diff --git a/README.md b/README.md
index 4cbf948..408b52b 100644
--- a/README.md
+++ b/README.md
@@ -1,39 +1,7 @@
-# chaozhangguijava
+## 服务器相关配置
 
-#### 介绍
-{**以下是 Gitee 平台说明，您可以替换此简介**
-Gitee 是 OSCHINA 推出的基于 Git 的代码托管平台（同时支持 SVN）。专为开发者提供稳定、高效、安全的云端软件开发协作平台
-无论是个人、团队、或是企业，都能够用 Gitee 实现代码托管、项目管理、协作开发。企业项目请看 [https://gitee.com/enterprises](https://gitee.com/enterprises)}
-
-#### 软件架构
-软件架构说明
-
-
-#### 安装教程
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### 使用说明
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### 参与贡献
-
-1.  Fork 本仓库
-2.  新建 Feat_xxx 分支
-3.  提交代码
-4.  新建 Pull Request
-
-
-#### 特技
-
-1.  使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md
-2.  Gitee 官方博客 [blog.gitee.com](https://blog.gitee.com)
-3.  你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解 Gitee 上的优秀开源项目
-4.  [GVP](https://gitee.com/gvp) 全称是 Gitee 最有价值开源项目，是综合评定出的优秀开源项目
-5.  Gitee 官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
-6.  Gitee 封面人物是一档用来展示 Gitee 会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
+### rabbitmq
+启动rabbitmq命令：
+```shell
+systemctl start rabbitmq-server.service
+```
\ No newline at end of file
diff --git a/autoStart.md b/autoStart.md
new file mode 100644
index 0000000..5c268da
--- /dev/null
+++ b/autoStart.md
@@ -0,0 +1,22 @@
+## autoStart.sh脚本使用说明
+
+#### 1、将对应的脚本文件放到对应的jar包启动脚本下
+如`apiStart7004.sh`的脚本在`/home/syb/api`目录下.  
+即将`pluss-api-page`下的`autoStart.sh`放到该目录下
+
+#### 2.1、文件授权
+```chmod 777 ./autoStart.sh``` 
+
+#### 2.2 文件编码调整
+```
+vi autoStart.out
+
+:set ff=unix
+
+:wq    
+```
+
+#### 3、脚本启动
+```nohup ./autoStart.sh >autoStart.out 2>&1 &```  
+```nohup ./autoStartApi.sh >autoStart.out 2>&1 &```  
+```nohup ./autoStartWap.sh >autoStart.out 2>&1 &```
\ No newline at end of file
diff --git a/code-generator/pom.xml b/code-generator/pom.xml
new file mode 100644
index 0000000..5f14265
--- /dev/null
+++ b/code-generator/pom.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>pluss-parent</artifactId>
+        <groupId>cn.pluss.platform</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>code-generator</artifactId>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>cn.pluss.platform</groupId>
+            <artifactId>pluss-common-bundle</artifactId>
+            <version>1.0.0</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>lombok</artifactId>
+                    <groupId>org.projectlombok</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>mybatis-plus-extension</artifactId>
+                    <groupId>com.baomidou</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>commons-logging</artifactId>
+                    <groupId>commons-logging</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>bcprov-jdk15on</artifactId>
+                    <groupId>org.bouncycastle</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>5.1.49</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-extension</artifactId>
+            <version>3.5.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <version>3.5.2</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>mybatis-plus-extension</artifactId>
+                    <groupId>com.baomidou</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-generator</artifactId>
+            <version>3.5.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.dataformat</groupId>
+            <artifactId>jackson-dataformat-yaml</artifactId>
+            <version>2.11.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba.fastjson2</groupId>
+            <artifactId>fastjson2</artifactId>
+            <version>2.0.9</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.24</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.ibeetl</groupId>
+            <artifactId>beetl</artifactId>
+            <version>3.10.0.RELEASE</version>
+        </dependency>
+
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.2.3</version>
+        </dependency>
+
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/code-generator/readme.md b/code-generator/readme.md
new file mode 100644
index 0000000..adacb4d
--- /dev/null
+++ b/code-generator/readme.md
@@ -0,0 +1,3 @@
+## 代码生成器
+
+用于通过数据表来生成对应的实体类，mybatis-plus Mapper文件，以及基本的controller
\ No newline at end of file
diff --git a/code-generator/src/main/java/com/demo/DataSource.java b/code-generator/src/main/java/com/demo/DataSource.java
new file mode 100644
index 0000000..5783a56
--- /dev/null
+++ b/code-generator/src/main/java/com/demo/DataSource.java
@@ -0,0 +1,18 @@
+package com.demo;
+
+import lombok.Data;
+
+/**
+ * @author DJH
+ */
+@Data
+public class DataSource {
+
+    private String url;
+
+    private String username;
+
+    private String password;
+
+    private String driverClassName;
+}
diff --git a/code-generator/src/main/java/com/demo/util/CodeGenerator.java b/code-generator/src/main/java/com/demo/util/CodeGenerator.java
new file mode 100644
index 0000000..0c2bd7c
--- /dev/null
+++ b/code-generator/src/main/java/com/demo/util/CodeGenerator.java
@@ -0,0 +1,80 @@
+package com.demo.util;
+
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.baomidou.mybatisplus.generator.AutoGenerator;
+import com.baomidou.mybatisplus.generator.FastAutoGenerator;
+import com.baomidou.mybatisplus.generator.config.*;
+import com.baomidou.mybatisplus.generator.config.converts.MySqlTypeConvert;
+import com.baomidou.mybatisplus.generator.config.po.TableInfo;
+import com.baomidou.mybatisplus.generator.config.rules.DbColumnType;
+import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.baomidou.mybatisplus.generator.engine.BeetlTemplateEngine;
+import com.baomidou.mybatisplus.generator.engine.FreemarkerTemplateEngine;
+import com.demo.DataSource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.FileNotFoundException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class CodeGenerator {
+
+    private final static Logger logger = LoggerFactory.getLogger(CodeGenerator.class);
+
+    private final static String[] TABLE_ARRAY = {"tb_pluss_merc_member_set"};
+
+    private final static String MODULE_NAME = "code-generator";
+
+    /**
+     * 表名前缀
+     */
+    private final static String TABLE_PREFIX = "tb_pluss";
+
+    private final static String AUTHOR = "Djh";
+
+    private final static String PACKAGE_PREFIX = "cn.pluss.platform";
+
+    /**
+     * 模板路径
+     */
+    private final static String ENTITY = "templates/entity.java";
+    private final static String MAPPER = "templates/mapper.java";
+//    private final static String SERVICE = "templates/service.java";
+//    private final static String SERVICE_IMPL = "templates/serviceImpl.java";
+    private final static String CONTROLLER = "templates/controller.java";
+
+    public static void main(String[] args) throws FileNotFoundException {
+        YamlUtils yamlUtils = new YamlUtils();
+        DataSource dataSource = yamlUtils.readDefaultYaml();
+
+        String projectPath = System.getProperty("user.dir") + "/" + MODULE_NAME;// 获取项目根目录
+
+        BeetlTemplateEngine beetlTemplateEngine = new BeetlTemplateEngine();
+
+        FastAutoGenerator.create(dataSource.getUrl(), dataSource.getUsername(), dataSource.getPassword())
+                .templateEngine(beetlTemplateEngine)
+                .globalConfig(builder -> {
+                    builder.author(AUTHOR) // 设置作者
+                            .outputDir(projectPath + "/src/main/java"); // 指定输出目录
+                })
+                .packageConfig(builder -> {
+                    builder.parent(PACKAGE_PREFIX) // 设置父包模块名
+                            .pathInfo(Collections.singletonMap(OutputFile.xml, projectPath + "/src/main/resources/mapper")); // 设置mapperXml生成路径
+                })
+                .strategyConfig(builder -> {
+                    builder.addInclude(TABLE_ARRAY) // 设置需要生成的表名
+                            .addTablePrefix(TABLE_PREFIX) // 设置过滤表前缀
+                            .entityBuilder().enableLombok()
+                            .serviceBuilder().formatServiceFileName("%sService")
+                            .controllerBuilder().enableRestStyle();
+                })
+                .execute();
+
+        logger.debug("执行生成");
+        // 执行生成
+    }
+}
diff --git a/code-generator/src/main/java/com/demo/util/TableFieldEntity.java b/code-generator/src/main/java/com/demo/util/TableFieldEntity.java
new file mode 100644
index 0000000..01dfcc1
--- /dev/null
+++ b/code-generator/src/main/java/com/demo/util/TableFieldEntity.java
@@ -0,0 +1,14 @@
+package com.demo.util;
+
+import lombok.Data;
+
+/**
+ * @author Djh
+ */
+@Data
+public class TableFieldEntity {
+
+    private String name;
+
+    private String type;
+}
diff --git a/code-generator/src/main/java/com/demo/util/TableReader.java b/code-generator/src/main/java/com/demo/util/TableReader.java
new file mode 100644
index 0000000..531feaa
--- /dev/null
+++ b/code-generator/src/main/java/com/demo/util/TableReader.java
@@ -0,0 +1,33 @@
+package com.demo.util;
+
+import lombok.Data;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Data
+public class TableReader {
+
+    private String url;
+
+    private String username;
+
+    private String password;
+
+    private String driverClassName;
+
+    public Map<String, Map<String, TableFieldEntity>> readTable(String... tableNames) {
+
+        Map<String, Map<String, TableFieldEntity>> result = new HashMap<>();
+        Map<String, TableFieldEntity> tableMap = new HashMap<>();
+        for (String tableName : tableNames) {
+            tableMap = new HashMap<>();
+            result.put(tableName, tableMap);
+
+
+        }
+
+
+        return result;
+    }
+}
\ No newline at end of file
diff --git a/code-generator/src/main/java/com/demo/util/YamlUtils.java b/code-generator/src/main/java/com/demo/util/YamlUtils.java
new file mode 100644
index 0000000..76e067d
--- /dev/null
+++ b/code-generator/src/main/java/com/demo/util/YamlUtils.java
@@ -0,0 +1,36 @@
+package com.demo.util;
+
+import com.alibaba.fastjson.JSONObject;
+import com.demo.DataSource;
+import org.yaml.snakeyaml.Yaml;
+
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.net.URL;
+import java.util.Map;
+
+/**
+ * @author Djh
+ */
+public class YamlUtils {
+
+    public DataSource readDefaultYaml() throws FileNotFoundException {
+        Yaml yaml = new Yaml();
+
+        URL url = this.getClass().getClassLoader().getResource("application.yml");
+        if (url != null) {
+            //获取test.yaml文件中的配置数据，然后转换为obj，
+            //也可以将值转换为Map
+            Map<String, Object> map = yaml.load(new FileInputStream(url.getFile()));
+            System.out.println(map);
+            return JSONObject.parseObject(JSONObject.toJSONString(map), DataSource.class);
+        }
+
+        return null;
+    }
+
+    public static void main(String[] args) throws FileNotFoundException {
+        YamlUtils yamlUtils = new YamlUtils();
+        yamlUtils.readDefaultYaml();
+    }
+}
diff --git a/code-generator/src/main/resources/application.yml b/code-generator/src/main/resources/application.yml
new file mode 100644
index 0000000..c941786
--- /dev/null
+++ b/code-generator/src/main/resources/application.yml
@@ -0,0 +1,4 @@
+url:
+username:
+password:
+driver-class-name: com.mysql.jdbc.Driver
diff --git a/code-generator/src/main/resources/logback.xml b/code-generator/src/main/resources/logback.xml
new file mode 100644
index 0000000..8cb6f47
--- /dev/null
+++ b/code-generator/src/main/resources/logback.xml
@@ -0,0 +1,239 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!-- 在此未说明属性为非必须的，那就表示属性必须设置 -->
+<!-- *****************最小配置文件结构介绍******************************* -->
+<!--
+    <configuration>
+        <appender></appender>    //存在1或多个，功能指定记录输出目的地
+        <root></root>            //最多存在一个，根logger
+        <logger><logger>        //存在1或多个，普通logger
+    </configuration>
+ -->
+<!-- *************************各个标签详细介绍********************************** -->
+
+<!-- debug（非必须）属性：true表示输出logback内部的日志信息（不影响配置和级别） ;
+     scan（非必须）属性：默认为false，true表示扫描配置文件的变化并自动重新配置，默认每隔1分钟扫描一次；
+     scanPeriod（非必须）属性：搭配scan属性使用，设置扫描的间隔时间
+-->
+<configuration debug="true" scan="true" scanPeriod="1 seconds">
+    <!-- 用于指定logger上下文名称，默认为default -->
+    <contextName>logback</contextName>
+
+    <!-- 设置变量FILE_PATH，用于指定名为FILE的appender的目的文件存放的目录 -->
+    <property name="FILE_PATH" value="D:/"></property>
+    <!--
+        **********************配置TurboFilter类型的过滤器**********************************
+        TurboFilter类型过滤器有三种：这里使用的是DuplicateMessageFilter
+            子标签<cacheSize>：表示内部缓存对旧消息引用的个数上限
+            子标签<allowedRepetitions>：表示允许消息出现的重复次数上限，超过次数上限的记录请求将被丢弃
+    -->
+<!--    &lt;!&ndash; 使用自定义的TurboFilter &ndash;&gt;-->
+<!--    <turboFilter class="logback.SampleTurboFilter">-->
+<!--    </turboFilter>-->
+<!--    &lt;!&ndash; 使用DuplicateTurboFilter &ndash;&gt;-->
+<!--    <turboFilter class="ch.qos.logback.classic.turbo.DuplicateMessageFilter">-->
+<!--        <allowedRepetitions>1</allowedRepetitions>-->
+<!--        <cacheSize>20</cacheSize>-->
+<!--    </turboFilter>-->
+
+    <!-- ************************常用的Appender************************************** -->
+    <!--
+        <appender>标签包含2个属性：name、class
+        name属性：指定appender名称;class属性：指定目的地类型 （比如ConsoleAppender、FileAppender等）
+        class属性的值决定了<appender>标签包含的子标签的种类。
+        -->
+    <!-- 该appender的功能是将记录信息以特定格式写到控制台 -->
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!--encoder:将事件转换为字符串
+            默认配置为PatternLayoutEncoder类
+            encoder用于替代Layout，encoder扩展了Layout功能
+            Layout功能：只负责把事件转换为字符串，但是不能指定何时将记录写入到指定目的地
+            encoder功能：即负责把事件转换为字符串，也可以指定何时将记录写入到指定目的地
+         -->
+        <encoder>
+            <!-- 指定输出格式
+                %d{} :表示时间
+                %thread:请求记录所在的线程名
+                %-5level：用5位显示请求级别
+                %logger{36}：输出logger名，{36}表示logger名最大占用的字符位数，{0}表示最简短logger名（不包含包名）。
+             -->
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{0} -%msg%n</pattern>
+        </encoder>
+    </appender>
+    <!-- 该appender的功能是将记录信息以特定格式写到文件 -->
+    <appender name="FILE" class="ch.qos.logback.core.FileAppender">
+        <!-- $使用变量FILE_PATH的格式,类似Linux中使用的格式：${FILE_PATH} -->
+        <file>${FILE_PATH}/file.log</file>
+        <encoder>
+            <!-- 指定输出格式 -->
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{0} -%msg%n</pattern>
+        </encoder>
+    </appender>
+    <!--
+        ***********************以最小窗体为指定的滚动规则的appender*****************************
+        RollingFileAppender类型的appender中必须包含4个子标签：<file>、<rollingPolicy>、<triggerPolicy>、<encoder>
+        <rollingPolicy>标签用于指定滚动规则，该标签有一个属性class：用于指定实现具体的滚动规则的类。
+        <triggerPolicy>标签用于指定发生滚动的条件，该标签有一个属性class：用于指定具体滚动条件的类。
+        <rollingPolicy>和<triggerPolicy>中具体包含哪些子标签是由class属性指定的类来决定的，因为不同的类有不同的参数，从而需要不同的标签来传参
+     -->
+    <!-- 该appender的功能是将记录信息以特定格式写到文件,当文件达到20MB时，创建以特定规则新的 文件，之后的记录会写到新文件-->
+    <appender name="rollingFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 在第一次触发滚动之前记录将会写到该文件中 -->
+        <file>${FILE_PATH}/rolling.log</file>
+        <!--
+            前提条件：class的值为FixedWindowRollingPolicy，表示以最小窗体为指定的滚动规则
+            RollingPolicy标签必须子标签：<fileNamePattern>、<minIndex>、<maxIndex>
+            <fileNamePattern>:表示滚动条件达到后，创建文件名的规则，其中"%i"代表数字1~5。第一次触发条件，创建文件rolling1.log，并且记录开始写到这个文件中
+             <minIndex>与<maxIndex>共同决定了文件的个数
+         -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+            <fileNamePattern>${FILE_PATH}/rolling%i.log</fileNamePattern>
+            <minIndex>1</minIndex>
+            <maxIndex>5</maxIndex>
+        </rollingPolicy>
+        <!--
+            <triggeringPolicy>功能：用于限制文件大小
+            前提条件：class的值为SizeBasedTriggeringPolicy，表示以文件大小为触发条件
+            只有一个子标签<maxFileSize>用于指定触发条件
+         -->
+        <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+            <maxFileSize>20MB</maxFileSize>
+        </triggeringPolicy>
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{0} -%msg%n</pattern>
+        </encoder>
+    </appender>
+    <!--
+    *****************************根据时间滚动 为滚动规则和条件的appender(最常用)***********************
+    -->
+    <!-- 该appender的功能：将记录信息以特定格式写到文件,当文件达到20MB时，创建以时间为特定规则新的 文件，之后的记录会写到新文件，
+    文件个数最多维持10个，文件达到10个 后删除旧的文件-->
+    <appender name="time_file" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- TimeBasedRollingPolicy实现了RollingPolicy与TriggeringPolicy，
+            因此只需要<rollingPolicy>标签，不需要<TriggeringPolicy>标签
+            <rollingPolicy>标签有两个子标签：<fileNamePattern>、<maxHistory>
+            <fileNamePattern>：用于指定文件名命名规则
+            <maxHistory>：保留文件的个数，超过了就删除创建时间最久的文件
+         -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 文件名 -->
+            <fileNamePattern>${FILE_PATH}/java_log/test%d{yyyy-MM-dd_HH-mm}.log</fileNamePattern>
+            <maxHistory>10</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{0} -%msg%n</pattern>
+        </encoder>
+    </appender>
+    <!--
+        ***********************常规级别过滤器的使用****************************************
+        本配置功能：过滤并接受请求级别为debug的请求，对于其他级别请求一律丢弃。
+     -->
+    <appender name="level_console" class="ch.qos.logback.core.ConsoleAppender">
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>debug</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{0} -%msg%n</pattern>
+        </encoder>
+    </appender>
+    <!--
+        ***********************常规临界值滤器的使用****************************************
+        本配置功能：请求级别高于或等于info的请求响应NEUTRAL（进入下一个环节），低于info的级别请求响应DENY(表示丢弃)。
+     -->
+    <appender name="threshold_console" class="ch.qos.logback.core.ConsoleAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>info</level>
+        </filter>
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{0} -%msg%n</pattern>
+        </encoder>
+    </appender>
+    <!-- appender的目的地为mysql数据库 -->
+<!--    <appender name="jdbc" class="ch.qos.logback.classic.db.DBAppender">-->
+<!--        &lt;!&ndash; 这里只使用jdbc中的DriverManager获得连接，不使用任何数据源 &ndash;&gt;-->
+<!--        <connectionSource class="ch.qos.logback.core.db.DriverManagerConnectionSource">-->
+<!--            <driverClass>com.mysql.jdbc.Driver</driverClass>-->
+<!--            <url>jdbc:mysql://localhost:3306/logback?useUnicode=true&amp;characterEncoding=utf8&amp;serverTimezone=UTC</url>-->
+<!--            <user>root</user>-->
+<!--            <password>Zp970321</password>-->
+<!--        </connectionSource>-->
+<!--    </appender>-->
+    <!-- ******以下DBAppender类型的appender的目的地为mysql数据库******** -->
+
+<!--    <appender name="c3p0_datasource" class="ch.qos.logback.classic.db.DBAppender">-->
+<!--        &lt;!&ndash; 这里使用DataSource获得连接&ndash;&gt;-->
+<!--        <connectionSource class="ch.qos.logback.core.db.DataSourceConnectionSource">-->
+<!--            &lt;!&ndash; 实现DataSource的数据库连接池有很多，比如DBCP、c3p0、Druid等-->
+<!--                这里使用的是c3p0-->
+<!--             &ndash;&gt;-->
+<!--            <dataSource class="com.mchange.v2.c3p0.ComboPooledDataSource">-->
+<!--                <user>root</user>-->
+<!--                <password>Zp970321</password>-->
+<!--                <driverClass>com.mysql.jdbc.Driver</driverClass>-->
+<!--                <jdbcUrl>jdbc:mysql://localhost:3306/logback?useUnicode=true&amp;characterEncoding=utf8</jdbcUrl>-->
+<!--            </dataSource>-->
+<!--        </connectionSource>-->
+<!--    </appender>-->
+<!--    <appender name="Druid_datasource" class="ch.qos.logback.classic.db.DBAppender">-->
+<!--        &lt;!&ndash; 这里使用DataSource获得连接&ndash;&gt;-->
+<!--        <connectionSource class="ch.qos.logback.core.db.DataSourceConnectionSource">-->
+<!--            &lt;!&ndash; 实现DataSource的数据库连接池有很多，比如DBCP、c3p0、Druid等-->
+<!--                这里使用的是Druid-->
+<!--             &ndash;&gt;-->
+<!--            <dataSource class="com.alibaba.druid.pool.DruidDataSource">-->
+<!--                <username>root</username>-->
+<!--                <password>Zp970321</password>-->
+<!--                <driverClassName>com.mysql.jdbc.Driver</driverClassName>-->
+<!--                <url>jdbc:mysql://localhost:3306/logback?useUnicode=true&amp;characterEncoding=utf8</url>-->
+<!--            </dataSource>-->
+<!--        </connectionSource>-->
+<!--    </appender>-->
+<!--    <appender name="dbcp_datasource" class="ch.qos.logback.classic.db.DBAppender">-->
+<!--        &lt;!&ndash; 这里使用DataSource获得连接&ndash;&gt;-->
+<!--        <connectionSource class="ch.qos.logback.core.db.DataSourceConnectionSource">-->
+<!--            &lt;!&ndash; 实现DataSource的数据库连接池有很多，比如DBCP、c3p0、Druid等-->
+<!--                这里使用的是dbcp-->
+<!--             &ndash;&gt;-->
+<!--            <dataSource class="org.apache.commons.dbcp.BasicDataSource">-->
+<!--                <username>root</username>-->
+<!--                <password>Zp970321</password>-->
+<!--                <driverClassName>com.mysql.jdbc.Driver</driverClassName>-->
+<!--                <url>jdbc:mysql://localhost:3306/logback?useUnicode=true&amp;characterEncoding=utf8</url>-->
+<!--            </dataSource>-->
+<!--        </connectionSource>-->
+<!--    </appender>-->
+    <!-- level属性：指定根logger的分配级别 -->
+    <root level="debug">
+        <!-- ref属性：指定根logger关联的appender -->
+        <appender-ref ref="STDOUT" />
+    </root>
+    <!-- name:指定logger名称；level：指定logger的分配级别；additivity(非必须，默认为true)：设置appender叠加性 -->
+    <logger name="demo" level="debug" additivity="false">
+        <appender-ref ref="FILE"></appender-ref>
+    </logger>
+    <logger name="demo2" level="debug">
+        <appender-ref ref="rollingFile"></appender-ref>
+    </logger>
+    <logger name="demo3" level="debug">
+        <appender-ref ref="time_file"></appender-ref>
+    </logger>
+    <logger name="demo4" level="debug" additivity="false">
+        <appender-ref ref="level_console"></appender-ref>
+    </logger>
+    <logger name="demo5" level="debug" additivity="false">
+        <appender-ref ref="threshold_console"></appender-ref>
+    </logger>
+<!--    <logger name="demo6" level="debug"  additivity="false">-->
+<!--        <appender-ref ref="jdbc"></appender-ref>-->
+<!--    </logger>-->
+<!--    <logger name="demo7" level="debug"  additivity="false">-->
+<!--        <appender-ref ref="c3p0_datasource"></appender-ref>-->
+<!--    </logger>-->
+<!--    <logger name="demo8" level="debug"  additivity="false">-->
+<!--        <appender-ref ref="Druid_datasource"></appender-ref>-->
+<!--    </logger>-->
+<!--    <logger name="demo9" level="debug"  additivity="false">-->
+<!--        <appender-ref ref="dbcp_datasource"></appender-ref>-->
+<!--    </logger>-->
+</configuration>
\ No newline at end of file
diff --git a/pluss-api-page/Dockerfile b/pluss-api-page/Dockerfile
new file mode 100644
index 0000000..7a7b00f
--- /dev/null
+++ b/pluss-api-page/Dockerfile
@@ -0,0 +1,6 @@
+FROM openjdk:8-jdk-alpine
+VOLUME /tmp
+EXPOSE 7004
+ARG JAR_FILE
+ADD ${JAR_FILE} app.jar
+ENTRYPOINT ["java","-jar","/app.jar", "--spring.profiles.active=dev"]
\ No newline at end of file
diff --git a/pluss-api-page/autoStart.sh b/pluss-api-page/autoStart.sh
new file mode 100644
index 0000000..1964312
--- /dev/null
+++ b/pluss-api-page/autoStart.sh
@@ -0,0 +1,37 @@
+while true
+do
+    ONE='one'
+    ONE_FILE='./one/syb.jar'
+    ONE_TIME=$(stat -c %Y $ONE_FILE)
+
+    ANOTHER='another'
+    ANOTHER_FILE='./another/syb.jar'
+    ANOTHER_TIME=$(stat -c %Y $ANOTHER_FILE)
+
+    if [ "$ONE_TIME" -gt "$ANOTHER_TIME" ]
+    then
+        FILE_NAME="$ONE_FILE"
+        FOLD="$ONE"
+    else
+        FILE_NAME="$ANOTHER_FILE"
+        FOLD="$ANOTHER"
+    fi
+
+    echo "最新的文件是${FILE_NAME}"
+    echo "最新的文件夹是${FOLD}"
+
+    # 先操作7004的端口
+    proc70041=$(pgrep -f "${ONE_FILE} --spring.profiles.active=prod$")
+    proc70042=$(pgrep -f "${ANOTHER_FILE} --spring.profiles.active=prod$")
+    if [ "$proc70041"x == "x" ] && [ "$proc70042"x == "x" ] ; then
+        ./apiStart7004.sh $FOLD
+    fi
+
+    # 再操作7014
+    proc70141=$(pgrep -f "${ONE_FILE} --spring.profiles.active=prod --server.port=7014$")
+    proc70142=$(pgrep -f "${ANOTHER_FILE} --spring.profiles.active=prod --server.port=7014$")
+    if [ "$proc70141"x == "x" ] && [ "$proc70142"x == "x" ] ; then
+        ./apiStart7014.sh $FOLD
+    fi
+    sleep 30
+done
\ No newline at end of file
diff --git a/pluss-api-page/pom.xml b/pluss-api-page/pom.xml
new file mode 100644
index 0000000..41a443a
--- /dev/null
+++ b/pluss-api-page/pom.xml
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>pluss-parent</artifactId>
+        <groupId>cn.pluss.platform</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>pluss-api-page</artifactId>
+    <packaging>jar</packaging>
+
+    <properties>
+        <docker.image.prefix>syb</docker.image.prefix>
+        <log4j.version>2.5</log4j.version>
+    </properties>
+
+    <dependencies>
+        <!-- https://mvnrepository.com/artifact/com.alipay.sdk/alipay-sdk-java -->
+        <dependency>
+            <groupId>com.alipay.sdk</groupId>
+            <artifactId>alipay-sdk-java</artifactId>
+            <version>4.7.1.ALL</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.alibaba</groupId>
+                    <artifactId>fastjson</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.13</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpmime</artifactId>
+            <version>4.5.13</version>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.pluss.platform</groupId>
+            <artifactId>pluss-common-bundle</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.pluss.platform</groupId>
+            <artifactId>pluss-service-bundle</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+
+        <!--腾讯云  -->
+        <dependency>
+            <groupId>com.github.tencentyun</groupId>
+            <artifactId>tls-sig-api</artifactId>
+            <version>1.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.8.5</version>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- 第三方推送消息 -->
+        <dependency>
+            <groupId>cn.jpush.api</groupId>
+            <artifactId>jpush-client</artifactId>
+            <version>3.4.6</version>
+        </dependency>
+
+
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore</artifactId>
+            <version>4.4.14</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.hannesdorfmann</groupId>
+            <artifactId>httpkit</artifactId>
+            <version>1.5.6</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>swagger-bootstrap-ui</artifactId>
+            <version>1.9.6</version>
+        </dependency>
+
+        <!--jsp支持 start -->
+
+        <!-- html 支持 -->
+        <!--<dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-starter-thymeleaf</artifactId>
+             </dependency>-->
+
+    </dependencies>
+
+    <build>
+        <finalName>czg</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>1.4.2.RELEASE</version>
+                <!--这里写上main方法所在类的路径-->
+                <configuration>
+                    <mainClass>cn.pluss.platform.ApiApplication</mainClass>
+                    <outputDirectory>./</outputDirectory>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+<!--            <plugin>-->
+<!--                <groupId>cn.smallbun.screw</groupId>-->
+<!--                <artifactId>screw-maven-plugin</artifactId>-->
+<!--                <version>1.0.3</version>-->
+<!--                <dependencies>-->
+<!--                    &lt;!&ndash; HikariCP &ndash;&gt;-->
+<!--                    <dependency>-->
+<!--                        <groupId>com.zaxxer</groupId>-->
+<!--                        <artifactId>HikariCP</artifactId>-->
+<!--                        <version>3.4.5</version>-->
+<!--                    </dependency>-->
+<!--                    &lt;!&ndash;mysql driver&ndash;&gt;-->
+<!--                    <dependency>-->
+<!--                        <groupId>mysql</groupId>-->
+<!--                        <artifactId>mysql-connector-java</artifactId>-->
+<!--                        <version>8.0.20</version>-->
+<!--                    </dependency>-->
+<!--                </dependencies>-->
+<!--                <configuration>-->
+<!--                    &lt;!&ndash;username&ndash;&gt;-->
+<!--                    <username>root</username>-->
+<!--                    &lt;!&ndash;password&ndash;&gt;-->
+<!--                    <password></password>-->
+<!--                    &lt;!&ndash;driver&ndash;&gt;-->
+<!--                    <driverClassName>com.mysql.cj.jdbc.Driver</driverClassName>-->
+<!--                    <jdbcUrl>jdbc:mysql://localhost:3306/shouyinbei?useUnicode=truecharacterEncoding=utf-8&amp;useSSL=false&amp;serverTimezone=GMT%2B8</jdbcUrl>-->
+<!--                    &lt;!&ndash;生成文件类型&ndash;&gt;-->
+<!--                    <fileType>HTML</fileType>-->
+<!--                    &lt;!&ndash;打开文件输出目录&ndash;&gt;-->
+<!--                    <openOutputDir>true</openOutputDir>-->
+<!--                    &lt;!&ndash;生成模板&ndash;&gt;-->
+<!--                    <produceType>freemarker</produceType>-->
+<!--                    &lt;!&ndash;文档名称 为空时:将采用[数据库名称-描述-版本号]作为文档名称&ndash;&gt;-->
+<!--                    &lt;!&ndash;                    <docName>测试文档名称</docName>&ndash;&gt;-->
+<!--                    &lt;!&ndash;描述&ndash;&gt;-->
+<!--                    <description>数据库文档生成</description>-->
+<!--                    &lt;!&ndash;版本&ndash;&gt;-->
+<!--                    <version>${project.version}</version>-->
+<!--                    &lt;!&ndash;标题&ndash;&gt;-->
+<!--                    <title>fire数据库文档</title>-->
+<!--                </configuration>-->
+<!--                <executions>-->
+<!--                    <execution>-->
+<!--                        <phase>compile</phase>-->
+<!--                        <goals>-->
+<!--                            <goal>run</goal>-->
+<!--                        </goals>-->
+<!--                    </execution>-->
+<!--                </executions>-->
+<!--            </plugin>-->
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/ApiApplication.java b/pluss-api-page/src/main/java/cn/pluss/platform/ApiApplication.java
new file mode 100644
index 0000000..e12aef8
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/ApiApplication.java
@@ -0,0 +1,30 @@
+package cn.pluss.platform;
+
+import com.github.xiaoymin.swaggerbootstrapui.annotations.EnableSwaggerBootstrapUI;
+import lombok.extern.slf4j.Slf4j;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.web.context.request.RequestContextListener;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+@Slf4j
+@MapperScan("cn.pluss.platform.mapper")
+@SpringBootApplication
+@EnableSwagger2
+@EnableAspectJAutoProxy(proxyTargetClass = true)
+@EnableSwaggerBootstrapUI
+public class ApiApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(ApiApplication.class, args);
+        log.info("Api Service Start Success");
+    }
+
+    @Bean
+    public RequestContextListener requestContextListener() {
+        return new RequestContextListener();
+    }
+}
\ No newline at end of file
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/annotation/Cert.java b/pluss-api-page/src/main/java/cn/pluss/platform/annotation/Cert.java
new file mode 100644
index 0000000..6d794fe
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/annotation/Cert.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * 标注的方法方法或者类下的接口需要完成实名认证才可调用
+ *
+ * @author DJH
+ */
+@Inherited
+@Target({ElementType.METHOD, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Cert {
+
+    boolean check() default true;
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/annotation/OpLog.java b/pluss-api-page/src/main/java/cn/pluss/platform/annotation/OpLog.java
new file mode 100644
index 0000000..bcab132
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/annotation/OpLog.java
@@ -0,0 +1,32 @@
+package cn.pluss.platform.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @author DJH
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface OpLog {
+
+    /**
+     * 操作日志code
+     * @return  操作code
+     */
+    String opCode() default "";
+
+    /**
+     * 操作日志-详情
+     * @return  操作详情
+     */
+    String opDetail() default "";
+
+    /**
+     * 操作日志名称
+     * @return  操作名称
+     */
+    String opName() default "";
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/annotation/ThirdAuth.java b/pluss-api-page/src/main/java/cn/pluss/platform/annotation/ThirdAuth.java
new file mode 100644
index 0000000..7b4d33c
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/annotation/ThirdAuth.java
@@ -0,0 +1,9 @@
+package cn.pluss.platform.annotation;
+
+import java.lang.annotation.*;
+
+@Inherited
+@Target({ElementType.METHOD, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface ThirdAuth {
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/aop/CertAspect.java b/pluss-api-page/src/main/java/cn/pluss/platform/aop/CertAspect.java
new file mode 100644
index 0000000..024886d
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/aop/CertAspect.java
@@ -0,0 +1,62 @@
+package cn.pluss.platform.aop;
+
+import cn.pluss.platform.annotation.Cert;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.userApp.UserAppService;
+import lombok.extern.slf4j.Slf4j;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.lang.reflect.Method;
+import java.util.Objects;
+
+/**
+ * 因为登录注册，以及忘记密码的时候，没有token，所以这三个操作的操作日志不通过注解实现
+ * 保存APP操作日志，取请求头中的用户信息
+ */
+@Slf4j
+@Aspect
+@Component
+public class CertAspect {
+
+    @Autowired
+    private UserAppService userAppService;
+
+    // 定义切点
+    // 记录后台接口的操作记录
+    // 拦截Controller所在的包
+    @Pointcut("(@within(cn.pluss.platform.annotation.Cert) && execution(* cn.pluss.platform.controller..*(..)))" +
+            "|| (execution(* cn.pluss.platform.controller..*(..)) && @annotation(cn.pluss.platform.annotation.Cert))")
+    public void executionService2() {
+    }
+
+
+    @Before(value = "executionService2()")
+    public void after(JoinPoint point) {
+
+        MethodSignature signature = (MethodSignature) point.getSignature();
+        Method method = signature.getMethod();
+        Class<?> declaringType = signature.getDeclaringType();
+        Cert classCertAnno = declaringType.getAnnotation(Cert.class);
+        Cert methodCertAnno = method.getAnnotation(Cert.class);
+
+        boolean classFlag = classCertAnno == null || classCertAnno.check();
+        boolean annoExistFlag = classCertAnno != null || methodCertAnno != null;
+        boolean methodFlag = methodCertAnno == null || methodCertAnno.check();
+
+        if (classFlag && methodFlag && annoExistFlag) {
+            final UserApp userApp = userAppService.queryUserAppByToken();
+
+            if (!Objects.equals(3, userApp.getBankStatus())) {
+                throw new MsgException("请先在APP中完成实名认证");
+            }
+        }
+
+    }
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/aop/OpLogAspect.java b/pluss-api-page/src/main/java/cn/pluss/platform/aop/OpLogAspect.java
new file mode 100644
index 0000000..cbefb23
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/aop/OpLogAspect.java
@@ -0,0 +1,99 @@
+package cn.pluss.platform.aop;
+
+import cn.pluss.platform.annotation.OpLog;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.entity.OperationRecord;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.operationRecord.OperationRecordService;
+import cn.pluss.platform.userApp.UserAppService;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.extern.slf4j.Slf4j;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.AfterReturning;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+import java.lang.reflect.Method;
+
+/**
+ * 因为登录注册，以及忘记密码的时候，没有token，所以这三个操作的操作日志不通过注解实现
+ * 保存APP操作日志，取请求头中的用户信息
+ */
+@Slf4j
+@Aspect
+@Component
+public class OpLogAspect {
+
+    @Autowired
+    private OperationRecordService opRecordService;
+
+    @Autowired
+    private UserAppService userAppService;
+
+    // 定义切点
+    // 记录后台接口的操作记录
+    // 拦截Controller所在的包
+    @Pointcut("execution(* cn.pluss.platform.controller..*.*(..)) && @annotation(cn.pluss.platform.annotation.OpLog))")
+    public void executionService() {
+    }
+
+
+    @AfterReturning(returning="rvt", value = "executionService()")
+    public void after(JoinPoint point, Object rvt) {
+        RequestAttributes attributes = RequestContextHolder.getRequestAttributes();
+        HttpServletRequest request;
+        if (attributes != null) {
+            request = ((ServletRequestAttributes) attributes).getRequest();
+        } else {
+            log.warn("未获取到request");
+            return;
+        }
+
+        MethodSignature signature = (MethodSignature) point.getSignature();
+        Method method = signature.getMethod();
+        OpLog annotation = method.getAnnotation(OpLog.class);
+
+        String token = request.getHeader("token");
+        String myLoginName = request.getHeader("myLoginName");
+
+        UserApp ua;
+        if (token == null || myLoginName == null) {
+            return;
+        }
+
+        //
+        LambdaQueryWrapper<UserApp> qWrapper = Wrappers.lambdaQuery();
+        qWrapper.eq(UserApp::getToken, token);
+        ua = userAppService.getOne(qWrapper);
+
+        OperationRecord opRecord = new OperationRecord();
+        opRecord.setDictValue(annotation.opCode());
+        opRecord.setRemark(annotation.opDetail());
+        opRecord.setOperator(ua.getUserId() + "");
+        opRecord.setUserId(ua.getUserId() + "");
+
+        if (rvt instanceof Result) {
+            Object data = ((Result) rvt).getData();
+            try {
+                JSONObject jsonObject = (JSONObject) JSON.toJSON(data);
+                String orderNumber = jsonObject.getString("orderNumber");
+                JSONObject extra = new JSONObject();
+                extra.put("orderNumber", orderNumber);
+                opRecord.setExtension(extra);
+            } catch (Exception e) {
+            }
+        }
+
+        opRecordService.save(opRecord);
+    }
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/aop/TrimAspect.java b/pluss-api-page/src/main/java/cn/pluss/platform/aop/TrimAspect.java
new file mode 100644
index 0000000..ce6e6f8
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/aop/TrimAspect.java
@@ -0,0 +1,122 @@
+package cn.pluss.platform.aop;
+
+
+import cn.hutool.core.date.DateUtil;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.http.HttpServletRequest;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author DJH
+ */
+@Aspect
+@Component
+public class TrimAspect {
+
+    private static final String PATTERN_COMPILE = "[\\s\\t\\n\\r]*";
+
+    // 定义切点
+    // 记录后台接口的操作记录
+    // 拦截Controller所在的包
+    @Pointcut("execution(* cn.pluss.platform.controller..*.*(..))")
+    public void executionService() {
+    }
+
+    @Around("executionService()")
+    public Object doAround(ProceedingJoinPoint pjp) throws Throwable {
+        // 数据校验注解优先于此AOP执行
+        //重点 这里就是获取@RequestBody参数的关键  调试的情况下 可以看到arr变量已经获取到了请求的参数
+        Object[] arr = pjp.getArgs();
+        for (int i = 0; i < arr.length; ++i) {
+            if (arr[i] instanceof HttpServletRequest) {
+                // 特殊处理
+                HttpServletRequest request = (HttpServletRequest) arr[i];
+                Map<String, String[]> m = request.getParameterMap();
+                Map<String, String[]> newM = new HashMap<>();
+                if (m != null) {
+                    for (Map.Entry<String, String[]> entry : m.entrySet()) {
+                        String key = entry.getKey();
+                        String[] value = entry.getValue();
+                        if (value == null) {
+                            continue;
+                        }
+                        for (int j = 0; j < value.length; ++j) {
+                            String temp = "";
+                            if (value[i] != null) {
+                                temp = value[i].replaceAll(PATTERN_COMPILE, "");
+                            }
+                            value[i] = temp.length() == 0 ? null : temp;
+                        }
+                        newM.put(key, value);
+                    }
+                }
+
+                request.setAttribute("The-result-after-removing-the-space", newM);
+                arr[i] = request;
+            } else {
+                if (arr[i] != null) {
+                    // 考虑到类里面还有类 这里采用递归的方式处理
+                    arr[i] = dfs(arr[i].getClass(), arr[i]);
+                }
+            }
+        }
+
+        // 把 arr 放回去即可改变参数的值
+        return pjp.proceed(arr);
+    }
+
+    private Object dfs(Class<?> aClass, Object object) throws IllegalAccessException {
+        if (object == null) {
+            return null;
+        }
+
+        // 如果是Java的基本数据类型就不需要继续递归了
+        if (isPrimitive(aClass)) {
+            if (!(object instanceof String)) {
+                return object;
+            }
+
+            try {
+                DateUtil.parseDate(((String) object));
+                return object;
+            } catch (Exception e) {
+                // 非时间字符串
+                String temp = ((String) object).replaceAll(PATTERN_COMPILE, "");
+                return temp.length() == 0 ? null : temp;
+            }
+        }
+
+        // 返回类所有字段
+        // 注意： 会返回静态字段
+        // 不要在Dto、Vo定义静态属性
+        // 没有获取父类属性 可通过 “object.getClass().getSuperclass()” 获取
+        for (Field item : object.getClass().getDeclaredFields()) {
+            // static 和 final 修饰的字段忽略
+            if (Modifier.isStatic(item.getModifiers())) {
+                continue;
+            }
+            // 设置可见性
+            item.setAccessible(true);
+            // 递归处理
+            item.set(object, dfs(item.getType(), item.get(object)));
+        }
+        return object;
+    }
+
+    // 判断是否为Java的基本类型或包装类
+    // java.lang.* java.util.* 存放着Java的基本数据类型的包装类和集合类
+    // 基本数据类型和包装类是JVM虚拟机运行需要的类，已嵌入到JVM内核
+    // 不需要继承ClassLoader 用户自定义的需要
+    private boolean isPrimitive(Class<?> aClass) {
+        return aClass != null && aClass.getClassLoader() == null;
+    }
+
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/configurer/Swagger2Configurer.java b/pluss-api-page/src/main/java/cn/pluss/platform/configurer/Swagger2Configurer.java
new file mode 100644
index 0000000..2458990
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/configurer/Swagger2Configurer.java
@@ -0,0 +1,58 @@
+package cn.pluss.platform.configurer;
+
+import cn.pluss.platform.constants.ProjectConstant;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.service.Parameter;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+@Configuration
+public  class Swagger2Configurer implements WebMvcConfigurer {
+
+    @Value("${swagger.production}")
+    private boolean isProd;
+
+    /**
+     * 这个地方要重新注入一下资源文件，不然不会注入资源的，也没有注入requestHandlerMappping,相当于xml配置的
+     * <!--swagger资源配置-->
+     * <mvc:resources location="classpath:/META-INF/resources/" mapping="swagger-ui.html"/>
+     * <mvc:resources location="classpath:/META-INF/resources/webjars/" mapping="/webjars/**"/>
+     */
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        registry.addResourceHandler("doc.html").addResourceLocations("classpath:/META-INF/resources/");
+        registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
+    }
+
+    @Bean
+    public Docket createRestApi() {
+        List<Parameter> pars = new ArrayList<Parameter>();
+        return new Docket(DocumentationType.SWAGGER_2)
+                .apiInfo(apiInfo())
+                .enable(!isProd)
+                .select()
+                .apis(RequestHandlerSelectors.basePackage(ProjectConstant.CONTROLLER_PACKAGE))
+                .paths(PathSelectors.any())
+                .build().globalOperationParameters(pars);
+    }
+
+    private ApiInfo apiInfo() {
+        return new ApiInfoBuilder()
+                .title("API文档展示")
+                .description("通过直接且美观的方式来查看和调试API")
+                .version("1.0")
+                .build();
+    }
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/configurer/WebConfigurer.java b/pluss-api-page/src/main/java/cn/pluss/platform/configurer/WebConfigurer.java
new file mode 100644
index 0000000..ef171d5
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/configurer/WebConfigurer.java
@@ -0,0 +1,91 @@
+package cn.pluss.platform.configurer;
+
+import cn.pluss.platform.configurer.extend.CurrentUserMethodArgumentResolver;
+import cn.pluss.platform.configurer.extend.FastJsonHttpMessageConverterEx;
+import cn.pluss.platform.interceptor.RequestInfoInterceptor;
+import cn.pluss.platform.interceptor.TokenRegistryInterceptor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.web.method.support.HandlerMethodArgumentResolver;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Spring MVC 配置
+ */
+@Configuration
+public class WebConfigurer implements WebMvcConfigurer {
+
+
+	@Override
+	public void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentResolvers) {
+		argumentResolvers.add(currentUserMethodArgumentResolver());
+	}
+
+	@Override
+	public void addResourceHandlers(ResourceHandlerRegistry registry) {
+		//和页面有关的静态目录都放在项目的static目录下
+//		registry.addResourceHandler("/static/**").addResourceLocations("classpath:/static/");
+		//上传的图片在D盘下的OTA目录下，访问路径如：http://localhost:8081/OTA/d3cf0281-bb7f-40e0-ab77-406db95ccf2c.jpg
+		//其中OTA表示访问的前缀。"file:D:/OTA/"是文件真实的存储路径
+		registry.addResourceHandler("/Pictures/**").addResourceLocations("file:D:/Pictures/");
+	}
+
+	/**
+	 * 使用阿里 FastJson 作为JSON MessageConverter
+	 * @param converters
+	 */
+	@Override
+	public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
+		converters.clear();
+		converters.add(fastJsonHttpMessageConverterEx());
+	}
+
+	/**
+	 * 解决跨域问题
+	 * @param registry
+	 */
+	@Override
+	public void addCorsMappings(CorsRegistry registry) {
+		registry.addMapping("/**").allowedMethods("*").allowedOrigins("*").allowedHeaders("*");
+	}
+
+	// 添加拦截器
+	@Override
+	public void addInterceptors(InterceptorRegistry registry) {
+		// 接口签名认证拦截器，该签名认证比较简单，实际项目中可以使用Json Web Token或其他更好的方式替代。
+		List<String> excludes = new ArrayList<>();
+		excludes.add("/webjars/**");
+		excludes.add("/doc.html");
+		excludes.add("/swagger-resources");
+		excludes.add("/auditCallback/**");
+		excludes.add("/wxCertCallback/**");
+		excludes.add("/Pictures/**");
+		excludes.add("/druid/**");
+		excludes.add("/callback/**");
+		registry.addInterceptor(new RequestInfoInterceptor());
+
+		registry.addInterceptor(tokenRegistryInterceptor()).excludePathPatterns(excludes);
+	}
+
+	@Bean
+	public TokenRegistryInterceptor tokenRegistryInterceptor() {
+		return new TokenRegistryInterceptor();
+	}
+
+	@Bean
+	public CurrentUserMethodArgumentResolver currentUserMethodArgumentResolver() {
+		return new CurrentUserMethodArgumentResolver();
+	}
+
+	@Bean
+	public FastJsonHttpMessageConverterEx fastJsonHttpMessageConverterEx() {
+		return new FastJsonHttpMessageConverterEx();
+	}
+}
\ No newline at end of file
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/configurer/extend/AllExceptionResolver.java b/pluss-api-page/src/main/java/cn/pluss/platform/configurer/extend/AllExceptionResolver.java
new file mode 100644
index 0000000..f3521aa
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/configurer/extend/AllExceptionResolver.java
@@ -0,0 +1,54 @@
+package cn.pluss.platform.configurer.extend;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultCode;
+import com.alibaba.fastjson.JSON;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.method.HandlerMethod;
+import org.springframework.web.servlet.HandlerExceptionResolver;
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.NoHandlerFoundException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+public class AllExceptionResolver implements HandlerExceptionResolver {
+	private final Logger logger = LoggerFactory.getLogger(AllExceptionResolver.class);
+
+	@Override
+	public ModelAndView resolveException(HttpServletRequest request, HttpServletResponse response, Object handler, Exception e) {
+		Result result = new Result();
+		// 业务失败的异常，如“账号或密码错误”
+	   if (e instanceof NoHandlerFoundException) {
+			result.setCode(ResultCode.NOT_FOUND).setMessage("接口 [" + request.getRequestURI() + "] 不存在");
+		} else if (e instanceof ServletException) {
+			result.setCode(ResultCode.FAIL).setMessage(e.getMessage());
+		} else {
+			result.setCode(ResultCode.INTERNAL_SERVER_ERROR).setMessage("接口 [" + request.getRequestURI() + "] 内部错误，请联系管理员");
+			String message;
+			if (handler instanceof HandlerMethod) {
+				HandlerMethod handlerMethod = (HandlerMethod) handler;
+				message = String.format("接口 [%s] 出现异常，方法：%s.%s，异常摘要：%s", request.getRequestURI(),handlerMethod.getBean().getClass().getName(), handlerMethod.getMethod().getName(),e.getMessage());
+			} else {
+				message = e.getMessage();
+			}
+			logger.error(message, e);
+		}
+		responseResult(response, result);
+		return new ModelAndView();
+	}
+
+	private void responseResult(HttpServletResponse response, Result result) {
+		response.setCharacterEncoding("UTF-8");
+		response.setHeader("Content-type", "application/json;charset=UTF-8");
+		response.setStatus(200);
+		try {
+			response.getWriter().write(JSON.toJSONString(result));
+		} catch (IOException ex) {
+			logger.error(ex.getMessage());
+		}
+	}
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/configurer/extend/CurrentUserMethodArgumentResolver.java b/pluss-api-page/src/main/java/cn/pluss/platform/configurer/extend/CurrentUserMethodArgumentResolver.java
new file mode 100644
index 0000000..166ae15
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/configurer/extend/CurrentUserMethodArgumentResolver.java
@@ -0,0 +1,28 @@
+package cn.pluss.platform.configurer.extend;
+
+import cn.pluss.platform.vo.BaseUser;
+import org.springframework.core.MethodParameter;
+import org.springframework.web.bind.support.WebDataBinderFactory;
+import org.springframework.web.context.request.NativeWebRequest;
+import org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.method.support.HandlerMethodArgumentResolver;
+import org.springframework.web.method.support.ModelAndViewContainer;
+
+
+public class CurrentUserMethodArgumentResolver implements HandlerMethodArgumentResolver{
+
+	@Override
+	public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer, NativeWebRequest webRequest, WebDataBinderFactory binderFactory) throws Exception {
+		BaseUser user = (BaseUser) webRequest.getAttribute("currentUser", RequestAttributes.SCOPE_REQUEST);
+        if (user == null) {
+            throw new Exception("获取用户信息失败");
+        }
+        return user;
+	}
+
+	@Override
+	public boolean supportsParameter(MethodParameter parameter) {
+		 return parameter.getParameterType().isAssignableFrom(BaseUser.class);
+	}
+
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/configurer/extend/FastJsonHttpMessageConverterEx.java b/pluss-api-page/src/main/java/cn/pluss/platform/configurer/extend/FastJsonHttpMessageConverterEx.java
new file mode 100644
index 0000000..12277e0
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/configurer/extend/FastJsonHttpMessageConverterEx.java
@@ -0,0 +1,48 @@
+package cn.pluss.platform.configurer.extend;
+
+import com.alibaba.fastjson.parser.ParserConfig;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.alibaba.fastjson.support.config.FastJsonConfig;
+import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
+import org.springframework.http.MediaType;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Collections;
+
+public class FastJsonHttpMessageConverterEx extends FastJsonHttpMessageConverter {
+	private static final SerializerFeature[] features = {
+			// 输出空置字段
+			SerializerFeature.WriteMapNullValue,
+			// list字段如果为null，输出为[]，而不是null
+			SerializerFeature.WriteNullListAsEmpty,
+			// 数值字段如果为null，输出为0，而不是null
+			// SerializerFeature.WriteNullNumberAsZero,
+			// SerializerFeature.WriteNullBooleanAsFalse,
+			// Boolean字段如果为null，输出为false，而不是null
+			// 字符类型字段如果为null，输出为""，而不是null
+			SerializerFeature.WriteNullStringAsEmpty,
+			// 关闭引用检测，解决$ref问题
+			SerializerFeature.DisableCircularReferenceDetect
+	};
+
+	public FastJsonHttpMessageConverterEx() {
+		FastJsonConfig fastJsonConfig = getFastJsonConfig();
+		fastJsonConfig.setSerializerFeatures(features);
+		fastJsonConfig.setFeatures();
+		fastJsonConfig.setSerializeFilters();
+		setDefaultCharset(StandardCharsets.UTF_8);
+		setSupportedMediaTypes(Collections.singletonList(MediaType.APPLICATION_JSON));
+
+		ParserConfig globalInstance = ParserConfig.getGlobalInstance();
+		// 只能过滤部分。对于接受参数为实体类的无法生效
+		StringDeserializer stringDeserializer = new StringDeserializer();
+		globalInstance.putDeserializer(String.class, stringDeserializer);
+		globalInstance.putDeserializer(StringBuilder.class, stringDeserializer);
+		globalInstance.putDeserializer(StringBuffer.class, stringDeserializer);
+	}
+
+	@Override
+	protected boolean supports(Class<?> clazz) {
+		return super.supports(clazz);
+	}
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/configurer/extend/StringDeserializer.java b/pluss-api-page/src/main/java/cn/pluss/platform/configurer/extend/StringDeserializer.java
new file mode 100644
index 0000000..b71913c
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/configurer/extend/StringDeserializer.java
@@ -0,0 +1,57 @@
+package cn.pluss.platform.configurer.extend;
+
+import com.alibaba.fastjson.parser.DefaultJSONParser;
+import com.alibaba.fastjson.parser.JSONLexer;
+import com.alibaba.fastjson.parser.JSONToken;
+import com.alibaba.fastjson.serializer.StringCodec;
+
+import java.lang.reflect.Type;
+
+/**
+ * @author DJH
+ */
+public class StringDeserializer extends StringCodec {
+
+    @Override
+    public <T> T deserialze(DefaultJSONParser parser, Type clazz, Object fieldName) {
+        if (clazz == StringBuffer.class) {
+            final JSONLexer lexer = parser.lexer;
+            if (lexer.token() == JSONToken.LITERAL_STRING) {
+                String val = lexer.stringVal();
+                val = val.replace("[\u0020\3000\n]", "");
+                lexer.nextToken(JSONToken.COMMA);
+
+                return (T) new StringBuffer(val);
+            }
+
+            Object value = parser.parse();
+
+            if (value == null) {
+                return null;
+            }
+
+            return (T) new StringBuffer(value.toString());
+        }
+
+        if (clazz == StringBuilder.class) {
+            final JSONLexer lexer = parser.lexer;
+            if (lexer.token() == JSONToken.LITERAL_STRING) {
+                String val = lexer.stringVal();
+                val = val.replace("[\u0020\3000\n]", "");
+                lexer.nextToken(JSONToken.COMMA);
+
+                return (T) new StringBuilder(val);
+            }
+
+            Object value = parser.parse();
+
+            if (value == null) {
+                return null;
+            }
+
+            return (T) new StringBuilder(value.toString());
+        }
+
+        return (T) deserialze(parser);
+    }
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/AccountBalanceController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/AccountBalanceController.java
new file mode 100644
index 0000000..d28ec6b
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/AccountBalanceController.java
@@ -0,0 +1,27 @@
+package cn.pluss.platform.controller;
+
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.app.AccountBalanceService;
+import cn.pluss.platform.entity.MakeMoney;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequiredArgsConstructor
+public class AccountBalanceController {
+
+    private final AccountBalanceService accountBalanceService;
+
+    @GetMapping(value = "/queryBills")
+    @ApiOperation(tags = {"页面-余额"}, value = "查询乐刷打款账单", notes = "查询乐刷打款账单", httpMethod = "POST")
+    public Result<PageInfo<MakeMoney>> queryBills(Page<MakeMoney> page)  {
+        page.setSize(20);
+        PageInfo<MakeMoney> result = accountBalanceService.queryBills(page);
+        return ResultGenerator.genSuccessResult(result);
+    }
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/AccountController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/AccountController.java
new file mode 100644
index 0000000..a826ab3
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/AccountController.java
@@ -0,0 +1,139 @@
+package cn.pluss.platform.controller;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.dto.AccountDTO;
+import cn.pluss.platform.dto.BankCardDTO;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.merchant.AccountService;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.vo.StoreSummaryVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @author Djh
+ * 结算信息接口控制
+ */
+@Validated
+@RestController
+@RequestMapping("account")
+public class AccountController {
+
+    @Autowired
+    private UserAppService userAppService;
+
+    @Autowired
+    @Qualifier("accountService")
+    private AccountService accountService;
+
+    @Autowired
+    private MerchantChannelStatusService mcsService;
+
+    @Autowired
+    private MerchantBaseInfoService mbiService;
+
+    /**
+     * 保存商户结算信息, 最新接口
+     *
+     * @return
+     */
+    @PostMapping("/v3/save")
+    public Result<Object> saveV3(@Validated @RequestBody AccountDTO accountDTO) {
+        accountService.saveOrUpdate(accountDTO);
+        return ResultGenerator.genSuccessResult("结算人信息保存成功", "");
+    }
+
+    /**
+     * 保存商户结算信息, 最新接口
+     *
+     * @return
+     */
+    @PostMapping("/save/v4")
+    public Result<Object> saveV4(@Validated @RequestBody AccountDTO accountDTO) {
+        UserApp userApp = userAppService.queryUserAppByToken();
+        MsgException.checkUnequals(userApp.getUserId() + "", accountDTO.getUserId(), "非法参数, 拒绝访问");
+        accountService.saveOrUpdate(accountDTO);
+        return ResultGenerator.genSuccessResult("结算人信息保存成功", "");
+    }
+
+
+    @GetMapping("/v3/{userId}")
+    public Result<Object> getAccountV3(@PathVariable("userId") String userId) {
+        AccountDTO accountDTO = accountService.getAccount(userId);
+        return ResultGenerator.genSuccessResult(accountDTO);
+    }
+
+    @GetMapping("/v4")
+    public Result<Object> getAccountV4(Account account) {
+        UserApp tokenUa = userAppService.queryUserAppByToken();
+
+        if (account.getChannelType() == null) {
+
+            MerchantChannelStatus mcs = mcsService.getValidData(tokenUa.getMerchantCode());
+            if (mcs == null || !Objects.equals(mcs.getChannel(), 4)) {
+                account.setChannelType(Account.CHANNEL_TYPE_D1);
+            } else {
+                account.setChannelType(Account.CHANNEL_TYPE_D0);
+            }
+        }
+
+        AccountDTO accountDTO = accountService.getRealAccount(account);
+        if (accountDTO == null) {
+            accountDTO = new AccountDTO();
+        }
+
+        if (accountDTO.getIdcard() == null && accountDTO.getBankCard() == null) {
+            accountDTO.setIdcard(new IdCard());
+            accountDTO.setBankCard(new BankCard());
+        }
+
+        return ResultGenerator.genSuccessResult(accountDTO);
+    }
+
+    @GetMapping("/all")
+    public Result<Object> getAccounts(@RequestParam String userId) {
+        Map<String, AccountDTO> result = accountService.getAccounts(userId);
+        return ResultGenerator.genSuccessResult(result);
+    }
+
+    @GetMapping("/reckoner/v2")
+    public Result<Object> reckonerV2(String userId, String merchantType) {
+        StoreSummaryVO result = accountService.getReckonerV2(userId, merchantType);
+        return ResultGenerator.genSuccessResult("请求成功", result);
+    }
+
+    @GetMapping("/reckoner")
+    public Result<Object> reckoner(String userId, String merchantType) {
+        StoreSummaryVO result = accountService.getReckoner(userId, merchantType);
+        return ResultGenerator.genSuccessResult("请求成功", result);
+    }
+
+    @PostMapping("/editAccountBankCard")
+    public Result<Object> editAccountBankCard(@RequestBody BankCard bankCard){
+//        throw new MsgException("系统维护中，暂不支持修改结算卡");
+         accountService.editAccountBankCard(bankCard);
+         return ResultGenerator.genSuccessResult("结算账户修改已申请", null);
+    }
+
+    @PostMapping("/editAccountBankCardV2")
+    public Result<Object> editAccountBankCardV2(@RequestBody BankCardDTO bankCard){
+        accountService.editAccountBankCardV2(bankCard);
+        return ResultGenerator.genSuccessResult("结算账户修改已申请", null);
+    }
+
+    @GetMapping("/canEditBankCard")
+    public Result<Object> canEditBankCard() {
+        UserApp userApp = userAppService.queryUserAppByToken();
+        boolean flag = accountService.canEditBankCard(userApp.getMerchantCode());
+        return ResultGenerator.genSuccessResult("请求成功", flag);
+    }
+}
\ No newline at end of file
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/ActivityActivateController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/ActivityActivateController.java
new file mode 100644
index 0000000..4510ada
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/ActivityActivateController.java
@@ -0,0 +1,198 @@
+package cn.pluss.platform.controller;
+
+import cn.pluss.platform.activityActivate.ActivityActivateService;
+import cn.pluss.platform.activityConsumReturn.ActivityConsumReturnService;
+import cn.pluss.platform.activityRecharge.ActivityRechargeService;
+import cn.pluss.platform.activityRecommend.ActivityRecommendService;
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.constants.ProjectConstant;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.merchantStore.MerchantStoreService;
+import cn.pluss.platform.util.EmojiUtil;
+import cn.pluss.platform.util.StringUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author DJH
+ */
+@RestController
+@Slf4j
+@RequestMapping("/activityActivate")
+@Api(value = "ActivityActivate控制类", tags = {"ActivityActivate接口"})
+public class ActivityActivateController {
+    @Resource
+    private ActivityActivateService activityActivateService;
+
+    @Resource
+    private ActivityConsumReturnService activityConsumReturnService;
+
+    @Resource
+    private ActivityRechargeService activityRechargeService;
+
+    @Resource
+    private ActivityRecommendService activityRecommendService;
+
+    @Resource
+    private MerchantStoreService merchantStoreService;
+
+    @GetMapping
+    @ApiOperation(value = "获取全部", notes = "返回分页过后的数据", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "page", value = "查询页码", paramType = "query", dataType = "Integer", defaultValue = "0"),
+            @ApiImplicitParam(name = "size", value = "每页数据量", paramType = "query", dataType = "Integer", defaultValue = "0")})
+    public Result<PageInfo<ActivityActivate>> list(@RequestParam(defaultValue = "1") Integer page,
+                                                   @RequestParam(defaultValue = "10") Integer size) {
+        if (size == null || size == 0) {
+            size = ProjectConstant.PAGE_SIZE;
+        }
+        if (page == null || page == 0) {
+            page = 1;
+        }
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageSize", size);
+        map.put("offset", (page - 1) * size);
+        List<ActivityActivate> activityActivateList = activityActivateService.queryActivityActivatePage(map);
+
+        for (ActivityActivate activityActivate : activityActivateList) {
+            activityActivate.setName(EmojiUtil.emojiRecovery2(activityActivate.getName()));
+        }
+
+        Integer count = activityActivateService.queryActivityActivatePageCount(map);
+        // 返回参数
+        PageInfo<ActivityActivate> pager = new PageInfo<>(count.longValue(), (long) StringUtil.getPageCount(count, size), page.longValue(), size.longValue(),
+                activityActivateList);
+        return ResultGenerator.genSuccessResult(pager);
+    }
+
+    @PostMapping
+    @ApiOperation(value = "添加数据", notes = "添加新的数据", httpMethod = "POST")
+    public Result<Object> add(@RequestBody ActivityActivate activityActivate) {
+
+        ActivityActivate activity = new ActivityActivate();
+        activity.setMerchantCode(activityActivate.getMerchantCode());
+        activity.setStoreId(activityActivate.getStoreId());
+        List<ActivityActivate> activityList = activityActivateService.queryActivityActivateList(activity);
+        for (ActivityActivate a : activityList) {
+            activityActivateService.deleteActivityActivate(a);
+        }
+        if(StringUtil.isEmpty(activityActivate.getStoreId())){
+            MerchantStore store = merchantStoreService.queryMerchantStore(new MerchantStore().setMerchantCode(activityActivate.getMerchantCode()));
+            if(store == null){
+                return ResultGenerator.genFailResult("门店信息有误！",null);
+            }
+            activityActivate.setStoreId(store.getStoreId());
+            activityActivate.setStoreName(store.getStoreName());
+        }
+        activityActivate.setCreateDt(new Date());
+        activityActivateService.saveActivityActivate(activityActivate);
+        return ResultGenerator.genSuccessResult("添加成功！");
+    }
+
+    @DeleteMapping("/{id}")
+    @ApiOperation(value = "删除数据", notes = "根据id删除数据", httpMethod = "DELETE")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "查询的id实例", paramType = "path", dataType = "Integer", required = true)})
+    public Result<Object> delete(@PathVariable Integer id) {
+        ActivityActivate activityActivate = new ActivityActivate();
+        activityActivate.setId(id);
+        activityActivateService.deleteActivityActivate(activityActivate);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @PutMapping
+    @ApiOperation(value = "更新数据", notes = "根据内容更新数据", httpMethod = "PUT")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "ActivityActivate", value = "更新的ActivityActivate实例", paramType = "body", dataType = "ActivityActivate", required = true)})
+    public Result<Object> update(@RequestBody ActivityActivate activityActivate) {
+        activityActivateService.updateActivityActivate(activityActivate);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @GetMapping("/{id}")
+    @ApiOperation(value = "获取单个值", notes = "查看单个项目的内容", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "查询的id", paramType = "path", required = true, dataType = "Integer", defaultValue = "0")})
+    public Result<Object> detail(@PathVariable Long id) {
+        ActivityActivate activityActivate = new ActivityActivate();
+        activityActivate.setId(id.intValue());
+        activityActivate = activityActivateService.queryActivityActivate(activityActivate);
+        return ResultGenerator.genSuccessResult(activityActivate);
+    }
+
+    @GetMapping("/queryAcitvity")
+    @ApiOperation(tags = {"页面-设置会员卡"}, value = "获取店铺活动", notes = "获取店铺活动", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "merchantCode", value = "商户Id", paramType = "merchantCode", required = true, dataType = "merchantCode"),
+            @ApiImplicitParam(name = "storeId", value = "门店Id", paramType = "storeId", required = true, dataType = "storeId"),
+    })
+    public Result<Object> queryActivity(@RequestParam String merchantCode, String storeId) {
+        Map<String, Object> result = new HashMap<>(16);
+        if (StringUtil.isEmpty(merchantCode)) {
+            return ResultGenerator.genFailResult("商家编码不能为空");
+        }
+
+        ActivityActivate activityActivate = new ActivityActivate();
+        activityActivate.setMerchantCode(merchantCode);
+        activityActivate.setStoreId(storeId);
+        List<ActivityActivate> queryActivityActivateList = activityActivateService.queryActivityActivateList(activityActivate);
+        ActivityConsumReturn activityConsumReturn = new ActivityConsumReturn();
+        activityConsumReturn.setMerchantCode(merchantCode);
+        activityConsumReturn.setStoreId(storeId);
+        List<ActivityConsumReturn> queryActivityConsumReturnList = activityConsumReturnService.queryActivityConsumReturnList(activityConsumReturn);
+        ActivityRecharge activityRecharge = new ActivityRecharge();
+        activityRecharge.setMerchantCode(merchantCode);
+        activityRecharge.setStoreId(storeId);
+        List<ActivityRecharge> queryActivityRechargeList = activityRechargeService.queryActivityRechargeList(activityRecharge);
+        ActivityRecommend activityRecommend = new ActivityRecommend();
+        activityRecommend.setMerchantCode(merchantCode);
+        activityRecommend.setStoreId(storeId);
+        List<ActivityRecommend> queryActivityRecommendList = activityRecommendService.queryActivityRecommendList(activityRecommend);
+        result.put("activityActivateList", queryActivityActivateList);
+        result.put("activityConsumReturnList", queryActivityConsumReturnList);
+        result.put("activityRechargeList", queryActivityRechargeList);
+        result.put("activityRecommendList", queryActivityRecommendList);
+
+        return ResultGenerator.genSuccessResult(result);
+    }
+
+    @PostMapping("deleteAcitvityByType")
+    @ApiOperation(value = "根据type删除对应的活动", notes = "根据type删除对应的活动 0：充值 1消费返 2激活送 ", httpMethod = "POST")
+    public Result<Object> deleteActivityByType(@RequestBody ActivityActivate activityActivate) {
+        String type = activityActivate.getType();
+        Integer id = activityActivate.getId();
+
+		if ("0".equals(type)) {
+			ActivityRecharge activityRecharge = new ActivityRecharge();
+			activityRecharge.setId(id);
+			activityRechargeService.deleteActivityRecharge(activityRecharge);
+		} else if ("1".equals(type)) {
+			ActivityConsumReturn activityConsumReturn = new ActivityConsumReturn();
+			activityConsumReturn.setId(id);
+			activityConsumReturnService.deleteActivityConsumReturn(activityConsumReturn);
+		} else if ("2".equals(type)) {
+			activityActivateService.deleteActivityActivate(activityActivate);
+		} else {
+			return ResultGenerator.genSuccessResult("删除失败");
+		}
+		return ResultGenerator.genSuccessResult("删除成功");
+    }
+
+    @PostMapping("delActByType")
+    public Result<Object> delActByType(@RequestBody ActivityActivate activityActivate) {
+        activityActivateService.delActByType(activityActivate);
+        return ResultGenerator.genSuccessResult("删除成功", null);
+    }
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/ActivityConsumReturnController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/ActivityConsumReturnController.java
new file mode 100644
index 0000000..89af925
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/ActivityConsumReturnController.java
@@ -0,0 +1,113 @@
+package cn.pluss.platform.controller;
+
+import cn.pluss.platform.activityConsumReturn.ActivityConsumReturnService;
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.constants.ProjectConstant;
+import cn.pluss.platform.entity.ActivityConsumReturn;
+import cn.pluss.platform.util.StringUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Slf4j
+@RestController
+@RequestMapping("/activityConsumReturn")
+@Transactional
+@Api(value = "ActivityConsumReturn控制类", tags = {"ActivityConsumReturn接口"})
+public class ActivityConsumReturnController {
+
+    @Resource
+    private ActivityConsumReturnService activityConsumReturnService;
+
+    @GetMapping
+    @ApiOperation(value = "获取全部", notes = "返回分页过后的数据", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "page", value = "查询页码", paramType = "query", dataType = "Integer", defaultValue = "0"),
+            @ApiImplicitParam(name = "size", value = "每页数据量", paramType = "query", dataType = "Integer", defaultValue = "0")})
+    public Result<PageInfo<ActivityConsumReturn>> list(@RequestParam(defaultValue = "1") Integer page,
+                                                       @RequestParam(defaultValue = "10") Integer size) {
+        if (size == null || size == 0) {
+            size = ProjectConstant.PAGE_SIZE;
+        }
+        if (page == null || page == 0) {
+            page = 1;
+        }
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageSize", size);
+        map.put("offset", (page - 1) * size);
+        List<ActivityConsumReturn> activityConsumReturnList = activityConsumReturnService
+                .queryActivityConsumReturnPage(map);
+        Integer count = activityConsumReturnService.queryActivityConsumReturnPageCount(map);
+        // 返回参数
+        PageInfo<ActivityConsumReturn> pager = new PageInfo<>(count.longValue(), (long) StringUtil.getPageCount(count, size), page.longValue(), size.longValue(),
+                activityConsumReturnList);
+        return ResultGenerator.genSuccessResult(pager);
+    }
+
+    @PostMapping
+    @ApiOperation(value = "添加数据", notes = "添加新的数据", httpMethod = "POST")
+    public Result<Object> add(@RequestBody List<ActivityConsumReturn> activityConsumReturn) {
+        if (activityConsumReturn == null) {
+            return ResultGenerator.genFailResult("参数错误！");
+        }
+        if (activityConsumReturn.size() > 0) {
+            ActivityConsumReturn activity = new ActivityConsumReturn();
+            activity.setMerchantCode(activityConsumReturn.get(0).getMerchantCode());
+            activity.setStoreId(activityConsumReturn.get(0).getStoreId());
+            List<ActivityConsumReturn> activityList = activityConsumReturnService.queryActivityConsumReturnList(activity);
+            for (ActivityConsumReturn a : activityList) {
+                activityConsumReturnService.deleteActivityConsumReturn(a);
+            }
+        }
+
+        for (ActivityConsumReturn activityConsumReturn2 : activityConsumReturn) {
+            activityConsumReturn2.setCreateDt(new Date());
+            activityConsumReturnService.saveActivityConsumReturn(activityConsumReturn2);
+        }
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @DeleteMapping("/{id}")
+    @ApiOperation(value = "删除数据", notes = "根据id删除数据", httpMethod = "DELETE")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "查询的id实例", paramType = "path", dataType = "Integer", required = true)})
+    public Result delete(@PathVariable Integer id) {
+        ActivityConsumReturn activityConsumReturn = new ActivityConsumReturn();
+        activityConsumReturn.setId(id);
+        activityConsumReturnService.deleteActivityConsumReturn(activityConsumReturn);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @PutMapping
+    @ApiOperation(value = "更新数据", notes = "根据内容更新数据", httpMethod = "PUT")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "ActivityConsumReturn", value = "更新的ActivityConsumReturn实例", paramType = "body", dataType = "ActivityConsumReturn", required = true)})
+    public Result update(@RequestBody ActivityConsumReturn activityConsumReturn) {
+        activityConsumReturnService.updateActivityConsumReturn(activityConsumReturn);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @GetMapping("/{id}")
+    @ApiOperation(value = "获取单个值", notes = "查看单个项目的内容", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "查询的id", paramType = "path", required = true, dataType = "Integer", defaultValue = "0")})
+    public Result detail(@PathVariable Long id) {
+        ActivityConsumReturn activityConsumReturn = new ActivityConsumReturn();
+        activityConsumReturn.setId(id.intValue());
+        activityConsumReturn = activityConsumReturnService.queryActivityConsumReturn(activityConsumReturn);
+        return ResultGenerator.genSuccessResult(activityConsumReturn);
+    }
+
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/ActivityRechargeController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/ActivityRechargeController.java
new file mode 100644
index 0000000..b53ba3f
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/ActivityRechargeController.java
@@ -0,0 +1,134 @@
+package cn.pluss.platform.controller;
+
+import cn.pluss.platform.activityRecharge.ActivityRechargeService;
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.constants.ProjectConstant;
+import cn.pluss.platform.entity.ActivityRecharge;
+import cn.pluss.platform.entity.MerchantBaseInfo;
+import cn.pluss.platform.entity.MerchantStore;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantStore.MerchantStoreService;
+import cn.pluss.platform.util.StringUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author DJH
+ */
+@RestController
+@RequestMapping("/activityRecharge")
+@RequiredArgsConstructor
+@Slf4j
+@Transactional
+@Api(value = "ActivityRecharge控制类", tags = {"ActivityRecharge接口"})
+public class ActivityRechargeController {
+
+
+    private final ActivityRechargeService activityRechargeService;
+
+    private final MerchantStoreService merchantStoreService;
+
+    private final MerchantBaseInfoService merchantBaseInfoService;
+
+    @GetMapping
+    @ApiOperation(value = "获取全部", notes = "返回分页过后的数据", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "page", value = "查询页码", paramType = "query", dataType = "Integer", defaultValue = "0"),
+            @ApiImplicitParam(name = "size", value = "每页数据量", paramType = "query", dataType = "Integer", defaultValue = "0")})
+    public Result<PageInfo<ActivityRecharge>> list(@RequestParam(defaultValue = "1") Integer page,
+                                                   @RequestParam(defaultValue = "10") Integer size) {
+        if (size == null || size == 0) {
+            size = ProjectConstant.PAGE_SIZE;
+        }
+        if (page == null || page == 0) {
+            page = 1;
+        }
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageSize", size);
+        map.put("offset", (page - 1) * size);
+        List<ActivityRecharge> activityRechargeList = activityRechargeService.queryActivityRechargePage(map);
+        Integer count = activityRechargeService.queryActivityRechargePageCount(map);
+        // 返回参数
+        PageInfo<ActivityRecharge> pager = new PageInfo<>(count.longValue(), (long) StringUtil.getPageCount(count, size), page.longValue(), size.longValue(),
+                activityRechargeList);
+        return ResultGenerator.genSuccessResult(pager);
+    }
+
+    @PostMapping
+    @ApiOperation(value = "添加数据", notes = "添加新的数据", httpMethod = "POST")
+    public Result<List<ActivityRecharge>> add(@RequestBody List<ActivityRecharge> activityRechargeList) {
+        MerchantStore merchantStore;
+        MerchantBaseInfo merchantBaseInfo;
+
+        if (activityRechargeList != null && !activityRechargeList.isEmpty()) {
+            MerchantStore queryMerchantStore = new MerchantStore();
+            queryMerchantStore.setMerchantCode(activityRechargeList.get(0).getMerchantCode());
+            merchantStore = merchantStoreService.queryMerchantStore(queryMerchantStore);
+
+            MerchantBaseInfo queryMerchantBaseInfo = new MerchantBaseInfo();
+            queryMerchantBaseInfo.setMerchantCode(activityRechargeList.get(0).getMerchantCode());
+            merchantBaseInfo = merchantBaseInfoService.queryMerchantBaseInfo(queryMerchantBaseInfo);
+
+            ActivityRecharge activity = new ActivityRecharge();
+            activity.setMerchantCode(merchantStore.getMerchantCode());
+            List<ActivityRecharge> activityList = activityRechargeService.queryActivityRechargeList(activity);
+            for (ActivityRecharge a : activityList) {
+                activityRechargeService.deleteActivityRecharge(a);
+            }
+
+            for (ActivityRecharge activityRecharge2 : activityRechargeList) {
+                activityRecharge2.setCreateDt(new Date());
+                activityRecharge2.setMerchantName(merchantBaseInfo.getAlias());
+                activityRecharge2.setStoreId(merchantStore.getStoreId());
+                activityRecharge2.setStoreName(merchantStore.getStoreName());
+                activityRechargeService.saveActivityRecharge(activityRecharge2);
+            }
+        }
+        return ResultGenerator.genSuccessResult(activityRechargeList);
+    }
+
+    @DeleteMapping("/{id}")
+    @ApiOperation(value = "删除数据", notes = "根据id删除数据", httpMethod = "DELETE")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "查询的id实例", paramType = "path", dataType = "Integer", required = true)})
+    public Result<?> delete(@PathVariable Integer id) {
+        ActivityRecharge activityRecharge = new ActivityRecharge();
+        activityRecharge.setId(id);
+        activityRechargeService.deleteActivityRecharge(activityRecharge);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @PutMapping
+    @ApiOperation(value = "更新数据", notes = "根据内容更新数据", httpMethod = "PUT")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "ActivityRecharge", value = "更新的ActivityRecharge实例", paramType = "body", dataType = "ActivityRecharge", required = true)})
+    public Result update(@RequestBody ActivityRecharge activityRecharge) {
+        activityRechargeService.updateActivityRecharge(activityRecharge);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @GetMapping("/{id}")
+    @ApiOperation(value = "获取单个值", notes = "查看单个项目的内容", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "查询的id", paramType = "path", required = true, dataType = "Integer", defaultValue = "0")})
+    public Result detail(@PathVariable Long id) {
+        ActivityRecharge activityRecharge = new ActivityRecharge();
+        activityRecharge.setId(id.intValue());
+        activityRecharge = activityRechargeService.queryActivityRecharge(activityRecharge);
+        return ResultGenerator.genSuccessResult(activityRecharge);
+    }
+
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/ActivityRecommendController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/ActivityRecommendController.java
new file mode 100644
index 0000000..31c13c8
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/ActivityRecommendController.java
@@ -0,0 +1,111 @@
+package cn.pluss.platform.controller;
+
+import cn.pluss.platform.activityRecommend.ActivityRecommendService;
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.constants.ProjectConstant;
+import cn.pluss.platform.entity.ActivityRecommend;
+import cn.pluss.platform.util.StringUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+@Slf4j
+@RestController
+@RequestMapping("/activityRecommend")
+@Transactional
+@Api(value = "ActivityRecommend控制类", tags = {"ActivityRecommend接口"})
+public class ActivityRecommendController {
+
+    @Resource
+    private ActivityRecommendService activityRecommendService;
+
+    @GetMapping
+    @ApiOperation(value = "获取全部", notes = "返回分页过后的数据", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "page", value = "查询页码", paramType = "query", dataType = "Integer", defaultValue = "0"),
+            @ApiImplicitParam(name = "size", value = "每页数据量", paramType = "query", dataType = "Integer", defaultValue = "0")
+    })
+    public Result<PageInfo<ActivityRecommend>> list(@RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
+        if (size == null || size == 0) {
+            size = ProjectConstant.PAGE_SIZE;
+        }
+        if (page == null || page == 0) {
+            page = 1;
+        }
+        Map<String, Object> map = new HashMap<String, Object>();
+        map.put("pageSize", size);
+        map.put("offset", (page - 1) * size);
+        List<ActivityRecommend> activityRecommendList = activityRecommendService.queryActivityRecommendPage(map);
+        Integer count = activityRecommendService.queryActivityRecommendPageCount(map);
+        //返回参数
+        PageInfo pager = new PageInfo<>(count.longValue(), (long) StringUtil.getPageCount(count, size), page.longValue(), size.longValue(), activityRecommendList);
+        return ResultGenerator.genSuccessResult(pager);
+    }
+
+    @PostMapping
+    @ApiOperation(value = "添加数据", notes = "添加新的数据", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "ActivityRecommend", value = "待添加的ActivityRecommend实例", paramType = "body", dataType = "ActivityRecommend", required = true)
+    })
+    public Result add(@RequestBody ActivityRecommend activityRecommend) {
+
+        ActivityRecommend activity = new ActivityRecommend();
+        activity.setMerchantCode(activityRecommend.getMerchantCode());
+//	    	activity.setStoreId(activityRecommend.getStoreId());
+        List<ActivityRecommend> activityList = activityRecommendService.queryActivityRecommendList(activity);
+        for (ActivityRecommend a : activityList) {
+            activityRecommendService.deleteActivityRecommend(a);
+        }
+
+        activityRecommendService.saveActivityRecommend(activityRecommend);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @DeleteMapping("/{id}")
+    @ApiOperation(value = "删除数据", notes = "根据id删除数据", httpMethod = "DELETE")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "查询的id实例", paramType = "path", dataType = "Integer", required = true)
+    })
+    public Result delete(@PathVariable Integer id) {
+        ActivityRecommend activityRecommend = new ActivityRecommend();
+        activityRecommend.setId(id);
+        activityRecommendService.deleteActivityRecommend(activityRecommend);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @PutMapping
+    @ApiOperation(value = "更新数据", notes = "根据内容更新数据", httpMethod = "PUT")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "ActivityRecommend", value = "更新的ActivityRecommend实例", paramType = "body", dataType = "ActivityRecommend", required = true)
+    })
+    public Result update(@RequestBody ActivityRecommend activityRecommend) {
+        activityRecommendService.updateActivityRecommend(activityRecommend);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @GetMapping("/{id}")
+    @ApiOperation(value = "获取单个值", notes = "查看单个项目的内容", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "查询的id", paramType = "path", required = true, dataType = "Integer", defaultValue = "0")
+    })
+    public Result detail(@PathVariable Long id) {
+        ActivityRecommend activityRecommend = new ActivityRecommend();
+        activityRecommend.setId(id.intValue());
+        activityRecommend = activityRecommendService.queryActivityRecommend(activityRecommend);
+        return ResultGenerator.genSuccessResult(activityRecommend);
+    }
+
+}
+
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/AgentInfoController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/AgentInfoController.java
new file mode 100644
index 0000000..16c991b
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/AgentInfoController.java
@@ -0,0 +1,98 @@
+package cn.pluss.platform.controller;
+
+import cn.pluss.platform.agent.AgentService;
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.dto.UserInfoDTO;
+import cn.pluss.platform.entity.MerchantRateNew;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.service.agent.AgentStaffService;
+import cn.pluss.platform.util.PageUtils;
+import cn.pluss.platform.vo.AgentInfo;
+import cn.pluss.platform.vo.AgentStaffVO;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+/**
+ * 超级服务商相关功能
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("agent")
+public class AgentInfoController {
+
+    @Setter(onMethod_ = {@Autowired})
+    private AgentService agentService;
+    @Setter(onMethod_ = {@Autowired})
+    private AgentStaffService agentStaffService;
+
+
+    @PostMapping("saveOrUpdateStaff")
+    public Result<?> saveOrUpdateStaff(@RequestBody @Valid UserInfoDTO userInfoDTO) {
+        agentStaffService.saveOrUpdateStaff(userInfoDTO);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @PostMapping("saveStaff")
+    public Result<?> saveStaff(@RequestBody @Valid UserInfoDTO userInfoDTO) {
+        agentStaffService.saveStaff(userInfoDTO);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @PostMapping("updateStaff")
+    public Result<?> updateStaff(@RequestBody @Valid UserInfoDTO userInfoDTO) {
+        agentStaffService.updateStaff(userInfoDTO);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @RequestMapping(value = "delStaff/{userId}", method = {RequestMethod.DELETE, RequestMethod.GET})
+    public Result<?> delStaff(@PathVariable String userId) {
+        agentStaffService.delStaff(userId);
+        return ResultGenerator.genSuccessResult("删除成功", null);
+    }
+
+    @GetMapping("staff/{userId}")
+    public Result<AgentStaffVO> getStaff(@PathVariable String userId) {
+        AgentStaffVO staff = agentStaffService.getStaff(userId);
+        return ResultGenerator.genSuccessResult(staff);
+    }
+
+    @GetMapping("staffPage")
+    public Result<PageInfo<AgentStaffVO>> staffPage(Page<AgentStaffVO> page,  UserInfoDTO userInfoDTO) {
+        if (userInfoDTO.getPId() == null) {
+            throw new MsgException("超级服务商id必传");
+        }
+
+        Page<AgentStaffVO> result = agentStaffService.staffPage(page, userInfoDTO);
+        return ResultGenerator.genSuccessResult(PageUtils.page(result));
+    }
+
+    @GetMapping("page")
+    public Result<Page<AgentInfo>> page(Page<AgentInfo> page, AgentInfo agentInfo, OrderItem orderItem) {
+        page = agentService.page(page, agentInfo, orderItem);
+        return ResultGenerator.genSuccessResult(page);
+    }
+
+    @PostMapping("save")
+    public Result<String> save(@RequestBody @Valid AgentInfo agentInfo) {
+        agentService.save(agentInfo);
+        return ResultGenerator.genSuccessResult("保存成功", "保存成功");
+    }
+
+    /**
+     * 修改商户费率的最小费率阈值
+     * @return
+     */
+    @GetMapping("minSettingRateNew")
+    public Result<MerchantRateNew> minSettingRateNew() {
+        MerchantRateNew minSettingRateNew = agentService.getMinSettingRateNew();
+        return ResultGenerator.genSuccessResult(minSettingRateNew);
+    }
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/AgreementController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/AgreementController.java
new file mode 100644
index 0000000..f4e4482
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/AgreementController.java
@@ -0,0 +1,101 @@
+package cn.pluss.platform.controller;
+
+import cn.pluss.platform.agreement.AgreementService;
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.constants.ProjectConstant;
+import cn.pluss.platform.entity.Agreement;
+import cn.pluss.platform.util.StringUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+@RestController
+@RequestMapping("/agreement")
+@Transactional
+@Api(value = "Agreement控制类", tags = {"Agreement接口"})
+public class AgreementController {
+
+    @Resource
+    private AgreementService agreementService;
+
+    @GetMapping
+    @ApiOperation(value = "获取全部", notes = "返回分页过后的数据", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "page", value = "查询页码", paramType = "query", dataType = "Integer", defaultValue = "0"),
+            @ApiImplicitParam(name = "size", value = "每页数据量", paramType = "query", dataType = "Integer", defaultValue = "0")
+    })
+    public Result<PageInfo<Agreement>> list(@RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
+        if (size == null || size == 0) {
+            size = ProjectConstant.PAGE_SIZE;
+        }
+        if (page == null || page == 0) {
+            page = 1;
+        }
+        Map<String, Object> map = new HashMap<String, Object>();
+        map.put("pageSize", size);
+        map.put("offset", (page - 1) * size);
+        List<Agreement> agreementList = agreementService.queryAgreementPage(map);
+        Integer count = agreementService.queryAgreementPageCount(map);
+        //返回参数
+        PageInfo pager = new PageInfo<Agreement>(count.longValue(), (long) StringUtil.getPageCount(count, size), page.longValue(), size.longValue(), agreementList);
+        return ResultGenerator.genSuccessResult(pager);
+    }
+
+    @PostMapping
+    @ApiOperation(value = "添加数据", notes = "添加新的数据", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "Agreement", value = "待添加的Agreement实例", paramType = "body", dataType = "Agreement", required = true)
+    })
+    public Result add(@RequestBody Agreement agreement) {
+        agreementService.saveAgreement(agreement);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @DeleteMapping("/{id}")
+    @ApiOperation(value = "删除数据", notes = "根据id删除数据", httpMethod = "DELETE")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "查询的id实例", paramType = "path", dataType = "Integer", required = true)
+    })
+    public Result delete(@PathVariable Integer id) {
+        Agreement agreement = new Agreement();
+        agreement.setId(id);
+        agreementService.deleteAgreement(agreement);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @PutMapping
+    @ApiOperation(value = "更新数据", notes = "根据内容更新数据", httpMethod = "PUT")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "Agreement", value = "更新的Agreement实例", paramType = "body", dataType = "Agreement", required = true)
+    })
+    public Result update(@RequestBody Agreement agreement) {
+        agreementService.updateAgreement(agreement);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @GetMapping("/getAgreementOne")
+    @ApiOperation(value = "获取单个值", notes = "查看单个项目的内容", httpMethod = "GET")
+    @ApiImplicitParam(name = "discern", value = "协议标识", paramType = "String", dataType = "discern", required = true)
+    public Result<Agreement> detail(String discern) {
+        Agreement agreement = new Agreement();
+        agreement.setDiscern(discern);
+        List<Agreement> queryAgreementList = agreementService.queryAgreementList(agreement);
+        if (queryAgreementList != null && queryAgreementList.size() > 0) {
+            agreement = queryAgreementList.get(0);
+        }
+        return ResultGenerator.genSuccessResult(agreement);
+    }
+
+}
+
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/AlipayController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/AlipayController.java
new file mode 100644
index 0000000..66e056b
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/AlipayController.java
@@ -0,0 +1,443 @@
+package cn.pluss.platform.controller;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.dto.*;
+import cn.pluss.platform.entity.MerchantBaseInfo;
+import cn.pluss.platform.entity.MerchantIncome;
+import cn.pluss.platform.entity.MerchantOrder;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantIncome.MerchantIncomeService;
+import cn.pluss.platform.merchantOrder.MerchantOrderService;
+import cn.pluss.platform.notice.NoticeService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.util.AliPayParam;
+import cn.pluss.platform.util.StringUtil;
+import com.alipay.api.AlipayApiException;
+import com.alipay.api.AlipayClient;
+import com.alipay.api.DefaultAlipayClient;
+import com.alipay.api.FileItem;
+import com.alipay.api.request.AlipayOpenAgentConfirmRequest;
+import com.alipay.api.request.AlipayOpenAgentCreateRequest;
+import com.alipay.api.request.AlipayOpenAgentFacetofaceSignRequest;
+import com.alipay.api.request.AlipayOpenAgentOrderQueryRequest;
+import com.alipay.api.response.AlipayOpenAgentConfirmResponse;
+import com.alipay.api.response.AlipayOpenAgentCreateResponse;
+import com.alipay.api.response.AlipayOpenAgentFacetofaceSignResponse;
+import com.alipay.api.response.AlipayOpenAgentOrderQueryResponse;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import order.OrderQueryVO;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @author yuchen
+ * 
+ * @Description 
+ */
+@Deprecated
+@RestController
+@RequestMapping("/alipay")
+@Transactional
+@Api(value = "支付宝控制类",tags={"支付宝接口"})
+public class AlipayController {
+	
+	private final static String APP_ID="2019092467786259";
+	
+	private final static String PRI="MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCN1NubOHroItIz7eLWWBDprPzToDr1cggn/V90ghPaoBWgmnZhD/CejX+KxHmQVQLEBVN6ehQgNSVGBj0hSHxkj1OCCU7Eu9qAIqRzkWY1RkZKoKOIcJbU+yL20XTs3kATgNm5jx8ejVQDsNqekS1bBrRX6xlU/mjMVFtKoZC/Vpv8yAmP6R9onkum4O0OgCWARKC40NuYVp9hPUgRpWJ/NIPSlO4j8zIPYFkjfsh84c8moVLZdhYDDbbEY3vnHutDa0A3d5f4MI4qXBZ6tW5wO5WG93U5E5jat73RUzBOc0zN+3U/Rsk+gq722ChLj4/ifp0NLqgjbKecs4wlM8A3AgMBAAECggEAQ1QjuAjU17QIA1zPTR9bUAKttqyesHukgY9XLBC/6g4KlkYdIjCV8j6LqE1iw/CHMpSwrziaqztvaVF23YDyhC5B3z4Z5Wyj6iYH2VDRq0KkBbNCTnfcMljRnUeLcRKEan3FXcAibrd6hZIEBjg2xrplDENvsBhhmXYGLGSMOTfoRFlc1DhvPdr3qxR9mljD2YcvIrxDVDPZ3P4wTcsIM6xZmXGrsFbI0sGxgm4a4fzMLUYxSvuMtc+auwasQ/393Le/kjdVBWr/hBJZbGIU5/NQN0EesOJD6dIFU07wDDuy4LYLVVjSN3EiynWfMJIrvLbnR1sMgKJ775wY61hIaQKBgQC/mFKwZdZvzsqnEMQmUfkUT5+v8BJvS4JApPpt+O2GMUAKoynk220U0rJW/QyEkTz6A/lR8ZStT6TyM14ulpOYDMJquZqSCoIHMrIdjhZRMqAVONUJHsYVvpLQLbJaDDEaCksnWE+77ULBstZaevkBgLmNsy6V4CxwLJKj0xMDEwKBgQC9giRaS4t2J5ZcNycuDEBhwPteSoFun/6bX4yPsZYdeB88NGs7j1oOk9MXrvQq69X0uXE8zv2DHrDvuoGI920m56bU/4wCuKoqpnLi0xFM1al0na12He6UmFKWa+kGBkH5p5BggPyaCFMwJI/qL3gZft56aWjliviwWSmI8pvOzQKBgHZw8d0+d1vTGJBC2x9dWX9m4a7f2GWY5kKUOoQ1eJCWbaKlz0Y9J6fRwJHqCQ0CxBFC16QClgi1zaA0hSqDx2YdrSpQ5u8VM+DDRDzlE4LKqw+zfG8Q6R+UGio7tZ/ZHZmdd2wxOclRGQ2pQr3Ye4qkSxEADfJ1DMOjqltAJualAoGALafl9C8RGVUuP2c2NDzVYfepV60hg7JeF7asWY4SOWVQOSPz1bSSoMJyb9lBj/mjYUMwCdNgdi91tzu6q3HYxS+4HMa4R4uPy5iwQv9Qwq8TFTpLqRJLAVe1RfIXgNEPIgOBoA5TTRTGXenhFi17hMDw/pLYp7yUb3/7pre0W90CgYAWb86ocBIpS8cKhZY2fcrHALzKh4cuxl68sNQcOxevt3tIak0KG+o/5/5l0uBW2qYSOJOl2u831VWuOWEJBk+h5brYCtTNIsa6lKdknhRP/NfAfWUiWEesPV5nfYKL85s8bf2x/gFv9Ah0S5K4cI+SCMVIzaQzQ2dN+cmlvM8rfQ==";
+	private final static String PUB="MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjdTbmzh66CLSM+3i1lgQ6az806A69XIIJ/1fdIIT2qAVoJp2YQ/wno1/isR5kFUCxAVTenoUIDUlRgY9IUh8ZI9TgglOxLvagCKkc5FmNUZGSqCjiHCW1Psi9tF07N5AE4DZuY8fHo1UA7DanpEtWwa0V+sZVP5ozFRbSqGQv1ab/MgJj+kfaJ5LpuDtDoAlgESguNDbmFafYT1IEaVifzSD0pTuI/MyD2BZI37IfOHPJqFS2XYWAw22xGN75x7rQ2tAN3eX+DCOKlwWerVucDuVhvd1OROY2re90VMwTnNMzft1P0bJPoKu9tgoS4+P4n6dDS6oI2ynnLOMJTPANwIDAQAB";
+	
+	@Resource
+	private UserAppService userAppService;
+	
+	@Resource
+	private MerchantBaseInfoService merchantBaseInfoService;
+	
+	@Resource
+	private MerchantOrderService merchantOrderService;
+	
+	@Resource
+	private NoticeService noticeService;
+	
+	@Resource
+	private MerchantIncomeService merchantIncomeService;
+	
+	
+	
+	@PostMapping
+	@ApiOperation(value = "开启代商户签约、创建应用事务",notes = "返回BatchNo",httpMethod = "POST")
+	public Result<?> get(@RequestBody AccountInfoDTO dto) throws AlipayApiException{
+		AlipayClient alipayClient = getAlipayClient();
+		AlipayOpenAgentCreateRequest request = new AlipayOpenAgentCreateRequest();
+		if(StringUtil.isEmpty(dto.getAccount())) {
+			return ResultGenerator.genFailResult("请输入支付宝账号");
+		}
+		if(StringUtil.isEmpty(dto.getContactName())) {
+			return ResultGenerator.genFailResult("请输入姓名");
+		}
+		
+		request.setBizContent("{" +
+		"\"account\":\""+dto.getAccount()+"\"," +
+		"\"contact_info\":{" +
+		"\"contact_name\":\""+dto.getContactName()+"\"," +
+		"\"contact_mobile\":\""+dto.getContactMobile()+"\"," +
+		"\"contact_email\":\""+dto.getContactEmail()+"\"" +
+		"    }," +"}");
+		AlipayOpenAgentCreateResponse response = alipayClient.execute(request);
+		if(response.isSuccess()){
+			if("10000".equals(response.getCode())) {
+				return ResultGenerator.genSuccessResult(response.getBatchNo());
+			}else {
+				return ResultGenerator.genFailResult("调用失败");
+			}
+		} else {
+			return ResultGenerator.genFailResult("调用失败");
+		}
+	}
+	
+	
+	@PostMapping("/facetofaceSign")
+	@ApiOperation(value = "代签约当面付产品",httpMethod = "POST")
+	public Result<String> facetofaceSign(@RequestBody BatchInfoDTO dto) throws AlipayApiException{
+		AlipayClient alipayClient = getAlipayClient();
+		FileItem BusinessLicensePic = new FileItem(dto.getBusinessLicensePic());
+		FileItem ShopSignBoardPic = new FileItem(dto.getShopSignBoardPic());
+		AlipayOpenAgentFacetofaceSignRequest request = new AlipayOpenAgentFacetofaceSignRequest();
+		request.setBatchNo(dto.getBatchNo());
+		request.setMccCode(dto.getMccCode());
+		request.setBusinessLicenseNo(dto.getBusinessLicenseNo());
+		request.setBusinessLicensePic(BusinessLicensePic);
+		request.setShopSignBoardPic(ShopSignBoardPic);
+		AlipayOpenAgentFacetofaceSignResponse response = alipayClient.execute(request);
+		if(response.isSuccess()){
+			if("10000".equals(response.getCode())) {
+				return ResultGenerator.genSuccessResult();
+			}else {
+				return ResultGenerator.genFailResult("调用失败");
+			}
+		} else {
+			return ResultGenerator.genFailResult("调用失败");
+		}
+	}
+	
+	@GetMapping("/agentConfirm")
+	@ApiOperation(value = "提交代商户签约、创建应用事务",httpMethod = "GET")
+   @ApiImplicitParam(name = "batchNo",value = "ISV代商户操作事务编号", paramType = "batchNo",dataType = "String",required=true)
+	public Result<String> agentConfirm(String batchNo) throws AlipayApiException{
+		AlipayClient alipayClient = getAlipayClient();
+		AlipayOpenAgentConfirmRequest request = new AlipayOpenAgentConfirmRequest();
+		request.setBizContent("{" +
+		"\"batch_no\":\""+batchNo+"\"" +
+		"  }");
+		AlipayOpenAgentConfirmResponse response = alipayClient.execute(request);
+		if(response.isSuccess()){
+			if("10000".equals(response.getCode())) {
+				return ResultGenerator.genSuccessResult();
+			}else {
+				return ResultGenerator.genFailResult("调用失败");
+			}
+		} else {
+			return ResultGenerator.genFailResult("调用失败");
+		}
+	}
+	
+	@GetMapping("/orderQuery")
+	@ApiOperation(value = "查询申请单状态",httpMethod = "GET")
+	public  Result<OrderQueryVO> orderQuery(String batchNo) throws AlipayApiException{
+		AlipayClient alipayClient = getAlipayClient();
+		AlipayOpenAgentOrderQueryRequest request = new AlipayOpenAgentOrderQueryRequest();
+		request.setBizContent("{" +
+		"\"batch_no\":\""+batchNo+"\"" +
+		"  }");
+		AlipayOpenAgentOrderQueryResponse response = alipayClient.execute(request);
+		if(response.isSuccess()){
+			if("10000".equals(response.getCode())) {
+				OrderQueryVO orderQueryVO=new OrderQueryVO();
+				orderQueryVO.setAgentAppId(response.getAgentAppId());
+				orderQueryVO.setConfirmUrl(response.getConfirmUrl());
+				orderQueryVO.setMerchantPid(response.getMerchantPid());
+				if("MERCHANT_INFO_HOLD".equals(response.getOrderStatus())) {
+					orderQueryVO.setOrderStatus("暂存");
+				}else if("MERCHANT_AUDITING".equals(response.getOrderStatus())) {
+					orderQueryVO.setOrderStatus("审核中");
+				}else if("MERCHANT_CONFIRM".equals(response.getOrderStatus())) {
+					orderQueryVO.setOrderStatus("待商户确认");
+				}else if("MERCHANT_CONFIRM_SUCCESS".equals(response.getOrderStatus())) {
+					orderQueryVO.setOrderStatus("商户确认成功");
+				}else if("MERCHANT_CONFIRM_TIME_OUT".equals(response.getOrderStatus())) {
+					orderQueryVO.setOrderStatus("商户超时未确认");
+				}else if("MERCHANT_APPLY_ORDER_CANCELED".equals(response.getOrderStatus())) {
+					orderQueryVO.setOrderStatus("审核失败或商户拒绝");
+				}
+				orderQueryVO.setRejectReason(response.getRejectReason());
+				return ResultGenerator.genSuccessResult(orderQueryVO);
+			}else {
+				return ResultGenerator.genFailResult("调用失败");
+			}
+		} else {
+			return ResultGenerator.genFailResult("调用失败");
+		}
+	}
+
+	@Deprecated
+	@PostMapping("/tradePay")
+	@ApiOperation(value = "统一收单交易支付接口",httpMethod = "POST")
+	public Result<String> tradePay(@RequestBody TradePayDTO dto) throws AlipayApiException{
+		throw new MsgException("接口暂不支持");
+//		if(StringUtil.isEmpty(dto.getUserId())) {
+//			return ResultGenerator.genFailResult("用户id不能为空");
+//		}
+//		UserApp userApp = getUserApp(dto.getUserId());
+//		if(StringUtil.isEmpty(userApp.getAppAuthToken())) {
+//			return ResultGenerator.genFailResult(ParametersUtil.domain+"/wap/aliPay/index?userId"+dto.getUserId());//跳转到商家授权H5页面（暂时缺失）
+//		}
+//		if(StringUtil.isEmpty(dto.getOutTradeNo())) {
+//			return ResultGenerator.genFailResult("商户订单号不能为空");
+//		}
+//		if(StringUtil.isEmpty(dto.getAuthCode())) {
+//			return ResultGenerator.genFailResult("支付授权码不能为空");
+//		}
+//		if(StringUtil.isEmpty(dto.getTotalAmount())) {
+//			return ResultGenerator.genFailResult("订单总额不能为空");
+//		}
+//		AlipayClient alipayClient = getAlipayClient();
+//		AlipayTradePayRequest request = new AlipayTradePayRequest();
+//		request.putOtherTextParam("app_auth_token", userApp.getAppAuthToken());
+//		request.setBizContent("{"+
+//		"\"out_trade_no\":\""+dto.getOutTradeNo()+"\"," +
+//		"\"scene\":\"bar_code\"," +
+//		"\"auth_code\":\""+dto.getAuthCode()+"\"," +
+//		"\"subject\":\""+dto.getSubject()+"\"," +
+//		"\"total_amount\":\""+dto.getTotalAmount()+"\"" +
+//		"  }");
+//		AlipayTradePayResponse response = alipayClient.execute(request);
+//		if(response.isSuccess()){
+//			if("10000".equals(response.getCode())) {
+//				return ResultGenerator.genSuccessResult(response.getBody());
+//			}else {
+//				return ResultGenerator.genFailResult("支付失败");
+//			}
+//		} else {
+//			return ResultGenerator.genFailResult("支付失败");
+//		}
+	}
+	
+	@PostMapping("/tradeRefund")
+	@ApiOperation(value = "统一收单交易退款接口",httpMethod = "POST")
+	public Result<String> tradeRefund(@RequestBody TradeRefundDTO dto) throws AlipayApiException{
+		throw new MsgException("暂不支持该接口");
+//		if(StringUtil.isEmpty(dto.getUserId())) {
+//			return ResultGenerator.genFailResult("用户id不能为空");
+//		}
+//		AlipayTradeRefundRequest request = new AlipayTradeRefundRequest();
+//		if(StringUtil.isEmpty(dto.getOutTradeNo())) {
+//			if(StringUtil.isEmpty(dto.getTradeNo())) {
+//				return ResultGenerator.genFailResult("支付宝交易号和商户订单号必须填一个");
+//			}else {
+//				request.setBizContent("{" +
+//						"\"trade_no\":\""+dto.getTradeNo()+"\"," +
+//						"\"refund_amount\":"+dto.getRefundAmount()+"" +
+//						"  }");
+//			}
+//		}else {
+//			if(StringUtil.isEmpty(dto.getTradeNo())) {
+//				request.setBizContent("{" +
+//						"\"out_trade_no\":\""+dto.getOutTradeNo()+"\"," +
+//						"\"refund_amount\":"+dto.getRefundAmount()+"" +
+//						"  }");
+//			}else {
+//				request.setBizContent("{" +
+//						"\"out_trade_no\":\""+dto.getOutTradeNo()+"\"," +
+//						"\"trade_no\":\""+dto.getTradeNo()+"\"," +
+//						"\"refund_amount\":"+dto.getRefundAmount()+"" +
+//						"  }");
+//			}
+//		}
+//		UserApp userApp = getUserApp(dto.getUserId());
+//		if(StringUtil.isEmpty(userApp.getAppAuthToken())) {
+//			 //跳转到商家授权H5页面（暂时缺失）
+//			return ResultGenerator.genFailResult(ParametersUtil.domain+"/wap/aliPay/index?userId="+dto.getUserId());
+//			}else {
+//				request.putOtherTextParam("app_auth_token", userApp.getAppAuthToken());
+//			}
+//		AlipayClient alipayClient = getAlipayClient();
+//		AlipayTradeRefundResponse response = alipayClient.execute(request);
+//		if(response.isSuccess()){
+//		return ResultGenerator.genSuccessResult("退款成功");
+//		} else {
+//			return ResultGenerator.genFailResult("退款失败");
+//		}
+	}
+	
+	@PostMapping("/tradeQuery")
+	@ApiOperation(value = "统一收单线下交易查询接口",httpMethod = "POST")
+	public Result<String>  tradeQuery(@RequestBody QueryOrderDTO queryOrderDTO) throws AlipayApiException{
+		throw new MsgException("暂不支持该接口");
+//		if(StringUtil.isEmpty(queryOrderDTO.getUserId())) {
+//			return ResultGenerator.genFailResult("用户userId不能为空");
+//		}
+//		if(StringUtil.isEmpty(queryOrderDTO.getOrderNumber())) {
+//			return ResultGenerator.genFailResult("商家订单号不能为空");
+//		}
+//		UserApp userApp = getUserApp(queryOrderDTO.getUserId());
+//		if(StringUtil.isEmpty(userApp.getAppAuthToken())) {
+//			return ResultGenerator.genFailResult(ParametersUtil.domain+"/wap/aliPay/index?userId="+queryOrderDTO.getUserId()); //跳转到商家授权H5页面（暂时缺失）
+//		}
+//		MerchantBaseInfo merchantBaseInfo=new MerchantBaseInfo();
+//		merchantBaseInfo.setMerchantCode(queryOrderDTO.getMerchantCode());
+//		List<MerchantBaseInfo> queryMerchantBaseInfoList = merchantBaseInfoService.queryMerchantBaseInfoList(merchantBaseInfo);
+//		if(queryMerchantBaseInfoList==null||queryMerchantBaseInfoList.size()==0) {
+//			return ResultGenerator.genFailResult("该商户不存在");
+//		}
+//		merchantBaseInfo=queryMerchantBaseInfoList.get(0);
+//		AlipayClient alipayClient = getAlipayClient();
+//		AlipayTradeQueryRequest request = new AlipayTradeQueryRequest();
+//		request.putOtherTextParam("app_auth_token", userApp.getAppAuthToken());
+//		request.setBizContent("{" +
+//		"\"out_trade_no\":\""+queryOrderDTO.getOrderNumber()+"\"" +
+//	"  }");
+//		AlipayTradeQueryResponse response = alipayClient.execute(request);
+//		if(response.isSuccess()){
+//			String tradeStatus = response.getTradeStatus();
+//			if("WAIT_BUYER_PAY".equals(tradeStatus)) {
+//				tradeStatus="交易创建，等待买家付款";
+//			return	ResultGenerator.genTransunKonwResult(tradeStatus);
+//			}else if("TRADE_CLOSED".equals(tradeStatus)) {
+//				tradeStatus="未付款交易超时关闭，或支付完成后全额退款";
+//			return	ResultGenerator.genFailResult(tradeStatus);
+//			}else if("TRADE_SUCCESS".equals(tradeStatus)) {
+//				tradeStatus="交易支付成功";
+//				Date sendPayDate = response.getSendPayDate();
+//				String tradeNo = response.getTradeNo();
+//				MerchantOrder order = queryOrderDTO.convertMerchantOrder();
+//				order.setTransDt(sendPayDate);
+//				merchantIncome(order, "1");
+//				saveMerchantOrderStatus(tradeNo,order, merchantBaseInfo);
+//				return ResultGenerator.genSuccessResult(tradeStatus);
+//			}else if("TRADE_FINISHED".equals(tradeStatus)) {
+//				tradeStatus="交易结束，不可退款";
+//				return ResultGenerator.genFailResult(tradeStatus);
+//			}
+//		} else {
+//			return ResultGenerator.genFailResult("查询失败");
+//		}
+//		return ResultGenerator.genFailResult("查询失败");
+	}
+	
+	private MerchantOrder saveMerchantOrderStatus(String outTradeNo,MerchantOrder merchantOrder, MerchantBaseInfo merchantBaseInfo) {
+		return null;
+//		String payTypeCode = merchantOrder.getPayTypeCode();//当前订单支付方式
+//		if("wechatPay".equalsIgnoreCase(payTypeCode)) {
+//			merchantOrder.setWeChatTransNo(outTradeNo);
+//		}else if("aliPay".equalsIgnoreCase(payTypeCode)) {
+//			merchantOrder.setAliPayTransNo(outTradeNo);
+//		}else if("leshuaPay0".equalsIgnoreCase(payTypeCode)||"leshuaPay1".equals(payTypeCode)) {
+//			merchantOrder.setLeshuaTransNo(outTradeNo);
+//		}
+//		merchantOrder.setStatus("1");
+//		merchantOrderService.updateById(merchantOrder);
+//		if (!StringUtil.isEmpty(merchantBaseInfo.getUserId())) {//更新上级推广员的交易金额
+//			UserApp userApp = new UserApp();
+//			userApp.setUserId(Long.parseLong(merchantBaseInfo.getUserId()));
+//			List<UserApp> queryUserAppList = userAppService.queryUserAppList(userApp);//查询当前商户的用户信息
+//			if (queryUserAppList != null && queryUserAppList.size()>0) {
+//				userApp = queryUserAppList.get(0);//当前商户的用户信息
+//				Long parentId = userApp.getParentId();//推荐人的userId
+//				UserApp userApp2 = new UserApp();
+//				userApp2.setUserId(parentId);
+//				if(StringUtil.isNotEmpty(parentId)) {
+//					userApp2=userAppService.queryUserApp(userApp2);
+//					Double tradeMoney = userApp2.getTradeMoney()==null?0d:userApp2.getTradeMoney();//当前推广员的交易额
+//					Double consumeFee = merchantOrder.getConsumeFee()==null?0d:merchantOrder.getConsumeFee();//这一笔订单的消费金额
+//					userApp2.setTradeMoney(StringUtil.bigDecimal(tradeMoney+consumeFee));
+//					double extendProfit = userApp2.getExtendProfit()==null?0d:userApp2.getExtendProfit();//当前推广员的推广分润
+//					double shareMoney = StringUtil.bigDecimal(Double.parseDouble(merchantOrder.getShareMoney()));
+//					extendProfit=extendProfit+shareMoney;
+//					userApp2.setExtendProfit(extendProfit);
+//					userAppService.updateUserApp(userApp2);
+//					if (shareMoney > 0.01) {
+//						// 生成分润通知
+//						Notice notice = new Notice(0, 6, userApp);
+//						notice.setConrtent("您有一笔" + merchantOrder.getShareMoney() + "元的商户分润");
+//						noticeService.saveNotice(notice);
+//						List<String> alias = new ArrayList<String>();
+//						alias.add(userApp.getUserId().toString());
+//						GeneralPushUtil.sendAllPlatByAlias(alias, "商户分润通知", "您有一笔" + merchantOrder.getShareMoney() + "元的商户分润", "0");
+////						JpushClientUtil.sendToRegistrationId2(alias, "商户分润通知", "商户分润通知","您有一笔" + merchantOrder.getShareMoney() + "元的商户分润",
+////								"0", DateUtils.currentYourDate("yyyy-MM-dd HH:mm:ss"));
+//					}
+//				}
+//			}
+//		}
+//		return merchantOrder;
+	}
+	
+	
+	
+	/**
+	 * 
+	 * merchantIncome:(添加收益记录). <br/> 
+	 * 
+	 * @author Administrator  
+	 * @since JDK 1.8
+	 */
+	private void merchantIncome(MerchantOrder merchantOrder,String payTypeCode){
+		MerchantIncome merchantIncome=new MerchantIncome();
+		if("1".equals(payTypeCode)) {
+			merchantIncome.setMerchantCode(merchantOrder.getMerchantCode());
+			merchantIncome.setMerchantName(merchantOrder.getMerchantName());
+			merchantIncome.setStoreId(merchantOrder.getStoreId());
+			merchantIncome.setStoreName(merchantOrder.getStoreName());
+			merchantIncome.setDealFee(merchantOrder.getConsumeFee());
+			merchantIncome.setIncomeFee(merchantOrder.getEnterFee());
+			merchantIncome.setPayTypeCode(payTypeCode);
+			merchantIncome.setPayTypeName("微信");
+			merchantIncome.setCreateTime(merchantOrder.getTransDt());
+			merchantIncomeService.saveMerchantIncome(merchantIncome);
+		}else if("0".equals(payTypeCode)) {
+			merchantIncome.setMerchantCode(merchantOrder.getMerchantCode());
+			merchantIncome.setMerchantName(merchantOrder.getMerchantName());
+			merchantIncome.setStoreId(merchantOrder.getStoreId());
+			merchantIncome.setStoreName(merchantOrder.getStoreName());
+			merchantIncome.setDealFee(merchantOrder.getConsumeFee());
+			merchantIncome.setIncomeFee(merchantOrder.getEnterFee());
+			merchantIncome.setPayTypeCode(payTypeCode);
+			merchantIncome.setPayTypeName("支付宝");
+			merchantIncome.setCreateTime(merchantOrder.getTransDt());
+			merchantIncomeService.saveMerchantIncome(merchantIncome);
+		}
+		
+	}
+	
+	public AlipayClient getAlipayClient() {
+		return new DefaultAlipayClient("https://openapi.alipay.com/gateway.do", AliPayParam.getAppId(),AliPayParam.getPri(),"json","UTF-8",AliPayParam.getPub(),"RSA2");
+	}
+	
+	/**
+	 * 
+	 * getUserApp:(获取userApp 并得到对应的token). <br/> 
+	 * 
+	 * @author Administrator 
+	 * @param userId
+	 * @return 
+	 * @since JDK 1.8
+	 */
+	public UserApp getUserApp(String userId) {
+		UserApp userApp=new UserApp();
+		userApp.setUserId(Long.valueOf(userId));
+		List<UserApp> queryUserAppList = userAppService.queryUserAppList(userApp);
+		if(queryUserAppList!=null&&queryUserAppList.size()>0) {
+			userApp = queryUserAppList.get(0);
+		}
+		return userApp;
+	}
+
+}
+
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/AliyunController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/AliyunController.java
new file mode 100644
index 0000000..29dc7b0
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/AliyunController.java
@@ -0,0 +1,65 @@
+package cn.pluss.platform.controller;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.common.AliyunService;
+import cn.pluss.platform.config.OssConfig;
+import cn.pluss.platform.config.StsConfig;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.userApp.UserAppService;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.aliyun.oss.common.auth.ServiceSignature;
+import com.aliyuncs.auth.sts.AssumeRoleResponse;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+
+
+/**
+ * 阿里云相关接口，获取stsToken等
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("aliyun")
+@Slf4j
+public class AliyunController {
+
+    private final UserAppService userAppService;
+
+    private final AliyunService aliyunService;
+
+    private final OssConfig ossConfig;
+
+    private final StsConfig stsConfig;
+
+    /**
+     * 获取上传图片签名
+     * @param content
+     * @return
+     */
+    @GetMapping("/signature")
+    public Result<String> getSignature(String content) throws UnsupportedEncodingException {
+        String toSign = URLDecoder.decode(content, "UTF-8");
+        String s = ServiceSignature.create().computeSignature(ossConfig.getKeysecret(), toSign);
+
+        String result = "OSS " + ossConfig.getKeyid() + ":" + s;
+        return ResultGenerator.genSuccessResult(result);
+    }
+
+    @GetMapping("/stsToken")
+    public Object getStsToken() {
+        JSONObject result = new JSONObject();
+        UserApp userApp = userAppService.queryUserAppByToken();
+        AssumeRoleResponse.Credentials credentials = aliyunService.stsToken(userApp.getUserId() + "");
+        JSONObject json = (JSONObject) JSON.toJSON(credentials);
+        result.putAll(json);
+        result.put("statusCode", 200);
+        return result;
+    }
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/AppMenuController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/AppMenuController.java
new file mode 100644
index 0000000..12adf7d
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/AppMenuController.java
@@ -0,0 +1,62 @@
+package cn.pluss.platform.controller;
+
+import cn.hutool.core.comparator.CompareUtil;
+import cn.pluss.platform.AppMenuService;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.entity.AppMenu;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author DJH
+ */
+@RequestMapping("appMenu")
+@RestController
+public class AppMenuController extends BaseModelController<AppMenuService, AppMenu> {
+
+    @GetMapping("homePageMenu")
+    public Result<List<Map<String, Object>>> getHomePageMenu(HttpServletRequest request) {
+        List<Map<String, Object>> homeMenu = baseService.getHomeMenu(request);
+        return ResultGenerator.genSuccessResult(homeMenu);
+    }
+
+    @GetMapping("spreadPageMenu")
+    public Result<List<Map<String, Object>>> getPromoterPageMenu(HttpServletRequest request) {
+        List<Map<String, Object>> homeMenu = baseService.getSpreadPageMenu(request);
+        return ResultGenerator.genSuccessResult(homeMenu);
+    }
+
+    @GetMapping("menuIsUpdated")
+    public Result<?> getInfoByName(String name, String cacheTime) throws ParseException {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd ahh:mm:ss");
+
+        Date mCacheTime = null;
+        if (StringUtils.isNotEmpty(cacheTime) ) {
+            if (((cacheTime.contains("上午")) || (cacheTime.contains("下午")))) {
+                mCacheTime = sdf2.parse(cacheTime);
+            } else {
+                mCacheTime = sdf.parse(cacheTime);
+            }
+        }
+
+        LambdaQueryWrapper<AppMenu> qWrapper = Wrappers.lambdaQuery();
+        qWrapper.eq(AppMenu::getName, name);
+        final AppMenu one = baseService.getOne(qWrapper);
+
+        return ResultGenerator.genSuccessResult(CompareUtil.compare(one.getUpdateTime(), mCacheTime) > 0);
+    }
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/BankCardController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/BankCardController.java
new file mode 100644
index 0000000..477b5cd
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/BankCardController.java
@@ -0,0 +1,42 @@
+package cn.pluss.platform.controller;
+
+import cn.pluss.platform.BankCardService;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.entity.BankCard;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.userApp.UserAppService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 银行卡信息 前端控制器
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-10-16
+ */
+@RestController
+@RequestMapping("/bankCard")
+public class BankCardController extends BaseModelController<BankCardService, BankCard> {
+
+    @Autowired
+    private BankCardService bankCardService;
+
+    @Autowired
+    private UserAppService uaService;
+
+    @GetMapping("/accBankCardList")
+    public Result<List<Map<String, Object>>> bankCardList() {
+        UserApp userApp = uaService.queryUserAppByToken();
+        List<Map<String, Object>> res = bankCardService.getAccBankCardList(userApp.getUserId() + "");
+        return ResultGenerator.genSuccessResult(res);
+    }
+}
\ No newline at end of file
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/BannerController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/BannerController.java
new file mode 100644
index 0000000..8683856
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/BannerController.java
@@ -0,0 +1,73 @@
+package cn.pluss.platform.controller;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.banner.BannerService;
+import cn.pluss.platform.entity.Banner;
+import cn.pluss.platform.util.StringUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @author DJH
+ */
+@RestController
+@RequestMapping("/banner")
+@Api(value = "Banner控制类", tags = {"Banner接口"})
+public class BannerController {
+
+    @Resource
+    private BannerService bannerService;
+
+    @PostMapping
+    @ApiOperation(value = "添加数据", notes = "添加新的数据", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "Banner", value = "待添加的Banner实例", paramType = "body", dataType = "Banner", required = true)})
+    public Result<Object> add(@RequestBody Banner banner) {
+        bannerService.saveBanner(banner);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @PostMapping("/queryBannerList")
+    @ApiOperation(tags = {"页面-首页"}, value = "查询所有的轮播图", notes = "查询所有的轮播图", httpMethod = "POST")
+    public Result<List<Banner>> queryBannerList(@RequestBody Banner banner) {
+        if (banner == null) {
+            return ResultGenerator.genFailResult("参数错误！");
+        }
+        if (banner.getType() == null || StringUtil.isEmpty(banner.getType())) {
+            return ResultGenerator.genFailResult("查询参数错误！");
+        }
+
+        Banner queryBanner = new Banner();
+        queryBanner.setType(banner.getType());
+        List<Banner> banners = bannerService.queryBannerList(queryBanner);
+        return ResultGenerator.genSuccessResult(banners);
+    }
+
+    @DeleteMapping("/{id}")
+    @ApiOperation(value = "删除数据", notes = "根据id删除数据", httpMethod = "DELETE")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "查询的id实例", paramType = "path", dataType = "Integer", required = true)})
+    public Result<Object> delete(@PathVariable Integer id) {
+        Banner banner = new Banner();
+        banner.setId(id);
+        bannerService.deleteBanner(banner);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @PutMapping
+    @ApiOperation(value = "更新数据", notes = "根据内容更新数据", httpMethod = "PUT")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "Banner", value = "更新的Banner实例", paramType = "body", dataType = "Banner", required = true)})
+    public Result<Object> update(@RequestBody Banner banner) {
+        bannerService.updateBanner(banner);
+        return ResultGenerator.genSuccessResult();
+    }
+
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/BestNewActivityController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/BestNewActivityController.java
new file mode 100644
index 0000000..eca62b0
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/BestNewActivityController.java
@@ -0,0 +1,92 @@
+package cn.pluss.platform.controller;
+
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.bestNewActivity.BestNewActivityService;
+import cn.pluss.platform.entity.BestNewActivity;
+import cn.pluss.platform.util.StringUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * @author DJH
+ */
+@RestController
+@RequestMapping("/bestNewActivity")
+@Transactional
+@Api(value = "BestNewActivity控制类", tags = {"BestNewActivity接口"})
+public class BestNewActivityController {
+
+    @Resource
+    private BestNewActivityService bestNewActivityService;
+
+    @GetMapping
+    @ApiOperation(tags = {"页面-最新活动"}, value = "获取全部", notes = "返回分页过后的数据", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "page", value = "查询页码", paramType = "query", dataType = "Integer", defaultValue = "0"),
+            @ApiImplicitParam(name = "size", value = "每页数据量", paramType = "query", dataType = "Integer", defaultValue = "0")
+    })
+    public Result<PageInfo<BestNewActivity>> list(@RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size, @RequestParam(defaultValue = "3") String type) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageSize", size);
+        map.put("offset", (page - 1) * size);
+        map.put("type", type);
+        List<BestNewActivity> bestNewActivityList = bestNewActivityService.queryBestNewActivityPage(map);
+        Integer count = bestNewActivityService.queryBestNewActivityPageCount(map);
+        //返回参数
+        PageInfo pager = new PageInfo<>(count.longValue(), (long) StringUtil.getPageCount(count, size), page.longValue(), size.longValue(), bestNewActivityList);
+        return ResultGenerator.genSuccessResult(pager);
+    }
+
+    @PostMapping
+    @ApiOperation(value = "添加数据", notes = "添加新的数据", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "BestNewActivity", value = "待添加的BestNewActivity实例", paramType = "body", dataType = "BestNewActivity", required = true)
+    })
+    public Result add(@RequestBody BestNewActivity bestNewActivity) {
+        bestNewActivityService.saveBestNewActivity(bestNewActivity);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @DeleteMapping("/{id}")
+    @ApiOperation(value = "删除数据", notes = "根据id删除数据", httpMethod = "DELETE")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "查询的id实例", paramType = "path", dataType = "Integer", required = true)
+    })
+    public Result delete(@PathVariable Integer id) {
+        BestNewActivity bestNewActivity = new BestNewActivity();
+        bestNewActivity.setId(id);
+        bestNewActivityService.deleteBestNewActivity(bestNewActivity);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @PutMapping
+    @ApiOperation(value = "更新数据", notes = "根据内容更新数据", httpMethod = "PUT")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "BestNewActivity", value = "更新的BestNewActivity实例", paramType = "body", dataType = "BestNewActivity", required = true)
+    })
+    public Result update(@RequestBody BestNewActivity bestNewActivity) {
+        bestNewActivityService.updateBestNewActivity(bestNewActivity);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @PostMapping("/detail")
+    @ApiOperation(value = "获取单个值", notes = "传id", httpMethod = "POST")
+    public Result detail(@RequestBody BestNewActivity bestNewActivity) {
+        bestNewActivity = bestNewActivityService.queryBestNewActivity(bestNewActivity);
+        return ResultGenerator.genSuccessResult(bestNewActivity);
+    }
+
+}
+
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/CashAccountController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/CashAccountController.java
new file mode 100644
index 0000000..03aafd6
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/CashAccountController.java
@@ -0,0 +1,51 @@
+package cn.pluss.platform.controller;
+
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.cashAccount.CashAccountService;
+import cn.pluss.platform.entity.CashAccount;
+import cn.pluss.platform.exception.MsgException;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author bzg
+ * @since 2021-07-23
+ */
+@RestController
+@RequestMapping("/cashAccount")
+public class CashAccountController extends BaseModelController<CashAccountService, CashAccount> {
+
+    @ApiOperation(tags = {"提现账户-保存"}, value = "保存提现账号", notes = "保存提现账号", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "cashAccount", value = "保存的cashAccount实例", paramType = "body", dataType = "CashAccount", required = true) })
+    @Override
+    public Result<String> save(@Valid @RequestBody CashAccount entity) {
+        try {
+            baseService.apiSave(entity);
+            return ResultGenerator.genSuccessResult("保存成功", null);
+        }catch (RuntimeException e){
+            MsgException.throwException(e.getMessage());
+        }
+
+        return null;
+    }
+
+    @GetMapping(value = "get/{userId}")
+    @ApiOperation(tags = {"获取提现-查询"}, value = "查询提现账号", notes = "查询提现账号", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "cashAccount", value = "查询cashAccount实例", paramType = "params", required = true) })
+    public Result<CashAccount> get(@PathVariable("userId") Integer userId) {
+        return super.get(new CashAccount().setUserId(userId));
+    }
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/CashController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/CashController.java
new file mode 100644
index 0000000..316db89
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/CashController.java
@@ -0,0 +1,94 @@
+package cn.pluss.platform.controller;
+
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.cash.CashService;
+import cn.pluss.platform.entity.Cash;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.entity.WxBankCode;
+import cn.pluss.platform.util.*;
+import cn.pluss.platform.wxBankCode.WxBankCodeService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import org.springframework.web.bind.annotation.*;
+
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequiredArgsConstructor
+@Slf4j
+@RequestMapping("/cash")
+@Api(value = "Cash控制类", tags = { "Cash接口" })
+public class CashController {
+
+  private final CashService cashService;
+
+  private final WxBankCodeService wxBankCodeService;
+
+  @GetMapping({ "", "/v3" })
+  @ApiOperation(tags = { "页面-提现记录" }, value = "获取分页提现记录", notes = "返回分页过后的数据", httpMethod = "GET")
+  @ApiImplicitParams({
+      @ApiImplicitParam(name = "page", value = "查询页码", paramType = "query", dataType = "Integer", defaultValue = "0"),
+      @ApiImplicitParam(name = "size", value = "每页数据量", paramType = "query", dataType = "Integer", defaultValue = "0"),
+      @ApiImplicitParam(name = "type", value = "提现类型  0粉丝分润   1推广分润      99其他 ", paramType = "type", dataType = "Integer", required = true),
+      @ApiImplicitParam(name = "status", value = "提现状态  0 申请提现  1 提现成功  2 提现失败", paramType = "status", dataType = "Integer"),
+      @ApiImplicitParam(name = "merchantCode", value = "商家Code", paramType = "merchantCode", dataType = "String", required = true), })
+  public Result<PageInfo<Cash>> list(@RequestParam(defaultValue = "1") Integer page,
+      @RequestParam(defaultValue = "10") Integer size, Integer type, Integer status, String merchantCode,
+      String userId) {
+
+    Map<String, Object> map = new HashMap<>();
+    map.put("pageSize", size);
+    map.put("offset", (page - 1) * size);
+
+    if (StringUtil.isEmpty(userId)) {
+      return ResultGenerator.genFailResult("无用户id");
+    }
+
+    // map.put("type", type);
+    map.put("userId", userId);
+    List<Cash> cashList = cashService.queryCashPage(map);
+    Integer count = cashService.queryCashPageCount(map);
+    // 返回参数
+    PageInfo<Cash> pageInfo = new PageInfo<>(count.longValue(), (long) StringUtil.getPageCount(count, size),
+        page.longValue(), size.longValue(), cashList);
+    return ResultGenerator.genSuccessResult(pageInfo);
+  }
+
+  @PostMapping
+  @ApiOperation(tags = { "页面-提现" }, value = "提现接口", notes = "添加新的提现记录", httpMethod = "POST")
+  @ApiImplicitParams({
+      @ApiImplicitParam(name = "Cash", value = "待添加的Cash实例", paramType = "body", dataType = "Cash", required = true) })
+  public Result<Object> add(@RequestBody Cash cash) {
+    cashService.apiSaveCash(cash);
+    return ResultGenerator.genSuccessResult();
+  }
+
+  @PostMapping("/v2")
+  public Result<Object> addV2(@RequestBody Cash cash) {
+    cashService.apiSaveCashV2(cash);
+    return ResultGenerator.genSuccessResult();
+  }
+
+  @GetMapping("/v3/preDetail")
+  public Result<Object> detail(Cash cash) {
+    Cash result = cashService.cashDetail(cash);
+    return ResultGenerator.genSuccessResult(result);
+  }
+
+  @PostMapping("/v3")
+  public Result<Object> addV3(@RequestBody Cash cash) {
+    cashService.apiSaveCashV3(cash);
+    return ResultGenerator.genSuccessResult();
+  }
+
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/DeviceController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/DeviceController.java
new file mode 100644
index 0000000..e70d3e7
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/DeviceController.java
@@ -0,0 +1,104 @@
+package cn.pluss.platform.controller;
+
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.constants.ProjectConstant;
+import cn.pluss.platform.device.DeviceService;
+import cn.pluss.platform.entity.Device;
+import cn.pluss.platform.util.StringUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+@RestController
+@RequestMapping("/device")
+@Transactional
+@Api(value = "Device控制类", tags = {"Device接口"})
+public class DeviceController {
+
+    @Resource
+    private DeviceService deviceService;
+
+    @GetMapping
+    @ApiOperation(value = "获取全部", notes = "返回分页过后的数据", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "page", value = "查询页码", paramType = "query", dataType = "Integer", defaultValue = "0"),
+            @ApiImplicitParam(name = "size", value = "每页数据量", paramType = "query", dataType = "Integer", defaultValue = "0")
+    })
+    public Result<PageInfo<Device>> list(@RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
+        if (size == null || size == 0) {
+            size = ProjectConstant.PAGE_SIZE;
+        }
+        if (page == null || page == 0) {
+            page = 1;
+        }
+        Map<String, Object> map = new HashMap<String, Object>();
+        map.put("pageSize", size);
+        map.put("offset", (page - 1) * size);
+        map.put("status", "1");
+        List<Device> deviceList = deviceService.queryDevicePage(map);
+        Integer count = deviceService.queryDevicePageCount(map);
+        //返回参数
+        PageInfo pager = new PageInfo<>(count.longValue(), (long) StringUtil.getPageCount(count, size), page.longValue(), size.longValue(), deviceList);
+        return ResultGenerator.genSuccessResult(pager);
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "添加数据", notes = "添加新的数据", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "Device", value = "待添加的Device实例", paramType = "body", dataType = "Device", required = true)
+    })
+    public Result add(@RequestBody Device device) {
+        device.setCreateDt(new Date());
+        deviceService.saveDevice(device);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @DeleteMapping("/{id}")
+    @ApiOperation(value = "删除数据", notes = "根据id删除数据", httpMethod = "DELETE")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "查询的id实例", paramType = "path", dataType = "Integer", required = true)
+    })
+    public Result delete(@PathVariable Integer id) {
+        Device device = new Device();
+        device.setId(id);
+        deviceService.deleteDevice(device);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @PutMapping
+    @ApiOperation(value = "更新数据", notes = "根据内容更新数据", httpMethod = "PUT")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "Device", value = "更新的Device实例", paramType = "body", dataType = "Device", required = true)
+    })
+    public Result update(@RequestBody Device device) {
+        deviceService.updateDevice(device);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @GetMapping("/{id}")
+    @ApiOperation(value = "获取单个值", notes = "查看单个项目的内容", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "查询的id", paramType = "path", required = true, dataType = "Integer", defaultValue = "0")
+    })
+    public Result detail(@PathVariable Long id) {
+        Device device = new Device();
+        device.setId(id.intValue());
+        device = deviceService.queryDevice(device);
+        return ResultGenerator.genSuccessResult(device);
+    }
+
+}
+
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/DeviceGoodsController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/DeviceGoodsController.java
new file mode 100644
index 0000000..45bae09
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/DeviceGoodsController.java
@@ -0,0 +1,64 @@
+package cn.pluss.platform.controller;
+
+
+import cn.pluss.platform.DeviceGoodsService;
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.device.DeviceGoodTagService;
+import cn.pluss.platform.entity.DeviceGoodTag;
+import cn.pluss.platform.entity.DeviceGoods;
+import cn.pluss.platform.vo.DeviceGoodsVO;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 设备商品展示表 前端控制器
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-11-11
+ */
+@RestController
+@RequestMapping("/deviceGoods")
+public class DeviceGoodsController extends BaseModelController<DeviceGoodsService, DeviceGoods> {
+
+    @Autowired
+    private DeviceGoodTagService goodTagService;
+
+    @GetMapping("/goodList")
+    public Result<PageInfo<DeviceGoodsVO>> goodList(@RequestParam(name = "page", defaultValue = "1") Integer page
+            , @RequestParam(name = "size", defaultValue = "10") Integer size, DeviceGoods condition) {
+        PageInfo<DeviceGoodsVO> pageData = baseService.goodList(page, size, condition);
+        return ResultGenerator.genSuccessResult(pageData);
+    }
+
+    @GetMapping("/goodListSimple")
+    public Result<PageInfo<DeviceGoodsVO>> goodListSimple(@RequestParam(name = "page", defaultValue = "1") Integer page
+            , @RequestParam(name = "size", defaultValue = "10") Integer size, DeviceGoods condition) {
+        PageInfo<DeviceGoodsVO> pageData = baseService.goodListSimple(page, size, condition);
+        return ResultGenerator.genSuccessResult(pageData);
+    }
+
+    @GetMapping("/deviceDetail/{code}")
+    public Result<DeviceGoods> deviceDetail(@PathVariable("code") String code) {
+        LambdaQueryWrapper<DeviceGoods> qWrapper = Wrappers.lambdaQuery();
+        qWrapper.eq(DeviceGoods::getCode, code);
+        DeviceGoods entity = baseService.getOne(qWrapper);
+        return ResultGenerator.genSuccessResult("获取成功", entity);
+    }
+
+    @GetMapping("/tagList")
+    public Result<List<DeviceGoodTag>> tagList() {
+        LambdaQueryWrapper<DeviceGoodTag> qWrapper = Wrappers.lambdaQuery();
+        qWrapper.orderByAsc(DeviceGoodTag::getSort);
+        List<DeviceGoodTag> result = goodTagService.list(qWrapper.last("limit 20"));
+        return ResultGenerator.genSuccessResult("数据获取成功", result);
+    }
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/DeviceMerchantBuyController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/DeviceMerchantBuyController.java
new file mode 100644
index 0000000..612167b
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/DeviceMerchantBuyController.java
@@ -0,0 +1,270 @@
+package cn.pluss.platform.controller;
+
+import cn.jiguang.common.utils.StringUtils;
+import cn.pluss.platform.ali.AliService;
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.constants.ProjectConstant;
+import cn.pluss.platform.device.DeviceOrderInfoService;
+import cn.pluss.platform.deviceDetail.DeviceDetailService;
+import cn.pluss.platform.deviceMerchantBuy.DeviceMerchantBuyService;
+import cn.pluss.platform.dto.DeviceMerchantBuyDTO;
+import cn.pluss.platform.entity.DeviceMerchantBuy;
+import cn.pluss.platform.entity.DeviceOrderInfo;
+import cn.pluss.platform.entity.MerchantChannelStatus;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.util.StringUtil;
+import cn.pluss.platform.vo.DeviceMerchantBuyVO;
+import cn.pluss.platform.wechat.WechatService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.Setter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+
+/**
+ * @author DJH
+ */
+@RestController
+@RequestMapping("/deviceMerchantBuy")
+@Api(value = "DeviceMerchantBuy控制类", tags = {"DeviceMerchantBuy接口"})
+public class DeviceMerchantBuyController {
+
+    @Setter(onMethod_ = {@Autowired})
+    private DeviceMerchantBuyService deviceMerchantBuyService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private AliService aliService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private WechatService wechatService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private HttpServletRequest request;
+
+    @Setter(onMethod_ = {@Autowired})
+    private UserAppService userAppService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantBaseInfoService mbiService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantChannelStatusService mcsService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private DeviceDetailService deviceDetailService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private DeviceOrderInfoService doiService;
+
+    @Autowired
+    private DeviceMerchantBuyService dmbService;
+
+    @GetMapping
+    @ApiOperation(value = "获取全部", notes = "返回分页过后的数据", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "page", value = "查询页码", paramType = "query", dataType = "Integer", defaultValue = "0"),
+            @ApiImplicitParam(name = "size", value = "每页数据量", paramType = "query", dataType = "Integer", defaultValue = "0")
+    })
+    public Result<PageInfo<DeviceMerchantBuy>> list(@RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
+        if (size == null || size == 0) {
+            size = ProjectConstant.PAGE_SIZE;
+        }
+        if (page == null || page == 0) {
+            page = 1;
+        }
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageSize", size);
+        map.put("offset", (page - 1) * size);
+        List<DeviceMerchantBuy> deviceMerchantBuyList = deviceMerchantBuyService.queryDeviceMerchantBuyPage(map);
+        Integer count = deviceMerchantBuyService.queryDeviceMerchantBuyPageCount(map);
+        //返回参数
+        PageInfo<DeviceMerchantBuy> pager = new PageInfo<>(count.longValue(), (long) StringUtil.getPageCount(count, size), page.longValue(), size.longValue(), deviceMerchantBuyList);
+        return ResultGenerator.genSuccessResult(pager);
+    }
+
+    @PostMapping
+    @ApiOperation(value = "添加数据", notes = "添加新的数据", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "DeviceMerchantBuy", value = "待添加的DeviceMerchantBuy实例", paramType = "body", dataType = "DeviceMerchantBuy", required = true)
+    })
+    public Result<?> add(@RequestBody DeviceMerchantBuy deviceMerchantBuy) {
+        deviceMerchantBuyService.saveDeviceMerchantBuy(deviceMerchantBuy);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @DeleteMapping("/{id}")
+    @ApiOperation(value = "删除数据", notes = "根据id删除数据", httpMethod = "DELETE")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "查询的id实例", paramType = "path", dataType = "Integer", required = true)
+    })
+    public Result<?> delete(@PathVariable Integer id) {
+        DeviceMerchantBuy deviceMerchantBuy = new DeviceMerchantBuy();
+        deviceMerchantBuy.setId(id);
+        deviceMerchantBuyService.deleteDeviceMerchantBuy(deviceMerchantBuy);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @PutMapping
+    @ApiOperation(value = "更新数据", notes = "根据内容更新数据", httpMethod = "PUT")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "DeviceMerchantBuy", value = "更新的DeviceMerchantBuy实例", paramType = "body", dataType = "DeviceMerchantBuy", required = true)
+    })
+    public Result<?> update(@RequestBody DeviceMerchantBuy deviceMerchantBuy) {
+        deviceMerchantBuyService.updateDeviceMerchantBuy(deviceMerchantBuy);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @GetMapping("/{id}")
+    @ApiOperation(value = "获取单个值", notes = "查看单个项目的内容", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "查询的id", paramType = "path", required = true, dataType = "Integer", defaultValue = "0")
+    })
+    public Result<?> detail(@PathVariable Long id) {
+        DeviceMerchantBuy deviceMerchantBuy = new DeviceMerchantBuy();
+        deviceMerchantBuy.setId(id.intValue());
+        deviceMerchantBuy = deviceMerchantBuyService.queryDeviceMerchantBuy(deviceMerchantBuy);
+        return ResultGenerator.genSuccessResult(deviceMerchantBuy);
+    }
+
+    @PostMapping("/buyDevice")
+    @ApiOperation(value = "购买设备生成订单", notes = "购买设备生成订单", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "deviceMerchantBuyDTO", value = "订单信息", paramType = "DeviceMerchantBuyDTO", required = true, dataType = "DeviceMerchantBuyDTO")
+    })
+    public Result<?> buyDevice(@RequestBody DeviceMerchantBuyDTO deviceMerchantBuyDTO) {
+        String orderNo = StringUtil.genRandomNum(3) + StringUtil.getBillno() + StringUtil.genRandomNum(3);
+        Map<String, String> map = deviceMerchantBuyDTO.convert(orderNo);
+        if ("aliPay".equals(deviceMerchantBuyDTO.getPayCode())) {
+            return aliService.appPayParam(map, deviceMerchantBuyDTO);
+        } else if ("wechatPay".equals(deviceMerchantBuyDTO.getPayCode())) {
+            return wechatService.appPayParam(request, map, deviceMerchantBuyDTO);
+        } else {
+            return ResultGenerator.genFailResult("请选择正确的支付方式");
+        }
+    }
+
+    @PostMapping("/v2/buyDevice")
+    @ApiOperation(value = "购买设备生成订单", notes = "购买设备生成订单", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "deviceMerchantBuyDTO", value = "订单信息", paramType = "DeviceMerchantBuyDTO", required = true, dataType = "DeviceMerchantBuyDTO")
+    })
+    public Result<?> buyDeviceV2(@RequestBody DeviceMerchantBuyDTO deviceMerchantBuyDTO) {
+        if (deviceMerchantBuyDTO.getCode() == null) {
+            throw new MsgException("缺少设备code");
+        }
+
+        if (Objects.equals(deviceMerchantBuyDTO.getQuantity(), 0)) {
+            throw new MsgException("数量不能为0");
+        }
+
+        UserApp userApp = userAppService.queryUserAppByToken();
+        if (deviceMerchantBuyDTO.getCode().startsWith("MP_NEW")) {
+            if (StringUtils.isEmpty(userApp.getMerchantCode())) {
+                throw new MsgException("非商户不允许购买新商户礼包");
+            } else {
+                MerchantChannelStatus mcs = mcsService.getValidData(userApp.getMerchantCode());
+                if (!MerchantChannelStatus.isAudited(mcs)) {
+                    throw new MsgException("非商户不允许购买新商户礼包");
+                }
+
+                if (!Objects.equals(deviceMerchantBuyDTO.getQuantity(), 1)) {
+                    throw new MsgException("新商户礼包只能下单一个");
+                }
+
+                QueryWrapper<DeviceOrderInfo> qWrapper = new QueryWrapper<DeviceOrderInfo>()
+                        .eq("userId", userApp.getUserId())
+                        .eq("code", "MP_NEW");
+                List<DeviceOrderInfo> data = doiService.list(qWrapper);
+                for (DeviceOrderInfo datum : data) {
+                    QueryWrapper<DeviceMerchantBuy> qWrapper2 = new QueryWrapper<>();
+                    qWrapper2.eq("orderNo", datum.getOrderNo());
+                    DeviceMerchantBuy one = dmbService.getOne(qWrapper2);
+                    if (one != null && "1".equals(one.getStatus())) {
+                        throw new MsgException("新商户礼包只能下单一次");
+                    }
+                }
+
+
+            }
+        }
+
+        // List<DeviceDetailVO> deviceDetailsList = deviceDetailService.listByCode(Collections.singletonList(deviceMerchantBuyDTO.getCode()));
+        // DeviceDetailVO devDetail = deviceDetailsList.get(0);
+        // Long leftStock = devDetail.getTotalCount() - devDetail.getTotalSold();
+        // BigDecimal leftGroup = leftStock.divideToIntegralValue(new BigDecimal(devDetail.get("groupSize").toString()));
+//        if (leftGroup.compareTo(BigDecimal.ZERO) < 0) {
+//            throw new MsgException("暂无库存");
+//        }
+
+        String orderNo = StringUtil.genRandomNum(3) + StringUtil.getBillno() + StringUtil.genRandomNum(3);
+        Map<String, String> map = deviceMerchantBuyDTO.convert(orderNo);
+        if ("aliPay".equals(deviceMerchantBuyDTO.getPayCode())) {
+            return aliService.appPayParamV2(map, deviceMerchantBuyDTO);
+        } else if ("wechatPay".equals(deviceMerchantBuyDTO.getPayCode())) {
+            return wechatService.appPayParamV2(request, map, deviceMerchantBuyDTO);
+        } else {
+            return ResultGenerator.genFailResult("请选择正确的支付方式");
+        }
+    }
+
+    @PostMapping("/deviceRefund")
+    @ApiOperation(value = "设备订单退款", notes = "设备订单退款", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "orderNo", value = "订单号", paramType = "query", dataType = "orderNo"),
+    })
+    public Result<?> deviceRefund(String orderNo) {
+        DeviceMerchantBuy deviceMerchantBuy = new DeviceMerchantBuy();
+        deviceMerchantBuy.setOrderNo(orderNo);
+        deviceMerchantBuy = deviceMerchantBuyService.queryDeviceMerchantBuy(deviceMerchantBuy);
+        String payCode = deviceMerchantBuy.getPayCode();
+        if ("aliPay".equals(payCode)) {//支付宝
+            return aliService.appRefund(deviceMerchantBuy);
+        } else if ("wechatPay".equals(payCode)) {//微信
+            return wechatService.appRefund(deviceMerchantBuy);
+        }
+        return ResultGenerator.genFailResult("退款失败");
+    }
+
+
+    @GetMapping("/deviceOrderShow")
+    @ApiOperation(value = "订单信息回显", notes = "订单信息回显", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "page", value = "查询页码", paramType = "query", dataType = "Integer", defaultValue = "1"),
+            @ApiImplicitParam(name = "size", value = "每页数据量", paramType = "query", dataType = "Integer", defaultValue = "10")
+    })
+    public Result<?> deviceOrderShow(@RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
+        try {
+            UserApp userApp = userAppService.queryUserAppByToken();
+            Map<String, Object> map = new HashMap<String, Object>(16);
+            map.put("userId", userApp.getUserId());
+            map.put("pageSize", size);
+            map.put("offset", (page - 1) * size);
+            map.put("status", "1");
+            List<DeviceMerchantBuyVO> deviceOrderShowPage = deviceMerchantBuyService.deviceOrderShowPage(map);
+            Integer count = deviceMerchantBuyService.deviceOrderShowPageCount(map);
+            PageInfo pageInfo = new PageInfo<>(count.longValue(), (long) StringUtil.getPageCount(count, size), page.longValue(), size.longValue(), deviceOrderShowPage);
+            return ResultGenerator.genSuccessResult(pageInfo);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResultGenerator.genFailResult("系统繁忙，请稍后再试");
+        }
+    }
+
+}
+
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/DeviceMerchantBuyDetailController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/DeviceMerchantBuyDetailController.java
new file mode 100644
index 0000000..b904cd2
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/DeviceMerchantBuyDetailController.java
@@ -0,0 +1,98 @@
+package cn.pluss.platform.controller;
+
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.constants.ProjectConstant;
+import cn.pluss.platform.deviceMerchantBuyDetail.DeviceMerchantBuyDetailService;
+import cn.pluss.platform.entity.DeviceMerchantBuyDetail;
+import cn.pluss.platform.util.StringUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+@RestController
+@RequestMapping("/deviceMerchantBuyDetail")
+@Api(value = "DeviceMerchantBuyDetail控制类", tags = {"DeviceMerchantBuyDetail接口"})
+public class DeviceMerchantBuyDetailController {
+
+    @Resource
+    private DeviceMerchantBuyDetailService deviceMerchantBuyDetailService;
+
+    @GetMapping
+    @ApiOperation(value = "获取全部", notes = "返回分页过后的数据", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "page", value = "查询页码", paramType = "query", dataType = "Integer", defaultValue = "0"),
+            @ApiImplicitParam(name = "size", value = "每页数据量", paramType = "query", dataType = "Integer", defaultValue = "0")
+    })
+    public Result<PageInfo<DeviceMerchantBuyDetail>> list(@RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
+        if (size == null || size == 0) {
+            size = ProjectConstant.PAGE_SIZE;
+        }
+        if (page == null || page == 0) {
+            page = 1;
+        }
+        Map<String, Object> map = new HashMap<String, Object>();
+        map.put("pageSize", size);
+        map.put("offset", (page - 1) * size);
+        List<DeviceMerchantBuyDetail> deviceMerchantBuyDetailList = deviceMerchantBuyDetailService.queryDeviceMerchantBuyDetailPage(map);
+        Integer count = deviceMerchantBuyDetailService.queryDeviceMerchantBuyDetailPageCount(map);
+        //返回参数
+        PageInfo pager = new PageInfo<DeviceMerchantBuyDetail>(count.longValue(), (long) StringUtil.getPageCount(count, size), page.longValue(), size.longValue(), deviceMerchantBuyDetailList);
+        return ResultGenerator.genSuccessResult(pager);
+    }
+
+    @PostMapping
+    @ApiOperation(value = "添加数据", notes = "添加新的数据", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "DeviceMerchantBuyDetail", value = "待添加的DeviceMerchantBuyDetail实例", paramType = "body", dataType = "DeviceMerchantBuyDetail", required = true)
+    })
+    public Result add(@RequestBody DeviceMerchantBuyDetail deviceMerchantBuyDetail) {
+        deviceMerchantBuyDetailService.saveDeviceMerchantBuyDetail(deviceMerchantBuyDetail);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @DeleteMapping("/{id}")
+    @ApiOperation(value = "删除数据", notes = "根据id删除数据", httpMethod = "DELETE")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "查询的id实例", paramType = "path", dataType = "Integer", required = true)
+    })
+    public Result delete(@PathVariable Integer id) {
+        DeviceMerchantBuyDetail deviceMerchantBuyDetail = new DeviceMerchantBuyDetail();
+        deviceMerchantBuyDetail.setId(id);
+        deviceMerchantBuyDetailService.deleteDeviceMerchantBuyDetail(deviceMerchantBuyDetail);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @PutMapping
+    @ApiOperation(value = "更新数据", notes = "根据内容更新数据", httpMethod = "PUT")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "DeviceMerchantBuyDetail", value = "更新的DeviceMerchantBuyDetail实例", paramType = "body", dataType = "DeviceMerchantBuyDetail", required = true)
+    })
+    public Result update(@RequestBody DeviceMerchantBuyDetail deviceMerchantBuyDetail) {
+        deviceMerchantBuyDetailService.updateDeviceMerchantBuyDetail(deviceMerchantBuyDetail);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @GetMapping("/{id}")
+    @ApiOperation(value = "获取单个值", notes = "查看单个项目的内容", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "查询的id", paramType = "path", required = true, dataType = "Integer", defaultValue = "0")
+    })
+    public Result detail(@PathVariable Long id) {
+        DeviceMerchantBuyDetail deviceMerchantBuyDetail = new DeviceMerchantBuyDetail();
+        deviceMerchantBuyDetail.setId(id.intValue());
+        deviceMerchantBuyDetail = deviceMerchantBuyDetailService.queryDeviceMerchantBuyDetail(deviceMerchantBuyDetail);
+        return ResultGenerator.genSuccessResult(deviceMerchantBuyDetail);
+    }
+
+}
+
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/DeviceSignUnbindController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/DeviceSignUnbindController.java
new file mode 100644
index 0000000..d2b4ba0
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/DeviceSignUnbindController.java
@@ -0,0 +1,106 @@
+package cn.pluss.platform.controller;
+
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.constants.ProjectConstant;
+import cn.pluss.platform.deviceSignUnbind.DeviceSignUnbindService;
+import cn.pluss.platform.entity.DeviceSignUnbind;
+import cn.pluss.platform.util.StringUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+@RestController
+@RequestMapping("/deviceSignUnbind")
+@Api(value = "DeviceSignUnbind控制类", tags = {"DeviceSignUnbind接口"})
+public class DeviceSignUnbindController {
+
+    @Resource
+    private DeviceSignUnbindService deviceSignUnbindService;
+
+    @GetMapping
+    @ApiOperation(value = "获取全部", notes = "返回分页过后的数据", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "page", value = "查询页码", paramType = "query", dataType = "Integer", defaultValue = "0"),
+            @ApiImplicitParam(name = "size", value = "每页数据量", paramType = "query", dataType = "Integer", defaultValue = "0")
+    })
+    public Result<PageInfo<DeviceSignUnbind>> list(@RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
+        if (size == null || size == 0) {
+            size = ProjectConstant.PAGE_SIZE;
+        }
+        if (page == null || page == 0) {
+            page = 1;
+        }
+        Map<String, Object> map = new HashMap<String, Object>();
+        map.put("pageSize", size);
+        map.put("offset", (page - 1) * size);
+        List<DeviceSignUnbind> deviceSignUnbindList = deviceSignUnbindService.queryDeviceSignUnbindPage(map);
+        Integer count = deviceSignUnbindService.queryDeviceSignUnbindPageCount(map);
+        //返回参数
+        PageInfo pager = new PageInfo<>(count.longValue(), (long) StringUtil.getPageCount(count, size), page.longValue(), size.longValue(), deviceSignUnbindList);
+        return ResultGenerator.genSuccessResult(pager);
+    }
+
+    @PostMapping
+    @ApiOperation(value = "添加数据", notes = "添加新的数据", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "DeviceSignUnbind", value = "待添加的DeviceSignUnbind实例", paramType = "body", dataType = "DeviceSignUnbind", required = true)
+    })
+    public Result add(@RequestBody DeviceSignUnbind deviceSignUnbind) {
+        deviceSignUnbindService.save(deviceSignUnbind);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @DeleteMapping("/{id}")
+    @ApiOperation(value = "删除数据", notes = "根据id删除数据", httpMethod = "DELETE")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "查询的id实例", paramType = "path", dataType = "Integer", required = true)
+    })
+    public Result delete(@PathVariable Integer id) {
+        deviceSignUnbindService.removeById(id);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @PutMapping
+    @ApiOperation(value = "更新数据", notes = "根据内容更新数据", httpMethod = "PUT")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "DeviceSignUnbind", value = "更新的DeviceSignUnbind实例", paramType = "body", dataType = "DeviceSignUnbind", required = true)
+    })
+    public Result update(@RequestBody DeviceSignUnbind deviceSignUnbind) {
+        deviceSignUnbindService.updateById(deviceSignUnbind);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @GetMapping("/{id}")
+    @ApiOperation(value = "获取单个值", notes = "查看单个项目的内容", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "查询的id", paramType = "path", required = true, dataType = "Integer", defaultValue = "0")
+    })
+    public Result detail(@PathVariable Long id) {
+        DeviceSignUnbind deviceSignUnbind = new DeviceSignUnbind();
+        deviceSignUnbind.setId(id.intValue());
+        deviceSignUnbind = deviceSignUnbindService.queryDeviceSignUnbind(deviceSignUnbind);
+        return ResultGenerator.genSuccessResult(deviceSignUnbind);
+    }
+
+    @GetMapping(value = "/applyDeviceSignUnbind")
+    @ApiOperation(value = "设备激活/解绑申请", notes = "设备激活/解绑申请", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "orderNo", value = "订单号", paramType = "orderNo", required = true, dataType = "orderNo"),
+            @ApiImplicitParam(name = "soleCode", value = "唯一编码", paramType = "soleCode", required = true, dataType = "soleCode"),
+            @ApiImplicitParam(name = "sn", value = "sn码", paramType = "sn", required = true, dataType = "sn"),
+    })
+    public Result applyDeviceSignUnbind(@RequestParam(value = "orderNo") String orderNo, @RequestParam(value = "soleCode") String soleCode, @RequestParam(value = "sn") String sn) {
+        return deviceSignUnbindService.applyDeviceSignUnbind(orderNo, soleCode, sn);
+    }
+}
+
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/FansConsumReturnController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/FansConsumReturnController.java
new file mode 100644
index 0000000..810e584
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/FansConsumReturnController.java
@@ -0,0 +1,196 @@
+package cn.pluss.platform.controller;
+
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.cash.CashService;
+import cn.pluss.platform.constants.ProjectConstant;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.fans.FansService;
+import cn.pluss.platform.fansConsumReturn.FansConsumReturnService;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantOrder.MerchantOrderService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.util.DateUtils;
+import cn.pluss.platform.util.StringUtil;
+import cn.pluss.platform.vo.FansSumRewardsInfoVO;
+import cn.pluss.platform.vo.PageFansConsumReturnVO;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.text.SimpleDateFormat;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/fansConsumReturn")
+@Transactional
+@Api(value = "FansConsumReturn控制类", tags = { "FansConsumReturn接口" })
+public class FansConsumReturnController {
+
+	@Resource
+	private FansConsumReturnService fansConsumReturnService;
+	@Resource
+	private FansService fansService;
+
+	@Autowired
+	private UserAppService uaService;
+
+	@Resource
+	private CashService cashService;
+	
+	@Resource
+	private MerchantBaseInfoService merchantBaseInfoService;
+	@Resource
+	private MerchantOrderService merchantOrderService;
+
+	@GetMapping
+	@ApiOperation(tags = {"页面-粉丝_粉丝消费"}, value = "获取全部", notes = "返回分页过后的数据", httpMethod = "GET")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "page", value = "查询页码", paramType = "query", dataType = "Integer", defaultValue = "0"),
+			@ApiImplicitParam(name = "size", value = "每页数据量", paramType = "query", dataType = "Integer", defaultValue = "0"),
+			@ApiImplicitParam(name = "merchantCode", value = "商家Code", paramType = "query", dataType = "String", required = true), })
+	public Result<PageFansConsumReturnVO> list(@RequestParam(defaultValue = "1") Integer page,
+			@RequestParam(defaultValue = "10") Integer size, String merchantCode,String startTime ,String endTime) {
+		UserApp userApp = uaService.queryUserAppByToken();
+		merchantCode = userApp.getMerchantCode();
+
+		PageFansConsumReturnVO pageVO = new PageFansConsumReturnVO();
+		if (size == null || size == 0) {
+			size = ProjectConstant.PAGE_SIZE;
+		}
+		if (page == null || page == 0) {
+			page = 1;
+		}
+		
+		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm");
+		Map<String, Object> map = new HashMap<String, Object>();
+		map.put("pageSize", size);
+		map.put("offset", (page - 1) * size);
+		map.put("lastMerchantCode", merchantCode);
+		try {
+			if(StringUtil.isNotEmpty(startTime)) {
+				map.put("startTime", sdf.parse(startTime));
+			}
+			if(StringUtil.isNotEmpty(endTime)) {
+				map.put("endTime", sdf.parse(endTime));
+			}
+			
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		Double fansConsumMonyNowDayCount=fansService.queryFansSumConsumMoney(map);//消费金额
+		if(fansConsumMonyNowDayCount==null) {
+			fansConsumMonyNowDayCount=0d;
+		}
+		Double fansReturnMoneyNowDayCount=fansService.queryFansSumShareMoney(map);//奖励金额
+		if(fansReturnMoneyNowDayCount==null) {
+			fansReturnMoneyNowDayCount=0d;
+		}
+		
+		List<Fans> fansConsumReturnList = fansService.queryFansPage(map);
+		for (Fans fans : fansConsumReturnList) {
+			MerchantOrder merchantOrder=new MerchantOrder();
+			merchantOrder.setOrderNumber(fans.getOrderNumber());
+			List<MerchantOrder> merchantOrderList=merchantOrderService.list(new QueryWrapper<>(merchantOrder));
+			if(merchantOrderList!=null&&merchantOrderList.size()>0) {
+				MerchantBaseInfo merchantBaseInfo=new MerchantBaseInfo();
+				merchantBaseInfo.setMerchantCode(merchantOrderList.get(0).getMerchantCode());
+				merchantBaseInfo=merchantBaseInfoService.queryMerchantBaseInfo(merchantBaseInfo);
+				if(null!=merchantBaseInfo&&StringUtil.isNotEmpty(merchantBaseInfo.getAlias())) {
+					fans.setAlias(merchantBaseInfo.getAlias());
+				}
+			}
+			if(!StringUtil.isEmpty(fans.getNickName())) {
+				try {
+					fans.setNickName(URLDecoder.decode(fans.getNickName(), "UTF-8"));
+					fans.setNickName(URLDecoder.decode(fans.getNickName(), "UTF-8"));
+				} catch (UnsupportedEncodingException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+			}
+			
+		}
+		Integer count = fansService.queryFansPageCount(map);
+		// 返回参数
+		PageInfo<Fans> pager = new PageInfo<>(count.longValue(), (long) StringUtil.getPageCount(count,size), page.longValue(), size.longValue(), fansConsumReturnList);
+		pageVO.setPageInfo(pager);
+//		FansInfoCountVO fansInfoCountVO = fansConsumReturnService.sumFansConsumReturnInfo(merchantCode);
+//		if (fansInfoCountVO != null) {
+		pageVO.setFansConsumMonyNowDayCount(StringUtil.bigDecimal(fansConsumMonyNowDayCount));
+		pageVO.setFansReturnMoneyNowDayCount(StringUtil.bigDecimal(fansReturnMoneyNowDayCount));
+//		}
+		return ResultGenerator.genSuccessResult(pageVO);
+	}
+	
+
+	@PostMapping
+	@ApiOperation(value = "添加数据", notes = "添加新的数据", httpMethod = "POST")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "FansConsumReturn", value = "待添加的FansConsumReturn实例", paramType = "body", dataType = "FansConsumReturn", required = true) })
+	public Result add(@RequestBody FansConsumReturn fansConsumReturn) {
+		fansConsumReturnService.saveFansConsumReturn(fansConsumReturn);
+		return ResultGenerator.genSuccessResult();
+	}
+
+	@PutMapping
+	@ApiOperation(value = "更新数据", notes = "根据内容更新数据", httpMethod = "PUT")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "FansConsumReturn", value = "更新的FansConsumReturn实例", paramType = "body", dataType = "FansConsumReturn", required = true) })
+	public Result update(@RequestBody FansConsumReturn fansConsumReturn) {
+		fansConsumReturnService.updateFansConsumReturn(fansConsumReturn);
+		return ResultGenerator.genSuccessResult();
+	}
+
+	@GetMapping("/{id}")
+	@ApiOperation(value = "获取单个值", notes = "查看单个项目的内容", httpMethod = "GET")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "id", value = "查询的id", paramType = "path", required = true, dataType = "Integer", defaultValue = "0") })
+	public Result detail(@PathVariable Long id) {
+		FansConsumReturn fansConsumReturn = new FansConsumReturn();
+		fansConsumReturn.setId(id.intValue());
+		fansConsumReturn = fansConsumReturnService.queryFansConsumReturn(fansConsumReturn);
+		return ResultGenerator.genSuccessResult(fansConsumReturn);
+	}
+
+	@GetMapping("/rewards")
+	@ApiOperation(tags = {"页面-粉丝_粉丝消费", "页面-粉丝_粉丝奖励"}, value = "获取粉丝奖励数据", httpMethod = "GET")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "merchantCode", value = "商家Code", paramType = "merchantCode", dataType = "String", required = true), })
+	public Result<FansSumRewardsInfoVO> listRewards(String merchantCode) {
+		UserApp tokenUa = uaService.queryUserAppByToken();
+		merchantCode = tokenUa.getMerchantCode();
+		Map<String, Object> map= new HashMap<>();
+		map.put("merchantCode", merchantCode);
+		FansSumRewardsInfoVO fVO = new FansSumRewardsInfoVO();
+		Double sumFansAllowCashMoney = fansConsumReturnService.sumFansAllowCashMoney(map);//可提现总金额
+		Double sumSuccessCash = cashService.sumFansSuccessCash(map);//已经被提现的金额
+		Double allowCashMoney = StringUtil.bigDecimal(sumFansAllowCashMoney - sumSuccessCash);//可提现金额
+		Double sumAreadlyCash = cashService.sumFansAlreadyCash(map);//已经提现金额
+//		Double noCashMoney = fansConsumReturnService.sumFansNotAllowCashMoney(map);//不可提现金额
+		Double sumAllShareMoney = fansConsumReturnService.sumAllShareMoney(map);//累计分润
+		map.put("startTime", DateUtils.getDayBegin());
+		map.put("endTime", DateUtils.getDayEnd());
+		Double sumNowDayShareMoney = fansConsumReturnService.sumNowDayShareMoney(map);// 今日分润
+		Double noCashMoney=sumNowDayShareMoney;
+		fVO.setAllowCashMoney(allowCashMoney);
+		fVO.setNoCashMoney(noCashMoney);
+		fVO.setSumAllShareMoney(sumAllShareMoney);
+		fVO.setSumAreadlyCash(sumAreadlyCash);
+		fVO.setSumNowDayShareMoney(sumNowDayShareMoney);
+		return ResultGenerator.genSuccessResult(fVO);
+	}
+
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/FansController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/FansController.java
new file mode 100644
index 0000000..ec1a8b9
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/FansController.java
@@ -0,0 +1,161 @@
+package cn.pluss.platform.controller;
+
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.constants.ProjectConstant;
+import cn.pluss.platform.entity.Fans;
+import cn.pluss.platform.entity.MerchantBaseInfo;
+import cn.pluss.platform.entity.MerchantOrder;
+import cn.pluss.platform.fans.FansService;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantOrder.MerchantOrderService;
+import cn.pluss.platform.util.StringUtil;
+import cn.pluss.platform.vo.PageFansVO;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/fans")
+@Transactional
+@Api(value = "Fans控制类", tags = { "Fans接口" })
+public class FansController {
+
+	@Resource
+	private FansService fansService;
+	
+	@Resource
+	private MerchantBaseInfoService merchantBaseInfoService;
+	@Resource
+	private MerchantOrderService merchantOrderService;
+	
+
+	@GetMapping
+	@ApiOperation(tags = {"页面-粉丝_粉丝"}, value = "获取全部", notes = "返回分页过后的数据", httpMethod = "GET")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "page", value = "查询页码", paramType = "query", dataType = "Integer", defaultValue = "0"),
+			@ApiImplicitParam(name = "size", value = "每页数据量", paramType = "query", dataType = "Integer", defaultValue = "0"),
+			@ApiImplicitParam(name = "merchantCode", value = "商家Code", paramType = "merchantCode", dataType = "String", required = true), })
+	public Result<PageFansVO> list(@RequestParam(defaultValue = "1") Integer page,
+			@RequestParam(defaultValue = "10") Integer size, String merchantCode,String startTime ,String endTime) {
+		PageFansVO pageVO = new PageFansVO();
+		if (size == null || size == 0) {
+			size = ProjectConstant.PAGE_SIZE;
+		}
+		if (page == null || page == 0) {
+			page = 1;
+		}
+		
+		
+		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm");
+		Map<String, Object> map = new HashMap<String, Object>();
+		map.put("pageSize", size);
+		map.put("merchantCode", merchantCode);
+		map.put("offset", (page - 1) * size);
+		try {
+			if(StringUtil.isNotEmpty(startTime)) {
+				map.put("startTime", sdf.parse(startTime));
+			}
+			if(StringUtil.isNotEmpty(endTime)) {
+				map.put("endTime", sdf.parse(endTime));
+			}
+		
+		} catch (ParseException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		
+		
+		
+		List<Fans> fansList = fansService.queryFansPage(map);
+		for (Fans fans : fansList) {
+			MerchantOrder merchantOrder=new MerchantOrder();
+			merchantOrder.setOrderNumber(fans.getOrderNumber());
+			List<MerchantOrder> merchantOrderList=merchantOrderService.list(new QueryWrapper<>(merchantOrder));
+			if(merchantOrderList!=null&&merchantOrderList.size()>0) {
+				MerchantBaseInfo merchantBaseInfo=new MerchantBaseInfo();
+				merchantBaseInfo.setMerchantCode(merchantOrderList.get(0).getMerchantCode());
+				merchantBaseInfo=merchantBaseInfoService.queryMerchantBaseInfo(merchantBaseInfo);
+				if(null!=merchantBaseInfo&&StringUtil.isNotEmpty(merchantBaseInfo.getAlias())) {
+					fans.setAlias(merchantBaseInfo.getAlias());
+				}
+			}
+			
+			
+			if(!StringUtil.isEmpty(fans.getNickName())) {
+				try {
+					fans.setNickName(URLDecoder.decode(fans.getNickName(), "UTF-8"));
+					fans.setNickName(URLDecoder.decode(fans.getNickName(), "UTF-8"));
+				} catch (UnsupportedEncodingException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+			}
+
+			Fans.updateOrderTypeDesc(fans);
+		}
+		Integer count = fansService.queryFansPageCount(map);
+		// 返回参数
+		PageInfo<Fans> pager = new PageInfo<>(count.longValue(), (long) StringUtil.getPageCount(count,size), page.longValue(), size.longValue(), fansList);
+		pageVO.setPageInfo(pager);
+		pageVO.setFansCount(count);
+		Double fansDealMoney = fansService.sumConsumMoneyByMerchantCode(map);
+		pageVO.setFansDealMoney(fansDealMoney);
+		return ResultGenerator.genSuccessResult(pageVO);
+	}
+
+	@PostMapping
+	@ApiOperation(value = "添加数据", notes = "添加新的数据", httpMethod = "POST")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "Fans", value = "待添加的Fans实例", paramType = "body", dataType = "Fans", required = true) })
+	public Result add(@RequestBody Fans fans) {
+		fansService.saveFans(fans);
+		return ResultGenerator.genSuccessResult();
+	}
+
+	@DeleteMapping("/{id}")
+	@ApiOperation(value = "删除数据", notes = "根据id删除数据", httpMethod = "DELETE")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "id", value = "查询的id实例", paramType = "path", dataType = "Integer", required = true) })
+	public Result delete(@PathVariable Integer id) {
+		Fans fans = new Fans();
+		fans.setId(id);
+		fansService.deleteFans(fans);
+		return ResultGenerator.genSuccessResult();
+	}
+
+	@PutMapping
+	@ApiOperation(value = "更新数据", notes = "根据内容更新数据", httpMethod = "PUT")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "Fans", value = "更新的Fans实例", paramType = "body", dataType = "Fans", required = true) })
+	public Result update(@RequestBody Fans fans) {
+		fansService.updateFans(fans);
+		return ResultGenerator.genSuccessResult();
+	}
+
+	@GetMapping("/{id}")
+	@ApiOperation(value = "获取单个值", notes = "查看单个项目的内容", httpMethod = "GET")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "id", value = "查询的id", paramType = "path", required = true, dataType = "Integer", defaultValue = "0") })
+	public Result detail(@PathVariable Long id) {
+		Fans fans = new Fans();
+		fans.setId(id.intValue());
+		fans = fansService.queryFans(fans);
+		return ResultGenerator.genSuccessResult(fans);
+	}
+
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/HelpVideoController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/HelpVideoController.java
new file mode 100644
index 0000000..94405c4
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/HelpVideoController.java
@@ -0,0 +1,99 @@
+package cn.pluss.platform.controller;
+
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.constants.ProjectConstant;
+import cn.pluss.platform.entity.HelpVideo;
+import cn.pluss.platform.helpVideo.HelpVideoService;
+import cn.pluss.platform.util.StringUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+@RestController
+@RequestMapping("/helpVideo")
+@Transactional
+@Api(value = "HelpVideo控制类",tags={"HelpVideo接口"})
+public class HelpVideoController{
+
+    @Resource
+    private HelpVideoService helpVideoService;
+
+    @GetMapping
+    @ApiOperation(value = "获取全部",notes = "返回分页过后的数据",httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "page",value = "查询页码", paramType = "query",dataType = "Integer",defaultValue = "0"),
+            @ApiImplicitParam(name = "size",value = "每页数据量", paramType = "query",dataType = "Integer",defaultValue = "0")
+    })
+    public Result<PageInfo<HelpVideo>> list(@RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
+        if(size==null||size==0) {
+            size=ProjectConstant.PAGE_SIZE;
+        }
+        if(page==null||page==0) {
+            page=1;
+        }
+        Map<String,Object> map= new HashMap<>();
+        map.put("pageSize",size);
+        map.put("offset", (page-1)*size);
+        List<HelpVideo> helpVideoList = helpVideoService.queryHelpVideoPage(map);
+        Integer count= helpVideoService.queryHelpVideoPageCount(map);
+        //返回参数
+        PageInfo<HelpVideo> pager=new PageInfo<>(count.longValue(), (long) StringUtil.getPageCount(count,size), page.longValue(), size.longValue(), helpVideoList);
+        return ResultGenerator.genSuccessResult(pager);
+    }
+
+    @PostMapping
+    @ApiOperation(value = "添加数据",notes = "添加新的数据",httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "HelpVideo",value = "待添加的HelpVideo实例",paramType = "body",dataType = "HelpVideo",required = true)
+    })
+    public Result add(@RequestBody HelpVideo helpVideo) {
+        helpVideoService.saveHelpVideo(helpVideo);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @DeleteMapping("/{id}")
+    @ApiOperation(value = "删除数据",notes = "根据id删除数据",httpMethod = "DELETE")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id",value = "查询的id实例",paramType = "path",dataType = "Integer",required = true)
+    })
+    public Result delete(@PathVariable Integer id) {
+        HelpVideo helpVideo = new HelpVideo();
+        helpVideo.setId(id);
+        helpVideoService.deleteHelpVideo(helpVideo);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @PutMapping
+    @ApiOperation(value = "更新数据",notes = "根据内容更新数据",httpMethod = "PUT")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "HelpVideo",value = "更新的HelpVideo实例",paramType = "body",dataType = "HelpVideo",required = true)
+    })
+    public Result update(@RequestBody HelpVideo helpVideo) {
+        helpVideoService.updateHelpVideo(helpVideo);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @GetMapping("/{id}")
+    @ApiOperation(value = "获取单个值",notes = "查看单个项目的内容",httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id",value = "查询的id", paramType = "path",required = true,dataType = "Integer",defaultValue = "0")
+    })
+    public Result detail(@PathVariable Long id) {
+        HelpVideo helpVideo = new HelpVideo();
+        helpVideo.setId(id.intValue());
+        helpVideo=helpVideoService.queryHelpVideo(helpVideo);
+        return ResultGenerator.genSuccessResult(helpVideo);
+    }
+
+}
\ No newline at end of file
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/HomePageController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/HomePageController.java
new file mode 100644
index 0000000..06fcc5c
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/HomePageController.java
@@ -0,0 +1,11 @@
+package cn.pluss.platform.controller;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/home")
+public class HomePageController {
+}
\ No newline at end of file
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/IdcardController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/IdcardController.java
new file mode 100644
index 0000000..a4f35fa
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/IdcardController.java
@@ -0,0 +1,34 @@
+package cn.pluss.platform.controller;
+
+
+import cn.pluss.platform.IdCardService;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.entity.IdCard;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 身份证信息表, 图片信息在tb_pluss_merchant_image表中 前端控制器
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-10-16
+ */
+@RestController
+@RequestMapping("/idcard")
+public class IdcardController extends BaseModelController<IdCardService, IdCard> {
+
+    @Autowired
+    private IdCardService idCardService;
+
+    @GetMapping("/faceCertInfo")
+    public Result<IdCard> faceCertInfo() {
+        IdCard idCard = idCardService.apiGetFaceCertInfo();
+        return ResultGenerator.genSuccessResult(idCard);
+    }
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/IntroduceController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/IntroduceController.java
new file mode 100644
index 0000000..42a4a99
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/IntroduceController.java
@@ -0,0 +1,35 @@
+package cn.pluss.platform.controller;
+
+import cn.jiguang.common.utils.StringUtils;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.appGuide.AppGuideService;
+import cn.pluss.platform.entity.AppGuide;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author djh
+ * 简介富文本内容
+ */
+@RestController
+@RequestMapping("/intro")
+public class IntroduceController {
+
+    @Autowired
+    private AppGuideService appGuideService;
+
+    @GetMapping({"/common", "/common/{code}"})
+    public Result<String> billIntro(@PathVariable(value = "code", required = false) String code) {
+        if (StringUtils.isEmpty(code)) {
+            String html = "<p><img src=\"https://www.shouyinbei.net/resources/images/upload/82031620725808697.jpg\" style=\"\"/></p><p><img src=\"https://www.shouyinbei.net/resources/images/upload/86751620725811158.jpg\" style=\"\"/></p><p><img src=\"https://www.shouyinbei.net/resources/images/upload/38401620725814105.jpg\" style=\"\"/></p><p><img src=\"https://www.shouyinbei.net/resources/images/upload/14561620725816223.jpg\" style=\"\"/></p><p><img src=\"https://www.shouyinbei.net/resources/images/upload/45071620725822267.jpg\" style=\"\"/></p><p><img src=\"https://www.shouyinbei.net/resources/images/upload/31221620725827105.jpg\" style=\"\"/></p><p><img src=\"https://www.shouyinbei.net/resources/images/upload/68211620725829889.jpg\" style=\"\"/></p><p><br/></p>";
+            return ResultGenerator.genSuccessResult(html);
+        }
+
+        AppGuide entity = appGuideService.getByCode(code);
+        return ResultGenerator.genSuccessResult(entity == null? "": entity.getContent());
+    }
+}
\ No newline at end of file
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/LeshuaMakeMoneyController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/LeshuaMakeMoneyController.java
new file mode 100644
index 0000000..5f77b1a
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/LeshuaMakeMoneyController.java
@@ -0,0 +1,76 @@
+package cn.pluss.platform.controller;
+
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.constants.ProjectConstant;
+import cn.pluss.platform.entity.LeshuaMakeMoney;
+import cn.pluss.platform.leshuaMakeMoney.LeshuaMakeMoneyService;
+import cn.pluss.platform.util.StringUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+@RestController
+@RequestMapping("/leshuaMakeMoney")
+@Api(value = "LeshuaMakeMoney控制类", tags = {"LeshuaMakeMoney接口"})
+public class LeshuaMakeMoneyController {
+
+    @Resource
+    private LeshuaMakeMoneyService leshuaMakeMoneyService;
+
+    @GetMapping
+    @ApiOperation(value = "获取全部", notes = "返回分页过后的数据", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "page", value = "查询页码", paramType = "query", dataType = "Integer", defaultValue = "0"),
+            @ApiImplicitParam(name = "size", value = "每页数据量", paramType = "query", dataType = "Integer", defaultValue = "0")
+    })
+    public Result<PageInfo<LeshuaMakeMoney>> list(@RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
+        if (size == 0) {
+            size = ProjectConstant.PAGE_SIZE;
+        }
+        if (page == 0) {
+            page = 1;
+        }
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageSize", size);
+        map.put("offset", (page - 1) * size);
+        List<LeshuaMakeMoney> leshuaMakeMoneyList = leshuaMakeMoneyService.queryLeshuaMakeMoneyPage(map);
+        Integer count = leshuaMakeMoneyService.queryLeshuaMakeMoneyPageCount(map);
+        //返回参数
+        PageInfo<LeshuaMakeMoney> pager = new PageInfo<>(count.longValue(), (long) StringUtil.getPageCount(count, size), page.longValue(), size.longValue(), leshuaMakeMoneyList);
+        return ResultGenerator.genSuccessResult(pager);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "更新数据", notes = "根据内容更新数据", httpMethod = "PUT")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "LeshuaMakeMoney", value = "更新的LeshuaMakeMoney实例", paramType = "body", dataType = "LeshuaMakeMoney", required = true)
+    })
+    public Result update(@RequestBody LeshuaMakeMoney leshuaMakeMoney) {
+        leshuaMakeMoneyService.updateLeshuaMakeMoney(leshuaMakeMoney);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @GetMapping("/{id}")
+    @ApiOperation(value = "获取单个值", notes = "查看单个项目的内容", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "查询的id", paramType = "path", required = true, dataType = "Integer", defaultValue = "0")
+    })
+    public Result detail(@PathVariable Long id) {
+        LeshuaMakeMoney leshuaMakeMoney = new LeshuaMakeMoney();
+        leshuaMakeMoney.setId(id);
+        leshuaMakeMoney = leshuaMakeMoneyService.queryLeshuaMakeMoney(leshuaMakeMoney);
+        return ResultGenerator.genSuccessResult(leshuaMakeMoney);
+    }
+
+}
+
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/LevelController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/LevelController.java
new file mode 100644
index 0000000..9f729e0
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/LevelController.java
@@ -0,0 +1,125 @@
+package cn.pluss.platform.controller;
+
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.constants.ProjectConstant;
+import cn.pluss.platform.entity.Level;
+import cn.pluss.platform.entity.SystemConfig;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.level.LevelService;
+import cn.pluss.platform.systemConfig.SystemConfigService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.util.StringUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * @author DJH
+ */
+@RestController
+@RequestMapping("/level")
+@RequiredArgsConstructor
+@Api(value = "Level控制类", tags = {"Level接口"})
+public class LevelController {
+
+    private final UserAppService userAppService;
+    private final LevelService levelService;
+
+    private final SystemConfigService configService;
+
+    @GetMapping
+    @ApiOperation(value = "获取全部", notes = "返回分页过后的数据", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "page", value = "查询页码", paramType = "query", dataType = "Integer", defaultValue = "0"),
+            @ApiImplicitParam(name = "size", value = "每页数据量", paramType = "query", dataType = "Integer", defaultValue = "0")
+    })
+    public Result<PageInfo<Level>> list(@RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
+        if (size == 0) {
+            size = ProjectConstant.PAGE_SIZE;
+        }
+        if (page == 0) {
+            page = 1;
+        }
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageSize", size);
+        map.put("offset", (page - 1) * size);
+        List<Level> levelList = levelService.queryLevelPage(map);
+        Integer count = levelService.queryLevelPageCount(map);
+        //返回参数
+        PageInfo<Level> pager = new PageInfo<>(count.longValue(), (long) StringUtil.getPageCount(count, size), page.longValue(), size.longValue(), levelList);
+        return ResultGenerator.genSuccessResult(pager);
+    }
+
+    @PostMapping
+    @ApiOperation(value = "添加数据", notes = "添加新的数据", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "Level", value = "待添加的Level实例", paramType = "body", dataType = "Level", required = true)
+    })
+    public Result add(@RequestBody Level level) {
+        levelService.saveLevel(level);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @DeleteMapping("/{id}")
+    @ApiOperation(value = "删除数据", notes = "根据id删除数据", httpMethod = "DELETE")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "查询的id实例", paramType = "path", dataType = "Integer", required = true)
+    })
+    public Result delete(@PathVariable Long id) {
+        Level level = new Level();
+        level.setId(id);
+        levelService.deleteLevel(level);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @PutMapping
+    @ApiOperation(value = "更新数据", notes = "根据内容更新数据", httpMethod = "PUT")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "Level", value = "更新的Level实例", paramType = "body", dataType = "Level", required = true)
+    })
+    public Result update(@RequestBody Level level) {
+        levelService.updateLevel(level);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @GetMapping("/{id}")
+    @ApiOperation(value = "获取单个值", notes = "查看单个项目的内容", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "查询的id", paramType = "path", required = true, dataType = "Integer", defaultValue = "0")
+    })
+    public Result<Object> detail(@PathVariable Long id) {
+        Level level = new Level();
+        level.setId(id);
+        level = levelService.queryLevel(level);
+        return ResultGenerator.genSuccessResult(level);
+    }
+
+
+    @GetMapping("/upgradeImg")
+    public Result<String> getUpgradeImg() {
+        UserApp userApp = userAppService.queryUserAppByToken();
+
+        SystemConfig systemConfig = new SystemConfig();
+        if (userApp.getLevel() == 1) {
+            systemConfig.setPropertyKey("twoUpVipImg");
+        } else if (userApp.getLevel() == 2) {
+            systemConfig.setPropertyKey("threeUpVipImg");
+        } else {
+            return ResultGenerator.genSuccessResult("当前商户已是最高级别", null);
+        }
+
+        systemConfig = configService.querySystemConfig(systemConfig);
+        return ResultGenerator.genSuccessResult(systemConfig.getPropertyValue());
+    }
+}
+
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/MainPageController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MainPageController.java
new file mode 100644
index 0000000..9deb9f1
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MainPageController.java
@@ -0,0 +1,48 @@
+package cn.pluss.platform.controller;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.app.MainPageService;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.userApp.UserAppService;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+@RestController
+@RequiredArgsConstructor
+public class MainPageController {
+
+    @Autowired
+    private UserAppService userAppService;
+
+    @Autowired
+    private MainPageService promoterMainPageService;
+
+    @Autowired
+    private MainPageService agentStaffMainPageService;
+
+    /**
+     * @page 商户推广
+     * 查询推广页统计数据
+     * @return
+     */
+    @PostMapping("/userApp/queryPromotePageData")
+    @ApiOperation(tags = {"页面-商户推广"}, value = "查询推广页统计数据", notes = "查询推广页统计数据", httpMethod = "POST")
+    public Result<?> getSpreadData() {
+        UserApp userApp = userAppService.queryUserAppByToken();
+        Map<String, Object> resultMap;
+
+        if ("agent_staff".equals(userApp.getUserType())) {
+            resultMap = agentStaffMainPageService.getSpreadData(userApp.getUserId() + "");
+        } else {
+            resultMap = promoterMainPageService.getSpreadData(userApp.getUserId() + "");
+        }
+
+        return ResultGenerator.genSuccessResult(resultMap);
+    }
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/MccInfoController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MccInfoController.java
new file mode 100644
index 0000000..dfcb464
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MccInfoController.java
@@ -0,0 +1,40 @@
+package cn.pluss.platform.controller;
+
+import cn.pluss.platform.SxfMccInfoService;
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.entity.SxfMccInfo;
+import cn.pluss.platform.util.PageUtils;
+import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+@RestController
+@RequestMapping("/mccInfo")
+@Transactional
+@Api(value = "MccInfo控制类", tags = {"MccInfo接口"})
+public class MccInfoController {
+
+    @Autowired
+    private SxfMccInfoService sxfMccInfoService;
+
+    @GetMapping("/pageData")
+    public Result<PageInfo<SxfMccInfo>> pageData(Page<SxfMccInfo> page, String keyWord) {
+        Page<SxfMccInfo> sxfMccInfoPage = sxfMccInfoService.pageData(page, keyWord);
+        return ResultGenerator.genSuccessResult(PageUtils.page(sxfMccInfoPage));
+    }
+
+    @GetMapping("/treeData")
+    public Result<JSONArray> treeData() {
+        JSONArray resultArr = sxfMccInfoService.treeData();
+        return ResultGenerator.genSuccessResult(resultArr);
+    }
+}
+
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/MccInfoSortController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MccInfoSortController.java
new file mode 100644
index 0000000..33d7757
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MccInfoSortController.java
@@ -0,0 +1,23 @@
+package cn.pluss.platform.controller;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author djh
+ */
+@RestController
+@RequestMapping("mccInfoSort")
+public class MccInfoSortController {
+
+    @GetMapping("/tree")
+    public Result<Object> mccInfoTree() {
+        JSONArray jsonArray = JSON.parseArray("[{\"name\":\"常用分类\",\"citylist\":[{\"code\":\"5814\",\"name\":\"快餐店\"},{\"code\":\"5812\",\"name\":\"餐厅、订餐服务\"},{\"code\":\"5815\",\"name\":\"咖啡厅、茶馆\"},{\"code\":\"5943\",\"name\":\"文具及办公用品\"},{\"code\":\"5621\",\"name\":\"女性成衣\"},{\"code\":\"5641\",\"name\":\"母婴用品\"},{\"code\":\"5921\",\"name\":\"酒类\"},{\"code\":\"5722\",\"name\":\"家用电器\"},{\"code\":\"5732\",\"name\":\"数码产品及配件\"},{\"code\":\"5995\",\"name\":\"宠物及宠物用品\"},{\"code\":\"5941\",\"name\":\"体育用品/器材\"},{\"code\":\"5945\",\"name\":\"玩具、游戏用品\"},{\"code\":\"5992\",\"name\":\"花店\"},{\"code\":\"5993\",\"name\":\"烟草/雪茄\"},{\"code\":\"5331\",\"name\":\"杂货店\"},{\"code\":\"5411\",\"name\":\"超市（非平台类）\"},{\"code\":\"5423\",\"name\":\"水果店\"},{\"code\":\"5451\",\"name\":\"乳制品/冷饮\"},{\"code\":\"5813\",\"name\":\"酒吧、舞厅、夜总会\"},{\"code\":\"7230\",\"name\":\"美容/美发服务\"},{\"code\":\"7298\",\"name\":\"美容SPA和美体保健\"},{\"code\":\"7531\",\"name\":\"汽车维修、保养、美容装饰\"},{\"code\":\"5712\",\"name\":\"家具/家庭摆设\"},{\"code\":\"5251\",\"name\":\"家用五金工具\"},{\"code\":\"4722\",\"name\":\"旅行社和旅游服务\"},{\"code\":\"7011\",\"name\":\"住宿服务（旅馆、酒店、汽车旅馆、度假村等）\"}]},{\"name\":\"餐旅业\",\"citylist\":[{\"code\":\"5814\",\"name\":\"快餐店\"},{\"code\":\"5812\",\"name\":\"餐厅、订餐服务\"},{\"code\":\"5815\",\"name\":\"咖啡厅、茶馆\"},{\"code\":\"5423\",\"name\":\"水果店\"},{\"code\":\"5441\",\"name\":\"糖果及坚果商店\"},{\"code\":\"5451\",\"name\":\"乳制品/冷饮\"},{\"code\":\"5462\",\"name\":\"面包糕点\"},{\"code\":\"5466\",\"name\":\"茶叶\"},{\"code\":\"5499\",\"name\":\"其他食品零售\"},{\"code\":\"4722\",\"name\":\"旅行社和旅游服务\"},{\"code\":\"7012\",\"name\":\"度假用别墅服务\"},{\"code\":\"7032\",\"name\":\"运动和娱乐露营\"},{\"code\":\"7033\",\"name\":\"活动房车场及野营场所 \"},{\"code\":\"7011\",\"name\":\"住宿服务（旅馆、酒店、汽车旅馆、度假村等）\"},{\"code\":\"4723\",\"name\":\"国际货运代理和报关行\"},{\"code\":\"4733\",\"name\":\"大型旅游景点\"},{\"code\":\"5422\",\"name\":\"肉、禽、蛋及水产品\"},{\"code\":\"5811\",\"name\":\"宴会提供商\"},{\"code\":\"5880\",\"name\":\"校园团餐\"},{\"code\":\"5881\",\"name\":\"综合团餐\"},{\"code\":\"4789\",\"name\":\"未列入其他代码的运输服务\"},]},{\"name\":\"商超便利\",\"citylist\":[{\"code\":\"5331\",\"name\":\"杂货店\"},{\"code\":\"5921\",\"name\":\"酒类\"},{\"code\":\"5993\",\"name\":\"烟草/雪茄\"},{\"code\":\"5399\",\"name\":\"其他综合零售\"},{\"code\":\"5411\",\"name\":\"超市（非平台类）\"},{\"code\":\"5310\",\"name\":\"团购及折扣店\"},{\"code\":\"5931\",\"name\":\"旧商品店、二手商品店\"},{\"code\":\"5300\",\"name\":\"会员制批量零售店\"},{\"code\":\"5309\",\"name\":\"国外代购及免税店\"},{\"code\":\"5311\",\"name\":\"平台类综合商城\"},{\"code\":\"5999\",\"name\":\"其他专业零售店\"},{\"code\":\"5467\",\"name\":\"保健品\"}]},{\"name\":\"日用百货\",\"citylist\":[{\"code\":\"5978\",\"name\":\"打字设备、打印复印机、扫描仪\"},{\"code\":\"5943\",\"name\":\"文具及办公用品\"},{\"code\":\"5111\",\"name\":\"文具、办公用品、复印纸和书写纸（批发商）\"},{\"code\":\"5192\",\"name\":\"书、期刊和报纸（批发商）\"},{\"code\":\"5994\",\"name\":\"报纸、杂志\"},{\"code\":\"5641\",\"name\":\"母婴用品\"},{\"code\":\"5914\",\"name\":\"成人用品/避孕用品/情趣内衣\"},{\"code\":\"5995\",\"name\":\"宠物及宠物用品\"},{\"code\":\"5996\",\"name\":\"游泳、SPA、洗浴设备\"},{\"code\":\"5997\",\"name\":\"男士用品：剃须刀、烟酒具、瑞士军刀\"},{\"code\":\"5998\",\"name\":\"帐篷和遮阳篷商店\"},{\"code\":\"5941\",\"name\":\"体育用品/器材\"},{\"code\":\"5942\",\"name\":\"书籍\"},{\"code\":\"5945\",\"name\":\"玩具、游戏用品\"},{\"code\":\"5944\",\"name\":\"钟表店\"},{\"code\":\"5992\",\"name\":\"花店\"},{\"code\":\"5983\",\"name\":\"油品燃料经销\"},{\"code\":\"5984\",\"name\":\"烟花爆竹\"},{\"code\":\"5094\",\"name\":\"珠宝和金银饰品\"},{\"code\":\"8043\",\"name\":\"眼镜店\"},{\"code\":\"5947\",\"name\":\"礼品、卡片、纪念品\"},{\"code\":\"5733\",\"name\":\"乐器\"},{\"code\":\"5932\",\"name\":\"文物古董\"},{\"code\":\"5937\",\"name\":\"古玩复制品（赝品）\"},{\"code\":\"5977\",\"name\":\"化妆品\"},{\"code\":\"5044\",\"name\":\"办公、影印及微缩摄影器材（批发商）\"},{\"code\":\"5972\",\"name\":\"邮票/纪念币\"},{\"code\":\"5715\",\"name\":\"酒精饮料批发商（国际专用）\"},{\"code\":\"5735\",\"name\":\"音像制品\"},{\"code\":\"5051\",\"name\":\"金属产品和服务（批发商）\"},{\"code\":\"5065\",\"name\":\"电气产品和设备\"},{\"code\":\"5074\",\"name\":\"管道及供暖设备\"},{\"code\":\"5169\",\"name\":\"化工产品\"},{\"code\":\"5172\",\"name\":\"石油及石油产品（批发商）\"},{\"code\":\"5199\",\"name\":\"其他工业原料和消耗品\"},{\"code\":\"5973\",\"name\":\"宗教物品\"},{\"code\":\"5085\",\"name\":\"工业设备和制成品\"},{\"code\":\"5099\",\"name\":\"其他工业耐用品\"},{\"code\":\"5046\",\"name\":\"未列入其他代码的商用器材\"}]},{\"name\":\"休闲娱乐\",\"citylist\":[{\"code\":\"7994\",\"name\":\"电玩娱乐场所\"},{\"code\":\"7996\",\"name\":\"游乐园、马戏团、嘉年华\"},{\"code\":\"7997\",\"name\":\"健身和运动俱乐部\"},{\"code\":\"7998\",\"name\":\"动物园、水族馆\"},{\"code\":\"7999\",\"name\":\"其他娱乐服务\"},{\"code\":\"5971\",\"name\":\"艺术品和画廊\"},{\"code\":\"7911\",\"name\":\"歌舞厅/夜店\"},{\"code\":\"7832\",\"name\":\"电影院及电影票\"},{\"code\":\"7922\",\"name\":\"演出票务服务\"},{\"code\":\"7929\",\"name\":\"乐队和文艺表演\"},{\"code\":\"7932\",\"name\":\"桌球/桌游\"},{\"code\":\"7933\",\"name\":\"保龄球\"},{\"code\":\"7941\",\"name\":\"体育场馆\"},{\"code\":\"7989\",\"name\":\"网吧\"},{\"code\":\"7990\",\"name\":\"棋牌室\"},{\"code\":\"5813\",\"name\":\"酒吧、舞厅、夜总会\"},{\"code\":\"7991\",\"name\":\"展览和艺术场馆\"},{\"code\":\"7992\",\"name\":\"高尔夫球场\"}]},{\"name\":\"服饰鞋包\",\"citylist\":[{\"code\":\"5611\",\"name\":\"男性服饰\"},{\"code\":\"5621\",\"name\":\"女性成衣\"},{\"code\":\"5631\",\"name\":\"配饰商店\"},{\"code\":\"5948\",\"name\":\"行李箱包\"},{\"code\":\"5651\",\"name\":\"内衣/家居服\"},{\"code\":\"5655\",\"name\":\"运动服饰\"},{\"code\":\"5661\",\"name\":\"鞋类\"},{\"code\":\"5681\",\"name\":\"皮草皮具\"},{\"code\":\"5137\",\"name\":\"制服与商务正装定制\"},{\"code\":\"5691\",\"name\":\"高档时装及奢侈品\"},{\"code\":\"5697\",\"name\":\"裁缝、修补、改衣制衣\"},{\"code\":\"5698\",\"name\":\"假发等饰品\"},{\"code\":\"5131\",\"name\":\"布料、缝纫用品和其他纺织品（批发商）\"},{\"code\":\"7296\",\"name\":\"服装出租\"},{\"code\":\"5699\",\"name\":\"各类服装及饰物\"},{\"code\":\"5139\",\"name\":\"鞋类销售平台（批发商）\"}]},{\"name\":\"生活服务\",\"citylist\":[{\"code\":\"7230\",\"name\":\"美容/美发服务\"},{\"code\":\"7231\",\"name\":\"美甲\"},{\"code\":\"7297\",\"name\":\"按摩服务\"},{\"code\":\"7298\",\"name\":\"美容SPA和美体保健\"},{\"code\":\"7251\",\"name\":\"鞋帽清洗\"},{\"code\":\"7210\",\"name\":\"洗衣服务\"},{\"code\":\"7211\",\"name\":\"洗熨服务（自助洗衣服务）\"},{\"code\":\"7216\",\"name\":\"干洗店\"},{\"code\":\"7295\",\"name\":\"家政服务\"},{\"code\":\"7342\",\"name\":\"灭虫及消毒服务\"},{\"code\":\"7349\",\"name\":\"清洁、保养及门卫服务\"},{\"code\":\"7217\",\"name\":\"室内清洁服务\"},{\"code\":\"7299\",\"name\":\"其他生活服务\"}]},{\"name\":\"商业服务\",\"citylist\":[{\"code\":\"7338\",\"name\":\"复印及绘图服务\"},{\"code\":\"7311\",\"name\":\"广告服务\"},{\"code\":\"7221\",\"name\":\"摄影服务\"},{\"code\":\"7395\",\"name\":\"商业摄影摄像服务\"},{\"code\":\"7333\",\"name\":\"商业摄影、设计、绘图服务\"},{\"code\":\"7273\",\"name\":\"婚介服务\"},{\"code\":\"7277\",\"name\":\"婚庆服务\"},{\"code\":\"7511\",\"name\":\"货品停放交易(国际专用)\"},{\"code\":\"7692\",\"name\":\"焊接维修服务\"},{\"code\":\"7699\",\"name\":\"各类维修相关服务\"},{\"code\":\"4215\",\"name\":\"快递服务\"},{\"code\":\"4214\",\"name\":\"物流货运服务\"},{\"code\":\"0742\",\"name\":\"兽医服务\"},{\"code\":\"0743\",\"name\":\"葡萄酒生产商\"},{\"code\":\"0744\",\"name\":\"其他酒类生产商\"},{\"code\":\"0763\",\"name\":\"农业合作与农具\"},{\"code\":\"0780\",\"name\":\"景观美化与园艺服务\"},{\"code\":\"4225\",\"name\":\"公共仓储、集装整理\"},{\"code\":\"7829\",\"name\":\"艺术创作服务\"},{\"code\":\"7841\",\"name\":\"音像制品出租\"},{\"code\":\"8111\",\"name\":\"法律咨询和律师事务所\"},{\"code\":\"8734\",\"name\":\"测试实验服务\"},{\"code\":\"8911\",\"name\":\"建筑、工程和测量服务\"},{\"code\":\"7321\",\"name\":\"征信和信用报告咨询服务\"},{\"code\":\"7322\",\"name\":\"债务催收机构\"},{\"code\":\"4113\",\"name\":\"ETC不停车自动缴费\"},{\"code\":\"4114\",\"name\":\"MTC半自动车道收费\"},{\"code\":\"1711\",\"name\":\"空调类承包商\"},{\"code\":\"1731\",\"name\":\"电器承包商\"},{\"code\":\"1740\",\"name\":\"建筑材料承包商\"},{\"code\":\"1750\",\"name\":\"木工承包商\"},{\"code\":\"1761\",\"name\":\"金属产品承包商\"},{\"code\":\"1771\",\"name\":\"混凝土承包商\"},{\"code\":\"1799\",\"name\":\"其他工程承包商\"},{\"code\":\"2741\",\"name\":\"出版印刷服务\"},{\"code\":\"2791\",\"name\":\"刻版排版服务\"},{\"code\":\"4904\",\"name\":\"公共事业-清洁服务缴费\"},{\"code\":\"4906\",\"name\":\"充电桩\"},{\"code\":\"4909\",\"name\":\"有线电视缴费\"},{\"code\":\"6071\",\"name\":\"自助贩卖机\"},{\"code\":\"6072\",\"name\":\"自助零售\"},{\"code\":\"6073\",\"name\":\"自助借还\"},{\"code\":\"6074\",\"name\":\"自助娱乐服务\"},{\"code\":\"6075\",\"name\":\"其他自助生活服务\"},{\"code\":\"6513\",\"name\":\"不动产管理－物业管理\"},{\"code\":\"7013\",\"name\":\"不动产代理——房地产经纪\"},{\"code\":\"8931\",\"name\":\"会计、审计、财务服务\"},{\"code\":\"8999\",\"name\":\"其他专业服务\"},{\"code\":\"7276\",\"name\":\"财务债务咨询\"},{\"code\":\"7278\",\"name\":\"导购、经纪和拍卖服务\"},{\"code\":\"7392\",\"name\":\"公关和企业管理服务\"},{\"code\":\"7393\",\"name\":\"保安和监控服务\"},{\"code\":\"5541\",\"name\":\"加油站、服务站\"},{\"code\":\"5542\",\"name\":\"加油卡、加油服务\"},{\"code\":\"7340\",\"name\":\"商户拓展\"},{\"code\":\"7261\",\"name\":\"丧仪殡葬服务\"},{\"code\":\"7339\",\"name\":\"文字处理/翻译速记\"},{\"code\":\"7361\",\"name\":\"猎头、职业中介\"},{\"code\":\"7394\",\"name\":\"设备、工具、家具和电器出租\"},{\"code\":\"7399\",\"name\":\"其他商业服务\"}]},{\"name\":\"数码家电\",\"citylist\":[{\"code\":\"5045\",\"name\":\"商用计算机及服务器\"},{\"code\":\"5722\",\"name\":\"家用电器\"},{\"code\":\"4812\",\"name\":\"手机、通讯设备销售\"},{\"code\":\"5732\",\"name\":\"数码产品及配件\"},{\"code\":\"7993\",\"name\":\"家用电子游戏\"},{\"code\":\"5946\",\"name\":\"专业摄影器材\"},{\"code\":\"7622\",\"name\":\"电器维修\"},{\"code\":\"7379\",\"name\":\"计算机维护和修理服务\"},{\"code\":\"7623\",\"name\":\"空调、制冷设备维修\"},{\"code\":\"7629\",\"name\":\"办公电器和小家电维修\"},{\"code\":\"7631\",\"name\":\"手表、钟表和首饰维修店\"},{\"code\":\"7641\",\"name\":\"家具维修、翻新\"}]},{\"name\":\"家具建材\",\"citylist\":[{\"code\":\"5231\",\"name\":\"玻璃、油漆涂料、墙纸\"},{\"code\":\"5198\",\"name\":\"油漆、清漆用品（批发商）\"},{\"code\":\"5712\",\"name\":\"家具/家庭摆设\"},{\"code\":\"5021\",\"name\":\"办公及商务家具（批发商）\"},{\"code\":\"5713\",\"name\":\"地板和地毯\"},{\"code\":\"5714\",\"name\":\"窗帘、帷幕、室内装潢\"},{\"code\":\"5718\",\"name\":\"壁炉、屏风\"},{\"code\":\"5949\",\"name\":\"家用纺织品\"},{\"code\":\"5950\",\"name\":\"瓷器、玻璃和水晶摆件\"},{\"code\":\"5719\",\"name\":\"各种家庭装饰专营\"},{\"code\":\"5261\",\"name\":\"草坪和花园用品\"},{\"code\":\"5193\",\"name\":\"花木栽种用品、苗木和花卉（批发商）\"},{\"code\":\"5970\",\"name\":\"工艺美术用品\"},{\"code\":\"5211\",\"name\":\"木材与建材商店\"},{\"code\":\"8912\",\"name\":\"装修、装潢、园艺\"},{\"code\":\"5251\",\"name\":\"家用五金工具\"},{\"code\":\"5072\",\"name\":\"五金器材及用品（批发商）\"},{\"code\":\"3002\",\"name\":\"大型企业批发\"},{\"code\":\"5200\",\"name\":\"大型仓储式家庭用品卖场\"},{\"code\":\"5039\",\"name\":\"未列入其他代码的建材（批发商）\"}]},{\"name\":\"交通运输\",\"citylist\":[{\"code\":\"5571\",\"name\":\"摩托车及配件\"},{\"code\":\"5572\",\"name\":\"电动车及配件\"},{\"code\":\"5940\",\"name\":\"自行车及配件\"},{\"code\":\"7512\",\"name\":\"汽车出租\"},{\"code\":\"7513\",\"name\":\"卡车及拖车出租\"},{\"code\":\"7519\",\"name\":\"房车和娱乐车辆出租\"},{\"code\":\"5521\",\"name\":\"二手车销售\"},{\"code\":\"5511\",\"name\":\"汽车销售\"},{\"code\":\"5013\",\"name\":\"机动车供应及零配件（批发商）\"},{\"code\":\"7538\",\"name\":\"汽车改造等服务（非经销商）\"},{\"code\":\"5533\",\"name\":\"汽车零配件\"},{\"code\":\"5532\",\"name\":\"汽车轮胎经销\"},{\"code\":\"7542\",\"name\":\"洗车\"},{\"code\":\"2842\",\"name\":\"清洁抛光服务\"},{\"code\":\"7531\",\"name\":\"汽车维修、保养、美容装饰\"},{\"code\":\"7534\",\"name\":\"轮胎翻新、维修\"},{\"code\":\"7535\",\"name\":\"汽车喷漆店\"},{\"code\":\"7523\",\"name\":\"停车服务\"},{\"code\":\"7549\",\"name\":\"拖车服务\"},{\"code\":\"4121\",\"name\":\"出租车服务（TAXI）\"},{\"code\":\"4131\",\"name\":\"长途公路客运\"},{\"code\":\"4411\",\"name\":\"游轮及巡游航线服务\"},{\"code\":\"4457\",\"name\":\"出租船只\"},{\"code\":\"4468\",\"name\":\"船舶、海运服务提供商\"},{\"code\":\"5271\",\"name\":\"活动房车销售商\"},{\"code\":\"5531\",\"name\":\"汽车商店、家庭用品商店（国际专用）\"},{\"code\":\"5551\",\"name\":\"船舶及配件销售\"},{\"code\":\"5561\",\"name\":\"拖车、篷车及娱乐用车\"},{\"code\":\"5564\",\"name\":\"轨道交通设备器材\"},{\"code\":\"5565\",\"name\":\"飞机及配件、航道设施\"},{\"code\":\"5599\",\"name\":\"机动车综合经营\"},{\"code\":\"5566\",\"name\":\"运输搬运设备、起重装卸设备\"},{\"code\":\"5592\",\"name\":\"露营及旅行汽车\"},{\"code\":\"5598\",\"name\":\"雪车\"}]},{\"name\":\"医疗教育\",\"citylist\":[{\"code\":\"5912\",\"name\":\"药物\"},{\"code\":\"5122\",\"name\":\"药品、药品经营者（批发商）\"},{\"code\":\"5975\",\"name\":\"助听器\"},{\"code\":\"5976\",\"name\":\"康复和身体辅助用品\"},{\"code\":\"5047\",\"name\":\"医疗器械\"},{\"code\":\"8049\",\"name\":\"公立社区卫生服务中心、卫生院\"},{\"code\":\"8062\",\"name\":\"公立医院\"},{\"code\":\"8011\",\"name\":\"诊所\"},{\"code\":\"8021\",\"name\":\"牙科医生\"},{\"code\":\"8031\",\"name\":\"正骨医生\"},{\"code\":\"8061\",\"name\":\"民营医院\"},{\"code\":\"8041\",\"name\":\"按摩医生\"},{\"code\":\"8042\",\"name\":\"眼科医疗服务\"},{\"code\":\"8050\",\"name\":\"护理和照料服务\"},{\"code\":\"8071\",\"name\":\"医学及牙科实验室\"},{\"code\":\"8099\",\"name\":\"其他医疗保健服务\"},{\"code\":\"8211\",\"name\":\"公立中小学校\"},{\"code\":\"8220\",\"name\":\"公立大学与学院\"},{\"code\":\"8351\",\"name\":\"公立儿童保育服务（学前教育）\"},{\"code\":\"3000\",\"name\":\"私立中小学校\"},{\"code\":\"3001\",\"name\":\"私立儿童保育服务（学前教育）\"},{\"code\":\"8298\",\"name\":\"少年宫及青少年发展中心\"},{\"code\":\"8299\",\"name\":\"其他学校和教育服务\"},{\"code\":\"3004\",\"name\":\"私立大学与学院\"},{\"code\":\"8241\",\"name\":\"函授学校（成人教育）\"},{\"code\":\"8244\",\"name\":\"商业和文秘学校\"},{\"code\":\"3007\",\"name\":\"线下教培\"},{\"code\":\"3005\",\"name\":\"校园直连(食堂类)\"},{\"code\":\"3006\",\"name\":\"校园直连(高校类)\"}]},{\"name\":\"特殊行业\",\"citylist\":[{\"code\":\"7995\",\"name\":\"彩票\"},{\"code\":\"9211\",\"name\":\"法庭费用\"},{\"code\":\"9222\",\"name\":\"行政费用和罚款\"},{\"code\":\"9223\",\"name\":\"保释金\"},{\"code\":\"9311\",\"name\":\"税务、海关\"},{\"code\":\"9399\",\"name\":\"社会保障服务\"},{\"code\":\"9405\",\"name\":\"政府采购\"},{\"code\":\"9411\",\"name\":\"政府贷款\"},{\"code\":\"9400\",\"name\":\"使领馆\"},{\"code\":\"9402\",\"name\":\"国家邮政\"},{\"code\":\"8398\",\"name\":\"慈善和社会公益服务\"},{\"code\":\"8651\",\"name\":\"政府机构\"},{\"code\":\"8641\",\"name\":\"行业协会和专业社团\"},{\"code\":\"8661\",\"name\":\"宗教组织\"},{\"code\":\"8675\",\"name\":\"汽车协会\"},{\"code\":\"8699\",\"name\":\"其他会员组织\"},{\"code\":\"9715\",\"name\":\"档案\"},{\"code\":\"9752\",\"name\":\"电子档案\"},{\"code\":\"9701\",\"name\":\"Visa信任服务\"},{\"code\":\"9702\",\"name\":\"GCAS紧急服务（仅限Visa使用）\"},{\"code\":\"3003\",\"name\":\"铁路局（直属）\"},{\"code\":\"4011\",\"name\":\"铁路货运\"},{\"code\":\"4111\",\"name\":\"公共交通\"},{\"code\":\"4112\",\"name\":\"铁路客运\"},{\"code\":\"4115\",\"name\":\"地铁\"},{\"code\":\"4119\",\"name\":\"急救服务\"},{\"code\":\"5935\",\"name\":\"海上船只遇难救助\"},{\"code\":\"4511\",\"name\":\"电信运营商\"},{\"code\":\"4512\",\"name\":\"话费充值与缴费\"},{\"code\":\"4582\",\"name\":\"网络电话、传真\"},{\"code\":\"5964\",\"name\":\"付费电视\"},{\"code\":\"5965\",\"name\":\"铁路局（直属）\"},{\"code\":\"5966\",\"name\":\"铁路货运\"},{\"code\":\"5967\",\"name\":\"公共交通\"},{\"code\":\"5968\",\"name\":\"铁路客运\"},{\"code\":\"5969\",\"name\":\"地铁\"},{\"code\":\"5962\",\"name\":\"急救服务\"},{\"code\":\"5963\",\"name\":\"海上船只遇难救助\"},{\"code\":\"4905\",\"name\":\"图书馆\"},{\"code\":\"1520\",\"name\":\"房地产开发商\"}]}]");
+        return ResultGenerator.genSuccessResult(jsonArray);
+    }
+}
\ No newline at end of file
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/MemberOrderController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MemberOrderController.java
new file mode 100644
index 0000000..36c363f
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MemberOrderController.java
@@ -0,0 +1,355 @@
+package cn.pluss.platform.controller;
+
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.api.PageVO;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.constants.ProjectConstant;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.memberOrder.MemberOrderService;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantMenber.MerchantMenberService;
+import cn.pluss.platform.merchantMenberComsume.MerchantMenberComsumeService;
+import cn.pluss.platform.merchantMenberRecharge.MerchantMenberRechargeService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.util.DateUtils;
+import cn.pluss.platform.util.StringUtil;
+import cn.pluss.platform.vo.MemberOrderNumberVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.val;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/memberOrder")
+@Transactional
+@Api(value = "MemberOrder控制类", tags = {"MemberOrder接口"})
+public class MemberOrderController {
+
+    private final MemberOrderService memberOrderService;
+
+    private final MerchantMenberService merchantMenberService;
+
+    private final MerchantMenberComsumeService merchantMenberComsumeService;
+
+    private final MerchantMenberRechargeService merchantMenberRechargeService;
+
+    private final MerchantBaseInfoService merchantBaseInfoService;
+
+    private final UserAppService userAppService;
+
+    @GetMapping
+    @ApiOperation(value = "获取全部", notes = "返回分页过后的数据", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "page", value = "查询页码", paramType = "query", dataType = "Integer", defaultValue = "0"),
+            @ApiImplicitParam(name = "size", value = "每页数据量", paramType = "query", dataType = "Integer", defaultValue = "0"),
+            @ApiImplicitParam(name = "memberCode", value = "要查询的会员编码", paramType = "query", dataType = "String", required = true)})
+    public Result<PageInfo<MemberOrder>> list(@RequestParam(defaultValue = "1") Integer page,
+                                              @RequestParam(defaultValue = "10") Integer size, @RequestParam String memberCode) {
+        if (size == null || size == 0) {
+            size = ProjectConstant.PAGE_SIZE;
+        }
+        if (page == null || page == 0) {
+            page = 1;
+        }
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageSize", size);
+        map.put("offset", (page - 1) * size);
+        map.put("memberCode", memberCode);
+        map.put("orderStatus", "1");
+        List<MemberOrder> memberOrderList = memberOrderService.queryMemberOrderPage(map);
+        for (MemberOrder memberOrder : memberOrderList) {
+            if ("1".equals(memberOrder.getOrderType())) {
+                MerchantMenberRecharge merchantMenberRecharge = new MerchantMenberRecharge();
+                merchantMenberRecharge.setOrderNumber(memberOrder.getOrderNumber());
+                merchantMenberRecharge = merchantMenberRechargeService.queryMerchantMenberRecharge(merchantMenberRecharge);
+                if (null != merchantMenberRecharge) {
+                    memberOrder.setGiveMoney(StringUtil.bigDecimal(merchantMenberRecharge.getGiveMoney() == null ? new Double(0) : merchantMenberRecharge.getGiveMoney()) + "");
+                }
+            } else if ("0".equals(memberOrder.getOrderType())) {
+                MerchantMenberComsume menberComsume = new MerchantMenberComsume();
+                menberComsume.setOrderNumber(memberOrder.getOrderNumber());
+                menberComsume = merchantMenberComsumeService.queryMerchantMenberComsume(menberComsume);
+                if (null != menberComsume) {
+                    memberOrder.setGiveMoney(StringUtil.bigDecimal(menberComsume.getGiveMoney() == null ? new Double(0) : menberComsume.getGiveMoney()) + "");
+                }
+            }
+
+            MemberOrder.updateOrderTypeDesc(memberOrder);
+        }
+        Integer count = memberOrderService.queryMemberOrderPageCount(map);
+        // 返回参数
+        PageInfo<MemberOrder> pager = new PageInfo<>(count.longValue(), (long) StringUtil.getPageCount(count,size), page.longValue(), size.longValue(),
+                memberOrderList);
+        return ResultGenerator.genSuccessResult(pager);
+    }
+
+    @PostMapping
+    @ApiOperation(value = "添加数据", notes = "添加新的数据", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "MemberOrder", value = "待添加的MemberOrder实例", paramType = "body", dataType = "MemberOrder", required = true)})
+    public Result add(@RequestBody MemberOrder memberOrder) {
+        memberOrderService.saveMemberOrder(memberOrder);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @PostMapping("/queryMemberOrderCensusData")
+    @ApiOperation(value = "查询会员订单统计数据", notes = "查询会员订单统计数据", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "MemberOrder", value = "需要查询的会员信息", paramType = "body", dataType = "MemberOrder", required = true)})
+    public Result queryMemberOrderCensusData(@RequestBody MemberOrder memberOrder) throws ParseException {
+        UserApp tokenUa = userAppService.queryUserAppByToken();
+        memberOrder.setMerchantCode(tokenUa.getMerchantCode());
+
+        if (StringUtil.isEmpty(memberOrder.getMerchantCode())) {
+            return ResultGenerator.genFailResult("无商家编码！");
+        }
+
+        Map<String, Object> queryMap = new HashMap<String, Object>();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+        //校验查询条件
+        if (!StringUtil.isEmpty(memberOrder.getStartTime()) && !DateUtils.isDate(memberOrder.getStartTime(), "yyyy-MM-dd HH:mm")) {
+            return ResultGenerator.genFailResult("初始时间不正确！");
+        }
+        if (!StringUtil.isEmpty(memberOrder.getEndTime()) && !DateUtils.isDate(memberOrder.getEndTime(), "yyyy-MM-dd HH:mm")) {
+
+            return ResultGenerator.genFailResult("结束时间不正确！");
+        }
+
+        if (memberOrder.getSize() == null || memberOrder.getSize() == 0) {
+            memberOrder.setSize(ProjectConstant.PAGE_SIZE);
+        }
+        if (memberOrder.getPage() == null || memberOrder.getPage() == 0) {
+            memberOrder.setPage(1);
+        }
+
+
+        if (StringUtil.isEmpty(memberOrder.getStartTime())) {
+            queryMap.put("startTime", DateUtils.getDayBegin());
+        } else {
+            queryMap.put("startTime", DateUtils.getDayStartTime(sdf.parse(memberOrder.getStartTime())));
+        }
+
+        if (StringUtil.isEmpty(memberOrder.getEndTime())) {
+            queryMap.put("endTime", DateUtils.getDayEnd());
+        } else {
+            queryMap.put("endTime", DateUtils.getDayEndTime(sdf.parse(memberOrder.getEndTime())));
+        }
+        queryMap.put("merchantCode", memberOrder.getMerchantCode());
+        queryMap.put("pageSize", memberOrder.getSize());
+        queryMap.put("offset", (memberOrder.getPage() - 1) * memberOrder.getSize());
+        List<MemberOrder> memberOrderList = memberOrderService.queryMemberOrderPageByTime(queryMap);
+        Integer count = memberOrderService.queryMemberOrderPageCountByTime(queryMap);
+        // 返回参数
+        PageInfo pager = new PageInfo<>(count.longValue(), (long) StringUtil.getPageCount(count, memberOrder.getSize()), memberOrder.getPage().longValue(), memberOrder.getSize().longValue(),
+                memberOrderList);
+
+        //查询会员充值金额
+        queryMap.put("orderType", 1);
+        Double totalRechargeFee = memberOrderService.queryMemberOrderTotalOrderFeeByTime(queryMap);
+
+        //查询会员消费金额
+        queryMap.put("orderType", 0);
+        Double totalConsumeFee = memberOrderService.queryMemberOrderTotalOrderFeeByTime(queryMap);
+
+
+        Map<String, Object> result = new HashMap<>();
+        result.put("totalRechargeFee", totalRechargeFee);
+        result.put("totalConsumeFee", totalConsumeFee);
+        result.put("pager", pager);
+        return ResultGenerator.genSuccessResult(result);
+    }
+
+    @DeleteMapping("/{id}")
+    @ApiOperation(value = "删除数据", notes = "根据id删除数据", httpMethod = "DELETE")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "查询的id实例", paramType = "path", dataType = "Integer", required = true)})
+    public Result delete(@PathVariable Integer id) {
+        MemberOrder memberOrder = new MemberOrder();
+        memberOrder.setId(id);
+        memberOrderService.deleteMemberOrder(memberOrder);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @PutMapping
+    @ApiOperation(value = "更新数据", notes = "根据内容更新数据", httpMethod = "PUT")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "MemberOrder", value = "更新的MemberOrder实例", paramType = "body", dataType = "MemberOrder", required = true)})
+    public Result update(@RequestBody MemberOrder memberOrder) {
+        memberOrderService.updateMemberOrder(memberOrder);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @GetMapping("/{id}")
+    @ApiOperation(value = "获取单个值", notes = "查看单个项目的内容", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "查询的id", paramType = "path", required = true, dataType = "Integer", defaultValue = "0")})
+    public Result detail(@PathVariable Long id) {
+        MemberOrder memberOrder = new MemberOrder();
+        memberOrder.setId(id.intValue());
+        memberOrder = memberOrderService.queryMemberOrder(memberOrder);
+        return ResultGenerator.genSuccessResult(memberOrder);
+    }
+
+
+    @PostMapping("/queryMemberOrderList")
+    @ApiOperation(tags = {"页面-账单_会员"}, value = "查询当前商家会员订单集合", notes = "查询当前商家会员订单集合", httpMethod = "POST")
+    public Result<PageVO<MemberOrderNumberVO>> queryMemberOrderList(@RequestBody MemberOrder memberOrder) {
+        UserApp tokenUa = userAppService.queryUserAppByToken();
+        memberOrder.setMerchantCode(tokenUa.getMerchantCode());
+
+        if (StringUtil.isEmpty(memberOrder.getMerchantCode())) {
+            return ResultGenerator.genFailResult("无商家编码！");
+        }
+
+        Map<String, Object> queryMap = new HashMap<>();
+        SimpleDateFormat sdfLong = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        if (StringUtil.isNotEmpty(memberOrder.getStartTime())) {
+            queryMap.put("startTime", memberOrder.getStartTime());
+        } else {
+            queryMap.put("startTime", sdfLong.format(DateUtils.getDayBegin()));
+        }
+        if (StringUtil.isNotEmpty(memberOrder.getEndTime())) {
+            queryMap.put("endTime", memberOrder.getEndTime());
+        } else {
+            queryMap.put("endTime", sdfLong.format(DateUtils.getDayEnd()));
+        }
+        if (StringUtil.isNotEmpty(memberOrder.getOrderType())) {//订单类型 0：会员消费  1：会员充值
+            queryMap.put("orderType", memberOrder.getOrderType());
+        }
+        if (StringUtil.isNotEmpty(memberOrder.getRechargeType())) {
+            queryMap.put("rechargeType", memberOrder.getRechargeType());
+        }
+        if (StringUtil.isNotEmpty(memberOrder.getMerchantCode())) {
+            queryMap.put("merchantCode", memberOrder.getMerchantCode());
+        }
+        if (memberOrder.getSize() == null || memberOrder.getSize() == 0) {
+            memberOrder.setSize(ProjectConstant.PAGE_SIZE);
+        }
+        if (memberOrder.getPage() == null || memberOrder.getPage() == 0) {
+            memberOrder.setPage(1);
+        }
+        if (StringUtil.isNotEmpty(memberOrder.getStaffCode())) {//员工集合
+            String[] staffCode = memberOrder.getStaffCode().split(",");
+            List<String> staffCodeList = new ArrayList<>(Arrays.asList(staffCode));
+            queryMap.put("staffCodeList", staffCodeList);
+        }
+        if (StringUtil.isNotEmpty(memberOrder.getStoreId())) {//门店集合
+            String[] storeId = memberOrder.getStoreId().split(",");
+            List<String> storeIdList = new ArrayList<>(Arrays.asList(storeId));
+            queryMap.put("storeIdList", storeIdList);
+        }
+        queryMap.put("pageSize", memberOrder.getSize());
+        queryMap.put("orderStatus", "1");
+        queryMap.put("offset", (memberOrder.getPage() - 1) * memberOrder.getSize());
+        List<MemberOrder> memberOrderList = memberOrderService.queryMemberOrderPageByTime(queryMap);
+        List<MemberOrder> orderList = new ArrayList<>();
+
+        if (memberOrderList != null && memberOrderList.size() > 0) {
+            MerchantBaseInfo merchantBaseInfo = new MerchantBaseInfo();
+            merchantBaseInfo.setMerchantCode(memberOrderList.get(0).getMerchantCode());
+            merchantBaseInfo = merchantBaseInfoService.queryMerchantBaseInfo(merchantBaseInfo);
+
+            UserApp userApp = new UserApp();
+            userApp.setUserType("promoter");
+            userApp.setMerchantCode(memberOrderList.get(0).getMerchantCode());
+            userApp = userAppService.queryUserApp(userApp);
+
+            for (MemberOrder o : memberOrderList) {
+                //待支付剔除
+                if ("0".equals(o.getOrderStatus())) {
+                    continue;
+                }
+
+                MerchantMenber member = new MerchantMenber();
+                member.setMemberCode(o.getMemberCode());
+                member = merchantMenberService.queryMerchantMenber(member);
+                if (member != null && StringUtil.isNotEmpty(member.getLogo())) {
+                    o.setLogo(member.getLogo());
+                }
+                String orderType = o.getOrderType();
+                if (StringUtil.isNotEmpty(orderType)) {
+                    if ("1".equals(orderType)) {
+                        MerchantMenberRecharge merchantMenberRecharge = new MerchantMenberRecharge();
+                        merchantMenberRecharge.setOrderNumber(o.getOrderNumber());
+                        merchantMenberRecharge = merchantMenberRechargeService.queryMerchantMenberRecharge(merchantMenberRecharge);
+                        if (null != merchantMenberRecharge) {
+                            o.setGiveMoney(StringUtil.bigDecimal(merchantMenberRecharge.getGiveMoney() == null ? new Double(0) : merchantMenberRecharge.getGiveMoney()) + "");
+                        }
+                    } else if ("0".equals(orderType)) {
+                        MerchantMenberComsume menberComsume = new MerchantMenberComsume();
+                        menberComsume.setOrderNumber(o.getOrderNumber());
+                        menberComsume = merchantMenberComsumeService.queryMerchantMenberComsume(menberComsume);
+                        if (null != menberComsume) {
+                            o.setGiveMoney(StringUtil.bigDecimal(menberComsume.getGiveMoney() == null ? new Double(0) : menberComsume.getGiveMoney()) + "");
+                        }
+                    }
+                }
+
+                o.setAlias(merchantBaseInfo.getAlias());
+                MemberOrder.updateStaffName(o, userApp);
+                MemberOrder.updateOrderTypeDesc(o);
+                orderList.add(o);
+            }
+        }
+
+        queryMap.put("isPay", "isPay");
+//        Integer count = memberOrderService.queryMemberOrderPageCountByTime(queryMap);
+        Map<String, Map<String, Object>> countMap = memberOrderService.queryMemberOrderCountByTimeGroupData(queryMap);
+        Map<String, Object> countMap1 = countMap.get("1");
+        Map<String, Object> countMap0 = countMap.get("0");
+        int chargeCount;
+        if (countMap1 != null) {
+            chargeCount = countMap1.get("count") == null? 0: Integer.parseInt(countMap1.get("count") + "");
+        } else {
+            chargeCount = 0;
+        }
+
+        int consumeCount;
+        if (countMap0 != null) {
+            consumeCount = countMap0.get("count") == null? 0: Integer.parseInt(countMap0.get("count") + "");
+        } else {
+            consumeCount = 0;
+        }
+
+        val count = chargeCount + consumeCount;
+        Double orderCount = 0d;
+        if ("0".equals(memberOrder.getOrderType())) {
+            queryMap.put("orderType", "0");
+            //消费总金额
+            orderCount = memberOrderService.sumMemberOrderMoney(queryMap);
+        } else if (StringUtil.isEmpty(memberOrder.getOrderType())) {
+            queryMap.put("orderType", "0");
+            //消费总金额
+            orderCount = memberOrderService.sumMemberOrderMoney(queryMap);
+        }
+        Double totalOrderFee = 0d;
+        if ("1".equals(memberOrder.getOrderType())) {
+            queryMap.put("orderType", "1");
+            //充值总金额
+            totalOrderFee = memberOrderService.sumMemberOrderMoney(queryMap);
+        } else if (StringUtil.isEmpty(memberOrder.getOrderType())) {
+            queryMap.put("orderType", "1");
+            //充值总金额
+            totalOrderFee = memberOrderService.sumMemberOrderMoney(queryMap);
+        }
+        MemberOrderNumberVO vo = new MemberOrderNumberVO();
+        vo.setOrderCount(StringUtil.bigDecimal(orderCount == null ? new Double(0) : orderCount) + "");
+        vo.setTotalOrderFee(StringUtil.bigDecimal(totalOrderFee == null ? new Double(0) : totalOrderFee) + "");
+        vo.setMemberOrderList(orderList);
+        vo.setChargeCount(chargeCount + "");
+        vo.setConsumeCount(consumeCount + "");
+        //返回参数
+        PageVO<MemberOrderNumberVO> pageVO = new PageVO<>(count, StringUtil.getPageCount(count, memberOrder.getSize()), memberOrder.getPage(), memberOrder.getSize(), vo);
+        return ResultGenerator.genSuccessResult(pageVO);
+    }
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/MemberSettingController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MemberSettingController.java
new file mode 100644
index 0000000..b016002
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MemberSettingController.java
@@ -0,0 +1,100 @@
+package cn.pluss.platform.controller;
+
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.constants.ProjectConstant;
+import cn.pluss.platform.entity.MemberSetting;
+import cn.pluss.platform.memberSetting.MemberSettingService;
+import cn.pluss.platform.util.StringUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+@RestController
+@RequestMapping("/memberSetting")
+@Transactional
+@Api(value = "MemberSetting控制类", tags = {"MemberSetting接口"})
+public class MemberSettingController {
+
+    @Resource
+    private MemberSettingService memberSettingService;
+
+    @GetMapping
+    @ApiOperation(value = "获取全部", notes = "返回分页过后的数据", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "page", value = "查询页码", paramType = "query", dataType = "Integer", defaultValue = "0"),
+            @ApiImplicitParam(name = "size", value = "每页数据量", paramType = "query", dataType = "Integer", defaultValue = "0")
+    })
+    public Result<PageInfo<MemberSetting>> list(@RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
+        if (size == null || size == 0) {
+            size = ProjectConstant.PAGE_SIZE;
+        }
+        if (page == null || page == 0) {
+            page = 1;
+        }
+        Map<String, Object> map = new HashMap<String, Object>();
+        map.put("pageSize", size);
+        map.put("offset", (page - 1) * size);
+        List<MemberSetting> memberSettingList = memberSettingService.queryMemberSettingPage(map);
+        Integer count = memberSettingService.queryMemberSettingPageCount(map);
+        //返回参数
+        PageInfo pager = new PageInfo<MemberSetting>(count.longValue(), (long) StringUtil.getPageCount(count,size), page.longValue(), size.longValue(), memberSettingList);
+        return ResultGenerator.genSuccessResult(pager);
+    }
+
+    @PostMapping
+    @ApiOperation(tags = {"页面-设置会员卡"}, value = "添加数据", notes = "添加新的数据", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "MemberSetting", value = "待添加的MemberSetting实例", paramType = "body", dataType = "MemberSetting", required = true)
+    })
+    public Result add(@RequestBody MemberSetting memberSetting) {
+        memberSettingService.saveMemberSetting(memberSetting);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @DeleteMapping("/{id}")
+    @ApiOperation(value = "删除数据", notes = "根据id删除数据", httpMethod = "DELETE")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "查询的id实例", paramType = "path", dataType = "Integer", required = true)
+    })
+    public Result delete(@PathVariable Integer id) {
+        MemberSetting memberSetting = new MemberSetting();
+        memberSetting.setId(id);
+        memberSettingService.deleteMemberSetting(memberSetting);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @PutMapping
+    @ApiOperation(value = "更新数据", notes = "根据内容更新数据", httpMethod = "PUT")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "MemberSetting", value = "更新的MemberSetting实例", paramType = "body", dataType = "MemberSetting", required = true)
+    })
+    public Result update(@RequestBody MemberSetting memberSetting) {
+        memberSettingService.updateMemberSetting(memberSetting);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @GetMapping("/{id}")
+    @ApiOperation(value = "获取单个值", notes = "查看单个项目的内容", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "查询的id", paramType = "path", required = true, dataType = "Integer", defaultValue = "0")
+    })
+    public Result detail(@PathVariable Long id) {
+        MemberSetting memberSetting = new MemberSetting();
+        memberSetting.setId(id.intValue());
+        memberSetting = memberSettingService.queryMemberSetting(memberSetting);
+        return ResultGenerator.genSuccessResult(memberSetting);
+    }
+
+}
+
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantAddressController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantAddressController.java
new file mode 100644
index 0000000..8c6d06d
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantAddressController.java
@@ -0,0 +1,99 @@
+package cn.pluss.platform.controller;
+
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.constants.ProjectConstant;
+import cn.pluss.platform.entity.MerchantAddress;
+import cn.pluss.platform.merchantAddress.MerchantAddressService;
+import cn.pluss.platform.util.StringUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+@RestController
+@RequestMapping("/merchantAddress")
+@Api(value = "MerchantAddress控制类", tags = {"MerchantAddress接口"})
+public class MerchantAddressController {
+
+    @Resource
+    private MerchantAddressService merchantAddressService;
+
+    @GetMapping
+    @ApiOperation(value = "获取全部", notes = "返回分页过后的数据", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "page", value = "查询页码", paramType = "query", dataType = "Integer", defaultValue = "0"),
+            @ApiImplicitParam(name = "size", value = "每页数据量", paramType = "query", dataType = "Integer", defaultValue = "0")
+    })
+    public Result<PageInfo<MerchantAddress>> list(@RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
+        if (size == null || size == 0) {
+            size = ProjectConstant.PAGE_SIZE;
+        }
+        if (page == null || page == 0) {
+            page = 1;
+        }
+        Map<String, Object> map = new HashMap<String, Object>();
+        map.put("pageSize", size);
+        map.put("offset", (page - 1) * size);
+        List<MerchantAddress> merchantAddressList = merchantAddressService.queryMerchantAddressPage(map);
+        Integer count = merchantAddressService.queryMerchantAddressPageCount(map);
+        //返回参数
+        PageInfo pager = new PageInfo<MerchantAddress>(count.longValue(), (long) StringUtil.getPageCount(count, size), page.longValue(), size.longValue(), merchantAddressList);
+        return ResultGenerator.genSuccessResult(pager);
+    }
+
+    @PostMapping
+    @ApiOperation(value = "添加数据", notes = "添加新的数据", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "MerchantAddress", value = "待添加的MerchantAddress实例", paramType = "body", dataType = "MerchantAddress", required = true)
+    })
+    public Result add(@RequestBody MerchantAddress merchantAddress) {
+        merchantAddress.setIsDefault("1");
+        merchantAddressService.saveMerchantAddress(merchantAddress);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @DeleteMapping("/{id}")
+    @ApiOperation(value = "删除数据", notes = "根据id删除数据", httpMethod = "DELETE")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "查询的id实例", paramType = "path", dataType = "Integer", required = true)
+    })
+    public Result delete(@PathVariable Integer id) {
+        MerchantAddress merchantAddress = new MerchantAddress();
+        merchantAddress.setId(id);
+        merchantAddressService.deleteMerchantAddress(merchantAddress);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @PutMapping
+    @ApiOperation(value = "更新数据", notes = "根据内容更新数据", httpMethod = "PUT")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "MerchantAddress", value = "更新的MerchantAddress实例", paramType = "body", dataType = "MerchantAddress", required = true)
+    })
+    public Result update(@RequestBody MerchantAddress merchantAddress) {
+        merchantAddressService.updateMerchantAddress(merchantAddress);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @GetMapping("/{id}")
+    @ApiOperation(value = "获取单个值", notes = "查看单个项目的内容", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "查询的id", paramType = "path", required = true, dataType = "Integer", defaultValue = "0")
+    })
+    public Result detail(@PathVariable Long id) {
+        MerchantAddress merchantAddress = new MerchantAddress();
+        merchantAddress.setId(id.intValue());
+        merchantAddress = merchantAddressService.queryMerchantAddress(merchantAddress);
+        return ResultGenerator.genSuccessResult(merchantAddress);
+    }
+
+}
+
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantBankCardController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantBankCardController.java
new file mode 100644
index 0000000..c37cdb7
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantBankCardController.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.controller;
+
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * @author DJH
+ */
+@RestController
+@RequestMapping("/merchantBankCard")
+@Api(value = "MerchantBankCard控制类", tags = {"MerchantBankCard接口"})
+public class MerchantBankCardController {
+}
+
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantBaseInfoController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantBaseInfoController.java
new file mode 100644
index 0000000..7747745
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantBaseInfoController.java
@@ -0,0 +1,417 @@
+package cn.pluss.platform.controller;
+
+import cn.hutool.core.date.DateUtil;
+import cn.pluss.platform.activityActivate.ActivityActivateService;
+import cn.pluss.platform.activityConsumReturn.ActivityConsumReturnService;
+import cn.pluss.platform.activityRecharge.ActivityRechargeService;
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.constants.ProjectConstant;
+import cn.pluss.platform.dto.BusinessLicenseDTO;
+import cn.pluss.platform.dto.ImgDTO;
+import cn.pluss.platform.dto.MerchantBaseInfoDTO;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.mapper.MerchantImageMapper;
+import cn.pluss.platform.mapper.MerchantRateMapper;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.userInfo.UserInfoService;
+import cn.pluss.platform.util.StringUtil;
+import cn.pluss.platform.vo.BusinessLicenseVO;
+import cn.pluss.platform.vo.MerchantBaseInfoVO;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+
+/**
+ * @author djh
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/merchantBaseInfo")
+@Transactional
+@Api(value = "商家接口", tags = {"商家接口"})
+public class MerchantBaseInfoController {
+    private final MerchantBaseInfoService merchantBaseInfoService;
+    private final UserAppService userAppService;
+    private final MerchantImageMapper merchantImageMapper;
+    private final ActivityActivateService activityActivateService;
+    private final ActivityConsumReturnService activityConsumReturnService;
+    private final ActivityRechargeService activityRechargeService;
+    private final UserInfoService userInfoService;
+    private final MerchantRateMapper merchantRateMapper;
+
+    private final MerchantChannelStatusService mcsService;
+
+    @GetMapping
+    @ApiOperation(value = "获取全部", notes = "返回分页过后的数据", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "page", value = "查询页码", paramType = "query", dataType = "Integer", defaultValue = "0"),
+            @ApiImplicitParam(name = "size", value = "每页数据量", paramType = "query", dataType = "Integer", defaultValue = "0")})
+    public Result<PageInfo<MerchantBaseInfo>> list(@RequestParam(defaultValue = "1") Integer page,
+                                                   @RequestParam(defaultValue = "10") Integer size) {
+        if (size == null || size == 0) {
+            size = ProjectConstant.PAGE_SIZE;
+        }
+        if (page == null || page == 0) {
+            page = 1;
+        }
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageSize", size);
+        map.put("offset", (page - 1) * size);
+        List<MerchantBaseInfo> merchantBaseInfoList = merchantBaseInfoService.queryMerchantBaseInfoPage(map);
+        Integer count = merchantBaseInfoService.queryMerchantBaseInfoPageCount(map);
+        // 返回参数
+        PageInfo<MerchantBaseInfo> pager = new PageInfo<>(count.longValue(), (long) StringUtil.getPageCount(count, size), page.longValue(), size.longValue(),
+                merchantBaseInfoList);
+        return ResultGenerator.genSuccessResult(pager);
+    }
+
+    @PostMapping
+    @ApiOperation(value = "添加数据", notes = "添加新的数据", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "MerchantBaseInfo", value = "待添加的MerchantBaseInfo实例", paramType = "body", dataType = "MerchantBaseInfo", required = true)})
+    public Result<?> add(@RequestBody MerchantBaseInfo merchantBaseInfo) {
+        merchantBaseInfoService.saveMerchantBaseInfo(merchantBaseInfo);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @DeleteMapping("/{id}")
+    @ApiOperation(value = "删除数据", notes = "根据id删除数据", httpMethod = "DELETE")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "查询的id实例", paramType = "path", dataType = "Integer", required = true)})
+    public Result<?> delete(@PathVariable Long id) {
+        MerchantBaseInfo merchantBaseInfo = new MerchantBaseInfo();
+        merchantBaseInfo.setId(id);
+        merchantBaseInfoService.deleteMerchantBaseInfo(merchantBaseInfo);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @PutMapping
+    @ApiOperation(value = "更新数据", notes = "根据内容更新数据", httpMethod = "PUT")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "MerchantBaseInfo", value = "更新的MerchantBaseInfo实例", paramType = "body", dataType = "MerchantBaseInfo", required = true)})
+    public Result<?> update(@RequestBody MerchantBaseInfo merchantBaseInfo) {
+        merchantBaseInfoService.updateMerchantBaseInfo(merchantBaseInfo);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @GetMapping("/{merchantCode}")
+    @ApiOperation(value = "获取单个值", notes = "查看单个项目的内容", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "MerchantCode", value = "查询的MerchantCode", paramType = "path", required = true, dataType = "String", defaultValue = "0")})
+    public Result<?> detail(@PathVariable String merchantCode) {
+        MerchantBaseInfo merchantBaseInfo = new MerchantBaseInfo();
+        merchantBaseInfo.setMerchantCode(merchantCode);
+        merchantBaseInfo = merchantBaseInfoService.queryMerchantBaseInfo(merchantBaseInfo);
+        return ResultGenerator.genSuccessResult(merchantBaseInfo);
+    }
+
+    @GetMapping("/saveMerchantImg")
+    @ApiOperation(value = "保存照片接口", notes = "保存照片接口", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "ImgDTO", value = "图片imgdto", paramType = "ImgDTO", dataType = "ImgDTO", required = true),})
+    public Result<?> saveMerchantImg(@RequestBody ImgDTO imgDTO) {
+        try {
+            String userId = imgDTO.getUserId();
+            if (StringUtil.isEmpty(userId)) {
+                return ResultGenerator.genFailResult("请先登录账号");
+            }
+            UserApp userApp = new UserApp();
+            userApp.setUserId(Long.valueOf(userId));
+            List<UserApp> queryUserAppList = userAppService.queryUserAppList(userApp);
+            if (queryUserAppList == null || queryUserAppList.size() == 0) {
+                return ResultGenerator.genFailResult("无当前账号");
+            } else {
+                userApp = queryUserAppList.get(0);
+            }
+            Result<MerchantImage> convertImgDTO = imgDTO.convertImgDTO();
+            if (400 == convertImgDTO.getCode()) {
+                return convertImgDTO;
+            }
+            MerchantImage merchantImage = convertImgDTO.getData();
+            if (StringUtil.isEmpty(userApp.getMerchantCode())) {
+                String merchantCode = "M800" + DateUtil.format(new Date(), "yyyyMMdd") + StringUtil.random6V2();
+                merchantImage.setMerchantCode(merchantCode);
+                merchantImageMapper.insert(merchantImage);
+            } else {
+                String merchantCode = userApp.getMerchantCode();
+                merchantImage.setMerchantCode(merchantCode);
+                MerchantImage mImage = new MerchantImage();
+                mImage.setMerchantCode(merchantCode);
+                mImage.setPhotoType(imgDTO.getPhoneType());
+                List<MerchantImage> queryMerchantImageList = merchantImageMapper.queryMerchantImageList(mImage);
+                if (queryMerchantImageList != null && queryMerchantImageList.size() > 0) {
+                    merchantImage.setId(queryMerchantImageList.get(0).getId());
+                    merchantImageMapper.updateById(merchantImage);
+                } else {
+                    merchantImageMapper.insert(merchantImage);
+                }
+            }
+            return ResultGenerator.genSuccessResult();
+        } catch (NumberFormatException e) {
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return ResultGenerator.genFailResult("图片保存失败,请稍后再试");
+        }
+    }
+
+    @PostMapping("/saveMerchantBaseInfoV2")
+    @ApiOperation(value = "添加/修改 商户基本资料", notes = "添加/修改 商户基本资料", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "MerchantBaseInfoDTO", value = "MerchantBaseInfoDTO实例", paramType = "body", dataType = "MerchantBaseInfoDTO", required = true)})
+    public Result<?> saveMerchantBaseInfoV2(@RequestBody MerchantBaseInfoDTO merchantBaseInfoDTO) {
+        try {
+            merchantBaseInfoService.saveMerchantBaseInfo(merchantBaseInfoDTO);
+            return ResultGenerator.genSuccessResult("保存成功");
+        } catch (NumberFormatException e) {
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return ResultGenerator.genFailResult("系统繁忙，请稍后再试");
+        }
+    }
+
+    @PostMapping("/saveBusinessLicense")
+    @ApiOperation(value = "添加/修改 营业执照", notes = "添加/修改 营业执照", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "", value = "实例", paramType = "body", dataType = "WxCityInfo", required = true)})
+    public Result<?> saveBusinessLicense(@RequestBody BusinessLicenseDTO businessLicenseDTO) {
+        merchantBaseInfoService.saveBusinessLicense(businessLicenseDTO);
+        return ResultGenerator.genSuccessResult("上传营业执照信息成功");
+    }
+
+    @GetMapping("/bussAuthDetail")
+    @ApiOperation(value = "营业执照信息回显", notes = "营业执照信息回显", httpMethod = "GET")
+    public Result<?> aliMerchantInfo(@RequestParam(required = true) String userId) {
+        MerchantBaseInfo merchantBaseInfo = new MerchantBaseInfo();
+        merchantBaseInfo.setUserId(userId);
+        List<MerchantBaseInfo> queryMerchantBaseInfoList = merchantBaseInfoService
+                .queryMerchantBaseInfoList(merchantBaseInfo);
+        if (queryMerchantBaseInfoList == null || queryMerchantBaseInfoList.size() == 0) {
+            return ResultGenerator.genSuccessResult();
+        }
+        merchantBaseInfo = queryMerchantBaseInfoList.get(0);
+        MerchantImage merchantImage = new MerchantImage();
+        merchantImage.setMerchantCode(merchantBaseInfo.getMerchantCode());
+        List<MerchantImage> queryMerchantImageList = merchantImageMapper.queryMerchantImageList(merchantImage);
+        BusinessLicenseVO businessLicenseVO = BusinessLicenseVO.convertMerchantBaseInfo(merchantBaseInfo, queryMerchantImageList);
+        return ResultGenerator.genSuccessResult(businessLicenseVO);
+    }
+
+    @GetMapping(value = "/merchantInfoDetail")
+    @ApiOperation(tags = {"页面-首页"}, value = "基本资料回显", notes = "基本资料回显", httpMethod = "GET")
+    public Result<?> merchantInfo() {
+        UserApp userApp = userAppService.queryUserAppByToken();
+        MerchantBaseInfo merchantBaseInfo = new MerchantBaseInfo();
+        merchantBaseInfo.setUserId(userApp.getUserId() + "");
+        List<MerchantBaseInfo> queryMerchantBaseInfoList = merchantBaseInfoService.queryMerchantBaseInfoList(merchantBaseInfo);
+        if (queryMerchantBaseInfoList == null || queryMerchantBaseInfoList.size() == 0) {
+            return ResultGenerator.genSuccessResult();
+        }
+        merchantBaseInfo = queryMerchantBaseInfoList.get(0);
+        MerchantImage merchantImage = new MerchantImage();
+        merchantImage.setMerchantCode(merchantBaseInfo.getMerchantCode());
+        List<MerchantImage> queryMerchantImageList = merchantImageMapper.queryMerchantImageList(merchantImage);
+        MerchantBaseInfoVO merchantBaseInfoVO = MerchantBaseInfoVO.convertMerchantBaseInfo(merchantBaseInfo, null, queryMerchantImageList);
+        return ResultGenerator.genSuccessResult(merchantBaseInfoVO);
+    }
+
+    @GetMapping("/queryMerchantActivity")
+    @ApiOperation(value = "查询商家活动", notes = "查询商家活动", httpMethod = "POST")
+    public Result<?> merchantActivity(@RequestParam String merchantCode) {
+        Map<String, Object> result = new HashMap<String, Object>(16);
+        try {
+            ActivityActivate activityActivate = new ActivityActivate();
+            activityActivate.setMerchantCode(merchantCode);
+            List<ActivityActivate> queryActivityActivateList = activityActivateService
+                    .queryActivityActivateList(activityActivate);
+            result.put("activityActivateList", queryActivityActivateList);
+            ActivityRecharge activityRecharge = new ActivityRecharge();
+            activityRecharge.setMerchantCode(merchantCode);
+            List<ActivityRecharge> queryActivityRechargeList = activityRechargeService
+                    .queryActivityRechargeList(activityRecharge);
+            result.put("activityRechargeList", queryActivityRechargeList);
+            ActivityConsumReturn activityConsumReturn = new ActivityConsumReturn();
+            activityConsumReturn.setMerchantCode(merchantCode);
+            List<ActivityConsumReturn> queryActivityConsumReturnList = activityConsumReturnService
+                    .queryActivityConsumReturnList(activityConsumReturn);
+            result.put("activityConsumReturnList", queryActivityConsumReturnList);
+            return ResultGenerator.genSuccessResult(result);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResultGenerator.genFailResult("系统繁忙，请稍后再试");
+        }
+    }
+
+    @PostMapping("/manageMerchantManageList")
+    @ApiOperation(value = "多商户管理列表", notes = "多商户管理列表", httpMethod = "POST")
+    public Result<?> manageMerchantManageList(@RequestBody MerchantBaseInfo merchantBaseInfo) {
+        Map<String, Object> result = new HashMap<>(16);
+        try {
+            List<MerchantBaseInfo> queryMerchantBaseInfoList;
+            merchantBaseInfo = merchantBaseInfoService.queryMerchantBaseInfo(merchantBaseInfo);
+            if (null != merchantBaseInfo && StringUtil.isNotEmpty(merchantBaseInfo.getBindingCode())) {
+                MerchantBaseInfo merchantBaseInfo2 = new MerchantBaseInfo();
+                merchantBaseInfo2.setBindingCode(merchantBaseInfo.getBindingCode());
+                queryMerchantBaseInfoList = merchantBaseInfoService.queryMerchantBaseInfoList(merchantBaseInfo2);
+            } else {
+                queryMerchantBaseInfoList = new ArrayList<>();
+                if (merchantBaseInfo != null) {
+                    queryMerchantBaseInfoList.add(merchantBaseInfo);
+                }
+            }
+
+            for (MerchantBaseInfo merchantBaseInfo3 : queryMerchantBaseInfoList) {
+                UserInfo userInfo = new UserInfo();
+                userInfo.setId(Long.valueOf(merchantBaseInfo3.getUserId()));
+                List<UserInfo> queryUserInfoList = userInfoService.queryUserInfoList(userInfo);
+                MerchantChannelStatus merchantChannelStatus = mcsService.getValidData(merchantBaseInfo3.getMerchantCode());
+
+                if (merchantChannelStatus == null) {
+                    merchantBaseInfo3.setMerchantAuditStatus("0");
+                } else {
+                    merchantBaseInfo3.setMerchantAuditStatus(merchantChannelStatus.getAppStatus());
+                }
+
+                if (queryUserInfoList != null && queryUserInfoList.size() > 0) {
+                    userInfo = queryUserInfoList.get(0);
+                    merchantBaseInfo3.setLoginName(userInfo.getLoginName());
+                    merchantBaseInfo3.setPassword(userInfo.getPassword());
+                }
+
+                MerchantImage merchantImage = new MerchantImage();
+                merchantImage.setMerchantCode(merchantBaseInfo3.getMerchantCode());
+                merchantImage.setPhotoType("06");
+                List<MerchantImage> queryMerchantImageList = merchantImageMapper.queryMerchantImageList(merchantImage);
+                if (queryMerchantImageList != null && queryMerchantImageList.size() > 0) {
+                    merchantImage = queryMerchantImageList.get(0);
+                    merchantBaseInfo3.setImgUrl(merchantImage.getPicUrl());
+                }
+            }
+            result.put("merchantBaseInfoList", queryMerchantBaseInfoList);
+            return ResultGenerator.genSuccessResult(result);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResultGenerator.genFailResult("系统异常");
+        }
+    }
+
+    @PostMapping("/saveMerchantUser")
+    @ApiOperation(value = "添加多商户的商户", notes = "添加多商户的商户", httpMethod = "POST")
+    public Result<?> saveMerchantUser(@RequestBody MerchantBaseInfoDTO merchantBaseInfoDTO) {
+        merchantBaseInfoService.saveMerchantUser(merchantBaseInfoDTO);
+        return ResultGenerator.genSuccessResult("子商户添加成功");
+    }
+
+    @PostMapping("/saveMerchantUserV2")
+    @ApiOperation(value = "添加多商户的商户", notes = "添加多商户的商户", httpMethod = "POST")
+    public Result<?> saveMerchantUserV2(@RequestBody MerchantBaseInfoDTO merchantBaseInfoDTO) {
+        merchantBaseInfoService.saveMerchantUser(merchantBaseInfoDTO);
+        return ResultGenerator.genSuccessResult("子商户添加成功");
+    }
+
+    @GetMapping("/mchDetail")
+    public Result<MerchantBaseInfoVO> getMchDetail(String userId) {
+        MerchantBaseInfoVO mbiVO = merchantBaseInfoService.apiGetMchDetail(userId);
+        return ResultGenerator.genSuccessResult(mbiVO);
+    }
+
+    @PostMapping("queryFeeInfoByMchId")
+    public Result<?> queryFeeInfo(@RequestBody UserApp userApp) {
+        UserApp tokenUserApp = userAppService.queryUserAppByToken();
+        MerchantRate merchantRate = new MerchantRate().setUserId(tokenUserApp.getUserId() + "");
+        merchantRate = merchantRateMapper.selectOne(new QueryWrapper<>(merchantRate));
+
+        Integer rate;
+        if (merchantRate != null) {
+            rate = merchantRate.getCurrentRate();
+        } else {
+            rate = 38;
+        }
+
+        try {
+            if (StringUtil.isNotEmpty(tokenUserApp.getMerchantCode())) {
+                MerchantBaseInfo merchantBaseInfo = new MerchantBaseInfo();
+                merchantBaseInfo.setMerchantCode(tokenUserApp.getMerchantCode());
+                merchantBaseInfo = merchantBaseInfoService.queryMerchantBaseInfo(merchantBaseInfo);
+                if (null != merchantBaseInfo) {
+                    JSONObject wechatRate = new JSONObject();
+                    wechatRate.put("rate", rate);
+                    JSONObject alipayRate = new JSONObject();
+                    alipayRate.put("rate", rate);
+                    JSONObject bank = new JSONObject();
+                    bank.put("rate", rate);
+                    JSONObject alipayT1 = new JSONObject();
+                    alipayT1.put("t1", alipayRate);
+                    JSONObject wechatT1 = new JSONObject();
+                    wechatT1.put("t1", wechatRate);
+                    JSONObject bankT1 = new JSONObject();
+                    bankT1.put("t1", bank);
+                    JSONObject data = new JSONObject();
+                    data.put("alipay", alipayT1);
+                    data.put("wechat", wechatT1);
+                    data.put("bank", bankT1);
+                    return ResultGenerator.genSuccessResult(data);
+                } else {
+                    return ResultGenerator.genSuccessResult();
+                }
+            } else {
+                return ResultGenerator.genSuccessResult();
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResultGenerator.genFailResult("系统异常");
+        }
+    }
+
+    @PostMapping("/setVoice")
+    @ApiOperation(value = "语音播报开启或关闭", notes = "语音播报开启或关闭", httpMethod = "POST")
+    public Result<?> setVoice(@RequestBody MerchantBaseInfo merchantBaseInfo) {
+        UserApp tokenUa = userAppService.queryUserAppByToken();
+        merchantBaseInfo.setMerchantCode(tokenUa.getMerchantCode());
+        
+        if (StringUtil.isEmpty(merchantBaseInfo.getMerchantCode())) {
+            return ResultGenerator.genFailResult("无商家编码");
+        }
+        if (StringUtil.isEmpty(merchantBaseInfo.getIsVoice())) {
+            return ResultGenerator.genFailResult("无是否开启或关闭播报");
+        }
+
+        try {
+            UserApp userApp = userAppService.queryUserAppByToken();
+            userApp.setIsVoice(merchantBaseInfo.getIsVoice());
+            userAppService.updateById(userApp);
+            return ResultGenerator.genSuccessResult();
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResultGenerator.genFailResult("系统异常");
+        }
+
+    }
+
+    @PostMapping("/switchBankLargePermission")
+    @ResponseBody
+    public Result<?> switchBankLargePermission() {
+        merchantBaseInfoService.apiSwitchBankLargePermission();
+
+        return ResultGenerator.genSuccessResult("操作成功", null);
+    }
+
+    @PostMapping("/wxCertPass")
+    @ResponseBody
+    public Result<?> wxCertPass() {
+        merchantBaseInfoService.apiWxCertPass();
+        return ResultGenerator.genSuccessResult("操作成功", null);
+    }
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantDeviceController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantDeviceController.java
new file mode 100644
index 0000000..116a903
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantDeviceController.java
@@ -0,0 +1,144 @@
+package cn.pluss.platform.controller;
+
+import cn.jiguang.common.utils.StringUtils;
+import cn.pluss.platform.DeviceGoodsService;
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.constants.ProjectConstant;
+import cn.pluss.platform.device.DeviceService;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.merchantDevice.MerchantDeviceService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.util.StringUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.Setter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+@RestController
+@RequestMapping("/merchantDevice")
+@Api(value = "MerchantDevice控制类", tags = {"MerchantDevice接口"})
+public class MerchantDeviceController {
+    @Resource
+    private MerchantDeviceService merchantDeviceService;
+
+    @Resource
+    private DeviceService deviceService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private DeviceGoodsService deviceGoodsService;
+
+    @Resource
+    private UserAppService userAppService;
+
+    @GetMapping
+    @ApiOperation(value = "获取全部", notes = "返回分页过后的数据", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "page", value = "查询页码", paramType = "query", dataType = "Integer", defaultValue = "0"),
+            @ApiImplicitParam(name = "size", value = "每页数据量", paramType = "query", dataType = "Integer", defaultValue = "0")
+    })
+    public Result<PageInfo<MerchantDevice>> list(@RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
+        if (size == null || size == 0) {
+            size = ProjectConstant.PAGE_SIZE;
+        }
+        if (page == null || page == 0) {
+            page = 1;
+        }
+
+        Map<String, Object> map = new HashMap<>(16);
+        map.put("pageSize", size);
+        map.put("offset", (page - 1) * size);
+        UserApp userApp = userAppService.queryUserAppByToken();
+        map.put("userId", userApp.getUserId());
+        List<MerchantDevice> merchantDeviceList = merchantDeviceService.queryMerchantDevicePage(map);
+        for (MerchantDevice d : merchantDeviceList) {
+            d.setStatus(2);
+            DeviceSignUnbind sign = new DeviceSignUnbind();
+            sign.setMerchantCode(d.getMerchantCode());
+            Device device = new Device();
+            if(StringUtils.isNotEmpty(d.getOrderNo() )){
+                if(d.getVenderCode() != null){
+                    device.setVenderCode(d.getVenderCode());
+                    device = deviceService.queryDevice(device);
+                    d.setDeviceLogo(device.getDeviceLogo());
+                    d.setVenderModel(device.getVenderModel());
+                    d.setIntroDesc(device.getIntroDesc());
+                    d.setName(device.getName());
+                    sign.setVenderCode(d.getVenderCode());
+                }
+            } else {
+                if(d.getVenderCode() != null){
+                    device.setVenderCode(d.getVenderCode());
+                    device = deviceService.queryDevice(device);
+                    d.setDeviceLogo(device.getDeviceLogo());
+                    d.setVenderModel(device.getVenderModel());
+                    sign.setVenderCode(d.getVenderCode());
+                }
+            }
+
+            if (StringUtils.isEmpty(d.getDeviceLogo()) && StringUtils.isNotEmpty(d.getSn())) {
+                DeviceGoods deviceGoods = deviceGoodsService.getBySn(d.getSn());
+                d.setDeviceLogo(deviceGoods.getDeviceLogo());
+            }
+        }
+        Integer count = merchantDeviceService.queryMerchantDevicePageCount(map);
+        //返回参数
+        PageInfo pager = new PageInfo<>(count.longValue(), (long) StringUtil.getPageCount(count, size), page.longValue(), size.longValue(), merchantDeviceList);
+        return ResultGenerator.genSuccessResult(pager);
+    }
+
+    @PostMapping
+    @ApiOperation(value = "添加数据", notes = "添加新的数据", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "MerchantDevice", value = "待添加的MerchantDevice实例", paramType = "body", dataType = "MerchantDevice", required = true)
+    })
+    public Result add(@RequestBody MerchantDevice merchantDevice) {
+        merchantDeviceService.save(merchantDevice);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @DeleteMapping("/{id}")
+    @ApiOperation(value = "删除数据", notes = "根据id删除数据", httpMethod = "DELETE")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "查询的id实例", paramType = "path", dataType = "Integer", required = true)
+    })
+    public Result delete(@PathVariable Long id) {
+        merchantDeviceService.removeById(id);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @PutMapping
+    @ApiOperation(value = "更新数据", notes = "根据内容更新数据", httpMethod = "PUT")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "MerchantDevice", value = "更新的MerchantDevice实例", paramType = "body", dataType = "MerchantDevice", required = true)
+    })
+    public Result update(@RequestBody MerchantDevice merchantDevice) {
+        merchantDeviceService.updateById(merchantDevice);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @GetMapping("/{id}")
+    @ApiOperation(value = "获取单个值", notes = "查看单个项目的内容", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "查询的id", paramType = "path", required = true, dataType = "Integer", defaultValue = "0")
+    })
+    public Result detail(@PathVariable Long id) {
+        MerchantDevice merchantDevice = new MerchantDevice();
+        merchantDevice.setId(id);
+        merchantDevice = merchantDeviceService.getOne(new QueryWrapper<>(merchantDevice));
+        return ResultGenerator.genSuccessResult(merchantDevice);
+    }
+
+}
+
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantGuideController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantGuideController.java
new file mode 100644
index 0000000..dc87df9
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantGuideController.java
@@ -0,0 +1,46 @@
+package cn.pluss.platform.controller;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.entity.MerchantGuide;
+import cn.pluss.platform.merchantGuide.MerchantGuideService;
+import lombok.Setter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author djh
+ */
+@RestController
+@RequestMapping("/merchantGuide")
+public class MerchantGuideController {
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantGuideService merchantGuideService;
+
+    @GetMapping("/list")
+    public Result<Object> list() {
+        List<MerchantGuide> merchantGuideList = merchantGuideService.appList();
+        return ResultGenerator.genSuccessResult(merchantGuideList);
+    }
+
+    @PostMapping("/save")
+    public Result<Object> save(@RequestBody MerchantGuide entity) {
+        merchantGuideService.appSave(entity);
+        return ResultGenerator.genSuccessResult("保存成功", null);
+    }
+
+    @GetMapping("/del/{id}")
+    public Result<Object> del(@PathVariable("id") Integer id) {
+        merchantGuideService.appDel(id);
+        return ResultGenerator.genSuccessResult("删除成功", null);
+    }
+
+    @PostMapping({"/choose"})
+    public Result<Object> choose(@RequestBody MerchantGuide merchantGuide) {
+        merchantGuideService.appChoose(merchantGuide);
+        return ResultGenerator.genSuccessResult("操作成功", null);
+    }
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantImageController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantImageController.java
new file mode 100644
index 0000000..69578e3
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantImageController.java
@@ -0,0 +1,54 @@
+package cn.pluss.platform.controller;
+
+import cn.jiguang.common.utils.StringUtils;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.entity.MerchantImage;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.merchantImage.MerchantImageService;
+import cn.pluss.platform.userApp.UserAppService;
+import lombok.Setter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+
+/**
+ * @author DJH
+ */
+@RestController
+@RequestMapping("/merchantImage")
+public class MerchantImageController extends BaseModelController<MerchantImageService, MerchantImage> {
+
+    @Setter(onMethod_ = {@Lazy, @Autowired})
+    private UserAppService userAppService;
+
+    /**
+     * 上传图片
+     */
+    @PostMapping("saveBatch")
+    @Transactional(rollbackFor = Exception.class)
+    public Result<String> saveBatch(@RequestBody List<MerchantImage> merchantImageList) {
+        UserApp userApp = userAppService.queryUserAppByToken();
+        if (StringUtils.isEmpty(userApp.getMerchantCode())) {
+            MsgException.throwException("缺少商户基本信息");
+        }
+
+        for (MerchantImage merchantImage: merchantImageList) {
+            merchantImage.setMerchantCode(userApp.getMerchantCode());
+        }
+
+        baseService.saveMerchantImageBatch(merchantImageList);
+
+        return ResultGenerator.genSuccessResult("保存成功", null);
+    }
+}
+
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantIncomeController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantIncomeController.java
new file mode 100644
index 0000000..deb08f8
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantIncomeController.java
@@ -0,0 +1,93 @@
+package cn.pluss.platform.controller;
+
+import cn.jiguang.common.utils.StringUtils;
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.dto.LeshuaBillsDTO;
+import cn.pluss.platform.entity.MakeMoney;
+import cn.pluss.platform.entity.MerchantIncome;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.merchantIncome.MerchantIncomeService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/merchantIncome")
+@Api(value = "MerchantIncome控制类", tags = {"MerchantIncome接口"})
+public class MerchantIncomeController {
+
+    @Resource
+    private MerchantIncomeService merchantIncomeService;
+
+    @GetMapping
+    @ApiOperation(tags = {"页面-余额"}, value = "根据日期获取对应商家指定时间段内的收益", notes = "返回分页过后的数据", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "page", value = "查询页码", paramType = "query", dataType = "Integer", defaultValue = "0"),
+            @ApiImplicitParam(name = "size", value = "每页数据量", paramType = "query", dataType = "Integer", defaultValue = "0"),
+            @ApiImplicitParam(name = "merchantCode", value = "商家的编码信息", paramType = "query", dataType = "String", required = true),
+            @ApiImplicitParam(name = "startTime", value = "查询的开始时间", paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "endTime", value = "查询的结束时间", paramType = "query", dataType = "String")})
+    public Result<Map<String, Object>> summary(@RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size, String merchantCode, @RequestParam String startTime, @RequestParam String endTime) throws ParseException {
+        Map<String, Object> resultMap = merchantIncomeService.queryTotalEnterFee(merchantCode, startTime, endTime);
+        return ResultGenerator.genSuccessResult(resultMap);
+    }
+
+    @PostMapping
+    @ApiOperation(value = "添加数据", notes = "添加新的数据", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "MerchantIncome", value = "待添加的MerchantIncome实例", paramType = "body", dataType = "MerchantIncome", required = true)})
+    public Result add(@RequestBody MerchantIncome merchantIncome) {
+        merchantIncomeService.saveMerchantIncome(merchantIncome);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @DeleteMapping("/{id}")
+    @ApiOperation(value = "删除数据", notes = "根据id删除数据", httpMethod = "DELETE")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "查询的id实例", paramType = "path", dataType = "Integer", required = true)})
+    public Result delete(@PathVariable Integer id) {
+        MerchantIncome merchantIncome = new MerchantIncome();
+        merchantIncome.setId(id);
+        merchantIncomeService.deleteMerchantIncome(merchantIncome);
+        return ResultGenerator.genSuccessResult();
+    }
+
+
+    @GetMapping("/{dealCode}")
+    @ApiOperation(value = "获取单个收益的详情", notes = "查看单个项目的内容", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "dealCode", value = "查询的dealCode", paramType = "path", required = true, dataType = "String")})
+    public Result detail(@PathVariable String dealCode) {
+        MerchantIncome merchantIncome = new MerchantIncome();
+        merchantIncome.setDealCode(dealCode);
+        merchantIncome = merchantIncomeService.queryMerchantIncome(merchantIncome);
+        return ResultGenerator.genSuccessResult(merchantIncome);
+    }
+
+    @PostMapping("/queryLastFiveIncome")
+    @ApiOperation(value = "查询商家最后的五条收入记录", notes = "查询最后的五条收入记录", httpMethod = "GET")
+    public Result<List<MerchantIncome>> queryLastFiveIncome(@RequestBody UserApp userApp) {
+        return ResultGenerator.genSuccessResult(merchantIncomeService.queryLastFiveMerchantIncome2(userApp));
+    }
+
+    @PostMapping("/queryLeshuaBills")
+    @ApiOperation(tags = {"页面-余额"}, value = "查询乐刷打款账单", notes = "查询乐刷打款账单", httpMethod = "POST")
+    public Result<PageInfo<MakeMoney>> queryLeshuaBills(@RequestBody LeshuaBillsDTO leshuaBillsDTO) throws ParseException {
+        if (StringUtils.isEmpty(leshuaBillsDTO.getMerchantId())) {
+            return ResultGenerator.genSuccessResult(new PageInfo<>(0L, 0L, 0L, 20L, new ArrayList<>()));
+        }
+
+        PageInfo<MakeMoney> result = merchantIncomeService.queryLeshuaBills(leshuaBillsDTO);
+        return ResultGenerator.genSuccessResult(result);
+    }
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantMenberComsumeController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantMenberComsumeController.java
new file mode 100644
index 0000000..e9ee961
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantMenberComsumeController.java
@@ -0,0 +1,100 @@
+package cn.pluss.platform.controller;
+
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.constants.ProjectConstant;
+import cn.pluss.platform.entity.MerchantMenberComsume;
+import cn.pluss.platform.merchantMenberComsume.MerchantMenberComsumeService;
+import cn.pluss.platform.util.StringUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+@RestController
+@RequestMapping("/merchantMenberComsume")
+@Transactional
+@Api(value = "MerchantMenberComsume控制类", tags = {"MerchantMenberComsume接口"})
+public class MerchantMenberComsumeController {
+
+    @Resource
+    private MerchantMenberComsumeService merchantMenberComsumeService;
+
+    @GetMapping
+    @ApiOperation(value = "获取全部", notes = "返回分页过后的数据", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "page", value = "查询页码", paramType = "query", dataType = "Integer", defaultValue = "0"),
+            @ApiImplicitParam(name = "size", value = "每页数据量", paramType = "query", dataType = "Integer", defaultValue = "0")
+    })
+    public Result<PageInfo<MerchantMenberComsume>> list(@RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
+        if (size == null || size == 0) {
+            size = ProjectConstant.PAGE_SIZE;
+        }
+        if (page == null || page == 0) {
+            page = 1;
+        }
+        Map<String, Object> map = new HashMap<String, Object>();
+        map.put("pageSize", size);
+        map.put("offset", (page - 1) * size);
+        List<MerchantMenberComsume> merchantMenberComsumeList = merchantMenberComsumeService.queryMerchantMenberComsumePage(map);
+        Integer count = merchantMenberComsumeService.queryMerchantMenberComsumePageCount(map);
+        //返回参数
+        PageInfo pager = new PageInfo<MerchantMenberComsume>(count.longValue(), (long) StringUtil.getPageCount(count, size), page.longValue(), size.longValue(), merchantMenberComsumeList);
+        return ResultGenerator.genSuccessResult(pager);
+    }
+
+    @PostMapping
+    @ApiOperation(value = "添加数据", notes = "添加新的数据", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "MerchantMenberComsume", value = "待添加的MerchantMenberComsume实例", paramType = "body", dataType = "MerchantMenberComsume", required = true)
+    })
+    public Result add(@RequestBody MerchantMenberComsume merchantMenberComsume) {
+        merchantMenberComsumeService.saveMerchantMenberComsume(merchantMenberComsume);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @DeleteMapping("/{id}")
+    @ApiOperation(value = "删除数据", notes = "根据id删除数据", httpMethod = "DELETE")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "查询的id实例", paramType = "path", dataType = "Integer", required = true)
+    })
+    public Result delete(@PathVariable Integer id) {
+        MerchantMenberComsume merchantMenberComsume = new MerchantMenberComsume();
+        merchantMenberComsume.setId(id);
+        merchantMenberComsumeService.deleteMerchantMenberComsume(merchantMenberComsume);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @PutMapping
+    @ApiOperation(value = "更新数据", notes = "根据内容更新数据", httpMethod = "PUT")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "MerchantMenberComsume", value = "更新的MerchantMenberComsume实例", paramType = "body", dataType = "MerchantMenberComsume", required = true)
+    })
+    public Result update(@RequestBody MerchantMenberComsume merchantMenberComsume) {
+        merchantMenberComsumeService.updateMerchantMenberComsume(merchantMenberComsume);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @GetMapping("/{id}")
+    @ApiOperation(value = "获取单个值", notes = "查看单个项目的内容", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "查询的id", paramType = "path", required = true, dataType = "Integer", defaultValue = "0")
+    })
+    public Result detail(@PathVariable Long id) {
+        MerchantMenberComsume merchantMenberComsume = new MerchantMenberComsume();
+        merchantMenberComsume.setId(id.intValue());
+        merchantMenberComsume = merchantMenberComsumeService.queryMerchantMenberComsume(merchantMenberComsume);
+        return ResultGenerator.genSuccessResult(merchantMenberComsume);
+    }
+
+}
+
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantMenberController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantMenberController.java
new file mode 100644
index 0000000..f1b2f64
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantMenberController.java
@@ -0,0 +1,304 @@
+package cn.pluss.platform.controller;
+
+import cn.pluss.platform.activityActivate.ActivityActivateService;
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.constants.ProjectConstant;
+import cn.pluss.platform.entity.ActivityActivate;
+import cn.pluss.platform.entity.MerchantMenber;
+import cn.pluss.platform.entity.MerchantMenberRecharge;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.memberOrder.MemberOrderService;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantMenber.MerchantMenberService;
+import cn.pluss.platform.merchantMenberComsume.MerchantMenberComsumeService;
+import cn.pluss.platform.merchantMenberRecharge.MerchantMenberRechargeService;
+import cn.pluss.platform.phoneValidateCode.PhoneValidateCodeService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.util.EmojiUtil;
+import cn.pluss.platform.util.StringUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+@RestController
+@RequestMapping("/merchantMenber")
+@Transactional
+@Slf4j
+@RequiredArgsConstructor
+@Api(value = "MerchantMenber控制类", tags = {"MerchantMenber接口"})
+public class MerchantMenberController {
+    private final MerchantMenberService merchantMenberService;
+    private final MerchantMenberComsumeService merchantMenberComsumeService;
+    private final MerchantMenberRechargeService merchantMenberRechargeService;
+    private final PhoneValidateCodeService phoneValidateCodeService;
+    private final MerchantBaseInfoService merchantBaseInfoService;
+    private final ActivityActivateService activityActivateService;
+    private final MemberOrderService memberOrderService;
+
+    @Autowired @Lazy
+    private UserAppService userAppService;
+
+
+    @PostMapping
+    @ApiOperation(tags = {"页面-会员选择", "页面-会员_管理"}, value = "获取全部", notes = "返回分页过后的数据", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "MerchantMenber", value = "查询对象的实例信息", paramType = "body", dataType = "MerchantMenber"),})
+    public Result<PageInfo<MerchantMenber>> list(@RequestBody MerchantMenber merchantMenber) {
+        UserApp tokenUa = userAppService.queryUserAppByToken();
+        merchantMenber.setMerchantCode(tokenUa.getMerchantCode());
+
+        if (StringUtil.isEmpty(merchantMenber.getMerchantCode())) {
+            return ResultGenerator.genFailResult("无商家编码！");
+        }
+        if (merchantMenber.getSize() == null || merchantMenber.getSize() == 0) {
+            merchantMenber.setSize(ProjectConstant.PAGE_SIZE);
+        }
+        if (merchantMenber.getPage() == null || merchantMenber.getPage() == 0) {
+            merchantMenber.setPage(1);
+        }
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageSize", merchantMenber.getSize());
+        map.put("offset", (merchantMenber.getPage() - 1) * merchantMenber.getSize());
+        map.put("merchantCode", merchantMenber.getMerchantCode());
+        map.put("memberCode", merchantMenber.getMemberCode());
+        if (StringUtil.isNotEmpty(merchantMenber.getStoreId())) {
+            map.put("storeId", merchantMenber.getStoreId());
+        }
+        if (!StringUtil.isEmpty(merchantMenber.getPhone()) || !StringUtil.isEmpty(merchantMenber.getMemberName())) {
+            map.put("keyWord", "1");
+        }
+        //判断是否有检索条件
+        if (StringUtil.isNotEmpty(merchantMenber.getPhone())) {
+            map.put("phone", merchantMenber.getPhone());
+        }
+        if (StringUtil.isNotEmpty(merchantMenber.getNickName())) {
+            map.put("nickName", merchantMenber.getNickName());
+        }
+        List<MerchantMenber> merchantMenberList = merchantMenberService.queryMerchantMenberPage(map);
+        for (MerchantMenber m : merchantMenberList) {
+            Map<String, Object> orderMap = new HashMap<>();
+            orderMap.put("memberCode", m.getMemberCode());
+            orderMap.put("orderType", "0");
+            orderMap.put("orderStatus", "1");
+            Integer count = memberOrderService.queryMemberOrderPageCount(orderMap);
+            m.setOrderNumber(count + "");
+
+            if (StringUtils.isNotBlank(m.getAppOpenId())) {
+                m.setOpenid(m.getAppOpenId());
+            }
+        }
+        Integer count = merchantMenberService.queryMerchantMenberPageCount(map);
+
+        for (MerchantMenber menber : merchantMenberList) {
+            menber.setNickName(EmojiUtil.emojiRecovery2(menber.getNickName()));
+        }
+
+        // 返回参数
+        PageInfo<MerchantMenber> pager = new PageInfo<>(count.longValue(), (long)StringUtil.getPageCount(count, merchantMenber.getSize()),
+                merchantMenber.getPage().longValue(), merchantMenber.getSize().longValue(), merchantMenberList);
+        return ResultGenerator.genSuccessResult(pager);
+    }
+
+    @GetMapping("/queryMemberIsExist")
+    @ApiOperation(tags = {"会员开卡"}, value = "获取关注公众号二维码", notes = "获取关注公众号二维码", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "phone", value = "手机号"),
+            @ApiImplicitParam(name = "checkCode", value = "验证码"),
+            @ApiImplicitParam(name = "nickName", value = "会员名"),
+            @ApiImplicitParam(name = "birthday", value = "生日"),
+    })
+    public Result<String> queryMemberIsExist(@RequestParam String merchantCode, String storeId,
+                                     @RequestParam String phone, @RequestParam String checkCode,
+                                     @RequestParam String nickName, @RequestParam String birthday) {
+
+        String result = merchantMenberService.queryMemberIsExist(merchantCode, storeId, phone, checkCode, nickName, birthday);
+        return ResultGenerator.genSuccessResult(result);
+    }
+
+    @GetMapping("/queryMemberIsExistV2")
+    @ApiOperation(tags = {"会员开卡"}, value = "获取关注公众号二维码", notes = "获取关注公众号二维码", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "merchantCode", value = "商家编码"),
+            @ApiImplicitParam(name = "storeId", value = "门店Id"),
+            @ApiImplicitParam(name = "phone", value = "手机号"),
+            @ApiImplicitParam(name = "checkCode", value = "验证码"),
+            @ApiImplicitParam(name = "nickName", value = "会员名"),
+            @ApiImplicitParam(name = "birthday", value = "生日"),
+    })
+    public Result<String> queryMemberIsExistV2(String merchantCode, String storeId,
+                                             @RequestParam String phone, @RequestParam String checkCode,
+                                             @RequestParam String nickName, @RequestParam String birthday) {
+
+        String result = merchantMenberService.queryMemberIsExistV2(merchantCode, storeId, phone, checkCode, nickName, birthday);
+        return ResultGenerator.genSuccessResult(result);
+    }
+
+    @GetMapping("/queryIsOenCardSuccess")
+    @ApiOperation(value = "会员是否开卡成功", notes = "会员是否开卡成功", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "merchantCode", value = "商家编码", required = true),
+            @ApiImplicitParam(name = "storeId", value = "门店Id", required = true),
+            @ApiImplicitParam(name = "phone", value = "手机号", required = true),
+    })
+    public Result queryIsOenCardSuccess(@RequestParam String phone, @RequestParam String merchantCode, @RequestParam String storeId) {
+        MerchantMenber merchantMenber = new MerchantMenber();
+        merchantMenber.setStoreId(storeId);
+        merchantMenber.setPhone(phone);
+        merchantMenber.setMerchantCode(merchantCode);
+        List<MerchantMenber> queryMerchantMenberList = merchantMenberService.queryMerchantMenberList(merchantMenber);
+        if (queryMerchantMenberList != null && queryMerchantMenberList.size() > 0) {
+            merchantMenber = queryMerchantMenberList.get(0);
+            if (StringUtil.isEmpty(merchantMenber.getOpenid())) {
+                return ResultGenerator.genFailResult("请稍等，会员还未进行绑卡");
+            } else {
+                return ResultGenerator.genSuccessResult("开卡成功");
+            }
+        } else {
+            return ResultGenerator.genFailResult("开卡失败");
+        }
+    }
+
+    public void dealMemberActivity(MerchantMenber merchantMenber) {
+        ActivityActivate querActivityActivate = new ActivityActivate();
+        querActivityActivate.setStoreId(merchantMenber.getStoreId());
+        List<ActivityActivate> activityActivateList = activityActivateService.queryActivityActivateList(querActivityActivate);
+        if (activityActivateList != null && activityActivateList.size() > 0) {
+            querActivityActivate = activityActivateList.get(0);
+            MerchantMenberRecharge merchantMenberRecharge = new MerchantMenberRecharge();//增加会员的储值记录
+            merchantMenberRecharge.setMerchantCode(merchantMenber.getMerchantCode());
+            merchantMenberRecharge.setMerchantName(merchantMenber.getMerchantName());
+            merchantMenberRecharge.setStoreId(merchantMenber.getStoreId());
+            merchantMenberRecharge.setStoreName(merchantMenber.getStoreName());
+            merchantMenberRecharge.setCreateDt(new Date());
+            merchantMenberRecharge.setMemberCode(merchantMenber.getMemberCode());
+            merchantMenberRecharge.setNickName(merchantMenber.getNickName());
+            merchantMenberRecharge.setPhone(merchantMenber.getPhone());
+            merchantMenberRecharge.setRechargeMoney(0d);
+            merchantMenberRecharge.setGiveMoney(querActivityActivate.getGiveMoney());
+            merchantMenberRecharge.setPayType(2);
+            merchantMenberRechargeService.saveMerchantMenberRecharge(merchantMenberRecharge);
+            //更新会员的赠送金额
+            MerchantMenber updateMerchantMenber = new MerchantMenber();
+            updateMerchantMenber.setId(merchantMenber.getId());
+            if (merchantMenber.getTotalGiveFee() == null) {
+                merchantMenber.setTotalGiveFee(0.0);
+            }
+            updateMerchantMenber.setTotalGiveFee(merchantMenber.getTotalGiveFee() + querActivityActivate.getGiveMoney());
+            if (merchantMenber.getUsableGiveFee() == null) {
+                merchantMenber.setUsableGiveFee(0.0);
+            }
+
+            updateMerchantMenber.setUsableGiveFee(merchantMenber.getUsableGiveFee() + querActivityActivate.getGiveMoney());
+            merchantMenberService.updateMerchantMenber(updateMerchantMenber);
+        }
+    }
+
+
+    @DeleteMapping("/{id}")
+    @ApiOperation(value = "删除数据", notes = "根据id删除数据", httpMethod = "DELETE")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "查询的id实例", paramType = "path", dataType = "Integer", required = true)})
+    public Result delete(@PathVariable Integer id) {
+        MerchantMenber merchantMenber = new MerchantMenber();
+        merchantMenber.setId(id);
+        merchantMenberService.deleteMerchantMenber(merchantMenber);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @PutMapping
+    @ApiOperation(value = "更新数据", notes = "根据内容更新数据", httpMethod = "PUT")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "MerchantMenber", value = "更新的MerchantMenber实例", paramType = "body", dataType = "MerchantMenber", required = true)})
+    public Result update(@RequestBody MerchantMenber merchantMenber) {
+        merchantMenberService.updateMerchantMenber(merchantMenber);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @PostMapping("/queryDetailByMemberCode")
+    @ApiOperation(value = "获取单个值", notes = "查看单个项目的内容", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "MerchantMenber", value = "查询的实例信息", paramType = "body", required = true, dataType = "MerchantMenber")})
+    public Result detail(@RequestBody MerchantMenber merchantMenber) {
+        MerchantMenber queryerchantMenber = new MerchantMenber();
+        queryerchantMenber.setMemberCode(merchantMenber.getMemberCode());
+        queryerchantMenber = merchantMenberService.queryMerchantMenber(merchantMenber);
+        return ResultGenerator.genSuccessResult(queryerchantMenber);
+    }
+
+    @PostMapping("/queryMerchantMemberData")
+    @ApiOperation(tags = {"页面-会员_数据"}, value = "查询当前商家的会员信息", notes = "查看单个项目的内容", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "MerchantMenber", value = "查询的实例信息", paramType = "body", required = true, dataType = "MerchantMenber")})
+    public Result queryMerchantMemberData(@RequestBody MerchantMenber merchantMenber) {
+        UserApp tokenUa = userAppService.queryUserAppByToken();
+        merchantMenber.setMerchantCode(tokenUa.getMerchantCode());
+
+        if (StringUtil.isEmpty(merchantMenber.getMerchantCode())) {
+            return ResultGenerator.genFailResult("无商家编码！");
+        }
+        // 当前时间毫秒数
+        long current = System.currentTimeMillis();
+        // 今天零点零分零秒的毫秒数
+        long zeroT = current / (1000 * 3600 * 24) * (1000 * 3600 * 24) - TimeZone.getDefault().getRawOffset();
+        String zero = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(zeroT);
+        // 今天23点59分59秒的毫秒数
+        long endT = zeroT + 24 * 60 * 60 * 1000 - 1;
+        String end = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(endT);
+        Map<String, String> memberMap = new HashMap<>();
+        memberMap.put("startTime", zero);
+        memberMap.put("endTime", end);
+        memberMap.put("merchantCode", merchantMenber.getMerchantCode());
+        Map<String, String> totalMemberMap = new HashMap<>();
+        totalMemberMap.put("endTime", end);
+        totalMemberMap.put("merchantCode", merchantMenber.getMerchantCode());
+        // 查询今日会员充值金额
+        double todayRecharg = merchantMenberService.queryMerchantMemberBill(null, "1", merchantMenber.getMerchantCode(), zero, end);
+        // 查询今日会员消费金额
+        double todayConsume = merchantMenberService.queryMerchantMemberBill(null, "0", merchantMenber.getMerchantCode(), zero, end);
+        // 查询今日会员线上充值金额 + app扫码充值
+        double onlineRecharg = merchantMenberService.queryMerchantMemberBill("0", "1", merchantMenber.getMerchantCode(), zero, end);
+        // 查询今日会员扫码充值
+        double scanRecharge = merchantMenberService.queryMerchantMemberBill("2", "1", merchantMenber.getMerchantCode(), zero, end);
+        // 查询今日会员现金充值金额
+        double cashRecharg = merchantMenberService.queryMerchantMemberBill("1", "1", merchantMenber.getMerchantCode(), zero, end);
+        // 查询会员可用充值金额
+        double totalRemainRecharg = merchantMenberService.queryMerchantMenberUsableRechargeFee(totalMemberMap);
+        // 查询会员充值总额
+        double totalRecharg = merchantMenberService.queryMerchantMemberBill(null, "1", merchantMenber.getMerchantCode(), null, null);
+        // 查询会员消费总额
+        double totalConsume = merchantMenberService.queryMerchantMemberBill(null, "0", merchantMenber.getMerchantCode(), null, null);
+        // 查询今日新增会员人数
+        double todayRegistNum = merchantMenberService.queryMerchantMenberNumByTime(memberMap);
+        // 查询所有会员数
+        double totalMemberNum = merchantMenberService.queryMerchantMenberNumByTime(totalMemberMap);
+        double giveReturn = merchantMenberService.queryMerchantGiveMoney(merchantMenber.getMerchantCode());
+        MerchantMenber queryerchantMenber = new MerchantMenber();
+        queryerchantMenber.setMerchantCode(merchantMenber.getMerchantCode());
+        queryerchantMenber.setTodayRecharg(todayRecharg);
+        queryerchantMenber.setTodayConsume(todayConsume);
+        queryerchantMenber.setTodayRegistNum(todayRegistNum);
+        queryerchantMenber.setOnlineRecharg(onlineRecharg);
+        queryerchantMenber.setGiveReturn(giveReturn);
+        queryerchantMenber.setCashRecharg(cashRecharg);
+        queryerchantMenber.setTotalRecharg(totalRecharg);
+        queryerchantMenber.setTotalRemainRecharg(totalRemainRecharg);
+        queryerchantMenber.setTotalConsume(totalConsume);
+        queryerchantMenber.setTotalMemberNum(totalMemberNum);
+        queryerchantMenber.setScanRecharge(scanRecharge);
+        return ResultGenerator.genSuccessResult(queryerchantMenber);
+    }
+
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantMenberRechargeController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantMenberRechargeController.java
new file mode 100644
index 0000000..86dc847
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantMenberRechargeController.java
@@ -0,0 +1,100 @@
+package cn.pluss.platform.controller;
+
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.constants.ProjectConstant;
+import cn.pluss.platform.entity.MerchantMenberRecharge;
+import cn.pluss.platform.merchantMenberRecharge.MerchantMenberRechargeService;
+import cn.pluss.platform.util.StringUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+@RestController
+@RequestMapping("/merchantMenberRecharge")
+@Transactional
+@Api(value = "MerchantMenberRecharge控制类", tags = {"MerchantMenberRecharge接口"})
+public class MerchantMenberRechargeController {
+
+    @Resource
+    private MerchantMenberRechargeService merchantMenberRechargeService;
+
+    @GetMapping
+    @ApiOperation(value = "获取全部", notes = "返回分页过后的数据", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "page", value = "查询页码", paramType = "query", dataType = "Integer", defaultValue = "0"),
+            @ApiImplicitParam(name = "size", value = "每页数据量", paramType = "query", dataType = "Integer", defaultValue = "0")
+    })
+    public Result<PageInfo<MerchantMenberRecharge>> list(@RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
+        if (size == null || size == 0) {
+            size = ProjectConstant.PAGE_SIZE;
+        }
+        if (page == null || page == 0) {
+            page = 1;
+        }
+        Map<String, Object> map = new HashMap<String, Object>();
+        map.put("pageSize", size);
+        map.put("offset", (page - 1) * size);
+        List<MerchantMenberRecharge> merchantMenberRechargeList = merchantMenberRechargeService.queryMerchantMenberRechargePage(map);
+        Integer count = merchantMenberRechargeService.queryMerchantMenberRechargePageCount(map);
+        //返回参数
+        PageInfo pager = new PageInfo<MerchantMenberRecharge>(count.longValue(), (long) StringUtil.getPageCount(count, size), page.longValue(), size.longValue(), merchantMenberRechargeList);
+        return ResultGenerator.genSuccessResult(pager);
+    }
+
+    @PostMapping
+    @ApiOperation(value = "添加数据", notes = "添加新的数据", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "MerchantMenberRecharge", value = "待添加的MerchantMenberRecharge实例", paramType = "body", dataType = "MerchantMenberRecharge", required = true)
+    })
+    public Result add(@RequestBody MerchantMenberRecharge merchantMenberRecharge) {
+        merchantMenberRechargeService.saveMerchantMenberRecharge(merchantMenberRecharge);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @DeleteMapping("/{id}")
+    @ApiOperation(value = "删除数据", notes = "根据id删除数据", httpMethod = "DELETE")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "查询的id实例", paramType = "path", dataType = "Integer", required = true)
+    })
+    public Result delete(@PathVariable Integer id) {
+        MerchantMenberRecharge merchantMenberRecharge = new MerchantMenberRecharge();
+        merchantMenberRecharge.setId(id);
+        merchantMenberRechargeService.deleteMerchantMenberRecharge(merchantMenberRecharge);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @PutMapping
+    @ApiOperation(value = "更新数据", notes = "根据内容更新数据", httpMethod = "PUT")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "MerchantMenberRecharge", value = "更新的MerchantMenberRecharge实例", paramType = "body", dataType = "MerchantMenberRecharge", required = true)
+    })
+    public Result update(@RequestBody MerchantMenberRecharge merchantMenberRecharge) {
+        merchantMenberRechargeService.updateMerchantMenberRecharge(merchantMenberRecharge);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @GetMapping("/{id}")
+    @ApiOperation(value = "获取单个值", notes = "查看单个项目的内容", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "查询的id", paramType = "path", required = true, dataType = "Integer", defaultValue = "0")
+    })
+    public Result detail(@PathVariable Long id) {
+        MerchantMenberRecharge merchantMenberRecharge = new MerchantMenberRecharge();
+        merchantMenberRecharge.setId(id.intValue());
+        merchantMenberRecharge = merchantMenberRechargeService.queryMerchantMenberRecharge(merchantMenberRecharge);
+        return ResultGenerator.genSuccessResult(merchantMenberRecharge);
+    }
+
+}
+
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantMoveRecordsController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantMoveRecordsController.java
new file mode 100644
index 0000000..130c057
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantMoveRecordsController.java
@@ -0,0 +1,33 @@
+package cn.pluss.platform.controller;
+
+
+import cn.pluss.platform.annotation.OpLog;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.entity.MerchantMoveRecords;
+import cn.pluss.platform.merchant.move.MerchantMoveRecordsService;
+import lombok.val;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 商户动态码生成记录 前端控制器
+ * </p>
+ *
+ * @author bzg
+ * @since 2021-07-30
+ */
+@RestController
+@RequestMapping("/merchantMoveRecords")
+public class MerchantMoveRecordsController extends BaseModelController<MerchantMoveRecordsService, MerchantMoveRecords> {
+
+    @OpLog(opName = "APP生成动态码", opDetail = "APP生成动态码", opCode = "APP_DYNAMIC")
+    @GetMapping("/getDynamicCode")
+    public Result<Object> getToken() {
+        val record = baseService.createToken();
+        return ResultGenerator.genSuccessResult(record);
+    }
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantOrderController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantOrderController.java
new file mode 100644
index 0000000..27e4a5e
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantOrderController.java
@@ -0,0 +1,1197 @@
+package cn.pluss.platform.controller;
+
+import cn.pluss.platform.IdCardService;
+import cn.pluss.platform.annotation.OpLog;
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultCode;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.constants.ProjectConstant;
+import cn.pluss.platform.dto.*;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.MerchantChannelStatusMapper;
+import cn.pluss.platform.mapper.MerchantOrderVOMapper;
+import cn.pluss.platform.memberOrder.MemberOrderService;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantIncome.MerchantIncomeService;
+import cn.pluss.platform.merchantMenber.MerchantMenberService;
+import cn.pluss.platform.merchantMenberRecharge.MerchantMenberRechargeService;
+import cn.pluss.platform.merchantOrder.MerchantOrderService;
+import cn.pluss.platform.notice.NoticeService;
+import cn.pluss.platform.pay.PayService;
+import cn.pluss.platform.ryx.pay.RyxPayService;
+import cn.pluss.platform.sxf.pay.SxfPayService;
+import cn.pluss.platform.user.impl.GeneralPushUtil;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.util.StringUtil;
+import cn.pluss.platform.vo.MemberScanVO;
+import cn.pluss.platform.vo.MerchantOrderVO;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+@Slf4j
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/merchantOrder")
+@Api(value = "MerchantOrder控制类", tags = {"MerchantOrder接口"})
+public class MerchantOrderController {
+
+    @Autowired
+    private GeneralPushUtil generalPushUtil;
+    private final MerchantOrderVOMapper merchantOrderVOMapper;
+    private final MerchantOrderService merchantOrderService;
+    private final MerchantBaseInfoService merchantBaseInfoService;
+    private final UserAppService userAppService;
+    private final MemberOrderService memberOrderService;
+    private final MerchantIncomeService merchantIncomeService;
+    private final NoticeService noticeService;
+    private final MerchantMenberService merchantMenberService;
+    private final MerchantMenberRechargeService merchantMenberRechargeService;
+    private final SxfPayService sxfPayService;
+    private final RyxPayService ryxPayService;
+    private final MerchantChannelStatusMapper merchantChannelStatusMapper;
+
+    @Setter(onMethod_ = {@Lazy, @Autowired})
+    private IdCardService idCardService;
+
+    @Setter(onMethod_ = {@Autowired, @Qualifier("ysPayOldService")})
+    private PayService ysPayOldService;
+
+    // 微信支付无法确认支付结果状态
+    private String[] wechatPayNotSureResult = new String[]{"SYSTEMERROR", "USERPAYING", "BANKERROR"};
+
+
+    @GetMapping("/plugin/order/page")
+    @ApiOperation(value = "获取插件分页订单信息", notes = "返回分页过后的数据", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "page", value = "查询页码", paramType = "query", dataType = "Integer", defaultValue = "0"),
+            @ApiImplicitParam(name = "size", value = "每页数据量", paramType = "query", dataType = "Integer", defaultValue = "0")})
+    public Result<Object> pluginOrderPage(@RequestParam(defaultValue = "1") Integer page,
+                                  @RequestParam(defaultValue = "10") Integer size,MerchantOrder query) {
+        UserApp app = userAppService.queryUserAppByToken();
+        Page<MerchantOrder> pageInfo = new Page<>();
+        pageInfo.setCurrent(page);
+        pageInfo.setSize(size);
+        query.setUserId(Integer.parseInt(String.valueOf(app.getUserId())));
+        query.setOrderType("99");
+        pageInfo = merchantOrderService.pageInfo(pageInfo, query);
+        return ResultGenerator.genSuccessResult(pageInfo);
+    }
+
+    /**
+     * 获取插件账单
+     * @param page
+     * @param size
+     * @return
+     */
+    @GetMapping
+    @ApiOperation(value = "获取全部", notes = "返回分页过后的数据", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "page", value = "查询页码", paramType = "query", dataType = "Integer", defaultValue = "0"),
+            @ApiImplicitParam(name = "size", value = "每页数据量", paramType = "query", dataType = "Integer", defaultValue = "0")})
+    public Result<PageInfo<MerchantOrder>> list(@RequestParam(defaultValue = "1") Integer page,
+                                                @RequestParam(defaultValue = "10") Integer size) {
+
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageSize", size);
+        map.put("offset", (page - 1) * size);
+        List<MerchantOrder> merchantOrderList = merchantOrderService.queryMerchantOrderPage(map);
+        for (MerchantOrder o : merchantOrderList) {
+            MerchantBaseInfo merchantBaseInfo = new MerchantBaseInfo();
+            merchantBaseInfo.setMerchantCode(o.getMerchantCode());
+            merchantBaseInfo = merchantBaseInfoService.queryMerchantBaseInfo(merchantBaseInfo);
+            o.setAlias(merchantBaseInfo.getAlias());
+
+        }
+        Integer count = merchantOrderService.queryMerchantOrderPageCount(map);
+        // 返回参数
+        PageInfo<MerchantOrder> pager = new PageInfo<>(count.longValue(), (long) StringUtil.getPageCount(count,size), page.longValue(), size.longValue(),
+                merchantOrderList);
+        return ResultGenerator.genSuccessResult(pager);
+    }
+
+    // 添加数据
+    @PostMapping
+    @ApiOperation(value = "添加数据", notes = "添加新的数据", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "MerchantOrder", value = "待添加的MerchantOrder实例", paramType = "body", dataType = "MerchantOrder", required = true)})
+    public Result add(@RequestBody MerchantOrder merchantOrder) {
+        merchantOrderService.save(merchantOrder);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    // 查询商家订单的统计数据
+    @PostMapping("/queryMerchantOrderCensusData")
+    @ApiOperation(value = "查询商家订单的统计数据", notes = "查询商家订单的统计数据", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "MerchantOrder", value = "待添加的MerchantOrder实例", paramType = "body", dataType = "MerchantOrder", required = true)})
+    public Result queryMerchantOrderCensusData(@RequestBody MerchantOrder merchantOrder) {
+        UserApp tokenUa = userAppService.queryUserAppByToken();
+        merchantOrder.setMerchantCode(tokenUa.getMerchantCode());
+
+        if (StringUtil.isEmpty(merchantOrder.getMerchantCode())) {
+            return ResultGenerator.genFailResult("无商家编码");
+        }
+        Map<String, Object> queryMap = new HashMap<String, Object>(16);
+        Calendar startCalendar = Calendar.getInstance();
+        try {
+            startCalendar.setTime(merchantOrder.getStartTime());// 设置查询的开始时间
+        } catch (Exception e) {
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+        }
+        queryMap.put("startTime", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(startCalendar.getTime()));
+        Calendar endCalendar = Calendar.getInstance();
+        try {
+            endCalendar.setTime(merchantOrder.getEndTime());// 设置查询的结束时间
+        } catch (Exception e) {
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+        }
+        endCalendar.set(Calendar.HOUR_OF_DAY, 23);
+        endCalendar.set(Calendar.MINUTE, 59);
+        endCalendar.set(Calendar.SECOND, 59);
+        queryMap.put("endTime", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(endCalendar.getTime()));
+        queryMap.put("merchantCode", merchantOrder.getMerchantCode());
+        // 获取指定时间段内的交易数量
+        Integer orderCount = merchantOrderService.queryMerchantOrderPageCountByTime(queryMap);
+        // 获取指定时间内的交易金额
+        Double totalOrderFee = merchantOrderService.queryMerchantOrderFeeByTime(queryMap);
+        Map<String, String> resultMap = new HashMap<>();
+        resultMap.put("orderCount", orderCount.toString());
+        resultMap.put("totalOrderFee", totalOrderFee.toString());
+        return ResultGenerator.genSuccessResult(resultMap);
+    }
+
+    // 查询商家订单集合
+    @PostMapping("/queryMerchantOrderList")
+    @ApiOperation(tags = {"页面-账单_账单", "页面-日账单", "页面-周账单", "页面-月账单"}, value = "查询商家订单集合", notes = "查询商家订单集合", httpMethod = "POST")
+    public Result<Map<String, Object>> queryMerchantOrderList(@Valid @RequestBody MerchantOrder merchantOrder) {
+        UserApp tokenUa = userAppService.queryUserAppByToken();
+        merchantOrder.setMerchantCode(tokenUa.getMerchantCode());
+        Map<String, Object> resultMap = merchantOrderService.billCollect(merchantOrder);
+        return ResultGenerator.genSuccessResult(resultMap);
+    }
+
+    // 查询首页统计数据
+    @PostMapping("/queryHomePageData")
+    @ApiOperation(tags = {"页面-首页"}, value = "查询首页统计数据", notes = "查询首页统计数据", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "UserApp", value = "待查询的UserApp实例", paramType = "body", dataType = "UserApp", required = true)})
+    public Result<Map<String, Object>> queryHomePageData(@RequestBody UserApp userApp) {
+        Map<String, Object> resultMap = merchantOrderService.queryHomePageData(userApp);
+        return ResultGenerator.genSuccessResult(resultMap);
+    }
+
+    // 查询商家订单集合（按天分组）
+    @PostMapping("/queryMerchantOrderListGroupByDay")
+    @ApiOperation(value = "查询商家订单集合（按天分组）", notes = "查询商家订单集合（按天分组）", httpMethod = "POST")
+    public Result queryMerchantOrderListGroupByDay(@RequestBody MerchantOrder merchantOrder) {
+        UserApp tokenUa = userAppService.queryUserAppByToken();
+        merchantOrder.setMerchantCode(tokenUa.getMerchantCode());
+
+        if (StringUtil.isEmpty(merchantOrder.getMerchantCode())) {
+            return ResultGenerator.genFailResult("无商家编码");
+        }
+        Map<String, Object> queryMap = new HashMap<String, Object>(16);
+        if (StringUtil.isNotEmpty(merchantOrder.getStartTime())) {
+            queryMap.put("startTime", merchantOrder.getStartTime());
+        }
+        if (StringUtil.isNotEmpty(merchantOrder.getEndTime())) {
+            queryMap.put("endTime", merchantOrder.getEndTime());
+        }
+        queryMap.put("merchantCode", merchantOrder.getMerchantCode());
+        if (merchantOrder.getSize() == null || merchantOrder.getSize() == 0) {
+            merchantOrder.setSize(ProjectConstant.PAGE_SIZE);
+        }
+        if (merchantOrder.getPage() == null || merchantOrder.getPage() == 0) {
+            merchantOrder.setPage(1);
+        }
+        queryMap.put("pageSize", merchantOrder.getSize());
+        queryMap.put("offset", (merchantOrder.getPage() - 1) * merchantOrder.getSize());
+        if (StringUtil.isNotEmpty(merchantOrder.getPayTypeCode())) {// 确定查询条件
+            String[] payTypeCode = merchantOrder.getPayTypeName().split(",");
+            List<String> payTypeCodeList = new ArrayList<>(Arrays.asList(payTypeCode));
+            List<String> p = new ArrayList<String>();
+            if (payTypeCodeList.contains("wechatPay")) {
+                p.add("wechatPay");
+                p.add("leshuaPay1");
+                p.add("leshuaPay-1");
+                p.add("leshuaPay");
+            }
+            if (payTypeCodeList.contains("aliPay")) {
+                p.add("aliPay");
+                p.add("leshuaPay0");
+                p.add("leshuaPay-0");
+                p.add("leshuaPay");
+            }
+            if (payTypeCodeList.contains("bank")) {
+                p.add("leshuaPay2");
+                p.add("bank");
+            }
+            queryMap.put("payTypeCodeList", p);
+        }
+        if (merchantOrder.getStatus() != null && !StringUtil.isEmpty(merchantOrder.getStatus())) {
+            queryMap.put("status", merchantOrder.getStatus());
+        }
+        if (merchantOrder.getStoreId() != null && StringUtil.isEmpty(merchantOrder.getStoreId())) {
+            String[] storeId = merchantOrder.getStoreId().split(",");
+            List<String> storeIdList = new ArrayList<>(Arrays.asList(storeId));
+            queryMap.put("storeId", storeIdList);
+        }
+        if (merchantOrder.getStaffCode() != null && !StringUtil.isEmpty(merchantOrder.getStaffCode())) {
+            String[] staffCode = merchantOrder.getStaffCode().split(",");
+            List<String> staffCodeList = new ArrayList<>(Arrays.asList(staffCode));
+            queryMap.put("staffCode", staffCodeList);
+        }
+        List<MerchantOrder> merchantOrders = merchantOrderService.queryMerchantOrderPageByTime(queryMap);
+        Map<String, Object> resultMap = new HashMap<>();
+        if (merchantOrders != null) {
+            List<String> timeStringList = new ArrayList<String>();
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            for (MerchantOrder merchantOrder2 : merchantOrders) {
+                // 获取当前交易的时间
+                String time = sdf.format(merchantOrder2.getCreateDt());
+                if (!timeStringList.contains(time)) {
+                    timeStringList.add(time);
+                    resultMap.put(time, new ArrayList<MerchantOrder>());
+                }
+                ((List<MerchantOrder>) resultMap.get(time)).add(merchantOrder2);// 将查询到的数据按天进行分组
+            }
+        }
+        Integer count = merchantOrderService.queryMerchantOrderPageCountByTime(queryMap);
+        PageInfo<MerchantOrder> pager = new PageInfo<MerchantOrder>(count.longValue(),
+                (long) StringUtil.getPageCount(count, merchantOrder.getSize()), merchantOrder.getPage().longValue(),
+                merchantOrder.getSize().longValue(), merchantOrders);// 返回参数
+        resultMap.put("pager", pager);
+        return ResultGenerator.genSuccessResult(resultMap);
+    }
+
+    // 查询商家对账数据
+    @PostMapping("/queryCheckOrderData")
+    @ApiOperation(value = "查询商家对账数据", notes = "查询商家对账数据", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "MerchantOrder", value = "待添加的MerchantOrder实例", paramType = "body", dataType = "MerchantOrder", required = true)})
+    public Result queryCheckOrderData(@RequestBody MerchantOrder merchantOrder) {
+        Map<String, Object> resultMap = merchantOrderService.queryCheckOrderData(merchantOrder);
+        return ResultGenerator.genSuccessResult(resultMap);
+    }
+
+    // 删除数据
+    @DeleteMapping("/{id}")
+    @ApiOperation(value = "删除数据", notes = "根据id删除数据", httpMethod = "DELETE")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "查询的id实例", paramType = "path", dataType = "Integer", required = true)})
+    public Result delete(@PathVariable Integer id) {
+        MerchantOrder merchantOrder = new MerchantOrder();
+        merchantOrder.setId(id.longValue());
+        merchantOrderService.removeById(merchantOrder.getId());
+        return ResultGenerator.genSuccessResult();
+    }
+
+    // 更新数据
+    @PutMapping
+    @ApiOperation(value = "更新数据", notes = "根据内容更新数据", httpMethod = "PUT")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "MerchantOrder", value = "更新的MerchantOrder实例", paramType = "body", dataType = "MerchantOrder", required = true)})
+    public Result update(@RequestBody MerchantOrder merchantOrder) {
+        merchantOrderService.updateById(merchantOrder);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    // 获取单个值
+    @GetMapping("/{orderNumber}")
+    @ApiOperation(value = "获取单个值", notes = "查看单个项目的内容", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "orderNumber", value = "查询的orderNumber", paramType = "orderNumber", required = true, dataType = "String")})
+    public Result<MerchantOrder> detail(@PathVariable String orderNumber) {
+        if (StringUtil.isEmpty(orderNumber)) {
+            return ResultGenerator.genFailResult("无订单号");
+        }
+        MerchantOrderVO merchantOrderVO = new MerchantOrderVO();
+        merchantOrderVO.setOrderNumber(orderNumber);
+        merchantOrderVO.setStatus("1");
+        List<MerchantOrderVO> result = merchantOrderVOMapper.selectList(new QueryWrapper<>(merchantOrderVO));
+        if (result != null && result.size() > 0) {
+            merchantOrderVO = result.get(0);
+            MerchantBaseInfo merchantBaseInfo = new MerchantBaseInfo();
+            merchantBaseInfo.setMerchantCode(merchantOrderVO.getMerchantCode());
+            merchantBaseInfo = merchantBaseInfoService.queryMerchantBaseInfo(merchantBaseInfo);
+            merchantOrderVO.setAlias(merchantBaseInfo.getAlias());
+            merchantOrderVO.setMerchantName(merchantBaseInfo.getAlias());
+            if (!"1".equals(merchantOrderVO.getOrderType())) {
+                // 除开主扫可以存在店员，其他的收银员均为老板
+                merchantOrderVO.setStaffName(merchantBaseInfo.getContactName());
+            }
+
+            Integer userId = merchantOrderVO.getUserId();
+            IdCard idCard = new IdCard().setUserId(userId + "");
+            idCard = idCardService.getOne(new QueryWrapper<>(idCard));
+            MerchantOrder.updateStaffName(merchantOrderVO, merchantOrderVO.getMerchantCode(), idCard);
+            MerchantOrder.updateOrderTypeDesc(merchantOrderVO);
+        }
+        return ResultGenerator.genSuccessResult(merchantOrderVO);
+    }
+
+
+    /**
+     * belongCalendar:(判断在不在营业时间范围内). <br/>
+     *
+     * @param nowTime
+     * @param beginTime
+     * @param endTime
+     * @return
+     *
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    private static boolean belongCalendar(Date nowTime, Date beginTime, Date endTime) {
+        Calendar date = Calendar.getInstance();
+        date.setTime(nowTime);
+        Calendar begin = Calendar.getInstance();
+        begin.setTime(beginTime);
+        Calendar end = Calendar.getInstance();
+        end.setTime(endTime);
+        if (date.after(begin) && date.before(end)) {
+            return true;
+        } else if (nowTime.compareTo(beginTime) == 0 || nowTime.compareTo(endTime) == 0) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    @PostMapping("/memberRecharge")
+    @ApiOperation(value = "会员充值", notes = "APP扫码-会员充值", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "MemberRechargeDTO", value = "MemberRechargeDTO", paramType = "MemberRechargeDTO", dataType = "MemberRechargeDTO", required = true)})
+    public Result<Map<String, Object>> memberRecharge(@RequestBody MemberRechargeDTO memberRechargeDTO) {
+
+        try {
+            UserApp userApp = userAppService.queryUserAppByToken();
+            if(userApp == null) {
+                MsgException.throwException("登陆信息异常！");
+            }
+            memberRechargeDTO.setMerchantCode(userApp.getMerchantCode());
+            memberRechargeDTO.setUserId(String.valueOf(userApp.getUserId()));
+            memberRechargeDTO.setUserName(userApp.getUserName());
+            return merchantOrderService.toMemberRecharge(memberRechargeDTO);
+        }catch (Exception e){
+            e.printStackTrace();
+            MsgException.throwException(e.getMessage());
+        }
+        return ResultGenerator.genFailResult("支付失败");
+    }
+
+
+    /**
+     * 扫用户付款ma进行收款
+     * @param merchantOrderDTO
+     * @return
+     */
+    @OpLog(opCode = "APP_SCAN_PAY", opDetail = "app主扫收款", opName = "APP主扫收款")
+    @PostMapping("/scanPay")
+    @ApiOperation(tags = {"页面-收款"}, value = "扫码支付", notes = "扫码支付", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "MerchantOrderVo", value = "扫码支付需要传递的参数实例", paramType = "body", dataType = "MerchantOrderVo", required = true)})
+    public Result<Object> scanPay(@RequestBody MerChantOrderDTO merchantOrderDTO) {
+        UserApp tokenUa = userAppService.queryUserAppByToken();
+        merchantOrderDTO.setMerchantCode(tokenUa.getMerchantCode());
+        try {
+            return merchantOrderService.toActivePay(merchantOrderDTO);
+        } catch (Exception e){
+            e.printStackTrace();
+            return ResultGenerator.genFailResult(e.getMessage());
+        }
+    }
+
+    /**
+     * 主扫会员支付
+     * @param memberScanPayDTO
+     * @return
+     */
+    @PostMapping("/memberScanPay")
+    @ApiOperation(tags = {"页面-收款"}, value = "扫会员码支付", notes = "扫会员码支付", httpMethod = "POST")
+    public Result<MemberScanVO> memberScanPay(@RequestBody MemberScanPayDTO memberScanPayDTO) {
+        log.error("=========参数===============" + JSONObject.toJSONString(memberScanPayDTO));
+        UserApp tokenUa = userAppService.queryUserAppByToken();
+        memberScanPayDTO.setMerchantCode(tokenUa.getMerchantCode());
+        try{
+            return merchantOrderService.toMemberScanPay(memberScanPayDTO);
+        }catch (Exception e){
+            e.printStackTrace();
+            return ResultGenerator.genFailResult(e.getMessage());
+        }
+    }
+
+    /**
+     * merchantIncome:(添加收益记录). <br/>
+     *
+     *
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    private void merchantIncome(MerchantOrder merchantOrder, String payTypeCode) {
+        MerchantIncome merchantIncome = new MerchantIncome();
+        if ("1".equals(payTypeCode)) {
+            merchantIncome.setMerchantCode(merchantOrder.getMerchantCode());
+            merchantIncome.setMerchantName(merchantOrder.getMerchantName());
+            merchantIncome.setStoreId(merchantOrder.getStoreId());
+            merchantIncome.setStoreName(merchantOrder.getStoreName());
+            merchantIncome.setDealFee(merchantOrder.getConsumeFee());
+            merchantIncome.setIncomeFee(merchantOrder.getEnterFee());
+            merchantIncome.setPayTypeCode(payTypeCode);
+            merchantIncome.setPayTypeName("微信");
+            merchantIncome.setCreateTime(merchantOrder.getTransDt());
+            merchantIncomeService.saveMerchantIncome(merchantIncome);
+        } else if ("0".equals(payTypeCode)) {
+            merchantIncome.setMerchantCode(merchantOrder.getMerchantCode());
+            merchantIncome.setMerchantName(merchantOrder.getMerchantName());
+            merchantIncome.setStoreId(merchantOrder.getStoreId());
+            merchantIncome.setStoreName(merchantOrder.getStoreName());
+            merchantIncome.setDealFee(merchantOrder.getConsumeFee());
+            merchantIncome.setIncomeFee(merchantOrder.getEnterFee());
+            merchantIncome.setPayTypeCode(payTypeCode);
+            merchantIncome.setPayTypeName("支付宝");
+            merchantIncome.setCreateTime(merchantOrder.getTransDt());
+            merchantIncomeService.saveMerchantIncome(merchantIncome);
+        }
+    }
+
+    /**
+     * LeshuaPay:(乐刷支付). <br/>
+     *
+     * @param merchantOrderDTO
+     * @return
+     *
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    private Result<Map<String, Object>> LeshuaPay(MerChantOrderDTO merchantOrderDTO, MerchantOrder order,
+                                                  MerchantBaseInfo queryMerchantBaseInfo) {
+        throw new MsgException("不支持的方法");
+//        UserApp userApp = new UserApp();
+//        userApp.setMerchantCode(queryMerchantBaseInfo.getMerchantCode());
+//        userApp.setUserType("promoter");
+//        userApp = userAppService.queryUserApp(userApp);
+//        Map<String, Object> resultMap = new HashMap<>(16);
+//        Map<String, String> reqMap = new HashMap<>(16);
+//        reqMap.put("service", "upload_authcode");
+//        reqMap.put("merchant_id", userApp.getLeshuaMchId());
+//        reqMap.put("auth_code", merchantOrderDTO.getAuthCode());
+//        reqMap.put("third_order_id", order.getOrderNumber());
+//        reqMap.put("amount", merchantOrderDTO.getConsumeFee() * 100 + "");
+//        reqMap.put("notify_url", ParametersUtil.domain + "/wap/merchant/appScanPayLeshuaCallBack");
+//        reqMap.put("nonce_str", StringUtil.genRandomNum(32));
+//        String requestPay;
+//        try {
+//            requestPay = leshuaService.requestPay(reqMap, ParametersUtil.leshuapaykey, true);
+//            Map<String, Object> map = XmlUtil.toMapLeshua(requestPay);
+//            String resp_code = (String) map.get("resp_code");
+//            if ("0".equals(resp_code)) {// 0表示通信成功
+//                String result_code = (String) map.get("result_code");
+//                if ("0".equals(result_code)) {// 0表示业务成功
+//                    String status = (String) map.get("status");// 0支付中 2支付成功 6订单关闭 8支付失败 10退款中 11退款成功 12退款失败
+//                    if ("2".equals(status)) {
+//                        String leshua_order_id = (String) map.get("leshua_order_id");
+//                        String payTime = (String) map.get("pay_time");
+//                        SimpleDateFormat sFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//                        order.setTransDt(sFormat.parse(payTime));
+//                        merchantOrderService.saveMerchantOrderStatus(leshua_order_id, order);
+//                        resultMap.put("data", order);
+//                        resultMap.put("message", "交易成功");
+//                        String pay_way = (String) map.get("pay_way");
+//                        if ("WXZF".equals(pay_way)) {
+//                            merchantIncome(order, "1");
+//                        } else if ("ZFBZF".equals(pay_way)) {
+//                            merchantIncome(order, "0");
+//                        }
+//                        UserApp userApp2 = new UserApp();
+//                        if (StringUtil.isNotEmpty(userApp.getParentId())) {
+//                            userApp2.setUserId(userApp.getParentId());// 当前商户的上级
+//                            userApp2 = userAppService.queryUserApp(userApp2);
+//                            double extendProfit = userApp2.getExtendProfit() == null ? 0d : userApp2.getExtendProfit();// 现在的推广分润
+//                            extendProfit = extendProfit + Double.parseDouble(order.getShareMoney());// 添加之后的推广分润
+//                            double tradeMoney = userApp2.getTradeMoney() == null ? 0d : userApp2.getTradeMoney();
+//                            userApp2.setTradeMoney(tradeMoney + order.getConsumeFee());// 交易额
+//                            userApp2.setExtendProfit(extendProfit);
+//                            userAppService.updateUserApp(userApp2);
+//                        }
+//                        return ResultGenerator.genSuccessResult(resultMap);
+//                    } else {
+//                        resultMap.put("data", order);
+//                        return ResultGenerator.genTransunKonwResult("交易未知", resultMap);
+//                    }
+//                } else {
+//                    resultMap.put("data", order);
+//                    return ResultGenerator.genFailResult("支付失败", resultMap);
+//                }
+//            } else {
+//                resultMap.put("data", order);
+//                return ResultGenerator.genFailResult("支付失败", resultMap);
+//            }
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//            resultMap.put("data", order);
+//            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+//            return ResultGenerator.genFailResult("支付失败", resultMap);
+//        }
+    }
+
+    // 查询微信订单支付状态
+    @PostMapping("/queryWechatOrderResult")
+    @ApiOperation(value = "查询微信订单支付状态", notes = "查询微信订单支付状态", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "queryOrderDTO", value = "扫码支付需要传递的参数实例", paramType = "body", dataType = "queryOrderDTO", required = true)})
+    public Result queryWechatOrderResult(@RequestBody QueryOrderDTO queryOrderDTO) throws Exception {
+        throw new MsgException("暂不支持该接口");
+//        if (StringUtil.isEmpty(queryOrderDTO.getMerchantCode())) {// 校验参数是否完整
+//            return ResultGenerator.genFailResult("没有商家编码");
+//        }
+//        if (StringUtil.isEmpty(queryOrderDTO.getOrderNumber())) {
+//            return ResultGenerator.genFailResult("没有订单编号");
+//        }
+//        MerchantBaseInfo merchantBaseInfo = new MerchantBaseInfo();
+//        merchantBaseInfo.setMerchantCode(queryOrderDTO.getMerchantCode());
+//        List<MerchantBaseInfo> queryMerchantBaseInfoList = merchantBaseInfoService
+//                .queryMerchantBaseInfoList(merchantBaseInfo);
+//        if (queryMerchantBaseInfoList == null || queryMerchantBaseInfoList.size() == 0) {
+//            return ResultGenerator.genFailResult("无商家信息");
+//        }
+//        merchantBaseInfo = queryMerchantBaseInfoList.get(0);
+//        Map<String, String> requestMap = new HashMap<String, String>(16);
+//        requestMap.put("appid", "wxed824282c345b7a0");
+//        requestMap.put("mch_id", "1551169371");
+//        requestMap.put("sub_mch_id", merchantBaseInfo.getSubMchId());
+//        requestMap.put("out_trade_no", queryOrderDTO.getOrderNumber());
+//        requestMap.put("nonce_str", StringUtil.genRandomNum(10));
+//        requestMap.put("sign_type", "HMAC-SHA256");
+//        requestMap.put("sign", WechatSignUtil.sha256Sign(requestMap, "7F05NZBTJ3XNDK5HLSDC3H25ZXOQKDHT"));
+//        String requestResult = WXPayHttpUtil.WXHttpPostXMLWithoutCert("https://api.mch.weixin.qq.com/pay/orderquery",
+//                requestMap);
+//        Map<String, String> map = WXPayXmlUtil.parseXMLToMap(requestResult);
+//        Map<String, Object> resultMap = new HashMap<>();
+//        MerchantOrder order = queryOrderDTO.convertMerchantOrder();
+//        if ("SUCCESS".equalsIgnoreCase(map.get("return_code"))) {
+//            if ("SUCCESS".equalsIgnoreCase(map.get("result_code"))
+//                    && "SUCCESS".equalsIgnoreCase(map.get("trade_state"))) {
+//                String transaction_id = map.get("transaction_id");
+//                String time_end = map.get("time_end");
+//                SimpleDateFormat sFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//                order.setTransDt(sFormat.parse(time_end));
+//                order = merchantOrderService.saveMerchantOrderStatus(transaction_id, order);// 更新订单的支付状态
+//                resultMap.put("merchantOrder", order);
+//                merchantIncome(order, "1");
+//                return ResultGenerator.genSuccessResult(resultMap);
+//            } else {
+//                boolean isNeedQuery = Arrays.asList(wechatPayNotSureResult).contains(map.get("trade_state"));// 判断是否需要条用查询接口
+//                if (isNeedQuery) {
+//                    resultMap.put("merchantOrder", order);
+//                    return ResultGenerator.genTransunKonwResult("交易未知", resultMap);
+//                } else {
+//                    return ResultGenerator.genFailResult("交易失败");
+//                }
+//            }
+//        }
+//        return ResultGenerator.genFailResult("交易失败");
+    }
+
+    @PostMapping("/leshuaPayQuery")
+    @ApiOperation(value = "乐刷交易结果查询", notes = "乐刷交易结果查询", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "QueryOrderDTO", value = "QueryOrderDTO实体类", paramType = "QueryOrderDTO", dataType = "QueryOrderDTO"),})
+    public Result<Object> leshuaPayQuery(@RequestBody QueryOrderDTO queryOrderDTO) throws Exception {
+        // 校验参数是否完整
+        MsgException.throwException("当前接口不可用，请升级APP后再使用！");
+        return null;
+//        if (StringUtil.isEmpty(queryOrderDTO.getMerchantCode())) {
+//            return ResultGenerator.genFailResult("没有商家编码");
+//        }
+//        if (StringUtil.isEmpty(queryOrderDTO.getOrderNumber())) {
+//            return ResultGenerator.genFailResult("没有订单编号");
+//        }
+//        MerchantBaseInfo queryMerchantBaseInfo = new MerchantBaseInfo();
+//        queryMerchantBaseInfo.setMerchantCode(queryOrderDTO.getMerchantCode());
+//        queryMerchantBaseInfo = merchantBaseInfoService.queryMerchantBaseInfo(queryMerchantBaseInfo);
+//        if (queryMerchantBaseInfo == null) {
+//            return ResultGenerator.genFailResult("无商家信息");
+//        }
+//        Map<String, Object> resultMap = new HashMap<String, Object>(16);
+//        Map<String, String> reqMap = new HashMap<String, String>(16);
+//        reqMap.put("service", "query_status");
+//        reqMap.put("merchant_id", queryOrderDTO.getLeshuaMchId());
+//        reqMap.put("third_order_id", queryOrderDTO.getOrderNumber());
+//        reqMap.put("nonce_str", StringUtil.genRandomNum(32));
+//        String requestPay = leshuaService.requestPay(reqMap, "60E3F31EDEC8061C33721737B36FA86D", true);
+//        log.info("======支付结果====" + requestPay);
+//        Map<String, Object> map = XmlUtil.toMapLeshua(requestPay);
+//        String resp_code = (String) map.get("resp_code");
+//        if ("0".equals(resp_code)) {// 0表示通信成功
+//            String result_code = (String) map.get("result_code");
+//            MerchantOrder order = queryOrderDTO.convertMerchantOrder();// 0表示业务成功
+//            if ("0".equals(result_code)) {
+//                // 0支付中 2支付成功 6订单关闭 8支付失败 10退款中 11退款成功 12退款失败
+//                String status = (String) map.get("status");
+//                if ("2".equals(status)) {
+//                    String leshua_order_id = (String) map.get("leshua_order_id");
+//                    String payTime = (String) map.get("pay_time");
+//                    String pay_way = (String) map.get("pay_way");
+//                    SimpleDateFormat sFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//                    order.setTransDt(sFormat.parse(payTime));
+//                    order = merchantOrderService.saveMerchantOrderStatus(leshua_order_id, order);
+//                    if ("WXZF".equals(pay_way)) {
+//                        merchantIncome(order, "1");
+//                    } else if ("ZFBZF".equals(pay_way)) {
+//                        merchantIncome(order, "0");
+//                    }
+//                    return ResultGenerator.genSuccessResult(order);
+//                } else if ("8".equals(status)) {
+//                    return ResultGenerator.genFailResult("交易失败");
+//                } else if ("0".equals(status)) {
+//                    return ResultGenerator.genTransunKonwResult("支付中", order);
+//                } else if ("6".equals(status)) {
+//                    return ResultGenerator.genFailResult("订单关闭");
+//                } else if ("10".equals(status)) {
+//                    return ResultGenerator.genFailResult("退款中");
+//                } else if ("11".equals(status)) {
+//                    return ResultGenerator.genFailResult("退款成功");
+//                } else if ("12".equals(status)) {
+//                    return ResultGenerator.genFailResult("退款失败");
+//                }
+//                log.info("=== resultMap === \n{}", JSON.toJSONString(resultMap));
+//            } else {
+//                return ResultGenerator.genFailResult("查询失败");
+//            }
+//        } else {
+//            return ResultGenerator.genFailResult("查询失败");
+//        }
+//        return ResultGenerator.genFailResult("交易失败");
+    }
+
+    @GetMapping("/tradeQuery/{orderNumber}")
+    @ApiOperation(value = "交易订单支付结果查询", notes = "交易订单支付结果查询", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "orderNumber", value = "查询的orderNumber", paramType = "orderNumber", required = true, dataType = "String")})
+    public Result<Object> tradeQuery(@PathVariable String orderNumber) throws Exception {
+        // 校验参数是否完整
+        if (StringUtil.isEmpty(orderNumber)) {
+            return ResultGenerator.genFailResult("无订单号");
+        }
+        QueryWrapper<MerchantOrder> queryWrapper = new QueryWrapper<MerchantOrder>()
+                .eq("orderNumber",orderNumber);
+        MerchantOrder order = merchantOrderService.getOne(queryWrapper);
+        if(order == null){
+            return ResultGenerator.genFailResult("订单数据异常");
+        }
+        //支付成功
+        if("1".equals(order.getStatus())){
+            return ResultGenerator.genSuccessResult("获取成功",order);
+        }
+        String aisleSwitch = order.getAisleSwitch();
+        MerchantChannelStatus channel = null;
+        switch (aisleSwitch){
+            case "2":
+                channel = merchantChannelStatusMapper.getByMerchantCode(order.getMerchantCode(),1);
+                break;
+            default:
+                channel = merchantChannelStatusMapper.getByMerchantCode(order.getMerchantCode(),Integer.valueOf(aisleSwitch));
+                break;
+        }
+        if(channel != null){
+            JSONObject result = null;
+            switch (channel.getChannel()){
+                case 1:
+                    result = sxfPayService.tradeQuery(order,channel.getMerchantId());
+                    break;
+                case 3:
+                    result = ryxPayService.tradeQuery(order,channel.getMerchantId());
+                    break;
+                case 4:
+                    result = ysPayOldService.tradeQuery(order,channel.getMerchantId());
+                    break;
+            }
+            if(result != null){
+                merchantOrderService.updateOrderStatus(result,order);
+                String status = result.getString("payStatus");
+                if("1".equals(status)){
+                    order.setStatus("1");
+                }
+            }
+        }
+        return ResultGenerator.genSuccessResult("获取成功",order);
+    }
+
+    @GetMapping("/closeOrder")
+    @ApiOperation(value = "订单关闭", notes = "订单关闭", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "orderNumber", value = "订单号", paramType = "orderNumber", dataType = "orderNumber"),})
+    public Result<?> closeOrder(@RequestParam String orderNumber)
+            throws Exception {
+        if(StringUtil.isEmpty(orderNumber)){
+            return ResultGenerator.genFailResult("订单号不能为空！");
+        }
+        QueryWrapper<MerchantOrder> queryWrapper = new QueryWrapper<MerchantOrder>().eq("orderNumber",orderNumber);
+        MerchantOrder order = merchantOrderService.getOne(queryWrapper);
+        if(order == null){
+            return ResultGenerator.genFailResult("订单不存在！！");
+        }
+        QueryWrapper<MerchantChannelStatus> channelStatusQueryWrapper = new QueryWrapper<>();
+        channelStatusQueryWrapper.eq("merchantCode",order.getMerchantCode())
+            .in("channel", 1, 3);
+        MerchantChannelStatus channelStatus = merchantChannelStatusMapper.selectOne(channelStatusQueryWrapper);
+        if(channelStatus == null){
+            return ResultGenerator.genFailResult("当前商户通道未配置！！");
+        }
+        Map<String, Object> reuslt = null;
+        try {
+            if("1".equals(order.getAisleSwitch())){
+                return ResultGenerator.genFailResult("通道已关闭");
+            }else if("2".equals(order.getAisleSwitch())){
+                reuslt = sxfPayService.closeOrder(orderNumber, channelStatus.getMerchantId());
+            }else if("3".equals(order.getAisleSwitch())){
+                reuslt = ryxPayService.closeOrder(orderNumber, channelStatus.getMerchantId());
+            }else if("4".equals(order.getAisleSwitch())){
+                log.info("<================银盛暂无订单关闭接口===========>");
+                return ResultGenerator.genSuccessResult("成功",null);
+            }else{
+                return ResultGenerator.genFailResult("未查询到其他通道");
+            }
+        }catch (Exception e){
+            return ResultGenerator.genFailResult(e.getMessage());
+        }
+        if((Integer) reuslt.get("code") == ResultCode.FAIL.code()){
+            return ResultGenerator.genFailResult(reuslt.get("msg"));
+        }
+        return ResultGenerator.genSuccessResult("关闭成功",reuslt);
+    }
+
+    /*@GetMapping("/leshuaCloseOrder")
+    @ApiOperation(value = "乐刷订单关闭", notes = "乐刷订单关闭", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "leshuaMchId", value = "乐刷商户号", paramType = "leshuaMchId", dataType = "leshuaMchId"),
+            @ApiImplicitParam(name = "orderNumber", value = "订单号", paramType = "orderNumber", dataType = "orderNumber"),})
+    public Result<?> leshuaCloseOrder(@RequestParam String leshuaMchId, @RequestParam String orderNumber)
+            throws Exception {
+        Map<String, String> reqMap = new HashMap<>(16);
+        reqMap.put("service", "close_order");
+        reqMap.put("merchant_id", leshuaMchId);
+        reqMap.put("third_order_id", orderNumber);
+        reqMap.put("nonce_str", StringUtil.genRandomNum(32));
+        String requestPay = leshuaService.requestPay(reqMap, "60E3F31EDEC8061C33721737B36FA86D", true);
+        Map<String, Object> map = XmlUtil.toMapLeshua(requestPay);
+        String resp_code = (String) map.get("resp_code");
+        String result_code = (String) map.get("result_code");
+        if ("0".equals(resp_code) && "0".equals(result_code)) {
+            return ResultGenerator.genSuccessResult();
+        } else {
+            return ResultGenerator.genFailResult("关闭失败");
+        }
+    }*/
+
+    // 查询商家账户余额
+    @PostMapping("/queryMerchantOrderFee")
+    @ApiOperation(value = "查询商家账户余额", notes = "查询商家账户余额", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "MerchantOrder", value = "查询的商家编码", paramType = "body", dataType = "MerchantOrder", required = true)})
+    public Result queryMerchantOrderFee(@RequestBody MerchantOrder merchantOrder) {
+        // 校验参数是否完整
+        if (StringUtil.isEmpty(merchantOrder.getMerchantCode())) {
+            return ResultGenerator.genFailResult("没有商家编码");
+        }
+        Map<String, Object> queryMap = new HashMap<String, Object>();
+        // 设置查询的开始时间
+        Calendar startCalendar = Calendar.getInstance();
+        try {
+            startCalendar.setTime(new SimpleDateFormat("yyyy-MM-dd").parse("2019-09-23"));
+        } catch (Exception e) {
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+        }
+        queryMap.put("startTime", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(startCalendar.getTime()));
+        // 设置查询的结束时间
+        Calendar endCalendar = Calendar.getInstance();
+        try {
+            endCalendar.setTime(merchantOrder.getEndTime());
+        } catch (Exception e) {
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+        }
+        endCalendar.set(Calendar.HOUR_OF_DAY, 23);
+        endCalendar.set(Calendar.MINUTE, 59);
+        endCalendar.set(Calendar.SECOND, 59);
+        queryMap.put("endTime", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(endCalendar.getTime()));
+        queryMap.put("merchantCode", merchantOrder.getMerchantCode());
+        if (merchantOrder.getSize() == null || merchantOrder.getSize() == 0) {
+            merchantOrder.setSize(ProjectConstant.PAGE_SIZE);
+        }
+        if (merchantOrder.getPage() == null || merchantOrder.getPage() == 0) {
+            merchantOrder.setPage(1);
+        }
+        queryMap.put("pageSize", merchantOrder.getSize());
+        queryMap.put("offset", (merchantOrder.getPage() - 1) * merchantOrder.getSize());
+        queryMap.put("status", 1);
+        Double enterFee = merchantOrderService.queryMerchantOrderFeeByTime(queryMap);// 查询交易成功的交易费用
+        queryMap.put("orderType", 1);
+        Double totalRechargeFee = memberOrderService.queryMemberOrderTotalOrderFeeByTime(queryMap);// 查询会员充值的金额
+        List<MerchantOrder> merchantOrders = merchantOrderService.queryMerchantOrderPageByTime(queryMap);
+        // List<MemberOrder> memberOrderList =
+        // memberOrderService.queryMemberOrderPage(queryMap);
+        Map<String, Object> resultMap = new HashMap<>(16);
+        Integer count = merchantOrderService.queryMerchantOrderPageCountByTime(queryMap);
+        // 返回参数
+        PageInfo<MerchantOrder> pager = new PageInfo<>(count.longValue(),
+                (long) StringUtil.getPageCount(count, merchantOrder.getSize()), merchantOrder.getPage().longValue(),
+                merchantOrder.getSize().longValue(), merchantOrders);
+        resultMap.put("pager", pager);
+        resultMap.put("merchantOrders", merchantOrders);
+        return ResultGenerator.genSuccessResult(resultMap);
+    }
+
+    @GetMapping("/returnOrder")
+    @ApiOperation(value = "商家退款", notes = "商家给用户交易退款", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "orderNumber", value = "待退款的订单编号", paramType = "query", dataType = "String", required = true),
+            @ApiImplicitParam(name = "noticeCode", value = "退款通知的编号", paramType = "query", dataType = "String")})
+    public Result<Object> returnOrder(@RequestParam String orderNumber, @RequestParam String noticeCode) {
+        merchantOrderService.returnOrder(orderNumber,null,"app", noticeCode);
+        return ResultGenerator.genSuccessResult("退款成功",null);
+    }
+
+    @GetMapping("/returnOrderV2")
+    @ApiOperation(value = "商家退款", notes = "商家给用户交易退款", httpMethod = "GET")
+    public Result<Object> returnOrder(@RequestParam String orderNumber, @RequestParam String noticeCode, String payPassword) {
+        merchantOrderService.apiReturnOrderV2(orderNumber,null,"app", noticeCode, payPassword);
+        return ResultGenerator.genSuccessResult("退款成功",null);
+    }
+
+    /**
+     * leshuaReturn:(乐刷退款). <br/>
+     *
+     *
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    /*private Result<Object> leshuaReturn(MerchantOrder queryMerchantOrder, String leshuaMchId) {
+        Map<String, String> reqMap = new HashMap<>(16);
+        String merchant_refund_id = StringUtil.getBillno();
+        reqMap.put("service", "unified_refund");
+        reqMap.put("merchant_id", leshuaMchId);
+        reqMap.put("third_order_id", queryMerchantOrder.getOrderNumber());
+        reqMap.put("refund_amount", queryMerchantOrder.getConsumeFee() * 100 + "");
+        reqMap.put("merchant_refund_id", merchant_refund_id);// 退款随机字符 在查询退款的时候需要用到
+        reqMap.put("nonce_str", StringUtil.genRandomNum(32));
+        reqMap.put("notify_url", systemConfigService.querySystemConfigValue("LeshuaRefundBack"));
+
+        String requestPay;
+        try {
+            requestPay = leshuaService.requestPay(reqMap, "60E3F31EDEC8061C33721737B36FA86D", true);
+            Map<String, Object> map = XmlUtil.toMapLeshua(requestPay);
+            String resp_code = (String) map.get("resp_code");
+            if ("0".equals(resp_code)) {
+                // 0表示通信成功
+                String result_code = (String) map.get("result_code");
+                if ("0".equals(result_code)) {
+                    // 0表示业务成功
+                    getProfit(queryMerchantOrder);
+                    Date refundTime = DateUtils.parse(map.get("refund_time").toString(), "yyyy-MM-dd HH:mm:ss");
+                    queryMerchantOrder.setUpdateTime(refundTime);
+                    queryMerchantOrder.setStatus("2");
+                    return ResultGenerator.genSuccessResult("退款成功");
+                } else {
+                    queryMerchantOrder.setStatus("3");
+                    String error_msg = (String) map.get("error_msg");
+                    return ResultGenerator.genFailResult(error_msg);
+                }
+            } else {
+                // 0表示业务成功
+                queryMerchantOrder.setStatus("3");
+                return ResultGenerator.genFailResult("退款失败");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            queryMerchantOrder.setStatus("3");
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return ResultGenerator.genFailResult("退款失败");
+        } finally {
+            queryMerchantOrder.setId(null);
+            queryMerchantOrder.setLeshuaMerchantRefundId(merchant_refund_id);
+            queryMerchantOrder.setUpdateTime(new Date());
+            merchantOrderService.saveMerchantOrder(queryMerchantOrder);
+        }
+    }*/
+
+    // 微信退款方法
+    private Boolean wechatReturnOrder(MerchantOrder merchantOrder) {
+        // 查询商家的subMchId
+//        MerchantBaseInfo queryMerchantBaseInfo = new MerchantBaseInfo();
+//        queryMerchantBaseInfo.setMerchantCode(merchantOrder.getMerchantCode());
+//        queryMerchantBaseInfo = merchantBaseInfoService.queryMerchantBaseInfo(queryMerchantBaseInfo);
+//        Map<String, String> wechatMap = new HashMap<>();
+//        wechatMap.put("appid", "wxed824282c345b7a0");
+//        wechatMap.put("mch_id", "1551169371");
+//        wechatMap.put("sub_mch_id", queryMerchantBaseInfo.getSubMchId());
+//        wechatMap.put("nonce_str", StringUtil.genRandomNum(10));
+//        wechatMap.put("sign_type", "HMAC-SHA256");
+//        wechatMap.put("out_trade_no", merchantOrder.getOrderNumber());
+//        wechatMap.put("out_refund_no", StringUtil.genRandomNum(10));
+//        wechatMap.put("total_fee", ((int) (merchantOrder.getConsumeFee() * 100)) + "");
+//        wechatMap.put("refund_fee", ((int) (merchantOrder.getConsumeFee() * 100)) + "");
+//        wechatMap.put("sign", WechatSignUtil.sha256Sign(wechatMap, "7F05NZBTJ3XNDK5HLSDC3H25ZXOQKDHT"));
+//        String resultString = WXPayHttpUtil.WXHttpPostXMLWithCert("https://api.mch.weixin.qq.com/secapi/pay/refund", wechatMap, "/home/syb/resources/wechatCert/apiclient_cert.p12");
+//        Map<String, String> resultMap = WXPayXmlUtil.parseXMLToMap(resultString);
+//        if ("SUCCESS".equalsIgnoreCase(resultMap.get("return_code"))) {
+//            if ("SUCCESS".equalsIgnoreCase(resultMap.get("result_code"))) {
+//                return true;
+//            } else if ("FAIL".equalsIgnoreCase(resultMap.get("result_code"))) {
+//
+//            }
+//        }
+        return false;
+    }
+
+    private Boolean aliReturnOrder(MerchantOrder order) {
+        return false;
+//        AlipayTradeRefundRequest request = new AlipayTradeRefundRequest();
+//        request.setBizContent("{" + "\"out_trade_no\":\"" + order.getOrderNumber() + "\"," + "\"refund_amount\":"
+//                + order.getConsumeFee() + "" + "}");
+//        // 获取对应商户的授权信息
+//        UserApp queryUserApp = new UserApp();
+//        queryUserApp.setMerchantCode(order.getMerchantCode());
+//        queryUserApp.setUserType("promoter");
+//        List<UserApp> queryUserAppList = userAppService.queryUserAppList(queryUserApp);
+//        if (queryUserAppList == null || queryUserAppList.size() == 0) {
+//            return false;
+//        }
+//        queryUserApp = queryUserAppList.get(0);
+//        if (StringUtil.isEmpty(queryUserApp.getAppAuthToken())) {
+//            return false;
+//        }
+//        request.putOtherTextParam("app_auth_token", queryUserApp.getAppAuthToken());
+//        AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do",
+//                AliPayParam.getAppId(), AliPayParam.getPri(), "json", "GBK", AliPayParam.getPub(), "RSA2");
+//        AlipayTradeRefundResponse response = null;
+//        try {
+//            response = alipayClient.execute(request);
+//        } catch (AlipayApiException e) {
+//            e.printStackTrace();
+//            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+//        }
+//        if (response != null && response.isSuccess()) {
+//            return true;
+//        }
+//        return false;
+    }
+
+    // 店员退款发给商家的通知
+    @GetMapping("/returnOrderSend")
+    @ApiOperation(value = "商家退款通知", notes = "店员退款发给商家的通知", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "orderNumber", value = "待退款的订单编号", paramType = "query", dataType = "String", required = true),
+            @ApiImplicitParam(name = "userId", value = "发起退款的人员id", paramType = "query", dataType = "Integer", required = true)})
+    public Result returnOrderSend(@RequestParam String orderNumber, @RequestParam Long userId) {
+        if (StringUtil.isEmpty(orderNumber)) {
+            return ResultGenerator.genFailResult("无订单编号");
+        }
+        if (StringUtil.isEmpty(userId)) {
+            return ResultGenerator.genFailResult("无发起人员信息！");
+        }
+        // 查询退款发起人信息
+        UserApp startUserApp = new UserApp();
+        startUserApp.setUserId(userId);
+        List<UserApp> queryUserAppList2 = userAppService.queryUserAppList(startUserApp);
+        if (queryUserAppList2 == null || queryUserAppList2.size() == 0) {
+            return ResultGenerator.genFailResult("发起人信息不正确！");
+        } else {
+            startUserApp = queryUserAppList2.get(0);
+        }
+        MerchantOrder queryMerchantOrder = new MerchantOrder();
+        queryMerchantOrder.setOrderNumber(orderNumber);
+        List<MerchantOrder> queryMerchantOrderList = merchantOrderService.list(new QueryWrapper<>(queryMerchantOrder));
+        if (queryMerchantOrderList == null || queryMerchantOrderList.size() == 0) {
+            return ResultGenerator.genFailResult("该订单不存在");
+        } else {
+            queryMerchantOrder = queryMerchantOrderList.get(0);
+        }
+
+        UserApp queryUserApp = new UserApp();
+        queryUserApp.setMerchantCode(queryMerchantOrder.getMerchantCode());
+        queryUserApp.setUserType("promoter");
+        List<UserApp> queryUserAppList = userAppService.queryUserAppList(queryUserApp);// 查询当前商户的用户信息
+        if (queryUserAppList == null || queryUserAppList.size() == 0) {
+            return ResultGenerator.genFailResult("无商户信息");
+        } else {
+            queryUserApp = queryUserAppList.get(0);
+        }
+
+        MerchantBaseInfo info = new MerchantBaseInfo();
+        info.setMerchantCode(queryMerchantOrder.getMerchantCode());
+        info = merchantBaseInfoService.queryMerchantBaseInfo(info);
+
+        // 生成退款通知
+        Notice notice = new Notice(1, 2, queryUserApp);
+        notice.setOrderNumber(orderNumber);
+        List<String> alias = new ArrayList<String>();
+        alias.add(queryUserApp.getUserId().toString());
+
+        String notificationContent = info.getAlias() + "店" + startUserApp.getUserName() + "店员发起"
+                + queryMerchantOrder.getPayTypeName() + "退款 ￥" + queryMerchantOrder.getConsumeFee() + "，请及时审核。";
+        generalPushUtil.sendAllPlatByAlias(alias, "店员退款审核通知", notificationContent, "1");
+        // 插入通知信息
+        notice.setConrtent(info.getAlias() + "店" + startUserApp.getUserName() + "店员发起");
+        noticeService.saveNotice(notice);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    // 拒绝店员退款接口
+    @GetMapping("/confuseStaffReturnOrder")
+    @ApiOperation(value = "商户拒绝员工退款", notes = "商户拒绝员工退款", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "noticeCode", value = "退款通知的编号", paramType = "query", dataType = "String", required = true)})
+    public Result confuseStaffReturnOrder(@RequestParam String noticeCode) {
+        if (StringUtil.isEmpty(noticeCode)) {
+            return ResultGenerator.genFailResult("无通知编号");
+        }
+        // 更新通知的处理状态
+        Notice queryNotice = new Notice();
+        queryNotice.setNoticeCode(noticeCode);
+        List<Notice> queryNoticeList = noticeService.queryNoticeList(queryNotice);
+        if (queryNoticeList != null && queryNoticeList.size() > 0) {
+            queryNotice = queryNoticeList.get(0);
+            queryNotice.setIsDeal(1);
+            queryNotice.setIsApply(0);
+            noticeService.updateNotice(queryNotice);
+        }
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @PostMapping("/memberRechargeQuery")
+    @ApiOperation(value = "轮循会员充值订单", notes = "轮循会员充值订单", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "MemberOrderDTO", value = "MemberOrderDTO", paramType = "MemberOrderDTO", dataType = "MemberOrderDTO", required = true)})
+    public Result memberRechargeQuery(@RequestBody MemberOrderDTO memberOrderDTO) {
+        String aisle = memberOrderDTO.getAisle();
+        MemberOrder memberOrder = memberOrderDTO.convertMemberOrder();
+        Map<String, Object> map = new HashMap<String, Object>(16);
+        map.put("aisle", aisle);
+        map.put("orderNumber", memberOrderDTO.getOrderNumber());
+        map.put("authCode", memberOrderDTO.getAuthCode());
+        MerchantMenber merchantMenber = new MerchantMenber();
+        merchantMenber.setMemberCode(memberOrderDTO.getMemberCode());
+        merchantMenber = merchantMenberService.queryMerchantMenber(merchantMenber);
+        MerchantMenberRecharge merchantMenberRecharge = memberOrderDTO.convertMerchantMenberRecharge(merchantMenber);
+        try {
+//			Result<Map<String, Object>> transQuery = transQueryService.TransQuery(map);
+            MerchantOrder merchantOrder = new MerchantOrder();
+            merchantOrder.setOrderNumber(memberOrder.getOrderNumber());
+            merchantOrder = merchantOrderService.queryMerchantOrder(merchantOrder);
+
+
+            if ("5".equals(merchantOrder.getStatus())) {
+                return ResultGenerator.genTransunKonwResult("交易未知", memberOrderDTO);
+            }
+            if ("0".equals(merchantOrder.getStatus())) {
+                return ResultGenerator.genFailResult("交易失败");
+            }
+            if ("1".equals(merchantOrder.getStatus())) {
+//				Map<String, Object> data = transQuery.getData();
+//				String tradeNo = (String) data.get("tradeNo");
+//				String payTime = (String) data.get("payTime");
+                SimpleDateFormat sFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                memberOrder.setOrderStatus("1");
+                memberOrder.setCreateDt(new Date());
+                merchantMenberRecharge.setCreateDt(new Date());
+//				MerchantOrder merchantOrder=new MerchantOrder();
+//				merchantOrder.setOrderNumber(memberOrderDTO.getOrderNumber());
+//				merchantOrder = merchantOrderService.queryMerchantOrder(merchantOrder);
+                merchantOrder.setTransDt(new Date());
+                merchantOrder.setStatus("1");
+                if ("0".equals(aisle)) {
+//					memberOrder.setAliPayTransNo(tradeNo);
+                    merchantMenberRecharge.setPayType(0);
+//					merchantOrder.setAliPayTransNo(tradeNo);
+                    memberOrderService.saveMemberOrder(memberOrder);
+                } else if ("1".equals(aisle)) {
+//					memberOrder.setWeChatTransNo(tradeNo);
+                    merchantMenberRecharge.setPayType(1);
+//					merchantOrder.setWeChatTransNo(tradeNo);
+                    memberOrderService.saveMemberOrder(memberOrder);
+                } else if ("2".equals(aisle)) {
+//					memberOrder.setLeshuaTransNo(tradeNo);
+                    merchantMenberRecharge.setPayType(2);
+                    memberOrder.setOrderStatus("1");
+//					merchantOrder.setLeshuaTransNo(tradeNo);
+                    memberOrderService.updateMemberOrder(memberOrder);
+                }
+//				merchantOrderService.updateMerchantOrder(merchantOrder);
+                merchantMenberRechargeService.saveMerchantMenberRecharge(merchantMenberRecharge);
+//				merchantMenberService.saveMerchantMenber(merchantMenber);
+                Double totalRechargeFee = merchantMenber.getTotalRechargeFee() == null ? new Double(0)
+                        : merchantMenber.getTotalRechargeFee();
+                Double usableRechargeFee = merchantMenber.getUsableRechargeFee() == null ? new Double(0)
+                        : merchantMenber.getUsableRechargeFee();
+                Double totalGiveFee = merchantMenber.getTotalGiveFee() == null ? new Double(0) : merchantMenber.getTotalGiveFee();
+                Double usableGiveFee = merchantMenber.getUsableGiveFee() == null ? new Double(0)
+                        : merchantMenber.getUsableGiveFee();
+                totalRechargeFee = totalRechargeFee + Double.parseDouble(memberOrderDTO.getOrderFee());
+                usableRechargeFee = usableRechargeFee + Double.parseDouble(memberOrderDTO.getOrderFee());
+                if (StringUtil.isNotEmpty(memberOrderDTO.getGiveMoney())) {
+                    totalGiveFee = totalGiveFee + Double.parseDouble(memberOrderDTO.getGiveMoney());
+                    usableGiveFee = usableGiveFee + Double.parseDouble(memberOrderDTO.getGiveMoney());
+                }
+                merchantMenber.setTotalRechargeFee(totalRechargeFee);
+                merchantMenber.setUsableRechargeFee(usableRechargeFee);
+                merchantMenber.setTotalGiveFee(totalGiveFee);
+                merchantMenber.setUsableGiveFee(usableGiveFee);
+                merchantMenberService.updateMerchantMenber(merchantMenber);
+                merchantIncome(memberOrder);
+                return ResultGenerator.genSuccessResult();
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResultGenerator.genFailResult("交易失败");
+        }
+        return ResultGenerator.genFailResult("交易失败");
+    }
+
+    /**
+     * merchantIncome:(添加收益). <br/>
+     *
+     * @param memberOrder
+     *
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    private void merchantIncome(MemberOrder memberOrder) {
+        MerchantIncome merchantIncome = new MerchantIncome();
+        merchantIncome.setMerchantCode(memberOrder.getMerchantCode());
+        merchantIncome.setMerchantName(memberOrder.getMerchantName());
+        merchantIncome.setStoreId(memberOrder.getStoreId());
+        merchantIncome.setStoreName(memberOrder.getStoreName());
+        merchantIncome.setDealFee(Double.valueOf(memberOrder.getOrderFee()));
+        merchantIncome.setIncomeFee(Double.valueOf(memberOrder.getOrderFee()));
+        merchantIncome.setPayTypeCode("2");
+        merchantIncome.setPayTypeName("会员充值");
+        merchantIncome.setCreateTime(memberOrder.getCreateDt());
+        merchantIncomeService.saveMerchantIncome(merchantIncome);
+    }
+
+    @GetMapping("/couponList/{orderNumber}")
+    public Result<List<Map<String, Object>>> getCouponListByOrderNumber(@PathVariable("orderNumber") String orderNumber) {
+        List<Map<String, Object>> couponList = merchantOrderService.getCouponList(orderNumber);
+        return ResultGenerator.genSuccessResult(couponList);
+    }
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantProfitController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantProfitController.java
new file mode 100644
index 0000000..efdcf0a
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantProfitController.java
@@ -0,0 +1,257 @@
+package cn.pluss.platform.controller;
+
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.constants.ProjectConstant;
+import cn.pluss.platform.entity.MerchantBaseInfo;
+import cn.pluss.platform.entity.MerchantOrder;
+import cn.pluss.platform.entity.MerchantProfit;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.mapper.MerchantProfitMapper;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantOrder.MerchantOrderService;
+import cn.pluss.platform.merchantProfit.MerchantProfitService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.util.StringUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.math.MathContext;
+import java.math.RoundingMode;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+@RestController
+@RequestMapping("/merchantProfit")
+@Api(value = "MerchantProfit控制类", tags = {"MerchantProfit接口"})
+public class MerchantProfitController {
+
+    @Resource
+    private MerchantProfitService merchantProfitService;
+    @Resource
+    private MerchantBaseInfoService merchantBaseInfoService;
+    @Resource
+    private MerchantOrderService merchantOrderService;
+    @Resource
+    private MerchantProfitMapper merchantProfitMapper;
+    @Resource
+    private UserAppService userAppService;
+
+    @GetMapping
+    @ApiOperation(tags = {"页面-商户推广_交易明细"}, value = "获取全部", notes = "返回分页过后的数据", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "page", value = "查询页码", paramType = "query", dataType = "Integer", defaultValue = "0"),
+            @ApiImplicitParam(name = "size", value = "每页数据量", paramType = "query", dataType = "Integer", defaultValue = "0")
+    })
+    public Result<PageInfo<MerchantProfit>> list(
+            @RequestParam(defaultValue = "1") Integer page,
+            @RequestParam(defaultValue = "10") Integer size,
+            @RequestParam String merchantName, // 商户名称
+            @RequestParam String level,  //等级       1   2  3
+            @RequestParam String type,//商户所属  不传全部  1直接  2 间接 3 二级间接
+            @RequestParam String startTime,
+            @RequestParam String endTime,
+            @RequestParam(required = false, value = "agentStaffIds[]") String[] agentStaffIds) throws ParseException {
+
+        UserApp userApp = userAppService.queryUserAppByToken();
+
+        Long userId = userApp.getUserId();
+
+        if (size == null || size == 0) {
+            size = ProjectConstant.PAGE_SIZE;
+        }
+        if (page == null || page == 0) {
+            page = 1;
+        }
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageSize", size);
+        map.put("offset", (page - 1) * size);
+
+        if ("agent_staff".equals(userApp.getUserType())) {
+            map.put("agentStaffId", userApp.getUserId());
+        } else {
+            if (agentStaffIds != null && agentStaffIds.length > 0) {
+                String id = agentStaffIds[0];
+                map.put("userId", userId);
+                if ("-1".equals(id)) {
+                    map.put("self", true);
+                } else {
+                    map.put("agentStaffIds", agentStaffIds);
+                }
+            }
+            map.put("userId", userId);
+        }
+        if (StringUtil.isNotEmpty(merchantName)) {
+            map.put("merchantName", merchantName);
+        }
+        if (StringUtil.isNotEmpty(level)) {
+            map.put("level", level);
+        }
+        if (StringUtil.isNotEmpty(type)) {
+            map.put("type", type);
+        } else {
+            map.put("retype", "1");
+        }
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd ahh:mm:ss");
+
+        if (StringUtils.isNotEmpty(startTime) ) {
+            if (((startTime.contains("上午")) || (startTime.contains("下午")))) {
+                map.put("startTime", sdf2.parse(startTime));
+            } else {
+                map.put("startTime", sdf.parse(startTime));
+            }
+        }
+
+        if (StringUtils.isNotEmpty(endTime) ) {
+            if (((endTime.contains("上午")) || (endTime.contains("下午")))) {
+                map.put("endTime", sdf2.parse(endTime));
+            } else {
+                map.put("endTime", sdf.parse(endTime));
+            }
+        }
+
+        List<MerchantProfit> merchantProfitList = merchantProfitService.queryMerchantProfitPage(map);
+
+        if (merchantProfitList != null && merchantProfitList.size() > 0) {
+
+            List<Map<String, Object>> rateInfoMapList = merchantProfitMapper.queryMerchantProfitRate(merchantProfitList, userApp.getUserId().toString());
+
+            // 商户code列表
+            List<String> merchantCodeList = new ArrayList<>();
+            //  订单number列表
+            List<String> orderNumberList = new ArrayList<>();
+            for (MerchantProfit m : merchantProfitList) {
+                merchantCodeList.add(m.getMerchantCode());
+                orderNumberList.add(m.getOrderNumber());
+            }
+
+            QueryWrapper<MerchantBaseInfo> queryMerchantBaseInfo = new QueryWrapper<MerchantBaseInfo>().in("merchantCode", merchantCodeList);
+            List<MerchantBaseInfo> merchantBaseInfoList = merchantBaseInfoService.list(queryMerchantBaseInfo);
+
+            QueryWrapper<MerchantOrder> queryMerchantOrder = new QueryWrapper<MerchantOrder>().in("orderNumber", orderNumberList);
+            List<MerchantOrder> merchantOrderList = merchantOrderService.list(queryMerchantOrder);
+
+            for (MerchantProfit m : merchantProfitList) {
+
+                m.setMerchantLogo(null);
+                m.setPayTypeName(m.getPayTypeName().replaceAll("乐刷|随行|随行付", ""));
+                for (MerchantBaseInfo merchantBaseInfo : merchantBaseInfoList) {
+                    if (merchantBaseInfo.getMerchantCode().equals(m.getMerchantCode())) {
+                        m.setUserName(merchantBaseInfo.getContactName());
+                        m.setPhone(merchantBaseInfo.getContactMobile());
+                        m.setMerchantName(merchantBaseInfo.getAlias());
+                    }
+                }
+
+                for (MerchantOrder merchantOrder : merchantOrderList) {
+                    if (merchantOrder.getOrderNumber().equals(m.getOrderNumber())) {
+                        m.setRate(merchantOrder.getRate());
+                        break;
+                    }
+                }
+
+
+                if (m.getRate() == null) {
+                    m.setRate(new BigDecimal(38));
+                } else {
+                    // TODO 暂去掉小数点后第三位，需要等 安卓app 1.7.0更新以后才可以去掉
+                    m.setRate(m.getRate().round(new MathContext(2, RoundingMode.DOWN)));
+                }
+
+                // 针对普通推广者
+                if (m.getProfitRate() == null) {
+                    if (m.getUserType().equals("promoter")) {
+                        switch (m.getMerchantParentLevel()) {
+                            case "1":
+                                m.setProfitRate(6);
+                                break;
+                            case "2":
+                                m.setProfitRate(8);
+                                break;
+                            case "3":
+                                m.setProfitRate(10);
+                                break;
+                            default:
+                                break;
+                        }
+                    } else {
+
+                        for (Map<String, Object> rateMap : rateInfoMapList) {
+                            // Long和int无法equals
+                            if ((m.getId() + "").equals(rateMap.get("id") + "")) {
+                                m.setProfitRate((int) rateMap.get("rateCur"));
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+
+        Integer count = merchantProfitService.queryMerchantProfitPageCount(map);
+
+        //返回参数
+        PageInfo<MerchantProfit> pager = new PageInfo<>(count.longValue(), (long) StringUtil.getPageCount(count, size), page.longValue(), size.longValue(), merchantProfitList);
+        return ResultGenerator.genSuccessResult(pager);
+    }
+
+    @PostMapping
+    @ApiOperation(value = "添加数据", notes = "添加新的数据", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "MerchantProfit", value = "待添加的MerchantProfit实例", paramType = "body", dataType = "MerchantProfit", required = true)
+    })
+    public Result add(@RequestBody MerchantProfit merchantProfit) {
+        merchantProfitService.saveMerchantProfit(merchantProfit);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @DeleteMapping("/{id}")
+    @ApiOperation(value = "删除数据", notes = "根据id删除数据", httpMethod = "DELETE")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "查询的id实例", paramType = "path", dataType = "Integer", required = true)
+    })
+    public Result delete(@PathVariable Long id) {
+        MerchantProfit merchantProfit = new MerchantProfit();
+        merchantProfit.setId(id);
+        merchantProfitService.deleteMerchantProfit(merchantProfit);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @PutMapping
+    @ApiOperation(value = "更新数据", notes = "根据内容更新数据", httpMethod = "PUT")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "MerchantProfit", value = "更新的MerchantProfit实例", paramType = "body", dataType = "MerchantProfit", required = true)
+    })
+    public Result update(@RequestBody MerchantProfit merchantProfit) {
+        merchantProfitService.updateMerchantProfit(merchantProfit);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @GetMapping("/{id}")
+    @ApiOperation(value = "获取单个值", notes = "查看单个项目的内容", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "查询的id", paramType = "path", required = true, dataType = "Integer", defaultValue = "0")
+    })
+    public Result<MerchantProfit> detail(@PathVariable Long id) {
+        MerchantProfit merchantProfit = new MerchantProfit();
+        merchantProfit.setId(id);
+        merchantProfit = merchantProfitService.queryMerchantProfit(merchantProfit);
+        return ResultGenerator.genSuccessResult(merchantProfit);
+    }
+}
+
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantQrCodeController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantQrCodeController.java
new file mode 100644
index 0000000..01662f9
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantQrCodeController.java
@@ -0,0 +1,32 @@
+package cn.pluss.platform.controller;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.entity.MerchantQrcode;
+import cn.pluss.platform.merchantQrcode.MerchantQrcodeService;
+import lombok.Setter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author djh
+ */
+@RestController
+@RequestMapping("/merQrCode")
+public class MerchantQrCodeController {
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantQrcodeService merchantQrcodeService;
+
+    @PostMapping("/saveMerQrcode")
+    public Result<Object> saveMerQrcode(@RequestBody MerchantQrcode merchantQrcode) {
+        merchantQrcodeService.saveMerQrcode(merchantQrcode);
+        return ResultGenerator.genSuccessResult("二维码保存成功", null);
+    }
+
+    @GetMapping("/removeById/{userId}")
+    public Result<Object> removeMerQrcode(@PathVariable("userId") String userId) {
+        merchantQrcodeService.removeByUserId(userId);
+        return ResultGenerator.genSuccessResult("二维码信息清理成功", null);
+    }
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantRateController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantRateController.java
new file mode 100644
index 0000000..ad95a05
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantRateController.java
@@ -0,0 +1,30 @@
+package cn.pluss.platform.controller;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.entity.MerchantRate;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.service.agent.MerchantRateApiService;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author DJH
+ */
+@RestController
+@RequestMapping("/merchantRate")
+public class MerchantRateController extends BaseModelController<MerchantRateApiService, MerchantRate> {
+
+    /**
+     * 修改下级服务商的费率
+     * @return
+     */
+    @PostMapping("/changeRate")
+    public Result<String> setSubAgentRate(@RequestBody MerchantRate merchantRate) {
+        throw new MsgException("不支持该操作");
+        // baseService.setSubAgentRate(merchantRate);
+        // return ResultGenerator.genSuccessResult("操作成功", null);
+    }
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantRateRecordController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantRateRecordController.java
new file mode 100644
index 0000000..e5af66d
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantRateRecordController.java
@@ -0,0 +1,20 @@
+package cn.pluss.platform.controller;
+
+import cn.pluss.platform.MerchantRateRecordService;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.entity.MerchantRateRecord;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 费率修改记录表 前端控制器
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-09-02
+ */
+@RestController
+@RequestMapping("/merchantRateRecord")
+public class MerchantRateRecordController extends BaseModelController<MerchantRateRecordService, MerchantRateRecord> {
+}
\ No newline at end of file
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantRegistAuditRecordController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantRegistAuditRecordController.java
new file mode 100644
index 0000000..e3135f1
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantRegistAuditRecordController.java
@@ -0,0 +1,100 @@
+package cn.pluss.platform.controller;
+
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.constants.ProjectConstant;
+import cn.pluss.platform.entity.MerchantRegistAuditRecord;
+import cn.pluss.platform.merchantRegistAuditRecord.MerchantRegistAuditRecordService;
+import cn.pluss.platform.util.StringUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+@RestController
+@RequestMapping("/merchantRegistAuditRecord")
+@Transactional
+@Api(value = "MerchantRegistAuditRecord控制类", tags = {"MerchantRegistAuditRecord接口"})
+public class MerchantRegistAuditRecordController {
+
+    @Resource
+    private MerchantRegistAuditRecordService merchantRegistAuditRecordService;
+
+    @GetMapping
+    @ApiOperation(value = "获取全部", notes = "返回分页过后的数据", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "page", value = "查询页码", paramType = "query", dataType = "Integer", defaultValue = "0"),
+            @ApiImplicitParam(name = "size", value = "每页数据量", paramType = "query", dataType = "Integer", defaultValue = "0")
+    })
+    public Result<PageInfo<MerchantRegistAuditRecord>> list(@RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
+        if (size == null || size == 0) {
+            size = ProjectConstant.PAGE_SIZE;
+        }
+        if (page == null || page == 0) {
+            page = 1;
+        }
+        Map<String, Object> map = new HashMap<String, Object>();
+        map.put("pageSize", size);
+        map.put("offset", (page - 1) * size);
+        List<MerchantRegistAuditRecord> merchantRegistAuditRecordList = merchantRegistAuditRecordService.queryMerchantRegistAuditRecordPage(map);
+        Integer count = merchantRegistAuditRecordService.queryMerchantRegistAuditRecordPageCount(map);
+        //返回参数
+        PageInfo pager = new PageInfo<MerchantRegistAuditRecord>(count.longValue(), (long) StringUtil.getPageCount(count, size), page.longValue(), size.longValue(), merchantRegistAuditRecordList);
+        return ResultGenerator.genSuccessResult(pager);
+    }
+
+    @PostMapping
+    @ApiOperation(value = "添加数据", notes = "添加新的数据", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "MerchantRegistAuditRecord", value = "待添加的MerchantRegistAuditRecord实例", paramType = "body", dataType = "MerchantRegistAuditRecord", required = true)
+    })
+    public Result add(@RequestBody MerchantRegistAuditRecord merchantRegistAuditRecord) {
+        merchantRegistAuditRecordService.saveMerchantRegistAuditRecord(merchantRegistAuditRecord);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @DeleteMapping("/{id}")
+    @ApiOperation(value = "删除数据", notes = "根据id删除数据", httpMethod = "DELETE")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "查询的id实例", paramType = "path", dataType = "Integer", required = true)
+    })
+    public Result delete(@PathVariable Integer id) {
+        MerchantRegistAuditRecord merchantRegistAuditRecord = new MerchantRegistAuditRecord();
+        merchantRegistAuditRecord.setId(id.intValue());
+        merchantRegistAuditRecordService.deleteMerchantRegistAuditRecord(merchantRegistAuditRecord);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @PutMapping
+    @ApiOperation(value = "更新数据", notes = "根据内容更新数据", httpMethod = "PUT")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "MerchantRegistAuditRecord", value = "更新的MerchantRegistAuditRecord实例", paramType = "body", dataType = "MerchantRegistAuditRecord", required = true)
+    })
+    public Result update(@RequestBody MerchantRegistAuditRecord merchantRegistAuditRecord) {
+        merchantRegistAuditRecordService.updateMerchantRegistAuditRecord(merchantRegistAuditRecord);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @GetMapping("/{id}")
+    @ApiOperation(value = "获取单个值", notes = "查看单个项目的内容", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "查询的id", paramType = "path", required = true, dataType = "Integer", defaultValue = "0")
+    })
+    public Result detail(@PathVariable Long id) {
+        MerchantRegistAuditRecord merchantRegistAuditRecord = new MerchantRegistAuditRecord();
+        merchantRegistAuditRecord.setId(id.intValue());
+        merchantRegistAuditRecord = merchantRegistAuditRecordService.queryMerchantRegistAuditRecord(merchantRegistAuditRecord);
+        return ResultGenerator.genSuccessResult(merchantRegistAuditRecord);
+    }
+
+}
+
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantRegistLogController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantRegistLogController.java
new file mode 100644
index 0000000..db3b3fb
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantRegistLogController.java
@@ -0,0 +1,100 @@
+package cn.pluss.platform.controller;
+
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.constants.ProjectConstant;
+import cn.pluss.platform.entity.MerchantRegistLog;
+import cn.pluss.platform.merchantRegistLog.MerchantRegistLogService;
+import cn.pluss.platform.util.StringUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+@RestController
+@RequestMapping("/merchantRegistLog")
+@Transactional
+@Api(value = "MerchantRegistLog控制类", tags = {"MerchantRegistLog接口"})
+public class MerchantRegistLogController {
+
+    @Resource
+    private MerchantRegistLogService merchantRegistLogService;
+
+    @GetMapping
+    @ApiOperation(value = "获取全部", notes = "返回分页过后的数据", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "page", value = "查询页码", paramType = "query", dataType = "Integer", defaultValue = "0"),
+            @ApiImplicitParam(name = "size", value = "每页数据量", paramType = "query", dataType = "Integer", defaultValue = "0")
+    })
+    public Result<PageInfo<MerchantRegistLog>> list(@RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
+        if (size == null || size == 0) {
+            size = ProjectConstant.PAGE_SIZE;
+        }
+        if (page == null || page == 0) {
+            page = 1;
+        }
+        Map<String, Object> map = new HashMap<String, Object>();
+        map.put("pageSize", size);
+        map.put("offset", (page - 1) * size);
+        List<MerchantRegistLog> merchantRegistLogList = merchantRegistLogService.queryMerchantRegistLogPage(map);
+        Integer count = merchantRegistLogService.queryMerchantRegistLogPageCount(map);
+        //返回参数
+        PageInfo pager = new PageInfo<MerchantRegistLog>(count.longValue(), (long) StringUtil.getPageCount(count, size), page.longValue(), size.longValue(), merchantRegistLogList);
+        return ResultGenerator.genSuccessResult(pager);
+    }
+
+    @PostMapping
+    @ApiOperation(value = "添加数据", notes = "添加新的数据", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "MerchantRegistLog", value = "待添加的MerchantRegistLog实例", paramType = "body", dataType = "MerchantRegistLog", required = true)
+    })
+    public Result add(@RequestBody MerchantRegistLog merchantRegistLog) {
+        merchantRegistLogService.saveMerchantRegistLog(merchantRegistLog);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @DeleteMapping("/{id}")
+    @ApiOperation(value = "删除数据", notes = "根据id删除数据", httpMethod = "DELETE")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "查询的id实例", paramType = "path", dataType = "Integer", required = true)
+    })
+    public Result delete(@PathVariable Integer id) {
+        MerchantRegistLog merchantRegistLog = new MerchantRegistLog();
+        merchantRegistLog.setId(id.intValue());
+        merchantRegistLogService.deleteMerchantRegistLog(merchantRegistLog);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @PutMapping
+    @ApiOperation(value = "更新数据", notes = "根据内容更新数据", httpMethod = "PUT")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "MerchantRegistLog", value = "更新的MerchantRegistLog实例", paramType = "body", dataType = "MerchantRegistLog", required = true)
+    })
+    public Result update(@RequestBody MerchantRegistLog merchantRegistLog) {
+        merchantRegistLogService.updateMerchantRegistLog(merchantRegistLog);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @GetMapping("/{id}")
+    @ApiOperation(value = "获取单个值", notes = "查看单个项目的内容", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "查询的id", paramType = "path", required = true, dataType = "Integer", defaultValue = "0")
+    })
+    public Result detail(@PathVariable Long id) {
+        MerchantRegistLog merchantRegistLog = new MerchantRegistLog();
+        merchantRegistLog.setId(id.intValue());
+        merchantRegistLog = merchantRegistLogService.queryMerchantRegistLog(merchantRegistLog);
+        return ResultGenerator.genSuccessResult(merchantRegistLog);
+    }
+
+}
+
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantScanQrCodeController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantScanQrCodeController.java
new file mode 100644
index 0000000..cd96592
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantScanQrCodeController.java
@@ -0,0 +1,46 @@
+package cn.pluss.platform.controller;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.deviceStock.DeviceStockService;
+import cn.pluss.platform.entity.QrCode;
+import cn.pluss.platform.exception.MsgException;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.Setter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+/**
+ * 商户扫码绑定接口类
+ */
+@Controller
+@RequestMapping("/merchantScanQrCode")
+@Transactional
+@Api(value = "merchantScanQrCode控制类", tags = {"MerchantScanQrCode接口"})
+public class MerchantScanQrCodeController {
+
+    @Setter(onMethod_ = {@Autowired})
+    private DeviceStockService deviceStockService;
+
+    @PostMapping(value = "bind")
+    @ResponseBody
+    @ApiOperation(value = "商户扫码绑定收款二维码", notes = "商户绑定收款码", httpMethod = "POST")
+    public Result bindCollectAmtQrCode(@RequestBody QrCode qrCode) {
+        String snNo = qrCode.getSnNo();
+        if (snNo == null) {
+            snNo = qrCode.getQrNo();
+        }
+
+        snNo = snNo.replace("ALI_", "");
+        MsgException.checkBlank(snNo, "设备编号不能为空！");
+
+        deviceStockService.bindPayCode(snNo);
+        return ResultGenerator.genSuccessResult("绑定成功！",null);
+    }
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantStaffController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantStaffController.java
new file mode 100644
index 0000000..4a71e24
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantStaffController.java
@@ -0,0 +1,42 @@
+package cn.pluss.platform.controller;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.dto.MerchantStaffDTO;
+import cn.pluss.platform.merchant.MerchantStaffConnService;
+import cn.pluss.platform.vo.MerchantStaffVO;
+import lombok.Setter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+
+/**
+ * @author DJH
+ */
+@RestController
+@RequestMapping("/merchantStaff")
+public class MerchantStaffController {
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantStaffConnService connService;
+
+    @PostMapping
+    public Result<Object> save(@RequestBody MerchantStaffDTO merchantStaffDTO) {
+        connService.createOrEditStaff(merchantStaffDTO);
+        return ResultGenerator.genSuccessResult("保存成功", null);
+    }
+
+    @GetMapping("/del")
+    public Result<Object> remove(Long userId, String merchantCodes) {
+        String[] split = merchantCodes.split(",");
+        connService.delStaff(userId, Arrays.asList(split.clone()));
+        return ResultGenerator.genSuccessResult("删除成功", null);
+    }
+
+    @GetMapping("/{userId}")
+    public Result<Object> one(@PathVariable("userId") String userId) {
+        MerchantStaffVO result = connService.getOneForApp(userId);
+        return ResultGenerator.genSuccessResult( result);
+    }
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantStoreController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantStoreController.java
new file mode 100644
index 0000000..900fa2e
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantStoreController.java
@@ -0,0 +1,145 @@
+package cn.pluss.platform.controller;
+
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.constants.ProjectConstant;
+import cn.pluss.platform.entity.MerchantBaseInfo;
+import cn.pluss.platform.entity.MerchantImage;
+import cn.pluss.platform.entity.MerchantStore;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantImage.MerchantImageService;
+import cn.pluss.platform.merchantStore.MerchantStoreService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.util.StringUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.Setter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author DJH
+ */
+@RestController
+@RequestMapping("/merchantStore")
+@Api(value = "MerchantStore控制类", tags = {"MerchantStore接口"})
+public class MerchantStoreController {
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantStoreService merchantStoreService;
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantBaseInfoService merchantBaseInfoService;
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantImageService merchantImageService;
+    @Setter(onMethod_ = {@Autowired})
+    private UserAppService userAppService;
+
+    @PostMapping
+    @ApiOperation(tags = {"页面-首页", "页面-商户详情"}, value = "获取门店信息", notes = "返回分页过后的数据", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "MerchantStore", value = "查询需要的信息实例", paramType = "body", dataType = "MerchantStore")})
+    public Result<PageInfo<MerchantStore>> list(@RequestBody MerchantStore merchantStore) {
+        UserApp userApp = userAppService.queryUserAppByToken();
+        merchantStore.setMerchantCode(userApp.getMerchantCode());
+
+        //判断有无商家信息
+        if (merchantStore.getMerchantCode() == null || StringUtil.isEmpty(merchantStore.getMerchantCode())) {
+            return ResultGenerator.genFailResult("无商家编码");
+        }
+
+        if (merchantStore.getSize() == null || merchantStore.getSize() == 0) {
+            merchantStore.setSize(ProjectConstant.PAGE_SIZE);
+        }
+        if (merchantStore.getPage() == null || merchantStore.getPage() == 0) {
+            merchantStore.setPage(1);
+        }
+
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageSize", merchantStore.getSize());
+        map.put("offset", (merchantStore.getPage() - 1) * merchantStore.getSize());
+        map.put("merchantCode", merchantStore.getMerchantCode());
+        if (!StringUtil.isEmpty(merchantStore.getStatus())) {
+            map.put("status", merchantStore.getStatus());
+        }
+        if (!StringUtil.isEmpty(merchantStore.getStoreName())) {
+            map.put("storeName", merchantStore.getStoreName());
+        }
+
+        MerchantBaseInfo merchantBaseInfo = new MerchantBaseInfo();
+        merchantBaseInfo.setMerchantCode(merchantStore.getMerchantCode());
+        merchantBaseInfo = merchantBaseInfoService.queryMerchantBaseInfo(merchantBaseInfo);
+        if (merchantBaseInfo == null) {
+            return ResultGenerator.genSuccessResult(null);
+        }
+
+        List<MerchantStore> merchantStoreList = merchantStoreService.queryMerchantStorePage(map);
+
+        for (MerchantStore m : merchantStoreList) {
+            if (!StringUtil.isEmpty(merchantBaseInfo.getAlias())) {
+                m.setAlias(merchantBaseInfo.getAlias());
+            }
+            if (!StringUtil.isEmpty(merchantBaseInfo.getProductDesc())) {
+                m.setProductDesc(merchantBaseInfo.getProductDesc());
+            }
+
+            String merchantCode = merchantBaseInfo.getMerchantCode();
+            if (!StringUtil.isEmpty(merchantCode)) {
+                MerchantImage merchantImage = new MerchantImage();
+                merchantImage.setMerchantCode(merchantCode);
+                merchantImage.setPhotoType("06");
+                List<MerchantImage> queryMerchantImageList = merchantImageService.queryMerchantImageList(merchantImage);
+                if (null != queryMerchantImageList && !queryMerchantImageList.isEmpty()) {
+                    merchantImage = queryMerchantImageList.get(0);
+                    m.setStoreHeadPic(merchantImage.getPicUrl());
+                }
+                MerchantImage merchantImage1 = new MerchantImage();
+                merchantImage1.setMerchantCode(merchantCode);
+                merchantImage1.setPhotoType("08");
+                List<MerchantImage> queryMerchantImageList1 = merchantImageService.queryMerchantImageList(merchantImage1);
+                if (null != queryMerchantImageList1 && !queryMerchantImageList1.isEmpty()) {
+                    merchantImage1 = queryMerchantImageList1.get(0);
+                    m.setCashPic(merchantImage1.getPicUrl());
+                }
+                MerchantImage merchantImage2 = new MerchantImage();
+                merchantImage2.setMerchantCode(merchantCode);
+                merchantImage2.setPhotoType("09");
+                List<MerchantImage> queryMerchantImageList2 = merchantImageService.queryMerchantImageList(merchantImage2);
+                if (null != queryMerchantImageList2 && !queryMerchantImageList2.isEmpty()) {
+                    merchantImage2 = queryMerchantImageList2.get(0);
+                    m.setStoreInsidePic(merchantImage2.getPicUrl());
+                }
+            }
+        }
+
+        Integer count = merchantStoreService.queryMerchantStorePageCount(map);
+        // 返回参数
+        PageInfo<MerchantStore> pager = new PageInfo<>(count.longValue(), (long) StringUtil.getPageCount(count, merchantStore.getSize()),
+                merchantStore.getPage().longValue(), merchantStore.getSize().longValue(), merchantStoreList);
+        return ResultGenerator.genSuccessResult(pager);
+    }
+
+    @GetMapping("/{storeId}")
+    @ApiOperation(value = "获取门店详情信息", notes = "查看单个项目的内容", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "storeId", value = "查询的storeId", paramType = "path", required = true, dataType = "String", defaultValue = "0")})
+    public Result<MerchantStore> detail(@PathVariable String storeId) {
+        MerchantStore merchantStore = new MerchantStore();
+        merchantStore.setStoreId(storeId);
+        merchantStore = merchantStoreService.queryMerchantStore(merchantStore);
+        return ResultGenerator.genSuccessResult(merchantStore);
+    }
+
+    @GetMapping("/certInfo")
+    public Result<Map<String, Object>> getCertInfo() {
+        UserApp userApp = userAppService.queryUserAppByToken();
+        Map<String, Object> certInfo = merchantStoreService.getCertInfo(userApp.getUserId() + "");
+        return ResultGenerator.genSuccessResult(certInfo);
+    }
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/NewAreaController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/NewAreaController.java
new file mode 100644
index 0000000..ebd7440
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/NewAreaController.java
@@ -0,0 +1,158 @@
+package cn.pluss.platform.controller;
+
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.constants.ProjectConstant;
+import cn.pluss.platform.entity.NewArea;
+import cn.pluss.platform.leshua.LeshuaArea;
+import cn.pluss.platform.leshua.LeshuaCity;
+import cn.pluss.platform.leshua.LeshuaProvince;
+import cn.pluss.platform.newArea.NewAreaService;
+import cn.pluss.platform.util.StringUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+@RestController
+@RequestMapping("/newArea")
+@Api(value = "NewArea控制类", tags = {"NewArea接口"})
+public class NewAreaController {
+
+    @Resource
+    private NewAreaService newAreaService;
+
+    @GetMapping
+    @ApiOperation(value = "获取全部", notes = "返回分页过后的数据", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "page", value = "查询页码", paramType = "query", dataType = "Integer", defaultValue = "0"),
+            @ApiImplicitParam(name = "size", value = "每页数据量", paramType = "query", dataType = "Integer", defaultValue = "0")
+    })
+    public Result<PageInfo<NewArea>> list(@RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
+        if (size == null || size == 0) {
+            size = ProjectConstant.PAGE_SIZE;
+        }
+        if (page == null || page == 0) {
+            page = 1;
+        }
+        Map<String, Object> map = new HashMap<String, Object>();
+        map.put("pageSize", size);
+        map.put("offset", (page - 1) * size);
+        List<NewArea> newAreaList = newAreaService.queryNewAreaPage(map);
+        Integer count = newAreaService.queryNewAreaPageCount(map);
+        //返回参数
+        PageInfo pager = new PageInfo<NewArea>(count.longValue(), (long) StringUtil.getPageCount(count, size), page.longValue(), size.longValue(), newAreaList);
+        return ResultGenerator.genSuccessResult(pager);
+    }
+
+    @PostMapping
+    @ApiOperation(value = "添加数据", notes = "添加新的数据", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "NewArea", value = "待添加的NewArea实例", paramType = "body", dataType = "NewArea", required = true)
+    })
+    public Result add(@RequestBody NewArea newArea) {
+        newAreaService.saveNewArea(newArea);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @DeleteMapping("/{id}")
+    @ApiOperation(value = "删除数据", notes = "根据id删除数据", httpMethod = "DELETE")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "查询的id实例", paramType = "path", dataType = "Integer", required = true)
+    })
+    public Result delete(@PathVariable Integer id) {
+        NewArea newArea = new NewArea();
+        newArea.setId(id.intValue());
+        newAreaService.deleteNewArea(newArea);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @PutMapping
+    @ApiOperation(value = "更新数据", notes = "根据内容更新数据", httpMethod = "PUT")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "NewArea", value = "更新的NewArea实例", paramType = "body", dataType = "NewArea", required = true)
+    })
+    public Result update(@RequestBody NewArea newArea) {
+        newAreaService.updateNewArea(newArea);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @GetMapping("/{id}")
+    @ApiOperation(value = "获取单个值", notes = "查看单个项目的内容", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "查询的id", paramType = "path", required = true, dataType = "Integer", defaultValue = "0")
+    })
+    public Result detail(@PathVariable Long id) {
+        NewArea newArea = new NewArea();
+        newArea.setId(id.intValue());
+        newArea = newAreaService.queryNewArea(newArea);
+        return ResultGenerator.genSuccessResult(newArea);
+    }
+
+
+    public Result queryProvice() {
+        NewArea newArea = new NewArea();
+        newArea.setParentId(0);
+        List<NewArea> queryNewAreaList = newAreaService.queryNewAreaList(newArea);//省
+
+        for (NewArea newArea2 : queryNewAreaList) {
+
+        }
+        return null;
+
+    }
+
+    @PostMapping("/queryProvinceandCityandArea")
+    @ApiOperation(value = "查询省市区", notes = "查询省市区", httpMethod = "POST")
+    public Result queryProvinceandCityandArea() {
+        NewArea newArea = new NewArea();
+        newArea.setParentId(0);
+        List<NewArea> queryNewAreaList = newAreaService.queryNewAreaList(newArea);//省
+        List<LeshuaProvince> list = new ArrayList<LeshuaProvince>();
+        for (NewArea leshuaProvince : queryNewAreaList) {
+            LeshuaProvince l = new LeshuaProvince();
+            l.setCode(leshuaProvince.getId() + "");
+            l.setName(leshuaProvince.getName());
+            list.add(l);
+
+        }
+        for (LeshuaProvince leshuaProvince : list) {
+            NewArea newArea1 = new NewArea();
+            newArea1.setParentId(Integer.valueOf(leshuaProvince.getCode()));
+            List<NewArea> queryNewAreaList2 = newAreaService.queryNewAreaList(newArea1);
+            List<LeshuaCity> leshuaCities = new ArrayList<LeshuaCity>();
+            for (NewArea leshuaProvince2 : queryNewAreaList2) {
+                LeshuaCity leshuaCity = new LeshuaCity();
+                leshuaCity.setCode(leshuaProvince2.getId() + "");
+                leshuaCity.setName(leshuaProvince2.getName());
+                List<LeshuaArea> areaList = new ArrayList<LeshuaArea>();
+                NewArea newArea2 = new NewArea();
+                newArea2.setId(leshuaProvince2.getId());
+                List<NewArea> queryNewAreaList3 = newAreaService.queryNewAreaList(newArea2);
+                for (NewArea leshuaProvince3 : queryNewAreaList3) {
+                    LeshuaArea leshuaArea = new LeshuaArea();
+                    leshuaArea.setCode(leshuaProvince3.getId() + "");
+                    leshuaArea.setName(leshuaProvince3.getName());
+                    areaList.add(leshuaArea);
+                }
+                leshuaCity.setAreaList(areaList);
+                leshuaCities.add(leshuaCity);
+            }
+            leshuaProvince.setCitylist(leshuaCities);
+
+        }
+        return ResultGenerator.genSuccessResult(list);
+    }
+
+
+}
+
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/NoticeController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/NoticeController.java
new file mode 100644
index 0000000..6078023
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/NoticeController.java
@@ -0,0 +1,97 @@
+package cn.pluss.platform.controller;
+
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.constants.ProjectConstant;
+import cn.pluss.platform.entity.Notice;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.notice.NoticeService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.util.StringUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/notice")
+@Transactional
+@Api(value = "Notice控制类", tags = {"Notice接口"})
+public class NoticeController {
+
+    @Resource
+    private NoticeService noticeService;
+    @Resource
+    private UserAppService userAppService;
+
+    @GetMapping
+    @ApiOperation(tags = {"页面-收益通知", "页面-审核通知"}, value = "获取全部", notes = "返回分页过后的数据", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "page", value = "查询页码", paramType = "query", dataType = "Integer", defaultValue = "0"),
+            @ApiImplicitParam(name = "size", value = "每页数据量", paramType = "query", dataType = "Integer", defaultValue = "0"),
+            @ApiImplicitParam(name = "typeFirst", value = "通知类型", paramType = "query", dataType = "Integer"),
+            @ApiImplicitParam(name = "userId", value = "指定人员的Id", paramType = "query", dataType = "String", required = true)})
+    public Result<PageInfo<Notice>> list(@RequestParam(defaultValue = "1") Integer page,
+                                         @RequestParam(defaultValue = "10") Integer size, Integer typeFirst, String userId) {
+        UserApp userApp = userAppService.queryUserAppByToken();
+        userId = userApp.getUserId() + "";
+        
+        if (size == null || size == 0) {
+            size = ProjectConstant.PAGE_SIZE;
+        }
+        if (page == null || page == 0) {
+            page = 1;
+        }
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageSize", size);
+        map.put("offset", (page - 1) * size);
+        map.put("typeFirst", typeFirst);
+        map.put("userId", userId);
+        List<Notice> noticeList = noticeService.queryNoticePage(map);
+        for (Notice notice : noticeList) {
+            notice.setIsDeal(1);
+            noticeService.updateNotice(notice);
+
+            if (notice.getTypeSecond().equals(Notice.TYPE_MER_OUT_LINE) || notice.getTypeSecond().equals(Notice.TYPE_MER_EXCEPTION) || notice.getTypeSecond().equals(Notice.TYPE_MER_FREEZE)) {
+                notice.setTypeSecond(-1);
+            }
+        }
+
+        Integer count = noticeService.queryNoticePageCount(map);
+        // 返回参数
+        PageInfo pager = new PageInfo<>(count.longValue(), (long) StringUtil.getPageCount(count, size), page.longValue(), size.longValue(), noticeList);
+        return ResultGenerator.genSuccessResult(pager);
+    }
+
+    /**
+     * queryIsDeal:(查询当前用户的审核消息未读数量). <br/>
+     *
+     * @return
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    @PostMapping("/queryIsDeal")
+    @ApiOperation(value = "查询当前用户的审核消息未读数量", notes = "查询当前用户的审核消息未读数量", httpMethod = "POST")
+    public Result queryIsDeal(@RequestBody Notice notice) {
+        Map<String, Object> result = new HashMap<>(16);
+        try {
+            notice.setIsDeal(0);
+            notice.setTypeFirst(notice.getTypeFirst() == null ? 1 : notice.getTypeFirst());
+            notice.setUserId(notice.getUserId());
+            List<Notice> queryNoticeList = noticeService.queryNoticeList(notice);
+            result.put("count", queryNoticeList.size());
+            return ResultGenerator.genSuccessResult(result);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResultGenerator.genFailResult(result);
+        }
+    }
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/NoticePageController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/NoticePageController.java
new file mode 100644
index 0000000..0ebadc0
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/NoticePageController.java
@@ -0,0 +1,8 @@
+package cn.pluss.platform.controller;
+
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class NoticePageController {
+
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/NoticeReadRecordController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/NoticeReadRecordController.java
new file mode 100644
index 0000000..9224964
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/NoticeReadRecordController.java
@@ -0,0 +1,61 @@
+package cn.pluss.platform.controller;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.entity.NoticeReadRecord;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.notice.NoticeReadRecordService;
+import lombok.Setter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+ * @author djh
+ * 通知已读相关接口
+ */
+@RestController
+@RequestMapping("/noticeReadRecord")
+public class NoticeReadRecordController {
+
+    @Setter(onMethod_ = {@Autowired})
+    private NoticeReadRecordService noticeReadRecordService;
+
+    @GetMapping("/notice")
+    public Result<Object> getNoReadNoticeCount() {
+        Map<String, Object> resultMap = noticeReadRecordService.getAppNoReadNoticeCount();
+        return ResultGenerator.genSuccessResult(resultMap);
+    }
+
+    @GetMapping("/article")
+    public Result<Object> getNoReadArticleCount() {
+        Map<String, Object> resultMap = noticeReadRecordService.getAppNoReadArticleCount();
+        return ResultGenerator.genSuccessResult(resultMap);
+    }
+
+    @PostMapping("/article")
+    public Result<Object> save(@RequestBody NoticeReadRecord noticeReadRecord) {
+        try {
+            noticeReadRecordService.save(noticeReadRecord);
+        } catch (Exception ignored) {
+        }
+
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @PostMapping("/clearReadFlag")
+    public Result<Object> clearReadFlag(@RequestBody Map<String, Object> params) {
+        if (params.get("typeFirst") == null) {
+            throw new MsgException("缺少类别一");
+        }
+
+        if (params.get("typeSecond") == null) {
+            throw new MsgException("缺少类别二");
+        }
+
+        noticeReadRecordService.clearReadFlag(params.get("typeFirst").toString(), params.get("typeSecond").toString());
+
+        return ResultGenerator.genSuccessResult();
+    }
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/PhoneValidateCodeController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/PhoneValidateCodeController.java
new file mode 100644
index 0000000..cf584c6
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/PhoneValidateCodeController.java
@@ -0,0 +1,130 @@
+package cn.pluss.platform.controller;
+
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.constants.ProjectConstant;
+import cn.pluss.platform.entity.PhoneValidateCode;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.entity.UserInfo;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.phoneValidateCode.PhoneValidateCodeService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.userInfo.UserInfoService;
+import cn.pluss.platform.util.StringUtil;
+import cn.pluss.platform.util.ValidateCodeUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+@RestController
+@RequestMapping("/phoneValidateCode")
+@Transactional
+@Api(value = "PhoneValidateCode控制类", tags = {"PhoneValidateCode接口"})
+public class PhoneValidateCodeController {
+
+    @Autowired
+    private ValidateCodeUtil validateCodeUtil;
+
+    @Resource
+    private PhoneValidateCodeService phoneValidateCodeService;
+    @Resource
+    private UserInfoService uiService;
+
+    @Autowired
+    private UserAppService uaService;
+
+    @GetMapping
+    @ApiOperation(value = "获取全部", notes = "返回分页过后的数据", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "page", value = "查询页码", paramType = "query", dataType = "Integer", defaultValue = "0"),
+            @ApiImplicitParam(name = "size", value = "每页数据量", paramType = "query", dataType = "Integer", defaultValue = "0")
+    })
+    public Result<PageInfo<PhoneValidateCode>> list(@RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
+        if (size == null || size == 0) {
+            size = ProjectConstant.PAGE_SIZE;
+        }
+        if (page == null || page == 0) {
+            page = 1;
+        }
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageSize", size);
+        map.put("offset", (page - 1) * size);
+        List<PhoneValidateCode> phoneValidateCodeList = phoneValidateCodeService.queryPhoneValidateCodePage(map);
+        Integer count = phoneValidateCodeService.queryPhoneValidateCodePageCount(map);
+        //返回参数
+        PageInfo pager = new PageInfo<>(count.longValue(), (long) StringUtil.getPageCount(count,size), page.longValue(), size.longValue(), phoneValidateCodeList);
+        return ResultGenerator.genSuccessResult(pager);
+    }
+
+    @PostMapping
+    @ApiOperation(tags = {"页面-忘记密码"}, value = "发送验证码", notes = "必须要已经注册的手机号可调用该验证码接口", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "PhoneValidateCode", value = "待添加的PhoneValidateCode实例", paramType = "body", dataType = "PhoneValidateCode", required = true)
+    })
+    public Result<Object> add(HttpServletRequest request, @RequestBody PhoneValidateCode phoneValidateCode) {
+
+        String phone = phoneValidateCode.getPhone();
+        if (StringUtil.isEmpty(phone)) {
+            return ResultGenerator.genFailResult("没有手机号！");
+        }
+
+        LambdaQueryWrapper<UserInfo> qWui = Wrappers.lambdaQuery();
+        qWui.eq(UserInfo::getLoginName, phone);
+        UserInfo ui = uiService.getOne(qWui);
+        if (ui == null) {
+            throw new MsgException("帐号不存在");
+        }
+
+        LambdaQueryWrapper<UserApp> qWua = Wrappers.lambdaQuery();
+        qWua.eq(UserApp::getUserId, ui.getId());
+        UserApp ua = uaService.getOne(qWua);
+        if ("promoter".equals(ua.getUserType()) && phone.length() > 11) {
+            throw new MsgException("子商户不允许执行该操作");
+        }
+
+        phoneValidateCode.setPhone(ui.getPhone());
+
+        String checkCode = StringUtil.random(4);
+        phoneValidateCode.setCode(checkCode);
+        try {
+            Result<Object> result = validateCodeUtil.requestValidateCode(phoneValidateCode.getPhone(), checkCode);
+            if (result != null) {
+                return result;
+            }
+        } catch (Exception e) {
+            return ResultGenerator.genFailResult(e.getMessage());
+        }
+
+        //根据当前手机号查询当前手机号是否有验证码信息
+        phoneValidateCodeService.saveOrReplaceIfExist(phoneValidateCode);
+        return ResultGenerator.genSuccessResult(phoneValidateCode);
+    }
+
+    @GetMapping("/{id}")
+    @ApiOperation(value = "获取单个值", notes = "查看单个项目的内容", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "查询的id", paramType = "path", required = true, dataType = "Integer", defaultValue = "0")
+    })
+    public Result<Object> detail(@PathVariable Long id) {
+        PhoneValidateCode phoneValidateCode = new PhoneValidateCode();
+        phoneValidateCode.setId(id.intValue());
+        phoneValidateCode = phoneValidateCodeService.queryPhoneValidateCode(phoneValidateCode);
+        return ResultGenerator.genSuccessResult(phoneValidateCode);
+    }
+
+}
+
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/PushController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/PushController.java
new file mode 100644
index 0000000..1182c72
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/PushController.java
@@ -0,0 +1,44 @@
+package cn.pluss.platform.controller;
+
+import cn.pluss.platform.PushService;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import lombok.Setter;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+ * 发送下单，催单通知等接口
+ *
+ * @author DJH
+ */
+@RestController
+@RequestMapping("/push/")
+public class PushController {
+
+    @Setter(onMethod_ = {@Autowired})
+    private PushService pushService;
+
+    @PostMapping("/pushMsg")
+    public Result<Object> pushMsg(@RequestBody Map<String, Object> param) {
+        String userId = (String) param.get("userId");
+        String msgType = (String) param.get("type");
+
+        Integer storeId = (Integer) param.get("storeId");
+
+        if (StringUtils.isNotBlank(userId)) {
+            pushService.pushMsg(userId, msgType);
+        } else {
+            pushService.pushMsg(storeId, msgType);
+        }
+
+
+        return ResultGenerator.genSuccessResult();
+    }
+ }
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/QuestionsAnswersController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/QuestionsAnswersController.java
new file mode 100644
index 0000000..466dc7a
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/QuestionsAnswersController.java
@@ -0,0 +1,95 @@
+package cn.pluss.platform.controller;
+
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.constants.ProjectConstant;
+import cn.pluss.platform.entity.QuestionsAnswers;
+import cn.pluss.platform.questionsAnswers.QuestionsAnswersService;
+import cn.pluss.platform.util.StringUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/questionsAnswers")
+@Transactional
+@Api(value = "QuestionsAnswers控制类", tags = { "QuestionsAnswers接口" })
+public class QuestionsAnswersController {
+
+	@Resource
+	private QuestionsAnswersService questionsAnswersService;
+
+	@GetMapping
+	@ApiOperation(value = "获取全部", notes = "返回分页过后的数据", httpMethod = "GET")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "page", value = "查询页码", paramType = "query", dataType = "Integer", defaultValue = "0"),
+			@ApiImplicitParam(name = "size", value = "每页数据量", paramType = "query", dataType = "Integer", defaultValue = "0") })
+	public Result<PageInfo<QuestionsAnswers>> list(@RequestParam(defaultValue = "1") Integer page,
+			@RequestParam(defaultValue = "10") Integer size) {
+		if (size == null || size == 0) {
+			size = ProjectConstant.PAGE_SIZE;
+		}
+		if (page == null || page == 0) {
+			page = 1;
+		}
+		Map<String, Object> map = new HashMap<String, Object>();
+		map.put("pageSize", size);
+		map.put("offset", (page - 1) * size);
+		List<QuestionsAnswers> questionsAnswersList = questionsAnswersService.queryQuestionsAnswersPage(map);
+		Integer count = questionsAnswersService.queryQuestionsAnswersPageCount(map);
+		// 返回参数
+		PageInfo pager = new PageInfo<QuestionsAnswers>(count.longValue(), (long) StringUtil.getPageCount(count,size), page.longValue(), size.longValue(),
+				questionsAnswersList);
+		return ResultGenerator.genSuccessResult(pager);
+	}
+
+	@PostMapping
+	@ApiOperation(value = "添加数据", notes = "添加新的数据", httpMethod = "POST")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "QuestionsAnswers", value = "待添加的QuestionsAnswers实例", paramType = "body", dataType = "QuestionsAnswers", required = true) })
+	public Result add(@RequestBody QuestionsAnswers questionsAnswers) {
+		questionsAnswersService.saveQuestionsAnswers(questionsAnswers);
+		return ResultGenerator.genSuccessResult();
+	}
+
+	@DeleteMapping("/{id}")
+	@ApiOperation(value = "删除数据", notes = "根据id删除数据", httpMethod = "DELETE")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "id", value = "查询的id实例", paramType = "path", dataType = "Integer", required = true) })
+	public Result delete(@PathVariable Integer id) {
+		QuestionsAnswers questionsAnswers = new QuestionsAnswers();
+		questionsAnswers.setId(id.intValue());
+		questionsAnswersService.deleteQuestionsAnswers(questionsAnswers);
+		return ResultGenerator.genSuccessResult();
+	}
+
+	@PutMapping
+	@ApiOperation(value = "更新数据", notes = "根据内容更新数据", httpMethod = "PUT")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "QuestionsAnswers", value = "更新的QuestionsAnswers实例", paramType = "body", dataType = "QuestionsAnswers", required = true) })
+	public Result update(@RequestBody QuestionsAnswers questionsAnswers) {
+		questionsAnswersService.updateQuestionsAnswers(questionsAnswers);
+		return ResultGenerator.genSuccessResult();
+	}
+
+	@GetMapping("/{id}")
+	@ApiOperation(value = "获取单个值", notes = "查看单个项目的内容", httpMethod = "GET")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "id", value = "查询的id", paramType = "path", required = true, dataType = "Integer", defaultValue = "0") })
+	public Result detail(@PathVariable Long id) {
+		QuestionsAnswers questionsAnswers = new QuestionsAnswers();
+		questionsAnswers.setId(id.intValue());
+		questionsAnswers = questionsAnswersService.queryQuestionsAnswers(questionsAnswers);
+		return ResultGenerator.genSuccessResult(questionsAnswers);
+	}
+
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/RealFansController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/RealFansController.java
new file mode 100644
index 0000000..8af2f3f
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/RealFansController.java
@@ -0,0 +1,81 @@
+package cn.pluss.platform.controller;
+
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.entity.RealFans;
+import cn.pluss.platform.realFans.RealFansService;
+import cn.pluss.platform.util.PageUtils;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+
+@RestController
+@RequestMapping("/realFans")
+@Api(value = "RealFans控制类", tags = {"RealFans接口"})
+public class RealFansController {
+    @Resource
+    private RealFansService realFansService;
+
+    @GetMapping
+    @ApiOperation(value = "获取全部", notes = "返回分页过后的数据", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "page", value = "查询页码", paramType = "query", dataType = "Integer", defaultValue = "0"),
+            @ApiImplicitParam(name = "size", value = "每页数据量", paramType = "query", dataType = "Integer", defaultValue = "0")
+    })
+    public Result<PageInfo<RealFans>> list(@RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
+        IPage<RealFans> page1 = realFansService.page(new Page<>(page, size));
+        //返回参数
+        PageInfo<RealFans> pager = PageUtils.page(page1);
+        return ResultGenerator.genSuccessResult(pager);
+    }
+
+    @PostMapping
+    @ApiOperation(value = "添加数据", notes = "添加新的数据", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "RealFans", value = "待添加的RealFans实例", paramType = "body", dataType = "RealFans", required = true)
+    })
+    public Result add(@RequestBody RealFans realFans) {
+        realFansService.save(realFans);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @DeleteMapping("/{id}")
+    @ApiOperation(value = "删除数据", notes = "根据id删除数据", httpMethod = "DELETE")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "查询的id实例", paramType = "path", dataType = "Integer", required = true)
+    })
+    public Result delete(@PathVariable Long id) {
+        realFansService.removeById(id);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @PutMapping
+    @ApiOperation(value = "更新数据", notes = "根据内容更新数据", httpMethod = "PUT")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "RealFans", value = "更新的RealFans实例", paramType = "body", dataType = "RealFans", required = true)
+    })
+    public Result update(@RequestBody RealFans realFans) {
+        realFansService.updateById(realFans);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @GetMapping("/{id}")
+    @ApiOperation(value = "获取单个值", notes = "查看单个项目的内容", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "查询的id", paramType = "path", required = true, dataType = "Integer", defaultValue = "0")
+    })
+    public Result detail(@PathVariable Long id) {
+        RealFans realFans = realFansService.getById(id);
+        return ResultGenerator.genSuccessResult(realFans);
+    }
+
+}
+
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/SpreadController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/SpreadController.java
new file mode 100644
index 0000000..d075147
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/SpreadController.java
@@ -0,0 +1,116 @@
+package cn.pluss.platform.controller;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.leshua.ExpandDto;
+import cn.pluss.platform.service.common.SpreadService;
+import cn.pluss.platform.vo.SpreadData;
+import cn.pluss.platform.vo.UserNumVO;
+import cn.pluss.platform.vo.UserTeamAchieVO;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.Setter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+ * @author DJH
+ */
+@RestController
+@RequestMapping("spread")
+public class SpreadController {
+
+    @Setter(onMethod_ = @Autowired)
+    private SpreadService spreadService;
+
+    @GetMapping("/expandPageData")
+    public Result<Page<UserApp>> expandPageData(ExpandDto dto) {
+        Page<UserApp> userAppPage = spreadService.expandPageData(dto);
+        return ResultGenerator.genSuccessResult(userAppPage);
+    }
+
+    /**
+     * 获取升级图片
+     * @return
+     */
+    @GetMapping("/upgradeImg")
+    public Result<String> getUpgradeImage() {
+        String imgUrl = spreadService.getUpgradeImage();
+        return ResultGenerator.genSuccessResult(imgUrl);
+    }
+
+    /**
+     * 获取支付成功后页面的数据配置数据
+     */
+    @GetMapping("/paySuccessPageData")
+    public Result<Map<String, Object>> paySuccessPageData() {
+        Map<String, Object> result = spreadService.appPaySuccessPageData();
+        return ResultGenerator.genSuccessResult(result);
+    }
+
+
+    @GetMapping("/todaySpreadData")
+    public Result<SpreadData> todaySpreadData() {
+        SpreadData spreadData = spreadService.apiTodaySpreadData();
+        return ResultGenerator.genSuccessResult(spreadData);
+    }
+
+    @GetMapping("/historySpreadPageData")
+    public Result<Page<SpreadData>> historySpreadPageData(Page<SpreadData> page, String type, String target) {
+        page.getOrders().clear();
+        page.getOrders().add(OrderItem.desc("startDate"));
+        Page<SpreadData> pageData = spreadService.apiHistorySpreadPageData(page, type, target);
+        return ResultGenerator.genSuccessResult(pageData);
+    }
+
+    /**
+     * 查询团队业绩
+     * @date: 2022/1/24 14:23
+     * @param vo:
+     * @return cn.pluss.platform.api.Result<com.baomidou.mybatisplus.extension.plugins.pagination.Page<cn.pluss.platform.vo.UserTeamAchieVO>>
+     */
+    @GetMapping("/getUserTeamAchie")
+    public Result<Page<UserTeamAchieVO>> getUserTeamAchie(Page<UserTeamAchieVO> page,UserTeamAchieVO vo) {
+        page = spreadService.userTeamAchiePage(page,vo);
+        return ResultGenerator.genSuccessResult(page);
+    }
+
+    /**
+     * 获取用户团队交易流水
+     * @date: 2022/1/24 22:50
+     * @param vo:
+     */
+    @GetMapping("/getUserFlow")
+    public Result<UserTeamAchieVO> getUserFlow(UserTeamAchieVO vo) {
+        UserTeamAchieVO result = spreadService.getAppUserTeanFlow(vo);
+        return ResultGenerator.genSuccessResult(result);
+    }
+
+    /**
+     * 获取直推商户数量信息
+     * @date: 2022/1/24 22:50
+     * @param vo:
+     */
+    @GetMapping("/getUserDirectMercInfo")
+    public Result<UserNumVO> getUserDirectMercInfo(UserNumVO vo) {
+        UserNumVO result = spreadService.getUserDirectNumInfo(vo,UserNumVO.DATA_TYPE_MERCHANT);
+        return ResultGenerator.genSuccessResult(result);
+    }
+
+
+    /**
+     * 获取直推成员数量信息
+     * @date: 2022/1/24 22:50
+     * @param vo:
+     */
+    @GetMapping("/getUserDirectMemberInfo")
+    public Result<UserNumVO> getUserDirectMemberInfo(UserNumVO vo) {
+        UserNumVO result = spreadService.getUserDirectNumInfo(vo,UserNumVO.DATE_TYPE_MEMBER);
+        return ResultGenerator.genSuccessResult(result);
+    }
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/SuggestController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/SuggestController.java
new file mode 100644
index 0000000..1594976
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/SuggestController.java
@@ -0,0 +1,109 @@
+package cn.pluss.platform.controller;
+
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.constants.ProjectConstant;
+import cn.pluss.platform.entity.Suggest;
+import cn.pluss.platform.suggest.SuggestService;
+import cn.pluss.platform.util.StringUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+@RestController
+@RequestMapping("/suggest")
+@Transactional
+@Api(value = "Suggest控制类", tags = {"Suggest接口"})
+public class SuggestController {
+
+    @Resource
+    private SuggestService suggestService;
+
+    @GetMapping
+    @ApiOperation(value = "获取全部", notes = "返回分页过后的数据", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "page", value = "查询页码", paramType = "query", dataType = "Integer", defaultValue = "0"),
+            @ApiImplicitParam(name = "size", value = "每页数据量", paramType = "query", dataType = "Integer", defaultValue = "0")
+    })
+    public Result<PageInfo<Suggest>> list(@RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
+        if (size == null || size == 0) {
+            size = ProjectConstant.PAGE_SIZE;
+        }
+        if (page == null || page == 0) {
+            page = 1;
+        }
+        Map<String, Object> map = new HashMap<String, Object>();
+        map.put("pageSize", size);
+        map.put("offset", (page - 1) * size);
+        List<Suggest> suggestList = suggestService.querySuggestPage(map);
+        Integer count = suggestService.querySuggestPageCount(map);
+        //返回参数
+        PageInfo pager = new PageInfo<Suggest>(count.longValue(), (long) StringUtil.getPageCount(count,size), page.longValue(), size.longValue(), suggestList);
+        return ResultGenerator.genSuccessResult(pager);
+    }
+
+    @PostMapping
+    @ApiOperation(value = "添加数据", notes = "添加新的数据", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "Suggest", value = "待添加的Suggest实例", paramType = "body", dataType = "Suggest", required = true)
+    })
+    public Result add(@RequestBody Suggest suggest) {
+//        if (suggest.getPhone() == null) {
+//            throw new MsgException("请输入手机号");
+//        }
+//
+//        if (suggest.getPhone().length() > 11) {
+//            throw new MsgException("手机号过长");
+//        }
+        suggestService.saveSuggest(suggest);
+        suggest.setCreateDt(new Date());
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @DeleteMapping("/{id}")
+    @ApiOperation(value = "删除数据", notes = "根据id删除数据", httpMethod = "DELETE")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "查询的id实例", paramType = "path", dataType = "Integer", required = true)
+    })
+    public Result delete(@PathVariable Integer id) {
+        Suggest suggest = new Suggest();
+        suggest.setId(id.intValue());
+        suggestService.deleteSuggest(suggest);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @PutMapping
+    @ApiOperation(value = "更新数据", notes = "根据内容更新数据", httpMethod = "PUT")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "Suggest", value = "更新的Suggest实例", paramType = "body", dataType = "Suggest", required = true)
+    })
+    public Result update(@RequestBody Suggest suggest) {
+        suggestService.updateSuggest(suggest);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @GetMapping("/{id}")
+    @ApiOperation(value = "获取单个值", notes = "查看单个项目的内容", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "查询的id", paramType = "path", required = true, dataType = "Integer", defaultValue = "0")
+    })
+    public Result detail(@PathVariable Long id) {
+        Suggest suggest = new Suggest();
+        suggest.setId(id.intValue());
+        suggest = suggestService.querySuggest(suggest);
+        return ResultGenerator.genSuccessResult(suggest);
+    }
+
+}
+
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/SxfMccInfoController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/SxfMccInfoController.java
new file mode 100644
index 0000000..d465116
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/SxfMccInfoController.java
@@ -0,0 +1,24 @@
+package cn.pluss.platform.controller;
+
+
+import cn.pluss.platform.SxfMccInfoService;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.entity.SxfMccInfo;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-09-22
+ */
+@Deprecated
+@RestController
+@RequestMapping("/sxfMccInfo")
+public class SxfMccInfoController extends BaseModelController<SxfMccInfoService, SxfMccInfo> {
+
+
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/SystemConfigController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/SystemConfigController.java
new file mode 100644
index 0000000..1d9897d
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/SystemConfigController.java
@@ -0,0 +1,208 @@
+package cn.pluss.platform.controller;
+
+import cn.pluss.platform.annotation.OpLog;
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.baidu.BaiduFaceDetectService;
+import cn.pluss.platform.constants.ProjectConstant;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantBankCard.MerchantBankCardService;
+import cn.pluss.platform.systemConfig.SystemConfigService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.util.StringUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import io.swagger.annotations.*;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.codec.digest.DigestUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/systemConfig")
+@Transactional
+@Slf4j
+@Api(value = "SystemConfig控制类", tags = {"系统参数接口"})
+public class SystemConfigController {
+
+    private final SystemConfigService systemConfigService;
+    private final UserAppService userAppService;
+    private final MerchantBaseInfoService merchantBaseInfoService;
+    private final MerchantBankCardService merchantBankCardService;
+
+    @Autowired
+    private BaiduFaceDetectService baiduFaceDetectService;
+
+    @GetMapping
+    @ApiOperation(value = "获取全部", notes = "返回分页过后的数据", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "page", value = "查询页码", paramType = "query", dataType = "Integer", defaultValue = "0"),
+            @ApiImplicitParam(name = "size", value = "每页数据量", paramType = "query", dataType = "Integer", defaultValue = "0")
+    })
+    public Result<PageInfo<SystemConfig>> list(@RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "1") Integer size) {
+        if (size == null || size == 0) {
+            size = ProjectConstant.PAGE_SIZE;
+        }
+        if (page == null || page == 0) {
+            page = 1;
+        }
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageSize", size);
+        map.put("offset", (page - 1) * size);
+        List<SystemConfig> systemconfigList = systemConfigService.querySystemConfigPage(map);
+        Integer count = systemConfigService.querySystemConfigPageCount(map);
+        //返回参数
+        PageInfo pager = new PageInfo<>(count.longValue(), (long) StringUtil.getPageCount(count, size), page.longValue(), size.longValue(), systemconfigList);
+        return ResultGenerator.genSuccessResult(pager);
+    }
+
+    /**
+     * 版本跟新接口
+     *
+     * @param platformCode 0： android; 1 :  iOS
+     * @return
+     */
+    @PostMapping("/updateSystemVersion")
+    @ApiOperation(value = "版本更新", notes = "传来版本返回下载地址和系统版本", httpMethod = "POST")
+    public Result<Object> updateSystemVersion(@RequestParam(defaultValue = "-1") int platformCode) {
+        Object result = systemConfigService.updateSystemVersion(platformCode);
+        return ResultGenerator.genSuccessResult(result);
+    }
+
+    @PostMapping("/queryMerchantFeeImgUrl")
+    public Result queryMerchantFeeImgUrl() {
+        Map<String, Object> result = new HashMap<String, Object>(16);
+        boolean flag = false;
+        try {
+            String merchantType = "1";
+            String accountType = "1";
+            UserApp userApp = userAppService.queryUserAppByToken();
+            String myLimit = "";
+            String brushBank = "";
+            String merchantCode = userApp.getMerchantCode();
+            if (StringUtil.isNotEmpty(merchantCode)) {
+                MerchantBaseInfo merchantBaseInfo = new MerchantBaseInfo();
+                merchantBaseInfo.setMerchantCode(merchantCode);
+                merchantBaseInfo = merchantBaseInfoService.queryMerchantBaseInfo(merchantBaseInfo);
+                if (null != merchantBaseInfo) {
+                    merchantType = merchantBaseInfo.getMerchantType() == null ? "1" : merchantBaseInfo.getMerchantType();
+                }
+                MerchantBankCard merchantBankCard;
+                merchantBankCard = merchantBankCardService.queryMerchantBankCard(userApp.getUserId() + "");
+                if (null != merchantBankCard) {
+                    accountType = merchantBankCard.getAccountType() == null ? "1" : merchantBankCard.getAccountType();
+                }
+            }
+
+            String levelImg = systemConfigService.querySystemConfigValue("levelImg");
+
+            flag = true;
+            result.put("flag", flag);
+            result.put("myLimit", levelImg);
+            result.put("brushBank", levelImg);
+            result.put("levelImg", levelImg);
+
+            return ResultGenerator.genSuccessResult(result);
+        } catch (Exception e) {
+            e.printStackTrace();
+            result.put("flag", flag);
+            return ResultGenerator.genFailResult(result);
+        }
+
+    }
+
+    @PostMapping("/isLogin")
+    @ApiOperation(value = "当前版本是否已经上架到appStore", notes = "1, 没有；2，已经上架", httpMethod = "POST", consumes = "application/json", produces = "application/json")
+    @ApiOperationSupport(params = @DynamicParameters(properties = {
+            @DynamicParameter(name = "version", value = "当前app版本号", example = "1.0.9.beta", required = true, dataTypeClass = String.class)
+    }))
+    public Result isLogin(HttpServletRequest request) throws IOException {
+        InputStream is = request.getInputStream();
+        StringBuilder responseStrBuilder = new StringBuilder();
+        BufferedReader streamReader = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8));
+        String inputStr;
+        while ((inputStr = streamReader.readLine()) != null) {
+            responseStrBuilder.append(inputStr);
+        }
+
+        if (responseStrBuilder.length() == 0) {
+            return ResultGenerator.genSuccessResult("1");
+        }
+
+        Object o = systemConfigService.updateSystemVersion(1);
+
+        if(o instanceof AppVersionInfo) {
+            JSONObject json = JSON.parseObject(responseStrBuilder.toString());
+            String version = json.getString("version");
+
+            String versionName = ((AppVersionInfo) o).getVersionName();
+
+            if (StringUtil.isEmpty(version) || StringUtil.isEmpty(versionName) || versionName.compareTo(version) < 0) {
+                return ResultGenerator.genSuccessResult("1");
+            } else {
+                return ResultGenerator.genSuccessResult("2");
+            }
+        } else {
+            return ResultGenerator.genSuccessResult("1");
+        }
+    }
+
+    @GetMapping("/getLeshuaUploadParam")
+    public Result<Map<String, Object>> getLeshuaUploadUrl(String fileMD5) {
+//        Map<String, Object> result = new HashMap<>();
+//        result.put("url", ParametersUtil.LESHUA_API + "/picture/upload");
+//        result.put("agentId", "7389852");
+//        result.put("version", "2.0");
+//
+//        JSONObject object = new JSONObject();
+//        object.put("data")
+//
+//        getSign()
+//
+//        return ResultGenerator.genSuccessResult(ParametersUtil.LESHUA_API + "/picture/upload");
+
+        return ResultGenerator.genFailResult("非法接口");
+    }
+
+    /**
+     * 进件获取签名值
+     *
+     * @param data
+     * @return
+     */
+    private String getSign(JSONObject data) {
+        String sign = "";
+        String jsonData = data.toJSONString();
+        StringBuffer sb = new StringBuffer("lepos");
+        sb.append("60E3F31EDEC8061C33721737B36FA86D").append(jsonData);// key每个渠道商不一样
+        String md5 = DigestUtils.md5Hex(sb.toString().getBytes(StandardCharsets.UTF_8));
+        sign = Base64.encodeBase64String(md5.getBytes(StandardCharsets.UTF_8));
+        log.info("待签参数:{}" + sb);
+        log.info("签名值:{}" + sign);
+        return sign;
+    }
+
+
+    @OpLog(opCode = "BAIDU_ACCESS_TOKEN", opDetail = "获取百度访问token", opName = "获取百度访问token")
+    @GetMapping("/baiduAccessToken")
+    public Result<?> getBaiduAccessToken() {
+        final String auth = baiduFaceDetectService.apiGetAuth();
+        return ResultGenerator.genSuccessResult(auth);
+    }
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/SystemInfoController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/SystemInfoController.java
new file mode 100644
index 0000000..1dad8d0
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/SystemInfoController.java
@@ -0,0 +1,100 @@
+package cn.pluss.platform.controller;
+
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.constants.ProjectConstant;
+import cn.pluss.platform.entity.SystemInfo;
+import cn.pluss.platform.systemInfo.SystemInfoService;
+import cn.pluss.platform.util.StringUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+@RestController
+@RequestMapping("/systemInfo")
+@Transactional
+@Api(value = "SystemInfo控制类", tags = {"SystemInfo接口"})
+public class SystemInfoController {
+
+    @Resource
+    private SystemInfoService systemInfoService;
+
+    @GetMapping
+    @ApiOperation(tags = {"页面-关于我们"}, value = "获取全部", notes = "返回分页过后的数据", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "page", value = "查询页码", paramType = "query", dataType = "Integer", defaultValue = "0"),
+            @ApiImplicitParam(name = "size", value = "每页数据量", paramType = "query", dataType = "Integer", defaultValue = "0")
+    })
+    public Result<PageInfo<SystemInfo>> list(@RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
+        if (size == null || size == 0) {
+            size = ProjectConstant.PAGE_SIZE;
+        }
+        if (page == null || page == 0) {
+            page = 1;
+        }
+        Map<String, Object> map = new HashMap<String, Object>();
+        map.put("pageSize", size);
+        map.put("offset", (page - 1) * size);
+        List<SystemInfo> systemInfoList = systemInfoService.querySystemInfoPage(map);
+        Integer count = systemInfoService.querySystemInfoPageCount(map);
+        //返回参数
+        PageInfo pager = new PageInfo<SystemInfo>(count.longValue(), (long) StringUtil.getPageCount(count, size), page.longValue(), size.longValue(), systemInfoList);
+        return ResultGenerator.genSuccessResult(pager);
+    }
+
+    @PostMapping
+    @ApiOperation(value = "添加数据", notes = "添加新的数据", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "SystemInfo", value = "待添加的SystemInfo实例", paramType = "body", dataType = "SystemInfo", required = true)
+    })
+    public Result add(@RequestBody SystemInfo systemInfo) {
+        systemInfoService.saveSystemInfo(systemInfo);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @DeleteMapping("/{id}")
+    @ApiOperation(value = "删除数据", notes = "根据id删除数据", httpMethod = "DELETE")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "查询的id实例", paramType = "path", dataType = "Integer", required = true)
+    })
+    public Result delete(@PathVariable Integer id) {
+        SystemInfo systemInfo = new SystemInfo();
+        systemInfo.setId(id.intValue());
+        systemInfoService.deleteSystemInfo(systemInfo);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @PutMapping
+    @ApiOperation(value = "更新数据", notes = "根据内容更新数据", httpMethod = "PUT")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "SystemInfo", value = "更新的SystemInfo实例", paramType = "body", dataType = "SystemInfo", required = true)
+    })
+    public Result update(@RequestBody SystemInfo systemInfo) {
+        systemInfoService.updateSystemInfo(systemInfo);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @GetMapping("/{id}")
+    @ApiOperation(value = "获取单个值", notes = "查看单个项目的内容", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "查询的id", paramType = "path", required = true, dataType = "Integer", defaultValue = "0")
+    })
+    public Result detail(@PathVariable Long id) {
+        SystemInfo systemInfo = new SystemInfo();
+        systemInfo.setId(id.intValue());
+        systemInfo = systemInfoService.querySystemInfo(systemInfo);
+        return ResultGenerator.genSuccessResult(systemInfo);
+    }
+
+}
+
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/TestController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/TestController.java
new file mode 100644
index 0000000..b76bf9c
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/TestController.java
@@ -0,0 +1,121 @@
+package cn.pluss.platform.controller;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.channel.MerchantAuditService;
+import cn.pluss.platform.export.BillStatisticsService;
+import cn.pluss.platform.mapper.MerchantRateMapper;
+import cn.pluss.platform.user.impl.GeneralPushUtil;
+import cn.pluss.platform.util.excel.ComplexExcelUtil;
+import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+/**
+ * @author Djh
+ */
+@Slf4j
+//@RestController
+@RequestMapping("test")
+public class TestController {
+
+    @Autowired
+    private BillStatisticsService billStatisticsService;
+
+    @Autowired
+    private GeneralPushUtil generalPushUtil;
+
+    @Autowired
+    private MerchantRateMapper rateMapper;
+
+    @Autowired
+    private MerchantAuditService ysAuditService;
+
+    @Autowired
+    private MerchantAuditService ryxMerchantAuditService;
+
+    @GetMapping("/export1/{merchantCode}")
+    public void test1(@PathVariable("merchantCode") String merchantCode, HttpServletResponse response) throws Exception {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Date startDate = sdf.parse("2021-04-01 00:00:00");
+        Date endDate = sdf.parse("2021-04-30 23:59:59");
+
+        XSSFWorkbook workBook = billStatisticsService.createBillStatisticsSheet(null, merchantCode, startDate, endDate);
+        workBook = billStatisticsService.createBillListSheet(workBook, merchantCode, startDate, endDate);
+        workBook = billStatisticsService.createMemberBillStatisticsSheet(workBook, merchantCode, startDate, endDate);
+        workBook = billStatisticsService.createMemberBillListSheet(workBook, merchantCode, startDate, endDate);
+        workBook = billStatisticsService.createStaffBillStatisticsSheet(workBook, merchantCode, startDate, endDate);
+
+        ComplexExcelUtil.setResponseHeader(response, "测试");
+        ServletOutputStream out = response.getOutputStream();
+        workBook.write(out);
+    }
+
+    @GetMapping("/ysAudit/{userId}")
+    public Result<Object> test1(@PathVariable("userId") String userId) {
+        ysAuditService.merchantAudit(userId, false);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @GetMapping("/ryxResult/{orderId}")
+    @ResponseBody
+    public Object test3(@PathVariable("orderId") String orderId) throws Exception {
+        Map<String, Object> param = new HashMap<>();
+        param.put("orderId", orderId);
+//        param.put("accessMerchId", "b6048439-504d-4be7-88f1-beae06391588");
+        JSONObject jsonObject = ryxMerchantAuditService.merchantAuditResult(param);
+        return jsonObject;
+    }
+
+    @GetMapping("/bb/czs")
+    public Result<Object> test4() {
+        List<String> alias = new ArrayList<>();
+        alias.add("7714");
+        generalPushUtil.sendAllPlatByUserIdChargeWithCoupon(alias, new BigDecimal("20"), new BigDecimal("50"));
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @GetMapping("/bb/cz")
+    public Result<Object> test5() {
+        List<String> alias = new ArrayList<>();
+        alias.add("7714");
+        generalPushUtil.sendAllPlatByUserIdChargeWithCoupon(alias, new BigDecimal("20"), new BigDecimal("50"));
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @GetMapping("/bb/xff")
+    public Result<Object> test6() {
+        List<String> alias = new ArrayList<>();
+        alias.add("7714");
+        generalPushUtil.sendAllPlatByUserIdConsumeWithCoupon(alias, new BigDecimal("20.12"), new BigDecimal(5));
+
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @GetMapping("/bb/xf")
+    public Result<Object> test7() {
+        List<String> alias = new ArrayList<>();
+        alias.add("7714");
+        generalPushUtil.sendAllPlatByUserIdConsumeWithCoupon(alias, new BigDecimal("20"), new BigDecimal("50"));
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @GetMapping("/bb/zfqx")
+    public Result<Object> test8() {
+        List<String> alias = new ArrayList<>();
+        alias.add("7714");
+        generalPushUtil.sendAllPlatByAlias(alias, "订单取消支付", "订单取消支付", "3");
+        return ResultGenerator.genSuccessResult();
+    }
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/UploadImageController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/UploadImageController.java
new file mode 100644
index 0000000..cca179a
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/UploadImageController.java
@@ -0,0 +1,102 @@
+package cn.pluss.platform.controller;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.util.Base64Util;
+import cn.pluss.platform.util.FileUtil;
+import cn.pluss.platform.util.ParametersUtil;
+import cn.pluss.platform.util.StringUtil;
+import cn.pluss.platform.vo.Images;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Properties;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/upLoadImage")
+@Transactional
+@Api(value = "UpLoadImage控制类", tags = { "UpLoadImage接口" })
+public class UploadImageController {
+
+	@PostMapping
+	@ApiOperation(tags = {"页面-设置"}, value = "图片上传, 只用于乐刷进件", notes = "图片的base64字符串", httpMethod = "POST")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "Image", value = "上传的图片实例", paramType = "body", dataType = "Image", required = true) })
+	public Result<Images> add(@RequestBody Images image) {
+		Integer size = FileUtil.imageSize(image.getBase64());
+		boolean bytesToKB =FileUtil.bytesToKB(size, 1);
+		if (bytesToKB) {
+			return ResultGenerator.genFailResult("请上传小于1M的图片（可以添加图片的时候点击编辑，裁剪多余的部分就可以小于1M）");
+		}
+		String visit=ParametersUtil.upload_visit_path;
+		String fileName = null;
+		String name = null;
+		String picUrl = "";
+		try {
+			String path=ParametersUtil.upload_save_path;
+			Properties prop = System.getProperties();
+			String os = prop.getProperty("os.name");
+			if (os.startsWith("win") || os.startsWith("Win")) {
+				// windows目录
+				path = "D:\\xm\\media\\java\\Media\\resources\\manage\\upload";
+				visit = "http://127.0.0.1/resources/manage/upload";
+			}
+			name = StringUtil.getBillno();
+			fileName = path + "/" + name + ".jpg";
+			Base64Util.decoderBase64File(image.getBase64(), fileName);
+			picUrl = visit + "/" + name + ".jpg";
+		} catch (Exception e) {
+			e.printStackTrace();
+			return ResultGenerator.genFailResult(e.getMessage());
+		}
+		image = new Images();
+		image.setVisitUrl(picUrl);
+
+		return ResultGenerator.genSuccessResult(image);
+	}
+
+	@PostMapping("/other")
+	@ApiOperation(tags = {"页面-设置"}, value = "图片上传, 意见反馈等", notes = "图片的base64字符串", httpMethod = "POST")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "Image", value = "上传的图片实例", paramType = "body", dataType = "Image", required = true) })
+	public Result<Images> addOther(@RequestBody Images image) {
+		Integer size = FileUtil.imageSize(image.getBase64());
+		boolean bytesToKB =FileUtil.bytesToKB(size, 5);
+		if (bytesToKB) {
+			return ResultGenerator.genFailResult("请上传小于5M的图片（可以添加图片的时候点击编辑，裁剪多余的部分就可以小于1M）");
+		}
+		String visit=ParametersUtil.upload_visit_path;
+		String fileName = null;
+		String name = null;
+		String picUrl = "";
+		try {
+			String path=ParametersUtil.upload_save_path;
+			Properties prop = System.getProperties();
+			String os = prop.getProperty("os.name");
+			if (os.startsWith("win") || os.startsWith("Win")) {
+				// windows目录
+				path = "D:\\xm\\media\\java\\Media\\resources\\manage\\upload";
+				visit = "http://127.0.0.1/resources/manage/upload";
+			}
+			name = StringUtil.getBillno();
+			fileName = path + "/" + name + ".jpg";
+			Base64Util.decoderBase64File(image.getBase64(), fileName);
+			picUrl = visit + "/" + name + ".jpg";
+		} catch (Exception e) {
+			e.printStackTrace();
+			return ResultGenerator.genFailResult(e.getMessage());
+		}
+		image = new Images();
+		image.setVisitUrl(picUrl);
+		return ResultGenerator.genSuccessResult(image);
+	}
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/UserAppController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/UserAppController.java
new file mode 100644
index 0000000..6b18d4a
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/UserAppController.java
@@ -0,0 +1,1725 @@
+package cn.pluss.platform.controller;
+
+import cn.hutool.core.util.DesensitizedUtil;
+import cn.pluss.platform.IdCardCacheService;
+import cn.pluss.platform.ali.AliService;
+import cn.pluss.platform.annotation.OpLog;
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.baidu.BaiduOCRService;
+import cn.pluss.platform.cash.CashService;
+import cn.pluss.platform.dto.*;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.leshua.*;
+import cn.pluss.platform.leshua.impl.LeshuaMerchantAuditService;
+import cn.pluss.platform.level.LevelService;
+import cn.pluss.platform.mapper.MerchantImageMapper;
+import cn.pluss.platform.mapper.MerchantOrderMapper;
+import cn.pluss.platform.mapper.MerchantRateMapper;
+import cn.pluss.platform.merchant.AccountService;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantBankCard.MerchantBankCardService;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.merchantOrder.MerchantOrderService;
+import cn.pluss.platform.merchantProfit.MerchantProfitService;
+import cn.pluss.platform.merchantStore.MerchantStoreService;
+import cn.pluss.platform.systemConfig.SystemConfigService;
+import cn.pluss.platform.systemInfo.SystemInfoService;
+import cn.pluss.platform.user.UserProfitService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.userInfo.UserInfoService;
+import cn.pluss.platform.util.*;
+import cn.pluss.platform.vo.*;
+import cn.pluss.platform.wechat.WechatService;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.google.gson.reflect.TypeToken;
+import io.swagger.annotations.*;
+import java.math.RoundingMode;
+import java.net.URLEncoder;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import javax.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author Administrator
+ */
+@RestController
+@RequiredArgsConstructor
+@Slf4j
+@RequestMapping("/userApp")
+@Transactional
+@Api(value = "UserApp控制类", tags = { "UserApp接口" })
+public class UserAppController {
+
+  private final AccountService accountService;
+
+  private final UserAppService userAppService;
+
+  private final MerchantStoreService merchantStoreService;
+
+  private final MerchantBaseInfoService merchantBaseInfoService;
+
+  private final MerchantImageMapper merchantImageMapper;
+
+  private final UserInfoService userInfoService;
+
+  private final SystemConfigService systemConfigService;
+
+  private final MerchantOrderService merchantOrderService;
+
+  private final CashService cashService;
+
+  private final LevelService levelService;
+
+  private final SystemInfoService systemInfoService;
+
+  private final LeshuaService leshuaService;
+
+  private final LeshuaMerchantAuditService leshuaMerchantAuditService;
+
+  private final MerchantBankCardService merchantBankCardService;
+
+  private final AliService aliService;
+
+  private final BaiduOCRService baiduOCRService;
+
+  private final MerchantProfitService merchantProfitService;
+
+  private final MerchantOrderMapper merchantOrderMapper;
+
+  private final MerchantRateMapper merchantRateMapper;
+
+  private final WechatService wechatService;
+
+  @Autowired
+  @Lazy
+  private IdCardCacheService idCardCacheService;
+
+  @Autowired
+  private UserProfitService userProfitService;
+
+  @Setter(onMethod_ = { @Autowired, @Lazy })
+  private MerchantChannelStatusService mcsService;
+
+  private static String keyStoreUrl =
+    "/home/syb/resources/wechatCert/apiclient_cert.p12"; // 验证证书路径
+
+  @GetMapping("/postageImg")
+  public Result<Object> getPostageImg() {
+    SystemConfig entity = new SystemConfig();
+    entity.setPropertyKey("yunfei");
+
+    SystemConfig result = systemConfigService.getOne(
+      new QueryWrapper<>(entity)
+    );
+
+    return ResultGenerator.genSuccessResult(result);
+  }
+
+  @PostMapping("/getPageUser")
+  @ApiOperation(
+    tags = { "页面-员工", "页面-选择员工" },
+    value = "获取全部",
+    notes = "返回分页过后的数据",
+    httpMethod = "POST"
+  )
+  public Result<Object> list(@RequestBody UserApp userApp) {
+    MsgException.checkNull(userApp, "参数错误");
+
+    MsgException.checkBlank(userApp.getUserType(), "没有员工类型参数！");
+
+    // 返回参数
+    Map<String, Object> result = new HashMap<>(16);
+    Page<UserApp> page = userAppService.appPageStaff(userApp);
+    PageInfo<UserApp> data = new PageInfo<>(
+      page.getTotal(),
+      page.getCurrent(),
+      page.getPages(),
+      page.getSize(),
+      page.getRecords()
+    );
+    result.put("pager", data);
+    return ResultGenerator.genSuccessResult(result);
+  }
+
+  @GetMapping("/deleteStaff")
+  @ApiOperation(value = "删除员工", notes = "删除员工", httpMethod = "GET")
+  public Result<Object> deleteStaff(@RequestParam String userId) {
+    try {
+      MsgException.checkBlank(userId, "请传入用户Id");
+
+      UserApp userApp = new UserApp();
+      userApp.setUserId(Long.valueOf(userId));
+      List<UserApp> queryUserAppList = userAppService.queryUserAppList(userApp);
+      MsgException.checkBlank(queryUserAppList, "无此用户");
+
+      userApp = queryUserAppList.get(0);
+      if (!"staff".equals(userApp.getUserType())) {
+        return ResultGenerator.genFailResult("该用户不属于员工");
+      }
+      userAppService.removeById(userApp.getId());
+      UserInfo userInfo = new UserInfo();
+      userInfo.setId(Long.valueOf(userId));
+      userInfoService.deleteUserInfo(userInfo);
+      return ResultGenerator.genSuccessResult();
+    } catch (NumberFormatException e) {
+      e.printStackTrace();
+      TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+      return ResultGenerator.genFailResult("删除失败");
+    }
+  }
+
+  @PostMapping("/saveStaffInfo")
+  @ApiOperation(value = "添加员工", notes = "添加新的数据", httpMethod = "POST")
+  @ApiImplicitParams(
+    {
+      @ApiImplicitParam(
+        name = "UserApp",
+        value = "待添加的UserApp实例",
+        paramType = "body",
+        dataType = "UserApp",
+        required = true
+      ),
+    }
+  )
+  public Result<Object> add(@RequestBody @Valid UserApp userApp) {
+    userAppService.appSaveStaffInfo(userApp);
+    return ResultGenerator.genSuccessResult();
+  }
+
+  @PostMapping("/saveAgentStaff")
+  @ApiOperation(value = "添加员工", notes = "添加新的数据", httpMethod = "POST")
+  @ApiImplicitParams(
+    {
+      @ApiImplicitParam(
+        name = "UserApp",
+        value = "待添加的UserApp实例",
+        paramType = "body",
+        dataType = "UserApp",
+        required = true
+      ),
+    }
+  )
+  public Result<Object> saveAgentStaff(@RequestBody @Valid UserApp userApp) {
+    userAppService.appSaveStaffInfo(userApp);
+    return ResultGenerator.genSuccessResult();
+  }
+
+  @DeleteMapping("/{id}")
+  @ApiOperation(
+    value = "删除数据",
+    notes = "根据id删除数据",
+    httpMethod = "DELETE"
+  )
+  @ApiImplicitParams(
+    {
+      @ApiImplicitParam(
+        name = "id",
+        value = "查询的id实例",
+        paramType = "path",
+        dataType = "Integer",
+        required = true
+      ),
+    }
+  )
+  public Result<Object> delete(@PathVariable Long id) {
+    userAppService.removeById(id);
+    return ResultGenerator.genSuccessResult();
+  }
+
+  @PostMapping("/realNameAudit")
+  @ApiOperation(
+    value = "实名认证",
+    notes = "用户实名认证  将实名认证信息存在MerchantBankCard",
+    httpMethod = "POST"
+  )
+  @ApiImplicitParams(
+    {
+      @ApiImplicitParam(
+        name = "UserApp",
+        value = "认证UserApp实例",
+        paramType = "body",
+        dataType = "UserApp",
+        required = true
+      ),
+    }
+  )
+  public Result<Object> realNameAudit(
+    @RequestBody @Valid CertificationDTO certificationDTO
+  ) {
+    try {
+      accountService.realNameAudit(certificationDTO);
+      return ResultGenerator.genSuccessResult();
+    } catch (NumberFormatException e) {
+      e.printStackTrace();
+      TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+      return ResultGenerator.genFailResult("系统繁忙，请稍后再试");
+    }
+  }
+
+  @PostMapping("/banCardAudit")
+  @ApiOperation(
+    value = "银行卡认证",
+    notes = "用户银行卡认证",
+    httpMethod = "POST"
+  )
+  public Result<Object> banCardAudit(
+    @RequestBody @Valid BankInfoDTO bankInfoDTO
+  ) {
+    accountService.bankcardAudit(bankInfoDTO);
+    return ResultGenerator.genSuccessResult("认证成功", null);
+  }
+
+  @PostMapping("/leshuajinjianQuery")
+  @ApiOperation(
+    value = "乐刷进件查询",
+    notes = "乐刷进件查询",
+    httpMethod = "POST"
+  )
+  public Result<Object> leshuajinjianQuery(String merchantId) {
+    JSONObject data = new JSONObject();
+    data.put("merchantId", merchantId);
+    Result<Object> result = leshuaService.requestApi(
+      LeshuaParam.getREGISTERURL() + "/merchant/info_qry",
+      data
+    );
+    if ("000000".equals(result.getRespCode())) {
+      JSONObject data2 = (JSONObject) result.getData();
+      JSONObject data3 = data2.getJSONObject("auditInfo");
+      log.info(data3.toJSONString());
+    }
+    return result;
+  }
+
+  // 修改用户头像
+  @PostMapping("/updateLogo")
+  @ApiOperation(
+    value = "修改用户头像",
+    notes = "修改用户头像",
+    httpMethod = "POST"
+  )
+  @ApiImplicitParams(
+    {
+      @ApiImplicitParam(
+        name = "UserApp",
+        value = "认证UserApp实例",
+        paramType = "body",
+        dataType = "UserApp",
+        required = true
+      ),
+    }
+  )
+  public Result<Object> updateLogo(@RequestBody UserApp userApp) {
+    // 验证参数是否完整
+    if (StringUtil.isEmpty(userApp.getUserId())) {
+      return ResultGenerator.genFailResult("userId参数不存在！");
+    }
+    // 查询当前用户是否存在
+    UserApp queryUserApp = new UserApp();
+    queryUserApp.setUserId(userApp.getUserId());
+    List<UserApp> queryUserAppList = userAppService.queryUserAppList(
+      queryUserApp
+    );
+
+    MsgException.checkBlank(queryUserAppList, "查无此人！");
+    queryUserApp = queryUserAppList.get(0);
+    // 修改用户头像
+    UserApp updateUserApp = new UserApp();
+    updateUserApp.setId(queryUserApp.getId());
+    updateUserApp.setLogo(userApp.getLogo());
+    userAppService.updateById(updateUserApp);
+    return ResultGenerator.genSuccessResult();
+  }
+
+  @PostMapping("/queryUserAppByUserId")
+  @ApiOperation(
+    tags = { "页面-对账", "页面-我的" },
+    value = "查询用户详情",
+    notes = "通过UserId查询用户信息",
+    httpMethod = "POST"
+  )
+  @ApiImplicitParams(
+    {
+      @ApiImplicitParam(
+        name = "UserApp",
+        value = "查询的UserApp",
+        paramType = "body",
+        required = true,
+        dataType = "UserApp"
+      ),
+    }
+  )
+  public Result<Object> queryUserAppByUserId() {
+    UserApp result = userAppService.queryUserBaseInfoByToken();
+    if (result.getLevelCode() != null) {
+      result.setLevelCode(result.getLevelCode().replace("T", "VIP"));
+    }
+    //        MerchantChannelStatus mcs = mcsService.getValidData(result.getMerchantCode());
+    //        mcsService.verifyWxAuthStatus(mcs);
+    return ResultGenerator.genSuccessResult(result);
+  }
+
+  @PostMapping("/queryStaffDetailUserId")
+  @ApiOperation(
+    value = "查询员工详情",
+    notes = "通过UserId查询员工信息",
+    httpMethod = "POST"
+  )
+  @ApiImplicitParams(
+    {
+      @ApiImplicitParam(
+        name = "UserApp",
+        value = "查询的UserApp",
+        paramType = "body",
+        required = true,
+        dataType = "UserApp"
+      ),
+    }
+  )
+  public Result<Object> queryStaffDetailUserId(@RequestBody UserApp userApp) {
+    UserApp tokenUserApp = userAppService.queryUserAppByToken();
+    if (StringUtil.isEmpty(userApp.getUserId())) {
+      return ResultGenerator.genFailResult("请传入userId");
+    }
+    UserApp queryUserApp = new UserApp();
+    QueryWrapper<Object> qWrapper = new QueryWrapper<>()
+      .eq("ua.userId", userApp.getUserId())
+      .eq("msc.merchantCode", tokenUserApp.getMerchantCode());
+    queryUserApp.setUserId(userApp.getUserId());
+    // 根据用户的id查询当前的用户详情
+
+    userApp = userAppService.appGetOne(qWrapper);
+    MsgException.checkNull(userApp, "员工信息错误！");
+    MerchantStore queryMerchantStore = new MerchantStore();
+    // 查询当前用户所属的门店信息
+    if (StringUtil.isNotEmpty(userApp.getStoreId())) {
+      queryMerchantStore.setStoreId(userApp.getStoreId());
+      List<MerchantStore> queryMerchantStoreList = merchantStoreService.queryMerchantStoreList(
+        queryMerchantStore
+      );
+
+      if (queryMerchantStoreList != null && !queryMerchantStoreList.isEmpty()) {
+        queryMerchantStore = queryMerchantStoreList.get(0);
+      }
+    }
+    if (StringUtil.isEmpty(queryMerchantStore)) {
+      return ResultGenerator.genFailResult("无门店信息！");
+    }
+    Map<String, Object> resultMap = new HashMap<>();
+    resultMap.put("userApp", userApp);
+    resultMap.put("merchantStore", queryMerchantStore);
+    return ResultGenerator.genSuccessResult(resultMap);
+  }
+
+  /**
+   * 商户推广分润数据统计
+   */
+  @GetMapping("/generaRhare")
+  @ApiOperation(
+    tags = { "页面-收益" },
+    value = "商户推广分润数据统计",
+    httpMethod = "GET"
+  )
+  @ApiImplicitParams(
+    {
+      @ApiImplicitParam(
+        name = "userId",
+        value = "当前用户Id",
+        paramType = "query",
+        required = true,
+        dataType = "Integer"
+      ),
+    }
+  )
+  public Result<Object> generaShare(@RequestParam Long userId) {
+    // 获取当前用户信息
+    UserApp queryUserApp = new UserApp();
+    queryUserApp.setUserId(userId);
+    List<UserApp> queryUserAppList = userAppService.queryUserAppList(
+      queryUserApp
+    );
+
+    MsgException.checkBlank(queryUserAppList, "用户信息错误");
+    queryUserApp = queryUserAppList.get(0);
+    // 获取当前用户的推广等级
+    Level currLevel = new Level();
+    currLevel.setLevel(queryUserApp.getLevel());
+    if (StringUtil.isNotEmpty(queryUserApp.getLevel())) {
+      List<Level> queryLevelList = levelService.queryLevelList(currLevel);
+
+      MsgException.checkBlank(queryLevelList, "推广信息错误！");
+      currLevel = queryLevelList.get(0);
+    } else {
+      return ResultGenerator.genFailResult("您无权访问该界面");
+    }
+    Double currRate = currLevel.getRate();
+    // 获取当前用户的下一推广等级
+    Level nextLevel = new Level();
+    nextLevel.setLevel(queryUserApp.getLevel() + 1);
+    nextLevel = levelService.queryLevel(nextLevel);
+    Double nextRate = 0.0d;
+    if (nextLevel != null) {
+      nextRate = nextLevel.getRate();
+    }
+    Double totalShareMoneyToday = 0d; // 今日分润总额
+    Double totalAccumulateShareMoney = 0d; // 累计总分润
+    Double merchantShareMoneyToday = 0d; // 推广商户今日分润
+    Double merchantShareMoneyHistory = 0d; // 推广商户历史分润
+
+    Double allowCashMoney = 0d; // 可提现分润
+    Double noCashMoney = 0d; // 不可提现分润
+    Double cashedMoney = 0d; // 已提现分润
+    // 获取当前商户的所有的下级商户信息
+
+    Map<String, Object> queryMap = new HashMap<>();
+    if ("agent_staff".equals(queryUserApp.getUserType())) {
+      queryMap.put("agentStaffId", userId);
+    } else {
+      queryMap.put("userId", userId);
+    }
+
+    queryMap.put("status", 1);
+
+    // 累计总分润
+    totalAccumulateShareMoney =
+      merchantProfitService.queryMerchantProfitSumPrice(queryMap);
+    if (totalAccumulateShareMoney == null) {
+      totalAccumulateShareMoney = 0d;
+    }
+    queryMap.put("startTime", DateUtils.getDayBegin());
+    totalShareMoneyToday =
+      merchantProfitService.queryMerchantProfitSumPrice(queryMap);
+    if (totalShareMoneyToday == null) {
+      totalShareMoneyToday = 0d;
+    }
+
+    queryMap.put("retype", "1");
+    // 商户今日分润
+    merchantShareMoneyToday =
+      merchantProfitService.queryMerchantProfitSumPrice(queryMap);
+    if (merchantShareMoneyToday == null) {
+      merchantShareMoneyToday = 0d;
+    }
+    // 商户历史分润
+    queryMap.put("startTime", null);
+    queryMap.put("endTime", DateUtils.getDayBegin());
+    merchantShareMoneyHistory =
+      merchantProfitService.queryMerchantProfitSumPrice(queryMap);
+    if (merchantShareMoneyHistory == null) {
+      merchantShareMoneyHistory = 0d;
+    }
+
+    // 今日总分润 = 今日商户分润
+    // 已经提现与正在提现的分润 //+ cashService.sumFansAreadlyCash(map);
+    cashedMoney = cashService.sumMerchantSuccessCash(userId);
+    if (cashedMoney == null) {
+      cashedMoney = 0d;
+    }
+    noCashMoney = totalShareMoneyToday;
+    allowCashMoney = totalAccumulateShareMoney - cashedMoney - noCashMoney;
+
+    Map<String, Object> resultMap = new HashMap<>();
+    resultMap.put(
+      "totalShareMoneyToday",
+      StringUtil.bigDecimal(totalShareMoneyToday)
+    ); //今日总分润
+    resultMap.put(
+      "totalAccumulateShareMoney",
+      StringUtil.bigDecimal(totalAccumulateShareMoney)
+    ); //累计总分润
+    resultMap.put(
+      "merchantShareMoneyToday",
+      StringUtil.bigDecimal(merchantShareMoneyToday)
+    ); //今日推广分润
+    resultMap.put(
+      "merchantShareMoneyHistory",
+      StringUtil.bigDecimal(merchantShareMoneyHistory)
+    ); //历史推广分润
+    resultMap.put(
+      "nextMerchantShareMoneyToday",
+      StringUtil.bigDecimal(totalShareMoneyToday - merchantShareMoneyToday)
+    ); //今日升级分润
+    resultMap.put(
+      "nextMerchantShareMoneyHistory",
+      StringUtil.bigDecimal(
+        totalAccumulateShareMoney -
+        merchantShareMoneyHistory -
+        totalShareMoneyToday
+      )
+    ); //历史升级分润
+    resultMap.put(
+      "allowCashMoney",
+      StringUtil.bigDecimal(allowCashMoney, RoundingMode.DOWN)
+    );
+    resultMap.put("noCashMoney", StringUtil.bigDecimal(noCashMoney));
+    resultMap.put("cashedMoney", StringUtil.bigDecimal(cashedMoney));
+    return ResultGenerator.genSuccessResult(resultMap);
+  }
+
+  // 修改员工信息
+  @PostMapping("/updateStaffInfo")
+  @ApiOperation(
+    value = "修改员工信息",
+    notes = "修改员工的数据",
+    httpMethod = "POST"
+  )
+  @ApiImplicitParams(
+    {
+      @ApiImplicitParam(
+        name = "UserApp",
+        value = "待修改的UserApp实例",
+        paramType = "body",
+        dataType = "UserApp",
+        required = true
+      ),
+    }
+  )
+  public Result<Object> updateStaffInfo(@RequestBody @Valid UserApp userApp) {
+    if (StringUtil.isEmpty(userApp.getUserId())) {
+      return ResultGenerator.genFailResult("无用户Id");
+    }
+    UserApp queryUserApp = new UserApp();
+    queryUserApp.setUserId(userApp.getUserId());
+    List<UserApp> queryUserAppList = userAppService.queryUserAppList(
+      queryUserApp
+    );
+
+    MsgException.checkBlank(queryUserAppList, "无用户信息！");
+    queryUserApp = queryUserAppList.get(0);
+
+    UserApp updateUserApp = new UserApp();
+    updateUserApp.setId(queryUserApp.getId());
+    updateUserApp.setLoginName(userApp.getLoginName());
+    updateUserApp.setUserName(userApp.getUserName());
+    updateUserApp.setPhone(userApp.getPhone());
+    updateUserApp.setPassword(userApp.getPassword());
+    updateUserApp.setStoreId(userApp.getStoreId());
+    updateUserApp.setStoreName(userApp.getStoreName());
+    UserInfo updateUserInfo = new UserInfo();
+    updateUserInfo.setId(queryUserApp.getUserId());
+    updateUserInfo.setLoginName(userApp.getLoginName());
+    updateUserInfo.setPassword(
+      MD5Util.MD5Encode(userApp.getPassword(), "utf-8")
+    );
+    updateUserInfo.setPhone(userApp.getPhone());
+    // 更新用户登录表
+    userInfoService.updateUserInfo(updateUserInfo);
+    // 更新用户详情信息表
+    userAppService.updateById(updateUserApp);
+    return ResultGenerator.genSuccessResult();
+  }
+
+  @OpLog(
+    opCode = "APP_AUDIT_REQ",
+    opName = "商户请求进件",
+    opDetail = "商户请求进件"
+  )
+  @PostMapping("/merchantAudit")
+  @ApiOperation(value = "通用进件", notes = "通用进件", httpMethod = "POST")
+  @ApiImplicitParams(
+    {
+      @ApiImplicitParam(
+        name = "paramJson",
+        value = "进件数据",
+        paramType = "body",
+        dataType = "JSONObject",
+        required = true
+      ),
+    }
+  )
+  public Result<Object> merchantAudit() {
+    userAppService.merchantAuditReq();
+    return ResultGenerator.genSuccessResult("进件请求成功，等待后台审核");
+  }
+
+  @PostMapping("/editMerchantAudit")
+  @ApiOperation(value = "通用进件", notes = "通用进件", httpMethod = "POST")
+  @ApiImplicitParams(
+    {
+      @ApiImplicitParam(
+        name = "paramJson",
+        value = "进件数据",
+        paramType = "body",
+        dataType = "JSONObject",
+        required = true
+      ),
+    }
+  )
+  public Result<Object> editMerchantAudit(String userId) throws Exception {
+    userAppService.editMerchantAudit(userId);
+    return ResultGenerator.genSuccessResult("进件请求成功");
+  }
+
+  @PostMapping("/leshuaMerchantAudit")
+  @ApiOperation(value = "乐刷进件", notes = "乐刷进件", httpMethod = "POST")
+  @ApiImplicitParams(
+    {
+      @ApiImplicitParam(
+        name = "LeshuaMerchantAuditDTO",
+        value = "LeshuaMerchantAuditDTO",
+        paramType = "LeshuaMerchantAuditDTO",
+        dataType = "LeshuaMerchantAuditDTO",
+        required = true
+      ),
+    }
+  )
+  public Result<Object> leshuaMerchantAudit(
+    @RequestBody LeshuaMerchantAuditDTO leshuaMerchantAuditDTO
+  )
+    throws Exception {
+    leshuaMerchantAuditService.merchantAudit(
+      leshuaMerchantAuditDTO.getUserId(),
+      true
+    );
+    return ResultGenerator.genSuccessResult("进件成功");
+  }
+
+  @PostMapping("/wechatMerchantAudit")
+  @ApiOperation(value = "微信进件", notes = "微信进件", httpMethod = "POST")
+  @ApiImplicitParams(
+    {
+      @ApiImplicitParam(
+        name = "AliMerchantAuditDTO",
+        value = "AliMerchantAuditDTO实例",
+        paramType = "AliMerchantAuditDTO",
+        dataType = "AliMerchantAuditDTO",
+        required = true
+      ),
+    }
+  )
+  public Result<Object> wechatMerchantAudit(
+    @RequestBody WechatMerchantAuditDTO wechatMerchantAuditDTO
+  ) {
+    wechatService.wechatMerchantAudit(wechatMerchantAuditDTO);
+    return ResultGenerator.genSuccessResult("微信进件成功");
+  }
+
+  @PostMapping("/aliMerchantAudit")
+  @ApiOperation(value = "支付宝进件", notes = "支付宝进件", httpMethod = "POST")
+  @ApiImplicitParams(
+    {
+      @ApiImplicitParam(
+        name = "AliMerchantAuditDTO",
+        value = "AliMerchantAuditDTO实例",
+        paramType = "AliMerchantAuditDTO",
+        dataType = "AliMerchantAuditDTO",
+        required = true
+      ),
+    }
+  )
+  public Result<?> aliMerchantAudit(
+    @RequestBody AliMerchantAuditDTO aliMerchantAuditDTO
+  ) {
+    throw new MsgException("暂不支持该接口");
+    //        if (StringUtil.isEmpty(aliMerchantAuditDTO.getUserId())) {
+    //            return ResultGenerator.genFailResult("userId参数不存在！");
+    //        }
+    //        UserApp userApp = new UserApp();
+    //        userApp.setUserId(aliMerchantAuditDTO.getUserId().longValue());
+    //        List<UserApp> queryUserAppList = userAppService.queryUserAppList(userApp);
+    //        if (queryUserAppList == null || queryUserAppList.isEmpty()) {
+    //            return ResultGenerator.genFailResult("该用户不存在");
+    //        }
+    //
+    //        userApp = queryUserAppList.get(0);// 获取当前用户的信息
+    //        if (null != userApp.getAliStatus() && 0 != userApp.getAliStatus() && 2 != userApp.getAliStatus()) {
+    //            return ResultGenerator.genFailResult("您已经进件或正在审核中");
+    //        }
+    //
+    //        MerchantBaseInfo mBaseInfo = new MerchantBaseInfo();
+    //        mBaseInfo.setUserId(aliMerchantAuditDTO.getUserId() + "");
+    //        List<MerchantBaseInfo> queryMerchantBaseInfoList = merchantBaseInfoService
+    //                .queryMerchantBaseInfoList(mBaseInfo);
+    //        if (queryMerchantBaseInfoList == null || queryMerchantBaseInfoList.isEmpty()) {
+    //            return ResultGenerator.genFailResult("请先完善商户基本信息");
+    //        }
+    //
+    //        mBaseInfo = queryMerchantBaseInfoList.get(0);
+    //        Result<MerchantBaseInfo> convertMerchantBaseInfo = aliMerchantAuditDTO
+    //                .convertMerchantBaseInfo(mBaseInfo);
+    //        if (400 == convertMerchantBaseInfo.getCode()) {
+    //            return convertMerchantBaseInfo;
+    //        }
+    //        mBaseInfo = convertMerchantBaseInfo.getData();
+    //        MerchantImage merchantImage = new MerchantImage();
+    //        merchantImage.setMerchantCode(mBaseInfo.getMerchantCode());
+    //        List<MerchantImage> queryMerchantImageList = merchantImageMapper
+    //                .queryMerchantImageList(merchantImage);// 当前商户所有的照片信息
+    //        Result<String> isOpenTrue = aliService.getBatchNo(mBaseInfo);
+    //        if (400 == isOpenTrue.getCode()) {
+    //            return isOpenTrue;
+    //        }
+    //        String batchNo = isOpenTrue.getData();// 开启事务成功
+    //        Result<BatchInfoDTO> convertBatchInfoDTO = aliMerchantAuditDTO
+    //                .convertBatchInfoDTO(queryMerchantImageList, mBaseInfo);
+    //        if (400 == convertBatchInfoDTO.getCode()) {
+    //            return convertBatchInfoDTO;
+    //        }
+    //        BatchInfoDTO batch = convertBatchInfoDTO.getData();
+    //        if (StringUtil.isEmpty(batchNo)) {
+    //            userApp.setAliStatus(2);
+    //        } else {
+    //            batch.setBatchNo(batchNo);
+    //        }
+    //        try {
+    //            if (aliService.facetofaceSign(batch)) {// 代签约当面付
+    //                if (aliService.agentConfirm(batchNo)) {// 提交事务
+    //                    mBaseInfo.setAlipaySource(batchNo);
+    //                    userApp.setAliStatus(1);
+    //                    if (StringUtil.isNotEmpty(userApp.getParentId())) {// 更新上级推广人的认证商户数量
+    //                        UserApp parentApp = new UserApp();
+    //                        parentApp.setUserId(userApp.getParentId());
+    //                        List<UserApp> queryUserAppList2 = userAppService.queryUserAppList(parentApp);
+    //                        if (StringUtil.isNotEmpty(userApp.getParentId()) && queryUserAppList2 != null
+    //                                && queryUserAppList2.size() > 0) {
+    //                            parentApp = queryUserAppList2.get(0);
+    //                            UserApp updateParentApp = new UserApp();
+    //                            updateParentApp.setId(parentApp.getId());
+    //                            updateParentApp.setAuthCount(
+    //                                    parentApp.getAuthCount() == null ? 1 : parentApp.getAuthCount() + 1);
+    //                            userAppService.updateUserApp(updateParentApp);
+    //                        }
+    //                    }
+    //                    return ResultGenerator.genSuccessResult("进件成功");
+    //                } else {
+    //                    userApp.setAliStatus(2);
+    //                    return ResultGenerator.genFailResult("进件失败");
+    //                }
+    //            } else {
+    //                userApp.setAliStatus(2);
+    //                return ResultGenerator.genFailResult("进件失败");
+    //            }
+    //        } catch (Exception e) {
+    //            e.printStackTrace();
+    //            userApp.setAliStatus(2);
+    //            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+    //            return ResultGenerator.genFailResult("系统繁忙,请稍后再试");
+    //        } finally {
+    //            userAppService.updateUserApp(userApp);
+    //            mBaseInfo.setAliRate(ParametersUtil.ALI_RATE);
+    //            merchantBaseInfoService.updateMerchantBaseInfo(mBaseInfo);
+    //        }
+  }
+
+  @GetMapping(value = "/idCardOCR")
+  @ApiOperation(
+    value = "OCR识别身份证信息",
+    notes = "OCR识别身份证信息",
+    httpMethod = "GET"
+  )
+  @ApiImplicitParams(
+    {
+      @ApiImplicitParam(
+        name = "imgUrl",
+        value = "图片URL",
+        paramType = "imgUrl",
+        dataType = "imgUrl",
+        required = true
+      ),
+      @ApiImplicitParam(
+        name = "idCardSide",
+        value = "front/back front：身份证含照片的一面；back：身份证带国徽的一面",
+        paramType = "idCardSide",
+        dataType = "idCardSide",
+        required = true
+      ),
+    }
+  )
+  public Result getIdCardInfo(
+    @RequestParam String imgUrl,
+    @RequestParam String idCardSide
+  ) {
+    if (!"front".equals(idCardSide) && !"back".equals(idCardSide)) {
+      return ResultGenerator.genFailResult("上传错误 ,请稍后再试");
+    }
+    String accessToken = baiduOCRService.getAuth();
+    String idCardOCRUrl = ParametersUtil.idCardOCRUrl;
+
+    try {
+      String imgStr = ImageUtils.image2Base64(imgUrl);
+      String imgParam = URLEncoder.encode(imgStr, "UTF-8");
+      String params = "id_card_side=" + idCardSide + "&image=" + imgParam;
+      String info = baiduOCRService.getInfo(idCardOCRUrl, accessToken, params);
+      JSONObject parseObject = JSONObject.parseObject(info);
+      String imageStatus = parseObject.getString("image_status");
+      if ("reversed_side".equals(imageStatus)) {
+        return ResultGenerator.genFailResult("身份证正反面颠倒");
+      }
+      if ("non_idcard".equals(imageStatus)) {
+        return ResultGenerator.genFailResult("上传的图片中不包含身份证");
+      }
+      if ("blurred".equals(imageStatus)) {
+        return ResultGenerator.genFailResult("身份证模糊");
+      }
+      if ("other_type_card".equals(imageStatus)) {
+        return ResultGenerator.genFailResult("其他类型证照");
+      }
+      if ("over_exposure".equals(imageStatus)) {
+        return ResultGenerator.genFailResult("身份证关键字段反光或过曝");
+      }
+      if ("over_dark".equals(imageStatus)) {
+        return ResultGenerator.genFailResult("身份证欠曝（亮度过低）");
+      }
+      if ("unknown".equals(imageStatus)) {
+        return ResultGenerator.genFailResult("未知状态");
+      }
+
+      final JSONObject jsonObject = JSON
+        .parseObject(info)
+        .getJSONObject("words_result");
+      if (jsonObject.getJSONObject("姓名") != null) {
+        IdCardCache idCardCache = new IdCardCache();
+        idCardCache.setCertNo(
+          jsonObject.getJSONObject("公民身份号码").getString("words")
+        );
+        IdCardCache existData = idCardCacheService.getOne(
+          new QueryWrapper<>(idCardCache)
+        );
+        if (existData == null) {
+          idCardCache.setName(
+            jsonObject.getJSONObject("姓名").getString("words")
+          );
+          idCardCache.setAddress(
+            jsonObject.getJSONObject("住址").getString("words")
+          );
+          idCardCache.setImgPositive(imgUrl);
+          idCardCacheService.save(idCardCache);
+        }
+      }
+
+      return ResultGenerator.genSuccessResult(info);
+    } catch (Exception e) {
+      e.printStackTrace();
+      TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+      return ResultGenerator.genFailResult("识别错误，请稍后再试");
+    }
+  }
+
+  /**
+   * 营业执照OCR识别
+   *
+   * @param imgUrl
+   * @return
+   */
+  @GetMapping(value = "/licenseOCR")
+  @ApiOperation(
+    tags = { "页面-营业执照" },
+    value = "OCR识别营业执照信息",
+    notes = "OCR识别营业执照信息",
+    httpMethod = "GET"
+  )
+  @ApiImplicitParams(
+    {
+      @ApiImplicitParam(
+        name = "imgUrl",
+        value = "图片URL",
+        paramType = "imgUrl",
+        dataType = "imgUrl",
+        required = true
+      ),
+    }
+  )
+  public Result getBusinessLicenseInfo(@RequestParam String imgUrl) {
+    String accessToken = baiduOCRService.getAuth();
+    String blCardOCRUrl = ParametersUtil.blCardOCRUrl;
+
+    try {
+      String imgStr = ImageUtils.image2Base64(imgUrl);
+      String imgParam = URLEncoder.encode(imgStr, "UTF-8");
+      String params = "image=" + imgParam;
+      String info = baiduOCRService.getInfo(blCardOCRUrl, accessToken, params);
+      return ResultGenerator.genSuccessResult(JSONObject.parseObject(info));
+    } catch (Exception e) {
+      e.printStackTrace();
+      TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+      return ResultGenerator.genFailResult("识别错误，请稍后再试");
+    }
+  }
+
+  @GetMapping(value = "/bankCardOCR")
+  @ApiOperation(
+    tags = { "页面-绑定银行卡" },
+    value = "OCR识别银行卡信息",
+    notes = "OCR识别银行卡信息",
+    httpMethod = "GET"
+  )
+  @ApiImplicitParams(
+    {
+      @ApiImplicitParam(
+        name = "imgUrl",
+        value = "图片URL",
+        paramType = "imgUrl",
+        dataType = "imgUrl",
+        required = true
+      ),
+    }
+  )
+  public Result getIdCardInfo(@RequestParam String imgUrl) {
+    String accessToken = baiduOCRService.getAuth();
+    String idCardOCRUrl = ParametersUtil.bankCardOCRUrl;
+
+    Map<String, Object> result;
+    try {
+      String imgStr = ImageUtils.image2Base64(imgUrl);
+      String imgParam = URLEncoder.encode(imgStr, "UTF-8");
+      String params = "image=" + imgParam;
+      String info = baiduOCRService.getInfo(idCardOCRUrl, accessToken, params);
+      result =
+        JSON.parseObject(
+          info,
+          new TypeToken<Map<String, Object>>() {}.getType()
+        );
+    } catch (Exception e) {
+      e.printStackTrace();
+      TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+      return ResultGenerator.genFailResult("识别错误，请稍后再试");
+    }
+
+    if (result != null && result.get("result") != null) {
+      String result1 = result.get("result").toString();
+      BankCardInfoVO bankCardInfoVO = JSON.parseObject(
+        result1,
+        BankCardInfoVO.class
+      );
+      if (bankCardInfoVO != null) {
+        String bankName = bankCardInfoVO.getBank_name();
+        bankCardInfoVO.setBank_name(FixedData.getBankName(bankName));
+        result.put("result", bankCardInfoVO);
+      }
+    }
+
+    return ResultGenerator.genSuccessResult(result);
+  }
+
+  @GetMapping(value = "/bankCardDetail")
+  @ApiOperation(
+    value = "银行卡信息回显",
+    notes = "银行卡信息回显",
+    httpMethod = "GET"
+  )
+  public Result<Object> bankCardDetail(@RequestParam String userId) {
+    BankCardVO bankCardVO = accountService.bankcardDetail(userId);
+    return ResultGenerator.genSuccessResult(bankCardVO);
+  }
+
+  @GetMapping(value = "/idCardDetail")
+  @ApiOperation(
+    value = "身份证信息回显",
+    notes = "身份证信息回显",
+    httpMethod = "GET"
+  )
+  public Result<Object> idCardDetail(
+    @RequestParam(required = true) String userId
+  ) {
+    IdCardVO idCardVO = accountService.idCardDetail(userId);
+    return ResultGenerator.genSuccessResult(idCardVO);
+  }
+
+  @PostMapping(value = "/expandMerchantList")
+  @ApiOperation(
+    value = "商户拓展列表接口",
+    notes = "商户拓展列表接口",
+    httpMethod = "POST"
+  )
+  public Result<Map<String, Object>> expandMerchantList(
+    @RequestBody ExpandDto dto
+  ) {
+    Map<String, Object> result = userAppService.expandMerchantList(dto);
+    return ResultGenerator.genSuccessResult(result);
+  }
+
+  @GetMapping("/queryJunior")
+  @ApiOperation(
+    value = "查询下级的流水，分润贡献(只查当前下级是商户的流水)",
+    httpMethod = "GET"
+  )
+  @ApiImplicitParams(
+    {
+      @ApiImplicitParam(
+        name = "userId",
+        value = "当前点击的用户userId",
+        paramType = "query",
+        dataType = "String"
+      ),
+    }
+  )
+  public Result<Map<String, Object>> queryUser(
+    @ApiParam(name = "userId", value = "用户id") @RequestParam String userId,
+    @ApiParam(
+      name = "merchantUserId",
+      value = "商户的userId"
+    ) @RequestParam String merchantUserId
+  ) {
+    Map<String, Object> resultMap = userAppService.queryAllMerchantFee(
+      userId,
+      merchantUserId
+    );
+    return ResultGenerator.genSuccessResult(resultMap);
+  }
+
+  /**
+   * 商户推广-商户列表
+   */
+  @PostMapping("/merChantList")
+  @ApiOperation(
+    value = "商户推广-商户列表",
+    notes = "返回分页过后的数据",
+    httpMethod = "POST"
+  )
+  public Result merChantList(@RequestBody ExpandDto dto) {
+    if (StringUtil.isEmpty(dto.getUserId())) {
+      return ResultGenerator.genFailResult("请先登录账号");
+    }
+
+    //间推集合
+    List<String> userList2 = new ArrayList<>();
+    //间推集合
+    List<String> userList3 = new ArrayList<>();
+
+    List<String> parentIdList = new ArrayList<>();
+    if (StringUtil.isEmpty(dto.getRecommend())) {
+      //查询全部
+      parentIdList.add(dto.getUserId());
+      //查询出直推的集合
+      UserApp userApp1 = new UserApp();
+      userApp1.setParentId(Long.parseLong(dto.getUserId()));
+      List<UserApp> userAppList = userAppService.queryUserAppListByPhone(
+        userApp1
+      );
+      for (UserApp u : userAppList) {
+        parentIdList.add(u.getUserId() + "");
+        userList2.add(u.getUserId() + "");
+      }
+      if (!userList2.isEmpty()) {
+        UserApp userApp3 = new UserApp();
+        userApp3.setParentIdList(userList2);
+        List<UserApp> userAppList3 = userAppService.queryUserAppListByPhone(
+          userApp3
+        ); //间推的集合
+        for (UserApp u : userAppList3) {
+          parentIdList.add(u.getUserId() + "");
+          userList3.add(u.getUserId() + "");
+        }
+      }
+    }
+
+    if (StringUtil.isNotEmpty(dto.getRecommend())) {
+      if ("1".equals(dto.getRecommend())) {
+        parentIdList.add(dto.getUserId());
+      }
+      if ("2".equals(dto.getRecommend())) {
+        //查询出直推的集合
+        UserApp userApp1 = new UserApp();
+        userApp1.setParentId(Long.parseLong(dto.getUserId()));
+        List<UserApp> userAppList = userAppService.queryUserAppListByPhone(
+          userApp1
+        );
+        for (UserApp u : userAppList) {
+          parentIdList.add(u.getUserId() + "");
+          userList2.add(u.getUserId() + "");
+        }
+      }
+
+      if ("3".equals(dto.getRecommend())) {
+        //查询出直推的集合
+        List<String> parentIdList2 = new ArrayList<>();
+        UserApp userApp1 = new UserApp();
+        userApp1.setParentId(Long.parseLong(dto.getUserId()));
+        List<UserApp> userAppList = userAppService.queryUserAppListByPhone(
+          userApp1
+        );
+        for (UserApp u : userAppList) {
+          parentIdList2.add(u.getUserId() + "");
+        }
+        if (!parentIdList2.isEmpty()) {
+          UserApp userApp2 = new UserApp();
+          userApp2.setParentIdList(parentIdList2);
+          List<UserApp> userAppList2 = userAppService.queryUserAppListByPhone(
+            userApp2
+          ); //间推的集合
+          for (UserApp u : userAppList2) {
+            parentIdList.add(u.getUserId() + "");
+            userList3.add(u.getUserId() + "");
+          }
+        }
+      }
+    }
+
+    Map<String, Object> map = new HashMap<>();
+    if (StringUtil.isNotEmpty(dto.getLevel())) {
+      map.put("level", dto.getLevel());
+    }
+    if (parentIdList.isEmpty()) {
+      parentIdList.add("999999999999999999999999");
+    }
+    map.put("parentIdList", parentIdList);
+    map.put("pageSize", dto.getSize());
+    map.put("offset", (dto.getPage() - 1) * dto.getSize());
+    map.put("leshuaStatus", "3");
+    if (StringUtil.isNotEmpty(dto.getStartTime())) {
+      map.put("startTime", dto.getStartTime());
+    }
+    if (StringUtil.isNotEmpty(dto.getEndTime())) {
+      map.put("endTime", dto.getEndTime());
+    }
+    if (StringUtil.isNotEmpty(dto.getMerchantName())) {
+      map.put("merchantName", dto.getMerchantName());
+    }
+
+    List<UserApp> userAppList = userAppService.queryUserAppPageByPhone(map);
+
+    List<UserApp> appList = new ArrayList<UserApp>();
+
+    for (UserApp u : userAppList) {
+      MerchantBaseInfo merchantBaseInfo = new MerchantBaseInfo();
+      merchantBaseInfo.setUserId(u.getUserId() + "");
+      List<MerchantBaseInfo> merchantList = merchantBaseInfoService.queryMerchantBaseInfoList(
+        merchantBaseInfo
+      );
+      if (merchantList != null && !merchantList.isEmpty()) {
+        u.setAlias(merchantList.get(0).getAlias());
+        u.setMerchantCode(merchantList.get(0).getMerchantCode());
+        Map<String, Object> map2 = new HashMap<>();
+        map2.put("merchantCode", merchantList.get(0).getMerchantCode());
+        map2.put("status", "1");
+        Double totalMoney = merchantOrderService.queryMerchantOrderFeeByTime(
+          map2
+        ); //总流水
+
+        if (totalMoney == null) {
+          totalMoney = 0d;
+        }
+        u.setTotalMoney(totalMoney);
+        if (StringUtil.isEmpty(u.getUserName())) {
+          u.setUserName(merchantList.get(0).getContactName());
+        }
+        if (StringUtil.isEmpty(u.getLoginName())) {
+          u.setLoginName(merchantList.get(0).getContactName());
+        }
+      }
+
+      if ((u.getParentId() + "").equals(dto.getUserId())) {
+        u.setType("直接推荐");
+      }
+
+      for (String s : userList2) {
+        if (s.equals(u.getParentId() + "")) {
+          u.setType("间接推荐");
+        }
+      }
+      for (String s : userList3) {
+        if (s.equals(u.getParentId() + "")) {
+          u.setType("二级间接推荐");
+        }
+      }
+      if (StringUtil.isNotEmpty(dto.getLevel())) {
+        UserApp parentUserApp = new UserApp();
+        parentUserApp.setUserId(u.getParentId());
+        parentUserApp = userAppService.queryUserApp(parentUserApp);
+        if (
+          parentUserApp != null &&
+          dto.getLevel().equals(parentUserApp.getLevel() + "")
+        ) {
+          appList.add(u);
+        }
+      } else {
+        appList.add(u);
+      }
+    }
+
+    Integer count = userAppService.queryUserAppPageCountByPhone(map);
+    // 返回参数
+    Map<String, Object> result = new HashMap<>(16);
+    PageInfo<UserApp> pager = new PageInfo<>(
+      count.longValue(),
+      (long) StringUtil.getPageCount(count, dto.getSize()),
+      dto.getPage().longValue(),
+      dto.getSize().longValue(),
+      appList
+    );
+    result.put("pager", pager);
+
+    return ResultGenerator.genSuccessResult(result);
+  }
+
+  /**
+   * 商户推广-商户列表  商户详情
+   */
+  @PostMapping("/extendMerchantDetail")
+  @ApiOperation(
+    tags = { "页面-商户详情" },
+    value = "商户推广-商户详情",
+    notes = "返回分页过后的数据",
+    httpMethod = "POST"
+  )
+  public Result<Object> extendMerchantDetail(@RequestBody MerchantDTO dto) {
+    Map<String, Object> resMap = new HashMap<>();
+
+    if (StringUtil.isEmpty(dto.getMerchantCode())) {
+      return ResultGenerator.genFailResult("请传商户编码");
+    }
+
+    if (StringUtil.isEmpty(dto.getUserId())) {
+      return ResultGenerator.genFailResult("请登录");
+    }
+
+    UserApp tokenUserApp = userAppService.queryUserAppByToken();
+
+    MerchantBaseInfo merchantBaseInfo = new MerchantBaseInfo();
+    merchantBaseInfo.setMerchantCode(dto.getMerchantCode());
+    merchantBaseInfo =
+      merchantBaseInfoService.queryMerchantBaseInfo(merchantBaseInfo);
+    if ("1".equals(merchantBaseInfo.getMerchantType())) {
+      resMap.put("merchantType", "小微商户");
+    } else if ("2".equals(merchantBaseInfo.getMerchantType())) {
+      resMap.put("merchantType", "个体商户");
+    } else if ("3".equals(merchantBaseInfo.getMerchantType())) {
+      resMap.put("merchantType", "企业商户");
+    }
+
+    UserApp userApp = new UserApp();
+    userApp.setUserId(Long.parseLong(merchantBaseInfo.getUserId()));
+    userApp = userAppService.queryUserApp(userApp);
+
+    UserApp userApp2 = new UserApp();
+    if (userApp.getAgentStaffId() == null) {
+      userApp2.setUserId(userApp.getParentId());
+    } else {
+      userApp2.setUserId(userApp.getAgentStaffId());
+    }
+
+    userApp2 = userAppService.queryUserApp(userApp2);
+
+    UserInfo userInfo = new UserInfo();
+    userInfo.setId(userApp.getUserId());
+    userInfo = userInfoService.queryUserInfo(userInfo);
+
+    UserInfo userInfo2 = new UserInfo();
+    userInfo2.setId(userApp2.getUserId());
+    userInfo2 = userInfoService.queryUserInfo(userInfo2);
+    resMap.put("extentManName", userApp2.getUserName());
+    resMap.put("extentMan", userInfo2.getPhone());
+    resMap.put("extentManLevel", userApp2.getLevel());
+
+    MerchantRate merchantRate = new MerchantRate()
+    .setUserId(merchantBaseInfo.getUserId() + "");
+    merchantRate =
+      merchantRateMapper.selectOne(new QueryWrapper<>(merchantRate));
+    if (merchantRate != null) {
+      resMap.put("rate", "0." + merchantRate.getRate() + "%");
+    } else {
+      resMap.put("rate", "0.38%");
+    }
+
+    Map<String, Object> map = new HashMap<>();
+    map.put("merchantCode", dto.getMerchantCode());
+
+    map.put("userId", dto.getUserId());
+    Double totalProfit = merchantProfitService.queryMerchantProfitSumPrice(map); //所有产生分润的总分润
+    if (totalProfit == null) {
+      totalProfit = 0d;
+    }
+    resMap.put("totalProfit", totalProfit + "");
+    map.put("startTime", DateUtils.getDayBegin());
+    map.put("endTime", DateUtils.getDayEnd());
+
+    Double todayProfit = merchantProfitService.queryMerchantProfitSumPrice(map); //今日分润
+    if (todayProfit == null) {
+      todayProfit = 0d;
+    }
+
+    Map<String, Object> orderMap = new HashMap<String, Object>();
+    orderMap.put("merchantCode", dto.getMerchantCode());
+    orderMap.put("status", "1");
+
+    Double totalMoney = merchantOrderService.queryMerchantOrderFeeByTime(
+      orderMap
+    ); //总流水
+    if (totalMoney == null) {
+      totalMoney = 0d;
+    }
+
+    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+    orderMap.put("startTime", sdf.format(DateUtils.getBeginDayOfMonth()) + "");
+    orderMap.put("endTime", sdf.format(DateUtils.getEndDayOfMonth()) + "");
+    Double monthMoney = merchantOrderService.queryMerchantOrderFeeByTime(
+      orderMap
+    ); //本月流水
+    if (monthMoney == null) {
+      monthMoney = 0d;
+    }
+
+    orderMap.put("startTime", sdf.format(DateUtils.getDayBegin()) + "");
+    orderMap.put("endTime", sdf.format(DateUtils.getDayEnd()) + "");
+    Double todayMoney = merchantOrderService.queryMerchantOrderFeeByTime(
+      orderMap
+    ); //今日流水
+    if (todayMoney == null) {
+      todayMoney = 0d;
+    }
+
+    resMap.put("todayProfit", todayProfit + "");
+    resMap.put("todayMoney", todayMoney + "");
+    resMap.put("totalMoney", totalMoney + "");
+    resMap.put("monthMoney", monthMoney + "");
+
+    resMap.put("userName", DesensitizedUtil.chineseName(userApp.getUserName()));
+    resMap.put(
+      "phone",
+      DesensitizedUtil.mobilePhone(userInfo.getPhone().substring(0, 11))
+    );
+    resMap.put("createTime", userApp.getCreateDt());
+
+    resMap.put("alias", merchantBaseInfo.getAlias());
+    resMap.put("address", merchantBaseInfo.getAddress());
+
+    return ResultGenerator.genSuccessResult(resMap);
+  }
+
+  /**
+   * 商户推广-商户列表
+   */
+  @PostMapping("/merChantListByTime")
+  @ApiOperation(
+    tags = {
+      "页面-新增商户_今日新增", "页面-新增商户_所有商户", "页面-商户列表",
+    },
+    value = "新增商户-商户列表",
+    notes = "返回分页过后的数据",
+    httpMethod = "POST"
+  )
+  public Result<Map<String, Object>> merChantListByTime(
+    @RequestBody ExpandDto dto
+  ) {
+    Map<String, Object> result = userAppService.getMerchantListByCondition(dto);
+    return ResultGenerator.genSuccessResult(result);
+  }
+
+  /**
+   * 商户推广-商户列表
+   */
+  @GetMapping("/merChantListV2")
+  @ApiOperation(
+    tags = {
+      "页面-新增商户_今日新增", "页面-新增商户_所有商户", "页面-商户列表",
+    },
+    value = "新增商户-商户列表",
+    notes = "返回分页过后的数据",
+    httpMethod = "POST"
+  )
+  public Result<Map<String, Object>> merChantListV2(
+    Page<MerchSummaryVO> page,
+    MerchSearchDTO merchSearchDTO,
+    OrderItem orderItem
+  ) {
+    page.getOrders().clear();
+    // 如果排序列是1, 那么就按总金额排序, 排序列是2, 那么就按笔数排序
+    if ("1".equals(orderItem.getColumn())) {
+      orderItem.setColumn("mos.totalFee");
+    } else if ("2".equals(orderItem.getColumn())) {
+      orderItem.setColumn("mos.count");
+    } else {
+      orderItem.setColumn("ua.createDt");
+    }
+    page.getOrders().add(orderItem);
+
+    UserApp tokenUa = userAppService.queryUserAppByToken();
+    if (
+      !"agent".equals(tokenUa.getUserType()) &&
+      merchSearchDTO.getAgentStaffIds() != null
+    ) {
+      merchSearchDTO.getAgentStaffIds().clear();
+    }
+    if (
+      "2".equals(merchSearchDTO.getType()) &&
+      merchSearchDTO.getAgentStaffIds() != null
+    ) {
+      merchSearchDTO.getAgentStaffIds().clear();
+    }
+
+    merchSearchDTO.setUserId(tokenUa.getUserId() + "");
+    Map<String, Object> result = userAppService.getMerchantListByConditionV2(
+      page,
+      merchSearchDTO
+    );
+    return ResultGenerator.genSuccessResult(result);
+  }
+
+  @GetMapping("/agentLevelInfo")
+  public Result<Map<String, Object>> agentLevelInfo() {
+    UserApp userApp = userAppService.queryUserAppByToken();
+    Double curMonthTotalConsume = merchantOrderMapper.querySubMerchantTransMonthAmount(
+      userApp.getUserId().toString()
+    );
+    Double lastMonthTotalConsume = merchantOrderMapper.querySubMerchantTransLastMonthAmount(
+      userApp.getUserId().toString()
+    );
+
+    Map<String, Object> map = new HashMap<>();
+    map.put(
+      "curMonthTotalConsume",
+      curMonthTotalConsume == null ? 0d : curMonthTotalConsume
+    );
+    map.put("curMonthTotalConsumeMax", 10000000);
+    map.put(
+      "lastMonthTotalConsume",
+      lastMonthTotalConsume == null ? 0d : lastMonthTotalConsume
+    );
+    map.put("lastMonthTotalConsumeMax", 10000000);
+
+    QueryWrapper<MerchantRate> merchantRateQueryWrapper = new QueryWrapper<MerchantRate>()
+    .eq("userId", userApp.getUserId());
+    MerchantRate merchantRate = merchantRateMapper.selectOne(
+      merchantRateQueryWrapper
+    );
+
+    Calendar calendar = Calendar.getInstance();
+    calendar.setTime(merchantRate.getUpdateTime());
+    Calendar calendarNow = Calendar.getInstance();
+    if (calendar.get(Calendar.MONTH) == calendarNow.get(Calendar.MONTH)) {
+      map.put("rate", merchantRate.getPreviousRate());
+    } else {
+      // 获取新的费率
+      map.put("rate", merchantRate.getRate());
+      // 保存新的费率
+      merchantRate.setPreviousRate(merchantRate.getRate());
+      merchantRate.setUpdateTime(new Date());
+      merchantRateMapper.updateById(merchantRate);
+    }
+
+    return ResultGenerator.genSuccessResult(map);
+  }
+
+  @GetMapping("/agent/agentShare")
+  public Result<Map<String, Object>> agentShareInfo() {
+    UserApp userApp = userAppService.queryUserAppByToken();
+    Map<String, Object> map = new HashMap<>();
+
+    if ("agent_staff".equals(userApp.getUserType())) {
+      map.put("userId", userApp.getParentId());
+      map.put("agentStaffId", userApp.getUserId());
+    } else {
+      map.put("userId", userApp.getUserId());
+    }
+
+    Double consumeFeeTotal = merchantProfitService.queryMerchantProfitSumConsumeFee(
+      map
+    );
+    Double priceTotal = merchantProfitService.queryMerchantProfitSumPrice(map);
+
+    Calendar calendar = Calendar.getInstance();
+    calendar.set(Calendar.DAY_OF_MONTH, 1);
+    calendar.set(Calendar.HOUR_OF_DAY, 0);
+    calendar.set(Calendar.MINUTE, 0);
+    calendar.set(Calendar.SECOND, 0);
+    calendar.set(Calendar.MILLISECOND, 0);
+    map.put("stTime", calendar.getTime());
+
+    Double consumeFeeCurrentMonth = merchantProfitService.queryMerchantProfitSumConsumeFee(
+      map
+    );
+    Double priceCurrentMonth = merchantProfitService.queryMerchantProfitSumPrice(
+      map
+    );
+
+    Map<String, Object> result = new HashMap<>();
+    result.put(
+      "consumeFeeTotal",
+      consumeFeeTotal == null ? 0d : consumeFeeTotal
+    );
+    result.put("priceTotal", priceTotal == null ? 0d : priceTotal);
+    result.put(
+      "consumeFeeCurrentMonth",
+      consumeFeeCurrentMonth == null ? 0d : consumeFeeCurrentMonth
+    );
+    result.put(
+      "priceCurrentMonth",
+      priceCurrentMonth == null ? 0d : priceCurrentMonth
+    );
+
+    Double totalShareMoneyToday; // 今日分润总额
+    Double totalAccumulateShareMoney; // 累计总分润
+
+    double allowCashMoney; // 可提现分润
+    double noCashMoney; // 不可提现分润
+    Double cashedMoney; // 已提现分润
+    // 获取当前商户的所有的下级商户信息
+
+    Map<String, Object> queryMap = new HashMap<>();
+    if ("agent_staff".equals(userApp.getUserType())) {
+      queryMap.put("agentStaffId", userApp.getUserId());
+    } else {
+      queryMap.put("userId", userApp.getUserId());
+    }
+
+    queryMap.put("status", 1);
+
+    // 累计总分润
+    totalAccumulateShareMoney =
+      merchantProfitService.queryMerchantProfitSumPrice(queryMap);
+    if (totalAccumulateShareMoney == null) {
+      totalAccumulateShareMoney = 0d;
+    }
+    queryMap.put("startTime", DateUtils.getDayBegin());
+    totalShareMoneyToday =
+      merchantProfitService.queryMerchantProfitSumPrice(queryMap);
+    if (totalShareMoneyToday == null) {
+      totalShareMoneyToday = 0d;
+    }
+
+    // 今日总分润 = 今日商户分润
+    cashedMoney = cashService.sumMerchantSuccessCash(userApp.getUserId()); //已经提现与正在提现的分润 //+ cashService.sumFansAreadlyCash(map);
+    if (cashedMoney == null) {
+      cashedMoney = 0d;
+    }
+    noCashMoney = totalShareMoneyToday;
+    allowCashMoney = totalAccumulateShareMoney - cashedMoney - noCashMoney;
+
+    result.put(
+      "totalShareMoneyToday",
+      StringUtil.bigDecimal(totalShareMoneyToday)
+    ); //今日总分润
+    result.put(
+      "totalAccumulateShareMoney",
+      StringUtil.bigDecimal(totalAccumulateShareMoney)
+    ); //累计总分润
+
+    result.put(
+      "allowCashMoney",
+      StringUtil.bigDecimal(allowCashMoney, RoundingMode.DOWN)
+    );
+    result.put("noCashMoney", StringUtil.bigDecimal(noCashMoney));
+    result.put("cashedMoney", StringUtil.bigDecimal(cashedMoney));
+
+    return ResultGenerator.genSuccessResult(result);
+  }
+
+  @GetMapping("/agent/agentStaffShare")
+  public Result<Map<String, Object>> agentStaffShareInfo() {
+    Map<String, Object> objectMap = userAppService.agentStaffShareInfo();
+    return ResultGenerator.genSuccessResult(objectMap);
+  }
+
+  @RequestMapping(
+    value = "/rate",
+    method = { RequestMethod.GET, RequestMethod.POST }
+  )
+  public Result<Integer> rateInfo() {
+    UserApp userApp = userAppService.queryUserAppByToken();
+    MerchantRate merchantRate = new MerchantRate()
+    .setUserId(userApp.getUserId() + "");
+    merchantRate =
+      merchantRateMapper.selectOne(new QueryWrapper<>(merchantRate));
+
+    if (merchantRate == null) {
+      return ResultGenerator.genSuccessResult(38);
+    } else {
+      return ResultGenerator.genSuccessResult(merchantRate.getRate());
+    }
+  }
+
+  @GetMapping(value = "/levelUpOrder")
+  public Result<Object> levelUpOrder(String type) {
+    throw new MsgException("系统升级中, 暂不支持该升级方式");
+    // UserApp userApp = userAppService.queryUserAppByToken();
+    //
+    // Map<String, Object> result = userAppService.getLevelUpOrder(userApp, type);
+    //
+    // return ResultGenerator.genSuccessResult(result);
+  }
+
+  @GetMapping(value = "/levelUpOrderV2Info")
+  public Result<Object> levelUpOrderInfo(String level) {
+    UserApp userApp = userAppService.queryUserAppByToken();
+
+    Map<String, Object> result = userAppService.getLevelUpOrderV2Info(
+      userApp,
+      level
+    );
+
+    return ResultGenerator.genSuccessResult(result);
+  }
+
+  @GetMapping(value = "/levelUpOrderV2")
+  public Result<Object> levelUpOrderV2(String level, String type) {
+    UserApp userApp = userAppService.queryUserAppByToken();
+
+    Map<String, Object> result = userAppService.getLevelUpOrderV2(
+      userApp,
+      type,
+      level
+    );
+
+    return ResultGenerator.genSuccessResult(result);
+  }
+
+  @GetMapping("/parentInfo")
+  public Result<UserAppVO> getParentInfo() {
+    UserApp userApp = userAppService.queryUserAppByToken();
+    QueryWrapper<UserApp> qWrapper = new QueryWrapper<UserApp>()
+    .eq("userId", userApp.getParentId());
+    userApp = userAppService.getOne(qWrapper);
+    if (userApp == null) {
+      return ResultGenerator.genSuccessResult("无上级信息", null);
+    }
+    UserInfo ui = userInfoService.getById(userApp.getUserId());
+
+    UserAppVO result = new UserAppVO();
+    result.setUserName(DesensitizedUtil.chineseName(userApp.getUserName()));
+    result.setPhone(ui.getPhone());
+    result.setInviteNum(userApp.getInviteNum());
+    result.setLogo(userApp.getLogo());
+
+    return ResultGenerator.genSuccessResult(result);
+  }
+
+  @GetMapping("/pageSubTeamData")
+  public Result<Page<UserAppVO>> pageSubTeamData(
+    Page<UserAppVO> page,
+    String userName
+  ) {
+    page.getOrders().clear();
+    page.getOrders().add(OrderItem.desc("ua.createDt"));
+    page = userProfitService.apiPageMonthSubTeamData(page, userName);
+
+    for (UserAppVO record : page.getRecords()) {
+      record.setUserName(DesensitizedUtil.chineseName(record.getUserName()));
+      if ("LV10".equals(record.getLevelName())) {
+        record.setLevelName("SVIP");
+      } else {
+        record.setLevelName(record.getLevelCode().replace("LV", "VIP"));
+      }
+    }
+
+    return ResultGenerator.genSuccessResult("操作成功", page);
+  }
+
+  /**
+   * 根据手机号获取划拨用户
+   * @param phone
+   * @return
+   */
+  @GetMapping("/get/phone/{phone}")
+  public Result<Object> getUserAppByPhone(
+    @PathVariable(value = "phone") String phone
+  ) {
+    UserApp userApp = userAppService.checkApiToken();
+    UserApp info = userAppService.getUserAppByPhone(phone, userApp);
+    return ResultGenerator.genSuccessResult("操作成功", info);
+  }
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/UserInfoController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/UserInfoController.java
new file mode 100644
index 0000000..26a6bbd
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/UserInfoController.java
@@ -0,0 +1,280 @@
+package cn.pluss.platform.controller;
+
+import cn.pluss.platform.annotation.OpLog;
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.constants.CommonError;
+import cn.pluss.platform.constants.ProjectConstant;
+import cn.pluss.platform.dto.ChangePwdDTO;
+import cn.pluss.platform.entity.PhoneValidateCode;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.entity.UserInfo;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.phoneValidateCode.PhoneValidateCodeService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.userInfo.UserInfoService;
+import cn.pluss.platform.util.MD5Util;
+import cn.pluss.platform.util.StringUtil;
+import cn.pluss.platform.util.ValidateCodeUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.client.RestTemplate;
+
+import javax.validation.Valid;
+import java.util.*;
+
+/**
+ * @author djh
+ */
+@RestController
+@RequestMapping("/userInfo")
+@RequiredArgsConstructor
+@Slf4j
+@Api(value = "UserInfo控制类", tags = {"用户相关接口"})
+public class UserInfoController {
+
+    private final UserInfoService userInfoNewService;
+    private final UserAppService userAppService;
+    private final PhoneValidateCodeService phoneValidateCodeService;
+    private final ValidateCodeUtil validateCodeUtil;
+
+    @Setter(onMethod_ = {@Autowired})
+    private RestTemplate restTemplate;
+
+    @GetMapping({"/bind/{inviteCode}", "/bind/"})
+    public Result<Object> bindInviteCode(@PathVariable(value = "inviteCode", required = false) String inviteCode) {
+        if (inviteCode == null) {
+            throw new MsgException("缺少邀请码");
+        }
+
+        userInfoNewService.bindInviteCode(inviteCode);
+        return ResultGenerator.genSuccessResult("操作成功", "操作成功");
+    }
+
+    @GetMapping
+    @ApiOperation(value = "获取全部", notes = "返回分页过后的数据", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "page", value = "查询页码", paramType = "query", dataType = "Integer", defaultValue = "0"),
+            @ApiImplicitParam(name = "size", value = "每页数据量", paramType = "query", dataType = "Integer", defaultValue = "0")})
+    public Result<PageInfo<UserInfo>> list(@RequestParam(defaultValue = "1") Integer page,
+                                           @RequestParam(defaultValue = "10") Integer size) {
+        if (size == null || size == 0) {
+            size = ProjectConstant.PAGE_SIZE;
+        }
+        if (page == null || page == 0) {
+            page = 1;
+        }
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageSize", size);
+        map.put("offset", (page - 1) * size);
+        List<UserInfo> userInfoList = userInfoNewService.queryUserInfoPage(map);
+        Integer count = userInfoNewService.queryUserInfoPageCount(map);
+        // 返回参数
+        PageInfo<UserInfo> pager = new PageInfo<>(count.longValue(), (long) StringUtil.getPageCount(count, size), page.longValue(), size.longValue(), userInfoList);
+        return ResultGenerator.genSuccessResult(pager);
+    }
+
+
+//    @NoRepeatSubmit
+    @PostMapping
+    @ApiOperation(tags = {"页面-注册", "页面-H5注册", "页面-分享_直接开户"}, value = "用户注册", notes = "添加新的数据", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "UserInfo", value = "待添加的UserInfo实例", paramType = "body", dataType = "UserInfo", required = true)})
+    public Result<Object> add(@RequestBody UserInfo userInfo) {
+        userInfoNewService.register(userInfo);
+        return ResultGenerator.genSuccessResult();
+    }
+
+
+    @GetMapping("/verifyPhoneIsExist")
+    @ApiOperation(tags = {"页面-注册", "页面-H5注册", "页面-分享注册", "页面-会员开卡", "页面-分享_直接开户"}, value = "未注册手机号并获取验证码", notes = "验证该手机号是否注册，未注册即发送验证码", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "storeId", value = "门店", paramType = "String", dataType = "String", required = true),
+            @ApiImplicitParam(name = "phone", value = "手机号", paramType = "String", dataType = "String", required = true),
+    })
+    public Result<Object> verifyPhoneIsExist(String phone) {
+        if (StringUtils.isBlank(phone)) {
+            return ResultGenerator.genFailResult("手机号不能为空！");
+        }
+
+        PhoneValidateCode phoneValidateCode = new PhoneValidateCode();
+        phoneValidateCode.setPhone(phone);
+        String checkCode = StringUtil.random(4);
+        phoneValidateCode.setCode(checkCode);
+        Result<Object> result = validateCodeUtil.requestValidateCode(phoneValidateCode.getPhone(), checkCode);
+        if (result != null) {
+            return result;
+        }
+        //根据当前手机号查询当前手机号是否有验证码信息
+        phoneValidateCodeService.saveOrReplaceIfExist(phoneValidateCode);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @DeleteMapping("/{id}")
+    @ApiOperation(value = "删除数据", notes = "根据id删除数据", httpMethod = "DELETE")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "查询的id实例", paramType = "path", dataType = "Integer", required = true)})
+    public Result delete(@PathVariable Long id) {
+        UserInfo userInfo = new UserInfo();
+        userInfo.setId(id);
+        userInfoNewService.deleteUserInfo(userInfo);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @PostMapping("/forgetPassword")
+    @ApiOperation(tags = {"页面-忘记密码"}, value = "忘记密码", notes = "忘记密码", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "UserInfo", value = "更新的UserInfo实例", paramType = "body", dataType = "UserInfo", required = true),})
+    public Result<Object> forgetPassword(@RequestBody UserInfo userInfo) {
+        userInfoNewService.forgetPwd(userInfo);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    // 修改密码
+    @PostMapping("/updatePassword")
+    @ApiOperation(value = "修改密码", notes = "修改密码", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "UserInfo", value = "更新的UserInfo实例", paramType = "body", dataType = "UserInfo", required = true),})
+    public Result updatePassword(@RequestBody UserInfo userInfo) {
+        UserApp tokenUa = userAppService.queryUserAppByToken();
+        if (!Objects.equals(tokenUa.getUserId(), userInfo.getId())) {
+            throw new MsgException(CommonError.NO_AUTHORIZATION);
+        }
+
+        MsgException.checkNull(userInfo.getId(), "无用户id!");
+        MsgException.checkBlank(userInfo.getCheckCode(), "无验证码!");
+
+        UserInfo queryUserInfo = new UserInfo();
+        queryUserInfo.setId(userInfo.getId());
+
+        // 查询当前用户信息
+        queryUserInfo = userInfoNewService.queryUserInfo(queryUserInfo);
+
+        MsgException.checkNull(queryUserInfo, CommonError.NO_EXIST_ACCOUNT);
+
+        // 验证原始密码
+        if (!MD5Util.MD5Encode(userInfo.getOldPassword(), "utf-8").equalsIgnoreCase(queryUserInfo.getPassword())) {
+            return ResultGenerator.genFailResult("原始密码错误！");
+        }
+
+        LambdaQueryWrapper<PhoneValidateCode> qWrapper = Wrappers.lambdaQuery();
+        qWrapper.eq(PhoneValidateCode::getPhone, queryUserInfo.getPhone())
+                .orderByDesc(PhoneValidateCode::getSendDt)
+                .last("limit 1");
+        PhoneValidateCode existValidCode = phoneValidateCodeService.getOne(qWrapper);
+        MsgException.checkNull(existValidCode, "验证码不存在或验证码已失效");
+
+        if (!Objects.equals(existValidCode.getCode(), userInfo.getCheckCode())) {
+            if (existValidCode.getAttempt() == null) {
+                existValidCode.setAttempt(1);
+                phoneValidateCodeService.updateById(existValidCode);
+                throw new MsgException("验证码错误");
+            }
+
+            int newAttemptCount = existValidCode.getAttempt() + 1;
+            if (newAttemptCount == 5) {
+                // 删除验证码
+                phoneValidateCodeService.removeById(existValidCode.getId());
+                throw new MsgException("验证码错误，请重新获取验证码");
+            }
+        } else {
+            // 删除验证码
+            phoneValidateCodeService.removeById(existValidCode.getId());
+        }
+
+        // 修改密码
+        UserInfo updateUserInfo = new UserInfo();
+        updateUserInfo.setId(queryUserInfo.getId());
+        updateUserInfo.setPassword(MD5Util.MD5Encode(userInfo.getPassword(), "utf-8"));
+        updateUserInfo.setUpdateTime(new Date());
+        userInfoNewService.updateById(updateUserInfo);
+
+        // 修改小程序密码
+        UserApp userApp = new UserApp().setUserId(updateUserInfo.getId());
+        userApp = userAppService.queryUserApp(userApp);
+        if (userApp != null && "promoter".equals(userApp.getUserType())) {
+            String url = "https://shop.shouyinbei.net/web/wmerchant.php?c=site&a=entry&ctrl=store&ac=oauth&op=set_password&do=web&m=we7_wmall&i=1";
+            url += "&password=" + updateUserInfo.getPassword();
+            url += "&mobile=" + queryUserInfo.getLoginName();
+            log.info("==================>修改小程序请求链接为: {}<=================", url);
+            try {
+                String result = restTemplate.getForObject(url, String.class);
+                log.info("==================>修改小程序密码结果: {}<=================", result);
+            } catch (Exception e) {
+                log.info("==================>修改小程序密码异常: {}<=================", e.getMessage());
+            }
+        }
+        // ============
+
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @GetMapping("/{loginName}/{password}")
+    @ApiOperation(tags = {"页面-登录", "页面-切换商户"}, value = "登录", notes = "登录接口", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "loginName", value = "查询的loginName", paramType = "path", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "password", value = "查询的password", paramType = "path", required = true, dataType = "String")})
+    public Result<Map<String, Object>> detail(@PathVariable("loginName") String loginName, @PathVariable("password") String password) {
+        Map<String, Object> login = userInfoNewService.login(loginName, password);
+        return ResultGenerator.genSuccessResult(login);
+    }
+
+    // 修改手机号
+    @PostMapping("/changePhone")
+    @ApiOperation(value = "修改手机号", notes = "修改手机号", httpMethod = "POST")
+    public Result<Object> changePhone(@Valid @RequestBody ChangePwdDTO changePwdDTO) {
+        userInfoNewService.changePhone(changePwdDTO);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    // @PostMapping("/changeRate")
+    // public Result<Object> changeRate(@RequestBody Map<String, Object>param) {
+    //     userInfoNewService.apiChangeRate(param.get("userId").toString(), Integer.parseInt(param.get("rate").toString()));
+    //     return ResultGenerator.genSuccessResult("修改成功，费率次日生效", null);
+    // }
+
+    @GetMapping("/userMerchantBaseInfo")
+    public Result<JSONObject> getUserMerchantBaseInfo() {
+        JSONObject result = userInfoNewService.getUserMerchantBaseInfo();
+        return ResultGenerator.genSuccessResult(result);
+    }
+
+    @PostMapping("/savePayPassword")
+    public Result<Object> savePayPassword(@RequestBody UserInfo userInfo) {
+        userInfoNewService.savePayPassword(userInfo);
+        return ResultGenerator.genSuccessResult("保存安全密码成功", null);
+    }
+
+    @PostMapping("/verifyPayPassword")
+    public Result<Object> verifyPayPassword(@RequestBody Map<String, Object> param) {
+        String payPassword = param.get("payPassword").toString();
+        userInfoNewService.apiVerifyPayPassword(payPassword);
+        return ResultGenerator.genSuccessResult("支付密码校验通过", null);
+    }
+
+    @OpLog(opCode = "APP_FACE_CERT", opDetail = "APP人脸识别通过", opName = "APP人脸识别结果")
+    @PostMapping("/verifyFaceCert")
+    public Result<Object> verifyFaceCert() {
+        userInfoNewService.appVerifyFaceCert();
+        return ResultGenerator.genSuccessResult("修改成功", null);
+    }
+
+    @OpLog(opCode = "APP_FACE_CERT", opDetail = "APP人脸识别失败", opName = "APP人脸识别结果")
+    @PostMapping("/verifyFaceCertFail")
+    public Result<Object> faceCertFail() {
+        userInfoNewService.appVerifyFaceCert();
+        return ResultGenerator.genSuccessResult("修改成功", null);
+    }
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/UserLevelController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/UserLevelController.java
new file mode 100644
index 0000000..f77ee3c
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/UserLevelController.java
@@ -0,0 +1,40 @@
+package cn.pluss.platform.controller;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.user.UserLevelService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ *
+ *用户等级APP接口
+ *@author: bzg
+ *@time: 2022/1/25 14:49
+ */
+@RestController
+@Slf4j
+@RequestMapping("/user")
+@Api(value = "UserLevel控制类", tags = {"UserLevel接口"})
+public class UserLevelController {
+
+
+    @Resource
+    private UserLevelService userLevelService;
+
+    /**
+     * 获取用户等级配置
+     * @date: 2022/1/25 14:51
+     * @return cn.pluss.platform.api.Result<java.lang.Object>
+     */
+    @GetMapping("/level/get")
+    @ApiOperation(value = "用户等级配置", notes = "用户等级配置", httpMethod = "GET")
+    public Result<Object> levelGet() {
+        return userLevelService.getAppLevelInfo();
+    }
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/UserOrganController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/UserOrganController.java
new file mode 100644
index 0000000..22c04a4
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/UserOrganController.java
@@ -0,0 +1,100 @@
+package cn.pluss.platform.controller;
+
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.constants.ProjectConstant;
+import cn.pluss.platform.entity.UserOrgan;
+import cn.pluss.platform.userOrgan.UserOrganService;
+import cn.pluss.platform.util.StringUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+@RestController
+@RequestMapping("/userOrgan")
+@Transactional
+@Api(value = "UserOrgan控制类", tags = {"UserOrgan接口"})
+public class UserOrganController {
+
+    @Resource
+    private UserOrganService userOrganService;
+
+    @GetMapping
+    @ApiOperation(value = "获取全部", notes = "返回分页过后的数据", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "page", value = "查询页码", paramType = "query", dataType = "Integer", defaultValue = "0"),
+            @ApiImplicitParam(name = "size", value = "每页数据量", paramType = "query", dataType = "Integer", defaultValue = "0")
+    })
+    public Result<PageInfo<UserOrgan>> list(@RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
+        if (size == null || size == 0) {
+            size = ProjectConstant.PAGE_SIZE;
+        }
+        if (page == null || page == 0) {
+            page = 1;
+        }
+        Map<String, Object> map = new HashMap<String, Object>();
+        map.put("pageSize", size);
+        map.put("offset", (page - 1) * size);
+        List<UserOrgan> userOrganList = userOrganService.queryUserOrganPage(map);
+        Integer count = userOrganService.queryUserOrganPageCount(map);
+        //返回参数
+        PageInfo pager = new PageInfo<UserOrgan>(count.longValue(), (long) StringUtil.getPageCount(count, size), page.longValue(), size.longValue(), userOrganList);
+        return ResultGenerator.genSuccessResult(pager);
+    }
+
+    @PostMapping
+    @ApiOperation(value = "添加数据", notes = "添加新的数据", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "UserOrgan", value = "待添加的UserOrgan实例", paramType = "body", dataType = "UserOrgan", required = true)
+    })
+    public Result add(@RequestBody UserOrgan userOrgan) {
+        userOrganService.saveUserOrgan(userOrgan);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @DeleteMapping("/{id}")
+    @ApiOperation(value = "删除数据", notes = "根据id删除数据", httpMethod = "DELETE")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "查询的id实例", paramType = "path", dataType = "Integer", required = true)
+    })
+    public Result delete(@PathVariable Integer id) {
+        UserOrgan userOrgan = new UserOrgan();
+        userOrgan.setId(id.intValue());
+        userOrganService.deleteUserOrgan(userOrgan);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @PutMapping
+    @ApiOperation(value = "更新数据", notes = "根据内容更新数据", httpMethod = "PUT")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "UserOrgan", value = "更新的UserOrgan实例", paramType = "body", dataType = "UserOrgan", required = true)
+    })
+    public Result update(@RequestBody UserOrgan userOrgan) {
+        userOrganService.updateUserOrgan(userOrgan);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @GetMapping("/{id}")
+    @ApiOperation(value = "获取单个值", notes = "查看单个项目的内容", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "查询的id", paramType = "path", required = true, dataType = "Integer", defaultValue = "0")
+    })
+    public Result detail(@PathVariable Long id) {
+        UserOrgan userOrgan = new UserOrgan();
+        userOrgan.setId(id.intValue());
+        userOrgan = userOrganService.queryUserOrgan(userOrgan);
+        return ResultGenerator.genSuccessResult(userOrgan);
+    }
+
+}
+
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/UserPushIdController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/UserPushIdController.java
new file mode 100644
index 0000000..650d181
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/UserPushIdController.java
@@ -0,0 +1,30 @@
+package cn.pluss.platform.controller;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.user.UserPushIdService;
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author djh
+ */
+@RestController
+@RequestMapping("/userPushId")
+public class UserPushIdController {
+
+    @Autowired
+    private UserPushIdService userPushIdService;
+
+    @PostMapping("/cid")
+    public Result<Object> setCid(@RequestBody JSONObject param) {
+        String cid = param.getString("cid");
+        userPushIdService.apiSetCid(cid);
+
+        return ResultGenerator.genSuccessResult();
+    }
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/UserVoiceController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/UserVoiceController.java
new file mode 100644
index 0000000..768113a
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/UserVoiceController.java
@@ -0,0 +1,32 @@
+package cn.pluss.platform.controller;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.entity.UserVoice;
+import cn.pluss.platform.user.UserVoiceService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author DJH
+ */
+@RequestMapping("/userVoice")
+@RestController
+public class UserVoiceController {
+
+    @Autowired
+    private UserVoiceService userVoiceService;
+
+    @GetMapping
+    public Result<Object> getVoiceSetting() {
+        UserVoice userVoice = userVoiceService.apiGetVoiceSetting();
+        return ResultGenerator.genSuccessResult(userVoice);
+    }
+
+    @PostMapping
+    public Result<Object> setVoiceSetting(@RequestBody UserVoice userVoice) {
+        userVoiceService.apiSetVoiceSetting(userVoice);
+        return ResultGenerator.genSuccessResult("配置修改成功", null);
+    }
+
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/WxBankCodeController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/WxBankCodeController.java
new file mode 100644
index 0000000..dd37e42
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/WxBankCodeController.java
@@ -0,0 +1,100 @@
+package cn.pluss.platform.controller;
+
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.constants.ProjectConstant;
+import cn.pluss.platform.entity.WxBankCode;
+import cn.pluss.platform.util.StringUtil;
+import cn.pluss.platform.wxBankCode.WxBankCodeService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+@RestController
+@RequestMapping("/wxBankCode")
+@Transactional
+@Api(value = "WxBankCode控制类", tags = {"WxBankCode接口"})
+public class WxBankCodeController {
+
+    @Resource
+    private WxBankCodeService wxBankCodeService;
+
+    @GetMapping
+    @ApiOperation(value = "获取全部", notes = "返回分页过后的数据", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "page", value = "查询页码", paramType = "query", dataType = "Integer", defaultValue = "0"),
+            @ApiImplicitParam(name = "size", value = "每页数据量", paramType = "query", dataType = "Integer", defaultValue = "0")
+    })
+    public Result<PageInfo<WxBankCode>> list(@RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
+        if (size == null || size == 0) {
+            size = ProjectConstant.PAGE_SIZE;
+        }
+        if (page == null || page == 0) {
+            page = 1;
+        }
+        Map<String, Object> map = new HashMap<String, Object>();
+        map.put("pageSize", size);
+        map.put("offset", (page - 1) * size);
+        List<WxBankCode> wxBankCodeList = wxBankCodeService.queryWxBankCodePage(map);
+        Integer count = wxBankCodeService.queryWxBankCodePageCount(map);
+        //返回参数
+        PageInfo pager = new PageInfo<WxBankCode>(count.longValue(), (long) StringUtil.getPageCount(count, size), page.longValue(), size.longValue(), wxBankCodeList);
+        return ResultGenerator.genSuccessResult(pager);
+    }
+
+    @PostMapping
+    @ApiOperation(value = "添加数据", notes = "添加新的数据", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "WxBankCode", value = "待添加的WxBankCode实例", paramType = "body", dataType = "WxBankCode", required = true)
+    })
+    public Result add(@RequestBody WxBankCode wxBankCode) {
+        wxBankCodeService.saveWxBankCode(wxBankCode);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @DeleteMapping("/{id}")
+    @ApiOperation(value = "删除数据", notes = "根据id删除数据", httpMethod = "DELETE")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "查询的id实例", paramType = "path", dataType = "Integer", required = true)
+    })
+    public Result delete(@PathVariable Integer id) {
+        WxBankCode wxBankCode = new WxBankCode();
+        wxBankCode.setId(id.intValue());
+        wxBankCodeService.deleteWxBankCode(wxBankCode);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @PutMapping
+    @ApiOperation(value = "更新数据", notes = "根据内容更新数据", httpMethod = "PUT")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "WxBankCode", value = "更新的WxBankCode实例", paramType = "body", dataType = "WxBankCode", required = true)
+    })
+    public Result update(@RequestBody WxBankCode wxBankCode) {
+        wxBankCodeService.updateWxBankCode(wxBankCode);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @GetMapping("/{id}")
+    @ApiOperation(value = "获取单个值", notes = "查看单个项目的内容", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "查询的id", paramType = "path", required = true, dataType = "Integer", defaultValue = "0")
+    })
+    public Result detail(@PathVariable Long id) {
+        WxBankCode wxBankCode = new WxBankCode();
+        wxBankCode.setId(id.intValue());
+        wxBankCode = wxBankCodeService.queryWxBankCode(wxBankCode);
+        return ResultGenerator.genSuccessResult(wxBankCode);
+    }
+
+}
+
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/WxCityInfoController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/WxCityInfoController.java
new file mode 100644
index 0000000..1d41b0f
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/WxCityInfoController.java
@@ -0,0 +1,117 @@
+package cn.pluss.platform.controller;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.bankUnionpayCode.BankUnionpayCodeService;
+import cn.pluss.platform.entity.WxCityInfo;
+import cn.pluss.platform.leshua.BankNameVO;
+import cn.pluss.platform.util.StringUtil;
+import cn.pluss.platform.wxCityInfo.WxCityInfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/wxCityInfo")
+@Transactional
+@Api(value = "WxCityInfo控制类", tags = {"WxCityInfo接口"})
+public class WxCityInfoController {
+
+    private final WxCityInfoService wxCityInfoService;
+    private final BankUnionpayCodeService bankUnionpayCodeService;
+
+    @PostMapping("/queryCodeByCityName")
+    @ApiOperation(value = "根据名称查询城市编码", notes = "查询城市编码", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "WxCityInfo", value = "待添加的WxCityInfo实例", paramType = "body", dataType = "WxCityInfo", required = true)})
+    public Result<Object> queryCodeByCityName(@RequestBody WxCityInfo wxCityInfo) {
+        if (StringUtil.isEmpty(wxCityInfo.getCityName())) {
+            return ResultGenerator.genFailResult("无城市名称");
+        }
+
+        wxCityInfo = wxCityInfoService.queryWxCityInfo(wxCityInfo);
+        return ResultGenerator.genSuccessResult(wxCityInfo);
+    }
+
+
+    @RequestMapping(value = "/queryBranchName", method = {RequestMethod.GET, RequestMethod.POST})
+    @ApiOperation(value = "根据省市code银行名称 查询支行 ", notes = "根据省市code 银行名称 查询支行", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "cityName", value = "中国+省市区", paramType = "cityName", dataType = "cityName", required = true),
+            @ApiImplicitParam(name = "bankName", value = "银行名称", paramType = "bankName", dataType = "bankName", required = true),
+            @ApiImplicitParam(name = "brankName", value = "支行名称", paramType = "brankName", dataType = "brankName", required = false),
+    })
+    public Result queryBranchName(@RequestParam String cityName, @RequestParam String bankName, @RequestParam(required = false) String brankName) {
+        //  对部分银行信息进行特殊处理
+        if (bankName != null) {
+            switch (bankName) {
+                case "工商银行":
+                    bankName = "工行";
+                    break;
+                case "交通银行":
+                    bankName = "交行";
+                    break;
+                case "招商银行":
+                    bankName = "招行";
+                    break;
+                case "农业银行":
+                    bankName = "农行";
+                    break;
+            }
+        }
+
+        if (StringUtil.isEmpty(cityName)) {
+            return ResultGenerator.genFailResult("省市区信息");
+        }
+        String[] cityStrings = cityName.split(",");//格式 ：xx, xx,xx,xx
+        String province = cityStrings[1];//省
+        String city = cityStrings[2];//市
+        city = city.substring(0, 2);
+        if (StringUtil.isEmpty(province)) {
+            province = city;
+        } else {
+            province = province.replace("省", "");
+        }
+
+        String concatBankName = "%";
+        if ("其他银行".equals(bankName)) {
+            concatBankName = null;
+        } else if (!"中国银行".equals(bankName)) {
+            for (int i = 0; i < bankName.length(); i++) {
+                concatBankName = concatBankName + bankName.charAt(i) + "%";
+            }
+        } else {
+            concatBankName = bankName;
+        }
+
+
+        // 特殊的城市查询银行需要特殊对待
+        if ("潜江".equals(city) || "天门".equals(city) || "仙桃".equals(city)) {
+            city = "荆州";
+        }
+
+        if ("儋州".equals(city)) {
+            city = "海口";
+        }
+
+        if (city.startsWith("省直")) {
+            city = null;
+        }
+
+        if ("海南".equals(province)) {
+            city = null;
+        }
+
+        List<BankNameVO> branchNameList = bankUnionpayCodeService.getBranchName(city, province, concatBankName, brankName);
+        return ResultGenerator.genSuccessResult(branchNameList);
+    }
+
+
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/address/UserAddressController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/address/UserAddressController.java
new file mode 100644
index 0000000..4040c6e
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/address/UserAddressController.java
@@ -0,0 +1,86 @@
+package cn.pluss.platform.controller.address;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.entity.UserAddress;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.userAddress.UserAddressService;
+import cn.pluss.platform.userApp.UserAppService;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * TODO
+ * 用户地址控制器
+ * @author crystal
+ * @date 2022/3/24 17:44
+ */
+@RestController
+@RequestMapping(value = "address")
+public class UserAddressController {
+
+    @Resource
+    private UserAddressService userAddressService;
+
+    @Resource
+    private UserAppService userAppService;
+
+    @GetMapping(value = "/list")
+    @ApiOperation(tags = {"页面-设备管理-地址管理"}, value = "查询用户收货地址列表", notes = "查询用户收货地址列表", httpMethod = "GET")
+    public Result<List<UserAddress>> list()  {
+        UserApp userApp = userAppService.queryUserAppByToken();
+        if(userApp == null){
+            return ResultGenerator.genFailResult("登录用户异常");
+        }
+        List<UserAddress> list = userAddressService.getAddressList(userApp.getUserId(), UserAddress.ADDRESS_TYPE_COLLECT, false);
+        return ResultGenerator.genSuccessResult(list);
+    }
+
+    @GetMapping(value = "/get/{id}")
+    @ApiOperation(tags = {"页面-设备管理-地址管理"}, value = "查询用户收货地址详情", notes = "查询用户收货地址详情", httpMethod = "GET")
+    public Result<UserAddress> get(@PathVariable("id") Long id)  {
+        UserAddress address = userAddressService.getById(id);
+        return ResultGenerator.genSuccessResult(address);
+    }
+
+    @GetMapping(value = "/defaultOne")
+    @ApiOperation(tags = {"页面-设备管理-地址管理"}, value = "查询用户收货地址详情", notes = "查询用户收货地址详情", httpMethod = "GET")
+    public Result<UserAddress> defaultOne()  {
+        UserApp userApp = userAppService.queryUserAppByToken();
+        LambdaQueryWrapper<UserAddress> qWrapper = Wrappers.lambdaQuery();
+        qWrapper.eq(UserAddress::getUserId, userApp.getUserId());
+        qWrapper.orderByDesc(UserAddress::getDefFlag);
+        qWrapper.orderByAsc(UserAddress::getId).last("limit 1");
+        UserAddress address = userAddressService.getOne(qWrapper);
+
+        return ResultGenerator.genSuccessResult(address);
+    }
+
+    @RequestMapping(value = "/delete")
+    @ApiOperation(tags = {"页面-设备管理-地址管理"}, value = "删除收货地址", notes = "删除收货地址", httpMethod = "GET")
+    public Result<Object> delete(@RequestParam("ids[]") Long[] ids)  {
+        if(ids == null || ids.length == 0){
+            return ResultGenerator.genSuccessResult("缺失ids参数",null);
+        }
+        userAddressService.removeByIds(Arrays.asList(ids));
+        return ResultGenerator.genSuccessResult("删除成功",null);
+    }
+
+    @PostMapping(value = "/save")
+    @ApiOperation(tags = {"页面-设备管理-地址管理"}, value = "保存收货地址", notes = "保存收货地址", httpMethod = "POST")
+    public Result<Object> save(@RequestBody UserAddress userAddress)  {
+        UserApp userApp = userAppService.queryUserAppByToken();
+        if(userApp == null){
+            return ResultGenerator.genFailResult("登录用户异常");
+        }
+        userAddress.setUserId(Integer.parseInt(userApp.getUserId().toString()));
+        userAddressService.saveOrUpdate(userAddress);
+        return ResultGenerator.genSuccessResult("操作成功",null);
+    }
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/bill/BillStatisticsController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/bill/BillStatisticsController.java
new file mode 100644
index 0000000..5d06f98
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/bill/BillStatisticsController.java
@@ -0,0 +1,106 @@
+package cn.pluss.platform.controller.bill;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.bill.BillSendRecordService;
+import cn.pluss.platform.bill.MemberTransStatisticsService;
+import cn.pluss.platform.bill.MerchantBillStatisticsService;
+import cn.pluss.platform.entity.BillSendRecord;
+import cn.pluss.platform.entity.MemberTransStatistics;
+import cn.pluss.platform.entity.MerchantBillStatistics;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.userApp.UserAppService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.Setter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.math.BigDecimal;
+import java.util.Objects;
+
+/**
+ * 商户账单统计
+ * @author DJH
+ */
+@RestController
+@RequestMapping("/bill")
+public class BillStatisticsController {
+
+    @Setter(onMethod_ = {@Autowired})
+    private UserAppService userAppService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantBillStatisticsService billStatisticsService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MemberTransStatisticsService memberTransStatisticsService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private BillSendRecordService billSendRecordService;
+
+    @GetMapping("/page")
+    public Result<Page<MerchantBillStatistics>> historyDayBill(Page<MerchantBillStatistics> page, MerchantBillStatistics condition, OrderItem orderItem) {
+        UserApp tokenUa = userAppService.queryUserAppByToken();
+        if ("staff".equals(tokenUa.getUserType()) && !Objects.equals(tokenUa.getPermissionBill(), "1")) {
+            return ResultGenerator.genSuccessResult(new Page<>());
+        }
+        page.getOrders().clear();
+        page.getOrders().add(orderItem);
+        Page<MerchantBillStatistics> pageData = billStatisticsService.page(page, new QueryWrapper<>(condition));
+        return ResultGenerator.genSuccessResult(pageData);
+    }
+
+    /**
+     * 查询历史会员账单流水
+     * @param page          分页数据
+     * @param condition     查询条件
+     * @param orderItem     排序条件
+     * @return
+     */
+    @GetMapping("/member/history/page")
+    public Result<Page<MemberTransStatistics>> historyMemberBill(Page<MemberTransStatistics> page, MemberTransStatistics condition, OrderItem orderItem) {
+        UserApp userApp = userAppService.queryUserAppByToken();
+        if ("staff".equals(userApp.getUserType()) && !Objects.equals(userApp.getPermissionBill(), "1")) {
+            return ResultGenerator.genSuccessResult(new Page<>());
+        }
+
+        page.getOrders().clear();
+        page.getOrders().add(orderItem);
+        condition.setUserId(userApp.getUserId().intValue());
+        Page<MemberTransStatistics> pageData = memberTransStatisticsService.page(page, new QueryWrapper<>(condition));
+        return ResultGenerator.genSuccessResult(pageData);
+    }
+
+    @GetMapping("/member/current")
+    public Result<MemberTransStatistics> currentDuringMemberBill(MemberTransStatistics condition) {
+        UserApp userApp = userAppService.queryUserAppByToken();
+        condition.setUserId(userApp.getUserId().intValue());
+
+        MemberTransStatistics result = memberTransStatisticsService.currentDuringBill(condition);
+        if (result == null) {
+            result = new MemberTransStatistics();
+            result.setUserId(userApp.getUserId().intValue());
+            result.setConsumeAmount(BigDecimal.ZERO);
+            result.setGiveAmount(BigDecimal.ZERO);
+            result.setRechargeAmount(BigDecimal.ZERO);
+        }
+
+        return ResultGenerator.genSuccessResult(result);
+    }
+
+    @PostMapping("/reqSendBill")
+    public Result<Object> reqSendBill(@RequestBody BillSendRecord entity) {
+        billSendRecordService.reqBill(entity);
+        return ResultGenerator.genSuccessResult("操作成功，报表会在5分钟内发送到该邮箱", null);
+    }
+
+    @GetMapping("/sendBillRecord/page")
+    public Result<Page<BillSendRecord>> page(Page<BillSendRecord> page, BillSendRecord condition, OrderItem orderItem) {
+        page.getOrders().clear();
+        page.getOrders().add(orderItem);
+        Page<BillSendRecord> pageData = billSendRecordService.page(page, new QueryWrapper<>(condition));
+        return ResultGenerator.genSuccessResult(pageData);
+    }
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/common/CustomErrorController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/common/CustomErrorController.java
new file mode 100644
index 0000000..8c7d3ff
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/common/CustomErrorController.java
@@ -0,0 +1,49 @@
+package cn.pluss.platform.controller.common;
+
+import cn.pluss.platform.exception.MsgException;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.autoconfigure.web.ServerProperties;
+import org.springframework.boot.autoconfigure.web.servlet.error.BasicErrorController;
+import org.springframework.boot.web.servlet.error.DefaultErrorAttributes;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @author djh
+ * 定义一些异常的httpStatus
+ */
+@Slf4j
+@RequestMapping("/error")
+@RestController
+public class CustomErrorController extends BasicErrorController {
+
+    public CustomErrorController(ServerProperties serverProperties) {
+        super(new DefaultErrorAttributes(), serverProperties.getError());
+    }
+
+    @Override
+    public ResponseEntity<Map<String, Object>> error(HttpServletRequest request) {
+        HttpStatus status = getStatus(request);
+
+        if (Objects.equals(status, HttpStatus.NOT_FOUND)) {
+            // 这里抛出异常让全局异常处理器去处理
+            throw new MsgException("请稍后重试");
+        }
+
+        log.error("未知错误：{}", status.toString());
+        throw new MsgException("未知错误");
+    }
+
+    @Override
+    public ModelAndView errorHtml(HttpServletRequest request, HttpServletResponse response) {
+        throw new MsgException("请稍后重试");
+    }
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/common/ImageUploadController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/common/ImageUploadController.java
new file mode 100644
index 0000000..089961a
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/common/ImageUploadController.java
@@ -0,0 +1,44 @@
+package cn.pluss.platform.controller.common;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.util.Base64Util;
+import cn.pluss.platform.util.OssOperatUtil;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.UUID;
+
+/**
+ * @author DJH
+ */
+@RestController
+@RequestMapping("/imageUpload")
+public class ImageUploadController {
+
+    @PostMapping("/base64")
+    public Result<?> imageUpload(String base64) {
+        final InputStream inputStream = Base64Util.base64ToInputStream(base64);
+        final String url = OssOperatUtil.upload(inputStream, UUID.randomUUID().toString().replace("-", ""), "png");
+
+        return ResultGenerator.genSuccessResult(url);
+    }
+
+    @PostMapping("")
+    public Result<?> imageUpload(@RequestParam("file") MultipartFile file) {
+        final String url;
+        try {
+            url = OssOperatUtil.upload(file.getInputStream(), UUID.randomUUID().toString().replace("-", ""), "png");
+        } catch (IOException e) {
+            throw new MsgException("文件读取异常");
+        }
+
+        return ResultGenerator.genSuccessResult(url);
+    }
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/device/DeviceStockController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/device/DeviceStockController.java
new file mode 100644
index 0000000..19de262
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/device/DeviceStockController.java
@@ -0,0 +1,98 @@
+package cn.pluss.platform.controller.device;
+
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.deviceStock.DeviceStockService;
+import cn.pluss.platform.dto.DeviceStockDTO;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.vo.DeviceNumVO;
+import cn.pluss.platform.vo.DeviceStockVO;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * <p>
+ * 设备库存controller
+ * </p>
+ *
+ * @author bzg
+ * @since 2020-11-11
+ */
+@RestController
+@RequestMapping("/device/stock")
+public class DeviceStockController{
+
+    @Resource
+    private UserAppService userAppService;
+
+    @Resource
+    private DeviceStockService dsService;
+
+    /**
+     * 获取设备统计详情
+     * @return
+     */
+    @GetMapping(value = "/count")
+    public Result<DeviceNumVO> count(DeviceStockDTO dto){
+        DeviceNumVO vo = dsService.getStockTypeNumList(dto);
+        return ResultGenerator.genSuccessResult("获取成功",vo);
+    }
+
+    /**
+     * 分页查询指定设备类型设备信息
+     * @param dto
+     * @return
+     */
+    @GetMapping(value = "/code/page")
+    public Result<Page<DeviceStockVO>> codePage(Page<DeviceStockVO> page, DeviceStockDTO dto){
+        UserApp userApp = userAppService.checkApiToken();
+        dto.setUserId(String.valueOf(userApp.getUserId()));
+        MsgException.checkBlank(dto.getCode(),"设备code不能为空");
+        page = dsService.pageInfo(page,dto);
+        return ResultGenerator.genSuccessResult("获取成功",page);
+    }
+
+    /**
+     * 查询设备详情
+     * @param dto
+     * @return
+     */
+    @GetMapping(value = "/detail")
+    public Result<DeviceStockVO> detail(DeviceStockDTO dto){
+        DeviceStockVO vo = dsService.detail(dto);
+        return ResultGenerator.genSuccessResult("获取成功",vo);
+    }
+
+    /**
+     * 获取商户信息
+     * @param dto
+     * @return
+     */
+    @GetMapping(value = "/mercInfo")
+    public Result<DeviceStockVO> mercInfo(DeviceStockDTO dto){
+        DeviceStockVO vo = dsService.getMercInfo(dto);
+        return ResultGenerator.genSuccessResult("获取成功",vo);
+    }
+
+    @GetMapping("/pageMercDevice")
+    public Result<Page<DeviceStockVO>> pageMercDevice(Page<DeviceStockVO> page, Long cashPlaceId) {
+        Page<DeviceStockVO> data = dsService.apiPageMercDevice(page, cashPlaceId);
+        return ResultGenerator.genSuccessResult("获取成功", data);
+    }
+
+    /**
+     *
+     * @param dto
+     * @return
+     */
+    @PostMapping(value = "/bind")
+    public Result<Object> bindV2(@RequestBody DeviceStockDTO dto){
+        dsService.bindDevcieV2(dto);
+        return ResultGenerator.genSuccessResult("绑定成功",null);
+    }
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/device/DeviceTransferController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/device/DeviceTransferController.java
new file mode 100644
index 0000000..acbea17
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/device/DeviceTransferController.java
@@ -0,0 +1,109 @@
+package cn.pluss.platform.controller.device;
+
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.device.DeviceOperateInfoService;
+import cn.pluss.platform.device.DeviceTransferService;
+import cn.pluss.platform.dto.DeviceTransferDTO;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.util.StringUtil;
+import cn.pluss.platform.vo.DeviceOperateInfoVO;
+import cn.pluss.platform.vo.DeviceTransferVO;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * <p>
+ * 设备库存controller
+ * </p>
+ *
+ * @author bzg
+ * @since 2020-11-11
+ */
+@RestController
+@RequestMapping("/device")
+public class DeviceTransferController {
+
+    @Resource
+    private UserAppService userAppService;
+
+    @Resource
+    private DeviceTransferService dtfService;
+
+    @Resource
+    private DeviceOperateInfoService doiService;
+
+    /**
+     * 设备划拨接口
+     *
+     * @return
+     */
+    @PostMapping(value = "transfer")
+    public Result<Object> transfer(@RequestBody DeviceTransferDTO dto) {
+        dtfService.transfer(dto);
+        return ResultGenerator.genSuccessResult("操作成功", null);
+    }
+
+    /**
+     * 设备接收接口
+     *
+     * @param dto
+     * @return
+     */
+    @PostMapping(value = "accept")
+    public Result<Object> accept(@RequestBody DeviceTransferDTO dto) {
+        dtfService.accept(dto);
+        return ResultGenerator.genSuccessResult("操作成功", null);
+    }
+
+
+    /**
+     * 划拨记录分页查询
+     *
+     * @param dto
+     * @return
+     */
+    @GetMapping(value = "/transfer/page")
+    public Result<Page<DeviceTransferVO>> page(Page<DeviceTransferVO> page, DeviceTransferDTO dto) {
+        UserApp userApp = userAppService.checkApiToken();
+        if (dto.getType().equals(DeviceTransferDTO.OUT)) {
+            page.getOrders().add(OrderItem.desc("transferTime"));
+        }
+
+        if (dto.getType().equals(DeviceTransferDTO.GET)) {
+            page.getOrders().add(OrderItem.desc("acceptTime"));
+        }
+
+        if (StringUtil.isEmpty(dto.getType()) || DeviceTransferDTO.OUT.equals(dto.getType())) {
+            dto.setUserId(userApp.getUserId());
+        } else {
+            dto.setAcceptUserId(userApp.getUserId());
+        }
+        page = dtfService.pageInfo(page, dto);
+        return ResultGenerator.genSuccessResult("获取成功", page);
+    }
+
+    @GetMapping(value = "/transfer/detail")
+    public Result<Object> page(DeviceTransferDTO dto) {
+        DeviceTransferVO vo = dtfService.getDetail(dto);
+        return ResultGenerator.genSuccessResult("获取成功", vo);
+    }
+
+    /**
+     * 获取设备流转详情
+     *
+     * @param dto
+     * @return
+     */
+    @GetMapping(value = "/operate/info")
+    public Result<Object> operateInfo(DeviceTransferDTO dto) {
+        List<DeviceOperateInfoVO> list = doiService.selectListVoByDeviceNo(dto.getSnNo());
+        return ResultGenerator.genSuccessResult("获取成功", list);
+    }
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/device/MercOrderExpressController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/device/MercOrderExpressController.java
new file mode 100644
index 0000000..82879df
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/device/MercOrderExpressController.java
@@ -0,0 +1,20 @@
+package cn.pluss.platform.controller.device;
+
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * TODO
+ *
+ * @author crystal
+ * @date 2022/3/24 17:37
+ */
+@Validated
+@RestController
+@RequestMapping(value = "orderExpress")
+public class MercOrderExpressController {
+
+
+
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/jft/JftAuditController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/jft/JftAuditController.java
new file mode 100644
index 0000000..ad7846d
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/jft/JftAuditController.java
@@ -0,0 +1,160 @@
+package cn.pluss.platform.controller.jft;
+
+import cn.pluss.platform.annotation.Cert;
+import cn.pluss.platform.annotation.ThirdAuth;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.converter.Converter;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.jft.*;
+import cn.pluss.platform.merchant.JftMercPaymentChannelService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.vo.JftMercPaymentChannelVO;
+import cn.pluss.platform.vo.MercInfoVO;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author DJH
+ */
+@Cert
+@ThirdAuth
+@RestController
+@RequestMapping("/jftAudit")
+public class JftAuditController {
+
+    @Autowired
+    private JftBankCardService jftBankCardService;
+
+    @Autowired
+    private JftAuditService jftAuditService;
+
+    @Autowired
+    private JftMercBaseInfoService jmbiService;
+
+    @Autowired
+    private JftMercPaymentChannelService jpcService;
+
+    @Autowired
+    private UserAppService uaService;
+
+    @Autowired
+    private JftMerchantRateService jmrService;
+
+    @Autowired
+    private JftMerchantRateRecordService jmrrService;
+
+    @RequestMapping(value = "/status", method = {RequestMethod.GET, RequestMethod.POST})
+    public Result<?> auditStatus() {
+        final UserApp tokenUa = uaService.queryUserAppByToken();
+        JftMercPaymentChannel jpc = jpcService.getByUserId(tokenUa.getUserId());
+
+        if (jpc == null) {
+            jpc = new JftMercPaymentChannel();
+            jpc.setStatus("0");
+        }
+
+        return ResultGenerator.genSuccessResult(jpc);
+    }
+
+    @RequestMapping(value = "/auditStatus", method = {RequestMethod.GET, RequestMethod.POST})
+    public Result<?> auditStatus2() {
+        final UserApp tokenUa = uaService.queryUserAppByToken();
+        JftMercPaymentChannel jpc = jpcService.getByUserId(tokenUa.getUserId());
+
+        jpc = Converter.INSTANCE.toVO(jpc);
+        if (jpc == null) {
+            jpc = new JftMercPaymentChannelVO();
+            jpc.setStatus("0");
+        }
+
+        return ResultGenerator.genSuccessResult(jpc);
+    }
+
+    @RequestMapping(value = "/mercInfo", method = {RequestMethod.GET, RequestMethod.POST})
+    public Result<MercInfoVO> mercInfo() {
+        MercInfoVO mercInfoVO = jmbiService.apiGetMercInfo();
+        return ResultGenerator.genSuccessResult(mercInfoVO);
+    }
+
+    @PostMapping("/saveBankCard")
+    public Result<?> saveBankCard(@RequestBody @Validated(JftBankCard.Common.class) JftBankCard jftBankCard) {
+        jftBankCardService.apiSaveBankCard(jftBankCard);
+
+        return ResultGenerator.genSuccessResult("操作成功");
+    }
+
+    @RequestMapping(value = "/account", method = {RequestMethod.GET, RequestMethod.POST})
+    public Result<?> accountInfo() {
+        final Map<String, Object> result = jftBankCardService.apiGetAccount();
+
+        return ResultGenerator.genSuccessResult(result);
+    }
+
+    @PostMapping("/changeBankCard")
+    public Result<?> changeJftBankCard(@RequestBody @Validated(JftBankCard.Common.class) JftBankCard jftBankCard) {
+        jftBankCardService.apiChangeBankCard(jftBankCard);
+
+        return ResultGenerator.genSuccessResult("操作成功", null);
+    }
+
+    @PostMapping("/audit")
+    public Result<?> jftAudit() {
+        jftAuditService.apiAudit();
+
+        return ResultGenerator.genSuccessResult("操作成功", null);
+    }
+
+    @PostMapping("/saveBaseInfo")
+    public Result<?> jftBaseInfo(@RequestBody @Validated(JftMercBaseInfo.Common.class) JftMercBaseInfo jftMercBaseInfo) {
+        jmbiService.apiSaveMercBaseInfo(jftMercBaseInfo);
+
+        if (!"0".equals(jftMercBaseInfo.getAutoFlag())) {
+            jftAuditService.apiAudit();
+        }
+
+        return ResultGenerator.genSuccessResult("操作成功", null);
+    }
+
+    @RequestMapping(value = "/getBaseInfo", method = {RequestMethod.GET, RequestMethod.POST})
+    public Result<?> getBaseInfo() {
+        UserApp ua = uaService.queryUserAppByToken();
+        final JftMercBaseInfo mercBaseInfo = jmbiService.getMercBaseInfo(ua.getUserId());
+
+        return ResultGenerator.genSuccessResult("操作成功", mercBaseInfo);
+    }
+
+    @GetMapping("/mercRate")
+    public Result<?> mercRate() {
+        UserApp ua = uaService.queryUserAppByToken();
+        final JftMerchantRate jftMerchantRate = jmrService.getRateByUserId(ua.getUserId());
+
+        return ResultGenerator.genSuccessResult("操作成功", jftMerchantRate);
+    }
+
+    @GetMapping("/mercRateRecord")
+    public Result<?> mercRateRecord() {
+        final UserApp tokenUa = uaService.queryUserAppByToken();
+        JftMercPaymentChannel channel = jpcService.getByUserId(tokenUa.getUserId());
+        if(channel == null){
+            return ResultGenerator.genFailResult("该商户暂未入网，费率变更记录获取失败");
+        }
+        LambdaQueryWrapper<JftMerchantRateRecord> qWrapper = Wrappers.lambdaQuery();
+        qWrapper.eq(JftMerchantRateRecord::getMerchantId, channel.getMerchantId());
+        qWrapper.orderByDesc(JftMerchantRateRecord::getCreateTime);
+        final List<JftMerchantRateRecord> result = jmrrService.list(qWrapper);
+        return ResultGenerator.genSuccessResult(result);
+    }
+
+    @PostMapping("/mercRate")
+    public Result<?> mercRate(@Validated @RequestBody JftMerchantRate rate) {
+        int i = jmrService.apiSaveRate(rate);
+        return ResultGenerator.genSuccessResult(i);
+    }
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/jft/JftController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/jft/JftController.java
new file mode 100644
index 0000000..b72ff2f
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/jft/JftController.java
@@ -0,0 +1,156 @@
+package cn.pluss.platform.controller.jft;
+
+import cn.pluss.platform.annotation.Cert;
+import cn.pluss.platform.annotation.ThirdAuth;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.dto.jft.JftReceiptOrderDTO;
+import cn.pluss.platform.entity.JftPaymentInfo;
+import cn.pluss.platform.entity.JftReceiptInfo;
+import cn.pluss.platform.entity.JftSmallClass;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.jft.JftPaymentInfoService;
+import cn.pluss.platform.jft.JftReceiptInfoService;
+import cn.pluss.platform.jft.JftReceiptOrderService;
+import cn.pluss.platform.jft.JftSmallClassService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.vo.JftReceiptInfoVO;
+import cn.pluss.platform.vo.JftReceiptOrderVO;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * TODO
+ * 缴费通业务处理入口
+ * @author crystal
+ * @date 2022/6/16 12:07
+ */
+@Cert
+@ThirdAuth
+@RestController
+@RequestMapping(value = "/jft")
+public class JftController {
+
+    @Resource
+    private JftReceiptInfoService jftReceiptInfoService;
+
+    @Resource
+    private UserAppService userAppService;
+
+    @Resource
+    private JftPaymentInfoService jftPaymentInfoService;
+
+    @Resource
+    private JftReceiptOrderService jftReceiptOrderService;
+
+    @Resource
+    private JftSmallClassService jftSmallClassService;
+
+    /**
+     * 创建收款单接口
+     * @param info
+     * @return
+     */
+    @PostMapping(value = "/create/receipt")
+    public Result<String> createReceipt(JftReceiptInfo info){
+        String url = jftReceiptInfoService.createReceipt(userAppService.checkApiToken(),info);
+        return ResultGenerator.genSuccessResult("创建成功",url);
+    }
+
+    /**
+     * 缴费通收款单分页查询
+     * @param condition
+     * @return
+     */
+    @GetMapping(value = "/receipt/page")
+    public Result<Page<JftReceiptInfoVO>> receiptPage(Page<JftReceiptInfoVO> page, JftReceiptInfo condition){
+        UserApp userApp = userAppService.checkApiToken();
+        condition.setUserId(userApp.getUserId());
+        page = jftReceiptInfoService.pageInfo(page,condition);
+        return ResultGenerator.genSuccessResult("获取成功",page);
+    }
+
+    /**
+     * 关闭收款单
+     * @param info
+     * @return
+     */
+    @PostMapping(value = "/close/receipt")
+    public Result<String> closeReceipt(JftReceiptInfo info){
+        userAppService.checkApiToken();
+        jftReceiptInfoService.closeReceipt(info);
+        return ResultGenerator.genSuccessResult("关闭成功",null);
+    }
+
+    /**
+     * 收款单详情
+     * @param info
+     * @return
+     */
+    @RequestMapping(value = "/receipt/detail")
+    public Result<JftReceiptInfoVO> receiptDetail(JftReceiptInfo info){
+        userAppService.checkApiToken();
+        JftReceiptInfoVO vo = jftReceiptInfoService.receiptDetail(info);
+        return ResultGenerator.genSuccessResult("查询成功",vo);
+    }
+
+
+    /**
+     * 查询付款配置项
+     * @return
+     */
+    @RequestMapping(value = "/payment/list")
+    public Result<List<JftPaymentInfo>> paymentList(){
+        userAppService.checkApiToken();
+        List<JftPaymentInfo> list = jftPaymentInfoService.list();
+        return ResultGenerator.genSuccessResult("查询成功",list);
+    }
+
+    /**
+     * 获取收款单对应付款信息配置项接口
+     * @param info
+     * @return
+     */
+    @RequestMapping(value = "/get/receipt")
+    public Result<Object> getReceipt(JftReceiptInfo info){
+        userAppService.checkApiToken();
+        JftReceiptInfoVO vo = jftReceiptInfoService.getReceipt(info);
+        return ResultGenerator.genSuccessResult("获取成功",vo);
+    }
+
+    /**
+     * 创建缴费通订单信息
+     * @param order
+     * @return
+     */
+    @GetMapping(value = "/order/page")
+    public Result<Page<JftReceiptOrderVO>> orderPage(Page<JftReceiptOrderVO> page, JftReceiptOrderDTO order){
+        UserApp userApp = userAppService.checkApiToken();
+        order.setUserId(userApp.getUserId());
+        page = jftReceiptOrderService.pageData(page,order);
+        return ResultGenerator.genSuccessResult("获取成功",page);
+    }
+
+    @PostMapping(value = "/create/order")
+    public Result<Object> createOrder(@RequestBody JftReceiptOrderDTO entity){
+        UserApp userApp = userAppService.checkApiToken();
+        entity.setUserId(userApp.getUserId());
+        JSONObject result = jftReceiptOrderService.createOrder(entity);
+        return ResultGenerator.genSuccessResult("获取成功",result);
+    }
+
+    @GetMapping(value = "/class/page")
+    public Result<Page<JftSmallClass>> orderPage(Page<JftSmallClass> page, JftSmallClass smallClass){
+        userAppService.checkApiToken();
+        QueryWrapper<JftSmallClass> queryWrapper = new QueryWrapper<>(smallClass);
+        queryWrapper.eq("status",JftSmallClass.DEUAULT_STATUS).last(" order by sort desc , createTime desc ");
+        page = jftSmallClassService.page(page,queryWrapper);
+        return ResultGenerator.genSuccessResult("获取成功",page);
+    }
+
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/level/TeamLevelController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/level/TeamLevelController.java
new file mode 100644
index 0000000..cdc74cf
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/level/TeamLevelController.java
@@ -0,0 +1,39 @@
+package cn.pluss.platform.controller.level;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.level.LevelOperateRecordService;
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+ * @author SSS
+ */
+@RequestMapping("/teamLevel")
+@RestController
+public class TeamLevelController {
+    
+    @Autowired
+    private LevelOperateRecordService levelOperateRecordService;
+
+    @GetMapping("/levelBenefitData")
+    public Result<Map<String, Object>> levelBenefitData() {
+        Map<String, Object> resultData = levelOperateRecordService.apiLevelBenefitData();
+        return ResultGenerator.genSuccessResult(resultData);
+    }
+
+    @PostMapping("/changeLevel")
+    public Result<Object> changeLevel(@RequestBody JSONObject param) {
+        levelOperateRecordService.apiChangeLevel(param.getInteger("userId"), param.getString("level"));
+        return ResultGenerator.genSuccessResult("操作成功", null);
+    }
+
+    @GetMapping("/levelBound")
+    public Result<Object> levelBound(String userId) {
+        Map<String, Object> resultMap = levelOperateRecordService.apiLevelBound(userId);
+        return ResultGenerator.genSuccessResult(resultMap);
+    }
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/logist/LogistCallbackController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/logist/LogistCallbackController.java
new file mode 100644
index 0000000..4599c26
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/logist/LogistCallbackController.java
@@ -0,0 +1,27 @@
+package cn.pluss.platform.controller.logist;
+
+import cn.pluss.platform.logist.LogistCallbackHandler;
+import cn.pluss.platform.yt.YtLogisticsEntity;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * 圆通物流回调接口
+ *
+ * @author crystal
+ * @date 2022/3/24 12:00
+ */
+@RestController
+@RequestMapping(value = "/callback")
+public class LogistCallbackController {
+
+    @Resource
+    private LogistCallbackHandler logistHandler;
+    @RequestMapping(value = "/logist/yt")
+    public String logistYt(@ModelAttribute YtLogisticsEntity entity){
+        return logistHandler.execute(entity);
+    }
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/MakeMoneyController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/MakeMoneyController.java
new file mode 100644
index 0000000..5322fdf
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/MakeMoneyController.java
@@ -0,0 +1,41 @@
+package cn.pluss.platform.controller.merchant;
+
+
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.channel.MakeMoneyService;
+import cn.pluss.platform.entity.MakeMoney;
+import cn.pluss.platform.util.SxfConfg;
+import com.alibaba.fastjson.JSONObject;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-09-10
+ */
+@Slf4j
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/makeMoney")
+public class MakeMoneyController extends BaseModelController<MakeMoneyService, MakeMoney> {
+
+    private final MakeMoneyService sxfMakeMoneyService;
+
+    /**
+     * 随行付结算接口回调
+     */
+    @PostMapping("sxfCallback")
+    public JSONObject sxfCallback(@RequestBody JSONObject data) {
+        log.info("=====随行付结算=====\n{}", data);
+        sxfMakeMoneyService.dealCallbackData(data);
+        return SxfConfg.ok();
+    }
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/MercAuthController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/MercAuthController.java
new file mode 100644
index 0000000..63d22b4
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/MercAuthController.java
@@ -0,0 +1,29 @@
+package cn.pluss.platform.controller.merchant;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.baidu.BaiduFaceDetectService;
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author DJH
+ */
+@RestController
+@RequestMapping("/mercAuth")
+public class MercAuthController {
+
+    @Autowired
+    private BaiduFaceDetectService baiduFaceDetectService;
+
+    @PostMapping("/mercFaceDetect")
+    public Result<?> mercFaceDetect(@RequestBody JSONObject params) {
+        baiduFaceDetectService.apiCheckFaceMatch(params.getString("dist"));
+
+        return ResultGenerator.genSuccessResult("验证通过", null);
+    }
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/MercMemberSetController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/MercMemberSetController.java
new file mode 100644
index 0000000..2f04ad2
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/MercMemberSetController.java
@@ -0,0 +1,55 @@
+package cn.pluss.platform.controller.merchant;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.entity.MercMemberSet;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.merchant.MercMemberSetService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.vo.MercMemberSetVO;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/mercMemberSet")
+public class MercMemberSetController {
+
+    @Autowired
+    private MercMemberSetService mmsService;
+
+    @GetMapping
+    public Result<MercMemberSetVO> mercMemberSet() {
+        MercMemberSetVO vo = mmsService.apiSet();
+        return ResultGenerator.genSuccessResult(vo);
+    }
+
+    @GetMapping("/allScopeType")
+    public Result<List<Map<String, Object>>> allScopeType() {
+        List<Map<String, Object>> result = new ArrayList<>();
+        Map<String, Object> map = new HashMap<>();
+        map.put("code", "1");
+        map.put("desc", "线下扫码");
+        result.add(map);
+
+        map = new HashMap<>();
+        map.put("code", "2");
+        map.put("desc", "外卖和扫码点单");
+        result.add(map);
+
+        map = new HashMap<>();
+        map.put("code", "3");
+        map.put("desc", "全部");
+        result.add(map);
+
+        return ResultGenerator.genSuccessResult(result);
+    }
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/MerchAuditController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/MerchAuditController.java
new file mode 100644
index 0000000..12f0d26
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/MerchAuditController.java
@@ -0,0 +1,45 @@
+package cn.pluss.platform.controller.merchant;
+
+import cn.pluss.platform.SubMerchantApplyOrderService;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.entity.SubMerchantApplyOrder;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.userApp.UserAppService;
+import lombok.Setter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author DJH
+ * 认证信息相关接口
+ */
+@RestController
+@RequestMapping("/auditInfo")
+public class MerchAuditController extends BaseModelController<SubMerchantApplyOrderService, SubMerchantApplyOrder> {
+
+    @Setter(onMethod_ = {@Autowired})
+    private UserAppService userAppService;
+
+    /**
+     * 查询商户微信认证信息
+     */
+    @GetMapping("/wxAuditInfo")
+    public Result<Object> getWxAuditInfo() {
+        UserApp userApp = userAppService.queryUserAppByToken();
+        SubMerchantApplyOrder data = baseService.apiGetWxAuditInfo(userApp);
+        return ResultGenerator.genSuccessResult("操作成功", data);
+    }
+
+    /** 微信认证记录标识为完成 */
+    @PostMapping("/complete")
+    public Result<Object> complete() {
+        UserApp userApp = userAppService.queryUserAppByToken();
+        baseService.complete(userApp);
+        return ResultGenerator.genSuccessResult("操作成功", null);
+    }
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/MerchantCashPlaceController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/MerchantCashPlaceController.java
new file mode 100644
index 0000000..4adf5f7
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/MerchantCashPlaceController.java
@@ -0,0 +1,104 @@
+package cn.pluss.platform.controller.merchant;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.entity.MerchantCashPayCode;
+import cn.pluss.platform.entity.MerchantCashPlace;
+import cn.pluss.platform.entity.MerchantCashPlaceStaff;
+import cn.pluss.platform.merchant.MerchantCashPlaceService;
+import cn.pluss.platform.merchant.MerchantCashPlaceStaffService;
+import cn.pluss.platform.vo.MerchantCashPlaceStaffVO;
+import cn.pluss.platform.vo.MerchantCashPlaceVO;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.Setter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author DJH
+ */
+@RestController
+@RequestMapping("/merchantCashPlace")
+public class MerchantCashPlaceController {
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantCashPlaceService cashPlaceService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantCashPlaceStaffService cashPlaceStaffService;
+
+    @PostMapping
+    public Result<Object> add(@RequestBody MerchantCashPlace merchantCashPlace) {
+        cashPlaceService.saveOrUpdate(merchantCashPlace);
+        return ResultGenerator.genSuccessResult("保存成功", merchantCashPlace);
+    }
+
+    @GetMapping("/{code}")
+    public Result<Object> delByCode(@PathVariable("code") String code) {
+        cashPlaceService.delByCodeForApp(code);
+        return ResultGenerator.genSuccessResult("操作成功", null);
+    }
+
+    @GetMapping("/list")
+    public Result<Object> list(Long current, Long size, MerchantCashPlace merchantCashPlace) {
+        Page<MerchantCashPlace> page = new Page<>();
+        if (current == null) {
+            page.setSize(100);
+        } else {
+            page.setCurrent(current);
+            page.setSize(size);
+        }
+        List<MerchantCashPlaceVO> result = cashPlaceService.getListForApp(page, merchantCashPlace);
+        return ResultGenerator.genSuccessResult(result);
+    }
+
+    @PostMapping("/payCode")
+    public Result<Object> bindPayCode(@RequestBody MerchantCashPayCode merchantCashPayCode) {
+        cashPlaceService.bindPayCode(merchantCashPayCode);
+        return ResultGenerator.genSuccessResult("操作成功", null);
+    }
+
+    @GetMapping("/payCode/{payCode}")
+    public Result<Object> unbindPayCode(@PathVariable("payCode") String payCode) {
+        cashPlaceService.unbindPayCode(payCode);
+        return ResultGenerator.genSuccessResult("操作成功", null);
+    }
+
+
+    @PostMapping("/payCode/online")
+    public Result<Object> online(@RequestBody Map<String, Object> map) {
+        Long userId = Long.parseLong((String) map.get("userId"));
+        String cashPlaceCode = (String) map.get("cashPlaceCode");
+        cashPlaceStaffService.bindCashPlace(userId, cashPlaceCode);
+
+        return ResultGenerator.genSuccessResult("操作成功", null);
+    }
+
+    @GetMapping("/payCode/offline/{userId}")
+    public Result<Object> offline(@PathVariable("userId") Long userId) {
+        cashPlaceStaffService.offLine(userId);
+        return ResultGenerator.genSuccessResult("操作成功", null);
+    }
+
+    @GetMapping("/payCode/status/{payCode}")
+    public Result<Object> status(@PathVariable("payCode") String payCode) {
+        MerchantCashPlaceStaffVO result = cashPlaceService.getStatusByPayCode(payCode);
+        return ResultGenerator.genSuccessResult(result);
+    }
+
+    @GetMapping("/payCode/staff/{staffId}")
+    public Result<Object> statusByStaffCode(@PathVariable("staffId") String staffId) {
+        MerchantCashPlaceStaffVO result = cashPlaceService.getStatusByStaffId(staffId);
+        return ResultGenerator.genSuccessResult(result);
+    }
+
+    @GetMapping("/record")
+    public Result<Object> record(Page<MerchantCashPlaceStaff> page, MerchantCashPlaceStaff condition, OrderItem orderItem) {
+        Page<MerchantCashPlaceStaffVO> pageData = cashPlaceStaffService.getRecord(page, condition, orderItem);
+        return ResultGenerator.genSuccessResult(pageData);
+    }
+}
\ No newline at end of file
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/MerchantChannelStatusController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/MerchantChannelStatusController.java
new file mode 100644
index 0000000..b92822f
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/MerchantChannelStatusController.java
@@ -0,0 +1,45 @@
+package cn.pluss.platform.controller.merchant;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.vo.ChannelStatusVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+ * @author djh
+ */
+@RestController
+@RequestMapping("/channelStatus")
+public class MerchantChannelStatusController {
+
+    @Autowired
+    private MerchantChannelStatusService channelStatusService;
+
+    @GetMapping("/quickCash")
+    public Result<ChannelStatusVO> entity() {
+        ChannelStatusVO csVO = channelStatusService.appQuickCash();
+        return ResultGenerator.genSuccessResult(csVO);
+    }
+
+    @GetMapping("/current")
+    public Result<ChannelStatusVO> current() {
+        ChannelStatusVO csVO = channelStatusService.appCurrent();
+        return ResultGenerator.genSuccessResult(csVO);
+    }
+
+    /**
+     * 快速到账通道和常规通道切换
+     * @param params 通道标识，目前是0：常规通道， 1： 快速到账通道
+     * @return  切换后的通道记录
+     */
+    @PostMapping("/channelSwitch")
+    public Result<ChannelStatusVO> switchChannel(@RequestBody Map<String, Object> params) {
+        String flag = (String) params.get("flag");
+        ChannelStatusVO channelStatusVO = channelStatusService.appSwitchChannel(Integer.parseInt(flag));
+        return ResultGenerator.genSuccessResult(channelStatusVO);
+    }
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/MerchantPluginController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/MerchantPluginController.java
new file mode 100644
index 0000000..a52a417
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/MerchantPluginController.java
@@ -0,0 +1,95 @@
+package cn.pluss.platform.controller.merchant;
+
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.entity.MerchantPlugin;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.merchant.MerchantPluginService;
+import cn.pluss.platform.userApp.UserAppService;
+import lombok.Setter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 商户插件表 前端控制器
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-01-29
+ */
+@RestController
+@RequestMapping("/merchantPlugin")
+public class MerchantPluginController extends BaseModelController<MerchantPluginService, MerchantPlugin> {
+
+    @Setter(onMethod_ = { @Autowired })
+    private UserAppService userAppService;
+
+    /**
+     * 获取插件进件状态
+     * @return
+     */
+    @GetMapping("/info")
+    public Result<Object> getAuditStatus() {
+        UserApp userApp = userAppService.queryUserAppByToken();
+        Map<String, Object> result = baseService.getInfo(userApp.getUserId().toString());
+        return ResultGenerator.genSuccessResult(result);
+    }
+
+    @PostMapping("/reqAudit")
+    public Result<Object> reqAudit() {
+        UserApp userApp = userAppService.queryUserAppByToken();
+        baseService.reqAudit(userApp.getUserId().toString());
+        return ResultGenerator.genSuccessResult("操作成功", null);
+    }
+
+    @GetMapping("/pluginGuideList")
+    public Result<Object> pluginGuideList() {
+        List<Map<String, Object>> arr = new ArrayList<>();
+        Map<String, Object> option = new HashMap<>();
+        /*
+         * 申请开通丨收银插件申请步骤、补贴活动https://t.1yb.co/h1ox
+         *
+         * 账单查询丨收银插件账单手机查询教程https://t.1yb.co/h1ow
+         *
+         * 收银插件丨下载安装插件流程及注意事项https://t.1yb.co/h1oy
+         *
+         * 收银插件丨插件功能详细使用教程https://t.1yb.co/h1oz
+         */
+
+        option.put("title", "申请开通丨收银插件申请步骤、补贴活动");
+        option.put("icon", "https://syb-resource.oss-cn-hangzhou.aliyuncs.com/upload/app/F3569A5641904DFFA4A6E6BC39277AC2?Expires=1927883734&OSSAccessKeyId=LTAI4G25PY4Tebxq4gCrhtF5&Signature=yMyuEjFybo7kdQ1vmTqRFGueySM%3D");
+        option.put("url", "https://t.1yb.co/h1ox");
+        arr.add(option);
+
+        option = new HashMap<>();
+        option.put("title", "账单查询丨收银插件账单手机查询教程");
+        option.put("icon", "https://syb-resource.oss-cn-hangzhou.aliyuncs.com/upload/app/F3569A5641904DFFA4A6E6BC39277AC2?Expires=1927883734&OSSAccessKeyId=LTAI4G25PY4Tebxq4gCrhtF5&Signature=yMyuEjFybo7kdQ1vmTqRFGueySM%3D");
+        option.put("url", "https://t.1yb.co/h1ow");
+        arr.add(option);
+
+        option = new HashMap<>();
+        option.put("title", "收银插件丨下载安装插件流程及注意事项");
+        option.put("icon", "https://syb-resource.oss-cn-hangzhou.aliyuncs.com/upload/app/F3569A5641904DFFA4A6E6BC39277AC2?Expires=1927883734&OSSAccessKeyId=LTAI4G25PY4Tebxq4gCrhtF5&Signature=yMyuEjFybo7kdQ1vmTqRFGueySM%3D");
+        option.put("url", "https://t.1yb.co/h1oy");
+        arr.add(option);
+
+        option = new HashMap<>();
+        option.put("title", "收银插件丨插件功能详细使用教程");
+        option.put("icon", "https://syb-resource.oss-cn-hangzhou.aliyuncs.com/upload/app/F3569A5641904DFFA4A6E6BC39277AC2?Expires=1927883734&OSSAccessKeyId=LTAI4G25PY4Tebxq4gCrhtF5&Signature=yMyuEjFybo7kdQ1vmTqRFGueySM%3D");
+        option.put("url", "https://t.1yb.co/h1oz");
+        arr.add(option);
+
+        return ResultGenerator.genSuccessResult(arr);
+    }
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/MerchantRateNewController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/MerchantRateNewController.java
new file mode 100644
index 0000000..603ef3b
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/MerchantRateNewController.java
@@ -0,0 +1,58 @@
+package cn.pluss.platform.controller.merchant;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.dto.MerchantRateNewDTO;
+import cn.pluss.platform.dto.MerchantRateNewRecordDTO;
+import cn.pluss.platform.entity.MerchantRateNewRecord;
+import cn.pluss.platform.merchant.MerchantRateNewRecordService;
+import cn.pluss.platform.merchant.MerchantRateNewService;
+import cn.pluss.platform.vo.MerchantRateNewRecordVO;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.math.BigDecimal;
+import java.util.Map;
+
+/**
+ * 商户费率相关接口，新
+ * @author djh
+ */
+@RequestMapping("merchantRateNew")
+@RestController
+public class MerchantRateNewController {
+
+    @Autowired
+    private MerchantRateNewService rateNewService;
+
+    @Autowired
+    private MerchantRateNewRecordService newRecordService;
+
+    @GetMapping("/rate")
+    public Result<Object> rate(String userId) {
+        Map<String, Object> rateMap = rateNewService.apiGetRate(userId);
+        return ResultGenerator.genSuccessResult(rateMap);
+    }
+
+    @PostMapping("/rate")
+    public Result<Object> rate(@RequestBody MerchantRateNewDTO params) {
+        if (params.getBankRateLargeD0() != null) {
+            params.setBankRateLargeD0(new BigDecimal("0.61"));
+        }
+
+        if (params.getBankRateLargeD1() != null) {
+            params.setBankRateLargeD1(new BigDecimal("0.61"));
+        }
+
+        rateNewService.apiChangeMerchantRateNew(params);
+        return ResultGenerator.genSuccessResult("费率修改请求已提交", null);
+    }
+
+
+    @GetMapping("/record")
+    public Result<Object> rate(Page<MerchantRateNewRecord> page, MerchantRateNewRecordDTO entity) {
+        Page<MerchantRateNewRecordVO> result = newRecordService.apiPage(page, entity);
+        return ResultGenerator.genSuccessResult("操作成功", result);
+    }
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/WxCertController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/WxCertController.java
new file mode 100644
index 0000000..7ec520d
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/WxCertController.java
@@ -0,0 +1,78 @@
+package cn.pluss.platform.controller.merchant;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.entity.SystemConfig;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.systemConfig.SystemConfigService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.util.ComUtil;
+import cn.pluss.platform.vo.WxCertInfoVO;
+import cn.pluss.platform.wx.WxCertService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * @author DJH
+ */
+@RequestMapping("/wxCert")
+@RestController
+public class WxCertController {
+
+    @Autowired
+    private SystemConfigService systemConfigService;
+
+    @Autowired
+    private UserAppService userAppService;
+
+    @Autowired
+    private WxCertService wxCertService;
+
+    /**
+     * 获取所有微信认证信息、包含D0、D1
+     * @return  微信认证信息
+     */
+    @GetMapping("/wxCertInfoList")
+    public Result<List<WxCertInfoVO>> getWxCertInfoList() {
+        UserApp tokenUa = userAppService.queryUserAppByToken();
+        List<WxCertInfoVO> result = wxCertService.wxCertInfo(tokenUa.getUserId() + "");
+        return ResultGenerator.genSuccessResult(result);
+    }
+
+    /**
+     * 获取所有微信认证信息、包含D0、D1
+     * @return  微信认证信息
+     */
+    @GetMapping("/wxCertInfo")
+    public Result<WxCertInfoVO> getWxCertInfo(String channelType) {
+        UserApp tokenUa = userAppService.queryUserAppByToken();
+        WxCertInfoVO result = wxCertService.wxCertInfo(tokenUa.getUserId() + "", channelType);
+        return ResultGenerator.genSuccessResult(result);
+    }
+
+    @GetMapping("/wxCertGuide")
+    public void wxCertGuide(HttpServletResponse response) {
+        SystemConfig systemConfig = new SystemConfig();
+        systemConfig.setPropertyKey("wxCertGuideUrl");
+        SystemConfig one = systemConfigService.getOne(new QueryWrapper<>(systemConfig).last("limit 1"));
+
+        Result<SystemConfig> result = ResultGenerator.genSuccessResult("未配置页面", one);
+        if (one == null) {
+            ComUtil.responseResult(response, result);
+            return;
+        }
+
+        try {
+            response.sendRedirect(one.getPropertyValue());
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/WxController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/WxController.java
new file mode 100644
index 0000000..4598c36
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/WxController.java
@@ -0,0 +1,71 @@
+package cn.pluss.platform.controller.merchant;
+
+import cn.pluss.platform.entity.SubMerchantApplyOrder;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.SubMerchantApplyOrderMapper;
+import com.aliyuncs.utils.StringUtils;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/wx")
+public class WxController {
+
+    private final SubMerchantApplyOrderMapper subMerchantApplyOrderMapper;
+
+    /**
+     * 跳转到微信商户认证图片
+     * @param merchantCode  商户code
+     */
+//    @GetMapping("/img/{merchantCode}")
+//    public void img(HttpServletResponse response, @PathVariable("merchantCode") String merchantCode) throws IOException {
+//        SubMerchantApplyOrder subMerchantApplyOrder = new SubMerchantApplyOrder().setMerchantCode(merchantCode);
+//        subMerchantApplyOrder = subMerchantApplyOrderMapper.selectOne(new QueryWrapper<>(subMerchantApplyOrder).orderByDesc("createTime").last("limit 1"));
+//        if (subMerchantApplyOrder == null) {
+//            throw new MsgException("未进行微信实名认证申请");
+//        }
+//
+//        if ("0".equals(subMerchantApplyOrder.getStatus())) {
+//            throw new MsgException("微信实名认证申请审核中");
+//        }
+//
+//        if (StringUtils.isEmpty(subMerchantApplyOrder.getInfoQrcode())) {
+//            throw new MsgException("图片不存在");
+//        }
+//
+//        response.setHeader("content-type", "text/html;charset=UTF-8");
+//        response.getWriter().write("<img src='" + subMerchantApplyOrder.getInfoQrcode() + "' />");
+//    }
+
+    /**
+     * 跳转到微信商户认证图片
+     * @param merchantCode  商户code
+     */
+    @GetMapping("/img/{merchantCode}")
+    public void img(HttpServletResponse response, @PathVariable("merchantCode") String merchantCode, @RequestParam(required = false, value = "i") String channelId) throws IOException {
+        SubMerchantApplyOrder subMerchantApplyOrder = new SubMerchantApplyOrder().setMerchantCode(merchantCode);
+        subMerchantApplyOrder = subMerchantApplyOrderMapper.selectOne(
+                new QueryWrapper<>(subMerchantApplyOrder).orderByDesc("createTime")
+                        .eq("channelId", channelId)
+                        .last("limit 1"));
+        if (subMerchantApplyOrder == null) {
+            throw new MsgException("未进行微信实名认证申请");
+        }
+
+        if ("0".equals(subMerchantApplyOrder.getStatus())) {
+            throw new MsgException("微信实名认证申请审核中");
+        }
+
+        if (StringUtils.isEmpty(subMerchantApplyOrder.getInfoQrcode())) {
+            throw new MsgException("图片不存在");
+        }
+
+        response.setHeader("content-type", "text/html;charset=UTF-8");
+        response.getWriter().write("<img src='" + subMerchantApplyOrder.getInfoQrcode() + "' />");
+    }
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/callback/AuditCallbackController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/callback/AuditCallbackController.java
new file mode 100644
index 0000000..58a1e27
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/callback/AuditCallbackController.java
@@ -0,0 +1,112 @@
+package cn.pluss.platform.controller.merchant.callback;
+
+import cn.hutool.crypto.symmetric.DES;
+import cn.pluss.platform.channel.MerchantAuditService;
+import cn.pluss.platform.entity.RyxAccessModel;
+import cn.pluss.platform.ryx.RyxService;
+import cn.pluss.platform.ys.impl.v20210929.YsConfigV2;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
+
+/**
+ * @author DJH
+ */
+@Slf4j
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/auditCallback")
+public class AuditCallbackController {
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantAuditService sxfMerchantAuditService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantAuditService ryxMerchantAuditService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantAuditService ysAuditService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantAuditService ysAuditServiceV2;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantAuditService ysAuditServiceExtensionV2;
+
+    @Autowired
+    private RyxService ryxService;
+
+    @Autowired
+    private YsConfigV2 ysConfig;
+
+    @PostMapping("sxf")
+    public Map<String, Object> sxfAuditCallback(@RequestBody JSONObject result) throws Exception {
+        return sxfMerchantAuditService.merchantAuditCallback(result);
+    }
+
+    @PostMapping("ys")
+    public String ysAuditCallback(@RequestParam Map<String, Object> result) throws Exception {
+        result = (JSONObject) JSON.toJSON(result);
+        log.info("data: {}", ((JSONObject) result).toJSONString());
+        ysAuditService.merchantAuditCallback((JSONObject) result);
+        return "success";
+    }
+
+    /**
+     * 审核不通过的解密data数据
+     * {"urm":{"sysFlowId":"27202110211044510914671","nogoReason":null,"nogoRemark":"小微缺手持身份证","noticeType":"审核拒绝"}}
+     * 审核通过
+     * {"notifyType":"00","status":"00","urm":{"agtMercId":"801521000001V0S","custId":"2022011320293776","mercAbbr":"华辉建材","mercCnm":"晋江市内坑镇威乐斯建材商行","mercId":"826701889990014","nogoRemark":"开户成功","noticeType":"开户成功","sysFlowId":"27202201131806151642525"}}
+     */
+    @PostMapping("ysV2")
+    public String ysAuditCallbackV2(@RequestBody Map<String, Object> result) throws Exception {
+        DES des = new DES(ysConfig.getEncryptPwd().getBytes(StandardCharsets.UTF_8));
+        String resp = des.decryptStr((String) result.get("data"));
+        JSONObject respJson = JSONObject.parseObject(resp);
+        log.info(resp);
+        ysAuditServiceV2.merchantAuditCallback(respJson);
+        return "success";
+    }
+
+    /**
+     * 审核不通过的解密data数据
+     * {"urm":{"sysFlowId":"27202110211044510914671","nogoReason":null,"nogoRemark":"小微缺手持身份证","noticeType":"审核拒绝"}}
+     * 审核通过
+     * {"notifyType":"00","status":"00","urm":{"agtMercId":"801521000001V0S","custId":"2022011320293776","mercAbbr":"华辉建材","mercCnm":"晋江市内坑镇威乐斯建材商行","mercId":"826701889990014","nogoRemark":"开户成功","noticeType":"开户成功","sysFlowId":"27202201131806151642525"}}
+     */
+    @PostMapping("ysExtensionV2")
+    public String ysExtensionAuditCallbackV2(@RequestBody Map<String, Object> result) throws Exception {
+        DES des = new DES(ysConfig.getEncryptPwd().getBytes(StandardCharsets.UTF_8));
+        String resp = des.decryptStr((String) result.get("data"));
+        JSONObject respJson = JSONObject.parseObject(resp);
+        log.info(resp);
+        ysAuditServiceExtensionV2.merchantAuditCallback(respJson);
+        return "success";
+    }
+
+    @PostMapping("sxf/edit")
+    public Map<String, Object> sxfEditCallback(@RequestBody JSONObject result) throws Exception {
+        return sxfMerchantAuditService.editMerchantCallback(result);
+    }
+
+    @PostMapping("ryx")
+    public Map<String, Object> ryxAuditCallback(@RequestBody JSONObject result) throws Exception {
+        RyxAccessModel ryxAccessModel = JSON.toJavaObject(result, RyxAccessModel.class);
+        JSONObject respResult = ryxService.accessResultDecrypt(ryxAccessModel, JSONObject.class);
+        return ryxMerchantAuditService.merchantAuditCallback(respResult);
+    }
+
+    @PostMapping("ryx/edit")
+    public Map<String, Object> ryxEditCallback(@RequestBody JSONObject result) throws Exception {
+        return ryxMerchantAuditService.editMerchantCallback(result);
+    }
+
+
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/callback/MachineCallbackController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/callback/MachineCallbackController.java
new file mode 100644
index 0000000..7a61544
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/callback/MachineCallbackController.java
@@ -0,0 +1,28 @@
+package cn.pluss.platform.controller.merchant.callback;
+
+import cn.pluss.platform.channel.MchMachineCallbackService;
+import cn.pluss.platform.util.SxfConfg;
+import com.alibaba.fastjson.JSONObject;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Slf4j
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/machineCallback")
+public class MachineCallbackController {
+
+    private final MchMachineCallbackService sxfMchMachineCallbackService;
+
+    @PostMapping("orderCallback")
+    public JSONObject orderCallback(@RequestBody JSONObject param) {
+        log.info("======随行付机具回调======");
+        log.info(param.toJSONString());
+        sxfMchMachineCallbackService.orderCallback(param);
+        return SxfConfg.ok();
+    }
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/callback/WxCertCallbackController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/callback/WxCertCallbackController.java
new file mode 100644
index 0000000..3bc7b90
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/callback/WxCertCallbackController.java
@@ -0,0 +1,28 @@
+package cn.pluss.platform.controller.merchant.callback;
+
+import cn.pluss.platform.channel.MerchantCertService;
+import com.alibaba.fastjson.JSONObject;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+ * 微信认证回调接口
+ * @author Djh
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("wxCertCallback")
+public class WxCertCallbackController {
+
+    @Qualifier("sxfCertService")
+    private final MerchantCertService sxfCertService;
+
+    @PostMapping("sxf")
+    @ResponseBody
+    public Map<String, Object> sxf(@RequestBody JSONObject wxCertResult) {
+        return sxfCertService.wxCertCallback(wxCertResult);
+    }
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/store/MercOrderDetailController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/store/MercOrderDetailController.java
new file mode 100644
index 0000000..7022809
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/store/MercOrderDetailController.java
@@ -0,0 +1,129 @@
+package cn.pluss.platform.controller.store;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.device.MercOrderDetailService;
+import cn.pluss.platform.dto.MercOrderDetailDTO;
+import cn.pluss.platform.entity.MercOrderDetail;
+import cn.pluss.platform.vo.MercOrderExpressVO;
+import cn.pluss.platform.yt.YtCreateOrder;
+import com.alibaba.fastjson.JSONObject;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Arrays;
+
+/**
+ * TODO
+ * 订单相关接口
+ * @author crystal
+ * @date 2022/3/28 14:10
+ */
+@RestController
+@RequestMapping("/mercOrderDetail")
+public class MercOrderDetailController {
+
+    @Resource
+    private MercOrderDetailService modService;
+
+    /**
+     * 订单分页查询接口
+     * @param page
+     * @param condition
+     * @return
+     */
+//    @GetMapping("/page")
+//    @ApiOperation(tags = {"设备商城-我的-我的订单"}, value = "查询我的订单", notes = "我的订单分页查询", httpMethod = "GET")
+//    public Result<Page<MercOrderDetail>> page(Page<MercOrderDetail> page, MercOrderDetail condition) {
+//        UserApp app = userAppService.checkApiToken();
+//        condition.setUserId(app.getUserId());
+//        page.addOrder(new OrderItem().setColumn("id").setAsc(false));
+//        page = modService.page(page, new QueryWrapper<>(condition));
+//        return ResultGenerator.genSuccessResult(page);
+//    }
+
+    /**
+     * 删除订单接口
+     * @param ids
+     * @return
+     */
+    @RequestMapping("/delete")
+    @ApiOperation(tags = {"设备商城-我的-我的订单"}, value = "删除我的订单", notes = "删除我的订单")
+    public Result<Object> delete(@RequestParam(value = "ids[]") Long[] ids) {
+        modService.removeByIds(Arrays.asList(ids));
+        return ResultGenerator.genSuccessResult("删除成功",null);
+    }
+
+    /**
+     * 确认收货接口
+     * @param id
+     * @return
+     */
+    @GetMapping("/receiving/{id}")
+    @ApiOperation(tags = {"设备商城-我的-确认收货"}, value = "确认收货", notes = "确认收货接口")
+    public Result<Object> receiving(@PathVariable(value = "id") Long id) {
+        modService.receiving(id);
+        return ResultGenerator.genSuccessResult("操作成功",null);
+    }
+
+    /**
+     * 查询订单详情
+     * @param id
+     * @return
+     */
+    @GetMapping("/get/{id}")
+    @ApiOperation(tags = {"设备商城-我的-查询详情"}, value = "查询详情", notes = "查询详情")
+    public Result<Object> get(@PathVariable(value = "id") Long id) {
+        MercOrderDetail entity = modService.getById(id);
+        return ResultGenerator.genSuccessResult("查询成功",entity);
+    }
+
+    /**
+     * 设置退款物流单号
+     * @param dto
+     * @return
+     */
+    @PostMapping("/refundExpressNo")
+    @ApiOperation(tags = {"设备商城-我的-设置退款物流单号"}, value = "设置退款物流单号", notes = "设置退款物流单号")
+    public Result<Object> setRefundExpressNo(@RequestBody MercOrderDetailDTO dto) {
+        modService.setRefundExpressNo(dto);
+        return ResultGenerator.genSuccessResult("操作成功",null);
+    }
+
+    @GetMapping("/getRefundAddress")
+    @ApiOperation(tags = {"设备商城-我的-获取退款地址"}, value = "获取退款地址", notes = "获取退款地址信息")
+    public Result<Object> getRefundAddress() {
+        YtCreateOrder createOrder = new YtCreateOrder();
+        JSONObject result = new JSONObject(3);
+        result.put("name",createOrder.getSenderName());
+        result.put("phone",createOrder.getSenderMobile());
+        result.put("address",createOrder.getSenderProvinceName() + createOrder.getSenderCityName() + createOrder.getSenderCountyName() + createOrder.getSenderAddress());
+        return ResultGenerator.genSuccessResult("操作成功",result);
+    }
+
+    /**
+     * 查看物流信息接口
+     * @param id
+     * @return
+     */
+    @GetMapping("/express/{id}")
+    @ApiOperation(tags = {"设备商城-我的-查看物流"}, value = "查看物流", notes = "查看物流详情接口")
+    public Result<Object> express(@PathVariable(value = "id") Long id) {
+        MercOrderExpressVO express = modService.getOrderExpressInfo(id);
+        String msg = express == null ? "暂无物流信息" : "获取成功";
+        return ResultGenerator.genSuccessResult(msg,express);
+    }
+
+    /**
+     * 申请退款
+     * @param dto
+     * @return
+     */
+    @PostMapping("/refund")
+    @ApiOperation(tags = {"设备商城-我的-申请退款"}, value = "申请退款", notes = "申请退款接口",httpMethod = "POST")
+    public Result<Object> refund(@RequestBody MercOrderDetailDTO dto) {
+        modService.refund(dto);
+        return ResultGenerator.genSuccessResult("退款申请已提交，请耐心等待","");
+    }
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/store/MercOrderNewController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/store/MercOrderNewController.java
new file mode 100644
index 0000000..c594cd4
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/store/MercOrderNewController.java
@@ -0,0 +1,92 @@
+package cn.pluss.platform.controller.store;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.device.MercOrderDetailService;
+import cn.pluss.platform.device.MercOrderNewService;
+import cn.pluss.platform.dto.MercOrderNewDTO;
+import cn.pluss.platform.entity.MercOrderDetail;
+import cn.pluss.platform.entity.MercOrderNew;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.vo.MercOrderNewVO;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @author SSS
+ */
+@RestController
+@RequestMapping("/mercOrderNew")
+public class MercOrderNewController {
+
+    @Autowired
+    private MercOrderNewService monService;
+
+    @Autowired
+    private MercOrderDetailService modService;
+
+    @Resource
+    private UserAppService userAppService;
+
+
+    @GetMapping("/page")
+    @ApiOperation(tags = {"设备商城-我的-我的订单"}, value = "查询我的订单", notes = "我的订单分页查询", httpMethod = "GET")
+    public Result<Page<MercOrderNewVO>> page(Page<MercOrderNewVO> page, MercOrderNewVO condition) {
+        setUserApp(condition);
+        page.addOrder(OrderItem.desc("id"));
+        page = monService.pageInfo(page, condition);
+        List<MercOrderNewVO> records = page.getRecords();
+        if (!records.isEmpty()){
+            for (MercOrderNewVO vo : records) {
+                List<MercOrderDetail> detailList = modService.getDetailByOrderNo(vo.getOrderNo(),condition.getPStatus());
+                vo.setDetailList(detailList);
+            }
+        }
+        return ResultGenerator.genSuccessResult(page);
+    }
+
+    private void setUserApp(MercOrderNew condition) {
+        UserApp userApp = userAppService.queryUserAppByToken();
+        if(userApp == null){
+            MsgException.throwException("登录用户异常");
+        }
+        condition.setUserId(userApp.getUserId());
+    }
+
+    @PostMapping("/create")
+    public Result<Object> createOrder(@RequestBody MercOrderNewDTO orderNewDTO) {
+        Object order = monService.apiCreateOrder(orderNewDTO);
+        return ResultGenerator.genSuccessResult("操作成功", order);
+    }
+
+    /**
+     * 获取商品邮费
+     * @param orderNewDTO
+     * @return
+     */
+    @PostMapping("/getPostageInfo")
+    @ApiOperation(tags = {"设备商城-我的-我的订单"}, value = "获取地区邮费配置价格", notes = "获取地区邮费配置价格", httpMethod = "GET")
+    public Result<Object> getPostageInfo(@RequestBody MercOrderNewDTO orderNewDTO) {
+        Object result = monService.getOrderPostageInfo(orderNewDTO);
+        return ResultGenerator.genSuccessResult("获取成功",result);
+    }
+
+    /**
+     * 查询订单支付状态
+     * @param orderNewDTO
+     * @return
+     */
+    @GetMapping("/getOrderStatusInfo")
+    public Result<Object> getOrderStatusInfo(MercOrderNewDTO orderNewDTO) {
+        Object result = monService.getOrderStatusInfo(orderNewDTO);
+        return ResultGenerator.genSuccessResult("获取成功",result);
+    }
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/store/MercShopTrolleyController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/store/MercShopTrolleyController.java
new file mode 100644
index 0000000..1aa3a03
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/store/MercShopTrolleyController.java
@@ -0,0 +1,59 @@
+package cn.pluss.platform.controller.store;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.device.MercShopTrolleyService;
+import cn.pluss.platform.entity.MercShopTrolley;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.vo.DeviceGoodsVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author djh
+ */
+@RestController
+@RequestMapping("/mercShopTrolley")
+public class MercShopTrolleyController {
+
+    @Autowired
+    private MercShopTrolleyService baseService;
+
+    @PostMapping("/addOne")
+    public Result<Object> addOne(@RequestBody MercShopTrolley entity) {
+        baseService.apiAdd(entity);
+        return ResultGenerator.genSuccessResult("已添加到购物车", null);
+    }
+
+    @GetMapping("/shopTrolleyList")
+    public Result<List<DeviceGoodsVO>> shopTrolleyList() {
+        List<DeviceGoodsVO> res = baseService.apiShopTrolleyList();
+        return ResultGenerator.genSuccessResult("操作成功", res);
+    }
+
+    @GetMapping("/remove/{id}")
+    public Result<Object> removeById(@PathVariable("id") Long id) {
+        baseService.removeById(id);
+
+        return ResultGenerator.genSuccessResult("操作成功", null);
+    }
+
+    @PostMapping("/remove")
+    public Result<Object> removeByIds(@RequestBody List<Long> ids) {
+        baseService.removeByIds(ids);
+        return ResultGenerator.genSuccessResult("操作成功", null);
+    }
+
+    @PostMapping("/update")
+    public Result<Object> updateById(@RequestBody MercShopTrolley entity) {
+        if (entity.getId() == null) {
+            throw new MsgException("参数异常");
+        }
+
+        baseService.apiUpdate(entity);
+
+        return ResultGenerator.genSuccessResult("操作成功", null);
+    }
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/store/PostageConfigController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/store/PostageConfigController.java
new file mode 100644
index 0000000..b8f27c1
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/store/PostageConfigController.java
@@ -0,0 +1,36 @@
+package cn.pluss.platform.controller.store;
+
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.dto.MercOrderNewDTO;
+import cn.pluss.platform.postageConfig.PostageConfigService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 邮费信息配置表 前端控制器
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-03-29
+ */
+@RestController
+@RequestMapping("/postageConfig")
+public class PostageConfigController {
+
+    @Resource
+    private PostageConfigService pcService;
+
+    @GetMapping("/get")
+    @ApiOperation(tags = {"设备商城-我的-我的订单"}, value = "获取地区邮费配置价格", notes = "获取地区邮费配置价格", httpMethod = "GET")
+    public Result<BigDecimal> get(MercOrderNewDTO orderNewDTO) {
+        return ResultGenerator.genSuccessResult(null);
+    }
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/interceptor/TokenRegistryInterceptor.java b/pluss-api-page/src/main/java/cn/pluss/platform/interceptor/TokenRegistryInterceptor.java
new file mode 100644
index 0000000..83bf2ea
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/interceptor/TokenRegistryInterceptor.java
@@ -0,0 +1,151 @@
+package cn.pluss.platform.interceptor;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultCode;
+import cn.pluss.platform.constants.CommonError;
+import cn.pluss.platform.entity.MerchantStaffConn;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.entity.UserInfo;
+import cn.pluss.platform.merchant.MerchantStaffConnService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.userInfo.UserInfoService;
+import cn.pluss.platform.util.ComUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.net.URLDecoder;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author djh
+ */
+public class TokenRegistryInterceptor extends HandlerInterceptorAdapter {
+
+    @Resource
+    private UserAppService userAppService;
+
+    @Resource
+    private UserInfoService uiService;
+
+    @Resource
+    private MerchantStaffConnService staffConnService;
+
+    @Override
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+        String requestUri = request.getRequestURI();
+        List<String> limitUri = new ArrayList<>();
+        limitUri.add("/api/agreement/getAgreementOne");
+        limitUri.add("/api/phoneValidateCode");
+        limitUri.add("/api/img");
+        limitUri.add("/api/test/");
+        limitUri.add("/api/push/pushMsg");
+        limitUri.add("/api/machineCallback/orderCallback");
+        limitUri.add("/api/makeMoney/sxfCallback");
+        limitUri.add("/api/img");
+        limitUri.add("/api/test/");
+        limitUri.add("/api/wx/img");
+        limitUri.add("/api/userInfo");
+        limitUri.add("/api/error");
+        limitUri.add("/api/wxCert/wxCertGuide");
+        limitUri.add("/api/callback/");
+        limitUri.add("/api/open/login");
+        boolean passFlag = limitUri.stream().anyMatch(s -> s.equals(requestUri) || requestUri.startsWith(s));
+        if (passFlag) {
+            return true;
+        }
+
+        String contentType = request.getContentType();
+
+
+        synchronized (this) {
+            String requestToken = request.getHeader("token");
+            // 登录账号
+            String myLoginName = request.getHeader("myLoginName");
+            if (StringUtils.isEmpty(myLoginName)) {
+                myLoginName = request.getHeader("myloginname");
+            }
+
+            if (StringUtils.isEmpty(myLoginName)) {
+                myLoginName = request.getHeader("MYLOGINNAME");
+            }
+
+            if (StringUtils.isEmpty(myLoginName) || StringUtils.isEmpty(requestToken)) {
+                Result<Object> result = new Result<>();
+                result.setCode(ResultCode.NOT_TOKEN).setMessage("非法请求");
+                ComUtil.responseResult(response, result);
+                return false;
+            }
+
+            myLoginName = URLDecoder.decode(myLoginName, "UTF-8");
+
+            // 商户编号
+            String merchantCode = request.getHeader("merchantCode");
+
+            UserInfo userInfo = new UserInfo();
+            userInfo.setLoginName(myLoginName);
+            userInfo = uiService.queryUserInfo(userInfo);
+            if (userInfo == null) {
+                Result<Object> result = new Result<>();
+                result.setCode(ResultCode.NOT_TOKEN).setMessage(CommonError.NO_EXIST_ACCOUNT);
+                ComUtil.responseResult(response, result);
+                return false;
+            }
+
+//            if (Objects.equals(userInfo.getStatus(), 0)) {
+//                Result<Object> result = new Result<>();
+//                result.setCode(ResultCode.UNAUTHORIZED).setMessage("账号涉嫌违规");
+//                ComUtil.responseResult(response, result);
+//                return false;
+//            }
+
+            UserApp userApp = new UserApp();
+            userApp.setUserId(userInfo.getId());
+            userApp = userAppService.queryUserApp(userApp);
+            if (!requestToken.equals(userApp.getToken())) {
+                Result<Object> result = new Result<>();
+                result.setCode(ResultCode.NOT_TOKEN).setMessage("您在其他设备中登录");
+                ComUtil.responseResult(response, result);
+                return false;
+            }
+
+            if (StringUtils.isNotBlank(merchantCode) && "staff".equals(userApp.getUserType())) {
+                MerchantStaffConn staffConn = new MerchantStaffConn().setMerchantCode(merchantCode);
+                staffConn.setUserId(userApp.getUserId());
+                staffConn = staffConnService.getOne(new QueryWrapper<>(staffConn));
+
+                if (staffConn == null) {
+                    Result<Object> result = new Result<>();
+                    result.setCode(ResultCode.FAIL).setMessage("商户信息异常");
+                    ComUtil.responseResult(response, result);
+                    return false;
+                }
+            }
+
+        }
+        return true;
+
+        // 验证Pass注解
+//		boolean pass = verificationPassAnnotation(request, response, handler,requestToken);
+//		if(pass){
+//			return true;
+//		}
+//		boolean token = false;
+//		synchronized(this) {
+//			token = validateSign(request,requestToken,requestSource);
+//		}
+//		if(token){
+//			return true;
+//		}else{
+//			logger.warn("签名认证失败，请求接口：{}，请求IP：{}，请求参数：{}",request.getRequestURI(), ComUtil.getIpAddress(request), JSON.toJSONString(request.getParameterMap()));
+//            Result result = new Result();
+//            result.setCode(ResultCode.NOT_TOKEN).setMessage("TOKEN丢失，请检查");
+//            ComUtil.responseResult(response, result);
+//            return false;
+//		}
+    }
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/mapper/ImgReflectMapper.java b/pluss-api-page/src/main/java/cn/pluss/platform/mapper/ImgReflectMapper.java
new file mode 100644
index 0000000..5830e99
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/mapper/ImgReflectMapper.java
@@ -0,0 +1,47 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.ImgReflect;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 服务器本地文件与OSS服务器数据关联表 Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-12-17
+ */
+public interface ImgReflectMapper extends BaseMapper<ImgReflect> {
+
+    /**
+     * 获取OSS没有对应链接的身份证信息
+     * @param page 分页信息
+     * @return
+     */
+    List<Map<String, Object>> selectIdCardUrl(Page<Map<String, Object>> page);
+
+    /**
+     * 获取OSS没有对应链接的银行卡图片信息
+     * @param page 分页信息
+     * @return
+     */
+    List<Map<String, Object>> selectBankCardUrl(Page<Map<String, Object>> page);
+
+    /**
+     * 获取OSS没有对应链接的门头照等图片
+     * @param page 分页信息
+     * @return
+     */
+    List<Map<String, Object>> selectStoreImgUrl(Page<Map<String, Object>> page);
+
+    /**
+     * 获取OSS没有对应链接的用户头像logo
+     * @param page 分页信息
+     * @return
+     */
+    List<Map<String, Object>> selectUserLogo(Page<Map<String, Object>> page);
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/mapper/SpreadMapper.java b/pluss-api-page/src/main/java/cn/pluss/platform/mapper/SpreadMapper.java
new file mode 100644
index 0000000..1d6c9fc
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/mapper/SpreadMapper.java
@@ -0,0 +1,110 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.leshua.ExpandDto;
+import cn.pluss.platform.vo.SpreadData;
+import cn.pluss.platform.vo.UserTeamAchieVO;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * @author DJH
+ */
+public interface SpreadMapper {
+
+    /**
+     * 查询直推用户信息
+     * @param condition 查询条件
+     * @param page 分页参数
+     * @return  result
+     */
+    Page<UserApp> selectDirectUser(@Param("condition") ExpandDto condition, Page<UserApp> page);
+
+    /**
+     * 查询普通服务商下的三级推广
+     * @param condition 查询条件
+     * @param page 分页参数
+     * @return  result
+     */
+    Page<UserApp> selectPmtSubUser(@Param("condition") ExpandDto condition, Page<UserApp> page);
+
+    /**
+     * 查询超级服务商/代理商下的推广商户
+     * @param condition 查询条件
+     * @param page 分页参数
+     * @return  result
+     */
+    Page<UserApp> selectAgentSubUser(@Param("condition") ExpandDto condition, Page<UserApp> page);
+
+    /**
+     * 查询团队交易数据
+     * @date: 2022/1/24 14:55
+     * @param page:
+     * @param condition:
+     * @return com.baomidou.mybatisplus.extension.plugins.pagination.Page<cn.pluss.platform.vo.UserTeamAchieVO>
+     */
+    Page<UserTeamAchieVO> userTemaAchiePage(Page<UserTeamAchieVO> page, @Param("condition") UserTeamAchieVO condition);
+
+    /**
+     * 获取当日推广数据
+     * @param userId    用户id
+     * @return
+     */
+    SpreadData selectTodaySpreadData(@Param("userId") String userId);
+
+    /**
+     * 获取历史推广数据
+     * @param page      分页数据
+     * @param userId    用户id
+     * @return
+     */
+    Page<SpreadData> pageDaySpreadPageData(Page<SpreadData> page, @Param("userId") String userId);
+
+    /**
+     * 获取历史推广数据
+     * @param page      分页数据
+     * @param userId    用户id
+     * @return
+     */
+    Page<SpreadData> pageMonthSpreadPageData(Page<SpreadData> page, @Param("userId") String userId);
+
+    /**
+     * 获取历史推广数据
+     * @param page      分页数据
+     * @param userId    用户id
+     * @return
+     */
+    Page<SpreadData> pageYearSpreadPageData(Page<SpreadData> page, @Param("userId") String userId);
+
+    /**
+     * 获取历史推广数据
+     * @param page      分页数据
+     * @param userId    用户id
+     * @return
+     */
+    Page<SpreadData> pageTeamDaySpreadPageData(Page<SpreadData> page, @Param("userId") String userId);
+
+    /**
+     * 获取历史推广数据
+     * @param page      分页数据
+     * @param userId    用户id
+     * @return
+     */
+    Page<SpreadData> pageTeamMonthSpreadPageData(Page<SpreadData> page, @Param("userId") String userId);
+
+    /**
+     * 获取历史推广数据
+     * @param page      分页数据
+     * @param userId    用户id
+     * @return
+     */
+    Page<SpreadData> pageTeamYearSpreadPageData(Page<SpreadData> page, @Param("userId") String userId);
+
+    /**
+     * 获取团队交易流水
+     * @date: 2022/1/25 23:56
+     * @param vo:
+     * @return cn.pluss.platform.vo.UserTeamAchieVO
+     */
+    UserTeamAchieVO getAppUserTeanFlow(UserTeamAchieVO vo);
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/mapper/TestMapper.java b/pluss-api-page/src/main/java/cn/pluss/platform/mapper/TestMapper.java
new file mode 100644
index 0000000..18c5373
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/mapper/TestMapper.java
@@ -0,0 +1,64 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.MerchantBaseInfo;
+import cn.pluss.platform.entity.MerchantChannelStatus;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+public interface TestMapper {
+
+    @Select("SELECT mbi.* FROM tb_pluss_merchant_base_info mbi\n" +
+            "LEFT JOIN tb_pluss_account a ON a.userId = mbi.userId\n" +
+            "LEFT JOIN tb_pluss_merchant_channel_status mcs ON mbi.merchantCode = mcs.merchantCode AND mcs.channel IN (1, 3)\n" +
+            "LEFT JOIN tb_pluss_merchant_channel_status mcs2 ON mbi.merchantCode = mcs2.merchantCode AND mcs2.channel = 4\n" +
+            "WHERE  mcs2.id IS NULL AND mbi.district = '云霄县' AND mcs.`status` = 3 AND mbi.merchantType != 1\n" +
+            "AND SUBSTR(a.settleType, 1, 2) = '01'")
+    List<MerchantBaseInfo> getYXMerchant();
+
+    @Select("SELECT DISTINCT\n" +
+            "mbi.*,\n" +
+            "b.count\n" +
+            "FROM\n" +
+            "tb_pluss_merchant_base_info mbi\n" +
+            "LEFT JOIN tb_pluss_account a ON a.userId = mbi.userId\n" +
+            "LEFT JOIN tb_pluss_id_card ic ON a.userId = ic.userId\n" +
+            "LEFT JOIN tb_pluss_risk_blacklist rb ON rb.idcardNo = ic.certNo \n" +
+            "LEFT JOIN (SELECT merchantCode,count(merchantCode) AS 'count' FROM tb_pluss_merchant_order  GROUP BY merchantCode HAVING count(merchantCode) > 0) AS b ON mbi.merchantCode = b.merchantCode\n" +
+            "LEFT JOIN tb_pluss_merchant_channel_status mcs ON mbi.merchantCode = mcs.merchantCode \n" +
+            "AND mcs.channel IN ( 1, 3 )\n" +
+            "LEFT JOIN tb_pluss_merchant_channel_status mcs2 ON mbi.merchantCode = mcs2.merchantCode \n" +
+            "AND mcs2.channel = 4 \n" +
+            "WHERE\n" +
+            "mcs2.id IS NULL \n" +
+            "AND b.count > 0\n" +
+            "AND mbi.district != '云霄县' \n" +
+            "AND mcs.`status` = 3 \n" +
+            "AND mbi.merchantType != 1 \n" +
+            "AND rb.id IS NULL \n" +
+            "AND SUBSTR(a.settleType, 1, 2 ) = '01' ORDER BY createDt desc limit 0,50")
+    List<MerchantBaseInfo> getYXMerchant1();
+
+    @Select("SELECT mcs.merchantId FROM tb_pluss_merchant_channel_status mcs\n" +
+            "LEFT JOIN tb_pluss_sub_merchant sm ON mcs.merchantId = sm.merchantId AND mcs.channel = sm.channelTypeId\n" +
+            "WHERE mcs.channel = #{channel} AND mcs.`status` = 3 AND sm.id IS NULL")
+    List<String> getNoSubMerchant(@Param("channel") String channel);
+
+    @Select("SELECT mcs.* FROM tb_pluss_merchant_channel_status mcs\n" +
+            "LEFT JOIN tb_pluss_sub_merchant_apply_order tpsmao ON mcs.merchantCode = tpsmao.merchantCode AND mcs.channel = tpsmao.applyNo\n" +
+            "WHERE mcs.channel = 3 AND mcs.authorizationStatus = '0' AND mcs.extra ->> '$.merInId' IS NOT NULL;")
+    List<MerchantChannelStatus> getRyxNoCert();
+
+    @Select("SELECT DISTINCT mcs.merchantCode FROM tb_pluss_merchant_channel_status mcs\n" +
+            "LEFT JOIN tb_pluss_sub_merchant sm ON mcs.merchantId = sm.merchantId\n" +
+            "WHERE mcs.channel = #{channel} AND sm.id IS NULL AND mcs.`status` IN (3, 7)")
+    List<String> getNoSmMerchant(String channel);
+
+    @Select("SELECT mcs.* FROM tb_pluss_merchant_channel_status mcs \n" +
+            "LEFT JOIN tb_pluss_merchant_rate_new_record mrnr ON mcs.merchantId = mrnr.merchantId AND mrnr.channel = mcs.channel\n" +
+            "LEFT JOIN tb_pluss_merchant_rate_new mrn ON mrn.merchantId = mcs.merchantId AND mrn.channel = mcs.channel\n" +
+            "WHERE mcs.channel = 4 AND mcs.`status` = 3 AND mcs.applicationId LIKE '27%'\n" +
+            "AND (mrnr.`status` != 1 OR mrnr.`status` IS NULL)")
+    List<MerchantChannelStatus> getYsNoRateChangeMerc();
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/service/agent/AgentStaffService.java b/pluss-api-page/src/main/java/cn/pluss/platform/service/agent/AgentStaffService.java
new file mode 100644
index 0000000..b8a7be4
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/service/agent/AgentStaffService.java
@@ -0,0 +1,27 @@
+package cn.pluss.platform.service.agent;
+
+import cn.pluss.platform.dto.UserInfoDTO;
+import cn.pluss.platform.vo.AgentStaffVO;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+/**
+ * 超级服务商员工相关处理逻辑
+ * @author DJH
+ */
+public interface AgentStaffService {
+
+    /**
+     * 保存代理商下级员工
+     */
+    void saveOrUpdateStaff(UserInfoDTO dto);
+
+    void saveStaff(UserInfoDTO userInfoDTO);
+
+    void updateStaff(UserInfoDTO userInfoDTO);
+
+    void delStaff(String userId);
+
+    AgentStaffVO getStaff(String userId);
+
+    Page<AgentStaffVO> staffPage(Page<AgentStaffVO> page, UserInfoDTO userInfoDTO);
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/service/agent/MerchantRateApiService.java b/pluss-api-page/src/main/java/cn/pluss/platform/service/agent/MerchantRateApiService.java
new file mode 100644
index 0000000..1232bf2
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/service/agent/MerchantRateApiService.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.service.agent;
+
+import cn.pluss.platform.entity.MerchantRate;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @author DJH
+ */
+public interface MerchantRateApiService extends IService<MerchantRate> {
+
+    /**
+     * 修改下级服务商费率
+     * @param merchantRate  费率信息
+     */
+    void setSubAgentRate(MerchantRate merchantRate);
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/service/agent/impl/AgentStaffServiceImpl.java b/pluss-api-page/src/main/java/cn/pluss/platform/service/agent/impl/AgentStaffServiceImpl.java
new file mode 100644
index 0000000..4d10d39
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/service/agent/impl/AgentStaffServiceImpl.java
@@ -0,0 +1,212 @@
+package cn.pluss.platform.service.agent.impl;
+
+import cn.pluss.platform.dto.UserInfoDTO;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.entity.UserInfo;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.service.agent.AgentStaffService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.userInfo.UserInfoService;
+import cn.pluss.platform.util.MD5Util;
+import cn.pluss.platform.util.StringUtil;
+import cn.pluss.platform.vo.AgentStaffVO;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.Setter;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author DJH
+ */
+@Service
+public class AgentStaffServiceImpl implements AgentStaffService {
+
+    @Setter(onMethod_ = {@Autowired})
+    private UserAppService userAppService;
+    @Setter(onMethod_ = {@Autowired})
+    private UserInfoService userInfoService;
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void saveOrUpdateStaff(UserInfoDTO dto) {
+        appStaffPermitCheck(dto.getUserId());
+        if (StringUtils.isEmpty(dto.getUserId())) {
+            saveStaff(dto);
+        } else {
+            updateStaff(dto);
+        }
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void saveStaff(@Validated(UserInfoDTO.AgentStaffInsert.class) UserInfoDTO dto) {
+        UserApp pUserApp = new UserApp().setUserId(Long.parseLong(dto.getPId()));
+        pUserApp = userAppService.queryUserApp(pUserApp);
+        if (pUserApp == null) {
+            throw new MsgException("未找到父id数据");
+        }
+
+        if (!"agent".equals(pUserApp.getUserType())) {
+            throw new MsgException("拒绝访问");
+        }
+
+        UserInfo userInfo = UserInfo.newInstance();
+        userInfo.setLoginName(dto.getLoginName());
+        UserInfo exist = userInfoService.queryUserInfo(new UserInfo().setLoginName(dto.getLoginName()));
+        if (exist != null) {
+            throw new MsgException("账号已存在");
+        }
+        userInfo.setPhone(dto.getPhone());
+
+
+        userInfo.setTrueName(dto.getUserName());
+        userInfo.setPassword(MD5Util.MD5Encode(dto.getPassword(), "utf-8"));
+        userInfoService.save(userInfo);
+
+        UserApp userApp = UserApp.newInstance();
+        userApp.setLoginName(dto.getLoginName());
+        userApp.setUserName(dto.getUserName());
+        userApp.setUserType("agent_staff");
+        userApp.setLevel(1).setInviteNum(getRandomNum());
+        userApp.setUserId(userInfo.getId());
+        userApp.setPhone(dto.getPhone());
+        userApp.setParentId(Long.parseLong(dto.getPId()));
+        userAppService.save(userApp);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void updateStaff(@Validated(UserInfoDTO.AgentStaffUpdate.class) UserInfoDTO dto) {
+        appStaffPermitCheck(dto.getUserId());
+
+        UserInfo userInfo = new UserInfo().setId(Long.parseLong(dto.getUserId()));
+        userInfo = userInfoService.queryUserInfo(userInfo);
+        if (userInfo == null) {
+            throw new MsgException("员工不存在");
+        }
+
+        userInfo.setPhone(dto.getPhone());
+        userInfo.setLoginName(dto.getLoginName());
+        userInfo.setTrueName(dto.getUserName());
+        userInfo.setPassword(MD5Util.MD5Encode(dto.getPassword(), "utf-8"));
+        userInfoService.updateById(userInfo);
+
+        UserApp userApp = new UserApp().setUserId(Long.parseLong(dto.getUserId()));
+        userApp = userAppService.queryUserApp(userApp);
+        userApp.setLoginName(dto.getLoginName());
+        userApp.setUserType("agent_staff");
+        userApp.setUserName(dto.getUserName());
+        userApp.setLevel(0);
+        userApp.setUserId(userInfo.getId());
+        userApp.setPhone(dto.getPhone());
+        userApp.setParentId(Long.parseLong(dto.getPId()));
+        userAppService.updateById(userApp);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public Page<AgentStaffVO> staffPage(Page<AgentStaffVO> page, UserInfoDTO dto) {
+        Page<UserApp> page1 = new Page<>();
+        page1.setCurrent(page.getCurrent());
+        page1.setSize(page.getSize());
+
+        QueryWrapper<UserApp> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("userType", "agent_staff");
+        queryWrapper.eq(dto.getUserId() != null, "userId", dto.getUserId());
+        queryWrapper.like(dto.getLoginName() != null, "loginName", dto.getLoginName());
+        queryWrapper.like(dto.getPhone() != null, "phone", dto.getPhone());
+        queryWrapper.eq(dto.getPId() != null, "parentId", dto.getPId());
+        queryWrapper.gt(dto.getStartTime() != null, "createDt", dto.getStartTime());
+        queryWrapper.lt(dto.getEndTime() != null, "createDt", dto.getEndTime());
+        queryWrapper.orderByDesc("createDt");
+        page1 = userAppService.page(page1, queryWrapper);
+
+        List<AgentStaffVO> result = new ArrayList<>();
+        for (UserApp userApp : page1.getRecords()) {
+            AgentStaffVO agentStaffVO = new AgentStaffVO();
+            agentStaffVO.setUserId(userApp.getUserId() + "");
+            agentStaffVO.setCreateTime(userApp.getCreateDt());
+            agentStaffVO.setLogo(userApp.getLogo());
+            agentStaffVO.setPhone(userApp.getPhone());
+            agentStaffVO.setUserName(userApp.getUserName());
+            agentStaffVO.setLoginName(userApp.getLoginName());
+
+            result.add(agentStaffVO);
+        }
+
+        page.setRecords(result);
+        page.setTotal(page1.getTotal());
+
+        return page;
+    }
+
+    @Override
+    public void delStaff(String userId) {
+        appStaffPermitCheck(userId);
+
+        UserApp userApp = new UserApp().setUserId(Long.parseLong(userId));
+        userApp = userAppService.queryUserApp(userApp);
+
+        userInfoService.removeById(userId);
+        userAppService.removeById(userApp.getId());
+    }
+
+    @Override
+    public AgentStaffVO getStaff(String userId) {
+        appStaffPermitCheck(userId);
+
+        UserApp userApp = new UserApp().setUserId(Long.parseLong(userId));
+        userApp = userAppService.queryUserApp(userApp);
+
+        AgentStaffVO agentStaffVO = new AgentStaffVO();
+        agentStaffVO.setUserId(userId);
+        agentStaffVO.setCreateTime(userApp.getCreateDt());
+        agentStaffVO.setLogo(userApp.getLogo());
+        agentStaffVO.setPhone(userApp.getPhone());
+        agentStaffVO.setUserName(userApp.getUserName());
+        return agentStaffVO;
+    }
+
+    public void appStaffPermitCheck(String userId) {
+        UserApp tokenUserApp = userAppService.queryUserAppByToken();
+        if (tokenUserApp == null || !"agent".equals(tokenUserApp.getUserType())) {
+            throw new MsgException("拒绝访问");
+        }
+
+        if (StringUtils.isEmpty(userId)) {
+            return;
+        }
+
+        UserApp userApp = new UserApp().setUserId(Long.parseLong(userId));
+        userApp = userAppService.queryUserApp(userApp);
+
+        if (userApp == null) {
+            return;
+        }
+
+        if (!tokenUserApp.getUserId().equals(userApp.getParentId())) {
+            throw new MsgException("拒绝访问");
+        }
+    }
+
+    private String getRandomNum() {
+        String inviteNum;
+        UserApp condition = new UserApp();
+
+        do {
+            inviteNum = StringUtil.genRandomNum(5);
+            condition.setInviteNum(inviteNum);
+            UserApp userApp = userAppService.queryUserApp(condition);
+            if (userApp == null) {
+                return inviteNum;
+            }
+        } while (true);
+    }
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/service/agent/impl/MerchantRateServiceApiImpl.java b/pluss-api-page/src/main/java/cn/pluss/platform/service/agent/impl/MerchantRateServiceApiImpl.java
new file mode 100644
index 0000000..f4b3394
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/service/agent/impl/MerchantRateServiceApiImpl.java
@@ -0,0 +1,129 @@
+package cn.pluss.platform.service.agent.impl;
+
+import cn.pluss.platform.MerchantRateRecordService;
+import cn.pluss.platform.entity.MerchantRate;
+import cn.pluss.platform.entity.MerchantRateRecord;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.MerchantRateMapper;
+import cn.pluss.platform.service.agent.MerchantRateApiService;
+import cn.pluss.platform.userApp.UserAppService;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.Setter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Calendar;
+import java.util.Date;
+
+/**
+ * @author DJH
+ */
+@Service
+public class MerchantRateServiceApiImpl extends ServiceImpl<MerchantRateMapper, MerchantRate> implements MerchantRateApiService {
+
+    @Setter(onMethod_ = {@Autowired})
+    private UserAppService userAppService;
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantRateRecordService merchantRateRecordService;
+
+    @Override
+    public MerchantRate getOne(Wrapper<MerchantRate> queryWrapper) {
+        UserApp tokenUserApp = userAppService.queryUserAppByToken();
+
+        String userId = queryWrapper.getEntity().getUserId();
+        UserApp queryUserApp = new UserApp().setUserId(Long.parseLong(userId));
+        queryUserApp = userAppService.queryUserApp(queryUserApp);
+
+        // 身份校验
+        // 查询用户是否为自身
+        boolean isSelf = queryUserApp.getUserId().equals(tokenUserApp.getUserId());
+        // 查询用户是否为下级代理
+        boolean isRelation = tokenUserApp.getUserId().equals(queryUserApp.getParentId());
+        MsgException.check(!isSelf && !isRelation, "拒绝访问");
+
+        MerchantRate one = super.getOne(queryWrapper);
+        // 结果校验
+        MsgException.checkNull(one, "未查询到费率信息");
+
+        return one;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRES_NEW)
+    public void setSubAgentRate(MerchantRate merchantRate) {
+        UserApp tokenUserApp = userAppService.queryUserAppByToken();
+
+        String userId = merchantRate.getUserId();
+        UserApp queryUserApp = new UserApp().setUserId(Long.parseLong(userId));
+        queryUserApp = userAppService.getOne(new QueryWrapper<>(queryUserApp));
+        // 当前接口这能修改代理商的费率
+        if (!"agent".equals(queryUserApp.getUserType())) {
+            throw new MsgException("拒绝访问");
+        }
+
+        // 查询用户是否为下级代理
+        boolean isRelation = tokenUserApp.getUserId().equals(queryUserApp.getParentId());
+        MsgException.check(!isRelation, "拒绝访问");
+
+        // 非固定费率
+        if (!"1".equals(tokenUserApp.getIsFixedRate())) {
+            MsgException.check(merchantRate.getRate() <= MerchantRate.MAX_RATE, "下级代理商费率不得小于" + MerchantRate.MAX_RATE);
+        }
+
+        // 费率下限
+        MerchantRate tokenUserRate = new MerchantRate().setUserId(tokenUserApp.getUserId() + "");
+        tokenUserRate = baseMapper.selectOne(new QueryWrapper<>(tokenUserRate));
+        MsgException.check(merchantRate.getRate() <= tokenUserRate.getRate(), "下级代理商费率必须高于自身费率");
+
+        MerchantRate mr2 = new MerchantRate().setUserId(queryUserApp.getUserId() + "");
+        if (merchantRate.getRate().equals(mr2.getRate())) {
+            throw new MsgException("费率没有发生变化");
+        }
+
+        mr2 = baseMapper.selectOne(new QueryWrapper<>(mr2));
+        if (merchantRate.getRate() > mr2.getRate()) {
+            throw new MsgException("禁止上调费率");
+        }
+
+
+        // 修改费率
+        MerchantRate exist = new MerchantRate().setUserId(merchantRate.getUserId());
+        exist = baseMapper.selectOne(new QueryWrapper<>(exist));
+
+        if (exist == null) {
+            exist = new MerchantRate();
+            exist.setPreviousRate(merchantRate.getRate());
+            exist.setUserId(merchantRate.getUserId());
+        } else {
+            // 一天只能修改一次
+            Calendar calendar = Calendar.getInstance();
+            calendar.set(Calendar.HOUR_OF_DAY, 0);
+            calendar.set(Calendar.MINUTE, 0);
+            calendar.set(Calendar.SECOND, 0);
+            calendar.set(Calendar.MILLISECOND, 0);
+            if (exist.getUpdateTime().after(calendar.getTime())) {
+                throw new MsgException("一天只能设置一次费率");
+            }
+
+            exist.setPreviousRate(exist.getRate());
+        }
+
+        exist.setUpdateTime(new Date());
+        exist.setRate(merchantRate.getRate());
+        exist.setPreviousRate(merchantRate.getRate());
+
+        saveOrUpdate(exist);
+
+        // 保存修改费率记录
+        MerchantRateRecord merchantRateRecord = new MerchantRateRecord();
+        merchantRateRecord.setCreateTime(new Date());
+        merchantRateRecord.setRate(merchantRate.getRate());
+        merchantRateRecord.setUserId(merchantRate.getUserId());
+        merchantRateRecordService.save(merchantRateRecord);
+    }
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/service/common/SpreadService.java b/pluss-api-page/src/main/java/cn/pluss/platform/service/common/SpreadService.java
new file mode 100644
index 0000000..274d85d
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/service/common/SpreadService.java
@@ -0,0 +1,103 @@
+package cn.pluss.platform.service.common;
+
+
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.leshua.ExpandDto;
+import cn.pluss.platform.vo.SpreadData;
+import cn.pluss.platform.vo.UserNumVO;
+import cn.pluss.platform.vo.UserTeamAchieVO;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import java.util.Map;
+
+/**
+ * app推广页面及其内也的接口逻辑
+ *
+ * @author DJH
+ */
+public interface SpreadService {
+
+    /**
+     * app拓展页面列表查询接口
+     *
+     * @param dto 查询参数
+     *            type不传为查间推
+     * @return 结果
+     */
+    Page<UserApp> expandPageData(ExpandDto dto);
+
+    /**
+     * 获取用户升级的图片
+     *
+     * @return
+     */
+    String getUpgradeImage();
+
+    /**
+     * 获取支付成功后页面的数据配置数据
+     *
+     * @return
+     */
+    Map<String, Object> appPaySuccessPageData();
+
+    /**
+     * 查询团队业绩
+     * @date: 2022/1/24 14:25
+     * @param vo:
+     * @return com.baomidou.mybatisplus.extension.plugins.pagination.Page<cn.pluss.platform.vo.UserTeamAchieVO>
+     */
+    Page<UserTeamAchieVO> userTeamAchiePage(Page<UserTeamAchieVO> page, UserTeamAchieVO vo);
+
+    /**
+     * 获取用户直推数量信息
+     * @date: 2022/1/24 23:20
+     * @param vo:
+     * @param type:
+     * @return cn.pluss.platform.vo.UserNumVO
+     */
+    UserNumVO getUserDirectNumInfo(UserNumVO vo,int type);
+
+
+    /**
+     * 获取当日推广数据
+     *
+     * @return
+     */
+    SpreadData apiTodaySpreadData();
+
+    /**
+     * 获取当日推广数据
+     *
+     * @param userId 用户id
+     * @return
+     */
+    SpreadData todaySpreadData(String userId);
+
+    /**
+     * 获取当日推广数据
+     *
+     * @param type {@link SpreadData#getType()}
+     * @param target
+     * @return
+     */
+    Page<SpreadData> apiHistorySpreadPageData(Page<SpreadData> page, String type, String target);
+
+    /**
+     * 获取当日推广数据
+     *
+     * @param userId 用户id
+     * @param page   分页数据
+     * @param type   {@link SpreadData#getType()}
+     * @param target
+     * @return
+     */
+    Page<SpreadData> historySpreadPageData(String userId, Page<SpreadData> page, String type, String target);
+
+    /**
+     * 获取用户团队交易流水
+     * @date: 2022/1/25 23:53
+     * @param vo:
+     * @return cn.pluss.platform.vo.UserTeamAchieVO
+     */
+    UserTeamAchieVO getAppUserTeanFlow(UserTeamAchieVO vo);
+}
diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/service/common/impl/SpreadServiceImpl.java b/pluss-api-page/src/main/java/cn/pluss/platform/service/common/impl/SpreadServiceImpl.java
new file mode 100644
index 0000000..9f3f979
--- /dev/null
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/service/common/impl/SpreadServiceImpl.java
@@ -0,0 +1,335 @@
+package cn.pluss.platform.service.common.impl;
+
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.leshua.ExpandDto;
+import cn.pluss.platform.mapper.SpreadMapper;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.merchantGuide.MerchantGuideService;
+import cn.pluss.platform.merchantQrcode.MerchantQrcodeService;
+import cn.pluss.platform.service.common.SpreadService;
+import cn.pluss.platform.systemConfig.SystemConfigService;
+import cn.pluss.platform.user.UserProfitService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.vo.SpreadData;
+import cn.pluss.platform.vo.UserNumVO;
+import cn.pluss.platform.vo.UserTeamAchieVO;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.Setter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.math.MathContext;
+import java.math.RoundingMode;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+/**
+ * @author DJH
+ */
+@Service
+public class SpreadServiceImpl implements SpreadService {
+
+    @Setter(onMethod_ = @Autowired)
+    private UserAppService userAppService;
+
+    @Setter(onMethod_ = @Autowired)
+    private SystemConfigService configService;
+
+    @Setter(onMethod_ = @Autowired)
+    private MerchantQrcodeService merchantQrcodeService;
+
+    @Setter(onMethod_ = @Autowired)
+    private MerchantGuideService merchantGuideService;
+
+    @Resource
+    private SpreadMapper spreadMapper;
+
+    @Resource
+    private MerchantChannelStatusService merchantChannelStatusService;
+
+
+    @Autowired
+    private UserProfitService userProfitService;
+
+    @Override
+    public Page<UserApp> expandPageData(ExpandDto dto) {
+        UserApp userApp = userAppService.queryUserAppByToken();
+        dto.setUserId(userApp.getUserId() + "");
+
+        MsgException.checkNull(dto.getPage(), "页码不能为空");
+        MsgException.checkNull(dto.getSize(), "页长不能为空");
+
+        Page<UserApp> page = new Page<>();
+        page.setCurrent(dto.getPage());
+        page.setSize(dto.getSize());
+
+        if ("1".equals(dto.getRecommend())) {
+            // 查直推
+            return spreadMapper.selectDirectUser(dto, page);
+        } else if ("promoter".equals(userApp.getUserType())) {
+            // 查普通服务商下的商户，只查三级
+            return spreadMapper.selectPmtSubUser(dto, page);
+        } else {
+            // 查超级服务商/代理商下的商户
+            return spreadMapper.selectAgentSubUser(dto, page);
+        }
+    }
+
+    @Override
+    public String getUpgradeImage() {
+        UserApp userApp = userAppService.queryUserAppByToken();
+        if (userApp.getLevel() == 3) {
+            return null;
+        }
+
+        SystemConfig systemConfig = new SystemConfig();
+        systemConfig.setPropertyKey("upgradeImg" + userApp.getLevel());
+        systemConfig = configService.querySystemConfig(systemConfig);
+
+        return systemConfig.getPropertyValue();
+    }
+
+    @Override
+    public Map<String, Object> appPaySuccessPageData() {
+        Map<String, Object> result = new HashMap<>();
+
+        UserApp userApp = userAppService.queryUserAppByToken();
+
+        MerchantQrcode merchantQrcode = new MerchantQrcode();
+        merchantQrcode.setMerchantCode(userApp.getMerchantCode());
+        merchantQrcode = merchantQrcodeService.getOne(new QueryWrapper<>(merchantQrcode));
+
+        if (merchantQrcode == null) {
+            merchantQrcode = new MerchantQrcode();
+        }
+
+        result.put("wxInfo", merchantQrcode);
+
+        List<MerchantGuide> merchantGuideList = merchantGuideService.appList();
+
+        result.put("dict", merchantGuideList);
+
+        return result;
+    }
+
+    @Override
+    public SpreadData apiTodaySpreadData() {
+        Calendar cal = Calendar.getInstance();
+        cal.add(Calendar.DAY_OF_MONTH, -1);
+        Date time = cal.getTime();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault());
+
+        String lastDay = sdf.format(time);
+
+        MathContext mathContext = new MathContext(2, RoundingMode.DOWN);
+
+        UserApp userApp = userAppService.queryUserAppByToken();
+        // 此处只能获取直属商户今日数据
+        SpreadData result = todaySpreadData(userApp.getUserId() + "");
+
+        // 获取直属商户以及团队昨日的数据
+        QueryWrapper<UserProfit> qWrapper = new QueryWrapper<>();
+        qWrapper.eq("userId", userApp.getUserId());
+        qWrapper.eq("profitDate", lastDay);
+        UserProfit one = userProfitService.getOne(qWrapper);
+
+        if (one == null) {
+            result.setTeamActiveCount(0L);
+            result.setTeamBillCount(0L);
+            result.setTeamAmt(BigDecimal.ZERO);
+
+            result.setOwnAmtPreCompare(BigDecimal.valueOf(1));
+            result.setOwnBillCountPreCompare(BigDecimal.valueOf(1));
+            result.setOwnActiveCountPreCompare(BigDecimal.valueOf(1));
+
+            result.setTeamAmtPreCompare(BigDecimal.valueOf(1));
+            result.setTeamBillCountPreCompare(BigDecimal.valueOf(1));
+            result.setTeamActiveCountPreCompare(BigDecimal.valueOf(1));
+
+            return result;
+        } else {
+            result.setTeamBillCount(one.getTransNum().longValue());
+            result.setTeamAmt(one.getTeamTransFlow().add(one.getOwnTransFlow()));
+        }
+
+        if (one.getDirectTransFlow().stripTrailingZeros().equals(BigDecimal.ZERO)) {
+            result.setOwnAmtPreCompare(BigDecimal.valueOf(1));
+        } else {
+            result.setOwnAmtPreCompare(result.getOwnAmt().divide(one.getDirectTransFlow(), RoundingMode.HALF_EVEN).round(mathContext));
+        }
+
+        // 直推的交易笔数占比暂无法计算
+        // if (one.getTransNum() == 0) {
+        //     result.setOwnBillCountPreCompare(BigDecimal.valueOf(1));
+        // } else {
+        //     result.setOwnBillCountPreCompare(BigDecimal.valueOf(1));
+        // }
+
+        UserNumVO userNumVO = new UserNumVO();
+        userNumVO.setUserId(userApp.getUserId());
+        userNumVO.setDateType(UserNumVO.DATE_TYPE_DAY);
+        userNumVO.setDate(lastDay);
+        userNumVO = getUserDirectNumInfo(userNumVO, UserNumVO.DATA_TYPE_MERCHANT);
+
+        result.setTeamActiveCount(userNumVO.getTotalNum().longValue());
+        if (userNumVO.getTotalNum() == 0) {
+            result.setOwnActiveCountPreCompare(BigDecimal.valueOf(1));
+        } else {
+            result.setOwnActiveCountPreCompare(BigDecimal.valueOf(result.getOwnBillCount()).divide(BigDecimal.valueOf(userNumVO.getTotalNum()), RoundingMode.HALF_EVEN).round(mathContext));
+        }
+
+        // result.setOwnActiveCountPreCompare();
+
+        // 获取团队前天数据
+        cal.add(Calendar.DAY_OF_MONTH, -1);
+        time = cal.getTime();
+        String beforeYesterdayStr  = sdf.format(time);
+
+        qWrapper = new QueryWrapper<>();
+        qWrapper.eq("userId", userApp.getUserId());
+        qWrapper.eq("profitDate", beforeYesterdayStr);
+        UserProfit beforeYesterdayUserProfit = userProfitService.getOne(qWrapper);
+
+        if (beforeYesterdayUserProfit == null) {
+            result.setTeamAmtPreCompare(BigDecimal.valueOf(1));
+            result.setTeamBillCountPreCompare(BigDecimal.valueOf(1));
+            result.setTeamActiveCountPreCompare(BigDecimal.valueOf(1));
+
+            return result;
+        }
+
+        if (beforeYesterdayUserProfit.getTeamTransFlow().stripTrailingZeros().equals(BigDecimal.ZERO)) {
+            result.setTeamAmtPreCompare(BigDecimal.valueOf(1));
+        } else {
+            result.setTeamAmtPreCompare(one.getTeamTransFlow().divide(beforeYesterdayUserProfit.getTeamTransFlow(), RoundingMode.DOWN).round(mathContext));
+        }
+
+        if (beforeYesterdayUserProfit.getTransNum() == 0) {
+            result.setTeamBillCountPreCompare(BigDecimal.valueOf(1));
+        } else {
+            result.setTeamBillCountPreCompare(BigDecimal.valueOf(result.getTeamBillCount()).divide(BigDecimal.valueOf(beforeYesterdayUserProfit.getTransNum()), RoundingMode.DOWN).round(mathContext));
+        }
+
+        userNumVO = new UserNumVO();
+        userNumVO.setUserId(userApp.getUserId());
+        userNumVO.setDateType(UserNumVO.DATE_TYPE_DAY);
+        userNumVO.setDate(beforeYesterdayStr);
+        userNumVO = getUserDirectNumInfo(userNumVO, UserNumVO.DATA_TYPE_MERCHANT);
+
+        if (userNumVO.getTotalNum() == 0) {
+            result.setTeamActiveCountPreCompare(BigDecimal.valueOf(1));
+        } else {
+            result.setTeamActiveCountPreCompare(BigDecimal.valueOf(result.getTeamActiveCount()).divide(BigDecimal.valueOf(userNumVO.getTotalNum()), RoundingMode.DOWN).round(mathContext));
+        }
+
+        return result;
+    }
+
+    @Override
+    public SpreadData todaySpreadData(String userId) {
+        return spreadMapper.selectTodaySpreadData(userId);
+    }
+
+    @Override
+    public Page<SpreadData> apiHistorySpreadPageData(Page<SpreadData> page, String type, String target) {
+        UserApp userApp = userAppService.queryUserAppByToken();
+        return historySpreadPageData(userApp.getUserId() + "", page, type, target);
+    }
+
+    @Override
+    public Page<SpreadData> historySpreadPageData(String userId, Page<SpreadData> page, String type, String target) {
+        if (Objects.equals(type, "1")) {
+            if (Objects.equals(target, "1")) {
+                page = spreadMapper.pageDaySpreadPageData(page, userId);
+            } else {
+                page = spreadMapper.pageTeamDaySpreadPageData(page, userId);
+            }
+        }
+
+        if (Objects.equals(type, "2")) {
+            if (Objects.equals(target, "1")) {
+                page = spreadMapper.pageMonthSpreadPageData(page, userId);
+            } else {
+                page = spreadMapper.pageTeamMonthSpreadPageData(page, userId);
+            }
+        }
+
+        if (Objects.equals(type, "3")) {
+            if (Objects.equals(target, "1")) {
+                page = spreadMapper.pageYearSpreadPageData(page, userId);
+            } else {
+                page = spreadMapper.pageTeamYearSpreadPageData(page, userId);
+            }
+        }
+
+        return page;
+    }
+
+    /**
+     * 查询团队交易数据
+     * @date: 2022/1/24 14:25
+     * @param condition:
+     * @return com.baomidou.mybatisplus.extension.plugins.pagination.Page<cn.pluss.platform.vo.UserTeamAchieVO>
+     */
+    @Override
+    public Page<UserTeamAchieVO> userTeamAchiePage(Page<UserTeamAchieVO> page, UserTeamAchieVO condition) {
+        UserApp userApp = userAppService.queryUserAppByToken();
+        MsgException.checkNull(userApp,"请求异常");
+        MsgException.checkNull(condition.getUserId(),"缺失用户ID");
+        condition.setDateType(condition.getDateType() == null ? UserTeamAchieVO.DATE_TYPE_DAY : condition.getDateType());
+        condition.setDataType(condition.getDataType() == null ? UserTeamAchieVO.DATA_TYPE_DIRET : condition.getDataType());
+        Page<UserTeamAchieVO> result = spreadMapper.userTemaAchiePage(page, condition);
+        List<UserTeamAchieVO> records = result.getRecords();
+        if(!records.isEmpty()){
+            for (UserTeamAchieVO vo:records) {
+                UserNumVO data = merchantChannelStatusService.getUserNumInfo(vo.getUserId(),vo.getDate(),condition.getDateType());
+                if(data != null){
+                    vo.setTotalNum(data.getTotalNum());
+                    vo.setAddNum(data.getAddNum());
+                }else{
+                    vo.setTotalNum(0);
+                    vo.setAddNum(0);
+                }
+            }
+        }
+        return result;
+    }
+
+    @Override
+    public UserNumVO getUserDirectNumInfo(UserNumVO vo,int type) {
+        MsgException.checkNull(vo.getUserId(),"缺失用户ID");
+        if(type == UserNumVO.DATA_TYPE_MERCHANT){
+            return merchantChannelStatusService.getUserNumInfo(vo.getUserId(), vo.getDate(), vo.getDateType());
+        }else{
+            return userAppService.getUserNumInfo(vo.getUserId(), vo.getDate(), vo.getDateType());
+        }
+    }
+
+
+    /**
+     * 获取团队交易流水
+     * @date: 2022/1/25 23:53
+     * @param vo:
+     * @return cn.pluss.platform.vo.UserTeamAchieVO
+     */
+    @Override
+    public UserTeamAchieVO getAppUserTeanFlow(UserTeamAchieVO vo) {
+        UserApp userApp = userAppService.queryUserAppByToken();
+        MsgException.checkNull(userApp,"未知请求");
+        MsgException.checkNull(vo.getUserId(),"缺失用户ID");
+        MsgException.checkNull(vo.getDate(),"缺失日期参数！");
+        vo.setDateType(vo.getDateType() == null ? UserTeamAchieVO.DATE_TYPE_DAY : vo.getDateType());
+        vo.setDataType(vo.getDataType() == null ? UserTeamAchieVO.DATA_TYPE_DIRET : vo.getDataType());
+        UserTeamAchieVO result = spreadMapper.getAppUserTeanFlow(vo);
+        if(result == null){
+            result = new UserTeamAchieVO();
+            result.setTradeAmt(BigDecimal.ZERO);
+            result.setTradeNum(0);
+        }
+        return result;
+    }
+}
diff --git a/pluss-api-page/src/main/resources/application-dev.yml b/pluss-api-page/src/main/resources/application-dev.yml
new file mode 100644
index 0000000..9ca9e82
--- /dev/null
+++ b/pluss-api-page/src/main/resources/application-dev.yml
@@ -0,0 +1,16 @@
+spring:
+  datasource:
+      url: jdbc:mysql://60.205.224.68:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8
+      username: root
+      password: CZGmysqlroot@123
+      driver-class-name: com.mysql.jdbc.Driver
+parameter:
+  ### 这个根据自己的情况配置
+  domain:
+
+swagger:
+  ### 生产环境不允许访问swagger
+  production: false
+
+logging:
+  config: classpath:log4j2-dev.xml
diff --git a/pluss-api-page/src/main/resources/application-prod.yml b/pluss-api-page/src/main/resources/application-prod.yml
new file mode 100644
index 0000000..19a9c13
--- /dev/null
+++ b/pluss-api-page/src/main/resources/application-prod.yml
@@ -0,0 +1,16 @@
+spring:
+  datasource:
+    url:
+    username:
+    password:
+    driver-class-name: com.mysql.jdbc.Driver
+
+rabbitmq:
+  enabled: true
+
+swagger:
+  ### 生产环境不允许访问swagger
+  production: true
+
+logging:
+  config: classpath:log4j2-prod.xml
diff --git a/pluss-api-page/src/main/resources/application-test.yml b/pluss-api-page/src/main/resources/application-test.yml
new file mode 100644
index 0000000..4c2492a
--- /dev/null
+++ b/pluss-api-page/src/main/resources/application-test.yml
@@ -0,0 +1,14 @@
+# 测试服务器上的数据库连接
+spring:
+  datasource:
+    url:
+    username:
+    password:
+    driver-class-name: com.mysql.jdbc.Driver
+
+parameter:
+  domain:
+
+swagger:
+  ### 生产环境不允许访问swagger
+  production: true
diff --git a/pluss-api-page/src/main/resources/application.yml b/pluss-api-page/src/main/resources/application.yml
new file mode 100644
index 0000000..549411a
--- /dev/null
+++ b/pluss-api-page/src/main/resources/application.yml
@@ -0,0 +1,27 @@
+spring:
+  output:
+    ansi:
+      enabled: always
+  profiles:
+    ###  将一些固定的配置放到下级文件夹下的yml文件中
+    include: common, ryx, ys
+    active: dev
+  mvc:
+    view:
+      prefix: /WEB-INF/jsp/
+      suffix: .jsp
+  resources:
+    static-locations: classpath:/static
+  datasource:
+    druid:
+      break-after-acquire-failure: true
+      connection-error-retry-attempts: 1
+  task:
+    execution:
+      pool:
+        max-size: 20
+
+server:
+  servlet:
+    context-path: /api
+  port: 7004
diff --git a/pluss-api-page/src/main/resources/log4j2-dev.xml b/pluss-api-page/src/main/resources/log4j2-dev.xml
new file mode 100644
index 0000000..0932fdd
--- /dev/null
+++ b/pluss-api-page/src/main/resources/log4j2-dev.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--日志级别以及优先级排序: OFF > FATAL > ERROR > WARN > INFO > DEBUG > TRACE > ALL -->
+<!--Configuration后面的status，这个用于设置log4j2自身内部的信息输出，可以不设置，当设置成trace时，你会看到log4j2内部各种详细输出-->
+<!--monitorInterval：Log4j能够自动检测修改配置 文件和重新配置本身，设置间隔秒数-->
+<configuration status="WARN" monitorInterval="30">
+    <!--先定义所有的appender-->
+    <appenders>
+        <!--这个输出控制台的配置-->
+        <console name="Console" target="SYSTEM_OUT">
+            <!--输出日志的格式-->
+            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p - %c{1.} - %m%n"/>
+        </console>
+        <!--文件会打印出所有信息，这个log每次运行程序会自动清空，由append属性决定，这个也挺有用的，适合临时测试用-->
+        <File name="log" fileName="${sys:user.home}/manage/logs/manage.log" append="false">
+            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %c{1.} - %msg%xEx%n" />
+        </File>
+        <!--<File name="log" fileName="d:/crystal/logs/manage.log" append="false">
+            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %class{36} %c - %msg%xEx%n" />
+        </File>-->
+        <!-- 这个会打印出所有的info及以下级别的信息，每次大小超过size，则这size大小的日志会自动存入按年份-月份建立的文件夹下面并进行压缩，作为存档-->
+        <RollingFile name="RollingFileInfo" fileName="${sys:user.home}/syb/logs/info.log"
+                     filePattern="${sys:user.home}/syb/logs/$${date:yyyy-MM}/info-%d{yyyy-MM-dd}-%i.log">
+            <!--控制台只输出level及以上级别的信息（onMatch），其他的直接拒绝（onMismatch）-->
+            <ThresholdFilter level="info" onMatch="ACCEPT" onMismatch="DENY"/>
+            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss:SSS} %p - %c{1.} - %m%n"/>
+            <Policies>
+                <TimeBasedTriggeringPolicy modulate="true" interval="1"/>
+                <SizeBasedTriggeringPolicy size="100 MB"/>
+            </Policies>
+        </RollingFile>
+        <RollingFile name="RollingFileWarn" fileName="${sys:user.home}/syb/logs/warn.log"
+                     filePattern="${sys:user.home}/syb/logs/$${date:yyyy-MM}/warn-%d{yyyy-MM-dd}-%i.log">
+            <ThresholdFilter level="warn" onMatch="ACCEPT" onMismatch="DENY"/>
+            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss:SSS} %p - %c{1.} - %m%n"/>
+            <Policies>
+                <TimeBasedTriggeringPolicy modulate="true" interval="1"/>
+                <SizeBasedTriggeringPolicy size="100 MB"/>
+            </Policies>
+            <!-- DefaultRolloverStrategy属性如不设置，则默认为最多同一文件夹下7个文件，这里设置了20 -->
+            <DefaultRolloverStrategy max="20"/>
+        </RollingFile>
+        <RollingFile name="RollingFileError" fileName="${sys:user.home}/syb/logs/error.log"
+                     filePattern="${sys:user.home}/syb/logs/$${date:yyyy-MM}/error-%d{yyyy-MM-dd}-%i.log">
+            <ThresholdFilter level="error" onMatch="ACCEPT" onMismatch="DENY"/>
+            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss:SSS} %p - %c{1.} - %m%n"/>
+            <Policies>
+                <TimeBasedTriggeringPolicy modulate="true" interval="1"/>
+                <SizeBasedTriggeringPolicy size="100 MB"/>
+            </Policies>
+        </RollingFile>
+    </appenders>
+    <!--然后定义logger，只有定义了logger并引入的appender，appender才会生效-->
+    <loggers>
+        <!--过滤掉spring和mybatis的一些无用的DEBUG信息-->
+        <logger name="cn.pluss.platform.mapper" level="DEBUG"></logger>
+        <logger name="cn.pluss.platform.ryx" level="DEBUG"></logger>
+        <logger name="cn.pluss.platform.ys" level="DEBUG"></logger>
+        <logger name="org.apache.http.impl.conn.PoolingHttpClientConnectionManager" level="INFO"></logger>
+
+        <root level="DEBUG">
+            <appender-ref ref="Console"/>
+            <appender-ref ref="RollingFileInfo"/>
+            <appender-ref ref="RollingFileWarn"/>
+            <appender-ref ref="RollingFileError"/>
+        </root>
+    </loggers>
+</configuration>
\ No newline at end of file
diff --git a/pluss-api-page/src/main/resources/log4j2-prod.xml b/pluss-api-page/src/main/resources/log4j2-prod.xml
new file mode 100644
index 0000000..41b9ecb
--- /dev/null
+++ b/pluss-api-page/src/main/resources/log4j2-prod.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--日志级别以及优先级排序: OFF > FATAL > ERROR > WARN > INFO > DEBUG > TRACE > ALL -->
+<!--Configuration后面的status，这个用于设置log4j2自身内部的信息输出，可以不设置，当设置成trace时，你会看到log4j2内部各种详细输出-->
+<!--monitorInterval：Log4j能够自动检测修改配置 文件和重新配置本身，设置间隔秒数-->
+<configuration status="WARN" monitorInterval="30">
+    <!--先定义所有的appender-->
+    <appenders>
+        <!--这个输出控制台的配置-->
+        <console name="Console" target="SYSTEM_OUT">
+            <!--输出日志的格式-->
+            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p - %c{1.} - %m%n"/>
+        </console>
+        <!--文件会打印出所有信息，这个log每次运行程序会自动清空，由append属性决定，这个也挺有用的，适合临时测试用-->
+        <File name="log" fileName="${sys:user.home}/manage/logs/manage.log" append="false">
+            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %c{1.} - %msg%xEx%n" />
+        </File>
+        <!--<File name="log" fileName="d:/crystal/logs/manage.log" append="false">
+            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %class{36} %c - %msg%xEx%n" />
+        </File>-->
+        <!-- 这个会打印出所有的info及以下级别的信息，每次大小超过size，则这size大小的日志会自动存入按年份-月份建立的文件夹下面并进行压缩，作为存档-->
+        <RollingFile name="RollingFileInfo" fileName="${sys:user.home}/syb/logs/info.log"
+                     filePattern="${sys:user.home}/syb/logs/$${date:yyyy-MM}/info-%d{yyyy-MM-dd}-%i.log">
+            <!--控制台只输出level及以上级别的信息（onMatch），其他的直接拒绝（onMismatch）-->
+            <ThresholdFilter level="info" onMatch="ACCEPT" onMismatch="DENY"/>
+            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss:SSS} %p - %c{1.} - %m%n"/>
+            <Policies>
+                <TimeBasedTriggeringPolicy modulate="true" interval="1"/>
+                <SizeBasedTriggeringPolicy size="100 MB"/>
+            </Policies>
+        </RollingFile>
+        <RollingFile name="RollingFileWarn" fileName="${sys:user.home}/syb/logs/warn.log"
+                     filePattern="${sys:user.home}/syb/logs/$${date:yyyy-MM}/warn-%d{yyyy-MM-dd}-%i.log">
+            <ThresholdFilter level="warn" onMatch="ACCEPT" onMismatch="DENY"/>
+            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss:SSS} %p - %c{1.} - %m%n"/>
+            <Policies>
+                <TimeBasedTriggeringPolicy modulate="true" interval="1"/>
+                <SizeBasedTriggeringPolicy size="100 MB"/>
+            </Policies>
+            <!-- DefaultRolloverStrategy属性如不设置，则默认为最多同一文件夹下7个文件，这里设置了20 -->
+            <DefaultRolloverStrategy max="20"/>
+        </RollingFile>
+        <RollingFile name="RollingFileError" fileName="${sys:user.home}/syb/logs/error.log"
+                     filePattern="${sys:user.home}/syb/logs/$${date:yyyy-MM}/error-%d{yyyy-MM-dd}-%i.log">
+            <ThresholdFilter level="error" onMatch="ACCEPT" onMismatch="DENY"/>
+            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss:SSS} %p - %c{1.} - %m%n"/>
+            <Policies>
+                <TimeBasedTriggeringPolicy modulate="true" interval="1"/>
+                <SizeBasedTriggeringPolicy size="100 MB"/>
+            </Policies>
+        </RollingFile>
+    </appenders>
+    <!--然后定义logger，只有定义了logger并引入的appender，appender才会生效-->
+    <loggers>
+        <!--过滤掉spring和mybatis的一些无用的DEBUG信息-->
+        <!--        <logger name="org.apache.shiro" level="INFO"></logger>-->
+        <!--        <logger name="org.springframework" level="INFO"></logger>-->
+        <!--        <logger name="com.baomidou.mybatisplus.core.MybatisConfiguration" level="INFO"></logger>-->
+        <!--        <logger name="com.baomidou.mybatisplus.core.MybatisConfiguration" level="INFO"></logger>-->
+        <!--        <logger name="com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean" level="INFO"></logger>-->
+        <!--        <logger name="org.springframework.web.servlet.mvc.method.annotation.RequestResponseBodyMethodProcessor" level="INFO"></logger>-->
+        <!--        <logger name="org.mybatis" level="INFO" ></logger>-->
+        <!--        <logger name="cn.pluss.platform.mapper" level="DEBUG"></logger>-->
+        <!--        <logger name="org.apache.http.wire" level="INFO"></logger>-->
+        <!--        <logger name="org.apache.http.headers" level="INFO"></logger>-->
+        <root level="INFO">
+            <appender-ref ref="Console"/>
+<!--            <appender-ref ref="RollingFileInfo"/>-->
+<!--            <appender-ref ref="RollingFileWarn"/>-->
+<!--            <appender-ref ref="RollingFileError"/>-->
+        </root>
+    </loggers>
+</configuration>
\ No newline at end of file
diff --git a/pluss-api-page/src/main/resources/mapper/ImgReflectMapper.xml b/pluss-api-page/src/main/resources/mapper/ImgReflectMapper.xml
new file mode 100644
index 0000000..3f3ac46
--- /dev/null
+++ b/pluss-api-page/src/main/resources/mapper/ImgReflectMapper.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.ImgReflectMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.ImgReflect">
+        <id column="id" property="id" />
+        <result column="localUrl" property="localUrl" />
+        <result column="ossUrl" property="ossUrl" />
+        <result column="createTime" property="createTime" />
+        <result column="updateTime" property="updateTime" />
+    </resultMap>
+
+    <select id="selectIdCardUrl" resultType="java.util.Map">
+        SELECT ic.id, ic.imgPositive, ic.imgNegative, ir.ossUrl imgPositiveOSS, ir2.ossUrl imgNegativeOSS
+        FROM tb_pluss_id_card ic
+        LEFT JOIN tb_pluss_img_reflect ir ON ir.localUrl = ic.imgPositive
+        LEFT JOIN tb_pluss_img_reflect ir2 ON ir2.localUrl = ic.imgNegative
+        WHERE NOT ((
+            INSTR(imgPositive, "C:/") > 0
+            AND imgPositive IS NOT NULL
+        ) OR (
+            INSTR(imgNegative, "C:/") > 0
+            AND imgNegative IS NOT NULL
+        ))
+        AND NOT (INSTR(imgPositive, "https://syb-resource") > 0 AND INSTR(imgNegative, "https://syb-resource") > 0)
+        AND (ir.ossUrl IS NULL OR ir2.ossUrl IS NULL)
+    </select>
+
+    <select id="selectBankCardUrl" resultType="java.util.Map">
+        SELECT
+            bc.id,
+            bc.imgUrl,
+            ir.ossUrl imgUrlOSS
+        FROM
+            tb_pluss_bank_card bc
+            LEFT JOIN tb_pluss_img_reflect ir ON ir.localUrl = bc.imgUrl
+        WHERE
+            NOT (
+                INSTR( bc.imgUrl, "C:/" ) > 0
+                AND bc.imgUrl IS NOT NULL
+            ) AND (
+                INSTR( bc.imgUrl, "https://syb-resource" ) = 0
+                AND bc.imgUrl IS NOT NULL
+                AND bc.imgUrl != ''
+            ) AND ir.ossUrl IS NULL
+        UNION
+        SELECT
+            bc.id,
+            bc.licenseUrl imgUrl,
+            ir.ossUrl imgUrlOSS
+        FROM
+            tb_pluss_bank_card bc
+            LEFT JOIN tb_pluss_img_reflect ir ON ir.localUrl = bc.licenseUrl
+        WHERE
+            NOT (
+                INSTR( bc.licenseUrl, "C:/" ) > 0
+                AND bc.licenseUrl IS NOT NULL
+            )
+            AND (
+                INSTR( bc.licenseUrl, "https://syb-resource" ) = 0
+                AND bc.licenseUrl IS NOT NULL
+                AND bc.licenseUrl != ''
+            ) AND ir.ossUrl IS NULL
+    </select>
+
+    <select id="selectStoreImgUrl" resultType="java.util.Map">
+        SELECT
+            mi.id,
+            mi.picUrl imgUrl,
+            ir.ossUrl imgUrlOSS
+        FROM
+            tb_pluss_merchant_image mi
+            LEFT JOIN tb_pluss_img_reflect ir ON ir.localUrl = mi.picUrl
+        WHERE
+            NOT (
+                INSTR( mi.picUrl, "C:/" ) > 0
+                AND mi.picUrl IS NOT NULL
+            ) AND (
+                INSTR( mi.picUrl, "https://syb-resource" ) = 0
+                AND mi.picUrl IS NOT NULL
+                AND mi.picUrl != ''
+            ) AND ir.ossUrl IS NULL
+    </select>
+
+    <select id="selectUserLogo" resultType="java.util.Map">
+        SELECT
+            ua.id,
+            ua.logo imgUrl,
+            ir.ossUrl imgUrlOSS
+        FROM
+            tb_pluss_user_app ua
+            LEFT JOIN tb_pluss_img_reflect ir ON ir.localUrl = ua.logo
+        WHERE
+            NOT (
+                INSTR( ua.logo, "C:/" ) > 0
+                AND ua.logo IS NOT NULL
+            ) AND (
+                INSTR( ua.logo, "https://syb-resource" ) = 0
+                AND ua.logo IS NOT NULL
+                AND ua.logo != ''
+            ) AND ir.ossUrl IS NULL
+    </select>
+</mapper>
diff --git a/pluss-api-page/src/main/resources/mapper/SpreadMapper.xml b/pluss-api-page/src/main/resources/mapper/SpreadMapper.xml
new file mode 100644
index 0000000..59be78f
--- /dev/null
+++ b/pluss-api-page/src/main/resources/mapper/SpreadMapper.xml
@@ -0,0 +1,523 @@
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.SpreadMapper">
+
+    <select id="selectDirectUser" resultType="cn.pluss.platform.entity.UserApp">
+        SELECT
+            ua.userId,
+            ua.parentId,
+            ui.loginName,
+            IFNULL(mr.rate, 38) rate,
+            ui.phone,
+            ua.userName,
+            ua.createDt,
+            mbi.alias,
+            ua.agentStaffId,
+            ua.`level`,
+            ua.`logo`,
+            mcs.remark auditReason,
+            IF (
+                (ua.bankStatus != 3 OR ua.bankStatus IS NULL), 1,
+                CASE mcs.`status`
+                WHEN '1' THEN IF(mcs.`thirdStatus` = '5', 6, 3)
+                WHEN '8' THEN 6
+                WHEN '2' THEN 4
+                WHEN '5' THEN 4
+                WHEN '3' THEN 5
+                WHEN '4' THEN 5
+                ELSE IF(mcs.`thirdStatus` = -100, 4, 2) END
+            ) `status`
+        FROM
+            tb_pluss_user_app ua
+        LEFT JOIN tb_pluss_merchant_rate mr ON ua.userId = mr.userId
+        LEFT JOIN tb_pluss_user_info ui ON ui.id = ua.userId
+        LEFT JOIN tb_pluss_merchant_base_info mbi ON ua.merchantCode = mbi.merchantCode
+        LEFT JOIN
+                (
+                    SELECT mcs.merchantCode, mcs.remark, mcs.`status`, mcs.`thirdStatus` FROM tb_pluss_merchant_channel_status mcs
+                    LEFT JOIN (
+                        SELECT merchantCode, MAX(valid) maxValid, MIN(id) minId FROM tb_pluss_merchant_channel_status mcs
+                        GROUP BY merchantCode
+                    ) t ON mcs.merchantCode = t.merchantCode AND mcs.valid = t.maxValid
+                    WHERE (t.maxValid = 1) OR
+                    (t.maxValid = 0 AND t.minId = mcs.id)
+                ) mcs ON mcs.merchantCode = ua.merchantCode
+        <where>
+            ua.parentId = #{condition.userId}
+            AND LOCATE('@', ui.loginName) = 0
+            AND LENGTH(ui.loginName) = 11
+            <if test="condition.agentStaffIds != null and condition.agentStaffIds.size() > 0">
+                AND ua.agentStaffId IN
+                <foreach collection="condition.agentStaffIds" open="(" separator="," close=")" item="item">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="condition.alias != null and condition.alias != ''">
+                AND mbi.alias LIKE CONCAT('%', #{condition.alias}, '%')
+            </if>
+            <if test="condition.userName != null and condition.userName != ''">
+                AND ua.userName LIKE CONCAT('%', #{condition.userName}, '%')
+            </if>
+            <if test="condition.phone != null and condition.phone != ''">
+                AND ui.phone LIKE CONCAT('%', #{condition.phone}, '%')
+            </if>
+            <if test="condition.startTime != null and condition.startTime != ''">
+                AND ua.createDt &gt;= #{condition.startTime}
+            </if>
+            <if test="condition.endTime != null and condition.endTime != ''">
+                AND ua.createDt &lt; #{condition.endTime}
+            </if>
+            <if test="condition.status != null and condition.status != ''">
+                <choose>
+                    <when test='condition.status == "1"'>
+                        AND (
+                            ua.bankStatus != 3
+                            OR ua.bankStatus IS NULL
+                        )
+                    </when>
+                    <when test='condition.status == "3"'>
+                        AND mcs.`status` = '1'
+                    </when>
+                    <when test='condition.status == "4"'>
+                        AND (
+                            mcs.`status` = '2'
+                            OR (mcs.`status` = '0' AND mcs.`thirdStatus` != '-100')
+                            OR mcs.`status` = '5'
+                        )
+                    </when>
+                    <when test='condition.status == "5"'>
+                        AND (
+                            mcs.`status` = '3'
+                            OR mcs.`status` = '4'
+                        )
+                    </when>
+                    <when test='condition.status == "2"'>
+                        AND (
+                            ua.bankStatus = 3
+                            AND
+                            (
+                                mcs.`status` = '0'
+                                OR mcs.`status` IS NULL
+                            )
+                        )
+                    </when>
+                </choose>
+            </if>
+        </where>
+        ORDER BY ua.createDt DESC
+    </select>
+
+    <select id="selectPmtSubUser" resultType="cn.pluss.platform.entity.UserApp">
+        SELECT
+            ua.userId,
+            ui.loginName,
+            ua.parentId,
+            IFNULL(mr.rate, 38) rate,
+            ui.phone,
+            ua.userName,
+            ua.createDt,
+            mbi.alias,
+            ua.agentStaffId,
+            ua.`level`,
+            ua.`logo`,
+            mcs.remark auditReason,
+            IF (
+                (ua.bankStatus != 3 OR ua.bankStatus IS NULL), 1,
+                CASE mcs.`status`
+                WHEN '1' THEN IF(mcs.`thirdStatus` = '5', 6, 3)
+                WHEN '8' THEN 6
+                WHEN '2' THEN 4
+                WHEN '5' THEN 4
+                WHEN '3' THEN 5
+                WHEN '4' THEN 5
+                ELSE IF(mcs.`thirdStatus` = -100, 4, 2) END
+            ) `status`
+        FROM
+        (
+            (
+                SELECT ua1.userId
+                FROM tb_pluss_user_app ua
+                LEFT JOIN tb_pluss_user_app ua1
+                ON ua.userId = ua1.parentId
+                WHERE ua.parentId = #{condition.userId}
+            )
+            UNION
+            (
+                SELECT ua2.userId
+                FROM tb_pluss_user_app ua
+                LEFT JOIN tb_pluss_user_app ua1
+                ON ua.userId = ua1.parentId
+                LEFT JOIN tb_pluss_user_app ua2
+                ON ua1.userId = ua2.parentId
+                WHERE ua.parentId = #{condition.userId}
+            )
+        ) userIdList
+        LEFT JOIN tb_pluss_user_app ua ON ua.userId = userIdList.userId
+        LEFT JOIN tb_pluss_merchant_rate mr ON ua.userId = mr.userId
+        LEFT JOIN tb_pluss_user_info ui ON ui.id = ua.userId
+        LEFT JOIN tb_pluss_merchant_base_info mbi ON ua.merchantCode = mbi.merchantCode
+        LEFT JOIN tb_pluss_merchant_channel_status mcs ON mcs.merchantCode = ua.merchantCode
+        <where>
+            LOCATE('@', ui.loginName) = 0
+            AND LENGTH(ui.loginName) = 11
+            <if test="condition.agentStaffIds != null and condition.agentStaffIds.size() > 0">
+                AND ua.agentStaffId IN
+                <foreach collection="condition.agentStaffIds" open="(" separator="," close=")" item="item">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="condition.alias != null and condition.alias != ''">
+                AND mbi.alias LIKE CONCAT('%', #{condition.alias}, '%')
+            </if>
+            <if test="condition.userName != null and condition.userName != ''">
+                AND ua.userName LIKE CONCAT('%', #{condition.userName}, '%')
+            </if>
+            <if test="condition.phone != null and condition.phone != ''">
+                AND ui.phone LIKE CONCAT('%', #{condition.phone}, '%')
+            </if>
+            <if test="condition.startTime != null and condition.startTime != ''">
+                AND ua.createDt &gt;= #{condition.startTime}
+            </if>
+            <if test="condition.endTime != null and condition.endTime != ''">
+                AND ua.createDt &lt; #{condition.endTime}
+            </if>
+            <if test="condition.status != null and condition.status != ''">
+                <choose>
+                    <when test='condition.status == "1"'>
+                        AND (
+                            ua.bankStatus != 3
+                            OR ua.bankStatus IS NULL
+                        )
+                    </when>
+                    <when test='condition.status == "3"'>
+                        AND mcs.`status` = '1'
+                    </when>
+                    <when test='condition.status == "4"'>
+                        AND (
+                            mcs.`status` = '2'
+                            OR mcs.`status` = '5'
+                        )
+                    </when>
+                    <when test='condition.status == "5"'>
+                        AND (
+                            mcs.`status` = '3'
+                            OR mcs.`status` = '4'
+                        )
+                    </when>
+                    <when test='condition.status == "2"'>
+                        AND (
+                            ua.bankStatus = 3
+                            AND (
+                                mcs.`status` = '0'
+                                OR mcs.`status` IS NULL
+                            )
+                        )
+                    </when>
+                </choose>
+            </if>
+        </where>
+        ORDER BY ua.createDt DESC
+    </select>
+
+    <select id="selectAgentSubUser" resultType="cn.pluss.platform.entity.UserApp">
+        SELECT
+            ua.userId,
+            ua.parentId,
+            ui.loginName,
+            IFNULL(mr.rate, 38) rate,
+            ui.phone,
+            ua.userName,
+            ua.createDt,
+            mbi.alias,
+            ua.agentStaffId,
+            ua.`level`,
+            ua.`logo`,
+            mcs.remark auditReason,
+            IF (
+                (ua.bankStatus != 3 OR ua.bankStatus IS NULL), 1,
+                CASE mcs.`status`
+                WHEN '1' THEN 3
+                WHEN '2' THEN 4
+                WHEN '3' THEN 5
+                ELSE 2 END
+            ) `status`
+        FROM
+        (
+            (
+                SELECT ua1.userId
+                FROM tb_pluss_user_app ua
+                LEFT JOIN tb_pluss_user_app ua1
+                ON ua.userId = ua1.parentId
+                WHERE ua.parentId = #{condition.userId}
+                AND ua.userType = 'agent'
+                AND LOCATE(#{condition.userId}, ua.pIdArr ) > 0
+            )
+            UNION
+            (
+                SELECT ua1.userId
+                FROM tb_pluss_user_app ua
+                LEFT JOIN tb_pluss_user_app ua1
+                ON ua.userId = ua1.parentId
+                WHERE ua.parentId = #{condition.userId}
+                AND ua.userType = 'promoter'
+            )
+            UNION
+            (
+                SELECT ua2.userId
+                FROM tb_pluss_user_app ua
+                LEFT JOIN tb_pluss_user_app ua1
+                ON ua.userId = ua1.parentId
+                LEFT JOIN tb_pluss_user_app ua2
+                ON ua1.userId = ua2.parentId
+                WHERE ua.parentId = #{condition.userId}
+                AND ua.userType = 'promoter'
+            )
+        ) userIdList
+        LEFT JOIN tb_pluss_user_app ua ON ua.userId = userIdList.userId
+        LEFT JOIN tb_pluss_merchant_rate mr ON ua.userId = mr.userId
+        LEFT JOIN tb_pluss_user_info ui ON ui.id = ua.userId
+        LEFT JOIN tb_pluss_merchant_base_info mbi ON ua.merchantCode = mbi.merchantCode
+        LEFT JOIN tb_pluss_merchant_channel_status mcs ON mcs.merchantCode = ua.merchantCode
+        <where>
+            LOCATE('@', ui.loginName) = 0
+            AND LENGTH(ui.loginName) = 11
+            <if test="condition.agentStaffIds != null and condition.agentStaffIds.size() > 0">
+                AND ua.agentStaffId IN
+                <foreach collection="condition.agentStaffIds" open="(" separator="," close=")" item="item">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="condition.alias != null and condition.alias != ''">
+                AND mbi.alias LIKE CONCAT('%', #{condition.alias}, '%')
+            </if>
+            <if test="condition.userName != null and condition.userName != ''">
+                AND ua.userName LIKE CONCAT('%', #{condition.userName}, '%')
+            </if>
+            <if test="condition.phone != null and condition.phone != ''">
+                AND ui.phone LIKE CONCAT('%', #{condition.phone}, '%')
+            </if>
+            <if test="condition.startTime != null and condition.startTime != ''">
+                AND ua.createDt &gt;= #{condition.startTime}
+            </if>
+            <if test="condition.endTime != null and condition.endTime != ''">
+                AND ua.createDt &lt; #{condition.endTime}
+            </if>
+            <if test="condition.status != null and condition.status != ''">
+                <choose>
+                    <when test='condition.status == "1"'>
+                        AND (
+                            ua.bankStatus != 3
+                            OR ua.bankStatus IS NULL
+                        )
+                    </when>
+                    <when test='condition.status == "3"'>
+                        AND mcs.`status` = '1'
+                    </when>
+                    <when test='condition.status == "4"'>
+                        AND (
+                            mcs.`status` = '2'
+                            OR mcs.`status` = '5'
+                        )
+                    </when>
+                    <when test='condition.status == "5"'>
+                        AND (
+                            mcs.`status` = '3'
+                            OR mcs.`status` = '4'
+                        )
+                    </when>
+                    <when test='condition.status == "2"'>
+                        AND (
+                            ua.bankStatus = 3
+                            AND (
+                                mcs.`status` = '0'
+                                OR mcs.`status` IS NULL
+                            )
+                        )
+                    </when>
+                </choose>
+            </if>
+        </where>
+        ORDER BY ua.createDt DESC
+    </select>
+
+    <!-- 查询团队交易数据 -->
+    <select id="userTemaAchiePage" resultType="cn.pluss.platform.vo.UserTeamAchieVO">
+        SELECT
+        <choose>
+            <when test="condition.dataType == null or condition.dataType == 1">
+                <if test="condition.dateType == null or condition.dateType == 1">
+                    SUM(ownTransFlow) as tradeAmt ,SUM(transNum) as tradeNum,profitDate as `date`,userId, 1 as dateType
+                </if>
+                <if test="condition.dateType == 2">
+                    SUM(ownTransFlow) as tradeAmt,SUM(transNum) as tradeNum,profitMonth as `date`,userId,2 as dateType
+                </if>
+                <if test="condition.dateType == 3">
+                    SUM(ownTransFlow) as tradeAmt,SUM(transNum) as tradeNum,DATE_FORMAT(profitDate,'%Y') as `date`,userId,3 as dateType
+                </if>
+            </when>
+            <otherwise>
+                <if test="condition.dateType == null or condition.dateType == 1">
+                    (teamTransFlow) as tradeAmt ,transNum as tradeNum,profitDate as `date`,userId, 1 as dateType
+                </if>
+                <if test="condition.dateType == 2">
+                    SUM(teamTransFlow) as tradeAmt,SUM(transNum) as tradeNum,profitMonth as `date`,userId,2 as dateType
+                </if>
+                <if test="condition.dateType == 3">
+                    SUM(teamTransFlow) as tradeAmt,SUM(transNum) as tradeNum,DATE_FORMAT(profitDate,'%Y') as `date`,userId,3 as dateType
+                </if>
+            </otherwise>
+        </choose>
+
+        from  tb_pluss_user_profit where
+        <choose>
+            <when test="condition.dataType == null or condition.dataType == 1">
+                parentId = #{condition.userId} and  ownTransFlow != 0 and teamTransFlow = 0
+            </when>
+            <otherwise>
+                userId = #{condition.userId}
+            </otherwise>
+        </choose>
+        <if test="condition.dateType == null or condition.dateType == 1">
+            group by profitDate
+        </if>
+        <if test="condition.dateType == 2">
+            group by profitMonth
+        </if>
+        <if test="condition.dateType == 3">
+            group by DATE_FORMAT(profitDate,'%Y')
+        </if>
+        order by
+        <if test="condition.dateType == null or condition.dateType == 1">
+             profitDate
+        </if>
+        <if test="condition.dateType == 2">
+             profitMonth
+        </if>
+        <if test="condition.dateType == 3">
+             DATE_FORMAT(profitDate,'%Y')
+        </if>
+        desc
+
+    </select>
+
+    <select id="selectTodaySpreadData" resultType="cn.pluss.platform.vo.SpreadData">
+        SELECT
+            IFNULL(SUM(IF(mo.`status` = 1, mo.consumeFee, IF(mo.`status` = 2, -mo.consumeFee, 0))), 0.00) ownAmt,
+            COUNT(DISTINCT IF(mo.`status` = 1, mo.orderNumber, 0)) ownBillCount,
+            COUNT(DISTINCT IF(mo.`status` = 1 || mo.`status` = 2, mo.merchantCode, 0)) ownActiveCount,
+            COUNT(DISTINCT IF(ua.createDt > CURRENT_DATE, ua.userId, 0)) ownNewCount,
+            CURRENT_DATE date
+        FROM tb_pluss_user_app ua
+             LEFT JOIN tb_pluss_user_app sua ON ua.userId = sua.parentId
+             LEFT JOIN tb_pluss_merchant_order mo ON mo.merchantCode = ua.merchantCode AND mo.createDate = CURRENT_DATE
+        WHERE ua.parentId = #{userId} AND ua.userType = 'promoter' AND ua.userType = 'promoter'
+    </select>
+
+    <select id="pageDaySpreadPageData" resultType="cn.pluss.platform.vo.SpreadData">
+        SELECT startDate date, COUNT(DISTINCT IF(createDate &lt;= startDate, merchantCode, NULL)) ownActiveCount
+                , COUNT(DISTINCT IF(createDate = startDate, merchantCode, NULL)) ownNewCount
+                , SUM(amount) ownAmt, SUM(count) ownBillCount
+        FROM (
+            SELECT DISTINCT DATE_FORMAT(ua.createDt, '%Y-%m-%d') createDate, ua.merchantCode, ua.userId, mbs.amount, mbs.count, mbs.startDate
+            FROM tb_pluss_user_app ua
+            LEFT JOIN tb_pluss_merchant_channel_status mcs ON ua.merchantCode = mcs.merchantCode
+            LEFT JOIN tb_pluss_merchant_bill_statistics mbs ON mbs.userId = ua.userId
+            WHERE ua.parentId = #{userId} AND mbs.type = 1 AND mcs.status = 3
+        ) t  GROUP BY startDate
+    </select>
+
+    <select id="pageMonthSpreadPageData" resultType="cn.pluss.platform.vo.SpreadData">
+        SELECT startDate month, COUNT(DISTINCT IF(createDate &lt;= startDate, merchantCode, NULL)) ownActiveCount, SUM(amount) ownAmt, SUM(count) ownBillCount
+                              , COUNT(DISTINCT IF(createDate = startDate, merchantCode, NULL)) ownNewCount
+        FROM (
+            SELECT DISTINCT DATE_FORMAT(ua.createDt, '%Y-%m') createDate, ua.merchantCode, ua.userId, mbs.amount, mbs.count, DATE_FORMAT(mbs.startDate, '%Y-%m') startDate
+            FROM tb_pluss_user_app ua
+            LEFT JOIN tb_pluss_merchant_channel_status mcs ON ua.merchantCode = mcs.merchantCode
+            LEFT JOIN tb_pluss_merchant_bill_statistics mbs ON mbs.userId = ua.userId
+            WHERE ua.parentId = #{userId} AND mbs.type = 1 AND mcs.status = 3
+        ) t  GROUP BY startDate
+    </select>
+
+    <select id="pageYearSpreadPageData" resultType="cn.pluss.platform.vo.SpreadData">
+        SELECT startDate year, COUNT(DISTINCT IF(createDate &lt;= startDate, merchantCode, NULL)) ownActiveCount, SUM(amount) ownAmt, SUM(count) ownBillCount
+                             , COUNT(DISTINCT IF(createDate = startDate, merchantCode, NULL)) ownNewCount
+        FROM (
+            SELECT DISTINCT DATE_FORMAT(ua.createDt, '%Y') createDate, ua.merchantCode, ua.userId, mbs.amount, mbs.count, DATE_FORMAT(mbs.startDate, '%Y') startDate
+            FROM tb_pluss_user_app ua
+            LEFT JOIN tb_pluss_merchant_channel_status mcs ON ua.merchantCode = mcs.merchantCode
+            LEFT JOIN tb_pluss_merchant_bill_statistics mbs ON mbs.userId = ua.userId
+            WHERE ua.parentId = #{userId} AND mbs.type = 1 AND mcs.status = 3
+            ) t  GROUP BY startDate
+    </select>
+
+    <select id="pageTeamDaySpreadPageData" resultType="cn.pluss.platform.vo.SpreadData">
+        SELECT startDate date, COUNT(DISTINCT IF(createDate &lt; startDate, merchantCode, NULL)) teamActiveCount, SUM(amount) teamAmt, SUM(count) teamBillCount
+                            , COUNT(DISTINCT IF(createDate = startDate, merchantCode, NULL)) teamNewCount
+        FROM (
+            SELECT DISTINCT DATE_FORMAT(ua2.createDt, '%Y-%m-%d') createDate, ua2.merchantCode, ua2.userId, mbs.amount, mbs.count, mbs.startDate FROM tb_pluss_user_app ua
+            LEFT JOIN tb_pluss_user_app ua2 ON ua2.parentId = ua.userId
+            LEFT JOIN tb_pluss_merchant_channel_status mcs ON ua.merchantCode = mcs.merchantCode
+            LEFT JOIN tb_pluss_merchant_bill_statistics mbs ON mbs.userId = ua.userId
+            WHERE ua.parentId = #{userId} AND mbs.type = 1 AND mcs.status = 3
+        ) t  GROUP BY startDate
+    </select>
+
+    <select id="pageTeamMonthSpreadPageData" resultType="cn.pluss.platform.vo.SpreadData">
+        SELECT startDate month, COUNT(DISTINCT IF(createDate &lt; startDate, merchantCode, NULL)) teamActiveCount, SUM(amount) teamAmt, SUM(count) teamBillCount
+                              , COUNT(DISTINCT IF(createDate = startDate, merchantCode, NULL)) teamNewCount
+        FROM (
+            SELECT DISTINCT DATE_FORMAT(ua2.createDt, '%Y-%m') createDate, ua2.merchantCode, ua2.userId, mbs.amount, mbs.count, DATE_FORMAT(mbs.startDate, '%Y-%m') startDate
+            FROM tb_pluss_user_app ua
+            LEFT JOIN tb_pluss_user_app ua2 ON ua2.parentId = ua.userId
+            LEFT JOIN tb_pluss_merchant_channel_status mcs ON ua.merchantCode = mcs.merchantCode
+            LEFT JOIN tb_pluss_merchant_bill_statistics mbs ON mbs.userId = ua.userId
+            WHERE ua.parentId = #{userId} AND mbs.type = 1 AND mcs.status = 3
+            ) t  GROUP BY startDate
+    </select>
+
+    <select id="pageTeamYearSpreadPageData" resultType="cn.pluss.platform.vo.SpreadData">
+        SELECT startDate year, COUNT(DISTINCT IF(createDate &lt; startDate, merchantCode, NULL)) teamActiveCount, SUM(amount) teamAmt, SUM(count) teamBillCount
+                             , COUNT(DISTINCT IF(createDate = startDate, merchantCode, NULL)) teamNewCount
+        FROM (
+            SELECT DISTINCT DATE_FORMAT(ua2.createDt, '%Y') createDate, ua2.merchantCode, ua2.userId, mbs.amount, mbs.count, DATE_FORMAT(mbs.startDate, '%Y') startDate
+            FROM tb_pluss_user_app ua
+            LEFT JOIN tb_pluss_user_app ua2 ON ua2.parentId = ua.userId
+            LEFT JOIN tb_pluss_merchant_channel_status mcs ON ua.merchantCode = mcs.merchantCode
+            LEFT JOIN tb_pluss_merchant_bill_statistics mbs ON mbs.userId = ua.userId
+            WHERE ua.parentId = #{userId} AND mbs.type = 1 AND mcs.status = 3
+            ) t  GROUP BY startDate
+    </select>
+
+    <select id="getAppUserTeanFlow" parameterType="cn.pluss.platform.vo.UserTeamAchieVO" resultType="cn.pluss.platform.vo.UserTeamAchieVO">
+        SELECT
+        <choose>
+            <when test="dataType == null or dataType == 1">
+                SUM(ownTransFlow) as tradeAmt,SUM(transNum) as tradeNum
+            </when>
+            <otherwise>
+                SUM(teamTransFlow) as tradeAmt ,SUM(transNum) as tradeNum
+            </otherwise>
+        </choose>
+        from  tb_pluss_user_profit
+        where
+        <choose>
+            <when test="dataType == null or dataType == 1">
+                parentId = #{userId} and  ownTransFlow != 0 and teamTransFlow = 0
+            </when>
+            <otherwise>
+                userId = #{userId}
+            </otherwise>
+        </choose>
+        <if test="dateType == null or dateType == 1">
+            and profitDate = #{date}
+        </if>
+        <if test="dateType == 2">
+            and profitMonth = #{date}
+        </if>
+        <if test="dateType == 3">
+            and DATE_FORMAT(profitDate,'%Y') = #{date}
+        </if>
+    </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/pluss-common-bundle/pom.xml b/pluss-common-bundle/pom.xml
new file mode 100644
index 0000000..0620350
--- /dev/null
+++ b/pluss-common-bundle/pom.xml
@@ -0,0 +1,343 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>pluss-parent</artifactId>
+        <groupId>cn.pluss.platform</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>pluss-common-bundle</artifactId>
+    <packaging>jar</packaging>
+    <version>1.0.0</version>
+
+    <properties>
+    </properties>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <!-- 引用log4j相关jar去除当前引用 -->
+            <exclusions>
+                <exclusion>
+                    <artifactId>spring-boot-starter-logging</artifactId>
+                    <groupId>org.springframework.boot</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-mail</artifactId>
+            <!-- 引用log4j相关jar去除当前引用 -->
+            <exclusions>
+                <exclusion>
+                    <artifactId>spring-boot-starter-logging</artifactId>
+                    <groupId>org.springframework.boot</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+        </dependency>
+
+        <!-- 极光推送 -->
+        <dependency>
+            <groupId>cn.jpush.api</groupId>
+            <artifactId>jpush-client</artifactId>
+            <version>3.5.5</version>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.jpush.api</groupId>
+            <artifactId>jiguang-common</artifactId>
+            <version>1.1.12</version>
+        </dependency>
+
+        <!-- mob推送 -->
+        <dependency>
+            <groupId>com.mob.push.sdk</groupId>
+            <artifactId>mobpush-websdkv3-java</artifactId>
+            <version>1.0.4</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>fastjson</artifactId>
+                    <groupId>com.alibaba</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <!-- 当前log4j版本存在漏洞，应注意修复 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-log4j2</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-tx</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>net.coobird</groupId>
+            <artifactId>thumbnailator</artifactId>
+            <version>0.4.14</version>
+        </dependency>
+
+        <!-- 图形验证码 -->
+        <dependency>
+            <groupId>com.github.penggle</groupId>
+            <artifactId>kaptcha</artifactId>
+            <version>2.3.2</version>
+        </dependency>
+
+<!--        <dependency>-->
+<!--            <groupId>org.apache.logging.log4j</groupId>-->
+<!--            <artifactId>log4j-api</artifactId>-->
+<!--            <version>${log4j.version}</version>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>org.apache.logging.log4j</groupId>-->
+<!--            <artifactId>log4j-core</artifactId>-->
+<!--            <version>${log4j.version}</version>-->
+<!--        </dependency>-->
+
+<!--        <dependency>-->
+<!--            <groupId>org.apache.logging.log4j</groupId>-->
+<!--            <artifactId>log4j-slf4j-impl</artifactId>-->
+<!--            <version>${log4j.version}</version>-->
+<!--        </dependency>-->
+
+        <!-- https://mvnrepository.com/artifact/com.alipay.sdk/alipay-sdk-java -->
+        <dependency>
+            <groupId>com.alipay.sdk</groupId>
+            <artifactId>alipay-sdk-java</artifactId>
+            <version>4.16.11.ALL</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>fastjson</artifactId>
+                    <groupId>com.alibaba</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>dom4j</groupId>
+            <artifactId>dom4j</artifactId>
+            <version>1.6.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>xml-security</groupId>
+            <artifactId>xmlsec</artifactId>
+            <version>1.3.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+            <version>1.3.2</version>
+        </dependency>
+
+<!--        <dependency>-->
+<!--            <groupId>commons-codec</groupId>-->
+<!--            <artifactId>commons-codec</artifactId>-->
+<!--            <version>1.10</version>-->
+<!--        </dependency>-->
+
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.6</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpmime</artifactId>
+            <version>4.5.6</version>
+        </dependency>
+
+
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.5</version>
+        </dependency>
+
+<!--        <dependency>-->
+<!--            <groupId>org.apache.shiro</groupId>-->
+<!--            <artifactId>shiro-spring</artifactId>-->
+<!--            <version>1.3.2</version>-->
+<!--        </dependency>-->
+
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+        </dependency>
+
+
+        <!-- lombok表达式 -->
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-extension</artifactId>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/com.squareup.okhttp3/okhttp -->
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>3.12.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid-spring-boot-starter</artifactId>
+            <version>1.1.23</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.aliyun.oss</groupId>
+            <artifactId>aliyun-sdk-oss</artifactId>
+            <version>3.9.1</version>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/org.apache.directory.studio/org.apache.commons.io -->
+<!--        <dependency>-->
+<!--            <groupId>org.apache.directory.studio</groupId>-->
+<!--            <artifactId>org.apache.commons.io</artifactId>-->
+<!--            <version>2.2</version>-->
+<!--        </dependency>-->
+
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>20.0</version>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-test -->
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>aliyun-java-sdk-geoip</artifactId>
+            <version>1.0.3</version>
+        </dependency>
+
+        <!-- emoji 表情处理 -->
+        <dependency>
+            <groupId>com.github.binarywang</groupId>
+            <artifactId>java-emoji-converter</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+
+        <!-- mqtt 依赖 -->
+        <dependency>
+            <groupId>org.eclipse.paho</groupId>
+            <artifactId>org.eclipse.paho.client.mqttv3</artifactId>
+            <version>1.2.2</version>
+        </dependency>
+
+        <!-- 阿里MQTT SDK -->
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>aliyun-java-sdk-onsmqtt</artifactId>
+            <version>1.0.4</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.zxing</groupId>
+            <artifactId>core</artifactId>
+            <version>3.0.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-net</groupId>
+            <artifactId>commons-net</artifactId>
+            <version>3.6</version>
+        </dependency>
+
+        <!-- 读取CSV文件-->
+        <dependency>
+            <groupId>com.opencsv</groupId>
+            <artifactId>opencsv</artifactId>
+            <version>4.4</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.mapstruct</groupId>
+            <artifactId>mapstruct</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.mapstruct</groupId>
+            <artifactId>mapstruct-processor</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcprov-jdk15to18</artifactId>
+            <version>1.69</version>
+        </dependency>
+    </dependencies>
+
+<!--    <repositories>-->
+<!--        <repository>-->
+<!--            <id>sonatype-nexus-staging</id>-->
+<!--            <name>Sonatype Nexus Staging</name>-->
+<!--            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>-->
+<!--            <releases>-->
+<!--                <enabled>true</enabled>-->
+<!--            </releases>-->
+<!--            <snapshots>-->
+<!--                <enabled>true</enabled>-->
+<!--            </snapshots>-->
+<!--        </repository>-->
+<!--    </repositories>-->
+
+    <!--
+        <build>
+            <plugins>
+                <plugin>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-maven-plugin</artifactId>
+                </plugin>
+            </plugins>
+        </build>-->
+
+
+</project>
\ No newline at end of file
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/annotation/NoRepeatSubmit.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/annotation/NoRepeatSubmit.java
new file mode 100644
index 0000000..882f0d5
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/annotation/NoRepeatSubmit.java
@@ -0,0 +1,17 @@
+package cn.pluss.platform.annotation;
+
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @功能描述 防止重复提交标记注解
+ * @author www.gaozz.club
+ *
+ */
+@Target(ElementType.METHOD) // 作用到方法上
+@Retention(RetentionPolicy.RUNTIME) // 运行时有效
+public @interface NoRepeatSubmit {
+}
\ No newline at end of file
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/annotation/ToEntity.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/annotation/ToEntity.java
new file mode 100644
index 0000000..3f62373
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/annotation/ToEntity.java
@@ -0,0 +1,15 @@
+package cn.pluss.platform.annotation;
+
+import java.lang.annotation.Retention;
+import org.mapstruct.Mapping;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * @author DJH
+ */
+@Retention(RetentionPolicy.CLASS)
+@Mapping(target = "id", ignore = true)
+@Mapping(target = "page", ignore = true)
+@Mapping(target = "size", ignore = true)
+public @interface ToEntity {
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/aop/NoRepeatSubmitAop.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/aop/NoRepeatSubmitAop.java
new file mode 100644
index 0000000..cdbe083
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/aop/NoRepeatSubmitAop.java
@@ -0,0 +1,55 @@
+package cn.pluss.platform.aop;
+
+import cn.pluss.platform.annotation.NoRepeatSubmit;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.exception.MsgException;
+import com.google.common.cache.Cache;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @功能描述 aop解析注解
+ *
+ */
+@Aspect
+@Component
+public class NoRepeatSubmitAop {
+
+
+    @Autowired
+    private Cache<String, Integer> cache;
+
+    @Around("execution(* cn.pluss.platform.controller..*Controller.*(..)) && @annotation(nrs)")
+    public Object arround(ProceedingJoinPoint pjp, NoRepeatSubmit nrs) {
+        try {
+            System.out.println("进入了切点：==================================>");
+            ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+            String sessionId = RequestContextHolder.getRequestAttributes().getSessionId();
+            HttpServletRequest request = attributes.getRequest();
+            String key = sessionId + "-" + request.getServletPath();
+            if (cache.getIfPresent(key) == null) {// 如果缓存中有这个url视为重复提交
+                Object o = pjp.proceed();
+                cache.put(key, 0);
+                return o;
+            } else {
+                System.out.println("重复提交！！");
+                return null;
+            }
+        } catch (Throwable e) {
+            e.printStackTrace();
+            if (e instanceof MsgException) {
+                throw (MsgException) e;
+            }
+            return ResultGenerator.genSuccessResult("验证重复提交时出现未知异常!", null);
+        }
+
+    }
+
+}
\ No newline at end of file
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/aop/cache/UrlCache.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/aop/cache/UrlCache.java
new file mode 100644
index 0000000..a3c3bce
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/aop/cache/UrlCache.java
@@ -0,0 +1,20 @@
+package cn.pluss.platform.aop.cache;
+
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.concurrent.TimeUnit;
+
+@Configuration
+/**
+ * @功能描述 内存缓存
+ * 
+ */
+public class UrlCache {
+    @Bean
+    public Cache<String, Integer> getCache() {
+        return CacheBuilder.newBuilder().expireAfterWrite(5L, TimeUnit.SECONDS).build();// 缓存有效期为5秒
+    }
+}
\ No newline at end of file
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/api/PageInfo.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/api/PageInfo.java
new file mode 100644
index 0000000..cfa1de3
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/api/PageInfo.java
@@ -0,0 +1,17 @@
+package cn.pluss.platform.api;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+public class PageInfo<T> {
+	
+	private Long count;
+	private Long pageCount;
+	private Long currPage ;
+	private Long pageSize ;
+	private List<T> data;
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/api/PageVO.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/api/PageVO.java
new file mode 100644
index 0000000..98ebd10
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/api/PageVO.java
@@ -0,0 +1,19 @@
+package cn.pluss.platform.api;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+/**
+ * @author DJH
+ */
+@Data
+@AllArgsConstructor
+public class PageVO<T> {
+	
+	private int count;
+	private int pageCount;
+	private int currPage ;
+	private int pageSize ;
+	private T data;
+}
+
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/api/Result.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/api/Result.java
new file mode 100644
index 0000000..e616bd3
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/api/Result.java
@@ -0,0 +1,67 @@
+package cn.pluss.platform.api;
+
+
+import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSON;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * 统一API响应结果封装
+ * @author DJH
+ */
+@Data
+@Accessors(chain = true)
+@AllArgsConstructor
+@NoArgsConstructor
+public class Result<T> {
+    private int code;
+    private String message;
+    private T data;
+    private String respCode;
+    
+    private T list;
+    
+    private String totalCount;
+
+    private String timestamp;
+
+    public Result<T> setCode(ResultCode resultCode) {
+        this.code = resultCode.code();
+        return this;
+    }
+
+    public Result(ResultCode resultCode, String message) {
+        this(resultCode, message, null);
+    }
+
+    public Result(ResultCode resultCode, String message, T data) {
+        this.code = resultCode.code();
+        this.message = message;
+        this.data = data;
+        timestamp = DateUtil.format(new Date(), "yyyyMMddHHmmss");
+    }
+
+    public Result(int code, String message, T data) {
+        this.code = code;
+        this.message = message;
+        this.data = data;
+        timestamp = DateUtil.format(new Date(), "yyyyMMddHHmmss");
+    }
+
+    public Result(int code, String message) {
+        this.code = code;
+        this.message = message;
+        timestamp = DateUtil.format(new Date(), "yyyyMMddHHmmss");
+    }
+
+	@Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
+
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/api/ResultCode.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/api/ResultCode.java
new file mode 100644
index 0000000..7a2748b
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/api/ResultCode.java
@@ -0,0 +1,41 @@
+package cn.pluss.platform.api;
+
+/**
+ * 响应码枚举，参考HTTP状态码的语义
+ */
+public enum ResultCode {
+    //成功
+    SUCCESS(200),
+    //失败
+    FAIL(400),
+    //未认证（签名错误）
+    UNAUTHORIZED(401),
+    //未认证（签名错误）
+    PARAM_ERROR(422),
+    // 403
+    FORBIDDEN(403),
+    //接口不存在
+    NOT_FOUND(404),
+    //服务器内部错误
+    INTERNAL_SERVER_ERROR(500),
+    // 服务不可达
+    SERVICE_UNAVAILABLE(503),
+    //未认证（签名错误）
+	NOT_TOKEN(401),
+    //无数据
+	UNDEFINDE(201),
+	/**
+	 * 交易未知  查询交易结果
+	 */
+	TRANSUNKNOW(202);
+	
+    private final int code;
+
+    ResultCode(int code) {
+        this.code = code;
+    }
+
+    public int code() {
+        return code;
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/api/ResultGenerator.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/api/ResultGenerator.java
new file mode 100644
index 0000000..c29c3ab
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/api/ResultGenerator.java
@@ -0,0 +1,80 @@
+package cn.pluss.platform.api;
+
+import com.alibaba.fastjson.JSONObject;
+import org.apache.poi.ss.formula.functions.T;
+
+/**
+ * 响应结果生成工具
+ */
+public class ResultGenerator {
+    public static final String DEFAULT_SUCCESS_MESSAGE = "操作成功";
+    public static final String DEFAULT_FAIL_MESSAGE = "操作失败！";
+
+    public static <T> Result<T> genSuccessResult() {
+        return new Result()
+                .setCode(ResultCode.SUCCESS)
+                .setMessage(DEFAULT_SUCCESS_MESSAGE);
+    }
+    
+    public static Result genUndefinedResult(String message) {
+    	return new Result()
+    			.setCode(ResultCode.UNDEFINDE)
+    			.setMessage(message);
+    }
+
+    public static <T> Result<T> genSuccessResult(String msg, T data) {
+        return new Result<>(ResultCode.SUCCESS, msg, data);
+    }
+
+    public static <T> Result<T> genSuccessResult(T data) {
+        return new Result<>(ResultCode.SUCCESS, DEFAULT_SUCCESS_MESSAGE, data);
+    }
+
+    public static <T> Result<T> genResult(String data) {
+    	return new Result<>(ResultCode.SUCCESS, data);
+    }
+    
+    public static Result genTransunKonwResult(String message) {
+        return new Result<T>().setCode(ResultCode.TRANSUNKNOW).setMessage(message);
+    }
+    
+    public static <T> Result<T> genTransunKonwResult(String message,T data){
+    	 return new Result<>(ResultCode.TRANSUNKNOW, message, data);
+    }
+
+    public static <T> Result<T> genFailResult(String message) {
+        return new Result<>(ResultCode.FAIL, message, null);
+    }
+    
+    public static <T> Result<T> genFailResult(String message,T data) {
+        return new Result<>(ResultCode.FAIL, message, data);
+    }
+    
+    
+    public static <T> Result<T> genFailResult(T data) {
+        return new Result<>(ResultCode.FAIL, DEFAULT_FAIL_MESSAGE, data);
+    }
+
+    public static JSONObject genFailJsonResult(String message) {
+        JSONObject result = new JSONObject();
+        result.put("code",ResultCode.FAIL.code());
+        result.put("message",message);
+        result.put("data",null);
+        return result;
+    }
+
+    public static JSONObject genSuccessJsonResult(String message,Object data) {
+        JSONObject result = new JSONObject();
+        result.put("code",ResultCode.SUCCESS.code());
+        result.put("message",message);
+        result.put("data",data);
+        return result;
+    }
+    public static JSONObject genSuccessJsonResult(Object data) {
+        JSONObject result = new JSONObject();
+        result.put("code",ResultCode.SUCCESS.code());
+        result.put("message","请求成功");
+        result.put("data",data);
+        return result;
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/base/BaseController.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/base/BaseController.java
new file mode 100644
index 0000000..e69de29
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/base/BaseModelController.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/base/BaseModelController.java
new file mode 100644
index 0000000..110cf04
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/base/BaseModelController.java
@@ -0,0 +1,84 @@
+package cn.pluss.platform.base;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author djh
+ */
+@Slf4j
+public class BaseModelController<S extends IService<T>, T> {
+
+	@Autowired
+	protected S baseService;
+
+	@GetMapping("/one")
+	@ResponseBody
+	public Result<T> get(T condition) {
+		QueryWrapper<T> queryWrapper = new QueryWrapper<>(condition);
+		T one = baseService.getOne(queryWrapper);
+		return ResultGenerator.genSuccessResult(one);
+	}
+
+	@GetMapping("/list")
+	@ResponseBody
+	public Result<List<T>> list(T condition, OrderItem orderItem) {
+		QueryWrapper<T> queryWrapper = new QueryWrapper<>(condition);
+
+		if (orderItem != null && StringUtils.isNotBlank(orderItem.getColumn())) {
+			queryWrapper.orderBy(true, orderItem.isAsc(), orderItem.getColumn());
+		}
+
+		List<T> list;
+		try {
+			queryWrapper = queryWrapper.orderByDesc("createTime");
+			list = baseService.list(queryWrapper);
+			return ResultGenerator.genSuccessResult(list);
+		} catch (Exception e){
+			list = baseService.list(queryWrapper);
+			return ResultGenerator.genSuccessResult(list);
+		}
+	}
+
+	@GetMapping("/page")
+	@ResponseBody
+	public Result<Page<T>> page(Page<T> page, T condition, OrderItem orderItem) {
+		page.getOrders().clear();
+		page.getOrders().add(orderItem);
+		Page<T> pageData = baseService.page(page, new QueryWrapper<>(condition));
+		return ResultGenerator.genSuccessResult(pageData);
+	}
+
+	@DeleteMapping("/del/{id}")
+	@ResponseBody
+	public Result<String> delete(@PathVariable String id) {
+		baseService.removeById(id);
+		return ResultGenerator.genSuccessResult("删除成功", null);
+	}
+
+	@DeleteMapping("/del")
+	@ResponseBody
+	public Result<String> delete(T condition) {
+		baseService.removeById(new QueryWrapper<>(condition));
+		return ResultGenerator.genSuccessResult("删除成功", null);
+	}
+
+	@PostMapping("/save")
+	@ResponseBody
+	public Result<String> save(@RequestBody @Validated T entity) {
+		baseService.saveOrUpdate(entity);
+		return ResultGenerator.genSuccessResult("保存成功", null);
+	}
+	
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/config/ApplicationContextHelper.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/config/ApplicationContextHelper.java
new file mode 100644
index 0000000..249122c
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/config/ApplicationContextHelper.java
@@ -0,0 +1,39 @@
+package cn.pluss.platform.config;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
+
+import javax.sql.DataSource;
+
+/**
+ * 项目启动检查数据库连接
+ * @author DJH
+ */
+@Component
+@Slf4j
+public class ApplicationContextHelper implements ApplicationContextAware {
+
+    private static ApplicationContext context;
+
+    public ApplicationContext getApplicationContext() {
+        return context;
+    }
+
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        try {
+            context = applicationContext;
+            // 项目初始化完成后，手动检验数据库
+            DataSource dataSource = (DataSource) context.getBean("dataSource");
+            dataSource.getConnection().close();
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("数据库连接失败");
+            // 当检测数据库连接失败时, 停止项目启动
+            System.exit(-1);
+        }
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/config/BeanConfig.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/config/BeanConfig.java
new file mode 100644
index 0000000..b88da05
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/config/BeanConfig.java
@@ -0,0 +1,64 @@
+package cn.pluss.platform.config;
+
+import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.MediaType;
+import org.springframework.http.client.SimpleClientHttpRequestFactory;
+import org.springframework.http.converter.FormHttpMessageConverter;
+import org.springframework.http.converter.StringHttpMessageConverter;
+import org.springframework.web.client.RestTemplate;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
+@Configuration
+public class BeanConfig {
+
+    @Bean
+    public RestTemplate restTemplate() {
+        SimpleClientHttpRequestFactory factory = new SimpleClientHttpRequestFactory();
+        factory.setConnectTimeout(600000);
+        // 超时时间设置为5秒
+        factory.setReadTimeout(20000);
+        RestTemplate restTemplate = new RestTemplate(factory);
+        // 设置编码集
+        restTemplate.getMessageConverters().set(1, new StringHttpMessageConverter(StandardCharsets.UTF_8));
+        // 设置JSON转换器
+        FastJsonHttpMessageConverter fastJsonHttpMessageConverter = new FastJsonHttpMessageConverter();
+        fastJsonHttpMessageConverter.setSupportedMediaTypes(Arrays.asList(MediaType.APPLICATION_JSON, MediaType.APPLICATION_OCTET_STREAM, MediaType.TEXT_PLAIN, MediaType.TEXT_HTML));
+        restTemplate.getMessageConverters().add(fastJsonHttpMessageConverter);
+        restTemplate.getMessageConverters().add(new FormHttpMessageConverter());
+
+//        ResponseErrorHandler  responseErrorHandler = new ResponseErrorHandler() {
+//            @Override
+//            public boolean hasError(ClientHttpResponse response) throws IOException {
+//                return false;
+//            }
+//
+//            @Override
+//            public void handleError(ClientHttpResponse response) throws IOException {
+//            }
+//        };
+//        restTemplate.setErrorHandler(responseErrorHandler);
+        return restTemplate;
+    }
+
+    @Bean
+    public ExecutorService executorService() {
+        return new ThreadPoolExecutor(4,
+                4, 1L
+                , TimeUnit.SECONDS, new ArrayBlockingQueue<>(100), Thread::new, new ThreadPoolExecutor.CallerRunsPolicy());
+    }
+
+    @Bean("executorService2")
+    public ExecutorService executorService2() {
+        return new ThreadPoolExecutor(4,
+                4, 1L
+                , TimeUnit.SECONDS, new ArrayBlockingQueue<>(100), Thread::new, new ThreadPoolExecutor.CallerRunsPolicy());
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/config/DruidConfiguration.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/config/DruidConfiguration.java
new file mode 100644
index 0000000..f540cab
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/config/DruidConfiguration.java
@@ -0,0 +1,59 @@
+package cn.pluss.platform.config;
+
+import com.alibaba.druid.support.http.StatViewServlet;
+import com.alibaba.druid.support.http.WebStatFilter;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.boot.web.servlet.ServletRegistrationBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * 这样的方式不需要在启动类头上添加注解：@ServletComponentScan
+ */
+@Configuration
+public class DruidConfiguration {
+
+    /**
+     * 注册一个StatViewServlet
+     * @return
+     */
+    @Bean
+    public ServletRegistrationBean DruidStatViewServle(){
+
+        //org.springframework.boot.context.embedded.ServletRegistrationBean提供类的进行注册.
+        ServletRegistrationBean servletRegistrationBean = new ServletRegistrationBean(new StatViewServlet(),"/druid/*");
+
+        //添加初始化参数：initParams
+
+        //白名单：
+        servletRegistrationBean.addInitParameter("allow","127.0.0.1");
+
+//        //IP黑名单 (存在共同时，deny优先于allow) : 如果满足deny的话提示:Sorry, you are not permitted to view this page.
+//        servletRegistrationBean.addInitParameter("deny","192.168.0.114");
+
+//        //登录查看信息的账号密码.
+//        servletRegistrationBean.addInitParameter("loginUsername","admin");
+//        servletRegistrationBean.addInitParameter("loginPassword","123456");
+
+        //是否能够重置数据.
+        servletRegistrationBean.addInitParameter("resetEnable","false");
+        return servletRegistrationBean;
+    }
+
+    /**
+     * 注册一个：filterRegistrationBean
+     * @return
+     */
+    @Bean
+    public FilterRegistrationBean druidStatFilter(){
+        FilterRegistrationBean filterRegistrationBean = new FilterRegistrationBean(new WebStatFilter());
+
+        //添加过滤规则.
+        filterRegistrationBean.addUrlPatterns("/*");
+
+        //添加不需要忽略的格式信息.
+        filterRegistrationBean.addInitParameter("exclusions","*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*");
+
+        return filterRegistrationBean;
+    }
+}
\ No newline at end of file
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/config/GetuiConfig.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/config/GetuiConfig.java
new file mode 100644
index 0000000..dcaf68a
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/config/GetuiConfig.java
@@ -0,0 +1,63 @@
+package cn.pluss.platform.config;
+
+import lombok.Data;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+
+import javax.annotation.PostConstruct;
+
+@Data
+@Configuration
+@PropertySource("classpath:config/application-common.yml")
+public class GetuiConfig {
+
+    public String domain = "https://restapi.getui.com/v2/lcpLtzlX1IAVVHaMzO7rI9";
+
+    public static String token = null;
+
+    public static Long expireTime = null;
+
+    /**
+     * 获取鉴权token
+     */
+    public String auth = "/auth";
+
+    /**
+     * 按照别名单推
+     */
+    public static String singleAlias = "/push/single/alias";
+
+    public static String singleCid = "/push/single/cid";
+
+    public static String createMsg = "/push/list/message";
+
+    /**
+     * 按照别名批量推
+     */
+    public static String listAlias = "/push/list/alias";
+
+    /**
+     * 执行cid批量推
+     */
+    public static String listCid = "/push/list/cid";
+
+    /**
+     * 全量推送
+     */
+    public static String all = "/push/all";
+
+    public static String tag = "/push/tag";
+
+    @PostConstruct
+    public void init() {
+        auth = domain + auth;
+        singleAlias = domain + singleAlias;
+        singleCid = domain + singleCid;
+
+        all = domain + all;
+        tag = domain + tag;
+        listAlias = domain + listAlias;
+        listCid = domain + listCid;
+        createMsg = domain + createMsg;
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/config/GlobalExceptionHandler.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/config/GlobalExceptionHandler.java
new file mode 100644
index 0000000..191922f
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/config/GlobalExceptionHandler.java
@@ -0,0 +1,235 @@
+package cn.pluss.platform.config;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultCode;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.exception.ForbiddenException;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.exception.ThirdException;
+import cn.pluss.platform.exception.UnauthorizedException;
+import cn.pluss.platform.service.UnknownExceptionService;
+import cn.pluss.platform.util.ParamsCheckUtil;
+import com.alibaba.fastjson.JSON;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.core.annotation.Order;
+import org.springframework.dao.DuplicateKeyException;
+import org.springframework.http.HttpStatus;
+import org.springframework.validation.BindException;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.HttpRequestMethodNotSupportedException;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.MissingServletRequestParameterException;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.io.*;
+import java.nio.charset.StandardCharsets;
+import java.sql.SQLException;
+import java.util.Arrays;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 全局的的异常拦截器（拦截所有的控制器）（带有@RequestMapping注解的方法上都会拦截）
+ *
+ * @author Djh
+ */
+@ControllerAdvice
+@Order(-1)
+@Slf4j
+public class GlobalExceptionHandler {
+
+    private static final String EXCEPTION_TIP = "异常信息: {}";
+
+    @Resource
+    private UnknownExceptionService unknownExceptionService;
+
+    /**
+     * 异常信息要传给前端的异常
+     */
+    @ExceptionHandler(SQLException.class)
+    @ResponseStatus(HttpStatus.OK)
+    @ResponseBody
+    public Result<Object> business(SQLException e) {
+        StringWriter sw = new StringWriter();
+        e.printStackTrace(new PrintWriter(sw, true));
+        log.error(EXCEPTION_TIP, sw);
+        return ResultGenerator.genFailResult("参数包含非法字符");
+    }
+
+
+    /**
+     * 异常信息要传给前端的异常
+     */
+    @ExceptionHandler(UnauthorizedException.class)
+    @ResponseStatus(HttpStatus.SERVICE_UNAVAILABLE)
+    @ResponseBody
+    public Result<Object> business(UnauthorizedException e) {
+        return new Result<>(ResultCode.SERVICE_UNAVAILABLE, e.getMessage());
+    }
+
+    /**
+     * 异常信息要传给前端的异常
+     */
+    @ExceptionHandler(MsgException.class)
+    @ResponseStatus(HttpStatus.OK)
+    @ResponseBody
+    public Result<Object> business(MsgException e) {
+        StringWriter sw = new StringWriter();
+        e.printStackTrace(new PrintWriter(sw, true));
+        log.error(EXCEPTION_TIP, sw);
+        return new Result<>(e.getCode(), e.getMessage());
+    }
+
+    /**
+     * 异常信息要传给前端的异常
+     */
+    @ExceptionHandler(ThirdException.class)
+    @ResponseStatus(HttpStatus.OK)
+    @ResponseBody
+    public Result<Object> business(ThirdException e) {
+        StringWriter sw = new StringWriter();
+        e.printStackTrace(new PrintWriter(sw, true));
+        log.error(EXCEPTION_TIP, sw);
+        return new Result<>(ResultCode.FAIL, e.getMessage());
+    }
+
+    /**
+     * 异常信息要传给前端的异常
+     */
+    @ExceptionHandler(ForbiddenException.class)
+    @ResponseStatus(HttpStatus.OK)
+    @ResponseBody
+    public Result<Object> business(ForbiddenException e) {
+        StringWriter sw = new StringWriter();
+        e.printStackTrace(new PrintWriter(sw, true));
+        log.error(EXCEPTION_TIP, sw);
+        return new Result<>(ResultCode.FORBIDDEN, e.getMessage());
+    }
+
+    /**
+     * 异常信息要传给前端的异常
+     */
+    @ExceptionHandler(DuplicateKeyException.class)
+    @ResponseStatus(HttpStatus.OK)
+    @ResponseBody
+    public Result<Object> business(DuplicateKeyException e) {
+        StringWriter sw = new StringWriter();
+        e.printStackTrace(new PrintWriter(sw, true));
+        log.error(EXCEPTION_TIP, sw);
+        return ResultGenerator.genFailResult("插入失败", null);
+    }
+
+
+    /**
+     * 参数校验错误异常
+     */
+    @ExceptionHandler(BindException.class)
+    @ResponseStatus(HttpStatus.OK)
+    @ResponseBody
+    public Result<Object> errorParams(BindException e) {
+        BindingResult bindingResult = e.getBindingResult();
+        log.error("参数校验异常：", e);
+        return new Result<>(ResultCode.PARAM_ERROR, ParamsCheckUtil.getErrorMsg(bindingResult));
+    }
+
+    /**
+     * 参数校验错误异常
+     */
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    @ResponseStatus(HttpStatus.OK)
+    @ResponseBody
+    public Result<Object> errorParams2(MethodArgumentNotValidException e) {
+        BindingResult bindingResult = e.getBindingResult();
+        log.error("参数校验异常：", e);
+        return new Result<>(ResultCode.PARAM_ERROR, ParamsCheckUtil.getErrorMsg(bindingResult));
+    }
+
+    @ExceptionHandler({HttpRequestMethodNotSupportedException.class})
+    @ResponseStatus(HttpStatus.OK)
+    @ResponseBody
+    public Result<Object> unusedException() {
+        return ResultGenerator.genFailResult("不支持的请求方式", null);
+    }
+
+    /**
+     * 拦截未知的运行时异常
+     */
+    @ExceptionHandler(Exception.class)
+    @ResponseStatus(HttpStatus.OK)
+    @ResponseBody
+    public Result<Object> commonError(HttpServletRequest request, Exception e) {
+        log.error("通用异常 URI: {}", request.getRequestURI());
+        log.error("通用异常 headers: {}", JSON.toJSONString(getHeaderInfo(request)));
+        try {
+            InputStream is = request.getInputStream();
+            StringBuilder responseStrBuilder = new StringBuilder();
+            BufferedReader streamReader = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8));
+            String inputStr;
+            while ((inputStr = streamReader.readLine()) != null) {
+                responseStrBuilder.append(inputStr);
+            }
+            log.error("通用异常 body: {}", responseStrBuilder);
+        } catch (Exception ignored) {
+            // 不处理
+        }
+        Map<String, Object> parameterInfo = getParameterInfo(request);
+        log.error("通用异常 params: {}",  JSON.toJSONString(parameterInfo));
+        // 将异常信息保存到数据库中
+        try {
+            e.printStackTrace();
+            unknownExceptionService.save(request, e);
+        } catch (Exception ignored) {
+            ignored.printStackTrace();
+        }
+        return new Result<>(ResultCode.PARAM_ERROR, "系统繁忙，请稍后再试");
+    }
+
+    /**
+     * 拦截 @RequestParam 必传参数不存在的异常
+     * @param e 异常信息
+     * @return  r
+     */
+    @ExceptionHandler(MissingServletRequestParameterException.class)
+    @ResponseStatus(HttpStatus.OK)
+    @ResponseBody
+    public Result<Object> missParam(MissingServletRequestParameterException e) {
+        StringWriter sw = new StringWriter();
+        e.printStackTrace(new PrintWriter(sw, true));
+        log.error(EXCEPTION_TIP, sw);
+        return new Result<>(ResultCode.PARAM_ERROR, "参数错误，或缺少必要参数");
+    }
+
+    private Map<String, Object> getParameterInfo(HttpServletRequest request) {
+        Map<String, Object> parameter = new HashMap<>(8);
+        Map<String, String[]> parameterMap = request.getParameterMap();
+
+        for (Map.Entry<String, String[]> entry: parameterMap.entrySet()) {
+            String key = entry.getKey();
+            String[] parameterValues = entry.getValue();
+            if (parameterValues.length == 1) {
+                parameter.put(key, parameterValues[0]);
+            } else {
+                parameter.put(key, Arrays.toString(parameterValues));
+            }
+        }
+        return parameter;
+    }
+
+    private Map<String, Object> getHeaderInfo(HttpServletRequest request) {
+        Map<String, Object> parameter = new HashMap<>(8);
+        Enumeration<String> headerNames = request.getHeaderNames();
+
+        while (headerNames.hasMoreElements()) {
+            String key = headerNames.nextElement();
+            parameter.put(key, request.getHeader(key));
+        }
+
+        return parameter;
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/config/KaptchaConfig.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/config/KaptchaConfig.java
new file mode 100644
index 0000000..5477e8c
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/config/KaptchaConfig.java
@@ -0,0 +1,65 @@
+package cn.pluss.platform.config;
+
+import com.google.code.kaptcha.impl.DefaultKaptcha;
+import com.google.code.kaptcha.util.Config;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.Properties;
+
+/**
+ *
+ *图形验证码配置类
+ *@author: bzg
+ *@time: 2021/12/20 10:18
+ */
+@Configuration
+public class KaptchaConfig {
+
+    @Bean
+    public DefaultKaptcha getDefaultKaptcha() {
+        DefaultKaptcha defaultKaptcha = new DefaultKaptcha();
+        Properties properties = new Properties();
+        // 图片边框
+        properties.setProperty("kaptcha.border", "no");
+        // 边框颜色
+        properties.setProperty("kaptcha.border.color", "black");
+        //边框厚度
+        properties.setProperty("kaptcha.border.thickness", "1");
+        // 图片宽
+        properties.setProperty("kaptcha.image.width", "150");
+        // 图片高
+        properties.setProperty("kaptcha.image.height", "50");
+        //图片实现类
+        properties.setProperty("kaptcha.producer.impl", "com.google.code.kaptcha.impl.DefaultKaptcha");
+        //文本实现类
+        properties.setProperty("kaptcha.textproducer.impl", "com.google.code.kaptcha.text.impl.DefaultTextCreator");
+        //文本集合，验证码值从此集合中获取
+        properties.setProperty("kaptcha.textproducer.char.string", "ABCDEFGOPQRSXYZ01234567890");
+        //验证码长度
+        properties.setProperty("kaptcha.textproducer.char.length", "4");
+        //字体
+        properties.setProperty("kaptcha.textproducer.font.names", "宋体");
+
+        properties.setProperty("kaptcha.textproducer.font.size", "35");
+        //字体颜色
+        properties.setProperty("kaptcha.textproducer.font.color", "black");
+        //文字间隔
+        properties.setProperty("kaptcha.textproducer.char.space", "5");
+        //干扰实现类
+        properties.setProperty("kaptcha.noise.impl", "com.google.code.kaptcha.impl.DefaultNoise");
+        //干扰颜色
+        properties.setProperty("kaptcha.noise.color", "blue");
+        //干扰图片样式
+        properties.setProperty("kaptcha.obscurificator.impl", "com.google.code.kaptcha.impl.WaterRipple");
+        //背景实现类
+        properties.setProperty("kaptcha.background.impl", "com.google.code.kaptcha.impl.DefaultBackground");
+        //背景颜色渐变，结束颜色
+        properties.setProperty("kaptcha.background.clear.to", "white");
+        //文字渲染器
+        properties.setProperty("kaptcha.word.impl", "com.google.code.kaptcha.text.impl.DefaultWordRenderer");
+        Config config = new Config(properties);
+        defaultKaptcha.setConfig(config);
+        return defaultKaptcha;
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/config/MqttConfig.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/config/MqttConfig.java
new file mode 100644
index 0000000..07ced4d
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/config/MqttConfig.java
@@ -0,0 +1,55 @@
+package cn.pluss.platform.config;
+
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author admin
+ * @desc 阿里云MQTT配置参数类
+ *
+ */
+@Data
+@Component("mqttConfig")
+@PropertySource("classpath:config/application-common.yml")
+public class MqttConfig {
+
+    /**
+     * 节点
+     */
+    @Value("${mqtt.region-id}")
+    private String regionId;
+
+    /**
+     * key
+     */
+    @Value("${mqtt.keyid}")
+    private String keyId;
+
+    /**
+     * secret
+     */
+    @Value("${mqtt.keysecret}")
+    private String keySecret;
+
+    /**
+     * 实例ID
+     */
+    @Value("${mqtt.instance-id}")
+    private String instanceId;
+
+    /**
+     * topic
+     */
+    @Value("${mqtt.topic}")
+    private String topic;
+
+    /**
+     * groupId
+     */
+    @Value("${mqtt.groupid}")
+    private String groupId;
+
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/config/MqttSendMessage.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/config/MqttSendMessage.java
new file mode 100644
index 0000000..bc4633a
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/config/MqttSendMessage.java
@@ -0,0 +1,73 @@
+package cn.pluss.platform.config;
+
+import cn.pluss.platform.util.StringUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.aliyuncs.DefaultAcsClient;
+import com.aliyuncs.IAcsClient;
+import com.aliyuncs.exceptions.ClientException;
+import com.aliyuncs.onsmqtt.model.v20200420.SendMessageRequest;
+import com.aliyuncs.onsmqtt.model.v20200420.SendMessageResponse;
+import com.aliyuncs.profile.DefaultProfile;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.DependsOn;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+import java.util.Map;
+
+@Component
+@DependsOn("mqttConfig")
+public class MqttSendMessage {
+
+    private Logger logger  = LoggerFactory.getLogger(this.getClass());
+
+    @Autowired
+    private MqttConfig mqttConfig;
+
+    private DefaultProfile profile;
+
+    private IAcsClient client;
+
+    @PostConstruct
+    public void init() {
+        if(profile == null){
+            profile = DefaultProfile.getProfile(mqttConfig.getRegionId(), mqttConfig.getKeyId(), mqttConfig.getKeySecret());
+        }
+        if(client == null){
+            client = new DefaultAcsClient(profile);
+        }
+    }
+
+    public Map<String,String> sendMqttMessage(String deviceNo, JSONObject payload){
+        logger.info("==============>推送Mqtt消息开始，推送设备编号:{},推送消息内容:{}<===============",deviceNo,payload);
+        if(StringUtil.isEmpty(deviceNo)){
+            logger.info("==============>推送Mqtt消息失败，推送设备编号为空!<=================");
+            return null;
+        }
+        if(StringUtil.isEmpty(payload)){
+            logger.info("==============>推送Mqtt消息失败，推送消息内容为空!<=================");
+            return null;
+        }
+        SendMessageRequest request = new SendMessageRequest();
+        request.setRegionId(mqttConfig.getRegionId());
+        request.setInstanceId(mqttConfig.getInstanceId());
+        request.setPayload(payload.toJSONString());
+        String sendTopic = mqttConfig.getTopic() + "/order/" + mqttConfig.getGroupId() + "@@@" + deviceNo;
+        logger.info("==============>推送Mqtt消息topic参数:{}<=================",sendTopic);
+        request.setMqttTopic(sendTopic);
+        try {
+            SendMessageResponse response = client.getAcsResponse(request);
+            if(response != null){
+                return JSONObject.parseObject(JSON.toJSONString(response),Map.class);
+            }
+        } catch (ClientException e) {
+            logger.info("==============>推送Mqtt消息失败，失败原因:{}<=================",e.getErrMsg());
+            return null;
+        }
+        return null;
+    }
+
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/config/OssConfig.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/config/OssConfig.java
new file mode 100644
index 0000000..2d7f69b
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/config/OssConfig.java
@@ -0,0 +1,36 @@
+package cn.pluss.platform.config;
+
+import com.aliyun.oss.OSS;
+import com.aliyun.oss.OSSClient;
+import com.aliyun.oss.OSSClientBuilder;
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.context.annotation.Scope;
+
+@Data
+@Configuration
+@PropertySource("classpath:config/application-common.yml")
+public class OssConfig {
+
+    @Value("${aliyun.oss.endpoint}")
+    private String endpoint;       //连接区域地址
+    @Value("${aliyun.keyid}")
+    private String keyid;    //连接keyId
+    @Value("${aliyun.keysecret}")
+    private String keysecret;    //连接秘钥
+    @Value("${aliyun.oss.bucketname}")
+    private String bucketname;     //需要存储的bucketName
+    @Value("${aliyun.region-id}")
+    private String regionId;
+    @Value("${aliyun.oss.callback}")
+    private String callback;
+
+    @Bean
+    @Scope("prototype")
+    public OSS ossClient(){
+        return new OSSClientBuilder().build(endpoint, keyid, keysecret);
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/config/ParameterConfig.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/config/ParameterConfig.java
new file mode 100644
index 0000000..b54d8e0
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/config/ParameterConfig.java
@@ -0,0 +1,314 @@
+package cn.pluss.platform.config;
+
+import cn.pluss.platform.util.ParametersUtil;
+import cn.pluss.platform.util.RyxConfig;
+import cn.pluss.platform.util.SxfConfg;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+
+/**
+ * @author Djh
+ * 配置参数接收实体类
+ */
+@Component
+public class ParameterConfig {
+
+    @Value("${sxf.domain}")
+    public String sxfDomain;
+
+    @Value("${sxf.orgId}")
+    public String orgId;
+
+    @Value("${sxf.publicKey}")
+    public String publicKey;
+
+    @Value("${ryx.auditDomain}")
+    public String ryxAuditDomain;
+
+    @Value("${ryx.payDomain}")
+    public String ryxPayDomain;
+
+    @Value("${ryx.accessId}")
+    public String ryxAccessId;
+
+    @Value("${ryx.subAccessId}")
+    public String ryxSubAccessId;
+
+    @Value("${ryx.subAccessPubKey}")
+    public String ryxSubAccessPubKey;
+
+    @Value("${ryx.cooperatorPriKey}")
+    public String ryxCooperatorPriKey;
+
+    @Value("${ryx.cooperatorPubKey}")
+    public String ryxCooperatorPubKey;
+
+    @Value("${ryx.accessPubKey}")
+    public String ryxAccessPubKey;
+
+    @Value("${ryx.smzfPubKey}")
+    public String ryxSmzfPubKey;
+
+    @Value("${ryx.payCooperator}")
+    public String ryxPayCooperator;
+
+    /**
+     * 上传图片保存路径
+     */
+    @Value("${parameter.upload_save_path}")
+    public String upload_save_path;
+    /**
+     * 上传图片访问路径
+     */
+    @Value("${parameter.upload_visit_path}")
+    public String upload_visit_path;
+    /**
+     * 获取支付宝授权token
+     */
+    @Value("${parameter.ALI_APP_AUTH_TOKEN}")
+    public String ALI_APP_AUTH_TOKEN;
+    /**
+     * 支付宝费率
+     */
+    @Value("${parameter.ALI_RATE}")
+    public Double ALI_RATE;
+    /**
+     * 微信费率
+     */
+    @Value("${parameter.WECHAT_RATE}")
+    public Double WECHAT_RATE;
+    /**
+     * 微信支付appid
+     */
+    @Value("${parameter.APPID}")
+    public String APPID;
+    /**
+     * 付款小程序APPID
+     */
+    @Value("${parameter.APPLETS_APPID}")
+    public String APPLETS_APPID;
+    /**
+     * AppSecret
+     */
+    @Value("${parameter.APPSECRET}")
+    public String APPSECRET;
+    /**
+     * 商户号
+     */
+    @Value("${parameter.PID}")
+    public String PID;
+    /**
+     * 秘钥
+     */
+    @Value("${parameter.KEY}")
+    public String KEY;
+    /**
+     * 微信支付回调地址
+     */
+    @Value("${parameter.wechatCallback}")
+    public String wechatCallback;
+    /**
+     * 支付宝Appid
+     */
+    @Value("${parameter.ALI_APP_ID}")
+    public String ALI_APP_ID;
+    /**
+     * 支付宝私钥
+     */
+    @Value("${parameter.PRI}")
+    public String PRI;
+    /**
+     * 支付宝公钥
+     */
+    @Value("${parameter.PUB}")
+    public String PUB;
+    /**
+     * 支付宝授权回调地址
+     */
+    @Value("${parameter.ALI_RETURN_URL}")
+    public String ALI_RETURN_URL;
+    /**
+     * 服务器域名
+     */
+    @Value("${parameter.domain}")
+    public String domain;
+    /**
+     * 乐刷代理商编号
+     */
+    @Value("${parameter.agentId}")
+    public String agentId;
+    /**
+     * 乐刷进件和交易请求密钥（key
+     */
+    @Value("${parameter.leshuapaykey}")
+    public String leshuapaykey;
+    /**
+     * 交易异步通知回调密钥
+     */
+    @Value("${parameter.leshuaCallBackKey}")
+    public String leshuaCallBackKey;
+    /**
+     * 粉丝分润比例
+     */
+    @Value("${parameter.fans_profit}")
+    public Double fans_profit;
+    /**
+     * 乐刷费率
+     */
+    @Value("${parameter.leshuarate}")
+    public Double leshuarate;
+    /**
+     * 下载apk地址
+     */
+    @Value("${parameter.apk_dowload_url}")
+    public String apk_dowload_url;
+    /**
+     * apk版本号
+     */
+    @Value("${parameter.versions}")
+    public String versions;
+    /**
+     * 官网获取的 API Key  OCR
+     */
+    @Value("${parameter.baiduAK}")
+    public String baiduAK;
+    /**
+     * 官网获取的 Secret Key OCR
+     */
+    @Value("${parameter.baiduSK}")
+    public String baiduSK;
+
+    /**
+     * 百度人脸识别
+     * 官网获取的 API Key  OCR
+     */
+    @Value("${parameter.baiduAK2}")
+    public String baiduAK2;
+
+    /**
+     * 百度人脸识别
+     * 官网获取的 Secret Key OCR
+     */
+    @Value("${parameter.baiduSK2}")
+    public String baiduSK2;
+
+    /**
+     * 身份证OCR接口地址
+     */
+    @Value("${parameter.idCardOCRUrl}")
+    public String idCardOCRUrl;
+    /**
+     * 银行卡OCR接口地址
+     */
+    @Value("${parameter.bankCardOCRUrl}")
+    public String bankCardOCRUrl;
+    /**
+     * 营业执照OCR接口地址
+     */
+    @Value("${parameter.blCardOCRUrl}")
+    public String blCardOCRUrl;
+    /**
+     * 阿里自用型应用appid
+     */
+    @Value("${parameter.ZY_ALI_APP_ID}")
+    public String ZY_ALI_APP_ID;
+    /**
+     * 阿里自用型应用私钥
+     */
+    @Value("${parameter.ZY_PRI}")
+    public String ZY_PRI;
+    /**
+     * 阿里自用型应用公钥
+     */
+    @Value("${parameter.ZY_PUB}")
+    public String ZY_PUB;
+    /**
+     * 刘思义本人的乐刷的商户编号 用来收推广人升级的钱
+     */
+    @Value("${parameter.LESHUALIU}")
+    public String LESHUALIU;
+
+    /**
+     * 收银呗微信普通商户APPID
+     */
+    @Value("${parameter.MERCHANT_APPID}")
+    public String MERCHANT_APPID;
+
+    /**
+     * 收银呗微信普通商户Appsecret
+     */
+    @Value("${parameter.MERCHANT_APPSECRET}")
+    public String MERCHANT_APPSECRET;
+
+    /**
+     * 收银呗微信普通商户号
+     */
+    @Value("${parameter.MERCHANT_PID}")
+    public String MERCHANT_PID;
+
+    /**
+     * 收银呗微信普通商户key
+     */
+    @Value("${parameter.MERCHANT_KEY}")
+    public String MERCHANT_KEY;
+
+    @Value("${parameter.LESHUA_API}")
+    public String LESHUA_API;
+
+    @Value("${parameter.SJ_APPID}")
+    public String SJ_APPID;
+
+    @Value("${parameter.SJ_APPSECRET}")
+    public String SJ_APPSECRET;
+
+    @PostConstruct
+    public void init() {
+        ParametersUtil.upload_save_path = upload_save_path;
+        ParametersUtil.upload_visit_path = upload_visit_path;
+        ParametersUtil.ALI_APP_AUTH_TOKEN = ALI_APP_AUTH_TOKEN;
+        ParametersUtil.ALI_RATE = ALI_RATE;
+        ParametersUtil.WECHAT_RATE = WECHAT_RATE;
+        ParametersUtil.APPID = APPID;
+        ParametersUtil.APPLETS_APPID = APPLETS_APPID;
+        ParametersUtil.APPSECRET = APPSECRET;
+        ParametersUtil.PID = PID;
+        ParametersUtil.KEY = KEY;
+        ParametersUtil.wechatCallback = wechatCallback;
+        ParametersUtil.ALI_APP_ID = ALI_APP_ID;
+        ParametersUtil.PRI = PRI;
+        ParametersUtil.PUB = PUB;
+        ParametersUtil.ALI_RETURN_URL = ALI_RETURN_URL;
+        ParametersUtil.domain = domain;
+        ParametersUtil.agentId = agentId;
+        ParametersUtil.leshuapaykey = leshuapaykey;
+        ParametersUtil.leshuaCallBackKey = leshuaCallBackKey;
+        ParametersUtil.fans_profit = fans_profit;
+        ParametersUtil.leshuarate = leshuarate;
+        ParametersUtil.apk_dowload_url = apk_dowload_url;
+        ParametersUtil.versions = versions;
+        ParametersUtil.baiduAK = baiduAK;
+        ParametersUtil.baiduSK = baiduSK;
+        ParametersUtil.baiduAK2 = baiduAK2;
+        ParametersUtil.baiduSK2 = baiduSK2;
+        ParametersUtil.idCardOCRUrl = idCardOCRUrl;
+        ParametersUtil.bankCardOCRUrl = bankCardOCRUrl;
+        ParametersUtil.blCardOCRUrl = blCardOCRUrl;
+        ParametersUtil.ZY_ALI_APP_ID = ZY_ALI_APP_ID;
+        ParametersUtil.ZY_PRI = ZY_PRI;
+        ParametersUtil.ZY_PUB = ZY_PUB;
+        ParametersUtil.LESHUALIU = LESHUALIU;
+        ParametersUtil.MERCHANT_APPID=MERCHANT_APPID;
+        ParametersUtil.MERCHANT_APPSECRET=MERCHANT_APPSECRET;
+        ParametersUtil.MERCHANT_PID=MERCHANT_PID;
+        ParametersUtil.MERCHANT_KEY=MERCHANT_KEY;
+        ParametersUtil.LESHUA_API=LESHUA_API;
+        ParametersUtil.SJ_APPID = SJ_APPID;
+        ParametersUtil.SJ_APPSECRET = SJ_APPSECRET;
+
+        SxfConfg.init(sxfDomain, publicKey, orgId);
+
+        RyxConfig.init(this);
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/config/StsConfig.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/config/StsConfig.java
new file mode 100644
index 0000000..7641760
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/config/StsConfig.java
@@ -0,0 +1,22 @@
+package cn.pluss.platform.config;
+
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+
+@Data
+@Configuration
+@PropertySource("classpath:config/application-common.yml")
+public class StsConfig {
+    @Value("${aliyun.sts.endpoint}")
+    private String endpoint;       //连接区域地址
+    @Value("${aliyun.keyid}")
+    private String keyid;    //连接keyId
+    @Value("${aliyun.keysecret}")
+    private String keysecret;    //连接秘钥
+    @Value("${aliyun.region-id}")
+    private String regionId;
+    @Value("${aliyun.sts.role-arn}")
+    private String roleArn;
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/config/TaskExecutorConfig.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/config/TaskExecutorConfig.java
new file mode 100644
index 0000000..6ed604f
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/config/TaskExecutorConfig.java
@@ -0,0 +1,32 @@
+package cn.pluss.platform.config;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.AsyncConfigurer;
+import org.springframework.scheduling.annotation.EnableAsync;
+
+import java.lang.reflect.Method;
+
+/**
+ * @author djh
+ */
+@Slf4j
+@Configuration
+@EnableAsync
+public class TaskExecutorConfig implements AsyncConfigurer {
+
+    @Override
+    public AsyncUncaughtExceptionHandler getAsyncUncaughtExceptionHandler() {
+        return new SimpleAsyncUncaughtExceptionHandler();
+    }
+
+    static class SimpleAsyncUncaughtExceptionHandler implements AsyncUncaughtExceptionHandler {
+
+        @Override
+        public void handleUncaughtException(Throwable throwable, Method method, Object... objects) {
+            log.error("异步回调失败了, 错误信息: " + throwable.getMessage());
+            throwable.printStackTrace();
+        }
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/config/UploadConfig.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/config/UploadConfig.java
new file mode 100644
index 0000000..a2ff626
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/config/UploadConfig.java
@@ -0,0 +1,22 @@
+package cn.pluss.platform.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.multipart.MultipartResolver;
+import org.springframework.web.multipart.commons.CommonsMultipartResolver;
+
+@Configuration
+public class UploadConfig {
+    @Bean(name = "multipartResolver")
+    public MultipartResolver multipartResolver() {
+        CommonsMultipartResolver resolver = new CommonsMultipartResolver();
+        resolver.setDefaultEncoding("UTF-8");
+        //resolveLazily属性启用是为了推迟文件解析，以在在UploadAction中捕获文件大小异常
+        resolver.setResolveLazily(true);
+        resolver.setMaxInMemorySize(40960);
+        //上传文件大小 50M 5*10*1024*1024
+        resolver.setMaxUploadSize(5* 10 * 1024 * 1024);
+        return resolver;
+    }
+
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/config/mybatis/SqlConditionExtra.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/config/mybatis/SqlConditionExtra.java
new file mode 100644
index 0000000..b09ef22
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/config/mybatis/SqlConditionExtra.java
@@ -0,0 +1,12 @@
+package cn.pluss.platform.config.mybatis;
+
+public class SqlConditionExtra {
+
+    public static final String GT = "%s &gt; #{%s}";
+
+    public static final String GE = "%s &gt;= #{%s}";
+
+    public static final String LT = "%s &lt; #{%s}";
+
+    public static final String LE = "%s &lt;= #{%s}";
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/constants/CommonError.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/constants/CommonError.java
new file mode 100644
index 0000000..badceee
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/constants/CommonError.java
@@ -0,0 +1,62 @@
+package cn.pluss.platform.constants;
+
+/**
+ * 这里存一些通用的异常术语
+ * @author SSS
+ */
+public class CommonError {
+
+    private CommonError(){}
+
+    public static final String NO_AUTHORIZATION = "拒绝访问";
+
+    public static final String NO_LOGIN = "请先登录账号";
+
+    public static final String NO_EXIST_ACCOUNT = "账号不存在";
+
+    public static final String PHONE_HAS_REGISTER = "手机号已被注册！";
+
+    public static final String NO_LEGAL_ID_CARD_INFO = "请填写法人身份证信息";
+
+    public static final String NO_ACC_ID_CARD_INFO = "请填写结算人身份证信息";
+
+    public static final String NO_USER_ID = "缺少userId";
+
+    public static final String NO_BANK_PHONE = "缺少银行卡预留手机号";
+
+    public static final String NO_ACCOUNT_ID_CARD = "缺少结算身份证信息";
+
+    public static final String NO_PART_ACCOUNT_ID_CARD = "结算身份证信息不全";
+
+    public static final String NO_PART_ACCOUNT_ID_CARD_HEAD = "缺少结算身份证信息人头面";
+
+    public static final String NO_PART_ACCOUNT_ID_CARD_EMBLEM = "缺少结算身份证信息国徽面";
+
+    public static final String NO_ACCOUNT_BANK_CARD = "缺少结算银行卡信息";
+
+    public static final String NO_ACCOUNT_BANK_CARD_LICENSE = "对公结算卡缺少开户许可证";
+
+    public static final String NO_ACCOUNT_BANK_CARD_IMG = "对私结算卡缺少银行卡卡号面图";
+
+    public static final String NO_PART_ACCOUNT_BANK_CARD = "结算银行卡信息不全";
+
+    public static final String NO_ILLEGAL_ACCOUNT_CERTIFICATE_URL = "非法人结算缺少非法人结算授权函";
+
+    public static final String CHANNEL_TYPE_ILLEGAL = "通道类型错误";
+
+    public static final String BANK_NAME_EMPTY = "缺少银行名称";
+
+    public static final String BANK_BRANCH_PROVINCE_EMPTY = "缺少开户支行所在省份";
+
+    public static final String BANK_BRANCH_CITY_EMPTY = "缺少开户支行所在市";
+
+    public static final String BANK_BRANCH_AREA_EMPTY = "缺少开户支行所在县/区";
+
+    public static final String BANK_BRANCH_NAME_EMPTY = "缺少开户支行名称";
+
+    public static final String BANK_BRANCH_CNAPS_EMPTY = "缺少开户支行联行号";
+
+    public static final String ACCOUNT_EMPTY = "缺少结算信息";
+
+    public static final String ERROR_STATUS = "当前状态不允许操作";
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/constants/Constant.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/constants/Constant.java
new file mode 100644
index 0000000..ebed667
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/constants/Constant.java
@@ -0,0 +1,237 @@
+package cn.pluss.platform.constants;
+
+
+import java.math.BigDecimal;
+
+public class Constant {
+
+
+    public static String INDUSTRY_TYPE = "industry";
+    public static String VIDEO_TYPE = "video";
+    public static String REQUST_RETIRN_JUMP = "";
+    public static String session_user = "session_user";
+
+    public static String MESSAGE_TYPE_BACK = "back";//回执
+    public static String MESSAGE_TYPE_MESSAGE = "message";//消息
+    public static String MESSAGE_TYPE_PING = "ping";//心跳
+    public static String MESSAGE_TYPE_BIND = "bind";//绑定
+    public static String MESSAGE_TYPE_RECEIVE = "receive";//暂存消息 收取
+    public static String QR_LIMIT_SCENE = "QR_LIMIT_SCENE";//微信创建二维码 永久 int
+
+    public static String RESULT_CODE_SUCCESS = "SUCCESS";//返回结果成功
+    public static String RESULT_CODE_FAIL = "FAIL";//返回结果失败
+    public static String RESULT_CODE_NONE = "NONE";//收到回执 什么不用做
+    public static String RESULT_CODE_OK = "OK";//服务端已接受
+
+    public static String FILE_SAVE_PATH = "/home/trade/talkfile/save";//服务端已接受
+
+
+    public static long MESSAGE_PING_CLOCK = 30;//心跳时钟 单位是秒
+
+
+    //支付状态
+    public static String PAY_RESULT_CODE_SUCCESS = "1";
+    public static String PAY_RESULT_CODE_FAIL = "2";
+    public static String PAY_RESULT_CODE_NONE = "0";
+
+
+    //支付方式
+    public static final String PAY_TYPE_WECHAT = "wechatPay";
+    public static final String PAY_TYPE_NAME_WECHAT = "微信";
+    public static final String PAY_TYPE_ALIPAY = "aliPay";
+    public static final String PAY_TYPE_NAME_ALIPAY = "支付宝";
+
+    public static final String PAY_TYPE_YSFPAY = "bank";
+
+    public static final String PAY_TYPE_NAME_YSFPAY = "云闪付";
+
+    //订单号前缀
+    public final static String PREFIX_ORDER = "11";
+    //日期格式
+    public final static String WECHATDATEFORMAT = "yyyyMMddHHmmss";
+
+    public final static String WEIXIN_PAY_UNIFIED_URL = "https://api.mch.weixin.qq.com/pay/unifiedorder";
+
+    public final static String TENCENT_GET_ADDRESS_URL = "https://apis.map.qq.com/ws/geocoder/v1";
+
+    public static String sync_type_dml = "dml";//同步类型
+    public static String sync_type_ddl = "ddl";//同步类型
+    public static String sync_definition_action_insert = "insert";
+    public static String sync_definition_action_update = "update";
+    public static String sync_definition_action_delete = "delete";
+    public static String sync_definition_action_alter = "alter";
+    public static String sync_definition_action_create = "create";
+    public static String sync_definition_action_save = "save";
+
+
+    public static String sync_definition_entity_MerchantProductCategory = "MerchantProductCategory";
+    public static String sync_definition_entity_MerchantProductCombo = "MerchantProductCombo";
+    public static String sync_definition_entity_MerchantProduct = "MerchantProduct";
+    public static String sync_definition_entity_MerchantRole = "MerchantRole";
+    public static String sync_definition_entity_MerchantRoleMenu = "MerchantRoleMenu";
+    public static String sync_definition_entity_MerchantRoleUser = "MerchantRoleUser";
+    public static String sync_definition_entity_MerchantBaseInfo = "MerchantBaseInfo";
+    public static String sync_definition_entity_MerchantArea = "MerchantArea";
+    public static String sync_definition_entity_MerchantAreaClass = "MerchantAreaClass";
+
+    /**
+     * 百度短信模板
+     */
+    //注册成功
+    public static String baidu_template_regist_success = "smsTpl:6c248ad7-921b-417a-869b-e43a78795700";
+    //带评阅
+    public static String baidu_template_waitfor_read = "smsTpl:e8e3651a-d7b7-4870-a70a-eeefd18f90eb";
+    //参赛成
+    public static String baidu_template_join_batter = "smsTpl:c7bcd897-6bee-4822-8823-be0e506ff334";
+    //中榜
+    public static String baidu_template_on_list = "smsTpl:466d88ca-317e-4af1-875d-d1ebe2258304";
+    //评阅成功
+    public static String baidu_template_read_success = "smsTpl:591e7f62-8a13-49b8-88b9-7dc9f9f6cf8f";
+    /**
+     * 微信公众号模板
+     */
+    /**
+     * 注册成功
+     */
+    public static String wechat_template_regist_success = "	UNeuf5QpriPfLVCJvXLhneBq3NVNQi2KKXIhCIjkz8Y";
+    /**
+     * 待评阅
+     */
+    public static String wechat_template_waitfor_read = "ncbyBjSDhvF3NQ-25OStNS7lohq_ZI_QLBjpS2Bj7NA";
+    /**
+     * 活动报名成功
+     */
+    public static String wechat_template_join_batter = "OKX7nmg0YPAicELVQn3DXMtHWowVS1jc0ZdAjmuYVqs";
+    /**
+     * 中榜
+     */
+    public static String wechat_template_on_list = "9TWvGm19CuV1Wk4fuGu-SUfkuKsR9Yi77OXm234w8Tw";
+    /**
+     * 评阅成功
+     */
+    public static String wechat_template_read_success = "D6eGbZ8GO36KCXCAe6CwNjG7RRHZxcDDxkOCbeYcIRk";
+    /**
+     * 登录成功提醒
+     */
+    public static String wechat_template_login_success = "iZugTWBgboOdqttfmHvgv_NR_QTFjp88GREmu5JUC7c";
+
+    /**
+     * 充值成功
+     */
+    public static String wechat_template_pay_success = "3TzSZHbyRMxG3e5x5KxTCMD_BTP8hJHTGllOnSaCpf0";
+    /**
+     * 消费成功
+     */
+    public static String wechat_consume_success = "JFIaSWscb_KKCHN_3cCO4ctlDrbsRs0MywjScpYk0bA";
+
+    /**
+     * 图形验证码key
+     * @date: 2021/12/20 10:24
+     */
+    public static final String LOGIN_VALIDATE_CODE = "login_validate_code";
+
+    /**
+     * 用户最高等级等级LV10
+     * @date: 2022/1/22 15:16
+     */
+    public static final String USER_MAX_LEVEL_CODE = "LV10";
+
+    /**
+     * 最小结算底价
+     * @date: 2022/3/9 18:08
+     */
+    public static final BigDecimal MIX_SETTLE_RATE = BigDecimal.valueOf(21);
+
+    /**
+     * 缴费通
+     * @date: 2022/3/9 18:08
+     */
+    public static final BigDecimal JFT_MIX_SETTLE_RATE = BigDecimal.valueOf(28);
+
+    /**
+     * 默认收款商户号
+     */
+    public static final String DEFUALT_CASHIER_MERCHANT = "M80020220111357490";
+
+    /**
+     * 默认收款商户属性key
+     */
+    public static final String SYSTEM_MERCHANT_KEY = "cashier_merchant";
+
+    /**
+     * 默认通道
+     */
+    public static final Integer DEFAULT_CHANNEL = 4;
+
+    /**
+     * 支付宝H5支付前缀
+     */
+    public static final String ALIPAY_H5_PAY_URL_PRIFIX = "alipays://platformapi/startapp?appId=20000067&url=";
+
+    /**
+     * 收款通道类型
+     */
+    public static final String PAYMENT_CHANNEL_TYPE = "payment_channel_type";
+
+    /**
+     * 原生通道
+     */
+    public static final Integer PRIMORDIAL_CHANNEL = 5;
+
+    /**
+     * 小程序默认支付路径
+     */
+    public static final String DEFAULT_APPLET_PATH = "/pages/pay/index";
+
+    /**
+     * 小程序默认支付参数名
+     */
+    public static final String DEFAULT_APPLET_PARAM_NAME_PREFIX = "orderId=";
+
+    /**
+     * 积分商城用户同步URL
+     */
+    public static final String JF_SHOP_USER_SYNC_URL = "http://jf.shouyinbei.com/addons/shopro/syb_merchant/sysnmerchant";
+
+    /**
+     * 生活圈会员卡默认过期时间 5（单位分钟）
+     */
+    public static final Integer DEFAULT_LIFE_MEMBER_CARD_REFRESH_TIME = 5;
+
+    /**
+     * 缴费通成本费率
+     */
+    public static final BigDecimal DEFAULT_JFT_COST_RATE = BigDecimal.valueOf(30);
+
+    /**
+     * 缴费通固定提现费率
+     */
+    public static final BigDecimal DEFAULT_JFT_CASH_RATE = BigDecimal.valueOf(0.001);
+
+    /**
+     * 缴费通固定提现费
+     */
+    public static final BigDecimal DEFAULT_JFT_CASH_FEE = BigDecimal.valueOf(0.01);
+
+
+    /**
+     * 银盛交易回传字段key
+     */
+    public static final String YS_PAY_ECHO_KEY_NAME = "extra_common_param";
+
+    /**
+     * 随行付回传字段key
+     */
+    public static final String SXF_PAY_ECHO_KEY_NAME = "extend";
+
+    /**
+     * 瑞银信交易回传字段
+     */
+    public static final String RYX_PAY_ECHO_KEY_NAME = "extend1";
+
+    /**
+     * 默认秘钥设置
+     */
+    public static final String DEFAULT_MD5_KEY = "4c8d277b0f274604af68e590cc0b3e6b";
+
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/constants/ProjectConstant.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/constants/ProjectConstant.java
new file mode 100644
index 0000000..cf4e364
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/constants/ProjectConstant.java
@@ -0,0 +1,70 @@
+package cn.pluss.platform.constants;
+
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * 项目常量
+ */
+public final class ProjectConstant {
+	/**
+	 * 生成代码所在的基础包名称，可根据自己的项目修改（注意：这个配置修改之后需要手工修改src目录项目默认的包路径，使其保持一致，不然会找不到类）
+	 **/
+	public static final String BASE_PACKAGE = "cn.pluss.platform";
+	/**
+	 * 生成的Model所在包
+	 */
+	public static final String MODEL_PACKAGE = BASE_PACKAGE + ".dto.entity";
+	/**
+	 * 生成的Mapper所在包
+	 */
+	public static final String MAPPER_PACKAGE = BASE_PACKAGE + ".dao";
+	/**
+	 * 生成的Service所在包
+	 */
+	public static final String SERVICE_PACKAGE = BASE_PACKAGE + ".service";
+	/**
+	 * 生成的ServiceImpl所在包
+	 */
+	public static final String SERVICE_IMPL_PACKAGE = SERVICE_PACKAGE + ".impl";
+	/**
+	 * 生成的Controller所在包
+	 */
+	public static final String CONTROLLER_PACKAGE = BASE_PACKAGE + ".controller";
+	/**
+	 * Mapper插件基础接口的完全限定名
+	 */
+	public static final String MAPPER_INTERFACE_REFERENCE = BASE_PACKAGE + ".core.Mapper";
+	
+	public static final int BYTE_BUFFER = 1024;
+
+	public static final int BUFFER_MULTIPLE = 10;
+
+	public static final Integer PAGE_SIZE = 10;
+
+	public static Set<String> METHOD_URL_SET = new HashSet<>();
+	public static boolean isPass = false;
+
+	public static class FilePostFix {
+		public static final String ZIP_FILE = ".zip";
+		public static final String[] IMAGES = { "jpg", "jpeg", "JPG", "JPEG", "gif", "GIF", "bmp", "BMP", "png" };
+		public static final String[] ZIP = { "ZIP", "zip", "rar", "RAR" };
+		public static final String[] VIDEO = { "mp4", "MP4", "mpg", "mpe", "mpa", "m15", "m1v", "mp2", "rmvb" };
+		public static final String[] APK = { "apk", "exe" };
+		public static final String[] OFFICE = { "xls", "xlsx", "docx", "doc", "ppt", "pptx" };
+
+	}
+
+	public class FileType {
+		public static final int FILE_IMG = 1;
+		public static final int FILE_ZIP = 2;
+		public static final int FILE_VEDIO = 3;
+		public static final int FILE_APK = 4;
+		public static final int FIVE_OFFICE = 5;
+		public static final String FILE_IMG_DIR = "/img/";
+		public static final String FILE_ZIP_DIR = "/zip/";
+		public static final String FILE_VEDIO_DIR = "/video/";
+		public static final String FILE_APK_DIR = "/apk/";
+		public static final String FIVE_OFFICE_DIR = "/office/";
+	}
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/constants/ServiceConstants.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/constants/ServiceConstants.java
new file mode 100644
index 0000000..e30dc1f
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/constants/ServiceConstants.java
@@ -0,0 +1,113 @@
+package cn.pluss.platform.constants;
+
+public class ServiceConstants {
+
+    /**
+     * 微信支付
+     */
+    public static final String PAYMENT_PLATFORM_WECHAT = "wechatPay";
+    
+    /**
+     * 支付宝支付
+     */
+    public static final String PAYMENT_PLATFORM_ALIPAY = "aliPay";
+
+
+
+	public final static String  FAIL="FAIL";
+	public final static String  SUCCESS="SUCCESS";
+	
+	public final static String  SERVICE_NOT_FOUNDE="未找该业务接口";
+	public final static String  SESSION_USER="session_user";
+	public final static String  SESSION_MERCHANT="session_merchant";
+	public final static String  SESSION_MERCHANT_ENTITY="session_merchant_entity";
+	public final static String  SESSION_MERCHANT_OBJECT="session_merchant_object";
+	
+	public final static String DEFAULT_HREF="www.baidu.com";
+	
+	public final static String REQUST_RETIRN_LOACL="1";
+	public final static String REQUST_RETIRN_JUMP="2";
+	
+	public final static String CALL_WAP="wap";
+	public final static String CALL_WEB="web";
+	
+	public final static String DATEFORMAT="yyyy-MM-dd HH:mm:ss";
+	public final static String WECHATDATEFORMAT="yyyyMMddHHmmss";
+	public final static String DATEONLY="yyyyMMdd";
+	public final static String TABLETYPE="hhmmss";
+	
+	public final static String IMAGE_PRODUCT_MOUDLE="product";
+	public final static String IMAGE_PRODUCT_MOUDLE_DESC="列表图片";
+
+	public final static String IMAGE_MERCHANT_MOUDLE="merchant";
+	public final static String IMAGE_MERCHANT_MOUDLE_DESC="商户图片";
+	
+	public final static String IMAGE_INDEX_ACTIVITY_MOUDLE="index_activity";
+	public final static String IMAGE_INDEX_ACTIVITY_MOUDLE_DESC="首页活动图";
+	
+	public final static String IMAGE_BRAND_MOUDLE="brand";
+	public final static String IMAGE_BRAND_MOUDLE_DESC="品牌图片";
+	
+	public final static String IMAGE_PRODUCT_DETAILS_MOUDLE="details";
+	public final static String IMAGE_PRODUCT_DETAILS_MOUDLE_DESC="详情图片";
+	
+	public final static String WEIXIN_PAY_UNIFIED_URL="https://api.mch.weixin.qq.com/pay/unifiedorder";
+	
+	public final static String WEIXIN_PAY_MICROPAY_URL="https://api.mch.weixin.qq.com/pay/micropay";
+	
+	
+	public final static String WEIXIN_PAY_ORDER_INFO_QUERY_URL="https://api.mch.weixin.qq.com/pay/orderquery";
+	
+	public final static String WEIXIN_PAY_AGREEMENT_SUCCESS="SUCCESS";
+	public final static String WEIXIN_PAY_DATA_SUCCESS="SUCCESS";
+	
+	public final static String WEIXIN_PAY_SUCCESS="SUCCESS";
+	
+	public final static String WEIXIN_PAY_FAIL="FAIL";
+	
+	public final static String SHOP_CHANNEL="13";
+	
+	//订单号前缀
+	public final static String PREFIX_ORDER="11";
+	
+	public final static String RETURNPAGEURL = "returnPageUrl";
+	
+	public final static String PAYMENTURL = "paymentUrl";
+	
+	public final static String NOTIFYURL = "notifyUrl";
+	
+	public final static Integer ONLINE = 1;
+	
+	public final static Integer CASH = 2;
+	
+	public final static String PRODUCTNUM = "productNum";
+	
+	public final static String REMOTETELEPHONE = "remoteTelephone";
+	
+	public final static String PHONEMAC = "phoneMac";
+	
+	public final static String BOXMAC = "boxMac";
+	
+	public final static String SKIPFLAG = "skipFlag";
+	
+	public final static String SKIPMERCHANTCODE = "skipMerchantCode";
+	
+	public final static String GWADDRESS = "gwAddress";
+	
+	public final static String BOXPORT = "boxPort";
+
+	public final static String TOKEN = "token";
+	
+	//支付宝RSA公钥
+	public final static String ALIPAY_PUBLIC_KEY="MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDUJ8o7gFbWZlw6xVjnEjVBTt/9iM9gFAdg+lmRFfyaDTXcHkVeUs+R99RB7mkzZjp/TrwhNMtN6Bn98tt66vWQ0MffWgsOb0zkRTxoqr2CQD1CdCd+FdunED/Z/JS3H2rctUMvSpoyYxLmquAm75S2O395Y2y1yopntKMzTt5PewIDAQAB";
+	//商家RSA私钥
+	public final static String ALIPAY_PRIVATE_KEY="MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBANQnyjuAVtZmXDrFWOcSNUFO3/2Iz2AUB2D6WZEV/JoNNdweRV5Sz5H31EHuaTNmOn9OvCE0y03oGf3y23rq9ZDQx99aCw5vTORFPGiqvYJAPUJ0J34V26cQP9n8lLcfaty1Qy9KmjJjEuaq4CbvlLY7f3ljbLXKime0ozNO3k97AgMBAAECgYA/Q6pLugarIpUINYdASK62zeV/fkeQuAhHRABngm30JlJUVHaNHRamyYdzLbwTRr3U7s6s/EhP8BGoJ76JVf1p6cmQns6s4IlYdq61y+GQCQEM1rGx3gdM6zGFHo/dsJwEM3+r9wTmWMnf1re6kGj2PdqdlUhqs0ZwB0syTdzdIQJBAOrIn8v4V5X6yyIqO3y4acbSnx7CwgUOn/KUGZdv7xKiJz4mOqFgLes2MPIKqo3DU8ItL99g7rPBkwOQBR71AjECQQDnU7G5SKyq/6NSQ/ym8rfmD6pRoIM33GGCAYWT/K5eeagtAw1iLX1drHhN/QrIcbY4Y9Wj+24R75nQU7MoVnVrAkEA0y3JremevmRqujxKbZBidFeWkFCVu37AF61mp3QjEhuQOLKiIe0k4GBJ/ivh5MlAWXPTj5TcoAsJdTbhpEq0wQJAFkTbVg/l92w2p8O9vcCd7XrSlZsTJryDcoV8+3sWuieSBgtGLY5dhDgHONLER/mSZilONsQMm5NqRkDYfWidUwJAYZapzIvzmbqFajsSvk52GppXThi7FdJLDMO5f51VvzQ0J3LRH90G7vPyRi1HtmDWgPfwJnNzAP18Yqaimh/fcw==";
+	
+
+	public final static String USER_INFO_USERNAME = "userName";
+	public final static String USER_INFO_PHONE = "userPhone";
+	public final static String ACTIVITY_CODE = "activity_code";
+	public final static String CURRENT_USER = "CURRENT_USER";
+	public final static String SESSION_USER_OPENID = "openId";
+	
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/constants/jft/JftConstant.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/constants/jft/JftConstant.java
new file mode 100644
index 0000000..40c1a4e
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/constants/jft/JftConstant.java
@@ -0,0 +1,23 @@
+package cn.pluss.platform.constants.jft;
+
+import java.math.BigDecimal;
+
+/**
+ * TODO
+ * 缴费通基础常量配置
+ * @author crystal
+ * @date 2022/6/16 15:59
+ */
+public class JftConstant {
+
+  /**
+   * 跳转小程序收款单页面url 或者是h5支付连接
+   */
+  public static final String JUMP_JFT_APPLET_URL =
+    "https://XXXXXX/wap/jft/auth?tk=TOKEN";
+
+  /**
+   * 收款单最少支付金额
+   */
+  public static final BigDecimal JFT_MIN_PAY_AMT = BigDecimal.valueOf(0.5);
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/entitiy/ActionInfo.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/entitiy/ActionInfo.java
new file mode 100644
index 0000000..d91f847
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/entitiy/ActionInfo.java
@@ -0,0 +1,26 @@
+package cn.pluss.platform.entitiy;
+
+/**
+ * @author yuchen
+ * @Description 
+ */
+public class ActionInfo {
+	
+	private Scene scene;
+
+	public Scene getScene() {
+		return scene;
+	}
+
+	public void setScene(Scene scene) {
+		this.scene = scene;
+	}
+
+
+	public ActionInfo(Scene scene) {
+		this.scene = scene;
+	}
+	public ActionInfo() {
+	}
+}
+
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/entitiy/ReqRecords.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/entitiy/ReqRecords.java
new file mode 100644
index 0000000..7e2bb92
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/entitiy/ReqRecords.java
@@ -0,0 +1,44 @@
+package cn.pluss.platform.entitiy;
+
+import cn.pluss.platform.config.mybatis.SqlConditionExtra;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@TableName("tb_pluss_req_records")
+public class ReqRecords {
+
+    private Integer id;
+
+    private String uri;
+
+    private Long userId;
+
+    private String loginName;
+
+    private String ip;
+
+    private String phone;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.GT)
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.LT)
+    private Date createTimeEnd;
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/entitiy/Scene.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/entitiy/Scene.java
new file mode 100644
index 0000000..faf28f0
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/entitiy/Scene.java
@@ -0,0 +1,27 @@
+package cn.pluss.platform.entitiy;
+
+/**
+ * @author yuchen
+ *
+ * @Description 
+ */
+public class Scene {
+	
+	private  String scene_str;
+
+	public String getScene_str() {
+		return scene_str;
+	}
+
+	public void setScene_str(String scene_str) {
+		this.scene_str = scene_str;
+	}
+
+	public Scene(String scene_str) {
+		this.scene_str = scene_str;
+	}
+	public Scene() {
+
+	}
+}
+
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/entitiy/SettleTypeEnum.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/entitiy/SettleTypeEnum.java
new file mode 100644
index 0000000..857ad6a
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/entitiy/SettleTypeEnum.java
@@ -0,0 +1,40 @@
+package cn.pluss.platform.entitiy;
+
+import cn.pluss.platform.exception.MsgException;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+
+/**
+ * 结算类型枚举
+ * @author Administrator
+ * @date 2021/07/12
+ */
+@Getter
+@AllArgsConstructor
+public enum SettleTypeEnum {
+
+    D0("D0",0,"D0实时结算"),
+    D1("D1",1,"D1次日结算");
+
+    private String code;
+
+    private Integer value;
+
+    private String name;
+
+    public static boolean checkValues(String code) {
+        SettleTypeEnum[] settleTypeEnums = values();
+        boolean flag = false;
+        for (SettleTypeEnum businessModeEnum : settleTypeEnums) {
+            if(businessModeEnum.getCode().equals(code)){
+                flag = true;
+            }
+        }
+        if(!flag){
+            MsgException.throwException("结算参数有误！");
+        }
+        return true;
+    }
+
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/entitiy/ShiroUser.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/entitiy/ShiroUser.java
new file mode 100644
index 0000000..b1cce09
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/entitiy/ShiroUser.java
@@ -0,0 +1,60 @@
+package cn.pluss.platform.entitiy;
+
+import cn.pluss.platform.util.StringUtil;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 自定义Authentication对象，使得Subject除了携带用户的登录名外还可以携带更多信息.
+ */
+@Data
+public class ShiroUser implements Serializable {
+    private static final long serialVersionUID = -1373760761780840081L;
+    private String loginName;
+    private String name;
+    private Long id;
+    private Long areaId;
+    private Integer status;
+
+    /**
+     * 当前登录的用户类型   merchant：商家，promoter：推广人 staff：员工   (不是管理员时的用户类型)
+     */
+    private String userType;
+
+    private String staffType;
+    /**
+     * 商户code
+     */
+    private String merchantCode;
+
+    /**
+     * 本函数输出将作为默认的<shiro:principal/>输出.
+     */
+    @Override
+    public String toString() {
+        return loginName;
+    }
+
+    /**
+     * 重载equals,只计算loginName;
+     */
+    @Override
+    public int hashCode() {
+        return this.loginName.hashCode();
+    }
+
+    /**
+     * 重载equals,只比较loginName
+     */
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null || !(obj instanceof ShiroUser))
+            return false;
+        ShiroUser o = (ShiroUser) obj;
+        return StringUtil.equals(loginName, o.loginName);
+    }
+
+
+}
\ No newline at end of file
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/entitiy/SystemConfig.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/entitiy/SystemConfig.java
new file mode 100644
index 0000000..94f7dad
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/entitiy/SystemConfig.java
@@ -0,0 +1,63 @@
+package cn.pluss.platform.entitiy;
+
+/**
+ * @author yuchen
+ * 
+ * @Description 
+ */
+public class SystemConfig {
+	private int id;
+	private String propertyKey;
+	private String propertyValue;
+	private String propertyDesc;
+	private int propertyIndex;
+	private String systemId;
+	
+	
+	@Override
+	public String toString() {
+		return "SystemConfigEntity [id=" + id + ", propertyKey=" + propertyKey
+				+ ", propertyValue=" + propertyValue + ", propertyDesc="
+				+ propertyDesc + ", propertyIndex=" + propertyIndex
+				+ ", systemId=" + systemId + "]";
+	}
+	
+	
+	public int getId() {
+		return id;
+	}
+	public void setId(int id) {
+		this.id = id;
+	}
+	public String getPropertyKey() {
+		return propertyKey;
+	}
+	public void setPropertyKey(String propertyKey) {
+		this.propertyKey = propertyKey;
+	}
+	public String getPropertyValue() {
+		return propertyValue;
+	}
+	public void setPropertyValue(String propertyValue) {
+		this.propertyValue = propertyValue;
+	}
+	public String getPropertyDesc() {
+		return propertyDesc;
+	}
+	public void setPropertyDesc(String propertyDesc) {
+		this.propertyDesc = propertyDesc;
+	}
+	public String getSystemId() {
+		return systemId;
+	}
+	public void setSystemId(String systemId) {
+		this.systemId = systemId;
+	}
+	public int getPropertyIndex() {
+		return propertyIndex;
+	}
+	public void setPropertyIndex(int propertyIndex) {
+		this.propertyIndex = propertyIndex;
+	}
+}
+
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/entitiy/UnknownException.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/entitiy/UnknownException.java
new file mode 100644
index 0000000..5a5a48c
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/entitiy/UnknownException.java
@@ -0,0 +1,36 @@
+package cn.pluss.platform.entitiy;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * CREATE TABLE `tb_pluss_unknown_exception` (
+ *   `id` int(11) NOT NULL,
+ *   `name` varchar(255) NOT NULL,
+ *   `desc` longtext COMMENT '异常内容',
+ *   `createTime` datetime DEFAULT NULL COMMENT '创建时间',
+ *   PRIMARY KEY (`id`)
+ * ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+ */
+@Data
+@Accessors(chain = true)
+public class UnknownException {
+
+    private Integer id;
+
+    private String name;
+
+    private String uri;
+
+    private Long userId;
+
+    private String params;
+
+    @TableField("`desc`")
+    private String desc;
+
+    private Date createTime;
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/entitiy/WechatQRCode.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/entitiy/WechatQRCode.java
new file mode 100644
index 0000000..8fdc276
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/entitiy/WechatQRCode.java
@@ -0,0 +1,39 @@
+package cn.pluss.platform.entitiy;
+
+/**
+ * @author yuchen
+ * 
+ * @Description 
+ */
+public class WechatQRCode {
+	
+	 // 获取的二维码  
+    private String ticket;  
+    // 二维码的有效时间,单位为秒,最大不超过2592000（即30天）  
+    private int expire_seconds;
+    
+    private  String url;
+    
+	public String getTicket() {
+		return ticket;
+	}
+	public void setTicket(String ticket) {
+		this.ticket = ticket;
+	}
+	public int getExpire_seconds() {
+		return expire_seconds;
+	}
+	public void setExpire_seconds(int expire_seconds) {
+		this.expire_seconds = expire_seconds;
+	}
+	public String getUrl() {
+		return url;
+	}
+	public void setUrl(String url) {
+		this.url = url;
+	}
+    
+    
+
+}
+
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/exception/BackDataErrorException.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/exception/BackDataErrorException.java
new file mode 100644
index 0000000..beea8f4
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/exception/BackDataErrorException.java
@@ -0,0 +1,22 @@
+package cn.pluss.platform.exception;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+/**
+ * 该异常用于统计后台数据异常信息，定时任务类错误信息，
+ * 此类报错无前端显示
+ * @author DJH
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class BackDataErrorException extends RuntimeException {
+
+    public BackDataErrorException(String msg) {
+        super(msg);
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/exception/ForbiddenException.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/exception/ForbiddenException.java
new file mode 100644
index 0000000..066b924
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/exception/ForbiddenException.java
@@ -0,0 +1,8 @@
+package cn.pluss.platform.exception;
+
+public class ForbiddenException extends RuntimeException {
+
+    public ForbiddenException(String message) {
+        super(message);
+    }
+}
\ No newline at end of file
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/exception/MsgException.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/exception/MsgException.java
new file mode 100644
index 0000000..1528819
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/exception/MsgException.java
@@ -0,0 +1,102 @@
+package cn.pluss.platform.exception;
+
+import cn.pluss.platform.api.ResultCode;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+import org.apache.commons.lang3.StringUtils;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 一般异常信息的异常，全局捕获会抛出异常信息给前端
+ * @author Djh
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class MsgException extends RuntimeException {
+
+    private final Serializable obj;
+    private final ResultCode code;
+
+    public MsgException(String msg) {
+        this(msg, null);
+    }
+
+    public MsgException(String msg, Serializable obj) {
+        this(ResultCode.FAIL, msg, obj);
+    }
+
+    public MsgException(ResultCode code, String msg, Serializable obj) {
+        super(msg);
+        this.code = code;
+        this.obj = obj;
+    }
+
+    public static void throwException(String msg) throws MsgException {
+        throw new MsgException(msg);
+    }
+
+    /**
+     * @param result
+     * @param errMsg
+     *
+     * @throws MsgException 为空的时候抛出异常
+     */
+    public static void check(boolean result, String errMsg) throws MsgException {
+        if (result) {
+            throw new MsgException(errMsg);
+        }
+    }
+
+    /**
+     * @param obj1
+     * @param errMsg
+     */
+    public static void checkNull(Object obj1, String errMsg) throws MsgException {
+        if (obj1 == null) {
+            throw new MsgException(errMsg);
+        }
+    }
+
+    public static void checkEquals(Object obj1, Object obj2, String errMsg) {
+        if (obj1.equals(obj2)) {
+            throw new MsgException(errMsg);
+        }
+    }
+
+    public static void checkUnequals(Object obj1, Object obj2, String errMsg) {
+        if (!obj1.equals(obj2)) {
+            throw new MsgException(errMsg);
+        }
+    }
+
+    public static void checkNonNull(Object obj1, String errMsg) throws MsgException {
+        if (obj1 != null) {
+            throw new MsgException(errMsg);
+        }
+    }
+
+    public static void checkBlank(String field, String errMsg) throws MsgException {
+        if (StringUtils.isBlank(field)) {
+            throw new MsgException(errMsg);
+        }
+    }
+
+    public static <T> void checkBlank(List<T> dataList, String errMsg) throws MsgException {
+        if (dataList == null || dataList.isEmpty()) {
+            throw new MsgException(errMsg);
+        }
+    }
+
+    public static <T> void checkNonBlank(List<T> dataList, String errMsg) throws MsgException {
+        if (dataList != null && !dataList.isEmpty()) {
+            throw new MsgException(errMsg);
+        }
+    }
+}
+
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/exception/PayRiskException.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/exception/PayRiskException.java
new file mode 100644
index 0000000..c12ed22
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/exception/PayRiskException.java
@@ -0,0 +1,11 @@
+package cn.pluss.platform.exception;
+
+/**
+ * 支付风险异常
+ */
+public class PayRiskException extends Exception {
+
+    public PayRiskException(String msg) {
+        super(msg);
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/exception/RateNoChangeException.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/exception/RateNoChangeException.java
new file mode 100644
index 0000000..8d68b87
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/exception/RateNoChangeException.java
@@ -0,0 +1,11 @@
+package cn.pluss.platform.exception;
+
+/**
+ * 费率未发生变更的异常信息
+ */
+public class RateNoChangeException extends MsgException {
+
+    public RateNoChangeException() {
+        super("未修改费率");
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/exception/ThirdException.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/exception/ThirdException.java
new file mode 100644
index 0000000..3f3898d
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/exception/ThirdException.java
@@ -0,0 +1,8 @@
+package cn.pluss.platform.exception;
+
+public class ThirdException extends RuntimeException {
+
+    public ThirdException(String message) {
+        super(message);
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/exception/UnauthorizedException.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/exception/UnauthorizedException.java
new file mode 100644
index 0000000..ffa7f54
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/exception/UnauthorizedException.java
@@ -0,0 +1,12 @@
+package cn.pluss.platform.exception;
+
+/**
+ * 未授权异常
+ * @author SSS
+ */
+public class UnauthorizedException extends RuntimeException {
+
+    public UnauthorizedException(String msg) {
+        super(msg);
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/filter/DruidStatFilter.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/filter/DruidStatFilter.java
new file mode 100644
index 0000000..b1d64e8
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/filter/DruidStatFilter.java
@@ -0,0 +1,14 @@
+package cn.pluss.platform.filter;
+
+import com.alibaba.druid.support.http.WebStatFilter;
+
+import javax.servlet.annotation.WebFilter;
+import javax.servlet.annotation.WebInitParam;
+
+@WebFilter(filterName="druidWebStatFilter",urlPatterns="/*",
+        initParams={
+                @WebInitParam(name="exclusions",value="*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*")// 忽略资源
+        }
+)
+public class DruidStatFilter extends WebStatFilter {
+}
\ No newline at end of file
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/interceptor/RequestInfoInterceptor.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/interceptor/RequestInfoInterceptor.java
new file mode 100644
index 0000000..3993f99
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/interceptor/RequestInfoInterceptor.java
@@ -0,0 +1,117 @@
+package cn.pluss.platform.interceptor;
+
+import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.method.HandlerMethod;
+import org.springframework.web.servlet.HandlerInterceptor;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author DJH
+ */
+@Slf4j
+public class RequestInfoInterceptor implements HandlerInterceptor {
+
+    @Override
+    public boolean preHandle(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Object handler) throws Exception {
+        // 所有请求第一个进入的方法
+        String ip = httpServletRequest.getRemoteHost();
+        InputStream is = httpServletRequest.getInputStream();
+        StringBuilder responseStrBuilder = new StringBuilder();
+        BufferedReader streamReader = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8));
+        String inputStr;
+        while ((inputStr = streamReader.readLine()) != null) {
+            responseStrBuilder.append(inputStr);
+        }
+
+        long startTime = System.currentTimeMillis();
+        httpServletRequest.setAttribute("startTime", startTime);
+
+        Enumeration<String> headerNames = httpServletRequest.getHeaderNames();
+        Map<String, Object> headers = new HashMap<>();
+
+        while (headerNames.hasMoreElements()) {
+            String key = headerNames.nextElement();
+            String value = httpServletRequest.getHeader(key);
+            headers.put(key, value);
+        }
+
+        if (handler instanceof HandlerMethod) {
+            StringBuilder sb = new StringBuilder(1000);
+            String header = httpServletRequest.getHeader("user-agent");
+            System.out.println("Header info : " + header);
+            sb.append("------------------------------------------------------------\n");
+            HandlerMethod h = (HandlerMethod) handler;
+            String typeName = h.getBean().getClass().getTypeName();
+            typeName = typeName.replaceAll("(\\w)\\w*\\.", "$1.");
+            int end = typeName.indexOf("$");
+            if (end == -1) {
+                end = typeName.length();
+            }
+
+            //Controller 的包名
+            sb.append("Controller: ").append(typeName, 0, end).append("\n");
+            //方法名称
+            sb.append("Method    : ").append(h.getMethod().getName()).append("\n");
+            //所有的请求参数
+            sb.append("Params    : ").append(getParameterInfo(httpServletRequest)).append("\n");
+
+            if (responseStrBuilder.length() > 1000) {
+                sb.append("body: ").append(responseStrBuilder.substring(0, 1000)).append("\n");
+            } else {
+                sb.append("body: ").append(responseStrBuilder).append("\n");
+            }
+            sb.append("headers   : ").append(JSONObject.toJSONString(headers)).append("\n");
+            //部分请求链接
+            sb.append("URI       : ").append(httpServletRequest.getRequestURI()).append("\n");
+
+            log.info("request info : \n {}", sb);
+        }
+
+
+        return true;
+    }
+
+    @Override
+    public void postHandle(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Object o, ModelAndView modelAndView) throws Exception {
+
+    }
+
+    @Override
+    public void afterCompletion(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Object o, Exception e) throws Exception {
+
+    }
+
+    private Map<String, Object> getParameterInfo(HttpServletRequest request) {
+        Map<String, Object> parameter = new HashMap<>();
+        Map<String, String[]> parameterMap = request.getParameterMap();
+
+        for (Map.Entry<String, String[]> entry : parameterMap.entrySet()) {
+            String key = entry.getKey();
+            String[] parameterValues = entry.getValue();
+            if (parameterValues.length == 1) {
+                int length = parameterValues[0].length();
+                if (length > 255) {
+                    parameter.put(key, parameterValues[0].substring(0, 255) + "...");
+                } else {
+                    parameter.put(key, parameterValues[0]);
+                }
+            } else {
+                parameter.put(key, Arrays.toString(parameterValues));
+            }
+        }
+
+        return parameter;
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/interceptor/filter/WrapFilter.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/interceptor/filter/WrapFilter.java
new file mode 100644
index 0000000..6b660d9
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/interceptor/filter/WrapFilter.java
@@ -0,0 +1,45 @@
+package cn.pluss.platform.interceptor.filter;
+
+import cn.pluss.platform.interceptor.wrapper.RequestWrapper;
+import org.springframework.core.Ordered;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.*;
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+
+/**
+ * 用于替换默认的 HttpServletRequest
+ * @author Djh
+ */
+@Component
+@Order(Ordered.HIGHEST_PRECEDENCE)
+public class WrapFilter implements Filter {
+
+    @Override
+    public void init(FilterConfig filterConfig) {
+    }
+
+    @Override
+    public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
+        HttpServletRequest httpServletRequest = (HttpServletRequest) servletRequest;
+//        String contentType = httpServletRequest.getContentType();
+//        String method = "multipart/form-data";
+
+//        if (contentType != null && contentType.contains(method)) {
+//            // 将转化后的 request 放入过滤链中
+//            httpServletRequest = new StandardServletMultipartResolver().resolveMultipart(httpServletRequest);
+//        }
+
+
+        ServletRequest requestWrapper = new RequestWrapper(httpServletRequest);
+        filterChain.doFilter(requestWrapper, servletResponse);
+
+//        filterChain.doFilter(servletRequest, servletResponse);
+    }
+
+    @Override
+    public void destroy() {
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/interceptor/wrapper/RequestWrapper.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/interceptor/wrapper/RequestWrapper.java
new file mode 100644
index 0000000..2c7b425
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/interceptor/wrapper/RequestWrapper.java
@@ -0,0 +1,161 @@
+package cn.pluss.platform.interceptor.wrapper;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.util.StreamUtils;
+
+import javax.servlet.ReadListener;
+import javax.servlet.ServletInputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequestWrapper;
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import java.util.*;
+
+@Slf4j
+public class RequestWrapper extends HttpServletRequestWrapper {
+
+    private Map<String, String[]> params = new HashMap<>();
+
+    /**
+     * 用于将流保存下来
+     */
+    private byte[] requestBody = null;
+
+    private final Map<String, String> headers = new HashMap<>();
+
+    @Override
+    public Map<String, String[]> getParameterMap() {
+        Map<String, String[]> result = new HashMap<>();
+        result.putAll(super.getParameterMap());
+        result.putAll(params);
+        return result;
+    }
+
+    @Override
+    public Enumeration<String> getParameterNames() {
+        Map<String, String[]> result = new HashMap<>();
+        result.putAll(super.getParameterMap());
+        result.putAll(params);
+
+        Vector<String> l = new Vector<>(result.keySet());
+        return l.elements();
+    }
+
+    @Override
+    public String[] getParameterValues(String name) {
+        Object v = params.get(name);
+
+        if (v == null) {
+            return super.getParameterValues(name);
+        } else {
+            return (String[]) v;
+        }
+    }
+
+    @Override
+    public String getParameter(String name) {
+        Object v = params.get(name);
+        if (v == null) {
+            return super.getParameter(name);
+        } else {
+            String[] strArr = (String[]) v;
+            if (strArr.length > 0) {
+                return strArr[0];
+            } else {
+                return null;
+            }
+        }
+    }
+
+    public void addParam(String key, String... value) {
+        params.put(key, value);
+    }
+
+    public void addHeader(String name,String value){
+        headers.put(name, value);
+    }
+
+    @Override
+    public Enumeration<String> getHeaderNames() {
+        List<String> names= Collections.list(super.getHeaderNames());
+        names.addAll(headers.keySet());
+
+        return Collections.enumeration(names);
+    }
+
+    @Override
+    public Enumeration<String> getHeaders(String name) {
+        List<String> list= Collections.list(super.getHeaders(name));
+
+        if (headers.containsKey(name)){
+            list.add(headers.get(name));
+        }
+
+        return Collections.enumeration(list);
+    }
+
+    @Override
+    public String getHeader(String name) {
+        String value=super.getHeader(name);
+
+        if (headers.containsKey(name)){
+            value=headers.get(name);
+        }
+
+        return value;
+    }
+
+    public void setRequestBody(String requestBody) {
+        this.requestBody = requestBody.getBytes(StandardCharsets.UTF_8);
+    }
+
+    public RequestWrapper(HttpServletRequest request) {
+        super(request);
+        try {
+            String contentType = request.getContentType();
+            // 这里排除表单请求
+            if (contentType != null && !contentType.contains("x-www-form-urlencoded")) {
+                requestBody = StreamUtils.copyToByteArray(request.getInputStream());
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public ServletInputStream getInputStream() {
+        if (requestBody == null) {
+            requestBody = new byte[0];
+        }
+        final ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(requestBody);
+        return new ServletInputStream() {
+
+            @Override
+            public int read() {
+                return byteArrayInputStream.read();
+            }
+
+            @Override
+            public void setReadListener(ReadListener listener) {
+            }
+
+            @Override
+            public boolean isReady() {
+                return false;
+            }
+
+            @Override
+            public boolean isFinished() {
+                return false;
+            }
+        };
+    }
+
+    @Override
+    public BufferedReader getReader() throws IOException {
+        return new BufferedReader(new InputStreamReader(getInputStream()));
+    }
+}
\ No newline at end of file
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/jty/JtyNoticeEnum.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/jty/JtyNoticeEnum.java
new file mode 100644
index 0000000..ebebb3d
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/jty/JtyNoticeEnum.java
@@ -0,0 +1,38 @@
+package cn.pluss.platform.jty;
+
+import cn.pluss.platform.entitiy.SettleTypeEnum;
+import cn.pluss.platform.exception.MsgException;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.Getter;
+
+/**
+ * TODO
+ * 佳天亿通知类型枚举
+ * @author crystal
+ * @date 2022/3/17 16:45
+ */
+@Getter
+@AllArgsConstructor
+public enum JtyNoticeEnum {
+
+    TEXT("1001","text","文本消息"),
+    SUCCESS("1002","pay","成功消息"),
+    CANCEL("1003","cancel","取消消息");
+
+    private String code;
+
+    private String name;
+
+    private String desc;
+
+    public static String getConverCode(String name) {
+        JtyNoticeEnum[] noticeEnums = values();
+        for (JtyNoticeEnum notice : noticeEnums) {
+            if(notice.getName().equals(name)){
+                return notice.getCode();
+            }
+        }
+        return null;
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/jty/JtyResponse.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/jty/JtyResponse.java
new file mode 100644
index 0000000..c0c9382
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/jty/JtyResponse.java
@@ -0,0 +1,19 @@
+package cn.pluss.platform.jty;
+
+import lombok.Data;
+
+/**
+ * TODO
+ * 佳天亿响应参数封装
+ * @author crystal
+ * @date 2022/3/17 16:00
+ */
+@Data
+public class JtyResponse {
+
+    private String code;
+
+    private String message;
+
+    private Object result;
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/jty/JtyResult.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/jty/JtyResult.java
new file mode 100644
index 0000000..018ec1a
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/jty/JtyResult.java
@@ -0,0 +1,17 @@
+package cn.pluss.platform.jty;
+
+import lombok.Data;
+
+/**
+ * TODO
+ * 佳天意授权返回结果参数封装
+ * @author crystal
+ * @date 2022/3/17 16:02
+ */
+@Data
+public class JtyResult {
+
+    private String authSign;
+
+    private Long expirationTime;
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/jty/JtyYxApiAuth.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/jty/JtyYxApiAuth.java
new file mode 100644
index 0000000..eb25203
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/jty/JtyYxApiAuth.java
@@ -0,0 +1,40 @@
+package cn.pluss.platform.jty;
+
+import cn.pluss.platform.jty.constant.JtyConstant;
+import lombok.Data;
+
+/**
+ * 佳天亿音箱授权实体类分装
+ * @author bzg
+ */
+@Data
+public class JtyYxApiAuth {
+
+    /**
+     * appId
+     */
+    private String appId;
+
+    /**
+     * appSecret
+     */
+    private String appSecret;
+
+    /**
+     * 版本号
+     */
+    private String apiVersion;
+
+
+    public JtyYxApiAuth(String appId,String appSecret) {
+        this.appId = appId;
+        this.appSecret = appSecret;
+        this.apiVersion = JtyConstant.VERSION;
+    }
+
+    public JtyYxApiAuth() {
+        this.appId = JtyConstant.APPID;
+        this.appSecret = JtyConstant.SECRET;
+        this.apiVersion = JtyConstant.VERSION;
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/jty/JtyYxPayNotice.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/jty/JtyYxPayNotice.java
new file mode 100644
index 0000000..222e081
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/jty/JtyYxPayNotice.java
@@ -0,0 +1,66 @@
+package cn.pluss.platform.jty;
+
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.jty.constant.JtyConstant;
+import cn.pluss.platform.util.StringUtil;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+import java.util.UUID;
+
+/**
+ * TODO
+ * 佳天亿音箱播报参数封装
+ * @author crystal
+ * @date 2022/3/17 15:32
+ */
+@Data
+@NoArgsConstructor
+public class JtyYxPayNotice {
+
+    /**
+     * 设备号
+     */
+    private String deviceNum;
+
+    /**
+     * 通知类型，1001(普通文本);1002(支付成功消息);1003(支付失败消息)
+     */
+    private String noticeType;
+    /**
+     * 支付方式
+     * 10001	支付宝
+     * 10002	微信
+     * 10003	收银呗
+     */
+    private String payType;
+
+    /**
+     * 对应产品编码
+     */
+    private String productNum;
+
+    /**
+     * 支付金额单位元
+     */
+    private BigDecimal payAmount;
+
+    /**
+     * 请求唯一标识
+     */
+    private String requestId;
+
+    public JtyYxPayNotice(String deviceNum, String type, BigDecimal payAmount) {
+        this.deviceNum = deviceNum;
+        String noticeType = JtyNoticeEnum.getConverCode(type);
+        if(StringUtil.isEmpty(noticeType)){
+            MsgException.throwException("消息类型配置异常");
+        }
+        this.noticeType = noticeType;
+        this.payAmount = payAmount;
+        this.requestId = UUID.randomUUID().toString();
+        this.payType = "1003";
+        this.productNum = JtyConstant.PRODUCT_REQ_NUM;
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/jty/constant/JtyConstant.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/jty/constant/JtyConstant.java
new file mode 100644
index 0000000..3696d4f
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/jty/constant/JtyConstant.java
@@ -0,0 +1,30 @@
+package cn.pluss.platform.jty.constant;
+
+/**
+ * TODO
+ * 佳天亿静态配置参数
+ * @author crystal
+ * @date 2022/3/17 15:15
+ */
+public class JtyConstant {
+    
+    public static final String APPID = "Y2VzaGlnb25nc2k=";
+
+    public static final String SECRET = "NTE0YTFmMGY0YjU3NGQ3NTkwMzE0MzFhZTRkNDBkNzU=";
+    
+    public static final String VERSION = "1.0";
+
+    public static final String API_TEST_DOMAIN = "http://101.132.171.8:17002";
+
+    public static final String PRODUCT_REQ_NUM = "fb_auth_0001";
+
+    public static final String TEST_DEVICE_NUM = "fb_a_d_10001";
+
+    public static final String PAY_NOTICE_METHOD = "/fbplatform/cloudHorn/payNotice";
+
+    public static final String API_AUTH_METHOD = "/fbplatform/auth/apiAuth";
+
+    public static final String CACHE_KEY_CODE_PRIFIX = "jty:authToken:";
+
+    public static final String SUCCESS_CODE = "00000";
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/mapper/ReqRecordsMapper.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/mapper/ReqRecordsMapper.java
new file mode 100644
index 0000000..424f447
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/mapper/ReqRecordsMapper.java
@@ -0,0 +1,7 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entitiy.ReqRecords;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+public interface ReqRecordsMapper extends BaseMapper<ReqRecords> {
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/mapper/UnknownExceptionMapper.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/mapper/UnknownExceptionMapper.java
new file mode 100644
index 0000000..20b8658
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/mapper/UnknownExceptionMapper.java
@@ -0,0 +1,9 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entitiy.UnknownException;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface UnknownExceptionMapper extends BaseMapper<UnknownException> {
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/service/EmailService.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/service/EmailService.java
new file mode 100644
index 0000000..fb01e30
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/service/EmailService.java
@@ -0,0 +1,84 @@
+package cn.pluss.platform.service;
+
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.compress.utils.IOUtils;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.io.ByteArrayResource;
+import org.springframework.mail.javamail.JavaMailSender;
+import org.springframework.mail.javamail.MimeMessageHelper;
+import org.springframework.stereotype.Component;
+
+import javax.mail.MessagingException;
+import javax.mail.internet.MimeMessage;
+import javax.mail.internet.MimeUtility;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * 发送电子邮件相关的功能service
+ * @author nb2020
+ */
+@Slf4j
+@Component
+public class EmailService {
+
+    @Value("${spring.mail.nickname}")
+    private String nickname;
+
+    @Value("${spring.mail.username}")
+    private String username;
+
+
+    public EmailService() {
+        System.setProperty("mail.mime.splitlongparameters", "false");
+    }
+
+    @Setter(onMethod_ = {@Autowired})
+    private JavaMailSender mailSender;
+
+    /**
+     * 发送邮件
+     * @param tos       接收人邮箱数组
+     * @param ccs       抄送人邮箱数组
+     * @param title     邮件主题
+     * @param content   邮件内容
+     * @param workBook  附件excel
+     */
+    public void sendEmail(String[] tos, String[] ccs, String title, String content, XSSFWorkbook workBook, String workBookName) {
+        MimeMessage mimeMessage = mailSender.createMimeMessage();
+
+        MimeMessageHelper mimeMessageHelper;
+
+        try {
+            mimeMessageHelper = new MimeMessageHelper(mimeMessage, true, "utf-8");
+            mimeMessageHelper.setTo(tos);
+            if (ccs != null) {
+                mimeMessageHelper.setCc(ccs);
+            }
+
+            mimeMessageHelper.setFrom(nickname + "<" + username + ">");
+            mimeMessageHelper.setSubject(title);
+            mimeMessageHelper.setText(content);
+
+            ByteArrayOutputStream out = new ByteArrayOutputStream();
+            workBook.write(out);
+            byte[] bookByteArr = out.toByteArray();
+            InputStream in = new ByteArrayInputStream(bookByteArr);
+            String newFileName =  MimeUtility.encodeWord(workBookName, "utf-8", "B");
+            mimeMessageHelper.addAttachment(newFileName, new ByteArrayResource(IOUtils.toByteArray(in), "application/vnd.ms-excel;charset=UTF-8"));
+
+        } catch (IOException | MessagingException e) {
+            log.error("邮件发送失败");
+            e.printStackTrace();
+            return;
+        }
+
+
+        mailSender.send(mimeMessage);
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/service/ReqRecordsService.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/service/ReqRecordsService.java
new file mode 100644
index 0000000..e9dd367
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/service/ReqRecordsService.java
@@ -0,0 +1,51 @@
+package cn.pluss.platform.service;
+
+import cn.pluss.platform.entitiy.ReqRecords;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.ReqRecordsMapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * @author DJH
+ */
+@Service
+public class ReqRecordsService extends ServiceImpl<ReqRecordsMapper, ReqRecords> {
+
+    /**
+     * 检查请求限制
+     * @param reqRecords    请求相关参数, 手机号, 用户id, ip等
+     * @param duringTime    请求限制间隔时间
+     */
+    @Transactional(propagation = Propagation.NOT_SUPPORTED)
+    public void checkLimit(ReqRecords reqRecords, long duringTime) {
+        LambdaQueryWrapper<ReqRecords> qWrapper = Wrappers.lambdaQuery();
+
+        boolean andFlag = StringUtils.isNotEmpty(reqRecords.getIp())
+                || (reqRecords.getUserId() != null)
+                || StringUtils.isNotEmpty(reqRecords.getPhone())
+                || StringUtils.isNotEmpty(reqRecords.getLoginName());
+        qWrapper.eq(ReqRecords::getUri, reqRecords.getUri())
+                .and(andFlag, wrapper -> wrapper
+                        .or(StringUtils.isNotEmpty(reqRecords.getIp()), wrapper2 -> wrapper2.eq(ReqRecords::getIp, reqRecords.getIp()))
+                        .or(reqRecords.getUserId() != null, wrapper2 -> wrapper2.eq(ReqRecords::getUserId, reqRecords.getUserId()))
+                        .or(StringUtils.isNotEmpty(reqRecords.getPhone()), wrapper2 -> wrapper2.eq(ReqRecords::getPhone, reqRecords.getPhone()))
+                        .or(StringUtils.isNotEmpty(reqRecords.getLoginName()), wrapper2 -> wrapper2.eq(ReqRecords::getLoginName, reqRecords.getLoginName())))
+                .orderByDesc(ReqRecords::getCreateTime)
+                .last("limit 1");
+
+        long nextLimitTime = System.currentTimeMillis() - duringTime;
+
+        ReqRecords lastReqRecords = getBaseMapper().selectOne(qWrapper);
+        if (lastReqRecords != null && lastReqRecords.getCreateTime().getTime() > nextLimitTime) {
+            throw new MsgException("请求过于频繁，请稍后再试");
+        }
+
+        save(reqRecords);
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/service/UnknownExceptionService.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/service/UnknownExceptionService.java
new file mode 100644
index 0000000..4829020
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/service/UnknownExceptionService.java
@@ -0,0 +1,109 @@
+package cn.pluss.platform.service;
+
+import cn.jiguang.common.utils.StringUtils;
+import cn.pluss.platform.entitiy.UnknownException;
+import cn.pluss.platform.mapper.UnknownExceptionMapper;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.*;
+import java.nio.charset.StandardCharsets;
+import java.util.*;
+
+
+@Service
+public class UnknownExceptionService extends ServiceImpl<UnknownExceptionMapper, UnknownException> {
+
+    /**
+     * 保存异常信息到数据库
+     * @param e
+     */
+    public void save(HttpServletRequest request, Exception e) {
+        String body = null;
+        try {
+            InputStream is = request.getInputStream();
+            StringBuilder responseStrBuilder = new StringBuilder();
+            BufferedReader streamReader = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8));
+            String inputStr;
+            while ((inputStr = streamReader.readLine()) != null) {
+                responseStrBuilder.append(inputStr);
+            }
+            body = responseStrBuilder.toString();
+        } catch (Exception ignored) {
+            // 不处理
+        }
+
+        Map<String, Object> parameterInfo = getParameterInfo(request);
+        StringWriter sw = new StringWriter();
+        e.printStackTrace(new PrintWriter(sw, true));
+        UnknownException unknownException = new UnknownException();
+        unknownException.setCreateTime(new Date());
+        unknownException.setName(e.getClass().getName());
+        String desc = sw.toString();
+
+        Map<String, Object> headerInfo = getHeaderInfo(request);
+        try {
+            String userId = headerInfo.get("userId") + "";
+            unknownException.setUserId(Long.parseLong(userId));
+        } catch (Exception e2) {
+            log.warn("没有userId");
+        }
+
+        if (StringUtils.isNotEmpty(body)) {
+            unknownException.setParams(body);
+        } else {
+            unknownException.setParams(JSON.toJSONString(parameterInfo));
+        }
+        unknownException.setUri(request.getRequestURI());
+        unknownException.setDesc(desc);
+        baseMapper.insert(unknownException);
+    }
+
+    /**
+     * 保存异常信息到数据库
+     * @param e 异常信息
+     */
+    public void save(Exception e) {
+        String desc = getStackTrace(e);
+        UnknownException unknownException = new UnknownException();
+        unknownException.setCreateTime(new Date());
+        unknownException.setName(e.getClass().getName());
+        unknownException.setDesc(desc);
+        baseMapper.insert(unknownException);
+    }
+
+    private String getStackTrace(Exception e) {
+        StringWriter sw = new StringWriter();
+        e.printStackTrace(new PrintWriter(sw, true));
+        return sw.toString();
+    }
+
+    private Map<String, Object> getParameterInfo(HttpServletRequest request) {
+        Map<String, Object> parameter = new HashMap<>();
+        Map<String, String[]> parameterMap = request.getParameterMap();
+        for (Map.Entry<String, String[]> entry: parameterMap.entrySet()) {
+            String key = entry.getKey();
+            String[] parameterValues = entry.getValue();
+            if (parameterValues.length == 1) {
+                parameter.put(key, parameterValues[0]);
+            } else {
+                parameter.put(key, Arrays.toString(parameterValues));
+            }
+        }
+        return parameter;
+    }
+
+    private Map<String, Object> getHeaderInfo(HttpServletRequest request) {
+        Map<String, Object> parameter = new HashMap<>(8);
+        Enumeration<String> headerNames = request.getHeaderNames();
+
+        while (headerNames.hasMoreElements()) {
+            String key = headerNames.nextElement();
+            parameter.put(key, request.getHeader(key));
+        }
+
+        return parameter;
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/ty/Ys4GEnum.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/ty/Ys4GEnum.java
new file mode 100644
index 0000000..d19ad0f
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/ty/Ys4GEnum.java
@@ -0,0 +1,32 @@
+package cn.pluss.platform.ty;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @description:音箱4G音箱枚举参数
+ * @author: Administrator
+ * @DATE: 2021/12/6 18:21
+ */
+@Getter
+@AllArgsConstructor
+public enum Ys4GEnum {
+
+    /**
+     * @description:博实结4G
+     * @date: 2021/12/6 18:24
+     */
+    BSJ_4G_YYS("ZF042","2021bsjZF042","https://ioe.car900.com/v1/openApi/dev/controlDevice.json"),
+    /**
+     * @description:天喻4G正式环境
+     * @date: 2021/12/6 18:25
+     */
+    TY_4G_YYS("IOT_ACCOUNT_PROD_SYB","SbjErK1z5gZ34dfHSH7k6Y6=","https://voice.typos.com.cn/api/bank/pushmsg");
+
+    private String appId;
+
+    private String secret;
+
+    private String domain;
+
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/ty/Ys4GTypeEnum.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/ty/Ys4GTypeEnum.java
new file mode 100644
index 0000000..9d7b4cb
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/ty/Ys4GTypeEnum.java
@@ -0,0 +1,21 @@
+package cn.pluss.platform.ty;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 4g音箱类型枚举
+ * @author: Administrator
+ * @DATE: 2021/12/10 11:37
+ */
+@Getter
+@AllArgsConstructor
+public enum Ys4GTypeEnum {
+
+    BSJ("BSJ","博实结"),
+    TY("TY","天喻");
+
+    private String code;
+
+    private String name;
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/AESEncrypt.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/AESEncrypt.java
new file mode 100644
index 0000000..6c0491f
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/AESEncrypt.java
@@ -0,0 +1,217 @@
+package cn.pluss.platform.util;
+
+import com.alipay.api.internal.util.codec.Base64;
+import org.apache.commons.lang3.StringUtils;
+
+import javax.crypto.Cipher;
+import javax.crypto.KeyGenerator;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+import java.nio.charset.StandardCharsets;
+import java.security.SecureRandom;
+
+/**
+ * @author ryx
+ * AES加密工具类
+ */
+public class AESEncrypt {
+
+    public static final String KEY_ALGORITHM_PADDING = "AES/CBC/PKCS5Padding";
+    private static final String KEY_ALGORITHM = "AES";
+    public static SecureRandom random = new SecureRandom();
+
+    public static final String KEY_ALGORITHM_ECB_PADDING = "AES/ECB/PKCS5Padding";
+
+    /**
+     * 生成二进制密钥
+     *
+     * @return
+     * @throws Exception
+     */
+    public static byte[] initKey() throws Exception {
+        KeyGenerator kg = KeyGenerator.getInstance(KEY_ALGORITHM);
+        kg.init(256);
+        return kg.generateKey().getEncoded();
+    }
+
+    /**
+     * 数据加密
+     *
+     * @param data    待加密数据
+     * @param key     密钥
+     * @param ivParam 向量
+     * @return 加密数据
+     * @throws Exception
+     */
+    public static byte[] encrypt(byte[] data, byte[] key, String ivParam) throws Exception {
+        SecretKey secretKey = new SecretKeySpec(key, KEY_ALGORITHM);
+		// 创建密码器
+        Cipher cipher = Cipher.getInstance(KEY_ALGORITHM_PADDING);
+        if (StringUtils.trimToNull(ivParam) != null) {
+            //使用CBC模式，需要一个向量iv，可增加加密算法的强度
+            IvParameterSpec iv = new IvParameterSpec(ivParam.getBytes());
+            // 初始化
+            cipher.init(Cipher.ENCRYPT_MODE, secretKey, iv);
+        } else {
+            cipher.init(Cipher.ENCRYPT_MODE, secretKey);
+        }
+		// 加密
+		return cipher.doFinal(data);
+    }
+
+    public static byte[] encryptEcb(byte[] data, byte[] key, String ivParam) throws Exception {
+        // 创建密码器
+        Cipher cipher = Cipher.getInstance(KEY_ALGORITHM_ECB_PADDING);
+        SecretKey secretKey = new SecretKeySpec(key, KEY_ALGORITHM);
+        if (StringUtils.trimToNull(ivParam) != null) {
+            //使用CBC模式，需要一个向量iv，可增加加密算法的强度
+            IvParameterSpec iv = new IvParameterSpec(ivParam.getBytes());
+            // 初始化
+            cipher.init(Cipher.ENCRYPT_MODE, secretKey, iv);
+        } else {
+            cipher.init(Cipher.ENCRYPT_MODE, secretKey);
+        }
+        // 加密
+        return cipher.doFinal(data);
+    }
+
+    /**
+     * 数据加密
+     *
+     * @param data    待加密数据
+     * @param key     密钥
+     * @param ivParam 向量
+     * @return 加密数据
+     * @throws Exception
+     */
+    public static String encryptToString(byte[] data, byte[] key, String ivParam) throws Exception {
+        return Base64.encodeBase64String(encrypt(data, key, ivParam));
+    }
+
+    public static String encryptEcbToString(byte[] data, byte[] key, String ivParam) throws Exception {
+        return Base64.encodeBase64String(encryptEcb(data, key, ivParam));
+    }
+
+    /**
+     * 数据解密
+     *
+     * @param data    待解密数据
+     * @param key     密钥
+     * @param ivParam 向量
+     * @return 解密数据
+     * @throws Exception
+     */
+    public static byte[] decrypt(byte[] data, byte[] key, String ivParam) throws Exception {
+        SecretKey secretKey = new SecretKeySpec(key, KEY_ALGORITHM);
+        Cipher cipher = Cipher.getInstance(KEY_ALGORITHM_PADDING);// 创建密码器
+        IvParameterSpec iv = new IvParameterSpec(ivParam.getBytes());//使用CBC模式，需要一个向量iv，可增加加密算法的强度
+        cipher.init(Cipher.DECRYPT_MODE, secretKey, iv);// 初始化
+        byte[] result = cipher.doFinal(data);
+        return result; // 加密
+    }
+
+    /**
+     * 数据加密钥
+     *
+     * @param data    待解密数据
+     * @param key     密钥
+     * @param ivParam 向量
+     * @return 解密数据
+     * @throws Exception
+     */
+    public static String decryptToString(byte[] data, byte[] key, String ivParam) throws Exception {
+        return new String(decrypt(data, key, ivParam), "utf-8");
+    }
+
+    /**
+     * 数据加密钥
+     *
+     * @param data    待解密数据
+     * @param key     密钥
+     * @param ivParam 向量
+     * @return 解密数据
+     * @throws Exception
+     */
+    public static String decryptEcbToString(byte[] data, byte[] key, String ivParam) throws Exception {
+        return new String(decryptEcb(data, key, ivParam), StandardCharsets.UTF_8);
+    }
+
+    private static byte[] decryptEcb(byte[] encryptedBytes, byte[] keyBytes, String IV) throws Exception{
+        Cipher cipher = Cipher.getInstance(KEY_ALGORITHM_ECB_PADDING);
+        SecretKey secretKey = new SecretKeySpec(keyBytes, KEY_ALGORITHM);
+        if (IV != null && StringUtils.trimToNull(IV) != null) {
+            IvParameterSpec ivspec = new IvParameterSpec(IV.getBytes());
+            cipher.init(Cipher.DECRYPT_MODE, secretKey, ivspec);
+        } else {
+            cipher.init(Cipher.DECRYPT_MODE, secretKey);
+        }
+        byte[] decryptedBytes = cipher.doFinal(encryptedBytes);
+        return decryptedBytes;
+    }
+
+
+    /**
+     * @param length
+     * @return
+     */
+    public static String getIVParam(int length) {
+        StringBuilder ret = new StringBuilder();
+        for (int i = 0; i < length; i++) {
+            boolean isChar = (random.nextInt(2) % 2 == 0);// 输出字母还是数字
+            if (isChar) { // 字符串
+                int choice = random.nextInt(2) % 2 == 0 ? 65 : 97; // 取得大写字母还是小写字母
+                ret.append((char) (choice + random.nextInt(26)));
+            } else { // 数字
+                ret.append(Integer.toString(random.nextInt(10)));
+            }
+        }
+        return ret.toString();
+    }
+
+    public static String decryptEcb(String content, String sKey) {
+        try {
+            //实例化
+             Cipher cipher = Cipher.getInstance(KEY_ALGORITHM_ECB_PADDING);
+             cipher.init(Cipher.DECRYPT_MODE, new SecretKeySpec(sKey.getBytes(StandardCharsets.UTF_8), "AES"));
+             byte[] encrypted = java.util.Base64.getDecoder().decode(content); // 先用base64解密
+             byte[] original = cipher.doFinal(encrypted);
+             return new String(original, StandardCharsets.UTF_8);
+         } catch (Exception ex) {
+            return null;
+        }
+    }
+
+//    public static void main(String[] args) {
+//        String aa = "name=123&age=234";
+//        try {
+//            String p = AESEncrypt.encryptDefaultToString(aa);
+//            System.out.println("p=>"+p);
+//            String s = Base64.encodeBase64String(p.getBytes(StandardCharsets.UTF_8));
+//            System.out.println("s=>"+s);
+//            byte[] bytes = Base64.decodeBase64String(s);
+//            String str = new String(bytes, "UTF-8");
+//            System.out.println("=======str=>"+str);
+//            String cc = AESEncrypt.decryptDefaultToString(str);
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//    }
+
+//    public static void main(String[] args) {
+//        String aa = "name=123&age=234";
+//        try {
+//            String pa = AESEncrypt.encryptDefaultBaseToString(aa);
+//            System.out.println("pa=>"+pa);
+//            String cp = StringUtil.base64Encoder(pa);
+//            System.out.println("cp=>"+cp);
+//
+//            String de = StringUtil.base64Decoder(cp);
+//            System.out.println("de=>"+de);
+//            String cd = decryptDefaultBaseToString(de);
+//            System.out.println("cd=>"+cd);
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/AliMerchantBatchNoUtil.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/AliMerchantBatchNoUtil.java
new file mode 100644
index 0000000..0cba0b4
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/AliMerchantBatchNoUtil.java
@@ -0,0 +1,54 @@
+package cn.pluss.platform.util;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.alipay.api.AlipayApiException;
+import com.alipay.api.AlipayClient;
+import com.alipay.api.DefaultAlipayClient;
+import com.alipay.api.request.AlipayOpenAgentCreateRequest;
+import com.alipay.api.response.AlipayOpenAgentCreateResponse;
+
+public class AliMerchantBatchNoUtil {
+
+	private static final String PRIVATE_KEY_STRING = "MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCN1NubOHroItIz7eLWWBDprPzToDr1cggn/V90ghPaoBWgmnZhD/CejX+KxHmQVQLEBVN6ehQgNSVGBj0hSHxkj1OCCU7Eu9qAIqRzkWY1RkZKoKOIcJbU+yL20XTs3kATgNm5jx8ejVQDsNqekS1bBrRX6xlU/mjMVFtKoZC/Vpv8yAmP6R9onkum4O0OgCWARKC40NuYVp9hPUgRpWJ/NIPSlO4j8zIPYFkjfsh84c8moVLZdhYDDbbEY3vnHutDa0A3d5f4MI4qXBZ6tW5wO5WG93U5E5jat73RUzBOc0zN+3U/Rsk+gq722ChLj4/ifp0NLqgjbKecs4wlM8A3AgMBAAECggEAQ1QjuAjU17QIA1zPTR9bUAKttqyesHukgY9XLBC/6g4KlkYdIjCV8j6LqE1iw/CHMpSwrziaqztvaVF23YDyhC5B3z4Z5Wyj6iYH2VDRq0KkBbNCTnfcMljRnUeLcRKEan3FXcAibrd6hZIEBjg2xrplDENvsBhhmXYGLGSMOTfoRFlc1DhvPdr3qxR9mljD2YcvIrxDVDPZ3P4wTcsIM6xZmXGrsFbI0sGxgm4a4fzMLUYxSvuMtc+auwasQ/393Le/kjdVBWr/hBJZbGIU5/NQN0EesOJD6dIFU07wDDuy4LYLVVjSN3EiynWfMJIrvLbnR1sMgKJ775wY61hIaQKBgQC/mFKwZdZvzsqnEMQmUfkUT5+v8BJvS4JApPpt+O2GMUAKoynk220U0rJW/QyEkTz6A/lR8ZStT6TyM14ulpOYDMJquZqSCoIHMrIdjhZRMqAVONUJHsYVvpLQLbJaDDEaCksnWE+77ULBstZaevkBgLmNsy6V4CxwLJKj0xMDEwKBgQC9giRaS4t2J5ZcNycuDEBhwPteSoFun/6bX4yPsZYdeB88NGs7j1oOk9MXrvQq69X0uXE8zv2DHrDvuoGI920m56bU/4wCuKoqpnLi0xFM1al0na12He6UmFKWa+kGBkH5p5BggPyaCFMwJI/qL3gZft56aWjliviwWSmI8pvOzQKBgHZw8d0+d1vTGJBC2x9dWX9m4a7f2GWY5kKUOoQ1eJCWbaKlz0Y9J6fRwJHqCQ0CxBFC16QClgi1zaA0hSqDx2YdrSpQ5u8VM+DDRDzlE4LKqw+zfG8Q6R+UGio7tZ/ZHZmdd2wxOclRGQ2pQr3Ye4qkSxEADfJ1DMOjqltAJualAoGALafl9C8RGVUuP2c2NDzVYfepV60hg7JeF7asWY4SOWVQOSPz1bSSoMJyb9lBj/mjYUMwCdNgdi91tzu6q3HYxS+4HMa4R4uPy5iwQv9Qwq8TFTpLqRJLAVe1RfIXgNEPIgOBoA5TTRTGXenhFi17hMDw/pLYp7yUb3/7pre0W90CgYAWb86ocBIpS8cKhZY2fcrHALzKh4cuxl68sNQcOxevt3tIak0KG+o/5/5l0uBW2qYSOJOl2u831VWuOWEJBk+h5brYCtTNIsa6lKdknhRP/NfAfWUiWEesPV5nfYKL85s8bf2x/gFv9Ah0S5K4cI+SCMVIzaQzQ2dN+cmlvM8rfQ==";
+	private static final String PUBLIC_KEY_STRING = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjdTbmzh66CLSM+3i1lgQ6az806A69XIIJ/1fdIIT2qAVoJp2YQ/wno1/isR5kFUCxAVTenoUIDUlRgY9IUh8ZI9TgglOxLvagCKkc5FmNUZGSqCjiHCW1Psi9tF07N5AE4DZuY8fHo1UA7DanpEtWwa0V+sZVP5ozFRbSqGQv1ab/MgJj+kfaJ5LpuDtDoAlgESguNDbmFafYT1IEaVifzSD0pTuI/MyD2BZI37IfOHPJqFS2XYWAw22xGN75x7rQ2tAN3eX+DCOKlwWerVucDuVhvd1OROY2re90VMwTnNMzft1P0bJPoKu9tgoS4+P4n6dDS6oI2ynnLOMJTPANwIDAQAB";
+	public static void getBatchNo() {
+		
+		Map<String, Object> dataMap = new HashMap<String, Object>();
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do","2019092467786259",PRIVATE_KEY_STRING,"json","GBK",PUBLIC_KEY_STRING,"RSA2");
+		AlipayOpenAgentCreateRequest request = new AlipayOpenAgentCreateRequest();
+		request.setBizContent("{" +
+		"\"account\":\"test@alipay.com\"," +
+		"\"contact_info\":{" +
+		"\"contact_name\":\"张三\"," +
+		"\"contact_mobile\":\"18866668888\"," +
+		"\"contact_email\":\"zhangsan@alipy.com\"" +
+		"    }," +
+		"\"order_ticket\":\"00ee2d475f374ad097ee0f1ac223fX00\"" +
+		"  }");
+		AlipayOpenAgentCreateResponse response = null;
+		try {
+			response = alipayClient.execute(request);
+		} catch (AlipayApiException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+			System.out.println(e.getMessage());
+		}
+		if(response.isSuccess()){
+		System.out.println("调用成功："+response.getBatchNo());
+		} else {
+		System.out.println("调用失败");
+
+	}
+}
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/AliMerchantRegistUtil.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/AliMerchantRegistUtil.java
new file mode 100644
index 0000000..bedf2bf
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/AliMerchantRegistUtil.java
@@ -0,0 +1,46 @@
+package cn.pluss.platform.util;
+
+import org.springframework.core.ReactiveAdapterRegistry;
+
+import com.alipay.api.AlipayApiException;
+import com.alipay.api.AlipayClient;
+import com.alipay.api.DefaultAlipayClient;
+import com.alipay.api.FileItem;
+import com.alipay.api.request.AlipayOpenAgentFacetofaceSignRequest;
+import com.alipay.api.response.AlipayOpenAgentFacetofaceSignResponse;
+
+public class AliMerchantRegistUtil {
+
+	public static void regist() throws AlipayApiException {
+
+		AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do", "app_id",
+				"your private_key", "json", "GBK", "alipay_public_key", "RSA2");
+		AlipayOpenAgentFacetofaceSignRequest request = new AlipayOpenAgentFacetofaceSignRequest();
+		request.setBatchNo("2017110616474516400082883");
+		request.setMccCode("A_A03_4582");
+		FileItem SpecialLicensePic = new FileItem(
+				"C:/Downloads/ooopic_963991_7eea1f5426105f9e6069/16365_1271139700.jpg");
+		request.setSpecialLicensePic(SpecialLicensePic);
+		request.setBusinessLicenseNo("1532501100006302");
+		FileItem BusinessLicensePic = new FileItem(
+				"C:/Downloads/ooopic_963991_7eea1f5426105f9e6069/16365_1271139700.jpg");
+		request.setBusinessLicensePic(BusinessLicensePic);
+		FileItem BusinessLicenseAuthPic = new FileItem(
+				"C:/Downloads/ooopic_963991_7eea1f5426105f9e6069/16365_1271139700.jpg");
+		request.setBusinessLicenseAuthPic(BusinessLicenseAuthPic);
+		request.setLongTerm(true);
+		request.setDateLimitation("2017-11-11");
+		FileItem ShopScenePic = new FileItem("C:/Downloads/ooopic_963991_7eea1f5426105f9e6069/16365_1271139700.jpg");
+		request.setShopScenePic(ShopScenePic);
+		FileItem ShopSignBoardPic = new FileItem(
+				"C:/Downloads/ooopic_963991_7eea1f5426105f9e6069/16365_1271139700.jpg");
+		request.setShopSignBoardPic(ShopSignBoardPic);
+		AlipayOpenAgentFacetofaceSignResponse response = alipayClient.execute(request);
+		if (response.isSuccess()) {
+			System.out.println("调用成功");
+		} else {
+			System.out.println("调用失败");
+		}
+	}
+
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/AliPayParam.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/AliPayParam.java
new file mode 100644
index 0000000..1f0252a
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/AliPayParam.java
@@ -0,0 +1,27 @@
+package cn.pluss.platform.util;
+
+/**
+ * @author yuchen
+ * 
+ * @Description 
+ */
+public class AliPayParam {
+    private final static String APP_ID="2019092467786259";
+	private final static String PRI="MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQChPC+LD4DlsOeLLaJI6FxKi2RsMmwGmtLXhK70OzkzOC5OP9M5Ev6NECWD3TxJaQESJraZ6KAnM1kjitsq8sEGxyRrXHZcL/a0/t43gQgVzoJ913o3/KIvE7OfoOP4lIDF2+Rffhb4ENP8DmFToKzxmwa2CiNHG4PSxbFNnj80h2JLtm8EdhtZG7WQplqVVoZhme/AF34KDZsDN6Tl3FL9WY/8PMLvlUGufV2dzbjJqgWBqiqLipgaUB6dkzlH36czQY20Fz1e56AALCQY3fNjykRx2mshMJWxO5TVTYCWXXAv00+iCMcCn2E+YsV9f4TiivbMDjDXrf64c1V4fJpxAgMBAAECggEAVpCrreuK9sb96Zl8kcw/EL66EeUYXottO8y+6d2KHlfBdL2LuA7cn/vVSHDVV0yLCKXET+m3YpSM/Sol9W8T94Gfqgygd2pA+HgF8qLSJnMTWGEB+2El6kSXodKN0v5YDOK8QBDAYDsYtTE7S9zuPWFQPxg+TIUXR2hggx29LYPOyao38SMRubT4CrNvc2F5pq6fyiaEBAeVQyORrhyWZpHGjqtCbUViCVRKWnik6u/w1FPgZw28zs8bch980BIOb87DG1mwSrEigHSlP1YXEJl6EPVnz+VHVg021YImD47Dow36UKhp87IPuDSt6XsOBcw9MUAcZM2T4D0j+RhBqQKBgQDj0GGH/0gin43UI2rOzPW/PnGK6ZM1uSoxUhFwGqtiPPOfhmwtTQV2D3dRDmUlojUo/9h9nw7eELAPKLdkAMAEQC/ImBtS/kRfiKEFAOkG34wg+ZOKwPqXl9aBIDj5Do7VJE54ynjc/RvQ0WMveYa5cnqLFh5Cj3sHZLeEWhZEiwKBgQC1Lwg8GyUEK8bDYXqf4viRpVTJS0nJCEQYscxJw65H9pms4Yn5UltMr35GE2GJVcgJt0K4AUpia6wQNEYFchZKepsCt+yF3ooKVt4YROkMEr01r1BBpDNv6Mooc8ClBysGxOePN1kCBAeTyQDDh9e85RVU9M286uWQKP1AlF1wcwKBgBQ7IS4uoX1Rpgq8ynNrCDffl726WHRg6TpQC3RlKesjdo8oJNsxB9cgMHxmRt08tnPZpKQjR/K4kKoH96FN37+A471wpJyOMAw72fDTz93oZE1ZXJzp3lcwCMCW1/hmLpEHFGDtuiYF5D57Gc/RfwFhBTjs0esfStGxRArg5TFZAoGASqLOPJxd+kLiRRgBwJ1qEe1OaQF3qrWZ/6Y2ZmiSgZiHI51hDfCsJYHhfZJ8Smuo1L/GXzBA6Rw7rA0sjw+5OQMamdsUNu0+ZhX0tYClk9CgWt4WLIQsoDwAEvvj7tduFQLF9MwzAU6RpIJXqzRpXansyKtzmRAWcvU/pfu4JhsCgYArmqUktyczmPg0FbtZTzd3e4Faq6S9w4Dn8w6GMRrWScIiTwLLGkAPSX2qgGrem5YEJ7vOVpuj6CfghaEVjhXZWFmYcad4NG524zjDSIL6o4unqukwdABJOgmE71KzWP0OucsT03mRofJBAFV5c4UC5DSQsnwjgdxaRWcUWNbLIw==";
+	private final static String PUB="MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4Dlipw4sxS6I9xMbUAiPSQkfD+8JkGAdLQo5+7MpjYAHPBGakMNfOOZgFO6PDeMvnJtRhSrw0fIRK+S382Xx3kg9TXa2NW6J4tJ+limKEv4HKEH3a0ocNdVtjmyl5CoPlhuZVtktuan+3DVMLdHDXABOyRad447DWJkExpKqu79lAcvySzzgRwXPgDnvbOGrAiPIMJ0esp+aw9gGraais+EcYnptMTvbwlFiADcgPEyVf7htIVdxyZtBLiZl1ltYX9W69Fk6prP7/wYccy4uOyu2uhHS0AmMQrbXZg4EmpAUoY7ckUOqplP0+/nJlJLB1jMxkXWzDqnCanU9pEL3sQIDAQAB";
+	private final static String RETURN_URL="http://192.168.0.185:8084/wap/aliPay/returnUrl";
+	public static String getAppId() {
+		return APP_ID;
+	}
+	public static String getPri() {
+		return PRI;
+	}
+	public static String getPub() {
+		return PUB;
+	}
+	public static String getReturnUrl() {
+		return RETURN_URL;
+	}
+	
+}
+
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/AliUtil.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/AliUtil.java
new file mode 100644
index 0000000..8bf7533
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/AliUtil.java
@@ -0,0 +1,58 @@
+package cn.pluss.platform.util;
+
+import cn.pluss.platform.exception.MsgException;
+import com.alipay.api.AlipayApiException;
+import com.alipay.api.AlipayClient;
+import com.alipay.api.DefaultAlipayClient;
+import com.alipay.api.request.AlipaySystemOauthTokenRequest;
+import com.alipay.api.response.AlipaySystemOauthTokenResponse;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ *
+ *@description:支付宝工具类
+ *@author: bzg
+ *@time: 2021/10/8 17:41
+ */
+
+public class AliUtil {
+
+
+//    public static Map<String, Object> getAliUserId(String auth_code,String priKey,String pubKey,String appId) {
+//        Map<String, Object> result = new HashMap<>(2);
+//        AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do", appId,
+//                priKey, "json", "GBK", pubKey, "RSA2");
+//        AlipaySystemOauthTokenRequest request = new AlipaySystemOauthTokenRequest();
+//        request.setCode(auth_code);
+//        request.setGrantType("authorization_code");
+//        try {
+//            AlipaySystemOauthTokenResponse oauthTokenResponse = alipayClient.execute(request);
+//            result.put("aliUserId", oauthTokenResponse.getUserId());
+//            result.put("accessToken", oauthTokenResponse.getAccessToken());
+//        } catch (AlipayApiException e) {
+//            e.printStackTrace();
+//        }
+//        return result;
+//    }
+
+    public static AlipaySystemOauthTokenResponse getAliUserIdV2(String auth_code,String priKey,String pubKey,String appId) {
+        AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do", appId,
+                priKey, "json", "GBK", pubKey, "RSA2");
+        AlipaySystemOauthTokenRequest request = new AlipaySystemOauthTokenRequest();
+        request.setCode(auth_code);
+        request.setGrantType("authorization_code");
+        try {
+            AlipaySystemOauthTokenResponse response = alipayClient.execute(request);
+            if(!response.isSuccess()){
+                MsgException.throwException("支付宝授权失败");
+            }
+            return response;
+        } catch (AlipayApiException e) {
+            e.printStackTrace();
+            MsgException.throwException("支付宝授权异常");
+            return null;
+        }
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/AreaUtils.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/AreaUtils.java
new file mode 100644
index 0000000..dceb234
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/AreaUtils.java
@@ -0,0 +1,28 @@
+package cn.pluss.platform.util;
+
+/**
+ * @author DJH
+ */
+public class AreaUtils {
+
+    /**
+     * 获取地区的编码数组
+     * @return  省市县(区)的编码数组
+     */
+    public static String[] distinctArrayFromAreaCode(String area) {
+        String[] result = new String[3];
+        result[2] = area;
+        // 前4位即为市的编码
+
+        if (area.length() > 6) {
+            // 某些特殊区域市编码长度为4位
+            result[1] = area.substring(0, 6);
+        } else {
+            result[1] = area.substring(0, 4) + "00";
+        }
+        // 前2位即为省的编码
+        result[0] = area.substring(0, 2) + "0000";
+
+        return result;
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/AuditUtils.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/AuditUtils.java
new file mode 100644
index 0000000..45e3ed3
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/AuditUtils.java
@@ -0,0 +1,22 @@
+package cn.pluss.platform.util;
+
+public class AuditUtils {
+
+    /**
+     * 银盛商户类型转换
+     * @param merchantType 商户类型
+     * @return 通道商户类型
+     */
+    public static String getYsMerchantType(String merchantType) {
+        if ("1".equals(merchantType)) {
+            return "3";
+        }
+
+        //
+        if ("2".equals(merchantType)) {
+            return "0";
+        }
+
+        return "1";
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/Base64DecodedMultipartFile.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/Base64DecodedMultipartFile.java
new file mode 100644
index 0000000..cb89ce6
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/Base64DecodedMultipartFile.java
@@ -0,0 +1,59 @@
+package cn.pluss.platform.util;
+
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.*;
+
+public class Base64DecodedMultipartFile implements MultipartFile {
+
+    private final byte[] imgContent;
+    private final String header;
+
+    public Base64DecodedMultipartFile(byte[] imgContent, String header) {
+        this.imgContent = imgContent;
+        this.header = header.split(";")[0];
+    }
+
+    @Override
+    public String getName() {
+        // TODO - implementation depends on your requirements
+        return System.currentTimeMillis() + Math.random() + "." + header.split("/")[1];
+    }
+
+    @Override
+    public String getOriginalFilename() {
+        // TODO - implementation depends on your requirements
+        return System.currentTimeMillis() + (int)Math.random() * 10000 + "." + header.split("/")[1];
+    }
+
+    @Override
+    public String getContentType() {
+        // TODO - implementation depends on your requirements
+        return header.split(":")[1];
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return imgContent == null || imgContent.length == 0;
+    }
+
+    @Override
+    public long getSize() {
+        return imgContent.length;
+    }
+
+    @Override
+    public byte[] getBytes() throws IOException {
+        return imgContent;
+    }
+
+    @Override
+    public InputStream getInputStream() throws IOException {
+        return new ByteArrayInputStream(imgContent);
+    }
+
+    @Override
+    public void transferTo(File dest) throws IOException, IllegalStateException {
+        new FileOutputStream(dest).write(imgContent);
+    }
+}
\ No newline at end of file
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/Base64Util.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/Base64Util.java
new file mode 100644
index 0000000..45fe33a
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/Base64Util.java
@@ -0,0 +1,170 @@
+package cn.pluss.platform.util;
+
+import lombok.extern.slf4j.Slf4j;
+import net.coobird.thumbnailator.Thumbnails;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.*;
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+
+@Slf4j
+public class Base64Util {
+
+    private static final Integer KB = 1024;
+
+    private static final char last2byte = (char) Integer.parseInt("00000011", 2);
+    private static final char last4byte = (char) Integer.parseInt("00001111", 2);
+    private static final char last6byte = (char) Integer.parseInt("00111111", 2);
+    private static final char lead6byte = (char) Integer.parseInt("11111100", 2);
+    private static final char lead4byte = (char) Integer.parseInt("11110000", 2);
+    private static final char lead2byte = (char) Integer.parseInt("11000000", 2);
+    private static final char[] encodeTable = new char[]{'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', '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', '0', '1',
+            '2', '3', '4', '5', '6', '7', '8', '9', '+', '/'};
+
+    /**
+     * 将文件转成base64 字符串
+     *
+     * @return *
+     * @throws Exception
+     */
+
+    public static String encodeBase64File(String path) throws Exception {
+        File file = new File(path);
+        FileInputStream inputFile = new FileInputStream(file);
+        byte[] buffer = new byte[(int) file.length()];
+        inputFile.read(buffer);
+        inputFile.close();
+        return Base64.getEncoder().encodeToString(buffer);
+
+    }
+
+    /**
+     * base64转inputStream
+     *
+     * @param base64string
+     * @return
+     */
+    public static InputStream base64ToInputStream(String base64string) {
+        ByteArrayInputStream stream = null;
+        try {
+            byte[] bytes1 = Base64.getDecoder().decode(base64string);
+            stream = new ByteArrayInputStream(bytes1);
+        } catch (Exception e) {
+            // TODO: handle exception
+        }
+        return stream;
+    }
+
+    /**
+     * 将base64字符解码保存文件
+     *
+     * @param base64Code
+     * @param targetPath
+     * @throws Exception
+     */
+
+    public static void decoderBase64File(String base64Code, String targetPath) throws Exception {
+        byte[] buffer = Base64.getDecoder().decode(base64Code);
+        FileOutputStream out = new FileOutputStream(targetPath);
+        out.write(buffer);
+        out.close();
+
+    }
+
+    /**
+     * 将base64字符保存文本文件
+     *
+     * @param base64Code
+     * @param targetPath
+     * @throws Exception
+     */
+
+    public static void toFile(String base64Code, String targetPath) throws Exception {
+
+        byte[] buffer = base64Code.getBytes();
+        FileOutputStream out = new FileOutputStream(targetPath);
+        out.write(buffer);
+        out.close();
+    }
+
+    public static MultipartFile base64ToMultipart(String base64) {
+        String[] baseStrs = base64.split(",");
+
+        byte[] b = Base64.getDecoder().decode(baseStrs[1]);
+
+        for (int i = 0; i < b.length; ++i) {
+            if (b[i] < 0) {
+                b[i] += 256;
+            }
+        }
+        return new Base64DecodedMultipartFile(b, baseStrs[0]);
+    }
+
+    /**
+     *
+     * @param origPicContent
+     * @param desFileSize   期望文件大小，单位KB
+     * @return
+     */
+    public static String compressPic(String origPicContent, Integer desFileSize) {
+        ByteArrayInputStream in = null;
+        ByteArrayOutputStream out = null;
+        try {
+            byte[] bytes = Base64.getDecoder().decode(origPicContent);
+            while (bytes.length > desFileSize * KB) {
+                in = new ByteArrayInputStream(bytes);
+                out = new ByteArrayOutputStream();
+                Thumbnails.of(in)
+                        .scale(0.9f)
+                        .outputQuality(1)
+                        .toOutputStream(out);
+                bytes = out.toByteArray();
+            }
+            return Base64.getEncoder().encodeToString(bytes).replaceAll("[\r\n]","");
+        } catch (IOException e) {
+            log.error ("decode buffer fail, message:{}", e.getMessage (), e);
+        } finally {
+            if (in != null) {
+                try {
+                    in.close ();
+                } catch (IOException e) {
+                    log.error ("ByteArrayInputStream close fail, message:{}", e.getMessage (), e);
+                }
+            }
+            if (out != null) {
+                try {
+                    out.close ();
+                } catch (IOException e) {
+                    log.error ("ByteArrayOutputStream close fail, message:{}", e.getMessage (), e);
+                }
+            }
+        }
+        return origPicContent;
+    }
+
+    /**
+     * 字符串 base64 编码
+     * @param source
+     * @return
+     */
+    public static String encode(String source){
+        return Base64.getEncoder().encodeToString(source.getBytes(StandardCharsets.UTF_8));
+    }
+
+    /**
+     * 字符串 base64 解码
+     * @param source
+     * @return
+     */
+    public static String decode(String source){
+        try {
+            return new String(Base64.getDecoder().decode(source),"UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+            return "";
+        }
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/BeanUtils.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/BeanUtils.java
new file mode 100644
index 0000000..686932c
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/BeanUtils.java
@@ -0,0 +1,233 @@
+package cn.pluss.platform.util;
+
+import java.beans.BeanInfo;
+import java.beans.Introspector;
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+/**
+ * 对apche BeanUtils 进行封装，将强制性捕获异常转化成运行时异常
+ * 
+ * 
+ */
+public class BeanUtils {
+
+	private static void handleReflectionException(Exception e) {
+	}
+
+	/**
+	 * 克隆对象
+	 * 
+	 * @param bean
+	 * @return
+	 */
+	public static Object cloneBean(Object bean) {
+		try {
+			return org.apache.commons.beanutils.BeanUtils.cloneBean(bean);
+		} catch (Exception e) {
+			handleReflectionException(e);
+			return null;
+		}
+	}
+
+	/**
+	 * 
+	 * @param destClass
+	 * @param orig
+	 * @return
+	 */
+	public static Object copyProperties(Class destClass, Object orig) {
+		try {
+			Object target = destClass.newInstance();
+			copyProperties((Object) target, orig);
+			return target;
+		} catch (Exception e) {
+			handleReflectionException(e);
+			return null;
+		}
+	}
+
+	public static void copyProperties(Object dest, Object orig) {
+		try {
+			org.apache.commons.beanutils.BeanUtils.copyProperties(dest.getClass(), orig);
+		} catch (Exception e) {
+			handleReflectionException(e);
+		}
+	}
+
+	public static void copyProperty(Object bean, String name, Object value) {
+		try {
+			org.apache.commons.beanutils.BeanUtils.copyProperty(bean, name, value);
+		} catch (Exception e) {
+			handleReflectionException(e);
+		}
+	}
+
+	public static Map describe(Object bean) {
+		try {
+			return org.apache.commons.beanutils.BeanUtils.describe(bean);
+		} catch (Exception e) {
+			handleReflectionException(e);
+			return null;
+		}
+	}
+
+	public static String[] getArrayProperty(Object bean, String name) {
+		try {
+			return org.apache.commons.beanutils.BeanUtils.getArrayProperty(bean, name);
+		} catch (Exception e) {
+			handleReflectionException(e);
+			return null;
+		}
+	}
+
+	public static String getIndexedProperty(Object bean, String name, int index) {
+		try {
+			return org.apache.commons.beanutils.BeanUtils.getIndexedProperty(bean, name, index);
+		} catch (Exception e) {
+			handleReflectionException(e);
+			return null;
+		}
+	}
+
+	public static String getIndexedProperty(Object bean, String name) {
+		try {
+			return org.apache.commons.beanutils.BeanUtils.getIndexedProperty(bean, name);
+		} catch (Exception e) {
+			handleReflectionException(e);
+			return null;
+		}
+	}
+
+	public static String getMappedProperty(Object bean, String name, String key) {
+		try {
+			return org.apache.commons.beanutils.BeanUtils.getMappedProperty(bean, name, key);
+		} catch (Exception e) {
+			handleReflectionException(e);
+			return null;
+		}
+	}
+
+	public static String getMappedProperty(Object bean, String name) {
+		try {
+			return org.apache.commons.beanutils.BeanUtils.getMappedProperty(bean, name);
+		} catch (Exception e) {
+			handleReflectionException(e);
+			return null;
+		}
+	}
+
+	public static String getNestedProperty(Object bean, String name) {
+		try {
+			return org.apache.commons.beanutils.BeanUtils.getNestedProperty(bean, name);
+		} catch (Exception e) {
+			handleReflectionException(e);
+			return null;
+		}
+	}
+
+	public static String getProperty(Object bean, String name) {
+		try {
+			return org.apache.commons.beanutils.BeanUtils.getProperty(bean, name);
+		} catch (Exception e) {
+			handleReflectionException(e);
+			return null;
+		}
+	}
+
+	public static String getSimpleProperty(Object bean, String name) {
+		try {
+			return org.apache.commons.beanutils.BeanUtils.getSimpleProperty(bean, name);
+		} catch (Exception e) {
+			handleReflectionException(e);
+			return null;
+		}
+	}
+
+	public static void populate(Object bean, Map properties) {
+		try {
+			org.apache.commons.beanutils.BeanUtils.populate(bean, properties);
+		} catch (Exception e) {
+			handleReflectionException(e);
+		}
+	}
+
+	public static void setProperty(Object bean, String name, Object value) {
+		try {
+			org.apache.commons.beanutils.BeanUtils.setProperty(bean, name, value);
+		} catch (Exception e) {
+			handleReflectionException(e);
+		}
+	}
+
+	/**
+	 * 将map转换成对应的javabean
+	 * 
+	 */
+	public static Object convertMap(Class type, Map map) throws Exception {
+		BeanInfo beanInfo = Introspector.getBeanInfo(type); // 获取类属性
+		Object obj = type.newInstance(); // 创建 JavaBean 对象
+
+		// 给 JavaBean 对象的属性赋值
+		PropertyDescriptor[] propertyDescriptors = beanInfo.getPropertyDescriptors();
+		for (int i = 0; i < propertyDescriptors.length; i++) {
+			PropertyDescriptor descriptor = propertyDescriptors[i];
+			String propertyName = descriptor.getName();
+			if (map.containsKey(propertyName)) {
+				// 下面一句可以 try 起来，这样当一个属性赋值失败的时候就不会影响其他属性赋值。
+				Object value = map.get(propertyName);
+
+				Object[] args = new Object[1];
+				args[0] = value;
+
+				descriptor.getWriteMethod().invoke(obj, args);
+			}
+		}
+		return obj;
+	}
+
+	/**
+	 * 将javabean转换成map
+	 */
+	public static Map convertBean(Object bean) throws Exception {
+		Class type = bean.getClass();
+		Map returnMap = new HashMap();
+		BeanInfo beanInfo = Introspector.getBeanInfo(type);
+
+		PropertyDescriptor[] propertyDescriptors = beanInfo.getPropertyDescriptors();
+		for (int i = 0; i < propertyDescriptors.length; i++) {
+			PropertyDescriptor descriptor = propertyDescriptors[i];
+			String propertyName = descriptor.getName();
+			if (!propertyName.equals("class")) {
+				Method readMethod = descriptor.getReadMethod();
+				Object result = readMethod.invoke(bean, new Object[0]);
+				if (result != null) {
+					returnMap.put(propertyName, result);
+				} else {
+					returnMap.put(propertyName, "");
+				}
+			}
+		}
+		return returnMap;
+	}
+
+	/**
+	 * 循环遍历克隆Map对象 值对象为浅clone
+	 * 
+	 * @param src
+	 * @return
+	 */
+	public static Map<String, Object> cloneMap(Map<String, Object> src) {
+		Map<String, Object> des = new HashMap<String, Object>();
+		for (Iterator<String> it = src.keySet().iterator(); it.hasNext();) {
+			String key = it.next();
+			Object value = src.get(key);
+			des.put(key, value);
+		}
+		return des;
+	}
+
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/ByteArrayImg.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/ByteArrayImg.java
new file mode 100644
index 0000000..af1112e
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/ByteArrayImg.java
@@ -0,0 +1,21 @@
+package cn.pluss.platform.util;
+
+import org.springframework.core.io.ByteArrayResource;
+
+/**
+ * @author SSS
+ */
+public class ByteArrayImg extends ByteArrayResource {
+
+    private String picName;
+
+    public ByteArrayImg(byte[] byteArray, String picName) {
+        super(byteArray);
+        this.picName = picName;
+    }
+
+    @Override
+    public String getFilename() {
+        return picName;
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/CertFicatesUtils.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/CertFicatesUtils.java
new file mode 100644
index 0000000..4e37485
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/CertFicatesUtils.java
@@ -0,0 +1,125 @@
+package cn.pluss.platform.util;
+
+import java.util.Base64;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+import javax.crypto.Cipher;
+import javax.crypto.spec.GCMParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+
+import org.apache.http.HttpHeaders;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
+import org.dom4j.Document;
+import org.dom4j.DocumentHelper;
+import org.dom4j.Element;
+
+import com.alibaba.fastjson.JSONObject;
+
+public class CertFicatesUtils {
+
+	//接口请求地址
+	private static String requestUrl = "https://api.mch.weixin.qq.com/risk/getcertficates";
+	//服务商号
+	private static String mch_id = "1551169371";
+	
+	private static String payKey = "7F05NZBTJ3XNDK5HLSDC3H25ZXOQKDHT";
+	
+	
+	//获取商户平台证书序列号
+	public static String getCertFicates() {
+		
+		// 初始化一个HttpClient
+		CloseableHttpClient httpClient = HttpClients.createDefault();
+		// Post请求
+		HttpPost httpPost = new HttpPost(requestUrl);
+		/**
+		 * 这边需要您提供微信分配的商户号跟API密钥
+		 */
+		Map<String, String> param = new HashMap<>(4);
+		param.put("mch_id", mch_id);
+		param.put("nonce_str", UUID.randomUUID().toString().replace("-", ""));
+		// 暂只支持HMAC-SHA256 加密
+		param.put("sign_type", "HMAC-SHA256");
+		// 对你的参数进行加密处理
+		String sign = WechatSignUtil.sha256Sign(param, payKey);
+		param.put("sign", sign);
+		httpPost.setEntity(new StringEntity(map2Xml(param), "UTF-8"));
+		httpPost.setHeader(HttpHeaders.CONTENT_TYPE, ContentType.APPLICATION_XML.getMimeType());
+		try {
+			HttpResponse httpResponse = httpClient.execute(httpPost);
+
+			if (httpResponse != null && httpResponse.getStatusLine().getStatusCode() == 200) {
+				String responseEntity = EntityUtils.toString(httpResponse.getEntity());
+				System.out.println(responseEntity);
+				Document document = DocumentHelper.parseText(responseEntity);
+				Element root = document.getRootElement();
+				if ("SUCCESS".equalsIgnoreCase(root.element("return_code").getTextTrim())&& "SUCCESS".equalsIgnoreCase(root.element("result_code").getTextTrim())) {
+					
+			
+					//System.out.println(root.element("certificates").getTextTrim());
+					JSONObject data = JSONObject.parseObject(root.element("certificates").getTextTrim());
+					//System.out.println(data.getString("data"));
+					JSONObject senconds = JSONObject.parseObject(data.getString("data").replace("[", "").replace("]", ""));
+					JSONObject encrypt_certificate = JSONObject.parseObject(senconds.getString("encrypt_certificate"));
+					
+					
+					
+					return //senconds.getString("serial_no");
+							//root.element("serial_no").getTextTrim();
+							decryptCertSN(encrypt_certificate.getString("associated_data"),encrypt_certificate.getString("nonce"),encrypt_certificate.getString("ciphertext"),"VVGT43fzo4ICUGcH5jJ38VBGXwq8Kmja");
+							//document.selectSingleNode("//certificates").getStringValue();
+				}else {
+					System.out.println("请求平台证书序号响应错误！");
+				}
+				// log.error("请求平台证书序号响应异常 {}",
+				// document.selectSingleNode("//return_msg").getStringValue());
+			}
+		} catch (Exception e) {
+			System.out.println(e.getMessage());
+			// log.error("执行httpclient请求平台证书序号错误 {}", e);
+		}
+		return null;
+	}
+
+	/**
+	 * map对象转xml
+	 *
+	 * @param map
+	 * @return
+	 */
+	private static String map2Xml(Map<String, String> map) {
+		StringBuilder result = new StringBuilder();
+		result.append("<xml>");
+		if (map != null && map.keySet().size() > 0) {
+			map.forEach((key, value) -> {
+				result.append("<" + key + "><![CDATA[");
+				result.append(value);
+				result.append("]]></" + key + ">");
+			});
+		}
+		result.append("</xml>");
+		return result.toString();
+	}
+	
+	
+	//解密平台证书
+	private static String decryptCertSN(String associatedData, String nonce, String cipherText, String apiv3Key) throws Exception{
+        final Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding", "SunJCE");
+        SecretKeySpec key = new SecretKeySpec(apiv3Key.getBytes(), "AES");
+        GCMParameterSpec spec = new GCMParameterSpec(128, nonce.getBytes());
+        cipher.init(Cipher.DECRYPT_MODE, key, spec);
+        cipher.updateAAD(associatedData.getBytes());
+        return new String(cipher.doFinal(Base64.getDecoder().decode(cipherText)));
+    }
+	
+	
+	
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/CheckUtils.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/CheckUtils.java
new file mode 100644
index 0000000..d877c1d
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/CheckUtils.java
@@ -0,0 +1,22 @@
+package cn.pluss.platform.util;
+
+import cn.pluss.platform.exception.MsgException;
+
+/**
+ * @author DJH
+ */
+public class CheckUtils {
+
+    /**
+     * 判断值是否在指定范围内
+     * @param target    目标值
+     * @param max       最大
+     * @param min       最小
+     * @param msg       抛出的异常信息
+     */
+    public static void limit(int target, int min, int max, String msg) {
+        if (target < min || target > max) {
+            throw new MsgException(msg);
+        }
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/ComUtil.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/ComUtil.java
new file mode 100644
index 0000000..cdcd3ac
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/ComUtil.java
@@ -0,0 +1,178 @@
+package cn.pluss.platform.util;
+
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Map;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.http.HttpHeaders;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import com.alibaba.fastjson.JSON;
+
+import cn.pluss.platform.api.Result;
+
+public class ComUtil {
+	private final static Logger logger = LoggerFactory.getLogger(ComUtil.class);
+
+	@SuppressWarnings("rawtypes")
+	public static boolean isEmpty(Object aObj) {
+		if (aObj instanceof String) {
+			return isEmpty((String) aObj);
+		} else if (aObj instanceof Long) {
+			return isEmpty((Long) aObj);
+		} else if (aObj instanceof java.util.Date) {
+			return isEmpty((java.util.Date) aObj);
+		} else if (aObj instanceof Collection) {
+			return isEmpty((Collection) aObj);
+		} else if (aObj instanceof Map) {
+			return isEmpty((Map) aObj);
+		} else if (aObj != null && aObj.getClass().isArray()) {
+			return isEmptyArray(aObj);
+		} else {
+			return isNull(aObj);
+		}
+	}
+
+	private static boolean isEmptyArray(Object array) {
+		int length = 0;
+		if (array instanceof int[]) {
+			length = ((int[]) array).length;
+		} else if (array instanceof byte[]) {
+			length = ((byte[]) array).length;
+		} else if (array instanceof short[]) {
+			length = ((short[]) array).length;
+		} else if (array instanceof char[]) {
+			length = ((char[]) array).length;
+		} else if (array instanceof float[]) {
+			length = ((float[]) array).length;
+		} else if (array instanceof double[]) {
+			length = ((double[]) array).length;
+		} else if (array instanceof long[]) {
+			length = ((long[]) array).length;
+		} else if (array instanceof boolean[]) {
+			length = ((boolean[]) array).length;
+		} else {
+			length = ((Object[]) array).length;
+		}
+		if (length == 0) {
+			return true;
+		}
+		return false;
+	}
+
+	public static boolean isEmpty(java.util.Date aDate) {
+		if (aDate == null) {
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+	public static boolean isEmpty(Long aLong) {
+		if (aLong == null) {
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+	@SuppressWarnings("rawtypes")
+	public static boolean isEmpty(Map m) {
+		if (m == null || m.size() == 0) {
+			return true;
+		}
+		return false;
+	}
+
+	@SuppressWarnings("rawtypes")
+	public static boolean isEmpty(Collection c) {
+		if (c == null || c.size() == 0) {
+			return true;
+		}
+		return false;
+	}
+
+	public static boolean isEmpty(String aStr) {
+		if (aStr == null || aStr.trim().isEmpty()) {
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+	public static String trim(String aStr) {
+		if (aStr == null) {
+			return "";
+		} else {
+			return aStr.trim();
+		}
+	}
+
+	public static boolean isNull(Object oStr) {
+		if (oStr == null) {
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+	public static boolean equals(String str1, String str2) {
+		return str1 != null ? str1.equals(str2) : str2 == null;
+	}
+
+	public static boolean equals(Long L1, Long L2) {
+		return L1 != null ? L1.equals(L2) : L2 == null;
+	}
+
+	public static boolean equals(Object obj1, Object obj2) {
+		boolean result;
+		if (obj1 != null) {
+			result = obj1.equals(obj2);
+		} else {
+			result = (obj2 == null);
+		}
+		return result;
+	}
+
+	public static boolean equalsIgnoreCase(String str1, String str2) {
+		return str1 != null ? str1.equalsIgnoreCase(str2) : str2 == null;
+	}
+	
+	public static String getIpAddress(HttpServletRequest request) {
+		String ip = request.getHeader("x-forwarded-for");
+		if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+			ip = request.getHeader("Proxy-Client-IP");
+		}
+		if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+			ip = request.getHeader("WL-Proxy-Client-IP");
+		}
+		if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+			ip = request.getHeader("HTTP_CLIENT_IP");
+		}
+		if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+			ip = request.getHeader("HTTP_X_FORWARDED_FOR");
+		}
+		if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+			ip = request.getRemoteAddr();
+		}
+		// 如果是多级代理，那么取第一个ip为客户端ip
+		if (ip != null && ip.indexOf(",") != -1) {
+			ip = ip.substring(0, ip.indexOf(",")).trim();
+		}
+
+		return ip;
+	}
+
+	public static void responseResult(HttpServletResponse response, Result result) {
+		response.setCharacterEncoding("UTF-8");
+		response.setHeader(HttpHeaders.CONTENT_TYPE, "application/json;charset=UTF-8");
+		response.setStatus(200);
+		try {
+			response.getWriter().write(JSON.toJSONString(result));
+		} catch (IOException ex) {
+			logger.error(ex.getMessage());
+		}
+	}
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/CookieUtils.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/CookieUtils.java
new file mode 100644
index 0000000..d1af337
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/CookieUtils.java
@@ -0,0 +1,51 @@
+package cn.pluss.platform.util;
+
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * TODO
+ * cookie 工具类
+ * @author crystal
+ * @date 2022/6/24 17:29
+ */
+public class CookieUtils {
+
+
+    private static final String PREFIX = "SYB-USERID-OPEND-";
+    /**
+     * 获取value
+     * @param request
+     * @param key
+     * @param isBase64Flag 是否需要转码
+     * @return
+     */
+    public static String getCookieValue(HttpServletRequest request,String key,boolean isBase64Flag){
+        String value = null;
+        Cookie[] cookies = request.getCookies();
+        key = PREFIX + key;
+        if (cookies != null && cookies.length > 0) {
+            for (Cookie c : cookies) {
+                if (key.equals(c.getName())) {
+                    value = c.getValue();
+                    break;
+                }
+            }
+        }
+        if(isBase64Flag && StringUtil.isNotEmpty(value)){
+            value = Base64Util.decode(value);
+        }
+        return value;
+    }
+
+    public static void setCookie(HttpServletResponse response,String key, String value,boolean isBase64Flag){
+        key = PREFIX + key;
+        if(isBase64Flag){
+            value = Base64Util.encode(value);
+        }
+        Cookie cookie = new Cookie(key, value);
+        cookie.setMaxAge(-1);
+        response.addCookie(cookie);
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/CustomAbstractWrapper.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/CustomAbstractWrapper.java
new file mode 100644
index 0000000..c5fa217
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/CustomAbstractWrapper.java
@@ -0,0 +1,28 @@
+package cn.pluss.platform.util;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.enums.SqlKeyword;
+
+import java.util.Objects;
+
+public class CustomAbstractWrapper<T> extends QueryWrapper<T> {
+
+    public CustomAbstractWrapper() {
+    }
+
+    public CustomAbstractWrapper(T entity) {
+        super(entity);
+    }
+
+    public CustomAbstractWrapper(T entity, String... columns) {
+        super(entity, columns);
+    }
+
+    @Override
+    protected QueryWrapper<T> addCondition(boolean condition, String column, SqlKeyword sqlKeyword, Object val) {
+        if (Objects.isNull(val) || "".equals(val)) {
+            condition = false;
+        }
+        return super.addCondition(condition, column, sqlKeyword, val);
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/DataFactory.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/DataFactory.java
new file mode 100644
index 0000000..9f4fa6f
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/DataFactory.java
@@ -0,0 +1,53 @@
+package cn.pluss.platform.util;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.RequiredArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @author  Djh
+ * @param <T> 类型
+ *   便于从数据中取出需要的数据
+ */
+@Data
+@RequiredArgsConstructor
+public class DataFactory<T> {
+
+    private List<T> srcList;
+
+    public T get(T condition) {
+        if (srcList == null || srcList.size() == 0) {
+            srcList = configuration.getData();
+        }
+
+        for (T item: srcList) {
+            if (configuration.compare(item, condition)) {
+                return item;
+            }
+        }
+
+        return null;
+    }
+
+    private final Configuration<T> configuration;
+
+
+    public interface Configuration<T> {
+
+        /**
+         * 获取数据
+         * @return
+         */
+        List<T> getData();
+
+        /**
+         * 数据比较
+         * @param src
+         * @param tar
+         * @return
+         */
+        boolean compare(T src, T tar);
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/DateUtils.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/DateUtils.java
new file mode 100644
index 0000000..5425fe2
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/DateUtils.java
@@ -0,0 +1,654 @@
+package cn.pluss.platform.util;
+
+import java.sql.Timestamp;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+/**
+ * @author hkj
+ * @category @see 日期工具
+ */
+public class DateUtils {
+
+	public final static String DEFAULT_FORMAT = "yyyy-MM-dd";
+
+	public static String formatDateDefault(Date date, String pattern) {
+		if (date == null) {
+			return "";
+		}
+
+		try {
+			SimpleDateFormat formatter = new SimpleDateFormat(pattern);
+			return formatter.format(date);
+		} catch (Exception e) {
+			return "";
+		}
+	}
+
+	/**
+	 * 根据给定的格式化参数，将字符串转换为日期
+	 * 
+	 * @param dateString
+	 * @param dateFormat
+	 * @return java.util.Date
+	 */
+	public static java.util.Date parse(String dateString, String dateFormat) {
+		if ("".equals(dateString.trim()) || dateString == null) {
+			return null;
+		}
+		DateFormat sdf = new SimpleDateFormat(dateFormat);
+		Date date = null;
+		try {
+			date = sdf.parse(dateString);
+
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
+		return date;
+	}
+
+	/**
+	 * 
+	 * 默认将字符串转换为日期，格式(yyyy-MM-dd)
+	 * 
+	 * @param dateString
+	 * @return
+	 */
+	public static java.util.Date parse(String dateString) {
+		return parse(dateString, DEFAULT_FORMAT);
+	}
+
+	/**
+	 * 根据给定的格式化参数，将日期转换为字符串
+	 * 
+	 * @param date
+	 * @param dateFormat
+	 * @return String
+	 */
+	public static String toString(java.util.Date date, String dateFormat) {
+		if ("".equals(date) || date == null) {
+			return "bug: date is null";
+		}
+		DateFormat sdf = new SimpleDateFormat(dateFormat);
+		String str = sdf.format(date);
+
+		return str;
+	}
+
+	/**
+	 * 默认将日期转换为字符串，格式(yyyy-MM-dd)
+	 * 
+	 * @param date
+	 * @return String
+	 */
+	public static String toString(java.util.Date date) {
+		return toString(date, DEFAULT_FORMAT);
+	}
+
+	/**
+	 * 将日期转换为长整型?
+	 * 
+	 * @param date
+	 * @return long
+	 */
+	public static long toLong(java.util.Date date) {
+		if (date == null) {
+			return 0;
+		}
+		long d = date.getTime();
+
+		return d;
+	}
+
+	/**
+	 * 将长整型转换为日期对象
+	 * 
+	 * @param time
+	 * @return date
+	 */
+	public static java.util.Date toDate(long time) {
+		if ("".equals(time)) {
+			return new Date();
+		}
+		Date date = new Date(time);
+
+		return date;
+	}
+
+	/**
+	 * 获得系统当前时间
+	 * 
+	 * @return java.util.Date
+	 */
+	public static String currentStringDate() {
+		Date date = new Date();
+
+		return toString(date);
+	}
+
+	/**
+	 * 获得系统当前时间(按用户自己格式)
+	 * 
+	 * @return java.util.Date
+	 */
+	public static String currentYourDate(String formate) {
+		Date date = new Date();
+		return toString(date, formate);
+	}
+
+	public static String currentYourDate() {
+		Date date = new Date();
+		return toString(date, DEFAULT_FORMAT);
+	}
+
+	/**
+	 * 获得系统当前时间
+	 * 
+	 * @return java.util.Date
+	 */
+	public static java.util.Date currentDate() {
+		Date date = new Date();
+
+		return date;
+	}
+
+	/**
+	 * 根据日历的规则，为给定的日历字段添加或减去指定的时间�?
+	 * 
+	 * @param field 指定的日历字段
+	 * @param date  需要操作的日期对象
+	 * @param value 更改的时间值
+	 * @return java.util.Date
+	 */
+	public static Date add(int field, Date date, int value) {
+		Calendar ca = Calendar.getInstance();
+		ca.setTime(date);
+		ca.add(field, value);
+		Date newDate = ca.getTime();
+
+		return newDate;
+	}
+
+	/**
+	 * 返回给定日历字段的值
+	 * 
+	 * @param field 指定的日历字段
+	 * @param date  给定的日期对象
+	 * @return java.util.Date
+	 */
+	public static int get(int field, Date date) {
+		Calendar ca = Calendar.getInstance();
+		ca.setTime(date);
+		int value = ca.get(field);
+
+		return value;
+	}
+
+	/**
+	 * 返回前N个月的日期值
+	 * 
+	 * @param month
+	 * @return
+	 */
+	public static Date getLastMonth(String month) {
+		Calendar ca = Calendar.getInstance();
+		int m = 0;
+		try {
+			m = Integer.parseInt(month);
+		} catch (NumberFormatException e) {
+			e.printStackTrace();
+		}
+		ca.add(Calendar.MONTH, -m);
+		return ca.getTime();
+	}
+
+	/**
+	 * 返回当前日期的前一天
+	 * 
+	 * @param date
+	 * @return
+	 */
+	public static String getPreDate(Date date) {
+		Calendar calendar = Calendar.getInstance();
+		calendar.setTime(date);
+		calendar.add(Calendar.DAY_OF_MONTH, -1);
+		date = calendar.getTime();
+		return toString(date, DEFAULT_FORMAT);
+	}
+
+	/**
+	 * 验证字符串是否匹配日期
+	 */
+	public static boolean isDate(String str, String formate) {
+		try {
+			DateFormat sdf = new SimpleDateFormat(formate);
+			sdf.parse(str);
+			return true;
+		} catch (Exception e) {
+			// 如果throw java.text.ParseException或者NullPointerException，就说明格式不对
+			return false;
+		}
+	}
+
+	/**
+	 * 获取偏移日期
+	 * 
+	 * @param offset
+	 * @return
+	 */
+	public static Date getOffsetDate(int offset) {
+
+		SimpleDateFormat dft = new SimpleDateFormat("yyyy-MM-dd");
+		Date beginDate = new Date();
+		Calendar date = Calendar.getInstance();
+		date.setTime(beginDate);
+		date.set(Calendar.DATE, date.get(Calendar.DATE) + offset);
+		Date endDate = null;
+		try {
+			endDate = dft.parse(dft.format(date.getTime()));
+		} catch (ParseException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		return endDate;
+	}
+
+	/**
+	 * 返回日时分秒
+	 * 
+	 * @param second
+	 * @return
+	 */
+	public static String secondToTime(long second) {
+		long days = second / 86400;// 转换天数
+		second = second % 86400;// 剩余秒数
+		long hours = second / 3600;// 转换小时数
+		second = second % 3600;// 剩余秒数
+		long minutes = second / 60;// 转换分钟
+		second = second % 60;// 剩余秒数
+		String min = minutes + "";
+		if (minutes < 10) {
+			min = "0" + minutes;
+		}
+		String sec = second + "";
+		if (second < 10) {
+			sec = "0" + second;
+		}
+
+		if (0 < days) {
+			return days + "天，" + hours + "小时，" + minutes + "分，" + second + "秒";
+		} else {
+			return hours + ":" + min + ":" + sec;
+		}
+	}
+
+	// 获取当天的开始时间
+	public static Date getDayBegin() {
+		Calendar cal = new GregorianCalendar();
+		cal.set(Calendar.HOUR_OF_DAY, 0);
+		cal.set(Calendar.MINUTE, 0);
+		cal.set(Calendar.SECOND, 0);
+		cal.set(Calendar.MILLISECOND, 0);
+		return cal.getTime();
+	}
+
+	// 获取当天的结束时间
+	public static Date getDayEnd() {
+		Calendar cal = new GregorianCalendar();
+		cal.set(Calendar.HOUR_OF_DAY, 23);
+		cal.set(Calendar.MINUTE, 59);
+		cal.set(Calendar.SECOND, 59);
+		cal.set(Calendar.MILLISECOND, 999);
+		return cal.getTime();
+	}
+
+	// 获取昨天的开始时间
+	public static Date getBeginDayOfYesterday() {
+		Calendar cal = new GregorianCalendar();
+		cal.setTime(getDayBegin());
+		cal.add(Calendar.DAY_OF_MONTH, -1);
+		return cal.getTime();
+	}
+
+	// 获取昨天的结束时间
+	public static Date getEndDayOfYesterDay() {
+		Calendar cal = new GregorianCalendar();
+		cal.setTime(getDayEnd());
+		cal.add(Calendar.DAY_OF_MONTH, -1);
+		return cal.getTime();
+	}
+
+	// 获取明天的开始时间
+	public static Date getBeginDayOfTomorrow() {
+		Calendar cal = new GregorianCalendar();
+		cal.setTime(getDayBegin());
+		cal.add(Calendar.DAY_OF_MONTH, 1);
+
+		return cal.getTime();
+	}
+
+	// 获取明天的结束时间
+	public static Date getEndDayOfTomorrow() {
+		Calendar cal = new GregorianCalendar();
+		cal.setTime(getDayEnd());
+		cal.add(Calendar.DAY_OF_MONTH, 1);
+		return cal.getTime();
+	}
+
+	// 获取本周的开始时间
+	public static Date getBeginDayOfWeek() {
+		Date date = new Date();
+
+		Calendar cal = Calendar.getInstance();
+		cal.setTime(date);
+		int dayofweek = cal.get(Calendar.DAY_OF_WEEK);
+		if (dayofweek == 1) {
+			dayofweek += 7;
+		}
+		cal.add(Calendar.DATE, 2 - dayofweek);
+		return getDayStartTime(cal.getTime());
+	}
+
+	// 获取本周的结束时间
+	public static Date getEndDayOfWeek() {
+		Calendar cal = Calendar.getInstance();
+		cal.setTime(getBeginDayOfWeek());
+		cal.add(Calendar.DAY_OF_WEEK, 6);
+		Date weekEndSta = cal.getTime();
+		return getDayEndTime(weekEndSta);
+	}
+
+	// 获取本月的开始时间
+	public static Date getBeginDayOfMonth() {
+		Calendar calendar = Calendar.getInstance();
+		calendar.set(getNowYear(), getNowMonth() - 1, 1);
+		return getDayStartTime(calendar.getTime());
+	}
+
+	// 获取本月的结束时间
+	public static Date getEndDayOfMonth() {
+		Calendar calendar = Calendar.getInstance();
+		calendar.set(getNowYear(), getNowMonth() - 1, 1);
+		int day = calendar.getActualMaximum(5);
+		calendar.set(getNowYear(), getNowMonth() - 1, day);
+		return getDayEndTime(calendar.getTime());
+	}
+
+	// 获取本年的开始时间
+	public static Date getBeginDayOfYear() {
+		Calendar cal = Calendar.getInstance();
+		cal.set(Calendar.YEAR, getNowYear());
+		// cal.set
+		cal.set(Calendar.MONTH, Calendar.JANUARY);
+		cal.set(Calendar.DATE, 1);
+
+		return getDayStartTime(cal.getTime());
+	}
+
+	// 获取本年的结束时间
+	public static Date getEndDayOfYear() {
+		Calendar cal = Calendar.getInstance();
+		cal.set(Calendar.YEAR, getNowYear());
+		cal.set(Calendar.MONTH, Calendar.DECEMBER);
+		cal.set(Calendar.DATE, 31);
+		return getDayEndTime(cal.getTime());
+	}
+
+	// 获取某个日期的开始时间
+	public static Timestamp getDayStartTime(Date d) {
+		Calendar calendar = Calendar.getInstance();
+		if (null != d) {
+			calendar.setTime(d);
+		}
+		calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), calendar.get(Calendar.DAY_OF_MONTH), 0,
+				0, 0);
+		calendar.set(Calendar.MILLISECOND, 0);
+		return new Timestamp(calendar.getTimeInMillis());
+	}
+
+	// 获取某个日期的结束时间
+	public static Timestamp getDayEndTime(Date d) {
+		Calendar calendar = Calendar.getInstance();
+		if (null != d) {
+			calendar.setTime(d);
+		}
+		calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), calendar.get(Calendar.DAY_OF_MONTH), 23,
+				59, 59);
+		calendar.set(Calendar.MILLISECOND, 999);
+		return new Timestamp(calendar.getTimeInMillis());
+	}
+
+	// 获取今年是哪一年
+	public static Integer getNowYear() {
+		Date date = new Date();
+		GregorianCalendar gc = (GregorianCalendar) Calendar.getInstance();
+		gc.setTime(date);
+		return Integer.valueOf(gc.get(1));
+	}
+
+	// 获取本月是哪一月
+	public static int getNowMonth() {
+		Date date = new Date();
+		GregorianCalendar gc = (GregorianCalendar) Calendar.getInstance();
+		gc.setTime(date);
+		return gc.get(2) + 1;
+	}
+
+	// 获取上一月的开始时间
+	public static Date getBeginDayOfPreMonth() {
+		Calendar calendar = Calendar.getInstance();
+		calendar.set(getNowYear(), getNowMonth() - 2, 1);
+		return getDayStartTime(calendar.getTime());
+	}
+
+	// 获取某个月的开始时间
+	public static String getBeginMonth(int i) {
+		SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+		Calendar cal_1 = Calendar.getInstance();// 获取当前日期
+		cal_1.add(Calendar.MONTH, i);
+		cal_1.set(Calendar.DAY_OF_MONTH, 1);// 设置为1号,当前日期既为本月第一天
+		String firstDay = format.format(cal_1.getTime()) + " 00:00:00";
+		return firstDay;
+	}
+
+	// 获取某个月的结束时间
+	public static String getEndMonth(int i) {
+		SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+		Calendar cale = Calendar.getInstance();
+		cale.add(Calendar.MONTH, i + 1);// 设置为1号,当前日期既为本月第一天
+		cale.set(Calendar.DAY_OF_MONTH, 0);// 设置为1号,当前日期既为本月第一天
+		String lastDay = format.format(cale.getTime()) + " 23:59:59";
+		return lastDay;
+	}
+
+	// 获取某个月的开始时间
+	public static Date getMonth(int i) {
+		SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+		Calendar cal_1 = Calendar.getInstance();// 获取当前日期
+		cal_1.add(Calendar.MONTH, i);
+		cal_1.set(Calendar.DAY_OF_MONTH, 1);// 设置为1号,当前日期既为本月第一天
+//	           String firstDay = format.format(cal_1.getTime())+" 00:00:00";
+		return cal_1.getTime();
+	}
+	
+	/**
+	 * 
+	 * getLastDay:(获取距离指定时间的指定距离天数 的时间 +[正]为后  -[负]为前). <br/> 
+	 *
+	 * @author Administrator 
+	 * @param time
+	 * @param i
+	 * @return 
+	 * @since JDK 1.8
+	 */
+	public static String getDay(String time,int i){
+	        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+	        Calendar calendar = Calendar.getInstance();
+	        Date date=null;
+	        try {
+	            date = sdf.parse(time);
+	        } catch (ParseException e) {
+	            e.printStackTrace();
+	        }
+	        calendar.setTime(date);
+	        int day=calendar.get(Calendar.DATE);
+	        //                      此处修改为+1则是获取后一天
+	        calendar.set(Calendar.DATE,day+i);
+	 
+	        String lastDay = sdf.format(calendar.getTime());
+	        return lastDay;
+	    }
+
+
+
+	/**
+	 * isBoolean:(当前时间大于活动开始时间，并且当前时间小于活动结束时间). <br/>
+	 *
+	 * @return
+	 *
+	 * @author Administrator
+	 * @since JDK 1.8
+	 */
+	public static boolean isBoolean(Date startTime, Date endTime) {
+		boolean flag = false;
+		boolean start = new Date().getTime() >= startTime.getTime();
+		boolean end = new Date().getTime() <= endTime.getTime();
+		if (start && end) {
+			flag = true;
+		}
+		return flag;
+	}
+
+
+	public static boolean isValidDate(String str) {
+		boolean convertSuccess=true;
+		// 指定日期格式为四位年/两位月份/两位日期，注意yyyy/MM/dd区分大小写；
+		SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		try {
+			// 设置lenient为false. 否则SimpleDateFormat会比较宽松地验证日期，比如2007/02/29会被接受，并转换成2007/03/01
+			//format.setLenient(false);
+			format.parse(str);
+		} catch (ParseException e) {
+			// e.printStackTrace();
+			// 如果throw java.text.ParseException或者NullPointerException，就说明格式不对
+			convertSuccess = false;
+		}
+		return convertSuccess;
+	}
+
+	public static List<Map<String,Object>> getLast6Months() throws ParseException {
+		Calendar c = Calendar.getInstance();
+		c.add(Calendar.MONTH, -5);
+		String before_six = c.get(Calendar.YEAR) + "-" + c.get(Calendar.MONTH);//六个月前
+		ArrayList<String> result = new ArrayList<String>();
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");// 格式化为年月
+		Calendar min = Calendar.getInstance();
+		Calendar max = Calendar.getInstance();
+		min.setTime(sdf.parse(before_six));
+		min.set(min.get(Calendar.YEAR), min.get(Calendar.MONTH), 1);
+		max.setTime(sdf.parse(sdf.format(new Date())));
+		max.set(max.get(Calendar.YEAR), max.get(Calendar.MONTH), 2);
+		Calendar curr = min;
+		while (curr.before(max)) {
+			result.add(sdf.format(curr.getTime()));
+			curr.add(Calendar.MONTH, 1);
+		}
+		String nowYear = String.valueOf(c.get(Calendar.YEAR));
+		List<Map<String,Object>> nowChilds = new ArrayList<>();
+		List<Map<String,Object>> prevChilds = new ArrayList<>();
+		Map<String,Object> prevYearMap = new HashMap<>();
+		Map<String,Object> nowYearMap = new HashMap<>();
+		List<Map<String,Object>> yearList = new ArrayList<>();
+		for (String o:result) {
+			String year = o.split("-")[0];
+			String month = o.split("-")[1];
+			if(nowYear.equals(year)){
+				Map<String,Object> childsMap = new HashMap<>();
+				childsMap.put("value",month);
+				nowChilds.add(childsMap);
+				nowYearMap.put("value",year);
+				//yearList.add();
+			}else{
+				Map<String,Object> childsMap = new HashMap<>();
+				childsMap.put("value",month);
+				prevChilds.add(childsMap);
+				prevYearMap.put("value",year);
+			}
+		}
+		nowYearMap.put("childs",nowChilds);
+		if(!prevChilds.isEmpty()){
+			prevYearMap.put("childs",prevChilds);
+			yearList.add(prevYearMap);
+		}
+		yearList.add(nowYearMap);
+		return yearList;
+	}
+
+	/**
+	 * 判断两个时间相差的天数
+	 * @param date1
+	 * @param date2
+	 * @return
+	 */
+	public static int differentDaysByMillisecond(Date date1,Date date2)
+	{
+		int days = (int) ((date2.getTime() - date1.getTime()) / (1000*3600*24));
+		return days;
+	}
+
+	/**
+	 * 判断两个时间相差的小时数
+	 * @param date1
+	 * @param date2
+	 * @return
+	 */
+	public static int differentDaysByHours(Date date1,Date date2)
+	{
+		int hours = (int) ((date2.getTime() - date1.getTime()) / (1000*3600));
+		return Math.abs(hours);
+	}
+
+	public static void main(String[] args) throws ParseException {
+		//List<String> last6Months = getLast6Months();
+//		List<String> last6Months = new ArrayList<>();
+//		last6Months.add("2019-11");
+//		last6Months.add("2019-12");
+//		last6Months.add("2020-01");
+//		last6Months.add("2020-02");
+//		last6Months.add("2020-03");
+//		last6Months.add("2020-04");
+		/*Calendar c = Calendar.getInstance();
+		String nowYear = String.valueOf(c.get(Calendar.YEAR));
+		List<Map<String,Object>> nowChilds = new ArrayList<>();
+		List<Map<String,Object>> prevChilds = new ArrayList<>();
+
+		Map<String,Object> prevYearMap = new HashMap<>();
+		Map<String,Object> nowYearMap = new HashMap<>();
+		List<Map<String,Object>> yearList = new ArrayList<>();
+		for (String o:last6Months) {
+			String year = o.split("-")[0];
+			String month = o.split("-")[1];
+			if(nowYear.equals(year)){
+				Map<String,Object> childsMap = new HashMap<>();
+				childsMap.put("value",month);
+				nowChilds.add(childsMap);
+				nowYearMap.put("value",year);
+				//yearList.add();
+			}else{
+				Map<String,Object> childsMap = new HashMap<>();
+				childsMap.put("value",month);
+				prevChilds.add(childsMap);
+				prevYearMap.put("value",year);
+			}
+		}
+		nowYearMap.put("childs",nowChilds);
+		prevYearMap.put("childs",prevChilds);
+		yearList.add(nowYearMap);
+		yearList.add(prevYearMap);
+		System.out.println(yearList);*/
+	}
+	
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/DesUtil.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/DesUtil.java
new file mode 100644
index 0000000..460258e
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/DesUtil.java
@@ -0,0 +1,174 @@
+package cn.pluss.platform.util;
+
+import javax.crypto.Cipher;
+import javax.crypto.SecretKeyFactory;
+import javax.crypto.spec.DESKeySpec;
+import java.security.Key;
+import java.security.SecureRandom;
+import java.util.Base64;
+
+public class DesUtil {
+
+    /**
+     * 偏移变量，固定占8位字节
+     */
+    private final static String IV_PARAMETER = "12345678";
+    /**
+     * 密钥算法
+     */
+    private static final String ALGORITHM = "DES";
+    /**
+     * 加密/解密算法-工作模式-填充模式
+     */
+    private static final String CIPHER_ALGORITHM = "DES/ECB/PKCS5Padding";
+    /**
+     * 默认编码
+     */
+    private static final String CHARSET = "utf-8";
+
+    /**
+     * 生成key
+     *
+     * @param password
+     * @return
+     * @throws Exception
+     */
+    private static Key generateKey(String password) throws Exception {
+        DESKeySpec dks = new DESKeySpec(password.getBytes(CHARSET));
+        SecretKeyFactory keyFactory = SecretKeyFactory.getInstance(ALGORITHM);
+        return keyFactory.generateSecret(dks);
+    }
+
+
+    /**
+     * DES加密字符串
+     *
+     * @param password 加密密码，长度不能够小于8位
+     * @param data 待加密字符串
+     * @return 加密后内容
+     */
+    public static String encrypt(String password, String data) {
+        if (password== null || password.length() < 8) {
+            throw new RuntimeException("加密失败，key不能小于8位");
+        }
+
+        if (data == null) {
+            return null;
+        }
+
+        SecureRandom random = new SecureRandom();
+        try {
+            Key secretKey = generateKey(password);
+            Cipher cipher = Cipher.getInstance(CIPHER_ALGORITHM);
+            cipher.init(Cipher.ENCRYPT_MODE, secretKey, random);
+            byte[] bytes = cipher.doFinal(data.getBytes(CHARSET));
+
+            //JDK1.8及以上可直接使用Base64，JDK1.7及以下可以使用BASE64Encoder
+            //Android平台可以使用android.util.Base64
+            return new String(Base64.getEncoder().encode(bytes));
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            return data;
+        }
+    }
+
+    /**
+     * DES解密字符串
+     *
+     * @param password 解密密码，长度不能够小于8位
+     * @param data 待解密字符串
+     * @return 解密后内容
+     */
+    public static String decrypt(String password, String data) {
+        if (password== null || password.length() < 8) {
+            throw new RuntimeException("加密失败，key不能小于8位");
+        }
+        if (data == null) {
+            return null;
+        }
+
+        SecureRandom random = new SecureRandom();
+        try {
+            Key secretKey = generateKey(password);
+            Cipher cipher = Cipher.getInstance(CIPHER_ALGORITHM);
+            cipher.init(Cipher.DECRYPT_MODE, secretKey, random);
+            return new String(cipher.doFinal(Base64.getDecoder().decode(data.getBytes(CHARSET))), CHARSET);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return data;
+        }
+    }
+
+//    /**
+//     * DES加密文件
+//     *
+//     * @param srcFile  待加密的文件
+//     * @param destFile 加密后存放的文件路径
+//     * @return 加密后的文件路径
+//     */
+//    public static String encryptFile(String password, String srcFile, String destFile) {
+//
+//        if (password== null || password.length() < 8) {
+//            throw new RuntimeException("加密失败，key不能小于8位");
+//        }
+//        try {
+//            IvParameterSpec iv = new IvParameterSpec(IV_PARAMETER.getBytes(CHARSET));
+//            Cipher cipher = Cipher.getInstance(CIPHER_ALGORITHM);
+//            cipher.init(Cipher.ENCRYPT_MODE, generateKey(key), iv);
+//            InputStream is = new FileInputStream(srcFile);
+//            OutputStream out = new FileOutputStream(destFile);
+//            CipherInputStream cis = new CipherInputStream(is, cipher);
+//            byte[] buffer = new byte[1024];
+//            int r;
+//            while ((r = cis.read(buffer)) > 0) {
+//                out.write(buffer, 0, r);
+//            }
+//            cis.close();
+//            is.close();
+//            out.close();
+//            return destFile;
+//        } catch (Exception ex) {
+//            ex.printStackTrace();
+//        }
+//        return null;
+//    }
+//
+//    /**
+//     * DES解密文件
+//     *
+//     * @param srcFile  已加密的文件
+//     * @param destFile 解密后存放的文件路径
+//     * @return 解密后的文件路径
+//     */
+//    public static String decryptFile(String password, String srcFile, String destFile) {
+//        if (password== null || password.length() < 8) {
+//            throw new RuntimeException("加密失败，key不能小于8位");
+//        }
+//        try {
+//            File file = new File(destFile);
+//            if (!file.exists()) {
+//                file.getParentFile().mkdirs();
+//                file.createNewFile();
+//            }
+//            IvParameterSpec iv = new IvParameterSpec(IV_PARAMETER.getBytes(CHARSET));
+//            Cipher cipher = Cipher.getInstance(CIPHER_ALGORITHM);
+//            cipher.init(Cipher.DECRYPT_MODE, generateKey(key), iv);
+//            InputStream is = new FileInputStream(srcFile);
+//            OutputStream out = new FileOutputStream(destFile);
+//            CipherOutputStream cos = new CipherOutputStream(out, cipher);
+//            byte[] buffer = new byte[1024];
+//            int r;
+//            while ((r = is.read(buffer)) >= 0) {
+//                cos.write(buffer, 0, r);
+//            }
+//            cos.close();
+//            is.close();
+//            out.close();
+//            return destFile;
+//        } catch (Exception ex) {
+//            ex.printStackTrace();
+//        }
+//        return null;
+//    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/EmojiUtil.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/EmojiUtil.java
new file mode 100644
index 0000000..25aefeb
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/EmojiUtil.java
@@ -0,0 +1,79 @@
+package cn.pluss.platform.util;
+
+import com.github.binarywang.java.emoji.EmojiConverter;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * 表情处理类
+ * @author Administrator
+ *
+ */
+public class EmojiUtil {
+
+    private static EmojiConverter emojiConverter = EmojiConverter.getInstance();
+
+    /**
+     * 将emojiStr转为 带有表情的字符
+     * @param emojiStr
+     * @return
+     */
+    public static String emojiConverterUnicodeStr(String emojiStr){
+        String result = emojiConverter.toUnicode(emojiStr);
+        return result;
+    }
+
+    /**
+     * 带有表情的字符串转换为编码
+     * @param str
+     * @return
+     */
+    public static String emojiConverterToAlias(String str){
+        String result=emojiConverter.toAlias(str);
+        return result;
+    }
+
+    public static String emojiRecovery2(String str){
+        String patternString = "\\[\\[(.*?)\\]\\]";
+
+        Pattern pattern = Pattern.compile(patternString);
+        Matcher matcher = pattern.matcher(str);
+
+        StringBuffer sb = new StringBuffer();
+        while(matcher.find()) {
+            try {
+                matcher.appendReplacement(sb,
+                        URLDecoder.decode(matcher.group(1), "UTF-8"));
+            } catch(UnsupportedEncodingException e) {
+
+            }
+        }
+        matcher.appendTail(sb);
+        return sb.toString();
+    }
+
+    public static String emojiConvert1(String str)
+    {
+        String patternString = "([\\x{10000}-\\x{10ffff}\ud800-\udfff])";
+
+        Pattern pattern = Pattern.compile(patternString);
+        Matcher matcher = pattern.matcher(str);
+        StringBuffer sb = new StringBuffer();
+        while(matcher.find()) {
+            try {
+                matcher.appendReplacement(
+                        sb,
+                        "[["
+                                + URLEncoder.encode(matcher.group(1),
+                                "UTF-8") + "]]");
+            } catch(UnsupportedEncodingException e) {
+            }
+        }
+        matcher.appendTail(sb);
+        return sb.toString();
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/ExcelInfo.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/ExcelInfo.java
new file mode 100644
index 0000000..20da837
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/ExcelInfo.java
@@ -0,0 +1,29 @@
+package cn.pluss.platform.util;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 表格生成
+ * @author Djh
+ */
+public interface ExcelInfo<T> {
+
+    /**
+     * 生成数据行
+     * @param rowData   一行的实体数据
+     * @return 返回一行的list数据
+     */
+    default List<Object> getRowData(T rowData) {
+        return null;
+    };
+
+    /**
+     * 生成数据行map
+     * @param rowData   一行的实体数据
+     * @return 返回一行的list数据
+     */
+    default Map<String, Object> getRowDataMap(T rowData) {
+        return null;
+    };
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/ExcelUtil.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/ExcelUtil.java
new file mode 100644
index 0000000..5313e06
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/ExcelUtil.java
@@ -0,0 +1,475 @@
+package cn.pluss.platform.util;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.net.URLEncoder;
+import java.text.DecimalFormat;
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import com.alibaba.fastjson.JSONObject;
+import org.apache.poi.hssf.usermodel.*;
+import org.apache.poi.hssf.util.HSSFColor;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.http.MediaType;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * @author yuchen
+ * 
+ * @Description 
+ */
+
+public class ExcelUtil {
+    public static<T> HSSFWorkbook getHSSFWorkbook( String sheetNmae, String[] title, Collection<T> values){
+        return null;
+    }
+
+    /**
+     * 利用正则的预编译功能
+     */
+    private static Pattern NUMBER_PATTERN = Pattern.compile("^//d+(//.//d+)?$");
+
+    /**
+     * 导出Excel工具
+     *
+     * @param fileName  文件名
+     * @param sheetName sheet名称
+     * @param headers   第一列内容，表头
+     * @param dataSet   内容
+     * @param keyList   map键，用于排序
+     * @param response  response
+     * @param pattern   日期格式化
+     * @throws IOException IO异常
+     */
+    public static void exportExcel(String fileName, String sheetName, String[] headers,
+                                   List<Map<String, Object>> dataSet, String[] keyList, HttpServletResponse response, String pattern) throws IOException {
+        exportExcel(fileName, sheetName, headers, dataSet, keyList, new ExcelInfo<Map<String, Object>>() {
+            @Override
+            public Map<String, Object> getRowDataMap(Map<String, Object> rowData) {
+                return rowData;
+            }
+        }, response, pattern);
+    }
+
+
+    private static <T> void exportExcel(String fileName, String sheetName, String[] headers,
+                                        List<T> dataSet, String[] keyList, ExcelInfo<T> iExcelInfo, HttpServletResponse response, String pattern) throws IOException {
+        // 声明一个工作薄
+        HSSFWorkbook workbook = new HSSFWorkbook();
+        HSSFCellStyle cellStyle = getCellStyle(workbook);
+
+        // 生成一个表格
+        HSSFSheet sheet = workbook.createSheet(sheetName);
+        // 设置表格默认列宽度为15个字节
+        sheet.setDefaultColumnWidth((short) 15);
+        setTitle(sheet, headers);
+
+        HSSFFont font3 = workbook.createFont();
+        font3.setColor(HSSFColor.HSSFColorPredefined.BLACK.getIndex());
+
+        // 声明一个画图的顶级管理器
+        HSSFPatriarch patriarch = sheet.createDrawingPatriarch();
+
+        // 遍历集合数据，产生数据行
+        Iterator<T> it = dataSet.iterator();
+        int index = 0;
+        while (it.hasNext()) {
+            index++;
+            T next = it.next();
+            Map<String, Object> rowDataMap = null;
+            List<Object> rowData = null;
+            int dataSize;
+            if (keyList != null) {
+                rowDataMap = iExcelInfo.getRowDataMap(next);
+                dataSize = keyList.length;
+            } else {
+                rowData = iExcelInfo.getRowData(next);
+                dataSize = rowData.size();
+            }
+
+            HSSFRow row = sheet.createRow(index);
+            //根据key的顺序依次从数据中拿到需要的数据，并生成所需要的单元格
+            for (int i = 0; i < dataSize; i++) {
+                HSSFCell cell = row.createCell(i);
+                cell.setCellStyle(cellStyle);
+                Object value;
+                if (keyList != null) {
+                    String key = keyList[i];
+                    value = rowDataMap.get(key);
+                } else {
+                    value = rowData.get(i);
+                }
+
+
+                String textValue;
+                if (value instanceof byte[]) {
+                    setPic(row, sheet, patriarch, (byte[]) value, i, index);
+                } else {
+                    DateTimeFormatter formatter = DateTimeFormatter.ofPattern(pattern);
+                    textValue = getTextObject(value, formatter);
+                    if (textValue != null) {
+                        Matcher matcher = NUMBER_PATTERN.matcher(textValue);
+                        if (matcher.matches()) {
+                            // 是数字当作double处理
+                            cell.setCellValue(Double.parseDouble(textValue));
+                        } else {
+                            HSSFRichTextString richString = new HSSFRichTextString(
+                                    textValue);
+
+                            richString.applyFont(font3);
+                            cell.setCellValue(richString);
+                        }
+                    }
+                }
+            }
+        }
+
+        setResponseHeader(response, fileName);
+        ServletOutputStream out = response.getOutputStream();
+        workbook.write(out);
+    }
+    /**
+     * 导出Excel工具
+     *
+     * @param fileName  文件名
+     * @param sheetName sheet名称
+     * @param response  response
+     * @param pattern   日期格式化
+     * @throws IOException IO异常
+     */
+    public static <T> void exportObjectExcel(String fileName, String sheetName, String[] headers, List<T> dataList, ExcelInfo<T> iExcelInfo, HttpServletResponse response, String pattern) throws IOException {
+
+        exportExcel(fileName, sheetName, headers, dataList, null, iExcelInfo, response, pattern);
+    }
+
+    /**
+     * 导出Excel工具,
+     *
+     * @param fileName  文件名
+     * @param sheetName sheet名称
+     * @param response  response
+     * @param pattern   日期格式化
+     * @throws IOException io异常
+     */
+    public static <T> void exportObjectExcel(String fileName, String sheetName, String[] headers, List<T> dataList, String[] keyList, HttpServletResponse response, String pattern) throws IOException {
+
+        exportExcel(fileName, sheetName, headers, dataList, keyList, new ExcelInfo<T>() {
+            @Override
+            public Map<String, Object> getRowDataMap(T rowData) {
+                return (JSONObject)JSONObject.toJSON(rowData);
+            }
+        }, response, pattern);
+    }
+
+    private static void setXSSFResponseHeader(HttpServletResponse response, String fileName) {
+        response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
+        String headerValue = "attachment;";
+        headerValue += " filename=\"" + encodeURIComponent(fileName + ".xlsx") +"\";";
+        headerValue += " filename*=utf-8''" + encodeURIComponent(fileName + ".xlsx");
+        response.setHeader("Content-Disposition", headerValue);
+    }
+
+    private static void setResponseHeader(HttpServletResponse response, String fileName) {
+        response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
+        String headerValue = "attachment;";
+        headerValue += " filename=\"" + encodeURIComponent(fileName + ".xls") +"\";";
+        headerValue += " filename*=utf-8''" + encodeURIComponent(fileName + ".xls");
+        response.setHeader("Content-Disposition", headerValue);
+    }
+
+    public static String getTextObject(Object value, DateTimeFormatter sdf) {
+        if (value == null) {
+            return "";
+        } else if (value instanceof Date) {
+            ZoneId zone = ZoneId.systemDefault();
+            Date date = (Date) value;
+            return sdf.format(date.toInstant().atZone(zone).toLocalDateTime());
+        } else if (value instanceof LocalDateTime) {
+            return ((LocalDateTime) value).format(sdf);
+        } else if (value instanceof BigDecimal) {
+            return ((BigDecimal) value).setScale(2, RoundingMode.HALF_UP).toPlainString();
+        } else {
+            return value.toString();
+        }
+    }
+
+    /**
+     * 设置表格头
+     * @param sheet sheet
+     * @param headers 标题数组
+     */
+    private static void setTitle(HSSFSheet sheet, String[] headers) {
+        HSSFWorkbook workbook = sheet.getWorkbook();
+        HSSFCellStyle style = getHeaderStyle(workbook);
+        // 生成一个字体
+        HSSFFont font = workbook.createFont();
+        font.setColor(HSSFColor.HSSFColorPredefined.BLACK.getIndex());
+        font.setFontHeightInPoints((short) 12);
+        font.setBold(true);
+        // 把字体应用到当前的样式
+        style.setFont(font);
+        // 产生表格标题行
+        HSSFRow row = sheet.createRow(0);
+        for (short i = 0; i < headers.length; i++) {
+            HSSFCell cell = row.createCell(i);
+            cell.setCellStyle(style);
+            HSSFRichTextString text = new HSSFRichTextString(headers[i]);
+            cell.setCellValue(text);
+        }
+    }
+
+    private static void setPic(HSSFRow hssfRow, Sheet sheet, HSSFPatriarch patriarch, byte[] value, int col, int row) {
+        // 有图片时，设置行高为60px;
+        hssfRow.setHeightInPoints(60);
+        // 设置图片所在列宽度为80px,注意这里单位的一个换算
+        sheet.setColumnWidth(col, (short) (35.7 * 80));
+        // sheet.autoSizeColumn(i);
+        HSSFClientAnchor anchor = new HSSFClientAnchor(0, 0,
+                1023, 255, (short) 6, row, (short) 6, row);
+        anchor.setAnchorType(ClientAnchor.AnchorType.MOVE_AND_RESIZE);
+        patriarch.createPicture(anchor, sheet.getWorkbook().addPicture(
+                value, HSSFWorkbook.PICTURE_TYPE_JPEG));
+    }
+
+    /**
+     * 标题的样式
+     */
+    private static HSSFCellStyle getHeaderStyle(HSSFWorkbook workbook) {
+        HSSFPalette customPalette = workbook.getCustomPalette();
+        customPalette.setColorAtIndex(HSSFColor.HSSFColorPredefined.TAN.getIndex(), (byte) 0xDD, (byte) 0xEB, (byte) 0xF7);
+
+        HSSFCellStyle cellStyle = workbook.createCellStyle();
+        setCellStyle(cellStyle);
+        cellStyle.setFillForegroundColor(HSSFColor.HSSFColorPredefined.TAN.getIndex());
+        cellStyle.setFillPattern(FillPatternType.SOLID_FOREGROUND);
+
+        return cellStyle;
+    }
+
+    public static void setCellStyle(CellStyle cellStyle) {
+        cellStyle.setAlignment(HorizontalAlignment.CENTER);
+        cellStyle.setVerticalAlignment(VerticalAlignment.CENTER);
+        cellStyle.setBorderBottom(BorderStyle.THIN);
+        cellStyle.setBorderTop(BorderStyle.THIN);
+        cellStyle.setBorderLeft(BorderStyle.THIN);
+        cellStyle.setBorderRight(BorderStyle.THIN);
+    }
+
+    public static HSSFCellStyle getCellStyle(HSSFWorkbook workbook) {
+        HSSFCellStyle cellStyle = workbook.createCellStyle();
+        cellStyle.setVerticalAlignment(VerticalAlignment.TOP);
+//        cellStyle.setWrapText(true);
+        return cellStyle;
+    }
+
+    public static void output(Workbook workbook, String fileName, HttpServletRequest request, HttpServletResponse response) throws IOException {
+        if (workbook instanceof HSSFWorkbook) {
+            setResponseHeader(response, fileName);
+        } else {
+            setXSSFResponseHeader(response, fileName);
+        }
+
+        ServletOutputStream out = response.getOutputStream();
+        workbook.write(out);
+    }
+
+    public static String encodeURIComponent(String value) {
+        try {
+            return URLEncoder.encode(value, "UTF-8").replaceAll("\\+", "%20");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    public static Workbook getWorkBook(MultipartFile file) {
+        //获得文件名
+        String fileName = file.getOriginalFilename();
+        //创建Workbook工作薄对象，表示整个excel
+        Workbook workbook = null;
+        try {
+            //获取excel文件的io流
+            InputStream is = file.getInputStream();
+            //根据文件后缀名不同(xls和xlsx)获得不同的Workbook实现类对象
+            if (fileName.endsWith("xls")) {
+                //2003
+                workbook = new HSSFWorkbook(is);
+            } else if (fileName.endsWith("xlsx")) {
+                //2007 及2007以上
+                workbook = new XSSFWorkbook(is);
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return workbook;
+    }
+
+    public static String getCellValue(Cell cell) {
+        String cellValue = "";
+        if (cell == null) {
+            return cellValue;
+        }
+        switch (cell.getCellTypeEnum()) {
+            case NUMERIC:
+                //数字
+                cellValue = stringDateProcess(cell);
+                break;
+            case STRING:
+                //字符串
+                cellValue = String.valueOf(cell.getStringCellValue());
+                break;
+            case BOOLEAN:
+                //Boolean
+                cellValue = String.valueOf(cell.getBooleanCellValue());
+                break;
+            case FORMULA:
+                //公式
+                cellValue = String.valueOf(cell.getCellFormula());
+                break;
+            case BLANK:
+                //空值
+                cellValue = "";
+                break;
+            case ERROR:
+                //故障
+                cellValue = "非法字符";
+                break;
+            default:
+                cellValue = "未知类型";
+                break;
+        }
+        return cellValue;
+    }
+
+    public static String stringDateProcess(Cell cell) {
+        String result = new String();
+        if (HSSFDateUtil.isCellDateFormatted(cell)) {
+            // 处理日期格式、时间格式
+            SimpleDateFormat sdf = null;
+            if (cell.getCellStyle().getDataFormat() == HSSFDataFormat.getBuiltinFormat("h:mm")) {
+                sdf = new SimpleDateFormat("HH:mm");
+            } else {// 日期
+                sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+            }
+            Date date = cell.getDateCellValue();
+            result = sdf.format(date);
+        } else if (cell.getCellStyle().getDataFormat() == 58) {
+            // 处理自定义日期格式：m月d日(通过判断单元格的格式id解决，id的值是58)
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+            double value = cell.getNumericCellValue();
+            Date date = org.apache.poi.ss.usermodel.DateUtil
+                    .getJavaDate(value);
+            result = sdf.format(date);
+        } else {
+            double value = cell.getNumericCellValue();
+            CellStyle style = cell.getCellStyle();
+            DecimalFormat format = new DecimalFormat();
+            String temp = style.getDataFormatString();
+            // 单元格设置成常规
+            if (temp.equals("General")) {
+                format.applyPattern("#");
+            }
+            result = format.format(value);
+        }
+
+        return result;
+    }
+
+    /**
+     * 解析上传的excel， 默认只解析第一张Sheet
+     *
+     * @param file     excel
+     * @param startRow 数据开始行
+     * @return List<String [ ]>
+     * @throws IOException
+     */
+    public static List<String[]> getExcelData(MultipartFile file, int startRow) throws IOException {
+        int resultSize = 0;
+        ArrayList<String[]> resultData = new ArrayList<>(resultSize);
+        if (!checkFile(file)) {
+            return resultData;
+        }
+        //获得Workbook工作薄对象
+        Workbook workbook = getWorkBook(file);
+        if (workbook != null) {
+            //获取第一张sheet工作表
+            Sheet sheet = workbook.getSheetAt(0);
+            if (sheet == null) {
+                return resultData;
+            }
+            // 重新初始化List结果大小
+            resultSize = sheet.getLastRowNum() + 1;
+            //获得当前sheet的开始行
+            int firstRowNum = sheet.getFirstRowNum();
+            //获得当前sheet的结束行
+            int lastRowNum = sheet.getLastRowNum();
+            //循环除了startRow的所有行,如果要循环除第一行以外的就firstRowNum+1
+            for (int rowNum = firstRowNum + startRow; rowNum <= lastRowNum; rowNum++) {
+                //获得当前行
+                Row row = sheet.getRow(rowNum);
+                if (rowIsEmpty(row)) {
+                    break;
+                }
+                //获得当前行的开始列
+                int firstCellNum = row.getFirstCellNum();
+                //获得当前行的列数
+                int lastCellNum = row.getLastCellNum();
+                String[] cells = new String[lastCellNum];
+                //循环当前行
+                for (int cellNum = firstCellNum; cellNum < lastCellNum; cellNum++) {
+                    Cell cell = row.getCell(cellNum);
+                    cells[cellNum] = getCellValue(cell);
+                }
+                resultData.add(cells);
+            }
+            workbook.close();
+        }
+        return resultData;
+    }
+    public static boolean rowIsEmpty(Row row) {
+        if (null == row) {
+            return true;
+        }
+        for (int c = row.getFirstCellNum(); c < row.getLastCellNum(); c++) {
+            Cell cell = row.getCell(c);
+            if (cell != null) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * 检查文件格式
+     *
+     * @param file
+     * @throws IOException
+     */
+    public static boolean checkFile(MultipartFile file) throws IOException {
+        if (null == file) {
+            return false;
+        }
+        //获得文件名
+        String fileName = file.getOriginalFilename();
+        //判断文件是否是excel文件
+        if (!fileName.endsWith("xls") && !fileName.endsWith("xlsx")) {
+            return false;
+        }
+        return true;
+    }
+}
+
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/FileUtil.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/FileUtil.java
new file mode 100644
index 0000000..a5cd2f6
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/FileUtil.java
@@ -0,0 +1,361 @@
+package cn.pluss.platform.util;
+
+import cn.pluss.platform.exception.MsgException;
+import org.apache.commons.net.util.Base64;
+import org.apache.http.entity.ContentType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.commons.CommonsMultipartFile;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
+import java.math.BigDecimal;
+import java.net.*;
+
+/**
+ * @author yuchen
+ * @Description
+ */
+public class FileUtil {
+
+    private static final Logger logger = LoggerFactory.getLogger(FileUtil.class);
+
+    /**
+     * File2byte:(file转byte). <br/>
+     *
+     * @param filePath
+     * @return
+     * @throws MalformedURLException
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    public static byte[] fileToByte(String filePath) throws Exception {
+        InputStream in = null;
+        BufferedInputStream bin = null;
+        ByteArrayOutputStream baos = null;
+        BufferedOutputStream bout = null;
+        try {
+            URL url = new URL(filePath);
+            URLConnection conn = url.openConnection();
+            in = conn.getInputStream();
+            bin = new BufferedInputStream(in);
+            baos = new ByteArrayOutputStream();
+            bout = new BufferedOutputStream(baos);
+            byte[] buffer = new byte[1024];
+            int len = bin.read(buffer);
+            while (len != -1) {
+                bout.write(buffer, 0, len);
+                len = bin.read(buffer);
+            }
+            // 刷新此输出流并强制写出所有缓冲的输出字节
+            bout.flush();
+            byte[] bytes = baos.toByteArray();
+            return bytes;
+        } finally {
+            in.close();
+            bin.close();
+            bout.close();
+        }
+    }
+
+
+    /**
+     * File2byte:(file转byte). <br/>
+     *
+     * @param filePath
+     * @return
+     * @throws MalformedURLException
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    public static byte[] File2byte2(String filePath) throws Exception {
+        byte[] buffer = null;
+        try {
+            File file = new File(filePath);
+            FileInputStream fis = new FileInputStream(file);
+            ByteArrayOutputStream bos = new ByteArrayOutputStream();
+            byte[] b = new byte[1024];
+            int n;
+            while ((n = fis.read(b)) != -1) {
+                bos.write(b, 0, n);
+            }
+            fis.close();
+            bos.close();
+            buffer = bos.toByteArray();
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return buffer;
+    }
+
+
+    /**
+     * 根据文件路径读取byte[] 数组
+     */
+    public static byte[] readFileByBytes(String filePath) throws IOException {
+        File file = new File(filePath);
+        if (!file.exists()) {
+            throw new FileNotFoundException(filePath);
+        } else {
+            ByteArrayOutputStream bos = new ByteArrayOutputStream((int) file.length());
+            BufferedInputStream in = null;
+
+            try {
+                in = new BufferedInputStream(new FileInputStream(file));
+                short bufSize = 1024;
+                byte[] buffer = new byte[bufSize];
+                int len1;
+                while (-1 != (len1 = in.read(buffer, 0, bufSize))) {
+                    bos.write(buffer, 0, len1);
+                }
+
+                byte[] var7 = bos.toByteArray();
+                return var7;
+            } finally {
+                try {
+                    if (in != null) {
+                        in.close();
+                    }
+                } catch (IOException var14) {
+                    var14.printStackTrace();
+                }
+
+                bos.close();
+            }
+        }
+    }
+
+
+    public static Integer imageSize(String imageBase64Str) {
+        if (imageBase64Str == null) {
+            throw new MsgException("图片不能为空！");
+        }
+        //1.找到等号，把等号也去掉(=用来填充base64字符串长度用)
+        Integer equalIndex = imageBase64Str.indexOf("=");
+        if (imageBase64Str.indexOf("=") > 0) {
+            imageBase64Str = imageBase64Str.substring(0, equalIndex);
+        }
+        //2.原来的字符流大小，单位为字节
+        Integer strLength = imageBase64Str.length();
+        System.out.println("imageBase64Str Length = " + strLength);
+        //3.计算后得到的文件流大小，单位为字节
+        Integer size = strLength - (strLength / 8) * 2;
+        return size;
+    }
+
+    /**
+     * byte(字节)根据长度转成kb(千字节)和mb(兆字节)
+     *
+     * @param bytes
+     * @return
+     */
+    public static boolean bytesToKB(long bytes, int maxSize) {
+        boolean flag = false;
+        BigDecimal filesize = new BigDecimal(bytes);
+        logger.error("==========filesize==============" + filesize);
+        BigDecimal megabyte = new BigDecimal(1024 * 1024);
+        logger.error("==========megabyte==============" + megabyte);
+        float returnValue = filesize.divide(megabyte, 1, BigDecimal.ROUND_DOWN).floatValue();
+        logger.error("==========returnValue1==============" + returnValue);
+        if (returnValue >= maxSize) {
+            flag = true;
+            //return (returnValue + "MB");
+            return flag;
+        }
+        BigDecimal kilobyte = new BigDecimal(1024);
+        returnValue = filesize.divide(kilobyte, 1, BigDecimal.ROUND_DOWN).floatValue();
+        logger.error("==========returnValue2==============" + returnValue);
+        return flag;
+    }
+
+    public static void url2File(String url, File file) {
+        try {
+            FileOutputStream fos = new FileOutputStream(file);
+            HttpURLConnection conn = (HttpURLConnection) new URL(url).openConnection();
+            conn.setReadTimeout(30000);
+            conn.setConnectTimeout(30000);
+            //设置应用程序要从网络连接读取数据
+            conn.setDoInput(true);
+            conn.setRequestMethod("GET");
+            if (conn.getResponseCode() == HttpURLConnection.HTTP_OK) {
+                InputStream is = conn.getInputStream();
+
+                int bytesRead = 0;
+                byte[] buffer = new byte[8192];
+                while ((bytesRead = is.read(buffer, 0, 8192)) != -1) {
+                    fos.write(buffer, 0, bytesRead);
+                }
+                fos.close();
+                is.close();
+            }
+        } catch (IOException e) {
+            throw new RuntimeException("文件下载失败", e);
+        }
+    }
+
+    public static byte[] url2Bytes(String url) throws IOException {
+        URL urlConet = new URL(url);
+        HttpURLConnection con = (HttpURLConnection) urlConet.openConnection();
+        con.setRequestMethod("GET");
+        con.setConnectTimeout(4 * 1000);
+        InputStream inStream = con.getInputStream();    //通过输入流获取图片数据
+        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+        byte[] buffer = new byte[2048];
+        int len = 0;
+        while ((len = inStream.read(buffer)) != -1) {
+            outStream.write(buffer, 0, len);
+        }
+        inStream.close();
+        byte[] data = outStream.toByteArray();
+        return data;
+    }
+
+    public static String getBase64FromInputStream(InputStream in) {
+        // 将图片文件转化为字节数组字符串，并对其进行Base64编码处理
+        byte[] data = null;
+        // 读取图片字节数组
+        try {
+            ByteArrayOutputStream swapStream = new ByteArrayOutputStream();
+            byte[] buff = new byte[100];
+            int rc = 0;
+            while ((rc = in.read(buff, 0, 100)) > 0) {
+                swapStream.write(buff, 0, rc);
+            }
+            data = swapStream.toByteArray();
+        } catch (IOException e) {
+            e.printStackTrace();
+        } finally {
+            if (in != null) {
+                try {
+                    in.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+
+        if (data == null) {
+            return null;
+        } else {
+            return new String(Base64.encodeBase64(data));
+        }
+    }
+
+    public static byte[] readInputStream(InputStream inputStream) throws IOException {
+        byte[] buffer = new byte[1024];
+        int len = 0;
+        ByteArrayOutputStream bos = new ByteArrayOutputStream();
+        while ((len = inputStream.read(buffer)) != -1) {
+            bos.write(buffer, 0, len);
+        }
+        bos.close();
+        return bos.toByteArray();
+    }
+
+    public static String getBase64FromUrl(String url) {
+        try {
+            URL urlConn = new URL(url);
+            HttpURLConnection con = (HttpURLConnection) urlConn.openConnection();
+            con.setRequestMethod("GET");
+            con.setConnectTimeout(4 * 1000);
+            InputStream inStream = con.getInputStream();
+
+            return FileUtil.getBase64FromInputStream(inStream);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    /**
+     * @param fileUrl:
+     * @param savePath:
+     * @description:根据url下载文件到指定的目录
+     * @date: 2021/8/4 16:45
+     */
+    public static void downloadFile(String fileUrl, String savePath) throws Exception {
+        File file = new File(savePath);
+        //判断文件是否存在，不存在则创建文件
+        if (!file.exists()) {
+            file.createNewFile();
+        }
+        URL url = new URL(fileUrl);
+        HttpURLConnection urlCon = (HttpURLConnection) url.openConnection();
+        urlCon.setConnectTimeout(6000);
+        urlCon.setReadTimeout(6000);
+        int code = urlCon.getResponseCode();
+        if (code != HttpURLConnection.HTTP_OK) {
+            throw new Exception("文件读取失败");
+        }
+        DataInputStream in = new DataInputStream(urlCon.getInputStream());
+        DataOutputStream out = new DataOutputStream(new FileOutputStream(savePath));
+        byte[] buffer = new byte[2048];
+        int count = 0;
+        while ((count = in.read(buffer)) > 0) {
+            out.write(buffer, 0, count);
+        }
+        try {
+            if (out != null) {
+                out.close();
+            }
+            if (in != null) {
+                in.close();
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public static void downLoad(HttpServletResponse response, String name, String filePath) throws IOException {
+        response.setContentType("application/x-download");
+        String fileName = URLEncoder.encode(name, "UTF-8");
+        response.setCharacterEncoding("UTF-8");
+        response.addHeader("Content-Disposition", "attachment;filename=" + fileName);
+        File file = new File(filePath);
+        InputStream stream = null;
+        ServletOutputStream out = null;
+        try {
+            stream = new FileInputStream(file);
+            out = response.getOutputStream();
+            byte buff[] = new byte[1024];
+            int length = 0;
+            while ((length = stream.read(buff)) > 0) {
+                out.write(buff, 0, length);
+            }
+            out.flush();
+        } catch (IOException e) {
+            e.printStackTrace();
+        } finally {
+            if (stream != null) {
+                stream.close();
+            }
+            if (out != null) {
+                out.close();
+            }
+        }
+    }
+
+    public static boolean deleteDir(File dir) {
+        if (dir.isDirectory()) {
+            String[] children = dir.list();
+            if (children == null) {
+                return dir.delete();
+            }
+
+            for (String child : children) {
+                boolean success = deleteDir(new File(dir, child));
+                if (!success) {
+                    return false;
+                }
+            }
+        }
+        // 目录此时为空，可以删除
+        return dir.delete();
+    }
+}
+
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/FixedData.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/FixedData.java
new file mode 100644
index 0000000..b6bcd56
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/FixedData.java
@@ -0,0 +1,121 @@
+package cn.pluss.platform.util;
+
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * @author SSS
+ */
+public class FixedData {
+
+    public static List<String> bankList = new ArrayList<String>() {{
+        add("工商银行");
+        add("交通银行");
+        add("招商银行");
+        add("民生银行");
+        add("中信银行");
+        add("浦发银行");
+        add("兴业银行");
+        add("光大银行");
+        add("广发银行");
+        add("平安银行");
+        add("北京银行");
+        add("华夏银行");
+        add("农业银行");
+        add("建设银行");
+        add("邮政储蓄银行");
+        add("中国银行");
+        add("宁波银行");
+        add("其他银行");
+    }};
+
+    /**
+     * 银行名称转化
+     * @param originBankName  银行名称
+     * @return  限定的银行名称
+     */
+    public static String getBankName(String originBankName) {
+        if (originBankName == null) {
+            return null;
+        }
+
+        for (String bankName : bankList) {
+            if (Objects.equals(originBankName, bankName)) {
+                return bankName;
+            }
+        }
+
+        if (StringUtils.isNotBlank(originBankName)) {
+            if (originBankName.contains("广发银行") || originBankName.contains("广东发展银行")) {
+                return "广发银行";
+            }
+
+            if (originBankName.contains("建设银行")) {
+                return "建设银行";
+            }
+
+            if (originBankName.contains("招商银行")) {
+                return "招商银行";
+            }
+
+            if (originBankName.contains("工商银行")) {
+                return "工商银行";
+            }
+
+            if (originBankName.contains("民生银行")) {
+                return "民生银行";
+            }
+
+            if (originBankName.contains("中信银行")) {
+                return "中信银行";
+            }
+
+            if (originBankName.contains("浦东发展银行")) {
+                return "浦发银行";
+            }
+
+            if (originBankName.contains("兴业银行")) {
+                return "兴业银行";
+            }
+
+            if (originBankName.contains("光大银行")) {
+                return "光大银行";
+            }
+
+            if (originBankName.contains("平安银行")) {
+                return "平安银行";
+            }
+
+            if (originBankName.contains("北京银行")) {
+                return "北京银行";
+            }
+
+            if (originBankName.contains("华夏银行")) {
+                return "华夏银行";
+            }
+
+            if (originBankName.contains("农业银行")) {
+                return "农业银行";
+            }
+
+            if (originBankName.contains("邮政")) {
+                return "邮政储蓄银行";
+            }
+
+            if (originBankName.contains("中国银行")) {
+                return "中国银行";
+            }
+
+            if (originBankName.contains("宁波银行")) {
+                return "宁波银行";
+            }
+        }
+
+
+
+        return "其他银行";
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/FtpUtils.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/FtpUtils.java
new file mode 100644
index 0000000..7bef06b
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/FtpUtils.java
@@ -0,0 +1,299 @@
+package cn.pluss.platform.util;
+
+
+import cn.pluss.platform.exception.MsgException;
+import org.apache.commons.net.ftp.FTPClient;
+import org.apache.commons.net.ftp.FTPReply;
+
+import java.io.*;
+import java.util.zip.GZIPInputStream;
+
+/**
+ * ftp文件操作工具类
+ */
+public class FtpUtils {
+
+//    // ftp服务器地址
+//    public String hostname = "119.254.93.57";
+//
+//    // ftp服务器端口号默认为21
+//    public Integer port = 22221;
+//
+//    // ftp登录账号
+//    public String username = "rscy";
+//
+//    // ftp登录密码fileName
+//    public String password = "gS4*F&o51KhA";
+//
+//    public String basePath = "onlpay/";
+
+    public static FTPClient ftpClient = null;
+
+    /**
+     * 本地字符编码
+     **/
+    private static String localCharset = "GBK";
+
+    /**
+     * FTP协议里面，规定文件名编码为iso-8859-1
+     **/
+    private static String serverCharset = "ISO-8859-1";
+
+    /**
+     * UTF-8字符编码
+     **/
+    private static final String CHARSET_UTF8 = "UTF-8";
+
+    /**
+     * OPTS UTF8字符串常量
+     **/
+    private static final String OPTS_UTF8 = "OPTS UTF8";
+
+    /**
+     * 设置缓冲区大小4M
+     **/
+    private static final int BUFFER_SIZE = 1024 * 1024 * 4;
+
+    /**
+     * 下载该目录下所有文件到本地
+     *
+     * @param ftpPath  FTP服务器上的相对路径，例如：test/123
+     * @param savePath 保存文件到本地的路径，例如：D:/test
+     * @return 成功返回true，否则返回false
+     */
+    public static boolean  downloadFiles(String prefixPath,String ftpPath, String savePath,String hostname,Integer port,String username,String password) {
+        // 登录
+        login(hostname, port, username, password);
+        if (ftpClient != null) {
+            try {
+                String path = changeEncoding(prefixPath + ftpPath);
+                // 判断是否存在该目录
+                if (!ftpClient.changeWorkingDirectory(path)) {
+                    return Boolean.FALSE;
+                }
+                ftpClient.enterLocalPassiveMode();  // 设置被动模式，开通一个端口来传输数据
+                String[] fs = ftpClient.listNames();
+                // 判断该目录下是否有文件
+                if (fs == null || fs.length == 0) {
+                    return Boolean.FALSE;
+                }
+                for (String ff : fs) {
+                    String ftpName = new String(ff.getBytes(serverCharset), localCharset);
+                    File file = new File(savePath + '/' + ftpName);
+                    try (OutputStream os = new FileOutputStream(file)) {
+                        ftpClient.retrieveFile(ff, os);
+                    } catch (Exception e) {
+                    }
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            } finally {
+                closeConnect();
+            }
+        }
+        return Boolean.TRUE;
+    }
+
+    /**
+     * 连接FTP服务器
+     *
+     * @param address  地址，如：127.0.0.1
+     * @param port     端口，如：21
+     * @param username 用户名，如：root
+     * @param password 密码，如：root
+     */
+    private static void login(String address, int port, String username, String password) {
+        ftpClient = new FTPClient();
+        try {
+            ftpClient.connect(address, port);
+            ftpClient.login(username, password);
+            ftpClient.setFileType(FTPClient.BINARY_FILE_TYPE);
+            //限制缓冲区大小
+            ftpClient.setBufferSize(BUFFER_SIZE);
+            int reply = ftpClient.getReplyCode();
+            if (!FTPReply.isPositiveCompletion(reply)) {
+                closeConnect();
+                MsgException.throwException("FTP服务器连接失败");
+            }
+        } catch (Exception e) {
+            MsgException.throwException("FTP登录失败");
+        }
+    }
+
+
+    /**
+     * FTP服务器路径编码转换
+     *
+     * @param ftpPath FTP服务器路径
+     * @return String
+     */
+    private static  String changeEncoding(String ftpPath) {
+        String directory = null;
+        try {
+            if (FTPReply.isPositiveCompletion(ftpClient.sendCommand(OPTS_UTF8, "ON"))) {
+                localCharset = CHARSET_UTF8;
+            }
+            directory = new String(ftpPath.getBytes(localCharset), serverCharset);
+        } catch (Exception e) {
+            MsgException.throwException("路径编码转换失败");
+        }
+        return directory;
+    }
+
+    /**
+     * 关闭FTP连接
+     */
+    private static void closeConnect() {
+        if (ftpClient != null && ftpClient.isConnected()) {
+            try {
+                ftpClient.logout();
+                ftpClient.disconnect();
+            } catch (IOException e) {
+//                logger.error("关闭FTP连接失败", e);
+                MsgException.throwException("关闭FTP连接失败");
+            }
+        }
+    }
+
+
+    /**
+     * 检查指定目录下是否含有指定文件
+     *
+     * @param ftpPath  FTP服务器文件相对路径，例如：test/123
+     * @param fileName 要下载的文件名，例如：test.txt
+     * @return 成功返回true，否则返回false
+     */
+    public boolean checkFileInFtp(String prefixPath,String ftpPath, String fileName,String hostname,Integer port,String username,String password) {
+        // 登录
+        login(hostname, port, username, password);
+        if (ftpClient != null) {
+            try {
+                String path = changeEncoding(prefixPath + ftpPath);
+                // 判断是否存在该目录
+                if (!ftpClient.changeWorkingDirectory(path)) {
+                    //logger.error(basePath + ftpPath + DIR_NOT_EXIST);
+                    return Boolean.FALSE;
+                }
+                ftpClient.enterLocalPassiveMode();  // 设置被动模式，开通一个端口来传输数据
+                String[] fs = ftpClient.listNames();
+                // 判断该目录下是否有文件
+                if (fs == null || fs.length == 0) {
+                    return Boolean.FALSE;
+                }
+                for (String ff : fs) {
+                    String ftpName = new String(ff.getBytes(serverCharset), localCharset);
+                    if (ftpName.equals(fileName)) {
+                        return Boolean.TRUE;
+                    }
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            } finally {
+                closeConnect();
+            }
+        }
+        return Boolean.TRUE;
+    }
+
+    /**
+     * 下载该目录下所有文件到本地 根据实际需要修改执行逻辑
+     *
+     * @param ftpPath  FTP服务器上的相对路径，例如：test/123
+     * @param savePath 保存文件到本地的路径，例如：D:/test
+     * @return 成功返回true，否则返回false
+     */
+//    public Map<String, Object> downLoadTableFile(String ftpPath, String savePath) {
+//        // 登录
+//        login(hostname, port, username, password);
+//        Map<String, Object> resultMap = new HashMap<>();
+//        if (ftpClient != null) {
+//            try {
+//                String path = changeEncoding(basePath + "/" + ftpPath);
+//                // 判断是否存在该目录
+//                if (!ftpClient.changeWorkingDirectory(path)) {
+//                    System.out.println("12================>"+basePath + "/" + ftpPath + DIR_NOT_EXIST);
+//                    //logger.error(basePath + "/" + ftpPath + DIR_NOT_EXIST);
+//                    resultMap.put("result", false);
+//                    return resultMap;
+//                }
+//                ftpClient.enterLocalPassiveMode();  // 设置被动模式，开通一个端口来传输数据
+//                String[] fs = ftpClient.listNames();
+//                // 判断该目录下是否有文件
+//                if (fs == null || fs.length == 0) {
+////                    logger.error(basePath + "/" + ftpPath + DIR_CONTAINS_NO_FILE);
+//                    System.out.println("12================>"+basePath + "/" + ftpPath + DIR_CONTAINS_NO_FILE);
+//                    resultMap.put("result", false);
+//                    return resultMap;
+//                }
+//                List<String> tableFileNameList = new ArrayList<>();
+//                //根据表名创建文件夹
+//                String tableDirName = savePath + "/" + ftpPath;
+//                File tableDirs=new File(tableDirName);
+//                if(!tableDirs.exists()){
+//                    tableDirs.mkdirs();
+//                }
+//                for (String ff : fs) {
+//                    String ftpName = new String(ff.getBytes(serverCharset), localCharset);
+//                    File file = new File(tableDirName + "/" + ftpName);
+//                    //存储文件名导入时使用
+//                    tableFileNameList.add(tableDirName + "/" + ftpName);
+//                    try (OutputStream os = new FileOutputStream(file)) {
+//                        ftpClient.retrieveFile(ff, os);
+//                    } catch (Exception e) {
+//                        System.out.println("13================>"+e.getMessage());
+////                        logger.error(e.getMessage(), e);
+//                    }
+//                }
+//                resultMap.put("fileNameList", tableFileNameList);
+//                resultMap.put("result", true);
+//                return resultMap;
+//            } catch (IOException e) {
+//                System.out.println("13================>下载文件失败");
+////                logger.error("下载文件失败", e);
+//            } finally {
+//                closeConnect();
+//            }
+//        }
+//        resultMap.put("result", false);
+//        return resultMap;
+//    }
+
+
+    /**
+     *  Ø  目录示例：/onlpay/20200701/ 线上交易对帐文件每天1个文件夹，命名方式为8位年月日
+     *  Ø  交易对帐文件tran_ROX00000000****_20200701.cvs.gz
+     *  Ø  出款预对帐文件pre_balance_ROX00000000****_20200701.txt.gz
+     *  Ø  出款终对帐文件last_balance_ROX00000000****_20200701.txt.gz
+     *  Ø  差错对账文件prev_error_ROX00000000****_20200512.cvs.gz
+     *  /onlpay/20210202/pre_balance_ROX000000002983_20210202.txt.gz
+     */
+//    public static void main(String[] args) throws IOException {
+//        FtpUtils ftp = new FtpUtils();
+//        ftp.downloadFiles("20210202/","E:\\crystal\\ftp\\file");
+//
+//        String filePath = "E:\\crystal\\ftp\\file\\";
+//        String fileName = "pre_balance_ROX000000002983_20210202.txt.gz";
+//        FileInputStream fileInputStream = new FileInputStream(filePath + fileName);
+//        //解凍する
+//        GZIPInputStream Zin = new GZIPInputStream(fileInputStream);
+//        File outdir = new File(filePath);
+//        extractFile(Zin, outdir, "aaa.txt");
+//    }
+
+    public static void extractFile(String fileName,String filePath,String outFileName) throws IOException {
+        FileInputStream fileInputStream = new FileInputStream(filePath + File.separator +fileName);
+        //解凍する
+        GZIPInputStream in = new GZIPInputStream(fileInputStream);
+        File outdir = new File(filePath);
+        byte[] buffer = new byte[BUFFER_SIZE];
+        BufferedOutputStream out = new BufferedOutputStream(
+                new FileOutputStream(new File(outdir, outFileName)));
+        int count = -1;
+        while ((count = in.read(buffer)) != -1) {
+            out.write(buffer, 0, count);
+        }
+        out.close();
+    }
+
+
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/GetuiPushUtil.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/GetuiPushUtil.java
new file mode 100644
index 0000000..7633cfd
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/GetuiPushUtil.java
@@ -0,0 +1,342 @@
+package cn.pluss.platform.util;
+
+import cn.hutool.crypto.SecureUtil;
+import cn.pluss.platform.config.GetuiConfig;
+import cn.pluss.platform.exception.MsgException;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.client.ClientHttpResponse;
+import org.springframework.web.client.ResponseErrorHandler;
+import org.springframework.web.client.RestTemplate;
+
+import java.io.IOException;
+import java.util.*;
+
+/**
+ * 个推按照cid推送,
+ * <b>没有区分安卓和iOS</b>
+ */
+@Slf4j
+public class GetuiPushUtil implements IPush {
+
+    private static IPush instance;
+
+    public static IPush getInstance() {
+        if (instance == null) {
+            instance = new GetuiPushUtil();
+        }
+
+        return instance;
+    }
+
+    private static RestTemplate restTemplate;
+
+    private static RestTemplate getRestTemplate() {
+        if (restTemplate == null) {
+            restTemplate = new RestTemplate();
+            ResponseErrorHandler responseErrorHandler = new ResponseErrorHandler() {
+                @Override
+                public boolean hasError(ClientHttpResponse response) throws IOException {
+                    return false;
+                }
+
+                @Override
+                public void handleError(ClientHttpResponse response) throws IOException {
+                }
+            };
+            restTemplate.setErrorHandler(responseErrorHandler);
+        }
+
+        return restTemplate;
+    }
+
+    public void init() {
+        // token初始化
+        if (GetuiConfig.token == null) {
+            initToken();
+        }
+
+        // token超时初始化
+        if (System.currentTimeMillis() + 1000 > GetuiConfig.expireTime) {
+            initToken();
+        }
+    }
+
+    private static void initToken() {
+        String authUrl = "https://restapi.getui.com/v2/lcpLtzlX1IAVVHaMzO7rI9/auth";
+
+        Map<String, Object> map = new HashMap<>();
+        long currentTimeMillis = System.currentTimeMillis();
+        System.out.println(currentTimeMillis);
+        map.put("timestamp", currentTimeMillis);
+        map.put("appkey", "qH8axt3RQ97lSPA1nsol1");
+
+        String sign = SecureUtil.sha256("qH8axt3RQ97lSPA1nsol1" + currentTimeMillis + "5QOwOzksge8R0ikThr0Ma1");
+        map.put("sign", sign);
+
+        JSONObject resp = getRestTemplate().postForObject(authUrl, map, JSONObject.class);
+        if (resp == null) {
+            log.error("个推获取授权接口请求异常");
+            throw new MsgException("个推获取授权接口请求异常");
+        }
+
+        if (resp.getIntValue("code") != 0) {
+            log.error("个推获取授权接口请求异常: {}", resp.getString("msg"));
+            throw new MsgException(resp.getString("msg"));
+        }
+
+        JSONObject data = resp.getJSONObject("data");
+        GetuiConfig.token = data.getString("token");
+        GetuiConfig.expireTime = data.getLong("expire_time");
+    }
+
+    @Override
+    public void sendAndroidByAlias(List<String> cidList, String notificationTitle, String msgContent, String extrasParam) {
+        init();
+        // 创建消息
+        HttpHeaders headers = new HttpHeaders();
+        headers.add("token", GetuiConfig.token);
+
+        JSONObject param1 = new JSONObject();
+        param1.fluentPut("request_id", UUID.randomUUID().toString().replace("-", ""))
+                .fluentPut("group_name", UUID.randomUUID().toString().replace("-", ""))
+                .fluentPut("settings", new JSONObject().fluentPut("ttl", 3600000));
+
+        JSONObject extra = new JSONObject();
+        extra.put("url", extrasParam);
+        extra.put("content", msgContent);
+        extra.put("title", notificationTitle);
+
+        JSONObject notification1 = new JSONObject();
+        notification1.put("title", notificationTitle);
+        notification1.put("body", msgContent);
+        notification1.put("click_type", "payload");
+        notification1.put("payload", extra.toString());
+        param1.fluentPut("push_message", new JSONObject().fluentPut("notification", notification1));
+
+        JSONObject pushChannel = new JSONObject();
+        JSONObject iosChannel = new JSONObject();
+        iosChannel.put("type", "notify");
+        iosChannel.put("payload", extra.toString());
+
+        JSONObject aps = new JSONObject();
+        aps.put("alert", new JSONObject().fluentPut("title", notificationTitle).fluentPut("body", msgContent));
+        aps.put("content-available", 0);
+        iosChannel.put("aps", aps);
+        iosChannel.put("auto_badge", "+1");
+        pushChannel.put("ios", iosChannel);
+        param1.put("push_channel", pushChannel);
+
+        HttpEntity<JSONObject> httpEntity = new HttpEntity<>(param1, headers);
+        JSONObject resp = getRestTemplate().postForObject(GetuiConfig.createMsg, httpEntity, JSONObject.class);
+        if (resp == null) {
+            log.error("个推推送接口请求异常");
+            // throw new MsgException("个推推送接口请求异常");
+            return;
+        }
+        log.error("resp: {}", resp);
+
+        if (resp.getIntValue("code") != 0) {
+            log.error("个推推送接口请求异常: {}", resp.getString("msg"));
+            // throw new MsgException(resp.getString("msg"));
+            return;
+        }
+
+        String taskId = resp.getJSONObject("data").getString("taskid");
+
+        JSONObject param = new JSONObject();
+        param.put("is_async", true);
+        param.put("audience", new JSONObject().fluentPut("cid", cidList));
+        param.put("taskid", taskId);
+
+        HttpEntity<JSONObject> httpEntity2 = new HttpEntity<>(param, headers);
+        JSONObject resp2 = getRestTemplate().postForObject(GetuiConfig.listCid, httpEntity2, JSONObject.class);
+        if (resp2 == null) {
+            log.error("个推推送接口请求异常");
+            // throw new MsgException("个推推送接口请求异常");
+            return;
+        }
+        log.error("resp2: {}", resp2);
+
+        if (resp2.getIntValue("code") != 0) {
+            log.error("个推推送接口请求异常: {}", resp.getString("msg"));
+            // throw new MsgException(resp.getString("msg"));
+        }
+    }
+
+    @Override
+    public void sendIOSByAlias(List<String> cidList, String notificationTitle, String msgContent, String extrasParam) {
+        init();
+
+        // 创建消息
+        HttpHeaders headers = new HttpHeaders();
+        headers.add("token", GetuiConfig.token);
+
+        JSONObject param1 = new JSONObject();
+        param1.fluentPut("request_id", UUID.randomUUID().toString().replace("-", ""))
+                .fluentPut("group_name", UUID.randomUUID().toString().replace("-", ""))
+                .fluentPut("settings", new JSONObject().fluentPut("ttl", 3600000));
+
+        JSONObject notification1 = new JSONObject();
+        notification1.put("title", notificationTitle);
+        notification1.put("body", msgContent);
+        notification1.put("click_type", "payload");
+        notification1.put("payload", extrasParam);
+        param1.fluentPut("push_message", new JSONObject().fluentPut("notification", notification1));
+
+        HttpEntity<JSONObject> httpEntity = new HttpEntity<>(param1, headers);
+        JSONObject resp = getRestTemplate().postForObject(GetuiConfig.createMsg, httpEntity, JSONObject.class);
+        if (resp == null) {
+            log.error("个推推送接口请求异常");
+            // throw new MsgException("个推推送接口请求异常");
+            return;
+        }
+        log.error("resp: {}", resp);
+
+        if (resp.getIntValue("code") != 0) {
+            log.error("个推推送接口请求异常: {}", resp.getString("msg"));
+            // throw new MsgException(resp.getString("msg"));
+            return;
+        }
+
+        String taskId = resp.getJSONObject("data").getString("taskid");
+
+        JSONObject param = new JSONObject();
+        param.put("is_async", true);
+        param.put("audience", new JSONObject().fluentPut("cid", cidList));
+        param.put("taskid", taskId);
+
+        HttpEntity<JSONObject> httpEntity2 = new HttpEntity<>(param, headers);
+        JSONObject resp2 = getRestTemplate().postForObject(GetuiConfig.listCid, httpEntity2, JSONObject.class);
+        if (resp2 == null) {
+            log.error("个推推送接口请求异常");
+            // throw new MsgException("个推推送接口请求异常");
+            return;
+        }
+        log.error("resp2: {}", resp2);
+
+        if (resp2.getIntValue("code") != 0) {
+            log.error("个推推送接口请求异常: {}", resp.getString("msg"));
+            // throw new MsgException(resp.getString("msg"));
+        }
+    }
+
+    @Override
+    public void sendAllPlatByAlias(List<String> alias, String notificationTitle, String msgContent, String extrasParam) {
+        sendAndroidByAlias(alias, notificationTitle, msgContent, extrasParam);
+    }
+
+    @Override
+    public void sendIOSAll(String notificationTitle, String msgContent, String extrasParam) {
+        init();
+        HttpHeaders headers = new HttpHeaders();
+        headers.add("token", GetuiConfig.token);
+
+        JSONObject param = new JSONObject();
+        param.put("is_async", true);
+        param.put("request_id", UUID.randomUUID().toString().replace("-", ""));
+        param.put("settings", new JSONObject().fluentPut("ttl", 3600000));
+
+        JSONObject tag = new JSONObject()
+                .fluentPut("key", "phone_type")
+                .fluentPut("values", new String[]{"android"})
+                .fluentPut("opt_type", "and");
+
+        param.put("audience", new JSONArray().fluentAdd(tag));
+
+        JSONObject notification = new JSONObject();
+        notification.put("title", notificationTitle);
+        notification.put("body", msgContent);
+        notification.put("click_type", "payload");
+        notification.put("payload", extrasParam);
+        param.put("push_message", notification);
+
+        HttpEntity<JSONObject> httpEntity = new HttpEntity<>(param, headers);
+        JSONObject resp = getRestTemplate().postForObject(GetuiConfig.all, httpEntity, JSONObject.class);
+        if (resp == null) {
+            log.error("个推推送接口请求异常");
+            // throw new MsgException("个推推送接口请求异常");
+            return;
+        }
+
+        if (resp.getIntValue("code") != 0) {
+            log.error("个推推送接口请求异常: {}", resp.getString("msg"));
+            // throw new MsgException(resp.getString("msg"));
+        }
+    }
+
+    @Override
+    public void sendAndroidAll(String notificationTitle, String msgContent, String extrasParam) {
+        init();
+        HttpHeaders headers = new HttpHeaders();
+        headers.add("token", GetuiConfig.token);
+
+        JSONObject param = new JSONObject();
+        param.put("is_async", true);
+        param.put("request_id", UUID.randomUUID().toString().replace("-", ""));
+        param.put("settings", new JSONObject().fluentPut("ttl", 3600000));
+
+        JSONObject tag = new JSONObject()
+                .fluentPut("key", "phone_type")
+                .fluentPut("values", new String[]{"ios"})
+                .fluentPut("opt_type", "and");
+
+        param.put("audience", new JSONArray().fluentAdd(tag));
+
+        JSONObject notification = new JSONObject();
+        notification.put("title", notificationTitle);
+        notification.put("body", msgContent);
+        notification.put("click_type", "payload");
+        notification.put("payload", extrasParam);
+        param.put("push_message", notification);
+
+        HttpEntity<JSONObject> httpEntity = new HttpEntity<>(param, headers);
+        JSONObject resp = getRestTemplate().postForObject(GetuiConfig.all, httpEntity, JSONObject.class);
+        if (resp == null) {
+            log.error("个推推送接口请求异常");
+            // throw new MsgException("个推推送接口请求异常");
+            return;
+        }
+
+        if (resp.getIntValue("code") != 0) {
+            log.error("个推推送接口请求异常: {}", resp.getString("msg"));
+            // throw new MsgException(resp.getString("msg"));
+        }
+    }
+
+    @Override
+    public void sendAllPlatAll(String notificationTitle, String msgContent, String extrasParam) {
+        init();
+        HttpHeaders headers = new HttpHeaders();
+        headers.add("token", GetuiConfig.token);
+
+        JSONObject param = new JSONObject();
+        param.put("is_async", true);
+        param.put("request_id", UUID.randomUUID().toString().replace("-", ""));
+        param.put("settings", new JSONObject().fluentPut("ttl", 3600000));
+        param.put("audience", "all");
+
+        JSONObject notification = new JSONObject();
+        notification.put("title", notificationTitle);
+        notification.put("body", msgContent);
+        notification.put("click_type", "payload");
+        notification.put("payload", extrasParam);
+        param.put("push_message", notification);
+
+
+        HttpEntity<JSONObject> httpEntity = new HttpEntity<>(param, headers);
+        JSONObject resp = getRestTemplate().postForObject(GetuiConfig.all, httpEntity, JSONObject.class);
+        if (resp == null) {
+            log.error("个推推送接口请求异常");
+            throw new MsgException("个推推送接口请求异常");
+        }
+
+        if (resp.getIntValue("code") != 0) {
+            log.error("个推推送接口请求异常: {}", resp.getString("msg"));
+            throw new MsgException(resp.getString("msg"));
+        }
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/HMACSHAUtil.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/HMACSHAUtil.java
new file mode 100644
index 0000000..e85ba04
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/HMACSHAUtil.java
@@ -0,0 +1,32 @@
+package cn.pluss.platform.util;
+
+import javax.crypto.Mac;
+import javax.crypto.spec.SecretKeySpec;
+
+public class HMACSHAUtil {
+
+	/**
+     * 生成 HMACSHA256
+     * @param data 待处理数据
+     * @param key 密钥
+     * @return 加密结果
+     * @throws Exception
+     */
+    public static String getHMACSHA256(String data, String key){
+        Mac sha256_HMAC;
+        byte[] array = null ;
+        try {
+            sha256_HMAC = Mac.getInstance("HmacSHA256");
+            SecretKeySpec secret_key = new SecretKeySpec(key.getBytes("UTF-8"), "HmacSHA256");
+            sha256_HMAC.init(secret_key);
+            array = sha256_HMAC.doFinal(data.getBytes("UTF-8"));
+        } catch (Exception e) {
+            return "";
+        }
+        StringBuilder sb = new StringBuilder();
+        for (byte item : array) {
+            sb.append(Integer.toHexString((item & 0xFF) | 0x100).substring(1, 3));
+        }
+        return sb.toString().toUpperCase();
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/HttpResult.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/HttpResult.java
new file mode 100644
index 0000000..ebb2e6a
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/HttpResult.java
@@ -0,0 +1,38 @@
+package cn.pluss.platform.util;
+
+public class HttpResult {
+	
+		// 响应的状态码
+		private int code;
+
+		// 响应的响应体
+		private String body;
+		
+		public int getCode() {
+			return code;
+		}
+
+		public void setCode(int code) {
+			this.code = code;
+		}
+
+		public String getBody() {
+			return body;
+		}
+
+		public void setBody(String body) {
+			this.body = body;
+		}
+	
+		public HttpResult(int code,String body) {
+			this.code=code;
+			this.body=body;
+		}
+
+		@Override
+		public String toString() {
+			return "HttpResult [code=" + code + ", body=" + body + "]";
+		}
+		
+		
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/HttpUtil.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/HttpUtil.java
new file mode 100644
index 0000000..194c6f3
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/HttpUtil.java
@@ -0,0 +1,724 @@
+package cn.pluss.platform.util;
+
+import cn.pluss.platform.wechat.MyX509TrustManager;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import org.apache.http.*;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.ResponseHandler;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.*;
+import org.apache.http.client.utils.URIBuilder;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.BasicResponseHandler;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.util.EntityUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSocketFactory;
+import javax.net.ssl.TrustManager;
+import java.io.*;
+import java.net.*;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+
+public class HttpUtil {
+
+    private static final Logger logger = LoggerFactory.getLogger(HttpUtil.class);
+
+//	private static CloseableHttpClient httpClient;
+//	
+//	 public void APIService() {
+//	        // 1 创建HttpClinet，相当于打开浏览器
+//	        this.httpClient = HttpClients.createDefault();
+//	 }
+
+
+    /**
+     * 带参数的get请求
+     *
+     * @param url
+     * @param map
+     * @return
+     * @throws Exception
+     */
+    public static HttpResult doGet(String url, Map<String, Object> map) throws Exception {
+
+        // 声明URIBuilder
+        URIBuilder uriBuilder = new URIBuilder(url);
+
+        // 判断参数map是否为非空
+        if (map != null) {
+            // 遍历参数
+            for (Map.Entry<String, Object> entry : map.entrySet()) {
+                // 设置参数
+                uriBuilder.setParameter(entry.getKey(), entry.getValue().toString());
+            }
+        }
+
+        // 2 创建httpGet对象，相当于设置url请求地址
+        HttpGet httpGet = new HttpGet(uriBuilder.build());
+
+        // 3 使用HttpClient执行httpGet，相当于按回车，发起请求
+
+        CloseableHttpClient httpClient = HttpClients.createDefault();
+        CloseableHttpResponse response = httpClient.execute(httpGet);
+
+        // 4 解析结果，封装返回对象httpResult，相当于显示相应的结果
+        // 状态码
+        // response.getStatusLine().getStatusCode();
+        // 响应体，字符串，如果response.getEntity()为空，下面这个代码会报错,所以解析之前要做非空的判断
+        // EntityUtils.toString(response.getEntity(), "UTF-8");
+        HttpResult httpResult = null;
+        // 解析数据封装HttpResult
+        if (response.getEntity() != null) {
+
+            httpResult = new HttpResult(response.getStatusLine().getStatusCode(),
+                    EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8));
+        } else {
+            httpResult = new HttpResult(response.getStatusLine().getStatusCode(), "");
+        }
+
+        // 返回
+        return httpResult;
+    }
+
+    /**
+     * 带参数的get请求
+     *
+     * @param url
+     * @param map
+     * @return
+     * @throws Exception
+     */
+    public static HttpResult doGet(String url, Map<String, String> headers, Map<String, Object> map) throws Exception {
+
+        // 声明URIBuilder
+        URIBuilder uriBuilder = new URIBuilder(url);
+        // 判断参数map是否为非空
+        if (map != null) {
+            // 遍历参数
+            for (Map.Entry<String, Object> entry : map.entrySet()) {
+                // 设置参数
+                uriBuilder.setParameter(entry.getKey(), entry.getValue().toString());
+            }
+        }
+
+        // 2 创建httpGet对象，相当于设置url请求地址
+        HttpGet httpGet = new HttpGet(uriBuilder.build());
+
+        // 判断参数headers是否为非空
+        if (headers != null) {
+            // 遍历参数
+            for (Map.Entry<String, String> entry : headers.entrySet()) {
+                // 设置参数
+                httpGet.addHeader(entry.getKey(), entry.getValue());
+            }
+        }
+
+        // 3 使用HttpClient执行httpGet，相当于按回车，发起请求
+
+        CloseableHttpClient httpClient = HttpClients.createDefault();
+        CloseableHttpResponse response = httpClient.execute(httpGet);
+
+        // 4 解析结果，封装返回对象httpResult，相当于显示相应的结果
+        // 状态码
+        // response.getStatusLine().getStatusCode();
+        // 响应体，字符串，如果response.getEntity()为空，下面这个代码会报错,所以解析之前要做非空的判断
+        // EntityUtils.toString(response.getEntity(), "UTF-8");
+        HttpResult httpResult = null;
+        // 解析数据封装HttpResult
+        if (response.getEntity() != null) {
+
+            httpResult = new HttpResult(response.getStatusLine().getStatusCode(),
+                    EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8));
+        } else {
+            httpResult = new HttpResult(response.getStatusLine().getStatusCode(), "");
+        }
+
+        // 返回
+        return httpResult;
+    }
+
+    /**
+     * 不带参数的get请求
+     *
+     * @param url
+     * @return
+     * @throws Exception
+     */
+    public HttpResult doGet(String url) throws Exception {
+        return doGet(url, null);
+    }
+
+    /**
+     * 带参数的post请求
+     *
+     * @param url
+     * @param map
+     * @return
+     * @throws Exception
+     */
+    public static HttpResult doPost(String url, Map<String, Object> map) throws Exception {
+        // 声明httpPost请求
+        HttpPost httpPost = new HttpPost(url);
+        httpPost.addHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_FORM_URLENCODED_VALUE);
+        // 判断map不为空
+        if (map != null) {
+            // 声明存放参数的List集合
+            List<NameValuePair> params = new ArrayList<>();
+
+            // 遍历map，设置参数到list中
+            for (Map.Entry<String, Object> entry : map.entrySet()) {
+                params.add(new BasicNameValuePair(entry.getKey(), entry.getValue().toString()));
+            }
+
+            // 创建form表单对象
+            UrlEncodedFormEntity formEntity = new UrlEncodedFormEntity(params, StandardCharsets.UTF_8);
+
+            // 把表单对象设置到httpPost中
+            httpPost.setEntity(formEntity);
+        }
+
+        // 使用HttpClient发起请求，返回response
+        CloseableHttpClient httpClient = HttpClients.createDefault();
+        CloseableHttpResponse response = httpClient.execute(httpPost);
+
+        // 解析response封装返回对象httpResult
+        HttpResult httpResult = null;
+        if (response.getEntity() != null) {
+            httpResult = new HttpResult(response.getStatusLine().getStatusCode(),
+                    EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8));
+        } else {
+            httpResult = new HttpResult(response.getStatusLine().getStatusCode(), "");
+        }
+
+        // 返回结果
+        return httpResult;
+    }
+
+
+    public static String HttpPostWithJson(String url, String json) {
+        String returnValue = "这是默认返回值，接口调用失败";
+        CloseableHttpClient httpClient = HttpClients.createDefault();
+        ResponseHandler<String> responseHandler = new BasicResponseHandler();
+        try {
+            //第一步：创建HttpClient对象
+            httpClient = HttpClients.createDefault();
+
+            //第二步：创建httpPost对象
+            HttpPost httpPost = new HttpPost(url);
+
+            //第三步：给httpPost设置JSON格式的参数
+            StringEntity requestEntity = new StringEntity(json, StandardCharsets.UTF_8);
+            requestEntity.setContentEncoding("UTF-8");
+            httpPost.setHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE);
+            httpPost.setEntity(requestEntity);
+
+            //第四步：发送HttpPost请求，获取返回值
+            returnValue = httpClient.execute(httpPost, responseHandler); //调接口获取返回值时，必须用此方法
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                httpClient.close();
+            } catch (IOException e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+            }
+        }
+        //第五步：处理返回值
+        return returnValue;
+    }
+
+
+    /**
+     * 不带参数的post请求
+     *
+     * @param url
+     * @return
+     * @throws Exception
+     */
+    public static HttpResult doPost(String url) throws Exception {
+        return doPost(url, null);
+    }
+
+    /**
+     * 带参数的Put请求
+     *
+     * @param url
+     * @param map
+     * @return
+     * @throws Exception
+     */
+    public HttpResult doPut(String url, Map<String, Object> map) throws Exception {
+        // 声明httpPost请求
+        HttpPut httpPut = new HttpPut(url);
+
+        // 判断map不为空
+        if (map != null) {
+            // 声明存放参数的List集合
+            List<NameValuePair> params = new ArrayList<>();
+
+            // 遍历map，设置参数到list中
+            for (Map.Entry<String, Object> entry : map.entrySet()) {
+                params.add(new BasicNameValuePair(entry.getKey(), entry.getValue().toString()));
+            }
+
+            // 创建form表单对象
+            UrlEncodedFormEntity formEntity = new UrlEncodedFormEntity(params, StandardCharsets.UTF_8);
+
+            // 把表单对象设置到httpPost中
+            httpPut.setEntity(formEntity);
+        }
+
+        // 使用HttpClient发起请求，返回response
+        CloseableHttpClient httpClient = HttpClients.createDefault();
+        CloseableHttpResponse response = httpClient.execute(httpPut);
+
+        // 解析response封装返回对象httpResult
+        HttpResult httpResult = null;
+        if (response.getEntity() != null) {
+            httpResult = new HttpResult(response.getStatusLine().getStatusCode(),
+                    EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8));
+        } else {
+            httpResult = new HttpResult(response.getStatusLine().getStatusCode(), "");
+        }
+
+        // 返回结果
+        return httpResult;
+    }
+
+    /**
+     * 带参数的Delete请求
+     *
+     * @param url
+     * @param map
+     * @return
+     * @throws Exception
+     */
+    public HttpResult doDelete(String url, Map<String, Object> map) throws Exception {
+
+        // 声明URIBuilder
+        URIBuilder uriBuilder = new URIBuilder(url);
+
+        // 判断参数map是否为非空
+        if (map != null) {
+            // 遍历参数
+            for (Map.Entry<String, Object> entry : map.entrySet()) {
+                // 设置参数
+                uriBuilder.setParameter(entry.getKey(), entry.getValue().toString());
+            }
+        }
+
+        // 2 创建httpGet对象，相当于设置url请求地址
+        HttpDelete httpDelete = new HttpDelete(uriBuilder.build());
+
+        // 3 使用HttpClient执行httpGet，相当于按回车，发起请求
+        CloseableHttpClient httpClient = HttpClients.createDefault();
+        CloseableHttpResponse response = httpClient.execute(httpDelete);
+
+        // 4 解析结果，封装返回对象httpResult，相当于显示相应的结果
+        // 状态码
+        // response.getStatusLine().getStatusCode();
+        // 响应体，字符串，如果response.getEntity()为空，下面这个代码会报错,所以解析之前要做非空的判断
+        // EntityUtils.toString(response.getEntity(), "UTF-8");
+        HttpResult httpResult = null;
+        // 解析数据封装HttpResult
+        if (response.getEntity() != null) {
+            httpResult = new HttpResult(response.getStatusLine().getStatusCode(),
+                    EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8));
+        } else {
+            httpResult = new HttpResult(response.getStatusLine().getStatusCode(), "");
+        }
+
+        // 返回
+        return httpResult;
+    }
+
+    public static String httpPostWithJson(String url, String json) {
+        String returnValue = "接口调用失败";
+        CloseableHttpClient httpClient = HttpClients.createDefault();
+        ResponseHandler<String> responseHandler = new BasicResponseHandler();
+        try {
+            //第一步：创建HttpClient对象
+            httpClient = HttpClients.createDefault();
+
+            //第二步：创建httpPost对象
+            HttpPost httpPost = new HttpPost(url);
+
+            //第三步：给httpPost设置JSON格式的参数
+            StringEntity requestEntity = new StringEntity(json, "utf-8");
+            requestEntity.setContentEncoding("UTF-8");
+            httpPost.setHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE);
+            httpPost.setEntity(requestEntity);
+
+            //第四步：发送HttpPost请求，获取返回值
+            returnValue = httpClient.execute(httpPost, responseHandler); //调接口获取返回值时，必须用此方法
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                httpClient.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        //第五步：处理返回值
+        return returnValue;
+    }
+
+
+    public static String sendPost(String url, String param) {
+        PrintWriter out = null;
+        BufferedReader in = null;
+        String result = "";
+        try {
+            URL realUrl = new URL(url);
+            // 打开和URL之间的连接
+            URLConnection conn = realUrl.openConnection();
+            // 设置通用的请求属性
+            conn.setRequestProperty("accept", "*/*");
+            conn.setRequestProperty("connection", "Keep-Alive");
+            conn.setRequestProperty("user-agent",
+                    "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)");
+            // 发送POST请求必须设置如下两行
+            conn.setDoOutput(true);
+            conn.setDoInput(true);
+            // 获取URLConnection对象对应的输出流
+            out = new PrintWriter(conn.getOutputStream());
+            // 发送请求参数
+            out.print(param);
+            // flush输出流的缓冲
+            out.flush();
+            // 定义BufferedReader输入流来读取URL的响应
+            in = new BufferedReader(
+                    new InputStreamReader(conn.getInputStream()));
+            String line;
+            while ((line = in.readLine()) != null) {
+                result += line;
+            }
+        } catch (Exception e) {
+            System.out.println("发送 POST 请求出现异常！" + e);
+            e.printStackTrace();
+        }
+        //使用finally块来关闭输出流、输入流
+        finally {
+            try {
+                if (out != null) {
+                    out.close();
+                }
+                if (in != null) {
+                    in.close();
+                }
+            } catch (IOException ex) {
+                ex.printStackTrace();
+            }
+        }
+        return result;
+    }
+
+
+    /**
+     * post请求(用于key-value格式的参数)
+     *
+     * @param url
+     * @param params
+     * @return
+     */
+    public static String doPost2(String url, Map<String, Object> params) {
+
+        BufferedReader in = null;
+        try {
+            HttpClientBuilder httpClientBuilder = HttpClientBuilder.create();
+            // 定义HttpClient
+            HttpClient client = httpClientBuilder.build();
+            // 实例化HTTP方法
+            HttpPost request = new HttpPost();
+            request.setURI(new URI(url));
+
+            //设置参数
+            List<NameValuePair> nvps = new ArrayList<>();
+            for (String name : params.keySet()) {
+                String value = String.valueOf(params.get(name));
+                nvps.add(new BasicNameValuePair(name, value));
+
+                //System.out.println(name +"-"+value);
+            }
+            request.setEntity(new UrlEncodedFormEntity(nvps, StandardCharsets.UTF_8));
+
+            HttpResponse response = client.execute(request);
+            int code = response.getStatusLine().getStatusCode();
+            if (code == 200) {    //请求成功
+                in = new BufferedReader(new InputStreamReader(response.getEntity()
+                        .getContent(), StandardCharsets.UTF_8));
+                StringBuilder sb = new StringBuilder();
+                String line = "";
+                String NL = System.getProperty("line.separator");
+                while ((line = in.readLine()) != null) {
+                    sb.append(line).append(NL);
+                }
+
+                in.close();
+
+                return sb.toString();
+            } else {    //
+                System.out.println("状态码：" + code);
+                return null;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+
+            return null;
+        }
+    }
+
+    public static JSONObject httpRequest(String requestUrl, String requestMethod, String outputStr)
+    {
+        JSONObject jsonObject = null;
+        StringBuffer buffer = new StringBuffer();
+        try
+        {
+            // 创建SSLContext对象，并使用我们指定的信任管理器初始化
+            TrustManager[] tm = { new MyX509TrustManager() };
+            SSLContext sslContext = SSLContext.getInstance("SSL", "SunJSSE");
+            sslContext.init(null, tm, new java.security.SecureRandom());
+
+            // 从上述SSLContext对象中得到SSLSocketFactory对象
+            SSLSocketFactory ssf = sslContext.getSocketFactory();
+
+            URL url = new URL(requestUrl);
+            HttpsURLConnection httpUrlConn = (HttpsURLConnection) url.openConnection();
+            httpUrlConn.setSSLSocketFactory(ssf);
+
+            httpUrlConn.setDoOutput(true);
+            httpUrlConn.setDoInput(true);
+            httpUrlConn.setUseCaches(false);
+
+            // 设置请求方式（GET/POST）
+            httpUrlConn.setRequestMethod(requestMethod);
+
+            if ("GET".equalsIgnoreCase(requestMethod))
+                httpUrlConn.connect();
+
+            // 当有数据需要提交时
+            if (null != outputStr)
+            {
+                OutputStream outputStream = httpUrlConn.getOutputStream();
+                // 注意编码格式，防止中文乱码
+                outputStream.write(outputStr.getBytes("UTF-8"));
+                outputStream.close();
+            }
+
+            // 将返回的输入流转换成字符串
+            InputStream inputStream = httpUrlConn.getInputStream();
+            InputStreamReader inputStreamReader = new InputStreamReader(inputStream, "utf-8");
+            BufferedReader bufferedReader = new BufferedReader(inputStreamReader);
+
+            String str = null;
+            while ((str = bufferedReader.readLine()) != null)
+            {
+                buffer.append(str);
+            }
+            bufferedReader.close();
+            inputStreamReader.close();
+            // 释放资源
+            inputStream.close();
+            inputStream = null;
+            httpUrlConn.disconnect();
+            jsonObject = JSONObject.parseObject(buffer.toString());
+        }
+        catch (ConnectException ce)
+        {
+            System.out.println("Weixin server connection timed out.");
+        }
+        catch (Exception e)
+        {
+            System.out.println("https request error:{}"+ e);
+        }
+        return jsonObject;
+    }
+
+    /**
+     * post请求（用于请求json格式的参数）
+     *
+     * @param url
+     * @param params
+     * @return
+     */
+    public static String doPostJson(String url, String params) throws Exception {
+
+        CloseableHttpClient httpclient = HttpClients.createDefault();
+        HttpPost httpPost = new HttpPost(url);// 创建httpPost
+        httpPost.setHeader("Accept", MediaType.APPLICATION_JSON_VALUE);
+        httpPost.setHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE);
+        String charSet = "UTF-8";
+        StringEntity entity = new StringEntity(params, charSet);
+        httpPost.setEntity(entity);
+        CloseableHttpResponse response = null;
+
+        try {
+
+            response = httpclient.execute(httpPost);
+            StatusLine status = response.getStatusLine();
+            int state = status.getStatusCode();
+            if (state == HttpStatus.SC_OK) {
+                HttpEntity responseEntity = response.getEntity();
+                return EntityUtils.toString(responseEntity);
+            } else {
+                System.out.println("请求返回:" + state + "(" + url + ")");
+            }
+        } finally {
+            if (response != null) {
+                try {
+                    response.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+            try {
+                httpclient.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return null;
+    }
+
+
+    public static String baiduGET(String url) {
+        try {
+            URL realUrl = new URL(url);
+            // 打开和URL之间的连接
+            HttpURLConnection connection = (HttpURLConnection) realUrl.openConnection();
+            connection.setRequestMethod("GET");
+            connection.connect();
+            // 获取所有响应头字段
+            Map<String, List<String>> map = connection.getHeaderFields();
+            // 遍历所有的响应头字段
+//            for (String key : map.keySet()) {
+//                System.err.println(key + "--->" + map.get(key));
+//            }
+            // 定义 BufferedReader输入流来读取URL的响应
+            BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream()));
+            StringBuilder result = new StringBuilder();
+            String line;
+            while ((line = in.readLine()) != null) {
+                result.append(line);
+            }
+            /*
+             * 返回结果示例
+             */
+            JSONObject jsonObject = JSON.parseObject(result.toString());
+            String access_token = jsonObject.getString("access_token");
+            System.err.println("access_token:====" + access_token);
+            return access_token;
+        } catch (Exception e) {
+            System.err.print("获取token失败！");
+            e.printStackTrace(System.err);
+        }
+        return null;
+    }
+
+    public static String baiduPOST(String requestUrl, String accessToken, String params) throws Exception {
+        return baiduPOST(requestUrl, accessToken, MediaType.APPLICATION_FORM_URLENCODED_VALUE, params);
+    }
+
+    public static String baiduPOST(String requestUrl, String accessToken, String contentType, String params) throws Exception {
+        String encoding = "UTF-8";
+        if (requestUrl.contains("nlp")) {
+            encoding = "GBK";
+        }
+        return baiduPOST(requestUrl, accessToken, contentType, params, encoding);
+    }
+
+    private static String baiduPOST(String requestUrl, String accessToken, String contentType, String params,
+                                    String encoding) throws Exception {
+        String url = requestUrl + "?access_token=" + accessToken;
+        return postGeneralUrl(url, contentType, params, encoding);
+    }
+
+    public static String postGeneralUrl(String generalUrl, String contentType, String params, String encoding)
+            throws Exception {
+        URL url = new URL(generalUrl);
+        // 打开和URL之间的连接
+        HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+        connection.setRequestMethod("POST");
+        // 设置通用的请求属性
+        connection.setRequestProperty(HttpHeaders.CONTENT_TYPE, contentType);
+        connection.setRequestProperty("Connection", "Keep-Alive");
+        connection.setUseCaches(false);
+        connection.setDoOutput(true);
+        connection.setDoInput(true);
+        // 得到请求的输出流对象
+        DataOutputStream out = new DataOutputStream(connection.getOutputStream());
+        out.write(params.getBytes(encoding));
+        out.flush();
+        out.close();
+
+        // 建立实际的连接
+        connection.connect();
+        // 获取所有响应头字段
+        Map<String, List<String>> headers = connection.getHeaderFields();
+        // 遍历所有的响应头字段
+        for (String key : headers.keySet()) {
+            System.err.println(key + "--->" + headers.get(key));
+        }
+        // 定义 BufferedReader输入流来读取URL的响应
+        BufferedReader in;
+        in = new BufferedReader(
+                new InputStreamReader(connection.getInputStream(), encoding));
+        StringBuilder result = new StringBuilder();
+        String getLine;
+        while ((getLine = in.readLine()) != null) {
+            result.append(getLine);
+        }
+        in.close();
+        System.err.println("result:" + result);
+        return result.toString();
+    }
+
+
+    public static String GET(String url) {
+        try {
+            URL realUrl = new URL(url);
+            // 打开和URL之间的连接
+            HttpURLConnection connection = (HttpURLConnection) realUrl.openConnection();
+            connection.setRequestMethod("GET");
+            connection.connect();
+            // 获取所有响应头字段
+            Map<String, List<String>> map = connection.getHeaderFields();
+            // 遍历所有的响应头字段
+            for (String key : map.keySet()) {
+                System.err.println(key + "--->" + map.get(key));
+            }
+            // 定义 BufferedReader输入流来读取URL的响应
+            BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream()));
+            StringBuilder result = new StringBuilder();
+            String line;
+            while ((line = in.readLine()) != null) {
+                result.append(line);
+            }
+            return result.toString();
+        } catch (Exception e) {
+            System.err.print("获取token失败！");
+            e.printStackTrace(System.err);
+        }
+        return null;
+    }
+
+
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/HttpUtils.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/HttpUtils.java
new file mode 100644
index 0000000..e85f161
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/HttpUtils.java
@@ -0,0 +1,24 @@
+package cn.pluss.platform.util;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @author DJH
+ * 网络请求相关工具类
+ */
+public class HttpUtils {
+
+    /**
+     * 判断是不是IOS app
+     * @param request
+     * @return
+     */
+    public static boolean isIOS(HttpServletRequest request) {
+        String userAgent = request.getHeader("user-agent");
+
+        /**
+         * 仅适用于收银呗app
+         */
+        return userAgent.contains("iOS");
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/HttpsMain.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/HttpsMain.java
new file mode 100644
index 0000000..625510e
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/HttpsMain.java
@@ -0,0 +1,161 @@
+package cn.pluss.platform.util;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.security.KeyManagementException;
+import java.security.NoSuchAlgorithmException;
+import java.security.NoSuchProviderException;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSession;
+import javax.net.ssl.SSLSocketFactory;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+
+public class HttpsMain {
+    /**
+     * 是否dev环境
+     */
+    public static final boolean isDev        = false;
+    /**
+     * 是否开启验签
+     */
+    public static final boolean isSign       = true;
+
+    /**
+     * 身份证
+     */
+    public static String        certNo       = "512734195005252263";
+
+    /**
+     * 商户ID
+     */
+    public static String        merchantId   = "226801000000000261290";
+
+    /**
+     * 渠道
+     */
+    public static final String  channel      = "MYBANK";
+
+    /**
+     * 短信验证码
+     */
+    public static final String  smsCode      = "888888";
+
+    /**
+     * 币种
+     */
+    public static final String  currencyCode = "156";
+
+    //sit环境url
+   // public static String        reqUrl       = "https://fcsupergw.dl.alipaydev.com/open/api/common/requestasync.htm";
+
+   // public static String        uploadUrl    = "https://fcsupergwlite.dl.alipaydev.com/ant/mybank/merchantprod/merchant/uploadphoto.htm";
+    /**
+     * partner
+     */
+    public static String        IsvOrgId     = "202210000000000001025";
+
+    /**
+     * 联调阶段使用1.0.0的版本，上线前需要根据情况重新配置
+     */
+    public static String        version      = "1.0.0";
+
+
+    /**
+     * 
+     */
+    public static void main(String[] args) throws Exception {
+
+    }
+
+    public static String httpsReq(String reqUrl, String param) throws NoSuchAlgorithmException,
+                                                              NoSuchProviderException, IOException,
+                                                              KeyManagementException {
+        URL url = new URL(reqUrl);
+        HttpsURLConnection httpsConn = (HttpsURLConnection) url.openConnection();
+        httpsConn.setHostnameVerifier(new HostnameVerifier() {
+            public boolean verify(String paramString, SSLSession paramSSLSession) {
+                return true;
+            }
+        });
+
+        //创建SSLContext对象，并使用我们指定的信任管理器初始化
+        TrustManager tm = new X509TrustManager() {
+            public void checkClientTrusted(X509Certificate[] paramArrayOfX509Certificate,
+                                           String paramString) throws CertificateException {
+            }
+
+            public void checkServerTrusted(X509Certificate[] paramArrayOfX509Certificate,
+                                           String paramString) throws CertificateException {
+            }
+
+            public X509Certificate[] getAcceptedIssuers() {
+                return null;
+            }
+        };
+
+        SSLContext sslContext = SSLContext.getInstance("SSL", "SunJSSE");
+        sslContext.init(null, new TrustManager[] { tm }, new java.security.SecureRandom());
+
+        //从上述SSLContext对象中得到SSLSocketFactory对象
+        SSLSocketFactory ssf = sslContext.getSocketFactory();
+
+        //创建HttpsURLConnection对象，并设置其SSLSocketFactory对象
+        httpsConn.setSSLSocketFactory(ssf);
+
+        httpsConn.setDoOutput(true);
+        httpsConn.setRequestMethod("POST");
+        httpsConn.setRequestProperty("Content-Type", "application/xml;charset=UTF-8");
+        httpsConn.setRequestProperty("Content-Length", String.valueOf(param.length()));
+
+        OutputStreamWriter out = new OutputStreamWriter(httpsConn.getOutputStream(), "UTF-8");
+        out.write(param);
+        out.flush();
+        out.close();
+
+        BufferedReader reader = new BufferedReader(new InputStreamReader(
+            httpsConn.getInputStream(), "UTF-8"));
+        String tempLine = "";
+        StringBuffer resultBuffer = new StringBuffer();
+        while ((tempLine = reader.readLine()) != null) {
+            resultBuffer.append(tempLine).append(System.getProperty("line.separator"));
+        }
+        return resultBuffer.toString();
+    }
+
+    public static String httpReq(String param) throws NoSuchAlgorithmException,
+                                              NoSuchProviderException, IOException,
+                                              KeyManagementException {
+        URL url = new URL("http://fcsupergw.d1003.mayibank.net/open/api/common/request.htm");
+        HttpURLConnection httpsConn = (HttpURLConnection) url.openConnection();
+
+        httpsConn.setDoOutput(true);
+        httpsConn.setRequestMethod("POST");
+        httpsConn.setRequestProperty("Content-Type", "application/xml;charset=UTF-8");
+        httpsConn.setRequestProperty("Content-Length", String.valueOf(param.length()));
+
+        OutputStreamWriter out = new OutputStreamWriter(httpsConn.getOutputStream(), "UTF-8");
+        out.write(param);
+        out.flush();
+        out.close();
+
+        BufferedReader reader = new BufferedReader(new InputStreamReader(
+            httpsConn.getInputStream(), "UTF-8"));
+        String tempLine = "";
+        StringBuffer resultBuffer = new StringBuffer();
+        while ((tempLine = reader.readLine()) != null) {
+            resultBuffer.append(tempLine).append(System.getProperty("line.separator"));
+        }
+        return resultBuffer.toString();
+    }
+
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/IPush.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/IPush.java
new file mode 100644
index 0000000..351b2b2
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/IPush.java
@@ -0,0 +1,59 @@
+package cn.pluss.platform.util;
+
+import java.util.List;
+
+public interface IPush {
+
+    /**
+     * 推送到安卓
+     *
+     * @param alias             id数组
+     * @param notificationTitle 推送通知标题
+     * @param msgContent        推送内容
+     * @param extrasParam       附加参数
+     */
+    void sendAndroidByAlias(List<String> alias, String notificationTitle, String msgContent, String extrasParam);
+
+    /**
+     * 推送到iphone
+     *
+     * @param alias             id数组
+     * @param notificationTitle 推送通知标题
+     * @param msgContent        推送内容
+     * @param extrasParam       附加参数
+     */
+    void sendIOSByAlias(List<String> alias, String notificationTitle, String msgContent, String extrasParam);
+
+    /**
+     * 推送到全部，android & iOS
+     *
+     * @param alias             id数组
+     * @param notificationTitle 推送通知标题
+     * @param msgContent        推送内容
+     * @param extrasParam       附加参数
+     */
+    void sendAllPlatByAlias(List<String> alias, String notificationTitle, String msgContent, String extrasParam);
+
+    /**
+     * 推送到全部iphone
+     *
+     * @param notificationTitle 推送通知标题
+     * @param msgContent        推送通知内容
+     * @param extrasParam       附加参数
+     */
+    void sendIOSAll(String notificationTitle, String msgContent, String extrasParam);
+
+    /**
+     * 推送到全部安卓机
+     *
+     * @param notificationTitle 推送通知标题
+     * @param msgContent        推送通知内容
+     * @param extrasParam       附加参数
+     */
+    void sendAndroidAll(String notificationTitle, String msgContent, String extrasParam);
+
+    /**
+     * 推送到所有人
+     */
+    void sendAllPlatAll(String notificationTitle, String msgContent, String extrasParam);
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/ImageUtils.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/ImageUtils.java
new file mode 100644
index 0000000..673864e
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/ImageUtils.java
@@ -0,0 +1,73 @@
+package cn.pluss.platform.util;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.Base64;
+
+public class ImageUtils {
+
+    /**
+     * 通过图片的url获取图片的base64字符串
+     *
+     * @param imgUrl 图片url
+     * @return 返回图片base64的字符串
+     */
+    public static String image2Base64(String imgUrl) {
+        URL url = null;
+        InputStream is = null;
+        ByteArrayOutputStream outStream = null;
+        HttpURLConnection httpUrl = null;
+
+        try {
+            url = new URL(imgUrl);
+            httpUrl = (HttpURLConnection) url.openConnection();
+            httpUrl.connect();
+            httpUrl.getInputStream();
+            is = httpUrl.getInputStream();
+            outStream = new ByteArrayOutputStream();
+
+            //创建一个Buffer字符串
+            byte[] buffer = new byte[1024];
+
+            //每次读取的字符串长度，如果为-1，代表全部读取完毕
+            int len = 0;
+
+            //使用一个输入流从buffer里把数据读取出来
+            while ((len = is.read(buffer)) != -1) {
+                //用输出流往buffer里写入数据，中间参数代表从哪个位置开始读，len代表读取的长度
+                outStream.write(buffer, 0, len);
+            }
+
+            // 对字节数组Base64编码
+            return Base64.getEncoder().encodeToString(outStream.toByteArray());
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            if (is != null) {
+                try {
+                    is.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+
+            if (outStream != null) {
+                try {
+                    outStream.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+
+            if (httpUrl != null) {
+                httpUrl.disconnect();
+            }
+        }
+
+        return imgUrl;
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/IpUtils.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/IpUtils.java
new file mode 100644
index 0000000..7de04fe
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/IpUtils.java
@@ -0,0 +1,121 @@
+package cn.pluss.platform.util;
+
+import cn.pluss.platform.exception.MsgException;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.aliyuncs.geoip.model.v20200101.DescribeIpv4LocationResponse;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.web.client.RestTemplate;
+
+import javax.servlet.http.HttpServletRequest;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * IP相关接口
+ */
+public class IpUtils {
+
+    private static final String UNKNOWN = "unknown";
+    private static final String LOCALHOST = "127.0.0.1";
+    private static final String SEPARATOR = ",";
+
+    public static String getIpAddr(HttpServletRequest request) {
+        System.out.println(request);
+        String ipAddress;
+        try {
+            ipAddress = request.getHeader("x-forwarded-for");
+            if (ipAddress == null || ipAddress.length() == 0 || UNKNOWN.equalsIgnoreCase(ipAddress)) {
+                ipAddress = request.getHeader("Proxy-Client-IP");
+            }
+            if (ipAddress == null || ipAddress.length() == 0 || UNKNOWN.equalsIgnoreCase(ipAddress)) {
+                ipAddress = request.getHeader("WL-Proxy-Client-IP");
+            }
+            if (ipAddress == null || ipAddress.length() == 0 || UNKNOWN.equalsIgnoreCase(ipAddress)) {
+                ipAddress = request.getRemoteAddr();
+                if (LOCALHOST.equals(ipAddress)) {
+                    InetAddress inet = null;
+                    try {
+                        inet = InetAddress.getLocalHost();
+                        ipAddress = inet.getHostAddress();
+                    } catch (UnknownHostException e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+            // 对于通过多个代理的情况，第一个IP为客户端真实IP,多个IP按照','分割
+            // "***.***.***.***".length()
+            if (ipAddress != null && ipAddress.length() > 15) {
+                if (ipAddress.indexOf(SEPARATOR) > 0) {
+                    ipAddress = ipAddress.substring(0, ipAddress.indexOf(","));
+                }
+            }
+        } catch (Exception e) {
+            ipAddress = "";
+        }
+        return ipAddress;
+    }
+
+    /**
+     * 是否为公网ip
+     * @return
+     */
+    public static boolean isWAN(String ip) {
+        if (StringUtils.isEmpty(ip)) {
+            throw new MsgException("ip不能为空");
+        }
+
+        if (ip.startsWith("192.168")) {
+            return false;
+        }
+
+        if (ip.startsWith("172.16")) {
+
+        }
+
+        return false;
+    }
+
+    /**
+     * 高德根据ip获取经纬度
+     * @param address
+     * @return
+     */
+    public static Map<String,String> getLocationByAddress(String address){
+        Map<String,String> result = new HashMap<>(2);
+        String url = "https://restapi.amap.com/v3/geocode/geo?address="+address+"&key=4d6b5117916ada2b52452d6a04483ac7";
+        RestTemplate restTemplate = new RestTemplate();
+        JSONObject forObject = restTemplate.getForObject(url, JSONObject.class);
+        if("1".equals(forObject.getString("status"))){
+            JSONArray geocodes = forObject.getJSONArray("geocodes");
+            String location = geocodes.getJSONObject(0).getString("location");
+            result.put("y",location.split(",")[0]);
+            result.put("x",location.split(",")[1]);
+            return result;
+        }
+        return null;
+    }
+
+    public static String getIpLoactionAddress(DescribeIpv4LocationResponse response) {
+        if(response == null){
+            return null;
+        }
+        StringBuffer sb = new StringBuffer();
+        if(StringUtil.isNotEmpty(response.getProvince())){
+            sb.append(response.getProvince() + "-");
+        }
+        if(StringUtil.isNotEmpty(response.getCity())){
+            sb.append(response.getCity() + "-");
+        }
+        if(StringUtil.isNotEmpty(response.getCounty())){
+            sb.append(response.getCounty() + "-");
+        }
+        if(sb.length() == 0){
+            return null;
+        }
+        sb.deleteCharAt(sb.length() - 1);
+        return sb.toString();
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/JGPushUtil.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/JGPushUtil.java
new file mode 100644
index 0000000..e087cd4
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/JGPushUtil.java
@@ -0,0 +1,220 @@
+package cn.pluss.platform.util;
+
+import cn.jiguang.common.resp.APIConnectionException;
+import cn.jiguang.common.resp.APIRequestException;
+import cn.jpush.api.JPushClient;
+import cn.jpush.api.push.PushResult;
+import cn.jpush.api.push.model.Message;
+import cn.jpush.api.push.model.Options;
+import cn.jpush.api.push.model.Platform;
+import cn.jpush.api.push.model.PushPayload;
+import cn.jpush.api.push.model.audience.Audience;
+import cn.jpush.api.push.model.notification.AndroidNotification;
+import cn.jpush.api.push.model.notification.IosNotification;
+import cn.jpush.api.push.model.notification.Notification;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.List;
+
+/**
+ * 极光推送
+ */
+@Slf4j
+public class JGPushUtil implements IPush {
+
+    private static IPush instance;
+
+    private JGPushUtil() {
+    }
+
+    public static IPush getInstance() {
+        if (instance == null) {
+            instance = new JGPushUtil();
+        }
+
+        return instance;
+    }
+
+    private final static String APP_KEY = "46a8063491a3a1e89ec9254f";
+
+    private final static String MASTER_SECRET = "ee279316fb21f2ec65390768";
+
+    private static JPushClient jpushClient;
+
+    public static JPushClient getJPushClient() {
+        if (jpushClient == null) {
+            jpushClient = new JPushClient(MASTER_SECRET, APP_KEY);
+        }
+
+        return jpushClient;
+    }
+
+    @Override
+    public void sendAndroidByAlias(List<String> alias, String notificationTitle, String msgContent, String extrasParam) {
+        PushPayload pushPayload = getPayLoadBuilder(notificationTitle, msgContent, extrasParam)
+                .setPlatform(Platform.android())
+                //指定推送的接收对象，all代表所有人，也可以指定已经设置成功的tag或alias或该应应用客户端调用接口获取到的registration id
+                .setAudience(Audience.alias(alias))
+                //jpush的通知，android的由jpush直接下发，iOS的由apns服务器下发，Winphone的由mpns下发
+                .setNotification(Notification.newBuilder()
+                        //指定当前推送的android通知
+                        .addPlatformNotification(getAndroidNotification(notificationTitle, msgContent, extrasParam))
+                        .build())
+                .build();
+
+        sendAndResultHandle(pushPayload);
+    }
+
+    @Override
+    public void sendIOSByAlias(List<String> alias, String notificationTitle, String msgContent, String extrasParam) {
+        PushPayload pushPayload = getPayLoadBuilder(notificationTitle, msgContent, extrasParam)
+                .setPlatform(Platform.ios())
+                //指定推送的接收对象，all代表所有人，也可以指定已经设置成功的tag或alias或该应应用客户端调用接口获取到的registration id
+                .setAudience(Audience.alias(alias))
+                // iOS的由apns服务器下发，Winphone的由mpns下发
+                .setNotification(Notification.newBuilder()
+                        //指定当前推送的android通知
+                        .addPlatformNotification(getIOSNotification(notificationTitle, msgContent, extrasParam))
+                        .build())
+                .build();
+
+        sendAndResultHandle(pushPayload);
+    }
+
+    @Override
+    public void sendAllPlatByAlias(List<String> alias, String notificationTitle, String msgContent, String extrasParam) {
+        PushPayload pushPayload = getPayLoadBuilder(notificationTitle, msgContent, extrasParam)
+                .setPlatform(Platform.android_ios())
+                //指定推送的接收对象，all代表所有人，也可以指定已经设置成功的tag或alias或该应应用客户端调用接口获取到的registration id
+                .setAudience(Audience.alias(alias))
+                .setNotification(Notification.newBuilder()
+                        .addPlatformNotification(getIOSNotification(notificationTitle, msgContent, extrasParam))
+                        .addPlatformNotification(getAndroidNotification(notificationTitle, msgContent, extrasParam))
+                        .build())
+                .build();
+
+        sendAndResultHandle(pushPayload);
+    }
+
+    @Override
+    public void sendIOSAll(String notificationTitle, String msgContent, String extrasParam) {
+        PushPayload pushPayload = getPayLoadBuilder(notificationTitle, msgContent, extrasParam)
+                .setPlatform(Platform.ios())
+                //指定推送的接收对象，all代表所有人，也可以指定已经设置成功的tag或alias或该应应用客户端调用接口获取到的registration id
+                .setAudience(Audience.all())
+                // iOS的由apns服务器下发，Winphone的由mpns下发
+                .setNotification(Notification.newBuilder()
+                        .addPlatformNotification(getIOSNotification(notificationTitle, msgContent, extrasParam))
+                        .build())
+                .build();
+
+        sendAndResultHandle(pushPayload);
+    }
+
+    @Override
+    public void sendAndroidAll(String notificationTitle, String msgContent, String extrasParam) {
+        PushPayload pushPayload = getPayLoadBuilder(notificationTitle, msgContent, extrasParam)
+                .setPlatform(Platform.android())
+                //指定推送的接收对象，all代表所有人，也可以指定已经设置成功的tag或alias或该应应用客户端调用接口获取到的registration id
+                .setAudience(Audience.all())
+                .setNotification(Notification.newBuilder()
+                        .addPlatformNotification(getAndroidNotification(notificationTitle, msgContent, extrasParam))
+                        .build())
+                .build();
+
+        sendAndResultHandle(pushPayload);
+    }
+
+    @Override
+    public void sendAllPlatAll(String notificationTitle, String msgContent, String extrasParam) {
+        PushPayload pushPayload = getPayLoadBuilder(notificationTitle, msgContent, extrasParam)
+                .setPlatform(Platform.android_ios())
+                //指定推送的接收对象，all代表所有人，也可以指定已经设置成功的tag或alias或该应应用客户端调用接口获取到的registration id
+                .setAudience(Audience.all())
+                .setNotification(Notification.newBuilder()
+                        .addPlatformNotification(getIOSNotification(notificationTitle, msgContent, extrasParam))
+                        .addPlatformNotification(getAndroidNotification(notificationTitle, msgContent, extrasParam))
+                        .build())
+                .build();
+
+        sendAndResultHandle(pushPayload);
+    }
+
+
+    private AndroidNotification getAndroidNotification(String notificationTitle, String msgContent, String extrasParam) {
+        return AndroidNotification.newBuilder()
+                .setAlert(msgContent)
+                .setTitle(notificationTitle)
+                // Notification.DEFAULT_ALL = -1
+                // Notification.DEFAULT_VIBRATE = 2
+                // Notification.DEFAULT_LIGHTS = 4
+                .setAlertType(-1)
+                //此字段为透传字段，不会显示在通知栏。用户可以通过此字段来做一些定制需求，如特定的key传要指定跳转的页面（value）
+                .addExtra("url", extrasParam)
+                .build();
+    }
+
+    /**
+     * 获取iOS的通知构造体
+     *
+     * @param notificationTitle 标题
+     * @param msgContent        内容
+     * @param extrasParam       附加参数
+     * @return
+     */
+    private IosNotification getIOSNotification(String notificationTitle, String msgContent, String extrasParam) {
+        return IosNotification.newBuilder()
+                //传一个IosAlert对象，指定apns title、title、subtitle等
+                .setAlert(msgContent)
+                .setMutableContent(true)
+                //直接传alert
+                //此项是指定此推送的badge自动加1
+                .incrBadge(1)
+                //此字段的值default表示系统默认声音；传sound.caf表示此推送以项目里面打包的sound.caf声音来提醒，
+                // 如果系统没有此音频则以系统默认声音提醒；此字段如果传空字符串，iOS9及以上的系统是无声音提醒，以下的系统是默认声音
+                .setSound("sound.caf")
+                //此字段为透传字段，不会显示在通知栏。用户可以通过此字段来做一些定制需求，如特定的key传要指定跳转的页面（value）
+                .addExtra("url", extrasParam)
+                //此项说明此推送是一个background推送，想了解background看：http://docs.jpush.io/client/ios_tutorials/#ios-7-background-remote-notification
+                //取消此注释，消息推送时ios将无法在锁屏情况接收
+                // .setContentAvailable(true)
+                .build();
+    }
+
+    private PushPayload.Builder getPayLoadBuilder(String notificationTitle, String msgContent, String extrasParam) {
+        return PushPayload.newBuilder()
+                //Platform指定了哪些平台就会像指定平台中符合推送条件的设备进行推送。 jpush的自定义消息，
+                // sdk默认不做任何处理，不会有通知提示。建议看文档http://docs.jpush.io/guideline/faq/的
+                .setMessage(Message.newBuilder()
+                        .setMsgContent(msgContent)
+                        .setTitle(notificationTitle)
+                        .addExtra("5", extrasParam)
+                        .build())
+                .setOptions(Options.newBuilder()
+                        //此字段的值是用来指定本推送要推送的apns环境，false表示开发，true表示生产；对android和自定义消息无意义
+                        .setApnsProduction(MobPushUtil.PROD == 1)
+                        //此字段是给开发者自己给推送编号，方便推送者分辨推送记录
+                        .setSendno(1)
+                        .build());
+    }
+
+    /**
+     * 发送推送并对结果进行处理
+     * @param pushPayload
+     */
+    void sendAndResultHandle(PushPayload pushPayload) {
+        try {
+            PushResult pushResult = getJPushClient().sendPush(pushPayload);
+//            System.out.println("[极光推送]    PushResult result is " + pushResult);
+            log.info("[极光推送]    PushResult result is " + pushResult);
+        } catch (APIConnectionException e) {
+            log.error("[极光推送]    Connection error. Should retry later. {}", e.toString());
+        } catch (APIRequestException e) {
+            System.out.println("[极光推送] " + e.getErrorMessage());
+//            log.error("[极光推送]Error response from JPush server. Should review and fix it. ", e);
+            log.info("[极光推送]HTTP Status: " + e.getStatus());
+            log.info("[极光推送]Error Code: " + e.getErrorCode());
+            log.info("[极光推送]Error Message: " + e.getErrorMessage());
+        }
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/JpushClientUtil.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/JpushClientUtil.java
new file mode 100644
index 0000000..2781ce1
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/JpushClientUtil.java
@@ -0,0 +1,392 @@
+package cn.pluss.platform.util;
+
+
+import cn.jiguang.common.resp.APIConnectionException;
+import cn.jiguang.common.resp.APIRequestException;
+import cn.jpush.api.JPushClient;
+import cn.jpush.api.push.PushResult;
+import cn.jpush.api.push.model.Message;
+import cn.jpush.api.push.model.Options;
+import cn.jpush.api.push.model.Platform;
+import cn.jpush.api.push.model.PushPayload;
+import cn.jpush.api.push.model.audience.Audience;
+import cn.jpush.api.push.model.notification.AndroidNotification;
+import cn.jpush.api.push.model.notification.IosNotification;
+import cn.jpush.api.push.model.notification.Notification;
+import cn.jpush.api.schedule.ScheduleResult;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class JpushClientUtil {
+
+	private static final Logger logger = LoggerFactory.getLogger(JpushClientUtil.class);
+	 
+    private final static String APPKER = "46a8063491a3a1e89ec9254f";
+
+    private final static String MASTERSECRET = "ee279316fb21f2ec65390768";
+ 
+    private static JPushClient jPushClient = new JPushClient(MASTERSECRET,APPKER);
+    
+    private JpushClientUtil() {
+        throw new AssertionError("不能产生该对象");
+    }
+
+    public static void main(String[] args) {
+    	List<String> alias = new ArrayList<>();
+    	//alias.add("276");
+    	alias.add("1791");
+        //alias.add("896");
+    	//sendToRegistrationId(alias, "测试", "测试信息", "测试信息", "https://www.baidu.com");
+
+//    	sendToAllAndroid("测试Android", "测试Android", "测试Android", "https://www.baidu.com");
+//    	sendToAllIos("测试Ios", "测试信息Ios", "测试信息Ios", "https://www.baidu.com");
+//    	sendToAll("测试全平台", "测试信息全平台", "测试信息全平台", "https://www.baidu.com");
+        int a = sendToRegistrationId2(alias, "收银呗到账通知233", "收银呗到账通知", "收银呗到账0.01元", "3","2018-11-23 17:05:25");
+    	System.out.println(a);
+    	System.out.println("发送成功！");
+	}
+
+
+
+   //推送给设备标识参数的用户
+    public static int sendToRegistrationId( List<String> alias,String notification_title, String msg_title, String msg_content, String extrasparam) {
+    	JPushClient jPushClient = new JPushClient(MASTERSECRET,APPKER);
+        int result = 0;
+        try {
+            PushPayload pushPayload= JpushClientUtil.buildPushObject_all_alias_alertWithTitle(alias,notification_title,msg_title,msg_content,extrasparam);
+            PushResult pushResult=jPushClient.sendPush(pushPayload);
+            if(pushResult.getResponseCode()==200){
+                result=1;
+            }
+            logger.info("[极光推送]PushResult result is " + pushResult);
+        } catch (APIConnectionException e) {
+        	logger.error("[极光推送]Connection error. Should retry later. ", e);
+        } catch (APIRequestException e) {
+        	logger.error("[极光推送]Error response from JPush server. Should review and fix it. ", e);
+        	logger.info("[极光推送]HTTP Status: " + e.getStatus());
+        	logger.info("[极光推送]Error Code: " + e.getErrorCode());
+        	logger.info("[极光推送]Error Message: " + e.getErrorMessage());
+        }
+         return result;
+    }
+
+    // 推送给设备标识参数的用户（定时）
+    public static int sendToRegistrationId2( List<String> alias,String notification_title, String msg_title, String msg_content, String extrasparam, String time) {
+    	JPushClient jPushClient = new JPushClient(MASTERSECRET,APPKER);
+//    	logger.error(JSONObject.toJSONString(jPushClient));
+        int result=0;
+        try {
+            PushPayload pushPayload= JpushClientUtil.buildPushObject_all_alias_alertWithTitle(alias,notification_title,msg_title,msg_content,extrasparam);
+            PushResult pushResult=jPushClient.sendPush(pushPayload);
+            if(pushResult.getResponseCode()==200){
+                result=1;
+            }
+            logger.info("[极光推送]ScheduleResult result is " + pushResult);
+        } catch (APIConnectionException e) {
+        	logger.error("[极光推送]Connection error. Should retry later. ", e);
+        	e.printStackTrace();
+        } catch (APIRequestException e) {
+            e.printStackTrace();
+        	logger.error("[极光推送]Error response from JPush server. Should review and fix it. ", e);
+        	logger.info("[极光推送]HTTP Status: " + e.getStatus());
+        	logger.info("[极光推送]Error Code: " + e.getErrorCode());
+        	logger.info("[极光推送]Error Message: " + e.getErrorMessage());
+        }
+        return result;
+    }    
+    
+
+    //发送给所有安卓用户
+    public static int sendToAllAndroid( String notification_title, String msg_title, String msg_content, String extrasparam) {
+        int result = 0;
+        try {
+            PushPayload pushPayload= JpushClientUtil.buildPushObject_android_all_alertWithTitle(notification_title,msg_title,msg_content,extrasparam);
+            PushResult pushResult=jPushClient.sendPush(pushPayload);
+            if(pushResult.getResponseCode()==200){
+                result=1;
+            }
+            logger.info("[极光推送]PushResult result is " + pushResult);
+        } catch (APIConnectionException e) {
+        	logger.error("[极光推送]Connection error. Should retry later. ", e);
+        } catch (APIRequestException e) {
+        	logger.error("[极光推送]Error response from JPush server. Should review and fix it. ", e);
+        	logger.info("[极光推送]HTTP Status: " + e.getStatus());
+        	logger.info("[极光推送]Error Code: " + e.getErrorCode());
+        	logger.info("[极光推送]Error Message: " + e.getErrorMessage());
+        }
+ 
+         return result;
+    }
+ 
+
+    // 发送给所有IOS用户
+    public static int sendToAllIos(String notification_title, String msg_title, String msg_content, String extrasparam) {
+        int result = 0;
+        try {
+            PushPayload pushPayload= JpushClientUtil.buildPushObject_ios_all_alertWithTitle(notification_title,msg_title,msg_content,extrasparam);
+            PushResult pushResult=jPushClient.sendPush(pushPayload);
+            if(pushResult.getResponseCode()==200){
+                result=1;
+            }
+            logger.info("[极光推送]PushResult result is " + pushResult);
+        } catch (APIConnectionException e) {
+        	logger.error("[极光推送]Connection error. Should retry later. ", e);
+        } catch (APIRequestException e) {
+        	logger.error("[极光推送]Error response from JPush server. Should review and fix it. ", e);
+        	logger.info("[极光推送]HTTP Status: " + e.getStatus());
+        	logger.info("[极光推送]Error Code: " + e.getErrorCode());
+        	logger.info("[极光推送]Error Message: " + e.getErrorMessage());
+        }
+ 
+         return result;
+    }
+ 
+
+    // 发送给所有用户
+    public static int sendToAll( String notification_title, String msg_title, String msg_content, String extrasparam) {
+        int result = 0;
+        try {
+            PushPayload pushPayload= JpushClientUtil.buildPushObject_android_and_ios(notification_title,msg_title,msg_content,extrasparam);
+            PushResult pushResult=jPushClient.sendPush(pushPayload);
+            if(pushResult.getResponseCode()==200){
+                result=1;
+            }
+            logger.info("[极光推送]PushResult result is " + pushResult);
+        } catch (APIConnectionException e) {
+        	logger.error("[极光推送]Connection error. Should retry later. ", e);
+        } catch (APIRequestException e) {
+        	logger.error("[极光推送]Error response from JPush server. Should review and fix it. ", e);
+        	logger.info("[极光推送]HTTP Status: " + e.getStatus());
+        	logger.info("[极光推送]Error Code: " + e.getErrorCode());
+        	logger.info("[极光推送]Error Message: " + e.getErrorMessage());
+        }
+ 
+        return result;
+    }
+    
+
+    //发送给所有用户(定时推送)
+    public static int sendToAll2( String notification_title, String msg_title, String msg_content, String extrasparam, String time) {
+        int result = 0;
+        try {
+            PushPayload pushPayload= JpushClientUtil.buildPushObject_android_and_ios(notification_title,msg_title,msg_content,extrasparam);
+            ScheduleResult scheduleResult=jPushClient.createSingleSchedule("测试", time, pushPayload, MASTERSECRET,APPKER);
+            if(scheduleResult.getResponseCode()==200){
+                result=1;
+            }
+            logger.info("[极光推送]scheduleResult result is " + scheduleResult);
+        } catch (APIConnectionException e) {
+        	logger.error("[极光推送]Connection error. Should retry later. ", e);
+        } catch (APIRequestException e) {
+        	logger.error("[极光推送]Error response from JPush server. Should review and fix it. ", e);
+        	logger.info("[极光推送]HTTP Status: " + e.getStatus());
+        	logger.info("[极光推送]Error Code: " + e.getErrorCode());
+        	logger.info("[极光推送]Error Message: " + e.getErrorMessage());
+        }
+ 
+        return result;
+    }
+ 
+    public static PushPayload buildPushObject_android_and_ios(String notification_title, String msg_title, String msg_content, String extrasparam) {
+        return PushPayload.newBuilder()
+                .setPlatform(Platform.android_ios())
+                .setAudience(Audience.all())
+                .setNotification(Notification.newBuilder()
+                        .setAlert(msg_content)
+                        .addPlatformNotification(AndroidNotification.newBuilder()
+                                .setAlert(msg_content)
+                                .setTitle(notification_title)
+                                //此字段为透传字段，不会显示在通知栏。用户可以通过此字段来做一些定制需求，如特定的key传要指定跳转的页面（value）
+                                .addExtra("url",extrasparam)
+                                .build()
+                        )
+                        .addPlatformNotification(IosNotification.newBuilder()
+                                //传一个IosAlert对象，指定apns title、title、subtitle等
+                                .setAlert(msg_content)
+                                //直接传alert
+                                //此项是指定此推送的badge自动加1
+                                .incrBadge(1)
+                                //此字段的值default表示系统默认声音；传sound.caf表示此推送以项目里面打包的sound.caf声音来提醒，
+                                // 如果系统没有此音频则以系统默认声音提醒；此字段如果传空字符串，iOS9及以上的系统是无声音提醒，以下的系统是默认声音
+                                .setSound("sound.caf")
+                                //此字段为透传字段，不会显示在通知栏。用户可以通过此字段来做一些定制需求，如特定的key传要指定跳转的页面（value）
+                                .addExtra("url",extrasparam)
+                                //此项说明此推送是一个background推送，想了解background看：http://docs.jpush.io/client/ios_tutorials/#ios-7-background-remote-notification
+                                // .setContentAvailable(true)
+ 
+                                .build()
+                        )
+                        .build()
+                )
+                //Platform指定了哪些平台就会像指定平台中符合推送条件的设备进行推送。 jpush的自定义消息，
+                // sdk默认不做任何处理，不会有通知提示。建议看文档http://docs.jpush.io/guideline/faq/的
+                .setMessage(Message.newBuilder()
+                        .setMsgContent(msg_content)
+                        .setTitle(msg_title)
+                        .addExtra("url",extrasparam)
+                        .build())
+ 
+                .setOptions(Options.newBuilder()
+                        //此字段的值是用来指定本推送要推送的apns环境，false表示开发，true表示生产；对android和自定义消息无意义
+                        .setApnsProduction(true)
+                        //此字段是给开发者自己给推送编号，方便推送者分辨推送记录
+                        .setSendno(1)
+                        //此字段的值是用来指定本推送的离线保存时长，如果不传此字段则默认保存一天，最多指定保留十天，单位为秒
+                        .setTimeToLive(86400)
+                        .build()
+                )
+                .build();
+    }
+ 
+    private static PushPayload buildPushObject_all_alias_alertWithTitle(List<String> alias,String notification_title, String msg_title, String msg_content, String extrasparam) {
+    	logger.error("===extrasparam======"+extrasparam);
+        //创建一个IosAlert对象，可指定APNs的alert、title等字段
+        //IosAlert iosAlert =  IosAlert.newBuilder().setTitleAndBody("title", "alert body").build();
+ 
+        return PushPayload.newBuilder()
+                //指定要推送的平台，all代表当前应用配置了的所有平台，也可以传android等具体平台
+                .setPlatform(Platform.all())
+                //指定推送的接收对象，all代表所有人，也可以指定已经设置成功的tag或alias或该应应用客户端调用接口获取到的registration id
+                .setAudience(Audience.alias(alias))
+//                .setAudience(Audience.registrationId(registrationId))
+                //jpush的通知，android的由jpush直接下发，iOS的由apns服务器下发，Winphone的由mpns下发
+                .setNotification(Notification.newBuilder()
+                        //指定当前推送的android通知
+                        .addPlatformNotification(AndroidNotification.newBuilder()
+                                .setAlert(msg_content)
+                                .setTitle(notification_title)
+                                //此字段为透传字段，不会显示在通知栏。用户可以通过此字段来做一些定制需求，如特定的key传要指定跳转的页面（value）
+                                .addExtra("url",extrasparam)
+                                .build())
+
+                        /*.setNotification(Notification.newBuilder()
+                                .addPlatformNotification(IosNotification.newBuilder()
+                                        .setAlert("提示")
+                                        .setBadge(5)
+                                        .setSound("happy")
+                                        .addExtra("url", "JPush")
+                                        .build())
+                                .build())*/
+
+                        //指定当前推送的iOS通知
+                        .addPlatformNotification(IosNotification.newBuilder()
+                                //传一个IosAlert对象，指定apns title、title、subtitle等
+                                .setAlert(msg_content)
+                                //.setMutableContent(true)
+                                //直接传alert
+                                //此项是指定此推送的badge自动加1
+                                .incrBadge(1)
+                                //此字段的值default表示系统默认声音；传sound.caf表示此推送以项目里面打包的sound.caf声音来提醒，
+                                // 如果系统没有此音频则以系统默认声音提醒；此字段如果传空字符串，iOS9及以上的系统是无声音提醒，以下的系统是默认声音
+                                .setSound("sound.caf")
+                                //此字段为透传字段，不会显示在通知栏。用户可以通过此字段来做一些定制需求，如特定的key传要指定跳转的页面（value）
+                                .addExtra("url",extrasparam)
+                                //此项说明此推送是一个background推送，想了解background看：http://docs.jpush.io/client/ios_tutorials/#ios-7-background-remote-notification
+                                //取消此注释，消息推送时ios将无法在锁屏情况接收
+                                // .setContentAvailable(true)
+                                .build())
+                        .build())
+                //Platform指定了哪些平台就会像指定平台中符合推送条件的设备进行推送。 jpush的自定义消息，
+                // sdk默认不做任何处理，不会有通知提示。建议看文档http://docs.jpush.io/guideline/faq/的
+                .setMessage(Message.newBuilder()
+                        .setMsgContent(msg_content)
+                        .setTitle(msg_title)
+                        .addExtra("5",extrasparam)
+                        .build())
+                .setOptions(Options.newBuilder()
+                        //此字段的值是用来指定本推送要推送的apns环境，false表示开发，true表示生产；对android和自定义消息无意义
+                        .setApnsProduction(true)
+                        //此字段是给开发者自己给推送编号，方便推送者分辨推送记录
+                        .setSendno(1)
+                        //此字段的值是用来指定本推送的离线保存时长，如果不传此字段则默认保存一天，最多指定保留十天；
+                        .setTimeToLive(86400)
+                        .build())
+                .build();
+    }
+ 
+    private static PushPayload buildPushObject_android_all_alertWithTitle(String notification_title, String msg_title, String msg_content, String extrasparam) {
+        return PushPayload.newBuilder()
+                //指定要推送的平台，all代表当前应用配置了的所有平台，也可以传android等具体平台
+                .setPlatform(Platform.android())
+                //指定推送的接收对象，all代表所有人，也可以指定已经设置成功的tag或alias或该应应用客户端调用接口获取到的registration id
+                .setAudience(Audience.all())
+                //jpush的通知，android的由jpush直接下发，iOS的由apns服务器下发，Winphone的由mpns下发
+                .setNotification(Notification.newBuilder()
+                        //指定当前推送的android通知
+                        .addPlatformNotification(AndroidNotification.newBuilder()
+                                .setAlert(msg_content)
+                                .setTitle(notification_title)
+                                //此字段为透传字段，不会显示在通知栏。用户可以通过此字段来做一些定制需求，如特定的key传要指定跳转的页面（value）
+                                .addExtra("url",extrasparam)
+                                .build())
+                        .build()
+                )
+                //Platform指定了哪些平台就会像指定平台中符合推送条件的设备进行推送。 jpush的自定义消息，
+                // sdk默认不做任何处理，不会有通知提示。建议看文档http://docs.jpush.io/guideline/faq/的
+                // [通知与自定义消息有什么区别？]了解通知和自定义消息的区别
+                .setMessage(Message.newBuilder()
+                        .setMsgContent(msg_content)
+                        .setTitle(msg_title)
+                        .addExtra("url",extrasparam)
+                        .build())
+ 
+                .setOptions(Options.newBuilder()
+                        //此字段的值是用来指定本推送要推送的apns环境，false表示开发，true表示生产；对android和自定义消息无意义
+                        .setApnsProduction(true)
+                        //此字段是给开发者自己给推送编号，方便推送者分辨推送记录
+                        .setSendno(1)
+                        //此字段的值是用来指定本推送的离线保存时长，如果不传此字段则默认保存一天，最多指定保留十天，单位为秒
+                        .setTimeToLive(86400)
+                        .build())
+                .build();
+    }
+ 
+    private static PushPayload buildPushObject_ios_all_alertWithTitle( String notification_title, String msg_title, String msg_content, String extrasparam) {
+        return PushPayload.newBuilder()
+                //指定要推送的平台，all代表当前应用配置了的所有平台，也可以传android等具体平台
+                .setPlatform(Platform.ios())
+                //指定推送的接收对象，all代表所有人，也可以指定已经设置成功的tag或alias或该应应用客户端调用接口获取到的registration id
+                .setAudience(Audience.all())
+                //jpush的通知，android的由jpush直接下发，iOS的由apns服务器下发，Winphone的由mpns下发
+                .setNotification(Notification.newBuilder()
+                        //指定当前推送的android通知
+                        .addPlatformNotification(IosNotification.newBuilder()
+                                //传一个IosAlert对象，指定apns title、title、subtitle等
+                                .setAlert(msg_content)
+                                //直接传alert
+                                //此项是指定此推送的badge自动加1
+                                .incrBadge(1)
+                                //此字段的值default表示系统默认声音；传sound.caf表示此推送以项目里面打包的sound.caf声音来提醒，
+                                // 如果系统没有此音频则以系统默认声音提醒；此字段如果传空字符串，iOS9及以上的系统是无声音提醒，以下的系统是默认声音
+                                .setSound("sound.caf")
+                                //此字段为透传字段，不会显示在通知栏。用户可以通过此字段来做一些定制需求，如特定的key传要指定跳转的页面（value）
+                                .addExtra("url",extrasparam)
+                                //此项说明此推送是一个background推送，想了解background看：http://docs.jpush.io/client/ios_tutorials/#ios-7-background-remote-notification
+                               // .setContentAvailable(true)
+                                .build())
+                        .build()
+                )
+                //Platform指定了哪些平台就会像指定平台中符合推送条件的设备进行推送。 jpush的自定义消息，
+                // sdk默认不做任何处理，不会有通知提示。建议看文档http://docs.jpush.io/guideline/faq/的
+                // [通知与自定义消息有什么区别？]了解通知和自定义消息的区别
+                .setMessage(Message.newBuilder()
+                        .setMsgContent(msg_content)
+                        .setTitle(msg_title)
+                        .addExtra("url",extrasparam)
+                        .build())
+ 
+                .setOptions(Options.newBuilder()
+                        //此字段的值是用来指定本推送要推送的apns环境，false表示开发，true表示生产；对android和自定义消息无意义
+                        .setApnsProduction(false)
+                        //此字段是给开发者自己给推送编号，方便推送者分辨推送记录
+                        .setSendno(1)
+                        //此字段的值是用来指定本推送的离线保存时长，如果不传此字段则默认保存一天，最多指定保留十天，单位为秒
+                        .setTimeToLive(86400)
+                        .build())
+                .build();
+    }
+
+}
\ No newline at end of file
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/JwtUtils.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/JwtUtils.java
new file mode 100644
index 0000000..9aba872
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/JwtUtils.java
@@ -0,0 +1,15 @@
+package cn.pluss.platform.util;
+
+import cn.hutool.jwt.JWT;
+import cn.hutool.jwt.JWTHeader;
+import cn.hutool.jwt.JWTUtil;
+
+public class JwtUtils {
+
+    public static Object get(String key, String token) {
+        final JWT jwt = JWTUtil.parseToken(token);
+
+        jwt.getHeader(JWTHeader.TYPE);
+        return jwt.getPayload(key);
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/LogExceptionUtils.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/LogExceptionUtils.java
new file mode 100644
index 0000000..7a87b6a
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/LogExceptionUtils.java
@@ -0,0 +1,26 @@
+package cn.pluss.platform.util;
+
+import org.slf4j.Logger;
+import org.springframework.cglib.proxy.UndeclaredThrowableException;
+
+import java.lang.reflect.InvocationTargetException;
+
+/**
+ * @author djh
+ */
+public class LogExceptionUtils {
+
+    public static void printStack(Logger logger, Throwable e, String message) {
+        logger.info("异常名称：{}", e.getClass().getCanonicalName());
+        if (e instanceof UndeclaredThrowableException) {
+            e.getCause().printStackTrace();
+            logger.info(message , e.getCause().getMessage());
+        } else if (e instanceof InvocationTargetException) {
+            ((InvocationTargetException) e).getTargetException().printStackTrace();
+            logger.info(message, e.getMessage());
+        } else {
+            e.printStackTrace();
+            logger.info(message, e.getMessage());
+        }
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/MD5Util.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/MD5Util.java
new file mode 100644
index 0000000..32a48cb
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/MD5Util.java
@@ -0,0 +1,42 @@
+package cn.pluss.platform.util;
+
+import java.security.MessageDigest;
+
+public class MD5Util {
+	private static String byteArrayToHexString(byte b[]) {  
+        StringBuffer resultSb = new StringBuffer();  
+        for (int i = 0; i < b.length; i++)  
+            resultSb.append(byteToHexString(b[i]));  
+  
+        return resultSb.toString();  
+    }  
+  
+    private static String byteToHexString(byte b) {  
+        int n = b;  
+        if (n < 0)  
+            n += 256;  
+        int d1 = n / 16;  
+        int d2 = n % 16;  
+        return hexDigits[d1] + hexDigits[d2];  
+    }  
+  
+    public static String MD5Encode(String origin, String charsetname) {  
+        String resultString = null;  
+        try {  
+            resultString = origin;
+            MessageDigest md = MessageDigest.getInstance("MD5");  
+            if (charsetname == null || "".equals(charsetname))  
+                resultString = byteArrayToHexString(md.digest(resultString  
+                        .getBytes()));  
+            else  
+                resultString = byteArrayToHexString(md.digest(resultString  
+                        .getBytes(charsetname)));  
+        } catch (Exception exception) {  
+        }  
+        return resultString;  
+    }  
+  
+    private static final String hexDigits[] = { "0", "1", "2", "3", "4", "5",  
+            "6", "7", "8", "9", "a", "b", "c", "d", "e", "f" };  
+  
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/MapUtils.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/MapUtils.java
new file mode 100644
index 0000000..10db134
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/MapUtils.java
@@ -0,0 +1,71 @@
+package cn.pluss.platform.util;
+
+import lombok.val;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+
+import java.beans.BeanInfo;
+import java.beans.IntrospectionException;
+import java.beans.Introspector;
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author djh
+ */
+public class MapUtils {
+
+    private static Logger logger = LoggerFactory.getLogger(MapUtils.class);
+
+    private static String classStr = "class";
+
+    /**
+     * map转MultiValueMap
+     * @param map 原map
+     * @return  。
+     */
+    public static MultiValueMap<String, Object> map2MultiValueMap(Map<String, Object> map) {
+        val result = new LinkedMultiValueMap<String, Object>();
+
+        for (Map.Entry<String, Object> entry : map.entrySet()) {
+            if (entry.getValue() != null) {
+                result.add(entry.getKey(), entry.getValue());
+            }
+        }
+
+        return result;
+    }
+    public static Map<String, String> objectToMapString(final Object o, boolean isIgnoreBlankOrNull) {
+        try {
+            Map<String, String> map = new HashMap<String, String>();
+            BeanInfo beanInfo = Introspector.getBeanInfo(o.getClass());
+            for (PropertyDescriptor descriptor : beanInfo.getPropertyDescriptors()) {
+                String name = descriptor.getName();
+                if (classStr.equals(name))
+                    continue;
+                Object obj = descriptor.getReadMethod().invoke(o);
+                if (isIgnoreBlankOrNull
+                        && (obj == null || (obj instanceof String && StringUtil.isBlank((String) obj)))) {
+
+                } else {
+                    map.put(name, String.valueOf(obj));
+                }
+            }
+            return map;
+        } catch (IntrospectionException e) {
+            logger.error("转换异常：{}", e);
+        } catch (IllegalArgumentException e) {
+            logger.error("转换异常：{}", e);
+        } catch (IllegalAccessException e) {
+            logger.error("转换异常：{}", e);
+        } catch (InvocationTargetException e) {
+            logger.error("转换异常：{}", e);
+        }
+        return null;
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/MobPushClient.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/MobPushClient.java
new file mode 100644
index 0000000..4e50920
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/MobPushClient.java
@@ -0,0 +1,60 @@
+package cn.pluss.platform.util;
+
+
+import com.google.common.collect.Sets;
+import mob.push.api.client.push.PushV3Client;
+import mob.push.api.config.MobPushConfig;
+import mob.push.api.http.Result;
+import mob.push.api.model.IosNotify;
+import mob.push.api.model.Push;
+import mob.push.api.model.PushNotify;
+import mob.push.api.model.PushTarget;
+import mob.push.api.res.PushV3Res;
+import org.apache.commons.collections.SetUtils;
+
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * mob 推送工具类
+ */
+public class MobPushClient {
+
+    private static final String APP_KEY = "30db41bafd252";
+
+    private static final String APP_SECRET = "5fc6143d7c4462c8d67650e94698554f";
+
+
+    public static boolean pushMsg(){
+        MobPushConfig.appkey = APP_KEY;
+        MobPushConfig.appSecret = APP_SECRET;
+        PushNotify notify = new PushNotify();
+        notify.setIosProduction(0);
+        notify.setPlats(Sets.newHashSet(2));
+        notify.setContent("收银呗到账100022.00元");
+        notify.setType(1);
+        Push push = new Push();
+        push.setPushNotify(notify);
+        PushTarget pushTarget = new PushTarget();
+//        Set<String> rids = new HashSet<String>();
+//        rids.add("65kyb6mmvuxvaio");
+        pushTarget.setAlias(Sets.newHashSet("1791"));
+
+        notify.setIosNotify(new IosNotify() {{
+            setMutableContent(1);
+        }});
+
+        pushTarget.setTarget(2);
+        push.setPushTarget(pushTarget);
+        Result<PushV3Res> pushV3ResResult = PushV3Client.pushTaskV3(push);
+        System.out.println(DateUtils.formatDateDefault(new Date(), "yyyy-MM-dd HH:mm:ss"));
+        //Result<PushV3Res> result = PushV3Client.pushByRids(null,"收银呗到账","收银呗到账1000.00元","65kyb6mmvuxvaio");
+        System.out.println(pushV3ResResult);
+        return true;
+    }
+
+    public static void main(String[] args) {
+        pushMsg();
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/MobPushUtil.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/MobPushUtil.java
new file mode 100644
index 0000000..cde2d6d
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/MobPushUtil.java
@@ -0,0 +1,214 @@
+package cn.pluss.platform.util;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+import lombok.extern.slf4j.Slf4j;
+import mob.push.api.client.push.PushV3Client;
+import mob.push.api.config.MobPushConfig;
+import mob.push.api.http.Result;
+import mob.push.api.model.*;
+import mob.push.api.res.PushV3Res;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Slf4j
+public class MobPushUtil implements IPush {
+
+    /**
+     * 生产环境还是开发环境
+     */
+    public final static int PROD = 1;
+
+    private static IPush instance;
+
+    private MobPushUtil() {
+    }
+
+    public static IPush getInstance() {
+        if (instance == null) {
+            instance = new MobPushUtil();
+        }
+
+        return instance;
+    }
+
+    private static final String APP_KEY = "30db41bafd252";
+
+    private static final String APP_SECRET = "5fc6143d7c4462c8d67650e94698554f";
+
+    static {
+        MobPushConfig.appkey = APP_KEY;
+        MobPushConfig.appSecret = APP_SECRET;
+    }
+
+    @Override
+    public void sendAndroidByAlias(List<String> alias, String notificationTitle, String msgContent, String extrasParam) {
+        PushNotify notify = generalPushNotify(notificationTitle, msgContent, extrasParam);
+        notify.setPlats(Sets.newHashSet(1));
+
+        Push push = new Push();
+        push.setPushNotify(notify);
+        PushTarget pushTarget = new PushTarget();
+        pushTarget.setAlias(Sets.newHashSet(alias));
+        // 目标类型为别名
+        pushTarget.setTarget(2);
+        notify.setAndroidNotify(new AndroidNotify() {{
+            // 普通通知
+            setStyle(0);
+            setSound("sound.caf");
+        }});
+
+        push.setPushTarget(pushTarget);
+
+        sendAndResultHandle(push);
+    }
+
+    @Override
+    public void sendIOSByAlias(List<String> alias, String notificationTitle, String msgContent, String extrasParam) {
+        PushNotify notify = generalPushNotify(notificationTitle, msgContent, extrasParam);
+        notify.setIosProduction(PROD);
+        notify.setPlats(Sets.newHashSet(2));
+
+        List<String> arrExtra = new ArrayList<>();
+        for (String s : alias) {
+            arrExtra.add(s);
+            arrExtra.add("syb_" + s);
+        }
+
+        Push push = new Push();
+        push.setPushNotify(notify);
+        PushTarget pushTarget = new PushTarget();
+        pushTarget.setAlias(Sets.newHashSet(arrExtra));
+        // 目标类型为别名
+        pushTarget.setTarget(2);
+        notify.setIosNotify(new IosNotify() {{
+            setMutableContent(1);
+            setSound("sound.caf");
+        }});
+
+        push.setPushTarget(pushTarget);
+
+        sendAndResultHandle(push);
+    }
+
+    @Override
+    public void sendAllPlatByAlias(List<String> alias, String notificationTitle, String msgContent, String extrasParam) {
+        PushNotify notify = generalPushNotify(notificationTitle, msgContent, extrasParam);
+        notify.setIosProduction(PROD);
+        notify.setPlats(Sets.newHashSet(1, 2));
+
+        Push push = new Push();
+        push.setPushNotify(notify);
+        PushTarget pushTarget = new PushTarget();
+        pushTarget.setAlias(Sets.newHashSet(alias));
+        // 目标类型为别名
+        pushTarget.setTarget(2);
+        notify.setAndroidNotify(new AndroidNotify() {{
+            // 普通通知
+            setStyle(0);
+            setSound("sound.caf");
+        }});
+        notify.setIosNotify(new IosNotify() {{
+            setMutableContent(1);
+            setSound("sound.caf");
+        }});
+
+        push.setPushTarget(pushTarget);
+
+        sendAndResultHandle(push);
+    }
+
+    @Override
+    public void sendIOSAll(String notificationTitle, String msgContent, String extrasParam) {
+        PushNotify notify = generalPushNotify(notificationTitle, msgContent, extrasParam);
+        notify.setIosProduction(PROD);
+        notify.setPlats(Sets.newHashSet(2));
+
+
+        Push push = new Push();
+        push.setPushNotify(notify);
+        PushTarget pushTarget = new PushTarget();
+        // 广播，推送给全部用户
+        pushTarget.setTarget(1);
+        notify.setIosNotify(new IosNotify() {{
+            setMutableContent(1);
+            setSound("sound.caf");
+        }});
+
+        push.setPushTarget(pushTarget);
+
+        sendAndResultHandle(push);
+    }
+
+    @Override
+    public void sendAndroidAll(String notificationTitle, String msgContent, String extrasParam) {
+        PushNotify notify = generalPushNotify(notificationTitle, msgContent, extrasParam);
+        notify.setPlats(Sets.newHashSet(1));
+
+        Push push = new Push();
+        push.setPushNotify(notify);
+        PushTarget pushTarget = new PushTarget();
+        // 广播
+        pushTarget.setTarget(1);
+        notify.setAndroidNotify(new AndroidNotify() {{
+            // 普通通知
+            setStyle(0);
+            setSound("sound.caf");
+        }});
+
+        push.setPushTarget(pushTarget);
+
+        sendAndResultHandle(push);
+    }
+
+    @Override
+    public void sendAllPlatAll(String notificationTitle, String msgContent, String extrasParam) {
+        PushNotify notify = generalPushNotify(notificationTitle, msgContent, extrasParam);
+        notify.setIosProduction(PROD);
+        notify.setPlats(Sets.newHashSet(1, 2));
+
+        Push push = new Push();
+        push.setPushNotify(notify);
+        PushTarget pushTarget = new PushTarget();
+        // 目标类型为广播
+        pushTarget.setTarget(1);
+        notify.setAndroidNotify(new AndroidNotify() {{
+            // 普通通知
+            setStyle(0);
+            setSound("sound.caf");
+        }});
+        notify.setIosNotify(new IosNotify() {{
+            setMutableContent(1);
+            setSound("sound.caf");
+        }});
+
+        push.setPushTarget(pushTarget);
+
+        sendAndResultHandle(push);
+    }
+
+    private PushNotify generalPushNotify(String notificationTitle, String msgContent, String extrasParam) {
+        PushNotify pushNotify = new PushNotify();
+        PushMap pushMap = new PushMap();
+        pushMap.setKey("url");
+        pushMap.setValue(extrasParam);
+        pushNotify.setExtrasMapList(Lists.newArrayList(pushMap));
+        pushNotify.setOfflineSeconds(86400);
+        pushNotify.setTitle(notificationTitle);
+        pushNotify.setContent(msgContent);
+        // type为1时，为通知
+        pushNotify.setType(1);
+
+        return pushNotify;
+    }
+
+    private void sendAndResultHandle(Push push) {
+        try {
+            Result<PushV3Res> pushV3ResResult = PushV3Client.pushTaskV3(push);
+        } catch (Exception e) {
+            System.out.println();
+            log.error("[mob推送]  ", e.toString());
+        }
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/OssOperatUtil.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/OssOperatUtil.java
new file mode 100644
index 0000000..c1e34c6
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/OssOperatUtil.java
@@ -0,0 +1,274 @@
+package cn.pluss.platform.util;
+
+
+import cn.jiguang.common.utils.StringUtils;
+import cn.pluss.platform.config.OssConfig;
+import com.alibaba.fastjson.JSONObject;
+import com.aliyun.oss.*;
+import com.aliyun.oss.common.utils.BinaryUtil;
+import com.aliyun.oss.model.GetObjectRequest;
+import com.aliyun.oss.model.MatchMode;
+import com.aliyun.oss.model.PolicyConditions;
+import com.aliyun.oss.model.PutBucketImageRequest;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.InputStream;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+/**
+ * aliyun oss upload utils
+ */
+@Component
+public class OssOperatUtil {
+
+    private static Logger logger = LoggerFactory.getLogger(OssOperatUtil.class);
+
+    @Autowired
+    private OssConfig ossConfig;
+
+    private static OssConfig  config = null;
+
+    public static  final String  APP_PATH = "app/";
+
+    public static  final String  IMAGE_PATH = "images/";
+
+    public static final  String imageType = "jpg|png|jpeg|bmp|tif|svg";
+
+    public static final  String appType = "apk|ipa";
+
+    public static final  String OTHER_PATH = "other/";
+
+    //利用@PostConstruct将yml中配置的值赋给本地的变量
+    @PostConstruct
+    public void getConfig(){
+        config = this.ossConfig;
+    }
+
+
+    /**
+     * OSS上传 上传公开文件至公共读写bucket
+     * @author LH_Yu
+     * @Param fileType 文件类型
+     * @Param is 上传文件
+     * @Param fileName
+     * @Param suffix 文件后缀名
+     */
+    public static String upload(InputStream is, String fileName, String suffix) {
+        OSS client = null;
+        String folderName = null;
+        try{
+            if(StringUtil.isEmpty(suffix)){
+                logger.error("===========>上传文件后缀名不能为空<============");
+                return null;
+            }
+            if(".".contains(suffix)){
+                suffix = suffix.replace(".","");
+            }
+            if(imageType.contains(suffix)){
+                folderName = IMAGE_PATH;
+            }else if(appType.contains(suffix)){
+                folderName = APP_PATH;
+            }else{
+                folderName = OTHER_PATH;
+            }
+            client = config.ossClient();
+            String fileKey = folderName + fileName +"."+suffix;
+            client.putObject(config.getBucketname(),fileKey , is);
+            client.shutdown();
+            return getUrl(fileKey);
+        } catch (Exception e){
+            logger.error("===============上传文件至oss服务器出错，错误信息：{}===============",e.getMessage());
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+
+    public static String upload(File file, String suffix) {
+        OSS client = null;
+        try{
+            client = config.ossClient();
+            String fileName = file.getName();
+            String folderName = null;
+            if(imageType.contains(suffix)){
+                folderName = IMAGE_PATH;
+            }else if(appType.contains(suffix)){
+                folderName = APP_PATH;
+            }else{
+                folderName = OTHER_PATH;
+            }
+            String fileKey = folderName + fileName;
+            client.putObject(config.getBucketname(),fileKey,file);
+            client.shutdown();
+            return getUrl(fileKey);
+        } catch (Exception e){
+            logger.error("===============上传文件至oss服务器出错，错误信息：{}===============",e.getMessage());
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+
+    /**
+     * 获得url链接
+     *
+     * @param key
+     * @return
+     */
+    public static String getUrl(String key) {
+        // 设置URL过期时间为10年 3600l* 1000*24*365*10
+        OSS oss = config.ossClient();
+        Date expiration = new Date(System.currentTimeMillis() + 3600L * 1000 * 24 * 365 * 10);
+        // 生成URL
+        URL url = oss.generatePresignedUrl(config.getBucketname(), key, expiration);
+        oss.shutdown();
+        if (url != null) {
+            return url.toString();
+        }
+        return null;
+    }
+    /**
+     * OSS下载文件
+     * @param filename
+     * @param path
+     * @return
+     */
+    public static boolean download(String filename, String path){
+        boolean flag = false;
+        try{
+            OSS oss = config.ossClient();
+            oss.getObject(new GetObjectRequest(config.getBucketname(), filename), new File(path));
+            oss.shutdown();
+        }catch(Exception e){
+            logger.error("===============从OSS下载文件出错，错误信息：{}===============", e);
+            return flag;
+        }
+        logger.info("===============从OSS下载文件成功！===============");
+        return true;
+    }
+
+    /**
+     * 创建文件夹
+     * @param folderName
+     * @return
+     */
+    public static boolean createFolder(String folderName){
+        try {
+            OSS oss = config.ossClient();
+            if(StringUtils.isEmpty(folderName)){
+                return false;
+            }
+            if(!folderName.endsWith("/")){
+                folderName = folderName + "/";
+            }
+            //Create an empty folder without request body, note that the key must be suffixed with a slash
+            oss.putObject(config.getBucketname(), folderName, new ByteArrayInputStream(new byte[0]));
+            oss.shutdown();
+            logger.info("===============OSS创建文件夹成功===============");
+            return true;
+        } catch (OSSException oe) {
+            logger.error("===============OSS创建文件夹异常，异常信息：{}===============" ,oe);
+        } catch (ClientException ce) {
+            logger.error("===============OSS创建文件夹异常，异常信息：{}===============" ,ce);
+        }
+        return false;
+    }
+
+    /**
+     * 删除文件
+     *
+     * @param filename   文件名字(全名-路径+文件名)
+     * @return
+     */
+    public static boolean deleteFile(String filename){
+        try {
+            OSS oss = config.ossClient();
+            if(StringUtils.isEmpty(filename)){
+                return false;
+            }
+            oss.deleteObject(config.getBucketname(), filename);
+            oss.shutdown();
+            return true;
+        } catch (OSSException oe) {
+            logger.error("===============OSS删除文件异常，异常信息：{}===============" ,oe);
+        } catch (ClientException ce) {
+            logger.error("===============OSS删除文件异常，异常信息：{}===============" ,ce);
+        }
+        return false;
+    }
+
+    /**
+     * 删除oss链接形式的文件
+     * @param url
+     * @return
+     */
+    public static boolean deleteUrlFile(String url){
+        try {
+            URI uri = new URI(url);
+            String host = uri.getScheme()+"://" + uri.getHost() + "/";
+            String domain = url.split("\\?")[0];
+            String fileKey = domain.replace(host, "");
+            return deleteFile(fileKey);
+        } catch (URISyntaxException e) {
+            e.printStackTrace();
+            logger.error("阿里云oss文件删除失败，失败原因：{}",e.getMessage());
+            return false;
+        }
+    }
+
+    public static Map<String,String> getUploadParam() {
+        logger.info("==============>获取上传参数:{}<===================",config);
+        Map<String,String> result = new HashMap<>(7);
+        // 创建OSSClient实例。
+        OSS ossClient = new OSSClientBuilder().build(config.getEndpoint(), config.getKeyid(), config.getKeysecret());
+        try {
+            long expireTime = 60;
+            long expireEndTime = System.currentTimeMillis() + expireTime * 1000;
+            Date expiration = new Date(expireEndTime);
+            String dir = OssOperatUtil.APP_PATH;
+            String enpoint = config.getEndpoint().replace("https://","").replace("http://","");
+            String host = "https://" + config.getBucketname() + "." + enpoint; // host的格式为 bucketname.endpoint
+            // callbackUrl为 上传回调服务器的URL，请将下面的IP和Port配置为您自己的真实信息。
+            // PostObject请求最大可支持的文件大小为5 GB，即CONTENT_LENGTH_RANGE为5*1024*1024*1024。
+            PolicyConditions policyConds = new PolicyConditions();
+            policyConds.addConditionItem(PolicyConditions.COND_CONTENT_LENGTH_RANGE, 0, 1048576000);
+            policyConds.addConditionItem(MatchMode.StartWith, PolicyConditions.COND_KEY, dir);
+            String postPolicy = ossClient.generatePostPolicy(expiration, policyConds);
+            byte[] binaryData = postPolicy.getBytes("utf-8");
+            String encodedPolicy = BinaryUtil.toBase64String(binaryData);
+            String postSignature = ossClient.calculatePostSignature(postPolicy);
+
+            JSONObject jasonCallback = new JSONObject();
+            jasonCallback.put("callbackUrl", config.getCallback());
+            jasonCallback.put("callbackBody",
+                    "filename=${object}&size=${size}&mimeType=${mimeType}&height=${imageInfo.height}&width=${imageInfo.width}");
+            jasonCallback.put("callbackBodyType", "application/x-www-form-urlencoded");
+            String base64CallbackBody = BinaryUtil.toBase64String(jasonCallback.toString().getBytes());
+            String key = UUID.randomUUID().toString().replace("-","").toUpperCase();
+            result.put("accessid", config.getKeyid());
+            result.put("policy", encodedPolicy);
+            result.put("signature", postSignature);
+            result.put("key", dir+key);
+            result.put("host", host);
+            result.put("expire", String.valueOf(expireEndTime / 1000));
+            result.put("callBack",base64CallbackBody);
+            return result;
+        } catch (Exception e) {
+        } finally {
+            ossClient.shutdown();
+        }
+        return result;
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/Page.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/Page.java
new file mode 100644
index 0000000..e6a6572
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/Page.java
@@ -0,0 +1,85 @@
+package cn.pluss.platform.util;
+
+import java.util.Map;
+
+/**
+ * 
+ * 分页器接口，根据page,pageSize,total用于页面上分页显示多项内容，计算页码和当前页的偏移量，方便页面分页使用.
+ * 
+ */
+public interface Page {
+	/**
+	 * 取总记录数.
+	 */
+	public long getTotal();
+
+	/**
+	 * 取总页数.
+	 */
+	public int getPageCount();
+
+	/**
+	 * 取每页数据容量.
+	 */
+	public int getPageSize();
+
+	/**
+	 * 得到页码
+	 * 
+	 * @return
+	 */
+	public int getCurrent();
+
+	/**
+	 * 是否为起始页
+	 * 
+	 * @return
+	 */
+	public boolean hasPrevious();
+
+	/**
+	 * 是否为末页
+	 * 
+	 * @return
+	 */
+	public boolean hasNext();
+
+	/**
+	 * 得到上一页的页码
+	 * 
+	 * @return
+	 */
+	public int getPrevious();
+
+	/**
+	 * 得到下一页的页码
+	 * 
+	 * @return
+	 */
+	public int getNext();
+
+	/**
+	 * 得到该页的数据
+	 * 
+	 * @return
+	 */
+	@SuppressWarnings("rawtypes")
+	public java.util.Collection getResult();
+
+	/**
+	 * 获取任一页第一条数据在数据集的位置，每页条数使用默认值.
+	 * 
+	 * 
+	 */
+	public int getStart();
+
+	/**
+	 * 获取任一页第后一条数据在数据集的位置，每页条数使用默认值.
+	 * 
+	 * 
+	 */
+	public int getEnd();
+
+	public Map getConditionsMap();
+
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/ParametersUtil.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/ParametersUtil.java
new file mode 100644
index 0000000..5d5f12a
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/ParametersUtil.java
@@ -0,0 +1,190 @@
+package cn.pluss.platform.util;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @author yuchen
+ *
+ * @Description 
+ */
+public class ParametersUtil {
+
+	public static String getRequestPrefix(HttpServletRequest request) {
+		return  "https://" + request.getServerName() + request.getContextPath();
+	}
+
+	public static String getSelfRedirectUrl(HttpServletRequest request, String requestPath) {
+		return getRequestPrefix(request) + requestPath;
+	}
+
+	/**
+	 * 上传图片保存路径
+	 */
+	public static String upload_save_path;
+	/**
+	 * 上传图片访问路径
+	 */
+	public static String upload_visit_path;
+	/**
+	 * 获取支付宝授权token
+	 */
+	public static String ALI_APP_AUTH_TOKEN;
+	/**
+	 * 支付宝费率
+	 */
+	public static Double ALI_RATE;
+	/**
+	 * 微信费率
+	 */
+	public static Double WECHAT_RATE;
+	/**
+	 * 微信支付appid
+	 */
+	public static String APPID;
+	/**
+	 * 小程序付款的appid
+	 */
+	public static String APPLETS_APPID;
+	/**
+	 * AppSecret
+	 */
+	public static String APPSECRET;
+	/**
+	 *商户号
+	 */
+	public static String PID;
+	/**
+	 * 秘钥
+	 */
+	public static String KEY;
+	/**
+	 * 微信支付回调地址
+	 */
+	public static String wechatCallback;
+	/**
+	 * 支付宝Appid
+	 */
+	public static String ALI_APP_ID;
+	/**
+	 * 支付宝私钥
+	 */
+	public static String PRI;
+	/**
+	 * 支付宝公钥
+	 */
+	public static String PUB;
+	/**
+	 * 支付宝授权回调地址
+	 */
+	public static String ALI_RETURN_URL;
+	/**
+	 * 服务器域名
+	 */
+	public static String domain;
+	/**
+	 * 乐刷代理商编号
+	 */
+	public static String agentId;
+	/**
+	 * 乐刷进件和交易请求密钥（key
+	 */
+	public static String leshuapaykey;
+	/**
+	 * 交易异步通知回调密钥
+	 */
+	public static String leshuaCallBackKey;
+	/**
+	 * 粉丝分润比例
+	 */
+	public static Double fans_profit;
+	/**
+	 *乐刷费率
+	 */
+	public static Double leshuarate;
+	/**
+	 * 下载apk地址
+	 */
+	public static String apk_dowload_url;
+	/**
+	 *apk版本号
+	 */
+	public static String versions;
+	/**
+	 * 官网获取的 API Key  OCR
+	 */
+	public static String baiduAK;
+	/**
+	 * 官网获取的 Secret Key OCR
+	 */
+	public static String baiduSK;
+	/**
+	 * 官网获取的 API Key  人脸识别
+	 */
+	public static String baiduAK2;
+	/**
+	 * 官网获取的 Secret Key 人脸识别
+	 */
+	public static String baiduSK2;
+	/**
+	 * 身份证OCR接口地址
+	 */
+	public static String idCardOCRUrl;
+	/**
+	 * 银行卡OCR接口地址
+	 */
+	public static String bankCardOCRUrl;
+	/**
+	 * 营业执照OCR接口地址
+	 */
+	public static String blCardOCRUrl;
+	/**
+	 * 阿里自用型应用appid
+	 */
+	public static String ZY_ALI_APP_ID;
+	/**
+	 * 阿里自用型应用私钥
+	 */
+	public static String ZY_PRI;
+	/**
+	 * 阿里自用型应用公钥
+	 */
+	public static String ZY_PUB;
+	/**
+	 * 刘思义本人的乐刷的商户编号 用来收推广人升级的钱
+	 */
+	public static String LESHUALIU;
+
+	/**
+	 * 收银呗微信普通商户APPID
+	 */
+	public static String MERCHANT_APPID;
+
+	/**
+	 * 收银呗微信普通商户Appsecret
+	 */
+	public static String MERCHANT_APPSECRET;
+
+	/**
+	 * 收银呗微信普通商户号
+	 */
+	public static String MERCHANT_PID;
+
+	/**
+	 * 收银呗微信普通商户key
+	 */
+	public static String MERCHANT_KEY;
+	public static String LESHUA_API;
+
+	/**
+	 * @description:收银呗商家公众号APPID
+	 * @date: 2021/9/23 10:27
+	 */
+	public static String SJ_APPID;
+
+	/**
+	 * @description:收银呗商家公众号APPSECRET
+	 * @date: 2021/9/23 10:27
+	 */
+	public static String SJ_APPSECRET;
+}
+
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/ParamsCheckUtil.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/ParamsCheckUtil.java
new file mode 100644
index 0000000..a8bf2d6
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/ParamsCheckUtil.java
@@ -0,0 +1,28 @@
+package cn.pluss.platform.util;
+
+import org.springframework.validation.BindingResult;
+import org.springframework.validation.FieldError;
+
+/**
+ * 参数校验工具
+ * @author Djh
+ */
+public class ParamsCheckUtil {
+
+    /**
+     * 获取校验结果
+     * @param bindingResult bindingResult
+     * @return 校验结果
+     */
+    public static String getErrorMsg(BindingResult bindingResult) {
+        StringBuilder errorData = new StringBuilder();
+
+        if (bindingResult.hasErrors()) {
+            for (FieldError fieldError: bindingResult.getFieldErrors()) {
+                errorData.append(fieldError.getDefaultMessage()).append(";");
+            }
+        }
+
+        return errorData.toString();
+    }
+}
\ No newline at end of file
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/PayUtil.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/PayUtil.java
new file mode 100644
index 0000000..b6953a0
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/PayUtil.java
@@ -0,0 +1,49 @@
+package cn.pluss.platform.util;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.alipay.api.AlipayApiException;
+import com.alipay.api.AlipayClient;
+import com.alipay.api.DefaultAlipayClient;
+import com.alipay.api.request.AlipayTradePayRequest;
+import com.alipay.api.response.AlipayTradePayResponse;
+
+public class PayUtil {
+
+	public static AlipayTradePayResponse aliPay(String appAuthToken,String orderNumber,String authCode,String storeName,String orderFee) throws AlipayApiException {
+		
+		AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do",AliPayParam.getAppId(),AliPayParam.getPri(),"json","GBK",AliPayParam.getPub(),"RSA2");
+		AlipayTradePayRequest request = new AlipayTradePayRequest();
+		request.putOtherTextParam("app_auth_token", appAuthToken);
+		request.setBizContent("{" +
+		"\"out_trade_no\":\""+orderNumber+"\"," +
+		"\"scene\":\"bar_code\"," +
+		"\"auth_code\":\""+authCode+"\"," +
+		"\"subject\":\""+storeName+"\"," +
+		"\"body\":\""+storeName+"\"," +
+		"\"timeout_express\":\"1m\"," +
+		"\"total_amount\":\""+orderFee+"\"" +
+		"  }");
+		AlipayTradePayResponse response = alipayClient.execute(request);
+		return response;
+	}
+	
+	public static String wechatPay(String code,String orderNumber,String dealFee) {
+		Map<String, String> receiveDataMap = new HashMap<String, String>();
+		receiveDataMap.put("appid", "wxed824282c345b7a0");
+		receiveDataMap.put("mch_id", "1551169371");
+		receiveDataMap.put("sub_mch_id", "1556940571");
+		receiveDataMap.put("nonce_str", StringUtil.genRandomNum().toUpperCase());
+		receiveDataMap.put("body", "零售商品");
+		receiveDataMap.put("out_trade_no", orderNumber);
+		receiveDataMap.put("total_fee", dealFee);
+		receiveDataMap.put("spbill_create_ip", "60.168.58.93");
+		receiveDataMap.put("auth_code", code);
+		receiveDataMap.put("sign_type", "HMAC-SHA256");
+		receiveDataMap.put("sign", WechatSignUtil.sha256Sign(receiveDataMap, "7F05NZBTJ3XNDK5HLSDC3H25ZXOQKDHT"));
+
+		return WXPayHttpUtil.WXHttpPostXMLWithoutCert("https://api.mch.weixin.qq.com/pay/micropay", receiveDataMap);
+	}
+
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/QRCodeMaxUtil.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/QRCodeMaxUtil.java
new file mode 100644
index 0000000..f0e3f47
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/QRCodeMaxUtil.java
@@ -0,0 +1,161 @@
+package cn.pluss.platform.util;
+
+import cn.hutool.core.codec.Base64;
+import com.google.common.collect.Maps;
+import com.google.zxing.BarcodeFormat;
+import com.google.zxing.EncodeHintType;
+import com.google.zxing.MultiFormatWriter;
+import com.google.zxing.common.BitMatrix;
+import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.imageio.ImageIO;
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+
+/**
+ * 二维码背景图片合成类
+ */
+public class QRCodeMaxUtil {
+
+    private static Logger log = LoggerFactory.getLogger(QRCodeMaxUtil.class);
+    //生成的二维码的路径
+    private static final String QR_CODE_IMAGE_PATH = "D:\\temp\\MyQRCode.png";
+
+    //文字显示
+    private static final int QRCOLOR = 0x201f1f; // 二维码颜色:黑色
+    private static final int BGWHITE = 0xFFFFFF; //二维码背景颜色:白色
+
+    private static final int BLACK = 0xFF000000;
+
+    private static final int WHITE = 0xFFFFFFFF;
+
+    // 设置QR二维码参数信息
+    private static Map<EncodeHintType, Object> hints = new HashMap<EncodeHintType, Object>() {
+        private static final long serialVersionUID = 1L;
+        {
+            put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.M);// 设置QR二维码的纠错级别(H为最高级别)
+            put(EncodeHintType.CHARACTER_SET, "utf-8");// 设置编码方式
+            put(EncodeHintType.MARGIN, 0);// 白边
+        }
+    };
+
+    /**
+     * 生成二维码图片+背景+文字描述
+     * @param bgImgFile 背景图地址
+     * @param WIDTH 二维码宽度
+     * @param HEIGHT 二维码高度
+     * @param qrUrl 二维码识别地址
+     * @param note  文字描述1
+     * @param tui   文字描述2
+     * @param size 文字大小
+     * @param imagesX 二维码x轴方向
+     * @param imagesY 二维码y轴方向
+     * @param text1X 文字描述1x轴方向
+     * @param text1Y 文字描述1y轴方向
+     * @param text2X 文字描述2x轴方向
+     * @param text2Y 文字描述2y轴方向
+     */
+    public static String CreatQRCode(File bgImgFile, Integer WIDTH, Integer HEIGHT, String qrUrl,
+                                   String note, String tui, Integer size, Integer imagesX, Integer imagesY, Integer text1X, Integer text1Y
+            , Integer text2X, Integer text2Y) {
+        try {
+            MultiFormatWriter multiFormatWriter = new MultiFormatWriter();
+            // 参数顺序分别为: 编码内容,编码类型,生成图片宽度,生成图片高度,设置参数
+            BitMatrix bm = multiFormatWriter.encode(qrUrl, BarcodeFormat.QR_CODE, WIDTH, HEIGHT, hints);
+            BufferedImage image = new BufferedImage(WIDTH, HEIGHT, BufferedImage.TYPE_INT_RGB);
+
+            // 开始利用二维码数据创建Bitmap图片，分别设为黑(0xFFFFFFFF) 白(0xFF000000)两色
+            for (int x = 0; x < WIDTH; x++) {
+                for (int y = 0; y < HEIGHT; y++) {
+                    image.setRGB(x, y, bm.get(x, y) ? QRCOLOR : BGWHITE);
+                }
+            }
+
+            /*
+             *     添加背景图片
+             */
+            BufferedImage backgroundImage = ImageIO.read(bgImgFile);
+            int bgWidth = backgroundImage.getWidth();
+            int qrWidth=image.getWidth();
+            //距离背景图片x边的距离，居中显示
+            int disx=(bgWidth-qrWidth)-imagesX;
+            //距离y边距离 * * * *
+            int disy=imagesY;
+            Graphics2D rng=backgroundImage.createGraphics();
+            rng.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_ATOP));
+            rng.drawImage(image,disx,disy,WIDTH,HEIGHT,null);
+
+            /*
+             *     文字描述参数设置
+             */
+
+            Color textColor=Color.white;
+            rng.setColor(textColor);
+            rng.drawImage(backgroundImage,0,0,null);
+            //设置字体类型和大小(BOLD加粗/ PLAIN平常)
+            rng.setFont(new Font("微软雅黑,Arial",Font.BOLD,size));
+            //设置字体颜色
+            rng.setColor(Color.black);
+            int strWidth=rng.getFontMetrics().stringWidth(note);
+
+            //文字1显示位置 //左右 //上下
+            int disx1=(bgWidth-strWidth)-text1X;
+            rng.drawString(note,disx1,text1Y);
+
+            //文字2显示位置 //左右 //上下
+            int disx2=(bgWidth-strWidth)-text2X;
+            rng.drawString(tui,disx2,text2Y);
+
+            rng.dispose();
+            image = backgroundImage;
+            ByteArrayOutputStream stream = new ByteArrayOutputStream();
+            ImageIO.write(image, "png", stream);
+            String base64 = Base64.encode(stream.toByteArray());
+            String newBase64 = "data:image/png;base64,"+Base64Util.compressPic(base64, 500);
+            return newBase64;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+    public static File createQrCode(String url, String path,String suffix,int width,int height) {
+        try {
+            Map<EncodeHintType, String> hints = Maps.newHashMap();
+            hints.put(EncodeHintType.CHARACTER_SET, "UTF-8");
+            BitMatrix bitMatrix = new MultiFormatWriter().encode(url, BarcodeFormat.QR_CODE, width, height, hints);
+            File file = new File(path, StringUtil.genUuid() + "."+ suffix);
+            writeToFile(bitMatrix, suffix, file);
+            return file;
+        } catch (Exception e) {
+            log.error("二维码图片生成失败");
+            return null;
+        }
+    }
+
+    private static void writeToFile(BitMatrix matrix, String format, File file) throws IOException {
+        BufferedImage image = toBufferedImage(matrix);
+        if (!ImageIO.write(image, format, file)) {
+            throw new IOException("Could not write an image of format " + format + " to " + file);
+        }
+    }
+
+    private static BufferedImage toBufferedImage(BitMatrix matrix) {
+        int width = matrix.getWidth();
+        int height = matrix.getHeight();
+        BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
+        for (int x = 0; x < width; x++) {
+            for (int y = 0; y < height; y++) {
+                image.setRGB(x, y, matrix.get(x, y) ? BLACK : WHITE);
+            }
+        }
+        return image;
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/RSAEncryptUtil.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/RSAEncryptUtil.java
new file mode 100644
index 0000000..17988a8
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/RSAEncryptUtil.java
@@ -0,0 +1,97 @@
+package cn.pluss.platform.util;
+
+import java.nio.file.Path;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.security.PublicKey;
+import javax.security.cert.X509Certificate;
+import javax.crypto.Cipher;
+import java.util.Base64;
+
+
+public class RSAEncryptUtil {
+
+	private static final String ALGORITHOM = "RSA";// 固定值，无须修改
+	private static final String CIPHER_PROVIDER = "SunJCE";
+	private static final String TRANSFORMATION_PKCS1Paddiing = "RSA/ECB/PKCS1Padding";
+	private static final String RSA_PKCS1_OAEP_PADDING = "RSA/ECB/OAEPWITHSHA-1ANDMGF1PADDING";
+	
+	private static final String CHAR_ENCODING = "UTF-8";// 固定值，无须修改
+	private static final String CERT ="-----BEGIN CERTIFICATE-----\r\n" + 
+			"MIID3DCCAsSgAwIBAgIUTz/ylkJ1ui0tgyC8gYf7PhjSLf4wDQYJKoZIhvcNAQEL\r\n" + 
+			"BQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT\r\n" + 
+			"FFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg\r\n" + 
+			"Q0EwHhcNMTkwOTE5MDYzOTI4WhcNMjQwOTE3MDYzOTI4WjBuMRgwFgYDVQQDDA9U\r\n" + 
+			"ZW5wYXkuY29tIHNpZ24xEzARBgNVBAoMClRlbnBheS5jb20xHTAbBgNVBAsMFFRl\r\n" + 
+			"bnBheS5jb20gQ0EgQ2VudGVyMQswCQYDVQQGDAJDTjERMA8GA1UEBwwIU2hlblpo\r\n" + 
+			"ZW4wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgVuNIZDy2F7UYQw7+\r\n" + 
+			"QjkWSBLbAimkhZ6Qa6jhquZvUruD1/YpKbtghk/ecxrSDpC8Pqsjl/QjrmkTPWv7\r\n" + 
+			"vNihoAMftuR/nAusmBrTkNlzxEBVvRpf4JRsIHg73wUi5zUJkZn7eAZ7kHVa0zow\r\n" + 
+			"qflsl7w29guTvqUPP1P1+gH+xD3b3fCM1uRINDDqTyFff6p1hM7Fn9wnapKDmcO7\r\n" + 
+			"57QkL8VGNAWknVkBpMYiAmK2R7DlPW5zUleO9M30koNYSIRVwgHiS2Kutd1/gvW7\r\n" + 
+			"g5oC+nDLSgQkwgUoonrXzo1bUkE05icf92v89hDVccaXKzVjGgMP407s88++amNV\r\n" + 
+			"5J65AgMBAAGjgYEwfzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE8DBlBgNVHR8EXjBc\r\n" + 
+			"MFqgWKBWhlRodHRwOi8vZXZjYS5pdHJ1cy5jb20uY24vcHVibGljL2l0cnVzY3Js\r\n" + 
+			"P0NBPTFCRDQyMjBFNTBEQkMwNEIwNkFEMzk3NTQ5ODQ2QzAxQzNFOEVCRDIwDQYJ\r\n" + 
+			"KoZIhvcNAQELBQADggEBAABTz0NLnc0bn7InEDVuYMEebEzZv3BxhHVdnzX6R0gQ\r\n" + 
+			"Ug0QifHdAtbh/qL10E4FjVACyWOOWgPoX/9I1BZjfxddzQgbUib3XybloR6eE0z3\r\n" + 
+			"WUh/B88cCM3GsJU4btaxY0qpTkEjEcqP7K+4ZrJyfCItAfxWqYh6sllGbFVvRSYa\r\n" + 
+			"brlEI+lbdlNVnshrRNegtFZIJ40O8aSpNA/2R0+5lEKPeYiQUO4qYbCE3lkPpY9S\r\n" + 
+			"p0SMyX0UmB9SIwOFAX+BX3KJ6GBKh+zqSmd0hm4NtbCNRmEG9gYQPl845FdYizKJ\r\n" + 
+			"RIk+gkdXBduIpO3/ZkzED/PYMOj/hhJdLNByPe78Ipo=\r\n" + 
+			"-----END CERTIFICATE-----";
+	private static final String PUBLIC_KEY ="-----BEGIN PUBLIC KEY-----\r\n" + 
+			"MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArjSigZVVYy1LzeKmjrJY\r\n" + 
+			"TVh1pS2mYa07hcXOH0vDGBFp8XY1HlJTedTDmYL9pBH/q6PSAf/mvQrXjEbOgFoa\r\n" + 
+			"ro2qEr+SLIze47hxXdZKtgHOKdX6XmjJ9zc1VgB1xHGL339fyOsAz9+lYy1aBClw\r\n" + 
+			"eInkruUBHSudF38dQY43UtHjLoXnrX+CiQCofTqcjbfjVgl/MKcsF6XVajkZ/yOa\r\n" + 
+			"I3kOaQ+YAxB45lAn8vt7rK+VvdkwEf/A1U0+jxwChpdzNlTGMy9qpIWQiILA1Z4+\r\n" + 
+			"9PtWq/3EYxGPKJyxG0PCSGT495v/rAbnYHDt37E4PqslBYBskYLlmQOIh4oltVMX\r\n" + 
+			"wwIDAQAB\r\n" + 
+			"-----END PUBLIC KEY-----";
+
+	/**
+	 * 数据加密方法
+	 * @param publicKey
+	 * @param data
+	 * @return
+	 * @throws Exception
+	 */
+	private static byte[] encryptPkcs1padding(PublicKey publicKey, byte[] data) throws Exception {
+		Cipher ci = Cipher.getInstance(TRANSFORMATION_PKCS1Paddiing, CIPHER_PROVIDER);
+		ci.init(Cipher.ENCRYPT_MODE, publicKey);
+		return ci.doFinal(data);
+	}
+
+	/**
+	 * 加密后的秘文，使用base64编码方法
+	 * @param bytes
+	 * @return
+	 * @throws Exception
+	 */
+	private static String encodeBase64(byte[] bytes) throws Exception {
+		return Base64.getEncoder().encodeToString(bytes);
+	}
+
+	/**
+	 * 对敏感内容（入参Content）加密，其中PUBLIC_KEY_FILENAME为存放平台证书的路径，平台证书文件存放明文平台证书内容，且为pem格式的平台证书（平台证书的获取方式参照平台证书及序列号获取接口，通过此接口得到的参数certificates包含了加密的平台证书内容ciphertext，然后根据接口文档中平台证书解密指引，最终得到明文平台证书内容）
+	 * @param Content
+	 * @return
+	 * @throws Exception
+	 */
+	public static String rsaEncrypt(String Content) throws Exception {
+		X509Certificate certificate = X509Certificate.getInstance(CERT.getBytes());
+		PublicKey publicKey = certificate.getPublicKey();
+		System.out.println(publicKey);
+		return encodeBase64(encryptPkcs1padding(publicKey, Content.getBytes(CHAR_ENCODING)));
+	}
+	
+	public static String rsaEncrypt(String Content,String ras) throws Exception {
+		X509Certificate certificate = X509Certificate.getInstance(PUBLIC_KEY.getBytes());
+		PublicKey publicKey = certificate.getPublicKey();
+		System.out.println(publicKey);
+		Cipher ci = Cipher.getInstance(RSA_PKCS1_OAEP_PADDING);
+		ci.init(Cipher.ENCRYPT_MODE, publicKey);
+		return encodeBase64(ci.doFinal(Content.getBytes(CHAR_ENCODING)));
+	}
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/RSAUtils.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/RSAUtils.java
new file mode 100644
index 0000000..817fb6c
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/RSAUtils.java
@@ -0,0 +1,213 @@
+package cn.pluss.platform.util;
+
+import cn.pluss.platform.exception.MsgException;
+import com.aliyun.oss.ServiceException;
+import javax.crypto.BadPaddingException;
+import javax.crypto.Cipher;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.NoSuchPaddingException;
+import java.io.*;
+import java.nio.charset.StandardCharsets;
+import java.security.*;
+import java.security.interfaces.RSAPrivateKey;
+import java.security.interfaces.RSAPublicKey;
+import java.security.spec.PKCS8EncodedKeySpec;
+import java.security.spec.X509EncodedKeySpec;
+import java.util.Base64;
+
+/**
+ * @author DJH
+ * rsa加密、解密，签名、验签工具类
+ */
+public class RSAUtils {
+    
+    private RSAUtils() {}
+
+    public static final String RSA = "RSA";
+
+    public static final String CIPHERALGORITHM = "RSA/ECB/PKCS1Padding";
+
+    public static String sign(String privateKey, String src) throws Exception {
+        RSAPrivateKey rsaPrivateKey = (RSAPrivateKey) getPrivateKey(privateKey);
+        return sign(rsaPrivateKey, src);
+    }
+
+    public static boolean checkSign(String publicKey, String src, String sign) throws Exception {
+        RSAPublicKey rsaPublicKey = (RSAPublicKey) getPublicKey(publicKey);
+        return checkSign(rsaPublicKey, src, sign);
+    }
+
+    public static String signSHA256(String privateKey, String src) throws Exception {
+        RSAPrivateKey rsaPrivateKey = (RSAPrivateKey) getPrivateKey(privateKey);
+        return signSHA256WithRSA(rsaPrivateKey, src);
+    }
+
+    public static boolean checkSignSHA256(String publicKey, String src, String sign) throws Exception {
+        RSAPublicKey rsaPublicKey = (RSAPublicKey) getPublicKey(publicKey);
+        return checkSignSHA256WithRSA(rsaPublicKey, src, sign);
+    }
+
+    /**
+     * 私钥签名过程
+     *
+     * @param rsaPrivateKey 私钥
+     * @param plainTextData 明文数据
+     * @return
+     * @throws Exception 加密过程中的异常信息
+     */
+    public static String sign(RSAPrivateKey rsaPrivateKey, String plainTextData) throws Exception {
+        if (rsaPrivateKey == null) {
+            throw new MsgException("签名私钥为空, 请设置");
+        }
+
+        Signature signature = Signature.getInstance("SHA1withRSA");
+        signature.initSign(rsaPrivateKey);
+        signature.update(plainTextData.getBytes());
+        byte[] result = signature.sign();
+
+        return Base64.getEncoder().encodeToString(result);
+    }
+
+    /**
+     * 私钥签名过程
+     *
+     * @param rsaPrivateKey 私钥
+     * @param plainTextData 明文数据
+     * @return
+     * @throws Exception 加密过程中的异常信息
+     */
+    public static String signSHA256WithRSA(RSAPrivateKey rsaPrivateKey, String plainTextData) throws Exception {
+        if (rsaPrivateKey == null) {
+            throw new MsgException("签名私钥为空, 请设置");
+        }
+
+        Signature signature = Signature.getInstance("SHA256withRSA");
+        signature.initSign(rsaPrivateKey);
+        signature.update(plainTextData.getBytes());
+        byte[] result = signature.sign();
+
+        return Base64.getEncoder().encodeToString(result);
+    }
+
+    public static boolean checkSign(RSAPublicKey rsaPublicKey, String src, String sign) throws Exception {
+        Signature signature = Signature.getInstance("SHA1withRSA");
+        signature.initVerify(rsaPublicKey);
+        signature.update(src.getBytes(StandardCharsets.UTF_8));
+        return signature.verify(Base64.getDecoder().decode(sign));
+    }
+
+    public static boolean checkSignSHA256WithRSA(RSAPublicKey rsaPublicKey, String src, String sign) throws Exception {
+        Signature signature = Signature.getInstance("SHA256withRSA");
+        signature.initVerify(rsaPublicKey);
+        signature.update(src.getBytes(StandardCharsets.UTF_8));
+        return signature.verify(Base64.getDecoder().decode(sign));
+    }
+
+    public static PublicKey getPublicKey(String key) throws Exception {
+        byte[] keyBytes;
+        keyBytes = Base64.getDecoder().decode(key);
+        X509EncodedKeySpec keySpec = new X509EncodedKeySpec(keyBytes);
+        KeyFactory keyFactory = KeyFactory.getInstance(RSA);
+        return keyFactory.generatePublic(keySpec);
+    }
+
+    public static PrivateKey getPrivateKey(String key) throws Exception {
+        byte[] keyBytes;
+        keyBytes = Base64.getDecoder().decode(key);
+        PKCS8EncodedKeySpec keySpec = new PKCS8EncodedKeySpec(keyBytes);
+        KeyFactory keyFactory = KeyFactory.getInstance(RSA);
+        return keyFactory.generatePrivate(keySpec);
+    }
+
+    /**
+     * 公钥加密过程
+     *
+     * @param rsaPublicKey  公钥
+     * @param plainTextData 明文数据
+     * @return
+     * @throws Exception 加密过程中的异常信息
+     */
+    public static String encrypt(RSAPublicKey rsaPublicKey, String plainTextData) throws Exception {
+        if (rsaPublicKey == null) {
+            throw new MsgException("加密公钥为空, 请设置");
+        }
+
+        Base64.Encoder encoder = Base64.getEncoder();
+
+        Cipher cipher = Cipher.getInstance(RSA);
+        cipher.init(Cipher.ENCRYPT_MODE, rsaPublicKey);
+        byte[] output = cipher.doFinal(plainTextData.getBytes(StandardCharsets.UTF_8));
+        return encoder.encodeToString(output);
+    }
+
+    /**
+     * 使用私钥解密
+     * @param rsaPrivateKey  私钥
+     * @param encryptParam  公钥加密的字符串
+     * @return  解密后的字符串
+     * */
+    public static String decrypt(RSAPrivateKey rsaPrivateKey,String encryptParam) throws Exception {
+        Base64.Decoder decoder = Base64.getDecoder();
+        Base64.Encoder encoder = Base64.getEncoder();
+
+        Cipher cipher;
+        try {
+            cipher = Cipher.getInstance(RSA);
+            cipher.init(Cipher.DECRYPT_MODE, rsaPrivateKey);
+            byte[] output = cipher.doFinal(decoder.decode(encryptParam));
+            return new String(output, StandardCharsets.UTF_8);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    /**
+     * Ecb解密
+     * @param encryptedBytes
+     * @param privateKey
+     * @param keyLength
+     * @param reserveSize
+     * @return
+     */
+    public static byte[] decryptEcb(byte[] encryptedBytes, PrivateKey privateKey, int keyLength, int reserveSize) throws ServiceException{
+        int keyByteSize = keyLength / 8; // 密钥字节数
+        int decryptBlockSize = keyByteSize - reserveSize; // 解密块大小=密钥字节数-padding填充字节数
+        int nBlock = encryptedBytes.length / keyByteSize;// 计算分段解密的block数，理论上能整除
+
+        try {
+            Cipher cipher = Cipher.getInstance(CIPHERALGORITHM);
+            cipher.init(Cipher.DECRYPT_MODE, privateKey);
+
+            // 输出buffer，大小为nBlock个decryptBlockSize
+            ByteArrayOutputStream outbuf = new ByteArrayOutputStream(nBlock * decryptBlockSize);
+            // 分段解密
+            for (int offset = 0; offset < encryptedBytes.length; offset += keyByteSize) {
+                // block大小: decryptBlock 或 剩余字节数
+                int inputLen = encryptedBytes.length - offset;
+                if (inputLen > keyByteSize) {
+                    inputLen = keyByteSize;
+                }
+                // 得到分段解密结果
+                byte[] decryptedBlock = cipher.doFinal(encryptedBytes, offset, inputLen);
+                // 追加结果到输出buffer中
+                outbuf.write(decryptedBlock);
+            }
+            outbuf.flush();
+            outbuf.close();
+            return outbuf.toByteArray();
+        } catch (NoSuchAlgorithmException e) {
+            throw new ServiceException(String.format("没有[%s]此类解密算法", CIPHERALGORITHM));
+        } catch (NoSuchPaddingException e) {
+            throw new ServiceException(String.format("没有[%s]此类填充模式", CIPHERALGORITHM));
+        } catch (InvalidKeyException e) {
+            throw new ServiceException("无效密钥");
+        } catch (IllegalBlockSizeException e) {
+            throw new ServiceException("解密块大小不合法");
+        } catch (BadPaddingException e) {
+            throw new ServiceException("错误填充模式");
+        } catch (IOException e) {
+            throw new ServiceException("字节输出流异常");
+        }
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/RegexUtils.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/RegexUtils.java
new file mode 100644
index 0000000..c85933b
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/RegexUtils.java
@@ -0,0 +1,34 @@
+package cn.pluss.platform.util;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * @author DJH
+ * 一些常用的正则校验
+ */
+public class RegexUtils {
+    
+    public static final String PHONE_REGEX = "^(((13[0-9])|(14[0|5|7|9])|(15[0-9])|(16[2|5|6|7])|(17[0-9])|(18[0-9])|(19[1|3|5|6|7|8|9]))\\d{8})$";
+
+    private RegexUtils() {}
+
+    /**
+     * 校验手机号的正确性
+     *
+     * @param phone 手机号
+     * @return 是否是手机号
+     */
+    public static boolean checkPhone(String phone) {
+        return check(phone, PHONE_REGEX);
+    }
+
+    public static boolean check(String target, String regex) {
+        // 创建一个匹配模式
+        Pattern p = Pattern.compile(regex);
+        // 返回matcher对象
+        Matcher m = p.matcher(target);
+
+        return m.matches();
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/RequestUtil.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/RequestUtil.java
new file mode 100644
index 0000000..048f073
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/RequestUtil.java
@@ -0,0 +1,111 @@
+package cn.pluss.platform.util;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+
+public class RequestUtil {
+
+    public static final String ACTION_SUFFIX_PATTERN = ".+[.]do$";// Action结尾
+
+    public static final String ACTION_SUFFIX = ".do";
+
+
+    public static String subActionSuffix(String url) {
+        if (url.matches(ACTION_SUFFIX_PATTERN)) {
+            url = url.substring(0, url.indexOf(".do"));
+        }
+        return url;
+    }
+
+    public static String addActionSuffix(String url) {
+        if (!url.matches(ACTION_SUFFIX_PATTERN)) {
+            url += ".do";
+        }
+        return url;
+    }
+
+    /**
+     * 返回全路径url
+     * */
+    public static String getFullURL(HttpServletRequest request) {
+        String uri = getURI(request);
+        String queryString = request.getQueryString();
+        if (queryString == null) return uri;
+        return uri + "?" + queryString;
+    }
+
+    /** 返回不带参数的URI */
+    public static String getURI(HttpServletRequest request) {
+        return request.getRequestURI();
+    }
+
+    public static boolean isAjax(HttpServletRequest request) {
+        return request.getHeader("x-requested-with") != null
+                && request.getHeader("x-requested-with").equalsIgnoreCase( // ajax超时处理
+                        "XMLHttpRequest");
+    }
+    
+    public static String getIp(HttpServletRequest request) {
+    	String ip = "";
+		if (request.getHeader("x-forwarded-for") == null) {  
+			ip = request.getRemoteAddr();  
+	    } else {
+	    	ip = request.getHeader("x-forwarded-for");  
+	    }
+		return ip;
+    }
+    
+    public static String getIpRemote(HttpServletRequest request){
+		String requestIp = request.getHeader("x-forwarded-for");
+		if(requestIp == null || requestIp.length() == 0 || "unknown".equalsIgnoreCase(requestIp)) {
+			requestIp = request.getHeader("Proxy-Client-IP");
+		}
+		if(requestIp == null || requestIp.length() == 0 || "unknown".equalsIgnoreCase(requestIp)) {
+			requestIp = request.getHeader("WL-Proxy-Client-IP");
+		}
+		if(requestIp == null || requestIp.length() == 0 || "unknown".equalsIgnoreCase(requestIp)) {
+			requestIp = request.getRemoteAddr();
+		}
+		return requestIp;
+    }
+    
+    /**
+     * 获取HttpServletRequest
+     * 中的值转换为Map
+     * 如果是数组，用逗号分隔。
+     * @param request
+     * @return
+     * @see [类、类#方法、类#成员]
+     */
+    public static Map<String,String> getParameterMap(HttpServletRequest request) {
+        // 参数Map
+        Map properties = request.getParameterMap();
+        // 返回值Map
+        Map returnMap = new HashMap();
+        Iterator entries = properties.entrySet().iterator();
+        Map.Entry entry;
+        String name = "";
+        String value = "";
+        while (entries.hasNext()) {
+            entry = (Map.Entry) entries.next();
+            name = (String) entry.getKey();
+            Object valueObj = entry.getValue();
+            if(null == valueObj){
+                value = "";
+            }else if(valueObj instanceof String[]){
+                String[] values = (String[])valueObj;
+                for(int i=0;i<values.length;i++){
+                    value = values[i] + "|";
+                }
+                value = value.substring(0, value.length()-1);
+            }else{
+                value = valueObj.toString();
+            }
+            returnMap.put(name, value);
+        }
+        return returnMap;
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/RyxConfig.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/RyxConfig.java
new file mode 100644
index 0000000..3f28c28
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/RyxConfig.java
@@ -0,0 +1,218 @@
+package cn.pluss.platform.util;
+
+import cn.pluss.platform.config.ParameterConfig;
+import com.alibaba.fastjson.JSONObject;
+
+/**
+ * 瑞银信配置信息
+ * @author DJH
+ */
+public class RyxConfig {
+    
+    /**
+     * 进件链接前缀
+     */
+    public static String auditDomain;
+    /**
+     * 支付链接前缀
+     */
+    public static String payDomain;
+    /**
+     * 机构id
+     */
+    public static String accessId;
+
+    /**
+     * 商服宝机构id
+     */
+    public static String subAccessId;
+    /**
+     * 私钥用于签名，对应的公钥给到瑞银信
+     */
+    public static String cooperatorPriKey;
+    /**
+     * 公钥用于加密
+     */
+    public static String cooperatorPubKey;
+
+    /**
+     * 瑞银信的进件/入网公钥
+     */
+    public static String accessPubKey;
+
+    /**
+     * 商服宝进件入网公钥
+     */
+    public static String subAccessPubKey;
+
+    /**
+     * 瑞银信的支付RSA公钥
+     */
+    public static String smzfPubKey;
+
+    /**
+     * 瑞银信交易上送的机构号
+     */
+    public static String payCooperator;
+    /**
+     * 进件URL
+     */
+    public static String merchantIncome = "ims/merch/simpleApply";
+
+    /**
+     * 修改结算卡URL
+     */
+    public static String updateSettleCard = "/ims/merch/updateSettleCard";
+
+    /**
+     * 终端列表
+     */
+    public static String termList = "/ims/work/list";
+
+    /**
+     * 修改费率URL
+     */
+    public static String changeRate = "/ims/merch/updateRate";
+
+    /**
+     * 查询结算数据
+     */
+    public static String tranSt = "/ims/tranSt/tranStList";
+
+    /**
+     * 查询结算数据
+     */
+    public static String tranStToday = "/ims/tranSt/tranStTodayList";
+
+    /**
+     * 支付请求地址
+     */
+    public static String payUrl = "/ydzf/ydzf-smzf";
+
+    /**
+     * 退款请求地址
+     */
+    public static String refundUrl = "/ydzf/admin/ydzf-smzf001";
+
+    /**
+     * 公众号配置相关接口
+     */
+    public static String wxPublicConfigUrl = "/ydzf/wechat/gateway";
+
+    /**
+     * 扫码支付tradeCode
+     */
+    public static String qrActiveCodePay = "SMZF002";
+    /**
+     * 条码支付tradeCode
+     */
+    public static String barCodePayWay = "SMZF003";
+
+    /**
+     * 交易查询tradeCode
+     */
+    public static String barCodePayQuery = "SMZF006";
+    /**
+     * 获取openid tradeCode
+     */
+    public static String barCodeGetOpenid = "SMZF032";
+
+    /**
+     * 获取银联用户标识
+     */
+    public static String barCodeUnionPayUserId = "SMZF019";
+
+    /**
+     * 获取用户信息
+     * @date: 2021/12/28 17:26
+     */
+    public static String barCodeUnionJsPay = "SMZF017";
+
+    /**
+     * 获取openid tradeCode
+     */
+    public static String barCodePayRefund = "SMZF004";
+
+    /**
+     * 关闭订单 tradeCode
+     */
+    public static String barCodeCloseOrder = "SMZF015";
+    /**
+     * 服务窗支付 tradeCode
+     */
+    public static String barCodePayService = "SMZF016";
+    /**
+     * 小程序支付 tradeCode
+     */
+    public static String barCodePayApplets = "SMZF018";
+
+    /**
+     * 异步通知 tradeCode
+     */
+    public static String barCodeNotify = "SMZF008";
+
+    /**
+     * 请求成功code
+     */
+    public static String PAY_SUCCESS_CODE = "000000";
+
+    /**
+     * 订单待确认支付code
+     */
+    public static String PAY_AWAIT_CODE = "200002";
+
+    /**
+     * 获取商户信息
+     */
+    public static String merchantInfo = "/ims/merch/getById";
+
+    /**
+     * 查询瑞银信进件结果的链接
+     */
+    public static String auditResult = "/ims/merch/queryMerchResult";
+
+    /**
+     * 获取merInId
+     */
+    public static String getMerInId = "/ims/merch/getMerInId";
+
+    private RyxConfig() {}
+
+    /** 从yml中读取静态配置数据 */
+    public static void init(ParameterConfig parameterConfig) {
+        auditDomain = parameterConfig.ryxAuditDomain;
+        payDomain = parameterConfig.ryxPayDomain;
+        accessId = parameterConfig.ryxAccessId;
+        cooperatorPriKey = parameterConfig.ryxCooperatorPriKey;
+        smzfPubKey = parameterConfig.ryxSmzfPubKey;
+        accessPubKey = parameterConfig.ryxAccessPubKey;
+        cooperatorPubKey = parameterConfig.ryxCooperatorPubKey;
+        merchantIncome = auditDomain + merchantIncome;
+        updateSettleCard = auditDomain + updateSettleCard;
+        changeRate = auditDomain + changeRate;
+        payUrl = payDomain + payUrl;
+        refundUrl = payDomain + refundUrl;
+        wxPublicConfigUrl = payDomain + wxPublicConfigUrl;
+        payCooperator = parameterConfig.ryxPayCooperator;
+        merchantInfo = auditDomain + merchantInfo;
+        subAccessId = parameterConfig.ryxSubAccessId;
+        subAccessPubKey = parameterConfig.ryxSubAccessPubKey;
+        termList = auditDomain + termList;
+        tranSt = auditDomain + tranSt;
+        tranStToday = auditDomain + tranStToday;
+        getMerInId = auditDomain + getMerInId;
+        auditResult = auditDomain + auditResult;
+    }
+
+    /**
+     * 回调处理成功通知
+     * @return 处理成功通知
+     */
+    public static JSONObject ok() {
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("code", "0");
+        jsonObject.put("msg", "通知成功");
+
+        return jsonObject;
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/SendMsgUtil.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/SendMsgUtil.java
new file mode 100644
index 0000000..51bacb5
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/SendMsgUtil.java
@@ -0,0 +1,45 @@
+package cn.pluss.platform.util;
+
+import cn.pluss.platform.exception.MsgException;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Component
+public class SendMsgUtil {
+
+    @Value("${juhe.send.url}")
+    private String URL;
+    /**
+     * 短信接口appKey
+     */
+    @Value("${juhe.send.key}")
+    private String KEY ;
+
+    /**
+     * 微信实名认证申请通过后，发送给商户的短信
+     */
+    public void  verifyMsg(String phone, String merchantCode) {
+        Map<String, Object> sendDataMap = new HashMap<>();
+        sendDataMap.put("mobile", phone);
+        sendDataMap.put("tpl_id", "221945");
+        sendDataMap.put("tpl_value", "#merchantCode#=" + merchantCode);
+        sendDataMap.put("key", KEY);
+        HttpResult httpResult;
+        try {
+            httpResult = HttpUtil.doPost(URL, sendDataMap);
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new MsgException(e.getMessage());
+        }
+        JSONObject json = JSON.parseObject(httpResult.getBody());
+
+        if (!"0".equalsIgnoreCase(json.getString("error_code"))) {
+            throw new MsgException(json.getString("reason"));
+        }
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/SignUtils.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/SignUtils.java
new file mode 100644
index 0000000..9379b8a
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/SignUtils.java
@@ -0,0 +1,160 @@
+package cn.pluss.platform.util;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.codec.digest.DigestUtils;
+
+import javax.crypto.Mac;
+import javax.crypto.spec.SecretKeySpec;
+import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.TreeMap;
+
+/**
+ * 签名工具类
+ */
+@Slf4j
+public class SignUtils {
+
+    /**
+     * 获取签名之前的源串 按照ASCII 排序
+     *
+     * @param object
+     * @return
+     */
+    public static String getSignContent(JSONObject object) {
+        TreeMap<String, Object> map = JSONObject.parseObject(JSONObject.toJSONString(object), TreeMap.class);
+        StringBuilder sb = new StringBuilder();
+        for (Map.Entry<String, Object> o : map.entrySet()) {
+            String key = o.getKey();
+            Object value = o.getValue();
+            if ("sign".contains(key)) {
+                continue;
+            }
+            if (value != null) {
+                sb.append(key).append("=").append(value).append("&");
+//                if(value instanceof ArrayList || value instanceof Map){
+//                    sb.append(key).append("=").append(JSON.toJSONString(value)).append("&");
+//                }else{
+//                    sb.append(key).append("=").append(value).append("&");
+//                }
+            }
+        }
+        sb.deleteCharAt(sb.length() - 1);
+        return sb.toString();
+    }
+
+    public static String wapGetSign(JSONObject object,String key) {
+        String checkSign = MD5Util.MD5Encode(getSignContent(object) + "&key=" + key, "UTF-8");
+        return checkSign;
+    }
+
+    /**
+     * 获取签名之前的源串 按照ASCII 排序
+     *
+     * @param object
+     * @return
+     */
+    public static String getYSSignContent(JSONObject object) {
+        String s = JSONObject.toJSONString(object);
+        TreeMap<String, Object> map = JSONObject.parseObject(s, TreeMap.class);
+        StringBuilder sb = new StringBuilder();
+        for (Map.Entry<String, Object> o : map.entrySet()) {
+            String key = o.getKey();
+            Object value = o.getValue();
+            if ("sign".contains(key)) {
+                continue;
+            }
+            if (StringUtil.isNotEmpty(value)) {
+                sb.append(key).append("=").append(value).append("&");
+            }
+        }
+        sb.deleteCharAt(sb.length() - 1);
+        return sb.toString();
+    }
+
+    public static String getSignContent1(JSONObject object,String appSerct) {
+        TreeMap<String, Object> map = JSONObject.parseObject(JSONObject.toJSONString(object), TreeMap.class);
+        StringBuilder sb = new StringBuilder();
+        for (Map.Entry<String, Object> o : map.entrySet()) {
+            String key = o.getKey();
+            Object value = o.getValue();
+            if ("sign".contains(key)) {
+                continue;
+            }
+            if (StringUtil.isNotEmpty(value)) {
+                sb.append(key).append(value);
+            }
+        }
+        sb.append(appSerct);
+        return sb.toString();
+    }
+
+    public static String sha1Encrypt(String str) {
+        if (str == null || str.length() == 0) {
+            return null;
+        }
+        char[] hexDigits = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+                'a', 'b', 'c', 'd', 'e', 'f' };
+        try {
+            MessageDigest mdTemp = MessageDigest.getInstance("SHA1");
+            mdTemp.update(str.getBytes(StandardCharsets.UTF_8));
+
+            byte[] md = mdTemp.digest();
+            int j = md.length;
+            char[] buf = new char[j * 2];
+            int k = 0;
+
+            for (byte byte0 : md) {
+                buf[k++] = hexDigits[byte0 >>> 4 & 0xf];
+                buf[k++] = hexDigits[byte0 & 0xf];
+            }
+            return new String(buf);
+        } catch (Exception e) {
+            return null;
+        }
+    }
+    public static String HMACSHA256BYTE(String data, String key) {
+        String hash = "";
+        try {
+            Mac sha256_HMAC = Mac.getInstance("HmacSHA256");
+            SecretKeySpec secret_key = new SecretKeySpec(key.getBytes(), "HmacSHA256");
+            sha256_HMAC.init(secret_key);
+            byte[] array = sha256_HMAC.doFinal(data.getBytes());
+            hash = Base64.encodeBase64String(array);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return hash;
+    }
+
+    public static String getSignSha256(JSONObject params, String accessKeySecret) {
+        return HMACSHA256BYTE(getSignContent(params),accessKeySecret);
+    }
+
+    /**
+     * 获取圆通签名
+     * @date: 2022/2/24 17:00
+     * @param param:
+     * @param secret:
+     * @param method:
+     * @param version:
+     * @return java.lang.String
+     */
+    public static String getYtSign(String param, String secret,String method,String version) {
+        String data = param + method + version;
+        String sign;
+        try {
+            byte[] signByte = DigestUtils.md5(data + secret);
+            sign = Base64.encodeBase64String(signByte);
+        } catch (Throwable e) {
+            log.error("加密失败.e:{}.", e.toString());
+            sign = "ERROR";
+        }
+        return sign;
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/SignatureUtils.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/SignatureUtils.java
new file mode 100644
index 0000000..1be7bdd
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/SignatureUtils.java
@@ -0,0 +1,167 @@
+/**
+ * Alipay.com Inc.
+ * Copyright (c) 2004-2016 All Rights Reserved.
+ */
+package cn.pluss.platform.util;
+
+import java.io.ByteArrayOutputStream;
+import java.security.KeyFactory;
+import java.security.NoSuchAlgorithmException;
+import java.security.PrivateKey;
+import java.security.PublicKey;
+import java.security.spec.InvalidKeySpecException;
+import java.security.spec.PKCS8EncodedKeySpec;
+import java.security.spec.X509EncodedKeySpec;
+import java.util.Base64;
+
+import org.apache.commons.compress.utils.IOUtils;
+import org.apache.xml.security.signature.XMLSignature;
+import org.apache.xml.security.transforms.Transforms;
+import org.apache.xml.security.utils.Constants;
+import org.apache.xml.security.utils.XMLUtils;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+/**
+ * 签名/验签工具类，包含以下功能
+ * <pre>
+ * 1. 获取RSA的公钥
+ * 2. 获取RSA的私钥
+ * 3. 进行RSA签名
+ * 4. 进行RS验签
+ * </pre>
+ * 
+ * @author jin.xie
+ * @version $Id: SignatureUtils.java, v 0.1 2016年2月1日 上午10:49:06 jin.xie Exp $
+ */
+public class SignatureUtils {
+    static {
+        org.apache.xml.security.Init.init();
+    }
+
+    /**
+     * 根据String获取私钥 - RSA
+     * 
+     * @param encodePrivateKey
+     * @return
+     * @throws NoSuchAlgorithmException
+     * @throws InvalidKeySpecException
+     */
+    public static PrivateKey getPrivateKey(String encodePrivateKey)
+                                                                   throws NoSuchAlgorithmException,
+                                                                   InvalidKeySpecException {
+        byte[] privateKeyBytes = Base64.getDecoder().decode(encodePrivateKey);
+        KeyFactory kf = KeyFactory.getInstance("RSA"); // or "EC" or whatever
+        PrivateKey privateKey = kf.generatePrivate(new PKCS8EncodedKeySpec(privateKeyBytes));
+        return privateKey;
+    }
+
+    /**
+     * 根据String获取公钥 - RSA
+     * 
+     * @param encodePublicKey
+     * @return
+     * @throws NoSuchAlgorithmException
+     * @throws InvalidKeySpecException
+     */
+    public static PublicKey getPublicKey(String encodePublicKey) throws NoSuchAlgorithmException,
+                                                                InvalidKeySpecException {
+        byte[] publicKeyKeyBytes = Base64.getDecoder().decode(encodePublicKey);
+        KeyFactory kf = KeyFactory.getInstance("RSA"); // or "EC" or whatever
+        PublicKey publicKey = kf.generatePublic(new X509EncodedKeySpec(publicKeyKeyBytes));
+        return publicKey;
+    }
+
+    /**
+     * XML签名
+     *
+     * @param elementTagName 续签签名的Tag名称
+     * @param algorithm 签名算法 {@link XMLSignature} 支持下列算法
+     * <ul>
+     * <li>XMLSignature.ALGO_ID_SIGNATURE_RSA</li>
+     * <li>XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA1</li>
+     * <li>XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA256</li>
+     * <li>XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA384</li>
+     * <li>XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA512</li>
+     * </ul>
+     * @param signatureAppendMode 签名节点的附加模式
+     * <ul>
+     * <li>作为子节点： XmlSignatureAppendMode.AS_CHILDREN</li>
+     * <li>作为兄弟节点：XmlSignatureAppendMode.AS_BROTHER</li>
+     * </ul>
+     * @return 签名后的文档 string
+     * @throws Exception the exception
+     */
+    public static String signXmlElement(PrivateKey privateKey, Document xmlDocument,
+                                        String elementTagName, String algorithm,
+                                        int signatureAppendMode) throws Exception {
+        XMLSignature xmlSignature = new XMLSignature(xmlDocument, xmlDocument.getDocumentURI(),
+            algorithm);
+
+        NodeList nodeList = xmlDocument.getElementsByTagName(elementTagName);
+        if (nodeList == null || nodeList.getLength() - 1 < 0) {
+            throw new Exception("Document element with tag name " + elementTagName + " not fount");
+        }
+
+        Node elementNode = nodeList.item(0);
+        if (elementNode == null) {
+            throw new Exception("Document element with tag name " + elementTagName + " not fount");
+        }
+
+        elementNode.appendChild(xmlSignature.getElement());
+        if (signatureAppendMode == XmlSignatureAppendMode.AS_CHILDREN) {
+            elementNode.appendChild(xmlSignature.getElement());
+        } else if (signatureAppendMode == XmlSignatureAppendMode.AS_BROTHER) {
+            elementNode.getParentNode().appendChild(xmlSignature.getElement());
+        } else {
+            throw new IllegalArgumentException("Illegal Append Mode");
+        }
+
+        Transforms transforms = new Transforms(xmlDocument);
+        transforms.addTransform(Transforms.TRANSFORM_ENVELOPED_SIGNATURE);
+        xmlSignature.addDocument("", transforms, Constants.ALGO_ID_DIGEST_SHA1);
+
+        xmlSignature.sign(privateKey);
+
+        ByteArrayOutputStream os = null;
+        try {
+            os = new ByteArrayOutputStream();
+            XMLUtils.outputDOM(xmlDocument, os);
+            return os.toString("UTF-8");
+        } finally {
+            IOUtils.closeQuietly(os);
+        }
+    }
+    
+    
+  
+    
+    
+    
+    
+
+    /**
+     * 验证XML签名
+     *
+     * @return 签名验证结果 boolean
+     * @throws Exception the exception
+     */
+    public static boolean verifyXmlElement(PublicKey publicKey, Document xmlDocument)
+                                                                                     throws Exception {
+        NodeList signatureNodes = xmlDocument.getElementsByTagNameNS(Constants.SignatureSpecNS,
+            "Signature");
+        if (signatureNodes == null || signatureNodes.getLength() < 1) {
+            throw new Exception("Signature element not found!");
+        }
+
+        Element signElement = (Element) signatureNodes.item(0);
+        if (signElement == null) {
+            throw new Exception("Signature element  not found");
+        }
+
+        XMLSignature signature = new XMLSignature(signElement, "");
+        return signature.checkSignatureValue(publicKey);
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/StringUtil.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/StringUtil.java
new file mode 100644
index 0000000..0ad14bb
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/StringUtil.java
@@ -0,0 +1,380 @@
+package cn.pluss.platform.util;
+
+import cn.hutool.crypto.digest.MD5;
+import org.apache.commons.lang3.StringUtils;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+
+public class StringUtil extends StringUtils {
+
+    /**
+     * 根据身份证号获取性别
+     *
+     * @param certNo 身份证号
+     * @return 0 男；1 女
+     */
+    public static String getSexFromCertNo(String certNo) {
+        String in17 = String.valueOf(certNo.charAt(16));
+        int intIn17 = Integer.parseInt(in17);
+        return (intIn17 % 2) >= 1 ? "0" : "1";
+    }
+
+    public static final String letterChar = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+
+    public static String random6() {
+        Random random = new Random();
+        String result = "";
+        for (int i = 0; i < 6; i++) {
+            result += random.nextInt(10);
+        }
+        return result;
+    }
+
+    public static String random6V2() {
+        return MD5.create().digestHex(UUID.randomUUID().toString()).substring(0, 6);
+    }
+
+    public static String random(int length) {
+        Random random = new Random();
+        String result = "";
+        for (int i = 0; i < length; i++) {
+            result += random.nextInt(10);
+        }
+        return result;
+    }
+
+    //生产随机8位userCode
+    public static String genRandomNum() {
+        int maxNum = 36;
+        int i;
+        int count = 0;
+        char[] str = {'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', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'};
+        StringBuffer pwd = new StringBuffer("");
+        Random r = new Random();
+        while (count < 8) {
+            i = Math.abs(r.nextInt(maxNum));
+            if (i >= 0 && i < str.length) {
+                pwd.append(str[i]);
+                count++;
+            }
+        }
+        return pwd.toString();
+    }
+
+    //生成指定长度的随机数
+    public static String genRandomNum(int length) {
+        int maxNum = 36;
+        int i;
+        int count = 0;
+        char[] str = {'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', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'};
+        StringBuffer pwd = new StringBuffer("");
+        Random r = new Random();
+        while (count < length) {
+            i = Math.abs(r.nextInt(maxNum));
+            pwd.append(str[i]);
+            count++;
+        }
+        return pwd.toString();
+    }
+
+    public static String genUuid(){
+        return UUID.randomUUID().toString().replace("-","").toUpperCase(Locale.ROOT);
+    }
+
+    /**
+     * 生成订单号
+     *
+     * @return
+     */
+    public static synchronized String getBillno() {
+        StringBuilder billno = new StringBuilder();
+
+        // 日期(格式:20080524)
+        SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHHmmssSSS");
+        billno.append(format.format(new Date()));
+        return billno.toString();
+    }
+
+    public static boolean isEmpty(Object content) {
+        if (content == null) {
+            return true;
+        }
+
+        if (content instanceof String) {
+            return "".equals(content);
+        } else {
+            return false;
+        }
+    }
+
+    public static String replaceNonLegalChar(String str) {
+        if (str == null) {
+            return null;
+        }
+
+        str = str.replace("（", "(");
+        str = str.replace("）", ")");
+        str = str.replaceAll("\\s*", "");
+
+        return str;
+    }
+
+    public static boolean isNotEmpty(Object content) {
+        return !isEmpty(content);
+    }
+
+
+    /**
+     * 计算分页数量
+     *
+     * @param count
+     * @param pageSize
+     * @return
+     */
+    public static int getPageCount(int count, int pageSize) {
+        // TODO Auto-generated method stub
+        int pageCount = 0;
+        if (count == 0) {
+            return 0;
+        }
+
+        // 页长不能为0
+        if (pageSize == 0) {
+            return -1;
+        }
+
+        if (count % pageSize == 0) {
+            pageCount = count / pageSize;
+        } else {
+            pageCount = count / pageSize + 1;
+
+        }
+        return pageCount;
+
+    }
+
+    /**
+     * 计算分页数量
+     *
+     * @param count
+     * @param pageSize
+     * @return
+     */
+    public static long getPageCount(long count, int pageSize) {
+        // TODO Auto-generated method stub
+        long pageCount = 0;
+        if (count == 0) {
+            return 0;
+        }
+
+        // 页长不能为0
+        if (pageSize == 0) {
+            return -1;
+        }
+
+        if (count % pageSize == 0) {
+            pageCount = count / pageSize;
+        } else {
+            pageCount = count / pageSize + 1;
+
+        }
+        return pageCount;
+
+    }
+
+    public static boolean equals(String str1, String str2) {
+        // TODO Auto-generated method stub
+        return str1 == null ? str2 == null : str1.equals(str2);
+    }
+
+    /**
+     * 返回一个定长的随机纯字母字符串(只包含大小写字母)
+     *
+     * @param length 随机字符串长度
+     * @return 随机字符串
+     */
+    public static String generateMixStr(int length) {
+        StringBuffer sb = new StringBuffer();
+        Random random = new Random();
+        for (int i = 0; i < length; i++) {
+            sb.append(letterChar.charAt(random.nextInt(letterChar.length())));
+        }
+        return sb.toString();
+    }
+
+
+    /**
+     * 返回日时分秒
+     *
+     * @param second
+     * @return
+     */
+    public static String secondToTime(long second) {
+        long days = second / 86400;//转换天数
+        second = second % 86400;//剩余秒数
+        long hours = second / 3600;//转换小时数
+        second = second % 3600;//剩余秒数
+        long minutes = second / 60;//转换分钟
+        second = second % 60;//剩余秒数
+        String min = minutes + "";
+        if (minutes < 10) {
+            min = "0" + minutes;
+        }
+        String sec = second + "";
+        if (second < 10) {
+            sec = "0" + second;
+        }
+
+        if (0 < days) {
+            return days + "";
+        } else {
+            return hours + "";
+        }
+    }
+
+    public static double bigDecimal(Double d) {
+        if (d == null) {
+            return 0d;
+        }
+        return new BigDecimal(d).setScale(2, RoundingMode.HALF_UP).doubleValue();
+    }
+
+    public static double bigDecimal(Double d, RoundingMode roundingMode) {
+        if (d == null) {
+            return 0d;
+        }
+        return new BigDecimal(d).setScale(2, roundingMode).doubleValue();
+    }
+
+    public static String isHideMobile(String mobile) {
+        if (mobile.length() == 11) {
+            mobile = mobile.substring(0, 3) + "****" + mobile.substring(7);
+        }
+        return mobile;
+    }
+
+    public static boolean isNumber(String str) {
+        String regex = "^([0-9]+(.[0-9]{1,2})?)|(-[0-9]+(.[0-9]{1,2})?)$";
+        Pattern pattern = Pattern.compile(regex);
+        Matcher match = pattern.matcher(str);
+        // match.find()
+        return match.matches();
+    }
+
+    /**
+     * 隐藏隐私信息。
+     *
+     * @param param
+     * @return
+     */
+    public static String hideSecret(String param) {
+        int len = param.length();
+        if (isContainChinese(param)) {
+            String replaceValue = "**";
+            if (param.length() == 2) {
+                replaceValue = "*";
+            }
+            return param.replaceAll("(.{1})(.*)(.{0})", "$1" + replaceValue + "$3");
+        }
+        return param.replaceAll("(.{" + (len < 12 ? 3 : 6) + "})(.*)(.{4})", "$1" + "****" + "$3");
+    }
+
+    private static boolean isContainChinese(String str) {
+        Pattern p = Pattern.compile("[\u4e00-\u9fa5]");
+        Matcher m = p.matcher(str);
+        if (m.find()) {
+            return true;
+        }
+        return false;
+    }
+
+    public static String buildPostForm(String baseUrl, Map<String, String> parameters) {
+        java.lang.StringBuffer sb = new StringBuffer();
+        sb.append("<form name=\"punchout_form\" method=\"post\" action=\"");
+        sb.append(baseUrl);
+        sb.append("\">\n");
+        sb.append(buildHiddenFields(parameters));
+        sb.append("<input type=\"submit\" value=\"pay...\" style=\"display:none\" >\n");
+        sb.append("</form>\n");
+        sb.append("<script>document.forms[0].submit();</script>");
+        java.lang.String form = sb.toString();
+        return form;
+    }
+
+    public static String buildHiddenFields(Map<String, String> parameters) {
+        if (parameters == null || parameters.isEmpty()) {
+            return "";
+        }
+        java.lang.StringBuffer sb = new StringBuffer();
+        Set<String> keys = parameters.keySet();
+        for (String key : keys) {
+            String value = parameters.get(key);
+            // 除去参数中的空值
+            if (key == null || value == null) {
+                continue;
+            }
+            sb.append("<input type=\"hidden\" name=\"");
+            sb.append(key);
+
+            sb.append("\" value=\"");
+            // 转义双引号
+            String a = value.replace("\"", "&quot;");
+            sb.append(a).append("\">\n");
+
+        }
+        return sb.toString();
+    }
+
+    /**
+     * @param src
+     * @param replaceSrc      需要替换的字符
+     * @param replacementList 替换后的字符
+     * @return
+     */
+    public static String replaceOneByOne(String src, String[] replaceSrc, String[] replacementList) {
+        if (replaceSrc == null) {
+            throw new IllegalArgumentException("replaceSrc 不能为空");
+        }
+
+        if (replacementList == null) {
+            throw new IllegalArgumentException("replacementList 不能为空");
+        }
+
+        if (replaceSrc.length != replacementList.length) {
+            throw new IllegalArgumentException("replaceSrc 和 replacementList的长度必须相等");
+        }
+
+        StringBuffer sb = new StringBuffer();
+
+        int start = 0;
+
+        if (replacementList.length == 0) {
+            return src;
+        }
+
+        for (int i = 0; i < replaceSrc.length; i++) {
+            int position = src.indexOf(replaceSrc[i], start);
+
+            if (position == -1) {
+                continue;
+            }
+
+            sb.append(src, start, position);
+            sb.append(replacementList[i]);
+            start = position + 1;
+        }
+        sb.append(src, start, src.length());
+
+        return sb.toString();
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/SxfConfg.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/SxfConfg.java
new file mode 100644
index 0000000..3f5efa0
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/SxfConfg.java
@@ -0,0 +1,219 @@
+package cn.pluss.platform.util;
+
+import com.alibaba.fastjson.JSONObject;
+
+/**
+ * 随行付的请求链接
+ */
+public class SxfConfg {
+
+
+    /**
+     * 微信实名认证接口前缀
+     */
+    private static final String SXF_CERT_DOMAIN = "https://openapi.suixingpay.com";
+    /**
+     * 微信实名认证接口
+     */
+    public static final String SXF_WX_CERT = SXF_CERT_DOMAIN + "/merchant/realName/commitApply";
+
+    /**
+     * 查询微信认证授权状态
+     */
+    public static final String SXF_WX_CERT_STATUS = SXF_CERT_DOMAIN + "/merchant/realName/queryGrantStatus";
+
+    /**
+     * 微信实名认证申请结果查询接口
+     */
+    public static final String SXF_WX_CERT_RESULT = SXF_CERT_DOMAIN + "/merchant/realName/queryApplyInfo";
+    /**
+     * 微信实名认证申请撤销接口
+     */
+    public static final String SXF_WX_CERT_CANCEL = SXF_CERT_DOMAIN + "/merchant/realName/backApplyBill";
+    public static String PRIVATE_KEY =
+            "MIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBAMRFhTpr+JWtfhHZ80UJcnDCMeydtcF38S5s+WdifTYNMequFN6uRYoSFJqzQrR0ls7/ZAjUFP/dZL0QJAsWlnRLLSvPsgUU/DzAF7myl6/swuK4eo9frwAYP4ItQcP+DsHBUFnqUbWUON8C3M5ggY92qKfKV1k59tVnFVjoPhbbAgMBAAECgYAzL/5jEi2uu6SZe0Iayy/xgHQMxcTVRDa+aOVStTj6k85k6im/OawhKj39aqsG7TE3oxuvwcAISvEu7bq4uZdbICPdeKLcfNpK4pIfVfokPROjlKSyDgm37gqM7F+T0ZoARVqcd7Mgj09UKKpq7Pi0a/FusEa5CdG2LrUTjZuHIQJBAOFzolrGsPsWaVMpoYGeRY2UrT0PjfXJ1E7nkHqLXCCgfrur374YEEWeLtjHCI6zaXgv/3Coj3USAhKMw4lDAYcCQQDe3bL3szwkGdUmZk61ebY7HanilKnIYNuhC9ALUEElDp2eA1ld5cQvRb4BAeNsvabptt2lRPcscFu9zvH0DaUNAkEAww8HAz8xVKyZSAiW4cyMJOjj0hapHmUXOYWELWJxvRDfVYRpOtEbEwC/S3M45i44LHJqsZBFPmbsQBxl+VZt9QJBAL2tD+EywU+0UK2SyxA2mzqq32iAwBNTI/lnlVPbpOYGD21pSkjZAWR+RdyTn9xveLxWr0M2c+t1YQ8lLtVYO40CQQC2pVlYu5BIvXClLj6pHxwrK9G3JgwaanbEPFX0PjIJmU94QSLUd4OtDhvbXq43E5dlyvz5ybYvd8pygmjV9oM5";
+    public static String PUBLIC_KEY;
+    /**
+     * sxf渠道号
+     */
+    public static String SXF_SUB_CHANNEL_NO = "398434152";
+    /**
+     * sxf环境机构号
+     */
+    public static String ORG_ID;
+    /**
+     * 商户号
+     */
+    public static String MERCHANT_NO = "399200821899489";
+    /**
+     * 成功响应码
+     */
+    public static final String SXF_SUCCESS_CODE = "0000";
+    /** 功能未开通 */
+    public static final String SXF_NO_PERMIT = "0006";
+
+    public static final String SXF_REFUND_SUCCESS_CODE = "2002";
+    /**
+     * 退款成功状态
+     */
+    public static final String SXF_REFUND_SUCCESS_STATUS_CODE = "REFUNDSUC";
+
+
+    /********************************************进件相关***************************************************/
+    /**
+     * 退款成功失败状态
+     */
+    public static final String SXF_REFUND_FAIL_STATUS_CODE = "REFUNDFAIL";
+    /**
+     * 退款成功中状态
+     */
+    public static final String SXF_REFUND_ING_STATUS_CODE = "REFUNDING";
+    /**
+     * 失败响应码
+     */
+    public static final String SXF_FAIL_CODE = "0001";
+    /**
+     * sxf正式domain
+     */
+    private static String sxfDomain;
+    /**
+     * 进件相关
+     * 正式环境图片上传
+     */
+    public static String SXF_MERCHANT_INCOME_PHOTO_UPLOAD = sxfDomain + "/merchant/uploadPicture";
+    /**
+     * 进件相关
+     * 正式环境商户入驻
+     */
+    public static String SXF_MERCHANT_INCOME = sxfDomain + "/merchant/income";
+    /**
+     * 进件信息
+     * 正式环境商户入驻信息修改
+     * 备注：商户进件失败的信息修改
+     */
+    public static String SXF_UPADTE_MERCHANT_RZ = sxfDomain + "/merchant/updateMerchantInfo";
+
+    /**
+     * 该接口通过申请单号查询
+     * 进件信息
+     * 正式环境商户入驻接口查询
+     */
+    public static String SXF_QUERY_MERCHANT_INFO = sxfDomain + "/merchant/queryMerchantInfo";
+
+    /**
+     * 该接口通过商编查询商户信息
+     */
+    public static String SXF_MERCHANT_INFO_QUERY = sxfDomain + "/merchant/merchantInfoQuery";
+
+    /********************************************支付相关***************************************************/
+    /**
+     * 进件信息
+     * 正式环境商户进件信息修改
+     * 备注：商户进件成功的信息修改
+     */
+    public static String SXF_UPDATE_MERCHANT_INFO = sxfDomain + "/merchant/editMerchantInfo";
+
+    /**
+     * 进件信息
+     * 正式环境商户信息修改审核结果查询
+     */
+    public static String SXF_UPDATE_MERCHANT_INFO_RESULT = sxfDomain + "/merchant/queryModifyResult";
+
+    /**
+     * 商户设置
+     * 正式环境修改商户费率信息 次日0时 生效
+     */
+    public static String SXF_UPDATE_MERCHANT_RATE = sxfDomain + "/merchant/merchantSetup";
+    /**
+     * 商户查询
+     * 正式环境商户详情查询
+     */
+    public static String SXF_QUERY_MERCHANT_DETAIL = sxfDomain + "/merchant/merchantInfoQuery";
+    /**
+     * 主扫付款
+     * 正式环境商户主扫接口
+     */
+    public static String SXF_REVERSE_SCAN_PAY = sxfDomain + "/order/reverseScan";
+    /**
+     * 商户被扫付款
+     * 正式环境商户被扫接口
+     */
+    public static String SXF_JSAPI_SCAN_PAY = sxfDomain + "/order/jsapiScan";
+    /**
+     * 退款
+     * 正式环境退款接口地址
+     */
+    public static String SXF_REFUND_PAY = sxfDomain + "/order/refund";
+    /**
+     * 交易查询
+     * 正式环境交易查询
+     */
+    public static String SXF_TRADE_QUERY_PAY = sxfDomain + "/query/tradeQuery";
+    /**
+     * 订单关闭
+     * 订单关闭接口
+     */
+    public static String SXF_CLOSE_ORDER = sxfDomain + "/query/close";
+    /**
+     * 订单撤销
+     * 订单撤销接口
+     */
+    public static String SXF_CANCEL_ORDER = sxfDomain + "/query/cancel";
+    /**
+     * sxf 辅助接口 获取wxopenId
+     */
+    public static String SXF_GET_WX_OPENID = sxfDomain + "/query/getSubOPenid";
+    /**
+     * sxf 辅助接口 获取银联用户标识
+     */
+    public static String SXF_GET_UNION_USERID = sxfDomain + "/query/getUnionInfo";
+    /**
+     * 转账接口地址
+     */
+    public static String SXF_ORG_TRANS_FER = sxfDomain + "/capital/fundManage/orgTransfer";
+
+    /**
+     * 商户生成带金额的付款码用户扫码付款
+     * 正式环境商户被扫接口
+     */
+    public static String SXF_ACTIVE_SCAN_PAY = sxfDomain + "/order/activeScan";
+
+    public static JSONObject ok() {
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("code", "success");
+        jsonObject.put("msg", "成功");
+        return jsonObject;
+    }
+
+    /**
+     * 参数初始化
+     * @param domain        sxf链接前缀
+     * @param publicKey     公钥
+     * @param orgId         机构id
+     */
+    public static void init(String domain, String publicKey, String orgId) {
+        sxfDomain = domain;
+        PUBLIC_KEY = publicKey;
+        ORG_ID = orgId;
+
+        SXF_MERCHANT_INCOME_PHOTO_UPLOAD = sxfDomain + "/merchant/uploadPicture";
+        SXF_MERCHANT_INCOME = sxfDomain + "/merchant/income";
+        SXF_UPADTE_MERCHANT_RZ = sxfDomain + "/merchant/updateMerchantInfo";
+        SXF_QUERY_MERCHANT_INFO = sxfDomain + "/merchant/queryMerchantInfo";
+        SXF_UPDATE_MERCHANT_INFO = sxfDomain + "/merchant/editMerchantInfo";
+        SXF_UPDATE_MERCHANT_INFO_RESULT = sxfDomain + "/merchant/queryModifyResult";
+        SXF_UPDATE_MERCHANT_RATE = sxfDomain + "/merchant/merchantSetup";
+        SXF_QUERY_MERCHANT_DETAIL = sxfDomain + "/merchant/merchantInfoQuery";
+        SXF_REVERSE_SCAN_PAY = sxfDomain + "/order/reverseScan";
+        SXF_JSAPI_SCAN_PAY = sxfDomain + "/order/jsapiScan";
+        SXF_REFUND_PAY = sxfDomain + "/order/refund";
+        SXF_TRADE_QUERY_PAY = sxfDomain + "/query/tradeQuery";
+        SXF_CLOSE_ORDER = sxfDomain + "/query/close";
+        SXF_CANCEL_ORDER = sxfDomain + "/query/cancel";
+        SXF_GET_WX_OPENID = sxfDomain + "/query/getSubOPenid";
+        SXF_GET_UNION_USERID = sxfDomain + "/query/getUnionInfo";
+        SXF_ORG_TRANS_FER = sxfDomain + "/capital/fundManage/orgTransfer";
+        SXF_MERCHANT_INFO_QUERY = sxfDomain + "/merchant/merchantInfoQuery";
+        SXF_ACTIVE_SCAN_PAY = sxfDomain + "/order/activeScan";
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/SystemConfigUtil.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/SystemConfigUtil.java
new file mode 100644
index 0000000..ce2b9ac
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/SystemConfigUtil.java
@@ -0,0 +1,99 @@
+package cn.pluss.platform.util;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.util.CollectionUtils;
+
+import cn.pluss.platform.entitiy.SystemConfig;
+
+/**
+ * @author yuchen
+ *
+ * @Description 
+ */
+public class SystemConfigUtil {
+	private static Map<String, List<SystemConfig>> systemConfigMap = new HashMap<String, List<SystemConfig>>();
+
+	 private static final Logger logger = LoggerFactory.getLogger( SystemConfigUtil.class);
+
+	/**
+	 * 根据参数键获取数据库参数（此方法返回参数集合）
+	 * 
+	 * @param propertyKey
+	 *            参数键
+	 * @return 如果存在，返回符合条件的参数集合，否则返回空集合
+	 */
+	public static List<SystemConfig> getPropertys(String propertyKey) {
+		if (!validate(propertyKey)) {
+			return Collections.emptyList();
+		}
+		
+		List<SystemConfig> list = systemConfigMap.get(propertyKey);
+		if(list == null) {
+			return Collections.emptyList();
+		}
+		
+		return list;
+	}
+	
+	/**
+	 * 根据参数键获取数据库参数（此方法返回单个系统参数）
+	 * 
+	 * @param propertyKey
+	 *            参数键
+	 * @return 如果存在，返回符合条件的系统参数，否则返回null
+	 */
+	public static SystemConfig getSingleProperty(String propertyKey) {
+		if (!validate(propertyKey)) {
+			return null;
+		}
+		List<SystemConfig> systemConfigList = systemConfigMap.get(propertyKey);
+		if(CollectionUtils.isEmpty(systemConfigList)){
+			return null;
+		}
+		return systemConfigList.get(0);
+	}
+
+	/**
+	 * 判断参数键是否不为空
+	 * 
+	 * @param propertyKey
+	 *            参数键
+	 * @return 如果参数键为空，返回false，否则返回true
+	 */
+	private static boolean validate(String propertyKey) {
+		if (StringUtils.isBlank(propertyKey)) {
+			logger.error("logger is blank");
+			return false;
+		}
+		return true;
+	}
+
+	public static Map<String, List<SystemConfig>> getSystemConfigMap() {
+		return systemConfigMap;
+	}
+
+	public static void setSystemConfigMap(
+			Map<String, List<SystemConfig>> systemConfigMap) {
+		SystemConfigUtil.systemConfigMap = systemConfigMap;
+	}
+
+	/**
+	 * 判断集约化开关
+	 * @return
+	 */
+	public static boolean  isOpenGroup(){
+		boolean isOpen=false;
+		if("1".equals(systemConfigMap.get("GROUP_SWITCH").get(0).getPropertyValue())){
+			isOpen=true;
+		}
+		return isOpen;
+	}
+}
+
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/TemporaryQRcode.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/TemporaryQRcode.java
new file mode 100644
index 0000000..19ef430
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/TemporaryQRcode.java
@@ -0,0 +1,124 @@
+package cn.pluss.platform.util;
+
+import cn.pluss.platform.entitiy.ActionInfo;
+import cn.pluss.platform.entitiy.Scene;
+import cn.pluss.platform.entitiy.WechatQRCode;
+import cn.pluss.platform.wechat.Oauth2Util;
+import com.alibaba.fastjson.JSONObject;
+
+import javax.net.ssl.HttpsURLConnection;
+import java.io.BufferedInputStream;
+import java.io.FileOutputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.URL;
+import java.net.URLEncoder;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+/**
+ * @author yuchen
+ * 
+ * @Description 
+ */
+public class TemporaryQRcode {
+	
+	
+	/**
+	 * 
+	 * @param accessToken    接口访问凭证 
+	 * @param expireSeconds    二维码有效时间   单位为秒   最长 1800秒 （30天）
+	 *                              也就是说永久二维码一共可以创建10000个    临时的多
+	 * @return
+	 */
+	public static WechatQRCode createForeverTicket(String accessToken, int expireSeconds, String sceneStr)
+	{
+		WechatQRCode wechatQRCode = null;
+		String requestUrl = "https://api.weixin.qq.com/cgi-bin/qrcode/create?access_token=TOKEN";// 拼接请求地址
+		requestUrl = requestUrl.replace("TOKEN", accessToken);
+		Map<String, Object> map= new HashMap<>(16);
+		map.put("expire_seconds", expireSeconds);
+		map.put("action_name", "QR_STR_SCENE");
+		ActionInfo actionInfo=new ActionInfo();
+		Scene scene=new Scene();
+		scene.setScene_str(sceneStr);
+		actionInfo.setScene(scene);
+		map.put("action_info",actionInfo);
+		String jsonmsg = com.alibaba.fastjson.JSONObject.toJSONString(map);
+		System.out.println(jsonmsg);
+		JSONObject jsonObject = Oauth2Util.httpRequest(requestUrl, "POST", jsonmsg);// 创建永久带参二维码
+		if (null != jsonObject)
+		{
+			System.out.println(jsonObject);
+			try
+			{
+				wechatQRCode=new WechatQRCode();
+				System.out.println(1);
+				wechatQRCode.setTicket(jsonObject.getString("ticket"));
+				wechatQRCode.setExpire_seconds(jsonObject.getInteger("expire_seconds"));
+				wechatQRCode.setUrl(jsonObject.getString("url"));
+				System.out.println("带参二维码ticket成功=" + wechatQRCode.getTicket()+"Expire_seconds="+wechatQRCode.getExpire_seconds()+wechatQRCode.getUrl());
+			} catch (Exception e)
+			{
+				wechatQRCode =null;
+				int err = jsonObject.getInteger("errcode");
+				String errormsg = jsonObject.getString("errmsg");
+				System.out.println("永久带参二维码ticket失败失败errcode=" + err + "errmsg=" + errormsg);
+				}
+		}
+		return wechatQRCode;
+	}
+	
+	public static String getRQcode(String ticket, String savepath) throws UnsupportedEncodingException
+	{
+		String filepath = null;
+		String  visitpath=null;
+		String requestUrl = "https://mp.weixin.qq.com/cgi-bin/showqrcode?ticket=TICKET";
+		requestUrl = requestUrl.replace("TICKET", URLEncoder.encode(ticket, "utf-8"));
+		try
+		{
+			URL url = new URL(requestUrl);
+			HttpsURLConnection conn = (HttpsURLConnection) url.openConnection();
+			conn.setDoInput(true);
+			conn.setRequestMethod("GET");
+			if (!savepath.endsWith("/")){
+				savepath += "/";
+			}
+			// 将ticket 作为文件名
+			filepath = savepath + ticket + ".jpg";
+			Properties prop = System.getProperties();
+			String os = prop.getProperty("os.name");
+			if (os.startsWith("win") || os.startsWith("Win")) {
+				visitpath="http://127.0.0.1/resources/manage/upload"+"/"+ticket+".jpg";
+			}else {
+				visitpath=ParametersUtil.upload_visit_path+"/"+ticket+".jpg";
+			}
+			// 将微信服务器返回的输入流写入文件
+ 
+			BufferedInputStream bis = new BufferedInputStream(conn.getInputStream());
+			FileOutputStream fos = new FileOutputStream(filepath);
+ 
+			byte[] buf = new byte[8096];
+			int size = 0;
+			while ((size = bis.read(buf)) != -1) {
+				fos.write(buf, 0, size);
+			}
+			fos.close();
+			bis.close();
+ 
+			System.out.println(conn);
+			conn.disconnect();
+			System.out.println("根据ticket换取二维码成功");
+		} catch (Exception e)
+		{
+			filepath = null;
+			System.out.println("根据ticket换取二维码失败" + e);
+		}
+		return visitpath;
+	}
+
+
+	
+
+}
+
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/USCCUtil.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/USCCUtil.java
new file mode 100644
index 0000000..0c906b3
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/USCCUtil.java
@@ -0,0 +1,221 @@
+package cn.pluss.platform.util;
+
+/**
+ * @author djh
+ */
+public class USCCUtil {
+
+    /**
+     * checkUSCC
+     * [功能]校验18位统一社会信用代码正确性
+     * [参数]testUSCC:待校验的统一社会信用代码（要求字母已经保持大写）
+     * [返回值]boolean类型，0(false)表示验证未通过，1(true)表示验证通过
+     */
+    public static boolean checkUSCC(String testUSCC) {
+        try {
+            if (testUSCC == null) {
+                return false;
+            }
+
+            if (testUSCC.length() >= 18) {
+                testUSCC = testUSCC.substring(0, 18);
+                return checkUSCC18(testUSCC);
+            }
+
+            if (testUSCC.length() == 15) {
+                return "true".equals(checkUSCC15(testUSCC));
+            }
+
+            return false;
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
+    /**
+     * checkUSCC
+     * [功能]校验18位统一社会信用代码正确性
+     * [参数]testUSCC:待校验的统一社会信用代码（要求字母已经保持大写）
+     * [返回值]boolean类型，0(false)表示验证未通过，1(true)表示验证通过
+     */
+    public static boolean checkUSCC18(String testUSCC) {
+        if (testUSCC.length() != 18) {
+            return false;
+        }
+
+        // 用于存放权值
+        int[] weight = {1, 3, 9, 27, 19, 26, 16, 17, 20, 29, 25, 13, 8, 24, 10, 30, 28};
+        //用于计算当前判断的统一社会信用代码位数
+        int index = 0;
+        //用于存放当前位的统一社会信用代码
+        char testc;
+        //用于存放代码字符和加权因子乘积之和
+        int tempSum = 0;
+        int tempNum = 0;
+        for (index = 0; index <= 16; index++) {
+            testc = testUSCC.charAt(index);
+
+            if (index == 0) {
+                if (testc != '1' && testc != '5' && testc != '9' && testc != 'Y') {
+                    return false;
+                }
+            }
+
+            if (index == 1) {
+                if (testc != '1' && testc != '2' && testc != '3' && testc != '9') {
+                    return false;
+                }
+            }
+
+            tempNum = charToNum(testc);
+            //验证代码中是否有错误字符
+            if (tempNum != -1) {
+                tempSum += weight[index] * tempNum;
+            } else {
+                return false;
+            }
+        }
+        tempNum = 31 - tempSum % 31;
+        if (tempNum == 31) {
+            tempNum = 0;
+        }
+        return charToNum(testUSCC.charAt(17)) == tempNum;
+    }
+
+
+    /**
+     * harToNum
+     * [功能]按照GB32100-2015标准代码字符集将用于检验的字符变为相应数字
+     * [参数]c:待转换的字符
+     * [返回值]转换完成后对应的数字,若无法找到字符集中字符，返回-1
+     */
+    public static int charToNum(char c) {
+        switch (c) {
+            case '0':
+                return 0;
+            case '1':
+                return 1;
+            case '2':
+                return 2;
+            case '3':
+                return 3;
+            case '4':
+                return 4;
+            case '5':
+                return 5;
+            case '6':
+                return 6;
+            case '7':
+                return 7;
+            case '8':
+                return 8;
+            case '9':
+                return 9;
+            case 'A':
+                return 10;
+            case 'B':
+                return 11;
+            case 'C':
+                return 12;
+            case 'D':
+                return 13;
+            case 'E':
+                return 14;
+            case 'F':
+                return 15;
+            case 'G':
+                return 16;
+            case 'H':
+                return 17;
+            case 'J':
+                return 18;
+            case 'K':
+                return 19;
+            case 'L':
+                return 20;
+            case 'M':
+                return 21;
+            case 'N':
+                return 22;
+            case 'P':
+                return 23;
+            case 'Q':
+                return 24;
+            case 'R':
+                return 25;
+            case 'T':
+                return 26;
+            case 'U':
+                return 27;
+            case 'W':
+                return 28;
+            case 'X':
+                return 29;
+            case 'Y':
+                return 30;
+            default:
+                return -1;
+        }
+    }
+
+    /**
+     * 营业执照注册号校验正确返回码
+     */
+    public static String isBusinesslicense = "true";
+    private static final String error_Businesslicense_Empty = "请输入营业执照注册号";
+    public static String error_Businesslicense = "您输入的营业执照注册号有误，请核对后再输!";
+    public static String error_Businesslicense_No = "您输入的营业执照注册号不足15位，请核对后再输!";
+
+    /**
+     * 校验 营业执照注册号
+     *
+     * @param businesslicense
+     * @return
+     */
+    public static String checkUSCC15(String businesslicense) {
+        if ("".equals(businesslicense) || " ".equals(businesslicense)) {
+            return error_Businesslicense_Empty;
+        } else if (businesslicense.length() != 15) {
+            return error_Businesslicense_No;
+        }
+        String businesslicensePrex14 = businesslicense.substring(0, 14);// 获取营业执照注册号前14位数字用来计算校验码
+        String businesslicense15 = businesslicense.substring(14);// 获取营业执照号的校验码
+        char[] chars = businesslicensePrex14.toCharArray();
+        int[] ints = new int[chars.length];
+        for (int i = 0; i < chars.length; i++) {
+            ints[i] = Integer.parseInt(String.valueOf(chars[i]));
+        }
+        getCheckCode(ints);
+        if (businesslicense15.equals(getCheckCode(ints) + "")) {// 比较 填写的营业执照注册号的校验码和计算的校验码是否一致
+            return isBusinesslicense;
+        }
+        return error_Businesslicense;
+    }
+
+    /**
+     * 获取 营业执照注册号的校验码
+     *
+     * @param ints
+     * @return
+     */
+    private static int getCheckCode(int[] ints) {
+        if (null != ints && ints.length > 1) {
+            int ti = 0;
+            int si = 0;// pi|11+ti
+            int cj = 0;// （si||10==0？10：si||10）*2
+            int pj = 10;// pj=cj|11==0?10:cj|11
+            for (int i = 0; i < ints.length; i++) {
+                ti = ints[i];
+                pj = (cj % 11) == 0 ? 10 : (cj % 11);
+                si = pj + ti;
+                cj = (0 == si % 10 ? 10 : si % 10) * 2;
+                if (i == ints.length - 1) {
+                    pj = (cj % 11) == 0 ? 10 : (cj % 11);
+                    return pj == 1 ? 1 : 11 - pj;
+                }
+            }
+        }
+        return -1;
+
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/ValidateCodeUtil.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/ValidateCodeUtil.java
new file mode 100644
index 0000000..2268c36
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/ValidateCodeUtil.java
@@ -0,0 +1,196 @@
+package cn.pluss.platform.util;
+
+import cn.hutool.core.date.DateUtil;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.constants.Constant;
+import cn.pluss.platform.entitiy.ReqRecords;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.service.ReqRecordsService;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.google.code.kaptcha.impl.DefaultKaptcha;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import javax.imageio.ImageIO;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.awt.image.BufferedImage;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 获取验证码相关工具
+ */
+@Component
+public class ValidateCodeUtil {
+
+    @Value("${juhe.send.url}")
+    private String URL;
+    /**
+     * 短信接口appKey
+     */
+    @Value("${juhe.send.key}")
+    private String KEY;
+
+    @Autowired
+    private ReqRecordsService reqRecordService;
+
+    @Autowired
+    private HttpServletRequest request;
+
+    /**
+     * 获取验证码
+     */
+    public Result<Object> requestValidateCode(String phone, String checkCode) {
+        String requestUri = request.getRequestURI();
+        String myLoginName = request.getHeader("myLoginName");
+
+        ReqRecords reqRecords = new ReqRecords();
+        reqRecords.setIp(IpUtils.getIpAddr(request));
+        reqRecords.setPhone(phone);
+        reqRecords.setLoginName(myLoginName);
+        reqRecords.setUri(requestUri);
+
+        // 短信一天限制10次
+        ReqRecords reqRecords1 = new ReqRecords();
+        reqRecords1.setIp(reqRecords.getIp());
+        reqRecords1.setCreateTimeStart(DateUtil.beginOfDay(new Date()).toJdkDate());
+        reqRecords1.setCreateTimeEnd(new Date());
+        int count = reqRecordService.count(new QueryWrapper<>(reqRecords1));
+        if (count >= 50) {
+            return ResultGenerator.genFailResult("限制请求");
+        }
+
+        // 短信一周限制45次
+        // ReqRecords reqRecords2 = new ReqRecords();
+        // reqRecords2.setIp(reqRecords.getIp());
+        // reqRecords2.setCreateTimeStart(DateUtil.beginOfWeek(new Date()).toJdkDate());
+        // reqRecords2.setCreateTimeEnd(new Date());
+        // count = reqRecordService.count(new QueryWrapper<>(reqRecords2));
+        // if (count >= 250) {
+        //     return ResultGenerator.genFailResult("限制请求");
+        // }
+
+        try {
+            reqRecordService.checkLimit(reqRecords, 60000);
+        } catch (Exception e) {
+            return ResultGenerator.genFailResult(e.getMessage());
+        }
+
+        Map<String, Object> sendDataMap = new HashMap<>();
+        sendDataMap.put("mobile", phone);
+        sendDataMap.put("tpl_id", "247236");
+        sendDataMap.put("tpl_value", "#code#=" + checkCode);
+        sendDataMap.put("key", KEY);
+        HttpResult httpResult;
+        try {
+            httpResult = HttpUtil.doPost(URL, sendDataMap);
+        } catch (Exception e) {
+            return ResultGenerator.genFailResult(e.getMessage());
+        }
+        JSONObject json = JSON.parseObject(httpResult.getBody());
+
+        if (!"0".equalsIgnoreCase(json.getString("error_code"))) {
+            return ResultGenerator.genFailResult(json.getString("reason"));
+        }
+
+        return null;
+    }
+
+
+    /**
+     * 生成验证码图片
+     * @param request 设置session
+     * @param response 转成图片
+     * @param captchaProducer 生成图片方法类
+     * @param validateSessionKey session名称
+     * @throws Exception
+     */
+    public static void validateCode(HttpServletRequest request, HttpServletResponse response, DefaultKaptcha captchaProducer, String validateSessionKey) throws Exception{
+        // Set to expire far in the past.
+        response.setDateHeader("Expires", 0);
+        // Set standard HTTP/1.1 no-cache headers.
+        response.setHeader("Cache-Control", "no-store, no-cache, must-revalidate");
+        // Set IE extended HTTP/1.1 no-cache headers (use addHeader).
+        response.addHeader("Cache-Control", "post-check=0, pre-check=0");
+        // Set standard HTTP/1.0 no-cache header.
+        response.setHeader("Pragma", "no-cache");
+
+        // return a jpeg
+        response.setContentType("image/jpeg");
+
+        // create the text for the image
+        String capText = captchaProducer.createText();
+
+        // store the text in the session
+        request.getSession().setAttribute(validateSessionKey, capText);
+
+        // create the image with the text
+        BufferedImage bi = captchaProducer.createImage(capText);
+
+        ServletOutputStream out = response.getOutputStream();
+
+        // write the data out
+        ImageIO.write(bi, "jpg", out);
+        try {
+            out.flush();
+        } finally {
+            out.close();
+        }
+    }
+
+    /**
+     * @description:比较验证码
+     * @date: 2021/12/20 11:10
+     * @param request:
+     * @param verifyCode:
+     * @return boolean
+     */
+    public static boolean checkVerifyCode(HttpServletRequest request,String verifyCode) {
+        //获取生成的验证码
+        Object verifyCodeExpected = request.getSession().getAttribute(Constant.LOGIN_VALIDATE_CODE);
+        if(verifyCodeExpected == null){
+            MsgException.throwException("图形验证码已过期！");
+        }
+        if(StringUtil.isEmpty(verifyCode)){
+            MsgException.throwException("请输入图形验证码！");
+        }
+        //获取用户输入的验证码
+        if(!verifyCode.equalsIgnoreCase(verifyCodeExpected.toString())) {
+            MsgException.throwException("图形验证码有误！");
+        }
+        return true;
+    }
+
+    /**
+     * 获取手机验证码
+     * @param phone
+     * @param code
+     */
+    public JSONObject requestManageValidateCode(String phone,String code) {
+        Map<String, Object> params = new HashMap<>();
+        params.put("mobile", phone);
+        params.put("tpl_id", "186650");
+        params.put("tpl_value", "#code#=" + code);
+        params.put("key", KEY);
+        try {
+            HttpResult httpResult = HttpUtil.doPost(URL, params);
+            if(httpResult == null){
+                return ResultGenerator.genFailJsonResult("获取失败，网络请求异常！");
+            }
+            JSONObject json = JSON.parseObject(httpResult.getBody());
+            if (!"0".equalsIgnoreCase(json.getString("error_code"))) {
+                return ResultGenerator.genFailJsonResult(json.getString("reason"));
+            }
+            return ResultGenerator.genSuccessJsonResult("获取成功",null);
+        } catch (Exception e) {
+            return ResultGenerator.genFailJsonResult(e.getMessage());
+        }
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/WXPayHttpUtil.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/WXPayHttpUtil.java
new file mode 100644
index 0000000..bc4e039
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/WXPayHttpUtil.java
@@ -0,0 +1,230 @@
+package cn.pluss.platform.util;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.security.KeyStore;
+import java.util.Map;
+import java.util.Properties;
+import javax.net.ssl.SSLContext;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpHeaders;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.conn.ssl.DefaultHostnameVerifier;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.entity.mime.MultipartEntityBuilder;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.ssl.SSLContexts;
+
+public class WXPayHttpUtil {
+
+  private static final String UTFCHARSET = "UTF-8";
+  private static final String XMLCONTENT = "text/xml;charset=utf-8";
+  private static final String FORMCONTENT = "multipart/form-data;charset=utf-8";
+
+  /**
+   * 不需证书上传xml形式接口
+   * @param url   接口地址
+   * @param reqDataTo  请求参数
+   * @return
+   */
+  public static String WXHttpPostXMLWithoutCert(
+    String url,
+    Map<String, String> reqDataTo
+  ) {
+    HttpPost httpPost = new HttpPost(url);
+    StringEntity postEntity = new StringEntity(
+      WXPayXmlUtil.parseMapToXML(reqDataTo),
+      UTFCHARSET
+    );
+    httpPost.setHeader(HttpHeaders.CONTENT_TYPE, XMLCONTENT);
+    httpPost.setEntity(postEntity);
+    StringBuilder stringBuilder = new StringBuilder();
+    try (
+      CloseableHttpClient client = HttpClients.createDefault();
+      CloseableHttpResponse response = client.execute(httpPost);
+    ) {
+      if (response != null && response.getEntity() != null) {
+        HttpEntity entity = response.getEntity();
+        try (
+          InputStream in = entity.getContent();
+          BufferedReader reader = new BufferedReader(
+            new InputStreamReader(in, "UTF-8")
+          )
+        ) {
+          reader
+            .lines()
+            .forEach(
+              line -> {
+                stringBuilder.append(line);
+              }
+            );
+        }
+      }
+    } catch (IOException e) {
+      //LOGGER.debug(e.getMessage());
+      return "";
+    }
+    return stringBuilder.toString();
+  }
+
+  /**
+   * 需证书上传xml形式接口
+   * @param url 接口地址
+   * @param reqData 参数
+   * @param certPath 证书文件位置 (服务商)
+   * @return
+   */
+  public static String WXHttpPostXMLWithCert(
+    String url,
+    Map<String, String> reqData,
+    String certPath
+  ) {
+    HttpPost queryState = new HttpPost(url);
+    SSLConnectionSocketFactory sslsf = null;
+    //读取本机存放的PKCS12证书文件
+    try (
+      InputStream inputStream = Thread
+        .currentThread()
+        .getContextClassLoader()
+        .getResourceAsStream("apiclient_cert.p12")
+    ) {
+      //指定读取证书格式为PKCS12
+      KeyStore keyStore = KeyStore.getInstance("PKCS12");
+      //"100000"为密码即商户号
+      keyStore.load(inputStream, reqData.get("mch_id").toCharArray());
+      SSLContext sslcontext = SSLContexts
+        .custom()
+        .loadKeyMaterial(keyStore, reqData.get("mch_id").toCharArray())
+        .build();
+      sslsf =
+        new SSLConnectionSocketFactory(
+          sslcontext,
+          new String[] { "TLSv1" },
+          null,
+          new DefaultHostnameVerifier()
+        );
+    } catch (Exception e) {
+      return "";
+    }
+    StringBuilder stringBuilder = new StringBuilder();
+    StringEntity postEntity = new StringEntity(
+      WXPayXmlUtil.parseMapToXML(reqData),
+      "UTF-8"
+    );
+    queryState.setEntity(postEntity);
+    queryState.setHeader(HttpHeaders.CONTENT_TYPE, XMLCONTENT);
+    try (
+      CloseableHttpClient client = HttpClients
+        .custom()
+        .setSSLSocketFactory(sslsf)
+        .build();
+      CloseableHttpResponse response = client.execute(queryState);
+    ) {
+      if (response != null && response.getEntity() != null) {
+        HttpEntity entity = response.getEntity();
+        try (
+          InputStream in = entity.getContent();
+          BufferedReader reader = new BufferedReader(
+            new InputStreamReader(in, "UTF-8")
+          )
+        ) {
+          reader
+            .lines()
+            .forEach(
+              line -> {
+                stringBuilder.append(line);
+              }
+            );
+        }
+      }
+    } catch (IOException e) {
+      //LOGGER.debug(e.getMessage());
+      return "";
+    }
+    return stringBuilder.toString();
+  }
+
+  /**
+   * 需证书上传xml形式接口
+   * @param url 接口地址
+   * @param reqData 参数
+   * @param certPath 证书文件位置 (普通商户)
+   * @return
+   */
+  public static String WXHttpPostXMLWithCertOrdinary(
+    String url,
+    Map<String, String> reqData,
+    String certPath
+  ) {
+    HttpPost queryState = new HttpPost(url);
+    SSLConnectionSocketFactory sslsf = null;
+    //读取本机存放的PKCS12证书文件
+    try (
+      InputStream inputStream = Thread
+        .currentThread()
+        .getContextClassLoader()
+        .getResourceAsStream("apiclient_cert1.p12")
+    ) {
+      //指定读取证书格式为PKCS12
+      KeyStore keyStore = KeyStore.getInstance("PKCS12");
+      //"100000"为密码即商户号
+      keyStore.load(inputStream, reqData.get("mch_id").toCharArray());
+      SSLContext sslcontext = SSLContexts
+        .custom()
+        .loadKeyMaterial(keyStore, reqData.get("mch_id").toCharArray())
+        .build();
+      sslsf =
+        new SSLConnectionSocketFactory(
+          sslcontext,
+          new String[] { "TLSv1" },
+          null,
+          new DefaultHostnameVerifier()
+        );
+    } catch (Exception e) {
+      return "";
+    }
+    StringBuilder stringBuilder = new StringBuilder();
+    StringEntity postEntity = new StringEntity(
+      WXPayXmlUtil.parseMapToXML(reqData),
+      "UTF-8"
+    );
+    queryState.setEntity(postEntity);
+    queryState.setHeader(HttpHeaders.CONTENT_TYPE, XMLCONTENT);
+    try (
+      CloseableHttpClient client = HttpClients
+        .custom()
+        .setSSLSocketFactory(sslsf)
+        .build();
+      CloseableHttpResponse response = client.execute(queryState);
+    ) {
+      if (response != null && response.getEntity() != null) {
+        HttpEntity entity = response.getEntity();
+        try (
+          InputStream in = entity.getContent();
+          BufferedReader reader = new BufferedReader(
+            new InputStreamReader(in, "UTF-8")
+          )
+        ) {
+          reader
+            .lines()
+            .forEach(
+              line -> {
+                stringBuilder.append(line);
+              }
+            );
+        }
+      }
+    } catch (IOException e) {
+      //LOGGER.debug(e.getMessage());
+      return "";
+    }
+    return stringBuilder.toString();
+  }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/WXPayUtil.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/WXPayUtil.java
new file mode 100644
index 0000000..721361e
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/WXPayUtil.java
@@ -0,0 +1,99 @@
+package cn.pluss.platform.util;
+
+import java.util.Arrays;
+import java.util.Base64;
+import java.util.Map;
+import java.util.Set;
+
+import javax.crypto.Cipher;
+import javax.crypto.spec.GCMParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+
+public class WXPayUtil {
+
+	private static final String ALGORITHM = "AES/GCM/NoPadding";
+    private static final int TAG_LENGTH_BIT = 128;
+    private static final String AES_KEY = "9bbbd2223e5240bb2252d05222210c27"; // APIv3密钥
+
+    /**
+     * 
+     * @param aad
+     * @param iv
+     * @param cipherText
+     * @return
+     * @throws Exception
+     */
+    private static String aesgcmDecrypt(String aad, String iv, String cipherText){
+        try {
+            final Cipher cipher = Cipher.getInstance(ALGORITHM, "SunJCE");
+            SecretKeySpec key = new SecretKeySpec(AES_KEY.getBytes(), "AES");
+            GCMParameterSpec spec = new GCMParameterSpec(TAG_LENGTH_BIT, iv.getBytes());
+            cipher.init(Cipher.DECRYPT_MODE, key, spec);
+            cipher.updateAAD(aad.getBytes());
+            return new String(cipher.doFinal(Base64.getDecoder().decode(cipherText)));
+        } catch (Exception e) {
+            return "fail";
+        }
+    }
+    public static String getWXCert(JSONArray data) {
+        //敏感信息证书生成所需参数
+        String encryptCertificate = JSONObject.parseObject(
+                JSONObject.toJSONString(data.get(0))).getString("encrypt_certificate");
+        String nonce = JSONObject.parseObject(
+                encryptCertificate).getString("nonce");
+        String associatedData = JSONObject.parseObject(
+                encryptCertificate).getString("associated_data");
+        //要被解密的证书字符串
+        String cipherText = JSONObject.parseObject(
+                encryptCertificate).getString("ciphertext");
+        String wechatpayCert = "";
+        try {
+            wechatpayCert = aesgcmDecrypt(associatedData, nonce, cipherText);
+        } catch (Exception e) {
+            return wechatpayCert;
+        }
+        return wechatpayCert;
+    }
+    /**
+     * 生成签名. 注意，若含有sign_type字段，必须和signType参数保持一致。
+     *
+     * @param data 待签名数据
+     * @param key API密钥
+     * @param signType 签名方式
+     * @return 签名
+     */
+    public static String generateSignature(final Map<String, String> data, String key, String signType) {
+        Set<String> keySet = data.keySet();
+        String[] keyArray = keySet.toArray(new String[keySet.size()]);
+        Arrays.sort(keyArray);
+        StringBuilder sb = new StringBuilder();
+        for (String k : keyArray) {
+            if (k.equals("sign")) {
+                continue;
+            }
+            if (data.get(k).trim().length() > 0) // 参数值为空，则不参与签名
+                sb.append(k).append("=").append(data.get(k).trim()).append("&");
+        }
+        sb.append("key=").append(key);
+        if ("MD5".equals(signType)) {
+            return MD5Util.MD5Encode(sb.toString(),"utf-8").toUpperCase();
+        }
+        else if ("HMACSHA256".equals(signType)) {
+            return HMACSHAUtil.getHMACSHA256(sb.toString(), key);
+        }
+        return signType;
+    }
+    //获取指定位数的随机字符串(包含小写字母、大写字母、数字,0<length)
+    public static String getRandomString(int length) {
+        //随机字符串的随机字符库
+        String KeyString = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+        StringBuffer sb = new StringBuffer(); int len = KeyString.length();
+        for (int i = 0; i < length; i++) {
+            sb.append(KeyString.charAt((int) Math.round(Math.random() * (len - 1))));
+        }
+        return sb.toString();
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/WXPayXmlUtil.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/WXPayXmlUtil.java
new file mode 100644
index 0000000..9c1c454
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/WXPayXmlUtil.java
@@ -0,0 +1,140 @@
+package cn.pluss.platform.util;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.StringWriter;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.xml.XMLConstants;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+public class WXPayXmlUtil {
+
+	public static DocumentBuilder newDocumentBuilder() throws ParserConfigurationException {
+        DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
+        documentBuilderFactory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
+        documentBuilderFactory.setFeature("http://xml.org/sax/features/external-general-entities", false);
+        documentBuilderFactory.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
+        documentBuilderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
+        documentBuilderFactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
+        documentBuilderFactory.setXIncludeAware(false);
+        documentBuilderFactory.setExpandEntityReferences(false);
+
+        return documentBuilderFactory.newDocumentBuilder();
+    }
+
+    public static Document newDocument() throws ParserConfigurationException {
+        return newDocumentBuilder().newDocument();
+    }
+
+    /**
+     * 解析xml,返回第一级元素键值对。如果第一级元素有子节点，则此节点的值是子节点的xml数据。
+     *
+     * @param strXML
+     * @return
+     */
+    public static Map<String, String> parseXMLToMap(String strXML) {
+        Map<String, String> data = new HashMap<String, String>();
+        try {
+            DocumentBuilder documentBuilder = WXPayXmlUtil.newDocumentBuilder();
+            InputStream stream = new ByteArrayInputStream(strXML.getBytes("UTF-8"));
+            Document doc = documentBuilder.parse(stream);
+            doc.getDocumentElement().normalize();
+            NodeList nodeList = doc.getDocumentElement().getChildNodes();
+            for (int idx = 0; idx < nodeList.getLength(); ++idx) {
+                Node node = nodeList.item(idx);
+                if (node.getNodeType() == Node.ELEMENT_NODE) {
+                    org.w3c.dom.Element element = (org.w3c.dom.Element) node;
+                    data.put(element.getNodeName(), element.getTextContent());
+                }
+            }
+            try {
+                stream.close();
+            } catch (Exception ex) {
+                return data;
+            }
+        } catch (Exception ex) {
+                return data;
+        }
+        return data;
+    }
+
+    /**
+     * map转xml
+     * @param data
+     * @return
+     */
+    public static String parseMapToXML(Map<String, String> data) {
+//        StringBuffer sb = new StringBuffer();
+//        sb.append("<xml>");
+//        Set es = parameters.entrySet();
+//        Iterator it = es.iterator();
+//        while (it.hasNext()) {
+//            Map.Entry entry = (Map.Entry)it.next();
+//            String k = (String)entry.getKey();
+//            String v = (String)entry.getValue();
+//            if (null != v && !"".equals(v)) {
+//                sb.append("<" + k + ">" + parameters.get(k) + "</" + k + ">\n");
+//            }
+//        }
+//        sb.append("</xml>");
+//        return sb.toString();
+//    }
+        Document document = null;
+        try {
+            document = WXPayXmlUtil.newDocument();
+        } catch (ParserConfigurationException e) {
+            e.printStackTrace();
+        }
+        org.w3c.dom.Element root = document.createElement("xml");
+        document.appendChild(root);
+        for (String key: data.keySet()) {
+            String value = data.get(key);
+            if (value == null) {
+                value = "";
+            }
+            value = value.trim();
+            if(!("").equals(value)){
+                org.w3c.dom.Element filed = document.createElement(key);
+                filed.appendChild(document.createTextNode(value));
+                root.appendChild(filed);
+            }
+
+        }
+        TransformerFactory tf = TransformerFactory.newInstance();
+        Transformer transformer = null;
+        StringWriter writer = new StringWriter();
+        String output = "";
+        try {
+            transformer = tf.newTransformer();
+            DOMSource source = new DOMSource(document);
+            transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
+            transformer.setOutputProperty(OutputKeys.INDENT, "yes");
+            StreamResult result = new StreamResult(writer);
+            transformer.transform(source, result);
+            output = writer.getBuffer().toString(); //.replaceAll("\n|\r", "");
+        } catch (Exception e) {
+            return output;
+        }finally {
+            try {
+                writer.close();
+            } catch (IOException e) {
+                return output;
+            }
+        }
+        return output;
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/WeChatImageUploadUtils.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/WeChatImageUploadUtils.java
new file mode 100644
index 0000000..8cbcf89
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/WeChatImageUploadUtils.java
@@ -0,0 +1,196 @@
+package cn.pluss.platform.util;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.security.KeyStore;
+import java.security.MessageDigest;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+import javax.crypto.Mac;
+import javax.crypto.spec.SecretKeySpec;
+import javax.net.ssl.SSLContext;
+
+import org.apache.commons.codec.binary.Hex;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.mime.MultipartEntityBuilder;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.protocol.HTTP;
+import org.apache.http.ssl.SSLContexts;
+import org.apache.http.util.EntityUtils;
+import org.dom4j.Document;
+import org.dom4j.DocumentException;
+import org.dom4j.DocumentHelper;
+import org.dom4j.Element;
+
+public class WeChatImageUploadUtils {
+	private static String keyStoreUrl = "/home/syb/resources/wechatCert/apiclient_cert.p12";
+	private static String requestUrl = "https://api.mch.weixin.qq.com/secapi/mch/uploadmedia";
+	private static String payKey = "7F05NZBTJ3XNDK5HLSDC3H25ZXOQKDHT";
+	private static String mch_id = "1551169371";
+
+	// 获取微信商家进价上传图片的mediaId
+	public static String upload(File file) {
+		String mediaId = null;
+		try {
+			String media_hash = md5HashCode(new FileInputStream(file));
+			String sign_type = "HMAC-SHA256";
+			Map<String, Object> paramMap = new HashMap<>();
+			paramMap.put("mch_id", mch_id);
+			paramMap.put("media_hash", media_hash);
+			paramMap.put("sign_type", sign_type);
+			String sign = sha256Sign(paramMap, payKey);
+
+			MultipartEntityBuilder multipartEntityBuilder = MultipartEntityBuilder.create();
+			multipartEntityBuilder.addTextBody("mch_id", mch_id, ContentType.MULTIPART_FORM_DATA);
+			multipartEntityBuilder.addBinaryBody("media", file, ContentType.create("image/jpg"), file.getName());
+			multipartEntityBuilder.addTextBody("media_hash", media_hash, ContentType.MULTIPART_FORM_DATA);
+			multipartEntityBuilder.addTextBody("sign_type", sign_type, ContentType.MULTIPART_FORM_DATA);
+			multipartEntityBuilder.addTextBody("sign", sign, ContentType.MULTIPART_FORM_DATA);
+			FileInputStream instream = null;
+			SSLContext sslcontext = null;
+			try {
+				KeyStore keyStore = KeyStore.getInstance("PKCS12");
+				Properties prop = System.getProperties();
+		        String os = prop.getProperty("os.name");
+		        if(os.startsWith("win") || os.startsWith("Win")){
+		        	//windows目录
+		        	keyStoreUrl="D:\\Dev\\SVN\\Java\\pluss\\shoyinbei\\pluss-common-bundle\\src\\main\\resources\\apiclient_cert.p12";
+		        }
+				instream = new FileInputStream(new File(keyStoreUrl));
+				keyStore.load(instream, mch_id.toCharArray());// 这里写密码..默认是你的MCHID
+				sslcontext = SSLContexts.custom().loadKeyMaterial(keyStore, mch_id.toCharArray()).build();
+			} catch (Exception e) {
+				System.out.println(e.getMessage());
+			} finally {
+				try {
+					if (instream != null) {
+						instream.close();
+					}
+				} catch (IOException e) {
+
+				}
+			}
+			@SuppressWarnings("deprecation")
+			SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(sslcontext, new String[] { "TLSv1" },
+					null, SSLConnectionSocketFactory.BROWSER_COMPATIBLE_HOSTNAME_VERIFIER);
+			CloseableHttpClient httpclient = HttpClients.custom().setSSLSocketFactory(sslsf).build();
+			try {
+				HttpPost httpPost = new HttpPost(requestUrl);
+				RequestConfig config = RequestConfig.custom().setConnectTimeout(10000)
+						.setConnectionRequestTimeout(10000).setSocketTimeout(10000).build();
+				httpPost.setConfig(config);
+				//// 这里的Content-type要设置为"multipart/form-data"，否则返回“参数填写有误，请检查后重试”
+				httpPost.addHeader(HTTP.CONTENT_TYPE, "multipart/form-data; charset=UTF-8");
+				httpPost.addHeader(HTTP.USER_AGENT, "wxpay sdk java v1.0 " + mch_id);
+				httpPost.setEntity(multipartEntityBuilder.build());
+				CloseableHttpResponse response = httpclient.execute(httpPost);
+				String result = EntityUtils.toString(response.getEntity(), "UTF-8");
+
+				Document document = null;
+
+				Document doc = null;
+				try {
+					doc = DocumentHelper.parseText(result);
+				} catch (DocumentException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+				Element root = doc.getRootElement();
+				String return_code = root.element("return_code").getTextTrim();
+
+				if ("SUCCESS".equalsIgnoreCase(return_code)) {
+
+					mediaId = root.element("media_id").getTextTrim();
+				}
+				// System.out.println(result);
+			} catch (Exception e) {
+
+			}
+
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
+		return mediaId;
+	}
+
+	/**
+	 * 对上次文件进行MD5获取其Hash值
+	 *
+	 * @param fis
+	 * @return
+	 */
+	public static String md5HashCode(InputStream fis) {
+		try {
+			MessageDigest MD5 = MessageDigest.getInstance("MD5");
+			byte[] buffer = new byte[8192];
+			int length;
+			while ((length = fis.read(buffer)) != -1) {
+				MD5.update(buffer, 0, length);
+			}
+			return new String(Hex.encodeHex(MD5.digest()));
+		} catch (Exception e) {
+			e.printStackTrace();
+			return null;
+		}
+	}
+
+	/**
+	 * 获取HMAC-SHA256签名
+	 *
+	 * @param paramMap 签名参数（sign不参与签名）
+	 * @param key      签名密钥
+	 * @return HMAC-SHA256签名结果
+	 */
+	public final static String sha256Sign(Map<String, Object> paramMap, String key) {
+		try {
+			String payParam = getSignTemp(paramMap, key);
+			Mac sha256_HMAC = Mac.getInstance("HmacSHA256");
+			SecretKeySpec secret_key = new SecretKeySpec(key.getBytes("UTF-8"), "HmacSHA256");
+			sha256_HMAC.init(secret_key);
+			byte[] array = sha256_HMAC.doFinal(payParam.getBytes("UTF-8"));
+			StringBuilder sb = new StringBuilder();
+			for (byte item : array) {
+				sb.append(Integer.toHexString((item & 0xFF) | 0x100).substring(1, 3));
+			}
+			String sign = sb.toString().toUpperCase();
+			return sign;
+		} catch (Exception e) {
+			return null;
+		}
+	}
+
+	/**
+	 * 获取签名参数字符串
+	 *
+	 * @param paramMap 签名参数（sign字段不参与签名）
+	 * @param payKey   签名密钥
+	 * @return 待签名字符串
+	 */
+	private final static String getSignTemp(Map<String, Object> paramMap, String payKey) {
+		ArrayList<String> keyList = new ArrayList<>(paramMap.keySet());
+		Collections.sort(keyList);
+
+		StringBuilder signParam = new StringBuilder();
+		for (String key : keyList) {
+			if (!"sign".equals(key) && !StringUtil.isEmpty(paramMap.get(key).toString())) {
+				signParam.append(key).append("=").append(paramMap.get(key)).append("&");
+			}
+		}
+		signParam.delete(signParam.length() - 1, signParam.length());
+		signParam.append("&key=").append(payKey);
+		return signParam.toString();
+	}
+
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/WeChatMerchantRegistUtil.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/WeChatMerchantRegistUtil.java
new file mode 100644
index 0000000..2acba0c
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/WeChatMerchantRegistUtil.java
@@ -0,0 +1,207 @@
+package cn.pluss.platform.util;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.security.KeyStore;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import javax.net.ssl.SSLContext;
+import org.apache.http.HttpHeaders;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.ClientProtocolException;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.entity.mime.MultipartEntityBuilder;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.protocol.HTTP;
+import org.apache.http.ssl.SSLContexts;
+import org.apache.http.util.EntityUtils;
+
+public class WeChatMerchantRegistUtil {
+
+	//必须参数
+	private String version="3.0";//接口版本号
+	private String cert_sn="4F3FF2964275BA2D2D8320BC8187FB3E18D22DFE";//平台证书序列号
+	private String mch_id="1551169371";//商户号
+	private String nonce_str="ibuaiVcKdpRxkhJA";//随机字串
+	private String sign_type="HMAC-SHA256";//签名类型
+	private String sign="";//签名
+	private String business_code="814160525";//业务申请编号
+	private String id_card_copy = "uJylNilvwIro6TBgJGM-9Xo4GA_5bAWOrStBa7qYmDU8055I2W75tG9ogJjhcEJBNGAB64g7uZcFcR9oqP2wuhgitBHYTKBwFoML3Snd9p8";//身份证人像面照片
+	private String id_card_national = "uJylNilvwIro6TBgJGM-9avd2QA3zCP5GL1H_q9dbC0jPBDFVINWYQF0jYSGlJ3ITYH8Vo2dnR6eYKLM8v2aX_CZWmHS80Fi9CrIejrjC5o";//身份证国徽面照片
+	private String id_card_name = "fDPD1jyt2fFMIeL65aHV3wQu2CbOViddiNM5bo3ulMCgYpWH8N0d00Z75OB9hIjQnSHcmRHKZ8mjEK8tnQ+ndwWlD3/oNWrBJfn9mPD/98KUAcwGeg5HlpdTN9LuucLdTYBYuZvOsr3UBsYU08lVguKPedA7Tm8HUNg2YAgvysm5BGkWjLC+xngg4fsUaLyDav+z1K4zpT64vqGFkVNsvb8e7R96B6IxI6/ifknccpvwMiB91i101rDF+mMHsoJXwXOCRqD84w4ntljhSJwK4U+AsVlXf6dK7VsrX4bJLkmB4zIxEMnZuFB9oUCgrPOw/fVA88fzzNY9JsNbR97+QA==";//身份证姓名 钱志国
+	private String id_card_number = "FfByA2mz+4Orx/nRL2kAdV3x6vmmY1n4NDGxYRQpvGjq4myv12kSKTppxmTQUR5w+T2tfKytEfAdMAaak4DYh4+QzEQ9MF7YIbATKfMHBvUbYOKrvsh8BrWsTErMdZleqkWDh3xhYweCVkML+k5AcYOidyQ2VlRPnd1oRC7GOnwqV1bQynZXDvWQiHW8zC9jC/KwcD3uFtQS1ODr8ijQIEkKviwxQRD9aawYx+4BnuozVfh27A8ADtB+2vQNlVgQDR1Lxe2D9IOtVc1IAf2ktkDMXU2nFnwiGUDCV1NmiQeiVdwZhZGKPbYC8q7ItftjXBenO7cAHn0g8eiV6hnWDg==";//身份证号码 340121198510055215
+	private String id_card_valid_time = "[\"2016-08-01\",\"2036-08-01\"]";//身份证有效期限
+	private String account_name = "hxODtW+jc9sU27HNdVOFAPDe2Vk38d6Kkp4zKbSt3wsO+pFKezi3K2Gy8SM2keE9VkZTS86HLfFT20yuFzy0uXd3auZKwZezBIhsdG660BvQ29/sZvZAuuPNB+UfarG9aXZXE0SIyUTaMfJyqhzpZHPUfBNGXRJhPHJI0jJsq67RqhYyDSWIKMRBDmhgH0ukNN734mxMglcOSURKL2lJrSG/jk64Iz1bh7rZ7vk7QU6JVlls/juDWfWdcS2SpyzJ0WX/77sfhd73lDZP5xwVAUDf/5d7GfVN2JAlDolAOjbVGeqdRbnbNG0+aSLshdkdKDaRpThdzN+4cMIyPW0IGg==";//开户名称
+	private String account_bank = "招商银行";//开户银行
+	private String bank_address_code = "340103";//开户银行省市编码
+	private String bank_name = "招商银行合肥分行营业部";//开户银行全称（含支行）
+	private String account_number = "Gapag31cSFQN7AKDOv5uwKLvYVHyOHvF0WhJTAZXdtRs6P3uJ5zVzZGp2UAgYBL4WhTUvVMb6f0h74njeSSRs4uVZuwhQ9xbLn/DKDOFdpfZabV9wnG4pdPWWz2qQuWFj8uZlFrevMoWAbAHyNtSaFkK2mMMjNAD00Zi+/3M1pkZKTb9SFE1lyFBnfm0pbvRWq66FCrwZSN0wjx6o8hJB10s69/+Pf/f/O4ayd0hLnblAGc2aB0MZygmRsFMIADVsI99iYeJ+5u8mJ9zA+ojy8DejO8DH049S1exxBSVZBDvOMI/OIlJkPRacNFZx2dAzjvn6m3eFGlOqoYGYs9+XQ==";//银行账号
+	private String store_name = "八分菜馆";//门店名称
+	private String store_address_code = "340103";//门店省市编码
+	private String store_street = "庐阳区固镇路188号海棠别院3幢101/101(上)室";//门店街道名称
+	private String store_entrance_pic = "uJylNilvwIro6TBgJGM-9WFbxyINH2wsT2G8W7WwisecJVrf9KczrkDpf-KD2l3qLSYdaANbOq5uAZsuZtw2JQWqbR6AZ7UIdd2RYSOrzZc";//门店门口照片
+	private String indoor_pic = "uJylNilvwIro6TBgJGM-9cbPVSGY8948VHFSnRhsuqjbIRKSolQ-Gcc8Wwu-BkYpdEl9HFmdq46UmAPZ2KMliF0HyBrhKpbuRWAn8FuxMC8";//店内环境照片
+	private String merchant_shortname = "八分菜馆";//商户简称
+	private String service_phone = "18714898998";//客服电话
+	private String product_desc = "餐饮";//售卖商品/提供服务描述
+	private String rate = "0.6%";//费率
+	private String contact = "fDPD1jyt2fFMIeL65aHV3wQu2CbOViddiNM5bo3ulMCgYpWH8N0d00Z75OB9hIjQnSHcmRHKZ8mjEK8tnQ+ndwWlD3/oNWrBJfn9mPD/98KUAcwGeg5HlpdTN9LuucLdTYBYuZvOsr3UBsYU08lVguKPedA7Tm8HUNg2YAgvysm5BGkWjLC+xngg4fsUaLyDav+z1K4zpT64vqGFkVNsvb8e7R96B6IxI6/ifknccpvwMiB91i101rDF+mMHsoJXwXOCRqD84w4ntljhSJwK4U+AsVlXf6dK7VsrX4bJLkmB4zIxEMnZuFB9oUCgrPOw/fVA88fzzNY9JsNbR97+QA==";//超级管理员姓名
+	private String contact_phone = "E7JkGhddjlL55q37LuPYsQtT40hAqkN/z/eFyFaN9MxdRUtPRlocX3xO6NNs0QzapWNOH383G+WZeEXOPH8Yk0TxBClFv1+iZWEBKoTr8w0Df4NjuDMvnpXDMwPaDklDENfJwzhlcpC3eARr0YDhQtqwOmPEtmrmEeoOrZjuqeN8TmCSkvIxLT/8lVAfW/c+IZRZ4Uh0i0HQiPBPjSouBgOG2b+B09IbG2C7EuMDortjfBvt43cvw7pRPJOeFr3USxf6JkQNIhLJUnRLYGgBIBB9MoVtqYe8h+YJZWnkndlSGjnYdyEypSviWd3Iw9dnblSQ0RasGJE4l422VEg/ew==";//手机号码
+	private String contact_email = "814160525@qq.com";//联系邮箱
+	
+	
+	
+	
+	//选填参数
+	private String store_longitude = "";//门店经度
+	private String store_latitude = "";//门店纬度
+	private String address_certification = "";//经营场地证明
+	private String business_addition_desc = "";//补充说明
+	private String business_addition_pics = "";//补充材料
+	
+	//接口请求地址
+	private static String requestUrl = "https://api.mch.weixin.qq.com/applyment/micro/submit";
+	private static String payKey = "7F05NZBTJ3XNDK5HLSDC3H25ZXOQKDHT";
+	private static String keyStoreUrl = "D:\\WeChatMerchantTool\\apiclient_cert.p12";
+	
+	public void regist() throws ClientProtocolException, IOException {
+		
+		        // 初始化一个HttpClient
+				//CloseableHttpClient httpClient = HttpClients.createDefault();
+				// Post请求
+				HttpPost httpPost = new HttpPost(requestUrl);
+				/**
+				 * 这边需要您提供微信分配的商户号跟API密钥
+				 */
+				
+				Map<String, String> param = new HashMap<>(4);
+				param.put("version", version);
+				param.put("cert_sn", cert_sn);
+				param.put("mch_id", mch_id);
+				param.put("nonce_str", nonce_str);
+				param.put("sign_type", sign_type);
+				param.put("business_code", business_code);
+				param.put("id_card_copy", id_card_copy);
+				param.put("id_card_national", id_card_national);
+				param.put("id_card_name", id_card_name);
+				param.put("id_card_number", id_card_number);
+				param.put("id_card_valid_time", id_card_valid_time);
+				param.put("account_name", account_name);
+				param.put("account_bank", account_bank);
+				param.put("bank_address_code", bank_address_code);
+				//param.put("bank_name", bank_name);
+				param.put("account_number", account_number);
+				param.put("store_name", store_name);
+				param.put("store_address_code", store_address_code);
+				param.put("store_street", store_street);
+				param.put("store_entrance_pic", store_entrance_pic);
+				param.put("indoor_pic", indoor_pic);
+				param.put("merchant_shortname", merchant_shortname);
+				param.put("service_phone", service_phone);
+				param.put("product_desc", product_desc);
+				param.put("rate", rate);
+				param.put("contact", contact);
+				param.put("contact_phone", contact_phone);
+				//param.put("contact_email", contact_email);
+				String sign = WechatSignUtil.sha256Sign(param, payKey);
+				param.put("sign", sign);
+				// 声明存放参数的List集合
+	            List<NameValuePair> params = new ArrayList<NameValuePair>();
+
+	            // 遍历map，设置参数到list中
+	            for (Map.Entry<String, String> entry : param.entrySet()) {
+	                params.add(new BasicNameValuePair(entry.getKey(), entry.getValue().toString()));
+	            }
+	            
+	            
+	            // 创建form表单对象
+	            UrlEncodedFormEntity formEntity = new UrlEncodedFormEntity(params, "UTF-8");
+	    		//httpPost.setHeader(HttpHeaders.CONTENT_TYPE, ContentType.APPLICATION_XML.getMimeType());
+	            
+	            MultipartEntityBuilder multipartEntityBuilder = MultipartEntityBuilder.create();
+	            multipartEntityBuilder.addTextBody("version", version);
+	            multipartEntityBuilder.addTextBody("cert_sn", cert_sn);
+	            multipartEntityBuilder.addTextBody("mch_id", mch_id);
+	            multipartEntityBuilder.addTextBody("nonce_str", nonce_str);
+	            multipartEntityBuilder.addTextBody("sign_type", sign_type);
+	            multipartEntityBuilder.addTextBody("business_code", business_code);
+	            multipartEntityBuilder.addTextBody("id_card_copy", id_card_copy);
+	            multipartEntityBuilder.addTextBody("id_card_national", id_card_national);
+	            multipartEntityBuilder.addTextBody("id_card_name", id_card_name);
+	            multipartEntityBuilder.addTextBody("id_card_number", id_card_number);
+	            multipartEntityBuilder.addTextBody("id_card_valid_time", id_card_valid_time);
+	            multipartEntityBuilder.addTextBody("account_name", account_name);
+	            multipartEntityBuilder.addTextBody("account_bank", account_bank);
+	            multipartEntityBuilder.addTextBody("bank_address_code", bank_address_code);
+	            //multipartEntityBuilder.addTextBody("bank_name", bank_name);
+	            multipartEntityBuilder.addTextBody("account_number", account_number);
+	            multipartEntityBuilder.addTextBody("store_name", store_name);
+	            multipartEntityBuilder.addTextBody("store_address_code", store_address_code);
+	            multipartEntityBuilder.addTextBody("store_street", store_street);
+	            multipartEntityBuilder.addTextBody("store_entrance_pic", store_entrance_pic);
+	            multipartEntityBuilder.addTextBody("indoor_pic", indoor_pic);
+	            multipartEntityBuilder.addTextBody("merchant_shortname", merchant_shortname);
+	            multipartEntityBuilder.addTextBody("service_phone", service_phone);
+	            multipartEntityBuilder.addTextBody("product_desc", product_desc);
+	            multipartEntityBuilder.addTextBody("rate", rate);
+	            multipartEntityBuilder.addTextBody("contact", contact);
+	            multipartEntityBuilder.addTextBody("contact_phone", contact_phone);
+	            //multipartEntityBuilder.addTextBody("contact_email", contact_email);
+	            multipartEntityBuilder.addTextBody("sign", sign);
+	            
+	            
+	    		FileInputStream instream = null;
+				SSLContext sslcontext = null;
+				try {
+					KeyStore keyStore = KeyStore.getInstance("PKCS12");
+					instream = new FileInputStream(new File(keyStoreUrl));
+					keyStore.load(instream, mch_id.toCharArray());// 这里写密码..默认是你的MCHID
+					sslcontext = SSLContexts.custom().loadKeyMaterial(keyStore, mch_id.toCharArray()).build();
+				} catch (Exception e) {
+					System.out.println(e.getMessage());
+				} finally {
+					try {
+						if (instream != null) {
+							instream.close();
+						}
+					} catch (IOException e) {
+
+					}
+				}
+				@SuppressWarnings("deprecation")
+				SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(sslcontext, new String[] { "TLSv1" },
+						null, SSLConnectionSocketFactory.BROWSER_COMPATIBLE_HOSTNAME_VERIFIER);
+				CloseableHttpClient httpclient = HttpClients.custom().setSSLSocketFactory(sslsf).build();
+				try {
+					RequestConfig config = RequestConfig.custom().setConnectTimeout(10000)
+							.setConnectionRequestTimeout(10000).setSocketTimeout(10000).build();
+					httpPost.setConfig(config);
+					//// 这里的Content-type要设置为"multipart/form-data"，否则返回“参数填写有误，请检查后重试”
+					httpPost.setHeader(HttpHeaders.CONTENT_TYPE, "text/xml;charset=utf-8");
+					StringEntity postEntity = new StringEntity(WXPayXmlUtil.parseMapToXML(param), "UTF-8");
+					httpPost.setEntity(postEntity);
+					CloseableHttpResponse response = httpclient.execute(httpPost);
+					String result = EntityUtils.toString(response.getEntity(), "UTF-8");
+					System.out.println(result);
+				}
+				catch (Exception e) {
+					// TODO: handle exception
+					System.out.println(e.getMessage());
+				}
+	}
+	
+	
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/WechatScanUserPayUtil.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/WechatScanUserPayUtil.java
new file mode 100644
index 0000000..073c944
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/WechatScanUserPayUtil.java
@@ -0,0 +1,60 @@
+package cn.pluss.platform.util;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.HashMap;
+import java.util.Map;
+
+import cn.pluss.platform.wechat.MicroPayCore;
+
+public class WechatScanUserPayUtil {
+	
+	public static String wechatPayOfficial(String code,String sub_mch_id,String orderNumber,String storeName,String dealFee) {
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
+		  Calendar nowTime = Calendar.getInstance();
+		  nowTime.add(Calendar.MINUTE, 1);
+		Map<String, String> receiveDataMap = new HashMap<String, String>();
+		receiveDataMap.put("appid", ParametersUtil.APPID);
+		receiveDataMap.put("mch_id", ParametersUtil.PID);
+		receiveDataMap.put("sub_mch_id", sub_mch_id);//"1556940571"
+		receiveDataMap.put("nonce_str", StringUtil.genRandomNum().toUpperCase());
+		receiveDataMap.put("body", storeName);
+		receiveDataMap.put("detail", storeName);
+		receiveDataMap.put("out_trade_no", orderNumber);
+		receiveDataMap.put("total_fee", dealFee);
+		receiveDataMap.put("spbill_create_ip", "60.168.58.93");
+		receiveDataMap.put("auth_code", code);
+		receiveDataMap.put("time_expire", sdf.format(nowTime.getTime()));
+		receiveDataMap.put("sign_type", "HMAC-SHA256");
+		receiveDataMap.put("sign", WechatSignUtil.sha256Sign(receiveDataMap, ParametersUtil.KEY));
+
+		return WXPayHttpUtil.WXHttpPostXMLWithoutCert("https://api.mch.weixin.qq.com/pay/micropay", receiveDataMap);
+	}
+	
+	
+	/**
+	 * 
+	 * getOenIdByAuthCode:(获取oenId). <br/> 
+	 * 
+	 * @author Administrator 
+	 * @param sub_mch_id
+	 * @param authCode
+	 * @return 
+	 * @since JDK 1.8
+	 */
+	public static String getOenIdByAuthCode(String sub_mch_id,String authCode) {
+		Map<String, String> receiveDataMap = new HashMap<String, String>(16);
+		receiveDataMap.put("appid", ParametersUtil.APPID);
+		receiveDataMap.put("mch_id", ParametersUtil.PID);
+		receiveDataMap.put("sub_mch_id", sub_mch_id);
+		receiveDataMap.put("nonce_str", StringUtil.genRandomNum().toUpperCase());
+		receiveDataMap.put("auth_code", authCode);
+		Map<String, String> array = MicroPayCore.paraFilter(receiveDataMap);
+		String sign = MicroPayCore.buildMysign(array, ParametersUtil.KEY);
+		receiveDataMap.put("sign", sign);
+		return WXPayHttpUtil.WXHttpPostXMLWithoutCert("https://api.mch.weixin.qq.com/tools/authcodetoopenid", receiveDataMap);
+	}
+	
+	
+	
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/WechatSignUtil.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/WechatSignUtil.java
new file mode 100644
index 0000000..87f8650
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/WechatSignUtil.java
@@ -0,0 +1,98 @@
+package cn.pluss.platform.util;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+
+import javax.crypto.Mac;
+import javax.crypto.spec.SecretKeySpec;
+
+import com.alibaba.fastjson.JSONObject;
+
+public class WechatSignUtil {
+
+	
+	public static String getSign(Map<String, String> map) {
+		 
+		String result = "";
+		try {
+			List<Map.Entry<String, String>> infoIds = new ArrayList<Map.Entry<String, String>>(map.entrySet());
+			// 对所有传入参数按照字段名的 ASCII 码从小到大排序（字典序）
+			Collections.sort(infoIds, new Comparator<Map.Entry<String, String>>() {
+ 
+				public int compare(Map.Entry<String, String> o1, Map.Entry<String, String> o2) {
+					return (o1.getKey()).toString().compareTo(o2.getKey());
+				}
+			});
+			
+			// 构造签名键值对的格式
+			StringBuilder sb = new StringBuilder();
+			for (Map.Entry<String, String> item : infoIds) {
+				if (item.getKey() != null || item.getKey() != "") {
+					String key = item.getKey();
+					String val = item.getValue();
+					if (!(val == "" || val == null)) {
+						sb.append(key + ":" + val + ":");
+					}
+				}
+ 
+			}
+//			sb.append(PropertyManager.getProperty("SIGNKEY"));
+			result = sb.toString();
+
+			
+		} catch (Exception e) {
+			return null;
+		}
+		return result;
+	}
+	/**
+	 * 获取HMAC-SHA256签名
+	 *
+	 * @param paramMap 签名参数（sign不参与签名）
+	 * @param key      签名密钥
+	 * @return HMAC-SHA256签名结果
+	 */
+	public final static String sha256Sign(Map<String, String> paramMap, String key) {
+		try {
+			String payParam = getSignTemp(paramMap, key);
+			Mac sha256_HMAC = Mac.getInstance("HmacSHA256");
+			SecretKeySpec secret_key = new SecretKeySpec(key.getBytes("UTF-8"), "HmacSHA256");
+			sha256_HMAC.init(secret_key);
+			byte[] array = sha256_HMAC.doFinal(payParam.getBytes("UTF-8"));
+			StringBuilder sb = new StringBuilder();
+			for (byte item : array) {
+				sb.append(Integer.toHexString((item & 0xFF) | 0x100).substring(1, 3));
+			}
+			String sign = sb.toString().toUpperCase();
+			return sign;
+		} catch (Exception e) {
+			e.printStackTrace();
+			return null;
+		}
+	}
+	
+	/**
+	 * 获取签名参数字符串
+	 *
+	 * @param paramMap 签名参数（sign字段不参与签名）
+	 * @param payKey   签名密钥
+	 * @return 待签名字符串
+	 */
+	public static String getSignTemp(Map<String, String> paramMap, String payKey) {
+		ArrayList<String> keyList = new ArrayList<>(paramMap.keySet());
+		Collections.sort(keyList);
+		StringBuilder signParam = new StringBuilder();
+		for (String key : keyList) {
+			System.out.println(key+"======"+paramMap.get(key));
+			if (!"sign".equals(key) && !StringUtil.isEmpty(paramMap.get(key).toString())) {
+				signParam.append(key).append("=").append(paramMap.get(key)).append("&");
+			}
+		}
+		signParam.delete(signParam.length() - 1, signParam.length());
+		signParam.append("&key=").append(payKey);
+		return signParam.toString();
+	}
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/XmlSignUtil.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/XmlSignUtil.java
new file mode 100644
index 0000000..d931c65
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/XmlSignUtil.java
@@ -0,0 +1,234 @@
+/**
+ * Alipay.com Inc.
+ * Copyright (c) 2004-2016 All Rights Reserved.
+ */
+package cn.pluss.platform.util;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.StringReader;
+import java.io.UnsupportedEncodingException;
+import java.security.KeyFactory;
+import java.security.PrivateKey;
+import java.security.PublicKey;
+import java.security.spec.PKCS8EncodedKeySpec;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.apache.commons.codec.binary.Base64;
+import org.apache.xml.security.signature.XMLSignature;
+import org.apache.xml.security.transforms.Transforms;
+import org.apache.xml.security.utils.Constants;
+import org.apache.xml.security.utils.XMLUtils;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
+/**
+ * 进行签名验签的测试
+ * 
+ * @author jin.xie
+ * @version $Id: XmlSignTest.java, v 0.1 2016年2月1日 上午10:51:39 jin.xie Exp $
+ */
+public class XmlSignUtil {
+	
+	//生产环境
+    /** 公钥 RSA */
+    public static final String RSA_publicKey  = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArohPusb9qwdDwnyTBxf+YnBEkeUfF+FJEzlK60TDKBnmQWk4zDsFRz6EroOvClxP998ffoTbyOuQJZHU9Hcb/YJaWBTaU7emcjxjV+L+6qBLZIzBdq4tH4dJXshKT8gd5ggQw00K2mwsdGI3ysFth8i8Gefu8wSduXT4yigLSWIyVLKa8lAFBe+//TZc9h76JJtCwLwULwryQLSfUo6d5bQhPsqcQ7Dnur8F+c5XdDmdkrFHXHlCuEHioR4dcOCvIf4UWq4inGKkwu7dJe5EOci7wLozLk+4F0bgryVX0kzxzusGkMF5UtwPjCmQnBI/mXFqnaHSr5iYBu0ElkwseQIDAQAB";
+    /** 私钥 RSA */
+    public static final String RSA_privateKey = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCuiE+6xv2rB0PCfJMHF/5icESR5R8X4UkTOUrrRMMoGeZBaTjMOwVHPoSug68KXE/33x9+hNvI65AlkdT0dxv9glpYFNpTt6ZyPGNX4v7qoEtkjMF2ri0fh0leyEpPyB3mCBDDTQrabCx0YjfKwW2HyLwZ5+7zBJ25dPjKKAtJYjJUspryUAUF77/9Nlz2Hvokm0LAvBQvCvJAtJ9Sjp3ltCE+ypxDsOe6vwX5zld0OZ2SsUdceUK4QeKhHh1w4K8h/hRariKcYqTC7t0l7kQ5yLvAujMuT7gXRuCvJVfSTPHO6waQwXlS3A+MKZCcEj+ZcWqdodKvmJgG7QSWTCx5AgMBAAECggEBAIAjbAYBWvRaXRFJTNkEcKvtKSrEQVPS/0ex5KNe1Ll4amjTy/OF0ZZA/ED0RWsh40Rk+EZ3XLXi3O34Z5UkbdRuA85vYOveBcIRPA6mhenUzgWAofl0X4SqWt/PxV9V2T2t5kC9K565lNnN0pB1+uiaJCAQ/IpHdVVX3+DsDX1N+FeAYCNRCDX2CTA+nsKe9wStMyU7xdHs/DKLjvCqrj3KvvEi2wp5I4eKbrxmTuz8RcsM9KyGQoyynijcK6DcOeiKeA+YAPTFJYAvDYtb0kjVP3Y+012Lg3rUYDmoOhsask+RwQddB188yBxu1VQYz1CcFs+te+LaZJdLLKlhz1ECgYEA3VhKpJpCPRpM03v+/FLCEwN0BWmc6FmyCQTk8dxZq7i/m/fhgjCVfS9WKABgMRd4pM3HnWwJImREpVRQAjLJrDEvnrhL+6ytn+OFLlX9+J6o3s0e3AW3Q9YFTMpzA8irrxDjHASXSi1VenkhdhzCMBLfzljIIW0EKV8e1Vr/WlsCgYEAydu8DIrpTmf5gM5isQNmIWa5ABP7rZSB+U3RKM95zHubmdYAIMAFhxnskZQaATqqGadAn4ZErG6xGVCqf8tGWVdRxAEsMxWOcbOGzv+7BJsl8rnFjiC0tgZZP4rXjTRRMM+WkMu5Dmnh4pkMpgGBCI8VsGGvjnvQ5aeoXeZfRLsCgYBXTJNkCFNHti/G2YjgC+Pvi9UerWDtYzMMy5lgqv/S8rLf2QxgRLkw/pKEhGFr+03h8idgt1OC9Pj+HBrSQyW3fE7D0vxk7t4ryZilhdT9UdZYyZ36OWbmomrEtrRWMbdE/OwWCNmCsA6el1fTNdSBEXCj+fA0/sI9bv7CN3mvMQKBgF29HuysLX/tpN39+bK+I1VrgInavctz5Y/CZVkQUD13QWEFEfYjde2xSjyojBL6DTfwhYAPOCDjHnblEOhbm4WtmRjuenoWjpmahwXlmBGhgtPfFTDVW1YUSKnLbiHyo6mJHSCMmplo7i7uaANHO4af+7B3DLGcKfwcCYHhk2g1AoGAVk69S0cgNDZed+/ZzJVrke3q0IlfBgU/p4dAytxxmzJ8rGRzclfGkwi+kaKIQwPvLYt2PjWaDt7G6wYwnUMBU4PoftmSCynl6u9FDm9kY8smkojH/e4k/N3yevfswtlIgE8JIX78CDxqZwVFV47pDe4Hji/wzCjGhrE1mfKTvNs=";
+   
+	
+    
+	//测试环境
+//	/** 公钥 RSA */
+//    public static final String RSA_publicKey  = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqOq41hcFZ1FdKMt6zXi1Qtm5s+KsOOLUPv6spkTAlw23yayObIv7aovo85Xsm0LRnmakEJBHpTY2UUlGyjKQ3GHFb9GN4ZyG6zyimVK3xBO0LSZhPN6NgcALqTFrlkhJ7eKq3aw53b9XhIPc3ZFvTFSqHR5Vl2xscNQkR776J9WJbK5MIW2bT7dRb9nJePMyHytKivbCdieGxkwiZCqGgkaHJTIXydPHVfgZ3zbluJ/8UucphS5/iUFsfdnOC/NiO9P01zjWWKo9qZpDad8/TJT6ZWby4pU3SrpNUeLm7ADW/M5UUXjA9B+BXGkK6D8O/CU841hM2aLlfIi4TpO1DQIDAQAB";
+//    /** 私钥 RSA */
+//    public static final String RSA_privateKey = "MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCo6rjWFwVnUV0oy3rNeLVC2bmz4qw44tQ+/qymRMCXDbfJrI5si/tqi+jzleybQtGeZqQQkEelNjZRSUbKMpDcYcVv0Y3hnIbrPKKZUrfEE7QtJmE83o2BwAupMWuWSEnt4qrdrDndv1eEg9zdkW9MVKodHlWXbGxw1CRHvvon1YlsrkwhbZtPt1Fv2cl48zIfK0qK9sJ2J4bGTCJkKoaCRoclMhfJ08dV+BnfNuW4n/xS5ymFLn+JQWx92c4L82I70/TXONZYqj2pmkNp3z9MlPplZvLilTdKuk1R4ubsANb8zlRReMD0H4FcaQroPw78JTzjWEzZouV8iLhOk7UNAgMBAAECggEAcyeBVsJe9q5rOhJt54Gw4KAZj16qViWc2E06WidovBGoB57RgYJ0pZA4AUdmA/qreLc0he42SZUJtqSj09hhFTy6Ip7TgMj62Yd+udPAX7WnEVim1Z5LDfdke7WrSMqDS99I6NIuqNN20GosuggZvgnB5xP0+cP6sXiOOzMgyuIU0Y44SGwUiDn70O1FjJd6ydbhRnsRLyrWmj+mDDGwVBGyJdRKDKcp7MGhCHmqhKFr4IETAvhsjyjF6msmySk/oxsDZGCXx/xNDFIOPVzbjqMOZfShHX3hvDmla51yCmWB7rioco5u232bxZPNNLqf4LULa/Npb0piBbdSvoAkKQKBgQDpyL1J2rr2UbrzW/G+uAipevNnLJn35cX1FW/IJmZS7zUzz6hE+xeUo7iDCKYtqsdsnxMND68jcKGu7NO9pGi+4NlakHPBxLpudZmkXJWVVCFqKwvSr0z8dbnIQNvSyppWInZZtApZGgclODhAPqe7RSIOk7gfxnAHzFDEoZRc7wKBgQC49/VmHx0Zsl8JM5BE0jEMoK3cNbxPeSENR0HoSUAorXiK4eUueAvi0nPzPNzdDlbMonBJrdNW9u+hxQuDFKccb/gxeAM50Z/Qb+5FXvps/vUB0qxnY0Ud/6W8ycb5f7Scfhm79Rfx63crwFr+V9CrE50VwixAogAC66z3C8PFwwKBgQDWdefvUFAilmdByB7ELl8D2l5fT3MPDiHC6p9YpKFJg1by6JQcc5r2KBqjWdPYIMpAwszfNnwbrr8jkO3NEn1kXTAG/Gy0XJwJqKgBN02hZ0Qf+M0nwNiG4BhFs/n0LRfX3FVlhNvZUR8s7Z3skY2dJZZQeQJ3Y7px7ORK/U700QKBgHPYqNOa7QjpFGiY6OSRmLLF994Rsa08uhys4nRvXEWdz/9716Qw/5DCKmjPV60DjA2CNz2OJu0yn4b7+GfSiY9f+VxSRAL0bVmIoPzFraaSUDUiE2R1YhaVxOHmpj4hY6cXu1pi+OpFhU/bm6Hssf5TvHCiOkEItWUe4iegMK8tAoGBALZwjzK23WqNzHG8wnFCF3chP5V4k/ttpO7lnS70PlmkTDH1VS96C/fY9VEvJPAFiRz4p3Iy06e/DGyOE2ZFPts3ybrloC53JGAZgXrvVhDHMx8N5yEM71fhM7horRQuWvNiNPcuqi4Fz9IuQ1apbgwrBcapAaNF5OTVh1CxK22w";
+
+    
+    
+    
+    /** 网商银行测试环境公钥 RSA */
+    public static String bank_RSA_publicKey  = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDOb4B1dnwONcW0RoJMa0IOq3O6jiqnTGLUpxEw2xJg+c7wsb6DBy5CAoR0w2ZjZ/BjKxGIQ+DoDg3NsHJeyuEjNF0/Ro/R5xVpFC5z4cBVSC2/gddz4a1EoGDJewML/Iv0yIw7ylB86++h23nRd079c5S9RZXurBfnLW2Srhqk2QIDAQAB";
+    private static final String XML_ALGORITHM      = "http://www.w3.org/2001/04/xmldsig-more#rsa-sha256";
+    private static final String CHARSET            = "UTF-8";
+    private static final String RESPONSE_TAG_NAME  = "response";
+    /**
+     * 签名- XML
+     * 
+     * @throws Exception
+     */
+    public static String sign(String xmlContent) throws Exception {
+        Document doc = parseDocumentByString(xmlContent);
+        PrivateKey privateKey = SignatureUtils.getPrivateKey(RSA_privateKey);
+        String result = SignatureUtils.signXmlElement(privateKey, doc, "request",
+            XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA256, 2);
+        return result;
+    }
+    
+    
+    public static String signResponse(String xmlContent) throws Exception {
+        Document doc = parseDocumentByString(xmlContent);
+        PrivateKey privateKey = SignatureUtils.getPrivateKey(RSA_privateKey);
+        String result = SignatureUtils.signXmlElement(privateKey, doc, "response",
+            XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA256, 2);
+        return result;
+    }
+
+    /**
+     * 验签 - XML
+     * 
+     * @throws Exception
+     */
+    public static boolean verify(String xmlContent) throws Exception {
+        Document doc = parseDocumentByString(xmlContent);
+        PublicKey publicKey = SignatureUtils.getPublicKey(RSA_publicKey);
+        //PublicKey publicKey = SignatureUtils.getPublicKey(RSA_publicKey);
+        return SignatureUtils.verifyXmlElement(publicKey, doc);
+    }
+
+    /**
+     * 解析XML
+     * 
+     * @param xmlContent
+     * @return
+     * @throws SAXException
+     * @throws IOException
+     * @throws ParserConfigurationException
+     */
+    private static Document parseDocumentByString(String xmlContent) throws SAXException,
+                                                                    IOException, Exception {
+
+        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+        factory.setNamespaceAware(true);// 否则无法识别namespace
+        return factory.newDocumentBuilder().parse(new InputSource(new StringReader(xmlContent)));
+    }
+    
+    public static void main(String[] args) throws Exception{
+        bank_RSA_publicKey  = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAg0HDiStmHDTHOAptH5Jlp4sg03Czir/My4vvFK/7Un/zyuyTa3aHqav4+GqPhGJcIGIiLVuP/tCCEU4Edl3LC0bNxUBdnPv7k3HDoonWmqD/EhBXKe/GD/Dwrn90VfP1s314ykj8Z2T06l3LYb5F44L8JOgVrqJOe2FMXvsEt6sik2jnMdq2rJLeda1QLQMKnla4t2wVK1DoC0eu+ry3Oc2BWhYwU1bwWaX71mROH0Q3jXj3FFLdGp2trrnkKnQzNfGHjRChxTWl3CgiWbFd/Ejgp0/cpovq3cAJtxD7HdtwOibiI9u6owyWFM6C2pMjsuI23WofRyD9UQoU0UToiwIDAQAB";
+        File file = new File("d:/sign.txt");
+        InputStream in  = new FileInputStream(file);
+        byte[] b = new byte[in.available()];
+        in.read(b);
+        String xml =new String(b);
+        in.close();
+       boolean result = verify(xml);
+       System.out.println(result);
+    }
+    
+    
+
+    public void beforeTest() {
+        org.apache.xml.security.Init.init();
+    }
+    
+    public static String xmlSign(String xmlSource) throws Exception {
+    	org.apache.xml.security.Init.init();
+        PrivateKey privateKey = getPrivateKey(RSA_privateKey.getBytes());
+        System.out.println(privateKey);
+//        String xmlSource = "<document><request><head><appid>2017060700000025</appid><function>ant.mybank.yulibao.accountopen.query</function><inputCharset>UTF-8</inputCharset><reqMsgId>e08d3570-af06-42ca-9486-6b553e4d76d5</reqMsgId><respTime>20170613124952</respTime><version>1.0.0</version></head><body><fundCode>001529</fundCode><isvOrgId>202210000000000001055</isvOrgId><merchantId>2088611330087634</merchantId></body></request></document>";
+        String xmlWithSign = signResponseMessage(xmlSource, privateKey);
+		return xmlWithSign;
+    }
+    
+    
+    
+    /**
+     * 读取私钥
+     * 
+     * @param keyData 私钥数据
+     * @return
+     * @throws Exception
+     */
+    public static PrivateKey getPrivateKey(final byte[] keyData) throws Exception {
+
+        byte[] encodedKey = Base64.decodeBase64(keyData);
+        final PKCS8EncodedKeySpec keySpec = new PKCS8EncodedKeySpec(encodedKey);
+        final KeyFactory keyFactory = KeyFactory.getInstance("RSA");
+        return keyFactory.generatePrivate(keySpec);
+    }
+    
+    
+    /**
+     * 私钥签名应答报文
+     * 
+     * @param responseMessage
+     * @param privateKey
+     * @return
+     * @throws Exception 
+     */
+    public static String signResponseMessage(String responseMessage, PrivateKey privateKey)
+                                                                                           throws Exception {
+        return signXmlMessage(responseMessage, RESPONSE_TAG_NAME, privateKey);
+    }
+    /**
+     * 私钥签名
+     * 
+     * @param xmlMessageSource 待签名的XML
+     * @param elementTagName
+     * @param privateKey
+     * @return
+     * @throws Exception 
+     */
+    public static String signXmlMessage(String xmlMessageSource, String elementTagName,
+            PrivateKey privateKey) throws Exception {
+
+		Document xmlDocument = getDocument(xmlMessageSource);
+		XMLSignature xmlSignature = new XMLSignature(xmlDocument, xmlDocument.getDocumentURI(),
+		XML_ALGORITHM);
+		
+		NodeList nodeList = xmlDocument.getElementsByTagName(elementTagName);
+		if (nodeList == null || nodeList.getLength() != 1) {
+		throw new Exception("Document element with tag name " + elementTagName + " not fount");
+		}
+		Node elementNode = nodeList.item(0);
+		elementNode.getParentNode().appendChild(xmlSignature.getElement());
+		
+		Transforms transforms = new Transforms(xmlDocument);
+		transforms.addTransform(Transforms.TRANSFORM_ENVELOPED_SIGNATURE);
+		xmlSignature.addDocument("", transforms, Constants.ALGO_ID_DIGEST_SHA1);
+		
+		xmlSignature.sign(privateKey);
+		
+		ByteArrayOutputStream os = new ByteArrayOutputStream();
+		XMLUtils.outputDOM(xmlDocument, os);
+		return os.toString(CHARSET);
+   }
+    
+    /**
+     * 解析XML字符串
+     * 
+     * @param xmlMessageSource
+     * @return
+     * @throws ParserConfigurationException
+     * @throws SAXException
+     * @throws IOException
+     * @throws UnsupportedEncodingException
+     */
+    private static Document getDocument(String xmlMessageSource)
+                                                                throws ParserConfigurationException,
+                                                                SAXException, IOException,
+                                                                UnsupportedEncodingException {
+
+        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+        factory.setNamespaceAware(true);
+        DocumentBuilder builder = factory.newDocumentBuilder();
+        Document xmlDocument = builder.parse(new InputSource(new ByteArrayInputStream(
+            xmlMessageSource.getBytes(CHARSET))));
+        return xmlDocument;
+    }
+    
+    
+    
+    
+
+}
\ No newline at end of file
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/XmlSignatureAppendMode.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/XmlSignatureAppendMode.java
new file mode 100644
index 0000000..6ce5909
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/XmlSignatureAppendMode.java
@@ -0,0 +1,22 @@
+/**
+ * Alipay.com Inc.
+ * Copyright (c) 2004-2016 All Rights Reserved.
+ */
+package cn.pluss.platform.util;
+
+/**
+ * 
+ * @author simon.xxm
+ * @version $Id: XmlSignatureAppendMode.java, v 0.1 2016年2月17日 下午6:05:27 simon.xxm Exp $
+ */
+public class XmlSignatureAppendMode {
+
+    /**
+     * 签名节点作为签名元素的子节点
+     */
+    public static final int AS_CHILDREN = 1;
+    /**
+     * 签名节点作为签名元素的兄弟节点
+     */
+    public static final int AS_BROTHER  = 2;
+}
\ No newline at end of file
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/XmlUtil.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/XmlUtil.java
new file mode 100644
index 0000000..ce4c77d
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/XmlUtil.java
@@ -0,0 +1,335 @@
+package cn.pluss.platform.util;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.dom4j.Document;
+import org.dom4j.DocumentException;
+import org.dom4j.DocumentHelper;
+import org.dom4j.Element;
+import org.dom4j.Namespace;
+import org.dom4j.QName;
+import org.dom4j.dom.DOMElement;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * @author yuchen
+ * 
+ * @Description 
+ */
+public class XmlUtil {
+	
+	private static final Logger log = LoggerFactory.getLogger( XmlUtil.class);
+		
+    public static String createXml(String element , Map<String, Object> map, String encoding){
+        Document document = DocumentHelper.createDocument();
+        if(encoding!=null){
+            document.setXMLEncoding(encoding);  
+        }
+        Element newspaperElement = document.addElement(element);
+        
+        Iterator<String> it = map.keySet().iterator();
+        while(it.hasNext()){
+            String key = it.next();
+            Object o = map.get(key);
+            if(!(o instanceof String)){
+                o = String.valueOf(o);
+            }
+            newspaperElement.addElement(key).setText(o.toString());
+        }
+        
+        return document.asXML();
+    }
+    
+    /**
+     * 
+     * 描  叙: 解析xml报文
+     * <p>
+     * 作  者: 徐新明<br>
+     * 时  间: 2015年4月17日 下午6:39:00
+     */
+    public static Map<String, String> readXml(String xmlText){
+        Map<String, String> map = new HashMap<String, String>();
+        Document document;
+        try {
+            document = DocumentHelper.parseText(xmlText);
+            Element root = document.getRootElement();
+            List<Element> list = root.elements();
+             for(Element e : list){
+                 parseXmlElement(map, e);
+             }
+        } catch (DocumentException e) {
+            log.error("解析xml报文出错"+xmlText, e);
+        }  
+       return map;
+    }
+    
+    public static void parseXmlElement(Map<String, String> map, Element e){
+        if(e.elementIterator().hasNext()){
+            Iterator<Element> it = e.elementIterator();
+             while(it.hasNext()){
+                 e = it.next();
+                 parseXmlElement(map, e);
+             }
+         }else{
+             map.put(e.getName(), e.getText()); 
+         }
+    }
+    
+  //读取报文格式cn.pluss.platform.xml
+    public String sendStyle(String function){
+        InputStream is=getClass().getClassLoader().getResourceAsStream("xml/"+function+".xml");
+        return getStyle(is);
+    }
+    //读取报文格式
+    public String receiveStyle(String function){
+    	 InputStream is=getClass().getClassLoader().getResourceAsStream("xml/"+function+".xml");
+        return getStyle(is);
+    }
+    public String getStyle(InputStream is){
+        BufferedReader br=null;
+        StringBuffer sb=new StringBuffer();
+        try{
+            br=new BufferedReader(new InputStreamReader(is));
+            String s="";
+            while((s=br.readLine())!=null){
+                sb.append(s);
+            }
+        }catch(IOException e){
+            e.printStackTrace();
+        }finally{
+            try {
+                if(br!=null)br.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return sb.toString();
+    }
+    //封装报文
+    public String format(Map<String,String> form,String function) throws DocumentException{
+        //报文头
+        Element headElement=formatHead(form);
+        //报文体
+        Element bodyElement=formatBody(form,function);
+        
+        Document docRes=DocumentHelper.createDocument();
+        Element rootElement=docRes.addElement("document");
+        Element requestElement=rootElement.addElement("request").addAttribute("id", "request");
+        requestElement.add(headElement);
+        requestElement.add(bodyElement);
+        
+        String out=docRes.asXML();
+        return out;
+    }
+    
+    //封装报文
+    public String formatResponse(Map<String,String> form,String function) throws DocumentException{
+        //报文头
+        Element headElement=formatHead(form);
+        //报文体
+        Element bodyElement=formatBody(form,function);
+        
+        Document docRes=DocumentHelper.createDocument();
+        Element rootElement=docRes.addElement("document");
+        Element requestElement=rootElement.addElement("response").addAttribute("id", "response");
+        requestElement.add(headElement);
+        requestElement.add(bodyElement);
+        
+        String out=docRes.asXML();
+        return out;
+    }
+    
+    private void sign(Document doc){
+        String xml = doc.getRootElement().element("response").asXML();
+        //return RSA.sign(xml, privateKey);
+    }
+    //封装报文头
+    public Element formatHead(Map<String,String> form) throws DocumentException{
+        Document docStyle = DocumentHelper.parseText(sendStyle("head"));
+        Element headStyle = docStyle.getRootElement();
+        List<Element> list = headStyle.elements();
+        Element headElement=new DOMElement("head");
+        for(int i=0;i<list.size();i++){
+            Element e=list.get(i);
+            String tagName=e.attributeValue("tagName");
+            String value=form.get(tagName);
+            if(value==null){
+                String defaultValue=e.attributeValue("defaultValue");
+                if(defaultValue!=null){
+                    value=defaultValue;
+                }
+            }
+            if(value!=null){
+                headElement.addElement(tagName).setText(value);
+            }
+        }
+        return headElement;
+    }
+    //封装报文体
+    public Element formatBody(Map<String,String> form,String function) throws DocumentException{
+        Document docStyle = DocumentHelper.parseText(sendStyle(function));
+        Element bodyStyle = docStyle.getRootElement();
+        List<Element> list = bodyStyle.elements();
+        Element bodyElement=new DOMElement("body");
+        for(int i=0;i<list.size();i++){
+            Element e=list.get(i);
+            String tagName=e.attributeValue("tagName");
+            String value=form.get(tagName);
+            if(value==null){
+                String defaultValue=e.attributeValue("defaultValue");
+                if(defaultValue!=null){
+                    value=defaultValue;
+                }
+            }
+            if(value!=null){
+                bodyElement.addElement(tagName).setText(value);
+            }
+        }
+        return bodyElement;
+    }
+    //封装签名数据
+    public Element formatSign(Map<String,String> form){
+        Namespace dsNamespace = new Namespace("ds","http://www.w3.org/2000/09/xmldsig#");
+        Element signature=new DOMElement(new QName("Signature",dsNamespace));
+        Element signatureValue=signature.addElement(new QName("SignatureValue",dsNamespace));
+        signatureValue.setText("签名数据");
+        return signature;
+    }
+    
+    //解析报文
+    public Map<String,Object> parse(String response,String function) throws DocumentException{
+        Map<String, Object> returnMap=new HashMap<String,Object>();
+        Document docStyle = DocumentHelper.parseText(response);
+        List<Element> headList= docStyle.getRootElement().element("response").element("head").elements();
+        Map<String,Object> headMap=parseHead(headList);
+        
+        List<Element> bodyList= docStyle.getRootElement().element("response").element("body").elements();
+        Map<String,Object> bodyMap=parseBody(bodyList);
+        
+        
+        returnMap.putAll(headMap);
+        returnMap.putAll(bodyMap);
+        return returnMap;
+    }
+    
+    //解析报文
+    public Map<String,Object> parseReceive(String request,String function) throws DocumentException{
+        Map<String, Object> returnMap=new HashMap<String,Object>();
+        Document docStyle = DocumentHelper.parseText(request);
+        List<Element> headList= docStyle.getRootElement().element("request").element("head").elements();
+        Map<String,Object> headMap=parseHead(headList);
+        
+        List<Element> bodyList= docStyle.getRootElement().element("request").element("body").elements();
+        Map<String,Object> bodyMap=parseBody(bodyList);
+        
+        
+        returnMap.putAll(headMap);
+        returnMap.putAll(bodyMap);
+        return returnMap;
+    }
+    //解析报文头
+    private Map<String, Object> parseHead(List<Element> list) throws DocumentException {
+        Map<String,Object> headMap=new HashMap<String,Object>();
+        for(int i=0;i<list.size();i++){
+            Element e=list.get(i);
+            if(e.getText()!=null && !"".equals(e.getText()))
+                headMap.put(e.getName(), e.getText());
+        }
+        return headMap;
+    }
+    //解析报文体
+    private Map<String, Object> parseBody(List<Element> list) throws DocumentException {
+        Map<String,Object> bodyMap=new HashMap<String,Object>();
+        for(int i=0;i<list.size();i++){
+            Element e=list.get(i);
+            //包含子元素
+            if(e.elements().size()!=0){
+                //重复标签合并成list
+                if(bodyMap.containsKey(e.getName())){
+                    Object o=bodyMap.get(e.getName());
+                    if(o instanceof ArrayList){
+                        ArrayList<Object> oList=(ArrayList<Object>)o;
+                        oList.add(parseBody(e.elements()));
+                    }else{
+                        ArrayList<Object> oList=new ArrayList<Object>();
+                        oList.add(o);
+                        oList.add(parseBody(e.elements()));
+                        bodyMap.put(e.getName(), oList);
+                    }
+                }else{
+                    bodyMap.put(e.getName(), parseBody(e.elements()));
+                }
+            //无子元素且非空
+            }else if(e.getText()!=null && !"".equals(e.getText())){
+                //重复标签合并成list
+                if(bodyMap.containsKey(e.getName())){
+                    Object o=bodyMap.get(e.getName());
+                    if(o instanceof ArrayList){
+                        ArrayList<Object> oList=(ArrayList<Object>)o;
+                        oList.add(e.getText());
+                    }else{
+                        ArrayList<Object> oList=new ArrayList<Object>();
+                        oList.add(o);
+                        oList.add(e.getText());
+                        bodyMap.put(e.getName(), oList);
+                    }
+                }else{
+                    bodyMap.put(e.getName(), e.getText());
+                }
+            }
+        }
+        return bodyMap;
+    }
+
+    public void addDs() throws IOException, DocumentException{
+        InputStream is=XmlUtil.class.getResourceAsStream("originMessage.txt");
+        BufferedReader br=new BufferedReader(new InputStreamReader(is));
+        StringBuffer sb=new StringBuffer();
+        String s="";
+        while((s=br.readLine())!=null){
+            sb.append(s);
+        }
+        s=sb.toString();
+        Document document = DocumentHelper.parseText(s);
+        String out=document.asXML();
+        System.out.println(out);
+        
+        Element root=document.getRootElement();
+        
+        Namespace dsNamespace = new Namespace("ds","http://www.w3.org/2000/09/xmldsig#");
+        Element signature=root.addElement(new QName("Signature",dsNamespace));
+        Element signedInfo=signature.addElement(new QName("SignedInfo",dsNamespace));
+        signedInfo.addElement(new QName("CanonicalizationMethod",dsNamespace))
+            .addAttribute("Algorithm", "http://www.w3.org/TR/2001/REC-xml-c14n-20010315");
+        signedInfo.addElement(new QName("SignatureMethod",dsNamespace))
+            .addAttribute("Algorithm", "http://www.w3.org/2001/04/xmldsig-more#rsa-sha256");
+        Element reference=signedInfo.addElement(new QName("Reference",dsNamespace));
+        reference.addAttribute("URI", "");
+        reference.addElement(new QName("Transforms",dsNamespace))
+            .addElement(new QName("Transform",dsNamespace))
+            .addAttribute("Algorithm", "http://www.w3.org/2000/09/xmldsig#enveloped-signature");
+        reference.addElement(new QName("DigestMethod",dsNamespace))
+            .addAttribute("Algorithm", "http://www.w3.org/2000/09/xmldsig#sha1");
+        reference.addElement(new QName("DigestValue",dsNamespace))
+            .setText("MD5值");
+        
+        Element signatureValue=signature.addElement(new QName("SignatureValue",dsNamespace));
+        signatureValue.setText("签名数据");
+        
+        out=document.asXML();
+        System.out.println(out);
+    }
+    
+	
+}
+
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/ZipUtil.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/ZipUtil.java
new file mode 100644
index 0000000..f28c325
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/ZipUtil.java
@@ -0,0 +1,244 @@
+package cn.pluss.platform.util;
+
+
+import java.io.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+/**
+ *
+ *@description:
+ *@author: bzg
+ *@time: 2021/8/4 16:09
+ */
+public class ZipUtil {
+
+    private static final int  BUFFER_SIZE = 2 * 1024;
+
+        /**
+         23
+         * 压缩成ZIP 方法1
+         24
+         * @param srcDir 压缩文件夹路径
+        25
+         * @param out    压缩文件输出流
+        26
+         * @param KeepDirStructure  是否保留原来的目录结构,true:保留目录结构;
+        27
+         *                          false:所有文件跑到压缩包根目录下(注意：不保留目录结构可能会出现同名文件,会压缩失败)
+        28
+         * @throws RuntimeException 压缩失败会抛出运行时异常
+        29
+         */
+
+    public static void toZip(String srcDir, OutputStream out, boolean KeepDirStructure)
+
+        throws RuntimeException{
+
+
+        long start = System.currentTimeMillis();
+
+        ZipOutputStream zos = null ;
+
+        try {
+
+            zos = new ZipOutputStream(out);
+
+            File sourceFile = new File(srcDir);
+
+            compress(sourceFile,zos,sourceFile.getName(),KeepDirStructure);
+
+            long end = System.currentTimeMillis();
+
+            System.out.println("压缩完成，耗时：" + (end - start) +" ms");
+
+        } catch (Exception e) {
+
+            throw new RuntimeException("zip error from ZipUtils",e);
+
+        }finally{
+
+            if(zos != null){
+
+                try {
+
+                    zos.close();
+
+                } catch (IOException e) {
+
+                    e.printStackTrace();
+
+                }
+
+            }
+
+        }
+
+
+
+    }
+
+
+
+        /**
+         56
+         * 压缩成ZIP 方法2
+         57
+         * @param srcFiles 需要压缩的文件列表
+        58
+         * @param out           压缩文件输出流
+        59
+         * @throws RuntimeException 压缩失败会抛出运行时异常
+        60
+         */
+
+    public static void toZip(List<File> srcFiles , OutputStream out)throws RuntimeException {
+
+        long start = System.currentTimeMillis();
+
+        ZipOutputStream zos = null ;
+
+        try {
+
+            zos = new ZipOutputStream(out);
+
+            for (File srcFile : srcFiles) {
+
+                byte[] buf = new byte[BUFFER_SIZE];
+
+                zos.putNextEntry(new ZipEntry(srcFile.getName()));
+
+                int len;
+
+                FileInputStream in = new FileInputStream(srcFile);
+
+                while ((len = in.read(buf)) != -1){
+
+                    zos.write(buf, 0, len);
+
+                }
+
+                zos.closeEntry();
+
+                in.close();
+
+            }
+
+            long end = System.currentTimeMillis();
+
+            System.out.println("压缩完成，耗时：" + (end - start) +" ms");
+
+        } catch (Exception e) {
+
+            throw new RuntimeException("zip error from ZipUtils",e);
+
+        }finally{
+
+            if(zos != null){
+
+                try {
+
+                    zos.close();
+
+                } catch (IOException e) {
+
+                    e.printStackTrace();
+
+                }
+
+            }
+
+        }
+
+    }
+
+
+
+
+
+        /**
+
+         * 递归压缩方法
+
+         * @param sourceFile 源文件
+
+         * @param zos        zip输出流
+
+         * @param name       压缩后的名称
+
+         * @param KeepDirStructure  是否保留原来的目录结构,true:保留目录结构;
+
+         *                          false:所有文件跑到压缩包根目录下(注意：不保留目录结构可能会出现同名文件,会压缩失败)
+
+         * @throws Exception
+
+         */
+
+    private static void compress(File sourceFile, ZipOutputStream zos, String name,
+
+                                 boolean KeepDirStructure) throws Exception{
+        byte[] buf = new byte[BUFFER_SIZE];
+        if(sourceFile.isFile()){
+            // 向zip输出流中添加一个zip实体，构造器中name为zip实体的文件的名字
+            zos.putNextEntry(new ZipEntry(name));
+            // copy文件到zip输出流中
+            int len;
+            FileInputStream in = new FileInputStream(sourceFile);
+            while ((len = in.read(buf)) != -1){
+                zos.write(buf, 0, len);
+            }
+            // Complete the entry
+            zos.closeEntry();
+            in.close();
+        } else {
+            File[] listFiles = sourceFile.listFiles();
+            if(listFiles == null || listFiles.length == 0){
+                // 需要保留原来的文件结构时,需要对空文件夹进行处理
+                if(KeepDirStructure){
+                    // 空文件夹的处理
+                    zos.putNextEntry(new ZipEntry(name + "/"));
+                    // 没有文件，不需要文件的copy
+                    zos.closeEntry();
+                }
+            }else {
+
+                for (File file : listFiles) {
+
+                    // 判断是否需要保留原来的文件结构
+
+                    if (KeepDirStructure) {
+
+                        // 注意：file.getName()前面需要带上父文件夹的名字加一斜杠,
+
+                        // 不然最后压缩包中就不能保留原来的文件结构,即：所有文件都跑到压缩包根目录下了
+
+                        compress(file, zos, name + "/" + file.getName(),KeepDirStructure);
+
+                    } else {
+
+                        compress(file, zos, file.getName(),KeepDirStructure);
+
+                    }
+
+
+                }
+
+            }
+
+        }
+
+    }
+
+    public static void main(String[] args) throws Exception {
+        /** 测试压缩方法2  */
+//        List<File> fileList = new ArrayList<>();
+//        fileList.add(new File("D:\\crystal\\pic\\"));
+//        FileOutputStream fos2 = new FileOutputStream(new File("D:\\crystal\\file\\mytest02.zip"));
+//        toZip(fileList, fos2);
+
+        FileOutputStream fos1 = new FileOutputStream(new File("D:\\crystal\\temp\\mytest01.zip"));
+        toZip("D:/crystal/pic", fos1,true);
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/excel/ComplexExcelUtil.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/excel/ComplexExcelUtil.java
new file mode 100644
index 0000000..92d1230
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/excel/ComplexExcelUtil.java
@@ -0,0 +1,178 @@
+package cn.pluss.platform.util.excel;
+
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.util.ExcelUtil;
+import cn.pluss.platform.util.excel.model.Cell;
+import cn.pluss.platform.util.excel.model.Row;
+import cn.pluss.platform.util.excel.model.Sheet;
+import org.apache.poi.ss.usermodel.FillPatternType;
+import org.apache.poi.ss.usermodel.IndexedColors;
+import org.apache.poi.xssf.usermodel.*;
+import org.springframework.http.MediaType;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.awt.*;
+import java.io.IOException;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+import java.util.Locale;
+
+/**
+ * 复杂的excel导出工具
+ * @author Djh
+ */
+public class ComplexExcelUtil {
+
+    /**
+     * 标题的样式
+     */
+    public static XSSFCellStyle getHeaderStyle(XSSFWorkbook workbook) {
+        DefaultIndexedColorMap colorMap = new DefaultIndexedColorMap();
+        XSSFColor titleBgColor = new XSSFColor(new Color(0xDD, 0xEB, 0xF7), colorMap);
+
+        XSSFCellStyle cellStyle = workbook.createCellStyle();
+        ExcelUtil.setCellStyle(cellStyle);
+        cellStyle.setFillForegroundColor(titleBgColor);
+        cellStyle.setFillPattern(FillPatternType.SOLID_FOREGROUND);
+        XSSFFont font = workbook.createFont();
+        font.setFontHeight(12);
+        font.setFontName("宋体");
+        font.setBold(true);
+        cellStyle.setFont(font);
+
+        return cellStyle;
+    }
+
+    public static void setResponseHeader(HttpServletResponse response, String fileName) {
+        response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
+        String headerValue = "attachment;";
+        headerValue += " filename=\"" + ExcelUtil.encodeURIComponent(fileName + ".xlsx") +"\";";
+        headerValue += " filename*=utf-8''" + ExcelUtil.encodeURIComponent(fileName + ".xlsx");
+        response.setHeader("Content-Disposition", headerValue);
+    }
+
+    public interface Transformer<T> {
+        /**
+         * 获取标题Row
+         * @param workbook  workbook
+         * @param dataList  数据
+         * @return title的row
+         */
+        Row getHeader(XSSFWorkbook workbook, List<T> dataList);
+
+        /**
+         * 将实体类数据转化为Row
+         * @param workbook workbook
+         * @param t 实体类数据
+         * @param scaleCol 列偏移量
+         * @param scaleRow 行偏移量
+         * @param position 序号
+         * @return 单条数据的row
+         */
+        Row getRow(XSSFWorkbook workbook, T t, int scaleCol, int scaleRow, int position);
+    }
+
+    public static <T> void export(String fileName, String sheetName, List<T> dataList, Transformer<T> transformer, HttpServletResponse response) throws IOException {
+        // 声明一个工作薄
+        XSSFWorkbook workbook = setData(sheetName, dataList, transformer);
+
+        setResponseHeader(response, fileName);
+        ServletOutputStream out = response.getOutputStream();
+        workbook.write(out);
+    }
+
+    public static <T> XSSFWorkbook setData(String sheetName, List<T> dataList, Transformer<T> transformer) {
+        XSSFWorkbook workbook = new XSSFWorkbook();
+        // 生成一个表格
+        XSSFSheet xssfSheet = workbook.createSheet(sheetName);
+        // 设置表格默认列宽度为15个字节
+        xssfSheet.setDefaultColumnWidth(15);
+
+        XSSFCellStyle cellStyle = workbook.createCellStyle();
+        ExcelUtil.setCellStyle(cellStyle);
+        cellStyle.setFillPattern(FillPatternType.SOLID_FOREGROUND);
+        cellStyle.setFillForegroundColor(IndexedColors.WHITE.getIndex());
+        XSSFFont font = workbook.createFont();
+        font.setFontHeight(12);
+        font.setFontName("宋体");
+        cellStyle.setFont(font);
+
+        Sheet sheet = new Sheet(xssfSheet);
+        sheet.setCellStyle(cellStyle);
+        Row header = transformer.getHeader(workbook, dataList);
+        header.setCellStyle(getHeaderStyle(workbook));
+        header.add2Sheet(sheet);
+
+        int scaleRow = header.getSpanRow();
+
+        for (int i=0; i<dataList.size(); i++) {
+            T item = dataList.get(i);
+            Row row = transformer.getRow(workbook, item, 0, scaleRow, i);
+            row.setCellStyle(cellStyle);
+            sheet.addRow(row);
+            scaleRow += row.getSpanRow();
+        }
+
+        return workbook;
+    }
+
+    public static <T> XSSFWorkbook addData(XSSFWorkbook workbook, String sheetName, List<T> dataList, Transformer<T> transformer) {
+        if (workbook == null) {
+            throw new MsgException("workBook can't be null");
+        }
+
+        // 生成一个表格
+        XSSFSheet xssfSheet = workbook.createSheet(sheetName);
+        // 设置表格默认列宽度为15个字节
+        xssfSheet.setDefaultColumnWidth(15);
+
+        XSSFCellStyle cellStyle = workbook.createCellStyle();
+        ExcelUtil.setCellStyle(cellStyle);
+        cellStyle.setFillPattern(FillPatternType.SOLID_FOREGROUND);
+        cellStyle.setFillForegroundColor(IndexedColors.WHITE.getIndex());
+        XSSFFont font = workbook.createFont();
+        font.setFontHeight(11);
+        font.setFontName("宋体");
+        cellStyle.setFont(font);
+
+        Sheet sheet = new Sheet(xssfSheet);
+        sheet.setCellStyle(cellStyle);
+        sheet.setDateTimeFormatter(DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm", Locale.CHINA));
+        Row header = transformer.getHeader(workbook, dataList);
+        XSSFCellStyle headerStyle = getHeaderStyle(workbook);
+        header.setCellStyle(headerStyle);
+        header.add2Sheet(sheet);
+
+        int scaleRow = header.getSpanRow();
+
+        for (int i=0; i<dataList.size(); i++) {
+            T item = dataList.get(i);
+            Row row = transformer.getRow(workbook, item, 0, scaleRow, i);
+            row.setCellStyle(cellStyle);
+            sheet.addRow(row);
+            scaleRow += row.getSpanRow();
+        }
+
+        return workbook;
+    }
+
+    /**
+     * 同一行添加空的单元格
+     * @param cellList  列表
+     * @param startCol  开始列
+     * @param startRow  开始行
+     * @param lengthCol 列宽
+     * @param lengthRow 行高
+     * @param count     添加单元格个数
+     */
+    public static void insertEmptyCell(List<Cell> cellList, int startCol, int startRow, int lengthCol, int lengthRow, int count) {
+        for (int i=0; i<count; i++) {
+            cellList.add(new Cell("", startCol + i, startRow, lengthCol, lengthRow));
+        }
+    }
+
+    public static void insertEmptyCell(List<Cell> cellList, int startCol, int startRow, int count) {
+        insertEmptyCell(cellList, startCol, startRow, 1, 1, count);
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/excel/ExcelImportUtil.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/excel/ExcelImportUtil.java
new file mode 100644
index 0000000..80bdead
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/excel/ExcelImportUtil.java
@@ -0,0 +1,171 @@
+package cn.pluss.platform.util.excel;
+
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.util.excel.model.RowInfo;
+import lombok.Data;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.poifs.filesystem.OfficeXmlFileException;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.ss.util.NumberToTextConverter;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.util.StringUtils;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author Djh
+ */
+public class ExcelImportUtil {
+
+    /**
+     * 只统计复合单元格的实体类
+     */
+    @Data
+    public static class RowCellRangeAdress {
+
+        private Map<Integer, CellRangeAddress> cellMap = new HashMap<>();
+
+        private int startRow;
+
+        private int lastRow;
+
+        public void put(Integer index, CellRangeAddress cellAddresses) {
+            cellMap.put(index, cellAddresses);
+        }
+
+        public CellRangeAddress get(Integer index) {
+            return cellMap.get(index);
+        }
+    }
+
+    public static <T> List<T> readExcel(MultipartFile file, RowInfoGetter<T> rowInfo, int dataStartRow) throws MsgException, IOException {
+        System.out.println(file.getOriginalFilename());
+        Workbook workbook;
+        try {
+            workbook = new HSSFWorkbook(file.getInputStream());
+            return dealWorkbook(workbook, rowInfo, dataStartRow);
+        } catch (OfficeXmlFileException e) {
+            workbook = new XSSFWorkbook(file.getInputStream());
+            return dealWorkbook(workbook, rowInfo, dataStartRow);
+        }
+    }
+
+    private static <T> List<T> dealWorkbook(Workbook workbook, RowInfoGetter<T> rowInfoGetter, int dataStartRow) throws MsgException {
+        List<T> result = new ArrayList<>();
+
+        int number = workbook.getNumberOfSheets();
+        if (number == 0) {
+            throw new MsgException("没有数据");
+        }
+
+        Sheet sheet = workbook.getSheetAt(0);
+        RowInfo rowInfo = new RowInfo();
+        rowInfo.startRow = dataStartRow;
+        rowInfo.sheet = sheet;
+
+        int lastRow = sheet.getLastRowNum();
+        Map<Integer, RowCellRangeAdress> mergedRegionSort = getMergedRegionSort(sheet);
+
+
+        int count = 0;
+        T entity;
+
+        while (rowInfo.startRow <= lastRow) {
+            // 对一条数据进行处理
+            RowCellRangeAdress row = mergedRegionSort.get(rowInfo.startRow);
+            if (row != null) {
+                rowInfo.endRow = row.getLastRow();
+                entity = rowInfoGetter.getEntity(rowInfo, count);
+                rowInfo.startRow = row.getLastRow() + 1;
+            } else {
+                rowInfo.endRow = rowInfo.startRow;
+                entity = rowInfoGetter.getEntity(rowInfo, count);
+                rowInfo.startRow++;
+            }
+
+            if (entity != null) {
+                result.add(entity);
+            }
+
+            count++;
+        }
+
+        return result;
+    }
+
+    /**
+     * 给合并的单元格进行行列分组
+     */
+    private static Map<Integer, RowCellRangeAdress> getMergedRegionSort(Sheet sheet) {
+        Map<Integer, RowCellRangeAdress> result = new HashMap<>();
+        List<CellRangeAddress> mergedRegions = sheet.getMergedRegions();
+
+        for (CellRangeAddress cellAddresses: mergedRegions) {
+            int firstRow = cellAddresses.getFirstRow();
+            int firstColumn = cellAddresses.getFirstColumn();
+            int lastRow = cellAddresses.getLastRow();
+
+            RowCellRangeAdress row = result.computeIfAbsent(firstRow, k -> new RowCellRangeAdress());
+            row.put(firstColumn, cellAddresses);
+            row.setStartRow(firstRow);
+            if (row.getLastRow() < lastRow) {
+                row.setLastRow(lastRow);
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * 读取cell里面的数据
+     * @param cell cell对象
+     * @return  单元格中的内容
+     */
+    public static Object readCell(Cell cell) {
+        Object obj = null;
+        if(cell == null) {
+            return "";
+        }
+
+        switch (cell.getCellType()) {
+            case BOOLEAN:
+                obj = cell.getBooleanCellValue();
+                break;
+            case ERROR:
+                obj = cell.getErrorCellValue();
+                break;
+            case FORMULA:
+                try {
+                    obj = String.valueOf(cell.getNumericCellValue());
+                } catch (IllegalStateException e) {
+                    obj = String.valueOf(cell.getRichStringCellValue());
+                }
+                break;
+            case NUMERIC:
+                obj = NumberToTextConverter.toText(cell.getNumericCellValue());
+                break;
+            case STRING:
+                obj = cell.getStringCellValue();
+                break;
+            default:
+                break;
+        }
+
+        if (obj == null) {
+            obj = "";
+        }
+        return obj;
+    }
+
+    public static boolean isEmpty(Cell cell) {
+        return StringUtils.isEmpty(readCell(cell));
+    }
+}
\ No newline at end of file
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/excel/RowInfoGetter.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/excel/RowInfoGetter.java
new file mode 100644
index 0000000..dbc2793
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/excel/RowInfoGetter.java
@@ -0,0 +1,17 @@
+package cn.pluss.platform.util.excel;
+
+import cn.pluss.platform.util.excel.model.RowInfo;
+
+/**
+ * @author Djh
+ */
+public interface RowInfoGetter<T> {
+
+    /**
+     * 将excel一条的数据转化为实体类
+     * @param rowInfo   行数据
+     * @param lineNum   数据行号
+     * @return  根据数据创建的对象
+     */
+    T getEntity(RowInfo rowInfo, int lineNum);
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/excel/model/Cell.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/excel/model/Cell.java
new file mode 100644
index 0000000..7b83ec0
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/excel/model/Cell.java
@@ -0,0 +1,133 @@
+package cn.pluss.platform.util.excel.model;
+
+import cn.pluss.platform.util.ExcelUtil;
+import lombok.Data;
+import org.apache.poi.ss.usermodel.BorderStyle;
+import org.apache.poi.ss.usermodel.CellStyle;
+import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.ss.util.RegionUtil;
+import org.apache.poi.xssf.usermodel.*;
+import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTMergeCell;
+import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTMergeCells;
+import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTWorksheet;
+
+/**
+ * 合并单元格与普通单元格统一对象
+ * @author Djh
+ */
+@Data
+public class Cell {
+
+    /**
+     * @param value     内容，这里默认全部转为文本，暂不支持其他
+     * @param font      字体
+     * @param startCol    开始列
+     * @param startRow    开始行
+     * @param lengthCol   跨列数
+     * @param lengthRow   跨行数
+     */
+    public Cell(Object value, XSSFFont font, int startCol, int startRow, int lengthCol, int lengthRow) {
+        this.font = font;
+        this.value = value;
+        this.startRow = startRow;
+        this.startCol = startCol;
+        this.lengthCol = lengthCol;
+        this.lengthRow = lengthRow;
+    }
+
+    public Cell(Object value, int startCol, int startRow) {
+        this(value, startCol, startRow, 1, 1);
+    }
+
+    public Cell(Object value, XSSFFont font, int startCol, int startRow) {
+        this(value, font,  startCol, startRow, 1, 1);
+    }
+
+    public Cell(Object value, int startCol, int startRow, int lengthCol, int lengthRow) {
+        this(value, null, startCol, startRow, lengthCol, lengthRow);
+    }
+
+    public void addCellRangeAddress(Sheet sheet) {
+        addCellRangeAddress(sheet, 0 ,0, null);
+    }
+
+    /**
+     * @param sheet         Sheet对象
+     * @param scaleCol      列偏移量
+     * @param scaleRow      行偏移量
+     */
+    public void addCellRangeAddress(Sheet sheet, int scaleCol, int scaleRow, CellStyle cellStyle) {
+        String textValue = ExcelUtil.getTextObject(value, sheet.getDateTimeFormatter());
+
+        XSSFCell cell;
+        XSSFRow row = sheet.getSheet().getRow(scaleRow + startRow);
+        if (row == null) {
+            row = sheet.getSheet().createRow(scaleRow + startRow);
+        }
+
+        cell = row.createCell(scaleCol + startCol);
+        if (cellStyle != null) {
+            cell.setCellStyle(cellStyle);
+        } else {
+            cell.setCellStyle(sheet.getCellStyle());
+        }
+
+        XSSFRichTextString richString = new XSSFRichTextString(textValue);
+        if (font != null) {
+            richString.applyFont(font);
+        }
+        cell.setCellValue(richString);
+
+        //
+        if (lengthCol > 1 || lengthRow > 1) {
+            // 合并单元格
+            CellRangeAddress cellAddresses = new CellRangeAddress( scaleRow + startRow, scaleRow + getEndY(), scaleCol + startCol, scaleCol + getEndX());
+            mergedRegion(sheet.getSheet(), cellAddresses, sheet.getMergeCount());
+            defaultStyle(sheet.getSheet(), cellAddresses);
+
+            sheet.mergeCountIncrement();
+        }
+    }
+
+    /**
+     * 合并单元格默认的样式
+     */
+    private void defaultStyle(XSSFSheet sheet, CellRangeAddress cellAddresses) {
+        RegionUtil.setBorderBottom(BorderStyle.THIN, cellAddresses, sheet);
+        RegionUtil.setBorderTop(BorderStyle.THIN, cellAddresses, sheet);
+        RegionUtil.setBorderLeft(BorderStyle.THIN, cellAddresses, sheet);
+        RegionUtil.setBorderRight(BorderStyle.THIN, cellAddresses, sheet);
+    }
+
+    /** cell 内容  */
+    private Object value;
+
+    /** 起始列号 */
+    private int startCol;
+
+    /** 起始行号 */
+    private int startRow;
+
+    /** 跨列数 */
+    private int lengthCol;
+
+    /** 跨行数 */
+    private int lengthRow;
+
+    private XSSFFont font;
+
+    public int getEndX() {
+        return startCol + lengthCol - 1;
+    }
+
+    public int getEndY() {
+        return startRow + lengthRow - 1;
+    }
+
+    private void mergedRegion(XSSFSheet sheet, CellRangeAddress cellAddresses, int mergeCount) {
+        CTWorksheet ctWorksheet = sheet.getCTWorksheet();
+        CTMergeCells ctMergeCells = mergeCount > 0 ?ctWorksheet.getMergeCells():ctWorksheet.addNewMergeCells();
+        CTMergeCell ctMergeCell = ctMergeCells.addNewMergeCell();
+        ctMergeCell.setRef(cellAddresses.formatAsString());
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/excel/model/Row.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/excel/model/Row.java
new file mode 100644
index 0000000..4caf422
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/excel/model/Row.java
@@ -0,0 +1,88 @@
+package cn.pluss.platform.util.excel.model;
+
+import org.apache.poi.xssf.usermodel.XSSFCellStyle;
+
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+
+/**
+ * 带合并单元格的，规律的row
+ * 一行内容的cell
+ * @author Djh
+ */
+public class Row {
+
+    private List<Cell> cellList;
+
+    private DateTimeFormatter df;
+
+    private XSSFCellStyle cellStyle;
+
+    private int scaleCol;
+
+    private int scaleRow;
+
+    private int spanRow = -1;
+
+    private int spanCol = -1;
+
+    public Row() {
+        this.scaleCol = 0;
+        this.scaleRow = 0;
+    }
+
+    public void setDataTimeFormatter(DateTimeFormatter df) {
+        this.df = df;
+    }
+
+    public void setCellStyle (XSSFCellStyle cellStyle) {
+        this.cellStyle = cellStyle;
+    }
+
+    public Row(List<Cell> cellList, int scaleCol, int scaleRow) {
+        this.cellList = cellList;
+        this.scaleCol = scaleCol;
+        this.scaleRow = scaleRow;
+        computeRowAndCel();
+    }
+
+    public void setCellList(List<Cell> cellList) {
+        this.cellList = cellList;
+        computeRowAndCel();
+    }
+    /**
+     * 计算跨行和跨列的宽度,当cellList被修改，需要调用此方法
+     */
+    public void computeRowAndCel() {
+        int startRow = Integer.MAX_VALUE;
+        int endRow = -1;
+
+        int startCol = Integer.MAX_VALUE;
+        int endCol = -1;
+
+        for (Cell cell: cellList) {
+            startRow = Math.min(startRow, cell.getStartRow());
+            endRow = Math.max(endRow, cell.getEndY());
+
+            startCol = Math.min(startCol, cell.getStartCol());
+            endCol = Math.max(endCol, cell.getEndX());
+        }
+
+        spanRow = endRow - startRow + 1;
+        spanCol = endCol - startCol + 1;
+    }
+
+    public int getSpanCol() {
+        return spanCol;
+    }
+
+    public int getSpanRow() {
+        return spanRow;
+    }
+
+    public void add2Sheet(Sheet sheet) {
+        for (Cell cell: cellList) {
+            cell.addCellRangeAddress(sheet, scaleCol, scaleRow, cellStyle);
+        }
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/excel/model/RowInfo.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/excel/model/RowInfo.java
new file mode 100644
index 0000000..159eced
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/excel/model/RowInfo.java
@@ -0,0 +1,15 @@
+package cn.pluss.platform.util.excel.model;
+
+import org.apache.poi.ss.usermodel.Sheet;
+
+/**
+ * @author Djh
+ */
+public class RowInfo {
+    /** sheet对象 */
+    public Sheet sheet;
+    /** 起始行 */
+    public int startRow;
+    /** 结束行 */
+    public int endRow;
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/excel/model/Sheet.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/excel/model/Sheet.java
new file mode 100644
index 0000000..360edd4
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/excel/model/Sheet.java
@@ -0,0 +1,64 @@
+package cn.pluss.platform.util.excel.model;
+
+import org.apache.poi.xssf.usermodel.XSSFCellStyle;
+import org.apache.poi.xssf.usermodel.XSSFSheet;
+
+import java.time.format.DateTimeFormatter;
+
+/**
+ * @author Djh
+ */
+public class Sheet {
+
+    private int mergeCount = 0;
+
+    private XSSFSheet sheet;
+
+    private XSSFCellStyle cellStyle;
+
+    private DateTimeFormatter dateTimeFormatter;
+
+    public int getMergeCount() {
+        return mergeCount;
+    }
+
+    public void setMergeCount(int mergeCount) {
+        this.mergeCount = mergeCount;
+    }
+
+    public XSSFSheet getSheet() {
+        return sheet;
+    }
+
+    public void setSheet(XSSFSheet sheet) {
+        this.sheet = sheet;
+    }
+
+    public XSSFCellStyle getCellStyle() {
+        return cellStyle;
+    }
+
+    public void setCellStyle(XSSFCellStyle cellStyle) {
+        this.cellStyle = cellStyle;
+    }
+
+    public DateTimeFormatter getDateTimeFormatter() {
+        return dateTimeFormatter;
+    }
+
+    public void setDateTimeFormatter(DateTimeFormatter dateTimeFormatter) {
+        this.dateTimeFormatter = dateTimeFormatter;
+    }
+
+    public Sheet(XSSFSheet sheet) {
+        this.sheet = sheet;
+    }
+
+    public void addRow(Row row) {
+        row.add2Sheet(this);
+    }
+
+    public void mergeCountIncrement() {
+        mergeCount++;
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/tree/BaseNode.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/tree/BaseNode.java
new file mode 100644
index 0000000..aa7b673
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/tree/BaseNode.java
@@ -0,0 +1,25 @@
+package cn.pluss.platform.util.tree;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Djh
+ */
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+@Data
+public abstract class BaseNode<T extends Node> extends Node {
+
+    @TableField(exist = false)
+    protected List<T> children = new ArrayList<>();
+}
\ No newline at end of file
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/tree/Node.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/tree/Node.java
new file mode 100644
index 0000000..bfbd57d
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/tree/Node.java
@@ -0,0 +1,28 @@
+package cn.pluss.platform.util.tree;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * @author DJH
+ */
+@Data
+@Accessors(chain = true)
+public class Node {
+
+    @TableId
+    protected String id;
+
+    @TableField(value = "pid")
+    protected String pId;
+
+    protected Integer sort;
+
+    @JSONField(serialize = false)
+    public boolean isRoot() {
+        return pId == null || "0".equals(pId);
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/tree/TreeUtils.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/tree/TreeUtils.java
new file mode 100644
index 0000000..2b8d5c4
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/tree/TreeUtils.java
@@ -0,0 +1,116 @@
+package cn.pluss.platform.util.tree;
+
+import java.util.*;
+
+/**
+ * @author Djh
+ * 分级节点排序工具类
+ */
+public class TreeUtils {
+
+    /**
+     * 树形结构并排序
+     */
+    public static <T extends BaseNode<T>> List<T> getSortTree(List<T> nodeList) {
+        if (nodeList == null || nodeList.size() == 0) {
+            return null;
+        }
+
+        nodeList.sort(Comparator.comparingInt(o -> o.sort));
+        boolean flag = true;
+        List<T> result = new ArrayList<>();
+
+        nodeList.sort(Comparator.comparingInt(o -> o.sort));
+
+        // 首先取得根节点
+        List<T> leafList = new ArrayList<>();
+        Iterator<T> startIterator = nodeList.iterator();
+        while (startIterator.hasNext()) {
+            T baseNode = startIterator.next();
+            if (baseNode.isRoot()) {
+                result.add(baseNode);
+                leafList.add(baseNode);
+                startIterator.remove();
+            }
+        }
+
+        while (flag) {
+            flag = false;
+            List<T> tempLeafList = new ArrayList<>();
+
+            for (T leafNode: leafList) {
+                Iterator<T> iterator = nodeList.iterator();
+                while(iterator.hasNext()) {
+                    T next = iterator.next();
+                    if (leafNode.getId().equals(next.getPId())) {
+                        iterator.remove();
+                        leafNode.children.add(next);
+                        tempLeafList.add(next);
+                        flag = true;
+                    }
+                }
+            }
+
+            if (flag) {
+                leafList = tempLeafList;
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * 树形列表排序
+     */
+    public static <T extends BaseNode> List<T> getSortList(List<T> srcList) {
+        // 先给源数组排序
+        if (srcList == null || srcList.size() == 0) {
+            return null;
+        }
+        srcList.sort(Comparator.comparingInt(o -> o.sort));
+        List<T> resultList = new LinkedList<>();
+        sort(srcList, null, resultList);
+
+        return resultList;
+    }
+
+    private static <T extends BaseNode> void sort(List<T> srcList, List<T> rootList, List<T> resultList) {
+        if (srcList.size() == 0) {
+            return;
+        }
+
+        List<T> subRoot = new ArrayList<>();
+        if (rootList == null) {
+            Iterator<T> iterator = srcList.iterator();
+            while (iterator.hasNext()) {
+                T t = iterator.next();
+                if (t.isRoot()) {
+                    resultList.add(t);
+                    subRoot.add(t);
+                    iterator.remove();
+                }
+            }
+            // 获取到一个下级列表，然后递归
+            sort(srcList, subRoot, resultList);
+
+            return;
+        }
+
+        for (T root: rootList) {
+            Iterator<T> iterator = srcList.iterator();
+            List<T> nodeList = new ArrayList<>();
+            // 获取根节点在结果组中的位置
+            int i = resultList.indexOf(root);
+            while (iterator.hasNext()) {
+                T t = iterator.next();
+                if (t.getPId().equals(root.getId())) {
+                    resultList.add(nodeList.size() + i + 1, t);
+                    nodeList.add(t);
+                    iterator.remove();
+                }
+            }
+
+            sort(srcList, nodeList, resultList);
+        }
+    }
+}
\ No newline at end of file
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/wechat/AccessTokenVo.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/wechat/AccessTokenVo.java
new file mode 100644
index 0000000..3a30dc4
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/wechat/AccessTokenVo.java
@@ -0,0 +1,62 @@
+/* 
+ * Copyrights 尚果科技平台研发项目组 @ 2015，尚果科技 SEOCOO Computer Co., Ltd.<br>
+ * 项目名称：尚果科技-平台开发组 <br>
+ * 文件名称：AccessTokenVo.java <br>
+ * 创建时间：2015-6-15-下午02:40:49 <br>
+ * Description： 
+ * History：<br> [ Author Date Version Content ]<br>
+ *  
+ */
+package cn.pluss.platform.wechat;
+
+import com.alibaba.fastjson.annotation.JSONField;
+
+public class AccessTokenVo {
+
+	@JSONField(name = "access_token")
+	private String accessToken;
+	@JSONField(name = "expires_in")
+	private String expiresIn;
+	@JSONField(name = "refresh_token")
+	private String refreshToken;
+	@JSONField(name = "openid")
+	private String openId;
+	@JSONField(name = "scope")
+	private String scope;
+	public String getAccessToken() {
+		return accessToken;
+	}
+	public void setAccessToken(String accessToken) {
+		this.accessToken = accessToken;
+	}
+	public String getExpiresIn() {
+		return expiresIn;
+	}
+	public void setExpiresIn(String expiresIn) {
+		this.expiresIn = expiresIn;
+	}
+	public String getRefreshToken() {
+		return refreshToken;
+	}
+	public void setRefreshToken(String refreshToken) {
+		this.refreshToken = refreshToken;
+	}
+	public String getOpenId() {
+		return openId;
+	}
+	public void setOpenId(String openId) {
+		this.openId = openId;
+	}
+	public String getScope() {
+		return scope;
+	}
+	public void setScope(String scope) {
+		this.scope = scope;
+	}
+	
+	@Override
+	public String toString() {
+		// TODO Auto-generated method stub
+		return super.toString();
+	}
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/wechat/AlipayMd5Encrypt.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/wechat/AlipayMd5Encrypt.java
new file mode 100644
index 0000000..ace3f16
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/wechat/AlipayMd5Encrypt.java
@@ -0,0 +1,69 @@
+package cn.pluss.platform.wechat;
+
+import java.io.UnsupportedEncodingException;
+import java.security.SignatureException;
+
+import org.apache.commons.codec.digest.DigestUtils;
+
+
+
+/** 
+* 功能：支付宝MD5签名处理核心文件，不需要修改
+* 版本：3.1
+* 修改日期：2010-11-01
+* 说明：
+* 以下代码只是为了方便商户测试而提供的样例代码，商户可以根据自己网站的需要，按照技术文档编写,并非一定要使用该代码。
+* 该代码仅供学习和研究支付宝接口使用，只是提供一个
+* */
+
+public class AlipayMd5Encrypt {
+
+	public  static String input_charset="utf-8";
+    /**
+     * 对字符串进行MD5签名
+     * 
+     * @param text
+     *            明文
+     * 
+     * @return 密文
+     */
+    public static String md5(String text) {
+
+        return DigestUtils.md5Hex(getContentBytes(text, input_charset));
+
+    }
+    
+    /**
+     * 对字符串进行MD5签名
+     * 
+     * @param text
+     *            明文
+     * 
+     * @return 密文
+     */
+    public static String md5ByGBK(String text) {
+
+        return DigestUtils.md5Hex(getContentBytes(text, "GBK"));
+
+    }
+
+    /**
+     * @param content
+     * @param charset
+     * @return
+     * @throws SignatureException
+     * @throws UnsupportedEncodingException 
+     */
+    private static byte[] getContentBytes(String content, String charset) {
+        if (charset == null || "".equals(charset)) {
+            return content.getBytes();
+        }
+
+        try {
+            return content.getBytes(charset);
+        } catch (UnsupportedEncodingException e) {
+            throw new RuntimeException("MD5签名过程中出现错误,指定的编码集不对,您目前指定的编码集是:" + charset);
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/wechat/MessageTemplate.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/wechat/MessageTemplate.java
new file mode 100644
index 0000000..927f6f8
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/wechat/MessageTemplate.java
@@ -0,0 +1,44 @@
+package cn.pluss.platform.wechat;
+
+public class MessageTemplate {
+
+	private String touser;
+	private String template_id;
+	private String url;
+	private String topcolor;
+	private Object data ;
+	public String getTouser() {
+		return touser;
+	}
+	public void setTouser(String touser) {
+		this.touser = touser;
+	}
+	public String getTemplate_id() {
+		return template_id;
+	}
+	public void setTemplate_id(String template_id) {
+		this.template_id = template_id;
+	}
+	public String getUrl() {
+		return url;
+	}
+	public void setUrl(String url) {
+		this.url = url;
+	}
+	public String getTopcolor() {
+		return topcolor;
+	}
+	public void setTopcolor(String topcolor) {
+		this.topcolor = topcolor;
+	}
+	public Object getData() {
+		return data;
+	}
+	public void setData(Object data) {
+		this.data = data;
+	}
+
+	
+	
+	
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/wechat/MicroPayCore.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/wechat/MicroPayCore.java
new file mode 100644
index 0000000..b696e78
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/wechat/MicroPayCore.java
@@ -0,0 +1,129 @@
+/* 
+ * Copyrights 尚果科技平台研发项目组 @ 2015，尚果科技 SEOCOO Computer Co., Ltd.<br>
+ * 项目名称：尚果科技-平台开发组 <br>
+ * 文件名称：MicroPayCore.java <br>
+ * 创建时间：2015-6-15-下午04:38:18 <br>
+ * Description： 
+ * History：<br> [ Author Date Version Content ]<br>
+ *  
+ */
+package cn.pluss.platform.wechat;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class MicroPayCore {
+
+	 /** 
+     * 除去数组中的空值和签名参数
+     * @param sArray 签名参数组
+     * @return 去掉空值与签名参数后的新签名参数组
+     */
+    public static Map<String, String> paraFilter(Map<String, String> sArray) {
+
+        Map<String, String> result = new HashMap<String, String>();
+
+        if (sArray == null || sArray.size() <= 0) {
+            return result;
+        }
+
+        for (String key : sArray.keySet()) {
+            String value = sArray.get(key);
+            if (value == null || value.equals("") || key.equalsIgnoreCase("sign")
+                || key.equalsIgnoreCase("sign_type")) {
+                continue;
+            }
+            result.put(key, value);
+        }
+
+        return result;
+    }
+    
+
+    /**
+     * 生成签名结果
+     * @param sArray 要签名的数组
+     * @return 签名结果字符串
+     */
+    public static String buildMysign(Map<String, String> sArray,String paternerKey) {
+        String prestr = createLinkString(sArray); //把数组所有元素，按照“参数=参数值”的模式用“&”字符拼接成字符串
+        prestr = prestr + "&key="+paternerKey; //把拼接后的字符串再与安全校验码直接连接起来
+        String mysign = AlipayMd5Encrypt.md5(prestr);
+        return mysign;
+    }
+    
+    /** 
+     * 把数组所有元素排序，并按照“参数=参数值”的模式用“&”字符拼接成字符串
+     * @param params 需要排序并参与字符拼接的参数组
+     * @return 拼接后字符串
+     */
+    public static String createLinkString(Map<String, String> params) {
+
+        List<String> keys = new ArrayList<String>(params.keySet());
+        Collections.sort(keys);
+
+        String prestr = "";
+
+        for (int i = 0; i < keys.size(); i++) {
+            String key = keys.get(i);
+            String value = params.get(key);
+
+            if (i == keys.size() - 1) {//拼接时，不包括最后一个&字符
+                prestr = prestr + key + "=" + value;
+            } else {
+                prestr = prestr + key + "=" + value + "&";
+            }
+        }
+
+        return prestr;
+    }
+    
+    
+    /** 
+     * 对所有的value进行urlencode编码
+     * @param sArray 签名参数组
+     * @return 去掉空值与签名参数后的新签名参数组
+     */
+    public static String urlEncode(Map<String, String> params) {
+
+    	  List<String> keys = new ArrayList<String>(params.keySet());
+
+          String prestr = "";
+
+          for (int i = 0; i < keys.size(); i++) {
+              String key = keys.get(i);
+              String value = params.get(key);
+
+              //urlencode编码
+              try {
+				value=URLEncoder.encode(value, "UTF-8");
+			} catch (UnsupportedEncodingException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+              if (i == keys.size() - 1) {//拼接时，不包括最后一个&字符
+                  prestr = prestr + key + "=" + value;
+              } else {
+                  prestr = prestr + key + "=" + value + "&";
+              }
+          }
+
+        return prestr;
+    }
+    
+    public static void main(String[] args) {
+		
+    	Map<String,String> param=new HashMap<String, String>();
+		param.put("appId","wxe7dc6c765a568c76");
+		param.put("timeStamp","1472480747126");
+		param.put("nonceStr","112016082922254733027");
+		param.put("package","prepay_id=wx20160829222547a02f157b8d0833160254");
+		param.put("signType","MD5");
+		System.out.println(buildMysign(param,"d1af79f0f3991dce45f246b8e1a6ebef"));
+	}
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/wechat/MyX509TrustManager.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/wechat/MyX509TrustManager.java
new file mode 100644
index 0000000..f3c50f6
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/wechat/MyX509TrustManager.java
@@ -0,0 +1,29 @@
+package cn.pluss.platform.wechat;
+
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+
+import javax.net.ssl.X509TrustManager;
+
+/**
+ * 证书信任管理器（用于https请求）
+ * 
+ * @author
+ * 
+ */
+public class MyX509TrustManager implements X509TrustManager
+{
+
+	public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException
+	{
+	}
+
+	public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException
+	{
+	}
+
+	public X509Certificate[] getAcceptedIssuers()
+	{
+		return null;
+	}
+}
\ No newline at end of file
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/wechat/Oauth2Util.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/wechat/Oauth2Util.java
new file mode 100644
index 0000000..4a15bb5
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/wechat/Oauth2Util.java
@@ -0,0 +1,385 @@
+package cn.pluss.platform.wechat;
+
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.net.ConnectException;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSocketFactory;
+import javax.net.ssl.TrustManager;
+
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.util.StringUtil;
+import com.alibaba.fastjson.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import cn.pluss.platform.constants.Constant;
+
+public class Oauth2Util{
+	 private static final Logger Log = LoggerFactory.getLogger( Oauth2Util.class);
+
+	/**
+	 * 发起https请求并获取结果
+	 * 
+	 * @param requestUrl
+	 *            请求地址
+	 * @param requestMethod
+	 *            请求方式（GET、POST）
+	 * @param outputStr
+	 *            提交的数据
+	 * @return JSONObject(通过JSONObject.get(key)的方式获取json对象的属性值)
+	 */
+	public static JSONObject httpRequest(String requestUrl, String requestMethod, String outputStr)
+	{
+		JSONObject jsonObject = null;
+		StringBuffer buffer = new StringBuffer();
+		try
+		{
+			// 创建SSLContext对象，并使用我们指定的信任管理器初始化
+			TrustManager[] tm = { new MyX509TrustManager() };
+			SSLContext sslContext = SSLContext.getInstance("SSL", "SunJSSE");
+			sslContext.init(null, tm, new java.security.SecureRandom());
+
+			// 从上述SSLContext对象中得到SSLSocketFactory对象
+			SSLSocketFactory ssf = sslContext.getSocketFactory();
+
+			URL url = new URL(requestUrl);
+			HttpsURLConnection httpUrlConn = (HttpsURLConnection) url.openConnection();
+			httpUrlConn.setSSLSocketFactory(ssf);
+
+			httpUrlConn.setDoOutput(true);
+			httpUrlConn.setDoInput(true);
+			httpUrlConn.setUseCaches(false);
+
+			// 设置请求方式（GET/POST）
+			httpUrlConn.setRequestMethod(requestMethod);
+
+			if ("GET".equalsIgnoreCase(requestMethod))
+				httpUrlConn.connect();
+
+			// 当有数据需要提交时
+			if (null != outputStr)
+			{
+				OutputStream outputStream = httpUrlConn.getOutputStream();
+				// 注意编码格式，防止中文乱码
+				outputStream.write(outputStr.getBytes("UTF-8"));
+				outputStream.close();
+			}
+
+			// 将返回的输入流转换成字符串
+			InputStream inputStream = httpUrlConn.getInputStream();
+			InputStreamReader inputStreamReader = new InputStreamReader(inputStream, "utf-8");
+			BufferedReader bufferedReader = new BufferedReader(inputStreamReader);
+
+			String str = null;
+			while ((str = bufferedReader.readLine()) != null)
+			{
+				buffer.append(str);
+			}
+			bufferedReader.close();
+			inputStreamReader.close();
+			// 释放资源
+			inputStream.close();
+			inputStream = null;
+			httpUrlConn.disconnect();
+			jsonObject = JSONObject.parseObject(buffer.toString());
+		}
+		catch (ConnectException ce)
+		{
+			System.out.println("Weixin server connection timed out.");
+		}
+		catch (Exception e)
+		{
+			System.out.println("https request error:{}"+ e);
+		}
+		return jsonObject;
+	}
+	
+	
+	
+
+	/**
+	 * 1、获取Oauth2 acess_token
+	 * 
+	 * @param appId
+	 * @param appSecret
+	 * @param code
+	 * @return
+	 * @author cdw
+	 */
+//	public static WeixinOauth2Token getOauth2AccessToken(String appId, String appSecret, String code){
+//		WeixinOauth2Token wot = null;
+//		String requesturl = "https://api.weixin.qq.com/sns/oauth2/access_token?appid=APPID&secret=SECRET&code=CODE&grant_type=authorization_code";
+//		requesturl = requesturl.replace("APPID", appId);
+//		requesturl = requesturl.replace("SECRET", appSecret);
+//		requesturl = requesturl.replace("CODE", code);
+//		JSONObject jsonObject =httpRequest(requesturl, "GET", null);
+//		if (jsonObject != null)	{
+//			System.out.println("jsonObject++++++++++++++++++"+com.alibaba.fastjson.JSONObject.toJSONString(jsonObject));
+//			try	{
+//				wot = new WeixinOauth2Token();
+//				wot.setAccessToken(jsonObject.getString("access_token"));
+//				wot.setExpiresIn(jsonObject.getInteger("expires_in"));
+//				wot.setRefreshToken(jsonObject.getString("refresh_token"));
+//				wot.setOpenId(jsonObject.getString("openid"));
+//				wot.setScope(jsonObject.getString("scope"));
+//				if(jsonObject.containsKey("unionid")){
+//					wot.setUnionId(jsonObject.getString("unionid"));
+//				}
+//			}catch (Exception e){
+//				wot = null;
+//				String errCode = jsonObject.getString("errcode");
+//				String errMsg = jsonObject.getString("errmsg");
+//				Log.error("获取网页信息的失败errcode:{" + errCode + "} errmsg{" + errMsg + "}");
+//			}
+//
+//		}
+//
+//		return wot;
+//	}
+
+	/**
+	 * 2、 刷新Oauth2 acess_token
+	 * 
+	 * @param appId
+	 * @param refreshToken
+	 * @return
+	 * @author cdw
+	 */
+//	public static WeixinOauth2Token refreshOauth2AccessToken(String appId, String refreshToken){
+//		WeixinOauth2Token wot = null;
+//
+//		String requestUrl = "https://api.weixin.qq.com/sns/oauth2/refresh_token?appid=APPID&grant_type=refresh_token&refresh_token=REFRESH_TOKEN";
+//
+//		requestUrl.replace("APPID", appId);
+//		requestUrl.replace("REFRESH_TOKEN", refreshToken);
+//
+//		JSONObject jsonObject = httpRequest(requestUrl, "GET", null);
+//		if (jsonObject != null)	{
+//			try	{
+//				wot = new WeixinOauth2Token();
+//				wot.setAccessToken(jsonObject.getString("access_token"));
+//				wot.setExpiresIn(jsonObject.getInteger("expires_in"));
+//				wot.setRefreshToken(jsonObject.getString("refresh_token"));
+//				wot.setOpenId(jsonObject.getString("openid"));
+//				String scope=jsonObject.getString("scope");
+//				System.out.println("----scope-----"+scope);
+//				wot.setScope(scope);
+//				//wot.setScope(jsonObject.getString("scope"));
+//			}catch (Exception e){
+//				wot = null;
+//				String errCode = jsonObject.getString("errcode");
+//				String errMsg = jsonObject.getString("errmsg");
+//				Log.error("获取网页信息的失败errcode:{" + errCode + "} errmsg{" + errMsg + "}");
+//			}
+//		}
+//
+//		return wot;
+//	}
+
+	/**
+	 * 查询用户信息
+	 * @param accessToken
+	 * @param openId
+	 * @return
+	 */
+//	public static UserApp getUserInfo(String accessToken, String openId){
+//		MerchantMenber uinfo = null;
+//		String requestUrl = "https://api.weixin.qq.com/cgi-bin/user/info?access_token=ACCESS_TOKEN&openid=OPENID&lang=zh_CN";
+//
+//		Log.info("==Oauth2Util======查询用户信息==getUserInfo===requestUrl="+requestUrl);
+//		requestUrl = requestUrl.replace("ACCESS_TOKEN", accessToken);
+//		requestUrl = requestUrl.replace("OPENID", openId);
+//
+//		JSONObject jsonObject = httpRequest(requestUrl, "GET", null);
+//
+//		if (jsonObject != null)	{
+//			try{
+//				uinfo = new MerchantMember();
+////				uinfo.setCity(jsonObject.getString("city"));
+////				uinfo.setCountry(jsonObject.getString("country"));
+//				uinfo.setPic(jsonObject.getString("headimgurl"));
+//				String nickName = jsonObject.getString("nickname");
+//				//对微信用户昵称进行编码，解决昵称中有图片的问题
+//				nickName = URLEncoder.encode(nickName, "utf-8");
+//				uinfo.setNickName(nickName);
+//				uinfo.setOpenId(jsonObject.getString("openid"));
+//				Date createDt = new Date(jsonObject.getLong("subscribe_time")*1000);//转换为毫秒
+//				uinfo.setCreateDt(createDt);
+//				uinfo.setSex(String.valueOf(jsonObject.getInt("sex")));
+//				Log.info("==Oauth2Util==============panTestSubscribe===================jsonObject="+jsonObject);
+//
+//			}catch (Exception e){
+//				uinfo = null;
+//				String errCode = jsonObject.getString("errcode");
+//				String errMsg = jsonObject.getString("errmsg");
+//				Log.error("获取网页信息的失败errcode:{" + errCode + "} errmsg{" + errMsg + "}");
+//			}
+//		}
+//		return uinfo;
+//
+//	}
+	
+	/**
+	 * 获取AccessToken
+	 * @param appId
+	 * @param appSecret
+	 * @return
+	 */
+//	public static String getAccessToken4User(String appId, String appSecret){
+//		String requestUrl = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=APPID&secret=SECRET";
+//		requestUrl =  requestUrl.replace("APPID", appId);
+//		requestUrl =  requestUrl.replace("SECRET", appSecret);
+//		String access_token =null;
+//		Log.info("getAccessToken4User===requestUrl===="+requestUrl);
+//		JSONObject jsonObject = httpRequest(requestUrl, "GET", null);
+//		if (jsonObject != null){
+//			try {
+//				access_token = jsonObject.getString("access_token");
+//			} catch (Exception e) {
+//				String errCode = jsonObject.getString("errcode");
+//				String errMsg = jsonObject.getString("errmsg");
+//				Log.error("获取token失败errcode:{" + errCode + "} errmsg{" + errMsg + "}");
+//			}
+//		}
+//		return access_token;
+//	}
+
+	
+	/**
+	 * 根据token创建二维码
+	 * @param access_token
+	 * @return
+	 */
+	public static String qrCodeCreate(String access_token, int sceneId){
+		String requestUrl = "https://api.weixin.qq.com/cgi-bin/qrcode/create?access_token="+access_token;
+		Log.info("qrCodeCreate====requestUrl===="+requestUrl);
+		// output data  
+	    Map<String, Integer> intMap = new HashMap<String, Integer>();  
+	    intMap.put("scene_id", sceneId);  
+	    Map<String, Map<String, Integer>> mapMap = new HashMap<String, Map<String, Integer>>();  
+	    mapMap.put("scene", intMap);  
+	    //  
+	    Map<String, Object> paramsMap = new HashMap<String, Object>();  
+	    paramsMap.put("action_name", Constant.QR_LIMIT_SCENE);  
+	    paramsMap.put("action_info", mapMap);  
+	    com.alibaba.fastjson.JSONObject gson = new  com.alibaba.fastjson.JSONObject();  
+	    String data = gson.toJSONString(paramsMap);  
+		JSONObject jsonObject = httpRequest(requestUrl, "POST", data);
+		Log.info("qrCodeCreate====jsonObject===="+jsonObject);
+		String url =null;
+		if (jsonObject != null){
+			try {
+				url = jsonObject.getString("url");
+			} catch (Exception e) {
+				String errCode = jsonObject.getString("errcode");
+				String errMsg = jsonObject.getString("errmsg");
+				Log.error("获取url失败errcode:{" + errCode + "} errmsg{" + errMsg + "}");
+			}
+		}
+		return url;
+	}	
+	
+	public static String cancelCode(String access_token, String params){
+		String requestUrl="https://api.weixin.qq.com/card/code/consume?access_token="+access_token;
+		Log.info("queryCode====requestUrl===="+requestUrl);
+		Map<String, Object> dataMap=new HashMap<String, Object>();
+		dataMap.put("code", params);
+		com.alibaba.fastjson.JSONObject gson = new  com.alibaba.fastjson.JSONObject();  
+		String data=gson.toJSONString(dataMap);
+	    System.out.println("data="+data);
+		JSONObject jsonObject = httpRequest(requestUrl, "POST",data);
+		if(jsonObject!=null){
+			String errmsg = jsonObject.getString("errmsg");
+			if("ok".equals(errmsg)){
+				return "ok";
+			}
+		}
+		return "error";
+	}
+	/**
+	 * @description:发送微信模板消息
+	 * @date: 2021/9/24 11:18
+	 * @param appId:
+	 * @param appSecret:
+	 * @param openid:
+	 * @param tempId:
+	 * @param toUrl:
+	 * @param miniprogram:
+	 * @param data:
+	 * @return java.lang.String
+	 */
+//	public static void sendTemplateMsg(String appId,
+//										 String appSecret,
+//										 String openid,
+//										 String tempId,
+//										 String toUrl,
+//										 com.alibaba.fastjson.JSONObject miniprogram,
+//									   com.alibaba.fastjson.JSONObject data){
+//		String accToken = getAccessToken4User(appId, appSecret);
+//		if(StringUtil.isNotEmpty(accToken)){
+//			String url = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token="+accToken;
+//			com.alibaba.fastjson.JSONObject reqData = new com.alibaba.fastjson.JSONObject();
+//			reqData.put("touser",openid);
+//			reqData.put("template_id",tempId);
+//			if(StringUtil.isNotEmpty(toUrl)){
+//				reqData.put("url",toUrl);
+//			}
+//			if(miniprogram != null){
+//				reqData.put("miniprogram",miniprogram);
+//			}
+//			reqData.put("data",data);
+//			JSONObject object = httpRequest(url, "POST", reqData.toJSONString());
+//			if(object == null){
+//				Log.error("发送模板消息失败");
+//			}else{
+//				Log.info("发送模板消息返回参数:{}", com.alibaba.fastjson.JSONObject.toJSONString(object));
+//				int errcode = object.getInteger("errcode");
+//				if(errcode == 0){
+//					Log.info("模板消息发送成功！");
+//				}
+//			}
+//		}
+//	}
+
+	/**
+	 * @description:小程序获取appid
+	 * @date: 2021/10/13 13:52
+	 * @param appid:
+	 * @param appSecret:
+	 * @param code:
+	 * @return java.lang.String
+	 */
+//	public static JSONObject getWxAppOpenId(String appid,String appSecret,String code){
+//		String url = "https://api.weixin.qq.com/sns/jscode2session?appid=APPID&secret=APPSECRET&js_code=CODE&grant_type=authorization_code";
+//		url = url.replace("APPID",appid).replace("APPSECRET",appSecret).replace("CODE",code);
+//		JSONObject respones = httpRequest(url, "GET", null);
+//		Log.info("【获取小程序openid接口】返回参数:{}",respones.toString());
+//		if(respones == null){
+//			MsgException.throwException("获取失败！");
+//		}
+//		return respones;
+//	}
+
+
+	public static String getJsapiTicket(String accessToken){
+		String url = "https://api.weixin.qq.com/cgi-bin/ticket/getticket?access_token=ACCESS_TOKEN&type=jsapi";
+		url = url.replace("ACCESS_TOKEN",accessToken);
+		JSONObject respones = httpRequest(url, "GET", null);
+		Log.info("【获取小程序小程序接口】返回参数:{}",respones.toString());
+		if(respones == null){
+			MsgException.throwException("获取失败！");
+		}
+		if(respones.getInteger("errcode") != 0){
+			MsgException.throwException(respones.getString("errmsg"));
+		}
+		return respones.getString("ticket");
+	}
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/wechat/PayInfo.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/wechat/PayInfo.java
new file mode 100644
index 0000000..5832114
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/wechat/PayInfo.java
@@ -0,0 +1,96 @@
+package cn.pluss.platform.wechat;
+
+public class PayInfo {
+
+	private String appId;
+	private String appSecret;
+	private String pid;
+	private String subMchId;
+	private String pkey;
+	private String openId;
+	private String orderNumber;
+	private String transSeq;
+	private Double orderPrice;
+	private String goodsName;
+	private WechatPayment wechatPayment;
+	private String merchantCode;
+	
+	
+	
+	public String getSubMchId() {
+		return subMchId;
+	}
+	public void setSubMchId(String subMchId) {
+		this.subMchId = subMchId;
+	}
+	public String getAppId() {
+		return appId;
+	}
+	public void setAppId(String appId) {
+		this.appId = appId;
+	}
+	public String getAppSecret() {
+		return appSecret;
+	}
+	public void setAppSecret(String appSecret) {
+		this.appSecret = appSecret;
+	}
+	public String getPid() {
+		return pid;
+	}
+	public void setPid(String pid) {
+		this.pid = pid;
+	}
+	public String getPkey() {
+		return pkey;
+	}
+	public void setPkey(String pkey) {
+		this.pkey = pkey;
+	}
+	public String getOrderNumber() {
+		return orderNumber;
+	}
+	public void setOrderNumber(String orderNumber) {
+		this.orderNumber = orderNumber;
+	}
+	public String getOpenId() {
+		return openId;
+	}
+	public void setOpenId(String openId) {
+		this.openId = openId;
+	}
+	public String getTransSeq() {
+		return transSeq;
+	}
+	public void setTransSeq(String transSeq) {
+		this.transSeq = transSeq;
+	}
+	public Double getOrderPrice() {
+		return orderPrice;
+	}
+	public void setOrderPrice(Double orderPrice) {
+		this.orderPrice = orderPrice;
+	}
+	public String getGoodsName() {
+		return goodsName;
+	}
+	public void setGoodsName(String goodsName) {
+		this.goodsName = goodsName;
+	}
+	public WechatPayment getWechatPayment() {
+		return wechatPayment;
+	}
+	public void setWechatPayment(WechatPayment wechatPayment) {
+		this.wechatPayment = wechatPayment;
+	}
+	public String getMerchantCode() {
+		return merchantCode;
+	}
+	public void setMerchantCode(String merchantCode) {
+		this.merchantCode = merchantCode;
+	}
+	
+	
+	
+	
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/wechat/PayNotify.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/wechat/PayNotify.java
new file mode 100644
index 0000000..26f98fe
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/wechat/PayNotify.java
@@ -0,0 +1,205 @@
+/* 
+ * Copyrights 尚果科技平台研发项目组 @ 2015，尚果科技 SEOCOO Computer Co., Ltd.<br>
+ * 项目名称：尚果科技-平台开发组 <br>
+ * 文件名称：PayNotify.java <br>
+ * 创建时间：2015-6-16-上午09:26:12 <br>
+ * Description： 
+ * History：<br> [ Author Date Version Content ]<br>
+ *  
+ */
+package cn.pluss.platform.wechat;
+
+public class PayNotify {
+
+	private String return_code;
+	private String return_msg;
+	private String appid;
+	private String mch_id;
+	private String device_info;
+	private String nonce_str;
+	private String sign;
+	private String result_code;
+	private String err_code;
+	private String err_code_desc;
+	
+	private String product_id;
+	private String prepay_id;
+	private String code_url;
+	
+	private String openid;
+	private String is_subscribe;
+	private String trade_type;
+	private String trade_state;
+	private String trade_state_desc;
+	private String bank_type;
+	
+	private String total_fee;
+	private String cash_fee;
+	private String fee_type;
+	private String transaction_id;
+	private String out_trade_no;
+	private String attach;
+	private String time_end;
+	public String getReturn_code() {
+		return return_code;
+	}
+	public void setReturn_code(String return_code) {
+		this.return_code = return_code;
+	}
+	public String getReturn_msg() {
+		return return_msg;
+	}
+	public void setReturn_msg(String return_msg) {
+		this.return_msg = return_msg;
+	}
+	public String getAppid() {
+		return appid;
+	}
+	public void setAppid(String appid) {
+		this.appid = appid;
+	}
+	public String getMch_id() {
+		return mch_id;
+	}
+	public String getProduct_id() {
+		return product_id;
+	}
+	public void setProduct_id(String product_id) {
+		this.product_id = product_id;
+	}
+	public void setMch_id(String mch_id) {
+		this.mch_id = mch_id;
+	}
+	public String getDevice_info() {
+		return device_info;
+	}
+	public void setDevice_info(String device_info) {
+		this.device_info = device_info;
+	}
+	public String getPrepay_id() {
+		return prepay_id;
+	}
+	public void setPrepay_id(String prepay_id) {
+		this.prepay_id = prepay_id;
+	}
+	public String getNonce_str() {
+		return nonce_str;
+	}
+	public void setNonce_str(String nonce_str) {
+		this.nonce_str = nonce_str;
+	}
+	public String getSign() {
+		return sign;
+	}
+	public void setSign(String sign) {
+		this.sign = sign;
+	}
+	public String getResult_code() {
+		return result_code;
+	}
+	public void setResult_code(String result_code) {
+		this.result_code = result_code;
+	}
+	public String getErr_code() {
+		return err_code;
+	}
+	public void setErr_code(String err_code) {
+		this.err_code = err_code;
+	}
+	public String getErr_code_desc() {
+		return err_code_desc;
+	}
+	public void setErr_code_desc(String err_code_desc) {
+		this.err_code_desc = err_code_desc;
+	}
+	public String getOpenid() {
+		return openid;
+	}
+	public void setOpenid(String openid) {
+		this.openid = openid;
+	}
+	public String getIs_subscribe() {
+		return is_subscribe;
+	}
+	public void setIs_subscribe(String is_subscribe) {
+		this.is_subscribe = is_subscribe;
+	}
+	public String getTrade_type() {
+		return trade_type;
+	}
+	public void setTrade_type(String trade_type) {
+		this.trade_type = trade_type;
+	}
+	public String getBank_type() {
+		return bank_type;
+	}
+	public void setBank_type(String bank_type) {
+		this.bank_type = bank_type;
+	}
+	public String getTotal_fee() {
+		return total_fee;
+	}
+	public void setTotal_fee(String total_fee) {
+		this.total_fee = total_fee;
+	}
+	public String getCash_fee() {
+		return cash_fee;
+	}
+	public void setCash_fee(String cash_fee) {
+		this.cash_fee = cash_fee;
+	}
+	public String getFee_type() {
+		return fee_type;
+	}
+	public void setFee_type(String fee_type) {
+		this.fee_type = fee_type;
+	}
+	public String getTransaction_id() {
+		return transaction_id;
+	}
+	public void setTransaction_id(String transaction_id) {
+		this.transaction_id = transaction_id;
+	}
+	public String getOut_trade_no() {
+		return out_trade_no;
+	}
+	public void setOut_trade_no(String out_trade_no) {
+		this.out_trade_no = out_trade_no;
+	}
+	public String getAttach() {
+		return attach;
+	}
+	public void setAttach(String attach) {
+		this.attach = attach;
+	}
+	public String getTime_end() {
+		return time_end;
+	}
+	public void setTime_end(String time_end) {
+		this.time_end = time_end;
+	}
+	@Override
+	public String toString() {
+		// TODO Auto-generated method stub
+		return super.toString();
+	}
+	public String getCode_url() {
+		return code_url;
+	}
+	public void setCode_url(String code_url) {
+		this.code_url = code_url;
+	}
+	
+	public String getTrade_state() {
+		return trade_state;
+	}
+	public void setTrade_state(String trade_state) {
+		this.trade_state = trade_state;
+	}
+	public String getTrade_state_desc() {
+		return trade_state_desc;
+	}
+	public void setTrade_state_desc(String trade_state_desc) {
+		this.trade_state_desc = trade_state_desc;
+	}
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/wechat/PayUnitedRequest.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/wechat/PayUnitedRequest.java
new file mode 100644
index 0000000..fe44420
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/wechat/PayUnitedRequest.java
@@ -0,0 +1,117 @@
+/* 
+ * Copyrights 尚果科技平台研发项目组 @ 2015，尚果科技 SEOCOO Computer Co., Ltd.<br>
+ * 项目名称：尚果科技-平台开发组 <br>
+ * 文件名称：PayUnitedRequest.java <br>
+ * 创建时间：2015-6-15-下午03:58:22 <br>
+ * Description： 
+ * History：<br> [ Author Date Version Content ]<br>
+ *  
+ */
+package cn.pluss.platform.wechat;
+
+public class PayUnitedRequest {
+
+
+	private String appid;
+	private String mch_id;
+	private String device_info;
+	private String nonce_str;
+	private String body;
+	private String attach;
+	private String out_trade_no;
+	private String total_fee;
+	private String spbill_create_ip;
+	private String time_start;
+	private String time_expire;
+	private String notify_url;
+	private String trade_type;
+	private String openid;
+	
+	
+	
+	public String getOpenid() {
+		return openid;
+	}
+	public void setOpenid(String openid) {
+		this.openid = openid;
+	}
+	public String getAppid() {
+		return appid;
+	}
+	public void setAppid(String appid) {
+		this.appid = appid;
+	}
+	public String getMch_id() {
+		return mch_id;
+	}
+	public void setMch_id(String mch_id) {
+		this.mch_id = mch_id;
+	}
+	public String getNonce_str() {
+		return nonce_str;
+	}
+	public void setNonce_str(String nonce_str) {
+		this.nonce_str = nonce_str;
+	}
+	public String getBody() {
+		return body;
+	}
+	public void setBody(String body) {
+		this.body = body;
+	}
+	public String getAttach() {
+		return attach;
+	}
+	public void setAttach(String attach) {
+		this.attach = attach;
+	}
+	public String getOut_trade_no() {
+		return out_trade_no;
+	}
+	public void setOut_trade_no(String out_trade_no) {
+		this.out_trade_no = out_trade_no;
+	}
+	public String getTotal_fee() {
+		return total_fee;
+	}
+	public void setTotal_fee(String total_fee) {
+		this.total_fee = total_fee;
+	}
+	public String getSpbill_create_ip() {
+		return spbill_create_ip;
+	}
+	public void setSpbill_create_ip(String spbill_create_ip) {
+		this.spbill_create_ip = spbill_create_ip;
+	}
+	public String getTime_start() {
+		return time_start;
+	}
+	public void setTime_start(String time_start) {
+		this.time_start = time_start;
+	}
+	public String getTime_expire() {
+		return time_expire;
+	}
+	public void setTime_expire(String time_expire) {
+		this.time_expire = time_expire;
+	}
+	public String getNotify_url() {
+		return notify_url;
+	}
+	public void setNotify_url(String notify_url) {
+		this.notify_url = notify_url;
+	}
+	public String getTrade_type() {
+		return trade_type;
+	}
+	public void setTrade_type(String trade_type) {
+		this.trade_type = trade_type;
+	}
+	public String getDevice_info() {
+		return device_info;
+	}
+	public void setDevice_info(String device_info) {
+		this.device_info = device_info;
+	}
+	
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/wechat/PayUnitedResponse.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/wechat/PayUnitedResponse.java
new file mode 100644
index 0000000..81a1141
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/wechat/PayUnitedResponse.java
@@ -0,0 +1,116 @@
+/* 
+ * Copyrights 尚果科技平台研发项目组 @ 2015，尚果科技 SEOCOO Computer Co., Ltd.<br>
+ * 项目名称：尚果科技-平台开发组 <br>
+ * 文件名称：PayUnitedResponse.java <br>
+ * 创建时间：2015-6-15-下午03:59:52 <br>
+ * Description： 
+ * History：<br> [ Author Date Version Content ]<br>
+ *  
+ */
+package cn.pluss.platform.wechat;
+
+public class PayUnitedResponse {
+
+
+	private String return_code;
+	private String return_msg;
+	private String appid;
+	private String mch_id;
+	private String device_info;
+	private String nonce_str;
+	private String sign;
+	private String result_code;
+	private String err_code;
+	private String err_code_desc;
+	private String trade_type;
+	private String prepay_id;
+	private String code_url;
+	public String getReturn_code() {
+		return return_code;
+	}
+	public void setReturn_code(String return_code) {
+		this.return_code = return_code;
+	}
+	public String getReturn_msg() {
+		return return_msg;
+	}
+	public void setReturn_msg(String return_msg) {
+		this.return_msg = return_msg;
+	}
+	public String getAppid() {
+		return appid;
+	}
+	public void setAppid(String appid) {
+		this.appid = appid;
+	}
+	public String getMch_id() {
+		return mch_id;
+	}
+	public void setMch_id(String mch_id) {
+		this.mch_id = mch_id;
+	}
+	public String getDevice_info() {
+		return device_info;
+	}
+	public void setDevice_info(String device_info) {
+		this.device_info = device_info;
+	}
+	public String getNonce_str() {
+		return nonce_str;
+	}
+	public void setNonce_str(String nonce_str) {
+		this.nonce_str = nonce_str;
+	}
+	public String getSign() {
+		return sign;
+	}
+	public void setSign(String sign) {
+		this.sign = sign;
+	}
+	public String getresult_code() {
+		return result_code;
+	}
+	public void setresult_code(String result_code) {
+		this.result_code = result_code;
+	}
+	public String getErr_code() {
+		return err_code;
+	}
+	public void setErr_code(String err_code) {
+		this.err_code = err_code;
+	}
+	public String getErr_code_desc() {
+		return err_code_desc;
+	}
+	public void setErr_code_desc(String err_code_desc) {
+		this.err_code_desc = err_code_desc;
+	}
+	public String getTrade_type() {
+		return trade_type;
+	}
+	public void setTrade_type(String trade_type) {
+		this.trade_type = trade_type;
+	}
+	public String getPrepay_id() {
+		return prepay_id;
+	}
+	public void setPrepay_id(String prepay_id) {
+		this.prepay_id = prepay_id;
+	}
+	public String getCode_url() {
+		return code_url;
+	}
+	public void setCode_url(String code_url) {
+		this.code_url = code_url;
+	}
+	@Override
+	public String toString() {
+		return "PayUnitedResponse [return_code=" + return_code + ", return_msg=" + return_msg + ", appid=" + appid
+				+ ", mch_id=" + mch_id + ", device_info=" + device_info + ", nonce_str=" + nonce_str + ", sign=" + sign
+				+ ", result_code=" + result_code + ", err_code=" + err_code + ", err_code_desc=" + err_code_desc
+				+ ", trade_type=" + trade_type + ", prepay_id=" + prepay_id + ", code_url=" + code_url + "]";
+	}
+	
+	
+	
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/wechat/PaymentResult.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/wechat/PaymentResult.java
new file mode 100644
index 0000000..f3ec696
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/wechat/PaymentResult.java
@@ -0,0 +1,400 @@
+/* 
+ * Copyrights 尚果科技支付平台研发项目组 @ 2015， 尚果科技支付 SEOCOO Computer Co., Ltd.<br>
+ * 项目名称： 尚果科技支付平台研发项目组 <br>
+ * 文件名称：PaymentAction.java <br>
+ * 创建时间：2015-5-19-下午18:49:14 <br>
+ * 创建用户：永生<br>
+ * Description： 
+ * History：<br> [ Author Date Version Content ]<br>
+ *  
+ */
+  
+package cn.pluss.platform.wechat;
+
+import java.util.Map;
+
+
+public class PaymentResult {
+    /**
+     * 支付成功
+     */
+    public final static String PAY_SUCCESS="SUCCESS";
+    /**
+     * 支付失败
+     */
+    public final static String PAY_FAIL="FAIL";
+    
+    private String uptranseq;
+    /**
+     * 商户编码
+     */
+    private String merchantCode;
+    /**
+     * 商户秘钥
+     */
+    private String merchantKey;
+    /**
+     * 交易时间
+     */
+    private String tranDate;
+    /**
+     * 返回的支付情况编码
+     */
+    private String retnCode;
+    /**
+     * 返回的支付情况信息
+     */
+    private String retnInfo;
+    /**
+     * 交易流水号
+     */
+    private String tranSeq;
+    /**
+     * 订单流水号
+     */
+    private String orderNumber;
+    /**
+     * 支付总额
+     */
+    private String totalPrice;
+    /**
+     * 消息摘要
+     */
+    private String sign;
+    /**
+     * 响应字符串
+     */
+    private String responseMsg;
+    /**
+     * 响应字符串
+     */
+    private String responseCode;
+    /**
+     * 原字符
+     */
+    private String jsonReqMsg;
+    
+    /**
+     * 回调相应字符串
+     */
+    private Map<String, String> reqParams;
+    
+    
+    /**
+     * 商户标识
+     */
+    private String merID;
+    /**
+     * 订单标识(原)
+     */
+    private String orderID;
+    /**
+     * 交易日期时间, YYYYMMDDHHmmSS
+     */
+    private String orderTime;
+    /**
+     *止付结果，标识是否成功或失败的原因
+     */
+    private String rspCode;
+    /**
+     * 对于止付结果的描述信息。
+     */
+    private String rspDesc;
+
+    //1基金支付，0正常支付
+    private String isFund="0";
+    
+    // 订单系统冻结金额
+    private String freezeAmt;
+    
+    //1页面回调 0服务器回调
+    private String isPageCall="0";
+    //原始请求流水号
+    private String oriTransID;
+    //冻结金额
+    private String freezeAmount;
+    //冻结到期日
+    private String freezeExpire;
+    //冻结时间
+    private String freezeDateTime;
+    //冻结订单号
+    private String freezeOrderID ;
+    
+    //余额宝购机参数start--------------
+    //1余额宝，0正常支付
+    private String isAli="0";
+    //支付宝授权订单号
+    private String auth_no;
+    //支付宝资金操作流水号
+    private String operation_id;
+    //商户本次资金操作的请求流水号
+    private String out_request_no;
+    //冻结金额
+    private String amount;
+    //操作流水状态 INIT：初始PROCESSING：处理中 SUCCESS：成功FAIL：失败 CLOSED：关闭
+    private String ali_status;
+    //操作时间
+    private String gmt_create;
+    //收款方支付宝账号
+    private String payee_user_id;
+    //付款方支付宝账号
+    private String payer_logon_id;
+    //付款方支付宝账号
+    private String payer_user_id;
+    
+    //余额宝购机参数end----------------------
+    
+    
+    /**
+     * 支付是否成功
+     * @return true成功，false失败
+     * @see [类、类#方法、类#成员]
+     */
+    public boolean isSuccess(){
+        return PAY_SUCCESS.equals(this.retnCode);
+    }
+    public boolean isSspSuccess(){
+        return "000000".equals(this.rspCode);
+    }
+    public String getUptranseq() {
+        return uptranseq;
+    }
+    public void setUptranseq(String uptranseq) {
+        this.uptranseq = uptranseq;
+    }
+    public String getTranDate() {
+        return tranDate;
+    }
+    public void setTranDate(String tranDate) {
+        this.tranDate = tranDate;
+    }
+    public String getRetnCode() {
+        return retnCode;
+    }
+    public void setRetnCode(String retnCode) {
+        this.retnCode = retnCode;
+    }
+    public String getRetnInfo() {
+        return retnInfo;
+    }
+    public void setRetnInfo(String retnInfo) {
+        this.retnInfo = retnInfo;
+    }
+    public String getTranSeq() {
+        return tranSeq;
+    }
+    public void setTranSeq(String tranSeq) {
+        this.tranSeq = tranSeq;
+    }
+ 
+    public String getOrderNumber() {
+        return orderNumber;
+    }
+    public void setOrderNumber(String orderNumber) {
+        this.orderNumber = orderNumber;
+    }
+    public String getTotalPrice() {
+        return totalPrice;
+    }
+    public void setTotalPrice(String totalPrice) {
+        this.totalPrice = totalPrice;
+    }
+    public String getSign() {
+        return sign;
+    }
+    public void setSign(String sign) {
+        this.sign = sign;
+    }
+    public String getMerchantCode() {
+        return merchantCode;
+    }
+    public void setMerchantCode(String merchantCode) {
+        this.merchantCode = merchantCode;
+    }
+    public String getResponseMsg() {  	
+        return responseMsg;
+    }
+    public void setResponseMsg(String responseMsg) {
+        this.responseMsg = responseMsg;
+    }
+    public String getMerchantKey() {
+        return merchantKey;
+    }
+    public void setMerchantKey(String merchantKey) {
+        this.merchantKey = merchantKey;
+    }
+
+    public Map<String, String> getReqParams() {
+        return reqParams;
+    }
+    public void setReqParams(Map<String, String> reqParams) {
+        this.reqParams = reqParams;
+    }
+    public String getJsonReqMsg() {
+        return jsonReqMsg;
+    }
+    public void setJsonReqMsg(String jsonReqMsg) {
+        this.jsonReqMsg = jsonReqMsg;
+    }
+    
+    public String getMerID() {
+		return merID;
+	}
+	public void setMerID(String merID) {
+		this.merID = merID;
+	}
+	public String getOrderID() {
+		return orderID;
+	}
+	public void setOrderID(String orderID) {
+		this.orderID = orderID;
+	}
+	public String getOrderTime() {
+		return orderTime;
+	}
+	public void setOrderTime(String orderTime) {
+		this.orderTime = orderTime;
+	}
+	public String getRspCode() {
+		return rspCode;
+	}
+	public void setRspCode(String rspCode) {
+		this.rspCode = rspCode;
+	}
+	public String getRspDesc() {
+		return rspDesc;
+	}
+	public void setRspDesc(String rspDesc) {
+		this.rspDesc = rspDesc;
+	}
+	
+	public String getIsPageCall() {
+		return isPageCall;
+	}
+	public void setIsPageCall(String isPageCall) {
+		this.isPageCall = isPageCall;
+	}
+	public String getIsFund() {
+		return isFund;
+	}
+	public void setIsFund(String isFund) {
+		this.isFund = isFund;
+	}
+	
+	public String getOriTransID() {
+		return oriTransID;
+	}
+	public void setOriTransID(String oriTransID) {
+		this.oriTransID = oriTransID;
+	}
+	public String getFreezeAmount() {
+		return freezeAmount;
+	}
+	public void setFreezeAmount(String freezeAmount) {
+		this.freezeAmount = freezeAmount;
+	}
+	public String getFreezeExpire() {
+		return freezeExpire;
+	}
+	public void setFreezeExpire(String freezeExpire) {
+		this.freezeExpire = freezeExpire;
+	}
+	public String getFreezeDateTime() {
+		return freezeDateTime;
+	}
+	public void setFreezeDateTime(String freezeDateTime) {
+		this.freezeDateTime = freezeDateTime;
+	}
+	public String getFreezeOrderID() {
+		return freezeOrderID;
+	}
+	public void setFreezeOrderID(String freezeOrderID) {
+		this.freezeOrderID = freezeOrderID;
+	}
+	
+	public String getResponseCode() {
+		return responseCode;
+	}
+	public void setResponseCode(String responseCode) {
+		this.responseCode = responseCode;
+	}
+	
+	public String getFreezeAmt() {
+		return freezeAmt;
+	}
+	public void setFreezeAmt(String freezeAmt) {
+		this.freezeAmt = freezeAmt;
+	}
+	
+	public String getIsAli() {
+		return isAli;
+	}
+	public void setIsAli(String isAli) {
+		this.isAli = isAli;
+	}
+	public String getAuth_no() {
+		return auth_no;
+	}
+	public void setAuth_no(String auth_no) {
+		this.auth_no = auth_no;
+	}
+	public String getOperation_id() {
+		return operation_id;
+	}
+	public void setOperation_id(String operation_id) {
+		this.operation_id = operation_id;
+	}
+	public String getOut_request_no() {
+		return out_request_no;
+	}
+	public void setOut_request_no(String out_request_no) {
+		this.out_request_no = out_request_no;
+	}
+	public String getAmount() {
+		return amount;
+	}
+	public void setAmount(String amount) {
+		this.amount = amount;
+	}
+	
+	public String getAli_status() {
+		return ali_status;
+	}
+	public void setAli_status(String ali_status) {
+		this.ali_status = ali_status;
+	}
+	
+	public String getGmt_create() {
+		return gmt_create;
+	}
+	public void setGmt_create(String gmt_create) {
+		this.gmt_create = gmt_create;
+	}
+	public String getPayee_user_id() {
+		return payee_user_id;
+	}
+	public void setPayee_user_id(String payee_user_id) {
+		this.payee_user_id = payee_user_id;
+	}
+	public String getPayer_logon_id() {
+		return payer_logon_id;
+	}
+	public void setPayer_logon_id(String payer_logon_id) {
+		this.payer_logon_id = payer_logon_id;
+	}
+	public String getPayer_user_id() {
+		return payer_user_id;
+	}
+	public void setPayer_user_id(String payer_user_id) {
+		this.payer_user_id = payer_user_id;
+	}
+	public String getDebugInfo(){
+        StringBuilder builder=new StringBuilder();
+        builder.append("订单：");
+        builder.append(this.orderNumber);
+        builder.append(";支付金额：");
+        builder.append(this.totalPrice);
+       return builder.toString();
+    }
+    
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/wechat/SNSUserInfo.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/wechat/SNSUserInfo.java
new file mode 100644
index 0000000..da7f27d
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/wechat/SNSUserInfo.java
@@ -0,0 +1,107 @@
+package cn.pluss.platform.wechat;
+
+import java.util.List;
+
+public class SNSUserInfo
+{
+	private String openId;
+	private String nickname;
+	private int sex;
+	private String province;
+	private String city;
+	private String country;
+	private String headImgUrl;
+	private List<String> privilegelist;
+	private String unionid;
+
+	public String getOpenId()
+	{
+		return openId;
+	}
+
+	public void setOpenId(String openId)
+	{
+		this.openId = openId;
+	}
+
+	public String getNickname()
+	{
+		return nickname;
+	}
+
+	public void setNickname(String nickname)
+	{
+		this.nickname = nickname;
+	}
+
+	public int getSex()
+	{
+		return sex;
+	}
+
+	public void setSex(int sex)
+	{
+		this.sex = sex;
+	}
+
+	public String getProvince()
+	{
+		return province;
+	}
+
+	public void setProvince(String province)
+	{
+		this.province = province;
+	}
+
+	public String getCity()
+	{
+		return city;
+	}
+
+	public void setCity(String city)
+	{
+		this.city = city;
+	}
+
+	public String getCountry()
+	{
+		return country;
+	}
+
+	public void setCountry(String country)
+	{
+		this.country = country;
+	}
+
+	public String getHeadImgUrl()
+	{
+		return headImgUrl;
+	}
+
+	public void setHeadImgUrl(String headImgUrl)
+	{
+		this.headImgUrl = headImgUrl;
+	}
+
+	public List<String> getPrivilegelist()
+	{
+		return privilegelist;
+	}
+
+	public void setPrivilegelist(List<String> privilegelist)
+	{
+		this.privilegelist = privilegelist;
+	}
+
+	public String getUnionid()
+	{
+		return unionid;
+	}
+
+	public void setUnionid(String unionid)
+	{
+		this.unionid = unionid;
+	}
+
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/wechat/TemplateData.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/wechat/TemplateData.java
new file mode 100644
index 0000000..b54034f
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/wechat/TemplateData.java
@@ -0,0 +1,5 @@
+package cn.pluss.platform.wechat;
+
+public class TemplateData {
+
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/wechat/WechatPayment.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/wechat/WechatPayment.java
new file mode 100644
index 0000000..8fe52cf
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/wechat/WechatPayment.java
@@ -0,0 +1,60 @@
+package cn.pluss.platform.wechat;
+
+public class WechatPayment {
+
+	
+	private String appId;
+	private String timeStamp;
+	private String totalFee;
+	private String nonceStr;
+	private String packageMsg;
+	private String signType;
+	private String paySgin;
+	public String getAppId() {
+		return appId;
+	}
+	public void setAppId(String appId) {
+		this.appId = appId;
+	}
+	public String getTimeStamp() {
+		return timeStamp;
+	}
+	public void setTimeStamp(String timeStamp) {
+		this.timeStamp = timeStamp;
+	}
+	public String getNonceStr() {
+		return nonceStr;
+	}
+	public void setNonceStr(String nonceStr) {
+		this.nonceStr = nonceStr;
+	}
+	public String getPackageMsg() {
+		return packageMsg;
+	}
+	public void setPackageMsg(String packageMsg) {
+		this.packageMsg = packageMsg;
+	}
+	public String getSignType() {
+		return signType;
+	}
+	public void setSignType(String signType) {
+		this.signType = signType;
+	}
+	public String getPaySgin() {
+		return paySgin;
+	}
+	public void setPaySgin(String paySgin) {
+		this.paySgin = paySgin;
+	}
+	public String getTotalFee() {
+		return totalFee;
+	}
+	public void setTotalFee(String totalFee) {
+		this.totalFee = totalFee;
+	}
+	
+	
+	
+	
+	
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/wechat/WeiXinUtil.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/wechat/WeiXinUtil.java
new file mode 100644
index 0000000..14ce888
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/wechat/WeiXinUtil.java
@@ -0,0 +1,320 @@
+/* 
+ * Copyrights 尚果科技平台研发项目组 @ 2015，尚果科技 SEOCOO Computer Co., Ltd.<br>
+ * 项目名称：尚果科技-平台开发组 <br>
+ * 文件名称：WeiXinUtil.java <br>
+ * 创建时间：2015-6-15-下午02:32:32 <br>
+ * Description： 
+ * History：<br> [ Author Date Version Content ]<br>
+ *  
+ */
+package cn.pluss.platform.wechat;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedMap;
+
+import org.dom4j.Document;
+import org.dom4j.DocumentException;
+import org.dom4j.DocumentHelper;
+import org.dom4j.Element;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import cn.pluss.platform.constants.Constant;
+import cn.pluss.platform.util.MD5Util;
+
+public class WeiXinUtil {
+
+	 private static final Logger logger = LoggerFactory.getLogger( WeiXinUtil.class);
+		
+
+		
+		public static PayNotify xmlToPayNotify(String msg){
+			PayNotify payNotify=new PayNotify();
+			try {
+				Document doc = DocumentHelper.parseText(msg);
+				Element root = doc.getRootElement();
+				String return_code = root.element("return_code").getTextTrim();
+				
+				
+				if(Constant.RESULT_CODE_SUCCESS.equals(return_code)){
+					
+					String result_code = root.element("result_code").getTextTrim();
+					
+					if(Constant.RESULT_CODE_SUCCESS.equals(result_code)){
+						
+						
+						String appid = root.element("appid").getTextTrim();
+						String mch_id = root.element("mch_id").getTextTrim();
+						String nonce_str = root.element("nonce_str").getTextTrim();
+						String sign = root.element("sign").getTextTrim();
+						String openid = root.element("openid").getTextTrim();
+						String is_subscribe = root.element("is_subscribe").getTextTrim();
+						String trade_type = root.element("trade_type").getTextTrim();
+						
+//						String trade_state_desc = root.element("trade_state_desc").getTextTrim();
+						String bank_type = root.element("bank_type").getTextTrim();
+						String total_fee = root.element("total_fee").getTextTrim();
+						String transaction_id = root.element("transaction_id").getTextTrim();
+						String out_trade_no = root.element("out_trade_no").getTextTrim();
+						String time_end = root.element("time_end").getTextTrim();
+						payNotify.setAppid(appid);
+						payNotify.setBank_type(bank_type);
+						payNotify.setIs_subscribe(is_subscribe);
+						payNotify.setMch_id(mch_id);
+						payNotify.setNonce_str(nonce_str); 
+						payNotify.setOpenid(openid);
+						payNotify.setOut_trade_no(out_trade_no);
+						payNotify.setResult_code(result_code);
+						payNotify.setReturn_code(return_code);
+						payNotify.setSign(sign);
+						payNotify.setTime_end(time_end);
+						payNotify.setTotal_fee(total_fee);
+						payNotify.setTrade_type(trade_type);
+//						payNotify.setTrade_state_desc(trade_state_desc);
+						payNotify.setTransaction_id(transaction_id);
+						
+					}else{
+						payNotify.setReturn_code("FAIL");
+						payNotify.setReturn_msg("支付回调接口返回数据错误");
+						System.out.println("支付回调接口返回数据错误");
+					}
+					
+					
+				}else{
+					//协议错误
+					String return_msg = root.element("return_msg").getTextTrim();
+					payNotify.setReturn_code("FAIL");
+					payNotify.setReturn_msg(return_msg);
+					System.out.println("支付回调接口协议数据错误");
+				}
+				
+				
+			} catch (Exception e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+				payNotify.setReturn_code("FAIL");
+				payNotify.setReturn_msg("支付回调接口返回数据错误");
+				System.out.println("支付回调接口返回数据错误");
+			}   
+			
+			return payNotify;
+			
+		}
+		
+		/**
+		 * 解析调用统一支付接口响应报文
+		 * @param msg
+		 * @return
+		 */
+		public static PayNotify xmlToPayNotifyResponse(String msg){
+			
+			PayNotify payNotify=new PayNotify();
+			try {
+				Document doc = DocumentHelper.parseText(msg);
+				Element root = doc.getRootElement();
+				String return_code = root.element("return_code").getTextTrim();
+				
+				
+				if(Constant.RESULT_CODE_SUCCESS.equals(return_code)){
+					
+					String result_code = root.element("result_code").getTextTrim();
+					
+					if(Constant.RESULT_CODE_SUCCESS.equals(result_code)){
+						
+						String appid = root.element("appid").getTextTrim();
+						String mch_id = root.element("mch_id").getTextTrim();
+						String nonce_str = root.element("nonce_str").getTextTrim();
+						String code_url = root.element("code_url").getTextTrim();
+						String sign = root.element("sign").getTextTrim();
+						String trade_type = root.element("trade_type").getTextTrim();
+						String prepay_id = root.element("prepay_id").getTextTrim();
+						String return_msg = root.element("return_msg").getTextTrim();
+						payNotify.setAppid(appid);
+						payNotify.setMch_id(mch_id);
+						payNotify.setNonce_str(nonce_str); 
+						payNotify.setPrepay_id(prepay_id);
+						payNotify.setCode_url(code_url);
+						payNotify.setResult_code(result_code);
+						payNotify.setReturn_code(return_code);
+						payNotify.setSign(sign);
+						payNotify.setTrade_type(trade_type);
+						payNotify.setReturn_msg(return_msg);
+						
+					}else{
+						//协议错误
+						String return_msg = root.element("return_msg").getTextTrim();
+						payNotify.setReturn_code("FAIL");
+						payNotify.setReturn_msg(return_msg);
+						System.out.println("统一下单回调接口协议数据错误");
+					}
+					
+				}else{
+					//协议错误
+					String return_msg = root.element("return_msg").getTextTrim();
+					payNotify.setReturn_code("FAIL");
+					payNotify.setReturn_msg(return_msg);
+					System.out.println("统一下单回调接口协议数据错误");
+				}
+			
+			} catch (Exception e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+				payNotify.setReturn_code("FAIL");
+				payNotify.setReturn_msg("统一下单回调接口返回数据错误");
+				System.out.println("统一下单回调接口返回数据错误");
+			}   
+			
+			return payNotify;
+		}
+		
+		
+		//生成签名
+		public static String paySign(String pKey2, String packageMsg, String appId2,String timeMillis, String appSecret2, String nonceStr,String signType) {
+			Map<String, String> param = new HashMap<String, String>();
+			param.put("appId", appId2);
+			param.put("timeStamp", timeMillis);
+			param.put("nonceStr", nonceStr);
+			param.put("package", packageMsg);
+			param.put("signType", signType);
+			//去除空串
+			Map<String, String> array = MicroPayCore.paraFilter(param);
+			//排序生成签名
+			String paySign = MicroPayCore.buildMysign(array, pKey2);
+			return paySign;
+				
+		}
+		//生成预支付订单签名
+		public static String paySign(String pKey2,String return_code,String return_msg, String appid, 
+				String mch_id,String nonce_str, String prepay_id, String result_code,String err_code_des,String signType) {
+			Map<String, String> param = new HashMap<String, String>();
+			param.put("return_code", return_code);
+			param.put("return_msg", return_msg);
+			param.put("appid", appid);
+			param.put("mch_id", mch_id);
+			param.put("nonce_str", nonce_str);
+			param.put("prepay_id", prepay_id);
+			param.put("result_code", result_code);
+			param.put("err_code_des", err_code_des);
+			param.put("signType", signType);
+			//去除空串
+			Map<String, String> array = MicroPayCore.paraFilter(param);
+			//排序生成签名
+			String paySign = MicroPayCore.buildMysign(array, pKey2);
+			return paySign;
+			
+		}
+		//模式二生成预支付订单签名
+		   public static String createSign(String characterEncoding, SortedMap<Object, Object> packageParams, String API_KEY) {  
+		        StringBuffer sb = new StringBuffer();  
+		        Set es = packageParams.entrySet();  
+		        Iterator it = es.iterator();  
+		        while (it.hasNext()) {  
+		            Map.Entry entry = (Map.Entry) it.next();  
+		            String k = (String) entry.getKey();  
+		            String v = String.valueOf(entry.getValue()) ;  
+		            if (null != v && !"".equals(v) && !"sign".equals(k) && !"key".equals(k)) {  
+		                sb.append(k + "=" + v + "&");  
+		            }  
+		        }  
+		        sb.append("key=" + API_KEY);  
+		        String sign = MD5Util.MD5Encode(sb.toString(), characterEncoding).toUpperCase();  
+		        return sign;  
+		    } 
+		   
+		   
+		  public static String getCurrTime() {  
+		        Date now = new Date();  
+		        SimpleDateFormat outFormat = new SimpleDateFormat("yyyyMMddHHmmss");  
+		        String s = outFormat.format(now);  
+		        return s;  
+		    }  
+		 
+		  public static String getRequestXml(SortedMap<Object, Object> parameters) {  
+		        StringBuffer sb = new StringBuffer();  
+		        sb.append("<xml>");  
+		        Set es = parameters.entrySet();  
+		        Iterator it = es.iterator();  
+		        while (it.hasNext()) {  
+		            Map.Entry entry = (Map.Entry) it.next();  
+		            String k = (String) entry.getKey();  
+		            String v = String.valueOf(entry.getValue());  
+		            if ("attach".equalsIgnoreCase(k) || "body".equalsIgnoreCase(k) || "sign".equalsIgnoreCase(k)) {  
+		                sb.append("<" + k + ">" + "<![CDATA[" + v + "]]></" + k + ">");  
+		            } else {  
+		                sb.append("<" + k + ">" + v + "</" + k + ">");  
+		            }  
+		        }  
+		        sb.append("</xml>");  
+		        return sb.toString();  
+		    }  
+	
+		  
+		  
+		  /**
+			 * 解析调用统一支付接口响应报文
+			 * @param msg
+			 * @return
+			 */
+			public static PayUnitedResponse xmlToPayUnitedResponse(String msg){
+				
+				PayUnitedResponse payUnitedResponse=new PayUnitedResponse();
+
+				Document doc=null;
+				try {
+					doc = DocumentHelper.parseText(msg);
+				} catch (DocumentException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+				Element root = doc.getRootElement();
+				String return_code = root.element("return_code").getTextTrim();
+				
+				
+				if(Constant.RESULT_CODE_SUCCESS.equals(return_code)){
+					
+					String result_code = root.element("result_code").getTextTrim();
+					
+					if(Constant.RESULT_CODE_SUCCESS.equals(result_code)){
+						
+						String appid = root.element("appid").getTextTrim();
+						String mch_id = root.element("mch_id").getTextTrim();
+						String nonce_str = root.element("nonce_str").getTextTrim();
+						String sign = root.element("sign").getTextTrim();
+						String trade_type = root.element("trade_type").getTextTrim();
+						String prepay_id = root.element("prepay_id").getTextTrim();
+
+						payUnitedResponse.setAppid(appid);
+						payUnitedResponse.setMch_id(mch_id);
+						payUnitedResponse.setNonce_str(nonce_str);
+						payUnitedResponse.setReturn_code(return_code);
+						payUnitedResponse.setReturn_code(result_code);
+						payUnitedResponse.setSign(sign);
+						payUnitedResponse.setTrade_type(trade_type);
+						payUnitedResponse.setPrepay_id(prepay_id);
+						
+					}else{
+						String err_code = root.element("err_code").getTextTrim();
+						String err_code_desc = root.element("err_code_des").getTextTrim();
+						payUnitedResponse.setReturn_msg(err_code_desc);
+						System.out.println("请求统一支付接口返回数据错误");
+					}
+					
+					
+				}else{
+					//协议错误
+					String return_msg = root.element("return_msg").getTextTrim();
+					payUnitedResponse.setReturn_msg(return_msg);
+					System.out.println("请求统一支付接口协议数据错误");
+				}
+				return  payUnitedResponse;
+			
+				
+			}
+		
+		  
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/wechat/WeixinOauth2Token.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/wechat/WeixinOauth2Token.java
new file mode 100644
index 0000000..6e4e82a
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/wechat/WeixinOauth2Token.java
@@ -0,0 +1,75 @@
+package cn.pluss.platform.wechat;
+
+public class WeixinOauth2Token
+{
+	// 网页授权接口调用凭证
+	private String accessToken;
+	// access_token接口调用凭证超时时间
+	private int expiresIn;
+	// 用户刷新access_token
+	private String refreshToken;
+	// 用户唯一标识
+	private String openId;
+	// 用户授权的作用域，使用逗号（,）分隔
+	private String scope;
+
+	private String unionId;
+
+	public String getAccessToken()
+	{
+		return accessToken;
+	}
+
+	public void setAccessToken(String accessToken)
+	{
+		this.accessToken = accessToken;
+	}
+
+	public int getExpiresIn()
+	{
+		return expiresIn;
+	}
+
+	public void setExpiresIn(int expiresIn)
+	{
+		this.expiresIn = expiresIn;
+	}
+
+	public String getRefreshToken()
+	{
+		return refreshToken;
+	}
+
+	public void setRefreshToken(String refreshToken)
+	{
+		this.refreshToken = refreshToken;
+	}
+
+	public String getOpenId()
+	{
+		return openId;
+	}
+
+	public void setOpenId(String openId)
+	{
+		this.openId = openId;
+	}
+
+	public String getScope()
+	{
+		return scope;
+	}
+
+	public void setScope(String scope)
+	{
+		this.scope = scope;
+	}
+
+	public String getUnionId() {
+		return unionId;
+	}
+
+	public void setUnionId(String unionId) {
+		this.unionId = unionId;
+	}
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/wechat/WxConstants.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/wechat/WxConstants.java
new file mode 100644
index 0000000..8b7fc5e
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/wechat/WxConstants.java
@@ -0,0 +1,100 @@
+package cn.pluss.platform.wechat;
+
+
+/**
+ *
+ *微信常量配置类
+ *@author: bzg
+ *@time: 2021/11/29 15:45
+ */
+public class WxConstants {
+
+    /**
+     * 公众号获取accesstoken URl
+     * @date: 2021/11/29 18:06
+     */
+    public static final String ACCESS_TOKEN_URL = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=APPID&secret=SECRET";
+
+    /**
+     * 跳转微信scheme
+     */
+    public static final String GENERATE_SCHEME = "https://api.weixin.qq.com/wxa/generatescheme?access_token=ACCESS_TOKEN";
+
+    /**
+     * 获取网页授权token
+     * @date: 2021/11/30 10:08
+     */
+    public static final String OAUTH2_ACCESS_TOKEN_URL = "https://api.weixin.qq.com/sns/oauth2/access_token?appid=APPID&secret=SECRET&code=CODE&grant_type=authorization_code";
+
+    /**
+     * 获取小程序OPENID url
+     * @date: 2021/11/29 18:06
+     */
+    public static final String WX_APPLET_OPENID_URL = "https://api.weixin.qq.com/sns/jscode2session?appid=APPID&secret=SECRET&js_code=CODE&grant_type=authorization_code";
+
+    /**
+     * 用户信息url
+     * @date: 2021/11/30 13:36
+     */
+    public static final String WX_USER_INFO_URL = "https://api.weixin.qq.com/cgi-bin/user/info?access_token=ACCESS_TOKEN&openid=OPENID&lang=zh_CN";
+    /**
+     * 发送模板消息接口url
+     * @date: 2021/11/29 18:07
+     */
+    public static final String WX_SEND_TEMPLATE_URL = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=ACCESS_TOKEN";
+
+    /**
+     * 生成微信带参数的二维码url
+     * @date: 2021/11/29 18:07
+     */
+    public static final String WX_CREATE_QR_CODE_URL = "https://api.weixin.qq.com/cgi-bin/qrcode/create?access_token=ACCESS_TOKEN";
+
+    /**
+     * 获取ticket
+     * @date: 2021/11/29 18:07
+     */
+    public static final String WX_TICKET_URL = "https://api.weixin.qq.com/cgi-bin/ticket/getticket?access_token=ACCESS_TOKEN&type=TYPE";
+
+
+    public static final String ERRCODE_NAME_PARAM = "errcode";
+
+    /**
+     * 二维码类型，QR_SCENE为临时的整型参数值
+     * @date: 2021/12/9 11:32
+     */
+    public static final String QR_SCENE = "QR_SCENE";
+
+    /**
+     * 二维码类型，QR_STR_SCENE为临时的字符串参数值
+     * @date: 2021/12/9 11:32
+     */
+    public static final String QR_STR_SCENE = "QR_STR_SCENE";
+
+    /**
+     * 二维码类型，QR_LIMIT_SCENE为永久的整型参数值
+     * @date: 2021/12/9 11:33
+     */
+    public static final String QR_LIMIT_SCENE = "QR_LIMIT_SCENE";
+
+    /**
+     * 二维码类型，QR_LIMIT_STR_SCENE为永久的字符串参数值
+     * @date: 2021/12/9 11:33
+     */
+    public static final String QR_LIMIT_STR_SCENE = "QR_LIMIT_STR_SCENE";
+
+    public static final Integer RESULT_SUCCESS_CODE = 0;
+
+    public static final Integer QR_EXPIRE_SECONDS = 2592000;
+
+    /**
+     * 微信会员开卡通知模板ID
+     * @date: 2021/12/9 18:17
+     */
+    public static final String VIP_CARD_SUCCESS_TEMPLATE_ID = "Hf_WLVwVAc0HD4KV2_zLD0vTgiw4jpZ-OkcN4lIffUA";
+
+    /**
+     * 会员卡余额变动通知模板ID
+     * @date: 2021/12/9 18:19
+     */
+    public static final String VIP_BALANCE_CHANGE_TEMPLATE_ID = "GNwluamISkPhGQU-NC1uBH-ftb7z28rknYe7hZyDKyI";
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/yt/YtCancelOrderRequest.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/yt/YtCancelOrderRequest.java
new file mode 100644
index 0000000..7b316a5
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/yt/YtCancelOrderRequest.java
@@ -0,0 +1,18 @@
+package cn.pluss.platform.yt;
+
+import lombok.Data;
+
+/**
+ *
+ *圆通取消订单接口
+ *@author: bzg
+ *@time: 2022/2/24 15:32
+ */
+@Data
+public class YtCancelOrderRequest {
+
+    private String logisticsNo;
+
+    private String cancelDesc;
+
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/yt/YtCreateOrder.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/yt/YtCreateOrder.java
new file mode 100644
index 0000000..e9b0b08
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/yt/YtCreateOrder.java
@@ -0,0 +1,142 @@
+package cn.pluss.platform.yt;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ *
+ *圆通创建订单接口请求封装
+ *@author: bzg
+ *@time: 2022/2/24 14:12
+ */
+@Data
+public class YtCreateOrder implements Serializable {
+
+    /**
+     * 物流单号，打印拉取运单号前，物流单号和渠道唯一确定一笔快递物流订单。
+     */
+    private String logisticsNo;
+
+    /**
+     * 寄件人姓名
+     * @date: 2022/2/24 14:17
+     */
+    private String senderName;
+
+    /**
+     * 寄件人省名称
+     * @date: 2022/2/24 14:17
+     */
+    private String senderProvinceName;
+
+    /**
+     * 寄件人市名称
+     * @date: 2022/2/24 14:17
+     */
+    private String senderCityName;
+
+    /**
+     * 	寄件人区县名称
+     * @date: 2022/2/24 14:17
+     */
+    private String senderCountyName;
+
+    /**
+     * 寄件人乡镇名称
+     * @date: 2022/2/24 14:17
+     */
+    private String senderTownName;
+
+
+    /**
+     * 	寄件人详细地址
+     * @date: 2022/2/24 14:17
+     */
+    private String senderAddress;
+
+
+    /**
+     * 	寄件人联系电话
+     * @date: 2022/2/24 14:17
+     */
+    private String senderMobile;
+
+
+    /**
+     * 收件人姓名
+     * @date: 2022/2/24 14:17
+     */
+    private String recipientName;
+
+
+    /**
+     * 收件人省名称
+     * @date: 2022/2/24 14:17
+     */
+    private String recipientProvinceName;
+
+
+    /**
+     * 收件人市名称
+     * @date: 2022/2/24 14:17
+     */
+    private String recipientCityName;
+
+
+    /**
+     * 收件人区县名称
+     * @date: 2022/2/24 14:17
+     */
+    private String recipientCountyName;
+
+
+    /**
+     * 收件人乡镇名称
+     * @date: 2022/2/24 14:17
+     */
+    private String recipientTownName;
+
+    /**
+     * 收件人详细地址
+     * @date: 2022/2/24 14:17
+     */
+    private String recipientAddress;
+
+    /**
+     * 收件人联系电话
+     * @date: 2022/2/24 14:17
+     */
+    private String recipientMobile;
+
+    /**
+     * 备注，打印在面单上备注内容
+     * @date: 2022/2/24 14:17
+     */
+    private String remark;
+
+    /**
+     * 寄件码或取件码
+     * @date: 2022/2/24 14:17
+     */
+    private String gotCode;
+
+    private String cstOrderNo;
+
+    private String cstBusinessType;
+
+    private List<YtGood> goods;
+
+    private List<YtOrderIncrement> increments;
+
+
+    public YtCreateOrder() {
+        this.senderName = "收银呗客服部";
+        this.senderProvinceName = "湖北省";
+        this.senderCityName = "武汉市";
+        this.senderCountyName = "洪山区";
+        this.senderAddress = "九台别墅42栋";
+        this.senderMobile = "18062761507";
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/yt/YtGood.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/yt/YtGood.java
new file mode 100644
index 0000000..a4148be
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/yt/YtGood.java
@@ -0,0 +1,58 @@
+package cn.pluss.platform.yt;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ *
+ *圆通商品信息实体类封装
+ *@author: bzg
+ *@time: 2022/2/24 15:22
+ */
+@Data
+public class YtGood {
+
+    /**
+     * 物品名称
+     * @date: 2022/2/24 15:24
+     */
+    private String name;
+
+    /**
+     * 重量，单位：千克
+     * @date: 2022/2/24 15:24
+     */
+    private BigDecimal weight;
+
+    /**
+     * 长，单位：米
+     * @date: 2022/2/24 15:24
+     */
+    private BigDecimal length;
+
+    /**
+     * 宽，单位：米
+     * @date: 2022/2/24 15:24
+     */
+    private BigDecimal width;
+
+    /**
+     * 高，单位：米
+     * @date: 2022/2/24 15:24
+     */
+    private BigDecimal height;
+
+    /**
+     * 单价，单位：元
+     * @date: 2022/2/24 15:24
+     */
+    private BigDecimal price;
+
+    /**
+     * 数量
+     * @date: 2022/2/24 15:24
+     */
+    private Long quantity;
+
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/yt/YtLogisticsEntity.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/yt/YtLogisticsEntity.java
new file mode 100644
index 0000000..9af37d8
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/yt/YtLogisticsEntity.java
@@ -0,0 +1,21 @@
+package cn.pluss.platform.yt;
+
+import lombok.Data;
+
+/**
+ * TODO
+ * 圆通物流参数封装
+ * @author crystal
+ * @date 2022/3/24 14:08
+ */
+@Data
+public class YtLogisticsEntity {
+
+    private String data_digest;
+
+    private String clientId;
+
+    private String type;
+
+    private String logistics_interface;
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/yt/YtLogisticsRequest.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/yt/YtLogisticsRequest.java
new file mode 100644
index 0000000..0c392d6
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/yt/YtLogisticsRequest.java
@@ -0,0 +1,40 @@
+package cn.pluss.platform.yt;
+
+import cn.pluss.platform.util.SignUtils;
+import cn.pluss.platform.yt.constant.YtConstant;
+import com.alibaba.fastjson.JSON;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ *
+ *圆通开放平台请求封装
+ *@author: bzg
+ *@time: 2022/2/24 14:09
+ */
+@Data
+@NoArgsConstructor
+public class YtLogisticsRequest {
+
+    private String sign;
+
+    private String timestamp;
+
+    private Object param;
+
+    private String format;
+
+    private String reqUrl;
+
+    public static final String FORMAT_JSON = "JSON";
+
+    public static final String FORMAT_XML = "xml";
+
+    public YtLogisticsRequest(Object param,String key,String method,String code){
+        this.sign = SignUtils.getYtSign(JSON.toJSONString(param), key,method,YtConstant.YT_DEFAULT_VERSION);
+        this.timestamp = String.valueOf(System.currentTimeMillis());
+        this.param = JSON.toJSONString(param);
+        this.format = FORMAT_JSON;
+        this.reqUrl = YtConstant.YT_API_PROD_DOMAIN + method + "/" + YtConstant.YT_DEFAULT_VERSION + "/" + YtConstant.YT_DEFAULT_CODE + "/" + code;
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/yt/YtLogisticsResponse.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/yt/YtLogisticsResponse.java
new file mode 100644
index 0000000..2a212a9
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/yt/YtLogisticsResponse.java
@@ -0,0 +1,34 @@
+package cn.pluss.platform.yt;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * TODO
+ * 圆通返回参数封装
+ * @author crystal
+ * @date 2022/3/31 11:27
+ */
+@Data
+@NoArgsConstructor
+public class YtLogisticsResponse {
+
+    private String logisticProviderID;
+
+    private String txLogisticID;
+
+    private Boolean success;
+
+    private String reason;
+
+    public YtLogisticsResponse(String logisticProviderID, String txLogisticID, Boolean success, String reason) {
+        this.logisticProviderID = logisticProviderID;
+        this.txLogisticID = txLogisticID;
+        this.success = success;
+        this.reason = reason;
+    }
+
+    public static YtLogisticsResponse build(String logisticProviderID, String txLogisticID, boolean success, String reason){
+        return new YtLogisticsResponse(logisticProviderID,txLogisticID,success,reason);
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/yt/YtOrderIncrement.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/yt/YtOrderIncrement.java
new file mode 100644
index 0000000..0e758c3
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/yt/YtOrderIncrement.java
@@ -0,0 +1,19 @@
+package cn.pluss.platform.yt;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ *
+ *@description:
+ *@author: bzg
+ *@time: 2022/2/24 15:48
+ */
+@Data
+public class YtOrderIncrement {
+
+    private Integer type;
+
+    private BigDecimal amount;
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/yt/YtStatusEnum.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/yt/YtStatusEnum.java
new file mode 100644
index 0000000..7f92e9f
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/yt/YtStatusEnum.java
@@ -0,0 +1,62 @@
+package cn.pluss.platform.yt;
+
+import cn.pluss.platform.entitiy.SettleTypeEnum;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.util.StringUtil;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * TODO
+ * 圆通物流状态枚举类
+ * @author crystal
+ * @date 2022/3/24 16:38
+ */
+@Getter
+@AllArgsConstructor
+public enum YtStatusEnum {
+
+    WAIT("WAIT","00","待发货"),
+    ACCEPT("ACCEPT","01","已接单"),
+    GOT("GOT","02","已揽收"),
+    ARRIVAL("ARRIVAL","03","已收入"),
+    DEPARTURE("DEPARTURE","04","已发出"),
+    PACKAGE("PACKAGE","05","已打包"),
+    SENT_SCAN("SENT_SCAN","06","派件中"),
+    INBOUND("INBOUND","07","自提柜入库"),
+    SIGNED("SIGNED","08","已签收"),
+    NOT_SEND("NOT_SEND","90","揽收失败"),
+    FAILED("FAILED","99","签收失败");
+
+    private String code;
+
+    private String value;
+
+    private String desc;
+
+    public static String getValueByCode(String code) {
+        if(StringUtil.isEmpty(code)){
+            MsgException.throwException("圆通code为空,状态转换失败");
+        }
+        YtStatusEnum[] ytStatusEnums = values();
+        for (YtStatusEnum ytStatusEnum : ytStatusEnums) {
+            if (ytStatusEnum.code.equals(code)) {
+                return ytStatusEnum.getValue();
+            }
+        }
+        return null;
+    }
+
+    public static String getDescByCode(String code) {
+        if(StringUtil.isEmpty(code)){
+            MsgException.throwException("圆通code为空,状态转换失败");
+        }
+        YtStatusEnum[] ytStatusEnums = values();
+        for (YtStatusEnum ytStatusEnum : ytStatusEnums) {
+            if (ytStatusEnum.code.equals(code)) {
+                return ytStatusEnum.getDesc();
+            }
+        }
+        return null;
+    }
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/yt/YtUpdateInfo.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/yt/YtUpdateInfo.java
new file mode 100644
index 0000000..40a61da
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/yt/YtUpdateInfo.java
@@ -0,0 +1,115 @@
+package cn.pluss.platform.yt;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * TODO
+ * 圆通物流回调业务参数封装
+ * @author crystal
+ * @date 2022/3/24 14:48
+ */
+@Data
+public class YtUpdateInfo {
+    /**
+     * YTO
+     */
+    private String logisticProviderID;
+
+    /**
+     * TEST
+     */
+    private String clientID;
+
+    /**
+     * 1648103805528
+     */
+    private String txLogisticID;
+
+    /**
+     * STATUS
+     */
+    private String infoType;
+
+    /**
+     * GOT
+     */
+    private String infoContent;
+
+    /**
+     * YT2220324143645 圆通物流单号
+     */
+    private String mailNo;
+
+    /**
+     * 重量（kg）
+     */
+    private BigDecimal weight;
+
+    /**
+     * 时间
+     */
+    private String acceptTime;
+
+    /**
+     * 城市
+     */
+    private String city;
+
+    /**
+     * 区域（县）
+     */
+    private String district;
+
+    /**
+     * 备注 测试省测试市测试县 公司 揽收成功
+     */
+    private String remark;
+
+    /**
+     * 010001
+     */
+    private String empCode;
+
+    /**
+     * 张三
+     */
+    private String empName;
+
+    /**
+     * 测试省测试市测试市测试镇
+     */
+    private String orgName;
+
+    /**
+     * 111111
+     */
+    private String orgCode;
+
+    /**
+     * 021-68888888,021-68888888
+     */
+    private String orgPhone;
+
+    /**
+     * 13888889999
+     */
+    private String contactInfo;
+
+    /**
+     * 托寄物品为禁限寄品
+     */
+    private String questionCause;
+
+    /**
+     * 派件员姓名张三
+     */
+    private String deliveryName;
+
+    /**
+     * 李四
+     */
+    private String signedName;
+
+}
diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/yt/constant/YtConstant.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/yt/constant/YtConstant.java
new file mode 100644
index 0000000..51a08a2
--- /dev/null
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/yt/constant/YtConstant.java
@@ -0,0 +1,37 @@
+package cn.pluss.platform.yt.constant;
+
+import lombok.Data;
+
+/**
+ *
+ *圆通基础定义类
+ *@author: bzg
+ *@time: 2022/2/24 16:21
+ */
+@Data
+public class YtConstant {
+
+
+    public static final String CUSTOMER_CODE = "K270131419";
+
+    public static final String CUSTOMER_CODE_TEST = "K21000119";
+
+    public static final String CUSTOMER_KEY = "CQZGuLV8";
+
+    public static final String  CUSTOMER_KEY_TEST = "u2Z1F7Fh";
+
+//    public static final String YT_DOMAIN = "https://openapi.yto.net.cn:11443/open/korder_create_adapter/v1/W53ViU/K270131419";
+    public static final String YT_API_PROD_DOMAIN = "https://openapi.yto.net.cn:11443/open/";
+
+    public static final String YT_API_TEST_DOMAIN = "https://openuat.yto56.com.cn:6443/open/";
+
+    public static final String YT_CREATE_METHOD = "korder_create_adapter";
+
+    public static final String YT_DEFAULT_CODE = "W53ViU";
+
+    public static final String YT_DEFAULT_VERSION = "v1";
+
+    public static final String YT_RESPONSE_XML_ELEMENT = "Response";
+
+    public static final String YT_CUSTOMER_TELEPHONE = "95554";
+}
diff --git a/pluss-common-bundle/src/main/resources/application.yml b/pluss-common-bundle/src/main/resources/application.yml
new file mode 100644
index 0000000..63be462
--- /dev/null
+++ b/pluss-common-bundle/src/main/resources/application.yml
@@ -0,0 +1,4 @@
+jpush:
+  environment:
+    # 极光推送开发环境还是线上环境
+    develop: true
\ No newline at end of file
diff --git a/pluss-common-bundle/src/main/resources/config/application-common.yml b/pluss-common-bundle/src/main/resources/config/application-common.yml
new file mode 100644
index 0000000..efcdc63
--- /dev/null
+++ b/pluss-common-bundle/src/main/resources/config/application-common.yml
@@ -0,0 +1,146 @@
+juhe:
+  send:
+    url: http://v.juhe.cn/sms/send
+    key: aeb2ea1a00cc46551aa93503ae9db7b1
+
+ip138:
+  url: https://api.ip138.com/ipv4/
+  token: 获取token
+
+aliyun:
+  # 这里推荐使用RAM账号信息 #
+  keyid: LTAI5tMLHwnM1zYYAFuRa1fK
+  keysecret: jS1h2STq1vcODczDNFQkjcU6ODyYAj
+  region-id: cn-hangzhou
+  sts:
+    role-arn:
+    endpoint: https://sts.cn-hangzhou.aliyuncs.com
+  oss:
+    endpoint: https://oss-cn-hangzhou.aliyuncs.com
+    bucketname: czg-oss
+    callback: ${parameter.domain}/manage/upload/ossCallback
+  bankcard:
+    bank-url: https://aliyun-bankcard4-verify.apistore.cn/bank4
+    app-code: 11cb746de2704f5482a40fd36ed8a1f1
+
+#阿里MQTT参数配置
+mqtt:
+  region-id: cn-hangzhou
+  keyid:
+  keysecret:
+  instance-id:
+  topic:
+  groupid:
+#  druid连接池基本配置 #
+spring:
+  mail:
+    default-encoding: utf-8
+    host: smtp.exmail.qq.com
+    port: 465
+    nickname: 发送报表邮件的昵称
+    username: 发送报表右键的邮箱
+    password:
+    properties:
+      mail:
+        smtp:
+          starttls:
+            enable: true
+            required: true
+          ssl:
+            enable: true
+            socketFactory:
+              fallback: false
+              class: com.fintech.modules.base.util.mail.MailSSLSocketFactory
+
+  #    username: 1317450073@qq.com
+  #    password: ldbidwgegkwtjcca
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    druid:
+      connection-properties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=500
+      filters: stat, wall
+      filter:
+        stat:
+          log-slow-sql: true
+          slow-sql-millis: 1000
+        wall:
+          config:
+            multi-statement-allow: true
+            none-base-statement-allow: true
+          enabled: true
+      initial-size: 5
+      max-active: 20
+      max-pool-prepared-statement-per-connection-size: 20
+      max-wait: 60000
+      min-evictable-idle-time-millis: 30000
+      min-idle: 5
+      test-on-borrow: false
+      test-on-return: false
+      test-while-idle: true
+      time-between-eviction-runs-millis: 60000
+      use-global-data-source-stat: true
+      validation-query: select 'x'
+
+  rabbitmq:
+    username:
+    password:
+    host:
+    port: 5672
+
+parameter:
+  domain: http://60.205.224.68
+  ALI_APP_AUTH_TOKEN: ${parameter.domain}/wap/aliPay/index
+  ALI_APP_ID: 支付宝原生接入的APPID
+  ALI_RATE: 0.006
+  ALI_RETURN_URL: ${parameter.domain}/wap/aliPay/returnUrl
+  APPID: 微信原生接入的APPID
+  APPLETS_APPID: 小程序付款APPID
+  APPSECRET:
+  KEY: 微信原生加密用的KEY
+  LESHUALIU: 乐刷、未接入可不管
+  LESHUA_API:
+  MERCHANT_APPID:
+  MERCHANT_APPSECRET:
+  MERCHANT_KEY:
+  MERCHANT_PID:
+  PID:
+  PRI:
+  PUB:
+  REPLACE: /home/syb
+  WECHAT_RATE:
+  ZY_ALI_APP_ID:
+  ZY_PRI:
+  ZY_PUB:
+  agentId: 乐刷代理商编号、未接入可不管
+  apk_dowload_url: apk下载链接，存储转入OSS之后可不管
+  baiduAK: cqmQn4RoZgC0IyH4mbHjKmQQ
+  baiduSK: hUhGrZFONMBjIzUQULOtlSXP3uTpompp
+  bankCardOCRUrl: https://aip.baidubce.com/rest/2.0/ocr/v1/bankcard
+  blCardOCRUrl: https://aip.baidubce.com/rest/2.0/ocr/v1/business_license
+  # 百度人脸识别应用的AK
+  baiduAK2:
+  # 百度人脸识别应用的SK
+  baiduSK2:
+  fans_profit: 4.0E-4
+  idCardOCRUrl: https://aip.baidubce.com/rest/2.0/ocr/v1/idcard
+  leshuaCallBackKey:
+  leshuapaykey:
+  leshuarate: 0.0038
+  upload_save_path: /czg/resources/images/upload
+  upload_visit_path: ${parameter.domain}/resources/images/upload
+  versions: 1
+  wechatCallback:
+  #商家公众号APPID
+  SJ_APPID:
+  #收银呗商家APPSECRET
+  SJ_APPSECRET:
+
+## 默认为正式环境
+sxf:
+  domain: https://openapi.tianquetech.com
+  orgId:
+  publicKey:
+
+getui:
+  domain: https://restapi.getui.com/v2/${getui.appId}
+  appId:
diff --git a/pluss-common-bundle/src/main/resources/config/application-ryx.yml b/pluss-common-bundle/src/main/resources/config/application-ryx.yml
new file mode 100644
index 0000000..9186e2e
--- /dev/null
+++ b/pluss-common-bundle/src/main/resources/config/application-ryx.yml
@@ -0,0 +1,24 @@
+ryx:
+  ## 进件URL前缀
+  auditDomain: https://rjp.ruiyinxin.com/nms/
+  ## 支付URL前缀
+  payDomain: https://qr.ruiyinxin.com
+  ## 机构id
+  accessId: ''
+  ## 商服宝机构id
+  subAccessId: ''
+  ## 私钥用于签名，对应的公钥给到瑞银信
+  cooperatorPriKey:
+    ## 公钥给到瑞银信，这里只做保存
+  cooperatorPubKey:
+    ## 进件/入网公钥用于加密，该公钥来自瑞银信
+  accessPubKey:
+    ## 进件/入网公钥
+  subAccessPubKey:
+    ## 进件/入网私钥
+  #  accessPriKey:
+  ## 支付公钥用于支付信息加密，该公钥来自瑞银信
+  # smzfPubKey:
+  smzfPubKey:
+    ##交易请求接口上送的机构号
+  payCooperator:
diff --git a/pluss-common-bundle/src/main/resources/config/application-ys.yml b/pluss-common-bundle/src/main/resources/config/application-ys.yml
new file mode 100644
index 0000000..ac4eb37
--- /dev/null
+++ b/pluss-common-bundle/src/main/resources/config/application-ys.yml
@@ -0,0 +1,58 @@
+ys:
+  ## 进件URL前缀
+  auditDomain: https://mpfpmerchantapi.ysepay.com
+  ## 支付URL网关
+  payDomain: https://qrcode.ysepay.com/gateway.do
+  ## 支付订单查询网关
+  searchDomain: https://search.ysepay.com/gateway.do
+  ## 公共网关接口
+  commonDomain: https://openapi.ysepay.com/gateway.do
+  ## 其他网关接口
+  otherDomain: https://commonapi.ysepay.com/gateway.do
+  ## 代理商编号
+  agentNo:
+  ## 交易发起方编号 武汉融商创赢科技有限公司
+  srcMerchantNo:
+
+  ## 私钥用于签名，对应的公钥给到银盛
+  priKey:
+  ## 签名公钥，由银盛提供
+  pubKey:
+  ## 付款验签公钥，由银盛提供
+  oldPubKey:
+
+  ## 进件URL前缀v2
+  auditDomainV2: https://ouser.ysepay.com:6443/
+  ## 机构号ID
+  src:
+  ## 代理商编号
+  agentNoV2:
+  ## 进件私钥v2
+  priKeyV2:
+    ## 进件公钥v2
+  pubKeyV2:
+    ## 加密密钥
+  encryptPwd:
+  oldPayV2:
+    ## 交易发起方编号 收银呗（武汉）科技有限公司
+    srcMerchantNo:
+    ## 收银呗（武汉）科技有限公司 私钥
+    payPriKey:
+      ## 收银呗公钥
+    sybPubKey:
+      # 银盛公钥
+    payPubKey:
+
+ys-extension:
+  ## 进件URL前缀v2
+  auditDomainV2: https://ouser.ysepay.com:6443/
+  ## 机构号ID
+  src:
+    ## 代理商编号
+  agentNoV2:
+  ## 进件私钥v2
+  priKeyV2:
+    ## 进件公钥v2
+  pubKeyV2:
+    ## 加密密钥
+  encryptPwd:
diff --git a/pluss-dao-bundle/pom.xml b/pluss-dao-bundle/pom.xml
new file mode 100644
index 0000000..cb571eb
--- /dev/null
+++ b/pluss-dao-bundle/pom.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>pluss-parent</artifactId>
+        <groupId>cn.pluss.platform</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>pluss-dao-bundle</artifactId>
+    <packaging>jar</packaging>
+    <version>1.0.0</version>
+
+    <dependencies>
+        <!-- mybatis服务 -->
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>spring-boot-starter-logging</artifactId>
+                    <groupId>org.springframework.boot</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.pluss.platform</groupId>
+            <artifactId>pluss-model-bundle</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <!-- jdbc服务 -->
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.boot</groupId>-->
+<!--            <artifactId>spring-boot-starter-jdbc</artifactId>-->
+<!--        </dependency>-->
+        <!-- mysql服务 -->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/config/MyMetaObjectHandler.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/config/MyMetaObjectHandler.java
new file mode 100644
index 0000000..859fbdb
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/config/MyMetaObjectHandler.java
@@ -0,0 +1,45 @@
+package cn.pluss.platform.config;
+
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.reflection.MetaObject;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+
+@Slf4j
+@Component
+public class MyMetaObjectHandler implements MetaObjectHandler {
+
+    private static final String UPDATE_TIME = "updateTime";
+    private static final String CREATE_TIME = "createTime";
+
+    private static final String UPDATE_DT = "updateDt";
+    private static final String CREATE_DT = "createDt";
+
+    @Override
+    public void insertFill(MetaObject metaObject) {
+        strictInsertFill(metaObject, CREATE_TIME, LocalDateTime.class, LocalDateTime.now());
+        strictInsertFill(metaObject, CREATE_TIME, Date.class, new Date());
+
+        strictInsertFill(metaObject, UPDATE_TIME, LocalDateTime.class, LocalDateTime.now());
+        strictInsertFill(metaObject, UPDATE_TIME, Date.class, new Date());
+
+        strictInsertFill(metaObject, CREATE_DT, LocalDateTime.class, LocalDateTime.now());
+        strictInsertFill(metaObject, CREATE_DT, Date.class, new Date());
+
+        strictInsertFill(metaObject, UPDATE_DT, LocalDateTime.class, LocalDateTime.now());
+        strictInsertFill(metaObject, UPDATE_DT, Date.class, new Date());
+    }
+
+
+    @Override
+    public void updateFill(MetaObject metaObject) {
+        strictUpdateFill(metaObject, UPDATE_TIME, LocalDateTime.class, LocalDateTime.now());
+        strictUpdateFill(metaObject, UPDATE_TIME, Date.class, new Date());
+
+        strictUpdateFill(metaObject, UPDATE_DT, LocalDateTime.class, LocalDateTime.now());
+        strictUpdateFill(metaObject, UPDATE_DT, Date.class, new Date());
+    }
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/config/MybatisPlusConfig.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/config/MybatisPlusConfig.java
new file mode 100644
index 0000000..531e2fe
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/config/MybatisPlusConfig.java
@@ -0,0 +1,22 @@
+package cn.pluss.platform.config;
+
+import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author DJH
+ */
+@MapperScan("cn.pluss.platform.mapper")
+@Configuration
+public class MybatisPlusConfig {
+
+    /**
+     * mybatis-plus分页插件
+     */
+    @Bean
+    public PaginationInterceptor paginationInterceptor() {
+        return new PaginationInterceptor();
+    }
+}
\ No newline at end of file
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/config/mybatis/FullSQLInterceptor.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/config/mybatis/FullSQLInterceptor.java
new file mode 100644
index 0000000..50a6889
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/config/mybatis/FullSQLInterceptor.java
@@ -0,0 +1,180 @@
+package cn.pluss.platform.config.mybatis;
+
+import cn.pluss.platform.util.StringUtil;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.executor.statement.StatementHandler;
+import org.apache.ibatis.mapping.BoundSql;
+import org.apache.ibatis.mapping.MappedStatement;
+import org.apache.ibatis.mapping.ParameterMapping;
+import org.apache.ibatis.plugin.*;
+import org.apache.ibatis.reflection.DefaultReflectorFactory;
+import org.apache.ibatis.reflection.MetaObject;
+import org.apache.ibatis.reflection.SystemMetaObject;
+import org.apache.ibatis.session.Configuration;
+import org.apache.ibatis.type.TypeHandlerRegistry;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.stereotype.Component;
+
+import java.sql.Connection;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+import java.util.Properties;
+import java.util.regex.Matcher;
+
+/**
+ * @author SSS
+ */
+@Slf4j
+@Component
+@ConditionalOnProperty(prefix = "spring.profiles", name = "active", havingValue = "dev")
+@Intercepts({@Signature(type = StatementHandler.class, method = "prepare", args = {Connection.class, Integer.class})})
+public class FullSQLInterceptor implements Interceptor {
+
+    @Override
+    public Object intercept(Invocation invocation) throws Throwable {
+        try {
+            printSql(invocation);
+        } catch (Exception ignored) {
+            log.warn("前置sql打印操作异常");
+        }
+        return invocation.proceed();
+    }
+
+    private void printSql(Invocation invocation) {
+        StatementHandler statementHandler = (StatementHandler) invocation.getTarget();
+        //通过MetaObject优雅访问对象的属性，这里是访问statementHandler的属性;：MetaObject是Mybatis提供的一个用于方便、
+        //优雅访问对象属性的对象，通过它可以简化代码、不需要try/catch各种reflect异常，同时它支持对JavaBean、Collection、Map三种类型对象的操作。
+        MetaObject metaObject = MetaObject
+                .forObject(statementHandler, SystemMetaObject.DEFAULT_OBJECT_FACTORY, SystemMetaObject.DEFAULT_OBJECT_WRAPPER_FACTORY,
+                        new DefaultReflectorFactory());
+        //先拦截到RoutingStatementHandler，里面有个StatementHandler类型的delegate变量，其实现类是BaseStatementHandler，然后就到BaseStatementHandler的成员变量mappedStatement
+        MappedStatement mappedStatement = (MappedStatement) metaObject.getValue("delegate.mappedStatement");
+        //id为执行的mapper方法的全路径名，如com.uv.dao.UserMapper.insertUser
+        String id = mappedStatement.getId();
+        //sql语句类型 select、delete、insert、update
+        String sqlCommandType = mappedStatement.getSqlCommandType().toString();
+        log.debug("类型 ==> " + sqlCommandType);
+
+        BoundSql boundSql = statementHandler.getBoundSql();
+
+        // 获取节点的配置
+        Configuration configuration = mappedStatement.getConfiguration();
+        // 获取到最终的sql语句
+        String newSql = showSql(configuration, boundSql);
+
+        if (newSql.contains("sys_sql") || newSql.contains("unknown_exception")) {
+            return;
+        }
+
+        log.debug("组装好的sql ==>: " + newSql);
+
+        // if (newSql.startsWith("SELECT") || newSql.startsWith("select")) {
+        //     // 查询
+        //     return;
+        // }
+        //
+        // if ("UPDATE".equals(sqlCommandType) || "INSERT".equals(sqlCommandType) || "DELETE".equals(sqlCommandType)) {
+        //     SysSqlMapper sysSqlMapper = SpringUtil.getBean(SysSqlMapper.class);
+        //     SysSql entity = new SysSql();
+        //     entity.setType(sqlCommandType);
+        //     entity.setMapperName(id);
+        //     entity.setSql(newSql);
+        //     sysSqlMapper.insert(entity);
+        // }
+    }
+
+    @Override
+    public Object plugin(Object target) {
+        return Plugin.wrap(target, this);
+    }
+
+    @Override
+    public void setProperties(Properties properties) {
+        // 无参数
+    }
+
+    /**
+     * 如果参数是String，则添加单引号， 如果是日期，则转换为时间格式器并加单引号；
+     * 对参数是null和不是null的情况作了处理<br>
+     *
+     * @param obj 参数
+     * @return 转换后的字符串
+     */
+    private String getParameterValue(Object obj) {
+        String value;
+        if (obj instanceof String) {
+            value = "'" + obj + "'";
+        } else if (obj instanceof Date) {
+            DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA);
+            value = "'" + formatter.format(obj) + "'";
+        } else {
+            if (obj != null) {
+                value = obj.toString();
+            } else {
+                value = null;
+            }
+
+        }
+        return value;
+    }
+
+    /**
+     * 进行？的替换
+     *
+     * @param configuration configuration
+     * @param boundSql      boundSql
+     * @return 拼接后的sql
+     */
+    public String showSql(Configuration configuration, BoundSql boundSql) {
+        // 获取参数
+        Object parameterObject = boundSql.getParameterObject();
+        List<ParameterMapping> parameterMappings = boundSql
+                .getParameterMappings();
+        // sql语句中多个空格都用一个空格代替
+        String sql = boundSql.getSql().replaceAll("[\\s]+", " ");
+
+        if (CollectionUtils.isNotEmpty(parameterMappings) && parameterObject != null) {
+            // 获取类型处理器注册器，类型处理器的功能是进行java类型和数据库类型的转换　　　　　　　
+            // 如果根据parameterObject.getClass(）可以找到对应的类型，则替换
+            TypeHandlerRegistry typeHandlerRegistry = configuration.getTypeHandlerRegistry();
+            if (typeHandlerRegistry.hasTypeHandler(parameterObject.getClass())) {
+                sql = sql.replaceFirst("\\?", Matcher.quoteReplacement(getParameterValue(parameterObject)));
+            } else {
+                //MetaObject主要是封装了originalObject对象，
+                // 提供了get和set的方法用于获取和设置originalObject的属性值,
+                // 主要支持对JavaBean、Collection、Map三种类型对象的操作
+                MetaObject metaObject = configuration.newMetaObject(parameterObject);
+
+                int length = parameterMappings.size();
+                String[] replace = new String[length];
+                String[] replacementList = new String[length];
+
+                for (int i = 0; i < parameterMappings.size(); i++) {
+                    ParameterMapping parameterMapping = parameterMappings.get(i);
+                    replace[i] = "?";
+
+                    String propertyName = parameterMapping.getProperty();
+                    if (metaObject.hasGetter(propertyName)) {
+                        Object obj = metaObject.getValue(propertyName);
+                        replacementList[i] = Matcher.quoteReplacement(getParameterValue(obj));
+                    } else if (boundSql.hasAdditionalParameter(propertyName)) {
+                        // 该分支是动态sql
+                        Object obj = boundSql.getAdditionalParameter(propertyName);
+                        replacementList[i] = Matcher.quoteReplacement(getParameterValue(obj));
+                    } else {
+                        //打印出缺失，提醒该参数缺失并防止错位
+                        replacementList[i] = "缺失";
+                    }
+                }
+
+                sql = StringUtil.replaceOneByOne(sql, replace, replacementList);
+            }
+        }
+        return sql;
+    }
+
+}
\ No newline at end of file
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/config/mybatis/JsonObjectTypeHandler.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/config/mybatis/JsonObjectTypeHandler.java
new file mode 100644
index 0000000..6f9bfc9
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/config/mybatis/JsonObjectTypeHandler.java
@@ -0,0 +1,19 @@
+package cn.pluss.platform.config.mybatis;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
+import org.apache.ibatis.type.JdbcType;
+import org.apache.ibatis.type.MappedJdbcTypes;
+import org.apache.ibatis.type.MappedTypes;
+
+/**
+ * @author DJH
+ */
+@MappedTypes(JSONObject.class)
+@MappedJdbcTypes(JdbcType.LONGVARCHAR)
+public class JsonObjectTypeHandler extends FastjsonTypeHandler {
+
+    public JsonObjectTypeHandler() {
+        super(JSONObject.class);
+    }
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/AccountMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/AccountMapper.java
new file mode 100644
index 0000000..d6fc593
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/AccountMapper.java
@@ -0,0 +1,49 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.Account;
+import cn.pluss.platform.entity.MerchantBaseInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 用户结算信息关联表 Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-10-17
+ */
+public interface AccountMapper extends BaseMapper<Account> {
+
+    /**
+     * 根据结算人身份证号获取小微结算账户数量
+     * @param certNo    身份证号
+     * @return          结算账户数量
+     */
+    Integer selectMicroMbiAccountNum(@Param("certNo") String certNo);
+
+    /**
+     * 根据结算人身份证号获取结算账户数量
+     * @param certNoList    身份证号
+     * @return          结算账户数量
+     */
+    Integer selectAccountNum(@Param("certNoList") List<String> certNoList);
+
+    /**
+     * 获取小微结算人对应的商户数量分组
+     * 其他类型商户得修改查询方法
+     * @return    结算人对应的商户数量
+     */
+    List<Map<String, Object>> selectGroupMaps();
+
+    Integer selectYSAuditSmallCount(@Param("userId") String userId);
+
+    /**
+     * 根据结算身份证号，获取所有相关的用户id
+     * @return
+     */
+    List<MerchantBaseInfo> selectMbiListByCertNo(@Param("certNo") String certNo);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/ActivityActivateMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/ActivityActivateMapper.java
new file mode 100644
index 0000000..b201d62
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/ActivityActivateMapper.java
@@ -0,0 +1,31 @@
+package cn.pluss.platform.mapper;
+
+import java.util.List;
+import java.util.Map;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import cn.pluss.platform.entity.ActivityActivate;
+
+@Mapper
+public interface ActivityActivateMapper extends BaseMapper<ActivityActivate> {
+
+    ActivityActivate queryActivityActivate(ActivityActivate activityActivate);
+
+    List<ActivityActivate> queryActivityActivateList(ActivityActivate activityActivate);
+
+    void updateActivityActivate(ActivityActivate activityActivate);
+    
+    List<ActivityActivate> queryActivityActivatePage(Map map);
+
+    List<ActivityActivate> queryNoActivityActivatePage(Map map);
+
+    Integer queryActivityActivatePageCount(Map map);
+
+    Integer queryNoActivityActivatePageCount(Map map);
+
+    void saveActivityActivateBatch(List<ActivityActivate>  activityActivateList);
+
+    List<Map<String, Object>> getNewestActivityJoin(String storeId);
+}
+
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/ActivityConsumReturnMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/ActivityConsumReturnMapper.java
new file mode 100644
index 0000000..d54f613
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/ActivityConsumReturnMapper.java
@@ -0,0 +1,33 @@
+package cn.pluss.platform.mapper;
+
+import java.util.List;
+import java.util.Map;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import cn.pluss.platform.entity.ActivityConsumReturn;
+
+@Mapper
+public interface ActivityConsumReturnMapper extends BaseMapper<ActivityConsumReturn> {
+
+    ActivityConsumReturn queryActivityConsumReturn(ActivityConsumReturn activityConsumReturn);
+
+    List<ActivityConsumReturn> queryActivityConsumReturnList(ActivityConsumReturn activityConsumReturn);
+
+    void saveActivityConsumReturn(ActivityConsumReturn activityConsumReturn);
+
+    void updateActivityConsumReturn(ActivityConsumReturn activityConsumReturn);
+
+    void deleteActivityConsumReturn(ActivityConsumReturn activityConsumReturn);
+
+    List<ActivityConsumReturn> queryActivityConsumReturnPage(Map<String, Object> map);
+
+    List<ActivityConsumReturn> queryActivityNoConsumReturnPage(Map<String, Object> map);
+
+    Integer queryActivityConsumReturnPageCount(Map<String, Object> map);
+
+    Integer queryActivityNoConsumReturnPageCount(Map<String, Object> map);
+
+    void saveActivityConsumReturnBatch(List<ActivityConsumReturn>  activityConsumReturnList);
+}
+
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/ActivityEnrollMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/ActivityEnrollMapper.java
new file mode 100644
index 0000000..f0e71b3
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/ActivityEnrollMapper.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.ActivityEnroll;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 商户活动报名记录表 Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-11-02
+ */
+public interface ActivityEnrollMapper extends BaseMapper<ActivityEnroll> {
+
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/ActivityRechargeMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/ActivityRechargeMapper.java
new file mode 100644
index 0000000..ae8fe23
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/ActivityRechargeMapper.java
@@ -0,0 +1,30 @@
+package cn.pluss.platform.mapper;
+
+import java.util.List;
+import java.util.Map;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import cn.pluss.platform.entity.ActivityRecharge;
+
+/**
+ * @author DJH
+ */
+@Mapper
+public interface ActivityRechargeMapper extends BaseMapper<ActivityRecharge> {
+
+    List<ActivityRecharge> queryActivityRechargeList(ActivityRecharge activityRecharge);
+
+    List<ActivityRecharge> queryActivityRechargePage(Map<String, Object> map);
+
+    List<ActivityRecharge> queryActivityNoRechargePage(Map<String, Object> map);
+
+    Integer queryActivityRechargePageCount(Map<String, Object> map);
+
+    Integer queryActivityNoRechargePageCount(Map<String, Object> map);
+
+    void saveActivityRechargeBatch(List<ActivityRecharge> activityRechargeList);
+
+    List<ActivityRecharge> queryUsableActivityRechageList(ActivityRecharge activityRecharge);
+}
+
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/ActivityRecommendMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/ActivityRecommendMapper.java
new file mode 100644
index 0000000..04493e5
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/ActivityRecommendMapper.java
@@ -0,0 +1,27 @@
+package cn.pluss.platform.mapper;
+
+import java.util.List;
+import java.util.Map;
+import org.apache.ibatis.annotations.Mapper;
+import cn.pluss.platform.entity.ActivityRecommend;
+
+@Mapper
+public interface ActivityRecommendMapper {
+
+    public ActivityRecommend queryActivityRecommend(ActivityRecommend activityRecommend);
+
+    public List<ActivityRecommend> queryActivityRecommendList(ActivityRecommend activityRecommend);
+
+    public void saveActivityRecommend(ActivityRecommend activityRecommend);
+
+    public void updateActivityRecommend(ActivityRecommend activityRecommend);
+
+    public void deleteActivityRecommend(ActivityRecommend activityRecommend);
+
+    public List<ActivityRecommend> queryActivityRecommendPage(Map map);
+
+    public Integer queryActivityRecommendPageCount(Map map);
+
+    public void saveActivityRecommendBatch(List<ActivityRecommend>  activityRecommendList);
+}
+
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/AgentInfoMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/AgentInfoMapper.java
new file mode 100644
index 0000000..41ca389
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/AgentInfoMapper.java
@@ -0,0 +1,38 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.vo.AgentInfo;
+import cn.pluss.platform.vo.AgentStaffVO;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface AgentInfoMapper {
+
+    List<List<?>> selectPage(@Param("agentInfo") AgentInfo agentInfo, @Param("page") JSONObject page);
+
+    List<List<?>> selectPermissionPage(@Param("agentInfo") AgentInfo agentInfo, @Param("page") JSONObject page);
+
+    Long selectPageCount(@Param("agentInfo") AgentInfo agentInfo);
+
+    List<List<?>> selectSubAgentPage(@Param("agentInfo") AgentInfo agentInfo, @Param("page") JSONObject page);
+
+    Long selectSubAgentPageCount(@Param("agentInfo") AgentInfo agentInfo);
+
+    AgentInfo selectOne(@Param("agentInfo") AgentInfo agentInfo);
+
+    /**
+     * 查询当月、上月收益
+     * @return
+     */
+    List<AgentInfo> selectRecentMonthPrice();
+
+    /**
+     * 分页查询业务员信息
+     * @param page      分页信息
+     * @param agentStaffVO
+     * @return
+     */
+    Page<AgentStaffVO> selectStaffPage(Page<AgentStaffVO> page, @Param("agentStaffVO") AgentStaffVO agentStaffVO);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/AgentMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/AgentMapper.java
new file mode 100644
index 0000000..e6a6d5e
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/AgentMapper.java
@@ -0,0 +1,23 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.vo.AgentInfo;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+
+public interface AgentMapper {
+
+    /**
+     * 分页查询
+     * @param page
+     * @param agentInfo
+     * @return
+     */
+    Page<AgentInfo> selectPage(Page<AgentInfo> page, @Param("agentInfo") AgentInfo agentInfo);
+
+    /**
+     * 查询
+     * @param agentInfo
+     * @return
+     */
+    AgentInfo selectOne(@Param("agentInfo") AgentInfo agentInfo);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/AgreementMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/AgreementMapper.java
new file mode 100644
index 0000000..72b39ba
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/AgreementMapper.java
@@ -0,0 +1,27 @@
+package cn.pluss.platform.mapper;
+
+import java.util.List;
+import java.util.Map;
+import org.apache.ibatis.annotations.Mapper;
+import cn.pluss.platform.entity.Agreement;
+
+@Mapper
+public interface AgreementMapper {
+
+    public Agreement queryAgreement(Agreement agreement);
+
+    public List<Agreement> queryAgreementList(Agreement agreement);
+
+    public void saveAgreement(Agreement agreement);
+
+    public void updateAgreement(Agreement agreement);
+
+    public void deleteAgreement(Agreement agreement);
+
+    public List<Agreement> queryAgreementPage(Map map);
+
+    public Integer queryAgreementPageCount(Map map);
+
+    public void saveAgreementBatch(List<Agreement>  agreementList);
+}
+
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/AliMccMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/AliMccMapper.java
new file mode 100644
index 0000000..f2269e8
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/AliMccMapper.java
@@ -0,0 +1,40 @@
+package cn.pluss.platform.mapper;
+
+import java.util.List;
+import java.util.Map;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import cn.pluss.platform.entity.AliMcc;
+
+@Mapper
+public interface AliMccMapper {
+
+    public AliMcc queryAliMcc(AliMcc aliMcc);
+
+    public List<AliMcc> queryAliMccList(AliMcc aliMcc);
+
+    public void saveAliMcc(AliMcc aliMcc);
+
+    public void updateAliMcc(AliMcc aliMcc);
+
+    public void deleteAliMcc(AliMcc aliMcc);
+
+    public List<AliMcc> queryAliMccPage(Map map);
+
+    public Integer queryAliMccPageCount(Map map);
+
+    public void saveAliMccBatch(List<AliMcc>  aliMccList);
+    
+    /**
+	 * 
+	 * queryMcc:(查询支付宝mccCode). <br/> 
+	 * 
+	 * @author Administrator 
+	 * @param mccCode
+	 * @return 
+	 * @since JDK 1.8
+	 */
+	public  String queryMccCode(@Param(value="mccCode") String mccCode);
+}
+
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/AppGuideMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/AppGuideMapper.java
new file mode 100644
index 0000000..1e40f5e
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/AppGuideMapper.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.AppGuide;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * app引导页 Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-06-03
+ */
+public interface AppGuideMapper extends BaseMapper<AppGuide> {
+
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/AppMenuMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/AppMenuMapper.java
new file mode 100644
index 0000000..1320114
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/AppMenuMapper.java
@@ -0,0 +1,24 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.AppMenu;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * app页面菜单 Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-09-27
+ */
+public interface AppMenuMapper extends BaseMapper<AppMenu> {
+
+    List<AppMenu> getByNavCodeAll(@Param("navCode") String navCode,@Param("userType") String userType);
+
+    List<AppMenu> getByNavCode(@Param("navCode") String navCode,@Param("userType") String userType);
+
+    List<AppMenu> getByNavCode(@Param("navCode") String navCode,@Param("userType") String userType, @Param("clientType") int clientType);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/AppMenuUserTypeMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/AppMenuUserTypeMapper.java
new file mode 100644
index 0000000..8d7d613
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/AppMenuUserTypeMapper.java
@@ -0,0 +1,11 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.AppMenuUserType;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface AppMenuUserTypeMapper extends BaseMapper<AppMenuUserType> {
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/AppVersionInfoMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/AppVersionInfoMapper.java
new file mode 100644
index 0000000..aa89c42
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/AppVersionInfoMapper.java
@@ -0,0 +1,11 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.AppVersionInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface AppVersionInfoMapper extends BaseMapper<AppVersionInfo> {
+    Page<AppVersionInfo> pageData(Page<AppVersionInfo> page, AppVersionInfo appVersionInfo);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/AppletInfoMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/AppletInfoMapper.java
new file mode 100644
index 0000000..07353fd
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/AppletInfoMapper.java
@@ -0,0 +1,24 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.AppletInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * <p>
+ * 小程序配置信息 Mapper 接口
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-04-20
+ */
+public interface AppletInfoMapper extends BaseMapper<AppletInfo> {
+
+    /**
+     * 获取小程序配置信息
+     * @param appid
+     * @return
+     */
+    @Select("SELECT * FROM tb_pluss_applet_info WHERE appid = #{appid}")
+    AppletInfo getAppletInfoByAppId(String appid);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/AreaCityMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/AreaCityMapper.java
new file mode 100644
index 0000000..a5ea933
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/AreaCityMapper.java
@@ -0,0 +1,54 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.AreaCity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 城市区域mapper
+ */
+@Mapper
+public  interface AreaCityMapper extends BaseMapper<AreaCity> {
+
+    List<AreaCity> queryProvince();
+
+    List<AreaCity> queryOnlyProvince();
+
+    AreaCity getAreaCityByProvince(String areaCode);
+    
+    /**
+     * @description:
+     * @date: 2022/2/25 11:06 
+ * @param areaCode:
+ * @return java.util.List<cn.pluss.platform.entity.AreaCity>
+     */
+    List<AreaCity> queryCity(String areaCode);
+
+    /**
+     * 获取区域信息
+     * @date: 2022/2/25 11:06
+     * @param provinceName:
+     * @param cityName:
+     * @param areaName:
+     * @param type:
+     * @return java.util.Map<java.lang.String,java.lang.String>
+     */
+    Map<String, String> getAreaCodeByName(@Param("provinceName") String provinceName,
+                                          @Param("cityName")String cityName,
+                                          @Param("areaName")String areaName,
+                                          @Param("type") String type);
+
+    /**
+     * 查询下级区域信息
+     * @date: 2022/2/25 11:05
+     * @param areaCode:
+     * @return java.util.List<cn.pluss.platform.entity.AreaCity>
+     */
+    @Select("select id,type,areaName,parentAreaCode,areaCode from tb_pluss_area_city where parentAreaCode = #{areaCode} ")
+    List<AreaCity> queryParentCode(String areaCode);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/AreaMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/AreaMapper.java
new file mode 100644
index 0000000..5feda00
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/AreaMapper.java
@@ -0,0 +1,29 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.Area;
+import cn.pluss.platform.leshua.LeshuaArea;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface AreaMapper {
+
+    LeshuaArea queryArea(Area area);
+
+    List<LeshuaArea> queryAreaList(Area area);
+
+    void saveArea(Area area);
+
+    void updateArea(Area area);
+
+    void deleteArea(Area area);
+
+    List<LeshuaArea> queryAreaPage(Map map);
+
+    Integer queryAreaPageCount(Map map);
+
+    void saveAreaBatch(List<Area>  areaList);
+}
+
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/Bank4CacheMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/Bank4CacheMapper.java
new file mode 100644
index 0000000..ea0cc66
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/Bank4CacheMapper.java
@@ -0,0 +1,7 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.Bank4Cache;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+public interface Bank4CacheMapper extends BaseMapper<Bank4Cache> {
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/BankCardMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/BankCardMapper.java
new file mode 100644
index 0000000..7064129
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/BankCardMapper.java
@@ -0,0 +1,26 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.BankCard;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * <p>
+ * 银行卡信息 Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-10-16
+ */
+public interface BankCardMapper extends BaseMapper<BankCard> {
+
+    /**
+     * 获取未关联结算信息的对私结算银行卡信息
+     *
+     * @param userId 用户id
+     * @return 银行卡信息
+     */
+    @Select("SELECT * FROM tb_pluss_bank_card bc LEFT JOIN tb_pluss_account acc ON acc.userId = bc.userId AND acc.idCardId = bc.id WHERE acc.id IS NULL AND bc.userType = '01'")
+    BankCard getUnusedBankCard(@Param("userId") String userId);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/BankCodeSxfMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/BankCodeSxfMapper.java
new file mode 100644
index 0000000..5a69480
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/BankCodeSxfMapper.java
@@ -0,0 +1,13 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.BankCodeSxf;
+import cn.pluss.platform.leshua.BankNameVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface BankCodeSxfMapper extends BaseMapper<BankCodeSxf> {
+
+    List<BankNameVO> getBranchName(@Param(value="areaCode")String areaCode, @Param(value="provinceCode")String provinceCode, @Param(value="bankName")String bankName, @Param(value="branchName")String branchName);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/BankCodeYsMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/BankCodeYsMapper.java
new file mode 100644
index 0000000..b621cf3
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/BankCodeYsMapper.java
@@ -0,0 +1,27 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.BankCodeYs;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import lombok.val;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-07-07
+ */
+public interface BankCodeYsMapper extends BaseMapper<BankCodeYs> {
+
+    /**
+     * 根据支行联行号获取对应的银行信息
+     * @param contactLine   联行号
+     * @return
+     */
+    default BankCodeYs selectByContactLine(String contactLine) {
+        val qWrapper = new LambdaQueryWrapper<BankCodeYs>().eq(BankCodeYs::getContactLine, contactLine);
+        return selectOne(qWrapper);
+    }
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/BankUnionpayCodeMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/BankUnionpayCodeMapper.java
new file mode 100644
index 0000000..617dbca
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/BankUnionpayCodeMapper.java
@@ -0,0 +1,78 @@
+package cn.pluss.platform.mapper;
+
+import java.util.List;
+import java.util.Map;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import cn.pluss.platform.entity.BankUnionpayCode;
+import cn.pluss.platform.leshua.BankNameVO;
+import cn.pluss.platform.leshua.CityVO;
+import cn.pluss.platform.leshua.ProvinceVO;
+
+@Mapper
+public interface BankUnionpayCodeMapper {
+
+    BankUnionpayCode queryBankUnionpayCode(BankUnionpayCode bankUnionpayCode);
+
+    List<BankUnionpayCode> queryBankUnionpayCodeList(BankUnionpayCode bankUnionpayCode);
+
+    void saveBankUnionpayCode(BankUnionpayCode bankUnionpayCode);
+
+    void updateBankUnionpayCode(BankUnionpayCode bankUnionpayCode);
+
+    void deleteBankUnionpayCode(BankUnionpayCode bankUnionpayCode);
+
+    List<BankUnionpayCode> queryBankUnionpayCodePage(Map map);
+
+    Integer queryBankUnionpayCodePageCount(Map map);
+
+    void saveBankUnionpayCodeBatch(List<BankUnionpayCode>  bankUnionpayCodeList);
+    
+    /**
+     * 
+     * getBankNameList:(查询银行). <br/> 
+     *
+     * @author Administrator 
+     * @return 
+     * @since JDK 1.8
+     */
+    List<String> getBankNameList();
+    
+    /**
+     * 
+     * getProvince:(查询省份). <br/> 
+     *
+     * @author Administrator 
+     * @return 
+     * @since JDK 1.8
+     */
+    List<ProvinceVO> getProvince();
+    
+    
+    /**
+     * 
+     * getCity:(省下面的市). <br/> 
+     *
+     * @author Administrator 
+     * @param provinceCode 省份
+     * @return 
+     * @since JDK 1.8
+     */
+    List<CityVO> getCity(@Param(value="provinceCode")String provinceCode);
+    
+    /**
+     * 
+     * getBranchName:(根据省市 银行名称 查询支行). <br/> 
+     *
+     * @author Administrator 
+     * @param areaCode 市
+     * @param provinceCode 省份
+     * @param bankName
+     * @return 
+     * @since JDK 1.8
+     */
+    List<BankNameVO> getBranchName(@Param(value="areaCode")String areaCode,@Param(value="provinceCode")String provinceCode,@Param(value="bankName")String bankName,@Param(value="brankName")String brankName);
+    
+}
+
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/BannerMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/BannerMapper.java
new file mode 100644
index 0000000..f38331d
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/BannerMapper.java
@@ -0,0 +1,29 @@
+package cn.pluss.platform.mapper;
+
+import java.util.List;
+import java.util.Map;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import cn.pluss.platform.entity.Banner;
+
+@Mapper
+public interface BannerMapper extends BaseMapper<Banner> {
+
+    Banner queryBanner(Banner banner);
+
+    List<Banner> queryBannerList(Banner banner);
+
+    void saveBanner(Banner banner);
+
+    void updateBanner(Banner banner);
+
+    void deleteBanner(Banner banner);
+
+    List<Banner> queryBannerPage(Map map);
+
+    Integer queryBannerPageCount(Map map);
+
+    void saveBannerBatch(List<Banner> bannerList);
+}
+
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/BestNewActivityMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/BestNewActivityMapper.java
new file mode 100644
index 0000000..10f98e8
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/BestNewActivityMapper.java
@@ -0,0 +1,29 @@
+package cn.pluss.platform.mapper;
+
+import java.util.List;
+import java.util.Map;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import cn.pluss.platform.entity.BestNewActivity;
+
+@Mapper
+public interface BestNewActivityMapper extends BaseMapper<BestNewActivity> {
+
+    BestNewActivity queryBestNewActivity(BestNewActivity bestNewActivity);
+
+    List<BestNewActivity> queryBestNewActivityList(BestNewActivity bestNewActivity);
+
+    void saveBestNewActivity(BestNewActivity bestNewActivity);
+
+    void updateBestNewActivity(BestNewActivity bestNewActivity);
+
+    void deleteBestNewActivity(BestNewActivity bestNewActivity);
+
+    List<BestNewActivity> queryBestNewActivityPage(Map map);
+
+    Integer queryBestNewActivityPageCount(Map map);
+
+    void saveBestNewActivityBatch(List<BestNewActivity> bestNewActivityList);
+}
+
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/BillSendRecordMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/BillSendRecordMapper.java
new file mode 100644
index 0000000..ec5054c
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/BillSendRecordMapper.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.BillSendRecord;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-05-10
+ */
+public interface BillSendRecordMapper extends BaseMapper<BillSendRecord> {
+
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/BillStatisticsMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/BillStatisticsMapper.java
new file mode 100644
index 0000000..5649e3d
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/BillStatisticsMapper.java
@@ -0,0 +1,62 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.vo.MemberOrderStatisticsVO;
+import cn.pluss.platform.vo.MemberOrderVO;
+import cn.pluss.platform.vo.MerchantOrderExportVO;
+import cn.pluss.platform.vo.BillStatisticsVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author Djh
+ */
+public interface BillStatisticsMapper {
+
+    /**
+     * 账单统计
+     * @param merchantCode  商编
+     * @param startDate     起始时间
+     * @param endDate       截止时间
+     * @return
+     */
+    List<BillStatisticsVO> selectBillStatistics(@Param("merchantCode") String merchantCode, @Param("startDate") Date startDate, @Param("endDate") Date endDate);
+
+    /**
+     * 账单列表信息
+     * @param merchantCode  商编
+     * @param startDate     起始时间
+     * @param endDate       截止时间
+     * @return
+     */
+    List<MerchantOrderExportVO> selectBillList(@Param("merchantCode") String merchantCode, @Param("startDate") Date startDate, @Param("endDate") Date endDate);
+
+    /**
+     * 会员账单列表
+     * @param merchantCode  商编
+     * @param startDate     起始时间
+     * @param endDate       截止时间
+     * @return
+     */
+    List<MemberOrderVO> selectMemberBillList(@Param("merchantCode") String merchantCode, @Param("startDate") Date startDate, @Param("endDate") Date endDate);
+
+    /**
+     * 会员账单统计
+     * @param merchantCode  商编
+     * @param startDate     起始时间
+     * @param endDate       截止时间
+     * @return
+     */
+    List<MemberOrderStatisticsVO> selectMemberBillStatistics(@Param("merchantCode") String merchantCode, @Param("startDate") Date startDate, @Param("endDate") Date endDate);
+
+    /**
+     * 员工账单统计
+     * @param merchantCode  商编
+     * @param startDate     起始时间
+     * @param endDate       截止时间
+     * @return
+     */
+    List<BillStatisticsVO> selectStaffBillStatistics(@Param("merchantCode") String merchantCode, @Param("startDate") Date startDate, @Param("endDate") Date endDate);
+
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/BusinessInfoMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/BusinessInfoMapper.java
new file mode 100644
index 0000000..e540b9d
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/BusinessInfoMapper.java
@@ -0,0 +1,12 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.vo.BusinessInfoVo;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface BusinessInfoMapper {
+
+    Page<BusinessInfoVo> selectPage(Page<BusinessInfoVo> page, @Param("businessInfoVo") BusinessInfoVo businessInfoVo);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/CacheInfoMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/CacheInfoMapper.java
new file mode 100644
index 0000000..15decfc
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/CacheInfoMapper.java
@@ -0,0 +1,25 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.CacheInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * <p>
+ * 缓存信息表 Mapper 接口
+ * </p>
+ *
+ * @author bzg
+ * @since 2021-09-24
+ */
+public interface CacheInfoMapper extends BaseMapper<CacheInfo> {
+
+    /**
+     * 获取生活圈缓存的数据
+     * @date: 2021/12/7 17:02
+     * @param keyCode:
+     * @return java.lang.String
+     */
+    @Select("SELECT `value` from `syblife`.ims_core_cache  where `key` = #{keyCode}")
+    String getShqCacheInfoByKeyCode(String keyCode);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/CallbackDataMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/CallbackDataMapper.java
new file mode 100644
index 0000000..13dd4c3
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/CallbackDataMapper.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.CallbackData;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 表原始数据记录，用于不明确的回调数据的统计 Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-09-10
+ */
+public interface CallbackDataMapper extends BaseMapper<CallbackData> {
+
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/CashAccountMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/CashAccountMapper.java
new file mode 100644
index 0000000..490869e
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/CashAccountMapper.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.CashAccount;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author bzg
+ * @since 2021-07-23
+ */
+public interface CashAccountMapper extends BaseMapper<CashAccount> {
+
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/CashMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/CashMapper.java
new file mode 100644
index 0000000..1f842d4
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/CashMapper.java
@@ -0,0 +1,75 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.Cash;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface CashMapper extends BaseMapper<Cash> {
+
+    List<Cash> queryCashPage(Map<String, Object> map);
+
+    IPage<Cash> queryCashPage2(IPage<Cash> page, @Param(Constants.WRAPPER) Wrapper<Cash> wrapper);
+
+    Integer queryCashPageCount(Map<String, Object> map);
+
+    /**
+     * 已经成功提现的金额/申请提现中的金额(粉丝分润)
+     *
+     * @param map
+     * @return
+     */
+    Double sumFansSuccessCash(Map<String, Object> map);
+
+    /**
+     * 已经成功提现(粉丝分润)
+     *
+     * @return
+     */
+    Double sumFansAreadlyCash(Map<String, Object> map);
+
+
+    /**
+     * 已经成功提现的金额/申请提现中的金额(推广分润)
+     *
+     * @return
+     */
+    Double sumMerChantSuccessCash(@Param(value = "userId") Long userId);
+
+    /**
+     * 已经成功提现(推广分润)
+     *
+     * @return
+     */
+    Double sumMerChantAreadlyCash(@Param(value = "userId") Long userId);
+
+    @Select("SELECT * FROM tb_pluss_cash WHERE id = #{id} FOR UPDATE")
+    Cash selectLockById(@Param(value = "id") Serializable id);
+
+    /**
+     * @param params:
+     * @return java.util.Map<java.lang.String, java.lang.Object>
+     * @description:统计提现信息记录
+     * @date: 2021/10/15 16:39
+     */
+    Map<String, Object> getCashCountData(Map<String, Object> params);
+
+    /**
+     * 查询提现总金额
+     *
+     * @param userId 用户id
+     * @return 提现总金额
+     */
+    BigDecimal selectCashAmtTotal(@Param("userId") String userId, @Param("statusArr") int... statusArr);
+}
+
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/CommonMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/CommonMapper.java
new file mode 100644
index 0000000..2ce55f9
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/CommonMapper.java
@@ -0,0 +1,7 @@
+package cn.pluss.platform.mapper;
+
+/**
+ * @author SSS
+ */
+public class CommonMapper {
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/CommonRemarkMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/CommonRemarkMapper.java
new file mode 100644
index 0000000..63e7b72
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/CommonRemarkMapper.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.CommonRemark;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 通用备注表，存储一些通用备注 Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-06-24
+ */
+public interface CommonRemarkMapper extends BaseMapper<CommonRemark> {
+
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/CommonSwitchMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/CommonSwitchMapper.java
new file mode 100644
index 0000000..0503238
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/CommonSwitchMapper.java
@@ -0,0 +1,9 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.CommonSwitch;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+
+public interface CommonSwitchMapper extends BaseMapper<CommonSwitch> {
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/DeviceBsjMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/DeviceBsjMapper.java
new file mode 100644
index 0000000..5c2ffb5
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/DeviceBsjMapper.java
@@ -0,0 +1,20 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.DeviceBsj;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-05-09
+ */
+public interface DeviceBsjMapper extends BaseMapper<DeviceBsj> {
+
+    List<Map<String, Object>> selectLastMonthExpiredData();
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/DeviceDetailMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/DeviceDetailMapper.java
new file mode 100644
index 0000000..90eaca3
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/DeviceDetailMapper.java
@@ -0,0 +1,34 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.DeviceDetail;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Param;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * [设备展示表] Mapper 接口
+ * </p>
+ *
+ * @author bzg
+ * @since 2020-11-12
+ */
+public interface DeviceDetailMapper extends BaseMapper<DeviceDetail> {
+
+    /**
+     * 获取设备详情
+     * @param wrapper
+     * @return
+     */
+    List<DeviceDetail> selectListWithStock(@Param(Constants.WRAPPER) QueryWrapper<DeviceDetail> wrapper);
+
+    /**
+     * 获取设备详情
+     * @param wrapper
+     * @return
+     */
+    List<DeviceDetail> selectListWithStockWithNoDetail(@Param(Constants.WRAPPER) QueryWrapper<DeviceDetail> wrapper);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/DeviceGoodTagMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/DeviceGoodTagMapper.java
new file mode 100644
index 0000000..e1a8242
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/DeviceGoodTagMapper.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.DeviceGoodTag;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 商品标签表 Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-04-21
+ */
+public interface DeviceGoodTagMapper extends BaseMapper<DeviceGoodTag> {
+
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/DeviceGoodsMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/DeviceGoodsMapper.java
new file mode 100644
index 0000000..f7f7d17
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/DeviceGoodsMapper.java
@@ -0,0 +1,27 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.DeviceGoods;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * <p>
+ * 设备商品展示表 Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-11-11
+ */
+public interface DeviceGoodsMapper extends BaseMapper<DeviceGoods> {
+
+    /**
+     * 根据sn码查询商城展示基本信息
+     * @param snNo
+     * @return
+     */
+    DeviceGoods selectBySn(@Param("snNo") String snNo);
+
+    @Select("SELECT * FROM tb_pluss_device_goods WHERE `code` = #{code}")
+    DeviceGoods getByCode(String code);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/DeviceMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/DeviceMapper.java
new file mode 100644
index 0000000..9c4ed2c
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/DeviceMapper.java
@@ -0,0 +1,35 @@
+package cn.pluss.platform.mapper;
+
+import java.util.List;
+import java.util.Map;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Mapper;
+import cn.pluss.platform.entity.Device;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface DeviceMapper extends BaseMapper<Device> {
+
+    public Device queryDevice(Device device);
+
+    public List<Device> queryDeviceList(Device device);
+
+    public void saveDevice(Device device);
+
+    public void updateDevice(Device device);
+
+    public void deleteDevice(Device device);
+
+    public List<Device> queryDevicePage(Map map);
+
+    public Integer queryDevicePageCount(Map map);
+
+    public void saveDeviceBatch(List<Device>  deviceList);
+
+    Page<Device> pageDate(Page<Device> page, @Param("device") Device device);
+
+    Device getDeviceId(Integer id);
+}
+
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/DeviceMerchantBuyDetailMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/DeviceMerchantBuyDetailMapper.java
new file mode 100644
index 0000000..8bb2801
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/DeviceMerchantBuyDetailMapper.java
@@ -0,0 +1,41 @@
+package cn.pluss.platform.mapper;
+
+import java.util.List;
+import java.util.Map;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import cn.pluss.platform.entity.DeviceMerchantBuyDetail;
+import cn.pluss.platform.vo.DeviceMerchantBuyDetailVO;
+
+@Mapper
+public interface DeviceMerchantBuyDetailMapper {
+
+    public DeviceMerchantBuyDetail queryDeviceMerchantBuyDetail(DeviceMerchantBuyDetail deviceMerchantBuyDetail);
+
+    public List<DeviceMerchantBuyDetail> queryDeviceMerchantBuyDetailList(DeviceMerchantBuyDetail deviceMerchantBuyDetail);
+
+    public void saveDeviceMerchantBuyDetail(DeviceMerchantBuyDetail deviceMerchantBuyDetail);
+
+    public void updateDeviceMerchantBuyDetail(DeviceMerchantBuyDetail deviceMerchantBuyDetail);
+
+    public void deleteDeviceMerchantBuyDetail(DeviceMerchantBuyDetail deviceMerchantBuyDetail);
+
+    public List<DeviceMerchantBuyDetail> queryDeviceMerchantBuyDetailPage(Map map);
+
+    public Integer queryDeviceMerchantBuyDetailPageCount(Map map);
+
+    public void saveDeviceMerchantBuyDetailBatch(List<DeviceMerchantBuyDetail>  deviceMerchantBuyDetailList);
+    
+    /**
+     * 
+     * queryDeviceMerchantBuyDetailVO:(是否绑定激活). <br/> 
+     * 
+     * @author Administrator 
+     * @param orderNo
+     * @return 
+     * @since JDK 1.8
+     */
+    public List<DeviceMerchantBuyDetailVO> queryDeviceMerchantBuyDetailVO(@Param(value="orderNo")String orderNo);
+}
+
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/DeviceMerchantBuyMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/DeviceMerchantBuyMapper.java
new file mode 100644
index 0000000..75595f3
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/DeviceMerchantBuyMapper.java
@@ -0,0 +1,65 @@
+package cn.pluss.platform.mapper;
+
+import java.util.List;
+import java.util.Map;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Mapper;
+import cn.pluss.platform.entity.DeviceMerchantBuy;
+import cn.pluss.platform.vo.DeviceMerchantBuyVO;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface DeviceMerchantBuyMapper extends BaseMapper<DeviceMerchantBuy> {
+
+    DeviceMerchantBuy queryDeviceMerchantBuy(DeviceMerchantBuy deviceMerchantBuy);
+
+    List<DeviceMerchantBuy> queryDeviceMerchantBuyList(DeviceMerchantBuy deviceMerchantBuy);
+
+    void saveDeviceMerchantBuy(DeviceMerchantBuy deviceMerchantBuy);
+
+    void updateDeviceMerchantBuy(DeviceMerchantBuy deviceMerchantBuy);
+
+    void deleteDeviceMerchantBuy(DeviceMerchantBuy deviceMerchantBuy);
+
+    List<DeviceMerchantBuy> queryDeviceMerchantBuyPage(Map map);
+
+    /**
+     * 查询分页数据
+     * @param page      分页信息
+     * @param wrapper   查询条件
+     * @return
+     */
+    Page<DeviceMerchantBuy> selectDeviceMerchantBuyPage(Page<DeviceMerchantBuy> page, @Param(Constants.WRAPPER) QueryWrapper<DeviceMerchantBuy> wrapper);
+
+    Integer queryDeviceMerchantBuyPageCount(Map map);
+
+    void saveDeviceMerchantBuyBatch(List<DeviceMerchantBuy> deviceMerchantBuyList);
+
+    /**
+     * deviceOrderShowPage:(订单回显). <br/>
+     *
+     * @param map
+     * @return
+     *
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    List<DeviceMerchantBuyVO> deviceOrderShowPage(Map<String, Object> map);
+
+    /**
+     * deviceOrderShowPageCount:(订单回显条数统计). <br/>
+     *
+     * @param map
+     * @return
+     *
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    Integer deviceOrderShowPageCount(Map<String, Object> map);
+
+}
+
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/DeviceOperateInfoMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/DeviceOperateInfoMapper.java
new file mode 100644
index 0000000..178ad55
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/DeviceOperateInfoMapper.java
@@ -0,0 +1,29 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.DeviceOperateInfo;
+import cn.pluss.platform.vo.DeviceOperateInfoVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 设备信息流转表 Mapper 接口
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-04-02
+ */
+public interface DeviceOperateInfoMapper extends BaseMapper<DeviceOperateInfo> {
+
+    /**
+     * 查询设备号查询指定设备流转详情
+     * @param snNo
+     * @return
+     */
+    List<DeviceOperateInfoVO> selectListVo(String snNo);
+
+    Page<DeviceOperateInfoVO> pageInfo(Page<DeviceOperateInfoVO> page, @Param("condition") DeviceOperateInfo condition);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/DeviceOrderInfoMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/DeviceOrderInfoMapper.java
new file mode 100644
index 0000000..183a61b
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/DeviceOrderInfoMapper.java
@@ -0,0 +1,22 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.DeviceOrderInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 设备商城，订单记录表 Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-11-13
+ */
+public interface DeviceOrderInfoMapper extends BaseMapper<DeviceOrderInfo> {
+
+    @Select("SELECT * FROM tb_pluss_device_order_info WHERE orderNo = #{orderNo} limit 1 ")
+    DeviceOrderInfo getDeviceInfoByOrderNo(String orderNo);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/DeviceSignUnbindMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/DeviceSignUnbindMapper.java
new file mode 100644
index 0000000..5b3fd30
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/DeviceSignUnbindMapper.java
@@ -0,0 +1,35 @@
+package cn.pluss.platform.mapper;
+
+import java.util.List;
+import java.util.Map;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Mapper;
+import cn.pluss.platform.entity.DeviceSignUnbind;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface DeviceSignUnbindMapper extends BaseMapper<DeviceSignUnbind> {
+
+    DeviceSignUnbind queryDeviceSignUnbind(DeviceSignUnbind deviceSignUnbind);
+
+    List<DeviceSignUnbind> queryDeviceSignUnbindList(DeviceSignUnbind deviceSignUnbind);
+
+    void saveDeviceSignUnbind(DeviceSignUnbind deviceSignUnbind);
+
+    void updateDeviceSignUnbind(DeviceSignUnbind deviceSignUnbind);
+
+    void deleteDeviceSignUnbind(DeviceSignUnbind deviceSignUnbind);
+
+    Page<DeviceSignUnbind> selectPageWithMerchantInfo(Page<DeviceSignUnbind> page, @Param(Constants.WRAPPER) Wrapper<Object> queryWrapper);
+
+    List<DeviceSignUnbind> queryDeviceSignUnbindPage(Map map);
+
+    Integer queryDeviceSignUnbindPageCount(Map map);
+
+    void saveDeviceSignUnbindBatch(List<DeviceSignUnbind> deviceSignUnbindList);
+}
+
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/DeviceSpecMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/DeviceSpecMapper.java
new file mode 100644
index 0000000..cd53fc5
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/DeviceSpecMapper.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.DeviceSpec;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 设备规格表 Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-03-04
+ */
+public interface DeviceSpecMapper extends BaseMapper<DeviceSpec> {
+
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/DeviceStockGroupMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/DeviceStockGroupMapper.java
new file mode 100644
index 0000000..43cf6cb
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/DeviceStockGroupMapper.java
@@ -0,0 +1,7 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.DeviceStockGroup;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+public interface DeviceStockGroupMapper extends BaseMapper<DeviceStockGroup> {
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/DeviceStockMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/DeviceStockMapper.java
new file mode 100644
index 0000000..a70aef2
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/DeviceStockMapper.java
@@ -0,0 +1,70 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.dto.DeviceStockDTO;
+import cn.pluss.platform.entity.DeviceStock;
+import cn.pluss.platform.vo.DeviceStockVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author bzg
+ * @since 2020-11-11
+ */
+public interface DeviceStockMapper extends BaseMapper<DeviceStock> {
+
+    /**
+     * 查询库存信息
+     * @param groupNoList  商品code
+     * @return
+     */
+    List<Map<String, Object>> selectStockInfoList(@Param("groupNoList") List<String> groupNoList);
+
+    /**
+     * 查询已售库存信息
+     * @param groupNoList  商品code
+     * @return
+     */
+    List<Map<String, Object>> selectSoldStockList(@Param("groupNoList") List<String> groupNoList);
+
+    /**
+     * 获取用户设备统计信息
+     * @param dto
+     * @return
+     */
+    List<DeviceStockVO> getStockTypeNumList(DeviceStockDTO dto);
+
+    /**
+     * 分页查询指定设备类型设备信息
+     * @param page
+     * @param dto
+     * @return
+     */
+    Page<DeviceStockVO> pageInfo(Page<DeviceStockVO> page, @Param("dto") DeviceStockDTO dto);
+
+    DeviceStockVO detail(DeviceStockDTO dto);
+
+    /**
+     * 获取商户信息
+     * @param dto
+     * @return
+     */
+    DeviceStockVO getMercInfo(DeviceStockDTO dto);
+
+    @Select("SELECT * FROM tb_pluss_device_stock where snNo = #{snNo} limit 1")
+    DeviceStock getDeviceBySnNo(String snNo);
+
+
+    Page<DeviceStockVO> pageDeviceStock(Page<DeviceStockVO> page, @Param("userId") Long userId, @Param("cashPlaceId") Long cashPlaceId);
+
+    @Select("SELECT * FROM tb_pluss_device_stock where deviceNo = #{deviceNo} limit 1")
+    DeviceStock getDeviceByDeviceNo(@Param("deviceNo") String deviceNo);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/DeviceTransferDetailMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/DeviceTransferDetailMapper.java
new file mode 100644
index 0000000..8d9ac9b
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/DeviceTransferDetailMapper.java
@@ -0,0 +1,25 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.DeviceTransferDetail;
+import cn.pluss.platform.vo.DeviceTransferDetailVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 划拨详情表 Mapper 接口
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-03-31
+ */
+public interface DeviceTransferDetailMapper extends BaseMapper<DeviceTransferDetail> {
+
+    /**
+     * 根据tid查询划拨明细
+     * @param tid
+     * @return
+     */
+    List<DeviceTransferDetailVO> selectListByTid(Long tid);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/DeviceTransferMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/DeviceTransferMapper.java
new file mode 100644
index 0000000..b7b1fa2
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/DeviceTransferMapper.java
@@ -0,0 +1,24 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.dto.DeviceTransferDTO;
+import cn.pluss.platform.entity.DeviceTransfer;
+import cn.pluss.platform.vo.DeviceTransferVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 设备划拨记录表 Mapper 接口
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-03-31
+ */
+public interface DeviceTransferMapper extends BaseMapper<DeviceTransfer> {
+
+
+    Page<DeviceTransferVO> pageInfo(Page<DeviceTransferVO> page, @Param("dto") DeviceTransferDTO dto);
+
+    DeviceTransferVO selectByIdVo(Long id);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/DeviceTypeMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/DeviceTypeMapper.java
new file mode 100644
index 0000000..fe59d5d
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/DeviceTypeMapper.java
@@ -0,0 +1,21 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.DeviceType;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 设备类型表 Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-03-04
+ */
+public interface DeviceTypeMapper extends BaseMapper<DeviceType> {
+
+    @Select("SELECT `code` FROM tb_pluss_device_type WHERE showFlag = 1")
+    List<String> selectListCodeByShowFlag();
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/DeviceVoiceBoxMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/DeviceVoiceBoxMapper.java
new file mode 100644
index 0000000..7f13f58
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/DeviceVoiceBoxMapper.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.DeviceVoiceBox;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 智能音箱设备信息表 Mapper 接口
+ * </p>
+ *
+ * @author bzg
+ * @since 2020-11-04
+ */
+public interface DeviceVoiceBoxMapper extends BaseMapper<DeviceVoiceBox> {
+
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/DeviceVoiceBoxMsgMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/DeviceVoiceBoxMsgMapper.java
new file mode 100644
index 0000000..a767287
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/DeviceVoiceBoxMsgMapper.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.DeviceVoiceBoxMsg;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 设备消息推送记录表 Mapper 接口
+ * </p>
+ *
+ * @author bzg
+ * @since 2020-11-04
+ */
+public interface DeviceVoiceBoxMsgMapper extends BaseMapper<DeviceVoiceBoxMsg> {
+
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/DictMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/DictMapper.java
new file mode 100644
index 0000000..6e05581
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/DictMapper.java
@@ -0,0 +1,23 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.Dict;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.MapKey;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface DictMapper extends BaseMapper<Dict> {
+
+    List<Dict> getDictByCode(@Param("codeList") List<String> codeList);
+
+    Page<Dict> selectDictPage(Page<Dict> page, Dict dict);
+
+    Dict selectMaxSortElem(@Param("code") String code);
+
+    Dict selectByNameAndPCode(@Param("code") String code, @Param("name") String name);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/EncryptKeyMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/EncryptKeyMapper.java
new file mode 100644
index 0000000..fdcb17f
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/EncryptKeyMapper.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.EncryptKey;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 商务密钥存储表 Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-10-28
+ */
+public interface EncryptKeyMapper extends BaseMapper<EncryptKey> {
+
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/ExtraLevelBenefitMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/ExtraLevelBenefitMapper.java
new file mode 100644
index 0000000..9cdc7d9
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/ExtraLevelBenefitMapper.java
@@ -0,0 +1,21 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.ExtraLevelBenefit;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 用户变更下级等级数据表 Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-02-08
+ */
+public interface ExtraLevelBenefitMapper extends BaseMapper<ExtraLevelBenefit> {
+
+    @Select("SELECT * FROM tb_pluss_extra_level_benefit WHERE userId = #{userId}")
+    ExtraLevelBenefit getByUserId(Serializable userId);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/FansConsumReturnMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/FansConsumReturnMapper.java
new file mode 100644
index 0000000..2f6a75c
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/FansConsumReturnMapper.java
@@ -0,0 +1,81 @@
+package cn.pluss.platform.mapper;
+
+import java.util.List;
+import java.util.Map;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import cn.pluss.platform.entity.FansConsumReturn;
+import cn.pluss.platform.vo.FansInfoCountVO;
+
+@Mapper
+public interface FansConsumReturnMapper {
+
+    public FansConsumReturn queryFansConsumReturn(FansConsumReturn fansConsumReturn);
+
+    public List<FansConsumReturn> queryFansConsumReturnList(FansConsumReturn fansConsumReturn);
+
+    public void saveFansConsumReturn(FansConsumReturn fansConsumReturn);
+
+    public void updateFansConsumReturn(FansConsumReturn fansConsumReturn);
+
+    public void deleteFansConsumReturn(FansConsumReturn fansConsumReturn);
+
+    public List<FansConsumReturn> queryFansConsumReturnPage(Map map);
+
+    public Integer queryFansConsumReturnPageCount(Map map);
+
+    public void saveFansConsumReturnBatch(List<FansConsumReturn>  fansConsumReturnList);
+    /**
+     * 统计粉丝消费金额  统计粉丝消费奖励金额
+     * @param merchantCode
+     * @return
+     */
+    public FansInfoCountVO sumFansConsumReturnInfo(@Param(value="merchantCode") String merchantCode);
+    
+    /**
+     * 可提现总金额（提现规则  超过一个月的时间）
+     * @param map
+     * @return
+     */
+    public Double sumFansAllowCashMoney(Map map);
+    
+    /**
+     * 不可提现总金额（提现规则 不超过一个月）
+     * @param map
+     * @return
+     */
+    public Double sumFansNotAllowCashMoney(Map map);
+    
+    
+    /**
+     * 今日分润
+     * @param map
+     * @return
+     */
+    public Double sumNowDayShareMoney(Map map);
+    
+    /**
+     * 累计总分润
+     * @param map
+     * @return
+     */
+    public Double sumAllShareMoney(Map map);
+    
+    /**
+     * 累计总奖励
+     * @param merchantCode
+     * @return
+     */
+    public Double sumShareMoney();
+    
+    /**
+     * 今日奖励
+     * @param merchantCode
+     * @return
+     */
+    public Double sumNowReturnMoney();
+    
+    public Double sumReturnMoneyByTime(Map map);
+}
+
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/FansMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/FansMapper.java
new file mode 100644
index 0000000..70d2ce4
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/FansMapper.java
@@ -0,0 +1,102 @@
+package cn.pluss.platform.mapper;
+
+import java.util.List;
+import java.util.Map;
+
+import cn.pluss.platform.entity.MerchantProfit;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import cn.pluss.platform.entity.Fans;
+import cn.pluss.platform.vo.FansConsumVO;
+import org.apache.ibatis.annotations.Select;
+
+@Mapper
+public interface FansMapper {
+
+    List<Fans> selectGroupData(@Param("lastMerchantCodeList") List<String> lastMerchantCodeList);
+
+    Fans queryFans(Fans fans);
+
+    List<Fans> queryFansList(Fans fans);
+
+    void saveFans(Fans fans);
+
+    void updateFans(Fans fans);
+
+    void deleteFans(Fans fans);
+
+    List<Fans> queryFansPage(Map map);
+
+    Integer queryFansPageCount(Map map);
+
+    Integer queryFansNoPageCount(Map map);
+
+    void saveFansBatch(List<Fans> fansList);
+
+    Double sumConsumMoneyByMerchantCode(Map map);
+
+    /**
+     * queryNowDateFansList:(获取当天粉丝的集合). <br/>
+     *
+     * @return
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    List<Fans> queryNowDateFansList(Map map);
+
+
+    List<Fans> queryFansPageManage(Map map);
+
+    Integer queryFansPageCountManage(Map map);
+
+    /**
+     * queryLastFansByUserId:(查询某一粉丝最后一次消费的时间). <br/>
+     *
+     * @param userId
+     * @return
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    Fans queryLastFansByUserId(@Param(value = "userId") String userId);
+
+    /**
+     * queryFansConsumPage:(最新粉丝分润记录查询). <br/>
+     *
+     * @param map
+     * @return
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    List<FansConsumVO> queryFansConsumPage(Map<String, Object> map);
+
+    List<FansConsumVO> queryFansNoConsumPage(Map<String, Object> map);
+
+    /**
+     * queryFansConsumPageCount:(最新粉丝分润记录统计). <br/>
+     *
+     * @param map
+     * @return
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    Integer queryFansConsumPageCount(Map<String, Object> map);
+
+    Integer queryFansNoConsumPageCount(Map<String, Object> map);
+
+    Double queryFansSumConsumMoney(Map<String, Object> map);
+
+    Double queryFansSumShareMoney(Map<String, Object> map);
+
+    /**
+     * 返回今日粉丝奖励总数
+     *
+     * @param fans
+     * @return
+     */
+    Double queryFansTodayCount(Fans fans);
+
+    @Select("SELECT * FROM tb_pluss_fans WHERE orderNumber = #{orderNumber} FOR UPDATE ")
+    Fans getByLockOrderNumber(String orderNumber);
+}
+
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/GuideLabelMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/GuideLabelMapper.java
new file mode 100644
index 0000000..5bb2061
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/GuideLabelMapper.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.GuideLabel;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-10-23
+ */
+public interface GuideLabelMapper extends BaseMapper<GuideLabel> {
+
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/HelpVideoMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/HelpVideoMapper.java
new file mode 100644
index 0000000..2a3f089
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/HelpVideoMapper.java
@@ -0,0 +1,29 @@
+package cn.pluss.platform.mapper;
+
+import java.util.List;
+import java.util.Map;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import cn.pluss.platform.entity.HelpVideo;
+
+@Mapper
+public interface HelpVideoMapper extends BaseMapper<HelpVideo> {
+
+    public HelpVideo queryHelpVideo(HelpVideo helpVideo);
+
+    public List<HelpVideo> queryHelpVideoList(HelpVideo helpVideo);
+
+    public void saveHelpVideo(HelpVideo helpVideo);
+
+    public void updateHelpVideo(HelpVideo helpVideo);
+
+    public void deleteHelpVideo(HelpVideo helpVideo);
+
+    public List<HelpVideo> queryHelpVideoPage(Map map);
+
+    public Integer queryHelpVideoPageCount(Map map);
+
+    public void saveHelpVideoBatch(List<HelpVideo>  helpVideoList);
+}
+
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/HomeMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/HomeMapper.java
new file mode 100644
index 0000000..b4016d3
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/HomeMapper.java
@@ -0,0 +1,53 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.Fans;
+import cn.pluss.platform.entity.MerchantMenber;
+import cn.pluss.platform.entity.MerchantOrder;
+
+import java.util.List;
+import java.util.Map;
+
+public interface HomeMapper  {
+    //商户数量
+    Integer  queryMerchantBaseInfoPageCount(Map map);
+    //粉丝数量
+    Integer queryMerchantFansCount(Map map);
+    //新增粉丝数量，今日/昨日
+    Integer queryTodayFanCount(Map<String, Object> fansMap);
+    //交易总额
+    Double getOrderFeeSum1(Map<String, Object> orderMap);
+    //总交易笔数
+    Integer queryMerchantOrderPageCount(Map map);
+    //会员总数
+    Integer manageQueryMerchantMenberPageCount(Map map);
+    //会员总余额
+    Double manageMerchantMenberSum(Map<String, Object> newMemberMap);
+    //粉丝分润总额
+    List<Fans> queryFansList(Fans fans);
+    //日交易额，今日/昨日
+    Double getToDayTransSum1(Map<String, Object> orderMap);
+    //日支付宝交易额，今日/昨日
+    Double toDayTransZfbSum(Map<String, Object> orderMap);
+    //日微信交易额，今日/昨日
+    Double toDayTransWxSum(Map<String, Object> orderMap);
+    //日云闪付交易额，今日/昨日
+    Double toDayTransYsfSum(Map<String, Object> orderMap);
+    //日支付宝交易笔数，今日/昨日
+    Integer toDayTransZfbCount(Map<String, Object> orderMap);
+    //日微信交易笔数，今日/昨日
+    Integer toDayTransWxCount(Map<String, Object> orderMap);
+    //日云闪付交易笔数，今日/昨日
+    Integer toDayTransYsfCount(Map<String, Object> orderMap);
+    //日退款金额，今日/昨日
+    List<MerchantOrder> queryMerchantOrderPage(Map map);
+    //今日粉丝奖励
+    public Double queryFansTodayCount(Fans fans);
+    //新增会员，今日/昨日
+    Integer queryMerchantMenberPageCount(Map map);
+    //推广分润总额
+    Double queryMerchantProfitSumPrice(Map<String, Object> merchantCodeMap);
+    //推广员数量
+    Integer queryUserAppPageCount(Map<String, Object> appMap);
+    //推广商户数量
+    Integer queryMerchantCount(Map<String, Object> merchantMap);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/IdCardCacheMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/IdCardCacheMapper.java
new file mode 100644
index 0000000..d0ca322
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/IdCardCacheMapper.java
@@ -0,0 +1,11 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.IdCardCache;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @author djh
+ */
+public interface IdCardCacheMapper extends BaseMapper<IdCardCache> {
+
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/IdCardMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/IdCardMapper.java
new file mode 100644
index 0000000..9efd1a6
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/IdCardMapper.java
@@ -0,0 +1,66 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.IdCard;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 身份证信息表, 图片信息在tb_pluss_merchant_image表中 Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-10-16
+ */
+public interface IdCardMapper extends BaseMapper<IdCard> {
+
+    /**
+     * 高并发容易发生死锁，不建议使用
+     * 插入唯一数据
+     *
+     * @param idCard      插入数据
+     * @param uniqueValue 唯一值
+     * @return
+     */
+    Integer insertUniqueData(@Param("data") IdCard idCard, @Param("uniqueData") Map<String, Object> uniqueValue);
+
+    /**
+     * 获取结算身份证信息
+     *
+     * @param userId 用户id
+     * @return
+     */
+    List<IdCard> getAccountIdCard(@Param("userId") String userId);
+
+    /**
+     * 获取结算身份证信息
+     *
+     * @param userId      用户id
+     * @param channelType 通道类型
+     * @return
+     */
+    IdCard getAccountIdCard(@Param("userId") String userId,@Param("channelType") String channelType);
+
+    /**
+     * 查询身份证关联的超级服务商帐号个数
+     *
+     * @param certNo 身份证号
+     * @return
+     */
+    int selectAgentCount(@Param("certNo") String certNo, @Param("userId") String userId);
+
+    /**
+     * 获取未关联结算信息的对私结算身份证信息
+     *
+     * @param userId 用户id
+     * @return
+     */
+    @Select("SELECT ic.* FROM tb_pluss_id_card ic " +
+            "LEFT JOIN tb_pluss_account acc ON acc.userId = ic.userId AND acc.idCardId = ic.id " +
+            "WHERE acc.id IS NULL AND ic.userType = '02' AND ic.userId = #{userId}")
+    IdCard getUnusedIdCard(@Param("userId") String userId);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/InviteRateMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/InviteRateMapper.java
new file mode 100644
index 0000000..3a560d2
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/InviteRateMapper.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.InviteRate;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 邀请商户费率阶梯表 Mapper 接口
+ * </p>
+ *
+ * @author bzg
+ * @since 2020-11-20
+ */
+public interface InviteRateMapper extends BaseMapper<InviteRate> {
+
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/IpLocationCacheMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/IpLocationCacheMapper.java
new file mode 100644
index 0000000..2ea173e
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/IpLocationCacheMapper.java
@@ -0,0 +1,10 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.IpLocationCache;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @author SSS
+ */
+public interface IpLocationCacheMapper extends BaseMapper<IpLocationCache> {
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/JftBankCardMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/JftBankCardMapper.java
new file mode 100644
index 0000000..b899c61
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/JftBankCardMapper.java
@@ -0,0 +1,7 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.JftBankCard;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+public interface JftBankCardMapper extends BaseMapper<JftBankCard> {
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/JftMercBaseInfoMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/JftMercBaseInfoMapper.java
new file mode 100644
index 0000000..affb787
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/JftMercBaseInfoMapper.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.JftMercBaseInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 缴费通详情表 Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-06-22
+ */
+public interface JftMercBaseInfoMapper extends BaseMapper<JftMercBaseInfo> {
+
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/JftMercPaymentChannelMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/JftMercPaymentChannelMapper.java
new file mode 100644
index 0000000..23e32ff
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/JftMercPaymentChannelMapper.java
@@ -0,0 +1,28 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.JftMercPaymentChannel;
+import cn.pluss.platform.entity.MerchantChannelStatus;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 银盛一码多户的商户进件记录 Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-06-15
+ */
+public interface JftMercPaymentChannelMapper extends BaseMapper<JftMercPaymentChannel> {
+
+    /**
+     * @param certNo 身份证号
+     * @return
+     */
+    Integer selectCountByCertNo(@Param("certNo") String certNo);
+
+    JftMercPaymentChannel selectByChangeFlowId(@Param("changeFlowId") String changeFlowId);
+
+    JftMercPaymentChannel selectBySysFlowId(@Param("sysFlowId") String sysFlowId);
+
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/JftMerchantRateMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/JftMerchantRateMapper.java
new file mode 100644
index 0000000..a9b49c4
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/JftMerchantRateMapper.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.JftMerchantRate;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 缴费通商户费率表(新) Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-06-21
+ */
+public interface JftMerchantRateMapper extends BaseMapper<JftMerchantRate> {
+
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/JftMerchantRateRecordMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/JftMerchantRateRecordMapper.java
new file mode 100644
index 0000000..7af775a
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/JftMerchantRateRecordMapper.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.JftMerchantRateRecord;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 缴费通商户费率表(新) Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-06-21
+ */
+public interface JftMerchantRateRecordMapper extends BaseMapper<JftMerchantRateRecord> {
+
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/JftPaymentInfoMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/JftPaymentInfoMapper.java
new file mode 100644
index 0000000..06301d7
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/JftPaymentInfoMapper.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.JftPaymentInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 缴费通付款基础信息 Mapper 接口
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-06-16
+ */
+public interface JftPaymentInfoMapper extends BaseMapper<JftPaymentInfo> {
+
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/JftReceiptInfoMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/JftReceiptInfoMapper.java
new file mode 100644
index 0000000..2547874
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/JftReceiptInfoMapper.java
@@ -0,0 +1,35 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.JftReceiptInfo;
+import cn.pluss.platform.vo.JftReceiptInfoVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * <p>
+ * 收银呗缴费通收款单 Mapper 接口
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-06-16
+ */
+public interface JftReceiptInfoMapper extends BaseMapper<JftReceiptInfo> {
+
+    /**
+     * 缴费通
+     * @param page
+     * @param condition
+     * @return
+     */
+    Page<JftReceiptInfoVO> pageInfo(@Param("page") Page<JftReceiptInfoVO> page, @Param("condition") JftReceiptInfo condition);
+
+    /**
+     * 根据token查询
+     * @param token
+     * @return
+     */
+    @Select("SELECT * FROM tb_pluss_jft_receipt_info WHERE token = #{token}")
+    JftReceiptInfo getByToken(String token);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/JftReceiptOrderMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/JftReceiptOrderMapper.java
new file mode 100644
index 0000000..3ec4ed8
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/JftReceiptOrderMapper.java
@@ -0,0 +1,44 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.dto.jft.JftReceiptOrderDTO;
+import cn.pluss.platform.entity.JftReceiptOrder;
+import cn.pluss.platform.vo.JftReceiptOrderVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 收款单订单详情 Mapper 接口
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-06-16
+ */
+public interface JftReceiptOrderMapper extends BaseMapper<JftReceiptOrder> {
+
+    /**
+     * 根据收款单id盒状态查询收款单详情
+     * @param rid
+     * @return
+     */
+    @Select("SELECT * FROM tb_pluss_jft_receipt_order WHERE rid = #{rid} and `status` = #{status} order by id desc")
+    List<JftReceiptOrder> listByReceiptId(@Param("rid") Long rid, @Param("status") String status);
+
+    @Select("SELECT * FROM tb_pluss_jft_receipt_order WHERE orderNumber = #{orderNumber} limit 1")
+    JftReceiptOrder getOrderByNo(String orderNumber);
+
+    @Select("SELECT * FROM tb_pluss_jft_receipt_order WHERE mercOrderNo = #{mercOrderNo} limit 1")
+    JftReceiptOrder getMercOrderByNo(String mercOrderNo);
+
+    /**
+     * 分页查询
+     * @param page
+     * @param entity
+     * @return
+     */
+    Page<JftReceiptOrderVO> pageData(@Param("page") Page<JftReceiptOrderVO> page, @Param("entity") JftReceiptOrderDTO entity);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/JftReceiptPaymentMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/JftReceiptPaymentMapper.java
new file mode 100644
index 0000000..5f821d6
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/JftReceiptPaymentMapper.java
@@ -0,0 +1,22 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.JftReceiptPayment;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 收款单和付款信息关联表 Mapper 接口
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-06-16
+ */
+public interface JftReceiptPaymentMapper extends BaseMapper<JftReceiptPayment> {
+
+    @Select("SELECT pid FROM tb_pluss_jft_receipt_payment WHERE  rid = #{receiptid}")
+    List<Long> listByReceiptId(Long receiptid);
+
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/JftSmallClassMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/JftSmallClassMapper.java
new file mode 100644
index 0000000..415048c
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/JftSmallClassMapper.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.JftSmallClass;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 缴费通小课堂信息表 Mapper 接口
+ * </p>
+ *
+ * @author bzg
+ * @since 2022-07-06
+ */
+public interface JftSmallClassMapper extends BaseMapper<JftSmallClass> {
+
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/LeshuaMakeMoneyMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/LeshuaMakeMoneyMapper.java
new file mode 100644
index 0000000..8363644
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/LeshuaMakeMoneyMapper.java
@@ -0,0 +1,19 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.LeshuaMakeMoney;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface LeshuaMakeMoneyMapper extends BaseMapper<LeshuaMakeMoney> {
+
+    List<LeshuaMakeMoney> queryLeshuaMakeMoneyPage(Map map);
+
+    Integer queryLeshuaMakeMoneyPageCount(Map map);
+
+    void saveLeshuaMakeMoneyBatch(List<LeshuaMakeMoney> leshuaMakeMoneyList);
+}
+
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/LevelMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/LevelMapper.java
new file mode 100644
index 0000000..77f5c32
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/LevelMapper.java
@@ -0,0 +1,29 @@
+package cn.pluss.platform.mapper;
+
+import java.util.List;
+import java.util.Map;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import cn.pluss.platform.entity.Level;
+
+@Mapper
+public interface LevelMapper extends BaseMapper<Level> {
+
+    Level queryLevel(Level level);
+
+    List<Level> queryLevelList(Level level);
+
+    void saveLevel(Level level);
+
+    void updateLevel(Level level);
+
+    void deleteLevel(Level level);
+
+    List<Level> queryLevelPage(Map map);
+
+    Integer queryLevelPageCount(Map map);
+
+    void saveLevelBatch(List<Level> levelList);
+}
+
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/LevelOperateRecordMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/LevelOperateRecordMapper.java
new file mode 100644
index 0000000..34999af
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/LevelOperateRecordMapper.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.LevelOperateRecord;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 等级变更记录表 Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-02-08
+ */
+public interface LevelOperateRecordMapper extends BaseMapper<LevelOperateRecord> {
+
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MakeMoneyMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MakeMoneyMapper.java
new file mode 100644
index 0000000..95e1f4b
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MakeMoneyMapper.java
@@ -0,0 +1,23 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.MakeMoney;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-09-10
+ */
+public interface MakeMoneyMapper extends BaseMapper<MakeMoney> {
+
+    /**
+     *  查询商户已经提现的金额
+     * @param merchantId
+     */
+    BigDecimal getCountNowDateSettleAmt(String merchantId);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MccInfoSortMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MccInfoSortMapper.java
new file mode 100644
index 0000000..57250f7
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MccInfoSortMapper.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.MccInfoSort;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * mcc行业对应表，此处的mcc主要还是以随行付的为主，不同通道有差异的通过mcc_reflect表做映射 Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-06-23
+ */
+public interface MccInfoSortMapper extends BaseMapper<MccInfoSort> {
+
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MccInfoYsMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MccInfoYsMapper.java
new file mode 100644
index 0000000..c803e0b
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MccInfoYsMapper.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.MccInfoYs;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-07-20
+ */
+public interface MccInfoYsMapper extends BaseMapper<MccInfoYs> {
+
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MccReflectMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MccReflectMapper.java
new file mode 100644
index 0000000..8fde572
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MccReflectMapper.java
@@ -0,0 +1,21 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.MccReflect;
+import cn.pluss.platform.vo.MccReflectVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 主通道(随行付)与其他通道之间mcc的关联表 Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-02-23
+ */
+public interface MccReflectMapper extends BaseMapper<MccReflect> {
+
+    IPage<MccReflectVO> selectPageMccReflectVO(IPage<MccReflectVO> page, @Param(Constants.WRAPPER) MccReflect entity);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MemberOrderMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MemberOrderMapper.java
new file mode 100644
index 0000000..1834c44
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MemberOrderMapper.java
@@ -0,0 +1,52 @@
+package cn.pluss.platform.mapper;
+
+import java.util.List;
+import java.util.Map;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.MapKey;
+import org.apache.ibatis.annotations.Mapper;
+
+import cn.pluss.platform.entity.MemberOrder;
+
+@Mapper
+public interface MemberOrderMapper extends BaseMapper<MemberOrder> {
+
+    MemberOrder queryMemberOrder(MemberOrder memberOrder);
+
+    List<MemberOrder> queryMemberOrderList(MemberOrder memberOrder);
+
+    void saveMemberOrder(MemberOrder memberOrder);
+
+    void updateMemberOrder(MemberOrder memberOrder);
+
+    void deleteMemberOrder(MemberOrder memberOrder);
+
+    List<MemberOrder> queryMemberOrderPage(Map map);
+
+    Integer queryMemberOrderPageCount(Map map);
+
+    void saveMemberOrderBatch(List<MemberOrder> memberOrderList);
+    
+    Double queryMemberOrderTotalOrderFeeByTime(Map map);
+
+	Integer queryMemberOrderPageCountByTime(Map map);
+
+	List<MemberOrder> queryMemberOrderPageByTime(Map queryMap);
+	
+	/**
+	 * 
+	 * sumMemberOrderMoney:(统计商家的会员消费金额  充值金额). <br/> 
+	 * 
+	 * @author Administrator 
+	 * @param merchantCode 商家code
+	 * @param orderType 0会员消费  1会员充值
+	 * @return 
+	 * @since JDK 1.8
+	 */
+	Double sumMemberOrderMoney(Map<String, Object> map);
+
+	@MapKey("orderType")
+	Map<String, Map<String, Object>> queryMemberOrderCountByTimeGroupData(Map<String, Object> map);
+}
+
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MemberSettingMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MemberSettingMapper.java
new file mode 100644
index 0000000..fe33c50
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MemberSettingMapper.java
@@ -0,0 +1,27 @@
+package cn.pluss.platform.mapper;
+
+import java.util.List;
+import java.util.Map;
+import org.apache.ibatis.annotations.Mapper;
+import cn.pluss.platform.entity.MemberSetting;
+
+@Mapper
+public interface MemberSettingMapper {
+
+    public MemberSetting queryMemberSetting(MemberSetting memberSetting);
+
+    public List<MemberSetting> queryMemberSettingList(MemberSetting memberSetting);
+
+    public void saveMemberSetting(MemberSetting memberSetting);
+
+    public void updateMemberSetting(MemberSetting memberSetting);
+
+    public void deleteMemberSetting(MemberSetting memberSetting);
+
+    public List<MemberSetting> queryMemberSettingPage(Map map);
+
+    public Integer queryMemberSettingPageCount(Map map);
+
+    public void saveMemberSettingBatch(List<MemberSetting>  memberSettingList);
+}
+
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MemberTransStatisticsMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MemberTransStatisticsMapper.java
new file mode 100644
index 0000000..0e92c3e
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MemberTransStatisticsMapper.java
@@ -0,0 +1,35 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.MemberTransStatistics;
+import cn.pluss.platform.entity.MerchantBillStatistics;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 会员消费日记录 Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-03-17
+ */
+public interface MemberTransStatisticsMapper extends BaseMapper<MemberTransStatistics> {
+
+    /**
+     * 保存一天的商户会员流水
+     * @param startDate     统计开始时间
+     * @param endDate       统计截止时间
+     */
+    void insertDuringBill(@Param("startDate") String startDate, @Param("endDate") String endDate);
+
+    /**
+     * 该查询用于查询实时账单
+     * @param startDate     开始时间
+     * @param endDate       截止时间
+     * @param userId        用户id
+     * @return 单个商户的信息
+     */
+    MemberTransStatistics selectOneDuringBill(@Param("startDate") String startDate, @Param("endDate") String endDate, @Param("userId") String userId);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MenuInfoMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MenuInfoMapper.java
new file mode 100644
index 0000000..4449fe8
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MenuInfoMapper.java
@@ -0,0 +1,40 @@
+package cn.pluss.platform.mapper;
+
+import java.util.List;
+import java.util.Map;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import cn.pluss.platform.entity.MenuInfo;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface MenuInfoMapper extends BaseMapper<MenuInfo> {
+
+    List<MenuInfo> queryRoleMenuInfoList(@Param("entity") MenuInfo menuInfo, @Param("roleId") String roleId);
+
+    MenuInfo queryMenuInfo(MenuInfo menuInfo);
+
+    List<MenuInfo> queryMenuInfoList(MenuInfo menuInfo);
+
+    Integer saveMenuInfo(MenuInfo menuInfo);
+
+    void updateMenuInfo(MenuInfo menuInfo);
+
+    void deleteMenuInfo(MenuInfo menuInfo);
+
+    List<MenuInfo> queryMenuInfoPage(Map map);
+
+    Integer queryMenuInfoPageCount(Map map);
+
+    void saveMenuInfoBatch(List<MenuInfo> menuInfoList);
+
+    List<MenuInfo> getPermissionNames(String loginName);
+
+    List<MenuInfo> queryPermitMenuInfoById(Map map);
+
+    List<MenuInfo> queryMenuInfoListOrderById(MenuInfo menuInfo);
+
+    List<MenuInfo> queryMenuInfoByRoleId(Map map);
+}
+
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MercDeviceRefundImageMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MercDeviceRefundImageMapper.java
new file mode 100644
index 0000000..45ff06a
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MercDeviceRefundImageMapper.java
@@ -0,0 +1,27 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.MercDeviceRefundImage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * <p>
+ * 商户设备订单退款图片表 Mapper 接口
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-03-31
+ */
+public interface MercDeviceRefundImageMapper extends BaseMapper<MercDeviceRefundImage> {
+
+    /**
+     * 根据detailId获取图片列表
+     * @param id
+     * @return
+     */
+    @Select("SELECT picUrl FROM tb_pluss_merc_device_refund_image WHERE detailId = #{id}")
+    List<String> selectListByDetailId(Serializable id);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MercMemberSetMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MercMemberSetMapper.java
new file mode 100644
index 0000000..bf4a736
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MercMemberSetMapper.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.MercMemberSet;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 商户会员功能基本设置表 Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-07-12
+ */
+public interface MercMemberSetMapper extends BaseMapper<MercMemberSet> {
+
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MercOrderDetailMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MercOrderDetailMapper.java
new file mode 100644
index 0000000..65df39f
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MercOrderDetailMapper.java
@@ -0,0 +1,46 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.MercOrderDetail;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * <p>
+ * 订单详情表 Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-03-17
+ */
+public interface MercOrderDetailMapper extends BaseMapper<MercOrderDetail> {
+
+    /**
+     * 获取已经退款的订单额度
+     * @param orderNo
+     * @return
+     */
+    @Select("SELECT IFNULL(SUM(refundAmt),0) FROM tb_pluss_merc_order_detail WHERE orderNo = #{orderNo} AND status = '03'  ")
+    BigDecimal getUseRefundAmtByOrderNo(String orderNo);
+
+    /**
+     * 分页查询
+     * @param page
+     * @param condition
+     * @return
+     */
+    Page<MercOrderDetail> pageInfo(Page<MercOrderDetail> page, @Param("condition") MercOrderDetail condition);
+
+    /**
+     * 根据订单号和code查询订单信息
+     * @param orderNo
+     * @param code
+     * @return
+     */
+    @Select("SELECT * FROM tb_pluss_merc_order_detail WHERE  orderNo = #{orderNo} and `code` = #{code}")
+    List<MercOrderDetail> listByOrderNoAndCode(@Param("orderNo") String orderNo, @Param("code")String code);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MercOrderExpressDetailMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MercOrderExpressDetailMapper.java
new file mode 100644
index 0000000..a63d74c
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MercOrderExpressDetailMapper.java
@@ -0,0 +1,25 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.MercOrderExpressDetail;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 商户订单物流详情 Mapper 接口
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-03-24
+ */
+public interface MercOrderExpressDetailMapper extends BaseMapper<MercOrderExpressDetail> {
+
+    @Select("SELECT * FROM tb_pluss_merc_order_express_detail where orderNo = #{orderNo} order by id desc ")
+    List<MercOrderExpressDetail> getByOrderNo(String orderNo);
+
+    @Select("SELECT * FROM tb_pluss_merc_order_express_detail where expressNo = #{expressNo} order by id desc ")
+    List<MercOrderExpressDetail> getByExpressNo(String expressNo);
+
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MercOrderExpressMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MercOrderExpressMapper.java
new file mode 100644
index 0000000..42c254f
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MercOrderExpressMapper.java
@@ -0,0 +1,18 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.MercOrderExpress;
+import cn.pluss.platform.vo.MercOrderExpressVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Select;
+
+public interface MercOrderExpressMapper extends BaseMapper<MercOrderExpress> {
+
+    @Select("SELECT * FROM tb_pluss_merc_order_express WHERE orderNo = #{orderNo} ")
+    MercOrderExpressVO getByOrderNo(String orderNo);
+
+    @Select("SELECT * FROM tb_pluss_merc_order_express WHERE logistNo = #{logistNo} ")
+    MercOrderExpress getByLogistNo(String logistNo);
+
+    @Select("SELECT * FROM tb_pluss_merc_order_express WHERE expressNo = #{expressNo} ")
+    MercOrderExpressVO getByExpressNo(String expressNo);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MercOrderNewMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MercOrderNewMapper.java
new file mode 100644
index 0000000..406c911
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MercOrderNewMapper.java
@@ -0,0 +1,31 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.MercOrderNew;
+import cn.pluss.platform.vo.MercOrderNewVO;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * <p>
+ * 新的订单表 Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-03-17
+ */
+public interface MercOrderNewMapper extends BaseMapper<MercOrderNew> {
+
+    /**
+     * 设备订单分页查询
+     * @param condition
+     * @return
+     */
+    Page<MercOrderNewVO> pageInfo(Page<MercOrderNewVO> page, @Param("condition")MercOrderNewVO condition);
+
+    @Select("SELECT * FROM tb_pluss_merc_order_new WHERE orderNo = #{orderNumber}")
+    MercOrderNew getOrderByNo(String orderNumber);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MercOrderTokenMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MercOrderTokenMapper.java
new file mode 100644
index 0000000..7c12814
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MercOrderTokenMapper.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.MercOrderToken;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 设备订单token表 Mapper 接口
+ * </p>
+ *
+ * @author bzg
+ * @since 2022-03-23
+ */
+public interface MercOrderTokenMapper extends BaseMapper<MercOrderToken> {
+
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MercReceiveAddressMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MercReceiveAddressMapper.java
new file mode 100644
index 0000000..d782355
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MercReceiveAddressMapper.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.MercReceiveAddress;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 设备商城用户地址表 Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-03-21
+ */
+public interface MercReceiveAddressMapper extends BaseMapper<MercReceiveAddress> {
+
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MercShopTrolleyMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MercShopTrolleyMapper.java
new file mode 100644
index 0000000..c0edab7
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MercShopTrolleyMapper.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.MercShopTrolley;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 购物车表 Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-03-16
+ */
+public interface MercShopTrolleyMapper extends BaseMapper<MercShopTrolley> {
+
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantAddressMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantAddressMapper.java
new file mode 100644
index 0000000..dfa4b39
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantAddressMapper.java
@@ -0,0 +1,27 @@
+package cn.pluss.platform.mapper;
+
+import java.util.List;
+import java.util.Map;
+import org.apache.ibatis.annotations.Mapper;
+import cn.pluss.platform.entity.MerchantAddress;
+
+@Mapper
+public interface MerchantAddressMapper {
+
+    public MerchantAddress queryMerchantAddress(MerchantAddress merchantAddress);
+
+    public List<MerchantAddress> queryMerchantAddressList(MerchantAddress merchantAddress);
+
+    public void saveMerchantAddress(MerchantAddress merchantAddress);
+
+    public void updateMerchantAddress(MerchantAddress merchantAddress);
+
+    public void deleteMerchantAddress(MerchantAddress merchantAddress);
+
+    public List<MerchantAddress> queryMerchantAddressPage(Map map);
+
+    public Integer queryMerchantAddressPageCount(Map map);
+
+    public void saveMerchantAddressBatch(List<MerchantAddress>  merchantAddressList);
+}
+
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantAuditRecordMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantAuditRecordMapper.java
new file mode 100644
index 0000000..fc0b41e
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantAuditRecordMapper.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.MerchantAuditRecord;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-11-27
+ */
+public interface MerchantAuditRecordMapper extends BaseMapper<MerchantAuditRecord> {
+
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantBankCardMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantBankCardMapper.java
new file mode 100644
index 0000000..e429e62
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantBankCardMapper.java
@@ -0,0 +1,53 @@
+package cn.pluss.platform.mapper;
+
+import java.util.List;
+import java.util.Map;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import cn.pluss.platform.entity.MerchantBankCard;
+
+@Mapper
+public interface MerchantBankCardMapper extends BaseMapper<MerchantBankCard> {
+
+    MerchantBankCard queryMerchantBankCard(MerchantBankCard merchantBankCard);
+
+    List<MerchantBankCard> queryMerchantBankCardList(MerchantBankCard merchantBankCard);
+
+    void saveMerchantBankCard(MerchantBankCard merchantBankCard);
+
+    void updateMerchantBankCard(MerchantBankCard merchantBankCard);
+
+    void updateMerchantBankCardUserId(MerchantBankCard merchantBankCard);
+
+    void deleteMerchantBankCard(MerchantBankCard merchantBankCard);
+
+    List<MerchantBankCard> queryMerchantBankCardPage(Map map);
+
+    Integer queryMerchantBankCardPageCount(Map map);
+
+    void saveMerchantBankCardBatch(List<MerchantBankCard> merchantBankCardList);
+    
+    /**
+     * 
+     * queryMerchantBankCardInfoPage:(最新查询商家信息). <br/> 
+     * 
+     * @author Administrator 
+     * @param map
+     * @return 
+     * @since JDK 1.8
+     */
+    List<MerchantBankCard> queryMerchantBankCardInfoPage(Map<String, Object> map);
+    
+    /**
+     * 
+     * queryMerchantBankCardInfoPageCount:(最新查询商家统计). <br/> 
+     * 
+     * @author Administrator 
+     * @param map
+     * @return 
+     * @since JDK 1.8
+     */
+    Integer queryMerchantBankCardInfoPageCount(Map<String, Object> map);
+}
+
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantBaseInfoMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantBaseInfoMapper.java
new file mode 100644
index 0000000..b96b185
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantBaseInfoMapper.java
@@ -0,0 +1,141 @@
+package cn.pluss.platform.mapper;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+import cn.pluss.platform.dto.MercActiveDataDTO;
+import cn.pluss.platform.dto.MercOrderDataDTO;
+import cn.pluss.platform.dto.MercTradeDataDTO;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.vo.StoreInfoVO;
+import cn.pluss.platform.vo.UserNumVO;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Mapper;
+import cn.pluss.platform.entity.MerchantBaseInfo;
+import cn.pluss.platform.vo.MerchantBaseNewVO;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+@Mapper
+public interface MerchantBaseInfoMapper extends BaseMapper<MerchantBaseInfo> {
+
+
+	@Select("SELECT * FROM tb_pluss_merchant_base_info WHERE merchantCode = #{merchantCode}")
+	MerchantBaseInfo queryByMerchantCode(@Param("merchantCode") String merchantCode);
+
+	@Select("SELECT * FROM tb_pluss_merchant_base_info WHERE userId = #{userId}")
+	List<MerchantBaseInfo> selectListByUserId(@Param("userId") Serializable userId);
+
+    default MerchantBaseInfo queryMerchantBaseInfo(MerchantBaseInfo merchantBaseInfo) {
+    	return selectOne(new QueryWrapper<>(merchantBaseInfo));
+	}
+
+	default List<MerchantBaseInfo> queryMerchantBaseInfoList(MerchantBaseInfo merchantBaseInfo) {
+		return selectList(new QueryWrapper<>(merchantBaseInfo));
+	}
+
+    default void saveMerchantBaseInfo(MerchantBaseInfo merchantBaseInfo) {
+    	insert(merchantBaseInfo);
+	}
+
+	default void updateMerchantBaseInfo(MerchantBaseInfo merchantBaseInfo) {
+    	updateById(merchantBaseInfo);
+	}
+
+    default void deleteMerchantBaseInfo(MerchantBaseInfo merchantBaseInfo) {
+    	deleteById(merchantBaseInfo.getId());
+	}
+
+    List<MerchantBaseInfo> queryMerchantBaseInfoPage(Map map);
+
+    Integer queryMerchantBaseInfoPageCount(Map map);
+
+	Integer queryMerchantBaseInfoPageCountBySignDt(Map map);
+	
+	/**
+	 * 
+	 * queryMerchantBaseNewPage:(查询商户管理列表的). <br/> 
+	 * 
+	 * @author Administrator 
+	 * @param map
+	 * @return 
+	 * @since JDK 1.8
+	 */
+	List<MerchantBaseNewVO> queryMerchantBaseNewPage(Map<String, Object> map);
+	
+	//统计商户列表个数,admin
+	Integer queryMerchantBaseNewPageCount(Map<String, Object> map);
+	//统计商户列表个数,商户
+	Integer queryMerchantNoBaseNewPageCount(Map<String, Object> map);
+	/**
+	 * 统计粉丝总数
+	 * @param map
+	 * @return
+	 */
+	Integer queryMerchantFansCount(Map map);
+
+	Integer queryTodayFanCount(Map<String, Object> fansMap);
+
+	/**
+	 * 获取指定用户所有的店铺
+	 * @return	店铺列表
+	 */
+	List<MerchantBaseInfo> queryMerchantListByUserId(@Param("userId") String userId);
+
+    StoreInfoVO selectParticulars(Integer id);
+
+	/**
+	 * 查询商户 ，商户
+	 * @param map
+	 * @return
+	 */
+	List<MerchantBaseNewVO> queryMerchantNoBaseNewPage(Map<String, Object> map);
+
+	/**
+	 * 关联查询分页信息
+	 * @param merchantPage
+	 * @param userApp
+	 * @return
+	 */
+    Page<MerchantBaseInfo> pageJoinData(@Param("page")Page<MerchantBaseInfo> merchantPage,
+										@Param("userApp")UserApp userApp);
+
+    /**
+     * @description:
+     * @date: 2021/12/30 17:52
+     * @param page:
+     * @param dto:
+     * @return com.baomidou.mybatisplus.extension.plugins.pagination.Page<cn.pluss.platform.dto.MercOrderDataDTO>
+     */
+    Page<MercOrderDataDTO> pageData(@Param("page")Page<MercOrderDataDTO> page, @Param("dto")MercOrderDataDTO dto);
+
+    Page<MercTradeDataDTO> pageTradeData(@Param("page")Page<MercTradeDataDTO> page, @Param("dto")MercTradeDataDTO dto);
+
+	/**
+	 * 该查询只查询商户信息，不做交易数据统计
+	 *
+	 * @return
+	 */
+	List<MercTradeDataDTO> listMercData(@Param("userId") Long userId, @Param("merchantCodeList") List<String> merchantCodeList);
+
+	Page<MercTradeDataDTO> pageTradeDataHistory(@Param("page")Page<MercTradeDataDTO> page, @Param("dto")MercTradeDataDTO dto);
+
+    Page<MercActiveDataDTO> pageActiveData(@Param("page") Page<MercActiveDataDTO> page, @Param("dto")MercActiveDataDTO dto);
+
+	/**
+	 * 根据区域和角色查询商户信息
+	 * @date: 2022/3/1 16:51
+	 * @param areaList:
+	 * @param roleCode:
+	 * @return java.util.List<java.lang.String>
+	 */
+    List<String> getAreaAndRoleList(@Param("areaList") List<String> areaList, @Param("roleCode") String roleCode);
+
+
+	@Select("SELECT mbi.merchantCode FROM tb_pluss_merchant_base_info mbi LEFT JOIN tb_pluss_user_app ua ON mbi.merchantCode = ua.merchantCode AND ua.userType = 'promoter' WHERE ua.parentId = #{userId}")
+	List<String> queryNextMercCodeByUserId(Serializable userId);
+}
+
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantBillStatisticsMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantBillStatisticsMapper.java
new file mode 100644
index 0000000..8509220
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantBillStatisticsMapper.java
@@ -0,0 +1,23 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.MerchantBillStatistics;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 按日统计商户的账单 Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-03-11
+ */
+public interface MerchantBillStatisticsMapper extends BaseMapper<MerchantBillStatistics> {
+
+    /**
+     * 保存一天的商户流水统计综合数据
+     * @param startDate     统计开始时间
+     * @param endDate       统计截止时间
+     */
+    void insertDuringBill(@Param("startDate") String startDate, @Param("endDate") String endDate);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantCashPayCodeMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantCashPayCodeMapper.java
new file mode 100644
index 0000000..8f8fe67
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantCashPayCodeMapper.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.MerchantCashPayCode;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 收银点和码牌关联记录表 Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-03-24
+ */
+public interface MerchantCashPayCodeMapper extends BaseMapper<MerchantCashPayCode> {
+
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantCashPlaceMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantCashPlaceMapper.java
new file mode 100644
index 0000000..ff67627
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantCashPlaceMapper.java
@@ -0,0 +1,19 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.MerchantCashPlace;
+import cn.pluss.platform.vo.MerchantCashPlaceVO;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 商户收银点表 Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-03-23
+ */
+public interface MerchantCashPlaceMapper extends BaseMapper<MerchantCashPlace> {
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantCashPlaceStaffMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantCashPlaceStaffMapper.java
new file mode 100644
index 0000000..080746d
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantCashPlaceStaffMapper.java
@@ -0,0 +1,35 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.MerchantCashPlaceStaff;
+import cn.pluss.platform.vo.MerchantCashPlaceStaffVO;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 收银点和员工关联记录表 Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-03-23
+ */
+public interface MerchantCashPlaceStaffMapper extends BaseMapper<MerchantCashPlaceStaff> {
+
+    /**
+     * 查询收银点签到记录，包含员工名称
+     * @param wrapper   查询条件
+     * @return  结果
+     */
+    <T extends MerchantCashPlaceStaff> T selectCustom(@Param(Constants.WRAPPER) Wrapper<Object> wrapper);
+
+    /**
+     * 查询收银点签到记录，包含员工名称
+     * @param page      页面信息
+     * @param wrapper   查询条件
+     * @return  结果
+     */
+    <T extends MerchantCashPlaceStaff> Page<T> selectCustom(Page<MerchantCashPlaceStaff> page, @Param(Constants.WRAPPER) Wrapper<Object> wrapper);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantChannelImgMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantChannelImgMapper.java
new file mode 100644
index 0000000..1060cc1
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantChannelImgMapper.java
@@ -0,0 +1,15 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.MerchantChannelImg;
+import cn.pluss.platform.entity.MerchantImage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface MerchantChannelImgMapper extends BaseMapper<MerchantChannelImg> {
+
+    List<MerchantImage> selectListByUserId(@Param("userId") String userId, @Param("channelId") String channelId);
+
+    Integer removeByMerchantCode(@Param("merchantCode") String merchantCode, @Param("channelType") String channelType);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantChannelMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantChannelMapper.java
new file mode 100644
index 0000000..07d2386
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantChannelMapper.java
@@ -0,0 +1,15 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.MerchantChannel;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+
+public interface MerchantChannelMapper extends BaseMapper<MerchantChannel> {
+
+    /**
+     * 获取所有有效的通道id
+     * @return
+     */
+    List<Integer> selectValidIdList();
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantChannelStatusMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantChannelStatusMapper.java
new file mode 100644
index 0000000..4229eba
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantChannelStatusMapper.java
@@ -0,0 +1,52 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.MerchantChannelStatus;
+import cn.pluss.platform.vo.MerchantChannelStatusVO;
+import cn.pluss.platform.vo.UserNumVO;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+@Mapper
+public interface MerchantChannelStatusMapper extends BaseMapper<MerchantChannelStatus> {
+
+    MerchantChannelStatus selectByChangeFlowId(@Param("changeFlowId") String changeFlowId);
+
+    MerchantChannelStatus selectBySysFlowId(@Param("sysFlowId") String sysFlowId);
+
+    List<MerchantChannelStatusVO> selectListByMerchantCode(@Param("merchantCodeList") List<String> merchantCodeList);
+
+    MerchantChannelStatus getByIdLock(@Param("id") Integer id);
+
+    default MerchantChannelStatus getByMerchantCode(@Param("merchantCode") String merchantCode) {
+       return getByMerchantCode(merchantCode, 1) ;
+    }
+
+    MerchantChannelStatus getByMerchantCode(@Param("merchantCode") String merchantCode, @Param("channel") Integer channel);
+
+    /**
+     * 获取未实名认证、瑞银信通道进件的商户
+     * @return 商户进件信息列表
+     */
+    List<MerchantChannelStatus> getRyxNoCertMerchant();
+
+    List<MerchantChannelStatus> selectListWithUserId(@Param(Constants.WRAPPER) Wrapper<MerchantChannelStatus> queryWrapper);
+
+    @Select("SELECT * FROM tb_pluss_merchant_channel_status WHERE merchantId = #{merchantId} FOR UPDATE ")
+    MerchantChannelStatus getByMerchantIdLock(@Param("merchantId") String merchantId);
+
+    /**
+     * 当前用户指定时间段 进件商户数量
+     * @date: 2022/1/24 22:43
+     * @param userId:
+     * @param date:
+     * @param dateType:
+     * @return java.util.Map<java.lang.String,java.lang.Integer>
+     */
+    UserNumVO getUserNumInfo(@Param("userId") Long userId, @Param("date")String date, @Param("dateType")Integer dateType);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantComplaintImageMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantComplaintImageMapper.java
new file mode 100644
index 0000000..33882b1
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantComplaintImageMapper.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.MerchantComplaintImage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 投诉图片信息表 Mapper 接口
+ * </p>
+ *
+ * @author bzg
+ * @since 2021-09-14
+ */
+public interface MerchantComplaintImageMapper extends BaseMapper<MerchantComplaintImage> {
+
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantComplaintRecordMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantComplaintRecordMapper.java
new file mode 100644
index 0000000..17f912a
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantComplaintRecordMapper.java
@@ -0,0 +1,25 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.MerchantComplaintRecord;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author bzg
+ * @since 2021-09-14
+ */
+public interface MerchantComplaintRecordMapper extends BaseMapper<MerchantComplaintRecord> {
+
+    /**
+     * @description:分页查询
+     * @date: 2021/9/15 13:42
+     * @param mcRecord
+     * @return com.baomidou.mybatisplus.extension.plugins.pagination.Page<cn.pluss.platform.entity.MerchantComplaintRecord>
+     */
+    Page<MerchantComplaintRecord> pageData(Page<MerchantComplaintRecord> page, @Param("record") MerchantComplaintRecord mcRecord);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantDeviceMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantDeviceMapper.java
new file mode 100644
index 0000000..c7bfd79
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantDeviceMapper.java
@@ -0,0 +1,59 @@
+package cn.pluss.platform.mapper;
+
+import java.util.List;
+import java.util.Map;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Mapper;
+
+import cn.pluss.platform.entity.MerchantDevice;
+import cn.pluss.platform.vo.DeviceVO;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface MerchantDeviceMapper extends BaseMapper<MerchantDevice> {
+
+    MerchantDevice queryMerchantDevice(MerchantDevice merchantDevice);
+
+    List<MerchantDevice> queryMerchantDeviceList(MerchantDevice merchantDevice);
+
+    void saveMerchantDevice(MerchantDevice merchantDevice);
+
+    void updateMerchantDevice(MerchantDevice merchantDevice);
+
+    void deleteMerchantDevice(MerchantDevice merchantDevice);
+
+    List<MerchantDevice> queryMerchantDevicePage(Map map);
+
+    Integer queryMerchantDevicePageCount(Map map);
+
+    void saveMerchantDeviceBatch(List<MerchantDevice>  merchantDeviceList);
+    
+    /**
+     * 
+     * showMerchantDevicePage:(商家设备列表). <br/> 
+     *
+     * @author Administrator 
+     * @param map
+     * @return 
+     * @since JDK 1.8
+     */
+    List<DeviceVO>  showMerchantDevicePage(Map<String,Object> map);
+    
+    /**
+     * 
+     * showMerchantDevicePageCount:(商家设备数量). <br/> 
+     *
+     * @author Administrator 
+     * @param map
+     * @return 
+     * @since JDK 1.8
+     */
+    Integer showMerchantDevicePageCount(Map<String,Object> map);
+
+    Page<DeviceVO> selectMerchantDevicePage(Page<DeviceVO> page, @Param(Constants.WRAPPER) Wrapper<Object> queryWrapper);
+}
+
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantGuideMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantGuideMapper.java
new file mode 100644
index 0000000..38f93ea
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantGuideMapper.java
@@ -0,0 +1,26 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.MerchantGuide;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-10-23
+ */
+public interface MerchantGuideMapper extends BaseMapper<MerchantGuide> {
+
+    /**
+     * 查询商户所有的话术
+     * @param merchantCode      商户code
+     * @param merchantName      商户名称
+     * @return
+     */
+    List<MerchantGuide> userMerchantGuide(@Param("merchantCode") String merchantCode, @Param("merchantName") String merchantName);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantImageMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantImageMapper.java
new file mode 100644
index 0000000..9857033
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantImageMapper.java
@@ -0,0 +1,35 @@
+package cn.pluss.platform.mapper;
+
+import java.util.List;
+import java.util.Map;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import cn.pluss.platform.entity.MerchantImage;
+
+@Mapper
+public interface MerchantImageMapper extends BaseMapper<MerchantImage> {
+
+    MerchantImage queryMerchantImage(MerchantImage merchantImage);
+
+    List<MerchantImage> queryMerchantImageList(MerchantImage merchantImage);
+
+    void saveMerchantImage(MerchantImage merchantImage);
+
+    void updateMerchantImage(MerchantImage merchantImage);
+
+    void deleteMerchantImage(MerchantImage merchantImage);
+
+    List<MerchantImage> queryMerchantImagePage(Map map);
+
+    Integer queryMerchantImagePageCount(Map map);
+
+    /**
+     * 保存多个
+     * @param merchantImageList
+     */
+    void saveMerchantImageBatch(List<MerchantImage> merchantImageList);
+
+    void deleteMerchantImageByMerchantCode(MerchantImage merchantImage);
+}
+
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantIncomeMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantIncomeMapper.java
new file mode 100644
index 0000000..10724ce
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantIncomeMapper.java
@@ -0,0 +1,37 @@
+package cn.pluss.platform.mapper;
+
+import java.util.List;
+import java.util.Map;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import cn.pluss.platform.entity.MerchantIncome;
+
+@Mapper
+public interface MerchantIncomeMapper extends BaseMapper<MerchantIncome> {
+
+    MerchantIncome queryMerchantIncome(MerchantIncome merchantIncome);
+
+    List<MerchantIncome> queryMerchantIncomeList(MerchantIncome merchantIncome);
+
+    void saveMerchantIncome(MerchantIncome merchantIncome);
+
+    void updateMerchantIncome(MerchantIncome merchantIncome);
+
+    void deleteMerchantIncome(MerchantIncome merchantIncome);
+
+    List<MerchantIncome> queryMerchantIncomePage(Map map);
+
+    Integer queryMerchantIncomePageCount(Map map);
+
+    void saveMerchantIncomeBatch(List<MerchantIncome> merchantIncomeList);
+    
+    List<MerchantIncome> queryLastFiveMerchantIncome(MerchantIncome merchantIncome);
+    
+    List<MerchantIncome> queryMerchantIncomePageByTime(Map map);
+    
+    Integer queryMerchantIncomePageCountByTime(Map map);
+    
+    Double queryMerchantTotalIncomeByTime(Map map);
+}
+
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantMarketMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantMarketMapper.java
new file mode 100644
index 0000000..2c70c28
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantMarketMapper.java
@@ -0,0 +1,24 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.MerchantMarket;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 商户奖励金记录表 Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-11-02
+ */
+public interface MerchantMarketMapper extends BaseMapper<MerchantMarket> {
+
+    /**
+     * 获取奖励金额度
+     * @param userId
+     * @return
+     */
+    BigDecimal getCountMarketAmt(Long userId);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantMemberCodeMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantMemberCodeMapper.java
new file mode 100644
index 0000000..117d2b2
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantMemberCodeMapper.java
@@ -0,0 +1,23 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.MerchantMemberCode;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * <p>
+ * 动态商户会员卡生成记录 Mapper 接口
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-06-07
+ */
+public interface MerchantMemberCodeMapper extends BaseMapper<MerchantMemberCode> {
+
+    @Select("SELECT * FROM tb_pluss_merchant_member_code WHERE `code` = #{code}")
+    MerchantMemberCode getByCode(String code);
+
+    @Delete("DELETE FROM tb_pluss_merchant_member_code WHERE `cardNo` = #{cardNo}")
+    void removeByCardNo(String cardNo);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantMenberComsumeMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantMenberComsumeMapper.java
new file mode 100644
index 0000000..3c86c22
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantMenberComsumeMapper.java
@@ -0,0 +1,29 @@
+package cn.pluss.platform.mapper;
+
+import java.util.List;
+import java.util.Map;
+import org.apache.ibatis.annotations.Mapper;
+import cn.pluss.platform.entity.MerchantMenberComsume;
+
+@Mapper
+public interface MerchantMenberComsumeMapper {
+
+    public MerchantMenberComsume queryMerchantMenberComsume(MerchantMenberComsume merchantMenberComsume);
+
+    public List<MerchantMenberComsume> queryMerchantMenberComsumeList(MerchantMenberComsume merchantMenberComsume);
+
+    public void saveMerchantMenberComsume(MerchantMenberComsume merchantMenberComsume);
+
+    public void updateMerchantMenberComsume(MerchantMenberComsume merchantMenberComsume);
+
+    public void deleteMerchantMenberComsume(MerchantMenberComsume merchantMenberComsume);
+
+    public List<MerchantMenberComsume> queryMerchantMenberComsumePage(Map map);
+
+    public Integer queryMerchantMenberComsumePageCount(Map map);
+
+    public void saveMerchantMenberComsumeBatch(List<MerchantMenberComsume>  merchantMenberComsumeList);
+    
+    public Double queryMerchantMenberComsumeByTime(Map map);
+}
+
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantMenberMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantMenberMapper.java
new file mode 100644
index 0000000..f82b537
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantMenberMapper.java
@@ -0,0 +1,116 @@
+package cn.pluss.platform.mapper;
+
+import java.util.List;
+import java.util.Map;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import cn.pluss.platform.entity.MerchantMenber;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
+
+@Mapper
+public interface MerchantMenberMapper extends BaseMapper<MerchantMenber> {
+
+    MerchantMenber queryMerchantMenber(MerchantMenber merchantMenber);
+
+    List<MerchantMenber> queryMerchantMenberList(MerchantMenber merchantMenber);
+
+    void saveMerchantMenber(MerchantMenber merchantMenber);
+
+    void updateMerchantMenber(MerchantMenber merchantMenber);
+
+    void deleteMerchantMenber(MerchantMenber merchantMenber);
+
+    List<MerchantMenber> queryMerchantMenberPage(Map map);
+
+    Integer queryMerchantMenberPageCount(Map map);
+
+    void saveMerchantMenberBatch(List<MerchantMenber> merchantMenberList);
+    
+    Double queryMerchantMenberTotalRechargeFee(Map map);
+    
+    Double queryMerchantMenberUsableRechargeFee(Map map);
+    
+    Integer queryMerchantMenberNumByTime(Map map);
+    
+    
+    /**
+     * 
+     * queryMerchantRecharge:(查询商户的账单). <br/> 
+     * 
+     * @author Administrator 
+     * @param merchantCode
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @param orderType 0：会员消费，1：会员充值'
+     * @return 
+     * @since JDK 1.8
+     */
+    Double queryMerchantMemberBill(@Param(value = "rechargeType") String rechargeType, @Param(value = "orderType") String orderType, @Param(value = "merchantCode") String merchantCode, @Param(value = "startTime") String startTime, @Param(value = "endTime") String endTime);
+    
+    /**
+     * 
+     * queryMerchantGiveMoney:(赠送返现金额). <br/> 
+     * 
+     * @author Administrator 
+     * @param merchantCode
+     * @return 
+     * @since JDK 1.8
+     */
+    Double queryMerchantGiveMoney(@Param(value = "merchantCode") String merchantCode);
+    
+    /**
+     * 
+     * manageQueryMerchantMenberPage:(manage). <br/> 
+     * 
+     * @author Administrator 
+     * @param map
+     * @return 
+     * @since JDK 1.8
+     */
+    List<MerchantMenber> manageQueryMerchantMenberPage(Map map);
+
+    List<MerchantMenber> manageQueryMerchantNoMenberPage(Map map);
+    /**
+     * 
+     * manageQueryMerchantMenberPageCount:(这里用一句话描述这个方法的作用). <br/> 
+     * 
+     * @author Administrator 
+     * @param map
+     * @return 
+     * @since JDK 1.8
+     */
+    Integer manageQueryMerchantMenberPageCount(Map map);
+
+    Integer manageQueryMerchantNoMenberPageCount(Map map);
+
+    List<MerchantMenber> manageMerchantMenberSum(Map<String, Object> newMemberMap);
+
+    /**
+     * 关联分页查询会员卡列表
+     * @param page
+     * @param menber
+     * @return
+     */
+    Page<MerchantMenber> pageJoinData(@Param("page") Page<MerchantMenber> page, @Param("menber")MerchantMenber menber);
+
+    /**
+     * 根据unionId 修改openid
+     * @date: 2021/12/9 18:00
+     */
+    @Update("UPDATE tb_pluss_merchant_menber SET openid = #{openId} WHERE unionId = #{unionId}")
+    void updateByUnionId(@Param("openId") String openId,@Param("unionId") String unionId);
+
+    /**
+     * 根据会员卡号获取会员卡信息
+     * @param cardNo
+     * @return
+     */
+    @Select("SELECT * FROM tb_pluss_merchant_menber WHERE cardNo = #{cardNo}")
+    MerchantMenber getByCardNo(String cardNo);
+}
+
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantMenberRechargeMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantMenberRechargeMapper.java
new file mode 100644
index 0000000..b79ae1a
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantMenberRechargeMapper.java
@@ -0,0 +1,31 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.MerchantMenberRecharge;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface MerchantMenberRechargeMapper {
+
+    MerchantMenberRecharge queryMerchantMenberRecharge(MerchantMenberRecharge merchantMenberRecharge);
+
+    List<MerchantMenberRecharge> queryMerchantMenberRechargeList(MerchantMenberRecharge merchantMenberRecharge);
+
+    void saveMerchantMenberRecharge(MerchantMenberRecharge merchantMenberRecharge);
+
+    void updateMerchantMenberRecharge(MerchantMenberRecharge merchantMenberRecharge);
+
+    void deleteMerchantMenberRecharge(MerchantMenberRecharge merchantMenberRecharge);
+
+    List<MerchantMenberRecharge> queryMerchantMenberRechargePage(Map map);
+
+    Integer queryMerchantMenberRechargePageCount(Map map);
+
+    void saveMerchantMenberRechargeBatch(List<MerchantMenberRecharge>  merchantMenberRechargeList);
+    
+    List<MerchantMenberRecharge> queryMerchantMenberRechargeListByTime(Map map);
+    
+}
+
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantMoveRecordsMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantMoveRecordsMapper.java
new file mode 100644
index 0000000..7512ad2
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantMoveRecordsMapper.java
@@ -0,0 +1,22 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.MerchantMoveRecords;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * <p>
+ * 商户动态码生成记录 Mapper 接口
+ * </p>
+ *
+ * @author bzg
+ * @since 2021-07-30
+ */
+public interface MerchantMoveRecordsMapper extends BaseMapper<MerchantMoveRecords> {
+
+    @Select("select IFNULL(sum(payNum),0) from tb_pluss_merchant_move_records ${ew.customSqlSegment}")
+    Integer getPaySuccessCount(@Param(Constants.WRAPPER) Wrapper<MerchantMoveRecords> wrapper);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantMoveSettingMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantMoveSettingMapper.java
new file mode 100644
index 0000000..06cab20
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantMoveSettingMapper.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.MerchantMoveSetting;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 商户动态码基本配置 Mapper 接口
+ * </p>
+ *
+ * @author bzg
+ * @since 2021-07-30
+ */
+public interface MerchantMoveSettingMapper extends BaseMapper<MerchantMoveSetting> {
+
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantOrderMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantOrderMapper.java
new file mode 100644
index 0000000..561f590
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantOrderMapper.java
@@ -0,0 +1,431 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.MerchantOrder;
+import cn.pluss.platform.entity.UserProfit;
+import cn.pluss.platform.vo.*;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @see cn.pluss.platform.mapper.MerchantOrderVOMapper
+ */
+@Mapper
+public interface MerchantOrderMapper extends BaseMapper<MerchantOrder> {
+
+	/**
+	 * 统计一些数值的合计值
+	 * @return .
+	 */
+	<E extends MerchantOrder> MerchantOrder sumData(@Param(Constants.WRAPPER) Wrapper<E> wrapper);
+
+    MerchantOrder queryMerchantOrder(MerchantOrder merchantOrder);
+
+    List<MerchantOrder> queryMerchantOrderList(MerchantOrder merchantOrder);
+
+    List<MerchantOrder> queryMerchantOrderPage(Map map);
+
+    Integer queryMerchantOrderPageCount(Map map);
+
+    void saveMerchantOrderBatch(List<MerchantOrder> merchantOrderList);
+    
+    /**
+     * 可提现总金额（提现规则  超过一个月的时间）推广
+     * @param 
+     * @return
+     */
+	Double sumMerchantAllowCashMoney(@Param(value = "memberCode") String memberCode);
+    
+    /**
+     * 不可提现总金额（提现规则 不超过一个月）推广
+     * @param 
+     * @return
+     */
+	Double sumMerchantNotAllowCashMoney(@Param(value = "memberCode") String memberCode);
+    
+    /**
+     * 今日分润 推广
+     * @param merchantCode
+     * @return
+     */
+	Double sumNowDayShareMoney(@Param(value = "memberCode") String merchantCode);
+    
+    /**
+     * 累计总分润 推广
+     * @return
+     */
+	Double sumAllShareMoney(@Param(value = "memberCode") String memberCode);
+
+    
+    
+    /**
+     * 供 商户推广- 交易明细 接口使用 
+     * @param map
+     * @return
+     */
+	List<MerchantOrder> queryMerchantOrderPageApp(Map map);
+    
+    /**
+     * 供 商户推广- 交易明细 接口使用
+     * @param map
+     * @return
+     */
+	Integer queryMerchantOrderPageCountApp(Map map);
+
+    Integer queryMerchantOrderPageCountByTime(Map map);
+    
+    Double queryMerchantOrdeFeeByTime(Map map);
+
+	List<MerchantOrder> queryMerchantOrderPageByTime(Map map);
+	
+	/**
+	 * 汇总流水（manage）
+	 */
+	SummaryOfWaterVO querySummaryOfWater(Map map);
+	
+	/**
+	 * 订单退款信息
+	 * @param map
+	 * @return
+	 */
+	List<MerchantOrder> queryMerchantOrderRefundPage(Map map);
+	
+	/**
+	 * 订单退款统计
+	 * @param map
+	 * @return
+	 */
+	Integer queryMerchantOrderRefundPageCount(Map map);
+
+	Double queryMerchantOrderShareMoney(Map map);
+	
+	/**
+	 * 
+	 * queryOrderTask:(给wap端的定时任务使用的 暂定查3天内状态为5待支付的订单). <br/> 
+	 * 
+	 * @author Administrator 
+	 * @param merchantOrder
+	 * @return 
+	 * @since JDK 1.8
+	 */
+	List<MerchantOrder> queryOrderTask(MerchantOrder merchantOrder);
+	
+	/**
+	 * 7日交易数统计
+	 * @param s 
+	 */
+	List<OrderStatisticsVO> queryOrderStatistics(MerchantOrder s);
+	
+	/**
+	 * 支付通道统计
+	 * @param s 
+	 */
+	List<PayTypeStatisticsVO> queryPayTypeStatistics(MerchantOrder s);
+	
+	
+	Double queryMerchantOrderEnterFeeByTime(Map map);
+	
+	Double queryMerchantOrderShareMoneyByTime(Map map);
+	
+	/**
+	 * 
+	 * queryMerchantOrderPageShuju:(最新统计订单方法). <br/> 
+	 * 
+	 * @author Administrator 
+	 * @param map
+	 * @return 
+	 * @since JDK 1.8
+	 */
+	List<MerchantMangeOrderVO> queryMerchantOrderPageShuju(Map<String, Object> map);
+
+//	List<MerchantMangeOrderVO> queryMerchantOrderNoPageShuju(Map<String, Object> map);
+	
+	/**
+	 * 
+	 * queryMerchantOrderPageCountShuju:(最新统计订单方法). <br/> 
+	 * 
+	 * @author Administrator 
+	 * @param map
+	 * @return 
+	 * @since JDK 1.8
+	 */
+	Integer queryMerchantOrderPageCountShuju(Map<String, Object> map);
+
+//	Integer queryMerchantOrderNoPageCountShuju(Map<String, Object> map);
+	/**
+	 * 
+	 * querySumEarnings:(统计总的收益 根据时间). <br/> 
+	 * 
+	 * @author Administrator 
+	 * @param map
+	 * @return 
+	 * @since JDK 1.8
+	 */
+	List<MerchantMangeOrderVO> querySumEarnings(Map<String, Object> map);
+	
+	/**
+	 * 
+	 * promoterSumCash:(推广员退关分润余额信息统计). <br/> 
+	 * 
+	 * @author Administrator 
+	 * @param userId
+	 * @return 
+	 * @since JDK 1.8
+	 */
+	PromoterSumVO promoterSumCash(@Param(value = "userId") Long userId);
+	
+	
+	
+	/**
+	 * 
+	 * PlatformSum:(统计平台大屏的门店数量 商户数量 交易总额 交易笔数 会员数量 推广员数量 推广分润总额 粉丝奖励总额 收益总计). <br/> 
+	 * 
+	 * @author Administrator 
+	 * @return 
+	 * @since JDK 1.8
+	 */
+	PlatformSumVO PlatformSum(@Param(value = "timeStatus") String timeStatus);
+	
+	/**
+	 * 
+	 * sumConsumeFeebystoreId:(查询门店的今日流水 跟总流水). <br/> 
+	 * 
+	 * @author Administrator 
+	 * @param storeId
+	 * @return 
+	 * @since JDK 1.8
+	 */
+	StoreVO sumConsumeFeebystoreId(String storeId);
+	
+	/**
+	 * 
+	 * sumConsumeFeebystoreId:(查询商户的今日流水 跟总流水). <br/> 
+	 * 
+	 * @author Administrator
+	 * @return 
+	 * @since JDK 1.8
+	 */
+	StoreVO sumConsumeFeebymerchantCode(String merchantCode);
+
+	/**
+	 * 修改总金额
+	 * @param orderMap
+	 * @return
+	 */
+	Double getOrderFeeSum1(Map<String, Object> orderMap);
+	
+	Double getToDayTransSum1(Map<String, Object> orderMap);
+
+	@Select("SELECT SUM(consumeFee) fee, status FROM tb_pluss_merchant_order ${ew.customSqlSegment}")
+	<E extends MerchantOrder> List<Map<String, Object>> getSumConsumeFee(@Param(Constants.WRAPPER) Wrapper<E> wrapper);
+
+	@Select("SELECT IFNULL(SUM(IF(`status` = 1, enterFee, -enterFee)), 0) fee FROM tb_pluss_merchant_order ${ew.customSqlSegment}")
+	<E extends MerchantOrder> Map<String, Object> getSumEnterFee(@Param(Constants.WRAPPER) Wrapper<E> wrapper);
+
+	@Select("SELECT IFNULL(SUM(IF(`status` = 1, consumeFee, -consumeFee)), 0) fee, count(1) count FROM tb_pluss_merchant_order " +
+			"WHERE merchantCode = #{merchantCode} AND createDate = #{date} AND `status` IN (1, 2)")
+	Map<String, Object> getConsumeFee(@Param("merchantCode") String merchantCode, @Param("date") String date);
+
+    Map<String, Object> querySumCount(Map<String, Object> params);
+
+	/**
+	 * 获取分组总营业额
+	 * @param merchantCodeList
+	 * @return
+	 */
+	List<Map<String, Object>> selectGroupMerchantTotalConsumeMoney(@Param("merchantCodeList") List<String> merchantCodeList);
+
+	/**
+	 * 查询自己和子属商户交易成功总额
+	 * @param merchantNoList
+	 * @return
+	 */
+    Double queryNextMercTransAmtCount(List<String> merchantNoList);
+
+	/**
+	 * 查询直推商户当月的总交易流水
+	 * @param parentId
+	 * @return
+	 */
+	Double querySubMerchantTransMonthAmount(@Param("parentId") String parentId);
+
+	/**
+	 * 查询直推商户上月的总交易流水
+	 * @param parentId
+	 * @return
+	 */
+	Double querySubMerchantTransLastMonthAmount(@Param("parentId") String parentId);
+
+	/**
+	 * 批量更新
+	 * @param lists
+	 */
+    void updateBatch(List<MerchantOrder> lists);
+
+	/**
+	 * 获取超级代理商下级商户当月交易额
+	 * @param params
+	 * @return
+	 */
+	List<Map<String, Object>> getSuperMerchantToDayTradeMoneyCount(Map<String, Object> params);
+
+	/**
+	 * 获取指定时间段内的订单记录
+	 * @param merchantCode 店铺code
+	 * @param start 开始时间
+	 * @param end   结束时间
+	 * @return  每天的总流水
+	 */
+	List<Map<String, Object>> queryDailyCount(@Param("merchantCode") String merchantCode, @Param("start") Date start, @Param("end") Date end);
+
+	/**
+	 *订单推广分润明细
+	 * @param map
+	 *
+	 * @return
+	 */
+	List<MerchantOrderProfitVO> selectProfitPage(Map<String,Object> map);
+
+	Integer selectProfitPageCount(Map<String, Object> map);
+
+
+	Double toDayTransZfbSum(Map<String, Object> orderMap);
+
+	Double toDayTransWxSum(Map<String, Object> orderMap);
+
+    Double toDayTransYsfSum(Map<String, Object> orderMap);
+
+    Integer toDayTransZfbCount(Map<String, Object> orderMap);
+
+    Integer toDayTransWxCount(Map<String, Object> orderMap);
+
+    Integer toDayTransYsfCount(Map<String, Object> orderMap);
+
+	/**
+	 * 统计营销活动奖励金
+	 * @return
+	 */
+//	Map<String, BigDecimal> getCountMaketAmt(@Param("userId") Long userId,@Param("date") String date,@Param("auditDate") String auditDate);
+
+	/**
+	 * 获取商户当前已经积累的交易额度
+	 * @param merchantCode
+	 * @return
+	 */
+	Map<String, Double> getCountTradeAmt(@Param("merchantCode")String merchantCode,
+										 @Param("date") String date,
+										 @Param("startDate") String startDate,
+										 @Param("endDate") String endDate);
+
+	BigDecimal getCountMaketAmtAndDate(@Param("merchantCode") String merchantCode, @Param("date") String date);
+
+
+	Page<MerchantOrder> pageWapInfo(@Param("page") Page<MerchantOrder> page, @Param("order")MerchantOrder order);
+
+	/**
+	 * 计算累计省钱金额和今日省钱金额
+	 * @param merchantCode
+	 * @param nowDate
+	 * @return
+	 */
+    Map<String, BigDecimal> getSaveMoneyCount(@Param("merchantCode") String merchantCode,
+											  @Param("date") String nowDate,
+											  @Param("startDate")String startDate,
+											  @Param("endDate")String endDate);
+
+	/**
+	 * 分页连表查询
+	 * @param page
+	 * @param query
+	 * @return
+	 */
+	Page<MerchantOrder> pageInfo(@Param("page") Page<MerchantOrder> page, @Param("order")MerchantOrder query);
+
+	/**
+	 * 获取商户当天交易的结算金额
+	 * @return
+	 */
+    BigDecimal getCountNowDateSettleAmt(String merchantCode);
+
+    /**
+     * @description:订单列表根据查询条件统计数据
+     * @date: 2021/8/5 16:59
+     * @param map:
+     * @return java.util.Map<java.lang.String,java.lang.Object>
+     */
+    Map<String, Object> getOrderCountData(Map<String, Object> map);
+
+	@Select("SELECT * FROM tb_pluss_merchant_order WHERE orderNumber = #{orderNumber} FOR UPDATE")
+    MerchantOrder getLockByOrderNumber(String orderNumber);
+	/**
+	 * @description:获取订单首页数据
+	 * @date: 2021/10/19 14:56
+	 * @return java.util.Map<java.lang.String,java.lang.Object>
+	 */
+	Map<String, Object> getPlatformOrderData();
+
+	/**
+	 * @description:统计累计金额数据
+	 * @date: 2021/10/19 17:53
+	 * @return java.util.Map<java.lang.String,java.lang.Object>
+	 */
+	Map<String, Object> getPlatformAmtData();
+
+	/**
+	 * 获取每个用户的订单流水
+	 * @date: 2022/1/15 11:34
+	 * @param date:
+	 * @return
+	 */
+	List<UserProfit> getOrderFlow(@Param("date")String date, @Param("sort")Integer sort);
+
+
+	Integer getOrderMaxSort(String date);
+
+	/**
+	 * 查询交易数据
+	 * @return
+	 */
+	Map<String, String> getPlatformTransData();
+
+	/**
+	 * 根据商户号和时间获取流水
+	 * @date: 2022/3/1 17:01
+	 * @param mercList:
+	 * @param date:
+	 * @param flag:
+	 * @return java.math.BigDecimal
+	 */
+    BigDecimal getAreaOrderCount(@Param("mercList") List<String> mercList, @Param("date") String date, @Param("flag") Integer flag);
+
+	/**
+	 * 获取交易金额
+	 * @Param date
+	 * @param startDate
+	 * @param endDate
+	 * @return
+	 */
+	@Select("SELECT IFNULL(SUM(consumeFee - refundAmt),0) FROM tb_pluss_merchant_order  WHERE createDate = #{date} AND `status` = 1 AND createDt >= #{startDate} AND createDt <= #{endDate}")
+	BigDecimal getPlatformAmtYestNowData(@Param("date") String date,@Param("startDate") String startDate, @Param("endDate") String endDate);
+
+	/**
+	 * 获取有效交易笔数
+	 * @param merchantCode
+	 * @return
+	 */
+	@Select("SELECT count(1) FROM (SELECT mercUserId FROM tb_pluss_merchant_order WHERE merchantCode = #{merchantCode} GROUP BY mercUserId) a")
+	Integer getValidNumByMerchantCode(String merchantCode);
+
+	@Select("SELECT * FROM tb_pluss_merchant_order WHERE mercOrderNo = #{mercOrderNo} limit 1")
+    MerchantOrder getByMercOrderNo(String mercOrderNo);
+}
+
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantOrderRiskMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantOrderRiskMapper.java
new file mode 100644
index 0000000..e86526a
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantOrderRiskMapper.java
@@ -0,0 +1,9 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.MerchantOrderRisk;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface MerchantOrderRiskMapper extends BaseMapper<MerchantOrderRisk> {
+}
\ No newline at end of file
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantOrderSplitDetailMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantOrderSplitDetailMapper.java
new file mode 100644
index 0000000..216a0c8
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantOrderSplitDetailMapper.java
@@ -0,0 +1,20 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.MerchantOrderSplitDetail;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * <p>
+ * 分账明细详情表 Mapper 接口
+ * </p>
+ *
+ * @author bzg
+ * @since 2022-07-01
+ */
+public interface MerchantOrderSplitDetailMapper extends BaseMapper<MerchantOrderSplitDetail> {
+
+    @Select("SELECT * FROM tb_pluss_merchant_order_split_detail WHERE  orderNumber = #{orderNumber} and merchantCode = #{merchantCode} ")
+    MerchantOrderSplitDetail getByOrderNumberAndMerchantCode(@Param("orderNumber") String orderNumber, @Param("merchantCode") String merchantCode);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantOrderSplitMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantOrderSplitMapper.java
new file mode 100644
index 0000000..5d2794f
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantOrderSplitMapper.java
@@ -0,0 +1,22 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.MerchantOrderSplit;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * <p>
+ * 订单分账信息表 Mapper 接口
+ * </p>
+ *
+ * @author bzg
+ * @since 2021-11-26
+ */
+public interface MerchantOrderSplitMapper extends BaseMapper<MerchantOrderSplit> {
+
+    @Select("SELECT * from tb_pluss_merchant_order_split where mercOrderNo = #{mercOrderNo} limit 1")
+    MerchantOrderSplit getByMercOrderNo(String mercOrderNo);
+
+    @Select("SELECT * from tb_pluss_merchant_order_split where orderNumber = #{orderNumber} limit 1")
+    MerchantOrderSplit getByOrderNumber(String orderNumber);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantOrderSplitRefundMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantOrderSplitRefundMapper.java
new file mode 100644
index 0000000..00d8d08
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantOrderSplitRefundMapper.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.MerchantOrderSplitRefund;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 分账订单退款详情表 Mapper 接口
+ * </p>
+ *
+ * @author bzg
+ * @since 2022-07-04
+ */
+public interface MerchantOrderSplitRefundMapper extends BaseMapper<MerchantOrderSplitRefund> {
+
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantOrderStatisticsMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantOrderStatisticsMapper.java
new file mode 100644
index 0000000..c192eba
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantOrderStatisticsMapper.java
@@ -0,0 +1,50 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.MerchantOrderStatistics;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * <p>
+ * 商户订单统计表 Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-12-21
+ */
+public interface MerchantOrderStatisticsMapper extends BaseMapper<MerchantOrderStatistics> {
+
+    /**
+     * 插入商户统计数据
+     * @param startDate     开始时间
+     * @param endDate       截止时间
+     * @return  操作结果条数
+     */
+    int insertStatistics(@Param("startDate") Date startDate, @Param("endDate") Date endDate);
+
+    /**
+     * 插入商户统计数据, 全量统计
+     * @return  操作结果条数
+     */
+    int insertAllStatics();
+
+    /**
+     * 获取直推总交易钱数, 以及交易笔数
+     * @param pId       上级id
+     * @param month     月份，传则当月，不传全部
+     * @return
+     */
+    MerchantOrderStatistics selectDirectTotal(@Param("pId") String pId, @Param("month") String month);
+
+    /**
+     * 获取非直推总交易钱数, 以及交易笔数
+     * @param pId       上级id
+     * @param month     月份，传则当月，不传全部
+     * @return
+     */
+    MerchantOrderStatistics selectIndirectTotal(@Param("pId") String pId, @Param("month") String month);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantOrderVOMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantOrderVOMapper.java
new file mode 100644
index 0000000..396c7d5
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantOrderVOMapper.java
@@ -0,0 +1,33 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.vo.MerchantOrderVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 只做查询
+ * @author djh
+ * @see cn.pluss.platform.mapper.MerchantOrderMapper
+ */
+@Mapper
+public interface MerchantOrderVOMapper extends BaseMapper<MerchantOrderVO> {
+
+    /**
+     * 查询线上店订单所有的优惠减免信息
+     * @param orderNumber   订单号
+     * @return
+     */
+    List<Map<String, Object>> getOnlineCouponList(@Param("orderNumber") String orderNumber);
+
+
+    /**
+     * 查询线下订单所有的优惠减免信息
+     * @param orderNumber   订单号
+     * @return
+     */
+    List<Map<String, Object>> getOfflineCouponList(@Param("orderNumber") String orderNumber);
+}
\ No newline at end of file
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantPluginMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantPluginMapper.java
new file mode 100644
index 0000000..a448eac
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantPluginMapper.java
@@ -0,0 +1,30 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.MerchantPlugin;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 商户插件表 Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-01-29
+ */
+public interface MerchantPluginMapper extends BaseMapper<MerchantPlugin> {
+
+    /**
+     * 有效的插件进件信息
+     * @param userId
+     * @return
+     */
+    MerchantPlugin selectValidMerchantPlugin(String userId);
+
+    /**
+     * 获取未实名认证、瑞银信通道进件的商户
+     * @return 商户进件信息列表
+     */
+    List<MerchantPlugin> getRyxNoCertMerchant();
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantProfitMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantProfitMapper.java
new file mode 100644
index 0000000..34736a9
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantProfitMapper.java
@@ -0,0 +1,71 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.dto.MerchantFeeDTO;
+import cn.pluss.platform.entity.MerchantProfit;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface MerchantProfitMapper extends BaseMapper<MerchantProfit> {
+
+    List<MerchantProfit> selectGroupMercProfit(@Param("userIdList") List<Long> userIdList);
+
+    @Select("SELECT SUM(`price`) FROM tb_pluss_merchant_profit WHERE `status` = '1' AND userId = #{userId}")
+    BigDecimal selectSumValidProfit(@Param("userId") String userId);
+
+    MerchantProfit queryMerchantProfit(MerchantProfit merchantProfit);
+
+    List<MerchantProfit> queryMerchantProfitList(MerchantProfit merchantProfit);
+
+    List<MerchantProfit> queryMerchantProfitPage(Map map);
+
+    Integer queryMerchantProfitPageCount(Map map);
+
+    void saveMerchantProfitBatch(List<MerchantProfit> merchantProfitList);
+    
+    Double queryMerchantProfitSumConsumeFee(Map map);
+    
+    Double queryMerchantProfitSumPrice(Map map);
+    
+    Integer queryMerchantProfitPageCountGroupByOrderNumber(Map map);
+
+    /**
+     * 查询流水以及分润
+     * @param userId            上级id, 也可能是上上级
+     * @param merchantCodeList  店铺code列表
+     * @param startTime         开始时间
+     * @param endTime           截止时间
+     * @return
+     */
+    List<MerchantFeeDTO> queryMerchantBillWithProfit(@Param("userId") String userId, @Param("merchantCodeList") List<String> merchantCodeList, @Param("startTime") Date startTime, @Param("endTime") Date endTime);
+
+
+    void updateMerchantProfit(MerchantProfit p);
+
+    /**
+     * 批量更新 指定字段
+     * @param listp
+     */
+    void updateBatch(List<MerchantProfit> listp);
+
+
+    Map<String, Object> getProfitCount(Map<String, Object> map);
+
+    /**
+     * 通过分润数据查询对应的费率信息
+     * @param merchantProfitList
+     * @return
+     */
+    List<Map<String, Object>> queryMerchantProfitRate(@Param("merchantProfitList") List<MerchantProfit> merchantProfitList, @Param("userId") String userId);
+
+
+    Map<String, BigDecimal> getProfitAmtCount(MerchantProfit condition);
+}
+
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantQrcodeMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantQrcodeMapper.java
new file mode 100644
index 0000000..254b031
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantQrcodeMapper.java
@@ -0,0 +1,28 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.MerchantQrcode;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-10-23
+ */
+public interface MerchantQrcodeMapper extends BaseMapper<MerchantQrcode> {
+
+    List<MerchantQrcode> listPage(Map<String, Object> map);
+
+    Integer countMerchantQrcode(Map<String, Object> map);
+
+    @Select("SELECT * FROM tb_pluss_merchant_qrcode WHERE merchantCode = #{merchantCode} limit 1")
+    MerchantQrcode getByMerchantCode(String merchantCode);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantRateMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantRateMapper.java
new file mode 100644
index 0000000..a7872e5
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantRateMapper.java
@@ -0,0 +1,24 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.MerchantRate;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface MerchantRateMapper extends BaseMapper<MerchantRate> {
+
+    void batchUpdateRate(@Param("list") List<MerchantRate> list);
+
+    /**
+     * 获取需要修改瑞银信费率的记录
+     * <p>
+     *     前一天的费率修改记录，第二天凌晨2点以后修改。
+     *     所以这里只获取前一天的费率修改记录
+     * </p>
+     * @return 前一天的费率修改记录
+     */
+    List<MerchantRate> selectRyxRateChangeList();
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantRateNewMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantRateNewMapper.java
new file mode 100644
index 0000000..0116c17
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantRateNewMapper.java
@@ -0,0 +1,59 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.MerchantRateNew;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 商户费率表(新) Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-08-09
+ */
+public interface MerchantRateNewMapper extends BaseMapper<MerchantRateNew> {
+
+    /**
+     * 根据用户id获取费率信息
+     * @param userId    用户id
+     * @return 费率信息
+     */
+    MerchantRateNew selectByUserId(@Param("userId") String userId, @Param("channel") String channel);
+
+    /**
+     * 根据商编获取费率信息
+     * @param merchantCode  商编
+     * @return 费率信息
+     */
+    MerchantRateNew selectByMerchantCode(@Param("merchantCode") String merchantCode, @Param("channel") String channel);
+
+    Page<Map<String, Object>> pageData(Page<Object> page, @Param("condition") Map<String, Object> condition);
+
+    /**
+     * 2021-08-25 , 费率改版迁移使用的sql
+     * 查询费率未修改的商户
+     * @param page
+     * @return
+     */
+    Page<MerchantRateNew> pageTempSxfRateNoChange(Page<MerchantRateNew> page);
+
+    /**
+     * 2021-08-25 , 费率改版迁移使用的sql
+     * 查询费率未修改的商户
+     * @param page
+     * @return
+     */
+    Page<MerchantRateNew> pageTempRyxRateNoChange(Page<MerchantRateNew> page);
+
+    /**
+     * 2021-08-25 , 费率改版迁移使用的sql
+     * 查询费率未修改的商户
+     * @param page
+     * @return
+     */
+    Page<MerchantRateNew> pageTempYsRateNoChange(Page<MerchantRateNew> page);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantRateNewRecordMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantRateNewRecordMapper.java
new file mode 100644
index 0000000..55c51d5
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantRateNewRecordMapper.java
@@ -0,0 +1,36 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.MerchantRateNewRecord;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 商户费率表(新) Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-08-09
+ */
+public interface MerchantRateNewRecordMapper extends BaseMapper<MerchantRateNewRecord> {
+
+    MerchantRateNewRecord selectLastExaminedDataByUserId(@Param("userId") String userId, @Param("channel") String channel);
+
+    MerchantRateNewRecord selectLastExaminedDataByMerchantCode(@Param("merchantCode") String merchantCode, @Param("channel") String channel);
+
+    MerchantRateNewRecord selectValidDataByMerchantCode(@Param("merchantCode") String merchantCode, @Param("channel") String channel);
+
+    /**
+     * 获取需要修改瑞银信费率的记录
+     * <p>
+     *     前一天的费率修改记录，第二天凌晨2点以后修改。
+     *     所以这里只获取前一天的费率修改记录
+     * </p>
+     * @return 前一天的费率修改记录
+     */
+    List<MerchantRateNewRecord> selectRyxRateChangeList();
+
+    List<MerchantRateNewRecord> selectSxfRateChangeList();
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantRateRecordMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantRateRecordMapper.java
new file mode 100644
index 0000000..deaf70f
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantRateRecordMapper.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.MerchantRateRecord;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 费率修改记录表 Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-09-02
+ */
+public interface MerchantRateRecordMapper extends BaseMapper<MerchantRateRecord> {
+
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantRefundOrderMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantRefundOrderMapper.java
new file mode 100644
index 0000000..74449e9
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantRefundOrderMapper.java
@@ -0,0 +1,27 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.MerchantRefundOrder;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface MerchantRefundOrderMapper extends BaseMapper<MerchantRefundOrder> {
+
+    Integer queryRefundOrderJoinPageCount(Map<String, Object> map);
+
+    List<MerchantRefundOrder> queryRefundOrderJoinPage(Map<String, Object> map);
+
+    Page<MerchantRefundOrder> pageDate(Page<MerchantRefundOrder> page, @Param("refundOrder") MerchantRefundOrder refundOrder);
+
+    /**
+     * @description:统计首页退款数据
+     * @date: 2021/10/19 15:12
+     * @return java.util.Map<java.lang.String,java.lang.Object>
+     */
+    Map<String, Object> getPlatformRefundData();
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantRegistAuditRecordMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantRegistAuditRecordMapper.java
new file mode 100644
index 0000000..5cd545c
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantRegistAuditRecordMapper.java
@@ -0,0 +1,27 @@
+package cn.pluss.platform.mapper;
+
+import java.util.List;
+import java.util.Map;
+import org.apache.ibatis.annotations.Mapper;
+import cn.pluss.platform.entity.MerchantRegistAuditRecord;
+
+@Mapper
+public interface MerchantRegistAuditRecordMapper {
+
+    public MerchantRegistAuditRecord queryMerchantRegistAuditRecord(MerchantRegistAuditRecord merchantRegistAuditRecord);
+
+    public List<MerchantRegistAuditRecord> queryMerchantRegistAuditRecordList(MerchantRegistAuditRecord merchantRegistAuditRecord);
+
+    public void saveMerchantRegistAuditRecord(MerchantRegistAuditRecord merchantRegistAuditRecord);
+
+    public void updateMerchantRegistAuditRecord(MerchantRegistAuditRecord merchantRegistAuditRecord);
+
+    public void deleteMerchantRegistAuditRecord(MerchantRegistAuditRecord merchantRegistAuditRecord);
+
+    public List<MerchantRegistAuditRecord> queryMerchantRegistAuditRecordPage(Map map);
+
+    public Integer queryMerchantRegistAuditRecordPageCount(Map map);
+
+    public void saveMerchantRegistAuditRecordBatch(List<MerchantRegistAuditRecord>  merchantRegistAuditRecordList);
+}
+
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantRegistLogMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantRegistLogMapper.java
new file mode 100644
index 0000000..352b851
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantRegistLogMapper.java
@@ -0,0 +1,27 @@
+package cn.pluss.platform.mapper;
+
+import java.util.List;
+import java.util.Map;
+import org.apache.ibatis.annotations.Mapper;
+import cn.pluss.platform.entity.MerchantRegistLog;
+
+@Mapper
+public interface MerchantRegistLogMapper {
+
+    public MerchantRegistLog queryMerchantRegistLog(MerchantRegistLog merchantRegistLog);
+
+    public List<MerchantRegistLog> queryMerchantRegistLogList(MerchantRegistLog merchantRegistLog);
+
+    public void saveMerchantRegistLog(MerchantRegistLog merchantRegistLog);
+
+    public void updateMerchantRegistLog(MerchantRegistLog merchantRegistLog);
+
+    public void deleteMerchantRegistLog(MerchantRegistLog merchantRegistLog);
+
+    public List<MerchantRegistLog> queryMerchantRegistLogPage(Map map);
+
+    public Integer queryMerchantRegistLogPageCount(Map map);
+
+    public void saveMerchantRegistLogBatch(List<MerchantRegistLog>  merchantRegistLogList);
+}
+
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantRejectDescMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantRejectDescMapper.java
new file mode 100644
index 0000000..5978195
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantRejectDescMapper.java
@@ -0,0 +1,19 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.MerchantRejectDesc;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author bzg
+ * @since 2021-01-11
+ */
+public interface MerchantRejectDescMapper extends BaseMapper<MerchantRejectDesc> {
+
+    @Select("select IFNULL(max(sort)+1,1) from tb_pluss_merchant_reject_desc")
+    Integer getMaxSort();
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantSplitSettingMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantSplitSettingMapper.java
new file mode 100644
index 0000000..e5bbe7c
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantSplitSettingMapper.java
@@ -0,0 +1,20 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.MerchantSplitSetting;
+import cn.pluss.platform.vo.MerchantSplitSettingVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 商户分账配置表 Mapper 接口
+ * </p>
+ *
+ * @author bzg
+ * @since 2021-11-26
+ */
+public interface MerchantSplitSettingMapper extends BaseMapper<MerchantSplitSetting> {
+
+    Page<MerchantSplitSettingVO> pageInfo(@Param("page")Page<MerchantSplitSettingVO> page, @Param("vo") MerchantSplitSettingVO vo);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantStaffConnMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantStaffConnMapper.java
new file mode 100644
index 0000000..bb28631
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantStaffConnMapper.java
@@ -0,0 +1,35 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.MerchantBaseInfo;
+import cn.pluss.platform.entity.MerchantStaffConn;
+import cn.pluss.platform.vo.MerchantStaffConnVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 员工商户关联表 Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-03-24
+ */
+public interface MerchantStaffConnMapper extends BaseMapper<MerchantStaffConn> {
+
+    /**
+     * 根据用户id获取记录
+     * @param userId    用户id
+     * @return
+     */
+    List<MerchantStaffConnVO> selectByUserId(@Param("userId") String userId);
+
+    /**
+     * @description:根据员工userAppid获取所绑定门店信息
+     * @date: 2021/9/23 17:59
+     * @param userAppId:
+     * @return java.util.List<cn.pluss.platform.entity.MerchantBaseInfo>
+     */
+    List<MerchantBaseInfo> getMercInfoByStaffId(String userAppId);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantStoreMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantStoreMapper.java
new file mode 100644
index 0000000..652cd20
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantStoreMapper.java
@@ -0,0 +1,98 @@
+package cn.pluss.platform.mapper;
+
+import java.util.List;
+import java.util.Map;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Mapper;
+import cn.pluss.platform.entity.MerchantStore;
+import cn.pluss.platform.vo.StoreInfoVO;
+import cn.pluss.platform.vo.StoreSignVO;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * @author djh
+ */
+@Mapper
+public interface MerchantStoreMapper extends BaseMapper<MerchantStore> {
+
+    default List<MerchantStore> queryMerchantStoreList(MerchantStore merchantStore) {
+        QueryWrapper<MerchantStore> qWrapper = new QueryWrapper<>(merchantStore);
+        qWrapper.orderByDesc("id");
+        return selectList(qWrapper);
+    }
+
+    default MerchantStore getStoreByMerchantCode(String merchantCode){
+        QueryWrapper<MerchantStore> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("merchantCode",merchantCode);
+        return selectOne(queryWrapper);
+    }
+
+    List<MerchantStore> queryMerchantNoStoreList(MerchantStore merchantStore);
+
+    List<MerchantStore> queryMerchantStorePage(Map<String, String> map);
+
+    Integer queryMerchantStorePageCount(Map<String, String> map);
+
+    Integer queryMerchantStoreNoPageCount(Map<String, String> map);
+    
+    /**
+     * 供商户推广-商户列表  接口 使用
+     * @param map
+     * @return
+     */
+    List<MerchantStore> queryMerchantStorePageApp(Map<String, String> map);
+    
+    /**
+     * 供商户推广-商户列表  接口 使用
+     * @param map
+     * @return
+     */
+    Integer queryMerchantStorePageCountApp(Map<String, String> map);
+    
+    /**
+     * 
+     * queryNewStoreListPage:(查询后台门店信息展示列表). <br/> 
+     *
+     * @author Administrator 
+     * @param map
+     * @return 
+     * @since JDK 1.8
+     */
+    List<List<?>> queryNewStoreListPage(Map<String, Object> map);
+
+    /**
+     * 
+     * queryStoreSignList:(门店签约信息). <br/> 
+     *
+     * @author Administrator 
+     * @param map
+     * @return 
+     * @since JDK 1.8
+     */
+    List<StoreSignVO> queryStoreSignList(Map<String, Object> map);
+
+    void disableMerchantStore(Map<String, Object> params);
+
+    void pesUpdateMerchantStore(Map<String,Object> params);
+
+    StoreInfoVO selectStatus(Map<String, Object> params);
+
+    void operatMarketMerchantStore(Map<String, Object> params);
+
+    StoreInfoVO showMerchantStoreReceipt(Integer userId);
+
+    /**
+     * 后台商户管理列表分页查询
+     * @param page
+     * @param wrapper
+     * @return
+     */
+    Page<StoreInfoVO> selectPage2(Page<MerchantStore> page, @Param(value = Constants.WRAPPER) Wrapper<MerchantStore> wrapper);
+}
+
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantTransferCashMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantTransferCashMapper.java
new file mode 100644
index 0000000..407dbbf
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantTransferCashMapper.java
@@ -0,0 +1,26 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.MerchantTransferCash;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.math.BigDecimal;
+import java.util.Map;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-09-26
+ */
+public interface MerchantTransferCashMapper extends BaseMapper<MerchantTransferCash> {
+
+    /**
+     *
+     * @param userId
+     * @return
+     */
+    BigDecimal getWithdrawAmt(@Param("userId") Long userId,@Param("date") String date);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantTransferMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantTransferMapper.java
new file mode 100644
index 0000000..5ee3fe2
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantTransferMapper.java
@@ -0,0 +1,10 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.MerchantRefundOrder;
+import cn.pluss.platform.entity.MerchantTransfer;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface MerchantTransferMapper extends BaseMapper<MerchantTransfer> {
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/NewAreaMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/NewAreaMapper.java
new file mode 100644
index 0000000..c3bfad4
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/NewAreaMapper.java
@@ -0,0 +1,27 @@
+package cn.pluss.platform.mapper;
+
+import java.util.List;
+import java.util.Map;
+import org.apache.ibatis.annotations.Mapper;
+import cn.pluss.platform.entity.NewArea;
+
+@Mapper
+public interface NewAreaMapper {
+
+    public NewArea queryNewArea(NewArea newArea);
+
+    public List<NewArea> queryNewAreaList(NewArea newArea);
+
+    public void saveNewArea(NewArea newArea);
+
+    public void updateNewArea(NewArea newArea);
+
+    public void deleteNewArea(NewArea newArea);
+
+    public List<NewArea> queryNewAreaPage(Map map);
+
+    public Integer queryNewAreaPageCount(Map map);
+
+    public void saveNewAreaBatch(List<NewArea>  newAreaList);
+}
+
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/NoticeMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/NoticeMapper.java
new file mode 100644
index 0000000..951d6ff
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/NoticeMapper.java
@@ -0,0 +1,31 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.Notice;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface NoticeMapper extends BaseMapper<Notice> {
+
+    Notice queryNotice(Notice notice);
+
+    List<Notice> queryNoticeList(Notice notice);
+
+    void saveNotice(Notice notice);
+
+    void updateNotice(Notice notice);
+
+    void deleteNotice(Notice notice);
+
+    List<Integer> queryNoticeId(Map<String, Object> map);
+
+    List<Notice> queryNoticePage(Map<String, Object> map);
+
+    Integer queryNoticePageCount(Map<String, Object> map);
+
+    void saveNoticeBatch(List<Notice> noticeList);
+}
+
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/NoticeReadRecordMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/NoticeReadRecordMapper.java
new file mode 100644
index 0000000..9234b39
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/NoticeReadRecordMapper.java
@@ -0,0 +1,60 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.NoticeReadRecord;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-04-19
+ */
+public interface NoticeReadRecordMapper extends BaseMapper<NoticeReadRecord> {
+
+    /**
+     * 查询未读的到账通知条数
+     * @param userId    用户id
+     * @return
+     */
+    Integer selectBillCount(@Param("userId") String userId);
+
+    /**
+     * 查询未读的分润通知和审核通知条数
+     * @param userId    用户id
+     * @return
+     */
+    List<Map<String, Object>> selectNoticeCount(@Param("userId") String userId);
+
+    /**
+     * 查询未读的资讯文章条数
+     * @param userId    用户id
+     * @return
+     */
+    List<Map<String, Object>> selectArticleCount(@Param("userId") String userId);
+
+    /**
+     * 一键标记账单通知为已读
+     * @param userId  用户id
+     */
+    Integer updateBillNoticeRead(@Param("userId") String userId);
+
+    /**
+     * 一键标记审核、分润通知为已读
+     * @param userId  用户id
+     * @param type     通知类别， 0是分润，1是审核
+     */
+    Integer updateNoticeRead(@Param("userId") String userId, @Param("type") String type);
+
+    /**
+     * 一键标记账单通知为已读
+     * @param userId  用户id
+     * @param type      1、攻略; 2、资讯; 3、活动
+     */
+    Integer updateEventInfoRead(@Param("userId") String userId, @Param("type") String type);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/NoticeTemplateMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/NoticeTemplateMapper.java
new file mode 100644
index 0000000..8ae7d4c
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/NoticeTemplateMapper.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.NoticeTemplate;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 自定义消息通知模板表 Mapper 接口
+ * </p>
+ *
+ * @author bzg
+ * @since 2021-08-26
+ */
+public interface NoticeTemplateMapper extends BaseMapper<NoticeTemplate> {
+
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/NotificationMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/NotificationMapper.java
new file mode 100644
index 0000000..3cdc7b7
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/NotificationMapper.java
@@ -0,0 +1,17 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.Notification;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface NotificationMapper extends BaseMapper<Notification> {
+    Notification selectOneTime();
+
+    void updateAll(String status);
+
+    List<Notification> queryNotification(Map<String, Object> map);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/OfficialActivityMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/OfficialActivityMapper.java
new file mode 100644
index 0000000..728bb5d
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/OfficialActivityMapper.java
@@ -0,0 +1,21 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.OfficialActivity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.List;
+
+public interface OfficialActivityMapper extends BaseMapper<OfficialActivity> {
+
+    void updateActivityStatus(Date dateTime);
+
+    /**
+     *根据角色查询当前角色活动
+     * @date: 2022/2/18 15:10
+     * @param condition:
+     * @return java.util.List<cn.pluss.platform.entity.OfficialActivity>
+     */
+    List<OfficialActivity> getListByRole(OfficialActivity condition);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/OfficialGoodsExchangeMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/OfficialGoodsExchangeMapper.java
new file mode 100644
index 0000000..eccb4a4
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/OfficialGoodsExchangeMapper.java
@@ -0,0 +1,7 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.OfficialGoodsExchange;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+public interface OfficialGoodsExchangeMapper extends BaseMapper<OfficialGoodsExchange> {
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/OfficialGoodsMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/OfficialGoodsMapper.java
new file mode 100644
index 0000000..31c61b8
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/OfficialGoodsMapper.java
@@ -0,0 +1,7 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.OfficialGoods;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+public interface OfficialGoodsMapper  extends BaseMapper<OfficialGoods> {
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/OpenAccountConfigMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/OpenAccountConfigMapper.java
new file mode 100644
index 0000000..f3070b4
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/OpenAccountConfigMapper.java
@@ -0,0 +1,21 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.OpenAccountConfig;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 开户奖配置表 Mapper 接口
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-06-14
+ */
+public interface OpenAccountConfigMapper extends BaseMapper<OpenAccountConfig> {
+
+    @Select("SELECT * FROM tb_pluss_open_account_config WHERE roleCode = #{roleCode} order by `level` desc")
+    List<OpenAccountConfig> listByRoleCode(String roleCode);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/OpenAccountRecordMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/OpenAccountRecordMapper.java
new file mode 100644
index 0000000..2178954
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/OpenAccountRecordMapper.java
@@ -0,0 +1,25 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.OpenAccountRecord;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.math.BigDecimal;
+import java.util.Map;
+
+/**
+ * <p>
+ * 用户开户奖励明细 Mapper 接口
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-06-14
+ */
+public interface OpenAccountRecordMapper extends BaseMapper<OpenAccountRecord> {
+
+    @Select("SELECT * FROM tb_pluss_open_account_record WHERE orderNumber = #{orderNumber} and `type` = #{type}")
+    OpenAccountRecord getByOrderNumberAndType(@Param("orderNumber") String orderNumber, @Param("type") String type);
+
+    Map<String, BigDecimal> countData(OpenAccountRecord condition);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/OperationRecordMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/OperationRecordMapper.java
new file mode 100644
index 0000000..28c878f
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/OperationRecordMapper.java
@@ -0,0 +1,24 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.OperationRecord;
+import cn.pluss.platform.vo.OperationRecordVO;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+
+public interface OperationRecordMapper extends BaseMapper<OperationRecord> {
+
+    Page<OperationRecordVO> selectUserSameIpCountPage(Page<OperationRecordVO> page, @Param("userId") String userId);
+
+    List<OperationRecord> selectOperationRecordOne(Map map);
+
+    Integer selectParticularsCount(Map map);
+
+    Page<OperationRecordVO> selectVOPage(Page<OperationRecordVO> page, @Param(Constants.WRAPPER) Wrapper<OperationRecordVO> entity);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/OperationRecordVOMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/OperationRecordVOMapper.java
new file mode 100644
index 0000000..7429f08
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/OperationRecordVOMapper.java
@@ -0,0 +1,30 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.vo.OperationRecordVO;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+
+public interface OperationRecordVOMapper extends BaseMapper<OperationRecordVO> {
+
+    @Override
+    default int insert(OperationRecordVO entity) {
+        throw new MsgException("VO类Mapper禁用增删改");
+    }
+
+    @Override
+    default int delete(Wrapper<OperationRecordVO> wrapper) {
+        throw new MsgException("VO类Mapper禁用增删改");
+    }
+
+    @Override
+    default int update(OperationRecordVO entity, Wrapper<OperationRecordVO> updateWrapper) {
+        throw new MsgException("VO类Mapper禁用增删改");
+    }
+
+    @Override
+    default int updateById(OperationRecordVO entity) {
+        throw new MsgException("VO类Mapper禁用增删改");
+    }
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/PayAreaRyxMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/PayAreaRyxMapper.java
new file mode 100644
index 0000000..9a7e49b
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/PayAreaRyxMapper.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.PayAreaRyx;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author bzg
+ * @since 2022-02-23
+ */
+public interface PayAreaRyxMapper extends BaseMapper<PayAreaRyx> {
+
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/PhoneConfigMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/PhoneConfigMapper.java
new file mode 100644
index 0000000..b38339f
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/PhoneConfigMapper.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.PhoneConfig;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 手机号配置表 Mapper 接口
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-04-13
+ */
+public interface PhoneConfigMapper extends BaseMapper<PhoneConfig> {
+
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/PhoneValidateCodeMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/PhoneValidateCodeMapper.java
new file mode 100644
index 0000000..7dbfa93
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/PhoneValidateCodeMapper.java
@@ -0,0 +1,34 @@
+package cn.pluss.platform.mapper;
+
+import java.util.List;
+import java.util.Map;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import cn.pluss.platform.entity.PhoneValidateCode;
+
+@Mapper
+public interface PhoneValidateCodeMapper extends BaseMapper<PhoneValidateCode> {
+
+    /**
+     * 取一个验证码
+     * @param phoneValidateCode
+     * @return
+     */
+    PhoneValidateCode queryPhoneValidateCode(PhoneValidateCode phoneValidateCode);
+
+    List<PhoneValidateCode> queryPhoneValidateCodeList(PhoneValidateCode phoneValidateCode);
+
+    void savePhoneValidateCode(PhoneValidateCode phoneValidateCode);
+
+    void updatePhoneValidateCode(PhoneValidateCode phoneValidateCode);
+
+    void deletePhoneValidateCode(PhoneValidateCode phoneValidateCode);
+
+    List<PhoneValidateCode> queryPhoneValidateCodePage(Map map);
+
+    Integer queryPhoneValidateCodePageCount(Map map);
+
+    void savePhoneValidateCodeBatch(List<PhoneValidateCode> phoneValidateCodeList);
+}
+
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/PlatformDataMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/PlatformDataMapper.java
new file mode 100644
index 0000000..f255808
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/PlatformDataMapper.java
@@ -0,0 +1,45 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.PlatformData;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 首页数据统计表 Mapper 接口
+ * </p>
+ *
+ * @author bzg
+ * @since 2021-10-20
+ */
+public interface PlatformDataMapper extends BaseMapper<PlatformData> {
+
+    PlatformData selectMonthData(@Param("month") String month);
+
+    /**
+     * @description:统计首页数据
+     * @date: 2021/10/20 15:36
+     * @return PlatformData
+     */
+    PlatformData getYestDayPlatformData();
+    /**
+     * @description:获得昨日退款数据
+     * @date: 2021/10/20 15:49
+     * @return cn.pluss.platform.entity.PlatformData
+     */
+    PlatformData getYestDayPlatformRefundData();
+
+    /**
+     * @description:获取昨日新增数据
+     * @date: 2021/10/20 15:54
+     * @return cn.pluss.platform.entity.PlatformData
+     */
+    PlatformData getYestDayPlatformAddData();
+
+    List<Map<String, Object>> getChartTransCountData();
+
+    List<Map<String, Object>> getChartChannelCountData();
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/PostageConfigMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/PostageConfigMapper.java
new file mode 100644
index 0000000..021b923
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/PostageConfigMapper.java
@@ -0,0 +1,20 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.PostageConfig;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * <p>
+ * 邮费信息配置表 Mapper 接口
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-03-29
+ */
+public interface PostageConfigMapper extends BaseMapper<PostageConfig> {
+
+    @Select("SELECT * FROM tb_pluss_postage_config WHERE areaCode like CONCAT('%',#{areaCode},'%') and `status` = #{status}  limit 1 ")
+    PostageConfig getPostageByArea(@Param("areaCode") String areaCode, @Param("status")String status);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/ProvinceMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/ProvinceMapper.java
new file mode 100644
index 0000000..8e63f69
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/ProvinceMapper.java
@@ -0,0 +1,30 @@
+package cn.pluss.platform.mapper;
+
+import java.util.List;
+import java.util.Map;
+import org.apache.ibatis.annotations.Mapper;
+
+import cn.pluss.platform.entity.Province;
+import cn.pluss.platform.leshua.LeshuaProvince;
+
+
+@Mapper
+public interface ProvinceMapper {
+
+    public LeshuaProvince queryProvince(Province province);
+
+    public List<LeshuaProvince> queryProvinceList(Province province);
+
+    public void saveProvince(Province province);
+
+    public void updateProvince(Province province);
+
+    public void deleteProvince(Province province);
+
+    public List<LeshuaProvince> queryProvincePage(Map map);
+
+    public Integer queryProvincePageCount(Map map);
+
+    public void saveProvinceBatch(List<Province>  provinceList);
+}
+
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/PushAllMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/PushAllMapper.java
new file mode 100644
index 0000000..fdc298e
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/PushAllMapper.java
@@ -0,0 +1,11 @@
+package cn.pluss.platform.mapper;
+
+
+import cn.pluss.platform.entity.PushAll;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @author djh
+ */
+public interface PushAllMapper extends BaseMapper<PushAll> {
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/QrCodeMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/QrCodeMapper.java
new file mode 100644
index 0000000..a9513f2
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/QrCodeMapper.java
@@ -0,0 +1,38 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.QrCode;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 二维码mapper
+ */
+@Mapper
+public interface QrCodeMapper extends BaseMapper<QrCode> {
+
+    //查询list列表
+    List<QrCode>  queryQrCodeList(QrCode qrCode);
+
+    QrCode getQrCode(QrCode qrCode);
+
+    void saveQrCode(QrCode qrCode);
+    //批量新增
+    void batchSaveQrCode(List<QrCode> qrCode);
+    //修改
+    void updateQrCode(QrCode qrCode);
+    //删除
+    void deleteQrCode(QrCode qrCode);
+
+    List<QrCode> queryQrCodePage(Map map);
+
+    Integer queryQrCodePageCount(Map map);
+
+    QrCode getQrCodeByQrNo(String qrNo);
+
+    void deleteQrCodeByIds(String[] ids);
+
+    Integer checkQrNo(List<String> checkQrNo);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/QuestionsAnswersMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/QuestionsAnswersMapper.java
new file mode 100644
index 0000000..d18009e
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/QuestionsAnswersMapper.java
@@ -0,0 +1,31 @@
+package cn.pluss.platform.mapper;
+
+import java.util.List;
+import java.util.Map;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import cn.pluss.platform.entity.QuestionsAnswers;
+
+@Mapper
+public interface QuestionsAnswersMapper extends BaseMapper<QuestionsAnswers> {
+
+    public QuestionsAnswers queryQuestionsAnswers(QuestionsAnswers questionsAnswers);
+
+    public List<QuestionsAnswers> queryQuestionsAnswersList(QuestionsAnswers questionsAnswers);
+
+    public void saveQuestionsAnswers(QuestionsAnswers questionsAnswers);
+
+    public void updateQuestionsAnswers(QuestionsAnswers questionsAnswers);
+
+    public void deleteQuestionsAnswers(QuestionsAnswers questionsAnswers);
+
+    public List<QuestionsAnswers> queryQuestionsAnswersPage(Map map);
+    
+    public List<QuestionsAnswers> queryQuestionsAnswersOrderByIDPage(Map map);
+
+    public Integer queryQuestionsAnswersPageCount(Map map);
+
+    public void saveQuestionsAnswersBatch(List<QuestionsAnswers>  questionsAnswersList);
+}
+
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/QueueDataMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/QueueDataMapper.java
new file mode 100644
index 0000000..0e9844c
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/QueueDataMapper.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.QueueData;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-04-20
+ */
+public interface QueueDataMapper extends BaseMapper<QueueData> {
+
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/RateOperationTempMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/RateOperationTempMapper.java
new file mode 100644
index 0000000..658e0cf
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/RateOperationTempMapper.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.RateOperationTemp;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-08-25
+ */
+public interface RateOperationTempMapper extends BaseMapper<RateOperationTemp> {
+
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/RealFansMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/RealFansMapper.java
new file mode 100644
index 0000000..8e973dd
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/RealFansMapper.java
@@ -0,0 +1,56 @@
+package cn.pluss.platform.mapper;
+
+import java.util.List;
+import java.util.Map;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Mapper;
+import cn.pluss.platform.entity.RealFans;
+import cn.pluss.platform.vo.RealFansVO;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+@Mapper
+public interface RealFansMapper extends BaseMapper<RealFans> {
+
+    @Select("SELECT * FROM tb_pluss_real_fans WHERE soleId = #{soleId}")
+    List<RealFans> queryBySoleId(@Param("soleId") String soleId);
+
+    List<RealFans> queryRealFansPage(Map map);
+
+    Integer queryRealFansPageCount(Map map);
+
+    void saveRealFansBatch(List<RealFans> realFansList);
+    
+    /**
+     * 
+     * queryRealFansListManagePage:(manage展示). <br/> 
+     * 
+     * @author Administrator 
+     * @param map
+     * @return 
+     * @since JDK 1.8
+     */
+    List<RealFansVO> queryRealFansListManagePage(Map<String, Object> map);
+    
+    /**
+     * 
+     * queryRealFansListManagePage:(manage展示). <br/> 
+     * 
+     * @author Administrator 
+     * @param map
+     * @return 
+     * @since JDK 1.8
+     */
+    Integer queryRealFansListManagePageCount(Map<String, Object> map);
+
+    /**
+     * 分页查询
+     * @param page
+     * @param realFans
+     * @return
+     */
+    Page<RealFans> pageData(@Param("page") Page<RealFans> page,@Param("realFans") RealFans realFans);
+}
+
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/RegionCodeLsMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/RegionCodeLsMapper.java
new file mode 100644
index 0000000..7412193
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/RegionCodeLsMapper.java
@@ -0,0 +1,33 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.RegionCodeLs;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 银盛地区表 Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-07-24
+ */
+public interface RegionCodeLsMapper extends BaseMapper<RegionCodeLs> {
+
+    /**
+     * 获取银盛对应的地区信息
+     * @param province  省
+     * @param city      市
+     * @param area      县区
+     * @return  地区信息
+     */
+    RegionCodeLs selectRegionCode(@Param("province") String province, @Param("city") String city, @Param("area") String area);
+
+    List<String> selectProvince();
+
+    List<String> selectCity(@Param("provice") String provice);
+
+    List<String> selectArea(@Param("province") String province, @Param("city") String city);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/RegionCodeRyxMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/RegionCodeRyxMapper.java
new file mode 100644
index 0000000..b98c8b1
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/RegionCodeRyxMapper.java
@@ -0,0 +1,34 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.RegionCodeRyx;
+import cn.pluss.platform.entity.RegionCodeSxf;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 瑞银信进件，地区编码 Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-01-15
+ */
+public interface RegionCodeRyxMapper extends BaseMapper<RegionCodeRyx> {
+
+    /**
+     * 获取银盛对应的地区信息
+     * @param province  省
+     * @param city      市
+     * @param area      县区
+     * @return  地区信息
+     */
+    RegionCodeRyx selectRegionCode(@Param("province") String province, @Param("city") String city, @Param("area") String area);
+
+    List<String> selectProvince();
+
+    List<String> selectCity(@Param("province") String province);
+
+    List<String> selectArea(@Param("province") String province, @Param("city") String city);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/RegionCodeSxfMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/RegionCodeSxfMapper.java
new file mode 100644
index 0000000..05ecd71
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/RegionCodeSxfMapper.java
@@ -0,0 +1,33 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.RegionCodeSxf;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 银盛地区表 Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-07-24
+ */
+public interface RegionCodeSxfMapper extends BaseMapper<RegionCodeSxf> {
+
+    /**
+     * 获取银盛对应的地区信息
+     * @param province  省
+     * @param city      市
+     * @param area      县区
+     * @return  地区信息
+     */
+    RegionCodeSxf selectRegionCode(@Param("province") String province, @Param("city") String city, @Param("area") String area);
+
+    List<String> selectProvince();
+
+    List<String> selectCity(@Param("provice") String provice);
+
+    List<String> selectArea(@Param("province") String province, @Param("city") String city);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/RegionCodeYsMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/RegionCodeYsMapper.java
new file mode 100644
index 0000000..60e08bc
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/RegionCodeYsMapper.java
@@ -0,0 +1,34 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.RegionCodeSxf;
+import cn.pluss.platform.entity.RegionCodeYs;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 银盛地区表 Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-07-24
+ */
+public interface RegionCodeYsMapper extends BaseMapper<RegionCodeYs> {
+
+    /**
+     * 获取银盛对应的地区信息
+     * @param province  省
+     * @param city      市
+     * @param area      县区
+     * @return  地区信息
+     */
+    RegionCodeYs selectRegionCode(@Param("province") String province, @Param("city") String city, @Param("area") String area);
+
+    List<String> selectProvince();
+
+    List<String> selectCity(@Param("provice") String provice);
+
+    List<String> selectArea(@Param("province") String province, @Param("city") String city);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/RegionReflectMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/RegionReflectMapper.java
new file mode 100644
index 0000000..b36ee2c
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/RegionReflectMapper.java
@@ -0,0 +1,21 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.RegionReflect;
+import cn.pluss.platform.vo.RegionReflectVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 不同通道的地区表映射表 Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-07-24
+ */
+public interface RegionReflectMapper extends BaseMapper<RegionReflect> {
+
+    Page<RegionReflectVO> selectRegionReflectList(IPage<RegionReflectVO> page, @Param("province") String province, @Param("city") String city, @Param("area") String area);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/RewardConfigMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/RewardConfigMapper.java
new file mode 100644
index 0000000..04649e6
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/RewardConfigMapper.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.RewardConfig;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 用户奖励配置 Mapper 接口
+ * </p>
+ *
+ * @author bzg
+ * @since 2022-02-22
+ */
+public interface RewardConfigMapper extends BaseMapper<RewardConfig> {
+
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/RiskBlacklistMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/RiskBlacklistMapper.java
new file mode 100644
index 0000000..151f82c
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/RiskBlacklistMapper.java
@@ -0,0 +1,27 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.RiskBlacklist;
+import cn.pluss.platform.vo.RiskBlacklistVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 风控黑名单表 Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-09-07
+ */
+public interface RiskBlacklistMapper extends BaseMapper<RiskBlacklist> {
+
+    Page<RiskBlacklistVO> selectPageVO(Page<RiskBlacklistVO> page, @Param("condition") Map<String, Object> condition);
+
+    @Select("SELECT * FROM tb_pluss_risk_blacklist where userId = #{userId}")
+    List<RiskBlacklist> getByUserId(Long userId);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/RoleInfoMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/RoleInfoMapper.java
new file mode 100644
index 0000000..176e51e
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/RoleInfoMapper.java
@@ -0,0 +1,36 @@
+package cn.pluss.platform.mapper;
+
+import java.util.List;
+import java.util.Map;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import cn.pluss.platform.entity.RoleInfo;
+import cn.pluss.platform.entity.UserInfo;
+
+@Mapper
+public interface RoleInfoMapper extends BaseMapper<RoleInfo> {
+
+    RoleInfo queryRoleInfo(RoleInfo roleInfo);
+
+    List<RoleInfo> queryRoleInfoList(RoleInfo roleInfo);
+
+    void saveRoleInfo(RoleInfo roleInfo);
+
+    void updateRoleInfo(RoleInfo roleInfo);
+
+    void deleteRoleInfo(RoleInfo roleInfo);
+
+    List<RoleInfo> queryRoleInfoPage(Map map);
+
+    Integer queryRoleInfoPageCount(Map map);
+
+    void saveRoleInfoBatch(List<RoleInfo>  roleInfoList);
+
+	List<RoleInfo> getRoleNames(@Param(value="loginName") String loginName);
+
+	List<RoleInfo> getRoleNames(UserInfo userInfo);
+}
+
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/RoleMenuInfoMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/RoleMenuInfoMapper.java
new file mode 100644
index 0000000..47528ed
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/RoleMenuInfoMapper.java
@@ -0,0 +1,29 @@
+package cn.pluss.platform.mapper;
+
+import java.util.List;
+import java.util.Map;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import cn.pluss.platform.entity.RoleMenuInfo;
+
+@Mapper
+public interface RoleMenuInfoMapper extends BaseMapper<RoleMenuInfo> {
+
+    RoleMenuInfo queryRoleMenuInfo(RoleMenuInfo roleMenuInfo);
+
+    List<RoleMenuInfo> queryRoleMenuInfoList(RoleMenuInfo roleMenuInfo);
+
+    void saveRoleMenuInfo(RoleMenuInfo roleMenuInfo);
+
+    void updateRoleMenuInfo(RoleMenuInfo roleMenuInfo);
+
+    void deleteRoleMenuInfo(RoleMenuInfo roleMenuInfo);
+
+    List<RoleMenuInfo> queryRoleMenuInfoPage(Map map);
+
+    Integer queryRoleMenuInfoPageCount(Map map);
+
+    void saveRoleMenuInfoBatch(List<RoleMenuInfo>  roleMenuInfoList);
+}
+
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/RoleUserInfoMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/RoleUserInfoMapper.java
new file mode 100644
index 0000000..3be82c0
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/RoleUserInfoMapper.java
@@ -0,0 +1,29 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.RoleUserInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface RoleUserInfoMapper extends BaseMapper<RoleUserInfo> {
+
+    RoleUserInfo queryRoleUserInfo(RoleUserInfo roleUserInfo);
+
+    List<RoleUserInfo> queryRoleUserInfoList(RoleUserInfo roleUserInfo);
+
+    void saveRoleUserInfo(RoleUserInfo roleUserInfo);
+
+    void updateRoleUserInfo(RoleUserInfo roleUserInfo);
+
+    void deleteRoleUserInfo(RoleUserInfo roleUserInfo);
+
+    List<RoleUserInfo> queryRoleUserInfoPage(Map map);
+
+    Integer queryRoleUserInfoPageCount(Map map);
+
+    void saveRoleUserInfoBatch(List<RoleUserInfo>  roleUserInfoList);
+}
+
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/RyxTransMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/RyxTransMapper.java
new file mode 100644
index 0000000..5222a29
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/RyxTransMapper.java
@@ -0,0 +1,36 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.Account;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 瑞银信结算信息相关查询
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-10-17
+ */
+public interface RyxTransMapper extends BaseMapper<Account> {
+
+    /**
+     * 返回指定日期(不包含)之前的最后结算日期
+     * @param lastDate 指定日期
+     * @param pageNo    页码
+     * @param pageSize  页长
+     * @return 返回yong
+     */
+    List<Map<String, Object>> selectRyxTrans(@Param("lastDate") String lastDate, @Param("pageNo") int pageNo, @Param("pageSize") int pageSize);
+
+    /**
+     * 返回前一天有交易的瑞银信商户信息
+     * @param pageNo    页码
+     * @param pageSize  页长
+     * @return 返回yong
+     */
+    List<Map<String, Object>> selectRyxInfoYesterday(@Param("pageNo") int pageNo, @Param("pageSize") int pageSize);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/StaffPermissionMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/StaffPermissionMapper.java
new file mode 100644
index 0000000..577b03c
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/StaffPermissionMapper.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.StaffPermission;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 员工权限表 Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-06-11
+ */
+public interface StaffPermissionMapper extends BaseMapper<StaffPermission> {
+
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/SubMercCodeYsMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/SubMercCodeYsMapper.java
new file mode 100644
index 0000000..4e45b67
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/SubMercCodeYsMapper.java
@@ -0,0 +1,19 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.SubMercCodeYs;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * <p>
+ * 银盛二级商户省市区code Mapper 接口
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-06-15
+ */
+public interface SubMercCodeYsMapper extends BaseMapper<SubMercCodeYs> {
+
+    @Select("SELECT * FROM tb_pluss_sub_merc_code_ys WHERE `name` like CONCAT(#{city},'%') limit 1")
+    SubMercCodeYs getSubMercCodeYsByCity(String city);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/SubMerchantApplyOrderMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/SubMerchantApplyOrderMapper.java
new file mode 100644
index 0000000..7e67f66
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/SubMerchantApplyOrderMapper.java
@@ -0,0 +1,28 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.SubMerchantApplyOrder;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 子渠道工单信息表 Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-08-31
+ */
+public interface SubMerchantApplyOrderMapper extends BaseMapper<SubMerchantApplyOrder> {
+
+    Page<Map<String, Object>> selectPageMoreDetail(Page<Map<String, Object>> page, @Param("condition") Map<String, String> condition);
+
+    /**
+     * 获取没有实名认证的商户信息
+     * @return
+     */
+    List<SubMerchantApplyOrder> selectListNoCert();
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/SubMerchantMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/SubMerchantMapper.java
new file mode 100644
index 0000000..1bcae86
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/SubMerchantMapper.java
@@ -0,0 +1,23 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.dto.SubMerchantDTO;
+import cn.pluss.platform.entity.SubMerchant;
+import cn.pluss.platform.vo.SubMerchantVO;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Controller;
+
+public interface SubMerchantMapper extends BaseMapper<SubMerchant> {
+
+    /**
+     * 分页查询
+     * @param page      分页参数
+     * @param wrapper   查询条件
+     * @return          查询结果
+     */
+    Page<SubMerchantVO> pageVO(Page<SubMerchantVO> page, @Param(Constants.WRAPPER) Wrapper<SubMerchantDTO> wrapper);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/SuggestMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/SuggestMapper.java
new file mode 100644
index 0000000..d458684
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/SuggestMapper.java
@@ -0,0 +1,29 @@
+package cn.pluss.platform.mapper;
+
+import java.util.List;
+import java.util.Map;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import cn.pluss.platform.entity.Suggest;
+
+@Mapper
+public interface SuggestMapper extends BaseMapper<Suggest> {
+
+    public Suggest querySuggest(Suggest suggest);
+
+    public List<Suggest> querySuggestList(Suggest suggest);
+
+    public void saveSuggest(Suggest suggest);
+
+    public void updateSuggest(Suggest suggest);
+
+    public void deleteSuggest(Suggest suggest);
+
+    public List<Suggest> querySuggestPage(Map map);
+
+    public Integer querySuggestPageCount(Map map);
+
+    public void saveSuggestBatch(List<Suggest>  suggestList);
+}
+
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/SxfMccInfoMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/SxfMccInfoMapper.java
new file mode 100644
index 0000000..cd193dc
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/SxfMccInfoMapper.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.SxfMccInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-09-22
+ */
+public interface SxfMccInfoMapper extends BaseMapper<SxfMccInfo> {
+
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/SysSqlMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/SysSqlMapper.java
new file mode 100644
index 0000000..c93c5c5
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/SysSqlMapper.java
@@ -0,0 +1,7 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.SysSql;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+public interface SysSqlMapper extends BaseMapper<SysSql> {
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/SystemConfigMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/SystemConfigMapper.java
new file mode 100644
index 0000000..3355ca5
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/SystemConfigMapper.java
@@ -0,0 +1,30 @@
+package cn.pluss.platform.mapper;
+
+import java.util.List;
+import java.util.Map;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import cn.pluss.platform.entity.SystemConfig;
+
+@Mapper
+public interface SystemConfigMapper extends BaseMapper<SystemConfig> {
+	
+    SystemConfig querySystemConfig(SystemConfig systemConfig);
+
+    List<SystemConfig> querySystemConfigList(SystemConfig systemConfig);
+    
+    void saveSystemConfig(SystemConfig systemConfig);
+    
+    void updateSystemConfig(SystemConfig systemConfig);
+    
+    void deleteSystemConfig(SystemConfig systemConfig);
+    
+    List<SystemConfig> querySystemConfigPage(Map map);
+    
+    Integer querySystemConfigPageCount(Map map);
+    
+	void saveSystemConfigBatch(List<SystemConfig> systemConfigList);
+
+
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/SystemInfoMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/SystemInfoMapper.java
new file mode 100644
index 0000000..10eb6eb
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/SystemInfoMapper.java
@@ -0,0 +1,33 @@
+package cn.pluss.platform.mapper;
+
+import java.util.List;
+import java.util.Map;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Mapper;
+import cn.pluss.platform.entity.SystemInfo;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface SystemInfoMapper extends BaseMapper<SystemInfo> {
+
+    SystemInfo querySystemInfo(SystemInfo systemInfo);
+
+    List<SystemInfo> querySystemInfoList(SystemInfo systemInfo);
+
+    void saveSystemInfo(SystemInfo systemInfo);
+
+    void updateSystemInfo(SystemInfo systemInfo);
+
+    void deleteSystemInfo(SystemInfo systemInfo);
+
+    List<SystemInfo> querySystemInfoPage(Map map);
+
+    Integer querySystemInfoPageCount(Map map);
+
+    void saveSystemInfoBatch(List<SystemInfo> systemInfoList);
+
+    Page<SystemInfo> PageData(Page<SystemInfo> page,@Param("systemInfo") SystemInfo systemInfo);
+}
+
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/TaskSortMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/TaskSortMapper.java
new file mode 100644
index 0000000..6f3d1a4
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/TaskSortMapper.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.TaskSort;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-05-27
+ */
+public interface TaskSortMapper extends BaseMapper<TaskSort> {
+
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserAddressMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserAddressMapper.java
new file mode 100644
index 0000000..0413fb9
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserAddressMapper.java
@@ -0,0 +1,34 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.UserAddress;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 用户地址信息表 Mapper 接口
+ * </p>
+ *
+ * @author bzg
+ * @since 2021-11-17
+ */
+public interface UserAddressMapper extends BaseMapper<UserAddress> {
+
+
+    default List<UserAddress> getAddressList(Long userId, Integer type, boolean defFlag){
+        if(defFlag){
+            return getDefaultAddressList(userId,type, UserAddress.DEFAULT_FLAG);
+        }else{
+            return getAddressList(userId,type);
+        }
+    }
+
+    @Select("select * from tb_pluss_user_address where userId = #{userId} and type = #{type} order by defFlag desc,id desc")
+    List<UserAddress> getAddressList(@Param("userId") Long userId, @Param("type") Integer type);
+
+    @Select("select * from tb_pluss_user_address where userId = #{userId} and type = #{type} and defFlag = #{defFlag} order by id desc")
+    List<UserAddress> getDefaultAddressList(@Param("userId") Long userId, @Param("type") Integer type,@Param("defFlag") String defFlag);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserAppMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserAppMapper.java
new file mode 100644
index 0000000..f494dff
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserAppMapper.java
@@ -0,0 +1,244 @@
+package cn.pluss.platform.mapper;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+import cn.pluss.platform.dto.MerchSearchDTO;
+import cn.pluss.platform.leshua.ExpandDto;
+import cn.pluss.platform.vo.MerchSummaryVO;
+import cn.pluss.platform.vo.UserNumVO;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.val;
+import org.apache.ibatis.annotations.Mapper;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.vo.UserExpandVO;
+import cn.pluss.platform.vo.UserInfoVO;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+@Mapper
+public interface UserAppMapper extends BaseMapper<UserApp> {
+
+    @Select("SELECT ua.*,ui.phone FROM tb_pluss_user_app ua left join tb_pluss_user_info ui on ua.userId = ui.id WHERE ua.userId = #{userId}")
+    UserApp selectInfoJoinByUserId(@Param("userId") Serializable userId);
+
+    @Select("SELECT * FROM tb_pluss_user_app WHERE userId = #{userId}")
+    UserApp selectByUserId(@Param("userId") Serializable userId);
+
+    @Select("SELECT * FROM tb_pluss_user_app WHERE merchantCode = #{merchantCode} AND userType = 'promoter'")
+    UserApp selectByMerchantCode(@Param("merchantCode") String merchantCode);
+
+    default List<UserApp> queryUserAppList(UserApp userApp) {
+        return selectList(new QueryWrapper<>(userApp));
+    }
+
+    Page<MerchSummaryVO> selectMerchantSummaryPage(Page<MerchSummaryVO> page, @Param("condition") MerchSearchDTO condition);
+
+    MerchSummaryVO selectBillCountAndTotalFee(@Param("condition") MerchSearchDTO condition);
+
+    Integer queryUserAppPageCount(Map<String, Object> map);
+
+    List<List<?>> queryUserInfoVOPage(Map<String, Object> map);
+
+    List<UserInfoVO> queryUserInfoVONoPage(Map<String, Object> map);
+
+    Integer queryUserInfoVOPageCount(Map<String, Object> map);
+
+    Integer queryUserInfoVONoPageCount(Map<String, Object> map);
+    /**
+     * 未实名信息
+     *
+     * @return
+     */
+    List<UserExpandVO> queryUserAppNoRealNamePage(Map<String, Object> map);
+
+    /**
+     * 未实名统计数量
+     *
+     * @param map
+     * @return
+     */
+    Integer queryUserAppNoRealNamePageCount(Map<String, Object> map);
+
+    /**
+     * queryUserAppRealNamePage:(已实名认证信息). <br/>
+     *
+     * @param map
+     * @return
+     * 
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    List<UserExpandVO> queryUserAppRealNamePage(Map<String, Object> map);
+
+    /**
+     * queryUserAppRealNamePage:(已实名认证条数). <br/>
+     *
+     * @param map
+     * @return
+     * 
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    Integer queryUserAppRealNamePageCount(Map<String, Object> map);
+
+    /**
+     * 是商户的信息
+     *
+     * @param map
+     * @return
+     */
+    List<UserExpandVO> queryUserAppIsMerchantPage(Map<String, Object> map);
+
+    /**
+     * 是商户信息统计数量
+     *
+     * @param map
+     * @return
+     */
+    Integer queryUserAppIsMerchantPageCount(Map<String, Object> map);
+
+
+    List<UserApp> queryUserAppListByPhone(UserApp userApp);
+
+    List<UserApp> queryUserAppPageByPhone(Map<String, Object> map);
+
+    Integer queryUserAppPageCountByPhone(Map<String, Object> map);
+
+    UserApp queryUserAppByInviteNum(String inviteNum);
+
+    /**
+     * 分页查询拓展数据
+     *
+     * @param page      分页信息
+     * @param expandDto 查询条件
+     * @return
+     */
+    IPage<UserApp> getExPageUserApp(IPage<UserApp> page, @Param("expandDto") ExpandDto expandDto, @Param("parentIdList") List<String> parentIdList);
+
+    IPage<UserApp> selectCustomList(IPage<UserApp> page, @Param(Constants.WRAPPER) Wrapper<UserApp> queryWrapper);
+
+    /**
+     * 根据推广员id关联查询商户信息，结算信息
+     * @return
+     */
+    UserApp queryUserAppJoinById(Long userId);
+
+    UserApp queryUserAppJoinByUserId(Long userId);
+
+    default void updateUserAppUserId(UserApp userApp) {
+        val uWrapper = new LambdaQueryWrapper<UserApp>()
+                .eq(UserApp::getUserId, userApp.getUserId());
+        update(userApp, uWrapper);
+    }
+
+    /**
+     * 获取指定进件状态的商户
+     */
+    Integer selectUserAppWithChannelStatusCount(@Param(Constants.WRAPPER) Wrapper<UserApp> updateWrapper);
+
+    /**
+     * 获取指定进件状态的商户
+     */
+    List<UserApp> selectListWithChannelStatus(@Param(Constants.WRAPPER) Wrapper<UserApp> updateWrapper);
+
+    /**
+     * 根据用户父级id获取用户信息
+     * @param userId
+     * @return
+     */
+    List<UserApp> getUserAppInfoByParentId(Long userId);
+
+    /**
+     * 关联查询分页
+     * @param page
+     * @param userApp
+     * @return
+     */
+    Page<UserApp> pageData(@Param("page") Page<UserApp> page, @Param("userApp") UserApp userApp);
+
+    /**
+     * 获取下级商户数量
+     * @param userId
+     * @return
+     */
+    Integer getSubUserCount(@Param("userId") Long userId,@Param("startDate")String startDate,@Param("endDate")String endDate);
+
+    /**
+     * 分页查询活动商户详情列表
+     * @param
+     * @return
+     */
+    Page<UserInfoVO> queryActPage(@Param("page")Page<UserInfoVO> page,@Param("userInfoVO") UserInfoVO userInfoVO);
+
+    int getNotificationMenuId(String link);
+
+    Integer getParentUserId(Integer parentUserId);
+
+    Integer getUserId(String merchantCode);
+
+    /**
+     * 分页查询员工信息
+     * @param page              分页以及排序
+     * @param queryWrapper      查询条件
+     * @return                  查询结果
+     */
+    Page<UserApp> selectUserApp(Page<UserApp> page, @Param(Constants.WRAPPER) Wrapper<Object> queryWrapper);
+
+    UserApp selectUserApp(@Param(Constants.WRAPPER) Wrapper<Object> queryWrapper);
+
+    /**
+     * @description:根据userId获取用户的所有上级
+     * @date: 2021/8/18 10:46
+     * @param userId:
+     * @return cn.pluss.platform.entity.UserApp
+     */
+    Map<String,Object> getUserAppParentsByUserId(String userId);
+
+
+    /**
+     * 获取实名认证审核中的商户
+     * @return
+     */
+    @Select("SELECT * FROM tb_pluss_user_app WHERE `status` = 1 AND userType IN ('promoter', 'agent') " +
+            "AND updateDt < DATE_SUB(CURRENT_TIMESTAMP, INTERVAL 1 HOUR) ORDER BY id DESC LIMIT 200")
+    List<UserApp> selectUserInCert();
+
+    /**
+     * @description:首页统计数据
+     * @date: 2021/10/19 17:24
+     * @return java.util.Map<java.lang.String,java.lang.Object>
+     */
+    Map<String, Object> getPlatformData();
+
+    Integer getMaxSort();
+
+    @Select("SELECT ua.*,ul.rate FROM tb_pluss_user_app ua left join tb_pluss_user_level ul on ua.levelCode = ul.levelCode WHERE ua.roleCode = #{roleCode} and ua.levelCode = #{levelCode} limit 1 ")
+    UserApp getRoleCodeAndLevelCode(@Param("roleCode") String roleCode, @Param("levelCode")String levelCode);
+
+    /**
+     * 获取直推用户的新增数量和总数
+     * @date: 2022/1/24 23:26
+     * @param userId:
+     * @param date:
+     * @param dateType:
+     * @return cn.pluss.platform.vo.UserNumVO
+     */
+    UserNumVO getUserNumInfo(@Param("userId")Long userId, @Param("date")String date, @Param("dateType")Integer dateType);
+
+    /**
+     * 根据手机号查询用户信息
+     * @param phone
+     * @return
+     */
+    List<UserApp> getUserInfoByPhone(String phone);
+
+}
\ No newline at end of file
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserAreaRewardFlowMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserAreaRewardFlowMapper.java
new file mode 100644
index 0000000..85b980a
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserAreaRewardFlowMapper.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.UserAreaRewardFlow;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 用户区域流水 Mapper 接口
+ * </p>
+ *
+ * @author bzg
+ * @since 2022-03-01
+ */
+public interface UserAreaRewardFlowMapper extends BaseMapper<UserAreaRewardFlow> {
+
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserAssessMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserAssessMapper.java
new file mode 100644
index 0000000..38a5a53
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserAssessMapper.java
@@ -0,0 +1,21 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.UserAssess;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 用户考核表 Mapper 接口
+ * </p>
+ *
+ * @author bzg
+ * @since 2022-07-11
+ */
+public interface UserAssessMapper extends BaseMapper<UserAssess> {
+
+    @Select("SELECT * FROM tb_pluss_user_assess WHERE userId = #{userId}")
+    UserAssess getByUserId(Serializable userId);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserExtraMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserExtraMapper.java
new file mode 100644
index 0000000..e1be1b0
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserExtraMapper.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.UserExtra;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 用户额外字段关联表信息 Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-05-31
+ */
+public interface UserExtraMapper extends BaseMapper<UserExtra> {
+
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserInfoMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserInfoMapper.java
new file mode 100644
index 0000000..e0a512e
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserInfoMapper.java
@@ -0,0 +1,51 @@
+package cn.pluss.platform.mapper;
+
+import java.util.List;
+import java.util.Map;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+import cn.pluss.platform.entity.UserInfo;
+import cn.pluss.platform.vo.UserInfoVO;
+
+@Mapper
+public interface UserInfoMapper extends BaseMapper<UserInfo> {
+
+    /**
+     * 获取主商户的用户信息
+     * @param id    用户id
+     * @return      主商户的用户信息
+     */
+    UserInfo selectMainUserInfo(Long id);
+
+    /**
+     * @description:取主商户和子商户信息
+     * @date: 2021/9/23 15:43
+     * @return java.util.List<cn.pluss.platform.entity.UserInfo>
+     */
+    List<UserInfoVO> selectMainUserInfoList(String userAppId);
+
+    UserInfo queryUserInfo(UserInfo userInfo);
+
+    List<UserInfo> queryUserInfoList(UserInfo userInfo);
+
+    Integer saveUserInfo(UserInfo userInfo);
+
+    void updateUserInfo(UserInfo userInfo);
+
+    void deleteUserInfo(UserInfo userInfo);
+
+    List<UserInfo> queryUserInfoPage(Map map);
+    
+    List<UserInfoVO> queryUserInfoVOPage(Map map);
+    
+    Integer queryUserInfoVOPageCount(Map map);
+
+    Integer queryUserInfoPageCount(Map map);
+
+    void saveUserInfoBatch(List<UserInfo> userInfoList);
+    
+    List<UserInfo>  queryUserInfoListLikeByPhone(UserInfo userInfo);
+}
+
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserIntegralMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserIntegralMapper.java
new file mode 100644
index 0000000..3610f9f
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserIntegralMapper.java
@@ -0,0 +1,47 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.UserIntegral;
+import cn.pluss.platform.other.JfShopIntegral;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * <p>
+ * 用户积分详情表 Mapper 接口
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-05-17
+ */
+public interface UserIntegralMapper extends BaseMapper<UserIntegral> {
+
+    /**
+     * 查询积分详情
+     * @param userId
+     * @param type
+     * @return
+     */
+    List<JfShopIntegral> list(@Param("userId") String userId, @Param("type") String type);
+
+    /**
+     * 统计积分总额
+     * @param userId
+     * @return
+     */
+    BigDecimal getCountIntegral(@Param("userId") Serializable userId,@Param("date") String date, @Param("auditDate") String auditDate);
+
+    default BigDecimal getCountIntegral(@Param("userId") Serializable userId){
+        return getCountIntegral(userId,null,null);
+    }
+
+    Page<UserIntegral> pageInfo(Page<UserIntegral> page, @Param("entity") UserIntegral query);
+
+    @Select("SELECT * FROM tb_pluss_user_integral WHERE orderNumber = #{orderNumber}")
+    UserIntegral getByOrderNumber(String orderNumber);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserIntegralUseMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserIntegralUseMapper.java
new file mode 100644
index 0000000..984bee3
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserIntegralUseMapper.java
@@ -0,0 +1,36 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.UserIntegralUse;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 用户积分使用详情 Mapper 接口
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-05-19
+ */
+public interface UserIntegralUseMapper extends BaseMapper<UserIntegralUse> {
+
+    /**
+     * 获取已使用积分信息
+     * @param userId
+     * @param date
+     * @return
+     */
+    BigDecimal getUseIntegral(@Param("userId") Serializable userId, @Param("date") String date);
+
+    /**
+     * 分页查询
+     * @param page
+     * @param query
+     * @return
+     */
+    Page pageInfo(Page<UserIntegralUse> page, @Param("entity") UserIntegralUse query);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserIpRecordMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserIpRecordMapper.java
new file mode 100644
index 0000000..3c69717
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserIpRecordMapper.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.UserIpRecord;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 用户操作IP记录表 Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-09-13
+ */
+public interface UserIpRecordMapper extends BaseMapper<UserIpRecord> {
+
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserLevelMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserLevelMapper.java
new file mode 100644
index 0000000..a6eaf65
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserLevelMapper.java
@@ -0,0 +1,35 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.UserLevel;
+import cn.pluss.platform.vo.UserLevelVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * <p>
+ * 用户等级表 Mapper 接口
+ * </p>
+ *
+ * @author bzg
+ * @since 2022-01-13
+ */
+public interface UserLevelMapper extends BaseMapper<UserLevel> {
+    /**
+     * 获取等级配置
+     * @date: 2022/1/25 20:57
+     * @param roleCode:
+     * @return java.util.List<cn.pluss.platform.vo.UserLevelVO>
+     */
+    List<UserLevelVO> getLevelInfoByRole(@Param("roleCode") String roleCode,@Param("type") Integer type);
+
+    /**
+     * 获取当前交易额度所在的等级
+     * @date: 2022/1/25 23:42
+     * @param flow:
+     * @return cn.pluss.platform.entity.UserLevel
+     */
+    UserLevel getNowQuotaLevel(BigDecimal flow);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserManageProfitMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserManageProfitMapper.java
new file mode 100644
index 0000000..25ae041
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserManageProfitMapper.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.UserManageProfit;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 用户管理奖统计表 Mapper 接口
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-05-23
+ */
+public interface UserManageProfitMapper extends BaseMapper<UserManageProfit> {
+
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserMultipleRemarkMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserMultipleRemarkMapper.java
new file mode 100644
index 0000000..00c527b
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserMultipleRemarkMapper.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.UserMultipleRemark;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-05-31
+ */
+public interface UserMultipleRemarkMapper extends BaseMapper<UserMultipleRemark> {
+
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserOrganMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserOrganMapper.java
new file mode 100644
index 0000000..b4e751e
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserOrganMapper.java
@@ -0,0 +1,27 @@
+package cn.pluss.platform.mapper;
+
+import java.util.List;
+import java.util.Map;
+import org.apache.ibatis.annotations.Mapper;
+import cn.pluss.platform.entity.UserOrgan;
+
+@Mapper
+public interface UserOrganMapper {
+
+    public UserOrgan queryUserOrgan(UserOrgan userOrgan);
+
+    public List<UserOrgan> queryUserOrganList(UserOrgan userOrgan);
+
+    public void saveUserOrgan(UserOrgan userOrgan);
+
+    public void updateUserOrgan(UserOrgan userOrgan);
+
+    public void deleteUserOrgan(UserOrgan userOrgan);
+
+    public List<UserOrgan> queryUserOrganPage(Map map);
+
+    public Integer queryUserOrganPageCount(Map map);
+
+    public void saveUserOrganBatch(List<UserOrgan>  userOrganList);
+}
+
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserProfitMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserProfitMapper.java
new file mode 100644
index 0000000..733e60b
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserProfitMapper.java
@@ -0,0 +1,49 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.UserProfit;
+import cn.pluss.platform.vo.UserAppVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author bzg
+ * @since 2022-01-14
+ */
+public interface UserProfitMapper extends BaseMapper<UserProfit> {
+
+
+    /**
+     * 获取用户月团队流水
+     * @date: 2022/1/25 23:01
+     * @param profitMonth:
+     * @return java.util.List<cn.pluss.platform.entity.UserProfit>
+     */
+    List<UserProfit> selectLevelFlow(String profitMonth);
+
+    /**
+     * 查询下级数据
+     * @return
+     */
+    Page<UserAppVO> selectPageSubTeamData(Page<UserAppVO> page, @Param("userId") String userId, @Param("userName") String userName);
+
+    @Select("SELECT IFNULL(SUM(teamTransFlow),0) FROM tb_pluss_user_profit WHERE userId = #{userId} ")
+    BigDecimal getBeforeFlowByUserId(Long userId);
+
+    /**
+     * 分页查询
+     * @date: 2022/3/11 15:56
+     * @param page:
+     * @param entity:
+     * @return com.baomidou.mybatisplus.extension.plugins.pagination.Page<cn.pluss.platform.entity.UserProfit>
+     */
+    Page<UserProfit> pageData(Page<UserProfit> page, @Param("entity") UserProfit entity);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserPushIdMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserPushIdMapper.java
new file mode 100644
index 0000000..65a238e
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserPushIdMapper.java
@@ -0,0 +1,10 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.UserPushId;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @author djh
+ */
+public interface UserPushIdMapper extends BaseMapper<UserPushId> {
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserRewardFlowMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserRewardFlowMapper.java
new file mode 100644
index 0000000..f735bd0
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserRewardFlowMapper.java
@@ -0,0 +1,25 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.UserManageProfit;
+import cn.pluss.platform.entity.UserRewardFlow;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 直营贝斯特管理奖流水表 Mapper 接口
+ * </p>
+ *
+ * @author bzg
+ * @since 2022-01-23
+ */
+public interface UserRewardFlowMapper extends BaseMapper<UserRewardFlow> {
+
+    /**
+     * 统计管理奖
+     * @param date
+     * @return
+     */
+    List<UserManageProfit> listManageProfit(String date);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserRewardInfoMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserRewardInfoMapper.java
new file mode 100644
index 0000000..15a4119
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserRewardInfoMapper.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.UserRewardInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 用户奖励信息表 Mapper 接口
+ * </p>
+ *
+ * @author bzg
+ * @since 2022-02-22
+ */
+public interface UserRewardInfoMapper extends BaseMapper<UserRewardInfo> {
+
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserRoleMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserRoleMapper.java
new file mode 100644
index 0000000..86fde0e
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserRoleMapper.java
@@ -0,0 +1,19 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.UserRole;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * <p>
+ * 用户角色表 Mapper 接口
+ * </p>
+ *
+ * @author bzg
+ * @since 2022-01-13
+ */
+public interface UserRoleMapper extends BaseMapper<UserRole> {
+
+    @Select("SELECT * FROM tb_pluss_user_role WHERE roleCode = #{roleCode}")
+    UserRole getByRoleCode(String roleCode);
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserTaskMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserTaskMapper.java
new file mode 100644
index 0000000..24c8121
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserTaskMapper.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.UserTask;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-05-27
+ */
+public interface UserTaskMapper extends BaseMapper<UserTask> {
+
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserVoiceMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserVoiceMapper.java
new file mode 100644
index 0000000..1f0395f
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/UserVoiceMapper.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.UserVoice;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 用户播报配置表 Mapper 接口
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-04-16
+ */
+public interface UserVoiceMapper extends BaseMapper<UserVoice> {
+
+}
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/WxBankCodeMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/WxBankCodeMapper.java
new file mode 100644
index 0000000..fc2486f
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/WxBankCodeMapper.java
@@ -0,0 +1,27 @@
+package cn.pluss.platform.mapper;
+
+import java.util.List;
+import java.util.Map;
+import org.apache.ibatis.annotations.Mapper;
+import cn.pluss.platform.entity.WxBankCode;
+
+@Mapper
+public interface WxBankCodeMapper {
+
+    public WxBankCode queryWxBankCode(WxBankCode wxBankCode);
+
+    public List<WxBankCode> queryWxBankCodeList(WxBankCode wxBankCode);
+
+    public void saveWxBankCode(WxBankCode wxBankCode);
+
+    public void updateWxBankCode(WxBankCode wxBankCode);
+
+    public void deleteWxBankCode(WxBankCode wxBankCode);
+
+    public List<WxBankCode> queryWxBankCodePage(Map map);
+
+    public Integer queryWxBankCodePageCount(Map map);
+
+    public void saveWxBankCodeBatch(List<WxBankCode>  wxBankCodeList);
+}
+
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/WxCityInfoMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/WxCityInfoMapper.java
new file mode 100644
index 0000000..523f96f
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/WxCityInfoMapper.java
@@ -0,0 +1,27 @@
+package cn.pluss.platform.mapper;
+
+import java.util.List;
+import java.util.Map;
+import org.apache.ibatis.annotations.Mapper;
+import cn.pluss.platform.entity.WxCityInfo;
+
+@Mapper
+public interface WxCityInfoMapper {
+
+    public WxCityInfo queryWxCityInfo(WxCityInfo wxCityInfo);
+
+    public List<WxCityInfo> queryWxCityInfoList(WxCityInfo wxCityInfo);
+
+    public void saveWxCityInfo(WxCityInfo wxCityInfo);
+
+    public void updateWxCityInfo(WxCityInfo wxCityInfo);
+
+    public void deleteWxCityInfo(WxCityInfo wxCityInfo);
+
+    public List<WxCityInfo> queryWxCityInfoPage(Map map);
+
+    public Integer queryWxCityInfoPageCount(Map map);
+
+    public void saveWxCityInfoBatch(List<WxCityInfo>  wxCityInfoList);
+}
+
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/util/PageUtils.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/util/PageUtils.java
new file mode 100644
index 0000000..99b6452
--- /dev/null
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/util/PageUtils.java
@@ -0,0 +1,11 @@
+package cn.pluss.platform.util;
+
+import cn.pluss.platform.api.PageInfo;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+public class PageUtils {
+
+    public static <T> PageInfo<T> page(IPage<T> iPage) {
+        return new PageInfo<T>(iPage.getTotal(), iPage.getPages(), iPage.getCurrent(), iPage.getSize(), iPage.getRecords());
+    }
+}
diff --git a/pluss-dao-bundle/src/main/resources/config/application.yml b/pluss-dao-bundle/src/main/resources/config/application.yml
new file mode 100644
index 0000000..3ba8722
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/config/application.yml
@@ -0,0 +1,12 @@
+mybatis-plus:
+  configuration:
+    map-underscore-to-camel-case: false
+  global-config:
+    db-config:
+      id-type: auto
+      table-prefix: tb_pluss_
+      select-strategy: not_empty
+
+
+
+  type-handlers-package: cn.pluss.platform.config.mybatis
\ No newline at end of file
diff --git a/pluss-dao-bundle/src/main/resources/log4j2.xml b/pluss-dao-bundle/src/main/resources/log4j2.xml
new file mode 100644
index 0000000..5a947ea
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/log4j2.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--日志级别以及优先级排序: OFF > FATAL > ERROR > WARN > INFO > DEBUG > TRACE > ALL -->
+<!--Configuration后面的status，这个用于设置log4j2自身内部的信息输出，可以不设置，当设置成trace时，你会看到log4j2内部各种详细输出-->
+<!--monitorInterval：Log4j能够自动检测修改配置 文件和重新配置本身，设置间隔秒数-->
+<configuration status="WARN" monitorInterval="30">
+    <!--先定义所有的appender-->
+    <appenders>
+        <!--这个输出控制台的配置-->
+        <console name="Console" target="SYSTEM_OUT">
+            <!--输出日志的格式-->
+            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p - %c{1.} - %m%n"/>
+        </console>
+        <!--文件会打印出所有信息，这个log每次运行程序会自动清空，由append属性决定，这个也挺有用的，适合临时测试用-->
+        <File name="log" fileName="${sys:user.home}/manage/logs/manage.log" append="false">
+            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %c{1.} - %msg%xEx%n" />
+        </File>
+        <!--<File name="log" fileName="d:/crystal/logs/manage.log" append="false">
+            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %class{36} %c - %msg%xEx%n" />
+        </File>-->
+        <!-- 这个会打印出所有的info及以下级别的信息，每次大小超过size，则这size大小的日志会自动存入按年份-月份建立的文件夹下面并进行压缩，作为存档-->
+        <RollingFile name="RollingFileInfo" fileName="${sys:user.home}/syb/logs/info.log"
+                     filePattern="${sys:user.home}/syb/logs/$${date:yyyy-MM}/info-%d{yyyy-MM-dd}-%i.log">
+            <!--控制台只输出level及以上级别的信息（onMatch），其他的直接拒绝（onMismatch）-->
+            <ThresholdFilter level="info" onMatch="ACCEPT" onMismatch="DENY"/>
+            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss:SSS} %p - %c{1.} - %m%n"/>
+            <Policies>
+                <TimeBasedTriggeringPolicy modulate="true" interval="1"/>
+                <SizeBasedTriggeringPolicy size="100 MB"/>
+            </Policies>
+        </RollingFile>
+        <RollingFile name="RollingFileWarn" fileName="${sys:user.home}/syb/logs/warn.log"
+                     filePattern="${sys:user.home}/syb/logs/$${date:yyyy-MM}/warn-%d{yyyy-MM-dd}-%i.log">
+            <ThresholdFilter level="warn" onMatch="ACCEPT" onMismatch="DENY"/>
+            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss:SSS} %p - %c{1.} - %m%n"/>
+            <Policies>
+                <TimeBasedTriggeringPolicy modulate="true" interval="1"/>
+                <SizeBasedTriggeringPolicy size="100 MB"/>
+            </Policies>
+            <!-- DefaultRolloverStrategy属性如不设置，则默认为最多同一文件夹下7个文件，这里设置了20 -->
+            <DefaultRolloverStrategy max="20"/>
+        </RollingFile>
+        <RollingFile name="RollingFileError" fileName="${sys:user.home}/syb/logs/error.log"
+                     filePattern="${sys:user.home}/syb/logs/$${date:yyyy-MM}/error-%d{yyyy-MM-dd}-%i.log">
+            <ThresholdFilter level="error" onMatch="ACCEPT" onMismatch="DENY"/>
+            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss:SSS} %p - %c{1.} - %m%n"/>
+            <Policies>
+                <TimeBasedTriggeringPolicy modulate="true" interval="1"/>
+                <SizeBasedTriggeringPolicy size="100 MB"/>
+            </Policies>
+        </RollingFile>
+    </appenders>
+    <!--然后定义logger，只有定义了logger并引入的appender，appender才会生效-->
+    <loggers>
+        <!--过滤掉spring和mybatis的一些无用的DEBUG信息-->
+        <logger name="cn.pluss.platform.mapper" level="DEBUG"></logger>
+        <logger name="cn.pluss.platform.ryx" level="DEBUG"></logger>
+        <logger name="cn.pluss.platform.ys" level="DEBUG"></logger>
+
+        <root level="DEBUG">
+            <appender-ref ref="Console"/>
+        </root>
+    </loggers>
+</configuration>
\ No newline at end of file
diff --git a/pluss-dao-bundle/src/main/resources/mapper/AccountMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/AccountMapper.xml
new file mode 100644
index 0000000..6de4520
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/AccountMapper.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.AccountMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.Account">
+        <id column="id" property="id" />
+        <result column="userId" property="userId" />
+        <result column="idcardId" property="idCardId" />
+        <result column="bankCardId" property="bankCardId" />
+        <result column="createTime" property="createTime" />
+        <result column="updateTime" property="updateTime" />
+    </resultMap>
+
+    <select id="selectMicroMbiAccountNum" resultType="java.lang.Integer">
+        SELECT count(DISTINCT mbi.userId) count FROM tb_pluss_merchant_base_info mbi
+        LEFT JOIN tb_pluss_account account ON account.userId = mbi.userId
+        LEFT JOIN tb_pluss_id_card ic ON account.userId = ic.userId AND account.idCardId = ic.id
+        LEFT JOIN tb_pluss_merchant_channel_status mcs ON mcs.merchantCode = mbi.merchantCode
+        WHERE merchantType = 1
+        AND mcs.`status` IN (3)
+        AND ic.certNo = #{certNo}
+    </select>
+
+    <select id="selectAccountNum" resultType="java.lang.Integer">
+        SELECT count(DISTINCT mbi.userId) count FROM tb_pluss_merchant_base_info mbi
+            LEFT JOIN tb_pluss_account account ON account.userId = mbi.userId
+            LEFT JOIN tb_pluss_id_card ic ON account.userId = ic.userId AND account.idCardId = ic.id
+            LEFT JOIN tb_pluss_merchant_channel_status mcs ON mcs.merchantCode = mbi.merchantCode
+        WHERE mcs.`status` IN (3, 7)
+          AND ic.certNo IN
+        <foreach collection="certNoList" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </select>
+
+    <select id="selectGroupMaps" resultType="java.util.Map">
+        SELECT count(1) count, ic.certName, ic.certNo FROM tb_pluss_merchant_base_info mbi
+        LEFT JOIN tb_pluss_id_card ic ON mbi.userId = ic.userId
+        LEFT JOIN tb_pluss_merchant_channel_status mcs ON mcs.merchantCode = mbi.merchantCode
+        WHERE merchantType = 1
+        AND ic.userType = 1
+        AND mcs.`status` IN (3, 4)
+        GROUP BY ic.certName, ic.certNo
+    </select>
+
+
+    <select id="selectYSAuditSmallCount" resultType="int">
+        SELECT count(DISTINCT a.userId) FROM tb_pluss_account a
+            LEFT JOIN tb_pluss_merchant_base_info mbi ON a.userId = mbi.userId
+            LEFT JOIN tb_pluss_merchant_channel_status mcs ON mbi.merchantCode = mcs.merchantCode
+            LEFT JOIN tb_pluss_id_card ic ON ic.id = a.idcardId
+        WHERE mcs.`status` IN (3, 7) AND mbi.merchantType = 1 AND mcs.channel = 4
+          AND ic.certNo = (
+            SELECT DISTINCT ic.certNo FROM tb_pluss_account a
+                   LEFT JOIN tb_pluss_merchant_base_info mbi ON a.userId = mbi.userId
+                   LEFT JOIN tb_pluss_merchant_channel_status mcs ON mbi.merchantCode = mcs.merchantCode
+                   LEFT JOIN tb_pluss_id_card ic ON ic.id = a.idcardId
+            WHERE mbi.userId = #{userId}
+        )
+    </select>
+
+    <select id="selectMbiListByCertNo" resultType="cn.pluss.platform.entity.MerchantBaseInfo">
+        SELECT DISTINCT account.userId, mbi.merchantCode FROM tb_pluss_account account
+        LEFT JOIN tb_pluss_id_card ic ON account.userId = ic.userId AND account.idcardId = ic.id
+        LEFT JOIN tb_pluss_merchant_base_info mbi ON mbi.userId = account.userId
+        WHERE ic.certNo = #{certNo};
+    </select>
+
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/ActivityActivate-sqlmap.xml b/pluss-dao-bundle/src/main/resources/mapper/ActivityActivate-sqlmap.xml
new file mode 100644
index 0000000..1be9e1e
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/ActivityActivate-sqlmap.xml
@@ -0,0 +1,302 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+			"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="cn.pluss.platform.mapper.ActivityActivateMapper">
+
+	   	<insert id="saveActivityActivate" parameterType="cn.pluss.platform.entity.ActivityActivate">
+        	insert into tb_pluss_activity_activate(userId,merchantCode,merchantName,giveMoney,storeId,storeName,name,createDt,posterUrl)VALUES(#{userId},#{merchantCode},#{merchantName},#{giveMoney},#{storeId},#{storeName},#{name},now(),#{posterUrl})
+    	</insert>
+
+	   	<insert id="saveActivityActivateBatch">
+        	insert into tb_pluss_activity_activate(userId,merchantCode,merchantName,giveMoney,storeId,storeName,name,createDt) VALUES 
+    			<foreach collection="list" item="item" index="index" separator=",">
+			(#{userId},#{merchantCode},#{merchantName},#{giveMoney},#{storeId},#{storeName},#{name},#{createDt}		)
+				</foreach>
+    	</insert>
+
+		<select id="queryActivityActivate" parameterType="cn.pluss.platform.entity.ActivityActivate" resultType="cn.pluss.platform.entity.ActivityActivate">
+			SELECT * from tb_pluss_activity_activate 
+				<where> 
+					<if test="id!= null"> 
+					 	and id = #{id}
+					 </if> 
+					<if test="userId!= null"> 
+					 	and userId = #{userId}
+					 </if> 
+					<if test="merchantCode!= null"> 
+					 	and merchantCode = #{merchantCode}
+					 </if> 
+					<if test="merchantName!= null"> 
+					 	and merchantName = #{merchantName}
+					 </if> 
+					<if test="giveMoney!= null"> 
+					 	and giveMoney = #{giveMoney}
+					 </if> 
+					<if test="storeId!= null"> 
+					 	and storeId = #{storeId}
+					 </if> 
+					<if test="storeName!= null"> 
+					 	and storeName = #{storeName}
+					 </if> 
+					<if test="name!= null"> 
+					 	and name = #{name}
+					 </if> 
+					<if test="createDt!= null"> 
+					 	and createDt = #{createDt}
+					 </if> 
+					 <if test="posterUrl!= null"> 
+					 	and posterUrl = #{posterUrl}
+					 </if>
+				 </where> 
+		</select>
+
+		<select id="queryActivityActivateList" parameterType="cn.pluss.platform.entity.ActivityActivate" resultType="cn.pluss.platform.entity.ActivityActivate">
+			SELECT * from tb_pluss_activity_activate 
+				<where> 
+					<if test="id!= null"> 
+					 and 	id = #{id}
+					 </if> 
+					<if test="userId!= null"> 
+					 and 	userId = #{userId}
+					 </if> 
+					<if test="merchantCode!= null"> 
+					 and 	merchantCode = #{merchantCode}
+					 </if> 
+					<if test="merchantName!= null"> 
+					 and 	merchantName = #{merchantName}
+					 </if> 
+					<if test="giveMoney!= null"> 
+					 and 	giveMoney = #{giveMoney}
+					 </if> 
+					<if test="storeId!= null"> 
+					 and 	storeId = #{storeId}
+					 </if> 
+					<if test="storeName!= null"> 
+					 and 	storeName = #{storeName}
+					 </if> 
+					<if test="name!= null"> 
+					 and 	name = #{name}
+					 </if> 
+					<if test="createDt!= null"> 
+					 and 	createDt = #{createDt}
+					 </if> 
+					 <if test="posterUrl!= null"> 
+					 and 	posterUrl = #{posterUrl}
+					 </if> 
+				 </where> 
+		</select>
+
+		<update id="updateActivityActivate" parameterType="cn.pluss.platform.entity.ActivityActivate" >
+			update tb_pluss_activity_activate 
+				  <set> 
+					<if test="userId!= null"> 
+					 	userId = #{userId},
+					 </if> 
+					<if test="merchantCode!= null"> 
+					 	merchantCode = #{merchantCode},
+					 </if> 
+					<if test="merchantName!= null"> 
+					 	merchantName = #{merchantName},
+					 </if> 
+					<if test="giveMoney!= null"> 
+					 	giveMoney = #{giveMoney},
+					 </if> 
+					<if test="storeId!= null"> 
+					 	storeId = #{storeId},
+					 </if> 
+					<if test="storeName!= null"> 
+					 	storeName = #{storeName},
+					 </if> 
+					<if test="name!= null"> 
+					 	name = #{name},
+					 </if> 
+					<if test="createDt!= null"> 
+					 	createDt = #{createDt},
+					 </if> 
+					 <if test="posterUrl!= null"> 
+					 	posterUrl = #{posterUrl}
+					 </if> 
+				</set>
+			where id=#{id} 
+		</update>
+
+		<delete id="deleteActivityActivate" parameterType="cn.pluss.platform.entity.ActivityActivate" >
+			DELETE FROM tb_pluss_activity_activate where id=#{id}
+		</delete>
+
+		<select id="queryActivityActivatePage" parameterType="java.util.Map" resultType="cn.pluss.platform.entity.ActivityActivate">
+			SELECT * from tb_pluss_activity_activate 
+				<where> 
+					<if test="id!= null"> 
+					and id = #{id}
+					 </if> 
+					<if test="userId!= null"> 
+					and userId = #{userId}
+					 </if> 
+					<if test="merchantCode!= null"> 
+					and merchantCode = #{merchantCode}
+					 </if> 
+					<if test="merchantName!= null"> 
+					and merchantName = #{merchantName}
+					 </if> 
+					<if test="giveMoney!= null"> 
+					and giveMoney = #{giveMoney}
+					 </if> 
+					<if test="storeId!= null"> 
+					and storeId = #{storeId}
+					 </if> 
+					<if test="storeName!= null"> 
+					and storeName = #{storeName}
+					 </if> 
+					<if test="name!= null"> 
+					and name Like CONCAT("%",#{name},"%")
+					 </if> 
+					<if test="createDt!= null"> 
+					and createDt = #{createDt}
+					 </if> 
+					 <if test="posterUrl!= null"> 
+					and posterUrl = #{createDt}
+					 </if> 
+				 </where> 
+			order by id desc  limit #{pageSize}  offset  #{offset}  
+		</select>
+
+	<select id="queryNoActivityActivatePage" parameterType="java.util.Map" resultType="cn.pluss.platform.entity.ActivityActivate">
+		SELECT * from tb_pluss_activity_activate
+		<where>
+			<if test="id!= null">
+				and id = #{id}
+			</if>
+			<if test="userId!= null">
+				and userId = #{userId}
+			</if>
+			<if test="merchantCode!= null">
+				and merchantCode IN (SELECT merchantCode
+				FROM tb_pluss_merchant_base_info
+				WHERE bindingCode = (SELECT bindingCode
+				FROM tb_pluss_merchant_base_info
+				where merchantCode = #{merchantCode}))
+			</if>
+			<if test="merchantName!= null">
+				and merchantName = #{merchantName}
+			</if>
+			<if test="giveMoney!= null">
+				and giveMoney = #{giveMoney}
+			</if>
+			<if test="storeId!= null">
+				and storeId = #{storeId}
+			</if>
+			<if test="storeName!= null">
+				and storeName = #{storeName}
+			</if>
+			<if test="name!= null">
+				and name Like CONCAT("%",#{name},"%")
+			</if>
+			<if test="createDt!= null">
+				and createDt = #{createDt}
+			</if>
+			<if test="posterUrl!= null">
+				and posterUrl = #{createDt}
+			</if>
+		</where>
+		order by id desc  limit #{pageSize}  offset  #{offset}
+	</select>
+
+		<select id="queryActivityActivatePageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+			SELECT count(*) from tb_pluss_activity_activate 
+					<where> 
+					<if test="id!= null"> 
+					 and id = #{id}
+					 </if> 
+					<if test="userId!= null"> 
+					 and userId = #{userId}
+					 </if> 
+					<if test="merchantCode!= null"> 
+					 and merchantCode = #{merchantCode}
+					 </if> 
+					<if test="merchantName!= null"> 
+					 and merchantName = #{merchantName}
+					 </if> 
+					<if test="giveMoney!= null"> 
+					 and giveMoney = #{giveMoney}
+					 </if> 
+					<if test="storeId!= null"> 
+					 and storeId = #{storeId}
+					 </if> 
+					<if test="storeName!= null"> 
+					 and storeName = #{storeName}
+					 </if> 
+					<if test="name!= null"> 
+					 and name  Like CONCAT("%",#{name},"%")  
+					 </if> 
+					<if test="createDt!= null"> 
+					 and createDt = #{createDt}
+					 </if> 
+				</where>
+		</select>
+
+	<select id="queryNoActivityActivatePageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+		SELECT count(*) from tb_pluss_activity_activate
+		<where>
+			<if test="id!= null">
+				and id = #{id}
+			</if>
+			<if test="userId!= null">
+				and userId = #{userId}
+			</if>
+			<if test="merchantCode!= null">
+				and merchantCode IN (SELECT merchantCode
+				FROM tb_pluss_merchant_base_info
+				WHERE bindingCode = (SELECT bindingCode
+				FROM tb_pluss_merchant_base_info
+				where merchantCode = #{merchantCode}))
+			</if>
+			<if test="merchantName!= null">
+				and merchantName = #{merchantName}
+			</if>
+			<if test="giveMoney!= null">
+				and giveMoney = #{giveMoney}
+			</if>
+			<if test="storeId!= null">
+				and storeId = #{storeId}
+			</if>
+			<if test="storeName!= null">
+				and storeName = #{storeName}
+			</if>
+			<if test="name!= null">
+				and name  Like CONCAT("%",#{name},"%")
+			</if>
+			<if test="createDt!= null">
+				and createDt = #{createDt}
+			</if>
+		</where>
+	</select>
+
+	<select id="getNewestActivityJoin" resultType="java.util.Map" parameterType="java.lang.String">
+		SELECT distinct a.id,a.createDt,a.giveMoney,a.rechargeMoney,a.type,a.reType,a.percent,a.timeType,a.startDt,a.endDt,a.storeId FROM (
+		(
+		SELECT id,createDt,giveMoney,rechargeMoney,3 'type',-1 AS 'reType',0 AS 'percent',timeType,startDt,endDt,storeId FROM tb_pluss_activity_recharge WHERE storeId = #{storeId} AND timeType = 0
+		)
+		UNION
+		(
+		SELECT id,createDt,giveMoney,rechargeMoney,3 'type',-1 AS 'reType',0 AS 'percent',timeType,startDt,endDt,storeId FROM tb_pluss_activity_recharge
+		WHERE storeId = #{storeId} AND timeType = 1 and DATE_FORMAT(startDt,'%Y-%m-%d') <![CDATA[<=]]> DATE_FORMAT(NOW(),'%Y-%m-%d') AND DATE_FORMAT(endDt,'%Y-%m-%d') <![CDATA[>=]]> DATE_FORMAT(NOW(),'%Y-%m-%d')
+		)
+		UNION
+		(
+		SELECT id,createDt,returnMoney AS 'giveMoney',comsumeMoney AS 'rechargeMoney', 2 'type', type AS 'reType',percent,timeType,startDt,endDt,storeId from tb_pluss_activity_consum_return WHERE storeId = #{storeId} and timeType = 0
+		)
+		UNION
+		(
+		SELECT id,createDt,returnMoney AS 'giveMoney',comsumeMoney AS 'rechargeMoney', 2 'type', type AS 'reType',percent,timeType,startDt,endDt,storeId from tb_pluss_activity_consum_return WHERE storeId = #{storeId} and timeType = 1 and DATE_FORMAT(startDt,'%Y-%m-%d') <![CDATA[<=]]> DATE_FORMAT(NOW(),'%Y-%m-%d') AND DATE_FORMAT(endDt,'%Y-%m-%d') <![CDATA[>=]]> DATE_FORMAT(NOW(),'%Y-%m-%d')
+		)
+		UNION
+		(
+		SELECT id,createDt,giveMoney, 0 'rechargeMoney',1 'type' , -1 AS 'reType' , 0 as 'percent', 0 as 'timeType', null as startDt,null as endDt,storeId FROM tb_pluss_activity_activate WHERE storeId = #{storeId}
+		)
+		) a ORDER BY a.createDt desc
+
+	</select>
+
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/ActivityConsumReturn-sqlmap.xml b/pluss-dao-bundle/src/main/resources/mapper/ActivityConsumReturn-sqlmap.xml
new file mode 100644
index 0000000..11e85a5
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/ActivityConsumReturn-sqlmap.xml
@@ -0,0 +1,428 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+			"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="cn.pluss.platform.mapper.ActivityConsumReturnMapper">
+
+	   	<insert id="saveActivityConsumReturn" parameterType="cn.pluss.platform.entity.ActivityConsumReturn">
+        	insert into tb_pluss_activity_consum_return(userId,merchantCode,merchantName,storeId,storeName,name,createDt,type,comsumeMoney,returnMoney,percent,startDt,endDt,timeType,posterUrl)VALUES(#{userId},#{merchantCode},#{merchantName},#{storeId},#{storeName},#{name},now(),#{type},#{comsumeMoney},#{returnMoney},#{percent},#{startDt},#{endDt},#{timeType},#{posterUrl})
+    	</insert>
+
+	   	<insert id="saveActivityConsumReturnBatch">
+        	insert into tb_pluss_activity_consum_return(userId,merchantCode,merchantName,storeId,storeName,name,createDt,type,comsumeMoney,returnMoney,percent,startDt,endDt,timeType) VALUES 
+    			<foreach collection="list" item="item" index="index" separator=",">
+			(#{userId},#{merchantCode},#{merchantName},#{storeId},#{storeName},#{name},#{createDt},#{type},#{comsumeMoney},#{returnMoney},#{percent},#{startDt},#{endDt},#{timeType}		)
+				</foreach>
+    	</insert>
+
+		<select id="queryActivityConsumReturn" parameterType="cn.pluss.platform.entity.ActivityConsumReturn" resultType="cn.pluss.platform.entity.ActivityConsumReturn">
+			SELECT * from tb_pluss_activity_consum_return 
+				<where> 
+					<if test="id!= null"> 
+					 	and id = #{id}
+					 </if> 
+					<if test="userId!= null"> 
+					 	and userId = #{userId}
+					 </if> 
+					<if test="merchantCode!= null"> 
+					 	and merchantCode = #{merchantCode}
+					 </if> 
+					<if test="merchantName!= null"> 
+					 	and merchantName = #{merchantName}
+					 </if> 
+					<if test="storeId!= null"> 
+					 	and storeId = #{storeId}
+					 </if> 
+					<if test="storeName!= null"> 
+					 	and storeName = #{storeName}
+					 </if> 
+					<if test="name!= null"> 
+					 	and name = #{name}
+					 </if> 
+					<if test="createDt!= null"> 
+					 	and createDt = #{createDt}
+					 </if> 
+					<if test="type!= null"> 
+					 	and type = #{type}
+					 </if> 
+					<if test="comsumeMoney!= null"> 
+					 	and comsumeMoney = #{comsumeMoney}
+					 </if> 
+					<if test="returnMoney!= null"> 
+					 	and returnMoney = #{returnMoney}
+					 </if> 
+					<if test="percent!= null"> 
+					 	and percent = #{percent}
+					 </if> 
+					<if test="startDt!= null"> 
+					 	and startDt = #{startDt}
+					 </if> 
+					<if test="endDt!= null"> 
+					 	and endDt = #{endDt}
+					 </if> 
+					<if test="timeType!= null"> 
+					 	and timeType = #{timeType}
+					 </if> 
+					 <if test="posterUrl!= null"> 
+					 	and posterUrl = #{posterUrl}
+					 </if> 
+				 </where> 
+		</select>
+
+		<select id="queryActivityConsumReturnList" parameterType="cn.pluss.platform.entity.ActivityConsumReturn" resultType="cn.pluss.platform.entity.ActivityConsumReturn">
+			SELECT * from tb_pluss_activity_consum_return 
+				<where> 
+					<if test="id!= null"> 
+					 and 	id = #{id}
+					 </if> 
+					<if test="userId!= null"> 
+					 and 	userId = #{userId}
+					 </if> 
+					<if test="merchantCode!= null"> 
+					 and 	merchantCode = #{merchantCode}
+					 </if> 
+					<if test="merchantName!= null"> 
+					 and 	merchantName = #{merchantName}
+					 </if> 
+					<if test="storeId!= null"> 
+					 and 	storeId = #{storeId}
+					 </if> 
+					<if test="storeName!= null"> 
+					 and 	storeName = #{storeName}
+					 </if> 
+					<if test="name!= null"> 
+					 and 	name = #{name}
+					 </if> 
+					<if test="createDt!= null"> 
+					 and 	createDt = #{createDt}
+					 </if> 
+					<if test="type!= null"> 
+					 and 	type = #{type}
+					 </if> 
+					<if test="comsumeMoney!= null"> 
+					 and 	comsumeMoney = #{comsumeMoney}
+					 </if> 
+					<if test="returnMoney!= null"> 
+					 and 	returnMoney = #{returnMoney}
+					 </if> 
+					<if test="percent!= null"> 
+					 and 	percent = #{percent}
+					 </if> 
+					<if test="startDt!= null"> 
+					 and 	startDt = #{startDt}
+					 </if> 
+					<if test="endDt!= null"> 
+					 and 	endDt = #{endDt}
+					 </if> 
+					<if test="timeType!= null"> 
+					 and 	timeType = #{timeType}
+					 </if> 
+					 <if test="posterUrl!= null"> 
+					 and 	posterUrl = #{posterUrl}
+					 </if> 
+				 </where> 
+		</select>
+
+		<update id="updateActivityConsumReturn" parameterType="cn.pluss.platform.entity.ActivityConsumReturn" >
+			update tb_pluss_activity_consum_return 
+				  <set> 
+				  startDt = #{startDt},
+				  endDt = #{endDt},
+					<if test="userId!= null"> 
+					 	userId = #{userId},
+					 </if> 
+					<if test="merchantCode!= null"> 
+					 	merchantCode = #{merchantCode},
+					 </if> 
+					<if test="merchantName!= null"> 
+					 	merchantName = #{merchantName},
+					 </if> 
+					<if test="storeId!= null"> 
+					 	storeId = #{storeId},
+					 </if> 
+					<if test="storeName!= null"> 
+					 	storeName = #{storeName},
+					 </if> 
+					<if test="name!= null"> 
+					 	name = #{name},
+					 </if> 
+					<if test="createDt!= null"> 
+					 	createDt = #{createDt},
+					 </if> 
+					<if test="type!= null"> 
+					 	type = #{type},
+					 </if> 
+					<if test="comsumeMoney!= null"> 
+					 	comsumeMoney = #{comsumeMoney},
+					 </if> 
+					<if test="returnMoney!= null"> 
+					 	returnMoney = #{returnMoney},
+					 </if> 
+					<if test="percent!= null"> 
+					 	percent = #{percent},
+					 </if> 
+					<if test="timeType!= null"> 
+					 	timeType = #{timeType},
+					 </if> 
+					 <if test="posterUrl!= null"> 
+					  	posterUrl = #{posterUrl}
+					 </if> 
+				</set>
+			where id=#{id} 
+		</update>
+
+		<delete id="deleteActivityConsumReturn" parameterType="cn.pluss.platform.entity.ActivityConsumReturn" >
+			DELETE FROM tb_pluss_activity_consum_return where id=#{id}
+		</delete>
+
+		<select id="queryActivityConsumReturnPage" parameterType="java.util.Map" resultType="cn.pluss.platform.entity.ActivityConsumReturn">
+			SELECT * from tb_pluss_activity_consum_return 
+				<where> 
+					<if test="id!= null"> 
+					and id = #{id}
+					 </if> 
+					<if test="userId!= null"> 
+					and userId = #{userId}
+					 </if> 
+					<if test="merchantCode!= null"> 
+					and merchantCode = #{merchantCode}
+					 </if> 
+					<if test="merchantName!= null"> 
+					and merchantName = #{merchantName}
+					 </if> 
+					<if test="storeId!= null"> 
+					and storeId = #{storeId}
+					 </if> 
+					<if test="storeName!= null"> 
+					and storeName = #{storeName}
+					 </if> 
+					<if test="name!= null"> 
+					and name Like CONCAT("%",#{name},"%")
+					 </if> 
+					<if test="createDt!= null"> 
+					and createDt = #{createDt}
+					 </if> 
+					<if test="type!= null"> 
+					and type = #{type}
+					 </if> 
+					<if test="comsumeMoney!= null"> 
+					and comsumeMoney = #{comsumeMoney}
+					 </if> 
+					<if test="returnMoney!= null"> 
+					and returnMoney = #{returnMoney}
+					 </if> 
+					<if test="percent!= null"> 
+					and percent = #{percent}
+					 </if> 
+					 
+					 <if test="startDt!= null">
+					   AND startDt <![CDATA[>=]]>#{startDt}
+					 </if>
+                <if test="endDt!= null">
+                    AND endDt <![CDATA[<=]]>#{endDt}
+                </if>
+					 
+					<!-- <if test="startDt!= null"> 
+					and startDt = #{startDt}
+					 </if> 
+					<if test="endDt!= null"> 
+					and endDt = #{endDt}
+					 </if>  -->
+					<if test="timeType!= null"> 
+					and timeType = #{timeType}
+					 </if> 
+					 <if test="posterUrl!= null"> 
+					 and 	posterUrl = #{posterUrl}
+					 </if> 
+				 </where> 
+			order by id desc  limit #{pageSize}  offset  #{offset}  
+		</select>
+
+	<select id="queryActivityNoConsumReturnPage" parameterType="java.util.Map" resultType="cn.pluss.platform.entity.ActivityConsumReturn">
+		SELECT * from tb_pluss_activity_consum_return
+		<where>
+			<if test="id!= null">
+				and id = #{id}
+			</if>
+			<if test="userId!= null">
+				and userId = #{userId}
+			</if>
+			<if test="merchantCode!= null">
+				and merchantCode IN (SELECT merchantCode
+				FROM tb_pluss_merchant_base_info
+				WHERE bindingCode = (SELECT bindingCode
+				FROM tb_pluss_merchant_base_info
+				where merchantCode = #{merchantCode}))
+			</if>
+			<if test="merchantName!= null">
+				and merchantName = #{merchantName}
+			</if>
+			<if test="storeId!= null">
+				and storeId = #{storeId}
+			</if>
+			<if test="storeName!= null">
+				and storeName = #{storeName}
+			</if>
+			<if test="name!= null">
+				and name Like CONCAT("%",#{name},"%")
+			</if>
+			<if test="createDt!= null">
+				and createDt = #{createDt}
+			</if>
+			<if test="type!= null">
+				and type = #{type}
+			</if>
+			<if test="comsumeMoney!= null">
+				and comsumeMoney = #{comsumeMoney}
+			</if>
+			<if test="returnMoney!= null">
+				and returnMoney = #{returnMoney}
+			</if>
+			<if test="percent!= null">
+				and percent = #{percent}
+			</if>
+
+			<if test="startDt!= null">
+				AND startDt <![CDATA[>=]]>#{startDt}
+			</if>
+			<if test="endDt!= null">
+				AND endDt <![CDATA[<=]]>#{endDt}
+			</if>
+
+			<!-- <if test="startDt!= null">
+            and startDt = #{startDt}
+             </if>
+            <if test="endDt!= null">
+            and endDt = #{endDt}
+             </if>  -->
+			<if test="timeType!= null">
+				and timeType = #{timeType}
+			</if>
+			<if test="posterUrl!= null">
+				and 	posterUrl = #{posterUrl}
+			</if>
+		</where>
+		order by id desc  limit #{pageSize}  offset  #{offset}
+	</select>
+
+		<select id="queryActivityConsumReturnPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+			SELECT count(*) from tb_pluss_activity_consum_return 
+					<where> 
+					<if test="id!= null"> 
+					 and id = #{id}
+					 </if> 
+					<if test="userId!= null"> 
+					 and userId = #{userId}
+					 </if> 
+					<if test="merchantCode!= null"> 
+					 and merchantCode = #{merchantCode}
+					 </if> 
+					<if test="merchantName!= null"> 
+					 and merchantName = #{merchantName}
+					 </if> 
+					<if test="storeId!= null"> 
+					 and storeId = #{storeId}
+					 </if> 
+					<if test="storeName!= null"> 
+					 and storeName = #{storeName}
+					 </if> 
+					<if test="name!= null"> 
+					 and name Like CONCAT("%",#{name},"%")
+					 </if> 
+					<if test="createDt!= null"> 
+					 and createDt = #{createDt}
+					 </if> 
+					<if test="type!= null"> 
+					 and type = #{type}
+					 </if> 
+					<if test="comsumeMoney!= null"> 
+					 and comsumeMoney = #{comsumeMoney}
+					 </if> 
+					<if test="returnMoney!= null"> 
+					 and returnMoney = #{returnMoney}
+					 </if> 
+					<if test="percent!= null"> 
+					 and percent = #{percent}
+					 </if> 
+					 
+					  <if test="startDt!= null">
+                       AND startDt <![CDATA[>=]]>#{startDt}
+                     </if>
+                <if test="endDt!= null">
+                    AND endDt <![CDATA[<=]]>#{endDt}
+                </if>
+					 
+					<!-- <if test="startDt!= null"> 
+					 and startDt = #{startDt}
+					 </if> 
+					<if test="endDt!= null"> 
+					 and endDt = #{endDt}
+					 </if>  -->
+					<if test="timeType!= null"> 
+					 and timeType = #{timeType}
+					 </if> 
+				</where>
+		</select>
+
+	<select id="queryActivityNoConsumReturnPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+		SELECT count(*) from tb_pluss_activity_consum_return
+		<where>
+			<if test="id!= null">
+				and id = #{id}
+			</if>
+			<if test="userId!= null">
+				and userId = #{userId}
+			</if>
+			<if test="merchantCode!= null">
+				and merchantCode IN (SELECT merchantCode
+				FROM tb_pluss_merchant_base_info
+				WHERE bindingCode = (SELECT bindingCode
+				FROM tb_pluss_merchant_base_info
+				where merchantCode = #{merchantCode}))
+			</if>
+			<if test="merchantName!= null">
+				and merchantName = #{merchantName}
+			</if>
+			<if test="storeId!= null">
+				and storeId = #{storeId}
+			</if>
+			<if test="storeName!= null">
+				and storeName = #{storeName}
+			</if>
+			<if test="name!= null">
+				and name Like CONCAT("%",#{name},"%")
+			</if>
+			<if test="createDt!= null">
+				and createDt = #{createDt}
+			</if>
+			<if test="type!= null">
+				and type = #{type}
+			</if>
+			<if test="comsumeMoney!= null">
+				and comsumeMoney = #{comsumeMoney}
+			</if>
+			<if test="returnMoney!= null">
+				and returnMoney = #{returnMoney}
+			</if>
+			<if test="percent!= null">
+				and percent = #{percent}
+			</if>
+			<if test="startDt!= null">
+				AND startDt <![CDATA[>=]]>#{startDt}
+			</if>
+			<if test="endDt!= null">
+				AND endDt <![CDATA[<=]]>#{endDt}
+			</if>
+			<!-- <if test="startDt!= null">
+             and startDt = #{startDt}
+             </if>
+            <if test="endDt!= null">
+             and endDt = #{endDt}
+             </if>  -->
+			<if test="timeType!= null">
+				and timeType = #{timeType}
+			</if>
+		</where>
+	</select>
+
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/ActivityEnrollMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/ActivityEnrollMapper.xml
new file mode 100644
index 0000000..0d625f1
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/ActivityEnrollMapper.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.ActivityEnrollMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.ActivityEnroll">
+        <id column="id" property="id" />
+        <result column="merchantCode" property="merchantCode" />
+        <result column="merchantName" property="merchantName" />
+        <result column="actName" property="actName" />
+        <result column="actId" property="actId" />
+        <result column="status" property="status" />
+        <result column="remark" property="remark" />
+        <result column="createTime" property="createTime" />
+        <result column="updateTime" property="updateTime" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/ActivityRecharge-sqlmap.xml b/pluss-dao-bundle/src/main/resources/mapper/ActivityRecharge-sqlmap.xml
new file mode 100644
index 0000000..4030a17
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/ActivityRecharge-sqlmap.xml
@@ -0,0 +1,273 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+			"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="cn.pluss.platform.mapper.ActivityRechargeMapper">
+
+	   	<insert id="saveActivityRechargeBatch">
+        	insert into tb_pluss_activity_recharge(userId,merchantCode,merchantName,rechargeMoney,giveMoney,startDt,endDt,name,createDt,timeType,storeId,storeName) VALUES 
+    			<foreach collection="list" item="item" index="index" separator=",">
+			(#{userId},#{merchantCode},#{merchantName},#{rechargeMoney},#{giveMoney},#{startDt},#{endDt},#{name},#{createDt},#{timeType},#{storeId},#{storeName}		)
+				</foreach>
+    	</insert>
+
+		<select id="queryActivityRechargeList" parameterType="cn.pluss.platform.entity.ActivityRecharge" resultType="cn.pluss.platform.entity.ActivityRecharge">
+			SELECT * from tb_pluss_activity_recharge 
+				<where> 
+					<if test="id!= null"> 
+					 and 	id = #{id}
+					 </if> 
+					<if test="userId!= null"> 
+					 and 	userId = #{userId}
+					 </if> 
+					<if test="merchantCode!= null"> 
+					 and 	merchantCode = #{merchantCode}
+					 </if> 
+					<if test="merchantName!= null"> 
+					 and 	merchantName = #{merchantName}
+					 </if> 
+					<if test="rechargeMoney!= null"> 
+					 and 	rechargeMoney = #{rechargeMoney}
+					 </if> 
+					<if test="giveMoney!= null"> 
+					 and 	giveMoney = #{giveMoney}
+					 </if> 
+					<if test="startDt!= null"> 
+					 and 	startDt = #{startDt}
+					 </if> 
+					<if test="endDt!= null"> 
+					 and 	endDt = #{endDt}
+					 </if> 
+					<if test="name!= null"> 
+					 and 	name = #{name}
+					 </if> 
+					<if test="startDt!= null">
+                       AND startDt <![CDATA[>=]]>#{startDt}
+                     </if>
+                <if test="endDt!= null">
+                    AND endDt <![CDATA[<=]]>#{endDt}
+                </if> 
+					<if test="storeId!= null"> 
+					 and 	storeId = #{storeId}
+					 </if> 
+					<if test="storeName!= null"> 
+					 and 	storeName = #{storeName}
+					 </if> 
+					 <if test="posterUrl!= null"> 
+					 and    posterUrl = #{posterUrl}
+					 </if> 
+				 </where>
+				  order by id desc
+		</select>
+
+		<select id="queryActivityRechargePage" parameterType="java.util.Map" resultType="cn.pluss.platform.entity.ActivityRecharge">
+			SELECT * from tb_pluss_activity_recharge
+			<where>
+					<if test="id!= null"> 
+					and id = #{id}
+					 </if> 
+					<if test="userId!= null"> 
+					and userId = #{userId}
+					 </if> 
+					<if test="merchantCode!= null"> 
+					and merchantCode = #{merchantCode}
+					 </if> 
+					<if test="merchantName!= null"> 
+					and merchantName = #{merchantName}
+					 </if> 
+					<if test="rechargeMoney!= null"> 
+					and rechargeMoney = #{rechargeMoney}
+					 </if> 
+					<if test="giveMoney!= null"> 
+					and giveMoney = #{giveMoney}
+					 </if>
+					 <if test="startDt!= null">
+                       AND startDt <![CDATA[>=]]>#{startDt}
+                     </if>
+                <if test="endDt!= null">
+                    AND endDt <![CDATA[<=]]>#{endDt}
+                </if>
+					<if test="name!= null and name!=''"> 
+					and name like CONCAT("%",#{name},"%")
+					 </if> 
+					<if test="createDt!= null"> 
+					and createDt = #{createDt}
+					 </if> 
+					<if test="timeType!= null"> 
+					and timeType = #{timeType}
+					 </if> 
+					<if test="storeId!= null"> 
+					and storeId = #{storeId}
+					 </if> 
+					<if test="storeName!= null"> 
+					and storeName = #{storeName}
+					 </if> 
+					 <if test="posterUrl!= null"> 
+					and posterUrl = #{posterUrl}
+					 </if> 
+				 </where> 
+			order by id desc  limit #{pageSize}  offset  #{offset}  
+		</select>
+
+	<select id="queryActivityNoRechargePage" parameterType="java.util.Map" resultType="cn.pluss.platform.entity.ActivityRecharge">
+		SELECT * from tb_pluss_activity_recharge
+		<where>
+			<if test="id!= null">
+				and id = #{id}
+			</if>
+			<if test="userId!= null">
+				and userId = #{userId}
+			</if>
+			<if test="merchantCode!= null">
+				and merchantCode IN (SELECT merchantCode
+				FROM tb_pluss_merchant_base_info
+				WHERE bindingCode = (SELECT bindingCode
+				FROM tb_pluss_merchant_base_info
+				where merchantCode = #{merchantCode}))
+			</if>
+			<if test="merchantName!= null">
+				and merchantName = #{merchantName}
+			</if>
+			<if test="rechargeMoney!= null">
+				and rechargeMoney = #{rechargeMoney}
+			</if>
+			<if test="giveMoney!= null">
+				and giveMoney = #{giveMoney}
+			</if>
+			<if test="startDt!= null">
+				AND startDt <![CDATA[>=]]>#{startDt}
+			</if>
+			<if test="endDt!= null">
+				AND endDt <![CDATA[<=]]>#{endDt}
+			</if>
+			<if test="name!= null and name!=''">
+				and name like CONCAT("%",#{name},"%")
+			</if>
+			<if test="createDt!= null">
+				and createDt = #{createDt}
+			</if>
+			<if test="timeType!= null">
+				and timeType = #{timeType}
+			</if>
+			<if test="storeId!= null">
+				and storeId = #{storeId}
+			</if>
+			<if test="storeName!= null">
+				and storeName = #{storeName}
+			</if>
+			<if test="posterUrl!= null">
+				and posterUrl = #{posterUrl}
+			</if>
+		</where>
+		order by id desc  limit #{pageSize}  offset  #{offset}
+	</select>
+
+		<select id="queryActivityRechargePageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+			SELECT count(*) from tb_pluss_activity_recharge 
+					<where> 
+					<if test="id!= null"> 
+					 and id = #{id}
+					 </if> 
+					<if test="userId!= null"> 
+					 and userId = #{userId}
+					 </if> 
+					<if test="merchantCode!= null"> 
+					 and merchantCode = #{merchantCode}
+					 </if> 
+					<if test="merchantName!= null"> 
+					 and merchantName = #{merchantName}
+					 </if> 
+					<if test="rechargeMoney!= null"> 
+					 and rechargeMoney = #{rechargeMoney}
+					 </if> 
+					<if test="giveMoney!= null"> 
+					 and giveMoney = #{giveMoney}
+					 </if> 
+					<if test="startDt!= null">
+                       AND startDt <![CDATA[>=]]>#{startDt}
+                     </if>
+                <if test="endDt!= null">
+                    AND endDt <![CDATA[<=]]>#{endDt}
+                </if>
+					<if test="name!= null and name!=''"> 
+					 and name = #{name}
+					 </if> 
+					<if test="createDt!= null"> 
+					 and createDt = #{createDt}
+					 </if> 
+					<if test="timeType!= null"> 
+					 and timeType = #{timeType}
+					 </if> 
+					<if test="storeId!= null"> 
+					 and storeId = #{storeId}
+					 </if> 
+					<if test="storeName!= null"> 
+					 and storeName = #{storeName}
+					 </if> 
+					 <if test="posterUrl!= null"> 
+					 and posterUrl = #{posterUrl}
+					 </if> 
+				</where>
+		</select>
+
+	<select id="queryActivityNoRechargePageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+		SELECT count(*) from tb_pluss_activity_recharge
+		<where>
+			<if test="id!= null">
+				and id = #{id}
+			</if>
+			<if test="userId!= null">
+				and userId = #{userId}
+			</if>
+			<if test="merchantCode!= null">
+				and merchantCode IN (SELECT merchantCode
+				FROM tb_pluss_merchant_base_info
+				WHERE bindingCode = (SELECT bindingCode
+				FROM tb_pluss_merchant_base_info
+				where merchantCode = #{merchantCode} ))
+			</if>
+			<if test="merchantName!= null">
+				and merchantName = #{merchantName}
+			</if>
+			<if test="rechargeMoney!= null">
+				and rechargeMoney = #{rechargeMoney}
+			</if>
+			<if test="giveMoney!= null">
+				and giveMoney = #{giveMoney}
+			</if>
+			<if test="startDt!= null">
+				AND startDt <![CDATA[>=]]>#{startDt}
+			</if>
+			<if test="endDt!= null">
+				AND endDt <![CDATA[<=]]>#{endDt}
+			</if>
+			<if test="name!= null and name!=''">
+				and name = #{name}
+			</if>
+			<if test="createDt!= null">
+				and createDt = #{createDt}
+			</if>
+			<if test="timeType!= null">
+				and timeType = #{timeType}
+			</if>
+			<if test="storeId!= null">
+				and storeId = #{storeId}
+			</if>
+			<if test="storeName!= null">
+				and storeName = #{storeName}
+			</if>
+			<if test="posterUrl!= null">
+				and posterUrl = #{posterUrl}
+			</if>
+		</where>
+	</select>
+
+
+	<select id="queryUsableActivityRechageList" parameterType="cn.pluss.platform.entity.ActivityRecharge" resultType="cn.pluss.platform.entity.ActivityRecharge">
+		(SELECT * FROM tb_pluss_activity_recharge
+		WHERE merchantCode = #{merchantCode} and storeId = #{storeId} and timeType = '0') UNION All
+		(SELECT * FROM tb_pluss_activity_recharge
+		WHERE merchantCode = #{merchantCode} and timeType = '1' and DATE_FORMAT(startDt,'%Y-%m-%d') <![CDATA[<=]]> DATE_FORMAT(NOW(),'%Y-%m-%d') and  DATE_FORMAT(endDt,'%Y-%m-%d') <![CDATA[>=]]> DATE_FORMAT(NOW(),'%Y-%m-%d') )
+	</select>
+
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/ActivityRecommend-sqlmap.xml b/pluss-dao-bundle/src/main/resources/mapper/ActivityRecommend-sqlmap.xml
new file mode 100644
index 0000000..a4e5b26
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/ActivityRecommend-sqlmap.xml
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+			"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="cn.pluss.platform.mapper.ActivityRecommendMapper">
+
+	   	<insert id="saveActivityRecommend" parameterType="cn.pluss.platform.entity.ActivityRecommend">
+        	insert into tb_pluss_activity_recommend(userId,name,firstMixRechargeMoney,recommendMoney,merchantCode,merchantName,storeId,storeName,createDt)VALUES(#{userId},#{name},#{firstMixRechargeMoney},#{recommendMoney},#{merchantCode},#{merchantName},#{storeId},#{storeName},NOW())
+    	</insert>
+
+	   	<insert id="saveActivityRecommendBatch">
+        	insert into tb_pluss_activity_recommend(userId,name,firstMixRechargeMoney,recommendMoney,merchantCode,merchantName,storeId,storeName,createDt) VALUES 
+    			<foreach collection="list" item="item" index="index" separator=",">
+			(#{userId},#{name},#{firstMixRechargeMoney},#{recommendMoney},#{merchantCode},#{merchantName},#{storeId},#{storeName},#{createDt}		)
+				</foreach>
+    	</insert>
+
+		<select id="queryActivityRecommend" parameterType="cn.pluss.platform.entity.ActivityRecommend" resultType="cn.pluss.platform.entity.ActivityRecommend">
+			SELECT * from tb_pluss_activity_recommend 
+				<where> 
+					<if test="id!= null"> 
+					 	and id = #{id}
+					 </if> 
+					<if test="userId!= null"> 
+					 	and userId = #{userId}
+					 </if> 
+					<if test="name!= null"> 
+					 	and name = #{name}
+					 </if> 
+					<if test="firstMixRechargeMoney!= null"> 
+					 	and firstMixRechargeMoney = #{firstMixRechargeMoney}
+					 </if> 
+					<if test="recommendMoney!= null"> 
+					 	and recommendMoney = #{recommendMoney}
+					 </if> 
+					<if test="merchantCode!= null"> 
+					 	and merchantCode = #{merchantCode}
+					 </if> 
+					<if test="merchantName!= null"> 
+					 	and merchantName = #{merchantName}
+					 </if> 
+					<if test="storeId!= null"> 
+					 	and storeId = #{storeId}
+					 </if> 
+					<if test="storeName!= null"> 
+					 	and storeName = #{storeName}
+					 </if> 
+					<if test="createDt!= null"> 
+					 	and createDt = #{createDt}
+					 </if> 
+				 </where> 
+		</select>
+
+		<select id="queryActivityRecommendList" parameterType="cn.pluss.platform.entity.ActivityRecommend" resultType="cn.pluss.platform.entity.ActivityRecommend">
+			SELECT * from tb_pluss_activity_recommend 
+				<where> 
+					<if test="id!= null"> 
+					 and 	id = #{id}
+					 </if> 
+					<if test="userId!= null"> 
+					 and 	userId = #{userId}
+					 </if> 
+					<if test="name!= null"> 
+					 and 	name = #{name}
+					 </if> 
+					<if test="firstMixRechargeMoney!= null"> 
+					 and 	firstMixRechargeMoney = #{firstMixRechargeMoney}
+					 </if> 
+					<if test="recommendMoney!= null"> 
+					 and 	recommendMoney = #{recommendMoney}
+					 </if> 
+					<if test="merchantCode!= null"> 
+					 and 	merchantCode = #{merchantCode}
+					 </if> 
+					<if test="merchantName!= null"> 
+					 and 	merchantName = #{merchantName}
+					 </if> 
+					<if test="storeId!= null"> 
+					 and 	storeId = #{storeId}
+					 </if> 
+					<if test="storeName!= null"> 
+					 and 	storeName = #{storeName}
+					 </if> 
+					<if test="createDt!= null"> 
+					 and 	createDt = #{createDt}
+					 </if> 
+				 </where> 
+		</select>
+
+		<update id="updateActivityRecommend" parameterType="cn.pluss.platform.entity.ActivityRecommend" >
+			update tb_pluss_activity_recommend 
+				  <set> 
+					<if test="userId!= null"> 
+					 	userId = #{userId},
+					 </if> 
+					<if test="name!= null"> 
+					 	name = #{name},
+					 </if> 
+					<if test="firstMixRechargeMoney!= null"> 
+					 	firstMixRechargeMoney = #{firstMixRechargeMoney},
+					 </if> 
+					<if test="recommendMoney!= null"> 
+					 	recommendMoney = #{recommendMoney},
+					 </if> 
+					<if test="merchantCode!= null"> 
+					 	merchantCode = #{merchantCode},
+					 </if> 
+					<if test="merchantName!= null"> 
+					 	merchantName = #{merchantName},
+					 </if> 
+					<if test="storeId!= null"> 
+					 	storeId = #{storeId},
+					 </if> 
+					<if test="storeName!= null"> 
+					 	storeName = #{storeName},
+					 </if> 
+					<if test="createDt!= null"> 
+					 	createDt = #{createDt}
+					 </if> 
+				</set>
+			where id=#{id} 
+		</update>
+
+		<delete id="deleteActivityRecommend" parameterType="cn.pluss.platform.entity.ActivityRecommend" >
+			DELETE FROM tb_pluss_activity_recommend where id=#{id}
+		</delete>
+
+		<select id="queryActivityRecommendPage" parameterType="java.util.Map" resultType="cn.pluss.platform.entity.ActivityRecommend">
+			SELECT * from tb_pluss_activity_recommend 
+				<where> 
+					<if test="id!= null"> 
+					and id = #{id}
+					 </if> 
+					<if test="userId!= null"> 
+					and userId = #{userId}
+					 </if> 
+					<if test="name!= null"> 
+					and name like CONCAT("%",#{name},"%")
+					 </if> 
+					<if test="firstMixRechargeMoney!= null"> 
+					and firstMixRechargeMoney = #{firstMixRechargeMoney}
+					 </if> 
+					<if test="recommendMoney!= null"> 
+					and recommendMoney = #{recommendMoney}
+					 </if> 
+					<if test="merchantCode!= null"> 
+					and merchantCode = #{merchantCode}
+					 </if> 
+					<if test="merchantName!= null"> 
+					and merchantName = #{merchantName}
+					 </if> 
+					<if test="storeId!= null"> 
+					and storeId = #{storeId}
+					 </if> 
+					<if test="storeName!= null"> 
+					and storeName = #{storeName}
+					 </if> 
+					<if test="createDt!= null"> 
+					and createDt = #{createDt}
+					 </if> 
+				 </where> 
+			order by id desc  limit #{pageSize}  offset  #{offset}  
+		</select>
+
+		<select id="queryActivityRecommendPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+			SELECT count(*) from tb_pluss_activity_recommend 
+					<where> 
+					<if test="id!= null"> 
+					 and id = #{id}
+					 </if> 
+					<if test="userId!= null"> 
+					 and userId = #{userId}
+					 </if> 
+					<if test="name!= null"> 
+					 and name like CONCAT("%",#{name},"%")
+					 </if> 
+					<if test="firstMixRechargeMoney!= null"> 
+					 and firstMixRechargeMoney = #{firstMixRechargeMoney}
+					 </if> 
+					<if test="recommendMoney!= null"> 
+					 and recommendMoney = #{recommendMoney}
+					 </if> 
+					<if test="merchantCode!= null"> 
+					 and merchantCode = #{merchantCode}
+					 </if> 
+					<if test="merchantName!= null"> 
+					 and merchantName = #{merchantName}
+					 </if> 
+					<if test="storeId!= null"> 
+					 and storeId = #{storeId}
+					 </if> 
+					<if test="storeName!= null"> 
+					 and storeName = #{storeName}
+					 </if> 
+					<if test="createDt!= null"> 
+					 and createDt = #{createDt}
+					 </if> 
+				</where>
+		</select>
+
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/AgentInfoMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/AgentInfoMapper.xml
new file mode 100644
index 0000000..7084d70
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/AgentInfoMapper.xml
@@ -0,0 +1,403 @@
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.AgentInfoMapper">
+
+    <resultMap id="AgentInfo"  type="cn.pluss.platform.vo.AgentInfo" autoMapping="true">
+
+    </resultMap>
+
+    <select id="selectPage" resultMap="AgentInfo, cn.pluss.platform.mapper.CommonMapper.count">
+        SELECT SQL_CALC_FOUND_ROWS
+            ua.userId,
+            ui.loginName,
+            mr.rate,
+            ui.phone,
+            ui.STATUS,
+            ua.userName,
+            ui.createTime,
+            ui.updateTime,
+            ua.isFixedRate, ua.autoAudit, ua.payEcdemicSwitch, ua.isMarket, ua.isUnionPay,
+            sumPrice,
+            cashAmt,
+            t4.beforeMonthPrice,
+            t4.nowMonthPrice
+        FROM
+            tb_pluss_user_app ua
+        LEFT JOIN tb_pluss_user_info ui ON ua.userId = ui.id
+        LEFT JOIN tb_pluss_merchant_rate mr ON ua.userId = mr.userId
+        LEFT JOIN (
+            SELECT
+                SUM( mp.price ) sumPrice, mp.userId
+            FROM
+                tb_pluss_merchant_profit mp
+            GROUP BY mp.userId
+        ) t2 ON ua.userId = t2.userId
+        LEFT JOIN (
+            SELECT SUM(pc.cashAmt) cashAmt, pc.userId
+            FROM tb_pluss_cash pc WHERE pc.`status` = '1'
+            GROUP BY pc.userId
+        ) t3 ON ua.userId = t3.userId
+        LEFT JOIN (
+            SELECT
+                t.userId
+                , SUM(IF(recordMonth = DATE_FORMAT(DATE_ADD(CURRENT_DATE, INTERVAL -1 MONTH), "%Y-%m"), monthPrice, 0)) beforeMonthPrice
+                , SUM(IF(recordMonth = DATE_FORMAT(CURRENT_DATE, "%Y-%m"), monthPrice, 0)) nowMonthPrice
+            FROM (
+                SELECT
+                    ua.userId,
+                    mp.recordMonth,
+                    IFNULL( SUM( mp.price ), 0 ) monthPrice
+                FROM
+                    tb_pluss_user_app ua
+                LEFT JOIN tb_pluss_merchant_profit mp ON ua.userId = mp.userId
+                AND mp.recordMonth IN ( DATE_FORMAT(DATE_ADD(CURRENT_DATE, INTERVAL -1 MONTH), "%Y-%m"), DATE_FORMAT(CURRENT_DATE, "%Y-%m") )
+                WHERE
+                    ua.userType = 'agent'
+                GROUP BY
+                    ua.userId,
+                    mp.recordMonth
+            ) t GROUP BY t.userId
+        ) t4 ON t4.userId = ua.userId
+        WHERE
+            ua.userType = 'agent'
+            AND ua.parentId IS NULL
+        <include refid="commonWhere"/>
+        ORDER BY
+        <foreach collection="page.orders" item="orderItem" separator=",">
+            ${orderItem.column}
+            <if test="orderItem.asc == false">
+                DESC
+            </if>
+        </foreach>
+        LIMIT ${page.getIntValue('size') * (page.current - 1)}, ${page.getIntValue('size')};
+        SELECT found_rows() as count;
+    </select>
+
+    <select id="selectPermissionPage" resultMap="AgentInfo, cn.pluss.platform.mapper.CommonMapper.count">
+        SELECT SQL_CALC_FOUND_ROWS
+        ua.userId,
+        ui.loginName,
+        mr.rate,
+        ui.phone,
+        ui.STATUS,
+        ua.userName,
+        ui.createTime,
+        ui.updateTime,
+        tpcr.remark,
+        ua.isFixedRate, ua.autoAudit, ua.payEcdemicSwitch, ua.isMarket, ua.isUnionPay
+        FROM
+        tb_pluss_user_app ua
+        LEFT JOIN tb_pluss_user_info ui ON ua.userId = ui.id
+        LEFT JOIN tb_pluss_merchant_rate mr ON ua.userId = mr.userId
+        LEFT JOIN tb_pluss_common_remark tpcr on mr.userId = tpcr.userId AND tpcr.code = 'USER'
+        <where>
+            ui.loginName NOT LIKE '%@%'
+            AND ua.userType IN ('promoter', 'agent')
+            <include refid="commonWhere"/>
+        </where>
+        ORDER BY
+        <foreach collection="page.orders" item="orderItem" separator=",">
+            ${orderItem.column}
+            <if test="orderItem.asc == false">
+                DESC
+            </if>
+        </foreach>
+        LIMIT ${page.getIntValue('size') * (page.current - 1)}, ${page.getIntValue('size')};
+        SELECT found_rows() as count;
+    </select>
+
+    <select id="selectPageCount" resultType="java.lang.Long">
+        SELECT
+        count(1)
+        FROM
+        tb_pluss_user_app ua
+        LEFT JOIN tb_pluss_user_info ui ON ua.userId = ui.id
+        LEFT JOIN tb_pluss_merchant_rate mr ON ua.userId = mr.userId
+        WHERE
+        ua.userType = 'agent'
+        AND ua.parentId IS NULL
+        <include refid="commonWhere"/>
+        ORDER BY ui.createTime desc
+    </select>
+
+    <select id="selectOne" resultType="cn.pluss.platform.vo.AgentInfo">
+        SELECT ua.userId, ui.loginName, mr.rate, ui.phone, ui.status, ua.userName, ui.createTime,
+        ui.updateTime,ua.isFixedRate, t3.cashAmt
+        FROM tb_pluss_user_app ua
+        LEFT JOIN tb_pluss_user_info ui ON ua.userId = ui.id
+        LEFT JOIN tb_pluss_merchant_rate mr ON ua.userId=mr.userId
+        LEFT JOIN tb_pluss_cash pc ON ua.userId = pc.userId
+        LEFT JOIN (
+            SELECT SUM(pc.cashAmt) cashAmt, pc.userId
+            FROM tb_pluss_cash pc
+            GROUP BY pc.userId
+        ) t3 ON ua.userId = t3.userId
+        WHERE ua.userType = 'agent'
+        <include refid="commonWhere"/>
+        LIMIT 1
+    </select>
+
+    <select id="selectRecentMonthPrice" resultType="cn.pluss.platform.vo.AgentInfo">
+        SELECT
+            t.userId, t.userName
+             , SUM(IF(recordMonth = DATE_FORMAT(DATE_ADD(CURRENT_DATE, INTERVAL -1 MONTH), "%Y-%m"), monthPrice, 0)) beforeMonthPrice
+             , SUM(IF(recordMonth = DATE_FORMAT(CURRENT_DATE, "%Y-%m"), monthPrice, 0)) nowMonthPrice
+        FROM (
+                 SELECT
+                     ua.userId,
+                     ua.userName,
+                     mp.recordMonth,
+                     IFNULL( SUM( mp.price ), 0 ) monthPrice
+                 FROM
+                     tb_pluss_user_app ua
+                         LEFT JOIN tb_pluss_merchant_profit mp ON ua.userId = mp.userId
+                         AND mp.recordMonth IN ( DATE_FORMAT(DATE_ADD(CURRENT_DATE, INTERVAL -1 MONTH), "%Y-%m"), DATE_FORMAT(CURRENT_DATE, "%Y-%m") )
+                 WHERE
+                     ua.userType = 'agent'
+                 GROUP BY
+                     ua.userId,
+                     ua.userName,
+                     mp.recordMonth
+             ) t GROUP BY t.monthPrice, t.userId, t.userName;
+    </select>
+
+    <select id="selectSubAgentPage" resultMap="AgentInfo, cn.pluss.platform.mapper.CommonMapper.count">
+        SELECT SQL_CALC_FOUND_ROWS
+        ua.userId,
+        ua.parentId,
+        ui.loginName,
+        mr.rate,
+        ui.phone,
+        ui.STATUS,
+        ua.userName,
+        ui.createTime,
+        ui.updateTime,
+        ua.isFixedRate, ua.autoAudit, ua.payEcdemicSwitch, ua.isMarket, ua.isUnionPay,
+        sumPrice,
+        cashAmt,
+        t4.beforeMonthPrice,
+        t4.nowMonthPrice
+        FROM
+        tb_pluss_user_app ua
+        LEFT JOIN tb_pluss_user_info ui ON ua.userId = ui.id
+        LEFT JOIN tb_pluss_merchant_rate mr ON ua.userId = mr.userId
+        LEFT JOIN (
+        SELECT
+        SUM( mp.price ) sumPrice, mp.userId
+        FROM
+        tb_pluss_merchant_profit mp
+        GROUP BY mp.userId
+        ) t2 ON ua.userId = t2.userId
+        LEFT JOIN (
+            SELECT SUM(pc.cashAmt) cashAmt, pc.userId
+            FROM tb_pluss_cash pc
+            WHERE pc.`status` = '1'
+            GROUP BY pc.userId
+        ) t3 ON ua.userId = t3.userId
+        LEFT JOIN (
+        SELECT
+        t.userId
+        , SUM(IF(recordMonth = DATE_FORMAT(DATE_ADD(CURRENT_DATE, INTERVAL -1 MONTH), "%Y-%m"), monthPrice, 0)) beforeMonthPrice
+        , SUM(IF(recordMonth = DATE_FORMAT(CURRENT_DATE, "%Y-%m"), monthPrice, 0)) nowMonthPrice
+        FROM (
+        SELECT
+        ua.userId,
+        mp.recordMonth,
+        IFNULL( SUM( mp.price ), 0 ) monthPrice
+        FROM
+        tb_pluss_user_app ua
+        LEFT JOIN tb_pluss_merchant_profit mp ON ua.userId = mp.userId
+        AND mp.recordMonth IN ( DATE_FORMAT(DATE_ADD(CURRENT_DATE, INTERVAL -1 MONTH), "%Y-%m"), DATE_FORMAT(CURRENT_DATE, "%Y-%m") )
+        WHERE
+        ua.userType = 'agent'
+        GROUP BY
+        ua.userId,
+        mp.recordMonth
+        ) t GROUP BY t.userId
+        ) t4 ON t4.userId = ua.userId
+        WHERE
+        ua.userType = 'agent'
+        AND ua.parentId IS NOT NULL
+        <include refid="commonWhere"/>
+        ORDER BY
+        <foreach collection="page.orders" item="orderItem" separator=",">
+            ${orderItem.column}
+            <if test="orderItem.asc == false">
+                DESC
+            </if>
+        </foreach>
+        LIMIT ${page.getIntValue('size') * (page.current - 1)}, ${page.getIntValue('size')};
+        SELECT found_rows() as count;
+    </select>
+
+<!--    <select id="selectSubAgentPage" resultType="cn.pluss.platform.vo.AgentInfo">-->
+<!--        SELECT-->
+<!--        ua.userId,-->
+<!--        ua.parentId,-->
+<!--        ui.loginName,-->
+<!--        mr.rate,-->
+<!--        ui.phone,-->
+<!--        ui.STATUS,-->
+<!--        ua.userName,-->
+<!--        ui.createTime,-->
+<!--        ui.updateTime,-->
+<!--        ua.isFixedRate, ua.autoAudit, ua.payEcdemicSwitch, ua.isMarket, ua.isUnionPay,-->
+<!--        t2.sumPrice,-->
+<!--        t3.cashAmt-->
+<!--        FROM-->
+<!--        tb_pluss_user_app ua-->
+<!--        LEFT JOIN tb_pluss_user_info ui ON ua.userId = ui.id-->
+<!--        LEFT JOIN tb_pluss_merchant_rate mr ON ua.userId = mr.userId-->
+<!--        LEFT JOIN (-->
+<!--            SELECT-->
+<!--                SUM( mp.price ) sumPrice, mp.userId-->
+<!--            FROM-->
+<!--                tb_pluss_merchant_profit mp-->
+<!--            GROUP BY mp.userId-->
+<!--        ) t2 ON ua.userId = t2.userId-->
+<!--        LEFT JOIN (-->
+<!--            SELECT SUM(pc.cashAmt) cashAmt, pc.userId-->
+<!--            FROM tb_pluss_cash pc-->
+<!--            GROUP BY pc.userId-->
+<!--        ) t3 ON ua.userId = t3.userId-->
+<!--        WHERE-->
+<!--        ua.userType = 'agent'-->
+<!--        AND ua.parentId IS NOT NULL-->
+<!--        <include refid="commonWhere"/>-->
+<!--        <if test="agentInfo.parentId != null and agentInfo.parentId != ''">-->
+<!--            and ua.parentId = #{agentInfo.parentId}-->
+<!--        </if>-->
+<!--        ORDER BY-->
+<!--        ui.createTime-->
+<!--    </select>-->
+
+    <select id="selectSubAgentPageCount" resultType="java.lang.Long">
+        SELECT
+            ua.userId,
+            ua.parentId,
+            ui.loginName,
+            mr.rate,
+            ui.phone,
+            ui.STATUS,
+            ua.userName,
+            ui.createTime,
+            ui.updateTime,
+            ua.isFixedRate,
+            t2.sumPrice,
+            t3.cashAmt
+        FROM
+        tb_pluss_user_app ua
+        LEFT JOIN tb_pluss_user_info ui ON ua.userId = ui.id
+        LEFT JOIN tb_pluss_merchant_rate mr ON ua.userId = mr.userId
+        WHERE
+        ua.userType = 'agent'
+        AND ua.parentId IS NOT NULL
+        <include refid="commonWhere"/>
+        <if test="agentInfo.parentId != null and agentInfo.parentId != ''">
+            and ua.parentId = #{agentInfo.parentId}
+        </if>
+        ORDER BY
+        ui.createTime
+    </select>
+
+    <select id="selectStaffPage" resultType="cn.pluss.platform.vo.AgentStaffVO">
+        SELECT loginName, userId, parentId, userName, createTime, phone, agentName, agentPhone FROM (
+            SELECT
+                ui.loginName, ua.userId, ua.parentId, ua.userName, ua.createDt createTime, ui.phone
+                , ua1.userName agentName, ui1.phone agentPhone
+            FROM tb_pluss_user_app ua
+            LEFT JOIN tb_pluss_user_info ui ON ua.userId = ui.id
+            LEFT JOIN tb_pluss_user_app ua1 ON ua.parentId = ua1.userId
+            LEFT JOIN tb_pluss_user_info ui1 ON ui1.id = ua1.userId
+             WHERE ua.userType = 'agent_staff'
+        ) t
+        <where>
+            <if test="agentStaffVO.userId != null and agentStaffVO.userId != ''">
+                t.userId = #{agentStaffVO.userId}
+            </if>
+            <if test="agentStaffVO.loginName != null and agentStaffVO.loginName != ''">
+                t.loginName = #{agentStaffVO.loginName}
+            </if>
+            <if test="agentStaffVO.userName != null and agentStaffVO.userName != ''">
+                t.userName LIKE CONCAT('%', #{agentStaffVO.userName},'%')
+            </if>
+            <if test="agentStaffVO.phone != null and agentStaffVO.phone != ''">
+                t.phone LIKE CONCAT('%',#{agentStaffVO.phone},'%')
+            </if>
+            <if test="agentStaffVO.parentId != null and agentStaffVO.parentId != ''">
+                t.parentId =#{agentStaffVO.parentId}
+            </if>
+            <if test="agentStaffVO.agentName != null and agentStaffVO.agentName != ''">
+                t.agentName LIKE CONCAT('%', #{agentStaffVO.agentName},'%')
+            </if>
+            <if test="agentStaffVO.agentPhone != null and agentStaffVO.agentPhone != ''">
+                t.agentPhone LIKE CONCAT('%',#{agentStaffVO.agentPhone},'%')
+            </if>
+        </where>
+    </select>
+
+
+    <sql id="commonWhere">
+        <if test="agentInfo.userId != null and agentInfo.userId != ''">
+            AND ua.userId = #{agentInfo.userId}
+        </if>
+        <if test="agentInfo.loginName != null and agentInfo.loginName != ''">
+            AND ui.loginName LIKE CONCAT("%", #{agentInfo.loginName}, "%")
+        </if>
+        <if test="agentInfo.phone != null and agentInfo.phone != ''">
+            AND ui.phone LIKE CONCAT("%", #{agentInfo.phone}, "%")
+        </if>
+        <if test="agentInfo.userName != null and agentInfo.userName != ''">
+            AND ua.userName LIKE #{agentInfo.userName}
+        </if>
+        <if test="agentInfo.isFixedRate == '1'.toString() ">
+            AND ua.isFixedRate = '1'
+        </if>
+        <if test="agentInfo.isFixedRate == '0'.toString() ">
+            AND (ua.isFixedRate is null or ua.isFixedRate = '0')
+        </if>
+        <if test="agentInfo.rate != null and agentInfo.rate != ''">
+            AND mr.rate LIKE #{agentInfo.rate}
+        </if>
+        <if test="agentInfo.autoAudit != null and agentInfo.autoAudit != ''">
+            <choose>
+                <when test="agentInfo.autoAudit == '1'.toString()">
+                    AND ua.autoAudit = '1'
+                </when>
+                <otherwise>
+                    AND (ua.autoAudit = '0' OR ua.autoAudit IS NULL)
+                </otherwise>
+            </choose>
+        </if>
+        <if test="agentInfo.payEcdemicSwitch != null and agentInfo.payEcdemicSwitch != ''">
+            <choose>
+                <when test="agentInfo.payEcdemicSwitch == '1'.toString()">
+                    AND ua.payEcdemicSwitch = '1'
+                </when>
+                <otherwise>
+                    AND ua.payEcdemicSwitch = '0'
+                </otherwise>
+            </choose>
+        </if>
+        <if test="agentInfo.isMarket != null and agentInfo.isMarket != ''">
+            <choose>
+                <when test="agentInfo.isMarket == '1'.toString()">
+                    AND ua.isMarket = '1'
+                </when>
+                <otherwise>
+                    AND (ua.isMarket = '0' OR ua.isMarket IS NULL)
+                </otherwise>
+            </choose>
+        </if>
+        <if test="agentInfo.isUnionPay != null and agentInfo.isUnionPay != ''">
+            <choose>
+                <when test="agentInfo.isUnionPay == '1'.toString()">
+                    AND ua.isUnionPay = '1'
+                </when>
+                <otherwise>
+                    AND (ua.isUnionPay = '0' OR ua.isUnionPay IS NULL)
+                </otherwise>
+            </choose>
+        </if>
+    </sql>
+</mapper>
\ No newline at end of file
diff --git a/pluss-dao-bundle/src/main/resources/mapper/AgentMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/AgentMapper.xml
new file mode 100644
index 0000000..eba7aa1
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/AgentMapper.xml
@@ -0,0 +1,73 @@
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.AgentMapper">
+
+    <select id="selectPage" resultType="cn.pluss.platform.vo.AgentInfo">
+        SELECT
+            ua.userId,
+            ui.loginName,
+            mr.rate,
+            ui.phone,
+            ui.STATUS,
+            ua.userName,
+            ui.createTime,
+            ui.updateTime
+        FROM
+            tb_pluss_user_app ua
+        LEFT JOIN tb_pluss_user_info ui ON ua.userId = ui.id
+        LEFT JOIN tb_pluss_merchant_rate mr ON ua.userId = mr.userId
+        WHERE
+            ua.userType = 'agent'
+        <include refid="commonWhere"/>
+        ORDER BY
+            ui.createTime
+    </select>
+
+    <select id="selectOne" resultType="cn.pluss.platform.vo.AgentInfo">
+        SELECT ua.userId, ui.loginName, mr.rate, ui.phone, ui.status, ua.userName, ui.createTime,
+        ui.updateTime,pc.cashAmt
+        FROM tb_pluss_user_app ua
+        LEFT JOIN tb_pluss_user_info ui
+        ON ua.userId = ui.id
+        LEFT JOIN tb_pluss_merchant_rate mr
+        ON ua.userId=mr.userId
+        LEFT JOIN tb_pluss_cash pc
+        ON ua.userId = pc.userId
+        WHERE ua.userType = 'agent'
+        <include refid="commonWhere"/>
+        LIMIT 1
+    </select>
+
+    <sql id="commonWhere">
+        <if test="agentInfo.userId != null and agentInfo.userId != ''">
+            AND ua.userId = #{agentInfo.userId}
+        </if>
+        <if test="agentInfo.loginName != null and agentInfo.loginName != ''">
+            AND ui.loginName LIKE CONCAT("%", #{agentInfo.loginName}, "%")
+        </if>
+        <if test="agentInfo.parentId != null">
+            AND ua.parentId = #{agentInfo.parentId}
+        </if>
+        <if test="agentInfo.phone != null and agentInfo.phone != ''">
+            AND ui.phone LIKE CONCAT("%", #{agentInfo.phone}, "%")
+        </if>
+        <if test="agentInfo.userName != null and agentInfo.userName != ''">
+            AND ua.userName LIKE #{agentInfo.userName}
+        </if>
+        <if test="agentInfo.createTimeStart != null">
+            AND ui.createTime &gt; #{agentInfo.createTimeStart}
+        </if>
+        <if test="agentInfo.createTimeEnd != null">
+            AND ui.createTime &lt;= #{agentInfo.createTimeEnd}
+        </if>
+        <if test="agentInfo.updateTimeStart != null">
+            AND ui.updateTime &gt; #{agentInfo.updateTimeStart}
+        </if>
+        <if test="agentInfo.updateTimeEnd != null">
+            AND ui.updateTime &lt;= #{agentInfo.updateTimeEnd}
+        </if>
+        <if test="agentInfo.rate != null and agentInfo.rate != ''">
+            AND mr.rate = #{agentInfo.rate}
+        </if>
+    </sql>
+</mapper>
\ No newline at end of file
diff --git a/pluss-dao-bundle/src/main/resources/mapper/Agreement-sqlmap.xml b/pluss-dao-bundle/src/main/resources/mapper/Agreement-sqlmap.xml
new file mode 100644
index 0000000..5cf4844
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/Agreement-sqlmap.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+			"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="cn.pluss.platform.mapper.AgreementMapper">
+
+	   	<insert id="saveAgreement" parameterType="cn.pluss.platform.entity.Agreement">
+        	insert into tb_pluss_agreement(name,content,createDt,createor,discern)VALUES(#{name},#{content},now(),#{createor},#{discern})
+    	</insert>
+
+	   	<insert id="saveAgreementBatch">
+        	insert into tb_pluss_agreement(name,content,createDt,createor,discern) VALUES 
+    			<foreach collection="list" item="item" index="index" separator=",">
+			(#{name},#{content},now(),#{createor},#{discern}		)
+				</foreach>
+    	</insert>
+
+		<select id="queryAgreement" parameterType="cn.pluss.platform.entity.Agreement" resultType="cn.pluss.platform.entity.Agreement">
+			SELECT * from tb_pluss_agreement 
+				<where> 
+					<if test="id!= null"> 
+					 	and id = #{id}
+					 </if> 
+					<if test="name!= null"> 
+					 	and name = #{name}
+					 </if> 
+					<if test="content!= null"> 
+					 	and content = #{content}
+					 </if> 
+					<if test="createDt!= null"> 
+					 	and createDt = #{createDt}
+					 </if> 
+					<if test="createor!= null"> 
+					 	and createor = #{createor}
+					 </if> 
+					<if test="discern!= null"> 
+					 	and discern = #{discern}
+					 </if> 
+				 </where> 
+		</select>
+
+		<select id="queryAgreementList" parameterType="cn.pluss.platform.entity.Agreement" resultType="cn.pluss.platform.entity.Agreement">
+			SELECT * from tb_pluss_agreement 
+				<where> 
+					<if test="id!= null"> 
+					 and 	id = #{id}
+					 </if> 
+					<if test="name!= null"> 
+					 and 	name = #{name}
+					 </if> 
+					<if test="content!= null"> 
+					 and 	content = #{content}
+					 </if> 
+					<if test="createDt!= null"> 
+					 and 	createDt = #{createDt}
+					 </if> 
+					<if test="createor!= null"> 
+					 and 	createor = #{createor}
+					 </if> 
+					 <if test="discern!= null"> 
+                        and discern = #{discern}
+                     </if> 
+				 </where> 
+		</select>
+
+		<update id="updateAgreement" parameterType="cn.pluss.platform.entity.Agreement" >
+			update tb_pluss_agreement 
+				  <set> 
+					<if test="name!= null"> 
+					 	name = #{name},
+					 </if> 
+					<if test="content!= null"> 
+					 	content = #{content},
+					 </if> 
+					<if test="createDt!= null"> 
+					 	createDt = #{createDt},
+					 </if> 
+					<if test="createor!= null"> 
+					 	createor = #{createor},
+					 </if> 
+					 <if test="discern!= null"> 
+                         discern = #{discern}
+                     </if> 
+				</set>
+			where id=#{id} 
+		</update>
+
+		<delete id="deleteAgreement" parameterType="cn.pluss.platform.entity.Agreement" >
+			DELETE FROM tb_pluss_agreement where id=#{id}
+		</delete>
+
+		<select id="queryAgreementPage" parameterType="java.util.Map" resultType="cn.pluss.platform.entity.Agreement">
+			SELECT * from tb_pluss_agreement 
+				<where> 
+					<if test="id!= null"> 
+					and id = #{id}
+					 </if> 
+					<if test="name!= null"> 
+					and name like CONCAT("%",#{name},"%")
+					 </if> 
+					<if test="content!= null"> 
+					and content = #{content}
+					 </if> 
+					<if test="createDt!= null"> 
+					and createDt = #{createDt}
+					 </if> 
+					<if test="createor!= null"> 
+					and createor = #{createor}
+					 </if> 
+					 <if test="discern!= null"> 
+                        and discern = #{discern}
+                     </if> 
+				 </where> 
+			order by id desc  limit #{pageSize}  offset  #{offset}  
+		</select>
+
+		<select id="queryAgreementPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+			SELECT count(*) from tb_pluss_agreement 
+					<where> 
+					<if test="id!= null"> 
+					 and id = #{id}
+					 </if> 
+					<if test="name!= null"> 
+					 and name like CONCAT("%",#{name},"%") 
+					 </if> 
+					<if test="content!= null"> 
+					 and content = #{content}
+					 </if> 
+					<if test="createDt!= null"> 
+					 and createDt = #{createDt}
+					 </if> 
+					<if test="createor!= null"> 
+					 and createor = #{createor}
+					 </if> 
+					 <if test="discern!= null"> 
+                        and discern = #{discern}
+                     </if> 
+				</where>
+		</select>
+
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/AliMcc-sqlmap.xml b/pluss-dao-bundle/src/main/resources/mapper/AliMcc-sqlmap.xml
new file mode 100644
index 0000000..0f33818
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/AliMcc-sqlmap.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+			"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="cn.pluss.platform.mapper.AliMccMapper">
+
+	   	<insert id="saveAliMcc" parameterType="cn.pluss.platform.entity.AliMcc">
+        	insert into tb_pluss_ali_mcc(mccCode)VALUES(#{mccCode})
+    	</insert>
+
+	   	<insert id="saveAliMccBatch">
+        	insert into tb_pluss_ali_mcc(mccCode) VALUES 
+    			<foreach collection="list" item="item" index="index" separator=",">
+			(#{mccCode}		)
+				</foreach>
+    	</insert>
+
+		<select id="queryAliMcc" parameterType="cn.pluss.platform.entity.AliMcc" resultType="cn.pluss.platform.entity.AliMcc">
+			SELECT * from tb_pluss_ali_mcc 
+				<where> 
+					<if test="id!= null"> 
+					 	and id = #{id}
+					 </if> 
+					<if test="mccCode!= null"> 
+					 	and mccCode = #{mccCode}
+					 </if> 
+				 </where> 
+		</select>
+
+		<select id="queryAliMccList" parameterType="cn.pluss.platform.entity.AliMcc" resultType="cn.pluss.platform.entity.AliMcc">
+			SELECT * from tb_pluss_ali_mcc 
+				<where> 
+					<if test="id!= null"> 
+					 and 	id = #{id}
+					 </if> 
+					<if test="mccCode!= null"> 
+					 and 	mccCode = #{mccCode}
+					 </if> 
+				 </where> 
+		</select>
+
+		<update id="updateAliMcc" parameterType="cn.pluss.platform.entity.AliMcc" >
+			update tb_pluss_ali_mcc 
+				  <set> 
+					<if test="mccCode!= null"> 
+					 	mccCode = #{mccCode}
+					 </if> 
+				</set>
+			where id=#{id} 
+		</update>
+
+		<delete id="deleteAliMcc" parameterType="cn.pluss.platform.entity.AliMcc" >
+			DELETE FROM tb_pluss_ali_mcc where id=#{id}
+		</delete>
+
+		<select id="queryAliMccPage" parameterType="java.util.Map" resultType="cn.pluss.platform.entity.AliMcc">
+			SELECT * from tb_pluss_ali_mcc 
+				<where> 
+					<if test="id!= null"> 
+					and id = #{id}
+					 </if> 
+					<if test="mccCode!= null"> 
+					and mccCode = #{mccCode}
+					 </if> 
+				 </where> 
+			order by id desc  limit #{pageSize}  offset  #{offset}  
+		</select>
+
+		<select id="queryAliMccPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+			SELECT count(*) from tb_pluss_ali_mcc 
+					<where> 
+					<if test="id!= null"> 
+					 and id = #{id}
+					 </if> 
+					<if test="mccCode!= null"> 
+					 and mccCode = #{mccCode}
+					 </if> 
+				</where>
+		</select>
+		
+		<select id="queryMccCode" resultType="java.lang.String">
+              select mccCode from tb_pluss_ali_mcc where mccCode like CONCAT("%",#{mccCode})
+            </select>
+
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/AppGuideMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/AppGuideMapper.xml
new file mode 100644
index 0000000..5757ae8
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/AppGuideMapper.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.AppGuideMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.AppGuide">
+        <id column="id" property="id" />
+        <result column="code" property="code" />
+        <result column="name" property="name" />
+        <result column="content" property="content" />
+        <result column="createTime" property="createTime" />
+        <result column="updateTime" property="updateTime" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/AppMenuMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/AppMenuMapper.xml
new file mode 100644
index 0000000..1568cd3
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/AppMenuMapper.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.AppMenuMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.AppMenu">
+        <id column="id" property="id" />
+        <result column="menu_group" property="menuGroup" />
+        <result column="name" property="name" />
+        <result column="code" property="code" />
+        <result column="icon" property="icon" />
+        <result column="nav_code" property="navCode" />
+        <result column="nav_name" property="navName" />
+        <result column="url" property="url" />
+        <result column="sort" property="sort" />
+        <result column="visible" property="visible" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="isApplets" property="isApplets"/>
+        <result column="isUniapp" property="isUniapp"/>
+        <result column="userName" property="userName" />
+        <result column="path" property="path" />
+        <result column="isAndroidEnabled" property="isAndroidEnabled"/>
+        <result column="isIphoneEnabled" property="isIphoneEnabled"/>
+    </resultMap>
+
+    <select id="getByNavCodeAll" resultType="cn.pluss.platform.entity.AppMenu">
+        SELECT appMenu.id, appMenu.menu_group menuGroup, appMenu.name, appMenu.code, appMenu.icon,
+               appMenu.nav_code navCode, appMenu.nav_name navName, appMenu.url, appMenu.sort, appMenu.visible,
+               appMenu.create_time createTime, appMenu.update_time updateTime, dict.name menuGroupDesc,
+               appMenu.isApplets, appMenu.userName,appMenu.path, appMenu.isUniapp
+        FROM tb_pluss_app_menu appMenu
+                 LEFT JOIN tb_pluss_dict dict ON appMenu.menu_group = dict.id
+                 LEFT JOIN tb_pluss_app_menu_user_type amut ON amut.`name` = appMenu.`name`
+        WHERE  appMenu.nav_code = #{navCode} AND amut.dictValue = #{userType}
+        ORDER BY dict.sort, appMenu.sort
+    </select>
+
+    <select id="getByNavCode" resultType="cn.pluss.platform.entity.AppMenu">
+        SELECT appMenu.id, appMenu.menu_group menuGroup, appMenu.name, appMenu.code, appMenu.icon,
+            appMenu.nav_code navCode, appMenu.nav_name navName, appMenu.url, appMenu.sort, appMenu.visible,
+            appMenu.create_time createTime, appMenu.update_time updateTime, dict.name menuGroupDesc,
+            appMenu.isApplets, appMenu.userName,appMenu.path, appMenu.isUniapp
+        FROM tb_pluss_app_menu appMenu
+        LEFT JOIN tb_pluss_dict dict ON appMenu.menu_group = dict.id
+        LEFT JOIN tb_pluss_app_menu_user_type amut ON amut.`name` = appMenu.`name`
+        WHERE appMenu.visible = 1 AND appMenu.nav_code = #{navCode} AND amut.dictValue = #{userType}
+        <if test="_parameter.containsKey('clientType')">
+            <choose>
+                <when test="clientType == 1">
+                    and appMenu.isAndroidEnabled = '1'
+                </when>
+                <otherwise>
+                    and appMenu.isIphoneEnabled = '1'
+                </otherwise>
+            </choose>
+        </if>
+        ORDER BY dict.sort, appMenu.sort
+    </select>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/AppVersionInfoMapper-sqlmap.xml b/pluss-dao-bundle/src/main/resources/mapper/AppVersionInfoMapper-sqlmap.xml
new file mode 100644
index 0000000..522774d
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/AppVersionInfoMapper-sqlmap.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.AppVersionInfoMapper">
+    <select id="pageData" resultType="cn.pluss.platform.entity.AppVersionInfo">
+        select id,platformCode,platformName,versionCode,versionName,url,updateInfo,forceUpdate,createTime,updateTime
+        from tb_pluss_app_version_info
+        order by case
+                 when platformCode=1 then 0 else 1
+		         END,createTime desc
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/pluss-dao-bundle/src/main/resources/mapper/AppletInfoMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/AppletInfoMapper.xml
new file mode 100644
index 0000000..3488042
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/AppletInfoMapper.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.AppletInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.AppletInfo">
+        <id column="id" property="id" />
+        <result column="appid" property="appid" />
+        <result column="secret" property="secret" />
+        <result column="remark" property="remark" />
+        <result column="createTime" property="createTime" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/Area-sqlmap.xml b/pluss-dao-bundle/src/main/resources/mapper/Area-sqlmap.xml
new file mode 100644
index 0000000..b220a0f
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/Area-sqlmap.xml
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+			"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="cn.pluss.platform.mapper.AreaMapper">
+
+        <resultMap type="cn.pluss.platform.leshua.LeshuaArea" id="area">
+              <result property="code" column="f_area_no" ></result>
+              <result property="name" column="f_area_name" jdbcType="VARCHAR"></result>
+        </resultMap>
+
+	   	<insert id="saveArea" parameterType="cn.pluss.platform.entity.Area">
+        	insert into tb_pluss_area(f_area_no,f_area_name,f_aliasa,f_area_cups_no,f_city_no,f_x,f_y)VALUES(#{f_area_no},#{f_area_name},#{f_aliasa},#{f_area_cups_no},#{f_city_no},#{f_x},#{f_y})
+    	</insert>
+
+	   	<insert id="saveAreaBatch">
+        	insert into tb_pluss_area(f_area_no,f_area_name,f_aliasa,f_area_cups_no,f_city_no,f_x,f_y) VALUES 
+    			<foreach collection="list" item="item" index="index" separator=",">
+			(#{f_area_no},#{f_area_name},#{f_aliasa},#{f_area_cups_no},#{f_city_no},#{f_x},#{f_y}		)
+				</foreach>
+    	</insert>
+
+		<select id="queryArea" parameterType="cn.pluss.platform.entity.Area" resultMap="area">
+			SELECT * from tb_pluss_area 
+				<where> 
+					<if test="f_area_no!= null"> 
+					 	and f_area_no = #{f_area_no}
+					 </if> 
+					<if test="f_area_name!= null"> 
+					 	and f_area_name = #{f_area_name}
+					 </if> 
+					<if test="f_aliasa!= null"> 
+					 	and f_aliasa = #{f_aliasa}
+					 </if> 
+					<if test="f_area_cups_no!= null"> 
+					 	and f_area_cups_no = #{f_area_cups_no}
+					 </if> 
+					<if test="f_city_no!= null"> 
+					 	and f_city_no = #{f_city_no}
+					 </if> 
+					<if test="f_x!= null"> 
+					 	and f_x = #{f_x}
+					 </if> 
+					<if test="f_y!= null"> 
+					 	and f_y = #{f_y}
+					 </if> 
+				 </where> 
+		</select>
+
+		<select id="queryAreaList" parameterType="cn.pluss.platform.entity.Area" resultMap="area">
+			SELECT * from tb_pluss_area 
+				<where> 
+					<if test="f_area_no!= null"> 
+					 and 	f_area_no = #{f_area_no}
+					 </if> 
+					<if test="f_area_name!= null"> 
+					 and 	f_area_name = #{f_area_name}
+					 </if> 
+					<if test="f_aliasa!= null"> 
+					 and 	f_aliasa = #{f_aliasa}
+					 </if> 
+					<if test="f_area_cups_no!= null"> 
+					 and 	f_area_cups_no = #{f_area_cups_no}
+					 </if> 
+					<if test="f_city_no!= null"> 
+					 and 	f_city_no = #{f_city_no}
+					 </if> 
+					<if test="f_x!= null"> 
+					 and 	f_x = #{f_x}
+					 </if> 
+					<if test="f_y!= null"> 
+					 and 	f_y = #{f_y}
+					 </if> 
+				 </where> 
+		</select>
+
+		<update id="updateArea" parameterType="cn.pluss.platform.entity.Area" >
+			update tb_pluss_area 
+				  <set> 
+					<if test="f_area_no!= null"> 
+					 	f_area_no = #{f_area_no},
+					 </if> 
+					<if test="f_area_name!= null"> 
+					 	f_area_name = #{f_area_name},
+					 </if> 
+					<if test="f_aliasa!= null"> 
+					 	f_aliasa = #{f_aliasa},
+					 </if> 
+					<if test="f_area_cups_no!= null"> 
+					 	f_area_cups_no = #{f_area_cups_no},
+					 </if> 
+					<if test="f_city_no!= null"> 
+					 	f_city_no = #{f_city_no},
+					 </if> 
+					<if test="f_x!= null"> 
+					 	f_x = #{f_x},
+					 </if> 
+					<if test="f_y!= null"> 
+					 	f_y = #{f_y}
+					 </if> 
+				</set>
+			where id=#{id} 
+		</update>
+
+		<delete id="deleteArea" parameterType="cn.pluss.platform.entity.Area" >
+			DELETE FROM tb_pluss_area where id=#{id}
+		</delete>
+
+		<select id="queryAreaPage" parameterType="java.util.Map" resultMap="area">
+			SELECT * from tb_pluss_area 
+				<where> 
+					<if test="f_area_no!= null"> 
+					and f_area_no = #{f_area_no}
+					 </if> 
+					<if test="f_area_name!= null"> 
+					and f_area_name = #{f_area_name}
+					 </if> 
+					<if test="f_aliasa!= null"> 
+					and f_aliasa = #{f_aliasa}
+					 </if> 
+					<if test="f_area_cups_no!= null"> 
+					and f_area_cups_no = #{f_area_cups_no}
+					 </if> 
+					<if test="f_city_no!= null"> 
+					and f_city_no = #{f_city_no}
+					 </if> 
+					<if test="f_x!= null"> 
+					and f_x = #{f_x}
+					 </if> 
+					<if test="f_y!= null"> 
+					and f_y = #{f_y}
+					 </if> 
+				 </where> 
+			order by id desc  limit #{pageSize}  offset  #{offset}  
+		</select>
+
+		<select id="queryAreaPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+			SELECT count(*) from tb_pluss_area 
+					<where> 
+					<if test="f_area_no!= null"> 
+					 and f_area_no = #{f_area_no}
+					 </if> 
+					<if test="f_area_name!= null"> 
+					 and f_area_name = #{f_area_name}
+					 </if> 
+					<if test="f_aliasa!= null"> 
+					 and f_aliasa = #{f_aliasa}
+					 </if> 
+					<if test="f_area_cups_no!= null"> 
+					 and f_area_cups_no = #{f_area_cups_no}
+					 </if> 
+					<if test="f_city_no!= null"> 
+					 and f_city_no = #{f_city_no}
+					 </if> 
+					<if test="f_x!= null"> 
+					 and f_x = #{f_x}
+					 </if> 
+					<if test="f_y!= null"> 
+					 and f_y = #{f_y}
+					 </if> 
+				</where>
+		</select>
+
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/AreaCity-sqlmap.xml b/pluss-dao-bundle/src/main/resources/mapper/AreaCity-sqlmap.xml
new file mode 100644
index 0000000..d99052f
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/AreaCity-sqlmap.xml
@@ -0,0 +1,81 @@
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.AreaCityMapper">
+
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.AreaCity">
+        <id column="id" property="id" />
+        <result column="type" property="type" />
+        <result column="areaName" property="areaName" />
+        <result column="parentAreaCode" property="parentAreaCode" />
+        <result column="areaCode" property="areaCode" />
+        <collection property="areaCityList" column="areaCode" ofType="java.util.HashMap" select="queryCity"/>
+    </resultMap>
+
+    <resultMap id="cityMap" type="cn.pluss.platform.entity.AreaCity">
+        <id column="id" property="id" />
+        <result column="type" property="type" />
+        <result column="areaName" property="areaName" />
+        <result column="parentAreaCode" property="parentAreaCode" />
+        <result column="areaCode" property="areaCode" />
+        <collection property="areaCityList" column="areaCode" ofType="java.util.HashMap" select="queryCountry"/>
+    </resultMap>
+
+
+    <sql id="ref_column">
+        id,type,areaName,parentAreaCode,areaCode
+    </sql>
+    <!--查询所有省 -->
+    <select id="queryProvince" resultMap="BaseResultMap">
+        select  <include refid="ref_column" />  from tb_pluss_area_city where type = 1
+    </select>
+
+    <select id="queryOnlyProvince" resultType="cn.pluss.platform.entity.AreaCity">
+        select  <include refid="ref_column" />  from tb_pluss_area_city where type = 1
+    </select>
+
+    <!--查询所有市 -->
+    <select id="queryCity" resultMap="cityMap">
+        select <include refid="ref_column" /> from tb_pluss_area_city where parentAreaCode=#{areaCode}
+    </select>
+
+    <!--查询所有区 -->
+    <select id="queryCountry" resultType="cn.pluss.platform.entity.AreaCity">
+        select <include refid="ref_column" /> from tb_pluss_area_city  where parentAreaCode = #{areaCode}
+    </select>
+
+    <select id="getAreaCityByProvince" resultMap="BaseResultMap">
+        select  <include refid="ref_column" />  from tb_pluss_area_city where areaCode = #{areaCode}
+    </select>
+
+    <select id="getAreaCodeByName" parameterType="java.lang.String" resultType="java.util.Map">
+        SELECT a.areaCode AS provinceCode
+        <choose>
+            <when test="type == 1">
+                ,b.areaCode AS cityCode
+            </when>
+            <otherwise>
+                ,a.areaCode AS cityCode
+            </otherwise>
+        </choose>
+        <choose>
+            <when test="type == 1">
+                ,c.areaCode as areaCode
+            </when>
+            <otherwise>
+                ,b.areaCode AS areaCode
+            </otherwise>
+        </choose>
+        FROM tb_pluss_area_city a
+                 LEFT JOIN tb_pluss_area_city b  on a.areaCode = b.parentAreaCode
+                <if test="type == 1">
+                    LEFT JOIN tb_pluss_area_city c ON b.areaCode = c.parentAreaCode
+                </if>
+        WHERE a.areaName = #{provinceName}
+          and b.areaName = #{cityName}
+        <if test="type == 1">
+          AND c.areaName = #{areaName}
+        </if>
+    </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/pluss-dao-bundle/src/main/resources/mapper/BankCardMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/BankCardMapper.xml
new file mode 100644
index 0000000..d1ed1f7
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/BankCardMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.BankCardMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.BankCard">
+        <id column="id" property="id" />
+        <result column="userId" property="userId" />
+        <result column="bankCardNo" property="bankCardNo" />
+        <result column="bankName" property="bankName" />
+        <result column="branchName" property="branchName" />
+        <result column="accountType" property="accountType" />
+        <result column="contactLine" property="contactLine" />
+        <result column="branchProvince" property="branchProvince" />
+        <result column="branchCity" property="branchCity" />
+        <result column="branchArea" property="branchArea" />
+        <result column="phone" property="phone" />
+        <result column="createTime" property="createTime" />
+        <result column="updateTime" property="updateTime" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/BankCodeSxfMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/BankCodeSxfMapper.xml
new file mode 100644
index 0000000..30edefb
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/BankCodeSxfMapper.xml
@@ -0,0 +1,23 @@
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.BankCodeSxfMapper">
+
+    <select id="getBranchName" resultType="cn.pluss.platform.leshua.BankNameVO">
+        SELECT cnaps_code unionpayCode , cnaps_name branchName
+        FROM tb_pluss_bank_code_sxf
+        <where>
+            <if test="bankName != null and bankName != ''">
+                AND cnaps_name like CONCAT(#{bankName}, "%")
+            </if>
+            <if test="areaCode != null and areaCode != ''">
+                AND city_name like CONCAT(#{areaCode}, "%")
+            </if>
+            <if test="provinceCode != null and provinceCode != ''">
+                AND province_name like CONCAT(#{provinceCode}, "%")
+            </if>
+            <if test="branchName!=null and branchName!=''">
+                AND cnaps_name like CONCAT("%",#{branchName},"%")
+            </if>
+        </where>
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/pluss-dao-bundle/src/main/resources/mapper/BankCodeYsMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/BankCodeYsMapper.xml
new file mode 100644
index 0000000..5005517
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/BankCodeYsMapper.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.BankCodeYsMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.BankCodeYs">
+        <result column="contactLine" property="contactLine" />
+        <result column="branchName" property="branchName" />
+        <result column="bankType" property="bankType" />
+        <result column="bankName" property="bankName" />
+        <result column="cityCode" property="cityCode" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/BankUnionpayCode-sqlmap.xml b/pluss-dao-bundle/src/main/resources/mapper/BankUnionpayCode-sqlmap.xml
new file mode 100644
index 0000000..b01bd5b
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/BankUnionpayCode-sqlmap.xml
@@ -0,0 +1,229 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+			"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="cn.pluss.platform.mapper.BankUnionpayCodeMapper">
+
+	   	<insert id="saveBankUnionpayCode" parameterType="cn.pluss.platform.entity.BankUnionpayCode">
+        	insert into tb_pluss_bank_unionpay_code(f_bank_area,f_bank_city,f_cft_area_code,f_cft_city_code,f_unionpay_code,f_branch_name,f_bank_name,f_x,f_y)VALUES(#{f_bank_area},#{f_bank_city},#{f_cft_area_code},#{f_cft_city_code},#{f_unionpay_code},#{f_branch_name},#{f_bank_name},#{f_x},#{f_y})
+    	</insert>
+
+	   	<insert id="saveBankUnionpayCodeBatch">
+        	insert into tb_pluss_bank_unionpay_code(f_bank_area,f_bank_city,f_cft_area_code,f_cft_city_code,f_unionpay_code,f_branch_name,f_bank_name,f_x,f_y) VALUES 
+    			<foreach collection="list" item="item" index="index" separator=",">
+			(#{f_bank_area},#{f_bank_city},#{f_cft_area_code},#{f_cft_city_code},#{f_unionpay_code},#{f_branch_name},#{f_bank_name},#{f_x},#{f_y}		)
+				</foreach>
+    	</insert>
+
+		<select id="queryBankUnionpayCode" parameterType="cn.pluss.platform.entity.BankUnionpayCode" resultType="cn.pluss.platform.entity.BankUnionpayCode">
+			SELECT * from tb_pluss_bank_unionpay_code 
+				<where> 
+					<if test="f_bank_area!= null"> 
+					 	and f_bank_area = #{f_bank_area}
+					 </if> 
+					<if test="f_bank_city!= null"> 
+					 	and f_bank_city = #{f_bank_city}
+					 </if> 
+					<if test="f_cft_area_code!= null"> 
+					 	and f_cft_area_code = #{f_cft_area_code}
+					 </if> 
+					<if test="f_cft_city_code!= null"> 
+					 	and f_cft_city_code = #{f_cft_city_code}
+					 </if> 
+					<if test="f_unionpay_code!= null"> 
+					 	and f_unionpay_code = #{f_unionpay_code}
+					 </if> 
+					<if test="f_branch_name!= null"> 
+					 	and f_branch_name = #{f_branch_name}
+					 </if> 
+					<if test="f_bank_name!= null"> 
+					 	and f_bank_name = #{f_bank_name}
+					 </if> 
+					<if test="f_x!= null"> 
+					 	and f_x = #{f_x}
+					 </if> 
+					<if test="f_y!= null"> 
+					 	and f_y = #{f_y}
+					 </if> 
+				 </where> 
+		</select>
+
+		<select id="queryBankUnionpayCodeList" parameterType="cn.pluss.platform.entity.BankUnionpayCode" resultType="cn.pluss.platform.entity.BankUnionpayCode">
+			SELECT * from tb_pluss_bank_unionpay_code 
+				<where> 
+					<if test="f_bank_area!= null"> 
+					 and 	f_bank_area = #{f_bank_area}
+					 </if> 
+					<if test="f_bank_city!= null"> 
+					 and 	f_bank_city = #{f_bank_city}
+					 </if> 
+					<if test="f_cft_area_code!= null"> 
+					 and 	f_cft_area_code = #{f_cft_area_code}
+					 </if> 
+					<if test="f_cft_city_code!= null"> 
+					 and 	f_cft_city_code = #{f_cft_city_code}
+					 </if> 
+					<if test="f_unionpay_code!= null"> 
+					 and 	f_unionpay_code = #{f_unionpay_code}
+					 </if> 
+					<if test="f_branch_name!= null"> 
+					 and 	f_branch_name = #{f_branch_name}
+					 </if> 
+					<if test="f_bank_name!= null"> 
+					 and 	f_bank_name = #{f_bank_name}
+					 </if> 
+					<if test="f_x!= null"> 
+					 and 	f_x = #{f_x}
+					 </if> 
+					<if test="f_y!= null"> 
+					 and 	f_y = #{f_y}
+					 </if> 
+				 </where> 
+		</select>
+
+		<update id="updateBankUnionpayCode" parameterType="cn.pluss.platform.entity.BankUnionpayCode" >
+			update tb_pluss_bank_unionpay_code 
+				  <set> 
+					<if test="f_bank_area!= null"> 
+					 	f_bank_area = #{f_bank_area},
+					 </if> 
+					<if test="f_bank_city!= null"> 
+					 	f_bank_city = #{f_bank_city},
+					 </if> 
+					<if test="f_cft_area_code!= null"> 
+					 	f_cft_area_code = #{f_cft_area_code},
+					 </if> 
+					<if test="f_cft_city_code!= null"> 
+					 	f_cft_city_code = #{f_cft_city_code},
+					 </if> 
+					<if test="f_unionpay_code!= null"> 
+					 	f_unionpay_code = #{f_unionpay_code},
+					 </if> 
+					<if test="f_branch_name!= null"> 
+					 	f_branch_name = #{f_branch_name},
+					 </if> 
+					<if test="f_bank_name!= null"> 
+					 	f_bank_name = #{f_bank_name},
+					 </if> 
+					<if test="f_x!= null"> 
+					 	f_x = #{f_x},
+					 </if> 
+					<if test="f_y!= null"> 
+					 	f_y = #{f_y}
+					 </if> 
+				</set>
+			where id=#{id} 
+		</update>
+
+		<delete id="deleteBankUnionpayCode" parameterType="cn.pluss.platform.entity.BankUnionpayCode" >
+			DELETE FROM tb_pluss_bank_unionpay_code where id=#{id}
+		</delete>
+
+		<select id="queryBankUnionpayCodePage" parameterType="java.util.Map" resultType="cn.pluss.platform.entity.BankUnionpayCode">
+			SELECT * from tb_pluss_bank_unionpay_code 
+				<where> 
+					<if test="f_bank_area!= null"> 
+					and f_bank_area = #{f_bank_area}
+					 </if> 
+					<if test="f_bank_city!= null"> 
+					and f_bank_city = #{f_bank_city}
+					 </if> 
+					<if test="f_cft_area_code!= null"> 
+					and f_cft_area_code = #{f_cft_area_code}
+					 </if> 
+					<if test="f_cft_city_code!= null"> 
+					and f_cft_city_code = #{f_cft_city_code}
+					 </if> 
+					<if test="f_unionpay_code!= null"> 
+					and f_unionpay_code = #{f_unionpay_code}
+					 </if> 
+					<if test="f_branch_name!= null"> 
+					and f_branch_name = #{f_branch_name}
+					 </if> 
+					<if test="f_bank_name!= null"> 
+					and f_bank_name = #{f_bank_name}
+					 </if> 
+					<if test="f_x!= null"> 
+					and f_x = #{f_x}
+					 </if> 
+					<if test="f_y!= null"> 
+					and f_y = #{f_y}
+					 </if> 
+				 </where> 
+			order by id desc  limit #{pageSize}  offset  #{offset}  
+		</select>
+
+		<select id="queryBankUnionpayCodePageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+			SELECT count(*) from tb_pluss_bank_unionpay_code 
+					<where> 
+					<if test="f_bank_area!= null"> 
+					 and f_bank_area = #{f_bank_area}
+					 </if> 
+					<if test="f_bank_city!= null"> 
+					 and f_bank_city = #{f_bank_city}
+					 </if> 
+					<if test="f_cft_area_code!= null"> 
+					 and f_cft_area_code = #{f_cft_area_code}
+					 </if> 
+					<if test="f_cft_city_code!= null"> 
+					 and f_cft_city_code = #{f_cft_city_code}
+					 </if> 
+					<if test="f_unionpay_code!= null"> 
+					 and f_unionpay_code = #{f_unionpay_code}
+					 </if> 
+					<if test="f_branch_name!= null"> 
+					 and f_branch_name = #{f_branch_name}
+					 </if> 
+					<if test="f_bank_name!= null"> 
+					 and f_bank_name = #{f_bank_name}
+					 </if> 
+					<if test="f_x!= null"> 
+					 and f_x = #{f_x}
+					 </if> 
+					<if test="f_y!= null"> 
+					 and f_y = #{f_y}
+					 </if> 
+				</where>
+		</select>
+		
+		<!--查询银行  -->
+		<select id="getBankNameList" resultType="java.lang.String">
+		     select  F_bank_name from tb_pluss_bank_unionpay_code GROUP BY F_bank_name
+		</select>
+		
+		<resultMap type="cn.pluss.platform.leshua.ProvinceVO" id="provinceVO">
+		      <result property="provinceCode" column="F_cft_area_code" jdbcType="VARCHAR"></result>
+		      <result property="provinceName" column="F_bank_area" jdbcType="VARCHAR"></result>
+		</resultMap>
+		
+		<resultMap type="cn.pluss.platform.leshua.CityVO" id="cityVO">
+		      <result property="cityCode" column="F_cft_city_code" jdbcType="VARCHAR"></result>
+              <result property="cityName" column="F_bank_city" jdbcType="VARCHAR"></result>
+		</resultMap>
+		
+		<resultMap type="cn.pluss.platform.leshua.BankNameVO" id="bankNameVO">
+              <result property="unionpayCode" column="F_unionpay_code" jdbcType="VARCHAR"></result>
+              <result property="branchName" column="F_branch_name" jdbcType="VARCHAR"></result>
+        </resultMap>
+		
+		<!-- 省份 -->
+		<select id="getProvince" resultMap="provinceVO">
+          select F_cft_area_code,F_bank_area from(select F_cft_area_code,F_bank_area from tb_pluss_bank_unionpay_code order by (F_cft_area_code+0) ASC)a GROUP BY (a.f_cft_area_code+0)
+        </select>
+        
+        <!--省下面的市  -->
+        <select id="getCity" resultMap="cityVO">
+            SELECT F_cft_city_code,F_bank_city FROM tb_pluss_bank_unionpay_code WHERE F_cft_area_code=#{provinceCode}  GROUP BY F_cft_city_code
+        </select>
+        
+        <!--根据选择的银行，省，市  查下面的支行  -->
+        <select id="getBranchName" resultMap="bankNameVO">
+            SELECT F_unionpay_code,F_branch_name from tb_pluss_bank_unionpay_code WHERE F_branch_name like CONCAT(#{bankName}, "%", #{areaCode}, "%")
+            <if test="brankName!=null and brankName!=''">
+             AND
+             F_branch_name like CONCAT("%",#{brankName},"%")
+             </if>
+              GROUP BY F_unionpay_code
+        </select>
+
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/Banner-sqlmap.xml b/pluss-dao-bundle/src/main/resources/mapper/Banner-sqlmap.xml
new file mode 100644
index 0000000..0d3b0dd
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/Banner-sqlmap.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+			"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="cn.pluss.platform.mapper.BannerMapper">
+
+	   	<insert id="saveBanner" parameterType="cn.pluss.platform.entity.Banner">
+        	insert into tb_pluss_banner(picUrl,seq,jumpUrl,type)VALUES(#{picUrl},#{seq},#{jumpUrl},#{type})
+    	</insert>
+
+	   	<insert id="saveBannerBatch">
+        	insert into tb_pluss_banner(picUrl,seq,jumpUrl,type) VALUES 
+    			<foreach collection="list" item="item" index="index" separator=",">
+			(#{picUrl},#{seq},#{jumpUrl},#{type}		)
+				</foreach>
+    	</insert>
+
+		<select id="queryBanner" parameterType="cn.pluss.platform.entity.Banner" resultType="cn.pluss.platform.entity.Banner">
+			SELECT * from tb_pluss_banner 
+				<where> 
+					<if test="id!= null"> 
+					 	and id = #{id}
+					 </if> 
+					<if test="picUrl!= null"> 
+					 	and picUrl = #{picUrl}
+					 </if> 
+					<if test="seq!= null"> 
+					 	and seq = #{seq}
+					 </if> 
+					<if test="jumpUrl!= null"> 
+					 	and jumpUrl = #{jumpUrl}
+					 </if> 
+					 <if test="type!= null"> 
+					 	and type = #{type}
+					 </if> 
+				 </where> 
+		</select>
+
+		<select id="queryBannerList" parameterType="cn.pluss.platform.entity.Banner" resultType="cn.pluss.platform.entity.Banner">
+			SELECT * from tb_pluss_banner
+				<where>
+					(`status` != '0' OR `status` IS NULL)
+					<if test="id!= null"> 
+					 and id = #{id}
+					 </if> 
+					<if test="picUrl!= null"> 
+					 and 	picUrl = #{picUrl}
+					 </if> 
+					<if test="seq!= null"> 
+					 and 	seq = #{seq}
+					 </if> 
+					<if test="jumpUrl!= null"> 
+					 and 	jumpUrl = #{jumpUrl}
+					 </if> 
+					 <if test="type!= null"> 
+					 and 	type = #{type}
+					 </if> 
+				 </where> 
+		</select>
+
+		<update id="updateBanner" parameterType="cn.pluss.platform.entity.Banner" >
+			update tb_pluss_banner 
+				  <set> 
+					<if test="picUrl!= null"> 
+					 	picUrl = #{picUrl},
+					 </if> 
+					<if test="seq!= null"> 
+					 	seq = #{seq},
+					 </if> 
+					<if test="jumpUrl!= null"> 
+					 	jumpUrl = #{jumpUrl},
+					 </if> 
+					 <if test="type!= null"> 
+					 	type = #{type}
+					 </if> 
+				</set>
+			where id=#{id} 
+		</update>
+
+		<delete id="deleteBanner" parameterType="cn.pluss.platform.entity.Banner" >
+			DELETE FROM tb_pluss_banner where id=#{id}
+		</delete>
+
+		<select id="queryBannerPage" parameterType="java.util.Map" resultType="cn.pluss.platform.entity.Banner">
+			SELECT * from tb_pluss_banner 
+				<where> 
+					<if test="id!= null"> 
+					and id = #{id}
+					 </if> 
+					<if test="picUrl!= null"> 
+					and picUrl = #{picUrl}
+					 </if> 
+					<if test="seq!= null"> 
+					and seq = #{seq}
+					 </if> 
+					<if test="jumpUrl!= null"> 
+					and jumpUrl = #{jumpUrl}
+					 </if> 
+					 <if test="type!= null"> 
+					and type = #{type}
+					 </if> 
+				 </where> 
+			order by id desc  limit #{pageSize}  offset  #{offset}  
+		</select>
+
+		<select id="queryBannerPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+			SELECT count(*) from tb_pluss_banner 
+					<where> 
+					<if test="id!= null"> 
+					 and id = #{id}
+					 </if> 
+					<if test="picUrl!= null"> 
+					 and picUrl = #{picUrl}
+					 </if> 
+					<if test="seq!= null"> 
+					 and seq = #{seq}
+					 </if> 
+					<if test="jumpUrl!= null"> 
+					 and jumpUrl = #{jumpUrl}
+					 </if> 
+					 <if test="type!= null"> 
+					 and type = #{type}
+					 </if> 
+				</where>
+		</select>
+
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/BestNewActivity-sqlmap.xml b/pluss-dao-bundle/src/main/resources/mapper/BestNewActivity-sqlmap.xml
new file mode 100644
index 0000000..5900be8
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/BestNewActivity-sqlmap.xml
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="cn.pluss.platform.mapper.BestNewActivityMapper">
+
+    <insert id="saveBestNewActivity" parameterType="cn.pluss.platform.entity.BestNewActivity">
+        insert into tb_pluss_best_new_activity(title, content, updateTime, updateor, seq, status)
+        VALUES (#{title}, #{content}, #{updateTime}, #{updateor}, #{seq}, #{status})
+    </insert>
+
+    <insert id="saveBestNewActivityBatch">
+        insert into tb_pluss_best_new_activity(title,content,updateTime,updateor) VALUES
+        <foreach collection="list" item="item" index="index" separator=",">
+            (#{title},#{content},#{updateTime},#{updateor} )
+        </foreach>
+    </insert>
+
+    <select id="queryBestNewActivity" parameterType="cn.pluss.platform.entity.BestNewActivity"
+            resultType="cn.pluss.platform.entity.BestNewActivity">
+        SELECT * from tb_pluss_best_new_activity
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="title!= null">
+                and title = #{title}
+            </if>
+            <if test="content!= null">
+                and content = #{content}
+            </if>
+            <if test="updateTime!= null">
+                and updateTime = #{updateTime}
+            </if>
+            <if test="updateor!= null">
+                and updateor = #{updateor}
+            </if>
+            <if test="status!= null">
+                and status = #{status}
+            </if>
+        </where>
+    </select>
+
+    <select id="queryBestNewActivityList" parameterType="cn.pluss.platform.entity.BestNewActivity"
+            resultType="cn.pluss.platform.entity.BestNewActivity">
+        SELECT * from tb_pluss_best_new_activity
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="title!= null">
+                and title = #{title}
+            </if>
+            <if test="content!= null">
+                and content = #{content}
+            </if>
+            <if test="updateTime!= null">
+                and updateTime = #{updateTime}
+            </if>
+            <if test="updateor!= null">
+                and updateor = #{updateor}
+            </if>
+            <if test="status!= null">
+                and status = #{status}
+            </if>
+        </where>
+    </select>
+
+    <update id="updateBestNewActivity" parameterType="cn.pluss.platform.entity.BestNewActivity">
+        update tb_pluss_best_new_activity
+        <set>
+            <if test="title!= null">
+                title = #{title},
+            </if>
+            <if test="content!= null">
+                content = #{content},
+            </if>
+            <if test="seq!= null">
+                seq = #{seq},
+            </if>
+            <if test="updateTime!= null">
+                updateTime = #{updateTime},
+            </if>
+            <if test="updateor!= null">
+                updateor = #{updateor},
+            </if>
+            <if test="status!= null">
+                status = #{status}
+            </if>
+        </set>
+        where id=#{id}
+    </update>
+
+    <delete id="deleteBestNewActivity" parameterType="cn.pluss.platform.entity.BestNewActivity">
+        DELETE
+        FROM tb_pluss_best_new_activity
+        where id = #{id}
+    </delete>
+
+    <select id="queryBestNewActivityPage" parameterType="java.util.Map"
+            resultType="cn.pluss.platform.entity.BestNewActivity">
+        SELECT bna.*, IF(nrr.id IS NULL, 0, 1) readStatus from tb_pluss_best_new_activity bna
+            LEFT JOIN tb_pluss_notice_read_record nrr ON nrr.noticeId = bna.id
+            <if test="userId != null">
+                AND nrr.userId = #{userId}
+            </if>
+        <where>
+            <if test="type != null">
+                FIND_IN_SET(#{type}, bna.`type`)
+            </if>
+            <if test="id!= null">
+                AND id = #{id}
+            </if>
+            <if test="seq!= null">
+                AND seq = #{seq}
+            </if>
+            <if test="title!= null">
+                AND title LIKE CONCAT("%",#{title},"%")
+            </if>
+            <if test="content!= null">
+                AND content = #{content}
+            </if>
+            <if test="updateTime!= null">
+                AND updateTime = #{updateTime}
+            </if>
+            <if test="updateor!= null">
+                AND updateor = #{updateor}
+            </if>
+            <if test="status!= null">
+                AND status = #{status}
+            </if>
+        </where>
+        ORDER BY seq IS NULL, bna.updateTime DESC LIMIT #{pageSize} OFFSET #{offset}
+    </select>
+
+    <select id="queryBestNewActivityPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+        SELECT count(*) from tb_pluss_best_new_activity
+        <where>
+            <if test="type != null">
+                FIND_IN_SET(#{type}, `type`)
+            </if>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="seq!= null">
+                and seq = #{seq}
+            </if>
+            <if test="title!= null">
+                and title LIKE CONCAT("%",#{title},"%")
+            </if>
+            <if test="content!= null">
+                and content = #{content}
+            </if>
+            <if test="updateTime!= null">
+                and updateTime = #{updateTime}
+            </if>
+            <if test="updateor!= null">
+                and updateor = #{updateor}
+            </if>
+            <if test="status!= null">
+                and status = #{status}
+            </if>
+        </where>
+    </select>
+
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/BillStatisticsMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/BillStatisticsMapper.xml
new file mode 100644
index 0000000..4511d3f
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/BillStatisticsMapper.xml
@@ -0,0 +1,416 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.BillStatisticsMapper">
+
+    <select id="selectBillStatistics" resultType="cn.pluss.platform.vo.BillStatisticsVO">
+        SELECT * FROM (
+          SELECT
+              IFNULL( COUNT( IF ( `status` = '1', 1, NULL ) ), 0) allOrderCount,
+              IFNULL( COUNT( IF ( `status` = '1' &amp;&amp; ( payTypeCode = 'sxfPay1' || payTypeCode = 'wechatPay' || payTypeCode = 'leshuaPay1' ), 1, NULL ) ), 0) wxOrderCount,
+              IFNULL( COUNT( IF ( `status` = '1' &amp;&amp; ( payTypeCode = 'sxfPay0' || payTypeCode = 'aliPay' || payTypeCode = 'leshuaPay0' ), 1, NULL ) ), 0) aliOrderCount,
+              IFNULL( COUNT( IF ( `status` = '1' &amp;&amp; ( payTypeCode = 'sxfPay2' || payTypeCode = 'bank' || payTypeCode = 'leshuaPay2' ), 1, NULL ) ), 0) bankOrderCount,
+              IFNULL( COUNT( IF ( `status` = '2', 1, NULL ) ), 0) allRefundOrderCount,
+              IFNULL( COUNT( IF ( `status` = '2' &amp;&amp; ( payTypeCode = 'sxfPay1' || payTypeCode = 'wechatPay' || payTypeCode = 'leshuaPay1' ), 1, NULL ) ), 0) wxRefundOrderCount,
+              IFNULL( COUNT( IF ( `status` = '2' &amp;&amp; ( payTypeCode = 'sxfPay0' || payTypeCode = 'aliPay' || payTypeCode = 'leshuaPay0' ), 1, NULL ) ), 0) aliRefundOrderCount,
+              IFNULL( COUNT( IF ( `status` = '2' &amp;&amp; ( payTypeCode = 'sxfPay2' || payTypeCode = 'bank' || payTypeCode = 'leshuaPay2' ), 1, NULL ) ), 0) bankRefundOrderCount,
+              IFNULL( SUM( IF ( `status` = '1', consumeFee, - consumeFee ) ), 0.00 ) allInMoney,
+              IFNULL( SUM( IF ( ( payTypeCode = 'sxfPay1' || payTypeCode = 'wechatPay' || payTypeCode = 'leshuaPay1' ), IF ( `status` = '1', consumeFee, - consumeFee ), 0.00 ) ), 0.00 ) wxInMoney,
+              IFNULL( SUM( IF ( ( payTypeCode = 'sxfPay0' || payTypeCode = 'aliPay' || payTypeCode = 'leshuaPay0' ), IF ( `status` = '1', consumeFee, - consumeFee ), 0.00 ) ), 0.00 ) aliInMoney,
+              IFNULL( SUM( IF ( ( payTypeCode = 'sxfPay2' || payTypeCode = 'bank' || payTypeCode = 'leshuaPay2' ), IF ( `status` = '1', consumeFee, - consumeFee ), 0.00 ) ), 0.00 ) bankInMoney,
+              IFNULL( SUM( IF ( `status` = 1, marketAmt, - marketAmt ) ), 0.00 ) allSubsidy,
+              IFNULL( SUM( IF ( ( payTypeCode = 'sxfPay1' || payTypeCode = 'wechatPay' || payTypeCode = 'leshuaPay1' ), IF ( `status` = '1',  marketAmt, - marketAmt ), 0.00 ) ), 0.00 ) wxSubsidy,
+              IFNULL( SUM( IF ( ( payTypeCode = 'sxfPay0' || payTypeCode = 'aliPay' || payTypeCode = 'leshuaPay0' ), IF ( `status` = '1', marketAmt, - marketAmt ), 0.00 ) ), 0.00 ) aliSubsidy,
+              IFNULL( SUM( IF ( ( payTypeCode = 'sxfPay2' || payTypeCode = 'bank' || payTypeCode = 'leshuaPay2' ), IF ( `status` = '1',  marketAmt, - marketAmt ), 0.00 ) ), 0.00 ) bankSubsidy,
+              IFNULL( SUM( IF ( `status` = 1, enterFee, - enterFee ) ), 0.00 ) allInAccount,
+              IFNULL( SUM( IF ( ( payTypeCode = 'sxfPay1' || payTypeCode = 'wechatPay' || payTypeCode = 'leshuaPay1' ), IF ( `status` = '1', enterFee, - enterFee  ), 0.00 ) ), 0.00 ) wxInAccount,
+              IFNULL( SUM( IF ( ( payTypeCode = 'sxfPay0' || payTypeCode = 'aliPay' || payTypeCode = 'leshuaPay0' ), IF ( `status` = '1',enterFee, - enterFee  ), 0.00 ) ), 0.00 ) aliInAccount,
+              IFNULL( SUM( IF ( ( payTypeCode = 'sxfPay2' || payTypeCode = 'bank' || payTypeCode = 'leshuaPay2' ), IF ( `status` = '1', enterFee, - enterFee  ), 0.00 ) ), 0.00 ) bankInAccount,
+              #{startDate} startDate,
+              #{endDate} endDate,
+              "汇总" billName
+          FROM
+              tb_pluss_merchant_order
+          WHERE
+              `status` IN ( '1', '2' )
+            AND merchantCode = #{merchantCode}
+            AND createDt BETWEEN #{startDate} AND #{endDate}
+          UNION
+          SELECT
+              IFNULL( COUNT( IF ( `status` = '1', 1, NULL ) ), 0) allOrderCount,
+              IFNULL( COUNT( IF ( `status` = '1' &amp;&amp; ( payTypeCode = 'sxfPay1' || payTypeCode = 'wechatPay' || payTypeCode = 'leshuaPay1' ), 1, NULL ) ), 0) wxOrderCount,
+              IFNULL( COUNT( IF ( `status` = '1' &amp;&amp; ( payTypeCode = 'sxfPay0' || payTypeCode = 'aliPay' || payTypeCode = 'leshuaPay0' ), 1, NULL ) ), 0) aliOrderCount,
+              IFNULL( COUNT( IF ( `status` = '1' &amp;&amp; ( payTypeCode = 'sxfPay2' || payTypeCode = 'bank' || payTypeCode = 'leshuaPay2' ), 1, NULL ) ), 0) bankOrderCount,
+              IFNULL( COUNT( IF ( `status` = '2', 1, NULL ) ), 0) allRefundOrderCount,
+              IFNULL( COUNT( IF ( `status` = '2' &amp;&amp; ( payTypeCode = 'sxfPay1' || payTypeCode = 'wechatPay' || payTypeCode = 'leshuaPay1' ), 1, NULL ) ), 0) wxRefundOrderCount,
+              IFNULL( COUNT( IF ( `status` = '2' &amp;&amp; ( payTypeCode = 'sxfPay0' || payTypeCode = 'aliPay' || payTypeCode = 'leshuaPay0' ), 1, NULL ) ), 0) aliRefundOrderCount,
+              IFNULL( COUNT( IF ( `status` = '2' &amp;&amp; ( payTypeCode = 'sxfPay2' || payTypeCode = 'bank' || payTypeCode = 'leshuaPay2' ), 1, NULL ) ), 0) bankRefundOrderCount,
+              IFNULL( SUM( IF ( `status` = '1', consumeFee, - consumeFee ) ), 0.00 ) allInMoney,
+              IFNULL( SUM( IF ( ( payTypeCode = 'sxfPay1' || payTypeCode = 'wechatPay' || payTypeCode = 'leshuaPay1' ), IF ( `status` = '1', consumeFee, - consumeFee ), 0.00 ) ), 0.00 ) wxInMoney,
+              IFNULL( SUM( IF ( ( payTypeCode = 'sxfPay0' || payTypeCode = 'aliPay' || payTypeCode = 'leshuaPay0' ), IF ( `status` = '1', consumeFee, - consumeFee ), 0.00 ) ), 0.00 ) aliInMoney,
+              IFNULL( SUM( IF ( ( payTypeCode = 'sxfPay2' || payTypeCode = 'bank' || payTypeCode = 'leshuaPay2' ), IF ( `status` = '1', consumeFee, - consumeFee ), 0.00 ) ), 0.00 ) bankInMoney,
+              IFNULL( SUM( IF ( `status` = 1, marketAmt, - marketAmt ) ), 0.00 ) allSubsidy,
+              IFNULL( SUM( IF ( ( payTypeCode = 'sxfPay1' || payTypeCode = 'wechatPay' || payTypeCode = 'leshuaPay1' ), IF ( `status` = '1',  marketAmt, - marketAmt ), 0.00 ) ), 0.00 ) wxSubsidy,
+              IFNULL( SUM( IF ( ( payTypeCode = 'sxfPay0' || payTypeCode = 'aliPay' || payTypeCode = 'leshuaPay0' ), IF ( `status` = '1', marketAmt, - marketAmt ), 0.00 ) ), 0.00 ) aliSubsidy,
+              IFNULL( SUM( IF ( ( payTypeCode = 'sxfPay2' || payTypeCode = 'bank' || payTypeCode = 'leshuaPay2' ), IF ( `status` = '1',  marketAmt, - marketAmt ), 0.00 ) ), 0.00 ) bankSubsidy,
+              IFNULL( SUM( IF ( `status` = 1, enterFee, - enterFee ) ), 0.00 ) allInAccount,
+              IFNULL( SUM( IF ( ( payTypeCode = 'sxfPay1' || payTypeCode = 'wechatPay' || payTypeCode = 'leshuaPay1' ), IF ( `status` = '1', enterFee, - enterFee  ), 0.00 ) ), 0.00 ) wxInAccount,
+              IFNULL( SUM( IF ( ( payTypeCode = 'sxfPay0' || payTypeCode = 'aliPay' || payTypeCode = 'leshuaPay0' ), IF ( `status` = '1',enterFee, - enterFee  ), 0.00 ) ), 0.00 ) aliInAccount,
+              IFNULL( SUM( IF ( ( payTypeCode = 'sxfPay2' || payTypeCode = 'bank' || payTypeCode = 'leshuaPay2' ), IF ( `status` = '1', enterFee, - enterFee  ), 0.00 ) ), 0.00 ) bankInAccount,
+              DATE_FORMAT(mo.createDt, '%Y-%m-%d 00:00:00') startDate,
+              DATE_FORMAT(mo.createDt, '%Y-%m-%d 23:59:59') endDate,
+              DATE_FORMAT(mo.createDt, '%Y-%m-%d') billName
+          FROM tb_pluss_merchant_order mo
+          WHERE mo.`status` IN ('1', '2')
+            AND merchantCode = #{merchantCode}
+            AND createDt BETWEEN #{startDate} AND #{endDate}
+          GROUP BY DATE_FORMAT(mo.createDt, '%Y-%m-%d'), DATE_FORMAT(mo.createDt, '%Y-%m-%d 00:00:00'), DATE_FORMAT(mo.createDt, '%Y-%m-%d 23:59:59')
+        ) t, (
+            SELECT CONCAT(mc.channelName, '备付金') merchantChannelType
+            FROM tb_pluss_merchant_channel mc
+            LEFT JOIN tb_pluss_merchant_channel_status mcs ON mc.id = mcs.channel
+            WHERE mcs.merchantCode = #{merchantCode}
+        ) t2
+        ORDER BY t.billName DESC;
+    </select>
+
+    <select id="selectBillList" resultType="cn.pluss.platform.vo.MerchantOrderExportVO">
+        SELECT mo.orderNumber,
+               mo.thirdTransNo thirdOrderNo,
+               mro.refundNo,
+               CASE mo.payTypeCode
+                   WHEN "sxfPay1" THEN "微信"
+                   WHEN "wechatPay" THEN "微信"
+                   WHEN "sxfPay0" THEN "支付宝"
+                   WHEN "aliPay" THEN "支付宝"
+                   WHEN "sxfPay2" THEN "银联"
+                   WHEN "bank" THEN "银联"
+                END payType,
+               CASE mo.orderType
+                   WHEN 1 THEN '反扫收款'
+                   WHEN 2 THEN '收款码'
+                   WHEN 3 THEN '会员充值'
+                   WHEN 4 THEN 'POS刷卡'
+                   WHEN 5 THEN '反扫会员充值'
+                   WHEN 6 THEN '扫码王'
+                   WHEN 9 THEN '收款码'
+                   WHEN 10 THEN '线上店' END 'orderTypeDesc',
+               consumeFee,
+               IF(mro.refundNo IS NULL, 0, consumeFee) refundFee,
+               0 subsidy,
+               mo.marketAmt,
+               IF(mro.refundNo IS NOT NULL, 0, consumeFee - enterFee) serviceCharge,
+               IF(mro.refundNo IS NOT NULL, 0, enterFee) enterFee,
+               mo.staffName,
+               mo.remark,
+               mo.createDt,
+               mo.transDt
+        FROM tb_pluss_merchant_order mo
+                 LEFT JOIN tb_pluss_merchant_refund_order mro ON mo.orderNumber = mro.orderNumber
+        WHERE mo.merchantCode = #{merchantCode}
+          AND mo.`status` IN ( '1' )
+          AND mo.createDt BETWEEN #{startDate}
+            AND #{endDate};
+    </select>
+
+    <select id="selectMemberBillList" resultType="cn.pluss.platform.vo.MemberOrderVO">
+        SELECT mo.orderNumber,
+               mo2.thirdTransNo thirdOrderNo,
+               mm.nickName,
+               mm.phone,
+               IF (mo.orderType = 0, NULL,
+                   IF (mo.rechargeType = 1, "现金",
+                       CASE mo2.payTypeCode
+                           WHEN "sxfPay1" THEN "微信"
+                           WHEN "wechatPay" THEN "微信"
+                           WHEN "sxfPay0" THEN "支付宝"
+                           WHEN "aliPay" THEN "支付宝"
+                           WHEN "sxfPay2" THEN "银联"
+                           WHEN "bank" THEN "银联"
+                           END
+                   ))
+                     payType,
+               IF (mo.orderType = 0, "会员消费", "会员充值") orderType,
+               mo.orderFee,
+               IF (mo.orderType = 0, 0.00,
+                   IF (mo.rechargeType = 1, 0.00, mo2.consumeFee - mo2.enterFee)
+                   ) serviceRecharge,
+               IF (mo.orderType = 0, 0.00,
+                   IF (mo.rechargeType = 1, mo.orderFee, 0.00)
+                   ) inCashMoney,
+               IF (mo.orderType = 0, 0.00,
+                   IF (mo.rechargeType != 1, mo2.enterFee, 0.00)
+                   ) cardMoney,
+               IF(mo.orderType = 0, mo.orderFee, 0.00) consumeFee,
+               IFNULL(mmr.giveMoney, IFNULL(mmc.giveMoney, 0.00)) giveMoney,
+               IFNULL(mo.staffName, mbi.alias) staffName,
+               mo.remark,
+               mo.createDt,
+               IFNULL(mo2.transDt, mo.createDt) transDt,
+               t.memberBalance
+        FROM tb_pluss_member_order mo
+            LEFT JOIN tb_pluss_merchant_order mo2 ON mo.orderNumber = mo2.orderNumber
+            LEFT JOIN tb_pluss_merchant_base_info mbi ON mbi.merchantCode = mo.merchantCode
+            LEFT JOIN tb_pluss_merchant_menber mm ON mm.memberCode = mo.memberCode
+            LEFT JOIN tb_pluss_merchant_menber_recharge mmr ON mmr.orderNumber = mo.orderNumber
+            LEFT JOIN tb_pluss_merchant_menber_comsume mmc ON mmc.orderNumber = mo.orderNumber
+            LEFT JOIN (
+                SELECT
+                    t.*,
+                    ROUND(IF (@cgroup = t.memberCode, @csum := @csum + t.cardMoney, @csum := 0 + t.cardMoney), 2) memberBalance,
+                    (@cgroup:= t.memberCode) `newGroup`
+                FROM (
+                     SELECT
+                         SUM( IF (
+                                 mo.orderType = 0,
+                                 ( IFNULL( mmc.giveMoney, 0.00 ) + IFNULL( mmr.giveMoney, 0.00 ) - IFNULL( mo.orderFee, 0.00 ) ),
+                                 ( IFNULL( mmc.giveMoney, 0.00 ) + IFNULL( mmr.giveMoney, 0.00 ) + IFNULL( mo.orderFee, 0.00 ) )
+                             )
+                             ) cardMoney, mo.memberCode, mo.createDt
+                     FROM tb_pluss_member_order mo
+                              LEFT JOIN tb_pluss_merchant_menber_comsume mmc ON mo.orderNumber = mmc.orderNumber
+                              LEFT JOIN tb_pluss_merchant_menber_recharge mmr ON mo.orderNumber = mmr.orderNumber
+                     WHERE mo.merchantCode = #{merchantCode} AND mo.createDt &lt;= #{endDate}
+                     GROUP BY mo.memberCode, mo.createDt
+                     ORDER BY mo.memberCode, mo.createDt
+                 ) t,
+                 (select @csum:=0, @cgroup:='') it
+                ORDER BY t.memberCode, t.createDt
+            ) t ON t.createDt = mo.createDt
+        WHERE mo.orderStatus = '1' AND mo.merchantCode = #{merchantCode}
+          AND mo.createDt BETWEEN #{startDate} AND #{endDate}
+        ORDER BY mo.createDt;
+    </select>
+
+    <select id="selectMemberBillStatistics" resultType="cn.pluss.platform.vo.MemberOrderStatisticsVO">
+        SELECT t.*, t2.sumMemberBalance memberBalance, t3.merchantChannelType FROM (
+              SELECT
+                  COUNT( IF ( mo.orderType = 0, 1, NULL ) ) consumeOrderCount,
+                  COUNT( IF ( mo.orderType = 1, 1, NULL ) ) rechargeOrderCount,
+                  COUNT( IF ( mo.orderType = 1 &amp;&amp; mo.rechargeType = 1, 1, NULL ) ) inCashRechargeOrderCount,
+                  COUNT( IF ( mo.orderType = 1 &amp;&amp; ( mo2.payTypeCode = 'sxfPay1' || mo2.payTypeCode = 'wechatPay' || mo2.payTypeCode = 'leshuaPay1' ), 1, NULL ) ) wxOrderCount,
+                  COUNT( IF ( mo.orderType = 1 &amp;&amp; ( mo2.payTypeCode = 'sxfPay0' || mo2.payTypeCode = 'aliPay' || mo2.payTypeCode = 'leshuaPay0' ), 1, NULL ) ) aliOrderCount,
+                  COUNT( IF ( mo.orderType = 1 &amp;&amp; ( mo2.payTypeCode = 'sxfPay2' || mo2.payTypeCode = 'bank' || mo2.payTypeCode = 'leshuaPay2' ), 1, NULL ) ) bankOrderCount,
+                  ROUND(SUM( IF ( mo.orderType = 0, mo.orderFee, 0.00)), 2) consumeSum,
+                  ROUND(SUM( IF ( mo.orderType = 1, mo.orderFee, 0.00)), 2) rechargeSum,
+                  ROUND(SUM( IF ( mo.orderType = 1 &amp;&amp; mo.rechargeType = 1, mo.orderFee, 0.00) ), 2) inCashRechargeSum,
+                  ROUND(SUM( IF ( mo.orderType = 1 &amp;&amp; ( mo2.payTypeCode = 'sxfPay1' || mo2.payTypeCode = 'wechatPay' || mo2.payTypeCode = 'leshuaPay1' ), mo.orderFee, 0.00 ) ), 2) wxRechargeSum,
+                  ROUND(SUM( IF ( mo.orderType = 1 &amp;&amp; ( mo2.payTypeCode = 'sxfPay0' || mo2.payTypeCode = 'aliPay' || mo2.payTypeCode = 'leshuaPay0' ), mo.orderFee, 0.00 ) ), 2) aliRechargeSum,
+                  ROUND(SUM( IF ( mo.orderType = 1 &amp;&amp; ( mo2.payTypeCode = 'sxfPay2' || mo2.payTypeCode = 'bank' || mo2.payTypeCode = 'leshuaPay2' ), mo.orderFee, 0.00 ) ), 2) bankRechargeSum,
+                  ROUND(SUM( IF ( mo.orderType = 0, IFNULL(mmr.giveMoney, 0.00) + IFNULL(mmc.giveMoney, 0.00), 0.00)), 2) consumeGiveMoney,
+                  ROUND(SUM( IF ( mo.orderType = 1, IFNULL(mmr.giveMoney, 0.00) + IFNULL(mmc.giveMoney, 0.00), 0.00)), 2) rechargeGiveMoney,
+                  ROUND(SUM( IF ( mo.orderType = 1 &amp;&amp; mo.rechargeType = 1, IFNULL(mmr.giveMoney, 0.00) + IFNULL(mmc.giveMoney, 0.00), 0.00)), 2) inCashRechargeGiveMoney,
+                  ROUND(SUM( IF ( mo.orderType = 1 &amp;&amp; ( mo2.payTypeCode = 'sxfPay1' || mo2.payTypeCode = 'wechatPay' || mo2.payTypeCode = 'leshuaPay1' ), IFNULL(mmr.giveMoney, 0.00) + IFNULL(mmc.giveMoney, 0.00), 0.00)), 2) wxGiveMoney,
+                  ROUND(SUM( IF ( mo.orderType = 1 &amp;&amp; ( mo2.payTypeCode = 'sxfPay0' || mo2.payTypeCode = 'aliPay' || mo2.payTypeCode = 'leshuaPay0') , IFNULL(mmr.giveMoney, 0.00) + IFNULL(mmc.giveMoney, 0.00), 0.00)), 2) aliGiveMoney,
+                  ROUND(SUM( IF ( mo.orderType = 1 &amp;&amp; ( mo2.payTypeCode = 'sxfPay2' || mo2.payTypeCode = 'bank' || mo2.payTypeCode = 'leshuaPay2' ), IFNULL(mmr.giveMoney, 0.00) + IFNULL(mmc.giveMoney, 0.00), 0.00)), 2) bankGiveMoney,
+                  #{startDate} startDate,
+                  #{endDate} endDate,
+                  '汇总' billName
+              FROM
+                  tb_pluss_member_order mo
+                      LEFT JOIN tb_pluss_merchant_order mo2 ON mo.orderNumber = mo2.orderNumber
+                      LEFT JOIN tb_pluss_merchant_menber_recharge mmr ON mmr.orderNumber = mo.orderNumber
+                      LEFT JOIN tb_pluss_merchant_menber_comsume mmc ON mmc.orderNumber = mo.orderNumber
+              WHERE
+                  mo.orderStatus = '1'
+                AND mo.merchantCode = #{merchantCode}
+                AND mo.createDt BETWEEN #{startDate} AND #{endDate}
+              UNION
+              SELECT
+                  COUNT( IF ( mo.orderType = 0, 1, NULL ) ) consumeOrderCount,
+                  COUNT( IF ( mo.orderType = 1, 1, NULL ) ) rechargeOrderCount,
+                  COUNT( IF ( mo.orderType = 1 &amp;&amp; mo.rechargeType = 1, 1, NULL ) ) inCashRechargeOrderCount,
+                  COUNT( IF ( mo.orderType = 1 &amp;&amp; ( mo2.payTypeCode = 'sxfPay1' || mo2.payTypeCode = 'wechatPay' || mo2.payTypeCode = 'leshuaPay1' ), 1, NULL ) ) wxOrderCount,
+                  COUNT( IF ( mo.orderType = 1 &amp;&amp; ( mo2.payTypeCode = 'sxfPay0' || mo2.payTypeCode = 'aliPay' || mo2.payTypeCode = 'leshuaPay0' ), 1, NULL ) ) aliOrderCount,
+                  COUNT( IF ( mo.orderType = 1 &amp;&amp; ( mo2.payTypeCode = 'sxfPay2' || mo2.payTypeCode = 'bank' || mo2.payTypeCode = 'leshuaPay2' ), 1, NULL ) ) bankOrderCount,
+                  ROUND(SUM( IF ( mo.orderType = 0, mo.orderFee, 0.00)), 2) consumeSum,
+                  ROUND(SUM( IF ( mo.orderType = 1, mo.orderFee, 0.00)), 2) rechargeSum,
+                  ROUND(SUM( IF ( mo.orderType = 1 &amp;&amp; mo.rechargeType = 1, mo.orderFee, 0.00) ), 2) inCashRechargeSum,
+                  ROUND(SUM( IF ( mo.orderType = 1 &amp;&amp; ( mo2.payTypeCode = 'sxfPay1' || mo2.payTypeCode = 'wechatPay' || mo2.payTypeCode = 'leshuaPay1' ), mo.orderFee, 0.00 ) ), 2) wxRechargeSum,
+                  ROUND(SUM( IF ( mo.orderType = 1 &amp;&amp; ( mo2.payTypeCode = 'sxfPay0' || mo2.payTypeCode = 'aliPay' || mo2.payTypeCode = 'leshuaPay0' ), mo.orderFee, 0.00 ) ), 2) aliRechargeSum,
+                  ROUND(SUM( IF ( mo.orderType = 1 &amp;&amp; ( mo2.payTypeCode = 'sxfPay2' || mo2.payTypeCode = 'bank' || mo2.payTypeCode = 'leshuaPay2' ), mo.orderFee, 0.00 ) ), 2) bankRechargeSum,
+                  ROUND(SUM( IF ( mo.orderType = 0, IFNULL(mmr.giveMoney, 0.00) + IFNULL(mmc.giveMoney, 0.00), 0.00)), 2) consumeGiveMoney,
+                  ROUND(SUM( IF ( mo.orderType = 1, IFNULL(mmr.giveMoney, 0.00) + IFNULL(mmc.giveMoney, 0.00), 0.00)), 2) rechargeGiveMoney,
+                  ROUND(SUM( IF ( mo.orderType = 1 &amp;&amp; mo.rechargeType = 1, IFNULL(mmr.giveMoney, 0.00) + IFNULL(mmc.giveMoney, 0.00), 0.00)), 2) inCashRechargeGiveMoney,
+                  ROUND(SUM( IF ( mo.orderType = 1 &amp;&amp; ( mo2.payTypeCode = 'sxfPay1' || mo2.payTypeCode = 'wechatPay' || mo2.payTypeCode = 'leshuaPay1' ), IFNULL(mmr.giveMoney, 0.00) + IFNULL(mmc.giveMoney, 0.00), 0.00)), 2) wxGiveMoney,
+                  ROUND(SUM( IF ( mo.orderType = 1 &amp;&amp; ( mo2.payTypeCode = 'sxfPay0' || mo2.payTypeCode = 'aliPay' || mo2.payTypeCode = 'leshuaPay0') , IFNULL(mmr.giveMoney, 0.00) + IFNULL(mmc.giveMoney, 0.00), 0.00)), 2) aliGiveMoney,
+                  ROUND(SUM( IF ( mo.orderType = 1 &amp;&amp; ( mo2.payTypeCode = 'sxfPay2' || mo2.payTypeCode = 'bank' || mo2.payTypeCode = 'leshuaPay2' ), IFNULL(mmr.giveMoney, 0.00) + IFNULL(mmc.giveMoney, 0.00), 0.00)), 2) bankGiveMoney,
+                  DATE_FORMAT(mo.createDt, '%Y-%m-%d 00:00:00') startDate,
+                  DATE_FORMAT(mo.createDt, '%Y-%m-%d 23:59:59') endDate,
+                  DATE_FORMAT(mo.createDt, '%Y-%m-%d') billName
+              FROM tb_pluss_member_order mo
+                       LEFT JOIN tb_pluss_merchant_order mo2 ON mo.orderNumber = mo2.orderNumber
+                       LEFT JOIN tb_pluss_merchant_menber_recharge mmr ON mmr.orderNumber = mo.orderNumber
+                       LEFT JOIN tb_pluss_merchant_menber_comsume mmc ON mmc.orderNumber = mo.orderNumber
+              WHERE mo.orderStatus = '1'
+                AND mo.merchantCode = #{merchantCode}
+                AND mo.createDt BETWEEN #{startDate} AND #{endDate}
+              GROUP BY DATE_FORMAT(mo.createDt, '%Y-%m-%d'), DATE_FORMAT(mo.createDt, '%Y-%m-%d 00:00:00'), DATE_FORMAT(mo.createDt, '%Y-%m-%d 23:59:59')
+          ) t LEFT JOIN (
+            SELECT date, ROUND((@csum := @csum + memberBalance), 2) sumMemberBalance
+            FROM (SELECT
+                      SUM(
+                              IF (mo.orderType = 0,
+                                  (IFNULL(mmc.giveMoney, 0.00) + IFNULL(mmr.giveMoney, 0.00) - IFNULL(mo.orderFee, 0.00)),
+                                  (IFNULL(mmc.giveMoney, 0.00) + IFNULL(mmr.giveMoney, 0.00) + IFNULL(mo.orderFee, 0.00))
+                                  )
+                          ) memberBalance, DATE_FORMAT(mo.createDt, '%Y-%m-%d 23:59:59') date
+                  FROM tb_pluss_member_order mo
+                           LEFT JOIN tb_pluss_merchant_menber_comsume mmc ON mo.orderNumber = mmc.orderNumber
+                           LEFT JOIN tb_pluss_merchant_menber_recharge mmr ON mo.orderNumber = mmr.orderNumber
+                  WHERE mo.merchantCode = 'M800202104111235020' AND mo.orderStatus = 1
+                  GROUP BY DATE_FORMAT(mo.createDt, '%Y-%m-%d 23:59:59')) t ,(select @csum:=0) as it order by date
+          ) t2 ON DATE_FORMAT(t.endDate, '%Y%m%d%H%i%s') = DATE_FORMAT(t2.date, '%Y%m%d%H%i%s'), (
+                SELECT CONCAT(mc.channelName, '备付金') merchantChannelType
+                FROM tb_pluss_merchant_channel mc
+                         LEFT JOIN tb_pluss_merchant_channel_status mcs ON mc.id = mcs.channel
+                WHERE mcs.merchantCode = #{merchantCode}
+          ) t3
+        ORDER BY t.billName DESC;
+    </select>
+
+    <select id="selectStaffBillStatistics" resultType="cn.pluss.platform.vo.BillStatisticsVO">
+        SELECT ta.staffName,
+               IFNULL(t.billName, tn.billName) billName,
+               IFNULL(t.allOrderCount, 0) allOrderCount,
+               IFNULL(t.wxOrderCount, 0) wxOrderCount,
+               IFNULL(t.aliOrderCount, 0) aliOrderCount,
+               IFNULL(t.bankOrderCount, 0) bankOrderCount,
+               IFNULL(t.allRefundOrderCount, 0) allRefundOrderCount,
+               IFNULL(t.wxRefundOrderCount, 0) wxRefundOrderCount,
+               IFNULL(t.aliRefundOrderCount, 0) aliRefundOrderCount,
+               IFNULL(t.bankRefundOrderCount, 0) bankRefundOrderCount,
+               IFNULL(t.allInMoney, 0.00) allInMoney,
+               IFNULL(t.wxInMoney, 0.00) wxInMoney,
+               IFNULL(t.aliInMoney, 0.00) aliInMoney,
+               IFNULL(t.bankInMoney, 0.00) bankInMoney,
+               IFNULL(t.allSubsidy, 0.00) allSubsidy,
+               IFNULL(t.wxSubsidy, 0.00) wxSubsidy,
+               IFNULL(t.aliSubsidy, 0.00) aliSubsidy,
+               IFNULL(t.bankSubsidy, 0.00) bankSubsidy,
+               IFNULL(t.allInAccount, 0.00) allInAccount,
+               IFNULL(t.wxInAccount, 0.00) wxInAccount,
+               IFNULL(t.aliInAccount, 0.00) aliInAccount,
+               IFNULL(t.bankInAccount, 0.00) bankInAccount,
+               #{startDate} startDate,
+               #{endDate} endDate,
+               IFNULL(tn.inCashOrderCount, 0) inCashOrderCount,
+               IFNULL(tn.inCashInMoney, 0.00) inCashInMoney,
+               IFNULL(tn.inCashInMoney, 0.00) inCashInAccount,
+               t2.merchantChannelType
+        FROM
+        ( SELECT userId, ua.userName staffName
+          FROM tb_pluss_user_app ua
+          WHERE userType = 'staff'
+            AND merchantCode = #{merchantCode}
+            ) ta LEFT JOIN
+        (
+              SELECT
+                  IFNULL( COUNT( IF ( `status` = '1', 1, NULL ) ), 0) allOrderCount,
+                  IFNULL( COUNT( IF ( `status` = '1' &amp;&amp; ( payTypeCode = 'sxfPay1' || payTypeCode = 'wechatPay' || payTypeCode = 'leshuaPay1' ), 1, NULL ) ), 0) wxOrderCount,
+                  IFNULL( COUNT( IF ( `status` = '1' &amp;&amp; ( payTypeCode = 'sxfPay0' || payTypeCode = 'aliPay' || payTypeCode = 'leshuaPay0' ), 1, NULL ) ), 0) aliOrderCount,
+                  IFNULL( COUNT( IF ( `status` = '1' &amp;&amp; ( payTypeCode = 'sxfPay2' || payTypeCode = 'bank' || payTypeCode = 'leshuaPay2' ), 1, NULL ) ), 0) bankOrderCount,
+                  IFNULL( COUNT( IF ( `status` = '2', 1, NULL ) ), 0) allRefundOrderCount,
+                  IFNULL( COUNT( IF ( `status` = '2' &amp;&amp; ( payTypeCode = 'sxfPay1' || payTypeCode = 'wechatPay' || payTypeCode = 'leshuaPay1' ), 1, NULL ) ), 0) wxRefundOrderCount,
+                  IFNULL( COUNT( IF ( `status` = '2' &amp;&amp; ( payTypeCode = 'sxfPay0' || payTypeCode = 'aliPay' || payTypeCode = 'leshuaPay0' ), 1, NULL ) ), 0) aliRefundOrderCount,
+                  IFNULL( COUNT( IF ( `status` = '2' &amp;&amp; ( payTypeCode = 'sxfPay2' || payTypeCode = 'bank' || payTypeCode = 'leshuaPay2' ), 1, NULL ) ), 0) bankRefundOrderCount,
+                  SUM( IF ( `status` = '1', consumeFee, - consumeFee ) ) allInMoney,
+                  SUM( IF ( ( payTypeCode = 'sxfPay1' || payTypeCode = 'wechatPay' || payTypeCode = 'leshuaPay1' ), IF ( `status` = '1', consumeFee, - consumeFee ), 0.00 ) ) wxInMoney,
+                  SUM( IF ( ( payTypeCode = 'sxfPay0' || payTypeCode = 'aliPay' || payTypeCode = 'leshuaPay0' ), IF ( `status` = '1', consumeFee, - consumeFee ), 0.00 ) ) aliInMoney,
+                  SUM( IF ( ( payTypeCode = 'sxfPay2' || payTypeCode = 'bank' || payTypeCode = 'leshuaPay2' ), IF ( `status` = '1', consumeFee, - consumeFee ), 0.00 ) ) bankInMoney,
+                  SUM( IF ( `status` = 1, marketAmt, - marketAmt ) ) allSubsidy,
+                  SUM( IF ( ( payTypeCode = 'sxfPay1' || payTypeCode = 'wechatPay' || payTypeCode = 'leshuaPay1' ), IF ( `status` = '1',  marketAmt, - marketAmt ), 0.00 ) ) wxSubsidy,
+                  SUM( IF ( ( payTypeCode = 'sxfPay0' || payTypeCode = 'aliPay' || payTypeCode = 'leshuaPay0' ), IF ( `status` = '1', marketAmt, - marketAmt ), 0.00 ) ) aliSubsidy,
+                  SUM( IF ( ( payTypeCode = 'sxfPay2' || payTypeCode = 'bank' || payTypeCode = 'leshuaPay2' ), IF ( `status` = '1',  marketAmt, - marketAmt ), 0.00 ) ) bankSubsidy,
+                  SUM( IF ( `status` = 1, enterFee, - enterFee ) ) allInAccount,
+                  SUM( IF ( ( payTypeCode = 'sxfPay1' || payTypeCode = 'wechatPay' || payTypeCode = 'leshuaPay1' ), IF ( `status` = '1', enterFee, - enterFee  ), 0.00 ) ) wxInAccount,
+                  SUM( IF ( ( payTypeCode = 'sxfPay0' || payTypeCode = 'aliPay' || payTypeCode = 'leshuaPay0' ), IF ( `status` = '1',enterFee, - enterFee  ), 0.00 ) ) aliInAccount,
+                  SUM( IF ( ( payTypeCode = 'sxfPay2' || payTypeCode = 'bank' || payTypeCode = 'leshuaPay2' ), IF ( `status` = '1', enterFee, - enterFee  ), 0.00 ) ) bankInAccount,
+                  #{startDate} startDate,
+                  #{endDate} endDate,
+                  mo.staffCode,
+                  CONCAT(staffName, '——汇总') billName
+              FROM
+                  tb_pluss_merchant_order mo
+              WHERE `status` IN ( '1', '2' )
+                AND staffName IS NOT NULL
+                AND merchantCode = #{merchantCode}
+                AND createDt BETWEEN #{startDate} AND #{endDate}
+              GROUP BY staffName, staffCode
+              UNION
+              SELECT
+                  IFNULL( COUNT( IF ( `status` = '1', 1, NULL ) ), 0) allOrderCount,
+                  IFNULL( COUNT( IF ( `status` = '1' &amp;&amp; ( payTypeCode = 'sxfPay1' || payTypeCode = 'wechatPay' || payTypeCode = 'leshuaPay1' ), 1, NULL ) ), 0) wxOrderCount,
+                  IFNULL( COUNT( IF ( `status` = '1' &amp;&amp; ( payTypeCode = 'sxfPay0' || payTypeCode = 'aliPay' || payTypeCode = 'leshuaPay0' ), 1, NULL ) ), 0) aliOrderCount,
+                  IFNULL( COUNT( IF ( `status` = '1' &amp;&amp; ( payTypeCode = 'sxfPay2' || payTypeCode = 'bank' || payTypeCode = 'leshuaPay2' ), 1, NULL ) ), 0) bankOrderCount,
+                  IFNULL( COUNT( IF ( `status` = '2', 1, NULL ) ), 0) allRefundOrderCount,
+                  IFNULL( COUNT( IF ( `status` = '2' &amp;&amp; ( payTypeCode = 'sxfPay1' || payTypeCode = 'wechatPay' || payTypeCode = 'leshuaPay1' ), 1, NULL ) ), 0) wxRefundOrderCount,
+                  IFNULL( COUNT( IF ( `status` = '2' &amp;&amp; ( payTypeCode = 'sxfPay0' || payTypeCode = 'aliPay' || payTypeCode = 'leshuaPay0' ), 1, NULL ) ), 0) aliRefundOrderCount,
+                  IFNULL( COUNT( IF ( `status` = '2' &amp;&amp; ( payTypeCode = 'sxfPay2' || payTypeCode = 'bank' || payTypeCode = 'leshuaPay2' ), 1, NULL ) ), 0) bankRefundOrderCount,
+                  SUM( IF ( `status` = '1', consumeFee, - consumeFee ) ) allInMoney,
+                  SUM( IF ( ( payTypeCode = 'sxfPay1' || payTypeCode = 'wechatPay' || payTypeCode = 'leshuaPay1' ), IF ( `status` = '1', consumeFee, - consumeFee ), 0.00 ) ) wxInMoney,
+                  SUM( IF ( ( payTypeCode = 'sxfPay0' || payTypeCode = 'aliPay' || payTypeCode = 'leshuaPay0' ), IF ( `status` = '1', consumeFee, - consumeFee ), 0.00 ) ) aliInMoney,
+                  SUM( IF ( ( payTypeCode = 'sxfPay2' || payTypeCode = 'bank' || payTypeCode = 'leshuaPay2' ), IF ( `status` = '1', consumeFee, - consumeFee ), 0.00 ) ) bankInMoney,
+                  SUM( IF ( `status` = 1, marketAmt, - marketAmt ) ) allSubsidy,
+                  SUM( IF ( ( payTypeCode = 'sxfPay1' || payTypeCode = 'wechatPay' || payTypeCode = 'leshuaPay1' ), IF ( `status` = '1',  marketAmt, - marketAmt ), 0.00 ) ) wxSubsidy,
+                  SUM( IF ( ( payTypeCode = 'sxfPay0' || payTypeCode = 'aliPay' || payTypeCode = 'leshuaPay0' ), IF ( `status` = '1', marketAmt, - marketAmt ), 0.00 ) ) aliSubsidy,
+                  SUM( IF ( ( payTypeCode = 'sxfPay2' || payTypeCode = 'bank' || payTypeCode = 'leshuaPay2' ), IF ( `status` = '1',  marketAmt, - marketAmt ), 0.00 ) ) bankSubsidy,
+                  SUM( IF ( `status` = 1, enterFee, - enterFee ) ) allInAccount,
+                  SUM( IF ( ( payTypeCode = 'sxfPay1' || payTypeCode = 'wechatPay' || payTypeCode = 'leshuaPay1' ), IF ( `status` = '1', enterFee, - enterFee  ), 0.00 ) ) wxInAccount,
+                  SUM( IF ( ( payTypeCode = 'sxfPay0' || payTypeCode = 'aliPay' || payTypeCode = 'leshuaPay0' ), IF ( `status` = '1',enterFee, - enterFee  ), 0.00 ) ) aliInAccount,
+                  SUM( IF ( ( payTypeCode = 'sxfPay2' || payTypeCode = 'bank' || payTypeCode = 'leshuaPay2' ), IF ( `status` = '1', enterFee, - enterFee  ), 0.00 ) ) bankInAccount,
+                  DATE_FORMAT(mo.createDt, '%Y-%m-%d 00:00:00') startDate,
+                  DATE_FORMAT(mo.createDt, '%Y-%m-%d 23:59:59') endDate,
+                  mo.staffCode,
+                  CONCAT(mo.staffName, '——', DATE_FORMAT(mo.createDt, '%Y-%m-%d')) billName
+              FROM tb_pluss_merchant_order mo
+              WHERE mo.`status` IN ('1', '2')
+                AND staffName IS NOT NULL
+                AND merchantCode = #{merchantCode}
+                AND createDt BETWEEN #{startDate} AND #{endDate}
+              GROUP BY DATE_FORMAT(mo.createDt, '%Y-%m-%d'), DATE_FORMAT(mo.createDt, '%Y-%m-%d 00:00:00'), DATE_FORMAT(mo.createDt, '%Y-%m-%d 23:59:59'), CONCAT(mo.staffName, '——', DATE_FORMAT(mo.createDt, '%Y-%m-%d')), mo.staffCode
+          ) t ON ta.userId = t.staffCode
+        LEFT JOIN (
+            SELECT
+                CONCAT(staffName, '——汇总' ) billName,
+                staffName,
+                SUM( orderFee ) inCashInMoney,
+                COUNT(1) inCashOrderCount
+            FROM
+                tb_pluss_member_order
+            WHERE
+                orderType = 1
+              AND rechargeType = 1
+              AND orderStatus = 1
+              AND merchantCode = #{merchantCode}
+              AND createDt BETWEEN #{startDate} AND #{endDate}
+            GROUP BY
+                CONCAT(staffName, '——汇总' ),
+                staffName
+            UNION
+            SELECT
+                CONCAT(staffName, DATE_FORMAT( createDt, '——%Y-%m-%d' )) billName,
+                staffName,
+                SUM( orderFee ) inCashMoney,
+                COUNT(1) inCashOrderCount
+            FROM
+                tb_pluss_member_order
+            WHERE
+                orderType = 1
+              AND rechargeType = 1
+              AND orderStatus = 1
+              AND merchantCode = #{merchantCode}
+              AND createDt BETWEEN #{startDate} AND #{endDate}
+            GROUP BY
+                CONCAT(staffName, DATE_FORMAT( createDt, '——%Y-%m-%d' )),
+                staffName
+        ) tn ON tn.staffName = ta.staffName
+                    , (
+              SELECT CONCAT(mc.channelName, '备付金') merchantChannelType
+              FROM tb_pluss_merchant_channel mc
+                       LEFT JOIN tb_pluss_merchant_channel_status mcs ON mc.id = mcs.channel
+              WHERE mcs.merchantCode = #{merchantCode}
+          ) t2
+        ORDER BY t.billName DESC;
+    </select>
+
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/BusinessInfoMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/BusinessInfoMapper.xml
new file mode 100644
index 0000000..2597b59
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/BusinessInfoMapper.xml
@@ -0,0 +1,38 @@
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.BusinessInfoMapper">
+
+    <select id="selectPage" resultType="cn.pluss.platform.vo.BusinessInfoVo">
+        SELECT ua.userId, ui.loginName, ui.phone, ui.status, ua.userName, ui.createTime, ui.updateTime,
+        pup.userName AS agentName, pup.userId AS agentId
+        FROM tb_pluss_user_app ua
+        LEFT JOIN tb_pluss_user_info ui
+        ON ua.userId = ui.id
+        LEFT JOIN tb_pluss_user_app pup
+        ON ua.parentId = pup.userId
+        WHERE ua.userType = 'agent_staff'
+        <include refid="commonWhere" />
+    </select>
+
+    <sql id="commonWhere">
+        <if test="businessInfoVo.userId != null and businessInfoVo.userId != ''">
+            AND ua.userId = #{businessInfoVo.userId}
+        </if>
+        <if test="businessInfoVo.loginName != null and businessInfoVo.loginName != ''">
+            AND ui.loginName LIKE CONCAT("%", #{businessInfoVo.loginName}, "%")
+        </if>
+        <if test="businessInfoVo.phone != null and businessInfoVo.phone != ''">
+            AND ui.phone LIKE CONCAT("%", #{businessInfoVo.phone}, "%")
+        </if>
+        <if test="businessInfoVo.userName != null and businessInfoVo.userName != ''">
+            AND ua.userName LIKE CONCAT("%", #{businessInfoVo.userName}, "%")
+        </if>
+        <if test="businessInfoVo.agentName != null and businessInfoVo.agentName != ''">
+            AND pup.userName LIKE concat('%',#{businessInfoVo.agentName},'%')
+        </if>
+        <if test="businessInfoVo.agentId != null">
+            AND pup.userId = #{businessInfoVo.agentId}
+        </if>
+    </sql>
+
+</mapper>
\ No newline at end of file
diff --git a/pluss-dao-bundle/src/main/resources/mapper/CacheInfoMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/CacheInfoMapper.xml
new file mode 100644
index 0000000..1345bce
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/CacheInfoMapper.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.CacheInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.CacheInfo">
+        <id column="id" property="id" />
+        <result column="keyCode" property="keyCode" />
+        <result column="appId" property="appId" />
+        <result column="appSercet" property="appSercet" />
+        <result column="accessToken" property="accessToken" />
+        <result column="refreshToken" property="refreshToken" />
+        <result column="expires_in" property="expiresIn" />
+        <result column="createTime" property="createTime" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/Cash-sqlmap.xml b/pluss-dao-bundle/src/main/resources/mapper/Cash-sqlmap.xml
new file mode 100644
index 0000000..b0853ae
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/Cash-sqlmap.xml
@@ -0,0 +1,220 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="cn.pluss.platform.mapper.CashMapper">
+
+    <select id="queryCashPage" parameterType="java.util.Map" resultType="cn.pluss.platform.entity.Cash">
+        SELECT
+               tpc.id, tpc.userId,tpc.userName,tpc.merchantCode,tpc.merchantName,
+               IFNULL(tpc.accountNo, ca.accountNo) accountNo, IFNULL(tpc.accountName, ca.accountName) accountName,
+               tpc.cashAmt,tpc.status,tpc.reason,tpc.createDt,tpc.updateDt,tpc.cashNumber,tpc.type,
+                tpui.alias as alias from tb_pluss_cash tpc
+        LEFT JOIN tb_pluss_merchant_base_info tpui on tpui.userId = tpc.userId
+        LEFT JOIN tb_pluss_cash_account ca ON ca.userId = tpc.userId
+        <where>
+            <if test="id!= null">
+                and tpc.id = #{id}
+            </if>
+            <if test="userId!= null">
+                and tpc.userId = #{userId}
+            </if>
+            <if test="userName!= null">
+                and tpc.userName LIKE CONCAT("%",#{userName},"%")
+            </if>
+            <if test="merchantCode!= null">
+                and tpc.merchantCode = #{merchantCode}
+            </if>
+            <if test="merchantName!= null">
+                and tpc.merchantName LIKE CONCAT("%", #{merchantName},"%")
+            </if>
+            <if test="cashAmt!= null">
+                and tpc.cashAmt = #{cashAmt}
+            </if>
+            <if test="status!= null">
+                and tpc.status = #{status}
+            </if>
+            <if test="reason!= null">
+                and tpc.reason = #{reason}
+            </if>
+            <if test="createDt!= null">
+                and tpc.createDt = #{createDt}
+            </if>
+            <if test="updateDt!= null">
+                and tpc.updateDt = #{updateDt}
+            </if>
+            <if test="logo!= null">
+                and tpc.logo = #{logo}
+            </if>
+            <if test="cashNumber!= null">
+                and tpc.cashNumber = #{cashNumber}
+            </if>
+            <if test="backNo!= null">
+                and tpc.backNo = #{backNo}
+            </if>
+            <if test="backDt!= null">
+                and tpc.backDt = #{backDt}
+            </if>
+            <if test="updator!= null">
+                and tpc.updator = #{updator}
+            </if>
+            <if test="type!= null">
+                and tpc.type = #{type}
+            </if>
+            <if test="beginTime!= null">
+                and tpc.createDt &gt; #{beginTime}
+            </if>
+            <if test="endTime!= null">
+                and tpc.createDt &lt; #{endTime}
+            </if>
+            <if test="phone!= null">
+                and phone LIKE CONCAT("%", #{phone},"%")
+            </if>
+
+        </where>
+        order by tpc.id desc limit #{pageSize} offset #{offset}
+    </select>
+
+    <select id="queryCashPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+        SELECT count(*) from tb_pluss_cash tpc
+            left join tb_pluss_merchant_base_info tpui on tpui.userId = tpc.userId
+        <where>
+            <if test="id!= null">
+                and tpc.id = #{id}
+            </if>
+            <if test="userId!= null">
+                and tpc.userId = #{userId}
+            </if>
+            <if test="userName!= null">
+                and tpc.userName LIKE CONCAT("%",#{userName},"%")
+            </if>
+            <if test="merchantCode!= null">
+                and tpc.merchantCode = #{merchantCode}
+            </if>
+            <if test="merchantName!= null">
+                and tpc.merchantName LIKE CONCAT("%", #{merchantName},"%")
+            </if>
+            <if test="cashAmt!= null">
+                and tpc.cashAmt = #{cashAmt}
+            </if>
+            <if test="status!= null">
+                and tpc.status = #{status}
+            </if>
+            <if test="reason!= null">
+                and tpc.reason = #{reason}
+            </if>
+            <if test="createDt!= null">
+                and tpc.createDt = #{createDt}
+            </if>
+            <if test="updateDt!= null">
+                and tpc.updateDt = #{updateDt}
+            </if>
+            <if test="logo!= null">
+                and tpc.logo = #{logo}
+            </if>
+            <if test="cashNumber!= null">
+                and tpc.cashNumber = #{cashNumber}
+            </if>
+            <if test="backNo!= null">
+                and tpc.backNo = #{backNo}
+            </if>
+            <if test="backDt!= null">
+                and tpc.backDt = #{backDt}
+            </if>
+            <if test="updator!= null">
+                and tpc.updator = #{updator}
+            </if>
+            <if test="type!= null">
+                and tpc.type = #{type}
+            </if>
+            <if test="beginTime!= null">
+                and tpc.createDt &gt; #{beginTime}
+            </if>
+            <if test="endTime!= null">
+                and tpc.createDt &lt; #{endTime}
+            </if>
+            <if test="phone!= null">
+                and phone LIKE CONCAT("%", #{phone},"%")
+            </if>
+        </where>
+    </select>
+
+
+    <!-- 已经成功提现的金额/申请提现中的金额  粉丝分润-->
+    <select id="sumFansSuccessCash" parameterType="java.util.Map" resultType="java.lang.Double">
+        select IFNULL(sum(cashAmt), 0) as cashAmt
+        from tb_pluss_cash
+        where merchantCode = #{merchantCode}
+          and type = '0'
+          and (status = '1' OR status = '0')
+    </select>
+
+    <!-- 已经成功提现 粉丝分润-->
+    <select id="sumFansAreadlyCash" parameterType="java.util.Map" resultType="java.lang.Double">
+        select sum(cashAmt) as cashAmt
+        from tb_pluss_cash
+        where merchantCode = #{merchantCode}
+          and type = '0'
+          and status = '1'
+    </select>
+
+    <!-- 已经成功提现的金额/申请提现中的金额 推广分润-->
+    <select id="sumMerChantSuccessCash" resultType="java.lang.Double">
+        select sum(cashAmt) as cashAmt
+        from tb_pluss_cash
+        where userId = #{userId}
+          and (status = '1' OR status = '0')
+    </select>
+
+    <!-- 已经成功提现 推广分润 -->
+    <select id="sumMerChantAreadlyCash" resultType="java.lang.Double">
+        select sum(cashAmt) as cashAmt
+        from tb_pluss_cash
+        where userId = #{userId}
+          and type = '1'
+          and status = '1'
+    </select>
+
+    <select id="queryCashPage2" resultType="cn.pluss.platform.entity.Cash">
+        SELECT tpc.*, cr.remark, tpui.aliAccount,tpui.alias as alias, ui.phone phone, t2.cashTotalAmt from tb_pluss_cash tpc
+        left join tb_pluss_merchant_base_info tpui on tpui.userId = tpc.userId
+        LEFT JOIN tb_pluss_user_info ui ON ui.id = tpc.userId
+        LEFT JOIN (
+            SELECT sum(cashAmt) cashTotalAmt,  userId FROM tb_pluss_cash
+            WHERE `status` = '1'
+            GROUP BY userId
+        ) t2 ON tpc.userId = t2.userId
+        LEFT JOIN tb_pluss_common_remark cr ON cr.userId = tpc.userId AND cr.code = 'CASH'
+        ${ew.customSqlSegment}
+    </select>
+
+    <select id="getCashCountData" parameterType="java.util.Map" resultType="java.util.Map">
+        SELECT
+            IFNULL(SUM(if(`status` = 0,cashAmt,0)),0) AS inCashAmtCount,
+            IFNULL(SUM(if(`status` = 1,cashAmt,0)),0) AS useCashAmtCount
+        FROM
+            tb_pluss_cash
+        <where>
+            <if test="startTime != null">
+                and createDt <![CDATA[>=]]> #{startTime}
+            </if>
+            <if test="endTime != null">
+                and createDt <![CDATA[<=]]> #{endTime}
+            </if>
+            <if test="userId != null and userId != ''">
+                and userId = #{userId}
+            </if>
+        </where>
+
+    </select>
+
+    <select id="selectCashAmtTotal" resultType="java.math.BigDecimal">
+        SELECT SUM(`cashAmt`) FROM tb_pluss_cash WHERE `userId` = #{userId}
+        <if test="statusArr != null and statusArr.length > 0">
+            AND `status` IN
+            <foreach collection="statusArr" separator=", " close=")" item="item" open="(">
+                #{item}
+            </foreach>
+        </if>
+    </select>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/CashAccountMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/CashAccountMapper.xml
new file mode 100644
index 0000000..239295a
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/CashAccountMapper.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.CashAccountMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.CashAccount">
+        <id column="id" property="id" />
+        <result column=" userId" property="userId" />
+        <result column="accountNo" property="accountNo" />
+        <result column="accountName" property="accountName" />
+        <result column="status" property="status" />
+        <result column="createTime" property="createTime" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/CommonMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/CommonMapper.xml
new file mode 100644
index 0000000..fa6f841
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/CommonMapper.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="cn.pluss.platform.mapper.CommonMapper">
+
+    <resultMap id="count" type="Long" />
+</mapper>
\ No newline at end of file
diff --git a/pluss-dao-bundle/src/main/resources/mapper/CommonRemarkMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/CommonRemarkMapper.xml
new file mode 100644
index 0000000..6b38bd6
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/CommonRemarkMapper.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.CommonRemarkMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.CommonRemark">
+        <id column="id" property="id" />
+        <result column="userId" property="userId" />
+        <result column="remark" property="remark" />
+        <result column="dataId" property="dataId" />
+        <result column="code" property="code" />
+        <result column="createTime" property="createTime" />
+        <result column="updateTime" property="updateTime" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/Device-sqlmap.xml b/pluss-dao-bundle/src/main/resources/mapper/Device-sqlmap.xml
new file mode 100644
index 0000000..39b546e
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/Device-sqlmap.xml
@@ -0,0 +1,352 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+			"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="cn.pluss.platform.mapper.DeviceMapper">
+
+	   	<insert id="saveDevice" parameterType="cn.pluss.platform.entity.Device">
+        	insert into tb_pluss_device(name,type,introDesc,seq,status,createDt,matNo,venderName,venderModel,aisleModel,inventory,unitPrice,deviceLogo,venderCode,detail)VALUES(#{name},#{type},#{introDesc},#{seq},#{status},NOW(),#{matNo},#{venderName},#{venderModel},#{aisleModel},#{inventory},#{unitPrice},#{deviceLogo},#{venderCode},#{detail})
+    	</insert>
+
+	   	<insert id="saveDeviceBatch">
+        	insert into tb_pluss_device(name,type,introDesc,seq,status,createDt) VALUES 
+    			<foreach collection="list" item="item" index="index" separator=",">
+			(#{name},#{type},#{introDesc},#{seq},#{status},#{createDt}		)
+				</foreach>
+    	</insert>
+
+		<select id="queryDevice" parameterType="cn.pluss.platform.entity.Device" resultType="cn.pluss.platform.entity.Device">
+			SELECT * from tb_pluss_device 
+				<where> 
+					<if test="id!= null"> 
+					 	and id = #{id}
+					 </if> 
+					<if test="name!= null"> 
+					 	and name = #{name}
+					 </if> 
+					<if test="type!= null"> 
+					 	and type = #{type}
+					 </if> 
+					<if test="introDesc!= null"> 
+					 	and introDesc = #{introDesc}
+					 </if> 
+					<if test="seq!= null"> 
+					 	and seq = #{seq}
+					 </if> 
+					<if test="status!= null"> 
+					 	and status = #{status}
+					 </if> 
+					<if test="createDt!= null"> 
+					 	and createDt = #{createDt}
+					 </if> 
+					<if test="matNo!= null"> 
+					 	and matNo = #{matNo}
+					 </if> 
+					 <if test="venderName!= null"> 
+                        and venderName = #{venderName}
+                     </if> 
+                    <if test="venderModel!= null"> 
+                        and venderModel = #{venderModel}
+                     </if> 
+                    <if test="aisleModel!= null"> 
+                        and aisleModel = #{aisleModel}
+                     </if> 
+                    <if test="inventory!= null"> 
+                        and inventory = #{inventory}
+                     </if> 
+                    <if test="unitPrice!= null"> 
+                        and unitPrice = #{unitPrice}
+                     </if> 
+                    <if test="deviceLogo!= null"> 
+                        and deviceLogo = #{deviceLogo}
+                     </if> 
+                    <if test="venderCode!= null"> 
+                        and venderCode = #{venderCode}
+                     </if> 
+                    <if test="detail!= null"> 
+                        and detail = #{detail}
+                     </if> 
+				 </where> 
+		</select>
+
+		<select id="queryDeviceList" parameterType="cn.pluss.platform.entity.Device" resultType="cn.pluss.platform.entity.Device">
+			SELECT * from tb_pluss_device 
+				<where> 
+					<if test="id!= null"> 
+					 and 	id = #{id}
+					 </if> 
+					<if test="name!= null"> 
+					 and 	name = #{name}
+					 </if> 
+					<if test="type!= null"> 
+					 and 	type = #{type}
+					 </if> 
+					<if test="introDesc!= null"> 
+					 and 	introDesc = #{introDesc}
+					 </if> 
+					<if test="seq!= null"> 
+					 and 	seq = #{seq}
+					 </if> 
+					<if test="status!= null"> 
+					 and 	status = #{status}
+					 </if> 
+					<if test="createDt!= null"> 
+					 and 	createDt = #{createDt}
+					 </if> 
+					 <if test="matNo!= null"> 
+                        and matNo = #{matNo}
+                     </if>
+                      <if test="venderName!= null"> 
+                        and venderName = #{venderName}
+                     </if> 
+                    <if test="venderModel!= null"> 
+                        and venderModel = #{venderModel}
+                     </if> 
+                    <if test="aisleModel!= null"> 
+                        and aisleModel = #{aisleModel}
+                     </if> 
+                    <if test="inventory!= null"> 
+                        and inventory = #{inventory}
+                     </if> 
+                    <if test="unitPrice!= null"> 
+                        and unitPrice = #{unitPrice}
+                     </if> 
+                      <if test="deviceLogo!= null"> 
+                        and deviceLogo = #{deviceLogo}
+                     </if>
+                     <if test="venderCode!= null"> 
+                        and venderCode = #{venderCode}
+                     </if>
+                     <if test="detail!= null"> 
+                        and detail = #{detail}
+                     </if> 
+				 </where> 
+		</select>
+
+		<update id="updateDevice" parameterType="cn.pluss.platform.entity.Device" >
+			update tb_pluss_device 
+				  <set> 
+					<if test="name!= null"> 
+					 	name = #{name},
+					 </if> 
+					<if test="type!= null"> 
+					 	type = #{type},
+					 </if> 
+					<if test="introDesc!= null"> 
+					 	introDesc = #{introDesc},
+					 </if> 
+					<if test="seq!= null"> 
+					 	seq = #{seq},
+					 </if> 
+					<if test="status!= null"> 
+					 	status = #{status},
+					 </if> 
+					<if test="createDt!= null"> 
+					 	createDt = #{createDt},
+					 </if> 
+					 <if test="matNo!= null"> 
+                         matNo = #{matNo},
+                     </if>
+                      <if test="venderName!= null"> 
+                         venderName = #{venderName},
+                     </if> 
+                    <if test="venderModel!= null"> 
+                         venderModel = #{venderModel},
+                     </if> 
+                    <if test="aisleModel!= null"> 
+                         aisleModel = #{aisleModel},
+                     </if> 
+                    <if test="inventory!= null"> 
+                         inventory = #{inventory},
+                     </if> 
+                    <if test="unitPrice!= null"> 
+                         unitPrice = #{unitPrice},
+                     </if> 
+                      <if test="deviceLogo!= null"> 
+                         deviceLogo = #{deviceLogo},
+                     </if>
+                     <if test="venderCode!= null"> 
+                         venderCode = #{venderCode},
+                     </if>
+                     <if test="detail!= null"> 
+                         detail = #{detail}
+                     </if> 
+				</set>
+			where id=#{id} 
+		</update>
+
+		<delete id="deleteDevice" parameterType="cn.pluss.platform.entity.Device" >
+			DELETE FROM tb_pluss_device where id=#{id}
+		</delete>
+
+		<select id="queryDevicePage" parameterType="java.util.Map" resultType="cn.pluss.platform.entity.Device">
+			SELECT * from tb_pluss_device 
+				<where> 
+					<if test="id!= null"> 
+					and id = #{id}
+					 </if> 
+					<if test="name!= null and name!=''"> 
+					and name LIKE CONCAT('%',#{name},'%')
+					 </if> 
+					<if test="type!= null"> 
+					and type = #{type}
+					 </if> 
+					<if test="introDesc!= null"> 
+					and introDesc = #{introDesc}
+					 </if> 
+					<if test="seq!= null"> 
+					and seq = #{seq}
+					 </if> 
+					<if test="status!= null">
+					and status = #{status}
+					 </if> 
+					<if test="createDt!= null"> 
+					and createDt = #{createDt}
+					 </if> 
+					 <if test="matNo!= null"> 
+                        and matNo = #{matNo}
+                     </if>
+                      <if test="venderName!= null and venderName!=''"> 
+                        and venderName LIKE CONCAT('%',#{venderName},'%') 
+                     </if> 
+                    <if test="venderModel!= null and venderModel!=''"> 
+                        and venderModel LIKE CONCAT('%',#{venderModel},'%') 
+                     </if> 
+                    <if test="aisleModel!= null"> 
+                        and aisleModel = #{aisleModel}
+                     </if> 
+                    <if test="inventory!= null"> 
+                        and inventory = #{inventory}
+                     </if> 
+                    <if test="unitPrice!= null"> 
+                        and unitPrice = #{unitPrice}
+                     </if> 
+                     <if test="startTime!= null and startTime!=''"> 
+                         <![CDATA[
+                            and  DATE_FORMAT(createDt, '%Y-%m-%d %H:%i:%S')>=DATE_FORMAT(#{startTime}, '%Y-%m-%d %H:%i:%S')
+                         ]]>
+                     </if> 
+                    <if test="endTime!= null and endTime!=''"> 
+                         <![CDATA[
+                            and  DATE_FORMAT(createDt, '%Y-%m-%d %H:%i:%S')<=DATE_FORMAT(#{endTime}, '%Y-%m-%d %H:%i:%S')
+                         ]]>
+                     </if> 
+                      <if test="deviceLogo!= null"> 
+                        and deviceLogo = #{deviceLogo}
+                     </if>
+                     <if test="venderCode!= null"> 
+                        and venderCode = #{venderCode}
+                     </if>
+                     <if test="detail!= null"> 
+                        and detail = #{detail}
+                     </if> 
+				 </where> 
+			order by seq asc  limit #{pageSize}  offset  #{offset}  
+		</select>
+
+		<select id="queryDevicePageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+			SELECT count(*) from tb_pluss_device 
+					<where> 
+					<if test="id!= null"> 
+					 and id = #{id}
+					 </if> 
+					<if test="name!= null and name!=''.toString"> 
+					 and name LIKE CONCAT('%',#{name},'%')
+					 </if> 
+					<if test="type!= null"> 
+					 and type = #{type}
+					 </if> 
+					<if test="introDesc!= null"> 
+					 and introDesc = #{introDesc}
+					 </if> 
+					<if test="seq!= null"> 
+					 and seq = #{seq}
+					 </if> 
+					<if test="status!= null">
+						and status = #{status}
+					</if>
+					 
+					 <if test="startTime!= null and startTime!=''"> 
+                         <![CDATA[
+                            and  DATE_FORMAT(createDt, '%Y-%m-%d %H:%i:%S')>=DATE_FORMAT(#{startTime}, '%Y-%m-%d %H:%i:%S')
+                         ]]>
+                     </if> 
+                    <if test="endTime!= null and endTime!=''"> 
+                         <![CDATA[
+                            and  DATE_FORMAT(createDt, '%Y-%m-%d %H:%i:%S')<=DATE_FORMAT(#{endTime}, '%Y-%m-%d %H:%i:%S')
+                         ]]>
+                     </if>  
+					<if test="createDt!= null"> 
+					 and createDt = #{createDt}
+					 </if>
+					 <if test="matNo!= null"> 
+                        and matNo = #{matNo}
+                     </if> 
+                      <if test="venderName!= null and venderName!=''">
+                        and venderName LIKE CONCAT('%',#{venderName},'%') 
+                     </if> 
+                    <if test="venderModel!= null and venderModel!='' "> 
+                        and venderModel LIKE CONCAT('%',#{venderModel},'%') 
+                     </if> 
+                    <if test="aisleModel!= null"> 
+                        and aisleModel = #{aisleModel}
+                     </if> 
+                    <if test="inventory!= null"> 
+                        and inventory = #{inventory}
+                     </if> 
+                    <if test="unitPrice!= null"> 
+                        and unitPrice = #{unitPrice}
+                     </if> 
+                      <if test="deviceLogo!= null"> 
+                        and deviceLogo = #{deviceLogo}
+                     </if>
+                     <if test="venderCode!= null"> 
+                        and venderCode = #{venderCode}
+                     </if>
+                     <if test="detail!= null"> 
+                        and detail = #{detail}
+                     </if> 
+				</where>
+		</select>
+
+		<select id="pageDate" resultType="cn.pluss.platform.entity.Device">
+				SELECT id,`name`,matNo,deviceLogo,`type`,introDesc,seq,`status`,
+					createDt,venderName,venderCode,venderModel,aisleModel,inventory,unitPrice,detail
+				FROM tb_pluss_device
+				<where>
+					<if test="device.id!= null">
+						and id = #{device.id}
+					</if>
+					<if test="device.name != null  and device.name !=''.toString ">
+						and name LIKE CONCAT('%',#{device.name},'%')
+					</if>
+					<if test="device.venderName!= null and device.venderName!=''">
+						and venderName LIKE CONCAT('%',#{device.venderName},'%')
+					</if>
+					<if test="device.venderModel!= null and device.venderModel!='' ">
+						and venderModel LIKE CONCAT('%',#{device.venderModel},'%')
+					</if>
+					<if test="device.status!= null">
+						and status = #{device.status}
+					</if>
+					<if test="device.startTime != null">
+						and createDt &gt;= #{device.startTime}
+					</if>
+					<if test="device.endTime!= null">
+						and createDt &lt;= #{device.endTime}
+					</if>
+				</where>
+		</select>
+
+		<select id="getDeviceId" resultType="cn.pluss.platform.entity.Device">
+			SELECT id,`name`,matNo,deviceLogo,`type`,introDesc,seq,`status`,
+					createDt,venderName,venderCode,venderModel,aisleModel,inventory,unitPrice,detail
+			FROM tb_pluss_device
+			<where>
+				<if test="id!= null">
+					and id = #{id}
+				</if>
+			</where>
+		</select>
+
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/DeviceBsjMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/DeviceBsjMapper.xml
new file mode 100644
index 0000000..dcc90cb
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/DeviceBsjMapper.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.DeviceBsjMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.DeviceBsj">
+        <id column="snNo" property="snNo"/>
+        <result column="deviceNo" property="deviceNo"/>
+        <result column="imei" property="imei"/>
+        <result column="iccid" property="iccid"/>
+        <result column="sim" property="sim"/>
+        <result column="simExpireTime" property="simExpireTime"/>
+    </resultMap>
+
+    <select id="selectLastMonthExpiredData" resultType="java.util.Map">
+        SELECT ds.snNo, mbi.alias, ua.userId
+        FROM tb_pluss_device_bsj dbsj
+                 LEFT JOIN tb_pluss_device_stock ds ON dbsj.snNo = ds.snNo
+                 LEFT JOIN tb_pluss_merchant_base_info mbi ON mbi.id = ds.actMercId
+                 LEFT JOIN tb_pluss_user_app ua ON ua.userId = mbi.userId
+        WHERE dbsj.simExpireTime &lt;= DATE_ADD(CURRENT_TIMESTAMP, INTERVAL 1 MONTH)
+    </select>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/DeviceDetailMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/DeviceDetailMapper.xml
new file mode 100644
index 0000000..0c977b4
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/DeviceDetailMapper.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.DeviceDetailMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.DeviceDetail">
+        <id column="id" property="id"/>
+        <result column="code" property="code"/>
+        <result column="venderCode" property="venderCode"/>
+        <result column="deviceLogo" property="deviceLogo"/>
+        <result column="venderName" property="venderName"/>
+        <result column="venderModel" property="venderModel"/>
+        <result column="aisleModel" property="aisleModel"/>
+        <result column="type" property="type"/>
+        <result column="typeDesc" property="typeDesc"/>
+        <result column="groupNo" property="groupNo"/>
+        <result column="introDesc" property="introDesc"/>
+        <result column="seq" property="seq"/>
+        <result column="status" property="status"/>
+        <result column="createDt" property="createDt"/>
+        <result column="unitPrice" property="unitPrice"/>
+        <result column="detail" property="detail"/>
+    </resultMap>
+
+    <select id="selectListWithStock" resultType="cn.pluss.platform.entity.DeviceDetail">
+        SELECT dd.id, dd.code, dd.venderCode, dd.deviceLogo, dd.venderName, dd.venderModel,
+            dd.aisleModel, dd.type, dd.groupNo, dd.size, dd.introDesc, dd.seq, dd.status, dd.createDt, dd.unitPrice,
+            dd.wholesalePrice, dd.wholesaleMinNum, dd.detail, ds.specName typeDesc
+        FROM tb_pluss_device_detail dd
+        LEFT JOIN tb_pluss_device_spec ds ON dd.type = ds.spec AND dd.`code` = ds.`code`
+        ${ew.customSqlSegment}
+    </select>
+
+    <select id="selectListWithStockWithNoDetail" resultType="cn.pluss.platform.entity.DeviceDetail">
+        SELECT dd.id, dd.code, dd.venderCode, dd.deviceLogo, dd.venderName, dd.venderModel,
+               dd.aisleModel, dd.type, dd.groupNo, dd.size, dd.seq, dd.status, dd.createDt, dd.unitPrice,
+               dd.wholesalePrice, dd.wholesaleMinNum, dd.introDesc, ds.specName typeDesc
+        FROM tb_pluss_device_detail dd
+                 LEFT JOIN tb_pluss_device_spec ds ON dd.type = ds.spec AND dd.`code` = ds.`code`
+            ${ew.customSqlSegment}
+    </select>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/DeviceGoodTagMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/DeviceGoodTagMapper.xml
new file mode 100644
index 0000000..0ceb0e1
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/DeviceGoodTagMapper.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.DeviceGoodTagMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.DeviceGoodTag">
+        <id column="id" property="id" />
+        <result column="tag" property="tag" />
+        <result column="sort" property="sort" />
+        <result column="createTime" property="createTime" />
+        <result column="updateTime" property="updateTime" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/DeviceGoodsMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/DeviceGoodsMapper.xml
new file mode 100644
index 0000000..dda6a18
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/DeviceGoodsMapper.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.DeviceGoodsMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.DeviceGoods">
+        <id column="id" property="id" />
+        <result column="code" property="code" />
+        <result column="name" property="name" />
+        <result column="deviceLogo" property="deviceLogo" />
+        <result column="introDesc" property="introDesc" />
+        <result column="sort" property="sort" />
+        <result column="status" property="status" />
+        <result column="createTime" property="createTime" />
+        <result column="updateTime" property="updateTime" />
+    </resultMap>
+
+    <select id="selectBySn" resultType="cn.pluss.platform.entity.DeviceGoods">
+        SELECT * FROM tb_pluss_device_goods dg LEFT JOIN tb_pluss_device_stock ds
+        ON dg.code = ds.code WHERE ds.snNo = #{snNo}
+    </select>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/DeviceMerchantBuy-sqlmap.xml b/pluss-dao-bundle/src/main/resources/mapper/DeviceMerchantBuy-sqlmap.xml
new file mode 100644
index 0000000..4085950
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/DeviceMerchantBuy-sqlmap.xml
@@ -0,0 +1,539 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="cn.pluss.platform.mapper.DeviceMerchantBuyMapper">
+
+    <insert id="saveDeviceMerchantBuy" parameterType="cn.pluss.platform.entity.DeviceMerchantBuy">
+        insert into tb_pluss_device_merchant_buy(orderNo, transNo, merchantCode, merchantName, venderModel, status,
+                                                 payCode, payName, createDt, transDt, refundNo, refundDt, expressNo,
+                                                 provinces, address, orderAmount, quantity, linkName, linkPhone,
+                                                 venderCode, email, snNo,logistNo)
+        VALUES (#{orderNo}, #{transNo}, #{merchantCode}, #{merchantName}, #{venderModel}, #{status}, #{payCode},
+                #{payName}, now(), #{transDt}, #{refundNo}, #{refundDt}, #{expressNo}, #{provinces}, #{address},
+                #{orderAmount}, #{quantity}, #{linkName}, #{linkPhone}, #{venderCode}, #{email}, #{snNo},#{logistNo})
+    </insert>
+
+    <insert id="saveDeviceMerchantBuyBatch">
+        insert into
+        tb_pluss_device_merchant_buy(orderNo,transNo,merchantCode,merchantName,venderModel,status,payCode,payName,createDt,transDt,refundNo,snNo,logistNo)
+        VALUES
+        <foreach collection="list" item="item" index="index" separator=",">
+            (#{orderNo},#{transNo},#{merchantCode},#{merchantName},#{venderModel},#{status},#{payCode},#{payName},#{createDt},#{transDt},#{refundNo},#{snNo},#{logistNo})
+        </foreach>
+    </insert>
+
+    <select id="queryDeviceMerchantBuy" parameterType="cn.pluss.platform.entity.DeviceMerchantBuy"
+            resultType="cn.pluss.platform.entity.DeviceMerchantBuy">
+        SELECT * from tb_pluss_device_merchant_buy
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="orderNo!= null">
+                and orderNo = #{orderNo}
+            </if>
+            <if test="transNo!= null">
+                and transNo = #{transNo}
+            </if>
+            <if test="merchantCode!= null">
+                and merchantCode = #{merchantCode}
+            </if>
+            <if test="merchantName!= null">
+                and merchantName = #{merchantName}
+            </if>
+            <if test="venderModel!= null">
+                and venderModel = #{venderModel}
+            </if>
+            <if test="status!= null">
+                and status = #{status}
+            </if>
+            <if test="payCode!= null">
+                and payCode = #{payCode}
+            </if>
+            <if test="payName!= null">
+                and payName = #{payName}
+            </if>
+            <if test="createDt!= null">
+                and createDt = #{createDt}
+            </if>
+            <if test="transDt!= null">
+                and transDt = #{transDt}
+            </if>
+            <if test="refundNo!= null">
+                and refundNo = #{refundNo}
+            </if>
+            <if test="refundDt!= null">
+                and refundDt = #{refundDt}
+            </if>
+            <if test="expressNo!= null">
+                and expressNo = #{expressNo}
+            </if>
+            <if test="provinces!= null">
+                and provinces = #{provinces}
+            </if>
+            <if test="address!= null">
+                and address = #{address}
+            </if>
+            <if test="orderAmount!= null">
+                and orderAmount = #{orderAmount}
+            </if>
+
+            <if test="quantity!= null">
+                and quantity = #{quantity}
+            </if>
+            <if test="linkName!= null">
+                and linkName = #{linkName}
+            </if>
+            <if test="linkPhone!= null">
+                and linkPhone = #{linkPhone}
+            </if>
+            <if test="venderCode!= null">
+                and venderCode = #{venderCode}
+            </if>
+            <if test="email!= null">
+                and email = #{email}
+            </if>
+            <if test="actStatus != null">
+                and actStatus = #{actStatus}
+            </if>
+            <if test="snNo != null">
+                and snNo = #{snNo}
+            </if>
+
+            <if test="logistNo != null">
+                and logistNo = #{logistNo}
+            </if>
+
+        </where>
+    </select>
+
+    <select id="queryDeviceMerchantBuyList" parameterType="cn.pluss.platform.entity.DeviceMerchantBuy"
+            resultType="cn.pluss.platform.entity.DeviceMerchantBuy">
+        SELECT * from tb_pluss_device_merchant_buy
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="orderNo!= null">
+                and orderNo = #{orderNo}
+            </if>
+            <if test="transNo!= null">
+                and transNo = #{transNo}
+            </if>
+            <if test="merchantCode!= null">
+                and merchantCode = #{merchantCode}
+            </if>
+            <if test="merchantName!= null">
+                and merchantName = #{merchantName}
+            </if>
+            <if test="venderModel!= null">
+                and venderModel = #{venderModel}
+            </if>
+            <if test="status!= null">
+                and status = #{status}
+            </if>
+            <if test="payCode!= null">
+                and payCode = #{payCode}
+            </if>
+            <if test="payName!= null">
+                and payName = #{payName}
+            </if>
+            <if test="createDt!= null">
+                and createDt = #{createDt}
+            </if>
+            <if test="startTime != null">
+                and createDt > #{startTime}
+            </if>
+            <if test="endTime != null">
+                and createDt <![CDATA[ <= ]]> #{endTime}
+            </if>
+            <if test="transDt!= null">
+                and transDt = #{transDt}
+            </if>
+            <if test="refundNo!= null">
+                and refundNo = #{refundNo}
+            </if>
+            <if test="refundDt!= null">
+                and refundDt = #{refundDt}
+            </if>
+            <if test="expressNo!= null">
+                and expressNo = #{expressNo}
+            </if>
+            <if test="provinces!= null">
+                and provinces = #{provinces}
+            </if>
+            <if test="address!= null">
+                and address = #{address}
+            </if>
+            <if test="orderAmount!= null">
+                and orderAmount = #{orderAmount}
+            </if>
+            <if test="quantity!= null">
+                and quantity = #{quantity}
+            </if>
+            <if test="linkName!= null">
+                and linkName = #{linkName}
+            </if>
+            <if test="linkPhone!= null">
+                and linkPhone = #{linkPhone}
+            </if>
+            <if test="venderCode!= null">
+                and venderCode = #{venderCode}
+            </if>
+            <if test="email!= null">
+                and email = #{email}
+            </if>
+            <if test="actStatus!= null">
+                and actStatus = #{actStatus}
+            </if>
+            <if test="snNo!= null">
+                and snNo = #{snNo}
+            </if>
+            <if test="logistNo!= null">
+                and logistNo = #{logistNo}
+            </if>
+
+        </where>
+    </select>
+
+    <update id="updateDeviceMerchantBuy" parameterType="cn.pluss.platform.entity.DeviceMerchantBuy">
+        update tb_pluss_device_merchant_buy
+        <set>
+            <if test="orderNo!= null">
+                orderNo = #{orderNo},
+            </if>
+            <if test="transNo!= null">
+                transNo = #{transNo},
+            </if>
+            <if test="merchantCode!= null">
+                merchantCode = #{merchantCode},
+            </if>
+            <if test="merchantName!= null">
+                merchantName = #{merchantName},
+            </if>
+            <if test="venderModel!= null">
+                venderModel = #{venderModel},
+            </if>
+            <if test="status!= null">
+                status = #{status},
+            </if>
+            <if test="payCode!= null">
+                payCode = #{payCode},
+            </if>
+            <if test="payName!= null">
+                payName = #{payName},
+            </if>
+            <if test="createDt!= null">
+                createDt = #{createDt},
+            </if>
+            <if test="transDt!= null">
+                transDt = #{transDt},
+            </if>
+            <if test="refundNo!= null">
+                refundNo = #{refundNo},
+            </if>
+            <if test="refundDt!= null">
+                refundDt = #{refundDt},
+            </if>
+
+            <if test="expressNo!= null">
+                expressNo = #{expressNo},
+            </if>
+            <if test="provinces!= null">
+                provinces = #{provinces},
+            </if>
+            <if test="address!= null">
+                address = #{address},
+            </if>
+            <if test="orderAmount!= null">
+                orderAmount = #{orderAmount},
+            </if>
+            <if test="quantity!= null">
+                quantity = #{quantity},
+            </if>
+            <if test="linkName!= null">
+                linkName = #{linkName},
+            </if>
+            <if test="linkPhone!= null">
+                linkPhone = #{linkPhone},
+            </if>
+            <if test="venderCode!= null">
+                venderCode = #{venderCode},
+            </if>
+            <if test="email!= null">
+                email = #{email},
+            </if>
+            <if test="actStatus!= null">
+                actStatus = #{actStatus},
+            </if>
+            <if test="snNo!= null">
+                snNo = #{snNo},
+            </if>
+            <if test="logistNo!= null">
+                logistNo = #{logistNo}
+            </if>
+
+        </set>
+        where id=#{id}
+    </update>
+
+    <delete id="deleteDeviceMerchantBuy" parameterType="cn.pluss.platform.entity.DeviceMerchantBuy">
+        DELETE
+        FROM tb_pluss_device_merchant_buy
+        where id = #{id}
+    </delete>
+
+    <select id="queryDeviceMerchantBuyPage" parameterType="java.util.Map"
+            resultType="cn.pluss.platform.entity.DeviceMerchantBuy">
+        SELECT dmb.*,mbi.alias,doi.userId, dg.`name`,doi.deviceType
+        from tb_pluss_device_merchant_buy dmb
+        LEFT JOIN tb_pluss_merchant_base_info mbi on mbi.merchantCode = dmb.merchantCode
+        LEFT JOIN tb_pluss_device_order_info doi ON doi.orderNo = dmb.orderNo
+        LEFT JOIN tb_pluss_qr_code qc on dmb.orderNo = qc.orderNo
+        LEFT JOIN tb_pluss_device_detail dd ON dd.type = doi.deviceType AND dd.`code` = doi.`code`
+        LEFT JOIN tb_pluss_device_goods dg ON dg.`code` = dd.`code`
+        <where>
+            <if test="id!= null">
+                and dmb.id = #{id}
+            </if>
+            <if test="alias!=null">
+                and mbi.alias like concat("%",#{alias},"%")
+            </if>
+            <if test="userId != null and userId != ''">
+                and mbi.userId = #{userId}
+            </if>
+            <if test="orderNo!= null and orderNo!=''">
+                and dmb.orderNo LIKE CONCAT('%',#{orderNo},'%')
+            </if>
+            <if test="transNo!= null and transNo!=''">
+                and dmb.transNo LIKE CONCAT('%',#{transNo},'%')
+            </if>
+            <if test="merchantCode!= null">
+                and dmb.merchantCode = #{merchantCode}
+            </if>
+            <if test="merchantName!= null and merchantName!=''">
+                and dmb.merchantName LIKE CONCAT('%',#{merchantName},'%')
+            </if>
+            <if test="venderModel!= null">
+                and dmb.venderModel = #{venderModel}
+            </if>
+            <if test="status!= null and status!=''">
+                and dmb.status = #{status}
+            </if>
+            <if test="payCode!= null">
+                and dmb.payCode = #{payCode}
+            </if>
+            <if test="payName!= null">
+                and dmb.payName = #{payName}
+            </if>
+            <if test="startTime!= null and startTime!=''">
+                <![CDATA[
+                            and  DATE_FORMAT(dmb.createDt, '%Y-%m-%d %H:%i:%S')>=DATE_FORMAT(#{startTime}, '%Y-%m-%d %H:%i:%S')
+                         ]]>
+            </if>
+            <if test="endTime!= null and endTime!=''">
+                <![CDATA[
+                            and  DATE_FORMAT(dmb.createDt, '%Y-%m-%d %H:%i:%S')<=DATE_FORMAT(#{endTime}, '%Y-%m-%d %H:%i:%S')
+                         ]]>
+            </if>
+
+            <if test="createDt!= null">
+                and dmb.createDt = #{createDt}
+            </if>
+            <if test="transDt!= null">
+                and dmb.transDt = #{transDt}
+            </if>
+            <if test="refundNo!= null">
+                and dmb.refundNo = #{refundNo}
+            </if>
+            <if test="refundDt!= null">
+                and dmb.refundDt = #{refundDt}
+            </if>
+            <if test="expressNo!= null">
+                and dmb.expressNo = #{expressNo}
+            </if>
+            <if test="provinces!= null">
+                and dmb.provinces = #{provinces}
+            </if>
+            <if test="address!= null">
+                and dmb.address = #{address}
+            </if>
+            <if test="orderAmount!= null">
+                and dmb.orderAmount = #{orderAmount}
+            </if>
+            <if test="quantity!= null">
+                and dmb.quantity = #{quantity}
+            </if>
+            <if test="linkName!= null">
+                and dmb.linkName = #{linkName}
+            </if>
+            <if test="linkPhone!= null">
+                and dmb.linkPhone = #{linkPhone}
+            </if>
+            <if test="venderCode!= null">
+                and dmb.venderCode = #{venderCode}
+            </if>
+            <if test="email!= null">
+                and dmb.email = #{email}
+            </if>
+            <if test="actStatus != null ">
+                and dmb.actStatus = #{actStatus}
+            </if>
+            <if test="snNo != null">
+                and dmb.snNo = #{snNo}
+            </if>
+
+        </where>
+        order by id desc limit #{pageSize} offset #{offset}
+    </select>
+
+    <select id="queryDeviceMerchantBuyPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+        SELECT count(*) from tb_pluss_device_merchant_buy dmb LEFT JOIN tb_pluss_merchant_base_info mbi on
+        mbi.merchantCode = dmb.merchantCode
+        <where>
+            <if test="id!= null">
+                and dmb.id = #{id}
+            </if>
+            <if test="alias!= null">
+                and mbi.alias like concat("%",#{alias},"%")
+            </if>
+
+            <if test="orderNo!= null and orderNo!=''">
+                and dmb.orderNo LIKE CONCAT('%',#{orderNo},'%')
+            </if>
+            <if test="transNo!= null and transNo!=''">
+                and dmb.transNo LIKE CONCAT('%',#{transNo},'%')
+            </if>
+            <if test="merchantCode!= null">
+                and dmb.merchantCode = #{merchantCode}
+            </if>
+            <if test="merchantName!= null and merchantName!=''">
+                and dmb.merchantName LIKE CONCAT('%',#{merchantName},'%')
+            </if>
+            <if test="venderModel!= null">
+                and dmb.venderModel = #{venderModel}
+            </if>
+            <if test="status!= null and status!=''">
+                and dmb.status = #{status}
+            </if>
+            <if test="payCode!= null">
+                and dmb.payCode = #{payCode}
+            </if>
+            <if test="payName!= null">
+                and dmb.payName = #{payName}
+            </if>
+
+            <if test="startTime!= null and startTime!=''">
+                <![CDATA[
+                            and  DATE_FORMAT(dmb.createDt, '%Y-%m-%d %H:%i:%S')>=DATE_FORMAT(#{startTime}, '%Y-%m-%d %H:%i:%S')
+                         ]]>
+            </if>
+            <if test="endTime!= null and endTime!=''">
+                <![CDATA[
+                            and  DATE_FORMAT(dmb.createDt, '%Y-%m-%d %H:%i:%S')<=DATE_FORMAT(#{endTime}, '%Y-%m-%d %H:%i:%S')
+                         ]]>
+            </if>
+
+            <if test="createDt!= null">
+                and dmb.createDt = #{createDt}
+            </if>
+            <if test="transDt!= null">
+                and dmb.transDt = #{transDt}
+            </if>
+            <if test="refundNo!= null">
+                and dmb.refundNo = #{refundNo}
+            </if>
+            <if test="refundDt!= null">
+                and dmb.refundDt = #{refundDt}
+            </if>
+            <if test="expressNo!= null">
+                and dmb.expressNo = #{expressNo}
+            </if>
+            <if test="provinces!= null">
+                and dmb.provinces = #{provinces}
+            </if>
+            <if test="address!= null">
+                and dmb.address = #{address}
+            </if>
+            <if test="orderAmount!= null">
+                and dmb.orderAmount = #{orderAmount}
+            </if>
+            <if test="quantity!= null">
+                and dmb.quantity = #{quantity}
+            </if>
+            <if test="linkName!= null">
+                and dmb.linkName = #{linkName}
+            </if>
+            <if test="linkPhone!= null">
+                and dmb.linkPhone = #{linkPhone}
+            </if>
+            <if test="venderCode!= null">
+                and dmb.venderCode = #{venderCode}
+            </if>
+            <if test="email!= null">
+                and dmb.email = #{email}
+            </if>
+            <if test="actStatus != null ">
+                and dmb.actStatus = #{actStatus}
+            </if>
+            <if test="snNo != null">
+                and dmb.snNo = #{snNo}
+            </if>
+
+        </where>
+    </select>
+
+    <select id="deviceOrderShowPage" parameterType="java.util.Map"
+            resultType="cn.pluss.platform.vo.DeviceMerchantBuyVO">
+        SELECT dmb.orderNo as orderNo,(dmb.orderAmount / dmb.quantity) as unitPrice,dmb.transNo as
+        transNo,dmb.orderAmount as orderAmount,dmb.quantity as quantity,dmb.merchantName as merchantName,dmb.venderModel
+        as venderModel,dmb.payCode as payCode,dmb.payName as payName,
+        dmb.createDt as createDt,dmb.transDt as transDt,dmb.provinces as provinces,dmb.address as address,dmb.linkName
+        aslinkName,dmb.linkPhone as linkPhone,dmb.expressNo as expressNo,
+        dmb.actStatus as actStatus,dmb.snNo as snNo,
+        IFNULL(pd.deviceLogo, dg.deviceLogo) as deviceLogo,
+        IFNULL(pd.introDesc, dg.introDesc) as introDesc,
+        IFNULL(pd.aisleModel, dd.aisleModel) as aisleModel,
+        IFNULL(pd.`name`, dg.`name`) as name,
+        IFNULL(pd.venderName, dd.`venderName`) as venderName,
+        doi.orderType
+        FROM tb_pluss_device_merchant_buy dmb
+        LEFT JOIN tb_pluss_device_order_info doi ON dmb.orderNo = doi.orderNo
+        LEFT JOIN tb_pluss_device pd ON dmb.venderCode=pd.venderCode
+        LEFT JOIN tb_pluss_merchant_base_info mbi ON dmb.merchantCode = mbi.merchantCode
+        LEFT JOIN tb_pluss_user_app ua ON doi.userId = ua.userId
+        LEFT JOIN tb_pluss_user_app ua2 ON mbi.userId = ua2.userId
+        LEFT JOIN tb_pluss_device_detail dd ON dd.code = doi.code AND dd.type = doi.deviceType
+        LEFT JOIN tb_pluss_device_goods dg ON dg.code = doi.code
+        <!-- 此处防止有的非商户订单 -->
+        WHERE (ua.userId = #{userId} OR ua2.userId = #{userId})
+        <if test="status!=null and status!=''">
+            and dmb.`status`= #{status}
+        </if>
+        order by dmb.id desc limit #{pageSize} offset #{offset}
+    </select>
+
+    <select id="deviceOrderShowPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+        SELECT count(dmb.id)
+        FROM tb_pluss_device_merchant_buy dmb
+        LEFT JOIN tb_pluss_device pd ON dmb.venderCode=pd.venderCode
+        LEFT JOIN tb_pluss_merchant_base_info mbi ON dmb.merchantCode=mbi.merchantCode
+        LEFT JOIN tb_pluss_user_app ua ON mbi.userId=ua.userId
+        WHERE ua.userId=#{userId}
+        <if test="status!=null and status!=''">
+            and dmb.`status`=#{status}
+        </if>
+    </select>
+
+    <select id="selectDeviceMerchantBuyPage" resultType="cn.pluss.platform.entity.DeviceMerchantBuy">
+        SELECT dmb.*, mbi.alias, doi.userId, dg.`name`, doi.deviceType
+        from tb_pluss_device_merchant_buy dmb
+                 LEFT JOIN tb_pluss_merchant_base_info mbi on mbi.merchantCode = dmb.merchantCode
+                 LEFT JOIN tb_pluss_device_order_info doi ON doi.orderNo = dmb.orderNo
+                 LEFT JOIN tb_pluss_device_detail dd ON dd.type = doi.deviceType AND dd.`code` = doi.`code`
+                 LEFT JOIN tb_pluss_device_goods dg ON dg.`code` = dd.`code`
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/DeviceMerchantBuyDetail-sqlmap.xml b/pluss-dao-bundle/src/main/resources/mapper/DeviceMerchantBuyDetail-sqlmap.xml
new file mode 100644
index 0000000..41485fe
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/DeviceMerchantBuyDetail-sqlmap.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+			"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="cn.pluss.platform.mapper.DeviceMerchantBuyDetailMapper">
+
+	   	<insert id="saveDeviceMerchantBuyDetail" parameterType="cn.pluss.platform.entity.DeviceMerchantBuyDetail">
+        	insert into tb_pluss_device_merchant_buy_detail(orderNo,soleCode)VALUES(#{orderNo},#{soleCode})
+    	</insert>
+
+	   	<insert id="saveDeviceMerchantBuyDetailBatch">
+        	insert into tb_pluss_device_merchant_buy_detail(orderNo,soleCode) VALUES 
+    			<foreach collection="list" item="item" index="index" separator=",">
+			(#{orderNo},#{soleCode}		)
+				</foreach>
+    	</insert>
+
+		<select id="queryDeviceMerchantBuyDetail" parameterType="cn.pluss.platform.entity.DeviceMerchantBuyDetail" resultType="cn.pluss.platform.entity.DeviceMerchantBuyDetail">
+			SELECT * from tb_pluss_device_merchant_buy_detail 
+				<where> 
+					<if test="id!= null"> 
+					 	and id = #{id}
+					 </if> 
+					<if test="orderNo!= null"> 
+					 	and orderNo = #{orderNo}
+					 </if> 
+					<if test="soleCode!= null"> 
+					 	and soleCode = #{soleCode}
+					 </if> 
+				 </where> 
+		</select>
+
+		<select id="queryDeviceMerchantBuyDetailList" parameterType="cn.pluss.platform.entity.DeviceMerchantBuyDetail" resultType="cn.pluss.platform.entity.DeviceMerchantBuyDetail">
+			SELECT * from tb_pluss_device_merchant_buy_detail 
+				<where> 
+					<if test="id!= null"> 
+					 and 	id = #{id}
+					 </if> 
+					<if test="orderNo!= null"> 
+					 and 	orderNo = #{orderNo}
+					 </if> 
+					<if test="soleCode!= null"> 
+					 and 	soleCode = #{soleCode}
+					 </if> 
+				 </where> 
+		</select>
+
+		<update id="updateDeviceMerchantBuyDetail" parameterType="cn.pluss.platform.entity.DeviceMerchantBuyDetail" >
+			update tb_pluss_device_merchant_buy_detail 
+				  <set> 
+					<if test="orderNo!= null"> 
+					 	orderNo = #{orderNo},
+					 </if> 
+					<if test="soleCode!= null"> 
+					 	soleCode = #{soleCode}
+					 </if> 
+				</set>
+			where id=#{id} 
+		</update>
+
+		<delete id="deleteDeviceMerchantBuyDetail" parameterType="cn.pluss.platform.entity.DeviceMerchantBuyDetail" >
+			DELETE FROM tb_pluss_device_merchant_buy_detail where id=#{id}
+		</delete>
+
+		<select id="queryDeviceMerchantBuyDetailPage" parameterType="java.util.Map" resultType="cn.pluss.platform.entity.DeviceMerchantBuyDetail">
+			SELECT * from tb_pluss_device_merchant_buy_detail 
+				<where> 
+					<if test="id!= null"> 
+					and id = #{id}
+					 </if> 
+					<if test="orderNo!= null"> 
+					and orderNo = #{orderNo}
+					 </if> 
+					<if test="soleCode!= null"> 
+					and soleCode = #{soleCode}
+					 </if> 
+				 </where> 
+			order by id desc  limit #{pageSize}  offset  #{offset}  
+		</select>
+
+		<select id="queryDeviceMerchantBuyDetailPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+			SELECT count(*) from tb_pluss_device_merchant_buy_detail 
+					<where> 
+					<if test="id!= null"> 
+					 and id = #{id}
+					 </if> 
+					<if test="orderNo!= null"> 
+					 and orderNo = #{orderNo}
+					 </if> 
+					<if test="soleCode!= null"> 
+					 and soleCode = #{soleCode}
+					 </if> 
+				</where>
+		</select>
+		
+		<select id="queryDeviceMerchantBuyDetailVO" resultType="cn.pluss.platform.vo.DeviceMerchantBuyDetailVO">
+		  select mbd.orderNo as orderNo,mbd.soleCode as soleCode,IFNULL(dsu.status,0) as status from tb_pluss_device_merchant_buy_detail mbd 
+		  LEFT JOIN tb_pluss_device_sign_unbind dsu  ON mbd.orderNo=dsu.orderNo and mbd.soleCode=dsu.soleCode
+		  where mbd.orderNo=#{orderNo}
+		</select>
+
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/DeviceOperateInfoMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/DeviceOperateInfoMapper.xml
new file mode 100644
index 0000000..2238bb2
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/DeviceOperateInfoMapper.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.DeviceOperateInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.DeviceOperateInfo">
+        <id column="id" property="id" />
+        <result column="deviceNo" property="deviceNo" />
+        <result column="type" property="type" />
+        <result column="userId" property="userId" />
+        <result column="createTime" property="createTime" />
+        <result column="remark" property="remark" />
+    </resultMap>
+
+    <select id="selectListVo" resultType="cn.pluss.platform.vo.DeviceOperateInfoVO">
+        SELECT doi.*,
+               ua.userName,
+               ui.phone,
+               mbi.alias as 'merchantName'
+        FROM tb_pluss_device_operate_info doi
+        left join tb_pluss_user_app ua on doi.userId = ua.userId
+        left join tb_pluss_user_info ui on  doi.userId = ui.id
+        left join tb_pluss_merchant_base_info mbi on doi.userId = mbi.userId
+        <where>
+            <if test="snNo != null and snNo != ''">
+                and deviceNo = #{snNo}
+            </if>
+        </where>
+        order by doi.id desc
+    </select>
+
+    <select id="pageInfo" resultType="cn.pluss.platform.vo.DeviceOperateInfoVO">
+        SELECT doi.*,
+        ua.userName,
+        ui.phone,
+        mbi.alias as 'merchantName'
+        FROM tb_pluss_device_operate_info doi
+        left join tb_pluss_user_app ua on doi.userId = ua.userId
+        left join tb_pluss_user_info ui on  doi.userId = ui.id
+        left join tb_pluss_merchant_base_info mbi on doi.userId = mbi.userId
+        <where>
+            <if test="condition != null and condition.deviceNo != null and condition.deviceNo != ''">
+                and doi.deviceNo = #{condition.deviceNo}
+            </if>
+        </where>
+        order by doi.id desc
+    </select>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/DeviceOrderInfoMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/DeviceOrderInfoMapper.xml
new file mode 100644
index 0000000..38f6800
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/DeviceOrderInfoMapper.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.DeviceOrderInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.DeviceOrderInfo">
+        <id column="id" property="id" />
+        <result column="orderNo" property="orderNo" />
+        <result column="userId" property="userId" />
+        <result column="code" property="code" />
+        <result column="type" property="type" />
+        <result column="groupNo" property="groupNo" />
+        <result column="num" property="num" />
+        <result column="sumPrice" property="sumPrice" />
+        <result column="createTime" property="createTime" />
+        <result column="updateTime" property="updateTime" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/DeviceSignUnbind-sqlmap.xml b/pluss-dao-bundle/src/main/resources/mapper/DeviceSignUnbind-sqlmap.xml
new file mode 100644
index 0000000..d3be150
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/DeviceSignUnbind-sqlmap.xml
@@ -0,0 +1,275 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="cn.pluss.platform.mapper.DeviceSignUnbindMapper">
+
+    <insert id="saveDeviceSignUnbind" parameterType="cn.pluss.platform.entity.DeviceSignUnbind">
+        insert into tb_pluss_device_sign_unbind(orderNo, merchantCode, merchantName, mchId, status, soleCode,
+                                                venderModel, sn, createDt, venderCode, reason)
+        VALUES (#{orderNo}, #{merchantCode}, #{merchantName}, #{mchId}, #{status}, #{soleCode}, #{venderModel}, #{sn},
+                #{createDt}, #{venderCode}, #{reason})
+    </insert>
+
+    <insert id="saveDeviceSignUnbindBatch">
+        insert into tb_pluss_device_sign_unbind(orderNo,merchantCode,merchantName,mchId,status) VALUES
+        <foreach collection="list" item="item" index="index" separator=",">
+            (#{orderNo},#{merchantCode},#{merchantName},#{mchId},#{status} )
+        </foreach>
+    </insert>
+
+    <select id="queryDeviceSignUnbind" parameterType="cn.pluss.platform.entity.DeviceSignUnbind"
+            resultType="cn.pluss.platform.entity.DeviceSignUnbind">
+        SELECT * from tb_pluss_device_sign_unbind
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="orderNo!= null">
+                and orderNo = #{orderNo}
+            </if>
+            <if test="merchantCode!= null">
+                and merchantCode = #{merchantCode}
+            </if>
+            <if test="merchantName!= null">
+                and merchantName = #{merchantName}
+            </if>
+            <if test="mchId!= null">
+                and mchId = #{mchId}
+            </if>
+            <if test="status!= null">
+                and status = #{status}
+            </if>
+
+            <if test="soleCode!= null">
+                and soleCode = #{soleCode}
+            </if>
+            <if test="venderModel!= null">
+                and venderModel = #{venderModel}
+            </if>
+            <if test="sn!= null">
+                and sn = #{sn}
+            </if>
+            <if test="createDt!= null">
+                and createDt = #{createDt}
+            </if>
+            <if test="venderCode!= null">
+                and venderCode = #{venderCode}
+            </if>
+            <if test="reason!= null">
+                and reason = #{reason}
+            </if>
+        </where>
+    </select>
+
+    <select id="queryDeviceSignUnbindList" parameterType="cn.pluss.platform.entity.DeviceSignUnbind"
+            resultType="cn.pluss.platform.entity.DeviceSignUnbind">
+        SELECT * from tb_pluss_device_sign_unbind
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="orderNo!= null">
+                and orderNo = #{orderNo}
+            </if>
+            <if test="merchantCode!= null">
+                and merchantCode = #{merchantCode}
+            </if>
+            <if test="merchantName!= null">
+                and merchantName = #{merchantName}
+            </if>
+            <if test="mchId!= null">
+                and mchId = #{mchId}
+            </if>
+            <if test="status!= null">
+                and status = #{status}
+            </if>
+            <if test="soleCode!= null">
+                and soleCode = #{soleCode}
+            </if>
+            <if test="venderModel!= null">
+                and venderModel = #{venderModel}
+            </if>
+            <if test="sn!= null">
+                and sn = #{sn}
+            </if>
+            <if test="createDt!= null">
+                and createDt = #{createDt}
+            </if>
+            <if test="venderCode!= null">
+                and venderCode = #{venderCode}
+            </if>
+            <if test="reason!= null">
+                and reason = #{reason}
+            </if>
+        </where>
+    </select>
+
+    <update id="updateDeviceSignUnbind" parameterType="cn.pluss.platform.entity.DeviceSignUnbind">
+        update tb_pluss_device_sign_unbind
+        <set>
+            <if test="orderNo!= null">
+                orderNo = #{orderNo},
+            </if>
+            <if test="merchantCode!= null">
+                merchantCode = #{merchantCode},
+            </if>
+            <if test="merchantName!= null">
+                merchantName = #{merchantName},
+            </if>
+            <if test="mchId!= null">
+                mchId = #{mchId},
+            </if>
+            <if test="status!= null">
+                status = #{status},
+            </if>
+            <if test="soleCode!= null">
+                soleCode = #{soleCode},
+            </if>
+            <if test="venderModel!= null">
+                venderModel = #{venderModel},
+            </if>
+            <if test="sn!= null">
+                sn = #{sn},
+            </if>
+            <if test="createDt!= null">
+                createDt = #{createDt},
+            </if>
+            <if test="venderCode!= null">
+                venderCode = #{venderCode},
+            </if>
+            <if test="reason!= null">
+                reason = #{reason}
+            </if>
+        </set>
+        where id=#{id}
+    </update>
+
+    <delete id="deleteDeviceSignUnbind" parameterType="cn.pluss.platform.entity.DeviceSignUnbind">
+        DELETE
+        FROM tb_pluss_device_sign_unbind
+        where id = #{id}
+    </delete>
+
+    <select id="queryDeviceSignUnbindPage" parameterType="java.util.Map"
+            resultType="cn.pluss.platform.entity.DeviceSignUnbind">
+        SELECT su.*,mbi.userId as userId from tb_pluss_device_sign_unbind su
+        left join tb_pluss_merchant_base_info mbi on su.merchantCode = mbi.merchantCode
+        <where>
+            <if test="id!= null">
+                and su.id = #{id}
+            </if>
+            <if test="userId != null">
+                and mbi.userId = #{userId}
+            </if>
+            <if test="orderNo!= null and orderNo!=''">
+                and su.orderNo LIKE CONCAT('%',#{orderNo},'%')
+            </if>
+            <if test="merchantCode!= null">
+                and su.merchantCode = #{merchantCode}
+            </if>
+            <if test="merchantName!= null and merchantName!=''">
+                and su.merchantName LIKE CONCAT('%',#{merchantName},'%')
+            </if>
+            <if test="mchId!= null">
+                and su.mchId = #{mchId}
+            </if>
+            <if test="status!= null and status!=''">
+                and su.status = #{status}
+            </if>
+            <if test="soleCode!= null">
+                and su.soleCode = #{soleCode}
+            </if>
+            <if test="venderModel!= null">
+                and su.venderModel = #{venderModel}
+            </if>
+            <if test="sn!= null">
+                and su.sn = #{sn}
+            </if>
+            <if test="createDt!= null">
+                and su.createDt = #{createDt}
+            </if>
+            <if test="startTime!= null and startTime!=''">
+                <![CDATA[
+                            and  DATE_FORMAT(su.createDt, '%Y-%m-%d %H:%i:%S')>=DATE_FORMAT(#{startTime}, '%Y-%m-%d %H:%i:%S')
+                         ]]>
+            </if>
+            <if test="endTime!= null and endTime!=''">
+                <![CDATA[
+                            and  DATE_FORMAT(su.createDt, '%Y-%m-%d %H:%i:%S')<=DATE_FORMAT(#{endTime}, '%Y-%m-%d %H:%i:%S')
+                         ]]>
+            </if>
+            <if test="venderCode!= null">
+                and su.venderCode = #{venderCode}
+            </if>
+            <if test="reason!= null">
+                and su.reason = #{reason}
+            </if>
+        </where>
+        order by su.id desc limit #{pageSize} offset #{offset}
+    </select>
+
+    <select id="queryDeviceSignUnbindPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+        SELECT count(*) from tb_pluss_device_sign_unbind su
+        left join tb_pluss_merchant_base_info mbi on su.merchantCode = mbi.merchantCode
+        <where>
+            <if test="id!= null">
+                and su.id = #{id}
+            </if>
+            <if test="userId != null">
+                and mbi.userId = #{userId}
+            </if>
+            <if test="orderNo!= null and orderNo!=''">
+                and su.orderNo LIKE CONCAT('%',#{orderNo},'%')
+            </if>
+            <if test="merchantCode!= null">
+                and su.merchantCode = #{merchantCode}
+            </if>
+            <if test="merchantName!= null and merchantName!=''">
+                and su.merchantName LIKE CONCAT('%',#{merchantName},'%')
+            </if>
+            <if test="mchId!= null">
+                and su.mchId = #{mchId}
+            </if>
+            <if test="status!= null and status!=''">
+                and su.status = #{status}
+            </if>
+            <if test="soleCode!= null">
+                and su.soleCode = #{soleCode}
+            </if>
+            <if test="venderModel!= null">
+                and su.venderModel = #{venderModel}
+            </if>
+            <if test="sn!= null">
+                and su.sn = #{sn}
+            </if>
+            <if test="createDt!= null">
+                and su.createDt = #{createDt}
+            </if>
+            <if test="startTime!= null and startTime!=''">
+                <![CDATA[
+                            and  DATE_FORMAT(su.createDt, '%Y-%m-%d %H:%i:%S')>=DATE_FORMAT(#{startTime}, '%Y-%m-%d %H:%i:%S')
+                         ]]>
+            </if>
+            <if test="endTime!= null and endTime!=''">
+                <![CDATA[
+                            and  DATE_FORMAT(su.createDt, '%Y-%m-%d %H:%i:%S')<=DATE_FORMAT(#{endTime}, '%Y-%m-%d %H:%i:%S')
+                         ]]>
+            </if>
+            <if test="venderCode!= null">
+                and su.venderCode = #{venderCode}
+            </if>
+            <if test="reason!= null">
+                and su.reason = #{reason}
+            </if>
+        </where>
+    </select>
+
+
+    <select id="selectPageWithMerchantInfo" resultType="cn.pluss.platform.entity.DeviceSignUnbind">
+        SELECT su.*,mbi.userId as userId
+        FROM tb_pluss_device_sign_unbind su
+        LEFT JOIN tb_pluss_merchant_base_info mbi on su.merchantCode = mbi.merchantCode
+    </select>
+
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/DeviceSpecMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/DeviceSpecMapper.xml
new file mode 100644
index 0000000..0c1e50b
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/DeviceSpecMapper.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.DeviceSpecMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.DeviceSpec">
+        <id column="id" property="id" />
+        <result column="code" property="code" />
+        <result column="spec" property="spec" />
+        <result column="specName" property="specName" />
+        <result column="specDesc" property="specDesc" />
+        <result column="type" property="type" />
+        <result column="createTime" property="createTime" />
+        <result column="updateTime" property="updateTime" />
+        <result column="creator" property="creator" />
+        <result column="updater" property="updater" />
+        <result column="postageFlag" property="postageFlag" />
+        <result column="weight" property="weight" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/DeviceStockGroupMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/DeviceStockGroupMapper.xml
new file mode 100644
index 0000000..fd18c4c
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/DeviceStockGroupMapper.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.DeviceStockGroupMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.DeviceStockGroup">
+        <id column="id" property="id" />
+        <result column="groupCode" property="groupCode" />
+        <result column="groupName" property="groupName" />
+        <result column="desc" property="desc" />
+        <result column="sort" property="sort" />
+        <result column="createTime" property="createTime" />
+        <result column="updateTime" property="updateTime" />
+        <result column="creator" property="creator" />
+        <result column="updater" property="updater" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/DeviceStockMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/DeviceStockMapper.xml
new file mode 100644
index 0000000..2974af8
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/DeviceStockMapper.xml
@@ -0,0 +1,224 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.DeviceStockMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.DeviceStock">
+        <id column="id" property="id"/>
+        <result column="snNo" property="snNo"/>
+        <result column="orderNo" property="orderNo"/>
+        <result column="price" property="price"/>
+        <result column="type" property="type"/>
+        <result column="groupNo" property="groupNo"/>
+        <result column="buyMercName" property="buyMercName"/>
+        <result column="buyMercId" property="buyMercId"/>
+        <result column="actMercName" property="actMercName"/>
+        <result column="actMercId" property="actMercId"/>
+        <result column="status" property="status"/>
+        <result column="createTime" property="createTime"/>
+        <result column="createBy" property="createBy"/>
+        <result column="delFlag" property="delFlag"/>
+        <result column="remarks" property="remarks"/>
+    </resultMap>
+
+    <select id="selectStockInfoList" resultType="java.util.Map">
+        SELECT dd.code, ds.groupNo, dd.size, count(1) count FROM tb_pluss_device_stock ds
+        LEFT JOIN tb_pluss_device_detail dd ON ds.groupNo = dd.groupNo AND dd.`code` = ds.`code`
+        WHERE ds.groupNo IN
+        <foreach collection="groupNoList" item="groupNo" close=")" separator="," open="(">
+            #{groupNo}
+        </foreach>
+        GROUP BY dd.groupNo, dd.code, dd.size;
+    </select>
+
+    <select id="selectSoldStockList" resultType="java.util.Map">
+        SELECT doi.groupNo, SUM(doi.num * dd.size) soldCount FROM tb_pluss_device_order_info doi
+        LEFT JOIN tb_pluss_device_detail dd ON doi.groupNo = dd.groupNo AND dd.`code` = doi.`code`
+        WHERE dd.groupNo IN
+        <foreach collection="groupNoList" item="groupNo" close=")" separator="," open="(">
+            #{groupNo}
+        </foreach>
+        GROUP BY groupNo;
+    </select>
+
+    <select id="getStockTypeNumList" resultType="cn.pluss.platform.vo.DeviceStockVO"
+            parameterType="cn.pluss.platform.dto.DeviceStockDTO">
+        SELECT
+        dt.`code`,
+        dt.`name` as deviceName,
+        IFNULL(ds.totalNum,0) as totalNum,
+        IFNULL(ds.bindNum,0) as bindNum,
+        IFNULL(ds.unBindNum,0) as unBindNum,
+        dg.deviceLogo
+        FROM tb_pluss_device_type dt
+        LEFT JOIN tb_pluss_device_goods dg ON dt.`code` = dg.`code`
+        LEFT JOIN (
+        SELECT
+        count(1) as totalNum,
+        `code`,
+        SUM(IF( `status` = 3, 1, 0 )) AS bindNum,
+        SUM(IF( `status` != 3 or `status` is null, 1, 0)) AS unBindNum
+        FROM
+        tb_pluss_device_stock
+        WHERE
+        <choose>
+            <when test='pType == "2"'>
+                belongUserId = #{userId} or belongUserId in (select userId from tb_pluss_user_app where pidArr like
+                CONCAT('%,',#{userId}))
+            </when>
+            <otherwise>
+                belongUserId = #{userId}
+            </otherwise>
+        </choose>
+
+        GROUP BY `code` ) ds
+        ON dt.`code` = ds.`code`
+        WHERE dt.showFlag = 1
+    </select>
+
+    <select id="pageInfo" parameterType="cn.pluss.platform.dto.DeviceStockDTO"
+            resultType="cn.pluss.platform.vo.DeviceStockVO">
+        SELECT ds.*, mbi.userId actUserId, mbi2.userId buyUserId,
+        dt.name as deviceName,
+        dg.deviceLogo,
+        ue.userName as extractName,
+        ub.userName as belongName
+        FROM tb_pluss_device_stock ds
+        left join tb_pluss_device_type dt on ds.`code` = dt.`code`
+        left join tb_pluss_device_goods dg on ds.`code` = dg.`code`
+        left join tb_pluss_user_app ue on ds.extractUserId = ue.userId
+        left join tb_pluss_user_app ub on ds.belongUserId = ub.userId
+        LEFT JOIN tb_pluss_merchant_base_info mbi ON mbi.id = ds.actMercId
+        LEFT JOIN tb_pluss_merchant_base_info mbi2 ON mbi2.id = ds.buyMercId
+        <where>
+            <if test="dto.code != null and dto.code != ''">
+                and ds.`code` = #{dto.code}
+            </if>
+            <if test="dto.userId != null">
+                <choose>
+                    <when test="dto.pType != null">
+                        <choose>
+                            <when test='dto.pType == "2"'>
+                                and (belongUserId = #{dto.userId} or belongUserId in (select userId from tb_pluss_user_app
+                                where pidArr like CONCAT('%,',#{dto.userId})))
+                            </when>
+                            <otherwise>
+                                and belongUserId = #{dto.userId}
+                            </otherwise>
+                        </choose>
+                    </when>
+                    <otherwise>
+                        and ds.belongUserId = #{dto.userId}
+                    </otherwise>
+                </choose>
+            </if>
+            <if test="dto.extractUserId != null">
+                and ds.extractUserId = #{dto.extractUserId}
+            </if>
+            <if test="dto.startDate != null and dto.startDate != ''">
+                and DATE_FORMAT(ds.inStockTime,'%Y-%m-%d') <![CDATA[ >= ]]> #{dto.startDate}
+            </if>
+            <if test="dto.endDate != null and dto.endDate != ''">
+                and DATE_FORMAT(ds.inStockTime,'%Y-%m-%d') <![CDATA[ <= ]]> #{dto.endDate}
+            </if>
+
+            <if test="dto.startSnNo != null and dto.startSnNo != ''">
+                and ds.deviceNo <![CDATA[ >= ]]> #{dto.startSnNo}
+            </if>
+            <if test="dto.endSnNo != null and dto.endSnNo != ''">
+                and ds.deviceNo <![CDATA[ <= ]]> #{dto.endSnNo}
+            </if>
+            <if test="dto.startDeviceNo != null and dto.startDeviceNo != ''">
+                and ds.snNo <![CDATA[ >= ]]> #{dto.startDeviceNo}
+            </if>
+            <if test="dto.endDeviceNo != null and dto.endDeviceNo != ''">
+                and ds.snNo <![CDATA[ <= ]]> #{dto.endDeviceNo}
+            </if>
+
+            <if test="dto.type != null and dto.type != ''">
+                and ds.type = #{dto.type}
+            </if>
+
+            <if test="dto.buyMercName != null and dto.buyMercName != ''">
+                and ds.buyMercName = #{dto.buyMercName}
+            </if>
+
+            <if test="dto.actMercName != null and dto.actMercName != ''">
+                and ds.actMercName = #{dto.actMercName}
+            </if>
+
+            <if test="dto.actUserId != null and dto.actUserId != ''">
+                and mbi.userId = #{dto.actUserId}
+            </if>
+
+            <if test="dto.deviceNo != null and dto.deviceNo != ''">
+                and ds.deviceNo = #{dto.deviceNo}
+            </if>
+            <if test="dto.snNo != null and dto.snNo != ''">
+                and (ds.snNo like CONCAT('%',#{dto.snNo},'%') or ds.deviceNo like CONCAT('%',#{dto.snNo},'%') )
+            </if>
+            <if test="dto.bindStatus != '-2'">
+                <choose>
+                    <when test="dto.bindStatus == null or dto.bindStatus == '' or dto.bindStatus == '-1'">
+                        and ds.status in ('1','2')
+                    </when>
+                    <otherwise>
+                        and ds.status = '3'
+                    </otherwise>
+                </choose>
+            </if>
+        </where>
+        order by ds.id desc
+    </select>
+
+    <select id="detail" parameterType="cn.pluss.platform.dto.DeviceStockDTO"
+            resultType="cn.pluss.platform.vo.DeviceStockVO">
+        SELECT ds.*,
+        ua1.userName as belongName,
+        ui1.phone as belongPhone,
+        ua2.userName as extractName,
+        ui2.phone as extractPhone
+        FROM tb_pluss_device_stock ds
+        left join tb_pluss_user_app ua1 on ds.belongUserId = ua1.userId
+        left join tb_pluss_user_info ui1 on ds.belongUserId = ui1.id
+
+        left join tb_pluss_user_app ua2 on ds.extractUserId = ua2.userId
+        left join tb_pluss_user_info ui2 on ds.extractUserId = ui2.id
+        <where>
+            ds.`snNo` = #{snNo}
+        </where>
+    </select>
+
+    <select id="getMercInfo" parameterType="cn.pluss.platform.dto.DeviceStockDTO"
+            resultType="cn.pluss.platform.vo.DeviceStockVO">
+        SELECT ds.actMercName,
+        ui.phone as mercPhone,
+        IFNULL(ds.bindTime,ds.updateTime) as bindTime
+        FROM tb_pluss_device_stock ds
+        left join tb_pluss_merchant_base_info mbi on ds.actMercId = mbi.id
+        left join tb_pluss_user_info ui on mbi.userId = ui.id
+        <where>
+            ds.`snNo` = #{snNo}
+        </where>
+    </select>
+
+    <select id="pageDeviceStock" resultType="cn.pluss.platform.vo.DeviceStockVO">
+        SELECT ds.*, dt.`name` deviceName, spec.specName typeDesc, dg.deviceLogo, dt.payCodeFlag, mcp.name cashPlaceName
+        FROM tb_pluss_device_stock ds
+        LEFT JOIN tb_pluss_merchant_base_info mbi ON ds.actMercId = mbi.id
+        LEFT JOIN tb_pluss_device_type dt ON dt.`code` = ds.`code`
+        LEFT JOIN tb_pluss_device_spec spec ON ds.`code` = spec.`code` AND ds.type = spec.spec
+        LEFT JOIN tb_pluss_merchant_cash_pay_code mcpc ON mcpc.payCode = ds.snNo
+        LEFT JOIN tb_pluss_merchant_cash_place mcp ON mcpc.cashPlaceId = mcp.id
+        LEFT JOIN tb_pluss_device_goods dg ON dg.`code` = ds.`code`
+        <where>
+            <if test="userId != null">
+                AND mbi.userId = #{userId}
+            </if>
+            <if test="cashPlaceId != null">
+                AND mcpc.cashPlaceId = #{cashPlaceId}
+            </if>
+        </where>
+    </select>
+
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/DeviceTransferDetailMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/DeviceTransferDetailMapper.xml
new file mode 100644
index 0000000..657309e
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/DeviceTransferDetailMapper.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.DeviceTransferDetailMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.DeviceTransferDetail">
+        <id column="id" property="id" />
+        <result column="tid" property="tid" />
+        <result column="deviceNo" property="deviceNo" />
+        <result column="createTime" property="createTime" />
+        <result column="batchNo" property="batchNo" />
+    </resultMap>
+
+
+    <select id="selectListByTid" resultType="cn.pluss.platform.vo.DeviceTransferDetailVO">
+        SELECT dtd.*,
+               ds.snNo,
+               dt.name as deviceName,
+               IF(ds.status = '3',ds.actMercName,'未绑定') as bindDesc,
+               ds.inStockTime
+        from tb_pluss_device_transfer_detail dtd
+        left join tb_pluss_device_stock ds on  dtd.deviceNo = ds.snNo
+        left join tb_pluss_device_type dt on  ds.`code` = dt.`code`
+        where dtd.tid = #{tid}
+    </select>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/DeviceTransferMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/DeviceTransferMapper.xml
new file mode 100644
index 0000000..cfde575
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/DeviceTransferMapper.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.DeviceTransferMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.DeviceTransfer">
+        <id column="id" property="id" />
+        <result column="userId" property="userId" />
+        <result column="acceptUserId" property="acceptUserId" />
+        <result column="status" property="status" />
+        <result column="transferTime" property="transferTime" />
+        <result column="acceptTime" property="acceptTime" />
+        <result column="batchNo" property="batchNo" />
+        <result column="remark" property="remark" />
+    </resultMap>
+
+    <select id="pageInfo" parameterType="cn.pluss.platform.dto.DeviceTransferDTO" resultType="cn.pluss.platform.vo.DeviceTransferVO">
+        SELECT
+               dt.*,
+               ui1.phone,
+               ua1.userName,
+               ui2.phone as acceptPhone,
+               ua2.userName as acceptName
+        FROM tb_pluss_device_transfer dt
+        left join tb_pluss_user_info ui1 on dt.userId = ui1.id
+        left join tb_pluss_user_app ua1 on dt.userId = ua1.userId
+
+        left join tb_pluss_user_info ui2 on dt.acceptUserId = ui2.id
+        left join tb_pluss_user_app ua2 on dt.acceptUserId = ua2.userId
+        <where>
+            <if test="dto.userId != null">
+                and dt.userId = #{dto.userId}
+            </if>
+            <if test="dto.acceptUserId != null">
+                and dt.acceptUserId = #{dto.acceptUserId}
+            </if>
+        </where>
+    </select>
+
+    <select id="selectByIdVo" resultType="cn.pluss.platform.vo.DeviceTransferVO">
+        SELECT
+        dt.*,
+        ui1.phone,
+        ua1.userName,
+        ui2.phone as acceptPhone,
+        ua2.userName as acceptName
+        FROM tb_pluss_device_transfer dt
+        left join tb_pluss_user_info ui1 on dt.userId = ui1.id
+        left join tb_pluss_user_app ua1 on dt.userId = ua1.userId
+
+        left join tb_pluss_user_info ui2 on dt.acceptUserId = ui2.id
+        left join tb_pluss_user_app ua2 on dt.acceptUserId = ua2.userId
+        where dt.id  = #{id}
+    </select>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/DeviceTypeMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/DeviceTypeMapper.xml
new file mode 100644
index 0000000..2fe12bd
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/DeviceTypeMapper.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.DeviceTypeMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.DeviceType">
+        <id column="id" property="id" />
+        <result column="code" property="code" />
+        <result column="name" property="name" />
+        <result column="desc" property="desc" />
+        <result column="weight" property="weight" />
+        <result column="createTime" property="createTime" />
+        <result column="updateTime" property="updateTime" />
+        <result column="creator" property="creator" />
+        <result column="updater" property="updater" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/DeviceVoiceBoxMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/DeviceVoiceBoxMapper.xml
new file mode 100644
index 0000000..7018fb9
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/DeviceVoiceBoxMapper.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.DeviceVoiceBoxMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.DeviceVoiceBox">
+        <id column="id" property="id" />
+        <result column="boxName" property="boxName" />
+        <result column="boxNo" property="boxNo" />
+        <result column="buyMercName" property="buyMercName" />
+        <result column="buyMercId" property="buyMercId" />
+        <result column="orderNo" property="orderNo" />
+        <result column="actMercName" property="actMercName" />
+        <result column="actMercId" property="actMercId" />
+        <result column="status" property="status" />
+        <result column="createTime" property="createTime" />
+        <result column="updateTime" property="updateTime" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/DeviceVoiceBoxMsgMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/DeviceVoiceBoxMsgMapper.xml
new file mode 100644
index 0000000..b515aea
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/DeviceVoiceBoxMsgMapper.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.DeviceVoiceBoxMsgMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.DeviceVoiceBoxMsg">
+        <id column="id" property="id" />
+        <result column="requestId" property="requestId" />
+        <result column="msgId" property="msgId" />
+        <result column="body" property="body" />
+        <result column="createTime" property="createTime" />
+        <result column="deviceNo" property="deviceNo" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/DictMpper.xml b/pluss-dao-bundle/src/main/resources/mapper/DictMpper.xml
new file mode 100644
index 0000000..3ed6ef8
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/DictMpper.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="cn.pluss.platform.mapper.DictMapper">
+    <select id="getDictByCode" resultType="cn.pluss.platform.entity.Dict">
+        SELECT d1.id, d1.pid, d1.sort, d1.code, d1.name, d1.desc, d1.value, d1.createTime, d1.updateTime, d2.code pCode FROM tb_pluss_dict d1 LEFT JOIN tb_pluss_dict d2 ON d1.pId = d2.id
+        <where>
+            d2.code IN
+            <foreach collection="codeList" item="item" close=")" open="(" separator=",">
+                #{item}
+            </foreach>
+        </where>
+        ORDER BY sort
+    </select>
+    <select id="selectDictPage" resultType="cn.pluss.platform.entity.Dict">
+        select id,pid,sort,code,name,describes,codeValue,createTime,updateTime
+        from  tb_pluss_dict
+        order by sort
+    </select>
+
+    <select id="selectMaxSortElem" resultType="cn.pluss.platform.entity.Dict">
+        SELECT MAX(t.sort) sort, t2.id FROM tb_pluss_dict t LEFT JOIN tb_pluss_dict t2 ON t.pid = t2.id
+        WHERE t2.code = #{code} GROUP BY t2.id
+    </select>
+
+    <select id="selectByNameAndPCode" resultType="cn.pluss.platform.entity.Dict">
+        SELECT
+               d1.code, d1.name, d1.desc, d1.value, d1.createTime, d1.updateTime
+        FROM  tb_pluss_dict d1 LEFT JOIN tb_pluss_dict d2 ON d1.pid = d2.id
+        WHERE d2.code = #{code} AND d1.name = #{name}
+    </select>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/EncryptKeyMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/EncryptKeyMapper.xml
new file mode 100644
index 0000000..08449d8
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/EncryptKeyMapper.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.EncryptKeyMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.EncryptKey">
+        <id column="id" property="id" />
+        <result column="name" property="name" />
+        <result column="code" property="code" />
+        <result column="desc" property="desc" />
+        <result column="priKey" property="priKey" />
+        <result column="pubKey" property="pubKey" />
+        <result column="version" property="version" />
+        <result column="status" property="status" />
+        <result column="createTime" property="createTime" />
+        <result column="updateTime" property="updateTime" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/ExtraLevelBenefitMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/ExtraLevelBenefitMapper.xml
new file mode 100644
index 0000000..29edcf1
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/ExtraLevelBenefitMapper.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.ExtraLevelBenefitMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.ExtraLevelBenefit">
+        <id column="id" property="id" />
+        <result column="userId" property="userId" />
+        <result column="maxCount" property="maxCount" />
+        <result column="useCount" property="useCount" />
+        <result column="createTime" property="createTime" />
+        <result column="updateTime" property="updateTime" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/Fans-sqlmap.xml b/pluss-dao-bundle/src/main/resources/mapper/Fans-sqlmap.xml
new file mode 100644
index 0000000..f28158b
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/Fans-sqlmap.xml
@@ -0,0 +1,752 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="cn.pluss.platform.mapper.FansMapper">
+
+    <insert id="saveFans" parameterType="cn.pluss.platform.entity.Fans">
+        	insert into tb_pluss_fans(userId,logo,nickName,consumMoney,merchantCode,merchantName,consumAddress,consumTime,orderNumber,createDt,lastMerchantCode,shareMoney,lastconsumTime,lastOrderNumber,payWay,isUse)VALUES(#{userId},#{logo},#{nickName},#{consumMoney},#{merchantCode},#{merchantName},#{consumAddress},#{consumTime},#{orderNumber},now(),#{lastMerchantCode},#{shareMoney},#{lastconsumTime},#{lastOrderNumber},#{payWay},#{isUse})
+    	</insert>
+
+
+    <select id="queryFans" parameterType="cn.pluss.platform.entity.Fans" resultType="cn.pluss.platform.entity.Fans">
+        SELECT * from tb_pluss_fans
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="userId!= null">
+                and userId = #{userId}
+            </if>
+            <if test="logo!= null">
+                and logo = #{logo}
+            </if>
+            <if test="nickName!= null">
+                and nickName = #{nickName}
+            </if>
+            <if test="consumMoney!= null">
+                and consumMoney = #{consumMoney}
+            </if>
+            <if test="merchantCode!= null">
+                and merchantCode = #{merchantCode}
+            </if>
+            <if test="merchantName!= null">
+                and merchantName = #{merchantName}
+            </if>
+            <if test="consumAddress!= null">
+                and consumAddress = #{consumAddress}
+            </if>
+            <if test="consumTime!= null">
+                and consumTime = #{consumTime}
+            </if>
+            <if test="orderNumber!= null">
+                and orderNumber = #{orderNumber}
+            </if>
+            <if test="createDt!= null">
+                and createDt = #{createDt}
+            </if>
+
+            <if test="lastMerchantCode!= null">
+                and lastMerchantCode = #{lastMerchantCode}
+            </if>
+            <if test="shareMoney!= null">
+                and shareMoney = #{shareMoney}
+            </if>
+            <if test="lastconsumTime!= null">
+                and lastconsumTime = #{lastconsumTime}
+            </if>
+            <if test="lastOrderNumber!= null">
+                and lastOrderNumber = #{lastOrderNumber}
+            </if>
+            <if test="payWay!= null">
+                and payWay = #{payWay}
+            </if>
+            <if test="isUse!= null">
+                and isUse = #{isUse}
+            </if>
+        </where>
+    </select>
+
+    <!-- queryFansTodayCount -->
+    <select id="queryFansTodayCount" parameterType="cn.pluss.platform.entity.Fans" resultType="java.lang.Double">
+        select sum(shareMoney) from tb_pluss_fans
+        <where>
+            <if test="merchantCode!= null">
+                and merchantCode = #{merchantCode}
+            </if>
+            <if test="stTime!= null">
+                and createDt &gt;= #{stTime}
+            </if>
+            <if test="endTime!= null">
+                and createDt &lt;= #{endTime}
+            </if>
+
+        </where>
+        <!-- <where>
+
+             <if test="stTime!= null">
+                     and createDt &gt;= #{stTime}
+             </if>
+             <if test="endTime!= null">
+                     and createDt &lt;= #{endTime}
+             </if>
+        </where> -->
+    </select>
+
+
+    <select id="queryFansList" parameterType="cn.pluss.platform.entity.Fans" resultType="cn.pluss.platform.entity.Fans">
+        SELECT * from tb_pluss_fans
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="userId!= null">
+                and userId = #{userId}
+            </if>
+            <if test="logo!= null">
+                and logo = #{logo}
+            </if>
+            <if test="nickName!= null">
+                and nickName like concat("%",#{nickName},"%")
+            </if>
+            <if test="consumMoney!= null">
+                and consumMoney = #{consumMoney}
+            </if>
+            <if test="merchantCode!= null">
+                and merchantCode = #{merchantCode}
+            </if>
+            <if test="merchantName!= null">
+                and merchantName = #{merchantName}
+            </if>
+            <if test="consumAddress!= null">
+                and consumAddress = #{consumAddress}
+            </if>
+            <if test="consumTime!= null">
+                and consumTime = #{consumTime}
+            </if>
+            <if test="orderNumber!= null">
+                and orderNumber = #{orderNumber}
+            </if>
+            <if test="createDt!= null">
+                and createDt = #{createDt}
+            </if>
+            <if test="stTime!= null">
+                and createDt &gt;= #{stTime}
+            </if>
+            <if test="endTime!= null">
+                and createDt &lt;= #{endTime}
+            </if>
+            <if test="lastMerchantCode!= null">
+                and lastMerchantCode = #{lastMerchantCode}
+            </if>
+            <if test="shareMoney!= null">
+                and shareMoney = #{shareMoney}
+            </if>
+            <if test="lastconsumTime!= null">
+                and lastconsumTime = #{lastconsumTime}
+            </if>
+            <if test="lastOrderNumber!= null">
+                and lastOrderNumber = #{lastOrderNumber}
+            </if>
+            <if test="payWay!= null">
+                and payWay = #{payWay}
+            </if>
+            <if test="isUse!= null">
+                and isUse = #{isUse}
+            </if>
+
+        </where>
+    </select>
+
+    <update id="updateFans" parameterType="cn.pluss.platform.entity.Fans">
+        update tb_pluss_fans
+        <set>
+            <if test="userId!= null">
+                userId = #{userId},
+            </if>
+            <if test="logo!= null">
+                logo = #{logo},
+            </if>
+            <if test="nickName!= null">
+                nickName = #{nickName},
+            </if>
+            <if test="consumMoney!= null">
+                consumMoney = #{consumMoney},
+            </if>
+            <if test="merchantCode!= null">
+                merchantCode = #{merchantCode},
+            </if>
+            <if test="merchantName!= null">
+                merchantName = #{merchantName},
+            </if>
+            <if test="consumAddress!= null">
+                consumAddress = #{consumAddress},
+            </if>
+            <if test="consumTime!= null">
+                consumTime = #{consumTime},
+            </if>
+            <if test="orderNumber!= null">
+                orderNumber = #{orderNumber},
+            </if>
+            <if test="createDt!= null">
+                createDt = #{createDt},
+            </if>
+
+            <if test="lastMerchantCode!= null">
+                lastMerchantCode = #{lastMerchantCode},
+            </if>
+            <if test="shareMoney!= null">
+                shareMoney = #{shareMoney},
+            </if>
+            <if test="lastconsumTime!= null">
+                lastconsumTime = #{lastconsumTime},
+            </if>
+            <if test="lastOrderNumber!= null">
+                lastOrderNumber = #{lastOrderNumber},
+            </if>
+            <if test="payWay!= null">
+                payWay = #{payWay},
+            </if>
+            <if test="isUse!= null">
+                isUse = #{isUse}
+            </if>
+
+        </set>
+        where id=#{id}
+    </update>
+
+    <delete id="deleteFans" parameterType="cn.pluss.platform.entity.Fans">
+			DELETE FROM tb_pluss_fans where id=#{id}
+		</delete>
+
+    <select id="queryFansPage" parameterType="java.util.Map" resultType="cn.pluss.platform.entity.Fans">
+        SELECT * from tb_pluss_fans
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="userId!= null">
+                and userId = #{userId}
+            </if>
+            <if test="logo!= null">
+                and logo = #{logo}
+            </if>
+            <if test="nickName!= null">
+                and nickName like CONCAT("%",#{nickName},"%")
+            </if>
+            <if test="consumMoney!= null">
+                and consumMoney = #{consumMoney}
+            </if>
+            <if test="merchantCode!= null">
+                and merchantCode = #{merchantCode}
+            </if>
+            <if test="merchantName!= null">
+                and merchantName = #{merchantName}
+            </if>
+            <if test="consumAddress!= null">
+                and consumAddress = #{consumAddress}
+            </if>
+            <if test="orderNumber!= null">
+                and orderNumber = #{orderNumber}
+            </if>
+            <if test="createDt!= null">
+                and createDt = #{createDt}
+            </if>
+
+            <if test="lastMerchantCode!= null">
+                and lastMerchantCode = #{lastMerchantCode}
+            </if>
+            <if test="shareMoney!= null">
+                and shareMoney = #{shareMoney}
+            </if>
+            <if test="lastconsumTime!= null">
+                and lastconsumTime = #{lastconsumTime}
+            </if>
+            <if test="lastOrderNumber!= null">
+                and lastOrderNumber = #{lastOrderNumber}
+            </if>
+            <if test="payWay!= null">
+                and payWay = #{payWay}
+            </if>
+            <if test="payWay!= null">
+                and payWay = #{payWay}
+            </if>
+            <if test="startTime!= null">
+                and createDt &gt; #{startTime}
+            </if>
+            <if test="endTime!= null">
+                and createDt &lt; #{endTime}
+            </if>
+            <if test="isUse!= null">
+                and isUse = #{isUse}
+            </if>
+        </where>
+        order by id desc limit #{pageSize} offset #{offset}
+    </select>
+
+    <select id="queryFansPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+        SELECT count(*) from tb_pluss_fans
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="userId!= null">
+                and userId = #{userId}
+            </if>
+            <if test="logo!= null">
+                and logo = #{logo}
+            </if>
+            <if test="nickName!= null and nickName!= ''">
+                and nickName like CONCAT("%",#{nickName},"%")
+            </if>
+            <if test="consumMoney!= null">
+                and consumMoney = #{consumMoney}
+            </if>
+            <if test="merchantCode!= null">
+                and merchantCode = #{merchantCode}
+            </if>
+            <if test="merchantName!= null">
+                and merchantName = #{merchantName}
+            </if>
+            <if test="consumAddress!= null">
+                and consumAddress = #{consumAddress}
+            </if>
+            <if test="orderNumber!= null">
+                and orderNumber = #{orderNumber}
+            </if>
+            <if test="createDt!= null">
+                and createDt = #{createDt}
+            </if>
+
+            <if test="lastMerchantCode!= null">
+                and lastMerchantCode = #{lastMerchantCode}
+            </if>
+            <if test="shareMoney!= null">
+                and shareMoney = #{shareMoney}
+            </if>
+            <if test="lastconsumTime!= null">
+                and lastconsumTime = #{lastconsumTime}
+            </if>
+            <if test="lastOrderNumber!= null">
+                and lastOrderNumber = #{lastOrderNumber}
+            </if>
+            <if test="payWay!= null">
+                and payWay = #{payWay}
+            </if>
+            <if test="isUse!= null">
+                and isUse = #{isUse}
+            </if>
+            <if test="startTime != null ">
+                <![CDATA[
+                            and  DATE_FORMAT(consumTime, '%Y-%m-%d %H:%i:%S')>=DATE_FORMAT(#{startTime}, '%Y-%m-%d %H:%i:%S')
+                         ]]>
+            </if>
+            <if test="endTime != null ">
+                <![CDATA[
+                            and  DATE_FORMAT(consumTime, '%Y-%m-%d %H:%i:%S')<=DATE_FORMAT(#{endTime}, '%Y-%m-%d %H:%i:%S')
+                         ]]>
+            </if>
+        </where>
+    </select>
+
+    <select id="queryFansNoPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+        SELECT count(*) from tb_pluss_fans
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="userId!= null">
+                and userId = #{userId}
+            </if>
+            <if test="logo!= null">
+                and logo = #{logo}
+            </if>
+            <if test="nickName!= null and nickName!= ''">
+                and nickName like CONCAT("%",#{nickName},"%")
+            </if>
+            <if test="consumMoney!= null">
+                and consumMoney = #{consumMoney}
+            </if>
+            <if test="merchantCode!= null">
+                and merchantCode IN (SELECT merchantCode
+                FROM tb_pluss_merchant_base_info
+                WHERE bindingCode = (SELECT bindingCode
+                FROM tb_pluss_merchant_base_info
+                where merchantCode = #{merchantCode}))
+            </if>
+            <if test="merchantName!= null">
+                and merchantName = #{merchantName}
+            </if>
+            <if test="consumAddress!= null">
+                and consumAddress = #{consumAddress}
+            </if>
+            <if test="orderNumber!= null">
+                and orderNumber = #{orderNumber}
+            </if>
+            <if test="createDt!= null">
+                and createDt = #{createDt}
+            </if>
+            <if test="lastMerchantCode!= null">
+                and lastMerchantCode = #{lastMerchantCode}
+            </if>
+            <if test="shareMoney!= null">
+                and shareMoney = #{shareMoney}
+            </if>
+            <if test="lastconsumTime!= null">
+                and lastconsumTime = #{lastconsumTime}
+            </if>
+            <if test="lastOrderNumber!= null">
+                and lastOrderNumber = #{lastOrderNumber}
+            </if>
+            <if test="payWay!= null">
+                and payWay = #{payWay}
+            </if>
+            <if test="isUse!= null">
+                and isUse = #{isUse}
+            </if>
+            <if test="startTime != null ">
+                <![CDATA[
+                            and  DATE_FORMAT(consumTime, '%Y-%m-%d %H:%i:%S')>=DATE_FORMAT(#{startTime}, '%Y-%m-%d %H:%i:%S')
+                         ]]>
+            </if>
+            <if test="endTime != null ">
+                <![CDATA[
+                            and  DATE_FORMAT(consumTime, '%Y-%m-%d %H:%i:%S')<=DATE_FORMAT(#{endTime}, '%Y-%m-%d %H:%i:%S')
+                         ]]>
+            </if>
+        </where>
+    </select>
+
+    <select id="sumConsumMoneyByMerchantCode" parameterType="java.util.Map" resultType="java.lang.Double">
+		  select sum(consumMoney) from tb_pluss_fans
+		  where merchantCode=#{merchantCode} and consumTime &gt; #{startTime} and consumTime &lt; #{endTime}
+		</select>
+
+    <!--获取当天的粉丝集合  -->
+    <select id="queryNowDateFansList" parameterType="java.util.Map" resultType="cn.pluss.platform.entity.Fans">
+           select * From tb_pluss_fans where userId = #{userId} and date(consumTime) = curdate() order by consumTime desc
+        </select>
+
+
+    <select id="queryFansPageManage" parameterType="java.util.Map" resultType="cn.pluss.platform.entity.Fans">
+        SELECT * from tb_pluss_fans
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="userId!= null">
+                and userId = #{userId}
+            </if>
+            <if test="logo!= null">
+                and logo = #{logo}
+            </if>
+            <if test="nickName!= null">
+                and nickName like CONCAT("%",#{nickName},"%")
+            </if>
+            <if test="consumMoney!= null">
+                and consumMoney = #{consumMoney}
+            </if>
+            <if test="merchantCode!= null">
+                and merchantCode = #{merchantCode}
+            </if>
+            <if test="merchantName!= null">
+                and merchantName = #{merchantName}
+            </if>
+            <if test="consumAddress!= null">
+                and consumAddress = #{consumAddress}
+            </if>
+            <if test="orderNumber!= null">
+                and orderNumber = #{orderNumber}
+            </if>
+            <if test="createDt!= null">
+                and createDt = #{createDt}
+            </if>
+
+            <if test="lastMerchantCode!= null">
+                and lastMerchantCode = #{lastMerchantCode}
+            </if>
+            <if test="shareMoney!= null">
+                and shareMoney = #{shareMoney}
+            </if>
+            <if test="lastconsumTime!= null">
+                and lastconsumTime = #{lastconsumTime}
+            </if>
+            <if test="lastOrderNumber!= null">
+                and lastOrderNumber = #{lastOrderNumber}
+            </if>
+            <if test="payWay!= null">
+                and payWay = #{payWay}
+            </if>
+            <if test="isUse!= null">
+                and isUse = #{isUse}
+            </if>
+
+        </where>
+        order by id desc limit #{pageSize} offset #{offset}
+    </select>
+
+
+    <select id="queryFansPageCountManage" parameterType="java.util.Map" resultType="java.lang.Integer">
+        SELECT count(*) from tb_pluss_fans
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="userId!= null">
+                and userId = #{userId}
+            </if>
+            <if test="logo!= null">
+                and logo = #{logo}
+            </if>
+            <if test="nickName!= null">
+                and nickName like CONCAT("%",#{nickName},"%")
+            </if>
+            <if test="consumMoney!= null">
+                and consumMoney = #{consumMoney}
+            </if>
+            <if test="merchantCode!= null">
+                and merchantCode = #{merchantCode}
+            </if>
+            <if test="merchantName!= null">
+                and merchantName = #{merchantName}
+            </if>
+            <if test="consumAddress!= null">
+                and consumAddress = #{consumAddress}
+            </if>
+            <if test="orderNumber!= null">
+                and orderNumber = #{orderNumber}
+            </if>
+            <if test="createDt!= null">
+                and createDt = #{createDt}
+            </if>
+
+            <if test="lastMerchantCode!= null">
+                and lastMerchantCode = #{lastMerchantCode}
+            </if>
+            <if test="shareMoney!= null">
+                and shareMoney = #{shareMoney}
+            </if>
+            <if test="lastconsumTime!= null">
+                and lastconsumTime = #{lastconsumTime}
+            </if>
+            <if test="lastOrderNumber!= null">
+                and lastOrderNumber = #{lastOrderNumber}
+            </if>
+            <if test="payWay!= null">
+                and payWay = #{payWay}
+            </if>
+            <if test="isUse!= null">
+                and isUse = #{isUse}
+            </if>
+
+        </where>
+    </select>
+
+    <!--查询某一粉丝最后一次的消费记录  -->
+    <select id="queryLastFansByUserId" resultType="cn.pluss.platform.entity.Fans">
+		 select * from tb_pluss_fans WHERE  userId=#{userId} ORDER BY consumTime desc limit 1
+		</select>
+
+
+    <select id="queryFansConsumPage" parameterType="java.util.Map" resultType="cn.pluss.platform.vo.FansConsumVO">
+        select pf.id as id,pf.userId as userId,pf.logo as logo,pf.nickName as nickName,pf.consumMoney as
+        consumMoney,pf.merchantCode as merchantCode,mbi.merchantName as
+        lastMerchantName,pf.lastMerchantCode,pf.merchantName as
+        merchantName,pf.shareMoney,pf.consumTime,pf.lastconsumTime,pf.orderNumber,pf.lastOrderNumber,pf.createDt,pf.payWay
+        from tb_pluss_fans pf left join tb_pluss_merchant_base_info mbi on mbi.merchantCode=pf.lastMerchantCode
+        <where>
+            <if test="merchantName!=null and merchantName!=''">
+                and pf.merchantName like concat("%",#{merchantName},"%")
+            </if>
+            <if test="nickName!=null and nickName!=''">
+                and pf.nickName like concat("%",#{nickName},"%")
+            </if>
+            <if test="merchantCode!=null and merchantCode!=''">
+                and pf.merchantCode like concat("%",#{merchantCode},"%")
+            </if>
+            <if test="lastMerchantName!=null and lastMerchantName!=''">
+                and mbi.merchantName like concat("%",#{lastMerchantName},"%")
+            </if>
+            <if test="orderNumber!=null and orderNumber!=''">
+                and pf.orderNumber like concat("%",#{orderNumber},"%")
+            </if>
+            <if test="lastOrderNumber!=null and lastOrderNumber!=''">
+                and pf.lastOrderNumber like concat("%",#{lastOrderNumber},"%")
+            </if>
+            <if test="startTime!= null">
+                <![CDATA[
+                            and  DATE_FORMAT(pf.consumTime, '%Y-%m-%d %H:%i:%S')>=DATE_FORMAT(#{startTime}, '%Y-%m-%d %H:%i:%S')
+                         ]]>
+            </if>
+            <if test="endTime!= null">
+                <![CDATA[
+                            and  DATE_FORMAT(pf.consumTime, '%Y-%m-%d %H:%i:%S')<=DATE_FORMAT(#{endTime}, '%Y-%m-%d %H:%i:%S')
+                         ]]>
+            </if>
+        </where>
+        order by pf.id DESC limit #{pageSize} offset #{offset}
+    </select>
+
+    <select id="queryFansNoConsumPage" parameterType="java.util.Map" resultType="cn.pluss.platform.vo.FansConsumVO">
+        select pf.id as id,pf.userId as userId,pf.logo as logo,pf.nickName as nickName,pf.consumMoney as
+        consumMoney,pf.merchantCode as merchantCode,mbi.merchantName as
+        lastMerchantName,pf.lastMerchantCode,pf.merchantName as
+        merchantName,pf.shareMoney,pf.consumTime,pf.lastconsumTime,pf.orderNumber,pf.lastOrderNumber,pf.createDt,pf.payWay
+        from tb_pluss_fans pf left join tb_pluss_merchant_base_info mbi on mbi.merchantCode=pf.lastMerchantCode
+        <where>
+            <if test="merchantName!=null and merchantName!=''">
+                and pf.merchantName like concat("%",#{merchantName},"%")
+            </if>
+            <if test="nickName!=null and nickName!=''">
+                and pf.nickName like concat("%",#{nickName},"%")
+            </if>
+            <if test="merchantCode!=null and merchantCode!=''">
+                and pf.merchantCode IN (SELECT merchantCode
+                FROM tb_pluss_merchant_base_info
+                WHERE bindingCode = (SELECT bindingCode
+                FROM tb_pluss_merchant_base_info
+                where merchantCode = #{merchantCode}))
+            </if>
+            <if test="lastMerchantName!=null and lastMerchantName!=''">
+                and mbi.merchantName like concat("%",#{lastMerchantName},"%")
+            </if>
+            <if test="orderNumber!=null and orderNumber!=''">
+                and pf.orderNumber like concat("%",#{orderNumber},"%")
+            </if>
+            <if test="lastOrderNumber!=null and lastOrderNumber!=''">
+                and pf.lastOrderNumber like concat("%",#{lastOrderNumber},"%")
+            </if>
+            <if test="startTime!= null">
+                <![CDATA[
+                            and  DATE_FORMAT(pf.consumTime, '%Y-%m-%d %H:%i:%S')>=DATE_FORMAT(#{startTime}, '%Y-%m-%d %H:%i:%S')
+                         ]]>
+            </if>
+            <if test="endTime!= null">
+                <![CDATA[
+                            and  DATE_FORMAT(pf.consumTime, '%Y-%m-%d %H:%i:%S')<=DATE_FORMAT(#{endTime}, '%Y-%m-%d %H:%i:%S')
+                         ]]>
+            </if>
+        </where>
+        order by pf.id DESC limit #{pageSize} offset #{offset}
+    </select>
+
+    <select id="queryFansConsumPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+        select count(pf.id) from tb_pluss_fans pf left join tb_pluss_merchant_base_info mbi on
+        mbi.merchantCode=pf.lastMerchantCode
+        <where>
+            <if test="merchantName!=null and merchantName!=''">
+                and pf.merchantName like concat("%",#{merchantName},"%")
+            </if>
+            <if test="nickName!=null and nickName!=''">
+                and pf.nickName like concat("%",#{nickName},"%")
+            </if>
+            <if test="merchantCode!=null and merchantCode!=''">
+                and pf.merchantCode like concat("%",#{merchantCode},"%")
+            </if>
+            <if test="lastMerchantName!=null and lastMerchantName!=''">
+                and mbi.merchantName like concat("%",#{lastMerchantName},"%")
+            </if>
+            <if test="orderNumber!=null and orderNumber!=''">
+                and pf.orderNumber like concat("%",#{orderNumber},"%")
+            </if>
+            <if test="lastOrderNumber!=null and lastOrderNumber!=''">
+                and pf.lastOrderNumber like concat("%",#{lastOrderNumber},"%")
+            </if>
+            <if test="startTime!= null">
+                <![CDATA[
+                            and  DATE_FORMAT(pf.consumTime, '%Y-%m-%d %H:%i:%S')>=DATE_FORMAT(#{startTime}, '%Y-%m-%d %H:%i:%S')
+                         ]]>
+            </if>
+            <if test="endTime!= null">
+                <![CDATA[
+                            and  DATE_FORMAT(pf.consumTime, '%Y-%m-%d %H:%i:%S')<=DATE_FORMAT(#{endTime}, '%Y-%m-%d %H:%i:%S')
+                         ]]>
+            </if>
+        </where>
+    </select>
+
+    <select id="queryFansNoConsumPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+        select count(pf.id) from tb_pluss_fans pf left join tb_pluss_merchant_base_info mbi on
+        mbi.merchantCode=pf.lastMerchantCode
+        <where>
+            <if test="merchantName!=null and merchantName!=''">
+                and pf.merchantName like concat("%",#{merchantName},"%")
+            </if>
+            <if test="nickName!=null and nickName!=''">
+                and pf.nickName like concat("%",#{nickName},"%")
+            </if>
+            <if test="merchantCode!=null and merchantCode!=''">
+                and pf.merchantCode IN (SELECT merchantCode
+                FROM tb_pluss_merchant_base_info
+                WHERE bindingCode = (SELECT bindingCode
+                FROM tb_pluss_merchant_base_info
+                where merchantCode = #{merchantCode}))
+            </if>
+            <if test="lastMerchantName!=null and lastMerchantName!=''">
+                and mbi.merchantName like concat("%",#{lastMerchantName},"%")
+            </if>
+            <if test="orderNumber!=null and orderNumber!=''">
+                and pf.orderNumber like concat("%",#{orderNumber},"%")
+            </if>
+            <if test="lastOrderNumber!=null and lastOrderNumber!=''">
+                and pf.lastOrderNumber like concat("%",#{lastOrderNumber},"%")
+            </if>
+            <if test="startTime!= null">
+                <![CDATA[
+                            and  DATE_FORMAT(pf.consumTime, '%Y-%m-%d %H:%i:%S')>=DATE_FORMAT(#{startTime}, '%Y-%m-%d %H:%i:%S')
+                         ]]>
+            </if>
+            <if test="endTime!= null">
+                <![CDATA[
+                            and  DATE_FORMAT(pf.consumTime, '%Y-%m-%d %H:%i:%S')<=DATE_FORMAT(#{endTime}, '%Y-%m-%d %H:%i:%S')
+                         ]]>
+            </if>
+        </where>
+    </select>
+
+    <select id="queryFansSumConsumMoney" parameterType="java.util.Map" resultType="java.lang.Double">
+        SELECT sum(consumMoney) from tb_pluss_fans
+        <where>
+            <if test="lastMerchantCode!= null">
+                and lastMerchantCode = #{lastMerchantCode}
+            </if>
+            <if test="startTime!= null">
+                and createDt &gt; #{startTime}
+            </if>
+            <if test="endTime!= null">
+                and createDt &lt; #{endTime}
+            </if>
+        </where>
+    </select>
+
+
+    <select id="queryFansSumShareMoney" parameterType="java.util.Map" resultType="java.lang.Double">
+        SELECT sum(shareMoney) from tb_pluss_fans
+        <where>
+            <if test="lastMerchantCode!= null">
+                and lastMerchantCode = #{lastMerchantCode}
+            </if>
+            <if test="startTime!= null">
+                and createDt &gt; #{startTime}
+            </if>
+            <if test="endTime!= null">
+                and createDt &lt; #{endTime}
+            </if>
+        </where>
+    </select>
+
+    <select id="selectGroupData" resultType="cn.pluss.platform.entity.Fans">
+        SELECT
+            SUM( shareMoney ) shareMoney,
+            lastMerchantCode
+        FROM
+            tb_pluss_fans
+        where lastMerchantCode IN
+        <foreach collection="lastMerchantCodeList" close=")" separator="," open="(" item="item">
+            #{item}
+        </foreach>
+        GROUP BY lastMerchantCode
+    </select>
+
+
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/FansConsumReturn-sqlmap.xml b/pluss-dao-bundle/src/main/resources/mapper/FansConsumReturn-sqlmap.xml
new file mode 100644
index 0000000..2874355
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/FansConsumReturn-sqlmap.xml
@@ -0,0 +1,264 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+			"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="cn.pluss.platform.mapper.FansConsumReturnMapper">
+
+	   	<insert id="saveFansConsumReturn" parameterType="cn.pluss.platform.entity.FansConsumReturn">
+        	insert into tb_pluss_fans_consum_return(logo,nickName,consumMony,merchantCode,merchantName,returnMoney,consumTime,orderNumber,createDt)VALUES(#{logo},#{nickName},#{consumMony},#{merchantCode},#{merchantName},#{returnMoney},#{consumTime},#{orderNumber},#{createDt})
+    	</insert>
+
+	   	<insert id="saveFansConsumReturnBatch">
+        	insert into tb_pluss_fans_consum_return(logo,nickName,consumMony,merchantCode,merchantName,returnMoney,consumTime,orderNumber,createDt) VALUES 
+    			<foreach collection="list" item="item" index="index" separator=",">
+			(#{logo},#{nickName},#{consumMony},#{merchantCode},#{merchantName},#{returnMoney},#{consumTime},#{orderNumber},#{createDt}		)
+				</foreach>
+    	</insert>
+
+		<select id="queryFansConsumReturn" parameterType="cn.pluss.platform.entity.FansConsumReturn" resultType="cn.pluss.platform.entity.FansConsumReturn">
+			SELECT * from tb_pluss_fans_consum_return 
+				<where> 
+					<if test="id!= null"> 
+					 	and id = #{id}
+					 </if> 
+					<if test="logo!= null"> 
+					 	and logo = #{logo}
+					 </if> 
+					<if test="nickName!= null"> 
+					 	and nickName = #{nickName}
+					 </if> 
+					<if test="consumMony!= null"> 
+					 	and consumMony = #{consumMony}
+					 </if> 
+					<if test="merchantCode!= null"> 
+					 	and merchantCode = #{merchantCode}
+					 </if> 
+					<if test="merchantName!= null"> 
+					 	and merchantName = #{merchantName}
+					 </if> 
+					<if test="returnMoney!= null"> 
+					 	and returnMoney = #{returnMoney}
+					 </if> 
+					  <if test="orderNumber!= null"> 
+					 	and orderNumber = #{orderNumber}
+					 </if>
+					 <if test="createDt!= null"> 
+					 	and createDt = #{createDt}
+					 </if> 
+					 and consumTime &gt; #{startTime} and consumTime &lt; #{endTime}
+				 </where> 
+		</select>
+
+		<select id="queryFansConsumReturnList" parameterType="cn.pluss.platform.entity.FansConsumReturn" resultType="cn.pluss.platform.entity.FansConsumReturn">
+			SELECT * from tb_pluss_fans_consum_return 
+				<where> 
+					<if test="id!= null"> 
+					 and 	id = #{id}
+					 </if> 
+					<if test="logo!= null"> 
+					 and 	logo = #{logo}
+					 </if> 
+					<if test="nickName!= null"> 
+					 and 	nickName = #{nickName}
+					 </if> 
+					<if test="consumMony!= null"> 
+					 and 	consumMony = #{consumMony}
+					 </if> 
+					<if test="merchantCode!= null"> 
+					 and 	merchantCode = #{merchantCode}
+					 </if> 
+					<if test="merchantName!= null"> 
+					 and 	merchantName = #{merchantName}
+					 </if> 
+					<if test="returnMoney!= null"> 
+					 and 	returnMoney = #{returnMoney}
+					 </if> 
+					<if test="consumTime!= null"> 
+					 and 	consumTime = #{consumTime}
+					 </if> 
+					  <if test="orderNumber!= null"> 
+					 	and orderNumber = #{orderNumber}
+					 </if>
+					 <if test="createDt!= null"> 
+					 	and createDt = #{createDt}
+					 </if> 
+				 </where> 
+		</select>
+
+		<update id="updateFansConsumReturn" parameterType="cn.pluss.platform.entity.FansConsumReturn" >
+			update tb_pluss_fans_consum_return 
+				  <set> 
+					<if test="logo!= null"> 
+					 	logo = #{logo},
+					 </if> 
+					<if test="nickName!= null"> 
+					 	nickName = #{nickName},
+					 </if> 
+					<if test="consumMony!= null"> 
+					 	consumMony = #{consumMony},
+					 </if> 
+					<if test="merchantCode!= null"> 
+					 	merchantCode = #{merchantCode},
+					 </if> 
+					<if test="merchantName!= null"> 
+					 	merchantName = #{merchantName},
+					 </if> 
+					<if test="returnMoney!= null"> 
+					 	returnMoney = #{returnMoney},
+					 </if> 
+					<if test="consumTime!= null"> 
+					 	consumTime = #{consumTime}
+					 </if> 
+					  <if test="orderNumber!= null"> 
+					 	orderNumber = #{orderNumber},
+					 </if>
+					 <if test="createDt!= null"> 
+					 	createDt = #{createDt},
+					 </if> 
+				</set>
+			where id=#{id} 
+		</update>
+
+		<delete id="deleteFansConsumReturn" parameterType="cn.pluss.platform.entity.FansConsumReturn" >
+			DELETE FROM tb_pluss_fans_consum_return where id=#{id}
+		</delete>
+
+		<select id="queryFansConsumReturnPage" parameterType="java.util.Map" resultType="cn.pluss.platform.entity.FansConsumReturn">
+			SELECT * from tb_pluss_fans_consum_return 
+				<where> 
+					<if test="id!= null"> 
+					and id = #{id}
+					 </if> 
+					<if test="logo!= null"> 
+					and logo = #{logo}
+					 </if> 
+					<if test="nickName!= null"> 
+					and nickName like CONCAT("%",#{nickName},"%")
+					 </if> 
+					<if test="consumMony!= null"> 
+					and consumMony = #{consumMony}
+					 </if> 
+					<if test="merchantCode!= null"> 
+					and merchantCode = #{merchantCode}
+					 </if> 
+					<if test="merchantName!= null"> 
+					and merchantName = #{merchantName}
+					 </if> 
+					<if test="returnMoney!= null"> 
+					and returnMoney = #{returnMoney}
+					 </if> 
+					  <if test="orderNumber!= null"> 
+					 	and orderNumber = #{orderNumber}
+					 </if>
+					<if test="startTime!= null"> 
+                         <![CDATA[
+                            and  DATE_FORMAT(createDt, '%Y-%m-%d %H:%i:%S')>=DATE_FORMAT(#{startTime}, '%Y-%m-%d %H:%i:%S')
+                         ]]>
+                     </if> 
+                    <if test="endTime!= null"> 
+                         <![CDATA[
+                            and  DATE_FORMAT(createDt, '%Y-%m-%d %H:%i:%S')<=DATE_FORMAT(#{endTime}, '%Y-%m-%d %H:%i:%S')
+                         ]]>
+                     </if> 
+				 </where> 
+			order by id desc  limit #{pageSize}  offset  #{offset}  
+		</select>
+
+		<select id="queryFansConsumReturnPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+			SELECT count(*) from tb_pluss_fans_consum_return 
+					<where> 
+					<if test="id!= null"> 
+					 and id = #{id}
+					 </if> 
+					<if test="logo!= null"> 
+					 and logo = #{logo}
+					 </if> 
+					<if test="nickName!= null"> 
+					 and nickName like CONCAT("%",#{nickName},"%")
+					 </if> 
+					<if test="consumMony!= null"> 
+					 and consumMony = #{consumMony}
+					 </if> 
+					<if test="merchantCode!= null"> 
+					 and merchantCode = #{merchantCode}
+					 </if> 
+					<if test="merchantName!= null"> 
+					 and merchantName = #{merchantName}
+					 </if> 
+					<if test="returnMoney!= null"> 
+					 and returnMoney = #{returnMoney}
+					 </if> 
+					  <if test="orderNumber!= null"> 
+					 	and orderNumber = #{orderNumber}
+					 </if>
+					<if test="startTime!= null"> 
+                         <![CDATA[
+                            and  DATE_FORMAT(createDt, '%Y-%m-%d %H:%i:%S')>=DATE_FORMAT(#{startTime}, '%Y-%m-%d %H:%i:%S')
+                         ]]>
+                     </if> 
+                    <if test="endTime!= null"> 
+                         <![CDATA[
+                            and  DATE_FORMAT(createDt, '%Y-%m-%d %H:%i:%S')<=DATE_FORMAT(#{endTime}, '%Y-%m-%d %H:%i:%S')
+                         ]]>
+                     </if> 
+				</where>
+		</select>
+		
+		<!-- 统计粉丝消费金额  统计粉丝消费奖励金额 -->
+		<select id="sumFansConsumReturnInfo" resultType="cn.pluss.platform.vo.FansInfoCountVO">
+            select (SELECT IFNULL(SUM(consumMoney),0) FROM tb_pluss_fans WHERE lastMerchantCode=#{merchantCode} AND  date(createDt) = curdate()) AS  fansConsumMonyNowDayCount,(select IFNULL(SUM(shareMoney),0) from tb_pluss_fans where lastMerchantCode=#{merchantCode} AND date(createDt) = curdate()) as fansReturnMoneyNowDayCount
+           
+        </select>
+        
+        <!-- 可提现总金额（提现规则  超过一个月的时间）  -->
+        <select id="sumFansAllowCashMoney"  parameterType="java.util.Map" resultType="java.lang.Double">
+             select IFNULL(sum(shareMoney),0) as returnMoney from tb_pluss_fans where lastMerchantCode=#{merchantCode} and createDt &lt;= (SELECT DATE_ADD(now(),INTERVAL -1 DAY))
+        </select>
+        
+        <!--不可提现金额 （为超过一个月 不可提现） -->
+         <select id="sumFansNotAllowCashMoney" parameterType="java.util.Map" resultType="java.lang.Double">
+             select IFNULL(sum(shareMoney),0) as returnMoney from tb_pluss_fans where lastMerchantCode=#{merchantCode} and createDt &gt; (SELECT DATE_ADD(now(),INTERVAL -1 DAY))
+        </select>
+		
+		<!-- 今日分润 -->
+		<select id="sumNowDayShareMoney"  parameterType="java.util.Map" resultType="java.lang.Double">
+		   select IFNULL(sum(shareMoney),0) as returnMoney From tb_pluss_fans where lastMerchantCode=#{merchantCode} and createDt &gt; #{startTime} and createDt &lt; #{endTime}
+        </select>
+        
+        <!-- 今日奖励 -->
+		<select id="sumNowReturnMoney" parameterType="java.util.Map"  resultType="java.lang.Double">
+		   select IFNULL(sum(shareMoney),0) as returnMoney From tb_pluss_fans where lastMerchantCode=#{merchantCode} and createDt &gt; #{startTime} and createDt &lt; #{endTime}
+        </select>
+        
+        <!-- 累计总分润  -->
+        <select id="sumAllShareMoney" parameterType="java.util.Map" resultType="java.lang.Double">
+           select IFNULL(sum(shareMoney),0) as returnMoney From tb_pluss_fans where lastMerchantCode=#{merchantCode}
+        </select>
+        
+        <!-- 累计总分润  -->
+        <select id="sumShareMoney" parameterType="java.util.Map" resultType="java.lang.Double">
+           select IFNULL(sum(returnMoney),0) as returnMoney From tb_pluss_fans_consum_return
+        </select>
+        
+        <select id="sumReturnMoneyByTime" parameterType="java.util.Map" resultType="java.lang.Double">
+			SELECT sum(returnMoney) from tb_pluss_fans_consum_return 
+					<where> 
+					<if test="startTime!= null"> 
+					 and consumTime &gt; #{startTime}
+					 </if> 
+					 <if test="endTime!= null"> 
+					 and consumTime &lt; #{endTime}
+					 </if> 
+					 <if test="childList!= null"> 
+					 and merchantCode in
+					 (
+					 <foreach collection="childList" item="item" index="index" separator=",">
+						#{merchantCode}
+					 </foreach>
+					 )
+					 </if> 
+				</where>
+		</select>
+        
+
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/GuideLabelMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/GuideLabelMapper.xml
new file mode 100644
index 0000000..1a5c98f
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/GuideLabelMapper.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.GuideLabelMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.GuideLabel">
+        <id column="id" property="id" />
+        <result column="name" property="name" />
+        <result column="status" property="status" />
+        <result column="createTime" property="createTime" />
+        <result column="updateTime" property="updateTime" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/HelpVideo-sqlmap.xml b/pluss-dao-bundle/src/main/resources/mapper/HelpVideo-sqlmap.xml
new file mode 100644
index 0000000..5290d89
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/HelpVideo-sqlmap.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="cn.pluss.platform.mapper.HelpVideoMapper">
+
+    <insert id="saveHelpVideo" parameterType="cn.pluss.platform.entity.HelpVideo">
+        	insert into tb_pluss_help_video(name,createDt,content,videoUrl,type)VALUES(#{name},NOW(),#{content},#{videoUrl},#{type})
+    	</insert>
+
+    <insert id="saveHelpVideoBatch">
+        insert into tb_pluss_help_video(name,createDt,content,videoUrl,type) VALUES
+        <foreach collection="list" item="item" index="index" separator=",">
+            (#{name},#{createDt},#{content},#{videoUrl},#{type}		)
+        </foreach>
+    </insert>
+
+    <select id="queryHelpVideo" parameterType="cn.pluss.platform.entity.HelpVideo" resultType="cn.pluss.platform.entity.HelpVideo">
+        SELECT * from tb_pluss_help_video
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="name!= null">
+                and name = #{name}
+            </if>
+            <if test="createDt!= null">
+                and createDt = #{createDt}
+            </if>
+            <if test="content!= null">
+                and content = #{content}
+            </if>
+            <if test="videoUrl!= null">
+                and videoUrl = #{videoUrl}
+            </if>
+            <if test="type!= null">
+                and type = #{type}
+            </if>
+        </where>
+    </select>
+
+    <select id="queryHelpVideoList" parameterType="cn.pluss.platform.entity.HelpVideo" resultType="cn.pluss.platform.entity.HelpVideo">
+        SELECT * from tb_pluss_help_video
+        <where>
+            <if test="id!= null">
+                and 	id = #{id}
+            </if>
+            <if test="name!= null">
+                and 	name = #{name}
+            </if>
+            <if test="createDt!= null">
+                and 	createDt = #{createDt}
+            </if>
+            <if test="content!= null">
+                and 	content = #{content}
+            </if>
+            <if test="videoUrl!= null">
+                and 	videoUrl = #{videoUrl}
+            </if>
+            <if test="type!= null">
+                and 	type = #{type}
+            </if>
+        </where>
+    </select>
+
+    <update id="updateHelpVideo" parameterType="cn.pluss.platform.entity.HelpVideo" >
+        update tb_pluss_help_video
+        <set>
+            <if test="name!= null">
+                name = #{name},
+            </if>
+            <if test="createDt!= null">
+                createDt = #{createDt},
+            </if>
+            <if test="content!= null">
+                content = #{content},
+            </if>
+            <if test="videoUrl!= null">
+                videoUrl = #{videoUrl},
+            </if>
+            <if test="type!= null">
+                type = #{type}
+            </if>
+        </set>
+        where id=#{id}
+    </update>
+
+    <delete id="deleteHelpVideo" parameterType="cn.pluss.platform.entity.HelpVideo" >
+			DELETE FROM tb_pluss_help_video where id=#{id}
+		</delete>
+
+    <select id="queryHelpVideoPage" parameterType="java.util.Map" resultType="cn.pluss.platform.entity.HelpVideo">
+        SELECT * from tb_pluss_help_video
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="name!= null">
+                and name like CONCAT("%",#{name},"%")
+            </if>
+            <if test="createDt!= null">
+                and createDt = #{createDt}
+            </if>
+            <if test="content!= null">
+                and content = #{content}
+            </if>
+            <if test="videoUrl!= null">
+                and videoUrl = #{videoUrl}
+            </if>
+            <if test="type!= null">
+                and type = #{type}
+            </if>
+        </where>
+        order by sort  limit #{pageSize}  offset  #{offset}
+    </select>
+
+    <select id="queryHelpVideoPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+        SELECT count(*) from tb_pluss_help_video
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="name!= null">
+                and name = #{name}
+            </if>
+            <if test="createDt!= null">
+                and createDt = #{createDt}
+            </if>
+            <if test="content!= null">
+                and content = #{content}
+            </if>
+            <if test="videoUrl!= null">
+                and videoUrl = #{videoUrl}
+            </if>
+            <if test="type!= null">
+                and type = #{type}
+            </if>
+        </where>
+    </select>
+
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/HomeMapper-sqlmap.xml b/pluss-dao-bundle/src/main/resources/mapper/HomeMapper-sqlmap.xml
new file mode 100644
index 0000000..de1ae3c
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/HomeMapper-sqlmap.xml
@@ -0,0 +1,951 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="cn.pluss.platform.mapper.HomeMapper">
+    <select id="queryMerchantBaseInfoPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+        SELECT count(*) from tb_pluss_merchant_base_info
+    </select>
+
+    <select id="queryMerchantFansCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+        SELECT COUNT(*)
+        FROM tb_pluss_fans pf
+        LEFT JOIN tb_pluss_merchant_base_info mbi
+        ON mbi.merchantCode = pf.merchantCode
+        <where>
+            pf.nickName is not null and pf.nickName!=''
+            <if test="merchantCode!=null and merchantCode!=''">
+                and mbi.bindingCode =( SELECT bindingCode FROM tb_pluss_merchant_base_info WHERE merchantCode = #{merchantCode})
+            </if>
+        </where>
+    </select>
+
+    <select id="queryTodayFanCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+        SELECT count(*) from tb_pluss_fans
+        <where>
+            nickName is not null and nickName!=''
+            <if test="merchantCode!= null">
+                and merchantCode IN (SELECT merchantCode
+                FROM tb_pluss_merchant_base_info
+                WHERE bindingCode = (SELECT bindingCode
+                FROM tb_pluss_merchant_base_info
+                where merchantCode = #{merchantCode}))
+            </if>
+            <if test="stTime != null ">
+                <![CDATA[
+                            and  DATE_FORMAT(consumTime, '%Y-%m-%d %H:%i:%S')>=DATE_FORMAT(#{stTime}, '%Y-%m-%d %H:%i:%S')
+                         ]]>
+            </if>
+            <if test="endTime != null ">
+                <![CDATA[
+                            and  DATE_FORMAT(consumTime, '%Y-%m-%d %H:%i:%S')<=DATE_FORMAT(#{endTime}, '%Y-%m-%d %H:%i:%S')
+                         ]]>
+            </if>
+        </where>
+    </select>
+
+    <select id="getOrderFeeSum1" parameterType="java.util.Map" resultType="java.lang.Double">
+        SELECT sum(consumeFee) from tb_pluss_merchant_order
+        <where>
+            <include refid="commom_where_if"/>
+        </where>
+    </select>
+
+    <select id="queryMerchantOrderPageCount"
+            parameterType="java.util.Map" resultType="java.lang.Integer">
+        SELECT count(1) from tb_pluss_merchant_order
+        <where>
+            <include refid="commom_where_if"/>
+            <if test="stTime != null ">
+                <![CDATA[
+                            and  DATE_FORMAT(transDt, '%Y-%m-%d %H:%i:%S')>=DATE_FORMAT(#{stTime}, '%Y-%m-%d %H:%i:%S')
+                         ]]>
+            </if>
+            <if test="endTime != null ">
+                <![CDATA[
+                            and  DATE_FORMAT(transDt, '%Y-%m-%d %H:%i:%S')<=DATE_FORMAT(#{endTime}, '%Y-%m-%d %H:%i:%S')
+                         ]]>
+            </if>
+        </where>
+    </select>
+
+    <select id="manageQueryMerchantMenberPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+        SELECT count(1) from tb_pluss_merchant_menber  mm LEFT JOIN tb_pluss_merchant_base_info mbi on mbi.merchantCode = mm.merchantCode
+        <where>
+            <if test="merchantCode!= null">
+                and mbi.merchantCode in (SELECT merchantCode
+                FROM tb_pluss_merchant_base_info
+                WHERE bindingCode =(SELECT bindingCode
+                FROM tb_pluss_merchant_base_info
+                where merchantCode = #{merchantCode}))
+            </if>
+            <if test="nickName == null">
+                and mm.nickName !='null'
+            </if>
+        </where>
+    </select>
+
+    <select id="manageMerchantMenberSum" parameterType="java.util.Map" resultType="java.lang.Double">
+			SELECT SUM(mm.usableRechargeFee+mm.usableGiveFee)
+			FROM tb_pluss_merchant_menber mm
+			LEFT JOIN tb_pluss_merchant_base_info mbi ON mbi.merchantCode = mm.merchantCode
+			WHERE mm.merchantCode in (SELECT merchantCode
+            FROM tb_pluss_merchant_base_info
+            WHERE bindingCode = (SELECT bindingCode
+            FROM tb_pluss_merchant_base_info
+            where merchantCode = #{merchantCode}))
+	</select>
+
+    <select id="queryFansList" parameterType="cn.pluss.platform.entity.Fans" resultType="cn.pluss.platform.entity.Fans">
+        SELECT * from tb_pluss_fans
+        <where>
+            lastMerchantCode IS NOT NULL
+            <if test="merchantCode!= null">
+                and lastMerchantCode in (SELECT merchantCode
+                FROM tb_pluss_merchant_base_info
+                WHERE bindingCode =(SELECT bindingCode
+                FROM tb_pluss_merchant_base_info
+                where merchantCode = #{merchantCode}))
+            </if>
+        </where>
+    </select>
+
+    <select id="getToDayTransSum1" parameterType="java.util.Map" resultType="java.lang.Double">
+        SELECT sum(consumeFee) from tb_pluss_merchant_order
+        <where>
+            <if test="merchantCode!= null">
+                and merchantCode IN (SELECT merchantCode
+                FROM tb_pluss_merchant_base_info
+                WHERE bindingCode = (SELECT bindingCode
+                FROM tb_pluss_merchant_base_info
+                where merchantCode = #{merchantCode}))
+            </if>
+            <if test="consumeFee!= null">
+                and consumeFee = #{consumeFee}
+            </if>
+            <if test="createDt!= null">
+                and createDt = #{createDt}
+            </if>
+            <if test="status!= null">
+                and status = #{status}
+            </if>
+            <if test="endTime != null">
+                and createDt <![CDATA[<=]]> #{endTime}
+            </if>
+            <if test="transDt!= null">
+                and transDt = #{transDt}
+            </if>
+            <if test="staffName!= null">
+                and staffName = #{staffName}
+            </if>
+            <if test="stTime!= null">
+                and transDt <![CDATA[>=]]> #{stTime}
+            </if>
+            <if test="endTime!= null">
+                and transDt <![CDATA[<=]]> #{endTime}
+            </if>
+        </where>
+    </select>
+
+    <select id="toDayTransZfbSum" parameterType="java.util.Map" resultType="java.lang.Double">
+        SELECT sum(consumeFee) from tb_pluss_merchant_order
+        <where>
+            <if test="merchantCode!= null">
+                and merchantCode IN (SELECT merchantCode
+                FROM tb_pluss_merchant_base_info
+                WHERE bindingCode = (SELECT bindingCode
+                FROM tb_pluss_merchant_base_info
+                where merchantCode = #{merchantCode}))
+            </if>
+            <if test="consumeFee!= null">
+                and consumeFee = #{consumeFee}
+            </if>
+            <if test="createDt!= null">
+                and createDt = #{createDt}
+            </if>
+            <if test="status!= null">
+                and status = #{status}
+            </if>
+            <if test="endTime != null">
+                and createDt &lt;= #{endTime}
+            </if>
+            <if test="transDt!= null">
+                and transDt = #{transDt}
+            </if>
+            <if test="staffName!= null">
+                and staffName = #{staffName}
+            </if>
+            <if test="stTime!= null">
+                and transDt  <![CDATA[>=]]> #{stTime}
+            </if>
+            <if test="endTime!= null">
+                and transDt <![CDATA[<=]]> #{endTime}
+            </if>
+            and (payTypeCode='leshuaPay0' or payTypeCode= 'aliPay' or payTypeCode='sxfPay0')
+        </where>
+    </select>
+
+    <select id="toDayTransWxSum" parameterType="java.util.Map" resultType="java.lang.Double">
+        SELECT sum(consumeFee) from tb_pluss_merchant_order
+        <where>
+            <if test="merchantCode!= null">
+                and merchantCode IN (SELECT merchantCode
+                FROM tb_pluss_merchant_base_info
+                WHERE bindingCode = (SELECT bindingCode
+                FROM tb_pluss_merchant_base_info
+                where merchantCode = #{merchantCode}))
+            </if>
+            <if test="consumeFee!= null">
+                and consumeFee = #{consumeFee}
+            </if>
+            <if test="createDt!= null">
+                and createDt = #{createDt}
+            </if>
+            <if test="status!= null">
+                and status = #{status}
+            </if>
+            <if test="endTime != null">
+                and createDt &lt;= #{endTime}
+            </if>
+            <if test="transDt!= null">
+                and transDt = #{transDt}
+            </if>
+            <if test="staffName!= null">
+                and staffName = #{staffName}
+            </if>
+            <if test="stTime!= null">
+                and transDt  <![CDATA[>=]]> #{stTime}
+            </if>
+            <if test="endTime!= null">
+                and transDt <![CDATA[<=]]> #{endTime}
+            </if>
+            and (payTypeCode='leshuaPay1' or payTypeCode= 'wechatPay' or payTypeCode='sxfPay1')
+        </where>
+    </select>
+
+    <select id="toDayTransYsfSum" parameterType="java.util.Map" resultType="java.lang.Double">
+        SELECT sum(consumeFee) from tb_pluss_merchant_order
+        <where>
+            <if test="merchantCode!= null">
+                and merchantCode IN (SELECT merchantCode
+                FROM tb_pluss_merchant_base_info
+                WHERE bindingCode = (SELECT bindingCode
+                FROM tb_pluss_merchant_base_info
+                where merchantCode = #{merchantCode}))
+            </if>
+
+            <if test="consumeFee!= null">
+                and consumeFee = #{consumeFee}
+            </if>
+
+            <if test="createDt!= null">
+                and createDt = #{createDt}
+            </if>
+
+            <if test="status!= null">
+                and status = #{status}
+            </if>
+
+            <if test="endTime != null">
+                and createDt &lt;= #{endTime}
+            </if>
+            <if test="transDt!= null">
+                and transDt = #{transDt}
+            </if>
+            <if test="staffName!= null">
+                and staffName = #{staffName}
+            </if>
+            <if test="stTime!= null">
+                and transDt  <![CDATA[>=]]> #{stTime}
+            </if>
+            <if test="endTime!= null">
+                and transDt <![CDATA[<=]]> #{endTime}
+            </if>
+            and payTypeCode='sxfPay2'
+        </where>
+    </select>
+
+    <select id="toDayTransZfbCount"
+            parameterType="java.util.Map" resultType="java.lang.Integer">
+        SELECT count(*) from tb_pluss_merchant_order
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="orderNumber!= null">
+                and orderNumber like CONCAT("%",#{orderNumber},"%")
+            </if>
+            <if test="merchantCode!= null">
+                and merchantCode IN (SELECT merchantCode
+                FROM tb_pluss_merchant_base_info
+                WHERE bindingCode = (SELECT bindingCode
+                FROM tb_pluss_merchant_base_info
+                where merchantCode = #{merchantCode}))
+            </if>
+            <if test="merchantName!= null">
+                and merchantName = #{merchantName}
+            </if>
+            <if test="payTypeCode!= null">
+                and payTypeCode = #{payTypeCode}
+            </if>
+            <if test="payTypeName!= null">
+                and payTypeName = #{payTypeName}
+            </if>
+            <if test="consumeFee!= null">
+                and consumeFee = #{consumeFee}
+            </if>
+            <if test="transNo!= null">
+                and transNo like CONCAT("%",#{transNo},"%")
+            </if>
+            <if test="memberCode!= null">
+                and memberCode like CONCAT("%",#{memberCode},"%")
+            </if>
+            <if test="storeId!= null">
+                and storeId = #{storeId}
+            </if>
+            <if test="storeName!= null">
+                and storeName like CONCAT("%",#{storeName},"%")
+            </if>
+            <if test="createDt!= null">
+                and createDt = #{createDt}
+            </if>
+            <if test="staffCode!= null">
+                and staffCode = #{staffCode}
+            </if>
+            <if test="status!= null">
+                and status = #{status}
+            </if>
+            <if test="shareMoney!= null">
+                and shareMoney = #{shareMoney}
+            </if>
+            <if test="aliPayTransNo!= null">
+                and aliPayTransNo = #{aliPayTransNo}
+            </if>
+            <if test="enterFee!= null">
+                and enterFee = #{enterFee}
+            </if>
+            <if test="weChatTransNo!= null">
+                and weChatTransNo = #{weChatTransNo}
+            </if>
+            <if test="aisleSwitch!= null">
+                and aisleSwitch = #{aisleSwitch}
+            </if>
+            <if test="leshuaMerchantRefundId!= null">
+                and leshuaMerchantRefundId = #{leshuaMerchantRefundId}
+            </if>
+            <if test="leshuaTransNo!= null">
+                and leshuaTransNo = #{leshuaTransNo}
+            </if>
+            <if test="orderType!= null">
+                and orderType = #{orderType}
+            </if>
+            <if test="promoteruserId!= null">
+                and promoteruserId = #{promoteruserId}
+            </if>
+            <if test="userImg!= null">
+                and userImg = #{userImg}
+            </if>
+            <if test="nickName!= null">
+                and nickName = #{nickName}
+            </if>
+            <if test="remark!= null">
+                and remark = #{remark}
+            </if>
+            <if test="transDt!= null">
+                and transDt = #{transDt}
+            </if>
+            <if test="staffName!= null">
+                and staffName = #{staffName}
+            </if>
+            <if test="stTime!= null">
+                and transDt  <![CDATA[>=]]> #{stTime}
+            </if>
+            <if test="endTime!= null">
+                and transDt <![CDATA[<=]]> #{endTime}
+            </if>
+            and (payTypeCode='leshuaPay0' or payTypeCode= 'aliPay' or payTypeCode='sxfPay0')
+        </where>
+
+    </select>
+
+    <!-- 今日微信收款笔数 -->
+    <select id="toDayTransWxCount"
+            parameterType="java.util.Map" resultType="java.lang.Integer">
+        SELECT count(*) from tb_pluss_merchant_order
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="orderNumber!= null">
+                and orderNumber like CONCAT("%",#{orderNumber},"%")
+            </if>
+            <if test="merchantCode!= null">
+                and merchantCode IN (SELECT merchantCode
+                FROM tb_pluss_merchant_base_info
+                WHERE bindingCode = (SELECT bindingCode
+                FROM tb_pluss_merchant_base_info
+                where merchantCode = #{merchantCode}))
+            </if>
+            <if test="merchantName!= null">
+                and merchantName = #{merchantName}
+            </if>
+            <if test="payTypeCode!= null">
+                and payTypeCode = #{payTypeCode}
+            </if>
+            <if test="payTypeName!= null">
+                and payTypeName = #{payTypeName}
+            </if>
+            <if test="consumeFee!= null">
+                and consumeFee = #{consumeFee}
+            </if>
+            <if test="transNo!= null">
+                and transNo like CONCAT("%",#{transNo},"%")
+            </if>
+            <if test="memberCode!= null">
+                and memberCode like CONCAT("%",#{memberCode},"%")
+            </if>
+            <if test="storeId!= null">
+                and storeId = #{storeId}
+            </if>
+            <if test="storeName!= null">
+                and storeName like CONCAT("%",#{storeName},"%")
+            </if>
+            <if test="createDt!= null">
+                and createDt = #{createDt}
+            </if>
+
+            <if test="staffCode!= null">
+                and staffCode = #{staffCode}
+            </if>
+            <if test="status!= null">
+                and status = #{status}
+            </if>
+            <if test="shareMoney!= null">
+                and shareMoney = #{shareMoney}
+            </if>
+            <if test="aliPayTransNo!= null">
+                and aliPayTransNo = #{aliPayTransNo}
+            </if>
+            <if test="enterFee!= null">
+                and enterFee = #{enterFee}
+            </if>
+            <if test="weChatTransNo!= null">
+                and weChatTransNo = #{weChatTransNo}
+            </if>
+            <if test="aisleSwitch!= null">
+                and aisleSwitch = #{aisleSwitch}
+            </if>
+            <if test="leshuaMerchantRefundId!= null">
+                and leshuaMerchantRefundId = #{leshuaMerchantRefundId}
+            </if>
+            <if test="leshuaTransNo!= null">
+                and leshuaTransNo = #{leshuaTransNo}
+            </if>
+            <if test="orderType!= null">
+                and orderType = #{orderType}
+            </if>
+            <if test="promoteruserId!= null">
+                and promoteruserId = #{promoteruserId}
+            </if>
+            <if test="userImg!= null">
+                and userImg = #{userImg}
+            </if>
+            <if test="nickName!= null">
+                and nickName = #{nickName}
+            </if>
+            <if test="remark!= null">
+                and remark = #{remark}
+            </if>
+            <if test="transDt!= null">
+                and transDt = #{transDt}
+            </if>
+            <if test="staffName!= null">
+                and staffName = #{staffName}
+            </if>
+            <if test="stTime!= null">
+                and transDt  <![CDATA[>=]]> #{stTime}
+            </if>
+            <if test="endTime!= null">
+                and transDt <![CDATA[<=]]> #{endTime}
+            </if>
+            and (payTypeCode='leshuaPay1' or payTypeCode= 'wechatPay' or payTypeCode='sxfPay1')
+        </where>
+    </select>
+
+    <select id="toDayTransYsfCount"
+            parameterType="java.util.Map" resultType="java.lang.Integer">
+        SELECT count(1) from tb_pluss_merchant_order
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="orderNumber!= null">
+                and orderNumber like CONCAT("%",#{orderNumber},"%")
+            </if>
+            <if test="merchantCode!= null">
+                and merchantCode IN (SELECT merchantCode
+                FROM tb_pluss_merchant_base_info
+                WHERE bindingCode = (SELECT bindingCode
+                FROM tb_pluss_merchant_base_info
+                where merchantCode = #{merchantCode}))
+            </if>
+            <if test="merchantName!= null">
+                and merchantName = #{merchantName}
+            </if>
+            <if test="payTypeCode!= null">
+                and payTypeCode = #{payTypeCode}
+            </if>
+            <if test="payTypeName!= null">
+                and payTypeName = #{payTypeName}
+            </if>
+            <if test="consumeFee!= null">
+                and consumeFee = #{consumeFee}
+            </if>
+            <if test="transNo!= null">
+                and transNo like CONCAT("%",#{transNo},"%")
+            </if>
+            <if test="memberCode!= null">
+                and memberCode like CONCAT("%",#{memberCode},"%")
+            </if>
+            <if test="storeId!= null">
+                and storeId = #{storeId}
+            </if>
+            <if test="storeName!= null">
+                and storeName like CONCAT("%",#{storeName},"%")
+            </if>
+            <if test="createDt!= null">
+                and createDt = #{createDt}
+            </if>
+            <if test="staffCode!= null">
+                and staffCode = #{staffCode}
+            </if>
+            <if test="status!= null">
+                and status = #{status}
+            </if>
+            <if test="shareMoney!= null">
+                and shareMoney = #{shareMoney}
+            </if>
+            <if test="aliPayTransNo!= null">
+                and aliPayTransNo = #{aliPayTransNo}
+            </if>
+            <if test="enterFee!= null">
+                and enterFee = #{enterFee}
+            </if>
+            <if test="weChatTransNo!= null">
+                and weChatTransNo = #{weChatTransNo}
+            </if>
+            <if test="aisleSwitch!= null">
+                and aisleSwitch = #{aisleSwitch}
+            </if>
+            <if test="leshuaMerchantRefundId!= null">
+                and leshuaMerchantRefundId = #{leshuaMerchantRefundId}
+            </if>
+            <if test="leshuaTransNo!= null">
+                and leshuaTransNo = #{leshuaTransNo}
+            </if>
+            <if test="orderType!= null">
+                and orderType = #{orderType}
+            </if>
+            <if test="promoteruserId!= null">
+                and promoteruserId = #{promoteruserId}
+            </if>
+            <if test="userImg!= null">
+                and userImg = #{userImg}
+            </if>
+            <if test="nickName!= null">
+                and nickName = #{nickName}
+            </if>
+            <if test="remark!= null">
+                and remark = #{remark}
+            </if>
+            <if test="transDt!= null">
+                and transDt = #{transDt}
+            </if>
+            <if test="staffName!= null">
+                and staffName = #{staffName}
+            </if>
+            <if test="stTime!= null">
+                and transDt  <![CDATA[>=]]> #{stTime}
+            </if>
+            <if test="endTime!= null">
+                and transDt <![CDATA[<=]]> #{endTime}
+            </if>
+            and payTypeCode='sxfPay2'
+        </where>
+    </select>
+
+    <select id="queryMerchantOrderPage"
+            parameterType="java.util.Map"
+            resultType="cn.pluss.platform.entity.MerchantOrder">
+        SELECT * from tb_pluss_merchant_order
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="orderNumber!= null">
+                and orderNumber like CONCAT("%",#{orderNumber},"%")
+            </if>
+            <if test="merchantCode!= null">
+                and merchantCode IN (SELECT merchantCode
+                FROM tb_pluss_merchant_base_info
+                WHERE bindingCode = (SELECT bindingCode
+                FROM tb_pluss_merchant_base_info
+                where merchantCode = #{merchantCode}))
+            </if>
+            <if test="merchantName!= null">
+                and merchantName like CONCAT("%",#{merchantName},"%")
+            </if>
+            <if test="payTypeCode!= null">
+                and payTypeCode = #{payTypeCode}
+            </if>
+            <if test="payTypeName!= null">
+                and payTypeName = #{payTypeName}
+            </if>
+            <if test="consumeFee!= null">
+                and consumeFee = #{consumeFee}
+            </if>
+            <if test="transNo!= null">
+                and transNo like CONCAT("%",#{transNo},"%")
+            </if>
+            <if test="memberCode!= null">
+                and memberCode like CONCAT("%",#{memberCode},"%")
+            </if>
+            <if test="storeId!= null">
+                and storeId = #{storeId}
+            </if>
+            <if test="storeName!= null">
+                and storeName like CONCAT("%",#{storeName},"%")
+            </if>
+            <if test="createDt!= null">
+                and createDt = #{createDt}
+            </if>
+            <if test="staffCode!= null">
+                and staffCode = #{staffCode}
+            </if>
+            <if test="status!= null">
+                and status = #{status}
+            </if>
+            <if test="shareMoney!= null">
+                and shareMoney = #{shareMoney}
+            </if>
+            <if test="aliPayTransNo!= null">
+                and aliPayTransNo = #{aliPayTransNo}
+            </if>
+            <if test="enterFee!= null">
+                and enterFee = #{enterFee}
+            </if>
+            <if test="weChatTransNo!= null">
+                and weChatTransNo = #{weChatTransNo}
+            </if>
+            <if test="aisleSwitch!= null">
+                and aisleSwitch = #{aisleSwitch}
+            </if>
+            <if test="leshuaMerchantRefundId!= null">
+                and leshuaMerchantRefundId = #{leshuaMerchantRefundId}
+            </if>
+            <if test="leshuaTransNo!= null">
+                and leshuaTransNo = #{leshuaTransNo}
+            </if>
+            <if test="orderType!= null">
+                and orderType = #{orderType}
+            </if>
+            <if test="promoteruserId!= null">
+                and promoteruserId = #{promoteruserId}
+            </if>
+            <if test="userImg!= null">
+                and userImg = #{userImg}
+            </if>
+            <if test="nickName!= null">
+                and nickName = #{nickName}
+            </if>
+            <if test="startTime != null">
+                and createDt <![CDATA[>=]]> #{startTime}
+            </if>
+            <if test="remark!= null">
+                and remark = #{remark}
+            </if>
+            <if test="endTime != null">
+                and createDt <![CDATA[<=]]> #{endTime}
+            </if>
+            <if test="transDt!= null">
+                and transDt = #{transDt}
+            </if>
+            <if test="staffName!= null">
+                and staffName = #{staffName}
+            </if>
+            <if test="stTime!= null">
+                and transDt  <![CDATA[>=]]> #{stTime}
+            </if>
+            <if test="endTime!= null">
+                and transDt <![CDATA[<=]]> #{endTime}
+            </if>
+        </where>
+        <!-- order by id desc  limit #{pageSize}  offset  #{offset} -->
+    </select>
+
+    <select id="queryFansTodayCount" parameterType="cn.pluss.platform.entity.Fans" resultType="java.lang.Double">
+        select sum(shareMoney) from tb_pluss_fans
+        <where>
+            <if test="merchantCode!= null">
+                and merchantCode IN (SELECT merchantCode
+                FROM tb_pluss_merchant_base_info
+                WHERE bindingCode = (SELECT bindingCode
+                FROM tb_pluss_merchant_base_info
+                where merchantCode = #{merchantCode}))
+            </if>
+            <if test="stTime!= null">
+                and createDt <![CDATA[>=]]> #{stTime}
+            </if>
+            <if test="endTime!= null">
+                and createDt <![CDATA[<=]]> #{endTime}
+            </if>
+        </where>
+    </select>
+
+    <select id="queryMerchantMenberPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+        SELECT count(*) from tb_pluss_merchant_menber
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="nickName== null">
+                and nickName !='null'
+            </if>
+            <if test="merchantCode!= null">
+                and merchantCode IN (SELECT merchantCode
+                FROM tb_pluss_merchant_base_info
+                WHERE bindingCode = (SELECT bindingCode
+                FROM tb_pluss_merchant_base_info
+                where merchantCode = #{merchantCode}))
+            </if>
+            <if test="merchantName!= null">
+                and merchantName = #{merchantName}
+            </if>
+            <if test="storeId!= null">
+                and storeId = #{storeId}
+            </if>
+            <if test="storeName!= null">
+                and storeName = #{storeName}
+            </if>
+            <if test="status!= null">
+                and status = #{status}
+            </if>
+            <if test="createDt!= null">
+                and createDt = #{createDt}
+            </if>
+            <if test="stTime!= null">
+                and createDt <![CDATA[>=]]> #{stTime}
+            </if>
+            <if test="endTime!= null">
+                and createDt <![CDATA[<=]]> #{endTime}
+            </if>
+            <if test="logo!= null">
+                and logo = #{logo}
+            </if>
+            <if test="memberCode!= null">
+                and memberCode = #{memberCode}
+            </if>
+            <if test="keyWord!=null">
+                and (
+                <if test="nickName!= null">
+                    nickName like CONCAT("%",#{nickName},"%")
+                </if>
+                <if test="phone!= null">
+                    or phone like CONCAT("%",#{phone},"%")
+                </if>
+                )
+            </if>
+            <if test="openid!= null">
+                and openid = #{openid}
+            </if>
+            <if test="alipayUserId!= null">
+                and alipayUserId = #{alipayUserId}
+            </if>
+            <if test="comsumeMoney!= null">
+                and comsumeMoney = #{comsumeMoney}
+            </if>
+            <if test="profitMoney!= null">
+                and profitMoney = #{profitMoney}
+            </if>
+            <if test="orderNumber!= null">
+                and orderNumber = #{orderNumber}
+            </if>
+            <if test="totalRechargeFee!= null">
+                and totalRechargeFee = #{totalRechargeFee}
+            </if>
+            <if test="usableRechargeFee!= null">
+                and usableRechargeFee = #{usableRechargeFee}
+            </if>
+            <if test="totalGiveFee!= null">
+                and totalGiveFee = #{totalGiveFee}
+            </if>
+            <if test="usableGiveFee!= null">
+                and usableGiveFee = #{usableGiveFee}
+            </if>
+            <if test="cardNo!= null">
+                and cardNo = #{cardNo}
+            </if>
+            <if test="birthdayDt!= null">
+                and birthdayDt = #{birthdayDt}
+            </if>
+            <if test="memberName!= null">
+                and memberName Like CONCAT('%',#{memberName},'%')
+            </if>
+            <if test="provinces!= null">
+                and provinces = #{provinces}
+            </if>
+            <if test="sex!= null">
+                and sex = #{sex}
+            </if>
+            <if test="bindingUrl!= null">
+                and bindingUrl = #{bindingUrl}
+            </if>
+            <if test="appOpenId!= null">
+                and appOpenId = #{appOpenId}
+            </if>
+        </where>
+    </select>
+
+    <select id="queryMerchantProfitSumPrice" parameterType="java.util.Map" resultType="java.lang.Double">
+        SELECT sum(price) from tb_pluss_merchant_profit profit
+        <where>
+            <if test="id!= null">
+                and profit.id = #{id}
+            </if>
+            <if test="agentStaffId != null">
+                and profit.agentStaffId = #{agentStaffId}
+            </if>
+            <if test="userId!= null">
+                and profit.userId = #{userId}
+            </if>
+            <if test="type!= null">
+                and profit.type = #{type}
+            </if>
+            <if test="price!= null">
+                and profit.price = #{price}
+            </if>
+            <if test="orderNumber!= null">
+                and profit.orderNumber = #{orderNumber}
+            </if>
+            <if test="merchantName!= null">
+                and profit.merchantName = #{merchantName}
+            </if>
+            <if test="agentStaffId != null">
+                and profit.agentStaffId = #{agentStaffId}
+            </if>
+            <if test="consumeFee!= null">
+                and profit.consumeFee = #{consumeFee}
+            </if>
+            <if test="createDt!= null">
+                and profit.createDt = #{createDt}
+            </if>
+            <if test="stTime!= null">
+                and profit.createDt <![CDATA[>=]]> #{stTime}
+            </if>
+            <if test="enTime!= null">
+                and profit.createDt <![CDATA[<=]]> #{enTime}
+            </if>
+            <if test="orderDt!= null">
+                and profit.orderDt = #{orderDt}
+            </if>
+            <if test="status!= null">
+                and profit.status = #{status}
+            </if>
+            <if test="startTime!= null">
+                and profit.createDt <![CDATA[>]]> #{startTime}
+            </if>
+            <if test="endTime!= null">
+                and profit.createDt <![CDATA[<]]> #{endTime}
+            </if>
+            <if test="payTypeCode!= null">
+                and profit.payTypeCode = #{payTypeCode}
+            </if>
+            <if test="payTypeName!= null">
+                and profit.payTypeName = #{payTypeName}
+            </if>
+            <if test="merchantLogo!= null">
+                and profit.merchantLogo = #{merchantLogo}
+            </if>
+            <if test="level!= null">
+                and profit.level = #{level}
+            </if>
+            <if test="merchantParentId!= null">
+                and profit.merchantParentId = #{merchantParentId}
+            </if>
+            <if test="merchantParentName!= null">
+                and profit.merchantParentName = #{merchantParentName}
+            </if>
+            <if test="merchantParentLogo!= null">
+                and profit.merchantParentLogo = #{merchantParentLogo}
+            </if>
+            <if test="startTime!= null">
+                and profit.createDt <![CDATA[>]]> #{startTime}
+            </if>
+            <if test="endTime!= null">
+                and profit.createDt <![CDATA[<]]> #{endTime}
+            </if>
+            <if test="merchantCodeList!= null">
+                and profit.merchantCode in
+                <foreach collection="merchantCodeList" item="item" open="(" close=")" index="index" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="phone!= null">
+                and profit.phone = #{phone}
+            </if>
+            <if test="userName!= null">
+                and profit.userName = #{userName}
+            </if>
+            <if test="merchantParentLevel!= null">
+                and profit.merchantParentLevel = #{merchantParentLevel}
+            </if>
+            <if test="merchantParentPhone!= null">
+                and profit.merchantParentPhone = #{merchantParentPhone}
+            </if>
+            <if test="retype!= null">
+                and profit.type !=4
+            </if>
+        </where>
+    </select>
+
+    <select id="queryUserAppPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+    SELECT count(*) from tb_pluss_user_app
+    <where>
+        userType = 'promoter'
+        <if test="parentId!= null">
+            and parentId = #{parentId}
+        </if>
+    </where>
+    </select>
+
+    <select id="queryMerchantCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+        SELECT COUNT(*)
+        FROM tb_pluss_merchant_base_info
+        WHERE userId IN (SELECT userId
+        FROM tb_pluss_user_app
+        <where>
+            userType = 'promoter'
+            <if test="parentId!= null">
+                and parentId = #{parentId}
+            </if>
+        </where>)
+    </select>
+
+    <sql id="commom_where_if">
+        <if test="merchantCode!= null">
+            and merchantCode in (SELECT merchantCode
+            FROM tb_pluss_merchant_base_info
+            WHERE bindingCode =(SELECT bindingCode
+            FROM tb_pluss_merchant_base_info
+            where merchantCode = #{merchantCode}))
+        </if>
+        <choose>
+            <when test="status != null and status != ''">
+                and status = #{status}
+            </when>
+            <otherwise>
+                and status = '1'
+            </otherwise>
+        </choose>
+    </sql>
+</mapper>
\ No newline at end of file
diff --git a/pluss-dao-bundle/src/main/resources/mapper/IdCardCacheMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/IdCardCacheMapper.xml
new file mode 100644
index 0000000..9fb609a
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/IdCardCacheMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="cn.pluss.platform.mapper.IdCardCacheMapper">
+
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/IdCardMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/IdCardMapper.xml
new file mode 100644
index 0000000..c06653d
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/IdCardMapper.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.IdCardMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.IdCard">
+        <id column="id" property="id"/>
+        <result column="userId" property="userId"/>
+        <result column="certType" property="certType"/>
+        <result column="userType" property="userType"/>
+        <result column="certNo" property="certNo"/>
+        <result column="certName" property="certName"/>
+        <result column="certStartTime" property="certStartTime"/>
+        <result column="certEndTime" property="certEndTime"/>
+        <result column="certAddress" property="certAddress"/>
+    </resultMap>
+
+    <insert id="insertUniqueData">
+        INSERT INTO `tb_pluss_id_card`
+        (`userId`, `userType`, `certType`, `certNo`, `certName`, `certStartTime`,
+        `certEndTime`, `certAddress`, `imgPositive`, `imgNegative`)
+        SELECT #{data.userId}, #{data.userType}, #{data.certType}, #{data.certNo}, #{data.certName},
+        #{data.certStartTime}, #{data.certEndTime}, #{data.certAddress}, #{data.imgPositive}, #{data.imgNegative}
+        FROM `tb_pluss_id_card`
+        <if test="uniqueData != null">
+            WHERE NOT EXISTS
+            (
+            SELECT 1 FROM `tb_pluss_id_card`
+            <where>
+                <foreach collection="uniqueData.entrySet()" index="key" item="value">
+                    and `${key}` = #{value}
+                </foreach>
+            </where>
+            )
+        </if>
+        LIMIT 1
+    </insert>
+
+    <select id="getAccountIdCard" resultType="cn.pluss.platform.entity.IdCard">
+        SELECT t1.`id`,
+               t1.`userId`,
+               t1.`userType`,
+               t1.`certType`,
+               t1.`certNo`,
+               t1.`certName`,
+               t1.`certStartTime`,
+               t1.`certEndTime`,
+               t1.`certAddress`,
+               t1.`createTime`,
+               t1.`updateTime`,
+               t1.`imgPositive`,
+               t1.`imgNegative`
+        FROM tb_pluss_id_card t1
+                 LEFT JOIN tb_pluss_account t2 ON t1.id = t2.idcardId
+        WHERE t2.userId = #{userId}
+        <if test="_parameter.containsKey('channelType')">
+            <if test="channelType != null and channelType != ''">
+                AND t2.channelType = #{channelType}
+            </if>
+        </if>
+    </select>
+
+    <select id="selectAgentCount" resultType="integer">
+        SELECT count(1)
+        FROM tb_pluss_id_card t1
+        LEFT JOIN tb_pluss_user_app ua ON t1.userId = ua.userId
+        WHERE ua.userType IN ('agent', 'promoter')
+          AND ua.`status` = '3' AND ua.`bankStatus` = '3'
+          AND t1.`certNo` = #{certNo}
+          AND ua.`userId` != #{userId}
+          AND t1.`userType` = '01'
+    </select>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/InviteRateMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/InviteRateMapper.xml
new file mode 100644
index 0000000..47aa5e2
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/InviteRateMapper.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.InviteRateMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.InviteRate">
+        <id column="id" property="id" />
+        <result column="number" property="number" />
+        <result column="rate" property="rate" />
+        <result column="startTime" property="startTime" />
+        <result column="endTime" property="endTime" />
+        <result column="createTime" property="createTime" />
+        <result column="updateTime" property="updateTime" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/IpLocationCacheMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/IpLocationCacheMapper.xml
new file mode 100644
index 0000000..c5274e6
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/IpLocationCacheMapper.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.IpLocationCacheMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.IpLocationCache">
+        <id column="id" property="id" />
+        <result column="ip" property="ip" />
+        <result column="isp" property="isp" />
+        <result column="country" property="country" />
+        <result column="province" property="province" />
+        <result column="city" property="city" />
+        <result column="county" property="county" />
+        <result column="createTime" property="createTime" />
+        <result column="updateTime" property="updateTime" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/JftBankCardMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/JftBankCardMapper.xml
new file mode 100644
index 0000000..c6ad501
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/JftBankCardMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.JftBankCardMapper">
+
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/JftMercBaseInfoMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/JftMercBaseInfoMapper.xml
new file mode 100644
index 0000000..084353a
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/JftMercBaseInfoMapper.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.JftMercBaseInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.JftMercBaseInfo">
+        <id column="id" property="id" />
+        <result column="userId" property="userId" />
+        <result column="merchantName" property="merchantName" />
+        <result column="merchantType" property="merchantType" />
+        <result column="mcc" property="mcc" />
+        <result column="mccName" property="mccName" />
+        <result column="alias" property="alias" />
+        <result column="addressNo" property="addressNo" />
+        <result column="province" property="province" />
+        <result column="city" property="city" />
+        <result column="district" property="district" />
+        <result column="address" property="address" />
+        <result column="principalPerson" property="principalPerson" />
+        <result column="bussAuthName" property="bussAuthName" />
+        <result column="bussAuthNum" property="bussAuthNum" />
+        <result column="bussAuthAddress" property="bussAuthAddress" />
+        <result column="bussAuthStartTime" property="bussAuthStartTime" />
+        <result column="bussAuthEndTime" property="bussAuthEndTime" />
+        <result column="createTime" property="createTime" />
+        <result column="updateTime" property="updateTime" />
+        <result column="buslicType" property="buslicType" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/JftMercPaymentChannelMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/JftMercPaymentChannelMapper.xml
new file mode 100644
index 0000000..2c6b6be
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/JftMercPaymentChannelMapper.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.JftMercPaymentChannelMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.JftMercPaymentChannel">
+        <id column="id" property="id" />
+        <result column="userId" property="userId" />
+        <result column="merchantCode" property="merchantCode" />
+        <result column="merchantId" property="merchantId" />
+        <result column="status" property="status" />
+        <result column="thirdStatus" property="thirdStatus" />
+        <result column="remark" property="remark" />
+        <result column="createTime" property="createTime" />
+        <result column="passTime" property="passTime" />
+        <result column="updateTime" property="updateTime" />
+        <result column="applicationId" property="applicationId" />
+        <result column="extra" property="extra" />
+        <result column="mercName" property="mercName" />
+    </resultMap>
+
+    <select id="selectCountByCertNo" resultType="java.lang.Integer">
+        SELECT count(mpc.id) FROM tb_pluss_jft_merc_payment_channel mpc
+        LEFT JOIN tb_pluss_id_card ic ON mpc.userId = ic.userId AND ic.userType = '01'
+        WHERE ic.certNo = #{certNo}
+    </select>
+
+    <select id="selectByChangeFlowId" resultType="cn.pluss.platform.entity.JftMercPaymentChannel">
+        SELECT * FROM tb_pluss_jft_merc_payment_channel
+        WHERE channel = 4 AND `status` = 3 AND (extra ->> '$.changeFlowId') = #{changeFlowId}
+    </select>
+
+    <select id="selectBySysFlowId" resultType="cn.pluss.platform.entity.JftMercPaymentChannel">
+        SELECT * FROM tb_pluss_jft_merc_payment_channel
+        WHERE channel = 4 AND `status` = 3 AND (extra ->> '$.sysFlowId') = #{sysFlowId}
+    </select>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/JftMerchantRateMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/JftMerchantRateMapper.xml
new file mode 100644
index 0000000..b72e6f4
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/JftMerchantRateMapper.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.JftMerchantRateMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.JftMerchantRate">
+        <id column="id" property="id" />
+        <result column="channel" property="channel" />
+        <result column="merchantId" property="merchantId" />
+        <result column="aliRate" property="aliRate" />
+        <result column="createTime" property="createTime" />
+        <result column="updateTime" property="updateTime" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/JftMerchantRateRecordMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/JftMerchantRateRecordMapper.xml
new file mode 100644
index 0000000..749560f
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/JftMerchantRateRecordMapper.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.JftMerchantRateRecordMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.JftMerchantRateRecord">
+        <id column="id" property="id" />
+        <result column="channel" property="channel" />
+        <result column="merchantId" property="merchantId" />
+        <result column="aliRate" property="aliRate" />
+        <result column="status" property="status" />
+        <result column="remark" property="remark" />
+        <result column="createTime" property="createTime" />
+        <result column="updateTime" property="updateTime" />
+        <result column="operationDate" property="operationDate" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/JftPaymentInfoMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/JftPaymentInfoMapper.xml
new file mode 100644
index 0000000..d860e63
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/JftPaymentInfoMapper.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.JftPaymentInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.JftPaymentInfo">
+        <id column="id" property="id" />
+        <result column="code" property="code" />
+        <result column="name" property="name" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/JftReceiptInfoMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/JftReceiptInfoMapper.xml
new file mode 100644
index 0000000..7de1574
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/JftReceiptInfoMapper.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.JftReceiptInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.JftReceiptInfo">
+        <id column="id" property="id" />
+        <result column="projectName" property="projectName" />
+        <result column="amount" property="amount" />
+        <result column="userId" property="userId" />
+        <result column="status" property="status" />
+        <result column="createTime" property="createTime" />
+        <result column="endTime" property="endTime" />
+        <result column="token" property="token" />
+    </resultMap>
+
+    <select id="pageInfo" parameterType="cn.pluss.platform.entity.JftReceiptInfo" resultType="cn.pluss.platform.vo.JftReceiptInfoVO">
+        SELECT a.*,IF(a.payNum > 0,"已收款","未收款") as payStatusDesc FROM (SELECT
+             jri.*,
+             SUM(IF(jro.`status` = '02',1,0)) AS payNum,
+             SUM(IF(jro.`status` = '02',jro.amount,0)) as totalAmount
+         FROM
+             tb_pluss_jft_receipt_info jri
+                 LEFT JOIN tb_pluss_jft_receipt_order jro ON jri.id = jro.rid GROUP BY id ) a
+        <where>
+            a.status = 1
+            <if test="condition != null and condition.userId != null">
+                and a.userId = #{condition.userId}
+            </if>
+            <if test="condition != null and condition.startDate != null and condition.startDate != ''">
+                and DATE_FORMAT(a.createTime,'%Y-%m-%d') >= #{condition.startDate}
+            </if>
+            <if test="condition != null and condition.endDate != null and condition.endDate != ''">
+                and DATE_FORMAT(a.createTime,'%Y-%m-%d') <![CDATA[ <= ]]> #{condition.endDate}
+            </if>
+        </where>
+        ORDER BY a.id desc
+    </select>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/JftReceiptOrderMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/JftReceiptOrderMapper.xml
new file mode 100644
index 0000000..c821c97
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/JftReceiptOrderMapper.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.JftReceiptOrderMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.JftReceiptOrder">
+        <id column="id" property="id" />
+        <result column="rid" property="rid" />
+        <result column="amount" property="amount" />
+        <result column="status" property="status" />
+        <result column="payType" property="payType" />
+        <result column="orderNumber" property="orderNumber" />
+        <result column="userId" property="userId" />
+        <result column="merchantCode" property="merchantCode" />
+        <result column="merchantName" property="merchantName" />
+        <result column="payUserId" property="payUserId" />
+        <result column="name" property="name" />
+        <result column="phone" property="phone" />
+        <result column="goods" property="goods" />
+        <result column="address" property="address" />
+        <result column="transNo" property="transNo" />
+        <result column="channelTransNo" property="channelTransNo" />
+        <result column="transTime" property="transTime" />
+        <result column="rate" property="rate" />
+        <result column="createTime" property="createTime" />
+        <result column="channelFee" property="channelFee" />
+        <result column="mercFee" property="mercFee" />
+        <result column="cashFee" property="cashFee" />
+        <result column="payData" property="payData" />
+        <result column="remark" property="remark" />
+        <result column="createDate" property="createDate" />
+    </resultMap>
+
+    <select id="pageData" parameterType="cn.pluss.platform.dto.jft.JftReceiptOrderDTO" resultType="cn.pluss.platform.vo.JftReceiptOrderVO">
+        select
+            ri.projectName as projectName,
+            ri.amount as orderAmt,
+            IF(ro.`status` = '01','待付款','已付款') as payStatusDesc,
+            ro.orderNumber as orderNumber,
+            ro.createTime
+        from tb_pluss_jft_receipt_order ro left join tb_pluss_jft_receipt_info ri on ro.rid = ri.id
+        <where>
+            <if test="entity.userId != null">
+                and ro.userId = #{entity.userId}
+            </if>
+            <if test="entity.status != null and entity.status != ''">
+                and ro.status = #{entity.status}
+            </if>
+            <if test="entity.startDate != null and entity.startDate != ''">
+                and ro.createDate >= #{entity.startDate}
+            </if>
+            <if test="entity.endDate != null and entity.endDate != ''">
+                and ro.createDate <![CDATA[ <= ]]> #{entity.endDate}
+            </if>
+        </where>
+        order by ro.id desc
+    </select>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/JftReceiptPaymentMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/JftReceiptPaymentMapper.xml
new file mode 100644
index 0000000..91d14fd
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/JftReceiptPaymentMapper.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.JftReceiptPaymentMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.JftReceiptPayment">
+        <id column="id" property="id" />
+        <result column="rid" property="rid" />
+        <result column="pid" property="pid" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/JftSmallClassMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/JftSmallClassMapper.xml
new file mode 100644
index 0000000..97085ea
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/JftSmallClassMapper.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.JftSmallClassMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.JftSmallClass">
+        <id column="id" property="id" />
+        <result column="title" property="title" />
+        <result column="describe" property="describe" />
+        <result column="content" property="content" />
+        <result column="photo" property="photo" />
+        <result column="url" property="url" />
+        <result column="status" property="status" />
+        <result column="sort" property="sort" />
+        <result column="createTime" property="createTime" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/LeshuaMakeMoney-sqlmap.xml b/pluss-dao-bundle/src/main/resources/mapper/LeshuaMakeMoney-sqlmap.xml
new file mode 100644
index 0000000..22bf978
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/LeshuaMakeMoney-sqlmap.xml
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+			"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="cn.pluss.platform.mapper.LeshuaMakeMoneyMapper">
+
+	   	<insert id="saveLeshuaMakeMoneyBatch">
+        	insert into tb_pluss_leshua_make_money(billId,createTime,merchantId,planAmount,suspendAmount,realAmount,state,failReason,remark,recreateFlag,settType,settDate,tag,bankretTime,bankAccount,bankHolder) VALUES 
+    			<foreach collection="list" item="item" index="index" separator=",">
+			(#{item.billId},#{item.createTime},#{item.merchantId},#{item.planAmount},#{item.suspendAmount},#{item.realAmount},#{item.state},#{item.failReason},#{item.remark},#{item.recreateFlag},#{item.settType},#{item.settDate},#{item.tag},#{item.bankretTime},#{item.bankAccount},#{item.bankHolder}		)
+				</foreach>
+    	</insert>
+
+		<select id="queryLeshuaMakeMoneyPage" parameterType="java.util.Map" resultType="cn.pluss.platform.entity.LeshuaMakeMoney">
+			SELECT * from tb_pluss_leshua_make_money 
+				<where> 
+					<if test="id!= null"> 
+					and id = #{id}
+					 </if> 
+					<if test="billId!= null"> 
+					and billId = #{billId}
+					 </if> 
+					<if test="createTime!= null"> 
+					and createTime = #{createTime}
+					 </if> 
+					<if test="merchantId!= null"> 
+					and merchantId = #{merchantId}
+					 </if> 
+					<if test="planAmount!= null"> 
+					and planAmount = #{planAmount}
+					 </if> 
+					<if test="suspendAmount!= null"> 
+					and suspendAmount = #{suspendAmount}
+					 </if> 
+					<if test="realAmount!= null"> 
+					and realAmount = #{realAmount}
+					 </if> 
+					<if test="state!= null"> 
+					and state = #{state}
+					 </if> 
+					<if test="failReason!= null"> 
+					and failReason = #{failReason}
+					 </if> 
+					<if test="remark!= null"> 
+					and remark = #{remark}
+					 </if> 
+					<if test="recreateFlag!= null"> 
+					and recreateFlag = #{recreateFlag}
+					 </if> 
+					<if test="settType!= null"> 
+					and settType = #{settType}
+					 </if> 
+					<if test="settDate!= null"> 
+					and settDate = #{settDate}
+					 </if> 
+					<if test="tag!= null"> 
+					and tag = #{tag}
+					 </if> 
+					<if test="bankretTime!= null"> 
+					and bankretTime = #{bankretTime}
+					 </if> 
+					<if test="bankAccount!= null"> 
+					and bankAccount = #{bankAccount}
+					 </if> 
+					<if test="bankHolder!= null"> 
+					and bankHolder = #{bankHolder}
+					 </if> 
+				 </where> 
+			order by createTime desc  limit #{pageSize}  offset  #{offset}  
+		</select>
+
+	<select id="queryLeshuaMakeMoneyPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+		SELECT count(*) from tb_pluss_leshua_make_money
+		<where>
+			<if test="id!= null">
+				and id = #{id}
+			</if>
+			<if test="billId!= null">
+				and billId = #{billId}
+			</if>
+			<if test="createTime!= null">
+				and createTime = #{createTime}
+			</if>
+			<if test="merchantId!= null">
+				and merchantId = #{merchantId}
+			</if>
+			<if test="planAmount!= null">
+				and planAmount = #{planAmount}
+			</if>
+			<if test="suspendAmount!= null">
+				and suspendAmount = #{suspendAmount}
+			</if>
+			<if test="realAmount!= null">
+				and realAmount = #{realAmount}
+			</if>
+			<if test="state!= null">
+				and state = #{state}
+			</if>
+			<if test="failReason!= null">
+				and failReason = #{failReason}
+			</if>
+			<if test="remark!= null">
+				and remark = #{remark}
+			</if>
+			<if test="recreateFlag!= null">
+				and recreateFlag = #{recreateFlag}
+			</if>
+			<if test="settType!= null">
+				and settType = #{settType}
+			</if>
+			<if test="settDate!= null">
+				and settDate = #{settDate}
+			</if>
+			<if test="tag!= null">
+				and tag = #{tag}
+			</if>
+			<if test="bankretTime!= null">
+				and bankretTime = #{bankretTime}
+			</if>
+			<if test="bankAccount!= null">
+				and bankAccount = #{bankAccount}
+			</if>
+			<if test="bankHolder!= null">
+				and bankHolder = #{bankHolder}
+			</if>
+		</where>
+	</select>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/Level-sqlmap.xml b/pluss-dao-bundle/src/main/resources/mapper/Level-sqlmap.xml
new file mode 100644
index 0000000..a2ef333
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/Level-sqlmap.xml
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+			"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="cn.pluss.platform.mapper.LevelMapper">
+
+	   	<insert id="saveLevel" parameterType="cn.pluss.platform.entity.Level">
+        	insert into tb_pluss_level(level,tradeMoney,authCount,levelName,rate,createDt,logo)VALUES(#{level},#{tradeMoney},#{authCount},#{levelName},#{rate},#{createDt},#{logo})
+    	</insert>
+
+	   	<insert id="saveLevelBatch">
+        	insert into tb_pluss_level(level,tradeMoney,authCount,levelName,rate,createDt,logo) VALUES 
+    			<foreach collection="list" item="item" index="index" separator=",">
+			(#{level},#{tradeMoney},#{authCount},#{levelName},#{rate},#{createDt},#{logo}		)
+				</foreach>
+    	</insert>
+
+		<select id="queryLevel" parameterType="cn.pluss.platform.entity.Level" resultType="cn.pluss.platform.entity.Level">
+			SELECT * from tb_pluss_level 
+				<where> 
+					<if test="id!= null"> 
+					 	and id = #{id}
+					 </if> 
+					<if test="level!= null"> 
+					 	and level = #{level}
+					 </if> 
+					<if test="tradeMoney!= null"> 
+					 	and tradeMoney = #{tradeMoney}
+					 </if> 
+					<if test="authCount!= null"> 
+					 	and authCount = #{authCount}
+					 </if> 
+					<if test="levelName!= null"> 
+					 	and levelName = #{levelName}
+					 </if> 
+					<if test="rate!= null"> 
+					 	and rate = #{rate}
+					 </if> 
+					<if test="createDt!= null"> 
+					 	and createDt = #{createDt}
+					 </if> 
+					<if test="logo!= null"> 
+					 	and logo = #{logo}
+					 </if> 
+				 </where> 
+		</select>
+
+		<select id="queryLevelList" parameterType="cn.pluss.platform.entity.Level" resultType="cn.pluss.platform.entity.Level">
+			SELECT * from tb_pluss_level 
+				<where> 
+					<if test="id!= null"> 
+					 and 	id = #{id}
+					 </if> 
+					<if test="level!= null"> 
+					 and 	level = #{level}
+					 </if> 
+					<if test="tradeMoney!= null"> 
+					 and 	tradeMoney = #{tradeMoney}
+					 </if> 
+					<if test="authCount!= null"> 
+					 and 	authCount = #{authCount}
+					 </if> 
+					<if test="levelName!= null"> 
+					 and 	levelName = #{levelName}
+					 </if> 
+					<if test="rate!= null"> 
+					 and 	rate = #{rate}
+					 </if> 
+					<if test="createDt!= null"> 
+					 and 	createDt = #{createDt}
+					 </if> 
+					<if test="logo!= null"> 
+					 and 	logo = #{logo}
+					 </if> 
+				 </where> 
+		</select>
+
+		<update id="updateLevel" parameterType="cn.pluss.platform.entity.Level" >
+			update tb_pluss_level 
+				  <set> 
+					<if test="level!= null"> 
+					 	level = #{level},
+					 </if> 
+					<if test="tradeMoney!= null"> 
+					 	tradeMoney = #{tradeMoney},
+					 </if> 
+					<if test="authCount!= null"> 
+					 	authCount = #{authCount},
+					 </if> 
+					<if test="levelName!= null"> 
+					 	levelName = #{levelName},
+					 </if> 
+					<if test="rate!= null"> 
+					 	rate = #{rate},
+					 </if> 
+					<if test="createDt!= null"> 
+					 	createDt = #{createDt},
+					 </if> 
+					<if test="logo!= null"> 
+					 	logo = #{logo}
+					 </if> 
+				</set>
+			where id=#{id} 
+		</update>
+
+		<delete id="deleteLevel" parameterType="cn.pluss.platform.entity.Level" >
+			DELETE FROM tb_pluss_level where id=#{id}
+		</delete>
+
+		<select id="queryLevelPage" parameterType="java.util.Map" resultType="cn.pluss.platform.entity.Level">
+			SELECT * from tb_pluss_level 
+				<where> 
+					<if test="id!= null"> 
+					and id = #{id}
+					 </if> 
+					<if test="level!= null"> 
+					and level = #{level}
+					 </if> 
+					<if test="tradeMoney!= null"> 
+					and tradeMoney = #{tradeMoney}
+					 </if> 
+					<if test="authCount!= null"> 
+					and authCount = #{authCount}
+					 </if> 
+					<if test="levelName!= null"> 
+					and levelName = #{levelName}
+					 </if> 
+					<if test="rate!= null"> 
+					and rate = #{rate}
+					 </if> 
+					<if test="createDt!= null"> 
+					and createDt = #{createDt}
+					 </if> 
+					<if test="logo!= null"> 
+					and logo = #{logo}
+					 </if> 
+				 </where> 
+			order by id desc  limit #{pageSize}  offset  #{offset}  
+		</select>
+
+		<select id="queryLevelPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+			SELECT count(*) from tb_pluss_level 
+					<where> 
+					<if test="id!= null"> 
+					 and id = #{id}
+					 </if> 
+					<if test="level!= null"> 
+					 and level = #{level}
+					 </if> 
+					<if test="tradeMoney!= null"> 
+					 and tradeMoney = #{tradeMoney}
+					 </if> 
+					<if test="authCount!= null"> 
+					 and authCount = #{authCount}
+					 </if> 
+					<if test="levelName!= null"> 
+					 and levelName = #{levelName}
+					 </if> 
+					<if test="rate!= null"> 
+					 and rate = #{rate}
+					 </if> 
+					<if test="createDt!= null"> 
+					 and createDt = #{createDt}
+					 </if> 
+					<if test="logo!= null"> 
+					 and logo = #{logo}
+					 </if> 
+				</where>
+		</select>
+
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/LevelOperateRecordMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/LevelOperateRecordMapper.xml
new file mode 100644
index 0000000..c96c245
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/LevelOperateRecordMapper.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.LevelOperateRecordMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.LevelOperateRecord">
+        <id column="id" property="id" />
+        <result column="userId" property="userId" />
+        <result column="operator" property="operator" />
+        <result column="levelCode" property="levelCode" />
+        <result column="createTime" property="createTime" />
+        <result column="updateTime" property="updateTime" />
+        <result column="createMonth" property="createMonth" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/MakeMoneyMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/MakeMoneyMapper.xml
new file mode 100644
index 0000000..8a3a7ca
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/MakeMoneyMapper.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.MakeMoneyMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.MakeMoney">
+        <id column="id" property="id"/>
+        <result column="billId" property="billId"/>
+        <result column="createTime" property="createTime"/>
+        <result column="merchantId" property="merchantId"/>
+        <result column="planAmount" property="planAmount"/>
+        <result column="suspendAmount" property="suspendAmount"/>
+        <result column="realAmount" property="realAmount"/>
+        <result column="state" property="state"/>
+        <result column="failReason" property="failReason"/>
+        <result column="remark" property="remark"/>
+        <result column="recreateFlag" property="recreateFlag"/>
+        <result column="settType" property="settType"/>
+        <result column="settDate" property="settDate"/>
+        <result column="tag" property="tag"/>
+        <result column="bankretTime" property="bankretTime"/>
+        <result column="bankAccount" property="bankAccount"/>
+        <result column="bankHolder" property="bankHolder"/>
+        <result column="readStatus" property="readStatus"/>
+    </resultMap>
+
+    <select id="selectPage" resultMap="BaseResultMap">
+        SELECT mm.id,
+               mm.billId,
+               mm.createTime,
+               mm.merchantId,
+               mm.planAmount,
+               mm.suspendAmount,
+               mm.realAmount,
+               mm.state,
+               mm.failReason,
+               mm.remark,
+               mm.recreateFlag,
+               mm.settType,
+               mm.settDate,
+               mm.tag,
+               DATE_FORMAT(mm.bankretTime, '%Y-%m-%d %H:%i:%s') bankretTime,
+               mm.bankAccount,
+               mm.bankHolder,
+               IF(nrr.id IS NULL, 0, 1) readStatus
+        FROM tb_pluss_make_money mm
+                 LEFT JOIN tb_pluss_notice_read_record nrr
+                           ON mm.id = nrr.noticeId AND nrr.type = 1 ${ew.customSqlSegment}
+    </select>
+
+    <select id="getCountNowDateSettleAmt" parameterType="java.lang.String" resultType="java.math.BigDecimal">
+        SELECT IFNULL(sum(planAmount), 0)
+        FROM tb_pluss_make_money
+        where merchantId = #{merchantId}
+          and `state` in (0, 1)
+          AND DATE_FORMAT(createTime, '%Y-%m-%d') = DATE_FORMAT(NOW(), '%Y-%m-%d')
+    </select>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/MccInfoSortMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/MccInfoSortMapper.xml
new file mode 100644
index 0000000..2b463f0
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/MccInfoSortMapper.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.MccInfoSortMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.MccInfoSort">
+        <id column="id" property="id" />
+        <result column="code" property="code" />
+        <result column="mccCode" property="mccCode" />
+        <result column="mccName" property="mccName" />
+        <result column="group" property="group" />
+        <result column="createTime" property="createTime" />
+        <result column="updateTime" property="updateTime" />
+        <result column="sort" property="sort" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/MccInfoYsMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/MccInfoYsMapper.xml
new file mode 100644
index 0000000..648405d
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/MccInfoYsMapper.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.MccInfoYsMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.MccInfoYs">
+        <result column="mccCode" property="mccCode" />
+        <result column="mccDesc" property="mccDesc" />
+        <result column="compan" property="compan" />
+        <result column="individual" property="individual" />
+        <result column="micro" property="micro" />
+        <result column="industryType" property="industryType" />
+        <result column="industryTypeDesc" property="industryTypeDesc" />
+        <result column="creator" property="creator" />
+        <result column="createTime" property="createTime" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/MccReflectMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/MccReflectMapper.xml
new file mode 100644
index 0000000..eb8bf13
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/MccReflectMapper.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.MccReflectMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.MccReflect">
+        <id column="id" property="id"/>
+        <result column="standard_mcc_code" property="standardMccCode"/>
+        <result column="mcc_code" property="mccCode"/>
+        <result column="channel_id" property="channelId"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_time" property="updateTime"/>
+    </resultMap>
+
+    <select id="selectPageMccReflectVO" resultType="cn.pluss.platform.vo.MccReflectVO">
+        SELECT mr.standard_mcc_code                standardMccCode,
+               sxfmcc.F_mcc_txt                    sxfMccDesc,
+               GROUP_CONCAT(ryxmcc.mcc)            ryxMcc,
+               GROUP_CONCAT(ryxmcc.bankDetailDesc) ryxMccDesc,
+               GROUP_CONCAT(ysmcc.mccCode)         ysMcc,
+               GROUP_CONCAT(ysmcc.mccDesc)         ysMccDesc
+        FROM tb_pluss_mcc_reflect mr
+                 LEFT JOIN tb_pluss_sxf_mcc_info sxfmcc ON mr.standard_mcc_code = sxfmcc.F_mcc_code
+                 LEFT JOIN (
+            SELECT DISTINCT mcc, bankDetailDesc
+            FROM tb_pluss_mcc_info_ryx
+        ) ryxmcc ON ryxmcc.mcc = mr.mcc_code AND mr.channel_id = 3
+                 LEFT JOIN tb_pluss_mcc_info_ys ysmcc ON ysmcc.mccCode = mr.mcc_code AND mr.channel_id = 4
+            <if test="ew.mccCode != null and ew.mccCode != ''">
+                <where>
+                    mr.standard_mcc_code = #{ew.mccCode}
+                </where>
+            </if>
+        GROUP BY mr.standard_mcc_code
+        ORDER BY standard_mcc_code
+    </select>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/MemberOrder-sqlmap.xml b/pluss-dao-bundle/src/main/resources/mapper/MemberOrder-sqlmap.xml
new file mode 100644
index 0000000..77e1f57
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/MemberOrder-sqlmap.xml
@@ -0,0 +1,691 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="cn.pluss.platform.mapper.MemberOrderMapper">
+
+    <insert id="saveMemberOrder" useGeneratedKeys="true" keyProperty="id" keyColumn="id"
+            parameterType="cn.pluss.platform.entity.MemberOrder">
+        insert into tb_pluss_member_order(merchantCode, merchantName, storeId, storeName, memberCode, nickName,
+                                          createDt, orderType, orderFee, orderStatus, rechargeType, staffCode,
+                                          staffName, orderNumber, weChatTransNo, aliPayTransNo)
+        VALUES (#{merchantCode}, #{merchantName}, #{storeId}, #{storeName}, #{memberCode}, #{nickName}, #{createDt},
+                #{orderType}, #{orderFee}, #{orderStatus}, #{rechargeType}, #{staffCode}, #{staffName}, #{orderNumber},
+                #{weChatTransNo}, #{aliPayTransNo})
+    </insert>
+
+    <insert id="saveMemberOrderBatch">
+        insert into
+        tb_pluss_member_order(merchantCode,merchantName,storeId,storeName,memberCode,nickName,createDt,orderType,orderFee,orderStatus,rechargeType,staffCode,staffName)
+        VALUES
+        <foreach collection="list" item="item" index="index" separator=",">
+            (#{merchantCode},#{merchantName},#{storeId},#{storeName},#{memberCode},#{nickName},#{createDt},#{orderType},#{orderFee},#{orderStatus},#{rechargeType},#{staffCode},#{staffName}
+            )
+        </foreach>
+    </insert>
+
+    <select id="queryMemberOrder" parameterType="cn.pluss.platform.entity.MemberOrder"
+            resultType="cn.pluss.platform.entity.MemberOrder">
+        SELECT * from tb_pluss_member_order
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="merchantCode!= null">
+                and merchantCode = #{merchantCode}
+            </if>
+            <if test="merchantName!= null">
+                and merchantName = #{merchantName}
+            </if>
+            <if test="storeId!= null">
+                and storeId = #{storeId}
+            </if>
+            <if test="storeName!= null">
+                and storeName = #{storeName}
+            </if>
+            <if test="memberCode!= null">
+                and memberCode = #{memberCode}
+            </if>
+            <if test="nickName!= null">
+                and nickName = #{nickName}
+            </if>
+            <if test="createDt!= null">
+                and createDt = #{createDt}
+            </if>
+            <if test="orderType!= null">
+                and orderType = #{orderType}
+            </if>
+            <if test="orderFee!= null">
+                and orderFee = #{orderFee}
+            </if>
+            <if test="orderStatus!= null">
+                and orderStatus = #{orderStatus}
+            </if>
+            <if test="rechargeType!= null">
+                and rechargeType = #{rechargeType}
+            </if>
+            <if test="staffCode!= null">
+                and staffCode = #{staffCode}
+            </if>
+            <if test="staffName!= null">
+                and staffName = #{staffName}
+            </if>
+            <if test="orderNumber!= null">
+                and orderNumber = #{orderNumber}
+            </if>
+            <if test="weChatTransNo!= null">
+                and weChatTransNo = #{weChatTransNo}
+            </if>
+            <if test="aliPayTransNo!= null">
+                and aliPayTransNo = #{aliPayTransNo}
+            </if>
+            <if test="channelNo!= null">
+                and channelNo = #{channelNo}
+            </if>
+        </where>
+    </select>
+
+    <select id="queryMemberOrderList" parameterType="cn.pluss.platform.entity.MemberOrder"
+            resultType="cn.pluss.platform.entity.MemberOrder">
+        SELECT * from tb_pluss_member_order
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="merchantCode!= null">
+                and merchantCode = #{merchantCode}
+            </if>
+            <if test="merchantName!= null">
+                and merchantName = #{merchantName}
+            </if>
+            <if test="storeId!= null">
+                and storeId = #{storeId}
+            </if>
+            <if test="storeName!= null">
+                and storeName = #{storeName}
+            </if>
+            <if test="memberCode!= null">
+                and memberCode = #{memberCode}
+            </if>
+            <if test="nickName!= null">
+                and nickName = #{nickName}
+            </if>
+            <if test="createDt!= null">
+                and createDt = #{createDt}
+            </if>
+            <if test="orderType!= null">
+                and orderType = #{orderType}
+            </if>
+            <if test="orderFee!= null">
+                and orderFee = #{orderFee}
+            </if>
+            <if test="orderStatus!= null">
+                and orderStatus = #{orderStatus}
+            </if>
+            <if test="rechargeType!= null">
+                and rechargeType = #{rechargeType}
+            </if>
+            <if test="staffCode!= null">
+                and staffCode = #{staffCode}
+            </if>
+            <if test="rechargeType!= null">
+                and staffName = #{staffName}
+            </if>
+            <if test="orderNumber!= null">
+                and orderNumber = #{orderNumber}
+            </if>
+            <if test="weChatTransNo!= null">
+                and weChatTransNo = #{weChatTransNo}
+            </if>
+            <if test="aliPayTransNo!= null">
+                and aliPayTransNo = #{aliPayTransNo}
+            </if>
+            <if test="channelNo!= null">
+                and channelNo = #{channelNo}
+            </if>
+
+        </where>
+    </select>
+
+    <update id="updateMemberOrder" parameterType="cn.pluss.platform.entity.MemberOrder">
+        update tb_pluss_member_order
+        <set>
+            <if test="merchantCode!= null">
+                merchantCode = #{merchantCode},
+            </if>
+            <if test="merchantName!= null">
+                merchantName = #{merchantName},
+            </if>
+            <if test="storeId!= null">
+                storeId = #{storeId},
+            </if>
+            <if test="storeName!= null">
+                storeName = #{storeName},
+            </if>
+            <if test="memberCode!= null">
+                memberCode = #{memberCode},
+            </if>
+            <if test="nickName!= null">
+                nickName = #{nickName},
+            </if>
+            <if test="createDt!= null">
+                createDt = #{createDt},
+            </if>
+            <if test="orderType!= null">
+                orderType = #{orderType},
+            </if>
+            <if test="orderFee!= null">
+                orderFee = #{orderFee},
+            </if>
+            <if test="orderStatus!= null">
+                orderStatus = #{orderStatus},
+            </if>
+            <if test="rechargeType!= null">
+                rechargeType = #{rechargeType},
+            </if>
+            <if test="staffCode!= null">
+                staffCode = #{staffCode},
+            </if>
+            <if test="staffName!= null">
+                staffName = #{staffName},
+            </if>
+            <if test="orderNumber!= null">
+                orderNumber = #{orderNumber},
+            </if>
+            <if test="weChatTransNo!= null">
+                weChatTransNo = #{weChatTransNo},
+            </if>
+            <if test="aliPayTransNo!= null">
+                aliPayTransNo = #{aliPayTransNo},
+            </if>
+            <if test="channelNo!= null">
+                channelNo = #{channelNo}
+            </if>
+
+        </set>
+        where id=#{id}
+    </update>
+
+    <delete id="deleteMemberOrder" parameterType="cn.pluss.platform.entity.MemberOrder">
+        DELETE
+        FROM tb_pluss_member_order
+        where id = #{id}
+    </delete>
+
+    <select id="queryMemberOrderPage" parameterType="java.util.Map" resultType="cn.pluss.platform.entity.MemberOrder">
+        SELECT * from tb_pluss_member_order
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="merchantCode!= null">
+                and merchantCode = #{merchantCode}
+            </if>
+            <if test="merchantName!= null">
+                and merchantName = #{merchantName}
+            </if>
+            <if test="storeId!= null">
+                and storeId = #{storeId}
+            </if>
+            <if test="storeName!= null">
+                and storeName = #{storeName}
+            </if>
+            <if test="memberCode!= null">
+                and memberCode = #{memberCode}
+            </if>
+            <if test="nickName!= null">
+                and nickName = #{nickName}
+            </if>
+            <if test="createDt!= null">
+                and createDt = #{createDt}
+            </if>
+            <if test="orderType!= null">
+                and orderType = #{orderType}
+            </if>
+            <if test="orderFee!= null">
+                and orderFee = #{orderFee}
+            </if>
+            <if test="orderStatus!= null">
+                and orderStatus = #{orderStatus}
+            </if>
+            <if test="rechargeType!= null">
+                and rechargeType = #{rechargeType}
+            </if>
+            <if test="staffCode!= null">
+                and staffCode = #{staffCode}
+            </if>
+            <if test="rechargeType!= null">
+                and staffName = #{staffName}
+            </if>
+            <if test="orderNumber!= null">
+                and orderNumber = #{orderNumber}
+            </if>
+            <if test="weChatTransNo!= null">
+                and weChatTransNo = #{weChatTransNo}
+            </if>
+            <if test="aliPayTransNo!= null">
+                and aliPayTransNo = #{aliPayTransNo}
+            </if>
+        </where>
+        order by id desc limit #{pageSize} offset #{offset}
+    </select>
+
+    <select id="queryMemberOrderPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+        SELECT count(*) from tb_pluss_member_order
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="merchantCode!= null">
+                and merchantCode = #{merchantCode}
+            </if>
+            <if test="merchantName!= null">
+                and merchantName = #{merchantName}
+            </if>
+            <if test="storeId!= null">
+                and storeId = #{storeId}
+            </if>
+            <if test="storeName!= null">
+                and storeName = #{storeName}
+            </if>
+            <if test="memberCode!= null">
+                and memberCode = #{memberCode}
+            </if>
+            <if test="nickName!= null">
+                and nickName = #{nickName}
+            </if>
+            <if test="createDt!= null">
+                and createDt = #{createDt}
+            </if>
+            <if test="orderType!= null">
+                and orderType = #{orderType}
+            </if>
+            <if test="orderFee!= null">
+                and orderFee = #{orderFee}
+            </if>
+            <if test="orderStatus!= null">
+                and orderStatus = #{orderStatus}
+            </if>
+            <if test="rechargeType!= null">
+                and rechargeType = #{rechargeType}
+            </if>
+            <if test="staffCode!= null">
+                and staffCode = #{staffCode}
+            </if>
+            <if test="rechargeType!= null">
+                and staffName = #{staffName}
+            </if>
+            <if test="orderNumber!= null">
+                and orderNumber = #{orderNumber}
+            </if>
+            <if test="weChatTransNo!= null">
+                and weChatTransNo = #{weChatTransNo}
+            </if>
+            <if test="aliPayTransNo!= null">
+                and aliPayTransNo = #{aliPayTransNo}
+            </if>
+        </where>
+    </select>
+
+    <select id="queryMemberOrderTotalOrderFeeByTime" parameterType="java.util.Map" resultType="java.lang.Double">
+        SELECT sum(orderFee) from tb_pluss_member_order
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="merchantCode!= null">
+                and merchantCode = #{merchantCode}
+            </if>
+            <if test="merchantName!= null">
+                and merchantName = #{merchantName}
+            </if>
+            <if test="storeId!= null">
+                and storeId = #{storeId}
+            </if>
+            <if test="storeName!= null">
+                and storeName = #{storeName}
+            </if>
+            <if test="memberCode!= null">
+                and memberCode = #{memberCode}
+            </if>
+            <if test="nickName!= null">
+                and nickName = #{nickName}
+            </if>
+            <if test="orderType!= null">
+                and orderType = #{orderType}
+            </if>
+            <if test="orderFee!= null">
+                and orderFee = #{orderFee}
+            </if>
+            <if test="orderStatus!= null">
+                and orderStatus = #{orderStatus}
+            </if>
+            <if test="rechargeType!= null">
+                and rechargeType = #{rechargeType}
+            </if>
+            <if test="staffCode!= null">
+                and staffCode = #{staffCode}
+            </if>
+            <if test="rechargeType!= null">
+                and staffName = #{staffName}
+            </if>
+            <if test="orderNumber!= null">
+                and orderNumber = #{orderNumber}
+            </if>
+
+            <if test="weChatTransNo!= null">
+                and weChatTransNo = #{weChatTransNo}
+            </if>
+            <if test="aliPayTransNo!= null">
+                and aliPayTransNo = #{aliPayTransNo}
+            </if>
+
+        </where>
+        and createDt &gt; #{startTime} and createDt &lt; #{endTime}
+    </select>
+
+    <select id="queryMemberOrderPageCountByTime" parameterType="java.util.Map" resultType="java.lang.Integer">
+        SELECT count(*) from tb_pluss_member_order
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="merchantCode!= null">
+                and merchantCode = #{merchantCode}
+            </if>
+            <if test="merchantName!= null">
+                and merchantName = #{merchantName}
+            </if>
+            <if test="storeId!= null">
+                and storeId = #{storeId}
+            </if>
+            <if test="storeName!= null">
+                and storeName = #{storeName}
+            </if>
+            <if test="memberCode!= null">
+                and memberCode = #{memberCode}
+            </if>
+            <if test="nickName!= null">
+                and nickName = #{nickName}
+            </if>
+            <if test="orderType!= null">
+                and orderType = #{orderType}
+            </if>
+            <if test="orderFee!= null">
+                and orderFee = #{orderFee}
+            </if>
+            <if test="orderStatus!= null">
+                and orderStatus = #{orderStatus}
+            </if>
+            <if test="rechargeType!= null and rechargeType!=''">
+                and rechargeType = #{rechargeType}
+            </if>
+            <if test="staffCode!= null">
+                and staffCode = #{staffCode}
+            </if>
+            <if test="staffName!= null">
+                and staffName = #{staffName}
+            </if>
+            <if test="orderNumber!= null">
+                and orderNumber = #{orderNumber}
+            </if>
+            <if test="weChatTransNo!= null">
+                and weChatTransNo = #{weChatTransNo}
+            </if>
+            <if test="aliPayTransNo!= null">
+                and aliPayTransNo = #{aliPayTransNo}
+            </if>
+            <if test="startTime!= null and startTime!=''">
+                <![CDATA[
+                            and  DATE_FORMAT(createDt, '%Y-%m-%d %H:%i:%S')>=DATE_FORMAT(#{startTime}, '%Y-%m-%d %H:%i:%S')
+                         ]]>
+            </if>
+            <if test="endTime!= null and endTime!='' ">
+                <![CDATA[
+                            and  DATE_FORMAT(createDt, '%Y-%m-%d %H:%i:%S')<=DATE_FORMAT(#{endTime}, '%Y-%m-%d %H:%i:%S')
+                         ]]>
+            </if>
+            <if test="staffCodeList!= null">
+                and (
+                <foreach collection="staffCodeList" item="item" index="index" separator="or">
+                    staffCode = #{item}
+                </foreach>
+                )
+            </if>
+
+            <if test="storeIdList!= null">
+                and (
+                <foreach collection="storeIdList" item="item" index="index" separator="or">
+                    storeId = #{item}
+                </foreach>
+                )
+            </if>
+            <if test="isPay!= null and isPay!=''">
+                and orderStatus <![CDATA[<> ]]> 0
+            </if>
+
+            <!--  and createDt &gt; #{startTime} and createDt &lt; #{endTime} -->
+        </where>
+
+    </select>
+
+    <select id="queryMemberOrderPageByTime" parameterType="java.util.Map"
+            resultType="cn.pluss.platform.entity.MemberOrder">
+        SELECT * from tb_pluss_member_order
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="merchantCode!= null">
+                and merchantCode = #{merchantCode}
+            </if>
+            <if test="merchantName!= null">
+                and merchantName = #{merchantName}
+            </if>
+            <if test="storeId!= null">
+                and storeId = #{storeId}
+            </if>
+            <if test="storeName!= null">
+                and storeName = #{storeName}
+            </if>
+            <if test="memberCode!= null">
+                and memberCode = #{memberCode}
+            </if>
+            <if test="nickName!= null">
+                and nickName = #{nickName}
+            </if>
+            <if test="orderType!= null">
+                and orderType = #{orderType}
+            </if>
+            <if test="orderFee!= null">
+                and orderFee = #{orderFee}
+            </if>
+            <if test="orderStatus!= null">
+                and orderStatus = #{orderStatus}
+            </if>
+            <if test="rechargeType!= null and rechargeType!=''">
+                and rechargeType = #{rechargeType}
+            </if>
+            <if test="staffCode!= null">
+                and staffCode = #{staffCode}
+            </if>
+            <if test="staffName!= null">
+                and staffName = #{staffName}
+            </if>
+            <if test="orderNumber!= null">
+                and orderNumber = #{orderNumber}
+            </if>
+            <if test="startTime!= null and startTime!=''">
+                <![CDATA[
+                            and  DATE_FORMAT(createDt, '%Y-%m-%d %H:%i:%S')>=DATE_FORMAT(#{startTime}, '%Y-%m-%d %H:%i:%S')
+                         ]]>
+            </if>
+            <if test="endTime!= null and endTime!='' ">
+                <![CDATA[
+                            and  DATE_FORMAT(createDt, '%Y-%m-%d %H:%i:%S')<=DATE_FORMAT(#{endTime}, '%Y-%m-%d %H:%i:%S')
+                         ]]>
+            </if>
+            <if test="staffCodeList!= null">
+                and (
+                <foreach collection="staffCodeList" item="item" index="index" separator="or">
+                    staffCode = #{item}
+                </foreach>
+                )
+            </if>
+            <if test="storeIdList!= null">
+                and (
+                <foreach collection="storeIdList" item="item" index="index" separator="or">
+                    storeId = #{item}
+                </foreach>
+                )
+            </if>
+        </where>
+        <!--  and createDt &gt; #{startTime} and createDt &lt; #{endTime} -->
+        order by id desc limit #{pageSize} offset #{offset}
+    </select>
+
+    <!-- 统计商家的会员消费金额  充值金额 -->
+    <select id="sumMemberOrderMoney" parameterType="java.util.Map" resultType="java.lang.Double">
+        SELECT IFNULL(SUM(orderFee),0) FROM tb_pluss_member_order
+        WHERE merchantCode=#{merchantCode} AND orderStatus='1' AND orderType=#{orderType}
+        <if test="merchantName!= null">
+            and merchantName = #{merchantName}
+        </if>
+        <if test="storeId!= null">
+            and storeId = #{storeId}
+        </if>
+        <if test="storeName!= null">
+            and storeName = #{storeName}
+        </if>
+        <if test="memberCode!= null">
+            and memberCode = #{memberCode}
+        </if>
+        <if test="nickName!= null">
+            and nickName = #{nickName}
+        </if>
+        <if test="orderType!= null">
+            and orderType = #{orderType}
+        </if>
+        <if test="orderFee!= null">
+            and orderFee = #{orderFee}
+        </if>
+        <if test="orderStatus!= null">
+            and orderStatus = #{orderStatus}
+        </if>
+        <if test="rechargeType!= null">
+            and rechargeType = #{rechargeType}
+        </if>
+
+        <if test="startTime!= null and startTime!=''">
+            <![CDATA[
+                            and  DATE_FORMAT(createDt, '%Y-%m-%d %H:%i:%S')>=DATE_FORMAT(#{startTime}, '%Y-%m-%d %H:%i:%S')
+                         ]]>
+        </if>
+        <if test="endTime!= null and endTime!='' ">
+            <![CDATA[
+                            and  DATE_FORMAT(createDt, '%Y-%m-%d %H:%i:%S')<=DATE_FORMAT(#{endTime}, '%Y-%m-%d %H:%i:%S')
+                         ]]>
+        </if>
+        <if test="staffCodeList!= null">
+            and (
+            <foreach collection="staffCodeList" item="item" index="index" separator="or">
+                staffCode = #{item}
+            </foreach>
+            )
+        </if>
+        <if test="storeIdList!= null">
+            and (
+            <foreach collection="storeIdList" item="item" index="index" separator="or">
+                storeId = #{item}
+            </foreach>
+            )
+        </if>
+    </select>
+
+    <select id="queryMemberOrderCountByTimeGroupData" resultType="java.util.Map">
+        SELECT count(1) count, orderType from tb_pluss_member_order
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="merchantCode!= null">
+                and merchantCode = #{merchantCode}
+            </if>
+            <if test="merchantName!= null">
+                and merchantName = #{merchantName}
+            </if>
+            <if test="storeId!= null">
+                and storeId = #{storeId}
+            </if>
+            <if test="storeName!= null">
+                and storeName = #{storeName}
+            </if>
+            <if test="memberCode!= null">
+                and memberCode = #{memberCode}
+            </if>
+            <if test="nickName!= null">
+                and nickName = #{nickName}
+            </if>
+            <if test="orderType!= null">
+                and orderType = #{orderType}
+            </if>
+            <if test="orderFee!= null">
+                and orderFee = #{orderFee}
+            </if>
+            <if test="orderStatus!= null">
+                and orderStatus = #{orderStatus}
+            </if>
+            <if test="rechargeType!= null and rechargeType!=''">
+                and rechargeType = #{rechargeType}
+            </if>
+            <if test="staffCode!= null">
+                and staffCode = #{staffCode}
+            </if>
+            <if test="staffName!= null">
+                and staffName = #{staffName}
+            </if>
+            <if test="orderNumber!= null">
+                and orderNumber = #{orderNumber}
+            </if>
+            <if test="weChatTransNo!= null">
+                and weChatTransNo = #{weChatTransNo}
+            </if>
+            <if test="aliPayTransNo!= null">
+                and aliPayTransNo = #{aliPayTransNo}
+            </if>
+            <if test="startTime!= null and startTime!=''">
+                <![CDATA[
+                            and  DATE_FORMAT(createDt, '%Y-%m-%d %H:%i:%S')>=DATE_FORMAT(#{startTime}, '%Y-%m-%d %H:%i:%S')
+                         ]]>
+            </if>
+            <if test="endTime!= null and endTime!='' ">
+                <![CDATA[
+                            and  DATE_FORMAT(createDt, '%Y-%m-%d %H:%i:%S')<=DATE_FORMAT(#{endTime}, '%Y-%m-%d %H:%i:%S')
+                         ]]>
+            </if>
+            <if test="staffCodeList!= null">
+                and (
+                <foreach collection="staffCodeList" item="item" index="index" separator="or">
+                    staffCode = #{item}
+                </foreach>
+                )
+            </if>
+
+            <if test="storeIdList!= null">
+                and (
+                <foreach collection="storeIdList" item="item" index="index" separator="or">
+                    storeId = #{item}
+                </foreach>
+                )
+            </if>
+            <if test="isPay!= null and isPay!=''">
+                and orderStatus <![CDATA[<> ]]> 0
+            </if>
+
+            <!--  and createDt &gt; #{startTime} and createDt &lt; #{endTime} -->
+        </where>
+        GROUP BY orderType
+    </select>
+
+
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/MemberSetting-sqlmap.xml b/pluss-dao-bundle/src/main/resources/mapper/MemberSetting-sqlmap.xml
new file mode 100644
index 0000000..c764717
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/MemberSetting-sqlmap.xml
@@ -0,0 +1,216 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+			"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="cn.pluss.platform.mapper.MemberSettingMapper">
+
+	   	<insert id="saveMemberSetting" parameterType="cn.pluss.platform.entity.MemberSetting">
+        	insert into tb_pluss_member_setting(merchantCode,merchantName,storeId,storeName,servicePhone,cardNum,cardContent,createDt,payDt,staffName)VALUES(#{merchantCode},#{merchantName},#{storeId},#{storeName},#{servicePhone},#{cardNum},#{cardContent},#{createDt},#{payDt},#{staffName})
+    	</insert>
+
+	   	<insert id="saveMemberSettingBatch">
+        	insert into tb_pluss_member_setting(merchantCode,merchantName,storeId,storeName,servicePhone,cardNum,cardContent,createDt,payDt,staffName) VALUES 
+    			<foreach collection="list" item="item" index="index" separator=",">
+			(#{merchantCode},#{merchantName},#{storeId},#{storeName},#{servicePhone},#{cardNum},#{cardContent},#{createDt},#{payDt},#{staffName}		)
+				</foreach>
+    	</insert>
+
+		<select id="queryMemberSetting" parameterType="cn.pluss.platform.entity.MemberSetting" resultType="cn.pluss.platform.entity.MemberSetting">
+			SELECT * from tb_pluss_member_setting 
+				<where> 
+					<if test="id!= null"> 
+					 	and id = #{id}
+					 </if> 
+					<if test="merchantCode!= null"> 
+					 	and merchantCode = #{merchantCode}
+					 </if> 
+					<if test="merchantName!= null"> 
+					 	and merchantName = #{merchantName}
+					 </if> 
+					<if test="storeId!= null"> 
+					 	and storeId = #{storeId}
+					 </if> 
+					<if test="storeName!= null"> 
+					 	and storeName = #{storeName}
+					 </if> 
+					<if test="servicePhone!= null"> 
+					 	and servicePhone = #{servicePhone}
+					 </if> 
+					<if test="cardNum!= null"> 
+					 	and cardNum = #{cardNum}
+					 </if> 
+					<if test="cardContent!= null"> 
+					 	and cardContent = #{cardContent}
+					 </if> 
+					<if test="createDt!= null"> 
+					 	and createDt = #{createDt}
+					 </if> 
+					<if test="payDt!= null"> 
+					 	and payDt = #{payDt}
+					 </if> 
+					<if test="staffName!= null"> 
+					 	and staffName = #{staffName}
+					 </if> 
+				 </where> 
+		</select>
+
+		<select id="queryMemberSettingList" parameterType="cn.pluss.platform.entity.MemberSetting" resultType="cn.pluss.platform.entity.MemberSetting">
+			SELECT * from tb_pluss_member_setting 
+				<where> 
+					<if test="id!= null"> 
+					 and 	id = #{id}
+					 </if> 
+					<if test="merchantCode!= null"> 
+					 and 	merchantCode = #{merchantCode}
+					 </if> 
+					<if test="merchantName!= null"> 
+					 and 	merchantName = #{merchantName}
+					 </if> 
+					<if test="storeId!= null"> 
+					 and 	storeId = #{storeId}
+					 </if> 
+					<if test="storeName!= null"> 
+					 and 	storeName = #{storeName}
+					 </if> 
+					<if test="servicePhone!= null"> 
+					 and 	servicePhone = #{servicePhone}
+					 </if> 
+					<if test="cardNum!= null"> 
+					 and 	cardNum = #{cardNum}
+					 </if> 
+					<if test="cardContent!= null"> 
+					 and 	cardContent = #{cardContent}
+					 </if> 
+					<if test="createDt!= null"> 
+					 and 	createDt = #{createDt}
+					 </if> 
+					<if test="payDt!= null"> 
+					 and 	payDt = #{payDt}
+					 </if> 
+					<if test="staffName!= null"> 
+					 and 	staffName = #{staffName}
+					 </if> 
+				 </where> 
+		</select>
+
+		<update id="updateMemberSetting" parameterType="cn.pluss.platform.entity.MemberSetting" >
+			update tb_pluss_member_setting 
+				  <set> 
+					<if test="merchantCode!= null"> 
+					 	merchantCode = #{merchantCode},
+					 </if> 
+					<if test="merchantName!= null"> 
+					 	merchantName = #{merchantName},
+					 </if> 
+					<if test="storeId!= null"> 
+					 	storeId = #{storeId},
+					 </if> 
+					<if test="storeName!= null"> 
+					 	storeName = #{storeName},
+					 </if> 
+					<if test="servicePhone!= null"> 
+					 	servicePhone = #{servicePhone},
+					 </if> 
+					<if test="cardNum!= null"> 
+					 	cardNum = #{cardNum},
+					 </if> 
+					<if test="cardContent!= null"> 
+					 	cardContent = #{cardContent},
+					 </if> 
+					<if test="createDt!= null"> 
+					 	createDt = #{createDt},
+					 </if> 
+					<if test="payDt!= null"> 
+					 	payDt = #{payDt},
+					 </if> 
+					<if test="staffName!= null"> 
+					 	staffName = #{staffName}
+					 </if> 
+				</set>
+			where id=#{id} 
+		</update>
+
+		<delete id="deleteMemberSetting" parameterType="cn.pluss.platform.entity.MemberSetting" >
+			DELETE FROM tb_pluss_member_setting where id=#{id}
+		</delete>
+
+		<select id="queryMemberSettingPage" parameterType="java.util.Map" resultType="cn.pluss.platform.entity.MemberSetting">
+			SELECT * from tb_pluss_member_setting 
+				<where> 
+					<if test="id!= null"> 
+					and id = #{id}
+					 </if> 
+					<if test="merchantCode!= null"> 
+					and merchantCode = #{merchantCode}
+					 </if> 
+					<if test="merchantName!= null"> 
+					and merchantName = #{merchantName}
+					 </if> 
+					<if test="storeId!= null"> 
+					and storeId = #{storeId}
+					 </if> 
+					<if test="storeName!= null"> 
+					and storeName = #{storeName}
+					 </if> 
+					<if test="servicePhone!= null"> 
+					and servicePhone = #{servicePhone}
+					 </if> 
+					<if test="cardNum!= null"> 
+					and cardNum = #{cardNum}
+					 </if> 
+					<if test="cardContent!= null"> 
+					and cardContent = #{cardContent}
+					 </if> 
+					<if test="createDt!= null"> 
+					and createDt = #{createDt}
+					 </if> 
+					<if test="payDt!= null"> 
+					and payDt = #{payDt}
+					 </if> 
+					<if test="staffName!= null"> 
+					and staffName = #{staffName}
+					 </if> 
+				 </where> 
+			order by id desc  limit #{pageSize}  offset  #{offset}  
+		</select>
+
+		<select id="queryMemberSettingPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+			SELECT count(*) from tb_pluss_member_setting 
+					<where> 
+					<if test="id!= null"> 
+					 and id = #{id}
+					 </if> 
+					<if test="merchantCode!= null"> 
+					 and merchantCode = #{merchantCode}
+					 </if> 
+					<if test="merchantName!= null"> 
+					 and merchantName = #{merchantName}
+					 </if> 
+					<if test="storeId!= null"> 
+					 and storeId = #{storeId}
+					 </if> 
+					<if test="storeName!= null"> 
+					 and storeName = #{storeName}
+					 </if> 
+					<if test="servicePhone!= null"> 
+					 and servicePhone = #{servicePhone}
+					 </if> 
+					<if test="cardNum!= null"> 
+					 and cardNum = #{cardNum}
+					 </if> 
+					<if test="cardContent!= null"> 
+					 and cardContent = #{cardContent}
+					 </if> 
+					<if test="createDt!= null"> 
+					 and createDt = #{createDt}
+					 </if> 
+					<if test="payDt!= null"> 
+					 and payDt = #{payDt}
+					 </if> 
+					<if test="staffName!= null"> 
+					 and staffName = #{staffName}
+					 </if> 
+				</where>
+		</select>
+
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/MemberTransStatisticsMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/MemberTransStatisticsMapper.xml
new file mode 100644
index 0000000..6366e0d
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/MemberTransStatisticsMapper.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.MemberTransStatisticsMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.MemberTransStatistics">
+        <id column="id" property="id" />
+        <result column="userId" property="userId" />
+        <result column="date" property="date" />
+        <result column="rechargeAmount" property="rechargeAmount" />
+        <result column="consumeAmount" property="consumeAmount" />
+        <result column="giveAmount" property="giveAmount" />
+        <result column="remark" property="remark" />
+        <result column="createTime" property="createTime" />
+        <result column="updateTime" property="updateTime" />
+    </resultMap>
+
+    <insert id="insertDuringBill">
+        INSERT IGNORE INTO tb_pluss_member_trans_statistics(userId, startDate, endDate, type, rechargeAmount, consumeAmount, giveAmount)
+        SELECT ua.userId, #{startDate}, #{endDate}, "1", IFNULL(t.rechargeAmount, 0), IFNULL(t.consumeAmount, 0), IFNULL(t.giveAmount, 0)
+        FROM
+            tb_pluss_user_app ua LEFT JOIN
+            (
+                SELECT
+                    merchantCode,
+                    SUM(IF(type = 1, transMoney, 0)) rechargeAmount,
+                    SUM(IF(type = 2, transMoney, 0)) consumeAmount,
+                    SUM(giveMoney) giveAmount
+                FROM (
+                         SELECT merchantCode, rechargeMoney transMoney, giveMoney, 1 type, createDt
+                         FROM tb_pluss_merchant_menber_recharge
+                         WHERE createDt BETWEEN CONCAT(#{startDate}, " 00:00:00")
+                            AND CONCAT(#{endDate}, " 23:59:59")
+                         UNION
+                         SELECT merchantCode, comsumeMoney transMoney, giveMoney, 2 type, createDt
+                         FROM tb_pluss_merchant_menber_comsume
+                         WHERE createDt BETWEEN CONCAT(#{startDate}, " 00:00:00")
+                            AND CONCAT(#{endDate}, " 23:59:59")
+                     ) t  GROUP BY merchantCode
+            ) t ON t.merchantCode = ua.merchantCode
+                                 LEFT JOIN tb_pluss_merchant_channel_status mcs ON ua.merchantCode = mcs.merchantCode
+        WHERE ua.userType = 'promoter' AND mcs.`status` = '3' AND mcs.updateTime &lt;= CONCAT(#{endDate}, " 23:59:59" )
+    </insert>
+
+    <select id="selectOneDuringBill" resultType="cn.pluss.platform.entity.MemberTransStatistics">
+        SELECT ua.userId, #{startDate} startDate, #{endDate} endDate, "1" type,
+               IFNULL(t.rechargeAmount, 0) rechargeAmount, IFNULL(t.consumeAmount, 0) consumeAmount, IFNULL(t.giveAmount, 0) giveAmount
+        FROM
+            tb_pluss_user_app ua LEFT JOIN
+            (
+                SELECT
+                    merchantCode,
+                    SUM(IF(type = 1, transMoney, 0)) rechargeAmount,
+                    SUM(IF(type = 2, transMoney, 0)) consumeAmount,
+                    SUM(giveMoney) giveAmount
+                FROM (
+                         SELECT merchantCode, rechargeMoney transMoney, giveMoney, 1 type, createDt
+                         FROM tb_pluss_merchant_menber_recharge
+                         WHERE createDt BETWEEN CONCAT(#{startDate}, " 00:00:00")
+                                   AND CONCAT(#{endDate}, " 23:59:59")
+                         UNION
+                         SELECT merchantCode, comsumeMoney transMoney, giveMoney, 2 type, createDt
+                         FROM tb_pluss_merchant_menber_comsume
+                         WHERE createDt BETWEEN CONCAT(#{startDate}, " 00:00:00")
+                                   AND CONCAT(#{endDate}, " 23:59:59")
+                     ) t  GROUP BY merchantCode
+            ) t ON t.merchantCode = ua.merchantCode
+                                 LEFT JOIN tb_pluss_merchant_channel_status mcs ON ua.merchantCode = mcs.merchantCode
+        WHERE mcs.`status` = '3' AND mcs.updateTime &lt;= CONCAT(#{endDate}, " 23:59:59" )
+        AND ua.userId = #{userId}
+        ORDER BY mcs.valid DESC, mcs.createTime LIMIT 1
+    </select>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/MenuInfo-sqlmap.xml b/pluss-dao-bundle/src/main/resources/mapper/MenuInfo-sqlmap.xml
new file mode 100644
index 0000000..809d020
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/MenuInfo-sqlmap.xml
@@ -0,0 +1,365 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="cn.pluss.platform.mapper.MenuInfoMapper">
+
+    <insert id="saveMenuInfo" parameterType="cn.pluss.platform.entity.MenuInfo" keyProperty="id"
+            useGeneratedKeys="true">
+        insert into tb_pluss_menu_info(name, menuType, link, parentId, menuOrder, iconUrl, visible, creator, version,
+                                       description, seq)
+        VALUES (#{name}, #{menuType}, #{link}, #{parentId}, #{menuOrder}, #{iconUrl}, #{visible}, #{creator},
+                #{version}, #{description}, #{seq})
+    </insert>
+
+    <insert id="saveMenuInfoBatch">
+        insert into
+        tb_pluss_menu_info(name,menuType,link,parentId,menuOrder,iconUrl,visible,creator,version,description,seq) VALUES
+        <foreach collection="list" item="item" index="index" separator=",">
+            (#{name},#{menuType},#{link},#{parentId},#{menuOrder},#{iconUrl},#{visible},#{creator},#{version},#{description},#{seq}
+            )
+        </foreach>
+    </insert>
+
+    <select id="queryMenuInfo" parameterType="cn.pluss.platform.entity.MenuInfo"
+            resultType="cn.pluss.platform.entity.MenuInfo">
+        SELECT * from tb_pluss_menu_info
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="name!= null">
+                and name = #{name}
+            </if>
+            <if test="menuType!= null">
+                and menuType = #{menuType}
+            </if>
+            <if test="link!= null">
+                and link = #{link}
+            </if>
+            <if test="parentId!= null">
+                and parentId = #{parentId}
+            </if>
+            <if test="menuOrder!= null">
+                and menuOrder = #{menuOrder}
+            </if>
+            <if test="iconUrl!= null">
+                and iconUrl = #{iconUrl}
+            </if>
+            <if test="visible!= null">
+                and visible = #{visible}
+            </if>
+            <if test="creator!= null">
+                and creator = #{creator}
+            </if>
+            <if test="version!= null">
+                and version = #{version}
+            </if>
+            <if test="description!= null">
+                and description = #{description}
+            </if>
+            <if test="seq!= null">
+                and seq = #{seq}
+            </if>
+        </where>
+    </select>
+
+    <select id="queryMenuInfoList" parameterType="cn.pluss.platform.entity.MenuInfo"
+            resultType="cn.pluss.platform.entity.MenuInfo">
+        SELECT * from tb_pluss_menu_info
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="name!= null">
+                and name = #{name}
+            </if>
+            <if test="menuType!= null">
+                and menuType = #{menuType}
+            </if>
+            <if test="link!= null">
+                and link = #{link}
+            </if>
+            <if test="parentId!= null">
+                and parentId = #{parentId}
+            </if>
+            <if test="menuOrder!= null">
+                and menuOrder = #{menuOrder}
+            </if>
+            <if test="iconUrl!= null">
+                and iconUrl = #{iconUrl}
+            </if>
+            <if test="visible!= null">
+                and visible = #{visible}
+            </if>
+            <if test="creator!= null">
+                and creator = #{creator}
+            </if>
+            <if test="version!= null">
+                and version = #{version}
+            </if>
+            <if test="description!= null">
+                and description = #{description}
+            </if>
+            <if test="seq!= null">
+                and seq = #{seq}
+            </if>
+        </where>
+        ORDER BY menuOrder
+    </select>
+
+    <select id="queryMenuInfoByRoleId" parameterType="java.util.Map" resultType="cn.pluss.platform.entity.MenuInfo">
+        select *
+        from tb_pluss_menu_info
+        where id in (select menuId from tb_pluss_role_menu_info where roleId = #{roleId})
+          and visible = 1
+        ORDER BY id
+    </select>
+
+
+    <select id="queryMenuInfoListOrderById" parameterType="cn.pluss.platform.entity.MenuInfo"
+            resultType="cn.pluss.platform.entity.MenuInfo">
+        SELECT * from tb_pluss_menu_info
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="name!= null">
+                and name = #{name}
+            </if>
+            <if test="menuType!= null">
+                and menuType = #{menuType}
+            </if>
+            <if test="link!= null">
+                and link = #{link}
+            </if>
+            <if test="parentId!= null">
+                and parentId = #{parentId}
+            </if>
+            <if test="menuOrder!= null">
+                and menuOrder = #{menuOrder}
+            </if>
+            <if test="iconUrl!= null">
+                and iconUrl = #{iconUrl}
+            </if>
+            <if test="visible!= null">
+                and visible = #{visible}
+            </if>
+            <if test="creator!= null">
+                and creator = #{creator}
+            </if>
+            <if test="version!= null">
+                and version = #{version}
+            </if>
+            <if test="description!= null">
+                and description = #{description}
+            </if>
+            <if test="seq!= null">
+                and seq = #{seq}
+            </if>
+        </where>
+        order by id desc
+    </select>
+
+    <update id="updateMenuInfo" parameterType="cn.pluss.platform.entity.MenuInfo">
+        update tb_pluss_menu_info
+        <set>
+            <if test="name!= null">
+                name = #{name},
+            </if>
+            <if test="menuType!= null">
+                menuType = #{menuType},
+            </if>
+            <if test="link!= null">
+                link = #{link},
+            </if>
+            <if test="parentId!= null">
+                parentId = #{parentId},
+            </if>
+            <if test="menuOrder!= null">
+                menuOrder = #{menuOrder},
+            </if>
+            <if test="iconUrl!= null">
+                iconUrl = #{iconUrl},
+            </if>
+            <if test="visible!= null">
+                visible = #{visible},
+            </if>
+            <if test="creator!= null">
+                creator = #{creator},
+            </if>
+            <if test="version!= null">
+                version = #{version},
+            </if>
+            <if test="description!= null">
+                description = #{description},
+            </if>
+            <if test="seq!= null">
+                seq = #{seq}
+            </if>
+        </set>
+        where id=#{id}
+    </update>
+
+    <delete id="deleteMenuInfo" parameterType="cn.pluss.platform.entity.MenuInfo">
+        DELETE
+        FROM tb_pluss_menu_info
+        where id = #{id}
+    </delete>
+
+    <select id="queryMenuInfoPage" parameterType="java.util.Map" resultType="cn.pluss.platform.entity.MenuInfo">
+        SELECT * from tb_pluss_menu_info
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="name!= null">
+                and name = #{name}
+            </if>
+            <if test="menuType!= null">
+                and menuType = #{menuType}
+            </if>
+            <if test="link!= null">
+                and link = #{link}
+            </if>
+            <if test="parentId!= null">
+                and parentId = #{parentId}
+            </if>
+            <if test="menuOrder!= null">
+                and menuOrder = #{menuOrder}
+            </if>
+            <if test="iconUrl!= null">
+                and iconUrl = #{iconUrl}
+            </if>
+            <if test="visible!= null">
+                and visible = #{visible}
+            </if>
+            <if test="creator!= null">
+                and creator = #{creator}
+            </if>
+            <if test="version!= null">
+                and version = #{version}
+            </if>
+            <if test="description!= null">
+                and description = #{description}
+            </if>
+            <if test="seq!= null">
+                and seq = #{seq}
+            </if>
+        </where>
+        order by id desc limit #{pageSize} offset #{offset}
+    </select>
+
+    <select id="queryMenuInfoPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+        SELECT count(*) from tb_pluss_menu_info
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="name!= null">
+                and name = #{name}
+            </if>
+            <if test="menuType!= null">
+                and menuType = #{menuType}
+            </if>
+            <if test="link!= null">
+                and link = #{link}
+            </if>
+            <if test="parentId!= null">
+                and parentId = #{parentId}
+            </if>
+            <if test="menuOrder!= null">
+                and menuOrder = #{menuOrder}
+            </if>
+            <if test="iconUrl!= null">
+                and iconUrl = #{iconUrl}
+            </if>
+            <if test="visible!= null">
+                and visible = #{visible}
+            </if>
+            <if test="creator!= null">
+                and creator = #{creator}
+            </if>
+            <if test="version!= null">
+                and version = #{version}
+            </if>
+            <if test="description!= null">
+                and description = #{description}
+            </if>
+            <if test="seq!= null">
+                and seq = #{seq}
+            </if>
+        </where>
+    </select>
+
+
+    <select id="getPermissionNames" parameterType="java.lang.String" resultType="cn.pluss.platform.entity.MenuInfo">
+        SELECT menu.* FROM tb_pluss_menu_info menu
+           LEFT JOIN tb_pluss_role_menu_info rmi ON menu.id = rmi.menuId
+           LEFT JOIN tb_pluss_role_user_info rui ON rui.roleId = rmi.roleId
+           LEFT JOIN tb_pluss_user_info ui ON ui.id = rui.userId
+        WHERE ui.loginName = 'admin' AND menu.visible = '1'
+        ORDER BY menu.id
+    </select>
+
+
+    <select id="queryPermitMenuInfoById" parameterType="java.util.Map" resultType="cn.pluss.platform.entity.MenuInfo">
+        select * from tb_pluss_menu_info mi
+        where mi.id in
+        (select distinct rmi.menuId from tb_pluss_role_user_info rui,tb_pluss_role_menu_info rmi where
+        rui.roleId=rmi.roleId and rui.userId=#{id})
+        and visible=1
+        <if test="parentId !=null">
+            and parentId=#{parentId}
+        </if>
+        <if test="parentId ==null">
+            and parentId is null
+        </if>
+        ORDER BY id
+    </select>
+
+    <select id="queryRoleMenuInfoList" resultType="cn.pluss.platform.entity.MenuInfo">
+        SELECT mi.*, IF(t.id IS NULL, 0, 1) checked FROM tb_pluss_menu_info mi LEFT JOIN
+        (SELECT rmi.id, rmi.menuId FROM tb_pluss_menu_info mi LEFT JOIN
+        tb_pluss_role_menu_info rmi ON mi.id = rmi.menuId
+        WHERE rmi.roleId = #{roleId}) t ON  mi.id = t.menuId
+        <where>
+            <if test="entity.id!= null">
+                and mi.id = #{id}
+            </if>
+            <if test="entity.name!= null">
+                and mi.`name` = #{name}
+            </if>
+            <if test="entity.menuType!= null">
+                and mi.menuType = #{menuType}
+            </if>
+            <if test="entity.link!= null">
+                and mi.link = #{link}
+            </if>
+            <if test="entity.parentId!= null">
+                and mi.parentId = #{parentId}
+            </if>
+            <if test="entity.menuOrder!= null">
+                and mi.menuOrder = #{menuOrder}
+            </if>
+            <if test="entity.iconUrl!= null">
+                and mi.iconUrl = #{iconUrl}
+            </if>
+            <if test="entity.visible!= null">
+                and mi.visible = #{visible}
+            </if>
+            <if test="entity.creator!= null">
+                and mi.creator = #{creator}
+            </if>
+            <if test="entity.version!= null">
+                and mi.version = #{version}
+            </if>
+            <if test="entity.description!= null">
+                and mi.description = #{description}
+            </if>
+            <if test="entity.seq!= null">
+                and mi.seq = #{seq}
+            </if>
+        </where>
+    </select>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/MercDeviceRefundImageMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/MercDeviceRefundImageMapper.xml
new file mode 100644
index 0000000..ae19eed
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/MercDeviceRefundImageMapper.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.MercDeviceRefundImageMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.MercDeviceRefundImage">
+        <id column="id" property="id" />
+        <result column="userId" property="userId" />
+        <result column="picUrl" property="picUrl" />
+        <result column="detailId" property="detailId" />
+        <result column="orderNo" property="orderNo" />
+        <result column="createTime" property="createTime" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/MercMemberSetMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/MercMemberSetMapper.xml
new file mode 100644
index 0000000..c3b3309
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/MercMemberSetMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.MercMemberSetMapper">
+
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/MercOrderDetailMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/MercOrderDetailMapper.xml
new file mode 100644
index 0000000..d9d7862
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/MercOrderDetailMapper.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.MercOrderDetailMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.MercOrderDetail">
+        <id column="id" property="id" />
+        <result column="orderNo" property="orderNo" />
+        <result column="code" property="code" />
+        <result column="name" property="name" />
+        <result column="deviceLogo" property="deviceLogo" />
+        <result column="type" property="type" />
+        <result column="num" property="num" />
+        <result column="userId" property="userId" />
+    </resultMap>
+
+    <select id="pageInfo" parameterType="cn.pluss.platform.entity.MercOrderDetail" resultType="cn.pluss.platform.entity.MercOrderDetail">
+        SELECT mo.*,
+               ua.roleCode,
+               ds.specName as specName,
+               moe.status as expressStatus,
+               mon.receiver as 'order.receiver',
+               mon.phone as 'order.phone',
+               mon.address as 'order.address',
+               mon.payType as 'order.payType',
+               mon.orderAmt as 'order.orderAmt',
+               mon.areaName as 'order.areaName',
+               mbi.alias as 'merchant.alias'
+            FROM
+            tb_pluss_merc_order_detail mo
+            left join tb_pluss_device_spec ds on  mo.code = ds.code and mo.type = ds.spec
+            left join tb_pluss_merc_order_express moe on mo.expressNo = moe.expressNo
+            left join tb_pluss_merc_order_new mon on mo.orderNo = mon.orderNo
+            left join tb_pluss_user_app ua on  mo.userId = ua.userId
+            left join tb_pluss_merchant_base_info mbi on mo.userId = mbi.userId
+            <where>
+                <if test="condition.orderNo != null and condition.orderNo != ''">
+                    and mo.orderNo = #{condition.orderNo}
+                </if>
+                <if test="condition.name != null and condition.name != ''">
+                    and mo.name = #{condition.name}
+                </if>
+                <if test="condition.merchant != null and condition.merchant.alias != null and condition.merchant.alias != ''">
+                    and mbi.alias = #{condition.merchant.alias}
+                </if>
+                <if test="condition.userId != null">
+                    and mo.userId = #{condition.userId}
+                </if>
+                <if test="condition.roleCode != null and condition.roleCode != ''">
+                    and ua.roleCode = #{condition.roleCode}
+                </if>
+                <if test="condition.logistNo != null and condition.logistNo != ''">
+                    and mo.logistNo = #{condition.logistNo}
+                </if>
+                <if test="condition.expressNo != null and condition.expressNo != ''">
+                    and mo.expressNo = #{condition.expressNo}
+                </if>
+                <if test="condition.status != null and condition.status != ''">
+                    and mo.status = #{condition.status}
+                </if>
+                <if test="condition.order != null and condition.order.payType != null">
+                    and mon.payType = #{condition.order.payType}
+                </if>
+
+                <if test="condition.order != null and condition.order.receiver != null and condition.order.receiver != ''">
+                    and mon.receiver = #{condition.order.receiver}
+                </if>
+
+                <if test="condition.order != null and condition.order.phone != null and condition.order.phone != ''">
+                    and mon.phone = #{condition.order.phone}
+                </if>
+
+                <if test="condition.expressStatus != null and condition.expressStatus != ''">
+                    <choose>
+                        <when test="condition.expressStatus == '00'">
+                            and moe.status is null
+                        </when>
+                        <otherwise>
+                            and moe.status != #{condition.expressStatus}
+                        </otherwise>
+                    </choose>
+
+                </if>
+            </where>
+            order by mo.createTime desc
+    </select>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/MercOrderExpressDetailMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/MercOrderExpressDetailMapper.xml
new file mode 100644
index 0000000..dc8a99c
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/MercOrderExpressDetailMapper.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.MercOrderExpressDetailMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.MercOrderExpressDetail">
+        <id column="id" property="id" />
+        <result column="orderNo" property="orderNo" />
+        <result column="logisticProvider" property="logisticProvider" />
+        <result column="expressNo" property="expressNo" />
+        <result column="logistNo" property="logistNo" />
+        <result column="city" property="city" />
+        <result column="district" property="district" />
+        <result column="acceptTime" property="acceptTime" />
+        <result column="remark" property="remark" />
+        <result column="empCode" property="empCode" />
+        <result column="empName" property="empName" />
+        <result column="info" property="info" />
+        <result column="weight" property="weight" />
+        <result column="contactInfo" property="contactInfo" />
+        <result column="questionCause" property="questionCause" />
+        <result column="deliveryName" property="deliveryName" />
+        <result column="orgName" property="orgName" />
+        <result column="orgCode" property="orgCode" />
+        <result column="orgPhone" property="orgPhone" />
+        <result column="createTime" property="createTime" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/MercOrderExpressMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/MercOrderExpressMapper.xml
new file mode 100644
index 0000000..a533893
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/MercOrderExpressMapper.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.MercOrderExpressMapper">
+</mapper>
\ No newline at end of file
diff --git a/pluss-dao-bundle/src/main/resources/mapper/MercOrderNewMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/MercOrderNewMapper.xml
new file mode 100644
index 0000000..8c58ab7
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/MercOrderNewMapper.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.MercOrderNewMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.MercOrderNew">
+        <id column="id" property="id" />
+        <result column="orderNo" property="orderNo" />
+        <result column="userId" property="userId" />
+        <result column="transNo" property="transNo" />
+        <result column="thirdTransNo" property="thirdTransNo" />
+        <result column="receiver" property="receiver" />
+        <result column="phone" property="phone" />
+        <result column="province" property="province" />
+        <result column="city" property="city" />
+        <result column="district" property="district" />
+        <result column="address" property="address" />
+        <result column="remark" property="remark" />
+        <result column="status" property="status" />
+        <result column="createTime" property="createTime" />
+        <result column="creator" property="creator" />
+        <result column="updateTime" property="updateTime" />
+        <result column="updater" property="updater" />
+        <result column="payType" property="payType" />
+        <result column="transDt" property="transDt" />
+        <result column="orderAmt" property="orderAmt" />
+        <result column="discountAmt" property="discountAmt" />
+        <result column="actualAmt" property="actualAmt" />
+        <result column="postage" property="postage" />
+        <result column="areaName" property="areaName" />
+        <result column="merchantCode" property="merchantCode" />
+        <result column="merchantName" property="merchantName" />
+        <result column="channel" property="channel" />
+        <result column="payData" property="payData" />
+        <result column="payUserId" property="payUserId" />
+    </resultMap>
+
+    <select id="pageInfo" resultType="cn.pluss.platform.vo.MercOrderNewVO">
+        select
+           mon.*
+        from tb_pluss_merc_order_new mon
+        <where>
+            mon.status != '00'
+            <if test="condition.orderNo != null and condition.orderNo != ''">
+                and mon.orderNo = #{condition.orderNo}
+            </if>
+            <if test="condition.userId != null">
+                and mon.userId = #{condition.userId}
+            </if>
+<!--            <if test="condition.pStatus != null and condition.pStatus != '' and condition.pStatus != '-1'">-->
+<!--                <if test="condition.pStatus == '1'">-->
+<!--                    and md.status = '06'-->
+<!--                </if>-->
+<!--                <if test="condition.pStatus == '2'">-->
+<!--                    and md.status = '05'-->
+<!--                </if>-->
+<!--                <if test="condition.pStatus == '3'">-->
+<!--                    and md.status in ('02','03','04')-->
+<!--                </if>-->
+<!--            </if>-->
+            <if test="condition.transNo != null and condition.transNo != ''">
+                and mon.transNo = #{condition.transNo}
+            </if>
+        </where>
+    </select>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/MercOrderTokenMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/MercOrderTokenMapper.xml
new file mode 100644
index 0000000..7246d1a
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/MercOrderTokenMapper.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.MercOrderTokenMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.MercOrderToken">
+        <id column="id" property="id" />
+        <result column="token" property="token" />
+        <result column="merchantName" property="merchantName" />
+        <result column="merchantCode" property="merchantCode" />
+        <result column="userId" property="userId" />
+        <result column="orderAmt" property="orderAmt" />
+        <result column="orderNumber" property="orderNumber" />
+        <result column="type" property="type" />
+        <result column="snNo" property="snNo" />
+        <result column="createTime" property="createTime" />
+        <result column="expireTime" property="expireTime" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/MercReceiveAddressMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/MercReceiveAddressMapper.xml
new file mode 100644
index 0000000..e76253c
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/MercReceiveAddressMapper.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.MercReceiveAddressMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.MercReceiveAddress">
+        <id column="id" property="id" />
+        <result column="userId" property="userId" />
+        <result column="name" property="name" />
+        <result column="phone" property="phone" />
+        <result column="province" property="province" />
+        <result column="city" property="city" />
+        <result column="district" property="district" />
+        <result column="address" property="address" />
+        <result column="defFlag" property="defFlag" />
+        <result column="createTime" property="createTime" />
+        <result column="updateTime" property="updateTime" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/MercShopTrolleyMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/MercShopTrolleyMapper.xml
new file mode 100644
index 0000000..dbb5f0f
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/MercShopTrolleyMapper.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.MercShopTrolleyMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.MercShopTrolley">
+        <id column="id" property="id" />
+        <result column="code" property="code" />
+        <result column="name" property="name" />
+        <result column="deviceLogo" property="deviceLogo" />
+        <result column="type" property="type" />
+        <result column="num" property="num" />
+        <result column="userId" property="userId" />
+        <result column="createTime" property="createTime" />
+        <result column="updateTime" property="updateTime" />
+        <result column="status" property="status" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/MerchantAddress-sqlmap.xml b/pluss-dao-bundle/src/main/resources/mapper/MerchantAddress-sqlmap.xml
new file mode 100644
index 0000000..71ffe5d
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/MerchantAddress-sqlmap.xml
@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+			"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="cn.pluss.platform.mapper.MerchantAddressMapper">
+
+	   	<insert id="saveMerchantAddress" parameterType="cn.pluss.platform.entity.MerchantAddress">
+        	insert into tb_pluss_merchant_address(userId,merchantCode,provinces,address,linkPhone,linkName,isDefault,createDt)VALUES(#{userId},#{merchantCode},#{provinces},#{address},#{linkPhone},#{linkName},#{isDefault},now())
+    	</insert>
+
+	   	<insert id="saveMerchantAddressBatch">
+        	insert into tb_pluss_merchant_address(userId,merchantCode,provinces,address,linkPhone,linkName,isDefault,createDt) VALUES 
+    			<foreach collection="list" item="item" index="index" separator=",">
+			(#{userId},#{merchantCode},#{provinces},#{address},#{linkPhone},#{linkName},#{isDefault},#{createDt}		)
+				</foreach>
+    	</insert>
+
+		<select id="queryMerchantAddress" parameterType="cn.pluss.platform.entity.MerchantAddress" resultType="cn.pluss.platform.entity.MerchantAddress">
+			SELECT * from tb_pluss_merchant_address 
+				<where> 
+					<if test="id!= null"> 
+					 	and id = #{id}
+					 </if> 
+					<if test="userId!= null"> 
+					 	and userId = #{userId}
+					 </if> 
+					<if test="merchantCode!= null"> 
+					 	and merchantCode = #{merchantCode}
+					 </if> 
+					<if test="provinces!= null"> 
+					 	and provinces = #{provinces}
+					 </if> 
+					<if test="address!= null"> 
+					 	and address = #{address}
+					 </if> 
+					<if test="linkPhone!= null"> 
+					 	and linkPhone = #{linkPhone}
+					 </if> 
+					<if test="linkName!= null"> 
+					 	and linkName = #{linkName}
+					 </if> 
+					<if test="isDefault!= null"> 
+					 	and isDefault = #{isDefault}
+					 </if> 
+					<if test="createDt!= null"> 
+					 	and createDt = #{createDt}
+					 </if> 
+				 </where> 
+		</select>
+
+		<select id="queryMerchantAddressList" parameterType="cn.pluss.platform.entity.MerchantAddress" resultType="cn.pluss.platform.entity.MerchantAddress">
+			SELECT * from tb_pluss_merchant_address 
+				<where> 
+					<if test="id!= null"> 
+					 and 	id = #{id}
+					 </if> 
+					<if test="userId!= null"> 
+					 and 	userId = #{userId}
+					 </if> 
+					<if test="merchantCode!= null"> 
+					 and 	merchantCode = #{merchantCode}
+					 </if> 
+					<if test="provinces!= null"> 
+					 and 	provinces = #{provinces}
+					 </if> 
+					<if test="address!= null"> 
+					 and 	address = #{address}
+					 </if> 
+					<if test="linkPhone!= null"> 
+					 and 	linkPhone = #{linkPhone}
+					 </if> 
+					<if test="linkName!= null"> 
+					 and 	linkName = #{linkName}
+					 </if> 
+					<if test="isDefault!= null"> 
+					 and 	isDefault = #{isDefault}
+					 </if> 
+					<if test="createDt!= null"> 
+					 and 	createDt = #{createDt}
+					 </if> 
+				 </where> 
+		</select>
+
+		<update id="updateMerchantAddress" parameterType="cn.pluss.platform.entity.MerchantAddress" >
+			update tb_pluss_merchant_address 
+				  <set> 
+					<if test="userId!= null"> 
+					 	userId = #{userId},
+					 </if> 
+					<if test="merchantCode!= null"> 
+					 	merchantCode = #{merchantCode},
+					 </if> 
+					<if test="provinces!= null"> 
+					 	provinces = #{provinces},
+					 </if> 
+					<if test="address!= null"> 
+					 	address = #{address},
+					 </if> 
+					<if test="linkPhone!= null"> 
+					 	linkPhone = #{linkPhone},
+					 </if> 
+					<if test="linkName!= null"> 
+					 	linkName = #{linkName},
+					 </if> 
+					<if test="isDefault!= null"> 
+					 	isDefault = #{isDefault},
+					 </if> 
+					<if test="createDt!= null"> 
+					 	createDt = #{createDt}
+					 </if> 
+				</set>
+			where id=#{id} 
+		</update>
+
+		<delete id="deleteMerchantAddress" parameterType="cn.pluss.platform.entity.MerchantAddress" >
+			DELETE FROM tb_pluss_merchant_address where id=#{id}
+		</delete>
+
+		<select id="queryMerchantAddressPage" parameterType="java.util.Map" resultType="cn.pluss.platform.entity.MerchantAddress">
+			SELECT * from tb_pluss_merchant_address 
+				<where> 
+					<if test="id!= null"> 
+					and id = #{id}
+					 </if> 
+					<if test="userId!= null"> 
+					and userId = #{userId}
+					 </if> 
+					<if test="merchantCode!= null"> 
+					and merchantCode = #{merchantCode}
+					 </if> 
+					<if test="provinces!= null"> 
+					and provinces = #{provinces}
+					 </if> 
+					<if test="address!= null"> 
+					and address = #{address}
+					 </if> 
+					<if test="linkPhone!= null"> 
+					and linkPhone = #{linkPhone}
+					 </if> 
+					<if test="linkName!= null"> 
+					and linkName = #{linkName}
+					 </if> 
+					<if test="isDefault!= null"> 
+					and isDefault = #{isDefault}
+					 </if> 
+					<if test="createDt!= null"> 
+					and createDt = #{createDt}
+					 </if> 
+				 </where> 
+			order by id desc  limit #{pageSize}  offset  #{offset}  
+		</select>
+
+		<select id="queryMerchantAddressPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+			SELECT count(*) from tb_pluss_merchant_address 
+					<where> 
+					<if test="id!= null"> 
+					 and id = #{id}
+					 </if> 
+					<if test="userId!= null"> 
+					 and userId = #{userId}
+					 </if> 
+					<if test="merchantCode!= null"> 
+					 and merchantCode = #{merchantCode}
+					 </if> 
+					<if test="provinces!= null"> 
+					 and provinces = #{provinces}
+					 </if> 
+					<if test="address!= null"> 
+					 and address = #{address}
+					 </if> 
+					<if test="linkPhone!= null"> 
+					 and linkPhone = #{linkPhone}
+					 </if> 
+					<if test="linkName!= null"> 
+					 and linkName = #{linkName}
+					 </if> 
+					<if test="isDefault!= null"> 
+					 and isDefault = #{isDefault}
+					 </if> 
+					<if test="createDt!= null"> 
+					 and createDt = #{createDt}
+					 </if> 
+				</where>
+		</select>
+
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/MerchantAuditRecordMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/MerchantAuditRecordMapper.xml
new file mode 100644
index 0000000..79c7253
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/MerchantAuditRecordMapper.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.MerchantAuditRecordMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.MerchantAuditRecord">
+        <id column="id" property="id" />
+        <result column="merchantCode" property="merchantCode" />
+        <result column="merchantId" property="merchantId" />
+        <result column="status" property="status" />
+        <result column="thirdStatus" property="thirdStatus" />
+        <result column="remark" property="remark" />
+        <result column="createTime" property="createTime" />
+        <result column="updateTime" property="updateTime" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/MerchantBankCard-sqlmap.xml b/pluss-dao-bundle/src/main/resources/mapper/MerchantBankCard-sqlmap.xml
new file mode 100644
index 0000000..2589901
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/MerchantBankCard-sqlmap.xml
@@ -0,0 +1,612 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+			"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="cn.pluss.platform.mapper.MerchantBankCardMapper">
+
+	   	<insert id="saveMerchantBankCard" parameterType="cn.pluss.platform.entity.MerchantBankCard">
+        	insert into tb_pluss_merchant_bank_card(merchantCode,storeId,bankCardNo,bankCertName,branchName,accountType,contactLine,branchProvince,branchCity,certType,certNo,cardHolderAddress,orderNo,merchantId,registerStatus,failReason,accountNo,wechatChannelList,phone,createDt,updateDt,userId,aisleSwitch,bankName,bankCardFrontPic,certStartTime,certEndTime,bankAddressNo,branchArea)VALUES(#{merchantCode},#{storeId},#{bankCardNo},#{bankCertName},#{branchName},#{accountType},#{contactLine},#{branchProvince},#{branchCity},#{certType},#{certNo},#{cardHolderAddress},#{orderNo},#{merchantId},#{registerStatus},#{failReason},#{accountNo},#{wechatChannelList},#{phone},now(),#{updateDt},#{userId},#{aisleSwitch},#{bankName},#{bankCardFrontPic},#{certStartTime},#{certEndTime},#{bankAddressNo},#{branchArea})
+    	</insert>
+
+	   	<insert id="saveMerchantBankCardBatch">
+        	insert into tb_pluss_merchant_bank_card(merchantCode,storeId,bankCardNo,bankCertName,branchName,accountType,contactLine,branchProvince,branchCity,certType,certNo,cardHolderAddress,orderNo,merchantId,registerStatus,failReason,accountNo,wechatChannelList,phone,createDt,updateDt) VALUES 
+    			<foreach collection="list" item="item" index="index" separator=",">
+			(#{merchantCode},#{storeId},#{bankCardNo},#{bankCertName},#{branchName},#{accountType},#{contactLine},#{branchProvince},#{branchCity},#{certType},#{certNo},#{cardHolderAddress},#{orderNo},#{merchantId},#{registerStatus},#{failReason},#{accountNo},#{wechatChannelList},#{phone},#{createDt},#{updateDt}		)
+				</foreach>
+    	</insert>
+
+		<select id="queryMerchantBankCard" parameterType="cn.pluss.platform.entity.MerchantBankCard" resultType="cn.pluss.platform.entity.MerchantBankCard">
+			SELECT * from tb_pluss_merchant_bank_card 
+				<where> 
+					<if test="id!= null"> 
+					 	and id = #{id}
+					 </if> 
+					<if test="merchantCode!= null"> 
+					 	and merchantCode = #{merchantCode}
+					 </if> 
+					<if test="storeId!= null"> 
+					 	and storeId = #{storeId}
+					 </if> 
+					<if test="bankCardNo!= null"> 
+					 	and bankCardNo = #{bankCardNo}
+					 </if> 
+					<if test="bankCertName!= null"> 
+					 	and bankCertName = #{bankCertName}
+					 </if> 
+					<if test="branchName!= null"> 
+					 	and branchName = #{branchName}
+					 </if> 
+					<if test="accountType!= null"> 
+					 	and accountType = #{accountType}
+					 </if> 
+					<if test="contactLine!= null"> 
+					 	and contactLine = #{contactLine}
+					 </if> 
+					<if test="branchProvince!= null"> 
+					 	and branchProvince = #{branchProvince}
+					 </if> 
+					<if test="branchCity!= null"> 
+					 	and branchCity = #{branchCity}
+					 </if> 
+					<if test="certType!= null"> 
+					 	and certType = #{certType}
+					 </if> 
+					<if test="certNo!= null"> 
+					 	and certNo = #{certNo}
+					 </if> 
+					<if test="cardHolderAddress!= null"> 
+					 	and cardHolderAddress = #{cardHolderAddress}
+					 </if> 
+					<if test="orderNo!= null"> 
+					 	and orderNo = #{orderNo}
+					 </if> 
+					<if test="merchantId!= null"> 
+					 	and merchantId = #{merchantId}
+					 </if> 
+					<if test="registerStatus!= null"> 
+					 	and registerStatus = #{registerStatus}
+					 </if> 
+					<if test="failReason!= null"> 
+					 	and failReason = #{failReason}
+					 </if> 
+					<if test="accountNo!= null"> 
+					 	and accountNo = #{accountNo}
+					 </if> 
+					<if test="wechatChannelList!= null"> 
+					 	and wechatChannelList = #{wechatChannelList}
+					 </if> 
+					<if test="phone!= null"> 
+					 	and phone = #{phone}
+					 </if> 
+					<if test="createDt!= null"> 
+					 	and createDt = #{createDt}
+					 </if> 
+					<if test="updateDt!= null"> 
+					 	and updateDt = #{updateDt}
+					 </if> 
+					<if test="userId!= null"> 
+					 	and userId = #{userId}
+					 </if> 
+					<if test="aisleSwitch!= null"> 
+					 	and aisleSwitch = #{aisleSwitch}
+					 </if> 
+					<if test="bankName!= null"> 
+					 	and bankName = #{bankName}
+					 </if> 
+					<if test="bankCardFrontPic!= null"> 
+					 	and bankCardFrontPic = #{bankCardFrontPic}
+					 </if> 
+					<if test="certStartTime!= null"> 
+					 	and certStartTime = #{certStartTime}
+					 </if> 
+					<if test="certEndTime!= null"> 
+					 	and certEndTime = #{certEndTime}
+					 </if> 
+					<if test="bankAddressNo!= null"> 
+					 	and bankAddressNo = #{bankAddressNo}
+					 </if> 
+					<if test="branchArea!= null"> 
+					 	and branchArea = #{branchArea}
+					 </if> 
+				 </where> 
+		</select>
+
+		<select id="queryMerchantBankCardList" parameterType="cn.pluss.platform.entity.MerchantBankCard" resultType="cn.pluss.platform.entity.MerchantBankCard">
+			SELECT * from tb_pluss_merchant_bank_card 
+				<where> 
+					<if test="id!= null"> 
+					 and 	id = #{id}
+					 </if> 
+					<if test="merchantCode!= null"> 
+					 and 	merchantCode = #{merchantCode}
+					 </if> 
+					<if test="storeId!= null"> 
+					 and 	storeId = #{storeId}
+					 </if> 
+					<if test="bankCardNo!= null"> 
+					 and 	bankCardNo = #{bankCardNo}
+					 </if> 
+					<if test="bankCertName!= null"> 
+					 and 	bankCertName = #{bankCertName}
+					 </if> 
+					<if test="branchName!= null"> 
+					 and 	branchName = #{branchName}
+					 </if> 
+					<if test="accountType!= null"> 
+					 and 	accountType = #{accountType}
+					 </if> 
+					<if test="contactLine!= null"> 
+					 and 	contactLine = #{contactLine}
+					 </if> 
+					<if test="branchProvince!= null"> 
+					 and 	branchProvince = #{branchProvince}
+					 </if> 
+					<if test="branchCity!= null"> 
+					 and 	branchCity = #{branchCity}
+					 </if> 
+					<if test="certType!= null"> 
+					 and 	certType = #{certType}
+					 </if> 
+					<if test="certNo!= null"> 
+					 and 	certNo = #{certNo}
+					 </if> 
+					<if test="cardHolderAddress!= null"> 
+					 and 	cardHolderAddress = #{cardHolderAddress}
+					 </if> 
+					<if test="orderNo!= null"> 
+					 and 	orderNo = #{orderNo}
+					 </if> 
+					<if test="merchantId!= null"> 
+					 and 	merchantId = #{merchantId}
+					 </if> 
+					<if test="registerStatus!= null"> 
+					 and 	registerStatus = #{registerStatus}
+					 </if> 
+					<if test="failReason!= null"> 
+					 and 	failReason = #{failReason}
+					 </if> 
+					<if test="accountNo!= null"> 
+					 and 	accountNo = #{accountNo}
+					 </if> 
+					<if test="wechatChannelList!= null"> 
+					 and 	wechatChannelList = #{wechatChannelList}
+					 </if> 
+					<if test="phone!= null"> 
+					 and 	phone = #{phone}
+					 </if> 
+					<if test="createDt!= null"> 
+					 and 	createDt = #{createDt}
+					 </if> 
+					<if test="updateDt!= null"> 
+					 and 	updateDt = #{updateDt}
+					 </if> 
+					 <if test="userId!= null"> 
+                        and userId = #{userId}
+                     </if> 
+                    <if test="aisleSwitch!= null"> 
+                        and aisleSwitch = #{aisleSwitch}
+                     </if> 
+                     <if test="bankName!= null"> 
+                        and bankName = #{bankName}
+                     </if> 
+                     <if test="bankCardFrontPic!= null"> 
+                        and bankCardFrontPic = #{bankCardFrontPic}
+                     </if> 
+                     <if test="certStartTime!= null"> 
+                        and certStartTime = #{certStartTime}
+                     </if> 
+                    <if test="certEndTime!= null"> 
+                        and certEndTime = #{certEndTime}
+                     </if> 
+                     <if test="bankAddressNo!= null"> 
+                        and bankAddressNo = #{bankAddressNo}
+                     </if> 
+                     <if test="branchArea!= null"> 
+                        and branchArea = #{branchArea}
+                     </if>
+				 </where> 
+		</select>
+
+		<update id="updateMerchantBankCard" parameterType="cn.pluss.platform.entity.MerchantBankCard" >
+			update tb_pluss_merchant_bank_card 
+				  <set> 
+					<if test="merchantCode!= null"> 
+					 	merchantCode = #{merchantCode},
+					 </if> 
+					<if test="storeId!= null"> 
+					 	storeId = #{storeId},
+					 </if> 
+					<if test="bankCardNo!= null"> 
+					 	bankCardNo = #{bankCardNo},
+					 </if> 
+					<if test="bankCertName!= null"> 
+					 	bankCertName = #{bankCertName},
+					 </if> 
+					<if test="branchName!= null"> 
+					 	branchName = #{branchName},
+					 </if> 
+					<if test="accountType!= null"> 
+					 	accountType = #{accountType},
+					 </if> 
+					<if test="contactLine!= null"> 
+					 	contactLine = #{contactLine},
+					 </if> 
+					<if test="branchProvince!= null"> 
+					 	branchProvince = #{branchProvince},
+					 </if> 
+					<if test="branchCity!= null"> 
+					 	branchCity = #{branchCity},
+					 </if> 
+					<if test="certType!= null"> 
+					 	certType = #{certType},
+					 </if> 
+					<if test="certNo!= null"> 
+					 	certNo = #{certNo},
+					 </if> 
+					<if test="cardHolderAddress!= null"> 
+					 	cardHolderAddress = #{cardHolderAddress},
+					 </if> 
+					<if test="orderNo!= null"> 
+					 	orderNo = #{orderNo},
+					 </if> 
+					<if test="merchantId!= null"> 
+					 	merchantId = #{merchantId},
+					 </if> 
+					<if test="registerStatus!= null"> 
+					 	registerStatus = #{registerStatus},
+					 </if> 
+					<if test="failReason!= null"> 
+					 	failReason = #{failReason},
+					 </if> 
+					<if test="accountNo!= null"> 
+					 	accountNo = #{accountNo},
+					 </if> 
+					<if test="wechatChannelList!= null"> 
+					 	wechatChannelList = #{wechatChannelList},
+					 </if> 
+					<if test="phone!= null"> 
+					 	phone = #{phone},
+					 </if> 
+					<if test="createDt!= null"> 
+					 	createDt = #{createDt},
+					 </if> 
+					<if test="updateDt!= null"> 
+					 	updateDt = #{updateDt},
+					 </if> 
+					 <if test="userId!= null"> 
+                         userId = #{userId},
+                     </if> 
+                    <if test="aisleSwitch!= null"> 
+                         aisleSwitch = #{aisleSwitch},
+                     </if> 
+                     <if test="bankName!= null"> 
+                         bankName = #{bankName},
+                     </if> 
+                     <if test="bankCardFrontPic!= null"> 
+                         bankCardFrontPic = #{bankCardFrontPic},
+                     </if> 
+                     <if test="certStartTime!= null"> 
+                         certStartTime = #{certStartTime},
+                     </if> 
+                    <if test="certEndTime!= null"> 
+                         certEndTime = #{certEndTime},
+                     </if> 
+                     <if test="bankAddressNo!= null"> 
+                         bankAddressNo = #{bankAddressNo},
+                     </if> 
+                     <if test="branchArea!= null"> 
+                         branchArea = #{branchArea}
+                     </if>
+				</set>
+			where id=#{id} 
+		</update>
+
+	<update id="updateMerchantBankCardUserId" parameterType="cn.pluss.platform.entity.MerchantBankCard" >
+		update tb_pluss_merchant_bank_card
+		<set>
+			<if test="merchantCode!= null">
+				merchantCode = #{merchantCode},
+			</if>
+			<if test="storeId!= null">
+				storeId = #{storeId},
+			</if>
+			<if test="bankCardNo!= null">
+				bankCardNo = #{bankCardNo},
+			</if>
+			<if test="bankCertName!= null">
+				bankCertName = #{bankCertName},
+			</if>
+			<if test="branchName!= null">
+				branchName = #{branchName},
+			</if>
+			<if test="accountType!= null">
+				accountType = #{accountType},
+			</if>
+			<if test="contactLine!= null">
+				contactLine = #{contactLine},
+			</if>
+			<if test="branchProvince!= null">
+				branchProvince = #{branchProvince},
+			</if>
+			<if test="branchCity!= null">
+				branchCity = #{branchCity},
+			</if>
+			<if test="certType!= null">
+				certType = #{certType},
+			</if>
+			<if test="certNo!= null">
+				certNo = #{certNo},
+			</if>
+			<if test="cardHolderAddress!= null">
+				cardHolderAddress = #{cardHolderAddress},
+			</if>
+			<if test="orderNo!= null">
+				orderNo = #{orderNo},
+			</if>
+			<if test="merchantId!= null">
+				merchantId = #{merchantId},
+			</if>
+			<if test="registerStatus!= null">
+				registerStatus = #{registerStatus},
+			</if>
+			<if test="failReason!= null">
+				failReason = #{failReason},
+			</if>
+			<if test="accountNo!= null">
+				accountNo = #{accountNo},
+			</if>
+			<if test="wechatChannelList!= null">
+				wechatChannelList = #{wechatChannelList},
+			</if>
+			<if test="phone!= null">
+				phone = #{phone},
+			</if>
+			<if test="createDt!= null">
+				createDt = #{createDt},
+			</if>
+			<if test="updateDt!= null">
+				updateDt = #{updateDt},
+			</if>
+			<if test="aisleSwitch!= null">
+				aisleSwitch = #{aisleSwitch},
+			</if>
+			<if test="bankName!= null">
+				bankName = #{bankName},
+			</if>
+			<if test="bankCardFrontPic!= null">
+				bankCardFrontPic = #{bankCardFrontPic},
+			</if>
+			<if test="certStartTime!= null">
+				certStartTime = #{certStartTime},
+			</if>
+			<if test="certEndTime!= null">
+				certEndTime = #{certEndTime},
+			</if>
+			<if test="bankAddressNo!= null">
+				bankAddressNo = #{bankAddressNo},
+			</if>
+			<if test="branchArea!= null">
+				branchArea = #{branchArea}
+			</if>
+		</set>
+		where userId=#{userId}
+	</update>
+
+		<delete id="deleteMerchantBankCard" parameterType="cn.pluss.platform.entity.MerchantBankCard" >
+			DELETE FROM tb_pluss_merchant_bank_card where id=#{id}
+		</delete>
+
+		<select id="queryMerchantBankCardPage" parameterType="java.util.Map" resultType="cn.pluss.platform.entity.MerchantBankCard">
+			SELECT * from tb_pluss_merchant_bank_card 
+				<where> 
+					<if test="id!= null"> 
+					and id = #{id}
+					 </if> 
+					<if test="merchantCode!= null"> 
+					and merchantCode = #{merchantCode}
+					 </if> 
+					<if test="storeId!= null"> 
+					and storeId = #{storeId}
+					 </if> 
+					<if test="bankCardNo!= null"> 
+					and bankCardNo = #{bankCardNo}
+					 </if> 
+					<if test="bankCertName!= null"> 
+					and bankCertName like CONCAT("%",#{bankCertName},"%")
+					 </if> 
+					<if test="branchName!= null"> 
+					and branchName = #{branchName}
+					 </if> 
+					<if test="accountType!= null"> 
+					and accountType = #{accountType}
+					 </if> 
+					<if test="contactLine!= null"> 
+					and contactLine = #{contactLine}
+					 </if> 
+					<if test="branchProvince!= null"> 
+					and branchProvince = #{branchProvince}
+					 </if> 
+					<if test="branchCity!= null"> 
+					and branchCity = #{branchCity}
+					 </if> 
+					<if test="certType!= null"> 
+					and certType = #{certType}
+					 </if> 
+					<if test="certNo!= null"> 
+					and certNo = #{certNo}
+					 </if> 
+					<if test="cardHolderAddress!= null"> 
+					and cardHolderAddress = #{cardHolderAddress}
+					 </if> 
+					<if test="orderNo!= null"> 
+					and orderNo = #{orderNo}
+					 </if> 
+					<if test="merchantId!= null"> 
+					and merchantId = #{merchantId}
+					 </if> 
+					<if test="registerStatus!= null"> 
+					and registerStatus = #{registerStatus}
+					 </if> 
+					<if test="failReason!= null"> 
+					and failReason = #{failReason}
+					 </if> 
+					<if test="accountNo!= null"> 
+					and accountNo = #{accountNo}
+					 </if> 
+					<if test="wechatChannelList!= null"> 
+					and wechatChannelList = #{wechatChannelList}
+					 </if> 
+					<if test="phone!= null"> 
+					and phone = #{phone}
+					 </if> 
+					<if test="createDt!= null"> 
+					and createDt = #{createDt}
+					 </if> 
+					<if test="updateDt!= null"> 
+					and updateDt = #{updateDt}
+					 </if> 
+					 <if test="userId!= null"> 
+                        and userId = #{userId}
+                     </if> 
+                    <if test="aisleSwitch!= null"> 
+                        and aisleSwitch = #{aisleSwitch}
+                     </if> 
+                     <if test="bankName!= null"> 
+                        and bankName = #{bankName}
+                     </if> 
+                     <if test="bankCardFrontPic!= null"> 
+                        and bankCardFrontPic = #{bankCardFrontPic}
+                     </if> 
+                     <if test="certStartTime!= null"> 
+                        and certStartTime = #{certStartTime}
+                     </if> 
+                    <if test="certEndTime!= null"> 
+                        and certEndTime = #{certEndTime}
+                     </if> 
+                     <if test="bankAddressNo!= null"> 
+                        and bankAddressNo = #{bankAddressNo}
+                     </if> 
+                     <if test="branchArea!= null"> 
+                        and branchArea = #{branchArea}
+                     </if>
+				 </where> 
+			order by id desc  limit #{pageSize}  offset  #{offset}  
+		</select>
+
+		<select id="queryMerchantBankCardPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+			SELECT count(*) from tb_pluss_merchant_bank_card 
+					<where> 
+					<if test="id!= null"> 
+					 and id = #{id}
+					 </if> 
+					<if test="merchantCode!= null"> 
+					 and merchantCode = #{merchantCode}
+					 </if> 
+					<if test="storeId!= null"> 
+					 and storeId = #{storeId}
+					 </if> 
+					<if test="bankCardNo!= null"> 
+					 and bankCardNo = #{bankCardNo}
+					 </if> 
+					<if test="bankCertName!= null"> 
+					 and bankCertName like  CONCAT("%",#{bankCertName},"%")
+					 </if> 
+					<if test="branchName!= null"> 
+					 and branchName = #{branchName}
+					 </if> 
+					<if test="accountType!= null"> 
+					 and accountType = #{accountType}
+					 </if> 
+					<if test="contactLine!= null"> 
+					 and contactLine = #{contactLine}
+					 </if> 
+					<if test="branchProvince!= null"> 
+					 and branchProvince = #{branchProvince}
+					 </if> 
+					<if test="branchCity!= null"> 
+					 and branchCity = #{branchCity}
+					 </if> 
+					<if test="certType!= null"> 
+					 and certType = #{certType}
+					 </if> 
+					<if test="certNo!= null"> 
+					 and certNo = #{certNo}
+					 </if> 
+					<if test="cardHolderAddress!= null"> 
+					 and cardHolderAddress = #{cardHolderAddress}
+					 </if> 
+					<if test="orderNo!= null"> 
+					 and orderNo = #{orderNo}
+					 </if> 
+					<if test="merchantId!= null"> 
+					 and merchantId = #{merchantId}
+					 </if> 
+					<if test="registerStatus!= null"> 
+					 and registerStatus = #{registerStatus}
+					 </if> 
+					<if test="failReason!= null"> 
+					 and failReason = #{failReason}
+					 </if> 
+					<if test="accountNo!= null"> 
+					 and accountNo = #{accountNo}
+					 </if> 
+					<if test="wechatChannelList!= null"> 
+					 and wechatChannelList = #{wechatChannelList}
+					 </if> 
+					<if test="phone!= null"> 
+					 and phone = #{phone}
+					 </if> 
+					<if test="createDt!= null"> 
+					 and createDt = #{createDt}
+					 </if> 
+					<if test="updateDt!= null"> 
+					 and updateDt = #{updateDt}
+					 </if> 
+					 <if test="userId!= null"> 
+                        and userId = #{userId}
+                     </if> 
+                    <if test="aisleSwitch!= null"> 
+                        and aisleSwitch = #{aisleSwitch}
+                     </if> 
+                      <if test="bankName!= null"> 
+                        and bankName = #{bankName}
+                     </if> 
+                     <if test="bankCardFrontPic!= null"> 
+                        and bankCardFrontPic = #{bankCardFrontPic}
+                     </if> 
+                     <if test="certStartTime!= null"> 
+                        and certStartTime = #{certStartTime}
+                     </if> 
+                    <if test="certEndTime!= null"> 
+                        and certEndTime = #{certEndTime}
+                     </if> 
+                     <if test="bankAddressNo!= null"> 
+                        and bankAddressNo = #{bankAddressNo}
+                     </if> 
+                     <if test="branchArea!= null"> 
+                        and branchArea = #{branchArea}
+                     </if>
+				</where>
+		</select>
+		
+		<select id="queryMerchantBankCardInfoPage" parameterType="java.util.Map" resultType="cn.pluss.platform.entity.MerchantBankCard">
+		      select mbc.id,mbc.bankCardNo,mbc.bankCertName,mbc.branchName,mbc.contactLine,mbc.branchProvince,mbc.branchCity,mbc.certNo,(select picUrl from tb_pluss_merchant_image mi where mi.merchantCode=mbc.merchantCode and mi.photoType='01') as image01,(select picUrl from tb_pluss_merchant_image mi where mi.merchantCode=mbc.merchantCode and mi.photoType='02') as image02,(select picUrl from tb_pluss_merchant_image mi where mi.merchantCode=mbc.merchantCode and mi.photoType='98') as image03,mbc.phone,mbc.createDt,mbc.updateDt from tb_pluss_merchant_bank_card mbc
+		      <where>
+		          <if test="bankCertName!=null and bankCertName!=''">
+		             and mbc.bankCertName=#{bankCertName}
+		          </if>
+		      </where>
+		      order by mbc.id DESC  limit #{pageSize}  offset  #{offset}  
+		</select>
+		
+		<select id="queryMerchantBankCardInfoPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+              select count(mbc.id) from tb_pluss_merchant_bank_card mbc
+              <where>
+                  <if test="bankCertName!=null and bankCertName!=''">
+                     and mbc.bankCertName=#{bankCertName}
+                  </if>
+              </where>
+        </select>
+		
+
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/MerchantBaseInfo-sqlmap.xml b/pluss-dao-bundle/src/main/resources/mapper/MerchantBaseInfo-sqlmap.xml
new file mode 100644
index 0000000..5a0f8cf
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/MerchantBaseInfo-sqlmap.xml
@@ -0,0 +1,1005 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="cn.pluss.platform.mapper.MerchantBaseInfoMapper">
+
+    <select id="queryMerchantBaseInfoPage" parameterType="java.util.Map"
+            resultType="cn.pluss.platform.entity.MerchantBaseInfo">
+        SELECT * from tb_pluss_merchant_base_info
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="merchantCode!= null">
+                and merchantCode = #{merchantCode}
+            </if>
+            <if test="merchantName!= null">
+                and merchantName like CONCAT("%",#{merchantName},"%")
+            </if>
+            <if test="merchantType!= null">
+                and merchantType = #{merchantType}
+            </if>
+            <if test="mcc!= null">
+                and mcc = #{mcc}
+            </if>
+            <if test="alias!= null">
+                and alias = #{alias}
+            </if>
+            <if test="contactMobile!= null">
+                and contactMobile = #{contactMobile}
+            </if>
+            <if test="contactName!= null">
+                and contactName = #{contactName}
+            </if>
+            <if test="province!= null">
+                and province = #{province}
+            </if>
+            <if test="city!= null">
+                and city = #{city}
+            </if>
+            <if test="district!= null">
+                and district = #{district}
+            </if>
+            <if test="address!= null">
+                and address = #{address}
+            </if>
+            <if test="email!= null">
+                and email = #{email}
+            </if>
+            <if test="principalMobile!= null">
+                and principalMobile = #{principalMobile}
+            </if>
+            <if test="principalCertType!= null">
+                and principalCertType = #{principalCertType}
+            </if>
+            <if test="principalCertNo!= null">
+                and principalCertNo = #{principalCertNo}
+            </if>
+            <if test="principalPerson!= null">
+                and principalPerson = #{principalPerson}
+            </if>
+            <if test="bussAuthNum!= null">
+                and bussAuthNum = #{bussAuthNum}
+            </if>
+            <if test="certOrgCode!= null">
+                and certOrgCode = #{certOrgCode}
+            </if>
+            <if test="startTime!= null and startTime!=''">
+                <![CDATA[
+                            and  DATE_FORMAT(createDt, '%Y-%m-%d %H:%i:%S')>=DATE_FORMAT(#{startTime}, '%Y-%m-%d %H:%i:%S')
+                         ]]>
+            </if>
+            <if test="endTime!= null and endTime!=''">
+                <![CDATA[
+                            and  DATE_FORMAT(createDt, '%Y-%m-%d %H:%i:%S')<=DATE_FORMAT(#{endTime}, '%Y-%m-%d %H:%i:%S')
+                         ]]>
+            </if>
+            <if test="createDt!= null">
+                and createDt = #{createDt}
+            </if>
+            <if test="updateDt!= null">
+                and updateDt = #{updateDt}
+            </if>
+            <if test="creator!= null">
+                and creator = #{creator}
+            </if>
+            <if test="bussAuthAddress!= null">
+                and bussAuthAddress = #{bussAuthAddress}
+            </if>
+            <if test="bussAuthStartTime!= null">
+                and bussAuthStartTime = #{bussAuthStartTime}
+            </if>
+            <if test="bussAuthEndTime!= null">
+                and bussAuthEndTime = #{bussAuthEndTime}
+            </if>
+            <if test="userId!= null">
+                and userId = #{userId}
+            </if>
+            <if test="aliAccount!= null">
+                and aliAccount = #{aliAccount}
+            </if>
+            <if test="aliMcc!= null">
+                and aliMcc = #{aliMcc}
+            </if>
+            <if test="addressNo!= null">
+                and addressNo = #{addressNo}
+            </if>
+            <if test="productDesc!= null">
+                and productDesc = #{productDesc}
+            </if>
+            <if test="mccName!= null">
+                and mccName = #{mccName}
+            </if>
+            <if test="bindingCode!= null">
+                and bindingCode = #{bindingCode}
+            </if>
+            <if test="bussAuthName!= null">
+                and bussAuthName = #{bussAuthName}
+            </if>
+            <if test="buslicType!= null">
+                and buslicType = #{buslicType}
+            </if>
+            <if test="isVoice!= null">
+                and isVoice = #{isVoice}
+            </if>
+
+        </where>
+        order by id desc limit #{pageSize} offset #{offset}
+    </select>
+
+    <select id="queryMerchantBaseInfoPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+        SELECT count(*) from tb_pluss_merchant_base_info
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="merchantCode!= null and merchantCode!=''">
+                and merchantCode = #{merchantCode}
+            </if>
+            <if test="merchantName!= null and merchantName!=''">
+                and merchantName LIKE CONCAT('%',#{merchantName},'%')
+            </if>
+            <if test="merchantType!= null">
+                and merchantType = #{merchantType}
+            </if>
+            <if test="mcc!= null">
+                and mcc = #{mcc}
+            </if>
+            <if test="authCode!= null">
+                and authCode = #{authCode}
+            </if>
+            <if test="supportStage!= null">
+                and supportStage = #{supportStage}
+            </if>
+            <if test="alias!= null">
+                and alias = #{alias}
+            </if>
+            <if test="contactMobile!= null">
+                and contactMobile = #{contactMobile}
+            </if>
+            <if test="contactName!= null">
+                and contactName = #{contactName}
+            </if>
+            <if test="province!= null">
+                and province = #{province}
+            </if>
+            <if test="city!= null">
+                and city = #{city}
+            </if>
+            <if test="district!= null">
+                and district = #{district}
+            </if>
+            <if test="address!= null">
+                and address = #{address}
+            </if>
+            <if test="email!= null">
+                and email = #{email}
+            </if>
+            <if test="legalPerson!= null">
+                and legalPerson = #{legalPerson}
+            </if>
+            <if test="principalMobile!= null">
+                and principalMobile = #{principalMobile}
+            </if>
+            <if test="principalCertType!= null">
+                and principalCertType = #{principalCertType}
+            </if>
+            <if test="principalCertNo!= null">
+                and principalCertNo = #{principalCertNo}
+            </if>
+            <if test="principalPerson!= null">
+                and principalPerson = #{principalPerson}
+            </if>
+            <if test="bussAuthNum!= null">
+                and bussAuthNum = #{bussAuthNum}
+            </if>
+            <if test="certOrgCode!= null">
+                and certOrgCode = #{certOrgCode}
+            </if>
+            <if test="createDt!= null">
+                and createDt = #{createDt}
+            </if>
+            <if test="startTime!= null and startTime!=''">
+                <![CDATA[
+                            and  DATE_FORMAT(createDt, '%Y-%m-%d %H:%i:%S')>=DATE_FORMAT(#{startTime}, '%Y-%m-%d %H:%i:%S')
+                         ]]>
+            </if>
+            <if test="endTime!= null and endTime!=''">
+                <![CDATA[
+                            and  DATE_FORMAT(createDt, '%Y-%m-%d %H:%i:%S')<=DATE_FORMAT(#{endTime}, '%Y-%m-%d %H:%i:%S')
+                         ]]>
+            </if>
+            <if test="updateDt!= null">
+                and updateDt = #{updateDt}
+            </if>
+            <if test="creator!= null">
+                and creator = #{creator}
+            </if>
+            <if test="creator!= null">
+                and creator = #{creator}
+            </if>
+            <if test="registerStatus!= null">
+                and registerStatus = #{registerStatus}
+            </if>
+            <if test="bindingCode!= null">
+                and bindingCode = #{bindingCode}
+            </if>
+            <if test="bussAuthAddress!= null">
+                and bussAuthAddress = #{bussAuthAddress}
+            </if>
+            <if test="bussAuthStartTime!= null">
+                and bussAuthStartTime = #{bussAuthStartTime}
+            </if>
+            <if test="bussAuthEndTime!= null">
+                and bussAuthEndTime = #{bussAuthEndTime}
+            </if>
+            <if test="userId!= null">
+                and userId = #{userId}
+            </if>
+            <if test="aliAccount!= null">
+                and aliAccount = #{aliAccount}
+            </if>
+            <if test="aliMcc!= null">
+                and aliMcc = #{aliMcc}
+            </if>
+            <if test="addressNo!= null">
+                and addressNo = #{addressNo}
+            </if>
+            <if test="productDesc!= null">
+                and productDesc = #{productDesc}
+            </if>
+            <if test="mccName!= null">
+                and mccName = #{mccName}
+            </if>
+            <if test="bussAuthName!= null">
+                and bussAuthName = #{bussAuthName}
+            </if>
+            <if test="buslicType!= null">
+                and buslicType = #{buslicType}
+            </if>
+            <if test="isVoice!= null">
+                and isVoice = #{isVoice}
+            </if>
+        </where>
+    </select>
+
+
+    <!-- 根据签约时间查询当前用户的推广商户 -->
+    <select id="queryMerchantBaseInfoPageCountBySignDt" parameterType="java.util.Map" resultType="java.lang.Integer">
+        SELECT count(*)
+        from tb_pluss_merchant_base_info
+        where signDt &gt;= #{startTime}
+          and signDt &lt;= #{endTime}
+          and promoterCode = #{promoterCode}
+    </select>
+
+    <select id="queryMerchantBaseNewPage" parameterType="java.util.Map"
+            resultType="cn.pluss.platform.vo.MerchantBaseNewVO">
+        SELECT
+        info.alias,
+        info.id,
+        info.userId,
+        info.merchantCode,
+        info.userName,
+        info.contactMobile AS phone,
+        IFNULL( spreadCountTb.`count`, 0) yesterdaySpreadCount,
+        IFNULL( orderCountTb.orderCount, 0) orderCount,
+        IFNULL( orderCountTb.yesterdayOrderCount, 0) yesterdayOrderCount,
+        IFNULL(trade.totalMoney,0.00) as earnings,
+        IFNULL(trade.toDayEarnings,0.00) as toDayEarnings,
+        IFNULL(trade.yestDayEarnings,0.00) as yestDayEarnings,
+        IFNULL(member.totalMember,0) as menber,
+        IFNULL(member.toDayMenber,0) as toDayMenber,
+        IFNULL( member.yestDayMenber, 0 ) AS yestDayMenber,
+        IFNULL(fans.yesterDayFansCount,0) as yesterDayFansCount,
+        IFNULL(fans.toDayFansCount,0) as toDayFansCount,
+        IFNULL(shape.fansMoney,0.00) as fansMoney,
+        info.parentIdPhone,
+        info.merchantName as merchantName,
+        info.createDt
+        FROM
+        (SELECT
+        mbi.id,
+        mbi.alias,
+        mbi.userId AS userId,
+        mbi.merchantCode AS merchantCode,
+        mbi.contactName as userName,
+        mbi.contactMobile,
+        mbi.merchantName,
+        ui.phone AS parentIdPhone,
+        mbi.createDt
+        FROM
+        tb_pluss_merchant_base_info mbi
+        LEFT JOIN tb_pluss_user_app ua
+        ON mbi.userId=ua.userId
+        LEFT JOIN tb_pluss_user_info ui
+        ON ua.parentId = ui.id
+        ) info
+        LEFT JOIN
+        (
+        SELECT
+        mo.merchantCode,SUM(mo.consumeFee) totalMoney,
+        SUM(IFNULL((CASE WHEN to_days(mo.createDt) = TO_DAYS(now()) THEN mo.consumeFee end),0.00)) AS toDayEarnings,
+        SUM(IFNULL((CASE WHEN to_days(mo.createDt) = TO_DAYS(DATE_SUB(now(),INTERVAL 1 DAY)) THEN mo.consumeFee
+        end),0.00)) AS yestDayEarnings
+        FROM tb_pluss_merchant_order mo WHERE mo.`status` = 1 GROUP BY mo.merchantCode) trade
+        ON info.merchantCode = trade.merchantCode
+        LEFT JOIN
+        (SELECT
+        mm.merchantCode,count(mm.id) AS totalMember,
+        count(CASE WHEN to_days(mm.createDt) = to_days(now()) THEN mm.id end) AS toDayMenber,
+        count(CASE WHEN (to_days(mm.createDt) + 1) = to_days(now()) THEN mm.id end) AS yestDayMenber
+        FROM tb_pluss_merchant_menber mm GROUP BY mm.merchantCode
+        ) member
+        ON info.merchantCode = member.merchantCode
+        LEFT JOIN
+        (SELECT
+        rf.enableMerchantCode,
+        count(CASE WHEN to_days(NOW()) - to_days(rf.enableTime) <![CDATA[<=]]>  1 THEN rf.id end) as yesterDayFansCount,
+        count(CASE WHEN to_days(rf.enableTime) = to_days(now()) THEN rf.id end) as toDayFansCount
+        FROM tb_pluss_real_fans rf GROUP BY rf.enableMerchantCode ) fans
+        ON info.merchantCode = fans.enableMerchantCode
+        LEFT JOIN
+        (SELECT pf.lastMerchantCode,ROUND(SUM(pf.shareMoney),2) AS fansMoney FROM tb_pluss_fans pf WHERE
+        pf.lastMerchantCode is not null GROUP BY pf.lastMerchantCode ) as shape
+        ON info.merchantCode = shape.lastMerchantCode
+        LEFT JOIN (
+        SELECT merchantCode, COUNT(1) orderCount, COUNT(IF(TO_DAYS(now()) = (TO_DAYS(createDt) + 1 ), 1, NULL))
+        yesterdayOrderCount
+        FROM tb_pluss_merchant_order GROUP BY merchantCode
+        ) orderCountTb ON info.merchantCode = orderCountTb.merchantCode
+        LEFT JOIN (
+        SELECT parentId userId, COUNT(IF(TO_DAYS(now()) = (TO_DAYS(createDt) + 1 ), 1, NULL)) `count`
+        FROM tb_pluss_user_app GROUP BY parentId
+        ) spreadCountTb ON spreadCountTb.userId = info.userId
+        <where>
+            <if test="merchantCode!=null and merchantCode!=''">
+                and info.merchantCode= #{merchantCode}
+            </if>
+            <if test="alias!=null and alias!=''">
+                and info.alias like concat("%",#{alias},"%")
+            </if>
+            <if test="merchantName!=null and merchantName!=''">
+                and info.merchantName LIKE CONCAT('%',#{merchantName},'%')
+            </if>
+            <if test="userName!=null and userName!=''">
+                and info.userName LIKE CONCAT('%',#{userName},'%')
+            </if>
+            <if test="userId!=null">
+                and info.userId = #{userId}
+            </if>
+            <if test="phone!=null and phone!=''">
+                and info.contactMobile LIKE CONCAT("%",#{phone},"%")
+            </if>
+            <if test="parentIdPhone!=null and parentIdPhone!=''">
+                and info.parentIdPhone LIKE CONCAT("%",#{parentIdPhone},"%")
+            </if>
+        </where>
+        <choose>
+            <when test="column != null and column != ''">
+                order by ${column}
+            </when>
+            <otherwise>
+                order by info.createDt
+            </otherwise>
+        </choose>
+        <choose>
+            <when test="asc">
+                asc
+            </when>
+            <otherwise>
+                desc
+            </otherwise>
+        </choose>
+        limit #{pageSize} offset #{offset}
+    </select>
+
+    <select id="queryMerchantNoBaseNewPage" parameterType="java.util.Map"
+            resultType="cn.pluss.platform.vo.MerchantBaseNewVO">
+        SELECT
+        info.alias,
+        info.id,
+        info.userId,
+        info.merchantCode,
+        info.userName,
+        info.contactMobile AS phone,
+        IFNULL( spreadCountTb.`count`, 0) yesterdaySpreadCount,
+        IFNULL( orderCountTb.orderCount, 0) orderCount,
+        IFNULL( orderCountTb.yesterdayOrderCount, 0) yesterdayOrderCount,
+        IFNULL( trade.totalMoney, 0.00 ) AS earnings,
+        IFNULL( trade.toDayEarnings, 0.00 ) AS toDayEarnings,=
+        IFNULL( trade.yestDayEarnings, 0.00 ) AS yestDayEarnings,
+        IFNULL( member.totalMember, 0 ) AS menber,
+        IFNULL( member.toDayMenber, 0 ) AS toDayMenber,
+        IFNULL( member.yestDayMenber, 0 ) AS yestDayMenber,
+        IFNULL( fans.yesterDayFansCount, 0 ) AS yesterDayFansCount,
+        IFNULL( fans.toDayFansCount, 0 ) AS toDayFansCount,
+        IFNULL( shape.fansMoney, 0.00 ) AS fansMoney,
+        info.merchantName AS merchantName,
+        info.createDt,
+        IFNULL( trade.sumNumber, 0 ) AS sumNumber,
+        info.sumDifference
+        FROM
+        (
+        SELECT
+        mbi.id,
+        mbi.alias,
+        mbi.userId AS userId,
+        mbi.merchantCode AS merchantCode,
+        mbi.contactName AS userName,
+        mbi.contactMobile,
+        mbi.merchantName,
+        mbi.createDt,
+        (
+        SELECT
+        SUM(
+        IFNULL( mm.usableRechargeFee, 0 )+ IFNULL( mm.usableGiveFee, 0 ))
+        FROM
+        tb_pluss_merchant_menber mm
+        WHERE
+        mbi.merchantCode = mm.merchantCode
+        GROUP BY
+        mbi.userId
+        ) AS sumDifference
+        FROM
+        tb_pluss_merchant_base_info mbi
+        LEFT JOIN tb_pluss_user_app ua ON mbi.userId = ua.userId
+        LEFT JOIN tb_pluss_user_info ui ON ua.parentId = ui.id
+        ) info
+        LEFT JOIN (
+        SELECT
+        mo.merchantCode,
+        SUM( mo.consumeFee ) totalMoney,
+        count(*) AS sumNumber,
+        SUM(
+        IFNULL(( CASE WHEN to_days( mo.createDt ) = to_days( now()) THEN mo.consumeFee END ), 0.00 )) AS toDayEarnings,
+        SUM(
+        IFNULL(( CASE WHEN to_days( now()) - to_days( mo.createDt ) <![CDATA[<=]]> 1 THEN mo.consumeFee END ), 0.00 ))
+        AS yestDayEarnings
+        FROM
+        tb_pluss_merchant_order mo
+        WHERE
+        mo.`status` = 1
+        GROUP BY
+        mo.merchantCode
+        ) trade ON info.merchantCode = trade.merchantCode
+        LEFT JOIN (
+        SELECT
+        mm.merchantCode,
+        count( mm.id ) AS totalMember,
+        count( CASE WHEN to_days( mm.createDt ) = to_days( now()) THEN mm.id END ) AS toDayMenber,
+        count( CASE WHEN to_days( now())- to_days( mm.createDt ) <![CDATA[<=]]> 1 THEN mm.id END ) AS yestDayMenber
+        FROM
+        tb_pluss_merchant_menber mm
+        GROUP BY
+        mm.merchantCode
+        ) member ON info.merchantCode = member.merchantCode
+        LEFT JOIN (
+        SELECT
+        rf.enableMerchantCode,
+        count( CASE WHEN to_days( NOW()) - to_days( rf.enableTime ) <![CDATA[<=]]> 1 THEN rf.id END ) AS
+        yesterDayFansCount,
+        count( CASE WHEN to_days( rf.enableTime ) = to_days( now()) THEN rf.id END ) AS toDayFansCount
+        FROM
+        tb_pluss_real_fans rf
+        GROUP BY
+        rf.enableMerchantCode
+        ) fans ON info.merchantCode = fans.enableMerchantCode
+        LEFT JOIN (
+        SELECT
+        pf.lastMerchantCode,
+        ROUND( SUM( pf.shareMoney ), 2 ) AS fansMoney
+        FROM
+        tb_pluss_fans pf
+        WHERE
+        pf.lastMerchantCode IS NOT NULL
+        GROUP BY
+        pf.lastMerchantCode
+        ) AS shape ON info.merchantCode = shape.lastMerchantCode
+        LEFT JOIN (
+        SELECT merchantCode, COUNT(1) orderCount, COUNT(IF(TO_DAYS(now()) = (TO_DAYS(createDt) + 1 ), 1, NULL))
+        yesterdayOrderCount
+        FROM tb_pluss_merchant_order GROUP BY merchantCode
+        ) orderCountTb ON info.merchantCode = orderCountTb.merchantCode
+        LEFT JOIN (
+        SELECT parentId userId, COUNT(IF(TO_DAYS(now()) = (TO_DAYS(createDt) + 1 ), 1, NULL)) count
+        FROM tb_pluss_user_app GROUP BY parentId
+        ) spreadCountTb ON spreadCountTb.userId = info.userId
+        <where>
+            info.merchantCode in (SELECT merchantCode7
+            FROM tb_pluss_merchant_base_info
+            WHERE bindingCode =(SELECT bindingCode
+            FROM tb_pluss_merchant_base_info
+            where merchantCode = #{merchantCode}))
+            <if test="alias!=null and alias!=''">
+                and info.alias like concat("%",#{alias},"%")
+            </if>
+            <if test="merchantName!=null and merchantName!=''">
+                and info.merchantName LIKE CONCAT('%',#{merchantName},'%')
+            </if>
+            <if test="userName!=null and userName!=''">
+                and info.userName LIKE CONCAT('%',#{userName},'%')
+            </if>
+            <if test="userId!=null">
+                and info.userId = #{userId}
+            </if>
+            <if test="phone!=null and phone!=''">
+                and info.contactMobile LIKE CONCAT("%",#{phone},"%")
+            </if>
+            <if test="parentIdPhone!=null and parentIdPhone!=''">
+                and info.parentIdPhone LIKE CONCAT("%",#{parentIdPhone},"%")
+            </if>
+        </where>
+        <choose>
+            <when test="column != null and column != ''">
+                order by ${column}
+            </when>
+            <otherwise>
+                order by info.createDt
+            </otherwise>
+        </choose>
+        <choose>
+            <when test="asc">
+                asc
+            </when>
+            <otherwise>
+                desc
+            </otherwise>
+        </choose>
+        limit #{pageSize} offset #{offset}
+    </select>
+
+    <select id="queryMerchantBaseNewPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+        SELECT
+        count(*)
+        FROM
+        (SELECT
+        mbi.id,
+        mbi.alias,
+        mbi.userId AS userId,
+        mbi.merchantCode AS merchantCode,
+        mbi.contactName as userName,
+        mbi.contactMobile,
+        mbi.merchantName,
+        ui.phone AS parentIdPhone,
+        mbi.createDt
+        FROM
+        tb_pluss_merchant_base_info mbi
+        LEFT JOIN tb_pluss_user_app ua
+        ON mbi.userId=ua.userId
+        LEFT JOIN tb_pluss_user_info ui
+        ON ua.parentId = ui.id
+        ) info
+        LEFT JOIN
+        (
+        SELECT
+        mo.merchantCode,SUM(mo.consumeFee) totalMoney,
+        SUM(IFNULL((CASE WHEN to_days(mo.createDt) = to_days(now()) THEN mo.consumeFee end),0.00)) AS toDayEarnings
+        FROM tb_pluss_merchant_order mo WHERE mo.`status` = 1 GROUP BY mo.merchantCode) trade
+        ON info.merchantCode = trade.merchantCode
+        LEFT JOIN
+        (SELECT
+        mm.merchantCode,count(mm.id) AS totalMember,
+        count(CASE WHEN to_days(mm.createDt) = to_days(now()) THEN mm.id end) AS toDayMenber
+        FROM tb_pluss_merchant_menber mm GROUP BY mm.merchantCode
+        ) member
+        ON info.merchantCode = member.merchantCode
+        LEFT JOIN
+        (SELECT
+        rf.enableMerchantCode,
+        count(CASE WHEN to_days(NOW()) - to_days(rf.enableTime) <![CDATA[<=]]>  1 THEN rf.id end) as yesterDayFansCount,
+        count(CASE WHEN to_days(rf.enableTime) = to_days(now()) THEN rf.id end) as toDayFansCount
+        FROM tb_pluss_real_fans rf GROUP BY rf.enableMerchantCode ) fans
+        ON info.merchantCode = fans.enableMerchantCode
+        LEFT JOIN
+        (SELECT pf.lastMerchantCode,ROUND(SUM(pf.shareMoney),2) AS fansMoney FROM tb_pluss_fans pf WHERE
+        pf.lastMerchantCode is not null GROUP BY pf.lastMerchantCode ) as shape
+        ON info.merchantCode = shape.lastMerchantCode
+        <where>
+            <if test="merchantCode!=null and merchantCode!=''">
+                and merchantCode=#{merchantCode}
+            </if>
+            <if test="alias!=null and alias!=''">
+                and alias like concat("%",#{alias},"%")
+            </if>
+            <if test="merchantName!=null and merchantName!=''">
+                and merchantName LIKE CONCAT('%',#{merchantName},'%')
+            </if>
+            <if test="userName!=null and userName!=''">
+                and userName LIKE CONCAT('%',#{userName},'%')
+            </if>
+            <if test="userId!=null">
+                and userId = #{userId}
+            </if>
+            <if test="phone!=null and phone!=''">
+                and contactMobile LIKE CONCAT('%',#{phone},'%')
+            </if>
+            <if test="parentIdPhone!=null and parentIdPhone!=''">
+                and contactMobile LIKE CONCAT('%',#{parentIdPhone},'%')
+            </if>
+        </where>
+    </select>
+
+    <select id="queryMerchantNoBaseNewPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+        SELECT
+        count(*)
+        FROM
+        (
+        SELECT
+        mbi.id,
+        mbi.alias,
+        mbi.userId AS userId,
+        mbi.merchantCode AS merchantCode,
+        mbi.contactName AS userName,
+        mbi.contactMobile,
+        mbi.merchantName,
+        mbi.createDt,
+        (
+        SELECT
+        SUM(
+        IFNULL( mm.usableRechargeFee, 0 )+ IFNULL( mm.usableGiveFee, 0 ))
+        FROM
+        tb_pluss_merchant_menber mm
+        WHERE
+        mbi.merchantCode = mm.merchantCode
+        GROUP BY
+        mbi.userId
+        ) AS sumDifference
+        FROM
+        tb_pluss_merchant_base_info mbi
+        LEFT JOIN tb_pluss_user_app ua ON mbi.userId = ua.userId
+        LEFT JOIN tb_pluss_user_info ui ON ua.parentId = ui.id
+        ) info
+        LEFT JOIN (
+        SELECT
+        mo.merchantCode,
+        SUM( mo.consumeFee ) totalMoney,
+        count(*) AS sumNumber,
+        SUM(
+        IFNULL(( CASE WHEN to_days( mo.createDt ) = to_days( now()) THEN mo.consumeFee END ), 0.00 )) AS toDayEarnings,
+        SUM(
+        IFNULL(( CASE WHEN to_days( now()) - to_days( mo.createDt ) <![CDATA[<=]]> 1 THEN mo.consumeFee END ), 0.00 ))
+        AS yestDayEarnings
+        FROM
+        tb_pluss_merchant_order mo
+        WHERE
+        mo.`status` = 1
+        GROUP BY
+        mo.merchantCode
+        ) trade ON info.merchantCode = trade.merchantCode
+        LEFT JOIN (
+        SELECT
+        mm.merchantCode,
+        count( mm.id ) AS totalMember,
+        count( CASE WHEN to_days( mm.createDt ) = to_days( now()) THEN mm.id END ) AS toDayMenber,
+        count( CASE WHEN to_days( now())- to_days( mm.createDt ) <![CDATA[<=]]> 1 THEN mm.id END ) AS yestDayMenber
+        FROM
+        tb_pluss_merchant_menber mm
+        GROUP BY
+        mm.merchantCode
+        ) member ON info.merchantCode = member.merchantCode
+        LEFT JOIN (
+        SELECT
+        rf.enableMerchantCode,
+        count( CASE WHEN to_days( NOW()) - to_days( rf.enableTime ) <![CDATA[<=]]> 1 THEN rf.id END ) AS
+        yesterDayFansCount,
+        count( CASE WHEN to_days( rf.enableTime ) = to_days( now()) THEN rf.id END ) AS toDayFansCount
+        FROM
+        tb_pluss_real_fans rf
+        GROUP BY
+        rf.enableMerchantCode
+        ) fans ON info.merchantCode = fans.enableMerchantCode
+        LEFT JOIN (
+        SELECT
+        pf.lastMerchantCode,
+        ROUND( SUM( pf.shareMoney ), 2 ) AS fansMoney
+        FROM
+        tb_pluss_fans pf
+        WHERE
+        pf.lastMerchantCode IS NOT NULL
+        GROUP BY
+        pf.lastMerchantCode
+        ) AS shape ON info.merchantCode = shape.lastMerchantCode
+        <where>
+            info.merchantCode in (SELECT merchantCode
+            FROM tb_pluss_merchant_base_info
+            WHERE bindingCode =(SELECT bindingCode
+            FROM tb_pluss_merchant_base_info
+            where merchantCode = #{merchantCode}))
+            <if test="alias!=null and alias!=''">
+                and alias like concat("%",#{alias},"%")
+            </if>
+            <if test="merchantName!=null and merchantName!=''">
+                and merchantName LIKE CONCAT('%',#{merchantName},'%')
+            </if>
+            <if test="userName!=null and userName!=''">
+                and userName LIKE CONCAT('%',#{userName},'%')
+            </if>
+            <if test="userId!=null">
+                and userId = #{userId}
+            </if>
+            <if test="phone!=null and phone!=''">
+                and contactMobile LIKE CONCAT('%',#{phone},'%')
+            </if>
+            <if test="parentIdPhone!=null and parentIdPhone!=''">
+                and contactMobile LIKE CONCAT('%',#{parentIdPhone},'%')
+            </if>
+        </where>
+    </select>
+
+    <select id="queryMerchantFansCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+        SELECT count(*) from tb_pluss_fans
+        <where>
+            nickName is not null and nickName!=''
+            <if test="merchantCode!=null and merchantCode!=''">
+                and merchantCode=#{merchantCode}
+            </if>
+        </where>
+    </select>
+
+    <!-- //queryFanCountCount -->
+    <select id="queryTodayFanCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+        SELECT count(*) from tb_pluss_fans
+        <where>
+            nickName is not null and nickName!=''
+            <if test="merchantCode!=null and merchantCode!=''">
+                and merchantCode=#{merchantCode}
+            </if>
+        </where>
+        and date_format(createDt,'%a %m %Y') = date_format(now(), '%a %m %Y')
+    </select>
+
+
+    <select id="queryMerchantListByUserId" resultType="cn.pluss.platform.entity.MerchantBaseInfo">
+        SELECT *
+        FROM tb_pluss_merchant_base_info baseInfo
+        WHERE baseInfo.bindingCode = (
+            SELECT bindingCode FROM tb_pluss_merchant_base_info baseInfo WHERE baseInfo.userId = #{userId}
+        )
+    </select>
+    <select id="selectParticulars" resultType="cn.pluss.platform.vo.StoreInfoVO">
+        select status, payEcdemicSwitch
+        from tb_pluss_merchant_store
+        where id = #{id}
+    </select>
+
+    <select id="pageJoinData" resultType="cn.pluss.platform.entity.MerchantBaseInfo"
+            parameterType="cn.pluss.platform.entity.UserApp">
+        SELECT CONCAT(LEFT(ui.loginName, 3),'****',RIGHT(ui.loginName, 4)) as 'loginName',
+        mbi.alias,
+        IFNULL(cs.createTime,mbi.createDt) AS createDt,
+        mbi.merchantCode
+        FROM tb_pluss_merchant_base_info mbi
+        LEFT JOIN tb_pluss_user_app ua ON mbi.userId = ua.userId
+        LEFT JOIN tb_pluss_user_info ui ON mbi.userId = ui.id
+        LEFT JOIN tb_pluss_merchant_channel_status cs ON mbi.merchantCode = cs.merchantCode
+        WHERE ua.parentId = #{userApp.userId} AND cs.`status` = '3' AND LENGTH(ui.loginName) = 11
+        <if test="userApp.startDate != null">
+            and DATE_FORMAT(cs.createTime,'%Y-%m-%d') <![CDATA[>=]]> DATE_FORMAT(#{userApp.startDate},'%Y-%m-%d')
+        </if>
+        <if test="userApp.endDate != null">
+            and DATE_FORMAT(cs.createTime,'%Y-%m-%d') <![CDATA[<=]]> DATE_FORMAT(#{userApp.endDate},'%Y-%m-%d')
+        </if>
+        GROUP BY mbi.merchantCode
+        order by mbi.createDt desc
+    </select>
+
+    <select id="pageData" parameterType="cn.pluss.platform.dto.MercOrderDataDTO"
+            resultType="cn.pluss.platform.dto.MercOrderDataDTO">
+        SELECT
+        mbi.userId,
+        mbi.alias,
+        mbi.merchantCode,
+        a.totalAmt,
+        a.tradeSucAmt,
+        a.tradeNum,
+        a.tradeSucNum,
+        a.debitSucNum,
+        a.creditSucNum,
+        a.otherSucNum,
+        a.d1Num,
+        a.d0Num,
+        cs.valid,
+        cs.channel,
+        ROUND(((a.tradeSucNum / a.tradeNum) *100),2) AS numScale, -- 支付成功占比
+        ROUND(((a.creditSucNum / a.tradeSucNum) *100),2) AS creditScale, -- 信用卡占比
+        ROUND(((a.debitSucNum / a.tradeSucNum) *100),2) AS debitScale, -- 借记卡占比
+
+        ROUND(((a.d1Num / a.tradeSucNum) *100),2) AS d1Scale, -- d1占比
+        ROUND(((a.d0Num / a.tradeSucNum) *100),2) AS d0Scale, -- D0占比
+        IF( a.tradeSucAmt >= 1000,
+        IF(
+        a.creditSucNum / a.tradeSucNum >= 1 ,
+        IF(a.d1Num / tradeSucNum >= 0.9,"D1套现",
+        IF(a.d1Num / tradeSucNum >= 0.7 and a.d1Num / tradeSucNum <![CDATA[<]]> 0.9 , "疑似D1套现","D0套现")),
+        IF( a.creditSucNum / a.tradeSucNum >= 0.8 AND a.creditSucNum / a.tradeSucNum <![CDATA[<]]> 1 , "疑似套现","-")
+        )
+        ,"-") AS risk
+        FROM tb_pluss_merchant_base_info mbi LEFT JOIN
+        (
+        SELECT
+        merchantCode,
+        SUM(consumeFee) as totalAmt,
+        SUM(IF(`status` = 1,consumeFee,0)) AS tradeSucAmt,
+        count(1) AS tradeNum,
+        SUM( IF ( `status` = 1, 1, 0 ) ) AS tradeSucNum,
+        SUM( IF ( `status` = 1 AND drType = 1, 1, 0 ) ) AS debitSucNum,
+        SUM( IF ( `status` = 1 AND drType = 2, 1, 0 ) ) AS creditSucNum,
+        SUM( IF ( `status` = 1 AND (drType = 3 or drType is null), 1, 0 ) ) AS otherSucNum,
+        SUM( IF ( `status` = 1 AND settlementType = 1,1,0)) AS d1Num,
+        SUM( IF ( `status` = 1 AND settlementType = 0,1,0)) AS d0Num
+        FROM
+        tb_pluss_merchant_order
+        WHERE
+        CURDATE() = createDate
+        GROUP BY
+        merchantCode) a ON mbi.merchantCode = a.merchantCode
+        LEFT JOIN tb_pluss_merchant_channel_status cs ON mbi.merchantCode = cs.merchantCode AND cs.channel != 4
+        <where>
+            <if test="dto.userId != null">
+                and mbi.userId = #{dto.userId}
+            </if>
+            <if test="dto.alias != null and dto.alias != ''">
+                and mbi.alias like CONCAT('%',#{dto.alias},'%')
+            </if>
+        </where>
+        ORDER BY creditScale desc,numScale asc
+    </select>
+
+
+    <select id="pageTradeData" parameterType="cn.pluss.platform.dto.MercTradeDataDTO"
+            resultType="cn.pluss.platform.dto.MercTradeDataDTO">
+        SELECT mbi.userId,
+        mbi.merchantCode,
+        SUBSTRING(ui.phone, 1, 11) phone,
+        mbi.alias,
+        a.tradeSumAmt,
+        a.tradeSumNum,
+        a.prevTradeSumAmt,
+        a.prevTradeSumNum,
+        ms.payEcdemicSwitch,
+        ms.id as storeId,
+        ue.`value` as followStatus,
+        <if test="dto.condition == -1">
+            "-" as amtChain,
+            "-" as numChain
+        </if>
+        <if test="dto.condition != -1">
+            IF(a.prevTradeSumNum = 0, 100,ROUND((a.tradeSumAmt-a.prevTradeSumAmt)/a.prevTradeSumAmt*100,2)) AS amtChain,
+            IF(a.prevTradeSumNum = 0, 100,ROUND((a.tradeSumNum-a.prevTradeSumNum)/a.prevTradeSumNum*100,2)) AS numChain
+        </if>
+        FROM tb_pluss_merchant_base_info mbi LEFT JOIN (
+        SELECT
+        merchantCode,
+        <if test="dto.condition != -1">
+            SUM(IF(createDate = #{dto.endTime},consumeFee,0)) AS tradeSumAmt,
+            SUM(IF(createDate = #{dto.endTime},1,0)) AS tradeSumNum,
+            SUM(IF(DATE_SUB(#{dto.endTime}, INTERVAL 1 DAY) = createDate,consumeFee,0)) as prevTradeSumAmt,
+            SUM(IF(DATE_SUB(#{dto.endTime}, INTERVAL 1 DAY) = createDate,1,0)) as prevTradeSumNum
+        </if>
+        <if test="dto.condition == -1">
+            SUM(consumeFee) AS tradeSumAmt,
+            count(1) AS tradeSumNum,
+            0 as prevTradeSumAmt,
+            0 as prevTradeSumNum
+        </if>
+        FROM
+        tb_pluss_merchant_order
+        <where>
+            `status` = 1
+            <if test="dto.endTime != null and dto.endTime != '' and dto.condition != -1">
+                AND (createDate = #{dto.endTime} OR DATE_SUB(#{dto.endTime}, INTERVAL 1 DAY) = createDate)
+            </if>
+        </where>
+        GROUP BY
+        merchantCode
+        ) a ON mbi.merchantCode = a.merchantCode
+        LEFT JOIN tb_pluss_user_info ui ON ui.id = mbi.userId
+        LEFT JOIN tb_pluss_user_extra ue ON ue.userId = ui.id AND ue.key = 'FOLLOW_UP'
+        left JOIN tb_pluss_merchant_store ms on mbi.merchantCode = ms.merchantCode
+        <where>
+            <if test="dto.userId != null">
+                and mbi.userId = #{dto.userId}
+            </if>
+        </where>
+        ORDER BY ${dto.field} ${dto.order}
+    </select>
+
+    <select id="listMercData" parameterType="cn.pluss.platform.dto.MercTradeDataDTO"
+            resultType="cn.pluss.platform.dto.MercTradeDataDTO">
+        SELECT
+        mbi.userId,
+        mbi.merchantCode,
+        SUBSTRING(ui.phone, 1, 11) phone,
+        mbi.alias,
+        ms.payEcdemicSwitch,
+        ms.id as storeId,
+        ue.`value` as followStatus
+        FROM tb_pluss_merchant_base_info mbi
+        LEFT JOIN tb_pluss_merchant_store ms on mbi.merchantCode = ms.merchantCode
+        LEFT JOIN tb_pluss_user_info ui ON ui.id = mbi.userId
+        LEFT JOIN tb_pluss_user_extra ue ON ue.userId = ui.id AND ue.key = 'FOLLOW_UP'
+        <where>
+            <if test="userId != null">
+                and mbi.userId = #{userId}
+            </if>
+            <if test="merchantCodeList != null and merchantCodeList.size() > 0">
+                and mbi.merchantCode IN
+                <foreach collection="merchantCodeList" close=")" separator="," open="(" item="item">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
+
+    <select id="pageTradeDataHistory" parameterType="cn.pluss.platform.dto.MercTradeDataDTO"
+            resultType="cn.pluss.platform.dto.MercTradeDataDTO">
+        SELECT
+        mbi.userId,
+        mbi.merchantCode,
+        SUBSTRING(ui.phone, 1, 11) phone,
+        mbi.alias,
+        a.tradeSumAmt,
+        a.tradeSumNum,
+        a.prevTradeSumAmt,
+        a.prevTradeSumNum,
+        ms.payEcdemicSwitch,
+        ms.id as storeId,
+        ue.`value` as followStatus,
+        <if test="dto.condition == -1">
+            "-" as amtChain,
+            "-" as numChain
+        </if>
+        <if test="dto.condition != -1">
+            IF(a.prevTradeSumNum = 0, 100,ROUND((a.tradeSumAmt-a.prevTradeSumAmt)/a.prevTradeSumAmt*100,2)) AS amtChain,
+            IF(a.prevTradeSumNum = 0, 100,ROUND((a.tradeSumNum-a.prevTradeSumNum)/a.prevTradeSumNum*100,2)) AS numChain
+        </if>
+        FROM (
+        SELECT
+        merchantCode,
+        totalFee AS tradeSumAmt,
+        `count` AS tradeSumNum,
+        0 AS prevTradeSumAmt,
+        0 AS prevTradeSumNum
+        FROM
+        tb_pluss_merchant_order_statistics
+        WHERE
+        startDate = '1970-01-01'
+        ORDER BY totalFee DESC
+        LIMIT 10
+        ) a left JOIN tb_pluss_merchant_base_info mbi ON mbi.merchantCode = a.merchantCode
+        LEFT JOIN
+        tb_pluss_merchant_store ms on mbi.merchantCode = ms.merchantCode
+        LEFT JOIN tb_pluss_user_info ui ON ui.id = mbi.userId
+        LEFT JOIN tb_pluss_user_extra ue ON ue.userId = ui.id AND ue.key = 'FOLLOW_UP'
+        <where>
+            <if test="dto.userId != null">
+                and mbi.userId = #{dto.userId}
+            </if>
+        </where>
+    </select>
+
+    <select id="pageActiveData" parameterType="cn.pluss.platform.dto.MercActiveDataDTO"
+            resultType="cn.pluss.platform.dto.MercActiveDataDTO">
+
+
+    </select>
+
+
+    <select id="getAreaAndRoleList" resultType="java.lang.String">
+        SELECT
+        mi.merchantCode
+        FROM
+        tb_pluss_merchant_base_info mi
+        LEFT JOIN tb_pluss_user_app ua ON mi.userId = ua.userId
+        WHERE
+        ua.roleCode = #{roleCode} AND
+        (
+        <foreach collection="areaList" separator="or" open="(" close=")" item="item">
+            addressNo like CONCAT(#{item},'%')
+        </foreach>
+        )
+    </select>
+
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/MerchantBillStatisticsMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/MerchantBillStatisticsMapper.xml
new file mode 100644
index 0000000..bd51dc5
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/MerchantBillStatisticsMapper.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.MerchantBillStatisticsMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.MerchantBillStatistics">
+        <id column="id" property="id" />
+        <result column="userId" property="userId" />
+        <result column="startDate" property="startDate" />
+        <result column="endDate" property="endDate" />
+        <result column="type" property="type" />
+        <result column="amount" property="amount" />
+        <result column="count" property="count" />
+        <result column="remark" property="remark" />
+        <result column="createTime" property="createTime" />
+        <result column="updateTime" property="updateTime" />
+    </resultMap>
+
+    <insert id="insertDuringBill">
+        INSERT IGNORE INTO tb_pluss_merchant_bill_statistics(userId, startDate, endDate, type, amount, count)
+        SELECT ua.userId, #{startDate}, #{endDate}, "1", IFNULL(t.amount, 0), IFNULL(t.count, 0)
+        FROM
+            tb_pluss_user_app ua LEFT JOIN
+            (
+                SELECT
+                    t.merchantCode,
+                    SUM(
+                        IF( `status` = '1', consumeFee, -consumeFee )
+                        ) amount,
+                    SUM(
+                        IF( `status` = '1', 1, 0 )
+                        ) count
+                FROM
+                    (
+                    SELECT
+                        merchantCode, `status`, consumeFee,
+                        DATE_FORMAT( createDt, "%Y-%m-%d" ) createTime
+                    FROM tb_pluss_merchant_order
+                    WHERE `status` IN ( '1', '2' )
+                    AND createDt &gt;= CONCAT(#{startDate}, " 00:00:00")
+                    AND createDt &lt;= CONCAT(#{endDate}, " 23:59:59")
+                    ) t
+                GROUP BY
+                    t.merchantCode
+            ) t ON t.merchantCode = ua.merchantCode
+            LEFT JOIN tb_pluss_merchant_channel_status mcs ON ua.merchantCode = mcs.merchantCode
+        WHERE ua.userType = 'promoter' AND mcs.`status` = '3' AND mcs.updateTime &lt;= CONCAT(#{endDate}, " 23:59:59" )
+    </insert>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/MerchantCashPayCodeMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/MerchantCashPayCodeMapper.xml
new file mode 100644
index 0000000..c7c80a4
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/MerchantCashPayCodeMapper.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.MerchantCashPayCodeMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.MerchantCashPayCode">
+        <id column="id" property="id" />
+        <result column="cashPlaceId" property="cashPlaceId" />
+        <result column="payCode" property="payCode" />
+        <result column="createTime" property="createTime" />
+        <result column="updateTime" property="updateTime" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/MerchantCashPlaceMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/MerchantCashPlaceMapper.xml
new file mode 100644
index 0000000..5295578
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/MerchantCashPlaceMapper.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.MerchantCashPlaceMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.MerchantCashPlace">
+        <id column="id" property="id" />
+        <result column="userId" property="userId" />
+        <result column="name" property="name" />
+        <result column="address" property="address" />
+        <result column="remark" property="remark" />
+        <result column="createTime" property="createTime" />
+        <result column="updateTime" property="updateTime" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/MerchantCashPlaceStaffMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/MerchantCashPlaceStaffMapper.xml
new file mode 100644
index 0000000..4bf2878
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/MerchantCashPlaceStaffMapper.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.MerchantCashPlaceStaffMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.MerchantCashPlaceStaff">
+        <id column="id" property="id" />
+        <result column="userId" property="userId" />
+        <result column="cashPlaceId" property="cashPlaceId" />
+        <result column="remark" property="remark" />
+        <result column="status" property="status" />
+        <result column="createTime" property="createTime" />
+        <result column="updateTime" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseVOResultMap" type="cn.pluss.platform.vo.MerchantCashPlaceStaffVO">
+        <id column="id" property="id" />
+        <result column="userId" property="userId" />
+        <result column="cashPlaceId" property="cashPlaceId" />
+        <result column="remark" property="remark" />
+        <result column="createTime" property="createTime" />
+        <result column="updateTime" property="updateTime" />
+        <result column="status" property="status" />
+
+        <association property="staff" javaType="cn.pluss.platform.entity.UserApp">
+            <result column="userId" property="userId" />
+            <result column="userName" property="userName" />
+        </association>
+    </resultMap>
+
+    <select id="selectCustom" resultMap="BaseVOResultMap">
+        SELECT
+               mcps.id, mcps.userId, mcps.status, mcps.cashPlaceId, mcps.remark, mcps.createTime, mcps.updateTime, ua.userName
+        FROM tb_pluss_merchant_cash_place_staff mcps
+        LEFT JOIN tb_pluss_user_app ua ON mcps.userId = ua.userId
+        ${ew.customSqlSegment}
+    </select>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/MerchantChannelImgMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/MerchantChannelImgMapper.xml
new file mode 100644
index 0000000..73028fc
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/MerchantChannelImgMapper.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="cn.pluss.platform.mapper.MerchantChannelImgMapper">
+
+    <delete id="removeByMerchantCode">
+        DELETE ci FROM tb_pluss_merchant_channel_img ci
+        LEFT JOIN tb_pluss_merchant_image mi
+        ON  ci.srcUrl = mi.picUrl
+        WHERE ci.channelType = #{channelType} AND mi.merchantCode LIKE CONCAT(#{merchantCode}, '%')
+    </delete>
+
+    <select id="selectListByUserId" resultType="cn.pluss.platform.entity.MerchantImage">
+        SELECT mi.id, mi.merchantCode, mi.photoType, ci.channelImgUrl photoUrl, mi.picUrl, mi.createDt, mi.updateDt FROM tb_pluss_merchant_base_info bi
+        LEFT JOIN tb_pluss_merchant_image mi ON bi.merchantCode = mi.merchantCode
+        LEFT JOIN tb_pluss_merchant_channel_img ci ON mi.picUrl = ci.srcUrl
+        WHERE bi.userId = #{userId} AND channelType = #{channelId}
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/pluss-dao-bundle/src/main/resources/mapper/MerchantChannelMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/MerchantChannelMapper.xml
new file mode 100644
index 0000000..1694df5
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/MerchantChannelMapper.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.MerchantChannelMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.MerchantChannel">
+        <id column="id" property="id" />
+        <result column="channelName" property="channelName" />
+        <result column="channelCode" property="channelCode" />
+        <result column="status" property="status" />
+    </resultMap>
+
+    <select id="selectValidIdList" resultType="java.lang.Integer">
+        SELECT id FROM tb_pluss_merchant_channel WHERE `status` = 1
+    </select>
+
+
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/MerchantChannelStatusMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/MerchantChannelStatusMapper.xml
new file mode 100644
index 0000000..375d8cf
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/MerchantChannelStatusMapper.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.MerchantChannelStatusMapper">
+
+    <select id="getByIdLock" resultType="cn.pluss.platform.entity.MerchantChannelStatus">
+        SELECT * FROM tb_pluss_merchant_channel_status WHERE id = #{id} FOR UPDATE;
+    </select>
+
+    <select id="getByMerchantCode" resultType="cn.pluss.platform.entity.MerchantChannelStatus">
+        SELECT t1.* FROM tb_pluss_merchant_channel_status t1
+            LEFT JOIN tb_pluss_merchant_channel t2 ON t1.channel = t2.id
+            WHERE t2.`status` = '1' AND t1.merchantCode = #{merchantCode} AND t1.channel = #{channel}
+    </select>
+
+    <select id="getRyxNoCertMerchant" resultType="cn.pluss.platform.entity.MerchantChannelStatus">
+        SELECT t1.* FROM tb_pluss_merchant_channel_status t1
+            LEFT JOIN tb_pluss_sub_merchant_apply_order t2 ON t1.merchantCode = t2.merchantCode
+            AND t1.channel = t2.channelId
+            WHERE t1.channel = 3 AND t1.`status` = 3 AND (t2.`status` = 0 OR t2.`status` IS NULL OR t2.resultStatus = '审核中' OR t2.resultStatus = '未提交' OR t2.resultStatus = '编辑中')
+    </select>
+
+    <select id="selectListWithUserId" resultType="cn.pluss.platform.entity.MerchantChannelStatus">
+        SELECT t1.*, mbi.userId FROM tb_pluss_merchant_channel_status t1
+            LEFT JOIN tb_pluss_merchant_base_info mbi ON t1.merchantCode = mbi.merchantCode
+            ${ew.customSqlSegment}
+    </select>
+
+    <select id="getUserNumInfo" resultType="cn.pluss.platform.vo.UserNumVO">
+        SELECT
+        count(1) as totalNum,
+        IFNULL(SUM(IF(t.createDate = #{date},1,0)),0) AS addNum
+        FROM (
+         SELECT
+             merchantCode,
+            <if test="dateType == null or dateType == 1">
+                DATE_FORMAT(createTime, '%Y-%m-%d' ) AS createDate
+            </if>
+            <if test="dateType == 2">
+                DATE_FORMAT(createTime, '%Y-%m' ) AS createDate
+            </if>
+            <if test="dateType == 3">
+                DATE_FORMAT(createTime, '%Y' ) AS createDate
+            </if>
+         FROM
+             tb_pluss_merchant_channel_status
+         WHERE
+             `status` = 3
+         GROUP BY
+             merchantCode
+            ) t
+         LEFT JOIN tb_pluss_user_app ua ON t.merchantCode = ua.merchantCode
+        WHERE ua.userType = 'promoter' AND ua.parentId = #{userId}
+    </select>
+
+    <select id="selectListByMerchantCode" resultType="cn.pluss.platform.vo.MerchantChannelStatusVO">
+        SELECT mcs.*, smWx.subMchId wxMercNo, smZfb.subMchId zfbMercNo FROM tb_pluss_merchant_channel_status mcs
+        LEFT JOIN tb_pluss_sub_merchant smWx ON smWx.merchantId = mcs.merchantId AND smWx.subMchType = 'WX'
+        LEFT JOIN tb_pluss_sub_merchant smZfb ON smZfb.merchantId = mcs.merchantId AND smZfb.subMchType = 'ZFB'
+        WHERE ((smWx.id IS NULL) OR (smZfb.id IS NULL)
+            OR (smWx.subMchId NOT LIKE '%\_%' AND smZfb.subMchId NOT LIKE '%\_%')
+            OR RIGHT(smWx.subMchId, 4) = RIGHT(smZfb.subMchId, 4) OR (smWx.channelTypeId != 4 AND smZfb.channelTypeId != 4)) AND mcs.merchantCode IN
+        <foreach open="(" separator="," close=")" collection="merchantCodeList" item="item">
+            #{item}
+        </foreach>
+    </select>
+
+    <select id="selectByChangeFlowId" resultType="cn.pluss.platform.entity.MerchantChannelStatus">
+        SELECT * FROM tb_pluss_merchant_channel_status
+        WHERE channel = 4 AND `status` = 3 AND (extra ->> '$.changeFlowId') = #{changeFlowId}
+    </select>
+
+    <select id="selectBySysFlowId" resultType="cn.pluss.platform.entity.MerchantChannelStatus">
+        SELECT * FROM tb_pluss_merchant_channel_status
+        WHERE channel = 4 AND `status` = 3 AND (extra ->> '$.sysFlowId') = #{sysFlowId}
+    </select>
+
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/MerchantComplaintImageMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/MerchantComplaintImageMapper.xml
new file mode 100644
index 0000000..7f69ab4
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/MerchantComplaintImageMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.MerchantComplaintImageMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.MerchantComplaintImage">
+        <id column="id" property="id" />
+        <result column="complaintId" property="complaintId" />
+        <result column="picUrl" property="picUrl" />
+        <result column="createTime" property="createTime" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/MerchantComplaintRecordMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/MerchantComplaintRecordMapper.xml
new file mode 100644
index 0000000..24d4184
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/MerchantComplaintRecordMapper.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.MerchantComplaintRecordMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.MerchantComplaintRecord">
+        <id column="id" property="id" />
+        <result column="merchantCode" property="merchantCode" />
+        <result column="orderAmt" property="orderAmt" />
+        <result column="payTime" property="payTime" />
+        <result column="complaintPhone" property="complaintPhone" />
+        <result column="remark" property="remark" />
+        <result column="orderNumber" property="orderNumber" />
+        <result column="createTime" property="createTime" />
+        <result column="status" property="status" />
+        <association property="userInfo" javaType="cn.pluss.platform.entity.UserInfo">
+            <id column="u_id" property="id" />
+            <result column="u_loginName" property="loginName"/>
+        </association>
+        <collection property="imageList" javaType="java.util.List" column="id" select="getImageList">
+        </collection>
+    </resultMap>
+
+    <select id="getImageList" resultType="java.lang.String">
+        select picUrl from tb_pluss_merchant_complaint_image where complaintId = #{id}
+    </select>
+
+    <select id="pageData" resultMap="BaseResultMap" parameterType="cn.pluss.platform.entity.MerchantComplaintRecord">
+        SELECT cr.*,
+            ui.id as  'u_id',
+            ui.loginName as 'u_loginName'
+        FROM tb_pluss_merchant_complaint_record cr
+            left join tb_pluss_user_app ua on ua.merchantCode = cr.merchantCode and ua.userType = 'promoter'
+            left join tb_pluss_user_info ui on ui.id = ua.userId
+        <where>
+            <if test="record.merchantName != null and record.merchantName != null and record.merchantName != ''">
+                and cr.merchantName LIKE CONCAT("%",#{record.merchantName},"%")
+            </if>
+            <if test="record.userInfo != null and record.userInfo.id != null">
+                and ui.id = #{record.userInfo.id}
+            </if>
+            <if test="record.userInfo != null and record.userInfo.loginName != null and record.userInfo.loginName != ''">
+                and ui.loginName = #{record.userInfo.loginName}
+            </if>
+            <if test="record.complaintPhone != null and record.complaintPhone != ''">
+                and cr.complaintPhone = #{record.complaintPhone}
+            </if>
+            <if test="record.orderNumber != null and record.orderNumber != ''">
+                and cr.orderNumber = #{record.orderNumber}
+            </if>
+            <if test="record.status != null and record.status != ''">
+                and cr.status = #{record.status}
+            </if>
+        </where>
+        order by cr.createTime desc
+    </select>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/MerchantDevice-sqlmap.xml b/pluss-dao-bundle/src/main/resources/mapper/MerchantDevice-sqlmap.xml
new file mode 100644
index 0000000..e2ae5b5
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/MerchantDevice-sqlmap.xml
@@ -0,0 +1,322 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="cn.pluss.platform.mapper.MerchantDeviceMapper">
+
+    <insert id="saveMerchantDevice" parameterType="cn.pluss.platform.entity.MerchantDevice">
+        insert into tb_pluss_merchant_device(name, type, introDesc, status, createDt, merchantCode, userId, sn,
+                                             venderModel, merchantName, venderCode, orderNo)
+        VALUES (#{name}, #{type}, #{introDesc}, #{status}, now(), #{merchantCode}, #{userId}, #{sn}, #{venderModel},
+                #{merchantName}, #{venderCode}, #{orderNo})
+    </insert>
+
+    <insert id="saveMerchantDeviceBatch">
+        insert into tb_pluss_merchant_device(name,type,introDesc,status,createDt,merchantCode,userId,sn,orderNo) VALUES
+        <foreach collection="list" item="item" index="index" separator=",">
+            (#{name},#{type},#{introDesc},#{status},now(),#{merchantCode},#{userId},#{sn},#{orderNo} )
+        </foreach>
+    </insert>
+
+    <select id="queryMerchantDevice" parameterType="cn.pluss.platform.entity.MerchantDevice"
+            resultType="cn.pluss.platform.entity.MerchantDevice">
+        SELECT * from tb_pluss_merchant_device
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="name!= null">
+                and name = #{name}
+            </if>
+            <if test="type!= null">
+                and type = #{type}
+            </if>
+            <if test="introDesc!= null">
+                and introDesc = #{introDesc}
+            </if>
+            <if test="status!= null">
+                and status = #{status}
+            </if>
+            <if test="createDt!= null">
+                and createDt = #{createDt}
+            </if>
+            <if test="merchantCode!= null">
+                and merchantCode = #{merchantCode}
+            </if>
+            <if test="userId!= null">
+                and userId = #{userId}
+            </if>
+            <if test="sn!= null">
+                and sn = #{sn}
+            </if>
+            <if test="venderModel!= null">
+                and venderModel = #{venderModel}
+            </if>
+            <if test="merchantName!= null">
+                and merchantName = #{merchantName}
+            </if>
+            <if test="venderCode!= null">
+                and venderCode = #{venderCode}
+            </if>
+            <if test="orderNo!= null">
+                and orderNo = #{orderNo}
+            </if>
+        </where>
+    </select>
+
+    <select id="queryMerchantDeviceList" parameterType="cn.pluss.platform.entity.MerchantDevice"
+            resultType="cn.pluss.platform.entity.MerchantDevice">
+        SELECT * from tb_pluss_merchant_device
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="name!= null">
+                and name = #{name}
+            </if>
+            <if test="type!= null">
+                and type = #{type}
+            </if>
+            <if test="introDesc!= null">
+                and introDesc = #{introDesc}
+            </if>
+            <if test="status!= null">
+                and status = #{status}
+            </if>
+            <if test="createDt!= null">
+                and createDt = #{createDt}
+            </if>
+            <if test="merchantCode!= null">
+                and merchantCode = #{merchantCode}
+            </if>
+            <if test="userId!= null">
+                and userId = #{userId}
+            </if>
+            <if test="sn!= null">
+                and sn = #{sn}
+            </if>
+            <if test="venderModel!= null">
+                and venderModel = #{venderModel}
+            </if>
+            <if test="merchantName!= null">
+                and merchantName = #{merchantName}
+            </if>
+            <if test="venderCode!= null">
+                and venderCode = #{venderCode}
+            </if>
+            <if test="orderNo!= null">
+                and orderNo = #{orderNo}
+            </if>
+        </where>
+    </select>
+
+    <update id="updateMerchantDevice" parameterType="cn.pluss.platform.entity.MerchantDevice">
+        update tb_pluss_merchant_device
+        <set>
+            <if test="name!= null">
+                name = #{name},
+            </if>
+            <if test="type!= null">
+                type = #{type},
+            </if>
+            <if test="introDesc!= null">
+                introDesc = #{introDesc},
+            </if>
+            <if test="status!= null">
+                status = #{status},
+            </if>
+            <if test="createDt!= null">
+                createDt = #{createDt},
+            </if>
+            <if test="merchantCode!= null">
+                merchantCode = #{merchantCode},
+            </if>
+            <if test="userId!= null">
+                userId = #{userId},
+            </if>
+            <if test="sn!= null">
+                sn = #{sn},
+            </if>
+            <if test="venderModel!= null">
+                venderModel = #{venderModel},
+            </if>
+            <if test="merchantName!= null">
+                merchantName = #{merchantName},
+            </if>
+            <if test="venderCode!= null">
+                venderCode = #{venderCode}
+            </if>
+            <if test="orderNo!= null">
+                and orderNo = #{orderNo}
+            </if>
+        </set>
+        where id=#{id}
+    </update>
+
+    <delete id="deleteMerchantDevice" parameterType="cn.pluss.platform.entity.MerchantDevice">
+        DELETE
+        FROM tb_pluss_merchant_device
+        where id = #{id}
+    </delete>
+
+    <select id="queryMerchantDevicePage" parameterType="java.util.Map"
+            resultType="cn.pluss.platform.entity.MerchantDevice">
+        SELECT * from tb_pluss_merchant_device
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="name!= null and name!=''">
+                and name like CONCAT("%",#{name},"%")
+            </if>
+            <if test="type!= null">
+                and type = #{type}
+            </if>
+            <if test="introDesc!= null">
+                and introDesc = #{introDesc}
+            </if>
+            <if test="status!= null and status!=''">
+                and status = #{status}
+            </if>
+            <if test="createDt!= null">
+                and createDt = #{createDt}
+            </if>
+            <if test="merchantCode!= null">
+                and merchantCode = #{merchantCode}
+            </if>
+            <if test="userId!= null">
+                and userId = #{userId}
+            </if>
+            <if test="sn!= null">
+                and sn = #{sn}
+            </if>
+            <if test="venderModel!= null">
+                and venderModel = #{venderModel}
+            </if>
+            <if test="merchantName!= null">
+                and merchantName = #{merchantName}
+            </if>
+            <if test="venderCode!= null">
+                and venderCode = #{venderCode}
+            </if>
+            <if test="orderNo!= null">
+                and orderNo = #{orderNo}
+            </if>
+        </where>
+        order by id desc limit #{pageSize} offset #{offset}
+    </select>
+
+    <select id="queryMerchantDevicePageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+        SELECT count(*) from tb_pluss_merchant_device
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="name!= null and name!=''">
+                and name like CONCAT("%",#{name},"%")
+            </if>
+            <if test="type!= null">
+                and type = #{type}
+            </if>
+            <if test="introDesc!= null">
+                and introDesc = #{introDesc}
+            </if>
+            <if test="status!= null and status!=''">
+                and status = #{status}
+            </if>
+            <if test="createDt!= null">
+                and createDt = #{createDt}
+            </if>
+            <if test="merchantCode!= null">
+                and merchantCode = #{merchantCode}
+            </if>
+            <if test="userId!= null">
+                and userId = #{userId}
+            </if>
+            <if test="sn!= null">
+                and sn = #{sn}
+            </if>
+            <if test="merchantName!= null">
+                and merchantName = #{merchantName}
+            </if>
+            <if test="venderModel!= null">
+                and venderModel = #{venderModel}
+            </if>
+            <if test="venderCode!= null">
+                and venderCode = #{venderCode}
+            </if>
+            <if test="orderNo!= null">
+                and orderNo = #{orderNo}
+            </if>
+        </where>
+    </select>
+
+    <select id="selectMerchantDevicePage" resultType="cn.pluss.platform.vo.DeviceVO">
+        SELECT distinct md.id as id,mbi.alias as alias,pd.venderModel as venderModel,md.merchantName as
+        merchantName,pd.name as name,pd.deviceLogo as deviceLogo,pd.introDesc as introDesc,dsu.soleCode as
+        soleCode,dsu.orderNo as orderNo,dsu.status as status,
+        md.createDt as createDt,md.userId as userId
+        FROM tb_pluss_merchant_device md
+        LEFT JOIN tb_pluss_device pd ON md.venderCode=pd.venderCode
+        LEFT JOIN tb_pluss_device_sign_unbind dsu ON dsu.merchantCode=md.merchantCode
+        LEFT JOIN tb_pluss_merchant_base_info mbi on md.merchantCode = mbi.merchantCode
+        ${ew.customSqlSegment}
+    </select>
+
+    <select id="showMerchantDevicePage" resultType="cn.pluss.platform.vo.DeviceVO">
+        SELECT distinct md.id as id,mbi.alias as alias,pd.venderModel as venderModel,md.merchantName as
+        merchantName,pd.name as name,pd.deviceLogo as deviceLogo,pd.introDesc as introDesc,dsu.soleCode as
+        soleCode,dsu.orderNo as orderNo,dsu.status as status,
+        md.createDt as createDt,md.userId as userId
+        FROM tb_pluss_merchant_device md
+        LEFT JOIN tb_pluss_device pd ON md.venderCode=pd.venderCode
+        LEFT JOIN tb_pluss_device_sign_unbind dsu ON dsu.merchantCode=md.merchantCode
+        LEFT JOIN tb_pluss_merchant_base_info mbi on md.merchantCode = mbi.merchantCode
+        <where>
+            <if test="userId != null">
+                and md.userId=#{userId}
+            </if>
+            <if test="alias!=null">
+                and mbi.alias like concat('%',#{alias},'%')
+            </if>
+            <if test="merchantCode!=null">
+                and md.merchantCode=#{merchantCode}
+            </if>
+            <if test="name!=null and name!=''">
+                and pd.name like concat('%',#{name},'%')
+            </if>
+            <if test="merchantName!=null and merchantName!=''">
+                and md.merchantName like concat('%',#{merchantName},'%')
+            </if>
+        </where>
+        order by md.id desc limit #{pageSize} offset #{offset}
+    </select>
+
+    <select id="showMerchantDevicePageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+        select count(*) from(
+        SELECT distinct md.id as id,mbi.alias as alias,pd.venderModel as venderModel,md.merchantName,pd.name as
+        name,pd.deviceLogo as deviceLogo,pd.introDesc as introDesc,dsu.soleCode as soleCode,dsu.orderNo as
+        orderNo,dsu.status as status,md.createDt as createDt
+        FROM tb_pluss_merchant_device md
+        LEFT JOIN tb_pluss_device pd ON md.venderCode=pd.venderCode LEFT JOIN tb_pluss_device_sign_unbind dsu ON
+        dsu.merchantCode=md.merchantCode LEFT JOIN tb_pluss_merchant_base_info mbi on md.merchantCode = mbi.merchantCode
+        <where>
+            <if test="userId!=null">
+                and md.userId=#{userId}
+            </if>
+            <if test="alias!=null">
+                and mbi.alias like concat('%',#{alias},'%')
+            </if>
+            <if test="merchantCode!=null">
+                and md.merchantCode=#{merchantCode}
+            </if>
+            <if test="name!=null and name!=''">
+                and pd.name like concat('%',#{name},'%')
+            </if>
+            <if test="merchantName!=null and merchantName!=''">
+                and md.merchantName like concat('%',#{merchantName},'%')
+            </if>
+        </where>
+        ) as showMerchant
+    </select>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/MerchantGuideMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/MerchantGuideMapper.xml
new file mode 100644
index 0000000..c5fbda7
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/MerchantGuideMapper.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.MerchantGuideMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.MerchantGuide">
+        <id column="id" property="id" />
+        <result column="merchantCode" property="merchantCode" />
+        <result column="merchantName" property="merchantName" />
+        <result column="name" property="name" />
+        <result column="status" property="status" />
+        <result column="createTime" property="createTime" />
+        <result column="updateTime" property="updateTime" />
+    </resultMap>
+
+    <select id="userMerchantGuide" resultType="cn.pluss.platform.entity.MerchantGuide">
+        SELECT null id, #{merchantCode} merchantCode, #{merchantName} merchantName, IFNULL(mg.`name`, gl.`name`) `name`, gl.createTime, gl.updateTime,
+               IF (tCount.`status` = 0, gl.`status`,
+                   IFNULL (mg.`status`, 0)
+                   ) `status`, gl.id guideId
+        FROM tb_pluss_guide_label gl
+                 LEFT JOIN (
+            SELECT * FROM tb_pluss_merchant_guide WHERE merchantCode = #{merchantCode}
+        ) mg ON gl.id = mg.guideId
+        , (
+            SELECT SUM(`status`) `status` FROM tb_pluss_merchant_guide mg WHERE mg.merchantCode = #{merchantCode}
+        ) tCount
+        UNION
+        SELECT id, merchantCode, merchantName, `name`, createTime, updateTime, `status`, null guideId FROM tb_pluss_merchant_guide
+        WHERE `guideId` IS NULL AND merchantCode = #{merchantCode}
+        ORDER BY createTime
+    </select>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/MerchantImage-sqlmap.xml b/pluss-dao-bundle/src/main/resources/mapper/MerchantImage-sqlmap.xml
new file mode 100644
index 0000000..644a04b
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/MerchantImage-sqlmap.xml
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+			"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="cn.pluss.platform.mapper.MerchantImageMapper">
+
+	   	<insert id="saveMerchantImage" parameterType="cn.pluss.platform.entity.MerchantImage">
+        	insert into tb_pluss_merchant_image(merchantCode,photoType,photoUrl,picUrl,createDt,updateDt,aisleSwitch)VALUES(#{merchantCode},#{photoType},#{photoUrl},#{picUrl},#{createDt},#{updateDt},#{aisleSwitch})
+    	</insert>
+
+	   	<insert id="saveMerchantImageBatch">
+        	insert into tb_pluss_merchant_image(merchantCode,photoType,photoUrl,picUrl,createDt,updateDt) VALUES 
+    			<foreach collection="list" item="item" index="index" separator=",">
+			(#{merchantCode},#{photoType},#{photoUrl},#{picUrl},#{createDt},#{updateDt}		)
+				</foreach>
+    	</insert>
+
+		<select id="queryMerchantImage" parameterType="cn.pluss.platform.entity.MerchantImage" resultType="cn.pluss.platform.entity.MerchantImage">
+			SELECT * from tb_pluss_merchant_image 
+				<where> 
+					<if test="id!= null"> 
+					 	and id = #{id}
+					 </if> 
+					<if test="merchantCode!= null"> 
+					 	and merchantCode = #{merchantCode}
+					 </if> 
+					<if test="photoType!= null"> 
+					 	and photoType = #{photoType}
+					 </if> 
+					<if test="photoUrl!= null"> 
+					 	and photoUrl = #{photoUrl}
+					 </if> 
+					<if test="picUrl!= null"> 
+					 	and picUrl = #{picUrl}
+					 </if> 
+					<if test="createDt!= null"> 
+					 	and createDt = #{createDt}
+					 </if> 
+					<if test="updateDt!= null"> 
+					 	and updateDt = #{updateDt}
+					 </if> 
+					<if test="aisleSwitch!= null"> 
+					 	and aisleSwitch = #{aisleSwitch}
+					 </if> 
+				 </where> 
+		</select>
+
+		<select id="queryMerchantImageList" parameterType="cn.pluss.platform.entity.MerchantImage" resultType="cn.pluss.platform.entity.MerchantImage">
+			SELECT * from tb_pluss_merchant_image 
+				<where> 
+					<if test="id!= null"> 
+					 and 	id = #{id}
+					 </if> 
+					<if test="merchantCode!= null"> 
+					 and 	merchantCode = #{merchantCode}
+					 </if> 
+					<if test="photoType!= null"> 
+					 and 	photoType = #{photoType}
+					 </if> 
+					<if test="photoUrl!= null"> 
+					 and 	photoUrl = #{photoUrl}
+					 </if> 
+					<if test="picUrl!= null"> 
+					 and 	picUrl = #{picUrl}
+					 </if> 
+					<if test="createDt!= null"> 
+					 and 	createDt = #{createDt}
+					 </if> 
+					<if test="updateDt!= null"> 
+					 and 	updateDt = #{updateDt}
+					 </if> 
+					 <if test="aisleSwitch!= null"> 
+                        and aisleSwitch = #{aisleSwitch}
+                     </if> 
+				 </where> 
+		</select>
+
+		<update id="updateMerchantImage" parameterType="cn.pluss.platform.entity.MerchantImage" >
+			update tb_pluss_merchant_image 
+				  <set> 
+					<if test="merchantCode!= null"> 
+					 	merchantCode = #{merchantCode},
+					 </if> 
+					<if test="photoType!= null"> 
+					 	photoType = #{photoType},
+					 </if> 
+					<if test="photoUrl!= null"> 
+					 	photoUrl = #{photoUrl},
+					 </if> 
+					<if test="picUrl!= null"> 
+					 	picUrl = #{picUrl},
+					 </if> 
+					<if test="createDt!= null"> 
+					 	createDt = #{createDt},
+					 </if> 
+					<if test="updateDt!= null"> 
+					 	updateDt = #{updateDt},
+					 </if> 
+					 <if test="aisleSwitch!= null"> 
+                         aisleSwitch = #{aisleSwitch}
+                     </if> 
+				</set>
+			where id=#{id} 
+		</update>
+
+		<delete id="deleteMerchantImage" parameterType="cn.pluss.platform.entity.MerchantImage" >
+			DELETE FROM tb_pluss_merchant_image where id=#{id}
+		</delete>
+		
+		<delete id="deleteMerchantImageByMerchantCode" parameterType="cn.pluss.platform.entity.MerchantImage" >
+			DELETE FROM tb_pluss_merchant_image where merchantCode=#{merchantCode}
+		</delete>
+
+		<select id="queryMerchantImagePage" parameterType="java.util.Map" resultType="cn.pluss.platform.entity.MerchantImage">
+			SELECT * from tb_pluss_merchant_image 
+				<where> 
+					<if test="id!= null"> 
+					and id = #{id}
+					 </if> 
+					<if test="merchantCode!= null"> 
+					and merchantCode = #{merchantCode}
+					 </if> 
+					<if test="photoType!= null"> 
+					and photoType = #{photoType}
+					 </if> 
+					<if test="photoUrl!= null"> 
+					and photoUrl = #{photoUrl}
+					 </if> 
+					<if test="picUrl!= null"> 
+					and picUrl = #{picUrl}
+					 </if> 
+					<if test="createDt!= null"> 
+					and createDt = #{createDt}
+					 </if> 
+					<if test="updateDt!= null"> 
+					and updateDt = #{updateDt}
+					 </if> 
+					 <if test="aisleSwitch!= null"> 
+                        and aisleSwitch = #{aisleSwitch}
+                     </if> 
+				 </where> 
+			order by id desc  limit #{pageSize}  offset  #{offset}  
+		</select>
+
+		<select id="queryMerchantImagePageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+			SELECT count(*) from tb_pluss_merchant_image 
+					<where> 
+					<if test="id!= null"> 
+					 and id = #{id}
+					 </if> 
+					<if test="merchantCode!= null"> 
+					 and merchantCode = #{merchantCode}
+					 </if> 
+					<if test="photoType!= null"> 
+					 and photoType = #{photoType}
+					 </if> 
+					<if test="photoUrl!= null"> 
+					 and photoUrl = #{photoUrl}
+					 </if> 
+					<if test="picUrl!= null"> 
+					 and picUrl = #{picUrl}
+					 </if> 
+					<if test="createDt!= null"> 
+					 and createDt = #{createDt}
+					 </if> 
+					<if test="updateDt!= null"> 
+					 and updateDt = #{updateDt}
+					 </if> 
+					 <if test="aisleSwitch!= null"> 
+                        and aisleSwitch = #{aisleSwitch}
+                     </if> 
+				</where>
+		</select>
+
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/MerchantIncome-sqlmap.xml b/pluss-dao-bundle/src/main/resources/mapper/MerchantIncome-sqlmap.xml
new file mode 100644
index 0000000..531d012
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/MerchantIncome-sqlmap.xml
@@ -0,0 +1,626 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+			"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="cn.pluss.platform.mapper.MerchantIncomeMapper">
+
+	   	<insert id="saveMerchantIncome" parameterType="cn.pluss.platform.entity.MerchantIncome">
+        	insert into tb_pluss_merchant_income(userId,merchantCode,merchantName,storeId,storeName,dealType,dealFee,incomeFee,createTime,payTypeCode,payTypeName,memberCode,memberName,memberPic,incomeType,plateformProfit,promoterProfit,dealStatus,dealCode)VALUES(#{userId},#{merchantCode},#{merchantName},#{storeId},#{storeName},#{dealType},#{dealFee},#{incomeFee},now(),#{payTypeCode},#{payTypeName},#{memberCode},#{memberName},#{memberPic},#{incomeType},#{plateformProfit},#{promoterProfit},#{dealStatus},#{dealCode})
+    	</insert>
+
+	   	<insert id="saveMerchantIncomeBatch">
+        	insert into tb_pluss_merchant_income(userId,merchantCode,merchantName,storeId,storeName,dealType,dealFee,incomeFee,createTime,payTypeCode,payTypeName,memberCode,memberName,memberPic,incomeType,plateformProfit,promoterProfit,dealStatus,dealCode) VALUES 
+    			<foreach collection="list" item="item" index="index" separator=",">
+			(#{userId},#{merchantCode},#{merchantName},#{storeId},#{storeName},#{dealType},#{dealFee},#{incomeFee},#{createTime},#{payTypeCode},#{payTypeName},#{memberCode},#{memberName},#{memberPic},#{incomeType},#{plateformProfit},#{promoterProfit},#{dealStatus},#{dealCode}		)
+				</foreach>
+    	</insert>
+
+		<select id="queryMerchantIncome" parameterType="cn.pluss.platform.entity.MerchantIncome" resultType="cn.pluss.platform.entity.MerchantIncome">
+			SELECT * from tb_pluss_merchant_income 
+				<where> 
+					<if test="id!= null"> 
+					 	and id = #{id}
+					 </if> 
+					<if test="userId!= null"> 
+					 	and userId = #{userId}
+					 </if> 
+					<if test="merchantCode!= null"> 
+					 	and merchantCode = #{merchantCode}
+					 </if> 
+					<if test="merchantName!= null"> 
+					 	and merchantName = #{merchantName}
+					 </if> 
+					<if test="storeId!= null"> 
+					 	and storeId = #{storeId}
+					 </if> 
+					<if test="storeName!= null"> 
+					 	and storeName = #{storeName}
+					 </if> 
+					<if test="dealType!= null"> 
+					 	and dealType = #{dealType}
+					 </if> 
+					<if test="dealFee!= null"> 
+					 	and dealFee = #{dealFee}
+					 </if> 
+					<if test="incomeFee!= null"> 
+					 	and incomeFee = #{incomeFee}
+					 </if> 
+					<if test="createTime!= null"> 
+					 	and createTime = #{createTime}
+					 </if> 
+					<if test="payTypeCode!= null"> 
+					 	and payTypeCode = #{payTypeCode}
+					 </if> 
+					<if test="payTypeName!= null"> 
+					 	and payTypeName = #{payTypeName}
+					 </if> 
+					<if test="memberCode!= null"> 
+					 	and memberCode = #{memberCode}
+					 </if> 
+					<if test="memberName!= null"> 
+					 	and memberName = #{memberName}
+					 </if> 
+					<if test="memberPic!= null"> 
+					 	and memberPic = #{memberPic}
+					 </if> 
+					<if test="incomeType!= null"> 
+					 	and incomeType = #{incomeType}
+					 </if> 
+					<if test="plateformProfit!= null"> 
+					 	and plateformProfit = #{plateformProfit}
+					 </if> 
+					<if test="promoterProfit!= null"> 
+					 	and promoterProfit = #{promoterProfit}
+					 </if> 
+					 <if test="dealStatus!= null"> 
+					 	and dealStatus = #{dealStatus}
+					 </if> 
+					 <if test="dealCode!= null"> 
+					 	and dealCode = #{dealCode}
+					 </if> 
+				 </where> 
+		</select>
+
+		<select id="queryMerchantIncomeList" parameterType="cn.pluss.platform.entity.MerchantIncome" resultType="cn.pluss.platform.entity.MerchantIncome">
+			SELECT * from tb_pluss_merchant_income 
+				<where> 
+					<if test="id!= null"> 
+					 and 	id = #{id}
+					 </if> 
+					<if test="userId!= null"> 
+					 and 	userId = #{userId}
+					 </if> 
+					<if test="merchantCode!= null"> 
+					 and 	merchantCode = #{merchantCode}
+					 </if> 
+					<if test="merchantName!= null"> 
+					 and 	merchantName = #{merchantName}
+					 </if> 
+					<if test="storeId!= null"> 
+					 and 	storeId = #{storeId}
+					 </if> 
+					<if test="storeName!= null"> 
+					 and 	storeName = #{storeName}
+					 </if> 
+					<if test="dealType!= null"> 
+					 and 	dealType = #{dealType}
+					 </if> 
+					<if test="dealFee!= null"> 
+					 and 	dealFee = #{dealFee}
+					 </if> 
+					<if test="incomeFee!= null"> 
+					 and 	incomeFee = #{incomeFee}
+					 </if> 
+					<if test="createTime!= null"> 
+					 and 	createTime = #{createTime}
+					 </if> 
+					<if test="payTypeCode!= null"> 
+					 and 	payTypeCode = #{payTypeCode}
+					 </if> 
+					<if test="payTypeName!= null"> 
+					 and 	payTypeName = #{payTypeName}
+					 </if> 
+					<if test="memberCode!= null"> 
+					 and 	memberCode = #{memberCode}
+					 </if> 
+					<if test="memberName!= null"> 
+					 and 	memberName = #{memberName}
+					 </if> 
+					<if test="memberPic!= null"> 
+					 and 	memberPic = #{memberPic}
+					 </if> 
+					<if test="incomeType!= null"> 
+					 and 	incomeType = #{incomeType}
+					 </if> 
+					<if test="plateformProfit!= null"> 
+					 and 	plateformProfit = #{plateformProfit}
+					 </if> 
+					<if test="promoterProfit!= null"> 
+					 and 	promoterProfit = #{promoterProfit}
+					 </if> 
+					 <if test="dealStatus!= null"> 
+					 and 	dealStatus = #{dealStatus}
+					 </if> 
+					 <if test="dealCode!= null"> 
+					 and 	dealCode = #{dealCode}
+					 </if> 
+				 </where> 
+		</select>
+
+		<update id="updateMerchantIncome" parameterType="cn.pluss.platform.entity.MerchantIncome" >
+			update tb_pluss_merchant_income 
+				  <set> 
+					<if test="userId!= null"> 
+					 	userId = #{userId},
+					 </if> 
+					<if test="merchantCode!= null"> 
+					 	merchantCode = #{merchantCode},
+					 </if> 
+					<if test="merchantName!= null"> 
+					 	merchantName = #{merchantName},
+					 </if> 
+					<if test="storeId!= null"> 
+					 	storeId = #{storeId},
+					 </if> 
+					<if test="storeName!= null"> 
+					 	storeName = #{storeName},
+					 </if> 
+					<if test="dealType!= null"> 
+					 	dealType = #{dealType},
+					 </if> 
+					<if test="dealFee!= null"> 
+					 	dealFee = #{dealFee},
+					 </if> 
+					<if test="incomeFee!= null"> 
+					 	incomeFee = #{incomeFee},
+					 </if> 
+					<if test="createTime!= null"> 
+					 	createTime = #{createTime},
+					 </if> 
+					<if test="payTypeCode!= null"> 
+					 	payTypeCode = #{payTypeCode},
+					 </if> 
+					<if test="payTypeName!= null"> 
+					 	payTypeName = #{payTypeName},
+					 </if> 
+					<if test="memberCode!= null"> 
+					 	memberCode = #{memberCode},
+					 </if> 
+					<if test="memberName!= null"> 
+					 	memberName = #{memberName},
+					 </if> 
+					<if test="memberPic!= null"> 
+					 	memberPic = #{memberPic},
+					 </if> 
+					<if test="incomeType!= null"> 
+					 	incomeType = #{incomeType},
+					 </if> 
+					<if test="plateformProfit!= null"> 
+					 	plateformProfit = #{plateformProfit},
+					 </if> 
+					<if test="promoterProfit!= null"> 
+					 	promoterProfit = #{promoterProfit},
+					 </if> 
+					 <if test="dealStatus!= null"> 
+					 	dealStatus = #{dealStatus},
+					 </if> 
+					 <if test="dealCode!= null"> 
+					 	dealCode = #{dealCode}
+					 </if> 
+				</set>
+			where id=#{id} 
+		</update>
+
+		<delete id="deleteMerchantIncome" parameterType="cn.pluss.platform.entity.MerchantIncome" >
+			DELETE FROM tb_pluss_merchant_income where id=#{id}
+		</delete>
+
+		<select id="queryMerchantIncomePage" parameterType="java.util.Map" resultType="cn.pluss.platform.entity.MerchantIncome">
+			SELECT * from tb_pluss_merchant_income 
+				<where> 
+					<if test="id!= null"> 
+					and id = #{id}
+					 </if> 
+					<if test="userId!= null"> 
+					and userId = #{userId}
+					 </if> 
+					<if test="merchantCode!= null"> 
+					and merchantCode = #{merchantCode}
+					 </if> 
+					<if test="merchantName!= null"> 
+					and merchantName = #{merchantName}
+					 </if> 
+					<if test="storeId!= null"> 
+					and storeId = #{storeId}
+					 </if> 
+					<if test="storeName!= null"> 
+					and storeName = #{storeName}
+					 </if> 
+					<if test="dealType!= null"> 
+					and dealType = #{dealType}
+					 </if> 
+					<if test="dealFee!= null"> 
+					and dealFee = #{dealFee}
+					 </if> 
+					<if test="incomeFee!= null"> 
+					and incomeFee = #{incomeFee}
+					 </if> 
+					<if test="createTime!= null"> 
+					and createTime = #{createTime}
+					 </if> 
+					<if test="payTypeCode!= null"> 
+					and payTypeCode = #{payTypeCode}
+					 </if> 
+					<if test="payTypeName!= null"> 
+					and payTypeName = #{payTypeName}
+					 </if> 
+					<if test="memberCode!= null"> 
+					and memberCode = #{memberCode}
+					 </if> 
+					<if test="memberName!= null"> 
+					and memberName = #{memberName}
+					 </if> 
+					<if test="memberPic!= null"> 
+					and memberPic = #{memberPic}
+					 </if> 
+					<if test="incomeType!= null"> 
+					and incomeType = #{incomeType}
+					 </if> 
+					<if test="plateformProfit!= null"> 
+					and plateformProfit = #{plateformProfit}
+					 </if> 
+					<if test="promoterProfit!= null"> 
+					and promoterProfit = #{promoterProfit}
+					 </if> 
+					 <if test="dealStatus!= null"> 
+					and dealStatus = #{dealStatus}
+					 </if> 
+					 <if test="dealCode!= null"> 
+					and dealCode = #{dealCode}
+					 </if> 
+				 </where> 
+			order by id desc  limit #{pageSize}  offset  #{offset}  
+		</select>
+
+		<select id="queryMerchantIncomePageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+			SELECT count(*) from tb_pluss_merchant_income 
+					<where> 
+					<if test="id!= null"> 
+					 and id = #{id}
+					 </if> 
+					<if test="userId!= null"> 
+					 and userId = #{userId}
+					 </if> 
+					<if test="merchantCode!= null"> 
+					 and merchantCode = #{merchantCode}
+					 </if> 
+					<if test="merchantName!= null"> 
+					 and merchantName = #{merchantName}
+					 </if> 
+					<if test="storeId!= null"> 
+					 and storeId = #{storeId}
+					 </if> 
+					<if test="storeName!= null"> 
+					 and storeName = #{storeName}
+					 </if> 
+					<if test="dealType!= null"> 
+					 and dealType = #{dealType}
+					 </if> 
+					<if test="dealFee!= null"> 
+					 and dealFee = #{dealFee}
+					 </if> 
+					<if test="incomeFee!= null"> 
+					 and incomeFee = #{incomeFee}
+					 </if> 
+					<if test="createTime!= null"> 
+					 and createTime = #{createTime}
+					 </if> 
+					<if test="payTypeCode!= null"> 
+					 and payTypeCode = #{payTypeCode}
+					 </if> 
+					<if test="payTypeName!= null"> 
+					 and payTypeName = #{payTypeName}
+					 </if> 
+					<if test="memberCode!= null"> 
+					 and memberCode = #{memberCode}
+					 </if> 
+					<if test="memberName!= null"> 
+					 and memberName = #{memberName}
+					 </if> 
+					<if test="memberPic!= null"> 
+					 and memberPic = #{memberPic}
+					 </if> 
+					<if test="incomeType!= null"> 
+					 and incomeType = #{incomeType}
+					 </if> 
+					<if test="plateformProfit!= null"> 
+					 and plateformProfit = #{plateformProfit}
+					 </if> 
+					<if test="promoterProfit!= null"> 
+					 and promoterProfit = #{promoterProfit}
+					 </if> 
+					 <if test="dealStatus!= null"> 
+					 and dealStatus = #{dealStatus}
+					 </if> 
+					 <if test="dealCode!= null"> 
+					 and dealCode = #{dealCode}
+					 </if> 
+				</where>
+		</select>
+		
+		
+		<!-- 查询最近五条收入记录 -->
+		<select id="queryLastFiveMerchantIncome" parameterType="cn.pluss.platform.entity.MerchantIncome" resultType="cn.pluss.platform.entity.MerchantIncome">
+			SELECT * from tb_pluss_merchant_income 
+				<where> 
+					<if test="id!= null"> 
+					 and 	id = #{id}
+					 </if> 
+					<if test="userId!= null"> 
+					 and 	userId = #{userId}
+					 </if> 
+					<if test="merchantCode!= null"> 
+					 and 	merchantCode = #{merchantCode}
+					 </if> 
+					<if test="merchantName!= null"> 
+					 and 	merchantName = #{merchantName}
+					 </if> 
+					<if test="storeId!= null"> 
+					 and 	storeId = #{storeId}
+					 </if> 
+					<if test="storeName!= null"> 
+					 and 	storeName = #{storeName}
+					 </if> 
+					<if test="dealType!= null"> 
+					 and 	dealType = #{dealType}
+					 </if> 
+					<if test="dealFee!= null"> 
+					 and 	dealFee = #{dealFee}
+					 </if> 
+					<if test="incomeFee!= null"> 
+					 and 	incomeFee = #{incomeFee}
+					 </if> 
+					<if test="createTime!= null"> 
+					 and 	createTime = #{createTime}
+					 </if> 
+					<if test="payTypeCode!= null"> 
+					 and 	payTypeCode = #{payTypeCode}
+					 </if> 
+					<if test="payTypeName!= null"> 
+					 and 	payTypeName = #{payTypeName}
+					 </if> 
+					<if test="memberCode!= null"> 
+					 and 	memberCode = #{memberCode}
+					 </if> 
+					<if test="memberName!= null"> 
+					 and 	memberName = #{memberName}
+					 </if> 
+					<if test="memberPic!= null"> 
+					 and 	memberPic = #{memberPic}
+					 </if> 
+					<if test="incomeType!= null"> 
+					 and 	incomeType = #{incomeType}
+					 </if> 
+					<if test="plateformProfit!= null"> 
+					 and 	plateformProfit = #{plateformProfit}
+					 </if> 
+					<if test="promoterProfit!= null"> 
+					 and 	promoterProfit = #{promoterProfit}
+					 </if> 
+					 <if test="dealStatus!= null"> 
+					 and 	dealStatus = #{dealStatus}
+					 </if> 
+					 <if test="dealCode!= null"> 
+					 and 	dealCode = #{dealCode}
+					 </if> 
+					 order by createTime DESC limit 5
+				 </where> 
+		</select>
+		
+		<!-- 根据时间查询商家收益明细 -->
+		<select id="queryMerchantIncomePageByTime" parameterType="java.util.Map" resultType="cn.pluss.platform.entity.MerchantIncome">
+			SELECT * from tb_pluss_merchant_income 
+				<where> 
+					<if test="id!= null"> 
+					and id = #{id}
+					 </if> 
+					<if test="userId!= null"> 
+					and userId = #{userId}
+					 </if> 
+					<if test="merchantCode!= null"> 
+					and merchantCode = #{merchantCode}
+					 </if> 
+					<if test="merchantName!= null"> 
+					and merchantName = #{merchantName}
+					 </if> 
+					<if test="storeId!= null"> 
+					and storeId = #{storeId}
+					 </if> 
+					<if test="storeName!= null"> 
+					and storeName = #{storeName}
+					 </if> 
+					<if test="dealType!= null"> 
+					and dealType = #{dealType}
+					 </if> 
+					<if test="dealFee!= null"> 
+					and dealFee = #{dealFee}
+					 </if> 
+					<if test="incomeFee!= null"> 
+					and incomeFee = #{incomeFee}
+					 </if> 
+					<if test="createTime!= null"> 
+					and createTime = #{createTime}
+					 </if> 
+					<if test="payTypeCode!= null"> 
+					and payTypeCode = #{payTypeCode}
+					 </if> 
+					<if test="payTypeName!= null"> 
+					and payTypeName = #{payTypeName}
+					 </if> 
+					<if test="memberCode!= null"> 
+					and memberCode = #{memberCode}
+					 </if> 
+					<if test="memberName!= null"> 
+					and memberName = #{memberName}
+					 </if> 
+					<if test="memberPic!= null"> 
+					and memberPic = #{memberPic}
+					 </if> 
+					<if test="incomeType!= null"> 
+					and incomeType = #{incomeType}
+					 </if> 
+					<if test="plateformProfit!= null"> 
+					and plateformProfit = #{plateformProfit}
+					 </if> 
+					<if test="promoterProfit!= null"> 
+					and promoterProfit = #{promoterProfit}
+					 </if> 
+					 <if test="dealStatus!= null"> 
+					and dealStatus = #{dealStatus}
+					 </if> 
+					 <if test="dealCode!= null"> 
+					and dealCode = #{dealCode}
+					 </if> 
+				 </where> 
+			and createTime &gt; #{startTime} and createTime &lt; #{endTime}  order by createTime desc  limit #{pageSize}  offset  #{offset}  
+		</select>
+		
+		
+		<!-- 根据时间查询商家收益数量 -->
+		<select id="queryMerchantIncomePageCountByTime" parameterType="java.util.Map" resultType="java.lang.Integer">
+			SELECT count(*) from tb_pluss_merchant_income 
+					<where> 
+					<if test="id!= null"> 
+					 and id = #{id}
+					 </if> 
+					<if test="userId!= null"> 
+					 and userId = #{userId}
+					 </if> 
+					<if test="merchantCode!= null"> 
+					 and merchantCode = #{merchantCode}
+					 </if> 
+					<if test="merchantName!= null"> 
+					 and merchantName = #{merchantName}
+					 </if> 
+					<if test="storeId!= null"> 
+					 and storeId = #{storeId}
+					 </if> 
+					<if test="storeName!= null"> 
+					 and storeName = #{storeName}
+					 </if> 
+					<if test="dealType!= null"> 
+					 and dealType = #{dealType}
+					 </if> 
+					<if test="dealFee!= null"> 
+					 and dealFee = #{dealFee}
+					 </if> 
+					<if test="incomeFee!= null"> 
+					 and incomeFee = #{incomeFee}
+					 </if> 
+					<if test="createTime!= null"> 
+					 and createTime = #{createTime}
+					 </if> 
+					<if test="payTypeCode!= null"> 
+					 and payTypeCode = #{payTypeCode}
+					 </if> 
+					<if test="payTypeName!= null"> 
+					 and payTypeName = #{payTypeName}
+					 </if> 
+					<if test="memberCode!= null"> 
+					 and memberCode = #{memberCode}
+					 </if> 
+					<if test="memberName!= null"> 
+					 and memberName = #{memberName}
+					 </if> 
+					<if test="memberPic!= null"> 
+					 and memberPic = #{memberPic}
+					 </if> 
+					<if test="incomeType!= null"> 
+					 and incomeType = #{incomeType}
+					 </if> 
+					<if test="plateformProfit!= null"> 
+					 and plateformProfit = #{plateformProfit}
+					 </if> 
+					<if test="promoterProfit!= null"> 
+					 and promoterProfit = #{promoterProfit}
+					 </if> 
+					 <if test="dealStatus!= null"> 
+					 and dealStatus = #{dealStatus}
+					 </if> 
+					 <if test="dealCode!= null"> 
+					 and dealCode = #{dealCode}
+					 </if> 
+					 and createTime &gt; #{startTime} and createTime &lt; #{endTime}
+				</where>
+		</select>
+		
+		
+		<!-- 根据时间查询商家总收益 -->
+		<select id="queryMerchantTotalIncomeByTime" parameterType="java.util.Map" resultType="java.lang.Double">
+			SELECT sum(incomeFee) from tb_pluss_merchant_income 
+					<where> 
+					<if test="id!= null"> 
+					 and id = #{id}
+					 </if> 
+					<if test="userId!= null"> 
+					 and userId = #{userId}
+					 </if> 
+					<if test="merchantCode!= null"> 
+					 and merchantCode = #{merchantCode}
+					 </if> 
+					<if test="merchantName!= null"> 
+					 and merchantName = #{merchantName}
+					 </if> 
+					<if test="storeId!= null"> 
+					 and storeId = #{storeId}
+					 </if> 
+					<if test="storeName!= null"> 
+					 and storeName = #{storeName}
+					 </if> 
+					<if test="dealType!= null"> 
+					 and dealType = #{dealType}
+					 </if> 
+					<if test="dealFee!= null"> 
+					 and dealFee = #{dealFee}
+					 </if> 
+					<if test="incomeFee!= null"> 
+					 and incomeFee = #{incomeFee}
+					 </if> 
+					<if test="createTime!= null"> 
+					 and createTime = #{createTime}
+					 </if> 
+					<if test="payTypeCode!= null"> 
+					 and payTypeCode = #{payTypeCode}
+					 </if> 
+					<if test="payTypeName!= null"> 
+					 and payTypeName = #{payTypeName}
+					 </if> 
+					<if test="memberCode!= null"> 
+					 and memberCode = #{memberCode}
+					 </if> 
+					<if test="memberName!= null"> 
+					 and memberName = #{memberName}
+					 </if> 
+					<if test="memberPic!= null"> 
+					 and memberPic = #{memberPic}
+					 </if> 
+					<if test="incomeType!= null"> 
+					 and incomeType = #{incomeType}
+					 </if> 
+					<if test="plateformProfit!= null"> 
+					 and plateformProfit = #{plateformProfit}
+					 </if> 
+					<if test="promoterProfit!= null"> 
+					 and promoterProfit = #{promoterProfit}
+					 </if> 
+					 <if test="dealStatus!= null"> 
+					 and dealStatus = #{dealStatus}
+					 </if> 
+					 <if test="dealCode!= null"> 
+					 and dealCode = #{dealCode}
+					 </if> 
+					 and createTime &gt; #{startTime} and createTime &lt; #{endTime}
+				</where>
+		</select>
+
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/MerchantMarketMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/MerchantMarketMapper.xml
new file mode 100644
index 0000000..000587e
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/MerchantMarketMapper.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.MerchantMarketMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.MerchantMarket">
+        <id column="id" property="id" />
+        <result column="marketAmt" property="marketAmt" />
+        <result column="source" property="source" />
+        <result column="createTime" property="createTime" />
+        <result column="updateTime" property="updateTime" />
+        <result column="userName" property="userName" />
+        <result column="userId" property="userId" />
+    </resultMap>
+
+    <select id="getCountMarketAmt" parameterType="java.lang.Long" resultType="java.math.BigDecimal">
+        select IFNULL(SUM(marketAmt),'0.00') from tb_pluss_merchant_market
+        where  userId = #{userId}
+    </select>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/MerchantMemberCodeMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/MerchantMemberCodeMapper.xml
new file mode 100644
index 0000000..ac9f132
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/MerchantMemberCodeMapper.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.MerchantMemberCodeMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.MerchantMemberCode">
+        <id column="id" property="id" />
+        <result column="code" property="code" />
+        <result column="merchantCode" property="merchantCode" />
+        <result column="cardNo" property="cardNo" />
+        <result column="startTime" property="startTime" />
+        <result column="endTime" property="endTime" />
+        <result column="createTime" property="createTime" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/MerchantMenber-sqlmap.xml b/pluss-dao-bundle/src/main/resources/mapper/MerchantMenber-sqlmap.xml
new file mode 100644
index 0000000..a34d899
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/MerchantMenber-sqlmap.xml
@@ -0,0 +1,1245 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+			"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="cn.pluss.platform.mapper.MerchantMenberMapper">
+
+	   	<insert id="saveMerchantMenber" parameterType="cn.pluss.platform.entity.MerchantMenber" keyProperty="id" useGeneratedKeys="true">
+        	insert into tb_pluss_merchant_menber(merchantCode,merchantName,storeId,storeName,status,createDt,logo,memberCode,nickName,phone,openid,alipayUserId,comsumeMoney,profitMoney,orderNumber,totalRechargeFee,usableRechargeFee,totalGiveFee,usableGiveFee,cardNo,birthdayDt,memberName,provinces,sex,bindingUrl,appOpenId,unionId)VALUES(#{merchantCode},#{merchantName},#{storeId},#{storeName},#{status},now(),#{logo},#{memberCode},#{nickName},#{phone},#{openid},#{alipayUserId},#{comsumeMoney},#{profitMoney},#{orderNumber},#{totalRechargeFee},#{usableRechargeFee},#{totalGiveFee},#{usableGiveFee},#{cardNo},#{birthdayDt},#{memberName},#{provinces},#{sex},#{bindingUrl},#{appOpenId},#{unionId})
+    	</insert>
+
+	   	<insert id="saveMerchantMenberBatch">
+        	insert into tb_pluss_merchant_menber(merchantCode,merchantName,storeId,storeName,status,createDt,logo,memberCode,nickName,phone,openid,alipayUserId,comsumeMoney,profitMoney,orderNumber,totalRechargeFee,usableRechargeFee,totalGiveFee,usableGiveFee) VALUES 
+    			<foreach collection="list" item="item" index="index" separator=",">
+			(#{merchantCode},#{merchantName},#{storeId},#{storeName},#{status},#{createDt},#{logo},#{memberCode},#{nickName},#{phone},#{openid},#{alipayUserId},#{comsumeMoney},#{profitMoney},#{orderNumber},#{totalRechargeFee},#{usableRechargeFee},#{totalGiveFee},#{usableGiveFee}		)
+				</foreach>
+    	</insert>
+
+		<select id="queryMerchantMenber" parameterType="cn.pluss.platform.entity.MerchantMenber" resultType="cn.pluss.platform.entity.MerchantMenber">
+			SELECT * from tb_pluss_merchant_menber 
+				<where> 
+					<if test="id!= null"> 
+					 	and id = #{id}
+					 </if> 
+					 <if test="nickName== null"> 
+                      and nickName !='null'
+                      </if> 
+					<if test="merchantCode!= null"> 
+					 	and merchantCode = #{merchantCode}
+					 </if> 
+					<if test="merchantName!= null"> 
+					 	and merchantName = #{merchantName}
+					 </if> 
+					<if test="storeId!= null"> 
+					 	and storeId = #{storeId}
+					 </if> 
+					<if test="storeName!= null"> 
+					 	and storeName = #{storeName}
+					 </if> 
+					<if test="status!= null"> 
+					 	and status = #{status}
+					 </if> 
+					<if test="createDt!= null"> 
+					 	and createDt = #{createDt}
+					 </if> 
+					<if test="logo!= null"> 
+					 	and logo = #{logo}
+					 </if> 
+					<if test="memberCode!= null"> 
+					 	and memberCode = #{memberCode}
+					 </if> 
+					<if test="nickName!= null"> 
+					 	and nickName = #{nickName}
+					 </if> 
+					<if test="phone!= null"> 
+					 	and phone = #{phone}
+					 </if> 
+					<if test="openid!= null"> 
+					 	and openid = #{openid}
+					 </if> 
+					<if test="alipayUserId!= null"> 
+					 	and alipayUserId = #{alipayUserId}
+					 </if> 
+					<if test="comsumeMoney!= null"> 
+					 	and comsumeMoney = #{comsumeMoney}
+					 </if> 
+					<if test="profitMoney!= null"> 
+					 	and profitMoney = #{profitMoney}
+					 </if> 
+					<if test="orderNumber!= null"> 
+					 	and orderNumber = #{orderNumber}
+					 </if> 
+					 <if test="totalRechargeFee!= null"> 
+					 	and totalRechargeFee = #{totalRechargeFee}
+					 </if> 
+					 <if test="usableRechargeFee!= null"> 
+					 	and usableRechargeFee = #{usableRechargeFee}
+					 </if> 
+					 <if test="totalGiveFee!= null"> 
+					 	and totalGiveFee = #{totalGiveFee}
+					 </if> 
+					 <if test="usableGiveFee!= null"> 
+					 	and usableGiveFee = #{usableGiveFee}
+					 </if> 
+					 <if test="cardNo!= null"> 
+					 	and cardNo = #{cardNo}
+					 </if> 
+					 <if test="birthdayDt!= null"> 
+					 	and birthdayDt = #{birthdayDt}
+					 </if> 
+					 <if test="memberName!= null"> 
+					 	and memberName = #{memberName}
+					 </if> 
+					 <if test="provinces!= null"> 
+					 	and provinces = #{provinces}
+					 </if> 
+					 <if test="sex!= null"> 
+					 	and sex = #{sex}
+					 </if> 
+					 <if test="bindingUrl!= null"> 
+					 	and bindingUrl = #{bindingUrl}
+					 </if>
+					<if test="appOpenId != null">
+						and appOpenId = #{appOpenId}
+					</if>
+					<if test="unionId != null">
+						and unionId = #{unionId}
+					</if>
+
+				 </where> 
+		</select>
+
+		<select id="queryMerchantMenberList" parameterType="cn.pluss.platform.entity.MerchantMenber" resultType="cn.pluss.platform.entity.MerchantMenber">
+			SELECT * from tb_pluss_merchant_menber 
+				<where> 
+					<if test="id!= null"> 
+					 and 	id = #{id}
+					 </if> 
+					 <if test="nickName== null"> 
+                      and nickName !='null'
+                      </if> 
+					<if test="merchantCode!= null"> 
+					 and 	merchantCode = #{merchantCode}
+					 </if> 
+					<if test="merchantName!= null"> 
+					 and 	merchantName = #{merchantName}
+					 </if> 
+					<if test="storeId!= null"> 
+					 and 	storeId = #{storeId}
+					 </if> 
+					<if test="storeName!= null"> 
+					 and 	storeName = #{storeName}
+					 </if> 
+					<if test="status!= null"> 
+					 and 	status = #{status}
+					 </if> 
+					<if test="createDt!= null"> 
+					 and 	createDt = #{createDt}
+					 </if> 
+					<if test="logo!= null"> 
+					 and 	logo = #{logo}
+					 </if> 
+					<if test="memberCode!= null"> 
+					 and 	memberCode = #{memberCode}
+					 </if> 
+					<if test="nickName!= null"> 
+					 and 	nickName = #{nickName}
+					 </if> 
+					<if test="phone!= null"> 
+					 and 	phone = #{phone}
+					 </if> 
+					<if test="openid!= null"> 
+					 and 	openid = #{openid}
+					 </if> 
+					<if test="alipayUserId!= null"> 
+					 and 	alipayUserId = #{alipayUserId}
+					 </if> 
+					<if test="comsumeMoney!= null"> 
+					 and 	comsumeMoney = #{comsumeMoney}
+					 </if> 
+					<if test="profitMoney!= null"> 
+					 and 	profitMoney = #{profitMoney}
+					 </if> 
+					<if test="orderNumber!= null"> 
+					 and 	orderNumber = #{orderNumber}
+					 </if> 
+					 <if test="totalRechargeFee!= null"> 
+					 	and totalRechargeFee = #{totalRechargeFee}
+					 </if> 
+					 <if test="usableRechargeFee!= null"> 
+					 	and usableRechargeFee = #{usableRechargeFee}
+					 </if> 
+					 <if test="totalGiveFee!= null"> 
+					 	and totalGiveFee = #{totalGiveFee}
+					 </if> 
+					 <if test="usableGiveFee!= null"> 
+					 	and usableGiveFee = #{usableGiveFee}
+					 </if> 
+					 <if test="cardNo!= null"> 
+                        and cardNo = #{cardNo}
+                     </if> 
+                     <if test="birthdayDt!= null"> 
+                        and birthdayDt = #{birthdayDt}
+                     </if> 
+                      <if test="memberName!= null"> 
+                        and memberName = #{memberName}
+                     </if> 
+                     <if test="provinces!= null"> 
+                        and provinces = #{provinces}
+                     </if> 
+                     <if test="sex!= null"> 
+                        and sex = #{sex}
+                     </if> 
+                     <if test="bindingUrl!= null"> 
+                        and bindingUrl = #{bindingUrl}
+                     </if>
+					<if test="appOpenId!= null">
+						and appOpenId = #{appOpenId}
+					</if>
+					<if test="unionId!= null">
+						and unionId = #{unionId}
+					</if>
+				 </where> 
+		</select>
+
+		<update id="updateMerchantMenber" parameterType="cn.pluss.platform.entity.MerchantMenber" >
+			update tb_pluss_merchant_menber 
+				  <set> 
+					<if test="merchantCode!= null"> 
+					 	merchantCode = #{merchantCode},
+					 </if> 
+					<if test="merchantName!= null"> 
+					 	merchantName = #{merchantName},
+					 </if> 
+					<if test="storeId!= null"> 
+					 	storeId = #{storeId},
+					 </if> 
+					<if test="storeName!= null"> 
+					 	storeName = #{storeName},
+					 </if> 
+					<if test="status!= null"> 
+					 	status = #{status},
+					 </if> 
+					<if test="createDt!= null"> 
+					 	createDt = #{createDt},
+					 </if> 
+					<if test="logo!= null"> 
+					 	logo = #{logo},
+					 </if> 
+					<if test="memberCode!= null"> 
+					 	memberCode = #{memberCode},
+					 </if> 
+					<if test="nickName!= null"> 
+					 	nickName = #{nickName},
+					 </if> 
+					<if test="phone!= null"> 
+					 	phone = #{phone},
+					 </if> 
+					<if test="openid!= null"> 
+					 	openid = #{openid},
+					 </if> 
+					<if test="alipayUserId!= null"> 
+					 	alipayUserId = #{alipayUserId},
+					 </if> 
+					<if test="comsumeMoney!= null"> 
+					 	comsumeMoney = #{comsumeMoney},
+					 </if> 
+					<if test="profitMoney!= null"> 
+					 	profitMoney = #{profitMoney},
+					 </if> 
+					<if test="orderNumber!= null"> 
+					 	orderNumber = #{orderNumber},
+					 </if> 
+					 <if test="totalRechargeFee!= null"> 
+					 	 totalRechargeFee = #{totalRechargeFee},
+					 </if> 
+					 <if test="usableRechargeFee!= null"> 
+					 	 usableRechargeFee = #{usableRechargeFee},
+					 </if> 
+					 <if test="totalGiveFee!= null"> 
+					 	 totalGiveFee = #{totalGiveFee},
+					 </if> 
+					 <if test="usableGiveFee!= null"> 
+					 	 usableGiveFee = #{usableGiveFee},
+					 </if> 
+					 <if test="cardNo!= null"> 
+                         cardNo = #{cardNo},
+                     </if> 
+                     <if test="birthdayDt!= null"> 
+                         birthdayDt = #{birthdayDt},
+                     </if> 
+                      <if test="memberName!= null"> 
+                         memberName = #{memberName},
+                     </if> 
+                     <if test="provinces!= null"> 
+                         provinces = #{provinces},
+                     </if> 
+                     <if test="sex!= null"> 
+                         sex = #{sex},
+                     </if> 
+                     <if test="bindingUrl!= null"> 
+                         bindingUrl = #{bindingUrl},
+                     </if>
+					  <if test="appOpenId!= null">
+						  appOpenId = #{appOpenId},
+					  </if>
+					  <if test="unionId!= null">
+						  unionId = #{unionId}
+					  </if>
+				</set>
+			where id=#{id} 
+		</update>
+
+		<delete id="deleteMerchantMenber" parameterType="cn.pluss.platform.entity.MerchantMenber" >
+			DELETE FROM tb_pluss_merchant_menber where id=#{id}
+		</delete>
+
+		<select id="queryMerchantMenberPage" parameterType="java.util.Map" resultType="cn.pluss.platform.entity.MerchantMenber">
+			SELECT * from tb_pluss_merchant_menber 
+				<where> 
+					<if test="id!= null"> 
+					and id = #{id}
+					 </if> 
+					<if test="merchantCode!= null"> 
+					and merchantCode = #{merchantCode}
+					 </if> 
+					<if test="merchantName!= null"> 
+					and merchantName = #{merchantName}
+					 </if> 
+					<if test="storeId!= null"> 
+					and storeId = #{storeId}
+					 </if> 
+					<if test="storeName!= null"> 
+					and storeName = #{storeName}
+					 </if> 
+					<if test="status!= null"> 
+					and status = #{status}
+					 </if> 
+					<if test="createDt!= null"> 
+					and createDt = #{createDt}
+					 </if> 
+					<if test="logo!= null">
+					and logo = #{logo}
+					 </if> 
+					<if test="memberCode!= null"> 
+					and memberCode = #{memberCode}
+					 </if> 
+					 <if test="keyWord!=null">
+					and (
+							<if test="nickName!= null"> 
+							nickName like CONCAT("%",#{nickName},"%")
+							 </if> 
+							<if test="phone!= null"> 
+							or phone like CONCAT("%",#{phone},"%")
+							 </if> 
+						)
+					</if>
+					<if test="nickName== null"> 
+                      and nickName !='null'
+                      </if> 
+					<if test="openid!= null"> 
+					and openid = #{openid}
+					 </if> 
+					<if test="alipayUserId!= null"> 
+					and alipayUserId = #{alipayUserId}
+					 </if> 
+					<if test="comsumeMoney!= null"> 
+					and comsumeMoney = #{comsumeMoney}
+					 </if> 
+					<if test="profitMoney!= null"> 
+					and profitMoney = #{profitMoney}
+					 </if> 
+					<if test="orderNumber!= null"> 
+					and orderNumber = #{orderNumber}
+					 </if> 
+					 <if test="totalRechargeFee!= null"> 
+					 	and totalRechargeFee = #{totalRechargeFee}
+					 </if> 
+					 <if test="usableRechargeFee!= null"> 
+					 	and usableRechargeFee = #{usableRechargeFee}
+					 </if> 
+					 <if test="totalGiveFee!= null"> 
+					 	and totalGiveFee = #{totalGiveFee}
+					 </if> 
+					 <if test="usableGiveFee!= null"> 
+					 	and usableGiveFee = #{usableGiveFee}
+					 </if> 
+					 <if test="cardNo!= null"> 
+                        and cardNo = #{cardNo}
+                     </if> 
+                     <if test="birthdayDt!= null"> 
+                        and birthdayDt = #{birthdayDt}
+                     </if> 
+                     <if test="provinces!= null"> 
+                        and provinces = #{provinces}
+                     </if> 
+                     <if test="sex!= null"> 
+                        and sex = #{sex}
+                     </if> 
+                     <if test="bindingUrl!= null"> 
+                        and bindingUrl = #{bindingUrl}
+                     </if>
+					<if test="appOpenId!= null">
+						and appOpenId = #{appOpenId}
+					</if>
+					<if test="unionId!= null">
+						and unionId = #{unionId}
+					</if>
+				 </where>
+			order by id desc  limit #{pageSize}  offset  #{offset}  
+		</select>
+		
+		
+		<select id="manageQueryMerchantMenberPage" parameterType="java.util.Map" resultType="cn.pluss.platform.entity.MerchantMenber">
+		      SELECT mm.*,mbi.userId ,mbi.alias from tb_pluss_merchant_menber  mm
+		      LEFT JOIN tb_pluss_merchant_base_info mbi on mbi.merchantCode = mm.merchantCode
+                <where> 
+                    <if test="id!= null"> 
+                    and mm.id = #{id}
+                     </if>
+					<if test="userId!= null">
+						and mbi.userId = #{userId}
+					</if>
+					<if test="alias != null and alias != ''">
+                    and mbi.alias like concat('%',#{alias},'%')
+                     </if> 
+                    <if test="merchantCode!= null"> 
+                    and mm.merchantCode = #{merchantCode}
+                     </if> 
+                    <if test="merchantName!= null"> 
+                    and mm.merchantName = #{merchantName}
+                     </if> 
+                    <if test="storeId!= null"> 
+                    and mm.storeId = #{storeId}
+                     </if> 
+                    <if test="storeName!= null"> 
+                    and mm.storeName = #{storeName}
+                     </if> 
+                    <if test="status!= null"> 
+                    and mm.status = #{status}
+                     </if> 
+                    <if test="createDt!= null"> 
+                    and mm.createDt = #{createDt}
+                     </if> 
+                    <if test="logo!= null">
+                    and mm.logo = #{logo}
+                     </if> 
+                    <if test="memberCode!= null"> 
+                    and mm.memberCode = #{memberCode}
+                     </if> 
+                     <if test="nickName!= null"> 
+                      and mm.nickName like CONCAT("%",#{nickName},"%")
+                      </if> 
+                     <if test="nickName== null"> 
+                      and mm.nickName !='null'
+                      </if> 
+                    <if test="phone!= null"> 
+                      and mm.phone like CONCAT("%",#{phone},"%")
+                     </if> 
+                    <if test="openid!= null"> 
+                    and mm.openid = #{openid}
+                     </if> 
+                    <if test="alipayUserId!= null"> 
+                    and mm.alipayUserId = #{alipayUserId}
+                     </if> 
+                    <if test="comsumeMoney!= null"> 
+                    and mm.comsumeMoney = #{comsumeMoney}
+                     </if> 
+                    <if test="profitMoney!= null"> 
+                    and mm.profitMoney = #{profitMoney}
+                     </if> 
+                    <if test="orderNumber!= null"> 
+                    and mm.orderNumber = #{orderNumber}
+                     </if> 
+                     <if test="totalRechargeFee!= null"> 
+                        and mm.totalRechargeFee = #{totalRechargeFee}
+                     </if> 
+                     <if test="usableRechargeFee!= null"> 
+                        and mm.usableRechargeFee = #{usableRechargeFee}
+                     </if> 
+                     <if test="totalGiveFee!= null"> 
+                        and mm.totalGiveFee = #{totalGiveFee}
+                     </if> 
+                     <if test="usableGiveFee!= null"> 
+                        and mm.usableGiveFee = #{usableGiveFee}
+                     </if> 
+                     <if test="cardNo!= null"> 
+                        and mm.cardNo = #{cardNo}
+                     </if> 
+                     <if test="birthdayDt!= null"> 
+                        and mm.birthdayDt = #{birthdayDt}
+                     </if> 
+                      <if test="memberName!= null"> 
+                        and mm.memberName Like CONCAT('%',#{memberName},'%')
+                     </if> 
+                     <if test="provinces!= null"> 
+                        and mm.provinces = #{provinces}
+                     </if> 
+                     <if test="sex!= null"> 
+                        and mm.sex = #{sex}
+                     </if> 
+                     <if test="bindingUrl!= null"> 
+                        and mm.bindingUrl = #{bindingUrl}
+                     </if>
+					<if test="appOpenId!= null">
+						and mm.appOpenId = #{appOpenId}
+					</if>
+					<if test="unionId!= null">
+						and mm.unionId = #{unionId}
+					</if>
+
+                 </where>
+            order by id desc  limit #{pageSize}  offset  #{offset}  
+		</select>
+
+	<select id="manageQueryMerchantNoMenberPage" parameterType="java.util.Map" resultType="cn.pluss.platform.entity.MerchantMenber">
+		SELECT mm.*,mbi.userId ,mbi.alias from tb_pluss_merchant_menber  mm
+		LEFT JOIN tb_pluss_merchant_base_info mbi on mbi.merchantCode = mm.merchantCode
+		<where>
+			<if test="id!= null">
+				and mm.id = #{id}
+			</if>
+			<if test="userId!= null">
+				and mbi.userId = #{userId}
+			</if>
+			<if test="alias != null and alias != ''">
+				and mbi.alias like concat('%',#{alias},'%')
+			</if>
+			<if test="merchantCode!= null">
+				and mm.merchantCode IN (SELECT merchantCode
+				FROM tb_pluss_merchant_base_info
+				WHERE bindingCode = (SELECT bindingCode
+				FROM tb_pluss_merchant_base_info
+				where merchantCode = #{merchantCode}))
+			</if>
+			<if test="merchantName!= null">
+				and mm.merchantName = #{merchantName}
+			</if>
+			<if test="storeId!= null">
+				and mm.storeId = #{storeId}
+			</if>
+			<if test="storeName!= null">
+				and mm.storeName = #{storeName}
+			</if>
+			<if test="status!= null">
+				and mm.status = #{status}
+			</if>
+			<if test="createDt!= null">
+				and mm.createDt = #{createDt}
+			</if>
+			<if test="logo!= null">
+				and mm.logo = #{logo}
+			</if>
+			<if test="memberCode!= null">
+				and mm.memberCode = #{memberCode}
+			</if>
+			<if test="nickName!= null">
+				and mm.nickName like CONCAT("%",#{nickName},"%")
+			</if>
+			<if test="nickName== null">
+				and mm.nickName !='null'
+			</if>
+			<if test="phone!= null">
+				and mm.phone like CONCAT("%",#{phone},"%")
+			</if>
+			<if test="openid!= null">
+				and mm.openid = #{openid}
+			</if>
+			<if test="alipayUserId!= null">
+				and mm.alipayUserId = #{alipayUserId}
+			</if>
+			<if test="comsumeMoney!= null">
+				and mm.comsumeMoney = #{comsumeMoney}
+			</if>
+			<if test="profitMoney!= null">
+				and mm.profitMoney = #{profitMoney}
+			</if>
+			<if test="orderNumber!= null">
+				and mm.orderNumber = #{orderNumber}
+			</if>
+			<if test="totalRechargeFee!= null">
+				and mm.totalRechargeFee = #{totalRechargeFee}
+			</if>
+			<if test="usableRechargeFee!= null">
+				and mm.usableRechargeFee = #{usableRechargeFee}
+			</if>
+			<if test="totalGiveFee!= null">
+				and mm.totalGiveFee = #{totalGiveFee}
+			</if>
+			<if test="usableGiveFee!= null">
+				and mm.usableGiveFee = #{usableGiveFee}
+			</if>
+			<if test="cardNo!= null">
+				and mm.cardNo = #{cardNo}
+			</if>
+			<if test="birthdayDt!= null">
+				and mm.birthdayDt = #{birthdayDt}
+			</if>
+			<if test="memberName!= null">
+				and mm.memberName Like CONCAT('%',#{memberName},'%')
+			</if>
+			<if test="provinces!= null">
+				and mm.provinces = #{provinces}
+			</if>
+			<if test="sex!= null">
+				and mm.sex = #{sex}
+			</if>
+			<if test="bindingUrl!= null">
+				and mm.bindingUrl = #{bindingUrl}
+			</if>
+			<if test="appOpenId!= null">
+				and mm.appOpenId = #{appOpenId}
+			</if>
+			<if test="unionId!= null">
+				and mm.unionId = #{unionId}
+			</if>
+		</where>
+		order by id desc  limit #{pageSize}  offset  #{offset}
+	</select>
+
+		<select id="manageMerchantMenberSum" parameterType="java.util.Map" resultType="cn.pluss.platform.entity.MerchantMenber">
+			SELECT usableRechargeFee,totalGiveFee
+			FROM tb_pluss_merchant_menber mm
+			WHERE id in ( SELECT
+			mm.id
+			FROM tb_pluss_merchant_menber mm
+			LEFT JOIN tb_pluss_merchant_base_info mbi ON mbi.merchantCode = mm.merchantCode
+			WHERE mm.merchantCode=#{merchantCode})
+		</select>
+
+		<select id="manageQueryMerchantMenberPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+		   SELECT count(*) from tb_pluss_merchant_menber  mm LEFT JOIN tb_pluss_merchant_base_info mbi on mbi.merchantCode = mm.merchantCode
+                <where> 
+                   <if test="id!= null"> 
+                    and mm.id = #{id}
+                     </if>
+					<if test="userId != null">
+						and mbi.userId = #{userId}
+					</if>
+					<if test="alias!= null">
+                    and mbi.alias like concat('%',#{alias},'%')
+                     </if> 
+                    <if test="merchantCode!= null"> 
+                    and mm.merchantCode = #{merchantCode}
+                     </if> 
+                    <if test="merchantName!= null"> 
+                    and mm.merchantName = #{merchantName}
+                     </if> 
+                    <if test="storeId!= null"> 
+                    and mm.storeId = #{storeId}
+                     </if> 
+                    <if test="storeName!= null"> 
+                    and mm.storeName = #{storeName}
+                     </if> 
+                    <if test="status!= null"> 
+                    and mm.status = #{status}
+                     </if> 
+                    <if test="createDt!= null"> 
+                    and mm.createDt = #{createDt}
+                     </if> 
+                    <if test="logo!= null">
+                    and mm.logo = #{logo}
+                     </if> 
+                    <if test="memberCode!= null"> 
+                    and mm.memberCode = #{memberCode}
+                     </if> 
+                     <if test="nickName!= null"> 
+                      and mm.nickName like CONCAT("%",#{nickName},"%")
+                      </if> 
+                     <if test="nickName== null"> 
+                      and mm.nickName !='null'
+                      </if> 
+                    <if test="phone!= null"> 
+                      and mm.phone like CONCAT("%",#{phone},"%")
+                     </if> 
+                    <if test="openid!= null"> 
+                    and mm.openid = #{openid}
+                     </if> 
+                    <if test="alipayUserId!= null"> 
+                    and mm.alipayUserId = #{alipayUserId}
+                     </if> 
+                    <if test="comsumeMoney!= null"> 
+                    and mm.comsumeMoney = #{comsumeMoney}
+                     </if> 
+                    <if test="profitMoney!= null"> 
+                    and mm.profitMoney = #{profitMoney}
+                     </if> 
+                    <if test="orderNumber!= null"> 
+                    and mm.orderNumber = #{orderNumber}
+                     </if> 
+                     <if test="totalRechargeFee!= null"> 
+                        and mm.totalRechargeFee = #{totalRechargeFee}
+                     </if> 
+                     <if test="usableRechargeFee!= null"> 
+                        and mm.usableRechargeFee = #{usableRechargeFee}
+                     </if> 
+                     <if test="totalGiveFee!= null"> 
+                        and mm.totalGiveFee = #{totalGiveFee}
+                     </if> 
+                     <if test="usableGiveFee!= null"> 
+                        and mm.usableGiveFee = #{usableGiveFee}
+                     </if> 
+                     <if test="cardNo!= null"> 
+                        and mm.cardNo = #{cardNo}
+                     </if> 
+                     <if test="birthdayDt!= null"> 
+                        and mm.birthdayDt = #{birthdayDt}
+                     </if> 
+                      <if test="memberName!= null"> 
+                        and mm.memberName Like CONCAT('%',#{memberName},'%')
+                     </if> 
+                     <if test="provinces!= null"> 
+                        and mm.provinces = #{provinces}
+                     </if> 
+                     <if test="sex!= null"> 
+                        and mm.sex = #{sex}
+                     </if> 
+                     <if test="bindingUrl!= null"> 
+                        and mm.bindingUrl = #{bindingUrl}
+                     </if>
+					<if test="appOpenId!= null">
+						and mm.appOpenId = #{appOpenId}
+					</if>
+					<if test="unionId!= null">
+						and mm.unionId = #{unionId}
+					</if>
+                 </where>
+		</select>
+
+
+		<select id="queryMerchantMenberPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+			SELECT count(*) from tb_pluss_merchant_menber 
+					<where> 
+					<if test="id!= null"> 
+					 and id = #{id}
+					 </if> 
+					<if test="nickName== null"> 
+                      and nickName !='null'
+                      </if> 
+					<if test="merchantCode!= null"> 
+					 and merchantCode = #{merchantCode}
+					 </if> 
+					<if test="merchantName!= null"> 
+					 and merchantName = #{merchantName}
+					 </if> 
+					<if test="storeId!= null"> 
+					 and storeId = #{storeId}
+					 </if> 
+					<if test="storeName!= null"> 
+					 and storeName = #{storeName}
+					 </if> 
+					<if test="status!= null"> 
+					 and status = #{status}
+					 </if> 
+					<if test="createDt!= null"> 
+					 and createDt = #{createDt}
+					 </if> 
+					 <if test="stTime!= null"> 
+					 	and createDt &gt;= #{stTime}
+					 </if> 
+					 <if test="endTime!= null"> 
+					 	and createDt &lt;= #{endTime}
+					 </if> 
+					<if test="logo!= null"> 
+					 and logo = #{logo}
+					 </if> 
+					<if test="memberCode!= null"> 
+					 and memberCode = #{memberCode}
+					 </if> 
+					 
+					  <if test="keyWord!=null">
+                    and (
+                            <if test="nickName!= null"> 
+                            nickName like CONCAT("%",#{nickName},"%")
+                             </if> 
+                            <if test="phone!= null"> 
+                            or phone like CONCAT("%",#{phone},"%")
+                             </if> 
+                        )
+                    </if>
+					<if test="openid!= null"> 
+					 and openid = #{openid}
+					 </if> 
+					<if test="alipayUserId!= null"> 
+					 and alipayUserId = #{alipayUserId}
+					 </if> 
+					<if test="comsumeMoney!= null"> 
+					 and comsumeMoney = #{comsumeMoney}
+					 </if> 
+					<if test="profitMoney!= null"> 
+					 and profitMoney = #{profitMoney}
+					 </if> 
+					<if test="orderNumber!= null"> 
+					 and orderNumber = #{orderNumber}
+					 </if> 
+					 <if test="totalRechargeFee!= null"> 
+					 	and totalRechargeFee = #{totalRechargeFee}
+					 </if> 
+					 <if test="usableRechargeFee!= null"> 
+					 	and usableRechargeFee = #{usableRechargeFee}
+					 </if> 
+					 <if test="totalGiveFee!= null"> 
+					 	and totalGiveFee = #{totalGiveFee}
+					 </if> 
+					 <if test="usableGiveFee!= null"> 
+					 	and usableGiveFee = #{usableGiveFee}
+					 </if> 
+					 <if test="cardNo!= null"> 
+                        and cardNo = #{cardNo}
+                     </if> 
+                     <if test="birthdayDt!= null"> 
+                        and birthdayDt = #{birthdayDt}
+                     </if> 
+                      <if test="memberName!= null"> 
+                        and memberName Like CONCAT('%',#{memberName},'%')
+                     </if> 
+                     <if test="provinces!= null"> 
+                        and provinces = #{provinces}
+                     </if> 
+                     <if test="sex!= null"> 
+                        and sex = #{sex}
+                     </if> 
+                     <if test="bindingUrl!= null"> 
+                        and bindingUrl = #{bindingUrl}
+                     </if>
+					<if test="appOpenId!= null">
+						and appOpenId = #{appOpenId}
+					</if>
+					<if test="unionId!= null">
+						and unionId = #{unionId}
+					</if>
+
+				</where>
+		</select>
+		
+		<select id="queryMerchantMenberTotalRechargeFee" parameterType="java.util.Map" resultType="java.lang.Double">
+			SELECT sum(totalRechargeFee) from tb_pluss_merchant_menber 
+					<where> 
+					<if test="id!= null"> 
+					 and id = #{id}
+					 </if> 
+					<if test="nickName== null"> 
+                      and nickName !='null'
+                      </if> 
+					<if test="merchantCode!= null"> 
+					 and merchantCode = #{merchantCode}
+					 </if> 
+					<if test="merchantName!= null"> 
+					 and merchantName = #{merchantName}
+					 </if> 
+					<if test="storeId!= null"> 
+					 and storeId = #{storeId}
+					 </if> 
+					<if test="storeName!= null"> 
+					 and storeName = #{storeName}
+					 </if> 
+					<if test="status!= null"> 
+					 and status = #{status}
+					 </if> 
+					<if test="createDt!= null"> 
+					 and createDt = #{createDt}
+					 </if> 
+					<if test="logo!= null"> 
+					 and logo = #{logo}
+					 </if> 
+					<if test="memberCode!= null"> 
+					 and memberCode = #{memberCode}
+					 </if> 
+					<if test="nickName!= null"> 
+					 and nickName like CONCAT("%",#{nickName},"%")
+					 </if> 
+					<if test="phone!= null"> 
+					 and phone like CONCAT("%",#{phone},"%")
+					 </if> 
+					<if test="openid!= null"> 
+					 and openid = #{openid}
+					 </if> 
+					<if test="alipayUserId!= null"> 
+					 and alipayUserId = #{alipayUserId}
+					 </if> 
+					<if test="comsumeMoney!= null"> 
+					 and comsumeMoney = #{comsumeMoney}
+					 </if> 
+					<if test="profitMoney!= null"> 
+					 and profitMoney = #{profitMoney}
+					 </if> 
+					<if test="orderNumber!= null"> 
+					 and orderNumber = #{orderNumber}
+					 </if> 
+					 <if test="totalRechargeFee!= null"> 
+					 	and totalRechargeFee = #{totalRechargeFee}
+					 </if> 
+					 <if test="usableRechargeFee!= null"> 
+					 	and usableRechargeFee = #{usableRechargeFee}
+					 </if> 
+					 <if test="totalGiveFee!= null"> 
+					 	and totalGiveFee = #{totalGiveFee}
+					 </if> 
+					 <if test="usableGiveFee!= null"> 
+					 	and usableGiveFee = #{usableGiveFee}
+					 </if> 
+					 <if test="cardNo!= null"> 
+                        and cardNo = #{cardNo}
+                     </if> 
+                     <if test="birthdayDt!= null"> 
+                        and birthdayDt = #{birthdayDt}
+                     </if>
+                      <if test="memberName!= null"> 
+                        and memberName = #{memberName}
+                     </if> 
+                     <if test="provinces!= null"> 
+                        and provinces = #{provinces}
+                     </if> 
+                     <if test="sex!= null"> 
+                        and sex = #{sex}
+                     </if> 
+                     <if test="bindingUrl!= null"> 
+                        and bindingUrl = #{bindingUrl}
+                     </if> 
+				</where>
+		</select>
+		
+		<select id="queryMerchantMenberUsableRechargeFee" parameterType="java.util.Map" resultType="java.lang.Double">
+			SELECT round(sum(usableRechargeFee),2) from tb_pluss_merchant_menber
+					<where> 
+					<if test="id!= null"> 
+					 and id = #{id}
+					 </if> 
+					<if test="nickName== null"> 
+                      and nickName !='null'
+                      </if> 
+					<if test="merchantCode!= null"> 
+					 and merchantCode = #{merchantCode}
+					 </if> 
+					<if test="merchantName!= null"> 
+					 and merchantName = #{merchantName}
+					 </if> 
+					<if test="storeId!= null"> 
+					 and storeId = #{storeId}
+					 </if> 
+					<if test="storeName!= null"> 
+					 and storeName = #{storeName}
+					 </if> 
+					<if test="status!= null"> 
+					 and status = #{status}
+					 </if> 
+					<if test="createDt!= null"> 
+					 and createDt = #{createDt}
+					 </if> 
+					<if test="logo!= null"> 
+					 and logo = #{logo}
+					 </if> 
+					<if test="memberCode!= null"> 
+					 and memberCode = #{memberCode}
+					 </if> 
+					<if test="nickName!= null"> 
+					 and nickName like CONCAT("%",#{nickName},"%")
+					 </if> 
+					<if test="phone!= null"> 
+					 and phone like CONCAT("%",#{phone},"%")
+					 </if> 
+					<if test="openid!= null"> 
+					 and openid = #{openid}
+					 </if> 
+					<if test="alipayUserId!= null"> 
+					 and alipayUserId = #{alipayUserId}
+					 </if> 
+					<if test="comsumeMoney!= null"> 
+					 and comsumeMoney = #{comsumeMoney}
+					 </if> 
+					<if test="profitMoney!= null"> 
+					 and profitMoney = #{profitMoney}
+					 </if> 
+					<if test="orderNumber!= null"> 
+					 and orderNumber = #{orderNumber}
+					 </if> 
+					 <if test="totalRechargeFee!= null"> 
+					 	and totalRechargeFee = #{totalRechargeFee}
+					 </if> 
+					 <if test="usableRechargeFee!= null"> 
+					 	and usableRechargeFee = #{usableRechargeFee}
+					 </if> 
+					 <if test="totalGiveFee!= null"> 
+					 	and totalGiveFee = #{totalGiveFee}
+					 </if> 
+					 <if test="usableGiveFee!= null"> 
+					 	and usableGiveFee = #{usableGiveFee}
+					 </if> 
+					 <if test="cardNo!= null"> 
+                        and cardNo = #{cardNo}
+                     </if> 
+                     <if test="birthdayDt!= null"> 
+                        and birthdayDt = #{birthdayDt}
+                     </if> 
+                      <if test="memberName!= null"> 
+                        and memberName = #{memberName}
+                     </if> 
+                     <if test="provinces!= null"> 
+                        and provinces = #{provinces}
+                     </if> 
+                     <if test="sex!= null"> 
+                        and sex = #{sex}
+                     </if> 
+                     <if test="bindingUrl!= null"> 
+                        and bindingUrl = #{bindingUrl}
+                     </if>
+					<if test="appOpenId!= null">
+						and appOpenId = #{appOpenId}
+					</if>
+					<if test="unionId!= null">
+						and unionId = #{unionId}
+					</if>
+
+				</where>
+		</select>
+		
+		<select id="queryMerchantMenberNumByTime" parameterType="java.util.Map" resultType="java.lang.Integer">
+			SELECT count(*) from tb_pluss_merchant_menber 
+					<where> 
+					<if test="id!= null"> 
+					 and id = #{id}
+					 </if> 
+					<if test="nickName== null"> 
+                      and nickName !='null'
+                      </if> 
+					<if test="merchantCode!= null"> 
+					 and merchantCode = #{merchantCode}
+					 </if> 
+					<if test="merchantName!= null"> 
+					 and merchantName = #{merchantName}
+					 </if> 
+					<if test="storeId!= null"> 
+					 and storeId = #{storeId}
+					 </if> 
+					<if test="storeName!= null"> 
+					 and storeName = #{storeName}
+					 </if> 
+					<if test="status!= null"> 
+					 and status = #{status}
+					 </if> 
+					<if test="createDt!= null"> 
+					 and createDt = #{createDt}
+					 </if> 
+					<if test="logo!= null"> 
+					 and logo = #{logo}
+					 </if> 
+					<if test="memberCode!= null"> 
+					 and memberCode = #{memberCode}
+					 </if> 
+					<if test="nickName!= null"> 
+					 and nickName like CONCAT("%",#{nickName},"%")
+					 </if> 
+					<if test="phone!= null"> 
+					 and phone like CONCAT("%",#{phone},"%")
+					 </if> 
+					<if test="openid!= null"> 
+					 and openid = #{openid}
+					 </if> 
+					<if test="alipayUserId!= null"> 
+					 and alipayUserId = #{alipayUserId}
+					 </if> 
+					<if test="comsumeMoney!= null"> 
+					 and comsumeMoney = #{comsumeMoney}
+					 </if> 
+					<if test="profitMoney!= null"> 
+					 and profitMoney = #{profitMoney}
+					 </if> 
+					<if test="orderNumber!= null">
+					 and orderNumber = #{orderNumber}
+					 </if> 
+					 <if test="totalRechargeFee!= null"> 
+					 	and totalRechargeFee = #{totalRechargeFee}
+					 </if> 
+					 <if test="usableRechargeFee!= null"> 
+					 	and usableRechargeFee = #{usableRechargeFee}
+					 </if> 
+					 <if test="totalGiveFee!= null"> 
+					 	and totalGiveFee = #{totalGiveFee}
+					 </if> 
+					 <if test="usableGiveFee!= null"> 
+					 	and usableGiveFee = #{usableGiveFee}
+					 </if> 
+					 <if test="cardNo!= null"> 
+                        and cardNo = #{cardNo}
+                     </if> 
+                     <if test="birthdayDt!= null"> 
+                        and birthdayDt = #{birthdayDt}
+                     </if> 
+                      <if test="memberName!= null"> 
+                        and memberName = #{memberName}
+                     </if> 
+                     <if test="provinces!= null"> 
+                        and provinces = #{provinces}
+                     </if> 
+                     <if test="sex!= null"> 
+                        and sex = #{sex}
+                     </if> 
+                     <if test="bindingUrl!= null"> 
+                        and bindingUrl = #{bindingUrl}
+                     </if>
+					 <if test="startTime!= null"> 
+					 	and createDt &gt;= #{startTime}
+					 </if> 
+					 <if test="endTime != null">
+					 	and createDt &lt;= #{endTime}
+					 </if>
+				</where>
+		</select>
+		
+		<select id="queryMerchantMemberBill" resultType="java.lang.Double">
+		  select round(sum(orderFee),2) from tb_pluss_member_order
+		  <where>
+		      <if test="rechargeType">
+                  and rechargeType=#{rechargeType}
+              </if>
+		      <if test="orderType">
+		          and orderType=#{orderType}
+		      </if>
+		      <if test="merchantCode">
+		           and merchantCode=#{merchantCode}
+		      </if>
+		       <if test="startTime!= null"> 
+                         <![CDATA[
+                            and  DATE_FORMAT(createDt, '%Y-%m-%d %H:%i:%S')>=DATE_FORMAT(#{startTime}, '%Y-%m-%d %H:%i:%S')
+                         ]]>
+                     </if> 
+                    <if test="endTime!= null"> 
+                         <![CDATA[
+                            and  DATE_FORMAT(createDt, '%Y-%m-%d %H:%i:%S')<=DATE_FORMAT(#{endTime}, '%Y-%m-%d %H:%i:%S')
+                         ]]>
+                     </if> 
+                     and orderStatus='1'
+		  </where>
+		</select>
+		
+		<select id="queryMerchantGiveMoney" resultType="java.lang.Double">
+		  select round(sum(totalGiveFee),2) from tb_pluss_merchant_menber
+		  where merchantCode=#{merchantCode}
+		</select>
+
+	<select id="manageQueryMerchantNoMenberPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+		SELECT count(*) from tb_pluss_merchant_menber mm LEFT JOIN tb_pluss_merchant_base_info mbi on mbi.merchantCode =
+		mm.merchantCode
+		<where>
+			<if test="id!= null">
+				and mm.id = #{id}
+			</if>
+			<if test="userId != null">
+				and mbi.userId = #{userId}
+			</if>
+			<if test="alias!= null">
+				and mbi.alias like concat('%',#{alias},'%')
+			</if>
+			<if test="merchantCode!= null">
+				and mm.merchantCode = #{merchantCode}
+			</if>
+			<if test="merchantName!= null">
+				and mm.merchantName = #{merchantName}
+			</if>
+			<if test="storeId!= null">
+				and mm.storeId = #{storeId}
+			</if>
+			<if test="storeName!= null">
+				and mm.storeName = #{storeName}
+			</if>
+			<if test="status!= null">
+				and mm.status = #{status}
+			</if>
+			<if test="createDt!= null">
+				and mm.createDt = #{createDt}
+			</if>
+			<if test="logo!= null">
+				and mm.logo = #{logo}
+			</if>
+			<if test="memberCode!= null">
+				and mm.memberCode in (SELECT merchantCode
+				FROM tb_pluss_merchant_base_info
+				WHERE bindingCode =(SELECT bindingCode
+				FROM tb_pluss_merchant_base_info
+				where merchantCode = #{merchantCode}))
+			</if>
+			<if test="nickName!= null">
+				and mm.nickName like CONCAT("%",#{nickName},"%")
+			</if>
+			<if test="nickName== null">
+				and mm.nickName !='null'
+			</if>
+			<if test="phone!= null">
+				and mm.phone like CONCAT("%",#{phone},"%")
+			</if>
+			<if test="openid!= null">
+				and mm.openid = #{openid}
+			</if>
+			<if test="alipayUserId!= null">
+				and mm.alipayUserId = #{alipayUserId}
+			</if>
+			<if test="comsumeMoney!= null">
+				and mm.comsumeMoney = #{comsumeMoney}
+			</if>
+			<if test="profitMoney!= null">
+				and mm.profitMoney = #{profitMoney}
+			</if>
+			<if test="orderNumber!= null">
+				and mm.orderNumber = #{orderNumber}
+			</if>
+			<if test="totalRechargeFee!= null">
+				and mm.totalRechargeFee = #{totalRechargeFee}
+			</if>
+			<if test="usableRechargeFee!= null">
+				and mm.usableRechargeFee = #{usableRechargeFee}
+			</if>
+			<if test="totalGiveFee!= null">
+				and mm.totalGiveFee = #{totalGiveFee}
+			</if>
+			<if test="usableGiveFee!= null">
+				and mm.usableGiveFee = #{usableGiveFee}
+			</if>
+			<if test="cardNo!= null">
+				and mm.cardNo = #{cardNo}
+			</if>
+			<if test="birthdayDt!= null">
+				and mm.birthdayDt = #{birthdayDt}
+			</if>
+			<if test="memberName!= null">
+				and mm.memberName Like CONCAT('%',#{memberName},'%')
+			</if>
+			<if test="provinces!= null">
+				and mm.provinces = #{provinces}
+			</if>
+			<if test="sex!= null">
+				and mm.sex = #{sex}
+			</if>
+			<if test="bindingUrl!= null">
+				and mm.bindingUrl = #{bindingUrl}
+			</if>
+		</where>
+	</select>
+
+
+	<select id="pageJoinData" resultType="cn.pluss.platform.entity.MerchantMenber" parameterType="cn.pluss.platform.entity.MerchantMenber">
+		SELECT
+			ROUND(IFNULL(mm.usableRechargeFee,0.00) + IFNULL(mm.usableGiveFee,0.00),2) AS 'useAmt',
+			mm.storeName,
+			ms.id AS storeId,
+			mi.picUrl as 'storeLogo',
+			mm.phone
+		FROM
+			tb_pluss_merchant_menber mm
+			LEFT JOIN tb_pluss_merchant_store ms
+			on mm.storeId = ms.storeId
+			LEFT JOIN tb_pluss_merchant_image mi
+			ON ms.merchantCode = mi.merchantCode
+		WHERE
+			 mi.photoType = '06'
+		  	<choose>
+				<when test="menber.unionId != null and menber.unionId != ''">
+					and mm.unionId = #{menber.unionId}
+				</when>
+		  		<otherwise>
+					and mm.appOpenId = #{menber.appOpenId}
+				</otherwise>
+			</choose>
+		ORDER BY mm.createDt desc
+	</select>
+
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/MerchantMenberComsume-sqlmap.xml b/pluss-dao-bundle/src/main/resources/mapper/MerchantMenberComsume-sqlmap.xml
new file mode 100644
index 0000000..cd7a2dd
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/MerchantMenberComsume-sqlmap.xml
@@ -0,0 +1,324 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+			"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="cn.pluss.platform.mapper.MerchantMenberComsumeMapper">
+
+	   	<insert id="saveMerchantMenberComsume" parameterType="cn.pluss.platform.entity.MerchantMenberComsume">
+        	insert into tb_pluss_merchant_menber_comsume(merchantCode,merchantName,storeId,storeName,createDt,logo,memberCode,nickName,phone,comsumeMoney,payType,giveMoney,orderNumber)VALUES(#{merchantCode},#{merchantName},#{storeId},#{storeName},#{createDt},#{logo},#{memberCode},#{nickName},#{phone},#{comsumeMoney},#{payType},#{giveMoney},#{orderNumber})
+    	</insert>
+
+	   	<insert id="saveMerchantMenberComsumeBatch">
+        	insert into tb_pluss_merchant_menber_comsume(merchantCode,merchantName,storeId,storeName,createDt,logo,memberCode,nickName,phone,comsumeMoney,payType,giveMoney) VALUES 
+    			<foreach collection="list" item="item" index="index" separator=",">
+			(#{merchantCode},#{merchantName},#{storeId},#{storeName},#{createDt},#{logo},#{memberCode},#{nickName},#{phone},#{comsumeMoney},#{payType},#{giveMoney}		)
+				</foreach>
+    	</insert>
+
+		<select id="queryMerchantMenberComsume" parameterType="cn.pluss.platform.entity.MerchantMenberComsume" resultType="cn.pluss.platform.entity.MerchantMenberComsume">
+			SELECT mc.*,mbi.alias from tb_pluss_merchant_menber_comsume mc LEFT JOIN tb_pluss_merchant_base_info mbi on mbi.merchantCode= mc.merchantCode
+				<where> 
+					<if test="id!= null"> 
+					 	and mc.id = #{id}
+					 </if> 
+					<if test="alias!= null"> 
+					 	and mbi.alias = #{alias}
+					 </if> 
+					<if test="merchantCode!= null"> 
+					 	and mc.merchantCode = #{merchantCode}
+					 </if> 
+					<if test="merchantName!= null"> 
+					 	and mc.merchantName = #{merchantName}
+					 </if> 
+					<if test="storeId!= null"> 
+					 	and mc.storeId = #{storeId}
+					 </if> 
+					<if test="storeName!= null"> 
+					 	and mc.storeName = #{storeName}
+					 </if> 
+					<if test="createDt!= null"> 
+					 	and mc.createDt = #{createDt}
+					 </if> 
+					<if test="logo!= null"> 
+					 	and mc.logo = #{logo}
+					 </if> 
+					<if test="memberCode!= null"> 
+					 	and mc.memberCode = #{memberCode}
+					 </if> 
+					<if test="nickName!= null"> 
+					 	and mc.nickName = #{nickName}
+					 </if> 
+					<if test="phone!= null"> 
+					 	and mc.phone = #{phone}
+					 </if> 
+					<if test="comsumeMoney!= null"> 
+					 	and mc.comsumeMoney = #{comsumeMoney}
+					 </if> 
+					<if test="payType!= null"> 
+					 	and mc.payType = #{payType}
+					 </if> 
+					<if test="giveMoney!= null"> 
+					 	and mc.giveMoney = #{giveMoney}
+					 </if> 
+					<if test="orderNumber!= null"> 
+					 	and mc.orderNumber = #{orderNumber}
+					 </if> 
+				 </where> 
+		</select>
+
+		<select id="queryMerchantMenberComsumeList" parameterType="cn.pluss.platform.entity.MerchantMenberComsume" resultType="cn.pluss.platform.entity.MerchantMenberComsume">
+			SELECT * from tb_pluss_merchant_menber_comsume 
+				<where> 
+					<if test="id!= null"> 
+					 and 	id = #{id}
+					 </if> 
+					<if test="merchantCode!= null"> 
+					 and 	merchantCode = #{merchantCode}
+					 </if> 
+					<if test="merchantName!= null"> 
+					 and 	merchantName = #{merchantName}
+					 </if> 
+					<if test="storeId!= null"> 
+					 and 	storeId = #{storeId}
+					 </if> 
+					<if test="storeName!= null"> 
+					 and 	storeName = #{storeName}
+					 </if> 
+					<if test="createDt!= null"> 
+					 and 	createDt = #{createDt}
+					 </if> 
+					<if test="logo!= null"> 
+					 and 	logo = #{logo}
+					 </if> 
+					<if test="memberCode!= null"> 
+					 and 	memberCode = #{memberCode}
+					 </if> 
+					<if test="nickName!= null"> 
+					 and 	nickName = #{nickName}
+					 </if> 
+					<if test="phone!= null"> 
+					 and 	phone = #{phone}
+					 </if> 
+					<if test="comsumeMoney!= null"> 
+					 and 	comsumeMoney = #{comsumeMoney}
+					 </if> 
+					<if test="payType!= null"> 
+					 and 	payType = #{payType}
+					 </if> 
+					 <if test="giveMoney!= null"> 
+                        and giveMoney = #{giveMoney}
+                     </if> 
+                     <if test="orderNumber!= null"> 
+                        and orderNumber = #{orderNumber}
+                     </if> 
+				 </where> 
+		</select>
+
+		<update id="updateMerchantMenberComsume" parameterType="cn.pluss.platform.entity.MerchantMenberComsume" >
+			update tb_pluss_merchant_menber_comsume 
+				  <set> 
+					<if test="merchantCode!= null"> 
+					 	merchantCode = #{merchantCode},
+					 </if> 
+					<if test="merchantName!= null"> 
+					 	merchantName = #{merchantName},
+					 </if> 
+					<if test="storeId!= null"> 
+					 	storeId = #{storeId},
+					 </if> 
+					<if test="storeName!= null"> 
+					 	storeName = #{storeName},
+					 </if> 
+					<if test="createDt!= null"> 
+					 	createDt = #{createDt},
+					 </if> 
+					<if test="logo!= null"> 
+					 	logo = #{logo},
+					 </if> 
+					<if test="memberCode!= null"> 
+					 	memberCode = #{memberCode},
+					 </if> 
+					<if test="nickName!= null"> 
+					 	nickName = #{nickName},
+					 </if> 
+					<if test="phone!= null"> 
+					 	phone = #{phone},
+					 </if> 
+					<if test="comsumeMoney!= null"> 
+					 	comsumeMoney = #{comsumeMoney},
+					 </if> 
+					<if test="payType!= null"> 
+					 	payType = #{payType},
+					 </if> 
+					 <if test="giveMoney!= null"> 
+                         giveMoney = #{giveMoney}
+                     </if> 
+                      <if test="orderNumber!= null"> 
+                         orderNumber = #{orderNumber}
+                     </if> 
+				</set>
+			where id=#{id} 
+		</update>
+
+		<delete id="deleteMerchantMenberComsume" parameterType="cn.pluss.platform.entity.MerchantMenberComsume" >
+			DELETE FROM tb_pluss_merchant_menber_comsume where id=#{id}
+		</delete>
+
+		<select id="queryMerchantMenberComsumePage" parameterType="java.util.Map" resultType="cn.pluss.platform.entity.MerchantMenberComsume">
+			SELECT mc.*,mbi.alias from tb_pluss_merchant_menber_comsume mc LEFT JOIN tb_pluss_merchant_base_info mbi on mbi.merchantCode= mc.merchantCode
+				<where> 
+					<if test="id!= null"> 
+					and mc.id = #{id}
+					 </if> 
+					<if test="alias!= null"> 
+					and mbi.alias LIKE concat("%", #{alias},"%")
+					 </if> 
+					<if test="merchantCode!= null"> 
+					and mc.merchantCode = #{merchantCode}
+					 </if> 
+					<if test="merchantName!= null"> 
+					and mc.merchantName = #{merchantName}
+					 </if> 
+					<if test="storeId!= null"> 
+					and mc.storeId = #{storeId}
+					 </if> 
+					<if test="storeName!= null"> 
+					and mc.storeName = #{storeName}
+					 </if> 
+					<if test="createDt!= null"> 
+					and mc.createDt = #{createDt}
+					 </if> 
+					<if test="logo!= null"> 
+					and mc.logo = #{logo}
+					 </if> 
+					<if test="memberCode!= null"> 
+					and mc.memberCode = #{memberCode}
+					 </if> 
+					<if test="nickName!= null"> 
+					and mc.nickName like CONCAT("%",#{nickName},"%")
+					 </if> 
+					<if test="phone!= null"> 
+					and mc.phone like CONCAT("%",#{phone},"%")
+					 </if> 
+					<if test="comsumeMoney!= null"> 
+					and mc.comsumeMoney = #{comsumeMoney}
+					 </if> 
+					<if test="payType!= null"> 
+					and mc.payType = #{payType}
+					 </if> 
+					 <if test="giveMoney!= null"> 
+                        and mc.giveMoney = #{giveMoney}
+                     </if>
+                      <if test="orderNumber!= null"> 
+                        and mc.orderNumber = #{orderNumber}
+                     </if>  
+				 </where> 
+			order by id desc  limit #{pageSize}  offset  #{offset}  
+		</select>
+		
+		
+		<!-- 根据时间查询消费金额 -->
+		<select id="queryMerchantMenberComsumeByTime" parameterType="java.util.Map" resultType="cn.pluss.platform.entity.MerchantMenberComsume">
+			SELECT Sum(comsumeMoney) from tb_pluss_merchant_menber_comsume 
+				<where> 
+					<if test="id!= null"> 
+					and id = #{id}
+					 </if> 
+					<if test="merchantCode!= null"> 
+					and merchantCode = #{merchantCode}
+					 </if> 
+					<if test="merchantName!= null"> 
+					and merchantName = #{merchantName}
+					 </if> 
+					<if test="storeId!= null"> 
+					and storeId = #{storeId}
+					 </if> 
+					<if test="storeName!= null"> 
+					and storeName = #{storeName}
+					 </if> 
+					<if test="createDt!= null"> 
+					and createDt = #{createDt}
+					 </if> 
+					<if test="logo!= null"> 
+					and logo = #{logo}
+					 </if> 
+					<if test="memberCode!= null"> 
+					and memberCode = #{memberCode}
+					 </if> 
+					  <if test="orderNumber!= null"> 
+                        and orderNumber = #{orderNumber}
+                     </if>  
+					<if test="nickName!= null"> 
+					and nickName like CONCAT("%",#{nickName},"%")
+					 </if> 
+					<if test="phone!= null"> 
+					and phone like CONCAT("%",#{phone},"%")
+					 </if> 
+					<if test="comsumeMoney!= null"> 
+					and comsumeMoney = #{comsumeMoney}
+					 </if> 
+					<if test="payType!= null"> 
+					and payType = #{payType}
+					 </if>
+					 <if test="giveMoney!= null"> 
+                        and giveMoney = #{giveMoney}
+                     </if>  
+					 <if test="startTime!= null"> 
+					and createDt &gt;= #{startTime}
+					 </if> 
+				 </where> 
+ 					and	createDt &lt;= #{endTime}
+		</select>
+
+		<select id="queryMerchantMenberComsumePageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+			SELECT count(*) from tb_pluss_merchant_menber_comsume mc LEFT JOIN tb_pluss_merchant_base_info mbi on mbi.merchantCode= mc.merchantCode
+					<where> 
+					<if test="id!= null"> 
+                    and mc.id = #{id}
+                     </if> 
+                    <if test="alias!= null"> 
+                    and mbi.alias concat("%", #{alias},"%")
+                     </if> 
+                    <if test="merchantCode!= null"> 
+                    and mc.merchantCode = #{merchantCode}
+                     </if> 
+                    <if test="merchantName!= null"> 
+                    and mc.merchantName = #{merchantName}
+                     </if> 
+                    <if test="storeId!= null"> 
+                    and mc.storeId = #{storeId}
+                     </if> 
+                    <if test="storeName!= null"> 
+                    and mc.storeName = #{storeName}
+                     </if> 
+                    <if test="createDt!= null"> 
+                    and mc.createDt = #{createDt}
+                     </if> 
+                    <if test="logo!= null"> 
+                    and mc.logo = #{logo}
+                     </if> 
+                    <if test="memberCode!= null"> 
+                    and mc.memberCode = #{memberCode}
+                     </if> 
+                    <if test="nickName!= null"> 
+                    and mc.nickName like CONCAT("%",#{nickName},"%")
+                     </if> 
+                    <if test="phone!= null"> 
+                    and mc.phone like CONCAT("%",#{phone},"%")
+                     </if> 
+                    <if test="comsumeMoney!= null"> 
+                    and mc.comsumeMoney = #{comsumeMoney}
+                     </if> 
+                    <if test="payType!= null"> 
+                    and mc.payType = #{payType}
+                     </if> 
+                     <if test="giveMoney!= null"> 
+                        and mc.giveMoney = #{giveMoney}
+                     </if>
+                      <if test="orderNumber!= null"> 
+                        and mc.orderNumber = #{orderNumber}
+                     </if>   
+				</where>
+		</select>
+
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/MerchantMenberRecharge-sqlmap.xml b/pluss-dao-bundle/src/main/resources/mapper/MerchantMenberRecharge-sqlmap.xml
new file mode 100644
index 0000000..5e759c0
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/MerchantMenberRecharge-sqlmap.xml
@@ -0,0 +1,327 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+			"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="cn.pluss.platform.mapper.MerchantMenberRechargeMapper">
+
+	   	<insert id="saveMerchantMenberRecharge" parameterType="cn.pluss.platform.entity.MerchantMenberRecharge">
+        	insert into tb_pluss_merchant_menber_recharge(merchantCode,merchantName,storeId,storeName,createDt,logo,memberCode,nickName,phone,rechargeMoney,giveMoney,payType,orderNumber)VALUES(#{merchantCode},#{merchantName},#{storeId},#{storeName},#{createDt},#{logo},#{memberCode},#{nickName},#{phone},#{rechargeMoney},#{giveMoney},#{payType},#{orderNumber})
+    	</insert>
+
+	   	<insert id="saveMerchantMenberRechargeBatch">
+        	insert into tb_pluss_merchant_menber_recharge(merchantCode,merchantName,storeId,storeName,createDt,logo,memberCode,nickName,phone,rechargeMoney,giveMoney,payType) VALUES 
+    			<foreach collection="list" item="item" index="index" separator=",">
+			(#{merchantCode},#{merchantName},#{storeId},#{storeName},#{createDt},#{logo},#{memberCode},#{nickName},#{phone},#{rechargeMoney},#{giveMoney},#{payType}		)
+				</foreach>
+    	</insert>
+
+		<select id="queryMerchantMenberRecharge" parameterType="cn.pluss.platform.entity.MerchantMenberRecharge" resultType="cn.pluss.platform.entity.MerchantMenberRecharge">
+			SELECT * from tb_pluss_merchant_menber_recharge 
+				<where> 
+					<if test="id!= null"> 
+					 	and id = #{id}
+					 </if> 
+					<if test="merchantCode!= null"> 
+					 	and merchantCode = #{merchantCode}
+					 </if> 
+					<if test="merchantName!= null"> 
+					 	and merchantName = #{merchantName}
+					 </if> 
+					<if test="storeId!= null"> 
+					 	and storeId = #{storeId}
+					 </if> 
+					<if test="storeName!= null"> 
+					 	and storeName = #{storeName}
+					 </if> 
+					<if test="createDt!= null"> 
+					 	and createDt = #{createDt}
+					 </if> 
+					<if test="logo!= null"> 
+					 	and logo = #{logo}
+					 </if> 
+					<if test="memberCode!= null"> 
+					 	and memberCode = #{memberCode}
+					 </if> 
+					<if test="nickName!= null"> 
+					 	and nickName = #{nickName}
+					 </if> 
+					<if test="phone!= null"> 
+					 	and phone = #{phone}
+					 </if> 
+					<if test="rechargeMoney!= null"> 
+					 	and rechargeMoney = #{rechargeMoney}
+					 </if> 
+					<if test="giveMoney!= null"> 
+					 	and giveMoney = #{giveMoney}
+					 </if> 
+					<if test="payType!= null"> 
+					 	and payType = #{payType}
+					 </if> 
+					<if test="orderNumber!= null"> 
+					 	and orderNumber = #{orderNumber}
+					 </if> 
+				 </where> 
+		</select>
+
+		<select id="queryMerchantMenberRechargeList" parameterType="cn.pluss.platform.entity.MerchantMenberRecharge" resultType="cn.pluss.platform.entity.MerchantMenberRecharge">
+			SELECT * from tb_pluss_merchant_menber_recharge 
+				<where> 
+					<if test="id!= null"> 
+					 and 	id = #{id}
+					 </if> 
+					<if test="merchantCode!= null"> 
+					 and 	merchantCode = #{merchantCode}
+					 </if> 
+					<if test="merchantName!= null"> 
+					 and 	merchantName = #{merchantName}
+					 </if> 
+					<if test="storeId!= null"> 
+					 and 	storeId = #{storeId}
+					 </if> 
+					<if test="storeName!= null"> 
+					 and 	storeName = #{storeName}
+					 </if> 
+					<if test="createDt!= null"> 
+					 and 	createDt = #{createDt}
+					 </if> 
+					<if test="logo!= null"> 
+					 and 	logo = #{logo}
+					 </if> 
+					<if test="memberCode!= null"> 
+					 and 	memberCode = #{memberCode}
+					 </if> 
+					<if test="nickName!= null"> 
+					 and 	nickName = #{nickName}
+					 </if> 
+					<if test="phone!= null"> 
+					 and 	phone = #{phone}
+					 </if> 
+					<if test="rechargeMoney!= null"> 
+					 and 	rechargeMoney = #{rechargeMoney}
+					 </if> 
+					<if test="giveMoney!= null"> 
+					 and 	giveMoney = #{giveMoney}
+					 </if> 
+					<if test="payType!= null"> 
+					 and 	payType = #{payType}
+					 </if>
+					 <if test="orderNumber!= null"> 
+                        and orderNumber = #{orderNumber}
+                     </if> 
+				 </where> 
+		</select>
+
+		<update id="updateMerchantMenberRecharge" parameterType="cn.pluss.platform.entity.MerchantMenberRecharge" >
+			update tb_pluss_merchant_menber_recharge 
+				  <set> 
+					<if test="merchantCode!= null"> 
+					 	merchantCode = #{merchantCode},
+					 </if> 
+					<if test="merchantName!= null"> 
+					 	merchantName = #{merchantName},
+					 </if> 
+					<if test="storeId!= null"> 
+					 	storeId = #{storeId},
+					 </if> 
+					<if test="storeName!= null"> 
+					 	storeName = #{storeName},
+					 </if> 
+					<if test="createDt!= null"> 
+					 	createDt = #{createDt},
+					 </if> 
+					<if test="logo!= null"> 
+					 	logo = #{logo},
+					 </if> 
+					<if test="memberCode!= null"> 
+					 	memberCode = #{memberCode},
+					 </if> 
+					<if test="nickName!= null"> 
+					 	nickName = #{nickName},
+					 </if> 
+					<if test="phone!= null"> 
+					 	phone = #{phone},
+					 </if> 
+					<if test="rechargeMoney!= null"> 
+					 	rechargeMoney = #{rechargeMoney},
+					 </if> 
+					<if test="giveMoney!= null"> 
+					 	giveMoney = #{giveMoney},
+					 </if> 
+					<if test="payType!= null"> 
+					 	payType = #{payType},
+					 </if> 
+					 <if test="orderNumber!= null"> 
+                         orderNumber = #{orderNumber}
+                     </if>
+				</set>
+			where id=#{id} 
+		</update>
+
+		<delete id="deleteMerchantMenberRecharge" parameterType="cn.pluss.platform.entity.MerchantMenberRecharge" >
+			DELETE FROM tb_pluss_merchant_menber_recharge where id=#{id}
+		</delete>
+
+		<select id="queryMerchantMenberRechargePage" parameterType="java.util.Map" resultType="cn.pluss.platform.entity.MerchantMenberRecharge">
+			SELECT mr.* ,mbi.alias from tb_pluss_merchant_menber_recharge mr LEFT JOIN tb_pluss_merchant_base_info mbi on mbi.merchantCode= mr.merchantCode
+				<where> 
+					<if test="id!= null"> 
+					and mr.id = #{id}
+					 </if> 
+					<if test="alias!= null"> 
+					and mbi.alias = #{alias}
+					 </if> 
+					<if test="merchantCode!= null"> 
+					and mr.merchantCode = #{merchantCode}
+					 </if> 
+					<if test="merchantName!= null"> 
+					and mr.merchantName = #{merchantName}
+					 </if> 
+					<if test="storeId!= null"> 
+					and mr.storeId = #{storeId}
+					 </if> 
+					<if test="storeName!= null"> 
+					and mr.storeName = #{storeName}
+					 </if> 
+					<if test="createDt!= null"> 
+					and mr.createDt = #{createDt}
+					 </if> 
+					<if test="logo!= null"> 
+					and mr.logo = #{logo}
+					 </if> 
+					<if test="memberCode!= null"> 
+					and mr.memberCode = #{memberCode}
+					 </if> 
+					<if test="nickName!= null"> 
+					and mr.nickName = #{nickName}
+					 </if> 
+					<if test="phone!= null"> 
+					and mr.phone = #{phone}
+					 </if> 
+					<if test="rechargeMoney!= null"> 
+					and mr.rechargeMoney = #{rechargeMoney}
+					 </if> 
+					<if test="giveMoney!= null"> 
+					and mr.giveMoney = #{giveMoney}
+					 </if> 
+					<if test="payType!= null"> 
+					and mr.payType = #{payType}
+					 </if> 
+					 <if test="orderNumber!= null"> 
+                        and mr.orderNumber = #{orderNumber}
+                     </if>
+				 </where> 
+			order by id desc  limit #{pageSize}  offset  #{offset}  
+		</select>
+		
+		
+		<!-- 查询今日会员的充值记录 -->
+		<select id="queryMerchantMenberRechargeListByTime" parameterType="java.util.Map" resultType="cn.pluss.platform.entity.MerchantMenberRecharge">
+			SELECT * from tb_pluss_merchant_menber_recharge 
+				<where> 
+					<if test="id!= null"> 
+					and id = #{id}
+					 </if> 
+					<if test="merchantCode!= null"> 
+					and merchantCode = #{merchantCode}
+					 </if> 
+					<if test="merchantName!= null"> 
+					and merchantName = #{merchantName}
+					 </if> 
+					<if test="storeId!= null"> 
+					and storeId = #{storeId}
+					 </if> 
+					<if test="storeName!= null"> 
+					and storeName = #{storeName}
+					 </if> 
+					<if test="createDt!= null"> 
+					and createDt = #{createDt}
+					 </if> 
+					<if test="logo!= null"> 
+					and logo = #{logo}
+					 </if> 
+					<if test="memberCode!= null"> 
+					and memberCode = #{memberCode}
+					 </if> 
+					<if test="nickName!= null"> 
+					and nickName = #{nickName}
+					 </if> 
+					<if test="phone!= null"> 
+					and phone = #{phone}
+					 </if> 
+					<if test="rechargeMoney!= null"> 
+					and rechargeMoney = #{rechargeMoney}
+					 </if> 
+					<if test="giveMoney!= null"> 
+					and giveMoney = #{giveMoney}
+					 </if> 
+					<if test="payType!= null"> 
+					and payType = #{payType}
+					 </if> 
+					 <if test="orderNumber!= null"> 
+                        and orderNumber = #{orderNumber}
+                     </if>
+                     <if test="startTime!= null"> 
+                         <![CDATA[
+                            and  DATE_FORMAT(createDt, '%Y-%m-%d %H:%i:%S')>=DATE_FORMAT(#{startTime}, '%Y-%m-%d %H:%i:%S')
+                         ]]>
+                     </if> 
+                    <if test="endTime!= null"> 
+                         <![CDATA[
+                            and  DATE_FORMAT(createDt, '%Y-%m-%d %H:%i:%S')<=DATE_FORMAT(#{endTime}, '%Y-%m-%d %H:%i:%S')
+                         ]]>
+                     </if> 
+				 </where> 
+		</select>
+
+		<select id="queryMerchantMenberRechargePageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+			SELECT count(*) from tb_pluss_merchant_menber_recharge mr LEFT JOIN tb_pluss_merchant_base_info mbi on mbi.merchantCode= mr.merchantCode
+					<where> 
+                    <if test="id!= null"> 
+                    and mr.id = #{id}
+                     </if> 
+                    <if test="alias!= null"> 
+                    and mbi.alias = #{alias}
+                     </if> 
+                    <if test="merchantCode!= null"> 
+                    and mr.merchantCode = #{merchantCode}
+                     </if> 
+                    <if test="merchantName!= null"> 
+                    and mr.merchantName = #{merchantName}
+                     </if> 
+                    <if test="storeId!= null"> 
+                    and mr.storeId = #{storeId}
+                     </if> 
+                    <if test="storeName!= null"> 
+                    and mr.storeName = #{storeName}
+                     </if> 
+                    <if test="createDt!= null"> 
+                    and mr.createDt = #{createDt}
+                     </if> 
+                    <if test="logo!= null"> 
+                    and mr.logo = #{logo}
+                     </if> 
+                    <if test="memberCode!= null"> 
+                    and mr.memberCode = #{memberCode}
+                     </if> 
+                    <if test="nickName!= null"> 
+                    and mr.nickName = #{nickName}
+                     </if> 
+                    <if test="phone!= null"> 
+                    and mr.phone = #{phone}
+                     </if> 
+                    <if test="rechargeMoney!= null"> 
+                    and mr.rechargeMoney = #{rechargeMoney}
+                     </if> 
+                    <if test="giveMoney!= null"> 
+                    and mr.giveMoney = #{giveMoney}
+                     </if> 
+                    <if test="payType!= null"> 
+                    and mr.payType = #{payType}
+                     </if> 
+                     <if test="orderNumber!= null"> 
+                        and mr.orderNumber = #{orderNumber}
+                     </if>
+				</where>
+		</select>
+
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/MerchantMoveRecordsMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/MerchantMoveRecordsMapper.xml
new file mode 100644
index 0000000..53e902c
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/MerchantMoveRecordsMapper.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.MerchantMoveRecordsMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.MerchantMoveRecords">
+        <id column="id" property="id" />
+        <result column="merchantCode" property="merchantCode" />
+        <result column="merchantName" property="merchantName" />
+        <result column="startTime" property="startTime" />
+        <result column="endTime" property="endTime" />
+        <result column="token" property="token" />
+        <result column="createTime" property="createTime" />
+        <result column="ip" property="ip" />
+        <result column="payUserId" property="payUserId" />
+        <result column="payNum" property="payNum" />
+        <result column="paySource" property="paySource" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/MerchantMoveSettingMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/MerchantMoveSettingMapper.xml
new file mode 100644
index 0000000..41fe6f4
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/MerchantMoveSettingMapper.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.MerchantMoveSettingMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.MerchantMoveSetting">
+        <id column="id" property="id" />
+        <result column="merchantCode" property="merchantCode" />
+        <result column="merchantName" property="merchantName" />
+        <result column="qr_num" property="qrNum" />
+        <result column="pay_num" property="payNum" />
+        <result column="aesKey" property="aesKey" />
+        <result column="status" property="status" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/MerchantOrder-sqlmap.xml b/pluss-dao-bundle/src/main/resources/mapper/MerchantOrder-sqlmap.xml
new file mode 100644
index 0000000..cef66f6
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/MerchantOrder-sqlmap.xml
@@ -0,0 +1,2984 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="cn.pluss.platform.mapper.MerchantOrderMapper">
+
+    <insert id="saveMerchantOrderBatch">
+        insert into
+        tb_pluss_merchant_order(orderNumber,merchantCode,merchantName,payTypeCode,payTypeName,consumeFee,transNo,memberCode,storeId,storeName,createDt,staffCode,status,rate,marketAmt)
+        VALUES
+        <foreach collection="list" item="item" index="index"
+                 separator=",">
+            (#{orderNumber},#{merchantCode},#{merchantName},#{payTypeCode},#{payTypeName},#{consumeFee},#{transNo},#{memberCode},#{storeId},#{storeName},#{createDt},#{staffCode},#{status},#{rate},#{marketAmt}
+            )
+        </foreach>
+    </insert>
+
+    <select id="queryMerchantOrder"
+            parameterType="cn.pluss.platform.entity.MerchantOrder"
+            resultType="cn.pluss.platform.entity.MerchantOrder">
+        SELECT * from tb_pluss_merchant_order
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="orderNumber!= null">
+                and orderNumber = #{orderNumber}
+            </if>
+            <if test="merchantCode!= null">
+                and merchantCode = #{merchantCode}
+            </if>
+            <if test="merchantName!= null">
+                and merchantName = #{merchantName}
+            </if>
+            <if test="payTypeCode!= null">
+                and payTypeCode = #{payTypeCode}
+            </if>
+            <if test="payTypeName!= null">
+                and payTypeName = #{payTypeName}
+            </if>
+            <if test="consumeFee!= null">
+                and consumeFee = #{consumeFee}
+            </if>
+            <if test="transNo!= null">
+                and transNo = #{transNo}
+            </if>
+            <if test="memberCode!= null">
+                and memberCode = #{memberCode}
+            </if>
+            <if test="storeId!= null">
+                and storeId = #{storeId}
+            </if>
+            <if test="storeName!= null">
+                and storeName = #{storeName}
+            </if>
+            <if test="createDt!= null">
+                and createDt = #{createDt}
+            </if>
+            <if test="staffCode!= null">
+                and staffCode = #{staffCode}
+            </if>
+            <if test="status!= null">
+                and status = #{status}
+            </if>
+
+            <if test="enterFee!= null">
+                and enterFee = #{enterFee}
+            </if>
+            <if test="aisleSwitch!= null">
+                and aisleSwitch = #{aisleSwitch}
+            </if>
+            <if test="leshuaMerchantRefundId!= null">
+                and leshuaMerchantRefundId = #{leshuaMerchantRefundId}
+            </if>
+            <if test="leshuaTransNo!= null">
+                and leshuaTransNo = #{leshuaTransNo}
+            </if>
+            <if test="orderType!= null">
+                and orderType = #{orderType}
+            </if>
+            <if test="promoteruserId!= null">
+                and promoteruserId = #{promoteruserId}
+            </if>
+            <if test="userImg!= null">
+                and userImg = #{userImg}
+            </if>
+            <if test="nickName!= null">
+                and nickName = #{nickName}
+            </if>
+            <if test="remark!= null">
+                and remark = #{remark}
+            </if>
+            <if test="transDt!= null">
+                and transDt = #{transDt}
+            </if>
+            <if test="staffName!= null">
+                and staffName = #{staffName}
+            </if>
+            <if test="settlementType!= null">
+                and settlementType = #{settlementType}
+            </if>
+        </where>
+    </select>
+
+
+    <select id="getToDayTransSum1" parameterType="java.util.Map" resultType="java.lang.Double">
+        SELECT sum(consumeFee) from tb_pluss_merchant_order
+        <where>
+
+            <if test="merchantCode!= null">
+                and merchantCode = #{merchantCode}
+            </if>
+
+            <if test="consumeFee!= null">
+                and consumeFee = #{consumeFee}
+            </if>
+
+            <if test="createDt!= null">
+                and createDt = #{createDt}
+            </if>
+
+            <if test="status!= null">
+                and status = #{status}
+            </if>
+
+            <if test="endTime != null">
+                and createDt <![CDATA[<=]]> #{endTime}
+            </if>
+            <if test="transDt!= null">
+                and transDt = #{transDt}
+            </if>
+            <if test="staffName!= null">
+                and staffName = #{staffName}
+            </if>
+            <if test="stTime!= null">
+                and transDt <![CDATA[>=]]> #{stTime}
+            </if>
+            <if test="endTime!= null">
+                and transDt <![CDATA[<=]]> #{endTime}
+            </if>
+        </where>
+    </select>
+
+    <select id="toDayTransZfbSum" parameterType="java.util.Map" resultType="java.lang.Double">
+        SELECT sum(consumeFee) from tb_pluss_merchant_order
+        <where>
+
+            <if test="merchantCode!= null">
+                and merchantCode = #{merchantCode}
+            </if>
+
+            <if test="consumeFee!= null">
+                and consumeFee = #{consumeFee}
+            </if>
+
+            <if test="createDt!= null">
+                and createDt = #{createDt}
+            </if>
+
+            <if test="status!= null">
+                and status = #{status}
+            </if>
+
+            <if test="endTime != null">
+                and createDt &lt;= #{endTime}
+            </if>
+            <if test="transDt!= null">
+                and transDt = #{transDt}
+            </if>
+            <if test="staffName!= null">
+                and staffName = #{staffName}
+            </if>
+            <if test="stTime!= null">
+                and transDt  <![CDATA[>=]]> #{stTime}
+            </if>
+            <if test="endTime!= null">
+                and transDt <![CDATA[<=]]> #{endTime}
+            </if>
+            and (payTypeCode='leshuaPay0' or payTypeCode= 'aliPay' or payTypeCode='sxfPay0')
+        </where>
+    </select>
+
+    <select id="toDayTransWxSum" parameterType="java.util.Map" resultType="java.lang.Double">
+        SELECT sum(consumeFee) from tb_pluss_merchant_order
+        <where>
+
+            <if test="merchantCode!= null">
+                and merchantCode = #{merchantCode}
+            </if>
+
+            <if test="consumeFee!= null">
+                and consumeFee = #{consumeFee}
+            </if>
+
+            <if test="createDt!= null">
+                and createDt = #{createDt}
+            </if>
+
+            <if test="status!= null">
+                and status = #{status}
+            </if>
+
+            <if test="endTime != null">
+                and createDt &lt;= #{endTime}
+            </if>
+            <if test="transDt!= null">
+                and transDt = #{transDt}
+            </if>
+            <if test="staffName!= null">
+                and staffName = #{staffName}
+            </if>
+            <if test="stTime!= null">
+                and transDt  <![CDATA[>=]]> #{stTime}
+            </if>
+            <if test="endTime!= null">
+                and transDt <![CDATA[<=]]> #{endTime}
+            </if>
+            and (payTypeCode='leshuaPay1' or payTypeCode= 'wechatPay' or payTypeCode='sxfPay1')
+        </where>
+
+    </select>
+
+    <select id="toDayTransYsfSum" parameterType="java.util.Map" resultType="java.lang.Double">
+        SELECT sum(consumeFee) from tb_pluss_merchant_order
+        <where>
+            <if test="merchantCode!= null">
+                and merchantCode = #{merchantCode}
+            </if>
+
+            <if test="consumeFee!= null">
+                and consumeFee = #{consumeFee}
+            </if>
+
+            <if test="createDt!= null">
+                and createDt = #{createDt}
+            </if>
+
+            <if test="status!= null">
+                and status = #{status}
+            </if>
+
+            <if test="endTime != null">
+                and createDt &lt;= #{endTime}
+            </if>
+            <if test="transDt!= null">
+                and transDt = #{transDt}
+            </if>
+            <if test="staffName!= null">
+                and staffName = #{staffName}
+            </if>
+            <if test="stTime!= null">
+                and transDt  <![CDATA[>=]]> #{stTime}
+            </if>
+            <if test="endTime!= null">
+                and transDt <![CDATA[<=]]> #{endTime}
+            </if>
+            and payTypeCode='sxfPay2'
+        </where>
+    </select>
+
+
+    <select id="queryMerchantOrderList"
+            parameterType="cn.pluss.platform.entity.MerchantOrder"
+            resultType="cn.pluss.platform.entity.MerchantOrder">
+        SELECT * from tb_pluss_merchant_order
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="orderNumber!= null">
+                and orderNumber = #{orderNumber}
+            </if>
+            <if test="merchantCode!= null">
+                and merchantCode = #{merchantCode}
+            </if>
+            <if test="merchantName!= null">
+                and merchantName = #{merchantName}
+            </if>
+            <if test="payTypeCode!= null">
+                and payTypeCode = #{payTypeCode}
+            </if>
+            <if test="payTypeName!= null">
+                and payTypeName = #{payTypeName}
+            </if>
+            <if test="consumeFee!= null">
+                and consumeFee = #{consumeFee}
+            </if>
+            <if test="transNo!= null">
+                and transNo = #{transNo}
+            </if>
+            <if test="memberCode!= null">
+                and memberCode = #{memberCode}
+            </if>
+            <if test="storeId!= null">
+                and storeId = #{storeId}
+            </if>
+            <if test="storeName!= null">
+                and storeName = #{storeName}
+            </if>
+            <if test="createDt!= null">
+                and createDt = #{createDt}
+            </if>
+            <if test="staffCode!= null">
+                and staffCode = #{staffCode}
+            </if>
+            <if test="status!= null">
+                and status = #{status}
+            </if>
+
+            <if test="aliPayTransNo!= null">
+                and thirdTransNo = #{aliPayTransNo}
+            </if>
+            <if test="enterFee!= null">
+                and enterFee = #{enterFee}
+            </if>
+            <if test="weChatTransNo!= null">
+                and thirdTransNo = #{weChatTransNo}
+            </if>
+            <if test="aisleSwitch!= null">
+                and aisleSwitch = #{aisleSwitch}
+            </if>
+            <if test="leshuaTransNo!= null">
+                and thirdTransNo = #{leshuaTransNo}
+            </if>
+            <if test="orderType!= null">
+                and orderType = #{orderType}
+            </if>
+            <if test="userImg!= null">
+                and userImg = #{userImg}
+            </if>
+            <if test="nickName!= null">
+                and nickName = #{nickName}
+            </if>
+            <if test="remark!= null">
+                and remark = #{remark}
+            </if>
+            <if test="transDt!= null">
+                and transDt = #{transDt}
+            </if>
+            <if test="staffName!= null">
+                and staffName = #{staffName}
+            </if>
+            <if test="settlementType!= null">
+                and settlementType = #{settlementType}
+            </if>
+
+        </where>
+    </select>
+
+    <select id="getOrderFeeSum1" parameterType="java.util.Map" resultType="java.lang.Double">
+        SELECT sum(consumeFee) from tb_pluss_merchant_order
+        <where>
+            <if test="merchantCode!= null and merchantCode!='' ">
+                and merchantCode = #{merchantCode}
+            </if>
+            <if test="status!= null">
+                and status = #{status}
+            </if>
+        </where>
+    </select>
+
+    <select id="queryMerchantOrderPage"
+            parameterType="java.util.Map"
+            resultType="cn.pluss.platform.entity.MerchantOrder">
+        SELECT * from tb_pluss_merchant_order
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="orderNumber!= null">
+                and orderNumber like CONCAT("%",#{orderNumber},"%")
+            </if>
+            <if test="merchantCode!= null">
+                and merchantCode = #{merchantCode}
+            </if>
+            <if test="merchantName!= null">
+                and merchantName like CONCAT("%",#{merchantName},"%")
+            </if>
+            <if test="payTypeCode!= null">
+                and payTypeCode = #{payTypeCode}
+            </if>
+            <if test="payTypeName!= null">
+                and payTypeName = #{payTypeName}
+            </if>
+            <if test="consumeFee!= null">
+                and consumeFee = #{consumeFee}
+            </if>
+            <if test="transNo!= null">
+                and transNo like CONCAT("%",#{transNo},"%")
+            </if>
+            <if test="memberCode!= null">
+                and memberCode like CONCAT("%",#{memberCode},"%")
+            </if>
+            <if test="storeId!= null">
+                and storeId = #{storeId}
+            </if>
+            <if test="storeName!= null">
+                and storeName like CONCAT("%",#{storeName},"%")
+            </if>
+            <if test="createDt!= null">
+                and createDt = #{createDt}
+            </if>
+            <if test="staffCode!= null">
+                and staffCode = #{staffCode}
+            </if>
+            <if test="status!= null">
+                and status = #{status}
+            </if>
+            <if test="aliPayTransNo!= null">
+                and thirdTransNo = #{aliPayTransNo}
+            </if>
+            <if test="enterFee!= null">
+                and enterFee = #{enterFee}
+            </if>
+            <if test="weChatTransNo!= null">
+                and thirdTransNo = #{weChatTransNo}
+            </if>
+            <if test="aisleSwitch!= null">
+                and aisleSwitch = #{aisleSwitch}
+            </if>
+            <if test="leshuaTransNo!= null">
+                and thirdTransNo = #{leshuaTransNo}
+            </if>
+            <if test="orderType!= null">
+                and orderType = #{orderType}
+            </if>
+            <if test="userImg!= null">
+                and userImg = #{userImg}
+            </if>
+            <if test="nickName!= null">
+                and nickName = #{nickName}
+            </if>
+            <if test="startTime != null">
+                and createDt &gt;= #{startTime}
+            </if>
+            <if test="remark!= null">
+                and remark = #{remark}
+            </if>
+            <if test="endTime != null">
+                and createDt &lt;= #{endTime}
+            </if>
+            <if test="transDt!= null">
+                and transDt = #{transDt}
+            </if>
+            <if test="staffName!= null">
+                and staffName = #{staffName}
+            </if>
+            <if test="stTime!= null">
+                and transDt  <![CDATA[>=]]> #{stTime}
+            </if>
+            <if test="endTime!= null">
+                and transDt <![CDATA[<=]]> #{endTime}
+            </if>
+            <if test="settlementType!= null">
+                and settlementType = #{settlementType}
+            </if>
+
+        </where>
+        <!-- order by id desc  limit #{pageSize}  offset  #{offset} -->
+    </select>
+
+    <!--给app 商户推广- 交易明细 接口调用的 -->
+    <select id="queryMerchantOrderPageApp"
+            parameterType="java.util.Map"
+            resultType="cn.pluss.platform.entity.MerchantOrder">
+        SELECT * from tb_pluss_merchant_order
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="orderNumber!= null">
+                and orderNumber = #{orderNumber}
+            </if>
+            <if test="merchantCode!= null">
+                and merchantCode = #{merchantCode}
+            </if>
+            <if test="merchantName!= null">
+                and merchantName = #{merchantName}
+            </if>
+            <if test="payTypeCode!= null">
+                and payTypeCode = #{payTypeCode}
+            </if>
+            <if test="payTypeName!= null">
+                and payTypeName = #{payTypeName}
+            </if>
+            <if test="consumeFee!= null">
+                and consumeFee = #{consumeFee}
+            </if>
+            <if test="transNo!= null">
+                and transNo = #{transNo}
+            </if>
+            <if test="memberCode!= null">
+                and memberCode = #{memberCode}
+            </if>
+            <if test="storeId!= null">
+                and storeId = #{storeId}
+            </if>
+            <if test="storeName!= null">
+                and storeName = #{storeName}
+            </if>
+            <if test="startTime != null">
+                and updateTime &gt;= #{startTime}
+            </if>
+            <if test="endTime!= null">
+                and updateTime &lt;= #{endTime}
+            </if>
+
+            <if test="staffCode!= null">
+                and staffCode = #{staffCode}
+            </if>
+            <if test="status!= null">
+                and status = #{status}
+            </if>
+            <if test="aliPayTransNo!= null">
+                and thirdTransNo = #{aliPayTransNo}
+            </if>
+            <if test="enterFee!= null">
+                and enterFee = #{enterFee}
+            </if>
+            <if test="weChatTransNo!= null">
+                and thirdTransNo = #{weChatTransNo}
+            </if>
+            <if test="aisleSwitch!= null">
+                and aisleSwitch = #{aisleSwitch}
+            </if>
+            <if test="leshuaTransNo!= null">
+                and thirdTransNo = #{leshuaTransNo}
+            </if>
+            <if test="orderType!= null">
+                and orderType = #{orderType}
+            </if>
+            <if test="userImg!= null">
+                and userImg = #{userImg}
+            </if>
+            <if test="nickName!= null">
+                and nickName = #{nickName}
+            </if>
+            <if test="remark!= null">
+                and remark = #{remark}
+            </if>
+            <if test="transDt!= null">
+                and transDt = #{transDt}
+            </if>
+            <if test="staffName!= null">
+                and staffName = #{staffName}
+            </if>
+            <if test="settlementType != null">
+                and settlementType = #{settlementType}
+            </if>
+            <if test="merchantCodeList!= null">
+                and merchantCode in
+                <foreach item="item" index="index" collection="merchantCodeList" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+        order by id desc limit #{pageSize} offset #{offset}
+    </select>
+
+    <select id="queryMerchantOrderPageCountApp"
+            parameterType="java.util.Map" resultType="java.lang.Integer">
+        SELECT count(*) from tb_pluss_merchant_order
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="orderNumber!= null">
+                and orderNumber = #{orderNumber}
+            </if>
+            <if test="merchantCode!= null">
+                and merchantCode = #{merchantCode}
+            </if>
+            <if test="merchantName!= null">
+                and merchantName = #{merchantName}
+            </if>
+            <if test="payTypeCode!= null">
+                and payTypeCode = #{payTypeCode}
+            </if>
+            <if test="payTypeName!= null">
+                and payTypeName = #{payTypeName}
+            </if>
+            <if test="consumeFee!= null">
+                and consumeFee = #{consumeFee}
+            </if>
+            <if test="transNo!= null">
+                and transNo = #{transNo}
+            </if>
+            <if test="memberCode!= null">
+                and memberCode = #{memberCode}
+            </if>
+            <if test="storeId!= null">
+                and storeId = #{storeId}
+            </if>
+            <if test="storeName!= null">
+                and storeName = #{storeName}
+            </if>
+            <if test="startTime != null">
+                and updateTime &gt;= #{startTime}
+            </if>
+            <if test="endTime!= null">
+                and updateTime &lt;= #{endTime}
+            </if>
+            <if test="staffCode!= null">
+                and staffCode = #{staffCode}
+            </if>
+            <if test="status!= null">
+                and status = #{status}
+            </if>
+            <if test="aliPayTransNo!= null">
+                and thirdTransNo = #{aliPayTransNo}
+            </if>
+            <if test="weChatTransNo!= null">
+                and thirdTransNo = #{weChatTransNo}
+            </if>
+            <if test="aisleSwitch!= null">
+                and aisleSwitch = #{aisleSwitch}
+            </if>
+            <if test="leshuaTransNo!= null">
+                and thirdTransNo = #{leshuaTransNo}
+            </if>
+            <if test="orderType!= null">
+                and orderType = #{orderType}
+            </if>
+            <if test="userImg!= null">
+                and userImg = #{userImg}
+            </if>
+            <if test="nickName!= null">
+                and nickName = #{nickName}
+            </if>
+            <if test="remark!= null">
+                and remark = #{remark}
+            </if>
+            <if test="transDt!= null">
+                and transDt = #{transDt}
+            </if>
+            <if test="staffName!= null">
+                and staffName = #{staffName}
+            </if>
+            <if test="settlementType!= null">
+                and settlementType = #{settlementType}
+            </if>
+
+            <if test="merchantCodeList!= null">
+                and merchantCode in
+                <foreach item="item" index="index" collection="merchantCodeList" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
+
+
+    <select id="queryMerchantOrderPageCount"
+            parameterType="java.util.Map" resultType="java.lang.Integer">
+        SELECT count(*) from tb_pluss_merchant_order
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="orderNumber!= null">
+                and orderNumber like CONCAT("%",#{orderNumber},"%")
+            </if>
+            <if test="merchantCode!= null">
+                and merchantCode = #{merchantCode}
+            </if>
+            <if test="merchantName!= null">
+                and merchantName = #{merchantName}
+            </if>
+            <if test="payTypeCode!= null">
+                and payTypeCode = #{payTypeCode}
+            </if>
+            <if test="payTypeName!= null">
+                and payTypeName = #{payTypeName}
+            </if>
+            <if test="consumeFee!= null">
+                and consumeFee = #{consumeFee}
+            </if>
+            <if test="transNo!= null">
+                and transNo like CONCAT("%",#{transNo},"%")
+            </if>
+            <if test="memberCode!= null">
+                and memberCode like CONCAT("%",#{memberCode},"%")
+            </if>
+            <if test="storeId!= null">
+                and storeId = #{storeId}
+            </if>
+            <if test="storeName!= null">
+                and storeName like CONCAT("%",#{storeName},"%")
+            </if>
+            <if test="createDt!= null">
+                and createDt = #{createDt}
+            </if>
+
+            <if test="staffCode!= null">
+                and staffCode = #{staffCode}
+            </if>
+            <if test="status!= null">
+                and status = #{status}
+            </if>
+            <if test="aliPayTransNo!= null">
+                and thirdTransNo = #{aliPayTransNo}
+            </if>
+            <if test="enterFee!= null">
+                and enterFee = #{enterFee}
+            </if>
+            <if test="weChatTransNo!= null">
+                and thirdTransNo = #{weChatTransNo}
+            </if>
+            <if test="aisleSwitch!= null">
+                and aisleSwitch = #{aisleSwitch}
+            </if>
+            <if test="leshuaTransNo!= null">
+                and thirdTransNo = #{leshuaTransNo}
+            </if>
+            <if test="orderType!= null">
+                and orderType = #{orderType}
+            </if>
+            <if test="userImg!= null">
+                and userImg = #{userImg}
+            </if>
+            <if test="nickName!= null">
+                and nickName = #{nickName}
+            </if>
+            <if test="remark!= null">
+                and remark = #{remark}
+            </if>
+            <if test="transDt!= null">
+                and transDt = #{transDt}
+            </if>
+            <if test="staffName!= null">
+                and staffName = #{staffName}
+            </if>
+            <if test="stTime!= null">
+                and transDt  <![CDATA[>=]]> #{stTime}
+            </if>
+            <if test="endTime!= null">
+                and transDt <![CDATA[<=]]> #{endTime}
+            </if>
+            <if test="settlementType != null">
+                and settlementType = #{settlementType}
+            </if>
+
+        </where>
+    </select>
+    <!-- 今日支付宝收款笔数 -->
+    <select id="toDayTransZfbCount"
+            parameterType="java.util.Map" resultType="java.lang.Integer">
+        SELECT count(*) from tb_pluss_merchant_order
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="orderNumber!= null">
+                and orderNumber like CONCAT("%",#{orderNumber},"%")
+            </if>
+            <if test="merchantCode!= null">
+                and merchantCode = #{merchantCode}
+            </if>
+            <if test="merchantName!= null">
+                and merchantName = #{merchantName}
+            </if>
+            <if test="payTypeCode!= null">
+                and payTypeCode = #{payTypeCode}
+            </if>
+            <if test="payTypeName!= null">
+                and payTypeName = #{payTypeName}
+            </if>
+            <if test="consumeFee!= null">
+                and consumeFee = #{consumeFee}
+            </if>
+            <if test="transNo!= null">
+                and transNo like CONCAT("%",#{transNo},"%")
+            </if>
+            <if test="memberCode!= null">
+                and memberCode like CONCAT("%",#{memberCode},"%")
+            </if>
+            <if test="storeId!= null">
+                and storeId = #{storeId}
+            </if>
+            <if test="storeName!= null">
+                and storeName like CONCAT("%",#{storeName},"%")
+            </if>
+            <if test="createDt!= null">
+                and createDt = #{createDt}
+            </if>
+
+            <if test="staffCode!= null">
+                and staffCode = #{staffCode}
+            </if>
+            <if test="status!= null">
+                and status = #{status}
+            </if>
+            <if test="aliPayTransNo!= null">
+                and thirdTransNo = #{aliPayTransNo}
+            </if>
+            <if test="enterFee!= null">
+                and enterFee = #{enterFee}
+            </if>
+            <if test="weChatTransNo!= null">
+                and thirdTransNo = #{weChatTransNo}
+            </if>
+            <if test="aisleSwitch!= null">
+                and aisleSwitch = #{aisleSwitch}
+            </if>
+            <if test="leshuaTransNo!= null">
+                and thirdTransNo = #{leshuaTransNo}
+            </if>
+            <if test="orderType!= null">
+                and orderType = #{orderType}
+            </if>
+            <if test="userImg!= null">
+                and userImg = #{userImg}
+            </if>
+            <if test="nickName!= null">
+                and nickName = #{nickName}
+            </if>
+            <if test="remark!= null">
+                and remark = #{remark}
+            </if>
+            <if test="transDt!= null">
+                and transDt = #{transDt}
+            </if>
+            <if test="staffName!= null">
+                and staffName = #{staffName}
+            </if>
+            <if test="stTime!= null">
+                and transDt  <![CDATA[>=]]> #{stTime}
+            </if>
+            <if test="endTime!= null">
+                and transDt <![CDATA[<=]]> #{endTime}
+            </if>
+            and (payTypeCode='leshuaPay0' or payTypeCode= 'aliPay' or payTypeCode='sxfPay0')
+        </where>
+
+    </select>
+
+    <!-- 今日微信收款笔数 -->
+    <select id="toDayTransWxCount"
+            parameterType="java.util.Map" resultType="java.lang.Integer">
+        SELECT count(*) from tb_pluss_merchant_order
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="orderNumber!= null">
+                and orderNumber like CONCAT("%",#{orderNumber},"%")
+            </if>
+            <if test="merchantCode!= null">
+                and merchantCode = #{merchantCode}
+            </if>
+            <if test="merchantName!= null">
+                and merchantName = #{merchantName}
+            </if>
+            <if test="payTypeCode!= null">
+                and payTypeCode = #{payTypeCode}
+            </if>
+            <if test="payTypeName!= null">
+                and payTypeName = #{payTypeName}
+            </if>
+            <if test="consumeFee!= null">
+                and consumeFee = #{consumeFee}
+            </if>
+            <if test="transNo!= null">
+                and transNo like CONCAT("%",#{transNo},"%")
+            </if>
+            <if test="memberCode!= null">
+                and memberCode like CONCAT("%",#{memberCode},"%")
+            </if>
+            <if test="storeId!= null">
+                and storeId = #{storeId}
+            </if>
+            <if test="storeName!= null">
+                and storeName like CONCAT("%",#{storeName},"%")
+            </if>
+            <if test="createDt!= null">
+                and createDt = #{createDt}
+            </if>
+
+            <if test="staffCode!= null">
+                and staffCode = #{staffCode}
+            </if>
+            <if test="status!= null">
+                and status = #{status}
+            </if>
+            <if test="aliPayTransNo!= null">
+                and thirdTransNo = #{aliPayTransNo}
+            </if>
+            <if test="enterFee!= null">
+                and enterFee = #{enterFee}
+            </if>
+            <if test="weChatTransNo!= null">
+                and thirdTransNo = #{weChatTransNo}
+            </if>
+            <if test="aisleSwitch!= null">
+                and aisleSwitch = #{aisleSwitch}
+            </if>
+            <if test="leshuaTransNo!= null">
+                and thirdTransNo = #{leshuaTransNo}
+            </if>
+            <if test="orderType!= null">
+                and orderType = #{orderType}
+            </if>
+            <if test="userImg!= null">
+                and userImg = #{userImg}
+            </if>
+            <if test="nickName!= null">
+                and nickName = #{nickName}
+            </if>
+            <if test="remark!= null">
+                and remark = #{remark}
+            </if>
+            <if test="transDt!= null">
+                and transDt = #{transDt}
+            </if>
+            <if test="staffName!= null">
+                and staffName = #{staffName}
+            </if>
+            <if test="stTime!= null">
+                and transDt  <![CDATA[>=]]> #{stTime}
+            </if>
+            <if test="endTime!= null">
+                and transDt <![CDATA[<=]]> #{endTime}
+            </if>
+            and (payTypeCode='leshuaPay1' or payTypeCode= 'wechatPay' or payTypeCode='sxfPay1')
+        </where>
+    </select>
+
+    <select id="toDayTransYsfCount"
+            parameterType="java.util.Map" resultType="java.lang.Integer">
+        SELECT count(*) from tb_pluss_merchant_order
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="orderNumber!= null">
+                and orderNumber like CONCAT("%",#{orderNumber},"%")
+            </if>
+            <if test="merchantCode!= null">
+                and merchantCode = #{merchantCode}
+            </if>
+            <if test="merchantName!= null">
+                and merchantName = #{merchantName}
+            </if>
+            <if test="payTypeCode!= null">
+                and payTypeCode = #{payTypeCode}
+            </if>
+            <if test="payTypeName!= null">
+                and payTypeName = #{payTypeName}
+            </if>
+            <if test="consumeFee!= null">
+                and consumeFee = #{consumeFee}
+            </if>
+            <if test="transNo!= null">
+                and transNo like CONCAT("%",#{transNo},"%")
+            </if>
+            <if test="memberCode!= null">
+                and memberCode like CONCAT("%",#{memberCode},"%")
+            </if>
+            <if test="storeId!= null">
+                and storeId = #{storeId}
+            </if>
+            <if test="storeName!= null">
+                and storeName like CONCAT("%",#{storeName},"%")
+            </if>
+            <if test="createDt!= null">
+                and createDt = #{createDt}
+            </if>
+
+            <if test="staffCode!= null">
+                and staffCode = #{staffCode}
+            </if>
+            <if test="status!= null">
+                and status = #{status}
+            </if>
+            <if test="aliPayTransNo!= null">
+                and thirdTransNo = #{aliPayTransNo}
+            </if>
+            <if test="enterFee!= null">
+                and enterFee = #{enterFee}
+            </if>
+            <if test="weChatTransNo!= null">
+                and thirdTransNo = #{weChatTransNo}
+            </if>
+            <if test="aisleSwitch!= null">
+                and aisleSwitch = #{aisleSwitch}
+            </if>
+            <if test="leshuaTransNo!= null">
+                and thirdTransNo = #{leshuaTransNo}
+            </if>
+            <if test="orderType!= null">
+                and orderType = #{orderType}
+            </if>
+            <if test="userImg!= null">
+                and userImg = #{userImg}
+            </if>
+            <if test="nickName!= null">
+                and nickName = #{nickName}
+            </if>
+            <if test="remark!= null">
+                and remark = #{remark}
+            </if>
+            <if test="transDt!= null">
+                and transDt = #{transDt}
+            </if>
+            <if test="staffName!= null">
+                and staffName = #{staffName}
+            </if>
+            <if test="stTime!= null">
+                and transDt  <![CDATA[>=]]> #{stTime}
+            </if>
+            <if test="endTime!= null">
+                and transDt <![CDATA[<=]]> #{endTime}
+            </if>
+            and payTypeCode='sxfPay2'
+        </where>
+    </select>
+
+    <!-- 可提现总金额（提现规则 超过一个月的时间） -->
+    <select id="sumMerchantAllowCashMoney"
+            resultType="java.lang.Double">
+        select sum(shareMoney)
+        from tb_pluss_merchant_order
+        where memberCode = #{memberCode}
+          and createDt &lt;= (SELECT DATE_ADD(now(), INTERVAL -1 MONTH))
+    </select>
+
+    <!--不可提现金额 （为超过一个月 不可提现） -->
+    <select id="sumMerchantNotAllowCashMoney"
+            resultType="java.lang.Double">
+        select sum(shareMoney)
+        from tb_pluss_merchant_order
+        where memberCode = #{memberCode}
+          and createDt &gt; (SELECT DATE_ADD(now(), INTERVAL -1 MONTH))
+    </select>
+
+    <!-- 今日推广分润 -->
+    <select id="sumNowDayShareMoney" resultType="java.lang.Double">
+        select sum(shareMoney)
+        from tb_pluss_merchant_order
+        where memberCode = #{memberCode}
+          and date (createDt) = curdate()
+    </select>
+
+    <!-- 累计推广分润 -->
+    <select id="sumAllShareMoney" resultType="java.lang.Double">
+        select sum(shareMoney)
+        from tb_pluss_merchant_order
+        where memberCode = #{memberCode}
+    </select>
+
+    <select id="queryMerchantOrderPageCountByTime"
+            parameterType="java.util.Map" resultType="java.lang.Integer">
+        SELECT count(*) from tb_pluss_merchant_order
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="orderNumber!= null">
+                and orderNumber = #{orderNumber}
+            </if>
+            <if test="merchantCode!= null">
+                and merchantCode = #{merchantCode}
+            </if>
+            <if test="merchantName!= null">
+                and merchantName = #{merchantName}
+            </if>
+            <if test="payTypeCode!= null">
+                and payTypeCode = #{payTypeCode}
+            </if>
+            <if test="payTypeName!= null">
+                and payTypeName = #{payTypeName}
+            </if>
+            <if test="consumeFee!= null">
+                and consumeFee = #{consumeFee}
+            </if>
+            <if test="transNo!= null">
+                and transNo = #{transNo}
+            </if>
+            <if test="memberCode!= null">
+                and memberCode = #{memberCode}
+            </if>
+            <if test="storeCode!= null">
+                and storeId = #{storeCode}
+            </if>
+            <if test="storeId!= null">
+                and
+                (
+                <foreach collection="storeId" item="item" index="index"
+                         separator="or">
+                    storeId = #{item}
+                </foreach>
+                )
+            </if>
+            <if test="storeName!= null">
+                and storeName = #{storeName}
+            </if>
+            <if test="staffCode!= null">
+                and
+                (
+                <foreach collection="staffCode" item="item" index="index"
+                         separator="or">
+                    staffCode = #{item}
+                </foreach>
+                )
+            </if>
+            <if test="status!= null">
+                and status = #{status}
+            </if>
+            <if test="aisleSwitch!= null">
+                and aisleSwitch = #{aisleSwitch}
+            </if>
+            <if test="leshuaMerchantRefundId!= null">
+                and leshuaMerchantRefundId = #{leshuaMerchantRefundId}
+            </if>
+            <if test="leshuaTransNo!= null">
+                and leshuaTransNo = #{leshuaTransNo}
+            </if>
+            <if test="orderType!= null">
+                and orderType = #{orderType}
+            </if>
+            <if test="promoteruserId!= null">
+                and promoteruserId = #{promoteruserId}
+            </if>
+            <if test="startTime != null">
+                and updateTime &gt;= #{startTime}
+            </if>
+            <if test="endTime != null">
+                and updateTime &lt;= #{endTime}
+            </if>
+            <if test="userImg!= null">
+                and userImg = #{userImg}
+            </if>
+            <if test="nickName!= null">
+                and nickName = #{nickName}
+            </if>
+            <if test="remark!= null">
+                and remark = #{remark}
+            </if>
+            <if test="transDt!= null">
+                and transDt = #{transDt}
+            </if>
+            <if test="staffName!= null">
+                and staffName = #{staffName}
+            </if>
+            <if test="settlementType != null">
+                and settlementType = #{settlementType}
+            </if>
+
+            <if test="payTypeCodeList!= null">
+                and (
+                <foreach collection="payTypeCodeList" item="item" index="index" separator="or">
+                    payTypeCode = #{item}
+                </foreach>
+                )
+            </if>
+            <if test="merchantCodeList!= null">
+                and merchantCode in
+                <foreach collection="merchantCodeList" item="item" open="(" close=")" index="index" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+
+    </select>
+
+    <select id="queryMerchantOrdeFeeByTime"
+            parameterType="java.util.Map" resultType="java.lang.Double">
+        SELECT sum(consumeFee) from tb_pluss_merchant_order t
+        <where>
+            ( SELECT count( 1 ) FROM tb_pluss_merchant_order t1 WHERE t1.orderNumber = t.orderNumber AND t1.status IN
+            (1, 2) ) = 1
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="orderNumber!= null">
+                and orderNumber = #{orderNumber}
+            </if>
+            <if test="merchantCode!= null">
+                and merchantCode = #{merchantCode}
+            </if>
+            <if test="merchantName!= null">
+                and merchantName = #{merchantName}
+            </if>
+            <if test="payTypeCode!= null">
+                and payTypeCode = #{payTypeCode}
+            </if>
+            <if test="payTypeName!= null">
+                and payTypeName = #{payTypeName}
+            </if>
+            <if test="consumeFee!= null">
+                and consumeFee = #{consumeFee}
+            </if>
+            <if test="transNo!= null">
+                and transNo = #{transNo}
+            </if>
+            <if test="memberCode!= null">
+                and memberCode = #{memberCode}
+            </if>
+            <if test="storeCode!= null">
+                and storeId = #{storeCode}
+            </if>
+            <if test="storeId!= null">
+                and (
+                <foreach collection="storeId" item="item" index="index"
+                         separator="or">
+                    storeId = #{item}
+                </foreach>
+                )
+            </if>
+            <if test="storeName!= null">
+                and storeName = #{storeName}
+            </if>
+            <if test="staffCode!= null">
+                and (
+                <foreach collection="staffCode" item="item" index="index"
+                         separator="or">
+                    staffCode = #{item}
+                </foreach>
+                )
+            </if>
+            <if test="status!= null">
+                and status = #{status}
+            </if>
+            <if test="aisleSwitch!= null">
+                and aisleSwitch = #{aisleSwitch}
+            </if>
+            <if test="leshuaMerchantRefundId!= null">
+                and leshuaMerchantRefundId = #{leshuaMerchantRefundId}
+            </if>
+            <if test="leshuaTransNo!= null">
+                and leshuaTransNo = #{leshuaTransNo}
+            </if>
+            <if test="orderType!= null">
+                and orderType = #{orderType}
+            </if>
+            <if test="promoteruserId!= null">
+                and promoteruserId = #{promoteruserId}
+            </if>
+            <if test="userImg!= null">
+                and userImg = #{userImg}
+            </if>
+            <if test="nickName!= null">
+                and nickName = #{nickName}
+            </if>
+            <if test="remark!= null">
+                and remark = #{remark}
+            </if>
+            <if test="transDt!= null">
+                and transDt = #{transDt}
+            </if>
+            <if test="staffName!= null">
+                and staffName = #{staffName}
+            </if>
+            <if test="startTime != null">
+                and updateTime &gt;= #{startTime}
+            </if>
+            <if test="endTime!= null">
+                and updateTime &lt;= #{endTime}
+            </if>
+            <if test="payTypeCodeList!= null">
+                and (
+                <foreach collection="payTypeCodeList" item="item" index="index" separator="or">
+                    payTypeCode = #{item}
+                </foreach>
+                )
+            </if>
+            <if test="startDt!= null">
+                and createDt &gt; #{startDt}
+            </if>
+            <if test="endDt!= null">
+                and createDt &lt; #{startDt}
+            </if>
+            <if test="merchantCodeList!= null">
+                and merchantCode in
+                <foreach collection="merchantCodeList" item="item" open="(" close=")" index="index" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
+
+    <select id="queryMerchantOrderPageByTime"
+            parameterType="java.util.Map"
+            resultType="cn.pluss.platform.entity.MerchantOrder">
+        SELECT * from tb_pluss_merchant_order
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="orderNumber!= null">
+                and orderNumber = #{orderNumber}
+            </if>
+            <if test="merchantCode!= null">
+                and merchantCode = #{merchantCode}
+            </if>
+            <if test="merchantName!= null">
+                and merchantName = #{merchantName}
+            </if>
+            <if test="payTypeCodeList!= null">
+                and (
+                <foreach collection="payTypeCodeList" item="item" index="index" separator="or">
+                    payTypeCode = #{item}
+                </foreach>
+                )
+            </if>
+            <if test="consumeFee!= null">
+                and consumeFee = #{consumeFee}
+            </if>
+            <if test="transNo!= null">
+                and transNo = #{transNo}
+            </if>
+            <if test="memberCode!= null">
+                and memberCode = #{memberCode}
+            </if>
+            <if test="storeId!= null">
+                and (
+                <foreach collection="storeId" item="item" index="index"
+                         separator="or">
+                    storeId = #{item}
+                </foreach>
+                )
+            </if>
+            <if test="storeName!= null">
+                and storeName = #{storeName}
+            </if>
+            <if test="staffCode!= null">
+                and (
+                <foreach collection="staffCode" item="item" index="index"
+                         separator="or">
+                    staffCode = #{item}
+                </foreach>
+                )
+            </if>
+            <if test="status!= null">
+                and status = #{status}
+            </if>
+            <if test="startTime != null">
+                and updateTime &gt;= #{startTime}
+            </if>
+            <if test="endTime!= null">
+                and updateTime &lt;= #{endTime}
+            </if>
+            <if test="enterFee!= null">
+                and enterFee = #{enterFee}
+            </if>
+            <if test="aisleSwitch!= null">
+                and aisleSwitch = #{aisleSwitch}
+            </if>
+            <if test="leshuaMerchantRefundId!= null">
+                and leshuaMerchantRefundId = #{leshuaMerchantRefundId}
+            </if>
+            <if test="leshuaTransNo!= null">
+                and leshuaTransNo = #{leshuaTransNo}
+            </if>
+            <if test="orderType!= null">
+                and orderType = #{orderType}
+            </if>
+            <if test="promoteruserId!= null">
+                and promoteruserId = #{promoteruserId}
+            </if>
+            <if test="userImg!= null">
+                and userImg = #{userImg}
+            </if>
+            <if test="nickName!= null">
+                and nickName = #{nickName}
+            </if>
+            <if test="remark!= null">
+                and remark = #{remark}
+            </if>
+            <if test="transDt!= null">
+                and transDt = #{transDt}
+            </if>
+            <if test="staffName!= null">
+                and staffName = #{staffName}
+            </if>
+        </where>
+        order by createDt desc limit #{pageSize} offset #{offset}
+    </select>
+
+    <select id="queryOrderStatistics" parameterType="cn.pluss.platform.entity.MerchantOrder"
+            resultType="cn.pluss.platform.vo.OrderStatisticsVO">
+        select count(1) orderCount,sum(t.consumeFee)
+        orderFee,date_format(t.createDt,'%Y-%m-%d') orderDate
+        from
+        tb_pluss_merchant_order t
+
+        <where>
+            t.status='1'
+            <if test="merchantCode!=null and merchantCode!=''">
+                and merchantCode=#{merchantCode}
+            </if>
+        </where>
+        group by date_format(t.createDt,'%Y-%m-%d')
+        order by orderDate DESC
+        limit 7
+    </select>
+
+    <select id="queryPayTypeStatistics" parameterType="cn.pluss.platform.entity.MerchantOrder"
+            resultType="cn.pluss.platform.vo.PayTypeStatisticsVO">
+        select count(1) orderCount,sum(t.consumeFee)
+        orderFee,t.payTypeName
+        payTypeName
+        from tb_pluss_merchant_order t
+        <where>
+            t.status=1
+            <if test="merchantCode!=null and merchantCode!=''">
+                and merchantCode=#{merchantCode}
+            </if>
+        </where>
+        group by payTypeName
+    </select>
+
+    <!--汇总流水 -->
+    <select id="querySummaryOfWater" parameterType="java.util.Map"
+            resultType="cn.pluss.platform.vo.SummaryOfWaterVO">
+        select sum(case when t.status=1 then 1 end) as dealCount,
+        sum(case when
+        t.status=1 then consumeFee end) as dealSum,
+        sum(case when t.status=2
+        then consumeFee end) as actualMoney,
+        count(t.id) as 'refundCount' ,
+        SUM(t.consumeFee) as 'netRefund',
+        sum(t.shareMoney) as 'shareMoney'
+        from tb_pluss_merchant_order t
+        <where>
+            <if test="payTypeCodeList!=null">
+                AND (
+                <foreach collection="payTypeCodeList" item="payTypeCode"
+                         index="index" separator="or">
+                    t.payTypeCode=#{payTypeCode}
+                </foreach>
+                )
+            </if>
+            <if test="storeIdList!=null">
+                AND (
+                <foreach collection="storeIdList" item="storeId"
+                         index="index" separator="or">
+                    t.storeId=#{storeId}
+                </foreach>
+                )
+            </if>
+            <if test="staffCodeList!=null">
+                AND (
+                <foreach collection="staffCodeList" item="staffCode"
+                         index="index" separator="or">
+                    t.staffCode=#{staffCode}
+                </foreach>
+                )
+            </if>
+            <!--今天 -->
+            <if test="timeStatus!=null and timeStatus=='1'">
+                and date(t.createDt) = curdate()
+            </if>
+            <!-- 昨天 -->
+            <if test="timeStatus!=null and timeStatus=='2'">
+                and date(t.createDt) = date_sub(curdate(),interval 1 day)
+            </if>
+            <!-- 七天内 -->
+            <if test="time!=NULL and timeStatus=='3'">
+                <![CDATA[
+		       and  DATEDIFF(t.createDt,NOW())<=0 AND DATEDIFF(t.createDt,NOW())>-7
+		       ]]>
+            </if>
+            <!-- 30天内 -->
+            <if test="time!=NULL and timeStatus=='4'">
+                <![CDATA[
+               and  DATEDIFF(t.createDt,NOW())<=0 AND DATEDIFF(t.createDt,NOW())>-30
+               ]]>
+            </if>
+            <!--近三个月 -->
+            <if test="time!=NULL and timeStatus=='5'">
+                <![CDATA[
+               and  DATEDIFF(t.createDt,NOW())<=0 AND DATEDIFF(t.createDt,NOW())>-90
+               ]]>
+            </if>
+            <if test="merchantCode!=null">
+                and t.merchantCode=#{merchantCode}
+            </if>
+        </where>
+    </select>
+
+    <!-- 订单退款信息 -->
+    <select id="queryMerchantOrderRefundPage"
+            parameterType="java.util.Map"
+            resultType="cn.pluss.platform.entity.MerchantOrder">
+        SELECT mo.* ,mbi.alias from tb_pluss_merchant_order mo LEFT JOIN tb_pluss_merchant_base_info mbi on
+        mbi.merchantCode = mo.merchantCode
+        <where>
+            <if test="payTypeCodeList!=null">
+                AND (
+                <foreach collection="payTypeCodeList" item="payTypeCode"
+                         index="index" separator="or">
+                    mo.payTypeCode=#{payTypeCode}
+                </foreach>
+                )
+            </if>
+            <if test="storeIdList!=null">
+                AND (
+                <foreach collection="storeIdList" item="storeId"
+                         index="index" separator="or">
+                    mo.storeId=#{storeId}
+                </foreach>
+                )
+            </if>
+            <if test="status!=null and status!=''">
+                and mo.status=#{status}
+            </if>
+            <if test="staffCodeList!=null">
+                AND (
+                <foreach collection="staffCodeList" item="staffCode"
+                         index="index" separator="or">
+                    mo.staffCode=#{staffCode}
+                </foreach>
+                )
+            </if>
+            <if test="orderNumber!=null">
+                AND mo.orderNumber=#{orderNumber}
+            </if>
+            <if test="orderType!=null">
+                AND mo.orderType=#{orderType}
+            </if>
+            <if test="consumeFee!=null">
+                AND mo.consumeFee=#{consumeFee}
+            </if>
+            <if test="merchantCode!=null">
+                AND mo.merchantCode=#{merchantCode}
+            </if>
+            <if test="aisleSwitch!= null">
+                and mo.aisleSwitch = #{aisleSwitch}
+            </if>
+            <if test="leshuaMerchantRefundId!= null">
+                and mo.leshuaMerchantRefundId = #{leshuaMerchantRefundId}
+            </if>
+            <if test="promoteruserId!= null">
+                and mo.promoteruserId = #{promoteruserId}
+            </if>
+            <!--今天 -->
+            <if test="timeStatus=='1'.toString()">
+                and date(createDt) = curdate()
+            </if>
+            <!-- 昨天 -->
+            <if test="timeStatus=='2'.toString()">
+                and date(createDt) = date_sub(curdate(),interval 1 day)
+            </if>
+            <!-- 七天内 -->
+            <if test="timeStatus=='3'.toString()">
+                <![CDATA[
+               and  DATEDIFF(createDt,NOW())<=0 AND DATEDIFF(createDt,NOW())>-7
+               ]]>
+            </if>
+            <!-- 30天内 -->
+            <if test="timeStatus=='4'.toString()">
+                <![CDATA[
+               and  DATEDIFF(createDt,NOW())<=0 AND DATEDIFF(createDt,NOW())>-30
+               ]]>
+            </if>
+            <!--近三个月 -->
+            <if test="timeStatus=='5'.toString()">
+                <![CDATA[
+               and  DATEDIFF(createDt,NOW())<=0 AND DATEDIFF(createDt,NOW())>-90
+               ]]>
+            </if>
+        </where>
+        order by id desc
+
+        limit #{pageSize} offset #{offset}
+    </select>
+    <!--订单退款信息统计 -->
+    <select id="queryMerchantOrderRefundPageCount"
+            parameterType="java.util.Map" resultType="java.lang.Integer">
+        SELECT COUNT(*) FROM(SELECT * from tb_pluss_merchant_order
+        <where>
+            <if test="payTypeCodeList!=null">
+                AND (
+                <foreach collection="payTypeCodeList" item="payTypeCode"
+                         index="index" separator="or">
+                    payTypeCode=#{payTypeCode}
+                </foreach>
+                )
+            </if>
+            <if test="status!=null and status!=''">
+                and status=#{status}
+            </if>
+            <if test="storeIdList!=null">
+                AND (
+                <foreach collection="storeIdList" item="storeId"
+                         index="index" separator="or">
+                    storeId=#{storeId}
+                </foreach>
+                )
+            </if>
+            <if test="staffCodeList!=null">
+                AND (
+                <foreach collection="staffCodeList" item="staffCode"
+                         index="index" separator="or">
+                    staffCode=#{staffCode}
+                </foreach>
+                )
+            </if>
+            <if test="orderNumber!=null">
+                AND orderNumber=#{orderNumber}
+            </if>
+            <if test="orderType!=null">
+                AND orderType=#{orderType}
+            </if>
+            <if test="consumeFee!=null">
+                AND consumeFee=#{consumeFee}
+            </if>
+            <if test="merchantCode!=null">
+                AND merchantCode=#{merchantCode}
+            </if>
+            <if test="aisleSwitch!= null">
+                and aisleSwitch = #{aisleSwitch}
+            </if>
+            <if test="leshuaMerchantRefundId!= null">
+                and leshuaMerchantRefundId = #{leshuaMerchantRefundId}
+            </if>
+            <if test="orderType!= null">
+                and orderType = #{orderType}
+            </if>
+            <if test="promoteruserId!= null">
+                and promoteruserId = #{promoteruserId}
+            </if>
+            <!--今天 -->
+            <if test="timeStatus=='1'.toString()">
+                and date(createDt) = curdate()
+            </if>
+            <!-- 昨天 -->
+            <if test="timeStatus=='2'.toString()">
+                and date(createDt) = date_sub(curdate(),interval 1 day)
+            </if>
+            <!-- 七天内 -->
+            <if test="timeStatus=='3'.toString()">
+                <![CDATA[
+               and  DATEDIFF(createDt,NOW())<=0 AND DATEDIFF(createDt,NOW())>-7
+               ]]>
+            </if>
+            <!-- 30天内 -->
+            <if test="timeStatus=='4'.toString()">
+                <![CDATA[
+               and  DATEDIFF(createDt,NOW())<=0 AND DATEDIFF(createDt,NOW())>-30
+               ]]>
+            </if>
+            <!--近三个月 -->
+            <if test="timeStatus=='5'.toString()">
+                <![CDATA[
+               and  DATEDIFF(createDt,NOW())<=0 AND DATEDIFF(createDt,NOW())>-90
+               ]]>
+            </if>
+        </where>
+        )ORER
+    </select>
+
+    <select id="queryMerchantOrderShareMoney"
+            parameterType="java.util.Map" resultType="java.lang.Double">
+        SELECT sum(shareMoney) from tb_pluss_merchant_order
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="orderNumber!= null">
+                and orderNumber = #{orderNumber}
+            </if>
+            <if test="merchantCode!= null">
+                and merchantCode = #{merchantCode}
+            </if>
+            <if test="merchantName!= null">
+                and merchantName = #{merchantName}
+            </if>
+            <if test="payTypeCode!= null">
+                and payTypeCode = #{payTypeCode}
+            </if>
+            <if test="payTypeName!= null">
+                and payTypeName = #{payTypeName}
+            </if>
+            <if test="consumeFee!= null">
+                and consumeFee = #{consumeFee}
+            </if>
+            <if test="transNo!= null">
+                and transNo = #{transNo}
+            </if>
+            <if test="memberCode!= null">
+                and memberCode = #{memberCode}
+            </if>
+            <if test="storeName!= null">
+                and storeName = #{storeName}
+            </if>
+            <if test="status!= null">
+                and status = #{status}
+            </if>
+            <if test="aisleSwitch!= null">
+                and aisleSwitch = #{aisleSwitch}
+            </if>
+            <if test="leshuaMerchantRefundId!= null">
+                and leshuaMerchantRefundId = #{leshuaMerchantRefundId}
+            </if>
+            <if test="leshuaMerchantRefundId!= null">
+                and leshuaMerchantRefundId = #{leshuaMerchantRefundId}
+            </if>
+            <if test="orderType!= null">
+                and orderType = #{orderType}
+            </if>
+            <if test="promoteruserId!= null">
+                and promoteruserId = #{promoteruserId}
+            </if>
+            <if test="userImg!= null">
+                and userImg = #{userImg}
+            </if>
+            <if test="nickName!= null">
+                and nickName = #{nickName}
+            </if>
+            <if test="startTime != null">
+                and updateTime &gt;= #{startTime}
+            </if>
+            <if test="endTime!= null">
+                and updateTime &lt;= #{endTime}
+            </if>
+            <if test="remark!= null">
+                and remark = #{remark}
+            </if>
+            <if test="transDt!= null">
+                and transDt = #{transDt}
+            </if>
+            <if test="staffName!= null">
+                and staffName = #{staffName}
+            </if>
+
+        </where>
+    </select>
+
+    <!--给wap端的定时任务使用的 暂定查3天内状态为5待支付的订单 -->
+    <select id="queryOrderTask"
+            parameterType="cn.pluss.platform.entity.MerchantOrder"
+            resultType="cn.pluss.platform.entity.MerchantOrder">
+        select * from tb_pluss_merchant_order where status=#{status}
+        <if test="startTime != null">
+            and updateTime &gt;= #{startTime}
+        </if>
+        <if test="endTime!= null">
+            and updateTime &lt;= #{endTime}
+        </if>
+    </select>
+
+    <select id="queryMerchantOrderEnterFeeByTime"
+            parameterType="java.util.Map" resultType="java.lang.Double">
+        SELECT sum(enterFee) from tb_pluss_merchant_order
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="orderNumber!= null">
+                and orderNumber = #{orderNumber}
+            </if>
+            <if test="merchantCode!= null">
+                and merchantCode = #{merchantCode}
+            </if>
+            <if test="merchantName!= null">
+                and merchantName = #{merchantName}
+            </if>
+            <if test="payTypeCode!= null">
+                and payTypeCode = #{payTypeCode}
+            </if>
+            <if test="payTypeName!= null">
+                and payTypeName = #{payTypeName}
+            </if>
+            <if test="consumeFee!= null">
+                and consumeFee = #{consumeFee}
+            </if>
+            <if test="transNo!= null">
+                and transNo = #{transNo}
+            </if>
+            <if test="memberCode!= null">
+                and memberCode = #{memberCode}
+            </if>
+            <if test="storeId!= null">
+                and (
+                <foreach collection="storeId" item="item" index="index"
+                         separator="or">
+                    storeId = #{item}
+                </foreach>
+                )
+            </if>
+            <if test="storeName!= null">
+                and storeName = #{storeName}
+            </if>
+            <if test="staffCode!= null">
+                and (
+                <foreach collection="staffCode" item="item" index="index"
+                         separator="or">
+                    staffCode = #{item}
+                </foreach>
+                )
+            </if>
+            <if test="status!= null">
+                and status = #{status}
+            </if>
+            <if test="aisleSwitch!= null">
+                and aisleSwitch = #{aisleSwitch}
+            </if>
+            <if test="leshuaMerchantRefundId!= null">
+                and leshuaMerchantRefundId = #{leshuaMerchantRefundId}
+            </if>
+            <if test="leshuaTransNo!= null">
+                and leshuaTransNo = #{leshuaTransNo}
+            </if>
+            <if test="orderType!= null">
+                and orderType = #{orderType}
+            </if>
+            <if test="promoteruserId!= null">
+                and promoteruserId = #{promoteruserId}
+            </if>
+            <if test="userImg!= null">
+                and userImg = #{userImg}
+            </if>
+            <if test="nickName!= null">
+                and nickName = #{nickName}
+            </if>
+            <if test="remark!= null">
+                and remark = #{remark}
+            </if>
+            <if test="transDt!= null">
+                and transDt = #{transDt}
+            </if>
+            <if test="staffName!= null">
+                and staffName = #{staffName}
+            </if>
+            <if test="startTime != null">
+                and updateTime &gt;= #{startTime}
+            </if>
+            <if test="endTime!= null">
+                and updateTime &lt;= #{endTime}
+            </if>
+        </where>
+    </select>
+
+
+    <!-- 根据时间查询商户的分润金额 -->
+    <select id="queryMerchantOrderShareMoneyByTime"
+            parameterType="java.util.Map" resultType="java.lang.Double">
+        SELECT sum(shareMoney) from tb_pluss_merchant_order
+        <where>
+            <if test="startTime != null">
+                and updateTime &gt; #{startTime}
+            </if>
+            <if test="endTime!= null">
+                and updateTime &lt; #{endTime}
+            </if>
+            <if test="childList!= null">
+                and merchantCode in
+                <foreach collection="childList" item="item" open="("
+                         close=")" index="index" separator=",">
+                    #{item.merchantCode}
+                </foreach>
+            </if>
+            <if test="status!= null">
+                and status = #{status}
+            </if>
+            <if test="aisleSwitch!= null">
+                and aisleSwitch = #{aisleSwitch}
+            </if>
+            <if test="leshuaMerchantRefundId!= null">
+                and leshuaMerchantRefundId = #{leshuaMerchantRefundId}
+            </if>
+            <if test="leshuaTransNo!= null">
+                and leshuaTransNo = #{leshuaTransNo}
+            </if>
+            <if test="orderType!= null">
+                and orderType = #{orderType}
+            </if>
+        </where>
+    </select>
+
+    <select id="queryMerchantOrderPageShuju"
+            parameterType="java.util.Map"
+            resultType="cn.pluss.platform.vo.MerchantMangeOrderVO">
+        SELECT
+        mo.id,
+        mo.`status`,
+        mo.createDt,
+        mo.transDt,
+        mo.merchantCode,
+        mo.thirdTransNo,
+        mo.transNo,
+        mo.orderNumber,
+        mo.merchantName,
+        mo.orderType,
+        mo.payTypeName,
+        mo.payTypeCode,
+        mo.consumeFee,
+        mo.ip,
+        mo.ipAddress,
+        mo.mercOrderNo,
+        mo.drType,
+        mo.mercFee,
+        mo.enterFee,
+        mo.rate as mercRate,
+        mo.profitShareMoney,
+        mo.fansShareMoney,
+        mo.marketAmt,
+        mo.channelFee,
+        IF(mo.settlementType = 0,mo.consumeFee - mo.enterFee - mo.mercFee ,0) AS cashFee,
+        IFNULL(mo.channelRate,21) AS aisleRate,
+        IF(mo.`status` = 1 , IF(mo.orderType = 8 , mo.consumeFee,mo.consumeFee - mo.enterFee - mo.channelFee),0) as platformRevenue,
+        IF(mo.`status` = 1 , ((mo.consumeFee - mo.profitShareMoney - mo.fansShareMoney - mo.enterFee - channelFee) - ((mo.consumeFee - mo.enterFee - mo.mercFee) * 0.2)),0) as practical
+        FROM
+        tb_pluss_merchant_order mo
+        <where>
+            <if test="alias!=null and alias!=''">
+                and mo.merchantName = #{alias}
+            </if>
+            <if test="id!=null and id!=''">
+                and mo.id=#{id}
+            </if>
+            <if test="orderType!=null and orderType!=''">
+                and mo.orderType=#{orderType}
+            </if>
+            <if test="payTypeCode != null and payTypeCode !=''">
+                and
+                (
+                <foreach collection="payTypeCode" index="index" item="item" separator="or">
+                    mo.payTypeCode = #{item}
+                </foreach>
+                )
+            </if>
+            <if test="orderNumber!=null and orderNumber!=''">
+                and (mo.orderNumber=#{orderNumber} or mo.transNo = #{orderNumber} or mo.thirdTransNo = #{orderNumber})
+            </if>
+            <if test="merchantName!=null and merchantName!=''">
+                and mo.merchantName like CONCAT("%",#{merchantName},"%")
+            </if>
+            <if test="merchantCode!=null and merchantCode!=''">
+                and mo.merchantCode=#{merchantCode}
+            </if>
+            <if test="storeName!=null and storeName!=''">
+                and mo.storename like CONCAT("%",#{storeName},"%")
+            </if>
+            <if test="payTypeName!=null and payTypeName!=''">
+                and mo.payTypeName=#{payTypeName}
+            </if>
+            <if test="status!=null and status!=''">
+                and mo.status=#{status}
+            </if>
+            <if test="settlementType != null and  settlementType != '' or 0 == settlementType ">
+                and mo.settlementType=#{settlementType}
+            </if>
+            <if test="aisleSwitch != null and  aisleSwitch != ''">
+                and mo.aisleSwitch=#{aisleSwitch}
+            </if>
+            <if test="startTime!= null and startTime!=''">
+                <![CDATA[
+                            and  DATE_FORMAT(mo.updateTime, '%Y-%m-%d %H:%i:%S')>=DATE_FORMAT(#{startTime}, '%Y-%m-%d %H:%i:%S')
+                         ]]>
+            </if>
+            <if test="endTime!= null and endTime!=''">
+                <![CDATA[
+                            and  DATE_FORMAT(mo.updateTime, '%Y-%m-%d %H:%i:%S')<=DATE_FORMAT(#{endTime}, '%Y-%m-%d %H:%i:%S')
+                         ]]>
+            </if>
+        </where>
+        order by createDt desc
+        limit #{pageSize} offset #{offset}
+    </select>
+
+<!--    <select id="queryMerchantOrderNoPageShuju"-->
+<!--            parameterType="java.util.Map"-->
+<!--            resultType="cn.pluss.platform.vo.MerchantMangeOrderVO">-->
+<!--        SELECT-->
+<!--        mo.id,-->
+<!--        mo.orderNumber,-->
+<!--        mbi.alias,-->
+<!--        mo.orderType,-->
+<!--        mo.payTypeName,-->
+<!--        mo.payTypeCode,-->
+<!--        mo.consumeFee,-->
+<!--        mo.enterFee,-->
+<!--        mo.marketAmt,-->
+<!--        IFNULL((SELECT SUM(price) FROM tb_pluss_merchant_profit mp WHERE mo.merchantCode = mp.merchantCode AND-->
+<!--        mp.orderNumber = mo.orderNumber),0.00) AS shareMoney,-->
+<!--        (CASE WHEN mo.orderNumber = pf.orderNumber THEN pf.shareMoney ELSE 0 END) AS fansShareMoney,-->
+<!--        IFNULL(mo.rate, 38) AS merchantRate,-->
+<!--        21 AS aisleRate,-->
+<!--        ROUND( ( CASE WHEN STATUS = '1' THEN consumeFee ELSE 0 END ) *-->
+<!--        IF(locate('SJ000',mo.orderNumber),1,((IFNULL(mo.rate, 38) - 21)/10000)), 2 ) AS platformRevenue,-->
+<!--        ROUND(-->
+<!--        ( ( CASE WHEN STATUS = '1' THEN consumeFee ELSE 0 END ) * IF(locate('SJ000',mo.orderNumber),1,((IFNULL(mo.rate,-->
+<!--        38) - 21)/10000))) - -->
+<!--        IFNULL((SELECT SUM(price) FROM tb_pluss_merchant_profit mp WHERE mo.merchantCode = mp.merchantCode AND-->
+<!--        mp.orderNumber = mo.orderNumber),0.00) - -->
+<!--        ( CASE WHEN pf.lastMerchantCode is not null THEN pf.shareMoney ELSE 0 END ),2) AS practical,-->
+<!--        ROUND( ( CASE WHEN STATUS = '1' THEN consumeFee ELSE 0 END ) * (IFNULL(mo.rate, 38)/10000), 2 ) AS aisleHold,-->
+<!--        mo.`status`,-->
+<!--        mo.createDt,-->
+<!--        mo.transNo,-->
+<!--        mbi.userId-->
+<!--        FROM-->
+<!--        tb_pluss_merchant_order mo-->
+<!--        LEFT JOIN tb_pluss_merchant_base_info mbi ON mo.merchantCode = mbi.merchantCode-->
+<!--        LEFT JOIN tb_pluss_fans pf ON mo.orderNumber = pf.orderNumber-->
+<!--        <where>-->
+<!--            <if test="alias!=null and alias!=''">-->
+<!--                and mbi.alias like concat("%",#{alias},"%")-->
+<!--            </if>-->
+<!--            <if test="id!=null and id!=''">-->
+<!--                and mo.id=#{id}-->
+<!--            </if>-->
+<!--            <if test="userId != null">-->
+<!--                and mbi.userId = #{userId}-->
+<!--            </if>-->
+<!--            <if test="orderType!=null and orderType!=''">-->
+<!--                and mo.orderType=#{orderType}-->
+<!--            </if>-->
+<!--            <if test="orderNumber!=null and orderNumber!=''">-->
+<!--                and mo.orderNumber=#{orderNumber}-->
+<!--            </if>-->
+<!--            <if test="merchantName!=null and merchantName!=''">-->
+<!--                and mo.merchantName like CONCAT("%",#{merchantName},"%")-->
+<!--            </if>-->
+<!--            <if test="merchantCode!=null and merchantCode!=''">-->
+<!--                and mo.merchantCode IN (SELECT merchantCode-->
+<!--                FROM tb_pluss_merchant_base_info-->
+<!--                WHERE bindingCode = (SELECT bindingCode-->
+<!--                FROM tb_pluss_merchant_base_info-->
+<!--                where merchantCode = #{merchantCode}))-->
+<!--            </if>-->
+<!--            <if test="storeName!=null and storeName!=''">-->
+<!--                and mo.storename like CONCAT("%",#{storeName},"%")-->
+<!--            </if>-->
+<!--            <if test="payTypeName!=null and payTypeName!=''">-->
+<!--                and mo.payTypeName=#{payTypeName}-->
+<!--            </if>-->
+<!--            <if test="status!=null and status!=''">-->
+<!--                and mo.status=#{status}-->
+<!--            </if>-->
+<!--            <if test="startTime!= null and startTime!=''">-->
+<!--                <![CDATA[-->
+<!--                            and  DATE_FORMAT(mo.createDt, '%Y-%m-%d %H:%i:%S')>=DATE_FORMAT(#{startTime}, '%Y-%m-%d %H:%i:%S')-->
+<!--                         ]]>-->
+<!--            </if>-->
+<!--            <if test="endTime!= null and endTime!=''">-->
+<!--                <![CDATA[-->
+<!--                            and  DATE_FORMAT(mo.createDt, '%Y-%m-%d %H:%i:%S')<=DATE_FORMAT(#{endTime}, '%Y-%m-%d %H:%i:%S')-->
+<!--                         ]]>-->
+<!--            </if>-->
+<!--        </where>-->
+<!--        order by createDt desc-->
+<!--        limit #{pageSize} offset #{offset}-->
+<!--    </select>-->
+
+    <select id="queryMerchantOrderPageCountShuju"
+            parameterType="java.util.Map" resultType="java.lang.Integer">
+        select count(*) from tb_pluss_merchant_order mo
+        <where>
+            <if test="alias != null and alias!=''">
+                and mo.merchantName = #{alias}
+            </if>
+            <if test="id!=null and id!=''">
+                and mo.id=#{id}
+            </if>
+            <if test="orderType!=null and orderType!=''">
+                and mo.orderType=#{orderType}
+            </if>
+            <if test="payTypeCode != null and payTypeCode !=''">
+                and
+                (
+                <foreach collection="payTypeCode" index="index" item="item" separator="or">
+                    mo.payTypeCode = #{item}
+                </foreach>
+                )
+            </if>
+            <if test="orderNumber!=null and orderNumber!=''">
+                and (mo.orderNumber=#{orderNumber} or mo.transNo = #{orderNumber} or mo.thirdTransNo = #{orderNumber})
+            </if>
+            <if test="merchantName!=null and merchantName!=''">
+                and mo.merchantName = #{merchantName}
+            </if>
+            <if test="merchantCode!=null and merchantCode!=''">
+                and mo.merchantCode = #{merchantCode}
+            </if>
+            <if test="storeName!=null and storeName!=''">
+                and mo.storename = #{storeName}
+            </if>
+            <if test="payTypeName!=null and payTypeName!=''">
+                and mo.payTypeName = #{payTypeName}
+            </if>
+            <if test="status!=null and status!=''">
+                and mo.status = #{status}
+            </if>
+            <if test="settlementType != null and  settlementType != '' or 0 == settlementType ">
+                and mo.settlementType = #{settlementType}
+            </if>
+            <if test="aisleSwitch != null and  aisleSwitch != ''">
+                and mo.aisleSwitch = #{aisleSwitch}
+            </if>
+            <if test="startTime!= null and startTime!=''">
+                <![CDATA[
+                            and  DATE_FORMAT(mo.updateTime, '%Y-%m-%d %H:%i:%S')>=DATE_FORMAT(#{startTime}, '%Y-%m-%d %H:%i:%S')
+                         ]]>
+            </if>
+            <if test="endTime!= null and endTime!=''">
+                <![CDATA[
+                            and  DATE_FORMAT(mo.updateTime, '%Y-%m-%d %H:%i:%S')<=DATE_FORMAT(#{endTime}, '%Y-%m-%d %H:%i:%S')
+                         ]]>
+            </if>
+        </where>
+    </select>
+
+<!--    <select id="queryMerchantOrderNoPageCountShuju"-->
+<!--            parameterType="java.util.Map" resultType="java.lang.Integer">-->
+<!--        select count(*) from tb_pluss_merchant_order mo-->
+<!--        <where>-->
+<!--            <if test="id!=null and id!=''">-->
+<!--                and mo.id=#{id}-->
+<!--            </if>-->
+<!--            <if test="alias!=null and alias!=''">-->
+<!--                and mbi.alias like concat("%",#{alias},"%")-->
+<!--            </if>-->
+<!--            <if test="userId != null">-->
+<!--                and mbi.userId = #{userId}-->
+<!--            </if>-->
+<!--            <if test="merchantCode!=null and merchantCode!=''">-->
+<!--                and mo.merchantCode IN (SELECT merchantCode-->
+<!--                FROM tb_pluss_merchant_base_info-->
+<!--                WHERE bindingCode = (SELECT bindingCode-->
+<!--                FROM tb_pluss_merchant_base_info-->
+<!--                where merchantCode = #{merchantCode}))-->
+<!--            </if>-->
+<!--            <if test="orderType!=null and orderType!=''">-->
+<!--                and mo.orderType=#{orderType}-->
+<!--            </if>-->
+<!--            <if test="orderNumber!=null and orderNumber!=''">-->
+<!--                and mo.orderNumber=#{orderNumber}-->
+<!--            </if>-->
+<!--            <if test="merchantName!=null and merchantName!=''">-->
+<!--                and mo.merchantName like CONCAT("%",#{merchantName},"%")-->
+<!--            </if>-->
+<!--            <if test="storeName!=null and storeName!=''">-->
+<!--                and mo.storename like CONCAT("%",#{storeName},"%")-->
+<!--            </if>-->
+<!--            <if test="payTypeName!=null and payTypeName!=''">-->
+<!--                and mo.payTypeName=#{payTypeName}-->
+<!--            </if>-->
+<!--            <if test="status!=null and status!=''">-->
+<!--                and mo.status=#{status}-->
+<!--            </if>-->
+<!--            <if test="startTime != null">-->
+<!--                and updateTime &gt;= #{startTime}-->
+<!--            </if>-->
+<!--            <if test="endTime!= null">-->
+<!--                and updateTime &lt;= #{endTime}-->
+<!--            </if>-->
+<!--        </where>-->
+<!--    </select>-->
+
+    <select id="querySumEarnings" parameterType="java.util.Map"
+            resultType="cn.pluss.platform.vo.MerchantMangeOrderVO">
+        select
+        sum(mo.consumeFee) as consumeFee,sum(IFNULL(mo.fansShareMoney,0.0))
+        as
+        fansShareMoney,sum(mo.enterFee) as enterFee,sum(mo.profitShareMoney) as
+        shareMoney,sum(truncate(mo.consumeFee*(mb.aliRate-0.0038),2))
+        as
+        platformRevenue,sum(truncate((mo.consumeFee*(mb.aliRate-0.0038)-mo.profitShareMoney-IFNULL((select
+        pf.shareMoney from tb_pluss_fans pf where
+        pf.orderNumber=mo.orderNumber),0.0)),2))
+        as practical,sum(truncate(mo.consumeFee*0.0038,2)) as aisleHold FROM
+        tb_pluss_merchant_order mo LEFT JOIN tb_pluss_merchant_base_info mb ON mo.merchantCode=mb.merchantCode WHERE
+        mo.status='1' and mo.payTypeCode='aliPay'
+        <if test="startTime != null">
+            and updateTime &gt;= #{startTime}
+        </if>
+        <if test="endTime!= null">
+            and updateTime &lt;= #{endTime}
+        </if>
+        <if test="merchantCode!=null and merchantCode!=''">
+            and mo.merchantCode=#{merchantCode}
+        </if>
+        union
+
+        select
+        sum(mo.consumeFee) as consumeFee,sum(IFNULL((select pf.shareMoney from tb_pluss_fans pf where
+        pf.lastMerchantCode=mo.merchantCode and pf.orderNumber=mo.orderNumber),0.0))
+        as
+        fansShareMoney,sum(mo.enterFee) as enterFee,sum(mo.shareMoney) as
+        shareMoney,sum(truncate(mo.consumeFee*(mb.wechatRate-0.0038),2)) as
+        platformRevenue,sum(truncate((mo.consumeFee*(mb.wechatRate-0.0038)-mo.profitShareMoney-IFNULL((select
+        pf.shareMoney
+        from tb_pluss_fans pf where pf.orderNumber=mo.orderNumber),0.0)),2))
+        as practical,sum(truncate(mo.consumeFee*0.0038,2)) as aisleHold FROM
+        tb_pluss_merchant_order mo LEFT JOIN tb_pluss_merchant_base_info mb ON mo.merchantCode=mb.merchantCode WHERE
+        mo.status='1' and mo.payTypeCode='wechatPay'
+        <if test="startTime != null">
+            and updateTime &gt;= #{startTime}
+        </if>
+        <if test="endTime != null">
+            and updateTime &lt;= #{endTime}
+        </if>
+        <if test="merchantCode!=null and merchantCode!=''">
+            and mo.merchantCode=#{merchantCode}
+        </if>
+        union
+
+        select
+        sum(mo.consumeFee) as consumeFee,sum(IFNULL((select
+        pf.shareMoney from tb_pluss_fans pf where
+        pf.lastMerchantCode=mo.merchantCode and
+        pf.orderNumber=mo.orderNumber),0.0))
+        as
+        fansShareMoney,sum(mo.enterFee) as enterFee,sum(mo.shareMoney) as
+        shareMoney,sum(truncate(mo.consumeFee*(mo.rate / 10000 - 0.0021),2))
+        as
+        platformRevenue,sum(truncate((mo.consumeFee*(mo.rate / 10000-0.0021)-mo.shareMoney-IFNULL((select
+        pf.shareMoney from tb_pluss_fans pf where
+        pf.orderNumber=mo.orderNumber),0.0)),2))
+        as practical,sum(truncate(mo.consumeFee*0.0021,2)) as aisleHold FROM
+        tb_pluss_merchant_order mo LEFT JOIN tb_pluss_merchant_base_info mb ON mo.merchantCode=mb.merchantCode WHERE
+        mo.status='1' and mo.payTypeCode='leshuaPay0' or mo.payTypeCode='leshuaPay1' or mo.payTypeCode='leshuaPay2'
+        <if test="startTime != null">
+            and updateTime &gt;= #{startTime}
+        </if>
+        <if test="endTime != null">
+            and updateTime &lt;= #{endTime}
+        </if>
+        <if test="merchantCode!=null and merchantCode!=''">
+            and mo.merchantCode=#{merchantCode}
+        </if>
+    </select>
+
+    <select id="promoterSumCash" resultType="cn.pluss.platform.vo.PromoterSumVO">
+        SELECT IFNULL(sum(truncate(mo.shareMoney, 2)), 0) as shareMoney,
+               IFNULL((SELECT sum(truncate(tc.cashAmt, 2))
+                       from tb_pluss_cash tc
+                       WHERE tc.`status` = '1'
+                         and tc.type = '1'
+                         and tc.userId = #{userId}), 0)   as cashMoney
+        from tb_pluss_merchant_order mo
+        WHERE mo.promoteruserId = #{userId}
+          and mo.status = '1'
+    </select>
+
+
+    <select id="PlatformSum" resultType="cn.pluss.platform.vo.PlatformSumVO">
+        select
+        (SELECT count(id) from tb_pluss_merchant_base_info
+        <where>
+            <if test="timeStatus!=null and timeStatus=='1'.toString()">and date(createDt) = curdate()</if>
+            <if test="timeStatus!=null and timeStatus=='2'.toString()">and date(createDt) = date_sub(curdate(),interval
+                1 day)
+            </if>
+        </where>
+        ) as merchantCount,
+        (SELECT count(id) from tb_pluss_merchant_store
+        <where>
+            <if test="timeStatus!=null and timeStatus=='1'.toString()">and date(createDt) = curdate()</if>
+            <if test="timeStatus!=null and timeStatus=='2'.toString()">and date(createDt) = date_sub(curdate(),interval
+                1 day)
+            </if>
+        </where>
+        ) as storeCount,
+        mot.transSum, mot.transCount, mot.refundSum, mot.refundCount, mot.sharemoneySum,
+
+        (SELECT COUNT(id) FROM tb_pluss_merchant_menber
+        <where>
+            <if test="timeStatus!=null and timeStatus=='1'.toString()">and date(createDt) = curdate()</if>
+            <if test="timeStatus!=null and timeStatus=='2'.toString()">and date(createDt) = date_sub(curdate(),interval
+                1 day)
+            </if>
+        </where>
+        ) as memberCount,
+        (SELECT COUNT(id) FROM tb_pluss_user_app WHERE userType='promoter'
+        <if test="timeStatus!=null and timeStatus=='1'.toString()">and date(createDt) = curdate()</if>
+        <if test="timeStatus!=null and timeStatus=='2'.toString()">and date(createDt) = date_sub(curdate(),interval 1
+            day)</if>) as promoterCount,
+        (SELECT IFNULL(SUM(shareMoney),0) FROM tb_pluss_fans
+        <where>
+            <if test="timeStatus!=null and timeStatus=='1'.toString()">and date(createDt) = curdate()</if>
+            <if test="timeStatus!=null and timeStatus=='2'.toString()">and date(createDt) = date_sub(curdate(),interval
+                1 day)
+            </if>
+        </where>
+        ) as fansShareMoneySum,
+        0 aliSum,
+        0 wechatSum,
+        (
+        SELECT IFNULL(TRUNCATE((SUM(mo.consumeFee*(mo.rate / 10000-0.0021)-mo.fansShareMoney-(SELECT
+        IFNULL(sum(pf.shareMoney),0) as totalSum FROM tb_pluss_fans pf WHERE pf.payWay in('2-0','2-1')))),2),0) FROM
+        tb_pluss_merchant_order mo LEFT JOIN tb_pluss_merchant_base_info mi ON mo.merchantCode=mi.merchantCode WHERE
+        mo.`status`='1' AND mo.payTypeCode='leshuaPay0' or mo.payTypeCode='leshuaPay1' or mo.payTypeCode='leshuaPay2'
+        <if test="timeStatus!=null and timeStatus=='1'.toString()">and date(mo.createDt) = curdate()</if>
+        <if test="timeStatus!=null and timeStatus=='2'.toString()">and date(mo.createDt) = date_sub(curdate(),interval 1
+            day)
+        </if>
+        )as leshuaSum
+        FROM (
+        SELECT SUM(IF(`status` = 1, total, 0)) transSum, SUM(IF(`status` = 1, count, 0)) transCount, SUM(IF(`status` =
+        2, total, 0)) refundSum, SUM(IF(`status` = 2, count, 0)) refundCount, SUM(sharemoneySum) sharemoneySum FROM (
+        SELECT `status`, SUM(consumeFee) total, COUNT(id) count, IFNULL( sum( TRUNCATE ( IF(`status` = 1,
+        fansShareMoney, 0), 2 )), 0 ) sharemoneySum FROM tb_pluss_merchant_order WHERE `status` IN ('1', '2')
+        <if test="timeStatus!=null and timeStatus=='1'.toString()">and date(createDt) = curdate()</if>
+        <if test="timeStatus!=null and timeStatus=='2'.toString()">and date(createDt) = date_sub(curdate(),interval 1
+            day)
+        </if>
+        GROUP BY `status`
+        ) t
+        ) mot
+    </select>
+
+    <select id="sumConsumeFeebystoreId" resultType="cn.pluss.platform.vo.StoreVO">
+        SELECT (SELECT storeName FROM tb_pluss_merchant_store WHERE storeId = #{storeId}) as storeName,
+               (SELECT IFNULL(sum(consumeFee), 0)
+                FROM tb_pluss_merchant_order
+                WHERE status = '1' and storeId = #{storeId} and date(createDt) = curdate()) as nowDayConsumeFee,
+            (
+        SELECT IFNULL(sum (consumeFee), 0)
+        FROM tb_pluss_merchant_order
+        WHERE status='1' and storeId=#{storeId}) as sumConsumeFee
+    </select>
+
+    <select id="sumConsumeFeebymerchantCode" resultType="cn.pluss.platform.vo.StoreVO">
+        SELECT (SELECT alias FROM tb_pluss_merchant_base_info WHERE merchantCode = #{merchantCode}) as storeName,
+               (SELECT IFNULL(sum(consumeFee), 0)
+                FROM tb_pluss_merchant_order
+                WHERE status = '1'
+                  and merchantCode = #{merchantCode}
+                  and date(createDt) = curdate()) as nowDayConsumeFee,
+            (
+        SELECT IFNULL(sum (consumeFee), 0)
+        FROM tb_pluss_merchant_order
+        WHERE status='1' and merchantCode=#{merchantCode}) as sumConsumeFee
+    </select>
+
+    <select id="querySumCount" parameterType="java.util.Map" resultType="java.util.Map">
+        SELECT
+        SUM( mo.consumeFee ) AS transAmountCount,
+        ROUND(
+        SUM( mo.consumeFee * (( IFNULL( mo.rate, 38 )- 21 )/ 10000 )) +
+        ROUND(SUM(IF(locate('YS',mo.orderNumber) and mo.settlementType = 0,IF(mo.consumeFee <![CDATA[<=]]> 100,0,IF(mo.consumeFee <![CDATA[>]]>
+        100 and mo.consumeFee <![CDATA[<=]]> 500, mo.consumeFee * 0.001 - 0.1,mo.consumeFee * 0.0008)),0)),2)
+        , 2 ) AS profitAmountCount,
+        ROUND( SUM( mp.shareAmountCount ) , 2 ) AS shareAmountCount,
+        ROUND( IFNULL( SUM( pf.shareMoney ), 0.00 ), 2 ) AS fansAmountCount,
+        ROUND(
+        SUM( mo.consumeFee * (( IFNULL( mo.rate, 38 )- 21 )/ 10000 )) , 2 ) -
+        ROUND( SUM( mp.shareAmountCount ), 2 ) -
+        ROUND( IFNULL( SUM( pf.shareMoney ), 0.00 ) +
+        ROUND(SUM(IF(locate('YS',mo.orderNumber) and mo.settlementType = 0,IF(mo.consumeFee <![CDATA[<=]]> 100,0,IF(mo.consumeFee <![CDATA[>]]>
+        100 and mo.consumeFee <![CDATA[<=]]> 500, mo.consumeFee * 0.001 - 0.1,mo.consumeFee * 0.0008)),0)),2)
+        , 2 ) AS actualAmountCount
+        FROM
+        tb_pluss_merchant_order mo
+        LEFT JOIN tb_pluss_fans pf ON mo.orderNumber = pf.orderNumber
+        LEFT JOIN tb_pluss_merchant_base_info mbi ON mo.merchantCode = mbi.merchantCode
+        LEFT JOIN ( SELECT orderNumber, SUM( price ) AS shareAmountCount FROM tb_pluss_merchant_profit GROUP BY
+        orderNumber ) mp ON mo.orderNumber = mp.orderNumber
+        <where>
+            <choose>
+                <when test="status != null and status != ''">
+                    and mo.status = #{status}
+                </when>
+                <otherwise>
+                    and mo.status = '1'
+                </otherwise>
+            </choose>
+            <if test="id != null and id != ''">
+                and mo.id = #{id}
+            </if>
+            <if test="userId != null and userId != ''">
+                and mbi.userId = #{userId}
+            </if>
+            <if test="orderNumber != null and orderNumber != ''">
+                and mo.orderNumber = #{orderNumber}
+            </if>
+            <if test="alias != null and alias != ''">
+                and mbi.alias like CONCAT('%',#{alias},'%')
+            </if>
+            <if test="storeName != null and storeName != ''">
+                and mo.storeName like CONCAT('%',#{storeName},'%')
+            </if>
+            <if test="orderType != null and orderType != ''">
+                and mo.orderType = #{orderType}
+            </if>
+            <if test="payTypeName != null and payTypeName != ''">
+                and mo.payTypeName = #{payTypeName}
+            </if>
+            <if test="payTypeCode != null and payTypeCode != ''">
+                and
+                (
+                <foreach collection="payTypeCode" index="index" item="item" separator="or">
+                    mo.payTypeCode = #{item}
+                </foreach>
+                )
+            </if>
+            <if test="startTime != null and startTime != ''">
+                and mo.createDt <![CDATA[>=]]> #{startTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and mo.createDt <![CDATA[<=]]> #{endTime}
+            </if>
+        </where>
+    </select>
+
+    <select id="selectGroupMerchantTotalConsumeMoney" resultType="java.util.Map">
+        SELECT sum(consumeFee) totalConsumeFee, status, merchantCode FROM tb_pluss_merchant_order tpmo
+        WHERE tpmo.status IN("1", "2") AND
+        tpmo.merchantCode IN
+        <foreach collection="merchantCodeList" separator="," open="(" close=")" item="item">
+            #{item}
+        </foreach>
+        GROUP BY merchantCode, status
+    </select>
+
+    <select id="queryNextMercTransAmtCount" resultType="java.lang.Double" parameterType="java.util.List">
+        SELECT IFNULL(sum(consumeFee),0) FROM tb_pluss_merchant_order WHERE `status` = 1 and merchantCode in
+        <foreach collection="list" open="(" separator="," close=")" item="item" index="index">
+            #{item}
+        </foreach>
+    </select>
+
+    <select id="querySubMerchantTransMonthAmount" resultType="java.lang.Double">
+        SELECT SUM(tpmo.consumeFee)
+        FROM (SELECT t1.consumeFee, t1.orderNumber, t1.createDt, t1.merchantCode
+              FROM tb_pluss_merchant_order t1
+                       LEFT JOIN tb_pluss_merchant_order t2
+                                 ON t1.orderNumber = t2.orderNumber AND t1.`status` = 1 AND t2.`status` = 2
+              WHERE t1.status = 1
+                AND t2.updateTime IS NULL) tpmo
+                 LEFT JOIN tb_pluss_user_app tpua ON tpmo.merchantCode = tpua.merchantCode
+        WHERE tpua.parentId = #{parentId}
+          AND tpmo.createDt &gt; DATE_FORMAT(CURDATE(), "%Y-%m")
+    </select>
+
+    <select id="querySubMerchantTransLastMonthAmount" resultType="java.lang.Double">
+        SELECT SUM(tpmo.consumeFee)
+        FROM (SELECT t1.consumeFee, t1.orderNumber, t1.createDt, t1.merchantCode
+              FROM tb_pluss_merchant_order t1
+                       LEFT JOIN tb_pluss_merchant_order t2
+                                 ON t1.orderNumber = t2.orderNumber AND t1.`status` = 1 AND t2.`status` = 2
+              WHERE t1.status = 1
+                AND t2.updateTime IS NULL) tpmo
+                 LEFT JOIN tb_pluss_user_app tpua ON tpmo.merchantCode = tpua.merchantCode
+        WHERE tpua.parentId = #{parentId}
+          AND tpmo.createDt &lt; DATE_FORMAT(CURDATE(), "%Y-%m")
+          AND tpmo.createDt &gt; DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), "%Y-%m")
+    </select>
+
+    <update id="updateBatch" parameterType="java.util.List">
+        update tb_pluss_merchant_order
+        <trim prefix="set" suffixOverrides=",">
+            <trim prefix="enterFee = case" suffix="end,">
+                <foreach collection="list" item="i" index="index">
+                    <if test="i.enterFee != null">
+                        when id=#{i.id} then #{i.enterFee}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix=" rate = case" suffix="end,">
+                <foreach collection="list" item="i" index="index">
+                    <if test="i.rate != null">
+                        when id=#{i.id} then #{i.rate}
+                    </if>
+                </foreach>
+            </trim>
+        </trim>
+        where
+        <foreach collection="list" separator="or" item="i" index="index">
+            id=#{i.id}
+        </foreach>
+    </update>
+
+    <select id="getSuperMerchantToDayTradeMoneyCount" parameterType="java.util.Map" resultType="java.util.Map">
+
+        SELECT IFNULL(SUM(mo.consumeFee),0.00) AS tradeCountMoney,ua.parentId as agentId FROM tb_pluss_merchant_order mo
+        LEFT JOIN tb_pluss_user_app ua ON mo.merchantCode = ua.merchantCode
+        WHERE mo.`status` = 1 AND mo.createDt BETWEEN #{firstDate}
+        AND #{lastDate} AND ua.parentId in
+        <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        AND ua.parentId is not null GROUP BY ua.parentId ;
+
+    </select>
+
+    <select id="queryDailyCount" resultType="java.util.Map">
+        SELECT DATE_ADD(t2.day, INTERVAL 1 DAY) date, SUM(t2.consumeFee) consumeFeeSum
+        FROM (
+            SELECT DATE_FORMAT(t.updateTime, "%Y-%m-%d") day, t.consumeFee FROM tb_pluss_merchant_order t
+            WHERE t.`status` = '1' AND t.merchantCode = #{merchantCode} AND t.updateTime BETWEEN #{start} AND #{end}
+            ) t2
+        GROUP BY t2.day
+    </select>
+
+
+    <select id="selectProfitPage" resultType="cn.pluss.platform.vo.MerchantOrderProfitVO" parameterType="java.util.Map">
+        SELECT a.*,ui.phone AS 'onePhone',ua.userName AS 'oneName', t.phone AS 'twoPhone',ta.userName AS
+        'twoName',e.phone AS 'threePhone',ea.userName AS 'threeName',p.phone AS 'toUpPhone',pa.userName AS 'toUpName'
+        FROM (
+        SELECT
+        mbi.userId,
+        mo.orderNumber,
+        mbi.alias as merchantName,
+        mo.orderType,
+        mo.payTypeCode as payType,
+        mo.consumeFee,
+        mo.createDt,
+        IFNULL(mo.rate,38) AS mercRate,
+        ROUND((mo.consumeFee * (IFNULL(mo.rate,38))/10000),2) AS mercFee ,
+        IFNULL((SELECT SUM(price) FROM tb_pluss_merchant_profit mp WHERE mp.orderNumber = mo.orderNumber),0.00) AS
+        shareMoney,
+
+        SUM(CASE mp.type WHEN '1' THEN mp.price ELSE 0 END) 'oneFee',
+        SUM(CASE mp.type WHEN '2' THEN mp.price ELSE 0 END) 'twoFee',
+        SUM(CASE mp.type WHEN '3' THEN mp.price ELSE 0 END) 'threeFee',
+        SUM(CASE mp.type WHEN '4' THEN mp.price ELSE 0 END) 'toUpFee',
+        SUM(CASE mp.type WHEN '5' THEN mp.price ELSE 0 END) 'toAgentFeeCount',
+        GROUP_CONCAT(CASE mp.type WHEN '1' THEN mp.userId ELSE '' END SEPARATOR '') 'oneUserId',
+        GROUP_CONCAT(CASE mp.type WHEN '2' THEN mp.userId ELSE '' END SEPARATOR '') 'twoUserId',
+        GROUP_CONCAT(CASE mp.type WHEN '3' THEN mp.userId ELSE '' END SEPARATOR '') 'threeUserId',
+        GROUP_CONCAT(CASE mp.type WHEN '4' THEN mp.userId ELSE '' END SEPARATOR '') 'toUpUserId'
+
+        FROM
+        tb_pluss_merchant_order mo
+        LEFT JOIN tb_pluss_merchant_profit mp ON mp.orderNumber = mo.orderNumber
+        LEFT JOIN tb_pluss_merchant_base_info mbi ON mo.merchantCode = mbi.merchantCode
+        WHERE
+        mo.`status` = '1'
+        <if test="merchantName != null and merchantName != ''">
+            and mbi.alias like concat('%',#{merchantName},'%')
+        </if>
+        <if test="userId != null and userId != ''">
+            and mp.userId = #{userId}
+        </if>
+        <if test="profitCount != all">
+            and mp.price != '0.00'
+        </if>
+        <if test="orderNumber != null and orderNumber != ''">
+            and mo.orderNumber = #{orderNumber}
+        </if>
+        GROUP BY mo.orderNumber
+        ORDER BY
+        mo.createDt DESC
+        limit #{pageSize} offset #{offset}
+        ) a
+        LEFT JOIN tb_pluss_user_info ui on
+        a.oneUserId = ui.id
+
+        LEFT JOIN tb_pluss_user_app ua ON
+        a.oneUserId = ua.userId
+
+        LEFT JOIN tb_pluss_user_info t ON
+        a.twoUserId = t.id
+
+        LEFT JOIN tb_pluss_user_app ta ON
+        a.twoUserId = ta.userId
+
+        LEFT JOIN tb_pluss_user_info e ON
+        a.threeUserId = e.id
+
+        LEFT JOIN tb_pluss_user_app ea ON
+        a.threeUserId = ea.userId
+
+        LEFT JOIN tb_pluss_user_info p ON
+        a.toUpUserId = p.id
+
+        LEFT JOIN tb_pluss_user_app pa ON
+        a.toUpUserId = pa.userId
+
+        ORDER BY a.createDt desc
+    </select>
+
+    <select id="selectProfitPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+        SELECT count(1) FROM (
+        SELECT
+        mbi.userId
+        FROM
+        tb_pluss_merchant_order mo
+        LEFT JOIN tb_pluss_merchant_profit mp ON mp.orderNumber = mo.orderNumber
+        LEFT JOIN tb_pluss_merchant_base_info mbi ON mo.merchantCode = mbi.merchantCode
+        WHERE
+        mo.`status` = '1'
+        <if test="merchantName != null and merchantName != ''">
+            and mbi.alias like concat('%',#{merchantName},'%')
+        </if>
+        <if test="userId != null and userId != ''">
+            and mp.userId = #{userId}
+        </if>
+        <if test="profitCount != all">
+            and mp.price != '0.00'
+        </if>
+        <if test="orderNumber != null and orderNumber != ''">
+            and mo.orderNumber = #{orderNumber}
+        </if>
+        GROUP BY mo.orderNumber
+        ) a
+    </select>
+
+<!--    <select id="getCountMaketAmt" parameterType="java.lang.String" resultType="java.util.Map">-->
+<!--        SELECT-->
+<!--        IFNULL(SUM(mo.marketAmt),0.00) AS marketAmtCount,-->
+<!--        IFNULL(-->
+<!--        SUM(-->
+<!--        CASE-->
+<!--        WHEN date_format( mo.createDt, '%Y%m' ) != date_format( NOW( ), '%Y%m' ) THEN-->
+<!--        mo.marketAmt-->
+<!--        END-->
+<!--        )-->
+<!--        ,0.00)AS useMarketAmtCount,-->
+<!--        IFNULL(-->
+<!--        SUM(-->
+<!--        CASE-->
+<!--        WHEN date_format( mo.createDt, '%Y%m' ) = date_format( NOW( ), '%Y%m' ) THEN-->
+<!--        mo.marketAmt-->
+<!--        END-->
+<!--        )-->
+<!--        ,0.00) AS useMonthMarketAmtCount-->
+<!--        FROM-->
+<!--        tb_pluss_merchant_order mo-->
+<!--        left join tb_pluss_merchant_base_info mbi-->
+<!--        on mo.merchantCode = mbi.merchantCode-->
+<!--        WHERE mbi.userId = #{userId} and mo.`status` = 1-->
+<!--        <if test="date != null">-->
+<!--            and date_format(mo.createDt, '%Y-%m') = #{date}-->
+<!--        </if>-->
+<!--        <if test="auditDate != null">-->
+<!--            and mo.createDate >= #{auditDate}-->
+<!--        </if>-->
+
+<!--    </select>-->
+
+    <select id="getCountTradeAmt" parameterType="java.lang.String" resultType="java.util.Map">
+        SELECT
+        IFNULL(SUM(mo.consumeFee - refundAmt),0.00) AS tradeAmtCount,
+        IFNULL(SUM(case when DATE_FORMAT(mo.transDt,'%Y-%m-%d') >= #{date} THEN mo.consumeFee END),0.00) AS dateAmt
+        FROM tb_pluss_merchant_order mo
+        WHERE mo.merchantCode = #{merchantCode} and mo.`status` = 1
+        <if test="startDate != null and startDate != ''">
+            <![CDATA[ and DATE_FORMAT(mo.createDt,'%Y-%m-%d')  >= #{startDate}]]>
+        </if>
+        <if test="endDate != null and endDate != ''">
+            <![CDATA[ and DATE_FORMAT(mo.createDt,'%Y-%m-%d')  <= #{endDate}]]>
+        </if>
+
+
+    </select>
+
+    <select id="getCountMaketAmtAndDate" parameterType="java.lang.String" resultType="java.math.BigDecimal">
+        SELECT IFNULL(SUM(mo.consumeFee), 0.00) AS tradeAmtCount
+        FROM tb_pluss_merchant_order mo
+        WHERE mo.merchantCode = #{merchantCode}
+          and mo.`status` = 1
+          and DATE_FORMAT(mo.transDt, '%Y-%m-%d') >= #{date}
+    </select>
+
+    <select id="pageWapInfo" parameterType="cn.pluss.platform.entity.MerchantOrder"
+            resultType="cn.pluss.platform.entity.MerchantOrder">
+        select consumeFee, ROUND(((38-IFNULL(rate,38))/10000)*consumeFee,2) as saveAmt,transDt FROM
+        tb_pluss_merchant_order
+        where status = #{order.status} and merchantCode = #{order.merchantCode}
+        <if test="order.startTime != null">
+            <![CDATA[ and createDt  >= #{order.startTime}]]>
+        </if>
+        <if test="order.endTime != null">
+            <![CDATA[ and createDt  <= #{order.endTime}]]>
+        </if>
+        order by createDt desc
+    </select>
+
+
+    <select id="getSaveMoneyCount" parameterType="java.lang.String" resultType="java.util.Map">
+        select
+        IFNULL(ROUND(SUM(((38-IFNULL(rate,38))/10000)*consumeFee),2),0.0) AS 'saveAmtCount',
+        IFNULL(SUM(case when DATE_FORMAT(transDt,'%Y-%m-%d') = #{date} THEN
+        ROUND((38-IFNULL(rate,38))/10000*consumeFee,2) END),0.00) AS saveDateAmt
+        FROM tb_pluss_merchant_order
+        where status = 1 and merchantCode = #{merchantCode}
+        <if test="startDate != null and startDate != ''">
+            <![CDATA[ and DATE_FORMAT(createDt,'%Y-%m-%d')  >= #{startDate}]]>
+        </if>
+        <if test="endDate != null and endDate != ''">
+            <![CDATA[ and DATE_FORMAT(createDt,'%Y-%m-%d')  <= #{endDate}]]>
+        </if>
+    </select>
+
+
+    <select id="pageInfo" parameterType="cn.pluss.platform.entity.MerchantOrder"
+            resultType="cn.pluss.platform.entity.MerchantOrder">
+
+        select mo.*,mbi.alias from tb_pluss_merchant_order mo
+
+        left join tb_pluss_merchant_base_info mbi
+        on mo.merchantCode = mbi.merchantCode
+
+        where mo.status = '1'
+        <if test="order.userId != null">
+            and mbi.userId = #{order.userId}
+        </if>
+        <if test="order.orderType != null">
+            and mo.orderType = #{order.orderType}
+        </if>
+        <if test="order.startTime != null">
+            and mo.transDt >= #{order.startTime}
+        </if>
+        <if test="order.endTime != null">
+            and mo.transDt <![CDATA[ <= ]]>  #{order.endTime}
+        </if>
+
+        <if test="order.params != null and order.params.createDtStr != null">
+            and DATE_FORMAT(mo.createDt,'%Y-%m') = #{order.params.createDtStr}
+        </if>
+
+        <if test="order.params != null and order.params.marketAmt == 0.00">
+            and mo.marketAmt is not null and mo.marketAmt != 0.00
+        </if>
+        ORDER BY mo.id desc
+    </select>
+
+    <select id="sumData" resultType="cn.pluss.platform.entity.MerchantOrder">
+        SELECT IFNULL(SUM(CASE `status`
+                              WHEN '1' THEN consumeFee
+                              WHEN '2' THEN -consumeFee
+                              ELSE 0
+                          ), 0) consumeFee,
+
+               IFNULL(SUM(CASE `status`
+                              WHEN '1' THEN enterFee
+                              WHEN '2' THEN -enterFee
+                              ELSE 0
+                          ), 0) enterFee,
+
+        FROM tb_pluss_merchant_order ${ew.customSqlSegment}
+    </select>
+
+    <select id="getCountNowDateSettleAmt" parameterType="java.lang.String" resultType="java.math.BigDecimal">
+        SELECT IFNULL(SUM(mo.enterFee - IF(mro.payAmt, mo.enterFee, 0)), 0) as settleAmt
+        FROM tb_pluss_merchant_order mo
+                 LEFT JOIN tb_pluss_merchant_refund_order mro ON mo.orderNumber = mro.orderNumber
+        WHERE mo.`status` = 1
+          and mo.orderType in (2, 3, 9, 10)
+          AND mo.merchantCode = #{merchantCode}
+          AND (mro.`status` is null or mro.`status` in (1, 2))
+          AND DATE_FORMAT(mo.transDt, '%Y-%m-%d') = DATE_FORMAT(NOW(), '%Y-%m-%d')
+    </select>
+
+    <select id="getOrderCountData" parameterType="java.util.Map" resultType="java.util.Map">
+        SELECT
+        SUM(IF( mo.STATUS = 1, mo.consumeFee, 0 )) AS transAmountCount,
+        SUM(IF( mo.STATUS = 2, IF ( mo.refundAmt = 0, mo.consumeFee, mo.refundAmt ), 0 )) AS refundAmountCount,
+        SUM(IF( mo.STATUS = 1 AND mo.orderType = 8, mo.consumeFee, 0 )) AS upAmountCount,
+        SUM(IF( mo.STATUS = 1 AND mo.orderType != 8, mo.mercFee - mo.channelFee, 0 )) AS transProfitAmountCount,
+        SUM(IF( mo.STATUS = 1 AND mo.settlementType = 0, IF(mo.cashFee = 0,mo.consumeFee - mo.enterFee - mo.mercFee,mo.cashFee),0)) numberAmountCount,
+        ROUND( SUM( mo.profitShareMoney ), 2 ) AS shareAmountCount,
+        ROUND( SUM( IFNULL( mo.fansShareMoney, 0 ) ), 2 ) AS fansAmountCount,
+        SUM(IF(mo.STATUS = 1,IF( mo.orderType = 8, mo.consumeFee, mo.consumeFee - mo.enterFee ) - mo.channelFee,0 )) AS profitAmountCount,
+        ROUND(SUM(IF(mo.`status` = 1,IF( mo.orderType = 8, mo.consumeFee, mo.consumeFee - mo.enterFee ) - mo.channelFee - mo.profitShareMoney - mo.fansShareMoney - IF(mo.settlementType = 0,IF(mo.cashFee = 0 ,mo.consumeFee - mo.enterFee - mo.mercFee , mo.cashFee) * 0.2,0),0 )),2) AS actualAmountCount
+        FROM
+        tb_pluss_merchant_order mo
+        <where>
+            mo.status in (1,2)
+            <if test="createDate != null">
+                and mo.createDate = #{createDate}
+            </if>
+            <if test="startCreateDate!= null and startCreateDate!=''">
+                and mo.createDate <![CDATA[>=]]> #{startCreateDate}
+            </if>
+            <if test="endCreateDate!= null and endCreateDate!=''">
+                and mo.createDate <![CDATA[<=]]> #{endCreateDate}
+            </if>
+            <if test="startUpdateDate!= null and startUpdateDate!=''">
+                and mo.updateDate <![CDATA[>=]]> #{startUpdateDate}
+            </if>
+            <if test="endUpdateDate!= null and endUpdateDate!=''">
+                and mo.updateDate <![CDATA[<=]]> #{endUpdateDate}
+            </if>
+            <if test="alias!=null and alias!=''">
+                and mo.merchantName = #{alias}
+            </if>
+            <if test="id!=null and id!=''">
+                and mo.id=#{id}
+            </if>
+            <if test="orderType!=null and orderType!=''">
+                and mo.orderType=#{orderType}
+            </if>
+            <if test="payTypeCode != null and payTypeCode !=''">
+                and
+                (
+                <foreach collection="payTypeCode" index="index" item="item" separator="or">
+                    mo.payTypeCode = #{item}
+                </foreach>
+                )
+            </if>
+            <if test="orderNumber!=null and orderNumber!=''">
+                and (mo.orderNumber=#{orderNumber} or mo.transNo = #{orderNumber} or mo.thirdTransNo = #{orderNumber})
+            </if>
+            <if test="merchantName!=null and merchantName!=''">
+                and mo.merchantName like CONCAT("%",#{merchantName},"%")
+            </if>
+            <if test="merchantCode!=null and merchantCode!=''">
+                and mo.merchantCode=#{merchantCode}
+            </if>
+            <if test="storeName!=null and storeName!=''">
+                and mo.storename like CONCAT("%",#{storeName},"%")
+            </if>
+            <if test="payTypeName!=null and payTypeName!=''">
+                and mo.payTypeName=#{payTypeName}
+            </if>
+            <if test="status!=null and status!=''">
+                and mo.status=#{status}
+            </if>
+            <if test="settlementType != null and  settlementType != '' or 0 == settlementType ">
+                and mo.settlementType=#{settlementType}
+            </if>
+            <if test="aisleSwitch != null and  aisleSwitch != ''">
+                and mo.aisleSwitch=#{aisleSwitch}
+            </if>
+            <if test="startTime!= null and startTime!=''">
+                and mo.updateTime <![CDATA[>=]]> #{startTime}
+            </if>
+            <if test="endTime!= null and endTime!=''">
+                and mo.updateTime <![CDATA[<=]]> #{endTime}
+            </if>
+        </where>
+    </select>
+
+    <select id="getPlatformOrderData" resultType="java.util.Map">
+        SELECT
+            SUM( consumeFee ) as toDayTransCount,
+            count(1) as toDayTransNum,
+            SUM(IF( payTypeCode = 'aliPay' OR payTypeCode = 'sxfPay0', consumeFee, 0 )) as toDayTransAliCount,
+            SUM(IF( payTypeCode = 'aliPay' OR payTypeCode = 'sxfPay0', 1, 0 )) as toDayTransAliNum,
+
+            SUM(IF( payTypeCode = 'wechatPay' OR payTypeCode = 'sxfPay1', consumeFee, 0 )) as toDayTransWxCount,
+            SUM(IF( payTypeCode = 'wechatPay' OR payTypeCode = 'sxfPay1', 1, 0 )) as toDayTransWxNum,
+
+            SUM(IF( payTypeCode = 'bank' OR payTypeCode = 'sxfPay2' , consumeFee, 0 )) as toDayTransUnionCount,
+            SUM(IF( payTypeCode = 'bank' OR payTypeCode = 'sxfPay2' , 1, 0 )) as toDayTransUnionNum
+        FROM
+            tb_pluss_merchant_order
+        WHERE
+            createDate = CURDATE() AND STATUS = 1;
+    </select>
+
+    <select id="getPlatformAmtData" resultType="java.util.Map">
+        SELECT
+            SUM(
+                    IF
+                        (orderType = 8,enterFee,IF(
+                                settlementType = 1,
+                                mercFee - channelFee,
+                                consumeFee - enterFee - channelFee - (IF(cashFee = 0, consumeFee - enterFee - mercFee,cashFee) * 0.2)))
+                ) AS toDayProfitCount,
+            SUM( profitShareMoney ) AS toDayShareCount,
+            SUM( fansShareMoney ) AS toDayFansCount
+        FROM
+            tb_pluss_merchant_order
+        WHERE
+            createDate = CURDATE()
+          AND `status` = 1
+    </select>
+
+    <select id="getOrderFlow" resultType="cn.pluss.platform.entity.UserProfit">
+
+        SELECT
+            ua.userId,
+            ua.parentId,
+            ua.roleCode,
+            ua.levelCode,
+            IFNUll(t.transNum,0) ownTransNum,
+            IFNUll(t2.transNum,0) transNum,
+            IFNULL( t2.teamTransFlow, 0 ) AS teamTransFlow,
+            IFNULL( t.ownTransFlow, 0 ) AS ownTransFlow,
+            IFNULL( t2.directTransFlow, 0 ) AS directTransFlow,
+            IFNULL( t2.indirectTransFlow, 0 ) AS indirectTransFlow,
+
+            IFNULL( t3.totalProfitAmt, 0 ) AS totalProfitAmt,
+            IFNULL( t3.directProfitAmt, 0 ) AS directProfitAmt,
+            IFNULL( t3.indirectProfitAmt, 0 ) AS indirectProfitAmt,
+            IFNULL( t3.otherProfitAmt, 0 ) AS otherProfitAmt
+        FROM
+            tb_pluss_user_app ua
+                LEFT JOIN (
+                SELECT
+                    mo.merchantCode,
+                    SUM(consumeFee - IFNULL(IFNULL(mro.refundAmt,mro.payAmt),0)) AS ownTransFlow,
+                    count(1) as transNum
+                FROM
+                    tb_pluss_merchant_order mo
+                        LEFT JOIN
+                    tb_pluss_merchant_refund_order mro ON mo.orderNumber = mro.orderNumber
+                WHERE
+                    mo.createDate = #{date}
+                  AND mo.`status` = 1
+                GROUP BY
+                    mo.merchantCode
+            ) t ON ua.merchantCode = t.merchantCode
+                LEFT JOIN (
+                SELECT
+                    SUM( ups.ownTransFlow + ups.teamTransFlow ) teamTransFlow,
+                    SUM( ups.ownTransFlow ) directTransFlow,
+                    SUM( ups.directTransFlow ) indirectTransFlow,
+                    SUM( ups.transNum + ups.ownTransNum) transNum,
+                    ua.userId
+                FROM
+                    tb_pluss_user_profit ups
+                        LEFT JOIN tb_pluss_user_app ua ON ups.parentId = ua.userId
+                        LEFT JOIN tb_pluss_user_level ul ON ul.levelCode = ua.levelCode
+                WHERE
+                    ups.profitDate = #{date}
+                  AND ua.sort = #{sort}
+                GROUP BY
+                    ua.userId
+            ) t2 ON t2.userId = ua.userId
+
+                LEFT JOIN (
+
+                SELECT
+                    SUM(price) totalProfitAmt,
+                    SUM(IF(type = 1,price,0)) AS directProfitAmt,
+                    SUM(IF(type = 2,price,0)) AS indirectProfitAmt,
+                    SUM(IF(type != 1 and type != 2,price,0)) AS otherProfitAmt,
+                    userId
+                FROM tb_pluss_merchant_profit WHERE recordDate = #{date} AND price != 0 GROUP BY userId
+
+            ) t3 ON ua.userId = t3.userId
+        LEFT JOIN tb_pluss_user_level ull ON ull.levelCode = ua.levelCode
+        WHERE
+            ua.sort = #{sort}
+          AND ua.userType NOT IN ( 'agent_staff', 'staff' )
+        ORDER BY
+            teamTransFlow DESC,
+            ownTransFlow DESC
+    </select>
+
+
+    <select id="getOrderMaxSort" resultType="java.lang.Integer">
+
+        SELECT
+            MAX(ua.sort)
+        FROM
+            (
+                SELECT
+                    mo.merchantCode,
+                    SUM( consumeFee ) AS transSumAmt,
+                    mo.rate
+                FROM
+                    tb_pluss_merchant_order mo
+                WHERE
+                    mo.createDate = #{date}
+                  AND mo.`status` = 1
+                GROUP BY
+                    mo.merchantCode
+            ) t
+                LEFT JOIN tb_pluss_user_app ua ON t.merchantCode = ua.merchantCode
+        WHERE ua.userType = 'promoter'
+    </select>
+
+    <select id="getPlatformTransData" resultType="java.util.Map">
+        SELECT
+            SUM( consumeFee ) AS transCount,
+            count( 1 ) AS transNum
+        FROM
+            tb_pluss_merchant_order
+        WHERE
+            `status` = 1
+    </select>
+
+
+    <select id="getAreaOrderCount" resultType="java.math.BigDecimal">
+        SELECT
+            IFNULL(SUM(consumeFee - refundAmt),0)
+            FROM
+            tb_pluss_merchant_order mo
+            WHERE status = 1
+              <choose>
+                  <when test="flag == 1">
+                      and createDate = #{date}
+                  </when>
+                <otherwise>
+                    and createDate <![CDATA[<=]]> #{date}
+                </otherwise>
+              </choose>
+              AND merchantCode in
+            <foreach collection="mercList" separator="," open="(" close=")" item="item">
+                #{item}
+            </foreach>
+    </select>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/MerchantOrderSplitDetailMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/MerchantOrderSplitDetailMapper.xml
new file mode 100644
index 0000000..cbe2505
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/MerchantOrderSplitDetailMapper.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.MerchantOrderSplitDetailMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.MerchantOrderSplitDetail">
+        <id column="id" property="id" />
+        <result column="merchantCode" property="merchantCode" />
+        <result column="merchantName" property="merchantName" />
+        <result column="orderNumber" property="orderNumber" />
+        <result column="status" property="status" />
+        <result column="divRatio" property="divRatio" />
+        <result column="divAmt" property="divAmt" />
+        <result column="fee" property="fee" />
+        <result column="remark" property="remark" />
+        <result column="createTime" property="createTime" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/MerchantOrderSplitMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/MerchantOrderSplitMapper.xml
new file mode 100644
index 0000000..408603d
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/MerchantOrderSplitMapper.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.MerchantOrderSplitMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.MerchantOrderSplit">
+        <id column="id" property="id" />
+        <result column="orderNumber" property="orderNumber" />
+        <result column="orderAmt" property="orderAmt" />
+        <result column="payTime" property="payTime" />
+        <result column="status" property="status" />
+        <result column="mercOrderNo" property="mercOrderNo" />
+        <result column="mercRefundNo" property="mercRefundNo" />
+        <result column="chieMerchantCode" property="chieMerchantCode" />
+        <result column="diviMerchantCode" property="diviMerchantCode" />
+        <result column="divAmt" property="divAmt" />
+        <result column="divRatio" property="divRatio" />
+        <result column="divisionMode" property="divisionMode" />
+        <result column="divStatus" property="divStatus" />
+        <result column="fee" property="fee" />
+        <result column="createTime" property="createTime" />
+        <result column="feePayer" property="feePayer" />
+        <result column="divStatusCode" property="divStatusCode" />
+        <result column="remark" property="remark" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/MerchantOrderSplitRefundMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/MerchantOrderSplitRefundMapper.xml
new file mode 100644
index 0000000..6bca07e
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/MerchantOrderSplitRefundMapper.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.MerchantOrderSplitRefundMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.MerchantOrderSplitRefund">
+        <id column="id" property="id" />
+        <result column="ordeNumber" property="ordeNumber" />
+        <result column="mercOrderNo" property="mercOrderNo" />
+        <result column="status" property="status" />
+        <result column="orderAmt" property="orderAmt" />
+        <result column="refundNo" property="refundNo" />
+        <result column="mercRefundNo" property="mercRefundNo" />
+        <result column="refundTime" property="refundTime" />
+        <result column="notifyUrl" property="notifyUrl" />
+        <result column="refundAmt" property="refundAmt" />
+        <result column="createTime" property="createTime" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/MerchantOrderStatisticsMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/MerchantOrderStatisticsMapper.xml
new file mode 100644
index 0000000..d588828
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/MerchantOrderStatisticsMapper.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.MerchantOrderStatisticsMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.MerchantOrderStatistics">
+        <id column="id" property="id" />
+        <result column="merchantCode" property="merchantCode" />
+        <result column="totalFee" property="totalFee" />
+        <result column="count" property="count" />
+        <result column="retFee" property="retFee" />
+        <result column="retCount" property="retCount" />
+        <result column="startDate" property="startDate" />
+        <result column="endDate" property="endDate" />
+        <result column="createTime" property="createTime" />
+    </resultMap>
+
+    <insert id="insertStatistics">
+        INSERT IGNORE INTO tb_pluss_merchant_order_statistics(`merchantCode`, `count`, `totalFee`, `retCount`, `retFee`, `startDate`, `endDate`)
+        SELECT
+            mbi.merchantCode,
+            COUNT(IF(mo.`status` = 1, 1, NULL)) count,
+            SUM(IF(mo.`status` = 1, consumeFee, 0.00)  ) totalFee,
+            COUNT(IF(mo.`status` = 2, 1, NULL)) retCount,
+            SUM(IF(mo.`status` = 2, consumeFee, 0.00)  ) retFee,
+	        #{startDate},
+	        #{endDate}
+        FROM
+            tb_pluss_merchant_base_info mbi
+            LEFT JOIN tb_pluss_merchant_order mo ON mbi.merchantCode = mo.merchantCode
+        WHERE
+            createDate BETWEEN #{startDate}
+          AND #{endDate}
+        GROUP BY
+            merchantCode;
+    </insert>
+
+    <insert id="insertAllStatics">
+        INSERT IGNORE INTO tb_pluss_merchant_order_statistics(`merchantCode`, `totalFee`, `count`, `retFee`, `retCount`, `startDate`, `endDate`)
+        SELECT merchantCode, SUM(totalFee) totalFee, SUM(count) count, SUM(retFee) retFee, SUM(retCount) retCount, '1970-01-01', '2099-12-31'
+        FROM tb_pluss_merchant_order_statistics mos GROUP BY merchantCode;
+    </insert>
+
+    <select id="selectDirectTotal" resultType="cn.pluss.platform.entity.MerchantOrderStatistics">
+        SELECT SUM(totalFee) `totalFee`, SUM(`count`) `count` FROM tb_pluss_user_app ua
+            LEFT JOIN tb_pluss_merchant_order_statistics mos ON ua.merchantCode = mos.merchantCode
+        WHERE ua.parentId = #{pId}
+        <choose>
+            <when test="month != null and month != ''">
+                AND DATE_FORMAT(mos.startDate, "%Y-%m") = #{month}
+            </when>
+            <otherwise>
+                AND mos.startDate = "1970-01-01"
+            </otherwise>
+        </choose>
+    </select>
+
+    <select id="selectIndirectTotal" resultType="cn.pluss.platform.entity.MerchantOrderStatistics">
+        SELECT SUM(`teamTransFlow`) totalFee, SUM(`transNum`) count FROM tb_pluss_user_profit
+        <where>
+            userId = #{pId}
+            <if test="month != null and month != ''">
+                AND profitMonth = #{month}
+            </if>
+        </where>
+
+    </select>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/MerchantOrderVOMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/MerchantOrderVOMapper.xml
new file mode 100644
index 0000000..a76a8b9
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/MerchantOrderVOMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="cn.pluss.platform.mapper.MerchantOrderVOMapper">
+
+    <select id="getOnlineCouponList" resultType="java.util.Map">
+        SELECT od.`name`, CONCAT(IFNULL(od.`fee`, '0'), '') `fee` FROM tb_pluss_merchant_order mo
+        LEFT JOIN `syblife`.ims_tiny_wmall_order wo ON mo.orderNumber = wo.transaction_id AND mo.orderType = 10
+        LEFT JOIN `syblife`.ims_tiny_wmall_order_discount od ON od.oid = wo.id
+        WHERE mo.orderNumber = #{orderNumber} AND mo.`status` = '1' AND od.fee > 0
+    </select>
+
+    <select id="getOfflineCouponList" resultType="java.util.Map">
+        SELECT CONCAT(IFNULL(IFNULL(no_discount_part, discount_fee), '0'), '') `fee`, IF(acr.id IS NULL, '满减优惠', '代金券') `name`
+        FROM tb_pluss_merchant_order mo
+        LEFT JOIN syblife.ims_tiny_wmall_paybill_order wpo ON mo.orderNumber = wpo.transaction_id
+        LEFT JOIN syblife.ims_tiny_wmall_activity_coupon_record acr ON wpo.id = acr.order_id = #{orderNumber}
+        WHERE mo.orderNumber = #{orderNumber} AND IFNULL(no_discount_part, discount_fee) > 0;
+    </select>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/MerchantPluginMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/MerchantPluginMapper.xml
new file mode 100644
index 0000000..8b199c1
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/MerchantPluginMapper.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.MerchantPluginMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.MerchantPlugin">
+        <id column="id" property="id" />
+        <result column="channel" property="channel" />
+        <result column="userId" property="userId" />
+        <result column="pluginId" property="pluginId" />
+        <result column="status" property="status" />
+        <result column="thirdStatus" property="thirdStatus" />
+        <result column="applicationId" property="applicationId" />
+        <result column="remark" property="remark" />
+        <result column="createTime" property="createTime" />
+        <result column="updateTime" property="updateTime" />
+        <result column="extra" property="extra" />
+    </resultMap>
+    
+    <select id="selectValidMerchantPlugin" resultType="cn.pluss.platform.entity.MerchantPlugin">
+        SELECT * FROM tb_pluss_merchant_plugin t WHERE userId = #{userId}
+    </select>
+
+    <select id="getRyxNoCertMerchant" resultType="cn.pluss.platform.entity.MerchantPlugin">
+        SELECT t1.* FROM tb_pluss_merchant_plugin t1
+            LEFT JOIN tb_pluss_user_app ua ON t1.userId = ua.userId
+            LEFT JOIN tb_pluss_sub_merchant_apply_order t2 ON ua.merchantCode = t2.merchantCode
+            AND t1.channel = t2.channelId
+        WHERE t1.channel = 31 AND t1.`status` = 3 AND t2.infoQrcode IS NULL
+    </select>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/MerchantProfit-sqlmap.xml b/pluss-dao-bundle/src/main/resources/mapper/MerchantProfit-sqlmap.xml
new file mode 100644
index 0000000..e1aff49
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/MerchantProfit-sqlmap.xml
@@ -0,0 +1,868 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="cn.pluss.platform.mapper.MerchantProfitMapper">
+
+    <insert id="saveMerchantProfitBatch">
+        insert into
+        tb_pluss_merchant_profit(userId,type,price,orderNumber,merchantCode,merchantName,consumeFee,createDt,orderDt,status,payTypeCode,payTypeName,merchantLogo,level,merchantParentId,merchantParentName,merchantParentLogo,phone,userName)
+        VALUES
+        <foreach collection="list" item="item" index="index" separator=",">
+            (#{userId},#{type},#{price},#{orderNumber},#{merchantCode},#{merchantName},#{consumeFee},#{createDt},#{orderDt},#{status},#{payTypeCode},#{payTypeName},#{merchantLogo},#{level},#{merchantParentId},#{merchantParentName},#{merchantParentLogo},#{phone},#{userName})
+        </foreach>
+    </insert>
+
+    <select id="queryMerchantProfit" parameterType="cn.pluss.platform.entity.MerchantProfit"
+            resultType="cn.pluss.platform.entity.MerchantProfit">
+        SELECT * from tb_pluss_merchant_profit
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="userId!= null">
+                and userId = #{userId}
+            </if>
+            <if test="agentStaffId != null">
+                and agentStaffId = #{agentStaffId}
+            </if>
+            <if test="type!= null">
+                and type = #{type}
+            </if>
+            <if test="price!= null">
+                and price = #{price}
+            </if>
+            <if test="orderNumber!= null">
+                and orderNumber = #{orderNumber}
+            </if>
+            <if test="merchantCode!= null">
+                and merchantCode = #{merchantCode}
+            </if>
+            <if test="merchantName!= null">
+                and merchantName = #{merchantName}
+            </if>
+            <if test="consumeFee!= null">
+                and consumeFee = #{consumeFee}
+            </if>
+            <if test="createDt!= null">
+                and createDt = #{createDt}
+            </if>
+            <if test="orderDt!= null">
+                and orderDt = #{orderDt}
+            </if>
+            <if test="status!= null">
+                and status = #{status}
+            </if>
+            <if test="payTypeCode!= null">
+                and payTypeCode = #{payTypeCode}
+            </if>
+            <if test="payTypeName!= null">
+                and payTypeName = #{payTypeName}
+            </if>
+            <if test="merchantLogo!= null">
+                and merchantLogo = #{merchantLogo}
+            </if>
+            <if test="level!= null">
+                and level = #{level}
+            </if>
+            <if test="merchantParentId!= null">
+                and merchantParentId = #{merchantParentId}
+            </if>
+            <if test="merchantParentName!= null">
+                and merchantParentName = #{merchantParentName}
+            </if>
+            <if test="merchantParentLogo!= null">
+                and merchantParentLogo = #{merchantParentLogo}
+            </if>
+            <if test="phone!= null">
+                and phone = #{phone}
+            </if>
+            <if test="userName!= null">
+                and userName = #{userName}
+            </if>
+            <if test="merchantParentLevel!= null">
+                and merchantParentLevel = #{merchantParentLevel}
+            </if>
+            <if test="merchantParentPhone!= null">
+                and merchantParentPhone = #{merchantParentPhone}
+            </if>
+
+        </where>
+    </select>
+
+    <select id="queryMerchantProfitList" parameterType="cn.pluss.platform.entity.MerchantProfit"
+            resultType="cn.pluss.platform.entity.MerchantProfit">
+        SELECT * from tb_pluss_merchant_profit
+        <where>
+            <if test="agentStaffId != null">
+                and agentStaffId = #{agentStaffId}
+            </if>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="userId!= null">
+                and userId = #{userId}
+            </if>
+            <if test="type!= null">
+                and type = #{type}
+            </if>
+            <if test="price!= null">
+                and price = #{price}
+            </if>
+            <if test="orderNumber!= null">
+                and orderNumber = #{orderNumber}
+            </if>
+            <if test="merchantCode!= null">
+                and merchantCode = #{merchantCode}
+            </if>
+            <if test="merchantName!= null">
+                and merchantName = #{merchantName}
+            </if>
+            <if test="consumeFee!= null">
+                and consumeFee = #{consumeFee}
+            </if>
+            <if test="createDt!= null">
+                and createDt = #{createDt}
+            </if>
+            <if test="orderDt!= null">
+                and orderDt = #{orderDt}
+            </if>
+            <if test="status!= null">
+                and status = #{status}
+            </if>
+            <if test="payTypeCode!= null">
+                and payTypeCode = #{payTypeCode}
+            </if>
+            <if test="payTypeName!= null">
+                and payTypeName = #{payTypeName}
+            </if>
+            <if test="merchantLogo!= null">
+                and merchantLogo = #{merchantLogo}
+            </if>
+            <if test="level!= null">
+                and level = #{level}
+            </if>
+            <if test="merchantParentId!= null">
+                and merchantParentId = #{merchantParentId}
+            </if>
+            <if test="merchantParentName!= null">
+                and merchantParentName = #{merchantParentName}
+            </if>
+            <if test="merchantParentLogo!= null">
+                and merchantParentLogo = #{merchantParentLogo}
+            </if>
+            <if test="startTime!= null">
+                and createDt &gt; #{startTime}
+            </if>
+            <if test="endTime!= null">
+                and createDt &lt; #{endTime}
+            </if>
+            <if test="phone!= null">
+                and phone = #{phone}
+            </if>
+            <if test="userName!= null">
+                and userName = #{userName}
+            </if>
+            <if test="merchantParentLevel!= null">
+                and merchantParentLevel = #{merchantParentLevel}
+            </if>
+            <if test="merchantParentPhone!= null">
+                and merchantParentPhone = #{merchantParentPhone}
+            </if>
+        </where>
+    </select>
+
+    <update id="updateMerchantProfit" parameterType="cn.pluss.platform.entity.MerchantProfit">
+        update tb_pluss_merchant_profit
+        <set>
+            <if test="userId!= null">
+                userId = #{userId},
+            </if>
+            <if test="type!= null">
+                type = #{type},
+            </if>
+            <if test="price!= null">
+                price = #{price},
+            </if>
+            <if test="orderNumber!= null">
+                orderNumber = #{orderNumber},
+            </if>
+            <if test="merchantCode!= null">
+                merchantCode = #{merchantCode},
+            </if>
+            <if test="merchantName!= null">
+                merchantName = #{merchantName},
+            </if>
+            <if test="consumeFee!= null">
+                consumeFee = #{consumeFee},
+            </if>
+            <if test="createDt!= null">
+                createDt = #{createDt},
+            </if>
+            <if test="orderDt!= null">
+                orderDt = #{orderDt},
+            </if>
+            <if test="status!= null">
+                status = #{status},
+            </if>
+            <if test="payTypeCode!= null">
+                payTypeCode = #{payTypeCode},
+            </if>
+            <if test="payTypeName!= null">
+                payTypeName = #{payTypeName},
+            </if>
+            <if test="merchantLogo!= null">
+                merchantLogo = #{merchantLogo},
+            </if>
+            <if test="level!= null">
+                level = #{level},
+            </if>
+            <if test="merchantParentId!= null">
+                merchantParentId = #{merchantParentId},
+            </if>
+            <if test="merchantParentName!= null">
+                merchantParentName = #{merchantParentName},
+            </if>
+            <if test="merchantParentLogo!= null">
+                merchantParentLogo = #{merchantParentLogo},
+            </if>
+            <if test="phone!= null">
+                phone = #{phone},
+            </if>
+            <if test="userName!= null">
+                userName = #{userName},
+            </if>
+            <if test="merchantParentLevel!= null">
+                merchantParentLevel = #{merchantParentLevel},
+            </if>
+            <if test="merchantParentPhone!= null">
+                merchantParentPhone = #{merchantParentPhone},
+            </if>
+            <if test="profitRate!= null">
+                profitRate = #{profitRate}
+            </if>
+        </set>
+        where id=#{id}
+    </update>
+
+    <select id="queryMerchantProfitPage" parameterType="java.util.Map"
+            resultType="cn.pluss.platform.entity.MerchantProfit">
+        SELECT
+        profit.*,
+        ua.userType
+        FROM
+        tb_pluss_merchant_profit profit
+        LEFT JOIN tb_pluss_merchant_order merchantOrder ON profit.orderNumber = merchantOrder.orderNumber
+        LEFT JOIN tb_pluss_user_app ua ON ua.userId = profit.userId
+        <where>
+            and merchantOrder.status = 1
+            <if test="id!= null">
+                and profit.id = #{id}
+            </if>
+            <if test="userId!= null">
+                and profit.userId = #{userId}
+            </if>
+            <if test="type!= null">
+                and profit.type = #{type}
+            </if>
+            <if test="price!= null">
+                and profit.price = #{price}
+            </if>
+            <if test="orderNumber!= null">
+                and profit.orderNumber = #{orderNumber}
+            </if>
+            <if test="agentStaffId != null">
+                and profit.agentStaffId = #{agentStaffId}
+            </if>
+            <if test="merchantCode!= null">
+                and profit.merchantCode = #{merchantCode}
+            </if>
+            <if test="merchantName!= null">
+                and profit.merchantName like CONCAT('%',#{merchantName},'%')
+            </if>
+            <if test="consumeFee!= null">
+                and profit.consumeFee = #{consumeFee}
+            </if>
+            <if test="createDt!= null">
+                and profit.createDt = #{createDt}
+            </if>
+            <if test="orderDt!= null">
+                and profit.orderDt = #{orderDt}
+            </if>
+            <if test="status!= null">
+                and profit.status = #{status}
+            </if>
+
+            <if test="self  != null">
+                and profit.agentStaffId IS NULL
+            </if>
+
+            <if test="agentStaffIds != null">
+                and profit.agentStaffId IN
+                <foreach collection="agentStaffIds" separator="," open="(" close=")" item="item">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="payTypeCode!= null">
+                and profit.payTypeCode = #{payTypeCode}
+            </if>
+            <if test="payTypeName!= null">
+                and profit.payTypeName = #{payTypeName}
+            </if>
+            <if test="merchantLogo!= null">
+                and profit.merchantLogo = #{merchantLogo}
+            </if>
+            <if test="level!= null">
+                and profit.level = #{level}
+            </if>
+            <if test="merchantParentId!= null">
+                and profit.merchantParentId = #{merchantParentId}
+            </if>
+            <if test="merchantParentName!= null">
+                and profit.merchantParentName = #{merchantParentName}
+            </if>
+            <if test="merchantParentLogo!= null">
+                and profit.merchantParentLogo = #{merchantParentLogo}
+            </if>
+            <if test="startTime!= null">
+                and profit.createDt &gt; #{startTime}
+            </if>
+            <if test="endTime!= null">
+                and profit.createDt &lt; #{endTime}
+            </if>
+            <if test="retype!= null">
+                and profit.type !=4
+            </if>
+            <if test="phone!= null">
+                and profit.phone = #{phone}
+            </if>
+            <if test="userName!= null">
+                and profit.userName = #{userName}
+            </if>
+            <if test="merchantParentLevel!= null">
+                and profit.merchantParentLevel = #{merchantParentLevel}
+            </if>
+            <if test="merchantParentPhone!= null">
+                and profit.merchantParentPhone = #{merchantParentPhone}
+            </if>
+
+        </where>
+        order by id desc limit #{pageSize} offset #{offset}
+    </select>
+
+    <select id="queryMerchantProfitPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+        SELECT count(*) from tb_pluss_merchant_profit
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="userId!= null">
+                and userId = #{userId}
+            </if>
+            <if test="type!= null">
+                and type = #{type}
+            </if>
+            <if test="agentStaffId != null">
+                and agentStaffId = #{agentStaffId}
+            </if>
+            <if test="price!= null">
+                and price = #{price}
+            </if>
+            <if test="orderNumber!= null">
+                and orderNumber = #{orderNumber}
+            </if>
+            <if test="merchantCode!= null">
+                and merchantCode = #{merchantCode}
+            </if>
+            <if test="merchantName!= null">
+                and merchantName like CONCAT('%',#{merchantName},'%')
+            </if>
+            <if test="consumeFee!= null">
+                and consumeFee = #{consumeFee}
+            </if>
+            <if test="createDt!= null">
+                and createDt = #{createDt}
+            </if>
+            <if test="orderDt!= null">
+                and orderDt = #{orderDt}
+            </if>
+            <if test="status!= null">
+                and status = #{status}
+            </if>
+
+            <if test="payTypeCode!= null">
+                and payTypeCode = #{payTypeCode}
+            </if>
+            <if test="payTypeName!= null">
+                and payTypeName = #{payTypeName}
+            </if>
+            <if test="merchantLogo!= null">
+                and merchantLogo = #{merchantLogo}
+            </if>
+            <if test="level!= null">
+                and level = #{level}
+            </if>
+            <if test="merchantParentId!= null">
+                and merchantParentId = #{merchantParentId}
+            </if>
+            <if test="merchantParentName!= null">
+                and merchantParentName = #{merchantParentName}
+            </if>
+            <if test="merchantParentLogo!= null">
+                and merchantParentLogo = #{merchantParentLogo}
+            </if>
+            <if test="startTime!= null">
+                and createDt &gt; #{startTime}
+            </if>
+            <if test="endTime!= null">
+                and createDt &lt; #{endTime}
+            </if>
+            <if test="retype!= null">
+                and type !=4
+            </if>
+            <if test="phone!= null">
+                and phone = #{phone}
+            </if>
+            <if test="userName!= null">
+                and userName = #{userName}
+            </if>
+            <if test="merchantParentLevel!= null">
+                and merchantParentLevel = #{merchantParentLevel}
+            </if>
+            <if test="merchantParentPhone!= null">
+                and merchantParentPhone = #{merchantParentPhone}
+            </if>
+            <if test="recordDate != null">
+                and recordDate = #{recordDate}
+            </if>
+            <if test="recordDateStart != null">
+                and recordDate &gt;= #{recordDateStart}
+            </if>
+            <if test="recordDateEnd != null">
+                and recordDate &lt;= #{recordDateEnd}
+            </if>
+            <if test="recordMonth != null">
+                and recordMonth = #{recordMonth}
+            </if>
+            <if test="recordMonthStart != null">
+                and recordMonth &gt;= #{recordMonthStart}
+            </if>
+            <if test="recordMonthEnd != null">
+                and recordMonth &lt;= #{recordMonthEnd}
+            </if>
+        </where>
+    </select>
+
+
+    <select id="queryMerchantProfitSumConsumeFee" parameterType="java.util.Map" resultType="java.lang.Double">
+        SELECT sum(consumeFee) from tb_pluss_merchant_profit
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="userId!= null">
+                and userId = #{userId}
+            </if>
+            <if test="agentStaffId != null">
+                and agentStaffId = #{agentStaffId}
+            </if>
+            <if test="type!= null">
+                and type = #{type}
+            </if>
+            <if test="price!= null">
+                and price = #{price}
+            </if>
+            <if test="orderNumber!= null">
+                and orderNumber = #{orderNumber}
+            </if>
+            <if test="merchantCode!= null">
+                and merchantCode = #{merchantCode}
+            </if>
+            <if test="merchantName!= null">
+                and merchantName = #{merchantName}
+            </if>
+            <if test="consumeFee!= null">
+                and consumeFee = #{consumeFee}
+            </if>
+            <if test="createDt!= null">
+                and createDt = #{createDt}
+            </if>
+            <if test="orderDt!= null">
+                and orderDt = #{orderDt}
+            </if>
+            <if test="status!= null">
+                and status = #{status}
+            </if>
+
+            <if test="payTypeCode!= null">
+                and payTypeCode = #{payTypeCode}
+            </if>
+            <if test="payTypeName!= null">
+                and payTypeName = #{payTypeName}
+            </if>
+            <if test="merchantLogo!= null">
+                and merchantLogo = #{merchantLogo}
+            </if>
+            <if test="level!= null">
+                and level = #{level}
+            </if>
+            <if test="merchantParentId!= null">
+                and merchantParentId = #{merchantParentId}
+            </if>
+            <if test="merchantParentName!= null">
+                and merchantParentName = #{merchantParentName}
+            </if>
+            <if test="merchantParentLogo!= null">
+                and merchantParentLogo = #{merchantParentLogo}
+            </if>
+            <if test="stTime!= null">
+                and createDt &gt;= #{stTime}
+            </if>
+            <if test="enTime!= null">
+                and createDt &lt;= #{enTime}
+            </if>
+            <if test="startTime!= null">
+                and createDt &gt;= #{startTime}
+            </if>
+            <if test="endTime!= null">
+                and createDt &lt; #{endTime}
+            </if>
+            <if test="merchantCodeList!= null">
+                and merchantCode in
+                <foreach collection="merchantCodeList" item="item" open="(" close=")" index="index" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="phone!= null">
+                and phone = #{phone}
+            </if>
+            <if test="userName!= null">
+                and userName = #{userName}
+            </if>
+            <if test="merchantParentLevel!= null">
+                and merchantParentLevel = #{merchantParentLevel}
+            </if>
+            <if test="merchantParentPhone!= null">
+                and merchantParentPhone = #{merchantParentPhone}
+            </if>
+            <if test="retype!= null">
+                and type !=4
+            </if>
+        </where>
+    </select>
+
+
+    <select id="queryMerchantProfitSumPrice" parameterType="java.util.Map" resultType="java.lang.Double">
+        SELECT sum(price) from tb_pluss_merchant_profit profit
+        <where>
+            <if test="id!= null">
+                and profit.id = #{id}
+            </if>
+            <if test="agentStaffId != null">
+                and profit.agentStaffId = #{agentStaffId}
+            </if>
+            <if test="userId!= null">
+                and profit.userId = #{userId}
+            </if>
+            <if test="type!= null">
+                and profit.type = #{type}
+            </if>
+            <if test="price!= null">
+                and profit.price = #{price}
+            </if>
+            <if test="orderNumber!= null">
+                and profit.orderNumber = #{orderNumber}
+            </if>
+            <if test="merchantCode!= null">
+                and profit.merchantCode = #{merchantCode}
+            </if>
+            <if test="merchantName!= null">
+                and profit.merchantName = #{merchantName}
+            </if>
+            <if test="agentStaffId != null">
+                and profit.agentStaffId = #{agentStaffId}
+            </if>
+            <if test="consumeFee!= null">
+                and profit.consumeFee = #{consumeFee}
+            </if>
+            <if test="createDt!= null">
+                and profit.createDt = #{createDt}
+            </if>
+            <if test="stTime!= null">
+                and profit.createDt &gt;= #{stTime}
+            </if>
+            <if test="enTime!= null">
+                and profit.createDt &lt;= #{enTime}
+            </if>
+            <if test="orderDt!= null">
+                and profit.orderDt = #{orderDt}
+            </if>
+            <if test="status!= null">
+                and profit.status = #{status}
+            </if>
+            <if test="startTime!= null">
+                and profit.createDt &gt; #{startTime}
+            </if>
+            <if test="endTime!= null">
+                and profit.createDt &lt; #{endTime}
+            </if>
+            <if test="payTypeCode!= null">
+                and profit.payTypeCode = #{payTypeCode}
+            </if>
+            <if test="payTypeName!= null">
+                and profit.payTypeName = #{payTypeName}
+            </if>
+            <if test="merchantLogo!= null">
+                and profit.merchantLogo = #{merchantLogo}
+            </if>
+            <if test="level!= null">
+                and profit.level = #{level}
+            </if>
+            <if test="merchantParentId!= null">
+                and profit.merchantParentId = #{merchantParentId}
+            </if>
+            <if test="merchantParentName!= null">
+                and profit.merchantParentName = #{merchantParentName}
+            </if>
+            <if test="merchantParentLogo!= null">
+                and profit.merchantParentLogo = #{merchantParentLogo}
+            </if>
+            <if test="merchantCodeList!= null">
+                and profit.merchantCode in
+                <foreach collection="merchantCodeList" item="item" open="(" close=")" index="index" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="phone!= null">
+                and profit.phone = #{phone}
+            </if>
+            <if test="userName!= null">
+                and profit.userName = #{userName}
+            </if>
+            <if test="merchantParentLevel!= null">
+                and profit.merchantParentLevel = #{merchantParentLevel}
+            </if>
+            <if test="merchantParentPhone!= null">
+                and profit.merchantParentPhone = #{merchantParentPhone}
+            </if>
+            <if test="retype!= null">
+                and profit.type !=4
+            </if>
+            <if test="recordDate != null">
+                and profit.recordDate = #{recordDate}
+            </if>
+            <if test="recordDateStart != null">
+                and profit.recordDate &gt;= #{recordDateStart}
+            </if>
+            <if test="recordDateEnd != null">
+                and profit.recordDate &lt;= #{recordDateEnd}
+            </if>
+        </where>
+    </select>
+
+
+    <select id="queryMerchantProfitPageCountGroupByOrderNumber" parameterType="java.util.Map"
+            resultType="java.lang.Integer">
+        SELECT count(*) from tb_pluss_merchant_profit
+        <where>
+            <if test="agentStaffId != null">
+                and agentStaffId = #{agentStaffId}
+            </if>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="userId!= null">
+                and userId = #{userId}
+            </if>
+            <if test="type!= null">
+                and type = #{type}
+            </if>
+            <if test="price!= null">
+                and price = #{price}
+            </if>
+            <if test="orderNumber!= null">
+                and orderNumber = #{orderNumber}
+            </if>
+            <if test="merchantCode!= null">
+                and merchantCode = #{merchantCode}
+            </if>
+            <if test="merchantName!= null">
+                and merchantName like CONCAT('%',#{merchantName},'%')
+            </if>
+            <if test="consumeFee!= null">
+                and consumeFee = #{consumeFee}
+            </if>
+            <if test="createDt!= null">
+                and createDt = #{createDt}
+            </if>
+            <if test="orderDt!= null">
+                and orderDt = #{orderDt}
+            </if>
+            <if test="status!= null">
+                and status = #{status}
+            </if>
+
+            <if test="payTypeCode!= null">
+                and payTypeCode = #{payTypeCode}
+            </if>
+            <if test="payTypeName!= null">
+                and payTypeName = #{payTypeName}
+            </if>
+            <if test="merchantLogo!= null">
+                and merchantLogo = #{merchantLogo}
+            </if>
+            <if test="level!= null">
+                and level = #{level}
+            </if>
+            <if test="merchantParentId!= null">
+                and merchantParentId = #{merchantParentId}
+            </if>
+            <if test="merchantParentName!= null">
+                and merchantParentName = #{merchantParentName}
+            </if>
+            <if test="merchantParentLogo!= null">
+                and merchantParentLogo = #{merchantParentLogo}
+            </if>
+            <if test="startTime!= null">
+                and createDt &gt; #{startTime}
+            </if>
+            <if test="endTime!= null">
+                and createDt &lt; #{endTime}
+            </if>
+            <if test="retype!= null">
+                and type !=4
+            </if>
+            <if test="phone!= null">
+                and phone = #{phone}
+            </if>
+            <if test="userName!= null">
+                and userName = #{userName}
+            </if>
+            <if test="merchantParentLevel!= null">
+                and merchantParentLevel = #{merchantParentLevel}
+            </if>
+            <if test="merchantParentPhone!= null">
+                and merchantParentPhone = #{merchantParentPhone}
+            </if>
+        </where>
+        group by orderNumber
+    </select>
+
+
+    <select id="queryMerchantBillWithProfit" resultType="cn.pluss.platform.dto.MerchantFeeDTO">
+        SELECT tmpo.merchantCode, SUM(tmpo.consumeFee) money, SUM(profit.price) profit FROM tb_pluss_merchant_profit profit
+        LEFT JOIN tb_pluss_merchant_order tmpo ON tmpo.orderNumber = profit.orderNumber
+        WHERE profit.userId = #{userId} AND tmpo.status = '1' AND tmpo.merchantCode IN
+        <foreach collection="merchantCodeList" close=")" item="item" open="(" separator=",">
+            #{item}
+        </foreach>
+        <if test="startTime != null">
+            AND tmpo.createDt &gt;= #{startTime}
+        </if>
+        <if test="endTime != null">
+            AND tmpo.createDt &lt;= #{endTime}
+        </if>
+        GROUP BY tmpo.merchantCode
+    </select>
+
+    <update id="updateBatch" parameterType="java.util.List">
+        update tb_pluss_merchant_profit
+        <trim prefix="set" suffixOverrides=",">
+            <trim prefix="price = case" suffix="end,">
+                <foreach collection="list" item="i" index="index">
+                    <if test="i.price != null">
+                        when id=#{i.id} then #{i.price}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix=" profitRate = case" suffix="end,">
+                <foreach collection="list" item="i" index="index">
+                    <if test="i.profitRate != null">
+                        when id=#{i.id} then #{i.profitRate}
+                    </if>
+                </foreach>
+            </trim>
+        </trim>
+        where
+        <foreach collection="list" separator="or" item="i" index="index">
+            id=#{i.id}
+        </foreach>
+    </update>
+
+    <select id="getProfitCount" parameterType="java.util.Map" resultType="java.util.Map">
+    SELECT
+    IFNULL(SUM(mp.consumeFee),0.00) AS transAmountCount,
+    IFNULL(sum(mp.price),0.00) AS shareAmountCount,
+    IFNULL(SUM(CASE WHEN mp.type = 4 THEN mp.price end),0.00) AS toUpShareAmtCount,
+    IFNULL(SUM(CASE WHEN mp.type <![CDATA[ <> ]]> 4 THEN mp.price end),0.00) AS mercShareAmtCount
+    FROM tb_pluss_merchant_profit mp
+    LEFT JOIN tb_pluss_user_info ui ON mp.userId = ui.id
+    LEFT JOIN tb_pluss_user_app ua ON mp.userId = ua.userId
+    <where>
+        <if test="userId != null and userId != ''">
+            and mp.userId = #{userId}
+        </if>
+        <if test="profitName != null and profitName != ''">
+            and ua.userName = #{profitName}
+        </if>
+        <if test="startDate != null and startDate != ''">
+            and DATE_FORMAT(mp.createDt,'%Y-%m-%d') <![CDATA[ >= ]]> #{startDate}
+        </if>
+        <if test="endDate != null and endDate != ''">
+            and DATE_FORMAT(mp.createDt,'%Y-%m-%d') <![CDATA[ <= ]]> #{endDate}
+        </if>
+    </where>
+    </select>
+
+    <select id="queryMerchantProfitRate" resultType="java.util.Map">
+        SELECT profit.id, IFNULL(mrr.rate, mr.rate) rateCur
+        FROM tb_pluss_merchant_profit profit LEFT JOIN (
+           SELECT profit.id, profit.userId, MIN(mrr.createTime) createTime
+           FROM
+                (SELECT * FROM  tb_pluss_merchant_profit WHERE userId = #{userId} ) profit
+                    LEFT JOIN
+                (SELECT * FROM  tb_pluss_merchant_rate_record WHERE userId = #{userId} )mrr
+                              ON mrr.userId = profit.userId
+           WHERE profit.createDt &gt; mrr.createTime
+           GROUP BY profit.id, profit.userId
+        ) t ON profit.id = t.id
+        LEFT JOIN tb_pluss_merchant_rate mr ON mr.userId = profit.userId
+        LEFT JOIN tb_pluss_merchant_rate_record mrr ON t.createTime = mrr.createTime AND t.userId = mrr.userId
+        <where>
+            <if test="merchantProfitList != null and merchantProfitList.size() > 0">
+                profit.id IN
+                <foreach collection="merchantProfitList" close=")" item="item" open="(" separator=",">
+                    #{item.id}
+                </foreach>
+            </if>
+        </where>
+    </select>
+    <select id="getProfitAmtCount" resultType="java.util.Map" parameterType="cn.pluss.platform.entity.MerchantProfit">
+        SELECT
+        SUM( price ) as shareAmountCount,
+        SUM( IF ( type = 1, price, 0 ) ) as diretAmountCount,
+        SUM( IF ( type != 1, price, 0 ) ) as teamAmountCount
+        FROM
+        tb_pluss_merchant_profit
+        <where>
+            <if test="userId != null">
+                and userId = #{userId}
+            </if>
+            <if test="orderNumber != null and orderNumber != ''">
+                and orderNumber = #{orderNumber}
+            </if>
+            <if test="recordDate != null">
+                and recordDate = #{recordDate}
+            </if>
+        </where>
+    </select>
+
+    <select id="selectGroupMercProfit" resultType="cn.pluss.platform.entity.MerchantProfit">
+        SELECT sum(price) price, userId FROM tb_pluss_merchant_profit WHERE  `status` =  '1' AND userId IN
+            <foreach collection="userIdList" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        GROUP BY userId
+    </select>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/MerchantQrcodeMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/MerchantQrcodeMapper.xml
new file mode 100644
index 0000000..0008e89
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/MerchantQrcodeMapper.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.MerchantQrcodeMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.MerchantQrcode">
+        <id column="id" property="id"/>
+        <result column="merchantCode" property="merchantCode"/>
+        <result column="merchantName" property="merchantName"/>
+        <result column="qrCodeUrl" property="qrCodeUrl"/>
+        <result column="createTime" property="createTime"/>
+        <result column="updateTime" property="updateTime"/>
+    </resultMap>
+
+    <select id="listPage" resultType="cn.pluss.platform.entity.MerchantQrcode" parameterType="java.util.Map">
+        SELECT mq.id,ua.userId,mq.merchantCode,mg.`name`,mg.`status`,mq.merchantName,mq.qrCodeUrl,mq.createTime,mq.updateTime
+        FROM tb_pluss_merchant_qrcode mq
+	    LEFT JOIN tb_pluss_merchant_guide mg ON mq.merchantCode = mg.merchantCode
+	    LEFT JOIN tb_pluss_user_app ua ON mq.merchantCode = ua.merchantCode
+	    <where>
+            ua.userType = 'promoter'
+            <if test="userId != null and userId != ''">
+                and ua.userId = #{userId}
+            </if>
+            <if test="merchantName != null and merchantName != ''">
+                and mq.merchantName = #{merchantName}
+            </if>
+            <if test="name != null and name != ''">
+                and mg.name like concat("%",#{name},"%")
+            </if>
+        </where>
+        order by mq.createTime desc limit #{pageSize} offset #{offset}
+    </select>
+
+    <select id="countMerchantQrcode" resultType="java.lang.Integer" parameterType="java.util.Map">
+        select count(*)
+        FROM tb_pluss_merchant_qrcode mq
+	    LEFT JOIN tb_pluss_merchant_guide mg ON mq.merchantCode = mg.merchantCode
+	    LEFT JOIN tb_pluss_user_app ua ON mq.merchantCode = ua.merchantCode
+        <where>
+            ua.userType = 'promoter'
+            <if test="userId != null and userId != ''">
+                and ua.userId = #{userId}
+            </if>
+            <if test="merchantName != null and merchantName != ''">
+                and mq.merchantName = #{merchantName}
+            </if>
+            <if test="name != null and name != ''">
+                and mg.name like concat("%",#{name},"%")
+            </if>
+        </where>
+    </select>
+
+    <select id="selectPage" resultType="cn.pluss.platform.entity.MerchantQrcode">
+        SELECT mq.id,ua.userId,mq.merchantCode,mg.`name`,mg.`status`,mq.merchantName,mq.qrCodeUrl,mq.createTime,mq.updateTime
+        FROM tb_pluss_merchant_qrcode mq
+        LEFT JOIN tb_pluss_merchant_guide mg ON mq.merchantCode = mg.merchantCode
+        LEFT JOIN tb_pluss_user_app ua ON mq.merchantCode = ua.merchantCode
+            ${ew.customSqlSegment}
+    </select>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/MerchantRateMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/MerchantRateMapper.xml
new file mode 100644
index 0000000..5a98d93
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/MerchantRateMapper.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.MerchantRateMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.MerchantRate">
+        <id column="id" property="id" />
+        <result column="userId" property="userId" />
+        <result column="rate" property="rate" />
+        <result column="updateTime" property="updateTime" />
+        <result column="previousRate" property="previousRate" />
+        <result column="isFixedRate" property="isFixedRate" />
+        <result column="startTime" property="startTime" />
+        <result column="endTime" property="endTime" />
+    </resultMap>
+    
+    <sql id="baseCol">
+        id, userId, rate, updateTime, previousRate, isFixedRate, startTime, endTime
+    </sql>
+
+    <update id="batchUpdateRate" parameterType="java.util.List">
+        update tb_pluss_merchant_rate
+        <trim prefix="set" suffixOverrides=",">
+            <trim prefix="previousRate =case" suffix="end,">
+                <foreach collection="list" item="i" index="index">
+                    when userId=#{i.userId} then rate
+                </foreach>
+            </trim>
+            <trim prefix="rate =case" suffix="end,">
+                <foreach collection="list" item="i" index="index">
+                    <if test="i.rate!=null">
+                        when userId=#{i.userId} then #{i.rate}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="updateTime =case" suffix="end,">
+                <foreach collection="list" item="i" index="index">
+                    when userId=#{i.userId} then #{i.updateTime}
+                </foreach>
+            </trim>
+        </trim>
+        where
+        <foreach collection="list" separator="or" item="i" index="index" >
+            userId=#{i.userId}
+        </foreach>
+    </update>
+
+    <select id="selectRyxRateChangeList" resultType="cn.pluss.platform.entity.MerchantRate">
+        SELECT <include refid="baseCol" /> FROM (
+            SELECT mr.id, mr.userId, mr.rate, mr.updateTime, mr.previousRate, mr.isFixedRate, mr.startTime, mr.endTime,
+                   DATE_FORMAT(mr.updateTime, "%Y-%m-%d") updateDate,
+                   DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY) yesterdayDate
+            FROM tb_pluss_merchant_rate mr LEFT JOIN tb_pluss_user_app ua ON mr.userId = ua.userId
+            LEFT JOIN tb_pluss_merchant_channel_status mcs ON mcs.merchantCode = ua.merchantCode
+            LEFT JOIN tb_pluss_merchant_channel mc ON mc.id = mcs.channel
+            WHERE mcs.channel = '3' AND mc.`status` = '1'
+        )	t WHERE t.updateDate = t.yesterdayDate;
+    </select>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/MerchantRateNewMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/MerchantRateNewMapper.xml
new file mode 100644
index 0000000..5c4bf11
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/MerchantRateNewMapper.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.MerchantRateNewMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.MerchantRateNew">
+        <id column="id" property="id"/>
+        <result column="channel" property="channel"/>
+        <result column="merchantId" property="merchantId"/>
+        <result column="wxRate" property="wxRate"/>
+        <result column="aliRate" property="aliRate"/>
+        <result column="bankRate" property="bankRate"/>
+        <result column="bankRateLarge" property="bankRateLarge"/>
+        <result column="createTime" property="createTime"/>
+        <result column="updateTime" property="updateTime"/>
+    </resultMap>
+
+    <select id="selectByUserId" resultType="cn.pluss.platform.entity.MerchantRateNew">
+        SELECT mrn.id,
+               mrn.channel,
+               mrn.merchantId,
+               mrn.wxRate,
+               mrn.aliRate,
+               mrn.bankRate,
+               mrn.bankRateLarge,
+               mrn.createTime,
+               mrn.updateTime
+        FROM tb_pluss_merchant_rate_new mrn
+                 LEFT JOIN tb_pluss_merchant_channel_status mcs
+                           ON mrn.merchantId = mcs.merchantId AND mrn.channel = mcs.channel
+                 LEFT JOIN tb_pluss_merchant_base_info mbi ON mcs.merchantCode = mbi.merchantCode
+        WHERE mbi.userId = #{userId}
+          AND mrn.channel = #{channel}
+    </select>
+
+    <select id="selectByMerchantCode" resultType="cn.pluss.platform.entity.MerchantRateNew">
+        SELECT mrn.id,
+               mrn.channel,
+               mrn.merchantId,
+               mrn.wxRate,
+               mrn.aliRate,
+               mrn.bankRate,
+               mrn.bankRateLarge,
+               mrn.createTime,
+               mrn.updateTime
+        FROM tb_pluss_merchant_rate_new mrn
+                 LEFT JOIN tb_pluss_merchant_channel_status mcs
+                           ON mrn.merchantId = mcs.merchantId AND mrn.channel = mcs.channel
+        WHERE mcs.merchantCode = #{merchantCode}
+          AND mrn.channel = #{channel}
+    </select>
+
+    <select id="pageData" resultType="java.util.Map">
+        SELECT mbi.userId,
+        mbi.alias,
+        mbi.merchantCode,
+        mcs2.merchantId,
+        IF(mcs.`status` IS NULL, '-', IFNULL(mrn.wxRate, 38)) wxRateD1,
+        IF(mcs.`status` IS NULL, '-', IFNULL(mrn.aliRate, 38)) aliRateD1,
+        IF(mcs.`status` IS NULL, '-', IFNULL(mrn.bankRate, 36)) bankRateD1,
+        IF(mcs.`status` IS NULL OR mcs.channel = '1', '-', IFNULL(mrn.bankRateLarge, 35)) bankRateLargeD1,
+        IF(mcs2.`status` IS NULL, '-', IFNULL(mrn2.wxRate, 38)) wxRateD0,
+        IF(mcs2.`status` IS NULL, '-', IFNULL(mrn2.aliRate, 38)) aliRateD0,
+        IF(mcs2.`status` IS NULL, '-', IFNULL(mrn2.bankRate, 36)) bankRateD0,
+        IF(mcs2.`status` IS NULL, '-', IFNULL(mrn2.bankRateLarge, 35)) bankRateLargeD0,
+        mrnr.wxRate wxRateEditD0,
+        mrnr.aliRate aliRateEditD0,
+        mrnr.bankRate bankRateEditD0,
+        mrnr.bankRateLarge bankRateLargeEditD0,
+        IFNULL(mrnr.createTime, mcs.updateTime) createTime,
+        IF(mcs2.`status` IS NULL, '-1', IFNULL(mrnr.`status`, '1')) status
+        FROM tb_pluss_merchant_base_info mbi
+        LEFT JOIN tb_pluss_merchant_channel_status mcs
+        ON mbi.merchantCode = mcs.merchantCode AND mcs.channel IN (1, 3)
+        LEFT JOIN tb_pluss_merchant_rate_new mrn
+        ON mrn.channel = mcs.channel AND mrn.merchantId = mcs.merchantId AND
+        mrn.channel IN (1, 3) AND mcs.channel IN (1, 3)
+        LEFT JOIN tb_pluss_merchant_channel_status mcs2
+        ON mbi.merchantCode = mcs2.merchantCode AND mcs2.channel = 4
+        LEFT JOIN tb_pluss_merchant_rate_new mrn2
+        ON mrn2.merchantId = mcs2.merchantId AND mrn2.channel = mcs2.channel AND mrn2.channel = 4 AND
+        mcs2.channel = 4
+        LEFT JOIN tb_pluss_merchant_rate_new_record mrnr ON mrnr.merchantId = mcs2.merchantId
+        AND mrnr.channel = mcs2.channel AND mrnr.`status` = 0 AND mrnr.channel = 4 AND mcs2.applicationId IS NULL
+        <where>
+            <if test="condition.status != null and condition.status != ''">
+                AND mrnr.status = #{condition.status}
+            </if>
+
+            <if test="condition.userId != null and condition.userId != ''">
+                AND mbi.userId = #{condition.userId}
+            </if>
+        </where>
+
+        ORDER BY mrnr.updateTime DESC
+    </select>
+
+    <select id="pageTempSxfRateNoChange" resultType="cn.pluss.platform.entity.MerchantRateNew">
+        SELECT DISTINCT 1 channel, mbi.userId, mcs.merchantId, IFNULL(mr.rate, 38) wxRate, IFNULL(mr.rate, 38) aliRate, IFNULL(mr.rate, 38) bankRate, -1 bankRateLarge FROM tb_pluss_merchant_base_info mbi
+            LEFT JOIN tb_pluss_merchant_channel_status mcs ON mbi.merchantCode = mcs.merchantCode
+            LEFT JOIN tb_pluss_merchant_rate mr ON mbi.userId = mr.userId
+            LEFT JOIN tb_pluss_rate_operation_temp rot ON rot.channel = mcs.channel AND rot.merchantId = mcs.merchantId
+        WHERE mcs.channel = 1 AND mcs.`status` = 3 AND rot.id IS NULL
+    </select>
+
+    <select id="pageTempRyxRateNoChange" resultType="cn.pluss.platform.entity.MerchantRateNew">
+        SELECT DISTINCT 3 channel, mbi.userId, mcs.merchantId, IFNULL(mr.rate, 38) wxRate, IFNULL(mr.rate, 38) aliRate, IFNULL(mr.rate, 38) bankRate, IFNULL(mr.rate, 38) bankRateLarge FROM tb_pluss_merchant_base_info mbi
+            LEFT JOIN tb_pluss_merchant_channel_status mcs ON mbi.merchantCode = mcs.merchantCode
+            LEFT JOIN tb_pluss_merchant_rate mr ON mbi.userId = mr.userId
+            LEFT JOIN tb_pluss_rate_operation_temp rot ON rot.channel = mcs.channel AND rot.merchantId = mcs.merchantId
+        WHERE mcs.channel = 3 AND mcs.`status` = 3 AND rot.id IS NULL
+    </select>
+
+    <select id="pageTempYsRateNoChange" resultType="cn.pluss.platform.entity.MerchantRateNew">
+        SELECT DISTINCT 4 channel, mbi.userId, mcs.merchantId, IFNULL(mr.rate, 38) wxRate, IFNULL(mr.rate, 38) aliRate, IFNULL(mr.rate, 38) bankRate, IFNULL(mr.rate, 38) bankRateLarge FROM tb_pluss_merchant_base_info mbi
+            LEFT JOIN tb_pluss_merchant_channel_status mcs ON mbi.merchantCode = mcs.merchantCode
+            LEFT JOIN tb_pluss_merchant_rate mr ON mbi.userId = mr.userId
+            LEFT JOIN tb_pluss_rate_operation_temp rot ON rot.channel = mcs.channel AND rot.merchantId = mcs.merchantId
+        WHERE mcs.channel = 4 AND mcs.`status` = 3 AND rot.id IS NULL
+    </select>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/MerchantRateNewRecordMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/MerchantRateNewRecordMapper.xml
new file mode 100644
index 0000000..583a2d9
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/MerchantRateNewRecordMapper.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.MerchantRateNewRecordMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.MerchantRateNewRecord">
+        <id column="id" property="id" />
+        <result column="channel" property="channel" />
+        <result column="merchantId" property="merchantId" />
+        <result column="wxRate" property="wxRate" />
+        <result column="aliRate" property="aliRate" />
+        <result column="bankRate" property="bankRate" />
+        <result column="bankRateLarge" property="bankRateLarge" />
+        <result column="status" property="status" />
+        <result column="createTime" property="createTime" />
+        <result column="updateTime" property="updateTime" />
+    </resultMap>
+
+    <select id="selectLastExaminedDataByUserId" resultType="cn.pluss.platform.entity.MerchantRateNewRecord">
+        SELECT
+            mrnr.id, mrnr.channel, mrnr.merchantId, mrnr.wxRate, mrnr.aliRate,
+               mrnr.bankRate, mrnr.bankRateLarge, mrnr.createTime, mrnr.updateTime, mrnr.`status`
+        FROM tb_pluss_merchant_rate_new_record mrnr
+                 LEFT JOIN tb_pluss_merchant_channel_status mcs ON mrnr.merchantId = mcs.merchantId AND mrnr.channel = mcs.channel
+                 LEFT JOIN tb_pluss_merchant_base_info mbi ON mcs.merchantCode = mbi.merchantCode
+        WHERE mbi.userId = #{userId} AND mrnr.status IN (0, 3) AND mrnr.channel = #{channel}
+        ORDER BY mrnr.createTime DESC LIMIT 1
+    </select>
+
+    <select id="selectLastExaminedDataByMerchantCode"
+            resultType="cn.pluss.platform.entity.MerchantRateNewRecord">
+        SELECT
+            mrnr.id, mrnr.channel, mrnr.merchantId, mrnr.wxRate, mrnr.aliRate,
+               mrnr.bankRate, mrnr.bankRateLarge, mrnr.createTime, mrnr.updateTime, mrnr.`status`
+        FROM tb_pluss_merchant_rate_new_record mrnr
+                 LEFT JOIN tb_pluss_merchant_channel_status mcs ON mrnr.merchantId = mcs.merchantId AND mrnr.channel = mcs.channel
+        WHERE mcs.merchantCode = #{merchantCode} AND mrnr.status IN (0, 3) AND mrnr.channel = #{channel}
+        ORDER BY mrnr.createTime DESC LIMIT 1
+    </select>
+
+    <select id="selectValidDataByMerchantCode"
+            resultType="cn.pluss.platform.entity.MerchantRateNewRecord">
+        SELECT
+            mrnr.id, mrnr.channel, mrnr.merchantId, mrnr.wxRate, mrnr.aliRate,
+            mrnr.bankRate, mrnr.bankRateLarge, mrnr.createTime, mrnr.updateTime, mrnr.`status`
+        FROM tb_pluss_merchant_rate_new_record mrnr
+                 LEFT JOIN tb_pluss_merchant_channel_status mcs ON mrnr.merchantId = mcs.merchantId AND mrnr.channel = mcs.channel
+        WHERE mcs.merchantCode = #{merchantCode} AND mrnr.status IN (0, 1, 3) AND mrnr.channel = #{channel}
+        ORDER BY mrnr.createTime DESC LIMIT 1
+    </select>
+
+    <select id="selectRyxRateChangeList" resultType="cn.pluss.platform.entity.MerchantRateNewRecord">
+        SELECT * FROM (
+            SELECT mrn.*, DATE_FORMAT(mrn.updateTime, "%Y-%m-%d") updateDate, DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY) yesterdayDate
+            FROM tb_pluss_merchant_rate_new_record mrn
+               LEFT JOIN tb_pluss_merchant_channel_status mcs ON mcs.merchantId = mrn.merchantId
+               LEFT JOIN tb_pluss_user_app ua ON ua.merchantCode = mcs.merchantCode
+               LEFT JOIN tb_pluss_merchant_channel mc ON mc.id = mcs.channel
+            WHERE mcs.channel = '3' AND mc.`status` = '1' AND mrn.`status` = 0 AND ua.userType = 'promoter'
+        ) t WHERE t.updateDate &lt;= t.yesterdayDate;
+    </select>
+
+    <select id="selectSxfRateChangeList" resultType="cn.pluss.platform.entity.MerchantRateNewRecord">
+        SELECT * FROM (
+              SELECT mrn.*, DATE_FORMAT(mrn.updateTime, "%Y-%m-%d") updateDate, DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY) yesterdayDate
+              FROM tb_pluss_merchant_rate_new_record mrn
+                       LEFT JOIN tb_pluss_merchant_channel_status mcs ON mcs.merchantId = mrn.merchantId
+                       LEFT JOIN tb_pluss_user_app ua ON ua.merchantCode = mcs.merchantCode
+                       LEFT JOIN tb_pluss_merchant_channel mc ON mc.id = mcs.channel
+              WHERE mcs.channel = '1' AND mc.`status` = '1' AND mrn.`status` = 3 AND ua.userType = 'promoter'
+          ) t WHERE t.updateDate &lt;= t.yesterdayDate;
+    </select>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/MerchantRateRecordMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/MerchantRateRecordMapper.xml
new file mode 100644
index 0000000..601aacb
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/MerchantRateRecordMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.MerchantRateRecordMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.MerchantRateRecord">
+        <id column="id" property="id" />
+        <result column="userId" property="userId" />
+        <result column="rate" property="rate" />
+        <result column="createTime" property="createTime" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/MerchantRefundOrderMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/MerchantRefundOrderMapper.xml
new file mode 100644
index 0000000..aecbff6
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/MerchantRefundOrderMapper.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.MerchantRefundOrderMapper">
+
+
+
+    <select id="queryRefundOrderJoinPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+        select  count(1) from (SELECT
+	    ro.merchantCode,
+	    ro.alias
+        FROM
+        tb_pluss_merchant_refund_order ro
+        LEFT JOIN tb_pluss_merchant_store ms ON ro.merchantCode = ms.merchantCode
+        LEFT JOIN tb_pluss_merchant_transfer mt ON ro.merchantCode = mt.merchantCode
+        where  ms.isMarket = 1 AND ro.`status` = 1
+        GROUP BY ro.merchantCode) a
+        <where>
+            <if test="alias != null and alias != ''">
+                and alias LIKE CONCAT('%',#{alias},'%')
+            </if>
+        </where>
+    </select>
+
+    <select id="queryRefundOrderJoinPage" parameterType="java.util.Map" resultType="cn.pluss.platform.entity.MerchantRefundOrder">
+        SELECT * FROM (
+        SELECT
+            ro.merchantCode,
+            ro.alias,
+            IFNULL( sum( ro.payAmt ), 0.00 ) AS refundAmtCount,
+            count( ro.merchantCode ) AS refunCount,
+            IFNUll( SUM( mt.amount ), 0.00 ) AS transferAmtCount
+        FROM
+            tb_pluss_merchant_refund_order ro
+            LEFT JOIN tb_pluss_merchant_store ms ON ro.merchantCode = ms.merchantCode
+            LEFT JOIN tb_pluss_merchant_transfer mt ON ro.merchantCode = mt.merchantCode
+        WHERE
+            ms.isMarket = 1
+            AND ro.`status` = 1
+        GROUP BY
+            ro.merchantCode
+        ) a
+        <where>
+            <if test="alias != null and alias != ''">
+               and alias LIKE CONCAT('%',#{alias},'%')
+            </if>
+        </where>
+
+        ORDER BY refundAmtCount desc
+        limit #{pageSize}  offset  #{offset}
+    </select>
+
+    <select id="pageDate" resultType="cn.pluss.platform.entity.MerchantRefundOrder">
+        select *
+        from tb_pluss_merchant_refund_order
+        <where>
+            <if test="refundOrder.orderNumber != null and refundOrder.orderNumber != '' ">
+                and orderNumber=#{refundOrder.orderNumber}
+            </if>
+            <if test="refundOrder.channelNo != null and refundOrder.channelNo != ''">
+                and channelNo=#{refundOrder.channelNo}
+            </if>
+            <if test="refundOrder.refundNo != null and refundOrder.refundNo !=''">
+                and refundNo=#{refundOrder.refundNo}
+            </if>
+            <if test="refundOrder.orderType != null and refundOrder.orderType != ''">
+                and orderType=#{refundOrder.orderType}
+            </if>
+            <if test="refundOrder.payTypeCodeList != null">
+                and (
+                <foreach collection="refundOrder.payTypeCodeList" item="item" index="index" separator="or">
+                    payTypeCode = #{item}
+                </foreach>
+                )
+            </if>
+            <if test="refundOrder.alias != null and refundOrder.alias != '' ">
+                and alias = #{refundOrder.alias}
+            </if>
+            <if test="refundOrder.merchantCode != null and refundOrder.merchantCode != ''">
+                and merchantCode IN (SELECT merchantCode
+                FROM tb_pluss_merchant_base_info
+                WHERE bindingCode = (SELECT bindingCode
+                FROM tb_pluss_merchant_base_info
+                where merchantCode = #{refundOrder.merchantCode}))
+            </if>
+        </where>
+        order by payTime desc
+    </select>
+
+    <select id="getPlatformRefundData" resultType="java.util.Map">
+        SELECT
+            IFNULL(SUM(IFNULL(refundAmt,payAmt)),0) as toDayRefundCount,
+            IFNULL(SUM(IF(payTypeCode = 'wechatPay' or payTypeCode = 'sxfPay1',refundAmt,0)),0) as toDayRefundWxCount,
+            IFNULL(SUM(IF(payTypeCode = 'aliPay' or payTypeCode = 'sxfPay0',refundAmt,0)),0) as toDayRefundAliCount,
+            IFNULL(SUM(IF(payTypeCode = 'bank' or payTypeCode = 'sxfPay2',refundAmt,0)),0) as toDayRefundUnionCount
+        FROM tb_pluss_merchant_refund_order
+        WHERE `status` = 1 AND date(createTime) = curdate()
+    </select>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/MerchantRegistAuditRecord-sqlmap.xml b/pluss-dao-bundle/src/main/resources/mapper/MerchantRegistAuditRecord-sqlmap.xml
new file mode 100644
index 0000000..18f8350
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/MerchantRegistAuditRecord-sqlmap.xml
@@ -0,0 +1,231 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+			"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="cn.pluss.platform.mapper.MerchantRegistAuditRecordMapper">
+
+	   	<insert id="saveMerchantRegistAuditRecord" parameterType="cn.pluss.platform.entity.MerchantRegistAuditRecord">
+        	insert into tb_pluss_merchant_regist_audit_record(merchantCode,merchantName,agentCode,agentName,creator,message,type,status,failReason,creatDt,modifyStatus)VALUES(#{merchantCode},#{merchantName},#{agentCode},#{agentName},#{creator},#{message},#{type},#{status},#{failReason},#{creatDt},#{modifyStatus})
+    	</insert>
+
+	   	<insert id="saveMerchantRegistAuditRecordBatch">
+        	insert into tb_pluss_merchant_regist_audit_record(merchantCode,merchantName,agentCode,agentName,creator,message,type,status,failReason,creatDt,modifyStatus) VALUES 
+    			<foreach collection="list" item="item" index="index" separator=",">
+			(#{merchantCode},#{merchantName},#{agentCode},#{agentName},#{creator},#{message},#{type},#{status},#{failReason},#{creatDt},#{modifyStatus}		)
+				</foreach>
+    	</insert>
+
+		<select id="queryMerchantRegistAuditRecord" parameterType="cn.pluss.platform.entity.MerchantRegistAuditRecord" resultType="cn.pluss.platform.entity.MerchantRegistAuditRecord">
+			SELECT * from tb_pluss_merchant_regist_audit_record 
+				<where> 
+					<if test="id!= null"> 
+					 	and id = #{id}
+					 </if> 
+					<if test="merchantCode!= null"> 
+					 	and merchantCode = #{merchantCode}
+					 </if> 
+					<if test="merchantName!= null"> 
+					 	and merchantName = #{merchantName}
+					 </if> 
+					<if test="agentCode!= null"> 
+					 	and agentCode = #{agentCode}
+					 </if> 
+					<if test="agentName!= null"> 
+					 	and agentName = #{agentName}
+					 </if> 
+					<if test="creator!= null"> 
+					 	and creator = #{creator}
+					 </if> 
+					<if test="message!= null"> 
+					 	and message = #{message}
+					 </if> 
+					<if test="type!= null"> 
+					 	and type = #{type}
+					 </if> 
+					<if test="status!= null"> 
+					 	and status = #{status}
+					 </if> 
+					<if test="failReason!= null"> 
+					 	and failReason = #{failReason}
+					 </if> 
+					<if test="creatDt!= null"> 
+					 	and creatDt = #{creatDt}
+					 </if> 
+					<if test="modifyStatus!= null"> 
+					 	and modifyStatus = #{modifyStatus}
+					 </if> 
+				 </where> 
+		</select>
+
+		<select id="queryMerchantRegistAuditRecordList" parameterType="cn.pluss.platform.entity.MerchantRegistAuditRecord" resultType="cn.pluss.platform.entity.MerchantRegistAuditRecord">
+			SELECT * from tb_pluss_merchant_regist_audit_record 
+				<where> 
+					<if test="id!= null"> 
+					 and 	id = #{id}
+					 </if> 
+					<if test="merchantCode!= null"> 
+					 and 	merchantCode = #{merchantCode}
+					 </if> 
+					<if test="merchantName!= null"> 
+					 and 	merchantName = #{merchantName}
+					 </if> 
+					<if test="agentCode!= null"> 
+					 and 	agentCode = #{agentCode}
+					 </if> 
+					<if test="agentName!= null"> 
+					 and 	agentName = #{agentName}
+					 </if> 
+					<if test="creator!= null"> 
+					 and 	creator = #{creator}
+					 </if> 
+					<if test="message!= null"> 
+					 and 	message = #{message}
+					 </if> 
+					<if test="type!= null"> 
+					 and 	type = #{type}
+					 </if> 
+					<if test="status!= null"> 
+					 and 	status = #{status}
+					 </if> 
+					<if test="failReason!= null"> 
+					 and 	failReason = #{failReason}
+					 </if> 
+					<if test="creatDt!= null"> 
+					 and 	creatDt = #{creatDt}
+					 </if> 
+					<if test="modifyStatus!= null"> 
+					 and 	modifyStatus = #{modifyStatus}
+					 </if> 
+				 </where> 
+		</select>
+
+		<update id="updateMerchantRegistAuditRecord" parameterType="cn.pluss.platform.entity.MerchantRegistAuditRecord" >
+			update tb_pluss_merchant_regist_audit_record 
+				  <set> 
+					<if test="merchantCode!= null"> 
+					 	merchantCode = #{merchantCode},
+					 </if> 
+					<if test="merchantName!= null"> 
+					 	merchantName = #{merchantName},
+					 </if> 
+					<if test="agentCode!= null"> 
+					 	agentCode = #{agentCode},
+					 </if> 
+					<if test="agentName!= null"> 
+					 	agentName = #{agentName},
+					 </if> 
+					<if test="creator!= null"> 
+					 	creator = #{creator},
+					 </if> 
+					<if test="message!= null"> 
+					 	message = #{message},
+					 </if> 
+					<if test="type!= null"> 
+					 	type = #{type},
+					 </if> 
+					<if test="status!= null"> 
+					 	status = #{status},
+					 </if> 
+					<if test="failReason!= null"> 
+					 	failReason = #{failReason},
+					 </if> 
+					<if test="creatDt!= null"> 
+					 	creatDt = #{creatDt},
+					 </if> 
+					<if test="modifyStatus!= null"> 
+					 	modifyStatus = #{modifyStatus}
+					 </if> 
+				</set>
+			where id=#{id} 
+		</update>
+
+		<delete id="deleteMerchantRegistAuditRecord" parameterType="cn.pluss.platform.entity.MerchantRegistAuditRecord" >
+			DELETE FROM tb_pluss_merchant_regist_audit_record where id=#{id}
+		</delete>
+
+		<select id="queryMerchantRegistAuditRecordPage" parameterType="java.util.Map" resultType="cn.pluss.platform.entity.MerchantRegistAuditRecord">
+			SELECT * from tb_pluss_merchant_regist_audit_record 
+				<where> 
+					<if test="id!= null"> 
+					and id = #{id}
+					 </if> 
+					<if test="merchantCode!= null"> 
+					and merchantCode = #{merchantCode}
+					 </if> 
+					<if test="merchantName!= null"> 
+					and merchantName = #{merchantName}
+					 </if> 
+					<if test="agentCode!= null"> 
+					and agentCode = #{agentCode}
+					 </if> 
+					<if test="agentName!= null"> 
+					and agentName = #{agentName}
+					 </if> 
+					<if test="creator!= null"> 
+					and creator = #{creator}
+					 </if> 
+					<if test="message!= null"> 
+					and message = #{message}
+					 </if> 
+					<if test="type!= null"> 
+					and type = #{type}
+					 </if> 
+					<if test="status!= null"> 
+					and status = #{status}
+					 </if> 
+					<if test="failReason!= null"> 
+					and failReason = #{failReason}
+					 </if> 
+					<if test="creatDt!= null"> 
+					and creatDt = #{creatDt}
+					 </if> 
+					<if test="modifyStatus!= null"> 
+					and modifyStatus = #{modifyStatus}
+					 </if> 
+				 </where> 
+			order by id desc  limit #{pageSize}  offset  #{offset}  
+		</select>
+
+		<select id="queryMerchantRegistAuditRecordPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+			SELECT count(*) from tb_pluss_merchant_regist_audit_record 
+					<where> 
+					<if test="id!= null"> 
+					 and id = #{id}
+					 </if> 
+					<if test="merchantCode!= null"> 
+					 and merchantCode = #{merchantCode}
+					 </if> 
+					<if test="merchantName!= null"> 
+					 and merchantName = #{merchantName}
+					 </if> 
+					<if test="agentCode!= null"> 
+					 and agentCode = #{agentCode}
+					 </if> 
+					<if test="agentName!= null"> 
+					 and agentName = #{agentName}
+					 </if> 
+					<if test="creator!= null"> 
+					 and creator = #{creator}
+					 </if> 
+					<if test="message!= null"> 
+					 and message = #{message}
+					 </if> 
+					<if test="type!= null"> 
+					 and type = #{type}
+					 </if> 
+					<if test="status!= null"> 
+					 and status = #{status}
+					 </if> 
+					<if test="failReason!= null"> 
+					 and failReason = #{failReason}
+					 </if> 
+					<if test="creatDt!= null"> 
+					 and creatDt = #{creatDt}
+					 </if> 
+					<if test="modifyStatus!= null"> 
+					 and modifyStatus = #{modifyStatus}
+					 </if> 
+				</where>
+		</select>
+
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/MerchantRegistLog-sqlmap.xml b/pluss-dao-bundle/src/main/resources/mapper/MerchantRegistLog-sqlmap.xml
new file mode 100644
index 0000000..b3dd0c0
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/MerchantRegistLog-sqlmap.xml
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+			"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="cn.pluss.platform.mapper.MerchantRegistLogMapper">
+
+	   	<insert id="saveMerchantRegistLog" parameterType="cn.pluss.platform.entity.MerchantRegistLog">
+        	insert into tb_pluss_merchant_regist_log(merchantCode,storeId,applyStatus,message,createDt,merchantName,merchantId,parentCode,creator)VALUES(#{merchantCode},#{storeId},#{applyStatus},#{message},#{createDt},#{merchantName},#{merchantId},#{parentCode},#{creator})
+    	</insert>
+
+	   	<insert id="saveMerchantRegistLogBatch">
+        	insert into tb_pluss_merchant_regist_log(merchantCode,storeId,applyStatus,message,createDt,merchantName,merchantId,parentCode,creator) VALUES 
+    			<foreach collection="list" item="item" index="index" separator=",">
+			(#{merchantCode},#{storeId},#{applyStatus},#{message},#{createDt},#{merchantName},#{merchantId},#{parentCode},#{creator}		)
+				</foreach>
+    	</insert>
+
+		<select id="queryMerchantRegistLog" parameterType="cn.pluss.platform.entity.MerchantRegistLog" resultType="cn.pluss.platform.entity.MerchantRegistLog">
+			SELECT * from tb_pluss_merchant_regist_log 
+				<where> 
+					<if test="id!= null"> 
+					 	and id = #{id}
+					 </if> 
+					<if test="merchantCode!= null"> 
+					 	and merchantCode = #{merchantCode}
+					 </if> 
+					<if test="storeId!= null"> 
+					 	and storeId = #{storeId}
+					 </if> 
+					<if test="applyStatus!= null"> 
+					 	and applyStatus = #{applyStatus}
+					 </if> 
+					<if test="message!= null"> 
+					 	and message = #{message}
+					 </if> 
+					<if test="createDt!= null"> 
+					 	and createDt = #{createDt}
+					 </if> 
+					<if test="merchantName!= null"> 
+					 	and merchantName = #{merchantName}
+					 </if> 
+					<if test="merchantId!= null"> 
+					 	and merchantId = #{merchantId}
+					 </if> 
+					<if test="parentCode!= null"> 
+					 	and parentCode = #{parentCode}
+					 </if> 
+					<if test="creator!= null"> 
+					 	and creator = #{creator}
+					 </if> 
+				 </where> 
+		</select>
+
+		<select id="queryMerchantRegistLogList" parameterType="cn.pluss.platform.entity.MerchantRegistLog" resultType="cn.pluss.platform.entity.MerchantRegistLog">
+			SELECT * from tb_pluss_merchant_regist_log 
+				<where> 
+					<if test="id!= null"> 
+					 and 	id = #{id}
+					 </if> 
+					<if test="merchantCode!= null"> 
+					 and 	merchantCode = #{merchantCode}
+					 </if> 
+					<if test="storeId!= null"> 
+					 and 	storeId = #{storeId}
+					 </if> 
+					<if test="applyStatus!= null"> 
+					 and 	applyStatus = #{applyStatus}
+					 </if> 
+					<if test="message!= null"> 
+					 and 	message = #{message}
+					 </if> 
+					<if test="createDt!= null"> 
+					 and 	createDt = #{createDt}
+					 </if> 
+					<if test="merchantName!= null"> 
+					 and 	merchantName = #{merchantName}
+					 </if> 
+					<if test="merchantId!= null"> 
+					 and 	merchantId = #{merchantId}
+					 </if> 
+					<if test="parentCode!= null"> 
+					 and 	parentCode = #{parentCode}
+					 </if> 
+					<if test="creator!= null"> 
+					 and 	creator = #{creator}
+					 </if> 
+				 </where> 
+		</select>
+
+		<update id="updateMerchantRegistLog" parameterType="cn.pluss.platform.entity.MerchantRegistLog" >
+			update tb_pluss_merchant_regist_log 
+				  <set> 
+					<if test="merchantCode!= null"> 
+					 	merchantCode = #{merchantCode},
+					 </if> 
+					<if test="storeId!= null"> 
+					 	storeId = #{storeId},
+					 </if> 
+					<if test="applyStatus!= null"> 
+					 	applyStatus = #{applyStatus},
+					 </if> 
+					<if test="message!= null"> 
+					 	message = #{message},
+					 </if> 
+					<if test="createDt!= null"> 
+					 	createDt = #{createDt},
+					 </if> 
+					<if test="merchantName!= null"> 
+					 	merchantName = #{merchantName},
+					 </if> 
+					<if test="merchantId!= null"> 
+					 	merchantId = #{merchantId},
+					 </if> 
+					<if test="parentCode!= null"> 
+					 	parentCode = #{parentCode},
+					 </if> 
+					<if test="creator!= null"> 
+					 	creator = #{creator}
+					 </if> 
+				</set>
+			where id=#{id} 
+		</update>
+
+		<delete id="deleteMerchantRegistLog" parameterType="cn.pluss.platform.entity.MerchantRegistLog" >
+			DELETE FROM tb_pluss_merchant_regist_log where id=#{id}
+		</delete>
+
+		<select id="queryMerchantRegistLogPage" parameterType="java.util.Map" resultType="cn.pluss.platform.entity.MerchantRegistLog">
+			SELECT * from tb_pluss_merchant_regist_log 
+				<where> 
+					<if test="id!= null"> 
+					and id = #{id}
+					 </if> 
+					<if test="merchantCode!= null"> 
+					and merchantCode = #{merchantCode}
+					 </if> 
+					<if test="storeId!= null"> 
+					and storeId = #{storeId}
+					 </if> 
+					<if test="applyStatus!= null"> 
+					and applyStatus = #{applyStatus}
+					 </if> 
+					<if test="message!= null"> 
+					and message = #{message}
+					 </if> 
+					<if test="createDt!= null"> 
+					and createDt = #{createDt}
+					 </if> 
+					<if test="merchantName!= null"> 
+					and merchantName = #{merchantName}
+					 </if> 
+					<if test="merchantId!= null"> 
+					and merchantId = #{merchantId}
+					 </if> 
+					<if test="parentCode!= null"> 
+					and parentCode = #{parentCode}
+					 </if> 
+					<if test="creator!= null"> 
+					and creator = #{creator}
+					 </if> 
+				 </where> 
+			order by id desc  limit #{pageSize}  offset  #{offset}  
+		</select>
+
+		<select id="queryMerchantRegistLogPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+			SELECT count(*) from tb_pluss_merchant_regist_log 
+					<where> 
+					<if test="id!= null"> 
+					 and id = #{id}
+					 </if> 
+					<if test="merchantCode!= null"> 
+					 and merchantCode = #{merchantCode}
+					 </if> 
+					<if test="storeId!= null"> 
+					 and storeId = #{storeId}
+					 </if> 
+					<if test="applyStatus!= null"> 
+					 and applyStatus = #{applyStatus}
+					 </if> 
+					<if test="message!= null"> 
+					 and message = #{message}
+					 </if> 
+					<if test="createDt!= null"> 
+					 and createDt = #{createDt}
+					 </if> 
+					<if test="merchantName!= null"> 
+					 and merchantName = #{merchantName}
+					 </if> 
+					<if test="merchantId!= null"> 
+					 and merchantId = #{merchantId}
+					 </if> 
+					<if test="parentCode!= null"> 
+					 and parentCode = #{parentCode}
+					 </if> 
+					<if test="creator!= null"> 
+					 and creator = #{creator}
+					 </if> 
+				</where>
+		</select>
+
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/MerchantRejectDescMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/MerchantRejectDescMapper.xml
new file mode 100644
index 0000000..1c5348f
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/MerchantRejectDescMapper.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.MerchantRejectDescMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.MerchantRejectDesc">
+        <id column="id" property="id" />
+        <result column="rejectName" property="rejectName" />
+        <result column="sort" property="sort" />
+        <result column="createTime" property="createTime" />
+        <result column="updateTime" property="updateTime" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/MerchantSplitSettingMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/MerchantSplitSettingMapper.xml
new file mode 100644
index 0000000..a02bd14
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/MerchantSplitSettingMapper.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.MerchantSplitSettingMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.MerchantSplitSetting">
+        <id column="id" property="id" />
+        <result column="chieMerchantCode" property="chieMerchantCode" />
+        <result column="chieMerchantId" property="chieMerchantId" />
+        <result column="isDivistion" property="isDivistion" />
+        <result column="divisionMode" property="divisionMode" />
+        <result column="diviMerchantCode" property="diviMerchantCode" />
+        <result column="diviMerchantId" property="diviMerchantId" />
+        <result column="divAmt" property="divAmt" />
+        <result column="divRatio" property="divRatio" />
+        <result column="isChargeFee" property="isChargeFee" />
+        <result column="createTime" property="createTime" />
+        <result column="status" property="status" />
+    </resultMap>
+
+    <sql id="sql_field">
+        id,chieMerchantCode,chieMerchantId,isDivistion,divisionMode,diviMerchantCode,diviMerchantId,divAmt,divRatio,isChargeFee,createTime,status
+    </sql>
+
+    <select id="pageInfo" resultType = "cn.pluss.platform.vo.MerchantSplitSettingVO">
+        SELECT a.*,b.alias as chieMerchantName,c.alias as diviMerchantName from tb_pluss_merchant_split_setting a
+            left join tb_pluss_merchant_base_info b on a.chieMerchantCode = b.merchantCode
+            left join tb_pluss_merchant_base_info c on a.diviMerchantCode = c.merchantCode
+        <where>
+              <if test="vo.chieMerchantCode != null and vo.chieMerchantCode != ''">
+                and a.chieMerchantCode = #{vo.chieMerchantCode}
+              </if>
+            <if test="vo.chieMerchantName != null and vo.chieMerchantName != ''">
+                and b.chieMerchantName like CONCAT('%',#{vo.chieMerchantName},'%')
+            </if>
+            <if test="vo.chieMerchantId != null and vo.chieMerchantId != ''">
+                 and a.chieMerchantId = #{vo.chieMerchantId}
+            </if>
+            <if test="vo.isDivistion != null and vo.isDivistion != ''">
+                and a.isDivistion = #{vo.isDivistion}
+            </if>
+            <if test="vo.divisionMode != null and vo.divisionMode != ''">
+                and a.divisionMode = #{vo.divisionMode}
+            </if>
+            <if test="vo.diviMerchantCode != null and vo.diviMerchantCode != ''">
+                and a.diviMerchantCode = #{vo.diviMerchantCode}
+            </if>
+            <if test="vo.diviMerchantName != null and vo.diviMerchantName != ''">
+                and c.diviMerchantName like CONCAT('%',#{vo.diviMerchantName},'%')
+            </if>
+            <if test="vo.diviMerchantId != null and vo.diviMerchantId != ''">
+                and a.diviMerchantId = #{vo.diviMerchantId}
+            </if>
+            <if test="vo.status != null ">
+                and a.status = #{vo.status}
+            </if>
+        </where>
+        order by a.createTime desc
+    </select>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/MerchantStaffConnMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/MerchantStaffConnMapper.xml
new file mode 100644
index 0000000..cb11a2a
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/MerchantStaffConnMapper.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.MerchantStaffConnMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.MerchantStaffConn">
+        <id column="id" property="id" />
+        <result column="userId" property="userId" />
+        <result column="merchantCode" property="merchantCode" />
+        <result column="createTime" property="createTime" />
+        <result column="updateTime" property="updateTime" />
+    </resultMap>
+
+    <select id="selectByUserId" resultType="cn.pluss.platform.vo.MerchantStaffConnVO">
+        SELECT msc.*, mbi.alias, mi.picUrl imgUrl, mbi.address, IFNULL(sp.permissionBill, "1") permissionBill FROM tb_pluss_merchant_staff_conn msc
+            LEFT JOIN tb_pluss_merchant_base_info mbi ON msc.merchantCode = mbi.merchantCode
+            LEFT JOIN tb_pluss_merchant_image mi ON mi.merchantCode = mbi.merchantCode
+            LEFT JOIN tb_pluss_staff_permission sp ON sp.userId = msc.userId AND sp.merchantCOde = msc.merchantCode
+            WHERE msc.userId = #{userId} AND mi.photoType = '06'
+    </select>
+
+    <select id="getMercInfoByStaffId" resultType="cn.pluss.platform.entity.MerchantBaseInfo">
+        SELECT mbi.alias,mbi.merchantCode,msc.isPushWxMessage as 'isPushWxMessage'
+        from tb_pluss_merchant_staff_conn msc
+        left join tb_pluss_merchant_base_info mbi on  msc.merchantCode = mbi.merchantCode
+        where msc.userId = #{id} order by mbi.createDt asc
+    </select>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/MerchantStore-sqlmap.xml b/pluss-dao-bundle/src/main/resources/mapper/MerchantStore-sqlmap.xml
new file mode 100644
index 0000000..446d493
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/MerchantStore-sqlmap.xml
@@ -0,0 +1,707 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="cn.pluss.platform.mapper.MerchantStoreMapper">
+
+    <resultMap id="StoreInfoVO" type="cn.pluss.platform.vo.StoreInfoVO" autoMapping="true">
+
+    </resultMap>
+
+    <select id="queryMerchantNoStoreList" parameterType="cn.pluss.platform.entity.MerchantStore"
+            resultType="cn.pluss.platform.entity.MerchantStore">
+        SELECT * from tb_pluss_merchant_store
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="merchantCode!= null">
+                and merchantCode in (SELECT merchantCode
+                FROM tb_pluss_merchant_base_info
+                WHERE bindingCode =(SELECT bindingCode
+                FROM tb_pluss_merchant_base_info
+                where merchantCode = #{merchantCode}))
+            </if>
+            <if test="storeId!= null">
+                and storeId = #{storeId}
+            </if>
+            <if test="storeName!= null">
+                and storeName = #{storeName}
+            </if>
+            <if test="linkName!= null">
+                and linkName = #{linkName}
+            </if>
+            <if test="linkPhone!= null">
+                and linkPhone = #{linkPhone}
+            </if>
+            <if test="address!= null">
+                and address = #{address}
+            </if>
+            <if test="storeDesc!= null">
+                and storeDesc = #{storeDesc}
+            </if>
+            <if test="logo!= null">
+                and logo = #{logo}
+            </if>
+            <if test="creator!= null">
+                and creator = #{creator}
+            </if>
+            <if test="createDt!= null">
+                and createDt = #{createDt}
+            </if>
+            <if test="openingTime!= null">
+                and openingTime = #{openingTime}
+            </if>
+            <if test="status!= null">
+                and status = #{status}
+            </if>
+            <if test="merchantName!= null">
+                and merchantName = #{merchantName}
+            </if>
+            <if test="parentCode!= null">
+                and parentCode = #{parentCode}
+            </if>
+            <if test="email!= null">
+                and email = #{email}
+            </if>
+            <if test="isAccount!= null">
+                and isAccount = #{isAccount}
+            </if>
+            <if test="loginName!= null">
+                and loginName = #{loginName}
+            </if>
+            <if test="storeHeadPic!= null">
+                and storeHeadPic = #{storeHeadPic}
+            </if>
+            <if test="storeInsidePic!= null">
+                and storeInsidePic = #{storeInsidePic}
+            </if>
+            <if test="cashPic!= null">
+                and cashPic = #{cashPic}
+            </if>
+            <if test="productDesc!= null">
+                and productDesc = #{productDesc}
+            </if>
+            <if test="paymentCodeUrl!= null">
+                and paymentCodeUrl = #{paymentCodeUrl}
+            </if>
+            <if test="isMarket!= null">
+                and isMarket = #{isMarket}
+            </if>
+        </where>
+    </select>
+
+    <select id="queryMerchantStorePage" parameterType="java.util.Map"
+            resultType="cn.pluss.platform.entity.MerchantStore">
+        SELECT * from tb_pluss_merchant_store
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="merchantCode!= null">
+                and merchantCode = #{merchantCode}
+            </if>
+            <if test="storeId!= null">
+                and storeId = #{storeId}
+            </if>
+            <if test="storeName!= null">
+                and storeName LIKE CONCAT("%",#{storeName},"%")
+            </if>
+            <if test="linkName!= null">
+                and linkName = #{linkName}
+            </if>
+            <if test="linkPhone!= null">
+                and linkPhone = #{linkPhone}
+            </if>
+            <if test="address!= null">
+                and address = #{address}
+            </if>
+            <if test="storeDesc!= null">
+                and storeDesc = #{storeDesc}
+            </if>
+            <if test="logo!= null">
+                and logo = #{logo}
+            </if>
+            <if test="creator!= null">
+                and creator = #{creator}
+            </if>
+            <if test="createDt!= null">
+                and createDt = #{createDt}
+            </if>
+            <if test="openingTime!= null">
+                and openingTime = #{openingTime}
+            </if>
+            <if test="status!= null">
+                and status = #{status}
+            </if>
+            <if test="merchantName!= null">
+                and merchantName = #{merchantName}
+            </if>
+            <if test="parentCode!= null">
+                and parentCode = #{parentCode}
+            </if>
+            <if test="email!= null">
+                and email = #{email}
+            </if>
+            <if test="isAccount!= null">
+                and isAccount = #{isAccount}
+            </if>
+            <if test="loginName!= null">
+                and loginName = #{loginName}
+            </if>
+            <if test="storeHeadPic!= null">
+                and storeHeadPic = #{storeHeadPic}
+            </if>
+            <if test="storeInsidePic!= null">
+                and storeInsidePic = #{storeInsidePic}
+            </if>
+            <if test="cashPic!= null">
+                and cashPic = #{cashPic}
+            </if>
+            <if test="productDesc!= null">
+                and productDesc = #{productDesc}
+            </if>
+            <if test="paymentCodeUrl!= null">
+                and paymentCodeUrl = #{paymentCodeUrl}
+            </if>
+        </where>
+        order by id desc limit #{pageSize} offset #{offset}
+    </select>
+
+    <select id="queryMerchantStorePageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+        SELECT count(*) from tb_pluss_merchant_store ms
+        JOIN tb_pluss_merchant_base_info mbi on ms.merchantCode = mbi.merchantCode
+        LEFT JOIN tb_pluss_user_app ua ON ms.merchantCode = ua.merchantCode
+        LEFT JOIN tb_pluss_merchant_channel_status mcs ON ms.merchantCode = mcs.merchantCode
+        <where>
+            <if test="merchantCode!=null and merchantCode!=''">
+                and ms.merchantCode =#{merchantCode}
+            </if>
+            <if test="merchantType!=null and merchantType!=''">
+                and mbi.merchantType =#{merchantType}
+            </if>
+            <if test="merchantName!=null and merchantName!=''">
+                and ms.merchantName LIKE CONCAT('%',#{merchantName},'%')
+            </if>
+            <if test="storeName!=null and storeName!=''">
+                and ms.storeName LIKE CONCAT('%',#{storeName},'%')
+            </if>
+            <if test="status == '1'.toString() ">
+                and (ms.status in ('1','0') OR ms.status IS NULL)
+            </if>
+            <if test="status == '2'.toString() ">
+                and ms.status = '2'
+            </if>
+            <if test="productDesc!=null and productDesc!=''">
+                and mbi.productDesc=#{productDesc}
+            </if>
+            <if test="payEcdemicSwitch == '2'.toString() ">
+                and (ms.payEcdemicSwitch = '0' OR ms.payEcdemicSwitch IS NULL)
+            </if>
+            <if test="payEcdemicSwitch == '1'.toString() ">
+                and ms.payEcdemicSwitch='1'
+            </if>
+            <if test="address!=null and address!=''">
+                and ms.address LIKE CONCAT('%',#{address},'%')
+            </if>
+            <if test="userId!=null">
+                and ua.userId = #{userId}
+            </if>
+            <if test="merchantType!=null and merchantType!=''">
+                and mbi.merchantType=#{merchantType}
+            </if>
+            <if test="alias!=null and alias!=''">
+                and mbi.alias like concat("%",#{alias},"%")
+            </if>
+            <if test="stTime!= null and stTime!=''">
+                and ms.createDt  <![CDATA[>=]]> #{stTime}
+            </if>
+            <if test="endTime!= null and endTime!=''">
+                and ms.createDt <![CDATA[<=]]> #{endTime}
+            </if>
+            <if test="isMarket!=null and isMarket!=''">
+                and ms.isMarket=#{isMarket}
+            </if>
+            <if test="mcsStatus != null and mcsStatus != ''">
+                and mcs.`status` = #{mcsStatus}
+            </if>
+
+            <if test="startTime != null and startTime != ''">
+                and mcs.createTime <![CDATA[ >= ]]> #{startTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and mcs.createTime  <![CDATA[ <= ]]> #{endTime}
+            </if>
+
+            and ua.userType = 'promoter'
+        </where>
+    </select>
+
+    <select id="queryMerchantStoreNoPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+        SELECT count(*) from tb_pluss_merchant_store ms
+        JOIN tb_pluss_merchant_base_info mbi on ms.merchantCode = mbi.merchantCode
+        LEFT JOIN tb_pluss_user_app ua ON ms.merchantCode = ua.merchantCode
+        <where>
+            <if test="merchantCode!=null and merchantCode!=''">
+                and ms.merchantCode in (SELECT merchantCode
+                FROM tb_pluss_merchant_base_info
+                WHERE bindingCode =(SELECT bindingCode
+                FROM tb_pluss_merchant_base_info
+                where merchantCode = #{merchantCode}))
+            </if>
+            <if test="merchantType!=null and merchantType!=''">
+                and mbi.merchantType =#{merchantType}
+            </if>
+            <if test="merchantName!=null and merchantName!=''">
+                and ms.merchantName LIKE CONCAT('%',#{merchantName},'%')
+            </if>
+            <if test="storeName!=null and storeName!=''">
+                and ms.storeName LIKE CONCAT('%',#{storeName},'%')
+            </if>
+            <if test="status == '1'.toString() ">
+                and (ms.status in ('1','0') OR ms.status IS NULL)
+            </if>
+            <if test="status == '2'.toString() ">
+                and ms.status = '2'
+            </if>
+            <if test="productDesc!=null and productDesc!=''">
+                and mbi.productDesc=#{productDesc}
+            </if>
+            <if test="payEcdemicSwitch == '2'.toString() ">
+                and (ms.payEcdemicSwitch = '0' OR ms.payEcdemicSwitch IS NULL)
+            </if>
+            <if test="payEcdemicSwitch == '1'.toString() ">
+                and ms.payEcdemicSwitch='1'
+            </if>
+            <if test="address!=null and address!=''">
+                and ms.address LIKE CONCAT('%',#{address},'%')
+            </if>
+            <if test="userId!=null">
+                and ua.userId = #{userId}
+            </if>
+            <if test="merchantType!=null and merchantType!=''">
+                and mbi.merchantType=#{merchantType}
+            </if>
+            <if test="alias!=null and alias!=''">
+                and mbi.alias like concat("%",#{alias},"%")
+            </if>
+            <if test="stTime!= null">
+                and ms.createDt  <![CDATA[>=]]> #{stTime}
+            </if>
+            <if test="endTime!= null">
+                and ms.createDt <![CDATA[<=]]> #{endTime}
+            </if>
+            <if test="isMarket!=null and isMarket!=''">
+                and ms.isMarket=#{isMarket}
+            </if>
+            and ua.userType = 'promoter'
+        </where>
+    </select>
+
+    <select id="queryMerchantStorePageApp" parameterType="java.util.Map"
+            resultType="cn.pluss.platform.entity.MerchantStore">
+        SELECT * from tb_pluss_merchant_store
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="merchantCode!= null">
+                and merchantCode = #{merchantCode}
+            </if>
+            <if test="storeId!= null">
+                and storeId = #{storeId}
+            </if>
+            <if test="storeName!= null">
+                and storeName LIKE CONCAT("%",#{storeName},"%")
+            </if>
+            <if test="linkName!= null">
+                and linkName = #{linkName}
+            </if>
+            <if test="linkPhone!= null">
+                and linkPhone = #{linkPhone}
+            </if>
+            <if test="address!= null">
+                and address = #{address}
+            </if>
+            <if test="storeDesc!= null">
+                and storeDesc = #{storeDesc}
+            </if>
+            <if test="logo!= null">
+                and logo = #{logo}
+            </if>
+            <if test="creator!= null">
+                and creator = #{creator}
+            </if>
+
+            <if test="startTime!= null and startTime!=''">
+                <![CDATA[
+                            and  DATE_FORMAT(createDt, '%Y-%m-%d %H:%i:%S')>=DATE_FORMAT(#{startTime}, '%Y-%m-%d %H:%i:%S')
+                         ]]>
+            </if>
+            <if test="endTime!= null and endTime!=''">
+                <![CDATA[
+                            and  DATE_FORMAT(createDt, '%Y-%m-%d %H:%i:%S')<=DATE_FORMAT(#{endTime}, '%Y-%m-%d %H:%i:%S')
+                         ]]>
+            </if>
+
+            <if test="openingTime!= null">
+                and openingTime = #{openingTime}
+            </if>
+            <if test="status!= null">
+                and status = #{status}
+            </if>
+            <if test="merchantName!= null">
+                and merchantName = #{merchantName}
+            </if>
+            <if test="parentCode!= null">
+                and parentCode = #{parentCode}
+            </if>
+            <if test="email!= null">
+                and email = #{email}
+            </if>
+            <if test="isAccount!= null">
+                and isAccount = #{isAccount}
+            </if>
+            <if test="loginName!= null">
+                and loginName = #{loginName}
+            </if>
+            <if test="paymentCodeUrl!= null">
+                and paymentCodeUrl = #{paymentCodeUrl}
+            </if>
+        </where>
+        order by id desc limit #{pageSize} offset #{offset}
+    </select>
+
+    <select id="queryMerchantStorePageCountApp" parameterType="java.util.Map" resultType="java.lang.Integer">
+        SELECT count(*) from tb_pluss_merchant_store
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="merchantCode!= null">
+                and merchantCode = #{merchantCode}
+            </if>
+            <if test="storeId!= null">
+                and storeId = #{storeId}
+            </if>
+            <if test="storeName!= null">
+                and storeName LIKE CONCAT("%",#{storeName},"%")
+            </if>
+            <if test="linkName!= null">
+                and linkName = #{linkName}
+            </if>
+            <if test="linkPhone!= null">
+                and linkPhone = #{linkPhone}
+            </if>
+            <if test="address!= null">
+                and address = #{address}
+            </if>
+            <if test="storeDesc!= null">
+                and storeDesc = #{storeDesc}
+            </if>
+            <if test="logo!= null">
+                and logo = #{logo}
+            </if>
+            <if test="creator!= null">
+                and creator = #{creator}
+            </if>
+            <if test="startTime!= null and startTime!=''">
+                <![CDATA[
+                            and  DATE_FORMAT(createDt, '%Y-%m-%d %H:%i:%S')>=DATE_FORMAT(#{startTime}, '%Y-%m-%d %H:%i:%S')
+                         ]]>
+            </if>
+            <if test="endTime!= null and endTime!=''">
+                <![CDATA[
+                            and  DATE_FORMAT(createDt, '%Y-%m-%d %H:%i:%S')<=DATE_FORMAT(#{endTime}, '%Y-%m-%d %H:%i:%S')
+                         ]]>
+            </if>
+            <if test="openingTime!= null">
+                and openingTime = #{openingTime}
+            </if>
+            <if test="status!= null">
+                and status = #{status}
+            </if>
+            <if test="merchantName!= null">
+                and merchantName = #{merchantName}
+            </if>
+            <if test="parentCode!= null">
+                and parentCode = #{parentCode}
+            </if>
+            <if test="email!= null">
+                and email = #{email}
+            </if>
+            <if test="isAccount!= null">
+                and isAccount = #{isAccount}
+            </if>
+            <if test="loginName!= null">
+                and loginName = #{loginName}
+            </if>
+        </where>
+    </select>
+
+    <select id="queryNewStoreListPage" parameterType="java.util.Map" resultMap="StoreInfoVO, cn.pluss.platform.mapper.CommonMapper.count">
+        SELECT SQL_CALC_FOUND_ROWS
+        ms.id AS id,
+        mbi.id AS mercId,
+        ms.isMarket AS isMarket,
+        ua.userType AS userType,
+        ms.storeId AS storeId,
+        ms.storeName AS storeName,
+        ms.logo AS logo,
+        mbi.merchantName AS merchantName,
+        mbi.merchantType AS merchantType,
+        mbi.alias AS alias,
+        mbi.isUnionPay AS isUnionPay,
+        ms.`status` AS `status`,
+        ms.payEcdemicSwitch AS payEcdemicSwitch,
+        ms.merchantCode AS merchantCode,
+        mbi.productDesc AS productDesc,
+        mbi.address AS address,
+        mbi.md5Key AS md5Key,
+        mbi.subAppId AS subAppId,
+        mbi.appid AS appid,
+        IFNULL(mr.rate,38) AS rate,
+        mr.updateTime AS updateTime,
+        mr.previousRate AS previousRate,
+        ms.isMarket,
+        mbi.province,
+        mcs.valid validStatus,
+        mbi.city,
+        mbi.district,
+        t.location,
+        ua.userId AS userId,
+        (
+        CASE
+        (
+        SELECT
+        COUNT(*)
+        FROM
+        tb_pluss_merchant_base_info mi
+        WHERE
+        mi.merchantCode = ms.merchantCode
+        AND mi.bussAuthNum IS NOT NULL
+        AND mi.principalPerson IS NOT NULL
+        AND mi.bussAuthStartTime IS NOT NULL
+        AND mi.bussAuthEndTime IS NOT NULL
+        )
+        WHEN 1 THEN
+        '营业执照'
+        WHEN 0 THEN
+        '小微'
+        END
+        ) AS storeType,
+        mcs.`status` AS mcsStatus,
+        mcs.remark AS remark,
+        mcs.channel AS channel,
+        mcs.merchantId AS merchantId,
+        IF(mcs.channel = 4,mcs.settlementType,'D1') AS settleType,
+        mcs.id as csId,
+        op.operatRemark as operatRemark,
+        mcs.createTime as incomTime
+        FROM
+        tb_pluss_merchant_store ms
+        LEFT JOIN (SELECT CONCAT(province,city,district,address) as location,merchantCode FROM
+        tb_pluss_merchant_base_info
+        ) t ON t.merchantCode = ms.merchantCode
+        LEFT JOIN tb_pluss_merchant_base_info mbi ON ms.merchantCode = mbi.merchantCode
+        LEFT JOIN tb_pluss_merchant_rate mr ON mbi.userId = mr.userId
+        LEFT JOIN tb_pluss_user_app ua ON ms.merchantCode = ua.merchantCode
+        LEFT JOIN tb_pluss_merchant_channel_status mcs ON ms.merchantCode = mcs.merchantCode
+        LEFT JOIN (SELECT IF(GROUP_CONCAT(remark, '\n') = " " ,"",GROUP_CONCAT(remark, '\n')) AS operatRemark,userId
+        FROM
+        tb_pluss_operation_record WHERE dictValue IN ('KTGRDZWL', 'GBGRDZWL', 'GBSHJYGN', 'KTSHJYGN') GROUP BY userId)
+        op on op.userId = mbi.userId
+        <where>
+            <if test="userId != null and userId != ''">
+                and ua.userId = #{userId}
+            </if>
+            <if test="merchantCode!=null and merchantCode!=''">
+                and ms.merchantCode = #{merchantCode}
+            </if>
+            <if test="merchantType!=null and merchantType!=''">
+                and mbi.merchantType = #{merchantType}
+            </if>
+            <if test="merchantName!=null and merchantName!=''">
+                and mbi.merchantName LIKE CONCAT('%',#{merchantName},'%')
+            </if>
+            <if test="storeName!=null and storeName!=''">
+                and ms.storeName LIKE CONCAT('%',#{storeName},'%')
+            </if>
+            <if test="status == '1'.toString() ">
+                and (ms.status in ('1','0') OR ms.status IS NULL)
+            </if>
+            <if test="status == '2'.toString() ">
+                and ms.status = '2'
+            </if>
+            <if test="address!=null and address!=''">
+                and ms.address LIKE CONCAT('%',#{address},'%')
+            </if>
+            <if test="payEcdemicSwitch == '2'.toString() ">
+                and (ms.payEcdemicSwitch = '0' OR ms.payEcdemicSwitch IS NULL)
+            </if>
+            <if test="payEcdemicSwitch == '1'.toString() ">
+                and ms.payEcdemicSwitch='1'
+            </if>
+            <if test="isMarket!=null and isMarket!=''">
+                and ms.isMarket=#{isMarket}
+            </if>
+            <if test="id!=null and id!=''">
+                and ms.id LIKE CONCAT('%',#{id},'%')
+            </if>
+            <if test="merchantType!=null and merchantType!=''">
+                and mbi.merchantType=#{merchantType}
+            </if>
+            <if test="alias!=null and alias!=''">
+                and mbi.alias like concat("%",#{alias},"%")
+            </if>
+            <if test="location != null and location != ''">
+                and t.location like concat("%",#{location},"%")
+            </if>
+            <if test="mcsStatus != null and mcsStatus != ''">
+                and mcs.`status` = #{mcsStatus}
+            </if>
+
+            <if test="startTime != null and startTime != ''">
+                and mcs.createTime <![CDATA[ >= ]]> #{startTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and mcs.createTime  <![CDATA[ <= ]]> #{endTime}
+            </if>
+
+            and userType = 'promoter'
+        </where>
+        order by ms.id desc limit #{pageSize} offset #{offset};
+        SELECT found_rows() as count
+    </select>
+
+    <update id="disableMerchantStore" parameterType="java.util.Map">
+        update tb_pluss_merchant_store ms
+            LEFT JOIN tb_pluss_merchant_base_info mbi
+        ON ms.merchantCode = mbi.merchantCode
+            set status=#{status}
+        where mbi.userId = ${id}
+    </update>
+
+    <update id="pesUpdateMerchantStore" parameterType="java.util.Map">
+        update tb_pluss_merchant_store ms
+            LEFT JOIN tb_pluss_merchant_base_info mbi
+        ON ms.merchantCode = mbi.merchantCode
+            set payEcdemicSwitch=#{payEcdemicSwitch}
+        where mbi.userId = ${id}
+    </update>
+
+    <update id="operatMarketMerchantStore" parameterType="java.util.Map">
+        update tb_pluss_merchant_store
+        set isMarket = #{isMarker}
+        where id in
+        <foreach collection="ids" open="(" separator="," close=")" item="item" index="index">
+            #{item}
+        </foreach>
+    </update>
+
+    <select id="showMerchantStoreReceipt" resultType="cn.pluss.platform.vo.StoreInfoVO">
+        SELECT ms.merchantCode AS merchantCode,
+               ms.storeId      AS storeId,
+               ua.userId       as userId,
+               ms.storeName    as storeName
+        FROM tb_pluss_user_app ua
+                 LEFT JOIN tb_pluss_merchant_store ms
+                           on ms.merchantCode = ua.merchantCode
+        WHERE ua.userId = #{userId}
+    </select>
+
+    <select id="queryStoreSignList" parameterType="java.util.Map" resultType="cn.pluss.platform.vo.StoreSignVO">
+        SELECT ms.linkPhone as linkPhone,ms.merchantName as merchantName,ms.id,ms.storeId as storeId,ms.storeName as
+        storeName,mbi.alias as alias,mbc.id as mbcId,ua.leshuaStatus as
+        leshuaStatus,ua.wechatStatus as wechatStatus,mbi.aliRate as aliRate,mbi.wechatRate as wechatRate,mbi.leshuaRate
+        as leshuaRate,ua.userId as userId FROM tb_pluss_merchant_store ms
+        LEFT JOIN tb_pluss_merchant_base_info mbi ON ms.merchantCode=mbi.merchantCode
+        LEFT JOIN tb_pluss_merchant_bank_card mbc ON mbc.merchantCode=ms.merchantCode
+        LEFT JOIN tb_pluss_user_app ua ON ua.userId=mbi.userId
+        <where>
+            <if test="storeId!=null and storeId!=''">
+                and ms.storeId LIKE CONCAT('%',#{storeId},'%')
+            </if>
+            <if test="alias!=null and alias!=''">
+                and mbi.alias LIKE CONCAT('%',#{alias},'%')
+            </if>
+            <if test="storeName!=null and storeName!=''">
+                and ms.storeName LIKE CONCAT('%',#{storeName},'%')
+            </if>
+            <if test="merchantCode!=null and merchantCode!=''">
+                and ms.merchantCode = #{merchantCode}
+            </if>
+            <if test="userId!=null">
+                and ua.userId = #{userId}
+            </if>
+            <if test="linkPhone!=null and linkPhone!=''">
+                and ms.linkPhone =#{linkPhone}
+            </if>
+            and ua.userType = 'promoter'
+        </where>
+        order by ms.id desc limit #{pageSize} offset #{offset}
+    </select>
+
+    <select id="selectStatus" parameterType="java.util.Map" resultType="cn.pluss.platform.vo.StoreInfoVO">
+        select *
+        from tb_pluss_merchant_store
+        where id = #{id}
+    </select>
+
+    <select id="selectPage2" resultType="cn.pluss.platform.vo.StoreInfoVO">
+        SELECT DISTINCT ms.id                         AS id,
+                        mbi.id                        AS mercId,
+                        ms.isMarket                   AS isMarket,
+                        ua.userType                   AS userType,
+                        ms.storeId                    AS storeId,
+                        ms.storeName                  AS storeName,
+                        ms.logo                       AS logo,
+                        mbi.merchantName              AS merchantName,
+                        mbi.merchantType              AS merchantType,
+                        mbi.alias                     AS alias,
+                        ms.`status`                   AS `status`,
+                        ms.payEcdemicSwitch           AS payEcdemicSwitch,
+                        mbi.merchantCode              AS merchantCode,
+                        mbi.productDesc               AS productDesc,
+                        mbi.address                   AS address,
+                        IFNULL(mr.rate, 38)           AS rate,
+                        mr.updateTime                 AS updateTime,
+                        mr.previousRate               AS previousRate,
+                        ms.isMarket,
+                        mbi.province,
+                        mbi.city,
+                        mbi.district,
+                        t.location,
+                        ua.userId                     AS userId,
+                        (
+                            CASE
+                                (
+                                    SELECT COUNT(*)
+                                    FROM tb_pluss_merchant_base_info mi
+                                    WHERE mi.merchantCode = ms.merchantCode
+                                      AND mi.bussAuthNum IS NOT NULL
+                                      AND mi.principalPerson IS NOT NULL
+                                      AND mi.bussAuthStartTime IS NOT NULL
+                                      AND mi.bussAuthEndTime IS NOT NULL
+                                )
+                                WHEN 1 THEN
+                                    '营业执照'
+                                WHEN 0 THEN
+                                    '小微'
+                                END
+                            )                         AS storeType,
+                        mcs.remark                    AS remark,
+                        IF(mcs.channel = 4, '0', '1') AS settleType,
+                        mcs.id                        as csId
+        FROM tb_pluss_merchant_store ms
+                 LEFT JOIN (SELECT CONCAT(province, city, district, address) as location, merchantCode
+                            FROM tb_pluss_merchant_base_info
+        ) t ON t.merchantCode = ms.merchantCode
+                 LEFT JOIN tb_pluss_merchant_base_info mbi ON ms.merchantCode = mbi.merchantCode
+                 LEFT JOIN tb_pluss_merchant_rate mr ON mbi.userId = mr.userId
+                 LEFT JOIN tb_pluss_user_app ua ON ms.merchantCode = ua.merchantCode
+                 LEFT JOIN tb_pluss_merchant_channel_status mcs ON ms.merchantCode = mcs.merchantCode
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/MerchantTransferCashMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/MerchantTransferCashMapper.xml
new file mode 100644
index 0000000..b2e1232
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/MerchantTransferCashMapper.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.MerchantTransferCashMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.MerchantTransferCash">
+        <id column="id" property="id" />
+        <result column="cashAmt" property="cashAmt" />
+        <result column="userId" property="userId" />
+        <result column="userName" property="userName" />
+        <result column="status" property="status" />
+        <result column="cashTime" property="cashTime" />
+        <result column="cashNo" property="cashNo" />
+        <result column="createTime" property="createTime" />
+        <result column="remark" property="remark" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/MerchantTransferMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/MerchantTransferMapper.xml
new file mode 100644
index 0000000..c0abf92
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/MerchantTransferMapper.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.MerchantTransferMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.MerchantTransfer">
+        <id column="id" property="id" />
+        <result column="merchantCode" property="merchantCode" />
+        <result column="alias" property="alias" />
+        <result column="channelNo" property="channelNo" />
+        <result column="channelId" property="channelId" />
+        <result column="amount" property="amount" />
+        <result column="createDt" property="createDt" />
+        <result column="orderNo" property="orderNo" />
+        <result column="content" property="content" />
+        <result column="transTime" property="transTime" />
+        <result column="transNo" property="transNo" />
+        <result column="remark" property="remark" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/NewArea-sqlmap.xml b/pluss-dao-bundle/src/main/resources/mapper/NewArea-sqlmap.xml
new file mode 100644
index 0000000..9a5585d
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/NewArea-sqlmap.xml
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+			"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="cn.pluss.platform.mapper.NewAreaMapper">
+
+	   	<insert id="saveNewArea" parameterType="cn.pluss.platform.entity.NewArea">
+        	insert into tb_pluss_new_area(parentId,name,shortName,longitude,latitude,level,sort,status,open)VALUES(#{parentId},#{name},#{shortName},#{longitude},#{latitude},#{level},#{sort},#{status},#{open})
+    	</insert>
+
+	   	<insert id="saveNewAreaBatch">
+        	insert into tb_pluss_new_area(parentId,name,shortName,longitude,latitude,level,sort,status,open) VALUES 
+    			<foreach collection="list" item="item" index="index" separator=",">
+			(#{parentId},#{name},#{shortName},#{longitude},#{latitude},#{level},#{sort},#{status},#{open}		)
+				</foreach>
+    	</insert>
+
+		<select id="queryNewArea" parameterType="cn.pluss.platform.entity.NewArea" resultType="cn.pluss.platform.entity.NewArea">
+			SELECT * from tb_pluss_new_area 
+				<where> 
+					<if test="id!= null"> 
+					 	and id = #{id}
+					 </if> 
+					<if test="parentId!= null"> 
+					 	and parentId = #{parentId}
+					 </if> 
+					<if test="name!= null"> 
+					 	and name = #{name}
+					 </if> 
+					<if test="shortName!= null"> 
+					 	and shortName = #{shortName}
+					 </if> 
+					<if test="longitude!= null"> 
+					 	and longitude = #{longitude}
+					 </if> 
+					<if test="latitude!= null"> 
+					 	and latitude = #{latitude}
+					 </if> 
+					<if test="level!= null"> 
+					 	and level = #{level}
+					 </if> 
+					<if test="sort!= null"> 
+					 	and sort = #{sort}
+					 </if> 
+					<if test="status!= null"> 
+					 	and status = #{status}
+					 </if> 
+					<if test="open!= null"> 
+					 	and open = #{open}
+					 </if> 
+				 </where> 
+		</select>
+
+		<select id="queryNewAreaList" parameterType="cn.pluss.platform.entity.NewArea" resultType="cn.pluss.platform.entity.NewArea">
+			SELECT * from tb_pluss_new_area 
+				<where> 
+					<if test="id!= null"> 
+					 and 	id = #{id}
+					 </if> 
+					<if test="parentId!= null"> 
+					 and 	parentId = #{parentId}
+					 </if> 
+					<if test="name!= null"> 
+					 and 	name = #{name}
+					 </if> 
+					<if test="shortName!= null"> 
+					 and 	shortName = #{shortName}
+					 </if> 
+					<if test="longitude!= null"> 
+					 and 	longitude = #{longitude}
+					 </if> 
+					<if test="latitude!= null"> 
+					 and 	latitude = #{latitude}
+					 </if> 
+					<if test="level!= null"> 
+					 and 	level = #{level}
+					 </if> 
+					<if test="sort!= null"> 
+					 and 	sort = #{sort}
+					 </if> 
+					<if test="status!= null"> 
+					 and 	status = #{status}
+					 </if> 
+					<if test="open!= null"> 
+					 and 	open = #{open}
+					 </if> 
+				 </where> 
+		</select>
+
+		<update id="updateNewArea" parameterType="cn.pluss.platform.entity.NewArea" >
+			update tb_pluss_new_area 
+				  <set> 
+					<if test="parentId!= null"> 
+					 	parentId = #{parentId},
+					 </if> 
+					<if test="name!= null"> 
+					 	name = #{name},
+					 </if> 
+					<if test="shortName!= null"> 
+					 	shortName = #{shortName},
+					 </if> 
+					<if test="longitude!= null"> 
+					 	longitude = #{longitude},
+					 </if> 
+					<if test="latitude!= null"> 
+					 	latitude = #{latitude},
+					 </if> 
+					<if test="level!= null"> 
+					 	level = #{level},
+					 </if> 
+					<if test="sort!= null"> 
+					 	sort = #{sort},
+					 </if> 
+					<if test="status!= null"> 
+					 	status = #{status},
+					 </if> 
+					<if test="open!= null"> 
+					 	open = #{open}
+					 </if> 
+				</set>
+			where id=#{id} 
+		</update>
+
+		<delete id="deleteNewArea" parameterType="cn.pluss.platform.entity.NewArea" >
+			DELETE FROM tb_pluss_new_area where id=#{id}
+		</delete>
+
+		<select id="queryNewAreaPage" parameterType="java.util.Map" resultType="cn.pluss.platform.entity.NewArea">
+			SELECT * from tb_pluss_new_area 
+				<where> 
+					<if test="id!= null"> 
+					and id = #{id}
+					 </if> 
+					<if test="parentId!= null"> 
+					and parentId = #{parentId}
+					 </if> 
+					<if test="name!= null"> 
+					and name = #{name}
+					 </if> 
+					<if test="shortName!= null"> 
+					and shortName = #{shortName}
+					 </if> 
+					<if test="longitude!= null"> 
+					and longitude = #{longitude}
+					 </if> 
+					<if test="latitude!= null"> 
+					and latitude = #{latitude}
+					 </if> 
+					<if test="level!= null"> 
+					and level = #{level}
+					 </if> 
+					<if test="sort!= null"> 
+					and sort = #{sort}
+					 </if> 
+					<if test="status!= null"> 
+					and status = #{status}
+					 </if> 
+					<if test="open!= null"> 
+					and open = #{open}
+					 </if> 
+				 </where> 
+			order by id desc  limit #{pageSize}  offset  #{offset}  
+		</select>
+
+		<select id="queryNewAreaPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+			SELECT count(*) from tb_pluss_new_area 
+					<where> 
+					<if test="id!= null"> 
+					 and id = #{id}
+					 </if> 
+					<if test="parentId!= null"> 
+					 and parentId = #{parentId}
+					 </if> 
+					<if test="name!= null"> 
+					 and name = #{name}
+					 </if> 
+					<if test="shortName!= null"> 
+					 and shortName = #{shortName}
+					 </if> 
+					<if test="longitude!= null"> 
+					 and longitude = #{longitude}
+					 </if> 
+					<if test="latitude!= null"> 
+					 and latitude = #{latitude}
+					 </if> 
+					<if test="level!= null"> 
+					 and level = #{level}
+					 </if> 
+					<if test="sort!= null"> 
+					 and sort = #{sort}
+					 </if> 
+					<if test="status!= null"> 
+					 and status = #{status}
+					 </if> 
+					<if test="open!= null"> 
+					 and open = #{open}
+					 </if> 
+				</where>
+		</select>
+
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/Notice-sqlmap.xml b/pluss-dao-bundle/src/main/resources/mapper/Notice-sqlmap.xml
new file mode 100644
index 0000000..7ee9e36
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/Notice-sqlmap.xml
@@ -0,0 +1,270 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="cn.pluss.platform.mapper.NoticeMapper">
+
+    <insert id="saveNotice" parameterType="cn.pluss.platform.entity.Notice">
+        insert into tb_pluss_notice(userId, userName, typeFirst, typeSecond, conrtent, createDt, noticeCode,
+                                    orderNumber, isDeal, isApply)
+        VALUES (#{userId}, #{userName}, #{typeFirst}, #{typeSecond}, #{conrtent}, NOW(), #{noticeCode}, #{orderNumber},
+                #{isDeal}, #{isApply})
+    </insert>
+
+    <insert id="saveNoticeBatch">
+        insert into
+        tb_pluss_notice(userId,userName,typeFirst,typeSecond,conrtent,createDt,noticeCode,`desc`,title,url,uniqueKey)
+        VALUES
+        <foreach collection="list" item="item" index="index" separator=",">
+            (#{item.userId},#{item.userName},#{item.typeFirst},#{item.typeSecond},#{item.conrtent},#{item.createDt},#{item.noticeCode},#{item.desc},#{item.title},#{item.url},#{item.uniqueKey})
+        </foreach>
+    </insert>
+
+    <select id="queryNotice" parameterType="cn.pluss.platform.entity.Notice"
+            resultType="cn.pluss.platform.entity.Notice">
+        SELECT * from tb_pluss_notice
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="userId!= null">
+                and userId = #{userId}
+            </if>
+            <if test="userName!= null">
+                and userName = #{userName}
+            </if>
+            <if test="typeFirst!= null">
+                and typeFirst = #{typeFirst}
+            </if>
+            <if test="typeSecond!= null">
+                and typeSecond = #{typeSecond}
+            </if>
+            <if test="conrtent!= null">
+                and conrtent = #{conrtent}
+            </if>
+            <if test="createDt!= null">
+                and createDt = #{createDt}
+            </if>
+            <if test="noticeCode!= null">
+                and noticeCode = #{noticeCode}
+            </if>
+            <if test="orderNumber!= null">
+                and orderNumber = #{orderNumber}
+            </if>
+            <if test="isDeal!= null">
+                and isDeal = #{isDeal}
+            </if>
+            <if test="isApply!= null">
+                and isApply = #{isApply}
+            </if>
+        </where>
+    </select>
+
+    <select id="queryNoticeList" parameterType="cn.pluss.platform.entity.Notice"
+            resultType="cn.pluss.platform.entity.Notice">
+        SELECT * from tb_pluss_notice
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="userId!= null">
+                and userId = #{userId}
+            </if>
+            <if test="userName!= null">
+                and userName = #{userName}
+            </if>
+            <if test="typeFirst!= null">
+                and typeFirst = #{typeFirst}
+            </if>
+            <if test="typeSecond!= null">
+                and typeSecond = #{typeSecond}
+            </if>
+            <if test="conrtent!= null">
+                and conrtent = #{conrtent}
+            </if>
+            <if test="createDt!= null">
+                and createDt = #{createDt}
+            </if>
+            <if test="noticeCode!= null">
+                and noticeCode = #{noticeCode}
+            </if>
+            <if test="orderNumber!= null">
+                and orderNumber = #{orderNumber}
+            </if>
+            <if test="isDeal!= null">
+                and isDeal = #{isDeal}
+            </if>
+            <if test="isApply!= null">
+                and isApply = #{isApply}
+            </if>
+        </where>
+    </select>
+
+    <update id="updateNotice" parameterType="cn.pluss.platform.entity.Notice">
+        update tb_pluss_notice
+        <set>
+            <if test="userId!= null">
+                userId = #{userId},
+            </if>
+            <if test="userName!= null">
+                userName = #{userName},
+            </if>
+            <if test="typeFirst!= null">
+                typeFirst = #{typeFirst},
+            </if>
+            <if test="typeSecond!= null">
+                typeSecond = #{typeSecond},
+            </if>
+            <if test="conrtent!= null">
+                conrtent = #{conrtent},
+            </if>
+            <if test="createDt!= null">
+                createDt = #{createDt},
+            </if>
+            <if test="noticeCode!= null">
+                noticeCode = #{noticeCode},
+            </if>
+            <if test="orderNumber!= null">
+                orderNumber = #{orderNumber},
+            </if>
+            <if test="isDeal!= null">
+                isDeal = #{isDeal},
+            </if>
+            <if test="isApply!= null">
+                isApply = #{isApply}
+            </if>
+        </set>
+        where id=#{id}
+    </update>
+
+    <delete id="deleteNotice" parameterType="cn.pluss.platform.entity.Notice">
+        DELETE
+        FROM tb_pluss_notice
+        where id = #{id}
+    </delete>
+
+    <select id="queryNoticeId" resultType="int">
+        SELECT n.id FROM tb_pluss_notice n
+        <where>
+            <if test="id!= null">
+                and n.id = #{id}
+            </if>
+            <if test="userId!= null">
+                and n.userId IN ('-1', #{userId})
+            </if>
+            <if test="userName!= null">
+                and userName like CONCAT("%",#{userName},"%")
+            </if>
+            <if test="typeFirst!= null">
+                and typeFirst = #{typeFirst}
+            </if>
+            <if test="typeSecond!= null">
+                and typeSecond = #{typeSecond}
+            </if>
+            <if test="conrtent!= null">
+                and conrtent = #{conrtent}
+            </if>
+            <if test="createDt!= null">
+                and createDt = #{createDt}
+            </if>
+            <if test="noticeCode!= null">
+                and noticeCode = #{noticeCode}
+            </if>
+            <if test="orderNumber!= null">
+                and orderNumber = #{orderNumber}
+            </if>
+            <if test="isDeal!= null">
+                and isDeal = #{isDeal}
+            </if>
+            <if test="isApply!= null">
+                and isApply = #{isApply}
+            </if>
+        </where>
+        order by n.id desc limit #{pageSize} offset #{offset}
+    </select>
+
+    <select id="queryNoticePage" parameterType="java.util.Map" resultType="cn.pluss.platform.entity.Notice">
+        SELECT
+            n.id, n.userId, n.userName, n.typeFirst, n.typeSecond, n.title, n.`desc`,
+            n.url, n.conrtent, n.createDt, n.noticeCode,
+            n.orderNumber, n.isDeal, n.isApply, n.uniqueKey,
+            IF ( nrr.id IS NULL, 0, 1 ) readStatus
+        FROM
+            tb_pluss_notice n
+        LEFT JOIN tb_pluss_notice_read_record nrr ON n.id = nrr.noticeId
+        AND nrr.userId = n.userId
+        <where>
+            <if test="id!= null">
+                and n.id = #{id}
+            </if>
+            <if test="userId!= null">
+                and n.userId IN ('-1', #{userId})
+            </if>
+            <if test="userName!= null">
+                and userName like CONCAT("%",#{userName},"%")
+            </if>
+            <if test="typeFirst!= null">
+                and typeFirst = #{typeFirst}
+            </if>
+            <if test="typeSecond!= null">
+                and typeSecond = #{typeSecond}
+            </if>
+            <if test="conrtent!= null">
+                and conrtent = #{conrtent}
+            </if>
+            <if test="createDt!= null">
+                and createDt = #{createDt}
+            </if>
+            <if test="noticeCode!= null">
+                and noticeCode = #{noticeCode}
+            </if>
+            <if test="orderNumber!= null">
+                and orderNumber = #{orderNumber}
+            </if>
+            <if test="isDeal!= null">
+                and isDeal = #{isDeal}
+            </if>
+            <if test="isApply!= null">
+                and isApply = #{isApply}
+            </if>
+        </where>
+        order by n.id desc limit #{pageSize} offset #{offset}
+    </select>
+
+    <select id="queryNoticePageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+        SELECT count(*) from tb_pluss_notice
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="userId!= null">
+                and userId = #{userId}
+            </if>
+            <if test="userName!= null">
+                and userName like CONCAT("%",#{userName},"%")
+            </if>
+            <if test="typeFirst!= null">
+                and typeFirst = #{typeFirst}
+            </if>
+            <if test="typeSecond!= null">
+                and typeSecond = #{typeSecond}
+            </if>
+            <if test="conrtent!= null">
+                and conrtent = #{conrtent}
+            </if>
+            <if test="createDt!= null">
+                and createDt = #{createDt}
+            </if>
+            <if test="noticeCode!= null">
+                and noticeCode = #{noticeCode}
+            </if>
+            <if test="isDeal!= null">
+                and isDeal = #{isDeal}
+            </if>
+            <if test="isApply!= null">
+                and isApply = #{isApply}
+            </if>
+        </where>
+    </select>
+
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/NoticeReadRecordMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/NoticeReadRecordMapper.xml
new file mode 100644
index 0000000..5a9121e
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/NoticeReadRecordMapper.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.NoticeReadRecordMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.NoticeReadRecord">
+        <id column="id" property="id" />
+        <result column="userId" property="userId" />
+        <result column="type" property="type" />
+        <result column="noticeId" property="noticeId" />
+        <result column="createTime" property="createTime" />
+    </resultMap>
+
+    <insert id="updateBillNoticeRead">
+        INSERT INTO tb_pluss_notice_read_record(`userId`, `type`, `noticeId`)
+        SELECT #{userId} `userId`, 1 `type`, mm.id noticeId FROM tb_pluss_make_money mm
+            LEFT JOIN tb_pluss_merchant_channel_status mcs ON mm.merchantId = mcs.merchantId
+            LEFT JOIN tb_pluss_user_app ua ON ua.merchantCode = mcs.merchantCode
+            LEFT JOIN tb_pluss_notice_read_record nrr ON nrr.noticeId = mm.id AND nrr.type = '1' AND nrr.userId = ua.userId
+        WHERE nrr.id IS NULL AND ua.userId = #{userId}
+    </insert>
+
+    <insert id="updateNoticeRead">
+        INSERT INTO tb_pluss_notice_read_record(`userId`, `type`, `noticeId`)
+        SELECT #{userId} `userId`, 2 `type`, n.id noticeId FROM tb_pluss_notice n
+            LEFT JOIN tb_pluss_notice_read_record nrr ON n.id = nrr.noticeId AND nrr.type = '2' AND (nrr.userId = n.userId OR n.userId = -1)
+        WHERE nrr.id IS NULL AND n.typeFirst = #{type} AND n.userId IN ("-1", #{userId})
+    </insert>
+
+    <insert id="updateEventInfoRead">
+        INSERT INTO tb_pluss_notice_read_record(`userId`, `type`, `noticeId`)
+        SELECT #{userId} `userId`, 3 `type`, bna.id noticeId FROM tb_pluss_best_new_activity bna
+            LEFT JOIN tb_pluss_notice_read_record nrr ON nrr.noticeId = bna.id AND nrr.type = '3' AND nrr.userId = #{userId}
+        WHERE FIND_IN_SET(#{type}, bna.type) AND nrr.id IS NULL
+    </insert>
+
+    <select id="selectBillCount" resultType="java.lang.Integer">
+        SELECT count(1) FROM tb_pluss_make_money mm
+         LEFT JOIN tb_pluss_merchant_channel_status mcs ON mm.merchantId = mcs.merchantId
+         LEFT JOIN tb_pluss_user_app ua ON ua.merchantCode = mcs.merchantCode
+         LEFT JOIN tb_pluss_notice_read_record nrr ON nrr.noticeId = mm.id AND nrr.type = '1' AND nrr.userId = ua.userId
+        WHERE nrr.id IS NULL AND ua.userId = #{userId}
+    </select>
+
+    <select id="selectNoticeCount" resultType="java.util.Map">
+        SELECT count(1) `count`, typeFirst `type` FROM tb_pluss_notice n
+         LEFT JOIN tb_pluss_notice_read_record nrr ON n.id = nrr.noticeId AND nrr.type = '2' AND (nrr.userId = n.userId OR n.userId = -1)
+        WHERE nrr.id IS NULL AND (n.userId = #{userId} OR n.userId = '-1')
+        GROUP BY n.typeFirst
+    </select>
+
+    <select id="selectArticleCount" resultType="java.util.Map">
+        SELECT count(1) `count`, 'recommendCount' `type` FROM tb_pluss_best_new_activity bna
+           LEFT JOIN tb_pluss_notice_read_record nrr ON nrr.noticeId = bna.id AND nrr.type = '3' AND nrr.userId = #{userId}
+        WHERE FIND_IN_SET(1, bna.type) AND nrr.id IS NULL
+        UNION
+        SELECT count(1) `count`, 'recommendCount2' `type` FROM tb_pluss_best_new_activity bna
+           LEFT JOIN tb_pluss_notice_read_record nrr ON nrr.noticeId = bna.id AND nrr.type = '3' AND nrr.userId = #{userId}
+        WHERE FIND_IN_SET(4, bna.type) AND nrr.id IS NULL
+        UNION
+        SELECT count(1) `count`, 'informationCount' `type` FROM tb_pluss_best_new_activity bna
+           LEFT JOIN tb_pluss_notice_read_record nrr ON nrr.noticeId = bna.id AND nrr.type = '3' AND nrr.userId = #{userId}
+        WHERE FIND_IN_SET(2, bna.type) AND nrr.id IS NULL
+        UNION
+        SELECT count(1) `count`, 'activityCount' `type` FROM tb_pluss_best_new_activity bna
+           LEFT JOIN tb_pluss_notice_read_record nrr ON nrr.noticeId = bna.id AND nrr.type = '3' AND nrr.userId = #{userId}
+        WHERE FIND_IN_SET(3, bna.type) AND nrr.id IS NULL
+    </select>
+
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/NoticeTemplateMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/NoticeTemplateMapper.xml
new file mode 100644
index 0000000..1c9df88
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/NoticeTemplateMapper.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.NoticeTemplateMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.NoticeTemplate">
+        <id column="id" property="id" />
+        <result column="type" property="type" />
+        <result column="variable" property="variable" />
+        <result column="content" property="content" />
+        <result column="createTime" property="createTime" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/NotificationMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/NotificationMapper.xml
new file mode 100644
index 0000000..70d7861
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/NotificationMapper.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.NotificationMapper">
+    <select id="selectOneTime" resultType="cn.pluss.platform.entity.Notification">
+        select id,createTime FROM tb_pluss_notification ORDER BY createTime DESC LIMIT 0,1 ;
+    </select>
+
+    <select id="queryNotification" resultType="cn.pluss.platform.entity.Notification" parameterType="java.util.Map">
+        select * from tb_pluss_notification
+        order by case
+                 when status=1 then 0 else 1
+		         END,createTime desc limit #{pageSize} offset #{offset}
+    </select>
+
+    <update id="updateAll" parameterType="java.lang.String">
+        update tb_pluss_notification set status=#{status}
+    </update>
+
+</mapper>
\ No newline at end of file
diff --git a/pluss-dao-bundle/src/main/resources/mapper/OfficialActivityMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/OfficialActivityMapper.xml
new file mode 100644
index 0000000..f066b81
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/OfficialActivityMapper.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.OfficialActivityMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.OfficialActivity">
+        <id column="id" property="id" />
+        <result column="officName" property="officName" />
+        <result column="officTitle" property="officTitle" />
+        <result column="officContent" property="officContent" />
+        <result column="officImgUrl" property="officImgUrl" />
+        <result column="toImgUrl" property="toImgUrl" />
+        <result column="startTime" property="startTime" />
+        <result column="endTime" property="endTime" />
+        <result column="status" property="status" />
+        <result column="remark" property="remark" />
+        <result column="createTime" property="createTime" />
+        <result column="createBy" property="createBy" />
+        <result column="updateTime" property="updateTime" />
+        <result column="officRule" property="officRule"/>
+        <result column="officDetailImgUrl" property="officDetailImgUrl"/>
+        <result column="activityGroupNo" property="activityGroupNo"/>
+        <result column="groupBy" property="groupBy"/>
+        <result column="actType" property="actType"/>
+        <result column="roleType" property="roleType"/>
+    </resultMap>
+
+
+
+    <update id="updateActivityStatus" parameterType="java.util.Date">
+        UPDATE tb_pluss_official_activity
+        SET `status` = '3'
+        WHERE
+        id IN (
+        SELECT id FROM(
+        SELECT
+        id
+        FROM
+        tb_pluss_official_activity
+        WHERE
+        endTime <![CDATA[<=]]> #{dateTime} AND `status` = '2' ) a )
+    </update>
+
+
+    <select id="getListByRole" resultType="cn.pluss.platform.entity.OfficialActivity" parameterType="cn.pluss.platform.entity.OfficialActivity">
+        select * from tb_pluss_official_activity
+        <where>
+            <if test="status != null and status != ''">
+                and status = #{status}
+            </if>
+            <if test="activityGroupNo != null and activityGroupNo != ''">
+                and activityGroupNo = #{activityGroupNo}
+            </if>
+            <if test="actType != null and actType != ''">
+                and actType = #{actType}
+            </if>
+            <if test="commonType != null or roleType != null ">
+                and (
+                <if test="commonType != null and commonType != ''">
+                    roleType = #{commonType}
+                </if>
+                <if test="roleType != null and roleType != ''">
+                    or roleType = #{roleType}
+                </if>
+                )
+            </if>
+            order by createTime desc
+        </where>
+    </select>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/OfficialGoodsExchangeMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/OfficialGoodsExchangeMapper.xml
new file mode 100644
index 0000000..8f59c29
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/OfficialGoodsExchangeMapper.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.OfficialGoodsExchangeMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.OfficialGoodsExchange">
+        <id column="id" property="id" />
+        <result column="merchantCode" property="merchantCode" />
+        <result column="merchantName" property="merchantName" />
+        <result column="goodId" property="goodId" />
+        <result column="createTime" property="createTime" />
+        <result column="address" property="address" />
+        <result column="phone" property="phone" />
+        <result column="userName" property="userName" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/OfficialGoodsMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/OfficialGoodsMapper.xml
new file mode 100644
index 0000000..e62f89b
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/OfficialGoodsMapper.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.OfficialGoodsMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.OfficialGoods">
+        <id column="id" property="id" />
+        <result column="goodName" property="goodName" />
+        <result column="goodDesc" property="goodDesc" />
+        <result column="goodPrice" property="goodPrice" />
+        <result column="status" property="status" />
+        <result column="toImgUrl" property="toImgUrl" />
+        <result column="imgUrl" property="imgUrl" />
+        <result column="createTime" property="createTime" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/OpenAccountConfigMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/OpenAccountConfigMapper.xml
new file mode 100644
index 0000000..281ba52
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/OpenAccountConfigMapper.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.OpenAccountConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.OpenAccountConfig">
+        <id column="id" property="id" />
+        <result column="roleCode" property="roleCode" />
+        <result column="type" property="type" />
+        <result column="provinceCode" property="provinceCode" />
+        <result column="cityCode" property="cityCode" />
+        <result column="areaCode" property="areaCode" />
+        <result column="provinceName" property="provinceName" />
+        <result column="cityName" property="cityName" />
+        <result column="areaName" property="areaName" />
+        <result column="level" property="level" />
+        <result column="rewardAmt" property="rewardAmt" />
+        <result column="createTime" property="createTime" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/OpenAccountRecordMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/OpenAccountRecordMapper.xml
new file mode 100644
index 0000000..4bef75e
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/OpenAccountRecordMapper.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.OpenAccountRecordMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.OpenAccountRecord">
+        <id column="id" property="id" />
+        <result column="userId" property="userId" />
+        <result column="merchantName" property="merchantName" />
+        <result column="orderNumber" property="orderNumber" />
+        <result column="orderAmt" property="orderAmt" />
+        <result column="goodCode" property="goodCode" />
+        <result column="goodName" property="goodName" />
+        <result column="type" property="type" />
+        <result column="rewardAmt" property="rewardAmt" />
+        <result column="status" property="status" />
+        <result column="rewardUserId" property="rewardUserId" />
+        <result column="areaCode" property="areaCode" />
+        <result column="areaName" property="areaName" />
+        <result column="createTime" property="createTime" />
+        <result column="createDate" property="createDate" />
+        <result column="roleCode" property="roleCode" />
+    </resultMap>
+
+    <select id="countData" parameterType="cn.pluss.platform.entity.OpenAccountRecord" resultType="java.util.Map">
+        SELECT
+            IFNULL( SUM(IF(type = '01',orderAmt,0)), 0 ) AS orderAmtCount,
+            IFNULL(SUM(IF(type = '02',orderAmt,0)),0) as refundAmtCount,
+            IFNULL(SUM(rewardAmt),0) as actualExpendAmtCount
+        FROM
+            tb_pluss_open_account_record
+        <where>
+            <if test="userId != null">
+                and userId = #{userId}
+            </if>
+            <if test="merchantName != null and merchantName != ''">
+                and merchantName = #{merchantName}
+            </if>
+            <if test="orderNumber != null and orderNumber != ''">
+                and orderNumber = #{orderNumber}
+            </if>
+            <if test="goodCode != null and goodCode != ''">
+                and goodCode = #{goodCode}
+            </if>
+            <if test="goodName != null and goodName != ''">
+                and goodName = #{goodName}
+            </if>
+            <if test="type != null and type != ''">
+                and type = #{type}
+            </if>
+            <if test="status != null and status != ''">
+                and userId = #{userId}
+            </if>
+            <if test="rewardUserId != null and rewardUserId != ''">
+                and rewardUserId = #{rewardUserId}
+            </if>
+            <if test="areaCode != null and areaCode != ''">
+                and areaCode = #{areaCode}
+            </if>
+            <if test="areaName != null and areaName != ''">
+                and areaName = #{areaName}
+            </if>
+            <if test="startTime != null and startTime != ''">
+                and createDate <![CDATA[ >= ]]> #{startTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and createDate <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+    </select>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/OperationRecordMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/OperationRecordMapper.xml
new file mode 100644
index 0000000..b66c23c
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/OperationRecordMapper.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.OperationRecordMapper">
+    <select id="selectOperationRecordOne" parameterType="java.util.Map"
+            resultType="cn.pluss.platform.entity.OperationRecord">
+        SELECT pd.`name` as dictName, pui.loginName AS loginName, por.*, pms.merchantName AS merchantName
+        FROM tb_pluss_operation_record por
+                 LEFT JOIN tb_pluss_dict pd
+                           ON por.dictValue = pd.`value`
+                 LEFT JOIN tb_pluss_user_info pui
+                           ON por.operator = pui.id
+                 LEFT JOIN tb_pluss_merchant_store pms
+                           ON por.userId = pms.id
+        where por.userId = #{id}
+        ORDER BY por.createTime DESC limit #{pageSize}
+        offset #{offset}
+    </select>
+
+    <select id="selectParticularsCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+        SELECT COUNT(*)
+        FROM tb_pluss_operation_record por
+                 LEFT JOIN tb_pluss_dict pd
+                           ON por.dictValue = pd.`value`
+                 LEFT JOIN tb_pluss_user_info pui
+                           ON por.operator = pui.id
+                 LEFT JOIN tb_pluss_merchant_store pms
+                           ON por.userId = pms.id
+        where por.userId = #{id}
+    </select>
+
+    <select id="selectVOPage" resultType="cn.pluss.platform.vo.OperationRecordVO">
+        SELECT opr.*,
+               opr.extension ->> '$.isp' isp, opr.extension ->> '$.city' city, opr.extension ->> '$.province' province
+                , opr.extension ->> '$.country' country, opr.extension ->> '$.county' county
+                , ua.userName, mbi.address, t.count, IF(opr.extension ->> '$.country' IS NULL, -1, IF(opr.extension ->> '$.country' = '中国', '1', '0')) isChina
+        FROM tb_pluss_operation_record opr
+            LEFT JOIN tb_pluss_user_app ua
+        ON opr.userId = ua.userId
+            LEFT JOIN tb_pluss_merchant_base_info mbi ON mbi.userId = opr.userId
+            LEFT JOIN (
+            SELECT ip , COUNT (DISTINCT opr.userId) count FROM tb_pluss_operation_record opr
+            LEFT JOIN tb_pluss_user_app ua ON ua.userId = opr.userId WHERE ua.userType != 'staff' GROUP BY ip
+            ) t ON t.ip = opr.ip
+            ${ew.customSqlSegment}
+    </select>
+
+    <select id="selectUserSameIpCountPage" resultType="cn.pluss.platform.vo.OperationRecordVO">
+        SELECT DISTINCT opr.remark
+                      , opr.ip
+                      , t.count
+                      , opr.createTime
+                      , opr.extension ->> '$.city' city
+                      , opr.extension ->> '$.province' province
+                      , opr.extension ->> '$.county' county
+        FROM tb_pluss_operation_record opr LEFT JOIN (
+            SELECT ip, COUNT(DISTINCT opr.userId) `count` FROM tb_pluss_operation_record opr
+            LEFT JOIN tb_pluss_merchant_base_info mbi ON mbi.userId = opr.userId
+            LEFT JOIN tb_pluss_merchant_channel_status mcs ON mcs.merchantCode = mbi.merchantCode
+            WHERE mcs.`status` = '3' AND mbi.userId = #{userId}
+            GROUP BY ip
+            ) t
+        ON opr.ip = t.ip
+        WHERE opr.userId = #{userId}
+        ORDER BY opr.createTime DESC
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/pluss-dao-bundle/src/main/resources/mapper/PayAreaRyxMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/PayAreaRyxMapper.xml
new file mode 100644
index 0000000..2e6c9e9
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/PayAreaRyxMapper.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.PayAreaRyxMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.PayAreaRyx">
+        <id column="id" property="id" />
+        <result column="provinceCode" property="provinceCode" />
+        <result column="province" property="province" />
+        <result column="cityCode" property="cityCode" />
+        <result column="city" property="city" />
+        <result column="areaCode" property="areaCode" />
+        <result column="area" property="area" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/PhoneConfigMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/PhoneConfigMapper.xml
new file mode 100644
index 0000000..f6abe85
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/PhoneConfigMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.PhoneConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.PhoneConfig">
+        <id column="id" property="id" />
+        <result column="phone" property="phone" />
+        <result column="name" property="name" />
+        <result column="createTime" property="createTime" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/PhoneValidateCode-sqlmap.xml b/pluss-dao-bundle/src/main/resources/mapper/PhoneValidateCode-sqlmap.xml
new file mode 100644
index 0000000..6aa22ef
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/PhoneValidateCode-sqlmap.xml
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="cn.pluss.platform.mapper.PhoneValidateCodeMapper">
+
+    <insert id="savePhoneValidateCode" parameterType="cn.pluss.platform.entity.PhoneValidateCode">
+        	insert into tb_pluss_phone_validate_code(phone,code,sendDt,status,remark)VALUES(#{phone},#{code},#{sendDt},#{status},#{remark})
+    </insert>
+
+    <insert id="savePhoneValidateCodeBatch">
+        insert into tb_pluss_phone_validate_code(phone,code,sendDt,status,remark) VALUES
+        <foreach collection="list" item="item" index="index" separator=",">
+            (#{phone},#{code},#{sendDt},#{status},#{remark} )
+        </foreach>
+    </insert>
+
+    <select id="queryPhoneValidateCode" parameterType="cn.pluss.platform.entity.PhoneValidateCode"
+            resultType="cn.pluss.platform.entity.PhoneValidateCode">
+        SELECT * from tb_pluss_phone_validate_code
+        <where>
+            <if test="id != null">
+                and id = #{id}
+            </if>
+            <if test="phone != null and phone != ''">
+                and phone = #{phone}
+            </if>
+            <if test="code != null and code != ''">
+                and code = #{code}
+            </if>
+            <if test="sendDt != null">
+                and sendDt = #{sendDt}
+            </if>
+            <if test="status != null and status != ''">
+                and status = #{status}
+            </if>
+            <if test="remark != null and remark != ''">
+                and remark = #{remark}
+            </if>
+            <if test="limitTime != null">
+                and sendDt >= DATE_SUB(NOW(),INTERVAL ${limitTime / 1000} SECOND)
+            </if>
+        </where>
+        ORDER BY sendDt DESC
+        LIMIT 0, 1
+    </select>
+
+    <select id="queryPhoneValidateCodeList" parameterType="cn.pluss.platform.entity.PhoneValidateCode"
+            resultType="cn.pluss.platform.entity.PhoneValidateCode">
+        SELECT * from tb_pluss_phone_validate_code
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="phone!= null">
+                and phone = #{phone}
+            </if>
+            <if test="code!= null">
+                and code = #{code}
+            </if>
+            <if test="sendDt!= null">
+                and sendDt = #{sendDt}
+            </if>
+            <if test="status!= null">
+                and status = #{status}
+            </if>
+            <if test="remark!= null">
+                and remark = #{remark}
+            </if>
+            order by sendDt desc
+
+        </where>
+    </select>
+
+    <update id="updatePhoneValidateCode" parameterType="cn.pluss.platform.entity.PhoneValidateCode">
+        update tb_pluss_phone_validate_code
+        <set>
+            <if test="phone!= null">
+                phone = #{phone},
+            </if>
+            <if test="code!= null">
+                code = #{code},
+            </if>
+            <if test="sendDt!= null">
+                sendDt = #{sendDt},
+            </if>
+            <if test="status!= null">
+                status = #{status},
+            </if>
+            <if test="remark!= null">
+                remark = #{remark}
+            </if>
+        </set>
+        where id=#{id}
+    </update>
+
+    <delete id="deletePhoneValidateCode" parameterType="cn.pluss.platform.entity.PhoneValidateCode">
+			DELETE FROM tb_pluss_phone_validate_code where id=#{id} or phone=#{phone}
+		</delete>
+
+    <select id="queryPhoneValidateCodePage" parameterType="java.util.Map"
+            resultType="cn.pluss.platform.entity.PhoneValidateCode">
+        SELECT * from tb_pluss_phone_validate_code
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="phone!= null">
+                and phone = #{phone}
+            </if>
+            <if test="code!= null">
+                and code = #{code}
+            </if>
+            <if test="sendDt!= null">
+                and sendDt = #{sendDt}
+            </if>
+            <if test="status!= null">
+                and status = #{status}
+            </if>
+            <if test="remark!= null">
+                and remark = #{remark}
+            </if>
+        </where>
+        order by id desc limit #{pageSize} offset #{offset}
+    </select>
+
+    <select id="queryPhoneValidateCodePageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+        SELECT count(*) from tb_pluss_phone_validate_code
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="phone!= null">
+                and phone = #{phone}
+            </if>
+            <if test="code!= null">
+                and code = #{code}
+            </if>
+            <if test="sendDt!= null">
+                and sendDt = #{sendDt}
+            </if>
+            <if test="status!= null">
+                and status = #{status}
+            </if>
+            <if test="remark!= null">
+                and remark = #{remark}
+            </if>
+        </where>
+    </select>
+
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/PlatformDataMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/PlatformDataMapper.xml
new file mode 100644
index 0000000..b4d2c4c
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/PlatformDataMapper.xml
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.PlatformDataMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.PlatformData">
+        <id column="id" property="id" />
+        <result column="transAmt" property="transAmt" />
+        <result column="aliAmt" property="aliAmt" />
+        <result column="wxAmt" property="wxAmt" />
+        <result column="ysfAmt" property="ysfAmt" />
+        <result column="transNum" property="transNum" />
+        <result column="aliNum" property="aliNum" />
+        <result column="wxNum" property="wxNum" />
+        <result column="ysfNum" property="ysfNum" />
+        <result column="refundAmt" property="refundAmt" />
+        <result column="aliRefundAmt" property="aliRefundAmt" />
+        <result column="wxRefundAmt" property="wxRefundAmt" />
+        <result column="ysfRefundAmt" property="ysfRefundAmt" />
+        <result column="storeNum" property="storeNum" />
+        <result column="memberNum" property="memberNum" />
+        <result column="promoterNum" property="promoterNum" />
+        <result column="profitAmt" property="profitAmt" />
+        <result column="shareAmt" property="shareAmt" />
+        <result column="fansAmt" property="fansAmt" />
+        <result column="actualAmt" property="actualAmt" />
+        <result column="operatDate" property="operatDate" />
+        <result column="createTime" property="createTime" />
+    </resultMap>
+
+    <select id="getYestDayPlatformData" resultType="cn.pluss.platform.entity.PlatformData">
+        SELECT
+        SUM(consumeFee) AS transAmt,
+        SUM(CASE WHEN (payTypeCode = 'wechatPay' or payTypeCode = 'sxfPay1') THEN
+        consumeFee
+        ELSE
+        0
+        END) AS wxAmt,
+        SUM(CASE WHEN (payTypeCode = 'aliPay' or payTypeCode = 'sxfPay0') THEN
+        consumeFee
+        ELSE
+        0
+        END) AS aliAmt,
+        SUM(CASE WHEN (payTypeCode = 'bank' or payTypeCode = 'sxfPay2') THEN
+        consumeFee
+        ELSE
+        0
+        END) AS ysfAmt,
+        count(1) AS transNum,
+        SUM(CASE WHEN (payTypeCode = 'wechatPay' or payTypeCode = 'sxfPay1') THEN
+        1
+        ELSE
+        0
+        END) AS wxNum,
+        SUM(CASE WHEN (payTypeCode = 'aliPay' or payTypeCode = 'sxfPay0') THEN
+        1
+        ELSE
+        0
+        END) AS aliNum,
+        SUM(CASE WHEN (payTypeCode = 'bank' or payTypeCode = 'sxfPay2') THEN
+        1
+        ELSE
+        0
+        END) AS ysfNum,
+        SUM(
+        IF(orderType = 8,enterFee, consumeFee - enterFee) - channelFee - (IF(cashFee = 0,consumeFee - enterFee - mercFee, cashFee) * 0.2)
+        ) AS profitAmt,
+        IFNULL(SUM(profitShareMoney), 0) AS shareAmt,
+        IFNULL(SUM(fansShareMoney), 0) AS fansAmt
+        FROM tb_pluss_merchant_order WHERE  `status` = 1 and createDate = date_sub(curdate(),interval 1 day)
+    </select>
+
+    <select id="getYestDayPlatformRefundData" resultType="cn.pluss.platform.entity.PlatformData">
+        SELECT
+            IFNULL(SUM(payAmt), 0) AS refundAmt,
+            IFNULL(SUM(CASE WHEN (payTypeCode = 'wechatPay' or payTypeCode = 'sxfPay1') THEN
+                payAmt
+                ELSE
+                0
+                END), 0) AS wxRefundAmt,
+            IFNULL(SUM(CASE WHEN (payTypeCode = 'aliPay' or payTypeCode = 'sxfPay0') THEN
+                payAmt
+                ELSE
+                0
+                END), 0) AS aliRefundAmt,
+            IFNULL(SUM(CASE WHEN (payTypeCode = 'bank' or payTypeCode = 'sxfPay2') THEN
+                payAmt
+                ELSE
+                0
+                END), 0) AS ysfRefundAmt
+        FROM tb_pluss_merchant_refund_order WHERE `status` = 1 and date(createTime) = date_sub(curdate(),interval 1 day)
+    </select>
+
+    <select id="getYestDayPlatformAddData" resultType="cn.pluss.platform.entity.PlatformData">
+        SELECT
+            SUM(IF(type = 'yesterdayPromoter',num,0)) AS promoterNum,
+            SUM(IF(type = 'yesterdayMember',num,0))AS memberNum,
+            SUM(IF(type = 'yesterdayStore',num,0)) AS storeNum
+        FROM (
+        SELECT count(1) AS num, 'yesterdayPromoter' as type, 'add' as addType FROM tb_pluss_user_app WHERE date(createDt) = date_sub(curdate(),interval 1 day)
+        union
+        SELECT count(1) AS num, 'yesterdayMember' AS type,'add' as addType  FROM tb_pluss_merchant_menber WHERE date(createDt) = date_sub(curdate(),interval 1 day)
+        union
+        SELECT count(1) AS num, 'yesterdayStore' AS type,'add' as addType FROM tb_pluss_merchant_store WHERE date(createDt) = date_sub(curdate(),interval 1 day)
+        )as
+        a GROUP BY addType
+    </select>
+
+    <select id="getChartTransCountData" resultType="java.util.Map">
+        SELECT
+            DATE_FORMAT(createDate, '%Y-%m-%d') days,
+            SUM( consumeFee ) AS transCountAmt,
+            count(1) AS transNum
+        FROM
+            ( SELECT consumeFee, createDate FROM tb_pluss_merchant_order WHERE DATE_SUB( CURDATE(), INTERVAL 7 DAY ) &lt;= createDate AND STATUS = '1' ) AS d
+        GROUP BY
+            d.createDate
+    </select>
+
+
+    <select id="getChartChannelCountData" resultType="java.util.Map">
+        SELECT * from (
+          SELECT
+              (CASE aisleSwitch
+                   WHEN 1 THEN
+                       '乐刷'
+                   WHEN 2 THEN
+                       '随行付'
+                   WHEN 3 THEN
+                       '瑞银信'
+                   WHEN 4 THEN
+                       '银盛'
+                   ELSE
+                       '其他'
+                  END) as channelName,
+              SUM(consumeFee) AS transCountAmt,
+              count(1) AS transNum
+          FROM tb_pluss_merchant_order WHERE `status` = 1 AND date(createDt) = curdate() GROUP BY aisleSwitch
+        ) a ORDER BY a.transCountAmt desc
+    </select>
+
+    <select id="selectMonthData" resultType="cn.pluss.platform.entity.PlatformData">
+        SELECT
+            SUM(transAmt) transAmt,
+            SUM(aliAmt) aliAmt,
+            SUM(wxAmt) wxAmt,
+            SUM(ysfAmt) ysfAmt,
+            SUM(transNum) transNum,
+            SUM(aliNum) aliNum,
+            SUM(wxNum) wxNum,
+            SUM(ysfNum) ysfNum,
+            SUM(storeNum) storeNum,
+            SUM(memberNum) memberNum,
+            SUM(promoterNum) promoterNum,
+            SUM(actualAmt) actualAmt
+        FROM tb_pluss_platform_data WHERE operateMonth = #{month};
+    </select>
+
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/PostageConfigMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/PostageConfigMapper.xml
new file mode 100644
index 0000000..5287ec8
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/PostageConfigMapper.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.PostageConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.PostageConfig">
+        <id column="id" property="id" />
+        <result column="areaCode" property="areaCode" />
+        <result column="areaLevel" property="areaLevel" />
+        <result column="firstWeight" property="firstWeight" />
+        <result column="nextWeight" property="nextWeight" />
+        <result column="remark" property="remark" />
+        <result column="createTime" property="createTime" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/Province-sqlmap.xml b/pluss-dao-bundle/src/main/resources/mapper/Province-sqlmap.xml
new file mode 100644
index 0000000..f6653d3
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/Province-sqlmap.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+			"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="cn.pluss.platform.mapper.ProvinceMapper">
+
+	   	<insert id="saveProvince" parameterType="cn.pluss.platform.entity.Province">
+        	insert into tb_pluss_province(f_province_no,f_province_name,f_aliasp,f_province_cups_no)VALUES(#{f_province_no},#{f_province_name},#{f_aliasp},#{f_province_cups_no})
+    	</insert>
+
+	   	<insert id="saveProvinceBatch">
+        	insert into tb_pluss_province(f_province_no,f_province_name,f_aliasp,f_province_cups_no) VALUES 
+    			<foreach collection="list" item="item" index="index" separator=",">
+			(#{f_province_no},#{f_province_name},#{f_aliasp},#{f_province_cups_no}		)
+				</foreach>
+    	</insert>
+
+		<select id="queryProvince" parameterType="cn.pluss.platform.entity.Province" resultMap="province">
+			SELECT * from tb_pluss_province 
+				<where> 
+					<if test="f_province_no!= null"> 
+					 	and f_province_no = #{f_province_no}
+					 </if> 
+					<if test="f_province_name!= null"> 
+					 	and f_province_name = #{f_province_name}
+					 </if> 
+					<if test="f_aliasp!= null"> 
+					 	and f_aliasp = #{f_aliasp}
+					 </if> 
+					<if test="f_province_cups_no!= null"> 
+					 	and f_province_cups_no = #{f_province_cups_no}
+					 </if> 
+				 </where> 
+		</select>
+		
+		<resultMap type="cn.pluss.platform.leshua.LeshuaProvince" id="province">
+              <result property="code" column="F_province_no" ></result>
+              <result property="name" column="F_province_name" jdbcType="VARCHAR"></result>
+        </resultMap>
+
+		<select id="queryProvinceList" parameterType="cn.pluss.platform.entity.Province" resultMap="province">
+			SELECT * from tb_pluss_province
+				<where> 
+					<if test="f_province_no!= null"> 
+					 and 	f_province_no = #{f_province_no}
+					 </if> 
+					<if test="f_province_name!= null"> 
+					 and 	f_province_name = #{f_province_name}
+					 </if> 
+					<if test="f_aliasp!= null"> 
+					 and 	f_aliasp = #{f_aliasp}
+					 </if> 
+					<if test="f_province_cups_no!= null"> 
+					 and 	f_province_cups_no = #{f_province_cups_no}
+					 </if> 
+				 </where> 
+		</select>
+
+		<update id="updateProvince" parameterType="cn.pluss.platform.entity.Province" >
+			update tb_pluss_province 
+				  <set> 
+					<if test="f_province_no!= null"> 
+					 	f_province_no = #{f_province_no},
+					 </if> 
+					<if test="f_province_name!= null"> 
+					 	f_province_name = #{f_province_name},
+					 </if> 
+					<if test="f_aliasp!= null"> 
+					 	f_aliasp = #{f_aliasp},
+					 </if> 
+					<if test="f_province_cups_no!= null"> 
+					 	f_province_cups_no = #{f_province_cups_no}
+					 </if> 
+				</set>
+			where id=#{id} 
+		</update>
+
+		<delete id="deleteProvince" parameterType="cn.pluss.platform.entity.Province" >
+			DELETE FROM tb_pluss_province where id=#{id}
+		</delete>
+
+		<select id="queryProvincePage" parameterType="java.util.Map" resultMap="province">
+			SELECT * from tb_pluss_province 
+				<where> 
+					<if test="f_province_no!= null"> 
+					and f_province_no = #{f_province_no}
+					 </if> 
+					<if test="f_province_name!= null"> 
+					and f_province_name = #{f_province_name}
+					 </if> 
+					<if test="f_aliasp!= null"> 
+					and f_aliasp = #{f_aliasp}
+					 </if> 
+					<if test="f_province_cups_no!= null"> 
+					and f_province_cups_no = #{f_province_cups_no}
+					 </if> 
+				 </where> 
+			order by id desc  limit #{pageSize}  offset  #{offset}  
+		</select>
+
+		<select id="queryProvincePageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+			SELECT count(*) from tb_pluss_province 
+					<where> 
+					<if test="f_province_no!= null"> 
+					 and f_province_no = #{f_province_no}
+					 </if> 
+					<if test="f_province_name!= null"> 
+					 and f_province_name = #{f_province_name}
+					 </if> 
+					<if test="f_aliasp!= null"> 
+					 and f_aliasp = #{f_aliasp}
+					 </if> 
+					<if test="f_province_cups_no!= null"> 
+					 and f_province_cups_no = #{f_province_cups_no}
+					 </if> 
+				</where>
+		</select>
+
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/PushAllMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/PushAllMapper.xml
new file mode 100644
index 0000000..774f2f9
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/PushAllMapper.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.PushAllMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.PushAll">
+        <id column="id" property="id" />
+        <result column="title" property="title" />
+        <result column="content" property="content" />
+        <result column="createTime" property="createTime" />
+        <result column="updateTime" property="updateTime" />
+    </resultMap>
+
+
+
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/QrCode-sqlmap.xml b/pluss-dao-bundle/src/main/resources/mapper/QrCode-sqlmap.xml
new file mode 100644
index 0000000..9f8703f
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/QrCode-sqlmap.xml
@@ -0,0 +1,268 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+			"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="cn.pluss.platform.mapper.QrCodeMapper">
+
+	   	<insert id="saveQrCode" parameterType="cn.pluss.platform.entity.QrCode">
+        	insert into tb_pluss_qr_code (
+			createTime
+			<if test="qrNo != null and qrNo != ''">
+				,qrNo
+			</if>
+			<if test="orderNo != null and orderNo != ''">
+				,orderNo
+			</if>
+			<if test="buyMercName != null and buyMercName != ''">
+				,buyMercName
+			</if>
+			<if test="buyMercId != null">
+				,buyMercId
+			</if>
+			<if test="actMercName != null and actMercName != ''">
+				,actMercName
+			</if>
+			<if test="actMercId != null">
+				,actMercId
+			</if>
+			<if test="status != null and status != ''">
+				,status
+			</if>
+			<if test="createBy != null and createBy != ''">
+				,createBy
+			</if>
+			<if test="remarks != null and remarks != ''">
+				,remarks
+			</if>
+			)
+			VALUES(
+				now()
+			<if test="qrNo != null and qrNo != ''">
+				,#{qrNo}
+			</if>
+			<if test="orderNo != null and orderNo != ''">
+				,#{orderNo}
+			</if>
+			<if test="buyMercName != null and buyMercName != ''">
+				,#{buyMercName}
+			</if>
+			<if test="buyMercId != null">
+				,#{buyMercId}
+			</if>
+			<if test="actMercName != null and actMercName != ''">
+				,#{actMercName}
+			</if>
+			<if test="actMercId != null">
+				,#{actMercId}
+			</if>
+			<if test="status != null and status != ''">
+				,#{status}
+			</if>
+			<if test="createBy != null and createBy != ''">
+				,#{createBy}
+			</if>
+			<if test="remarks != null and remarks != ''">
+				,#{remarks}
+			</if>
+			)
+    	</insert>
+
+	   	<insert id="batchSaveQrCode">
+        	insert into tb_pluss_qr_code(
+			qrNo,orderNo,buyMercName,buyMercId,actMercName,actMercId,createTime,createBy,remarks
+			) VALUES
+    			<foreach collection="list" item="item" index="index" separator=",">
+					(#{item.qrNo},#{item.orderNo},
+					#{item.buyMercName},
+					#{item.buyMercId},
+					#{item.actMercName},
+					#{item.actMercId},
+					now(),#{item.createBy},#{item.remarks})
+				</foreach>
+    	</insert>
+
+		<select id="getQrCode" parameterType="cn.pluss.platform.entity.QrCode" resultType="cn.pluss.platform.entity.QrCode">
+			SELECT * from tb_pluss_qr_code
+				<where>
+					delFlag = '1'
+					<if test="id!= null"> 
+					 	and id = #{id}
+					 </if> 
+					<if test="qrNo!= null and qrNo != ''">
+					 	and qrNo = #{qrNo}
+					 </if> 
+					<if test="orderNo!= null and orderNo != ''">
+					 	and orderNo = #{orderNo}
+					 </if> 
+					<if test="buyMercName!= null and buyMercName != ''">
+					 	and buyMercName = #{buyMercName}
+					 </if>
+					<if test="buyMercId!= null">
+						and buyMercId = #{buyMercId}
+					</if>
+					<if test="actMercName!= null and actMercName != ''">
+						and actMercName = #{actMercName}
+					</if>
+					<if test="actMercId!= null">
+						and actMercId = #{actMercId}
+					</if>
+					<if test="status!= null and status != ''">
+					 	and status = #{status}
+					 </if> 
+				 </where>
+		</select>
+
+		<select id="queryQrCodeList" parameterType="cn.pluss.platform.entity.QrCode" resultType="cn.pluss.platform.entity.QrCode">
+			SELECT * from tb_pluss_qr_code
+				<where>
+					delFlag = '1'
+					<if test="id!= null"> 
+					 	and id = #{id}
+					 </if>
+					<if test="qrNo!= null and qrNo != ''">
+						and qrNo = #{qrNo}
+					</if>
+					<if test="orderNo!= null and orderNo != ''">
+						and orderNo = #{orderNo}
+					</if>
+					<if test="buyMercName!= null and buyMercName != ''">
+						and buyMercName = #{buyMercName}
+					</if>
+					<if test="buyMercId!= null">
+						and buyMercId = #{buyMercId}
+					</if>
+					<if test="actMercName!= null and actMercName != ''">
+						and actMercName = #{actMercName}
+					</if>
+					<if test="actMercId!= null">
+						and actMercId = #{actMercId}
+					</if>
+					<if test="status!= null and status != ''">
+						and status = #{status}
+					</if>
+					<if test="createTime!= null">
+						and createTime = #{createTime}
+					</if>
+				</where>
+		</select>
+
+		<select id="getQrCodeByQrNo" parameterType="java.lang.String" resultType="cn.pluss.platform.entity.QrCode">
+			SELECT * from tb_pluss_qr_code where delFlag = '1' and qrNo = #{qrNo}
+		</select>
+
+		<update id="updateQrCode" parameterType="cn.pluss.platform.entity.QrCode" >
+			update tb_pluss_qr_code
+				  <set> 
+					<if test="qrNo!= null and qrNo != ''">
+						qrNo = #{qrNo},
+					 </if>
+					  <if test="orderNo!= null and orderNo !=''">
+						  orderNo = #{orderNo},
+					  </if>
+					  <if test="buyMercName!= null and buyMercName != ''">
+						  buyMercName = #{buyMercName},
+					 </if>
+					  <if test="buyMercId!= null">
+						  buyMercId = #{buyMercId},
+					  </if>
+					  <if test="actMercName!= null and actMercName != ''">
+						  actMercName = #{actMercName},
+					  </if>
+					  <if test="actMercId!= null">
+						  actMercId = #{actMercId},
+					  </if>
+
+					  <if test="status!= null and status != ''">
+						  status = #{status}
+					  </if>
+				</set>
+			where id=#{id} 
+		</update>
+
+		<delete id="deleteQrCode" parameterType="cn.pluss.platform.entity.QrCode" >
+			DELETE FROM tb_pluss_qr_code where id=#{id}
+		</delete>
+
+		<select id="queryQrCodePage" parameterType="java.util.Map" resultType="cn.pluss.platform.entity.QrCode">
+			SELECT * from tb_pluss_qr_code
+				<where>
+					delFlag = '1'
+					<if test="id!= null">
+						and id = #{id}
+					</if>
+					<if test="qrNo!= null and qrNo != ''">
+						and qrNo = #{qrNo}
+					</if>
+					<if test="orderNo!= null and orderNo != ''">
+						and orderNo = #{orderNo}
+					</if>
+					<if test="buyMercName!= null and buyMercName != ''">
+						and buyMercName = #{buyMercName}
+					</if>
+					<if test="buyMercId!= null">
+						and buyMercId = #{buyMercId}
+					</if>
+					<if test="actMercName!= null and actMercName != ''">
+						and actMercName = #{actMercName}
+					</if>
+					<if test="actMercId!= null">
+						and actMercId = #{actMercId}
+					</if>
+					<if test="status!= null and status != ''">
+						and status = #{status}
+					</if>
+					<if test="createTime!= null">
+						and createTime = #{createTime}
+					</if>
+				 </where>
+			order by id desc  limit #{pageSize}  offset  #{offset}  
+		</select>
+
+		<select id="queryQrCodePageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+			SELECT count(*) from tb_pluss_qr_code
+			<where>
+				delFlag = '1'
+				<if test="id!= null">
+					and id = #{id}
+				</if>
+				<if test="qrNo!= null and qrNo != ''">
+					and qrNo = #{qrNo}
+				</if>
+				<if test="orderNo!= null and orderNo != ''">
+					and orderNo = #{orderNo}
+				</if>
+				<if test="buyMercName!= null and buyMercName != ''">
+					and buyMercName = #{buyMercName}
+				</if>
+				<if test="buyMercId!= null">
+					and buyMercId = #{buyMercId}
+				</if>
+				<if test="actMercName!= null and actMercName != ''">
+					and actMercName = #{actMercName}
+				</if>
+				<if test="actMercId!= null">
+					and actMercId = #{actMercId}
+				</if>
+				<if test="status!= null and status != ''">
+					and status = #{status}
+				</if>
+				<if test="createTime!= null">
+					and createTime = #{createTime}
+				</if>
+			</where>
+		</select>
+
+	<delete id="deleteQrCodeByIds">
+		delete from tb_pluss_qr_code where id in
+		<foreach collection="array" index="index" item="item" open="(" separator="," close=")">
+			#{item}
+		</foreach>
+	</delete>
+
+	<select id="checkQrNo" parameterType="java.util.List" resultType="java.lang.Integer">
+		select count(1) from tb_pluss_qr_code where qrNo in
+		<foreach collection="list" index="index" item="item" open="(" close=")" separator=",">
+			#{item}
+		</foreach>
+	</select>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/QuestionsAnswers-sqlmap.xml b/pluss-dao-bundle/src/main/resources/mapper/QuestionsAnswers-sqlmap.xml
new file mode 100644
index 0000000..67282d0
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/QuestionsAnswers-sqlmap.xml
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+			"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="cn.pluss.platform.mapper.QuestionsAnswersMapper">
+
+	   	<insert id="saveQuestionsAnswers" parameterType="cn.pluss.platform.entity.QuestionsAnswers">
+        	insert into tb_pluss_questions_answers(question,answer,createDt,seq,status)VALUES(#{question},#{answer},NOW(),#{seq},#{status})
+    	</insert>
+
+	   	<insert id="saveQuestionsAnswersBatch">
+        	insert into tb_pluss_questions_answers(question,answer,createDt,seq,status) VALUES 
+    			<foreach collection="list" item="item" index="index" separator=",">
+			(#{question},#{answer},#{createDt},#{seq},#{status}		)
+				</foreach>
+    	</insert>
+
+		<select id="queryQuestionsAnswers" parameterType="cn.pluss.platform.entity.QuestionsAnswers" resultType="cn.pluss.platform.entity.QuestionsAnswers">
+			SELECT * from tb_pluss_questions_answers 
+				<where> 
+					<if test="id!= null"> 
+					 	and id = #{id}
+					 </if> 
+					<if test="question!= null"> 
+					 	and question = #{question}
+					 </if> 
+					<if test="answer!= null"> 
+					 	and answer = #{answer}
+					 </if> 
+					<if test="createDt!= null"> 
+					 	and createDt = #{createDt}
+					 </if> 
+					<if test="seq!= null"> 
+					 	and seq = #{seq}
+					 </if> 
+					<if test="status!= null"> 
+					 	and status = #{status}
+					 </if> 
+				 </where> 
+		</select>
+
+		<select id="queryQuestionsAnswersList" parameterType="cn.pluss.platform.entity.QuestionsAnswers" resultType="cn.pluss.platform.entity.QuestionsAnswers">
+			SELECT * from tb_pluss_questions_answers 
+				<where> 
+					<if test="id!= null"> 
+					 and 	id = #{id}
+					 </if> 
+					<if test="question!= null"> 
+					 and 	question = #{question}
+					 </if> 
+					<if test="answer!= null"> 
+					 and 	answer = #{answer}
+					 </if> 
+					<if test="createDt!= null"> 
+					 and 	createDt = #{createDt}
+					 </if> 
+					<if test="seq!= null"> 
+					 and 	seq = #{seq}
+					 </if> 
+					<if test="status!= null"> 
+					 and 	status = #{status}
+					 </if> 
+				 </where> 
+		</select>
+
+		<update id="updateQuestionsAnswers" parameterType="cn.pluss.platform.entity.QuestionsAnswers" >
+			update tb_pluss_questions_answers 
+				  <set> 
+					<if test="question!= null"> 
+					 	question = #{question},
+					 </if> 
+					<if test="answer!= null"> 
+					 	answer = #{answer},
+					 </if> 
+					<if test="createDt!= null"> 
+					 	createDt = #{createDt},
+					 </if> 
+					<if test="seq!= null"> 
+					 	seq = #{seq},
+					 </if> 
+					<if test="status!= null"> 
+					 	status = #{status}
+					 </if> 
+				</set>
+			where id=#{id} 
+		</update>
+
+		<delete id="deleteQuestionsAnswers" parameterType="cn.pluss.platform.entity.QuestionsAnswers" >
+			DELETE FROM tb_pluss_questions_answers where id=#{id}
+		</delete>
+
+		<select id="queryQuestionsAnswersPage" parameterType="java.util.Map" resultType="cn.pluss.platform.entity.QuestionsAnswers">
+			SELECT * from tb_pluss_questions_answers 
+				<where> 
+					<if test="id!= null"> 
+					and id = #{id}
+					 </if> 
+					<if test="question!= null"> 
+					and question like CONCAT("%",#{question},"%") 
+					 </if> 
+					<if test="answer!= null"> 
+					and answer = #{answer}
+					 </if> 
+					<if test="createDt!= null"> 
+					and createDt = #{createDt}
+					 </if> 
+					<if test="seq!= null"> 
+					and seq = #{seq}
+					 </if> 
+					<if test="status!= null"> 
+					and status = #{status}
+					 </if> 
+				 </where> 
+			order by seq asc  limit #{pageSize}  offset  #{offset}  
+		</select>
+		
+		<!--根据ID倒序  -->
+		<select id="queryQuestionsAnswersOrderByIDPage" parameterType="java.util.Map" resultType="cn.pluss.platform.entity.QuestionsAnswers">
+			SELECT * from tb_pluss_questions_answers 
+				<where> 
+					<if test="id!= null"> 
+					and id = #{id}
+					 </if> 
+					<if test="question!= null"> 
+					and question like CONCAT("%",#{question},"%") 
+					 </if> 
+					<if test="answer!= null"> 
+					and answer = #{answer}
+					 </if> 
+					<if test="createDt!= null"> 
+					and createDt = #{createDt}
+					 </if> 
+					<if test="seq!= null"> 
+					and seq = #{seq}
+					 </if> 
+					<if test="status!= null"> 
+					and status = #{status}
+					 </if> 
+				 </where> 
+			order by id desc  limit #{pageSize}  offset  #{offset}  
+		</select>
+
+		<select id="queryQuestionsAnswersPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+			SELECT count(*) from tb_pluss_questions_answers 
+					<where> 
+					<if test="id!= null"> 
+					 and id = #{id}
+					 </if> 
+					<if test="question!= null"> 
+					 and question like CONCAT("%",#{question},"%")
+					 </if> 
+					<if test="answer!= null"> 
+					 and answer = #{answer}
+					 </if> 
+					<if test="createDt!= null"> 
+					 and createDt = #{createDt}
+					 </if> 
+					<if test="seq!= null"> 
+					 and seq = #{seq}
+					 </if> 
+					<if test="status!= null"> 
+					 and status = #{status}
+					 </if> 
+				</where>
+		</select>
+
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/QueueDataMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/QueueDataMapper.xml
new file mode 100644
index 0000000..8825922
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/QueueDataMapper.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.QueueDataMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.QueueData">
+        <id column="id" property="id" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/RateOperationTempMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/RateOperationTempMapper.xml
new file mode 100644
index 0000000..fad33a4
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/RateOperationTempMapper.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.RateOperationTempMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.RateOperationTemp">
+        <id column="id" property="id" />
+        <result column="channel" property="channel" />
+        <result column="merchantId" property="merchantId" />
+        <result column="createTime" property="createTime" />
+        <result column="updateTime" property="updateTime" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/RealFans-sqlmap.xml b/pluss-dao-bundle/src/main/resources/mapper/RealFans-sqlmap.xml
new file mode 100644
index 0000000..ae926a6
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/RealFans-sqlmap.xml
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+			"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="cn.pluss.platform.mapper.RealFansMapper">
+
+	   	<insert id="saveRealFansBatch">
+        	insert into tb_pluss_real_fans(nickName,logo,phone,soleId,aliConsum,wechatConsum,enableMerchantCode,enableTime) VALUES 
+    			<foreach collection="list" item="item" index="index" separator=",">
+			(#{nickName},#{logo},#{phone},#{soleId},#{aliConsum},#{wechatConsum},#{enableMerchantCode},#{enableTime}		)
+				</foreach>
+    	</insert>
+
+		<select id="queryRealFansPage" parameterType="java.util.Map" resultType="cn.pluss.platform.entity.RealFans">
+			SELECT * from tb_pluss_real_fans 
+				<where> 
+					<if test="id!= null"> 
+					and id = #{id}
+					 </if> 
+					<if test="nickName!= null and nickName!=''"> 
+					and nickName like CONCAT("%",#{nickName},"%") 
+					 </if> 
+					<if test="logo!= null"> 
+					and logo = #{logo}
+					 </if> 
+					<if test="phone!= null and phone!=''"> 
+					and phone like CONCAT("%",#{phone},"%")
+					 </if> 
+					<if test="soleId!= null"> 
+					and soleId = #{soleId}
+					 </if> 
+					<if test="aliConsum!= null"> 
+					and aliConsum = #{aliConsum}
+					 </if> 
+					<if test="wechatConsum!= null"> 
+					and wechatConsum = #{wechatConsum}
+					 </if> 
+					<if test="enableMerchantCode!= null"> 
+					and enableMerchantCode = #{enableMerchantCode}
+					 </if> 
+					<if test="enableTime!= null"> 
+					and enableTime = #{enableTime}
+					 </if> 
+				 </where> 
+			order by id desc  limit #{pageSize}  offset  #{offset}  
+		</select>
+		
+		<select id="queryRealFansPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+			SELECT count(*) from tb_pluss_real_fans 
+					<where> 
+					<if test="id!= null"> 
+					 and id = #{id}
+					 </if> 
+					<if test="nickName!= null and nickName!=''"> 
+					 and nickName like CONCAT("%",#{nickName},"%") 
+					 </if> 
+					<if test="logo!= null"> 
+					 and logo = #{logo}
+					 </if> 
+					<if test="phone!= null and phone!=''"> 
+					 and phone like CONCAT("%",#{phone},"%")
+					 </if> 
+					<if test="soleId!= null"> 
+					 and soleId = #{soleId}
+					 </if> 
+					<if test="aliConsum!= null"> 
+					 and aliConsum = #{aliConsum}
+					 </if> 
+					<if test="wechatConsum!= null"> 
+					 and wechatConsum = #{wechatConsum}
+					 </if> 
+					<if test="enableMerchantCode!= null"> 
+					 and enableMerchantCode = #{enableMerchantCode}
+					 </if> 
+					<if test="enableTime!= null"> 
+					 and enableTime = #{enableTime}
+					 </if> 
+					 
+				</where>
+		</select>
+		
+		<select id="queryRealFansListManagePage" parameterType="java.util.Map" resultType="cn.pluss.platform.vo.RealFansVO">
+               select rf.id,mbi.alias,rf.nickName,rf.logo,rf.phone,rf.soleId,rf.aliConsum,rf.wechatConsum,mbi.merchantName as merchantName,rf.enableTime from tb_pluss_real_fans rf LEFT JOIN tb_pluss_merchant_base_info mbi ON rf.enableMerchantCode=mbi.merchantCode
+               <where>
+                    <if test="phone!=null and phone!=''">
+                        rf.phone like CONCAT("%",#{phone},"%")
+                    </if>
+                    <if test="alias!=null and alias!=''">
+                        mbi.alias like CONCAT("%",#{alias},"%")
+                    </if>
+                    <if test="nickName!= null and nickName!=''"> 
+                     and rf.nickName like CONCAT("%",#{nickName},"%") 
+                     </if> 
+                     <if test="merchantCode!=null and merchantCode!=''">
+                        rf.enableMerchantCode=#{merchantCode}
+                    </if>
+                    <if test="startTime!= null and startTime!=''"> 
+                         <![CDATA[
+                            and  DATE_FORMAT(enableTime, '%Y-%m-%d %H:%i:%S')>=DATE_FORMAT(#{startTime}, '%Y-%m-%d %H:%i:%S')
+                         ]]>
+                     </if> 
+                    <if test="endTime!= null and endTime!=''"> 
+                         <![CDATA[
+                            and  DATE_FORMAT(enableTime, '%Y-%m-%d %H:%i:%S')<=DATE_FORMAT(#{endTime}, '%Y-%m-%d %H:%i:%S')
+                         ]]>
+                     </if> 
+                     <if test="merchantName!= null and merchantName!=''"> 
+                     and mbi.merchantName like CONCAT("%",#{merchantName},"%") 
+                     </if> 
+               </where>
+        </select>
+        
+        <select id="queryRealFansListManagePageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+               select count(*) from tb_pluss_real_fans rf LEFT JOIN tb_pluss_merchant_base_info mbi ON rf.enableMerchantCode=mbi.merchantCode
+               <where>
+                    <if test="phone!=null and phone!=''">
+                        rf.phone like CONCAT("%",#{phone},"%")
+                    </if>
+                     <if test="alias!=null and alias!=''">
+                        mbi.alias like CONCAT("%",#{alias},"%")
+                    </if>
+                     <if test="nickName!= null and nickName!=''"> 
+                     and rf.nickName like CONCAT("%",#{nickName},"%") 
+                     </if> 
+                     <if test="merchantCode!=null and merchantCode!=''">
+                        rf.enableMerchantCode=#{merchantCode}
+                    </if>
+                    <if test="startTime!= null and startTime!=''"> 
+                         <![CDATA[
+                            and  DATE_FORMAT(enableTime, '%Y-%m-%d %H:%i:%S')>=DATE_FORMAT(#{startTime}, '%Y-%m-%d %H:%i:%S')
+                         ]]>
+                     </if> 
+                    <if test="endTime!= null and endTime!=''"> 
+                         <![CDATA[
+                            and  DATE_FORMAT(enableTime, '%Y-%m-%d %H:%i:%S')<=DATE_FORMAT(#{endTime}, '%Y-%m-%d %H:%i:%S')
+                         ]]>
+                     </if> 
+                     <if test="merchantName!= null and merchantName!=''"> 
+                     and mbi.merchantName like CONCAT("%",#{merchantName},"%") 
+                     </if> 
+               </where>
+        </select>
+
+	<select id="pageData" resultType="cn.pluss.platform.entity.RealFans">
+        select *,
+		mbi.alias
+        from tb_pluss_real_fans rf
+        left join  tb_pluss_merchant_base_info mbi
+        on rf.enableMerchantCode = mbi.merchantCode
+        <where>
+			<if test="realFans.alias != null and realFans.alias != ''">
+				and mbi.alias like CONCAT('%',#{realFans.alias},'%')
+			</if>
+			<if test="realFans.nickName != null and realFans.nickName != ''">
+				and rf.nickName = #{realFans.nickName}
+			</if>
+			<if test="realFans.soleId != null and realFans.soleId != ''">
+				and rf.soleId = #{realFans.soleId}
+			</if>
+
+			<if test="realFans.startTime != null">
+				and DATE_FORMAT(rf.enableTime,'%Y-%m-%d')  <![CDATA[ >= ]]> DATE_FORMAT(#{realFans.startTime},'%Y-%m-%d')
+			</if>
+
+			<if test="realFans.endTime != null">
+				and DATE_FORMAT(rf.enableTime,'%Y-%m-%d')  <![CDATA[ <= ]]> DATE_FORMAT(#{realFans.endTime},'%Y-%m-%d')
+			</if>
+		</where>
+        order by enableTime desc
+    </select>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/RegionCodeLsMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/RegionCodeLsMapper.xml
new file mode 100644
index 0000000..f3743b1
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/RegionCodeLsMapper.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.RegionCodeLsMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.RegionCodeLs">
+        <id column="id" property="id"/>
+        <result column="province" property="province"/>
+        <result column="provinceCode" property="provinceCode"/>
+        <result column="city" property="city"/>
+        <result column="cityCode" property="cityCode"/>
+        <result column="area" property="area"/>
+        <result column="areaCode" property="areaCode"/>
+    </resultMap>
+
+    <select id="selectRegionCode" resultType="cn.pluss.platform.entity.RegionCodeLs">
+        SELECT ls.id, ls.province, ls.provinceCode, ls.city, ls.cityCode, ls.area, ls.areaCode
+        FROM tb_pluss_region_code_ls ls
+        WHERE ls.province LIKE CONCAT(#{province}, "%")
+          AND ls.city = #{city}
+          AND ls.area = #{area}
+    </select>
+
+
+    <select id="selectProvince" resultType="java.lang.String">
+        SELECT province FROM tb_pluss_region_code_ls
+    </select>
+
+
+    <select id="selectCity" resultType="java.lang.String">
+        SELECT city FROM tb_pluss_region_code_ls
+        WHERE province LIKE CONCAT(#{provice}, '%')
+    </select>
+
+
+    <select id="selectArea" resultType="java.lang.String">
+        SELECT area FROM tb_pluss_region_code_ls
+        WHERE province LIKE CONCAT(#{provice}, '%')
+        AND city LIKE CONCAT(#{city}, '%')
+    </select>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/RegionCodeRyxMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/RegionCodeRyxMapper.xml
new file mode 100644
index 0000000..ae27523
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/RegionCodeRyxMapper.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.RegionCodeRyxMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.RegionCodeRyx">
+        <id column="id" property="id" />
+        <result column="province" property="province" />
+        <result column="provinceCode" property="provinceCode" />
+        <result column="city" property="city" />
+        <result column="cityCode" property="cityCode" />
+        <result column="area" property="area" />
+        <result column="areaCode" property="areaCode" />
+        <result column="createTime" property="createTime" />
+    </resultMap>
+
+    <select id="selectRegionCode" resultType="cn.pluss.platform.entity.RegionCodeRyx">
+        SELECT sxf.id, sxf.province, sxf.provinceCode, sxf.city, sxf.cityCode, sxf.area, sxf.areaCode
+        FROM tb_pluss_region_code_ryx sxf
+                 LEFT JOIN tb_pluss_region_reflect rr ON sxf.id = rr.regionDes
+                 LEFT JOIN tb_pluss_region_code_ls ls ON ls.id = rr.regionSrc
+        WHERE rr.channel = 3
+          AND ls.province LIKE CONCAT(#{province}, "%")
+          AND ls.city = #{city}
+          AND ls.area = #{area}
+    </select>
+
+    <select id="selectProvince" resultType="java.lang.String">
+        SELECT DISTINCT province FROM tb_pluss_region_code_ryx
+    </select>
+
+
+    <select id="selectCity" resultType="java.lang.String">
+        SELECT DISTINCT city FROM tb_pluss_region_code_ryx
+        WHERE province LIKE CONCAT(#{province}, '%')
+    </select>
+
+
+    <select id="selectArea" resultType="java.lang.String">
+        SELECT area FROM tb_pluss_region_code_ryx
+        WHERE province LIKE CONCAT(#{province}, '%')
+          AND city LIKE CONCAT(#{city}, '%')
+    </select>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/RegionCodeSxfMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/RegionCodeSxfMapper.xml
new file mode 100644
index 0000000..72974d6
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/RegionCodeSxfMapper.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.RegionCodeSxfMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.RegionCodeSxf">
+        <id column="id" property="id"/>
+        <result column="province" property="province"/>
+        <result column="provinceCode" property="provinceCode"/>
+        <result column="city" property="city"/>
+        <result column="cityCode" property="cityCode"/>
+        <result column="area" property="area"/>
+        <result column="areaCode" property="areaCode"/>
+    </resultMap>
+
+    <select id="selectRegionCode" resultType="cn.pluss.platform.entity.RegionCodeSxf">
+        SELECT sxf.id, sxf.province, sxf.provinceCode, sxf.city, sxf.cityCode, sxf.area, sxf.areaCode
+        FROM tb_pluss_region_code_sxf sxf
+                 LEFT JOIN tb_pluss_region_reflect rr ON sxf.id = rr.regionDes
+                 LEFT JOIN tb_pluss_region_code_ls ls ON ls.id = rr.regionSrc
+        WHERE rr.channel = 1
+          AND ls.province LIKE CONCAT(#{province}, "%")
+          AND ls.city = #{city}
+          AND ls.area = #{area}
+    </select>
+
+
+    <select id="selectProvince" resultType="java.lang.String">
+        SELECT DISTINCT province FROM tb_pluss_region_code_sxf
+    </select>
+
+
+    <select id="selectCity" resultType="java.lang.String">
+        SELECT DISTINCT city FROM tb_pluss_region_code_sxf
+        WHERE province LIKE CONCAT(#{provice}, '%')
+    </select>
+
+
+    <select id="selectArea" resultType="java.lang.String">
+        SELECT area FROM tb_pluss_region_code_sxf
+        WHERE province LIKE CONCAT(#{province}, '%')
+          AND city LIKE CONCAT(#{city}, '%')
+    </select>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/RegionCodeYsMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/RegionCodeYsMapper.xml
new file mode 100644
index 0000000..9f749ab
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/RegionCodeYsMapper.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.RegionCodeYsMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.RegionCodeYs">
+        <id column="id" property="id" />
+        <result column="province" property="province" />
+        <result column="provinceCode" property="provinceCode" />
+        <result column="city" property="city" />
+        <result column="cityCode" property="cityCode" />
+        <result column="area" property="area" />
+        <result column="areaCode" property="areaCode" />
+    </resultMap>
+
+    <select id="selectRegionCode" resultType="cn.pluss.platform.entity.RegionCodeYs">
+        SELECT sxf.id, sxf.province, sxf.provinceCode, sxf.city, sxf.cityCode, sxf.area, sxf.areaCode
+        FROM tb_pluss_region_code_ys sxf
+                 LEFT JOIN tb_pluss_region_reflect rr ON sxf.id = rr.regionDes
+                 LEFT JOIN tb_pluss_region_code_ls ls ON ls.id = rr.regionSrc
+        WHERE rr.channel = 4
+          AND ls.province LIKE CONCAT(#{province}, "%")
+          AND ls.city = #{city}
+          AND ls.area = #{area}
+    </select>
+
+
+    <select id="selectProvince" resultType="java.lang.String">
+        SELECT DISTINCT province FROM tb_pluss_region_code_ys
+    </select>
+
+
+    <select id="selectCity" resultType="java.lang.String">
+        SELECT DISTINCT city FROM tb_pluss_region_code_ys
+        WHERE province LIKE CONCAT(#{provice}, '%')
+    </select>
+
+
+    <select id="selectArea" resultType="java.lang.String">
+        SELECT area FROM tb_pluss_region_code_ys
+        WHERE province LIKE CONCAT(#{province}, '%')
+          AND city LIKE CONCAT(#{city}, '%')
+    </select>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/RegionReflectMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/RegionReflectMapper.xml
new file mode 100644
index 0000000..3fd4cc0
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/RegionReflectMapper.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.RegionReflectMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.RegionReflect">
+        <id column="id" property="id" />
+        <result column="channel" property="channel" />
+        <result column="regionSrc" property="regionSrc" />
+        <result column="regionDes" property="regionDes" />
+    </resultMap>
+
+    <resultMap id="baseResultVOMap" type="cn.pluss.platform.vo.RegionReflectVO">
+        <id column="id" property="id" />
+        <result column="channel" property="channel" />
+        <result column="regionSrc" property="regionSrc" />
+        <result column="regionDes" property="regionDes" />
+        <association property="src">
+            <result property="area" column="srcArea" />
+            <result property="areaCode" column="srcAreaCode" />
+            <result property="city" column="srcCity" />
+            <result property="cityCode" column="srcCityCode" />
+            <result property="province" column="srcProvince" />
+            <result property="provinceCode" column="srcProvinceCode" />
+        </association>
+        <association property="sxf">
+            <result property="area" column="sxfArea" />
+            <result property="areaCode" column="sxfAreaCode" />
+            <result property="city" column="sxfCity" />
+            <result property="cityCode" column="sxfCityCode" />
+            <result property="province" column="sxfProvince" />
+            <result property="provinceCode" column="sxfProvinceCode" />
+        </association>
+        <association property="ryx">
+            <result property="area" column="ryxArea" />
+            <result property="areaCode" column="ryxAreaCode" />
+            <result property="city" column="ryxCity" />
+            <result property="cityCode" column="ryxCityCode" />
+            <result property="province" column="ryxProvince" />
+            <result property="provinceCode" column="ryxProvinceCode" />
+        </association>
+        <association property="ys">
+            <result property="area" column="ysArea" />
+            <result property="areaCode" column="ysAreaCode" />
+            <result property="city" column="ysCity" />
+            <result property="cityCode" column="ysCityCode" />
+            <result property="province" column="ysProvince" />
+            <result property="provinceCode" column="ysProvinceCode" />
+        </association>
+    </resultMap>
+
+    <select id="selectRegionReflectList" resultMap="baseResultVOMap">
+        SELECT
+            ls.id regionSrc,
+            ls.province srcProvince, ls.city srcCity, ls.area srcArea,
+            sxf.province sxfProvince, sxf.city sxfCity, sxf.area sxfArea,
+            ryx.province ryxProvince, ryx.city ryxCity, ryx.area ryxArea,
+            ys.province ysProvince, ys.city ysCity, ys.area ysArea
+        FROM tb_pluss_region_code_ls ls
+          LEFT JOIN tb_pluss_region_reflect rr1 ON ls.id = rr1.regionSrc AND rr1.channel = 1
+          LEFT JOIN tb_pluss_region_code_sxf sxf ON rr1.regionDes = sxf.id
+          LEFT JOIN tb_pluss_region_reflect rr2 ON ls.id = rr2.regionSrc AND rr2.channel = 3
+          LEFT JOIN tb_pluss_region_code_ryx ryx ON rr2.regionDes = ryx.id
+          LEFT JOIN tb_pluss_region_reflect rr3 ON ls.id = rr3.regionSrc AND rr3.channel = 4
+          LEFT JOIN tb_pluss_region_code_ys ys ON rr3.regionDes = ys.id
+        <where>
+            ls.area IS NOT NULL
+            <if test="province != null and province != ''">
+                AND ls.province LIKE CONCAT(#{province}, "%")
+            </if>
+            <if test="city != null and city != ''">
+                AND ls.city LIKE CONCAT(#{city}, "%")
+            </if>
+            <if test="area != null and area != ''">
+                AND ls.area LIKE CONCAT(#{area}, "%")
+            </if>
+        </where>
+    </select>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/ReqRecordsMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/ReqRecordsMapper.xml
new file mode 100644
index 0000000..fdfe745
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/ReqRecordsMapper.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.ReqRecordsMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entitiy.ReqRecords">
+        <id column="id" property="id"/>
+        <result column="userId" property="userId"/>
+        <result column="uri" property="uri"/>
+        <result column="phone" property="phone"/>
+        <result column="ip" property="ip"/>
+        <result column="createTime" property="createTime"/>
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/RewardConfigMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/RewardConfigMapper.xml
new file mode 100644
index 0000000..0ea6e74
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/RewardConfigMapper.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.RewardConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.RewardConfig">
+        <id column="id" property="id" />
+        <result column="name" property="name" />
+        <result column="roleCode" property="roleCode" />
+        <result column="type" property="type" />
+        <result column="scale" property="scale" />
+        <result column="createTime" property="createTime" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/RiskBlacklistMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/RiskBlacklistMapper.xml
new file mode 100644
index 0000000..31924ac
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/RiskBlacklistMapper.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.RiskBlacklistMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.RiskBlacklist">
+        <id column="id" property="id" />
+        <result column="idcardNo" property="idcardNo" />
+        <result column="certName" property="certName" />
+        <result column="userId" property="userId" />
+        <result column="remark" property="remark" />
+        <result column="channel" property="channel" />
+        <result column="payWay" property="payWay" />
+        <result column="createTime" property="createTime" />
+        <result column="updateTime" property="updateTime" />
+    </resultMap>
+
+
+    <select id="selectPageVO" resultType="cn.pluss.platform.vo.RiskBlacklistVO">
+        SELECT rb.*, ua.userName, mbi.alias, ui.phone regPhone, bc.phone accountPhone, bc.bankHolder accountName,
+               pua.userId parentId, pua.userName parentName, gpua.userId grandParentId, gpua.userName grandParentName
+        FROM tb_pluss_risk_blacklist rb
+             LEFT JOIN tb_pluss_user_info ui ON ui.id = rb.userId
+             LEFT JOIN tb_pluss_merchant_base_info mbi ON mbi.userId = rb.userId
+             LEFT JOIN tb_pluss_account ac ON ac.userId = rb.userId
+             LEFT JOIN tb_pluss_bank_card bc ON ac.userId = bc.userId AND bc.id = ac.bankCardId
+             LEFT JOIN tb_pluss_user_app ua ON ua.userId = rb.userId
+             LEFT JOIN tb_pluss_user_app pua ON pua.userId = ua.parentId
+             LEFT JOIN tb_pluss_user_app gpua ON gpua.userId = LEFT(pua.parentId, LOCATE(',', pua.parentId) - 1)
+        <where>
+            <if test="condition.userId != null and condition.userId != ''">
+                AND rb.userId = #{condition.userId}
+            </if>
+            <if test="condition.certName != null and condition.certName != ''">
+                AND rb.certName LIKE CONCAT(#{condition.certName}, '%')
+            </if>
+            <if test="condition.idcardNo != null and condition.idcardNo != ''">
+                AND rb.idcardNo LIKE CONCAT(#{condition.idcardNo}, '%')
+            </if>
+            <if test="condition.alias != null and condition.alias != ''">
+                AND mbi.alias LIKE CONCAT(#{condition.alias}, '%')
+            </if>
+            <if test="condition.channel != null and condition.channel != ''">
+                AND rb.channel = #{condition.channel}
+            </if>
+            <if test="condition.payWay != null and condition.payWay != ''">
+                AND rb.payWay = #{condition.channel}
+            </if>
+
+            <if test="condition.userName != null and condition.userName != ''">
+                AND ua.userName LIKE CONCAT(#{condition.userName}, '%')
+            </if>
+            <if test="condition.regPhone != null and condition.regPhone != ''">
+                AND ui.phone LIKE CONCAT(#{condition.regPhone}, '%')
+            </if>
+
+            <if test="condition.accountPhone != null and condition.accountPhone != ''">
+                AND bc.phone LIKE CONCAT(#{condition.accountPhone}, '%')
+            </if>
+
+            <if test="condition.accountName != null and condition.accountName != ''">
+                AND bc.bankHolder LIKE CONCAT(#{condition.accountName}, '%')
+            </if>
+
+            <if test="condition.parentId != null and condition.parentId != ''">
+                AND pua.userId = #{condition.parentId}
+            </if>
+
+            <if test="condition.parentName != null and condition.parentName != ''">
+                AND pua.userName LIKE CONCAT(#{condition.parentName}, '%')
+            </if>
+
+            <if test="condition.grandParentId != null and condition.grandParentId != ''">
+                AND gpua.userId = #{condition.grandParentId}
+            </if>
+
+            <if test="condition.grandParentName != null and condition.grandParentName != ''">
+                AND gpua.userName LIKE CONCAT(#{condition.grandParentName}, '%')
+            </if>
+        </where>
+    </select>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/RoleInfo-sqlmap.xml b/pluss-dao-bundle/src/main/resources/mapper/RoleInfo-sqlmap.xml
new file mode 100644
index 0000000..3846df0
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/RoleInfo-sqlmap.xml
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+			"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="cn.pluss.platform.mapper.RoleInfoMapper">
+
+	   	<insert id="saveRoleInfo" parameterType="cn.pluss.platform.entity.RoleInfo">
+        	insert into tb_pluss_role_info(name,creator,createTime,updator,updateTime,version)VALUES(#{name},#{creator},#{createTime},#{updator},#{updateTime},#{version})
+    	</insert>
+
+	   	<insert id="saveRoleInfoBatch">
+        	insert into tb_pluss_role_info(name,creator,createTime,updator,updateTime,version) VALUES 
+    			<foreach collection="list" item="item" index="index" separator=",">
+			(#{name},#{creator},#{createTime},#{updator},#{updateTime},#{version}		)
+				</foreach>
+    	</insert>
+
+		<select id="queryRoleInfo" parameterType="cn.pluss.platform.entity.RoleInfo" resultType="cn.pluss.platform.entity.RoleInfo">
+			SELECT * from tb_pluss_role_info 
+				<where> 
+					<if test="id!= null"> 
+					 and	id = #{id}
+					 </if> 
+					<if test="name!= null"> 
+					 and	name = #{name}
+					 </if> 
+					<if test="creator!= null"> 
+					 and	creator = #{creator}
+					 </if> 
+					<if test="createTime!= null"> 
+					 and	createTime = #{createTime}
+					 </if> 
+					<if test="updator!= null"> 
+					 and	updator = #{updator}
+					 </if> 
+					<if test="updateTime!= null"> 
+					 and	updateTime = #{updateTime}
+					 </if> 
+					<if test="version!= null"> 
+					 and	version = #{version}
+					 </if> 
+				 </where> 
+		</select>
+
+		<select id="queryRoleInfoList" parameterType="cn.pluss.platform.entity.RoleInfo" resultType="cn.pluss.platform.entity.RoleInfo">
+			SELECT * from tb_pluss_role_info 
+				<where> 
+					<if test="id!= null"> 
+					 and	id = #{id}
+					 </if> 
+					<if test="name!= null"> 
+					 and	name = #{name}
+					 </if> 
+					<if test="creator!= null"> 
+					 and	creator = #{creator}
+					 </if> 
+					<if test="createTime!= null"> 
+					 and	createTime = #{createTime}
+					 </if> 
+					<if test="updator!= null"> 
+					 and	updator = #{updator}
+					 </if> 
+					<if test="updateTime!= null"> 
+					 and	updateTime = #{updateTime}
+					 </if> 
+					<if test="version!= null"> 
+					 and	version = #{version}
+					 </if> 
+				 </where> 
+				 order by id desc
+		</select>
+
+		<update id="updateRoleInfo" parameterType="cn.pluss.platform.entity.RoleInfo" >
+			update tb_pluss_role_info 
+				  <set> 
+					<if test="name!= null"> 
+					name = #{name},
+					 </if> 
+					<if test="creator!= null"> 
+					 creator = #{creator},
+					 </if> 
+					<if test="createTime!= null"> 
+					 createTime = #{createTime},
+					 </if> 
+					<if test="updator!= null"> 
+					 updator = #{updator},
+					 </if> 
+					<if test="updateTime!= null"> 
+					 updateTime = #{updateTime},
+					 </if> 
+					<if test="version!= null"> 
+					 version = #{version}
+					 </if> 
+				</set>
+			where id=#{id} 
+		</update>
+
+		<delete id="deleteRoleInfo" parameterType="cn.pluss.platform.entity.RoleInfo" >
+			DELETE FROM tb_pluss_role_info where id=#{id}
+		</delete>
+
+		<select id="queryRoleInfoPage" parameterType="java.util.Map" resultType="cn.pluss.platform.entity.RoleInfo">
+			SELECT * from tb_pluss_role_info 
+				<where> 
+					<if test="id!= null"> 
+					 and	id = #{id}
+					 </if> 
+					<if test="name!= null"> 
+					and name Like CONCAT("%",#{name},"%")
+					 </if> 
+					<if test="creator!= null"> 
+					 and	creator = #{creator}
+					 </if> 
+					<if test="createTime!= null"> 
+					 and	createTime = #{createTime}
+					 </if> 
+					<if test="updator!= null"> 
+					 and	updator = #{updator}
+					 </if> 
+					<if test="updateTime!= null"> 
+					 and	updateTime = #{updateTime}
+					 </if> 
+					<if test="version!= null"> 
+					 and	version = #{version}
+					 </if> 
+				 </where> 
+			order by id desc  limit #{pageSize}  offset  #{offset}  
+		</select>
+
+		<select id="queryRoleInfoPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+			SELECT count(*) from tb_pluss_role_info 
+					<where> 
+					<if test="id!= null"> 
+					 and	id = #{id}
+					 </if> 
+					<if test="name!= null"> 
+					and 	name = #{name}
+					 </if> 
+					<if test="creator!= null"> 
+					 and	creator = #{creator}
+					 </if> 
+					<if test="createTime!= null"> 
+					 and	createTime = #{createTime}
+					 </if> 
+					<if test="updator!= null"> 
+					 and	updator = #{updator}
+					 </if> 
+					<if test="updateTime!= null"> 
+					 and	updateTime = #{updateTime}
+					 </if> 
+					<if test="version!= null"> 
+					 and	version = #{version}
+					 </if> 
+				</where>
+		</select>
+		
+		
+		
+		<select id="getRoleNames" parameterType="java.lang.String" resultType="cn.pluss.platform.entity.RoleInfo">
+				select * from tb_pluss_role_info  where id in (select roleId from tb_pluss_role_user_info where userId in (select id from tb_pluss_user_info  
+				<where> 
+						<if test="loginName!= null"> 
+						and loginName=#{loginName}
+						 </if> 
+				</where>
+				))  
+		</select>
+		
+		
+
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/RoleMenuInfo-sqlmap.xml b/pluss-dao-bundle/src/main/resources/mapper/RoleMenuInfo-sqlmap.xml
new file mode 100644
index 0000000..f50bddf
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/RoleMenuInfo-sqlmap.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+			"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="cn.pluss.platform.mapper.RoleMenuInfoMapper">
+
+	   	<insert id="saveRoleMenuInfo" parameterType="cn.pluss.platform.entity.RoleMenuInfo">
+        	insert into tb_pluss_role_menu_info(roleId,menuId)VALUES(#{roleId},#{menuId})
+    	</insert>
+
+	   	<insert id="saveRoleMenuInfoBatch">
+        	insert into tb_pluss_role_menu_info(roleId,menuId) VALUES 
+    			<foreach collection="list" item="item" index="index" separator=",">
+			(#{roleId},#{menuId}		)
+				</foreach>
+    	</insert>
+
+		<select id="queryRoleMenuInfo" parameterType="cn.pluss.platform.entity.RoleMenuInfo" resultType="cn.pluss.platform.entity.RoleMenuInfo">
+			SELECT * from tb_pluss_role_menu_info 
+				<where> 
+					<if test="id!= null"> 
+					 and	id = #{id}
+					 </if> 
+					<if test="roleId!= null"> 
+					 and	roleId = #{roleId}
+					 </if> 
+					<if test="menuId!= null"> 
+					 and	menuId = #{menuId}
+					 </if> 
+				 </where> 
+		</select>
+
+		<select id="queryRoleMenuInfoList" parameterType="cn.pluss.platform.entity.RoleMenuInfo" resultType="cn.pluss.platform.entity.RoleMenuInfo">
+			SELECT * from tb_pluss_role_menu_info 
+				<where> 
+					<if test="id!= null"> 
+					 and	id = #{id}
+					 </if> 
+					<if test="roleId!= null"> 
+					 and	roleId = #{roleId}
+					 </if> 
+					<if test="menuId!= null"> 
+					 and	menuId = #{menuId}
+					 </if> 
+				 </where> 
+		</select>
+
+		<update id="updateRoleMenuInfo" parameterType="cn.pluss.platform.entity.RoleMenuInfo" >
+			update tb_pluss_role_menu_info 
+				  <set> 
+					<if test="roleId!= null"> 
+					 roleId = #{roleId},
+					 </if> 
+					<if test="menuId!= null"> 
+					 menuId = #{menuId}
+					 </if> 
+				</set>
+			where id=#{id} 
+		</update>
+
+		<delete id="deleteRoleMenuInfo" parameterType="cn.pluss.platform.entity.RoleMenuInfo" >
+			DELETE FROM tb_pluss_role_menu_info where roleId=#{roleId}
+		</delete>
+
+		<select id="queryRoleMenuInfoPage" parameterType="java.util.Map" resultType="cn.pluss.platform.entity.RoleMenuInfo">
+			SELECT * from tb_pluss_role_menu_info 
+				<where> 
+					<if test="id!= null"> 
+					 and	id = #{id}
+					 </if> 
+					<if test="roleId!= null"> 
+					 and	roleId = #{roleId}
+					 </if> 
+					<if test="menuId!= null"> 
+					 and	menuId = #{menuId}
+					 </if> 
+				 </where> 
+			order by id desc  limit #{pageSize}  offset  #{offset}  
+		</select>
+
+		<select id="queryRoleMenuInfoPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+			SELECT count(*) from tb_pluss_role_menu_info 
+					<where> 
+					<if test="id!= null"> 
+					 and	id = #{id}
+					 </if> 
+					<if test="roleId!= null"> 
+					 and	roleId = #{roleId}
+					 </if> 
+					<if test="menuId!= null"> 
+					 and	menuId = #{menuId}
+					 </if> 
+				</where>
+		</select>
+
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/RoleUserInfo-sqlmap.xml b/pluss-dao-bundle/src/main/resources/mapper/RoleUserInfo-sqlmap.xml
new file mode 100644
index 0000000..5048aed
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/RoleUserInfo-sqlmap.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+			"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="cn.pluss.platform.mapper.RoleUserInfoMapper">
+
+	   	<insert id="saveRoleUserInfo" parameterType="cn.pluss.platform.entity.RoleUserInfo">
+        	insert into tb_pluss_role_user_info(roleId,userId,version)VALUES(#{roleId},#{userId},#{version})
+    	</insert>
+
+	   	<insert id="saveRoleUserInfoBatch">
+        	insert into tb_pluss_role_user_info(roleId,userId,version) VALUES 
+    			<foreach collection="list" item="item" index="index" separator=",">
+			(#{roleId},#{userId},#{version})
+				</foreach>
+    	</insert>
+
+		<select id="queryRoleUserInfo" parameterType="cn.pluss.platform.entity.RoleUserInfo" resultType="cn.pluss.platform.entity.RoleUserInfo">
+			SELECT * from tb_pluss_role_user_info 
+				<where> 
+					<if test="id!= null"> 
+					 and	id = #{id}
+					 </if> 
+					<if test="roleId!= null"> 
+					 and	roleId = #{roleId}
+					 </if> 
+					<if test="userId!= null"> 
+					 and	userId = #{userId}
+					 </if> 
+					<if test="version!= null"> 
+					 and	version = #{version}
+					 </if> 
+				 </where> 
+		</select>
+
+		<select id="queryRoleUserInfoList" parameterType="cn.pluss.platform.entity.RoleUserInfo" resultType="cn.pluss.platform.entity.RoleUserInfo">
+			SELECT * from tb_pluss_role_user_info 
+				<where> 
+					<if test="id!= null"> 
+					 and	id = #{id}
+					 </if> 
+					<if test="roleId!= null"> 
+					 and	roleId = #{roleId}
+					 </if> 
+					<if test="userId!= null"> 
+					 and	userId = #{userId}
+					 </if> 
+					<if test="version!= null"> 
+					 and	version = #{version}
+					 </if> 
+				 </where> 
+		</select>
+
+		<update id="updateRoleUserInfo" parameterType="cn.pluss.platform.entity.RoleUserInfo" >
+			update tb_pluss_role_user_info 
+				  <set> 
+					<if test="roleId!= null"> 
+					 	roleId = #{roleId},
+					 </if> 
+					<if test="userId!= null"> 
+					 	userId = #{userId},
+					 </if> 
+					<if test="version!= null"> 
+					 	version = #{version}
+					 </if> 
+				</set>
+			where id=#{id} 
+		</update>
+
+		<delete id="deleteRoleUserInfo" parameterType="cn.pluss.platform.entity.RoleUserInfo" >
+			DELETE FROM tb_pluss_role_user_info where id=#{id}
+		</delete>
+
+		<select id="queryRoleUserInfoPage" parameterType="java.util.Map" resultType="cn.pluss.platform.entity.RoleUserInfo">
+			SELECT * from tb_pluss_role_user_info 
+				<where> 
+					<if test="id!= null"> 
+					 and	id = #{id}
+					 </if> 
+					<if test="roleId!= null"> 
+					 and	roleId = #{roleId}
+					 </if> 
+					<if test="userId!= null"> 
+					 and	userId = #{userId}
+					 </if> 
+					<if test="version!= null"> 
+					 and	version = #{version}
+					 </if> 
+				 </where> 
+			order by id desc  limit #{pageSize}  offset  #{offset}  
+		</select>
+
+		<select id="queryRoleUserInfoPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+			SELECT count(*) from tb_pluss_role_user_info 
+					<where> 
+					<if test="id!= null"> 
+					 and	id = #{id}
+					 </if> 
+					<if test="roleId!= null"> 
+					 and	roleId = #{roleId}
+					 </if> 
+					<if test="userId!= null"> 
+					 and	userId = #{userId}
+					 </if> 
+					<if test="version!= null"> 
+					 and	version = #{version}
+					 </if> 
+				</where>
+		</select>
+
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/RyxTransMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/RyxTransMapper.xml
new file mode 100644
index 0000000..4d7a4ed
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/RyxTransMapper.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.RyxTransMapper">
+
+
+    <!-- 字段转换这个地方也不知道是为何, 默认接收的类型是byte -->
+    <select id="selectRyxTrans" resultType="java.util.Map">
+        SELECT
+          mcs.merchantCode, mcs.merchantId,
+          cast(mcs.extra ->> "$.merInId" as char) merInId,
+          IFNULL(mm.lastSettleDate, mo.earliestDate) lastSettleDate
+        FROM tb_pluss_merchant_channel_status mcs
+        LEFT JOIN (
+            SELECT merchantId, DATE_FORMAT(MAX( settDate ), '%Y%m%d' ) lastSettleDate
+            FROM tb_pluss_make_money
+            GROUP BY merchantId
+        ) mm ON mcs.merchantId = mm.merchantId
+        LEFT JOIN (
+            SELECT
+                   mo.merchantCode,
+                   DATE_FORMAT(MIN(mo.createDt), '%Y%m%d') earliestDate,
+                   DATE_FORMAT( MAX( mo.createDt ), '%Y%m%d' ) lastDate
+            FROM tb_pluss_merchant_order mo
+            LEFT JOIN tb_pluss_merchant_channel_status mcs ON mo.merchantCode = mcs.merchantCode
+            WHERE mo.`status` = '1' AND mcs.channel = '3' AND mo.`aisleSwitch` = '3'
+            GROUP BY mo.merchantCode
+        ) mo ON mo.merchantCode = mcs.merchantCode
+        WHERE mcs.channel = '3' AND mcs.`status` = '3'
+        AND IFNULL( mm.lastSettleDate, mo.earliestDate ) &lt; #{lastDate}
+        AND (mo.lastDate >= mm.lastSettleDate OR mm.lastSettleDate IS NULL)
+        LIMIT ${(pageNo - 1) * pageSize}, ${pageSize}
+    </select>
+
+    <select id="selectRyxInfoYesterday" resultType="java.util.Map">
+        SELECT DISTINCT mcs.merchantId, cast(mcs.extra ->> "$.merInId" as char) merInId
+        FROM
+            (
+                SELECT merchantCode, count(1) count FROM tb_pluss_merchant_order
+                WHERE `status` IN (1, 2) AND createDate = DATE_SUB(CURRENT_DATE,INTERVAL 1 DAY) AND aisleSwitch = 3
+            GROUP BY orderNumber, merchantCode
+            ) mo
+        LEFT JOIN tb_pluss_merchant_channel_status mcs ON mo.merchantCode = mcs.merchantCode
+        LEFT JOIN (SELECT merchantId, MAX(settDate) settDate FROM tb_pluss_make_money GROUP BY merchantId ) t ON t.merchantId = mcs.merchantId
+        WHERE mcs.channel = 3 AND mo.count = 1 AND (t.settDate &lt; CURRENT_DATE OR t.settDate IS NULL)
+        LIMIT ${(pageNo - 1) * pageSize}, ${pageSize}
+    </select>
+
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/StaffPermissionMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/StaffPermissionMapper.xml
new file mode 100644
index 0000000..6d70663
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/StaffPermissionMapper.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.StaffPermissionMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.StaffPermission">
+        <id column="id" property="id" />
+        <result column="userId" property="userId" />
+        <result column="permissionBill" property="permissionBill" />
+        <result column="createTime" property="createTime" />
+        <result column="updateTime" property="updateTime" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/SubMercCodeYsMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/SubMercCodeYsMapper.xml
new file mode 100644
index 0000000..1a1dc6b
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/SubMercCodeYsMapper.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.SubMercCodeYsMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.SubMercCodeYs">
+        <id column="id" property="id" />
+        <result column="code" property="code" />
+        <result column="name" property="name" />
+        <result column="pCode" property="pCode" />
+        <result column="leveName" property="leveName" />
+        <result column="remark" property="remark" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/SubMerchantApplyOrderMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/SubMerchantApplyOrderMapper.xml
new file mode 100644
index 0000000..d727bf3
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/SubMerchantApplyOrderMapper.xml
@@ -0,0 +1,99 @@
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.SubMerchantApplyOrderMapper">
+
+    <select id="selectPageMoreDetail" resultType="java.util.Map">
+        SELECT tpmcs.id, tpmcs.merchantCode, tpmcs.channel channelId,
+        tpsmao.subMchType,tpsmao.applyNo,tpsmao.status,tpsmao.infoQrcode,tpsmao.resultStatus
+        , tpsmao.remark, tpmcs.createTime auditCreateTime, tpmcs.updateTime auditUpdateTime, tpsmao.createTime,
+        tpsmao.updateTime, tpui.phone, tpic.certName bankCertName, tpmcs.merchantId
+        FROM tb_pluss_merchant_channel_status tpmcs
+        LEFT JOIN tb_pluss_sub_merchant_apply_order tpsmao ON tpsmao.merchantCode = tpmcs.merchantCode AND tpmcs.channel
+        = tpsmao.channelId
+        LEFT JOIN tb_pluss_user_app tpua ON tpmcs.merchantCode = tpua.merchantCode
+        LEFT JOIN tb_pluss_user_info tpui ON tpua.userId = tpui.id
+        LEFT JOIN tb_pluss_id_card tpic ON tpic.userId = tpua.userId
+        <where>
+            tpua.userType = 'promoter' AND
+            tpic.userType = '01' AND
+            tpmcs.merchantId IS NOT NULL AND
+            tpmcs.status IN (3, 4)
+            <if test="condition.merchantCode != null and condition.merchantCode != ''">
+                and tpmcs.merchantCode LIKE CONCAT('%', #{condition.merchantCode}, '%')
+            </if>
+            <if test="condition.phone != null and condition.phone != ''">
+                and tpui.phone LIKE CONCAT('%', #{condition.phone}, '%')
+            </if>
+            <if test="condition.merchantId != null and condition.merchantId != ''">
+                and tpmcs.merchantId LIKE CONCAT('%', #{condition.merchantId}, '%')
+            </if>
+            <if test="condition.userName != null and condition.userName != ''">
+                and tpic.certName LIKE CONCAT('%', #{condition.userName}, '%')
+            </if>
+            <if test="condition.status != null and condition.status != ''">
+                and tpsmao.status LIKE CONCAT('%', #{condition.status}, '%')
+            </if>
+            <if test="condition.resultStatus != null and condition.resultStatus != ''">
+                <choose>
+                    <when test="condition.resultStatus == '-1'">
+                        AND (
+                        (tpsmao.id IS NULL OR tpsmao.resultStatus = '4' OR (tpsmao.resultStatus IS NULL AND tpsmao.applyNo IS NOT NULL))
+                        )
+                    </when>
+                    <when test="condition.resultStatus == 3">
+                        AND (
+                        tpsmao.resultStatus NOT IN ('waitting', 'APPLYMENT_STATE_WAITTING_FOR_AUDIT', '1',
+                        'confirmcontact', '待确认联系信息', 'APPLYMENT_STATE_WAITTING_FOR_CONFIRM_CONTACT')
+                        )
+                    </when>
+                    <when test="condition.resultStatus == 0">
+                        AND tpsmao.resultStatus IN ('waitting', 'APPLYMENT_STATE_WAITTING_FOR_AUDIT', '4')
+                    </when>
+                    <when test="condition.resultStatus == 1">
+                        AND tpsmao.resultStatus IN ('1', 'confirmcontact', '待确认联系信息',
+                        'APPLYMENT_STATE_WAITTING_FOR_CONFIRM_CONTACT')
+                    </when>
+                    <otherwise>
+                        AND tpsmao.resultStatus = #{condition.resultStatus}
+                    </otherwise>
+                </choose>
+            </if>
+        </where>
+        <if test="condition.column != null and condition.column != ''">
+            ORDER BY ${condition.column}
+            <if test='condition.asc == "false"'>
+                DESC
+            </if>
+        </if>
+    </select>
+
+    <!-- 添加applyNo的校验是为了判断之前是否存在已经成功发起微信认证的记录 -->
+    <select id="selectListNoCert" resultType="cn.pluss.platform.entity.SubMerchantApplyOrder">
+        SELECT tpsmao.id,
+               tpmcs.merchantCode,
+               tpmcs.merchantId,
+               tpmcs.applicationId applyNo,
+               tpmcs.channel channelId
+        FROM tb_pluss_merchant_channel_status tpmcs
+                 LEFT JOIN (
+            SELECT smao.*
+            FROM (SELECT merchantCode, channelId, MAX(createTime) lastTime, MAX(applyNo) applyNo
+                  FROM tb_pluss_sub_merchant_apply_order
+                  GROUP BY merchantCode, channelId) t
+                     LEFT JOIN tb_pluss_sub_merchant_apply_order smao ON smao.createTime = t.lastTime AND smao.merchantCode = t.merchantCode AND smao.channelId = t.channelId
+        ) tpsmao ON tpsmao.merchantCode = tpmcs.merchantCode
+            AND tpmcs.channel = tpsmao.channelId
+                 LEFT JOIN tb_pluss_user_app tpua ON tpmcs.merchantCode = tpua.merchantCode
+                 LEFT JOIN tb_pluss_user_info tpui ON tpua.userId = tpui.id
+                 LEFT JOIN tb_pluss_id_card tpic ON tpic.userId = tpua.userId
+        WHERE tpua.userType = 'promoter'
+          AND tpic.userType = '01'
+          AND tpmcs.merchantId IS NOT NULL
+          AND tpmcs.channel IN (1, 4)
+          AND tpmcs.`status` IN (3, 4)
+          AND (tpsmao.id IS NULL OR
+               (tpsmao.updateTime &lt; DATE_SUB(NOW(), INTERVAL 6 MINUTE ) AND tpsmao.resultStatus = '4' AND tpsmao.applyNo IS NULL ))
+        ORDER BY tpmcs.createTime
+                DESC LIMIT 0, 20;
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/pluss-dao-bundle/src/main/resources/mapper/SubMerchantMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/SubMerchantMapper.xml
new file mode 100644
index 0000000..daa3de8
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/SubMerchantMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.SubMerchantMapper">
+
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.SubMerchant" autoMapping="true">
+    </resultMap>
+
+    <resultMap id="VO" type="cn.pluss.platform.vo.SubMerchantVO" autoMapping="true">
+    </resultMap>
+
+    <select id="pageVO" resultType="cn.pluss.platform.vo.SubMerchantVO">
+        SELECT sm.id
+             , sm.merchantId
+             , sm.channelId
+             , sm.subMchId
+             , sm.subMchType
+             , sm.remark
+             , sm.channelTypeId
+             , sm.status
+             , sm.createTime
+             , sm.updateTime
+             , mbi.merchantCode
+             , mbi.userId
+             , ui.loginName
+             , ua.userName
+        FROM tb_pluss_sub_merchant sm
+                 LEFT JOIN tb_pluss_merchant_channel_status mcs ON mcs.merchantId = sm.merchantId
+                 LEFT JOIN tb_pluss_merchant_base_info mbi ON mbi.merchantCode = mcs.merchantCode
+                 LEFT JOIN tb_pluss_user_info ui ON ui.id = mbi.userId
+                 LEFT JOIN tb_pluss_user_app ua ON ua.userId = mbi.userId
+        ${ew.customSqlSegment}
+    </select>
+
+
+</mapper>
\ No newline at end of file
diff --git a/pluss-dao-bundle/src/main/resources/mapper/Suggest-sqlmap.xml b/pluss-dao-bundle/src/main/resources/mapper/Suggest-sqlmap.xml
new file mode 100644
index 0000000..ca6f5cd
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/Suggest-sqlmap.xml
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+			"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="cn.pluss.platform.mapper.SuggestMapper">
+
+	   	<insert id="saveSuggest" parameterType="cn.pluss.platform.entity.Suggest">
+        	insert into tb_pluss_suggest(userId,logo,createDt,content,picUrls,status,phone)VALUES(#{userId},#{logo},now(),#{content},#{picUrls},'0',#{phone})
+    	</insert>
+
+	   	<insert id="saveSuggestBatch">
+        	insert into tb_pluss_suggest(userId,logo,createDt,content,picUrls,status,phone) VALUES
+    			<foreach collection="list" item="item" index="index" separator=",">
+			(#{userId},#{logo},#{createDt},#{content},#{picUrls},#{status},#{phone}		)
+				</foreach>
+    	</insert>
+
+		<select id="querySuggest" parameterType="cn.pluss.platform.entity.Suggest" resultType="cn.pluss.platform.entity.Suggest">
+			SELECT * from tb_pluss_suggest 
+				<where> 
+					<if test="id!= null"> 
+					 	and id = #{id}
+					 </if> 
+					<if test="userId!= null"> 
+					 	and userId = #{userId}
+					 </if> 
+					<if test="logo!= null"> 
+					 	and logo = #{logo}
+					 </if> 
+					<if test="createDt!= null"> 
+					 	and createDt = #{createDt}
+					 </if> 
+					<if test="content!= null"> 
+					 	and content = #{content}
+					 </if> 
+					<if test="picUrls!= null"> 
+					 	and picUrls = #{picUrls}
+					 </if> 
+					 <if test="status!= null"> 
+                        and status = #{status}
+                     </if>
+                     <if test="phone!= null"> 
+                        and phone = #{phone}
+                     </if> 
+                     
+				 </where> 
+		</select>
+
+		<select id="querySuggestList" parameterType="cn.pluss.platform.entity.Suggest" resultType="cn.pluss.platform.entity.Suggest">
+			SELECT * from tb_pluss_suggest 
+				<where> 
+					<if test="id!= null"> 
+					 and 	id = #{id}
+					 </if> 
+					<if test="userId!= null"> 
+					 and 	userId = #{userId}
+					 </if> 
+					<if test="logo!= null"> 
+					 and 	logo = #{logo}
+					 </if> 
+					<if test="createDt!= null"> 
+					 and 	createDt = #{createDt}
+					 </if>
+					<if test="startTime != null">
+					and  createDt  > #{startTime}
+					</if>
+					<if test="endTime != null">
+						and  createDt  <![CDATA[ <= ]]> #{endTime}
+					</if>
+					<if test="content!= null"> 
+					 and 	content = #{content}
+					 </if> 
+					<if test="picUrls!= null"> 
+					 and 	picUrls = #{picUrls}
+					 </if> 
+					 <if test="status!= null"> 
+                        and status = #{status}
+                     </if> 
+                     <if test="phone!= null"> 
+                        and phone like CONCAT('%',#{phone},'%')
+                     </if>
+				 </where> 
+		</select>
+
+		<update id="updateSuggest" parameterType="cn.pluss.platform.entity.Suggest" >
+			update tb_pluss_suggest 
+				  <set> 
+					<if test="userId!= null"> 
+					 	userId = #{userId},
+					 </if> 
+					<if test="logo!= null"> 
+					 	logo = #{logo},
+					 </if> 
+					<if test="createDt!= null"> 
+					 	createDt = #{createDt},
+					 </if> 
+					<if test="content!= null"> 
+					 	content = #{content},
+					 </if> 
+					<if test="picUrls!= null"> 
+					 	picUrls = #{picUrls},
+					 </if> 
+					 <if test="status!= null"> 
+                        status = #{status},
+                     </if> 
+                     <if test="phone!= null"> 
+                        phone = #{phone}
+                     </if>
+				</set>
+			where id=#{id} 
+		</update>
+
+		<delete id="deleteSuggest" parameterType="cn.pluss.platform.entity.Suggest" >
+			DELETE FROM tb_pluss_suggest where id=#{id}
+		</delete>
+
+		<select id="querySuggestPage" parameterType="java.util.Map" resultType="cn.pluss.platform.entity.Suggest">
+			SELECT *, tpui.phone userPhone from tb_pluss_suggest tps LEFT JOIN tb_pluss_user_info tpui ON tps.userId = tpui.id
+				<where> 
+					<if test="id!= null"> 
+					and tps.id = #{id}
+					 </if> 
+					<if test="userId!= null"> 
+					and tps.userId = #{userId}
+					 </if> 
+					<if test="logo!= null"> 
+					and tps.logo = #{logo}
+					 </if> 
+					<if test="createDt!= null"> 
+					and tps.createDt = #{createDt}
+					 </if> 
+					<if test="content!= null"> 
+					and tps.content like CONCAT("%",#{content},"%")
+					 </if> 
+					<if test="picUrls!= null"> 
+					and tps.picUrls = #{picUrls}
+					 </if> 
+					 <if test="status!= null"> 
+                        and tps.status = #{status}
+                     </if> 
+                     <if test="phone!= null"> 
+                        and tps.phone = #{phone}
+                     </if>
+				 </where> 
+			order by tps.id desc  limit #{pageSize}  offset  #{offset}
+		</select>
+
+		<select id="querySuggestPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+			SELECT count(*) from tb_pluss_suggest 
+					<where> 
+					<if test="id!= null"> 
+					 and id = #{id}
+					 </if> 
+					<if test="userId!= null"> 
+					 and userId = #{userId}
+					 </if> 
+					<if test="logo!= null"> 
+					 and logo = #{logo}
+					 </if> 
+					<if test="createDt!= null"> 
+					 and createDt = #{createDt}
+					 </if> 
+					<if test="content!= null"> 
+					 and content like CONCAT("%",#{content},"%") 
+					 </if> 
+					<if test="picUrls!= null"> 
+					 and picUrls = #{picUrls}
+					 </if> 
+					 <if test="status!= null"> 
+                        and status = #{status}
+                     </if> 
+                     <if test="phone!= null"> 
+                        and phone = #{phone}
+                     </if>
+				</where>
+		</select>
+
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/SxfMccInfoMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/SxfMccInfoMapper.xml
new file mode 100644
index 0000000..305ba0e
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/SxfMccInfoMapper.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.SxfMccInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.SxfMccInfo">
+        <id column="F_ID" property="fId" />
+        <result column="F_mcc_code" property="fMccCode" />
+        <result column="F_grandpa_txt" property="fGrandpaTxt" />
+        <result column="F_father_txt" property="fFatherTxt" />
+        <result column="F_mcc_txt" property="fMccTxt" />
+        <result column="F_mcc_type" property="fMccType" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/SysSqlMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/SysSqlMapper.xml
new file mode 100644
index 0000000..068e3d0
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/SysSqlMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.SysSqlMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.SysSql">
+        <id column="id" property="id" />
+        <result column="sql" property="sql" />
+        <result column="createTime" property="createTime" />
+    </resultMap>
+
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/SystemConfig-sqlmap.xml b/pluss-dao-bundle/src/main/resources/mapper/SystemConfig-sqlmap.xml
new file mode 100644
index 0000000..9f15ffc
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/SystemConfig-sqlmap.xml
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="cn.pluss.platform.mapper.SystemConfigMapper">
+
+	<insert id="saveSystemConfig" parameterType="cn.pluss.platform.entity.SystemConfig">
+       	insert into tb_pluss_systemconfig(propertyKey,propertyValue,propertyDesc,propertyIndex,systemId)VALUES(#{propertyKey,jdbcType=VARCHAR},#{propertyValue,jdbcType=VARCHAR},#{propertyDesc,jdbcType=VARCHAR},#{propertyIndex,jdbcType=VARCHAR},#{systemId,jdbcType=VARCHAR})
+   	</insert>
+   	
+   	
+	<insert id="saveSystemConfigBatch">
+       	insert into tb_pluss_systemconfig
+       	(propertyKey,propertyValue,propertyDesc,propertyIndex,systemId)
+       	VALUES
+       	<foreach collection="list" item="item" index="index" separator=",">
+     	 (#{item.propertyKey},#{item.propertyValue},#{item.propertyDesc},#{item.propertyIndex},#{item.systemId})
+     	</foreach>
+   	</insert>
+   	
+   	
+
+	<select id="querySystemConfig" parameterType="cn.pluss.platform.entity.SystemConfig" resultType="cn.pluss.platform.entity.SystemConfig">
+
+		 select * from tb_pluss_systemconfig 
+		<where>
+		    <if test="id != null">
+		       AND id = #{id}
+		    </if>
+		    <if test="propertyKey != null">
+		       AND  propertyKey = #{propertyKey}
+		    </if>
+		    <if test="propertyValue != null">
+		        AND propertyValue = #{propertyValue}
+		    </if>
+		    <if test="propertyDesc != null">
+		        AND propertyDesc = #{propertyDesc}
+		    </if>
+		      <if test="propertyIndex != null">
+		        AND propertyIndex = #{propertyIndex}
+		    </if>
+		      <if test="systemId != null">
+		        AND systemId = #{systemId}
+		    </if>
+		 </where>
+	</select>
+	
+	
+	<select id="querySystemConfigList" parameterType="cn.pluss.platform.entity.SystemConfig" resultType="cn.pluss.platform.entity.SystemConfig">
+
+		 select * from tb_pluss_systemconfig 
+		<where>
+		  	<if test="id != null">
+		        AND id = #{id}
+		    </if>
+		    <if test="propertyKey != null">
+		        AND propertyKey = #{propertyKey}
+		    </if>
+		    <if test="propertyValue != null">
+		        AND propertyValue = #{propertyValue}
+		    </if>
+		    <if test="propertyDesc != null">
+		        AND propertyDesc = #{propertyDesc}
+		    </if>
+		      <if test="propertyIndex != null">
+		        AND propertyIndex = #{propertyIndex}
+		    </if>
+		     <if test="systemId != null">
+		        AND systemId = #{systemId}
+		    </if>
+		 </where>
+	</select>
+	
+	<update id="updateSystemConfig" parameterType="cn.pluss.platform.entity.SystemConfig">
+	    update tb_pluss_systemconfig 
+	    <set>
+	    	<if test="propertyKey != null">
+		         propertyKey = #{propertyKey},
+		    </if>
+		    <if test="propertyValue != null">
+		         propertyValue = #{propertyValue},
+		    </if>
+		    <if test="propertyDesc != null">
+		         propertyDesc = #{propertyDesc},
+		    </if>
+		      <if test="propertyIndex != null">
+		         propertyIndex = #{propertyIndex},
+		    </if>
+		     <if test="systemId != null">
+				 systemId = #{systemId}
+		    </if>
+		  </set>
+	   where id = #{id}
+	</update>
+	
+	
+	
+	<delete id="deleteSystemConfig" parameterType="cn.pluss.platform.entity.SystemConfig">
+        delete from tb_pluss_systemconfig where id = #{id}  
+	</delete>  
+	
+	
+	<select id="querySystemConfigPage" parameterType="java.util.Map" resultType="cn.pluss.platform.entity.SystemConfig">
+
+		 select * from tb_pluss_systemconfig 
+		<where>
+		    <if test="id != null">
+		         id = #{id}
+		    </if>
+		    <if test="propertyKey != null">
+		         propertyKey = #{propertyKey}
+		    </if>
+		    <if test="propertyValue != null">
+		        AND propertyValue = #{propertyValue}
+		    </if>
+		    <if test="propertyDesc != null">
+		        AND propertyDesc = #{propertyDesc}
+		    </if>
+		      <if test="propertyIndex != null">
+		        AND propertyIndex = #{propertyIndex}
+		    </if>
+		     <if test="systemId != null">
+		        AND systemId = #{systemId}
+		    </if>
+		 </where>
+		 order by id desc limit #{pageSize} offset #{offset}
+	</select>
+	
+	<select id="querySystemConfigPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+
+		 select count(*) from tb_pluss_systemconfig 
+		<where>
+		    <if test="id != null">
+		         id = #{id}
+		    </if>
+		    <if test="propertyKey != null">
+		         propertyKey = #{propertyKey}
+		    </if>
+		    <if test="propertyValue != null">
+		        AND propertyValue = #{propertyValue}
+		    </if>
+		    <if test="propertyDesc != null">
+		        AND propertyDesc = #{propertyDesc}
+		    </if>
+		      <if test="propertyIndex != null">
+		        AND propertyIndex = #{propertyIndex}
+		    </if>
+		     <if test="systemId != null">
+		        AND systemId = #{systemId}
+		    </if>
+		 </where>
+	</select>
+	
+	
+	
+	
+</mapper>
\ No newline at end of file
diff --git a/pluss-dao-bundle/src/main/resources/mapper/SystemInfo-sqlmap.xml b/pluss-dao-bundle/src/main/resources/mapper/SystemInfo-sqlmap.xml
new file mode 100644
index 0000000..9446ab3
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/SystemInfo-sqlmap.xml
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+			"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="cn.pluss.platform.mapper.SystemInfoMapper">
+
+	   	<insert id="saveSystemInfo" parameterType="cn.pluss.platform.entity.SystemInfo">
+        	insert into tb_pluss_system_info(title,content,remark,seq,createDt)VALUES(#{title},#{content},#{remark},#{seq},now())
+    	</insert>
+
+	   	<insert id="saveSystemInfoBatch">
+        	insert into tb_pluss_system_info(title,content,remark,seq) VALUES 
+    			<foreach collection="list" item="item" index="index" separator=",">
+			(#{title},#{content},#{remark},#{seq}		)
+				</foreach>
+    	</insert>
+
+		<select id="PageData" resultType="cn.pluss.platform.entity.SystemInfo">
+			select id, title, content, remark, seq, createDt
+			from tb_pluss_system_info
+			<where>
+				<if test="systemInfo.id!= null">
+					and id = #{systemInfo.id}
+				</if>
+				<if test="systemInfo.title!= null and systemInfo.title!= ''">
+					and title = #{systemInfo.title}
+				</if>
+				<if test="systemInfo.content!= null and systemInfo.content!= ''">
+					and content = #{systemInfo.content}
+				</if>
+				<if test="systemInfo.remark!= null and remark!= ''">
+					and remark = #{systemInfo.remark}
+				</if>
+				<if test="systemInfo.seq!= null and systemInfo.seq!= ''">
+					and seq = #{systemInfo.seq}
+				</if>
+				<if test="systemInfo.startTime!= null and systemInfo.startTime!=''">
+					<![CDATA[
+                            and  DATE_FORMAT(createDt, '%Y-%m-%d %H:%i:%S')>=DATE_FORMAT(#{systemInfo.startTime}, '%Y-%m-%d %H:%i:%S')
+                         ]]>
+				</if>
+				<if test="systemInfo.endTime!= null and systemInfo.endTime!=''">
+					<![CDATA[
+                            and  DATE_FORMAT(createDt, '%Y-%m-%d %H:%i:%S')<=DATE_FORMAT(#{systemInfo.endTime}, '%Y-%m-%d %H:%i:%S')
+                         ]]>
+				</if>
+			</where>
+			order by seq
+		</select>
+
+		<select id="querySystemInfo" parameterType="cn.pluss.platform.entity.SystemInfo" resultType="cn.pluss.platform.entity.SystemInfo">
+			SELECT * from tb_pluss_system_info 
+				<where> 
+					<if test="id!= null"> 
+					 	and id = #{id}
+					 </if> 
+					<if test="title!= null"> 
+					 	and title = #{title}
+					 </if> 
+					<if test="content!= null"> 
+					 	and content = #{content}
+					 </if> 
+					<if test="remark!= null"> 
+					 	and remark = #{remark}
+					 </if> 
+					<if test="seq!= null"> 
+					 	and seq = #{seq}
+					 </if> 
+					<if test="createDt!= null"> 
+					 	and createDt = #{createDt}
+					 </if> 
+				 </where> 
+		</select>
+
+		<select id="querySystemInfoList" parameterType="cn.pluss.platform.entity.SystemInfo" resultType="cn.pluss.platform.entity.SystemInfo">
+			SELECT * from tb_pluss_system_info 
+				<where> 
+					<if test="id!= null"> 
+					 and 	id = #{id}
+					 </if> 
+					<if test="title!= null"> 
+					 and 	title = #{title}
+					 </if> 
+					<if test="content!= null"> 
+					 and 	content = #{content}
+					 </if> 
+					<if test="remark!= null"> 
+					 and 	remark = #{remark}
+					 </if> 
+					<if test="seq!= null"> 
+					 and 	seq = #{seq}
+					 </if> 
+					 <if test="createDt!= null"> 
+                        and createDt = #{createDt}
+                     </if> 
+				 </where> 
+		</select>
+
+		<update id="updateSystemInfo" parameterType="cn.pluss.platform.entity.SystemInfo" >
+			update tb_pluss_system_info 
+				  <set> 
+					<if test="title!= null"> 
+					 	title = #{title},
+					 </if> 
+					<if test="content!= null"> 
+					 	content = #{content},
+					 </if> 
+					<if test="remark!= null"> 
+					 	remark = #{remark},
+					 </if> 
+					<if test="seq!= null"> 
+					 	seq = #{seq}
+					 </if> 
+					 <if test="createDt!= null"> 
+                         createDt = #{createDt}
+                     </if> 
+				</set>
+			where id=#{id} 
+		</update>
+
+		<delete id="deleteSystemInfo" parameterType="cn.pluss.platform.entity.SystemInfo" >
+			DELETE FROM tb_pluss_system_info where id=#{id}
+		</delete>
+
+		<select id="querySystemInfoPage" parameterType="java.util.Map" resultType="cn.pluss.platform.entity.SystemInfo">
+			SELECT * from tb_pluss_system_info 
+				<where> 
+					<if test="id!= null"> 
+					and id = #{id}
+					 </if> 
+					<if test="title!= null"> 
+					and title like CONCAT("%", #{title},"%")
+					 </if> 
+					<if test="content!= null"> 
+					and content like CONCAT("%", #{content},"%")
+					 </if> 
+					<if test="remark!= null"> 
+					and remark = #{remark}
+					 </if> 
+					<if test="seq!= null"> 
+					and seq = #{seq}
+					 </if> 
+					 <if test="createDt!= null"> 
+                        and createDt = #{createDt}
+                     </if> 
+				 </where> 
+			order by seq asc  limit #{pageSize}  offset  #{offset}  
+		</select>
+
+		<select id="querySystemInfoPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+			SELECT count(*) from tb_pluss_system_info 
+					<where> 
+					<if test="id!= null"> 
+					 and id = #{id}
+					 </if> 
+					<if test="title!= null"> 
+					 and title like CONCAT("%",#{title},"%")
+					 </if> 
+					<if test="content!= null"> 
+					 and content like CONCAT("%",#{content},"%") 
+					 </if> 
+					<if test="remark!= null"> 
+					 and remark = #{remark}
+					 </if> 
+					<if test="seq!= null"> 
+					 and seq = #{seq}
+					 </if> 
+					 <if test="createDt!= null"> 
+                        and createDt = #{createDt}
+                     </if> 
+				</where>
+		</select>
+
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/TaskSortMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/TaskSortMapper.xml
new file mode 100644
index 0000000..ea7a2cb
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/TaskSortMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.TaskSortMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.TaskSort">
+        <id column="id" property="id" />
+        <result column="code" property="code" />
+        <result column="name" property="name" />
+        <result column="desc" property="desc" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/UserAddressMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/UserAddressMapper.xml
new file mode 100644
index 0000000..2d8df22
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/UserAddressMapper.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.UserAddressMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.UserAddress">
+        <id column="id" property="id" />
+        <result column="name" property="name" />
+        <result column="phone" property="phone" />
+        <result column="address" property="address" />
+        <result column="areaCode" property="areaCode" />
+        <result column="areaName" property="areaName" />
+        <result column="defFlag" property="defFlag" />
+        <result column="createTime" property="createTime" />
+        <result column="userId" property="userId" />
+        <result column="type" property="type" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/UserApp-sqlmap.xml b/pluss-dao-bundle/src/main/resources/mapper/UserApp-sqlmap.xml
new file mode 100644
index 0000000..f3a0318
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/UserApp-sqlmap.xml
@@ -0,0 +1,1474 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="cn.pluss.platform.mapper.UserAppMapper">
+
+    <resultMap id="userInfoVO" type="cn.pluss.platform.vo.UserInfoVO" autoMapping="true">
+        <result property="id" column="id" />
+        <result property="userType" column="userType" />
+        <result property="merchantCode" column="merchantCode" />
+        <result property="alias" column="alias" />
+        <result property="merchantName" column="merchantName" />
+        <result property="contactMobile" column="contactMobile" />
+        <result property="parentId" column="parentId" />
+        <result property="userName" column="userName" />
+        <result property="inviteNum" column="inviteNum" />
+        <result property="parentPhone" column="parentPhone" />
+        <result property="parentLoginName" column="parentLoginName" />
+        <result property="parentUserType" column="parentUserType" />
+        <result property="parentUserId" column="parentUserId" />
+        <result property="parentUserName" column="parentUserName" />
+        <result property="loginName" column="loginName" />
+        <result property="level" column="level" />
+        <result property="phone" column="phone" />
+        <result property="status" column="status" />
+        <result property="createDt" column="createDt" />
+        <result property="userId" column="userId" />
+        <result property="merchantType" column="merchantType" />
+        <result property="ppThirdStatus" column="ppThirdStatus" />
+        <result property="ppStatus" column="ppStatus" />
+        <result property="isBlack" column="isBlack" />
+    </resultMap>
+
+    <select id="selectUserApp" resultType="cn.pluss.platform.entity.UserApp">
+        <include refid="commonSelect"></include>
+        ${ew.customSqlSegment}
+    </select>
+
+    <sql id="commonSelect">
+        SELECT DISTINCT ua.*, ui.phone, IFNULL(sp.permissionBill, 1) permissionBill
+        FROM tb_pluss_user_app ua
+                 LEFT JOIN tb_pluss_user_info ui ON ua.userId = ui.id
+                 LEFT JOIN tb_pluss_merchant_staff_conn msc ON ua.userId = msc.userId
+                 LEFT JOIN tb_pluss_staff_permission sp ON ua.userId = sp.userId AND msc.merchantCode = sp.merchantCode
+    </sql>
+
+    <select id="queryUserAppPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+        SELECT count(*) from tb_pluss_user_app
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="userId!= null">
+                and userId = #{userId}
+            </if>
+            <if test="logo!= null">
+                and logo = #{logo}
+            </if>
+            <if test="level!= null">
+                and level = #{level}
+            </if>
+            <if test="userType!= null">
+                and userType = #{userType}
+            </if>
+            <if test="createDt!= null">
+                and createDt = #{createDt}
+            </if>
+            <if test="stTime!= null">
+                and createDt &gt;= #{stTime}
+            </if>
+            <if test="enTime!= null">
+                and createDt &lt;= #{enTime}
+            </if>
+            <if test="status!= null">
+                and status = #{status}
+            </if>
+            <if test="certnum!= null">
+                and certnum = #{certnum}
+            </if>
+            <if test="certBacKPhoto!= null">
+                and certBacKPhoto = #{certBacKPhoto}
+            </if>
+            <if test="handCertPhoto!= null">
+                and handCertPhoto = #{handCertPhoto}
+            </if>
+            <if test="bankName!= null">
+                and bankName = #{bankName}
+            </if>
+            <if test="bankAddress!= null">
+                and bankAddress = #{bankAddress}
+            </if>
+            <if test="bankBranch!= null">
+                and bankBranch = #{bankBranch}
+            </if>
+            <if test="bankNo!= null">
+                and bankNo = #{bankNo}
+            </if>
+            <if test="bankPhoto!= null">
+                and bankPhoto = #{bankPhoto}
+            </if>
+            <if test="merchantCode!= null">
+                and merchantCode = #{merchantCode}
+            </if>
+            <if test="fansProfit!= null">
+                and fansProfit = #{fansProfit}
+            </if>
+            <if test="extendProfit!= null">
+                and extendProfit = #{extendProfit}
+            </if>
+            <if test="cashProfit!= null">
+                and cashProfit = #{cashProfit}
+            </if>
+            <if test="userName!= null">
+                and userName = #{userName}
+            </if>
+            <if test="staffType!= null">
+                and staffType = #{staffType}
+            </if>
+            <if test="parentId!= null">
+                and parentId = #{parentId}
+            </if>
+            <if test="inviteNum!= null">
+                and inviteNum = #{inviteNum}
+            </if>
+            <if test="bankStatus!= null">
+                and bankStatus = #{bankStatus}
+            </if>
+            <if test="merchantStatus!= null">
+                and merchantStatus = #{merchantStatus}
+            </if>
+            <if test="certReason!= null">
+                and certReason = #{certReason}
+            </if>
+            <if test="bankReason!= null">
+                and bankReason = #{bankReason}
+            </if>
+            <if test="merchantReason!= null">
+                and merchantReason = #{merchantReason}
+            </if>
+            <if test="certPeriod!= null">
+                and certPeriod = #{certPeriod}
+            </if>
+            <if test="certStartTime!= null">
+                and certStartTime = #{certStartTime}
+            </if>
+            <if test="bankAddressCode!= null">
+                and bankAddressCode = #{bankAddressCode}
+            </if>
+            <if test="phone!= null">
+                and phone = #{phone}
+            </if>
+            <if test="merchantName!= null">
+                and merchantName = #{merchantName}
+            </if>
+            <if test="merchantAddress!= null">
+                and merchantAddress = #{merchantAddress}
+            </if>
+            <if test="merchantDetailAddress!= null">
+                and merchantDetailAddress = #{merchantDetailAddress}
+            </if>
+            <if test="contactName!= null">
+                and contactName = #{contactName}
+            </if>
+            <if test="contactPhone!= null">
+                and contactPhone = #{contactPhone}
+            </if>
+            <if test="productDesc!= null">
+                and productDesc = #{productDesc}
+            </if>
+            <if test="bussAuthNum!= null">
+                and bussAuthNum = #{bussAuthNum}
+            </if>
+            <if test="bussAuthPeriod!= null">
+                and bussAuthPeriod = #{bussAuthPeriod}
+            </if>
+            <if test="storeId!= null">
+                and storeId = #{storeId}
+            </if>
+            <if test="appAuthToken!= null">
+                and appAuthToken = #{appAuthToken}
+            </if>
+            <if test="tradeMoney!= null">
+                and tradeMoney = #{tradeMoney}
+            </if>
+            <if test="authCount!= null">
+                and authCount = #{authCount}
+            </if>
+            <if test="subMchId!= null">
+                and subMchId = #{subMchId}
+            </if>
+            <if test="aisleSwitch!= null">
+                and aisleSwitch = #{aisleSwitch}
+            </if>
+            <if test="unionpay!= null">
+                and unionpay = #{unionpay}
+            </if>
+            <if test="mccCode!= null">
+                and mccCode = #{mccCode}
+            </if>
+            <if test="contactEmail!= null">
+                and contactEmail = #{contactEmail}
+            </if>
+            <if test="mccName!= null">
+                and mccName = #{mccName}
+            </if>
+            <if test="leshuaLicenseName!= null">
+                and leshuaLicenseName = #{leshuaLicenseName}
+            </if>
+            <if test="aliAccount!= null">
+                and aliAccount = #{aliAccount}
+            </if>
+            <if test="aliName!= null">
+                and aliName = #{aliName}
+            </if>
+            <if test="aliSignUrl!= null">
+                and aliSignUrl = #{aliSignUrl}
+            </if>
+            <if test="wechatSignUrl!= null">
+                and wechatSignUrl = #{wechatSignUrl}
+            </if>
+            <if test="token!= null">
+                and token = #{token}
+            </if>
+            <if test="endTime!= null">
+                and createDt <![CDATA[>=]]> #{startTime}
+            </if>
+            <if test="endTime!= null">
+                and createDt <![CDATA[<=]]> #{endTime}
+            </if>
+            <if test="isVoice!= null">
+                and isVoice = #{isVoice}
+            </if>
+            <if test="parentIdList!= null">
+                and parentId in
+                <foreach collection="parentIdList" item="item" open="(" close=")" index="index" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
+
+    <select id="queryUserInfoVOPage" parameterType="java.util.Map" resultMap="userInfoVO, cn.pluss.platform.mapper.CommonMapper.count">
+        SELECT DISTINCT SQL_CALC_FOUND_ROWS
+        ua.id,
+        ui.status AS uiStatus,
+        ua.roleCode AS roleCode,
+        ua.userType AS userType,
+        ua.merchantCode AS merchantCode,
+        mbi.alias,
+        mbi.merchantName,
+        mbi.contactMobile AS contactMobile,
+        ua.parentId AS parentId,
+        ua.userName AS userName,
+        ua.inviteNum AS inviteNum,
+        pui.phone AS parentPhone,
+        pui.loginName AS parentLoginName,
+        pua.userType AS parentUserType,
+        pua.userId AS parentUserId,
+        pua.userName as parentUserName,
+        ui.loginName AS loginName,
+        ua.`level` AS level,
+        ul.levelName as levelName,
+        ui.phone AS phone,
+        ua.`status` AS status,
+        ua.createDt AS createDt,
+        ua.userId AS userId,
+        ua.spreadFlag,
+        mbi.merchantType AS merchantType,
+        pp.thirdStatus AS ppThirdStatus,
+        pp.status AS ppStatus,
+        IF(rb.id IS NULL, false, true) isBlack
+        FROM
+        <choose>
+            <when test="sameIp != null and sameIp != ''">
+                tb_pluss_user_app ua1
+                LEFT JOIN tb_pluss_operation_record opr ON opr.userId = ua1.userId
+                LEFT JOIN tb_pluss_operation_record opr2 ON opr.ip = opr2.ip
+                LEFT JOIN tb_pluss_user_app ua ON ua.userId = opr2.userId
+            </when>
+            <otherwise>
+                tb_pluss_user_app ua
+            </otherwise>
+        </choose>
+        LEFT JOIN tb_pluss_user_app pua ON pua.userId = ua.parentId
+        LEFT JOIN tb_pluss_merchant_channel_status mcs ON mcs.merchantCode = ua.merchantCode
+        LEFT JOIN tb_pluss_user_info pui ON pui.id = ua.parentId
+        LEFT JOIN tb_pluss_user_info ui ON ua.userId = ui.id
+        LEFT JOIN tb_pluss_merchant_base_info mbi ON mbi.merchantCode = ua.merchantCode
+        LEFT JOIN tb_pluss_risk_blacklist rb ON rb.userId = ua.userId
+        LEFT JOIN tb_pluss_user_level ul ON ul.levelCode = ua.levelCode
+        LEFT JOIN tb_pluss_sub_merchant sm ON sm.merchantId = mcs.merchantId
+        LEFT JOIN (
+            SELECT mp.* FROM
+            (
+                SELECT userId, MAX(createTime) createTime
+                FROM tb_pluss_merchant_plugin GROUP BY userId
+            ) t LEFT JOIN
+        tb_pluss_merchant_plugin mp
+        ON t.userId = mp.userId AND mp.createTime = t.createTime
+        ) pp
+        ON ua.userId = pp.userId
+        <where>
+            <choose>
+                <when test="userType!=null and userType!=''">
+                    <choose>
+                        <when test="userType == 'agent_agency'">
+                            and ua.userType = 'agent' and pua.userId is not null
+                        </when>
+                        <otherwise>
+                            <choose>
+                                <when test="userType == 'agent'">
+                                    and ua.userType = 'agent' and pua.userId is null
+                                </when>
+                                <otherwise>
+                                    and ua.userType=#{userType}
+                                </otherwise>
+                            </choose>
+                        </otherwise>
+                    </choose>
+                </when>
+                <otherwise>
+                    and ua.userType <![CDATA[<>]]> 'staff'
+                </otherwise>
+            </choose>
+            <if test="userId!=null and userId!=''">
+                <choose>
+                    <when test="sameIp != null and sameIp != ''">
+                        and ua1.userId = #{userId}
+                    </when>
+                    <otherwise>
+                        and ua.userId = #{userId}
+                    </otherwise>
+                </choose>
+            </if>
+            <if test="merchantType != null and merchantType != ''">
+                and mbi.merchantType = #{merchantType}
+            </if>
+            <if test="inviteNum!=null and inviteNum!=''">
+                and ua.inviteNum LIKE CONCAT("%",#{inviteNum},"%")
+            </if>
+            <if test="merchantCode!=null and merchantCode!=''">
+                and ua.merchantCode = #{merchantCode}
+            </if>
+            <if test="alias!=null and alias!=''">
+                and mbi.alias LIKE CONCAT("%",#{alias},"%")
+            </if>
+            <if test="userName!=null and userName!=''">
+                and ua.userName LIKE CONCAT("%",#{userName},"%")
+            </if>
+            <if test="merchantId != null and merchantId  != ''">
+                and mcs.merchantId LIKE CONCAT("%",#{merchantId},"%")
+            </if>
+            <if test="merchantId != null and merchantId  != ''">
+                and mcs.merchantId LIKE CONCAT("%",#{merchantId},"%")
+            </if>
+            <if test="phone!=null and phone!=''">
+                and ui.phone LIKE CONCAT("%",#{phone},"%")
+            </if>
+            <if test="parentPhone!=null and parentPhone!=''">
+                and pui.phone LIKE CONCAT("%",#{parentPhone},"%")
+            </if>
+            <if test="contactMobile!=null and contactMobile!=''">
+                and mbi.contactMobile LIKE CONCAT("%",#{contactMobile},"%")
+            </if>
+            <if test="status!=null">
+                and ua.status=#{status}
+            </if>
+            <if test="wxMercNo != null">
+                and sm.subMchType = 'WX'
+                and sm.subMchId LIKE CONCAT('%', #{wxMercNo}, '%')
+            </if>
+            <if test="zfbMercNo != null">
+                and sm.subMchType = 'ZFB'
+                and sm.subMchId LIKE CONCAT('%', #{wxMercNo}, '%')
+            </if>
+            <choose>
+                <when test="mcsStatus == '2'.toString()">
+                    and (mcs.status = '2' or (mcs.status = '0' and mcs.thirdStatus = '-100'))
+                </when>
+                <otherwise>
+                    <if test="mcsStatus!=null and mcsStatus!=''">
+                        and mcs.status = #{mcsStatus}
+                    </if>
+                </otherwise>
+            </choose>
+            <choose>
+                <when test="thirdStatus == '100'.toString()">
+                    and mcs.thirdStatus <![CDATA[<>]]> '-100'
+                </when>
+                <otherwise>
+                    <if test="thirdStatus != null and thirdStatus != ''">
+                        and mcs.thirdStatus = #{thirdStatus}
+                    </if>
+                </otherwise>
+            </choose>
+            <choose>
+                <when test="ppStatus == '2'.toString()">
+                    and (pp.status = '2' or (pp.status = '0' and pp.thirdStatus = '-100'))
+                </when>
+                <otherwise>
+                    <if test="ppStatus!=null and ppStatus!=''">
+                        and pp.status = #{ppStatus}
+                    </if>
+                </otherwise>
+            </choose>
+            <choose>
+                <when test="ppThirdStatus == '100'.toString()">
+                    and pp.thirdStatus <![CDATA[<>]]> '-100'
+                </when>
+                <otherwise>
+                    <if test="ppThirdStatus != null and ppThirdStatus != ''">
+                        and pp.thirdStatus = #{ppThirdStatus}
+                    </if>
+                </otherwise>
+            </choose>
+            <if test="parentUserType != null and parentUserType != ''">
+                <choose>
+                    <when test="parentUserType == 'agent_agency'">
+                        and pua.userId IN (SELECT ua.userId
+                        FROM tb_pluss_user_app ua
+                        LEFT JOIN tb_pluss_user_app pua ON pua.userId = ua.parentId
+                        WHERE ua.userType = 'agent' and pua.userId is not null)
+                    </when>
+                    <otherwise>
+                        <choose>
+                            <when test="parentUserType == 'agent'">
+                                and pua.userId IN (SELECT ua.userId
+                                FROM tb_pluss_user_app ua
+                                LEFT JOIN tb_pluss_user_app pua ON pua.userId = ua.parentId
+                                WHERE ua.userType = 'agent' and pua.userId is null)
+                            </when>
+                            <otherwise>
+                                and pua.userType=#{parentUserType}
+                            </otherwise>
+                        </choose>
+                    </otherwise>
+                </choose>
+            </if>
+            <if test="merchantCode!=null">
+                and mbi.merchantCode=#{merchantCode}
+            </if>
+        </where>
+        order by ua.id desc limit #{pageSize} offset #{offset};
+        SELECT found_rows() as count
+    </select>
+
+    <select id="queryUserInfoVONoPage" parameterType="java.util.Map" resultType="cn.pluss.platform.vo.UserInfoVO">
+        SELECT
+        ua.id,
+        mbi.alias,
+        mbi.merchantName,
+        mbi.contactMobile AS contactMobile,
+        ua.userName AS userName,
+        ua.inviteNum AS inviteNum,
+        pui.phone AS parentPhone,
+        pui.loginName AS parentLoginName,
+        pua.userType AS parentUserType,
+        ui.loginName AS loginName,
+        ua.`level` AS LEVEL,
+        ui.phone AS phone,
+        ua.`status` AS STATUS,
+        ua.createDt AS createDt,
+        ua.userId AS userId
+        FROM
+        tb_pluss_user_app ua
+        LEFT JOIN tb_pluss_user_app pua ON pua.userId = ua.parentId
+        LEFT JOIN tb_pluss_user_info pui ON pui.id = ua.parentId
+        LEFT JOIN tb_pluss_user_info ui ON ua.userId = ui.id
+        LEFT JOIN tb_pluss_merchant_base_info mbi ON mbi.merchantCode = ua.merchantCode
+        <where>
+            <if test="userId != null and userId !='' ">
+                and ua.userId = #{userId}
+            </if>
+            <if test="inviteNum!=null and inviteNum!=''">
+                and ua.inviteNum LIKE CONCAT("%",#{inviteNum},"%")
+            </if>
+            <if test="alias!=null and alias!=''">
+                and mbi.alias LIKE CONCAT("%",#{alias},"%")
+            </if>
+            <if test="userName!=null and userName!=''">
+                and ua.userName LIKE CONCAT("%",#{userName},"%")
+            </if>
+            <if test="phone!=null and phone!=''">
+                and ui.phone LIKE CONCAT("%",#{phone},"%")
+            </if>
+            <if test="parentPhone!=null and parentPhone!=''">
+                and pui.phone LIKE CONCAT("%",#{parentPhone},"%")
+            </if>
+            <if test="contactMobile!=null and contactMobile!=''">
+                and mbi.contactMobile LIKE CONCAT("%",#{contactMobile},"%")
+            </if>
+            <if test="userType!=null and userType!=''">
+                and ua.userType=#{userType}
+            </if>
+            <if test="status!=null">
+                and ua.status=#{status}
+            </if>
+            <if test="parentUserType!=null">
+                and pua.userType=#{parentUserType}
+            </if>
+            <if test="merchantCode!=null">
+                and ua.merchantCode in (SELECT merchantCode
+                FROM tb_pluss_merchant_base_info
+                WHERE bindingCode =(SELECT bindingCode
+                FROM tb_pluss_merchant_base_info
+                where merchantCode = #{merchantCode}))
+            </if>
+        </where>
+        order by ua.id desc limit #{pageSize} offset #{offset}
+    </select>
+
+    <select id="queryUserInfoVOPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+        select count(1)
+        from
+        <choose>
+            <when test="sameIp != null and sameIp != ''">
+                tb_pluss_user_app ua1
+                LEFT JOIN tb_pluss_operation_record opr ON opr.userId = ua1.userId
+                LEFT JOIN tb_pluss_operation_record opr2 ON opr.ip = opr2.ip
+                LEFT JOIN tb_pluss_user_app ua ON ua.userId = opr2.userId
+            </when>
+            <otherwise>
+                tb_pluss_user_app ua
+            </otherwise>
+        </choose>
+        LEFT JOIN tb_pluss_user_info ui
+        ON ua.userId=ui.id
+        LEFT JOIN tb_pluss_user_info pui ON pui.id = ua.parentId
+        LEFT JOIN tb_pluss_user_app pua ON pua.userId = ua.parentId
+        LEFT JOIN tb_pluss_merchant_channel_status mcs ON mcs.merchantCode = ua.merchantCode
+        LEFT JOIN tb_pluss_merchant_base_info mbi
+        on mbi.merchantCode = ua.merchantCode
+        LEFT JOIN tb_pluss_merchant_plugin pp ON pp.userId = ua.userId
+        <where>
+            <choose>
+                <when test="userType!=null and userType!=''">
+                    <choose>
+                        <when test="userType == 'agent_agency'">
+                            and ua.userType = 'agent' and pua.userId is not null
+                        </when>
+                        <otherwise>
+                            <choose>
+                                <when test="userType == 'agent'">
+                                    and ua.userType = 'agent' and pua.userId is null
+                                </when>
+                                <otherwise>
+                                    and ua.userType=#{userType}
+                                </otherwise>
+                            </choose>
+                        </otherwise>
+                    </choose>
+                </when>
+                <otherwise>
+                    and ua.userType <![CDATA[<>]]> 'staff'
+                </otherwise>
+            </choose>
+            <if test="merchantCode != null ">
+                and ua.merchantCode = #{merchantCode}
+            </if>
+            <if test="merchantType != null and merchantType != ''">
+                and mbi.merchantType = #{merchantType}
+            </if>
+            <if test="userId!=null and userId!=''">
+                <choose>
+                    <when test="sameIp != null and sameIp != ''">
+                        and ua1.userId = #{userId}
+                    </when>
+                    <otherwise>
+                        and ua.userId = #{userId}
+                    </otherwise>
+                </choose>
+            </if>
+            <choose>
+                <when test="mcsStatus == '2'.toString()">
+                    and (mcs.status = '2' or (mcs.status = '0' and mcs.thirdStatus = '-100'))
+                </when>
+                <otherwise>
+                    <if test="mcsStatus!=null and mcsStatus!=''">
+                        and mcs.status = #{mcsStatus}
+                    </if>
+                </otherwise>
+            </choose>
+            <choose>
+                <when test="thirdStatus == '100'.toString()">
+                    and mcs.thirdStatus <![CDATA[<>]]> '-100'
+                </when>
+                <otherwise>
+                    <if test="thirdStatus != null and thirdStatus != ''">
+                        and mcs.thirdStatus = #{thirdStatus}
+                    </if>
+                </otherwise>
+            </choose>
+            <choose>
+                <when test="ppStatus == '2'.toString()">
+                    and (pp.status = '2' or (pp.status = '0' and pp.thirdStatus = '-100'))
+                </when>
+                <otherwise>
+                    <if test="ppStatus!=null and ppStatus!=''">
+                        and pp.status = #{ppStatus}
+                    </if>
+                </otherwise>
+            </choose>
+            <choose>
+                <when test="ppThirdStatus == '100'.toString()">
+                    and pp.thirdStatus <![CDATA[<>]]> '-100'
+                </when>
+                <otherwise>
+                    <if test="ppThirdStatus != null and ppThirdStatus != ''">
+                        and pp.thirdStatus = #{ppThirdStatus}
+                    </if>
+                </otherwise>
+            </choose>
+            <if test="parentPhone!=null and parentPhone!=''">
+                and pui.phone LIKE CONCAT("%",#{parentPhone},"%")
+            </if>
+            <if test="inviteNum!=null and inviteNum!=''">
+                and ua.inviteNum LIKE CONCAT("%",#{inviteNum},"%")
+            </if>
+            <if test="alias!=null and alias!=''">
+                and mbi.alias LIKE CONCAT("%",#{alias},"%")
+            </if>
+            <if test="userName!=null and userName!=''">
+                and ua.userName LIKE CONCAT("%",#{userName},"%")
+            </if>
+            <if test="phone!=null and phone!=''">
+                and ui.phone LIKE CONCAT("%",#{phone},"%")
+            </if>
+            <if test="contactMobile!=null and contactMobile!=''">
+                and mbi.contactMobile LIKE CONCAT("%",#{contactMobile},"%")
+            </if>
+            <if test="status!=null">
+                and ua.status=#{status}
+            </if>
+            <if test="parentUserType != null and parentUserType != ''">
+                <choose>
+                    <when test="parentUserType == 'agent_agency'">
+                        and pua.userId IN (SELECT ua.userId
+                        FROM tb_pluss_user_app ua
+                        LEFT JOIN tb_pluss_user_app pua ON pua.userId = ua.parentId
+                        WHERE ua.userType = 'agent' and pua.userId is not null)
+                    </when>
+                    <otherwise>
+                        <choose>
+                            <when test="parentUserType == 'agent'">
+                                and pua.userId IN (SELECT ua.userId
+                                FROM tb_pluss_user_app ua
+                                LEFT JOIN tb_pluss_user_app pua ON pua.userId = ua.parentId
+                                WHERE ua.userType = 'agent' and pua.userId is null)
+                            </when>
+                            <otherwise>
+                                and pua.userType=#{parentUserType}
+                            </otherwise>
+                        </choose>
+                    </otherwise>
+                </choose>
+            </if>
+        </where>
+    </select>
+
+    <select id="queryUserInfoVONoPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+        select count(*)
+        from tb_pluss_user_app ua
+        LEFT JOIN tb_pluss_user_info ui
+        ON ua.userId=ui.id
+        LEFT JOIN tb_pluss_user_info pui ON pui.id = ua.parentId
+        LEFT JOIN tb_pluss_user_app pua ON pua.userId = ua.parentId
+        LEFT JOIN tb_pluss_merchant_bank_card mb
+        ON mb.userId=ua.userId
+        LEFT JOIN tb_pluss_merchant_base_info mbi
+        on mbi.merchantCode = ua.merchantCode
+        <where>
+            <if test="merchantCode != null ">
+                and ua.merchantCode in (SELECT merchantCode
+                FROM tb_pluss_merchant_base_info
+                WHERE bindingCode =(SELECT bindingCode
+                FROM tb_pluss_merchant_base_info
+                where merchantCode = #{merchantCode}))
+            </if>
+            <if test="userId!=null and userId!=''">
+                and ua.userId = #{userId}
+            </if>
+            <if test="parentPhone!=null and parentPhone!=''">
+                and pui.phone LIKE CONCAT("%",#{parentPhone},"%")
+            </if>
+            <if test="inviteNum!=null and inviteNum!=''">
+                and ua.inviteNum LIKE CONCAT("%",#{inviteNum},"%")
+            </if>
+            <if test="alias!=null and alias!=''">
+                and mbi.alias LIKE CONCAT("%",#{alias},"%")
+            </if>
+
+            <if test="userName!=null and userName!=''">
+                and ua.userName LIKE CONCAT("%",#{userName},"%")
+            </if>
+            <if test="phone!=null and phone!=''">
+                and ui.phone LIKE CONCAT("%",#{phone},"%")
+            </if>
+            <if test="contactMobile!=null and contactMobile!=''">
+                and mbi.contactMobile LIKE CONCAT("%",#{contactMobile},"%")
+            </if>
+            <if test="status!=null">
+                and ua.status=#{status}
+            </if>
+            <if test="userType!=null and userType!=''">
+                and ua.userType=#{userType}
+            </if>
+            <if test="parentUserType!=null">
+                and pua.userType=#{parentUserType}
+            </if>
+        </where>
+    </select>
+
+    <!-- 未实名认证信息 -->
+    <select id="queryUserAppNoRealNamePage" parameterType="java.util.Map"
+            resultType="cn.pluss.platform.vo.UserExpandVO">
+        select ua.id, ua.userId, ua.userName, ui.phone, ua.logo, ua.createDt
+        from tb_pluss_user_app ua
+                 LEFT JOIN tb_pluss_user_info ui ON ua.userId = ui.id
+        where (ua.status = '0' or ua.status = '1' or ua.status = '2' or ua.status is null)
+          and ua.parentId = #{parentId}
+    </select>
+
+    <!-- 未实名认证信息统计条数 -->
+    <select id="queryUserAppNoRealNamePageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+        select count(ua.id)
+        from tb_pluss_user_app ua
+                 LEFT JOIN tb_pluss_user_info ui ON ua.userId = ui.id
+        where (ua.status = '0' or ua.status = '1' or ua.status = '2' or ua.status is null)
+          and ua.parentId = #{parentId}
+    </select>
+
+
+    <!-- 已实名认证信息 -->
+    <select id="queryUserAppRealNamePage" parameterType="java.util.Map" resultType="cn.pluss.platform.vo.UserExpandVO">
+        select ua.id, ua.userId, ua.userName, ui.phone, ua.logo, ua.createDt
+        from tb_pluss_user_app ua
+                 LEFT JOIN tb_pluss_user_info ui ON ua.userId = ui.id
+        where ua.status = '3'
+          and ua.parentId = #{parentId}
+    </select>
+
+    <!-- 已实名认证信息统计条数 -->
+    <select id="queryUserAppRealNamePageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+        select count(ua.id)
+        from tb_pluss_user_app ua
+                 LEFT JOIN tb_pluss_user_info ui ON ua.userId = ui.id
+        where ua.status = '3'
+          and ua.parentId = #{parentId}
+    </select>
+
+    <!--是商户的信息  -->
+    <select id="queryUserAppIsMerchantPage" parameterType="java.util.Map"
+            resultType="cn.pluss.platform.vo.UserExpandVO">
+        select ua.id, ua.userId, ua.userName, ui.phone, ua.logo, ua.createDt
+        from tb_pluss_user_app ua
+                 LEFT JOIN tb_pluss_user_info ui ON ua.userId = ui.id
+        where ua.status = '3'
+          and ua.parentId = #{parentId}
+          and (ua.wechatStatus = '3' or ua.aliStatus = '3')
+    </select>
+
+    <!-- 是商户信息统计数量 -->
+    <select id="queryUserAppIsMerchantPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+        select count(ua.id)
+        from tb_pluss_user_app ua
+                 LEFT JOIN tb_pluss_user_info ui ON ua.userId = ui.id
+        where ua.status = '3'
+          and ua.parentId = #{parentId}
+          and (ua.wechatStatus = '3' or ua.aliStatus = '3')
+    </select>
+
+
+    <select id="queryUserAppListByPhone" parameterType="cn.pluss.platform.entity.UserApp"
+            resultType="cn.pluss.platform.entity.UserApp">
+        SELECT u.loginName,a.logo,a.userName,a.createDt,a.userId,a.status from tb_pluss_user_app a left
+        join tb_pluss_user_info u on a.userId=u.id
+        <where>
+            instr(u.loginName, '@') = 0
+            <if test="level!= null">
+                and a.level = #{level}
+            </if>
+            <if test="status!= null">
+                and a.status = #{status}
+            </if>
+            <if test="parentId!= null">
+                and a.parentId = #{parentId}
+            </if>
+            <if test="agentStaffId!= null">
+                and a.agentStaffId = #{agentStaffId}
+            </if>
+            <if test="parentIdList!= null">
+                and a.parentId in
+                <foreach collection="parentIdList" item="item" open="(" close=")" index="index" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="loginName!= null">
+                and u.loginName is not null and u.loginName > '13000000000' and length(u.loginName)=11 AND u.loginName
+                NOT LIKE '%@%'
+            </if>
+        </where>
+    </select>
+
+
+    <select id="queryUserAppPageByPhone" parameterType="java.util.Map" resultType="cn.pluss.platform.entity.UserApp">
+        SELECT u.loginName,a.logo,a.userName,a.createDt,a.userId,a.status,a.level,a.parentId from
+        tb_pluss_user_app a left join tb_pluss_user_info u on a.userId=u.id
+        <where>
+            <if test="level!= null">
+                and a.level = #{level}
+            </if>
+            <if test="status!= null">
+                and a.status = #{status}
+            </if>
+            <if test="parentId!= null">
+                and a.parentId = #{parentId}
+            </if>
+            <if test="agentStaffId!= null">
+                and a.agentStaffId = #{agentStaffId}
+            </if>
+            <if test="parentIdList!= null">
+                and a.parentId in
+                <foreach collection="parentIdList" item="item" open="(" close=")" index="index" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="loginName!= null">
+                and u.loginName is not null and u.loginName > '13000000000' and length(u.loginName)=11 AND u.loginName
+                NOT LIKE '%@%'
+            </if>
+            <if test="merchantName!= null">
+                and userId in (select userId from tb_pluss_merchant_base_info where alias like
+                CONCAT('%',#{merchantName},'%'))
+            </if>
+            <if test="startTime!= null">
+                and createDt &gt; #{startTime}
+            </if>
+            <if test="endTime!= null">
+                and createDt &lt; #{endTime}
+            </if>
+        </where>
+        order by a.createDt desc limit #{pageSize} offset #{offset}
+    </select>
+
+    <select id="queryUserAppPageCountByPhone" parameterType="java.util.Map" resultType="java.lang.Integer">
+        SELECT count(*) from tb_pluss_user_app a left join tb_pluss_user_info u on a.userId=u.id
+        <where>
+            <if test="level!= null">
+                and a.level = #{level}
+            </if>
+            <if test="status!= null">
+                and a.status = #{status}
+            </if>
+            <if test="parentId!= null">
+                and a.parentId = #{parentId}
+            </if>
+            <if test="parentIdList!= null">
+                and a.parentId in
+                <foreach collection="parentIdList" item="item" open="(" close=")" index="index" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="agentStaffId!= null">
+                and a.agentStaffId = #{agentStaffId}
+            </if>
+            <if test="loginName!= null">
+                and u.loginName is not null and u.loginName > '13000000000' and length(u.loginName)=11 AND u.loginName
+                NOT LIKE '%@%'
+            </if>
+            <if test="startTime!= null">
+                and createDt &gt; #{startTime}
+            </if>
+            <if test="endTime!= null">
+                and createDt &lt; #{endTime}
+            </if>
+            <if test="merchantName!= null">
+                and userId in (select userId from tb_pluss_merchant_base_info where alias like
+                CONCAT('%',#{merchantName},'%'))
+            </if>
+        </where>
+    </select>
+
+    <select id="queryUserAppByInviteNum" parameterType="java.lang.String" resultType="cn.pluss.platform.entity.UserApp">
+        SELECT ua.id,
+               ua.userName  AS userName,
+               ua.inviteNum AS inviteNum,
+               ua.loginName AS loginName,
+               ua.`level`   AS LEVEL,
+               ui.phone     AS phone,
+               ua.`status`  AS STATUS,
+               ua.createDt  AS createDt,
+               ua.userId    AS userId,
+               ua.userType  AS userType,
+               ua.parentId  AS parentId,
+               ua.`sort`  AS sort,
+               ua.`roleCode` AS roleCode,
+               ua.`levelCode` AS levelCode,
+               ua.`status` AS status,
+               ua.`bankStatus` AS bankStatus
+        FROM tb_pluss_user_app ua
+                 LEFT JOIN tb_pluss_user_info ui ON ua.userId = ui.id
+        where inviteNum = #{inviteNum}
+    </select>
+
+    <select id="getExPageUserApp" resultType="cn.pluss.platform.entity.UserApp">
+        SELECT u.loginName,a.logo,a.userName,a.createDt,a.userId,channel.status,a.level,a.parentId,
+        a.agentStaffId from
+        tb_pluss_user_app a left join tb_pluss_user_info u on a.userId=u.id
+        LEFT JOIN tb_pluss_merchant_channel_status channel ON channel.merchantCode = a.merchantCode
+        <where>
+            and a.userType = 'promoter'
+            and instr(u.loginName, '@') = 0
+            <if test="expandDto.level!= null">
+                and a.level = #{expandDto.level}
+            </if>
+            <if test="parentIdList!= null">
+                and a.parentId in
+                <foreach collection="parentIdList" item="item" open="(" close=")" index="index" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="expandDto.merchantName!= null">
+                and userId in (select userId from tb_pluss_merchant_base_info where alias like
+                CONCAT('%',#{expandDto.merchantName},'%'))
+            </if>
+            <if test="expandDto.agentStaffId!= null">
+                and agentStaffId= #{expandDto.agentStaffId}
+            </if>
+            <if test="expandDto.startTime!= null">
+                and createDt &gt; #{expandDto.startTime}
+            </if>
+            <if test="expandDto.endTime!= null">
+                and createDt &lt; #{expandDto.endTime}
+            </if>
+            <if test="expandDto.type != null and expandDto.type != ''">
+                and
+                <choose>
+                    <when test='expandDto.type == "1"'>
+                        a.status != 3
+                    </when>
+                    <when test='expandDto.type == "2"'>
+                        a.status = 3
+                    </when>
+                    <when test='expandDto.type == "3"'>
+                        a.status = 3 and channel.status = 3
+                    </when>
+                </choose>
+            </if>
+        </where>
+        order by a.createDt DESC
+    </select>
+
+    <select id="selectCustomList" resultType="cn.pluss.platform.entity.UserApp">
+        SELECT DISTINCT *
+        FROM (
+             SELECT tpui.loginName,
+                    tpua.userId,
+                    userName,
+                    tpua.logo,
+                    tpua.createDt,
+                    tpua.merchantCode,
+                    tpmbi.merchantName,
+                    tpmbi.alias,
+                    tpmcs.`status`,
+                    tpua.parentId,
+                    tpua.agentStaffId
+             FROM tb_pluss_user_app tpua
+                      LEFT JOIN tb_pluss_user_info tpui ON tpua.userId = tpui.id
+                      LEFT JOIN tb_pluss_merchant_base_info tpmbi ON tpua.userId = tpmbi.userId
+                      LEFT JOIN tb_pluss_merchant_channel_status tpmcs ON tpmcs.merchantCode = tpua.merchantCode
+             ) t ${ew.customSqlSegment}
+    </select>
+
+    <select id="queryUserAppJoinById" parameterType="java.lang.Long" resultType="cn.pluss.platform.entity.UserApp">
+        SELECT pua.id,
+               pua.userName,
+               ui.loginName,
+               pua.status,
+               pua.merchantCode,
+               pua.userId,
+               id.id AS 'idCard.id', id.certNo AS 'idCard.certNo', id.imgPositive AS 'idCard.imgPositive', id.imgNegative AS 'idCard.imgNegative', id.certStartTime AS 'idCard.certStartTime', id.certEndTime AS 'idCard.certEndTime', pbc.bankCardNo AS 'bankCard.bankCardNo', pbc.branchName AS 'bankCard.branchName', pbc.imgUrl AS 'bankCard.imgUrl', pbc.phone AS 'bankCard.phone', pbc.bankName AS 'bankCard.bankName', pbc.branchProvince AS 'bankCard.branchProvince', pbc.branchCity AS 'bankCard.branchCity', pbc.branchArea AS 'bankCard.branchArea', pmai.id AS 'merchantBaseInfo.id', pmai.merchantName AS 'merchantBaseInfo.merchantName', pmai.merchantType AS 'merchantBaseInfo.merchantType', pmai.alias AS 'merchantBaseInfo.alias', pmai.address AS 'merchantBaseInfo.address', pmai.contactName AS 'merchantBaseInfo.contactName', pmai.email AS 'merchantBaseInfo.email', pmai.contactMobile AS 'merchantBaseInfo.contactMobile', pmai.aliAccount AS 'merchantBaseInfo.aliAccount', pmai.mcc AS 'merchantBaseInfo.mcc', pmai.mccName AS 'merchantBaseInfo.mccName', pmai.province AS 'merchantBaseInfo.province', pmai.city AS 'merchantBaseInfo.city', pmai.district AS 'merchantBaseInfo.district', pmai.principalPerson AS 'merchantBaseInfo.principalPerson', pmai.bussAuthName AS 'merchantBaseInfo.bussAuthName', pmai.bussAuthNum AS 'merchantBaseInfo.bussAuthNum', pmai.bussAuthAddress AS 'merchantBaseInfo.bussAuthAddress', pmai.bussAuthStartTime AS 'merchantBaseInfo.bussAuthStartTime', pmai.bussAuthEndTime AS 'merchantBaseInfo.bussAuthEndTime', pp.thirdStatus AS ppThirdStatus,
+               pp.`status` AS ppStatus
+        FROM tb_pluss_user_app pua
+                 left join tb_pluss_merchant_base_info pmai on pua.merchantCode = pmai.merchantCode
+                 left join tb_pluss_bank_card pbc on pbc.userId = pua.userId
+                 left join tb_pluss_id_card id on id.userId = pua.userId
+                 LEFT JOIN tb_pluss_user_info ui ON pua.userId = ui.id
+                 LEFT JOIN (SELECT *
+                            FROM tb_pluss_merchant_plugin
+                            WHERE userId = #{userId}
+                            ORDER BY createTime DESC LIMIT 1) pp
+                           ON pua.userId = pp.userId
+        where pua.userId = #{userId}
+          AND id.userType = "01"
+          AND pbc.accountType = '03'
+    </select>
+
+    <select id="queryUserAppJoinByUserId" parameterType="java.lang.Long" resultType="cn.pluss.platform.entity.UserApp">
+        SELECT pua.*,
+               pmai.id AS 'merchantBaseInfo.id', pmai.userId AS 'merchantBaseInfo.userId', pmai.merchantName AS 'merchantBaseInfo.merchantName', pmai.merchantType AS 'merchantBaseInfo.merchantType', pmai.alias AS 'merchantBaseInfo.alias', pmai.province AS 'merchantBaseInfo.province', pmai.city AS 'merchantBaseInfo.city', pmai.district AS 'merchantBaseInfo.district', pmai.address AS 'merchantBaseInfo.address', pmai.contactName AS 'merchantBaseInfo.contactName', pmai.email AS 'merchantBaseInfo.email', pmai.contactMobile AS 'merchantBaseInfo.contactMobile', pmai.aliAccount AS 'merchantBaseInfo.aliAccount', pmbc.id AS 'merchantBankCard.id', pmbc.merchantCode AS 'merchantBankCard.merchantCode', pmbc.storeId AS 'merchantBankCard.storeId', pmbc.bankCardNo AS 'merchantBankCard.bankCardNo', pmbc.bankAddressNo AS 'merchantBankCard.bankAddressNo', pmbc.bankCertName AS 'merchantBankCard.bankCertName', pmbc.bankName AS 'merchantBankCard.bankName', pmbc.branchName AS 'merchantBankCard.branchName', pmbc.accountType AS 'merchantBankCard.accountType', pmbc.contactLine AS 'merchantBankCard.contactLine', pmbc.certNo AS 'merchantBankCard.certNo', pmbc.phone AS 'merchantBankCard.phone', pmbc.certFullPhoto AS 'merchantBankCard.certFullPhoto', pmbc.certBacKPhoto AS 'merchantBankCard.certBacKPhoto', pmbc.bankCardFrontPic AS 'merchantBankCard.bankCardFrontPic'
+        FROM tb_pluss_user_app pua
+                 left join tb_pluss_merchant_base_info pmai on pua.merchantCode = pmai.merchantCode
+                 left join tb_pluss_merchant_bank_card pmbc on pua.merchantCode = pmbc.merchantCode
+        where pua.userId = #{userId}
+    </select>
+
+    <select id="selectUserAppWithChannelStatusCount" resultType="java.lang.Integer">
+        SELECT count(DISTINCT userId)
+        FROM (
+                 SELECT t1.userId,
+                        t1.userType,
+                        t1.logo,
+                        t1.level,
+                        t1.createDt,
+                        t1.status,
+                        t1.parentId,
+                        t1.bankStatus,
+                        t1.agentStaffId,
+                        t2.status merchantAuditStatus
+                 FROM tb_pluss_user_app t1
+                     LEFT JOIN tb_pluss_user_info ui ON t1.userId = ui.id
+                          LEFT JOIN tb_pluss_merchant_channel_status t2 ON t1.merchantCode = t2.merchantCode
+                    WHERE ui.loginName NOT LIKE '%@%'
+             ) t ${ew.customSqlSegment}
+    </select>
+
+    <select id="selectListWithChannelStatus" resultType="cn.pluss.platform.entity.UserApp">
+        SELECT *
+        FROM (
+                 SELECT t1.*, t2.status merchantAuditStatus
+                 FROM tb_pluss_user_app t1
+                          LEFT JOIN tb_pluss_merchant_channel_status t2 ON t1.merchantCode = t2.merchantCode
+             ) t
+            ${ew.customSqlSegment}
+    </select>
+
+    <select id="getUserAppInfoByParentId" resultType="cn.pluss.platform.entity.UserApp">
+        SELECT ua.status,
+               CONCAT(LEFT(ui.loginName, 3),'****', RIGHT(ui.loginName, 4)) as 'loginName', ua.createDt
+        FROM tb_pluss_user_app ua
+                 left join tb_pluss_user_info ui on ua.userId = ui.id
+        where ua.parentId = #{userId}
+          and ua.userType = 'promoter'
+          AND instr(ui.loginName, '@') = 0
+        order By ua.createDt desc
+    </select>
+
+    <select id="pageData" parameterType="cn.pluss.platform.entity.UserApp"
+            resultType="cn.pluss.platform.entity.UserApp">
+        SELECT ua.status,
+        CONCAT(LEFT(ui.loginName, 3),'****',RIGHT(ui.loginName, 4)) as 'loginName',
+        ua.createDt , cs.`status` AS merchantAuditStatus
+        FROM tb_pluss_user_app ua
+        left join tb_pluss_user_info ui on ua.userId = ui.id
+        left join tb_pluss_merchant_channel_status cs on ua.merchantCode = cs.merchantCode
+        where ua.parentId = #{userApp.userId} and ua.userType = 'promoter' AND instr(ui.loginName,'@') = 0
+        <if test="userApp.startDate != null">
+            <![CDATA[ and DATE_FORMAT(ua.createDt,'%Y-%m-%d')  >= DATE_FORMAT(#{userApp.startDate},'%Y-%m-%d')]]>
+        </if>
+        <if test="userApp.endDate != null">
+            <![CDATA[ and DATE_FORMAT(ua.createDt,'%Y-%m-%d')  <= DATE_FORMAT(#{userApp.endDate},'%Y-%m-%d')]]>
+        </if>
+        GROUP BY ua.merchantCode
+        order By ua.createDt desc
+    </select>
+
+
+    <select id="getSubUserCount" resultType="java.lang.Integer">
+        SELECT count( 1 ) FROM tb_pluss_user_app ua LEFT JOIN tb_pluss_user_info ui ON ua.userId = ui.id
+        WHERE
+        ua.parentId = #{userId}
+        AND userType = 'promoter'
+        AND instr( ui.loginName, '@' ) = 0
+        <if test="startDate != null and startDate != ''">
+            <![CDATA[ and DATE_FORMAT(ua.createDt,'%Y-%m-%d')  >= #{startDate}]]>
+        </if>
+        <if test="endDate != null and endDate != ''">
+            <![CDATA[ and DATE_FORMAT(ua.createDt,'%Y-%m-%d')  <= #{endDate}]]>
+        </if>
+    </select>
+
+    <select id="queryActPage" parameterType="cn.pluss.platform.vo.UserInfoVO"
+            resultType="cn.pluss.platform.vo.UserInfoVO">
+        SELECT
+        t4.userId,
+        t4.nextRegisterCount,
+        t4.nextCertCount,
+        t4.nextIncomingCount,
+        ua.id,
+        ua.userName,
+        ua.`level`,
+        mbi.alias,
+        ui.loginName,
+        pui.phone AS parentPhone,
+        mbi.contactMobile,
+        ua.createDt,
+        ua.`status`
+        FROM
+        (
+        SELECT
+        t3.userId,
+        SUM( t3.nextCount ) AS nextRegisterCount,
+        SUM( IF ( t3.cStatus = '2', t3.nextCount, 0 )) AS nextCertCount,
+        SUM( IF ( t3.cStatus = '3', t3.nextCount, 0 )) AS nextIncomingCount
+        FROM
+        (
+        SELECT
+        ua.userId,
+        IFNULL( t2.count, 0 ) AS nextCount,
+        t2.`status` AS cStatus
+        FROM
+        tb_pluss_user_app ua
+        LEFT JOIN (
+        SELECT
+        t.parentId,
+        t.`status`,
+        count( 1 ) count
+        FROM
+        (
+        SELECT
+        ua.parentId,
+        IF
+        ( ua.bankStatus = 3, IF ( mcs.`status` = 3, 3, 2 ), 1 ) `status`
+        FROM
+        tb_pluss_user_app ua
+        LEFT JOIN tb_pluss_merchant_channel_status mcs ON ua.merchantCode = mcs.merchantCode
+        LEFT JOIN tb_pluss_user_info ui ON ua.userId = ui.id
+        WHERE
+        INSTR( ui.loginName, '@' ) = 0
+        AND DATE_FORMAT(ua.createDt,'%Y-%m-%d') <![CDATA[ >= ]]> DATE_FORMAT(#{userInfoVO.startTime},'%Y-%m-%d')
+        AND DATE_FORMAT(ua.createDt,'%Y-%m-%d')  <![CDATA[ <= ]]> DATE_FORMAT(#{userInfoVO.endTime},'%Y-%m-%d')
+        AND ua.userType = 'promoter'
+        ) t
+
+        GROUP BY
+        t.parentId,
+        t.`status`
+        ) t2 ON ua.userId = t2.parentId
+        ) t3
+        GROUP BY
+        t3.userId
+        ) t4
+        LEFT JOIN tb_pluss_user_app ua ON t4.userId = ua.userId
+        LEFT JOIN tb_pluss_merchant_base_info mbi ON mbi.merchantCode = ua.merchantCode
+        LEFT JOIN tb_pluss_user_info ui ON ui.id = t4.userId
+        LEFT JOIN tb_pluss_user_info pui ON ua.parentId = pui.id
+        <if test="userInfoVO.userId != null">
+            and t3.userId = #{userInfoVO.userId}
+        </if>
+        <if test="userInfoVO.userName != null and userInfoVO.userName != ''">
+            and t3.userName like CONCAT('%',#{userInfoVO.userName},'%')
+        </if>
+        <if test="userInfoVO.loginName != null and userInfoVO.loginName !=''">
+            and ui.loginName = #{userInfoVO.loginName}
+        </if>
+        <if test="userInfoVO.alias != null and userInfoVO.alias != ''">
+            and mbi.alias like CONCAT('%',#{userInfoVO.alias},'%')
+        </if>
+        <if test="userInfoVO.contactMobile != null and userInfoVO.contactMobile != ''">
+            and mbi.contactMobile = #{userInfoVO.contactMobile}
+        </if>
+        <if test="userInfoVO.parentPhone != null and userInfoVO.parentPhone != ''">
+            and pui.phone = #{userInfoVO.parentPhone}
+        </if>
+        ORDER BY
+        nextRegisterCount DESC
+    </select>
+
+    <select id="getNotificationMenuId" parameterType="java.lang.String" resultType="java.lang.Integer">
+        SELECT id
+        FROM `tb_pluss_menu_info`
+        where link = #{link}
+    </select>
+
+    <select id="getParentUserId" parameterType="java.lang.Integer" resultType="java.lang.Integer">
+        select count(pua.userId)
+        from tb_pluss_user_app ua
+                 LEFT JOIN tb_pluss_user_app pua ON pua.userId = ua.parentId
+        where ua.userId = #{parentUserId}
+    </select>
+
+    <select id="getUserId" parameterType="java.lang.String" resultType="java.lang.Integer">
+        SELECT ua.userId
+        FROM tb_pluss_user_app ua
+                 LEFT JOIN tb_pluss_merchant_channel_status mcs ON ua.merchantCode = mcs.merchantCode
+        WHERE mcs.merchantCode = #{merchantCode}
+          AND ua.userType = 'promoter'
+          AND mcs.merchantId IS NULL
+    </select>
+
+    <!-- 根据userId获取用户的所有上级 -->
+    <select id="getUserAppParentsByUserId" resultType="java.util.Map">
+        SELECT ua.userId    as nowUserId,
+               ua.LEVEL     AS nowLevel,
+               ua.userType  as nowType,
+               ua.pIdArr    AS nowPidArr,
+
+               ua1.userId   as prevOneUserId,
+               ua1.LEVEL    AS prevOneLevel,
+               ua1.userType as prevOneType,
+               ua1.pIdArr   AS prevOnePidArr,
+
+               ua2.userId   as prevTwoUserId,
+               ua2.LEVEL    AS prevTwoLevel,
+               ua2.userType as prevTwoType,
+               ua2.pIdArr   AS prevTwoPidArr,
+
+               ua3.userId   AS prevThreeUserId,
+               ua3.LEVEL    AS prevThreeLevel,
+               ua3.userType as prevThreeType,
+               ua3.pIdArr   AS prevThreePidArr,
+
+               ua4.userId   AS prevFourUserId,
+               ua4.LEVEL    AS prevFourLevel,
+               ua4.userType as prevFourType,
+               ua4.pIdArr   AS prevFourPidArr
+        FROM tb_pluss_user_app ua
+                 LEFT JOIN tb_pluss_user_app ua1 ON ua.parentId = ua1.userId
+                 LEFT JOIN tb_pluss_user_app ua2 ON ua1.parentId = ua2.userId
+                 LEFT JOIN tb_pluss_user_app ua3 ON ua2.parentId = ua3.userId
+                 LEFT JOIN tb_pluss_user_app ua4 ON ua3.parentId = ua4.userId
+        WHERE ua.userId = #{userId};
+    </select>
+
+    <select id="getPlatformData" resultType="java.util.Map">
+        SELECT
+            SUM(IF(type = 'toDayPromoter',num,0)) AS addToDayPromoterNum,
+            SUM(IF(type = 'toDayMember',num,0))AS addToDayMemberNum,
+            SUM(IF(type = 'toDayStore',num,0)) AS addToDayStoreNum,
+            SUM(IF(type = 'mercNum',num,0)) AS mercCountNum,
+            SUM(IF(type = 'fansNum',num,0)) AS fansCountNum,
+            SUM(IF(type = 'promNum',num,0)) AS promCountNum,
+            SUM(IF(type = 'memberNum',num,0)) AS memberCountNum
+
+        FROM (
+
+            SELECT count(1) AS num, 'toDayPromoter' as type, 'add' as addType FROM tb_pluss_user_app WHERE date(createDt) = curdate()
+
+            union
+
+            SELECT count(1) AS num, 'toDayMember' AS type,'add' as addType  FROM tb_pluss_merchant_menber WHERE date(createDt) = curdate()
+
+            union
+
+            SELECT count(1) AS num, 'toDayStore' AS type,'add' as addType FROM tb_pluss_merchant_store WHERE date(createDt) = curdate()
+
+            union
+
+            SELECT count(1) AS num, 'mercNum' AS type,'add' as addType FROM tb_pluss_merchant_base_info
+
+            union
+
+            SELECT count(1) AS num, 'fansNum' AS type,'add' as addType FROM tb_pluss_real_fans
+
+            union
+
+            SELECT count(1) AS num, 'promNum' AS type,'add' as addType FROM tb_pluss_user_app
+
+            union
+
+            SELECT count(1) AS num, 'memberNum' AS type,'add' as addType FROM tb_pluss_merchant_menber
+
+        )as
+        a GROUP BY addType
+    </select>
+
+    <select id="selectMerchantSummaryPage" resultType="cn.pluss.platform.vo.MerchSummaryVO">
+        SELECT
+            ua.createDt createTime,
+            ua.userId,
+            mbi.alias,
+            mbi.merchantCode,
+            IFNULL(mos.count, 0) count,
+            IFNULL(mos.totalFee, 0.00) totalFee,
+            IFNULL(mos.retFee, 0.00) retFee,
+            IFNULL(mos.retCount, 0) retCount,
+            IFNULL(mcsD1.`status`, "-1") `d1Status`,
+            IFNULL(mcsD1.`thirdStatus`, "-1") `d1thirdStatus`,
+            mcsD1.`remark` `d1Remark`,
+            IFNULL(mcsD0.`status`, "-1") `d0Status`,
+            IFNULL(mcsD0.`thirdStatus`, "-1") `d0thirdStatus`,
+            mcsD0.`remark` `d0Remark`,
+            ms.`status` `d1StoreStatus`,
+            ms.`status` `d0StoreStatus`,
+            IFNULL(mcsD1.`authorizationStatus`, '0') `d1WxCertStatus`,
+            IFNULL(mcsD0.`authorizationStatus`, '0') `d0WxCertStatus`,
+            IF(ua.parentId = #{condition.userId}, "1", "0") directFlag
+        FROM
+            (
+                <if test="condition.userId != null and condition.userId != ''">
+                    <if test="condition.type != null and condition.type != ''">
+                        <choose>
+                            <when test='"1" == condition.type'>
+                                SELECT ua.userId, ua.createDt, ua.merchantCode, ua.parentId, ua.agentStaffId FROM tb_pluss_user_app ua
+                                LEFT JOIN tb_pluss_user_app ua1 ON ua1.userId = ua.parentId WHERE ua1.userId = #{condition.userId}
+                            </when>
+                            <when test='"2" == condition.type'>
+                                SELECT ua.userId, ua.createDt, ua.merchantCode, ua.parentId, ua.agentStaffId FROM tb_pluss_user_app ua
+                                LEFT JOIN tb_pluss_user_app ua1 ON ua1.userId = ua.parentId
+                                LEFT JOIN tb_pluss_user_app ua2 ON ua2.userId = ua1.parentId WHERE ua2.userId = #{condition.userId}
+                            </when>
+                            <otherwise>
+                                SELECT ua.userId, ua.createDt, ua.merchantCode, ua.parentId, ua.agentStaffId FROM tb_pluss_user_app ua
+                                LEFT JOIN tb_pluss_user_app ua1 ON ua1.userId = ua.parentId WHERE ua1.userId = #{condition.userId}
+                                UNION
+                                SELECT ua.userId, ua.createDt, ua.merchantCode, ua.parentId, ua.agentStaffId FROM tb_pluss_user_app ua
+                                LEFT JOIN tb_pluss_user_app ua1 ON ua1.userId = ua.parentId
+                                LEFT JOIN tb_pluss_user_app ua2 ON ua2.userId = ua1.parentId WHERE ua2.userId = #{condition.userId}
+                            </otherwise>
+                        </choose>
+                    </if>
+                </if>
+            ) ua
+            LEFT JOIN tb_pluss_merchant_base_info mbi ON mbi.userId = ua.userId
+            LEFT JOIN tb_pluss_merchant_store ms ON ms.merchantCode = ua.merchantCode
+            LEFT JOIN
+                tb_pluss_merchant_channel_status mcsD1
+                ON mcsD1.merchantCode = mbi.merchantCode AND (mcsD1.channel IN (1,3) OR mcsD1.channel IS NULL)
+            LEFT JOIN
+                tb_pluss_merchant_channel_status mcsD0
+                ON mcsD0.merchantCode = mbi.merchantCode AND (mcsD0.channel IN (4) OR mcsD0.channel IS NULL)
+            LEFT JOIN (
+            SELECT
+                merchantCode,
+                SUM( count ) count,
+                SUM( totalFee ) totalFee,
+                SUM( retFee ) retFee,
+                SUM( retCount ) retCount
+            FROM
+                tb_pluss_merchant_order_statistics mos
+                WHERE mos.`startDate` = '1970-01-01'
+            GROUP BY
+                merchantCode
+            ) mos ON mos.merchantCode = mbi.merchantCode
+        WHERE (mcsD1.`status` IS NOT NULL OR mcsD0.`status` IS NOT NULL)
+        <if test="condition.merchantName != null and condition.merchantName != ''">
+            AND mbi.alias LIKE CONCAT('%', #{condition.merchantName}, '%')
+        </if>
+        <if test='condition.agentStaffIds != null and condition.agentStaffIds.size() != 0'>
+            AND ua.agentStaffId IN
+            <foreach collection="condition.agentStaffIds" close=")" open="(" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="condition.startTime != null">
+            AND ua.createDt &gt;= #{condition.startTime}
+        </if>
+        <if test="condition.endTime != null">
+            AND ua.createDt &lt;= #{condition.endTime}
+        </if>
+    </select>
+
+    <select id="selectBillCountAndTotalFee" resultType="cn.pluss.platform.vo.MerchSummaryVO">
+        SELECT
+            IFNULL(SUM(mos.count), 0) `count`,
+            IFNULL(SUM(mos.totalFee), 0.00) totalFee
+        FROM (
+            <if test="condition.userId != null and condition.userId != ''">
+                <if test="condition.type != null and condition.type != ''">
+                    <choose>
+                        <when test='"1" == condition.type'>
+                            SELECT ua.* FROM tb_pluss_user_app ua
+                            WHERE ua.parentId = #{condition.userId}
+                        </when>
+                        <when test='"2" == condition.type'>
+                            SELECT ua1.* FROM tb_pluss_user_app ua
+                            LEFT JOIN tb_pluss_user_app ua1 ON ua1.parentId = ua.userId
+                            WHERE ua.parentId = #{condition.userId}
+                            UNION
+                            SELECT ua2.* FROM tb_pluss_user_app ua
+                            LEFT JOIN tb_pluss_user_app ua1 ON ua1.parentId = ua.userId
+                            LEFT JOIN tb_pluss_user_app ua2 ON ua2.parentId = ua1.userId
+                            WHERE ua.parentId = #{condition.userId}
+                        </when>
+                        <otherwise>
+                            SELECT ua.* FROM tb_pluss_user_app ua
+                            WHERE ua.parentId = #{condition.userId}
+                            UNION
+                            SELECT ua1.* FROM tb_pluss_user_app ua
+                            LEFT JOIN tb_pluss_user_app ua1 ON ua1.parentId = ua.userId
+                            WHERE ua.parentId = #{condition.userId}
+                            UNION
+                            SELECT ua2.* FROM tb_pluss_user_app ua
+                            LEFT JOIN tb_pluss_user_app ua1 ON ua1.parentId = ua.userId
+                            LEFT JOIN tb_pluss_user_app ua2 ON ua2.parentId = ua1.userId
+                            WHERE ua.parentId = #{condition.userId}
+                        </otherwise>
+                    </choose>
+                </if>
+            </if>
+        ) ua
+        LEFT JOIN tb_pluss_merchant_base_info mbi ON mbi.userId = ua.userId
+        LEFT JOIN tb_pluss_merchant_store ms ON ms.merchantCode = ua.merchantCode
+        LEFT JOIN tb_pluss_merchant_channel_status mcsD1 ON mcsD1.merchantCode = mbi.merchantCode AND mcsD1.channel IN (1,3)
+        LEFT JOIN tb_pluss_merchant_channel_status mcsD0 ON mcsD0.merchantCode = mbi.merchantCode AND mcsD0.channel IN (4)
+        LEFT JOIN (
+        SELECT
+            merchantCode,
+            SUM( count ) count,
+            SUM( totalFee ) totalFee,
+            SUM( retFee ) retFee,
+            SUM( retCount ) retCount
+        FROM
+            tb_pluss_merchant_order_statistics
+        WHERE startDate = '1970-01-01'
+        GROUP BY
+            merchantCode
+        ) mos ON mos.merchantCode = mbi.merchantCode
+        WHERE (mcsD1.`status` IN (1, 2, 3) OR mcsD0.`status` IN (1, 2, 3))
+        <if test="condition.merchantName != null and condition.merchantName != ''">
+            AND mbi.alias LIKE CONCAT('%', #{condition.merchantName}, '%')
+        </if>
+        <if test="condition.userId != null and condition.userId != ''">
+            <if test="condition.type != null and condition.type != ''">
+
+            </if>
+        </if>
+        <if test='condition.agentStaffIds != null and condition.agentStaffIds.size() != 0'>
+            AND ua.agentStaffId IN
+            <foreach collection="condition.agentStaffIds" close=")" open="(" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="condition.startTime != null">
+            AND ua.createDt &gt;= #{condition.startTime}
+        </if>
+        <if test="condition.endTime != null">
+            AND ua.createDt &lt;= #{condition.endTime}
+        </if>
+    </select>
+
+    <select id="getMaxSort" resultType="java.lang.Integer">
+        SELECT
+            MAX(sort)
+        FROM
+         tb_pluss_user_app
+    </select>
+
+    <select id="getUserNumInfo" resultType="cn.pluss.platform.vo.UserNumVO">
+        SELECT
+            IFNULL(SUM(t.totalNum), 0) as totalNum,
+            IFNULL(SUM(IF(t.createDate = #{date},1,0)),0) AS addNum
+        FROM (
+             SELECT
+                 count(1) as totalNum,
+                 <if test="dateType == null or dateType == 1">
+                     DATE_FORMAT(createDt, '%Y-%m-%d' ) AS createDate
+                 </if>
+                 <if test="dateType == 2">
+                    DATE_FORMAT(createDt, '%Y-%m' ) AS createDate
+                 </if>
+                <if test="dateType == 3">
+                    DATE_FORMAT(createDt, '%Y' ) AS createDate
+                </if>
+             FROM tb_pluss_user_app WHERE parentId = #{userId} and userType not in ('staff','agent_staff')
+             GROUP BY
+            <if test="dateType == null or dateType == 1">
+                DATE_FORMAT(createDt, '%Y-%m-%d')
+            </if>
+            <if test="dateType == 2">
+                DATE_FORMAT(createDt, '%Y-%m')
+            </if>
+            <if test="dateType == 3">
+                DATE_FORMAT(createDt, '%Y')
+            </if>
+         ) t
+    </select>
+
+    <select id="getUserInfoByPhone" resultType="cn.pluss.platform.entity.UserApp">
+        SELECT ua.*,ui.phone FROM tb_pluss_user_app ua
+        left join tb_pluss_user_info ui on ua.userId = ui.id
+        where ui.phone = #{phone} and userType not in ('agent_staff','staff') AND LENGTH(ui.phone) = 11
+    </select>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/UserAreaRewardFlowMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/UserAreaRewardFlowMapper.xml
new file mode 100644
index 0000000..40528dd
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/UserAreaRewardFlowMapper.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.UserAreaRewardFlowMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.UserAreaRewardFlow">
+        <id column="id" property="id" />
+        <result column="userId" property="userId" />
+        <result column="roleCode" property="roleCode" />
+        <result column="areaFlow" property="areaFlow" />
+        <result column="rewardAmt" property="rewardAmt" />
+        <result column="createTime" property="createTime" />
+        <result column="createDate" property="createDate" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/UserAssessMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/UserAssessMapper.xml
new file mode 100644
index 0000000..71ac306
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/UserAssessMapper.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.UserAssessMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.UserAssess">
+        <id column="id" property="id" />
+        <result column="userId" property="userId" />
+        <result column="roleCode" property="roleCode" />
+        <result column="directMercNum" property="directMercNum" />
+        <result column="validMercNum" property="validMercNum" />
+        <result column="expireTime" property="expireTime" />
+        <result column="expireStatus" property="expireStatus" />
+        <result column="isCheck" property="isCheck" />
+        <result column="reason" property="reason" />
+        <result column="remark" property="remark" />
+        <result column="createTime" property="createTime" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/UserExtraMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/UserExtraMapper.xml
new file mode 100644
index 0000000..65444ff
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/UserExtraMapper.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.UserExtraMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.UserExtra">
+        <id column="id" property="id" />
+        <result column="userId" property="userId" />
+        <result column="key" property="key" />
+        <result column="value" property="value" />
+        <result column="createTime" property="createTime" />
+        <result column="updateTime" property="updateTime" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/UserInfo-sqlmap.xml b/pluss-dao-bundle/src/main/resources/mapper/UserInfo-sqlmap.xml
new file mode 100644
index 0000000..6869783
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/UserInfo-sqlmap.xml
@@ -0,0 +1,591 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="cn.pluss.platform.mapper.UserInfoMapper">
+
+    <insert id="saveUserInfo" parameterType="cn.pluss.platform.entity.UserInfo" keyProperty="id"
+            useGeneratedKeys="true">
+        insert into tb_pluss_user_info(loginName, trueName, provinceCode, cityCode, sex, phone, email, status, password,
+                                       creator, createTime, updator, updateTime, version, parentId, areaId, areaCode,
+                                       source)
+        VALUES (#{loginName}, #{trueName}, #{provinceCode}, #{cityCode}, #{sex}, #{phone}, #{email}, #{status},
+                #{password}, #{creator}, #{createTime}, #{updator}, #{updateTime}, #{version}, #{parentId}, #{areaId},
+                #{areaCode}, #{source})
+    </insert>
+
+    <insert id="saveUserInfoBatch">
+        insert into
+        tb_pluss_user_info(loginName,trueName,provinceCode,cityCode,sex,phone,email,status,password,creator,createTime,updator,updateTime,version,parentId,areaId,areaCode,source)
+        VALUES
+        <foreach collection="list" item="item" index="index" separator=",">
+            (#{loginName},#{trueName},#{provinceCode},#{cityCode},#{sex},#{phone},#{email},#{status},#{password},#{creator},#{createTime},#{updator},#{updateTime},#{version},#{parentId},#{areaId},#{areaCode},#{source}
+            )
+        </foreach>
+    </insert>
+
+    <select id="queryUserInfo" parameterType="cn.pluss.platform.entity.UserInfo"
+            resultType="cn.pluss.platform.entity.UserInfo">
+        SELECT * from tb_pluss_user_info
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="loginName!= null">
+                and loginName = #{loginName}
+            </if>
+            <if test="trueName!= null">
+                and trueName = #{trueName}
+            </if>
+            <if test="provinceCode!= null">
+                and provinceCode = #{provinceCode}
+            </if>
+            <if test="cityCode!= null">
+                and cityCode = #{cityCode}
+            </if>
+            <if test="sex!= null">
+                and sex = #{sex}
+            </if>
+            <if test="phone!= null">
+                and phone = #{phone}
+            </if>
+            <if test="email!= null">
+                and email = #{email}
+            </if>
+            <if test="status!= null">
+                and status = #{status}
+            </if>
+            <if test="password!= null">
+                and password = #{password}
+            </if>
+            <if test="creator!= null">
+                and creator = #{creator}
+            </if>
+            <if test="createTime!= null">
+                and createTime = #{createTime}
+            </if>
+            <if test="updator!= null">
+                and updator = #{updator}
+            </if>
+            <if test="updateTime!= null">
+                and updateTime = #{updateTime}
+            </if>
+            <if test="version!= null">
+                and version = #{version}
+            </if>
+            <if test="parentId!= null">
+                and parentId = #{parentId}
+            </if>
+            <if test="areaId!= null">
+                and areaId = #{areaId}
+            </if>
+            <if test="areaCode!= null">
+                and areaCode = #{areaCode}
+            </if>
+            <if test="source!= null">
+                and source = #{source}
+            </if>
+        </where>
+    </select>
+
+    <select id="queryUserInfoList" parameterType="cn.pluss.platform.entity.UserInfo"
+            resultType="cn.pluss.platform.entity.UserInfo">
+        SELECT * from tb_pluss_user_info
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="loginName!= null">
+                and loginName = #{loginName}
+            </if>
+            <if test="trueName!= null">
+                and trueName = #{trueName}
+            </if>
+            <if test="provinceCode!= null">
+                and provinceCode = #{provinceCode}
+            </if>
+            <if test="cityCode!= null">
+                and cityCode = #{cityCode}
+            </if>
+            <if test="sex!= null">
+                and sex = #{sex}
+            </if>
+            <if test="phone!= null">
+                and phone = #{phone}
+            </if>
+            <if test="email!= null">
+                and email = #{email}
+            </if>
+            <if test="status!= null">
+                and status = #{status}
+            </if>
+            <if test="password!= null">
+                and password = #{password}
+            </if>
+            <if test="creator!= null">
+                and creator = #{creator}
+            </if>
+            <if test="createTime!= null">
+                and createTime = #{createTime}
+            </if>
+            <if test="updator!= null">
+                and updator = #{updator}
+            </if>
+            <if test="updateTime!= null">
+                and updateTime = #{updateTime}
+            </if>
+            <if test="version!= null">
+                and version = #{version}
+            </if>
+            <if test="parentId!= null">
+                and parentId = #{parentId}
+            </if>
+            <if test="areaId!= null">
+                and areaId = #{areaId}
+            </if>
+            <if test="areaCode!= null">
+                and areaCode = #{areaCode}
+            </if>
+            <if test="source!= null">
+                and source = #{source}
+            </if>
+        </where>
+        order by id desc
+    </select>
+
+    <update id="updateUserInfo" parameterType="cn.pluss.platform.entity.UserInfo">
+        update tb_pluss_user_info
+        <set>
+            <if test="loginName!= null">
+                loginName = #{loginName},
+            </if>
+            <if test="trueName!= null">
+                trueName = #{trueName},
+            </if>
+            <if test="provinceCode!= null">
+                provinceCode = #{provinceCode},
+            </if>
+            <if test="cityCode!= null">
+                cityCode = #{cityCode},
+            </if>
+            <if test="sex!= null">
+                sex = #{sex},
+            </if>
+            <if test="phone!= null">
+                phone = #{phone},
+            </if>
+            <if test="email!= null">
+                email = #{email},
+            </if>
+            <if test="status!= null">
+                status = #{status},
+            </if>
+            <if test="password!= null">
+                password = #{password},
+            </if>
+            <if test="creator!= null">
+                creator = #{creator},
+            </if>
+            <if test="createTime!= null">
+                createTime = #{createTime},
+            </if>
+            <if test="updator!= null">
+                updator = #{updator},
+            </if>
+            <if test="updateTime!= null">
+                updateTime = #{updateTime},
+            </if>
+            <if test="version!= null">
+                version = #{version},
+            </if>
+            <if test="parentId!= null">
+                parentId = #{parentId},
+            </if>
+            <if test="areaId!= null">
+                areaId = #{areaId},
+            </if>
+            <if test="areaCode!= null">
+                areaCode = #{areaCode},
+            </if>
+            <if test="source!= null">
+                source = #{source}
+            </if>
+        </set>
+        where id=#{id}
+    </update>
+
+    <delete id="deleteUserInfo" parameterType="cn.pluss.platform.entity.UserInfo">
+        DELETE
+        FROM tb_pluss_user_info
+        where id = #{id}
+    </delete>
+
+    <select id="queryUserInfoPage" parameterType="java.util.Map" resultType="cn.pluss.platform.entity.UserInfo">
+        SELECT * from tb_pluss_user_info
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="loginName!= null">
+                and loginName like CONCAT("%",#{loginName},"%")
+            </if>
+            <if test="trueName!= null">
+                and trueName = #{trueName}
+            </if>
+            <if test="provinceCode!= null">
+                and provinceCode = #{provinceCode}
+            </if>
+            <if test="cityCode!= null">
+                and cityCode = #{cityCode}
+            </if>
+            <if test="sex!= null">
+                and sex = #{sex}
+            </if>
+            <if test="phone!= null">
+                and phone = #{phone}
+            </if>
+            <if test="email!= null">
+                and email = #{email}
+            </if>
+            <if test="status!= null">
+                and status = #{status}
+            </if>
+            <if test="password!= null">
+                and password = #{password}
+            </if>
+            <if test="creator!= null">
+                and creator = #{creator}
+            </if>
+            <if test="createTime!= null">
+                and createTime = #{createTime}
+            </if>
+            <if test="updator!= null">
+                and updator = #{updator}
+            </if>
+            <if test="updateTime!= null">
+                and updateTime = #{updateTime}
+            </if>
+            <if test="version!= null">
+                and version = #{version}
+            </if>
+            <if test="parentId!= null">
+                and parentId = #{parentId}
+            </if>
+            <if test="areaId!= null">
+                and areaId = #{areaId}
+            </if>
+            <if test="areaCode!= null">
+                and areaCode = #{areaCode}
+            </if>
+            <if test="source!= null">
+                and source = #{source}
+            </if>
+        </where>
+        order by id desc limit #{pageSize} offset #{offset}
+    </select>
+
+    <select id="queryUserInfoVOPage" parameterType="java.util.Map" resultType="cn.pluss.platform.vo.UserInfoVO">
+        select ui.*,uo.organCode,uo.organName,uo.organTypeCode,uo.organTypeName from tb_pluss_user_info ui LEFT JOIN
+        tb_pluss_user_organ uo ON uo.userId=ui.id
+        <where>
+            <if test="id!= null and id!=''">
+                and ui.id = #{id}
+            </if>
+            <if test="loginName!= null and loginName!=''">
+                and loginName = #{loginName}
+            </if>
+            <if test="trueName!= null and trueName!=''">
+                and trueName like CONCAT("%",#{trueName},"%")
+            </if>
+            <if test="provinceCode!= null and provinceCode!=''">
+                and provinceCode = #{provinceCode}
+            </if>
+            <if test="cityCode!= null and cityCode!=''">
+                and cityCode = #{cityCode}
+            </if>
+            <if test="sex!= null and sex!=''">
+                and sex = #{sex}
+            </if>
+            <if test="phone!= null and phone!=''">
+                and phone LIKE CONCAT("%",#{phone},"%")
+            </if>
+            <if test="email!= null and email!=''">
+                and email = #{email}
+            </if>
+            <if test="status!= null and status!=''">
+                and status = #{status}
+            </if>
+            <if test="password!= null and password!=''">
+                and password = #{password}
+            </if>
+            <if test="creator!= null and creator!=''">
+                and creator = #{creator}
+            </if>
+            <if test="createTime!= null and createTime!=''">
+                and createTime = #{createTime}
+            </if>
+            <if test="updator!= null and updator!=''">
+                and updator = #{updator}
+            </if>
+            <if test="updateTime!= null and updateTime!=''">
+                and updateTime = #{updateTime}
+            </if>
+            <if test="version!= null and version!=''">
+                and version = #{version}
+            </if>
+            <if test="parentId!= null and parentId!=''">
+                and parentId = #{parentId}
+            </if>
+            <if test="areaId!= null and areaId!=''">
+                and areaId = #{areaId}
+            </if>
+            <if test="areaCode!= null and loginName!=''">
+                and areaCode = #{areaCode}
+            </if>
+            <if test="source!= null and source!=''">
+                and source = #{source}
+            </if>
+            <if test="organCode!= null and organCode!=''">
+                and organCode = #{organCode}
+            </if>
+            <if test="organName!= null and organName!=''">
+                and organName = #{organName}
+            </if>
+            <if test="organTypeCode!= null and organTypeCode!=''">
+                and organTypeCode = #{organTypeCode}
+            </if>
+            <if test="organTypeName!= null and organTypeName!=''">
+                and organTypeName = #{organTypeName}
+            </if>
+        </where>
+        order by ui.id DESC limit #{pageSize} offset #{offset}
+    </select>
+
+    <select id="queryUserInfoVOPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+        select count(*) FROM (select ui.*,uo.organCode,uo.organName,uo.organTypeCode,uo.organTypeName from
+        tb_pluss_user_info ui LEFT JOIN tb_pluss_user_organ uo ON uo.userId=ui.id
+        <where>
+            <if test="id!= null and id!=''">
+                and ui.id = #{id}
+            </if>
+            <if test="loginName!= null and loginName!=''">
+                and loginName = #{loginName}
+            </if>
+            <if test="trueName!= null and trueName!=''">
+                and trueName like CONCAT("%",#{trueName},"%")
+            </if>
+            <if test="provinceCode!= null and provinceCode!=''">
+                and provinceCode = #{provinceCode}
+            </if>
+            <if test="cityCode!= null and cityCode!=''">
+                and cityCode = #{cityCode}
+            </if>
+            <if test="sex!= null and sex!=''">
+                and sex = #{sex}
+            </if>
+            <if test="phone!= null and phone!=''">
+                and phone LIKE CONCAT("%",#{phone},"%")
+            </if>
+            <if test="email!= null and email!=''">
+                and email = #{email}
+            </if>
+            <if test="status!= null and status!=''">
+                and status = #{status}
+            </if>
+            <if test="password!= null and password!=''">
+                and password = #{password}
+            </if>
+            <if test="creator!= null and creator!=''">
+                and creator = #{creator}
+            </if>
+            <if test="createTime!= null and createTime!=''">
+                and createTime = #{createTime}
+            </if>
+            <if test="updator!= null and updator!=''">
+                and updator = #{updator}
+            </if>
+            <if test="updateTime!= null and updateTime!=''">
+                and updateTime = #{updateTime}
+            </if>
+            <if test="version!= null and version!=''">
+                and version = #{version}
+            </if>
+            <if test="parentId!= null and parentId!=''">
+                and parentId = #{parentId}
+            </if>
+            <if test="areaId!= null and areaId!=''">
+                and areaId = #{areaId}
+            </if>
+            <if test="areaCode!= null and loginName!=''">
+                and areaCode = #{areaCode}
+            </if>
+            <if test="source!= null and source!=''">
+                and source = #{source}
+            </if>
+            <if test="organCode!= null and organCode!=''">
+                and organCode = #{organCode}
+            </if>
+            <if test="organName!= null and organName!=''">
+                and organName = #{organName}
+            </if>
+            <if test="organTypeCode!= null and organTypeCode!=''">
+                and organTypeCode = #{organTypeCode}
+            </if>
+            <if test="organTypeName!= null and organTypeName!=''">
+                and organTypeName = #{organTypeName}
+            </if>
+        </where>
+        )u
+    </select>
+
+
+    <select id="queryUserInfoPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+        SELECT count(*) from tb_pluss_user_info
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="loginName!= null">
+                and loginName = #{loginName}
+            </if>
+            <if test="trueName!= null">
+                and trueName = #{trueName}
+            </if>
+            <if test="provinceCode!= null">
+                and provinceCode = #{provinceCode}
+            </if>
+            <if test="cityCode!= null">
+                and cityCode = #{cityCode}
+            </if>
+            <if test="sex!= null">
+                and sex = #{sex}
+            </if>
+            <if test="phone!= null">
+                and phone = #{phone}
+            </if>
+            <if test="email!= null">
+                and email = #{email}
+            </if>
+            <if test="status!= null">
+                and status = #{status}
+            </if>
+            <if test="password!= null">
+                and password = #{password}
+            </if>
+            <if test="creator!= null">
+                and creator = #{creator}
+            </if>
+            <if test="createTime!= null">
+                and createTime = #{createTime}
+            </if>
+            <if test="updator!= null">
+                and updator = #{updator}
+            </if>
+            <if test="updateTime!= null">
+                and updateTime = #{updateTime}
+            </if>
+            <if test="version!= null">
+                and version = #{version}
+            </if>
+            <if test="parentId!= null">
+                and parentId = #{parentId}
+            </if>
+            <if test="areaId!= null">
+                and areaId = #{areaId}
+            </if>
+            <if test="areaCode!= null">
+                and areaCode = #{areaCode}
+            </if>
+            <if test="source!= null">
+                and source = #{source}
+            </if>
+        </where>
+    </select>
+
+
+    <select id="queryUserInfoListLikeByPhone" parameterType="cn.pluss.platform.entity.UserInfo"
+            resultType="cn.pluss.platform.entity.UserInfo">
+        SELECT * from tb_pluss_user_info
+        <where>
+            <if test="id!= null">
+                and id = #{id}
+            </if>
+            <if test="loginName!= null">
+                and loginName = #{loginName}
+            </if>
+            <if test="trueName!= null">
+                and trueName = #{trueName}
+            </if>
+            <if test="provinceCode!= null">
+                and provinceCode = #{provinceCode}
+            </if>
+            <if test="cityCode!= null">
+                and cityCode = #{cityCode}
+            </if>
+            <if test="sex!= null">
+                and sex = #{sex}
+            </if>
+            <if test="phone!= null">
+                and phone Like CONCAT(#{phone},'%')
+            </if>
+            <if test="email!= null">
+                and email = #{email}
+            </if>
+            <if test="status!= null">
+                and status = #{status}
+            </if>
+            <if test="password!= null">
+                and password = #{password}
+            </if>
+            <if test="creator!= null">
+                and creator = #{creator}
+            </if>
+            <if test="createTime!= null">
+                and createTime = #{createTime}
+            </if>
+            <if test="updator!= null">
+                and updator = #{updator}
+            </if>
+            <if test="updateTime!= null">
+                and updateTime = #{updateTime}
+            </if>
+            <if test="version!= null">
+                and version = #{version}
+            </if>
+            <if test="parentId!= null">
+                and parentId = #{parentId}
+            </if>
+            <if test="areaId!= null">
+                and areaId = #{areaId}
+            </if>
+            <if test="areaCode!= null">
+                and areaCode = #{areaCode}
+            </if>
+            <if test="source!= null">
+                and source = #{source}
+            </if>
+        </where>
+        order by id desc
+    </select>
+
+    <select id="selectMainUserInfo" resultType="cn.pluss.platform.entity.UserInfo">
+        SELECT ui.*
+        FROM tb_pluss_merchant_base_info mbi1
+        LEFT JOIN tb_pluss_merchant_base_info mbi2 ON mbi1.bindingCode = mbi2.bindingCode
+        LEFT JOIN tb_pluss_user_info ui ON mbi2.userId = ui.id
+        WHERE mbi1.userId = #{id}
+        AND LENGTH(ui.phone) &lt;= 11
+    </select>
+
+    <select id="selectMainUserInfoList" resultType="cn.pluss.platform.vo.UserInfoVO">
+        SELECT ui.id,mbi2.alias 'alias',
+               mbi2.isPushWxMessage as 'isPushWxMessage',
+               mbi2.merchantCode as 'merchantCode'
+        FROM tb_pluss_merchant_base_info mbi1
+        LEFT JOIN tb_pluss_merchant_base_info mbi2 ON (mbi1.bindingCode = mbi2.bindingCode OR mbi1.userId = mbi2.userId)
+        LEFT JOIN tb_pluss_user_info ui ON ui.id = mbi2.userId
+        WHERE mbi1.userId = #{id}
+        order by mbi2.createDt asc
+    </select>
+
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/UserIntegralMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/UserIntegralMapper.xml
new file mode 100644
index 0000000..c8c6937
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/UserIntegralMapper.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.UserIntegralMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.UserIntegral">
+        <id column="id" property="id" />
+        <result column="userId" property="userId" />
+        <result column="orderNumber" property="orderNumber" />
+        <result column="integral" property="integral" />
+        <result column="orderAmt" property="orderAmt" />
+        <result column="type" property="type" />
+        <result column="source" property="source" />
+        <result column="remark" property="remark" />
+        <result column="createTime" property="createTime" />
+    </resultMap>
+
+    <select id="list" resultType="cn.pluss.platform.other.JfShopIntegral">
+        select orderNumber,integral,createTime as grantDate,`type`
+        from  tb_pluss_user_integral where userId = #{userId} and `status` = 1
+        <if test="type != null and type != ''">
+            and type = #{type}
+        </if>
+        order by id desc
+    </select>
+
+    <select id="getCountIntegral" resultType="java.math.BigDecimal">
+        select IFNULL(SUM(integral),0) from tb_pluss_user_integral where userId = #{userId} and `status` = 1
+        <if test="date != null and date != ''">
+            and date_format(createTime, '%Y-%m') = #{date}
+        </if>
+        <if test="auditDate != null and auditDate != ''">
+            and createTime >= #{auditDate}
+        </if>
+    </select>
+
+    <select id="pageInfo" parameterType="cn.pluss.platform.entity.UserIntegral"
+            resultType="cn.pluss.platform.entity.UserIntegral">
+        select * from tb_pluss_user_integral
+        where status = '1'
+        <if test="entity.userId != null">
+            and userId = #{entity.userId}
+        </if>
+        <if test="entity.orderNumber != null and entity.orderNumber != ''">
+            and orderNumber = #{entity.orderNumber}
+        </if>
+        <if test="entity.type != null and entity.type != ''">
+            and type = #{entity.type}
+        </if>
+        <if test="entity.queryDate != null and entity.queryDate != ''">
+            and DATE_FORMAT(createTime,'%Y-%m') = #{entity.queryDate}
+        </if>
+        ORDER BY createTime desc
+    </select>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/UserIntegralUseMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/UserIntegralUseMapper.xml
new file mode 100644
index 0000000..3ff64c1
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/UserIntegralUseMapper.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.UserIntegralUseMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.UserIntegralUse">
+        <id column="id" property="id" />
+        <result column="name" property="name" />
+        <result column="userId" property="userId" />
+        <result column="integral" property="integral" />
+        <result column="status" property="status" />
+        <result column="remark" property="remark" />
+        <result column="orderNumber" property="orderNumber" />
+        <result column="handleTime" property="handleTime" />
+        <result column="createTime" property="createTime" />
+    </resultMap>
+
+    <select id="getUseIntegral" resultType="java.math.BigDecimal">
+        SELECT IFNULL(sum(integral),0.00)
+        FROM tb_pluss_user_integral_use WHERE userId = #{userId} AND `status` = '2'
+        <if test="date != null and date != ''">
+            and date_format(createTime, '%Y-%m') = #{date}
+        </if>
+    </select>
+
+    <select id="pageInfo" parameterType="cn.pluss.platform.entity.UserIntegralUse"
+            resultType="cn.pluss.platform.entity.UserIntegralUse">
+        select * from tb_pluss_user_integral_use
+        where status = '2'
+        <if test="entity.userId != null">
+            and userId = #{entity.userId}
+        </if>
+        <if test="entity.orderNumber != null and entity.orderNumber != ''">
+            and orderNumber = #{entity.orderNumber}
+        </if>
+        <if test="entity.name != null and entity.name != ''">
+            and name like CONCAT('%',#{entity.name},'%')
+        </if>
+        ORDER BY createTime desc
+    </select>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/UserIpRecordMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/UserIpRecordMapper.xml
new file mode 100644
index 0000000..2aee911
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/UserIpRecordMapper.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.UserIpRecordMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.UserIpRecord">
+        <id column="id" property="id" />
+        <result column="userId" property="userId" />
+        <result column="regIp" property="regIp" />
+        <result column="regTime" property="regTime" />
+        <result column="auditIp" property="auditIp" />
+        <result column="auditTime" property="auditTime" />
+        <result column="createTime" property="createTime" />
+        <result column="updateTime" property="updateTime" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/UserLevelMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/UserLevelMapper.xml
new file mode 100644
index 0000000..a82222f
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/UserLevelMapper.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.UserLevelMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.UserLevel">
+        <id column="id" property="id" />
+        <result column="roleCode" property="roleCode" />
+        <result column="levelName" property="levelName" />
+        <result column="levelCode" property="levelCode" />
+        <result column="rate" property="rate" />
+        <result column="quota" property="quota" />
+        <result column="directRate" property="directRate" />
+        <result column="indirectRate" property="indirectRate" />
+        <result column="t2Scale" property="t2Scale" />
+        <result column="t3Scale" property="t3Scale" />
+        <result column="dividScale" property="dividScale" />
+        <result column="areaScale" property="areaScale" />
+        <result column="createTime" property="createTime" />
+    </resultMap>
+
+    <select id="getLevelInfoByRole" resultType="cn.pluss.platform.vo.UserLevelVO">
+        SELECT levelName,roleCode,quota,rate,levelCode from tb_pluss_user_level
+        where roleCode = #{roleCode}
+        <if test="type == 1">
+            and roleCode != 'LV10'
+        </if>
+    </select>
+
+    <select id="getNowQuotaLevel" resultType="cn.pluss.platform.entity.UserLevel">
+        SELECT * from tb_pluss_user_level WHERE quota <![CDATA[<=]]> #{flow} ORDER BY quota desc limit 1;
+    </select>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/UserManageProfitMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/UserManageProfitMapper.xml
new file mode 100644
index 0000000..0bff4d8
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/UserManageProfitMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.UserManageProfitMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.UserManageProfit">
+        <id column="id" property="id" />
+        <result column="userId" property="userId" />
+        <result column="parentId" property="parentId" />
+        <result column="roleCode" property="roleCode" />
+        <result column="levelCode" property="levelCode" />
+        <result column="t2Flow" property="t2Flow" />
+        <result column="t3Flow" property="t3Flow" />
+        <result column="t2Profit" property="t2Profit" />
+        <result column="t3Profit" property="t3Profit" />
+        <result column="createTime" property="createTime" />
+        <result column="profitDate" property="profitDate" />
+        <result column="profitMonth" property="profitMonth" />
+        <result column="remark" property="remark" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/UserMultipleRemarkMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/UserMultipleRemarkMapper.xml
new file mode 100644
index 0000000..97b258c
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/UserMultipleRemarkMapper.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.UserMultipleRemarkMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.UserMultipleRemark">
+        <id column="id" property="id" />
+        <result column="userId" property="userId" />
+        <result column="code" property="code" />
+        <result column="remark" property="remark" />
+        <result column="createTime" property="createTime" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/UserOrgan-sqlmap.xml b/pluss-dao-bundle/src/main/resources/mapper/UserOrgan-sqlmap.xml
new file mode 100644
index 0000000..98e2c06
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/UserOrgan-sqlmap.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+			"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="cn.pluss.platform.mapper.UserOrganMapper">
+
+	   	<insert id="saveUserOrgan" parameterType="cn.pluss.platform.entity.UserOrgan">
+        	insert into tb_pluss_user_organ(userId,organCode,organName,organTypeCode,organTypeName)VALUES(#{userId},#{organCode},#{organName},#{organTypeCode},#{organTypeName})
+    	</insert>
+
+	   	<insert id="saveUserOrganBatch">
+        	insert into tb_pluss_user_organ(userId,organCode,organName,organTypeCode,organTypeName) VALUES 
+    			<foreach collection="list" item="item" index="index" separator=",">
+			(#{userId},#{organCode},#{organName},#{organTypeCode},#{organTypeName}		)
+				</foreach>
+    	</insert>
+
+		<select id="queryUserOrgan" parameterType="cn.pluss.platform.entity.UserOrgan" resultType="cn.pluss.platform.entity.UserOrgan">
+			SELECT * from tb_pluss_user_organ 
+				<where> 
+					<if test="id!= null"> 
+					 	and id = #{id}
+					 </if> 
+					<if test="userId!= null"> 
+					 	and userId = #{userId}
+					 </if> 
+					<if test="organCode!= null"> 
+					 	and organCode = #{organCode}
+					 </if> 
+					<if test="organName!= null"> 
+					 	and organName = #{organName}
+					 </if> 
+					<if test="organTypeCode!= null"> 
+					 	and organTypeCode = #{organTypeCode}
+					 </if> 
+					<if test="organTypeName!= null"> 
+					 	and organTypeName = #{organTypeName}
+					 </if> 
+				 </where> 
+		</select>
+
+		<select id="queryUserOrganList" parameterType="cn.pluss.platform.entity.UserOrgan" resultType="cn.pluss.platform.entity.UserOrgan">
+			SELECT * from tb_pluss_user_organ 
+				<where> 
+					<if test="id!= null"> 
+					 and 	id = #{id}
+					 </if> 
+					<if test="userId!= null"> 
+					 and 	userId = #{userId}
+					 </if> 
+					<if test="organCode!= null"> 
+					 and 	organCode = #{organCode}
+					 </if> 
+					<if test="organName!= null"> 
+					 and 	organName = #{organName}
+					 </if> 
+					<if test="organTypeCode!= null"> 
+					 and 	organTypeCode = #{organTypeCode}
+					 </if> 
+					<if test="organTypeName!= null"> 
+					 and 	organTypeName = #{organTypeName}
+					 </if> 
+				 </where> 
+		</select>
+
+		<update id="updateUserOrgan" parameterType="cn.pluss.platform.entity.UserOrgan" >
+			update tb_pluss_user_organ 
+				  <set> 
+					<if test="userId!= null"> 
+					 	userId = #{userId},
+					 </if> 
+					<if test="organCode!= null"> 
+					 	organCode = #{organCode},
+					 </if> 
+					<if test="organName!= null"> 
+					 	organName = #{organName},
+					 </if> 
+					<if test="organTypeCode!= null"> 
+					 	organTypeCode = #{organTypeCode},
+					 </if> 
+					<if test="organTypeName!= null"> 
+					 	organTypeName = #{organTypeName}
+					 </if> 
+				</set>
+			where id=#{id} 
+		</update>
+
+		<delete id="deleteUserOrgan" parameterType="cn.pluss.platform.entity.UserOrgan" >
+			DELETE FROM tb_pluss_user_organ where id=#{id}
+		</delete>
+
+		<select id="queryUserOrganPage" parameterType="java.util.Map" resultType="cn.pluss.platform.entity.UserOrgan">
+			SELECT * from tb_pluss_user_organ 
+				<where> 
+					<if test="id!= null"> 
+					and id = #{id}
+					 </if> 
+					<if test="userId!= null"> 
+					and userId = #{userId}
+					 </if> 
+					<if test="organCode!= null"> 
+					and organCode = #{organCode}
+					 </if> 
+					<if test="organName!= null"> 
+					and organName = #{organName}
+					 </if> 
+					<if test="organTypeCode!= null"> 
+					and organTypeCode = #{organTypeCode}
+					 </if> 
+					<if test="organTypeName!= null"> 
+					and organTypeName = #{organTypeName}
+					 </if> 
+				 </where> 
+			order by id desc  limit #{pageSize}  offset  #{offset}  
+		</select>
+
+		<select id="queryUserOrganPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+			SELECT count(*) from tb_pluss_user_organ 
+					<where> 
+					<if test="id!= null"> 
+					 and id = #{id}
+					 </if> 
+					<if test="userId!= null"> 
+					 and userId = #{userId}
+					 </if> 
+					<if test="organCode!= null"> 
+					 and organCode = #{organCode}
+					 </if> 
+					<if test="organName!= null"> 
+					 and organName = #{organName}
+					 </if> 
+					<if test="organTypeCode!= null"> 
+					 and organTypeCode = #{organTypeCode}
+					 </if> 
+					<if test="organTypeName!= null"> 
+					 and organTypeName = #{organTypeName}
+					 </if> 
+				</where>
+		</select>
+
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/UserProfitMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/UserProfitMapper.xml
new file mode 100644
index 0000000..8d38a4f
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/UserProfitMapper.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.UserProfitMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.UserProfit">
+        <id column="id" property="id" />
+        <result column="userId" property="userId" />
+        <result column="parentId" property="parentId" />
+        <result column="roleCode" property="roleCode" />
+        <result column="teamTransFlow" property="teamTransFlow" />
+        <result column="ownTransFlow" property="ownTransFlow" />
+        <result column="directTransFlow" property="directTransFlow" />
+        <result column="totalProfitAmt" property="totalProfitAmt" />
+        <result column="directProfitAmt" property="directProfitAmt" />
+        <result column="indirectProfitAmt" property="indirectProfitAmt" />
+        <result column="otherProfitAmt" property="otherProfitAmt" />
+        <result column="t2ProfitAmt" property="t2ProfitAmt" />
+        <result column="t3ProfitAmt" property="t3ProfitAmt" />
+        <result column="dividProfitAmt" property="dividProfitAmt" />
+        <result column="areaFlow" property="areaFlow" />
+        <result column="areaProfitAmt" property="areaProfitAmt" />
+        <result column="createTime" property="createTime" />
+        <result column="profitDate" property="profitDate" />
+        <result column="remarks" property="remarks" />
+        <result column="transNum" property="transNum" />
+    </resultMap>
+
+    <select id="selectLevelFlow" resultType="cn.pluss.platform.entity.UserProfit">
+        SELECT SUM(teamTransFlow) as teamTransFlow,userId FROM tb_pluss_user_profit
+        WHERE profitMonth = #{date} AND teamTransFlow != 0 and roleCode != 'ZY_BST' AND levelCode not in ('LV9','LV10') GROUP BY userId
+    </select>
+
+    <select id="selectPageSubTeamData" resultType="cn.pluss.platform.vo.UserAppVO">
+        SELECT
+            IFNULL(ua.userName, SUBSTR(ui.phone, 1, 11)) `userName`, ua.userId, ua.logo,
+               SUBSTR(ui.phone, 1, 11) phone, ua.levelCode, IFNULL(t2.lastMonthTranFee, 0.00) lastMonthTransFee,
+            IFNULL(t2.monthTransFee, 0.00) monthTransFee, ua.createDt, ua.createDt createTime, ua.inviteNum,
+            IF(t2.monthTransFee = 0.00 || t2.monthTransFee IS NULL, 0, IF(t2.lastMonthTranFee = 0.00 || t2.lastMonthTranFee IS NULL, 1, ROUND((t2.monthTransFee / t2.lastMonthTranFee), 2))) rate,
+            IF((t2.monthTransFee / t2.lastMonthTranFee) &lt; 1, 2, 1) rateFlag
+        FROM tb_pluss_user_app ua LEFT JOIN
+            tb_pluss_user_info ui ON ui.id = ua.userId
+        LEFT JOIN (
+            SELECT
+                t.userId,
+                SUM(IF(t.profitMonth = DATE_FORMAT(CURRENT_DATE, '%Y-%m'), t.monthTransFee, 0)) monthTransFee,
+                SUM(IF(t.profitMonth = DATE_FORMAT(DATE_SUB(CURRENT_DATE, INTERVAL 1 MONTH), '%Y-%m'), t.monthTransFee, 0)) lastMonthTranFee
+            FROM (
+                SELECT SUM(up.ownTransFlow + up.teamTransFlow) monthTransFee, profitMonth, up.userId
+                FROM tb_pluss_user_profit up
+                WHERE parentId = #{userId} AND profitMonth IN (DATE_FORMAT(CURRENT_DATE, '%Y-%m'), DATE_FORMAT(DATE_SUB(CURRENT_DATE, INTERVAL 1 MONTH), '%Y-%m'))
+                GROUP BY profitMonth, up.userId
+            ) t GROUP BY t.userId
+        ) t2 ON ua.userId = t2.userId WHERE ua.parentId = #{userId} AND ua.userType IN ('agent', 'promoter') AND ui.loginName NOT LIKE '%@%'
+        <if test="userName != null and userName != ''">
+            AND ua.userName LIKE CONCAT('%', #{userName}, '%')
+        </if>
+        ORDER BY ua.createDt DESC
+    </select>
+
+
+    <select id="pageData" resultType="cn.pluss.platform.entity.UserProfit">
+        SELECT up.*,ua.userName from tb_pluss_user_profit up left join tb_pluss_user_app ua on up.userId = ua.userId
+        <where>
+            up.profitDate = #{entity.profitDate}
+            <if test="entity.userId != null">
+                and up.userId = #{entity.userId}
+            </if>
+            <if test="entity.parentId != null">
+                and up.parentId = #{entity.parentId}
+            </if>
+        </where>
+        ORDER BY up.teamTransFlow DESC, up.id desc
+    </select>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/UserPushIdMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/UserPushIdMapper.xml
new file mode 100644
index 0000000..eb13ad7
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/UserPushIdMapper.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="cn.pluss.platform.mapper.UserPushIdMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.UserPushId">
+        <id column="id" property="id" />
+        <result column="userId" property="userId" />
+        <result column="getuiClientId" property="getuiClientId" />
+        <result column="createTime" property="createTime" />
+        <result column="updateTime" property="updateTime" />
+    </resultMap>
+
+
+</mapper>
\ No newline at end of file
diff --git a/pluss-dao-bundle/src/main/resources/mapper/UserRewardFlowMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/UserRewardFlowMapper.xml
new file mode 100644
index 0000000..ad6095b
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/UserRewardFlowMapper.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.UserRewardFlowMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.UserRewardFlow">
+        <id column="id" property="id" />
+        <result column="userId" property="userId" />
+        <result column="parentId" property="parentId" />
+        <result column="t2Flow" property="t2Flow" />
+        <result column="t3Flow" property="t3Flow" />
+        <result column="dividFlow" property="dividFlow" />
+        <result column="areaFlow" property="areaFlow" />
+        <result column="createTime" property="createTime" />
+        <result column="createDate" property="createDate" />
+        <result column="orderNumber" property="orderNumber" />
+    </resultMap>
+
+    <select id="listManageProfit" resultType="cn.pluss.platform.entity.UserManageProfit">
+        SELECT
+            a.userId,
+            a.parentId,
+            a.roleCode,
+            a.levelCode,
+            a.t2Flow,
+            a.t3Flow,
+            ROUND((a.t2Flow * (a.directRate / 10000) * a.t2Scale),2) AS t2Profit,
+            ROUND(( a.t3Flow * (a.indirectRate / 10000) * a.t3Scale ),2)AS t3Profit
+        FROM
+            (
+                SELECT
+                    rf.userId,
+                    rf.parentId,
+                    ua.roleCode,
+                    ua.levelCode,
+                    SUM( rf.t2Flow ) AS t2Flow,
+                    SUM( rf.t3Flow ) AS t3Flow,
+                    rf.createTime,
+                    ul.directRate,
+                    ul.indirectRate,
+                    ul.t2Scale,
+                    ul.t3Scale
+                FROM
+                    tb_pluss_user_reward_flow rf
+                        LEFT JOIN tb_pluss_user_app ua ON rf.userId = ua.userId
+                        LEFT JOIN tb_pluss_user_level ul ON ua.levelCode = ul.levelCode
+                WHERE createDate = #{date} AND rf.`status` = 1
+                GROUP BY
+                    userId,
+                    createDate
+            ) a
+    </select>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/UserRewardInfoMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/UserRewardInfoMapper.xml
new file mode 100644
index 0000000..23193b2
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/UserRewardInfoMapper.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.UserRewardInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.UserRewardInfo">
+        <id column="id" property="id" />
+        <result column="userId" property="userId" />
+        <result column="phone" property="phone" />
+        <result column="areaLevel" property="areaLevel" />
+        <result column="areaNo" property="areaNo" />
+        <result column="areaName" property="areaName" />
+        <result column="status" property="status" />
+        <result column="reId" property="reId" />
+        <result column="rName" property="rName" />
+        <result column="createTime" property="createTime" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/UserRoleMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/UserRoleMapper.xml
new file mode 100644
index 0000000..58ce968
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/UserRoleMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.UserRoleMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.UserRole">
+        <id column="id" property="id" />
+        <result column="roleName" property="roleName" />
+        <result column="roleCode" property="roleCode" />
+        <result column="createTime" property="createTime" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/UserTaskMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/UserTaskMapper.xml
new file mode 100644
index 0000000..35a5ce1
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/UserTaskMapper.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.UserTaskMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.UserTask">
+        <id column="id" property="id" />
+        <result column="userId" property="userId" />
+        <result column="taskCode" property="taskCode" />
+        <result column="status" property="status" />
+        <result column="type" property="type" />
+        <result column="arg0" property="arg0" />
+        <result column="arg1" property="arg1" />
+        <result column="createTime" property="createTime" />
+        <result column="updateTime" property="updateTime" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/UserVoiceMapper.xml b/pluss-dao-bundle/src/main/resources/mapper/UserVoiceMapper.xml
new file mode 100644
index 0000000..c5e000f
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/UserVoiceMapper.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.pluss.platform.mapper.UserVoiceMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.pluss.platform.entity.UserVoice">
+        <id column="id" property="id" />
+        <result column="userId" property="userId" />
+        <result column="paySuccess" property="paySuccess" />
+        <result column="payCancel" property="payCancel" />
+        <result column="memberCharge" property="memberCharge" />
+        <result column="memberConsume" property="memberConsume" />
+        <result column="deliveryOrder" property="deliveryOrder" />
+        <result column="storeOrder" property="storeOrder" />
+        <result column="urge" property="urge" />
+    </resultMap>
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/WxBankCode-sqlmap.xml b/pluss-dao-bundle/src/main/resources/mapper/WxBankCode-sqlmap.xml
new file mode 100644
index 0000000..f4d7aa6
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/WxBankCode-sqlmap.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+			"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="cn.pluss.platform.mapper.WxBankCodeMapper">
+
+	   	<insert id="saveWxBankCode" parameterType="cn.pluss.platform.entity.WxBankCode">
+        	insert into tb_pluss_wx_bank_code(bankName,bankCode,remark)VALUES(#{bankName},#{bankCode},#{remark})
+    	</insert>
+
+	   	<insert id="saveWxBankCodeBatch">
+        	insert into tb_pluss_wx_bank_code(bankName,bankCode,remark) VALUES 
+    			<foreach collection="list" item="item" index="index" separator=",">
+			(#{bankName},#{bankCode},#{remark}		)
+				</foreach>
+    	</insert>
+
+		<select id="queryWxBankCode" parameterType="cn.pluss.platform.entity.WxBankCode" resultType="cn.pluss.platform.entity.WxBankCode">
+			SELECT * from tb_pluss_wx_bank_code 
+				<where> 
+					<if test="id!= null"> 
+					 	and id = #{id}
+					 </if> 
+					<if test="bankName!= null"> 
+					 	and bankName = #{bankName}
+					 </if> 
+					<if test="bankCode!= null"> 
+					 	and bankCode = #{bankCode}
+					 </if> 
+					<if test="remark!= null"> 
+					 	and remark = #{remark}
+					 </if> 
+				 </where> 
+		</select>
+
+		<select id="queryWxBankCodeList" parameterType="cn.pluss.platform.entity.WxBankCode" resultType="cn.pluss.platform.entity.WxBankCode">
+			SELECT * from tb_pluss_wx_bank_code 
+				<where> 
+					<if test="id!= null"> 
+					 and 	id = #{id}
+					 </if> 
+					<if test="bankName!= null"> 
+					 and 	bankName = #{bankName}
+					 </if> 
+					<if test="bankCode!= null"> 
+					 and 	bankCode = #{bankCode}
+					 </if> 
+					<if test="remark!= null"> 
+					 and 	remark = #{remark}
+					 </if> 
+				 </where> 
+		</select>
+
+		<update id="updateWxBankCode" parameterType="cn.pluss.platform.entity.WxBankCode" >
+			update tb_pluss_wx_bank_code 
+				  <set> 
+					<if test="bankName!= null"> 
+					 	bankName = #{bankName},
+					 </if> 
+					<if test="bankCode!= null"> 
+					 	bankCode = #{bankCode},
+					 </if> 
+					<if test="remark!= null"> 
+					 	remark = #{remark}
+					 </if> 
+				</set>
+			where id=#{id} 
+		</update>
+
+		<delete id="deleteWxBankCode" parameterType="cn.pluss.platform.entity.WxBankCode" >
+			DELETE FROM tb_pluss_wx_bank_code where id=#{id}
+		</delete>
+
+		<select id="queryWxBankCodePage" parameterType="java.util.Map" resultType="cn.pluss.platform.entity.WxBankCode">
+			SELECT * from tb_pluss_wx_bank_code 
+				<where> 
+					<if test="id!= null"> 
+					and id = #{id}
+					 </if> 
+					<if test="bankName!= null"> 
+					and bankName = #{bankName}
+					 </if> 
+					<if test="bankCode!= null"> 
+					and bankCode = #{bankCode}
+					 </if> 
+					<if test="remark!= null"> 
+					and remark = #{remark}
+					 </if> 
+				 </where> 
+			order by id desc  limit #{pageSize}  offset  #{offset}  
+		</select>
+
+		<select id="queryWxBankCodePageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+			SELECT count(*) from tb_pluss_wx_bank_code 
+					<where> 
+					<if test="id!= null"> 
+					 and id = #{id}
+					 </if> 
+					<if test="bankName!= null"> 
+					 and bankName = #{bankName}
+					 </if> 
+					<if test="bankCode!= null"> 
+					 and bankCode = #{bankCode}
+					 </if> 
+					<if test="remark!= null"> 
+					 and remark = #{remark}
+					 </if> 
+				</where>
+		</select>
+
+</mapper>
diff --git a/pluss-dao-bundle/src/main/resources/mapper/WxCityInfo-sqlmap.xml b/pluss-dao-bundle/src/main/resources/mapper/WxCityInfo-sqlmap.xml
new file mode 100644
index 0000000..062942d
--- /dev/null
+++ b/pluss-dao-bundle/src/main/resources/mapper/WxCityInfo-sqlmap.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+			"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="cn.pluss.platform.mapper.WxCityInfoMapper">
+
+	   	<insert id="saveWxCityInfo" parameterType="cn.pluss.platform.entity.WxCityInfo">
+        	insert into tb_pluss_wx_city_info(cityCode,cityName)VALUES(#{cityCode},#{cityName})
+    	</insert>
+
+	   	<insert id="saveWxCityInfoBatch">
+        	insert into tb_pluss_wx_city_info(cityCode,cityName) VALUES 
+    			<foreach collection="list" item="item" index="index" separator=",">
+			(#{cityCode},#{cityName}		)
+				</foreach>
+    	</insert>
+
+		<select id="queryWxCityInfo" parameterType="cn.pluss.platform.entity.WxCityInfo" resultType="cn.pluss.platform.entity.WxCityInfo">
+			SELECT * from tb_pluss_wx_city_info 
+				<where> 
+					<if test="id!= null"> 
+					 	and id = #{id}
+					 </if> 
+					<if test="cityCode!= null"> 
+					 	and cityCode = #{cityCode}
+					 </if>
+					<if test="cityName!= null"> 
+					 	and cityName LIKE CONCAT(#{cityName},"%")
+					 </if> 
+				 </where> 
+		</select>
+
+		<select id="queryWxCityInfoList" parameterType="cn.pluss.platform.entity.WxCityInfo" resultType="cn.pluss.platform.entity.WxCityInfo">
+			SELECT * from tb_pluss_wx_city_info 
+				<where> 
+					<if test="id!= null"> 
+					 and 	id = #{id}
+					 </if> 
+					<if test="cityCode!= null"> 
+					 and 	cityCode = #{cityCode}
+					 </if> 
+					<if test="cityName!= null"> 
+					 and 	cityName = #{cityName}
+					 </if> 
+				 </where> 
+		</select>
+
+		<update id="updateWxCityInfo" parameterType="cn.pluss.platform.entity.WxCityInfo" >
+			update tb_pluss_wx_city_info 
+				  <set> 
+					<if test="cityCode!= null"> 
+					 	cityCode = #{cityCode},
+					 </if> 
+					<if test="cityName!= null"> 
+					 	cityName = #{cityName}
+					 </if> 
+				</set>
+			where id=#{id} 
+		</update>
+
+		<delete id="deleteWxCityInfo" parameterType="cn.pluss.platform.entity.WxCityInfo" >
+			DELETE FROM tb_pluss_wx_city_info where id=#{id}
+		</delete>
+
+		<select id="queryWxCityInfoPage" parameterType="java.util.Map" resultType="cn.pluss.platform.entity.WxCityInfo">
+			SELECT * from tb_pluss_wx_city_info 
+				<where> 
+					<if test="id!= null"> 
+					and id = #{id}
+					 </if> 
+					<if test="cityCode!= null"> 
+					and cityCode = #{cityCode}
+					 </if> 
+					<if test="cityName!= null"> 
+					and cityName = #{cityName}
+					 </if> 
+				 </where> 
+			order by id desc  limit #{pageSize}  offset  #{offset}  
+		</select>
+
+		<select id="queryWxCityInfoPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+			SELECT count(*) from tb_pluss_wx_city_info 
+					<where> 
+					<if test="id!= null"> 
+					 and id = #{id}
+					 </if> 
+					<if test="cityCode!= null"> 
+					 and cityCode = #{cityCode}
+					 </if> 
+					<if test="cityName!= null"> 
+					 and cityName = #{cityName}
+					 </if> 
+				</where>
+		</select>
+
+</mapper>
diff --git a/pluss-manage-page/autoStart.sh b/pluss-manage-page/autoStart.sh
new file mode 100644
index 0000000..0b7b844
--- /dev/null
+++ b/pluss-manage-page/autoStart.sh
@@ -0,0 +1,31 @@
+while true
+do
+    ONE='one'
+    ONE_FILE='./one/manage.war'
+    ONE_TIME=$(stat -c %Y $ONE_FILE)
+
+    ANOTHER='another'
+    ANOTHER_FILE='./another/manage.war'
+    ANOTHER_TIME=$(stat -c %Y $ANOTHER_FILE)
+
+    if [ "$ONE_TIME" -gt "$ANOTHER_TIME" ]
+    then
+        FILE_NAME="$ONE_FILE"
+        FOLD="$ONE"
+    else
+        FILE_NAME="$ANOTHER_FILE"
+        FOLD="$ANOTHER"
+    fi
+
+    echo "最新的文件是${FILE_NAME}"
+    echo "最新的文件夹是${FOLD}"
+
+    # 先操作7002的端口
+    proc70021=$(pgrep -f "${ONE_FILE} --spring.profiles.active=prod --server.port=7002$")
+    proc70022=$(pgrep -f "${ANOTHER_FILE} --spring.profiles.active=prod --server.port=7002$")
+    if [ "$proc70021"x == "x" ] && [ "$proc70022"x == "x" ] ; then
+        ./manageStart7002.sh $FOLD
+    fi
+
+    sleep 30
+done
\ No newline at end of file
diff --git a/pluss-manage-page/pom.xml b/pluss-manage-page/pom.xml
new file mode 100644
index 0000000..5a1a8ca
--- /dev/null
+++ b/pluss-manage-page/pom.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>pluss-parent</artifactId>
+        <groupId>cn.pluss.platform</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>pluss-manage-page</artifactId>
+    <packaging>war</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>cn.pluss.platform</groupId>
+            <artifactId>pluss-service-bundle</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-tomcat</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <!--jsp支持 start -->
+        <dependency>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <artifactId>tomcat-embed-jasper</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jstl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.taglibs</groupId>
+            <artifactId>taglibs-standard-impl</artifactId>
+            <version>1.2.5</version>
+        </dependency>
+
+<!--        <dependency>-->
+<!--            <groupId>org.apache.shiro</groupId>-->
+<!--            <artifactId>shiro-spring</artifactId>-->
+<!--            <version>1.3.2</version>-->
+<!--        </dependency>-->
+
+        <dependency>
+            <groupId>com.alipay.sdk</groupId>
+            <artifactId>alipay-sdk-java</artifactId>
+            <version>4.16.21.ALL</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.auth0</groupId>
+            <artifactId>java-jwt</artifactId>
+            <version>3.4.0</version>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <finalName>manage</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+                <excludes>
+                    <exclude>static/**</exclude>
+                </excludes>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>false</filtering>
+                <includes>
+                    <include>static/**</include>
+                </includes>
+            </resource>
+
+            <!--2022-07-22 add-->
+        <!--    <resource>
+                <directory>src/main/webapp</directory>
+                <targetPath>META-INF/resources</targetPath>
+                <includes>
+                    <include>**/*.*</include>
+                </includes>
+            </resource>-->
+
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.7.0</version>
+                <configuration>
+                    <encoding>UTF-8</encoding>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>1.4.2.RELEASE</version>
+                <configuration>
+                    <mainClass>cn.pluss.platform.ManageApplication</mainClass>
+                    <outputDirectory>./</outputDirectory>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>3.2.0</version>
+                <configuration>
+                    <nonFilteredFileExtensions>
+                        <nonFilteredFileExtension>woff</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>woff2</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>eot</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>ttf</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>svg</nonFilteredFileExtension>
+                    </nonFilteredFileExtensions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/ManageApplication.java b/pluss-manage-page/src/main/java/cn/pluss/platform/ManageApplication.java
new file mode 100644
index 0000000..9db517f
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/ManageApplication.java
@@ -0,0 +1,29 @@
+package cn.pluss.platform;
+
+import org.mybatis.spring.annotation.MapperScan;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.web.servlet.MultipartAutoConfiguration;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+
+@MapperScan("cn.pluss.platform.mapper")
+@SpringBootApplication(exclude = MultipartAutoConfiguration.class)
+public class ManageApplication extends SpringBootServletInitializer {
+
+	private static final Logger logger = LoggerFactory.getLogger(ManageApplication.class);
+
+	public static void main(String[] args) {
+		SpringApplication.run(ManageApplication.class, args);
+		logger.info("ManageApplication Service Start Success");
+	}
+
+	@Override
+	protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
+		return builder.sources(ManageApplication.class);
+	}
+
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/annotation/OpLog.java b/pluss-manage-page/src/main/java/cn/pluss/platform/annotation/OpLog.java
new file mode 100644
index 0000000..63f9ca5
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/annotation/OpLog.java
@@ -0,0 +1,38 @@
+package cn.pluss.platform.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @author DJH
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface OpLog {
+
+    /**
+     * 操作日志code
+     * @return  操作code
+     */
+    String opCode() default "";
+
+    /**
+     * 操作日志-详情
+     * @return  操作详情
+     */
+    String opDetail() default "";
+
+    /**
+     * 被操作人的用户id字段名称
+     * @return
+     */
+    String opUserId() default "";
+
+    /**
+     * 操作日志名称
+     * @return  操作名称
+     */
+    String opName() default "";
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/annotation/PassToken.java b/pluss-manage-page/src/main/java/cn/pluss/platform/annotation/PassToken.java
new file mode 100644
index 0000000..2e9adab
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/annotation/PassToken.java
@@ -0,0 +1,12 @@
+package cn.pluss.platform.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.METHOD, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface PassToken {
+    boolean required() default true;
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/annotation/UserLoginToken.java b/pluss-manage-page/src/main/java/cn/pluss/platform/annotation/UserLoginToken.java
new file mode 100644
index 0000000..55761ee
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/annotation/UserLoginToken.java
@@ -0,0 +1,12 @@
+package cn.pluss.platform.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.METHOD, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface UserLoginToken {
+    boolean required() default true;
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/aop/OpLogAspect.java b/pluss-manage-page/src/main/java/cn/pluss/platform/aop/OpLogAspect.java
new file mode 100644
index 0000000..15204f7
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/aop/OpLogAspect.java
@@ -0,0 +1,90 @@
+package cn.pluss.platform.aop;
+
+import cn.pluss.platform.annotation.OpLog;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.entity.OperationRecord;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.operationRecord.OperationRecordService;
+import cn.pluss.platform.userApp.UserAppService;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.extern.slf4j.Slf4j;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.AfterReturning;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+import java.lang.reflect.Method;
+
+/**
+ * 因为登录注册，以及忘记密码的时候，没有token，所以这三个操作的操作日志不通过注解实现
+ * 保存APP操作日志，取请求头中的用户信息
+ */
+@Slf4j
+@Aspect
+@Component
+public class OpLogAspect {
+
+    @Autowired
+    private OperationRecordService opRecordService;
+
+    @Autowired
+    private UserAppService userAppService;
+
+    // 定义切点
+    // 记录后台接口的操作记录
+    // 拦截Controller所在的包
+    @Pointcut("execution(* cn.pluss.platform.controller..*.*(..)) && @annotation(cn.pluss.platform.annotation.OpLog))")
+    public void executionService() {
+    }
+
+
+    @AfterReturning(returning="rvt", value = "executionService()")
+    public void after(JoinPoint point, Object rvt) {
+        RequestAttributes attributes = RequestContextHolder.getRequestAttributes();
+        HttpServletRequest request;
+        if (attributes != null) {
+            request = ((ServletRequestAttributes) attributes).getRequest();
+        } else {
+            log.warn("未获取到request");
+            return;
+        }
+
+        MethodSignature signature = (MethodSignature) point.getSignature();
+        Method method = signature.getMethod();
+        OpLog annotation = method.getAnnotation(OpLog.class);
+
+        String opUserId = request.getParameter(annotation.opUserId());
+
+        String userId = request.getHeader("userId");
+
+        OperationRecord opRecord = new OperationRecord();
+        opRecord.setDictValue(annotation.opCode());
+        opRecord.setRemark(annotation.opDetail());
+        opRecord.setOperator(userId);
+        opRecord.setUserId(opUserId);
+
+        if (rvt instanceof Result) {
+            Object data = ((Result<?>) rvt).getData();
+            try {
+                JSONObject jsonObject = (JSONObject) JSON.toJSON(data);
+                String orderNumber = jsonObject.getString("orderNumber");
+                JSONObject extra = new JSONObject();
+                extra.put("orderNumber", orderNumber);
+                opRecord.setExtension(extra);
+            } catch (Exception ignored) {
+            }
+        }
+
+        opRecordService.save(opRecord);
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/config/WebConfig.java b/pluss-manage-page/src/main/java/cn/pluss/platform/config/WebConfig.java
new file mode 100644
index 0000000..66234de
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/config/WebConfig.java
@@ -0,0 +1,95 @@
+package cn.pluss.platform.config;
+
+import cn.pluss.platform.interceptor.AuthenticationInterceptor;
+import cn.pluss.platform.interceptor.RequestInfoInterceptor;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.serializer.SerializeConfig;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.alibaba.fastjson.serializer.ToStringSerializer;
+import com.alibaba.fastjson.support.config.FastJsonConfig;
+import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.MediaType;
+import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.List;
+
+@Configuration
+@EnableScheduling
+public class WebConfig implements WebMvcConfigurer {
+
+    // 解决跨域问题
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+        registry.addMapping("/**").allowedMethods("*").allowedOrigins("*").allowedHeaders("*");
+    }
+
+    @Bean
+    public AuthenticationInterceptor authenticationInterceptor() {
+        return new AuthenticationInterceptor();
+    }
+
+    // 添加拦截器
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(new RequestInfoInterceptor());
+        registry.addInterceptor(authenticationInterceptor());
+    }
+
+    @Override
+    public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
+        converters.clear();
+        converters.add(getFastJsonConverter());
+    }
+
+    @Bean
+    public FastJsonHttpMessageConverter getFastJsonConverter() {
+        // 初始化转换器
+        FastJsonHttpMessageConverter fastConverter = new FastJsonHttpMessageConverter();
+        // 初始化一个转换器配置
+        FastJsonConfig fastJsonConfig = new FastJsonConfig();
+        JSON.DEFFAULT_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss";
+        fastJsonConfig.setSerializerFeatures(SerializerFeature.BrowserCompatible,
+                SerializerFeature.PrettyFormat,
+                SerializerFeature.WriteNullStringAsEmpty,
+                SerializerFeature.WriteDateUseDateFormat,
+                SerializerFeature.DisableCircularReferenceDetect);
+        //解决Long转json精度丢失的问题
+        SerializeConfig serializeConfig = SerializeConfig.getGlobalInstance();
+        serializeConfig.put(BigInteger.class, ToStringSerializer.instance);
+        serializeConfig.put(Long.class, ToStringSerializer.instance);
+        serializeConfig.put(Long.TYPE, ToStringSerializer.instance);
+        fastJsonConfig.setSerializeConfig(serializeConfig);
+        // 将配置设置给转换器并添加到HttpMessageConverter转换器列表中
+        fastConverter.setFastJsonConfig(fastJsonConfig);
+
+        List<MediaType> supportedMediaTypes = new ArrayList<>();
+        supportedMediaTypes.add(MediaType.APPLICATION_JSON);
+        supportedMediaTypes.add(MediaType.APPLICATION_JSON_UTF8);
+        supportedMediaTypes.add(MediaType.APPLICATION_ATOM_XML);
+        supportedMediaTypes.add(MediaType.APPLICATION_FORM_URLENCODED);
+        supportedMediaTypes.add(MediaType.APPLICATION_OCTET_STREAM);
+        supportedMediaTypes.add(MediaType.APPLICATION_PDF);
+        supportedMediaTypes.add(MediaType.APPLICATION_RSS_XML);
+        supportedMediaTypes.add(MediaType.APPLICATION_XHTML_XML);
+        supportedMediaTypes.add(MediaType.APPLICATION_XML);
+        supportedMediaTypes.add(MediaType.IMAGE_GIF);
+        supportedMediaTypes.add(MediaType.IMAGE_JPEG);
+        supportedMediaTypes.add(MediaType.IMAGE_PNG);
+        supportedMediaTypes.add(MediaType.TEXT_EVENT_STREAM);
+        supportedMediaTypes.add(MediaType.TEXT_HTML);
+        supportedMediaTypes.add(MediaType.TEXT_MARKDOWN);
+        supportedMediaTypes.add(MediaType.TEXT_PLAIN);
+        supportedMediaTypes.add(MediaType.TEXT_XML);
+        fastConverter.setSupportedMediaTypes(supportedMediaTypes);
+
+        return fastConverter;
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/BaseController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/BaseController.java
new file mode 100644
index 0000000..27e8657
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/BaseController.java
@@ -0,0 +1,135 @@
+package cn.pluss.platform.controller;
+
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.entitiy.ShiroUser;
+import cn.pluss.platform.entity.RoleInfo;
+import cn.pluss.platform.entity.RoleUserInfo;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.entity.UserInfo;
+import cn.pluss.platform.roleInfo.RoleInfoService;
+import cn.pluss.platform.roleUserInfo.RoleUserInfoService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.userInfo.UserInfoService;
+import cn.pluss.platform.util.StringUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+
+public class BaseController<S extends IService<T>, T> extends BaseModelController<S, T> {
+
+    @Autowired
+    protected HttpServletRequest request;
+
+    @Autowired
+    protected UserInfoService uiService;
+
+    @Autowired
+    protected UserAppService uaService;
+
+    @Autowired
+    protected RoleUserInfoService ruiService;
+
+    @Autowired
+    protected RoleInfoService riService;
+    /**
+     * 获取登录用户信息
+     *
+     * @return
+     */
+    public ShiroUser queryCurrentShiroUser() {
+        try {
+            String userId = request.getHeader("userId");
+            UserInfo ui = uiService.getById(userId);
+            UserApp ua = new UserApp();
+            ua.setUserId(ui.getId());
+            ua = uaService.getOne(new QueryWrapper<>(ua));
+            ShiroUser shiroUser = new ShiroUser();
+            shiroUser.setUserType(ua.getUserType());
+            shiroUser.setId(ui.getId());
+            shiroUser.setStatus(ui.getStatus());
+            shiroUser.setLoginName(ui.getLoginName());
+            shiroUser.setStaffType(ua.getStaffType() + "");
+            shiroUser.setUserType(ua.getUserType());
+            shiroUser.setMerchantCode(ua.getMerchantCode());
+
+            return shiroUser;
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    /**
+     * 判断是否是管理员
+     *
+     * @return
+     */
+    public Boolean verifyUserRole() {
+        try {
+            String userId = request.getHeader("userId");
+            RoleUserInfo roleUserInfo = new RoleUserInfo();
+            roleUserInfo.setUserId(Long.parseLong(userId));
+            roleUserInfo = ruiService.getOne(new QueryWrapper<>(roleUserInfo));
+
+            RoleInfo roleInfo = new RoleInfo();
+            roleInfo.setId(roleUserInfo.getRoleId());
+            roleInfo = riService.getOne(new QueryWrapper<>(roleInfo));
+            return roleInfo.getName().equals("超级系统管理员");
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+
+    /**
+     * 读取request数据
+     *
+     * @param request
+     * @return
+     */
+    public String readRequestMsg(HttpServletRequest request) {
+        java.io.BufferedReader bis = null;
+        String line = null;
+        String result = "";
+        try {
+            bis = new java.io.BufferedReader(new java.io.InputStreamReader(
+                    request.getInputStream(), "UTF-8"));
+            while ((line = bis.readLine()) != null) {
+                result += line + "\r\n";
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                bis.close();
+            } catch (IOException e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+            }
+        }
+        return result;
+    }
+
+    /**
+     * 是否是管理员
+     */
+    public void getRole() {
+        Boolean bol = verifyUserRole();
+        if (bol) {
+            request.setAttribute("admin", "admin");
+        }
+    }
+
+    /**
+     * 不是管理员 获取的权限  是商户
+     */
+    public void getPermission() {
+        ShiroUser user = queryCurrentShiroUser();
+        if (StringUtil.isNotEmpty(user.getMerchantCode())) {
+            request.setAttribute("merchant", "merchant");
+        }
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/BaseNoModelController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/BaseNoModelController.java
new file mode 100644
index 0000000..346b1c9
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/BaseNoModelController.java
@@ -0,0 +1,136 @@
+package cn.pluss.platform.controller;
+
+import cn.pluss.platform.entitiy.ShiroUser;
+import cn.pluss.platform.entity.RoleInfo;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.entity.UserInfo;
+import cn.pluss.platform.exception.UnauthorizedException;
+import cn.pluss.platform.roleInfo.RoleInfoService;
+import cn.pluss.platform.roleUserInfo.RoleUserInfoService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.userInfo.UserInfoService;
+import cn.pluss.platform.util.StringUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.util.List;
+
+public class BaseNoModelController {
+
+    @Autowired
+    protected HttpServletRequest request;
+
+    @Autowired
+    protected UserInfoService uiService;
+
+    @Autowired
+    protected UserAppService uaService;
+
+    @Autowired
+    protected RoleUserInfoService ruiService;
+
+    @Autowired
+    protected RoleInfoService riService;
+    /**
+     * 获取登录用户信息
+     *
+     * @return
+     */
+    public ShiroUser queryCurrentShiroUser() {
+        String userId = request.getHeader("userId");
+        if (StringUtils.isEmpty(userId) || "null".equals(userId)) {
+            throw new UnauthorizedException("非法请求");
+        }
+
+        UserInfo ui = uiService.getById(userId);
+        UserApp ua = new UserApp();
+        ua.setUserId(ui.getId());
+
+        ShiroUser shiroUser = new ShiroUser();
+        shiroUser.setId(ui.getId());
+        shiroUser.setStatus(ui.getStatus());
+        shiroUser.setLoginName(ui.getLoginName());
+
+        ua = uaService.getOne(new QueryWrapper<>(ua));
+        if (ua == null) {
+            return shiroUser;
+        }
+
+        shiroUser.setUserType(ua.getUserType());
+        shiroUser.setStaffType(ua.getStaffType() + "");
+        shiroUser.setUserType(ua.getUserType());
+        shiroUser.setMerchantCode(ua.getMerchantCode());
+
+        return shiroUser;
+    }
+
+    /**
+     * 判断是否是管理员
+     *
+     * @return
+     */
+    public Boolean verifyUserRole() {
+        String userId = request.getHeader("userId");
+        UserInfo ui = uiService.getById(userId);
+        List<RoleInfo> roleNames = riService.getRoleNames(ui.getLoginName());
+        for (RoleInfo roleName : roleNames) {
+            if (roleName.getName().equals("超级系统管理员")) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+
+    /**
+     * 读取request数据
+     *
+     * @param request
+     * @return
+     */
+    public String readRequestMsg(HttpServletRequest request) {
+        java.io.BufferedReader bis = null;
+        String line = null;
+        String result = "";
+        try {
+            bis = new java.io.BufferedReader(new java.io.InputStreamReader(
+                    request.getInputStream(), "UTF-8"));
+            while ((line = bis.readLine()) != null) {
+                result += line + "\r\n";
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                bis.close();
+            } catch (IOException e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+            }
+        }
+        return result;
+    }
+
+    /**
+     * 是否是管理员
+     */
+    public void getRole() {
+        Boolean bol = verifyUserRole();
+        if (bol) {
+            request.setAttribute("admin", "admin");
+        }
+    }
+
+    /**
+     * 不是管理员 获取的权限  是商户
+     */
+    public void getPermission() {
+        ShiroUser user = queryCurrentShiroUser();
+        if (StringUtil.isNotEmpty(user.getMerchantCode())) {
+            request.setAttribute("merchant", "merchant");
+        }
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/DateTimeFormat/DateConverterConfig.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/DateTimeFormat/DateConverterConfig.java
new file mode 100644
index 0000000..7b81336
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/DateTimeFormat/DateConverterConfig.java
@@ -0,0 +1,64 @@
+package cn.pluss.platform.controller.DateTimeFormat;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.stereotype.Component;
+/**
+ * 
+ * @author yuchen
+ *
+ * @Description 
+ *
+ */
+@Component
+public class DateConverterConfig implements Converter<String, Date> {
+	private static final List<String> FORM_MARTS = new ArrayList<>(4);
+	static {
+		FORM_MARTS.add("yyyy-MM");
+        FORM_MARTS.add("yyyy-MM-dd");
+        FORM_MARTS.add("yyyy-MM-dd hh:mm");
+        FORM_MARTS.add("yyyy-MM-dd hh:mm:ss");
+	}
+	
+	@Override
+	public Date convert(String source) {
+		 String value = source.trim();
+	        if ("".equals(value)) {
+	            return null;
+	        }
+	        if(source.matches("^\\d{4}-\\d{1,2}$")){
+	            return parseDate(source, FORM_MARTS.get(0));
+	        }else if(source.matches("^\\d{4}-\\d{1,2}-\\d{1,2}$")){
+	            return parseDate(source, FORM_MARTS.get(1));
+	        }else if(source.matches("^\\d{4}-\\d{1,2}-\\d{1,2} {1}\\d{1,2}:\\d{1,2}$")){
+	            return parseDate(source, FORM_MARTS.get(2));
+	        }else if(source.matches("^\\d{4}-\\d{1,2}-\\d{1,2} {1}\\d{1,2}:\\d{1,2}:\\d{1,2}$")){
+	            return parseDate(source, FORM_MARTS.get(3));
+	        }else {
+	            throw new IllegalArgumentException("Invalid boolean value '" + source + "'");
+	        }
+	}
+	
+	/**
+     * 格式化日期
+     * @param dateStr String 字符型日期
+     * @param format String 格式
+     * @return Date 日期
+     */
+    public  Date parseDate(String dateStr, String format) {
+        Date date=null;
+        try {
+            DateFormat dateFormat = new SimpleDateFormat(format);
+            date = dateFormat.parse(dateStr);
+        } catch (Exception e) {
+ 
+        }
+        return date;
+    }
+
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/MainController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/MainController.java
new file mode 100644
index 0000000..1fab8c5
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/MainController.java
@@ -0,0 +1,26 @@
+package cn.pluss.platform.controller;
+
+import org.springframework.boot.web.servlet.error.ErrorController;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+/**
+ * @author DJH
+ */
+@Controller
+public class MainController implements ErrorController {
+
+    @GetMapping({"/", "/index", "/error"})
+    public void index(HttpServletRequest request, HttpServletResponse response) throws IOException {
+        response.sendRedirect(request.getContextPath() + "/login");
+    }
+
+    @Override
+    public String getErrorPath() {
+        return "/index";
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/MerchantPlugin/MerchantPluginController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/MerchantPlugin/MerchantPluginController.java
new file mode 100644
index 0000000..2e08cb0
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/MerchantPlugin/MerchantPluginController.java
@@ -0,0 +1,78 @@
+package cn.pluss.platform.controller.MerchantPlugin;
+
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.entity.MerchantPlugin;
+import cn.pluss.platform.merchant.MerchantPluginService;
+import cn.pluss.platform.util.StringUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import org.apache.http.HttpRequest;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Controller
+@RequestMapping("/merchantPlugin")
+public class MerchantPluginController {
+
+    @Autowired
+    private MerchantPluginService merchantPluginService;
+
+    @GetMapping("/index")
+    public String index() {
+        return "merchantPlugin/merchantPluginList";
+    }
+
+    @GetMapping("/page")
+    @ResponseBody
+    public Map<String, Object> listMerchantPlugin(@RequestParam(defaultValue = "1") Integer currPage, Integer size,MerchantPlugin merchantPlugin) {
+        QueryWrapper<MerchantPlugin> queryWrapper = new QueryWrapper<>();
+        queryWrapper.last("limit " + ((currPage - 1) * size) + "10");
+        if (StringUtil.isNotEmpty(merchantPlugin.getUserId())){
+            queryWrapper.eq("userId",merchantPlugin.getUserId());
+        }
+        List<MerchantPlugin> merchantPluginList = merchantPluginService.list(queryWrapper);
+        for (MerchantPlugin m : merchantPluginList) {
+            if (StringUtil.isNotEmpty(m.getExtra())) {
+                m.setPosMerId(m.getExtra().getString("posMerId"));
+                m.setTermList(m.getExtra().getString("termList"));
+            }
+        }
+        int count = merchantPluginService.count();
+        Map<String, Object> result = new HashMap<>();
+        result.put("merchantPluginList", merchantPluginList);
+        result.put("count", count);
+        result.put("pageCount", StringUtil.getPageCount(count, size));
+        result.put("currPage", currPage);
+        result.put("code", 200);
+        return result;
+    }
+
+    @GetMapping(value = "/detail/{id}")
+    public String detail(@PathVariable(value = "id", required = false) Integer id, HttpServletRequest request) {
+        MerchantPlugin merchantPlugin = merchantPluginService.getById(id);
+        if (StringUtil.isNotEmpty(merchantPlugin.getExtra())) {
+            merchantPlugin.setPosMerId(merchantPlugin.getExtra().getString("posMerId"));
+            merchantPlugin.setTermList(merchantPlugin.getExtra().getString("termList"));
+        }
+        request.setAttribute("merchantPlugin", merchantPlugin);
+        return "merchantPlugin/detail";
+    }
+
+    @PostMapping("/updatePlugin")
+    @ResponseBody
+    public Result<MerchantPlugin> updatePlugin(@RequestBody MerchantPlugin merchantPlugin){
+        MerchantPlugin pluginServiceById = merchantPluginService.getById(merchantPlugin.getId());
+        pluginServiceById.getExtra().put("termList",merchantPlugin.getTermList());
+        merchantPluginService.updateById(pluginServiceById);
+        return ResultGenerator.genSuccessResult("修改成功！",null);
+    }
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/activityActivate/ActivityActivateController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/activityActivate/ActivityActivateController.java
new file mode 100644
index 0000000..79b8f93
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/activityActivate/ActivityActivateController.java
@@ -0,0 +1,300 @@
+package cn.pluss.platform.controller.activityActivate;
+
+import cn.pluss.platform.activityActivate.ActivityActivateService;
+import cn.pluss.platform.controller.BaseNoModelController;
+import cn.pluss.platform.entitiy.ShiroUser;
+import cn.pluss.platform.entity.ActivityActivate;
+import cn.pluss.platform.entity.MerchantBaseInfo;
+import cn.pluss.platform.entity.MerchantStore;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantStore.MerchantStoreService;
+import cn.pluss.platform.util.StringUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 
+ * @author Administrator
+ *
+ */
+@Controller
+@RequestMapping("activityActivate")
+public class ActivityActivateController extends BaseNoModelController {
+
+	private Integer PAGE_SIZE = 12;
+
+	@Autowired
+	private HttpServletRequest request;
+
+	@Autowired
+	private ActivityActivateService activityActivateService;
+
+	@Autowired
+	private MerchantBaseInfoService merchantBaseInfoService;
+
+	@Autowired
+	private MerchantStoreService merchantStoreService;
+
+	/**
+	 * 引导页
+	 * 
+	 * @return
+	 */
+	@RequestMapping(value = "/index", method = RequestMethod.GET)
+	public String index() {
+		getRole();
+		getPermission();
+		return "activityActivate/activityActivateList";
+	}
+
+	/**
+	 * 分页查询
+	 */
+	@RequestMapping(value = "/queryActivityActivateByPage", method = RequestMethod.POST)
+	@ResponseBody
+	public Map<String, Object> queryActivityActivateByPage(@RequestParam(defaultValue = "1") Integer currPage,
+			String name) {
+		Map<String, Object> map = new HashMap<>(16);
+		Map<String, Object> result = new HashMap<>(16);
+		Boolean bol = verifyUserRole();
+		// 是否是管理员进行数据筛选和权限标记
+		if (bol) {
+			result.put("admin", "admin");
+		} else {
+			ShiroUser shiroUser = queryCurrentShiroUser();
+			if (StringUtil.isNotEmpty(shiroUser.getMerchantCode())) {
+				result.put("merchant", "merchant");
+				map.put("merchantCode", shiroUser.getMerchantCode());
+			} else {
+				map.put("merchantCode", StringUtil.genRandomNum(33));
+			}
+		}
+		map.put("pageSize", PAGE_SIZE);
+		map.put("offset", (currPage - 1) * PAGE_SIZE);
+		map.put("name", name);
+		List<ActivityActivate> activityActivateList = null;
+		Integer count = 0 ;
+		if (bol){
+			activityActivateList = activityActivateService.queryActivityActivatePage(map);
+			count = activityActivateService.queryActivityActivatePageCount(map);
+		}else{
+			activityActivateList = activityActivateService.queryNoActivityActivatePage(map);
+			count = activityActivateService.queryNoActivityActivatePageCount(map);
+		}
+		result.put("activityActivateList", activityActivateList);
+		result.put("count", count);
+		result.put("pageCount", StringUtil.getPageCount(count, PAGE_SIZE));
+		result.put("currPage", currPage);
+		return result;
+	}
+
+	/**
+	 * 查询详情
+	 */
+	@RequestMapping(value = "/queryActivityActivateDetails", method = RequestMethod.GET)
+	public String queryActivityActivateDetails(HttpServletRequest request, Integer id, Integer pageIndex) {
+		if (id != null && id != 0) {
+			ActivityActivate activityActivate = new ActivityActivate();
+			activityActivate.setId(id);
+			activityActivate = activityActivateService.queryActivityActivate(activityActivate);
+			request.setAttribute("activityActivate", activityActivate);
+			request.setAttribute("pageIndex", pageIndex);
+		}
+		return "activityActivate/activityActivateDetails";
+	}
+
+	/**
+	 * 其他用户查询详情
+	 */
+	@RequestMapping(value = "/otherActivityActivateDetails", method = RequestMethod.GET)
+	public String otherActivityActivateDetails(HttpServletRequest request, Integer id, Integer pageIndex) {
+		if (id != null && id != 0) {
+			ActivityActivate activityActivate = new ActivityActivate();
+			activityActivate.setId(id);
+			activityActivate = activityActivateService.queryActivityActivate(activityActivate);
+			request.setAttribute("activityActivate", activityActivate);
+			request.setAttribute("pageIndex", pageIndex);
+		}
+		return "activityActivate/otherActivityActivateDetails";
+	}
+
+	/**
+	 * 查询详情
+	 */
+	@RequestMapping(value = "/queryActivityActivateBaseInfo", method = RequestMethod.GET)
+	public String queryActivityActivateBaseInfo(HttpServletRequest request, Integer id, Integer pageIndex) {
+		Boolean bol = verifyUserRole();
+		if (!bol) {
+			ShiroUser user = queryCurrentShiroUser();
+			if (StringUtil.isNotEmpty(user.getMerchantCode())) {
+				MerchantStore merchantStore = new MerchantStore();
+				merchantStore.setMerchantCode(user.getMerchantCode());
+				List<MerchantStore> merchantStoreList = merchantStoreService.queryMerchantNoStoreList(merchantStore);
+				request.setAttribute("merchantStoreList", merchantStoreList);
+			}
+		}
+		if (id != null && id != 0) {
+			ActivityActivate activityActivate = new ActivityActivate();
+			activityActivate.setId(id);
+			activityActivate = activityActivateService.queryActivityActivate(activityActivate);
+			request.setAttribute("activityActivate", activityActivate);
+			request.setAttribute("pageIndex", pageIndex);
+			// 如果是管理员
+			if (bol) {
+				MerchantStore merchantStore = new MerchantStore();
+				merchantStore.setMerchantCode(activityActivate.getMerchantCode());
+				List<MerchantStore> merchantStoreList = merchantStoreService.queryMerchantStoreList(merchantStore);
+				request.setAttribute("merchantStoreList", merchantStoreList);
+			}
+		}
+		getRole();
+		getPermission();
+		getMerchant();
+		return "activityActivate/activityActivateBaseInfo";
+	}
+
+	/**
+	 * 查询详情
+	 */
+	@RequestMapping(value = "/queryActivityActivateExtendsInfo", method = RequestMethod.GET)
+	public String queryActivityActivateExtendsInfo() {
+		return "activityActivate/activityActivateExtendsInfo";
+	}
+
+	/**
+	 * 查询详情
+	 */
+	@RequestMapping(value = "/queryActivityActivateFunctionsInfo", method = RequestMethod.GET)
+	public String queryActivityActivateFunctionsInfo() {
+		return "activityActivate/activityActivateFunctionsInfo";
+	}
+
+	/**
+	 * 保存对象
+	 * 
+	 * @throws IOException
+	 */
+	@RequestMapping(value = "/saveActivityActivate", method = RequestMethod.POST)
+	@ResponseBody
+	public Map<String, Object> saveActivityActivate(ActivityActivate activityActivate) {
+		Map<String, Object> result = new HashMap<String, Object>(16);
+		// 通过merchantCode查商户信息
+		MerchantBaseInfo merchantBaseInfo = new MerchantBaseInfo();
+		merchantBaseInfo.setMerchantCode(activityActivate.getMerchantCode());
+		if (StringUtil.isNotEmpty(activityActivate.getMerchantCode())) {
+			merchantBaseInfo.setMerchantCode(activityActivate.getMerchantCode());
+		}else {
+			ShiroUser user=queryCurrentShiroUser();
+			activityActivate.setMerchantCode(user.getMerchantCode());
+			merchantBaseInfo.setMerchantCode(user.getMerchantCode());
+		}
+		List<MerchantBaseInfo> merchantBaseInfoList = merchantBaseInfoService.queryMerchantBaseInfoList(merchantBaseInfo);
+		if (merchantBaseInfoList != null && merchantBaseInfoList.size() > 0) {
+			activityActivate.setMerchantName(merchantBaseInfoList.get(0).getMerchantName());
+		}
+		// 通过StoreId查门店信息
+		MerchantStore merchantStore = new MerchantStore();
+		merchantStore.setStoreId(activityActivate.getStoreId());
+		if (StringUtil.isNotEmpty(activityActivate.getStoreId())) {
+			List<MerchantStore> merchantStoreList = merchantStoreService.queryMerchantStoreList(merchantStore);
+			if (merchantStoreList != null && merchantStoreList.size() > 0) {
+				activityActivate.setStoreName(merchantStoreList.get(0).getStoreName());
+			}
+		}
+		if (activityActivate.getId() != null && activityActivate.getId() != 0) {
+			activityActivateService.updateActivityActivate(activityActivate);
+		} else {
+			if (StringUtil.isEmpty(activityActivate.getUserId())) {
+				ShiroUser shiroUser = queryCurrentShiroUser();
+				if (StringUtil.isNotEmpty(shiroUser)) {
+					activityActivate.setUserId(shiroUser.getId().intValue());
+				}
+			}
+			ActivityActivate activate=new ActivityActivate();
+			activate.setStoreId(activityActivate.getStoreId());
+			activate.setMerchantCode(activityActivate.getMerchantCode());
+			List<ActivityActivate> queryActivityActivateList = activityActivateService.queryActivityActivateList(activate);
+			for (ActivityActivate a : queryActivityActivateList) {
+				activityActivateService.deleteActivityActivate(a);
+			}
+			activityActivateService.saveActivityActivate(activityActivate);
+		}
+		result.put("resultCode", "1");
+		result.put("resultMessage", "保存成功!");
+		return result;
+	}
+
+	/**
+	 * 修改对象
+	 * 
+	 * @throws IOException
+	 */
+	@RequestMapping(value = "/updateActivityActivate", method = RequestMethod.POST)
+	@ResponseBody
+	public Map<String, Object> updateActivityActivate(Integer id) {
+
+		ActivityActivate activityActivate = new ActivityActivate();
+		activityActivate.setId(id);
+		activityActivateService.updateActivityActivate(activityActivate);
+		Map<String, Object> result = new HashMap<String, Object>(16);
+		result.put("resultCode", "1");
+		result.put("resultMessage", "保存成功!");
+		return result;
+	}
+
+	/**
+	 * 删除对象
+	 * 
+	 * @throws IOException
+	 */
+	@RequestMapping(value = "/deleteActivityActivate", method = RequestMethod.POST)
+	@ResponseBody
+	public Map<String, Object> deleteActivityActivate(Integer id) {
+		ActivityActivate activityActivate = new ActivityActivate();
+		activityActivate.setId(id);
+		activityActivateService.deleteActivityActivate(activityActivate);
+		Map<String, Object> result = new HashMap<String, Object>(16);
+		result.put("resultCode", "1");
+		result.put("resultMessage", "保存成功!");
+		return result;
+	}
+
+	/**
+	 * 管理员权限标识
+	 */
+	public void getRole() {
+		Boolean bol = verifyUserRole();
+		if (bol) {
+			request.setAttribute("admin", "admin");
+		}
+	}
+
+	/**
+	 * 不是管理员 获取的权限 是商户
+	 */
+	public void getPermission() {
+		ShiroUser user = queryCurrentShiroUser();
+		if (StringUtil.isNotEmpty(user.getMerchantCode())) {
+			request.setAttribute("merchant", "merchant");
+		}
+	}
+
+	/**
+	 * 获取所有商户信息
+	 */
+	public void getMerchant() {
+		List<MerchantBaseInfo> merchantBaseInfoList = merchantBaseInfoService.queryMerchantBaseInfoList(null);
+		request.setAttribute("merchantBaseInfoList", merchantBaseInfoList);
+	}
+
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/activityConsumReturn/ActivityConsumReturnController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/activityConsumReturn/ActivityConsumReturnController.java
new file mode 100644
index 0000000..7d494d4
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/activityConsumReturn/ActivityConsumReturnController.java
@@ -0,0 +1,307 @@
+package cn.pluss.platform.controller.activityConsumReturn;
+
+import cn.pluss.platform.activityConsumReturn.ActivityConsumReturnService;
+import cn.pluss.platform.controller.BaseNoModelController;
+import cn.pluss.platform.entitiy.ShiroUser;
+import cn.pluss.platform.entity.ActivityConsumReturn;
+import cn.pluss.platform.entity.MerchantBaseInfo;
+import cn.pluss.platform.entity.MerchantStore;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantStore.MerchantStoreService;
+import cn.pluss.platform.util.StringUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author Administrator
+ */
+@Controller
+@RequestMapping("activityConsumReturn")
+public class ActivityConsumReturnController extends BaseNoModelController {
+
+    private Integer PAGE_SIZE = 12;
+
+    @Autowired
+    private ActivityConsumReturnService activityConsumReturnService;
+
+    @Autowired
+    private HttpServletRequest request;
+
+    @Autowired
+    private MerchantBaseInfoService merchantBaseInfoService;
+
+    @Autowired
+    private MerchantStoreService merchantStoreService;
+
+    /**
+     * 引导页
+     *
+     * @return
+     */
+    @RequestMapping(value = "/index", method = RequestMethod.GET)
+    public String index() {
+        getRole();
+        getPermission();
+        return "activityConsumReturn/activityConsumReturnList";
+    }
+
+    /**
+     * 分页查询
+     */
+    @RequestMapping(value = "/queryActivityConsumReturnByPage", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> queryActivityConsumReturnByPage(@RequestParam(defaultValue = "1") Integer currPage, ActivityConsumReturn activityConsumReturn) {
+
+        Map<String, Object> result = new HashMap<String, Object>(16);
+        Map<String, Object> map = new HashMap<String, Object>(16);
+        map.put("pageSize", PAGE_SIZE);
+        map.put("offset", (currPage - 1) * PAGE_SIZE);
+        map.put("startDt", activityConsumReturn.getStartDt());
+        map.put("endDt", activityConsumReturn.getEndDt());
+        map.put("name", activityConsumReturn.getName());
+        Boolean bol = verifyUserRole();
+        //是否是管理员进行数据筛选和权限标记
+        if (bol) {
+            result.put("admin", "admin");
+        }else {
+            ShiroUser shiroUser = queryCurrentShiroUser();
+            if (StringUtil.isNotEmpty(shiroUser.getMerchantCode())) {
+                result.put("merchant", "merchant");
+                map.put("merchantCode", shiroUser.getMerchantCode());
+            } else {
+                map.put("merchantCode", StringUtil.genRandomNum(33));
+            }
+        }
+		List<ActivityConsumReturn> activityConsumReturnList = null;
+		Integer count = 0;
+        if (bol){
+			activityConsumReturnList = activityConsumReturnService.queryActivityConsumReturnPage(map);
+			count = activityConsumReturnService.queryActivityConsumReturnPageCount(map);
+		}else {
+			activityConsumReturnList = activityConsumReturnService.queryActivityNoConsumReturnPage(map);
+			count = activityConsumReturnService.queryActivityNoConsumReturnPageCount(map);
+		}
+        result.put("activityConsumReturnList", activityConsumReturnList);
+        result.put("count", count);
+        result.put("pageCount", StringUtil.getPageCount(count, PAGE_SIZE));
+        result.put("currPage", currPage);
+        return result;
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryActivityConsumReturnDetails", method = RequestMethod.GET)
+    public String queryActivityConsumReturnDetails(HttpServletRequest request, Integer id, Integer pageIndex) {
+        if (id != null && id != 0) {
+            ActivityConsumReturn activityConsumReturn = new ActivityConsumReturn();
+            activityConsumReturn.setId(id);
+            activityConsumReturn = activityConsumReturnService.queryActivityConsumReturn(activityConsumReturn);
+            request.setAttribute("activityConsumReturn", activityConsumReturn);
+            request.setAttribute("pageIndex", pageIndex);
+        }
+        return "activityConsumReturn/activityConsumReturnDetails";
+    }
+
+    /**
+     * 其他用户查询详情
+     */
+    @RequestMapping(value = "/otherActivityConsumReturnDetails", method = RequestMethod.GET)
+    public String otherActivityConsumReturnDetails(HttpServletRequest request, Integer id, Integer pageIndex) {
+        if (id != null && id != 0) {
+            ActivityConsumReturn activityConsumReturn = new ActivityConsumReturn();
+            activityConsumReturn.setId(id);
+            activityConsumReturn = activityConsumReturnService.queryActivityConsumReturn(activityConsumReturn);
+            request.setAttribute("activityConsumReturn", activityConsumReturn);
+            request.setAttribute("pageIndex", pageIndex);
+        }
+        return "activityConsumReturn/otherActivityConsumReturnDetails";
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryActivityConsumReturnBaseInfo", method = RequestMethod.GET)
+    public String queryActivityConsumReturnBaseInfo(HttpServletRequest request, Integer id, Integer pageIndex) {
+        Boolean bol = verifyUserRole();
+        if (!bol) {
+            ShiroUser user = queryCurrentShiroUser();
+            if (StringUtil.isNotEmpty(user.getMerchantCode())) {
+                MerchantStore merchantStore = new MerchantStore();
+                merchantStore.setMerchantCode(user.getMerchantCode());
+                List<MerchantStore> merchantStoreList = merchantStoreService.queryMerchantNoStoreList(merchantStore);
+                request.setAttribute("merchantStoreList", merchantStoreList);
+            }
+        }
+        if (id != null && id != 0) {
+            ActivityConsumReturn activityConsumReturn = new ActivityConsumReturn();
+            activityConsumReturn.setId(id);
+            activityConsumReturn = activityConsumReturnService.queryActivityConsumReturn(activityConsumReturn);
+            request.setAttribute("activityConsumReturn", activityConsumReturn);
+            request.setAttribute("pageIndex", pageIndex);
+            //如果是管理员
+            if (bol) {
+                MerchantStore merchantStore = new MerchantStore();
+                merchantStore.setMerchantCode(activityConsumReturn.getMerchantCode());
+                List<MerchantStore> merchantStoreList = merchantStoreService.queryMerchantStoreList(merchantStore);
+                request.setAttribute("merchantStoreList", merchantStoreList);
+            }
+        }
+        getRole();
+        getPermission();
+        getMerchant();
+        return "activityConsumReturn/activityConsumReturnBaseInfo";
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryActivityConsumReturnExtendsInfo", method = RequestMethod.GET)
+    public String queryActivityConsumReturnExtendsInfo() {
+
+        return "activityConsumReturn/activityConsumReturnExtendsInfo";
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryActivityConsumReturnFunctionsInfo", method = RequestMethod.GET)
+    public String queryActivityConsumReturnFunctionsInfo() {
+
+        return "activityConsumReturn/activityConsumReturnFunctionsInfo";
+    }
+
+    /**
+     * 保存对象
+     *
+     * @throws IOException
+     */
+    @RequestMapping(value = "/saveActivityConsumReturn", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> saveActivityConsumReturn(ActivityConsumReturn activityConsumReturn) {
+        //通过merchantCode查商户信息
+        MerchantBaseInfo merchantBaseInfo = new MerchantBaseInfo();
+        if (StringUtil.isNotEmpty(activityConsumReturn.getMerchantCode())){
+            merchantBaseInfo.setMerchantCode(activityConsumReturn.getMerchantCode());
+        }else {
+            ShiroUser user=queryCurrentShiroUser();
+            activityConsumReturn.setMerchantCode(user.getMerchantCode());
+            merchantBaseInfo.setMerchantCode(user.getMerchantCode());
+        }
+        List<MerchantBaseInfo> merchantBaseInfoList = merchantBaseInfoService.queryMerchantBaseInfoList(merchantBaseInfo);
+        if (merchantBaseInfoList != null && merchantBaseInfoList.size() > 0) {
+            activityConsumReturn.setMerchantName(merchantBaseInfoList.get(0).getMerchantName());
+        }
+        //通过StoreId查门店信息
+        MerchantStore merchantStore = new MerchantStore();
+        merchantStore.setStoreId(activityConsumReturn.getStoreId());
+        List<MerchantStore> merchantStoreList = merchantStoreService.queryMerchantStoreList(merchantStore);
+        if (merchantStoreList != null && merchantStoreList.size() > 0) {
+            activityConsumReturn.setStoreName(merchantStoreList.get(0).getStoreName());
+        }
+        if (activityConsumReturn.getId() != null && activityConsumReturn.getId() != 0) {
+            if (StringUtil.isNotEmpty(activityConsumReturn)) {
+                if (null != activityConsumReturn.getTimeType() && 0 == activityConsumReturn.getTimeType()) {
+                    activityConsumReturn.setStartDt(null);
+                    activityConsumReturn.setEndDt(null);
+                }
+            }
+            activityConsumReturnService.updateActivityConsumReturn(activityConsumReturn);
+        } else {
+            ActivityConsumReturn aConsumReturn = new ActivityConsumReturn();
+            aConsumReturn.setMerchantCode(activityConsumReturn.getMerchantCode());
+            aConsumReturn.setStoreId(activityConsumReturn.getStoreId());
+            List<ActivityConsumReturn> queryActivityConsumReturnList = activityConsumReturnService.queryActivityConsumReturnList(aConsumReturn);
+            for (ActivityConsumReturn a : queryActivityConsumReturnList) {
+                activityConsumReturnService.deleteActivityConsumReturn(a);
+            }
+            if (StringUtil.isEmpty(activityConsumReturn.getUserId())) {
+                ShiroUser shiroUser = queryCurrentShiroUser();
+                if (StringUtil.isNotEmpty(shiroUser)) {
+                    activityConsumReturn.setUserId(shiroUser.getId().intValue());
+                }
+            }
+            activityConsumReturnService.saveActivityConsumReturn(activityConsumReturn);
+        }
+        Map<String, Object> result = new HashMap<String, Object>(16);
+        result.put("resultCode", "1");
+        result.put("resultMessage", "保存成功!");
+        return result;
+    }
+
+    /**
+     * 修改对象
+     *
+     * @throws IOException
+     */
+    @RequestMapping(value = "/updateActivityConsumReturn", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> updateActivityConsumReturn(Integer id) {
+
+        ActivityConsumReturn activityConsumReturn = new ActivityConsumReturn();
+        activityConsumReturn.setId(id);
+        activityConsumReturnService.updateActivityConsumReturn(activityConsumReturn);
+        Map<String, Object> result = new HashMap<String, Object>(16);
+        result.put("resultCode", "1");
+        result.put("resultMessage", "保存成功!");
+        return result;
+    }
+
+    /**
+     * 删除对象
+     *
+     * @throws IOException
+     */
+    @RequestMapping(value = "/deleteActivityConsumReturn", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> deleteActivityConsumReturn(Integer id) {
+        ActivityConsumReturn activityConsumReturn = new ActivityConsumReturn();
+        activityConsumReturn.setId(id);
+        activityConsumReturnService.deleteActivityConsumReturn(activityConsumReturn);
+        Map<String, Object> result = new HashMap<>(16);
+        result.put("resultCode", "1");
+        result.put("resultMessage", "保存成功!");
+        return result;
+    }
+
+    /**
+     * 管理员权限标识
+     */
+    public void getRole() {
+        Boolean bol = verifyUserRole();
+        if (bol) {
+            request.setAttribute("admin", "admin");
+        }
+    }
+
+    /**
+     * 不是管理员 获取的权限  是商户
+     */
+    public void getPermission() {
+        ShiroUser user = queryCurrentShiroUser();
+        if (StringUtil.isNotEmpty(user.getMerchantCode())) {
+            request.setAttribute("merchant", "merchant");
+        }
+    }
+
+    /**
+     * 获取所有商户信息
+     */
+    public void getMerchant() {
+        List<MerchantBaseInfo> merchantBaseInfoList = merchantBaseInfoService.queryMerchantBaseInfoList(null);
+        request.setAttribute("merchantBaseInfoList", merchantBaseInfoList);
+    }
+
+}
+
+
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/activityEnroll/ActivityEnrollController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/activityEnroll/ActivityEnrollController.java
new file mode 100644
index 0000000..596d3e6
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/activityEnroll/ActivityEnrollController.java
@@ -0,0 +1,65 @@
+package cn.pluss.platform.controller.activityEnroll;
+
+
+import cn.pluss.platform.activityEnroll.ActivityEnrollService;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.dict.DictService;
+import cn.pluss.platform.entity.ActivityEnroll;
+import cn.pluss.platform.entity.Dict;
+import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 商户活动报名记录表 前端控制器
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-11-02
+ */
+@Controller
+@RequestMapping("/activityEnroll")
+public class ActivityEnrollController extends BaseModelController<ActivityEnrollService, ActivityEnroll> {
+
+    @Autowired
+    private DictService dictService;
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = "/index")
+    public String index(HttpServletRequest request) {
+        List<String> actList = new ArrayList<String>(){{this.add("ACTIVITY_TYPE");}};
+        List<Dict> actDictList = dictService.getByCode(actList);
+        request.setAttribute("actTypeList",JSONArray.toJSONString(actDictList));
+        return "activityEnroll/list";
+    }
+
+
+    @Override
+    public Result<Page<ActivityEnroll>> page(Page<ActivityEnroll> page, ActivityEnroll condition, OrderItem orderItem) {
+        orderItem.setAsc(false).setColumn("createTime");
+        return super.page(page, condition, orderItem);
+    }
+
+    @PostMapping("saveOrUpdate")
+    @ResponseBody
+    public Result<String> saveOrUpdate(@RequestBody ActivityEnroll activityEnroll) {
+        if (activityEnroll.getId() != null){
+            activityEnroll.setAuditTime(new Date());
+            this.baseService.updateById(activityEnroll);
+        }else {
+            activityEnroll.setCreateTime(new Date());
+            this.baseService.save(activityEnroll);
+        }
+        return ResultGenerator.genSuccessResult("保存成功");
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/activityRecharge/ActivityRechargeController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/activityRecharge/ActivityRechargeController.java
new file mode 100644
index 0000000..0c5a9fa
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/activityRecharge/ActivityRechargeController.java
@@ -0,0 +1,300 @@
+package cn.pluss.platform.controller.activityRecharge;
+
+import cn.pluss.platform.activityRecharge.ActivityRechargeService;
+import cn.pluss.platform.controller.BaseNoModelController;
+import cn.pluss.platform.entitiy.ShiroUser;
+import cn.pluss.platform.entity.ActivityRecharge;
+import cn.pluss.platform.entity.MerchantBaseInfo;
+import cn.pluss.platform.entity.MerchantStore;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantStore.MerchantStoreService;
+import cn.pluss.platform.util.StringUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author Administrator
+ */
+@Controller
+@RequestMapping("activityRecharge")
+public class ActivityRechargeController extends BaseNoModelController {
+
+    private Integer PAGE_SIZE = 12;
+
+    @Autowired
+    private ActivityRechargeService activityRechargeService;
+
+    @Autowired
+    private HttpServletRequest request;
+
+    @Autowired
+    private MerchantBaseInfoService merchantBaseInfoService;
+
+    @Autowired
+    private MerchantStoreService merchantStoreService;
+
+    /**
+     * 引导页
+     *
+     * @return
+     */
+    @RequestMapping(value = "/index", method = RequestMethod.GET)
+    public String index() {
+        getRole();
+        getPermission();
+        return "activityRecharge/activityRechargeList";
+    }
+
+    /**
+     * 分页查询
+     */
+    @RequestMapping(value = "/queryActivityRechargeByPage", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> queryActivityRechargeByPage(@RequestParam(defaultValue = "1") Integer currPage, ActivityRecharge activityRecharge) {
+        Map<String, Object> map = new HashMap<String, Object>(16);
+        Map<String, Object> result = new HashMap<String, Object>(16);
+        map.put("pageSize", PAGE_SIZE);
+        map.put("offset", (currPage - 1) * PAGE_SIZE);
+        if (null != activityRecharge.getStartDt()) {
+            map.put("startDt", activityRecharge.getStartDt());
+        }
+        if (null != activityRecharge.getEndDt()) {
+            map.put("endDt", activityRecharge.getEndDt());
+        }
+        if (null != activityRecharge.getId()) {
+            map.put("id", activityRecharge.getId());
+        }
+        if (null != activityRecharge.getMerchantName() && !"".equals(activityRecharge.getMerchantName())) {
+            map.put("merchantName", activityRecharge.getMerchantName());
+        }
+        //map.put("name", activityRecharge.getName());
+        Boolean bol = verifyUserRole();
+        //是否是管理员进行数据筛选和权限标记
+        if (bol) {
+            result.put("admin", "admin");
+        } else {
+            ShiroUser shiroUser = queryCurrentShiroUser();
+            if (StringUtil.isNotEmpty(shiroUser.getMerchantCode())) {
+                result.put("merchant", "merchant");
+                map.put("merchantCode", shiroUser.getMerchantCode());
+            } else {
+                map.put("merchantCode", StringUtil.genRandomNum(33));
+            }
+        }
+        List<ActivityRecharge> activityRechargeList = null;
+        Integer count = 0;
+        if (!bol) {
+            activityRechargeList = activityRechargeService.queryActivityNoRechargePage(map);
+            count = activityRechargeService.queryActivityNoRechargePageCount(map);
+        } else {
+            activityRechargeList = activityRechargeService.queryActivityRechargePage(map);
+            count = activityRechargeService.queryActivityRechargePageCount(map);
+        }
+        result.put("activityRechargeList", activityRechargeList);
+        result.put("count", count);
+        result.put("pageCount", StringUtil.getPageCount(count, PAGE_SIZE));
+        result.put("currPage", currPage);
+        return result;
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryActivityRechargeDetails", method = RequestMethod.GET)
+    public String queryActivityRechargeDetails(HttpServletRequest request, Integer id, Integer pageIndex) {
+
+        if (id != null && id != 0) {
+            ActivityRecharge activityRecharge = new ActivityRecharge();
+            activityRecharge.setId(id);
+            activityRecharge = activityRechargeService.queryActivityRecharge(activityRecharge);
+            request.setAttribute("activityRecharge", activityRecharge);
+            request.setAttribute("pageIndex", pageIndex);
+        }
+        return "activityRecharge/activityRechargeDetails";
+    }
+
+    /**
+     * 其他用户查询详情
+     */
+    @RequestMapping(value = "/otherActivityRechargeDetails", method = RequestMethod.GET)
+    public String otherActivityRechargeDetails(HttpServletRequest request, Integer id, Integer pageIndex) {
+        if (id != null && id != 0) {
+            ActivityRecharge activityRecharge = new ActivityRecharge();
+            activityRecharge.setId(id);
+            activityRecharge = activityRechargeService.queryActivityRecharge(activityRecharge);
+            request.setAttribute("activityRecharge", activityRecharge);
+            request.setAttribute("pageIndex", pageIndex);
+        }
+        return "activityRecharge/otherActivityRechargeDetails";
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryActivityRechargeBaseInfo", method = RequestMethod.GET)
+    public String queryActivityRechargeBaseInfo(HttpServletRequest request, Integer id, Integer pageIndex) {
+        Boolean bol = verifyUserRole();
+        if (!bol) {
+            ShiroUser user = queryCurrentShiroUser();
+            if (StringUtil.isNotEmpty(user.getMerchantCode())) {
+                MerchantStore merchantStore = new MerchantStore();
+                merchantStore.setMerchantCode(user.getMerchantCode());
+				List<MerchantStore> merchantStoreList = merchantStoreService.queryMerchantNoStoreList(merchantStore);
+                request.setAttribute("merchantStoreList", merchantStoreList);
+            }
+        }
+        if (id != null && id != 0) {
+            ActivityRecharge activityRecharge = new ActivityRecharge();
+            activityRecharge.setId(id);
+            activityRecharge = activityRechargeService.queryActivityRecharge(activityRecharge);
+            request.setAttribute("activityRecharge", activityRecharge);
+            request.setAttribute("pageIndex", pageIndex);
+            //如果是管理员
+            if (bol) {
+                MerchantStore merchantStore = new MerchantStore();
+                merchantStore.setMerchantCode(activityRecharge.getMerchantCode());
+                List<MerchantStore> merchantStoreList = merchantStoreService.queryMerchantStoreList(merchantStore);
+                request.setAttribute("merchantStoreList", merchantStoreList);
+            }
+        }
+        getRole();
+        getPermission();
+        getMerchant();
+        return "activityRecharge/activityRechargeBaseInfo";
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryActivityRechargeExtendsInfo", method = RequestMethod.GET)
+    public String queryActivityRechargeExtendsInfo() {
+
+        return "activityRecharge/activityRechargeExtendsInfo";
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryActivityRechargeFunctionsInfo", method = RequestMethod.GET)
+    public String queryActivityRechargeFunctionsInfo() {
+
+        return "activityRecharge/activityRechargeFunctionsInfo";
+    }
+
+    /**
+     * 保存对象
+     *
+     * @throws IOException
+     */
+    @RequestMapping(value = "/saveActivityRecharge", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> saveActivityRecharge(ActivityRecharge activityRecharge) {
+
+        //通过merchantCode查商户信息
+        MerchantBaseInfo merchantBaseInfo = new MerchantBaseInfo();
+        if (StringUtil.isNotEmpty(activityRecharge.getMerchantCode())) {
+			merchantBaseInfo.setMerchantCode(activityRecharge.getMerchantCode());
+        }else {
+            ShiroUser user = queryCurrentShiroUser();
+            activityRecharge.setMerchantCode(user.getMerchantCode());
+            merchantBaseInfo.setMerchantCode(user.getMerchantCode());
+		}
+		List<MerchantBaseInfo> merchantBaseInfoList = merchantBaseInfoService.queryMerchantBaseInfoList(merchantBaseInfo);
+		if (merchantBaseInfoList != null && merchantBaseInfoList.size() > 0) {
+			activityRecharge.setMerchantName(merchantBaseInfoList.get(0).getMerchantName());
+		}
+        //通过StoreId查门店信息
+        MerchantStore merchantStore = new MerchantStore();
+        merchantStore.setStoreId(activityRecharge.getStoreId());
+        if (StringUtil.isNotEmpty(activityRecharge.getStoreId())) {
+            List<MerchantStore> merchantStoreList = merchantStoreService.queryMerchantStoreList(merchantStore);
+            if (merchantStoreList != null && merchantStoreList.size() > 0) {
+                activityRecharge.setStoreName(merchantStoreList.get(0).getStoreName());
+            }
+        }
+        if (activityRecharge.getId() != null && activityRecharge.getId() != 0) {
+            if (StringUtil.isNotEmpty(activityRecharge)) {
+                if (null != activityRecharge.getTimeType() && 0 == activityRecharge.getTimeType()) {
+                    activityRecharge.setStartDt(null);
+                    activityRecharge.setEndDt(null);
+                }
+            }
+            activityRechargeService.updateActivityRecharge(activityRecharge);
+        } else {
+            if (StringUtil.isEmpty(activityRecharge.getUserId())) {
+                ShiroUser shiroUser = queryCurrentShiroUser();
+                if (StringUtil.isNotEmpty(shiroUser)) {
+                    activityRecharge.setUserId(shiroUser.getId().intValue());
+                }
+            }
+            ActivityRecharge aRecharge = new ActivityRecharge();
+            aRecharge.setMerchantCode(activityRecharge.getMerchantCode());
+            aRecharge.setStoreId(activityRecharge.getStoreId());
+            List<ActivityRecharge> queryActivityRechargeList = activityRechargeService.queryActivityRechargeList(aRecharge);
+            for (ActivityRecharge a : queryActivityRechargeList) {
+                activityRechargeService.deleteActivityRecharge(a);
+            }
+            activityRechargeService.saveActivityRecharge(activityRecharge);
+        }
+        Map<String, Object> result = new HashMap<String, Object>(16);
+        result.put("resultCode", "1");
+        result.put("resultMessage", "保存成功!");
+        return result;
+    }
+
+    /**
+     * 修改对象
+     *
+     * @throws IOException
+     */
+    @RequestMapping(value = "/updateActivityRecharge", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> updateActivityRecharge(Integer id) {
+
+        ActivityRecharge activityRecharge = new ActivityRecharge();
+        activityRecharge.setId(id);
+        activityRechargeService.updateActivityRecharge(activityRecharge);
+        Map<String, Object> result = new HashMap<String, Object>(16);
+        result.put("resultCode", "1");
+        result.put("resultMessage", "保存成功!");
+        return result;
+    }
+
+    /**
+     * 删除对象
+     *
+     * @throws IOException
+     */
+    @RequestMapping(value = "/deleteActivityRecharge", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> deleteActivityRecharge(Integer id) {
+        ActivityRecharge activityRecharge = new ActivityRecharge();
+        activityRecharge.setId(id);
+        activityRechargeService.deleteActivityRecharge(activityRecharge);
+        Map<String, Object> result = new HashMap<String, Object>(16);
+        result.put("resultCode", "1");
+        result.put("resultMessage", "保存成功!");
+        return result;
+    }
+
+    /**
+     * 获取所有商户信息
+     */
+    public void getMerchant() {
+        List<MerchantBaseInfo> merchantBaseInfoList = merchantBaseInfoService.queryMerchantBaseInfoList(null);
+        request.setAttribute("merchantBaseInfoList", merchantBaseInfoList);
+    }
+
+}
+
+
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/activityRecommend/ActivityRecommendController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/activityRecommend/ActivityRecommendController.java
new file mode 100644
index 0000000..9c88a0d
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/activityRecommend/ActivityRecommendController.java
@@ -0,0 +1,238 @@
+package cn.pluss.platform.controller.activityRecommend;
+
+import cn.pluss.platform.activityRecommend.ActivityRecommendService;
+import cn.pluss.platform.controller.BaseNoModelController;
+import cn.pluss.platform.entitiy.ShiroUser;
+import cn.pluss.platform.entity.ActivityRecommend;
+import cn.pluss.platform.entity.MerchantBaseInfo;
+import cn.pluss.platform.entity.MerchantStore;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantStore.MerchantStoreService;
+import cn.pluss.platform.util.StringUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Controller
+@RequestMapping("activityRecommend")
+public class ActivityRecommendController extends BaseNoModelController {
+
+	private Integer PAGE_SIZE = 12;
+
+	@Autowired
+	private HttpServletRequest request;
+
+	@Autowired
+	private MerchantBaseInfoService merchantBaseInfoService;
+
+	@Autowired
+	private MerchantStoreService merchantStoreService;
+
+	@Autowired
+	private ActivityRecommendService activityRecommendService;
+
+	/**
+	 * 引导页
+	 * 
+	 * @return
+	 */
+	@RequestMapping(value = "/index", method = RequestMethod.GET)
+	public String index() {
+		return "activityRecommend/activityRecommendList";
+	}
+
+	/**
+	 * 分页查询
+	 */
+	@RequestMapping(value = "/queryActivityRecommendByPage", method = RequestMethod.POST)
+	@ResponseBody
+	public Map<String, Object> queryActivityRecommendByPage(@RequestParam(defaultValue = "1") Integer currPage,
+			ActivityRecommend activityRecommend) {
+		Map<String, Object> map = new HashMap<String, Object>(16);
+		Map<String, Object> result = new HashMap<String, Object>(16);
+		map.put("pageSize", PAGE_SIZE);
+		map.put("offset", (currPage - 1) * PAGE_SIZE);
+		Boolean bol = verifyUserRole();
+		if (!bol) {
+			ShiroUser shiroUser = queryCurrentShiroUser();
+			if(StringUtil.isNotEmpty(shiroUser.getMerchantCode())) {
+				map.put("merchantCode", shiroUser.getMerchantCode());
+			}else {
+				map.put("merchantCode", StringUtil.genRandomNum(33));
+			}
+		}
+		if (StringUtil.isNotEmpty(activityRecommend.getName())) {
+			map.put("name", activityRecommend.getName());
+		}
+		List<ActivityRecommend> activityRecommendList = activityRecommendService.queryActivityRecommendPage(map);
+		Integer count = activityRecommendService.queryActivityRecommendPageCount(map);
+		result.put("activityRecommendList", activityRecommendList);
+		result.put("count", count);
+		result.put("pageCount", StringUtil.getPageCount(count, PAGE_SIZE));
+		result.put("currPage", currPage);
+		return result;
+	}
+
+	/**
+	 * 查询详情
+	 */
+	@RequestMapping(value = "/queryActivityRecommendDetails", method = RequestMethod.GET)
+	public String queryActivityRecommendDetails(HttpServletRequest request, Integer id, Integer pageIndex) {
+
+		if (id != null && id != 0) {
+			ActivityRecommend activityRecommend = new ActivityRecommend();
+			activityRecommend.setId(id);
+			activityRecommend = activityRecommendService.queryActivityRecommend(activityRecommend);
+			request.setAttribute("activityRecommend", activityRecommend);
+			request.setAttribute("pageIndex", pageIndex);
+		}
+		return "activityRecommend/activityRecommendDetails";
+	}
+
+	/**
+	 * 查询详情
+	 */
+	@RequestMapping(value = "/queryActivityRecommendBaseInfo", method = RequestMethod.GET)
+	public String queryActivityRecommendBaseInfo(HttpServletRequest request, Integer id, Integer pageIndex) {
+		// 是否是管理员
+		Boolean bol = verifyUserRole();
+		if (!bol) {
+			ShiroUser user = queryCurrentShiroUser();
+			if (StringUtil.isNotEmpty(user.getMerchantCode())) {
+				MerchantStore merchantStore = new MerchantStore();
+				merchantStore.setMerchantCode(user.getMerchantCode());
+				List<MerchantStore> merchantStoreList = merchantStoreService.queryMerchantStoreList(merchantStore);
+				request.setAttribute("merchantStoreList", merchantStoreList);
+			}
+		}
+
+		if (id != null && id != 0) {
+			ActivityRecommend activityRecommend = new ActivityRecommend();
+			activityRecommend.setId(id);
+			activityRecommend = activityRecommendService.queryActivityRecommend(activityRecommend);
+			request.setAttribute("activityRecommend", activityRecommend);
+			request.setAttribute("pageIndex", pageIndex);
+			if (bol) {
+				MerchantStore merchantStore = new MerchantStore();
+				merchantStore.setMerchantCode(activityRecommend.getMerchantCode());
+				List<MerchantStore> merchantStoreList = merchantStoreService.queryMerchantStoreList(merchantStore);
+				request.setAttribute("merchantStoreList", merchantStoreList);
+			}
+		}
+		getMerchant();
+		return "activityRecommend/activityRecommendBaseInfo";
+	}
+
+	/**
+	 * 查询详情
+	 */
+	@RequestMapping(value = "/queryActivityRecommendExtendsInfo", method = RequestMethod.GET)
+	public String queryActivityRecommendExtendsInfo() {
+
+		return "activityRecommend/activityRecommendExtendsInfo";
+	}
+
+	/**
+	 * 查询详情
+	 */
+	@RequestMapping(value = "/queryActivityRecommendFunctionsInfo", method = RequestMethod.GET)
+	public String queryActivityRecommendFunctionsInfo() {
+
+		return "activityRecommend/activityRecommendFunctionsInfo";
+	}
+
+	/**
+	 * 保存对象
+	 * 
+	 * @throws IOException
+	 */
+	@RequestMapping(value = "/saveActivityRecommend", method = RequestMethod.POST)
+	@ResponseBody
+	public Map<String, Object> saveActivityRecommend(ActivityRecommend activityRecommend) {
+		Map<String, Object> result = new HashMap<String, Object>(16);
+		// 通过merchantCode查商户信息
+		MerchantBaseInfo merchantBaseInfo = new MerchantBaseInfo();
+		merchantBaseInfo.setMerchantCode(activityRecommend.getMerchantCode());
+		if (StringUtil.isNotEmpty(activityRecommend.getMerchantCode())) {
+			List<MerchantBaseInfo> merchantBaseInfoList = merchantBaseInfoService
+					.queryMerchantBaseInfoList(merchantBaseInfo);
+			if (merchantBaseInfoList != null && merchantBaseInfoList.size() > 0) {
+				activityRecommend.setMerchantName(merchantBaseInfoList.get(0).getMerchantName());
+			}
+		}
+		// 通过StoreId查门店信息
+		MerchantStore merchantStore = new MerchantStore();
+		merchantStore.setStoreId(activityRecommend.getStoreId());
+		if (StringUtil.isNotEmpty(activityRecommend.getStoreId())) {
+			List<MerchantStore> merchantStoreList = merchantStoreService.queryMerchantStoreList(merchantStore);
+			if (merchantStoreList != null && merchantStoreList.size() > 0) {
+				activityRecommend.setStoreName(merchantStoreList.get(0).getStoreName());
+			}
+		}
+		if (activityRecommend.getId() != null && activityRecommend.getId() != 0) {
+			activityRecommendService.updateActivityRecommend(activityRecommend);
+		} else {
+			ShiroUser shiroUser = queryCurrentShiroUser();
+			if (StringUtil.isNotEmpty(shiroUser)) {
+				activityRecommend.setUserId(shiroUser.getId().intValue());
+			}
+			activityRecommendService.saveActivityRecommend(activityRecommend);
+		}
+		result.put("resultCode", "1");
+		result.put("resultMessage", "保存成功!");
+		return result;
+	}
+
+	/**
+	 * 修改对象
+	 * 
+	 * @throws IOException
+	 */
+	@RequestMapping(value = "/updateActivityRecommend", method = RequestMethod.POST)
+	@ResponseBody
+	public Map<String, Object> updateActivityRecommend(Integer id) {
+
+		ActivityRecommend activityRecommend = new ActivityRecommend();
+		activityRecommend.setId(id);
+		activityRecommendService.updateActivityRecommend(activityRecommend);
+		Map<String, Object> result = new HashMap<String, Object>();
+		result.put("resultCode", "1");
+		result.put("resultMessage", "保存成功!");
+		return result;
+	}
+
+	/**
+	 * 删除对象
+	 * 
+	 * @throws IOException
+	 */
+	@RequestMapping(value = "/deleteActivityRecommend", method = RequestMethod.POST)
+	@ResponseBody
+	public Map<String, Object> deleteActivityRecommend(Integer id) {
+		ActivityRecommend activityRecommend = new ActivityRecommend();
+		activityRecommend.setId(id);
+		activityRecommendService.deleteActivityRecommend(activityRecommend);
+		Map<String, Object> result = new HashMap<String, Object>();
+		result.put("resultCode", "1");
+		result.put("resultMessage", "保存成功!");
+		return result;
+	}
+
+	/**
+	 * 获取所有商户信息
+	 */
+	public void getMerchant() {
+		List<MerchantBaseInfo> merchantBaseInfoList = merchantBaseInfoService.queryMerchantBaseInfoList(null);
+		request.setAttribute("merchantBaseInfoList", merchantBaseInfoList);
+	}
+
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/agent/AgentInfoController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/agent/AgentInfoController.java
new file mode 100644
index 0000000..19322bd
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/agent/AgentInfoController.java
@@ -0,0 +1,190 @@
+package cn.pluss.platform.controller.agent;
+
+import cn.pluss.platform.agentInfo.AgentInfoService;
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.entity.MerchantImage;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.merchantBankCard.MerchantBankCardService;
+import cn.pluss.platform.merchantImage.MerchantImageService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.util.PageUtils;
+import cn.pluss.platform.util.StringUtil;
+import cn.pluss.platform.vo.AgentInfo;
+import cn.pluss.platform.vo.AgentStaffVO;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
+import java.util.List;
+
+@Controller
+@RequestMapping("agentInfo")
+public class AgentInfoController {
+
+    @Autowired
+    private AgentInfoService agentInfoService;
+
+    @Autowired
+    private UserAppService userAppService;
+
+    @Autowired
+    private MerchantImageService merchantImageService;
+
+    @Autowired
+    private MerchantBankCardService merchantBankCardService;
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = "/list")
+    public String index() {
+        return "agent/list";
+    }
+
+    @GetMapping("/page")
+    @ResponseBody
+    public Result<PageInfo<AgentInfo>> page(Page<AgentInfo> page, AgentInfo agentInfo) {
+        if ("".equals(agentInfo.getIsFixedRate())) {
+            agentInfo.setIsFixedRate(null);
+        }
+        Page<AgentInfo> pageData = agentInfoService.pageData(page, agentInfo);
+        return ResultGenerator.genSuccessResult(PageUtils.page(pageData));
+    }
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = {"/detail/{userId}", "/detail"})
+    public String detail(HttpServletRequest request, @PathVariable(value = "userId", required = false) Long userId) {
+        AgentInfo agentInfo;
+        if (userId != null) {
+            agentInfo = new AgentInfo().setUserId(userId);
+            agentInfo = agentInfoService.getOne(agentInfo);
+        } else {
+            agentInfo = new AgentInfo();
+            agentInfo.setRate(BigDecimal.valueOf(25));
+        }
+        request.setAttribute("entity", agentInfo);
+        return "agent/detail";
+    }
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = {"/part/{userId}"})
+    public String part(HttpServletRequest request, @PathVariable(value = "userId", required = false) Long userId) {
+        //超级管理商结算信息：
+        if (userId != null) {
+            //超级管理商基本信息
+            QueryWrapper<UserApp> userAppQueryWrapper = new QueryWrapper<UserApp>().eq("userId", userId);
+            UserApp userAppServiceOne = userAppService.getOne(userAppQueryWrapper);
+            request.setAttribute("userApp", userAppServiceOne);
+            UserApp appInfo = userAppService.queryUserAppJoinByUserId(userId);
+            if (appInfo != null) {
+                if (StringUtils.isNotEmpty(appInfo.getMerchantCode())) {
+                    MerchantImage image = new MerchantImage();
+                    image.setMerchantCode(appInfo.getMerchantCode());
+                    if (appInfo.getMerchantBaseInfo() != null) {
+                        request.setAttribute("merchantInfo", appInfo.getMerchantBaseInfo());
+                    }
+                    if (appInfo.getMerchantBankCard() != null) {
+                        request.setAttribute("mercBankCard", appInfo.getMerchantBankCard());
+                    }
+                    List<MerchantImage> imageList = merchantImageService.queryMerchantImageList(image);
+                    String merchantImage1 = null;
+                    String merchantImage2 = null;
+                    String merchantImage3 = null;
+                    String merchantImage6 = null;
+                    String merchantImage8 = null;
+                    String merchantImage9 = null;
+                    String merchantImage98 = null;
+                    if (imageList != null && !imageList.isEmpty()) {
+                        for (MerchantImage m : imageList) {
+                            switch (m.getPhotoType()) {
+                                case "01":
+                                    merchantImage1 = m.getPicUrl();
+                                    break;
+                                case "02":
+                                    merchantImage2 = m.getPicUrl();
+                                    break;
+                                case "03":
+                                    merchantImage3 = m.getPicUrl();
+                                    break;
+                                case "06":
+                                    merchantImage6 = m.getPicUrl();
+                                    break;
+                                case "08":
+                                    merchantImage8 = m.getPicUrl();
+                                    break;
+                                case "09":
+                                    merchantImage9 = m.getPicUrl();
+                                    break;
+                                case "98":
+                                    merchantImage98 = m.getPicUrl();
+                                    break;
+                                default:
+                                    break;
+                            }
+                        }
+                        request.setAttribute("merchantImage1", merchantImage1);
+                        request.setAttribute("merchantImage2", merchantImage2);
+                        request.setAttribute("merchantImage3", merchantImage3);
+                        request.setAttribute("merchantImage6", merchantImage6);
+                        request.setAttribute("merchantImage8", merchantImage8);
+                        request.setAttribute("merchantImage9", merchantImage9);
+                        request.setAttribute("merchantImage98", merchantImage98);
+                    }
+                }
+            }
+        }
+        return "agent/particulars";
+    }
+
+    @PostMapping("/saveOrUpdate")
+    @ResponseBody
+    public Result<AgentInfo> saveOrUpdate(@RequestBody AgentInfo agentInfo) {
+        agentInfoService.saveOrUpdate(agentInfo);
+        return ResultGenerator.genSuccessResult("保存成功", agentInfo);
+    }
+
+    @PostMapping("/delete")
+    public Result<AgentInfo> del(@RequestBody AgentInfo agentInfo) {
+        agentInfoService.delete(agentInfo);
+        return ResultGenerator.genSuccessResult("删除成功", agentInfo);
+    }
+
+    @PostMapping("/saveAgentInfo")
+    @Transactional(rollbackFor = Exception.class)
+    @ResponseBody
+    public Result<String> saveAgentInfo(UserApp userApp) {
+        merchantBankCardService.updateMerchantBankCardUserId(userApp.getMerchantBankCard());
+        if (StringUtil.isNotEmpty(userApp.getUserId())) {
+            userAppService.updateUserAppUserId(userApp);
+        }
+        return ResultGenerator.genSuccessResult("保存成功");
+    }
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = "/subAgentList")
+    public String subAgentList() {
+        return "agent/subAgentList";
+    }
+
+    @GetMapping("/subAgentPage")
+    @ResponseBody
+    public Result<PageInfo<AgentInfo>> subAgentPage(Page<AgentInfo> page, AgentInfo agentInfo) {
+        Page<AgentInfo> pageData = agentInfoService.pageSubData(page, agentInfo);
+        return ResultGenerator.genSuccessResult(PageUtils.page(pageData));
+    }
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = "/staffList")
+    public String staffList() {
+        return "agent/staffList";
+    }
+
+    @GetMapping("/staffPage")
+    @ResponseBody
+    public Result<PageInfo<AgentStaffVO>> staffPage(Page<AgentStaffVO> page, AgentStaffVO agentStaffVO, OrderItem orderItem) {
+        Page<AgentStaffVO> userAppPage = agentInfoService.staffPage(page, agentStaffVO, orderItem);
+        return ResultGenerator.genSuccessResult(PageUtils.page(userAppPage));
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/agreement/AgreementController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/agreement/AgreementController.java
new file mode 100644
index 0000000..71cf0f1
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/agreement/AgreementController.java
@@ -0,0 +1,173 @@
+package cn.pluss.platform.controller.agreement;
+
+import cn.pluss.platform.agreement.AgreementService;
+import cn.pluss.platform.controller.BaseNoModelController;
+import cn.pluss.platform.entitiy.ShiroUser;
+import cn.pluss.platform.entity.Agreement;
+import cn.pluss.platform.util.StringUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Controller
+@RequestMapping("agreement")
+public class AgreementController  extends BaseNoModelController {
+
+	  private Integer PAGE_SIZE=12;
+
+    @Autowired
+	  private AgreementService agreementService;
+
+    /**
+    *引导页
+    * @return
+    */
+    @RequestMapping(value = "/index", method = RequestMethod.GET)
+    public String index() {
+   
+        return "agreement/agreementList";
+    }
+
+    /**
+    *分页查询
+    */
+    @RequestMapping(value = "/queryAgreementByPage", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String,Object> queryAgreementByPage(@RequestParam(defaultValue="1") Integer currPage,Agreement agreement){
+   
+    	Map<String,Object> map=new HashMap<String, Object>(16);
+    	Map<String,Object> result=new HashMap<String,Object>(16);
+    	map.put("pageSize",PAGE_SIZE);
+    	map.put("offset", (currPage-1)*PAGE_SIZE);
+    	if(StringUtil.isNotEmpty(agreement.getName())) {
+    		map.put("name", agreement.getName());
+    	}
+    	List<Agreement> agreementList=agreementService.queryAgreementPage(map);
+    	Integer count=agreementService.queryAgreementPageCount(map);
+        result.put("agreementList", agreementList);
+        result.put("count", count);
+        result.put("pageCount",StringUtil.getPageCount(count,PAGE_SIZE));
+        result.put("currPage", currPage);
+    	  return result;
+    }
+    /**
+    *查询详情
+    */
+     @RequestMapping(value = "/queryAgreementDetails", method = RequestMethod.GET)
+    public String queryAgreementDetails(HttpServletRequest request,Integer id,Integer pageIndex){
+   
+   	  if(id!=null&&id!=0) {
+   		 Agreement agreement=new Agreement();
+   		 agreement.setId(id);
+           agreement=agreementService.queryAgreement(agreement);
+          request.setAttribute("agreement", agreement);
+   		request.setAttribute("pageIndex", pageIndex);
+       	}
+        return "agreement/agreementDetails";
+    }
+    /**
+    *查询详情
+    */
+     @RequestMapping(value = "/queryAgreementBaseInfo", method = RequestMethod.GET)
+    public String queryAgreementBaseInfo(HttpServletRequest request,Integer id,Integer pageIndex){
+   
+   	  if(id!=null&&id!=0) {
+   		Agreement agreement=new Agreement();
+   		agreement.setId(id);
+        agreement=agreementService.queryAgreement(agreement);
+          request.setAttribute("agreement", agreement);
+   		request.setAttribute("pageIndex", pageIndex);
+       	}
+        return "agreement/agreementBaseInfo";
+    }
+    /**
+    *查询详情
+    */
+     @RequestMapping(value = "/queryAgreementExtendsInfo", method = RequestMethod.GET)
+    public String queryAgreementExtendsInfo(){
+   
+        return "agreement/agreementExtendsInfo";
+    }
+    /**
+    *查询详情
+    */
+     @RequestMapping(value = "/queryAgreementFunctionsInfo", method = RequestMethod.GET)
+    public String queryAgreementFunctionsInfo(){
+   
+        return "agreement/agreementFunctionsInfo";
+    }
+    /**
+    *保存对象
+    *@throws IOException
+    */
+    @RequestMapping(value = "/saveAgreement", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String,Object> saveAgreement(Agreement agreement,String oldDiscern){
+    	Map<String,Object> result=new HashMap<String,Object>(16);
+    	 Agreement a=new Agreement();
+    	 String discern = agreement.getDiscern();
+    	 a.setDiscern(discern);
+       if(agreement.getId()!=null&&agreement.getId()!=0){
+    	   if(!agreement.getDiscern().equals(oldDiscern)) {
+    		   List<Agreement> queryAgreementList =  agreementService.queryAgreementList(a);
+    		   if(queryAgreementList!=null&&queryAgreementList.size()>0) {
+      			 result.put("code", "0");
+      		     return result;
+      		   }
+    	   }
+    	   agreementService.updateAgreement(agreement);
+    	 }else{ 
+    		 List<Agreement> queryAgreementList = agreementService.queryAgreementList(a);
+    		 if(queryAgreementList!=null&&queryAgreementList.size()>0) {
+    			 result.put("code", "0");
+    		     return result;
+    		 }
+    		 ShiroUser shiroUser = queryCurrentShiroUser();
+    		agreement.setCreateor(shiroUser.getLoginName());
+    		agreementService.saveAgreement(agreement);
+    	 }  
+    	return result;
+    }
+    /**
+    *修改对象
+    *@throws IOException
+    */
+    @RequestMapping(value = "/updateAgreement", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String,Object> updateAgreement(Integer id){
+   
+   	Agreement agreement=new Agreement();
+   	agreement.setId(id);
+      agreementService.updateAgreement(agreement);
+   	Map<String,Object> result=new HashMap<String,Object>();
+    	result.put("resultCode", "1");
+    	result.put("resultMessage", "保存成功!");
+    	return result;
+    }
+    /**
+    *删除对象
+    *@throws IOException
+    */
+    @RequestMapping(value = "/deleteAgreement", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String,Object> deleteAgreement(Integer id){
+   	Agreement agreement=new Agreement();
+   	agreement.setId(id);
+		agreementService.deleteAgreement(agreement);
+		Map<String,Object> result=new HashMap<String,Object>();
+    	result.put("resultCode", "1");
+    	result.put("resultMessage", "保存成功!");
+    	return result;
+    }
+
+}
+
+
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/appGuide/AppGuideController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/appGuide/AppGuideController.java
new file mode 100644
index 0000000..198f80e
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/appGuide/AppGuideController.java
@@ -0,0 +1,80 @@
+package cn.pluss.platform.controller.appGuide;
+
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.appGuide.AppGuideService;
+import cn.pluss.platform.entity.AppGuide;
+import cn.pluss.platform.entity.AppVersionInfo;
+import cn.pluss.platform.util.OssOperatUtil;
+import cn.pluss.platform.util.PageUtils;
+import cn.pluss.platform.util.StringUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * @author djh
+ */
+@Controller
+@RequestMapping("/appGuide")
+public class AppGuideController {
+
+    @Autowired
+    private AppGuideService appGuideService;
+
+    @GetMapping("/index")
+    public String index() {
+        return "appGuide/appGuideList";
+    }
+
+    @RequestMapping("add")
+    public String add() {
+        return "appGuide/appGuideDetail";
+    }
+
+    @GetMapping("/edit/{id}")
+    public ModelAndView edit(@PathVariable Integer id){
+        ModelAndView view = new ModelAndView("appGuide/appGuideDetail");
+        AppGuide v = appGuideService.getById(id);
+        view.addObject("entity",v);
+        return view;
+    }
+
+    @GetMapping("page")
+    @ResponseBody
+    public Result<PageInfo<AppGuide>> page(Page<AppGuide> page, AppGuide condition) {
+        Page<AppGuide> pageData= appGuideService.page(page, new QueryWrapper<>(condition));
+        return ResultGenerator.genSuccessResult(PageUtils.page(pageData));
+    }
+
+    @PostMapping("saveOrUpdate")
+    @ResponseBody
+    public Result<String> saveOrUpdate(@RequestBody AppGuide entity) {
+        if (entity.getId() != null && entity.getId() != 0){
+            entity.setUpdateTime(new Date());
+            appGuideService.updateById(entity);
+        }else {
+            entity.setCreateTime(new Date());
+            entity.setUpdateTime(new Date());
+            appGuideService.save(entity);
+        }
+        return ResultGenerator.genSuccessResult("保存成功");
+    }
+
+    @PostMapping("delete")
+    @ResponseBody
+    public Result<String> delete(@RequestBody AppVersionInfo appVersionInfo) {
+        appGuideService.removeById(appVersionInfo.getId());
+        if(StringUtil.isNotEmpty(appVersionInfo.getUrl())){
+            OssOperatUtil.deleteFile(appVersionInfo.getUrl());
+        }
+        return ResultGenerator.genSuccessResult("操作成功!");
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/appVersionInfo/AppVersionInfoController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/appVersionInfo/AppVersionInfoController.java
new file mode 100644
index 0000000..7d508c6
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/appVersionInfo/AppVersionInfoController.java
@@ -0,0 +1,81 @@
+package cn.pluss.platform.controller.appVersionInfo;
+
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.appVersionInfo.AppVersionInfoService;
+import cn.pluss.platform.controller.BaseNoModelController;
+import cn.pluss.platform.entity.AppVersionInfo;
+import cn.pluss.platform.util.OssOperatUtil;
+import cn.pluss.platform.util.PageUtils;
+import cn.pluss.platform.util.StringUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.util.Date;
+import java.util.Map;
+
+@Controller
+@RequiredArgsConstructor
+@RequestMapping("appVersionInfo")
+public class AppVersionInfoController extends BaseNoModelController {
+
+    private final AppVersionInfoService appVersionInfoService;
+
+    @GetMapping("index")
+    public String index() {
+        return "appVersionInfo/list";
+    }
+
+    @RequestMapping("add")
+    public ModelAndView add() {
+        ModelAndView view = new ModelAndView("appVersionInfo/detail");
+        Map<String, String> uploadParam = OssOperatUtil.getUploadParam();
+        view.addObject("uploadParam",uploadParam);
+        return view;
+    }
+
+    @GetMapping("/edit/{id}")
+    public ModelAndView edit(@PathVariable Integer id){
+        ModelAndView view = new ModelAndView("appVersionInfo/detail");
+        AppVersionInfo v = appVersionInfoService.getById(id);
+        Map<String, String> uploadParam = OssOperatUtil.getUploadParam();
+        view.addObject("uploadParam",uploadParam);
+        view.addObject("appVerInfo",v);
+        return view;
+    }
+
+    @GetMapping("page")
+    @ResponseBody
+    public Result<PageInfo<AppVersionInfo>> page(Page<AppVersionInfo> page,AppVersionInfo appVersionInfo) {
+        Page<AppVersionInfo> pageData= appVersionInfoService.pageData(page,appVersionInfo);
+        return ResultGenerator.genSuccessResult(PageUtils.page(pageData));
+    }
+
+    @PostMapping("saveOrUpdate")
+    @ResponseBody
+    public Result<String> saveOrUpdate(@RequestBody AppVersionInfo appVersionInfo) {
+        if (appVersionInfo.getId()!= 0){
+            appVersionInfo.setUpdateTime(new Date());
+            appVersionInfoService.updateById(appVersionInfo);
+        }else {
+            appVersionInfo.setCreateTime(new Date());
+            appVersionInfo.setUpdateTime(new Date());
+            appVersionInfoService.save(appVersionInfo);
+        }
+        return ResultGenerator.genSuccessResult("保存成功");
+    }
+
+    @PostMapping("delete")
+    @ResponseBody
+    public Result<String> delete(@RequestBody AppVersionInfo appVersionInfo) {
+        appVersionInfoService.removeById(appVersionInfo.getId());
+        if(StringUtil.isNotEmpty(appVersionInfo.getUrl())){
+            OssOperatUtil.deleteFile(appVersionInfo.getUrl());
+        }
+        return ResultGenerator.genSuccessResult("操作成功!");
+    }
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/audit/SubMerchantApplyOrderController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/audit/SubMerchantApplyOrderController.java
new file mode 100644
index 0000000..9fe5651
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/audit/SubMerchantApplyOrderController.java
@@ -0,0 +1,102 @@
+package cn.pluss.platform.controller.audit;
+
+
+import cn.pluss.platform.SubMerchantApplyOrderService;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.entity.SubMerchantApplyOrder;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 子渠道工单信息表 前端控制器
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-08-31
+ */
+@Controller
+@RequestMapping("/subMerchantApplyOrder")
+public class SubMerchantApplyOrderController extends BaseModelController<SubMerchantApplyOrderService, SubMerchantApplyOrder> {
+    @Autowired
+    private SubMerchantApplyOrderService subMerchantApplyOrderService;
+
+    @RequestMapping("/toList")
+    public String toList() {
+        return "subMerchantApplyOrder/list";
+    }
+
+    @RequestMapping("/detail")
+    public String detail() {
+        return "subMerchantApplyOrder/detail";
+    }
+
+    @RequestMapping("/pageMoreDetail")
+    @ResponseBody
+    public Result<Page<Map<String, Object>>> page(Page<Map<String, Object>> page, @RequestParam Map<String, String> condition) {
+        Page<Map<String, Object>> mapPage = baseService.pageMoreDetail(page, condition);
+        return ResultGenerator.genSuccessResult(mapPage);
+    }
+
+    @RequestMapping(value = "/remark", method = RequestMethod.GET)
+    public ModelAndView remark(@RequestParam(value = "merchantCode") String merchantCode, Integer channel, ModelAndView view) {
+        view.setViewName("subMerchantApplyOrder/remark");
+        view.addObject("channel", channel);
+        view.addObject("merchantCode", merchantCode);
+        return view;
+    }
+
+    @RequestMapping(value = "/disable", method = RequestMethod.POST)
+    @ResponseBody
+    public Result<SubMerchantApplyOrder> disable(String merchantCode, String resultStatus, String channel) {
+        QueryWrapper<SubMerchantApplyOrder> queryWrapper = new QueryWrapper<SubMerchantApplyOrder>()
+                .eq("merchantCode", merchantCode)
+                .eq("channelId", channel);
+        SubMerchantApplyOrder subMerchantApplyOrder = new SubMerchantApplyOrder();
+        subMerchantApplyOrder.setResultStatus(resultStatus);
+        subMerchantApplyOrder.setStatus("2");
+        subMerchantApplyOrderService.update(subMerchantApplyOrder, queryWrapper);
+        return ResultGenerator.genSuccessResult("修改成功", subMerchantApplyOrder);
+    }
+
+    @RequestMapping(value = "/complete", method = RequestMethod.POST)
+    @ResponseBody
+    public Result<Object> complete(String merchantCode, String channel) {
+        LambdaUpdateWrapper<SubMerchantApplyOrder> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.eq(SubMerchantApplyOrder::getMerchantCode, merchantCode)
+                .eq(SubMerchantApplyOrder::getChannelId, channel)
+                .and(wrapper -> {
+                    wrapper.ne(SubMerchantApplyOrder::getStatus, "1")
+                            .or()
+                            .isNull(SubMerchantApplyOrder::getStatus);
+                })
+                .set(SubMerchantApplyOrder::getResultStatus, SubMerchantApplyOrder.RES_STATUS_COMPLETE)
+                .set(SubMerchantApplyOrder::getStatus, SubMerchantApplyOrder.RES_STATUS_COMPLETE);
+
+        boolean updateCount = baseService.update(updateWrapper);
+        if (!updateCount) {
+            SubMerchantApplyOrder subMerchApplyOrder = new SubMerchantApplyOrder();
+            subMerchApplyOrder.setMerchantCode(merchantCode);
+            subMerchApplyOrder.setChannelId(Integer.parseInt(channel));
+            subMerchApplyOrder.setStatus(SubMerchantApplyOrder.RES_STATUS_SUCCESS);
+            subMerchApplyOrder.setResultStatus(SubMerchantApplyOrder.RES_STATUS_SUCCESS);
+            subMerchApplyOrder.setSubMchType("WX");
+            subMerchApplyOrder.setRemark("已通过手动码或其他方式认证");
+            baseService.save(subMerchApplyOrder);
+        }
+
+        return ResultGenerator.genSuccessResult("修改成功", null);
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/auth/AuthController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/auth/AuthController.java
new file mode 100644
index 0000000..6f18066
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/auth/AuthController.java
@@ -0,0 +1,44 @@
+package cn.pluss.platform.controller.auth;
+
+import cn.pluss.platform.entity.MenuInfo;
+import cn.pluss.platform.shiro.UserService;
+import cn.pluss.platform.util.JwtUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+@Slf4j
+@Controller
+@RequestMapping("auth")
+public class AuthController {
+
+    @Autowired
+    private UserService userService;
+
+    @Autowired
+    private HttpServletRequest request;
+
+    @RequestMapping(value = "/getPermissionMenusOnceAll", method = RequestMethod.POST)
+    @ResponseBody
+    public List<MenuInfo> getPermissionMenusOnceAll() {
+        String token = request.getHeader("token");
+        Object loginName = JwtUtils.get("loginName", token);
+        List<MenuInfo> menus = userService.getPermissionNames(loginName.toString());
+        return menus;
+    }
+
+    @RequestMapping(value = "/menuId", method = RequestMethod.POST)
+    @ResponseBody
+    public Integer menuId(){
+        String link="/notification/index";
+        int notificationMenuId = userService.getNotificationMenuId(link);
+        return notificationMenuId;
+    }
+
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/banner/BannerController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/banner/BannerController.java
new file mode 100644
index 0000000..693a099
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/banner/BannerController.java
@@ -0,0 +1,103 @@
+package cn.pluss.platform.controller.banner;
+
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.banner.BannerService;
+import cn.pluss.platform.controller.BaseNoModelController;
+import cn.pluss.platform.entity.Banner;
+import cn.pluss.platform.util.OssOperatUtil;
+import cn.pluss.platform.util.PageUtils;
+import cn.pluss.platform.util.StringUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.util.Map;
+
+@Controller
+@RequestMapping("banner")
+public class BannerController extends BaseNoModelController {
+
+    @Autowired
+    private BannerService bannerService;
+
+    /**
+     * 引导页
+     *
+     * @return
+     */
+    @RequestMapping(value = "/index", method = RequestMethod.GET)
+    public String index() {
+        return "banner/bannerList";
+    }
+
+    /**
+     * 分页查询
+     */
+    @GetMapping("/page")
+    @ResponseBody
+    public Result<PageInfo<Banner>> queryHelpVideoByPage(Page<Banner> page) {
+        QueryWrapper<Banner> bannerQueryWrapper = new QueryWrapper<Banner>().orderByDesc("seq");
+        page = bannerService.page(page, bannerQueryWrapper);
+        return ResultGenerator.genSuccessResult(PageUtils.page(page));
+    }
+
+    @GetMapping("/add")
+    public ModelAndView add() {
+        ModelAndView view = new ModelAndView("banner/bannerBaseInfo");
+        Map<String, String> uploadParam = OssOperatUtil.getUploadParam();
+        view.addObject("uploadParam", uploadParam);
+        return view;
+    }
+
+    @PostMapping("/saveOrUpdate")
+    @ResponseBody
+    public Result<String> saveOrUpdate(@RequestBody Banner banner) {
+        if (banner.getId() == null) {
+            bannerService.save(banner);
+        } else {
+            bannerService.updateById(banner);
+        }
+        return ResultGenerator.genSuccessResult("保存成功");
+    }
+
+    @RequestMapping("/edit/{id}")
+    public ModelAndView edit(@PathVariable Integer id) {
+        ModelAndView view = new ModelAndView("banner/bannerBaseInfo");
+        Banner banner = bannerService.getById(id);
+        Map<String, String> uploadParam = OssOperatUtil.getUploadParam();
+        view.addObject("banner", banner);
+        view.addObject("uploadParam", uploadParam);
+        return view;
+    }
+
+    @PostMapping("/statusUpdate")
+    @ResponseBody
+    public Result<String> statusUpdate(@RequestBody Banner banner) {
+        UpdateWrapper<Banner> bannerUpdateWrapper = new UpdateWrapper<Banner>().eq("id", banner.getId());
+        if (StringUtil.isEmpty(banner.getStatus()) || banner.getStatus().equals("1")) {
+            banner.setStatus("0");
+            bannerService.update(banner, bannerUpdateWrapper);
+        } else {
+            banner.setStatus("1");
+            bannerService.update(banner, bannerUpdateWrapper);
+        }
+        return ResultGenerator.genSuccessResult("操作成功!");
+    }
+
+    @PostMapping("delete")
+    @ResponseBody
+    public Result<String> delete(@RequestBody Banner banner) {
+        bannerService.removeById(banner.getId());
+        if (StringUtil.isNotEmpty(banner.getPicUrl())) {
+            OssOperatUtil.deleteFile(banner.getPicUrl());
+        }
+        return ResultGenerator.genSuccessResult("操作成功!");
+    }
+
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/bestNewActivity/BestNewActivityController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/bestNewActivity/BestNewActivityController.java
new file mode 100644
index 0000000..c2b3605
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/bestNewActivity/BestNewActivityController.java
@@ -0,0 +1,91 @@
+package cn.pluss.platform.controller.bestNewActivity;
+
+import cn.pluss.platform.PushService;
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.bestNewActivity.BestNewActivityService;
+import cn.pluss.platform.controller.BaseNoModelController;
+import cn.pluss.platform.entitiy.ShiroUser;
+import cn.pluss.platform.entity.BestNewActivity;
+import cn.pluss.platform.util.PageUtils;
+import cn.pluss.platform.util.StringUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.Setter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
+import java.util.Objects;
+
+@Controller
+@RequestMapping("bestNewActivity")
+public class BestNewActivityController extends BaseNoModelController {
+
+    @Autowired
+    private BestNewActivityService bestNewActivityService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private PushService pushService;
+
+    /**
+     * 引导页
+     *
+     * @return
+     */
+    @GetMapping("/index")
+    public String index() {
+        return "bestNewActivity/bestNewActivityList";
+    }
+
+    @GetMapping("/page")
+    @ResponseBody
+    public Result<PageInfo<BestNewActivity>> page(Page<BestNewActivity> page, BestNewActivity bestNewActivity) {
+        QueryWrapper<BestNewActivity> bestNewActivityQueryWrapper = new QueryWrapper<BestNewActivity>().orderByAsc("seq");
+        if (StringUtil.isNotEmpty(bestNewActivity.getTitle())) {
+            bestNewActivityQueryWrapper.eq("title", bestNewActivity.getTitle());
+        }
+        page = bestNewActivityService.page(page, bestNewActivityQueryWrapper);
+        return ResultGenerator.genSuccessResult(PageUtils.page(page));
+    }
+
+    //数据回显
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = {"/detail/{id}", "/detail"})
+    public String detail(HttpServletRequest request, @PathVariable(value = "id", required = false) Integer id) {
+        if (StringUtil.isNotEmpty(id)) {
+            BestNewActivity bestNewActivity = bestNewActivityService.getById(id);
+            request.setAttribute("entity", bestNewActivity);
+        }
+        return "bestNewActivity/bestNewActivityBaseInfo";
+    }
+
+    @PostMapping("/saveOrUpdate")
+    @ResponseBody
+    public Result<BestNewActivity> saveOrUpdate(@RequestBody BestNewActivity bestNewActivity) {
+
+        if (StringUtil.isEmpty(bestNewActivity.getId())) {
+            bestNewActivity.setUpdateTime(new Date());
+            ShiroUser shiroUser = queryCurrentShiroUser();
+            bestNewActivity.setUpdateor(shiroUser.getLoginName());
+            bestNewActivityService.save(bestNewActivity);
+            String pushType = bestNewActivity.getPushType();
+            if(Objects.equals(pushType, "1")){
+                pushService.pushAll(bestNewActivity.getTitle(), bestNewActivity.getDesc());
+            }
+        } else {
+            UpdateWrapper<BestNewActivity> updateWrapper = new UpdateWrapper<BestNewActivity>().eq("id", bestNewActivity.getId());
+            bestNewActivityService.update(bestNewActivity, updateWrapper);
+        }
+        return ResultGenerator.genSuccessResult("保存成功", bestNewActivity);
+    }
+
+    @PostMapping("/delete")
+    public Result<BestNewActivity> delete(@RequestBody BestNewActivity bestNewActivity) {
+        bestNewActivityService.removeById(bestNewActivity.getId());
+        return ResultGenerator.genSuccessResult("删除成功！", bestNewActivity);
+    }
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/business/BusinessInfoController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/business/BusinessInfoController.java
new file mode 100644
index 0000000..8535c61
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/business/BusinessInfoController.java
@@ -0,0 +1,41 @@
+package cn.pluss.platform.controller.business;
+
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.business.BusinessInfoService;
+import cn.pluss.platform.util.PageUtils;
+import cn.pluss.platform.vo.BusinessInfoVo;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+@Controller
+@RequiredArgsConstructor
+@RequestMapping("businessInfo")
+public class BusinessInfoController {
+
+
+    private final BusinessInfoService businessInfoService;
+
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = "/list")
+    public String index() {
+        return "business/list";
+    }
+
+    @GetMapping("/page")
+    @ResponseBody
+    public Result<PageInfo<BusinessInfoVo>> page(Page<BusinessInfoVo> page, BusinessInfoVo businessInfoVo) {
+        Page<BusinessInfoVo> pageData = businessInfoService.pageData(page, businessInfoVo);
+        return ResultGenerator.genSuccessResult(PageUtils.page(pageData));
+    }
+
+    /*@PostMapping("/delete")
+    public Result<AgentInfo> del(@RequestBody AgentInfo agentInfo) {
+        agentInfoService.delete(agentInfo);
+        return ResultGenerator.genSuccessResult("删除成功", agentInfo);
+    }*/
+
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/cash/CashAccountController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/cash/CashAccountController.java
new file mode 100644
index 0000000..9ff0750
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/cash/CashAccountController.java
@@ -0,0 +1,49 @@
+package cn.pluss.platform.controller.cash;
+
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.cashAccount.CashAccountService;
+import cn.pluss.platform.entity.CashAccount;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author bzg
+ * @since 2021-07-23
+ */
+@Controller
+@RequestMapping("/cashAccount")
+public class CashAccountController extends BaseModelController<CashAccountService, CashAccount> {
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = "/index")
+    public String index() {
+        return "cash/account/list";
+    }
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = {"/detail/{id}", "/detail"})
+    public String detail(HttpServletRequest request, @PathVariable(value = "id", required = false) Integer id) {
+        if (id != null) {
+            CashAccount cashAccount = new CashAccount().setId(id);
+            cashAccount = baseService.getOne(new QueryWrapper<>(cashAccount));
+            request.setAttribute("entity", cashAccount);
+        }
+        return "cash/account/detail";
+    }
+
+    @Override
+    public Result<Page<CashAccount>> page(Page<CashAccount> page, CashAccount condition, OrderItem orderItem) {
+        orderItem.setColumn("createTime");
+        orderItem.setAsc(false);
+        return super.page(page, condition, orderItem);
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/cash/CashController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/cash/CashController.java
new file mode 100644
index 0000000..dcf1d94
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/cash/CashController.java
@@ -0,0 +1,297 @@
+package cn.pluss.platform.controller.cash;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.cash.CashService;
+import cn.pluss.platform.controller.BaseController;
+import cn.pluss.platform.entity.Cash;
+import cn.pluss.platform.entity.UserInfo;
+import cn.pluss.platform.merchantOrder.MerchantOrderService;
+import cn.pluss.platform.userInfo.UserInfoService;
+import cn.pluss.platform.util.DateUtils;
+import cn.pluss.platform.util.StringUtil;
+import lombok.Setter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.util.*;
+
+/**
+ * @author DJH
+ */
+@Controller
+@RequestMapping("cash")
+public class CashController extends BaseController<CashService, Cash> {
+
+    @Setter(onMethod_ = {@Autowired})
+    private CashService cashService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private HttpServletRequest request;
+
+    @Setter(onMethod_ = {@Autowired})
+    private UserInfoService userInfoService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantOrderService merchantOrderService;
+
+    /**
+     * 引导页
+     */
+    @GetMapping(value = "/index")
+    public String index(Cash condition) {
+        String type = request.getParameter("type");
+        request.setAttribute("type", type);
+        Result<Object> otherData = getOtherData(condition);
+        request.setAttribute("otherData",otherData.getData());
+        return "cash/cashList";
+    }
+
+    @RequestMapping(value = "otherData")
+    @ResponseBody
+    public Result<Object> getOtherData(Cash condition){
+        String nowDate = DateUtils.currentStringDate();
+        String startTime = nowDate + " 00:00:00";
+        String endTime = nowDate + " 23:59:59";
+        Map<String,Object> params = new HashMap<>();
+        params.put("startTime", StringUtil.isNotEmpty(condition.getBeginTime()) ? condition.getBeginTime() : startTime);
+        params.put("endTime", StringUtil.isNotEmpty(condition.getEndTime()) ? condition.getEndTime() : endTime);
+        Map<String, Object> orderData = merchantOrderService.getOrderCountData(params);
+        if (orderData == null) {
+            orderData = new HashMap<>();
+        }
+        params.put("userId", condition.getUserId());
+        if(StringUtil.isNotEmpty(condition.getUserId())){
+            params.remove("startTime");
+            params.remove("endTime");
+        }
+        Map<String, Object> cashData = cashService.getCashCountData(params);
+        orderData.putAll(cashData);
+        return ResultGenerator.genSuccessResult(orderData);
+    }
+
+    /**
+     * 分页查询
+     */
+    @RequestMapping(value = "/queryCashByPage", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> queryCashByPage(@RequestParam(defaultValue = "1") Integer currPage
+            , @RequestParam(defaultValue = "10") Integer pageSize
+            , Cash cash) {
+
+        Map<String, Object> map = new HashMap<>(16);
+        map.put("pageSize", pageSize);
+        map.put("offset", (currPage - 1) * pageSize);
+        if (StringUtil.isNotEmpty(cash.getType())) {
+            map.put("type", cash.getType());
+        }
+        if (StringUtil.isNotEmpty(cash.getUserName())) {
+            map.put("userName", cash.getUserName());
+        }
+        if (StringUtil.isNotEmpty(cash.getMerchantName())) {
+            map.put("merchantName", cash.getMerchantName());
+        }
+        if (StringUtil.isNotEmpty(cash.getStatus())) {
+            map.put("status", cash.getStatus());
+        }
+        if (StringUtil.isNotEmpty(cash.getPhone())) {
+            map.put("phone", cash.getPhone());
+        }
+        if (StringUtil.isNotEmpty(cash.getId())) {
+            map.put("id", cash.getId());
+        }
+        if (StringUtil.isNotEmpty(cash.getUserId())) {
+            map.put("userId", cash.getUserId());
+        }
+        if (StringUtil.isNotEmpty(cash.getBeginTime())) {
+            map.put("beginTime", cash.getBeginTime());
+        }
+        if (StringUtil.isNotEmpty(cash.getEndTime())) {
+            map.put("endTime", cash.getEndTime());
+        }
+        List<Cash> cashList = cashService.queryCashPage(map);
+        //添加手机号
+        for (Cash cash2 : cashList) {
+            UserInfo userInfo = new UserInfo();
+            userInfo.setId(cash2.getUserId());
+            userInfo = userInfoService.queryUserInfo(userInfo);
+            if (userInfo != null && userInfo.getPhone() != null) {
+                cash2.setPhone(userInfo.getPhone());
+            }
+        }
+        Integer count = cashService.queryCashPageCount(map);
+
+        Map<String, Object> result = new HashMap<>(16);
+        result.put("cashList", cashList);
+        result.put("count", count);
+        result.put("pageCount", StringUtil.getPageCount(count, pageSize));
+        result.put("currPage", currPage);
+        return result;
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryCashDetails", method = RequestMethod.GET)
+    public String queryCashDetails(HttpServletRequest request, Long id, Integer pageIndex) {
+
+        if (id != null && id != 0) {
+            Cash cash = new Cash();
+            cash.setId(id);
+            cash = cashService.queryCash(cash);
+            request.setAttribute("cash", cash);
+            request.setAttribute("pageIndex", pageIndex);
+        }
+        return "cash/cashDetails";
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryCashBaseInfo", method = RequestMethod.GET)
+    public String queryCashBaseInfo(HttpServletRequest request, Long id, Integer pageIndex) {
+
+        if (id != null && id != 0) {
+            Cash cash = new Cash();
+            cash.setId(id);
+            cash = cashService.queryCash(cash);
+            request.setAttribute("cash", cash);
+            request.setAttribute("pageIndex", pageIndex);
+        }
+        return "cash/cashBaseInfo";
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryCashExtendsInfo", method = RequestMethod.GET)
+    public String queryCashExtendsInfo() {
+        return "cash/cashExtendsInfo";
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryCashFunctionsInfo", method = RequestMethod.GET)
+    public String queryCashFunctionsInfo() {
+        return "cash/cashFunctionsInfo";
+    }
+
+    /**
+     * 保存对象
+     */
+    @RequestMapping(value = "/saveCash", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> saveCash(Cash cash) {
+
+        cashService.saveOrUpdate(cash);
+        Map<String, Object> result = new HashMap<>();
+        result.put("resultCode", "1");
+        result.put("resultMessage", "保存成功!");
+        return result;
+    }
+
+    /**
+     * 修改对象
+     *
+     * @throws IOException
+     */
+    @RequestMapping(value = "/updateCash", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> updateCash(Long id) {
+
+        Cash cash = new Cash();
+        cash.setId(id);
+        cashService.updateCash(cash);
+        Map<String, Object> result = new HashMap<>();
+        result.put("resultCode", "1");
+        result.put("resultMessage", "保存成功!");
+        return result;
+    }
+
+    /**
+     * 删除对象
+     *
+     * @throws IOException
+     */
+    @RequestMapping(value = "/deleteCash", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> deleteCash(Long id) {
+        cashService.removeById(id);
+        Map<String, Object> result = new HashMap<>();
+        result.put("resultCode", "1");
+        result.put("resultMessage", "保存成功!");
+        return result;
+    }
+
+    @GetMapping("/pass/{id}")
+    public String pass(HttpServletRequest request, @PathVariable("id") String id) {
+        Cash entity = cashService.getById(id);
+        request.setAttribute("entity", entity);
+        return "/cash/cashPass";
+    }
+
+    /**
+     * realAuditPass:(cash提现审核通过). <br/>
+     *
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    @PostMapping("/realAuditPass")
+    @ResponseBody
+    public Result<Object> realAuditPass(Cash cash) {
+        cashService.passAndRemit(cash);
+        return ResultGenerator.genSuccessResult("提现成功", null);
+    }
+
+    /**
+     * @description:手动通过
+     * @date: 2021/9/2 19:17
+     * @param cash:
+     * @return cn.pluss.platform.api.Result<java.lang.Object>
+     */
+    @PostMapping("/auditSuccess")
+    @ResponseBody
+    public Result<Object> auditSuccess(Cash cash) {
+        cash.setUpdateDt(new Date());
+        // cash.setUpdator(queryCurrentShiroUser().getId().toString());
+        cashService.updateCash(cash);
+        return ResultGenerator.genSuccessResult("操作成功",null);
+    }
+
+    /**
+     * realAuditPass:(cash提现审核通过). <br/>
+     *
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    @PostMapping("/batchPass")
+    @ResponseBody
+    public Result<Object> batchPass(@RequestParam(value = "ids[]", required = false) String[] ids) {
+        cashService.batchPassAndRemit(Arrays.asList(ids));
+        return ResultGenerator.genSuccessResult("操作成功",null);
+    }
+
+    /**
+     * realauditRefuse:(cash提现审核拒绝). <br/>
+     *
+     * @param cash
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    @PostMapping("/realauditRefuse")
+    @ResponseBody
+    public Map<String, Object> realauditRefuse(Cash cash) {
+        Map<String, Object> result = new HashMap<>(16);
+        cash.setStatus(2);
+        // cash.setUpdator(queryCurrentShiroUser().getId() + "");
+        cash.setUpdateDt(new Date());
+        cashService.updateCash(cash);
+        return result;
+    }
+}
+
+
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/common/OperationRecordController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/common/OperationRecordController.java
new file mode 100644
index 0000000..2a8c2aa
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/common/OperationRecordController.java
@@ -0,0 +1,50 @@
+package cn.pluss.platform.controller.common;
+
+import cn.jiguang.common.utils.StringUtils;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.operationRecord.OperationRecordService;
+import cn.pluss.platform.vo.OperationRecordVO;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+@Controller
+@RequestMapping("operationRecord")
+public class OperationRecordController {
+
+    @Autowired
+    private OperationRecordService opRecordService;
+
+    @GetMapping("/index")
+    public String index() {
+        return "/operationRecord/index";
+    }
+
+    @GetMapping("/page")
+    @ResponseBody
+    public Result<Object> page(Page<OperationRecordVO> page, OrderItem orderItem, OperationRecordVO condition) {
+        page.getOrders().clear();
+        if (StringUtils.isNotEmpty(orderItem.getColumn())) {
+            switch (orderItem.getColumn()) {
+                case "userName":
+                    orderItem.setColumn("ua.userName");
+                    break;
+                case "count":
+                    orderItem.setColumn("t.count");
+                    break;
+                default:
+                    orderItem.setColumn("opr." + orderItem.getColumn());
+                    break;
+            }
+        }
+        page.getOrders().add(orderItem);
+
+        Page<OperationRecordVO> data = opRecordService.pageVO(page, condition);
+        return ResultGenerator.genSuccessResult(data);
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/common/RiskBlacklistController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/common/RiskBlacklistController.java
new file mode 100644
index 0000000..86e7b0b
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/common/RiskBlacklistController.java
@@ -0,0 +1,82 @@
+package cn.pluss.platform.controller.common;
+
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.common.RiskBlacklistService;
+import cn.pluss.platform.controller.BaseNoModelController;
+import cn.pluss.platform.dto.RiskBlacklistDTO;
+import cn.pluss.platform.entitiy.ShiroUser;
+import cn.pluss.platform.vo.RiskBlacklistVO;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
+/**
+ * <p>
+ * 风控黑名单表 前端控制器
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-09-07
+ */
+@Controller
+@RequestMapping("/riskBlacklist")
+public class RiskBlacklistController extends BaseNoModelController {
+
+    @Autowired
+    private RiskBlacklistService riskBlacklistService;
+
+    @GetMapping("/index")
+    public String index() {
+        return "/riskBlacklist/list";
+    }
+
+    @GetMapping("/simpleForm")
+    public String blacklistForm(HttpServletRequest request, String userId) {
+        request.setAttribute("userId", userId);
+        return "/riskBlacklist/simple_form";
+    }
+
+    @GetMapping("/batchForm")
+    public String blacklistBatchForm(HttpServletRequest request, String[] userId) {
+        request.setAttribute("userIds", userId);
+        return "/riskBlacklist/batch_form";
+    }
+
+    @GetMapping("/page")
+    @ResponseBody
+    public Result<Object> pageVO(Page<RiskBlacklistVO> page, @RequestParam Map<String, Object> map) {
+        page.getOrders().clear();
+        page.getOrders().add(OrderItem.desc("rb.createTime"));
+        page = riskBlacklistService.page(page, map);
+        return ResultGenerator.genSuccessResult("查询成功", page);
+    }
+
+    @PostMapping("/toBlackList")
+    @ResponseBody
+    public Result<Object> toBlackList(@RequestBody RiskBlacklistDTO riskBlacklistDTO) {
+        riskBlacklistService.addData(riskBlacklistDTO);
+        return ResultGenerator.genSuccessResult("操作成功, 关闭" + riskBlacklistDTO.getCount() + "个商户", null);
+    }
+
+    @PostMapping("/batchToBlackList")
+    @ResponseBody
+    public Result<Object> batchToBlackList(@RequestBody RiskBlacklistDTO riskBlacklistDTO) {
+        riskBlacklistService.batchAddData(riskBlacklistDTO);
+        return ResultGenerator.genSuccessResult("操作成功", null);
+    }
+
+    @PostMapping("/relieve")
+    @ResponseBody
+    public Result<Object> relieve(Long userId) {
+        final ShiroUser shiroUser = queryCurrentShiroUser();
+        riskBlacklistService.relieve(shiroUser.getId(), userId);
+        return ResultGenerator.genSuccessResult("操作成功", null);
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/device/DeviceBsjController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/device/DeviceBsjController.java
new file mode 100644
index 0000000..8fa34f8
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/device/DeviceBsjController.java
@@ -0,0 +1,56 @@
+package cn.pluss.platform.controller.device;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.device.DeviceBsjService;
+import cn.pluss.platform.entity.DeviceBsj;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+@RequestMapping("/deivceBsj")
+@Controller
+public class DeviceBsjController extends BaseModelController<DeviceBsjService, DeviceBsj> {
+
+    @Autowired
+    private DeviceBsjService bsjService;
+
+    @Override
+    public Result<Page<DeviceBsj>> page(Page<DeviceBsj> page, DeviceBsj condition, OrderItem orderItem) {
+        orderItem = OrderItem.desc("simExpireTime");
+        return super.page(page, condition, orderItem);
+    }
+
+    /**
+     * 数据展示页面
+     * @return
+     */
+    @GetMapping("/index")
+    public String index() {
+        return "device/deviceBsj/list";
+    }
+
+    @PostMapping("/importExpiredTime")
+    @ResponseBody
+    public Result<?> importExpiredTime(@RequestBody MultipartFile file) {
+        try {
+            bsjService.importExpiredTime(file);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResultGenerator.genFailResult("操作异常，请稍后重试");
+        }
+
+        return ResultGenerator.genSuccessResult("数据导入成功", null);
+    }
+
+    @PostMapping("/sendExpiredTime")
+    @ResponseBody
+    public Result<?> sendExpiredTime() {
+        bsjService.sendBatchExpiredNotice();
+        return ResultGenerator.genSuccessResult("流量卡到期通知已发送", null);
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/device/DeviceController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/device/DeviceController.java
new file mode 100644
index 0000000..a7cd369
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/device/DeviceController.java
@@ -0,0 +1,100 @@
+package cn.pluss.platform.controller.device;
+
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.controller.BaseNoModelController;
+import cn.pluss.platform.device.DeviceService;
+import cn.pluss.platform.entity.Device;
+import cn.pluss.platform.util.OssOperatUtil;
+import cn.pluss.platform.util.PageUtils;
+import cn.pluss.platform.util.StringUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.util.Date;
+import java.util.Map;
+
+
+@Controller
+@RequestMapping("device")
+public class DeviceController extends BaseNoModelController {
+
+    @Autowired
+    private DeviceService deviceService;
+
+    /**
+     * 引导页
+     *
+     * @return
+     */
+    @GetMapping("/index")
+    public String index() {
+        return "device/deviceList";
+    }
+
+    @GetMapping("/page")
+    @ResponseBody
+    public Result<PageInfo<Device>> page(Page<Device> page, Device device) {
+        Page<Device> pageDate = deviceService.pageDate(page, device);
+        return ResultGenerator.genSuccessResult(PageUtils.page(pageDate));
+    }
+
+    //数据回显
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = {"/detail/{id}", "/detail"})
+    @ResponseBody
+    public ModelAndView detail(@PathVariable(value = "id", required = false) Integer id) {
+        ModelAndView view = new ModelAndView("device/deviceBaseInfo");
+        if (id != null) {
+            Map<String, String> uploadParam = OssOperatUtil.getUploadParam();
+            view.addObject("uploadParam", uploadParam);
+            Device deviceServiceById = deviceService.getDeviceId(id);
+            System.out.println("deviceServiceById=" + deviceServiceById);
+            view.addObject("entity", deviceServiceById);
+        } else {
+            Map<String, String> uploadParam = OssOperatUtil.getUploadParam();
+            view.addObject("uploadParam", uploadParam);
+        }
+        return view;
+    }
+
+    //设备详情
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = "/particulars/{id}")
+    @ResponseBody
+    public ModelAndView particulars(@PathVariable(value = "id", required = false) Integer id) {
+        ModelAndView view = new ModelAndView("device/particulars");
+        Map<String, String> uploadParam = OssOperatUtil.getUploadParam();
+        view.addObject("uploadParam", uploadParam);
+        Device deviceServiceById = deviceService.getDeviceId(id);
+        System.out.println("deviceServiceById=" + deviceServiceById);
+        view.addObject("entity", deviceServiceById);
+        return view;
+    }
+
+    @PostMapping("/saveOrUpdate")
+    @ResponseBody
+    public Result<String> saveOrUpdate(@RequestBody Device device) {
+        if (device.getId() == null) {
+            device.setCreateDt(new Date());
+            deviceService.save(device);
+        } else {
+            deviceService.updateById(device);
+        }
+        return ResultGenerator.genSuccessResult("保存成功");
+    }
+
+    @PostMapping("/delete")
+    public Result<Device> delete(@RequestBody Device device) {
+        deviceService.removeById(device.getId());
+        if (StringUtil.isNotEmpty(device.getDeviceLogo())) {
+            OssOperatUtil.deleteFile(device.getDeviceLogo());
+        }
+        return ResultGenerator.genSuccessResult("删除成功", device);
+    }
+
+}
+
+
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/device/DeviceGoodTagController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/device/DeviceGoodTagController.java
new file mode 100644
index 0000000..50cae97
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/device/DeviceGoodTagController.java
@@ -0,0 +1,28 @@
+package cn.pluss.platform.controller.device;
+
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.device.DeviceGoodTagService;
+import cn.pluss.platform.entity.DeviceGoodTag;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import javax.servlet.http.HttpServletRequest;
+
+@Controller
+@RequestMapping("/deviceGoodTag")
+public class DeviceGoodTagController extends BaseModelController<DeviceGoodTagService, DeviceGoodTag> {
+
+    @GetMapping("index")
+    public String index() {
+        return "device/tag/list";
+    }
+
+    @GetMapping({"detail/{id}", "detail"})
+    public String detail(HttpServletRequest request, @PathVariable(value = "id", required = false) Integer id) {
+        DeviceGoodTag entity = baseService.getById(id);
+        request.setAttribute("entity", entity);
+        return "device/tag/detail";
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/device/DeviceSpecController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/device/DeviceSpecController.java
new file mode 100644
index 0000000..578f3dd
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/device/DeviceSpecController.java
@@ -0,0 +1,60 @@
+package cn.pluss.platform.controller.device;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.device.DeviceSpecService;
+import cn.pluss.platform.device.DeviceTransferService;
+import cn.pluss.platform.device.DeviceTypeService;
+import cn.pluss.platform.entity.DeviceSpec;
+import cn.pluss.platform.entity.DeviceType;
+import cn.pluss.platform.entity.UserLevel;
+import cn.pluss.platform.entity.UserRole;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+
+/**
+ * TODO
+ *
+ * @author crystal
+ * @date 2022/4/15 10:58
+ */
+@Controller
+@RequestMapping("deviceSpec")
+public class DeviceSpecController extends BaseModelController<DeviceSpecService, DeviceSpec> {
+
+    @Resource
+    private DeviceTypeService deviceTypeService;
+
+    @GetMapping("/index")
+    public String index() {
+        return "device/spec/list";
+    }
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = {"/detail/{id}", "/detail"})
+    public String detail(HttpServletRequest request, @PathVariable(value = "id", required = false) Integer id) {
+        List<DeviceType> typeList = deviceTypeService.list();
+        if (id != null) {
+            DeviceSpec entity = baseService.getById(id);
+            request.setAttribute("entity", entity);
+        }
+        request.setAttribute("codeList", typeList);
+        return "device/spec/detail";
+    }
+
+    @Override
+    public Result<Page<DeviceSpec>> page(Page<DeviceSpec> page, DeviceSpec condition, OrderItem orderItem) {
+        orderItem.setColumn("id").setAsc(false);
+        return super.page(page, condition, orderItem);
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/device/DeviceTypeController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/device/DeviceTypeController.java
new file mode 100644
index 0000000..6bf8d0b
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/device/DeviceTypeController.java
@@ -0,0 +1,45 @@
+package cn.pluss.platform.controller.device;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.device.DeviceTypeService;
+import cn.pluss.platform.entity.DeviceType;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @author SSS
+ */
+@RequestMapping("/deviceType")
+@Controller
+public class DeviceTypeController extends BaseModelController<DeviceTypeService, DeviceType> {
+
+    @GetMapping("/index")
+    public String list() {
+        return "device/type/list";
+    }
+
+    @Override
+    public Result<Page<DeviceType>> page(Page<DeviceType> page, DeviceType condition, OrderItem orderItem) {
+        orderItem.setColumn("id").setAsc(false);
+        return super.page(page, condition, orderItem);
+    }
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = {"/detail/{id}", "/detail"})
+    public String detail(HttpServletRequest request, @PathVariable(value = "id", required = false) Integer id) {
+        if (id != null) {
+            DeviceType entity = baseService.getById(id);
+            request.setAttribute("entity", entity);
+        }
+        return "device/type/detail";
+    }
+
+
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/device/order/MercOrderDetailController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/device/order/MercOrderDetailController.java
new file mode 100644
index 0000000..455a304
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/device/order/MercOrderDetailController.java
@@ -0,0 +1,135 @@
+package cn.pluss.platform.controller.device.order;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.device.DeviceTypeService;
+import cn.pluss.platform.device.MercDeviceRefundImageService;
+import cn.pluss.platform.device.MercOrderDetailService;
+import cn.pluss.platform.entity.DeviceType;
+import cn.pluss.platform.entity.MercOrderDetail;
+import cn.pluss.platform.entity.PhoneConfig;
+import cn.pluss.platform.entity.PhoneValidateCode;
+import cn.pluss.platform.mapper.DeviceTypeMapper;
+import cn.pluss.platform.mapper.PhoneConfigMapper;
+import cn.pluss.platform.util.StringUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * @author SSS
+ */
+@RequestMapping("/mercOrderDetail")
+@Controller
+public class MercOrderDetailController extends BaseModelController<MercOrderDetailService, MercOrderDetail> {
+
+    @Resource
+    private PhoneConfigMapper phoneConfigMapper;
+
+    @Resource
+    private MercDeviceRefundImageService mercDeviceRefundImageService;
+
+    @Resource
+    private DeviceTypeMapper deviceTypeMapper;
+
+    @GetMapping("/index")
+    public String list(HttpServletRequest request) {
+        List<String> codeList = deviceTypeMapper.selectListCodeByShowFlag();
+        List<PhoneConfig> phoneList = phoneConfigMapper.selectList(Wrappers.emptyWrapper());
+        request.setAttribute("phoneList", phoneList);
+        request.setAttribute("codeArr", StringUtil.join(codeList,","));
+        return "device/order/detailList";
+    }
+
+    /**
+     * 分页查询
+     * @param page
+     * @param condition
+     * @return
+     */
+    @RequestMapping("pageInfo")
+    @ResponseBody
+    public Result<Page<MercOrderDetail>> pageInfo(Page<MercOrderDetail> page, MercOrderDetail condition) {
+        page = baseService.pageInfo(page,condition);
+        List<MercOrderDetail> records = page.getRecords();
+        if(!records.isEmpty()){
+            for (MercOrderDetail detail:records) {
+                List<String> picList = mercDeviceRefundImageService.selectListByDetailId(detail.getId());
+                detail.setPicList(picList);
+            }
+        }
+        return ResultGenerator.genSuccessResult(page);
+    }
+
+    /**
+     * 审核退款
+     * @param orderDetail
+     * @return
+     */
+    @PostMapping("/auditRefund")
+    @ResponseBody
+    public Result<Object> refund(MercOrderDetail orderDetail) {
+        return baseService.auditRefund(orderDetail);
+    }
+
+    @GetMapping("/refundReject/{id}")
+    public String refundRejectPage(@PathVariable("id") Long id, HttpServletRequest request) {
+        final MercOrderDetail existData = baseService.getById(id);
+        request.setAttribute("entity", existData);
+
+        return "device/order/reject";
+    }
+
+    @PostMapping("/refundReject")
+    @ResponseBody
+    public Result<Object> refundReject(MercOrderDetail orderDetail) {
+        baseService.refundReject(orderDetail);
+        return ResultGenerator.genSuccessResult("已驳回退货/退款申请", null);
+    }
+
+    @PostMapping("/refundAgree")
+    @ResponseBody
+    public Result<Object> refundAgree(Long id) {
+        baseService.refundAgree(id);
+        return ResultGenerator.genSuccessResult("已同意退款", null);
+    }
+
+    /**
+     * 获取验证码
+     * @param phoneValidateCode
+     * @return
+     */
+    @PostMapping("/getVerifyCode")
+    @ResponseBody
+    public Result<Object> getVerifyCode(PhoneValidateCode phoneValidateCode) {
+        return baseService.getVerifyCode(phoneValidateCode);
+    }
+
+    /**
+     * 推送物流信息
+     * @param ids
+     * @return
+     */
+    @PostMapping("/print")
+    @ResponseBody
+    public Result<Object> printLogistInfo(@RequestParam("ids[]") List<Long> ids) {
+        return baseService.printLogistInfo(ids);
+    }
+
+    /**
+     * 填写快递单号
+     * @param expressNo
+     * @return
+     */
+    @PostMapping("/inputExpressNo")
+    @ResponseBody
+    public Result<Object> inputExpressNo(Long id,String expressNo) {
+        return baseService.inputExpressNo(id,expressNo);
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/device/order/MercOrderExpressDetailController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/device/order/MercOrderExpressDetailController.java
new file mode 100644
index 0000000..a4c839f
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/device/order/MercOrderExpressDetailController.java
@@ -0,0 +1,32 @@
+package cn.pluss.platform.controller.device.order;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.device.MercOrderExpressDetailService;
+import cn.pluss.platform.entity.MercOrderExpressDetail;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @author SSS
+ */
+@RequestMapping("/mercOrderExpressDetail")
+@Controller
+public class MercOrderExpressDetailController extends BaseModelController<MercOrderExpressDetailService, MercOrderExpressDetail> {
+
+    @GetMapping("/index")
+    public String list(HttpServletRequest request,String expressNo) {
+        request.setAttribute("expressNo",expressNo);
+        return "device/express/detailList";
+    }
+
+    @Override
+    public Result<Page<MercOrderExpressDetail>> page(Page<MercOrderExpressDetail> page, MercOrderExpressDetail condition, OrderItem orderItem) {
+        orderItem.setColumn("id").setAsc(false);
+        return super.page(page, condition, orderItem);
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/device/order/MercOrderNewController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/device/order/MercOrderNewController.java
new file mode 100644
index 0000000..04fc575
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/device/order/MercOrderNewController.java
@@ -0,0 +1,30 @@
+package cn.pluss.platform.controller.device.order;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.device.MercOrderNewService;
+import cn.pluss.platform.entity.MercOrderNew;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * @author SSS
+ */
+@RequestMapping("/mercOrderNew")
+@Controller
+public class MercOrderNewController extends BaseModelController<MercOrderNewService, MercOrderNew> {
+
+    @GetMapping("/index")
+    public String list() {
+        return "device/order/list";
+    }
+
+    @Override
+    public Result<Page<MercOrderNew>> page(Page<MercOrderNew> page, MercOrderNew condition, OrderItem orderItem) {
+        orderItem.setColumn("createTime").setAsc(false);
+        return super.page(page, condition, orderItem);
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/deviceDetail/DeviceDetailController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/deviceDetail/DeviceDetailController.java
new file mode 100644
index 0000000..13616cc
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/deviceDetail/DeviceDetailController.java
@@ -0,0 +1,131 @@
+package cn.pluss.platform.controller.deviceDetail;
+
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.device.DeviceSpecService;
+import cn.pluss.platform.device.DeviceStockGroupService;
+import cn.pluss.platform.device.DeviceTypeService;
+import cn.pluss.platform.deviceDetail.DeviceDetailService;
+import cn.pluss.platform.dict.DictService;
+import cn.pluss.platform.entity.*;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.Setter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * <p>
+ * [设备展示表] 前端控制器
+ * </p>
+ *
+ * @author bzg
+ * @since 2020-11-12
+ */
+@Controller
+@RequestMapping("/deviceDetail")
+public class DeviceDetailController extends BaseModelController<DeviceDetailService, DeviceDetail> {
+
+    @Setter(onMethod_ = {@Autowired})
+    private DictService dictService;
+
+    @Autowired
+    private DeviceSpecService deviceSpecService;
+
+    @Autowired
+    private DeviceTypeService deviceTypeService;
+
+    @Autowired
+    private DeviceStockGroupService deviceStockGroupService;
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = "/index")
+    public String index(HttpServletRequest request) {
+        List<Dict> deviceType = dictService.getByCode(Collections.singletonList("DEVICE_TYPE"));
+        request.setAttribute("deviceTypeDict", deviceType);
+        return "deviceDetail/list";
+    }
+
+    @Override
+    public Result<Page<DeviceDetail>> page(Page<DeviceDetail> page, DeviceDetail condition, OrderItem orderItem) {
+        orderItem.setAsc(true).setColumn("seq");
+        condition.setSize(null);
+        Result<Page<DeviceDetail>> pageData = super.page(page, condition, orderItem);
+
+        List<DeviceStockGroup> deviceStockGroupList = deviceStockGroupService.list();
+        List<DeviceType> deviceTypeList = deviceTypeService.list();
+        List<DeviceSpec> deviceSpecList = deviceSpecService.list();
+
+        for (DeviceDetail item : pageData.getData().getRecords()) {
+            for (DeviceStockGroup deviceStockGroup : deviceStockGroupList) {
+                if (deviceStockGroup.getGroupCode().equals(item.getGroupNo())) {
+                    item.setGroupNoDesc(deviceStockGroup.getGroupName());
+                }
+            }
+
+            for (DeviceType deviceType : deviceTypeList) {
+                if (deviceType.getCode().equals(item.getCode())) {
+                    item.setCodeDesc(deviceType.getName());
+                }
+            }
+
+            for (DeviceSpec deviceSpec : deviceSpecList) {
+                if (deviceSpec.getCode().equals(item.getCode()) && deviceSpec.getSpec().equals(item.getType())) {
+                    item.setTypeDesc(deviceSpec.getSpecName());
+                }
+            }
+        }
+
+        return pageData;
+    }
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = {"/detail/{id}", "/detail"})
+    public String detail(HttpServletRequest request, @PathVariable(value = "id", required = false) Integer id) {
+        List<DeviceType> deviceTypeDict = deviceTypeService.list();
+        request.setAttribute("deviceTypeDict",deviceTypeDict);
+        List<DeviceStockGroup> deviceGroupDict = deviceStockGroupService.list();
+        request.setAttribute("deviceGroupDict",deviceGroupDict);
+        if (id != null) {
+            DeviceDetail deviceDetail = this.baseService.getById(id);
+            request.setAttribute("entity",deviceDetail);
+            List<DeviceSpec> subDeviceType = deviceSpecService.listByCode(deviceDetail.getCode());
+            request.setAttribute("subDeviceType",subDeviceType);
+        }
+
+        return "deviceDetail/detail";
+    }
+
+
+    @GetMapping("/getDeviceSubVersionType/{dataType}")
+    @ResponseBody
+    public Result<Object> detail(@PathVariable(value = "dataType") String dataType) {
+        List<DeviceSpec> deviceSpecs = deviceSpecService.listByCode(dataType);
+        return ResultGenerator.genSuccessResult("获取成功",deviceSpecs);
+    }
+
+    @GetMapping("/getDeviceType/{dataType}")
+    @ResponseBody
+    public Result<Object> getDeviceType(@PathVariable(value = "dataType") String dataType) {
+        return ResultGenerator.genSuccessResult("获取成功",null);
+    }
+
+    @PostMapping("saveOrUpdate")
+    @ResponseBody
+    public Result<String> saveOrUpdate(@RequestBody DeviceDetail deviceDetail) {
+        if (deviceDetail.getWholesalePrice() == null) {
+            deviceDetail.setWholesalePrice(deviceDetail.getUnitPrice());
+            deviceDetail.setWholesaleMinNum(1);
+        }
+
+        baseService.saveOrUpdate(deviceDetail);
+
+        return ResultGenerator.genSuccessResult("保存成功",null);
+    }
+
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/deviceGoods/DeviceGoodsController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/deviceGoods/DeviceGoodsController.java
new file mode 100644
index 0000000..95a3a8f
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/deviceGoods/DeviceGoodsController.java
@@ -0,0 +1,135 @@
+package cn.pluss.platform.controller.deviceGoods;
+
+
+import cn.pluss.platform.DeviceGoodsService;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.device.DeviceGoodTagService;
+import cn.pluss.platform.device.DeviceTypeService;
+import cn.pluss.platform.entity.DeviceGoodTag;
+import cn.pluss.platform.entity.DeviceGoods;
+import cn.pluss.platform.entity.DeviceType;
+import cn.pluss.platform.util.OssOperatUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * <p>
+ * 设备商品展示表 前端控制器
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-11-11
+ */
+@Controller
+@RequestMapping("/deviceGoods")
+public class DeviceGoodsController extends BaseModelController<DeviceGoodsService, DeviceGoods> {
+
+    @Autowired
+    private DeviceTypeService deviceTypeService;
+
+    @Autowired
+    private DeviceGoodTagService deviceGoodTagService;
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = "/index")
+    public ModelAndView index() {
+        ModelAndView view = new ModelAndView("deviceGoods/list");
+        List<DeviceType> deviceTypeList = deviceTypeService.list();
+
+        view.addObject("deviceTypeDict", deviceTypeList);
+        view.addObject("deviceTypeJsonDict", JSONObject.toJSONString(deviceTypeList));
+        return view;
+    }
+
+    @Override
+    public Result<Page<DeviceGoods>> page(Page<DeviceGoods> page, DeviceGoods condition, OrderItem orderItem) {
+        orderItem.setAsc(false).setColumn("createTime");
+        Result<Page<DeviceGoods>> data = super.page(page, condition, orderItem);
+
+        List<DeviceGoodTag> tagList = deviceGoodTagService.list();
+
+        for (DeviceGoods item : data.getData().getRecords()) {
+            for (DeviceGoodTag deviceGoodTag : tagList) {
+                if (Objects.equals(item.getTagId(), deviceGoodTag.getId())) {
+                    item.setTag(deviceGoodTag.getTag());
+                    break;
+                }
+            }
+        }
+
+        return data;
+    }
+
+    /**
+     * 数据回显
+     */
+    @GetMapping({"/detail/{id}", "/detail"})
+    public String detail(Model model, @PathVariable(value = "id", required = false) Integer id) {
+        List<DeviceType> deviceTypeList = deviceTypeService.list();
+        model.addAttribute("deviceTypeDict", deviceTypeList);
+
+        List<DeviceGoodTag> list = deviceGoodTagService.list();
+        model.addAttribute("deviceGoodTagList", list);
+
+        Map<String, String> uploadParam = OssOperatUtil.getUploadParam();
+        model.addAttribute("uploadParam",uploadParam);
+        if (id != null) {
+            DeviceGoods deviceGoods = baseService.getById(id);
+            for (DeviceType deviceType : deviceTypeList) {
+                if (deviceGoods.getCode().equals(deviceType.getCode())) {
+                    deviceGoods.setCodeName(deviceType.getName());
+                    break;
+                }
+            }
+
+            model.addAttribute("entity",deviceGoods);
+        }
+        return "deviceGoods/detail";
+    }
+
+//    /**
+//     * 数据回显
+//     */
+//    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = {"/detail/{id}", "/detail"})
+//    @ResponseBody
+//    public ModelAndView detail(@PathVariable(value = "id", required = false) Integer id) {
+//        ModelAndView view = new ModelAndView("deviceGoods/detail");
+//        List<Dict> deviceType = dictService.getByCode(Collections.singletonList("DEVICE_TYPE"));
+//        view.addObject("deviceTypeDict", deviceType);
+//        if (id != null) {
+//            Map<String, String> uploadParam = OssOperatUtil.getUploadParam();
+//            view.addObject("uploadParam",uploadParam);
+//            DeviceGoods deviceGoods = baseService.getById(id);
+//
+//            for (Dict dict : deviceType) {
+//                if (deviceGoods.getCode().equals(dict.getValue())) {
+//                    deviceGoods.setCodeName(dict.getName());
+//                    break;
+//                }
+//            }
+//
+//            view.addObject("entity",deviceGoods);
+//        }else {
+//            Map<String, String> uploadParam = OssOperatUtil.getUploadParam();
+//            view.addObject("uploadParam",uploadParam);
+//        }
+//        return view;
+//    }
+    @PostMapping("saveOrUpdate")
+    @ResponseBody
+    public Result<String> saveOrUpdate(@RequestBody DeviceGoods deviceGoods) {
+        baseService.saveOrUpdate(deviceGoods);
+        return ResultGenerator.genSuccessResult("保存成功",null);
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/deviceMerchantBuy/DeviceMerchantBuyController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/deviceMerchantBuy/DeviceMerchantBuyController.java
new file mode 100644
index 0000000..2311245
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/deviceMerchantBuy/DeviceMerchantBuyController.java
@@ -0,0 +1,328 @@
+package cn.pluss.platform.controller.deviceMerchantBuy;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.controller.BaseNoModelController;
+import cn.pluss.platform.deviceMerchantBuy.DeviceMerchantBuyService;
+import cn.pluss.platform.deviceStock.DeviceStockService;
+import cn.pluss.platform.dict.DictService;
+import cn.pluss.platform.entitiy.ShiroUser;
+import cn.pluss.platform.entity.DeviceMerchantBuy;
+import cn.pluss.platform.entity.DeviceStock;
+import cn.pluss.platform.entity.Dict;
+import cn.pluss.platform.entity.MerchantBaseInfo;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.yt.YtLogistHandler;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.Setter;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Controller
+@RequestMapping("deviceMerchantBuy")
+public class DeviceMerchantBuyController extends BaseNoModelController {
+
+    private Integer PAGE_SIZE = 12;
+
+    @Setter(onMethod_ = {@Autowired})
+    private DeviceMerchantBuyService deviceMerchantBuyService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private DeviceStockService deviceStockService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private DictService dictService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantBaseInfoService merchantBaseInfoService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private HttpServletRequest request;
+
+    @Setter(onMethod_ = {@Autowired})
+    private YtLogistHandler ytLogistHandler;
+
+    /**
+     * 引导页
+     *
+     * @return
+     */
+    @RequestMapping(value = "/index", method = RequestMethod.GET)
+    public ModelAndView index(ModelAndView view) {
+        List<Dict> deviceGroupDict = dictService.getByCode(Collections.singletonList("DEVICE_STOCK_GROUP"));
+        view.addObject("deviceGroupDict", deviceGroupDict);
+        view.setViewName("deviceMerchantBuy/deviceMerchantBuyList");
+        return view;
+    }
+
+    /**
+     * 分页查询
+     */
+    @RequestMapping(value = "/queryDeviceMerchantBuyByPage", method = RequestMethod.GET)
+    @ResponseBody
+    public Result<Page<DeviceMerchantBuy>> queryDeviceMerchantBuyByPage(Page<DeviceMerchantBuy> page, DeviceMerchantBuy deviceMerchantBuy, String startTime, String endTime) {
+        QueryWrapper<DeviceMerchantBuy> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(StringUtils.isNotBlank(deviceMerchantBuy.getOrderNo()),"dmb.orderNo", deviceMerchantBuy.getOrderNo());
+
+        queryWrapper.eq(StringUtils.isNotBlank(deviceMerchantBuy.getMerchantName()), "merchantCode", deviceMerchantBuy.getMerchantName());
+
+        queryWrapper.like(StringUtils.isNotBlank(deviceMerchantBuy.getAlias()),"mbi.alias", deviceMerchantBuy.getAlias());
+
+        queryWrapper.like(StringUtils.isNotBlank(deviceMerchantBuy.getTransNo()),"dmb.transNo", deviceMerchantBuy.getTransNo());
+
+        queryWrapper.eq(StringUtils.isNotBlank(deviceMerchantBuy.getStatus()),"dmb.status", deviceMerchantBuy.getStatus());
+
+        queryWrapper.gt(deviceMerchantBuy.getStartTime() != null, "dmb.createDt", deviceMerchantBuy.getStartTime());
+
+        queryWrapper.lt(deviceMerchantBuy.getEndTime() != null, "dmb.createDt", deviceMerchantBuy.getEndTime());
+
+        queryWrapper.eq(StringUtils.isNotBlank(deviceMerchantBuy.getUserId()), "doi.userId", deviceMerchantBuy.getUserId());
+
+        queryWrapper.like(StringUtils.isNotBlank(deviceMerchantBuy.getName()),"dg.name",deviceMerchantBuy.getName());
+
+        queryWrapper.like(StringUtils.isNotBlank(deviceMerchantBuy.getLinkName()),"dmb.linkName",deviceMerchantBuy.getLinkName());
+
+        queryWrapper.eq(StringUtils.isNotBlank(deviceMerchantBuy.getLinkPhone()),"dmb.linkPhone",deviceMerchantBuy.getLinkPhone());
+
+        queryWrapper.eq(deviceMerchantBuy.getOrderAmount() != null,"dmb.orderAmount",deviceMerchantBuy.getOrderAmount());
+
+        queryWrapper.orderByDesc("id");
+
+        Boolean admin = verifyUserRole();
+        if (!admin) {
+            ShiroUser queryCurrentShiroUser = queryCurrentShiroUser();
+            queryWrapper.eq("status", "1");
+            queryWrapper.eq("merchantCode", queryCurrentShiroUser.getMerchantCode());
+        }
+
+        Page<DeviceMerchantBuy> result = deviceMerchantBuyService.pageDeviceMerchantBuy(page, queryWrapper);
+        return ResultGenerator.genSuccessResult(result);
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryDeviceMerchantBuyDetails", method = RequestMethod.GET)
+    public String queryDeviceMerchantBuyDetails(HttpServletRequest request, Integer id, Integer pageIndex) {
+
+        if (id != null && id != 0) {
+            DeviceMerchantBuy deviceMerchantBuy = new DeviceMerchantBuy();
+            deviceMerchantBuy.setId(id);
+            deviceMerchantBuy = deviceMerchantBuyService.queryDeviceMerchantBuy(deviceMerchantBuy);
+            request.setAttribute("deviceMerchantBuy", deviceMerchantBuy);
+            request.setAttribute("pageIndex", pageIndex);
+        }
+        return "deviceMerchantBuy/deviceMerchantBuyDetails";
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryDeviceMerchantBuyBaseInfo", method = RequestMethod.GET)
+    public String queryDeviceMerchantBuyBaseInfo(HttpServletRequest request, Integer id, Integer pageIndex) {
+
+        if (id != null && id != 0) {
+            DeviceMerchantBuy deviceMerchantBuy = new DeviceMerchantBuy();
+            deviceMerchantBuy.setId(id);
+            deviceMerchantBuy = deviceMerchantBuyService.queryDeviceMerchantBuy(deviceMerchantBuy);
+            request.setAttribute("deviceMerchantBuy", deviceMerchantBuy);
+            request.setAttribute("pageIndex", pageIndex);
+        }
+        return "deviceMerchantBuy/deviceMerchantBuyBaseInfo";
+    }
+
+    @PostMapping("/update")
+    @ResponseBody
+    public Result<Object> update(@RequestBody DeviceMerchantBuy entity) {
+        deviceMerchantBuyService.updateById(entity);
+        return ResultGenerator.genSuccessResult("操作成功", null);
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryDeviceMerchantBuyExtendsInfo", method = RequestMethod.GET)
+    public String queryDeviceMerchantBuyExtendsInfo() {
+
+        return "deviceMerchantBuy/deviceMerchantBuyExtendsInfo";
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryDeviceMerchantBuyFunctionsInfo", method = RequestMethod.GET)
+    public String queryDeviceMerchantBuyFunctionsInfo() {
+
+        return "deviceMerchantBuy/deviceMerchantBuyFunctionsInfo";
+    }
+
+    /**
+     * 保存对象
+     *
+     * @throws IOException
+     */
+    @RequestMapping(value = "/saveDeviceMerchantBuy", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> saveDeviceMerchantBuy(DeviceMerchantBuy deviceMerchantBuy) {
+
+        if (deviceMerchantBuy.getId() != null && deviceMerchantBuy.getId() != 0) {
+            deviceMerchantBuyService.updateDeviceMerchantBuy(deviceMerchantBuy);
+        } else {
+            deviceMerchantBuyService.saveDeviceMerchantBuy(deviceMerchantBuy);
+        }
+        Map<String, Object> result = new HashMap<String, Object>();
+        result.put("resultCode", "1");
+        result.put("resultMessage", "保存成功!");
+        return result;
+    }
+
+    /**
+     * 修改对象
+     *
+     * @throws IOException
+     */
+    @RequestMapping(value = "/updateDeviceMerchantBuy", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> updateDeviceMerchantBuy(Integer id) {
+
+        DeviceMerchantBuy deviceMerchantBuy = new DeviceMerchantBuy();
+        deviceMerchantBuy.setId(id);
+        deviceMerchantBuyService.updateDeviceMerchantBuy(deviceMerchantBuy);
+        Map<String, Object> result = new HashMap<String, Object>();
+        result.put("resultCode", "1");
+        result.put("resultMessage", "保存成功!");
+        return result;
+    }
+
+    /**
+     * 删除对象
+     *
+     * @throws IOException
+     */
+    @RequestMapping(value = "/deleteDeviceMerchantBuy", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> deleteDeviceMerchantBuy(Integer id) {
+        DeviceMerchantBuy deviceMerchantBuy = new DeviceMerchantBuy();
+        deviceMerchantBuy.setId(id);
+        deviceMerchantBuyService.deleteDeviceMerchantBuy(deviceMerchantBuy);
+        Map<String, Object> result = new HashMap<String, Object>();
+        result.put("resultCode", "1");
+        result.put("resultMessage", "保存成功!");
+        return result;
+    }
+
+    /**
+     * expressNo:(填写快递单号). <br/>
+     *
+     * @param deviceMerchantBuy
+     * @return
+     *
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    @RequestMapping(value = "/expressNo", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> expressNo(DeviceMerchantBuy deviceMerchantBuy) {
+        Map<String, Object> result = new HashMap<String, Object>(16);
+        try {
+            deviceMerchantBuyService.updateDeviceMerchantBuy(deviceMerchantBuy);
+            result.put("msg", "操作成功");
+        } catch (Exception e) {
+            result.put("msg", "操作失败");
+            e.printStackTrace();
+        }
+        return result;
+    }
+
+    @RequestMapping(value = "/printYtOrder", method = RequestMethod.POST)
+    @ResponseBody
+    public Result<?> printYtOrder(String ids) {
+        if(StringUtils.isEmpty(ids)){
+            return ResultGenerator.genFailResult("缺失参数");
+        }
+        if(ids.indexOf(",") < 0){
+            DeviceMerchantBuy merchantBy = deviceMerchantBuyService.getById(ids);
+            ytLogistHandler.createYtOrder(merchantBy);
+            deviceMerchantBuyService.updateDeviceMerchantBuy(merchantBy);
+            return ResultGenerator.genSuccessResult("操作成功！",null);
+        }else{
+            String[] idArr = ids.split(",");
+            QueryWrapper<DeviceMerchantBuy> queryWrapper = new QueryWrapper<DeviceMerchantBuy>().
+                    last(" WHERE linkPhone IN ( SELECT linkPhone FROM tb_pluss_device_merchant_buy WHERE id IN ("+ids+") GROUP BY linkPhone HAVING COUNT( linkPhone ) < 2) AND id IN ("+ids+") and status = 1 and expressNo IS NULL");
+            List<DeviceMerchantBuy> list = deviceMerchantBuyService.list(queryWrapper);
+            if(list.isEmpty()){
+                return ResultGenerator.genFailResult("当前选中的订单未满足条件！",null);
+            }
+            int sIndex = idArr.length;
+            int mIndex = list.size();
+            for (DeviceMerchantBuy buy:list) {
+                ytLogistHandler.createYtOrder(buy);
+                deviceMerchantBuyService.updateDeviceMerchantBuy(buy);
+            }
+            return ResultGenerator.genSuccessResult("执行成功个数:"+mIndex+",选中个数:"+sIndex+",重复个数:"+(sIndex-mIndex),null);
+        }
+    }
+
+    @PostMapping(value = "/updateSnNo")
+    @ResponseBody
+    public Result updateQrNo(Integer id, String snNo, String groupNo) {
+        try {
+            QueryWrapper<DeviceStock> queryWrapper = new QueryWrapper<DeviceStock>().eq("groupNo",groupNo)
+                    .eq("snNo",snNo);
+            List<DeviceStock> list = deviceStockService.list(queryWrapper);
+            if(list.isEmpty()){
+                return ResultGenerator.genFailResult("设备编号和设备类型不一致！",null);
+            }
+            DeviceMerchantBuy deviceMerchantBuy = new DeviceMerchantBuy();
+            deviceMerchantBuy.setId(id);
+            DeviceMerchantBuy buy = deviceMerchantBuyService.queryDeviceMerchantBuy(deviceMerchantBuy);
+            if(buy == null){
+                return ResultGenerator.genFailResult("订单数据不存在！",null);
+            }
+            DeviceStock stock = list.get(0);
+            if(!"1".equals(stock.getStatus())){
+                return ResultGenerator.genFailResult("设备已出售或激活，请更换！",null);
+            }
+            QueryWrapper<MerchantBaseInfo> baseInfoQueryWrapper = new QueryWrapper<MerchantBaseInfo>()
+                    .eq("merchantCode",buy.getMerchantCode());
+            List<MerchantBaseInfo> baseInfo = merchantBaseInfoService.list(baseInfoQueryWrapper);
+            if (baseInfo != null && !baseInfo.isEmpty()) {
+                MerchantBaseInfo merchant = baseInfo.get(0);
+                stock.setBuyMercId(String.valueOf(merchant.getId()));
+                stock.setBuyMercName(merchant.getAlias());
+            }
+            buy.setSnNo(snNo);
+            deviceMerchantBuyService.updateDeviceMerchantBuy(buy);
+            stock.setOrderNo(buy.getOrderNo());
+            stock.setStatus("2");
+
+            deviceStockService.updateById(stock);
+            return ResultGenerator.genSuccessResult("操作成功！",null);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResultGenerator.genFailResult("操作异常！",null);
+        }
+    }
+
+    @RequestMapping(value = "/querydeviceMerchantBuyInfo", method = RequestMethod.GET)
+    public String querydeviceMerchantBuyInfo(Integer id, HttpServletRequest request) {
+        DeviceMerchantBuy deviceMerchantBuy = new DeviceMerchantBuy();
+        deviceMerchantBuy.setId(id);
+        deviceMerchantBuy = deviceMerchantBuyService.queryDeviceMerchantBuy(deviceMerchantBuy);
+        request.setAttribute("deviceMerchantBuy", deviceMerchantBuy);
+        return "deviceMerchantBuy/deviceMerchantBuyBaseInfo";
+    }
+}
+
+
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/deviceMerchantBuyDetail/DeviceMerchantBuyDetailController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/deviceMerchantBuyDetail/DeviceMerchantBuyDetailController.java
new file mode 100644
index 0000000..f799dd7
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/deviceMerchantBuyDetail/DeviceMerchantBuyDetailController.java
@@ -0,0 +1,158 @@
+package cn.pluss.platform.controller.deviceMerchantBuyDetail;
+
+import cn.pluss.platform.controller.BaseNoModelController;
+import cn.pluss.platform.deviceMerchantBuyDetail.DeviceMerchantBuyDetailService;
+import cn.pluss.platform.entity.DeviceMerchantBuyDetail;
+import cn.pluss.platform.util.StringUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Controller
+@RequestMapping("deviceMerchantBuyDetail")
+public class DeviceMerchantBuyDetailController  extends BaseNoModelController {
+
+	  private Integer PAGE_SIZE=12;
+
+    @Autowired
+	  private DeviceMerchantBuyDetailService deviceMerchantBuyDetailService;
+
+    /**
+    *引导页
+    * @return
+    */
+    @RequestMapping(value = "/index", method = RequestMethod.GET)
+    public String index() {
+   
+        return "deviceMerchantBuyDetail/deviceMerchantBuyDetailList";
+    }
+
+    /**
+    *分页查询
+    */
+    @RequestMapping(value = "/queryDeviceMerchantBuyDetailByPage", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String,Object> queryDeviceMerchantBuyDetailByPage(Integer currPage,Integer id){
+   
+   	if(currPage==null) {
+   	   currPage=1;
+       }
+    	Map<String,Object> map=new HashMap<String, Object>();
+    	map.put("pageSize",PAGE_SIZE);
+    	map.put("offset", (currPage-1)*PAGE_SIZE);
+    	map.put("id",  id);
+    	List<DeviceMerchantBuyDetail> deviceMerchantBuyDetailList=deviceMerchantBuyDetailService.queryDeviceMerchantBuyDetailPage(map);
+    	Integer count=deviceMerchantBuyDetailService.queryDeviceMerchantBuyDetailPageCount(map);
+        Map<String,Object> result=new HashMap<String,Object>();
+        result.put("deviceMerchantBuyDetailList", deviceMerchantBuyDetailList);
+        result.put("count", count);
+        result.put("pageCount",StringUtil.getPageCount(count,PAGE_SIZE));
+        result.put("currPage", currPage);
+    	  return result;
+    }
+    /**
+    *查询详情
+    */
+     @RequestMapping(value = "/queryDeviceMerchantBuyDetailDetails", method = RequestMethod.GET)
+    public String queryDeviceMerchantBuyDetailDetails(HttpServletRequest request,Integer id,Integer pageIndex){
+   
+   	  if(id!=null&&id!=0) {
+   		 DeviceMerchantBuyDetail deviceMerchantBuyDetail=new DeviceMerchantBuyDetail();
+   		 deviceMerchantBuyDetail.setId(id);
+           deviceMerchantBuyDetail=deviceMerchantBuyDetailService.queryDeviceMerchantBuyDetail(deviceMerchantBuyDetail);
+          request.setAttribute("deviceMerchantBuyDetail", deviceMerchantBuyDetail);
+   		request.setAttribute("pageIndex", pageIndex);
+       	}
+        return "deviceMerchantBuyDetail/deviceMerchantBuyDetailDetails";
+    }
+    /**
+    *查询详情
+    */
+     @RequestMapping(value = "/queryDeviceMerchantBuyDetailBaseInfo", method = RequestMethod.GET)
+    public String queryDeviceMerchantBuyDetailBaseInfo(HttpServletRequest request,Integer id,Integer pageIndex){
+   
+   	  if(id!=null&&id!=0) {
+   		DeviceMerchantBuyDetail deviceMerchantBuyDetail=new DeviceMerchantBuyDetail();
+   		deviceMerchantBuyDetail.setId(id);
+        deviceMerchantBuyDetail=deviceMerchantBuyDetailService.queryDeviceMerchantBuyDetail(deviceMerchantBuyDetail);
+          request.setAttribute("deviceMerchantBuyDetail", deviceMerchantBuyDetail);
+   		request.setAttribute("pageIndex", pageIndex);
+       	}
+        return "deviceMerchantBuyDetail/deviceMerchantBuyDetailBaseInfo";
+    }
+    /**
+    *查询详情
+    */
+     @RequestMapping(value = "/queryDeviceMerchantBuyDetailExtendsInfo", method = RequestMethod.GET)
+    public String queryDeviceMerchantBuyDetailExtendsInfo(){
+   
+        return "deviceMerchantBuyDetail/deviceMerchantBuyDetailExtendsInfo";
+    }
+    /**
+    *查询详情
+    */
+     @RequestMapping(value = "/queryDeviceMerchantBuyDetailFunctionsInfo", method = RequestMethod.GET)
+    public String queryDeviceMerchantBuyDetailFunctionsInfo(){
+   
+        return "deviceMerchantBuyDetail/deviceMerchantBuyDetailFunctionsInfo";
+    }
+    /**
+    *保存对象
+    *@throws IOException
+    */
+    @RequestMapping(value = "/saveDeviceMerchantBuyDetail", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String,Object> saveDeviceMerchantBuyDetail(DeviceMerchantBuyDetail deviceMerchantBuyDetail){
+   
+       if(deviceMerchantBuyDetail.getId()!=null&&deviceMerchantBuyDetail.getId()!=0){
+    		deviceMerchantBuyDetailService.updateDeviceMerchantBuyDetail(deviceMerchantBuyDetail);
+    	 }else{  
+      	deviceMerchantBuyDetailService.saveDeviceMerchantBuyDetail(deviceMerchantBuyDetail);
+    	 }  
+		Map<String,Object> result=new HashMap<String,Object>();
+    	result.put("resultCode", "1");
+    	result.put("resultMessage", "保存成功!");
+    	return result;
+    }
+    /**
+    *修改对象
+    *@throws IOException
+    */
+    @RequestMapping(value = "/updateDeviceMerchantBuyDetail", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String,Object> updateDeviceMerchantBuyDetail(Integer id){
+   
+   	DeviceMerchantBuyDetail deviceMerchantBuyDetail=new DeviceMerchantBuyDetail();
+   	deviceMerchantBuyDetail.setId(id);
+      deviceMerchantBuyDetailService.updateDeviceMerchantBuyDetail(deviceMerchantBuyDetail);
+   	Map<String,Object> result=new HashMap<String,Object>();
+    	result.put("resultCode", "1");
+    	result.put("resultMessage", "保存成功!");
+    	return result;
+    }
+    /**
+    *删除对象
+    *@throws IOException
+    */
+    @RequestMapping(value = "/deleteDeviceMerchantBuyDetail", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String,Object> deleteDeviceMerchantBuyDetail(Integer id){
+   	DeviceMerchantBuyDetail deviceMerchantBuyDetail=new DeviceMerchantBuyDetail();
+   	deviceMerchantBuyDetail.setId(id);
+		deviceMerchantBuyDetailService.deleteDeviceMerchantBuyDetail(deviceMerchantBuyDetail);
+		Map<String,Object> result=new HashMap<String,Object>();
+    	result.put("resultCode", "1");
+    	result.put("resultMessage", "保存成功!");
+    	return result;
+    }
+
+}
+
+
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/deviceOperateInfo/DeviceOperateInfoController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/deviceOperateInfo/DeviceOperateInfoController.java
new file mode 100644
index 0000000..823bf32
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/deviceOperateInfo/DeviceOperateInfoController.java
@@ -0,0 +1,49 @@
+package cn.pluss.platform.controller.deviceOperateInfo;
+
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.device.DeviceOperateInfoService;
+import cn.pluss.platform.entity.DeviceOperateInfo;
+import cn.pluss.platform.util.StringUtil;
+import cn.pluss.platform.vo.DeviceOperateInfoVO;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * <p>
+ * 设备库存controller
+ * </p>
+ *
+ * @author bzg
+ * @since 2020-11-11
+ */
+@Controller
+@RequestMapping("/deviceOperateInfo")
+public class DeviceOperateInfoController extends BaseModelController<DeviceOperateInfoService, DeviceOperateInfo> {
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = "/index")
+    public String index(HttpServletRequest request,String deviceNo) {
+        if(StringUtil.isNotEmpty(deviceNo)){
+            request.setAttribute("deviceNo",deviceNo);
+        }
+        return "deviceOperateInfo/list";
+    }
+
+    /**
+     * 分页查询
+     * @param page
+     * @param condition
+     * @return
+     */
+    @RequestMapping("pageData")
+    @ResponseBody
+    public Result<Page<DeviceOperateInfoVO>> page(Page<DeviceOperateInfoVO> page, DeviceOperateInfo condition) {
+        page = baseService.pageInfo(page,condition);
+        return ResultGenerator.genSuccessResult("获取成功",page);
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/deviceSignUnbind/DeviceSignUnbindController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/deviceSignUnbind/DeviceSignUnbindController.java
new file mode 100644
index 0000000..990ee95
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/deviceSignUnbind/DeviceSignUnbindController.java
@@ -0,0 +1,168 @@
+package cn.pluss.platform.controller.deviceSignUnbind;
+
+import java.util.Map;
+import java.util.List;
+import java.util.HashMap;
+
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.util.StringUtil;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import cn.pluss.platform.entity.DeviceSignUnbind;
+import cn.pluss.platform.deviceSignUnbind.DeviceSignUnbindService;
+
+@Controller
+@RequestMapping("deviceSignUnbind")
+public class DeviceSignUnbindController extends BaseModelController<DeviceSignUnbindService, DeviceSignUnbind> {
+
+    private Integer PAGE_SIZE = 12;
+
+    @Autowired
+    private DeviceSignUnbindService deviceSignUnbindService;
+
+    /**
+     * 引导页
+     *
+     * @return
+     */
+    @RequestMapping(value = "/index", method = RequestMethod.GET)
+    public String index() {
+        return "deviceSignUnbind/deviceSignUnbindList";
+    }
+
+    /**
+     * 分页查询
+     */
+    @RequestMapping(value = "/queryDeviceSignUnbindByPage", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> queryDeviceSignUnbindByPage(Integer currPage, String startTime, String endTime, DeviceSignUnbind deviceSignUnbind) {
+        if (currPage == null) {
+            currPage = 1;
+        }
+        Map<String, Object> map = new HashMap<>(16);
+        map.put("pageSize", PAGE_SIZE);
+        map.put("offset", (currPage - 1) * PAGE_SIZE);
+        map.put("orderNo", deviceSignUnbind.getOrderNo());
+        map.put("merchantName", deviceSignUnbind.getMerchantName());
+        map.put("status", deviceSignUnbind.getStatus());
+        map.put("startTime", startTime);
+        map.put("endTime", endTime);
+        map.put("userId", deviceSignUnbind.getUserId());
+        List<DeviceSignUnbind> deviceSignUnbindList = deviceSignUnbindService.queryDeviceSignUnbindPage(map);
+        Integer count = deviceSignUnbindService.queryDeviceSignUnbindPageCount(map);
+        Map<String, Object> result = new HashMap<>(16);
+        result.put("deviceSignUnbindList", deviceSignUnbindList);
+        result.put("count", count);
+        result.put("pageCount", StringUtil.getPageCount(count, PAGE_SIZE));
+        result.put("currPage", currPage);
+        return result;
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryDeviceSignUnbindDetails", method = RequestMethod.GET)
+    public String queryDeviceSignUnbindDetails(HttpServletRequest request, Integer id, Integer pageIndex) {
+
+        if (id != null && id != 0) {
+            DeviceSignUnbind deviceSignUnbind = new DeviceSignUnbind();
+            deviceSignUnbind.setId(id);
+            deviceSignUnbind = deviceSignUnbindService.queryDeviceSignUnbind(deviceSignUnbind);
+            request.setAttribute("deviceSignUnbind", deviceSignUnbind);
+            request.setAttribute("pageIndex", pageIndex);
+        }
+        return "deviceSignUnbind/deviceSignUnbindDetails";
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryDeviceSignUnbindBaseInfo", method = RequestMethod.GET)
+    public String queryDeviceSignUnbindBaseInfo(HttpServletRequest request, Integer id, Integer pageIndex) {
+
+        if (id != null && id != 0) {
+            DeviceSignUnbind deviceSignUnbind = new DeviceSignUnbind();
+            deviceSignUnbind.setId(id);
+            deviceSignUnbind = deviceSignUnbindService.queryDeviceSignUnbind(deviceSignUnbind);
+            request.setAttribute("deviceSignUnbind", deviceSignUnbind);
+            request.setAttribute("pageIndex", pageIndex);
+        }
+        return "deviceSignUnbind/deviceSignUnbindBaseInfo";
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryDeviceSignUnbindExtendsInfo", method = RequestMethod.GET)
+    public String queryDeviceSignUnbindExtendsInfo() {
+        return "deviceSignUnbind/deviceSignUnbindExtendsInfo";
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryDeviceSignUnbindFunctionsInfo", method = RequestMethod.GET)
+    public String queryDeviceSignUnbindFunctionsInfo() {
+        return "deviceSignUnbind/deviceSignUnbindFunctionsInfo";
+    }
+
+    /**
+     * 保存对象
+     *
+     */
+    @RequestMapping(value = "/saveDeviceSignUnbind", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> saveDeviceSignUnbind(DeviceSignUnbind deviceSignUnbind) {
+
+        if (deviceSignUnbind.getId() != null && deviceSignUnbind.getId() != 0) {
+            deviceSignUnbindService.updateById(deviceSignUnbind);
+        } else {
+            deviceSignUnbindService.save(deviceSignUnbind);
+        }
+        Map<String, Object> result = new HashMap<>();
+        result.put("resultCode", "1");
+        result.put("resultMessage", "保存成功!");
+        return result;
+    }
+
+    /**
+     * 删除对象
+     *
+     */
+    @RequestMapping(value = "/deleteDeviceSignUnbind", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> deleteDeviceSignUnbind(Integer id) {
+        deviceSignUnbindService.removeById(id);
+        Map<String, Object> result = new HashMap<>();
+        result.put("resultCode", "1");
+        result.put("resultMessage", "保存成功!");
+        return result;
+    }
+
+    /**
+     * 修改状态
+     *
+     */
+    @RequestMapping(value = "/updateStatus", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> updateStatus(DeviceSignUnbind deviceSignUnbind) {
+        Map<String, Object> result = new HashMap<>(16);
+        try {
+            deviceSignUnbindService.updateById(deviceSignUnbind);
+            result.put("msg", "操作成功!");
+        } catch (Exception e) {
+            e.printStackTrace();
+            result.put("msg", "操作失败!");
+        }
+        return result;
+    }
+
+}
+
+
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/deviceStock/DeviceStockController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/deviceStock/DeviceStockController.java
new file mode 100644
index 0000000..528be1d
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/deviceStock/DeviceStockController.java
@@ -0,0 +1,267 @@
+package cn.pluss.platform.controller.deviceStock;
+
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.converter.Converter;
+import cn.pluss.platform.device.DeviceSpecService;
+import cn.pluss.platform.device.DeviceStockGroupService;
+import cn.pluss.platform.device.DeviceTypeService;
+import cn.pluss.platform.deviceDetail.DeviceDetailService;
+import cn.pluss.platform.deviceStock.DeviceStockService;
+import cn.pluss.platform.dict.DictService;
+import cn.pluss.platform.dto.DeviceStockDTO;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.vo.DeviceStockVO;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * <p>
+ * 设备库存controller
+ * </p>
+ *
+ * @author bzg
+ * @since 2020-11-11
+ */
+@Controller
+@RequestMapping("/deviceStock")
+public class DeviceStockController extends BaseModelController<DeviceStockService, DeviceStock> {
+
+    @Autowired
+    private DictService dictService;
+
+    @Autowired
+    private DeviceDetailService deviceDetailService;
+
+    @Autowired
+    private DeviceStockService dsService;
+
+    @Autowired
+    private UserAppService uaService;
+
+    @Autowired
+    private DeviceTypeService deviceTypeService;
+
+    @Autowired
+    private DeviceStockGroupService deviceStockGroupService;
+
+    @Autowired
+    private DeviceSpecService deviceSpecService;
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = "/index")
+    public String index(HttpServletRequest request) {
+        List<DeviceType> deviceType = deviceTypeService.list();
+        request.setAttribute("deviceTypeDict", deviceType);
+        return "deviceStock/list";
+    }
+
+    @PostMapping("saveOrUpdate")
+    @ResponseBody
+    public Result<String> saveOrUpdate(@RequestBody DeviceStockDTO deviceStock) {
+        if (deviceStock.getId() != null) {
+            baseService.updateById(Converter.INSTANCE.toEntity(deviceStock));
+            return ResultGenerator.genSuccessResult("保存成功", null);
+        }
+
+        try {
+            if (StringUtils.isEmpty(deviceStock.getSnNo())) {
+                throw new MsgException("设备编号不能为空");
+            }
+
+            QueryWrapper<DeviceDetail> queryWrapper = new QueryWrapper<DeviceDetail>()
+                    .eq("groupNo", deviceStock.getGroupNo());
+            List<DeviceDetail> list = deviceDetailService.list(queryWrapper);
+            if (list.isEmpty()) {
+                return ResultGenerator.genFailResult("未查询到该类型的设备，请先添加", null);
+            }
+            deviceStock.setPrice(list.get(0).getUnitPrice());
+            baseService.save(deviceStock);
+        } catch (Exception e) {
+            return ResultGenerator.genFailResult("设备编号重复!", null);
+        }
+
+        return ResultGenerator.genSuccessResult("保存成功", null);
+    }
+
+    /**
+     * 绑定厂家id
+     *
+     * @param deviceStock
+     * @return
+     */
+    @PostMapping("/bindDeviceNo")
+    @ResponseBody
+    public Result<String> bindDeviceNo(@RequestBody DeviceStock deviceStock) {
+        if (deviceStock.getId() == null) {
+            throw new MsgException("id不能为空");
+        }
+
+        DeviceStock exist = baseService.getById(deviceStock.getId());
+        if (!exist.getCode().startsWith("MP") && deviceStock.getDeviceNo() == null) {
+            throw new MsgException("非码牌设备，厂家编号不能为空");
+        }
+
+        this.baseService.updateById(deviceStock);
+        return ResultGenerator.genSuccessResult("保存成功", null);
+    }
+
+    @RequestMapping("pageData")
+    @ResponseBody
+    public Result<Page<DeviceStockVO>> pageData(Page<DeviceStockVO> page, DeviceStockDTO dto) {
+        if (Objects.equals(dto.getDeviceNo(), "")) {
+            dto.setDeviceNo(null);
+        }
+        if(StringUtils.isEmpty(dto.getBindStatus())){
+            dto.setBindStatus("-2");
+        }
+        if(StringUtils.isNotEmpty(dto.getNoType())){
+            if("2".equals(dto.getNoType())){
+                if(StringUtils.isNotEmpty(dto.getStartDeviceNo())){
+                    dto.setStartSnNo(dto.getStartDeviceNo());
+                    dto.setStartDeviceNo(null);
+                }
+                if(StringUtils.isNotEmpty(dto.getEndDeviceNo())){
+                    dto.setEndSnNo(dto.getEndDeviceNo());
+                    dto.setEndDeviceNo(null);
+                }
+            }
+        }
+        Page<DeviceStockVO> result = baseService.pageInfo(page, dto);
+
+        List<DeviceStockVO> resultList = new ArrayList<>();
+
+        List<DeviceStockGroup> deviceStockGroupList = deviceStockGroupService.list();
+        List<DeviceType> deviceTypeList = deviceTypeService.list();
+        List<DeviceSpec> deviceSpecList = deviceSpecService.list();
+
+        for (DeviceStockVO item : result.getRecords()) {
+            for (DeviceStockGroup deviceStockGroup : deviceStockGroupList) {
+                if (deviceStockGroup.getGroupCode().equals(item.getGroupNo())) {
+                    item.setGroupNoDesc(deviceStockGroup.getGroupName());
+                }
+            }
+
+            for (DeviceType deviceType : deviceTypeList) {
+                if (deviceType.getCode().equals(item.getCode())) {
+                    item.setCodeDesc(deviceType.getName());
+                }
+            }
+
+            for (DeviceSpec deviceSpec : deviceSpecList) {
+                if (deviceSpec.getCode().equals(item.getCode()) && deviceSpec.getSpec().equals(item.getType())) {
+                    item.setTypeDesc(deviceSpec.getSpecName());
+                }
+            }
+            resultList.add(item);
+        }
+        result.setRecords(resultList);
+        return ResultGenerator.genSuccessResult(result);
+    }
+
+    @PostMapping("batchSaveNo")
+    @ResponseBody
+    public Result<String> batchSaveNo(@RequestBody DeviceStock deviceStock) {
+        if (StringUtils.isEmpty(deviceStock.getStartSnNo())) {
+            return ResultGenerator.genFailResult("开始设备编号不能为空，请重新输入！");
+        }
+
+        if (StringUtils.isEmpty(deviceStock.getEndSnNo())) {
+            return ResultGenerator.genFailResult("开始设备不能为空，请重新输入！");
+        }
+        try {
+            Long startSnNo = Long.parseLong(deviceStock.getStartSnNo());
+            Long endSnNo = Long.parseLong(deviceStock.getEndSnNo());
+            if (endSnNo.compareTo(startSnNo) < 0) {
+                return ResultGenerator.genFailResult("结束编号范围有误，请重新输入！");
+            }
+            QueryWrapper<DeviceDetail> queryWrapper = new QueryWrapper<DeviceDetail>()
+                    .eq("groupNo", deviceStock.getGroupNo());
+            List<DeviceDetail> detail = deviceDetailService.list(queryWrapper);
+            if (detail.isEmpty()) {
+                return ResultGenerator.genFailResult("未查询到该类型的设备，请先添加", null);
+            }
+            deviceStock.setPrice(detail.get(0).getUnitPrice());
+            List<DeviceStock> list = new ArrayList<>();
+            for (long i = startSnNo; i <= endSnNo; i++) {
+                DeviceStock stock = new DeviceStock();
+                stock.setCreateTime(new Date());
+                stock.setSnNo(String.valueOf(i));
+                stock.setPrice(deviceStock.getPrice());
+                stock.setStatus("1");
+                stock.setCode(deviceStock.getCode());
+                stock.setType(deviceStock.getType());
+                stock.setGroupNo(deviceStock.getGroupNo());
+                list.add(stock);
+            }
+            try {
+                this.baseService.saveBatch(list, Integer.parseInt(String.valueOf(endSnNo - startSnNo)));
+            } catch (Exception e) {
+                return ResultGenerator.genFailResult("设备编号重复!", null);
+            }
+            return ResultGenerator.genSuccessResult("操作成功！！", null);
+        } catch (Exception e) {
+            throw new MsgException("包含重复的设备编号！");
+        }
+    }
+
+    @PostMapping("bindSave")
+    @ResponseBody
+    public Result<String> bindSave(@RequestBody DeviceStockDTO deviceStock) {
+        MsgException.checkNull(deviceStock.getUserId(), "缺少用户id");
+        UserApp ua = uaService.getOne(new QueryWrapper<UserApp>().eq("userId", deviceStock.getUserId()));
+        MsgException.checkNull(ua, "不存在的用户id");
+
+        if (!Objects.equals("promoter", ua.getUserType())) {
+            throw new MsgException("该用户id不是商户");
+        }
+
+        DeviceStock existData = dsService.getById(deviceStock.getId());
+        dsService.bindPayCode(existData.getSnNo(), ua);
+
+        return ResultGenerator.genSuccessResult("操作成功！！", null);
+    }
+
+    @PostMapping("unBindSave")
+    @ResponseBody
+    public Result<String> unBindSave(@RequestBody DeviceStock deviceStock) {
+        baseService.unbind(deviceStock.getId().longValue());
+        return ResultGenerator.genSuccessResult("操作成功！！", null);
+    }
+
+    @GetMapping("/getDeviceVersion")
+    @ResponseBody
+    public Result getDeviceVersion() {
+        QueryWrapper<DeviceStockGroup> queryWrapper = new QueryWrapper<>();
+        queryWrapper.select("groupCode", "groupName");
+        List<DeviceStockGroup> list = deviceStockGroupService.list(queryWrapper);
+        return ResultGenerator.genSuccessResult("操作成功！！", list);
+    }
+
+    /**
+     * 后台设备出库
+     * @param ids
+     * @param accpetUserId
+     * @param orderNo
+     * @return
+     */
+    @PostMapping("transfer")
+    @ResponseBody
+    public Result<String> transfer(@RequestParam("ids[]") List<Long> ids,Long accpetUserId,String orderNo) {
+        return baseService.manageTransfer(ids,accpetUserId,orderNo);
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/deviceVoiceBox/DeviceVoiceBoxController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/deviceVoiceBox/DeviceVoiceBoxController.java
new file mode 100644
index 0000000..d6753fd
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/deviceVoiceBox/DeviceVoiceBoxController.java
@@ -0,0 +1,117 @@
+package cn.pluss.platform.controller.deviceVoiceBox;
+
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.deviceVoiceBox.DeviceVoiceBoxService;
+import cn.pluss.platform.entity.DeviceVoiceBox;
+import cn.pluss.platform.entity.MerchantBaseInfo;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.util.StringUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 智能音箱设备信息表 前端控制器
+ * </p>
+ *
+ * @author bzg
+ * @since 2020-11-04
+ */
+@Controller
+@RequestMapping("/deviceVoiceBox")
+public class DeviceVoiceBoxController extends BaseModelController<DeviceVoiceBoxService, DeviceVoiceBox> {
+
+    @Autowired
+    private MerchantBaseInfoService merchantBaseInfoService;
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = "/index")
+    public String index() {
+        return "deviceVoiceBox/list";
+    }
+
+    @PostMapping("saveOrUpdate")
+    @ResponseBody
+    public Result<String> saveOrUpdate(@RequestBody DeviceVoiceBox deviceVoiceBox) {
+        if (deviceVoiceBox.getId() != null){
+            if(StringUtil.isNotEmpty(deviceVoiceBox.getActMercId()) && StringUtil.isEmpty(deviceVoiceBox.getActMercName())){
+                MerchantBaseInfo byId = merchantBaseInfoService.getById(deviceVoiceBox.getActMercId());
+                if(byId == null){
+                    return ResultGenerator.genFailResult("商户ID输入有误！");
+                }
+                deviceVoiceBox.setActMercName(byId.getAlias());
+            }
+            deviceVoiceBox.setUpdateTime(new Date());
+            this.baseService.updateById(deviceVoiceBox);
+        }else {
+            if(StringUtil.isEmpty(deviceVoiceBox.getBoxNo())){
+                return ResultGenerator.genFailResult("设备编号不能为空！");
+            }
+            QueryWrapper<DeviceVoiceBox> queryWrapper = new QueryWrapper<DeviceVoiceBox>()
+                    .eq("boxNo",deviceVoiceBox.getBoxNo());
+            List<DeviceVoiceBox> boxList = this.baseService.list(queryWrapper);
+            if(!boxList.isEmpty()){
+                return ResultGenerator.genFailResult("设备编号已存在，请重新添加！");
+            }
+            deviceVoiceBox.setCreateTime(new Date());
+            this.baseService.save(deviceVoiceBox);
+        }
+        return ResultGenerator.genSuccessResult("保存成功",null);
+    }
+
+    @PostMapping("batchSaveNo")
+    @ResponseBody
+    public Result<String> batchSaveNo(@RequestBody DeviceVoiceBox deviceVoiceBox) {
+        if(StringUtil.isEmpty(deviceVoiceBox.getStartBoxNo())){
+            return ResultGenerator.genFailResult("开始编号不能为空，请重新输入！");
+        }
+        if(StringUtil.isEmpty(deviceVoiceBox.getEndBoxNo())){
+            return ResultGenerator.genFailResult("结束编号不能为空，请重新输入！");
+        }
+        try {
+            Integer startBoxNo = Integer.parseInt(deviceVoiceBox.getStartBoxNo());
+            Integer endBoxNo = Integer.parseInt(deviceVoiceBox.getEndBoxNo());
+            if(endBoxNo.compareTo(startBoxNo) < 0){
+                return ResultGenerator.genFailResult("结束编号范围有误，请重新输入！");
+            }
+            List<DeviceVoiceBox> list = new ArrayList<>();
+            for (int i = startBoxNo;i<= endBoxNo;i++) {
+                DeviceVoiceBox box = new DeviceVoiceBox();
+                box.setCreateTime(new Date());
+                box.setBoxNo(String.valueOf(i));
+                list.add(box);
+            }
+            this.baseService.saveBatch(list);
+            return ResultGenerator.genSuccessResult("操作成功！！",null);
+        }catch (Exception e){
+            throw new MsgException("包含重复的设备编号！");
+        }
+    }
+
+
+    @PostMapping("unBindSave")
+    @ResponseBody
+    public Result<String> unBindSave(@RequestBody DeviceVoiceBox deviceVoiceBox) {
+        if(StringUtil.isEmpty(deviceVoiceBox.getId())){
+            return ResultGenerator.genFailResult("解绑出错");
+        }
+        if(StringUtil.isEmpty(deviceVoiceBox.getStatus())){
+            return ResultGenerator.genFailResult("解绑出错");
+        }
+        if("1".equals(deviceVoiceBox.getStatus())){
+            deviceVoiceBox.setActMercName("");
+            deviceVoiceBox.setActMercId(null);
+        }
+        this.baseService.updateById(deviceVoiceBox);
+        return ResultGenerator.genSuccessResult("操作成功！！",null);
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/deviceVoiceBox/DeviceVoiceBoxMsgController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/deviceVoiceBox/DeviceVoiceBoxMsgController.java
new file mode 100644
index 0000000..3e5d4e3
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/deviceVoiceBox/DeviceVoiceBoxMsgController.java
@@ -0,0 +1,37 @@
+package cn.pluss.platform.controller.deviceVoiceBox;
+
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.deviceVoiceBox.DeviceVoiceBoxMsgService;
+import cn.pluss.platform.entity.DeviceVoiceBoxMsg;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+/**
+ * <p>
+ * 设备消息推送记录表 前端控制器
+ * </p>
+ *
+ * @author bzg
+ * @since 2020-11-04
+ */
+@Controller
+@RequestMapping("/deviceVoiceBoxMsg")
+public class DeviceVoiceBoxMsgController extends BaseModelController<DeviceVoiceBoxMsgService, DeviceVoiceBoxMsg> {
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = "/index")
+    public String index() {
+        return "deviceVoiceBox/msg/list";
+    }
+
+    @Override
+    public Result<Page<DeviceVoiceBoxMsg>> page(Page<DeviceVoiceBoxMsg> page, DeviceVoiceBoxMsg condition, OrderItem orderItem) {
+        orderItem.setAsc(false);
+        orderItem.setColumn("createTime");
+        return super.page(page, condition, orderItem);
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/dict/DictController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/dict/DictController.java
new file mode 100644
index 0000000..7cba6f3
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/dict/DictController.java
@@ -0,0 +1,85 @@
+package cn.pluss.platform.controller.dict;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.dict.DictService;
+import cn.pluss.platform.entity.Dict;
+import cn.pluss.platform.exception.MsgException;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Calendar;
+import java.util.List;
+
+@Controller
+@RequiredArgsConstructor
+@RequestMapping("dict")
+public class DictController extends BaseModelController<DictService, Dict> {
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = "/index")
+    public String index() {
+        return "dict/dict";
+    }
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = {"/detailDict/{id}", "/detailDict"})
+    public String detail(HttpServletRequest request, @PathVariable(value = "id", required = false) Integer id) {
+        if (id != null) {
+            Dict dictOne = baseService.getById(id);
+            request.setAttribute("entity", dictOne);
+        }
+        return "dict/detailDict";
+    }
+
+    @PostMapping("/saveOrUpdate")
+    @ResponseBody
+    public Result<Dict> saveOrUpdate(@RequestBody Dict dict) {
+        Calendar calendar=Calendar.getInstance();
+        if (dict.getId() != null){
+            dict.setUpdateTime(calendar.getTime());
+            UpdateWrapper<Dict> dictUpdateWrapper=new UpdateWrapper<>();
+            dictUpdateWrapper.eq("id",dict.getId());
+            baseService.update(dict,dictUpdateWrapper);
+        }else {
+            dict.setCreateTime(calendar.getTime());
+            dict.setUpdateTime(calendar.getTime());
+            baseService.save(dict);
+        }
+        return ResultGenerator.genSuccessResult("保存成功", dict);
+    }
+
+    @PostMapping("/delete")
+    public Result<Dict> del(@RequestBody Dict dict) {
+        baseService.removeById(dict.getId());
+        return ResultGenerator.genSuccessResult("删除成功", dict);
+    }
+
+    @GetMapping("/tree")
+    @ResponseBody
+    public Result<List<Dict>> tree() {
+        List<Dict> result = baseService.tree();
+        return ResultGenerator.genSuccessResult(result);
+    }
+
+    @GetMapping("/getGroup/{code}")
+    @ResponseBody
+    public Result<List<Dict>> getGroupByCode(@PathVariable(name = "code") String code) {
+        Dict dict = new Dict().setCode(code);
+        dict = baseService.getOne(new QueryWrapper<>(dict));
+
+        if (dict == null) {
+            throw new MsgException("对应code的字典项不存在");
+        }
+
+        Dict queryParent = (Dict) new Dict().setPId(dict.getId());
+        QueryWrapper<Dict> queryWrapper = new QueryWrapper<>(queryParent);
+        queryWrapper.orderBy(true,true, "sort");
+        List<Dict> list = baseService.list(queryWrapper);
+
+        return ResultGenerator.genSuccessResult(list);
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/encrypt/EncryptKeyController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/encrypt/EncryptKeyController.java
new file mode 100644
index 0000000..74429ad
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/encrypt/EncryptKeyController.java
@@ -0,0 +1,69 @@
+package cn.pluss.platform.controller.encrypt;
+
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.encrypt.EncryptKeyService;
+import cn.pluss.platform.entity.EncryptKey;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+/**
+ * <p>
+ * 商务密钥存储表 前端控制器
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-10-28
+ */
+@Controller
+@RequestMapping("/encryptKey")
+public class EncryptKeyController {
+
+    @Autowired
+    private EncryptKeyService encryptKeyService;
+
+    @GetMapping("/index")
+    public String index() {
+        return "encrypt/index";
+    }
+
+    @GetMapping("/detail")
+    public String detail() {
+        return "encrypt/detail";
+    }
+
+    @GetMapping("/page")
+    @ResponseBody
+    public Result<Page<EncryptKey>> page(Page<EncryptKey> page, EncryptKey condition, OrderItem orderItem) {
+        if (orderItem != null) {
+            page.addOrder(orderItem);
+        } else {
+            page.addOrder(OrderItem.desc("version"));
+            page.addOrder(OrderItem.desc("createTime"));
+        }
+
+        page = encryptKeyService.page(page, Wrappers.query(condition));
+
+        return ResultGenerator.genSuccessResult(page);
+    }
+
+    @PostMapping("/save")
+    public Result<Object> save(EncryptKey encryptKey) {
+        encryptKeyService.save(encryptKey);
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @PostMapping("/enable")
+    public Result<Object> enable(String id) {
+        encryptKeyService.enable(id);
+        return ResultGenerator.genSuccessResult();
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/fans/FansController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/fans/FansController.java
new file mode 100644
index 0000000..c23e680
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/fans/FansController.java
@@ -0,0 +1,220 @@
+package cn.pluss.platform.controller.fans;
+
+import cn.pluss.platform.controller.BaseNoModelController;
+import cn.pluss.platform.entitiy.ShiroUser;
+import cn.pluss.platform.entity.Fans;
+import cn.pluss.platform.fans.FansService;
+import cn.pluss.platform.util.StringUtil;
+import cn.pluss.platform.vo.FansConsumVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Controller
+@RequestMapping("fans")
+public class FansController extends BaseNoModelController {
+
+    private final static Integer PAGE_SIZE = 12;
+
+    @Autowired
+    private FansService fansService;
+
+    /**
+     * 引导页
+     *
+     * @return
+     */
+    @RequestMapping(value = "/index", method = RequestMethod.GET)
+    public String index() {
+        return "fans/fansList";
+    }
+
+    /**
+     * 分页查询
+     *
+     * @throws Exception
+     */
+    @RequestMapping(value = "/queryFansByPage", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> queryFansByPage(@RequestParam(defaultValue = "1") Integer currPage, String startTime, String endTime, FansConsumVO fansConsumVO) throws Exception {
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        Map<String, Object> map = new HashMap<>(16);
+        Map<String, Object> result = new HashMap<>(16);
+        map.put("pageSize", PAGE_SIZE);
+        map.put("offset", (currPage - 1) * PAGE_SIZE);
+        Boolean bol = verifyUserRole();
+        if (StringUtil.isNotEmpty(fansConsumVO.getNickName())) {
+            String nickName = URLEncoder.encode(fansConsumVO.getNickName(), "UTF-8");
+            map.put("nickName", nickName);
+        }
+        try {
+            Date startTimeDate = simpleDateFormat.parse(startTime);
+            Date endTimeDate = simpleDateFormat.parse(endTime);
+            map.put("startTime", startTimeDate);
+            map.put("endTime", endTimeDate);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        if (StringUtil.isNotEmpty(fansConsumVO.getMerchantName())) {
+            map.put("merchantName", fansConsumVO.getMerchantName());
+        }
+        if (StringUtil.isNotEmpty(fansConsumVO.getLastMerchantName())) {
+            map.put("lastMerchantName", fansConsumVO.getLastMerchantName());
+        }
+        if (StringUtil.isNotEmpty(fansConsumVO.getOrderNumber())) {
+            map.put("orderNumber", fansConsumVO.getOrderNumber());
+        }
+        if (StringUtil.isNotEmpty(fansConsumVO.getLastOrderNumber())) {
+            map.put("lastOrderNumber", fansConsumVO.getLastOrderNumber());
+        }
+        List<FansConsumVO> fansList = null;
+        Integer count = 0;
+        if (!bol) {
+            ShiroUser shiroUser = queryCurrentShiroUser();
+            if (StringUtil.isNotEmpty(shiroUser.getMerchantCode())) {
+                map.put("merchantCode", shiroUser.getMerchantCode());
+            } else {
+                map.put("merchantCode", StringUtil.genRandomNum(33));
+            }
+            fansList = fansService.queryFansNoConsumPage(map);
+            count = fansService.queryFansNoConsumPageCount(map);
+        }else {
+            fansList = fansService.queryFansConsumPage(map);
+            count = fansService.queryFansConsumPageCount(map);
+            result.put("admin",bol);
+        }
+        for (FansConsumVO f : fansList) {
+            if (StringUtil.isNotEmpty(f.getNickName())) {
+                f.setNickName(URLDecoder.decode(f.getNickName(), "UTF-8"));
+                f.setNickName(URLDecoder.decode(f.getNickName(), "UTF-8"));
+                f.setNickName(URLDecoder.decode(f.getNickName(), "UTF-8"));
+                f.setNickName(URLDecoder.decode(f.getNickName(), "UTF-8"));
+                f.setNickName(URLDecoder.decode(f.getNickName(), "UTF-8"));
+            }
+        }
+        result.put("fansList", fansList);
+        result.put("count", count);
+        result.put("pageCount", StringUtil.getPageCount(count, PAGE_SIZE));
+        result.put("currPage", currPage);
+        return result;
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryFansDetails", method = RequestMethod.GET)
+    public String queryFansDetails(HttpServletRequest request, Integer id, Integer pageIndex) {
+
+        if (id != null && id != 0) {
+            Fans fans = new Fans();
+            fans.setId(id);
+            fans = fansService.queryFans(fans);
+            request.setAttribute("fans", fans);
+            request.setAttribute("pageIndex", pageIndex);
+        }
+        return "fans/fansDetails";
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryFansBaseInfo", method = RequestMethod.GET)
+    public String queryFansBaseInfo(HttpServletRequest request, Integer id, Integer pageIndex) {
+
+        if (id != null && id != 0) {
+            Fans fans = new Fans();
+            fans.setId(id);
+            fans = fansService.queryFans(fans);
+            request.setAttribute("fans", fans);
+            request.setAttribute("pageIndex", pageIndex);
+        }
+        return "fans/fansBaseInfo";
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryFansExtendsInfo", method = RequestMethod.GET)
+    public String queryFansExtendsInfo() {
+
+        return "fans/fansExtendsInfo";
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryFansFunctionsInfo", method = RequestMethod.GET)
+    public String queryFansFunctionsInfo() {
+
+        return "fans/fansFunctionsInfo";
+    }
+
+    /**
+     * 保存对象
+     *
+     */
+    @RequestMapping(value = "/saveFans", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> saveFans(Fans fans) {
+
+        if (fans.getId() != null && fans.getId() != 0) {
+            fansService.updateFans(fans);
+        } else {
+            fansService.saveFans(fans);
+        }
+        Map<String, Object> result = new HashMap<>();
+        result.put("resultCode", "1");
+        result.put("resultMessage", "保存成功!");
+        return result;
+    }
+
+    /**
+     * 修改对象
+     *
+     *
+     */
+    @RequestMapping(value = "/updateFans", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> updateFans(Integer id) {
+
+        Fans fans = new Fans();
+        fans.setId(id);
+        fansService.updateFans(fans);
+        Map<String, Object> result = new HashMap<>();
+        result.put("resultCode", "1");
+        result.put("resultMessage", "保存成功!");
+        return result;
+    }
+
+    /**
+     * 删除对象
+     *
+     */
+    @RequestMapping(value = "/deleteFans", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> deleteFans(Integer id) {
+        Fans fans = new Fans();
+        fans.setId(id);
+        fansService.deleteFans(fans);
+        Map<String, Object> result = new HashMap<>();
+        result.put("resultCode", "1");
+        result.put("resultMessage", "保存成功!");
+        return result;
+    }
+
+}
+
+
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/fansConsumReturn/FansConsumReturnController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/fansConsumReturn/FansConsumReturnController.java
new file mode 100644
index 0000000..bfd56dd
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/fansConsumReturn/FansConsumReturnController.java
@@ -0,0 +1,168 @@
+package cn.pluss.platform.controller.fansConsumReturn;
+
+import cn.pluss.platform.controller.BaseNoModelController;
+import cn.pluss.platform.entitiy.ShiroUser;
+import cn.pluss.platform.entity.FansConsumReturn;
+import cn.pluss.platform.fansConsumReturn.FansConsumReturnService;
+import cn.pluss.platform.util.StringUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Controller
+@RequestMapping("fansConsumReturn")
+public class FansConsumReturnController  extends BaseNoModelController {
+
+	  private Integer PAGE_SIZE=12;
+
+    @Autowired
+	  private FansConsumReturnService fansConsumReturnService;
+
+    /**
+    *引导页
+    * @return
+    */
+    @RequestMapping(value = "/index", method = RequestMethod.GET)
+    public String index() {
+   
+        return "fansConsumReturn/fansConsumReturnList";
+    }
+
+    /**
+    *分页查询
+    */
+    @RequestMapping(value = "/queryFansConsumReturnByPage", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String,Object> queryFansConsumReturnByPage(@RequestParam(defaultValue="1") Integer currPage,FansConsumReturn fansConsumReturn){
+   
+    	Map<String,Object> map=new HashMap<String, Object>();
+    	map.put("pageSize",PAGE_SIZE);
+    	map.put("offset", (currPage-1)*PAGE_SIZE);
+    	if(StringUtil.isNotEmpty(fansConsumReturn.getNickName())) {
+    		map.put("nickName", fansConsumReturn.getNickName());
+    	}
+    	Boolean bol = verifyUserRole();
+    	if(!bol)  {
+    		ShiroUser shiroUser = queryCurrentShiroUser();
+    		if(StringUtil.isNotEmpty(shiroUser.getMerchantCode())) {
+    			map.put("merchantCode", shiroUser.getMerchantCode());
+    		}else {
+    			map.put("merchantCode", StringUtil.genRandomNum(33));
+    		}
+    	}
+    	List<FansConsumReturn> fansConsumReturnList=fansConsumReturnService.queryFansConsumReturnPage(map);
+    	Integer count=fansConsumReturnService.queryFansConsumReturnPageCount(map);
+        Map<String,Object> result=new HashMap<String,Object>();
+        result.put("fansConsumReturnList", fansConsumReturnList);
+        result.put("count", count);
+        result.put("pageCount",StringUtil.getPageCount(count,PAGE_SIZE));
+        result.put("currPage", currPage);
+    	  return result;
+    }
+    /**
+    *查询详情
+    */
+     @RequestMapping(value = "/queryFansConsumReturnDetails", method = RequestMethod.GET)
+    public String queryFansConsumReturnDetails(HttpServletRequest request,Integer id,Integer pageIndex){
+   
+   	  if(id!=null&&id!=0) {
+   		 FansConsumReturn fansConsumReturn=new FansConsumReturn();
+   		 fansConsumReturn.setId(id);
+           fansConsumReturn=fansConsumReturnService.queryFansConsumReturn(fansConsumReturn);
+          request.setAttribute("fansConsumReturn", fansConsumReturn);
+   		request.setAttribute("pageIndex", pageIndex);
+       	}
+        return "fansConsumReturn/fansConsumReturnDetails";
+    }
+    /**
+    *查询详情
+    */
+     @RequestMapping(value = "/queryFansConsumReturnBaseInfo", method = RequestMethod.GET)
+    public String queryFansConsumReturnBaseInfo(HttpServletRequest request,Integer id,Integer pageIndex){
+   
+   	  if(id!=null&&id!=0) {
+   		FansConsumReturn fansConsumReturn=new FansConsumReturn();
+   		fansConsumReturn.setId(id);
+        fansConsumReturn=fansConsumReturnService.queryFansConsumReturn(fansConsumReturn);
+          request.setAttribute("fansConsumReturn", fansConsumReturn);
+   		request.setAttribute("pageIndex", pageIndex);
+       	}
+        return "fansConsumReturn/fansConsumReturnBaseInfo";
+    }
+    /**
+    *查询详情
+    */
+     @RequestMapping(value = "/queryFansConsumReturnExtendsInfo", method = RequestMethod.GET)
+    public String queryFansConsumReturnExtendsInfo(){
+   
+        return "fansConsumReturn/fansConsumReturnExtendsInfo";
+    }
+    /**
+    *查询详情
+    */
+     @RequestMapping(value = "/queryFansConsumReturnFunctionsInfo", method = RequestMethod.GET)
+    public String queryFansConsumReturnFunctionsInfo(){
+   
+        return "fansConsumReturn/fansConsumReturnFunctionsInfo";
+    }
+    /**
+    *保存对象
+    *@throws IOException
+    */
+    @RequestMapping(value = "/saveFansConsumReturn", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String,Object> saveFansConsumReturn(FansConsumReturn fansConsumReturn){
+   
+       if(fansConsumReturn.getId()!=null&&fansConsumReturn.getId()!=0){
+    		fansConsumReturnService.updateFansConsumReturn(fansConsumReturn);
+    	 }else{  
+      	fansConsumReturnService.saveFansConsumReturn(fansConsumReturn);
+    	 }  
+		Map<String,Object> result=new HashMap<String,Object>();
+    	result.put("resultCode", "1");
+    	result.put("resultMessage", "保存成功!");
+    	return result;
+    }
+    /**
+    *修改对象
+    *@throws IOException
+    */
+    @RequestMapping(value = "/updateFansConsumReturn", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String,Object> updateFansConsumReturn(Integer id){
+   
+   	FansConsumReturn fansConsumReturn=new FansConsumReturn();
+   	fansConsumReturn.setId(id);
+      fansConsumReturnService.updateFansConsumReturn(fansConsumReturn);
+   	Map<String,Object> result=new HashMap<String,Object>();
+    	result.put("resultCode", "1");
+    	result.put("resultMessage", "保存成功!");
+    	return result;
+    }
+    /**
+    *删除对象
+    *@throws IOException
+    */
+    @RequestMapping(value = "/deleteFansConsumReturn", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String,Object> deleteFansConsumReturn(Integer id){
+   	FansConsumReturn fansConsumReturn=new FansConsumReturn();
+   	fansConsumReturn.setId(id);
+		fansConsumReturnService.deleteFansConsumReturn(fansConsumReturn);
+		Map<String,Object> result=new HashMap<String,Object>();
+    	result.put("resultCode", "1");
+    	result.put("resultMessage", "保存成功!");
+    	return result;
+    }
+
+}
+
+
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/guideLabel/GuideLabelController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/guideLabel/GuideLabelController.java
new file mode 100644
index 0000000..295f5ba
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/guideLabel/GuideLabelController.java
@@ -0,0 +1,67 @@
+package cn.pluss.platform.controller.guideLabel;
+
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.entity.GuideLabel;
+import cn.pluss.platform.guideLabel.GuideLabelService;
+import cn.pluss.platform.util.StringUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-10-23
+ */
+@Controller
+@RequestMapping("/guideLabel")
+public class GuideLabelController extends BaseModelController<GuideLabelService, GuideLabel> {
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = "/index")
+    public String index() {
+        return "guideLabel/list";
+    }
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = {"/detail/{id}", "/detail"})
+    public String detail(HttpServletRequest request, @PathVariable(value = "id", required = false) Integer id) {
+        if (id != null) {
+            GuideLabel label = new GuideLabel().setId(id);
+            label = baseService.getOne(new QueryWrapper<>(label));
+            request.setAttribute("entity", label);
+        }
+        return "guideLabel/detail";
+    }
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = "/save")
+    @Override
+    public Result<String> save(@RequestBody GuideLabel entity) {
+        if(StringUtil.isEmpty(entity.getName())){
+            return ResultGenerator.genFailResult("话术名称不能为空", null);
+        }
+        if(StringUtil.isEmpty(entity.getStatus())){
+            return ResultGenerator.genFailResult("状态不能为空", null);
+        }
+        if(!"0".equals(entity.getStatus())){
+            QueryWrapper<GuideLabel> queryWrapper = new QueryWrapper<GuideLabel>();
+            if(StringUtil.isEmpty(entity.getId())){
+                queryWrapper.eq("status",entity.getStatus());
+            }else{
+                queryWrapper.eq("status",entity.getStatus()).ne("id",entity.getId());
+            }
+            List<GuideLabel> list = this.baseService.list(queryWrapper);
+            if(list.size() != 0){
+                return ResultGenerator.genFailResult("选中的数据只能有一条！", null);
+            }
+        }
+        return super.save(entity);
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/helpVideo/HelpVideoController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/helpVideo/HelpVideoController.java
new file mode 100644
index 0000000..9cc7a2a
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/helpVideo/HelpVideoController.java
@@ -0,0 +1,94 @@
+package cn.pluss.platform.controller.helpVideo;
+
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.controller.BaseNoModelController;
+import cn.pluss.platform.entity.HelpVideo;
+import cn.pluss.platform.helpVideo.HelpVideoService;
+import cn.pluss.platform.util.OssOperatUtil;
+import cn.pluss.platform.util.PageUtils;
+import cn.pluss.platform.util.StringUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.util.Date;
+import java.util.Map;
+
+@Controller
+@RequestMapping("helpVideo")
+public class HelpVideoController extends BaseNoModelController {
+
+    private Integer PAGE_SIZE = 12;
+
+    @Autowired
+    private HelpVideoService helpVideoService;
+
+    /**
+     * 引导页
+     *
+     * @return
+     */
+    @GetMapping("/index")
+    public String index() {
+        return "helpVideo/helpVideoList";
+    }
+
+    @RequestMapping("add")
+    public ModelAndView add() {
+        ModelAndView view = new ModelAndView("helpVideo/helpVideoBaseInfo");
+        Map<String, String> uploadParam = OssOperatUtil.getUploadParam();
+        view.addObject("uploadParam",uploadParam);
+        return view;
+    }
+
+    /**
+     * 分页查询
+     */
+    @GetMapping("/queryHelpVideoByPage")
+    @ResponseBody
+    public Result<PageInfo<HelpVideo>> queryHelpVideoByPage(Page<HelpVideo> page) {
+        QueryWrapper<HelpVideo> helpVideoQueryWrapper=new QueryWrapper<HelpVideo>().orderByAsc("sort");
+        page= helpVideoService.page(page, helpVideoQueryWrapper);
+        return ResultGenerator.genSuccessResult(PageUtils.page(page));
+    }
+
+    @PostMapping("/saveOrUpdate")
+    @ResponseBody
+    public Result<String> saveOrUpdate(@RequestBody HelpVideo helpVideo) {
+        if (StringUtil.isNotEmpty(helpVideo.getId())){
+            helpVideoService.updateById(helpVideo);
+        }else {
+            helpVideo.setCreateDt(new Date());
+            helpVideoService.save(helpVideo);
+        }
+        return ResultGenerator.genSuccessResult("保存成功");
+    }
+
+    @GetMapping("/edit/{id}")
+    public ModelAndView edit(@PathVariable Integer id){
+        ModelAndView view = new ModelAndView("helpVideo/helpVideoBaseInfo");
+        HelpVideo helpVideo = helpVideoService.getById(id);
+        Map<String, String> uploadParam = OssOperatUtil.getUploadParam();
+        view.addObject("helpVideo",helpVideo);
+        view.addObject("uploadParam",uploadParam);
+        //OssOperatUtil.getUploadParam();
+        return view;
+    }
+
+    @PostMapping("delete")
+    @ResponseBody
+    public Result<String> delete(@RequestBody HelpVideo helpVideo) {
+        helpVideoService.removeById(helpVideo.getId());
+        if(StringUtil.isNotEmpty(helpVideo.getVideoUrl())){
+            OssOperatUtil.deleteFile(helpVideo.getVideoUrl());
+        }
+        return ResultGenerator.genSuccessResult("删除成功!");
+    }
+}
+
+
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/home/HomeController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/home/HomeController.java
new file mode 100644
index 0000000..59f1846
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/home/HomeController.java
@@ -0,0 +1,169 @@
+package cn.pluss.platform.controller.home;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.controller.BaseNoModelController;
+import cn.pluss.platform.entitiy.ShiroUser;
+import cn.pluss.platform.entity.MerchantChannelStatus;
+import cn.pluss.platform.entity.PlatformData;
+import cn.pluss.platform.home.HomeService;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.merchantOrder.MerchantOrderService;
+import cn.pluss.platform.platformData.PlatformDataService;
+import cn.pluss.platform.refundOrder.MerchantRefundOrderService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.util.DateUtils;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
+import java.util.*;
+
+@Controller
+@RequestMapping("platform")
+public class HomeController extends BaseNoModelController {
+    @Autowired
+    private MerchantOrderService merchantOrderService;
+    @Autowired
+    private HomeService homeService;
+    @Autowired
+    private UserAppService userAppService;
+
+    @Resource
+    private MerchantRefundOrderService merchantRefundOrderService;
+
+    @Resource
+    private MerchantChannelStatusService merchantChannelStatusService;
+
+    @Resource
+    private PlatformDataService platformDataService;
+
+    @GetMapping("/console")
+    public String index() {
+        return "index/index2";
+    }
+
+    @GetMapping("/first")
+    public String first() {
+        return "index/first";
+    }
+
+    @PostMapping("/firstData")
+    @ResponseBody
+    public Result<?> firstData(){
+        Map<String,Object> result = new HashMap<>(20);
+//        //获取首页订单统计数据
+        Map<String,Object> orderData = merchantOrderService.getPlatformOrderData();
+
+        Map<String,String> transData = merchantOrderService.getPlatformTransData();
+
+//        //统计首页退款数据
+        Map<String,Object> refundData = merchantRefundOrderService.getPlatformRefundData();
+//        //统计首页其他数据
+        Map<String,Object> otherData =  userAppService.getPlatformData();
+//        //统计累计金额数据
+        Map<String,Object> amtData =  merchantOrderService.getPlatformAmtData();
+
+        //获取昨日这个时候的支付金额
+        Date yestNowEndDate = DateUtils.add(Calendar.DAY_OF_MONTH,DateUtils.currentDate(),-1);
+        String date = DateUtils.toString(yestNowEndDate,"yyyy-MM-dd");
+        String yestStartDate = DateUtils.toString(yestNowEndDate,"yyyy-MM-dd") + " 00:00:00";
+        String yestEndDate = DateUtils.toString(yestNowEndDate,"yyyy-MM-dd HH:mm:ss");
+        BigDecimal yestDayNowTransAmt = merchantOrderService.getPlatformAmtYestNowData(date,yestStartDate,yestEndDate);
+        BigDecimal toDayTransCount = orderData.get("toDayTransCount") == null ? BigDecimal.ZERO :BigDecimal.valueOf((double)orderData.get("toDayTransCount"));
+        BigDecimal subtract = toDayTransCount.subtract(yestDayNowTransAmt);
+        BigDecimal scale = subtract.divide(yestDayNowTransAmt,4,BigDecimal.ROUND_DOWN).multiply(BigDecimal.valueOf(100)).setScale(2,BigDecimal.ROUND_DOWN);
+        result.putAll(orderData);
+        result.putAll(refundData);
+        result.putAll(otherData);
+        result.putAll(amtData);
+        result.putAll(transData);
+        PlatformData yesterDayData = platformDataService.censusPlatformData();
+        result.put("yesterDay",yesterDayData);
+
+        result.put("yestDayNowTransAmt",yestDayNowTransAmt);
+        result.put("scale",scale + "%");
+        result.put("subtract",Math.abs(subtract.doubleValue()));
+        if(scale.doubleValue() < 0){
+            result.put("oTypeName","下降");
+        }else{
+            result.put("oTypeName","上升");
+        }
+        List<Map<String,Object>> chartTransList = platformDataService.getChartTransCountData();
+        List<String> timeList = new ArrayList<>();
+        List<String> payAmtList = new ArrayList<>();
+        List<String> payNumList = new ArrayList<>();
+        for (Map<String,Object> map:chartTransList) {
+            timeList.add((String) map.get("days"));
+            payAmtList.add(map.get("transCountAmt").toString());
+            payNumList.add(map.get("transNum").toString());
+        }
+        List<String> channelList = new ArrayList<>();
+        List<String> channelAmtList = new ArrayList<>();
+        List<String> channelNumList = new ArrayList<>();
+        List<Map<String,Object>> chartChannelMap = platformDataService.getChartChannelCountData();
+        for (Map<String,Object> map:chartChannelMap) {
+            channelList.add((String) map.get("channelName"));
+            channelAmtList.add(map.get("transCountAmt").toString());
+            channelNumList.add(map.get("transNum").toString());
+        }
+        result.put("timeList",timeList);
+        result.put("payAmtList",payAmtList);
+        result.put("payNumList",payNumList);
+        result.put("channelList",channelList);
+        result.put("channelAmtList",channelAmtList);
+        result.put("channelNumList",channelNumList);
+        return ResultGenerator.genSuccessResult("获取成功",result);
+    }
+
+    @PostMapping("/logout")
+    @ResponseBody
+    public Map<String, Object> login(HttpServletRequest request) {
+        Map<String, Object> result = new HashMap<>();
+        result.put("result", 2);
+        // 执行认证登陆
+        try {
+            result.put("result", 1);
+            result.put("code", 0);
+            result.put("url", request.getContextPath() + "/login");
+        } catch (Exception uae) {
+        }
+        return result;
+    }
+
+    @PostMapping(value = "/showAdmin")
+    @ResponseBody
+    public Map<String, Object> showAdmin() {
+        Map<String, Object> result = new HashMap<>();
+        ShiroUser queryCurrentShiroUser = queryCurrentShiroUser();
+        String loginName = queryCurrentShiroUser.getLoginName();
+        result.put("loginName", loginName);
+        return result;
+    }
+
+    @PostMapping(value = "/getAuditData")
+    @ResponseBody
+    public Result<Object> getAuditData() {
+        QueryWrapper<MerchantChannelStatus> queryWrapper = new QueryWrapper<MerchantChannelStatus>()
+                .eq("status",MerchantChannelStatus.AUDIT_STATUS_EXAMINING)
+                .eq("thirdStatus",MerchantChannelStatus.AUDIT_THIRD_STATUS_WAITING)
+                .last(" order by id desc").select("id");
+        int count = merchantChannelStatusService.count(queryWrapper);
+        queryWrapper.last(" order by id desc limit 1");
+        Map<String,Object> map = merchantChannelStatusService.getMap(queryWrapper);
+        Integer maxId = 0;
+        if(map != null){
+            maxId = (Integer) map.get("id");
+        }
+
+        JSONObject result = new JSONObject(2);
+        result.put("id",maxId);
+        result.put("count",count);
+        return ResultGenerator.genSuccessResult("获取成功",result);
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/home/LoginController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/home/LoginController.java
new file mode 100644
index 0000000..802f016
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/home/LoginController.java
@@ -0,0 +1,133 @@
+package cn.pluss.platform.controller.home;
+
+import cn.hutool.crypto.digest.MD5;
+import cn.pluss.platform.annotation.PassToken;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.entity.UserInfo;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.ipLocation.IpLocationService;
+import cn.pluss.platform.userInfo.UserInfoService;
+import cn.pluss.platform.util.IpUtils;
+import cn.pluss.platform.util.JwtUtils;
+import cn.pluss.platform.wx.WxTalkService;
+import com.aliyuncs.geoip.model.v20200101.DescribeIpv4LocationResponse;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+@Controller
+@RequestMapping("login")
+public class LoginController {
+
+    @Autowired
+    private UserInfoService uiService;
+
+    @Autowired
+    private WxTalkService wxTalkService;
+
+    @Autowired
+    private IpLocationService ipLocationService;
+
+    @PassToken
+    @GetMapping("/auth")
+    @ResponseBody
+    public Result<Object> jwtTest(HttpServletRequest request) {
+        String token = request.getHeader("token");
+        String userId = request.getHeader("userId");
+
+        if (!Objects.equals("244", userId)) {
+            // 此处不能返回401, 不然会形成死循环
+            throw new MsgException("未授权");
+        }
+
+        Object tokenUserId = JwtUtils.get("uid", token);
+        if (!Objects.equals(userId, tokenUserId.toString())) {
+            // 此处不能返回401, 不然会形成死循环
+            throw new MsgException("未授权");
+        }
+
+        try {
+            boolean verify = JwtUtils.verify(token, userId);
+            if (!verify) {
+                // 此处不能返回401, 不然会形成死循环
+                throw new MsgException("未授权");
+            }
+
+            Object expireTime = JwtUtils.get("expire_time", token);
+            if (!(expireTime instanceof Long)) {
+                throw new MsgException("未授权");
+            }
+
+            if (((Long) expireTime) < System.currentTimeMillis()) {
+                throw new MsgException("未授权");
+            }
+
+        } catch (Exception e) {
+            throw new MsgException("未授权");
+        }
+        return ResultGenerator.genSuccessResult();
+    }
+
+    /**
+     *引导页
+     */
+    @PassToken
+    @GetMapping
+    public String index(HttpServletRequest request) {
+        String contextPath = request.getContextPath();
+        switch (contextPath) {
+            case "/merchant":
+                return "index/loginMerchant";
+            case "/service":
+                return "index/loginService";
+            default:
+                return "index/login";
+        }
+    }
+
+    @PassToken
+    @PostMapping("/doLogin")
+    @ResponseBody
+    public Map<String,Object> login(HttpServletRequest request, @RequestParam("loginName") String username, @RequestParam("password") String password) {
+        Map<String,Object> result= new HashMap<>();
+		result.put("result", 2);
+        UserInfo userInfo = new UserInfo();
+        userInfo.setLoginName(username);
+        userInfo = uiService.getOne(new QueryWrapper<>(userInfo));
+
+        String ipAddr = IpUtils.getIpAddr(request);
+        DescribeIpv4LocationResponse clientLocation = ipLocationService.getLocation(ipAddr);
+        String location = clientLocation.getCountry()
+                + "," + clientLocation.getProvince()
+                + "," + clientLocation.getCity()
+                + "," + clientLocation.getCounty();
+        if (userInfo == null) {
+            wxTalkService.sendManageLoginInfo(username, password, ipAddr, clientLocation.getIsp(), location, false);
+            result.put("message", "用户名或者密码错误");
+            return result;
+        }
+
+        if (!userInfo.getPassword().equals(MD5.create().digestHex(password, StandardCharsets.UTF_8))) {
+            wxTalkService.sendManageLoginInfo(username, password, ipAddr, clientLocation.getIsp(), location, false);
+            result.put("message", "用户名或者密码错误");
+            return result;
+        }
+
+        result.put("result", 1);
+        result.put("redirectUri", "/manage/platform/console");
+        result.put("token", JwtUtils.getToken(userInfo));
+        result.put("userId", userInfo.getId());
+
+        wxTalkService.sendManageLoginInfo(username, password, ipAddr, clientLocation.getIsp(), location, true);
+        return result;
+    }
+
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/inviteRate/InviteRateController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/inviteRate/InviteRateController.java
new file mode 100644
index 0000000..82ab8cb
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/inviteRate/InviteRateController.java
@@ -0,0 +1,117 @@
+package cn.pluss.platform.controller.inviteRate;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.dict.DictService;
+import cn.pluss.platform.entity.Dict;
+import cn.pluss.platform.entity.InviteRate;
+import cn.pluss.platform.entity.OfficialActivity;
+import cn.pluss.platform.inviteRate.InviteRateService;
+import cn.pluss.platform.officialActivity.OfficialActivityService;
+import cn.pluss.platform.util.DateUtils;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.commons.lang3.time.DateFormatUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 邀请商户费率阶梯表 前端控制器
+ * </p>
+ *
+ * @author bzg
+ * @since 2020-11-20
+ */
+@Controller
+@RequestMapping("/inviteRate")
+public class InviteRateController extends BaseModelController<InviteRateService, InviteRate> {
+
+    @Autowired
+    private InviteRateService inviteRateService;
+
+    @Autowired
+    private DictService dictService;
+
+    @Autowired
+    private OfficialActivityService officialActivityService;
+
+    /**
+     * 引导页
+     *
+     * @return
+     */
+    @GetMapping("/index")
+    public String index(HttpServletRequest request) {
+        List<Dict> dictList = dictService.getByCode(Collections.singletonList("SERVICE_PROVIDER_TYPE"));
+        request.setAttribute("dictList", JSONObject.toJSONString(dictList));
+        return "inviteRate/inviteRateList";
+    }
+
+    @Override
+    public Result<Page<InviteRate>> page(Page<InviteRate> page, InviteRate condition, OrderItem orderItem) {
+        return super.page(page, condition, orderItem);
+    }
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = {"/detail/{id}", "/detail"})
+    public String detail(HttpServletRequest request, @PathVariable(value = "id", required = false) Integer id) {
+        List<Dict> typeList = dictService.getByCode(Collections.singletonList("SERVICE_PROVIDER_TYPE"));
+        if (id != null) {
+            InviteRate inviteRate = inviteRateService.getById(id);
+            String type = inviteRate.getType();
+            QueryWrapper<OfficialActivity> queryWrapper = new QueryWrapper<OfficialActivity>().eq("activityGroupNo",type);
+            List<OfficialActivity> list = officialActivityService.list(queryWrapper);
+            /*String format = "yyyy-MM-dd HH:mm:ss";
+            inviteRate.setStartTimeStr(DateFormatUtils.format(inviteRate.getStartTime(), format));
+            inviteRate.setEndTimeStr(DateFormatUtils.format(inviteRate.getEndTime(), format));*/
+            request.setAttribute("entity", inviteRate);
+            request.setAttribute("actList", list);
+        }
+        request.setAttribute("typeList", typeList);
+        return "inviteRate/detail";
+    }
+
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = "/getActType/{type}")
+    @ResponseBody
+    public Result getActType(@PathVariable(value = "type") String type){
+        QueryWrapper<OfficialActivity> queryWrapper = new QueryWrapper<OfficialActivity>()
+                .eq("status","2").eq("activityGroupNo",type);
+        List<OfficialActivity> list = officialActivityService.list(queryWrapper);
+        return ResultGenerator.genSuccessResult("查询成功",list);
+    }
+
+    @Override
+    public Result<String> save(@RequestBody InviteRate entity) {
+        OfficialActivity act = officialActivityService.getById(entity.getActId());
+        if(act == null){
+            return ResultGenerator.genFailResult("活动不存在");
+        }
+        if (entity.getId() == null){
+            entity.setActName(act.getOfficName());
+            entity.setStartTime(act.getStartTime());
+            entity.setEndTime(act.getEndTime());
+            entity.setCreateTime(DateUtils.formatDateDefault(new Date(),"yyyy-MM-dd HH:mm:ss"));
+        }else{
+            entity.setUpdateTime(DateUtils.formatDateDefault(new Date(),"yyyy-MM-dd HH:mm:ss"));
+        }
+        return super.save(entity);
+    }
+
+    @DeleteMapping("/del")
+    public Result<String> delete(@RequestBody InviteRate inviteRate) {
+        inviteRateService.removeById(inviteRate.getId());
+        return ResultGenerator.genSuccessResult("删除成功", null);
+    }
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/jft/JftBankCardController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/jft/JftBankCardController.java
new file mode 100644
index 0000000..f166227
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/jft/JftBankCardController.java
@@ -0,0 +1,61 @@
+package cn.pluss.platform.controller.jft;
+
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.entity.JftBankCard;
+import cn.pluss.platform.entity.RewardConfig;
+import cn.pluss.platform.entity.UserRole;
+import cn.pluss.platform.jft.JftBankCardService;
+import cn.pluss.platform.rewardConfig.RewardConfigService;
+import cn.pluss.platform.user.UserRoleService;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * <p>
+ * 缴费通银行卡 前端控制器
+ * </p>
+ *
+ * @author bzg
+ * @since 2022-02-22
+ */
+@Controller
+@RequestMapping("/jftBankCard")
+public class JftBankCardController extends BaseModelController<JftBankCardService, JftBankCard> {
+
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = "/index")
+    public String index(HttpServletRequest request) {
+        return "jft/bankList";
+    }
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = {"/detail/{id}", "/detail"})
+    public String detail(HttpServletRequest request, @PathVariable(value = "id", required = false) Integer id) {
+        if (id != null) {
+            JftBankCard entity = baseService.getOne(new QueryWrapper<JftBankCard>().eq("id",id));
+            request.setAttribute("entity", entity);
+        }
+        return "jft/bankDetail";
+    }
+
+    @Override
+    public Result<Page<JftBankCard>> page(Page<JftBankCard> page, JftBankCard condition, OrderItem orderItem) {
+        orderItem.setColumn("id");
+        orderItem.setAsc(false);
+        return super.page(page, condition, orderItem);
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/jft/JftMercBaseInfoController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/jft/JftMercBaseInfoController.java
new file mode 100644
index 0000000..cd9b547
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/jft/JftMercBaseInfoController.java
@@ -0,0 +1,53 @@
+package cn.pluss.platform.controller.jft;
+
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.entity.JftBankCard;
+import cn.pluss.platform.entity.JftMercBaseInfo;
+import cn.pluss.platform.jft.JftBankCardService;
+import cn.pluss.platform.jft.JftMercBaseInfoService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * <p>
+ * 缴费通商户信息 前端控制器
+ * </p>
+ *
+ * @author bzg
+ * @since 2022-02-22
+ */
+@Controller
+@RequestMapping("/jftMercInfo")
+public class JftMercBaseInfoController extends BaseModelController<JftMercBaseInfoService, JftMercBaseInfo> {
+
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = "/index")
+    public String index(HttpServletRequest request) {
+        return "jft/mercList";
+    }
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = {"/detail/{id}", "/detail"})
+    public String detail(HttpServletRequest request, @PathVariable(value = "id", required = false) Integer id) {
+        if (id != null) {
+            JftMercBaseInfo entity = baseService.getOne(new QueryWrapper<JftMercBaseInfo>().eq("id",id));
+            request.setAttribute("entity", entity);
+        }
+        return "jft/mercDetail";
+    }
+
+    @Override
+    public Result<Page<JftMercBaseInfo>> page(Page<JftMercBaseInfo> page, JftMercBaseInfo condition, OrderItem orderItem) {
+        orderItem.setColumn("createTime");
+        orderItem.setAsc(false);
+        return super.page(page, condition, orderItem);
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/jft/JftMercPaymentChannelController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/jft/JftMercPaymentChannelController.java
new file mode 100644
index 0000000..96defda
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/jft/JftMercPaymentChannelController.java
@@ -0,0 +1,105 @@
+package cn.pluss.platform.controller.jft;
+
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.merchant.JftMercPaymentChannelService;
+import cn.pluss.platform.notice.NoticeService;
+import cn.pluss.platform.user.impl.GeneralPushUtil;
+import cn.pluss.platform.yinsheng.v20210929.ReqMethod;
+import cn.pluss.platform.ys.impl.v20210929.YsConfigV2;
+import cn.pluss.platform.ysExtension.v20220615.YsServiceV2;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Collections;
+
+/**
+ * <p>
+ * 缴费通进件信息 前端控制器
+ * </p>
+ *
+ * @author bzg
+ * @since 2022-02-22
+ */
+@Controller
+@RequestMapping("/jftPaymentChannel")
+public class JftMercPaymentChannelController extends BaseModelController<JftMercPaymentChannelService, JftMercPaymentChannel> {
+
+    @Autowired
+    private YsServiceV2 ysServiceV2;
+
+    @Autowired
+    private NoticeService noticeService;
+
+    @Autowired
+    private GeneralPushUtil generalPushUtil;
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = "/index")
+    public String index(HttpServletRequest request) {
+        return "jft/channelList";
+    }
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = {"/detail/{id}", "/detail"})
+    public String detail(HttpServletRequest request, @PathVariable(value = "id", required = false) Integer id) {
+        if (id != null) {
+            JftMercPaymentChannel entity = baseService.getOne(new QueryWrapper<JftMercPaymentChannel>().eq("id",id));
+            request.setAttribute("entity", entity);
+        }
+        return "jft/channelDetail";
+    }
+
+    @Override
+    public Result<Page<JftMercPaymentChannel>> page(Page<JftMercPaymentChannel> page, JftMercPaymentChannel condition, OrderItem orderItem) {
+        orderItem.setColumn("createTime");
+        orderItem.setAsc(false);
+        return super.page(page, condition, orderItem);
+    }
+
+    @PostMapping("/sendMsg")
+    @ResponseBody
+    public Result<?> sendMsg(String userId) {
+        JftMercPaymentChannel jpc = baseService.getByUserId(userId);
+        if (jpc.getStatus().equals(MerchantChannelStatus.AUDIT_STATUS_SUCCESS)) {
+            throw new MsgException("已完成进件！");
+        }
+
+        JSONObject data = new JSONObject();
+        data.put("sysFlowId", jpc.getApplicationId());
+        data.put("isSendMsg", "N");
+        JSONObject respResult = ysServiceV2.req(YsConfigV2.MER_PROTOCOL_MSG, ReqMethod.MERCHANT_SEND_MSG, data);
+
+        if ("00".equals(respResult.getString("code"))) {
+            jpc.getExtra().put("sysSignFlowId", respResult.getString("sysSignFlowId"));
+            jpc.getExtra().put("signUrl", respResult.getString("signUrl"));
+
+            Notice notice = new Notice(1, -1, userId);
+            String uniqueKey = "YS_QY" + System.currentTimeMillis();
+            String title = "电子协议签约通知";
+            String content = "尊敬的客户您好，请点此通知完成签约意愿授权。请注意，同意授权后，支付通道才会进行商户资料审核，否则会一直等待审核。";
+            String url = respResult.getString("signUrl");
+            notice.setUniqueKey(uniqueKey);
+            notice.setNoticeCode(uniqueKey);
+            notice.setTitle(title);
+            notice.setUrl(url);
+            notice.setDesc(content);
+            noticeService.save(notice);
+
+            generalPushUtil.sendAllPlatByAlias(Collections.singletonList(userId), title, content, "1");
+
+            jpc.setStatus(MerchantChannelStatus.AUDIT_STATUS_WAITING_SIGN);
+            baseService.updateById(jpc);
+        }
+
+        return ResultGenerator.genSuccessResult("操作成功", null);
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/jft/JftMerchantRateController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/jft/JftMerchantRateController.java
new file mode 100644
index 0000000..7bbafd7
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/jft/JftMerchantRateController.java
@@ -0,0 +1,77 @@
+package cn.pluss.platform.controller.jft;
+
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.entity.JftBankCard;
+import cn.pluss.platform.entity.JftMerchantRate;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.entity.UserLevel;
+import cn.pluss.platform.jft.JftMerchantRateService;
+import cn.pluss.platform.user.UserLevelService;
+import cn.pluss.platform.userApp.UserAppService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * <p>
+ * 缴费通银行卡 前端控制器
+ * </p>
+ *
+ * @author bzg
+ * @since 2022-02-22
+ */
+@Controller
+@RequestMapping("/jftMercRate")
+public class JftMerchantRateController extends BaseModelController<JftMerchantRateService, JftMerchantRate> {
+
+    @Resource
+    private UserAppService userAppService;
+
+    @Resource
+    private UserLevelService userLevelService;
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = "/index")
+    public String index(HttpServletRequest request) {
+        return "jft/rateList";
+    }
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = {"/detail/{id}", "/detail"})
+    public String detail(HttpServletRequest request, @PathVariable(value = "id", required = false) Integer id) {
+        if (id != null) {
+            JftMerchantRate entity = baseService.getOne(new QueryWrapper<JftMerchantRate>().eq("id",id));
+            request.setAttribute("entity", entity);
+        }
+        return "jft/rateDetail";
+    }
+
+    @Override
+    public Result<Page<JftMerchantRate>> page(Page<JftMerchantRate> page, JftMerchantRate condition, OrderItem orderItem) {
+        orderItem.setColumn("createTime");
+        orderItem.setAsc(false);
+        Result<Page<JftMerchantRate>> result = super.page(page, condition, orderItem);
+        Page<JftMerchantRate> pageRecords = result.getData();
+        List<JftMerchantRate> records = pageRecords.getRecords();
+        for (JftMerchantRate rate :records) {
+            UserApp userApp = userAppService.getUserAppByUserId(rate.getUserId());
+            rate.setLevelCode(userApp.getLevelCode());
+            UserLevel level = userLevelService.getLevelInfoByRoleLevel(userApp.getRoleCode(), userApp.getLevelCode());
+            if(level != null){
+                rate.setConsultRate(level.getJftRate());
+            }else{
+                rate.setConsultRate(BigDecimal.ZERO);
+            }
+        }
+        return result;
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/jft/JftMerchantRateRecordController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/jft/JftMerchantRateRecordController.java
new file mode 100644
index 0000000..59f6723
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/jft/JftMerchantRateRecordController.java
@@ -0,0 +1,43 @@
+package cn.pluss.platform.controller.jft;
+
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.entity.JftBankCard;
+import cn.pluss.platform.entity.JftMerchantRateRecord;
+import cn.pluss.platform.jft.JftMerchantRateRecordService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * <p>
+ * 缴费通费率变更记录 前端控制器
+ * </p>
+ *
+ * @author bzg
+ * @since 2022-02-22
+ */
+@Controller
+@RequestMapping("/jftRateRecord")
+public class JftMerchantRateRecordController extends BaseModelController<JftMerchantRateRecordService, JftMerchantRateRecord> {
+
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = "/index")
+    public String index(HttpServletRequest request) {
+        return "jft/rateRecordList";
+    }
+
+    @Override
+    public Result<Page<JftMerchantRateRecord>> page(Page<JftMerchantRateRecord> page, JftMerchantRateRecord condition, OrderItem orderItem) {
+        orderItem.setColumn("createTime");
+        orderItem.setAsc(false);
+        return super.page(page, condition, orderItem);
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/jft/JftPaymentInfoController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/jft/JftPaymentInfoController.java
new file mode 100644
index 0000000..f5494b2
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/jft/JftPaymentInfoController.java
@@ -0,0 +1,52 @@
+package cn.pluss.platform.controller.jft;
+
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.entity.JftBankCard;
+import cn.pluss.platform.entity.JftPaymentInfo;
+import cn.pluss.platform.jft.JftPaymentInfoService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * <p>
+ * 缴费通银行卡 前端控制器
+ * </p>
+ *
+ * @author bzg
+ * @since 2022-02-22
+ */
+@Controller
+@RequestMapping("/jftPaymentInfo")
+public class JftPaymentInfoController extends BaseModelController<JftPaymentInfoService, JftPaymentInfo> {
+
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = "/index")
+    public String index(HttpServletRequest request) {
+        return "jft/paymentlist";
+    }
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = {"/detail/{id}", "/detail"})
+    public String detail(HttpServletRequest request, @PathVariable(value = "id", required = false) Integer id) {
+        if (id != null) {
+            JftPaymentInfo entity = baseService.getOne(new QueryWrapper<JftPaymentInfo>().eq("id",id));
+            request.setAttribute("entity", entity);
+        }
+        return "jft/paymentDetail";
+    }
+
+    @Override
+    public Result<Page<JftPaymentInfo>> page(Page<JftPaymentInfo> page, JftPaymentInfo condition, OrderItem orderItem) {
+        orderItem.setColumn("createTime");
+        orderItem.setAsc(false);
+        return super.page(page, condition, orderItem);
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/jft/JftReceiptInfoController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/jft/JftReceiptInfoController.java
new file mode 100644
index 0000000..5db5254
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/jft/JftReceiptInfoController.java
@@ -0,0 +1,43 @@
+ package cn.pluss.platform.controller.jft;
+
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.entity.JftBankCard;
+import cn.pluss.platform.entity.JftReceiptInfo;
+import cn.pluss.platform.jft.JftReceiptInfoService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * <p>
+ * 缴费通银行卡 前端控制器
+ * </p>
+ *
+ * @author bzg
+ * @since 2022-02-22
+ */
+@Controller
+@RequestMapping("/jfReceiptInfo")
+public class JftReceiptInfoController extends BaseModelController<JftReceiptInfoService, JftReceiptInfo> {
+
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = "/index")
+    public String index(HttpServletRequest request) {
+        return "jft/receiptList";
+    }
+
+    @Override
+    public Result<Page<JftReceiptInfo>> page(Page<JftReceiptInfo> page, JftReceiptInfo condition, OrderItem orderItem) {
+        orderItem.setColumn("createTime");
+        orderItem.setAsc(false);
+        return super.page(page, condition, orderItem);
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/jft/JftReceiptOrderController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/jft/JftReceiptOrderController.java
new file mode 100644
index 0000000..2c63131
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/jft/JftReceiptOrderController.java
@@ -0,0 +1,42 @@
+package cn.pluss.platform.controller.jft;
+
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.entity.JftReceiptOrder;
+import cn.pluss.platform.jft.JftReceiptOrderService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * <p>
+ * 缴费通银行卡 前端控制器
+ * </p>
+ *
+ * @author bzg
+ * @since 2022-02-22
+ */
+@Controller
+@RequestMapping("/jftOrder")
+public class JftReceiptOrderController extends BaseModelController<JftReceiptOrderService, JftReceiptOrder> {
+
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = "/index")
+    public String index(HttpServletRequest request) {
+        return "jft/orderList";
+    }
+
+    @Override
+    public Result<Page<JftReceiptOrder>> page(Page<JftReceiptOrder> page, JftReceiptOrder condition, OrderItem orderItem) {
+        orderItem.setColumn("id");
+        orderItem.setAsc(false);
+        return super.page(page, condition, orderItem);
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/jft/JftSmallClassController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/jft/JftSmallClassController.java
new file mode 100644
index 0000000..93d9e48
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/jft/JftSmallClassController.java
@@ -0,0 +1,56 @@
+package cn.pluss.platform.controller.jft;
+
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.entity.JftReceiptOrder;
+import cn.pluss.platform.entity.JftSmallClass;
+import cn.pluss.platform.jft.JftSmallClassService;
+import cn.pluss.platform.util.Base64Util;
+import cn.pluss.platform.util.OssOperatUtil;
+import cn.pluss.platform.util.StringUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.InputStream;
+
+/**
+ * <p>
+ * 缴费通小课堂信息表 前端控制器
+ * </p>
+ *
+ * @author bzg
+ * @since 2022-07-06
+ */
+@Controller
+@RequestMapping("/jftSmallClass")
+public class JftSmallClassController extends BaseModelController<JftSmallClassService, JftSmallClass> {
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = "/index")
+    public String index(HttpServletRequest request) {
+        return "jft/classList";
+    }
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = {"/detail/{id}", "/detail"})
+    public String detail(HttpServletRequest request, @PathVariable(value = "id", required = false) Integer id) {
+        if (id != null) {
+            JftSmallClass entity = baseService.getOne(new QueryWrapper<JftSmallClass>().eq("id",id));
+            request.setAttribute("entity", entity);
+        }
+        return "jft/classDetail";
+    }
+
+    @Override
+    public Result<Page<JftSmallClass>> page(Page<JftSmallClass> page, JftSmallClass condition, OrderItem orderItem) {
+        orderItem.setColumn("sort");
+        orderItem.setAsc(false);
+        return super.page(page, condition, orderItem);
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/level/LevelController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/level/LevelController.java
new file mode 100644
index 0000000..74b2d43
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/level/LevelController.java
@@ -0,0 +1,160 @@
+package cn.pluss.platform.controller.level;
+
+
+import java.util.Map;
+import java.util.List;
+import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.util.StringUtil;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import cn.pluss.platform.entity.Level;
+import cn.pluss.platform.level.LevelService;
+
+@Controller
+@RequestMapping("level")
+public class LevelController extends BaseModelController<LevelService, Level> {
+
+    private Integer PAGE_SIZE = 12;
+
+    /**
+     * 引导页
+     *
+     * @return
+     */
+    @RequestMapping(value = "/index", method = RequestMethod.GET)
+    public String index(Integer pageIndex) {
+
+        return "level/levelList";
+    }
+
+    /**
+     * 分页查询
+     */
+    @RequestMapping(value = "/queryLevelByPage", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> queryLevelByPage(Integer currPage, Integer id) {
+
+        if (currPage == null) {
+            currPage = 1;
+        }
+        Map<String, Object> map = new HashMap<String, Object>();
+        map.put("pageSize", PAGE_SIZE);
+        map.put("offset", (currPage - 1) * PAGE_SIZE);
+        map.put("id", id);
+        List<Level> levelList = baseService.queryLevelPage(map);
+        Integer count = baseService.queryLevelPageCount(map);
+        Map<String, Object> result = new HashMap<String, Object>();
+        result.put("levelList", levelList);
+        result.put("count", count);
+        result.put("pageCount", StringUtil.getPageCount(count, PAGE_SIZE));
+        result.put("currPage", currPage);
+        return result;
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryLevelDetails", method = RequestMethod.GET)
+    public String queryLevelDetails(HttpServletRequest request, Long id, Long pageIndex) {
+
+        if (id != null && id != 0) {
+            Level level = new Level();
+            level.setId(id);
+            level = baseService.queryLevel(level);
+            request.setAttribute("level", level);
+            request.setAttribute("pageIndex", pageIndex);
+        }
+        return "level/levelDetails";
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryLevelBaseInfo", method = RequestMethod.GET)
+    public String queryLevelBaseInfo(HttpServletRequest request, Long id, Long pageIndex) {
+
+        if (id != null && id != 0) {
+            Level level = new Level();
+            level.setId(id);
+            level = baseService.queryLevel(level);
+            BigDecimal rate = BigDecimal.valueOf(level.getRate());
+
+            request.setAttribute("rate", rate);
+            request.setAttribute("level", level);
+            request.setAttribute("pageIndex", pageIndex);
+        }
+        return "level/levelBaseInfo";
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryLevelExtendsInfo", method = RequestMethod.GET)
+    public String queryLevelExtendsInfo() {
+
+        return "level/levelExtendsInfo";
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryLevelFunctionsInfo", method = RequestMethod.GET)
+    public String queryLevelFunctionsInfo() {
+
+        return "level/levelFunctionsInfo";
+    }
+
+    /**
+     * 保存对象
+     *
+     * @throws ParseException
+     */
+    @RequestMapping(value = "/saveLevel", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> saveLevel(Level level) throws ParseException {
+        SimpleDateFormat date = new SimpleDateFormat("yyyy-MM-dd");
+        String createDtSTR = level.getCreateDtSTR();
+        if (!StringUtil.isEmpty(createDtSTR)) {
+            Date date2 = date.parse(createDtSTR);
+            level.setCreateDt(date2);
+        }
+        if (level.getId() != null && level.getId() != 0) {
+            baseService.updateLevel(level);
+        } else {
+            baseService.saveLevel(level);
+        }
+        Map<String, Object> result = new HashMap<String, Object>();
+        result.put("resultCode", "1");
+        result.put("resultMessage", "保存成功!");
+        return result;
+    }
+
+    /**
+     * 修改对象
+     *
+     */
+    @RequestMapping(value = "/updateLevel", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> updateLevel(Long id) {
+
+        Level level = new Level();
+        level.setId(id);
+        baseService.updateLevel(level);
+        Map<String, Object> result = new HashMap<String, Object>();
+        result.put("resultCode", "1");
+        result.put("resultMessage", "保存成功!");
+        return result;
+    }
+
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/memberOrder/MemberOrderController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/memberOrder/MemberOrderController.java
new file mode 100644
index 0000000..48d216f
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/memberOrder/MemberOrderController.java
@@ -0,0 +1,171 @@
+package cn.pluss.platform.controller.memberOrder;
+
+import cn.pluss.platform.controller.BaseNoModelController;
+import cn.pluss.platform.entity.MemberOrder;
+import cn.pluss.platform.memberOrder.MemberOrderService;
+import cn.pluss.platform.util.StringUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Controller
+@RequestMapping("memberOrder")
+public class MemberOrderController extends BaseNoModelController {
+
+
+    private Integer PAGE_SIZE = 12;
+
+    @Autowired
+    private MemberOrderService memberOrderService;
+
+    /**
+     * 引导页
+     *
+     * @return
+     */
+    @RequestMapping(value = "/index", method = RequestMethod.GET)
+    public String index() {
+
+        return "memberOrder/memberOrderList";
+    }
+
+    /**
+     * 分页查询
+     */
+    @RequestMapping(value = "/queryMemberOrderByPage", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> queryMemberOrderByPage(Integer currPage, Integer id) {
+
+        if (currPage == null) {
+            currPage = 1;
+        }
+        Map<String, Object> map = new HashMap<String, Object>();
+        map.put("pageSize", PAGE_SIZE);
+        map.put("offset", (currPage - 1) * PAGE_SIZE);
+        map.put("id", id);
+        List<MemberOrder> memberOrderList = memberOrderService.queryMemberOrderPage(map);
+        Integer count = memberOrderService.queryMemberOrderPageCount(map);
+        Map<String, Object> result = new HashMap<String, Object>();
+        result.put("memberOrderList", memberOrderList);
+        result.put("count", count);
+        result.put("pageCount", StringUtil.getPageCount(count, PAGE_SIZE));
+        result.put("currPage", currPage);
+        return result;
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryMemberOrderDetails", method = RequestMethod.GET)
+    public String queryMemberOrderDetails(HttpServletRequest request, Integer id, Integer pageIndex) {
+
+        if (id != null && id != 0) {
+            MemberOrder memberOrder = new MemberOrder();
+            memberOrder.setId(id);
+            memberOrder = memberOrderService.queryMemberOrder(memberOrder);
+            request.setAttribute("memberOrder", memberOrder);
+            request.setAttribute("pageIndex", pageIndex);
+        }
+        return "memberOrder/memberOrderDetails";
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryMemberOrderBaseInfo", method = RequestMethod.GET)
+    public String queryMemberOrderBaseInfo(HttpServletRequest request, Integer id, Integer pageIndex) {
+
+        if (id != null && id != 0) {
+            MemberOrder memberOrder = new MemberOrder();
+            memberOrder.setId(id);
+            memberOrder = memberOrderService.queryMemberOrder(memberOrder);
+            request.setAttribute("memberOrder", memberOrder);
+            request.setAttribute("pageIndex", pageIndex);
+        }
+        return "memberOrder/memberOrderBaseInfo";
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryMemberOrderExtendsInfo", method = RequestMethod.GET)
+    public String queryMemberOrderExtendsInfo() {
+
+        return "memberOrder/memberOrderExtendsInfo";
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryMemberOrderFunctionsInfo", method = RequestMethod.GET)
+    public String queryMemberOrderFunctionsInfo() {
+
+        return "memberOrder/memberOrderFunctionsInfo";
+    }
+
+    /**
+     * 保存对象
+     *
+     * @throws IOException
+     */
+    @RequestMapping(value = "/saveMemberOrder", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> saveMemberOrder(MemberOrder memberOrder) {
+
+        if (memberOrder.getId() != null && memberOrder.getId() != 0) {
+            memberOrderService.updateMemberOrder(memberOrder);
+        } else {
+            memberOrderService.saveMemberOrder(memberOrder);
+        }
+        Map<String, Object> result = new HashMap<String, Object>();
+        result.put("resultCode", "1");
+        result.put("resultMessage", "保存成功!");
+        return result;
+    }
+
+    /**
+     * 修改对象
+     *
+     * @throws IOException
+     */
+    @RequestMapping(value = "/updateMemberOrder", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> updateMemberOrder(Integer id) {
+
+        MemberOrder memberOrder = new MemberOrder();
+        memberOrder.setId(id);
+        memberOrderService.updateMemberOrder(memberOrder);
+        Map<String, Object> result = new HashMap<String, Object>();
+        result.put("resultCode", "1");
+        result.put("resultMessage", "保存成功!");
+        return result;
+    }
+
+    /**
+     * 删除对象
+     *
+     * @throws IOException
+     */
+    @RequestMapping(value = "/deleteMemberOrder", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> deleteMemberOrder(Integer id) {
+        MemberOrder memberOrder = new MemberOrder();
+        memberOrder.setId(id);
+        memberOrderService.deleteMemberOrder(memberOrder);
+        Map<String, Object> result = new HashMap<>();
+        result.put("resultCode", "1");
+        result.put("resultMessage", "保存成功!");
+        return result;
+    }
+
+}
+
+
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/memberSetting/MemberSettingController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/memberSetting/MemberSettingController.java
new file mode 100644
index 0000000..66b3d46
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/memberSetting/MemberSettingController.java
@@ -0,0 +1,158 @@
+package cn.pluss.platform.controller.memberSetting;
+
+import cn.pluss.platform.controller.BaseNoModelController;
+import cn.pluss.platform.entity.MemberSetting;
+import cn.pluss.platform.memberSetting.MemberSettingService;
+import cn.pluss.platform.util.StringUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Controller
+@RequestMapping("memberSetting")
+public class MemberSettingController  extends BaseNoModelController {
+
+	  private Integer PAGE_SIZE=12;
+
+    @Autowired
+	  private MemberSettingService memberSettingService;
+
+    /**
+    *引导页
+    * @return
+    */
+    @RequestMapping(value = "/index", method = RequestMethod.GET)
+    public String index() {
+   
+        return "memberSetting/memberSettingList";
+    }
+
+    /**
+    *分页查询
+    */
+    @RequestMapping(value = "/queryMemberSettingByPage", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String,Object> queryMemberSettingByPage(Integer currPage,Integer id){
+   
+   	if(currPage==null) {
+   	   currPage=1;
+       }
+    	Map<String,Object> map=new HashMap<String, Object>();
+    	map.put("pageSize",PAGE_SIZE);
+    	map.put("offset", (currPage-1)*PAGE_SIZE);
+    	map.put("id",  id);
+    	List<MemberSetting> memberSettingList=memberSettingService.queryMemberSettingPage(map);
+    	Integer count=memberSettingService.queryMemberSettingPageCount(map);
+        Map<String,Object> result=new HashMap<String,Object>();
+        result.put("memberSettingList", memberSettingList);
+        result.put("count", count);
+        result.put("pageCount",StringUtil.getPageCount(count,PAGE_SIZE));
+        result.put("currPage", currPage);
+    	  return result;
+    }
+    /**
+    *查询详情
+    */
+     @RequestMapping(value = "/queryMemberSettingDetails", method = RequestMethod.GET)
+    public String queryMemberSettingDetails(HttpServletRequest request,Integer id,Integer pageIndex){
+   
+   	  if(id!=null&&id!=0) {
+   		 MemberSetting memberSetting=new MemberSetting();
+   		 memberSetting.setId(id);
+           memberSetting=memberSettingService.queryMemberSetting(memberSetting);
+          request.setAttribute("memberSetting", memberSetting);
+   		request.setAttribute("pageIndex", pageIndex);
+       	}
+        return "memberSetting/memberSettingDetails";
+    }
+    /**
+    *查询详情
+    */
+     @RequestMapping(value = "/queryMemberSettingBaseInfo", method = RequestMethod.GET)
+    public String queryMemberSettingBaseInfo(HttpServletRequest request,Integer id,Integer pageIndex){
+   
+   	  if(id!=null&&id!=0) {
+   		MemberSetting memberSetting=new MemberSetting();
+   		memberSetting.setId(id);
+        memberSetting=memberSettingService.queryMemberSetting(memberSetting);
+          request.setAttribute("memberSetting", memberSetting);
+   		request.setAttribute("pageIndex", pageIndex);
+       	}
+        return "memberSetting/memberSettingBaseInfo";
+    }
+    /**
+    *查询详情
+    */
+     @RequestMapping(value = "/queryMemberSettingExtendsInfo", method = RequestMethod.GET)
+    public String queryMemberSettingExtendsInfo(){
+   
+        return "memberSetting/memberSettingExtendsInfo";
+    }
+    /**
+    *查询详情
+    */
+     @RequestMapping(value = "/queryMemberSettingFunctionsInfo", method = RequestMethod.GET)
+    public String queryMemberSettingFunctionsInfo(){
+   
+        return "memberSetting/memberSettingFunctionsInfo";
+    }
+    /**
+    *保存对象
+    *@throws IOException
+    */
+    @RequestMapping(value = "/saveMemberSetting", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String,Object> saveMemberSetting(MemberSetting memberSetting){
+   
+       if(memberSetting.getId()!=null&&memberSetting.getId()!=0){
+    		memberSettingService.updateMemberSetting(memberSetting);
+    	 }else{  
+      	memberSettingService.saveMemberSetting(memberSetting);
+    	 }  
+		Map<String,Object> result=new HashMap<String,Object>();
+    	result.put("resultCode", "1");
+    	result.put("resultMessage", "保存成功!");
+    	return result;
+    }
+    /**
+    *修改对象
+    *@throws IOException
+    */
+    @RequestMapping(value = "/updateMemberSetting", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String,Object> updateMemberSetting(Integer id){
+   
+   	MemberSetting memberSetting=new MemberSetting();
+   	memberSetting.setId(id);
+      memberSettingService.updateMemberSetting(memberSetting);
+   	Map<String,Object> result=new HashMap<String,Object>();
+    	result.put("resultCode", "1");
+    	result.put("resultMessage", "保存成功!");
+    	return result;
+    }
+    /**
+    *删除对象
+    *@throws IOException
+    */
+    @RequestMapping(value = "/deleteMemberSetting", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String,Object> deleteMemberSetting(Integer id){
+   	MemberSetting memberSetting=new MemberSetting();
+   	memberSetting.setId(id);
+		memberSettingService.deleteMemberSetting(memberSetting);
+		Map<String,Object> result=new HashMap<String,Object>();
+    	result.put("resultCode", "1");
+    	result.put("resultMessage", "保存成功!");
+    	return result;
+    }
+
+}
+
+
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/menuInfo/MenuInfoController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/menuInfo/MenuInfoController.java
new file mode 100644
index 0000000..cc3537f
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/menuInfo/MenuInfoController.java
@@ -0,0 +1,281 @@
+package cn.pluss.platform.controller.menuInfo;
+
+import cn.jiguang.common.utils.StringUtils;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.controller.BaseNoModelController;
+import cn.pluss.platform.entity.MenuInfo;
+import cn.pluss.platform.entity.UserInfo;
+import cn.pluss.platform.menuInfo.MenuInfoService;
+import cn.pluss.platform.util.StringUtil;
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Controller
+@RequestMapping("menuInfo")
+public class MenuInfoController extends BaseNoModelController {
+
+    private Integer PAGE_SIZE = 12;
+
+    @Autowired
+    private MenuInfoService menuInfoService;
+
+    /**
+     * 引导页
+     *
+     * @return
+     */
+    @GetMapping
+    public String index() {
+        return "auth/menu/menu_v2";
+    }
+
+    /**
+     * 获取菜单
+     *
+     */
+    @GetMapping("/getMenuTree")
+    @ResponseBody
+    public Result<List<MenuInfo>> getMenuTree(MenuInfo menuInfo) {
+        List<MenuInfo> menuTree = menuInfoService.getMenuTree(menuInfo);
+        return ResultGenerator.genSuccessResult(menuTree);
+    }
+
+    /**
+     * 获取角色配置菜单
+     *
+     */
+    @GetMapping("/getRoleConfigMenuTree")
+    @ResponseBody
+    public Result<List<MenuInfo>> getRoleConfigMenuTree(MenuInfo menuInfo, String roleId) {
+        List<MenuInfo> menuTree = menuInfoService.getRoleConfigMenuTree(menuInfo, roleId);
+        return ResultGenerator.genSuccessResult(menuTree);
+    }
+
+    /**
+     * 获取菜单
+     *
+     * @throws IOException
+     */
+    @RequestMapping(value = "/getSubMenus", method = RequestMethod.POST)
+    @ResponseBody
+    public List<MenuInfo> getSubMenus(String parentId) throws IOException {
+
+        MenuInfo menuInfo = new MenuInfo();
+        if (!StringUtil.isEmpty(parentId)) {
+            menuInfo.setParentId(Integer.valueOf(parentId));
+        }
+        List<MenuInfo> menuList = menuInfoService.queryMenuInfoList(menuInfo);
+        String json = JSONObject.toJSONString(menuList);
+        return menuList;
+    }
+
+
+    /**
+     * 保存对象
+     *
+     * @throws IOException
+     */
+    @RequestMapping(value = "/saveMenu", method = RequestMethod.POST)
+    @ResponseBody
+    public MenuInfo saveMenu(MenuInfo menu) throws IOException {
+        menu.setVisible(0);
+        if (!StringUtil.isEmpty(menu.getIsVisible())) {
+
+            if ("on".equals(menu.getIsVisible())) {
+                menu.setVisible(1);
+            } else {
+                menu.setVisible(0);
+            }
+
+        }
+
+        String userId = request.getHeader("userId");
+        UserInfo userInfo = uiService.getById(userId);
+
+        if (menu.getCreator() == null) {
+            menu.setCreator(userInfo.getId() + "");
+        }
+        if (StringUtils.isNotEmpty(menu.getId())) {
+            menuInfoService.updateMenuInfo(menu);
+        } else {
+            Integer id = menuInfoService.saveMenuInfo(menu);
+            MenuInfo menu2 = new MenuInfo();
+            List<MenuInfo> menuList = menuInfoService.queryMenuInfoListOrderById(menu2);
+            menu.setId(menuList.get(0).getId());
+        }
+        String json = JSONObject.toJSONString(menu);
+        System.out.println(json);
+        return menu;
+    }
+
+
+    /**
+     * 查询当前用户可用的菜单
+     *
+     * @throws IOException
+     */
+    @RequestMapping(value = "/permitSubMenus", method = RequestMethod.POST)
+    @ResponseBody
+    public List<MenuInfo> permitSubMenus(String parentId) throws IOException {
+        Integer pid = null;
+        if (!StringUtil.isEmpty(parentId)) {
+            pid = Integer.valueOf(parentId);
+        }
+
+        String userId = request.getHeader("userId");
+        UserInfo userInfo = uiService.getById(userId);
+
+        if ("admin".equals(userInfo.getLoginName())) {
+            MenuInfo menuInfo = new MenuInfo();
+
+            if (!StringUtil.isEmpty(parentId)) {
+                menuInfo.setParentId(pid);
+            }
+            return menuInfoService.queryMenuInfoList(menuInfo);
+        }
+        Map<String, Object> menuparam = new HashMap<>();
+        menuparam.put("id", userInfo.getId());
+        menuparam.put("parentId", pid);
+        return menuInfoService.queryPermitMenuInfoById(menuparam);
+    }
+
+
+    /**
+     * 分页查询
+     */
+    @RequestMapping(value = "/queryMenuInfoByPage", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> queryMenuInfoByPage(Integer currPage, Integer id) {
+
+        if (currPage == null) {
+            currPage = 1;
+        }
+        Map<String, Object> map = new HashMap<String, Object>();
+        map.put("pageSize", PAGE_SIZE);
+        map.put("offset", (currPage - 1) * PAGE_SIZE);
+        map.put("id", id);
+        List<MenuInfo> menuInfoList = menuInfoService.queryMenuInfoPage(map);
+        Integer count = menuInfoService.queryMenuInfoPageCount(map);
+        Map<String, Object> result = new HashMap<String, Object>();
+        result.put("menuInfoList", menuInfoList);
+        result.put("count", count);
+        result.put("pageCount", StringUtil.getPageCount(count, PAGE_SIZE));
+        result.put("currPage", currPage);
+        return result;
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryMenuInfoDetails", method = RequestMethod.GET)
+    public String queryMenuInfoDetails(HttpServletRequest request, Integer id, Integer pageIndex) {
+
+        if (id != null && id != 0) {
+            MenuInfo menuInfo = new MenuInfo();
+            menuInfo.setId(id + "");
+            menuInfo = menuInfoService.queryMenuInfo(menuInfo);
+            request.setAttribute("menuInfo", menuInfo);
+            request.setAttribute("pageIndex", pageIndex);
+        }
+        return "menuInfo/menuInfoDetails";
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryMenuInfoBaseInfo", method = RequestMethod.GET)
+    public String queryMenuInfoBaseInfo(HttpServletRequest request, Integer id, Integer pageIndex) {
+
+        if (id != null && id != 0) {
+            MenuInfo menuInfo = new MenuInfo();
+            menuInfo.setId(id + "");
+            menuInfo = menuInfoService.queryMenuInfo(menuInfo);
+            request.setAttribute("menuInfo", menuInfo);
+            request.setAttribute("pageIndex", pageIndex);
+        }
+        return "menuInfo/menuInfoBaseInfo";
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryMenuInfoExtendsInfo", method = RequestMethod.GET)
+    public String queryMenuInfoExtendsInfo() {
+
+        return "menuInfo/menuInfoExtendsInfo";
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryMenuInfoFunctionsInfo", method = RequestMethod.GET)
+    public String queryMenuInfoFunctionsInfo() {
+
+        return "menuInfo/menuInfoFunctionsInfo";
+    }
+
+    /**
+     * 保存对象
+     *
+     * @throws IOException
+     */
+    @RequestMapping(value = "/saveMenuInfo", method = RequestMethod.POST)
+    @ResponseBody
+    public Result<Object> saveMenuInfo(MenuInfo menuInfo) {
+        if (StringUtils.isNotEmpty(menuInfo.getId())) {
+            menuInfoService.updateMenuInfo(menuInfo);
+        } else {
+            menuInfoService.saveMenuInfo(menuInfo);
+        }
+        return ResultGenerator.genSuccessResult("保存成功!", null);
+    }
+
+    /**
+     * 修改对象
+     *
+     * @throws IOException
+     */
+    @RequestMapping(value = "/updateMenuInfo", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> updateMenuInfo(Integer id) {
+        MenuInfo menuInfo = new MenuInfo();
+        menuInfo.setId(id + "");
+        menuInfoService.updateMenuInfo(menuInfo);
+        Map<String, Object> result = new HashMap<>();
+        result.put("resultCode", "1");
+        result.put("resultMessage", "保存成功!");
+        return result;
+    }
+
+    /**
+     * 删除对象
+     *
+     * @throws IOException
+     */
+    @RequestMapping(value = "/deleteMenuInfo", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> deleteMenuInfo(Integer id) {
+        MenuInfo menuInfo = new MenuInfo();
+        menuInfo.setId(id + "");
+        menuInfoService.deleteMenuInfo(menuInfo);
+        Map<String, Object> result = new HashMap<>();
+        result.put("resultCode", "1");
+        result.put("resultMessage", "保存成功!");
+        return result;
+    }
+
+}
+
+
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/mercOrderSplit/MerchantOrderSplitController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/mercOrderSplit/MerchantOrderSplitController.java
new file mode 100644
index 0000000..26b7275
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/mercOrderSplit/MerchantOrderSplitController.java
@@ -0,0 +1,70 @@
+package cn.pluss.platform.controller.mercOrderSplit;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.merchantOrderSplit.MerchantOrderSplitDetailService;
+import cn.pluss.platform.merchantOrderSplit.MerchantOrderSplitService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ *
+ *@description: 分账订单
+ *@author: bzg
+ *@time: 2021/11/26 14:27
+ */
+@Controller
+@RequiredArgsConstructor
+@RequestMapping("/mercOrderSplit")
+public class MerchantOrderSplitController extends BaseModelController<MerchantOrderSplitService, MerchantOrderSplit> {
+
+
+    @Resource
+    private MerchantOrderSplitDetailService merchantOrderSplitDetailService;
+
+    @GetMapping(value = "/index")
+    public String index(HttpServletRequest request) {
+        return "mercOrderSplit/list";
+    }
+
+    @Override
+    public Result<Page<MerchantOrderSplit>> page(Page<MerchantOrderSplit> page, MerchantOrderSplit condition, OrderItem orderItem) {
+        orderItem.setAsc(false);
+        orderItem.setColumn("id");
+        return super.page(page, condition, orderItem);
+    }
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = "/detail/{orderNumeber}")
+    public String detail(HttpServletRequest request, @PathVariable(value = "orderNumeber") String orderNumeber) {
+        request.setAttribute("orderNumber",orderNumeber);
+        return "mercOrderSplit/detailList";
+    }
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = "/detailOrder/{id}")
+    public String detail(HttpServletRequest request, @PathVariable(value = "id",required = false) Integer id) {
+        if(id != null){
+            MerchantOrderSplitDetail entity = merchantOrderSplitDetailService.getById(id);
+            request.setAttribute("entity",entity);
+        }
+        return "mercOrderSplit/detailOrder";
+    }
+
+
+    @RequestMapping(value = "/detailPage")
+    @ResponseBody
+    public Result<Page<MerchantOrderSplitDetail>> detailPage(Page<MerchantOrderSplitDetail> page, MerchantOrderSplitDetail entity) {
+        QueryWrapper<MerchantOrderSplitDetail> queryWrapper = new QueryWrapper<>(entity);
+        queryWrapper.last(" order by id desc ");
+        page = merchantOrderSplitDetailService.page(page, queryWrapper);
+        return ResultGenerator.genSuccessResult("获取成功",page);
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/mercSplitSetting/MerchantSplitSettingController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/mercSplitSetting/MerchantSplitSettingController.java
new file mode 100644
index 0000000..70ca035
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/mercSplitSetting/MerchantSplitSettingController.java
@@ -0,0 +1,78 @@
+package cn.pluss.platform.controller.mercSplitSetting;
+
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.entity.MerchantBaseInfo;
+import cn.pluss.platform.entity.MerchantChannelStatus;
+import cn.pluss.platform.entity.MerchantSplitSetting;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mercSplitSetting.MerchantSplitSettingService;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.util.PageUtils;
+import cn.pluss.platform.vo.MerchantSplitSettingVO;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ *
+ *@description:
+ *@author: bzg
+ *@time: 2021/11/26 14:27
+ */
+@Controller
+@RequiredArgsConstructor
+@RequestMapping("/mercSplitSetting")
+public class MerchantSplitSettingController extends BaseModelController<MerchantSplitSettingService, MerchantSplitSetting> {
+
+
+    @Resource
+    private MerchantChannelStatusService merchantChannelStatusService;
+
+    @Resource
+    private MerchantBaseInfoService merchantBaseInfoService;
+
+    @GetMapping(value = "/index/{csId}")
+    public String index(HttpServletRequest request,@PathVariable("csId") Integer csId) {
+        request.setAttribute("csId",csId);
+        return "merchantStore/mercSplitSettingList";
+    }
+
+    @GetMapping("selectPage")
+    @ResponseBody
+    public Result<PageInfo<MerchantSplitSettingVO>> selectPage(Page<MerchantSplitSettingVO> page, MerchantSplitSettingVO vo) {
+        Page<MerchantSplitSettingVO> pageData = baseService.pageData(page,vo);
+        return ResultGenerator.genSuccessResult(PageUtils.page(pageData));
+    }
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = {"/detail/{csId}/{id}", "/detail/{csId}"})
+    public String detail(HttpServletRequest request,@PathVariable(value = "csId") Integer csId,
+                         @PathVariable(value = "id", required = false) Integer id) {
+        MerchantChannelStatus channel = merchantChannelStatusService.getById(csId);
+        MerchantBaseInfo merchant = merchantBaseInfoService.getMerchantBaseInfoByMerchantCode(channel.getMerchantCode());
+        if (id != null) {
+            MerchantSplitSetting entity = baseService.getById(id);
+            request.setAttribute("entity", entity);
+        }
+        request.setAttribute("channel", channel);
+        request.setAttribute("merchant", merchant);
+        return "merchantStore/mercSplitSettingDetail";
+    }
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = "/save")
+    @Override
+    public Result<String> save(@RequestBody MerchantSplitSetting setting) {
+
+        MerchantChannelStatus channel = merchantChannelStatusService.getByMerchantCode(setting.getDiviMerchantCode(), 4);
+        MsgException.checkNull(channel,"商户编有误或该商户还未进件银盛通道！");
+        setting.setDiviMerchantId(channel.getMerchantId());
+        return super.save(setting);
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchant/MerchAuditController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchant/MerchAuditController.java
new file mode 100644
index 0000000..642c4ae
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchant/MerchAuditController.java
@@ -0,0 +1,96 @@
+package cn.pluss.platform.controller.merchant;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.channel.MerchantAuditService;
+import cn.pluss.platform.entity.MerchantBaseInfo;
+import cn.pluss.platform.entity.MerchantChannelStatus;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.vo.AuditResult;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Objects;
+import java.util.concurrent.ExecutorService;
+
+/**
+ * 这里作为进件接口的入口，
+ * 由于进件接口的复杂性，以及耗时操作，将进件的流程分多个接口
+ *
+ * @author djh
+ */
+@RequestMapping("/merAudit")
+@RestController
+public class MerchAuditController {
+
+    @Autowired
+    private MerchantAuditService ysAuditServiceV2;
+
+    @Autowired
+    private MerchantChannelStatusService mcsService;
+
+    @Autowired
+    private MerchantBaseInfoService mbiService;
+
+    @Autowired
+    private ExecutorService executorService;
+
+    /**
+     * 通用进件接口
+     *
+     * @param userId  用户id
+     * @param channel 通道id
+     * @return Result
+     */
+    @PostMapping
+    public Result<Object> merchAudit(String userId, String channel) {
+        MerchantBaseInfo mbi = mbiService.getMerchantBaseInfoByUserId(userId);
+        MerchantChannelStatus mcs = mcsService.getByMerchantCode(mbi.getMerchantCode(), 4);
+
+        if (mcs == null) {
+            throw new MsgException("商户尚未发起进件");
+        }
+
+        if (!Objects.equals(mcs.getStatus(), MerchantChannelStatus.AUDIT_STATUS_EXAMINING)
+            || !(Objects.equals(mcs.getThirdStatus(), MerchantChannelStatus.AUDIT_THIRD_STATUS_WAITING))) {
+            throw new MsgException("当前状态不允许进件");
+        }
+
+        if ("4".equals(channel)) {
+            ysAuditServiceV2.merchantAudit(userId, false);
+        }
+        AuditResult auditResult = new AuditResult("发起进件成功, 稍后查看进件状态", null, null);
+        return ResultGenerator.genSuccessResult(auditResult);
+    }
+
+    @PostMapping("/ys/v1")
+    public Result<Object> auditYs(String userId) {
+
+        return ResultGenerator.genSuccessResult("进件成功", null);
+    }
+
+//    @PostMapping("/ys/v2/step1")
+//    public Result<Object> auditYsV2Step1(String userId) {
+//        ((YsAuditServiceImpl) ysAuditServiceV2).step1(userId);
+//        AuditResult auditResult = new AuditResult("基础资料提交成功", "/merAudit/ys/v2/step2", "开始上传图片");
+//        return ResultGenerator.genSuccessResult(auditResult);
+//    }
+//
+//    @PostMapping("/ys/v2/step2")
+//    public Result<Object> auditYsV2Step2(String userId) {
+//        ((YsAuditServiceImpl) ysAuditServiceV2).step2(userId);
+//        AuditResult auditResult = new AuditResult("图片上传完成", "/merAudit/ys/v2/step3", "准备进件提交");
+//        return ResultGenerator.genSuccessResult(auditResult);
+//    }
+//
+//    @PostMapping("/ys/v2/step3")
+//    public Result<Object> auditYsV2Step3(String userId) {
+//        ((YsAuditServiceImpl) ysAuditServiceV2).step3(userId);
+//        AuditResult auditResult = new AuditResult("银盛通道进件完成", null, null);
+//        return ResultGenerator.genSuccessResult(auditResult);
+//    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchant/MerchantChannelStatusController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchant/MerchantChannelStatusController.java
new file mode 100644
index 0000000..11af69b
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchant/MerchantChannelStatusController.java
@@ -0,0 +1,101 @@
+package cn.pluss.platform.controller.merchant;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.channel.MerchantAuditService;
+import cn.pluss.platform.entity.MerchantChannelStatus;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.ys.impl.v20210929.YsAuditServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+/**
+ *
+ * @author djh
+ */
+@Controller
+@RequestMapping("/channelStatus")
+public class MerchantChannelStatusController {
+
+    @Autowired
+    private MerchantChannelStatusService mcsService;
+
+    @Autowired
+    private MerchantAuditService ysAuditServiceV2;
+
+    /**
+     * 清理进件驳回信息中的通道数据
+     *
+     * @return
+     */
+    @PostMapping("/clearRejectedChannel")
+    @ResponseBody
+    public Result<Object> clearRejectedChannel(String merchantCode) {
+        mcsService.clearRejectedChannel(merchantCode);
+        return ResultGenerator.genSuccessResult("操作成功", null);
+    }
+
+    /**
+     * 发送签约短信
+     *
+     */
+    @PostMapping("/sendSignMsg")
+    @ResponseBody
+    public Result<Object> sendSignMsg(String merchantCode) {
+        mcsService.sendSignMsg(merchantCode);
+        return ResultGenerator.genSuccessResult("操作成功", null);
+    }
+
+    /**
+     * 开通D0
+     */
+    @PostMapping("/openOnlinePay")
+    @ResponseBody
+    public Result<Object> openOnlinePay(String merchantCode) {
+        MerchantChannelStatus mcs = mcsService.getByMerchantCode(merchantCode, 4);
+        ((YsAuditServiceImpl) ysAuditServiceV2).openOnlinePay(mcs);
+        return ResultGenerator.genSuccessResult("操作成功", null);
+    }
+
+    @PostMapping("/createNewAuditData")
+    @ResponseBody
+    public Result<Object> createNewAuditData(String merchantCode) {
+        LambdaQueryWrapper<MerchantChannelStatus> qWrapper = Wrappers.lambdaQuery();
+        qWrapper.eq(MerchantChannelStatus::getMerchantCode, merchantCode)
+                .eq(MerchantChannelStatus::getStatus, MerchantChannelStatus.AUDIT_STATUS_EXAMINING)
+                .eq(MerchantChannelStatus::getThirdStatus, MerchantChannelStatus.AUDIT_THIRD_STATUS_WAITING);
+
+        MerchantChannelStatus one = mcsService.getOne(qWrapper);
+        MsgException.checkNonNull(one, "当前已存在待审核信息");
+
+        LambdaQueryWrapper<MerchantChannelStatus> qWrapper2 = Wrappers.lambdaQuery();
+        qWrapper2.eq(MerchantChannelStatus::getMerchantCode, merchantCode)
+                .eq(MerchantChannelStatus::getChannel, 1)
+                .ne(MerchantChannelStatus::getStatus, 3);
+
+        one = mcsService.getOne(qWrapper2);
+        MsgException.checkNonNull(one, "当前D1通道存在未完成进件数据");
+
+        qWrapper.clear();
+        qWrapper.eq(MerchantChannelStatus::getMerchantCode, merchantCode)
+                .ne(MerchantChannelStatus::getStatus, MerchantChannelStatus.AUDIT_STATUS_EXAMINING);
+
+        int auditSize = mcsService.count(qWrapper);
+
+        MsgException.check(auditSize >= 2, "当前已进件两个通道");
+
+        MerchantChannelStatus mcs = new MerchantChannelStatus();
+        mcs.setMerchantCode(merchantCode);
+        mcs.setStatus(MerchantChannelStatus.AUDIT_STATUS_EXAMINING);
+        mcs.setThirdStatus(MerchantChannelStatus.AUDIT_THIRD_STATUS_WAITING);
+        mcsService.save(mcs);
+
+        return ResultGenerator.genSuccessResult("进件申请已生成");
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchant/MerchantCountDataController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchant/MerchantCountDataController.java
new file mode 100644
index 0000000..bd191ab
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchant/MerchantCountDataController.java
@@ -0,0 +1,89 @@
+package cn.pluss.platform.controller.merchant;
+
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.dto.MercActiveDataDTO;
+import cn.pluss.platform.dto.MercOrderDataDTO;
+import cn.pluss.platform.dto.MercTradeDataDTO;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.util.PageUtils;
+import cn.pluss.platform.util.StringUtil;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * 商户交易数据统计
+ *
+ * @author: bzg
+ * @time: 2021/12/30 17:36
+ */
+@RequestMapping("/mercData")
+@Controller
+public class MerchantCountDataController {
+
+    @Resource
+    private MerchantBaseInfoService merchantBaseInfoService;
+
+    @Resource
+    private HttpServletRequest request;
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = "/chain")
+    public String index() {
+        return "countData/mercChainList";
+    }
+
+    @GetMapping("page")
+    @ResponseBody
+    public Result<PageInfo<MercOrderDataDTO>> page(Page<MercOrderDataDTO> page, MercOrderDataDTO dto) {
+        Page<MercOrderDataDTO> pageData = merchantBaseInfoService.pageData(page, dto);
+        return ResultGenerator.genSuccessResult(PageUtils.page(pageData));
+    }
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = "/trade")
+    public String tradeIndex() {
+        return "countData/mercTradeList";
+    }
+
+    /**
+     * 商户交易信息统计
+     *
+     * @param page:
+     * @param dto:
+     * @return cn.pluss.platform.api.Result<cn.pluss.platform.api.PageInfo < cn.pluss.platform.dto.MercTradeData>>
+     * @date: 2021/12/31 13:43
+     */
+    @GetMapping("tradePage")
+    @ResponseBody
+    public Result<Page<MercTradeDataDTO>> tradePage(Page<MercTradeDataDTO> page, MercTradeDataDTO dto, OrderItem orderItem) {
+        if (StringUtil.isEmpty(dto.getField())) {
+            dto.setField("tradeSumAmt");
+            dto.setOrder("desc");
+        }
+
+        Page<MercTradeDataDTO> pageData;
+        pageData = merchantBaseInfoService.pageTradeData(page, dto);
+
+        return ResultGenerator.genSuccessResult(pageData);
+    }
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = "/active")
+    public String silentIndex() {
+        return "countData/mercActiveList";
+    }
+
+    @GetMapping("activePage")
+    @ResponseBody
+    public Result<PageInfo<MercActiveDataDTO>> activePage(Page<MercActiveDataDTO> page, MercActiveDataDTO dto) {
+        Page<MercActiveDataDTO> pageData = merchantBaseInfoService.pageActiveData(page, dto);
+        return ResultGenerator.genSuccessResult(PageUtils.page(pageData));
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchant/SubMerchantController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchant/SubMerchantController.java
new file mode 100644
index 0000000..1d6a34e
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchant/SubMerchantController.java
@@ -0,0 +1,52 @@
+package cn.pluss.platform.controller.merchant;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.dto.SubMerchantDTO;
+import cn.pluss.platform.subMerchant.SubMerchantService;
+import cn.pluss.platform.vo.SubMerchantVO;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+/**
+ * @author SSS
+ */
+@Controller
+@RequestMapping("subMerchant")
+public class SubMerchantController {
+
+    @Autowired
+    private SubMerchantService smService;
+
+    @GetMapping("/toList")
+    public String toList() {
+        return "subMerchant/list";
+    }
+
+    @GetMapping("/page")
+    @ResponseBody
+    public Result<Page<SubMerchantVO>> page(SubMerchantDTO condition, OrderItem orderItem, Page<SubMerchantVO> page) {
+        if (orderItem == null) {
+            orderItem = OrderItem.desc("sm.createTime");
+        }
+
+        QueryWrapper<SubMerchantDTO> qWrapper = Wrappers.query();
+        qWrapper.likeRight(StringUtils.isNotEmpty(condition.getMerchantCode()), "mbi.merchantCode", condition.getMerchantCode());
+        qWrapper.eq(StringUtils.isNotEmpty(condition.getUserId()), "mbi.userId", condition.getUserId());
+        qWrapper.likeRight(StringUtils.isNotEmpty(condition.getMerchantId()), "mcs.merchantId", condition.getMerchantId());
+        qWrapper.likeRight(StringUtils.isNotEmpty(condition.getLoginName()), "ui.loginName", condition.getLoginName());
+        qWrapper.orderBy(true, orderItem.isAsc(), orderItem.getColumn());
+        page = smService.pageVO(page, qWrapper);
+
+        return ResultGenerator.genSuccessResult(page);
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchant/move/MerchantMoveRecordsController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchant/move/MerchantMoveRecordsController.java
new file mode 100644
index 0000000..62c8d5e
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchant/move/MerchantMoveRecordsController.java
@@ -0,0 +1,37 @@
+package cn.pluss.platform.controller.merchant.move;
+
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.entity.MerchantMoveRecords;
+import cn.pluss.platform.merchant.move.MerchantMoveRecordsService;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+/**
+ * <p>
+ * 商户动态码生成记录 前端控制器
+ * </p>
+ *
+ * @author bzg
+ * @since 2021-07-30
+ */
+@Controller
+@RequestMapping("/merchantMoveRecords")
+public class MerchantMoveRecordsController extends BaseModelController<MerchantMoveRecordsService, MerchantMoveRecords> {
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = "/index")
+    public String index() {
+        return "merchantMoveRecords/list";
+    }
+
+    @Override
+    public Result<Page<MerchantMoveRecords>> page(Page<MerchantMoveRecords> page, MerchantMoveRecords condition, OrderItem orderItem) {
+        orderItem.setColumn("createTime");
+        orderItem.setAsc(false);
+        return super.page(page, condition, orderItem);
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchant/move/MerchantMoveSettingController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchant/move/MerchantMoveSettingController.java
new file mode 100644
index 0000000..1aa8784
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchant/move/MerchantMoveSettingController.java
@@ -0,0 +1,51 @@
+package cn.pluss.platform.controller.merchant.move;
+
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.entity.MerchantMoveSetting;
+import cn.pluss.platform.merchant.move.MerchantMoveSettingService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * <p>
+ * 商户动态码基本配置 前端控制器
+ * </p>
+ *
+ * @author bzg
+ * @since 2021-07-30
+ */
+@Controller
+@RequestMapping("/merchantMoveSetting")
+public class MerchantMoveSettingController extends BaseModelController<MerchantMoveSettingService, MerchantMoveSetting> {
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = "/index")
+    public String index() {
+        return "merchantMoveSetting/list";
+    }
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = {"/detail/{id}", "/detail"})
+    public String detail(HttpServletRequest request, @PathVariable(value = "id", required = false) Integer id) {
+        if (id != null) {
+            MerchantMoveSetting setting = new MerchantMoveSetting().setId(id);
+            setting = baseService.getOne(new QueryWrapper<>(setting));
+            request.setAttribute("entity", setting);
+        }
+        return "merchantMoveSetting/detail";
+    }
+
+    @Override
+    public Result<Page<MerchantMoveSetting>> page(Page<MerchantMoveSetting> page, MerchantMoveSetting condition, OrderItem orderItem) {
+        orderItem.setColumn("createTime");
+        orderItem.setAsc(false);
+        return super.page(page, condition, orderItem);
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchant/rate/MerchantRateController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchant/rate/MerchantRateController.java
new file mode 100644
index 0000000..3fdc042
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchant/rate/MerchantRateController.java
@@ -0,0 +1,61 @@
+package cn.pluss.platform.controller.merchant.rate;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.merchant.MerchantRateNewRecordService;
+import cn.pluss.platform.merchant.MerchantRateNewService;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.val;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.Map;
+
+/**
+ * @author DJH
+ */
+@Controller
+@RequestMapping("/merchantRate")
+public class MerchantRateController {
+
+    @Autowired
+    private MerchantRateNewService merchantRateNewService;
+
+    @Autowired
+    private MerchantRateNewRecordService rateNewRecordService;
+
+    @GetMapping("/list")
+    public String list() {
+        return "/merchantRate/rate_list";
+    }
+
+    @GetMapping("/page")
+    @ResponseBody
+    public Result<Page<Map<String, Object>>> page(Page<Object> page, @RequestParam Map<String, Object> condition) {
+        page.orders().add(new OrderItem().setAsc(false).setColumn("mrnr.createTime"));
+        page.orders().add(new OrderItem().setAsc(false).setColumn("mcs.updateTime"));
+        val result = merchantRateNewService.pageData(page, condition);
+        return ResultGenerator.genSuccessResult(result);
+    }
+
+    @PostMapping("/pass")
+    @ResponseBody
+    @Transactional(rollbackFor = Exception.class)
+    public Result<Object> pass(String merchantId) {
+        merchantRateNewService.passD0(merchantId);
+        return ResultGenerator.genSuccessResult("D0费率修改已通过", null);
+    }
+
+    @PostMapping("/batchPass")
+    @ResponseBody
+    @Transactional(rollbackFor = Exception.class)
+    public Result<Object> batchPass(@RequestParam("merchantId[]") String[] merchantIds) {
+//        System.out.println(merchantIds);
+        merchantRateNewService.passD0(Arrays.asList(merchantIds));
+        return ResultGenerator.genSuccessResult("操作成功", null);
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantAccount/MerchantAccountController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantAccount/MerchantAccountController.java
new file mode 100644
index 0000000..b423578
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantAccount/MerchantAccountController.java
@@ -0,0 +1,75 @@
+package cn.pluss.platform.controller.merchantAccount;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.dto.AccountDTO;
+import cn.pluss.platform.entity.Account;
+import cn.pluss.platform.entity.BankCard;
+import cn.pluss.platform.merchant.AccountService;
+import cn.pluss.platform.vo.AccountVO;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.ArrayList;
+
+/**
+ * @author djh
+ *
+ * 商户结算信息修改表
+ */
+@Controller
+@RequestMapping("merchantAccount")
+public class MerchantAccountController {
+
+    @Autowired
+    private AccountService accountService;
+
+    /**
+     * 商户结算信息修改中的列表
+     */
+    @GetMapping("/index")
+    public String index() {
+        return "merchantAccount/edit_list";
+    }
+
+    /**
+     * 获取分页信息
+     * @param page          分页信息
+     * @param entity        结算信息
+     * @param orderItem     排序信息
+     */
+    @GetMapping("/page")
+    @ResponseBody
+    public Result<Page<AccountDTO>> page(Page<AccountDTO> page, Account entity, OrderItem orderItem) {
+        AccountVO account = new AccountVO();
+        BankCard bankCard = new BankCard();
+        bankCard.setUserId("12345");
+        bankCard.setBankCardNo("12345");
+        bankCard.setBankName("建设银行");
+        bankCard.setBranchName("建设银行湖北分行");
+        account.setBankCard(bankCard);
+
+        BankCard newBankCard = new BankCard();
+        newBankCard.setUserId("12345");
+        newBankCard.setBankCardNo("12345");
+        newBankCard.setBankName("招商银行");
+        newBankCard.setBranchName("招商银行湖北分行");
+        newBankCard.setImgUrl("https://wwsdsd//sd");
+        account.setBak((JSONObject) JSONObject.toJSON(newBankCard));
+        account.setChannelType(Account.CHANNEL_TYPE_D0);
+        account.setMerchantId("87551231131");
+
+        page.setCurrent(1);
+        page.setSize(10);
+        page.setTotal(1);
+        page.setRecords(new ArrayList<AccountDTO>() {{ add(account); }});
+
+        return ResultGenerator.genSuccessResult(page);
+    }
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantAddress/MerchantAddressController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantAddress/MerchantAddressController.java
new file mode 100644
index 0000000..2987c31
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantAddress/MerchantAddressController.java
@@ -0,0 +1,158 @@
+package cn.pluss.platform.controller.merchantAddress;
+
+import cn.pluss.platform.controller.BaseNoModelController;
+import cn.pluss.platform.entity.MerchantAddress;
+import cn.pluss.platform.merchantAddress.MerchantAddressService;
+import cn.pluss.platform.util.StringUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Controller
+@RequestMapping("merchantAddress")
+public class MerchantAddressController  extends BaseNoModelController {
+
+	  private Integer PAGE_SIZE=12;
+
+    @Autowired
+	  private MerchantAddressService merchantAddressService;
+
+    /**
+    *引导页
+    * @return
+    */
+    @RequestMapping(value = "/index", method = RequestMethod.GET)
+    public String index() {
+   
+        return "merchantAddress/merchantAddressList";
+    }
+
+    /**
+    *分页查询
+    */
+    @RequestMapping(value = "/queryMerchantAddressByPage", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String,Object> queryMerchantAddressByPage(Integer currPage,Integer id){
+   
+   	if(currPage==null) {
+   	   currPage=1;
+       }
+    	Map<String,Object> map=new HashMap<String, Object>();
+    	map.put("pageSize",PAGE_SIZE);
+    	map.put("offset", (currPage-1)*PAGE_SIZE);
+    	map.put("id",  id);
+    	List<MerchantAddress> merchantAddressList=merchantAddressService.queryMerchantAddressPage(map);
+    	Integer count=merchantAddressService.queryMerchantAddressPageCount(map);
+        Map<String,Object> result=new HashMap<String,Object>();
+        result.put("merchantAddressList", merchantAddressList);
+        result.put("count", count);
+        result.put("pageCount",StringUtil.getPageCount(count,PAGE_SIZE));
+        result.put("currPage", currPage);
+    	  return result;
+    }
+    /**
+    *查询详情
+    */
+     @RequestMapping(value = "/queryMerchantAddressDetails", method = RequestMethod.GET)
+    public String queryMerchantAddressDetails(HttpServletRequest request,Integer id,Integer pageIndex){
+   
+   	  if(id!=null&&id!=0) {
+   		 MerchantAddress merchantAddress=new MerchantAddress();
+   		 merchantAddress.setId(id);
+           merchantAddress=merchantAddressService.queryMerchantAddress(merchantAddress);
+          request.setAttribute("merchantAddress", merchantAddress);
+   		request.setAttribute("pageIndex", pageIndex);
+       	}
+        return "merchantAddress/merchantAddressDetails";
+    }
+    /**
+    *查询详情
+    */
+     @RequestMapping(value = "/queryMerchantAddressBaseInfo", method = RequestMethod.GET)
+    public String queryMerchantAddressBaseInfo(HttpServletRequest request,Integer id,Integer pageIndex){
+   
+   	  if(id!=null&&id!=0) {
+   		MerchantAddress merchantAddress=new MerchantAddress();
+   		merchantAddress.setId(id);
+        merchantAddress=merchantAddressService.queryMerchantAddress(merchantAddress);
+          request.setAttribute("merchantAddress", merchantAddress);
+   		request.setAttribute("pageIndex", pageIndex);
+       	}
+        return "merchantAddress/merchantAddressBaseInfo";
+    }
+    /**
+    *查询详情
+    */
+     @RequestMapping(value = "/queryMerchantAddressExtendsInfo", method = RequestMethod.GET)
+    public String queryMerchantAddressExtendsInfo(){
+   
+        return "merchantAddress/merchantAddressExtendsInfo";
+    }
+    /**
+    *查询详情
+    */
+     @RequestMapping(value = "/queryMerchantAddressFunctionsInfo", method = RequestMethod.GET)
+    public String queryMerchantAddressFunctionsInfo(){
+   
+        return "merchantAddress/merchantAddressFunctionsInfo";
+    }
+    /**
+    *保存对象
+    *@throws IOException
+    */
+    @RequestMapping(value = "/saveMerchantAddress", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String,Object> saveMerchantAddress(MerchantAddress merchantAddress){
+   
+       if(merchantAddress.getId()!=null&&merchantAddress.getId()!=0){
+    		merchantAddressService.updateMerchantAddress(merchantAddress);
+    	 }else{  
+      	merchantAddressService.saveMerchantAddress(merchantAddress);
+    	 }  
+		Map<String,Object> result=new HashMap<String,Object>();
+    	result.put("resultCode", "1");
+    	result.put("resultMessage", "保存成功!");
+    	return result;
+    }
+    /**
+    *修改对象
+    *@throws IOException
+    */
+    @RequestMapping(value = "/updateMerchantAddress", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String,Object> updateMerchantAddress(Integer id){
+   
+   	MerchantAddress merchantAddress=new MerchantAddress();
+   	merchantAddress.setId(id);
+      merchantAddressService.updateMerchantAddress(merchantAddress);
+   	Map<String,Object> result=new HashMap<String,Object>();
+    	result.put("resultCode", "1");
+    	result.put("resultMessage", "保存成功!");
+    	return result;
+    }
+    /**
+    *删除对象
+    *@throws IOException
+    */
+    @RequestMapping(value = "/deleteMerchantAddress", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String,Object> deleteMerchantAddress(Integer id){
+   	MerchantAddress merchantAddress=new MerchantAddress();
+   	merchantAddress.setId(id);
+		merchantAddressService.deleteMerchantAddress(merchantAddress);
+		Map<String,Object> result=new HashMap<String,Object>();
+    	result.put("resultCode", "1");
+    	result.put("resultMessage", "保存成功!");
+    	return result;
+    }
+
+}
+
+
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantBaseInfo/MerchantBaseInfoController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantBaseInfo/MerchantBaseInfoController.java
new file mode 100644
index 0000000..6304242
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantBaseInfo/MerchantBaseInfoController.java
@@ -0,0 +1,80 @@
+package cn.pluss.platform.controller.merchantBaseInfo;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.controller.BaseNoModelController;
+import cn.pluss.platform.entity.MerchantBaseInfo;
+import cn.pluss.platform.entity.MerchantChannelStatus;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.vo.MerchantBaseNewVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+import java.util.UUID;
+
+@Controller
+@RequestMapping("merchantBaseInfo")
+public class MerchantBaseInfoController extends BaseNoModelController {
+
+    @Autowired
+    private HttpServletRequest request;
+
+    @Autowired
+    private MerchantBaseInfoService mbiService;
+
+    @Autowired
+    private MerchantChannelStatusService chsService;
+
+    @GetMapping("/{userId}")
+    @ResponseBody
+    public Result<Object> detail(@PathVariable("userId") String userId) {
+        MerchantBaseInfo mbi = mbiService.getMerchantBaseInfoByUserId(userId);
+        return ResultGenerator.genSuccessResult(mbi);
+    }
+
+    /**
+     * 引导页
+     *
+     * @return
+     */
+    @GetMapping("/index")
+    public String index() {
+        return "merchantBaseInfo/merchantBaseInfoList";
+    }
+    /**
+     * 分页查询
+     */
+    @GetMapping("/queryMerchantBaseInfoPage")
+    @ResponseBody
+    public Map<String, Object> listMerchantBaseInfoPage(@RequestParam(defaultValue = "1") Integer currPage, Integer size,
+            String column, Boolean asc, MerchantBaseNewVO merchantBaseNewVO) {
+        return mbiService.listMerchantBaseInfoPage(currPage, size, column, asc, merchantBaseNewVO);
+    }
+
+    @RequestMapping("/updateInfo")
+    @ResponseBody
+    public Result<Object> updateInfo(MerchantBaseInfo baseInfo) {
+        mbiService.updateById(baseInfo);
+        return ResultGenerator.genSuccessResult("操作成功",null);
+    }
+
+    @RequestMapping("/updateSettleType")
+    @ResponseBody
+    public Result<Object> updateSettleType(MerchantChannelStatus channel) {
+        chsService.updateById(channel);
+        return ResultGenerator.genSuccessResult("操作成功",null);
+    }
+
+    @RequestMapping("/createKey")
+    @ResponseBody
+    public Result<Object> createKey() {
+        String uuid = UUID.randomUUID().toString().replace("-","");
+        return ResultGenerator.genSuccessResult("操作成功",uuid);
+    }
+
+
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantComplaintRecord/MerchantComplaintRecordController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantComplaintRecord/MerchantComplaintRecordController.java
new file mode 100644
index 0000000..dbadbc9
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantComplaintRecord/MerchantComplaintRecordController.java
@@ -0,0 +1,48 @@
+package cn.pluss.platform.controller.merchantComplaintRecord;
+
+
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.entity.MerchantComplaintRecord;
+import cn.pluss.platform.merchantComplaintRecord.MerchantComplaintRecordService;
+import cn.pluss.platform.util.PageUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+/**
+ * <p>
+ *  商户投诉控制器
+ * </p>
+ *
+ * @author bzg
+ * @since 2021-09-14
+ */
+@Controller
+@RequestMapping("/merchantComplaintRecord")
+public class MerchantComplaintRecordController extends BaseModelController<MerchantComplaintRecordService, MerchantComplaintRecord> {
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = "/index")
+    public String index() {
+        return "merchantComplaintRecord/list";
+    }
+
+    /**
+     * @description:分页查询
+     * @date: 2021/9/15 13:39
+     * @param page:
+     * @param record:
+     * @return cn.pluss.platform.api.Result<cn.pluss.platform.api.PageInfo<cn.pluss.platform.entity.MerchantComplaintRecord>>
+     */
+    @GetMapping("pageData")
+    @ResponseBody
+    public Result<Page<MerchantComplaintRecord>> pageData(Page<MerchantComplaintRecord> page, MerchantComplaintRecord record) {
+        Page<MerchantComplaintRecord> pageData = baseService.pageData(page,record);
+        return ResultGenerator.genSuccessResult(pageData);
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantDevice/MerchantDeviceController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantDevice/MerchantDeviceController.java
new file mode 100644
index 0000000..7a7af69
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantDevice/MerchantDeviceController.java
@@ -0,0 +1,228 @@
+package cn.pluss.platform.controller.merchantDevice;
+
+import cn.pluss.platform.controller.BaseNoModelController;
+import cn.pluss.platform.entitiy.ShiroUser;
+import cn.pluss.platform.entity.MerchantBaseInfo;
+import cn.pluss.platform.entity.MerchantDevice;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantDevice.MerchantDeviceService;
+import cn.pluss.platform.util.StringUtil;
+import cn.pluss.platform.vo.DeviceVO;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Controller
+@RequestMapping("merchantDevice")
+public class MerchantDeviceController extends BaseNoModelController {
+
+    private Integer PAGE_SIZE = 12;
+
+    @Autowired
+    private HttpServletRequest request;
+
+    @Autowired
+    private MerchantDeviceService merchantDeviceService;
+
+    @Autowired
+    private MerchantBaseInfoService merchantBaseInfoService;
+
+    /**
+     * 引导页
+     *
+     * @return
+     */
+    @RequestMapping(value = "/index", method = RequestMethod.GET)
+    public String index() {
+        return "merchantDevice/merchantDeviceList";
+    }
+
+    /**
+     * 分页查询
+     */
+    @RequestMapping(value = "/queryMerchantDeviceByPage", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> queryMerchantDeviceByPage(@RequestParam(defaultValue = "1") Integer currPage, MerchantDevice merchantDevice) {
+        Map<String, Object> map = new HashMap<>(16);
+        Map<String, Object> result = new HashMap<>(16);
+        map.put("pageSize", PAGE_SIZE);
+        map.put("offset", (currPage - 1) * PAGE_SIZE);
+        if (StringUtil.isNotEmpty(merchantDevice.getName())) {
+            map.put("name", merchantDevice.getName());
+        }
+        Boolean bol = verifyUserRole();
+        if (bol) {
+            result.put("admin", "admin");
+        } else {
+            ShiroUser shiroUser = queryCurrentShiroUser();
+            if (StringUtil.isNotEmpty(shiroUser.getUserType())) {
+                result.put("userType", shiroUser.getUserType());
+            }
+            map.put("merchantCode", shiroUser.getMerchantCode());
+        }
+        if (StringUtil.isNotEmpty(merchantDevice.getMerchantName())) {
+            map.put("merchantName", merchantDevice.getMerchantName());
+        }
+        if (StringUtil.isNotEmpty(merchantDevice.getAlias())) {
+            map.put("alias", merchantDevice.getAlias());
+        }
+        if (StringUtil.isNotEmpty(merchantDevice.getUserId())) {
+            map.put("userId", merchantDevice.getUserId());
+        }
+        List<DeviceVO> merchantDeviceList = merchantDeviceService.showMerchantDevicePage(map);
+        Integer count = merchantDeviceService.showMerchantDevicePageCount(map);
+        result.put("merchantDeviceList", merchantDeviceList);
+        result.put("count", count);
+        result.put("pageCount", StringUtil.getPageCount(count, PAGE_SIZE));
+        result.put("currPage", currPage);
+        return result;
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryMerchantDeviceDetails", method = RequestMethod.GET)
+    public String queryMerchantDeviceDetails(HttpServletRequest request, Long id, Integer pageIndex) {
+
+        if (id != null && id != 0) {
+            MerchantDevice merchantDevice = new MerchantDevice();
+            merchantDevice.setId(id);
+            merchantDevice = merchantDeviceService.getOne(new QueryWrapper<>(merchantDevice));
+            request.setAttribute("merchantDevice", merchantDevice);
+            request.setAttribute("pageIndex", pageIndex);
+        }
+        return "merchantDevice/merchantDeviceDetails";
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryMerchantDeviceBaseInfo", method = RequestMethod.GET)
+    public String queryMerchantDeviceBaseInfo(HttpServletRequest request, Long id, Integer pageIndex) {
+        if (id != null && id != 0) {
+            MerchantDevice merchantDevice = new MerchantDevice();
+            merchantDevice.setId(id);
+            merchantDevice = merchantDeviceService.getOne(new QueryWrapper<>(merchantDevice));
+            request.setAttribute("merchantDevice", merchantDevice);
+            request.setAttribute("pageIndex", pageIndex);
+        }
+        getRole();
+        getPermission();
+        getMerchant();
+        return "merchantDevice/merchantDeviceBaseInfo";
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryMerchantDeviceExtendsInfo", method = RequestMethod.GET)
+    public String queryMerchantDeviceExtendsInfo() {
+        return "merchantDevice/merchantDeviceExtendsInfo";
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryMerchantDeviceFunctionsInfo", method = RequestMethod.GET)
+    public String queryMerchantDeviceFunctionsInfo() {
+        return "merchantDevice/merchantDeviceFunctionsInfo";
+    }
+
+    /**
+     * 保存对象
+     *
+     * @throws IOException
+     */
+    @RequestMapping(value = "/saveMerchantDevice", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> saveMerchantDevice(MerchantDevice merchantDevice) {
+
+        if (merchantDevice.getId() != null && merchantDevice.getId() != 0) {
+            merchantDeviceService.updateById(merchantDevice);
+        } else {
+            Boolean bol = verifyUserRole();
+            if (!bol) {
+                ShiroUser shiroUser = queryCurrentShiroUser();
+                if (StringUtil.isNotEmpty(shiroUser)) {
+                    merchantDevice.setMerchantCode(shiroUser.getMerchantCode());
+                }
+            }
+            merchantDeviceService.save(merchantDevice);
+        }
+        Map<String, Object> result = new HashMap<String, Object>();
+        result.put("resultCode", "1");
+        result.put("resultMessage", "保存成功!");
+        return result;
+    }
+
+    /**
+     * 修改对象
+     *
+     * @throws IOException
+     */
+    @RequestMapping(value = "/updateMerchantDevice", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> updateMerchantDevice(Long id) {
+
+        MerchantDevice merchantDevice = new MerchantDevice();
+        merchantDevice.setId(id);
+        merchantDeviceService.updateById(merchantDevice);
+        Map<String, Object> result = new HashMap<>();
+        result.put("resultCode", "1");
+        result.put("resultMessage", "保存成功!");
+        return result;
+    }
+
+    /**
+     * 删除对象
+     *
+     * @throws IOException
+     */
+    @RequestMapping(value = "/deleteMerchantDevice", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> deleteMerchantDevice(Long id) {
+        MerchantDevice merchantDevice = new MerchantDevice();
+        merchantDevice.setId(id);
+        merchantDeviceService.removeById(id);
+        Map<String, Object> result = new HashMap<>();
+        result.put("resultCode", "1");
+        result.put("resultMessage", "保存成功!");
+        return result;
+    }
+
+    /**
+     * 管理员权限标识
+     */
+    public void getRole() {
+        request.setAttribute("admin", "admin");
+    }
+
+    /**
+     * 不是管理员 获取的权限
+     */
+    public void getPermission() {
+        ShiroUser user = queryCurrentShiroUser();
+        request.setAttribute("userType", user.getUserType());
+    }
+
+    /**
+     * 获取所有商户信息
+     */
+    public void getMerchant() {
+        List<MerchantBaseInfo> merchantBaseInfoList = merchantBaseInfoService.queryMerchantBaseInfoList(null);
+        request.setAttribute("merchantBaseInfoList", merchantBaseInfoList);
+    }
+
+}
+
+
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantGuide/MerchantGuideController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantGuide/MerchantGuideController.java
new file mode 100644
index 0000000..e001ff4
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantGuide/MerchantGuideController.java
@@ -0,0 +1,82 @@
+package cn.pluss.platform.controller.merchantGuide;
+
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.entity.MerchantGuide;
+import cn.pluss.platform.entity.MerchantQrcode;
+import cn.pluss.platform.merchantGuide.MerchantGuideService;
+import cn.pluss.platform.util.OssOperatUtil;
+import cn.pluss.platform.util.StringUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-10-23
+ */
+@Controller
+@RequestMapping("/merchantGuide")
+public class MerchantGuideController extends BaseModelController<MerchantGuideService, MerchantGuide> {
+
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = "/index")
+    public String index() {
+        return "merchantGuide/list";
+    }
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = {"/detail/{id}", "/detail"})
+    public String detail(HttpServletRequest request, @PathVariable(value = "id", required = false) Integer id) {
+        if (id != null) {
+            MerchantGuide qrcode = new MerchantGuide().setId(id);
+            qrcode = baseService.getOne(new QueryWrapper<>(qrcode));
+            request.setAttribute("entity", qrcode);
+        }
+        return "merchantGuide/detail";
+    }
+
+    @Override
+    public Result<Page<MerchantGuide>> page(Page<MerchantGuide> page, MerchantGuide condition, OrderItem orderItem) {
+        orderItem.setAsc(false).setColumn("id");
+        return super.page(page, condition, orderItem);
+    }
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = "/save")
+    @Override
+    public Result<String> save(@RequestBody MerchantGuide entity) {
+        if(StringUtil.isEmpty(entity.getMerchantCode())){
+            return ResultGenerator.genFailResult("商户编号不能为空", null);
+        }
+        if(StringUtil.isEmpty(entity.getMerchantName())){
+            return ResultGenerator.genFailResult("商户名称不能为空", null);
+        }
+        if(StringUtil.isEmpty(entity.getName())){
+            return ResultGenerator.genFailResult("引导话术不能为空", null);
+        }
+        if(StringUtil.isEmpty(entity.getStatus())){
+            return ResultGenerator.genFailResult("状态不能为空", null);
+        }
+        if(!"0".equals(entity.getStatus()) && StringUtil.isNotEmpty(entity.getId())){
+            QueryWrapper<MerchantGuide> queryWrapper = new QueryWrapper<MerchantGuide>().eq("merchantCode",entity.getMerchantCode())
+                    .eq("status",entity.getStatus())
+                    .ne("id",entity.getId());
+            List<MerchantGuide> list = this.baseService.list(queryWrapper);
+            if(list.size() != 0){
+                return ResultGenerator.genFailResult("只允许有一条选中的话术！", null);
+            }
+        }
+        return super.save(entity);
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantImage/MerchantImageController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantImage/MerchantImageController.java
new file mode 100644
index 0000000..0281a2d
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantImage/MerchantImageController.java
@@ -0,0 +1,147 @@
+package cn.pluss.platform.controller.merchantImage;
+
+import cn.pluss.platform.controller.BaseNoModelController;
+import cn.pluss.platform.entity.MerchantImage;
+import cn.pluss.platform.merchantImage.MerchantImageService;
+import cn.pluss.platform.util.StringUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Controller
+@RequestMapping("merchantImage")
+public class MerchantImageController extends BaseNoModelController {
+
+    private Integer PAGE_SIZE = 12;
+
+    @Autowired
+    private MerchantImageService merchantImageService;
+
+    /**
+     * 引导页
+     *
+     * @return
+     */
+    @RequestMapping(value = "/index", method = RequestMethod.GET)
+    public String index() {
+
+        return "merchantImage/merchantImageList";
+    }
+
+    /**
+     * 分页查询
+     */
+    @RequestMapping(value = "/queryMerchantImageByPage", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> queryMerchantImageByPage(Integer currPage, Integer id) {
+
+        if (currPage == null) {
+            currPage = 1;
+        }
+        Map<String, Object> map = new HashMap<String, Object>();
+        map.put("pageSize", PAGE_SIZE);
+        map.put("offset", (currPage - 1) * PAGE_SIZE);
+        map.put("id", id);
+        List<MerchantImage> merchantImageList = merchantImageService.queryMerchantImagePage(map);
+        Integer count = merchantImageService.queryMerchantImagePageCount(map);
+        Map<String, Object> result = new HashMap<String, Object>();
+        result.put("merchantImageList", merchantImageList);
+        result.put("count", count);
+        result.put("pageCount", StringUtil.getPageCount(count, PAGE_SIZE));
+        result.put("currPage", currPage);
+        return result;
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryMerchantImageDetails", method = RequestMethod.GET)
+    public String queryMerchantImageDetails(HttpServletRequest request, Integer id, Integer pageIndex) {
+
+        if (id != null && id != 0) {
+            MerchantImage merchantImage = new MerchantImage();
+            merchantImage.setId(id);
+            merchantImage = merchantImageService.queryMerchantImage(merchantImage);
+            request.setAttribute("merchantImage", merchantImage);
+            request.setAttribute("pageIndex", pageIndex);
+        }
+        return "merchantImage/merchantImageDetails";
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryMerchantImageBaseInfo", method = RequestMethod.GET)
+    public String queryMerchantImageBaseInfo(HttpServletRequest request, Integer id, Integer pageIndex) {
+
+        if (id != null && id != 0) {
+            MerchantImage merchantImage = new MerchantImage();
+            merchantImage.setId(id);
+            merchantImage = merchantImageService.queryMerchantImage(merchantImage);
+            request.setAttribute("merchantImage", merchantImage);
+            request.setAttribute("pageIndex", pageIndex);
+        }
+        return "merchantImage/merchantImageBaseInfo";
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryMerchantImageExtendsInfo", method = RequestMethod.GET)
+    public String queryMerchantImageExtendsInfo() {
+
+        return "merchantImage/merchantImageExtendsInfo";
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryMerchantImageFunctionsInfo", method = RequestMethod.GET)
+    public String queryMerchantImageFunctionsInfo() {
+
+        return "merchantImage/merchantImageFunctionsInfo";
+    }
+
+    /**
+     * 保存对象
+     *
+     */
+    @RequestMapping(value = "/saveMerchantImage", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> saveMerchantImage(MerchantImage merchantImage) {
+
+        if (merchantImage.getId() != null && merchantImage.getId() != 0) {
+            merchantImageService.updateById(merchantImage);
+        } else {
+            merchantImageService.save(merchantImage);
+        }
+        Map<String, Object> result = new HashMap<>();
+        result.put("resultCode", "1");
+        result.put("resultMessage", "保存成功!");
+        return result;
+    }
+
+    /**
+     * 删除对象
+     *
+     */
+    @RequestMapping(value = "/deleteMerchantImage", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> deleteMerchantImage(Integer id) {
+        merchantImageService.removeById(id);
+        Map<String, Object> result = new HashMap<>();
+        result.put("resultCode", "1");
+        result.put("resultMessage", "保存成功!");
+        return result;
+    }
+
+}
+
+
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantIncome/MerchantIncomeController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantIncome/MerchantIncomeController.java
new file mode 100644
index 0000000..9d15c57
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantIncome/MerchantIncomeController.java
@@ -0,0 +1,158 @@
+package cn.pluss.platform.controller.merchantIncome;
+
+import cn.pluss.platform.controller.BaseNoModelController;
+import cn.pluss.platform.entity.MerchantIncome;
+import cn.pluss.platform.merchantIncome.MerchantIncomeService;
+import cn.pluss.platform.util.StringUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Controller
+@RequestMapping("merchantIncome")
+public class MerchantIncomeController  extends BaseNoModelController {
+
+	  private Integer PAGE_SIZE=12;
+
+    @Autowired
+	  private MerchantIncomeService merchantIncomeService;
+
+    /**
+    *引导页
+    * @return
+    */
+    @RequestMapping(value = "/index", method = RequestMethod.GET)
+    public String index() {
+   
+        return "merchantIncome/merchantIncomeList";
+    }
+
+    /**
+    *分页查询
+    */
+    @RequestMapping(value = "/queryMerchantIncomeByPage", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String,Object> queryMerchantIncomeByPage(Integer currPage,Integer id){
+   
+   	if(currPage==null) {
+   	   currPage=1;
+       }
+    	Map<String,Object> map=new HashMap<String, Object>();
+    	map.put("pageSize",PAGE_SIZE);
+    	map.put("offset", (currPage-1)*PAGE_SIZE);
+    	map.put("id",  id);
+    	List<MerchantIncome> merchantIncomeList=merchantIncomeService.queryMerchantIncomePage(map);
+    	Integer count=merchantIncomeService.queryMerchantIncomePageCount(map);
+        Map<String,Object> result=new HashMap<String,Object>();
+        result.put("merchantIncomeList", merchantIncomeList);
+        result.put("count", count);
+        result.put("pageCount",StringUtil.getPageCount(count,PAGE_SIZE));
+        result.put("currPage", currPage);
+    	  return result;
+    }
+    /**
+    *查询详情
+    */
+     @RequestMapping(value = "/queryMerchantIncomeDetails", method = RequestMethod.GET)
+    public String queryMerchantIncomeDetails(HttpServletRequest request,Integer id,Integer pageIndex){
+   
+   	  if(id!=null&&id!=0) {
+   		 MerchantIncome merchantIncome=new MerchantIncome();
+   		 merchantIncome.setId(id);
+           merchantIncome=merchantIncomeService.queryMerchantIncome(merchantIncome);
+          request.setAttribute("merchantIncome", merchantIncome);
+   		request.setAttribute("pageIndex", pageIndex);
+       	}
+        return "merchantIncome/merchantIncomeDetails";
+    }
+    /**
+    *查询详情
+    */
+     @RequestMapping(value = "/queryMerchantIncomeBaseInfo", method = RequestMethod.GET)
+    public String queryMerchantIncomeBaseInfo(HttpServletRequest request,Integer id,Integer pageIndex){
+   
+   	  if(id!=null&&id!=0) {
+   		MerchantIncome merchantIncome=new MerchantIncome();
+   		merchantIncome.setId(id);
+        merchantIncome=merchantIncomeService.queryMerchantIncome(merchantIncome);
+          request.setAttribute("merchantIncome", merchantIncome);
+   		request.setAttribute("pageIndex", pageIndex);
+       	}
+        return "merchantIncome/merchantIncomeBaseInfo";
+    }
+    /**
+    *查询详情
+    */
+     @RequestMapping(value = "/queryMerchantIncomeExtendsInfo", method = RequestMethod.GET)
+    public String queryMerchantIncomeExtendsInfo(){
+   
+        return "merchantIncome/merchantIncomeExtendsInfo";
+    }
+    /**
+    *查询详情
+    */
+     @RequestMapping(value = "/queryMerchantIncomeFunctionsInfo", method = RequestMethod.GET)
+    public String queryMerchantIncomeFunctionsInfo(){
+   
+        return "merchantIncome/merchantIncomeFunctionsInfo";
+    }
+    /**
+    *保存对象
+    *@throws IOException
+    */
+    @RequestMapping(value = "/saveMerchantIncome", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String,Object> saveMerchantIncome(MerchantIncome merchantIncome){
+   
+       if(merchantIncome.getId()!=null&&merchantIncome.getId()!=0){
+    		merchantIncomeService.updateMerchantIncome(merchantIncome);
+    	 }else{  
+      	merchantIncomeService.saveMerchantIncome(merchantIncome);
+    	 }  
+		Map<String,Object> result=new HashMap<String,Object>();
+    	result.put("resultCode", "1");
+    	result.put("resultMessage", "保存成功!");
+    	return result;
+    }
+    /**
+    *修改对象
+    *@throws IOException
+    */
+    @RequestMapping(value = "/updateMerchantIncome", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String,Object> updateMerchantIncome(Integer id){
+   
+   	MerchantIncome merchantIncome=new MerchantIncome();
+   	merchantIncome.setId(id);
+      merchantIncomeService.updateMerchantIncome(merchantIncome);
+   	Map<String,Object> result=new HashMap<String,Object>();
+    	result.put("resultCode", "1");
+    	result.put("resultMessage", "保存成功!");
+    	return result;
+    }
+    /**
+    *删除对象
+    *@throws IOException
+    */
+    @RequestMapping(value = "/deleteMerchantIncome", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String,Object> deleteMerchantIncome(Integer id){
+   	MerchantIncome merchantIncome=new MerchantIncome();
+   	merchantIncome.setId(id);
+		merchantIncomeService.deleteMerchantIncome(merchantIncome);
+		Map<String,Object> result=new HashMap<String,Object>();
+    	result.put("resultCode", "1");
+    	result.put("resultMessage", "保存成功!");
+    	return result;
+    }
+
+}
+
+
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantMarket/MerchantMarketController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantMarket/MerchantMarketController.java
new file mode 100644
index 0000000..e79d512
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantMarket/MerchantMarketController.java
@@ -0,0 +1,85 @@
+package cn.pluss.platform.controller.merchantMarket;
+
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.entity.MerchantMarket;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.merchantMarket.MerchantMarketService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.util.StringUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
+
+/**
+ * <p>
+ * 商户奖励金记录表 前端控制器
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-11-02
+ */
+@Controller
+@RequestMapping("/merchantMarket")
+public class MerchantMarketController extends BaseModelController<MerchantMarketService, MerchantMarket> {
+
+    @Autowired
+    private UserAppService userAppService;
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = "/index")
+    public String index() {
+        return "merchantMarket/list";
+    }
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = {"/detail/{id}", "/detail"})
+    public String detail(HttpServletRequest request, @PathVariable(value = "id", required = false) Integer id) {
+        if (id != null) {
+            MerchantMarket market = new MerchantMarket().setId(id);
+            market = baseService.getOne(new QueryWrapper<>(market));
+            request.setAttribute("entity", market);
+        }
+        return "merchantMarket/detail";
+    }
+
+    @Override
+    public Result<Page<MerchantMarket>> page(Page<MerchantMarket> page, MerchantMarket condition, OrderItem orderItem) {
+        orderItem.setColumn("createTime");
+        orderItem.setAsc(false);
+        return super.page(page, condition, orderItem);
+    }
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = "/save")
+    @Override
+    public Result<String> save(@RequestBody MerchantMarket entity) {
+        if(StringUtil.isEmpty(entity.getUserId())){
+            return ResultGenerator.genFailResult("用户ID不能为空");
+        }
+        if(StringUtil.isEmpty(entity.getSource())){
+            return ResultGenerator.genFailResult("来源不能为空");
+        }
+        if(StringUtil.isEmpty(entity.getMarketAmt())){
+            return ResultGenerator.genFailResult("积分不能为空");
+        }
+        QueryWrapper<UserApp> queryWrapper = new QueryWrapper<UserApp>().
+                eq("userId",entity.getUserId());
+        UserApp app = userAppService.getOne(queryWrapper);
+        if(app == null){
+            return ResultGenerator.genFailResult("请输入正确的用户ID");
+        }
+        if(StringUtil.isEmpty(app.getMerchantCode())){
+            return ResultGenerator.genFailResult("当前用户不支持增加积分");
+        }
+        entity.setUserName(app.getUserName());
+        entity.setCreateTime(new Date());
+        return super.save(entity);
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantMenber/MerchantMenberController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantMenber/MerchantMenberController.java
new file mode 100644
index 0000000..b92e7a0
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantMenber/MerchantMenberController.java
@@ -0,0 +1,411 @@
+package cn.pluss.platform.controller.merchantMenber;
+
+import cn.jiguang.common.utils.StringUtils;
+import cn.pluss.platform.controller.BaseNoModelController;
+import cn.pluss.platform.entitiy.ShiroUser;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantMenber.MerchantMenberService;
+import cn.pluss.platform.merchantMenberComsume.MerchantMenberComsumeService;
+import cn.pluss.platform.merchantMenberRecharge.MerchantMenberRechargeService;
+import cn.pluss.platform.merchantStore.MerchantStoreService;
+import cn.pluss.platform.util.StringUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Controller
+@RequestMapping("merchantMenber")
+public class MerchantMenberController extends BaseNoModelController {
+
+	private Integer PAGE_SIZE = 12;
+
+	@Resource
+	private HttpServletRequest request;
+	
+	@Autowired
+	private MerchantMenberService merchantMenberService;
+
+	@Autowired
+	private MerchantMenberRechargeService merchantMenberRechargeService;
+
+	@Autowired
+	private MerchantMenberComsumeService merchantMenberComsumeService;
+	
+	@Autowired
+	private MerchantBaseInfoService merchantBaseInfoService;
+	
+	@Autowired
+	private MerchantStoreService merchantStoreService;
+
+	/**
+	 * 引导页
+	 * 
+	 * @return
+	 */
+	@GetMapping("/index")
+	public String index() {
+		return "merchantMenber/merchantMenberList";
+	}
+	/**
+	 * 引导页
+	 * 
+	 * @return
+	 */
+	@GetMapping("/market")
+	public String market() {
+		return "merchantMenber/memberMarket";
+	}
+	/**
+	 * 分页查询
+	 */
+	@RequestMapping(value = "/queryMerchantMenberByPage", method = RequestMethod.POST)
+	@ResponseBody
+	public Map<String, Object> queryMerchantMenberByPage(@RequestParam(defaultValue = "1") Integer currPage,MerchantMenber merchantMenber) {
+		Map<String, Object> map = new HashMap<String, Object>(16);
+		Map<String, Object> result = new HashMap<String, Object>(16);
+		map.put("pageSize", PAGE_SIZE);
+		map.put("offset", (currPage - 1) * PAGE_SIZE);
+		// 是否是管理员
+		Boolean bol = verifyUserRole();
+		if(StringUtil.isNotEmpty(merchantMenber.getMemberName())) {
+			map.put("nickName", merchantMenber.getMemberName());
+		}
+		if(StringUtil.isNotEmpty(merchantMenber.getPhone())) {
+			map.put("phone", merchantMenber.getPhone());
+		}
+		ShiroUser shiroUser = queryCurrentShiroUser();
+		// 如果不是管理员通过当前用户的merchantCode进行筛选数据
+		if (!bol) {
+			map.put("merchantCode", shiroUser.getMerchantCode());
+			//通过进行权限控制
+			if(StringUtil.isNotEmpty(shiroUser.getMerchantCode())) {
+				result.put("merchant", "merchant");
+			}
+		}else {
+			//通过admin是不是管理员进行操作权限控制
+			result.put("admin", "admin");
+		}
+		if(StringUtil.isNotEmpty(merchantMenber.getId())) {
+			map.put("id",merchantMenber.getId());
+		}
+		if(StringUtil.isNotEmpty(merchantMenber.getUserId())) {
+			map.put("userId",merchantMenber.getUserId());
+		}
+		if(StringUtil.isNotEmpty(merchantMenber.getMemberName())) {
+			map.put("memberName",merchantMenber.getMemberName());
+		}
+		if(StringUtils.isNotEmpty(merchantMenber.getAlias())) {
+			map.put("alias",merchantMenber.getAlias());
+		}
+		List<MerchantMenber> merchantMenberList = null ;
+		Integer count=0;
+		//管理员查看的数据
+		if (bol){
+			merchantMenberList = merchantMenberService.manageQueryMerchantMenberPage(map);
+			count = merchantMenberService.manageQueryMerchantMenberPageCount(map);
+		}else {
+			merchantMenberList = merchantMenberService.manageQueryMerchantNoMenberPage(map);
+			count = merchantMenberService.manageQueryMerchantNoMenberPageCount(map);
+		}
+		result.put("merchantMenberList", merchantMenberList);
+		result.put("count", count);
+		result.put("pageCount", StringUtil.getPageCount(count, PAGE_SIZE));
+		result.put("currPage", currPage);
+		return result;
+	}
+
+	/**
+	 * 查询详情
+	 */
+	@RequestMapping(value = "/queryMerchantMenberDetails", method = RequestMethod.GET)
+	public String queryMerchantMenberDetails(HttpServletRequest request, Integer id, Integer pageIndex) {
+
+		if (id != null && id != 0) {
+			MerchantMenber merchantMenber = new MerchantMenber();
+			merchantMenber.setId(id);
+			merchantMenber = merchantMenberService.queryMerchantMenber(merchantMenber);
+			request.setAttribute("merchantMenber", merchantMenber);
+			request.setAttribute("pageIndex", pageIndex);
+		}
+		return "merchantMenber/merchantMenberDetails";
+	}
+	//其它用户查看详情
+	@RequestMapping(value="/otherMerchantMenberDetails",method = RequestMethod.GET)
+	public String otherMerchantMenberDetails(Integer id,HttpServletRequest request,Integer pageIndex) {
+		if (id != null && id != 0) {
+			MerchantMenber merchantMenber = new MerchantMenber();
+			merchantMenber.setId(id);
+			merchantMenber = merchantMenberService.queryMerchantMenber(merchantMenber);
+			request.setAttribute("merchantMenber", merchantMenber);
+			request.setAttribute("pageIndex", pageIndex);
+		}
+		return "merchantMenber/otherMerchantMenberDetails";
+	}
+
+	/**
+	 * 查询详情
+	 */
+	@RequestMapping(value = "/queryMerchantMenberBaseInfo", method = RequestMethod.GET)
+	public String queryMerchantMenberBaseInfo(HttpServletRequest request, Integer id, Integer pageIndex) {
+		MerchantMenber merchantMenber = new MerchantMenber();
+		if (id != null && id != 0) {
+			merchantMenber.setId(id);
+			merchantMenber = merchantMenberService.queryMerchantMenber(merchantMenber);
+			request.setAttribute("merchantMenber", merchantMenber);
+			request.setAttribute("pageIndex", pageIndex);
+		}
+		return "merchantMenber/merchantMenberBaseInfo";
+	}
+
+	/**
+	 * 查询详情
+	 */
+	@RequestMapping(value = "/queryMerchantMenberExtendsInfo", method = RequestMethod.GET)
+	public String queryMerchantMenberExtendsInfo() {
+		return "merchantMenber/merchantMenberExtendsInfo";
+	}
+
+	/**
+	 * 查询详情
+	 */
+	@RequestMapping(value = "/queryMerchantMenberFunctionsInfo", method = RequestMethod.GET)
+	public String queryMerchantMenberFunctionsInfo() {
+
+		return "merchantMenber/merchantMenberFunctionsInfo";
+	}
+
+	/**
+	 * 保存对象
+	 * 
+	 * @throws IOException
+	 */
+	@RequestMapping(value = "/saveMerchantMenber", method = RequestMethod.POST)
+	@ResponseBody
+	public Map<String, Object> saveMerchantMenber(MerchantMenber merchantMenber) {
+		//通过merchantCode查商户信息
+    	MerchantBaseInfo merchantBaseInfo=new MerchantBaseInfo();
+    	merchantBaseInfo.setMerchantCode(merchantMenber.getMerchantCode());
+		List<MerchantBaseInfo> merchantBaseInfoList = merchantBaseInfoService.queryMerchantBaseInfoList(merchantBaseInfo);
+		if(merchantBaseInfoList!=null&&merchantBaseInfoList.size()>0) {
+			merchantMenber.setMerchantName(merchantBaseInfoList.get(0).getMerchantName());
+		}
+		//通过StoreId查门店信息
+		MerchantStore merchantStore=new MerchantStore();
+		merchantStore.setStoreId(merchantMenber.getStoreId());
+		List<MerchantStore> merchantStoreList = merchantStoreService.queryMerchantStoreList(merchantStore);
+		if(merchantStoreList!=null&&merchantStoreList.size()>0) {
+			merchantMenber.setStoreName(merchantStoreList.get(0).getStoreName());
+		}
+		if (merchantMenber.getId() != null && merchantMenber.getId() != 0) {
+			merchantMenberService.updateMerchantMenber(merchantMenber);
+		} else {
+			//生成会员编码
+			merchantMenber.setMemberCode(StringUtil.getBillno());
+			if(StringUtil.isEmpty(merchantMenber.getProfitMoney())) {
+				merchantMenber.setProfitMoney(0d);
+			}
+			if(StringUtil.isEmpty(merchantMenber.getComsumeMoney())) {
+				merchantMenber.setComsumeMoney(0d);
+			}
+			merchantMenberService.saveMerchantMenber(merchantMenber);
+		}
+		Map<String, Object> result = new HashMap<String, Object>();
+		result.put("resultCode", "1");
+		result.put("resultMessage", "保存成功!");
+		return result;
+	}
+
+	/**
+	 * 修改对象
+	 * 
+	 * @throws IOException
+	 */
+	@RequestMapping(value = "/updateMerchantMenber", method = RequestMethod.POST)
+	@ResponseBody
+	public Map<String, Object> updateMerchantMenber(Integer id) {
+
+		MerchantMenber merchantMenber = new MerchantMenber();
+		merchantMenber.setId(id);
+		merchantMenberService.updateMerchantMenber(merchantMenber);
+		Map<String, Object> result = new HashMap<String, Object>();
+		result.put("resultCode", "1");
+		result.put("resultMessage", "保存成功!");
+		return result;
+	}
+
+	/**
+	 * 删除对象
+	 * 
+	 * @throws IOException
+	 */
+	@RequestMapping(value = "/deleteMerchantMenber", method = RequestMethod.POST)
+	@ResponseBody
+	public Map<String, Object> deleteMerchantMenber(Integer id) {
+		MerchantMenber merchantMenber = new MerchantMenber();
+		merchantMenber.setId(id);
+		merchantMenberService.deleteMerchantMenber(merchantMenber);
+		Map<String, Object> result = new HashMap<String, Object>();
+		result.put("resultCode", "1");
+		result.put("resultMessage", "保存成功!");
+		return result;
+	}
+
+	/**
+	 * 到充值
+	 * 
+	 * @return
+	 */
+	@RequestMapping(value = "/showRechargeDetails", method = RequestMethod.GET)
+	public String showRechargeDetails() {
+		String memberCode = request.getParameter("memberCode");
+		request.setAttribute("memberCode", memberCode);
+		return "merchantMenber/showRechargeDetails";
+	}
+
+	@RequestMapping(value = "/rechargeDetails", method = RequestMethod.POST)
+	@ResponseBody
+	public Map<String, Object> rechargeDetails(@RequestParam(defaultValue = "1") Integer currPage,
+			MerchantMenberRecharge menberRecharge) {
+		Boolean bol = verifyUserRole();
+		ShiroUser shiroUser = queryCurrentShiroUser();
+		Map<String, Object> map = new HashMap<String, Object>(16);
+		Map<String, Object> result = new HashMap<String, Object>(16);
+		String memberCode = request.getParameter("memberCode");
+		map.put("pageSize", PAGE_SIZE);
+		map.put("offset", (currPage - 1) * PAGE_SIZE);
+		map.put("memberCode", memberCode);
+		if (StringUtil.isNotEmpty(menberRecharge.getNickName())) {
+			map.put("nickName", menberRecharge.getNickName());
+		}
+		if (StringUtil.isNotEmpty(menberRecharge.getPhone())) {
+			map.put("phone", menberRecharge.getPhone());
+		}
+		//如果不是管理员
+		if (!bol) {
+			if (StringUtil.isNotEmpty(shiroUser.getMerchantCode())) {
+				map.put("merchantCode", shiroUser.getMerchantCode());
+			}
+		}
+		if(StringUtil.isNotEmpty(menberRecharge.getId())) {
+			map.put("id",menberRecharge.getId());
+		}
+		if(StringUtil.isNotEmpty(menberRecharge.getMerchantName())) {
+			map.put("merchantName",menberRecharge.getMerchantName() );
+		}
+		if(StringUtil.isNotEmpty(menberRecharge.getOrderNumber())) {
+			map.put("orderNumber",menberRecharge.getOrderNumber());
+		}
+		if(StringUtil.isNotEmpty(menberRecharge.getAlias())) {
+			map.put("alias", menberRecharge.getAlias());
+		}
+		List<MerchantMenberRecharge> merchantMenberRechargeList = merchantMenberRechargeService
+				.queryMerchantMenberRechargePage(map);
+		Integer count = merchantMenberRechargeService.queryMerchantMenberRechargePageCount(map);
+		result.put("merchantMenberRechargeList", merchantMenberRechargeList);
+		result.put("count", count);
+		result.put("pageCount", StringUtil.getPageCount(count, PAGE_SIZE));
+		result.put("currPage", currPage);
+		return result;
+	}
+
+	/**
+	 * 到消费
+	 * 
+	 * @return
+	 */
+	@RequestMapping(value = "/showConsumptionDetails", method = RequestMethod.GET)
+	public String showConsumptionDetails() {
+		String memberCode = request.getParameter("memberCode");
+		request.setAttribute("memberCode", memberCode);
+		return "merchantMenber/showConsumptionDetails";
+	}
+
+	@RequestMapping(value = "/consumptionDetails", method = RequestMethod.POST)
+	@ResponseBody
+	public Map<String, Object> consumptionDetails(@RequestParam(defaultValue = "1") Integer currPage,
+			MerchantMenberComsume menberComsume) {
+		Boolean bol = verifyUserRole();
+		ShiroUser shiroUser = queryCurrentShiroUser();
+		Map<String, Object> map = new HashMap<String, Object>(16);
+		Map<String, Object> result = new HashMap<String, Object>(16);
+		String memberCode = request.getParameter("memberCode");
+		map.put("pageSize", PAGE_SIZE);
+		map.put("offset", (currPage - 1) * PAGE_SIZE);
+		map.put("memberCode", memberCode);
+		if (StringUtil.isNotEmpty(menberComsume.getNickName())) {
+			map.put("nickName", menberComsume.getNickName());
+		}
+		if (StringUtil.isNotEmpty(menberComsume.getPhone())) {
+			map.put("phone", menberComsume.getPhone());
+		}
+		//如果不是管理员
+		if (!bol) {
+			if (StringUtil.isNotEmpty(shiroUser.getMerchantCode())) {
+				map.put("merchantCode", shiroUser.getMerchantCode());
+			}
+		}
+		if(StringUtil.isNotEmpty(menberComsume.getOrderNumber())) {
+			map.put("orderNumber",menberComsume.getOrderNumber());
+		}
+		if(StringUtil.isNotEmpty(menberComsume.getMerchantName())) {
+			map.put("merchantName",menberComsume.getMerchantName());
+		}
+		if(StringUtil.isNotEmpty(menberComsume.getAlias())) {
+			map.put("alias",menberComsume.getAlias());
+		}
+		List<MerchantMenberComsume> merchantMenberComsumeList = merchantMenberComsumeService
+				.queryMerchantMenberComsumePage(map);
+		Integer count = merchantMenberComsumeService.queryMerchantMenberComsumePageCount(map);
+		result.put("merchantMenberComsumeList", merchantMenberComsumeList);
+		result.put("count", count);
+		result.put("pageCount", StringUtil.getPageCount(count, PAGE_SIZE));
+		result.put("currPage", currPage);
+		return result;
+	}
+	
+	  /**
+     * 是否是管理员
+     */
+    public void getRole() {
+    	Boolean bol = verifyUserRole();
+    	if(bol) {
+			request.setAttribute("admin", "admin");
+		}
+    }
+		    /**
+		     *不是管理员 获取的权限  是商户
+		*/
+		public void getPermission() {
+		ShiroUser user = queryCurrentShiroUser();
+			if(StringUtil.isNotEmpty(user.getMerchantCode())) {
+				request.setAttribute("merchant", "merchant");
+			}
+		}
+    /**
+     * 获取所有商户信息
+     */
+    public void getMerchant() {
+    	List<MerchantBaseInfo> merchantBaseInfoList = merchantBaseInfoService.queryMerchantBaseInfoList(null);
+    	request.setAttribute("merchantBaseInfoList", merchantBaseInfoList);
+    }
+    /**
+     * 根据选择的商户code获取下面的门店
+     */
+    @RequestMapping(value="/getStoreByMerchantCode",method=RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> getStoreByMerchantCode(MerchantStore merchantStore) {
+    	Map<String, Object> result = new HashMap<String, Object>(16);
+		List<MerchantStore> merchantStoreList = merchantStoreService.queryMerchantStoreList(merchantStore);
+		result.put("merchantStoreList", merchantStoreList);
+		return result;
+    }
+
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantMenberComsume/MerchantMenberComsumeController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantMenberComsume/MerchantMenberComsumeController.java
new file mode 100644
index 0000000..4f42cf0
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantMenberComsume/MerchantMenberComsumeController.java
@@ -0,0 +1,158 @@
+package cn.pluss.platform.controller.merchantMenberComsume;
+
+import cn.pluss.platform.controller.BaseNoModelController;
+import cn.pluss.platform.entity.MerchantMenberComsume;
+import cn.pluss.platform.merchantMenberComsume.MerchantMenberComsumeService;
+import cn.pluss.platform.util.StringUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Controller
+@RequestMapping("merchantMenberComsume")
+public class MerchantMenberComsumeController  extends BaseNoModelController {
+
+	  private Integer PAGE_SIZE=12;
+
+    @Autowired
+	  private MerchantMenberComsumeService merchantMenberComsumeService;
+
+    /**
+    *引导页
+    * @return
+    */
+    @RequestMapping(value = "/index", method = RequestMethod.GET)
+    public String index() {
+   
+        return "merchantMenberComsume/merchantMenberComsumeList";
+    }
+
+    /**
+    *分页查询
+    */
+    @RequestMapping(value = "/queryMerchantMenberComsumeByPage", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String,Object> queryMerchantMenberComsumeByPage(Integer currPage,Integer id){
+   
+   	if(currPage==null) {
+   	   currPage=1;
+       }
+    	Map<String,Object> map=new HashMap<String, Object>();
+    	map.put("pageSize",PAGE_SIZE);
+    	map.put("offset", (currPage-1)*PAGE_SIZE);
+    	map.put("id",  id);
+    	List<MerchantMenberComsume> merchantMenberComsumeList=merchantMenberComsumeService.queryMerchantMenberComsumePage(map);
+    	Integer count=merchantMenberComsumeService.queryMerchantMenberComsumePageCount(map);
+        Map<String,Object> result=new HashMap<String,Object>();
+        result.put("merchantMenberComsumeList", merchantMenberComsumeList);
+        result.put("count", count);
+        result.put("pageCount",StringUtil.getPageCount(count,PAGE_SIZE));
+        result.put("currPage", currPage);
+    	  return result;
+    }
+    /**
+    *查询详情
+    */
+     @RequestMapping(value = "/queryMerchantMenberComsumeDetails", method = RequestMethod.GET)
+    public String queryMerchantMenberComsumeDetails(HttpServletRequest request,Integer id,Integer pageIndex){
+   
+   	  if(id!=null&&id!=0) {
+   		 MerchantMenberComsume merchantMenberComsume=new MerchantMenberComsume();
+   		 merchantMenberComsume.setId(id);
+           merchantMenberComsume=merchantMenberComsumeService.queryMerchantMenberComsume(merchantMenberComsume);
+          request.setAttribute("merchantMenberComsume", merchantMenberComsume);
+   		request.setAttribute("pageIndex", pageIndex);
+       	}
+        return "merchantMenberComsume/merchantMenberComsumeDetails";
+    }
+    /**
+    *查询详情
+    */
+     @RequestMapping(value = "/queryMerchantMenberComsumeBaseInfo", method = RequestMethod.GET)
+    public String queryMerchantMenberComsumeBaseInfo(HttpServletRequest request,Integer id,Integer pageIndex){
+   
+   	  if(id!=null&&id!=0) {
+   		MerchantMenberComsume merchantMenberComsume=new MerchantMenberComsume();
+   		merchantMenberComsume.setId(id);
+        merchantMenberComsume=merchantMenberComsumeService.queryMerchantMenberComsume(merchantMenberComsume);
+          request.setAttribute("merchantMenberComsume", merchantMenberComsume);
+   		request.setAttribute("pageIndex", pageIndex);
+       	}
+        return "merchantMenberComsume/merchantMenberComsumeBaseInfo";
+    }
+    /**
+    *查询详情
+    */
+     @RequestMapping(value = "/queryMerchantMenberComsumeExtendsInfo", method = RequestMethod.GET)
+    public String queryMerchantMenberComsumeExtendsInfo(){
+   
+        return "merchantMenberComsume/merchantMenberComsumeExtendsInfo";
+    }
+    /**
+    *查询详情
+    */
+     @RequestMapping(value = "/queryMerchantMenberComsumeFunctionsInfo", method = RequestMethod.GET)
+    public String queryMerchantMenberComsumeFunctionsInfo(){
+   
+        return "merchantMenberComsume/merchantMenberComsumeFunctionsInfo";
+    }
+    /**
+    *保存对象
+    *@throws IOException
+    */
+    @RequestMapping(value = "/saveMerchantMenberComsume", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String,Object> saveMerchantMenberComsume(MerchantMenberComsume merchantMenberComsume){
+   
+       if(merchantMenberComsume.getId()!=null&&merchantMenberComsume.getId()!=0){
+    		merchantMenberComsumeService.updateMerchantMenberComsume(merchantMenberComsume);
+    	 }else{  
+      	merchantMenberComsumeService.saveMerchantMenberComsume(merchantMenberComsume);
+    	 }  
+		Map<String,Object> result=new HashMap<String,Object>();
+    	result.put("resultCode", "1");
+    	result.put("resultMessage", "保存成功!");
+    	return result;
+    }
+    /**
+    *修改对象
+    *@throws IOException
+    */
+    @RequestMapping(value = "/updateMerchantMenberComsume", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String,Object> updateMerchantMenberComsume(Integer id){
+   
+   	MerchantMenberComsume merchantMenberComsume=new MerchantMenberComsume();
+   	merchantMenberComsume.setId(id);
+      merchantMenberComsumeService.updateMerchantMenberComsume(merchantMenberComsume);
+   	Map<String,Object> result=new HashMap<String,Object>();
+    	result.put("resultCode", "1");
+    	result.put("resultMessage", "保存成功!");
+    	return result;
+    }
+    /**
+    *删除对象
+    *@throws IOException
+    */
+    @RequestMapping(value = "/deleteMerchantMenberComsume", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String,Object> deleteMerchantMenberComsume(Integer id){
+   	MerchantMenberComsume merchantMenberComsume=new MerchantMenberComsume();
+   	merchantMenberComsume.setId(id);
+		merchantMenberComsumeService.deleteMerchantMenberComsume(merchantMenberComsume);
+		Map<String,Object> result=new HashMap<String,Object>();
+    	result.put("resultCode", "1");
+    	result.put("resultMessage", "保存成功!");
+    	return result;
+    }
+
+}
+
+
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantMenberRecharge/MerchantMenberRechargeController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantMenberRecharge/MerchantMenberRechargeController.java
new file mode 100644
index 0000000..9496335
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantMenberRecharge/MerchantMenberRechargeController.java
@@ -0,0 +1,158 @@
+package cn.pluss.platform.controller.merchantMenberRecharge;
+
+import cn.pluss.platform.controller.BaseNoModelController;
+import cn.pluss.platform.entity.MerchantMenberRecharge;
+import cn.pluss.platform.merchantMenberRecharge.MerchantMenberRechargeService;
+import cn.pluss.platform.util.StringUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Controller
+@RequestMapping("merchantMenberRecharge")
+public class MerchantMenberRechargeController  extends BaseNoModelController {
+
+	  private Integer PAGE_SIZE=12;
+
+    @Autowired
+	  private MerchantMenberRechargeService merchantMenberRechargeService;
+
+    /**
+    *引导页
+    * @return
+    */
+    @RequestMapping(value = "/index", method = RequestMethod.GET)
+    public String index() {
+   
+        return "merchantMenberRecharge/merchantMenberRechargeList";
+    }
+
+    /**
+    *分页查询
+    */
+    @RequestMapping(value = "/queryMerchantMenberRechargeByPage", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String,Object> queryMerchantMenberRechargeByPage(Integer currPage,Integer id){
+   
+   	if(currPage==null) {
+   	   currPage=1;
+       }
+    	Map<String,Object> map=new HashMap<String, Object>();
+    	map.put("pageSize",PAGE_SIZE);
+    	map.put("offset", (currPage-1)*PAGE_SIZE);
+    	map.put("id",  id);
+    	List<MerchantMenberRecharge> merchantMenberRechargeList=merchantMenberRechargeService.queryMerchantMenberRechargePage(map);
+    	Integer count=merchantMenberRechargeService.queryMerchantMenberRechargePageCount(map);
+        Map<String,Object> result=new HashMap<String,Object>();
+        result.put("merchantMenberRechargeList", merchantMenberRechargeList);
+        result.put("count", count);
+        result.put("pageCount",StringUtil.getPageCount(count,PAGE_SIZE));
+        result.put("currPage", currPage);
+    	  return result;
+    }
+    /**
+    *查询详情
+    */
+     @RequestMapping(value = "/queryMerchantMenberRechargeDetails", method = RequestMethod.GET)
+    public String queryMerchantMenberRechargeDetails(HttpServletRequest request,Integer id,Integer pageIndex){
+   
+   	  if(id!=null&&id!=0) {
+   		 MerchantMenberRecharge merchantMenberRecharge=new MerchantMenberRecharge();
+   		 merchantMenberRecharge.setId(id);
+           merchantMenberRecharge=merchantMenberRechargeService.queryMerchantMenberRecharge(merchantMenberRecharge);
+          request.setAttribute("merchantMenberRecharge", merchantMenberRecharge);
+   		request.setAttribute("pageIndex", pageIndex);
+       	}
+        return "merchantMenberRecharge/merchantMenberRechargeDetails";
+    }
+    /**
+    *查询详情
+    */
+     @RequestMapping(value = "/queryMerchantMenberRechargeBaseInfo", method = RequestMethod.GET)
+    public String queryMerchantMenberRechargeBaseInfo(HttpServletRequest request,Integer id,Integer pageIndex){
+   
+   	  if(id!=null&&id!=0) {
+   		MerchantMenberRecharge merchantMenberRecharge=new MerchantMenberRecharge();
+   		merchantMenberRecharge.setId(id);
+        merchantMenberRecharge=merchantMenberRechargeService.queryMerchantMenberRecharge(merchantMenberRecharge);
+          request.setAttribute("merchantMenberRecharge", merchantMenberRecharge);
+   		request.setAttribute("pageIndex", pageIndex);
+       	}
+        return "merchantMenberRecharge/merchantMenberRechargeBaseInfo";
+    }
+    /**
+    *查询详情
+    */
+     @RequestMapping(value = "/queryMerchantMenberRechargeExtendsInfo", method = RequestMethod.GET)
+    public String queryMerchantMenberRechargeExtendsInfo(){
+   
+        return "merchantMenberRecharge/merchantMenberRechargeExtendsInfo";
+    }
+    /**
+    *查询详情
+    */
+     @RequestMapping(value = "/queryMerchantMenberRechargeFunctionsInfo", method = RequestMethod.GET)
+    public String queryMerchantMenberRechargeFunctionsInfo(){
+   
+        return "merchantMenberRecharge/merchantMenberRechargeFunctionsInfo";
+    }
+    /**
+    *保存对象
+    *@throws IOException
+    */
+    @RequestMapping(value = "/saveMerchantMenberRecharge", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String,Object> saveMerchantMenberRecharge(MerchantMenberRecharge merchantMenberRecharge){
+   
+       if(merchantMenberRecharge.getId()!=null&&merchantMenberRecharge.getId()!=0){
+    		merchantMenberRechargeService.updateMerchantMenberRecharge(merchantMenberRecharge);
+    	 }else{  
+      	merchantMenberRechargeService.saveMerchantMenberRecharge(merchantMenberRecharge);
+    	 }  
+		Map<String,Object> result=new HashMap<String,Object>();
+    	result.put("resultCode", "1");
+    	result.put("resultMessage", "保存成功!");
+    	return result;
+    }
+    /**
+    *修改对象
+    *@throws IOException
+    */
+    @RequestMapping(value = "/updateMerchantMenberRecharge", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String,Object> updateMerchantMenberRecharge(Integer id){
+   
+   	MerchantMenberRecharge merchantMenberRecharge=new MerchantMenberRecharge();
+   	merchantMenberRecharge.setId(id);
+      merchantMenberRechargeService.updateMerchantMenberRecharge(merchantMenberRecharge);
+   	Map<String,Object> result=new HashMap<String,Object>();
+    	result.put("resultCode", "1");
+    	result.put("resultMessage", "保存成功!");
+    	return result;
+    }
+    /**
+    *删除对象
+    *@throws IOException
+    */
+    @RequestMapping(value = "/deleteMerchantMenberRecharge", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String,Object> deleteMerchantMenberRecharge(Integer id){
+   	MerchantMenberRecharge merchantMenberRecharge=new MerchantMenberRecharge();
+   	merchantMenberRecharge.setId(id);
+		merchantMenberRechargeService.deleteMerchantMenberRecharge(merchantMenberRecharge);
+		Map<String,Object> result=new HashMap<String,Object>();
+    	result.put("resultCode", "1");
+    	result.put("resultMessage", "保存成功!");
+    	return result;
+    }
+
+}
+
+
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantOrder/MerchantOrderController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantOrder/MerchantOrderController.java
new file mode 100644
index 0000000..cd79afb
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantOrder/MerchantOrderController.java
@@ -0,0 +1,797 @@
+package cn.pluss.platform.controller.merchantOrder;
+
+import cn.hutool.core.io.FileUtil;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.controller.BaseNoModelController;
+import cn.pluss.platform.dto.SummaryOfWaterDTO;
+import cn.pluss.platform.entitiy.ShiroUser;
+import cn.pluss.platform.entity.MerchantChannel;
+import cn.pluss.platform.entity.MerchantOrder;
+import cn.pluss.platform.entity.MerchantStore;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.merchantChannel.MerchantChannelService;
+import cn.pluss.platform.merchantOrder.MerchantOrderService;
+import cn.pluss.platform.merchantProfit.MerchantProfitService;
+import cn.pluss.platform.merchantStore.MerchantStoreService;
+import cn.pluss.platform.refundOrder.MerchantRefundOrderService;
+import cn.pluss.platform.ryx.RyxService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.util.DateUtils;
+import cn.pluss.platform.util.ExcelUtil;
+import cn.pluss.platform.util.StringUtil;
+import cn.pluss.platform.vo.*;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+@Controller
+@RequestMapping("merchantOrder")
+public class MerchantOrderController extends BaseNoModelController {
+
+
+    private Integer PAGE_SIZE = 12;
+
+    @Autowired
+    private HttpServletRequest request;
+
+    @Autowired
+    private MerchantOrderService merchantOrderService;
+
+    @Autowired
+    private MerchantStoreService merchantStoreService;
+
+    @Autowired
+    private UserAppService userAppService;
+
+    @Autowired
+    private MerchantProfitService merchantProfitService;
+
+    @Autowired
+    private RyxService ryxService;
+
+    @Resource
+    private MerchantChannelService merchantChannelService;
+
+    @Resource
+    private MerchantRefundOrderService merchantRefundOrderService;
+
+    /**
+     * 引导页
+     *
+     * @return
+     */
+    @RequestMapping(value = "/index", method = RequestMethod.GET)
+    public String initIndex() {
+        List<MerchantChannel> channelList = merchantChannelService.getValidChannelList();
+        request.setAttribute("channelList", channelList);
+        return "merchantOrder/merchantOrderList";
+    }
+
+    @ResponseBody
+    @RequestMapping(value = "/queryMerchantOrderByPage", method = RequestMethod.GET)
+    public Map<String, Object> querPage(@RequestParam(name = "currPage") Integer currPage, MerchantOrder merchantOrder, @RequestParam(name = "size") Integer size, HttpServletRequest request) {
+        Map<String, Object> map = new HashMap<String, Object>();
+        map.put("pageSize", size);
+        map.put("offset", (currPage - 1) * size);
+        Boolean bol = verifyUserRole();
+        ShiroUser shiroUser = queryCurrentShiroUser();
+        if (!bol) {
+            map.put("merchantCode", shiroUser.getMerchantCode());
+        }
+        map.put("userId", merchantOrder.getUserId());
+        map.put("merchantCode", merchantOrder.getMerchantCode());
+        map.put("orderNumber", merchantOrder.getOrderNumber());// 订单号
+        map.put("storeName", merchantOrder.getStoreName());// 门店名称
+        if (StringUtil.isNotEmpty(merchantOrder.getPayTypeCode())) {
+            String[] payTypeCodeArr = merchantOrder.getPayTypeCode().split("\\|");
+            map.put("payTypeCode", payTypeCodeArr);//支付方式
+        }
+        map.put("alias", merchantOrder.getAlias());// 商家名称
+        map.put("status", merchantOrder.getStatus());// 交易状态
+        map.put("aisleSwitch", merchantOrder.getAisleSwitch());
+        if (StringUtil.isNotEmpty(merchantOrder.getSettlementType())) {
+            map.put("settlementType", merchantOrder.getSettlementType());// 结算类型
+        }
+        if (StringUtil.isNotEmpty(merchantOrder.getPayTypeName())) {
+            switch (merchantOrder.getPayTypeName()) {// 支付方式
+                case "1":
+                    map.put("payTypeName", "微信");
+                    break;
+                case "2":
+                    map.put("payTypeName", "支付宝");
+                    break;
+                case "3":
+                    map.put("payTypeName", "随行支付宝支付");
+                    break;
+                case "4":
+                    map.put("payTypeName", "随行微信支付");
+                    break;
+                case "5":
+                    map.put("payTypeName", "随行刷卡支付");
+                    break;
+                case "6":
+                    map.put("payTypeName", "随行云闪付支付");
+            }
+        }
+        map.put("orderType", merchantOrder.getOrderType());
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        if (StringUtil.isNotEmpty(merchantOrder.getStartTime())) {
+            String startTime = simpleDateFormat.format(merchantOrder.getStartTime());
+            System.out.println("获取的开始时间startTime为:" + startTime);
+            map.put("startTime", startTime);// 开始时间
+        }
+        if (StringUtil.isNotEmpty(merchantOrder.getEndTime())) {
+            String endTime = simpleDateFormat.format(merchantOrder.getEndTime());
+            System.out.println("获取的结束时间endTime为:" + endTime);
+            map.put("endTime", endTime);// 结束时间
+        }
+        List<MerchantMangeOrderVO> merchantOrderList = null;
+        Integer count = 0;
+        // if (bol) {
+            merchantOrderList = merchantOrderService.queryMerchantOrderPageShuju(map);
+            count = merchantOrderService.queryMerchantOrderPageCountShuju(map);
+        // } else {
+        //     merchantOrderList = merchantOrderService.queryMerchantOrderNoPageShuju(map);
+        //     count = merchantOrderService.queryMerchantOrderNoPageCountShuju(map);
+        // }
+        Boolean flag = false;
+        for(String key:map.keySet()){//keySet获取map集合key的集合  然后在遍历key即可
+            if("pageSize".equals(key) || "offset".equals(key)){
+                continue;
+            }
+            if(map.get(key) != null && StringUtil.isNotEmpty(map.get(key).toString())){
+                flag = true;
+            }
+        }
+        if(!flag){
+            map.put("createDate",DateUtils.toString(DateUtils.currentDate(),"yyyy-MM-dd"));
+        }
+        Map<String, Object> resultData = merchantOrderService.getOrderCountData(map);
+        Map<String, Object> result = new HashMap<>(9);
+        if (count == 0) {
+            result.put("resultData", null);
+        } else {
+            result.put("resultData", resultData);
+        }
+        result.put("merchantOrderList", merchantOrderList);
+        result.put("count", count);
+        result.put("code", 200);
+        result.put("pageCount", StringUtil.getPageCount(count, PAGE_SIZE));
+        result.put("currPage", currPage);
+//		if(resultData != null){
+//			result.putAll(resultData);
+//		}
+        return result;
+    }
+
+    /**
+     * 订单推广分润明细
+     *
+     * @return
+     */
+    @GetMapping("/profit/page2")
+    @ResponseBody
+    public Result<Map<String, Object>> orderProfitPage2(Page<MerchantOrderProfitVO> page, MerchantOrderVO condition, OrderItem orderItem) {
+        Map<String, Object> map = new HashMap<>(16);
+        Map<String, Object> result = new HashMap<>();
+        map.put("pageSize", page.getSize());
+        map.put("offset", (page.getSize() - 1) * PAGE_SIZE);
+        map.put("profitCount", "all");
+        if (StringUtil.isNotEmpty(condition.getUserId())) {
+            map.put("userId", condition.getUserId());
+        }
+        if (StringUtil.isNotEmpty(condition.getAlias())) {
+            map.put("merchantName", condition.getAlias());
+        }
+        if (StringUtil.isNotEmpty(condition.getOrderNumber())) {
+            map.put("orderNumber", condition.getOrderNumber());
+        }
+        if (StringUtil.isNotEmpty(condition.getUserId())) {
+            Map<String, Object> profitMap = merchantProfitService.getProfitCount(map);
+            if (profitMap != null && profitMap.size() > 0) {
+                result.put("transAmountCount", profitMap.get("transAmountCount"));
+                result.put("shareAmountCount", profitMap.get("shareAmountCount"));
+            } else {
+                result.put("transAmountCount", "0.00");
+                result.put("shareAmountCount", "0.00");
+            }
+            map.put("profitCount", "part");
+        }
+        List<MerchantOrderProfitVO> pageData = merchantOrderService.pageData(map);
+        Integer count = merchantOrderService.pageDataCount(map);
+        result.put("count", count);
+        result.put("pageCount", StringUtil.getPageCount(count, PAGE_SIZE));
+        result.put("currPage", page.getCurrent());
+
+        page.setRecords(pageData);
+        page.setTotal(count);
+
+        result.put("pageData", page);
+
+        return ResultGenerator.genSuccessResult(result);
+    }
+
+    /**
+     * 订单推广分润明细
+     *
+     * @return
+     */
+    @RequestMapping(value = "/profit/page", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> orderProfitPage(@RequestParam(defaultValue = "1") Integer currPage, MerchantOrder order) {
+        Map<String, Object> result = new HashMap<>(16);
+        Map<String, Object> map = new HashMap<>(16);
+        map.put("pageSize", PAGE_SIZE);
+        map.put("offset", (currPage - 1) * PAGE_SIZE);
+        map.put("profitCount", "all");
+        if (StringUtil.isNotEmpty(order.getUserId())) {
+            map.put("userId", order.getUserId());
+        }
+        if (StringUtil.isNotEmpty(order.getAlias())) {
+            map.put("merchantName", order.getAlias());
+        }
+        if (StringUtil.isNotEmpty(order.getOrderNumber())) {
+            map.put("orderNumber", order.getOrderNumber());
+        }
+        if (StringUtil.isNotEmpty(order.getUserId())) {
+            Map<String, Object> profitMap = merchantProfitService.getProfitCount(map);
+            if (profitMap != null && profitMap.size() > 0) {
+                result.put("transAmountCount", profitMap.get("transAmountCount"));
+                result.put("shareAmountCount", profitMap.get("shareAmountCount"));
+            } else {
+                result.put("transAmountCount", "0.00");
+                result.put("shareAmountCount", "0.00");
+            }
+            map.put("profitCount", "part");
+        }
+        List<MerchantOrderProfitVO> pageData = merchantOrderService.pageData(map);
+        Integer count = merchantOrderService.pageDataCount(map);
+        result.put("orderProfitList", pageData);
+        result.put("count", count);
+        result.put("pageCount", StringUtil.getPageCount(count, PAGE_SIZE));
+        result.put("currPage", currPage);
+        return result;
+    }
+
+    @RequestMapping(value = "/profit", method = RequestMethod.GET)
+    public String index() {
+        return "merchantOrder/orderProfitList";
+    }
+
+
+    /**
+     * 分页查询
+     */
+//	@RequestMapping(value = "/queryMerchantOrderByPage", method = RequestMethod.POST)
+//	@ResponseBody
+//	public Map<String, Object> queryMerchantOrderByPage(@RequestParam(defaultValue = "1") Integer currPage,
+//			MerchantOrder merchantOrder) {
+//		return result;
+//	}
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryMerchantOrderDetails", method = RequestMethod.GET)
+    public String queryMerchantOrderDetails(HttpServletRequest request, Integer id, Integer pageIndex) {
+
+        if (id != null && id != 0) {
+            MerchantOrder merchantOrder = new MerchantOrder();
+            merchantOrder.setId(id.longValue());
+            merchantOrder = merchantOrderService.queryMerchantOrder(merchantOrder);
+            request.setAttribute("merchantOrder", merchantOrder);
+            request.setAttribute("pageIndex", pageIndex);
+        }
+        return "merchantOrder/merchantOrderDetails";
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryMerchantOrderBaseInfo", method = RequestMethod.GET)
+    public String queryMerchantOrderBaseInfo(HttpServletRequest request, Integer id, Integer pageIndex) {
+
+        if (id != null && id != 0) {
+            MerchantOrder merchantOrder = new MerchantOrder();
+            merchantOrder.setId(id.longValue());
+            merchantOrder = merchantOrderService.queryMerchantOrder(merchantOrder);
+            request.setAttribute("merchantOrder", merchantOrder);
+            request.setAttribute("pageIndex", pageIndex);
+        }
+        return "merchantOrder/merchantOrderBaseInfo";
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryMerchantOrderExtendsInfo", method = RequestMethod.GET)
+    public String queryMerchantOrderExtendsInfo() {
+
+        return "merchantOrder/merchantOrderExtendsInfo";
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryMerchantOrderFunctionsInfo", method = RequestMethod.GET)
+    public String queryMerchantOrderFunctionsInfo() {
+
+        return "merchantOrder/merchantOrderFunctionsInfo";
+    }
+
+    /**
+     * 保存对象
+     *
+     * @throws IOException
+     */
+    @RequestMapping(value = "/saveMerchantOrder", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> saveMerchantOrder(MerchantOrder merchantOrder) {
+
+        if (merchantOrder.getId() != null && merchantOrder.getId() != 0) {
+            merchantOrderService.updateById(merchantOrder);
+        } else {
+            merchantOrderService.save(merchantOrder);
+        }
+        Map<String, Object> result = new HashMap<String, Object>();
+        result.put("resultCode", "1");
+        result.put("resultMessage", "保存成功!");
+        return result;
+    }
+
+    /**
+     * 修改对象
+     *
+     * @throws IOException
+     */
+    @RequestMapping(value = "/updateMerchantOrder", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> updateMerchantOrder(Integer id) {
+
+        MerchantOrder merchantOrder = new MerchantOrder();
+        merchantOrder.setId(id.longValue());
+        merchantOrderService.updateById(merchantOrder);
+        Map<String, Object> result = new HashMap<String, Object>();
+        result.put("resultCode", "1");
+        result.put("resultMessage", "保存成功!");
+        return result;
+    }
+
+    /**
+     * 删除对象
+     *
+     * @throws IOException
+     */
+    @RequestMapping(value = "/deleteMerchantOrder", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> deleteMerchantOrder(Integer id) {
+        MerchantOrder merchantOrder = new MerchantOrder();
+        merchantOrder.setId(id.longValue());
+        merchantOrderService.removeById(merchantOrder.getId());
+        Map<String, Object> result = new HashMap<String, Object>();
+        result.put("resultCode", "1");
+        result.put("resultMessage", "保存成功!");
+        return result;
+    }
+
+    /**
+     * 跳转汇总流水
+     *
+     * @return
+     */
+    @RequestMapping(value = "/summaryOfWater", method = RequestMethod.GET)
+    public String summaryOfWater() {
+        ShiroUser user = queryCurrentShiroUser();
+        // user.setMerchantCode("M800201909246546966");
+        if (StringUtil.isNotEmpty(user)) {
+            request.setAttribute("merchantCode", user.getMerchantCode());
+            if (StringUtil.isNotEmpty(user.getMerchantCode())) {
+                MerchantStore merchantStore = new MerchantStore();
+                merchantStore.setMerchantCode(user.getMerchantCode());
+                List<MerchantStore> merchantStoreList = merchantStoreService.queryMerchantStoreList(merchantStore);
+                // 得到门店集合
+                request.setAttribute("merchantStoreList", merchantStoreList);
+                UserApp userApp = new UserApp();
+                userApp.setUserType("staff");
+                userApp.setMerchantCode(user.getMerchantCode());
+                List<UserApp> userAppList = userAppService.queryUserAppList(userApp);
+                // 得到员工集合
+                request.setAttribute("userAppList", userAppList);
+            }
+        }
+        return "merchantOrder/summaryOfWater";
+    }
+
+    /**
+     * AJAX请求查询汇总流水数据
+     */
+    @RequestMapping(value = "/querySummaryOfWater", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> querySummaryOfWater(SummaryOfWaterDTO summaryOfWaterDTO) {
+        Map<String, Object> result = new HashMap<String, Object>(16);
+        Map<String, Object> map = new HashMap<String, Object>(16);
+        if (StringUtil.isNotEmpty(summaryOfWaterDTO.getPayTypeCodeList())) {
+            map.put("payTypeCodeList", Arrays.asList(summaryOfWaterDTO.getPayTypeCodeList().split(",")));
+        }
+        if (StringUtil.isNotEmpty(summaryOfWaterDTO.getStaffCodeList())) {
+            map.put("staffCodeList", Arrays.asList(summaryOfWaterDTO.getStaffCodeList().split(",")));
+        }
+        if (StringUtil.isNotEmpty(summaryOfWaterDTO.getStoreIdList())) {
+            map.put("storeIdList", Arrays.asList(summaryOfWaterDTO.getStoreIdList().split(",")));
+        }
+        if (StringUtil.isNotEmpty(summaryOfWaterDTO.getTimeStatus())) {
+            map.put("timeStatus", summaryOfWaterDTO.getTimeStatus());
+        }
+        if (StringUtil.isNotEmpty(summaryOfWaterDTO.getMerchantCode())) {
+            map.put("merchantCode", summaryOfWaterDTO.getMerchantCode());
+        } else {
+            return result;
+        }
+        SummaryOfWaterVO summaryOfWaterVO = merchantOrderService.querySummaryOfWater(map);
+        result.put("summaryOfWaterVO", summaryOfWaterVO);
+        return result;
+    }
+
+    /**
+     * 订单退款跳转页
+     *
+     * @return
+     */
+    @GetMapping(value = "/orderRefund")
+    public String orderRefund() {
+        return "merchantOrder/orderRefund";
+    }
+
+    @RequestMapping(value = "/queryOrderRefund", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> queryOrderRefund(@RequestParam(defaultValue = "1") Integer currPage,
+                                                SummaryOfWaterDTO summaryOfWaterDTO) {
+        Map<String, Object> result = new HashMap<String, Object>(16);
+        Map<String, Object> map = new HashMap<String, Object>(16);
+        ShiroUser shiroUser = queryCurrentShiroUser();
+        if (StringUtil.isNotEmpty(shiroUser.getMerchantCode())) {
+            map.put("merchantCode", shiroUser.getMerchantCode());
+        }
+        if (StringUtil.isNotEmpty(summaryOfWaterDTO.getOrderType())) {
+            map.put("orderType", summaryOfWaterDTO.getOrderType());
+        }
+        if (StringUtil.isNotEmpty(summaryOfWaterDTO.getPayTypeCodeList())) {
+            map.put("payTypeCodeList", Arrays.asList(summaryOfWaterDTO.getPayTypeCodeList().split(",")));
+        }
+        if (StringUtil.isNotEmpty(summaryOfWaterDTO.getStaffCodeList())) {
+            map.put("staffCodeList", Arrays.asList(summaryOfWaterDTO.getStaffCodeList().split(",")));
+        }
+        if (StringUtil.isNotEmpty(summaryOfWaterDTO.getStoreIdList())) {
+            map.put("storeIdList", Arrays.asList(summaryOfWaterDTO.getStoreIdList().split(",")));
+        }
+        if (StringUtil.isNotEmpty(summaryOfWaterDTO.getTimeStatus())) {
+            map.put("timeStatus", summaryOfWaterDTO.getTimeStatus());
+        }
+        map.put("pageSize", PAGE_SIZE);
+        map.put("offset", (currPage - 1) * PAGE_SIZE);
+        map.put("status", "2");
+        List<MerchantOrder> merchantOrderList = merchantOrderService.queryMerchantOrderRefundPage(map);
+        Integer count = merchantOrderService.queryMerchantOrderRefundPageCount(map);
+        result.put("merchantOrderList", merchantOrderList);
+        result.put("count", count);
+        result.put("pageCount", StringUtil.getPageCount(count, PAGE_SIZE));
+        result.put("currPage", currPage);
+        return result;
+    }
+
+    /**
+     * 店长审核通过
+     *
+     * @return
+     */
+    @RequestMapping(value = "/buinourPass", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> buinourPass(Integer id) {
+        Map<String, Object> result = new HashMap<String, Object>(16);
+        try {
+            MerchantOrder merchantOrder = new MerchantOrder();
+            merchantOrder.setStatus("2");
+            merchantOrder.setId(id.longValue());
+            merchantOrderService.updateById(merchantOrder);
+            result.put("data", "1");
+        } catch (Exception e) {
+            result.put("data", "0");
+            e.printStackTrace();
+        }
+        return result;
+    }
+
+    /**
+     * 店长审核拒绝
+     *
+     * @return
+     */
+    @RequestMapping(value = "/buinourRefuse", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> buinourRefuse(Integer id) {
+        Map<String, Object> result = new HashMap<String, Object>(16);
+        try {
+            MerchantOrder merchantOrder = new MerchantOrder();
+            merchantOrder.setId(id.longValue());
+            merchantOrder.setStatus("3");
+            merchantOrderService.updateById(merchantOrder);
+            result.put("data", "1");
+        } catch (Exception e) {
+            result.put("data", "0");
+            e.printStackTrace();
+        }
+        return result;
+    }
+
+    /**
+     * 店长退款
+     *
+     * @return
+     */
+    @RequestMapping(value = "/buinourRefund", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> buinourRefund(Integer id) {
+        Map<String, Object> result = new HashMap<>(16);
+        try {
+            MerchantOrder merchantOrder = new MerchantOrder();
+            merchantOrder.setStatus("2");
+            merchantOrder.setId(id.longValue());
+            merchantOrderService.updateById(merchantOrder);
+            result.put("data", "1");
+        } catch (Exception e) {
+            result.put("data", "0");
+            e.printStackTrace();
+        }
+        return result;
+    }
+
+    /**
+     * 店员发起退款
+     *
+     * @return
+     */
+    @RequestMapping(value = "/clerkSponsorRefund", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> clerkSponsorRefund(Integer id) {
+        Map<String, Object> result = new HashMap<>(16);
+        try {
+            MerchantOrder merchantOrder = new MerchantOrder();
+            merchantOrder.setStatus("4");
+            merchantOrder.setId(id.longValue());
+            merchantOrderService.updateById(merchantOrder);
+            result.put("data", "1");
+        } catch (Exception e) {
+            result.put("data", "0");
+            e.printStackTrace();
+        }
+        return result;
+    }
+
+    @RequestMapping(value = "/dowloadExcel", method = RequestMethod.GET)
+    @ResponseBody
+    public void dow(HttpServletResponse response) throws IOException {
+        ShiroUser shiroUser = queryCurrentShiroUser();
+        Boolean isAdmin = verifyUserRole();
+        if (isAdmin) {
+            String[] title = new String[]{"订单号", "商家名称", "门店名称", "支付方式名称", "消费金额", "交易时间", "交易状态"};
+            List<MerchantOrder> merchantOrder = merchantOrderService.list();
+            List<MerchantOrderDVO> mVos = new ArrayList<MerchantOrderDVO>();
+            for (MerchantOrder merchantOrder2 : merchantOrder) {
+                mVos.add(new MerchantOrderDVO(merchantOrder2));
+            }
+            HSSFWorkbook workbook = ExcelUtil.getHSSFWorkbook("管理员", title, mVos);
+            String fileName = "交易查询.xls";
+            download(response, fileName, workbook);
+        } else {
+            if (StringUtil.isNotEmpty(shiroUser.getMerchantCode())) {
+                String[] title = new String[]{"订单号", "商家名称", "门店名称", "支付方式名称", "消费金额", "交易时间", "交易状态"};
+                MerchantOrder m = new MerchantOrder();
+                m.setMerchantCode(shiroUser.getMerchantCode());
+                List<MerchantOrder> merchantOrder = merchantOrderService.list(new QueryWrapper<>(m));
+                List<MerchantOrderDVO> mVos = new ArrayList<MerchantOrderDVO>();
+                for (MerchantOrder merchantOrder2 : merchantOrder) {
+                    mVos.add(new MerchantOrderDVO(merchantOrder2));
+                }
+                HSSFWorkbook workbook = ExcelUtil.getHSSFWorkbook("管理员", title, mVos);
+                String fileName = "交易查询.xls";
+                download(response, fileName, workbook);
+            }
+        }
+    }
+
+    private void download(HttpServletResponse response, String fileName, HSSFWorkbook workbook) throws IOException {
+        // 文件下载
+        String downName = new String(fileName.getBytes("utf-8"), "iso-8859-1");
+        response.setHeader("Content-Disposition", "attachment;filename=" + downName);
+        ServletOutputStream outputStream = response.getOutputStream();
+        workbook.write(outputStream);
+        outputStream.close();
+    }
+
+    @RequestMapping(value = "/dowOrderRefundExcel", method = RequestMethod.GET)
+    @ResponseBody
+    public void dowOrderRefund(HttpServletResponse response) throws IOException {
+        ShiroUser shiroUser = queryCurrentShiroUser();
+        Boolean isAdmin = verifyUserRole();
+        if (isAdmin) {
+            String[] title = new String[]{"订单号", "商家名称", "门店名称", "支付方式名称", "消费金额", "交易流水号", "交易时间", "交易状态"};
+            List<MerchantOrder> merchantOrders = merchantOrderService.list();
+            List<MerchantOrderDVO> mVos = new ArrayList<MerchantOrderDVO>();
+            for (MerchantOrder merchantOrder2 : merchantOrders) {
+                mVos.add(new MerchantOrderDVO(merchantOrder2));
+            }
+            HSSFWorkbook workbook = ExcelUtil.getHSSFWorkbook("管理员", title, mVos);
+            String fileName = "退款订单.xls";
+            download(response, fileName, workbook);
+        } else {
+            if (StringUtil.isNotEmpty(shiroUser.getMerchantCode())) {
+                String[] title = new String[]{"订单号", "商家名称", "门店名称", "支付方式名称", "消费金额", "交易流水号", "交易时间", "交易状态"};
+                MerchantOrder merchantOrder = new MerchantOrder();
+                merchantOrder.setMerchantCode(shiroUser.getMerchantCode());
+                List<MerchantOrder> merchantOrders = merchantOrderService.list(new QueryWrapper<>(merchantOrder));
+                List<MerchantOrderDVO> mVos = new ArrayList<MerchantOrderDVO>();
+                for (MerchantOrder merchantOrder2 : merchantOrders) {
+                    mVos.add(new MerchantOrderDVO(merchantOrder2));
+                }
+                HSSFWorkbook workbook = ExcelUtil.getHSSFWorkbook("管理员", title, mVos);
+                String fileName = "退款订单.xls";
+                download(response, fileName, workbook);
+            }
+        }
+    }
+
+    /**
+     *
+     * querySumEarnings:(查询平台/商家总的收益). <br/>
+     *
+     * @author Administrator
+     * @return
+     * @since JDK 1.8
+     */
+//	@PostMapping(value="/querySumEarnings")
+//	@ResponseBody
+//	public Map<String, Object> querySumEarnings(@RequestParam Map<String,Object> params) {
+//		Map<String, Object> resultMap=new HashMap<String, Object>(16);
+//
+//		Map<String,Object> result = merchantOrderService.querySumCount(params);
+//
+//		//Map<String, Object> map=new HashMap<String, Object>(16);
+//		/*Double shareoneySum1=merchantProfitService.queryMerchantProfitSumPrice(null);
+//		System.out.println("总收益"+shareoneySum1);
+//		//粉丝奖励总额
+//				List<Fans> fansList= fansService.queryFansList(null);
+//		        Double fansShareMoneySum1=0.0;
+//				for(Fans li:fansList) {
+//					String money=li.getShareMoney();
+//					if(money!=null) {
+//						Double d=Double.parseDouble(money);
+//						fansShareMoneySum1+=d;
+//					}
+//				}
+//
+//
+//				//交易总额
+//				Map<String, Object> orderMap = new HashMap<String, Object>();
+//				orderMap.put("status",1);
+//				orderMap.put("limit",1000000000);
+//				orderMap.put("offset",0);
+//				Double orderFeeSum1=0.0;
+//
+//				List<MerchantOrder> merchantOrderList = merchantOrderService.queryMerchantOrderPage(orderMap);
+//				for(MerchantOrder li:merchantOrderList) {
+//					Double money=li.getConsumeFee();
+//					if(money!=null) {
+//						orderFeeSum1+=money;
+//					}
+//				}
+//
+//
+//		*//*
+//		 * map.put("startTime", startTime); map.put("endTime", endTime); Boolean isAdmin
+//		 * = verifyUserRole(); ShiroUser shiroUser = queryCurrentShiroUser();
+//		 * MerchantMangeOrderVO merchantMangeOrderVO =new MerchantMangeOrderVO();
+//		 * if(isAdmin) { merchantMangeOrderVO =
+//		 * merchantOrderService.querySumEarnings(map); resultMap.put("isAdmin", "1");
+//		 * }else { String merchantCode = shiroUser.getMerchantCode();
+//		 * if(StringUtil.isEmpty(merchantCode)) { map.put("merchantCode",
+//		 * StringUtil.genRandomNum(33)); }else { map.put("merchantCode", merchantCode);
+//		 * } merchantMangeOrderVO=merchantOrderService.querySumEarnings(map);
+//		 * resultMap.put("isAdmin", "0"); }
+//		 *//*
+//
+//		//resultMap.put("merchantMangeOrderVO", merchantMangeOrderVO);
+//
+//		Double shareoneySum=StringUtil.bigDecimal(shareoneySum1);
+//		Double fansShareMoneySum=StringUtil.bigDecimal(fansShareMoneySum1);//粉丝奖励金额
+//		Double orderFeeSum=StringUtil.bigDecimal(orderFeeSum1);
+//		Double sum1=fansShareMoneySum+shareoneySum1;//总收益
+//		Double sum=StringUtil.bigDecimal(sum1);
+//		resultMap.put("shareoneySum", shareoneySum);//推广分润
+//		resultMap.put("fansShareMoneySum", fansShareMoneySum);//粉丝奖励总额
+//		resultMap.put("orderFeeSum", orderFeeSum);//实际收益
+//		resultMap.put("sum", sum);//总收益*/
+//		if(result == null){
+//			result = new HashMap<>();
+//		}
+//		return result;
+//	}
+
+    /**
+     * 订单补单参数
+     *
+     * @param id
+     * @return
+     */
+    @RequestMapping(value = "/suppleOrder/{id}", method = RequestMethod.POST)
+    @ResponseBody
+    public Result suppleOrder(@PathVariable("id") Integer id) {
+        try {
+            return merchantOrderService.suppleOrder(id);
+        } catch (Exception e) {
+            e.printStackTrace();
+            MsgException.throwException(e.getMessage());
+        }
+        return ResultGenerator.genFailResult("补单失败");
+    }
+
+    /**
+     * 数据同步
+     */
+    @RequestMapping(value = "/syncPluginOrder", method = RequestMethod.POST)
+    @ResponseBody
+    public Result syncPluginOrder(Date startDate, Date endDate) {
+        int i = DateUtils.differentDaysByMillisecond(startDate, endDate);
+        if (i > 0) {
+            return ResultGenerator.genFailResult("日期相差超过一天");
+        }
+        String date = DateUtils.formatDateDefault(startDate, "yyyyMMdd");
+        String nowDate = DateUtils.formatDateDefault(new Date(), "yyyyMMdd");
+        if (Integer.parseInt(nowDate) - Integer.parseInt(date) < 1) {
+            return ResultGenerator.genFailResult("同步数据的日期不能选择当天的日期！");
+        }
+        try {
+            JSONObject result = ryxService.downloadFtpFile(date);
+            if (result == null) {
+                return ResultGenerator.genFailResult("文件下载失败");
+            }
+            String uploadPath = result.getString("uploadPath");
+            String filePath = result.getString("filePath");
+            //读取文件
+            merchantOrderService.readCSV(filePath);
+            //删除文件
+            FileUtil.del(uploadPath);
+            return ResultGenerator.genSuccessResult("数据同步成功！");
+        } catch (Exception e) {
+            e.printStackTrace();
+            MsgException.throwException(e.getMessage());
+        }
+        return ResultGenerator.genSuccessResult("数据同步失败！");
+    }
+
+    /**
+     * 获取通道对账文件下载地址
+     * @param
+     * @param
+     * @return
+     */
+    @RequestMapping(value = "/getChannelFileUrl", method = RequestMethod.POST)
+    @ResponseBody
+    public Result<Object> getChannelFileUrl(String accountDate,Integer channel,Integer type) {
+        return merchantOrderService.getChannelFileUrl(accountDate,channel,type);
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantProfit/MerchantProfitController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantProfit/MerchantProfitController.java
new file mode 100644
index 0000000..8323982
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantProfit/MerchantProfitController.java
@@ -0,0 +1,53 @@
+package cn.pluss.platform.controller.merchantProfit;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.entity.MerchantProfit;
+import cn.pluss.platform.merchantProfit.MerchantProfitService;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.math.BigDecimal;
+import java.util.Map;
+
+
+/**
+ * 商户订单分润表
+ * @author Administrator
+ * @date: 2022/2/9 18:18
+ */
+@Controller
+@RequestMapping("merchantProfit")
+public class MerchantProfitController extends BaseModelController<MerchantProfitService, MerchantProfit> {
+
+    /**
+     * 引导页
+     *
+     * @return
+     */
+    @RequestMapping(value = "/index", method = RequestMethod.GET)
+    public String index() {
+        return "merchantProfit/list";
+    }
+
+    @Override
+    public Result<Page<MerchantProfit>> page(Page<MerchantProfit> page, MerchantProfit condition, OrderItem orderItem) {
+        orderItem.setColumn("id");
+        orderItem.setAsc(false);
+        return super.page(page, condition, orderItem);
+    }
+
+    @RequestMapping(value = "countData")
+    @ResponseBody
+    public Result<Object> countData(MerchantProfit condition){
+        Map<String, BigDecimal> count = baseService.getProfitAmtCount(condition);
+        return ResultGenerator.genSuccessResult("获取成功",count);
+    }
+}
+
+
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantQrcode/MerchantQrcodeController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantQrcode/MerchantQrcodeController.java
new file mode 100644
index 0000000..c37e05f
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantQrcode/MerchantQrcodeController.java
@@ -0,0 +1,70 @@
+package cn.pluss.platform.controller.merchantQrcode;
+
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.entity.MerchantQrcode;
+import cn.pluss.platform.merchantQrcode.MerchantQrcodeService;
+import cn.pluss.platform.util.OssOperatUtil;
+import cn.pluss.platform.util.StringUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-10-23
+ */
+@Controller
+@RequestMapping("/merchantQrcode")
+public class MerchantQrcodeController{
+
+    @Autowired
+    private MerchantQrcodeService merchantQrcodeService;
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = "/index")
+    public String index() {
+        return "merchantQrcode/list";
+    }
+
+    @GetMapping("/page")
+    @ResponseBody
+    public Result<Page<MerchantQrcode>> queryMerchantQrcodePage(Page<MerchantQrcode> page, MerchantQrcode merchantQrcode) {
+        QueryWrapper<MerchantQrcode> wrapper = new QueryWrapper<>();
+        if (StringUtil.isNotEmpty(merchantQrcode.getUserId())) {
+            wrapper.eq("userId", merchantQrcode.getUserId());
+        }
+        if (StringUtil.isNotEmpty(merchantQrcode.getMerchantName())) {
+            wrapper.eq("merchantName", merchantQrcode.getMerchantName());
+        }
+        if (StringUtil.isNotEmpty(merchantQrcode.getName())) {
+            wrapper.like("userId", merchantQrcode.getName());
+        }
+        wrapper.orderByDesc( "id");
+        Page<MerchantQrcode> result = merchantQrcodeService.page(page, wrapper);
+        return ResultGenerator.genSuccessResult(result);
+    }
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = {"/detail/{id}", "/detail"})
+    public String detail(HttpServletRequest request, @PathVariable(value = "id", required = false) Integer id) {
+        if (id != null) {
+            MerchantQrcode qrcode = new MerchantQrcode().setId(id);
+            qrcode = merchantQrcodeService.getOne(new QueryWrapper<>(qrcode));
+            request.setAttribute("entity", qrcode);
+        }
+        Map<String, String> uploadParam = OssOperatUtil.getUploadParam();
+        request.setAttribute("uploadParam",uploadParam);
+        return "merchantQrcode/detail";
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantRegistAuditRecord/MerchantRegistAuditRecordController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantRegistAuditRecord/MerchantRegistAuditRecordController.java
new file mode 100644
index 0000000..b436969
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantRegistAuditRecord/MerchantRegistAuditRecordController.java
@@ -0,0 +1,158 @@
+package cn.pluss.platform.controller.merchantRegistAuditRecord;
+
+import cn.pluss.platform.controller.BaseNoModelController;
+import cn.pluss.platform.entity.MerchantRegistAuditRecord;
+import cn.pluss.platform.merchantRegistAuditRecord.MerchantRegistAuditRecordService;
+import cn.pluss.platform.util.StringUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Controller
+@RequestMapping("merchantRegistAuditRecord")
+public class MerchantRegistAuditRecordController  extends BaseNoModelController {
+
+	  private Integer PAGE_SIZE=12;
+
+    @Autowired
+	  private MerchantRegistAuditRecordService merchantRegistAuditRecordService;
+
+    /**
+    *引导页
+    * @return
+    */
+    @RequestMapping(value = "/index", method = RequestMethod.GET)
+    public String index() {
+   
+        return "merchantRegistAuditRecord/merchantRegistAuditRecordList";
+    }
+
+    /**
+    *分页查询
+    */
+    @RequestMapping(value = "/queryMerchantRegistAuditRecordByPage", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String,Object> queryMerchantRegistAuditRecordByPage(Integer currPage,Integer id){
+   
+   	if(currPage==null) {
+   	   currPage=1;
+       }
+    	Map<String,Object> map=new HashMap<String, Object>();
+    	map.put("pageSize",PAGE_SIZE);
+    	map.put("offset", (currPage-1)*PAGE_SIZE);
+    	map.put("id",  id);
+    	List<MerchantRegistAuditRecord> merchantRegistAuditRecordList=merchantRegistAuditRecordService.queryMerchantRegistAuditRecordPage(map);
+    	Integer count=merchantRegistAuditRecordService.queryMerchantRegistAuditRecordPageCount(map);
+        Map<String,Object> result=new HashMap<String,Object>();
+        result.put("merchantRegistAuditRecordList", merchantRegistAuditRecordList);
+        result.put("count", count);
+        result.put("pageCount",StringUtil.getPageCount(count,PAGE_SIZE));
+        result.put("currPage", currPage);
+    	  return result;
+    }
+    /**
+    *查询详情
+    */
+     @RequestMapping(value = "/queryMerchantRegistAuditRecordDetails", method = RequestMethod.GET)
+    public String queryMerchantRegistAuditRecordDetails(HttpServletRequest request,Integer id,Integer pageIndex){
+   
+   	  if(id!=null&&id!=0) {
+   		 MerchantRegistAuditRecord merchantRegistAuditRecord=new MerchantRegistAuditRecord();
+   		 merchantRegistAuditRecord.setId(id);
+           merchantRegistAuditRecord=merchantRegistAuditRecordService.queryMerchantRegistAuditRecord(merchantRegistAuditRecord);
+          request.setAttribute("merchantRegistAuditRecord", merchantRegistAuditRecord);
+   		request.setAttribute("pageIndex", pageIndex);
+       	}
+        return "merchantRegistAuditRecord/merchantRegistAuditRecordDetails";
+    }
+    /**
+    *查询详情
+    */
+     @RequestMapping(value = "/queryMerchantRegistAuditRecordBaseInfo", method = RequestMethod.GET)
+    public String queryMerchantRegistAuditRecordBaseInfo(HttpServletRequest request,Integer id,Integer pageIndex){
+   
+   	  if(id!=null&&id!=0) {
+   		MerchantRegistAuditRecord merchantRegistAuditRecord=new MerchantRegistAuditRecord();
+   		merchantRegistAuditRecord.setId(id);
+        merchantRegistAuditRecord=merchantRegistAuditRecordService.queryMerchantRegistAuditRecord(merchantRegistAuditRecord);
+          request.setAttribute("merchantRegistAuditRecord", merchantRegistAuditRecord);
+   		request.setAttribute("pageIndex", pageIndex);
+       	}
+        return "merchantRegistAuditRecord/merchantRegistAuditRecordBaseInfo";
+    }
+    /**
+    *查询详情
+    */
+     @RequestMapping(value = "/queryMerchantRegistAuditRecordExtendsInfo", method = RequestMethod.GET)
+    public String queryMerchantRegistAuditRecordExtendsInfo(){
+   
+        return "merchantRegistAuditRecord/merchantRegistAuditRecordExtendsInfo";
+    }
+    /**
+    *查询详情
+    */
+     @RequestMapping(value = "/queryMerchantRegistAuditRecordFunctionsInfo", method = RequestMethod.GET)
+    public String queryMerchantRegistAuditRecordFunctionsInfo(){
+   
+        return "merchantRegistAuditRecord/merchantRegistAuditRecordFunctionsInfo";
+    }
+    /**
+    *保存对象
+    *@throws IOException
+    */
+    @RequestMapping(value = "/saveMerchantRegistAuditRecord", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String,Object> saveMerchantRegistAuditRecord(MerchantRegistAuditRecord merchantRegistAuditRecord){
+   
+       if(merchantRegistAuditRecord.getId()!=null&&merchantRegistAuditRecord.getId()!=0){
+    		merchantRegistAuditRecordService.updateMerchantRegistAuditRecord(merchantRegistAuditRecord);
+    	 }else{  
+      	merchantRegistAuditRecordService.saveMerchantRegistAuditRecord(merchantRegistAuditRecord);
+    	 }  
+		Map<String,Object> result=new HashMap<String,Object>();
+    	result.put("resultCode", "1");
+    	result.put("resultMessage", "保存成功!");
+    	return result;
+    }
+    /**
+    *修改对象
+    *@throws IOException
+    */
+    @RequestMapping(value = "/updateMerchantRegistAuditRecord", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String,Object> updateMerchantRegistAuditRecord(Integer id){
+   
+   	MerchantRegistAuditRecord merchantRegistAuditRecord=new MerchantRegistAuditRecord();
+   	merchantRegistAuditRecord.setId(id);
+      merchantRegistAuditRecordService.updateMerchantRegistAuditRecord(merchantRegistAuditRecord);
+   	Map<String,Object> result=new HashMap<String,Object>();
+    	result.put("resultCode", "1");
+    	result.put("resultMessage", "保存成功!");
+    	return result;
+    }
+    /**
+    *删除对象
+    *@throws IOException
+    */
+    @RequestMapping(value = "/deleteMerchantRegistAuditRecord", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String,Object> deleteMerchantRegistAuditRecord(Integer id){
+   	MerchantRegistAuditRecord merchantRegistAuditRecord=new MerchantRegistAuditRecord();
+   	merchantRegistAuditRecord.setId(id);
+		merchantRegistAuditRecordService.deleteMerchantRegistAuditRecord(merchantRegistAuditRecord);
+		Map<String,Object> result=new HashMap<String,Object>();
+    	result.put("resultCode", "1");
+    	result.put("resultMessage", "保存成功!");
+    	return result;
+    }
+
+}
+
+
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantRegistLog/MerchantRegistLogController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantRegistLog/MerchantRegistLogController.java
new file mode 100644
index 0000000..c255268
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantRegistLog/MerchantRegistLogController.java
@@ -0,0 +1,158 @@
+package cn.pluss.platform.controller.merchantRegistLog;
+
+import cn.pluss.platform.controller.BaseNoModelController;
+import cn.pluss.platform.entity.MerchantRegistLog;
+import cn.pluss.platform.merchantRegistLog.MerchantRegistLogService;
+import cn.pluss.platform.util.StringUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Controller
+@RequestMapping("merchantRegistLog")
+public class MerchantRegistLogController  extends BaseNoModelController {
+
+	  private Integer PAGE_SIZE=12;
+
+    @Autowired
+	  private MerchantRegistLogService merchantRegistLogService;
+
+    /**
+    *引导页
+    * @return
+    */
+    @RequestMapping(value = "/index", method = RequestMethod.GET)
+    public String index() {
+   
+        return "merchantRegistLog/merchantRegistLogList";
+    }
+
+    /**
+    *分页查询
+    */
+    @RequestMapping(value = "/queryMerchantRegistLogByPage", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String,Object> queryMerchantRegistLogByPage(Integer currPage,Integer id){
+   
+   	if(currPage==null) {
+   	   currPage=1;
+       }
+    	Map<String,Object> map=new HashMap<String, Object>();
+    	map.put("pageSize",PAGE_SIZE);
+    	map.put("offset", (currPage-1)*PAGE_SIZE);
+    	map.put("id",  id);
+    	List<MerchantRegistLog> merchantRegistLogList=merchantRegistLogService.queryMerchantRegistLogPage(map);
+    	Integer count=merchantRegistLogService.queryMerchantRegistLogPageCount(map);
+        Map<String,Object> result=new HashMap<String,Object>();
+        result.put("merchantRegistLogList", merchantRegistLogList);
+        result.put("count", count);
+        result.put("pageCount",StringUtil.getPageCount(count,PAGE_SIZE));
+        result.put("currPage", currPage);
+    	  return result;
+    }
+    /**
+    *查询详情
+    */
+     @RequestMapping(value = "/queryMerchantRegistLogDetails", method = RequestMethod.GET)
+    public String queryMerchantRegistLogDetails(HttpServletRequest request,Integer id,Integer pageIndex){
+   
+   	  if(id!=null&&id!=0) {
+   		 MerchantRegistLog merchantRegistLog=new MerchantRegistLog();
+   		 merchantRegistLog.setId(id);
+           merchantRegistLog=merchantRegistLogService.queryMerchantRegistLog(merchantRegistLog);
+          request.setAttribute("merchantRegistLog", merchantRegistLog);
+   		request.setAttribute("pageIndex", pageIndex);
+       	}
+        return "merchantRegistLog/merchantRegistLogDetails";
+    }
+    /**
+    *查询详情
+    */
+     @RequestMapping(value = "/queryMerchantRegistLogBaseInfo", method = RequestMethod.GET)
+    public String queryMerchantRegistLogBaseInfo(HttpServletRequest request,Integer id,Integer pageIndex){
+   
+   	  if(id!=null&&id!=0) {
+   		MerchantRegistLog merchantRegistLog=new MerchantRegistLog();
+   		merchantRegistLog.setId(id);
+        merchantRegistLog=merchantRegistLogService.queryMerchantRegistLog(merchantRegistLog);
+          request.setAttribute("merchantRegistLog", merchantRegistLog);
+   		request.setAttribute("pageIndex", pageIndex);
+       	}
+        return "merchantRegistLog/merchantRegistLogBaseInfo";
+    }
+    /**
+    *查询详情
+    */
+     @RequestMapping(value = "/queryMerchantRegistLogExtendsInfo", method = RequestMethod.GET)
+    public String queryMerchantRegistLogExtendsInfo(){
+   
+        return "merchantRegistLog/merchantRegistLogExtendsInfo";
+    }
+    /**
+    *查询详情
+    */
+     @RequestMapping(value = "/queryMerchantRegistLogFunctionsInfo", method = RequestMethod.GET)
+    public String queryMerchantRegistLogFunctionsInfo(){
+   
+        return "merchantRegistLog/merchantRegistLogFunctionsInfo";
+    }
+    /**
+    *保存对象
+    *@throws IOException
+    */
+    @RequestMapping(value = "/saveMerchantRegistLog", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String,Object> saveMerchantRegistLog(MerchantRegistLog merchantRegistLog){
+   
+       if(merchantRegistLog.getId()!=null&&merchantRegistLog.getId()!=0){
+    		merchantRegistLogService.updateMerchantRegistLog(merchantRegistLog);
+    	 }else{  
+      	merchantRegistLogService.saveMerchantRegistLog(merchantRegistLog);
+    	 }  
+		Map<String,Object> result=new HashMap<String,Object>();
+    	result.put("resultCode", "1");
+    	result.put("resultMessage", "保存成功!");
+    	return result;
+    }
+    /**
+    *修改对象
+    *@throws IOException
+    */
+    @RequestMapping(value = "/updateMerchantRegistLog", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String,Object> updateMerchantRegistLog(Integer id){
+   
+   	MerchantRegistLog merchantRegistLog=new MerchantRegistLog();
+   	merchantRegistLog.setId(id);
+      merchantRegistLogService.updateMerchantRegistLog(merchantRegistLog);
+   	Map<String,Object> result=new HashMap<String,Object>();
+    	result.put("resultCode", "1");
+    	result.put("resultMessage", "保存成功!");
+    	return result;
+    }
+    /**
+    *删除对象
+    *@throws IOException
+    */
+    @RequestMapping(value = "/deleteMerchantRegistLog", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String,Object> deleteMerchantRegistLog(Integer id){
+   	MerchantRegistLog merchantRegistLog=new MerchantRegistLog();
+   	merchantRegistLog.setId(id);
+		merchantRegistLogService.deleteMerchantRegistLog(merchantRegistLog);
+		Map<String,Object> result=new HashMap<String,Object>();
+    	result.put("resultCode", "1");
+    	result.put("resultMessage", "保存成功!");
+    	return result;
+    }
+
+}
+
+
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantRejectDesc/MerchantRejectDescController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantRejectDesc/MerchantRejectDescController.java
new file mode 100644
index 0000000..9399aee
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantRejectDesc/MerchantRejectDescController.java
@@ -0,0 +1,53 @@
+package cn.pluss.platform.controller.merchantRejectDesc;
+
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.entity.MerchantRejectDesc;
+import cn.pluss.platform.merchantRejectDesc.MerchantRejectDescService;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author bzg
+ * @since 2021-01-11
+ */
+@Controller
+@RequestMapping("/merchantRejectDesc")
+public class MerchantRejectDescController extends BaseModelController<MerchantRejectDescService, MerchantRejectDesc> {
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = "/index")
+    public String index(HttpServletRequest request) {
+        Integer sort = this.baseService.getMaxSort();
+        request.setAttribute("sort",sort);
+        return "merchantRejectDesc/list";
+    }
+
+
+    @Override
+    public Result<Page<MerchantRejectDesc>> page(Page<MerchantRejectDesc> page, MerchantRejectDesc condition, OrderItem orderItem) {
+        orderItem.setAsc(false).setColumn("sort");
+        return super.page(page, condition, orderItem);
+    }
+
+    @PostMapping("saveOrUpdate")
+    @ResponseBody
+    public Result<String> saveOrUpdate(@RequestBody MerchantRejectDesc merchantRejectDesc) {
+        if (merchantRejectDesc.getId() != null){
+            this.baseService.updateById(merchantRejectDesc);
+        }else {
+            this.baseService.save(merchantRejectDesc);
+        }
+        return ResultGenerator.genSuccessResult("保存成功");
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantStore/MerchantStoreController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantStore/MerchantStoreController.java
new file mode 100644
index 0000000..2d8e9ea
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantStore/MerchantStoreController.java
@@ -0,0 +1,725 @@
+package cn.pluss.platform.controller.merchantStore;
+
+import cn.pluss.platform.annotation.PassToken;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.channel.MerchantAuditService;
+import cn.pluss.platform.common.CommonRemarkService;
+import cn.pluss.platform.controller.BaseNoModelController;
+import cn.pluss.platform.entitiy.ShiroUser;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.mapper.MerchantChannelStatusMapper;
+import cn.pluss.platform.mapper.OperationRecordMapper;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchant.MerchantPluginService;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.merchantImage.MerchantImageService;
+import cn.pluss.platform.merchantStore.MerchantStoreService;
+import cn.pluss.platform.operationRecord.OperationRecordService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.util.*;
+import cn.pluss.platform.vo.StoreInfoVO;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.*;
+import java.util.concurrent.ExecutorService;
+
+@Slf4j
+@Controller
+@RequestMapping("merchantStore")
+public class MerchantStoreController extends BaseNoModelController {
+
+    @Setter(onMethod_ = {@Autowired})
+    private HttpServletRequest request;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantStoreService merchantStoreService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private OperationRecordService operationRecordService;
+
+    @Resource
+    private OperationRecordMapper opRecordMapper;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantBaseInfoService merchantBaseInfoService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantChannelStatusService mcsService;
+
+    @Autowired
+    private MerchantChannelStatusMapper mcsMapper;
+
+    @Setter(onMethod_ = {@Autowired})
+    private UserAppService userAppService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantPluginService merchantPluginService;
+
+    @Setter(onMethod_ = {@Autowired, @Lazy})
+    private MerchantImageService merchantImageService;
+
+    @Setter(onMethod_ = {@Autowired, @Lazy})
+    private CommonRemarkService remarkService;
+
+
+    @Setter(onMethod_ = {@Autowired, @Qualifier("ysAuditServiceV2")})
+    private MerchantAuditService ysAuditServiceV2;
+
+
+    /**
+     * 引导页
+     */
+    @GetMapping(value = "/index")
+    public String index() {
+        return "merchantStore/merchantStoreList";
+    }
+
+    /**
+     * 分页查询
+     */
+    @RequestMapping(value = "/queryMerchantStoreByPage", method = {RequestMethod.POST, RequestMethod.GET})
+    @ResponseBody
+    public Map<String, Object> queryMerchantStoreByPage(@RequestParam(defaultValue = "1") Integer currPage,
+                                                        Integer size, MerchantStore merchantStore, MerchantBaseInfo merchantBaseInfo, String merchantType, String userId) {
+        return merchantStoreService.queryMerchantStoreByPage(currPage, size, merchantStore, merchantBaseInfo, merchantType, userId);
+    }
+
+    @GetMapping(value = "/merchantStoreForbidden")
+    public ModelAndView forbidden(@RequestParam(value = "id") Integer id, String resultValue, ModelAndView view) {
+        view.setViewName("merchantStore/merchantStoreForbidden");
+        view.addObject("resultValue", resultValue);
+        view.addObject("id", id);
+        return view;
+    }
+
+    @PostMapping(value = "/disableMerchantStore")
+    @ResponseBody
+    public Map<String, Object> disableMerchantStore(Integer id, String resultValue, String remark) {
+        ShiroUser shiroUser = queryCurrentShiroUser();
+        Map<String, Object> params = new HashMap<>(2);
+        OperationRecord operationRecord = new OperationRecord();
+        operationRecord.setOperator(String.valueOf(shiroUser.getId()));
+        //封装被操作人ID
+        operationRecord.setUserId(String.valueOf(id));
+        operationRecord.setCreateTime(new Date());
+        operationRecord.setRemark(remark);
+
+        if ("2".equals(resultValue)) {
+            merchantStoreService.enableMerchantStore(shiroUser.getId(), id.longValue(), remark);
+        } else if ("1".equals(resultValue)) {
+            merchantStoreService.disableMerchantStore(shiroUser.getId(), id.longValue(), remark);
+        }
+
+        Map<String, Object> result = new HashMap<>();
+        result.put("resultCode", "1");
+        result.put("msg", "保存成功!");
+        return result;
+    }
+
+    @GetMapping(value = "/merchantStorePath")
+    public String merchantStorePath() {
+        String ids = request.getParameter("id");
+        Integer id = Integer.valueOf(ids);
+        System.out.println("id=" + id);
+        request.setAttribute("id", id);
+        return "merchantStore/merchantStoreParticulars";
+    }
+
+    @PostMapping(value = "/queryMerchantStoreParticulars")
+    @ResponseBody
+    public Map<String, Object> queryMerchantStoreParticulars(@RequestParam(defaultValue = "1") Integer currPage, @RequestParam Integer id) {
+        Map<String, Object> result = new HashMap<>();
+        Map<String, Object> map = new HashMap<>();
+        int pageSize = 12;
+        map.put("pageSize", pageSize);
+        map.put("offset", (currPage - 1) * pageSize);
+        map.put("id", id);
+        List<OperationRecord> operationRecordList = operationRecordService.selectOne(map);
+        Integer count = operationRecordService.selectParticularsCount(map);
+        boolean admin = verifyUserRole();
+        result.put("admin", admin);
+        result.put("operationRecordList", operationRecordList);
+        result.put("count", count);
+        result.put("pageCount", StringUtil.getPageCount(count, pageSize));
+        result.put("currPage", currPage);
+        return result;
+    }
+
+    @PostMapping(value = "/merchantStorePayEcdemicSwitch")
+    @ResponseBody
+    public Map<String, Object> selectPayEcdemicSwitch(@RequestParam(value = "id") Integer id) {
+        StoreInfoVO storeInfoVO = merchantStoreService.selectParticulars(id);
+        if (storeInfoVO == null) {
+            storeInfoVO = new StoreInfoVO();
+        }
+
+        String payEcdemicSwitch = storeInfoVO.getPayEcdemicSwitch();
+        if (payEcdemicSwitch == null) {
+            payEcdemicSwitch = "0";
+        }
+        Map<String, Object> result = new HashMap<>();
+        result.put("payEcdemicSwitch", payEcdemicSwitch);
+        result.put("resultCode", "1");
+        result.put("msg", "保存成功!");
+        return result;
+    }
+
+    @PostMapping(value = "/updateChannelStatus")
+    @ResponseBody
+    public Result<?> updateChannelStatus(@RequestParam(value = "csId") Integer csId, @RequestParam(value = "status") String status) {
+        MerchantChannelStatus channelStatus = new MerchantChannelStatus();
+        channelStatus.setId(csId);
+        channelStatus = mcsService.getByIdLock(csId);
+        merchantStoreService.updateChannelStatusAndWxCert(channelStatus, status);
+        return ResultGenerator.genSuccessResult("操作成功", null);
+    }
+
+    @GetMapping(value = "/merchantStoreThoroughfare")
+    public ModelAndView thoroughfare(Integer id, String payEcdemicSwitch, ModelAndView view) {
+        view.setViewName("merchantStore/merchantStoreTthoroughfare");
+        view.addObject("payEcdemicSwitch", payEcdemicSwitch);
+        view.addObject("id", id);
+        return view;
+    }
+
+    @PostMapping(value = "/payEcdemicSwitchMerchantStore")
+    @ResponseBody
+    public Map<String, Object> payEcdemicSwitchMerchantStore(@RequestParam(value = "id") Integer id, String payEcdemicSwitch, String remark) {
+        ShiroUser shiroUser = queryCurrentShiroUser();
+        Map<String, Object> params = new HashMap<>(2);
+        OperationRecord operationRecord = new OperationRecord();
+        operationRecord.setOperator(String.valueOf(shiroUser.getId()));
+        //封装被操作人ID
+        operationRecord.setUserId(String.valueOf(id));
+        operationRecord.setCreateTime(new Date());
+        operationRecord.setRemark(remark);
+        if ("1".equals(payEcdemicSwitch)) {
+            payEcdemicSwitch = "0";
+            operationRecord.setDictValue("GBGRDZWL");
+        } else if ("0".equals(payEcdemicSwitch)) {
+            payEcdemicSwitch = "1";
+            operationRecord.setDictValue("KTGRDZWL");
+        }
+        opRecordMapper.insert(operationRecord);
+        params.put("id", id);
+        params.put("payEcdemicSwitch", payEcdemicSwitch);
+        merchantStoreService.pesUpdateMerchantStore(params);
+        Map<String, Object> result = new HashMap<>();
+        result.put("resultCode", "1");
+        result.put("msg", "保存成功!");
+        return result;
+    }
+
+    @PostMapping(value = "/operatMarket")
+    @ResponseBody
+    public Map<String, Object> operateMarket(@RequestParam(value = "ids[]") Integer[] ids, String isMarker) {
+        Map<String, Object> params = new HashMap<>(2);
+        params.put("ids", ids);
+        params.put("isMarker", isMarker);
+        merchantStoreService.operatMarketMerchantStore(params);
+        Map<String, Object> result = new HashMap<>();
+        result.put("resultCode", "1");
+        result.put("msg", "保存成功!");
+        return result;
+    }
+
+    @PostMapping("/queryStatus")
+    @ResponseBody
+    public Map<String, Object> queryStatus(@RequestParam(value = "id") Integer id) {
+        Map<String, Object> params = new HashMap<>(2);
+        params.put("id", id);
+        StoreInfoVO storeInfoVO = merchantStoreService.selectStatus(params);
+        int resultValue;
+        if ("2".equals(storeInfoVO.getStatus())) {
+            resultValue = 2;
+        } else {
+            resultValue = 1;
+        }
+        Map<String, Object> result = new HashMap<>();
+        result.put("resultCode", "1");
+        result.put("resultValue", resultValue);
+        result.put("msg", "保存成功!");
+        return result;
+    }
+
+    /**
+     * 查询详情
+     */
+    @GetMapping("/queryMerchantStoreDetails")
+    public String queryMerchantStoreDetails(HttpServletRequest request, Integer id, Integer pageIndex) {
+
+        if (id != null && id != 0) {
+            MerchantStore merchantStore = new MerchantStore();
+            merchantStore.setId(id);
+            merchantStore = merchantStoreService.queryMerchantStore(merchantStore);
+            request.setAttribute("merchantStore", merchantStore);
+            request.setAttribute("pageIndex", pageIndex);
+        }
+        return "merchantStore/merchantStoreDetails";
+    }
+
+    /**
+     * 查询详情
+     */
+    @GetMapping("/showMerchantStoreReceipt")
+    @ResponseBody
+    public Map<String, Object> showMerchantStoreReceipt(Integer userId, Integer channel) {
+        Map<String, Object> result = new HashMap<>(3);
+        if (userId != null && userId != 0) {
+            StoreInfoVO queryStoreInfoVO = merchantStoreService.showMerchantStoreReceipt(userId);
+            String url = ParametersUtil.domain + "/wap/merchant/authPay?userAppId=" + queryStoreInfoVO.getUserId() + "&channel=" + channel;
+            result.put("url", url);
+            result.put("storeName", queryStoreInfoVO.getStoreName());
+            result.put("code", "1");
+            result.put("msg", "获取成功！");
+            return result;
+        }
+        result.put("code", "0");
+        result.put("msg", "获取失败！");
+        return result;
+    }
+
+    /**
+     * 查询详情
+     */
+    @GetMapping("/queryMerchantStoreBaseInfo")
+    public String queryMerchantStoreBaseInfo(HttpServletRequest request, Integer id, Integer pageIndex) {
+        MerchantStore merchantStore = new MerchantStore();
+        ShiroUser user = queryCurrentShiroUser();
+        if (id != null && id != 0) {
+            merchantStore.setId(id);
+            merchantStore = merchantStoreService.queryMerchantStore(merchantStore);
+            request.setAttribute("merchantStore", merchantStore);
+            request.setAttribute("pageIndex", pageIndex);
+        } else {
+            //添加时存入MerchantCode商户编码 前台根据有无判断是否有资格添加门店
+            merchantStore.setMerchantCode(user.getMerchantCode());
+            request.setAttribute("merchantStore", merchantStore);
+        }
+        getRole();
+        List<MerchantBaseInfo> merchantBaseInfoList = merchantBaseInfoService.queryMerchantBaseInfoList(null);
+        request.setAttribute("merchantBaseInfoList", merchantBaseInfoList);
+        return "merchantStore/merchantStoreBaseInfo";
+    }
+
+    /**
+     * 保存对象
+     */
+    @PostMapping("/saveMerchantStore")
+    @ResponseBody
+    public Map<String, Object> saveMerchantStore(MerchantStore merchantStore) {
+        MerchantBaseInfo merchantBaseInfo = new MerchantBaseInfo();
+
+        if (merchantStore.getId() != null && merchantStore.getId() != 0) {
+            List<MerchantBaseInfo> queryMerchantBaseInfoList = merchantBaseInfoService.queryMerchantBaseInfoList(merchantBaseInfo);
+            if (queryMerchantBaseInfoList != null && !queryMerchantBaseInfoList.isEmpty()) {
+                merchantBaseInfo = queryMerchantBaseInfoList.get(0);
+                merchantStore.setEmail(merchantBaseInfo.getEmail());
+                merchantStore.setMerchantName(merchantBaseInfo.getMerchantName());
+            }
+        } else {
+            //不管是不是管理员的增加
+            merchantStore.setStoreId(StringUtil.genRandomNum(5));
+            List<MerchantBaseInfo> queryMerchantBaseInfoList = merchantBaseInfoService.queryMerchantBaseInfoList(merchantBaseInfo);
+            if (queryMerchantBaseInfoList != null && !queryMerchantBaseInfoList.isEmpty()) {
+                merchantBaseInfo = queryMerchantBaseInfoList.get(0);
+                merchantStore.setEmail(merchantBaseInfo.getEmail());
+                merchantStore.setMerchantName(merchantBaseInfo.getMerchantName());
+            }
+        }
+        Map<String, Object> result = new HashMap<>();
+        //判断是否是管理员
+        if (merchantStore.getId() != null && merchantStore.getId() != 0) {
+            merchantStoreService.updateMerchantStore(merchantStore);
+        } else {
+            merchantStoreService.saveMerchantStore(merchantStore);
+        }
+
+        return result;
+    }
+
+    /**
+     * 修改对象
+     */
+    @PostMapping("/updateMerchantStore")
+    @ResponseBody
+    public Map<String, Object> updateMerchantStore(Integer id) {
+
+        MerchantStore merchantStore = new MerchantStore();
+        merchantStore.setId(id);
+        merchantStoreService.updateMerchantStore(merchantStore);
+        Map<String, Object> result = new HashMap<>();
+        result.put("resultCode", "1");
+        result.put("resultMessage", "保存成功!");
+        return result;
+    }
+
+    /**
+     * 删除对象
+     */
+    @PostMapping("/deleteMerchantStore")
+    @ResponseBody
+    public Map<String, Object> deleteMerchantStore(Integer id) {
+        MerchantStore merchantStore = new MerchantStore();
+        merchantStore.setId(id);
+        merchantStoreService.deleteMerchantStore(merchantStore);
+        Map<String, Object> result = new HashMap<>();
+        result.put("resultCode", "1");
+        result.put("resultMessage", "保存成功!");
+        return result;
+    }
+
+
+    /**
+     * 手动后台发起进件
+     */
+    @PassToken
+    @GetMapping(value = "/manualMerchantIncom/{userId}/{id}/{merchantCode}")
+    @ResponseBody
+    public Map<String, Object> manualMerchantIncome(@PathVariable("userId") Integer userId, @PathVariable("id") String id, @PathVariable("merchantCode") String merchantCode) {
+        JSONObject params = new JSONObject();
+        Map<String, Object> result = new HashMap<>(2);
+        params.put("userId", userId + "");
+        try {
+            if (StringUtils.isEmpty(id) || "undefined".equals(id)) {
+                QueryWrapper<MerchantChannelStatus> queryWrapper = new QueryWrapper<MerchantChannelStatus>().eq("merchantCode", merchantCode);
+                MerchantChannelStatus one = mcsService.getOne(queryWrapper);
+                one.setStatus(MerchantChannelStatus.AUDIT_STATUS_EXAMINING);
+                one.setThirdStatus(MerchantChannelStatus.AUDIT_THIRD_STATUS_WAITING);
+                mcsService.updateById(one);
+                id = String.valueOf(one.getChannel());
+            }
+
+            userAppService.merchantAudit(params, id);
+
+            result.put("code", "1");
+            result.put("msg", "发起进件成功，等待审核中！");
+            return result;
+        } catch (Exception e) {
+            e.printStackTrace();
+            result.put("code", "0");
+            result.put("msg", e.getMessage());
+            return result;
+        }
+    }
+
+    /**
+     * 手动后台发起进件
+     */
+    @PostMapping(value = "/reAuditYs/{merchantCode}")
+    @ResponseBody
+    public Map<String, Object> reAuditYs(@PathVariable("merchantCode") String merchantCode) {
+        MerchantChannelStatus mcs = mcsService.getByMerchantCode(merchantCode, 4);
+        UserApp ua = new UserApp();
+        ua.setMerchantCode(merchantCode);
+        ua.setUserType("promoter");
+        ua = userAppService.getOne(new QueryWrapper<>(ua));
+        if (mcs == null) {
+            mcs = new MerchantChannelStatus();
+        } else {
+            if (mcs.getStatus().equals(MerchantChannelStatus.AUDIT_STATUS_EXAMINING) && !mcs.getThirdStatus().equals(MerchantChannelStatus.AUDIT_THIRD_STATUS_WAITING)) {
+                Map<String, Object> result = new HashMap<>(2);
+                result.put("code", "0");
+                result.put("msg", "该商户进件正在审核中");
+                return result;
+            }
+        }
+
+        mcs.setStatus(MerchantChannelStatus.AUDIT_STATUS_EXAMINING);
+        mcs.setMerchantCode(merchantCode);
+        mcs.setThirdStatus(MerchantChannelStatus.AUDIT_THIRD_STATUS_WAITING);
+        mcs.setAuthorizationStatus(MerchantChannelStatus.AUTHORIZATION_STATUS_UNAUTHORIZED);
+        mcs.setValid(0);
+
+        if (mcs.getId() == null) {
+            mcsMapper.insert(mcs);
+        } else {
+            mcsMapper.updateById(mcs);
+        }
+
+        Map<String, Object> result = new HashMap<>(2);
+        try {
+            JSONObject params = new JSONObject();
+            params.put("userId", ua.getUserId() + "");
+            ysAuditServiceV2.merchantAudit(ua.getUserId() + "", false);
+            // userAppService.merchantAudit(params, "4");
+            result.put("code", "1");
+            result.put("msg", "发起进件成功, 稍后查看进件状态");
+            return result;
+        } catch (Exception e) {
+            e.printStackTrace();
+            result.put("code", "0");
+            result.put("msg", e.getMessage());
+            return result;
+        }
+    }
+
+    /**
+     * 进件审核驳回
+     */
+    @PassToken
+    @GetMapping(value = "/rejectAudit/{userId}")
+    @ResponseBody
+    public Map<String, Object> rejectAudit(@PathVariable("userId") Integer userId, String errMsg) {
+        UserApp userApp = new UserApp().setUserId(userId.longValue()).setUserType("promoter");
+        userApp = userAppService.queryUserApp(userApp);
+
+        Map<String, Object> result = new HashMap<>(2);
+        try {
+            mcsService.rejectAudit(userApp.getMerchantCode(), errMsg);
+            result.put("code", "1");
+            result.put("msg", "处理成功");
+        } catch (Exception e) {
+            result.put("code", "0");
+            result.put("msg", e.getMessage());
+        }
+
+        return result;
+    }
+
+    /**
+     * 进件审核驳回
+     */
+    @PostMapping(value = "/canAudit")
+    @ResponseBody
+    public Map<String, Object> rejectAudit(@RequestParam Integer userId) {
+        LambdaQueryWrapper<CommonRemark> qWrapper = new LambdaQueryWrapper<>();
+        qWrapper.eq(CommonRemark::getCode, "CAN_AUDIT")
+                .eq(CommonRemark::getUserId, userId);
+
+        remarkService.remove(qWrapper);
+
+        Map<String, Object> result = new HashMap<>(2);
+        result.put("code", "1");
+        result.put("msg", "处理成功");
+        return result;
+    }
+
+    /**
+     * 进件审核驳回
+     */
+    @GetMapping(value = "/rejectAudit2/{userId}")
+    @ResponseBody
+    public Map<String, Object> rejectAudit2(@PathVariable("userId") Integer userId, String errMsg) {
+        UserApp userApp = new UserApp().setUserId(userId.longValue()).setUserType("promoter");
+        userApp = userAppService.queryUserApp(userApp);
+
+        Map<String, Object> result = new HashMap<>(2);
+        try {
+            CommonRemark commonRemark = new CommonRemark()
+                    .setRemark("-1")
+                    .setUserId(userId)
+                    .setCode("CAN_AUDIT");
+            remarkService.save(commonRemark);
+            mcsService.rejectAudit(userApp.getMerchantCode(), errMsg);
+            result.put("code", "1");
+            result.put("msg", "处理成功");
+        } catch (Exception e) {
+            result.put("code", "0");
+            result.put("msg", e.getMessage());
+        }
+
+        return result;
+    }
+
+    /**
+     * 进件审核驳回
+     */
+    @GetMapping(value = "/rejectPluginAudit/{userId}")
+    @ResponseBody
+    public Map<String, Object> rejectPluginAudit(@PathVariable("userId") Integer userId, String errMsg) {
+        UserApp userApp = new UserApp().setUserId(userId.longValue());
+        userApp = userAppService.queryUserApp(userApp);
+
+        Map<String, Object> result = new HashMap<>(2);
+        try {
+            merchantPluginService.refuse(userApp.getUserId().toString(), errMsg);
+            result.put("code", "1");
+            result.put("msg", "处理成功");
+        } catch (Exception e) {
+            result.put("code", "0");
+            result.put("msg", e.getMessage());
+            return result;
+        }
+
+
+        return result;
+    }
+
+    /**
+     * 手动后台批量发起进件
+     */
+    @GetMapping(value = "/batchMerchantIncom")
+    @ResponseBody
+    public Map<String, Object> manualMerchantIncom() {
+        Map<String, Object> result = new HashMap<>();
+        merchantStoreService.manualMerchantIncom();
+        result.put("code", "1");
+        result.put("msg", "进件任务执行中...");
+        return result;
+    }
+
+    /**
+     * 插件审核
+     */
+    @PassToken
+    @GetMapping(value = "/audit/{userId}")
+    @ResponseBody
+    public Map<String, Object> audit(@PathVariable("userId") Integer userId) {
+        Map<String, Object> result = new HashMap<>();
+        try {
+            merchantPluginService.audit(String.valueOf(userId));
+            result.put("code", "200");
+            result.put("msg", "进件任务执行中...");
+        } catch (Exception e) {
+            result.put("code", "0");
+            result.put("msg", e.getMessage());
+        }
+
+        return result;
+    }
+
+    /**
+     * @param file:
+     * @return cn.pluss.platform.api.Result<?>
+     * @description:批量导入d0excel开通文件
+     * @date: 2021/8/4 11:46
+     */
+    @RequestMapping(value = "/exportD0Excel")
+    @ResponseBody
+    public Result<?> exportD0Excel(@RequestParam("file") MultipartFile file) {
+        return merchantStoreService.exportD0Excel(file);
+    }
+
+
+    @GetMapping("/dowloadD0QuicklyExcel")
+    @ResponseBody
+    public void dowloadD0QuicklyExcel(HttpServletResponse response, String startTime, String endTime) throws IOException {
+        if (StringUtils.isEmpty(startTime)) {
+            return;
+        }
+        if (StringUtils.isEmpty(endTime)) {
+            return;
+        }
+        String suffix = ".zip";
+        QueryWrapper<MerchantChannelStatus> queryWrapper = new QueryWrapper<MerchantChannelStatus>()
+                .in("status", MerchantChannelStatus.AUDIT_STATUS_QUICK_CASH, MerchantChannelStatus.AUDIT_STATUS_EXAMINING)
+                .eq("channel", 4)
+                .ne("thirdStatus", MerchantChannelStatus.AUDIT_THIRD_STATUS_WAITING)
+                .between("createTime", startTime, endTime);
+        List<MerchantChannelStatus> list = mcsService.list(queryWrapper);
+        if (list.isEmpty()) {
+            return;
+        }
+        String tempName = DateUtils.formatDateDefault(DateUtils.parse(startTime, "yyyy-MM-dd HH:mm:ss"), "yyyyMMddHHmm") + "快付审核";
+        String uploadTempPath = "/home/syb/resources/d0/temp";
+        Properties prop = System.getProperties();
+        String os = prop.getProperty("os.name");
+        if (os.startsWith("win") || os.startsWith("Win")) {
+            uploadTempPath = "E:/crystal/temp";// 测试 // windows目录
+        }
+        String tempPath = uploadTempPath + File.separator + tempName;
+        File file = new File(tempPath);
+        if (!file.exists()) {
+            file.mkdirs();
+        }
+        for (MerchantChannelStatus channelStatus : list) {
+            MerchantBaseInfo merchant = merchantBaseInfoService.getMerchantBaseInfoByMerchantCode(channelStatus.getMerchantCode());
+            if (merchant != null) {
+                File f1 = new File(tempPath + File.separator + merchant.getAlias());
+                if (!f1.exists()) {
+                    f1.mkdirs();
+                }
+                QueryWrapper<MerchantImage> imageQuery = new QueryWrapper<MerchantImage>().eq("merchantCode", merchant.getMerchantCode())
+                        .in("photoType", "06", "08", "09");
+                List<MerchantImage> imageList = merchantImageService.list(imageQuery);
+                String savePath = tempPath + File.separator + merchant.getAlias();
+                if (!imageList.isEmpty()) {
+                    for (MerchantImage image : imageList) {
+                        try {
+                            String fileName = UUID.randomUUID().toString() + ".jpg";
+                            FileUtil.downloadFile(image.getPicUrl(), savePath + File.separator + fileName);
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            }
+        }
+        FileOutputStream fos1 = new FileOutputStream(new File(uploadTempPath + File.separator + tempName + suffix));
+        ZipUtil.toZip(tempPath, fos1, true);
+        FileUtil.downLoad(response, tempName + suffix, tempPath + suffix);
+        FileUtil.deleteDir(new File(uploadTempPath));
+    }
+
+
+    /**
+     * 关闭通道支付权限
+     * @param channelId     通道id
+     * @param merchantCode  商编
+     * @return
+     */
+    @PostMapping("/banChannelValid")
+    public Result<String> banChannelValid(int channelId, String merchantCode, String remark) {
+        LambdaQueryWrapper<MerchantChannelStatus> qWrapper = Wrappers.lambdaQuery();
+        qWrapper.eq(MerchantChannelStatus::getChannel, channelId);
+        qWrapper.eq(MerchantChannelStatus::getMerchantCode, merchantCode);
+
+        MerchantChannelStatus mcs = mcsService.getOne(qWrapper);
+
+        LambdaUpdateWrapper<MerchantChannelStatus> uWrapper = Wrappers.lambdaUpdate();
+        uWrapper.eq(MerchantChannelStatus::getId, mcs.getId());
+        uWrapper.set(MerchantChannelStatus::getValid, MerchantChannelStatus.VALID_STATUS_BAN)
+                .set(MerchantChannelStatus::getUpdateTime, mcs.getUpdateTime())
+                .set(MerchantChannelStatus::getRemark, remark);
+        mcsService.update(uWrapper);
+
+        return ResultGenerator.genSuccessResult("操作成功", null);
+    }
+
+    /**
+     * 关闭通道支付权限
+     * @param channelId     通道id
+     * @param merchantCode  商编
+     * @return
+     */
+    @PostMapping("/openChannelValid")
+    public Result<String> openChannelValid(int channelId, String merchantCode) {
+        LambdaQueryWrapper<MerchantChannelStatus> qWrapper = Wrappers.lambdaQuery();
+        qWrapper.eq(MerchantChannelStatus::getChannel, channelId);
+        qWrapper.eq(MerchantChannelStatus::getMerchantCode, merchantCode);
+
+        MerchantChannelStatus mcs = mcsService.getOne(qWrapper);
+
+        LambdaUpdateWrapper<MerchantChannelStatus> uWrapper = Wrappers.lambdaUpdate();
+        uWrapper.eq(MerchantChannelStatus::getId, mcs.getId());
+        uWrapper.set(MerchantChannelStatus::getValid, MerchantChannelStatus.VALID_STATUS_NORMAL)
+                .set(MerchantChannelStatus::getUpdateTime, mcs.getUpdateTime());
+        mcsService.update(uWrapper);
+
+        return ResultGenerator.genSuccessResult("操作成功", null);
+    }
+}
+
+
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantTranfer/MerchantTransferController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantTranfer/MerchantTransferController.java
new file mode 100644
index 0000000..c64d0a7
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantTranfer/MerchantTransferController.java
@@ -0,0 +1,44 @@
+package cn.pluss.platform.controller.merchantTranfer;
+
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.controller.BaseNoModelController;
+import cn.pluss.platform.entity.MerchantTransfer;
+import cn.pluss.platform.transfer.MerchantTransferService;
+import cn.pluss.platform.util.PageUtils;
+import cn.pluss.platform.util.StringUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+@Controller
+@RequiredArgsConstructor
+@RequestMapping("merchantTransfer")
+public class MerchantTransferController extends BaseNoModelController {
+
+    private final MerchantTransferService merchantTransferService;
+
+    @GetMapping("index")
+    public String index() {
+        return "merchantTransfer/list";
+    }
+
+    @GetMapping("page")
+    @ResponseBody
+    public Result<PageInfo<MerchantTransfer>> page(Page<MerchantTransfer> page,MerchantTransfer transfer) {
+        QueryWrapper<MerchantTransfer> queryWrapper = new QueryWrapper<MerchantTransfer>().orderByDesc("createDt");
+        if(StringUtil.isNotEmpty(transfer.getAlias())){
+            queryWrapper.like("alias",transfer.getAlias());
+        }
+        if(StringUtil.isNotEmpty(transfer.getOrderNo())){
+            queryWrapper.eq("orderNo",transfer.getOrderNo());
+        }
+        page = merchantTransferService.page(page, queryWrapper);
+        return ResultGenerator.genSuccessResult(PageUtils.page(page));
+    }
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/newArea/NewAreaController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/newArea/NewAreaController.java
new file mode 100644
index 0000000..1f9f2f6
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/newArea/NewAreaController.java
@@ -0,0 +1,158 @@
+package cn.pluss.platform.controller.newArea;
+
+import cn.pluss.platform.controller.BaseNoModelController;
+import cn.pluss.platform.entity.NewArea;
+import cn.pluss.platform.newArea.NewAreaService;
+import cn.pluss.platform.util.StringUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Controller
+@RequestMapping("newArea")
+public class NewAreaController  extends BaseNoModelController {
+
+	  private Integer PAGE_SIZE=12;
+
+    @Autowired
+	  private NewAreaService newAreaService;
+
+    /**
+    *引导页
+    * @return
+    */
+    @RequestMapping(value = "/index", method = RequestMethod.GET)
+    public String index() {
+   
+        return "newArea/newAreaList";
+    }
+
+    /**
+    *分页查询
+    */
+    @RequestMapping(value = "/queryNewAreaByPage", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String,Object> queryNewAreaByPage(Integer currPage,Integer id){
+   
+   	if(currPage==null) {
+   	   currPage=1;
+       }
+    	Map<String,Object> map=new HashMap<String, Object>();
+    	map.put("pageSize",PAGE_SIZE);
+    	map.put("offset", (currPage-1)*PAGE_SIZE);
+    	map.put("id",  id);
+    	List<NewArea> newAreaList=newAreaService.queryNewAreaPage(map);
+    	Integer count=newAreaService.queryNewAreaPageCount(map);
+        Map<String,Object> result=new HashMap<String,Object>();
+        result.put("newAreaList", newAreaList);
+        result.put("count", count);
+        result.put("pageCount",StringUtil.getPageCount(count,PAGE_SIZE));
+        result.put("currPage", currPage);
+    	  return result;
+    }
+    /**
+    *查询详情
+    */
+     @RequestMapping(value = "/queryNewAreaDetails", method = RequestMethod.GET)
+    public String queryNewAreaDetails(HttpServletRequest request,Integer id,Integer pageIndex){
+   
+   	  if(id!=null&&id!=0) {
+   		 NewArea newArea=new NewArea();
+   		 newArea.setId(id);
+           newArea=newAreaService.queryNewArea(newArea);
+          request.setAttribute("newArea", newArea);
+   		request.setAttribute("pageIndex", pageIndex);
+       	}
+        return "newArea/newAreaDetails";
+    }
+    /**
+    *查询详情
+    */
+     @RequestMapping(value = "/queryNewAreaBaseInfo", method = RequestMethod.GET)
+    public String queryNewAreaBaseInfo(HttpServletRequest request,Integer id,Integer pageIndex){
+   
+   	  if(id!=null&&id!=0) {
+   		NewArea newArea=new NewArea();
+   		newArea.setId(id);
+        newArea=newAreaService.queryNewArea(newArea);
+          request.setAttribute("newArea", newArea);
+   		request.setAttribute("pageIndex", pageIndex);
+       	}
+        return "newArea/newAreaBaseInfo";
+    }
+    /**
+    *查询详情
+    */
+     @RequestMapping(value = "/queryNewAreaExtendsInfo", method = RequestMethod.GET)
+    public String queryNewAreaExtendsInfo(){
+   
+        return "newArea/newAreaExtendsInfo";
+    }
+    /**
+    *查询详情
+    */
+     @RequestMapping(value = "/queryNewAreaFunctionsInfo", method = RequestMethod.GET)
+    public String queryNewAreaFunctionsInfo(){
+   
+        return "newArea/newAreaFunctionsInfo";
+    }
+    /**
+    *保存对象
+    *@throws IOException
+    */
+    @RequestMapping(value = "/saveNewArea", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String,Object> saveNewArea(NewArea newArea){
+   
+       if(newArea.getId()!=null&&newArea.getId()!=0){
+    		newAreaService.updateNewArea(newArea);
+    	 }else{  
+      	newAreaService.saveNewArea(newArea);
+    	 }  
+		Map<String,Object> result=new HashMap<String,Object>();
+    	result.put("resultCode", "1");
+    	result.put("resultMessage", "保存成功!");
+    	return result;
+    }
+    /**
+    *修改对象
+    *@throws IOException
+    */
+    @RequestMapping(value = "/updateNewArea", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String,Object> updateNewArea(Integer id){
+   
+   	NewArea newArea=new NewArea();
+   	newArea.setId(id);
+      newAreaService.updateNewArea(newArea);
+   	Map<String,Object> result=new HashMap<String,Object>();
+    	result.put("resultCode", "1");
+    	result.put("resultMessage", "保存成功!");
+    	return result;
+    }
+    /**
+    *删除对象
+    *@throws IOException
+    */
+    @RequestMapping(value = "/deleteNewArea", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String,Object> deleteNewArea(Integer id){
+   	NewArea newArea=new NewArea();
+   	newArea.setId(id);
+		newAreaService.deleteNewArea(newArea);
+		Map<String,Object> result=new HashMap<String,Object>();
+    	result.put("resultCode", "1");
+    	result.put("resultMessage", "保存成功!");
+    	return result;
+    }
+
+}
+
+
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/notice/NoticeController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/notice/NoticeController.java
new file mode 100644
index 0000000..bac18be
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/notice/NoticeController.java
@@ -0,0 +1,213 @@
+package cn.pluss.platform.controller.notice;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.dict.DictService;
+import cn.pluss.platform.entity.Dict;
+import cn.pluss.platform.entity.Notice;
+import cn.pluss.platform.entity.NoticeTemplate;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.notice.NoticeService;
+import cn.pluss.platform.notice.template.NoticeTemplateService;
+import cn.pluss.platform.userApp.UserAppService;
+import com.alibaba.fastjson.JSONObject;
+import lombok.Setter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.*;
+
+@Controller
+@RequestMapping("notice")
+public class NoticeController extends BaseModelController<NoticeService, Notice> {
+
+    private Integer PAGE_SIZE = 12;
+
+    @Setter(onMethod_ = {@Autowired})
+    private HttpServletRequest request;
+
+    @Setter(onMethod_ = {@Autowired})
+    private NoticeService noticeService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private UserAppService userAppService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private DictService dictService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private NoticeTemplateService noticeTemplateService;
+
+    /**
+     * 引导页
+     *
+     * @return
+     */
+    @RequestMapping(value = "/index", method = RequestMethod.GET)
+    public String index() {
+        List<Dict> typeFirstList = dictService.getByCode(Collections.singletonList("NOTICE_TYPE_FIRST"));
+        List<Dict> typeSecondList0 = dictService.getByCode(Collections.singletonList("NOTICE_TYPE_SECOND_0"));
+        List<Dict> typeSecondList1 = dictService.getByCode(Collections.singletonList("NOTICE_TYPE_SECOND_1"));
+
+        request.setAttribute("typeFirstList", typeFirstList);
+        request.setAttribute("typeSecondList0", typeSecondList0);
+        request.setAttribute("typeSecondList1", typeSecondList1);
+
+        return "notice/noticeList";
+    }
+
+    /**
+     * 查询详情
+     */
+    @GetMapping({"/detail/{id}", "/detail"})
+    public String queryNoticeDetails(HttpServletRequest request,
+                                     @PathVariable(value = "id", required = false) Integer id,
+                                     Integer pageIndex,
+                                     Long userId) {
+        List<Dict> templateTypeList = dictService.getByCode(Arrays.asList("notice_template_type"));
+        if (id != null && id != 0) {
+            Notice notice = new Notice();
+            notice.setId(id);
+            notice = noticeService.queryNotice(notice);
+
+            if ("-1".equals(notice.getUserId())) {
+                request.setAttribute("parentName", "无");
+            } else {
+                UserApp userApp = new UserApp();
+                userApp.setUserId(Long.parseLong(notice.getUserId()));
+                userApp = userAppService.queryUserApp(userApp);
+                if (userApp.getParentId() != null) {
+                    UserApp parentUserApp = new UserApp().setUserId(userApp.getParentId());
+                    parentUserApp = userAppService.queryUserApp(parentUserApp);
+                    request.setAttribute("parentName", parentUserApp.getUserName());
+                } else {
+                    request.setAttribute("parentName", "无");
+                }
+            }
+            request.setAttribute("notice", notice);
+            request.setAttribute("pageIndex", pageIndex);
+        } else {
+            if (userId != null) {
+                UserApp userApp = new UserApp();
+                userApp.setUserId(userId);
+                userApp = userAppService.queryUserApp(userApp);
+                final Map<String, Object> userData = userAppService.getUserByUid(userId.toString());
+                request.setAttribute("userData", userData);
+
+                Notice notice = new Notice();
+                notice.setUserId(userId.toString());
+                notice.setUserName(userApp.getUserName());
+                request.setAttribute("notice", notice);
+
+                if (userApp.getParentId() != null) {
+                    UserApp parentUserApp = new UserApp().setUserId(userApp.getParentId());
+                    parentUserApp = userAppService.queryUserApp(parentUserApp);
+                    request.setAttribute("parentName", parentUserApp.getUserName());
+                } else {
+                    request.setAttribute("parentName", "无");
+                }
+            }
+        }
+        request.setAttribute("templateTypeList", templateTypeList);
+        List<NoticeTemplate> templateList = noticeTemplateService.list();
+
+        String templateStr = JSONObject.toJSONString(templateList);
+        request.setAttribute("templateList", templateStr);
+        return "notice/noticeDetails";
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryNoticeBaseInfo", method = RequestMethod.GET)
+    public String queryNoticeBaseInfo(HttpServletRequest request, Integer id, Integer pageIndex) {
+
+        if (id != null && id != 0) {
+            Notice notice = new Notice();
+            notice.setId(id);
+            notice = noticeService.queryNotice(notice);
+            request.setAttribute("notice", notice);
+            request.setAttribute("pageIndex", pageIndex);
+        }
+        return "notice/noticeBaseInfo";
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryNoticeExtendsInfo", method = RequestMethod.GET)
+    public String queryNoticeExtendsInfo() {
+
+        return "notice/noticeExtendsInfo";
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryNoticeFunctionsInfo", method = RequestMethod.GET)
+    public String queryNoticeFunctionsInfo() {
+
+        return "notice/noticeFunctionsInfo";
+    }
+
+    /**
+     * 保存对象
+     */
+    @RequestMapping(value = "/saveNotice", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> saveNotice(Notice notice) {
+
+        if (notice.getId() != null && notice.getId() != 0) {
+            noticeService.updateNotice(notice);
+        } else {
+            noticeService.saveNotice(notice);
+        }
+        Map<String, Object> result = new HashMap<>();
+        result.put("resultCode", "1");
+        result.put("resultMessage", "保存成功!");
+        return result;
+    }
+
+    /**
+     * 修改对象
+     */
+    @RequestMapping(value = "/updateNotice", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> updateNotice(Integer id) {
+
+        Notice notice = new Notice();
+        notice.setId(id);
+        noticeService.updateNotice(notice);
+        Map<String, Object> result = new HashMap<>();
+        result.put("resultCode", "1");
+        result.put("resultMessage", "保存成功!");
+        return result;
+    }
+
+    /**
+     * 删除对象
+     */
+    @RequestMapping(value = "/deleteNotice", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> deleteNotice(Integer id) {
+        Notice notice = new Notice();
+        notice.setId(id);
+        noticeService.deleteNotice(notice);
+        Map<String, Object> result = new HashMap<>();
+        result.put("resultCode", "1");
+        result.put("resultMessage", "保存成功!");
+        return result;
+    }
+
+    @RequestMapping(value = "/sendTempNotice", method = RequestMethod.POST)
+    @ResponseBody
+    public Result<?> saveTempNotice(@RequestBody Notice notice) {
+        noticeService.sendTempNotice(notice, notice.getScheduleFlag());
+        return ResultGenerator.genSuccessResult("操作成功", null);
+    }
+}
+
+
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/notice/template/NoticeTemplateController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/notice/template/NoticeTemplateController.java
new file mode 100644
index 0000000..b766b6c
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/notice/template/NoticeTemplateController.java
@@ -0,0 +1,70 @@
+package cn.pluss.platform.controller.notice.template;
+
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.dict.DictService;
+import cn.pluss.platform.entity.Dict;
+import cn.pluss.platform.entity.MerchantMoveRecords;
+import cn.pluss.platform.entity.MerchantMoveSetting;
+import cn.pluss.platform.entity.NoticeTemplate;
+import cn.pluss.platform.notice.template.NoticeTemplateService;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * <p>
+ * 自定义消息通知模板表 前端控制器
+ * </p>
+ *
+ * @author bzg
+ * @since 2021-08-26
+ */
+@Controller
+@RequestMapping("/notice/template")
+public class NoticeTemplateController extends BaseModelController<NoticeTemplateService, NoticeTemplate> {
+
+    @Resource
+    private DictService dictService;
+
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = "/index")
+    public ModelAndView index(ModelAndView view) {
+        List<Dict> templateTypeList = dictService.getByCode(Arrays.asList("notice_template_type"));
+        view.addObject("templateTypeList", JSONObject.toJSONString(templateTypeList));
+        view.setViewName("notice/templateList");
+        return view;
+    }
+
+    @Override
+    public Result<Page<NoticeTemplate>> page(Page<NoticeTemplate> page, NoticeTemplate condition, OrderItem orderItem) {
+        orderItem.setColumn("createTime");
+        orderItem.setAsc(false);
+        return super.page(page, condition, orderItem);
+    }
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = {"/detail/{id}", "/detail"})
+    public String detail(HttpServletRequest request, @PathVariable(value = "id", required = false) Integer id) {
+        List<Dict> templateTypeList = dictService.getByCode(Arrays.asList("notice_template_type"));
+        if (id != null) {
+            NoticeTemplate template = new NoticeTemplate().setId(id);
+            template = baseService.getOne(new QueryWrapper<>(template));
+            request.setAttribute("entity", template);
+        }
+        request.setAttribute("templateTypeList", templateTypeList);
+        return "notice/templateDetail";
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/notification/NotificationController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/notification/NotificationController.java
new file mode 100644
index 0000000..2f2ab69
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/notification/NotificationController.java
@@ -0,0 +1,80 @@
+package cn.pluss.platform.controller.notification;
+
+import cn.pluss.platform.activityEnroll.ActivityEnrollService;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.cash.CashService;
+import cn.pluss.platform.deviceMerchantBuy.DeviceMerchantBuyService;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.notification.NotificationService;
+import cn.pluss.platform.officialGoods.exchange.OfficialGoodsExchangeService;
+import cn.pluss.platform.suggest.SuggestService;
+import cn.pluss.platform.transferCash.MerchantTransferCashService;
+import cn.pluss.platform.util.StringUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import java.util.*;
+
+@Controller
+@RequestMapping("/notification")
+public class NotificationController {
+    @Autowired
+    private NotificationService notificationService;
+
+    @RequestMapping(value = "/index", method = RequestMethod.GET)
+    public String index(){
+        return "notification/notificationList";
+    }
+
+    @GetMapping("/countStatus")
+    @ResponseBody
+    public Integer count(){
+        QueryWrapper<Notification> notificationQueryWrapper=new QueryWrapper<Notification>().eq("status","1");
+        int count = notificationService.count(notificationQueryWrapper);
+        return count;
+    }
+
+    @GetMapping("/page")
+    @ResponseBody
+    public Map<String,Object> notificationQuery(@RequestParam(defaultValue = "1") Integer currPage, Integer size){
+        Map<String,Object> map = new HashMap<>();
+        map.put("pageSize", size);
+        map.put("offset", (currPage - 1) * size);
+        List<Notification> notificationList = notificationService.queryNotification(map);
+        int count = notificationService.count();
+        Map<String,Object> result = new HashMap<>();
+        result.put("notificationList",notificationList);
+        result.put("count", count);
+        result.put("pageCount", StringUtil.getPageCount(count, size));
+        result.put("currPage", currPage);
+        result.put("code", 200);
+        return result;
+    }
+
+    @PostMapping("/delete")
+    @ResponseBody
+    public Result<Notification> delete(@RequestBody Notification notification){
+        notification.setStatus("0");
+        notificationService.updateById(notification);
+        return ResultGenerator.genSuccessResult("已读！",null);
+    }
+
+    @PostMapping("/already")
+    @ResponseBody
+    public Result<Notification> already(){
+        String status="0";
+        notificationService.updateAll(status);
+        return ResultGenerator.genSuccessResult("全部已读！",null);
+    }
+
+    @PostMapping("/whithout")
+    @ResponseBody
+    public Result<Notification> whithout(){
+        String status="1";
+        notificationService.updateAll(status);
+        return ResultGenerator.genSuccessResult("全部未读！",null);
+    }
+
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/officialActivity/OfficialActivityController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/officialActivity/OfficialActivityController.java
new file mode 100644
index 0000000..9301b55
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/officialActivity/OfficialActivityController.java
@@ -0,0 +1,148 @@
+package cn.pluss.platform.controller.officialActivity;
+
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.dict.DictService;
+import cn.pluss.platform.entity.AppVersionInfo;
+import cn.pluss.platform.entity.Dict;
+import cn.pluss.platform.entity.OfficialActivity;
+import cn.pluss.platform.entity.UserRole;
+import cn.pluss.platform.officialActivity.OfficialActivityService;
+import cn.pluss.platform.user.UserRoleService;
+import cn.pluss.platform.util.OssOperatUtil;
+import cn.pluss.platform.util.StringUtil;
+import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 官方活动表 前端控制器
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-09-24
+ */
+@Controller
+@RequiredArgsConstructor
+@RequestMapping("/officialActivity")
+public class OfficialActivityController extends BaseModelController<OfficialActivityService, OfficialActivity> {
+
+    private final OfficialActivityService officialActivityService;
+
+    private final DictService dictService;
+
+    @Resource
+    private UserRoleService userRoleService;
+
+    @GetMapping("index")
+    public ModelAndView index() {
+        ModelAndView view = new ModelAndView("officialActivity/list");
+        List<String> list = new ArrayList<String>(){{this.add("SERVICE_PROVIDER_TYPE");}};
+        List<Dict> dictList = dictService.getByCode(list);
+        view.addObject("dictList", JSONArray.toJSONString(dictList));
+
+        List<UserRole> roleList = userRoleService.list();
+        view.addObject("roleList", JSONArray.toJSONString(roleList));
+
+        List<String> actList = new ArrayList<String>(){{this.add("ACTIVITY_TYPE");}};
+        List<Dict> actDictList = dictService.getByCode(actList);
+        view.addObject("actTypeList", JSONArray.toJSONString(actDictList));
+
+        return view;
+    }
+
+    @RequestMapping("add")
+    public ModelAndView add() {
+        ModelAndView view = new ModelAndView("officialActivity/detail");
+        List<String> list = new ArrayList<String>(){{this.add("SERVICE_PROVIDER_TYPE");}};
+        List<String> actType = new ArrayList<String>(){{this.add("ACTIVITY_TYPE");}};
+        List<UserRole> roleList = userRoleService.list();
+        List<Dict> dictList = dictService.getByCode(list);
+        List<Dict> actTypeList = dictService.getByCode(actType);
+        Map<String, String> uploadParam = OssOperatUtil.getUploadParam();
+        view.addObject("uploadParam",uploadParam);
+        view.addObject("dictList",dictList);
+        view.addObject("actTypeList",actTypeList);
+        view.addObject("roleList",roleList);
+        return view;
+    }
+
+    @Override
+    public Result<Page<OfficialActivity>> page(Page<OfficialActivity> page, OfficialActivity condition, OrderItem orderItem) {
+        orderItem.setAsc(false).setColumn("createTime");
+        return super.page(page, condition, orderItem);
+    }
+
+    @GetMapping("/edit/{id}")
+    public ModelAndView edit(@PathVariable Integer id){
+        ModelAndView view = new ModelAndView("officialActivity/detail");
+        List<String> list = new ArrayList<String>(){{this.add("SERVICE_PROVIDER_TYPE");}};
+        List<Dict> dictList = dictService.getByCode(list);
+
+        List<String> actType = new ArrayList<String>(){{this.add("ACTIVITY_TYPE");}};
+        List<Dict> actTypeList = dictService.getByCode(actType);
+
+        List<UserRole> roleList = userRoleService.list();
+
+        OfficialActivity v = officialActivityService.getById(id);
+        Map<String, String> uploadParam = OssOperatUtil.getUploadParam();
+        view.addObject("uploadParam",uploadParam);
+        view.addObject("officialActivity",v);
+        view.addObject("dictList",dictList);
+        view.addObject("actTypeList",actTypeList);
+
+        view.addObject("roleList",roleList);
+        return view;
+    }
+
+    @PostMapping("saveOrUpdate")
+    @ResponseBody
+    public Result<String> saveOrUpdate(@RequestBody OfficialActivity officialActivity) {
+        if (officialActivity.getId() != null){
+            officialActivity.setUpdateTime(new Date());
+            officialActivity.setActivityGroupNo(officialActivity.getValue());
+            officialActivityService.updateById(officialActivity);
+        }else {
+            if (officialActivity.getActivityGroupNo() != null ){
+                String[] split = officialActivity.getActivityGroupNo().split(",");
+                for (int i=0;i<split.length;i++){
+                    officialActivity.setCreateTime(new Date());
+                    officialActivity.setActivityGroupNo(split[i]);
+                    officialActivityService.save(officialActivity);
+                }
+            }
+        }
+        return ResultGenerator.genSuccessResult("保存成功");
+    }
+
+    @PostMapping("delete")
+    @ResponseBody
+    public Result<String> delete(@RequestBody AppVersionInfo appVersionInfo) {
+        officialActivityService.removeById(appVersionInfo.getId());
+        if(StringUtil.isNotEmpty(appVersionInfo.getUrl())){
+            OssOperatUtil.deleteFile(appVersionInfo.getUrl());
+        }
+        return ResultGenerator.genSuccessResult("操作成功!");
+    }
+
+    @PostMapping("batchDelete")
+    @ResponseBody
+    public Result<String> batchDelete(@RequestBody List<Integer> ids) {
+        officialActivityService.removeByIds(ids);
+        return ResultGenerator.genSuccessResult("操作成功!");
+    }
+
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/officialGoods/OfficialGoodsController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/officialGoods/OfficialGoodsController.java
new file mode 100644
index 0000000..e0351f4
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/officialGoods/OfficialGoodsController.java
@@ -0,0 +1,103 @@
+package cn.pluss.platform.controller.officialGoods;
+
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.entity.OfficialGoods;
+import cn.pluss.platform.officialGoods.OfficialGoodsService;
+import cn.pluss.platform.util.OssOperatUtil;
+import cn.pluss.platform.util.StringUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 商品活动表 前端控制器
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-09-29
+ */
+@Controller
+@RequiredArgsConstructor
+@RequestMapping("/officialGoods")
+public class OfficialGoodsController extends BaseModelController<OfficialGoodsService, OfficialGoods> {
+
+    private final OfficialGoodsService OfficialGoodsService;
+
+    @GetMapping("index")
+    public String index() {
+        return "officialGoods/list";
+    }
+
+    @RequestMapping("add")
+    public ModelAndView add() {
+        ModelAndView view = new ModelAndView("officialGoods/detail");
+        Map<String, String> uploadParam = OssOperatUtil.getUploadParam();
+        view.addObject("uploadParam",uploadParam);
+        return view;
+    }
+
+    @GetMapping("/edit/{id}")
+    public ModelAndView edit(@PathVariable Integer id){
+        ModelAndView view = new ModelAndView("officialGoods/detail");
+        OfficialGoods v = OfficialGoodsService.getById(id);
+        Map<String, String> uploadParam = OssOperatUtil.getUploadParam();
+        view.addObject("uploadParam",uploadParam);
+        view.addObject("officialGoods",v);
+        return view;
+    }
+
+    @RequestMapping("page")
+    @ResponseBody
+    public Result<Page<OfficialGoods>> page(Page<OfficialGoods> page, OfficialGoods officialGoods) {
+        QueryWrapper<OfficialGoods> queryWrapper = new QueryWrapper<OfficialGoods>().orderByDesc("createTime");
+        if(StringUtil.isNotEmpty(officialGoods.getGoodName())){
+            queryWrapper.like("goodName",officialGoods.getGoodName());
+        }
+        if(StringUtil.isNotEmpty(officialGoods.getStatus())){
+            queryWrapper.eq("status",officialGoods.getStatus());
+        }
+        page = OfficialGoodsService.page(page, queryWrapper);
+        return ResultGenerator.genSuccessResult(page);
+    }
+
+    @PostMapping("saveOrUpdate")
+    @ResponseBody
+    public Result<String> saveOrUpdate(@RequestBody OfficialGoods officialGoods) {
+
+        if (officialGoods.getId() != null){
+            OfficialGoodsService.updateById(officialGoods);
+        }else {
+            officialGoods.setCreateTime(new Date());
+            OfficialGoodsService.save(officialGoods);
+        }
+        return ResultGenerator.genSuccessResult("保存成功");
+    }
+
+    @PostMapping("delete")
+    @ResponseBody
+    public Result<String> delete(@RequestBody OfficialGoods officialGoods) {
+        OfficialGoodsService.removeById(officialGoods.getId());
+        if(StringUtil.isNotEmpty(officialGoods.getImgUrl())){
+            OssOperatUtil.deleteFile(officialGoods.getImgUrl());
+        }
+        return ResultGenerator.genSuccessResult("操作成功!");
+    }
+
+    @PostMapping("batchDelete")
+    @ResponseBody
+    public Result<String> batchDelete(@RequestBody List<Integer> ids) {
+        OfficialGoodsService.removeByIds(ids);
+        return ResultGenerator.genSuccessResult("操作成功!");
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/officialGoods/exchange/OfficialGoodsExchangeController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/officialGoods/exchange/OfficialGoodsExchangeController.java
new file mode 100644
index 0000000..26acb9f
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/officialGoods/exchange/OfficialGoodsExchangeController.java
@@ -0,0 +1,95 @@
+package cn.pluss.platform.controller.officialGoods.exchange;
+
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.device.DeviceBsjService;
+import cn.pluss.platform.entity.DeviceBsj;
+import cn.pluss.platform.entity.OfficialGoodsExchange;
+import cn.pluss.platform.officialGoods.exchange.OfficialGoodsExchangeService;
+import cn.pluss.platform.util.StringUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Calendar;
+import java.util.Date;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-10-09
+ */
+@Controller
+@RequestMapping("/officialGoodsExchange")
+public class OfficialGoodsExchangeController extends BaseModelController<OfficialGoodsExchangeService, OfficialGoodsExchange> {
+
+    @Autowired
+    private DeviceBsjService bsjService;
+
+    @GetMapping("index")
+    public String index() {
+        return "officialGoods/exchange/list";
+    }
+
+    @Override
+    public Result<Page<OfficialGoodsExchange>> page(Page<OfficialGoodsExchange> page, OfficialGoodsExchange officialGoodsExchange,OrderItem orderItem) {
+        QueryWrapper<OfficialGoodsExchange> queryWrapper = new QueryWrapper<OfficialGoodsExchange>().orderByDesc("createTime");
+        if(StringUtil.isNotEmpty(officialGoodsExchange.getUserName())){
+            queryWrapper.like("userName",officialGoodsExchange.getUserName());
+        }
+        if(StringUtil.isNotEmpty(officialGoodsExchange.getUserId())){
+            queryWrapper.eq("userId",officialGoodsExchange.getUserId());
+        }
+        if(StringUtil.isNotEmpty(officialGoodsExchange.getPhone())){
+            queryWrapper.eq("phone",officialGoodsExchange.getPhone());
+        }
+        if(officialGoodsExchange.getStatus() != null){
+            queryWrapper.eq("status",officialGoodsExchange.getStatus());
+        }
+        if(officialGoodsExchange.getDeliveryStatus() != null){
+            queryWrapper.eq("deliveryStatus",officialGoodsExchange.getDeliveryStatus());
+        }
+        if(officialGoodsExchange.getName() != null){
+            queryWrapper.like("name",officialGoodsExchange.getName());
+        }
+        page = this.baseService.page(page, queryWrapper);
+        return ResultGenerator.genSuccessResult(page);
+    }
+
+    @Override
+    public Result<String> save(@RequestBody OfficialGoodsExchange entity) {
+        entity.setDeliveryTime(new Date());
+
+        final OfficialGoodsExchange existData = baseService.getById(entity.getId());
+        if ("移动4G流量年卡流量".equals(entity.getName())) {
+            // 充值流量的订单，自动点击发货后，即表示已充值新的一年的流量，将对应机具的流量到期时间往后加一年
+            LambdaQueryWrapper<DeviceBsj> qWrapper = Wrappers.lambdaQuery();
+            qWrapper.eq(DeviceBsj::getDeviceNo, existData.getAddress())
+                    .or()
+                    .eq(DeviceBsj::getSnNo, existData.getAddress());
+
+            final DeviceBsj one = bsjService.getOne(qWrapper);
+            if (one != null) {
+                final Date expireTime = one.getSimExpireTime();
+                if (expireTime != null) {
+                    Calendar calendar = Calendar.getInstance();
+                    calendar.setTime(expireTime);
+                    calendar.add(Calendar.YEAR, 1);
+                    one.setSimExpireTime(calendar.getTime());
+                    bsjService.updateById(one);
+                }
+            }
+        }
+        return super.save(entity);
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/openAccount/OpenAccountConfigController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/openAccount/OpenAccountConfigController.java
new file mode 100644
index 0000000..549dd90
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/openAccount/OpenAccountConfigController.java
@@ -0,0 +1,67 @@
+package cn.pluss.platform.controller.openAccount;
+
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.areaCity.AreaCityService;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.openAccount.OpenAccountConfigService;
+import cn.pluss.platform.user.UserRoleService;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * <p>
+ * 开户奖配置表 前端控制器
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-06-14
+ */
+@Controller
+@RequestMapping("/openAccountConfig")
+public class OpenAccountConfigController extends BaseModelController<OpenAccountConfigService, OpenAccountConfig> {
+
+    @Resource
+    private UserRoleService userRoleService;
+
+    @Resource
+    private AreaCityService areaCityService;
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = "/index")
+    public String index(HttpServletRequest request) {
+        List<UserRole> list = userRoleService.list();
+        request.setAttribute("roleList", JSON.toJSONString(list));
+        return "openAccount/configList";
+    }
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = {"/detail/{id}", "/detail"})
+    public String detail(HttpServletRequest request, @PathVariable(value = "id", required = false) Integer id) {
+        List<AreaCity> areaCities = areaCityService.queryOnlyProvince();
+        List<UserRole> list = userRoleService.list();
+        if (id != null) {
+            OpenAccountConfig entity = baseService.getById(id);
+            request.setAttribute("entity", entity);
+        }
+        request.setAttribute("roleList",list);
+        request.setAttribute("pList", areaCities);
+        return "openAccount/configDetail";
+    }
+
+    @Override
+    public Result<Page<OpenAccountConfig>> page(Page<OpenAccountConfig> page, OpenAccountConfig condition, OrderItem orderItem) {
+        orderItem.setColumn("id");
+        orderItem.setAsc(false);
+        return super.page(page, condition, orderItem);
+    }
+
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/openAccount/OpenAccountRecordController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/openAccount/OpenAccountRecordController.java
new file mode 100644
index 0000000..25d12c6
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/openAccount/OpenAccountRecordController.java
@@ -0,0 +1,60 @@
+package cn.pluss.platform.controller.openAccount;
+
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.entity.OpenAccountRecord;
+import cn.pluss.platform.openAccount.OpenAccountRecordService;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * <p>
+ * 用户开户奖励明细 前端控制器
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-06-14
+ */
+@Controller
+@RequestMapping("/openAccountRecord")
+public class OpenAccountRecordController extends BaseModelController<OpenAccountRecordService, OpenAccountRecord> {
+
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = "/index")
+    public String index(HttpServletRequest request) {
+        return "openAccount/recordList";
+    }
+
+    @Override
+    public Result<Page<OpenAccountRecord>> page(Page<OpenAccountRecord> page, OpenAccountRecord condition, OrderItem orderItem) {
+        orderItem.setColumn("id");
+        orderItem.setAsc(false);
+        return super.page(page, condition, orderItem);
+    }
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = "/refund/{orderNumber}")
+    @ResponseBody
+    public Result refund(@PathVariable("orderNumber") String orderNumber) {
+        return baseService.refund(orderNumber);
+    }
+
+    /**
+     * 数据统计
+     * @param condition
+     * @return
+     */
+    @RequestMapping(value = "countData")
+    @ResponseBody
+    public Result countData(OpenAccountRecord condition){
+        return baseService.countData(condition);
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/phoneValidateCode/PhoneValidateCodeController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/phoneValidateCode/PhoneValidateCodeController.java
new file mode 100644
index 0000000..4d71199
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/phoneValidateCode/PhoneValidateCodeController.java
@@ -0,0 +1,158 @@
+package cn.pluss.platform.controller.phoneValidateCode;
+
+import cn.pluss.platform.controller.BaseNoModelController;
+import cn.pluss.platform.entity.PhoneValidateCode;
+import cn.pluss.platform.phoneValidateCode.PhoneValidateCodeService;
+import cn.pluss.platform.util.StringUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Controller
+@RequestMapping("phoneValidateCode")
+public class PhoneValidateCodeController  extends BaseNoModelController {
+
+	  private Integer PAGE_SIZE=12;
+
+    @Autowired
+	  private PhoneValidateCodeService phoneValidateCodeService;
+
+    /**
+    *引导页
+    * @return
+    */
+    @RequestMapping(value = "/index", method = RequestMethod.GET)
+    public String index() {
+   
+        return "phoneValidateCode/phoneValidateCodeList";
+    }
+
+    /**
+    *分页查询
+    */
+    @RequestMapping(value = "/queryPhoneValidateCodeByPage", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String,Object> queryPhoneValidateCodeByPage(Integer currPage,Integer id){
+   
+   	if(currPage==null) {
+   	   currPage=1;
+       }
+    	Map<String,Object> map=new HashMap<String, Object>();
+    	map.put("pageSize",PAGE_SIZE);
+    	map.put("offset", (currPage-1)*PAGE_SIZE);
+    	map.put("id",  id);
+    	List<PhoneValidateCode> phoneValidateCodeList=phoneValidateCodeService.queryPhoneValidateCodePage(map);
+    	Integer count=phoneValidateCodeService.queryPhoneValidateCodePageCount(map);
+        Map<String,Object> result=new HashMap<String,Object>();
+        result.put("phoneValidateCodeList", phoneValidateCodeList);
+        result.put("count", count);
+        result.put("pageCount",StringUtil.getPageCount(count,PAGE_SIZE));
+        result.put("currPage", currPage);
+    	  return result;
+    }
+    /**
+    *查询详情
+    */
+     @RequestMapping(value = "/queryPhoneValidateCodeDetails", method = RequestMethod.GET)
+    public String queryPhoneValidateCodeDetails(HttpServletRequest request,Integer id,Integer pageIndex){
+   
+   	  if(id!=null&&id!=0) {
+   		 PhoneValidateCode phoneValidateCode=new PhoneValidateCode();
+   		 phoneValidateCode.setId(id);
+           phoneValidateCode=phoneValidateCodeService.queryPhoneValidateCode(phoneValidateCode);
+          request.setAttribute("phoneValidateCode", phoneValidateCode);
+   		request.setAttribute("pageIndex", pageIndex);
+       	}
+        return "phoneValidateCode/phoneValidateCodeDetails";
+    }
+    /**
+    *查询详情
+    */
+     @RequestMapping(value = "/queryPhoneValidateCodeBaseInfo", method = RequestMethod.GET)
+    public String queryPhoneValidateCodeBaseInfo(HttpServletRequest request,Integer id,Integer pageIndex){
+   
+   	  if(id!=null&&id!=0) {
+   		PhoneValidateCode phoneValidateCode=new PhoneValidateCode();
+   		phoneValidateCode.setId(id);
+        phoneValidateCode=phoneValidateCodeService.queryPhoneValidateCode(phoneValidateCode);
+          request.setAttribute("phoneValidateCode", phoneValidateCode);
+   		request.setAttribute("pageIndex", pageIndex);
+       	}
+        return "phoneValidateCode/phoneValidateCodeBaseInfo";
+    }
+    /**
+    *查询详情
+    */
+     @RequestMapping(value = "/queryPhoneValidateCodeExtendsInfo", method = RequestMethod.GET)
+    public String queryPhoneValidateCodeExtendsInfo(){
+   
+        return "phoneValidateCode/phoneValidateCodeExtendsInfo";
+    }
+    /**
+    *查询详情
+    */
+     @RequestMapping(value = "/queryPhoneValidateCodeFunctionsInfo", method = RequestMethod.GET)
+    public String queryPhoneValidateCodeFunctionsInfo(){
+   
+        return "phoneValidateCode/phoneValidateCodeFunctionsInfo";
+    }
+    /**
+    *保存对象
+    *@throws IOException
+    */
+    @RequestMapping(value = "/savePhoneValidateCode", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String,Object> savePhoneValidateCode(PhoneValidateCode phoneValidateCode){
+   
+       if(phoneValidateCode.getId()!=null&&phoneValidateCode.getId()!=0){
+    		phoneValidateCodeService.updatePhoneValidateCode(phoneValidateCode);
+    	 }else{  
+      	phoneValidateCodeService.savePhoneValidateCode(phoneValidateCode);
+    	 }  
+		Map<String,Object> result=new HashMap<String,Object>();
+    	result.put("resultCode", "1");
+    	result.put("resultMessage", "保存成功!");
+    	return result;
+    }
+    /**
+    *修改对象
+    *@throws IOException
+    */
+    @RequestMapping(value = "/updatePhoneValidateCode", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String,Object> updatePhoneValidateCode(Integer id){
+   
+   	PhoneValidateCode phoneValidateCode=new PhoneValidateCode();
+   	phoneValidateCode.setId(id);
+      phoneValidateCodeService.updatePhoneValidateCode(phoneValidateCode);
+   	Map<String,Object> result=new HashMap<String,Object>();
+    	result.put("resultCode", "1");
+    	result.put("resultMessage", "保存成功!");
+    	return result;
+    }
+    /**
+    *删除对象
+    *@throws IOException
+    */
+    @RequestMapping(value = "/deletePhoneValidateCode", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String,Object> deletePhoneValidateCode(Integer id){
+   	PhoneValidateCode phoneValidateCode=new PhoneValidateCode();
+   	phoneValidateCode.setId(id);
+		phoneValidateCodeService.deletePhoneValidateCode(phoneValidateCode);
+		Map<String,Object> result=new HashMap<String,Object>();
+    	result.put("resultCode", "1");
+    	result.put("resultMessage", "保存成功!");
+    	return result;
+    }
+
+}
+
+
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/postageConfig/PostageConfigController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/postageConfig/PostageConfigController.java
new file mode 100644
index 0000000..59cfea7
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/postageConfig/PostageConfigController.java
@@ -0,0 +1,26 @@
+package cn.pluss.platform.controller.postageConfig;
+
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.entity.PostageConfig;
+import cn.pluss.platform.postageConfig.PostageConfigService;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * TODO
+ *
+ * @author crystal
+ * @date 2022/4/15 10:58
+ */
+@Controller
+@RequestMapping("postageConfig")
+public class PostageConfigController extends BaseModelController<PostageConfigService, PostageConfig> {
+
+
+    @GetMapping("/index")
+    public String index() {
+        return "postageConfig/list";
+    }
+
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/promoter/PromoterController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/promoter/PromoterController.java
new file mode 100644
index 0000000..387ad01
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/promoter/PromoterController.java
@@ -0,0 +1,1566 @@
+package cn.pluss.platform.controller.promoter;
+
+import cn.pluss.platform.BankCardService;
+import cn.pluss.platform.IdCardService;
+import cn.pluss.platform.SxfMccInfoService;
+import cn.pluss.platform.agentInfo.AgentInfoService;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.common.CommonRemarkService;
+import cn.pluss.platform.converter.Converter;
+import cn.pluss.platform.dto.AccountDTO;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.inviteRate.InviteRateService;
+import cn.pluss.platform.mapper.AccountMapper;
+import cn.pluss.platform.mapper.AreaCityMapper;
+import cn.pluss.platform.mapper.BankCodeSxfMapper;
+import cn.pluss.platform.mapper.OperationRecordMapper;
+import cn.pluss.platform.merchant.AccountService;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchant.MerchantPluginService;
+import cn.pluss.platform.merchantChannel.MerchantChannelService;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.merchantImage.MerchantImageService;
+import cn.pluss.platform.merchantRejectDesc.MerchantRejectDescService;
+import cn.pluss.platform.merchantStore.MerchantStoreService;
+import cn.pluss.platform.notice.NoticeService;
+import cn.pluss.platform.officialActivity.OfficialActivityService;
+import cn.pluss.platform.user.UserLevelService;
+import cn.pluss.platform.user.impl.GeneralPushUtil;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.userInfo.UserInfoService;
+import cn.pluss.platform.util.*;
+import cn.pluss.platform.vo.*;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.io.*;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 推广员管理
+ *
+ * @author Administrator
+ */
+@Controller
+@RequestMapping("promoter")
+public class PromoterController {
+
+    @Autowired
+    private HttpServletRequest request;
+
+    @Autowired
+    private AreaCityMapper areaCityMapper;
+
+    @Autowired
+    private UserAppService uaService;
+
+    @Autowired
+    private NoticeService noticeService;
+
+    @Autowired
+    private MerchantImageService merchantImageService;
+
+    @Autowired
+    private UserInfoService uiService;
+
+    @Autowired
+    private SxfMccInfoService sxfMccInfoService;
+
+    @Autowired
+    private MerchantBaseInfoService mbiService;
+
+    @Autowired
+    private AccountService accountService;
+
+    @Autowired
+    private BankCardService bankCardService;
+
+    @Autowired
+    private IdCardService idCardService;
+
+    @Autowired
+    private InviteRateService inviteRateService;
+
+    @Autowired
+    private OfficialActivityService officialActivityService;
+
+    @Resource
+    private BankCodeSxfMapper bankCodeSxfMapper;
+
+    @Autowired
+    private MerchantRejectDescService merchantRejectDescService;
+
+    @Autowired
+    private MerchantChannelService merchantChannelService;
+
+    @Autowired
+    private MerchantStoreService msService;
+
+    @Autowired
+    private MerchantPluginService merchantPluginService;
+
+    @Autowired
+    private MerchantChannelStatusService merchantChannelStatusService;
+
+    @Resource
+    private OperationRecordMapper oprMapper;
+
+    @Resource
+    private AccountMapper accountMapper;
+
+    @Resource
+    private UserLevelService userLevelService;
+
+    @Autowired
+    private AgentInfoService agentInfoService;
+
+    @Autowired
+    private CommonRemarkService crService;
+
+    @Autowired
+    private GeneralPushUtil generalPushUtil;
+
+    @GetMapping("/permissionIndex")
+    public String permissionIndex() {
+        return "/promoter/permissionList";
+    }
+
+    @GetMapping("/remark")
+    public String remark(HttpServletRequest request, Integer userId) {
+        if (userId != null) {
+            CommonRemark cr = new CommonRemark();
+            cr.setUserId(userId);
+            cr.setCode("USER");
+            CommonRemark exist = crService.getOne(new QueryWrapper<>(cr));
+            if (exist != null) {
+                cr.setRemark(exist.getRemark());
+            }
+            request.setAttribute("entity", cr);
+        }
+        return "/promoter/remark";
+    }
+
+    @GetMapping("/permissionPage")
+    @ResponseBody
+    public Result<Object> permissionPage(Page<AgentInfo> page, AgentInfo agentInfo) {
+        Page<AgentInfo> pageData = agentInfoService.pagePermissionData(page, agentInfo);
+        return ResultGenerator.genSuccessResult(PageUtils.page(pageData));
+    }
+
+    @PostMapping("/openAll")
+    @ResponseBody
+    public Result<Object> openAll(Long userId) {
+        UserApp ua = new UserApp().setUserId(userId);
+        ua = uaService.getOne(new QueryWrapper<>(ua));
+        ua.setAutoAudit("1");
+        ua.setIsMarket("1");
+        ua.setIsUnionPay("1");
+        ua.setPayEcdemicSwitch("1");
+
+        uaService.updateById(ua);
+
+        return ResultGenerator.genSuccessResult("操作成功", null);
+    }
+
+    @PostMapping("/userRemark")
+    @ResponseBody
+    public Result<Object> saveRemark(String remark, Integer userId) {
+        CommonRemark commonRemark = new CommonRemark();
+        commonRemark.setCode("USER");
+        commonRemark.setUserId(userId);
+        commonRemark.setRemark(remark);
+        CommonRemark exist = crService.getOne(new QueryWrapper<>(commonRemark));
+        if (exist != null) {
+            commonRemark.setId(exist.getId());
+            commonRemark.setUpdateTime(new Date());
+        } else {
+            commonRemark.setCreateTime(new Date());
+        }
+        crService.saveOrUpdate(commonRemark);
+
+        return ResultGenerator.genSuccessResult("操作成功", null);
+    }
+
+    /**
+     * 引导页
+     *
+     */
+    @GetMapping(value = "/index")
+    public String index() {
+        String userType = request.getParameter("userType");
+        request.setAttribute("userType", userType);
+        return "promoter/userAppList";
+    }
+
+    @GetMapping(value = "/actIndex")
+    public String actIndex() {
+        String userType = request.getParameter("userType");
+        request.setAttribute("userType", userType);
+        return "promoter/actUserList";
+    }
+
+    @RequestMapping(value = "/queryActPage")
+    @ResponseBody
+    public Result<Page<UserInfoVO>> queryActPage(Page<UserInfoVO> page, UserInfoVO userInfoVO) {
+        String startDate = "2020-12-01";
+        String endDate = "2021-02-01";
+        List<InviteRate> inviteRateList = inviteRateService.list(new QueryWrapper<InviteRate>().orderByAsc("number").eq("type", "merchant"));
+        if (!inviteRateList.isEmpty()) {
+            InviteRate rate = inviteRateList.get(0);
+            OfficialActivity act = officialActivityService.getById(rate.getActId());
+            if (act != null) {
+                startDate = DateUtils.formatDateDefault(act.getStartTime(), "yyyy-MM-dd");
+                endDate = DateUtils.formatDateDefault(act.getEndTime(), "yyyy-MM-dd");
+            }
+        }
+        Date startTime = DateUtils.parse(startDate + " 00:00:00", "yyyy-MM-dd HH:mm:ss");
+        Date endTime = DateUtils.parse(endDate + " 23:59:59", "yyyy-MM-dd HH:mm:ss");
+        userInfoVO.setStartTime(startTime);
+        userInfoVO.setEndTime(endTime);
+        page = uaService.queryActPage(page, userInfoVO);
+        return ResultGenerator.genSuccessResult("查询成功！", page);
+    }
+
+    /**
+     * 分页查询
+     */
+    @GetMapping("/queryUserAppByPage")
+    @ResponseBody
+    public Map<String, Object> queryUserAppByPage(@RequestParam(defaultValue = "1") Integer currPage, Integer size,
+                                                  UserInfoVO userInfoVO) {
+
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageSize", size);
+        map.put("offset", (currPage - 1) * size);
+        // 筛选出推广员
+        if (StringUtils.isNotEmpty(userInfoVO.getUserName())) {
+            map.put("userName", userInfoVO.getUserName());
+        }
+        if (userInfoVO.getUserId() != null) {
+            map.put("userId", userInfoVO.getUserId());
+        } else {
+            userInfoVO.setSameIp(null);
+        }
+
+        if (userInfoVO.getSameIp() != null) {
+            map.put("sameIp", "1");
+        }
+
+        if (StringUtils.isNotEmpty(userInfoVO.getPhone())) {
+            map.put("phone", userInfoVO.getPhone());
+        }
+        if (StringUtils.isNotEmpty(userInfoVO.getMerchantCode())) {
+            map.put("merchantCode", userInfoVO.getMerchantCode());
+        }
+        if (StringUtils.isNotEmpty(userInfoVO.getParentPhone())) {
+            map.put("parentPhone", userInfoVO.getParentPhone());
+        }
+        if (StringUtils.isNotEmpty(userInfoVO.getMerchantType())) {
+            map.put("merchantType", userInfoVO.getMerchantType());
+        }
+        if (StringUtils.isNotEmpty(userInfoVO.getMerchantId())) {
+            map.put("merchantId", userInfoVO.getMerchantId());
+        }
+        if (userInfoVO.getStatus() != null) {
+            map.put("status", userInfoVO.getStatus());
+        }
+        if (StringUtils.isNotEmpty(userInfoVO.getUserType())) {
+            map.put("userType", userInfoVO.getUserType());
+        }
+        if (StringUtils.isNotEmpty(userInfoVO.getParentUserType())) {
+            map.put("parentUserType", userInfoVO.getParentUserType());
+        }
+        if (StringUtils.isNotEmpty(userInfoVO.getInviteNum())) {
+            map.put("inviteNum", userInfoVO.getInviteNum());
+        }
+        if (StringUtils.isNotEmpty(userInfoVO.getAlias())) {
+            map.put("alias", userInfoVO.getAlias());
+        }
+        if (StringUtils.isNotEmpty(userInfoVO.getWxMercNo())) {
+            map.put("wxMercNo", userInfoVO.getWxMercNo());
+        }
+        if (StringUtils.isNotEmpty(userInfoVO.getZfbMercNo())) {
+            map.put("zfbMercNo", userInfoVO.getZfbMercNo());
+        }
+        if (StringUtils.isNotEmpty(userInfoVO.getMcsStatus())) {
+            if ("0".equals(userInfoVO.getMcsStatus())) {
+                userInfoVO.setMcsStatus("1");
+                userInfoVO.setThirdStatus(MerchantChannelStatus.AUDIT_THIRD_STATUS_WAITING);
+                map.put("thirdStatus", userInfoVO.getThirdStatus());
+            } else if ("1".equals(userInfoVO.getMcsStatus())) {
+                userInfoVO.setThirdStatus("100");
+                map.put("thirdStatus", userInfoVO.getThirdStatus());
+            }
+            map.put("mcsStatus", userInfoVO.getMcsStatus());
+        }
+
+        if (StringUtils.isNotEmpty(userInfoVO.getPpStatus())) {
+            if ("0".equals(userInfoVO.getPpStatus())) {
+                userInfoVO.setPpStatus("1");
+                userInfoVO.setPpThirdStatus(MerchantChannelStatus.AUDIT_THIRD_STATUS_WAITING);
+                map.put("ppThirdStatus", userInfoVO.getPpThirdStatus());
+            } else if ("1".equals(userInfoVO.getPpStatus())) {
+                userInfoVO.setPpThirdStatus("100");
+                map.put("ppThirdStatus", userInfoVO.getPpThirdStatus());
+            }
+            map.put("ppStatus", userInfoVO.getPpStatus());
+        }
+
+        Page<UserInfoVO> pageData = uaService.queryUserInfoVOPage(map);
+        if (!pageData.getRecords().isEmpty()) {
+            for (UserInfoVO infoVO : pageData.getRecords()) {
+                if ("agent".equals(infoVO.getUserType()) && infoVO.getParentUserId() != null) {
+                    infoVO.setUserType("agent_agency");
+                }
+                if (infoVO.getParentUserType() != null && "agent".equals(infoVO.getParentUserType())) {
+                    Integer parentUserId = uaService.getParentUserId(infoVO.getParentUserId());
+                    if (parentUserId > 0) {
+                        infoVO.setParentUserType("agent_agency");
+                    }
+                }
+            }
+        }
+        Long count = pageData.getTotal();
+        Map<String, Object> result = new HashMap<>();
+        result.put("code", 200);
+        result.put("userAppList", pageData.getRecords());
+        result.put("count", count);
+        result.put("pageCount", StringUtil.getPageCount(count.intValue(), size));
+        result.put("currPage", currPage);
+        return result;
+    }
+
+    @GetMapping("/detail/{userId}")
+    public String detail(@PathVariable("userId") String userId) {
+        request.setAttribute("userId", userId);
+        return "promoter/detail";
+    }
+
+    @GetMapping("/getLevelConfig/{id}")
+    @ResponseBody
+    public Result<Object> getLevelConfig(@PathVariable("id") Long id) {
+        UserApp userApp = uaService.getById(id);
+        if(userApp == null || StringUtil.isEmpty(userApp.getRoleCode())){
+            return ResultGenerator.genFailResult("用户ID有误或用户角色未配置！");
+        }
+        String roleCode = userApp.getRoleCode();
+        List<UserLevelVO> levelInfoByRole = userLevelService.getLevelInfoByRole(roleCode, 0);
+        return ResultGenerator.genSuccessResult("获取成功",levelInfoByRole);
+    }
+
+    @GetMapping("/detail/audit/{userId}")
+    public String auditInfo(@PathVariable("userId") Long userId) {
+        UserApp ua = new UserApp();
+        ua.setUserId(userId);
+        ua = uaService.getOne(new QueryWrapper<>(ua));
+
+        UserInfo ui = uiService.getById(userId);
+        ua.setLoginName(ui.getLoginName());
+
+        request.setAttribute("userAppInfo", ua);
+
+        IdCard auditIdCard = idCardService.getCertIdCard(userId.toString());
+        request.setAttribute("idCard", auditIdCard);
+
+        BankCard bankCard = new BankCard();
+        bankCard.setAccountType(BankCard.ACCOUNT_TYPE_CERT);
+        bankCard.setUserId(userId.toString());
+        bankCard = bankCardService.getOne(new QueryWrapper<>(bankCard));
+        request.setAttribute("bankCard", bankCard);
+
+        getProvince();
+
+        return "promoter/audit";
+    }
+
+    @GetMapping("/detail/merchBaseInfo/{userId}")
+    public String merchBaseInfo(@PathVariable("userId") Long userId) {
+        MerchantBaseInfo mbi = mbiService.getMerchantBaseInfoByUserId(userId + "");
+        request.setAttribute("merchantBaseInfo", mbi);
+
+        List<SxfMccInfo> mccList = sxfMccInfoService.list();
+        for (SxfMccInfo c : mccList) {
+            if (c.getFMccCode().equals(mbi.getMcc())) {
+                request.setAttribute("checkMcc", JSONObject.parseObject(JSON.toJSONString(c)));
+                break;
+            }
+        }
+        request.setAttribute("mccList", JSONArray.parseArray(JSON.toJSONString(mccList)));
+
+        LambdaQueryWrapper<MerchantImage> qWrapper = Wrappers.lambdaQuery();
+        qWrapper.eq(MerchantImage::getMerchantCode, mbi.getMerchantCode());
+        qWrapper.in(MerchantImage::getPhotoType
+                , MerchantImage.ImageType.SHOP_FRONT_DOOR
+                , MerchantImage.ImageType.CASH_DESK_PHOTO
+                , MerchantImage.ImageType.STORE_INTERIOR_PHOTO
+                , MerchantImage.ImageType.MERCHANT_PROTOCOL
+                , MerchantImage.ImageType.MERCHANT_SUB_PROTOCOL);
+
+        List<MerchantImage> list = merchantImageService.list(qWrapper);
+
+        if (list == null || list.isEmpty()) {
+            getProvince();
+            return "promoter/merchBaseInfo";
+        }
+
+        for (MerchantImage mi : list) {
+            switch (mi.getPhotoType()) {
+                case MerchantImage.ImageType.SHOP_FRONT_DOOR:
+                    request.setAttribute("merchantImage6", mi.getPicUrl());
+                    break;
+                case MerchantImage.ImageType.CASH_DESK_PHOTO:
+                    request.setAttribute("merchantImage8", mi.getPicUrl());
+                    break;
+                case MerchantImage.ImageType.STORE_INTERIOR_PHOTO:
+                    request.setAttribute("merchantImage9", mi.getPicUrl());
+                    break;
+                case MerchantImage.ImageType.MERCHANT_PROTOCOL:
+                    request.setAttribute("merchantImage101", mi.getPicUrl());
+                    break;
+                case MerchantImage.ImageType.MERCHANT_SUB_PROTOCOL:
+                    request.setAttribute("merchantImage102", mi.getPicUrl());
+                    break;
+                default:
+                    break;
+            }
+        }
+
+        getProvince();
+        return "promoter/merchBaseInfo";
+    }
+
+    @GetMapping("/detail/merchLicense/{userId}")
+    public String merchLicense(@PathVariable("userId") Long userId) {
+        MerchantBaseInfo mbi = mbiService.getMerchantBaseInfoByUserId(userId + "");
+        request.setAttribute("merchantBaseInfo", mbi);
+
+        IdCard idCard = idCardService.getLegalIdCard(userId + "");
+        request.setAttribute("priceIdCard", idCard);
+
+        if (idCard != null) {
+            request.setAttribute("merchantImage1", idCard.getImgPositive());
+            request.setAttribute("merchantImage2", idCard.getImgNegative());
+        }
+
+        LambdaQueryWrapper<MerchantImage> qWrapper = Wrappers.lambdaQuery();
+        qWrapper.eq(MerchantImage::getMerchantCode, mbi.getMerchantCode());
+        qWrapper.in(MerchantImage::getPhotoType
+                , MerchantImage.ImageType.BUSINESS_LICENSE
+                , MerchantImage.ImageType.IDCARD_FRONT
+                , MerchantImage.ImageType.IDCARD_BACK);
+
+        List<MerchantImage> list = merchantImageService.list(qWrapper);
+
+        if (list == null || list.isEmpty()) {
+            getProvince();
+            return "promoter/merchLicense";
+        }
+
+        for (MerchantImage mi : list) {
+            switch (mi.getPhotoType()) {
+                case MerchantImage.ImageType.BUSINESS_LICENSE:
+                    request.setAttribute("merchantImage3", mi.getPicUrl());
+                    break;
+                default:
+                    break;
+            }
+        }
+
+        return "promoter/merchLicense";
+    }
+
+    @GetMapping("/detail/settlement/{userId}")
+    public String settlementInfo(@PathVariable("userId") Long userId) {
+        AccountDTO accountDTO = accountService.getRealAccount(userId + "");
+        if (accountDTO != null) {
+            switch (accountDTO.getSettleType()) {
+                case "011":
+                    request.setAttribute("settleTypeName", "对私法人");
+                    break;
+                case "012":
+                    request.setAttribute("settleTypeName", "非法人对私法人");
+                    break;
+                case "021":
+                    request.setAttribute("settleTypeName", "法人对私非法人");
+                    break;
+                case "022":
+                    request.setAttribute("settleTypeName", "非法人对私非法人");
+                    break;
+                case "03":
+                    request.setAttribute("settleTypeName", "对公");
+                    break;
+                case "00":
+                    request.setAttribute("settleTypeName", "小微");
+                    break;
+                default:
+                    break;
+            }
+
+            request.setAttribute("bankCard", accountDTO.getBankCard());
+            request.setAttribute("idCard", accountDTO.getIdcard());
+        }
+
+        MerchantBaseInfo mbi = mbiService.getMerchantBaseInfoByUserId(userId + "");
+        request.setAttribute("merchantCode", mbi.getMerchantCode());
+
+        LambdaQueryWrapper<MerchantImage> qWrapper = Wrappers.lambdaQuery();
+        qWrapper.eq(MerchantImage::getMerchantCode, mbi.getMerchantCode());
+        qWrapper.in(MerchantImage::getPhotoType
+                , MerchantImage.ImageType.HAND_IDCARD_PHOTO
+                , MerchantImage.ImageType.CASH_DESK_WITH_PERSON
+                , MerchantImage.ImageType.NON_LEG_SETTLE_AUTH);
+
+        List<MerchantImage> list = merchantImageService.list(qWrapper);
+
+        for (MerchantImage mi : list) {
+            switch (mi.getPhotoType()) {
+                case MerchantImage.ImageType.HAND_IDCARD_PHOTO:
+                    request.setAttribute("merchantImage11", mi.getPicUrl());
+                    break;
+                case MerchantImage.ImageType.NON_LEG_SETTLE_AUTH:
+                    request.setAttribute("merchantImage7", mi.getPicUrl());
+                    break;
+                case MerchantImage.ImageType.CASH_DESK_WITH_PERSON:
+                    request.setAttribute("merchantImage999", mi.getPicUrl());
+                    break;
+                default:
+                    break;
+            }
+        }
+
+        getProvince();
+
+        return "promoter/settlementInfo";
+    }
+
+    @GetMapping("/detail/settlementV2/{userId}")
+    public String settlementInfoV2(@PathVariable("userId") Long userId) {
+        AccountDTO accountDTO = accountService.getRealAccount(userId + "", Account.CHANNEL_TYPE_D1);
+        if (accountDTO != null) {
+            AccountVO dataD1 = Converter.INSTANCE.toVO(accountDTO);
+            String settleTypeNameD1 = AccountVO.getSettleTypeName(accountDTO.getSettleType());
+            dataD1.setSettleTypeName(settleTypeNameD1);
+            request.setAttribute("d1", dataD1);
+        }
+
+        accountDTO = accountService.getRealAccount(userId + "", Account.CHANNEL_TYPE_D0);
+        if (accountDTO != null) {
+            AccountVO dataD0 = Converter.INSTANCE.toVO(accountDTO);
+            String settleTypeNameD0 = AccountVO.getSettleTypeName(accountDTO.getSettleType());
+            dataD0.setSettleTypeName(settleTypeNameD0);
+            request.setAttribute("d0", dataD0);
+        }
+
+        MerchantBaseInfo mbi = mbiService.getMerchantBaseInfoByUserId(userId + "");
+        request.setAttribute("merchantCode", mbi.getMerchantCode());
+
+        LambdaQueryWrapper<MerchantImage> qWrapper = Wrappers.lambdaQuery();
+        qWrapper.eq(MerchantImage::getMerchantCode, mbi.getMerchantCode());
+        qWrapper.in(MerchantImage::getPhotoType
+                , MerchantImage.ImageType.HAND_IDCARD_PHOTO
+                , MerchantImage.ImageType.CASH_DESK_WITH_PERSON
+                , MerchantImage.ImageType.NON_LEG_SETTLE_AUTH);
+
+        List<MerchantImage> list = merchantImageService.list(qWrapper);
+
+        for (MerchantImage mi : list) {
+            switch (mi.getPhotoType()) {
+                case MerchantImage.ImageType.HAND_IDCARD_PHOTO:
+                    request.setAttribute("merchantImage11", mi.getPicUrl());
+                    break;
+                case MerchantImage.ImageType.NON_LEG_SETTLE_AUTH:
+                    request.setAttribute("merchantImage7", mi.getPicUrl());
+                    break;
+                case MerchantImage.ImageType.CASH_DESK_WITH_PERSON:
+                    request.setAttribute("merchantImage999", mi.getPicUrl());
+                    break;
+                default:
+                    break;
+            }
+        }
+
+        getProvince();
+
+        return "promoter/settlementInfoV2";
+    }
+
+    @GetMapping("/detail/channelAuditInfo/{userId}")
+    public String channelAuditInfo(@PathVariable("userId") Long userId) {
+        MerchantBaseInfo mbi = mbiService.getMerchantBaseInfoByUserId(userId + "");
+        if (mbi != null) {
+            QueryWrapper<MerchantChannelStatus> qWrapper = new QueryWrapper<MerchantChannelStatus>()
+                    .eq("merchantCode", mbi.getMerchantCode());
+            List<MerchantChannelStatus> channelStatusList = merchantChannelStatusService.list(qWrapper);
+            request.setAttribute("channelStatusList", channelStatusList);
+
+            List<MerchantChannel> channelList = merchantChannelService.list(new LambdaQueryWrapper<MerchantChannel>().eq(MerchantChannel::getStatus, "1"));
+            request.setAttribute("channel", channelList);
+        }
+
+        List<MerchantRejectDesc> listMerchantRejectDesc = merchantRejectDescService.list();
+        request.setAttribute("listMerchantRejectDesc", listMerchantRejectDesc);
+
+        UserApp appInfo = uaService.queryUserAppJoinById(userId);
+        request.setAttribute("ppStatus", appInfo.getPpStatus());
+        request.setAttribute("ppThirdStatus", appInfo.getPpThirdStatus());
+        request.setAttribute("userId", userId);
+        request.setAttribute("mbi", mbi);
+
+        return "promoter/channelAuditInfo";
+    }
+
+    /**
+     * 查询详情
+     */
+    @GetMapping(value = {"/queryUserAppBaseInfo/{userId}"})
+    public ModelAndView queryUserAppBaseInfo(@PathVariable(value = "userId", required = false) Long userId) {
+        ModelAndView view = new ModelAndView();
+        view.setViewName("promoter/userAppBaseInfo");
+        Map<String, String> uploadParam = OssOperatUtil.getUploadParam();
+        view.addObject("uploadParam", uploadParam);
+        if (userId != null) {
+            /*
+             * 获取推广员基本信息，商户信息，营业执照信息
+             */
+            UserApp appInfo = uaService.queryUserAppJoinById(userId);
+            if (appInfo != null) {
+                QueryWrapper<MerchantChannelStatus> qWrapper = new QueryWrapper<MerchantChannelStatus>().eq("merchantCode", appInfo.getMerchantCode());
+                List<MerchantChannelStatus> channelStatusList = merchantChannelStatusService.list(qWrapper);
+                appInfo.setChannelStatusList(channelStatusList);
+            }
+
+            List<MerchantChannel> channelList = merchantChannelService.list(new LambdaQueryWrapper<MerchantChannel>().eq(MerchantChannel::getStatus, "1"));
+            view.addObject("channel", channelList);
+            if (appInfo != null && appInfo.getMerchantBaseInfo() != null) {
+                switch (appInfo.getMerchantBaseInfo().getProvince()) {
+                    case "北京":
+                        appInfo.getMerchantBaseInfo().setProvince("北京市");
+                        break;
+                    case "天津":
+                        appInfo.getMerchantBaseInfo().setProvince("天津市");
+                        break;
+                    case "重庆":
+                        appInfo.getMerchantBaseInfo().setProvince("重庆市");
+                        break;
+                    case "上海":
+                        appInfo.getMerchantBaseInfo().setProvince("上海市");
+                        break;
+                    default:
+                        break;
+                }
+                List<MerchantRejectDesc> listMerchantRejectDesc = merchantRejectDescService.list();
+                view.addObject("listMerchantRejectDesc", listMerchantRejectDesc);
+                //获取法人身份证号
+                QueryWrapper<IdCard> idCardQueryWrapper = new QueryWrapper<IdCard>()
+                        .eq("userId", userId).eq("userType", IdCard.TYPE_LEGAL);
+                IdCard priceIdCard = idCardService.getOne(idCardQueryWrapper);
+                view.addObject("priceIdCard", priceIdCard);
+                //获取结算信息
+                if (appInfo.getUserId() != null) {
+                    try {
+                        AccountDTO account = accountService.getRealAccount(appInfo.getUserId().toString());
+                        if (account != null) {
+                            switch (account.getSettleType()) {
+                                case "011":
+                                    view.addObject("settleTypeName", "对私法人");
+                                    break;
+                                case "012":
+                                    view.addObject("settleTypeName", "非法人对私法人");
+                                    break;
+                                case "021":
+                                    view.addObject("settleTypeName", "法人对私非法人");
+                                    break;
+                                case "022":
+                                    view.addObject("settleTypeName", "非法人对私非法人");
+                                    break;
+                                case "03":
+                                    view.addObject("settleTypeName", "对公");
+                                    break;
+                                case "00":
+                                    view.addObject("settleTypeName", "小微");
+                                    break;
+                                default:
+                                    break;
+                            }
+                            view.addObject("settleTypeCode", account.getSettleType());
+                            BankCard bankCard = account.getBankCard();
+                            IdCard idCard = account.getIdcard();
+                            view.addObject("bankCard", bankCard);
+                            view.addObject("idCard", idCard);
+                        }
+                    } catch (Exception ignored) {
+                    }
+                }
+                if (StringUtils.isNotEmpty(appInfo.getMerchantCode())) {
+                    //获取图片信息
+                    MerchantImage image = new MerchantImage();
+                    image.setMerchantCode(appInfo.getMerchantCode());
+                    //获取经营类目信息
+                    if (appInfo.getMerchantBaseInfo() != null) {
+                        List<SxfMccInfo> list = sxfMccInfoService.list();
+                        for (SxfMccInfo c : list) {
+                            if (c.getFMccCode().equals(appInfo.getMerchantBaseInfo().getMcc())) {
+                                view.addObject("checkMcc", JSON.parseObject(JSON.toJSONString(c)));
+                                break;
+                            }
+                        }
+                        request.setAttribute("mccList", JSON.parseArray(JSON.toJSONString(list)));
+                    }
+                    List<MerchantImage> imageList = merchantImageService.queryMerchantImageList(image);
+                    String merchantImage1 = null;
+                    String merchantImage2 = null;
+                    String merchantImage3 = null;
+                    String merchantImage6 = null;
+                    String merchantImage7 = null;
+                    String merchantImage8 = null;
+                    String merchantImage9 = null;
+                    String merchantImage98 = null;
+                    String merchantImage999 = null;
+                    String merchantImage101 = null;
+                    String merchantImage102 = null;
+                    String merchantImage11 = null;
+                    if (imageList != null && !imageList.isEmpty()) {
+                        for (MerchantImage m : imageList) {
+                            switch (m.getPhotoType()) {
+                                case MerchantImage.ImageType.IDCARD_FRONT:
+                                    merchantImage1 = m.getPicUrl();
+                                    break;
+                                case MerchantImage.ImageType.IDCARD_BACK:
+                                    merchantImage2 = m.getPicUrl();
+                                    break;
+                                case MerchantImage.ImageType.BUSINESS_LICENSE:
+                                    merchantImage3 = m.getPicUrl();
+                                    break;
+                                case MerchantImage.ImageType.SHOP_FRONT_DOOR:
+                                    merchantImage6 = m.getPicUrl();
+                                    break;
+                                case MerchantImage.ImageType.NON_LEG_SETTLE_AUTH:
+                                    merchantImage7 = m.getPicUrl();
+                                    break;
+                                case MerchantImage.ImageType.CASH_DESK_PHOTO:
+                                    merchantImage8 = m.getPicUrl();
+                                    break;
+                                case MerchantImage.ImageType.STORE_INTERIOR_PHOTO:
+                                    merchantImage9 = m.getPicUrl();
+                                    break;
+                                case MerchantImage.ImageType.BANK_CARD_FRONT:
+                                    merchantImage98 = m.getPicUrl();
+                                    break;
+                                case MerchantImage.ImageType.CASH_DESK_WITH_PERSON:
+                                    merchantImage999 = m.getPicUrl();
+                                    break;
+                                case MerchantImage.ImageType.MERCHANT_PROTOCOL:
+                                    merchantImage101 = m.getPicUrl();
+                                    break;
+                                case MerchantImage.ImageType.MERCHANT_SUB_PROTOCOL:
+                                    merchantImage102 = m.getPicUrl();
+                                    break;
+                                case MerchantImage.ImageType.HAND_IDCARD_PHOTO:
+                                    merchantImage11 = m.getPicUrl();
+                                    break;
+                                default:
+                                    break;
+                            }
+                        }
+                        view.addObject("merchantImage1", merchantImage1);
+                        view.addObject("merchantImage2", merchantImage2);
+                        view.addObject("merchantImage3", merchantImage3);
+                        view.addObject("merchantImage6", merchantImage6);
+                        view.addObject("merchantImage7", merchantImage7);
+                        view.addObject("merchantImage8", merchantImage8);
+                        view.addObject("merchantImage9", merchantImage9);
+                        view.addObject("merchantImage98", merchantImage98);
+                        view.addObject("merchantImage999", merchantImage999);
+                        view.addObject("merchantImage101", merchantImage101);
+                        view.addObject("merchantImage102", merchantImage102);
+                        view.addObject("merchantImage11", merchantImage11);
+                    }
+                }
+            } else {
+                appInfo = new UserApp();
+                appInfo.setUserId(userId);
+            }
+            view.addObject("userAppInfo", appInfo);
+            QueryWrapper<MerchantPlugin> queryWrapper = new QueryWrapper<MerchantPlugin>().eq("userId", userId);
+            int count = merchantPluginService.count(queryWrapper);
+            view.addObject("count", count);
+        } else {
+            view.addObject("userAppInfo", new UserApp());
+        }
+        getProvince();
+        return view;
+    }
+
+    /**
+     * 获取所有省
+     */
+    private void getProvince() {
+        QueryWrapper<AreaCity> queryWrapper = new QueryWrapper<AreaCity>().eq("type", "1");
+        List<AreaCity> areaCitiesList = areaCityMapper.selectList(queryWrapper);
+        for (AreaCity areaCity : areaCitiesList) {
+            switch (areaCity.getAreaName()) {
+                case "北京":
+                    areaCity.setAreaName("北京市");
+                    break;
+                case "天津":
+                    areaCity.setAreaName("天津市");
+                    break;
+                case "重庆":
+                    areaCity.setAreaName("重庆市");
+                    break;
+                case "上海":
+                    areaCity.setAreaName("上海市");
+                    break;
+                default:
+                    break;
+            }
+        }
+
+        request.setAttribute("areaCitiesList", areaCitiesList);
+    }
+
+    /**
+     * 获取所在省的所有市/获取所在市的所有区
+     */
+    @GetMapping(value = "/getDowntownByCode/{areaCode}")
+    @ResponseBody
+    public Map<String, Object> getDowntown(@PathVariable(value = "areaCode") String areaCode) {
+        QueryWrapper<AreaCity> queryWrapper = new QueryWrapper<AreaCity>().eq("parentAreaCode", areaCode);
+        List<AreaCity> areaCityList = areaCityMapper.selectList(queryWrapper);
+        Map<String, Object> result = new HashMap<>();
+        result.put("areaCityList", areaCityList);
+        result.put("code", 200);
+        return result;
+    }
+
+    /**
+     * 获取所在省的所有市/获取所在市的所有区
+     */
+    @GetMapping(value = "/getDowntownByName/city/{areaName}")
+    @ResponseBody
+    public Map<String, Object> getDowntown2(@PathVariable(value = "areaName") String areaName) {
+        LambdaQueryWrapper<AreaCity> qWrapper = new LambdaQueryWrapper<AreaCity>().eq(AreaCity::getAreaName, areaName);
+        AreaCity entity = areaCityMapper.selectOne(qWrapper);
+
+        if (areaName.equals("北京市") || areaName.equals("上海市") || areaName.equals("天津市") || areaName.equals("重庆市")) {
+            Map<String, Object> result = new HashMap<>();
+            result.put("areaCityList", Arrays.asList(entity));
+            result.put("code", 200);
+            return result;
+        }
+        
+        QueryWrapper<AreaCity> queryWrapper = new QueryWrapper<AreaCity>().eq("parentAreaCode", entity.getAreaCode());
+        List<AreaCity> areaCityList = areaCityMapper.selectList(queryWrapper);
+        Map<String, Object> result = new HashMap<>();
+        result.put("areaCityList", areaCityList);
+        result.put("code", 200);
+        return result;
+    }
+
+    /**
+     * 获取所在省的所有市/获取所在市的所有区
+     */
+    @GetMapping(value = "/getDowntownByName/area/{areaName}")
+    @ResponseBody
+    public Map<String, Object> getDowntown3(@PathVariable(value = "areaName") String areaName) {
+        LambdaQueryWrapper<AreaCity> qWrapper = new LambdaQueryWrapper<AreaCity>().eq(AreaCity::getAreaName, areaName);
+        AreaCity entity = areaCityMapper.selectOne(qWrapper);
+        QueryWrapper<AreaCity> queryWrapper = new QueryWrapper<AreaCity>().eq("parentAreaCode", entity.getAreaCode());
+        List<AreaCity> areaCityList = areaCityMapper.selectList(queryWrapper);
+        Map<String, Object> result = new HashMap<>();
+        result.put("areaCityList", areaCityList);
+        result.put("code", 200);
+        return result;
+    }
+
+    /**
+     * 获取对应的银行
+     */
+    @GetMapping(value = "/getBranchList")
+    @ResponseBody
+    public Map<String, Object> getBranchList(String bankName, String cityName) {
+        if ("浦发银行".equals(bankName)) {
+            bankName = "上海浦东发展银行";
+        }
+        QueryWrapper<BankCodeSxf> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("city_name", cityName);
+        if (!"其他银行".equals(bankName)) {
+            queryWrapper.likeLeft("bank_name", bankName);
+        }
+
+        List<BankCodeSxf> data = bankCodeSxfMapper.selectList(queryWrapper);
+
+        Map<String, Object> result = new HashMap<>(8);
+        result.put("branchList", data);
+        result.put("code", 200);
+        return result;
+    }
+
+    /**
+     * 保存对象
+     */
+    @PostMapping("/saveUserApp")
+    @ResponseBody
+    public Map<String, Object> saveUserApp(UserApp userApp) {
+        uaService.saveOrUpdate(userApp);
+        Map<String, Object> result = new HashMap<>();
+        result.put("resultCode", "1");
+        result.put("resultMessage", "保存成功!");
+        return result;
+    }
+
+    /**
+     * 修改推广员基本信息
+     */
+    @PostMapping("/updatePromoterInformation")
+    @Transactional
+    @ResponseBody
+    public Result<UserApp> updatePromoterInformation(UserApp userApp) {
+        if (userApp == null) {
+            return ResultGenerator.genFailResult("缺少参数", null);
+        }
+        //修改推广员名称和登录账号
+        UserApp appUser = new UserApp();
+        UserInfo userInfo = new UserInfo();
+        userInfo.setLoginName(userApp.getLoginName());
+        userInfo.setPhone(userApp.getLoginName());
+        userInfo.setTrueName(userApp.getUserName());
+        appUser.setLoginName(userApp.getLoginName());
+        appUser.setUserName(userApp.getUserName());
+        UpdateWrapper<UserApp> userAppUpdateWrapper = new UpdateWrapper<UserApp>().eq("userId", userApp.getUserId());
+        uaService.update(appUser, userAppUpdateWrapper);
+        UpdateWrapper<UserInfo> userInfoUpdateWrapper = new UpdateWrapper<UserInfo>().eq("id", userApp.getUserId());
+        uiService.update(userInfo, userInfoUpdateWrapper);
+
+
+        if (Objects.equals(userApp.getStatus(), 3)) {
+            //保存实名认证的其他信息
+            UpdateWrapper<BankCard> bankCardUpdateWrapper = new UpdateWrapper<BankCard>().eq("userId", userApp.getUserId());
+            //判断实名人与结算人是否为同一人
+            AccountDTO accountDTO = accountService.getRealAccount(userApp.getBankCard().getUserId());
+            if (accountDTO == null || accountDTO.getIdcard() == null || !userApp.getIdCard().getCertNo().equals(accountDTO.getIdcard().getCertNo())) {
+                bankCardUpdateWrapper.eq("accountType", BankCard.ACCOUNT_TYPE_CERT);
+            }
+            if ("".equals(userApp.getBankCard().getImgUrl())) {
+                userApp.getBankCard().setImgUrl(null);
+            }
+            QueryWrapper<AreaCity> areaCityQueryWrapper = new QueryWrapper<AreaCity>().
+                    in("areaCode", userApp.getBankCard().getBranchProvince(),
+                            userApp.getBankCard().getBranchCity(), userApp.getBankCard().getBranchArea());
+            List<AreaCity> areaCityList = areaCityMapper.selectList(areaCityQueryWrapper);
+            for (AreaCity areaCity : areaCityList) {
+                if ("1".equals(areaCity.getType())) {
+                    userApp.getBankCard().setBranchProvince(areaCity.getAreaName());
+                } else if ("2".equals(areaCity.getType())) {
+                    userApp.getBankCard().setBranchCity(areaCity.getAreaName());
+                } else if ("3".equals(areaCity.getType()) || "4".equals(areaCity.getType())) {
+                    userApp.getBankCard().setBranchArea(areaCity.getAreaName());
+                }
+            }
+            LambdaQueryWrapper<BankCodeSxf> sxfQueryWrapper = new LambdaQueryWrapper<BankCodeSxf>()
+                    .eq(StringUtils.isNotEmpty(userApp.getBankCard().getContactLine()), BankCodeSxf::getCnapsCode, userApp.getBankCard().getContactLine())
+                    .eq(StringUtils.isNotEmpty(userApp.getBankCard().getBranchName()), BankCodeSxf::getCnapsName, userApp.getBankCard().getBranchName())
+                    .last("limit 1");
+            BankCodeSxf bankCodeSxf = bankCodeSxfMapper.selectOne(sxfQueryWrapper);
+            if (bankCodeSxf == null) {
+                throw new MsgException("未找到支行信息");
+            }
+            userApp.getBankCard().setContactLine(bankCodeSxf.getCnapsCode());
+            bankCardService.update(userApp.getBankCard(), bankCardUpdateWrapper);
+            UpdateWrapper<IdCard> idCardUpdateWrapper = new UpdateWrapper<IdCard>().eq("userId", userApp.getUserId()).eq("userType", IdCard.TYPE_CERT);
+            if ("".equals(userApp.getIdCard().getImgPositive())) {
+                userApp.getIdCard().setImgPositive(null);
+            }
+            if ("".equals(userApp.getIdCard().getImgNegative())) {
+                userApp.getIdCard().setImgNegative(null);
+            }
+            idCardService.update(userApp.getIdCard(), idCardUpdateWrapper);
+        }
+        return ResultGenerator.genSuccessResult("保存成功！", null);
+    }
+
+    /**
+     * 修改商户信息
+     */
+    @PostMapping("/updateMerchantInformation")
+    @ResponseBody
+    public Result<UserApp> updateMerchantInformation(UserApp userApp, MerchantImage merchantImage) {
+        if (userApp.getMerchantBaseInfo() != null) {
+            QueryWrapper<AreaCity> areaCityQueryWrapper = new QueryWrapper<AreaCity>().
+                    in("areaCode", userApp.getMerchantBaseInfo().getProvince(),
+                            userApp.getMerchantBaseInfo().getCity(), userApp.getMerchantBaseInfo().getDistrict());
+            List<AreaCity> areaCityList = areaCityMapper.selectList(areaCityQueryWrapper);
+            for (AreaCity areaCity : areaCityList) {
+                if ("1".equals(areaCity.getType())) {
+                    userApp.getMerchantBaseInfo().setProvince(areaCity.getAreaName());
+                } else if ("2".equals(areaCity.getType())) {
+                    userApp.getMerchantBaseInfo().setCity(areaCity.getAreaName());
+                } else if ("3".equals(areaCity.getType()) || "4".equals(areaCity.getType())) {
+                    userApp.getMerchantBaseInfo().setDistrict(areaCity.getAreaName());
+                }
+            }
+            UpdateWrapper<MerchantBaseInfo> merchantBaseInfoUpdateWrapper = new UpdateWrapper<MerchantBaseInfo>().eq("userId", userApp.getUserId());
+            mbiService.update(userApp.getMerchantBaseInfo(), merchantBaseInfoUpdateWrapper);
+        }
+
+
+        if (userApp.getMerchantCode() != null) {
+            UpdateWrapper<MerchantImage> merchantImageUpdateWrapper;
+            if (!"".equals(merchantImage.getPicUrl6())) {
+                merchantImage.setPicUrl(merchantImage.getPicUrl6());
+                merchantImage.setPhotoType(MerchantImage.ImageType.SHOP_FRONT_DOOR);
+                merchantImageUpdateWrapper = new UpdateWrapper<MerchantImage>()
+                        .eq("merchantCode", userApp.getMerchantCode()).eq("photoType", merchantImage.getPhotoType());
+                merchantImageService.saveOrUpdate(merchantImage, merchantImageUpdateWrapper);
+            }
+
+            if (!"".equals(merchantImage.getPicUrl8())) {
+                merchantImage.setPicUrl(merchantImage.getPicUrl8());
+                merchantImage.setPhotoType(MerchantImage.ImageType.CASH_DESK_PHOTO);
+                merchantImageUpdateWrapper = new UpdateWrapper<MerchantImage>()
+                        .eq("merchantCode", userApp.getMerchantCode()).eq("photoType", merchantImage.getPhotoType());
+                merchantImageService.saveOrUpdate(merchantImage, merchantImageUpdateWrapper);
+            }
+            if (!"".equals(merchantImage.getPicUrl9())) {
+                merchantImage.setPicUrl(merchantImage.getPicUrl9());
+                merchantImage.setPhotoType(MerchantImage.ImageType.STORE_INTERIOR_PHOTO);
+                merchantImageUpdateWrapper = new UpdateWrapper<MerchantImage>()
+                        .eq("merchantCode", userApp.getMerchantCode()).eq("photoType", merchantImage.getPhotoType());
+                merchantImageService.saveOrUpdate(merchantImage, merchantImageUpdateWrapper);
+            }
+
+            if (!"".equals(merchantImage.getPicUrl101())) {
+                merchantImage.setPicUrl(merchantImage.getPicUrl101());
+                merchantImage.setPhotoType(MerchantImage.ImageType.MERCHANT_PROTOCOL);
+                merchantImageUpdateWrapper = new UpdateWrapper<MerchantImage>()
+                        .eq("merchantCode", userApp.getMerchantCode()).eq("photoType", merchantImage.getPhotoType());
+                merchantImageService.saveOrUpdate(merchantImage, merchantImageUpdateWrapper);
+            }
+
+            if (!"".equals(merchantImage.getPicUrl102())) {
+                merchantImage.setPicUrl(merchantImage.getPicUrl102());
+                merchantImage.setPhotoType(MerchantImage.ImageType.MERCHANT_SUB_PROTOCOL);
+                merchantImageUpdateWrapper = new UpdateWrapper<MerchantImage>()
+                        .eq("merchantCode", userApp.getMerchantCode()).eq("photoType", merchantImage.getPhotoType());
+                merchantImageService.saveOrUpdate(merchantImage, merchantImageUpdateWrapper);
+            }
+        }
+        return ResultGenerator.genSuccessResult("保存成功！", null);
+    }
+
+    /**
+     * 修改营业执照信息
+     */
+    @PostMapping("/updateMerchantLicense")
+    @Transactional
+    @ResponseBody
+    public Result<UserApp> updateMerchantLicense(UserApp userApp, MerchantImage merchantImage, String certNo,
+                                                 String certName, String certStartTime, String certEndTime) {
+        if (userApp.getMerchantBaseInfo() != null) {
+            UpdateWrapper<MerchantBaseInfo> merchantBaseInfoUpdateWrapper = new UpdateWrapper<MerchantBaseInfo>().eq("userId", userApp.getUserId());
+            mbiService.update(userApp.getMerchantBaseInfo(), merchantBaseInfoUpdateWrapper);
+        }
+        //更改法人身份证号
+        if (StringUtils.isNotEmpty(certNo) && StringUtils.isNotEmpty(certName)) {
+            IdCard idCard = new IdCard();
+            idCard.setCertNo(certNo);
+            idCard.setImgPositive(merchantImage.getPicUrl1());
+            idCard.setImgNegative(merchantImage.getPicUrl2());
+            idCard.setCertStartTime(certStartTime);
+            idCard.setCertEndTime(certEndTime);
+            UpdateWrapper<IdCard> cardUpdateWrapper = new UpdateWrapper<IdCard>()
+                    .eq("certName", certName).eq("userId", userApp.getUserId()).eq("userType", IdCard.TYPE_LEGAL);
+            boolean update = idCardService.update(idCard, cardUpdateWrapper);
+            if (!update) {
+                idCard.setUserType(IdCard.TYPE_LEGAL);
+                idCard.setUserId(userApp.getUserId() + "");
+                idCard.setCertType("00");
+                idCard.setCertName(certName);
+                idCardService.save(idCard);
+            }
+        }
+        if (userApp.getMerchantCode() != null) {
+            if (!"".equals(merchantImage.getPicUrl3())) {
+                merchantImage.setPicUrl(merchantImage.getPicUrl3());
+                merchantImage.setPhotoType(MerchantImage.ImageType.BUSINESS_LICENSE);
+
+                UpdateWrapper<MerchantImage> merchantImageUpdateWrapper = new UpdateWrapper<MerchantImage>()
+                        .eq("merchantCode", userApp.getMerchantCode()).eq("photoType", merchantImage.getPhotoType());
+                merchantImageService.update(merchantImage, merchantImageUpdateWrapper);
+            }
+
+            if (!"".equals(merchantImage.getPicUrl1())) {
+                merchantImage.setPicUrl(merchantImage.getPicUrl1());
+                merchantImage.setPhotoType(MerchantImage.ImageType.IDCARD_FRONT);
+
+                UpdateWrapper<MerchantImage> merchantImageUpdateWrapper = new UpdateWrapper<MerchantImage>()
+                        .eq("merchantCode", userApp.getMerchantCode()).eq("photoType", merchantImage.getPhotoType());
+                merchantImageService.update(merchantImage, merchantImageUpdateWrapper);
+            }
+
+            if (!"".equals(merchantImage.getPicUrl2())) {
+                merchantImage.setPicUrl(merchantImage.getPicUrl2());
+                merchantImage.setPhotoType(MerchantImage.ImageType.IDCARD_BACK);
+
+                UpdateWrapper<MerchantImage> merchantImageUpdateWrapper = new UpdateWrapper<MerchantImage>()
+                        .eq("merchantCode", userApp.getMerchantCode()).eq("photoType", merchantImage.getPhotoType());
+                merchantImageService.update(merchantImage, merchantImageUpdateWrapper);
+            }
+        }
+        return ResultGenerator.genSuccessResult("保存成功！", null);
+    }
+
+    /**
+     * 修改结算信息
+     */
+    @PostMapping("/updateMerchantSettlement")
+    @Transactional
+    @ResponseBody
+    public Result<UserApp> updateMerchantSettlement(UserApp userApp, MerchantImage merchantImage) {
+        if (userApp.getBankCard() != null) {
+            LambdaQueryWrapper<BankCodeSxf> qWrapper = new LambdaQueryWrapper<BankCodeSxf>()
+                    .eq(BankCodeSxf::getCnapsCode, userApp.getBankCard().getContactLine());
+            BankCodeSxf bankCodeSxf = bankCodeSxfMapper.selectOne(qWrapper);
+            userApp.getBankCard().setBranchName(bankCodeSxf.getCnapsName());
+            // 这里获取结算账户的类型
+            AccountDTO realAccount = accountService.getRealAccount(userApp.getIdCard().getUserId());
+            BankCard existBankCard = realAccount.getBankCard();
+            BankCard editBankCard = userApp.getBankCard();
+            editBankCard.setAccountType(existBankCard.getAccountType());
+            bankCardService.saveOrUpdate(editBankCard);
+        }
+        if (userApp.getIdCard() != null) {
+            idCardService.saveOrUpdate(userApp.getIdCard());
+        }
+        if (userApp.getMerchantCode() != null) {
+            //修改结算人与收银台合照
+            if (!"".equals(merchantImage.getPicUrl999())) {
+                merchantImage.setPicUrl(merchantImage.getPicUrl999());
+                merchantImage.setPhotoType(MerchantImage.ImageType.CASH_DESK_WITH_PERSON);
+
+                UpdateWrapper<MerchantImage> merchantImageUpdateWrapper = new UpdateWrapper<MerchantImage>()
+                        .eq("merchantCode", userApp.getMerchantCode()).eq("photoType", merchantImage.getPhotoType());
+                boolean update = merchantImageService.update(merchantImage, merchantImageUpdateWrapper);
+                if (!update) {
+                    merchantImage.setMerchantCode(userApp.getMerchantCode());
+                    merchantImageService.save(merchantImage);
+                }
+            }
+            //修改结算人手持身份证照
+            if (!"".equals(merchantImage.getPicUrl11())) {
+                merchantImage.setPicUrl(merchantImage.getPicUrl11());
+                merchantImage.setPhotoType(MerchantImage.ImageType.HAND_IDCARD_PHOTO);
+
+
+                UpdateWrapper<MerchantImage> merchantImageUpdateWrapper = new UpdateWrapper<MerchantImage>()
+                        .eq("merchantCode", userApp.getMerchantCode()).eq("photoType", merchantImage.getPhotoType());
+                boolean update = merchantImageService.update(merchantImage, merchantImageUpdateWrapper);
+                if (!update) {
+                    merchantImage.setMerchantCode(userApp.getMerchantCode());
+                    merchantImageService.save(merchantImage);
+                }
+            }
+        }
+        return ResultGenerator.genSuccessResult("保存成功！", null);
+    }
+
+    /**
+     * 修改结算信息
+     */
+    @PostMapping("/updateMerchantSettlement2")
+    @Transactional
+    @ResponseBody
+    public Result<UserApp> updateMerchantSettlement2(AccountDTO accountDTO, MerchantImage merchantImage) {
+        if (accountDTO != null && accountDTO.getUserId() != null) {
+            accountService.saveV4(accountDTO, false);
+        }
+
+        // System.out.println(JSON.toJSONString(accountDTO));
+//        BankCard editBankCard = accountDTO.getBankCard();
+//        if (editBankCard != null) {
+//            MsgException.checkNull(editBankCard.getId(), "无结算银行卡信息，请先从通过app填写结算信息!");
+//
+//            LambdaQueryWrapper<BankCodeSxf> qWrapper = new LambdaQueryWrapper<BankCodeSxf>()
+//                    .eq(BankCodeSxf::getCnapsCode, editBankCard.getContactLine());
+//            BankCodeSxf bankCodeSxf = bankCodeSxfMapper.selectOne(qWrapper);
+//            editBankCard.setBranchName(bankCodeSxf.getCnapsName());
+//
+//            bankCardService.updateById(editBankCard);
+//        }
+//
+//        IdCard editIdCard = accountDTO.getIdcard();
+//        if (editIdCard != null) {
+//            MsgException.checkNull(editBankCard.getId(), "无结算身份证信息，请先从通过app填写结算信息!");
+//
+//            idCardService.updateById(editIdCard);
+//        }
+
+        if (merchantImage.getMerchantCode() != null) {
+            //修改结算人与收银台合照
+            if (!StringUtils.isEmpty(merchantImage.getPicUrl999())) {
+                merchantImage.setPicUrl(merchantImage.getPicUrl999());
+                merchantImage.setPhotoType(MerchantImage.ImageType.CASH_DESK_WITH_PERSON);
+
+                UpdateWrapper<MerchantImage> merchantImageUpdateWrapper = new UpdateWrapper<MerchantImage>()
+                        .eq("merchantCode", merchantImage.getMerchantCode()).eq("photoType", merchantImage.getPhotoType());
+                boolean update = merchantImageService.update(merchantImage, merchantImageUpdateWrapper);
+                if (!update) {
+                    merchantImage.setMerchantCode(merchantImage.getMerchantCode());
+                    merchantImageService.save(merchantImage);
+                }
+            }
+            //修改结算人手持身份证照
+            if (!StringUtils.isEmpty(merchantImage.getPicUrl11())) {
+                merchantImage.setPicUrl(merchantImage.getPicUrl11());
+                merchantImage.setPhotoType(MerchantImage.ImageType.HAND_IDCARD_PHOTO);
+
+                UpdateWrapper<MerchantImage> merchantImageUpdateWrapper = new UpdateWrapper<MerchantImage>()
+                        .eq("merchantCode", merchantImage.getMerchantCode()).eq("photoType", merchantImage.getPhotoType());
+                boolean update = merchantImageService.update(merchantImage, merchantImageUpdateWrapper);
+                if (!update) {
+                    merchantImage.setMerchantCode(merchantImage.getMerchantCode());
+                    merchantImageService.save(merchantImage);
+                }
+            }
+        }
+
+        // throw new MsgException("终止操作");
+        return ResultGenerator.genSuccessResult("保存成功！", null);
+    }
+
+    /**
+     * 删除对象
+     */
+    @PostMapping("/deleteUserApp")
+    @ResponseBody
+    public Map<String, Object> deleteUserApp(Long id) {
+        uaService.removeById(id);
+        Map<String, Object> result = new HashMap<>();
+        result.put("resultCode", "1");
+        result.put("resultMessage", "保存成功!");
+        return result;
+    }
+
+    /**
+     * 审核对象
+     */
+    @PostMapping("/toExamine")
+    @ResponseBody
+    public Map<String, Object> toExamine(Long id, Integer status, String certReason) {
+        UserApp userApp = new UserApp();
+        userApp.setId(id);
+        userApp = uaService.queryUserApp(userApp);
+        userApp.setStatus(status);
+        userApp.setCertReason(certReason);
+        uaService.updateById(userApp);
+        String statusZh = "审核通过";
+        if (status == 2) {
+            statusZh = "很遗憾，您的实名认证未通过，" + certReason + "，请您核对信息。";
+        }
+        List<String> alias = new ArrayList<>();
+        alias.add(userApp.getUserId().toString());
+        generalPushUtil.sendAllPlatByAlias(alias, "实名认证通知", statusZh, "1");
+
+        Notice notice = new Notice();
+        notice.setUserId(userApp.getUserId().toString());
+        notice.setUserName(userApp.getUserName());
+        notice.setTypeFirst(1);
+        notice.setTypeSecond(0);
+        notice.setIsDeal(0);
+        notice.setConrtent(statusZh);
+        notice.setCreateDt(new Date());
+        notice.setNoticeCode(UUID.randomUUID().toString().replace("-", ""));
+        noticeService.saveNotice(notice);
+        Map<String, Object> result = new HashMap<>();
+        result.put("resultCode", "1");
+        result.put("resultMessage", "审核成功!");
+        return result;
+    }
+
+    /**
+     * goLevel:(修改等级). <br/>
+     *
+     * @since JDK 1.8
+     */
+//    @PostMapping(value = "/goLevel")
+//    @ResponseBody
+//    public Map<String, Object> goLevel(Long id, Integer level) {
+//        Map<String, Object> result = new HashMap<>(16);
+//        try {
+//            System.out.println("等级：" + level);
+//            UserApp userApp = new UserApp();
+//            userApp.setLevel(level);
+//            userApp.setId(id);
+//            uaService.updateById(userApp);
+//            result.put("code", "1");
+//            result.put("msg", "修改成功");
+//            return result;
+//        } catch (Exception e) {
+//            result.put("code", "0");
+//            result.put("msg", "修改失败");
+//            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+//            e.printStackTrace();
+//            return result;
+//        }
+//    }
+
+
+    /**
+     * goLevel:(修改等级). <br/>
+     * @since JDK 1.8
+     */
+    @PostMapping(value = "/goLevelV2")
+    @ResponseBody
+    public Result<Object> goLevelV2(Long id, String levelCode) {
+        try {
+            UserApp userApp = new UserApp();
+            userApp.setLevelCode(levelCode);
+            userApp.setId(id);
+            uaService.updateById(userApp);
+            return ResultGenerator.genSuccessResult("操作成功！",null);
+        } catch (Exception e) {
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            e.printStackTrace();
+            return ResultGenerator.genFailResult("操作失败！");
+        }
+    }
+
+    /**
+     * 修改图片
+     */
+    @RequestMapping(value = "/updateImage", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> updateImage(@RequestParam(value = "file") MultipartFile file, String imageType, String merchantCode, String type, String dataId) throws IOException {
+        Map<String, Object> result = new HashMap<>(2);
+        if (file.getSize() == 0) {
+            result.put("code", "0");
+            result.put("msg", "上传图片不能为空！");
+            return result;
+        }
+        if (StringUtil.isEmpty(imageType)) {
+            result.put("code", "0");
+            result.put("msg", "上传图片类型不能为空！");
+            return result;
+        }
+        if (StringUtil.isEmpty(merchantCode)) {
+            result.put("code", "0");
+            result.put("msg", "商户编号不能为空！");
+            return result;
+        }
+
+        String suffix = Objects.requireNonNull(file.getOriginalFilename()).substring(file.getOriginalFilename().lastIndexOf(".") + 1);
+        // 保存文件名称
+        String fileName = StringUtil.getBillno() + "." + suffix;
+        String uploadPath = ParametersUtil.upload_save_path;
+        String visitPath = ParametersUtil.upload_visit_path;
+        Properties prop = System.getProperties();
+        String os = prop.getProperty("os.name");
+        if (os.startsWith("win") || os.startsWith("Win")) {
+            //D:\work\workspace_java\syb\pluss-manage-page
+            uploadPath = "D:/Pictures/";// 测试 // windows目录
+        }
+        FileInputStream fis = null;
+        FileOutputStream fos = null;
+        String path = uploadPath + "/" + fileName;
+        String code = "1";
+        try {
+            InputStream ins = file.getInputStream();
+            File f = new File(file.getOriginalFilename());
+            inputStreamToFile(ins, f);
+            fis = new FileInputStream(f);
+            fos = new FileOutputStream(path);
+            byte[] strByte = new byte[(int) f.length()];
+            // 生成文件
+            while (fis.read(strByte) != -1) {
+                fos.write(strByte);
+            }
+            fos.flush();
+            path = visitPath + "/" + fileName;// 测试
+            // 访问路劲
+            if (os.startsWith("win") || os.startsWith("Win")) {
+                path = "http://192.168.0.184:7004/api/Pictures" + "/" + fileName;// 测试 // windows目录
+            } else {
+                Runtime.getRuntime().exec("chmod -R 777 /home/syb/resources/");
+            }
+
+
+            if (StringUtils.isNotEmpty(dataId)) {
+                MerchantImage image = new MerchantImage();
+                image.setMerchantCode(merchantCode);
+                if ("settle".equals(type)) {
+                    Integer id = Integer.valueOf(dataId);
+                    String imgType = null;
+                    if ("01".equals(imageType) || "02".equals(imageType)) {
+                        IdCard idCard = new IdCard();
+                        idCard.setId(id);
+                        idCard.setUserType(IdCard.TYPE_ACCOUNT);
+                        if ("01".equals(imageType)) {
+                            imgType = MerchantImage.ImageType.SETTLE_IDCARD_FRONT;
+                            image.setPhotoType(MerchantImage.ImageType.SETTLE_IDCARD_FRONT);
+                            idCard.setImgPositive(path);
+                        }
+                        if ("02".equals(imageType)) {
+                            imgType = MerchantImage.ImageType.SETTLE_IDCARD_BACK;
+                            image.setPhotoType(MerchantImage.ImageType.SETTLE_IDCARD_BACK);
+                            idCard.setImgNegative(path);
+                        }
+                        idCardService.updateById(idCard);
+                    } else if ("03".equals(imageType)) {
+                        imgType = MerchantImage.ImageType.BANK_CARD_FRONT;
+                        BankCard bankCard = new BankCard().setId(id);
+                        bankCard.setImgUrl(path);
+                        image.setPhotoType(MerchantImage.ImageType.BANK_CARD_FRONT);
+                        bankCardService.updateById(bankCard);
+                    }
+                    merchantImageService.saveMerchantImageUpload(merchantCode, path, imgType);
+                } else if ("auth".equals(type)) {
+                    Integer id = Integer.valueOf(dataId);
+                    if ("01".equals(imageType) || "02".equals(imageType)) {
+                        IdCard idCard = new IdCard();
+                        idCard.setId(id);
+                        if ("01".equals(imageType)) {
+                            image.setPhotoType(MerchantImage.ImageType.IDCARD_FRONT);
+                            idCard.setImgPositive(path);
+                        }
+                        if ("02".equals(imageType)) {
+                            image.setPhotoType(MerchantImage.ImageType.IDCARD_BACK);
+                            idCard.setImgNegative(path);
+                        }
+                        idCardService.updateById(idCard);
+                    } else if ("04".equals(imageType)) {
+                        image.setPhotoType(MerchantImage.ImageType.BANK_CARD_FRONT);
+                        BankCard bank = new BankCard().setId(id);
+                        bank.setImgUrl(path);
+                        bankCardService.updateById(bank);
+                    }
+                }
+                List<MerchantImage> imageList = merchantImageService.queryMerchantImageList(image);
+                if (!imageList.isEmpty()) {
+                    MerchantImage img = imageList.get(0);
+                    img.setPicUrl(path);
+                    merchantImageService.updateById(img);
+                }
+            } else {
+                MerchantImage image = new MerchantImage();
+                image.setPhotoType(imageType);
+                image.setMerchantCode(merchantCode);
+                List<MerchantImage> merchantImages = merchantImageService.queryMerchantImageList(image);
+                if (merchantImages.isEmpty()) {
+                    image.setPicUrl(path);
+                    image.setCreateDt(new Date());
+                    merchantImageService.save(image);
+                } else {
+                    MerchantImage imageInfo = merchantImages.get(0);
+                    imageInfo.setPicUrl(path);
+                    merchantImageService.updateById(imageInfo);
+                    merchantImageService.saveMerchantImageUpload(merchantCode, path, imageType);
+                }
+            }
+            code = "1";
+        } catch (Exception e) {
+            code = "2";
+        } finally {
+            if (fos != null) {
+                try {
+                    fos.close();
+                } catch (IOException ignored) {
+                }
+            }
+            if (fis != null) {
+                fis.close();
+            }
+        }
+        // 返回保存结果
+        result.put("code", code);
+        result.put("url", path);
+        result.put("fileName", fileName);
+        return result;
+    }
+
+    private static void inputStreamToFile(InputStream ins, File file) {
+        try {
+            OutputStream os = new FileOutputStream(file);
+            int bytesRead;
+            byte[] buffer = new byte[8192];
+            while ((bytesRead = ins.read(buffer, 0, 8192)) != -1) {
+                os.write(buffer, 0, bytesRead);
+            }
+            os.close();
+            ins.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 实名认证信息页面
+     *
+     * @param userId
+     * @return
+     */
+    @GetMapping("/connectInfo")
+    public String connectInfo(HttpServletRequest request, String userId) {
+        request.setAttribute("userId", userId);
+
+        // 实名身份证相关的结算信息条数
+        IdCard certIdCard = idCardService.getCertIdCard(userId);
+        if (certIdCard != null) {
+            int countCert = accountMapper.selectAccountNum(Collections.singletonList(certIdCard.getCertNo()));
+            request.setAttribute("countCert", countCert);
+        } else {
+            request.setAttribute("countCert", 0);
+        }
+
+        // 结算身份证相关的结算信息条数
+        List<IdCard> accountIdCardList = idCardService.getAccountIdCard(userId);
+        if (!accountIdCardList.isEmpty()) {
+            List<String> certNoList = accountIdCardList.stream().map(IdCard::getCertNo)
+                    .distinct().collect(Collectors.toList());
+            int countAccount = accountMapper.selectAccountNum(certNoList);
+            request.setAttribute("countAccount", countAccount);
+        } else {
+            request.setAttribute("countAccount", 0);
+        }
+
+        MerchantBaseInfo mbi = mbiService.getMerchantBaseInfoByUserId(userId);
+
+        if (mbi == null) {
+            request.setAttribute("countMbiName", 0);
+        } else {
+            LambdaQueryWrapper<MerchantBaseInfo> qWrapper = Wrappers.lambdaQuery();
+            qWrapper.eq(MerchantBaseInfo::getAlias, mbi.getAlias())
+                    .or()
+                    .eq(MerchantBaseInfo::getMerchantName, mbi.getMerchantName());
+            int countMbiName = mbiService.count(qWrapper);
+            request.setAttribute("countMbiName", countMbiName);
+        }
+
+        return "promoter/userAppConnectInfo";
+    }
+
+    @GetMapping("/userIpPage")
+    @ResponseBody
+    public Result<Object> userIpPageInfo(Page<OperationRecordVO> page, String userId) {
+        page = oprMapper.selectUserSameIpCountPage(page, userId);
+        return ResultGenerator.genSuccessResult(page);
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/qrCode/QrCodeController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/qrCode/QrCodeController.java
new file mode 100644
index 0000000..b21a089
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/qrCode/QrCodeController.java
@@ -0,0 +1,162 @@
+package cn.pluss.platform.controller.qrCode;
+
+import cn.pluss.platform.controller.BaseNoModelController;
+import cn.pluss.platform.entity.QrCode;
+import cn.pluss.platform.qrCode.QrCodeService;
+import cn.pluss.platform.util.StringUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Pattern;
+
+@Controller
+@RequestMapping("qrCode")
+public class QrCodeController extends BaseNoModelController {
+
+    private Integer PAGE_SIZE = 12;
+
+    @Autowired
+    private QrCodeService qrCodeService;
+
+
+    @RequestMapping(value = "/index", method = RequestMethod.GET)
+    public String index() {
+        return "qrCode/qrCodeList";
+    }
+
+    /**
+     * 分页查询
+     */
+    @RequestMapping(value = "/queryQrCodeByPage", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> queryQrCodeByPage(@RequestParam(defaultValue = "1") Integer currPage,
+                                                           QrCode qrCode) {
+        Map<String, Object> map = new HashMap<String, Object>(16);
+        Map<String, Object> result = new HashMap<String, Object>(16);
+        map.put("pageSize", PAGE_SIZE);
+        map.put("offset", (currPage - 1) * PAGE_SIZE);
+        if (StringUtil.isNotEmpty(qrCode.getQrNo())) {
+            map.put("qrNo", qrCode.getQrNo());
+        }
+        if (StringUtil.isNotEmpty(qrCode.getStatus())) {
+            map.put("status", qrCode.getStatus());
+        }
+        Boolean bol = verifyUserRole();
+        if (bol) {
+            List<QrCode> qrCodeList = qrCodeService.queryQrCodePage(map);
+            Integer count = qrCodeService.queryQrCodePageCount(map);
+            result.put("qrCodeList", qrCodeList);
+            result.put("count", count);
+            result.put("pageCount", StringUtil.getPageCount(count, PAGE_SIZE));
+            result.put("currPage", currPage);
+        }
+        return result;
+    }
+
+    @RequestMapping(value = "/saveQrCode", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> saveQrCode(QrCode qrCode) {
+        Map<String, Object> result = new HashMap<String, Object>();
+        if (qrCode.getId() != null && qrCode.getId() != 0) {
+            qrCodeService.updateQrCode(qrCode);
+        } else {
+            if(StringUtil.isEmpty(qrCode.getQrNo())){
+                result.put("resultCode", "2");
+                result.put("resultMessage", "二维码编号不能为空!");
+                return result;
+            }
+            Pattern pattern = Pattern.compile("^-?\\d+(\\.\\d+)?$");
+            boolean qrNoCheck = pattern.matcher(qrCode.getQrNo()).matches();
+            if(!qrNoCheck){
+                result.put("resultCode", "4");
+                result.put("resultMessage", "输入编号不合法！");
+                return result;
+            }
+            QrCode checkQrCode = qrCodeService.getQrCodeByQrNo(qrCode.getQrNo());
+            if(checkQrCode != null){
+                result.put("resultCode", "3");
+                result.put("resultMessage", "二维码编号已存在，请重新输入!");
+                return result;
+            }
+            qrCode.setCreateBy(queryCurrentShiroUser().getName());
+            qrCodeService.saveQrCode(qrCode);
+        }
+        result.put("resultCode", "1");
+        result.put("resultMessage", "保存成功!");
+        return result;
+    }
+
+    /**
+     * 范围新增
+     * @param qrNoStart
+     * @param qrNoEnd
+     * @return
+     */
+    @RequestMapping(value = "/saveBatchQrCode", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> saveBatchQrCode(String qrNoStart,String qrNoEnd) {
+        Map<String, Object> result = new HashMap<String, Object>();
+        if(StringUtil.isEmpty(qrNoStart) || StringUtil.isEmpty(qrNoEnd)){
+            result.put("resultCode", "2");
+            result.put("resultMessage", "范围值不能为空!");
+        }
+        Pattern pattern = Pattern.compile("^-?\\d+(\\.\\d+)?$");
+        boolean matchesStart = pattern.matcher(qrNoStart).matches();
+        boolean matchesEnd = pattern.matcher(qrNoEnd).matches();
+        if(matchesStart && matchesEnd){
+            Integer startNum = Integer.valueOf(qrNoStart);
+            Integer endNum = Integer.valueOf(qrNoEnd);
+            if(startNum>endNum){
+                result.put("resultCode", "3");
+                result.put("resultMessage", "二维码编号范围输入有误!");
+                return result;
+            }
+            List<QrCode> qrCodeList = new ArrayList<>();
+            List<String> checkQrNo = new ArrayList<>();
+            for (int i = startNum;i<=endNum;i++){
+                QrCode qrCode = new QrCode();
+                qrCode.setCreateBy(queryCurrentShiroUser().getName());
+                qrCode.setQrNo(String.valueOf(i));
+                qrCodeList.add(qrCode);
+                checkQrNo.add(String.valueOf(i));
+            }
+            Integer checkCount = qrCodeService.checkQrNo(checkQrNo);
+            if(checkCount > 0){
+                result.put("resultCode", "4");
+                result.put("resultMessage", "范围中包含已入库的编号，请重新输入!");
+                return result;
+            }
+            qrCodeService.batchSaveQrCode(qrCodeList);
+            result.put("resultCode", "1");
+            result.put("resultMessage", "导入成功!");
+            return result;
+        }else{
+            result.put("resultCode", "2");
+            result.put("resultMessage", "范围值输入格式有误!");
+            return result;
+        }
+    }
+
+    @RequestMapping(value = "/deleteBatchQrCode", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> deleteBatchQrCode(String[] ids) {
+        Map<String, Object> result = new HashMap<String, Object>(16);
+        if(ids.length == 0){
+            result.put("resultCode", "2");
+            result.put("resultMessage", "请选中需要删除的数据!");
+            return result;
+        }
+        qrCodeService.deleteQrCodeByIds(ids);
+        result.put("resultCode", "1");
+        result.put("resultMessage", "操作成功!");
+        return result;
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/questionsAnswers/QuestionsAnswersController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/questionsAnswers/QuestionsAnswersController.java
new file mode 100644
index 0000000..90ae88d
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/questionsAnswers/QuestionsAnswersController.java
@@ -0,0 +1,82 @@
+package cn.pluss.platform.controller.questionsAnswers;
+
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.controller.BaseNoModelController;
+import cn.pluss.platform.entity.QuestionsAnswers;
+import cn.pluss.platform.questionsAnswers.QuestionsAnswersService;
+import cn.pluss.platform.util.PageUtils;
+import cn.pluss.platform.util.StringUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
+
+@Controller
+@RequestMapping("questionsAnswers")
+public class QuestionsAnswersController extends BaseNoModelController {
+
+	@Autowired
+	private QuestionsAnswersService questionsAnswersService;
+
+
+	/**
+	 * 引导页
+	 * 
+	 * @return
+	 */
+	@RequestMapping(value = "/index", method = RequestMethod.GET)
+	public String index() {
+
+		return "questionsAnswers/questionsAnswersList";
+	}
+
+	@GetMapping("/page")
+	@ResponseBody
+	public Result<PageInfo<QuestionsAnswers>> page(Page<QuestionsAnswers> page,QuestionsAnswers questionsAnswers){
+		QueryWrapper<QuestionsAnswers> queryWrapper = new QueryWrapper<QuestionsAnswers>().orderByAsc("seq");
+		if (StringUtil.isNotEmpty(questionsAnswers.getStatus())) {
+			queryWrapper.eq("status",questionsAnswers.getStatus());
+		}
+		if (StringUtil.isNotEmpty(questionsAnswers.getQuestion())) {
+			queryWrapper.eq("question", questionsAnswers.getQuestion());
+		}
+		page =questionsAnswersService.page(page,queryWrapper);
+		return ResultGenerator.genSuccessResult(PageUtils.page(page));
+	}
+
+	@RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = {"/detail/{id}", "/detail"})
+	public String detail(HttpServletRequest request, @PathVariable(value = "id", required = false) Integer id) {
+		if (id != null ) {
+			QuestionsAnswers questionsAnswersServiceById = questionsAnswersService.getById(id);
+			request.setAttribute("entity",questionsAnswersServiceById);
+		}
+		return "questionsAnswers/questionsAnswersBaseInfo";
+	}
+
+	@PostMapping("/saveOrUpdate")
+	@ResponseBody
+	public Result<QuestionsAnswers> saveOrUpdate(@RequestBody QuestionsAnswers questionsAnswers){
+		if (questionsAnswers.getId() == null ){
+			questionsAnswers.setCreateDt(new Date());
+			questionsAnswersService.save(questionsAnswers);
+		}else {
+			UpdateWrapper<QuestionsAnswers> questionsAnswersUpdateWrapper=new UpdateWrapper<QuestionsAnswers>().eq("id",questionsAnswers.getId());
+			questionsAnswersService.update(questionsAnswers,questionsAnswersUpdateWrapper);
+		}
+		return ResultGenerator.genSuccessResult("保存成功",questionsAnswers);
+	}
+
+	@PostMapping("/delete")
+	@ResponseBody
+	public Result<QuestionsAnswers> delete(@RequestBody QuestionsAnswers questionsAnswers){
+		questionsAnswersService.removeById(questionsAnswers.getId());
+		return ResultGenerator.genSuccessResult("删除成功！",questionsAnswers);
+	}
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/realFans/RealFansController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/realFans/RealFansController.java
new file mode 100644
index 0000000..6a9807c
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/realFans/RealFansController.java
@@ -0,0 +1,56 @@
+package cn.pluss.platform.controller.realFans;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.entity.RealFans;
+import cn.pluss.platform.realFans.RealFansService;
+import cn.pluss.platform.util.StringUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
+
+
+@Controller
+@RequiredArgsConstructor
+@RequestMapping("realFans")
+public class RealFansController extends BaseModelController<RealFansService, RealFans> {
+
+    private final RealFansService realFansService;
+
+    /**
+     * 引导页
+     * @return
+     */
+    @GetMapping("index")
+    public ModelAndView index() {
+        ModelAndView view = new ModelAndView("realFans/realFansList");
+        return view;
+    }
+
+
+    @RequestMapping(value = "/pageData")
+    @ResponseBody
+    public Result<Page<RealFans>> page(Page<RealFans> page, RealFans realFans) {
+        if(StringUtil.isNotEmpty(realFans.getNickName())){
+            String nickName = null;
+            try {
+                nickName = URLEncoder.encode(realFans.getNickName(),"UTF-8");
+            } catch (UnsupportedEncodingException e) {
+                e.printStackTrace();
+            }
+            realFans.setNickName(nickName);
+        }
+        Page<RealFans> pageData = realFansService.pageData(page,realFans);
+        return ResultGenerator.genSuccessResult(pageData);
+    }
+}
+
+
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/refundOrder/MerchantRefundOrderController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/refundOrder/MerchantRefundOrderController.java
new file mode 100644
index 0000000..6dedc91
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/refundOrder/MerchantRefundOrderController.java
@@ -0,0 +1,76 @@
+package cn.pluss.platform.controller.refundOrder;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.controller.BaseNoModelController;
+import cn.pluss.platform.entitiy.ShiroUser;
+import cn.pluss.platform.entity.MerchantRefundOrder;
+import cn.pluss.platform.refundOrder.MerchantRefundOrderService;
+import cn.pluss.platform.util.StringUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Controller
+@RequiredArgsConstructor
+@RequestMapping("refundOrder")
+public class MerchantRefundOrderController extends BaseNoModelController {
+
+    private final MerchantRefundOrderService merchantRefundOrderService;
+
+    private Integer PAGE_SIZE = 12;
+
+    @GetMapping("index")
+    public String index() {
+        return "refundOrder/refundOrderList";
+    }
+
+    @RequestMapping(value = "/queryRefundOrderByPage", method = RequestMethod.POST)
+    @ResponseBody
+    public Result<Page<MerchantRefundOrder>> queryRefundOrderByPage(Page<MerchantRefundOrder> page,
+                                                                    MerchantRefundOrder refundOrder) {
+        Boolean bol = verifyUserRole();
+        ShiroUser shiroUser = queryCurrentShiroUser();
+        if (!bol) {
+            refundOrder.setMerchantCode(shiroUser.getMerchantCode());
+        }
+        if(StringUtil.isNotEmpty(refundOrder.getPayTypeCode()) && refundOrder.getPayTypeCode().contains("|")){
+            List<String> payTypeCodeList = Arrays.asList(refundOrder.getPayTypeCode().split("\\|"));
+            refundOrder.setPayTypeCodeList(payTypeCodeList);
+        }
+        Page<MerchantRefundOrder> pageDate = merchantRefundOrderService.pageDate(page, refundOrder);
+        return ResultGenerator.genSuccessResult(pageDate);
+    }
+
+    @GetMapping("marketIndex")
+    public String marketIndex() {
+        return "refundOrder/marketOrderList";
+    }
+
+    @RequestMapping(value = "/queryMarketCountByPage", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> queryMarketCountByPage(@RequestParam(defaultValue = "1") Integer currPage, MerchantRefundOrder refundOrder) {
+        Map<String, Object> map = new HashMap<>(16);
+        Map<String, Object> result = new HashMap<>(16);
+        map.put("pageSize", PAGE_SIZE);
+        map.put("offset", (currPage - 1) * PAGE_SIZE);
+        if(StringUtil.isNotEmpty(refundOrder.getAlias())){
+            map.put("alias",refundOrder.getAlias());
+        }
+        //管理员查看的数据
+        List<MerchantRefundOrder> refundOrderCountList = merchantRefundOrderService.queryRefundOrderJoinPage(map);
+        Integer count = merchantRefundOrderService.queryRefundOrderJoinPageCount(map);
+        result.put("refundOrderCountList", refundOrderCountList);
+        result.put("count", count);
+        result.put("pageCount", StringUtil.getPageCount(count, PAGE_SIZE));
+        result.put("currPage", currPage);
+        return result;
+    }
+
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/rewardConfig/RewardConfigController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/rewardConfig/RewardConfigController.java
new file mode 100644
index 0000000..c032b0f
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/rewardConfig/RewardConfigController.java
@@ -0,0 +1,75 @@
+package cn.pluss.platform.controller.rewardConfig;
+
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.entity.RewardConfig;
+import cn.pluss.platform.entity.UserRole;
+import cn.pluss.platform.rewardConfig.RewardConfigService;
+import cn.pluss.platform.user.UserRoleService;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * <p>
+ * 用户奖励配置 前端控制器
+ * </p>
+ *
+ * @author bzg
+ * @since 2022-02-22
+ */
+@Controller
+@RequestMapping("/rewardConfig")
+public class RewardConfigController extends BaseModelController<RewardConfigService, RewardConfig> {
+
+    @Resource
+    private UserRoleService userRoleService;
+
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = "/index")
+    public String index(HttpServletRequest request) {
+        List<UserRole> list = userRoleService.list();
+        request.setAttribute("roleList", JSON.toJSONString(list));
+        return "rewardConfig/list";
+    }
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = {"/detail/{id}", "/detail"})
+    public String detail(HttpServletRequest request, @PathVariable(value = "id", required = false) Integer id) {
+        List<UserRole> list = userRoleService.list();
+        if (id != null) {
+            RewardConfig entity = baseService.getOne(new QueryWrapper<RewardConfig>().eq("id",id));
+            request.setAttribute("entity", entity);
+        }
+        request.setAttribute("roleList", list);
+        return "rewardConfig/detail";
+    }
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = "/save")
+    @Override
+    public Result<String> save(@RequestBody RewardConfig entity) {
+        try {
+            entity.setType(RewardConfig.DEFAULT_TYPE);
+            entity.setScale(entity.getScale().divide(BigDecimal.valueOf(10000)));
+            return super.save(entity);
+        }catch (Exception e){
+            return ResultGenerator.genFailResult("系统开小差了");
+        }
+    }
+
+    @Override
+    public Result<Page<RewardConfig>> page(Page<RewardConfig> page, RewardConfig condition, OrderItem orderItem) {
+        orderItem.setColumn("createTime");
+        orderItem.setAsc(false);
+        return super.page(page, condition, orderItem);
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/roleInfo/RoleInfoController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/roleInfo/RoleInfoController.java
new file mode 100644
index 0000000..befca65
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/roleInfo/RoleInfoController.java
@@ -0,0 +1,314 @@
+package cn.pluss.platform.controller.roleInfo;
+
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.entity.MenuInfo;
+import cn.pluss.platform.entity.RoleInfo;
+import cn.pluss.platform.entity.RoleMenuInfo;
+import cn.pluss.platform.entity.UserInfo;
+import cn.pluss.platform.menuInfo.MenuInfoService;
+import cn.pluss.platform.roleInfo.RoleInfoService;
+import cn.pluss.platform.roleMenuInfo.RoleMenuInfoService;
+import cn.pluss.platform.userInfo.UserInfoService;
+import cn.pluss.platform.util.StringUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.util.*;
+
+@Controller
+@RequestMapping("roleInfo")
+public class RoleInfoController extends BaseModelController<RoleInfoService, RoleInfo> {
+
+    private Integer PAGE_SIZE = 12;
+
+    @Autowired
+    private RoleInfoService roleInfoService;
+    @Autowired
+    private RoleMenuInfoService roleMenuInfoService;
+    @Autowired
+    private MenuInfoService menuInfoService;
+
+    @Autowired
+    private HttpServletRequest request;
+
+    @Autowired
+    private UserInfoService uiService;
+
+    /**
+     * 引导页
+     *
+     * @return
+     */
+    @GetMapping
+    public String index() {
+        return "auth/roleInfo/roleInfoList";
+    }
+
+    /**
+     * 分页查询
+     */
+    @PostMapping("/queryRoleInfoByPage")
+    @ResponseBody
+    public Map<String, Object> queryRoleInfoByPage(Integer currPage, String name) {
+
+        if (currPage == null) {
+            currPage = 1;
+        }
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageSize", PAGE_SIZE);
+        map.put("offset", (currPage - 1) * PAGE_SIZE);
+        if (StringUtil.isNotEmpty(name)) {
+            map.put("name", name);
+        }
+        List<RoleInfo> roleInfoList = roleInfoService.queryRoleInfoPage(map);
+        Integer count = roleInfoService.queryRoleInfoPageCount(map);
+        Map<String, Object> result = new HashMap<>();
+        result.put("roleInfoList", roleInfoList);
+        result.put("count", count);
+        result.put("pageCount", StringUtil.getPageCount(count, PAGE_SIZE));
+        result.put("currPage", currPage);
+        return result;
+    }
+
+
+    /**
+     * 修改初始化
+     *
+     * @return
+     */
+    @RequestMapping(value = "/edit", method = RequestMethod.GET)
+    public String edit() {
+        return "auth/role/editRole";
+    }
+
+    @GetMapping("detail")
+    public String detail(Model model, Integer id) {
+        if (id != null) {
+            RoleInfo entity = roleInfoService.getById(id);
+            request.setAttribute("entity", entity);
+        }
+
+        return "auth/roleInfo/roleInfoDetails";
+    }
+
+    @GetMapping("configDetail")
+    public String configDetail(Integer id) {
+        if (id != null) {
+            RoleInfo entity = roleInfoService.getById(id);
+            request.setAttribute("entity", entity);
+        }
+
+        return "auth/roleInfo/roleInfoConfig";
+    }
+
+    @PostMapping("/saveConfig")
+    @ResponseBody
+    public Result<Object> saveConfig(String id, @RequestParam(value = "menuIds[]", required = false) String[] menuIds) {
+        roleMenuInfoService.saveRoleMenuList(id, menuIds);
+        return ResultGenerator.genSuccessResult("保存成功");
+    }
+
+    /**
+     * 保存角色配置
+     *
+     * @throws IOException
+     */
+    @Override
+    @PostMapping("/save")
+    @ResponseBody
+    public Result<String> save(RoleInfo roleInfo) {
+
+        String userId = request.getHeader("userId");
+        UserInfo userInfo = uiService.getById(userId);
+
+        if (roleInfo.getId() != null && roleInfo.getId() != 0) {
+            //修改
+            roleInfo.setUpdateTime(new Date());
+            roleInfo.setUpdator(userInfo.getId() + "");
+            roleInfoService.updateRoleInfo(roleInfo);
+        } else {
+            //新增
+            roleInfo.setCreateTime(new Date());
+            roleInfo.setCreator(userInfo.getId() + "");
+            roleInfo.setUpdateTime(new Date());
+            roleInfo.setUpdator(userInfo.getId() + "");
+            roleInfoService.saveRoleInfo(roleInfo);
+            RoleInfo roleInfo2 = new RoleInfo();
+            roleInfo2.setName(roleInfo.getName());
+            List<RoleInfo> roleInfoList = roleInfoService.queryRoleInfoList(roleInfo2);
+            roleInfo.setId(roleInfoList.get(0).getId());
+        }
+
+        //删除关联关系
+        RoleMenuInfo rmInfo = new RoleMenuInfo();
+        rmInfo.setRoleId(roleInfo.getId());
+        roleMenuInfoService.deleteRoleMenuInfo(rmInfo);
+
+        //保存关联关系
+        if (!StringUtil.isEmpty(roleInfo.getMenuIds())) {
+            String menuIds = roleInfo.getMenuIds();
+            String[] mids = menuIds.split(",");
+            RoleMenuInfo roleMenuInfo = null;
+            List<RoleMenuInfo> roleMenuInfoList = new ArrayList<>();
+            for (String mid : mids) {
+                roleMenuInfo = new RoleMenuInfo();
+                roleMenuInfo.setMenuId(Long.valueOf(mid));
+                roleMenuInfo.setRoleId(roleInfo.getId());
+                roleMenuInfoList.add(roleMenuInfo);
+                roleMenuInfoService.saveRoleMenuInfo(roleMenuInfo);
+            }
+
+            //保存关联关系
+        }
+
+        return ResultGenerator.genSuccessResult("保存成功");
+    }
+
+
+    /**
+     * 通过id查询角色信息
+     *
+     * @throws IOException
+     */
+    @RequestMapping(value = "findById", method = RequestMethod.POST)
+    @ResponseBody
+    public RoleInfo findById(String id) throws IOException {
+        Long roleId = Long.valueOf(id);
+        RoleInfo roleInfo = new RoleInfo();
+        roleInfo.setId(roleId);
+        RoleInfo rInfo = roleInfoService.queryRoleInfo(roleInfo);
+        return rInfo;
+    }
+
+    /**
+     * 查询角色目录
+     *
+     * @throws IOException
+     */
+    @RequestMapping(value = "roleMenus", method = RequestMethod.POST)
+    @ResponseBody
+    public List<MenuInfo> roleMenus(String roleId) throws IOException {
+        Integer id = Integer.valueOf(roleId);
+        Map<String, Object> map = new HashMap<String, Object>();
+        map.put("roleId", id);
+        List<MenuInfo> menuList = menuInfoService.queryMenuInfoByRoleId(map);
+        return menuList;
+    }
+
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryRoleInfoDetails", method = RequestMethod.GET)
+    public String queryRoleInfoDetails(HttpServletRequest request, Long id, Integer pageIndex) {
+
+        if (id != null && id != 0) {
+            RoleInfo roleInfo = new RoleInfo();
+            roleInfo.setId(id);
+            roleInfo = roleInfoService.queryRoleInfo(roleInfo);
+            request.setAttribute("roleInfo", roleInfo);
+            request.setAttribute("pageIndex", pageIndex);
+        }
+        return "roleInfo/roleInfoDetails";
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryRoleInfoBaseInfo", method = RequestMethod.GET)
+    public String queryRoleInfoBaseInfo(HttpServletRequest request, Long id, Integer pageIndex) {
+
+        if (id != null && id != 0) {
+            RoleInfo roleInfo = new RoleInfo();
+            roleInfo.setId(id);
+            roleInfo = roleInfoService.queryRoleInfo(roleInfo);
+            request.setAttribute("roleInfo", roleInfo);
+            request.setAttribute("pageIndex", pageIndex);
+        }
+        return "roleInfo/roleInfoBaseInfo";
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryRoleInfoExtendsInfo", method = RequestMethod.GET)
+    public String queryRoleInfoExtendsInfo() {
+
+        return "roleInfo/roleInfoExtendsInfo";
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryRoleInfoFunctionsInfo", method = RequestMethod.GET)
+    public String queryRoleInfoFunctionsInfo() {
+
+        return "roleInfo/roleInfoFunctionsInfo";
+    }
+
+    /**
+     * 保存对象
+     *
+     * @throws IOException
+     */
+    @RequestMapping(value = "/saveRoleInfo", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> saveRoleInfo(RoleInfo roleInfo) {
+
+        if (roleInfo.getId() != null && roleInfo.getId() != 0) {
+            roleInfoService.updateRoleInfo(roleInfo);
+        } else {
+            roleInfoService.saveRoleInfo(roleInfo);
+        }
+        Map<String, Object> result = new HashMap<String, Object>();
+        result.put("resultCode", "1");
+        result.put("resultMessage", "保存成功!");
+        return result;
+    }
+
+    /**
+     * 修改对象
+     *
+     * @throws IOException
+     */
+    @RequestMapping(value = "/updateRoleInfo", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> updateRoleInfo(Long id) {
+
+        RoleInfo roleInfo = new RoleInfo();
+        roleInfo.setId(id);
+        roleInfoService.updateRoleInfo(roleInfo);
+        Map<String, Object> result = new HashMap<>();
+        result.put("resultCode", "1");
+        result.put("resultMessage", "保存成功!");
+        return result;
+    }
+
+    /**
+     * 删除对象
+     *
+     * @throws IOException
+     */
+    @RequestMapping(value = "/deleteRoleInfo", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> deleteRoleInfo(Long id) {
+        RoleInfo roleInfo = new RoleInfo();
+        roleInfo.setId(id);
+        roleInfoService.deleteRoleInfo(roleInfo);
+        Map<String, Object> result = new HashMap<>();
+        result.put("resultCode", "1");
+        result.put("resultMessage", "保存成功!");
+        return result;
+    }
+
+
+}
+
+
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/staff/StaffController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/staff/StaffController.java
new file mode 100644
index 0000000..38a0a30
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/staff/StaffController.java
@@ -0,0 +1,141 @@
+package cn.pluss.platform.controller.staff;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.controller.BaseNoModelController;
+import cn.pluss.platform.dto.StaffDTO;
+import cn.pluss.platform.entity.MerchantStore;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantStore.MerchantStoreService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.vo.UserInfoVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 员工管理
+ *
+ * @author Administrator
+ */
+@Controller
+@RequestMapping("staff")
+public class StaffController extends BaseNoModelController {
+
+    @Autowired
+    private HttpServletRequest request;
+
+    @Autowired
+    private UserAppService userAppService;
+
+    @Autowired
+    private MerchantStoreService merchantStoreService;
+
+    @Autowired
+    private MerchantBaseInfoService merchantBaseInfoService;
+
+    /**
+     * 引导页
+     *
+     * @return
+     */
+    @RequestMapping(value = "/index", method = RequestMethod.GET)
+    public String index() {
+        String userType = request.getParameter("userType");
+        request.setAttribute("userType", userType);
+        String merchantCode = (String) request.getSession().getAttribute("merchantCodeSession");
+        MerchantStore merchantStore = new MerchantStore();
+        merchantStore.setMerchantCode(merchantCode);
+        List<MerchantStore> merchantStoreList = merchantStoreService.queryMerchantStoreList(merchantStore);
+        if (merchantStoreList != null && merchantStoreList.size() > 0) {
+            request.setAttribute("merchantStoreList", merchantStoreList);
+        }
+        return "staff/userAppList";
+    }
+
+    /**
+     * 分页查询
+     */
+    @RequestMapping(value = "/queryUserAppByPage", method = RequestMethod.GET)
+    @ResponseBody
+    public Map<String, Object> queryUserAppByPage(@RequestParam(defaultValue = "1") Integer currPage, Integer size,
+                                                  UserInfoVO userInfoVO) {
+        return userAppService.getStaffPage(currPage,size,userInfoVO);
+    }
+
+    /**
+     * 查询详情
+     */
+    @GetMapping(value = {"/queryUserAppBaseInfo/{id}", "/queryUserAppBaseInfo"})
+    public String queryUserAppBaseInfo(HttpServletRequest request, @PathVariable(value = "id", required = false) Long id, Integer pageIndex) {
+        if (id != null && id != 0) {
+            UserApp userApp = new UserApp();
+            userApp.setId(id);
+            userApp = userAppService.queryUserApp(userApp);
+            request.setAttribute("userApp", userApp);
+
+            MerchantStore merchantStore = new MerchantStore();
+            merchantStore.setMerchantCode(userApp.getMerchantCode());
+            List<MerchantStore> merchantStoreList = merchantStoreService.queryMerchantStoreList(merchantStore);
+            request.setAttribute("merchantStoreList", merchantStoreList);
+
+            request.setAttribute("pageIndex", pageIndex);
+        }
+        return "staff/userAppBaseInfo";
+    }
+
+    /**
+     * 删除对象
+     *
+     * @throws IOException
+     */
+    @RequestMapping(value = "/deleteUserApp", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> deleteUserApp(Long id) {
+        userAppService.removeById(id);
+        Map<String, Object> result = new HashMap<>();
+        result.put("resultCode", "1");
+        result.put("resultMessage", "保存成功!");
+        return result;
+    }
+
+    /**
+     * saveStaff:(添加员工). <br/>
+     *
+     * @param
+     * @return
+     * @throws Exception
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    @PostMapping(value = "/saveStaff")
+    @ResponseBody
+    public Map<String, Object> saveStaff(StaffDTO staffDTO) {
+        Result<Map<String, Object>> saveStaff = userAppService.saveStaff(staffDTO);
+        Map<String, Object> result = saveStaff.getData();
+        return result;
+    }
+
+    /**
+     * deleteStaff:(删除员工). <br/>
+     *
+     * @param id
+     * @return
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    @PostMapping(value = "/deleteStaff")
+    @ResponseBody
+    public Map<String, Object> deleteStaff(Long id) {
+        Result<Map<String, Object>> deleteStaff = userAppService.deleteStaff(id);
+        Map<String, Object> result = deleteStaff.getData();
+        return result;
+    }
+
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/suggest/SuggestController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/suggest/SuggestController.java
new file mode 100644
index 0000000..33bced6
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/suggest/SuggestController.java
@@ -0,0 +1,58 @@
+package cn.pluss.platform.controller.suggest;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.controller.BaseController;
+import cn.pluss.platform.controller.BaseNoModelController;
+import cn.pluss.platform.device.MercOrderDetailService;
+import cn.pluss.platform.entity.MercOrderDetail;
+import cn.pluss.platform.entity.Suggest;
+import cn.pluss.platform.suggest.SuggestService;
+import cn.pluss.platform.util.StringUtil;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Controller
+@RequestMapping("suggest")
+public class SuggestController extends BaseModelController<SuggestService, Suggest> {
+
+    /**
+     * 引导页
+     * @return
+     */
+    @GetMapping(value = "/index")
+    public String index() {
+        return "suggest/suggestList";
+    }
+
+    @Override
+    public Result<Page<Suggest>> page(Page<Suggest> page, Suggest condition, OrderItem orderItem) {
+        orderItem.setColumn("id").setAsc(false);
+        return super.page(page, condition, orderItem);
+    }
+
+    @PostMapping("/markDeal")
+    @ResponseBody
+    public Result<Object> markDeal(Integer id) {
+        Suggest entity = baseService.getById(id);
+        entity.setStatus("1");
+        baseService.updateById(entity);
+
+        return ResultGenerator.genSuccessResult("操作成功", null);
+    }
+}
+
+
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/sys/AppMenuController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/sys/AppMenuController.java
new file mode 100644
index 0000000..add3d9f
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/sys/AppMenuController.java
@@ -0,0 +1,114 @@
+package cn.pluss.platform.controller.sys;
+
+import cn.pluss.platform.AppMenuService;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.appMenuUserType.AppMenuUserTypeService;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.dict.DictService;
+import cn.pluss.platform.entity.AppMenu;
+import cn.pluss.platform.entity.AppMenuUserType;
+import cn.pluss.platform.entity.Dict;
+import cn.pluss.platform.util.OssOperatUtil;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.*;
+
+@Controller
+@RequestMapping("appMenu")
+public class AppMenuController extends BaseModelController<AppMenuService, AppMenu> {
+
+    @Autowired
+    private DictService dictService;
+
+    @Autowired
+    private AppMenuUserTypeService appMenuUserTypeService;
+
+    @Autowired
+    private AppMenuService appMenuService;
+
+    @RequestMapping("/index")
+    public String index(HttpServletRequest request) {
+        List<Dict> menuGroup = dictService.getByCode(Collections.singletonList("APP_MENU_GROUP"));
+        List<Dict> navCode = dictService.getByCode(Collections.singletonList("APP_MENU_NAV"));
+
+        request.setAttribute("menuGroup", menuGroup);
+        request.setAttribute("navCode", navCode);
+
+        request.setAttribute("menuGroupString", JSON.toJSONString(menuGroup));
+        request.setAttribute("navCodeString", JSON.toJSONString(navCode));
+
+        return "sys/appMenu/appMenuList";
+    }
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = {"/detail/{id}", "/detail"})
+    public String detail(HttpServletRequest request, @PathVariable(value = "id", required = false) Long id) {
+        if (id != null) {
+            AppMenu appMenu = new AppMenu().setId(id);
+            appMenu = baseService.getOne(new QueryWrapper<>(appMenu));
+            request.setAttribute("entity", appMenu);
+        }
+        Map<String, String> uploadParam = OssOperatUtil.getUploadParam();
+        request.setAttribute("uploadParam", uploadParam);
+        return "sys/appMenu/appMenuDetail";
+    }
+
+    @GetMapping("/bandage/{id}")
+    public ModelAndView bandage(@PathVariable(value = "id", required = false) Long id) {
+        ModelAndView view = new ModelAndView("sys/appMenu/appMenuBandage");
+        List<String> list = new ArrayList<String>() {{
+            this.add("YHLX");
+        }};
+        List<Dict> dictList = dictService.getByCode(list);
+        AppMenu appMenu = appMenuService.getById(id);
+        QueryWrapper<AppMenuUserType> queryWrapper = new QueryWrapper<AppMenuUserType>().eq("name", appMenu.getName());
+        List<AppMenuUserType> appMenuUserTypeList = appMenuUserTypeService.list(queryWrapper);
+        view.addObject("appMenuUserTypeList", appMenuUserTypeList);
+        view.addObject("appMenu",appMenu);
+        view.addObject("dictList", dictList);
+        view.addObject("id", id);
+        return view;
+    }
+
+    @PostMapping("saveOrUpdate")
+    @ResponseBody
+    public Result<String> saveOrUpdate(@RequestBody AppMenuUserType appMenuUserType) {
+        AppMenu appMenuById = appMenuService.getById(appMenuUserType.getId());
+        QueryWrapper<AppMenuUserType> appMenuUserTypeQueryWrapper
+                = new QueryWrapper<AppMenuUserType>().eq("name", appMenuById.getName()).eq("nav_code",appMenuById.getNavCode());
+        int count = appMenuUserTypeService.count(appMenuUserTypeQueryWrapper);
+        if (count > 0 ) {
+            List<AppMenuUserType> list = appMenuUserTypeService.list(appMenuUserTypeQueryWrapper);
+            Date createTime = list.get(0).getCreateTime();
+            appMenuUserTypeService.remove(appMenuUserTypeQueryWrapper);
+            AppMenu appMenu = appMenuService.getById(appMenuUserType.getId());
+            appMenuUserType.setName(appMenu.getName());
+            appMenuUserType.setNavCode(appMenu.getNavCode());
+            String[] split = appMenuUserType.getDictValue().split(",");
+            for (int i = 0; i < split.length; i++) {
+                appMenuUserType.setCreateTime(createTime);
+                appMenuUserType.setUpdateTime(new Date());
+                appMenuUserType.setDictValue(split[i]);
+                appMenuUserTypeService.save(appMenuUserType);
+            }
+        }else {
+            AppMenu appMenu = appMenuService.getById(appMenuUserType.getId());
+            appMenuUserType.setName(appMenu.getName());
+            appMenuUserType.setNavCode(appMenu.getNavCode());
+            String[] split = appMenuUserType.getDictValue().split(",");
+            for (int i = 0; i < split.length; i++) {
+                appMenuUserType.setCreateTime(new Date());
+                appMenuUserType.setUpdateTime(new Date());
+                appMenuUserType.setDictValue(split[i]);
+                appMenuUserTypeService.save(appMenuUserType);
+            }
+        }
+        return ResultGenerator.genSuccessResult("保存成功");
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/sys/MccInfoController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/sys/MccInfoController.java
new file mode 100644
index 0000000..b8f7aae
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/sys/MccInfoController.java
@@ -0,0 +1,127 @@
+package cn.pluss.platform.controller.sys;
+
+import cn.pluss.platform.SxfMccInfoService;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.mcc.MccInfoYsService;
+import cn.pluss.platform.mcc.MccReflectService;
+import cn.pluss.platform.merchantChannel.MerchantChannelService;
+import cn.pluss.platform.vo.MccReflectVO;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+@Controller
+@RequestMapping("/mccInfo")
+public class MccInfoController {
+
+    @Autowired
+    private SxfMccInfoService sxfMccInfoService;
+
+    @Autowired
+    private MccInfoYsService mccInfoYsService;
+
+    @Autowired
+    private MccReflectService mccReflectService;
+
+    @Resource
+    private MerchantChannelService merchantChannelService;
+
+    @GetMapping("/sxfMccList")
+    public String sxfMccList() {
+        return "sys/mcc/sxfMccList";
+    }
+
+    @GetMapping("/sxf/page")
+    @ResponseBody
+    public Result<Page<SxfMccInfo>> pageSxfMccInfo(Page<SxfMccInfo> page, SxfMccInfo condition, OrderItem orderItem) {
+        if (orderItem != null && orderItem.getColumn() != null) {
+            page.getOrders().add(orderItem);
+        }
+        page = sxfMccInfoService.page(page, new QueryWrapper<>(condition));
+        return ResultGenerator.genSuccessResult("请求成功", page);
+    }
+
+    @GetMapping("/sxfMccEdit")
+    public String edit(String sxfMcc, Integer channelId, HttpServletRequest request) {
+        if (sxfMcc != null) {
+            MccReflect mccReflect = new MccReflect();
+            mccReflect.setStandardMccCode(sxfMcc);
+            mccReflect.setChannelId(channelId);
+            mccReflect = mccReflectService.getOne(new QueryWrapper<>(mccReflect));
+            request.setAttribute("entity", mccReflect);
+        }
+
+        return "sys/mcc/mccReflectEditV2";
+    }
+
+    @GetMapping("/ysMccList")
+    public String ysMccList() {
+        return "sys/mcc/ysMccList";
+    }
+
+    @GetMapping("/ys/page")
+    @ResponseBody
+    public Result<Page<MccInfoYs>> pageYsMccInfo(Page<MccInfoYs> page, MccInfoYs condition, OrderItem orderItem) {
+        if (orderItem != null && orderItem.getColumn() != null) {
+            page.getOrders().add(orderItem);
+        }
+
+        page = mccInfoYsService.page(page, new QueryWrapper<>(condition));
+        return ResultGenerator.genSuccessResult("请求成功", page);
+    }
+
+    @GetMapping("/mccInfoReflect")
+    public String mccInfoReflect() {
+        return "sys/mcc/mccReflectList";
+    }
+
+    @GetMapping("/mccReflect/page")
+    @ResponseBody
+    public Result<IPage<MccReflectVO>> pageMccInfoReflect(Page<MccReflectVO> page, MccReflect condition, OrderItem orderItem) {
+        if (orderItem != null && orderItem.getColumn() != null) {
+            page.getOrders().add(orderItem);
+        }
+
+        IPage<MccReflectVO> result = mccReflectService.pageMccReflectVO(page, condition);
+        return ResultGenerator.genSuccessResult("请求成功", result);
+    }
+
+    @DeleteMapping("/mccReflect/del/{id}")
+    @ResponseBody
+    public Result<Object> delMccInfoReflect(@PathVariable("id") Integer id) {
+        boolean flag = mccReflectService.removeById(id);
+        if(flag){
+            return ResultGenerator.genSuccessResult("删除成功！", null);
+        }else{
+            return ResultGenerator.genFailResult("删除失败！");
+        }
+    }
+
+    @RequestMapping("/mccReflect/save")
+    @ResponseBody
+    public Result<Object> saveMccInfoReflect(@RequestBody MccReflect condition) {
+        mccReflectService.saveOrUpdate(condition);
+        return ResultGenerator.genSuccessResult("保存成功", null);
+    }
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = {"/mccReflect/detail/{id}", "/mccReflect/detail"})
+    public String detail(HttpServletRequest request, @PathVariable(value = "id", required = false) Integer id) {
+        List<MerchantChannel> channelList = merchantChannelService.getValidChannelList();
+        if (id != null) {
+            MccReflect entity = mccReflectService.getOne(new QueryWrapper<>(new MccReflect().setId(id)));
+            request.setAttribute("entity", entity);
+        }
+        request.setAttribute("channelList",channelList);
+        return "sys/mcc/mccReflectEdit";
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/sys/RegionReflectController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/sys/RegionReflectController.java
new file mode 100644
index 0000000..ce3e298
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/sys/RegionReflectController.java
@@ -0,0 +1,80 @@
+package cn.pluss.platform.controller.sys;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.dto.RegionReflectDTO;
+import cn.pluss.platform.region.RegionReflectService;
+import cn.pluss.platform.vo.RegionReflectVO;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.val;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @author djh
+ * 通道地区对应页面
+ */
+@Controller
+@RequestMapping("/regionReflect")
+public class RegionReflectController {
+
+    @Autowired
+    private RegionReflectService regionReflectService;
+
+    @GetMapping("/list")
+    public String list() {
+        return "/sys/region/regionReflectList";
+    }
+
+    @GetMapping("/pageData")
+    @ResponseBody
+    public Result<Object> pageData(Page<RegionReflectVO> page, String province, String city, String code) {
+        val result = regionReflectService.pageRegionReflect(page, province, city, code);
+        return ResultGenerator.genSuccessResult(result);
+    }
+
+
+
+    @GetMapping("/edit/{type}")
+    public String edit(HttpServletRequest request, @PathVariable("type") String type, String regionSrc) {
+        request.setAttribute("type", type);
+        request.setAttribute("regionSrc", regionSrc);
+
+        return "/sys/region/regionReflectEdit";
+    }
+
+    @GetMapping("/listProvince/{type}")
+    @ResponseBody
+    public Result<Object> listProvince(@PathVariable("type") String type) {
+        val result = regionReflectService.listProvince(type);
+
+        return ResultGenerator.genSuccessResult(result);
+    }
+
+    @GetMapping("/listCity/{type}/{province}")
+    @ResponseBody
+    public Result<Object> listCity(@PathVariable("type") String type, @PathVariable("province") String province) {
+        val result = regionReflectService.listCity(type, province);
+
+        return ResultGenerator.genSuccessResult(result);
+    }
+
+    @GetMapping("/listArea/{type}/{province}/{city}")
+    @ResponseBody
+    public Result<Object> listArea(@PathVariable("type") String type, @PathVariable("province") String province, @PathVariable("city") String city) {
+        val result = regionReflectService.listArea(type, city, province);
+
+        return ResultGenerator.genSuccessResult(result);
+    }
+
+    @PostMapping("/save")
+    @ResponseBody
+    public Result<Object> saveReflect(RegionReflectDTO inputData) {
+        regionReflectService.saveReflect(inputData);
+
+        return ResultGenerator.genSuccessResult("保存成功", null);
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/systemConfig/SystemConfigController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/systemConfig/SystemConfigController.java
new file mode 100644
index 0000000..de578d0
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/systemConfig/SystemConfigController.java
@@ -0,0 +1,94 @@
+package cn.pluss.platform.controller.systemConfig;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.controller.BaseNoModelController;
+import cn.pluss.platform.entity.SystemConfig;
+import cn.pluss.platform.systemConfig.SystemConfigService;
+import cn.pluss.platform.util.OssOperatUtil;
+import cn.pluss.platform.util.StringUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+@Controller
+@RequestMapping("systemconfig")
+public class SystemConfigController extends BaseNoModelController {
+
+    @Autowired
+    private SystemConfigService systemConfigService;
+
+    //引导页
+    @GetMapping("/index")
+    public String index() {
+        return "systemConfig/systemconfigList";
+    }
+
+    //分页查询
+    @GetMapping("/querySystemconfigByPage")
+    @ResponseBody
+    public Map<String, Object> querySystemconfigByPage(@RequestParam(defaultValue = "1") Integer currPage, Integer size) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageSize", size);
+        map.put("offset", (currPage - 1) * size);
+        List<SystemConfig> systemconfigList = systemConfigService.querySystemConfigPage(map);
+        Integer count = systemConfigService.querySystemConfigPageCount(map);
+        Map<String, Object> result = new HashMap<>();
+        result.put("systemconfigList", systemconfigList);
+        result.put("count", count);
+        result.put("code", 200);
+        result.put("pageCount", StringUtil.getPageCount(count, size));
+        result.put("currPage", currPage);
+        return result;
+    }
+
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = {"/querySystemconfigBaseInfo/{id}", "/querySystemconfigBaseInfo"})
+    public ModelAndView querySystemConfigBaseInfo(@PathVariable(value = "id", required = false) Integer id) {
+        ModelAndView view = new ModelAndView("systemConfig/systemconfigBaseInfo");
+        if (id != null && id != 0) {
+            SystemConfig systemconfig = new SystemConfig();
+            systemconfig.setId(id);
+            systemconfig = systemConfigService.querySystemConfig(systemconfig);
+            view.addObject("systemconfig", systemconfig);
+        }
+        Map<String, String> uploadParam = OssOperatUtil.getUploadParam();
+        view.addObject("uploadParam", uploadParam);
+        return view;
+    }
+
+    /**
+     * 保存对象
+     */
+    @PostMapping("/saveSystemconfig")
+    @ResponseBody
+    public Result<SystemConfig> saveSystemConfig(@RequestBody SystemConfig systemconfig) {
+        if (systemconfig.getId() != null && systemconfig.getId() != 0) {
+            systemConfigService.updateSystemConfig(systemconfig);
+        } else {
+            systemConfigService.saveSystemConfig(systemconfig);
+        }
+        return ResultGenerator.genSuccessResult("保存成功!",null);
+    }
+
+    /**
+     * 删除对象
+     */
+    @PostMapping("/deleteSystemconfig")
+    @ResponseBody
+    public Result<SystemConfig> deleteSystemConfig(@RequestBody SystemConfig systemConfig) {
+        SystemConfig systemconfig = new SystemConfig();
+        systemconfig.setId(systemConfig.getId());
+        systemConfigService.deleteSystemConfig(systemconfig);
+        return ResultGenerator.genSuccessResult("删除成功！",null);
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/systemConfig/SystemSwitchController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/systemConfig/SystemSwitchController.java
new file mode 100644
index 0000000..6c73608
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/systemConfig/SystemSwitchController.java
@@ -0,0 +1,35 @@
+package cn.pluss.platform.controller.systemConfig;
+
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.entity.CommonSwitch;
+import cn.pluss.platform.mswitch.CommonSwitchService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+/**
+ * 系统开关管理页面
+ */
+@Controller
+@RequiredArgsConstructor
+@RequestMapping("systemSwitch")
+public class SystemSwitchController {
+
+    private final CommonSwitchService commonSwitchService;
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = "index")
+    public String toList() {
+        return "systemSwitch/list";
+    }
+
+    @GetMapping("/page")
+    public Result<PageInfo<CommonSwitch>> page(Page<CommonSwitch> page , CommonSwitch commonSwitch) {
+        PageInfo<CommonSwitch> pageInfo = commonSwitchService.pageData(page, commonSwitch);
+        return ResultGenerator.genSuccessResult(pageInfo);
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/systemInfo/SystemInfoController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/systemInfo/SystemInfoController.java
new file mode 100644
index 0000000..1ef56cb
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/systemInfo/SystemInfoController.java
@@ -0,0 +1,71 @@
+package cn.pluss.platform.controller.systemInfo;
+
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.controller.BaseNoModelController;
+import cn.pluss.platform.entity.SystemInfo;
+import cn.pluss.platform.systemInfo.SystemInfoService;
+import cn.pluss.platform.util.PageUtils;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
+
+@Controller
+@RequestMapping("systemInfo")
+public class SystemInfoController extends BaseNoModelController {
+
+	@Autowired
+	private SystemInfoService systemInfoService;
+
+	/**
+	 * 引导页
+	 * 
+	 * @return
+	 */
+	@GetMapping("/index")
+	public String index() {
+		return "systemInfo/systemInfoList";
+	}
+
+	@GetMapping("/page")
+	@ResponseBody
+	public Result<PageInfo<SystemInfo>> page(Page<SystemInfo> page,SystemInfo systemInfo){
+		Page<SystemInfo> pageData = systemInfoService.PageData(page,systemInfo);
+		return ResultGenerator.genSuccessResult(PageUtils.page(pageData));
+	}
+
+	@RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = {"/detail/{id}", "/detail"})
+	public String detail(HttpServletRequest request, @PathVariable(value = "id", required = false) Integer id) {
+		if (id != null) {
+			SystemInfo systemInfoServiceById = systemInfoService.getById(id);
+			request.setAttribute("entity",systemInfoServiceById);
+		}
+		return "systemInfo/systemInfoBaseReadInfo";
+	}
+
+	@PostMapping("/saveOrUpdate")
+	@ResponseBody
+	public Result<SystemInfo> saveOrUpdate(@RequestBody SystemInfo systemInfo){
+		if (systemInfo.getId() == null ){
+			systemInfo.setCreateDt(new Date());
+			systemInfoService.save(systemInfo);
+		}else {
+			UpdateWrapper<SystemInfo> systemInfoUpdateWrapper=new UpdateWrapper<SystemInfo>().eq("id",systemInfo.getId());
+			systemInfoService.update(systemInfo,systemInfoUpdateWrapper);
+		}
+		return ResultGenerator.genSuccessResult("保存成功",systemInfo);
+	}
+
+	@PostMapping("/delete")
+	public Result<SystemInfo> delete(@RequestBody SystemInfo systemInfo){
+		systemInfoService.removeById(systemInfo.getId());
+		return ResultGenerator.genSuccessResult("删除成功",systemInfo);
+	}
+
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/task/TaskSortController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/task/TaskSortController.java
new file mode 100644
index 0000000..8bc7041
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/task/TaskSortController.java
@@ -0,0 +1,22 @@
+package cn.pluss.platform.controller.task;
+
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.entity.TaskSort;
+import cn.pluss.platform.schedule.TaskSortService;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * 定时任务
+ * @author DJH
+ */
+@Controller
+@RequestMapping("/taskSort")
+public class TaskSortController extends BaseModelController<TaskSortService, TaskSort> {
+
+    @GetMapping("/index")
+    public String index() {
+        return "task/taskSortIndex";
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/task/UserTaskController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/task/UserTaskController.java
new file mode 100644
index 0000000..b59cd21
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/task/UserTaskController.java
@@ -0,0 +1,42 @@
+package cn.pluss.platform.controller.task;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.entity.UserTask;
+import cn.pluss.platform.schedule.UserTaskService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.Date;
+
+/**
+ * @author DJH
+ */
+@Controller
+@RequestMapping("/userTask")
+public class UserTaskController extends BaseModelController<UserTaskService, UserTask> {
+
+    @Autowired
+    private UserTaskService userTaskService;
+
+    @GetMapping("/index")
+    public String index() {
+        return "task/userTaskIndex";
+    }
+
+    @PostMapping("/cancel")
+    @ResponseBody
+    public Result<?> cancel(Integer id) {
+        final UserTask entity = userTaskService.getById(id);
+        entity.setStatus(UserTask.STATUS_CANCELED);
+        entity.setUpdateTime(new Date());
+        userTaskService.updateById(entity);
+
+        return ResultGenerator.genSuccessResult("操作成功", null);
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/transferCash/MerchantTransferCashController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/transferCash/MerchantTransferCashController.java
new file mode 100644
index 0000000..c65a115
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/transferCash/MerchantTransferCashController.java
@@ -0,0 +1,100 @@
+package cn.pluss.platform.controller.transferCash;
+
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.entity.MerchantBankCard;
+import cn.pluss.platform.entity.MerchantBaseInfo;
+import cn.pluss.platform.entity.MerchantTransferCash;
+import cn.pluss.platform.merchantBankCard.MerchantBankCardService;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.transferCash.MerchantTransferCashService;
+import cn.pluss.platform.util.StringUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-09-26
+ */
+@Controller
+@RequiredArgsConstructor
+@RequestMapping("/merchantTransferCash")
+public class MerchantTransferCashController extends BaseModelController<MerchantTransferCashService, MerchantTransferCash> {
+
+    private final MerchantTransferCashService merchantTransferCashService;
+
+    private final MerchantBankCardService merchantBankCardService;
+
+    private final MerchantBaseInfoService merchantBaseInfoService;
+
+    @GetMapping("index")
+    public String index() {
+        return "transferCash/list";
+    }
+
+    @RequestMapping("page")
+    @ResponseBody
+    public Result<Page<MerchantTransferCash>> page(Page<MerchantTransferCash> page, MerchantTransferCash merchantTransferCash) {
+        QueryWrapper<MerchantTransferCash> queryWrapper = new QueryWrapper<MerchantTransferCash>().orderByDesc("createTime");
+        if(StringUtil.isNotEmpty(merchantTransferCash.getUserName())){
+            queryWrapper.like("userName",merchantTransferCash.getUserName());
+        }
+        if(StringUtil.isNotEmpty(merchantTransferCash.getCashNo())){
+            queryWrapper.eq("cashNo",merchantTransferCash.getCashNo());
+        }
+        if(StringUtil.isNotEmpty(merchantTransferCash.getStatus())){
+            queryWrapper.eq("status",merchantTransferCash.getStatus());
+        }
+        page = merchantTransferCashService.page(page, queryWrapper);
+        return ResultGenerator.genSuccessResult(page);
+    }
+
+    @PostMapping("saveOrUpdate")
+    @ResponseBody
+    public Result<String> saveOrUpdate(@RequestBody MerchantTransferCash merchantTransferCash) {
+
+        if (merchantTransferCash.getId() != null){
+            merchantTransferCashService.updateById(merchantTransferCash);
+        }else {
+            merchantTransferCash.setCreateTime(new Date());
+            merchantTransferCashService.save(merchantTransferCash);
+        }
+        return ResultGenerator.genSuccessResult("保存成功");
+    }
+
+    /**
+     * 获取结算信息
+     */
+    @RequestMapping("settle/{userId}")
+    @ResponseBody
+    public Result settleInfo(@PathVariable("userId") Integer userId) {
+        if(StringUtil.isEmpty(userId)){
+            return ResultGenerator.genFailResult("未获取到用户ID！");
+        }
+        MerchantBankCard bankCard = merchantBankCardService.queryMerchantBankCard(String.valueOf(userId));
+        if(bankCard == null){
+            return ResultGenerator.genFailResult("当前商户编号有误！");
+        }
+        Map<String,Object> result = new HashMap<>();
+        QueryWrapper<MerchantBaseInfo> queryWrapper = new QueryWrapper<MerchantBaseInfo>().eq("userId",userId);
+        MerchantBaseInfo info = merchantBaseInfoService.getOne(queryWrapper);
+        if(info != null){
+            result.put("zfbAccount",info.getAliAccount());
+        }
+        result.put("bankCard", bankCard);
+        return ResultGenerator.genSuccessResult(result);
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/upload/UploadController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/upload/UploadController.java
new file mode 100644
index 0000000..9f59852
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/upload/UploadController.java
@@ -0,0 +1,261 @@
+package cn.pluss.platform.controller.upload;
+
+import cn.pluss.platform.annotation.PassToken;
+import cn.pluss.platform.config.OssConfig;
+import cn.pluss.platform.controller.BaseNoModelController;
+import cn.pluss.platform.systemConfig.SystemConfigService;
+import cn.pluss.platform.util.OssOperatUtil;
+import cn.pluss.platform.util.ParametersUtil;
+import cn.pluss.platform.util.StringUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.*;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+import java.util.UUID;
+
+
+@Controller
+@RequestMapping("upload")
+public class UploadController extends BaseNoModelController {
+    @Autowired
+    private SystemConfigService systemConfigService;
+
+    @Autowired
+    private HttpServletRequest request;
+
+    @Autowired
+    private OssConfig config;
+
+    @RequestMapping(value = "/uploadImage", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> uploadImage(HttpServletRequest request, @RequestParam(value = "imageFile") MultipartFile imageFile) throws IOException {
+
+        String fileNameAtr = request.getParameter("filename_atr");
+        FileOutputStream fos = null;
+        FileInputStream fis = null;
+        // 保存文件名称
+        String fileName = "file_" + StringUtil.getBillno() + "." + fileNameAtr;
+        String uploadPath = ParametersUtil.upload_save_path;
+        String visitPath = ParametersUtil.upload_visit_path;
+        Properties prop = System.getProperties();
+        String os = prop.getProperty("os.name");
+        if (os.startsWith("win") || os.startsWith("Win")) {
+            //D:\work\workspace_java\syb\pluss-manage-page
+            uploadPath = "D:\\work\\workspace_java\\syb\\resources\\manage\\upload";// 测试 // windows目录
+        }
+        String path = uploadPath + "/" + fileName;
+        String suc;
+        try {
+            InputStream ins = imageFile.getInputStream();
+            File f = new File(imageFile.getOriginalFilename());
+            inputStreamToFile(ins, f);
+            fis = new FileInputStream(f);
+            fos = new FileOutputStream(new File(path));
+            byte[] strByte = new byte[(int) f.length()];
+            // 生成文件
+            while (fis.read(strByte) != -1) {
+                fos.write(strByte);
+            }
+            fos.flush();
+            suc = "1";
+            //Runtime.getRuntime().exec("chmod -R 777 /home/syb/resources/");
+            path = visitPath + "/" + fileName;// 测试
+            // 访问路劲
+            if (os.startsWith("win") || os.startsWith("Win")) {
+                path = "http://127.0.0.1/resources/manage/upload" + "/" + fileName;// 测试 // windows目录
+            } else {
+                Runtime.getRuntime().exec("chmod -R 777 /home/syb/resources/");
+            }
+        } catch (Exception e) {
+            suc = "0";
+            e.printStackTrace();
+        } finally {
+            if (fos != null) {
+                try {
+                    fos.close();
+                } catch (IOException e) {
+                }
+            }
+            if (fis != null) {
+                fis.close();
+            }
+        }
+        // 返回保存结果
+        Map<String, Object> result = new HashMap<String, Object>();
+        result.put("result", suc);
+        result.put("url", path);
+        result.put("fileName", fileName);
+        return result;
+    }
+
+    @RequestMapping(value = "/uploadFile", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> uploadFile(HttpServletRequest request, @RequestParam(value = "file") MultipartFile file) throws IOException {
+        FileOutputStream fos = null;
+        FileInputStream fis = null;
+        // 保存文件名称
+        String name = file.getOriginalFilename();
+        String suffixName = name.substring(name.lastIndexOf("."));//获取后缀名
+        String fileName = "file_" + StringUtil.getBillno() + suffixName;
+        String uploadPath = ParametersUtil.upload_save_path;
+        String visitPath = ParametersUtil.upload_visit_path;
+        Properties prop = System.getProperties();
+        String os = prop.getProperty("os.name");
+        if (os.startsWith("win") || os.startsWith("Win")) {// windows目录
+            uploadPath = "D:/";// 测试
+        }
+        String path = uploadPath + "/" + fileName;
+        String suc;
+        try {
+            InputStream ins = file.getInputStream();
+            File f = new File(file.getOriginalFilename());
+            inputStreamToFile(ins, f);
+            fis = new FileInputStream(f);
+            fos = new FileOutputStream(new File(path));
+            byte[] strByte = new byte[(int) f.length()];
+            while (fis.read(strByte) != -1) {// 生成文件
+                fos.write(strByte);
+            }
+            fos.flush();
+            suc = "1";
+            Runtime.getRuntime().exec("chmod -R 777 /home/syb/resources/");
+            path = visitPath + "/" + fileName;// 测试
+            if (os.startsWith("win") || os.startsWith("Win")) {// 访问路劲
+                path = "http://127.0.0.1/resources/manage/upload" + "/" + fileName;// windows目录
+            }
+        } catch (Exception e) {
+            suc = "0";
+            e.printStackTrace();
+        } finally {
+            if (fos != null) {
+                try {
+                    fos.close();
+                } catch (IOException e) {
+                }
+            }
+            if (fis != null) {
+                fis.close();
+            }
+        }
+        // 返回保存结果
+        Map<String, Object> result = new HashMap<String, Object>();
+        result.put("result", suc);
+        result.put("url", path);
+        result.put("fileName", fileName);
+        return result;
+
+    }
+
+    @PostMapping("/ossUploadFile")
+    @ResponseBody
+    public Map<String, Object> ossUploadFile(HttpServletRequest request, @RequestParam("file") MultipartFile file) throws IOException {
+        Map<String, Object> result = new HashMap<>();
+        if (file.isEmpty()) {
+            result.put("code", 500);
+            result.put("msg", "上传文件不能为空！");
+            return result;
+        }
+        String fileName = UUID.randomUUID().toString().replace("-", "").toUpperCase();
+        String suffix = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".") + 1);
+        String url = OssOperatUtil.upload(file.getInputStream(), fileName, suffix);
+        if (StringUtils.isEmpty(url)) {
+            result.put("code", 501);
+            result.put("msg", "上传失败！");
+            return result;
+        }
+        System.out.println("======================================>" + url);
+        result.put("code", 200);
+        result.put("msg", "上传成功！");
+        result.put("url", url);
+        return result;
+    }
+
+
+
+    /*
+     * //上传视频 public Map<String, Object> uploadVideo() throws IOException{ String
+     * fileNameAtr=this.request.getParameter("filename_atr"); // FileOutputStream
+     * fos = null; FileInputStream fis= null; //保存文件名称 String
+     * fileName="video_"+StringUtil.getBillno()+".mp4"; String
+     * uploadPath=systemConfigService.querySystemConfigValue("upload_visit_path");
+     *
+     * Properties prop = System.getProperties(); String os1 =
+     * prop.getProperty("os.name"); if(os1.startsWith("win") ||
+     * os1.startsWith("Win")){ //windows目录
+     *
+     * //uploadPath="D:/eclipse-workspace/huazhi/resources/manage/upload";
+     * uploadPath="D:/eclipse-worksHZ/hz/java/resources/manage/upload"; } String
+     * path=uploadPath+"/"+fileName;
+     *
+     *
+     *
+     *
+     * String suc; try { fis=new FileInputStream(getImageFile()); //
+     * path=aliyunOssUpload(fileName, fis); // suc="1"; //访问路劲 // fos = new
+     * FileOutputStream(new File(path)); // byte[] strByte =new byte[(int)
+     * getImageFile().length()]; // //生成文件 // while(fis.read(strByte)!=-1){ //
+     * String str1=new String(strByte); // fos.write(strByte); // } // fos.flush();
+     * // suc="1"; //访问路劲 OutputStream os = new FileOutputStream(new File(path));
+     * int bytesRead = 0; byte[] buffer = new byte[8192]; while ((bytesRead =
+     * fis.read(buffer, 0, 8192)) != -1) { os.write(buffer, 0, bytesRead); }
+     * os.close(); fis.close();
+     *
+     * suc="1";
+     *
+     * path=SystemConfigUtil.getSingleProperty("upload_visit_path").getPropertyValue
+     * ()+"/"+fileName;
+     *
+     * if(os1.startsWith("win") || os1.startsWith("Win")){ //windows目录
+     *
+     * path="http://127.0.0.1/resources/manage/upload"+"/"+fileName; }
+     *
+     *
+     *
+     * } catch (Exception e) { suc="0"; e.printStackTrace(); } finally { // if (fos
+     * != null) { // try { fos.close(); } catch (IOException e) {} // }
+     * if(fis!=null){ fis.close(); } } Map<String, Object> result=new
+     * HashMap<String, Object>(); System.out.println(path); //返回保存结果 JSONObject
+     * json=new JSONObject(); result.put("result", suc); result.put("url", path);
+     * return result; }
+     */
+
+    public static void inputStreamToFile(InputStream ins, File file) {
+        try {
+            OutputStream os = new FileOutputStream(file);
+            int bytesRead = 0;
+            byte[] buffer = new byte[8192];
+            while ((bytesRead = ins.read(buffer, 0, 8192)) != -1) {
+                os.write(buffer, 0, bytesRead);
+            }
+            os.close();
+            ins.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @PassToken
+    @PostMapping("ossCallback")
+    @ResponseBody
+    public Map<String, String> callback(HttpServletRequest request) {
+        Map<String, String> result = new HashMap<String, String>(4);
+        String fileKey = request.getParameter("filename");
+        //String size = request.getParameter("size");
+        //String mimeType = request.getParameter("mimeType");
+//        AppVersionInfo info = new AppVersionInfo();
+//        info.setFileKey(fileKey);
+        String url = OssOperatUtil.getUrl(fileKey);
+        result.put("code", "200");
+        result.put("Status", "OK");
+        result.put("msg", "上传成功");
+        result.put("url", url);
+        return result;
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/upload/Uploader.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/upload/Uploader.java
new file mode 100644
index 0000000..f0df94a
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/upload/Uploader.java
@@ -0,0 +1,370 @@
+package cn.pluss.platform.controller.upload;
+
+import cn.pluss.platform.util.OssOperatUtil;
+import org.apache.tomcat.util.http.fileupload.FileItemIterator;
+import org.apache.tomcat.util.http.fileupload.FileItemStream;
+import org.apache.tomcat.util.http.fileupload.disk.DiskFileItemFactory;
+import org.apache.tomcat.util.http.fileupload.servlet.ServletFileUpload;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.*;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+/**
+ * UEditor文件上传辅助类
+ *
+ * @author yuchen
+ * @Description
+ */
+public class Uploader {
+    // 输出文件地址
+    private String url = "";
+    // 上传文件名
+    private String fileName = "";
+    // 状态
+    private String state = "";
+    // 文件类型
+    private String type = "";
+    // 原始文件名
+    private String originalName = "";
+    // 文件大小
+    private long size = 0;
+
+    private HttpServletRequest request = null;
+    private String title = "";
+
+    // 保存路径
+    private String savePath = "upload";
+    // 文件允许格式
+    private String[] allowFiles = {".rar", ".doc", ".docx", ".zip", ".pdf", ".txt", ".swf", ".wmv", ".gif", ".png", ".jpg", ".jpeg", ".bmp"};
+    // 文件大小限制，单位KB
+    private int maxSize = 10000;
+
+    private HashMap<String, String> errorInfo = new HashMap<>();
+
+    public Uploader(HttpServletRequest request) {
+        this.request = request;
+        HashMap<String, String> tmp = this.errorInfo;
+        tmp.put("SUCCESS", "SUCCESS"); //默认成功
+        tmp.put("NOFILE", "未包含文件上传域");
+        tmp.put("TYPE", "不允许的文件格式");
+        tmp.put("SIZE", "文件大小超出限制");
+        tmp.put("ENTYPE", "请求类型ENTYPE错误");
+        tmp.put("REQUEST", "上传请求异常");
+        tmp.put("IO", "IO异常");
+        tmp.put("DIR", "目录创建失败");
+        tmp.put("UNKNOWN", "未知错误");
+
+    }
+
+    @SuppressWarnings("unused")
+    // 存到本机
+//	public void upload() throws Exception {
+//		boolean isMultipart = ServletFileUpload.isMultipartContent(this.request);
+//		if (!isMultipart) {
+//			this.state = this.errorInfo.get("NOFILE");
+//			return;
+//		}
+//		DiskFileItemFactory dff = new DiskFileItemFactory();
+//		savePath="/home/syb/resources/images/upload";
+//
+//		Properties prop = System.getProperties();
+//        String os = prop.getProperty("os.name");
+//        if(os.startsWith("win") || os.startsWith("Win")){
+//			// windows目录
+//        	savePath="D:\\Dev\\SVN\\Java\\pluss\\media\\resources\\manage\\upload";
+//        }
+//
+//		dff.setRepository(new File(savePath));
+//		try {
+//			ServletFileUpload sfu = new ServletFileUpload(dff);
+//			sfu.setSizeMax(this.maxSize * 1024*1024);
+//			sfu.setHeaderEncoding("utf-8");
+//			FileItemIterator fii = sfu.getItemIterator(this.request);
+//			while (fii.hasNext()) {
+//				FileItemStream fis = fii.next();
+//				if (!fis.isFormField()) {
+//					this.originalName = fis.getName().substring(fis.getName().lastIndexOf(System.getProperty("file.separator")) + 1);
+//					if (!this.checkFileType(this.originalName)) {
+//						this.state = this.errorInfo.get("TYPE");
+//						continue;
+//					}
+//					this.fileName = this.getName(this.originalName);
+//					this.type = this.getFileExt(this.fileName);
+//					this.url = savePath + "/" + this.fileName;
+//
+//					BufferedInputStream in = new BufferedInputStream(fis.openStream());
+//					File file = new File(this.url);
+//					FileOutputStream out = new FileOutputStream(file);
+//					BufferedOutputStream output = new BufferedOutputStream(out);
+//					Streams.copy(in, output, true);
+//
+//					this.state=this.errorInfo.get("SUCCESS");
+//					//UE中只会处理单张上传，完成后即退出
+//					url="https://www.shouyinbei.net/resources/images/upload"+ "/" + this.fileName;
+//					 if(os.startsWith("win") || os.startsWith("Win")){
+//							// windows目录
+//						 url="http://127.0.0.1/resources/manage/upload"+ "/" + this.fileName;
+//				     }else {
+//				    	 Runtime.getRuntime().exec("chmod -R 777 /home/syb/resources/");
+//				     }
+//					break;
+//				} else {
+//					String fname = fis.getFieldName();
+//					//只处理title，其余表单请自行处理
+//					if(!"pictitle".equals(fname)){
+//						continue;
+//					}
+//                    BufferedInputStream in = new BufferedInputStream(fis.openStream());
+//                    BufferedReader reader = new BufferedReader(new InputStreamReader(in));
+//                    StringBuffer result = new StringBuffer();
+//                    while (reader.ready()) {
+//                        result.append((char)reader.read());
+//                    }
+//                    this.title = new String(result.toString().getBytes(),"utf-8");
+//                    reader.close();
+//
+//				}
+//			}
+//		} catch (Exception e) {
+//			this.state = this.errorInfo.get("UNKNOWN");
+//			System.out.println(e.toString());
+//		}
+//	}
+
+    /**
+     * 内容编辑器的图片文件上传等修改为oss上传
+     */
+    public void upload() {
+        boolean isMultipart = ServletFileUpload.isMultipartContent(this.request);
+        if (!isMultipart) {
+            this.state = this.errorInfo.get("NOFILE");
+            return;
+        }
+        DiskFileItemFactory dff = new DiskFileItemFactory();
+//        savePath = "/home/syb/resources/images/upload";
+//
+//        Properties prop = System.getProperties();
+//        String os = prop.getProperty("os.name");
+//        if (os.startsWith("win") || os.startsWith("Win")) {
+//            // windows目录
+//            savePath = "D:\\Dev\\SVN\\Java\\pluss\\media\\resources\\manage\\upload";
+//        }
+//
+//        File dir = new File(savePath);
+//        dff.setRepository(dir);
+//        if (!dir.exists()) {
+//            dir.mkdirs();
+//        }
+
+        try {
+            ServletFileUpload sfu = new ServletFileUpload(dff);
+            sfu.setSizeMax(this.maxSize * 1024 * 1024);
+            sfu.setHeaderEncoding("utf-8");
+            FileItemIterator fii = sfu.getItemIterator(this.request);
+            while (fii.hasNext()) {
+                FileItemStream fis = fii.next();
+                if (!fis.isFormField()) {
+                    this.originalName = fis.getName().substring(fis.getName().lastIndexOf(System.getProperty("file.separator")) + 1);
+                    if (!this.checkFileType(this.originalName)) {
+                        this.state = this.errorInfo.get("TYPE");
+                        continue;
+                    }
+                    this.fileName = this.getName(this.originalName);
+                    this.type = this.getFileExt(this.fileName);
+                    this.url = savePath + "/" + this.fileName;
+
+                    originalName = fis.getName().substring(fis.getName().lastIndexOf(System.getProperty("file.separator")) + 1);
+                    this.state = this.errorInfo.get("SUCCESS");
+                    try (InputStream is = fis.openStream()) {
+                        originalName = UUID.randomUUID().toString().replace("-", "");
+                        url = OssOperatUtil.upload(is, fileName, originalName);
+                    } catch (Exception e) {
+                        System.out.println("图片上传错误");
+                    }
+                    break;
+                } else {
+                    String fname = fis.getFieldName();
+                    //只处理title，其余表单请自行处理
+                    if (!"pictitle".equals(fname)) {
+                        continue;
+                    }
+                    BufferedInputStream in = new BufferedInputStream(fis.openStream());
+                    BufferedReader reader = new BufferedReader(new InputStreamReader(in));
+                    StringBuffer result = new StringBuffer();
+                    while (reader.ready()) {
+                        result.append((char) reader.read());
+                    }
+                    this.title = new String(result.toString().getBytes(), "utf-8");
+                    reader.close();
+
+                }
+            }
+        } catch (Exception e) {
+            this.state = this.errorInfo.get("UNKNOWN");
+            System.out.println(e.toString());
+        }
+
+
+//		try {
+//			ServletFileUpload sfu = new ServletFileUpload(dff);
+//			sfu.setSizeMax(this.maxSize * 1024*1024);
+//			sfu.setHeaderEncoding("utf-8");
+//			FileItemIterator fii = sfu.getItemIterator(this.request);
+//			while (fii.hasNext()) {
+//				FileItemStream fis = fii.next();
+//				originalName = fis.getName().substring(fis.getName().lastIndexOf(System.getProperty("file.separator")) + 1);
+//				try (BufferedInputStream is = new BufferedInputStream(fis.openStream())) {
+//					fileName = UUID.randomUUID().toString().replace("-", "");
+//					url = OssOperatUtil.upload(is, fileName, originalName);
+//				} catch (Exception e) {
+//					System.out.println("图片上传错误");
+//				}
+//			}
+//		} catch (Exception e) {
+//			this.state = this.errorInfo.get("UNKNOWN");
+//			System.out.println(e.toString());
+//		}
+    }
+
+    /**
+     * 接受并保存以base64格式上传的文件
+     *
+     * @param fieldName
+     */
+    public void uploadBase64(String fieldName) {
+        String savePath = this.getFolder(this.savePath);
+        String base64Data = this.request.getParameter(fieldName);
+        this.fileName = this.getName("test.png");
+        this.url = savePath + "/" + this.fileName;
+        Base64.Decoder decoder = Base64.getDecoder();
+        try {
+            File outFile = new File(this.getPhysicalPath(this.url));
+            OutputStream ro = new FileOutputStream(outFile);
+            byte[] b = decoder.decode(base64Data);
+            for (int i = 0; i < b.length; ++i) {
+                if (b[i] < 0) {
+                    b[i] += 256;
+                }
+            }
+            ro.write(b);
+            ro.flush();
+            ro.close();
+            this.state = this.errorInfo.get("SUCCESS");
+        } catch (Exception e) {
+            this.state = this.errorInfo.get("IO");
+        }
+    }
+
+    /**
+     * 文件类型判断
+     *
+     * @param fileName
+     * @return
+     */
+    private boolean checkFileType(String fileName) {
+        Iterator<String> type = Arrays.asList(this.allowFiles).iterator();
+        while (type.hasNext()) {
+            String ext = type.next();
+            if (fileName.toLowerCase().endsWith(ext)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 获取文件扩展名
+     *
+     * @return string
+     */
+    private String getFileExt(String fileName) {
+        return fileName.substring(fileName.lastIndexOf("."));
+    }
+
+    /**
+     * 依据原始文件名生成新文件名
+     *
+     * @return
+     */
+    private String getName(String fileName) {
+        Random random = new Random();
+        return this.fileName = "" + random.nextInt(10000)
+                + System.currentTimeMillis() + this.getFileExt(fileName);
+    }
+
+    /**
+     * 根据字符串创建本地目录 并按照日期建立子目录返回
+     *
+     * @param path
+     * @return
+     */
+    private String getFolder(String path) {
+        SimpleDateFormat formater = new SimpleDateFormat("yyyyMMdd");
+        path += "/" + formater.format(new Date());
+        File dir = new File(this.getPhysicalPath(path));
+        if (!dir.exists()) {
+            try {
+                dir.mkdirs();
+            } catch (Exception e) {
+                this.state = this.errorInfo.get("DIR");
+                return "";
+            }
+        }
+        return path;
+    }
+
+    /**
+     * 根据传入的虚拟路径获取物理路径
+     *
+     * @param path
+     * @return
+     */
+    private String getPhysicalPath(String path) {
+        String servletPath = this.request.getServletPath();
+        String realPath = this.request.getSession().getServletContext()
+                .getRealPath(servletPath);
+        return new File(realPath).getParent() + "/" + path;
+    }
+
+    public void setSavePath(String savePath) {
+        this.savePath = savePath;
+    }
+
+    public void setAllowFiles(String[] allowFiles) {
+        this.allowFiles = allowFiles;
+    }
+
+    public void setMaxSize(int size) {
+        this.maxSize = size;
+    }
+
+    public long getSize() {
+        return this.size;
+    }
+
+    public String getUrl() {
+        return this.url;
+    }
+
+    public String getFileName() {
+        return this.fileName;
+    }
+
+    public String getState() {
+        return this.state;
+    }
+
+    public String getTitle() {
+        return this.title;
+    }
+
+    public String getType() {
+        return this.type;
+    }
+
+    public String getOriginalName() {
+        return this.originalName;
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/user/BankCardController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/user/BankCardController.java
new file mode 100644
index 0000000..afe68e5
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/user/BankCardController.java
@@ -0,0 +1,34 @@
+package cn.pluss.platform.controller.user;
+
+import cn.pluss.platform.BankCardService;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.vo.BankCardRecordVO;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * @author DJH
+ */
+@Controller
+@RequestMapping("/bankCard")
+public class BankCardController {
+
+    @Autowired
+    private BankCardService bankCardService;
+
+    @GetMapping("/changeRecord")
+    public String index() {
+        return "user/bankCardChangeRecord";
+    }
+
+    @GetMapping("/pageBankCardRecord")
+    public Result<Page<BankCardRecordVO>> pageBankCardRecord(Page<BankCardRecordVO> page, Long userId) {
+        Page<BankCardRecordVO> resultData = bankCardService.pageBankCardRecord(page, userId);
+
+        return ResultGenerator.genSuccessResult(resultData);
+    }
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/user/UserController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/user/UserController.java
new file mode 100644
index 0000000..50ba03f
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/user/UserController.java
@@ -0,0 +1,70 @@
+package cn.pluss.platform.controller.user;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.entity.UserExtra;
+import cn.pluss.platform.entity.UserMultipleRemark;
+import cn.pluss.platform.user.UserExtraService;
+import cn.pluss.platform.user.UserMultipleRemarkService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @author DJH
+ */
+@Controller
+@RequestMapping("/user")
+public class UserController {
+
+    @Autowired
+    private UserExtraService userExtraService;
+
+    @Autowired
+    private UserMultipleRemarkService umrService;
+
+    @PostMapping("/followUpSuccess")
+    @ResponseBody
+    public Result<?> followUpSuccess(Long userId) {
+        userExtraService.followUpMark(userId);
+        return ResultGenerator.genSuccessResult("操作成功", null);
+    }
+
+    @PostMapping("/followUpStart")
+    @ResponseBody
+    public Result<?> followUpStart(Long userId) {
+        userExtraService.followUpStart(userId);
+        return ResultGenerator.genSuccessResult("操作成功", null);
+    }
+
+    @PostMapping("/addFollowUpRecord")
+    @ResponseBody
+    public Result<?> addFollowUpRecord(Long userId, String remark) {
+        UserMultipleRemark entity = new UserMultipleRemark();
+        entity.setUserId(userId);
+        entity.setCode(UserExtraService.FU);
+        entity.setRemark(remark);
+        umrService.save(entity);
+
+        return ResultGenerator.genSuccessResult(entity);
+    }
+
+    @GetMapping("/followUpData")
+    public String followUpListPage(Long userId, HttpServletRequest request) {
+        request.setAttribute("userId", userId);
+        return "user/userFollowList";
+    }
+
+    @GetMapping("/followUpDataList")
+    @ResponseBody
+    public Result<?> followUpPage(Page<UserMultipleRemark> page, UserMultipleRemark condition) {
+        final Page<UserMultipleRemark> result = umrService.pageFollowDataList(page, condition.getUserId());
+        return ResultGenerator.genSuccessResult(result);
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/userApp/UserAppController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/userApp/UserAppController.java
new file mode 100644
index 0000000..96736fa
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/userApp/UserAppController.java
@@ -0,0 +1,282 @@
+package cn.pluss.platform.controller.userApp;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.controller.BaseNoModelController;
+import cn.pluss.platform.converter.UserAppConverter;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.systemConfig.SystemConfigService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.util.StringUtil;
+import cn.pluss.platform.vo.UserInfoVO;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.Setter;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Controller
+@RequestMapping("userApp")
+public class UserAppController extends BaseNoModelController {
+
+    private Integer PAGE_SIZE = 12;
+
+    @Resource
+    private HttpServletRequest request;
+
+    @Autowired
+    private UserAppService userAppService;
+
+    @Autowired
+    private MerchantBaseInfoService merchantBaseInfoService;
+
+    @Autowired
+    private SystemConfigService systemConfigService;
+
+    @Setter(onMethod_ = {@Lazy, @Autowired})
+    private MerchantChannelStatusService merchantChannelStatusService;
+
+    /**
+     * 引导页
+     *
+     * @return
+     */
+    @RequestMapping(value = "/index", method = RequestMethod.GET)
+    public String index() {
+        String userType = request.getParameter("userType");
+        request.setAttribute("userType", userType);
+        return "userApp/userAppList";
+    }
+
+    /**
+     * 分页查询
+     */
+    @RequestMapping(value = "/queryUserAppByPage", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> queryUserAppByPage(@RequestParam(defaultValue = "1") Integer currPage, UserApp userApp) {
+        Map<String, Object> result = new HashMap<>(16);
+        Map<String, Object> map = new HashMap<>(16);
+        // ShiroUser queryCurrentShiroUser = queryCurrentShiroUser();
+        map.put("pageSize", PAGE_SIZE);
+        map.put("offset", (currPage - 1) * PAGE_SIZE);
+        map.put("userType", userApp.getUserType());
+        Page<UserInfoVO> pageData = userAppService.queryUserInfoVOPage(map);
+        Long count = pageData.getTotal();
+        result.put("userAppList", pageData.getRecords());
+        result.put("count", count);
+        result.put("pageCount", StringUtil.getPageCount(count.intValue(), PAGE_SIZE));
+        result.put("currPage", currPage);
+        return result;
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryUserAppDetails", method = RequestMethod.GET)
+    public String queryUserAppDetails(HttpServletRequest request, Long id, Integer pageIndex) {
+
+        if (id != null && id != 0) {
+            UserApp userApp = new UserApp();
+            userApp.setId(id);
+            userApp = userAppService.queryUserApp(userApp);
+            request.setAttribute("userApp", userApp);
+            request.setAttribute("pageIndex", pageIndex);
+        }
+        return "userApp/userAppDetails";
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryUserAppBaseInfo", method = RequestMethod.GET)
+    public String queryUserAppBaseInfo(HttpServletRequest request, Long id, Integer pageIndex) {
+
+        if (id != null && id != 0) {
+            UserApp userApp = new UserApp();
+            userApp.setId(id);
+            userApp = userAppService.queryUserApp(userApp);
+            request.setAttribute("userApp", userApp);
+            request.setAttribute("pageIndex", pageIndex);
+        }
+        return "userApp/userAppBaseInfo";
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryUserAppExtendsInfo", method = RequestMethod.GET)
+    public String queryUserAppExtendsInfo() {
+
+        return "userApp/userAppExtendsInfo";
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryUserAppFunctionsInfo", method = RequestMethod.GET)
+    public String queryUserAppFunctionsInfo() {
+
+        return "userApp/userAppFunctionsInfo";
+    }
+
+    /**
+     * 保存对象
+     *
+     * @throws IOException
+     */
+    @PostMapping(value = "/saveUserApp")
+    @ResponseBody
+    public Map<String, Object> saveUserApp(UserApp userApp) {
+        userAppService.saveOrUpdate(userApp);
+        Map<String, Object> result = new HashMap<>();
+        result.put("resultCode", "1");
+        result.put("resultMessage", "保存成功!");
+        return result;
+    }
+
+    /**
+     * 保存对象
+     *
+     * @throws IOException
+     */
+    @PostMapping(value = "/updateByUserId")
+    @ResponseBody
+    public Map<String, Object> updateByUserId(UserApp userApp) {
+        UpdateWrapper<UserApp> uWrapper = new UpdateWrapper<>();
+        uWrapper.eq("userId", userApp.getUserId());
+        userAppService.update(userApp, uWrapper);
+        Map<String, Object> result = new HashMap<>();
+        result.put("resultCode", "1");
+        result.put("resultMessage", "保存成功!");
+        return result;
+    }
+
+    /**
+     * 删除对象
+     *
+     * @throws IOException
+     */
+    @PostMapping(value = "/deleteUserApp")
+    @ResponseBody
+    public Map<String, Object> deleteUserApp(Long id) {
+        userAppService.removeById(id);
+        Map<String, Object> result = new HashMap<>();
+        result.put("resultCode", "1");
+        result.put("resultMessage", "保存成功!");
+        return result;
+    }
+
+    /**
+     * goAisleSwitch:(跳转到切换通道页面). <br/>
+     *
+     * @return
+     * 
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    @GetMapping(value = "/goAisleSwitchPage")
+    public String goAisleSwitch() {
+        String aisleSwitch = systemConfigService.querySystemConfigValue("aisleSwitch");
+        request.setAttribute("aisleSwitch", aisleSwitch);
+        if ("1".equals(aisleSwitch)) {
+            request.setAttribute("aisleSwitchValue", "乐刷通道");
+        } else if ("0".equals(aisleSwitch)) {
+            request.setAttribute("aisleSwitchValue", "支付宝，微信官方通道");//支付宝，微信官方通道
+        }else if("2".equals(aisleSwitch)){
+            request.setAttribute("aisleSwitchValue", "随行付");//支付宝，微信官方通道
+        }
+        return "userApp/goAisleSwitchPage";
+    }
+
+//    /**
+//     * 
+//     * aisleSwitchDetail:(加载当前用户的通道信息).<br/> 
+//     * 
+//     * @author Administrator 
+//     * @return 
+//     * @since JDK 1.8
+//     */
+//    @PostMapping(value="/aisleSwitchDetail")
+//    @ResponseBody
+//    public Map<String, Object> aisleSwitchDetail(){
+//    	Map<String, Object> result=new HashMap<String, Object>(16);
+//    	ShiroUser shiroUser = queryCurrentShiroUser();
+//    	UserApp userApp=new UserApp();
+//    	if(null!=shiroUser.getId()) {
+//    		userApp.setUserId(shiroUser.getId().intValue());
+//    		List<UserApp> queryUserAppList = userAppService.queryUserAppList(userApp);
+//    		if(queryUserAppList!=null&&queryUserAppList.size()>0) {
+//    			userApp=queryUserAppList.get(0);
+//    			result.put("code", "1");//成功
+//    			result.put("userApp", userApp);
+//    			return result;
+//    		}else {
+//    			result.put("code", "0");
+//    			return result;
+//    		}
+//    	}
+//    	result.put("code", "0");
+//		return result;
+//    }
+
+    @PostMapping("/updateAisleSwitch")
+    @ResponseBody
+    public Map<String, Object> updateAisleSwitch(String aisleSwitch) {
+        Map<String, Object> result = new HashMap<>(16);
+        try {
+            SystemConfig systemConfig = new SystemConfig();
+            systemConfig.setPropertyKey("aisleSwitch");
+            SystemConfig querySystemConfig = systemConfigService.querySystemConfig(systemConfig);
+            querySystemConfig.setPropertyValue(aisleSwitch);
+            systemConfigService.updateSystemConfig(querySystemConfig);
+            result.put("aisleSwitchValue", aisleSwitch);
+            result.put("code", "1");
+        } catch (NumberFormatException e) {
+            e.printStackTrace();
+            result.put("code", "0");
+        }
+        return result;
+    }
+
+    @GetMapping("/getByUId/{userIds}")
+    @ResponseBody
+    public Result<Map<String, Object>> getUserByUid(@PathVariable("userIds") String userIds) {
+        final Map<String, Object> resultMap = userAppService.getUserByUid(userIds);
+        return ResultGenerator.genSuccessResult(resultMap);
+    }
+
+    @PostMapping("/closeSpreadPerm")
+    @ResponseBody
+    public Result<Object> closeSpreadPerm(String userId) {
+        UserInfo ui = uiService.getById(userId);
+        ui.setStatus(UserInfo.STATUS_NO_SPREAD);
+        uiService.updateById(ui);
+
+        return ResultGenerator.genSuccessResult("操作成功", null);
+    }
+
+    @PostMapping("/openSpreadPerm")
+    @ResponseBody
+    public Result<Object> openSpreadPerm(String userId) {
+        UserInfo ui = uiService.getById(userId);
+        ui.setStatus(UserInfo.STATUS_VALID);
+        uiService.updateById(ui);
+
+        return ResultGenerator.genSuccessResult("操作成功", null);
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/userInfo/UserInfoController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/userInfo/UserInfoController.java
new file mode 100644
index 0000000..95bb0cc
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/userInfo/UserInfoController.java
@@ -0,0 +1,327 @@
+package cn.pluss.platform.controller.userInfo;
+
+import cn.pluss.platform.annotation.OpLog;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.controller.BaseNoModelController;
+import cn.pluss.platform.entity.RoleInfo;
+import cn.pluss.platform.entity.RoleUserInfo;
+import cn.pluss.platform.entity.UserInfo;
+import cn.pluss.platform.roleInfo.RoleInfoService;
+import cn.pluss.platform.roleUserInfo.RoleUserInfoService;
+import cn.pluss.platform.userInfo.UserInfoService;
+import cn.pluss.platform.util.StringUtil;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.util.*;
+
+@Controller
+@RequiredArgsConstructor
+@RequestMapping("userInfo")
+public class UserInfoController extends BaseNoModelController {
+
+    private Integer PAGE_SIZE = 12;
+
+    private final RoleInfoService roleInfoService;
+    private final RoleUserInfoService roleUserInfoService;
+
+    @Autowired
+    private UserInfoService userInfoNewService;
+
+    /**
+     * 引导页
+     *
+     * @return
+     */
+    @RequestMapping(value = "", method = RequestMethod.GET)
+    public String index() {
+
+        return "auth/userInfo/userInfoList";
+    }
+
+    /**
+     * 分页查询
+     */
+    @RequestMapping(value = "/queryUserInfoByPage", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> queryUserInfoByPage(@RequestParam(defaultValue = "1") Integer currPage, UserInfo userInfo) {
+        Map<String, Object> map = new HashMap<String, Object>(16);
+        Map<String, Object> result = new HashMap<String, Object>(16);
+        map.put("pageSize", PAGE_SIZE);
+        map.put("offset", (currPage - 1) * PAGE_SIZE);
+        if (StringUtil.isNotEmpty(userInfo.getLoginName())) {
+            map.put("loginName", userInfo.getLoginName());
+        }
+        List<UserInfo> userInfoList = uiService.queryUserInfoPage(map);
+        Integer count = uiService.queryUserInfoPageCount(map);
+        result.put("userInfoList", userInfoList);
+        result.put("count", count);
+        result.put("pageCount", StringUtil.getPageCount(count, PAGE_SIZE));
+        result.put("currPage", currPage);
+        return result;
+    }
+
+    /**
+     * 编辑导航
+     *
+     * @return
+     */
+
+    @RequestMapping(value = "/edit", method = RequestMethod.GET)
+    public String edit(Long id) {
+        System.out.println("========================");
+        if (id != null && id != 0) {
+            UserInfo userInfo = new UserInfo();
+            userInfo.setId(id);
+            userInfo = uiService.queryUserInfo(userInfo);
+            request.setAttribute("userInfo", userInfo);
+        }
+        return "auth/user/editUser";
+    }
+
+    /**
+     * 详情
+     *
+     * @return
+     */
+
+    @RequestMapping(value = "/detail", method = RequestMethod.GET)
+    public String detail(Long id) {
+        if (id != null && id != 0) {
+            UserInfo userInfo = new UserInfo();
+            userInfo.setId(id);
+            userInfo = uiService.queryUserInfo(userInfo);
+            request.setAttribute("userInfo", userInfo);
+        }
+        return "auth/user/userDetail";
+    }
+
+    /**
+     * 根据id查询user对象
+     *
+     * @throws IOException
+     */
+
+    @RequestMapping(value = "/findById", method = RequestMethod.POST)
+    @ResponseBody
+    public UserInfo findById(String id) throws IOException {
+
+        UserInfo user = new UserInfo();
+        user.setId(Long.valueOf(id));
+        UserInfo userInfo = uiService.queryUserInfo(user);
+
+        return userInfo;
+    }
+
+    /**
+     * 获取可配置的角色
+     *
+     * @throws IOException
+     */
+    @RequestMapping(value = "/permitRoles", method = RequestMethod.POST)
+    @ResponseBody
+    public List<RoleInfo> permitRoles() throws IOException {
+        List<RoleInfo> list = null;
+        String userId = request.getHeader("userId");
+        UserInfo userInfo = uiService.getById(userId);
+
+        if (userInfo == null) {
+            list = new ArrayList<>();
+        } else {
+            if (verifyUserRole()) {
+                list = roleInfoService.queryRoleInfoList(null);
+            } else {
+                list = roleInfoService.getRolesByUser(userInfo);
+            }
+        }
+
+        return list;
+    }
+
+    /**
+     * 保存用户信息
+     *
+     * @throws IOException
+     */
+    @RequestMapping(value = "/save", method = RequestMethod.POST)
+    @ResponseBody
+    public UserInfo save(UserInfo user) throws IOException {
+
+        String userId = request.getHeader("userId");
+        UserInfo handler = uiService.getById(userId);
+
+        // 设置修改时间
+        user.setUpdateTime(new Date());
+        user.setUpdator(handler.getId() + "");
+        // 并不修改密码
+        user.setPassword(null);
+        if (user.getId() != null && user.getId() != 0) {
+            uiService.updateById(user);
+        } else {
+            // 设置创建时间
+            user.setCreator(handler.getId() + "");
+            user.setCreateTime(new Date());
+            // 初始密码 123456
+            String password = "e10adc3949ba59abbe56e057f20f883e";
+            user.setPassword(password);
+            uiService.save(user);
+
+            UserInfo userInfo = new UserInfo();
+            userInfo.setLoginName(user.getLoginName());
+            List<UserInfo> userList = uiService.queryUserInfoList(userInfo);
+            user.setId(userList.get(0).getId());
+        }
+        // 保存用户角色信息
+        // 删除之前保存的用户角色绑定关系
+        RoleUserInfo roleUserInfo = new RoleUserInfo();
+        roleUserInfo.setUserId(user.getId());
+        roleUserInfoService.deleteRoleUserInfo(roleUserInfo);
+        // 保存现有的角色绑定关系
+        if (!StringUtil.isEmpty(user.getRoleIds())) {
+            String roleIds = user.getRoleIds();
+            roleIds = roleIds.substring(0, roleIds.length() - 1);
+            String[] ids = roleIds.split(",");
+            List<RoleUserInfo> roleUserInfoList = new ArrayList<>();
+            RoleUserInfo ruf;
+            for (String id : ids) {
+                ruf = new RoleUserInfo();
+                ruf.setUserId(user.getId());
+                ruf.setRoleId(Long.valueOf(id));
+                roleUserInfoList.add(ruf);
+            }
+            // 批量保存
+            for (RoleUserInfo r : roleUserInfoList) {
+                roleUserInfoService.saveRoleUserInfo(r);
+            }
+
+        }
+// 		String json = JSON.toJSONString(user);
+// 		this.sendMessages(json);
+        return user;
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryUserInfoDetails", method = RequestMethod.GET)
+    public String queryUserInfoDetails(HttpServletRequest request, Long id, Integer pageIndex) {
+
+        if (id != null && id != 0) {
+            UserInfo userInfo = new UserInfo();
+            userInfo.setId(id);
+            userInfo = uiService.queryUserInfo(userInfo);
+            request.setAttribute("userInfo", userInfo);
+            request.setAttribute("pageIndex", pageIndex);
+        }
+        return "auth/userInfo/userInfoDetails";
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryUserInfoBaseInfo", method = RequestMethod.GET)
+    public String queryUserInfoBaseInfo(HttpServletRequest request, Long id, Integer pageIndex) {
+
+        if (id != null && id != 0) {
+            UserInfo userInfo = new UserInfo();
+            userInfo.setId(id);
+            userInfo = uiService.queryUserInfo(userInfo);
+            request.setAttribute("userInfo", userInfo);
+            request.setAttribute("pageIndex", pageIndex);
+        }
+        return "auth/userInfo/userInfoBaseInfo";
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryUserInfoExtendsInfo", method = RequestMethod.GET)
+    public String queryUserInfoExtendsInfo() {
+        return "auth/userInfo/userInfoExtendsInfo";
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryUserInfoFunctionsInfo", method = RequestMethod.GET)
+    public String queryUserInfoFunctionsInfo() {
+        return "auth/userInfo/userInfoFunctionsInfo";
+    }
+
+    /**
+     * 保存对象
+     *
+     * @throws IOException
+     */
+    @RequestMapping(value = "/saveUserInfo", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> saveUserInfo(UserInfo userInfo) {
+
+        if (userInfo.getId() != null && userInfo.getId() != 0) {
+            uiService.updateUserInfo(userInfo);
+        } else {
+            uiService.saveUserInfo(userInfo);
+        }
+        Map<String, Object> result = new HashMap<>();
+        result.put("resultCode", "1");
+        result.put("resultMessage", "保存成功!");
+        return result;
+    }
+
+    /**
+     * 修改对象
+     *
+     * @throws IOException
+     */
+    @RequestMapping(value = "/updateUserInfo", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> updateUserInfo(Long id) {
+
+        UserInfo userInfo = new UserInfo();
+        userInfo.setId(id);
+        uiService.updateUserInfo(userInfo);
+        Map<String, Object> result = new HashMap<>();
+        result.put("resultCode", "1");
+        result.put("resultMessage", "保存成功!");
+        return result;
+    }
+
+    /**
+     * 删除对象
+     *
+     * @throws IOException
+     */
+    @RequestMapping(value = "/deleteUserInfo", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> deleteUserInfo(Long id) {
+        UserInfo userInfo = new UserInfo();
+        userInfo.setId(id);
+        uiService.deleteUserInfo(userInfo);
+        Map<String, Object> result = new HashMap<>();
+        result.put("resultCode", "1");
+        result.put("resultMessage", "保存成功!");
+        return result;
+    }
+
+    @RequestMapping(value = "/findRolesByUser", method = RequestMethod.POST)
+    @ResponseBody
+    public List<RoleUserInfo> findRolesByUser(Long userId) {
+        RoleUserInfo roleUserInfo = new RoleUserInfo();
+        roleUserInfo.setUserId(userId);
+        return roleUserInfoService.queryRoleUserInfoList(roleUserInfo);
+    }
+
+    @OpLog(opCode = "APP_FACE_CERT", opDetail = "APP人脸识别通过", opName = "APP人脸识别结果", opUserId = "userId")
+    @PostMapping("/verifyFaceCert")
+    @ResponseBody
+    public Result<Object> verifyFaceCert(Long userId) {
+        userInfoNewService.verifyFaceCert(userId);
+        return ResultGenerator.genSuccessResult("修改成功", null);
+    }
+
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/userIntegral/UserIntegralController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/userIntegral/UserIntegralController.java
new file mode 100644
index 0000000..8f5bdd5
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/userIntegral/UserIntegralController.java
@@ -0,0 +1,77 @@
+package cn.pluss.platform.controller.userIntegral;
+
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.userIntegral.UserIntegralService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * <p>
+ * 积分商城controller
+ * </p>
+ *
+ * @author bzg
+ * @since 2020-11-11
+ */
+@Controller
+@RequestMapping("/userIntegral")
+public class UserIntegralController extends BaseModelController<UserIntegralService, UserIntegral> {
+
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = "/index")
+    public String index() {
+        return "userIntegral/list";
+    }
+
+    @Override
+    public Result<Page<UserIntegral>> page(Page<UserIntegral> page, UserIntegral condition, OrderItem orderItem) {
+        orderItem.setColumn("id").setAsc(false);
+        return super.page(page, condition, orderItem);
+    }
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = {"/detail/{id}", "/detail"})
+    public String detail(HttpServletRequest request, @PathVariable(value = "id", required = false) Integer id) {
+        if (id != null) {
+            UserIntegral integral = baseService.getById(id);
+            request.setAttribute("entity", integral);
+        }
+        return "userIntegral/detail";
+    }
+
+    /**
+     * 保存
+     * @param entity
+     * @return
+     */
+    @RequestMapping("saveOrUpdate")
+    @ResponseBody
+    public Result<String> saveOrUpdate(UserIntegral entity) {
+        if("1".equals(entity.getType())){
+            MsgException.checkBlank(entity.getOrderNumber(),"交易类型的积分必须填写订单号");
+            MsgException.checkNull(entity.getOrderAmt(),"交易类型的积分必须填写订单金额");
+            UserIntegral userIntegral = baseService.getByOrderNumber(entity.getOrderNumber());
+            MsgException.check(userIntegral != null,"订单号已存在");
+        }else if("2".equals(entity.getType())){
+            MsgException.check(!"2".equals(entity.getSource()) && !"5".equals(entity.getSource()),"机具活动暂时只支持云音箱和扫码王！");
+            QueryWrapper<UserIntegral> queryWrapper = new QueryWrapper<UserIntegral>().eq("userId",entity.getUserId())
+                    .eq("type",entity.getType()).eq("source",entity.getSource());
+            List<UserIntegral> list = baseService.list(queryWrapper);
+            if(!list.isEmpty()){
+                MsgException.throwException("机具活动积分来源只能添加一次");
+            }
+        }
+        baseService.saveOrUpdate(entity);
+        return ResultGenerator.genSuccessResult("操作成功",null);
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/userIntegralUse/UserIntegralUseController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/userIntegralUse/UserIntegralUseController.java
new file mode 100644
index 0000000..68dc8ba
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/userIntegralUse/UserIntegralUseController.java
@@ -0,0 +1,22 @@
+package cn.pluss.platform.controller.userIntegralUse;
+
+
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.entity.UserIntegralUse;
+import cn.pluss.platform.userIntegralUse.UserIntegralUseService;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 用户积分使用详情 前端控制器
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-05-19
+ */
+@RestController
+@RequestMapping("/userIntegralUse")
+public class UserIntegralUseController extends BaseModelController<UserIntegralUseService, UserIntegralUse> {
+
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/userLevel/UserLevelController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/userLevel/UserLevelController.java
new file mode 100644
index 0000000..dc3c7e3
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/userLevel/UserLevelController.java
@@ -0,0 +1,60 @@
+package cn.pluss.platform.controller.userLevel;
+
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.entity.UserLevel;
+import cn.pluss.platform.entity.UserRole;
+import cn.pluss.platform.user.UserLevelService;
+import cn.pluss.platform.user.UserRoleService;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * <p>
+ * 用户等级表 前端控制器
+ * </p>
+ *
+ * @author bzg
+ * @since 2022-01-13
+ */
+@Controller
+@RequestMapping("/userLevel")
+public class UserLevelController extends BaseModelController<UserLevelService, UserLevel> {
+
+    @Resource
+    private UserRoleService userRoleService;
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = "/index")
+    public String index(HttpServletRequest request) {
+        return "userLevel/list";
+    }
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = {"/detail/{id}", "/detail"})
+    public String detail(HttpServletRequest request, @PathVariable(value = "id", required = false) Integer id) {
+        List<UserRole> list = userRoleService.list();
+        if (id != null) {
+            UserLevel entity = baseService.getOne(new QueryWrapper<UserLevel>().eq("id",id));
+            request.setAttribute("entity", entity);
+        }
+        request.setAttribute("roleList", list);
+        return "userLevel/detail";
+    }
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = "/save")
+    @Override
+    public Result<String> save(@RequestBody UserLevel entity) {
+        try {
+            return super.save(entity);
+        }catch (Exception e){
+            return ResultGenerator.genFailResult("角色Code和当前等级Code已存在！");
+        }
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/userOrgan/UserOrganController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/userOrgan/UserOrganController.java
new file mode 100644
index 0000000..6d41a5e
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/userOrgan/UserOrganController.java
@@ -0,0 +1,184 @@
+package cn.pluss.platform.controller.userOrgan;
+
+import cn.pluss.platform.controller.BaseNoModelController;
+import cn.pluss.platform.entitiy.ShiroUser;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.entity.UserOrgan;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.userOrgan.UserOrganService;
+import cn.pluss.platform.util.StringUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Controller
+@RequestMapping("userOrgan")
+public class UserOrganController extends BaseNoModelController {
+
+    private Integer PAGE_SIZE = 12;
+
+    @Autowired
+    private UserOrganService userOrganService;
+
+    @Autowired
+    private UserAppService userAppService;
+
+    /**
+     * 引导页
+     *
+     * @return
+     */
+    @GetMapping(value = "/index")
+    public String index(HttpServletRequest request) {
+        return "userOrgan/userOrganList";
+    }
+
+    /**
+     * 分页查询
+     */
+    @RequestMapping(value = "/queryUserOrganByPage", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> queryUserOrganByPage(@RequestParam(defaultValue = "1") Integer currPage) {
+        Map<String, Object> result = new HashMap<>();
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageSize", PAGE_SIZE);
+        map.put("offset", (currPage - 1) * PAGE_SIZE);
+        ShiroUser user = queryCurrentShiroUser();
+        Boolean bol = verifyUserRole();
+        UserApp userApp = new UserApp();
+        userApp.setUserId(user.getId());
+        List<UserApp> queryUserAppList = userAppService.queryUserAppList(userApp);
+
+        if (!bol) {
+            map.put("userId", user.getId());
+            //可以得到用户的类型
+            if (queryUserAppList != null && queryUserAppList.size() > 0) {
+                result.put("userType", queryUserAppList.get(0).getUserType());
+            }
+        }
+        if (bol) {
+            result.put("admin", "admin");
+        }
+        List<UserOrgan> userOrganList = userOrganService.queryUserOrganPage(map);
+        Integer count = userOrganService.queryUserOrganPageCount(map);
+        result.put("userOrganList", userOrganList);
+        result.put("count", count);
+        result.put("pageCount", StringUtil.getPageCount(count, PAGE_SIZE));
+        result.put("currPage", currPage);
+        return result;
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryUserOrganDetails", method = RequestMethod.GET)
+    public String queryUserOrganDetails(HttpServletRequest request, Integer id, Integer pageIndex) {
+
+        if (id != null && id != 0) {
+            UserOrgan userOrgan = new UserOrgan();
+            userOrgan.setId(id);
+            userOrgan = userOrganService.queryUserOrgan(userOrgan);
+            request.setAttribute("userOrgan", userOrgan);
+            request.setAttribute("pageIndex", pageIndex);
+        }
+        return "userOrgan/userOrganDetails";
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryUserOrganBaseInfo", method = RequestMethod.GET)
+    public String queryUserOrganBaseInfo(HttpServletRequest request, Integer id, Integer pageIndex) {
+
+        if (id != null && id != 0) {
+            UserOrgan userOrgan = new UserOrgan();
+            userOrgan.setId(id);
+            userOrgan = userOrganService.queryUserOrgan(userOrgan);
+            request.setAttribute("userOrgan", userOrgan);
+            request.setAttribute("pageIndex", pageIndex);
+        }
+        return "userOrgan/userOrganBaseInfo";
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryUserOrganExtendsInfo", method = RequestMethod.GET)
+    public String queryUserOrganExtendsInfo() {
+
+        return "userOrgan/userOrganExtendsInfo";
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryUserOrganFunctionsInfo", method = RequestMethod.GET)
+    public String queryUserOrganFunctionsInfo() {
+
+        return "userOrgan/userOrganFunctionsInfo";
+    }
+
+    /**
+     * 保存对象
+     *
+     * @throws IOException
+     */
+    @RequestMapping(value = "/saveUserOrgan", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> saveUserOrgan(UserOrgan userOrgan) {
+
+        if (userOrgan.getId() != null && userOrgan.getId() != 0) {
+            userOrganService.updateUserOrgan(userOrgan);
+        } else {
+            userOrganService.saveUserOrgan(userOrgan);
+        }
+        Map<String, Object> result = new HashMap<String, Object>();
+        result.put("resultCode", "1");
+        result.put("resultMessage", "保存成功!");
+        return result;
+    }
+
+    /**
+     * 修改对象
+     *
+     * @throws IOException
+     */
+    @RequestMapping(value = "/updateUserOrgan", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> updateUserOrgan(Integer id) {
+
+        UserOrgan userOrgan = new UserOrgan();
+        userOrgan.setId(id);
+        userOrganService.updateUserOrgan(userOrgan);
+        Map<String, Object> result = new HashMap<String, Object>();
+        result.put("resultCode", "1");
+        result.put("resultMessage", "保存成功!");
+        return result;
+    }
+
+    /**
+     * 删除对象
+     *
+     * @throws IOException
+     */
+    @RequestMapping(value = "/deleteUserOrgan", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> deleteUserOrgan(Integer id) {
+        UserOrgan userOrgan = new UserOrgan();
+        userOrgan.setId(id);
+        userOrganService.deleteUserOrgan(userOrgan);
+        Map<String, Object> result = new HashMap<String, Object>();
+        result.put("resultCode", "1");
+        result.put("resultMessage", "保存成功!");
+        return result;
+    }
+
+}
+
+
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/userProfit/UserProfitController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/userProfit/UserProfitController.java
new file mode 100644
index 0000000..68d52aa
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/userProfit/UserProfitController.java
@@ -0,0 +1,52 @@
+package cn.pluss.platform.controller.userProfit;
+
+
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.entity.UserProfit;
+import cn.pluss.platform.user.UserProfitService;
+import cn.pluss.platform.util.DateUtils;
+import cn.pluss.platform.util.PageUtils;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Calendar;
+import java.util.Date;
+
+/**
+ * <p>
+ * 用户流水统计控制器
+ * </p>
+ *
+ * @author bzg
+ * @since 2022-01-13
+ */
+@Controller
+@RequestMapping("/userProft")
+public class UserProfitController extends BaseModelController<UserProfitService, UserProfit> {
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = "/flow")
+    public String index(HttpServletRequest request) {
+        return "countData/userFlowList";
+    }
+
+
+    @GetMapping("pageData")
+    @ResponseBody
+    public Result<PageInfo<UserProfit>> pageData(Page<UserProfit> page, UserProfit condition) {
+        if(condition.getProfitDate() == null){
+            Date date = DateUtils.add(Calendar.DAY_OF_MONTH, DateUtils.currentDate(), -1);
+            condition.setProfitDate(date);
+        }
+        page = this.baseService.pageData(page, condition);
+        return ResultGenerator.genSuccessResult(PageUtils.page(page));
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/userRewardInfo/UserRewardInfoController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/userRewardInfo/UserRewardInfoController.java
new file mode 100644
index 0000000..4df76d6
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/userRewardInfo/UserRewardInfoController.java
@@ -0,0 +1,160 @@
+package cn.pluss.platform.controller.userRewardInfo;
+
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.areaCity.AreaCityService;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.enums.UserRoleEnum;
+import cn.pluss.platform.rewardConfig.RewardConfigService;
+import cn.pluss.platform.user.UserRoleService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.userInfo.UserInfoService;
+import cn.pluss.platform.userRewardInfo.UserRewardInfoService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * <p>
+ * 用户奖励信息表 前端控制器
+ * </p>
+ *
+ * @author bzg
+ * @since 2022-02-22
+ */
+@Controller
+@RequestMapping("/userRewardInfo")
+public class UserRewardInfoController extends BaseModelController<UserRewardInfoService, UserRewardInfo> {
+
+    @Resource
+    private AreaCityService areaCityService;
+
+    @Resource
+    private UserAppService userAppService;
+
+    @Resource
+    private RewardConfigService rewardConfigService;
+
+    @Resource
+    private UserInfoService userInfoService;
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = "/index")
+    public String index(HttpServletRequest request) {
+        return "userRewardInfo/list";
+    }
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = {"/detail/{id}", "/detail"})
+    public String detail(HttpServletRequest request, @PathVariable(value = "id", required = false) Integer id) {
+        List<AreaCity> areaCities = areaCityService.queryOnlyProvince();
+        List<RewardConfig> list = rewardConfigService.list();
+        if (id != null) {
+            UserRewardInfo entity = baseService.getById(id);
+            if(entity != null){
+                UserInfo userInfo = userInfoService.getById(entity.getUserId());
+                if(userInfo == null){
+                    entity.setLoginName(userInfo.getLoginName());
+                }
+            }
+            request.setAttribute("entity", entity);
+        }
+        request.setAttribute("pList", areaCities);
+        request.setAttribute("rList", list);
+        return "userRewardInfo/detail";
+    }
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = "/save")
+    @Override
+    public Result<String> save(@RequestBody UserRewardInfo entity) {
+        try {
+            if(StringUtils.isEmpty(entity.getLoginName()) && entity.getUserId() == null){
+                return ResultGenerator.genFailResult("缺失用户ID和登录账号至少填写一个");
+            }
+            String loginName = entity.getLoginName();
+            UserInfo info = null;
+            if(StringUtils.isNotEmpty(loginName)){
+                info = userInfoService.getUserInfoByLoginName(loginName);
+                if(info == null){
+                    return ResultGenerator.genFailResult("登录账号有误！");
+                }
+            }else{
+                 info = userInfoService.getById(entity.getUserId());
+                if(info == null){
+                    return ResultGenerator.genFailResult("用户ID有误！");
+                }
+
+            }
+            entity.setPhone(info.getPhone());
+            entity.setUserId(Integer.valueOf(info.getId().toString()));
+            if(entity.getUserId() == null){
+                return ResultGenerator.genFailResult("缺失userId");
+            }
+            if(entity.getReId() == null){
+                return ResultGenerator.genFailResult("缺失奖励ID");
+            }
+            UserApp userApp = userAppService.getUserAppByUserId(entity.getUserId());
+            if(userApp == null){
+                return ResultGenerator.genFailResult("无效的用户ID参数");
+            }
+            RewardConfig byId = rewardConfigService.getById(entity.getReId());
+            if(byId == null){
+                return ResultGenerator.genFailResult("当前奖励类型配置不存在");
+            }
+            if(!byId.getRoleCode().equals(userApp.getRoleCode())){
+                return ResultGenerator.genFailResult("当前奖励所属类型和用户类型不匹配！");
+            }
+            entity.setRName(byId.getName());
+            if(entity.getId() == null){
+                QueryWrapper<UserRewardInfo> queryWrapper = new QueryWrapper<UserRewardInfo>()
+                        .eq("userId",entity.getUserId()).likeRight("areaNo",entity.getAreaNo());
+                List<UserRewardInfo> list = this.baseService.list(queryWrapper);
+                if(!list.isEmpty()){
+                    return ResultGenerator.genFailResult("区域设置有误，当前设置区域已经存在，或已被包含！");
+                }
+            }
+            try {
+                super.save(entity);
+                //设置成区域合伙人
+                userApp.setAreaMark(1);
+                userAppService.updateById(userApp);
+                return ResultGenerator.genSuccessResult("操作成功",null);
+            }catch (Exception e){
+                return ResultGenerator.genFailResult("唯一约束冲突，当前用户已经存在一个该区域的配置，请勿重复添加");
+            }
+        }catch (Exception e){
+            return ResultGenerator.genFailResult("系统开小差了");
+        }
+    }
+
+    @Override
+    public Result<Page<UserRewardInfo>> page(Page<UserRewardInfo> page, UserRewardInfo condition, OrderItem orderItem) {
+        orderItem.setColumn("createTime");
+        orderItem.setAsc(false);
+        return super.page(page, condition, orderItem);
+    }
+
+    @RequestMapping(value = "getAreaInfo")
+    @ResponseBody
+    public Result<List<AreaCity>> getAreaInfo() {
+        List<AreaCity> areaCities = areaCityService.queryProvince();
+        return ResultGenerator.genSuccessResult("查询成功",areaCities);
+    }
+
+    @RequestMapping(value = "/getNextAreaInfo/{areaCode}")
+    @ResponseBody
+    public Result<List<AreaCity>> getNextAreaInfo(@PathVariable("areaCode") String areaCode) {
+        List<AreaCity> list = areaCityService.queryParentCode(areaCode);
+        return ResultGenerator.genSuccessResult("查询成功",list);
+    }
+
+
+
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/userRole/UserRoleController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/userRole/UserRoleController.java
new file mode 100644
index 0000000..e55b623
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/userRole/UserRoleController.java
@@ -0,0 +1,61 @@
+package cn.pluss.platform.controller.userRole;
+
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.base.BaseModelController;
+import cn.pluss.platform.entity.GuideLabel;
+import cn.pluss.platform.entity.UserRole;
+import cn.pluss.platform.user.UserRoleService;
+import cn.pluss.platform.util.StringUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * <p>
+ * 用户角色表 前端控制器
+ * </p>
+ *
+ * @author bzg
+ * @since 2022-01-13
+ */
+@Controller
+@RequestMapping("/userRole")
+public class UserRoleController extends BaseModelController<UserRoleService, UserRole> {
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = "/index")
+    public String index() {
+        return "userRole/list";
+    }
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = {"/detail/{id}", "/detail"})
+    public String detail(HttpServletRequest request, @PathVariable(value = "id", required = false) Integer id) {
+        if (id != null) {
+            UserRole role = baseService.getOne(new QueryWrapper<UserRole>().eq("id",id));
+            request.setAttribute("entity", role);
+        }
+        return "userRole/detail";
+    }
+
+    @RequestMapping(method = {RequestMethod.GET, RequestMethod.POST}, value = "/save")
+    @Override
+    public Result<String> save(@RequestBody UserRole entity) {
+        if(StringUtil.isEmpty(entity.getRoleName())){
+            return ResultGenerator.genFailResult("角色名称不能为空！", null);
+        }
+        if(StringUtil.isEmpty(entity.getRoleCode())){
+            return ResultGenerator.genFailResult("角色Code不能为空", null);
+        }
+        try {
+            return super.save(entity);
+        }catch (Exception e){
+            return ResultGenerator.genFailResult("角色Code已存在，请更换！");
+        }
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/wx/WxController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/wx/WxController.java
new file mode 100644
index 0000000..1442457
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/wx/WxController.java
@@ -0,0 +1,43 @@
+package cn.pluss.platform.controller.wx;
+
+import cn.pluss.platform.annotation.PassToken;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.wx.WxCertService;
+import com.alibaba.fastjson.JSONObject;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+@Controller
+@RequiredArgsConstructor
+@RequestMapping("/wx")
+public class WxController {
+
+    private final WxCertService wxCertService;
+
+    @PassToken
+    @PostMapping("/wxCert")
+    @ResponseBody
+    public Result<JSONObject> wxCert(String userId, String merchantCode, Integer channelId) {
+        wxCertService.wxCert(userId, merchantCode, channelId);
+        return ResultGenerator.genSuccessResult("微信实名认证申请成功", null);
+    }
+
+    @PostMapping("/wxCert/result")
+    @ResponseBody
+    public Result<JSONObject> wxCertResult(@RequestParam String userId) {
+        // TODO 暂无用，后面再写
+        return ResultGenerator.genSuccessResult("微信实名认证成功", null);
+    }
+
+    @PostMapping("/wxCert/cancel")
+    @ResponseBody
+    public Result<JSONObject> wxCertCancel(String userId, String merchantCode, Integer channelId) {
+        wxCertService.wxCertCancel(userId, merchantCode, channelId);
+        return ResultGenerator.genSuccessResult("微信认证申请已经撤销", null);
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/wxBankCode/WxBankCodeController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/wxBankCode/WxBankCodeController.java
new file mode 100644
index 0000000..02a3307
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/wxBankCode/WxBankCodeController.java
@@ -0,0 +1,158 @@
+package cn.pluss.platform.controller.wxBankCode;
+
+import cn.pluss.platform.controller.BaseNoModelController;
+import cn.pluss.platform.entity.WxBankCode;
+import cn.pluss.platform.util.StringUtil;
+import cn.pluss.platform.wxBankCode.WxBankCodeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Controller
+@RequestMapping("wxBankCode")
+public class WxBankCodeController  extends BaseNoModelController {
+
+	  private Integer PAGE_SIZE=12;
+
+    @Autowired
+	  private WxBankCodeService wxBankCodeService;
+
+    /**
+    *引导页
+    * @return
+    */
+    @RequestMapping(value = "/index", method = RequestMethod.GET)
+    public String index() {
+   
+        return "wxBankCode/wxBankCodeList";
+    }
+
+    /**
+    *分页查询
+    */
+    @RequestMapping(value = "/queryWxBankCodeByPage", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String,Object> queryWxBankCodeByPage(Integer currPage,Integer id){
+   
+   	if(currPage==null) {
+   	   currPage=1;
+       }
+    	Map<String,Object> map=new HashMap<String, Object>();
+    	map.put("pageSize",PAGE_SIZE);
+    	map.put("offset", (currPage-1)*PAGE_SIZE);
+    	map.put("id",  id);
+    	List<WxBankCode> wxBankCodeList=wxBankCodeService.queryWxBankCodePage(map);
+    	Integer count=wxBankCodeService.queryWxBankCodePageCount(map);
+        Map<String,Object> result=new HashMap<String,Object>();
+        result.put("wxBankCodeList", wxBankCodeList);
+        result.put("count", count);
+        result.put("pageCount",StringUtil.getPageCount(count,PAGE_SIZE));
+        result.put("currPage", currPage);
+    	  return result;
+    }
+    /**
+    *查询详情
+    */
+     @RequestMapping(value = "/queryWxBankCodeDetails", method = RequestMethod.GET)
+    public String queryWxBankCodeDetails(HttpServletRequest request,Integer id,Integer pageIndex){
+   
+   	  if(id!=null&&id!=0) {
+   		 WxBankCode wxBankCode=new WxBankCode();
+   		 wxBankCode.setId(id);
+           wxBankCode=wxBankCodeService.queryWxBankCode(wxBankCode);
+          request.setAttribute("wxBankCode", wxBankCode);
+   		request.setAttribute("pageIndex", pageIndex);
+       	}
+        return "wxBankCode/wxBankCodeDetails";
+    }
+    /**
+    *查询详情
+    */
+     @RequestMapping(value = "/queryWxBankCodeBaseInfo", method = RequestMethod.GET)
+    public String queryWxBankCodeBaseInfo(HttpServletRequest request,Integer id,Integer pageIndex){
+   
+   	  if(id!=null&&id!=0) {
+   		WxBankCode wxBankCode=new WxBankCode();
+   		wxBankCode.setId(id);
+        wxBankCode=wxBankCodeService.queryWxBankCode(wxBankCode);
+          request.setAttribute("wxBankCode", wxBankCode);
+   		request.setAttribute("pageIndex", pageIndex);
+       	}
+        return "wxBankCode/wxBankCodeBaseInfo";
+    }
+    /**
+    *查询详情
+    */
+     @RequestMapping(value = "/queryWxBankCodeExtendsInfo", method = RequestMethod.GET)
+    public String queryWxBankCodeExtendsInfo(){
+   
+        return "wxBankCode/wxBankCodeExtendsInfo";
+    }
+    /**
+    *查询详情
+    */
+     @RequestMapping(value = "/queryWxBankCodeFunctionsInfo", method = RequestMethod.GET)
+    public String queryWxBankCodeFunctionsInfo(){
+   
+        return "wxBankCode/wxBankCodeFunctionsInfo";
+    }
+    /**
+    *保存对象
+    *@throws IOException
+    */
+    @RequestMapping(value = "/saveWxBankCode", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String,Object> saveWxBankCode(WxBankCode wxBankCode){
+   
+       if(wxBankCode.getId()!=null&&wxBankCode.getId()!=0){
+    		wxBankCodeService.updateWxBankCode(wxBankCode);
+    	 }else{  
+      	wxBankCodeService.saveWxBankCode(wxBankCode);
+    	 }  
+		Map<String,Object> result=new HashMap<String,Object>();
+    	result.put("resultCode", "1");
+    	result.put("resultMessage", "保存成功!");
+    	return result;
+    }
+    /**
+    *修改对象
+    *@throws IOException
+    */
+    @RequestMapping(value = "/updateWxBankCode", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String,Object> updateWxBankCode(Integer id){
+   
+   	WxBankCode wxBankCode=new WxBankCode();
+   	wxBankCode.setId(id);
+      wxBankCodeService.updateWxBankCode(wxBankCode);
+   	Map<String,Object> result=new HashMap<String,Object>();
+    	result.put("resultCode", "1");
+    	result.put("resultMessage", "保存成功!");
+    	return result;
+    }
+    /**
+    *删除对象
+    *@throws IOException
+    */
+    @RequestMapping(value = "/deleteWxBankCode", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String,Object> deleteWxBankCode(Integer id){
+   	WxBankCode wxBankCode=new WxBankCode();
+   	wxBankCode.setId(id);
+		wxBankCodeService.deleteWxBankCode(wxBankCode);
+		Map<String,Object> result=new HashMap<String,Object>();
+    	result.put("resultCode", "1");
+    	result.put("resultMessage", "保存成功!");
+    	return result;
+    }
+
+}
+
+
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/wxCityInfo/WxCityInfoController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/wxCityInfo/WxCityInfoController.java
new file mode 100644
index 0000000..50d6086
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/wxCityInfo/WxCityInfoController.java
@@ -0,0 +1,169 @@
+package cn.pluss.platform.controller.wxCityInfo;
+
+import cn.pluss.platform.controller.BaseNoModelController;
+import cn.pluss.platform.entity.WxCityInfo;
+import cn.pluss.platform.util.StringUtil;
+import cn.pluss.platform.wxCityInfo.WxCityInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Controller
+@RequestMapping("wxCityInfo")
+public class WxCityInfoController extends BaseNoModelController {
+
+    private Integer PAGE_SIZE = 12;
+
+    @Autowired
+    private WxCityInfoService wxCityInfoService;
+
+    /**
+     * 引导页
+     *
+     * @return
+     */
+    @RequestMapping(value = "/index", method = RequestMethod.GET)
+    public String index() {
+
+        return "wxCityInfo/wxCityInfoList";
+    }
+
+    /**
+     * 分页查询
+     */
+    @RequestMapping(value = "/queryWxCityInfoByPage", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> queryWxCityInfoByPage(Integer currPage, Integer id) {
+
+        if (currPage == null) {
+            currPage = 1;
+        }
+        Map<String, Object> map = new HashMap<String, Object>();
+        map.put("pageSize", PAGE_SIZE);
+        map.put("offset", (currPage - 1) * PAGE_SIZE);
+        map.put("id", id);
+        List<WxCityInfo> wxCityInfoList = wxCityInfoService.queryWxCityInfoPage(map);
+        Integer count = wxCityInfoService.queryWxCityInfoPageCount(map);
+        Map<String, Object> result = new HashMap<String, Object>();
+        result.put("wxCityInfoList", wxCityInfoList);
+        result.put("count", count);
+        result.put("pageCount", StringUtil.getPageCount(count, PAGE_SIZE));
+        result.put("currPage", currPage);
+        return result;
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryWxCityInfoDetails", method = RequestMethod.GET)
+    public String queryWxCityInfoDetails(HttpServletRequest request, Integer id, Integer pageIndex) {
+
+        if (id != null && id != 0) {
+            WxCityInfo wxCityInfo = new WxCityInfo();
+            wxCityInfo.setId(id);
+            wxCityInfo = wxCityInfoService.queryWxCityInfo(wxCityInfo);
+            request.setAttribute("wxCityInfo", wxCityInfo);
+            request.setAttribute("pageIndex", pageIndex);
+        }
+        return "wxCityInfo/wxCityInfoDetails";
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryWxCityInfoBaseInfo", method = RequestMethod.GET)
+    public String queryWxCityInfoBaseInfo(HttpServletRequest request, Integer id, Integer pageIndex) {
+
+        if (id != null && id != 0) {
+            WxCityInfo wxCityInfo = new WxCityInfo();
+            wxCityInfo.setId(id);
+            wxCityInfo = wxCityInfoService.queryWxCityInfo(wxCityInfo);
+            request.setAttribute("wxCityInfo", wxCityInfo);
+            request.setAttribute("pageIndex", pageIndex);
+        }
+        return "wxCityInfo/wxCityInfoBaseInfo";
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryWxCityInfoExtendsInfo", method = RequestMethod.GET)
+    public String queryWxCityInfoExtendsInfo() {
+
+        return "wxCityInfo/wxCityInfoExtendsInfo";
+    }
+
+    /**
+     * 查询详情
+     */
+    @RequestMapping(value = "/queryWxCityInfoFunctionsInfo", method = RequestMethod.GET)
+    public String queryWxCityInfoFunctionsInfo() {
+
+        return "wxCityInfo/wxCityInfoFunctionsInfo";
+    }
+
+    /**
+     * 保存对象
+     *
+     * @throws IOException
+     */
+    @RequestMapping(value = "/saveWxCityInfo", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> saveWxCityInfo(WxCityInfo wxCityInfo) {
+
+        if (wxCityInfo.getId() != null && wxCityInfo.getId() != 0) {
+            wxCityInfoService.updateWxCityInfo(wxCityInfo);
+        } else {
+            wxCityInfoService.saveWxCityInfo(wxCityInfo);
+        }
+        Map<String, Object> result = new HashMap<String, Object>();
+        result.put("resultCode", "1");
+        result.put("resultMessage", "保存成功!");
+        return result;
+    }
+
+    /**
+     * 修改对象
+     *
+     * @throws IOException
+     */
+    @RequestMapping(value = "/updateWxCityInfo", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> updateWxCityInfo(Integer id) {
+
+        WxCityInfo wxCityInfo = new WxCityInfo();
+        wxCityInfo.setId(id);
+        wxCityInfoService.updateWxCityInfo(wxCityInfo);
+        Map<String, Object> result = new HashMap<String, Object>();
+        result.put("resultCode", "1");
+        result.put("resultMessage", "保存成功!");
+        return result;
+    }
+
+    /**
+     * 删除对象
+     *
+     * @throws IOException
+     */
+    @RequestMapping(value = "/deleteWxCityInfo", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> deleteWxCityInfo(Integer id) {
+        WxCityInfo wxCityInfo = new WxCityInfo();
+        wxCityInfo.setId(id);
+        wxCityInfoService.deleteWxCityInfo(wxCityInfo);
+        Map<String, Object> result = new HashMap<String, Object>();
+        result.put("resultCode", "1");
+        result.put("resultMessage", "保存成功!");
+        return result;
+    }
+
+}
+
+
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/interceptor/AuthenticationInterceptor.java b/pluss-manage-page/src/main/java/cn/pluss/platform/interceptor/AuthenticationInterceptor.java
new file mode 100644
index 0000000..fd67bfd
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/interceptor/AuthenticationInterceptor.java
@@ -0,0 +1,135 @@
+package cn.pluss.platform.interceptor;
+
+import cn.pluss.platform.annotation.PassToken;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultCode;
+import cn.pluss.platform.entity.UserInfo;
+import cn.pluss.platform.exception.UnauthorizedException;
+import cn.pluss.platform.ipLocation.IpLocationService;
+import cn.pluss.platform.userInfo.UserInfoService;
+import cn.pluss.platform.util.ComUtil;
+import cn.pluss.platform.util.IpUtils;
+import cn.pluss.platform.util.JwtUtils;
+import com.aliyuncs.geoip.model.v20200101.DescribeIpv4LocationResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.method.HandlerMethod;
+import org.springframework.web.servlet.HandlerInterceptor;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.lang.reflect.Method;
+import java.util.Objects;
+
+/**
+ * @author Djh
+ */
+public class AuthenticationInterceptor implements HandlerInterceptor {
+
+    @Autowired
+    private UserInfoService uiService;
+
+    @Autowired
+    private IpLocationService ipLocationService;
+
+    @Value("${ip.config.enabled}")
+    private Boolean ipEnable;
+
+    @Override
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+        if (ipEnable.equals(Boolean.TRUE)) {
+            String ipAddr = IpUtils.getIpAddr(request);
+            DescribeIpv4LocationResponse location = ipLocationService.getLocation(ipAddr);
+            if (!"中国".equals(location.getCountry())) {
+                throw new UnauthorizedException("非法请求");
+            }
+
+            if ("香港".equals(location.getProvince())) {
+                throw new UnauthorizedException("非法请求");
+            }
+        }
+
+        // 如果不是映射到方法直接通过, 跳过静态文件
+        if (!(handler instanceof HandlerMethod)) {
+            return HandlerInterceptor.super.preHandle(request, response, handler);
+        }
+
+        HandlerMethod handlerMethod = (HandlerMethod) handler;
+        Method method = handlerMethod.getMethod();
+        // 页面请求不做拦截, url无法带header
+        boolean annotationPresent = method.isAnnotationPresent(PassToken.class);
+        boolean b = !method.isAnnotationPresent(ResponseBody.class);
+        if ( annotationPresent || b ) {
+            return HandlerInterceptor.super.preHandle(request, response, handler);
+        }
+
+        // String uri = request.getRequestURI();
+        String token = request.getHeader("token");
+        String userId = request.getHeader("userId");
+
+        // 执行认证
+        if (token == null) {
+            Result<Object> result = new Result<>();
+            result.setCode(ResultCode.UNAUTHORIZED);
+            ComUtil.responseResult(response, result);
+            return false;
+        }
+
+        UserInfo ui = uiService.getById(userId);
+        if (ui == null) {
+            Result<Object> result = new Result<>();
+            result.setCode(ResultCode.UNAUTHORIZED);
+            ComUtil.responseResult(response, result);
+            return false;
+        }
+
+        if (!Objects.equals("244", userId)) {
+            Result<Object> result = new Result<>();
+            result.setCode(ResultCode.UNAUTHORIZED);
+            ComUtil.responseResult(response, result);
+            return false;
+        }
+
+        Object uid = JwtUtils.get("uid", token);
+        if (!Objects.equals(userId, uid.toString())) {
+            Result<Object> result = new Result<>();
+            result.setCode(ResultCode.UNAUTHORIZED);
+            ComUtil.responseResult(response, result);
+            return false;
+        }
+
+        Object expireTime = JwtUtils.get("expire_time", token);
+        if (!(expireTime instanceof Long)) {
+            Result<Object> result = new Result<>();
+            result.setCode(ResultCode.UNAUTHORIZED);
+            ComUtil.responseResult(response, result);
+            return false;
+        }
+
+        if (((Long) expireTime) < System.currentTimeMillis()) {
+            Result<Object> result = new Result<>();
+            result.setCode(ResultCode.UNAUTHORIZED);
+            ComUtil.responseResult(response, result);
+            return false;
+        }
+
+        try {
+            boolean verify = JwtUtils.verify(token, userId);
+            if (!verify) {
+                Result<Object> result = new Result<>();
+                result.setCode(ResultCode.UNAUTHORIZED);
+                ComUtil.responseResult(response, result);
+                return false;
+            }
+
+        } catch (Exception e) {
+            Result<Object> result = new Result<>();
+            result.setCode(ResultCode.UNAUTHORIZED);
+            ComUtil.responseResult(response, result);
+            return false;
+        }
+
+        return HandlerInterceptor.super.preHandle(request, response, handler);
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/job/CalcUserAreaRewardJob.java b/pluss-manage-page/src/main/java/cn/pluss/platform/job/CalcUserAreaRewardJob.java
new file mode 100644
index 0000000..78a512b
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/job/CalcUserAreaRewardJob.java
@@ -0,0 +1,36 @@
+package cn.pluss.platform.job;
+
+import cn.pluss.platform.mapper.UserRewardInfoMapper;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.userAreaRewardFlow.UserAreaRewardFlowService;
+import cn.pluss.platform.userRewardInfo.UserRewardInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.Scheduled;
+
+import javax.annotation.Resource;
+
+/**
+ *
+ *统计用户区域奖励
+ *@author: bzg
+ *@time: 2022/2/28 17:19
+ */
+@Slf4j
+@Configuration
+@ConditionalOnProperty(prefix = "scheduling", name = "enabled", havingValue = "true")
+public class CalcUserAreaRewardJob {
+
+
+    @Resource
+    private UserAreaRewardFlowService userAreaRewardFlowService;
+
+
+    @Scheduled(cron = "0 5 0 * * ?")
+    public void calcUserAreaRewardTask(){
+        log.info("~~~~~~~~统计用户区域奖励定时任务开始~~~~~~~~~~~~~");
+        userAreaRewardFlowService.calcUserAreaRewardFlow();
+        log.info("~~~~~~~~统计用户区域奖励定时任务结束~~~~~~~~~~~~");
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/job/CalcUserLevelJob.java b/pluss-manage-page/src/main/java/cn/pluss/platform/job/CalcUserLevelJob.java
new file mode 100644
index 0000000..adfe809
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/job/CalcUserLevelJob.java
@@ -0,0 +1,37 @@
+package cn.pluss.platform.job;
+
+import cn.pluss.platform.user.UserProfitService;
+import cn.pluss.platform.userApp.UserAppService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.Scheduled;
+
+import javax.annotation.Resource;
+
+/**
+ *
+ *计算每个月用户流水是否达标进行升级
+ *@author: bzg
+ *@time: 2022/1/20 16:46
+ */
+@Slf4j
+@Configuration
+@ConditionalOnProperty(prefix = "scheduling", name = "enabled", havingValue = "true")
+public class CalcUserLevelJob {
+
+    @Resource
+    private UserProfitService userProfitService;
+
+    /**
+     * 计算每个月用户流水是否达标进行升级
+     * 每个月1号 1：30执行 获取上个月的交易流水 判断是否达标进行升级
+     * @date: 2022/1/14 14:14
+     */
+    @Scheduled(cron = "0 30 1 1 * ?")
+    public void calcLevelTask(){
+        log.info("~~~~~~~~~统计用户流水是否达标定时任务开始~~~~~~~~~~~~");
+        userProfitService.calcLevelTask();
+        log.info("~~~~~~~~统计用户流水是否达标定时任务结束~~~~~~~~~~~~");
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/job/CalcUserProfitJob.java b/pluss-manage-page/src/main/java/cn/pluss/platform/job/CalcUserProfitJob.java
new file mode 100644
index 0000000..2fe7638
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/job/CalcUserProfitJob.java
@@ -0,0 +1,50 @@
+package cn.pluss.platform.job;
+
+import cn.pluss.platform.user.UserProfitService;
+import cn.pluss.platform.userRewardFlow.UserRewardFlowService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.Scheduled;
+
+import javax.annotation.Resource;
+
+/**
+ *
+ * 统计前一天用户交易分润
+ *@author: bzg
+ *@time: 2022/1/14 14:07
+ */
+@Slf4j
+@Configuration
+@ConditionalOnProperty(prefix = "scheduling", name = "enabled", havingValue = "true")
+public class CalcUserProfitJob {
+
+
+    @Resource
+    private UserProfitService userProfitService;
+
+    @Resource
+    private UserRewardFlowService userRewardFlowService;
+
+    /**
+     * 每天24点10分统计上一个交易日所产生的分润
+     * @date: 2022/1/14 14:14
+     */
+    @Scheduled(cron = "0 10 0 * * ?")
+    public void calcProftTask(){
+        log.info("~~~~~~~~统计所有用户前一天的流水以及分润定时任务开始~~~~~~~~~~~~~");
+        userProfitService.createProfitV2(null);
+        log.info("~~~~~~~~统计所有用户前一天的流水以及分润定时任务结束~~~~~~~~~~~~");
+    }
+
+    /**
+     * 统计用户管理奖收益
+     */
+    @Scheduled(cron = "30 0 0 * * ?")
+    public void calcManageProftTask(){
+        log.info("统计用户管理奖定时任务开始");
+        userRewardFlowService.countManageProfit();
+        log.info("统计用户管理奖定时任务结束");
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/job/CensusPlatformDataJob.java b/pluss-manage-page/src/main/java/cn/pluss/platform/job/CensusPlatformDataJob.java
new file mode 100644
index 0000000..09500e7
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/job/CensusPlatformDataJob.java
@@ -0,0 +1,35 @@
+package cn.pluss.platform.job;
+
+import cn.pluss.platform.platformData.PlatformDataService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.Scheduled;
+
+import javax.annotation.Resource;
+
+/**
+ *
+ *@description:统计首页昨日交易数据
+ *@author: bzg
+ *@time: 2021/10/20 15:16
+ */
+@Configuration
+@ConditionalOnProperty(prefix = "scheduling", name = "enabled", havingValue = "true")
+public class CensusPlatformDataJob {
+
+    private Logger log = LoggerFactory.getLogger(this.getClass());
+
+    @Resource
+    private PlatformDataService platformDataService;
+
+
+    //每天凌晨执行统计昨日交易数据
+    @Scheduled(cron = "0 02 0 1/1 * ? ")
+    public void task() {
+        log.info("统计首页数据定时任务开始~~~");
+        platformDataService.censusPlatformData();
+        log.info("统计首页数据执行成功，定时任务结束！");
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/job/CheckMerchAuditStatusJob.java b/pluss-manage-page/src/main/java/cn/pluss/platform/job/CheckMerchAuditStatusJob.java
new file mode 100644
index 0000000..684033d
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/job/CheckMerchAuditStatusJob.java
@@ -0,0 +1,425 @@
+package cn.pluss.platform.job;
+
+import cn.pluss.platform.BankCardService;
+import cn.pluss.platform.channel.MerchantAuditService;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.merchant.AccountService;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchant.MerchantCashPlaceService;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.notice.NoticeService;
+import cn.pluss.platform.ryx.RyxService;
+import cn.pluss.platform.sxf.SxfService;
+import cn.pluss.platform.task.RyxMerAuditHandler;
+import cn.pluss.platform.task.SxfMerAuditHandler;
+import cn.pluss.platform.user.impl.GeneralPushUtil;
+import cn.pluss.platform.util.LogExceptionUtils;
+import cn.pluss.platform.util.RyxConfig;
+import cn.pluss.platform.util.SxfConfg;
+import cn.pluss.platform.yinsheng.v20210929.ReqMethod;
+import cn.pluss.platform.ys.impl.v20210929.YsConfigV2;
+import cn.pluss.platform.ys.impl.v20210929.YsServiceV2;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.transaction.TransactionStatus;
+import org.springframework.transaction.support.TransactionCallbackWithoutResult;
+import org.springframework.transaction.support.TransactionTemplate;
+
+import java.util.*;
+
+/**
+ * 定时任务查询进件状态
+ */
+@Slf4j
+@Configuration
+@ConditionalOnProperty(prefix = "scheduling", name = "enabled", havingValue = "true")
+public class CheckMerchAuditStatusJob {
+
+    public static final int MAX_SIZE = 100;
+
+    @Autowired
+    @Lazy
+    private SxfMerAuditHandler sxfMerAuditHandler;
+
+    @Autowired
+    private MerchantBaseInfoService mbiService;
+
+    @Autowired
+    private AccountService accountService;
+
+    @Autowired
+    private BankCardService bankCardService;
+
+    @Autowired
+    private MerchantChannelStatusService mcsService;
+
+    @Autowired
+    private MerchantAuditService ysAuditService;
+
+    @Autowired
+    private YsServiceV2 ysServiceV2;
+
+    @Autowired
+    private MerchantAuditService ysAuditServiceV2;
+
+    @Autowired
+    private SxfService sxfService;
+
+    @Autowired
+    private RyxService ryxService;
+
+    @Autowired
+    private MerchantAuditService ryxMerchantAuditService;
+
+    @Autowired
+    private TransactionTemplate transactionTemplate;
+
+    @Autowired
+    private RyxMerAuditHandler ryxMerAuditHandler;
+
+    @Autowired
+    private NoticeService noticeService;
+
+    @Autowired
+    @Lazy
+    private MerchantCashPlaceService cashPlaceService;
+
+    @Autowired
+    private GeneralPushUtil generalPushUtil;
+
+    public void process() {
+        checkSxfMerchEditStatus();
+
+        checkRyxMerchEditStatus();
+
+        checkYsMerchStatusV2();
+
+        checkYsMerchEditStatus();
+
+        checkRyxMerchStatus();
+    }
+
+    /**
+     * 查询随行付银行卡修改结果
+     */
+    @Scheduled(fixedDelay = 3 * 60 * 1000)
+    public void checkSxfMerchEditStatus() {
+        log.info("======开始查询随行付商户修改结果======");
+        MerchantChannelStatus mcsCondition = new MerchantChannelStatus();
+        mcsCondition.setStatus(MerchantChannelStatus.AUDIT_STATUS_DATA_EDIT);
+        mcsCondition.setChannel(1);
+        List<MerchantChannelStatus> mcsList = mcsService.list(new QueryWrapper<>(mcsCondition));
+
+        for (MerchantChannelStatus mcs : mcsList) {
+            try {
+                Thread.sleep(100);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+
+            try {
+                JSONObject param = new JSONObject();
+                param.put("applicationId", mcs.getApplicationId());
+                JSONObject result = sxfService.requestApi(SxfConfg.SXF_UPDATE_MERCHANT_INFO_RESULT, param);
+
+                try {
+                    sxfService.checkSign(result);
+                } catch (Exception e) {
+                    log.error("验签异常");
+                    MsgException.throwException(e.getMessage());
+                }
+
+                String reqId = result.getString("reqId");
+
+                if (!Objects.equals(SxfConfg.SXF_SUCCESS_CODE, result.get("code"))) {
+                    String msg = result.getString("msg");
+                    log.error("查询随行付修改结果异常: {}", msg);
+                }
+
+                JSONObject respData = result.getJSONObject("respData");
+                if (!Objects.equals(SxfConfg.SXF_SUCCESS_CODE, respData.get("bizCode"))) {
+                    String msg = result.getString("bizMsg");
+                    log.error("查询随行付修改结果异常: {}", msg);
+                }
+
+                String taskStatus = respData.getString("taskStatus");
+
+                if (Objects.equals(taskStatus, "5")) {
+                    // 修改成功
+                    accountService.editSuccess(mcs, Account.CHANNEL_TYPE_D1);
+                }
+
+                if (Objects.equals(taskStatus, "6")) {
+                    // 修改失败
+                    accountService.editFail(mcs, reqId + "_" + System.currentTimeMillis(), result.getString("suggestion"), Account.CHANNEL_TYPE_D1);
+                }
+
+            } catch (Exception e) {
+                log.info("查询随行付修改结果异常");
+            }
+        }
+
+        log.info("======结束查询随行付商户修改结果======");
+    }
+
+    /**
+     * 查询瑞银信商户进件修改的状态
+     */
+    @Scheduled(fixedDelay = 3 * 60 * 1000)
+    public void checkRyxMerchEditStatus() {
+        log.info("======开始查询瑞银信商户修改结果======");
+        MerchantChannelStatus mcsCondition = new MerchantChannelStatus();
+        mcsCondition.setStatus(MerchantChannelStatus.AUDIT_STATUS_DATA_EDIT);
+        mcsCondition.setChannel(3);
+        List<MerchantChannelStatus> mcsList = mcsService.list(new QueryWrapper<>(mcsCondition));
+
+        for (MerchantChannelStatus mcs : mcsList) {
+            try {
+                Thread.sleep(100);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+            try {
+                JSONObject param = new JSONObject();
+                String merInId = mcs.getExtra().getString("merInId");
+                param.put("merInId", merInId);
+                param.put("flag", "1");
+
+                RyxAccessResp resp = ryxService.reqCommon(param, null, RyxConfig.merchantInfo);
+                JSONObject result = resp.getResult();
+
+                JSONObject merchBase = result.getJSONObject("merchBase");
+
+                String merStatus = merchBase.getString("merStatus");
+
+                String reason = merchBase.getString("finalAuditNoMemo");
+
+                if (Objects.equals("00", merStatus)) {
+                    // 审核通过
+                    accountService.editSuccess(mcs, Account.CHANNEL_TYPE_D1);
+                }
+
+                if (Objects.equals("32", merStatus)) {
+                    // 修改失败
+                    accountService.editFail(mcs, UUID.randomUUID().toString().replace("-", "") + "_" + System.currentTimeMillis(), reason, Account.CHANNEL_TYPE_D1);
+                }
+
+            } catch (Exception e) {
+                log.info("查询随行付修改结果异常");
+            }
+        }
+
+        log.info("======结束查询瑞银信商户修改结果======");
+    }
+
+    /**
+     * 查询瑞银信进件商户的状态
+     */
+    @Scheduled(fixedDelay = 3 * 60 * 1000)
+    public void checkRyxMerchStatus() {
+        log.info("==========查询瑞银信商户进件状态开始==========");
+        LambdaQueryWrapper<MerchantChannelStatus> qW = Wrappers.lambdaQuery();
+        qW.in(MerchantChannelStatus::getStatus, MerchantChannelStatus.AUDIT_STATUS_EXAMINING, MerchantChannelStatus.AUDIT_STATUS_WAITING_SIGN)
+                .eq(MerchantChannelStatus::getChannel, 3)
+                .ne(MerchantChannelStatus::getThirdStatus, MerchantChannelStatus.AUDIT_THIRD_STATUS_WAITING)
+                .orderByDesc(MerchantChannelStatus::getUpdateTime)
+                .last("limit " + MAX_SIZE);
+
+        List<MerchantChannelStatus> mcsList = mcsService.list(qW);
+
+        for (MerchantChannelStatus mcs : mcsList) {
+            try {
+                Thread.sleep(100);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+
+            String applicationId = mcs.getApplicationId();
+            if (StringUtils.isBlank(applicationId)) {
+                continue;
+            }
+
+            // 拼接成真正的orderId
+            String orderId = applicationId.substring(0, 8) + "-" +
+                    applicationId.substring(8, 12) + "-" +
+                    applicationId.substring(12, 16) + "-" +
+                    applicationId.substring(16, 20) + "-" +
+                    applicationId.substring(20);
+
+            try {
+                Map<String, Object> param = new HashMap<>();
+                param.put("orderId", orderId);
+                JSONObject jsonObject = ryxMerchantAuditService.merchantAuditResult(param);
+
+                ryxMerAuditHandler.auditCallback(jsonObject);
+
+                MerchantChannelStatus mcsCurrent = mcsService.getById(mcs.getId());
+
+                if (!mcsCurrent.getStatus().equals(MerchantChannelStatus.AUDIT_STATUS_SUCCESS)) {
+                    continue;
+                }
+
+                // 以下代码为进件结果处理后的操作
+                // 创建线上店铺
+                try {
+                    log.info("===================>进件回调，创建店铺开始,商户编号memo为:{}<=====================", jsonObject.getString("memo"));
+                    ryxMerAuditHandler.createStore(mcs);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    log.info("创建店铺信息异常,异常信息:{}", e.getMessage());
+                }
+
+                try {
+                    MerchantBaseInfo merchantBaseInfo = mbiService.getMerchantBaseInfoByMerchantCode(mcs.getMerchantCode());
+                    if (StringUtils.isNotBlank(merchantBaseInfo.getUserId())) {
+                        cashPlaceService.createDefaultCashPlace(Long.parseLong(merchantBaseInfo.getUserId()));
+                    }
+                } catch (Exception e) {
+                    LogExceptionUtils.printStack(log, e, "创建默认收银点失败,异常信息:{}");
+                }
+            } catch (Exception ignored) {
+            }
+        }
+
+        log.info("==========查询瑞银信商户进件状态结束==========");
+    }
+
+    /**
+     * 查询银盛进件商户的状态
+     */
+    private void checkYsMerchStatus() {
+        log.info("==========查询银盛商户进件状态开始==========");
+        LambdaQueryWrapper<MerchantChannelStatus> qW = Wrappers.lambdaQuery();
+        qW.in(MerchantChannelStatus::getStatus, MerchantChannelStatus.AUDIT_STATUS_EXAMINING, MerchantChannelStatus.AUDIT_STATUS_WAITING_SIGN)
+                .eq(MerchantChannelStatus::getChannel, 4)
+                .isNull(MerchantChannelStatus::getApplicationId)
+                .notIn(MerchantChannelStatus::getThirdStatus, MerchantChannelStatus.AUDIT_THIRD_STATUS_WAITING, MerchantChannelStatus.AUDIT_THIRD_STATUS_AUDITING)
+                .orderByDesc(MerchantChannelStatus::getUpdateTime)
+                .last("limit " + MAX_SIZE);
+
+        List<MerchantChannelStatus> mcsList = mcsService.list(qW);
+
+        for (MerchantChannelStatus mcs : mcsList) {
+            try {
+                JSONObject params = new JSONObject();
+                params.put("merchantCode", mcs.getMerchantCode());
+                ysAuditService.merchantAuditResult(params);
+            } catch (Exception e) {
+                log.warn("银盛查询商户进件状态失败");
+            }
+        }
+        log.info("==========查询银盛商户进件状态结束==========");
+    }
+
+    /**
+     * 银盛-云商服进件商户的状态查询
+     */
+    @Scheduled(fixedDelay = 3 * 60 * 1000)
+    public void checkYsMerchStatusV2() {
+        log.info("==========查询银盛-云商服商户进件状态开始==========");
+        Calendar calendar = Calendar.getInstance();
+        calendar.add(Calendar.WEEK_OF_YEAR, -1);
+        LambdaQueryWrapper<MerchantChannelStatus> qW = Wrappers.lambdaQuery();
+        qW.in(MerchantChannelStatus::getStatus,
+                        MerchantChannelStatus.AUDIT_STATUS_EXAMINING,
+                        MerchantChannelStatus.AUDIT_STATUS_WAITING_SIGN,
+                        MerchantChannelStatus.AUDIT_STATUS_SIGNED)
+                .eq(MerchantChannelStatus::getChannel, 4)
+                .isNotNull(MerchantChannelStatus::getApplicationId)
+                .notIn(MerchantChannelStatus::getThirdStatus,
+                        MerchantChannelStatus.AUDIT_THIRD_STATUS_WAITING,
+                        MerchantChannelStatus.AUDIT_THIRD_STATUS_AUDITING)
+                .orderByDesc(MerchantChannelStatus::getUpdateTime)
+                .ge(MerchantChannelStatus::getUpdateTime, calendar.getTime())
+                .last("limit " + MAX_SIZE);
+
+        List<MerchantChannelStatus> mcsList = mcsService.list(qW);
+
+        for (MerchantChannelStatus mcs : mcsList) {
+            try {
+                Thread.sleep(100);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+
+            JSONObject params = new JSONObject();
+            if (mcs.getApplicationId() == null) {
+                continue;
+            }
+            params.put("sysFlowId", mcs.getApplicationId());
+            try {
+                ysAuditServiceV2.merchantAuditResult(params);
+            } catch (Exception e) {
+                log.warn("银盛查询商户进件状态失败: {}", e.getMessage());
+                e.printStackTrace();
+            }
+        }
+        log.info("==========查询银盛-云商服商户进件状态结束==========");
+    }
+
+    /**
+     * 银盛-云商服，商户修改信息
+     */
+    @Scheduled(fixedDelay = 3 * 60 * 1000)
+    public void checkYsMerchEditStatus() {
+        log.info("==========查询银盛-云商服商户变更状态开始==========");
+        LambdaQueryWrapper<MerchantChannelStatus> qWrapper = Wrappers.lambdaQuery();
+        qWrapper.eq(MerchantChannelStatus::getStatus, MerchantChannelStatus.AUDIT_STATUS_DATA_EDIT)
+                .eq(MerchantChannelStatus::getChannel, 4)
+                .last("limit " + MAX_SIZE);
+
+        List<MerchantChannelStatus> editList = mcsService.list(qWrapper);
+
+        for (MerchantChannelStatus mcs : editList) {
+            try {
+                Thread.sleep(100);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+
+            String changeFlowId = mcs.getExtra().getString("changeFlowId");
+
+            if (StringUtils.isEmpty(changeFlowId)) {
+                continue;
+            }
+
+            JSONObject param = new JSONObject();
+            param.put("changeFlowId", changeFlowId);
+
+            JSONObject result;
+            try {
+                result = ysServiceV2.req(YsConfigV2.MER_EDIT_RESULT, ReqMethod.MERCHANT_EDIT_RESULT, param);
+            } catch (Exception e) {
+                continue;
+            }
+
+            String modifyType = result.getString("modifyType");
+
+            transactionTemplate.execute(new TransactionCallbackWithoutResult() {
+                @Override
+                protected void doInTransactionWithoutResult(TransactionStatus status) {
+                    if ("02".equals(modifyType)) {
+                        if ("02".equals(result.getString("status"))) {
+                            accountService.editSuccess(mcs, Account.CHANNEL_TYPE_D0);
+                        }
+
+                        if ("90".equals(result.getString("status"))) {
+                            accountService.editFail(mcs, UUID.randomUUID().toString().replace("-", ""), result.getString("remark"), Account.CHANNEL_TYPE_D0);
+                        }
+                    }
+                }
+            });
+        }
+        log.info("==========查询银盛-云商服商户变更状态结束==========");
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/job/CheckMerchantAuditStatusJob.java b/pluss-manage-page/src/main/java/cn/pluss/platform/job/CheckMerchantAuditStatusJob.java
new file mode 100644
index 0000000..9f191e3
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/job/CheckMerchantAuditStatusJob.java
@@ -0,0 +1,18 @@
+package cn.pluss.platform.job;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+
+/**
+ * @author yuchen
+ * @deprecated 微信支付宝原生通道，基本不会使用
+ */
+@Deprecated
+@Slf4j
+//@Configuration
+@ConditionalOnProperty(
+  prefix = "scheduling",
+  name = "enabled",
+  havingValue = "true"
+)
+public class CheckMerchantAuditStatusJob {}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/job/CheckMerchantRateExpireJob.java b/pluss-manage-page/src/main/java/cn/pluss/platform/job/CheckMerchantRateExpireJob.java
new file mode 100644
index 0000000..9ea05bf
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/job/CheckMerchantRateExpireJob.java
@@ -0,0 +1,80 @@
+package cn.pluss.platform.job;
+
+import cn.pluss.platform.MerchantRateRecordService;
+import cn.pluss.platform.entity.MerchantRate;
+import cn.pluss.platform.entity.MerchantRateRecord;
+import cn.pluss.platform.mapper.MerchantRateMapper;
+import cn.pluss.platform.userInfo.UserInfoService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.Scheduled;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 检查商户费率是否过期
+ */
+@Configuration
+@ConditionalOnProperty(prefix = "scheduling", name = "enabled", havingValue = "true")
+public class CheckMerchantRateExpireJob {
+
+    private Logger log = LoggerFactory.getLogger(this.getClass());
+
+    @Resource
+    private MerchantRateMapper merchantRateMapper;
+
+    @Resource
+    private UserInfoService userInfoService;
+
+    @Resource
+    private MerchantRateRecordService merchantRateRecordService;
+
+    /**
+     * 检查商户交易费率是否过期 每天执行一次
+     *
+     */
+    @Scheduled(cron = "0 0 18 1/1 * ? ")
+    //@Scheduled(fixedDelay = 24 * 60 * 60 * 1000)
+    public void checkMercRateExpireTask(){
+        log.info("===============>检查商户交易费率是否过期定时任务开始<==================");
+        Date now = new Date();
+        QueryWrapper<MerchantRate> queryWrapper = new QueryWrapper<MerchantRate>().eq("isfixedDelay","0")
+                .apply("date_format (endTime,'%Y-%m-%d') = date_format('" + now + "','%Y-%m-%d')");
+        List<MerchantRate> rateList = merchantRateMapper.selectList(queryWrapper);
+        if(rateList.isEmpty()){
+            log.info("===============>未筛选出符合条件的数据，检查商户交易费率是否过期定时任务结束<==================");
+            return;
+        }
+        log.info("===============>即将过期的商户费率数据条数为：{}<==================",rateList.size());
+        rateList.forEach(r ->{
+
+            MerchantRateRecord rateRecord = new MerchantRateRecord();
+
+            Integer rate = r.getPreviousRate();
+            Integer pRate = r.getRate();
+            r.setRate(rate);
+            r.setPreviousRate(pRate);
+            r.setUpdateTime(new Date());
+            r.setEndTime(null);
+            r.setStartTime(null);
+            r.setIsFixedRate("1");
+            merchantRateMapper.updateById(r);
+            userInfoService.changeRate(r.getUserId(),rate);
+
+            //添加费率修改记录
+            rateRecord.setUserId(r.getUserId());
+            rateRecord.setRate(rate);
+            rateRecord.setCreateTime(new Date());
+            merchantRateRecordService.save(rateRecord);
+
+
+            log.info("===============>商户userId为：{},更新费率为:{}成功!<==================",r.getUserId(),rate);
+        });
+        log.info("===============>检查商户交易费率是否过期定时任务结束<==================");
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/job/CheckMerchantRefundOrderStatusJob.java b/pluss-manage-page/src/main/java/cn/pluss/platform/job/CheckMerchantRefundOrderStatusJob.java
new file mode 100644
index 0000000..4b884d7
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/job/CheckMerchantRefundOrderStatusJob.java
@@ -0,0 +1,98 @@
+package cn.pluss.platform.job;
+
+import cn.pluss.platform.api.ResultCode;
+import cn.pluss.platform.entity.MerchantRefundOrder;
+import cn.pluss.platform.pay.PayService;
+import cn.pluss.platform.refundOrder.MerchantRefundOrderService;
+import cn.pluss.platform.sxf.pay.SxfPayService;
+import cn.pluss.platform.util.DateUtils;
+import cn.pluss.platform.util.StringUtil;
+import cn.pluss.platform.util.SxfConfg;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.Scheduled;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 检查退管订单状态定时任务
+ *
+ * @Author admin
+ *
+ */
+@Slf4j
+@Configuration
+@ConditionalOnProperty(prefix = "scheduling", name = "enabled", havingValue = "true")
+public class CheckMerchantRefundOrderStatusJob {
+
+    @Autowired
+    private MerchantRefundOrderService merchantRefundOrderService;
+
+    @Autowired
+    private SxfPayService sxfPayService;
+
+    @Setter(onMethod_ = {@Autowired, @Qualifier("ysPayService")})
+    private PayService ysPayService;
+
+    /**
+     * 检查退款订单的状态TASK
+     * 每30分钟执行一次
+     */
+    @Scheduled(fixedDelay = 30 * 60 * 1000)
+    public void checkMercRefundOrderStatusTask(){
+        log.info("===============>检查退款订单状态定时任务开始<==================");
+        Date startDate = DateUtils.getDayBegin();
+        Date endDate =  DateUtils.getDayEnd();
+        QueryWrapper<MerchantRefundOrder> queryWrapper = new QueryWrapper<MerchantRefundOrder>()
+                .eq("status","2").between("createTime",startDate,endDate);
+        List<MerchantRefundOrder> refundOrderList = merchantRefundOrderService.list(queryWrapper);
+        if(refundOrderList.isEmpty()){
+            log.info("===============>当前退款中的订单数据为空，定时任务结束!<==================");
+            return;
+        }
+        log.info("===============>待更新退款订单的数据条数为:{}<==================",refundOrderList.size());
+        refundOrderList.forEach(refundOrder ->{
+            if(refundOrder.getOrderNumber().contains("SXF")){
+                JSONObject qData = sxfPayService.refundQuery(refundOrder);
+                log.info("===========>退款订单上送，返回参数:{}<===============",qData.toJSONString());
+                if("1".equals(qData.get("code").toString())){
+                    Map<String,String> respData = (Map<String,String>)qData.get("data");
+                    String tranSts = respData.get("tranSts");
+                    refundOrder.setFailMsg(respData.get("bizMsg"));
+                    //退款成功
+                    if(SxfConfg.SXF_REFUND_SUCCESS_STATUS_CODE.equalsIgnoreCase(tranSts)){
+                        refundOrder.setStatus("1");
+                        Date payTime = DateUtils.parse(respData.get("payTime"));
+                        refundOrder.setRefundTime(payTime);
+                    }else if(SxfConfg.SXF_REFUND_FAIL_STATUS_CODE.equalsIgnoreCase(tranSts)){
+                        refundOrder.setStatus("3");
+                    }else if(SxfConfg.SXF_REFUND_ING_STATUS_CODE.equalsIgnoreCase(tranSts)){
+                        return;
+                    }
+                    merchantRefundOrderService.updateById(refundOrder);
+                }
+            }else if(refundOrder.getOrderNumber().contains("YS")){
+                JSONObject object = ysPayService.refundQuery(refundOrder);
+                if(ResultCode.SUCCESS.code() == object.getIntValue("code")){
+                    refundOrder.setStatus(object.getString("status"));
+                    if(StringUtil.isNotEmpty(object.getString("refundTime"))){
+                        Date refundTime = DateUtils.parse(object.getString("refundTime"), "yyyyMMddHHmmss");
+                        refundOrder.setRefundTime(refundTime);
+                    }
+                    merchantRefundOrderService.updateById(refundOrder);
+                }else{
+                    log.info("===============>定时任务查询退款订单状态,订单号为:{}的退款订单,查询异常,异常信息:{}<============",refundOrder.getRefundNo(),object.getString("msg"));
+                }
+            }
+        });
+        log.info("===============>退款检查退款订单状态定时任务执行结束<==================");
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/job/CheckSuperMerchantTradeJob.java b/pluss-manage-page/src/main/java/cn/pluss/platform/job/CheckSuperMerchantTradeJob.java
new file mode 100644
index 0000000..57d3a5a
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/job/CheckSuperMerchantTradeJob.java
@@ -0,0 +1,109 @@
+package cn.pluss.platform.job;
+
+
+import cn.pluss.platform.entity.MerchantRate;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.mapper.MerchantRateMapper;
+import cn.pluss.platform.merchantOrder.MerchantOrderService;
+import cn.pluss.platform.userApp.UserAppService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.Scheduled;
+
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+
+/**
+ * 超级服务商交易量检查
+ */
+@Deprecated
+//@Configuration
+@ConditionalOnProperty(prefix = "scheduling", name = "enabled", havingValue = "true")
+public class CheckSuperMerchantTradeJob {
+
+
+    private Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Autowired
+    private UserAppService userAppService;
+    @Autowired
+    private MerchantOrderService merchantOrderService;
+    @Autowired
+    private MerchantRateMapper merchantRateMapper;
+
+    /**
+     * 超级代理商每个月月末交易量检查
+     * 费率阶梯：不足200w 费率0.25%
+     *         超过200w小于400w 费率0.24%
+     *         超过400w小于700w 费率0.23%
+     *         超过700w小于1000w 费率0.22%
+     *         超过1000w 费率0.21%
+     */
+    @Scheduled(cron = "0 55 23 28,29,30,31 * ? ")
+    public void checkSuperMercTradeTask(){
+        logger.info("=================>检查超级代理商当月交易量情况定时任务开始，并更新超级代理商费率<====================");
+        Calendar c = Calendar.getInstance();
+        if (c.get(Calendar.DATE) == c.getActualMaximum(Calendar.DATE)) {
+            QueryWrapper<UserApp> queryWrapper = new QueryWrapper<UserApp>().eq("userType","agent");
+            //过滤固定的超级服务商费率的费率
+            queryWrapper.and(wrapper ->wrapper.eq("isfixedDelay","0").or().isNull("isfixedDelay"));
+            List<UserApp> userAppList = userAppService.list(queryWrapper);
+            logger.info("=================>等待执行的超级代理商数量为：{}<====================",userAppList.size());
+            if(userAppList.isEmpty()){
+                logger.info("=================>待更新的超级代理商为空，定时任务结束<====================");
+                return;
+            }
+            List<Long> userIdList = new ArrayList<Long>();
+            userAppList.forEach(userApp -> {
+                userIdList.add(userApp.getUserId());
+            });
+            Map<String,Object> params = new HashMap<String,Object>();
+            params.put("list",userIdList);
+
+            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+            Calendar date = Calendar.getInstance();
+            date.add(Calendar.MONTH, 0);
+            date.set(Calendar.DAY_OF_MONTH,1);//设置为1号,当前日期既为本月第一天
+            String first = format.format(date.getTime());
+            //获取当前月最后一天
+            Calendar ca = Calendar.getInstance();
+            ca.set(Calendar.DAY_OF_MONTH, ca.getActualMaximum(Calendar.DAY_OF_MONTH));
+            String last = format.format(ca.getTime());
+
+            params.put("firstDate",first + " 00:00:00");
+            params.put("lastDate",last + " 23:59:59");
+            if(userIdList != null && userIdList.size() > 0){
+                List<Map<String,Object>> list = merchantOrderService.getSuperMerchantToDayTradeMoneyCount(params);
+                List<MerchantRate> updateRateList = new ArrayList<MerchantRate>(list.size());
+                if(list != null && list.size() > 0){
+                    for (int i=0;i<list.size();i++){
+                        MerchantRate rate = new MerchantRate();
+                        Map<String, Object> r = list.get(i);
+                        Double tradeMoney = (Double) r.get("tradeCountMoney");
+                        if(tradeMoney < 2000000d){
+                            rate.setRate(25);
+                        }else if(tradeMoney >= 2000000d && tradeMoney < 4000000){
+                            rate.setRate(24);
+                        }else if(tradeMoney >= 4000000d && tradeMoney < 7000000d){
+                            rate.setRate(23);
+                        }else if(tradeMoney >= 7000000d && tradeMoney < 10000000d){
+                            rate.setRate(22);
+                        }else{
+                            rate.setRate(21);
+                        }
+                        rate.setUserId(r.get("agentId").toString());
+                        rate.setUpdateTime(new Date());
+                        updateRateList.add(rate);
+                    }
+                    merchantRateMapper.batchUpdateRate(updateRateList);
+                }
+            }
+        }
+        logger.info("=================>超级代理商费率更新定时任务结束<====================");
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/job/CheckTransOrderStatusJob.java b/pluss-manage-page/src/main/java/cn/pluss/platform/job/CheckTransOrderStatusJob.java
new file mode 100644
index 0000000..ef3dc0f
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/job/CheckTransOrderStatusJob.java
@@ -0,0 +1,166 @@
+package cn.pluss.platform.job;
+
+import cn.pluss.platform.entity.MerchantChannelStatus;
+import cn.pluss.platform.entity.MerchantOrder;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.merchantOrder.MerchantOrderService;
+import cn.pluss.platform.pay.PayService;
+import cn.pluss.platform.ryx.pay.RyxPayService;
+import cn.pluss.platform.sxf.pay.SxfPayService;
+import cn.pluss.platform.util.DateUtils;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.scheduling.annotation.Scheduled;
+
+import javax.annotation.Resource;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+import java.util.function.Function;
+
+/**
+ * 定时任务检查待确认状态的订单数据
+ * @author admin
+ * 
+ * @Description
+ */
+@Slf4j
+// @Configuration
+@ConditionalOnProperty(prefix = "scheduling", name = "enabled", havingValue = "true")
+public class CheckTransOrderStatusJob {
+
+
+    @Resource
+    private MerchantOrderService merchantOrderService;
+    @Resource
+    private MerchantChannelStatusService merchantChannelStatusService;
+    @Resource
+    private RyxPayService ryxPayService;
+    @Resource
+    private SxfPayService sxfPayService;
+    @Setter(onMethod_ = {@Autowired, @Qualifier("ysPayOldService")})
+    private PayService ysPayOldService;
+
+    /**
+     * 检查待确认订单状态定时任务 5秒执行一次
+     */
+    @Scheduled(fixedDelay = 5  * 1000)
+    public void checkOrderStatus() {
+        log.info("================>检查待确认订单状态定时任务开始<=====================");
+        Date now = new Date();
+        Date endTime = DateUtils.add(Calendar.SECOND, now, -10);
+        Date startTime = DateUtils.add(Calendar.MINUTE, endTime, -2);
+        QueryWrapper<MerchantOrder> orderWrapper = new QueryWrapper<MerchantOrder>()
+                .in("status","5","7").between("createDt",startTime,endTime)
+                .select("id");
+        List<Long> orderIdList = merchantOrderService.listObjs(orderWrapper, new Function<Object, Long>() {
+            @Override
+            public Long apply(Object o) {
+                if (o instanceof Integer) {
+                    return ((Integer) o).longValue();
+                }
+
+                if (o instanceof Long) {
+                    return ((Long) o);
+                }
+
+                if (o instanceof String) {
+                    return Long.parseLong((String) o);
+                }
+
+                return null;
+            }
+        });
+
+        QueryWrapper<MerchantOrder> qWrapper2 = new QueryWrapper<MerchantOrder>().in("id", orderIdList);
+        List<MerchantOrder> orderList = merchantOrderService.list(qWrapper2);
+
+        if (orderList.isEmpty()) {
+            log.info("=================>没有需要处理的待确认订单状态的数据，定时任务结束<=================");
+            return;
+        }
+        for (MerchantOrder order:orderList) {
+            MerchantChannelStatus channel = null;
+            if (order.getOrderNumber().startsWith("SXF")) {
+                channel = merchantChannelStatusService.getByMerchantCode(order.getMerchantCode(), 1);
+            }
+
+            if (order.getOrderNumber().startsWith("RYX")) {
+                channel = merchantChannelStatusService.getByMerchantCode(order.getMerchantCode(), 3);
+            }
+
+            if (order.getOrderNumber().startsWith("YS")) {
+                channel = merchantChannelStatusService.getByMerchantCode(order.getMerchantCode(), 4);
+            }
+
+            if(channel == null){
+                log.info("=============>检查待确认订单状态定时任务商户编号为:{}，的进件数据为空，跳过当前订单状态确认<================",order.getMerchantCode());
+                continue;
+            }
+            log.info("======>【订单查询接口】当前查询订单号：{},订单状态:{}<=======",order.getOrderNumber(),order.getStatus());
+            //随行付
+            JSONObject result = null;
+            if(channel.getChannel() == 1){
+                result = sxfPayService.tradeQuery(order, channel.getMerchantId());
+                //乐刷
+            }else if(channel.getChannel() == 2){
+                continue;
+            //瑞银信
+            }else if(channel.getChannel() == 3){
+                result = ryxPayService.tradeQuery(order, channel.getMerchantId());
+            //银盛
+            }else if(channel.getChannel() == 4){
+                result = ysPayOldService.tradeQuery(order, channel.getMerchantId());
+            }else{
+                continue;
+            }
+            if(result != null){
+                merchantOrderService.updateOrderStatus(result,order);
+            }
+        }
+        log.info("=====检查待确认订单状态定时任务结束=====");
+    }
+
+    /**
+     * 修改待确认订单状态
+     * @param order
+     * @param result
+     */
+//    private void updateOrderStatus(MerchantOrder order, JSONObject result) {
+//        log.info("===============>待确认订单查询接口返回支付结果参数:{}<===============",result);
+//        MerchantOrder update = new MerchantOrder();
+//        int code = result.getIntValue("code");
+//        if(ResultCode.SUCCESS.code() == code){
+//            update.setId(order.getId());
+//            String payStatus = (String)result.get("payStatus");
+//            if("1".equals(payStatus)){
+//                String channelOrderNo = result.getString("channelOrderNo");
+//                String transNo = result.getString("transNo");
+//                String fee = result.getString("fee");
+//                update.setStatus("1");
+//                update.setTransNo(transNo);
+//                update.setTransDt(result.getDate("payTime"));
+//                update.setThirdTransNo(channelOrderNo);
+//                if(StringUtil.isNotEmpty(fee) && order.getOrderNumber().startsWith("YS")){
+//                    BigDecimal tradeAmt = new BigDecimal(order.getConsumeFee().toString());
+//                    BigDecimal cashRate = new BigDecimal("0.001");
+//                    BigDecimal minFee = new BigDecimal("0.1");
+//                    BigDecimal cashFee = tradeAmt.multiply(cashRate).compareTo(minFee) > 0 ? tradeAmt.multiply(cashRate) : minFee;
+//                    update.setEnterFee(tradeAmt.subtract(new BigDecimal(fee)).subtract(cashFee).setScale(2,BigDecimal.ROUND_DOWN).doubleValue());
+//                }
+//                merchantOrderService.updateById(update);
+//                //创建分润
+//                merchantProfitService.createOrderProfit(order);
+//                log.info("==================>待确认的订单号为：{}的订单，订单状态更新成功<========================",order.getOrderNumber());
+//            }else if("0".equals(payStatus) || "6".equals(payStatus)){
+//                update.setStatus(payStatus);
+//                merchantOrderService.saveOrUpdate(update);
+//            }
+//        }
+//    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/job/CheckUserAssessStatus.java b/pluss-manage-page/src/main/java/cn/pluss/platform/job/CheckUserAssessStatus.java
new file mode 100644
index 0000000..3cf710a
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/job/CheckUserAssessStatus.java
@@ -0,0 +1,111 @@
+package cn.pluss.platform.job;
+
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantOrder.MerchantOrderService;
+import cn.pluss.platform.user.UserRoleService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.userAssess.UserAssessService;
+import cn.pluss.platform.util.DateUtils;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.Scheduled;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * TODO
+ * 校验用户的考核状态
+ * @author crystal
+ * @date 2022/7/11 10:13
+ */
+@Slf4j
+// @Configuration
+//@ConditionalOnProperty(prefix = "scheduling", name = "enabled", havingValue = "true")
+public class CheckUserAssessStatus {
+
+    @Resource
+    private UserAssessService userAssessService;
+
+    @Resource
+    private UserRoleService userRoleService;
+
+    @Resource
+    private UserAppService userAppService;
+
+    @Resource
+    private MerchantBaseInfoService merchantBaseInfoService;
+
+    @Resource
+    private MerchantOrderService merchantOrderService;
+
+    private static int DEFAULT_SIZE = 200;
+
+    private static int DEFAULT_CURRENT = 1;
+
+    /**
+     * 每天凌晨12点执行
+     * @date: 2022/1/14 14:14
+     */
+    @Scheduled(cron = "0 0 0 * * ?")
+    public void checkBstUserAssessStatusJob(){
+        log.info("检查倍斯特用户考核状态开始");
+        LambdaQueryWrapper<UserRole> lambdaQuery = Wrappers.lambdaQuery();
+        lambdaQuery.eq(UserRole::getValidFlag,UserRole.DEFAULT_VALID_OPEN);
+        List<UserRole> list = userRoleService.list(lambdaQuery);
+        if(list.isEmpty()){
+            return;
+        }
+        Date now = DateUtils.currentDate();
+        for (UserRole u:list) {
+            startCheck(now,u,DEFAULT_CURRENT,DEFAULT_SIZE);
+        }
+        log.info("检查倍斯特用户考核状态结束");
+    }
+
+    public void startCheck(Date now,UserRole r,int current,int size) {
+        Page<UserAssess> page = new Page<>(current,size);
+        QueryWrapper<UserAssess> queryWrapper = new QueryWrapper<UserAssess>()
+                .eq("roleCode",r.getRoleCode());
+        page = userAssessService.page(page, queryWrapper);
+        List<UserAssess> records = page.getRecords();
+        for (UserAssess assess:records) {
+            List<String> list = merchantBaseInfoService.queryNextMercCodeByUserId(assess.getUserId());
+            assess.setDirectMercNum(list.size());
+//            BigInteger validMercNum = BigInteger.ZERO;
+//            for (String merchantCode:list) {
+//                MerchantBaseInfo merchant = merchantBaseInfoService.getMerchantBaseInfoByMerchantCode(merchantCode);
+//                if(merchant != null){
+//                    if(merchant.getValidFlag()  == 1){
+//                        validMercNum = validMercNum.add(BigInteger.ONE);
+//                    }
+////                    else{
+////                        Map<String, Double> tradeAmtMap = merchantOrderService.getCountTradeAmt(merchantCode, DateUtils.toString(now, "yyyy-MM-dd"),null,null);
+////                        BigDecimal tradeAmt = BigDecimal.valueOf(tradeAmtMap.get("tradeAmtCount"));
+////                        boolean amtFlag = tradeAmt.compareTo(r.getValidTransAmt()) >= 0;
+////                        int num = merchantOrderService.getValidNumByMerchantCode(merchantCode);
+////                        boolean numFlag = num >= r.getMinNum();
+////                        if(amtFlag && numFlag){
+////                            validMercNum = validMercNum.add(BigInteger.ONE);
+////                            MerchantBaseInfo update = new MerchantBaseInfo();
+////                            update.setId(merchant.getId());
+////                            update.setValidFlag(1);
+////                            merchantBaseInfoService.updateById(update);
+////                        }
+////                    }
+//                }
+//            }
+            //计算用户达标数量
+        }
+        
+        if(page.getSize() < size){
+            this.startCheck(now,r,current++,size);
+        }
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/job/CheckUserCertStatusJob.java b/pluss-manage-page/src/main/java/cn/pluss/platform/job/CheckUserCertStatusJob.java
new file mode 100644
index 0000000..ed9f7cf
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/job/CheckUserCertStatusJob.java
@@ -0,0 +1,43 @@
+package cn.pluss.platform.job;
+
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.mapper.UserAppMapper;
+import cn.pluss.platform.userApp.UserAppService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.Scheduled;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 定时检查用户实名认证状态
+ * @author admin
+ *
+ * @Description
+ */
+@Slf4j
+@Configuration
+@ConditionalOnProperty(prefix = "scheduling", name = "enabled", havingValue = "true")
+public class CheckUserCertStatusJob {
+
+    @Autowired
+    private UserAppService uaService;
+
+    @Resource
+    private UserAppMapper userAppMapper;
+
+    /**
+     * 查询出1小时内没有完成实名认证的用户，并驳回
+     */
+    @Scheduled(fixedDelay = 5  * 1000)
+    public void refuseUserCert() {
+
+        List<UserApp> uaList = userAppMapper.selectUserInCert();
+        for (UserApp ua : uaList) {
+            uaService.userCert(ua.getUserId() + "", 2, "实名认证超时，已自动驳回");
+        }
+    }
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/job/CheckWxCertStatusJob.java b/pluss-manage-page/src/main/java/cn/pluss/platform/job/CheckWxCertStatusJob.java
new file mode 100644
index 0000000..97edcc9
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/job/CheckWxCertStatusJob.java
@@ -0,0 +1,292 @@
+package cn.pluss.platform.job;
+
+import cn.pluss.platform.SubMerchantApplyOrderService;
+import cn.pluss.platform.channel.MerchantCertService;
+import cn.pluss.platform.entity.MerchantChannelStatus;
+import cn.pluss.platform.entity.MerchantPlugin;
+import cn.pluss.platform.entity.SubMerchantApplyOrder;
+import cn.pluss.platform.exception.BackDataErrorException;
+import cn.pluss.platform.mapper.MerchantChannelStatusMapper;
+import cn.pluss.platform.mapper.MerchantPluginMapper;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.service.UnknownExceptionService;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.Scheduled;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * 定时任务放到后台管理进程，减轻app后台服务的压力
+ * 微信认证工单状态等信息查询
+ *
+ * @author DJH
+ */
+@Slf4j
+@Configuration
+@ConditionalOnProperty(prefix = "scheduling", name = "enabled", havingValue = "true")
+public class CheckWxCertStatusJob {
+
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantCertService sxfCertService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantCertService ryxCertService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantCertService ysCertService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantCertService ysCertV2Service;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantChannelStatusMapper merchantChannelStatusMapper;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantPluginMapper merchantPluginMapper;
+
+    @Setter(onMethod_ = {@Autowired})
+    private SubMerchantApplyOrderService subMerchantApplyOrderService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private UnknownExceptionService unknownExceptionService;
+
+    @Autowired
+    private MerchantChannelStatusService mcsService;
+
+    /**
+     * 3分钟跑一次定时任务
+     */
+    @Scheduled(fixedDelay = 3 * 60 * 1000)
+    public void checkWxCert() {
+        checkSxfCertStatus();
+//
+        checkRyxCertStatus();
+
+        checkRyxPluginCertStatus();
+//
+        checkYsCertStatus();
+
+        checkNoCertMerchant();
+
+    }
+
+    /**
+     * 3分钟跑一次定时任务
+     */
+    @Scheduled(fixedDelay = 3 * 60 * 1000)
+    public void checkWxAuthStatusRecent() {
+        log.info("=====查询最近一百条商户微信授权状态开始=====");
+        MerchantChannelStatus mcs = new MerchantChannelStatus();
+        mcs.setAuthorizationStatus(MerchantChannelStatus.AUTHORIZATION_STATUS_UNAUTHORIZED);
+        mcs.setStatus(MerchantChannelStatus.AUDIT_STATUS_SUCCESS);
+
+        QueryWrapper<MerchantChannelStatus> qWrapper = new QueryWrapper<>(mcs).orderByDesc("createTime");
+        qWrapper.isNotNull("applicationId").last("limit 100");
+        List<MerchantChannelStatus> mcsList = merchantChannelStatusMapper.selectList(qWrapper);
+
+        for (MerchantChannelStatus item: mcsList) {
+            try {
+                mcsService.verifyWxAuthStatus(item);
+            } catch (Exception ignored) {}
+
+        }
+
+        log.info("=====查询最近一百条商户微信授权状态结束=====");
+    }
+
+    /**
+     * 3分钟跑一次定时任务
+     */
+    @Scheduled(fixedDelay = 3 * 60 * 1000)
+    public void checkWxAuthStatus() {
+        log.info("=====查询商户微信授权状态开始=====");
+        MerchantChannelStatus mcs = new MerchantChannelStatus();
+        mcs.setAuthorizationStatus(MerchantChannelStatus.AUTHORIZATION_STATUS_UNAUTHORIZED);
+        mcs.setStatus(MerchantChannelStatus.AUDIT_STATUS_SUCCESS);
+
+        QueryWrapper<MerchantChannelStatus> qWrapper = new QueryWrapper<>(mcs).orderByDesc("createTime");
+        qWrapper.isNotNull("applicationId");
+        List<MerchantChannelStatus> mcsList = merchantChannelStatusMapper.selectList(qWrapper);
+
+        for (MerchantChannelStatus item: mcsList) {
+            try {
+                mcsService.verifyWxAuthStatus(item);
+            } catch (Exception ignored) {}
+
+        }
+
+        log.info("=====查询商户微信授权状态结束=====");
+    }
+
+    private void checkSxfCertStatus() {
+        log.info("=====查询随行付商户微信认证状态结果开始=====");
+        // step 1、查询状态为待处理的工单
+        SubMerchantApplyOrder condition = new SubMerchantApplyOrder()
+                .setStatus("0")
+                .setChannelId(1)
+                .setSubMchType("WX");
+        List<SubMerchantApplyOrder> orderList = subMerchantApplyOrderService.list(
+                new QueryWrapper<>(condition).isNotNull("applyNo")
+                        .ne("applyNo", ""));
+        if (orderList == null || orderList.isEmpty()) {
+            log.info("=====没有需要处理的微信工单=====");
+            log.info("=====查询随行付商户微信认证状态结果结束=====");
+            return;
+        }
+
+        List<String> merchantCodeList = new ArrayList<>();
+        for (SubMerchantApplyOrder subMerchantApplyOrder : orderList) {
+            merchantCodeList.add(subMerchantApplyOrder.getMerchantCode());
+        }
+
+        // 查询对应商户进件信息列表
+        QueryWrapper<MerchantChannelStatus> queryWrapper = new QueryWrapper<MerchantChannelStatus>().eq("channel", 1);
+        queryWrapper.in("merchantCode", merchantCodeList);
+        List<MerchantChannelStatus> merchantChannelStatusList = merchantChannelStatusMapper.selectList(queryWrapper);
+
+        // step 2、查询对应工单的结果
+        for (SubMerchantApplyOrder subMerchantApplyOrder : orderList) {
+            String wxApplyNo = subMerchantApplyOrder.getApplyNo();
+            String merchantCode = subMerchantApplyOrder.getMerchantCode();
+
+            Iterator<MerchantChannelStatus> iterator = merchantChannelStatusList.iterator();
+            MerchantChannelStatus merchantChannelStatus = null;
+            // 获取对应商户进件信息
+            while (iterator.hasNext()) {
+                MerchantChannelStatus next = iterator.next();
+                if (next.getMerchantCode().equals(merchantCode)) {
+                    merchantChannelStatus = next;
+                    iterator.remove();
+                    break;
+                }
+            }
+
+            if (merchantChannelStatus == null) {
+                BackDataErrorException dataErrorException = new BackDataErrorException("商户实名工单无对应的微信进件信息");
+                unknownExceptionService.save(dataErrorException);
+                continue;
+            }
+
+            sxfCertService.wxCertResult(merchantChannelStatus.getMerchantId(), wxApplyNo);
+        }
+
+        log.info("=====查询随行付商户微信认证状态结果结束=====");
+    }
+
+    private void checkRyxCertStatus() {
+        log.info("=====查询瑞银信商户微信认证状态结果开始=====");
+        List<MerchantChannelStatus> noCertMerchantList = merchantChannelStatusMapper.getRyxNoCertMerchant();
+
+        for (MerchantChannelStatus noCertMerchant : noCertMerchantList) {
+            try {
+                ryxCertService.wxCertResult(noCertMerchant.getMerchantId(), null);
+            } catch (Exception e) {
+                log.error("=====商户【" + noCertMerchant.getMerchantCode() + "】获取微信认证信息错误=====");
+                e.printStackTrace();
+            }
+        }
+
+        log.info("=====查询瑞银信商户微信认证状态结果结束=====");
+    }
+
+    private void checkRyxPluginCertStatus() {
+        log.info("=====查询瑞银信-商服宝商户微信认证状态结果开始=====");
+        List<MerchantPlugin> noCertPluginList = merchantPluginMapper.getRyxNoCertMerchant();
+
+        for (MerchantPlugin noCertMerchant : noCertPluginList) {
+            try {
+                ryxCertService.wxCertResult(noCertMerchant.getPluginId(), null);
+            } catch (Exception e) {
+                log.error("=====商户【" + noCertMerchant.getUserId() + "】获取微信认证信息错误=====");
+                e.printStackTrace();
+            }
+        }
+
+        log.info("=====查询瑞银信-商服宝商户微信认证状态结果结束=====");
+    }
+
+    private void checkYsCertStatus() {
+        log.info("=====查询银盛商户微信认证状态结果开始=====");
+        // step 1、查询状态为待处理的工单
+        SubMerchantApplyOrder condition = new SubMerchantApplyOrder().setStatus("0").setChannelId(4).setSubMchType("WX");
+        List<SubMerchantApplyOrder> orderList = subMerchantApplyOrderService.list(
+                new QueryWrapper<>(condition).isNotNull("applyNo")
+                        .ne("applyNo", ""));
+        if (orderList == null || orderList.isEmpty()) {
+            log.info("=====没有需要处理的微信工单=====");
+            log.info("=====查询银盛商户微信认证状态结果结束=====");
+            return;
+        }
+
+        // step 2、查询对应工单的结果
+        for (SubMerchantApplyOrder subMerchantApplyOrder : orderList) {
+            String wxApplyNo = subMerchantApplyOrder.getApplyNo();
+
+            try {
+                ysCertService.wxCertResult(null, wxApplyNo);
+            } catch (Exception e) {
+                log.error("=====银盛通道微信工单【" + wxApplyNo + "】获取微信认证信息错误=====");
+            }
+        }
+
+        // step 2、查询微信认证状态为未认证的商户信息
+        LambdaQueryWrapper<MerchantChannelStatus> qWrapper = Wrappers.lambdaQuery();
+        qWrapper.eq(MerchantChannelStatus::getChannel, 4)
+                .eq(MerchantChannelStatus::getStatus, MerchantChannelStatus.AUDIT_STATUS_SUCCESS)
+                .eq(MerchantChannelStatus::getAuthorizationStatus, MerchantChannelStatus.AUTHORIZATION_STATUS_UNAUTHORIZED);
+
+        List<MerchantChannelStatus> mcsList = merchantChannelStatusMapper.selectList(qWrapper);
+        for (MerchantChannelStatus mcs : mcsList) {
+            if (StringUtils.isNotEmpty(mcs.getApplicationId())) {
+                ysCertV2Service.wxCertAuthStatus(mcs.getMerchantId());
+            }
+        }
+
+        log.info("=====查询银盛商户微信认证状态结果结束=====");
+    }
+
+    /**
+     * 检查没有微信认证记录的商户
+     */
+    private void checkNoCertMerchant() {
+        log.info("=====查询未进行过实名认证的商户开始=====");
+        for (int i = 0; i < 6; i++) {
+            List<SubMerchantApplyOrder> applyOrderList = subMerchantApplyOrderService.listNoCertData();
+            if (applyOrderList == null || applyOrderList.isEmpty()) {
+                break;
+            }
+
+            for (SubMerchantApplyOrder applyOrder : applyOrderList) {
+                try {
+                    if (Objects.equals(applyOrder.getChannelId(), 1)) {
+                        sxfCertService.wxCert(applyOrder.getMerchantId(), applyOrder.getMerchantCode());
+                    }
+
+                    if (Objects.equals(applyOrder.getChannelId(), 4)) {
+                        if (StringUtils.isBlank(applyOrder.getApplyNo())) {
+                            ysCertService.wxCert(applyOrder.getMerchantId(), applyOrder.getMerchantCode());
+                        } else {
+                            ysCertV2Service.wxCert(applyOrder.getMerchantId(), applyOrder.getMerchantCode());
+                        }
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    log.error("发起微信实名认证错误, {}", e.getMessage());
+                }
+            }
+        }
+        log.info("=====查询未进行过实名认证的商户结束=====");
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/job/DeviceShopOrderAutoReceiptJob.java b/pluss-manage-page/src/main/java/cn/pluss/platform/job/DeviceShopOrderAutoReceiptJob.java
new file mode 100644
index 0000000..482e5e9
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/job/DeviceShopOrderAutoReceiptJob.java
@@ -0,0 +1,62 @@
+package cn.pluss.platform.job;
+
+import cn.pluss.platform.device.MercOrderDetailService;
+import cn.pluss.platform.device.MercOrderExpressService;
+import cn.pluss.platform.entity.MercOrderDetail;
+import cn.pluss.platform.entity.MercOrderExpress;
+import cn.pluss.platform.entity.MerchantChannelStatus;
+import cn.pluss.platform.util.DateUtils;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.Scheduled;
+
+import javax.annotation.Resource;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * TODO
+ * 设备商城订单自动确认收货定时任务
+ * @author crystal
+ * @date 2022/4/27 16:57
+ */
+@Slf4j
+@Configuration
+@ConditionalOnProperty(prefix = "scheduling", name = "enabled", havingValue = "true")
+public class DeviceShopOrderAutoReceiptJob {
+
+    @Resource
+    private MercOrderDetailService mercOrderDetailService;
+
+    @Resource
+    private MercOrderExpressService mercOrderExpressService;
+    /**
+     * 设备订单物流自动确认收货状态
+     * 有物流信息后 15天自动确认收货
+     * 每天执行一次
+     */
+    @Scheduled(fixedDelay = 60 * 60 * 1000 * 24)
+    public void checkDeviceOrderStatusTask() {
+        log.info("~设备订单物流自动确认收货状态定时任务开始~");
+        String date = DateUtils.toString(DateUtils.add(Calendar.DAY_OF_MONTH,DateUtils.currentDate(),-15),"yyyy-MM-dd");
+        QueryWrapper<MercOrderDetail> queryWrapper = new QueryWrapper<MercOrderDetail>()
+                .eq("status",MercOrderDetail.STATUS_UN_RECEIVED)
+                .isNotNull("logistNo").isNotNull("expressNo").last(" and DATE_FORMAT(createTime,'%Y-%m-%d') = '"+date+"'");
+        List<MercOrderDetail> list = mercOrderDetailService.list(queryWrapper);
+        if(!list.isEmpty()){
+            for (MercOrderDetail d:list) {
+                MercOrderExpress express = mercOrderExpressService.getByLogistNo(d.getLogistNo());
+                //没有物流信息
+                if(express == null){
+                    continue;
+                }
+                d.setStatus(MercOrderDetail.STATUS_COMPLETE);
+                mercOrderDetailService.updateById(d);
+            }
+        }
+        log.info("~设备订单物流自动确认收货状态定时任务结束~");
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/job/ExamineActityIsExistJob.java b/pluss-manage-page/src/main/java/cn/pluss/platform/job/ExamineActityIsExistJob.java
new file mode 100644
index 0000000..c82fb73
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/job/ExamineActityIsExistJob.java
@@ -0,0 +1,60 @@
+package cn.pluss.platform.job;
+
+import cn.pluss.platform.activityActivate.ActivityActivateService;
+import cn.pluss.platform.activityConsumReturn.ActivityConsumReturnService;
+import cn.pluss.platform.activityRecharge.ActivityRechargeService;
+import cn.pluss.platform.activityRecommend.ActivityRecommendService;
+import cn.pluss.platform.entity.ActivityConsumReturn;
+import cn.pluss.platform.entity.ActivityRecharge;
+import cn.pluss.platform.util.DateUtils;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.Scheduled;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author yuchen
+ *
+ * @Description 检查活动是否到期 到期删除
+ */
+@Configuration
+@ConditionalOnProperty(prefix = "scheduling", name = "enabled", havingValue = "true")
+public class ExamineActityIsExistJob {
+	
+	@Autowired
+	private ActivityConsumReturnService activityConsumReturnService;
+	
+	@Autowired
+	private ActivityRechargeService activityRechargeService;
+
+	/**
+	 *	每天凌晨12点执行一次 判断活动是否过期 过期活动删除
+	 */
+	@Scheduled(cron = "05 00 0 * * ?")
+	private void configureTasks() {
+		Integer timeType = 1;
+		String nowDate = DateUtils.currentYourDate();
+		String lastSql = " and (date_format(endDt,'%Y-%m-%d')) < '" + nowDate + "'";
+		QueryWrapper<ActivityConsumReturn> returnWrapper = new QueryWrapper<ActivityConsumReturn>()
+				.eq("timeType", timeType).last(lastSql);
+		List<ActivityConsumReturn> returnList = activityConsumReturnService.list(returnWrapper);
+		if (!returnList.isEmpty()) {
+			for (ActivityConsumReturn r : returnList) {
+				activityConsumReturnService.removeById(r.getId());
+			}
+		}
+		QueryWrapper<ActivityRecharge> rechargeWrapper = new QueryWrapper<ActivityRecharge>()
+				.eq("timeType", timeType).last(lastSql);
+		List<ActivityRecharge> rechargeList = activityRechargeService.list(rechargeWrapper);
+		if (!rechargeList.isEmpty()) {
+			for (ActivityRecharge r : rechargeList) {
+				activityRechargeService.removeById(r.getId());
+			}
+		}
+	}
+}
+
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/job/MerchBillJob.java b/pluss-manage-page/src/main/java/cn/pluss/platform/job/MerchBillJob.java
new file mode 100644
index 0000000..22b2475
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/job/MerchBillJob.java
@@ -0,0 +1,85 @@
+package cn.pluss.platform.job;
+
+import cn.hutool.core.date.DateUtil;
+import cn.pluss.platform.bill.MemberTransStatisticsService;
+import cn.pluss.platform.bill.MerchantBillStatisticsService;
+import cn.pluss.platform.merchantOrder.MerchantOrderStatisticsService;
+import cn.pluss.platform.wx.WxTalkService;
+import cn.pluss.platform.wx.impl.WxTalkServiceImpl;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.Scheduled;
+
+import java.util.Calendar;
+import java.util.Date;
+
+/**
+ * 账单相关定时任务
+ * @author DJH
+ */
+@Slf4j
+@Configuration
+@ConditionalOnProperty(prefix = "scheduling", name = "enabled", havingValue = "true")
+public class MerchBillJob {
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantBillStatisticsService billStatisticsService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MemberTransStatisticsService memberTransStatisticsService;
+
+    @Autowired
+    private MerchantOrderStatisticsService mosService;
+
+    @Autowired
+    private WxTalkService wxTalkService;
+
+    /**
+     * 前一天的数据播报
+     */
+    @Scheduled(cron = "0 0 10 * * ? ")
+    public void setWxTalkDailyData() {
+        try {
+            wxTalkService.sendStatisticData();
+        } catch (Exception e) {
+            wxTalkService.sendTextMsg("账单统计失败(- -)!!!", WxTalkServiceImpl.WX_GO_PUBLIC_TALK_URL);
+        }
+    }
+
+    /**
+     * 每天统计商户前一天的账单
+     */
+    @Scheduled(cron = "10 0 0 * * ? ")
+    public void processDay() {
+        Calendar calendar = Calendar.getInstance();
+        calendar.add(Calendar.DAY_OF_WEEK, -1);
+        Date date = calendar.getTime();
+        String format = DateUtil.format(date, "yyyy-MM-dd");
+
+        billStatisticsService.saveDaysBill(format);
+    }
+
+    /**
+     * 每天统计商户前一天的会员账单
+     */
+    @Scheduled(cron = "10 0 0 * * ? ")
+    public void processMemberDay() {
+        Calendar calendar = Calendar.getInstance();
+        calendar.add(Calendar.DAY_OF_WEEK, -1);
+        Date date = calendar.getTime();
+        String format = DateUtil.format(date, "yyyy-MM-dd");
+
+        memberTransStatisticsService.saveDaysBill(format);
+    }
+
+    /**
+     * 统计月账单
+     */
+    @Scheduled(cron = "0 0 0 * * ? ")
+    public void processMonthOrderStatistics() {
+        mosService.untilLastMonth();
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/job/NotificationJob.java b/pluss-manage-page/src/main/java/cn/pluss/platform/job/NotificationJob.java
new file mode 100644
index 0000000..1e32372
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/job/NotificationJob.java
@@ -0,0 +1,155 @@
+package cn.pluss.platform.job;
+
+import cn.pluss.platform.activityEnroll.ActivityEnrollService;
+import cn.pluss.platform.cash.CashService;
+import cn.pluss.platform.deviceMerchantBuy.DeviceMerchantBuyService;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.notification.NotificationService;
+import cn.pluss.platform.officialGoods.exchange.OfficialGoodsExchangeService;
+import cn.pluss.platform.suggest.SuggestService;
+import cn.pluss.platform.transferCash.MerchantTransferCashService;
+import cn.pluss.platform.userApp.UserAppService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.Scheduled;
+
+import java.util.Date;
+import java.util.List;
+
+@Configuration
+@ConditionalOnProperty(prefix = "scheduling", name = "enabled", havingValue = "true")
+public class NotificationJob {
+    private Logger log = LoggerFactory.getLogger(this.getClass());
+
+    //1、资金管理-提现管理
+    @Autowired
+    private CashService cashService;
+
+    //2、系统配置-意见反馈
+    @Autowired
+    private SuggestService suggestService;
+
+    //3、活动管理-提现管理
+    @Autowired
+    private MerchantTransferCashService merchantTransferCashService;
+
+    //4、活动管理-兑换详情
+    @Autowired
+    private OfficialGoodsExchangeService officialGoodsExchangeService;
+
+    //5、活动管理-活动申请列表
+    @Autowired
+    private ActivityEnrollService activityEnrollService;
+
+    //6、设备管理-设备订单
+    @Autowired
+    private DeviceMerchantBuyService deviceMerchantBuyService;
+
+    //7、推广员管理-推广员列表
+    @Autowired
+    private MerchantChannelStatusService merchantChannelStatusService;
+
+    @Autowired
+    private UserAppService userAppService;
+
+    @Autowired
+    private NotificationService notificationService;
+
+    @Scheduled(fixedDelay = 5 * 60 * 1000)
+    public void notificationQuery() {
+        log.info("===============>检查消息通知数据定时任务开始<==================");
+        Date startTime;
+        Notification notification = notificationService.selectOne();
+        startTime = notification.getCreateTime();
+        Date endTime = new Date();
+        notification = new Notification();
+        QueryWrapper<Cash> cashQueryWrapper = new QueryWrapper<Cash>().gt("createDt", startTime).le("createDt", endTime);
+        List<Cash> cashList = cashService.list(cashQueryWrapper);
+        if (cashList.size() != 0) {
+            for (Cash cash : cashList) {
+                notification.setTitle("资金管理-提现管理");
+                notification.setContent("用户" + cash.getUserName() + "申请提现！");
+                notification.setCreateTime(cash.getCreateDt());
+                notificationService.save(notification);
+            }
+        }
+        Suggest suggest = new Suggest();
+        suggest.setStartTime(startTime);
+        suggest.setEndTime(endTime);
+        List<Suggest> suggestList = suggestService.querySuggestList(suggest);
+        if (suggestList.size() != 0) {
+            for (Suggest value : suggestList) {
+                notification.setTitle("系统配置-意见反馈");
+                notification.setContent(value.getContent());
+                notification.setCreateTime(value.getCreateDt());
+                notificationService.save(notification);
+            }
+        }
+        QueryWrapper<MerchantTransferCash> merchantTransferCashQueryWrapper = new QueryWrapper<MerchantTransferCash>()
+                .gt("createTime", startTime).le("createTime", endTime);
+        List<MerchantTransferCash> merchantTransferCashList = merchantTransferCashService.list(merchantTransferCashQueryWrapper);
+        if (merchantTransferCashList.size() != 0) {
+            for (MerchantTransferCash merchantTransferCash : merchantTransferCashList) {
+                notification.setTitle("活动管理-提现管理");
+                notification.setContent("用户" + merchantTransferCash.getUserName() + "申请提现！");
+                notification.setCreateTime(merchantTransferCash.getCreateTime());
+                notificationService.save(notification);
+            }
+        }
+        QueryWrapper<OfficialGoodsExchange> officialGoodsExchangeQueryWrapper = new QueryWrapper<OfficialGoodsExchange>()
+                .gt("createTime", startTime).le("createTime", endTime);
+        List<OfficialGoodsExchange> officialGoodsExchangeList = officialGoodsExchangeService.list(officialGoodsExchangeQueryWrapper);
+        if (officialGoodsExchangeList.size() != 0) {
+            for (OfficialGoodsExchange officialGoodsExchange : officialGoodsExchangeList) {
+                notification.setTitle("活动管理-兑换详情");
+                notification.setContent(officialGoodsExchange.getUserName() + "申请兑换商品！");
+                notification.setCreateTime(officialGoodsExchange.getCreateTime());
+                notificationService.save(notification);
+            }
+        }
+        QueryWrapper<ActivityEnroll> activityEnrollQueryWrapper = new QueryWrapper<ActivityEnroll>()
+                .gt("createTime", startTime).le("createTime", endTime);
+        List<ActivityEnroll> activityEnrollList = activityEnrollService.list(activityEnrollQueryWrapper);
+        if (activityEnrollList.size() != 0) {
+            for (ActivityEnroll activityEnroll : activityEnrollList) {
+                notification.setTitle("活动管理-活动申请列表");
+                notification.setContent(activityEnroll.getMerchantName() + "申请开通" + activityEnroll.getActName() + "的活动！");
+                notification.setCreateTime(activityEnroll.getCreateTime());
+                notificationService.save(notification);
+            }
+        }
+        DeviceMerchantBuy deviceMerchantBuy = new DeviceMerchantBuy();
+        deviceMerchantBuy.setStartTime(startTime);
+        deviceMerchantBuy.setEndTime(endTime);
+        deviceMerchantBuy.setStatus("1");
+        List<DeviceMerchantBuy> deviceMerchantBuyList = deviceMerchantBuyService.queryDeviceMerchantBuyList(deviceMerchantBuy);
+        if (deviceMerchantBuyList.size() != 0) {
+            for (DeviceMerchantBuy merchantBuy : deviceMerchantBuyList) {
+                notification.setTitle("设备管理-设备订单");
+                notification.setContent(merchantBuy.getMerchantName()
+                        + merchantBuy.getPayName() + "购买了" + merchantBuy.getQuantity() + "个"
+                        + merchantBuy.getVenderModel() + "机具");
+                notification.setCreateTime(merchantBuy.getCreateDt());
+                notificationService.save(notification);
+            }
+        }
+        QueryWrapper<MerchantChannelStatus> merchantChannelStatusQueryWrapper = new QueryWrapper<MerchantChannelStatus>()
+                .gt("createTime", startTime).le("createTime", endTime).eq("thirdStatus",MerchantChannelStatus.AUDIT_THIRD_STATUS_WAITING);
+        List<MerchantChannelStatus> merchantChannelStatusList = merchantChannelStatusService.list(merchantChannelStatusQueryWrapper);
+        if (merchantChannelStatusList.size() != 0){
+            for (MerchantChannelStatus merchantChannelStatus : merchantChannelStatusList){
+                notification.setTitle("推广员管理-推广员列表");
+                Integer userId = userAppService.getUserId(merchantChannelStatus.getMerchantCode());
+                notification.setContent("用户Id:"+userId+",申请进件！");
+                notification.setCreateTime(merchantChannelStatus.getCreateTime());
+                notificationService.save(notification);
+            }
+        }
+        log.info("===============>检查消息通知数据定时任务结束<==================");
+    }
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/job/RateChangeNewJob.java b/pluss-manage-page/src/main/java/cn/pluss/platform/job/RateChangeNewJob.java
new file mode 100644
index 0000000..8b07664
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/job/RateChangeNewJob.java
@@ -0,0 +1,357 @@
+package cn.pluss.platform.job;
+
+import cn.pluss.platform.channel.MchChannelRateNewService;
+import cn.pluss.platform.converter.Converter;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.MerchantRateNewRecordMapper;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchant.MerchantRateNewRecordService;
+import cn.pluss.platform.merchant.MerchantRateNewService;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.notice.NoticeService;
+import cn.pluss.platform.notice.template.NoticeTemplateService;
+import cn.pluss.platform.ryx.RyxConstants;
+import cn.pluss.platform.ryx.RyxService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.user.impl.GeneralPushUtil;
+import cn.pluss.platform.util.RyxConfig;
+import cn.pluss.platform.yinsheng.v20210929.ReqMethod;
+import cn.pluss.platform.ys.impl.v20210929.YsConfigV2;
+import cn.pluss.platform.ys.impl.v20210929.YsServiceV2;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.HttpEntity;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.TransactionDefinition;
+import org.springframework.transaction.TransactionStatus;
+import org.springframework.transaction.support.DefaultTransactionDefinition;
+import org.springframework.transaction.support.TransactionCallbackWithoutResult;
+import org.springframework.transaction.support.TransactionTemplate;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestTemplate;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.*;
+import java.util.concurrent.ExecutorService;
+
+@Slf4j
+@Configuration
+@ConditionalOnProperty(prefix = "scheduling", name = "enabled", havingValue = "true")
+public class RateChangeNewJob {
+
+    public static final int MAX_TIMES = 10;
+
+    @Autowired
+    private GeneralPushUtil generalPushUtil;
+
+    @Setter(onMethod_ = {@Autowired})
+    private UserAppService userAppService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantChannelStatusService mcsService;
+
+    @Autowired
+    private MerchantBaseInfoService mbiService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantRateNewService rateNewService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantRateNewRecordMapper rateNewRecordMapper;
+
+    @Setter(onMethod_ = {@Autowired})
+    private RyxService ryxService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private RestTemplate restTemplate;
+
+    @Setter(onMethod_ = {@Autowired})
+    private PlatformTransactionManager platformTransactionManager;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantRateNewRecordService rateNewRecordService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MchChannelRateNewService sxfChangeRateNewService;
+
+    @Autowired
+    private NoticeTemplateService nTempService;
+
+    @Autowired
+    private NoticeService noticeService;
+
+    @Autowired
+    private ExecutorService executorService2;
+
+    @Autowired
+    private MerchantRateNewRecordService mrnrService;
+
+    @Autowired
+    private TransactionTemplate transactionTemplate;
+
+    @Autowired
+    private YsServiceV2 ysServiceV2;
+
+    /**
+     * 随行付定时任务
+     */
+    @Scheduled(cron = "0 0 0 * * ? ")
+    public void process2() {
+
+        List<MerchantRateNewRecord> rateNewRecordList = rateNewRecordMapper.selectSxfRateChangeList();
+
+        for (MerchantRateNewRecord rateNewRecord : rateNewRecordList) {
+            executorService2.execute(() -> {
+                String merchantId = rateNewRecord.getMerchantId();
+                LambdaQueryWrapper<MerchantRateNew> qWrapper = Wrappers.lambdaQuery();
+                qWrapper.eq(MerchantRateNew::getMerchantId, merchantId)
+                        .eq(MerchantRateNew::getChannel, rateNewRecord.getChannel());
+
+                 MerchantRateNew one = rateNewService.getOne(qWrapper);
+                if (one == null) {
+                    one = sxfChangeRateNewService.getDefaultRate();
+                }
+
+                Converter.INSTANCE.cp(rateNewRecord, one);
+                rateNewRecord.setStatus("1");
+
+                // 获取用户id
+                LambdaQueryWrapper<MerchantChannelStatus> qWrapper2 = Wrappers.lambdaQuery();
+                qWrapper2.eq(MerchantChannelStatus::getMerchantId, merchantId)
+                        .eq(MerchantChannelStatus::getChannel, rateNewRecord.getChannel());
+                MerchantChannelStatus mcs = mcsService.getOne(qWrapper2);
+
+                List<String> aliasList = new ArrayList<>();
+
+                LambdaQueryWrapper<UserApp> qWrapper3 = Wrappers.lambdaQuery();
+                qWrapper3.eq(UserApp::getMerchantCode, mcs.getMerchantCode());
+                qWrapper3.eq(UserApp::getUserType, "promoter");
+                UserApp ua = userAppService.getOne(qWrapper3);
+                aliasList.add(ua.getUserId() + "");
+
+                LambdaQueryWrapper<MerchantBaseInfo> qWrapper6 = Wrappers.lambdaQuery();
+                qWrapper6.eq(MerchantBaseInfo::getMerchantCode, mcs.getMerchantCode());
+                MerchantBaseInfo mbi = mbiService.getOne(qWrapper6);
+
+                // 获取上级用户id
+                UserApp uaParent = null;
+                if (ua.getParentId() != null) {
+                    LambdaQueryWrapper<UserApp> qWrapper4 = Wrappers.lambdaQuery();
+                    qWrapper4.eq(UserApp::getUserId, ua.getParentId());
+                    uaParent = userAppService.getOne(qWrapper4);
+                    aliasList.add(uaParent.getUserId() + "");
+                }
+
+                // 获取通知模板
+                NoticeTemplate template = nTempService.getNoticeTemplateByType("14");
+                String templateContent;
+                if (template == null) {
+                    templateContent = "尊敬的商户“$1”，您的交易费率调整审核已通过，费率修改记录在个人页面【商户认证】-【商户费率】-右上角【变更记录】中查看，如有疑问请咨询您的业务员。";
+                } else {
+                    templateContent = template.getContent();
+                }
+                templateContent = templateContent.replace("$1", mbi.getAlias());
+
+                List<Notice> noticeList = new ArrayList<>();
+
+                Notice notice = new Notice(1, -1, ua.getUserId() + "", ua.getUserName());
+                notice.setConrtent(templateContent);
+                notice.setDesc(templateContent);
+                notice.setTitle("费率修改通知");
+                noticeList.add(notice);
+
+                if (uaParent != null) {
+                    Notice notice2 = new Notice(1, -1, uaParent.getUserId() + "", uaParent.getUserName());
+                    notice2.setConrtent(templateContent);
+                    notice2.setDesc(templateContent);
+                    notice2.setTitle("费率修改通知");
+                    noticeList.add(notice2);
+                }
+
+                // 开启事务
+                DefaultTransactionDefinition def = new DefaultTransactionDefinition();
+                def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW);
+                TransactionStatus status = platformTransactionManager.getTransaction(def);
+                try {
+                    rateNewRecordService.updateById(rateNewRecord);
+                    rateNewService.saveOrUpdate(one);
+                    noticeService.saveBatch(noticeList);
+
+                    generalPushUtil.sendAllPlatByAlias(aliasList, "费率修改通知", templateContent, "1");
+                } catch (Exception e) {
+                    platformTransactionManager.rollback(status);
+                }
+
+                platformTransactionManager.commit(status);
+            });
+        }
+    }
+
+
+    /**
+     * 瑞银信定时任务
+     */
+    @Scheduled(cron = "0 1 2 * * ?")
+    public void process() {
+        List<MerchantRateNewRecord> merchantRates = rateNewRecordMapper.selectRyxRateChangeList();
+        for (MerchantRateNewRecord rateNewRecord : merchantRates) {
+            executorService2.execute(() -> {
+
+                boolean result = false;
+                int tryTimes = 0;
+                // 修改请求尝试10次，
+                while (!result && tryTimes <= MAX_TIMES) {
+                    try {
+                        tryTimes++;
+                        changeRate(rateNewRecord);
+                        result = true;
+                        log.error("商户 {}, 第{}次瑞银信费率修改成功", rateNewRecord.getMerchantId(), tryTimes);
+                    } catch (Exception e) {
+                        result = false;
+                        log.error("商户 {}, 第{}次瑞银信费率修改失败\n, {}", rateNewRecord.getMerchantId(), tryTimes, e.getMessage());
+                    }
+
+                    try {
+                        Thread.sleep(100);
+                    } catch (InterruptedException e) {
+                        e.printStackTrace();
+                    }
+                }
+
+                // 开启事务
+                DefaultTransactionDefinition def = new DefaultTransactionDefinition();
+                def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW);
+                TransactionStatus status = platformTransactionManager.getTransaction(def);
+
+                try {
+                    if (result) {
+                        mrnrService.onSuccess(rateNewRecord);
+                    } else {
+                        mrnrService.onFail(rateNewRecord);
+                    }
+                    platformTransactionManager.commit(status);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    platformTransactionManager.rollback(status);
+                }
+            });
+        }
+    }
+
+    /**
+     * 银盛-云商服，商户修改费率
+     */
+    @Scheduled(fixedDelay = 3 * 60 * 1000)
+    public void checkYsMerchRateStatus() {
+        LambdaQueryWrapper<MerchantRateNewRecord> qWrapper = Wrappers.lambdaQuery();
+        qWrapper.eq(MerchantRateNewRecord::getStatus, MerchantRateNewRecord.STATUS_IN_REVIEW)
+                .eq(MerchantRateNewRecord::getChannel, 4)
+                .last("limit " + CheckMerchAuditStatusJob.MAX_SIZE);
+
+        List<MerchantRateNewRecord> editList = mrnrService.list(qWrapper);
+
+        for (MerchantRateNewRecord mrnr : editList) {
+            try {
+                MerchantChannelStatus mcs = new MerchantChannelStatus();
+                mcs.setMerchantId(mrnr.getMerchantId()).setChannel(4);
+                mcs = mcsService.getOne(new QueryWrapper<>(mcs));
+                if (!MerchantChannelStatus.isAudited(mcs)) {
+                    throw new MsgException("商户状态错误");
+                }
+
+                String changeFlowId = mrnr.getRemark();
+
+                if (StringUtils.isEmpty(changeFlowId)) {
+                    continue;
+                }
+
+                JSONObject param = new JSONObject();
+                param.put("changeFlowId", changeFlowId);
+
+                JSONObject result;
+                try {
+                    result = ysServiceV2.req(YsConfigV2.MER_EDIT_RESULT, ReqMethod.MERCHANT_EDIT_RESULT, param);
+                } catch (Exception e) {
+                    continue;
+                }
+
+                transactionTemplate.execute(new TransactionCallbackWithoutResult() {
+                    @Override
+                    protected void doInTransactionWithoutResult(TransactionStatus status) {
+
+                        String modifyType = result.getString("modifyType");
+
+                        if ("03".equals(modifyType)) {
+                            if ("02".equals(result.getString("status"))) {
+                                mrnrService.onSuccess(mrnr);
+                            }
+
+                            if ("90".equals(result.getString("status"))) {
+                                mrnrService.onFail(mrnr);
+                            }
+                        }
+                    }
+                });
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    private void changeRate(MerchantRateNewRecord rateNewRecord) {
+        LambdaQueryWrapper<MerchantChannelStatus> qWrapper = new LambdaQueryWrapper<MerchantChannelStatus>()
+                .eq(MerchantChannelStatus::getMerchantId, rateNewRecord.getMerchantId())
+                .eq(MerchantChannelStatus::getChannel, rateNewRecord.getChannel());
+        MerchantChannelStatus mcs = mcsService.getOne(qWrapper);
+        UserApp userApp = new UserApp();
+        userApp.setMerchantCode(mcs.getMerchantCode());
+        userApp.setUserType("promoter");
+        userApp = userAppService.queryUserApp(userApp);
+
+        String merchantCode = userApp.getMerchantCode();
+
+        MerchantRateNew transRateNew = Converter.INSTANCE.trans(rateNewRecord);
+        MerchantRateNew.setRateValue(transRateNew);
+
+        MerchantChannelStatus channelStatus = mcsService.getByMerchantCode(merchantCode, 3);
+
+        Map<String, Object> map = new HashMap<>();
+        map.put(RyxConstants.MER_IN_ID, channelStatus.getExtra().getString(RyxConstants.MER_IN_ID));
+        map.put(RyxConstants.ACCESS_ID, RyxConfig.accessId);
+        map.put(RyxConstants.DEBIT_RATE, transRateNew.getBankRateLargeValue().setScale(3, RoundingMode.HALF_UP).divide(BigDecimal.valueOf(100), RoundingMode.HALF_UP).toPlainString());
+        map.put(RyxConstants.DEBIT_TOP, 80);
+        map.put(RyxConstants.CREDIT_RATE, transRateNew.getBankRateLargeValue().setScale(3, RoundingMode.HALF_UP).divide(BigDecimal.valueOf(100), RoundingMode.HALF_UP).toPlainString());
+        map.put(RyxConstants.QR_CREDIT_RATE, transRateNew.getBankRateValue().divide(BigDecimal.valueOf(100), RoundingMode.HALF_UP).toPlainString());
+        map.put(RyxConstants.QR_DEBIT_RATE, transRateNew.getBankRateValue().divide(BigDecimal.valueOf(100), RoundingMode.HALF_UP).toPlainString());
+        map.put(RyxConstants.WX_DEBIT_RATE, transRateNew.getWxRateValue().divide(BigDecimal.valueOf(100), RoundingMode.HALF_UP).toPlainString());
+        map.put(RyxConstants.ZFB_DEBIT_RATE, transRateNew.getAliRateValue().divide(BigDecimal.valueOf(100), RoundingMode.HALF_UP).toPlainString());
+
+        log.info("请求参数：{}", JSON.toJSONString(map));
+
+        RyxAccessModel ryxAccessModel = ryxService.accessCombineEncrypt(map, null, RyxConfig.accessId, RyxConfig.accessPubKey);
+
+        MultiValueMap<String, Object> reqMap = RyxAccessModel.toMap(ryxAccessModel);
+
+        HttpEntity<MultiValueMap<String, Object>> httpEntity = new HttpEntity<>(reqMap);
+
+        RyxAccessModel respModel = restTemplate.postForObject(RyxConfig.changeRate, httpEntity, RyxAccessModel.class);
+
+        RyxAccessResp resp = ryxService.accessResultDecrypt(respModel, RyxAccessResp.class);
+
+        if (resp.getCode().equals(RyxAccessResp.RESULT_ERROR)) {
+            throw new MsgException(resp.getMsg());
+        }
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/job/RyxGetPlugInTransOrderJob.java b/pluss-manage-page/src/main/java/cn/pluss/platform/job/RyxGetPlugInTransOrderJob.java
new file mode 100644
index 0000000..3b67698
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/job/RyxGetPlugInTransOrderJob.java
@@ -0,0 +1,50 @@
+package cn.pluss.platform.job;
+
+import cn.hutool.core.io.FileUtil;
+import cn.pluss.platform.merchantOrder.MerchantOrderService;
+import cn.pluss.platform.ryx.RyxService;
+import cn.pluss.platform.util.StringUtil;
+import com.alibaba.fastjson.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.Scheduled;
+
+import javax.annotation.Resource;
+
+/**
+ * 定时任务获取前一天插件订单交易数据
+ */
+@Configuration
+@ConditionalOnProperty(prefix = "scheduling", name = "enabled", havingValue = "true")
+public class RyxGetPlugInTransOrderJob {
+
+    private Logger log = LoggerFactory.getLogger(this.getClass());
+
+    @Resource
+    private RyxService ryxService;
+
+    @Resource
+    private MerchantOrderService merchantOrderService;
+
+    /**
+     * 每天早上8点获取前一天的插件订单记录
+     */
+    @Scheduled(cron = "0 0 8 * * ? ")
+    public void getPlugInTransOrderTask(){
+        log.info("====================>【瑞银信】获取插件交易订单记录开始<==========================");
+        JSONObject result = ryxService.downloadFtpFile(null);
+        if(StringUtil.isEmpty(result)){
+            log.info("====================>【瑞银信】获取插件交易订单结束，下载文件返回路径为null<==========================");
+            return;
+        }
+        String uploadPath = result.getString("uploadPath");
+        String filePath = result.getString("filePath");
+        //读取文件
+        merchantOrderService.readCSV(filePath);
+        //删除文件
+        FileUtil.del(uploadPath);
+        log.info("====================>【瑞银信】获取插件交易订单记录定时任务结束<==========================");
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/job/RyxRateChangeJob.java b/pluss-manage-page/src/main/java/cn/pluss/platform/job/RyxRateChangeJob.java
new file mode 100644
index 0000000..7bbd890
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/job/RyxRateChangeJob.java
@@ -0,0 +1,237 @@
+package cn.pluss.platform.job;
+
+import cn.jiguang.common.utils.StringUtils;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.MerchantRateMapper;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.merchantOrder.MerchantOrderService;
+import cn.pluss.platform.merchantProfit.MerchantProfitService;
+import cn.pluss.platform.realFans.RealFansService;
+import cn.pluss.platform.ryx.RyxConstants;
+import cn.pluss.platform.ryx.RyxService;
+import cn.pluss.platform.service.UnknownExceptionService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.util.RyxConfig;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.http.HttpEntity;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.TransactionDefinition;
+import org.springframework.transaction.TransactionStatus;
+import org.springframework.transaction.support.DefaultTransactionDefinition;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestTemplate;
+
+import java.math.BigDecimal;
+import java.math.MathContext;
+import java.math.RoundingMode;
+import java.util.*;
+
+/**
+ * 瑞银信费率变更请求定时任务
+ * @author DJH
+ */
+@Slf4j
+//@Configuration
+@ConditionalOnProperty(prefix = "scheduling", name = "enabled", havingValue = "true")
+public class RyxRateChangeJob {
+
+    public static final int MAX_TIMES = 10;
+
+    @Setter(onMethod_ = {@Autowired})
+    private UserAppService userAppService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantChannelStatusService merchantChannelStatusService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantRateMapper merchantRateMapper;
+
+    @Setter(onMethod_ = {@Autowired})
+    private RyxService ryxService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private RestTemplate restTemplate;
+
+    @Setter(onMethod_ = {@Autowired})
+    private RealFansService realFansService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private PlatformTransactionManager platformTransactionManager;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantOrderService merchantOrderService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private UnknownExceptionService exceptionService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantProfitService profitService;
+
+    /**
+     * 定时任务
+     */
+    @Scheduled(cron = "0 1 2 * * ?")
+    public void process() {
+        List<MerchantRate> merchantRates = merchantRateMapper.selectRyxRateChangeList();
+
+        int tryTimes;
+        boolean result;
+        for (MerchantRate merchantRate: merchantRates) {
+            // 开启事务
+            DefaultTransactionDefinition def = new DefaultTransactionDefinition();
+            def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW);
+            TransactionStatus status = platformTransactionManager.getTransaction(def);
+
+            result = false;
+            tryTimes = 0;
+            // 修改请求尝试10次，
+            while (!result && tryTimes <= MAX_TIMES) {
+                try {
+                    tryTimes++;
+                    changeRate(merchantRate.getUserId());
+                    result = true;
+                    log.error("用户 {}, 第{}次瑞银信费率修改成功", merchantRate.getUserId(), tryTimes);
+                } catch (Exception e) {
+                    result = false;
+                    log.error("用户 {}, 第{}次瑞银信费率修改失败\n, {}", merchantRate.getUserId(), tryTimes, e.getMessage());
+                }
+
+                try {
+                    Thread.sleep(100);
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+            }
+
+            if (result) {
+                platformTransactionManager.commit(status);
+                continue;
+            }
+
+            // 失败
+            try {
+                onFail(merchantRate);
+                platformTransactionManager.commit(status);
+            } catch (Exception e2) {
+                log.error("费率修改失败, 订单信息回滚失败, 错误原因: ");
+                e2.printStackTrace();
+
+                platformTransactionManager.rollback(status);
+                exceptionService.save(e2);
+            }
+        }
+    }
+
+    private void changeRate(String userId) {
+        UserApp userApp = new UserApp();
+        userApp.setUserId(Long.parseLong(userId));
+        userApp = userAppService.queryUserApp(userApp);
+
+        String merchantCode = userApp.getMerchantCode();
+
+        MerchantRate merchantRate = new MerchantRate().setUserId(userId);
+        merchantRate = merchantRateMapper.selectOne(new QueryWrapper<>(merchantRate));
+
+        if (merchantRate == null) {
+            return;
+        }
+
+        MerchantChannelStatus channelStatus = merchantChannelStatusService.getByMerchantCode(merchantCode, 3);
+
+        Map<String, Object> map = new HashMap<>();
+        map.put(RyxConstants.MER_IN_ID, channelStatus.getExtra().getString(RyxConstants.MER_IN_ID));
+        map.put(RyxConstants.ACCESS_ID, RyxConfig.accessId);
+        map.put(RyxConstants.DEBIT_RATE, "0.6");
+        map.put(RyxConstants.DEBIT_TOP, 20);
+        map.put(RyxConstants.CREDIT_RATE, "0.6");
+        map.put(RyxConstants.QR_CREDIT_RATE, "0." + Math.max(merchantRate.getRate(), 22));
+        map.put(RyxConstants.QR_DEBIT_RATE, "0." + Math.max(merchantRate.getRate(), 22));
+        map.put(RyxConstants.WX_DEBIT_RATE, "0." + merchantRate.getRate());
+        map.put(RyxConstants.ZFB_DEBIT_RATE, "0." + merchantRate.getRate());
+
+        log.info("请求参数：{}", JSON.toJSONString(map));
+
+        RyxAccessModel ryxAccessModel = ryxService.accessCombineEncrypt(map, null, RyxConfig.accessId, RyxConfig.accessPubKey);
+
+        MultiValueMap<String, Object> reqMap = RyxAccessModel.toMap(ryxAccessModel);
+
+        HttpEntity<MultiValueMap<String, Object>> httpEntity = new HttpEntity<>(reqMap);
+
+        RyxAccessModel respModel = restTemplate.postForObject(RyxConfig.changeRate, httpEntity, RyxAccessModel.class);
+
+        RyxAccessResp resp = ryxService.accessResultDecrypt(respModel, RyxAccessResp.class);
+
+        if (resp.getCode().equals(RyxAccessResp.RESULT_ERROR)) {
+            throw new MsgException(resp.getMsg());
+        }
+    }
+
+    /**
+     * <h1>修改费率失败</h1>
+     * <p>
+     *     修改费率失败时，<br/>
+     *     将费率信息进行回滚 <br/>
+     *     重新计算今日已经发生的订单费率、手续费、分润等
+     * </p>
+     * @param merchantRate
+     */
+    private void onFail(MerchantRate merchantRate) {
+        // 费率改回原来的费率
+        merchantRate.setRate(merchantRate.getPreviousRate());
+        merchantRateMapper.updateById(merchantRate);
+
+        // 查询当天所有的订单，重新修改订单信息
+        UserApp userApp = new UserApp().setUserId(Long.parseLong(merchantRate.getUserId()));
+        userApp = userAppService.queryUserApp(userApp);
+
+        MerchantOrder merchantOrder = new MerchantOrder();
+        merchantOrder.setStatus("1");
+        
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(Calendar.HOUR_OF_DAY, 0);
+        calendar.set(Calendar.MINUTE, 0);
+        calendar.set(Calendar.SECOND, 0);
+        calendar.set(Calendar.MILLISECOND, 0);
+        Date startTime = calendar.getTime();
+
+        merchantOrder.setStartTime(startTime);
+        merchantOrder.setEndTime(new Date());
+        merchantOrder.setMerchantCode(userApp.getMerchantCode());
+
+        List<MerchantOrder> orderList = merchantOrderService.list(new QueryWrapper<>(merchantOrder));
+        MathContext mc = new MathContext(2, RoundingMode.HALF_UP);
+        for (MerchantOrder order: orderList) {
+            // 修改订单费率以及订单到账金额
+            order.setRate(new BigDecimal(merchantRate.getRate()));
+            BigDecimal consumeFee = BigDecimal.valueOf(order.getConsumeFee());
+            BigDecimal charge = consumeFee.multiply(BigDecimal.valueOf(merchantRate.getRate())).divide(BigDecimal.valueOf(10000), mc);
+            BigDecimal enterFee = consumeFee.subtract(charge);
+            order.setEnterFee(enterFee.doubleValue());
+
+            BigDecimal marketAmt = merchantOrder.getMarketAmt();
+            // 如果有费率补贴，则修改费率补贴的值
+            if (!marketAmt.equals(BigDecimal.ZERO)) {
+                merchantOrder.setMarketAmt(charge);
+            }
+
+            merchantOrderService.save(merchantOrder);
+
+            MerchantProfit merchantProfit = new MerchantProfit();
+            String orderNumber = merchantOrder.getOrderNumber();
+            if (StringUtils.isNotEmpty(orderNumber)) {
+                merchantProfit.setOrderNumber(orderNumber);
+                // 删除现有分润记录
+                profitService.remove(new QueryWrapper<>(merchantProfit));
+                // 生成分润
+                profitService.createOrderProfitV2(merchantOrder,"1");
+            }
+        }
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/job/RyxTransJob.java b/pluss-manage-page/src/main/java/cn/pluss/platform/job/RyxTransJob.java
new file mode 100644
index 0000000..6f82282
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/job/RyxTransJob.java
@@ -0,0 +1,28 @@
+package cn.pluss.platform.job;
+
+import cn.pluss.platform.ryx.RyxTransService;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.Scheduled;
+
+/**
+ * 瑞银信打款记录查询定时任务
+ * @author DJH
+ */
+@Slf4j
+@Configuration
+@ConditionalOnProperty(prefix = "scheduling", name = "enabled", havingValue = "true")
+public class RyxTransJob {
+
+    @Setter(onMethod_ = {@Autowired})
+    private RyxTransService ryxTransService;
+
+    @Scheduled(cron = "0 0/5 8-13 * * ?")
+    public void process() {
+        // ryxTransService.pullTransRecord();
+        ryxTransService.pullYesterdayTransRecord();
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/job/TaskScheduleJob.java b/pluss-manage-page/src/main/java/cn/pluss/platform/job/TaskScheduleJob.java
new file mode 100644
index 0000000..16fa2b4
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/job/TaskScheduleJob.java
@@ -0,0 +1,90 @@
+package cn.pluss.platform.job;
+
+import cn.pluss.platform.entity.UserTask;
+import cn.pluss.platform.notice.NoticeService;
+import cn.pluss.platform.schedule.UserTaskService;
+import cn.pluss.platform.wx.impl.WxTalkServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.logging.Log;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.Scheduled;
+
+import java.util.Calendar;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * @author DJH
+ */
+@Slf4j
+@Configuration
+@ConditionalOnProperty(prefix = "scheduling", name = "enabled", havingValue = "true")
+public class TaskScheduleJob {
+
+    @Autowired
+    private UserTaskService userTaskService;
+
+    @Autowired
+    private NoticeService noticeService;
+
+    /**
+     * 前一天的数据播报
+     */
+    @Scheduled(cron = "0 1 10 * * ? ")
+    public void userTask() {
+        LambdaQueryWrapper<UserTask> qWrapper = Wrappers.lambdaQuery();
+        qWrapper.eq(UserTask::getType, UserTask.STATUS_ENABLED);
+
+        final List<UserTask> userTaskList = userTaskService.list(qWrapper);
+
+        for (UserTask userTask : userTaskList) {
+            try {
+                if ("SCHE_NOTICE".equals(userTask.getTaskCode())) {
+                    sendNotice(userTask);
+                }
+            } catch (Exception e) {
+                log.debug("====定时通知执行异常");
+                e.printStackTrace();
+            }
+
+        }
+    }
+
+    private void sendNotice(UserTask userTask) {
+
+        if (UserTask.TYPE_ONCE.equals(userTask.getType())) {
+            // 发送一次后即标记为过期
+            noticeService.sendTempNotice(userTask.getArg0(), userTask.getArg1(), userTask.getArg3(), userTask.getArg2(), userTask.getUserId() + "", new HashMap<>());
+            userTask.setStatus(UserTask.STATUS_EXPIRED);
+            userTaskService.updateById(userTask);
+            return;
+        }
+
+        if (UserTask.TYPE_DAY.equals(userTask.getType())) {
+            noticeService.sendTempNotice(userTask.getArg0(), userTask.getArg1(), userTask.getArg3(), userTask.getArg2(), userTask.getUserId() + "", new HashMap<>());
+            return;
+        }
+
+        Calendar calendar = Calendar.getInstance();
+
+        if (UserTask.TYPE_WEEK.equals(userTask.getType())) {
+            final int dayOfWeek = calendar.get(Calendar.DAY_OF_WEEK);
+            if (dayOfWeek == Calendar.SUNDAY) {
+                noticeService.sendTempNotice(userTask.getArg0(), userTask.getArg1(), userTask.getArg3(), userTask.getArg2(), userTask.getUserId() + "", new HashMap<>());
+            } else {
+                return;
+            }
+        }
+
+        if (UserTask.TYPE_MONTH.equals(userTask.getType())) {
+            final int dayOfMonth = calendar.get(Calendar.DAY_OF_MONTH);
+            if (dayOfMonth == 1) {
+                noticeService.sendTempNotice(userTask.getArg0(), userTask.getArg1(), userTask.getArg3(), userTask.getArg2(), userTask.getUserId() + "", new HashMap<>());
+            }
+        }
+    }
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/job/merchantActivityJob.java b/pluss-manage-page/src/main/java/cn/pluss/platform/job/merchantActivityJob.java
new file mode 100644
index 0000000..ee1ba4d
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/job/merchantActivityJob.java
@@ -0,0 +1,36 @@
+package cn.pluss.platform.job;
+
+import cn.pluss.platform.officialActivity.OfficialActivityService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.Scheduled;
+
+import java.util.Date;
+
+@Configuration
+@ConditionalOnProperty(prefix = "scheduling", name = "enabled", havingValue = "true")
+public class merchantActivityJob {
+    private Logger log = LoggerFactory.getLogger(this.getClass());
+
+    @Autowired
+    private OfficialActivityService officialActivityService;
+
+    @Scheduled(cron = "0 0 0 * * ? ")
+//    @Scheduled(fixedDelay = 5 * 60 * 1000)
+    public void merchantActivityQuery(){
+        log.info("===============>检查官方活动是否到期定时任务开始<==================");
+        Date dateTime = new Date();
+        officialActivityService.updateActivicyStatus(dateTime);
+        /*List<OfficialActivity> list = officialActivityService.list();
+        for (OfficialActivity off: list) {
+            if (dateTime.compareTo(off.getEndTime()) != -1){
+                off.setStatus("3");
+                officialActivityService.updateById(off);
+            }
+        }*/
+        log.info("===============>检查官方活动是否到期定时任务结束<==================");
+    }
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/mapper/TestMapper.java b/pluss-manage-page/src/main/java/cn/pluss/platform/mapper/TestMapper.java
new file mode 100644
index 0000000..49dc9ce
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/mapper/TestMapper.java
@@ -0,0 +1,12 @@
+package cn.pluss.platform.mapper;
+
+import cn.pluss.platform.entity.MerchantPlugin;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+public interface TestMapper {
+
+    @Select("SELECT * FROM tb_pluss_merchant_plugin WHERE `status` = '1' AND thirdStatus = '-100';")
+    List<MerchantPlugin> getPluginAlready4Audit();
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/test/TestController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/test/TestController.java
new file mode 100644
index 0000000..ee629d0
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/test/TestController.java
@@ -0,0 +1,229 @@
+package cn.pluss.platform.test;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.bind.annotation.*;
+
+import com.alibaba.fastjson.JSONObject;
+
+import cn.pluss.platform.entitiy.WechatQRCode;
+import cn.pluss.platform.util.HttpResult;
+import cn.pluss.platform.util.HttpUtil;
+import cn.pluss.platform.util.ParametersUtil;
+import cn.pluss.platform.util.StringUtil;
+import cn.pluss.platform.util.TemporaryQRcode;
+import org.springframework.web.multipart.MultipartFile;
+
+@RestController
+@RequestMapping("test")
+public class TestController {
+
+	@PostMapping("/upload")
+	@ResponseBody
+	public String upload(@RequestParam("file") MultipartFile file) {
+
+		return "success";
+	}
+
+	private static final Logger logger = LoggerFactory.getLogger(TestController.class);
+
+	@RequestMapping(value = "/hello", method = RequestMethod.GET)
+	public String sayHello() {
+		Map<String, Object> map = new HashMap<String, Object>(16);
+		map.put("grant_type", "client_credential");
+		map.put("appid", "wxed824282c345b7a0");
+		map.put("secret", "155350e41b5bc5bff95cc41d306a8161");
+		try {
+			HttpResult doGet = HttpUtil.doGet("https://api.weixin.qq.com/cgi-bin/token", map);
+			logger.error("=====获取token接口返回值=====", JSONObject.toJSONString(doGet));
+			Integer code = doGet.getCode();
+			String msg = null;
+			boolean flag = false;
+			if (code == 200) {
+				String body = doGet.getBody();
+				JSONObject parseObject = JSONObject.parseObject(body);
+				Integer errorCode = parseObject.getInteger("errcode");
+				if (!StringUtil.isEmpty(errorCode)) {
+					switch (errorCode) {
+					case -1:
+						msg = "系统繁忙，此时请开发者稍候再试";
+						break;
+					case 0:
+						msg = "请求成功";
+						flag = true;
+						break;
+					case 40001:
+						msg = "AppSecret错误或者AppSecret不属于这个公众号，请开发者确认AppSecret的正确性";
+						break;
+					case 40002:
+						msg = "请确保grant_type字段值为client_credential";
+						break;
+					case 40164:
+						msg = "调用接口的IP地址不在白名单中，请在接口IP白名单中进行设置。（小程序及小游戏调用不要求IP地址在白名单内。）";
+						break;
+					default:
+						msg = "请求成功";
+						break;
+					}
+				} else {
+					flag = true;
+				}
+				if (flag) {
+					String accessToken = parseObject.getString("access_token");
+					Map<String, Object> map1 = new HashMap<String, Object>(16);
+					map1.put("expire_seconds", 2592000);
+					map1.put("action_name", "QR_STR_SCENE");
+					String sceneStr = null;
+					WechatQRCode wechatQRCode = TemporaryQRcode.createForeverTicket(accessToken, 2592000, sceneStr);
+					Properties prop = System.getProperties();
+					String os = prop.getProperty("os.name");
+					String path = null;
+					if (os.startsWith("win") || os.startsWith("Win")) {
+						path = "D:/Pictures";// windows目录
+					} else {
+						path = ParametersUtil.upload_save_path;
+					}
+					String rQcode = TemporaryQRcode.getRQcode(wechatQRCode.getTicket(), path);
+					System.out.println(rQcode);
+					return rQcode;
+				} else {
+					System.out.println(msg);
+				}
+			}
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+	private static String getAccessToken() {
+		Map<String, Object> map = new HashMap<String, Object>(16);
+		map.put("grant_type", "client_credential");
+		map.put("appid", "wx20403c16079b1b59");
+		map.put("secret", "bca9c306d375840f4c5d7bfea22d5f74");
+		try {
+			HttpResult doGet = HttpUtil.doGet("https://api.weixin.qq.com/cgi-bin/token", map);
+			logger.error("=====获取token接口返回值=====", JSONObject.toJSONString(doGet));
+			Integer code = doGet.getCode();
+			String msg = null;
+			boolean flag = false;
+			if (code == 200) {
+				String body = doGet.getBody();
+				JSONObject parseObject = JSONObject.parseObject(body);
+				Integer errorCode = parseObject.getInteger("errcode");
+				if (!StringUtil.isEmpty(errorCode)) {
+					switch (errorCode) {
+					case -1:
+						msg = "系统繁忙，此时请开发者稍候再试";
+						break;
+					case 0:
+						msg = "请求成功";
+						flag = true;
+						break;
+					case 40001:
+						msg = "AppSecret错误或者AppSecret不属于这个公众号，请开发者确认AppSecret的正确性";
+						break;
+					case 40002:
+						msg = "请确保grant_type字段值为client_credential";
+						break;
+					case 40164:
+						msg = "调用接口的IP地址不在白名单中，请在接口IP白名单中进行设置。（小程序及小游戏调用不要求IP地址在白名单内。）";
+						break;
+					default:
+						msg = "请求成功";
+						break;
+					}
+				} else {
+					flag = true;
+				}
+				if (flag) {
+					String accessToken = parseObject.getString("access_token");
+					return accessToken;
+				} else {
+					System.out.println(msg);
+					return msg;
+				}
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return null;
+
+	}
+	
+	
+	
+	
+
+	/**
+	 * 
+	 * creatMenu:(创建菜单). <br/>
+	 * 
+	 *
+	 * @author Administrator
+	 * @return
+	 * @since JDK 1.8
+	 */
+	@RequestMapping(value = "/creatMenu", method = RequestMethod.GET)
+	public String creatMenu() {
+		String accessToken = getAccessToken();
+		if (StringUtil.isNotEmpty(accessToken)) {
+			String string = "{\"button\":[{\"name\":\"福利社\",\"sub_button\":{\"list\":[{\"type\":\"miniprogram\",\"name\":\"积分商城\",\"url\":\"https:\\/\\/shop.shouyinbei.net\\/addons\\/we7_wmall\\/template\\/vue\\/index.html?menu=#\\/pages\\/creditshop\\/index?i=1\",\"appid\":\"wx00f4ba80787fbdbb\",\"pagepath\":\"pages\\/creditshop\\/index\"},{\"type\":\"miniprogram\",\"name\":\"生活圈\",\"url\":\"https:\\/\\/shop.shouyinbei.net\\/addons\\/we7_wmall\\/template\\/vue\\/index.html?menu=#\\/pages\\/home\\/index?i=1\",\"appid\":\"wx00f4ba80787fbdbb\",\"pagepath\":\"pages\\/home\\/index\"},{\"type\":\"miniprogram\",\"name\":\"优惠券\",\"url\":\"https:\\/\\/shop.shouyinbei.net\\/addons\\/we7_wmall\\/template\\/vue\\/index.html?menu=#\\/pages\\/channel\\/coupon?i=1\",\"appid\":\"wx00f4ba80787fbdbb\",\"pagepath\":\"pages\\/channel\\/coupon\"},{\"type\":\"miniprogram\",\"name\":\"天天特价\",\"url\":\"https:\\/\\/shop.shouyinbei.net\\/addons\\/we7_wmall\\/template\\/vue\\/index.html?menu=#\\/plugin\\/pages\\/bargain\\/index?i=1\",\"appid\":\"wx00f4ba80787fbdbb\",\"pagepath\":\"pages\\/bargain\\/index\"},{\"type\":\"miniprogram\",\"name\":\"拼团抢购\",\"url\":\"https:\\/\\/shop.shouyinbei.net\\/addons\\/we7_wmall\\/template\\/vue\\/index.html?menu=#\\/gohome\\/pages\\/home\\/index?i=1\",\"appid\":\"wx00f4ba80787fbdbb\",\"pagepath\":\"gohome\\/pages\\/home\\/index\"}]}},{\"type\":\"text\",\"name\":\"广告位\",\"value\":\"暂未开放\"},{\"name\":\"更多服务\",\"sub_button\":{\"list\":[{\"type\":\"miniprogram\",\"name\":\"会员卡\",\"url\":\"https:\\/\\/shop.shouyinbei.net\\/addons\\/we7_wmall\\/template\\/vue\\/index.html?menu=#\\/pages\\/home\\/index?i=1\",\"appid\":\"wx00f4ba80787fbdbb\",\"pagepath\":\"pages\\/card\\/mine\"},{\"type\":\"text\",\"name\":\"商户入驻\",\"value\":\"1\"},{\"type\":\"text\",\"name\":\"广告合作\",\"value\":\"1\"},{\"type\":\"text\",\"name\":\"在线客服\",\"value\":\"1\"}]}}]}";
+			String json = HttpUtil.HttpPostWithJson("https://api.weixin.qq.com/cgi-bin/menu/create?access_token=" + accessToken + "", string);
+			return json;
+		}
+		return null;
+	}
+
+	public static void main(String[] args) throws Exception {
+		createMenu();
+	}
+
+	private static void createMenu() {
+		String accessToken = getAccessToken();
+		if (StringUtil.isNotEmpty(accessToken)) {
+			String string = "{\"button\":[{\"name\":\"福利社\",\"sub_button\":[{\"type\":\"miniprogram\",\"name\":\"同城外卖\",\"url\":\"https:\\/\\/shop.shouyinbei.net\\/addons\\/we7_wmall\\/template\\/vue\\/index.html?menu=#\\/pages\\/home\\/index?i=1\",\"appid\":\"wx00f4ba80787fbdbb\",\"pagepath\":\"pages\\/home\\/index\"},{\"type\":\"miniprogram\",\"name\":\"积分商城\",\"url\":\"https:\\/\\/shop.shouyinbei.net\\/addons\\/we7_wmall\\/template\\/vue\\/index.html?menu=#\\/pages\\/creditshop\\/index?i=1\",\"appid\":\"wx00f4ba80787fbdbb\",\"pagepath\":\"pages\\/creditshop\\/index\"},{\"type\":\"miniprogram\",\"name\":\"优惠券\",\"url\":\"https:\\/\\/shop.shouyinbei.net\\/addons\\/we7_wmall\\/template\\/vue\\/index.html?menu=#\\/pages\\/channel\\/coupon?i=1\",\"appid\":\"wx00f4ba80787fbdbb\",\"pagepath\":\"pages\\/channel\\/coupon\"},{\"type\":\"miniprogram\",\"name\":\"天天特价\",\"url\":\"https:\\/\\/shop.shouyinbei.net\\/addons\\/we7_wmall\\/template\\/vue\\/index.html?menu=#\\/plugin\\/pages\\/bargain\\/index?i=1\",\"appid\":\"wx00f4ba80787fbdbb\",\"pagepath\":\"pages\\/bargain\\/index\"},{\"type\":\"miniprogram\",\"name\":\"拼团抢购\",\"url\":\"https:\\/\\/shop.shouyinbei.net\\/addons\\/we7_wmall\\/template\\/vue\\/index.html?menu=#\\/gohome\\/pages\\/home\\/index?i=1\",\"appid\":\"wx00f4ba80787fbdbb\",\"pagepath\":\"gohome\\/pages\\/home\\/index\"}]},{\"type\":\"miniprogram\",\"name\":\"同城信息\",\"url\":\"https:\\/\\/shop.shouyinbei.net\\/addons\\/we7_wmall\\/template\\/vue\\/index.html?menu=#\\/gohome\\/pages\\/tongcheng\\/index?i=1\",\"appid\":\"wx00f4ba80787fbdbb\",\"pagepath\":\"gohome/pages/tongcheng/index\"},{\"name\":\"更多服务\",\"sub_button\":[{\"type\":\"miniprogram\",\"name\":\"会员卡\",\"url\":\"https:\\/\\/shop.shouyinbei.net\\/addons\\/we7_wmall\\/template\\/vue\\/index.html?menu=#\\/pages\\/home\\/index?i=1\",\"appid\":\"wx00f4ba80787fbdbb\",\"pagepath\":\"pages\\/card\\/mine\"},{\"type\":\"click\",\"name\":\"商户入驻\",\"key\":\"syb_settle\"},{\"type\":\"view\",\"name\":\"广告合作\",\"url\":\"https://jinshuju.net/f/Kwn8TI\"},{\"type\":\"click\",\"name\":\"在线客服\",\"key\":\"syb_service\"}]}]}";
+			String json = HttpUtil.HttpPostWithJson("https://api.weixin.qq.com/cgi-bin/menu/create?access_token=" + accessToken + "", string);
+			System.out.println("=================创建菜单结果==========>"+json);
+		}
+	}
+
+	private static void getMenu() throws Exception {
+		String accessToken = getAccessToken();
+		String url = "https://api.weixin.qq.com/cgi-bin/get_current_selfmenu_info?access_token=" + accessToken;
+		System.out.println("==========token=============>"+accessToken);
+		HttpResult doPost = HttpUtil.doGet(url, null);
+		String body = doPost.getBody();
+		System.out.println("json=================>"+body);
+	}
+	//
+
+	/**
+	 * 
+	 * deleteMenu:(删除菜单). <br/>
+	 * 
+	 *
+	 * @author Administrator
+	 * @return
+	 * @throws Exception
+	 * @since JDK 1.8
+	 */
+	@RequestMapping(value = "/deleteMenu", method = RequestMethod.GET)
+	public String deleteMenu() throws Exception {
+		String accessToken = getAccessToken();
+		if (StringUtil.isNotEmpty(accessToken)) {
+			HttpResult doPost = HttpUtil.doGet("https://api.weixin.qq.com/cgi-bin/menu/delete?access_token=" + accessToken + "", null);
+			return JSONObject.toJSONString(doPost);
+		}
+		return null;
+	}
+	
+	
+
+
+}
diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/util/JwtUtils.java b/pluss-manage-page/src/main/java/cn/pluss/platform/util/JwtUtils.java
new file mode 100644
index 0000000..731c5df
--- /dev/null
+++ b/pluss-manage-page/src/main/java/cn/pluss/platform/util/JwtUtils.java
@@ -0,0 +1,37 @@
+package cn.pluss.platform.util;
+
+import cn.hutool.jwt.JWT;
+import cn.hutool.jwt.JWTUtil;
+import cn.pluss.platform.entity.UserInfo;
+
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author DJH
+ */
+public class JwtUtils {
+
+    public static String getToken(UserInfo userInfo) {
+        Map<String, Object> map = new HashMap<String, Object>() {
+            private static final long serialVersionUID = 1L;
+            {
+                put("uid", userInfo.getId());
+                put("loginName", userInfo.getLoginName());
+                put("expire_time", System.currentTimeMillis() + 1000 * 3600 * 24 * 3);
+            }
+        };
+        return JWTUtil.createToken(map, userInfo.getId().toString().getBytes(StandardCharsets.UTF_8));
+    }
+
+    public static boolean verify(String token, String userId) {
+        return JWTUtil.verify(token, userId.getBytes(StandardCharsets.UTF_8));
+    }
+
+    public static Object get(String key, String token) {
+        final JWT jwt = JWTUtil.parseToken(token);
+
+        return jwt.getPayload(key);
+    }
+}
diff --git a/pluss-manage-page/src/main/resources/application-dev.yml b/pluss-manage-page/src/main/resources/application-dev.yml
new file mode 100644
index 0000000..64711c0
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/application-dev.yml
@@ -0,0 +1,13 @@
+spring:
+  datasource:
+    druid:
+    url: jdbc:mysql://60.205.224.68:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8
+    username: root
+    password: CZGmysqlroot@123
+    driver-class-name: com.mysql.jdbc.Driver
+logging:
+  config: classpath:log4j2-dev.xml
+
+ip:
+  config:
+    enabled: false
diff --git a/pluss-manage-page/src/main/resources/application-prod.yml b/pluss-manage-page/src/main/resources/application-prod.yml
new file mode 100644
index 0000000..60216e2
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/application-prod.yml
@@ -0,0 +1,17 @@
+spring:
+  datasource:
+    druid:
+      url:
+      username:
+      password:
+      driver-class-name: com.mysql.jdbc.Driver
+
+scheduling:
+  enabled: true
+
+ip:
+  config:
+    enabled: true
+
+logging:
+  config: classpath:log4j2-prod.xml
diff --git a/pluss-manage-page/src/main/resources/application-test.yml b/pluss-manage-page/src/main/resources/application-test.yml
new file mode 100644
index 0000000..7a0c050
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/application-test.yml
@@ -0,0 +1,10 @@
+spring:
+  datasource:
+    druid:
+      url:
+      username:
+      password:
+      driver-class-name: com.mysql.jdbc.Driver
+
+parameter:
+  domain:
diff --git a/pluss-manage-page/src/main/resources/application.yml b/pluss-manage-page/src/main/resources/application.yml
new file mode 100644
index 0000000..978381b
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/application.yml
@@ -0,0 +1,33 @@
+spring:
+  profiles:
+    include: common, ryx, ys
+    active: dev
+  servlet:
+    multipart:
+      max-file-size: 100MB
+      #设置总上传的数据大小
+      max-request-size: 1000MB
+
+  mvc:
+    view:
+      prefix: /WEB-INF/jsp/
+      suffix: .jsp
+  resources:
+    static-locations: classpath:/static/,classpath:/public/,file:/home/syb/resources/manage/
+  task:
+    execution:
+      thread-name-prefix: async-
+      pool:
+        core-size: 8
+        max-size: 20
+        keep-alive: 60s
+        queue-capacity: 50
+
+    scheduling:
+      pool:
+        size: 10
+
+server:
+  port: 8083
+  servlet:
+    context-path: /manage
diff --git a/pluss-manage-page/src/main/resources/log4j2-dev.xml b/pluss-manage-page/src/main/resources/log4j2-dev.xml
new file mode 100644
index 0000000..6ee9fb0
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/log4j2-dev.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--日志级别以及优先级排序: OFF > FATAL > ERROR > WARN > INFO > DEBUG > TRACE > ALL -->
+<!--Configuration后面的status，这个用于设置log4j2自身内部的信息输出，可以不设置，当设置成trace时，你会看到log4j2内部各种详细输出-->
+<!--monitorInterval：Log4j能够自动检测修改配置 文件和重新配置本身，设置间隔秒数-->
+<configuration status="WARN" monitorInterval="30">
+    <!--先定义所有的appender-->
+    <appenders>
+        <!--这个输出控制台的配置-->
+        <console name="Console" target="SYSTEM_OUT">
+            <!--输出日志的格式-->
+            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p - %c{1.} - %m%n"/>
+        </console>
+        <!--文件会打印出所有信息，这个log每次运行程序会自动清空，由append属性决定，这个也挺有用的，适合临时测试用-->
+        <File name="log" fileName="${sys:user.home}/manage/logs/manage.log" append="false">
+            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %c{1.} - %msg%xEx%n" />
+        </File>
+        <!--<File name="log" fileName="d:/crystal/logs/manage.log" append="false">
+            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %class{36} %c - %msg%xEx%n" />
+        </File>-->
+        <!-- 这个会打印出所有的info及以下级别的信息，每次大小超过size，则这size大小的日志会自动存入按年份-月份建立的文件夹下面并进行压缩，作为存档-->
+        <RollingFile name="RollingFileInfo" fileName="${sys:user.home}/syb/logs/info.log"
+                     filePattern="${sys:user.home}/syb/logs/$${date:yyyy-MM}/info-%d{yyyy-MM-dd}-%i.log">
+            <!--控制台只输出level及以上级别的信息（onMatch），其他的直接拒绝（onMismatch）-->
+            <ThresholdFilter level="info" onMatch="ACCEPT" onMismatch="DENY"/>
+            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss:SSS} %p - %c{1.} - %m%n"/>
+            <Policies>
+                <TimeBasedTriggeringPolicy modulate="true" interval="1"/>
+                <SizeBasedTriggeringPolicy size="100 MB"/>
+            </Policies>
+        </RollingFile>
+        <RollingFile name="RollingFileWarn" fileName="${sys:user.home}/syb/logs/warn.log"
+                     filePattern="${sys:user.home}/syb/logs/$${date:yyyy-MM}/warn-%d{yyyy-MM-dd}-%i.log">
+            <ThresholdFilter level="warn" onMatch="ACCEPT" onMismatch="DENY"/>
+            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss:SSS} %p - %c{1.} - %m%n"/>
+            <Policies>
+                <TimeBasedTriggeringPolicy modulate="true" interval="1"/>
+                <SizeBasedTriggeringPolicy size="100 MB"/>
+            </Policies>
+            <!-- DefaultRolloverStrategy属性如不设置，则默认为最多同一文件夹下7个文件，这里设置了20 -->
+            <DefaultRolloverStrategy max="20"/>
+        </RollingFile>
+        <RollingFile name="RollingFileError" fileName="${sys:user.home}/syb/logs/error.log"
+                     filePattern="${sys:user.home}/syb/logs/$${date:yyyy-MM}/error-%d{yyyy-MM-dd}-%i.log">
+            <ThresholdFilter level="error" onMatch="ACCEPT" onMismatch="DENY"/>
+            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss:SSS} %p - %c{1.} - %m%n"/>
+            <Policies>
+                <TimeBasedTriggeringPolicy modulate="true" interval="1"/>
+                <SizeBasedTriggeringPolicy size="100 MB"/>
+            </Policies>
+        </RollingFile>
+    </appenders>
+    <!--然后定义logger，只有定义了logger并引入的appender，appender才会生效-->
+    <loggers>
+        <!--过滤掉spring和mybatis的一些无用的DEBUG信息-->
+        <logger name="cn.pluss.platform.mapper" level="DEBUG"></logger>
+        <logger name="cn.pluss.platform.ryx" level="DEBUG"></logger>
+
+        <root level="DEBUG">
+            <appender-ref ref="Console"/>
+        </root>
+    </loggers>
+</configuration>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/log4j2-prod.xml b/pluss-manage-page/src/main/resources/log4j2-prod.xml
new file mode 100644
index 0000000..41b9ecb
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/log4j2-prod.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--日志级别以及优先级排序: OFF > FATAL > ERROR > WARN > INFO > DEBUG > TRACE > ALL -->
+<!--Configuration后面的status，这个用于设置log4j2自身内部的信息输出，可以不设置，当设置成trace时，你会看到log4j2内部各种详细输出-->
+<!--monitorInterval：Log4j能够自动检测修改配置 文件和重新配置本身，设置间隔秒数-->
+<configuration status="WARN" monitorInterval="30">
+    <!--先定义所有的appender-->
+    <appenders>
+        <!--这个输出控制台的配置-->
+        <console name="Console" target="SYSTEM_OUT">
+            <!--输出日志的格式-->
+            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p - %c{1.} - %m%n"/>
+        </console>
+        <!--文件会打印出所有信息，这个log每次运行程序会自动清空，由append属性决定，这个也挺有用的，适合临时测试用-->
+        <File name="log" fileName="${sys:user.home}/manage/logs/manage.log" append="false">
+            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %c{1.} - %msg%xEx%n" />
+        </File>
+        <!--<File name="log" fileName="d:/crystal/logs/manage.log" append="false">
+            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %class{36} %c - %msg%xEx%n" />
+        </File>-->
+        <!-- 这个会打印出所有的info及以下级别的信息，每次大小超过size，则这size大小的日志会自动存入按年份-月份建立的文件夹下面并进行压缩，作为存档-->
+        <RollingFile name="RollingFileInfo" fileName="${sys:user.home}/syb/logs/info.log"
+                     filePattern="${sys:user.home}/syb/logs/$${date:yyyy-MM}/info-%d{yyyy-MM-dd}-%i.log">
+            <!--控制台只输出level及以上级别的信息（onMatch），其他的直接拒绝（onMismatch）-->
+            <ThresholdFilter level="info" onMatch="ACCEPT" onMismatch="DENY"/>
+            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss:SSS} %p - %c{1.} - %m%n"/>
+            <Policies>
+                <TimeBasedTriggeringPolicy modulate="true" interval="1"/>
+                <SizeBasedTriggeringPolicy size="100 MB"/>
+            </Policies>
+        </RollingFile>
+        <RollingFile name="RollingFileWarn" fileName="${sys:user.home}/syb/logs/warn.log"
+                     filePattern="${sys:user.home}/syb/logs/$${date:yyyy-MM}/warn-%d{yyyy-MM-dd}-%i.log">
+            <ThresholdFilter level="warn" onMatch="ACCEPT" onMismatch="DENY"/>
+            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss:SSS} %p - %c{1.} - %m%n"/>
+            <Policies>
+                <TimeBasedTriggeringPolicy modulate="true" interval="1"/>
+                <SizeBasedTriggeringPolicy size="100 MB"/>
+            </Policies>
+            <!-- DefaultRolloverStrategy属性如不设置，则默认为最多同一文件夹下7个文件，这里设置了20 -->
+            <DefaultRolloverStrategy max="20"/>
+        </RollingFile>
+        <RollingFile name="RollingFileError" fileName="${sys:user.home}/syb/logs/error.log"
+                     filePattern="${sys:user.home}/syb/logs/$${date:yyyy-MM}/error-%d{yyyy-MM-dd}-%i.log">
+            <ThresholdFilter level="error" onMatch="ACCEPT" onMismatch="DENY"/>
+            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss:SSS} %p - %c{1.} - %m%n"/>
+            <Policies>
+                <TimeBasedTriggeringPolicy modulate="true" interval="1"/>
+                <SizeBasedTriggeringPolicy size="100 MB"/>
+            </Policies>
+        </RollingFile>
+    </appenders>
+    <!--然后定义logger，只有定义了logger并引入的appender，appender才会生效-->
+    <loggers>
+        <!--过滤掉spring和mybatis的一些无用的DEBUG信息-->
+        <!--        <logger name="org.apache.shiro" level="INFO"></logger>-->
+        <!--        <logger name="org.springframework" level="INFO"></logger>-->
+        <!--        <logger name="com.baomidou.mybatisplus.core.MybatisConfiguration" level="INFO"></logger>-->
+        <!--        <logger name="com.baomidou.mybatisplus.core.MybatisConfiguration" level="INFO"></logger>-->
+        <!--        <logger name="com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean" level="INFO"></logger>-->
+        <!--        <logger name="org.springframework.web.servlet.mvc.method.annotation.RequestResponseBodyMethodProcessor" level="INFO"></logger>-->
+        <!--        <logger name="org.mybatis" level="INFO" ></logger>-->
+        <!--        <logger name="cn.pluss.platform.mapper" level="DEBUG"></logger>-->
+        <!--        <logger name="org.apache.http.wire" level="INFO"></logger>-->
+        <!--        <logger name="org.apache.http.headers" level="INFO"></logger>-->
+        <root level="INFO">
+            <appender-ref ref="Console"/>
+<!--            <appender-ref ref="RollingFileInfo"/>-->
+<!--            <appender-ref ref="RollingFileWarn"/>-->
+<!--            <appender-ref ref="RollingFileError"/>-->
+        </root>
+    </loggers>
+</configuration>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/activityActivate/activityActivateDetails.js b/pluss-manage-page/src/main/resources/static/resources/activityActivate/activityActivateDetails.js
new file mode 100644
index 0000000..cdb777b
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/activityActivate/activityActivateDetails.js
@@ -0,0 +1,177 @@
+/**
+ * create by robot 
+ * date Thu Sep 12 16:16:36 CST 2019 
+ */ 
+
+$(document).ready(function(){
+	//form表单样式
+	layui.use(['layer', 'form'], function() {
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+	
+	//日历控件
+	layui.use(['layer', 'laydate'], function() {
+		var layer = layui.layer;
+		laydate = layui.laydate;
+		laydate.render({
+		elem: '#date1' //指定元素
+		});
+		laydate.render({
+			elem: '#date2' //指定元素
+		});
+	});
+	
+	//li 切换事件
+	$(".nav-tabs>li").click(function() {
+		var index = $(".nav-tabs>li").index(this);
+		$(this).addClass("active").siblings("li").removeClass("active");
+		
+	})
+	//弹出一个提示层
+	$('.fa-save').on('click', function() {
+		saveActivityActivate();
+	});
+
+	//绑定标签栏事件
+	$(document).on('click','.nav-tabs li',function(){
+
+		var action =$(this).data('action');
+		 switch (action) {
+			case "base"://基本资料
+				goBase();
+				break;  
+			case "functions"://多功能
+				goFunctions();
+				break;
+			case "extends"://扩展    
+				goExtends();         
+				break;           
+		 }
+	})
+
+	//加载第一个标签
+	$('.nav-tabs li').eq(0).click();
+	
+});
+
+
+//跳转基本信息 
+function goBase(){
+	var url=ctx+'/activityActivate/queryActivityActivateBaseInfo?id='+$('#activityActivateId').val();
+	$('.tab-content').load(url);
+	              
+}
+//跳转多功能输入
+function goFunctions(){ 
+	var url=ctx+'/activityActivate/queryActivityActivateFunctionsInfo?id='+$('#activityActivateId').val();
+	$('.tab-content').load(url);  
+	
+}
+//跳转到扩展   
+function goExtends(){
+	
+	var url=ctx+'/activityActivate/queryActivityActivateExtendsInfo?id='+$('#activityActivateId').val();
+	$('.tab-content').load(url);          
+}  
+  
+
+ 
+//保存
+function saveActivityActivate(){
+	
+	var isAdmin=$("#isAdmin").val();
+	if(isAdmin=='1'){
+		var merchantCode=$("#merchantCode option:selected").val();
+		if(StringUtil.isBlank(merchantCode)){
+			layer.msg('请选择商户');
+			return;
+		}
+	}
+	var storeId=$("#storeId option:selected").val();
+	if(StringUtil.isBlank(storeId)){
+		layer.msg('请选择门店');
+		return;
+	}
+	
+	var name=$("#name").val();
+	if(StringUtil.isBlank(name)){
+		layer.msg('请输入活动名称');
+		return;
+	}
+	var giveMoney=$("#giveMoney").val();
+	if(StringUtil.isNotJustIntgerAndDecimals2(giveMoney)){
+		if(StringUtil.isBlank(giveMoney)){
+			layer.msg('请输入激活赠送金额');
+			return;
+		}
+		layer.msg('请输入正确的激活赠送金额(正整数或小数（保留两位小数）)');
+		return;
+	}
+	
+	if(StringUtil.isNotBlank(giveMoney)){
+		if(giveMoney<0.01){
+			layer.msg('激活赠送金额必须大于0.01');
+			return;
+		}
+	}
+	
+	
+	$(".fa-save").attr("disabled","disabled");
+	$('.fa-save').html('正在保存...')
+	$.ajax({
+		url:ctx+"/activityActivate/saveActivityActivate",
+		type:"POST",
+		dataType:'json',
+		data:$("#data_form").serializeArray(),
+		complete:function(){
+			$(".fa-save").removeAttr("disabled");
+			$('.fa-save').html('保存')
+		},        
+		success:function(service){ 
+		
+			layer.confirm('保存成功,是否前往列表？', {
+				  btn: ['确认','取消'] //按钮
+				}, function(){
+					$('#goback span').trigger('click'); 
+				}, function(){         
+					layer.closeAll();
+			});  
+			
+		}
+	});  
+}
+
+//onchange商户
+$(function(){
+	layui.use(['layer', 'form'], function() {
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+		form.on('select(selectMerchantCode)', function(data){
+			var merchantCode=data.value;
+			$.ajax({
+				url:ctx+'/merchantMenber/getStoreByMerchantCode',
+				type:'post',
+				dataType:'json',
+				data:{
+					'merchantCode':merchantCode,
+				},
+				success:function(result){
+					var storeList=result.merchantStoreList;
+					$("#storeId").empty();
+					var data='';
+					data+='<option value="">请选择</option>';
+					for (var i = 0; i < storeList.length; i++) {
+						data+='<option value='+storeList[i].storeId+'>'+storeList[i].storeName+'</option>'
+					}
+					$("#storeId").append(data);
+					form.render("select");
+				}
+			})
+		})
+	})
+});
+ 
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/activityActivate/activityActivateList.js b/pluss-manage-page/src/main/resources/static/resources/activityActivate/activityActivateList.js
new file mode 100644
index 0000000..c72368e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/activityActivate/activityActivateList.js
@@ -0,0 +1,318 @@
+/**
+ * create by robot
+ * date Thu Sep 12 16:16:36 CST 2019
+ */
+
+var pageIndex = 1;
+$(document).ready(function () {
+    //调用查询
+    pageIndex = StringUtil.getQueryString('pageIndex');
+    if (pageIndex == undefined || pageIndex == null) {
+        pageIndex = 1;
+    }
+    queryActivityActivate(pageIndex);
+    //绑定hover操作
+    $(document).on('mouseenter', '.listOperaters', function () {
+        $(this).children(".ops_itemDiv").show();
+        var width = 15;
+        $(this).children('div').find('li').each(function () {
+            //获取li宽度
+            width += $(this).width();
+        });
+        $(this).children('div').width(width);
+    })
+    $(document).on('mouseleave', '.listOperaters', function () {
+        $(this).children(".ops_itemDiv").hide();
+    });
+
+    //日历控件
+    layui.use(['layer', 'laydate'], function () {
+        var layer = layui.layer;
+        laydate = layui.laydate;
+        laydate.render({
+            elem: '#date1' //指定元素
+        });
+        laydate.render({
+            elem: '#date2' //指定元素
+        });
+    });
+
+
+    //行选中事件
+    $("#allCheck").find("span").click(function () {
+        $(this).toggleClass('checked');
+        if ($(this).hasClass('checked')) {
+            //所有列选中
+            $(".checker").find("span").each(function () {
+                $(this).addClass("checked");
+            })
+        } else {
+            //所有列取消选中
+            $(".checker").find("span").each(function () {
+                $(this).removeClass("checked");
+            })
+        }
+    });
+
+    //单个选中
+    $(document).on('click', '.checkeBox span', function () {
+        $(this).toggleClass('checked');
+        //设置头部事件
+        var length = $('.checkeBox span').length;
+        var count = 0;
+        $(".checkeBox").find("span").each(function () {
+            if ($(this).hasClass("checked")) {
+                count++;
+            }
+        })
+        //全选
+        if (count == length) {
+            $("#allCheck").find("span").addClass('checked');
+        } else {
+            $("#allCheck").find("span").removeClass('checked');
+        }
+    })
+    //左右div高度相等
+    var left_content_height = $(".right-content").height();
+    $(".left-content").height(left_content_height + 35);
+    var sub_left_height = $(".res-menu").height(left_content_height - 60);
+});
+
+//查询
+function queryActivityActivate(index) {
+    if (typeof (index) == 'undefined') {
+        index = 1;
+    }
+    var url = ctx + '/activityActivate/queryActivityActivateByPage';
+    $.ajax({
+        url: url,
+        type: "post",
+        dataType: "json",
+        data: {
+            "currPage": index,
+            "name": $("#name").val(),
+        },
+        success: function (result) {
+            //渲染数据
+            $('#data_content').empty();
+            var header = '';
+            $.each(result.activityActivateList, function (i) {
+                var activityActivate = result.activityActivateList[i];
+                var data = '';
+                data += '<tr class="odd">';
+                data += '<td class="textc">';
+                data += '		 <div class="checker checkeBox">';
+                data += '		 <span class=""  data-id="' + activityActivate.id + '"><input type="checkbox"  value=""></span>';
+                data += '		</div>';
+                data += '</td>';
+                data += '<td class="textc">' + activityActivate.id + '</td>';
+                data += '<td class="textc">' + activityActivate.name + '</td>';
+                data += '<td class="textc">' + activityActivate.giveMoney.toFixed(2) + '</td>';
+                var merchantName = '';
+                if (StringUtil.isNotBlank(activityActivate.merchantName)) {
+                    merchantName = activityActivate.merchantName;
+                }
+                data += '<td class="textc">' + merchantName + '</td>';
+                var storeName = '';
+                if (StringUtil.isNotBlank(activityActivate.storeName)) {
+                    storeName = activityActivate.storeName;
+                }
+                data += '<td class="textc">' + storeName + '</td>';
+                var createDt = '';
+                if (StringUtil.isNotBlank(activityActivate.createDt)) {
+                    createDt = dateFtt("yyyy-MM-dd hh:mm:ss", new Date(activityActivate.createDt));
+                }
+                data += '<td class="textc">' + createDt + '</td>';
+                data += '<td class="textc">';
+                //管理员或商户能进行的操作
+                if (result.admin == 'admin' || result.userType == 'merchant') {
+					data += '<div class="positionr listOperaters">';
+					data += '		<a href="javascript:void(0);"  class="icon-large dlblock w16 h16"><img src="' + resourcePath + '/images/angle-down.png"/></a>';
+					data += '		<div class="ops_box ops_itemDiv positiona clearfix whitebg">';
+					data += '			<ul>';
+					data += '				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="otherActivityActivateDetails(' + activityActivate.id + ')" class="layui-btn layui-btn-sm layui-btn-radius fa fa-detail ops_more f12">详情</a></li>';
+					data += '			</ul>';
+					data += '		</div>';
+					data += '</div>';
+                    //其它用户能进行的操作
+                } else {
+					data += '<div class="positionr listOperaters">';
+					data += '		<a href="javascript:void(0);"  class="icon-large dlblock w16 h16"><img src="' + resourcePath + '/images/angle-down.png"/></a>';
+					data += '		<div class="ops_box ops_itemDiv positiona clearfix whitebg">';
+					data += '			<ul>';
+					data += '				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showActivityActivateDetails(' + activityActivate.id + ')" class="layui-btn layui-btn-sm layui-btn-radius fa fa-edit ops_more f12">编辑</a></li>';
+					data += '				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="initDeleteActivityActivate(' + activityActivate.id + ')" class="layui-btn layui-btn-sm layui-btn-radius layui-btn-danger fa fa-remove ops_more f12">删除</a></li>';
+					data += '			</ul>';
+					data += '		</div>';
+					data += '</div>';
+                }
+                data += '</td>';
+                data += '</tr>';
+                $('#data_content').append(data);
+            });
+            //分页
+            $('#pageCount').html(result.pageCount);
+            $('#currPage').html(result.currPage);
+            $('#totalCount').html(result.count);
+            //设置分页
+            pageIndex = result.currPage;
+            $('#pagination').pagination({
+                pageCount: result.pageCount,
+                jump: true,
+                coping: true,
+                jump: true,
+                homePage: '首页',
+                endPage: '末页',
+                prevContent: '上页',
+                nextContent: '下页',
+                current: result.currPage,
+                callback: function (api) {
+                    pageIndex = api.getCurrent();
+                    queryActivityActivate(api.getCurrent());
+                }
+            });
+        }
+    });
+    //表头列不选中
+    $("#allCheck").find("span").removeClass('checked');
+}
+
+//初始化新增
+function initAddActivityActivate() {
+    window.location = ctx + '/activityActivate/queryActivityActivateDetails?pageIndex=' + pageIndex;
+}
+
+//初始化修改
+function showActivityActivateDetails(id) {
+    window.location = ctx + '/activityActivate/queryActivityActivateDetails?id=' + id + '&pageIndex=' + pageIndex;
+}
+
+//初始化删除
+function initDeleteActivityActivate(id) {
+
+    layer.open({
+        type: 1,
+        closeBtn: 1, title: '提示',
+        offset: 'm', //具体配置参考：offset参数项
+        area: ['300px', '180px'],
+        content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+        btn: ['确认', '取消'],
+        btnAlign: 'r', //按钮居中
+        shade: 0.3,//不显示遮罩
+        yes: function () {
+            layer.closeAll();
+            deleteActivityActivate(id, true);
+        }
+    });
+}
+
+//删除
+function deleteActivityActivate(id, showMsg) {
+    $.ajax({
+        url: ctx + '/activityActivate/deleteActivityActivate',
+        data: [{
+            name: 'id',
+            value: id
+        }],
+        type: 'POST',
+        dataType: 'json',
+        success: function () {
+            queryActivityActivate(pageIndex);
+            if (showMsg) {
+                layer.msg('删除成功!');
+            }
+        }
+    });
+}
+
+//头部编辑
+function initEditActivityActivate() {
+    var count = 0;
+    var id = 0;
+    $(".checkeBox").find("span").each(function () {
+        if ($(this).hasClass("checked")) {
+            count++;
+            id = $(this).data('id');
+        }
+    })
+    if (count > 1) {
+        layer.msg('只能选中一行记录进行操作!');
+        return;
+    }
+    if (count == 0) {
+        layer.msg('请选中一行记录!');
+        return;
+    }
+    if (id > 0) {
+        showActivityActivateDetails(id);
+    }
+}
+
+//头部删除
+function initBatchDeleteActivityActivate() {
+    var count = 0;
+    $(".checkeBox").find("span").each(function () {
+        if ($(this).hasClass("checked")) {
+            count++;
+        }
+    })
+
+    if (count == 0) {
+        layer.msg('请选中一行记录!');
+        return;
+    }
+
+
+    layer.open({
+        type: 1,
+        closeBtn: 1,
+        title: '提示',
+        offset: 'm', //具体配置参考：offset参数项
+        area: ['300px', '180px'],
+        content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+        btn: ['确认', '取消'],
+        btnAlign: 'r', //按钮居中
+        shade: 0.3, //不显示遮罩
+        yes: function () {
+            layer.closeAll();
+            deleteBatchActivityActivate();
+        }
+    });
+
+}
+
+//批量删除
+function deleteBatchActivityActivate() {
+
+    $(".checkeBox").find("span").each(function () {
+        if ($(this).hasClass("checked")) {
+            var id = $(this).data('id');
+            deleteActivityActivate(id, false);
+            layer.msg('删除成功!');
+        }
+    })
+}
+
+//其它用户查看详情
+function otherActivityActivateDetails(id) {
+    window.location = ctx + '/activityActivate/otherActivityActivateDetails?id=' + id + '&pageIndex=' + pageIndex;
+}
+
+//时间格式化处理
+function dateFtt(fmt, date) { //author: meizz
+    var o = {
+        "M+": date.getMonth() + 1,                 //月份
+        "d+": date.getDate(),                    //日
+        "h+": date.getHours(),                   //小时
+        "m+": date.getMinutes(),                 //分
+        "s+": date.getSeconds(),                 //秒
+        "q+": Math.floor((date.getMonth() + 3) / 3), //季度
+        "S": date.getMilliseconds()             //毫秒
+    };
+    if (/(y+)/.test(fmt))
+        fmt = fmt.replace(RegExp.$1, (date.getFullYear() + "").substr(4 - RegExp.$1.length));
+    for (var k in o)
+        if (new RegExp("(" + k + ")").test(fmt))
+            fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
+    return fmt;
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/activityConsumReturn/activityConsumReturnDetails.js b/pluss-manage-page/src/main/resources/static/resources/activityConsumReturn/activityConsumReturnDetails.js
new file mode 100644
index 0000000..0fcc888
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/activityConsumReturn/activityConsumReturnDetails.js
@@ -0,0 +1,259 @@
+/**
+ * create by robot 
+ * date Thu Sep 12 16:16:36 CST 2019 
+ */ 
+
+$(document).ready(function(){
+	//form表单样式
+	layui.use(['layer', 'form'], function() {
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+	
+	//日历控件
+	layui.use(['layer', 'laydate'], function() {
+		var layer = layui.layer;
+		laydate = layui.laydate;
+		laydate.render({
+		elem: '#date1' //指定元素
+		});
+		laydate.render({
+			elem: '#date2' //指定元素
+		});
+	});
+	
+	//li 切换事件
+	$(".nav-tabs>li").click(function() {
+		var index = $(".nav-tabs>li").index(this);
+		$(this).addClass("active").siblings("li").removeClass("active");
+		
+	})
+	//弹出一个提示层
+	$('.fa-save').on('click', function() {
+		saveActivityConsumReturn();
+	});
+
+	//绑定标签栏事件
+	$(document).on('click','.nav-tabs li',function(){
+
+		var action =$(this).data('action');
+		 switch (action) {
+			case "base"://基本资料
+				goBase();
+				break;  
+			case "functions"://多功能
+				goFunctions();
+				break;
+			case "extends"://扩展    
+				goExtends();         
+				break;           
+		 }
+	})
+
+	//加载第一个标签
+	$('.nav-tabs li').eq(0).click();
+	
+});
+
+
+//跳转基本信息 
+function goBase(){
+	var url=ctx+'/activityConsumReturn/queryActivityConsumReturnBaseInfo?id='+$('#activityConsumReturnId').val();
+	$('.tab-content').load(url);
+	              
+}
+//跳转多功能输入
+function goFunctions(){ 
+	var url=ctx+'/activityConsumReturn/queryActivityConsumReturnFunctionsInfo?id='+$('#activityConsumReturnId').val();
+	$('.tab-content').load(url);  
+	
+}
+//跳转到扩展   
+function goExtends(){
+	
+	var url=ctx+'/activityConsumReturn/queryActivityConsumReturnExtendsInfo?id='+$('#activityConsumReturnId').val();
+	$('.tab-content').load(url);          
+}  
+  
+
+ 
+//保存
+function saveActivityConsumReturn(){
+	var isAdmin=$("#isAdmin").val();
+	if(isAdmin=='1'){
+		var merchantCode=$("#merchantCode option:selected").val();
+		if(StringUtil.isBlank(merchantCode)){
+			layer.msg('请选择商户');
+			return;
+		}
+	}
+	var storeId=$("#storeId option:selected").val();
+	if(StringUtil.isBlank(storeId)){
+		layer.msg('请选择门店');
+		return;
+	}
+	
+	var name=$("#name").val();
+	if(StringUtil.isBlank(name)){
+		layer.msg('请输入活动名称');
+		return;
+	}
+	var type=$("#type option:selected").val();
+	var percent=$("#percent").val();
+	if(type=='2'){
+		if(StringUtil.isNotOneBT(percent)){
+			if(StringUtil.isBlank(percent)){
+				layer.msg('请输入百分比返现比例');
+				return;
+			}
+			layer.msg('请输入正确百分比返现比例');
+			return;
+		}
+	}
+	var comsumeMoney=$("#comsumeMoney").val();
+	if(StringUtil.isNotJustIntgerAndDecimals2(comsumeMoney)){
+		if(StringUtil.isBlank(comsumeMoney)){
+			layer.msg('请输入消费金额');
+			return;
+		}
+		layer.msg('请输入正确的消费金额(正整数或小数(保留两位小数))');
+		return;
+	}
+	
+	if(StringUtil.isNotBlank(comsumeMoney)){
+		if(comsumeMoney<0.01){
+			layer.msg('消费金额必须大于0.01');
+			return;
+		}
+	}
+	var returnMoney=$("#returnMoney").val();
+	
+	if(StringUtil.isNotJustIntgerAndDecimals2(returnMoney)){
+		if(StringUtil.isBlank(returnMoney)){
+			layer.msg('请输入返现金额');
+			return;
+		}
+		layer.msg('请输入正确的返现金额(正整数或小数(保留两位小数))');
+		return;
+	}
+	
+	if(StringUtil.isNotBlank(returnMoney)){
+		if(returnMoney<0.01){
+			layer.msg('返现金额必须大于0.01');
+			return;
+		}
+	}
+	
+	if(StringUtil.isNotBlank(returnMoney)){
+		if(parseInt(returnMoney)>parseInt(comsumeMoney)){
+			layer.msg('返现金额必须小于消费金额');
+			return;
+		}
+	}
+	var timeType=$("#timeType option:selected").val();
+	var date1=$("#date1").val();
+	var date2=$("#date2").val();
+	if(timeType=='1'){
+		if(StringUtil.isBlank(date1)){
+			layer.msg('请输入开始时间');
+			return;
+		}
+		if(StringUtil.isBlank(date2)){
+			layer.msg('请输入结束时间');
+			return;
+		}
+	}
+	 
+	$(".fa-save").attr("disabled","disabled");
+	$('.fa-save').html('正在保存...')
+	$.ajax({
+		url:ctx+"/activityConsumReturn/saveActivityConsumReturn",
+		type:"POST",
+		dataType:'json',
+		data:$("#data_form").serializeArray(),
+		complete:function(){
+			$(".fa-save").removeAttr("disabled");
+			$('.fa-save').html('保存')
+		},        
+		success:function(service){ 
+		
+			layer.confirm('保存成功,是否前往列表？', {
+				  btn: ['确认','取消'] //按钮
+				}, function(){
+					$('#goback span').trigger('click'); 
+				}, function(){         
+					layer.closeAll();
+			});  
+			
+		}
+	});  
+}
+
+//onchange商户
+$(function(){
+	layui.use(['layer', 'form'], function() {
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+		form.on('select(selectMerchantCode)', function(data){
+			var merchantCode=data.value;
+			$.ajax({
+				url:ctx+'/merchantMenber/getStoreByMerchantCode',
+				type:'post',
+				dataType:'json',
+				data:{
+					'merchantCode':merchantCode,
+				},
+				success:function(result){
+					var storeList=result.merchantStoreList;
+					$("#storeId").empty();
+					var data='';
+					data+='<option value="">请选择</option>';
+					for (var i = 0; i < storeList.length; i++) {
+						data+='<option value='+storeList[i].storeId+'>'+storeList[i].storeName+'</option>'
+					}
+					$("#storeId").append(data);
+					form.render("select");
+				}
+			})
+		})
+	});
+	
+	layui.use(['layer', 'form'], function() {
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+		form.on('select(selectTimeType)', function(data){
+			var timeType=data.value;
+			if(timeType=='1'){
+				 $("#dateDetail").show();
+			}else if(timeType=='0'){
+				$("#date1").val('');
+				$("#date2").val('');
+				 $("#dateDetail").hide();
+			}
+		})
+	});
+	
+	layui.use(['layer', 'form'], function() {
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+		form.on('select(selectType)', function(data){
+			var type=data.value;
+			if(type=='2'){
+				 $("#percentDetail").show();
+			}else{
+				 $("#percent").val('');
+				 $("#percentDetail").hide();
+			}
+		})
+	});
+	
+	
+});
+
+
+ 
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/activityConsumReturn/activityConsumReturnList.js b/pluss-manage-page/src/main/resources/static/resources/activityConsumReturn/activityConsumReturnList.js
new file mode 100644
index 0000000..5ffb4d2
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/activityConsumReturn/activityConsumReturnList.js
@@ -0,0 +1,362 @@
+/**
+ * create by robot 
+ * date Thu Sep 12 16:16:36 CST 2019 
+ */ 
+
+var pageIndex=1;
+$(document).ready(function(){
+	//调用查询
+	pageIndex=StringUtil.getQueryString('pageIndex');
+	if(pageIndex==undefined||pageIndex==null){
+		pageIndex=1;
+	}
+	queryActivityConsumReturn(pageIndex);
+	//绑定hover操作
+	$(document).on('mouseenter','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").show();
+		var width=15;
+		$(this).children('div').find('li').each(function(){
+			//获取li宽度
+			width+=$(this).width();
+		});
+		$(this).children('div').width(width);
+	})
+	$(document).on('mouseleave','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").hide();
+	});
+
+	//日历控件
+	layui.use(['layer', 'laydate'], function() {
+		var layer = layui.layer;
+		laydate = layui.laydate;
+		laydate.render({
+		elem: '#date1' //指定元素
+		});
+		laydate.render({
+			elem: '#date2' //指定元素
+		});
+	});
+
+
+	//行选中事件
+	$("#allCheck").find("span").click(function() {
+		$(this).toggleClass('checked');
+		if($(this).hasClass('checked')){
+			//所有列选中
+		  $(".checker").find("span").each(function () {
+		         $(this).addClass("checked");
+		    })
+		}else{
+			//所有列取消选中
+			$(".checker").find("span").each(function () {
+				 $(this).removeClass("checked");
+		    })
+		}
+	});
+
+	//单个选中
+	$(document).on('click','.checkeBox span',function() {
+		$(this).toggleClass('checked');
+		//设置头部事件
+		var length=$('.checkeBox span').length;
+		var count=0;
+		$(".checkeBox").find("span").each(function () {
+	        if($(this).hasClass("checked")){
+	        	count++;
+	        }
+	   })
+		//全选
+	   if(count==length){
+		   $("#allCheck").find("span").addClass('checked');
+	   }else{
+		   $("#allCheck").find("span").removeClass('checked');
+	   }
+	})
+	//左右div高度相等
+	var left_content_height = $(".right-content").height();
+	$(".left-content").height(left_content_height+35);
+	var sub_left_height=$(".res-menu").height(left_content_height-60);
+});
+
+//查询
+function queryActivityConsumReturn(index){
+	if(typeof(index)=='undefined'){
+		index=1;
+	}
+	var url=ctx+'/activityConsumReturn/queryActivityConsumReturnByPage';
+	$.ajax({  
+        url:url,  
+        type:"post", 
+        dataType:"json",  
+        data:{  
+        	"currPage":index,
+        	"name":$("#name").val(),
+        	"startDt":$("#date1").val(),
+        	"endDt":$("#date2").val(),
+        },  
+        success:function(result){  
+        	//渲染数据
+        	$('#data_content').empty();
+        	var header='';
+        	$.each(result.activityConsumReturnList,function(i){
+        		var activityConsumReturn=result.activityConsumReturnList[i];
+        		var data='';
+        		data+='<tr class="odd">';
+        		data+='<td class="textc">';
+				data+='		 <div class="checker checkeBox">';        		data+='		 <span class=""  data-id="'+activityConsumReturn.id+'"><input type="checkbox"  value=""></span>';
+        		data+='		</div>';
+        		data+='</td>';
+        		data+='<td class="textc">'+activityConsumReturn.id+'</td>';
+        		data+='<td class="textc">'+activityConsumReturn.name+'</td>';
+        		/*data+='<td class="textc">'+activityConsumReturn.userId+'</td>';
+        		data+='<td class="textc">'+activityConsumReturn.merchantCode+'</td>';*/
+        		if(StringUtil.isNotBlank(activityConsumReturn.merchantName)){
+        			data+='<td class="textc">'+activityConsumReturn.merchantName+'</td>';
+        		}else{
+        			data+='<td class="textc"></td>';
+        		}
+        		if(StringUtil.isNotBlank(activityConsumReturn.storeName)){
+        			data+='<td class="textc">'+activityConsumReturn.storeName+'</td>';
+        		}else{
+        			data+='<td class="textc"></td>';
+        		}
+        		/*data+='<td class="textc">'+activityConsumReturn.storeId+'</td>';*/
+        		//0分等级返现   1等比例返现   2 百分比返现
+        		var type = '';
+        		if(activityConsumReturn.type == '0'){
+        			type = '分等级返现';
+        		}else if(activityConsumReturn.type == '1'){
+        			type = '等比例返现';
+        		}else if(activityConsumReturn.type == '2'){
+        			type = '百分比返现';
+        		}
+        		data+='<td class="textc">'+type+'</td>';
+        		if(StringUtil.isNotBlank(activityConsumReturn.comsumeMoney)){
+        			data+='<td class="textc">'+activityConsumReturn.comsumeMoney+'</td>';
+        		}else{
+        			data+='<td class="textc"></td>';
+        		}
+        		if(StringUtil.isNotBlank(activityConsumReturn.returnMoney)){
+        			data+='<td class="textc">'+activityConsumReturn.returnMoney+'</td>';
+        		}else{
+        			data+='<td class="textc"></td>';
+        		}
+        		if(StringUtil.isNotBlank(activityConsumReturn.percent)){
+        			data+='<td class="textc">'+activityConsumReturn.percent+'</td>';
+        		}else{
+        			data+='<td class="textc"></td>';
+        		}
+        		
+        		var startDt='';
+        		if(StringUtil.isNotBlank(activityConsumReturn.startDt)){
+					startDt = dateFtt("yyyy-MM-dd hh:mm:ss",new Date(activityConsumReturn.startDt));
+        		}
+        		data+='<td class="textc">'+startDt+'</td>';
+        		var endDt='';
+        		if(StringUtil.isNotBlank(activityConsumReturn.endDt)){
+					endDt = dateFtt("yyyy-MM-dd hh:mm:ss",new Date(activityConsumReturn.endDt));
+        		}
+        		data+='<td class="textc">'+endDt+'</td>';
+        		var timeType='';
+        			if(activityConsumReturn.timeType=='0'){
+        				timeType='永久';
+        			}else if(activityConsumReturn.timeType=='1'){
+        				timeType='设置时间';
+        			}
+        		data+='<td class="textc">'+timeType+'</td>';
+        		var createDt='';
+        		if(StringUtil.isNotBlank(activityConsumReturn.createDt)){
+					createDt = dateFtt("yyyy-MM-dd hh:mm:ss",new Date(activityConsumReturn.createDt));
+        		}
+        		data+='<td class="textc">'+createDt+'</td>';
+        		data+='<td class="textc">';
+        		//管理员或商户能进行的操作
+        		if(result.admin=='admin'||result.userType=='merchant'){
+					data+='<div class="positionr listOperaters">';
+					data+='		<a href="javascript:void(0);"  class="icon-large dlblock w16 h16"><img src="'+resourcePath+'/images/angle-down.png"/></a>';
+					data+='		<div class="ops_box ops_itemDiv positiona clearfix whitebg">';
+					data+='			<ul>';
+					data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="otherActivityConsumReturnDetails('+activityConsumReturn.id+')" class="btn btn-primary fa fa-edit ops_more f12">详情</a></li>';
+					data+='			</ul>';
+					data+='		</div>';
+					data+='</div>';
+        		}else{
+					data+='<div class="positionr listOperaters">';
+					data+='		<a href="javascript:void(0);"  class="icon-large dlblock w16 h16"><img src="'+resourcePath+'/images/angle-down.png"/></a>';
+					data+='		<div class="ops_box ops_itemDiv positiona clearfix whitebg">';
+					data+='			<ul>';
+					data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showActivityConsumReturnDetails('+activityConsumReturn.id+')" class="layui-btn layui-btn-sm layui-btn-radius fa fa-edit ops_more f12">编辑</a></li>';
+					data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="initDeleteActivityConsumReturn('+activityConsumReturn.id+')" class="layui-btn layui-btn-sm layui-btn-radius layui-btn-danger fa fa-remove ops_more f12">删除</a></li>';
+					data+='			</ul>';
+					data+='		</div>';
+					data+='</div>';
+        		}
+        		
+        	    data+='</td>';
+        	    data+='</tr>';
+        	    $('#data_content').append(data);
+        	});
+        	//分页
+        	$('#pageCount').html(result.pageCount);
+      	$('#currPage').html(result.currPage);
+          $('#totalCount').html(result.count);
+           	//设置分页
+           	pageIndex=result.currPage;
+			$('#pagination').pagination({
+				pageCount: result.pageCount,
+				jump: true,
+				coping: true,
+				jump: true,
+				homePage: '首页',
+				endPage: '末页',
+				prevContent: '上页',
+				nextContent: '下页',
+				current:result.currPage,
+				callback:function(api){
+					pageIndex=api.getCurrent();
+					queryActivityConsumReturn(api.getCurrent());
+				}
+			});
+        } 
+    });  
+	//表头列不选中
+	$("#allCheck").find("span").removeClass('checked');
+}
+
+//初始化新增
+function initAddActivityConsumReturn(){
+	window.location=ctx+'/activityConsumReturn/queryActivityConsumReturnDetails?pageIndex='+pageIndex;
+}
+
+//初始化修改
+function showActivityConsumReturnDetails(id){
+	window.location=ctx+'/activityConsumReturn/queryActivityConsumReturnDetails?id='+id+'&pageIndex='+pageIndex;
+}
+
+//初始化删除
+function initDeleteActivityConsumReturn(id){
+	
+		layer.open({
+		type: 1,
+		closeBtn: 1,		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r'	, //按钮居中
+		shade: 0.3 ,//不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteActivityConsumReturn(id,true);
+		}
+	});
+}
+
+//删除
+function deleteActivityConsumReturn(id,showMsg){
+	$.ajax({
+		url:ctx+'/activityConsumReturn/deleteActivityConsumReturn',
+		data:[{
+			name:'id',
+			value:id
+		}],
+		type:'POST',
+		dataType:'json',
+		success:function(){
+			queryActivityConsumReturn(pageIndex);
+			if(showMsg){
+				layer.msg('删除成功!');	
+			}
+		}
+	});
+}
+//头部编辑
+function initEditActivityConsumReturn(){
+	var count=0;
+	var id=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+        	 id=$(this).data('id');
+         }
+    })
+    if(count>1){
+    	layer.msg('只能选中一行记录进行操作!');
+    	return ;
+    }
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	 if(id>0){
+	  showActivityConsumReturnDetails(id);
+	 }
+}
+//头部删除
+function initBatchDeleteActivityConsumReturn(){
+	var count=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+         }
+    })
+	
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	
+
+	layer.open({
+		type: 1,
+		closeBtn: 1,
+		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r', //按钮居中
+		shade: 0.3, //不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteBatchActivityConsumReturn();
+		}
+	});
+	
+}
+//批量删除
+function deleteBatchActivityConsumReturn(){
+	
+	$(".checkeBox").find("span").each(function () {
+        if($(this).hasClass("checked")){
+        	var id=$(this).data('id');
+        	deleteActivityConsumReturn(id,false);
+        	layer.msg('删除成功!');	
+        }
+   })
+}
+
+//其他用户查看详情
+function otherActivityConsumReturnDetails(id){
+	window.location=ctx+'/activityConsumReturn/otherActivityConsumReturnDetails?id='+id+'&pageIndex='+pageIndex;
+}
+
+//时间格式化处理
+function dateFtt(fmt,date)
+{ //author: meizz
+	var o = {
+		"M+" : date.getMonth()+1,                 //月份
+		"d+" : date.getDate(),                    //日
+		"h+" : date.getHours(),                   //小时
+		"m+" : date.getMinutes(),                 //分
+		"s+" : date.getSeconds(),                 //秒
+		"q+" : Math.floor((date.getMonth()+3)/3), //季度
+		"S"  : date.getMilliseconds()             //毫秒
+	};
+	if(/(y+)/.test(fmt))
+		fmt=fmt.replace(RegExp.$1, (date.getFullYear()+"").substr(4 - RegExp.$1.length));
+	for(var k in o)
+		if(new RegExp("("+ k +")").test(fmt))
+			fmt = fmt.replace(RegExp.$1, (RegExp.$1.length==1) ? (o[k]) : (("00"+ o[k]).substr((""+ o[k]).length)));
+	return fmt;
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/activityRecharge/activityRechargeDetails.js b/pluss-manage-page/src/main/resources/static/resources/activityRecharge/activityRechargeDetails.js
new file mode 100644
index 0000000..7901d7d
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/activityRecharge/activityRechargeDetails.js
@@ -0,0 +1,224 @@
+/**
+ * create by robot 
+ * date Thu Sep 12 16:16:36 CST 2019 
+ */ 
+
+$(document).ready(function(){
+	//form表单样式
+	layui.use(['layer', 'form'], function() {
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+	
+	//日历控件
+	layui.use(['layer', 'laydate'], function() {
+		var layer = layui.layer;
+		laydate = layui.laydate;
+		laydate.render({
+		elem: '#date1' //指定元素
+		});
+		laydate.render({
+			elem: '#date2' //指定元素
+		});
+	});
+	
+	//li 切换事件
+	$(".nav-tabs>li").click(function() {
+		var index = $(".nav-tabs>li").index(this);
+		$(this).addClass("active").siblings("li").removeClass("active");
+		
+	})
+	//弹出一个提示层
+	$('.fa-save').on('click', function() {
+		saveActivityRecharge();
+	});
+
+	//绑定标签栏事件
+	$(document).on('click','.nav-tabs li',function(){
+
+		var action =$(this).data('action');
+		 switch (action) {
+			case "base"://基本资料
+				goBase();
+				break;  
+			case "functions"://多功能
+				goFunctions();
+				break;
+			case "extends"://扩展    
+				goExtends();         
+				break;           
+		 }
+	})
+
+	//加载第一个标签
+	$('.nav-tabs li').eq(0).click();
+	
+});
+
+
+//跳转基本信息 
+function goBase(){
+	var url=ctx+'/activityRecharge/queryActivityRechargeBaseInfo?id='+$('#activityRechargeId').val();
+	$('.tab-content').load(url);
+	              
+}
+//跳转多功能输入
+function goFunctions(){ 
+	var url=ctx+'/activityRecharge/queryActivityRechargeFunctionsInfo?id='+$('#activityRechargeId').val();
+	$('.tab-content').load(url);  
+	
+}
+//跳转到扩展   
+function goExtends(){
+	
+	var url=ctx+'/activityRecharge/queryActivityRechargeExtendsInfo?id='+$('#activityRechargeId').val();
+	$('.tab-content').load(url);          
+}  
+  
+
+ 
+//保存
+function saveActivityRecharge(){
+	var isAdmin=$("#isAdmin").val();
+	if(isAdmin=='1'){
+		var merchantCode=$("#merchantCode option:selected").val();
+		if(StringUtil.isBlank(merchantCode)){
+			layer.msg('请选择商户');
+			return;
+		}
+	}
+	var storeId=$("#storeId option:selected").val();
+	if(StringUtil.isBlank(storeId)){
+		layer.msg('请选择门店');
+		return;
+	}
+	
+	
+	var rechargeMoney=$("#rechargeMoney").val();
+	if(StringUtil.isNotJustIntgerAndDecimals2(rechargeMoney)){
+		if(StringUtil.isBlank(rechargeMoney)){
+			layer.msg('请输入充值金额');
+			return;
+		}
+		layer.msg('请输入正确的充值金额(正整数或小数(保留两位小数))');
+		return;
+	}
+	
+	if(StringUtil.isNotBlank(rechargeMoney)){
+		if(rechargeMoney<0.01){
+			layer.msg('充值金额必须大于0.01');
+			return;
+		}
+	}
+	
+	var giveMoney=$("#giveMoney").val();
+	if(StringUtil.isNotJustIntgerAndDecimals2(giveMoney)){
+		if(StringUtil.isBlank(giveMoney)){
+			layer.msg('请输入赠送金额');
+			return;
+		}
+		layer.msg('请输入正确的赠送金额(正整数或小数(保留两位小数))');
+		return;
+	}
+	
+	if(StringUtil.isNotBlank(giveMoney)){
+		if(parseInt(giveMoney)>parseInt(rechargeMoney)){
+			layer.msg('赠送金额必须小于充值金额');
+			return;
+		}
+	}
+	
+	if(StringUtil.isNotBlank(giveMoney)){
+		if(giveMoney<0.01){
+			layer.msg('赠送金额必须大于0.01');
+			return;
+		}
+	}
+	var timeType=$("#timeType option:selected").val();
+	var date1=$("#date1").val();
+	var date2=$("#date2").val();
+	if(timeType=='1'){
+		if(StringUtil.isBlank(date1)){
+			layer.msg('请输入开始时间');
+			return;
+		}
+		if(StringUtil.isBlank(date2)){
+			layer.msg('请输入结束时间');
+			return;
+		}
+	}
+	
+	 
+	$(".fa-save").attr("disabled","disabled");
+	$('.fa-save').html('正在保存...')
+	$.ajax({
+		url:ctx+"/activityRecharge/saveActivityRecharge",
+		type:"POST",
+		dataType:'json',
+		data:$("#data_form").serializeArray(),
+		complete:function(){
+			$(".fa-save").removeAttr("disabled");
+			$('.fa-save').html('保存')
+		},        
+		success:function(service){ 
+		
+			layer.confirm('保存成功,是否前往列表？', {
+				  btn: ['确认','取消'] //按钮
+				}, function(){
+					$('#goback span').trigger('click'); 
+				}, function(){         
+					layer.closeAll();
+			});  
+			
+		}
+	});  
+}
+ 
+//onchange商户
+$(function(){
+	layui.use(['layer', 'form'], function() {
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+		form.on('select(selectMerchantCode)', function(data){
+			var merchantCode=data.value;
+			$.ajax({
+				url:ctx+'/merchantMenber/getStoreByMerchantCode',
+				type:'post',
+				dataType:'json',
+				data:{
+					'merchantCode':merchantCode,
+				},
+				success:function(result){
+					var storeList=result.merchantStoreList;
+					$("#storeId").empty();
+					var data='';
+					data+='<option value="">请选择</option>';
+					for (var i = 0; i < storeList.length; i++) {
+						data+='<option value='+storeList[i].storeId+'>'+storeList[i].storeName+'</option>'
+					}
+					$("#storeId").append(data);
+					form.render("select");
+				}
+			})
+		})
+	});
+	
+	layui.use(['layer', 'form'], function() {
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+		form.on('select(selectTimeType)', function(data){
+			var timeType=data.value;
+			if(timeType=='1'){
+				 $("#dateDetail").show();
+			}else{
+				$("#date1").val('');
+				$("#date2").val('');
+				$("#dateDetail").hide();
+			}
+		})
+	});
+});
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/activityRecharge/activityRechargeList.js b/pluss-manage-page/src/main/resources/static/resources/activityRecharge/activityRechargeList.js
new file mode 100644
index 0000000..8f89f51
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/activityRecharge/activityRechargeList.js
@@ -0,0 +1,346 @@
+/**
+ * create by robot
+ * date Thu Sep 12 16:16:36 CST 2019
+ */
+
+var pageIndex = 1;
+$(document).ready(function () {
+    //调用查询
+    pageIndex = StringUtil.getQueryString('pageIndex');
+    if (pageIndex == undefined || pageIndex == null) {
+        pageIndex = 1;
+    }
+    queryActivityRecharge(pageIndex);
+    //绑定hover操作
+    $(document).on('mouseenter', '.listOperaters', function () {
+        $(this).children(".ops_itemDiv").show();
+        var width = 15;
+        $(this).children('div').find('li').each(function () {
+            //获取li宽度
+            width += $(this).width();
+        });
+        $(this).children('div').width(width);
+    })
+    $(document).on('mouseleave', '.listOperaters', function () {
+        $(this).children(".ops_itemDiv").hide();
+    });
+
+    //日历控件
+    layui.use(['layer', 'laydate'], function () {
+        var layer = layui.layer;
+        laydate = layui.laydate;
+        laydate.render({
+            elem: '#date1' //指定元素
+        });
+        laydate.render({
+            elem: '#date2' //指定元素
+        });
+    });
+
+    //行选中事件
+    $("#allCheck").find("span").click(function () {
+        $(this).toggleClass('checked');
+        if ($(this).hasClass('checked')) {
+            //所有列选中
+            $(".checker").find("span").each(function () {
+                $(this).addClass("checked");
+            })
+        } else {
+            //所有列取消选中
+            $(".checker").find("span").each(function () {
+                $(this).removeClass("checked");
+            })
+        }
+    });
+
+    //单个选中
+    $(document).on('click', '.checkeBox span', function () {
+        $(this).toggleClass('checked');
+        //设置头部事件
+        var length = $('.checkeBox span').length;
+        var count = 0;
+        $(".checkeBox").find("span").each(function () {
+            if ($(this).hasClass("checked")) {
+                count++;
+            }
+        })
+        //全选
+        if (count == length) {
+            $("#allCheck").find("span").addClass('checked');
+        } else {
+            $("#allCheck").find("span").removeClass('checked');
+        }
+    })
+    //左右div高度相等
+    var left_content_height = $(".right-content").height();
+    $(".left-content").height(left_content_height + 35);
+    var sub_left_height = $(".res-menu").height(left_content_height - 60);
+});
+
+//查询
+function queryActivityRecharge(index) {
+    if (typeof (index) == 'undefined') {
+        index = 1;
+    }
+    var url = ctx + '/activityRecharge/queryActivityRechargeByPage';
+    $.ajax({
+        url: url,
+        type: "post",
+        dataType: "json",
+        data: {
+            "currPage": index,
+            "merchantName": $("#name").val(),
+            "startDt": $("#date1").val(),
+            "endDt": $("#date2").val(),
+            "id": $("#searchId").val(),
+        },
+        success: function (result) {
+            //渲染数据
+            $('#data_content').empty();
+            var presentPage = result.currPage;
+            var header = '';
+            $.each(result.activityRechargeList, function (i) {
+                var activityRecharge = result.activityRechargeList[i];
+                var orderNumber = (presentPage - 1) * 12 + i + 1;
+                var data = '';
+                data += '<tr class="odd">';
+                data += '<td class="textc">';
+                data += '		 <div class="checker checkeBox">';
+                data += '		 <span class=""  data-id="' + activityRecharge.id + '"><input type="checkbox"  value=""></span>';
+                data += '		</div>';
+                data += '</td>';
+                data += '<td class="textc">' + orderNumber + '</td>';
+                data += '<td class="textc">' + activityRecharge.id + '</td>';
+                /*data+='<td class="textc">'+activityRecharge.userId+'</td>';
+                data+='<td class="textc">'+activityRecharge.merchantCode+'</td>';*/
+                data += '<td class="textc">' + activityRecharge.name + '</td>';
+                /*	var merchantName='';
+                    if(StringUtil.isNotBlank(activityRecharge.merchantName)){
+                        merchantName=activityRecharge.merchantName;
+                    }
+                    data+='<td class="textc">'+merchantName+'</td>';*/
+                var merchantName = '';
+                if (StringUtil.isNotBlank(activityRecharge.merchantName)) {
+                    merchantName = activityRecharge.merchantName;
+                }
+                data += '<td class="textc">' + merchantName + '</td>';
+                var storeName = '';
+                if (StringUtil.isNotBlank(activityRecharge.storeName)) {
+                    storeName = activityRecharge.storeName;
+                }
+                data += '<td class="textc">' + storeName + '</td>';
+                data += '<td class="textc">' + activityRecharge.rechargeMoney + '</td>';
+                data += '<td class="textc">' + activityRecharge.giveMoney + '</td>';
+                var startDt = '';
+                if (StringUtil.isNotBlank(activityRecharge.startDt)) {
+                    // startDt=new Date(activityRecharge.startDt).toYYYYMMDD();
+                    startDt = dateFtt("yyyy-MM-dd hh:mm:ss", new Date(activityRecharge.startDt));
+                }
+                data += '<td class="textc">' + startDt + '</td>';
+                var endDt = '';
+                if (StringUtil.isNotBlank(activityRecharge.endDt)) {
+                    // endDt=new Date(activityRecharge.endDt).toYYYYMMDD();
+                    endDt = dateFtt("yyyy-MM-dd hh:mm:ss", new Date(activityRecharge.endDt));
+                }
+                data += '<td class="textc">' + endDt + '</td>';
+                var timeType = '';
+                if (activityRecharge.timeType == '0') {
+                    timeType = '永久';
+                } else if (activityRecharge.timeType == '1') {
+                    timeType = '设置时间';
+                }
+                data += '<td class="textc">' + timeType + '</td>';
+                var createDt = '';
+                if (StringUtil.isNotBlank(activityRecharge.createDt)) {
+                    // createDt = new Date(activityRecharge.createDt).toYYYYMMDD();
+                    createDt = dateFtt("yyyy-MM-dd hh:mm:ss", new Date(activityRecharge.createDt));
+                }
+                data += '<td class="textc">' + createDt + '</td>';
+                /*data+='<td class="textc">'+activityRecharge.storeId+'</td>';*/
+                data += '<td class="textc">';
+                data += '<div class="positionr listOperaters">';
+                data += '		<a href="javascript:void(0);"  class="icon-large dlblock w16 h16"><img src="' + resourcePath + '/images/angle-down.png"/></a>';
+                data += '		<div class="ops_box ops_itemDiv positiona clearfix whitebg">';
+                data += '			<ul>';
+                data += '				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showActivityRechargeDetails(' + activityRecharge.id + ')" class="layui-btn layui-btn-sm layui-btn-radius fa fa-edit ops_more f12">编辑</a></li>';
+                data += '				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="initDeleteActivityRecharge(' + activityRecharge.id + ')" class="layui-btn layui-btn-sm layui-btn-radius layui-btn-danger fa fa-remove ops_more f12">删除</a></li>';
+                data += '			</ul>';
+                data += '		</div>';
+                data += '</div>';
+                // data+='<div class="positionr listOperaters">';
+                // data+='		<a href="javascript:void(0);"  class="icon-large dlblock w16 h16"><img src="'+resourcePath+'/images/angle-down.png"/></a>';
+                // data+='		<div class="ops_box ops_itemDiv positiona clearfix whitebg">';
+                // data+='			<ul>';
+                // data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="otherActivityRechargeDetails('+activityRecharge.id+')" class="layui-btn layui-btn-sm layui-btn-radius fa fa-edit ops_more f12">详情</a></li>';
+                // data+='			</ul>';
+                // data+='		</div>';
+                // data+='</div>';
+                data += '</td>';
+                data += '</tr>';
+                $('#data_content').append(data);
+            });
+            //分页
+            $('#pageCount').html(result.pageCount);
+            $('#currPage').html(result.currPage);
+            $('#totalCount').html(result.count);
+            //设置分页
+            pageIndex = result.currPage;
+            $('#pagination').pagination({
+                pageCount: result.pageCount,
+                jump: true,
+                coping: true,
+                jump: true,
+                homePage: '首页',
+                endPage: '末页',
+                prevContent: '上页',
+                nextContent: '下页',
+                current: result.currPage,
+                callback: function (api) {
+                    pageIndex = api.getCurrent();
+                    queryActivityRecharge(api.getCurrent());
+                }
+            });
+        }
+    });
+    //表头列不选中
+    $("#allCheck").find("span").removeClass('checked');
+}
+
+//初始化新增
+function initAddActivityRecharge() {
+    window.location = ctx + '/activityRecharge/queryActivityRechargeDetails?pageIndex=' + pageIndex;
+}
+
+//初始化修改
+function showActivityRechargeDetails(id) {
+    window.location = ctx + '/activityRecharge/queryActivityRechargeDetails?id=' + id + '&pageIndex=' + pageIndex;
+}
+
+//初始化删除
+function initDeleteActivityRecharge(id) {
+
+    layer.open({
+        type: 1,
+        closeBtn: 1, title: '提示',
+        offset: 'm', //具体配置参考：offset参数项
+        area: ['300px', '180px'],
+        content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+        btn: ['确认', '取消'],
+        btnAlign: 'r', //按钮居中
+        shade: 0.3,//不显示遮罩
+        yes: function () {
+            layer.closeAll();
+            deleteActivityRecharge(id, true);
+        }
+    });
+}
+
+//删除
+function deleteActivityRecharge(id, showMsg) {
+    $.ajax({
+        url: ctx + '/activityRecharge/deleteActivityRecharge',
+        data: [{
+            name: 'id',
+            value: id
+        }],
+        type: 'POST',
+        dataType: 'json',
+        success: function () {
+            queryActivityRecharge(pageIndex);
+            if (showMsg) {
+                layer.msg('删除成功!');
+            }
+        }
+    });
+}
+
+//头部编辑
+function initEditActivityRecharge() {
+    var count = 0;
+    var id = 0;
+    $(".checkeBox").find("span").each(function () {
+        if ($(this).hasClass("checked")) {
+            count++;
+            id = $(this).data('id');
+        }
+    })
+    if (count > 1) {
+        layer.msg('只能选中一行记录进行操作!');
+        return;
+    }
+    if (count == 0) {
+        layer.msg('请选中一行记录!');
+        return;
+    }
+    if (id > 0) {
+        showActivityRechargeDetails(id);
+    }
+}
+
+//头部删除
+function initBatchDeleteActivityRecharge() {
+    var count = 0;
+    $(".checkeBox").find("span").each(function () {
+        if ($(this).hasClass("checked")) {
+            count++;
+        }
+    })
+
+    if (count == 0) {
+        layer.msg('请选中一行记录!');
+        return;
+    }
+
+
+    layer.open({
+        type: 1,
+        closeBtn: 1,
+        title: '提示',
+        offset: 'm', //具体配置参考：offset参数项
+        area: ['300px', '180px'],
+        content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+        btn: ['确认', '取消'],
+        btnAlign: 'r', //按钮居中
+        shade: 0.3, //不显示遮罩
+        yes: function () {
+            layer.closeAll();
+            deleteBatchActivityRecharge();
+        }
+    });
+
+}
+
+//批量删除
+function deleteBatchActivityRecharge() {
+
+    $(".checkeBox").find("span").each(function () {
+        if ($(this).hasClass("checked")) {
+            var id = $(this).data('id');
+            deleteActivityRecharge(id, false);
+            layer.msg('删除成功!');
+        }
+    })
+}
+
+//其他用户查看详情
+function otherActivityRechargeDetails(id) {
+    window.location = ctx + '/activityRecharge/otherActivityRechargeDetails?id=' + id + '&pageIndex=' + pageIndex;
+}
+
+function dateFtt(fmt, date) { //author: meizz
+    var o = {
+        "M+": date.getMonth() + 1,                 //月份
+        "d+": date.getDate(),                    //日
+        "h+": date.getHours(),                   //小时
+        "m+": date.getMinutes(),                 //分
+        "s+": date.getSeconds(),                 //秒
+        "q+": Math.floor((date.getMonth() + 3) / 3), //季度
+        "S": date.getMilliseconds()             //毫秒
+    };
+    if (/(y+)/.test(fmt))
+        fmt = fmt.replace(RegExp.$1, (date.getFullYear() + "").substr(4 - RegExp.$1.length));
+    for (var k in o)
+        if (new RegExp("(" + k + ")").test(fmt))
+            fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
+    return fmt;
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/My97DatePicker/My97DatePicker.htm b/pluss-manage-page/src/main/resources/static/resources/auth/My97DatePicker/My97DatePicker.htm
new file mode 100644
index 0000000..5a0b5b0
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/My97DatePicker/My97DatePicker.htm
@@ -0,0 +1,49 @@
+<html>

+<head>

+<meta http-equiv="content-type" content="text/xml; charset=utf-8" />

+<title>My97DatePicker</title>

+<script type="text/javascript" src="config.js"></script>

+<script>

+if(parent==window)

+	location.href = 'http://www.my97.net';

+var $d, $dp, $pdp = parent.$dp, $dt, $tdt, $sdt, $IE=$pdp.ie, $FF = $pdp.ff,$OPERA=$pdp.opera, $ny, $cMark = false;

+if ($pdp.eCont) {

+	$dp = {};

+	for (var p in $pdp) {

+		$dp[p] = $pdp[p];

+	}

+}

+else

+	$dp = $pdp;

+	

+$dp.getLangIndex = function(name){

+	var arr = langList;

+	for (var i = 0; i < arr.length; i++) {

+		if (arr[i].name == name) {

+			return i;

+		}

+	}

+	return -1;

+}

+

+$dp.getLang = function(name){

+	var index = $dp.getLangIndex(name);

+	if (index == -1) {

+		index = 0;

+	}

+	return langList[index];

+}

+ 

+$dp.realLang = $dp.getLang($dp.lang);

+document.write("<script src='lang/" + $dp.realLang.name + ".js' charset='" + $dp.realLang.charset + "'><\/script>");

+

+for (var i = 0; i < skinList.length; i++) {

+    document.write('<link rel="stylesheet" type="text/css" href="skin/' + skinList[i].name + '/datepicker.css" title="' + skinList[i].name + '" charset="' + skinList[i].charset + '" disabled="true"/>');

+}

+</script>

+<script type="text/javascript" src="calendar.js"></script>

+</head>

+<body leftmargin="0" topmargin="0" onload="$c.autoSize()" tabindex=0>

+</body>

+</html>

+<script>new My97DP();</script>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/My97DatePicker/WdatePicker.js b/pluss-manage-page/src/main/resources/static/resources/auth/My97DatePicker/WdatePicker.js
new file mode 100644
index 0000000..d51a9ca
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/My97DatePicker/WdatePicker.js
@@ -0,0 +1,523 @@
+/*
+ * My97 DatePicker 4.72 Release
+ * License: http://www.my97.net/dp/license.asp
+ */
+var $dp, WdatePicker;
+(function() {
+	var _ = {
+		$wdate : true,
+		$dpPath : "",
+		$crossFrame : true,
+		doubleCalendar : false,
+		enableKeyboard : true,
+		enableInputMask : true,
+		autoUpdateOnChanged : null,
+		whichDayIsfirstWeek : 4,
+		position : {},
+		lang : "auto",
+		skin : "twoer",
+		dateFmt : "yyyy-MM-dd",
+		realDateFmt : "yyyy-MM-dd",
+		realTimeFmt : "HH:mm:ss",
+		realFullFmt : "%Date %Time",
+		minDate : "1900-01-01 00:00:00",
+		maxDate : "2099-12-31 23:59:59",
+		startDate : "",
+		alwaysUseStartDate : false,
+		yearOffset : 1911,
+		firstDayOfWeek : 0,
+		isShowWeek : false,
+		highLineWeekDay : true,
+		isShowClear : true,
+		isShowToday : true,
+		isShowOK : true,
+		isShowOthers : true,
+		readOnly : false,
+		errDealMode : 0,
+		autoPickDate : null,
+		qsEnabled : true,
+		autoShowQS : false,
+
+		specialDates : null,
+		specialDays : null,
+		disabledDates : null,
+		disabledDays : null,
+		opposite : false,
+		onpicking : null,
+		onpicked : null,
+		onclearing : null,
+		oncleared : null,
+		ychanging : null,
+		ychanged : null,
+		Mchanging : null,
+		Mchanged : null,
+		dchanging : null,
+		dchanged : null,
+		Hchanging : null,
+		Hchanged : null,
+		mchanging : null,
+		mchanged : null,
+		schanging : null,
+		schanged : null,
+		eCont : null,
+		vel : null,
+		errMsg : "",
+		quickSel : [],
+		has : {}
+	};
+	WdatePicker = U;
+	var X = window, O = "document", J = "documentElement", C = "getElementsByTagName", V, A, T, I, b;
+	switch (navigator.appName) {
+	case "Microsoft Internet Explorer":
+		T = true;
+		break;
+	case "Opera":
+		b = true;
+		break;
+	default:
+		I = true;
+		break
+	}
+	A = L();
+	if (_.$wdate)
+		M(A + "skin/WdatePicker.css");
+	V = X;
+	if (_.$crossFrame) {
+		try {
+			while (V.parent && V.parent[O] != V[O]
+					&& V.parent[O][C]("frameset").length == 0)
+				V = V.parent
+		} catch (P) {
+		}
+	}
+	if (!V.$dp)
+		V.$dp = {
+			ff : I,
+			ie : T,
+			opera : b,
+			el : null,
+			win : X,
+			status : 0,
+			defMinDate : _.minDate,
+			defMaxDate : _.maxDate,
+			flatCfgs : []
+		};
+	B();
+	if ($dp.status == 0)
+		Z(X, function() {
+			U(null, true)
+		});
+	if (!X[O].docMD) {
+		E(X[O], "onmousedown", D);
+		X[O].docMD = true
+	}
+	if (!V[O].docMD) {
+		E(V[O], "onmousedown", D);
+		V[O].docMD = true
+	}
+	E(X, "onunload", function() {
+		if ($dp.dd)
+			Q($dp.dd, "none")
+	});
+	function B() {
+		V.$dp = V.$dp || {};
+		obj = {
+			$ : function($) {
+				return (typeof $ == "string") ? X[O].getElementById($) : $
+			},
+			$D : function($, _) {
+				return this.$DV(this.$($).value, _)
+			},
+			$DV : function(_, $) {
+				if (_ != "") {
+					this.dt = $dp.cal.splitDate(_, $dp.cal.dateFmt);
+					if ($)
+						for ( var B in $)
+							if (this.dt[B] === undefined)
+								this.errMsg = "invalid property:" + B;
+							else {
+								this.dt[B] += $[B];
+								if (B == "M") {
+									var C = $["M"] > 0 ? 1 : 0, A = new Date(
+											this.dt["y"], this.dt["M"], 0)
+											.getDate();
+									this.dt["d"] = Math
+											.min(A + C, this.dt["d"])
+								}
+							}
+					if (this.dt.refresh())
+						return this.dt
+				}
+				return ""
+			},
+			show : function() {
+				var A = V[O].getElementsByTagName("div"), $ = 100000;
+				for ( var B = 0; B < A.length; B++) {
+					var _ = parseInt(A[B].style.zIndex);
+					if (_ > $)
+						$ = _
+				}
+				this.dd.style.zIndex = $ + 2;
+				Q(this.dd, "block")
+			},
+			hide : function() {
+				Q(this.dd, "none")
+			},
+			attachEvent : E
+		};
+		for ( var $ in obj)
+			V.$dp[$] = obj[$];
+		$dp = V.$dp;
+		$dp.dd = V[O].getElementById("_my97DP")
+	}
+	function E(A, $, _) {
+		if (T)
+			A.attachEvent($, _);
+		else if (_) {
+			var B = $.replace(/on/, "");
+			_._ieEmuEventHandler = function($) {
+				return _($)
+			};
+			A.addEventListener(B, _._ieEmuEventHandler, false)
+		}
+	}
+	function L() {
+		var _, A, $ = X[O][C]("script");
+		for ( var B = 0; B < $.length; B++) {
+			_ = $[B].src.substring(0, $[B].src.toLowerCase().indexOf(
+					"wdatepicker.js"));
+			A = _.lastIndexOf("/");
+			if (A > 0)
+				_ = _.substring(0, A + 1);
+			if (_)
+				break
+		}
+		return _
+	}
+	function F(F) {
+		var E, C;
+		if (F.substring(0, 1) != "/" && F.indexOf("://") == -1) {
+			E = V.location.href;
+			C = location.href;
+			if (E.indexOf("?") > -1)
+				E = E.substring(0, E.indexOf("?"));
+			if (C.indexOf("?") > -1)
+				C = C.substring(0, C.indexOf("?"));
+			var G, I, $ = "", D = "", A = "", J, H, B = "";
+			for (J = 0; J < Math.max(E.length, C.length); J++) {
+				G = E.charAt(J).toLowerCase();
+				I = C.charAt(J).toLowerCase();
+				if (G == I) {
+					if (G == "/")
+						H = J
+				} else {
+					$ = E.substring(H + 1, E.length);
+					$ = $.substring(0, $.lastIndexOf("/"));
+					D = C.substring(H + 1, C.length);
+					D = D.substring(0, D.lastIndexOf("/"));
+					break
+				}
+			}
+			if ($ != "")
+				for (J = 0; J < $.split("/").length; J++)
+					B += "../";
+			if (D != "")
+				B += D + "/";
+			F = E.substring(0, E.lastIndexOf("/") + 1) + B + F
+		}
+		_.$dpPath = F
+	}
+	function M(A, $, B) {
+		var D = X[O][C]("HEAD").item(0), _ = X[O].createElement("link");
+		if (D) {
+			_.href = A;
+			_.rel = "stylesheet";
+			_.type = "text/css";
+			if ($)
+				_.title = $;
+			if (B)
+				_.charset = B;
+			D.appendChild(_)
+		}
+	}
+	function Z($, _) {
+		E($, "onload", _)
+	}
+	function G($) {
+		$ = $ || V;
+		var A = 0, _ = 0;
+		while ($ != V) {
+			var D = $.parent[O][C]("iframe");
+			for ( var F = 0; F < D.length; F++) {
+				try {
+					if (D[F].contentWindow == $) {
+						var E = W(D[F]);
+						A += E.left;
+						_ += E.top;
+						break
+					}
+				} catch (B) {
+				}
+			}
+			$ = $.parent
+		}
+		return {
+			"leftM" : A,
+			"topM" : _
+		}
+	}
+	function W(F) {
+		if (F.getBoundingClientRect)
+			return F.getBoundingClientRect();
+		else {
+			var A = {
+				ROOT_TAG : /^body|html$/i,
+				OP_SCROLL : /^(?:inline|table-row)$/i
+			}, E = false, H = null, _ = F.offsetTop, G = F.offsetLeft, D = F.offsetWidth, B = F.offsetHeight, C = F.offsetParent;
+			if (C != F)
+				while (C) {
+					G += C.offsetLeft;
+					_ += C.offsetTop;
+					if (S(C, "position").toLowerCase() == "fixed")
+						E = true;
+					else if (C.tagName.toLowerCase() == "body")
+						H = C.ownerDocument.defaultView;
+					C = C.offsetParent
+				}
+			C = F.parentNode;
+			while (C.tagName && !A.ROOT_TAG.test(C.tagName)) {
+				if (C.scrollTop || C.scrollLeft)
+					if (!A.OP_SCROLL.test(Q(C)))
+						if (!b || C.style.overflow !== "visible") {
+							G -= C.scrollLeft;
+							_ -= C.scrollTop
+						}
+				C = C.parentNode
+			}
+			if (!E) {
+				var $ = a(H);
+				G -= $.left;
+				_ -= $.top
+			}
+			D += G;
+			B += _;
+			return {
+				"left" : G,
+				"top" : _,
+				"right" : D,
+				"bottom" : B
+			}
+		}
+	}
+	function N($) {
+		$ = $ || V;
+		var B = $[O], A = ($.innerWidth) ? $.innerWidth
+				: (B[J] && B[J].clientWidth) ? B[J].clientWidth
+						: B.body.offsetWidth, _ = ($.innerHeight) ? $.innerHeight
+				: (B[J] && B[J].clientHeight) ? B[J].clientHeight
+						: B.body.offsetHeight;
+		return {
+			"width" : A,
+			"height" : _
+		}
+	}
+	function a($) {
+		$ = $ || V;
+		var B = $[O], A = B[J], _ = B.body;
+		B = (A && A.scrollTop != null && (A.scrollTop > _.scrollTop || A.scrollLeft > _.scrollLeft)) ? A
+				: _;
+		return {
+			"top" : B.scrollTop,
+			"left" : B.scrollLeft
+		}
+	}
+	function D($) {
+		var _ = $ ? ($.srcElement || $.target) : null;
+		try {
+			if ($dp.cal && !$dp.eCont && $dp.dd && _ != $dp.el
+					&& $dp.dd.style.display == "block")
+				$dp.cal.close()
+		} catch ($) {
+		}
+	}
+	function Y() {
+		$dp.status = 2;
+		H()
+	}
+	function H() {
+		if ($dp.flatCfgs.length > 0) {
+			var $ = $dp.flatCfgs.shift();
+			$.el = {
+				innerHTML : ""
+			};
+			$.autoPickDate = true;
+			$.qsEnabled = false;
+			K($)
+		}
+	}
+	var R, $;
+	function U(J, C) {
+		$dp.win = X;
+		B();
+		J = J || {};
+		if (C) {
+			if (!G()) {
+				$ = $ || setInterval(function() {
+					if (V[O].readyState == "complete")
+						clearInterval($);
+					U(null, true)
+				}, 50);
+				return
+			}
+			if ($dp.status == 0) {
+				$dp.status = 1;
+				K({
+					el : {
+						innerHTML : ""
+					}
+				}, true)
+			} else
+				return
+		} else if (J.eCont) {
+			J.eCont = $dp.$(J.eCont);
+			$dp.flatCfgs.push(J);
+			if ($dp.status == 2)
+				H()
+		} else {
+			if ($dp.status == 0) {
+				U(null, true);
+				return
+			}
+			if ($dp.status != 2)
+				return;
+			var F = D();
+			if (F) {
+				$dp.srcEl = F.srcElement || F.target;
+				F.cancelBubble = true
+			}
+			$dp.el = J.el = $dp.$(J.el || $dp.srcEl);
+			if (!$dp.el
+					|| $dp.el["My97Mark"] === true
+					|| $dp.el.disabled
+					|| ($dp.el == $dp.el && Q($dp.dd) != "none" && $dp.dd.style.left != "-1970px")) {
+				$dp.el["My97Mark"] = false;
+				return
+			}
+			K(J);
+			if (F && $dp.el.nodeType == 1 && $dp.el["My97Mark"] === undefined) {
+				$dp.el["My97Mark"] = false;
+				var _, A;
+				if (F.type == "focus") {
+					_ = "onclick";
+					A = "onfocus"
+				} else {
+					_ = "onfocus";
+					A = "onclick"
+				}
+				E($dp.el, _, $dp.el[A])
+			}
+		}
+		function G() {
+			if (T && V != X && V[O].readyState != "complete")
+				return false;
+			return true
+		}
+		function D() {
+			if (I) {
+				func = D.caller;
+				while (func != null) {
+					var $ = func.arguments[0];
+					if ($ && ($ + "").indexOf("Event") >= 0)
+						return $;
+					func = func.caller
+				}
+				return null
+			}
+			return event
+		}
+	}
+	function S(_, $) {
+		return _.currentStyle ? _.currentStyle[$] : document.defaultView
+				.getComputedStyle(_, false)[$]
+	}
+	function Q(_, $) {
+		if (_)
+			if ($ != null)
+				_.style.display = $;
+			else
+				return S(_, "display")
+	}
+	function K(H, $) {
+		for ( var D in _)
+			if (D.substring(0, 1) != "$")
+				$dp[D] = _[D];
+		for (D in H)
+			if ($dp[D] !== undefined)
+				$dp[D] = H[D];
+		var E = $dp.el ? $dp.el.nodeName : "INPUT";
+		if ($ || $dp.eCont
+				|| new RegExp(/input|textarea|div|span|p|a/ig).test(E))
+			$dp.elProp = E == "INPUT" ? "value" : "innerHTML";
+		else
+			return;
+		if ($dp.lang == "auto")
+			$dp.lang = T ? navigator.browserLanguage.toLowerCase()
+					: navigator.language.toLowerCase();
+		if (!$dp.dd
+				|| $dp.eCont
+				|| ($dp.lang && $dp.realLang && $dp.realLang.name != $dp.lang
+						&& $dp.getLangIndex && $dp.getLangIndex($dp.lang) >= 0)) {
+			if ($dp.dd && !$dp.eCont)
+				V[O].body.removeChild($dp.dd);
+			if (_.$dpPath == "")
+				F(A);
+			var B = "<iframe style=\"width:1px;height:1px\" src=\""
+					+ _.$dpPath
+					+ "My97DatePicker.htm\" frameborder=\"0\" border=\"0\" scrolling=\"no\"></iframe>";
+			if ($dp.eCont) {
+				$dp.eCont.innerHTML = B;
+				Z($dp.eCont.childNodes[0], Y)
+			} else {
+				$dp.dd = V[O].createElement("DIV");
+				$dp.dd.id = "_my97DP";
+				$dp.dd.style.cssText = "position:absolute";
+				$dp.dd.innerHTML = B;
+				V[O].body.appendChild($dp.dd);
+				Z($dp.dd.childNodes[0], Y);
+				if ($)
+					$dp.dd.style.left = $dp.dd.style.top = "-1970px";
+				else {
+					$dp.show();
+					C()
+				}
+			}
+		} else if ($dp.cal) {
+			$dp.show();
+			$dp.cal.init();
+			if (!$dp.eCont)
+				C()
+		}
+		function C() {
+			var F = $dp.position.left, B = $dp.position.top, C = $dp.el;
+			if (C != $dp.srcEl && (Q(C) == "none" || C.type == "hidden"))
+				C = $dp.srcEl;
+			var H = W(C), $ = G(X), D = N(V), A = a(V), E = $dp.dd.offsetHeight, _ = $dp.dd.offsetWidth;
+			if (isNaN(B)) {
+				if (B == "above"
+						|| (B != "under" && (($.topM + H.bottom + E > D.height) && ($.topM
+								+ H.top - E > 0))))
+					B = A.top + $.topM + H.top - E - 2;
+				else
+					B = A.top + $.topM + Math.min(H.bottom, D.height - E) + 2
+			} else
+				B += A.top + $.topM;
+			if (isNaN(F))
+				F = A.left + Math.min($.leftM + H.left, D.width - _ - 5)
+						- (T ? 2 : 0);
+			else
+				F += A.left + $.leftM;
+			$dp.dd.style.top = B + "px";
+			$dp.dd.style.left = F + "px"
+		}
+	}
+})()
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/My97DatePicker/calendar.js b/pluss-manage-page/src/main/resources/static/resources/auth/My97DatePicker/calendar.js
new file mode 100644
index 0000000..46cc248
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/My97DatePicker/calendar.js
@@ -0,0 +1,5 @@
+/*
+ * My97 DatePicker 4.72 Release
+ * License: http://www.my97.net/dp/license.asp
+ */
+eval(function(p,a,c,k,e,d){e=function(c){return(c<a?"":e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)d[e(c)]=k[c]||e(c);k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1;};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p;}('o $c;k($5u){5Q.2X.7n("6G",l($){k(!$)h.25();t $});5Q.2X.7e("6w",l(){o $=h.6t;3i($.5M!=1)$=$.7g;t $});7f.2X.2I=l($,b){o A=$.1l(/6p/,"");b.5R=l($){6L.1Y=$;t b()};h.7t(A,b.5R,1m)}}l 5H(){$c=h;h.2Y=[];$d=1Q.7q("x");$d.1d="4d";$d.1L="<x 1D=6Y><x Y=\\"3H 6W\\"><a 3W=\\"###\\"></a></x><x Y=\\"3H 76\\"><a 3W=\\"###\\"></a></x><x 1c=\\"3g:2v\\"><x Y=\\"33 7a\\"></x><1v Y=3M></x><x 1c=\\"3g:2v\\"><x Y=\\"33 81\\"></x><1v Y=3M></x><x Y=\\"3H 83\\"><a 3W=\\"###\\"></a></x><x Y=\\"3H 84\\"><a 3W=\\"###\\"></a></x><x 1c=\\"3g:5i\\"></x></x><x 1c=\\"86:85;7B:6A\\"></x><x></x><x 1D=7x><x Y=\\"33 7A\\"></x><x Y=\\"33 7M\\"></x><x Y=\\"33 7P\\"></x><1x 2o=0 2m=0 2u=0><1j><18 7J=2><4h 1D=7L></4h>&4B;<1v Y=7o 4b=2><1v 1g=\\":\\" Y=5P 5N><1v Y=5O 4b=2><1v 1g=\\":\\" Y=5P 5N><1v Y=5O 4b=2></18><18><1O 1D=7I></1O></18></1j><1j><18><1O 1D=7Q></1O></18></1j></1x></x><x 1D=7O></x><x 1D=7N><1v Y=4e 1D=7G 3o=1O><1v Y=4e 1D=7z 3o=1O><1v Y=4e 1D=7E 3o=1O></x>";6M($d,l(){3t()});A();$f.1W=[1Q,$d.1M,$d.1t,$d.2V,$d.3r,$d.3I,$d.2S,$d.28,$d.1U];1b(o B=0;B<$f.1W.u;B++){o b=$f.1W[B];b.3q=B==$f.1W.u-1?$f.1W[1]:$f.1W[B+1];$f.2I(b,"4c",4R)}h.5F();$();4Q("y,M,H,m,s");$d.5S.1q=l(){4Z(1)};$d.5T.1q=l(){4Z(-1)};$d.4i.1q=l(){k($d.1E.1c.2h!="6K"){$c.4p();3w($d.1E)}q 1n($d.1E)};1Q.6N.4q($d);l A(){o b=$("a");1r=$("x"),1I=$("1v"),4g=$("1O"),5G=$("4h");$d.3y=b[0];$d.3V=b[1];$d.42=b[3];$d.3Y=b[2];$d.3K=1r[9];$d.1M=1I[0];$d.1t=1I[1];$d.4k=1r[0];$d.3T=1r[4];$d.2J=1r[6];$d.1E=1r[10];$d.2T=1r[11];$d.2H=1r[12];$d.6R=1r[13];$d.6Q=1r[14];$d.6O=1r[15];$d.4i=1r[16];$d.3z=1r[17];$d.2V=1I[2];$d.3r=1I[4];$d.3I=1I[6];$d.2S=1I[7];$d.28=1I[8];$d.1U=1I[9];$d.5S=4g[0];$d.5T=4g[1];$d.5L=5G[0];l $($){t $d.4o($)}}l $(){$d.3y.1q=l(){$1P=$1P<=0?$1P-1:-1;k($1P%5==0){$d.1t.2d();t}$d.1t.1g=$n.y-1;$d.1t.2n()};$d.3V.1q=l(){$n.2C("M",-1);$d.1M.2n()};$d.42.1q=l(){$n.2C("M",1);$d.1M.2n()};$d.3Y.1q=l(){$1P=$1P>=0?$1P+1:1;k($1P%5==0){$d.1t.2d();t}$d.1t.1g=$n.y+1;$d.1t.2n()}}}5H.2X={5F:l(){$1P=0;$f.5K=h;k($f.3N&&$f.z.3N!=1i){$f.z.3N=19;$f.z.4w()}$();h.5j();$n=h.6f=1a 1C();$1B=1a 1C();$1w=h.2w=1a 1C();h.1y=h.34($f.1y);h.2P=$f.2P==1i?($f.Z.2a&&$f.Z.2a?1m:19):$f.2P;$f.2z=$f.2z==1i?($f.4j&&$f.Z.d?1m:19):$f.2z;h.49=h.3f("8a");h.68=h.3f("8b");h.64=h.3f("89");h.5C=h.3f("87");h.1X=h.3P($f.1X,$f.1X!=$f.5D?$f.1S:$f.3j,$f.5D);h.1Z=h.3P($f.1Z,$f.1Z!=$f.5E?$f.1S:$f.3j,$f.5E);k(h.1X.2r(h.1Z)>0)$f.4f=$1k.7V;k(h.1R()){h.5J();h.3O=$f.z[$f.1z]}q h.3m(1m,2);4u($n);$d.5L.1L=$1k.7R;$d.2S.1g=$1k.7S;$d.28.1g=$1k.7Z;$d.1U.1g=$1k.80;$d.1U.1N=!$c.1u($1w);h.5c();h.6l();k($f.4f)7Y($f.4f);h.4C();k($f.z.5M==1&&$f.z["4m"]===4Y){$f.2I($f.z,"4c",4R);$f.2I($f.z,"2n",l(){k($f.1K.1c.2h=="2E"){$c.3Q();k($f.5K.3O!=$f.z[$f.1z]&&$f.z.75)4I($f.z,"73")}})}$c.1f=$f.z;3t();l $(){o b,$;1b(b=0;($=1Q.4o("71")[b]);b++)k($["72"].1o("1c")!=-1&&$["5I"]){$.1N=19;k($["5I"]==$f.79)$.1N=1m}}},5J:l(){o b=h.2L();k(b!=0){o $;k(b>0)$=h.1Z;q $=h.1X;k($f.Z.3u){$n.y=$.y;$n.M=$.M;$n.d=$.d}k($f.Z.2a){$n.H=$.H;$n.m=$.m;$n.s=$.s}}},3b:l(J,C,Q,E,B,G,F,K,L){o $;k(J&&J.1R)$=J;q{$=1a 1C();k(J!=""){C=C||$f.1y;o H,P=0,O,A=/3a|2l|36|y|2A|2Z|3U|M|1K|d|%2k|4J|H|4K|m|4G|s|3c|D|4H|W|w/g,b=C.35(A);A.2x=0;k(L)O=J.4O(/\\W+/);q{o D=0,M="^";3i((O=A.3h(C))!==1i){k(D>=0)M+=C.1F(D,O.3x);D=A.2x;2G(O[0]){1e"3a":M+="(\\\\d{4})";1h;1e"2l":M+="(\\\\d{3})";1h;1e"2A":1e"2Z":1e"3c":1e"D":M+="(\\\\D+)";1h;5X:M+="(\\\\d\\\\d?)";1h}}M+=".*$";O=1a 4r(M).3h(J);P=1}k(O){1b(H=0;H<b.u;H++){o I=O[H+P];k(I)2G(b[H]){1e"2A":1e"2Z":$.M=N(b[H],I);1h;1e"y":1e"36":I=3E(I,0);k(I<50)I+=5z;q I+=78;$.y=I;1h;1e"2l":$.y=3E(I,0)+$f.5p;1h;5X:$[b[H].4T(-1)]=I;1h}}}q $.d=32}}$.6r(Q,E,B,G,F,K);t $;l N(A,$){o b=A=="2A"?$1k.5m:$1k.29;1b(o B=0;B<12;B++)k(b[B].3X()==$.77(0,b[B].u).3X())t B+1;t-1}},3f:l(b){o B,$=$f[b],A="(?:";k($){1b(B=0;B<$.u;B++){A+=h.34($[B]);k(B!=$.u-1)A+="|"}A=1a 4r(A+")")}q A=1i;t A},2p:l(){o $=h.4s();k($f.z[$f.1z]!=$)$f.z[$f.1z]=$;h.3R()},3R:l($){o b=$f.$($f.6V),$=2K($,h.4s($f.1S));k(b)b.1g=$;$f.z["3v"]=$},34:l(s){o 3D="2N",1s,2B,6c=/#?\\{(.*?)\\}/;s=s+"";1b(o i=0;i<3D.u;i++)s=s.1l("%"+3D.1J(i),h.1V(3D.1J(i),1i,$1B));k(s.1F(0,3)=="#F{"){s=s.1F(3,s.u-1);k(s.1o("t ")<0)s="t "+s;s=$f.4N.2W("1a 6S(\\""+s+"\\");");s=s()}q 3i((1s=6c.3h(s))!=1i){1s.2x=1s.3x+1s[1].u+1s[0].u-1s[1].u-1;2B=2e(2W(1s[1]));k(2B<0)2B="2b"+(-2B);s=s.1F(0,1s.3x)+2B+s.1F(1s.2x+1)}t s},3P:l(A,B,b){o $;A=h.34(A);k(!A||A=="")A=b;k(6Z A=="70")$=A;q{$=h.3b(A,B,1i,1i,1,0,0,0,19);$.y=(""+$.y).1l(/^2b/,"-");$.M=(""+$.M).1l(/^2b/,"-");$.d=(""+$.d).1l(/^2b/,"-");$.H=(""+$.H).1l(/^2b/,"-");$.m=(""+$.m).1l(/^2b/,"-");$.s=(""+$.s).1l(/^2b/,"-");k(A.1o("%2k")>=0){A=A.1l(/%2k/g,"0");$.d=0;$.M=2e($.M)+1}$.20()}t $},1R:l(){o b,$;k($f.7b||($f.6b!=""&&$f.z[$f.1z]=="")){b=h.34($f.6b);$=$f.1S}q{b=$f.z[$f.1z];$=h.1y}$n.2c(h.3b(b,$));k(b!=""){o A=1;k($f.Z.3u&&!h.44($n)){$n.y=$1B.y;$n.M=$1B.M;$n.d=$1B.d;A=0}k($f.Z.2a&&!h.4a($n)){$n.H=$1B.H;$n.m=$1B.m;$n.s=$1B.s;A=0}t A&&h.1u($n)}t 1},44:l($){k($.y!=1i)$=3n($.y,4)+"-"+$.M+"-"+$.d;t $.35(/^((\\d{2}(([69][7p])|([6a][26]))[\\-\\/\\s]?((((0?[6h])|(1[6i]))[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])|(3[6g])))|(((0?[6e])|(11))[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])|(30)))|(0?2[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])))))|(\\d{2}(([69][74])|([6a][7u]))[\\-\\/\\s]?((((0?[6h])|(1[6i]))[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])|(3[6g])))|(((0?[6e])|(11))[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])|(30)))|(0?2[\\-\\/\\s]?((0?[1-9])|(1[0-9])|(2[0-8]))))))(\\s(((0?[0-9])|([1-2][0-3]))\\:([0-5]?[0-9])((\\s)|(\\:([0-5]?[0-9])))))?$/)},4a:l($){k($.H!=1i)$=$.H+":"+$.m+":"+$.s;t $.35(/^([0-9]|([0-1][0-9])|([2][0-3])):([0-9]|([0-5][0-9])):([0-9]|([0-5][0-9]))$/)},2L:l($,A){$=$||$n;o b=$.2r(h.1X,A);k(b>0){b=$.2r(h.1Z,A);k(b<0)b=0}t b},1u:l($,A,B){A=A||$f.Z.3A;o b=h.2L($,A);k(b==0){b=1;k(A=="d"&&B==1i)B=2y.5Y((1a 1G($.y,$.M-1,$.d).21()-$f.41)%7);b=!h.67(B)&&!h.5Z($,A)}q b=0;t b},62:l(){o b=$f.z,A=h,$=$f.z[$f.1z];k($!=1i){k($!="")A.2w.2c(A.3b($,A.1y));k($==""||(A.44(A.2w)&&A.4a(A.2w)&&A.1u(A.2w))){k($!=""){A.6f.2c(A.2w);A.2p()}q A.3R("")}q t 1m}t 19},3Q:l($){3t();k(h.62()){h.3m(19);$f.1n()}q{k($){3k($);h.3m(1m,2)}q h.3m(1m);$f.24()}},3F:l(){o E,C,D,K,A,H=1a 2s(),F=$1k.5y,G=$f.41,I="",$="",b=1a 1C($n.y,$n.M,$n.d,0,0,0),J=b.y,B=b.M;A=1-1a 1G(J,B-1,1).21()+G;k(A>1)A-=7;H.a("<1x Y=5g 2U=3p% 2u=0 2o=0 2m=0>");H.a("<1j Y=5f 4A=5h>");k($f.61)H.a("<18>"+F[0]+"</18>");1b(E=0;E<7;E++)H.a("<18>"+F[(G+E)%7+1]+"</18>");H.a("</1j>");1b(E=1,C=A;E<7;E++){H.a("<1j>");1b(D=0;D<7;D++){b.1R(J,B,C++);b.20();k(b.M==B){K=19;k(b.2r($1w,"d")==0)I="7s";q k(b.2r($1B,"d")==0)I="7d";q I=($f.63&&(0==(G+D)%7||6==(G+D)%7)?"7k":"7l");$=($f.63&&(0==(G+D)%7||6==(G+D)%7)?"7i":"7j")}q k($f.5s){K=19;I="7c";$="8L"}q K=1m;k($f.61&&D==0&&(E<4||K))H.a("<18 Y=8H>"+4t(b,$f.41==0?1:0)+"</18>");H.a("<18 ");k(K){k(h.1u(b,"d",D)){k(h.65(2y.5Y((1a 1G(b.y,b.M-1,b.d).21()-$f.41)%7))||h.66(b))I="8K";H.a("1q=\\"2O("+b.y+","+b.M+","+b.d+");\\" ");H.a("2t=\\"h.1d=\'"+$+"\'\\" ");H.a("2q=\\"h.1d=\'"+I+"\'\\" ")}q I="8M";H.a("Y="+I);H.a(">"+b.d+"</18>")}q H.a("></18>")}H.a("</1j>")}H.a("</1x>");t H.j()},5Z:l(b,A){o $=h.47(b,h.49,A);t(h.49&&$f.5e)?!$:$},67:l($){t h.4x($,h.68)},66:l($){t h.47($,h.64)},65:l($){t h.4x($,h.5C)},47:l($,B,A){o b=A=="d"?$f.4l:$f.1S;t B?B.4P(h.3S(b,$)):0},4x:l(b,$){t $?$.4P(b):0},2R:l(p,c,r,e,2j){o s=1a 2s(),4y=2j?"r"+p:p;5b=$n[p];s.a("<1x 2o=0 2m=3 2u=0");1b(o i=0;i<r;i++){s.a("<1j 3d=\\"3d\\">");1b(o j=0;j<c;j++){s.a("<18 3d ");$n[p]=2W(e);k(($f.5e&&h.2L($n,p)==0)||h.1u($n,p)){s.a("Y=\'1A\' 2t=\\"h.1d=\'3e\'\\" 2q=\\"h.1d=\'1A\'\\" 3Z=\\"");s.a("1n($d."+p+"D);$d."+4y+"I.1g="+$n[p]+";$d."+4y+"I.4w();\\"")}q s.a("Y=\'4z\'");s.a(">"+(p=="M"?$1k.29[$n[p]-1]:$n[p])+"</18>")}s.a("</1j>")}s.a("</1x>");$n[p]=5b;t s.j()},4E:l($,b){k($){o A=$.8Q;k($6m)A=$.8V().2v;b.1c.2v=A}},8E:l($){h.4E($,$d.3T);$d.3T.1L=h.2R("M",2,6,"i+j*6+1",$==$d.2i)},4v:l(b,A){o $=1a 2s();A=2K(A,$n.y-5);$.a(h.2R("y",2,5,A+"+i+j*5",b==$d.2D));$.a("<1x 2o=0 2m=3 2u=0 4A=5h><1j><18 ");$.a(h.1X.y<A?"Y=\'1A\' 2t=\\"h.1d=\'3e\'\\" 2q=\\"h.1d=\'1A\'\\" 3Z=\'k(1Y.25)1Y.25();1Y.4S=19;$c.4v(0,"+(A-10)+")\'":"Y=\'4z\'");$.a(">\\8l</18><18 Y=\'1A\' 2t=\\"h.1d=\'3e\'\\" 2q=\\"h.1d=\'1A\'\\" 3Z=\\"1n($d.2J);$d.1t.4w();\\">\\5l</18><18 ");$.a(h.1Z.y>A+10?"Y=\'1A\' 2t=\\"h.1d=\'3e\'\\" 2q=\\"h.1d=\'1A\'\\" 3Z=\'k(1Y.25)1Y.25();1Y.4S=19;$c.4v(0,"+(A+10)+")\'":"Y=\'4z\'");$.a(">\\8p</18></1j></1x>");h.4E(b,$d.2J);$d.2J.1L=$.j()},3C:l(A,b,$){$d[A+"D"].1L=h.2R(A,6,b,$)},8n:l(){h.3C("H",4,"i * 6 + j")},8e:l(){h.3C("m",2,"i * 30 + j * 5")},8c:l(){h.3C("s",1,"j * 10")},4p:l(A){h.6F();o b=h.2Y,C=b.1c,$=1a 2s();$.a("<1x Y=5g 2U=3p% 2f=3p% 2u=0 2o=0 2m=0>");$.a("<1j Y=5f><18><x 1c=\\"3g:2v\\">"+$1k.8g+"</x>");k(!A)$.a("<x 1c=\\"3g:5i;8z:8y\\" 1q=\\"1n($d.1E);\\">\\5l</x>");$.a("</18></1j>");1b(o B=0;B<b.u;B++)k(b[B]){$.a("<1j><18 1c=\'55-4A:2v\' 3d=\'3d\' Y=\'1A\' 2t=\\"h.1d=\'3e\'\\" 2q=\\"h.1d=\'1A\'\\" 1q=\\"");$.a("2O("+b[B].y+", "+b[B].M+", "+b[B].d+","+b[B].H+","+b[B].m+","+b[B].s+");\\">");$.a("&4B;"+h.3S(1i,b[B]));$.a("</18></1j>")}q $.a("<1j><18 Y=\'1A\'>&4B;</18></1j>");$.a("</1x>");$d.1E.1L=$.j()},5j:l(){$(/w/);$(/4H|W/);$(/3c|D/);$(/3a|2l|36|y/);$(/2A|2Z|3U|M/);$(/1K|d/);$(/4J|H/);$(/4K|m/);$(/4G|s/);$f.Z.3u=($f.Z.y||$f.Z.M||$f.Z.d)?19:1m;$f.Z.2a=($f.Z.H||$f.Z.m||$f.Z.s)?19:1m;$f.3j=$f.3j.1l(/%1G/,$f.4l).1l(/%8w/,$f.5d);k($f.Z.3u){k($f.Z.2a)$f.1S=$f.3j;q $f.1S=$f.4l}q $f.1S=$f.5d;l $(b){o $=(b+"").4T(1,2);$f.Z[$]=b.3h($f.1y)?($f.Z.3A=$,19):1m}},5c:l(){o $=0;$f.Z.y?($=1,24($d.1t,$d.3y,$d.3Y)):1n($d.1t,$d.3y,$d.3Y);$f.Z.M?($=1,24($d.1M,$d.3V,$d.42)):1n($d.1M,$d.3V,$d.42);$?24($d.4k):1n($d.4k);k($f.Z.2a){24($d.2H);3G($d.2V,$f.Z.H);3G($d.3r,$f.Z.m);3G($d.3I,$f.Z.s)}q 1n($d.2H);2M($d.2S,$f.5w);2M($d.28,$f.5x);2M($d.1U,$f.4j);2M($d.4i,!$f.5n&&$f.Z.d&&$f.8t);k($f.6v||!($f.5w||$f.5x||$f.4j))1n($d.3z);q 24($d.3z)},3m:l(B,D){o A=$f.z,b=$5u?"Y":"1d";k(B)C(A);q{k(D==1i)D=$f.8s;2G(D){1e 0:k(8B($1k.8C)){A[$f.1z]=h.3O;C(A)}q $(A);1h;1e 1:A[$f.1z]=h.3O;C(A);1h;1e 2:$(A);1h}}l C(A){o B=A.1d;k(B){o $=B.1l(/5B/g,"");k(B!=$)A.5A(b,$)}}l $($){$.5A(b,$.1d+" 5B")}},1V:l(D,b,$){$=$||$1w;o H,C=[D+D,D],E,A=$[D],F=l($){t 3n(A,$.u)};2G(D){1e"w":A=21($);1h;1e"D":o G=21($)+1;F=l($){t $.u==2?$1k.8A[G]:$1k.5y[G]};1h;1e"W":A=4t($);1h;1e"y":C=["3a","2l","36","y"];b=b||C[0];F=l(b){t 3n((b.u<4)?(b.u<3?$.y%3p:($.y+5z-$f.5p)%8x):A,b.u)};1h;1e"M":C=["2A","2Z","3U","M"];F=l($){t($.u==4)?$1k.5m[A-1]:($.u==3)?$1k.29[A-1]:3n(A,$.u)};1h}b=b||D+D;k("2N".1o(D)>-1&&D!="y"&&!$f.Z[D])k("8h".1o(D)>-1)A=0;q A=1;o B=[];1b(H=0;H<C.u;H++){E=C[H];k(b.1o(E)>=0){B[H]=F(E);b=b.1l(E,"{"+H+"}")}}1b(H=0;H<B.u;H++)b=b.1l(1a 4r("\\\\{"+H+"\\\\}","g"),B[H]);t b},3S:l(b,$){$=$||h.3b($f.z[$f.1z],h.1y)||$1w;b=b||h.1y;k(b.1o("%2k")>=0){o A=1a 1C();A.2c($);A.d=0;A.M=2e(A.M)+1;A.20();b=b.1l(/%2k/g,A.d)}o B="8d";1b(o D=0;D<B.u;D++){o C=B.1J(D);b=h.1V(C,b,$)}k($f.Z["D"]){b=b.1l(/3c/g,"%1K").1l(/D/g,"%d");b=h.1V("M",b,$);b=b.1l(/\\%1K/g,h.1V("D","3c")).1l(/\\%d/g,h.1V("D","D"))}q b=h.1V("M",b,$);t b},8o:l(b,$){t h.1V(b,$,$n)},4s:l($){t h.3S($,$n)},4C:l(){$d.3K.1L="";k($f.5n){$c.2P=19;$f.5s=1m;$d.1d="4d 8T";o $=1a 2s();$.a("<1x Y=8R 2U=3p% 2o=0 2m=0 2u=1><1j><18 5q=5r>");$.a(h.3F());$.a("</18><18 5q=5r>");$n.2C("M",1);$.a(h.3F());$d.2i=$d.1M.5o(19);$d.2D=$d.1t.5o(19);$d.3K.4q($d.2i);$d.3K.4q($d.2D);$d.2i.1g=$1k.29[$n.M-1];$d.2i["3v"]=$n.M;$d.2D.1g=$n.y;4Q("6H,6E");$d.2i.1d=$d.2D.1d="3M";$n.2C("M",-1);$.a("</18></1j></1x>");$d.2T.1L=$.j()}q{$d.1d="4d";$d.2T.1L=h.3F()}k(!$f.Z.d||$f.8J){h.4p(19);3w($d.1E)}q 1n($d.1E);h.6P()},6P:l(){o b=8W.1Q.4o("8k");1b(o C=0;C<b.u;C++){o $=$d.1c.2f;$d.1c.2f="";o A=$d.3l;k(b[C].8j==6L&&A){b[C].1c.2U=$d.6q+"6s";o B=$d.2H.3l;k(B&&$d.3z.1c.2h=="2E"&&$d.2H.1c.2h!="2E"&&1Q.6N.8f-A>=B){A+=B;$d.1c.2f=A}q $d.1c.2f=$;b[C].1c.2f=2y.5v(A,$d.3l)+"6s"}}$d.1E.1c.2U=$d.2T.6q;$d.1E.1c.2f=$d.2T.3l},4W:l(){$n.d=2y.8D(1a 1G($n.y,$n.M,0).2F(),$n.d);$1w.2c($n);h.2p();k(!$f.6v)k(h.1u($n)){4n();1n($f.1K)}k($f.6u)2g("6u")},6l:l(){$d.2S.1q=l(){k(!2g("8q")){$f.z[$f.1z]="";$c.3R("");4n();1n($f.1K);k($f.6n)2g("6n")}};$d.1U.1q=l(){2O()};k(h.1u($1B)){$d.28.1N=1m;$d.28.1q=l(){$n.2c($1B);2O()}}q $d.28.1N=19},6F:l(){o H,G,A,F,C=[],$=5,E=$f.6I.u,b=$f.Z.3A;k(E>$)E=$;q k(b=="m"||b=="s")C=[-60,-30,0,30,60,-15,15,-45,45];q 1b(H=0;H<$;H++)C[H]=$n[b]-2+H;1b(H=G=0;H<E;H++){A=h.3P($f.6I[H]);k(h.1u(A))h.2Y[G++]=A}o B="2N",D=[1,1,1,0,0,0];1b(H=0;H<=B.1o(b);H++)D[H]=$n[B.1J(H)];1b(H=0;G<$;H++)k(H<C.u){A=1a 1C(D[0],D[1],D[2],D[3],D[4],D[5]);A[b]=C[H];A.20();k(h.1u(A))h.2Y[G++]=A}q h.2Y[G++]=1i}};l 4n(){o b=$f.z;8F{k(b.1c.2h!="2E"&&b.3o!="6A"&&(b.6D.3X()=="1v"||b.6D.3X()=="8G")){k($f.8N==b)$f.z["4m"]=19;$f.z.2d();t}}8O($){}b["4m"]=1m}l 2s(){h.s=1a 7h();h.i=0;h.a=l($){h.s[h.i++]=$};h.j=l(){t h.s.7r("")}}l 4t($,B){B=B||0;o b=1a 1G($.y,$.M-1,$.d+B);b.6z(b.2F()-(b.21()+6)%7+$f.7v-1);o A=b.6J();b.7m(0);b.6z(4);t 2y.6X((A-b.6J())/(7*6T))+1}l 21($){o b=1a 1G($.y,$.M-1,$.d);t b.21()}l 24(){3s(2Q,"")}l 3w(){3s(2Q,"6K")}l 1n(){3s(2Q,"2E")}l 3s(b,$){1b(i=0;i<b.u;i++)b[i].1c.2h=$}l 2M(b,$){$?24(b):1n(b)}l 3G(b,$){k($)b.1N=1m;q{b.1N=19;b.1g="7T"}}l c(p,1H){k(p=="M")1H=43(1H,1,12);q k(p=="H")1H=43(1H,0,23);q k("5k".1o(p)>=0)1H=43(1H,0,59);k($1w[p]!=1H&&!2g(p+"7U")){o 6o="1T(\\""+p+"\\","+1H+")",3B=$c.2L();k(3B==0)2W(6o);q k(3B<0)4D($c.1X);q k(3B>0)4D($c.1Z);$d.1U.1N=!$c.1u($1w);k("7C".1o(p)>=0)$c.4C();2g(p+"7D")}l 4D($){4u($c.1u($)?$:$1w)}}l 4u($){1T("y",$.y);1T("M",$.M);1T("d",$.d);1T("H",$.H);1T("m",$.m);1T("s",$.s)}l 2O(F,B,b,D,C,A){o $=1a 1C($n.y,$n.M,$n.d,$n.H,$n.m,$n.s);$n.1R(F,B,b,D,C,A);k(!2g("7H")){o E=$.y==F&&$.M==B&&$.d==b;k(!E&&2Q.u!=0){c("y",F);c("M",B);c("d",b);$c.1f=$f.z;k($f.2z)$c.2p()}k($c.2P||E||2Q.u==0)$c.4W()}q $n=$}l 2g($){o b;k($f[$])b=$f[$].4V($f.z,$f);t b}l 1T(b,$){k($==1i)$=$n[b];$1w[b]=$n[b]=$;k("7K".1o(b)>=0)$d[b+"I"].1g=$;k(b=="M"){$d.1M["3v"]=$;$d.1M.1g=$1k.29[$-1]}}l 43(b,$,A){k(b<$)b=$;q k(b>A)b=A;t b}l 6M($,b){$.2I("4c",l(){o $=1Y,A=($.4M==4Y)?$.4F:$.4M;k(A==9)b()})}l 3n($,b){$=$+"";3i($.u<b)$="0"+$;t $}l 3t(){1n($d.2J,$d.3T,$d.6R,$d.6Q,$d.6O)}l 4Z($){k($c.1f==4Y)$c.1f=$d.2V;2G($c.1f){1e $d.2V:c("H",$n.H+$);1h;1e $d.3r:c("m",$n.m+$);1h;1e $d.3I:c("s",$n.s+$);1h}k($f.2z)$c.2p()}l 1C(D,A,$,C,B,b){h.1R(D,A,$,C,B,b)}1C.2X={1R:l(E,B,b,D,C,A){o $=1a 1G();h.y=1p(E,h.y,$.52());h.M=1p(B,h.M,$.5a()+1);h.d=$f.Z.d?1p(b,h.d,$.2F()):1;h.H=1p(D,h.H,$.54());h.m=1p(C,h.m,$.53());h.s=1p(A,h.s,$.56())},2c:l($){k($)h.1R($.y,$.M,$.d,$.H,$.m,$.s)},6r:l(E,B,b,D,C,A){o $=1a 1G();h.y=1p(h.y,E,$.52());h.M=1p(h.M,B,$.5a()+1);h.d=$f.Z.d?1p(h.d,b,$.2F()):1;h.H=1p(h.H,D,$.54());h.m=1p(h.m,C,$.53());h.s=1p(h.s,A,$.56())},2r:l($,C){o A="2N",b,B;C=A.1o(C);C=C>=0?C:5;1b(o D=0;D<=C;D++){B=A.1J(D);b=h[B]-$[B];k(b>0)t 1;q k(b<0)t-1}t 0},20:l(){o $=1a 1G(h.y,h.M-1,h.d,h.H,h.m,h.s);h.y=$.52();h.M=$.5a()+1;h.d=$.2F();h.H=$.54();h.m=$.53();h.s=$.56();t!6j(h.y)},2C:l(b,$){k("2N".1o(b)>=0){o A=h.d;k(b=="M")h.d=1;h[b]+=$;h.20();h.d=A}}};l 2e($){t 7F($,10)}l 3E($,b){t 2K(2e($),b)}l 1p($,A,b){t 3E($,2K(A,b))}l 2K($,b){t $==1i||6j($)?b:$}l 4I(A,$){k($6m)A.4I("6p"+$);q{o b=1Q.82("88");b.7W($,19,19);A.7X(b)}}l 3J($){o A,B,b="y,M,H,m,s,6E,6H".4O(",");1b(B=0;B<b.u;B++){A=b[B];k($d[A+"I"]==$)t A.4T(A.u-1,A.u)}t 0}l 6k($){o b=3J(h);k(!b)t;$c.1f=h;k(b=="y")h.1d="6x";q k(b=="M"){h.1d="6x";h.1g=h["3v"]}h.4U();$c["2R"+b](h);3w($d[b+"D"])}l 3L(6y){o p=3J(h),2j,51,v=h.1g,6C=$n[p];k(p==0)t;$n[p]=6B(v)>=0?6B(v):$n[p];k(p=="y"){2j=h==$d.2D;k(2j&&$n.M==12)$n.y-=1}q k(p=="M"){2j=h==$d.2i;k(2j){51=$1k.29[$n[p]-1];k(6C==12)$n.y+=1;$n.2C("M",-1)}k($1w.M==$n.M)h.1g=51||$1k.29[$n[p]-1];k(($1w.y!=$n.y))c("y",$n.y)}2W("c(\\""+p+"\\","+$n[p]+")");k(6y!==19){k(p=="y"||p=="M")h.1d="3M";1n($d[p+"D"])}k($f.2z)$c.2p()}l 3k($){k($.25){$.25();$.8i()}q{$.4S=19;$.6G=1m}k($5t)$.4F=0}l 4Q($){o A=$.4O(",");1b(o B=0;B<A.u;B++){o b=A[B]+"I";$d[b].8u=6k;$d[b].2n=3L}}l 4R(M){o H=M.6w||M.6t,Q=M.4M||M.4F;58=$f.1K.1c.2h!="2E";k(Q>=8m&&Q<=8U)Q-=48;k($f.8I&&58){k(!H.3q){H.3q=$f.1W[1];$c.1f=$f.z}k(H==$f.z)$c.1f=$f.z;k(Q==27)k(H==$f.z){$c.3Q();t}q $f.z.2d();k(Q>=37&&Q<=40){o U;k($c.1f==$f.z||$c.1f==$d.1U)k($f.Z.d){U="d";k(Q==38)$n[U]-=7;q k(Q==39)$n[U]+=1;q k(Q==37)$n[U]-=1;q $n[U]+=7;$n.20();c("y",$n["y"]);c("M",$n["M"]);c("d",$n[U]);3k(M);t}q{U=$f.Z.3A;$d[U+"I"].2d()}U=U||3J($c.1f);k(U){k(Q==38||Q==39)$n[U]+=1;q $n[U]-=1;$n.20();$c.1f.1g=$n[U];3L.4V($c.1f,19);$c.1f.4U()}}q k(Q==9){o D=H.3q;1b(o R=0;R<$f.1W.u;R++)k(D.1N==19||D.3l==0)D=D.3q;q 1h;k($c.1f!=D){$c.1f=D;D.2d()}}q k(Q==13){3L.4V($c.1f);k($c.1f.3o=="1O")$c.1f.8P();q $c.4W();$c.1f=$f.z}}q k(Q==9&&H==$f.z)$c.3Q();k($f.8S&&!$5t&&!$f.3N&&$c.1f==$f.z&&(Q>=48&&Q<=57)){o T=$f.z,S=T.1g,F=E(T),I={22:"",1s:[]},R=0,K,N=0,X=0,O=0,J,b=/3a|2l|36|y|3U|M|1K|d|%2k|4J|H|4K|m|4G|s|4H|W|w/g,L=$f.1y.35(b),B,A,$,V,W,G,J=0;k(S!=""){O=S.35(/[0-9]/g);O=O==1i?0:O.u;1b(R=0;R<L.u;R++)O-=2y.5v(L[R].u,2);O=O>=0?1:0;k(O==1&&F>=S.u)F=S.u-1}S=S.1F(0,F)+8r.8v(Q)+S.1F(F+O);F++;1b(R=0;R<S.u;R++){o C=S.1J(R);k(/[0-9]/.4P(C))I.22+=C;q I.1s[R]=1}S="";b.2x=0;3i((K=b.3h($f.1y))!==1i){X=K.3x-(K[0]=="%2k"?1:0);k(N>=0){S+=$f.1y.1F(N,X);k(F>=N+J&&F<=X+J)F+=X-N}N=b.2x;G=N-X;B=I.22.1F(0,G);A=K[0].1J(0);$=2e(B.1J(0));k(I.22.u>1){V=I.22.1J(1);W=$*10+2e(V)}q{V="";W=$}k(I.1s[X+1]||A=="M"&&W>12||A=="d"&&W>31||A=="H"&&W>23||"5k".1o(A)>=0&&W>59){k(K[0].u==2)B="0"+$;q B=$;F++}q k(G==1){B=W;G++;J++}S+=B;I.22=I.22.1F(G);k(I.22=="")1h}T.1g=S;P(T,F);3k(M)}k(58&&$c.1f!=$f.z&&!((Q>=48&&Q<=57)||Q==8||Q==46))3k(M);l E(A){o b=0;k($f.4N.1Q.6d){o B=$f.4N.1Q.6d.6U(),$=B.55.u;B.5V("4X",-A.1g.u);b=B.55.u-$}q k(A.4L||A.4L=="0")b=A.4L;t b}l P(b,A){k(b.5U){b.2d();b.5U(A,A)}q k(b.5W){o $=b.5W();$.7w(19);$.7y("4X",A);$.5V("4X",A);$.4U()}}}',62,555,'|||||||||||_||||dp||this|||if|function||dt|var||else|||return|length|||div||el|||||||||||||||||||||||||class|has|||||||||td|true|new|for|style|className|case|currFocus|value|break|null|tr|lang|replace|false|hide|indexOf|pInt3|onclick|divs|arr|yI|checkValid|input|sdt|table|dateFmt|elProp|menu|tdt|DPDate|id|qsDivSel|substring|Date|pv|ipts|charAt|dd|innerHTML|MI|disabled|button|ny|document|loadDate|realFmt|sv|okI|getP|focusArr|minDate|event|maxDate|refresh|getDay|str||show|preventDefault|||todayI|aMonStr|st|9700|loadFromDate|focus|pInt|height|callFunc|display|rMI|isR|ld|yyy|cellpadding|onblur|cellspacing|update|onmouseout|compareWith|sb|onmouseover|border|left|date|lastIndex|Math|autoUpdateOnChanged|MMMM|tmpEval|attr|ryI|none|getDate|switch|tDiv|attachEvent|yD|rtn|checkRange|shorH|yMdHms|day_Click|autoPickDate|arguments|_f|clearI|dDiv|width|HI|eval|prototype|QS|MMM||||menuSel|doExp|match|yy||||yyyy|splitDate|DD|nowrap|menuOn|_initRe|float|exec|while|realFullFmt|_cancelKey|offsetHeight|mark|doStr|type|100|nextCtrl|mI|setDisp|hideSel|sd|realValue|showB|index|navLeftImg|bDiv|minUnit|rv|_fHMS|ps|pInt2|_fd|disHMS|navImg|sI|_foundInput|rMD|_blur|yminput|readOnly|oldValue|doCustomDate|close|setRealValue|getDateStr|MD|MM|leftImg|href|toLowerCase|navRightImg|onmousedown||firstDayOfWeek|rightImg|makeInRange|isDate|||testDate||ddateRe|isTime|maxlength|onkeydown|WdateDiv|dpButton|errMsg|btns|span|qsDiv|isShowOK|titleDiv|realDateFmt|My97Mark|elFocus|getElementsByTagName|_fillQS|appendChild|RegExp|getNewDateStr|getWeek|_setAll|_fy|blur|testDay|fp|invalidMenu|align|nbsp|draw|_setFrom|_fMyPos|keyCode|ss|WW|fireEvent|HH|mm|selectionStart|which|win|split|test|_inputBindEvent|_tab|cancelBubble|slice|select|call|pickDate|character|undefined|updownEvent||mStr|getFullYear|getMinutes|getHours|text|getSeconds||isShow||getMonth|bak|initShowAndHide|realTimeFmt|opposite|MTitle|WdayTable|center|right|_dealFmt|ms|xd7|aLongMonStr|doubleCalendar|cloneNode|yearOffset|valign|top|isShowOthers|OPERA|FF|max|isShowClear|isShowToday|aWeekStr|2000|setAttribute|WdateFmtErr|sdayRe|defMinDate|defMaxDate|init|spans|My97DP|title|_makeDateInRange|cal|timeSpan|nodeType|readonly|tE|tm|Event|_ieEmuEventHandler|upButton|downButton|setSelectionRange|moveStart|createTextRange|default|abs|testDisDate||isShowWeek|checkAndUpdate|highLineWeekDay|sdateRe|testSpeDay|testSpeDate|testDisDay|ddayRe|02468|13579|startDate|re|selection|469|newdate|01|13578|02|isNaN|_focus|initBtn|IE|oncleared|func|on|offsetWidth|coverDate|px|target|onpicked|eCont|srcElement|yminputfocus|showDiv|setDate|hidden|Number|oldv|nodeName|ry|initQS|returnValue|rM|quickSel|valueOf|block|window|attachTabEvent|body|sD|autoSize|mD|HD|Function|86400000|createRange|vel|NavImgll|round|dpTitle|typeof|object|link|rel|change|1235679|onchange|NavImgl|substr|1900|skin|MMenu|alwaysUseStartDate|WotherDay|Wtoday|__defineGetter__|HTMLElement|parentNode|Array|WwdayOn|WdayOn|Wwday|Wday|setMonth|__defineSetter__|tB|048|createElement|join|Wselday|addEventListener|01345789|whichDayIsfirstWeek|collapse|dpTime|moveEnd|dpTodayInput|hhMenu|overflow|yMd|changed|dpOkInput|parseInt|dpClearInput|onpicking|dpTimeUp|rowspan|yHms|dpTimeStr|mmMenu|dpControl|dpQS|ssMenu|dpTimeDown|timeStr|clearStr|00|changing|err_1|initEvent|dispatchEvent|alert|todayStr|okStr|YMenu|createEvent|NavImgrr|NavImgr|absolute|position|specialDays|HTMLEvents|specialDates|disabledDates|disabledDays|_fs|ydHmswW|_fm|scrollHeight|quickStr|Hms|stopPropagation|contentWindow|iframe|u2190|96|_fH|getNewP|u2192|onclearing|String|errDealMode|qsEnabled|onfocus|fromCharCode|Time|1000|pointer|cursor|aLongWeekStr|confirm|errAlertMsg|min|_fM|try|textarea|Wweek|enableKeyboard|autoShowQS|WspecialDay|WotherDayOn|WinvalidDay|srcEl|catch|click|offsetLeft|WdayTable2|enableInputMask|WdateDiv2|105|getBoundingClientRect|parent'.split('|'),0,{}))
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/My97DatePicker/config.js b/pluss-manage-page/src/main/resources/static/resources/auth/My97DatePicker/config.js
new file mode 100644
index 0000000..96a4afb
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/My97DatePicker/config.js
@@ -0,0 +1,13 @@
+var langList = 
+[
+	{name:'en',	charset:'UTF-8'},
+	{name:'zh-cn',	charset:'UTF-8'},
+	{name:'zh-tw',	charset:'UTF-8'}
+];
+
+var skinList = 
+[
+	{name:'default',	charset:'UTF-8'},
+	{name:'twoer',	charset:'GB2312'},
+	{name:'whyGreen',	charset:'UTF-8'}
+];
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/My97DatePicker/lang/en.js b/pluss-manage-page/src/main/resources/static/resources/auth/My97DatePicker/lang/en.js
new file mode 100644
index 0000000..3159885
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/My97DatePicker/lang/en.js
@@ -0,0 +1,14 @@
+var $lang={
+errAlertMsg: "Invalid date or the date out of range,redo or not?",
+aWeekStr: ["wk", "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"],
+aLongWeekStr:["wk","Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday","Sunday"],
+aMonStr: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"],
+aLongMonStr: ["January","February","March","April","May","June","July","August","September","October","November","December"],
+clearStr: "Clear",
+todayStr: "Today",
+okStr: "OK",
+updateStr: "OK",
+timeStr: "Time",
+quickStr: "Quick Selection",
+err_1: 'MinDate Cannot be bigger than MaxDate!'
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/My97DatePicker/lang/zh-cn.js b/pluss-manage-page/src/main/resources/static/resources/auth/My97DatePicker/lang/zh-cn.js
new file mode 100644
index 0000000..70e5e4f
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/My97DatePicker/lang/zh-cn.js
@@ -0,0 +1,14 @@
+var $lang={
+errAlertMsg: "\u4E0D\u5408\u6CD5\u7684\u65E5\u671F\u683C\u5F0F\u6216\u8005\u65E5\u671F\u8D85\u51FA\u9650\u5B9A\u8303\u56F4,\u9700\u8981\u64A4\u9500\u5417?",
+aWeekStr: ["\u5468","\u65E5","\u4E00","\u4E8C","\u4E09","\u56DB","\u4E94","\u516D"],
+aLongWeekStr:["\u5468","\u661F\u671F\u65E5","\u661F\u671F\u4E00","\u661F\u671F\u4E8C","\u661F\u671F\u4E09","\u661F\u671F\u56DB","\u661F\u671F\u4E94","\u661F\u671F\u516D"],
+aMonStr: ["\u4E00\u6708","\u4E8C\u6708","\u4E09\u6708","\u56DB\u6708","\u4E94\u6708","\u516D\u6708","\u4E03\u6708","\u516B\u6708","\u4E5D\u6708","\u5341\u6708","\u5341\u4E00","\u5341\u4E8C"],
+aLongMonStr: ["\u4E00\u6708","\u4E8C\u6708","\u4E09\u6708","\u56DB\u6708","\u4E94\u6708","\u516D\u6708","\u4E03\u6708","\u516B\u6708","\u4E5D\u6708","\u5341\u6708","\u5341\u4E00\u6708","\u5341\u4E8C\u6708"],
+clearStr: "\u6E05\u7A7A",
+todayStr: "\u4ECA\u5929",
+okStr: "\u786E\u5B9A",
+updateStr: "\u786E\u5B9A",
+timeStr: "\u65F6\u95F4",
+quickStr: "\u5FEB\u901F\u9009\u62E9", 
+err_1: '\u6700\u5C0F\u65E5\u671F\u4E0D\u80FD\u5927\u4E8E\u6700\u5927\u65E5\u671F!'
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/My97DatePicker/lang/zh-tw.js b/pluss-manage-page/src/main/resources/static/resources/auth/My97DatePicker/lang/zh-tw.js
new file mode 100644
index 0000000..b92e0ee
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/My97DatePicker/lang/zh-tw.js
@@ -0,0 +1,14 @@
+var $lang={
+errAlertMsg: "\u4E0D\u5408\u6CD5\u7684\u65E5\u671F\u683C\u5F0F\u6216\u8005\u65E5\u671F\u8D85\u51FA\u9650\u5B9A\u7BC4\u570D,\u9700\u8981\u64A4\u92B7\u55CE?",
+aWeekStr: ["\u5468","\u65E5","\u4E00","\u4E8C","\u4E09","\u56DB","\u4E94","\u516D"],
+aLongWeekStr:["\u5468","\u661F\u671F\u65E5","\u661F\u671F\u4E00","\u661F\u671F\u4E8C","\u661F\u671F\u4E09","\u661F\u671F\u56DB","\u661F\u671F\u4E94","\u661F\u671F\u516D"],
+aMonStr: ["\u4E00\u6708","\u4E8C\u6708","\u4E09\u6708","\u56DB\u6708","\u4E94\u6708","\u516D\u6708","\u4E03\u6708","\u516B\u6708","\u4E5D\u6708","\u5341\u6708","\u5341\u4E00","\u5341\u4E8C"],
+aLongMonStr: ["\u4E00\u6708","\u4E8C\u6708","\u4E09\u6708","\u56DB\u6708","\u4E94\u6708","\u516D\u6708","\u4E03\u6708","\u516B\u6708","\u4E5D\u6708","\u5341\u6708","\u5341\u4E00\u6708","\u5341\u4E8C\u6708"],
+clearStr: "\u6E05\u7A7A",
+todayStr: "\u4ECA\u5929",
+okStr: "\u78BA\u5B9A",
+updateStr: "\u78BA\u5B9A",
+timeStr: "\u6642\u9593",
+quickStr: "\u5FEB\u901F\u9078\u64C7",
+err_1: '\u6700\u5C0F\u65E5\u671F\u4E0D\u80FD\u5927\u65BC\u6700\u5927\u65E5\u671F!'
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/My97DatePicker/skin/WdatePicker.css b/pluss-manage-page/src/main/resources/static/resources/auth/My97DatePicker/skin/WdatePicker.css
new file mode 100644
index 0000000..8d447b5
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/My97DatePicker/skin/WdatePicker.css
@@ -0,0 +1,10 @@
+.Wdate{
+	border:#999 1px solid;
+	height:20px;
+	background:#fff url(datePicker.gif) no-repeat right;
+}
+
+.WdateFmtErr{
+	font-weight:bold;
+	color:red;
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/My97DatePicker/skin/datePicker.gif b/pluss-manage-page/src/main/resources/static/resources/auth/My97DatePicker/skin/datePicker.gif
new file mode 100644
index 0000000..d6bf40c
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/My97DatePicker/skin/datePicker.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/My97DatePicker/skin/default/datepicker.css b/pluss-manage-page/src/main/resources/static/resources/auth/My97DatePicker/skin/default/datepicker.css
new file mode 100644
index 0000000..29d5432
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/My97DatePicker/skin/default/datepicker.css
@@ -0,0 +1,246 @@
+/* 
+ * My97 DatePicker 4.7
+ */
+
+.WdateDiv{
+	width:180px;
+	background-color:#FFFFFF;
+	border:#bbb 1px solid;
+	padding:2px;
+}
+
+.WdateDiv2{
+	width:360px;
+}
+.WdateDiv *{font-size:9pt;}
+
+.WdateDiv .NavImg a{
+	display:block;
+	cursor:pointer;
+	height:16px;
+	width:16px;
+}
+
+.WdateDiv .NavImgll a{
+	float:left;
+	background:transparent url(img.gif) no-repeat scroll 0 0;
+}
+.WdateDiv .NavImgl a{
+	float:left;
+	background:transparent url(img.gif) no-repeat scroll -16px 0;
+}
+.WdateDiv .NavImgr a{
+	float:right;
+	background:transparent url(img.gif) no-repeat scroll -32px 0;
+}
+.WdateDiv .NavImgrr a{
+	float:right;
+	background:transparent url(img.gif) no-repeat scroll -48px 0;
+}
+
+.WdateDiv #dpTitle{
+	height:24px;
+	margin-bottom:2px;
+	padding:1px;
+}
+
+.WdateDiv .yminput{
+	margin-top:2px;
+	text-align:center;
+	height:20px;
+	border:0px;
+	width:50px;
+	cursor:pointer;		
+}
+
+.WdateDiv .yminputfocus{
+	margin-top:2px;
+	text-align:center;
+	font-weight:bold;
+	height:20px;
+	color:blue;
+	border:#ccc 1px solid;
+	width:50px;
+}
+
+.WdateDiv .menuSel{
+	z-index:1;
+	position:absolute;
+	background-color:#FFFFFF;	
+	border:#ccc 1px solid;
+	display:none;
+}
+
+.WdateDiv .menu{
+	cursor:pointer;
+	background-color:#fff;
+}
+
+.WdateDiv .menuOn{
+	cursor:pointer;
+	background-color:#BEEBEE;
+}
+
+.WdateDiv .invalidMenu{
+	color:#aaa;
+}
+
+.WdateDiv .YMenu{
+	margin-top:20px;
+	
+}
+
+.WdateDiv .MMenu{
+	margin-top:20px;
+	*width:62px;
+}
+
+.WdateDiv .hhMenu{
+	margin-top:-90px; 
+	margin-left:26px;
+}
+
+.WdateDiv .mmMenu{
+	margin-top:-46px; 
+	margin-left:26px;
+}
+
+.WdateDiv .ssMenu{
+	margin-top:-24px; 
+	margin-left:26px;
+}
+
+ .WdateDiv .Wweek {
+ 	text-align:center;
+	background:#DAF3F5;
+	border-right:#BDEBEE 1px solid;
+ }
+
+.WdateDiv .MTitle{
+	background-color:#BDEBEE;
+}
+.WdateDiv .WdayTable2{
+	border-collapse:collapse;
+	border:#c5d9e8 1px solid;
+}
+.WdateDiv .WdayTable2 table{
+	border:0;
+}
+
+.WdateDiv .WdayTable{
+	line-height:20px;
+	border:#c5d9e8 1px solid;
+}
+.WdateDiv .WdayTable td{
+	text-align:center;
+}
+
+.WdateDiv .Wday{
+	cursor:pointer;
+}
+
+.WdateDiv .WdayOn{
+	cursor:pointer;
+	background-color:#C0EBEF;
+}
+
+.WdateDiv .Wwday{
+	cursor:pointer;
+	color:#FF2F2F;
+}
+
+.WdateDiv .WwdayOn{
+	cursor:pointer;
+	color:#000;
+	background-color:#C0EBEF;
+}
+.WdateDiv .Wtoday{
+	cursor:pointer;
+	color:blue;
+}
+.WdateDiv .Wselday{
+	background-color:#A9E4E9;
+}
+.WdateDiv .WspecialDay{
+	background-color:#66F4DF;
+}
+
+.WdateDiv .WotherDay{ 
+	cursor:pointer;
+	color:#6A6AFF;	
+}
+
+.WdateDiv .WotherDayOn{ 
+	cursor:pointer;
+	background-color:#C0EBEF;	
+}
+
+.WdateDiv .WinvalidDay{
+	color:#aaa;
+}
+
+.WdateDiv #dpTime{
+	float:left;
+	margin-top:3px;
+	margin-right:30px;
+}
+
+.WdateDiv #dpTime #dpTimeStr{
+	margin-left:1px;
+}
+
+.WdateDiv #dpTime input{
+	width:18px;
+	height:20px;
+	text-align:center;
+	border:#ccc 1px solid;	
+}
+
+.WdateDiv #dpTime .tB{
+	border-right:0px;
+}
+
+.WdateDiv #dpTime .tE{
+	border-left:0;
+	border-right:0;
+}
+
+.WdateDiv #dpTime .tm{
+	width:7px;
+	border-left:0;
+	border-right:0;
+}
+
+.WdateDiv #dpTime #dpTimeUp{
+	height:10px;
+	width:13px;
+	border:0px;
+	background:url(img.gif) no-repeat -32px -16px;
+}
+
+.WdateDiv #dpTime #dpTimeDown{
+	height:10px;
+	width:13px;
+	border:0px;
+    background:url(img.gif) no-repeat -48px -16px;
+}
+
+ .WdateDiv #dpQS {
+ 	float:left;
+	margin-right:3px;
+	margin-top:3px;
+	background:url(img.gif) no-repeat 0px -16px;
+	width:20px;
+	height:20px;
+	cursor:pointer;
+ }
+.WdateDiv #dpControl {
+	text-align:right;	
+}
+.WdateDiv .dpButton{ 
+	height:20px;
+	width:45px;
+	border:#ccc 1px solid;
+	margin-top:2px;
+	margin-right:1px;
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/My97DatePicker/skin/default/img.gif b/pluss-manage-page/src/main/resources/static/resources/auth/My97DatePicker/skin/default/img.gif
new file mode 100644
index 0000000..053205d
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/My97DatePicker/skin/default/img.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/My97DatePicker/skin/twoer/datepicker-dev.css b/pluss-manage-page/src/main/resources/static/resources/auth/My97DatePicker/skin/twoer/datepicker-dev.css
new file mode 100644
index 0000000..db1a639
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/My97DatePicker/skin/twoer/datepicker-dev.css
@@ -0,0 +1,339 @@
+/* 
+ * My97 DatePicker 4.8 
+ * auther : zhangkun , hejianting(design)
+ * email : zhangkun_net@hotmail.com
+ * date : 2012-05-25
+ */ 
+.WdateDiv
+{
+	position:relative;
+	padding:5px;
+	width:180px;
+	*width:190px;
+	font-size:12px;
+	color:#333;
+	border:solid 1px #DEDEDE;
+	background-color:#F2F0F1;
+}
+
+.WdateDiv2
+{
+	width:360px;
+}
+
+.WdateDiv .NavImg a,.WdateDiv .yminput,.WdateDiv .yminputfocus,.WdateDiv #dpQS 
+{
+	background:url(img.gif) no-repeat;
+}
+
+.WdateDiv .NavImg a
+{
+	float:left;
+	width:16px;
+	height:16px;
+	cursor:pointer;
+}
+.WdateDiv .NavImgll a
+{
+	background-position:0px 5px;
+}
+.WdateDiv .NavImgl a
+{
+	background-position:0px -10px;
+}
+.WdateDiv .NavImgr a
+{
+	background-position:0px -25px;
+	float:right;
+}
+.WdateDiv .NavImgrr a
+{
+	background-position:0px -40px;
+	float:right;
+}
+
+.WdateDiv #dpTitle
+{
+	padding:3px 0px 0px 0px;
+	line-height:0px;
+	height:20px;
+	*height:23;
+}
+
+.WdateDiv .yminput,.WdateDiv .yminputfocus
+{
+	margin-left:3px;
+	width:50px;
+	height:20px;
+	line-height:16px;
+	border:solid 1px #F2F0F1;
+	cursor:pointer;
+	background-position:35px -68px;
+}
+
+.WdateDiv .yminputfocus
+{
+	background-color:#fff;
+	border:solid 1px #D8D8D8;
+}
+
+.WdateDiv .menuSel{
+	z-index:1;
+	position:absolute;
+	background-color:#FFFFFF;
+	border:#A3C6C8 1px solid;
+	display:none;
+}
+
+.WdateDiv .menu
+{
+	background:#fff;
+}
+.WdateDiv .menuOn
+{
+	color:#fff;
+	background:#64A3F3;
+}
+
+.WdateDiv .invalidMenu{
+	color:#aaa;
+}
+
+.WdateDiv .MMenu,.WdateDiv .YMenu
+{
+	padding:2px;
+	margin-top:20px;
+	margin-left:-1px;
+	width:68px;
+	border:solid 1px #D9D9D9;
+}
+.WdateDiv .MMenu table,.WdateDiv .YMenu table
+{
+	width:100%;
+}
+.WdateDiv .MMenu table td,.WdateDiv .YMenu table td
+{
+	padding:0px;
+	line-height:20px;
+	text-align:center;
+	font-size:12px;
+	cursor: pointer;
+}
+
+.WdateDiv .Wweek {
+ 	text-align:center;
+	background:#DAF3F5;
+	border-right:#BDEBEE 1px solid;
+ }
+
+.WdateDiv td
+{
+	padding:1px;
+	line-height:20px;
+	font-size:12px;
+	color:#999999;
+	background:#fff;
+	cursor:pointer;
+}
+.WdateDiv .MTitle td
+{
+	line-height:24px;
+	color:#7D7D7D;
+	background:#F2F0F1;
+	cursor: default;
+}
+
+.WdateDiv .WdayTable2
+{
+	border-collapse:collapse;
+	border:#808080 1px solid;
+}
+.WdateDiv .WdayTable2 table
+{
+	border:0;
+}
+
+.WdateDiv .WdayTable{
+	line-height:20px;	
+	color:#13777e;
+	background-color:#edfbfb;
+}
+.WdateDiv .WdayTable td{
+	text-align:center;
+}
+
+.WdateDiv .Wday
+{
+	color:#323232;
+}
+
+.WdateDiv .WdayOn
+{
+	color:#fff;
+	background-color:#65A2F3;	
+}
+
+.WdateDiv .Wwday
+{
+	color:#65A4F3;
+}
+
+.WdateDiv .WwdayOn
+{
+	color:#fff;
+	background-color:#65A2F3;	
+}
+.WdateDiv .Wtoday
+{
+	color:#FF6D10;
+	background:#E0EDFE;
+}
+.WdateDiv .Wselday
+{
+	color:#fff;
+	background-color:#65A2F3;	
+}
+.WdateDiv .WspecialDay{
+	background-color:#66F4DF;
+}
+
+.WdateDiv .WotherDay
+{ 
+	color:#D4D4D4;	
+}
+.WdateDiv .WotherDayOn
+{
+	color:#fff;
+	background-color:#65A2F3;	
+}
+
+.WdateDiv .WinvalidDay{
+	color:#aaa;
+}
+
+.WdateDiv #dpTime
+{
+	position:relative;
+	margin-top:5px;
+}
+
+.WdateDiv #dpTime #dpTimeStr
+{
+	display:inline-block;
+	width:28px;
+	*width:30px;
+	color:#7d7d7d;
+}
+
+.WdateDiv #dpTime input
+{
+	padding:0px;
+	margin:0px;
+	width:25px;
+	height:20px;
+	line-height:20px;
+	text-align:center;
+	color:#333;
+	border:#D9D9D9 1px solid;	
+}
+
+.WdateDiv #dpTime .tm
+{
+	width:7px;
+	border:none;
+	background:#F2F0F1;
+}
+
+.WdateDiv #dpTime #dpTimeUp
+{
+	display:none;
+}
+
+.WdateDiv #dpTime #dpTimeDown
+{
+	display:none;
+}
+
+.WdateDiv #dpQS 
+ {
+ 	float:left;
+	margin-right:3px;
+	margin-top:9px;
+	*margin-top:6px;
+	width:16px;
+	height:16px;
+	cursor:pointer;
+	background-position:0px -90px;
+ }
+.WdateDiv #dpControl 
+{
+	text-align:right;
+	margin-top:3px;
+}
+.WdateDiv .dpButton
+{ 
+	margin-left:2px;
+	line-height:18px;
+	*line-height:16px;
+	width:45px;
+	background-color:#C3C3C3;
+	*background-color:#64A3F3;
+	color:#fff;
+	border:none;
+	cursor: pointer;
+}
+.WdateDiv .dpButton:hover
+{ 
+	background-color:#64A3F3;
+}
+
+.WdateDiv .hhMenu,
+.WdateDiv .mmMenu,
+.WdateDiv .ssMenu
+{
+	position:absolute;
+	padding:3px;
+	font-size:12px;
+	color:#333;
+	border:solid 1px #DEDEDE;
+	background-color:#F2F0F1;
+}
+
+.WdateDiv #dpTime .menu,.WdateDiv #dpTime .menuOn
+{
+	width:18px;
+	height:18px;
+	line-height:18px;
+	text-align:center;
+	background:#fff;
+}
+.WdateDiv #dpTime .menuOn
+{
+	background:#65A2F3;
+}
+
+.WdateDiv #dpTime td
+{
+	background:#F2F0F1;
+}
+
+.WdateDiv .hhMenu
+{
+	top:-87px;
+	left:35px;
+	left:32px\9;
+}
+
+.WdateDiv .mmMenu
+{
+	top:-47px;
+	left:35px;
+	left:32px\9;
+}
+
+.WdateDiv .ssMenu
+{
+	top:-27px;
+	left:35px;
+	left:32px\9;
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/My97DatePicker/skin/twoer/datepicker.css b/pluss-manage-page/src/main/resources/static/resources/auth/My97DatePicker/skin/twoer/datepicker.css
new file mode 100644
index 0000000..020ceec
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/My97DatePicker/skin/twoer/datepicker.css
@@ -0,0 +1 @@
+.WdateDiv{position:relative;width:190px;font-size:12px;color:#333;border:solid 1px #DEDEDE;background-color:#F2F0F1;padding:5px;}.WdateDiv2{width:360px;}.WdateDiv .NavImg a,.WdateDiv .yminput,.WdateDiv .yminputfocus,.WdateDiv #dpQS{background:url(img.gif) no-repeat;}.WdateDiv .NavImg a{float:left;width:16px;height:16px;cursor:pointer;}.WdateDiv .NavImgll a{background-position:0 5px;}.WdateDiv .NavImgl a{background-position:0 -10px;}.WdateDiv .NavImgr a{background-position:0 -25px;float:right;}.WdateDiv .NavImgrr a{background-position:0 -40px;float:right;}.WdateDiv #dpTitle{line-height:0;height:23px;padding:3px 0 0;}.WdateDiv .yminput,.WdateDiv .yminputfocus{margin-left:3px;width:50px;height:20px;line-height:16px;border:solid 1px #F2F0F1;cursor:pointer;background-position:35px -68px;}.WdateDiv .yminputfocus{background-color:#fff;border:solid 1px #D8D8D8;}.WdateDiv .menuSel{z-index:1;position:absolute;background-color:#FFF;border:#A3C6C8 1px solid;display:none;}.WdateDiv .menu{background:#fff;}.WdateDiv .menuOn{color:#fff;background:#64A3F3;}.WdateDiv .MMenu,.WdateDiv .YMenu{margin-top:20px;margin-left:-1px;width:68px;border:solid 1px #D9D9D9;padding:2px;}.WdateDiv .MMenu table,.WdateDiv .YMenu table{width:100%;}.WdateDiv .MMenu table td,.WdateDiv .YMenu table td{line-height:20px;text-align:center;font-size:12px;cursor:pointer;padding:0;}.WdateDiv .Wweek{text-align:center;background:#DAF3F5;border-right:#BDEBEE 1px solid;}.WdateDiv td{line-height:20px;font-size:12px;color:#999;background:#fff;cursor:pointer;padding:1px;}.WdateDiv .MTitle td{line-height:24px;color:#7D7D7D;background:#F2F0F1;cursor:default;}.WdateDiv .WdayTable2{border-collapse:collapse;border:gray 1px solid;}.WdateDiv .WdayTable2 table{border:0;}.WdateDiv .WdayTable{line-height:20px;color:#13777e;background-color:#edfbfb;}.WdateDiv .WdayTable td{text-align:center;}.WdateDiv .Wday{color:#323232;}.WdateDiv .Wwday{color:#65A4F3;}.WdateDiv .Wtoday{color:#FF6D10;background:#E0EDFE;}.WdateDiv .WspecialDay{background-color:#66F4DF;}.WdateDiv .WotherDay{color:#D4D4D4;}.WdateDiv #dpTime{position:relative;margin-top:5px;}.WdateDiv #dpTime #dpTimeStr{display:inline-block;width:30px;color:#7d7d7d;}.WdateDiv #dpTime input{width:25px;height:20px;line-height:20px;text-align:center;color:#333;border:#D9D9D9 1px solid;margin:0;padding:0;}.WdateDiv #dpTime .tm{width:7px;border:none;background:#F2F0F1;}.WdateDiv #dpQS{float:left;margin-right:3px;margin-top:6px;width:16px;height:16px;cursor:pointer;background-position:0 -90px;}.WdateDiv #dpControl{text-align:right;margin-top:3px;}.WdateDiv .dpButton{margin-left:2px;line-height:16px;width:45px;background-color:#64A3F3;color:#fff;border:none;cursor:pointer;}.WdateDiv .dpButton:hover{background-color:#64A3F3;}.WdateDiv .hhMenu,.WdateDiv .mmMenu,.WdateDiv .ssMenu{position:absolute;font-size:12px;color:#333;border:solid 1px #DEDEDE;background-color:#F2F0F1;padding:3px;}.WdateDiv #dpTime .menu,.WdateDiv #dpTime .menuOn{width:18px;height:18px;line-height:18px;text-align:center;background:#fff;}.WdateDiv #dpTime .menuOn{background:#65A2F3;}.WdateDiv #dpTime td{background:#F2F0F1;}.WdateDiv .hhMenu{top:-87px;left:32px;}.WdateDiv .mmMenu{top:-47px;left:32px;}.WdateDiv .ssMenu{top:-27px;left:32px;}.WdateDiv .invalidMenu,.WdateDiv .WinvalidDay{color:#aaa;}.WdateDiv .WdayOn,.WdateDiv .WwdayOn,.WdateDiv .Wselday,.WdateDiv .WotherDayOn{background-color:#65A2F3;color:#fff;}.WdateDiv #dpTime #dpTimeUp,.WdateDiv #dpTime #dpTimeDown{display:none;}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/My97DatePicker/skin/twoer/img.gif b/pluss-manage-page/src/main/resources/static/resources/auth/My97DatePicker/skin/twoer/img.gif
new file mode 100644
index 0000000..da838ce
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/My97DatePicker/skin/twoer/img.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/My97DatePicker/skin/twoer/img.png b/pluss-manage-page/src/main/resources/static/resources/auth/My97DatePicker/skin/twoer/img.png
new file mode 100644
index 0000000..99960d8
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/My97DatePicker/skin/twoer/img.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/My97DatePicker/skin/whyGreen/bg.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/My97DatePicker/skin/whyGreen/bg.jpg
new file mode 100644
index 0000000..75516a6
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/My97DatePicker/skin/whyGreen/bg.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/My97DatePicker/skin/whyGreen/datepicker.css b/pluss-manage-page/src/main/resources/static/resources/auth/My97DatePicker/skin/whyGreen/datepicker.css
new file mode 100644
index 0000000..f8426f5
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/My97DatePicker/skin/whyGreen/datepicker.css
@@ -0,0 +1,256 @@
+/* 
+ * My97 DatePicker 4.7 Skin:whyGreen
+ */ 
+.WdateDiv{
+	width:180px;
+	background-color:#fff;
+	border:#C5E1E4 1px solid;
+	padding:2px;
+}
+
+.WdateDiv2{
+	width:360px;
+}
+.WdateDiv *{font-size:9pt;}
+
+.WdateDiv .NavImg a{
+	cursor:pointer;
+	display:block;
+	width:16px;
+	height:16px;
+	margin-top:1px;
+}
+
+.WdateDiv .NavImgll a{
+	float:left;
+	background:url(img.gif) no-repeat;
+}
+.WdateDiv .NavImgl a{
+	float:left;
+	background:url(img.gif) no-repeat -16px 0px;
+}
+.WdateDiv .NavImgr a{
+	float:right;
+	background:url(img.gif) no-repeat -32px 0px;
+}
+.WdateDiv .NavImgrr a{
+	float:right;
+	background:url(img.gif) no-repeat -48px 0px;
+}
+
+.WdateDiv #dpTitle{
+	height:24px;
+	padding:1px;
+	border:#c5d9e8 1px solid;
+	background:url(bg.jpg);
+	margin-bottom:2px;
+}
+
+.WdateDiv .yminput{
+	margin-top:2px;
+	text-align:center;
+	border:0px;
+	height:20px;
+	width:50px;
+	color:#034c50;
+	background-color:transparent;
+	cursor:pointer;
+}
+
+.WdateDiv .yminputfocus{
+	margin-top:2px;
+	text-align:center;
+	border:#939393 1px solid;
+	font-weight:bold;
+	color:#034c50;	
+	height:20px;
+	width:50px;
+}
+
+.WdateDiv .menuSel{
+	z-index:1;
+	position:absolute;
+	background-color:#FFFFFF;
+	border:#A3C6C8 1px solid;
+	display:none;
+}
+
+.WdateDiv .menu{
+	cursor:pointer;
+	background-color:#fff;
+	color:#11777C;
+}
+
+.WdateDiv .menuOn{
+	cursor:pointer;
+	background-color:#BEEBEE;
+}
+
+.WdateDiv .invalidMenu{
+	color:#aaa;
+}
+
+.WdateDiv .YMenu{
+	margin-top:20px;
+}
+
+.WdateDiv .MMenu{
+	margin-top:20px;
+	*width:62px;
+}
+
+.WdateDiv .hhMenu{
+	margin-top:-90px; 
+	margin-left:26px;
+}
+
+.WdateDiv .mmMenu{
+	margin-top:-46px; 
+	margin-left:26px;
+}
+
+.WdateDiv .ssMenu{
+	margin-top:-24px; 
+	margin-left:26px;
+}
+
+ .WdateDiv .Wweek {
+ 	text-align:center;
+	background:#DAF3F5;
+	border-right:#BDEBEE 1px solid;
+ }
+
+.WdateDiv .MTitle{
+	color:#13777e;
+	background-color:#bdebee;
+}
+.WdateDiv .WdayTable2{
+	border-collapse:collapse;
+	border:#BEE9F0 1px solid;
+}
+.WdateDiv .WdayTable2 table{
+	border:0;
+}
+
+.WdateDiv .WdayTable{
+	line-height:20px;	
+	color:#13777e;
+	background-color:#edfbfb;
+	border:#BEE9F0 1px solid;
+}
+.WdateDiv .WdayTable td{
+	text-align:center;
+}
+
+.WdateDiv .Wday{
+	cursor:pointer;
+}
+
+.WdateDiv .WdayOn{
+	cursor:pointer;
+	background-color:#74d2d9 ;
+}
+
+.WdateDiv .Wwday{
+	cursor:pointer;
+	color:#ab1e1e;
+}
+
+.WdateDiv .WwdayOn{
+	cursor:pointer;
+	background-color:#74d2d9;
+}
+.WdateDiv .Wtoday{
+	cursor:pointer;
+	color:blue;
+}
+.WdateDiv .Wselday{
+	background-color:#A7E2E7;
+}
+.WdateDiv .WspecialDay{
+	background-color:#66F4DF;
+}
+
+.WdateDiv .WotherDay{ 
+	cursor:pointer;
+	color:#0099CC;	
+}
+
+.WdateDiv .WotherDayOn{ 
+	cursor:pointer;
+	background-color:#C0EBEF;	
+}
+
+.WdateDiv .WinvalidDay{
+	color:#aaa;
+}
+
+.WdateDiv #dpTime{
+	float:left;
+	margin-top:3px;
+	margin-right:30px;
+}
+
+.WdateDiv #dpTime #dpTimeStr{
+	margin-left:1px;
+	color:#497F7F;
+}
+
+.WdateDiv #dpTime input{
+	height:20px;
+	width:18px;
+	text-align:center;
+	color:#333;
+	border:#61CAD0 1px solid;	
+}
+
+.WdateDiv #dpTime .tB{
+	border-right:0px;
+}
+
+.WdateDiv #dpTime .tE{
+	border-left:0;
+	border-right:0;
+}
+
+.WdateDiv #dpTime .tm{
+	width:7px;
+	border-left:0;
+	border-right:0;
+}
+
+.WdateDiv #dpTime #dpTimeUp{
+	height:10px;
+	width:13px;
+	border:0px;
+	background:url(img.gif) no-repeat -32px -16px;
+}
+
+.WdateDiv #dpTime #dpTimeDown{
+	height:10px;
+	width:13px;
+	border:0px;
+	background:url(img.gif) no-repeat -48px -16px;
+}
+
+ .WdateDiv #dpQS {
+ 	float:left;
+	margin-right:3px;
+	margin-top:3px;
+	background:url(img.gif) no-repeat 0px -16px;
+	width:20px;
+	height:20px;
+	cursor:pointer;
+ }
+.WdateDiv #dpControl {
+	text-align:right;
+	margin-top:3px;
+}
+.WdateDiv .dpButton{ 
+	height:20px;
+	width:45px;
+	margin-top:2px;
+	border:#38B1B9 1px solid;
+	background-color:#CFEBEE;
+	color:#08575B;
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/My97DatePicker/skin/whyGreen/img.gif b/pluss-manage-page/src/main/resources/static/resources/auth/My97DatePicker/skin/whyGreen/img.gif
new file mode 100644
index 0000000..4003f20
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/My97DatePicker/skin/whyGreen/img.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/announcement/announcement.js b/pluss-manage-page/src/main/resources/static/resources/auth/announcement/announcement.js
new file mode 100644
index 0000000..3428559
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/announcement/announcement.js
@@ -0,0 +1,43 @@
+var is = false;
+$(function() {
+	$("#te").on('click',function(){
+		$("#title").focus();
+	})
+		$("#st").on('click',function(){
+		$("#content").focus();
+	})
+		$("#de").on('click',function(){
+		$("#createTime").focus();
+	})
+		$("#ul").on('click',function(){
+		$("#url").focus();
+	})
+	$("#compere_btn_save").on('click', function() {
+		validate();
+		if (is) {
+			document.form1.action = "/auth/announcement/saveAnnouncementInfo";
+			document.form1.submit();
+		}
+	});
+	$("#compere_btn_edit")
+			.on(
+					'click',
+					function() {
+						validate();
+						if (is) {
+							document.form1.action = "/auth/announcement/editAnnouncementInfo?id="
+									+ id;
+							document.form1.submit();
+						}
+					});
+});
+function validate() {
+	if ($("#title").val() == "") {
+		alert('标题不能为空！');
+		return;
+	} else if ($("#content").val() == "") {
+		alert('内容不能为空！');
+		return;
+	} else
+		is = true;
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/announcement/announcementList.js b/pluss-manage-page/src/main/resources/static/resources/auth/announcement/announcementList.js
new file mode 100644
index 0000000..2b025cb
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/announcement/announcementList.js
@@ -0,0 +1,62 @@
+var table;
+$(function() {
+	initTable();
+	$("#query_btn").click(function() {
+		table.fnDraw();
+	});
+});
+
+function initTable() {
+	if (table == undefined) {
+		table = $("#tableList")
+				.myDataTable(
+						{
+							"sAjaxSource" : ctx
+									+ '/announcement/queryannouncement1',
+							"paramSelector" : '#name',
+							"iDisplayLength" : 10,
+							"bSort" : false,
+							"aoColumns" : [
+									{
+										"sTitle" : "序列",
+										"bSortable" : true,
+										sWidth : 100
+									},
+									{
+										"sTitle" : "标题",
+										sWidth : 150
+									},
+									{
+										"sTitle" : "内容",
+										sWidth : 300
+									},
+									{
+										"sTitle" : "创建时间",
+									},
+									{
+										"sTitle" : "更新时间",
+									},
+									{
+										"sTitle" : "路径",
+									},
+									{
+										"sTitle" : "操作",
+										fnRender : function(obj) {
+											var id = obj.aData[0];
+											return "<a href='"
+													+ ctx
+													+ "/announcement/queryAnnouncementInfoById?id={0}'>编辑</a>&nbsp|&nbsp"
+															.format(id)
+													+ "<a href='javascript:deletes({0})'>删除</a>"
+															.format(id);
+										}
+									} ]
+						});
+	} else {
+		table.fnPageChange("first", true);
+	}
+}
+function deletes(id){
+	if(confirm('确定删除吗？'))
+	  window.location.href=ctx+'/announcement/deleteAnnouncementInfo?id='+id;
+}
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/carousel/carouselList.js b/pluss-manage-page/src/main/resources/static/resources/auth/carousel/carouselList.js
new file mode 100644
index 0000000..362ffc3
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/carousel/carouselList.js
@@ -0,0 +1,76 @@
+var table;
+$(function() {
+	initTable();
+	$("#query_btn").click(function() {
+		table.fnDraw();
+	});
+});
+
+function initTable() {
+	if (table == undefined) {
+		table = $("#tableList").myDataTable({
+					"sAjaxSource" : ctx + '/carousel/queryCarousels1',
+					"paramSelector" : '#name',
+					"iDisplayLength" : 10,
+					"bSort" : false,
+					"aoColumns" : [
+							{
+								"sTitle" : "序列",
+								"bSortable" : true,
+								sWidth : 100
+							},
+							{
+								"sTitle" : "标题",
+								sWidth : 150
+							},
+	                        {
+	                        	"sTitle" : "预览",
+                        		"fnRender" : function(obj){
+                        			var id = obj.aData[6];
+	                        		var img = obj.aData[2];
+	                        		return "<a href='#' onmouseover='showPic(this,"+id+")' onmouseout='hiddenPic("+id+")'>查看</a>"
+	                        		       +"<div id='Layer"+id+"' style='display:none;position:absolute;z-index:1;'><img width='190' height='280' src='"+res+"/upload/"+img+"'></div>";
+	                        	}
+	                        },
+							{
+								"sTitle" : "创建时间",
+							},
+							{
+								"sTitle" : "更新时间",
+							},
+							{
+								"sTitle" : "排序",
+							},
+							{
+								"sTitle" : "操作",
+								fnRender : function(obj) {
+									var id = obj.aData[6];
+									return "<a href='"+ctx+"/carousel/queryCarouselsById?id={0}'>编辑</a>&nbsp|&nbsp".format(id)
+											+ "<a href='javascript:deletes({0})'>删除</a>".format(id);
+								}
+							} ]
+				});
+	} else {
+		table.fnPageChange("first", true);
+	}
+}
+function showPic(obj,id){
+	var x=$(obj).offset.top;
+	var y=$(obj).offset.left;
+	document.getElementById("Layer"+id+"").style.left = x; 
+	document.getElementById("Layer"+id+"").style.top = y; 
+	document.getElementById("Layer"+id+"").style.display = "block"; 
+	} 
+
+
+function hiddenPic(id){ 
+	document.getElementById("Layer"+id+"").style.display = "none"; 
+	}
+
+function deletes(id){
+	
+	if(confirm('确定删除吗？')){
+	      window.location.href=ctx+'/carousel/deleteCarouselInfo?id='+id;
+	 }
+}
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/carousel/editCarousel.js b/pluss-manage-page/src/main/resources/static/resources/auth/carousel/editCarousel.js
new file mode 100644
index 0000000..a608031
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/carousel/editCarousel.js
@@ -0,0 +1,45 @@
+var is = false;
+$(function() {
+	// 初始化页面
+	$("#te").on('click',function(){
+		$("#title").focus();
+	})
+		$("#st").on('click',function(){
+		$("#sort").focus();
+	})
+	var myfile = document.getElementById('qwer');
+	myfile.remove();
+	$("#img")
+			.append(
+					"<span class='file-wrapper' id='qwer'>"
+							+ "<img src='"
+							+ res
+							+ "/third-party/img/message/upload.png'/>"
+							+ "<input type='file' name='upload1' id='upload1' value='上传图片1' onchange='onUploadImgChange(this,1)'/>"
+							+ "</span>");
+	// 提交表单
+	$("#compere_btn_save").on('click', function() {
+		validate();
+		if (is) {
+			document.form1.action = "/auth/carousel/saveCarouselInfoList";
+			document.form1.submit();
+		}
+	});
+	$("#compere_btn_edit").on('click', function() {
+		validate();
+		if (is) {
+			document.form1.action = "/auth/carousel/editCarouselInfo?id=" + id;
+			document.form1.submit();
+		}
+	});
+});
+function validate() {
+	if ($("#title").val()=="") {
+		alert('标题不能为空！');
+		return;
+	} else if ($("#upload1").val()=="") {
+		alert('您还没有上传图片！');
+		return;
+	} else
+		is = true;
+}
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/css/animate.css b/pluss-manage-page/src/main/resources/static/resources/auth/css/animate.css
new file mode 100644
index 0000000..0f9fba1
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/css/animate.css
@@ -0,0 +1,2848 @@
+@charset "UTF-8";
+
+/*!
+Animate.css - http://daneden.me/animate
+Licensed under the MIT license
+
+Copyright (c) 2013 Daniel Eden
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+.animated {
+    -webkit-animation-duration: 1s;
+    animation-duration: 1s;
+    -webkit-animation-fill-mode: both;
+    animation-fill-mode: both;
+    z-index: 100;
+}
+
+.animated.infinite {
+    -webkit-animation-iteration-count: infinite;
+    animation-iteration-count: infinite;
+}
+
+.animated.hinge {
+    -webkit-animation-duration: 2s;
+    animation-duration: 2s;
+}
+
+@-webkit-keyframes bounce {
+    0%, 20%, 50%, 80%, 100% {
+        -webkit-transform: translateY(0);
+        transform: translateY(0);
+    }
+
+    40% {
+        -webkit-transform: translateY(-30px);
+        transform: translateY(-30px);
+    }
+
+    60% {
+        -webkit-transform: translateY(-15px);
+        transform: translateY(-15px);
+    }
+}
+
+@keyframes bounce {
+    0%, 20%, 50%, 80%, 100% {
+        -webkit-transform: translateY(0);
+        -ms-transform: translateY(0);
+        transform: translateY(0);
+    }
+
+    40% {
+        -webkit-transform: translateY(-30px);
+        -ms-transform: translateY(-30px);
+        transform: translateY(-30px);
+    }
+
+    60% {
+        -webkit-transform: translateY(-15px);
+        -ms-transform: translateY(-15px);
+        transform: translateY(-15px);
+    }
+}
+
+.bounce {
+    -webkit-animation-name: bounce;
+    animation-name: bounce;
+}
+
+@-webkit-keyframes flash {
+    0%, 50%, 100% {
+        opacity: 1;
+    }
+
+    25%, 75% {
+        opacity: 0;
+    }
+}
+
+@keyframes flash {
+    0%, 50%, 100% {
+        opacity: 1;
+    }
+
+    25%, 75% {
+        opacity: 0;
+    }
+}
+
+.flash {
+    -webkit-animation-name: flash;
+    animation-name: flash;
+}
+
+/* originally authored by Nick Pettit - https://github.com/nickpettit/glide */
+
+@-webkit-keyframes pulse {
+    0% {
+        -webkit-transform: scale(1);
+        transform: scale(1);
+    }
+
+    50% {
+        -webkit-transform: scale(1.1);
+        transform: scale(1.1);
+    }
+
+    100% {
+        -webkit-transform: scale(1);
+        transform: scale(1);
+    }
+}
+
+@keyframes pulse {
+    0% {
+        -webkit-transform: scale(1);
+        -ms-transform: scale(1);
+        transform: scale(1);
+    }
+
+    50% {
+        -webkit-transform: scale(1.1);
+        -ms-transform: scale(1.1);
+        transform: scale(1.1);
+    }
+
+    100% {
+        -webkit-transform: scale(1);
+        -ms-transform: scale(1);
+        transform: scale(1);
+    }
+}
+
+.pulse {
+    -webkit-animation-name: pulse;
+    animation-name: pulse;
+}
+
+@-webkit-keyframes rubberBand {
+    0% {
+        -webkit-transform: scale(1);
+        transform: scale(1);
+    }
+
+    30% {
+        -webkit-transform: scaleX(1.25) scaleY(0.75);
+        transform: scaleX(1.25) scaleY(0.75);
+    }
+
+    40% {
+        -webkit-transform: scaleX(0.75) scaleY(1.25);
+        transform: scaleX(0.75) scaleY(1.25);
+    }
+
+    60% {
+        -webkit-transform: scaleX(1.15) scaleY(0.85);
+        transform: scaleX(1.15) scaleY(0.85);
+    }
+
+    100% {
+        -webkit-transform: scale(1);
+        transform: scale(1);
+    }
+}
+
+@keyframes rubberBand {
+    0% {
+        -webkit-transform: scale(1);
+        -ms-transform: scale(1);
+        transform: scale(1);
+    }
+
+    30% {
+        -webkit-transform: scaleX(1.25) scaleY(0.75);
+        -ms-transform: scaleX(1.25) scaleY(0.75);
+        transform: scaleX(1.25) scaleY(0.75);
+    }
+
+    40% {
+        -webkit-transform: scaleX(0.75) scaleY(1.25);
+        -ms-transform: scaleX(0.75) scaleY(1.25);
+        transform: scaleX(0.75) scaleY(1.25);
+    }
+
+    60% {
+        -webkit-transform: scaleX(1.15) scaleY(0.85);
+        -ms-transform: scaleX(1.15) scaleY(0.85);
+        transform: scaleX(1.15) scaleY(0.85);
+    }
+
+    100% {
+        -webkit-transform: scale(1);
+        -ms-transform: scale(1);
+        transform: scale(1);
+    }
+}
+
+.rubberBand {
+    -webkit-animation-name: rubberBand;
+    animation-name: rubberBand;
+}
+
+@-webkit-keyframes shake {
+    0%, 100% {
+        -webkit-transform: translateX(0);
+        transform: translateX(0);
+    }
+
+    10%, 30%, 50%, 70%, 90% {
+        -webkit-transform: translateX(-10px);
+        transform: translateX(-10px);
+    }
+
+    20%, 40%, 60%, 80% {
+        -webkit-transform: translateX(10px);
+        transform: translateX(10px);
+    }
+}
+
+@keyframes shake {
+    0%, 100% {
+        -webkit-transform: translateX(0);
+        -ms-transform: translateX(0);
+        transform: translateX(0);
+    }
+
+    10%, 30%, 50%, 70%, 90% {
+        -webkit-transform: translateX(-10px);
+        -ms-transform: translateX(-10px);
+        transform: translateX(-10px);
+    }
+
+    20%, 40%, 60%, 80% {
+        -webkit-transform: translateX(10px);
+        -ms-transform: translateX(10px);
+        transform: translateX(10px);
+    }
+}
+
+.shake {
+    -webkit-animation-name: shake;
+    animation-name: shake;
+}
+
+@-webkit-keyframes swing {
+    20% {
+        -webkit-transform: rotate(15deg);
+        transform: rotate(15deg);
+    }
+
+    40% {
+        -webkit-transform: rotate(-10deg);
+        transform: rotate(-10deg);
+    }
+
+    60% {
+        -webkit-transform: rotate(5deg);
+        transform: rotate(5deg);
+    }
+
+    80% {
+        -webkit-transform: rotate(-5deg);
+        transform: rotate(-5deg);
+    }
+
+    100% {
+        -webkit-transform: rotate(0deg);
+        transform: rotate(0deg);
+    }
+}
+
+@keyframes swing {
+    20% {
+        -webkit-transform: rotate(15deg);
+        -ms-transform: rotate(15deg);
+        transform: rotate(15deg);
+    }
+
+    40% {
+        -webkit-transform: rotate(-10deg);
+        -ms-transform: rotate(-10deg);
+        transform: rotate(-10deg);
+    }
+
+    60% {
+        -webkit-transform: rotate(5deg);
+        -ms-transform: rotate(5deg);
+        transform: rotate(5deg);
+    }
+
+    80% {
+        -webkit-transform: rotate(-5deg);
+        -ms-transform: rotate(-5deg);
+        transform: rotate(-5deg);
+    }
+
+    100% {
+        -webkit-transform: rotate(0deg);
+        -ms-transform: rotate(0deg);
+        transform: rotate(0deg);
+    }
+}
+
+.swing {
+    -webkit-transform-origin: top center;
+    -ms-transform-origin: top center;
+    transform-origin: top center;
+    -webkit-animation-name: swing;
+    animation-name: swing;
+}
+
+@-webkit-keyframes tada {
+    0% {
+        -webkit-transform: scale(1);
+        transform: scale(1);
+    }
+
+    10%, 20% {
+        -webkit-transform: scale(0.9) rotate(-3deg);
+        transform: scale(0.9) rotate(-3deg);
+    }
+
+    30%, 50%, 70%, 90% {
+        -webkit-transform: scale(1.1) rotate(3deg);
+        transform: scale(1.1) rotate(3deg);
+    }
+
+    40%, 60%, 80% {
+        -webkit-transform: scale(1.1) rotate(-3deg);
+        transform: scale(1.1) rotate(-3deg);
+    }
+
+    100% {
+        -webkit-transform: scale(1) rotate(0);
+        transform: scale(1) rotate(0);
+    }
+}
+
+@keyframes tada {
+    0% {
+        -webkit-transform: scale(1);
+        -ms-transform: scale(1);
+        transform: scale(1);
+    }
+
+    10%, 20% {
+        -webkit-transform: scale(0.9) rotate(-3deg);
+        -ms-transform: scale(0.9) rotate(-3deg);
+        transform: scale(0.9) rotate(-3deg);
+    }
+
+    30%, 50%, 70%, 90% {
+        -webkit-transform: scale(1.1) rotate(3deg);
+        -ms-transform: scale(1.1) rotate(3deg);
+        transform: scale(1.1) rotate(3deg);
+    }
+
+    40%, 60%, 80% {
+        -webkit-transform: scale(1.1) rotate(-3deg);
+        -ms-transform: scale(1.1) rotate(-3deg);
+        transform: scale(1.1) rotate(-3deg);
+    }
+
+    100% {
+        -webkit-transform: scale(1) rotate(0);
+        -ms-transform: scale(1) rotate(0);
+        transform: scale(1) rotate(0);
+    }
+}
+
+.tada {
+    -webkit-animation-name: tada;
+    animation-name: tada;
+}
+
+/* originally authored by Nick Pettit - https://github.com/nickpettit/glide */
+
+@-webkit-keyframes wobble {
+    0% {
+        -webkit-transform: translateX(0%);
+        transform: translateX(0%);
+    }
+
+    15% {
+        -webkit-transform: translateX(-25%) rotate(-5deg);
+        transform: translateX(-25%) rotate(-5deg);
+    }
+
+    30% {
+        -webkit-transform: translateX(20%) rotate(3deg);
+        transform: translateX(20%) rotate(3deg);
+    }
+
+    45% {
+        -webkit-transform: translateX(-15%) rotate(-3deg);
+        transform: translateX(-15%) rotate(-3deg);
+    }
+
+    60% {
+        -webkit-transform: translateX(10%) rotate(2deg);
+        transform: translateX(10%) rotate(2deg);
+    }
+
+    75% {
+        -webkit-transform: translateX(-5%) rotate(-1deg);
+        transform: translateX(-5%) rotate(-1deg);
+    }
+
+    100% {
+        -webkit-transform: translateX(0%);
+        transform: translateX(0%);
+    }
+}
+
+@keyframes wobble {
+    0% {
+        -webkit-transform: translateX(0%);
+        -ms-transform: translateX(0%);
+        transform: translateX(0%);
+    }
+
+    15% {
+        -webkit-transform: translateX(-25%) rotate(-5deg);
+        -ms-transform: translateX(-25%) rotate(-5deg);
+        transform: translateX(-25%) rotate(-5deg);
+    }
+
+    30% {
+        -webkit-transform: translateX(20%) rotate(3deg);
+        -ms-transform: translateX(20%) rotate(3deg);
+        transform: translateX(20%) rotate(3deg);
+    }
+
+    45% {
+        -webkit-transform: translateX(-15%) rotate(-3deg);
+        -ms-transform: translateX(-15%) rotate(-3deg);
+        transform: translateX(-15%) rotate(-3deg);
+    }
+
+    60% {
+        -webkit-transform: translateX(10%) rotate(2deg);
+        -ms-transform: translateX(10%) rotate(2deg);
+        transform: translateX(10%) rotate(2deg);
+    }
+
+    75% {
+        -webkit-transform: translateX(-5%) rotate(-1deg);
+        -ms-transform: translateX(-5%) rotate(-1deg);
+        transform: translateX(-5%) rotate(-1deg);
+    }
+
+    100% {
+        -webkit-transform: translateX(0%);
+        -ms-transform: translateX(0%);
+        transform: translateX(0%);
+    }
+}
+
+.wobble {
+    -webkit-animation-name: wobble;
+    animation-name: wobble;
+}
+
+@-webkit-keyframes bounceIn {
+    0% {
+        opacity: 0;
+        -webkit-transform: scale(.3);
+        transform: scale(.3);
+    }
+
+    50% {
+        opacity: 1;
+        -webkit-transform: scale(1.05);
+        transform: scale(1.05);
+    }
+
+    70% {
+        -webkit-transform: scale(.9);
+        transform: scale(.9);
+    }
+
+    100% {
+        opacity: 1;
+        -webkit-transform: scale(1);
+        transform: scale(1);
+    }
+}
+
+@keyframes bounceIn {
+    0% {
+        opacity: 0;
+        -webkit-transform: scale(.3);
+        -ms-transform: scale(.3);
+        transform: scale(.3);
+    }
+
+    50% {
+        opacity: 1;
+        -webkit-transform: scale(1.05);
+        -ms-transform: scale(1.05);
+        transform: scale(1.05);
+    }
+
+    70% {
+        -webkit-transform: scale(.9);
+        -ms-transform: scale(.9);
+        transform: scale(.9);
+    }
+
+    100% {
+        opacity: 1;
+        -webkit-transform: scale(1);
+        -ms-transform: scale(1);
+        transform: scale(1);
+    }
+}
+
+.bounceIn {
+    -webkit-animation-name: bounceIn;
+    animation-name: bounceIn;
+}
+
+@-webkit-keyframes bounceInDown {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateY(-2000px);
+        transform: translateY(-2000px);
+    }
+
+    60% {
+        opacity: 1;
+        -webkit-transform: translateY(30px);
+        transform: translateY(30px);
+    }
+
+    80% {
+        -webkit-transform: translateY(-10px);
+        transform: translateY(-10px);
+    }
+
+    100% {
+        -webkit-transform: translateY(0);
+        transform: translateY(0);
+    }
+}
+
+@keyframes bounceInDown {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateY(-2000px);
+        -ms-transform: translateY(-2000px);
+        transform: translateY(-2000px);
+    }
+
+    60% {
+        opacity: 1;
+        -webkit-transform: translateY(30px);
+        -ms-transform: translateY(30px);
+        transform: translateY(30px);
+    }
+
+    80% {
+        -webkit-transform: translateY(-10px);
+        -ms-transform: translateY(-10px);
+        transform: translateY(-10px);
+    }
+
+    100% {
+        -webkit-transform: translateY(0);
+        -ms-transform: translateY(0);
+        transform: translateY(0);
+    }
+}
+
+.bounceInDown {
+    -webkit-animation-name: bounceInDown;
+    animation-name: bounceInDown;
+}
+
+@-webkit-keyframes bounceInLeft {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateX(-2000px);
+        transform: translateX(-2000px);
+    }
+
+    60% {
+        opacity: 1;
+        -webkit-transform: translateX(30px);
+        transform: translateX(30px);
+    }
+
+    80% {
+        -webkit-transform: translateX(-10px);
+        transform: translateX(-10px);
+    }
+
+    100% {
+        -webkit-transform: translateX(0);
+        transform: translateX(0);
+    }
+}
+
+@keyframes bounceInLeft {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateX(-2000px);
+        -ms-transform: translateX(-2000px);
+        transform: translateX(-2000px);
+    }
+
+    60% {
+        opacity: 1;
+        -webkit-transform: translateX(30px);
+        -ms-transform: translateX(30px);
+        transform: translateX(30px);
+    }
+
+    80% {
+        -webkit-transform: translateX(-10px);
+        -ms-transform: translateX(-10px);
+        transform: translateX(-10px);
+    }
+
+    100% {
+        -webkit-transform: translateX(0);
+        -ms-transform: translateX(0);
+        transform: translateX(0);
+    }
+}
+
+.bounceInLeft {
+    -webkit-animation-name: bounceInLeft;
+    animation-name: bounceInLeft;
+}
+
+@-webkit-keyframes bounceInRight {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateX(2000px);
+        transform: translateX(2000px);
+    }
+
+    60% {
+        opacity: 1;
+        -webkit-transform: translateX(-30px);
+        transform: translateX(-30px);
+    }
+
+    80% {
+        -webkit-transform: translateX(10px);
+        transform: translateX(10px);
+    }
+
+    100% {
+        -webkit-transform: translateX(0);
+        transform: translateX(0);
+    }
+}
+
+@keyframes bounceInRight {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateX(2000px);
+        -ms-transform: translateX(2000px);
+        transform: translateX(2000px);
+    }
+
+    60% {
+        opacity: 1;
+        -webkit-transform: translateX(-30px);
+        -ms-transform: translateX(-30px);
+        transform: translateX(-30px);
+    }
+
+    80% {
+        -webkit-transform: translateX(10px);
+        -ms-transform: translateX(10px);
+        transform: translateX(10px);
+    }
+
+    100% {
+        -webkit-transform: translateX(0);
+        -ms-transform: translateX(0);
+        transform: translateX(0);
+    }
+}
+
+.bounceInRight {
+    -webkit-animation-name: bounceInRight;
+    animation-name: bounceInRight;
+}
+
+@-webkit-keyframes bounceInUp {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateY(2000px);
+        transform: translateY(2000px);
+    }
+
+    60% {
+        opacity: 1;
+        -webkit-transform: translateY(-30px);
+        transform: translateY(-30px);
+    }
+
+    80% {
+        -webkit-transform: translateY(10px);
+        transform: translateY(10px);
+    }
+
+    100% {
+        -webkit-transform: translateY(0);
+        transform: translateY(0);
+    }
+}
+
+@keyframes bounceInUp {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateY(2000px);
+        -ms-transform: translateY(2000px);
+        transform: translateY(2000px);
+    }
+
+    60% {
+        opacity: 1;
+        -webkit-transform: translateY(-30px);
+        -ms-transform: translateY(-30px);
+        transform: translateY(-30px);
+    }
+
+    80% {
+        -webkit-transform: translateY(10px);
+        -ms-transform: translateY(10px);
+        transform: translateY(10px);
+    }
+
+    100% {
+        -webkit-transform: translateY(0);
+        -ms-transform: translateY(0);
+        transform: translateY(0);
+    }
+}
+
+.bounceInUp {
+    -webkit-animation-name: bounceInUp;
+    animation-name: bounceInUp;
+}
+
+@-webkit-keyframes bounceOut {
+    0% {
+        -webkit-transform: scale(1);
+        transform: scale(1);
+    }
+
+    25% {
+        -webkit-transform: scale(.95);
+        transform: scale(.95);
+    }
+
+    50% {
+        opacity: 1;
+        -webkit-transform: scale(1.1);
+        transform: scale(1.1);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: scale(.3);
+        transform: scale(.3);
+    }
+}
+
+@keyframes bounceOut {
+    0% {
+        -webkit-transform: scale(1);
+        -ms-transform: scale(1);
+        transform: scale(1);
+    }
+
+    25% {
+        -webkit-transform: scale(.95);
+        -ms-transform: scale(.95);
+        transform: scale(.95);
+    }
+
+    50% {
+        opacity: 1;
+        -webkit-transform: scale(1.1);
+        -ms-transform: scale(1.1);
+        transform: scale(1.1);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: scale(.3);
+        -ms-transform: scale(.3);
+        transform: scale(.3);
+    }
+}
+
+.bounceOut {
+    -webkit-animation-name: bounceOut;
+    animation-name: bounceOut;
+}
+
+@-webkit-keyframes bounceOutDown {
+    0% {
+        -webkit-transform: translateY(0);
+        transform: translateY(0);
+    }
+
+    20% {
+        opacity: 1;
+        -webkit-transform: translateY(-20px);
+        transform: translateY(-20px);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateY(2000px);
+        transform: translateY(2000px);
+    }
+}
+
+@keyframes bounceOutDown {
+    0% {
+        -webkit-transform: translateY(0);
+        -ms-transform: translateY(0);
+        transform: translateY(0);
+    }
+
+    20% {
+        opacity: 1;
+        -webkit-transform: translateY(-20px);
+        -ms-transform: translateY(-20px);
+        transform: translateY(-20px);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateY(2000px);
+        -ms-transform: translateY(2000px);
+        transform: translateY(2000px);
+    }
+}
+
+.bounceOutDown {
+    -webkit-animation-name: bounceOutDown;
+    animation-name: bounceOutDown;
+}
+
+@-webkit-keyframes bounceOutLeft {
+    0% {
+        -webkit-transform: translateX(0);
+        transform: translateX(0);
+    }
+
+    20% {
+        opacity: 1;
+        -webkit-transform: translateX(20px);
+        transform: translateX(20px);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateX(-2000px);
+        transform: translateX(-2000px);
+    }
+}
+
+@keyframes bounceOutLeft {
+    0% {
+        -webkit-transform: translateX(0);
+        -ms-transform: translateX(0);
+        transform: translateX(0);
+    }
+
+    20% {
+        opacity: 1;
+        -webkit-transform: translateX(20px);
+        -ms-transform: translateX(20px);
+        transform: translateX(20px);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateX(-2000px);
+        -ms-transform: translateX(-2000px);
+        transform: translateX(-2000px);
+    }
+}
+
+.bounceOutLeft {
+    -webkit-animation-name: bounceOutLeft;
+    animation-name: bounceOutLeft;
+}
+
+@-webkit-keyframes bounceOutRight {
+    0% {
+        -webkit-transform: translateX(0);
+        transform: translateX(0);
+    }
+
+    20% {
+        opacity: 1;
+        -webkit-transform: translateX(-20px);
+        transform: translateX(-20px);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateX(2000px);
+        transform: translateX(2000px);
+    }
+}
+
+@keyframes bounceOutRight {
+    0% {
+        -webkit-transform: translateX(0);
+        -ms-transform: translateX(0);
+        transform: translateX(0);
+    }
+
+    20% {
+        opacity: 1;
+        -webkit-transform: translateX(-20px);
+        -ms-transform: translateX(-20px);
+        transform: translateX(-20px);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateX(2000px);
+        -ms-transform: translateX(2000px);
+        transform: translateX(2000px);
+    }
+}
+
+.bounceOutRight {
+    -webkit-animation-name: bounceOutRight;
+    animation-name: bounceOutRight;
+}
+
+@-webkit-keyframes bounceOutUp {
+    0% {
+        -webkit-transform: translateY(0);
+        transform: translateY(0);
+    }
+
+    20% {
+        opacity: 1;
+        -webkit-transform: translateY(20px);
+        transform: translateY(20px);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateY(-2000px);
+        transform: translateY(-2000px);
+    }
+}
+
+@keyframes bounceOutUp {
+    0% {
+        -webkit-transform: translateY(0);
+        -ms-transform: translateY(0);
+        transform: translateY(0);
+    }
+
+    20% {
+        opacity: 1;
+        -webkit-transform: translateY(20px);
+        -ms-transform: translateY(20px);
+        transform: translateY(20px);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateY(-2000px);
+        -ms-transform: translateY(-2000px);
+        transform: translateY(-2000px);
+    }
+}
+
+.bounceOutUp {
+    -webkit-animation-name: bounceOutUp;
+    animation-name: bounceOutUp;
+}
+
+@-webkit-keyframes fadeIn {
+    0% {
+        opacity: 0;
+    }
+
+    100% {
+        opacity: 1;
+    }
+}
+
+@keyframes fadeIn {
+    0% {
+        opacity: 0;
+    }
+
+    100% {
+        opacity: 1;
+    }
+}
+
+.fadeIn {
+    -webkit-animation-name: fadeIn;
+    animation-name: fadeIn;
+}
+
+@-webkit-keyframes fadeInDown {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateY(-20px);
+        transform: translateY(-20px);
+    }
+
+    100% {
+        opacity: 1;
+        -webkit-transform: translateY(0);
+        transform: translateY(0);
+    }
+}
+
+@keyframes fadeInDown {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateY(-20px);
+        -ms-transform: translateY(-20px);
+        transform: translateY(-20px);
+    }
+
+    100% {
+        opacity: 1;
+        -webkit-transform: translateY(0);
+        -ms-transform: translateY(0);
+        transform: translateY(0);
+    }
+}
+
+.fadeInDown {
+    -webkit-animation-name: fadeInDown;
+    animation-name: fadeInDown;
+}
+
+@-webkit-keyframes fadeInDownBig {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateY(-2000px);
+        transform: translateY(-2000px);
+    }
+
+    100% {
+        opacity: 1;
+        -webkit-transform: translateY(0);
+        transform: translateY(0);
+    }
+}
+
+@keyframes fadeInDownBig {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateY(-2000px);
+        -ms-transform: translateY(-2000px);
+        transform: translateY(-2000px);
+    }
+
+    100% {
+        opacity: 1;
+        -webkit-transform: translateY(0);
+        -ms-transform: translateY(0);
+        transform: translateY(0);
+    }
+}
+
+.fadeInDownBig {
+    -webkit-animation-name: fadeInDownBig;
+    animation-name: fadeInDownBig;
+}
+
+@-webkit-keyframes fadeInLeft {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateX(-20px);
+        transform: translateX(-20px);
+    }
+
+    100% {
+        opacity: 1;
+        -webkit-transform: translateX(0);
+        transform: translateX(0);
+    }
+}
+
+@keyframes fadeInLeft {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateX(-20px);
+        -ms-transform: translateX(-20px);
+        transform: translateX(-20px);
+    }
+
+    100% {
+        opacity: 1;
+        -webkit-transform: translateX(0);
+        -ms-transform: translateX(0);
+        transform: translateX(0);
+    }
+}
+
+.fadeInLeft {
+    -webkit-animation-name: fadeInLeft;
+    animation-name: fadeInLeft;
+}
+
+@-webkit-keyframes fadeInLeftBig {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateX(-2000px);
+        transform: translateX(-2000px);
+    }
+
+    100% {
+        opacity: 1;
+        -webkit-transform: translateX(0);
+        transform: translateX(0);
+    }
+}
+
+@keyframes fadeInLeftBig {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateX(-2000px);
+        -ms-transform: translateX(-2000px);
+        transform: translateX(-2000px);
+    }
+
+    100% {
+        opacity: 1;
+        -webkit-transform: translateX(0);
+        -ms-transform: translateX(0);
+        transform: translateX(0);
+    }
+}
+
+.fadeInLeftBig {
+    -webkit-animation-name: fadeInLeftBig;
+    animation-name: fadeInLeftBig;
+}
+
+@-webkit-keyframes fadeInRight {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateX(20px);
+        transform: translateX(20px);
+    }
+
+    100% {
+        opacity: 1;
+        -webkit-transform: translateX(0);
+        transform: translateX(0);
+    }
+}
+
+@keyframes fadeInRight {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateX(40px);
+        -ms-transform: translateX(40px);
+        transform: translateX(40px);
+    }
+
+    100% {
+        opacity: 1;
+        -webkit-transform: translateX(0);
+        -ms-transform: translateX(0);
+        transform: translateX(0);
+    }
+}
+
+.fadeInRight {
+    -webkit-animation-name: fadeInRight;
+    animation-name: fadeInRight;
+}
+
+@-webkit-keyframes fadeInRightBig {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateX(2000px);
+        transform: translateX(2000px);
+    }
+
+    100% {
+        opacity: 1;
+        -webkit-transform: translateX(0);
+        transform: translateX(0);
+    }
+}
+
+@keyframes fadeInRightBig {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateX(2000px);
+        -ms-transform: translateX(2000px);
+        transform: translateX(2000px);
+    }
+
+    100% {
+        opacity: 1;
+        -webkit-transform: translateX(0);
+        -ms-transform: translateX(0);
+        transform: translateX(0);
+    }
+}
+
+.fadeInRightBig {
+    -webkit-animation-name: fadeInRightBig;
+    animation-name: fadeInRightBig;
+}
+
+@-webkit-keyframes fadeInUp {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateY(20px);
+        transform: translateY(20px);
+    }
+
+    100% {
+        opacity: 1;
+        -webkit-transform: translateY(0);
+        transform: translateY(0);
+    }
+}
+
+@keyframes fadeInUp {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateY(20px);
+        -ms-transform: translateY(20px);
+        transform: translateY(20px);
+    }
+
+    100% {
+        opacity: 1;
+        -webkit-transform: translateY(0);
+        -ms-transform: translateY(0);
+        transform: translateY(0);
+    }
+}
+
+.fadeInUp {
+    -webkit-animation-name: fadeInUp;
+    animation-name: fadeInUp;
+}
+
+@-webkit-keyframes fadeInUpBig {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateY(2000px);
+        transform: translateY(2000px);
+    }
+
+    100% {
+        opacity: 1;
+        -webkit-transform: translateY(0);
+        transform: translateY(0);
+    }
+}
+
+@keyframes fadeInUpBig {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateY(2000px);
+        -ms-transform: translateY(2000px);
+        transform: translateY(2000px);
+    }
+
+    100% {
+        opacity: 1;
+        -webkit-transform: translateY(0);
+        -ms-transform: translateY(0);
+        transform: translateY(0);
+    }
+}
+
+.fadeInUpBig {
+    -webkit-animation-name: fadeInUpBig;
+    animation-name: fadeInUpBig;
+}
+
+@-webkit-keyframes fadeOut {
+    0% {
+        opacity: 1;
+    }
+
+    100% {
+        opacity: 0;
+    }
+}
+
+@keyframes fadeOut {
+    0% {
+        opacity: 1;
+    }
+
+    100% {
+        opacity: 0;
+    }
+}
+
+.fadeOut {
+    -webkit-animation-name: fadeOut;
+    animation-name: fadeOut;
+}
+
+@-webkit-keyframes fadeOutDown {
+    0% {
+        opacity: 1;
+        -webkit-transform: translateY(0);
+        transform: translateY(0);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateY(20px);
+        transform: translateY(20px);
+    }
+}
+
+@keyframes fadeOutDown {
+    0% {
+        opacity: 1;
+        -webkit-transform: translateY(0);
+        -ms-transform: translateY(0);
+        transform: translateY(0);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateY(20px);
+        -ms-transform: translateY(20px);
+        transform: translateY(20px);
+    }
+}
+
+.fadeOutDown {
+    -webkit-animation-name: fadeOutDown;
+    animation-name: fadeOutDown;
+}
+
+@-webkit-keyframes fadeOutDownBig {
+    0% {
+        opacity: 1;
+        -webkit-transform: translateY(0);
+        transform: translateY(0);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateY(2000px);
+        transform: translateY(2000px);
+    }
+}
+
+@keyframes fadeOutDownBig {
+    0% {
+        opacity: 1;
+        -webkit-transform: translateY(0);
+        -ms-transform: translateY(0);
+        transform: translateY(0);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateY(2000px);
+        -ms-transform: translateY(2000px);
+        transform: translateY(2000px);
+    }
+}
+
+.fadeOutDownBig {
+    -webkit-animation-name: fadeOutDownBig;
+    animation-name: fadeOutDownBig;
+}
+
+@-webkit-keyframes fadeOutLeft {
+    0% {
+        opacity: 1;
+        -webkit-transform: translateX(0);
+        transform: translateX(0);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateX(-20px);
+        transform: translateX(-20px);
+    }
+}
+
+@keyframes fadeOutLeft {
+    0% {
+        opacity: 1;
+        -webkit-transform: translateX(0);
+        -ms-transform: translateX(0);
+        transform: translateX(0);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateX(-20px);
+        -ms-transform: translateX(-20px);
+        transform: translateX(-20px);
+    }
+}
+
+.fadeOutLeft {
+    -webkit-animation-name: fadeOutLeft;
+    animation-name: fadeOutLeft;
+}
+
+@-webkit-keyframes fadeOutLeftBig {
+    0% {
+        opacity: 1;
+        -webkit-transform: translateX(0);
+        transform: translateX(0);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateX(-2000px);
+        transform: translateX(-2000px);
+    }
+}
+
+@keyframes fadeOutLeftBig {
+    0% {
+        opacity: 1;
+        -webkit-transform: translateX(0);
+        -ms-transform: translateX(0);
+        transform: translateX(0);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateX(-2000px);
+        -ms-transform: translateX(-2000px);
+        transform: translateX(-2000px);
+    }
+}
+
+.fadeOutLeftBig {
+    -webkit-animation-name: fadeOutLeftBig;
+    animation-name: fadeOutLeftBig;
+}
+
+@-webkit-keyframes fadeOutRight {
+    0% {
+        opacity: 1;
+        -webkit-transform: translateX(0);
+        transform: translateX(0);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateX(20px);
+        transform: translateX(20px);
+    }
+}
+
+@keyframes fadeOutRight {
+    0% {
+        opacity: 1;
+        -webkit-transform: translateX(0);
+        -ms-transform: translateX(0);
+        transform: translateX(0);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateX(20px);
+        -ms-transform: translateX(20px);
+        transform: translateX(20px);
+    }
+}
+
+.fadeOutRight {
+    -webkit-animation-name: fadeOutRight;
+    animation-name: fadeOutRight;
+}
+
+@-webkit-keyframes fadeOutRightBig {
+    0% {
+        opacity: 1;
+        -webkit-transform: translateX(0);
+        transform: translateX(0);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateX(2000px);
+        transform: translateX(2000px);
+    }
+}
+
+@keyframes fadeOutRightBig {
+    0% {
+        opacity: 1;
+        -webkit-transform: translateX(0);
+        -ms-transform: translateX(0);
+        transform: translateX(0);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateX(2000px);
+        -ms-transform: translateX(2000px);
+        transform: translateX(2000px);
+    }
+}
+
+.fadeOutRightBig {
+    -webkit-animation-name: fadeOutRightBig;
+    animation-name: fadeOutRightBig;
+}
+
+@-webkit-keyframes fadeOutUp {
+    0% {
+        opacity: 1;
+        -webkit-transform: translateY(0);
+        transform: translateY(0);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateY(-20px);
+        transform: translateY(-20px);
+    }
+}
+
+@keyframes fadeOutUp {
+    0% {
+        opacity: 1;
+        -webkit-transform: translateY(0);
+        -ms-transform: translateY(0);
+        transform: translateY(0);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateY(-20px);
+        -ms-transform: translateY(-20px);
+        transform: translateY(-20px);
+    }
+}
+
+.fadeOutUp {
+    -webkit-animation-name: fadeOutUp;
+    animation-name: fadeOutUp;
+}
+
+@-webkit-keyframes fadeOutUpBig {
+    0% {
+        opacity: 1;
+        -webkit-transform: translateY(0);
+        transform: translateY(0);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateY(-2000px);
+        transform: translateY(-2000px);
+    }
+}
+
+@keyframes fadeOutUpBig {
+    0% {
+        opacity: 1;
+        -webkit-transform: translateY(0);
+        -ms-transform: translateY(0);
+        transform: translateY(0);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateY(-2000px);
+        -ms-transform: translateY(-2000px);
+        transform: translateY(-2000px);
+    }
+}
+
+.fadeOutUpBig {
+    -webkit-animation-name: fadeOutUpBig;
+    animation-name: fadeOutUpBig;
+}
+
+@-webkit-keyframes flip {
+    0% {
+        -webkit-transform: perspective(400px) translateZ(0) rotateY(0) scale(1);
+        transform: perspective(400px) translateZ(0) rotateY(0) scale(1);
+        -webkit-animation-timing-function: ease-out;
+        animation-timing-function: ease-out;
+    }
+
+    40% {
+        -webkit-transform: perspective(400px) translateZ(150px) rotateY(170deg) scale(1);
+        transform: perspective(400px) translateZ(150px) rotateY(170deg) scale(1);
+        -webkit-animation-timing-function: ease-out;
+        animation-timing-function: ease-out;
+    }
+
+    50% {
+        -webkit-transform: perspective(400px) translateZ(150px) rotateY(190deg) scale(1);
+        transform: perspective(400px) translateZ(150px) rotateY(190deg) scale(1);
+        -webkit-animation-timing-function: ease-in;
+        animation-timing-function: ease-in;
+    }
+
+    80% {
+        -webkit-transform: perspective(400px) translateZ(0) rotateY(360deg) scale(.95);
+        transform: perspective(400px) translateZ(0) rotateY(360deg) scale(.95);
+        -webkit-animation-timing-function: ease-in;
+        animation-timing-function: ease-in;
+    }
+
+    100% {
+        -webkit-transform: perspective(400px) translateZ(0) rotateY(360deg) scale(1);
+        transform: perspective(400px) translateZ(0) rotateY(360deg) scale(1);
+        -webkit-animation-timing-function: ease-in;
+        animation-timing-function: ease-in;
+    }
+}
+
+@keyframes flip {
+    0% {
+        -webkit-transform: perspective(400px) translateZ(0) rotateY(0) scale(1);
+        -ms-transform: perspective(400px) translateZ(0) rotateY(0) scale(1);
+        transform: perspective(400px) translateZ(0) rotateY(0) scale(1);
+        -webkit-animation-timing-function: ease-out;
+        animation-timing-function: ease-out;
+    }
+
+    40% {
+        -webkit-transform: perspective(400px) translateZ(150px) rotateY(170deg) scale(1);
+        -ms-transform: perspective(400px) translateZ(150px) rotateY(170deg) scale(1);
+        transform: perspective(400px) translateZ(150px) rotateY(170deg) scale(1);
+        -webkit-animation-timing-function: ease-out;
+        animation-timing-function: ease-out;
+    }
+
+    50% {
+        -webkit-transform: perspective(400px) translateZ(150px) rotateY(190deg) scale(1);
+        -ms-transform: perspective(400px) translateZ(150px) rotateY(190deg) scale(1);
+        transform: perspective(400px) translateZ(150px) rotateY(190deg) scale(1);
+        -webkit-animation-timing-function: ease-in;
+        animation-timing-function: ease-in;
+    }
+
+    80% {
+        -webkit-transform: perspective(400px) translateZ(0) rotateY(360deg) scale(.95);
+        -ms-transform: perspective(400px) translateZ(0) rotateY(360deg) scale(.95);
+        transform: perspective(400px) translateZ(0) rotateY(360deg) scale(.95);
+        -webkit-animation-timing-function: ease-in;
+        animation-timing-function: ease-in;
+    }
+
+    100% {
+        -webkit-transform: perspective(400px) translateZ(0) rotateY(360deg) scale(1);
+        -ms-transform: perspective(400px) translateZ(0) rotateY(360deg) scale(1);
+        transform: perspective(400px) translateZ(0) rotateY(360deg) scale(1);
+        -webkit-animation-timing-function: ease-in;
+        animation-timing-function: ease-in;
+    }
+}
+
+.animated.flip {
+    -webkit-backface-visibility: visible;
+    -ms-backface-visibility: visible;
+    backface-visibility: visible;
+    -webkit-animation-name: flip;
+    animation-name: flip;
+}
+
+@-webkit-keyframes flipInX {
+    0% {
+        -webkit-transform: perspective(400px) rotateX(90deg);
+        transform: perspective(400px) rotateX(90deg);
+        opacity: 0;
+    }
+
+    40% {
+        -webkit-transform: perspective(400px) rotateX(-10deg);
+        transform: perspective(400px) rotateX(-10deg);
+    }
+
+    70% {
+        -webkit-transform: perspective(400px) rotateX(10deg);
+        transform: perspective(400px) rotateX(10deg);
+    }
+
+    100% {
+        -webkit-transform: perspective(400px) rotateX(0deg);
+        transform: perspective(400px) rotateX(0deg);
+        opacity: 1;
+    }
+}
+
+@keyframes flipInX {
+    0% {
+        -webkit-transform: perspective(400px) rotateX(90deg);
+        -ms-transform: perspective(400px) rotateX(90deg);
+        transform: perspective(400px) rotateX(90deg);
+        opacity: 0;
+    }
+
+    40% {
+        -webkit-transform: perspective(400px) rotateX(-10deg);
+        -ms-transform: perspective(400px) rotateX(-10deg);
+        transform: perspective(400px) rotateX(-10deg);
+    }
+
+    70% {
+        -webkit-transform: perspective(400px) rotateX(10deg);
+        -ms-transform: perspective(400px) rotateX(10deg);
+        transform: perspective(400px) rotateX(10deg);
+    }
+
+    100% {
+        -webkit-transform: perspective(400px) rotateX(0deg);
+        -ms-transform: perspective(400px) rotateX(0deg);
+        transform: perspective(400px) rotateX(0deg);
+        opacity: 1;
+    }
+}
+
+.flipInX {
+    -webkit-backface-visibility: visible !important;
+    -ms-backface-visibility: visible !important;
+    backface-visibility: visible !important;
+    -webkit-animation-name: flipInX;
+    animation-name: flipInX;
+}
+
+@-webkit-keyframes flipInY {
+    0% {
+        -webkit-transform: perspective(400px) rotateY(90deg);
+        transform: perspective(400px) rotateY(90deg);
+        opacity: 0;
+    }
+
+    40% {
+        -webkit-transform: perspective(400px) rotateY(-10deg);
+        transform: perspective(400px) rotateY(-10deg);
+    }
+
+    70% {
+        -webkit-transform: perspective(400px) rotateY(10deg);
+        transform: perspective(400px) rotateY(10deg);
+    }
+
+    100% {
+        -webkit-transform: perspective(400px) rotateY(0deg);
+        transform: perspective(400px) rotateY(0deg);
+        opacity: 1;
+    }
+}
+
+@keyframes flipInY {
+    0% {
+        -webkit-transform: perspective(400px) rotateY(90deg);
+        -ms-transform: perspective(400px) rotateY(90deg);
+        transform: perspective(400px) rotateY(90deg);
+        opacity: 0;
+    }
+
+    40% {
+        -webkit-transform: perspective(400px) rotateY(-10deg);
+        -ms-transform: perspective(400px) rotateY(-10deg);
+        transform: perspective(400px) rotateY(-10deg);
+    }
+
+    70% {
+        -webkit-transform: perspective(400px) rotateY(10deg);
+        -ms-transform: perspective(400px) rotateY(10deg);
+        transform: perspective(400px) rotateY(10deg);
+    }
+
+    100% {
+        -webkit-transform: perspective(400px) rotateY(0deg);
+        -ms-transform: perspective(400px) rotateY(0deg);
+        transform: perspective(400px) rotateY(0deg);
+        opacity: 1;
+    }
+}
+
+.flipInY {
+    -webkit-backface-visibility: visible !important;
+    -ms-backface-visibility: visible !important;
+    backface-visibility: visible !important;
+    -webkit-animation-name: flipInY;
+    animation-name: flipInY;
+}
+
+@-webkit-keyframes flipOutX {
+    0% {
+        -webkit-transform: perspective(400px) rotateX(0deg);
+        transform: perspective(400px) rotateX(0deg);
+        opacity: 1;
+    }
+
+    100% {
+        -webkit-transform: perspective(400px) rotateX(90deg);
+        transform: perspective(400px) rotateX(90deg);
+        opacity: 0;
+    }
+}
+
+@keyframes flipOutX {
+    0% {
+        -webkit-transform: perspective(400px) rotateX(0deg);
+        -ms-transform: perspective(400px) rotateX(0deg);
+        transform: perspective(400px) rotateX(0deg);
+        opacity: 1;
+    }
+
+    100% {
+        -webkit-transform: perspective(400px) rotateX(90deg);
+        -ms-transform: perspective(400px) rotateX(90deg);
+        transform: perspective(400px) rotateX(90deg);
+        opacity: 0;
+    }
+}
+
+.flipOutX {
+    -webkit-animation-name: flipOutX;
+    animation-name: flipOutX;
+    -webkit-backface-visibility: visible !important;
+    -ms-backface-visibility: visible !important;
+    backface-visibility: visible !important;
+}
+
+@-webkit-keyframes flipOutY {
+    0% {
+        -webkit-transform: perspective(400px) rotateY(0deg);
+        transform: perspective(400px) rotateY(0deg);
+        opacity: 1;
+    }
+
+    100% {
+        -webkit-transform: perspective(400px) rotateY(90deg);
+        transform: perspective(400px) rotateY(90deg);
+        opacity: 0;
+    }
+}
+
+@keyframes flipOutY {
+    0% {
+        -webkit-transform: perspective(400px) rotateY(0deg);
+        -ms-transform: perspective(400px) rotateY(0deg);
+        transform: perspective(400px) rotateY(0deg);
+        opacity: 1;
+    }
+
+    100% {
+        -webkit-transform: perspective(400px) rotateY(90deg);
+        -ms-transform: perspective(400px) rotateY(90deg);
+        transform: perspective(400px) rotateY(90deg);
+        opacity: 0;
+    }
+}
+
+.flipOutY {
+    -webkit-backface-visibility: visible !important;
+    -ms-backface-visibility: visible !important;
+    backface-visibility: visible !important;
+    -webkit-animation-name: flipOutY;
+    animation-name: flipOutY;
+}
+
+@-webkit-keyframes lightSpeedIn {
+    0% {
+        -webkit-transform: translateX(100%) skewX(-30deg);
+        transform: translateX(100%) skewX(-30deg);
+        opacity: 0;
+    }
+
+    60% {
+        -webkit-transform: translateX(-20%) skewX(30deg);
+        transform: translateX(-20%) skewX(30deg);
+        opacity: 1;
+    }
+
+    80% {
+        -webkit-transform: translateX(0%) skewX(-15deg);
+        transform: translateX(0%) skewX(-15deg);
+        opacity: 1;
+    }
+
+    100% {
+        -webkit-transform: translateX(0%) skewX(0deg);
+        transform: translateX(0%) skewX(0deg);
+        opacity: 1;
+    }
+}
+
+@keyframes lightSpeedIn {
+    0% {
+        -webkit-transform: translateX(100%) skewX(-30deg);
+        -ms-transform: translateX(100%) skewX(-30deg);
+        transform: translateX(100%) skewX(-30deg);
+        opacity: 0;
+    }
+
+    60% {
+        -webkit-transform: translateX(-20%) skewX(30deg);
+        -ms-transform: translateX(-20%) skewX(30deg);
+        transform: translateX(-20%) skewX(30deg);
+        opacity: 1;
+    }
+
+    80% {
+        -webkit-transform: translateX(0%) skewX(-15deg);
+        -ms-transform: translateX(0%) skewX(-15deg);
+        transform: translateX(0%) skewX(-15deg);
+        opacity: 1;
+    }
+
+    100% {
+        -webkit-transform: translateX(0%) skewX(0deg);
+        -ms-transform: translateX(0%) skewX(0deg);
+        transform: translateX(0%) skewX(0deg);
+        opacity: 1;
+    }
+}
+
+.lightSpeedIn {
+    -webkit-animation-name: lightSpeedIn;
+    animation-name: lightSpeedIn;
+    -webkit-animation-timing-function: ease-out;
+    animation-timing-function: ease-out;
+}
+
+@-webkit-keyframes lightSpeedOut {
+    0% {
+        -webkit-transform: translateX(0%) skewX(0deg);
+        transform: translateX(0%) skewX(0deg);
+        opacity: 1;
+    }
+
+    100% {
+        -webkit-transform: translateX(100%) skewX(-30deg);
+        transform: translateX(100%) skewX(-30deg);
+        opacity: 0;
+    }
+}
+
+@keyframes lightSpeedOut {
+    0% {
+        -webkit-transform: translateX(0%) skewX(0deg);
+        -ms-transform: translateX(0%) skewX(0deg);
+        transform: translateX(0%) skewX(0deg);
+        opacity: 1;
+    }
+
+    100% {
+        -webkit-transform: translateX(100%) skewX(-30deg);
+        -ms-transform: translateX(100%) skewX(-30deg);
+        transform: translateX(100%) skewX(-30deg);
+        opacity: 0;
+    }
+}
+
+.lightSpeedOut {
+    -webkit-animation-name: lightSpeedOut;
+    animation-name: lightSpeedOut;
+    -webkit-animation-timing-function: ease-in;
+    animation-timing-function: ease-in;
+}
+
+@-webkit-keyframes rotateIn {
+    0% {
+        -webkit-transform-origin: center center;
+        transform-origin: center center;
+        -webkit-transform: rotate(-200deg);
+        transform: rotate(-200deg);
+        opacity: 0;
+    }
+
+    100% {
+        -webkit-transform-origin: center center;
+        transform-origin: center center;
+        -webkit-transform: rotate(0);
+        transform: rotate(0);
+        opacity: 1;
+    }
+}
+
+@keyframes rotateIn {
+    0% {
+        -webkit-transform-origin: center center;
+        -ms-transform-origin: center center;
+        transform-origin: center center;
+        -webkit-transform: rotate(-200deg);
+        -ms-transform: rotate(-200deg);
+        transform: rotate(-200deg);
+        opacity: 0;
+    }
+
+    100% {
+        -webkit-transform-origin: center center;
+        -ms-transform-origin: center center;
+        transform-origin: center center;
+        -webkit-transform: rotate(0);
+        -ms-transform: rotate(0);
+        transform: rotate(0);
+        opacity: 1;
+    }
+}
+
+.rotateIn {
+    -webkit-animation-name: rotateIn;
+    animation-name: rotateIn;
+}
+
+@-webkit-keyframes rotateInDownLeft {
+    0% {
+        -webkit-transform-origin: left bottom;
+        transform-origin: left bottom;
+        -webkit-transform: rotate(-90deg);
+        transform: rotate(-90deg);
+        opacity: 0;
+    }
+
+    100% {
+        -webkit-transform-origin: left bottom;
+        transform-origin: left bottom;
+        -webkit-transform: rotate(0);
+        transform: rotate(0);
+        opacity: 1;
+    }
+}
+
+@keyframes rotateInDownLeft {
+    0% {
+        -webkit-transform-origin: left bottom;
+        -ms-transform-origin: left bottom;
+        transform-origin: left bottom;
+        -webkit-transform: rotate(-90deg);
+        -ms-transform: rotate(-90deg);
+        transform: rotate(-90deg);
+        opacity: 0;
+    }
+
+    100% {
+        -webkit-transform-origin: left bottom;
+        -ms-transform-origin: left bottom;
+        transform-origin: left bottom;
+        -webkit-transform: rotate(0);
+        -ms-transform: rotate(0);
+        transform: rotate(0);
+        opacity: 1;
+    }
+}
+
+.rotateInDownLeft {
+    -webkit-animation-name: rotateInDownLeft;
+    animation-name: rotateInDownLeft;
+}
+
+@-webkit-keyframes rotateInDownRight {
+    0% {
+        -webkit-transform-origin: right bottom;
+        transform-origin: right bottom;
+        -webkit-transform: rotate(90deg);
+        transform: rotate(90deg);
+        opacity: 0;
+    }
+
+    100% {
+        -webkit-transform-origin: right bottom;
+        transform-origin: right bottom;
+        -webkit-transform: rotate(0);
+        transform: rotate(0);
+        opacity: 1;
+    }
+}
+
+@keyframes rotateInDownRight {
+    0% {
+        -webkit-transform-origin: right bottom;
+        -ms-transform-origin: right bottom;
+        transform-origin: right bottom;
+        -webkit-transform: rotate(90deg);
+        -ms-transform: rotate(90deg);
+        transform: rotate(90deg);
+        opacity: 0;
+    }
+
+    100% {
+        -webkit-transform-origin: right bottom;
+        -ms-transform-origin: right bottom;
+        transform-origin: right bottom;
+        -webkit-transform: rotate(0);
+        -ms-transform: rotate(0);
+        transform: rotate(0);
+        opacity: 1;
+    }
+}
+
+.rotateInDownRight {
+    -webkit-animation-name: rotateInDownRight;
+    animation-name: rotateInDownRight;
+}
+
+@-webkit-keyframes rotateInUpLeft {
+    0% {
+        -webkit-transform-origin: left bottom;
+        transform-origin: left bottom;
+        -webkit-transform: rotate(90deg);
+        transform: rotate(90deg);
+        opacity: 0;
+    }
+
+    100% {
+        -webkit-transform-origin: left bottom;
+        transform-origin: left bottom;
+        -webkit-transform: rotate(0);
+        transform: rotate(0);
+        opacity: 1;
+    }
+}
+
+@keyframes rotateInUpLeft {
+    0% {
+        -webkit-transform-origin: left bottom;
+        -ms-transform-origin: left bottom;
+        transform-origin: left bottom;
+        -webkit-transform: rotate(90deg);
+        -ms-transform: rotate(90deg);
+        transform: rotate(90deg);
+        opacity: 0;
+    }
+
+    100% {
+        -webkit-transform-origin: left bottom;
+        -ms-transform-origin: left bottom;
+        transform-origin: left bottom;
+        -webkit-transform: rotate(0);
+        -ms-transform: rotate(0);
+        transform: rotate(0);
+        opacity: 1;
+    }
+}
+
+.rotateInUpLeft {
+    -webkit-animation-name: rotateInUpLeft;
+    animation-name: rotateInUpLeft;
+}
+
+@-webkit-keyframes rotateInUpRight {
+    0% {
+        -webkit-transform-origin: right bottom;
+        transform-origin: right bottom;
+        -webkit-transform: rotate(-90deg);
+        transform: rotate(-90deg);
+        opacity: 0;
+    }
+
+    100% {
+        -webkit-transform-origin: right bottom;
+        transform-origin: right bottom;
+        -webkit-transform: rotate(0);
+        transform: rotate(0);
+        opacity: 1;
+    }
+}
+
+@keyframes rotateInUpRight {
+    0% {
+        -webkit-transform-origin: right bottom;
+        -ms-transform-origin: right bottom;
+        transform-origin: right bottom;
+        -webkit-transform: rotate(-90deg);
+        -ms-transform: rotate(-90deg);
+        transform: rotate(-90deg);
+        opacity: 0;
+    }
+
+    100% {
+        -webkit-transform-origin: right bottom;
+        -ms-transform-origin: right bottom;
+        transform-origin: right bottom;
+        -webkit-transform: rotate(0);
+        -ms-transform: rotate(0);
+        transform: rotate(0);
+        opacity: 1;
+    }
+}
+
+.rotateInUpRight {
+    -webkit-animation-name: rotateInUpRight;
+    animation-name: rotateInUpRight;
+}
+
+@-webkit-keyframes rotateOut {
+    0% {
+        -webkit-transform-origin: center center;
+        transform-origin: center center;
+        -webkit-transform: rotate(0);
+        transform: rotate(0);
+        opacity: 1;
+    }
+
+    100% {
+        -webkit-transform-origin: center center;
+        transform-origin: center center;
+        -webkit-transform: rotate(200deg);
+        transform: rotate(200deg);
+        opacity: 0;
+    }
+}
+
+@keyframes rotateOut {
+    0% {
+        -webkit-transform-origin: center center;
+        -ms-transform-origin: center center;
+        transform-origin: center center;
+        -webkit-transform: rotate(0);
+        -ms-transform: rotate(0);
+        transform: rotate(0);
+        opacity: 1;
+    }
+
+    100% {
+        -webkit-transform-origin: center center;
+        -ms-transform-origin: center center;
+        transform-origin: center center;
+        -webkit-transform: rotate(200deg);
+        -ms-transform: rotate(200deg);
+        transform: rotate(200deg);
+        opacity: 0;
+    }
+}
+
+.rotateOut {
+    -webkit-animation-name: rotateOut;
+    animation-name: rotateOut;
+}
+
+@-webkit-keyframes rotateOutDownLeft {
+    0% {
+        -webkit-transform-origin: left bottom;
+        transform-origin: left bottom;
+        -webkit-transform: rotate(0);
+        transform: rotate(0);
+        opacity: 1;
+    }
+
+    100% {
+        -webkit-transform-origin: left bottom;
+        transform-origin: left bottom;
+        -webkit-transform: rotate(90deg);
+        transform: rotate(90deg);
+        opacity: 0;
+    }
+}
+
+@keyframes rotateOutDownLeft {
+    0% {
+        -webkit-transform-origin: left bottom;
+        -ms-transform-origin: left bottom;
+        transform-origin: left bottom;
+        -webkit-transform: rotate(0);
+        -ms-transform: rotate(0);
+        transform: rotate(0);
+        opacity: 1;
+    }
+
+    100% {
+        -webkit-transform-origin: left bottom;
+        -ms-transform-origin: left bottom;
+        transform-origin: left bottom;
+        -webkit-transform: rotate(90deg);
+        -ms-transform: rotate(90deg);
+        transform: rotate(90deg);
+        opacity: 0;
+    }
+}
+
+.rotateOutDownLeft {
+    -webkit-animation-name: rotateOutDownLeft;
+    animation-name: rotateOutDownLeft;
+}
+
+@-webkit-keyframes rotateOutDownRight {
+    0% {
+        -webkit-transform-origin: right bottom;
+        transform-origin: right bottom;
+        -webkit-transform: rotate(0);
+        transform: rotate(0);
+        opacity: 1;
+    }
+
+    100% {
+        -webkit-transform-origin: right bottom;
+        transform-origin: right bottom;
+        -webkit-transform: rotate(-90deg);
+        transform: rotate(-90deg);
+        opacity: 0;
+    }
+}
+
+@keyframes rotateOutDownRight {
+    0% {
+        -webkit-transform-origin: right bottom;
+        -ms-transform-origin: right bottom;
+        transform-origin: right bottom;
+        -webkit-transform: rotate(0);
+        -ms-transform: rotate(0);
+        transform: rotate(0);
+        opacity: 1;
+    }
+
+    100% {
+        -webkit-transform-origin: right bottom;
+        -ms-transform-origin: right bottom;
+        transform-origin: right bottom;
+        -webkit-transform: rotate(-90deg);
+        -ms-transform: rotate(-90deg);
+        transform: rotate(-90deg);
+        opacity: 0;
+    }
+}
+
+.rotateOutDownRight {
+    -webkit-animation-name: rotateOutDownRight;
+    animation-name: rotateOutDownRight;
+}
+
+@-webkit-keyframes rotateOutUpLeft {
+    0% {
+        -webkit-transform-origin: left bottom;
+        transform-origin: left bottom;
+        -webkit-transform: rotate(0);
+        transform: rotate(0);
+        opacity: 1;
+    }
+
+    100% {
+        -webkit-transform-origin: left bottom;
+        transform-origin: left bottom;
+        -webkit-transform: rotate(-90deg);
+        transform: rotate(-90deg);
+        opacity: 0;
+    }
+}
+
+@keyframes rotateOutUpLeft {
+    0% {
+        -webkit-transform-origin: left bottom;
+        -ms-transform-origin: left bottom;
+        transform-origin: left bottom;
+        -webkit-transform: rotate(0);
+        -ms-transform: rotate(0);
+        transform: rotate(0);
+        opacity: 1;
+    }
+
+    100% {
+        -webkit-transform-origin: left bottom;
+        -ms-transform-origin: left bottom;
+        transform-origin: left bottom;
+        -webkit-transform: rotate(-90deg);
+        -ms-transform: rotate(-90deg);
+        transform: rotate(-90deg);
+        opacity: 0;
+    }
+}
+
+.rotateOutUpLeft {
+    -webkit-animation-name: rotateOutUpLeft;
+    animation-name: rotateOutUpLeft;
+}
+
+@-webkit-keyframes rotateOutUpRight {
+    0% {
+        -webkit-transform-origin: right bottom;
+        transform-origin: right bottom;
+        -webkit-transform: rotate(0);
+        transform: rotate(0);
+        opacity: 1;
+    }
+
+    100% {
+        -webkit-transform-origin: right bottom;
+        transform-origin: right bottom;
+        -webkit-transform: rotate(90deg);
+        transform: rotate(90deg);
+        opacity: 0;
+    }
+}
+
+@keyframes rotateOutUpRight {
+    0% {
+        -webkit-transform-origin: right bottom;
+        -ms-transform-origin: right bottom;
+        transform-origin: right bottom;
+        -webkit-transform: rotate(0);
+        -ms-transform: rotate(0);
+        transform: rotate(0);
+        opacity: 1;
+    }
+
+    100% {
+        -webkit-transform-origin: right bottom;
+        -ms-transform-origin: right bottom;
+        transform-origin: right bottom;
+        -webkit-transform: rotate(90deg);
+        -ms-transform: rotate(90deg);
+        transform: rotate(90deg);
+        opacity: 0;
+    }
+}
+
+.rotateOutUpRight {
+    -webkit-animation-name: rotateOutUpRight;
+    animation-name: rotateOutUpRight;
+}
+
+@-webkit-keyframes slideInDown {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateY(-2000px);
+        transform: translateY(-2000px);
+    }
+
+    100% {
+        -webkit-transform: translateY(0);
+        transform: translateY(0);
+    }
+}
+
+@keyframes slideInDown {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateY(-2000px);
+        -ms-transform: translateY(-2000px);
+        transform: translateY(-2000px);
+    }
+
+    100% {
+        -webkit-transform: translateY(0);
+        -ms-transform: translateY(0);
+        transform: translateY(0);
+    }
+}
+
+.slideInDown {
+    -webkit-animation-name: slideInDown;
+    animation-name: slideInDown;
+}
+
+@-webkit-keyframes slideInLeft {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateX(-2000px);
+        transform: translateX(-2000px);
+    }
+
+    100% {
+        -webkit-transform: translateX(0);
+        transform: translateX(0);
+    }
+}
+
+@keyframes slideInLeft {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateX(-2000px);
+        -ms-transform: translateX(-2000px);
+        transform: translateX(-2000px);
+    }
+
+    100% {
+        -webkit-transform: translateX(0);
+        -ms-transform: translateX(0);
+        transform: translateX(0);
+    }
+}
+
+.slideInLeft {
+    -webkit-animation-name: slideInLeft;
+    animation-name: slideInLeft;
+}
+
+@-webkit-keyframes slideInRight {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateX(2000px);
+        transform: translateX(2000px);
+    }
+
+    100% {
+        -webkit-transform: translateX(0);
+        transform: translateX(0);
+    }
+}
+
+@keyframes slideInRight {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateX(2000px);
+        -ms-transform: translateX(2000px);
+        transform: translateX(2000px);
+    }
+
+    100% {
+        -webkit-transform: translateX(0);
+        -ms-transform: translateX(0);
+        transform: translateX(0);
+    }
+}
+
+.slideInRight {
+    -webkit-animation-name: slideInRight;
+    animation-name: slideInRight;
+}
+
+@-webkit-keyframes slideOutLeft {
+    0% {
+        -webkit-transform: translateX(0);
+        transform: translateX(0);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateX(-2000px);
+        transform: translateX(-2000px);
+    }
+}
+
+@keyframes slideOutLeft {
+    0% {
+        -webkit-transform: translateX(0);
+        -ms-transform: translateX(0);
+        transform: translateX(0);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateX(-2000px);
+        -ms-transform: translateX(-2000px);
+        transform: translateX(-2000px);
+    }
+}
+
+.slideOutLeft {
+    -webkit-animation-name: slideOutLeft;
+    animation-name: slideOutLeft;
+}
+
+@-webkit-keyframes slideOutRight {
+    0% {
+        -webkit-transform: translateX(0);
+        transform: translateX(0);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateX(2000px);
+        transform: translateX(2000px);
+    }
+}
+
+@keyframes slideOutRight {
+    0% {
+        -webkit-transform: translateX(0);
+        -ms-transform: translateX(0);
+        transform: translateX(0);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateX(2000px);
+        -ms-transform: translateX(2000px);
+        transform: translateX(2000px);
+    }
+}
+
+.slideOutRight {
+    -webkit-animation-name: slideOutRight;
+    animation-name: slideOutRight;
+}
+
+@-webkit-keyframes slideOutUp {
+    0% {
+        -webkit-transform: translateY(0);
+        transform: translateY(0);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateY(-2000px);
+        transform: translateY(-2000px);
+    }
+}
+
+@keyframes slideOutUp {
+    0% {
+        -webkit-transform: translateY(0);
+        -ms-transform: translateY(0);
+        transform: translateY(0);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateY(-2000px);
+        -ms-transform: translateY(-2000px);
+        transform: translateY(-2000px);
+    }
+}
+
+.slideOutUp {
+    -webkit-animation-name: slideOutUp;
+    animation-name: slideOutUp;
+}
+
+@-webkit-keyframes slideOutDown {
+    0% {
+        -webkit-transform: translateY(0);
+        transform: translateY(0);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateY(2000px);
+        transform: translateY(2000px);
+    }
+}
+
+@keyframes slideOutDown {
+    0% {
+        -webkit-transform: translateY(0);
+        -ms-transform: translateY(0);
+        transform: translateY(0);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateY(2000px);
+        -ms-transform: translateY(2000px);
+        transform: translateY(2000px);
+    }
+}
+
+.slideOutDown {
+    -webkit-animation-name: slideOutDown;
+    animation-name: slideOutDown;
+}
+
+@-webkit-keyframes hinge {
+    0% {
+        -webkit-transform: rotate(0);
+        transform: rotate(0);
+        -webkit-transform-origin: top left;
+        transform-origin: top left;
+        -webkit-animation-timing-function: ease-in-out;
+        animation-timing-function: ease-in-out;
+    }
+
+    20%, 60% {
+        -webkit-transform: rotate(80deg);
+        transform: rotate(80deg);
+        -webkit-transform-origin: top left;
+        transform-origin: top left;
+        -webkit-animation-timing-function: ease-in-out;
+        animation-timing-function: ease-in-out;
+    }
+
+    40% {
+        -webkit-transform: rotate(60deg);
+        transform: rotate(60deg);
+        -webkit-transform-origin: top left;
+        transform-origin: top left;
+        -webkit-animation-timing-function: ease-in-out;
+        animation-timing-function: ease-in-out;
+    }
+
+    80% {
+        -webkit-transform: rotate(60deg) translateY(0);
+        transform: rotate(60deg) translateY(0);
+        -webkit-transform-origin: top left;
+        transform-origin: top left;
+        -webkit-animation-timing-function: ease-in-out;
+        animation-timing-function: ease-in-out;
+        opacity: 1;
+    }
+
+    100% {
+        -webkit-transform: translateY(700px);
+        transform: translateY(700px);
+        opacity: 0;
+    }
+}
+
+@keyframes hinge {
+    0% {
+        -webkit-transform: rotate(0);
+        -ms-transform: rotate(0);
+        transform: rotate(0);
+        -webkit-transform-origin: top left;
+        -ms-transform-origin: top left;
+        transform-origin: top left;
+        -webkit-animation-timing-function: ease-in-out;
+        animation-timing-function: ease-in-out;
+    }
+
+    20%, 60% {
+        -webkit-transform: rotate(80deg);
+        -ms-transform: rotate(80deg);
+        transform: rotate(80deg);
+        -webkit-transform-origin: top left;
+        -ms-transform-origin: top left;
+        transform-origin: top left;
+        -webkit-animation-timing-function: ease-in-out;
+        animation-timing-function: ease-in-out;
+    }
+
+    40% {
+        -webkit-transform: rotate(60deg);
+        -ms-transform: rotate(60deg);
+        transform: rotate(60deg);
+        -webkit-transform-origin: top left;
+        -ms-transform-origin: top left;
+        transform-origin: top left;
+        -webkit-animation-timing-function: ease-in-out;
+        animation-timing-function: ease-in-out;
+    }
+
+    80% {
+        -webkit-transform: rotate(60deg) translateY(0);
+        -ms-transform: rotate(60deg) translateY(0);
+        transform: rotate(60deg) translateY(0);
+        -webkit-transform-origin: top left;
+        -ms-transform-origin: top left;
+        transform-origin: top left;
+        -webkit-animation-timing-function: ease-in-out;
+        animation-timing-function: ease-in-out;
+        opacity: 1;
+    }
+
+    100% {
+        -webkit-transform: translateY(700px);
+        -ms-transform: translateY(700px);
+        transform: translateY(700px);
+        opacity: 0;
+    }
+}
+
+.hinge {
+    -webkit-animation-name: hinge;
+    animation-name: hinge;
+}
+
+/* originally authored by Nick Pettit - https://github.com/nickpettit/glide */
+
+@-webkit-keyframes rollIn {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateX(-100%) rotate(-120deg);
+        transform: translateX(-100%) rotate(-120deg);
+    }
+
+    100% {
+        opacity: 1;
+        -webkit-transform: translateX(0px) rotate(0deg);
+        transform: translateX(0px) rotate(0deg);
+    }
+}
+
+@keyframes rollIn {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateX(-100%) rotate(-120deg);
+        -ms-transform: translateX(-100%) rotate(-120deg);
+        transform: translateX(-100%) rotate(-120deg);
+    }
+
+    100% {
+        opacity: 1;
+        -webkit-transform: translateX(0px) rotate(0deg);
+        -ms-transform: translateX(0px) rotate(0deg);
+        transform: translateX(0px) rotate(0deg);
+    }
+}
+
+.rollIn {
+    -webkit-animation-name: rollIn;
+    animation-name: rollIn;
+}
+
+/* originally authored by Nick Pettit - https://github.com/nickpettit/glide */
+
+@-webkit-keyframes rollOut {
+    0% {
+        opacity: 1;
+        -webkit-transform: translateX(0px) rotate(0deg);
+        transform: translateX(0px) rotate(0deg);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateX(100%) rotate(120deg);
+        transform: translateX(100%) rotate(120deg);
+    }
+}
+
+@keyframes rollOut {
+    0% {
+        opacity: 1;
+        -webkit-transform: translateX(0px) rotate(0deg);
+        -ms-transform: translateX(0px) rotate(0deg);
+        transform: translateX(0px) rotate(0deg);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateX(100%) rotate(120deg);
+        -ms-transform: translateX(100%) rotate(120deg);
+        transform: translateX(100%) rotate(120deg);
+    }
+}
+
+.rollOut {
+    -webkit-animation-name: rollOut;
+    animation-name: rollOut;
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/css/bootstrap.min.css b/pluss-manage-page/src/main/resources/static/resources/auth/css/bootstrap.min.css
new file mode 100644
index 0000000..34fd495
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/css/bootstrap.min.css
@@ -0,0 +1,7978 @@
+html {
+	font-family: sans-serif;
+	-webkit-text-size-adjust: 100%;
+	-ms-text-size-adjust: 100%
+}
+
+body {
+	margin: 0
+}
+
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+main,
+menu,
+nav,
+section,
+summary {
+	display: block
+}
+
+audio,
+canvas,
+progress,
+video {
+	display: inline-block;
+	vertical-align: baseline
+}
+
+audio:not([controls]) {
+	display: none;
+	height: 0
+}
+
+[hidden],
+template {
+	display: none
+}
+
+a {
+	background-color: transparent
+}
+
+a:active,
+a:hover {
+	outline: 0
+}
+
+abbr[title] {
+	border-bottom: 1px dotted
+}
+
+b,
+strong {
+	font-weight: 700
+}
+
+dfn {
+	font-style: italic
+}
+
+h1 {
+	margin: .67em 0;
+	font-size: 2em
+}
+
+mark {
+	color: #000;
+	background: #ff0
+}
+
+small {
+	font-size: 80%
+}
+
+sub,
+sup {
+	position: relative;
+	font-size: 75%;
+	line-height: 0;
+	vertical-align: baseline
+}
+
+sup {
+	top: -.5em
+}
+
+sub {
+	bottom: -.25em
+}
+
+img {
+	border: 0
+}
+
+svg:not(:root) {
+	overflow: hidden
+}
+
+figure {
+	margin: 1em 40px
+}
+
+hr {
+	height: 0;
+	-webkit-box-sizing: content-box;
+	-moz-box-sizing: content-box;
+	box-sizing: content-box
+}
+
+pre {
+	overflow: auto
+}
+
+code,
+kbd,
+pre,
+samp {
+	font-family: monospace, monospace;
+	font-size: 1em
+}
+
+button,
+input,
+optgroup,
+select,
+textarea {
+	margin: 0;
+	font: inherit;
+	color: inherit
+}
+
+button {
+	overflow: visible
+}
+
+button,
+select {
+	text-transform: none
+}
+
+button,
+html input[type=button],
+input[type=reset],
+input[type=submit] {
+	-webkit-appearance: button;
+	cursor: pointer
+}
+
+button[disabled],
+html input[disabled] {
+	cursor: default
+}
+
+button::-moz-focus-inner,
+input::-moz-focus-inner {
+	padding: 0;
+	border: 0
+}
+
+input {
+	line-height: normal
+}
+
+input[type=checkbox],
+input[type=radio] {
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+	padding: 0
+}
+
+input[type=number]::-webkit-inner-spin-button,
+input[type=number]::-webkit-outer-spin-button {
+	height: auto
+}
+
+input[type=search] {
+	-webkit-box-sizing: content-box;
+	-moz-box-sizing: content-box;
+	box-sizing: content-box;
+	-webkit-appearance: textfield
+}
+
+input[type=search]::-webkit-search-cancel-button,
+input[type=search]::-webkit-search-decoration {
+	-webkit-appearance: none
+}
+
+fieldset {
+	padding: .35em .625em .75em;
+	margin: 0 2px;
+	border: 1px solid silver
+}
+
+legend {
+	padding: 0;
+	border: 0
+}
+
+textarea {
+	overflow: auto
+}
+
+optgroup {
+	font-weight: 700
+}
+
+table {
+	border-spacing: 0;
+	border-collapse: collapse
+}
+
+td,
+th {
+	padding: 0
+}
+
+
+/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */
+
+@media print {
+	*,
+	:after,
+	:before {
+		color: #000!important;
+		text-shadow: none!important;
+		background: 0 0!important;
+		-webkit-box-shadow: none!important;
+		box-shadow: none!important
+	}
+	blockquote,
+	pre {
+		border: 1px solid #999;
+		page-break-inside: avoid
+	}
+	thead {
+		display: table-header-group
+	}
+	img,
+	tr {
+		page-break-inside: avoid
+	}
+	img {
+		max-width: 100%!important
+	}
+	h2,
+	h3,
+	p {
+		orphans: 3;
+		widows: 3
+	}
+	h2,
+	h3 {
+		page-break-after: avoid
+	}
+	.navbar {
+		display: none
+	}
+	.btn>.caret,
+	.dropup>.btn>.caret {
+		border-top-color: #000!important
+	}
+	.label {
+		border: 1px solid #000
+	}
+	.table {
+		border-collapse: collapse!important
+	}
+	.table td,
+	.table th {
+		background-color: #fff!important
+	}
+	.table-bordered td,
+	.table-bordered th {
+		border: 1px solid #ddd!important
+	}
+}
+
+@font-face {
+	font-family: 'Glyphicons Halflings';
+	src: url(../../fonts/glyphicons-halflings-regular.eot);
+	src: url(../../fonts/glyphicons-halflings-regular.eot?#iefix) format('embedded-opentype'), url(../../fonts/glyphicons-halflings-regular.woff2) format('woff2'), url(../../fonts/glyphicons-halflings-regular.woff) format('woff'), url(../../fonts/glyphicons-halflings-regular.ttf) format('truetype'), url(../../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular) format('svg')
+}
+
+.glyphicon {
+	position: relative;
+	top: 1px;
+	display: inline-block;
+	font-family: 'Glyphicons Halflings';
+	font-style: normal;
+	font-weight: 400;
+	line-height: 1;
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale
+}
+
+.glyphicon-asterisk:before {
+	content: "\002a"
+}
+
+.glyphicon-plus:before {
+	content: "\002b"
+}
+
+.glyphicon-eur:before,
+.glyphicon-euro:before {
+	content: "\20ac"
+}
+
+.glyphicon-minus:before {
+	content: "\2212"
+}
+
+.glyphicon-cloud:before {
+	content: "\2601"
+}
+
+.glyphicon-envelope:before {
+	content: "\2709"
+}
+
+.glyphicon-pencil:before {
+	content: "\270f"
+}
+
+.glyphicon-glass:before {
+	content: "\e001"
+}
+
+.glyphicon-music:before {
+	content: "\e002"
+}
+
+.glyphicon-search:before {
+	content: "\e003"
+}
+
+.glyphicon-heart:before {
+	content: "\e005"
+}
+
+.glyphicon-star:before {
+	content: "\e006"
+}
+
+.glyphicon-star-empty:before {
+	content: "\e007"
+}
+
+.glyphicon-user:before {
+	content: "\e008"
+}
+
+.glyphicon-film:before {
+	content: "\e009"
+}
+
+.glyphicon-th-large:before {
+	content: "\e010"
+}
+
+.glyphicon-th:before {
+	content: "\e011"
+}
+
+.glyphicon-th-list:before {
+	content: "\e012"
+}
+
+.glyphicon-ok:before {
+	content: "\e013"
+}
+
+.glyphicon-remove:before {
+	content: "\e014"
+}
+
+.glyphicon-zoom-in:before {
+	content: "\e015"
+}
+
+.glyphicon-zoom-out:before {
+	content: "\e016"
+}
+
+.glyphicon-off:before {
+	content: "\e017"
+}
+
+.glyphicon-signal:before {
+	content: "\e018"
+}
+
+.glyphicon-cog:before {
+	content: "\e019"
+}
+
+.glyphicon-trash:before {
+	content: "\e020"
+}
+
+.glyphicon-home:before {
+	content: "\e021"
+}
+
+.glyphicon-file:before {
+	content: "\e022"
+}
+
+.glyphicon-time:before {
+	content: "\e023"
+}
+
+.glyphicon-road:before {
+	content: "\e024"
+}
+
+.glyphicon-download-alt:before {
+	content: "\e025"
+}
+
+.glyphicon-download:before {
+	content: "\e026"
+}
+
+.glyphicon-upload:before {
+	content: "\e027"
+}
+
+.glyphicon-inbox:before {
+	content: "\e028"
+}
+
+.glyphicon-play-circle:before {
+	content: "\e029"
+}
+
+.glyphicon-repeat:before {
+	content: "\e030"
+}
+
+.glyphicon-refresh:before {
+	content: "\e031"
+}
+
+.glyphicon-list-alt:before {
+	content: "\e032"
+}
+
+.glyphicon-lock:before {
+	content: "\e033"
+}
+
+.glyphicon-flag:before {
+	content: "\e034"
+}
+
+.glyphicon-headphones:before {
+	content: "\e035"
+}
+
+.glyphicon-volume-off:before {
+	content: "\e036"
+}
+
+.glyphicon-volume-down:before {
+	content: "\e037"
+}
+
+.glyphicon-volume-up:before {
+	content: "\e038"
+}
+
+.glyphicon-qrcode:before {
+	content: "\e039"
+}
+
+.glyphicon-barcode:before {
+	content: "\e040"
+}
+
+.glyphicon-tag:before {
+	content: "\e041"
+}
+
+.glyphicon-tags:before {
+	content: "\e042"
+}
+
+.glyphicon-book:before {
+	content: "\e043"
+}
+
+.glyphicon-bookmark:before {
+	content: "\e044"
+}
+
+.glyphicon-print:before {
+	content: "\e045"
+}
+
+.glyphicon-camera:before {
+	content: "\e046"
+}
+
+.glyphicon-font:before {
+	content: "\e047"
+}
+
+.glyphicon-bold:before {
+	content: "\e048"
+}
+
+.glyphicon-italic:before {
+	content: "\e049"
+}
+
+.glyphicon-text-height:before {
+	content: "\e050"
+}
+
+.glyphicon-text-width:before {
+	content: "\e051"
+}
+
+.glyphicon-align-left:before {
+	content: "\e052"
+}
+
+.glyphicon-align-center:before {
+	content: "\e053"
+}
+
+.glyphicon-align-right:before {
+	content: "\e054"
+}
+
+.glyphicon-align-justify:before {
+	content: "\e055"
+}
+
+.glyphicon-list:before {
+	content: "\e056"
+}
+
+.glyphicon-indent-left:before {
+	content: "\e057"
+}
+
+.glyphicon-indent-right:before {
+	content: "\e058"
+}
+
+.glyphicon-facetime-video:before {
+	content: "\e059"
+}
+
+.glyphicon-picture:before {
+	content: "\e060"
+}
+
+.glyphicon-map-marker:before {
+	content: "\e062"
+}
+
+.glyphicon-adjust:before {
+	content: "\e063"
+}
+
+.glyphicon-tint:before {
+	content: "\e064"
+}
+
+.glyphicon-edit:before {
+	content: "\e065"
+}
+
+.glyphicon-share:before {
+	content: "\e066"
+}
+
+.glyphicon-check:before {
+	content: "\e067"
+}
+
+.glyphicon-move:before {
+	content: "\e068"
+}
+
+.glyphicon-step-backward:before {
+	content: "\e069"
+}
+
+.glyphicon-fast-backward:before {
+	content: "\e070"
+}
+
+.glyphicon-backward:before {
+	content: "\e071"
+}
+
+.glyphicon-play:before {
+	content: "\e072"
+}
+
+.glyphicon-pause:before {
+	content: "\e073"
+}
+
+.glyphicon-stop:before {
+	content: "\e074"
+}
+
+.glyphicon-forward:before {
+	content: "\e075"
+}
+
+.glyphicon-fast-forward:before {
+	content: "\e076"
+}
+
+.glyphicon-step-forward:before {
+	content: "\e077"
+}
+
+.glyphicon-eject:before {
+	content: "\e078"
+}
+
+.glyphicon-chevron-left:before {
+	content: "\e079"
+}
+
+.glyphicon-chevron-right:before {
+	content: "\e080"
+}
+
+.glyphicon-plus-sign:before {
+	content: "\e081"
+}
+
+.glyphicon-minus-sign:before {
+	content: "\e082"
+}
+
+.glyphicon-remove-sign:before {
+	content: "\e083"
+}
+
+.glyphicon-ok-sign:before {
+	content: "\e084"
+}
+
+.glyphicon-question-sign:before {
+	content: "\e085"
+}
+
+.glyphicon-info-sign:before {
+	content: "\e086"
+}
+
+.glyphicon-screenshot:before {
+	content: "\e087"
+}
+
+.glyphicon-remove-circle:before {
+	content: "\e088"
+}
+
+.glyphicon-ok-circle:before {
+	content: "\e089"
+}
+
+.glyphicon-ban-circle:before {
+	content: "\e090"
+}
+
+.glyphicon-arrow-left:before {
+	content: "\e091"
+}
+
+.glyphicon-arrow-right:before {
+	content: "\e092"
+}
+
+.glyphicon-arrow-up:before {
+	content: "\e093"
+}
+
+.glyphicon-arrow-down:before {
+	content: "\e094"
+}
+
+.glyphicon-share-alt:before {
+	content: "\e095"
+}
+
+.glyphicon-resize-full:before {
+	content: "\e096"
+}
+
+.glyphicon-resize-small:before {
+	content: "\e097"
+}
+
+.glyphicon-exclamation-sign:before {
+	content: "\e101"
+}
+
+.glyphicon-gift:before {
+	content: "\e102"
+}
+
+.glyphicon-leaf:before {
+	content: "\e103"
+}
+
+.glyphicon-fire:before {
+	content: "\e104"
+}
+
+.glyphicon-eye-open:before {
+	content: "\e105"
+}
+
+.glyphicon-eye-close:before {
+	content: "\e106"
+}
+
+.glyphicon-warning-sign:before {
+	content: "\e107"
+}
+
+.glyphicon-plane:before {
+	content: "\e108"
+}
+
+.glyphicon-calendar:before {
+	content: "\e109"
+}
+
+.glyphicon-random:before {
+	content: "\e110"
+}
+
+.glyphicon-comment:before {
+	content: "\e111"
+}
+
+.glyphicon-magnet:before {
+	content: "\e112"
+}
+
+.glyphicon-chevron-up:before {
+	content: "\e113"
+}
+
+.glyphicon-chevron-down:before {
+	content: "\e114"
+}
+
+.glyphicon-retweet:before {
+	content: "\e115"
+}
+
+.glyphicon-shopping-cart:before {
+	content: "\e116"
+}
+
+.glyphicon-folder-close:before {
+	content: "\e117"
+}
+
+.glyphicon-folder-open:before {
+	content: "\e118"
+}
+
+.glyphicon-resize-vertical:before {
+	content: "\e119"
+}
+
+.glyphicon-resize-horizontal:before {
+	content: "\e120"
+}
+
+.glyphicon-hdd:before {
+	content: "\e121"
+}
+
+.glyphicon-bullhorn:before {
+	content: "\e122"
+}
+
+.glyphicon-bell:before {
+	content: "\e123"
+}
+
+.glyphicon-certificate:before {
+	content: "\e124"
+}
+
+.glyphicon-thumbs-up:before {
+	content: "\e125"
+}
+
+.glyphicon-thumbs-down:before {
+	content: "\e126"
+}
+
+.glyphicon-hand-right:before {
+	content: "\e127"
+}
+
+.glyphicon-hand-left:before {
+	content: "\e128"
+}
+
+.glyphicon-hand-up:before {
+	content: "\e129"
+}
+
+.glyphicon-hand-down:before {
+	content: "\e130"
+}
+
+.glyphicon-circle-arrow-right:before {
+	content: "\e131"
+}
+
+.glyphicon-circle-arrow-left:before {
+	content: "\e132"
+}
+
+.glyphicon-circle-arrow-up:before {
+	content: "\e133"
+}
+
+.glyphicon-circle-arrow-down:before {
+	content: "\e134"
+}
+
+.glyphicon-globe:before {
+	content: "\e135"
+}
+
+.glyphicon-wrench:before {
+	content: "\e136"
+}
+
+.glyphicon-tasks:before {
+	content: "\e137"
+}
+
+.glyphicon-filter:before {
+	content: "\e138"
+}
+
+.glyphicon-briefcase:before {
+	content: "\e139"
+}
+
+.glyphicon-fullscreen:before {
+	content: "\e140"
+}
+
+.glyphicon-dashboard:before {
+	content: "\e141"
+}
+
+.glyphicon-paperclip:before {
+	content: "\e142"
+}
+
+.glyphicon-heart-empty:before {
+	content: "\e143"
+}
+
+.glyphicon-link:before {
+	content: "\e144"
+}
+
+.glyphicon-phone:before {
+	content: "\e145"
+}
+
+.glyphicon-pushpin:before {
+	content: "\e146"
+}
+
+.glyphicon-usd:before {
+	content: "\e148"
+}
+
+.glyphicon-gbp:before {
+	content: "\e149"
+}
+
+.glyphicon-sort:before {
+	content: "\e150"
+}
+
+.glyphicon-sort-by-alphabet:before {
+	content: "\e151"
+}
+
+.glyphicon-sort-by-alphabet-alt:before {
+	content: "\e152"
+}
+
+.glyphicon-sort-by-order:before {
+	content: "\e153"
+}
+
+.glyphicon-sort-by-order-alt:before {
+	content: "\e154"
+}
+
+.glyphicon-sort-by-attributes:before {
+	content: "\e155"
+}
+
+.glyphicon-sort-by-attributes-alt:before {
+	content: "\e156"
+}
+
+.glyphicon-unchecked:before {
+	content: "\e157"
+}
+
+.glyphicon-expand:before {
+	content: "\e158"
+}
+
+.glyphicon-collapse-down:before {
+	content: "\e159"
+}
+
+.glyphicon-collapse-up:before {
+	content: "\e160"
+}
+
+.glyphicon-log-in:before {
+	content: "\e161"
+}
+
+.glyphicon-flash:before {
+	content: "\e162"
+}
+
+.glyphicon-log-out:before {
+	content: "\e163"
+}
+
+.glyphicon-new-window:before {
+	content: "\e164"
+}
+
+.glyphicon-record:before {
+	content: "\e165"
+}
+
+.glyphicon-save:before {
+	content: "\e166"
+}
+
+.glyphicon-open:before {
+	content: "\e167"
+}
+
+.glyphicon-saved:before {
+	content: "\e168"
+}
+
+.glyphicon-import:before {
+	content: "\e169"
+}
+
+.glyphicon-export:before {
+	content: "\e170"
+}
+
+.glyphicon-send:before {
+	content: "\e171"
+}
+
+.glyphicon-floppy-disk:before {
+	content: "\e172"
+}
+
+.glyphicon-floppy-saved:before {
+	content: "\e173"
+}
+
+.glyphicon-floppy-remove:before {
+	content: "\e174"
+}
+
+.glyphicon-floppy-save:before {
+	content: "\e175"
+}
+
+.glyphicon-floppy-open:before {
+	content: "\e176"
+}
+
+.glyphicon-credit-card:before {
+	content: "\e177"
+}
+
+.glyphicon-transfer:before {
+	content: "\e178"
+}
+
+.glyphicon-cutlery:before {
+	content: "\e179"
+}
+
+.glyphicon-header:before {
+	content: "\e180"
+}
+
+.glyphicon-compressed:before {
+	content: "\e181"
+}
+
+.glyphicon-earphone:before {
+	content: "\e182"
+}
+
+.glyphicon-phone-alt:before {
+	content: "\e183"
+}
+
+.glyphicon-tower:before {
+	content: "\e184"
+}
+
+.glyphicon-stats:before {
+	content: "\e185"
+}
+
+.glyphicon-sd-video:before {
+	content: "\e186"
+}
+
+.glyphicon-hd-video:before {
+	content: "\e187"
+}
+
+.glyphicon-subtitles:before {
+	content: "\e188"
+}
+
+.glyphicon-sound-stereo:before {
+	content: "\e189"
+}
+
+.glyphicon-sound-dolby:before {
+	content: "\e190"
+}
+
+.glyphicon-sound-5-1:before {
+	content: "\e191"
+}
+
+.glyphicon-sound-6-1:before {
+	content: "\e192"
+}
+
+.glyphicon-sound-7-1:before {
+	content: "\e193"
+}
+
+.glyphicon-copyright-mark:before {
+	content: "\e194"
+}
+
+.glyphicon-registration-mark:before {
+	content: "\e195"
+}
+
+.glyphicon-cloud-download:before {
+	content: "\e197"
+}
+
+.glyphicon-cloud-upload:before {
+	content: "\e198"
+}
+
+.glyphicon-tree-conifer:before {
+	content: "\e199"
+}
+
+.glyphicon-tree-deciduous:before {
+	content: "\e200"
+}
+
+.glyphicon-cd:before {
+	content: "\e201"
+}
+
+.glyphicon-save-file:before {
+	content: "\e202"
+}
+
+.glyphicon-open-file:before {
+	content: "\e203"
+}
+
+.glyphicon-level-up:before {
+	content: "\e204"
+}
+
+.glyphicon-copy:before {
+	content: "\e205"
+}
+
+.glyphicon-paste:before {
+	content: "\e206"
+}
+
+.glyphicon-alert:before {
+	content: "\e209"
+}
+
+.glyphicon-equalizer:before {
+	content: "\e210"
+}
+
+.glyphicon-king:before {
+	content: "\e211"
+}
+
+.glyphicon-queen:before {
+	content: "\e212"
+}
+
+.glyphicon-pawn:before {
+	content: "\e213"
+}
+
+.glyphicon-bishop:before {
+	content: "\e214"
+}
+
+.glyphicon-knight:before {
+	content: "\e215"
+}
+
+.glyphicon-baby-formula:before {
+	content: "\e216"
+}
+
+.glyphicon-tent:before {
+	content: "\26fa"
+}
+
+.glyphicon-blackboard:before {
+	content: "\e218"
+}
+
+.glyphicon-bed:before {
+	content: "\e219"
+}
+
+.glyphicon-apple:before {
+	content: "\f8ff"
+}
+
+.glyphicon-erase:before {
+	content: "\e221"
+}
+
+.glyphicon-hourglass:before {
+	content: "\231b"
+}
+
+.glyphicon-lamp:before {
+	content: "\e223"
+}
+
+.glyphicon-duplicate:before {
+	content: "\e224"
+}
+
+.glyphicon-piggy-bank:before {
+	content: "\e225"
+}
+
+.glyphicon-scissors:before {
+	content: "\e226"
+}
+
+.glyphicon-bitcoin:before {
+	content: "\e227"
+}
+
+.glyphicon-btc:before {
+	content: "\e227"
+}
+
+.glyphicon-xbt:before {
+	content: "\e227"
+}
+
+.glyphicon-yen:before {
+	content: "\00a5"
+}
+
+.glyphicon-jpy:before {
+	content: "\00a5"
+}
+
+.glyphicon-ruble:before {
+	content: "\20bd"
+}
+
+.glyphicon-rub:before {
+	content: "\20bd"
+}
+
+.glyphicon-scale:before {
+	content: "\e230"
+}
+
+.glyphicon-ice-lolly:before {
+	content: "\e231"
+}
+
+.glyphicon-ice-lolly-tasted:before {
+	content: "\e232"
+}
+
+.glyphicon-education:before {
+	content: "\e233"
+}
+
+.glyphicon-option-horizontal:before {
+	content: "\e234"
+}
+
+.glyphicon-option-vertical:before {
+	content: "\e235"
+}
+
+.glyphicon-menu-hamburger:before {
+	content: "\e236"
+}
+
+.glyphicon-modal-window:before {
+	content: "\e237"
+}
+
+.glyphicon-oil:before {
+	content: "\e238"
+}
+
+.glyphicon-grain:before {
+	content: "\e239"
+}
+
+.glyphicon-sunglasses:before {
+	content: "\e240"
+}
+
+.glyphicon-text-size:before {
+	content: "\e241"
+}
+
+.glyphicon-text-color:before {
+	content: "\e242"
+}
+
+.glyphicon-text-background:before {
+	content: "\e243"
+}
+
+.glyphicon-object-align-top:before {
+	content: "\e244"
+}
+
+.glyphicon-object-align-bottom:before {
+	content: "\e245"
+}
+
+.glyphicon-object-align-horizontal:before {
+	content: "\e246"
+}
+
+.glyphicon-object-align-left:before {
+	content: "\e247"
+}
+
+.glyphicon-object-align-vertical:before {
+	content: "\e248"
+}
+
+.glyphicon-object-align-right:before {
+	content: "\e249"
+}
+
+.glyphicon-triangle-right:before {
+	content: "\e250"
+}
+
+.glyphicon-triangle-left:before {
+	content: "\e251"
+}
+
+.glyphicon-triangle-bottom:before {
+	content: "\e252"
+}
+
+.glyphicon-triangle-top:before {
+	content: "\e253"
+}
+
+.glyphicon-console:before {
+	content: "\e254"
+}
+
+.glyphicon-superscript:before {
+	content: "\e255"
+}
+
+.glyphicon-subscript:before {
+	content: "\e256"
+}
+
+.glyphicon-menu-left:before {
+	content: "\e257"
+}
+
+.glyphicon-menu-right:before {
+	content: "\e258"
+}
+
+.glyphicon-menu-down:before {
+	content: "\e259"
+}
+
+.glyphicon-menu-up:before {
+	content: "\e260"
+}
+
+* {
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box
+}
+
+:after,
+:before {
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box
+}
+
+html {
+	font-size: 10px;
+	-webkit-tap-highlight-color: rgba(0, 0, 0, 0)
+}
+
+body {
+	font-family: "Helvetica Neue", Helvetica, Tahoma, Arial, 'Microsoft Yahei', 'Hiragino Sans GB', 'WenQuanYi Micro Hei', sans-serif;
+	font-size: 14px;
+	line-height: 1.42857143;
+	color: #333;
+	background-color: #fff
+}
+
+button,
+input,
+select,
+textarea {
+	font-family: inherit;
+	font-size: inherit;
+	line-height: inherit
+}
+
+a {
+	color: #337ab7;
+	text-decoration: none
+}
+
+a:focus,
+a:hover {
+	color: #23527c;
+	text-decoration: underline
+}
+
+a:focus {
+	outline: 5px auto -webkit-focus-ring-color;
+	outline-offset: -2px
+}
+
+figure {
+	margin: 0
+}
+
+img {
+	vertical-align: middle
+}
+
+.carousel-inner>.item>a>img,
+.carousel-inner>.item>img,
+.img-responsive,
+.thumbnail a>img,
+.thumbnail>img {
+	display: block;
+	max-width: 100%;
+	height: auto
+}
+
+.img-rounded {
+	border-radius: 6px
+}
+
+.img-thumbnail {
+	display: inline-block;
+	max-width: 100%;
+	height: auto;
+	padding: 4px;
+	line-height: 1.42857143;
+	background-color: #fff;
+	border: 1px solid #ddd;
+	border-radius: 4px;
+	-webkit-transition: all .2s ease-in-out;
+	-o-transition: all .2s ease-in-out;
+	transition: all .2s ease-in-out
+}
+
+.img-circle {
+	border-radius: 50%
+}
+
+hr {
+	margin-top: 20px;
+	margin-bottom: 20px;
+	border: 0;
+	border-top: 1px solid #eee
+}
+
+.sr-only {
+	position: absolute;
+	width: 1px;
+	height: 1px;
+	padding: 0;
+	margin: -1px;
+	overflow: hidden;
+	clip: rect(0, 0, 0, 0);
+	border: 0
+}
+
+.sr-only-focusable:active,
+.sr-only-focusable:focus {
+	position: static;
+	width: auto;
+	height: auto;
+	margin: 0;
+	overflow: visible;
+	clip: auto
+}
+
+[role=button] {
+	cursor: pointer
+}
+
+.h1,
+.h2,
+.h3,
+.h4,
+.h5,
+.h6,
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+	font-family: inherit;
+	font-weight: 500;
+	line-height: 1.1;
+	color: inherit
+}
+
+.h1 .small,
+.h1 small,
+.h2 .small,
+.h2 small,
+.h3 .small,
+.h3 small,
+.h4 .small,
+.h4 small,
+.h5 .small,
+.h5 small,
+.h6 .small,
+.h6 small,
+h1 .small,
+h1 small,
+h2 .small,
+h2 small,
+h3 .small,
+h3 small,
+h4 .small,
+h4 small,
+h5 .small,
+h5 small,
+h6 .small,
+h6 small {
+	font-weight: 400;
+	line-height: 1;
+	color: #777
+}
+
+.h1,
+.h2,
+.h3,
+h1,
+h2,
+h3 {
+	margin-top: 20px;
+	margin-bottom: 10px
+}
+
+.h1 .small,
+.h1 small,
+.h2 .small,
+.h2 small,
+.h3 .small,
+.h3 small,
+h1 .small,
+h1 small,
+h2 .small,
+h2 small,
+h3 .small,
+h3 small {
+	font-size: 65%
+}
+
+.h4,
+.h5,
+.h6,
+h4,
+h5,
+h6 {
+	margin-top: 10px;
+	margin-bottom: 10px
+}
+
+.h4 .small,
+.h4 small,
+.h5 .small,
+.h5 small,
+.h6 .small,
+.h6 small,
+h4 .small,
+h4 small,
+h5 .small,
+h5 small,
+h6 .small,
+h6 small {
+	font-size: 75%
+}
+
+.h1,
+h1 {
+	font-size: 36px
+}
+
+.h2,
+h2 {
+	font-size: 30px
+}
+
+.h3,
+h3 {
+	font-size: 24px
+}
+
+.h4,
+h4 {
+	font-size: 18px
+}
+
+.h5,
+h5 {
+	font-size: 14px
+}
+
+.h6,
+h6 {
+	font-size: 12px
+}
+
+p {
+	margin: 0 0 10px
+}
+
+.lead {
+	margin-bottom: 20px;
+	font-size: 16px;
+	font-weight: 300;
+	line-height: 1.4
+}
+
+@media (min-width:768px) {
+	.lead {
+		font-size: 21px
+	}
+}
+
+.small,
+small {
+	font-size: 85%
+}
+
+.mark,
+mark {
+	padding: .2em;
+	background-color: #fcf8e3
+}
+
+.text-left {
+	text-align: left
+}
+
+.text-right {
+	text-align: right
+}
+
+.text-center {
+	text-align: center
+}
+
+.text-justify {
+	text-align: justify
+}
+
+.text-nowrap {
+	white-space: nowrap
+}
+
+.text-lowercase {
+	text-transform: lowercase
+}
+
+.text-uppercase {
+	text-transform: uppercase
+}
+
+.text-capitalize {
+	text-transform: capitalize
+}
+
+.text-muted {
+	color: #777
+}
+
+.text-primary {
+	color: #337ab7
+}
+
+a.text-primary:focus,
+a.text-primary:hover {
+	color: #286090
+}
+
+.text-success {
+	color: #3c763d
+}
+
+a.text-success:focus,
+a.text-success:hover {
+	color: #2b542c
+}
+
+.text-info {
+	color: #31708f
+}
+
+a.text-info:focus,
+a.text-info:hover {
+	color: #245269
+}
+
+.text-warning {
+	color: #8a6d3b
+}
+
+a.text-warning:focus,
+a.text-warning:hover {
+	color: #66512c
+}
+
+.text-danger {
+	color: #a94442
+}
+
+a.text-danger:focus,
+a.text-danger:hover {
+	color: #843534
+}
+
+.bg-primary {
+	color: #fff;
+	background-color: #337ab7
+}
+
+a.bg-primary:focus,
+a.bg-primary:hover {
+	background-color: #286090
+}
+
+.bg-success {
+	background-color: #dff0d8
+}
+
+a.bg-success:focus,
+a.bg-success:hover {
+	background-color: #c1e2b3
+}
+
+.bg-info {
+	background-color: #d9edf7
+}
+
+a.bg-info:focus,
+a.bg-info:hover {
+	background-color: #afd9ee
+}
+
+.bg-warning {
+	background-color: #fcf8e3
+}
+
+a.bg-warning:focus,
+a.bg-warning:hover {
+	background-color: #f7ecb5
+}
+
+.bg-danger {
+	background-color: #f2dede
+}
+
+a.bg-danger:focus,
+a.bg-danger:hover {
+	background-color: #e4b9b9
+}
+
+.page-header {
+	padding-bottom: 9px;
+	margin: 40px 0 20px;
+	border-bottom: 1px solid #eee
+}
+
+ol,
+ul {
+	margin-top: 0;
+	margin-bottom: 10px
+}
+
+ol ol,
+ol ul,
+ul ol,
+ul ul {
+	margin-bottom: 0
+}
+
+.list-unstyled {
+	padding-left: 0;
+	list-style: none
+}
+
+.list-inline {
+	padding-left: 0;
+	margin-left: -5px;
+	list-style: none
+}
+
+.list-inline>li {
+	display: inline-block;
+	padding-right: 5px;
+	padding-left: 5px
+}
+
+dl {
+	margin-top: 0;
+	margin-bottom: 20px
+}
+
+dd,
+dt {
+	line-height: 1.42857143
+}
+
+dt {
+	font-weight: 700
+}
+
+dd {
+	margin-left: 0
+}
+
+@media (min-width:768px) {
+	.dl-horizontal dt {
+		float: left;
+		width: 160px;
+		overflow: hidden;
+		clear: left;
+		text-align: right;
+		text-overflow: ellipsis;
+		white-space: nowrap
+	}
+	.dl-horizontal dd {
+		margin-left: 180px
+	}
+}
+
+abbr[data-original-title],
+abbr[title] {
+	cursor: help;
+	border-bottom: 1px dotted #777
+}
+
+.initialism {
+	font-size: 90%;
+	text-transform: uppercase
+}
+
+blockquote {
+	padding: 10px 20px;
+	margin: 0 0 20px;
+	font-size: 17.5px;
+	border-left: 5px solid #eee
+}
+
+blockquote ol:last-child,
+blockquote p:last-child,
+blockquote ul:last-child {
+	margin-bottom: 0
+}
+
+blockquote .small,
+blockquote footer,
+blockquote small {
+	display: block;
+	font-size: 80%;
+	line-height: 1.42857143;
+	color: #777
+}
+
+blockquote .small:before,
+blockquote footer:before,
+blockquote small:before {
+	content: '\2014 \00A0'
+}
+
+.blockquote-reverse,
+blockquote.pull-right {
+	padding-right: 15px;
+	padding-left: 0;
+	text-align: right;
+	border-right: 5px solid #eee;
+	border-left: 0
+}
+
+.blockquote-reverse .small:before,
+.blockquote-reverse footer:before,
+.blockquote-reverse small:before,
+blockquote.pull-right .small:before,
+blockquote.pull-right footer:before,
+blockquote.pull-right small:before {
+	content: ''
+}
+
+.blockquote-reverse .small:after,
+.blockquote-reverse footer:after,
+.blockquote-reverse small:after,
+blockquote.pull-right .small:after,
+blockquote.pull-right footer:after,
+blockquote.pull-right small:after {
+	content: '\00A0 \2014'
+}
+
+address {
+	margin-bottom: 20px;
+	font-style: normal;
+	line-height: 1.42857143
+}
+
+code,
+kbd,
+pre,
+samp {
+	font-family: Menlo, Monaco, Consolas, "Courier New", monospace
+}
+
+code {
+	padding: 2px 4px;
+	font-size: 90%;
+	color: #c7254e;
+	background-color: #f9f2f4;
+	border-radius: 4px
+}
+
+kbd {
+	padding: 2px 4px;
+	font-size: 90%;
+	color: #fff;
+	background-color: #333;
+	border-radius: 3px;
+	-webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .25);
+	box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .25)
+}
+
+kbd kbd {
+	padding: 0;
+	font-size: 100%;
+	font-weight: 700;
+	-webkit-box-shadow: none;
+	box-shadow: none
+}
+
+pre {
+	display: block;
+	padding: 9.5px;
+	margin: 0 0 10px;
+	font-size: 13px;
+	line-height: 1.42857143;
+	color: #333;
+	word-break: break-all;
+	word-wrap: break-word;
+	background-color: #f5f5f5;
+	border: 1px solid #ccc;
+	border-radius: 4px
+}
+
+pre code {
+	padding: 0;
+	font-size: inherit;
+	color: inherit;
+	white-space: pre-wrap;
+	background-color: transparent;
+	border-radius: 0
+}
+
+.pre-scrollable {
+	max-height: 340px;
+	overflow-y: scroll
+}
+
+.container {
+	padding-right: 15px;
+	padding-left: 15px;
+	margin-right: auto;
+	margin-left: auto
+}
+
+@media (min-width:768px) {
+	.container {
+		width: 750px
+	}
+}
+
+@media (min-width:992px) {
+	.container {
+		width: 970px
+	}
+}
+
+@media (min-width:1200px) {
+	.container {
+		width: 1170px
+	}
+}
+
+.container-fluid {
+	padding-right: 15px;
+	padding-left: 15px;
+	margin-right: auto;
+	margin-left: auto
+}
+
+.row {
+	margin-left:10px
+}
+
+.col-lg-1,
+.col-lg-10,
+.col-lg-11,
+.col-lg-12,
+.col-lg-2,
+.col-lg-3,
+.col-lg-4,
+.col-lg-5,
+.col-lg-6,
+.col-lg-7,
+.col-lg-8,
+.col-lg-9,
+.col-md-1,
+.col-md-10,
+.col-md-11,
+.col-md-12,
+.col-md-2,
+.col-md-3,
+.col-md-4,
+.col-md-5,
+.col-md-6,
+.col-md-7,
+.col-md-8,
+.col-md-9,
+.col-sm-1,
+.col-sm-10,
+.col-sm-11,
+.col-sm-12,
+.col-sm-2,
+.col-sm-3,
+.col-sm-4,
+.col-sm-5,
+.col-sm-6,
+.col-sm-7,
+.col-sm-8,
+.col-sm-9,
+.col-xs-1,
+.col-xs-10,
+.col-xs-11,
+.col-xs-12,
+.col-xs-2,
+.col-xs-3,
+.col-xs-4,
+.col-xs-5,
+.col-xs-6,
+.col-xs-7,
+.col-xs-8,
+.col-xs-9 {
+	position: relative;
+	min-height: 1px;
+	padding-right: 10px;
+	padding-left: 10px
+}
+
+.col-xs-1,
+.col-xs-10,
+.col-xs-11,
+.col-xs-12,
+.col-xs-2,
+.col-xs-3,
+.col-xs-4,
+.col-xs-5,
+.col-xs-6,
+.col-xs-7,
+.col-xs-8,
+.col-xs-9 {
+	float: left
+}
+
+.col-xs-12 {
+	width: 100%
+}
+
+.col-xs-11 {
+	width: 91.66666667%
+}
+
+.col-xs-10 {
+	width: 83.33333333%
+}
+
+.col-xs-9 {
+	width: 75%
+}
+
+.col-xs-8 {
+	width: 66.66666667%
+}
+
+.col-xs-7 {
+	width: 58.33333333%
+}
+
+.col-xs-6 {
+	width: 50%
+}
+
+.col-xs-5 {
+	width: 41.66666667%
+}
+
+.col-xs-4 {
+	width: 33.33333333%
+}
+
+.col-xs-3 {
+	width: 25%
+}
+
+.col-xs-2 {
+	width: 16.66666667%
+}
+
+.col-xs-1 {
+	width: 8.33333333%
+}
+
+.col-xs-pull-12 {
+	right: 100%
+}
+
+.col-xs-pull-11 {
+	right: 91.66666667%
+}
+
+.col-xs-pull-10 {
+	right: 83.33333333%
+}
+
+.col-xs-pull-9 {
+	right: 75%
+}
+
+.col-xs-pull-8 {
+	right: 66.66666667%
+}
+
+.col-xs-pull-7 {
+	right: 58.33333333%
+}
+
+.col-xs-pull-6 {
+	right: 50%
+}
+
+.col-xs-pull-5 {
+	right: 41.66666667%
+}
+
+.col-xs-pull-4 {
+	right: 33.33333333%
+}
+
+.col-xs-pull-3 {
+	right: 25%
+}
+
+.col-xs-pull-2 {
+	right: 16.66666667%
+}
+
+.col-xs-pull-1 {
+	right: 8.33333333%
+}
+
+.col-xs-pull-0 {
+	right: auto
+}
+
+.col-xs-push-12 {
+	left: 100%
+}
+
+.col-xs-push-11 {
+	left: 91.66666667%
+}
+
+.col-xs-push-10 {
+	left: 83.33333333%
+}
+
+.col-xs-push-9 {
+	left: 75%
+}
+
+.col-xs-push-8 {
+	left: 66.66666667%
+}
+
+.col-xs-push-7 {
+	left: 58.33333333%
+}
+
+.col-xs-push-6 {
+	left: 50%
+}
+
+.col-xs-push-5 {
+	left: 41.66666667%
+}
+
+.col-xs-push-4 {
+	left: 33.33333333%
+}
+
+.col-xs-push-3 {
+	left: 25%
+}
+
+.col-xs-push-2 {
+	left: 16.66666667%
+}
+
+.col-xs-push-1 {
+	left: 8.33333333%
+}
+
+.col-xs-push-0 {
+	left: auto
+}
+
+.col-xs-offset-12 {
+	margin-left: 100%
+}
+
+.col-xs-offset-11 {
+	margin-left: 91.66666667%
+}
+
+.col-xs-offset-10 {
+	margin-left: 83.33333333%
+}
+
+.col-xs-offset-9 {
+	margin-left: 75%
+}
+
+.col-xs-offset-8 {
+	margin-left: 66.66666667%
+}
+
+.col-xs-offset-7 {
+	margin-left: 58.33333333%
+}
+
+.col-xs-offset-6 {
+	margin-left: 50%
+}
+
+.col-xs-offset-5 {
+	margin-left: 41.66666667%
+}
+
+.col-xs-offset-4 {
+	margin-left: 33.33333333%
+}
+
+.col-xs-offset-3 {
+	margin-left: 25%
+}
+
+.col-xs-offset-2 {
+	margin-left: 16.66666667%
+}
+
+.col-xs-offset-1 {
+	margin-left: 8.33333333%
+}
+
+.col-xs-offset-0 {
+	margin-left: 0
+}
+
+@media (min-width:768px) {
+	.col-sm-1,
+	.col-sm-10,
+	.col-sm-11,
+	.col-sm-12,
+	.col-sm-2,
+	.col-sm-3,
+	.col-sm-4,
+	.col-sm-5,
+	.col-sm-6,
+	.col-sm-7,
+	.col-sm-8,
+	.col-sm-9 {
+		float: left
+	}
+	.col-sm-12 {
+		width: 100%
+	}
+	.col-sm-11 {
+		width: 91.66666667%
+	}
+	.col-sm-10 {
+		width: 83.33333333%
+	}
+	.col-sm-9 {
+		width: 75%
+	}
+	.col-sm-8 {
+		width: 66.66666667%
+	}
+	.col-sm-7 {
+		width: 58.33333333%
+	}
+	.col-sm-6 {
+		width: 50%
+	}
+	.col-sm-5 {
+		width: 41.66666667%
+	}
+	.col-sm-4 {
+		width: 33.33333333%
+	}
+	.col-sm-3 {
+		width: 25%
+	}
+	.col-sm-2 {
+		width: 16.66666667%
+	}
+	.col-sm-1 {
+		width: 8.33333333%
+	}
+	.col-sm-pull-12 {
+		right: 100%
+	}
+	.col-sm-pull-11 {
+		right: 91.66666667%
+	}
+	.col-sm-pull-10 {
+		right: 83.33333333%
+	}
+	.col-sm-pull-9 {
+		right: 75%
+	}
+	.col-sm-pull-8 {
+		right: 66.66666667%
+	}
+	.col-sm-pull-7 {
+		right: 58.33333333%
+	}
+	.col-sm-pull-6 {
+		right: 50%
+	}
+	.col-sm-pull-5 {
+		right: 41.66666667%
+	}
+	.col-sm-pull-4 {
+		right: 33.33333333%
+	}
+	.col-sm-pull-3 {
+		right: 25%
+	}
+	.col-sm-pull-2 {
+		right: 16.66666667%
+	}
+	.col-sm-pull-1 {
+		right: 8.33333333%
+	}
+	.col-sm-pull-0 {
+		right: auto
+	}
+	.col-sm-push-12 {
+		left: 100%
+	}
+	.col-sm-push-11 {
+		left: 91.66666667%
+	}
+	.col-sm-push-10 {
+		left: 83.33333333%
+	}
+	.col-sm-push-9 {
+		left: 75%
+	}
+	.col-sm-push-8 {
+		left: 66.66666667%
+	}
+	.col-sm-push-7 {
+		left: 58.33333333%
+	}
+	.col-sm-push-6 {
+		left: 50%
+	}
+	.col-sm-push-5 {
+		left: 41.66666667%
+	}
+	.col-sm-push-4 {
+		left: 33.33333333%
+	}
+	.col-sm-push-3 {
+		left: 25%
+	}
+	.col-sm-push-2 {
+		left: 16.66666667%
+	}
+	.col-sm-push-1 {
+		left: 8.33333333%
+	}
+	.col-sm-push-0 {
+		left: auto
+	}
+	.col-sm-offset-12 {
+		margin-left: 100%
+	}
+	.col-sm-offset-11 {
+		margin-left: 91.66666667%
+	}
+	.col-sm-offset-10 {
+		margin-left: 83.33333333%
+	}
+	.col-sm-offset-9 {
+		margin-left: 75%
+	}
+	.col-sm-offset-8 {
+		margin-left: 66.66666667%
+	}
+	.col-sm-offset-7 {
+		margin-left: 58.33333333%
+	}
+	.col-sm-offset-6 {
+		margin-left: 50%
+	}
+	.col-sm-offset-5 {
+		margin-left: 41.66666667%
+	}
+	.col-sm-offset-4 {
+		margin-left: 33.33333333%
+	}
+	.col-sm-offset-3 {
+		margin-left: 25%
+	}
+	.col-sm-offset-2 {
+		margin-left: 16.66666667%
+	}
+	.col-sm-offset-1 {
+		margin-left: 8.33333333%
+	}
+	.col-sm-offset-0 {
+		margin-left: 0
+	}
+}
+
+@media (min-width:992px) {
+	.col-md-1,
+	.col-md-10,
+	.col-md-11,
+	.col-md-12,
+	.col-md-2,
+	.col-md-3,
+	.col-md-4,
+	.col-md-5,
+	.col-md-6,
+	.col-md-7,
+	.col-md-8,
+	.col-md-9 {
+		float: left
+	}
+	.col-md-12 {
+		width: 100%
+	}
+	.col-md-11 {
+		width: 91.66666667%
+	}
+	.col-md-10 {
+		width: 83.33333333%
+	}
+	.col-md-9 {
+		width: 75%
+	}
+	.col-md-8 {
+		width: 66.66666667%
+	}
+	.col-md-7 {
+		width: 58.33333333%
+	}
+	.col-md-6 {
+		width: 50%
+	}
+	.col-md-5 {
+		width: 41.66666667%
+	}
+	.col-md-4 {
+		width: 33.33333333%
+	}
+	.col-md-3 {
+		width: 25%
+	}
+	.col-md-2 {
+		width: 16.66666667%
+	}
+	.col-md-1 {
+		width: 8.33333333%
+	}
+	.col-md-pull-12 {
+		right: 100%
+	}
+	.col-md-pull-11 {
+		right: 91.66666667%
+	}
+	.col-md-pull-10 {
+		right: 83.33333333%
+	}
+	.col-md-pull-9 {
+		right: 75%
+	}
+	.col-md-pull-8 {
+		right: 66.66666667%
+	}
+	.col-md-pull-7 {
+		right: 58.33333333%
+	}
+	.col-md-pull-6 {
+		right: 50%
+	}
+	.col-md-pull-5 {
+		right: 41.66666667%
+	}
+	.col-md-pull-4 {
+		right: 33.33333333%
+	}
+	.col-md-pull-3 {
+		right: 25%
+	}
+	.col-md-pull-2 {
+		right: 16.66666667%
+	}
+	.col-md-pull-1 {
+		right: 8.33333333%
+	}
+	.col-md-pull-0 {
+		right: auto
+	}
+	.col-md-push-12 {
+		left: 100%
+	}
+	.col-md-push-11 {
+		left: 91.66666667%
+	}
+	.col-md-push-10 {
+		left: 83.33333333%
+	}
+	.col-md-push-9 {
+		left: 75%
+	}
+	.col-md-push-8 {
+		left: 66.66666667%
+	}
+	.col-md-push-7 {
+		left: 58.33333333%
+	}
+	.col-md-push-6 {
+		left: 50%
+	}
+	.col-md-push-5 {
+		left: 41.66666667%
+	}
+	.col-md-push-4 {
+		left: 33.33333333%
+	}
+	.col-md-push-3 {
+		left: 25%
+	}
+	.col-md-push-2 {
+		left: 16.66666667%
+	}
+	.col-md-push-1 {
+		left: 8.33333333%
+	}
+	.col-md-push-0 {
+		left: auto
+	}
+	.col-md-offset-12 {
+		margin-left: 100%
+	}
+	.col-md-offset-11 {
+		margin-left: 91.66666667%
+	}
+	.col-md-offset-10 {
+		margin-left: 83.33333333%
+	}
+	.col-md-offset-9 {
+		margin-left: 75%
+	}
+	.col-md-offset-8 {
+		margin-left: 66.66666667%
+	}
+	.col-md-offset-7 {
+		margin-left: 58.33333333%
+	}
+	.col-md-offset-6 {
+		margin-left: 50%
+	}
+	.col-md-offset-5 {
+		margin-left: 41.66666667%
+	}
+	.col-md-offset-4 {
+		margin-left: 33.33333333%
+	}
+	.col-md-offset-3 {
+		margin-left: 25%
+	}
+	.col-md-offset-2 {
+		margin-left: 16.66666667%
+	}
+	.col-md-offset-1 {
+		margin-left: 8.33333333%
+	}
+	.col-md-offset-0 {
+		margin-left: 0
+	}
+}
+
+@media (min-width:1000px) {
+	.col-lg-1,
+	.col-lg-10,
+	.col-lg-11,
+	.col-lg-12,
+	.col-lg-2,
+	.col-lg-3,
+	.col-lg-4,
+	.col-lg-5,
+	.col-lg-6,
+	.col-lg-7,
+	.col-lg-8,
+	.col-lg-9 {
+		float: left
+	}
+	.col-lg-12 {
+		width: 100%
+	}
+	.col-lg-11 {
+		width: 91.66666667%
+	}
+	.col-lg-10 {
+		width: 83.33333333%
+	}
+	.col-lg-9 {
+		width: 75%
+	}
+	.col-lg-8 {
+		width: 66.66666667%
+	}
+	.col-lg-7 {
+		width: 58.33333333%
+	}
+	.col-lg-6 {
+		width: 50%
+	}
+	.col-lg-5 {
+		width: 41.66666667%
+	}
+	.col-lg-4 {
+		width: 33.33333333%
+	}
+	.col-lg-3 {
+		width: 25%
+	}
+	.col-lg-2 {
+		width: 16.66666667%
+	}
+	.col-lg-1 {
+		width: 8.33333333%
+	}
+	.col-lg-pull-12 {
+		right: 100%
+	}
+	.col-lg-pull-11 {
+		right: 91.66666667%
+	}
+	.col-lg-pull-10 {
+		right: 83.33333333%
+	}
+	.col-lg-pull-9 {
+		right: 75%
+	}
+	.col-lg-pull-8 {
+		right: 66.66666667%
+	}
+	.col-lg-pull-7 {
+		right: 58.33333333%
+	}
+	.col-lg-pull-6 {
+		right: 50%
+	}
+	.col-lg-pull-5 {
+		right: 41.66666667%
+	}
+	.col-lg-pull-4 {
+		right: 33.33333333%
+	}
+	.col-lg-pull-3 {
+		right: 25%
+	}
+	.col-lg-pull-2 {
+		right: 16.66666667%
+	}
+	.col-lg-pull-1 {
+		right: 8.33333333%
+	}
+	.col-lg-pull-0 {
+		right: auto
+	}
+	.col-lg-push-12 {
+		left: 100%
+	}
+	.col-lg-push-11 {
+		left: 91.66666667%
+	}
+	.col-lg-push-10 {
+		left: 83.33333333%
+	}
+	.col-lg-push-9 {
+		left: 75%
+	}
+	.col-lg-push-8 {
+		left: 66.66666667%
+	}
+	.col-lg-push-7 {
+		left: 58.33333333%
+	}
+	.col-lg-push-6 {
+		left: 50%
+	}
+	.col-lg-push-5 {
+		left: 41.66666667%
+	}
+	.col-lg-push-4 {
+		left: 33.33333333%
+	}
+	.col-lg-push-3 {
+		left: 25%
+	}
+	.col-lg-push-2 {
+		left: 16.66666667%
+	}
+	.col-lg-push-1 {
+		left: 8.33333333%
+	}
+	.col-lg-push-0 {
+		left: auto
+	}
+	.col-lg-offset-12 {
+		margin-left: 100%
+	}
+	.col-lg-offset-11 {
+		margin-left: 91.66666667%
+	}
+	.col-lg-offset-10 {
+		margin-left: 83.33333333%
+	}
+	.col-lg-offset-9 {
+		margin-left: 75%
+	}
+	.col-lg-offset-8 {
+		margin-left: 66.66666667%
+	}
+	.col-lg-offset-7 {
+		margin-left: 58.33333333%
+	}
+	.col-lg-offset-6 {
+		margin-left: 50%
+	}
+	.col-lg-offset-5 {
+		margin-left: 41.66666667%
+	}
+	.col-lg-offset-4 {
+		margin-left: 33.33333333%
+	}
+	.col-lg-offset-3 {
+		margin-left: 25%
+	}
+	.col-lg-offset-2 {
+		margin-left: 16.66666667%
+	}
+	.col-lg-offset-1 {
+		margin-left: 8.33333333%
+	}
+	.col-lg-offset-0 {
+		margin-left: 0
+	}
+}
+
+table {
+	background-color: transparent
+}
+
+caption {
+	padding-top: 8px;
+	padding-bottom: 8px;
+	color: #777;
+	text-align: left
+}
+
+th {
+	text-align: left
+}
+
+.table {
+	width: 100%;
+	max-width: 100%;
+	margin-bottom: 20px
+}
+
+.table>tbody>tr>td,
+.table>tbody>tr>th,
+.table>tfoot>tr>td,
+.table>tfoot>tr>th,
+.table>thead>tr>td,
+.table>thead>tr>th {
+	padding: 8px;
+	line-height: 1.42857143;
+	vertical-align: top;
+	border-top: 1px solid #ddd
+}
+
+.table>thead>tr>th {
+	vertical-align: bottom;
+	border-bottom: 2px solid #ddd
+}
+
+.table>caption+thead>tr:first-child>td,
+.table>caption+thead>tr:first-child>th,
+.table>colgroup+thead>tr:first-child>td,
+.table>colgroup+thead>tr:first-child>th,
+.table>thead:first-child>tr:first-child>td,
+.table>thead:first-child>tr:first-child>th {
+	border-top: 0
+}
+
+.table>tbody+tbody {
+	border-top: 2px solid #ddd
+}
+
+.table .table {
+	background-color: #fff
+}
+
+.table-condensed>tbody>tr>td,
+.table-condensed>tbody>tr>th,
+.table-condensed>tfoot>tr>td,
+.table-condensed>tfoot>tr>th,
+.table-condensed>thead>tr>td,
+.table-condensed>thead>tr>th {
+	padding: 5px
+}
+
+.table-bordered {
+	border: 1px solid #ddd
+}
+
+.table-bordered>tbody>tr>td,
+.table-bordered>tbody>tr>th,
+.table-bordered>tfoot>tr>td,
+.table-bordered>tfoot>tr>th,
+.table-bordered>thead>tr>td,
+.table-bordered>thead>tr>th {
+	border: 1px solid #ddd
+}
+
+.table-bordered>thead>tr>td,
+.table-bordered>thead>tr>th {
+	border-bottom-width: 2px
+}
+
+.table-striped>tbody>tr:nth-of-type(odd) {
+	background-color: #f9f9f9
+}
+
+.table-hover>tbody>tr:hover {
+	background-color: #f5f5f5
+}
+
+table col[class*=col-] {
+	position: static;
+	display: table-column;
+	float: none
+}
+
+table td[class*=col-],
+table th[class*=col-] {
+	position: static;
+	display: table-cell;
+	float: none
+}
+
+.table>tbody>tr.active>td,
+.table>tbody>tr.active>th,
+.table>tbody>tr>td.active,
+.table>tbody>tr>th.active,
+.table>tfoot>tr.active>td,
+.table>tfoot>tr.active>th,
+.table>tfoot>tr>td.active,
+.table>tfoot>tr>th.active,
+.table>thead>tr.active>td,
+.table>thead>tr.active>th,
+.table>thead>tr>td.active,
+.table>thead>tr>th.active {
+	background-color: #f5f5f5
+}
+
+.table-hover>tbody>tr.active:hover>td,
+.table-hover>tbody>tr.active:hover>th,
+.table-hover>tbody>tr:hover>.active,
+.table-hover>tbody>tr>td.active:hover,
+.table-hover>tbody>tr>th.active:hover {
+	background-color: #e8e8e8
+}
+
+.table>tbody>tr.success>td,
+.table>tbody>tr.success>th,
+.table>tbody>tr>td.success,
+.table>tbody>tr>th.success,
+.table>tfoot>tr.success>td,
+.table>tfoot>tr.success>th,
+.table>tfoot>tr>td.success,
+.table>tfoot>tr>th.success,
+.table>thead>tr.success>td,
+.table>thead>tr.success>th,
+.table>thead>tr>td.success,
+.table>thead>tr>th.success {
+	background-color: #dff0d8
+}
+
+.table-hover>tbody>tr.success:hover>td,
+.table-hover>tbody>tr.success:hover>th,
+.table-hover>tbody>tr:hover>.success,
+.table-hover>tbody>tr>td.success:hover,
+.table-hover>tbody>tr>th.success:hover {
+	background-color: #d0e9c6
+}
+
+.table>tbody>tr.info>td,
+.table>tbody>tr.info>th,
+.table>tbody>tr>td.info,
+.table>tbody>tr>th.info,
+.table>tfoot>tr.info>td,
+.table>tfoot>tr.info>th,
+.table>tfoot>tr>td.info,
+.table>tfoot>tr>th.info,
+.table>thead>tr.info>td,
+.table>thead>tr.info>th,
+.table>thead>tr>td.info,
+.table>thead>tr>th.info {
+	background-color: #d9edf7
+}
+
+.table-hover>tbody>tr.info:hover>td,
+.table-hover>tbody>tr.info:hover>th,
+.table-hover>tbody>tr:hover>.info,
+.table-hover>tbody>tr>td.info:hover,
+.table-hover>tbody>tr>th.info:hover {
+	background-color: #c4e3f3
+}
+
+.table>tbody>tr.warning>td,
+.table>tbody>tr.warning>th,
+.table>tbody>tr>td.warning,
+.table>tbody>tr>th.warning,
+.table>tfoot>tr.warning>td,
+.table>tfoot>tr.warning>th,
+.table>tfoot>tr>td.warning,
+.table>tfoot>tr>th.warning,
+.table>thead>tr.warning>td,
+.table>thead>tr.warning>th,
+.table>thead>tr>td.warning,
+.table>thead>tr>th.warning {
+	background-color: #fcf8e3
+}
+
+.table-hover>tbody>tr.warning:hover>td,
+.table-hover>tbody>tr.warning:hover>th,
+.table-hover>tbody>tr:hover>.warning,
+.table-hover>tbody>tr>td.warning:hover,
+.table-hover>tbody>tr>th.warning:hover {
+	background-color: #faf2cc
+}
+
+.table>tbody>tr.danger>td,
+.table>tbody>tr.danger>th,
+.table>tbody>tr>td.danger,
+.table>tbody>tr>th.danger,
+.table>tfoot>tr.danger>td,
+.table>tfoot>tr.danger>th,
+.table>tfoot>tr>td.danger,
+.table>tfoot>tr>th.danger,
+.table>thead>tr.danger>td,
+.table>thead>tr.danger>th,
+.table>thead>tr>td.danger,
+.table>thead>tr>th.danger {
+	background-color: #f2dede
+}
+
+.table-hover>tbody>tr.danger:hover>td,
+.table-hover>tbody>tr.danger:hover>th,
+.table-hover>tbody>tr:hover>.danger,
+.table-hover>tbody>tr>td.danger:hover,
+.table-hover>tbody>tr>th.danger:hover {
+	background-color: #ebcccc
+}
+
+.table-responsive {
+	min-height: .01%;
+	overflow-x: auto
+}
+
+@media screen and (max-width:767px) {
+	.table-responsive {
+		width: 100%;
+		margin-bottom: 15px;
+		overflow-y: hidden;
+		-ms-overflow-style: -ms-autohiding-scrollbar;
+		border: 1px solid #ddd
+	}
+	.table-responsive>.table {
+		margin-bottom: 0
+	}
+	.table-responsive>.table>tbody>tr>td,
+	.table-responsive>.table>tbody>tr>th,
+	.table-responsive>.table>tfoot>tr>td,
+	.table-responsive>.table>tfoot>tr>th,
+	.table-responsive>.table>thead>tr>td,
+	.table-responsive>.table>thead>tr>th {
+		white-space: nowrap
+	}
+	.table-responsive>.table-bordered {
+		border: 0
+	}
+	.table-responsive>.table-bordered>tbody>tr>td:first-child,
+	.table-responsive>.table-bordered>tbody>tr>th:first-child,
+	.table-responsive>.table-bordered>tfoot>tr>td:first-child,
+	.table-responsive>.table-bordered>tfoot>tr>th:first-child,
+	.table-responsive>.table-bordered>thead>tr>td:first-child,
+	.table-responsive>.table-bordered>thead>tr>th:first-child {
+		border-left: 0
+	}
+	.table-responsive>.table-bordered>tbody>tr>td:last-child,
+	.table-responsive>.table-bordered>tbody>tr>th:last-child,
+	.table-responsive>.table-bordered>tfoot>tr>td:last-child,
+	.table-responsive>.table-bordered>tfoot>tr>th:last-child,
+	.table-responsive>.table-bordered>thead>tr>td:last-child,
+	.table-responsive>.table-bordered>thead>tr>th:last-child {
+		border-right: 0
+	}
+	.table-responsive>.table-bordered>tbody>tr:last-child>td,
+	.table-responsive>.table-bordered>tbody>tr:last-child>th,
+	.table-responsive>.table-bordered>tfoot>tr:last-child>td,
+	.table-responsive>.table-bordered>tfoot>tr:last-child>th {
+		border-bottom: 0
+	}
+}
+
+fieldset {
+	min-width: 0;
+	padding: 0;
+	margin: 0;
+	border: 0
+}
+
+legend {
+	display: block;
+	width: 100%;
+	padding: 0;
+	margin-bottom: 20px;
+	font-size: 21px;
+	line-height: inherit;
+	color: #333;
+	border: 0;
+	border-bottom: 1px solid #e5e5e5
+}
+
+label {
+	display: inline-block;
+	max-width: 100%;
+	margin-bottom: 5px;
+	font-weight: 700
+}
+
+input[type=search] {
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box
+}
+
+input[type=checkbox],
+input[type=radio] {
+	margin: 0 4px;
+	margin-top: 1px\9;
+	line-height: normal
+}
+
+input[type=file] {
+	display: block
+}
+
+input[type=range] {
+	display: block;
+	width: 100%
+}
+
+select[multiple],
+select[size] {
+	height: auto
+}
+
+input[type=file]:focus,
+input[type=checkbox]:focus,
+input[type=radio]:focus {
+	outline: 5px auto -webkit-focus-ring-color;
+	outline-offset: -2px
+}
+
+output {
+	display: block;
+	padding-top: 7px;
+	font-size: 14px;
+	line-height: 1.42857143;
+	color: #555
+}
+
+.form-control {
+	display: inline-block;
+	width: 100%;
+	height: 34px;
+	padding: 6px 12px;
+	font-size: 14px;
+	line-height: 1.42857143;
+	color: #555;
+	background-color: #fff;
+	background-image: none;
+	border: 1px solid #ccc;
+	border-radius: 4px;
+	-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+	box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+	-webkit-transition: border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s;
+	-o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
+	transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s
+}
+
+.form-control:focus {
+	border-color: #66afe9;
+	outline: 0;
+	-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, .6);
+	box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, .6)
+}
+
+.form-control::-moz-placeholder {
+	color: #999;
+	opacity: 1
+}
+
+.form-control:-ms-input-placeholder {
+	color: #999
+}
+
+.form-control::-webkit-input-placeholder {
+	color: #999
+}
+
+.form-control::-ms-expand {
+	background-color: transparent;
+	border: 0
+}
+
+.form-control[disabled],
+.form-control[readonly],
+fieldset[disabled] .form-control {
+	background-color: #eee;
+	opacity: 1
+}
+
+.form-control[disabled],
+fieldset[disabled] .form-control {
+	cursor: not-allowed
+}
+
+textarea.form-control {
+	height: auto
+}
+
+input[type=search] {
+	-webkit-appearance: none
+}
+
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+	input[type=date].form-control,
+	input[type=time].form-control,
+	input[type=datetime-local].form-control,
+	input[type=month].form-control {
+		line-height: 34px
+	}
+	.input-group-sm input[type=date],
+	.input-group-sm input[type=time],
+	.input-group-sm input[type=datetime-local],
+	.input-group-sm input[type=month],
+	input[type=date].input-sm,
+	input[type=time].input-sm,
+	input[type=datetime-local].input-sm,
+	input[type=month].input-sm {
+		line-height: 30px
+	}
+	.input-group-lg input[type=date],
+	.input-group-lg input[type=time],
+	.input-group-lg input[type=datetime-local],
+	.input-group-lg input[type=month],
+	input[type=date].input-lg,
+	input[type=time].input-lg,
+	input[type=datetime-local].input-lg,
+	input[type=month].input-lg {
+		line-height: 46px
+	}
+}
+
+.form-group {
+	margin-bottom: 15px
+}
+
+.checkbox,
+.radio {
+	position: relative;
+	display: block;
+	margin-top: 10px;
+	margin-bottom: 10px
+}
+
+.checkbox label,
+.radio label {
+	min-height: 20px;
+	padding-left: 20px;
+	margin-bottom: 0;
+	font-weight: 400;
+	cursor: pointer
+}
+
+.checkbox+.checkbox,
+.radio+.radio {
+	margin-top: -5px
+}
+
+.checkbox-inline,
+.radio-inline {
+	position: relative;
+	display: inline-block;
+	padding-left: 20px;
+	margin-bottom: 0;
+	font-weight: 400;
+	vertical-align: middle;
+	cursor: pointer
+}
+
+.checkbox-inline+.checkbox-inline,
+.radio-inline+.radio-inline {
+	margin-top: 0;
+	margin-left: 10px
+}
+
+fieldset[disabled] input[type=checkbox],
+fieldset[disabled] input[type=radio],
+input[type=checkbox].disabled,
+input[type=checkbox][disabled],
+input[type=radio].disabled,
+input[type=radio][disabled] {
+	cursor: not-allowed
+}
+
+.checkbox-inline.disabled,
+.radio-inline.disabled,
+fieldset[disabled] .checkbox-inline,
+fieldset[disabled] .radio-inline {
+	cursor: not-allowed
+}
+
+.checkbox.disabled label,
+.radio.disabled label,
+fieldset[disabled] .checkbox label,
+fieldset[disabled] .radio label {
+	cursor: not-allowed
+}
+
+.form-control-static {
+	min-height: 34px;
+	padding-top: 7px;
+	padding-bottom: 7px;
+	margin-bottom: 0
+}
+
+.form-control-static.input-lg,
+.form-control-static.input-sm {
+	padding-right: 0;
+	padding-left: 0
+}
+
+.input-sm {
+	height: 30px;
+	padding: 5px 10px;
+	font-size: 12px;
+	line-height: 1.5;
+	border-radius: 3px
+}
+
+select.input-sm {
+	height: 30px;
+	line-height: 30px
+}
+
+select[multiple].input-sm,
+textarea.input-sm {
+	height: auto
+}
+
+.form-group-sm .form-control {
+	height: 30px;
+	padding: 5px 10px;
+	font-size: 12px;
+	line-height: 1.5;
+	border-radius: 3px
+}
+
+.form-group-sm select.form-control {
+	height: 30px;
+	line-height: 30px
+}
+
+.form-group-sm select[multiple].form-control,
+.form-group-sm textarea.form-control {
+	height: auto
+}
+
+.form-group-sm .form-control-static {
+	height: 30px;
+	min-height: 32px;
+	padding: 6px 10px;
+	font-size: 12px;
+	line-height: 1.5
+}
+
+.input-lg {
+	height: 46px;
+	padding: 10px 16px;
+	font-size: 18px;
+	line-height: 1.3333333;
+	border-radius: 6px
+}
+
+select.input-lg {
+	height: 46px;
+	line-height: 46px
+}
+
+select[multiple].input-lg,
+textarea.input-lg {
+	height: auto
+}
+
+.form-group-lg .form-control {
+	height: 46px;
+	padding: 10px 16px;
+	font-size: 18px;
+	line-height: 1.3333333;
+	border-radius: 6px
+}
+
+.form-group-lg select.form-control {
+	height: 46px;
+	line-height: 46px
+}
+
+.form-group-lg select[multiple].form-control,
+.form-group-lg textarea.form-control {
+	height: auto
+}
+
+.form-group-lg .form-control-static {
+	height: 46px;
+	min-height: 38px;
+	padding: 11px 16px;
+	font-size: 18px;
+	line-height: 1.3333333
+}
+
+.has-feedback {
+	position: relative
+}
+
+.has-feedback .form-control {
+	padding-right: 42.5px
+}
+
+.form-control-feedback {
+	position: absolute;
+	top: 0;
+	right: 0;
+	z-index: 2;
+	display: block;
+	width: 34px;
+	height: 34px;
+	line-height: 34px;
+	text-align: center;
+	pointer-events: none
+}
+
+.form-group-lg .form-control+.form-control-feedback,
+.input-group-lg+.form-control-feedback,
+.input-lg+.form-control-feedback {
+	width: 46px;
+	height: 46px;
+	line-height: 46px
+}
+
+.form-group-sm .form-control+.form-control-feedback,
+.input-group-sm+.form-control-feedback,
+.input-sm+.form-control-feedback {
+	width: 30px;
+	height: 30px;
+	line-height: 30px
+}
+
+.has-success .checkbox,
+.has-success .checkbox-inline,
+.has-success .control-label,
+.has-success .help-block,
+.has-success .radio,
+.has-success .radio-inline,
+.has-success.checkbox label,
+.has-success.checkbox-inline label,
+.has-success.radio label,
+.has-success.radio-inline label {
+	color: #3c763d
+}
+
+.has-success .form-control {
+	border-color: #3c763d;
+	-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+	box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075)
+}
+
+.has-success .form-control:focus {
+	border-color: #2b542c;
+	-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #67b168;
+	box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #67b168
+}
+
+.has-success .input-group-addon {
+	color: #3c763d;
+	background-color: #dff0d8;
+	border-color: #3c763d
+}
+
+.has-success .form-control-feedback {
+	color: #3c763d
+}
+
+.has-warning .checkbox,
+.has-warning .checkbox-inline,
+.has-warning .control-label,
+.has-warning .help-block,
+.has-warning .radio,
+.has-warning .radio-inline,
+.has-warning.checkbox label,
+.has-warning.checkbox-inline label,
+.has-warning.radio label,
+.has-warning.radio-inline label {
+	color: #8a6d3b
+}
+
+.has-warning .form-control {
+	border-color: #8a6d3b;
+	-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+	box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075)
+}
+
+.has-warning .form-control:focus {
+	border-color: #66512c;
+	-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #c0a16b;
+	box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #c0a16b
+}
+
+.has-warning .input-group-addon {
+	color: #8a6d3b;
+	background-color: #fcf8e3;
+	border-color: #8a6d3b
+}
+
+.has-warning .form-control-feedback {
+	color: #8a6d3b
+}
+
+.has-error .checkbox,
+.has-error .checkbox-inline,
+.has-error .control-label,
+.has-error .help-block,
+.has-error .radio,
+.has-error .radio-inline,
+.has-error.checkbox label,
+.has-error.checkbox-inline label,
+.has-error.radio label,
+.has-error.radio-inline label {
+	color: #a94442
+}
+
+.has-error .form-control {
+	border-color: #a94442;
+	-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+	box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075)
+}
+
+.has-error .form-control:focus {
+	border-color: #843534;
+	-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #ce8483;
+	box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #ce8483
+}
+
+.has-error .input-group-addon {
+	color: #a94442;
+	background-color: #f2dede;
+	border-color: #a94442
+}
+
+.has-error .form-control-feedback {
+	color: #a94442
+}
+
+.has-feedback label~.form-control-feedback {
+	top: 25px
+}
+
+.has-feedback label.sr-only~.form-control-feedback {
+	top: 0
+}
+
+.help-block {
+	display: block;
+	margin-top: 5px;
+	margin-bottom: 10px;
+	color: #737373
+}
+
+@media (min-width:768px) {
+	.form-inline .form-group {
+		display: inline-block;
+		margin-bottom: 0;
+		vertical-align: middle
+	}
+	.form-inline .form-control {
+		display: inline-block;
+		width: auto;
+		vertical-align: middle
+	}
+	.form-inline .form-control-static {
+		display: inline-block
+	}
+	.form-inline .input-group {
+		display: inline-table;
+		vertical-align: middle
+	}
+	.form-inline .input-group .form-control,
+	.form-inline .input-group .input-group-addon,
+	.form-inline .input-group .input-group-btn {
+		width: auto
+	}
+	.form-inline .input-group>.form-control {
+		width: 100%
+	}
+	.form-inline .control-label {
+		margin-bottom: 0;
+		vertical-align: middle
+	}
+	.form-inline .checkbox,
+	.form-inline .radio {
+		display: inline-block;
+		margin-top: 0;
+		margin-bottom: 0;
+		vertical-align: middle
+	}
+	.form-inline .checkbox label,
+	.form-inline .radio label {
+		padding-left: 0
+	}
+	.form-inline .checkbox input[type=checkbox],
+	.form-inline .radio input[type=radio] {
+		position: relative;
+		margin-left: 0
+	}
+	.form-inline .has-feedback .form-control-feedback {
+		top: 0
+	}
+}
+
+.form-horizontal .checkbox,
+.form-horizontal .checkbox-inline,
+.form-horizontal .radio,
+.form-horizontal .radio-inline {
+	padding-top: 7px;
+	margin-top: 0;
+	margin-bottom: 0
+}
+
+.form-horizontal .checkbox,
+.form-horizontal .radio {
+	min-height: 27px
+}
+
+.form-horizontal .form-group {
+	margin-right: -15px;
+	margin-left: -15px
+}
+
+@media (min-width:768px) {
+	.form-horizontal .control-label {
+		padding-top: 7px;
+		margin-bottom: 0;
+		text-align: right
+	}
+}
+
+.form-horizontal .has-feedback .form-control-feedback {
+	right: 15px
+}
+
+@media (min-width:768px) {
+	.form-horizontal .form-group-lg .control-label {
+		padding-top: 11px;
+		font-size: 18px
+	}
+}
+
+@media (min-width:768px) {
+	.form-horizontal .form-group-sm .control-label {
+		padding-top: 6px;
+		font-size: 12px
+	}
+}
+
+.btn {
+	display: inline-block;
+	padding: 6px 12px;
+	margin-bottom: 0;
+	font-size: 14px;
+	font-weight: 400;
+	line-height: 1.42857143;
+	text-align: center;
+	white-space: nowrap;
+	vertical-align: middle;
+	-ms-touch-action: manipulation;
+	touch-action: manipulation;
+	cursor: pointer;
+	-webkit-user-select: none;
+	-moz-user-select: none;
+	-ms-user-select: none;
+	user-select: none;
+	background-image: none;
+	border: 1px solid transparent;
+	border-radius: 4px
+}
+
+.btn.active.focus,
+.btn.active:focus,
+.btn.focus,
+.btn:active.focus,
+.btn:active:focus,
+.btn:focus {
+	outline: 5px auto -webkit-focus-ring-color;
+	outline-offset: -2px
+}
+
+.btn.focus,
+.btn:focus,
+.btn:hover {
+	color: #333;
+	text-decoration: none
+}
+
+.btn.active,
+.btn:active {
+	background-image: none;
+	outline: 0;
+	-webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
+	box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125)
+}
+
+.btn.disabled,
+.btn[disabled],
+fieldset[disabled] .btn {
+	cursor: not-allowed;
+	filter: alpha(opacity=65);
+	-webkit-box-shadow: none;
+	box-shadow: none;
+	opacity: .65
+}
+
+a.btn.disabled,
+fieldset[disabled] a.btn {
+	pointer-events: none
+}
+
+.btn-default {
+	color: #333;
+	background-color: #fff;
+	border-color: #ccc
+}
+
+.btn-default.focus,
+.btn-default:focus {
+	color: #333;
+	background-color: #e6e6e6;
+	border-color: #8c8c8c
+}
+
+.btn-default:hover {
+	color: #333;
+	background-color: #e6e6e6;
+	border-color: #adadad
+}
+
+.btn-default.active,
+.btn-default:active,
+.open>.dropdown-toggle.btn-default {
+	color: #333;
+	background-color: #e6e6e6;
+	border-color: #adadad
+}
+
+.btn-default.active.focus,
+.btn-default.active:focus,
+.btn-default.active:hover,
+.btn-default:active.focus,
+.btn-default:active:focus,
+.btn-default:active:hover,
+.open>.dropdown-toggle.btn-default.focus,
+.open>.dropdown-toggle.btn-default:focus,
+.open>.dropdown-toggle.btn-default:hover {
+	color: #333;
+	background-color: #d4d4d4;
+	border-color: #8c8c8c
+}
+
+.btn-default.active,
+.btn-default:active,
+.open>.dropdown-toggle.btn-default {
+	background-image: none
+}
+
+.btn-default.disabled.focus,
+.btn-default.disabled:focus,
+.btn-default.disabled:hover,
+.btn-default[disabled].focus,
+.btn-default[disabled]:focus,
+.btn-default[disabled]:hover,
+fieldset[disabled] .btn-default.focus,
+fieldset[disabled] .btn-default:focus,
+fieldset[disabled] .btn-default:hover {
+	background-color: #fff;
+	border-color: #ccc
+}
+
+.btn-default .badge {
+	color: #fff;
+	background-color: #333
+}
+
+.btn-primary {
+	color: #fff;
+	background-color: #337ab7;
+	border-color: #2e6da4
+}
+
+.btn-primary.focus,
+.btn-primary:focus {
+	color: #fff;
+	background-color: #286090;
+	border-color: #122b40
+}
+
+.btn-primary:hover {
+	color: #fff;
+	background-color: #286090;
+	border-color: #204d74
+}
+
+.btn-primary.active,
+.btn-primary:active,
+.open>.dropdown-toggle.btn-primary {
+	color: #fff;
+	background-color: #286090;
+	border-color: #204d74
+}
+
+.btn-primary.active.focus,
+.btn-primary.active:focus,
+.btn-primary.active:hover,
+.btn-primary:active.focus,
+.btn-primary:active:focus,
+.btn-primary:active:hover,
+.open>.dropdown-toggle.btn-primary.focus,
+.open>.dropdown-toggle.btn-primary:focus,
+.open>.dropdown-toggle.btn-primary:hover {
+	color: #fff;
+	background-color: #204d74;
+	border-color: #122b40
+}
+
+.btn-primary.active,
+.btn-primary:active,
+.open>.dropdown-toggle.btn-primary {
+	background-image: none
+}
+
+.btn-primary.disabled.focus,
+.btn-primary.disabled:focus,
+.btn-primary.disabled:hover,
+.btn-primary[disabled].focus,
+.btn-primary[disabled]:focus,
+.btn-primary[disabled]:hover,
+fieldset[disabled] .btn-primary.focus,
+fieldset[disabled] .btn-primary:focus,
+fieldset[disabled] .btn-primary:hover {
+	background-color: #337ab7;
+	border-color: #2e6da4
+}
+
+.btn-primary .badge {
+	color: #337ab7;
+	background-color: #fff
+}
+
+.btn-success {
+	color: #fff;
+	background-color: #5cb85c;
+	border-color: #4cae4c
+}
+
+.btn-success.focus,
+.btn-success:focus {
+	color: #fff;
+	background-color: #449d44;
+	border-color: #255625
+}
+
+.btn-success:hover {
+	color: #fff;
+	background-color: #449d44;
+	border-color: #398439
+}
+
+.btn-success.active,
+.btn-success:active,
+.open>.dropdown-toggle.btn-success {
+	color: #fff;
+	background-color: #449d44;
+	border-color: #398439
+}
+
+.btn-success.active.focus,
+.btn-success.active:focus,
+.btn-success.active:hover,
+.btn-success:active.focus,
+.btn-success:active:focus,
+.btn-success:active:hover,
+.open>.dropdown-toggle.btn-success.focus,
+.open>.dropdown-toggle.btn-success:focus,
+.open>.dropdown-toggle.btn-success:hover {
+	color: #fff;
+	background-color: #398439;
+	border-color: #255625
+}
+
+.btn-success.active,
+.btn-success:active,
+.open>.dropdown-toggle.btn-success {
+	background-image: none
+}
+
+.btn-success.disabled.focus,
+.btn-success.disabled:focus,
+.btn-success.disabled:hover,
+.btn-success[disabled].focus,
+.btn-success[disabled]:focus,
+.btn-success[disabled]:hover,
+fieldset[disabled] .btn-success.focus,
+fieldset[disabled] .btn-success:focus,
+fieldset[disabled] .btn-success:hover {
+	background-color: #5cb85c;
+	border-color: #4cae4c
+}
+
+.btn-success .badge {
+	color: #5cb85c;
+	background-color: #fff
+}
+
+.btn-info {
+	color: #fff;
+	background-color: #5bc0de;
+	border-color: #46b8da
+}
+
+.btn-info.focus,
+.btn-info:focus {
+	color: #fff;
+	background-color: #31b0d5;
+	border-color: #1b6d85
+}
+
+.btn-info:hover {
+	color: #fff;
+	background-color: #31b0d5;
+	border-color: #269abc
+}
+
+.btn-info.active,
+.btn-info:active,
+.open>.dropdown-toggle.btn-info {
+	color: #fff;
+	background-color: #31b0d5;
+	border-color: #269abc
+}
+
+.btn-info.active.focus,
+.btn-info.active:focus,
+.btn-info.active:hover,
+.btn-info:active.focus,
+.btn-info:active:focus,
+.btn-info:active:hover,
+.open>.dropdown-toggle.btn-info.focus,
+.open>.dropdown-toggle.btn-info:focus,
+.open>.dropdown-toggle.btn-info:hover {
+	color: #fff;
+	background-color: #269abc;
+	border-color: #1b6d85
+}
+
+.btn-info.active,
+.btn-info:active,
+.open>.dropdown-toggle.btn-info {
+	background-image: none
+}
+
+.btn-info.disabled.focus,
+.btn-info.disabled:focus,
+.btn-info.disabled:hover,
+.btn-info[disabled].focus,
+.btn-info[disabled]:focus,
+.btn-info[disabled]:hover,
+fieldset[disabled] .btn-info.focus,
+fieldset[disabled] .btn-info:focus,
+fieldset[disabled] .btn-info:hover {
+	background-color: #5bc0de;
+	border-color: #46b8da
+}
+
+.btn-info .badge {
+	color: #5bc0de;
+	background-color: #fff
+}
+
+.btn-warning {
+	color: #fff;
+	background-color: #f0ad4e;
+	border-color: #eea236
+}
+
+.btn-warning.focus,
+.btn-warning:focus {
+	color: #fff;
+	background-color: #ec971f;
+	border-color: #985f0d
+}
+
+.btn-warning:hover {
+	color: #fff;
+	background-color: #ec971f;
+	border-color: #d58512
+}
+
+.btn-warning.active,
+.btn-warning:active,
+.open>.dropdown-toggle.btn-warning {
+	color: #fff;
+	background-color: #ec971f;
+	border-color: #d58512
+}
+
+.btn-warning.active.focus,
+.btn-warning.active:focus,
+.btn-warning.active:hover,
+.btn-warning:active.focus,
+.btn-warning:active:focus,
+.btn-warning:active:hover,
+.open>.dropdown-toggle.btn-warning.focus,
+.open>.dropdown-toggle.btn-warning:focus,
+.open>.dropdown-toggle.btn-warning:hover {
+	color: #fff;
+	background-color: #d58512;
+	border-color: #985f0d
+}
+
+.btn-warning.active,
+.btn-warning:active,
+.open>.dropdown-toggle.btn-warning {
+	background-image: none
+}
+
+.btn-warning.disabled.focus,
+.btn-warning.disabled:focus,
+.btn-warning.disabled:hover,
+.btn-warning[disabled].focus,
+.btn-warning[disabled]:focus,
+.btn-warning[disabled]:hover,
+fieldset[disabled] .btn-warning.focus,
+fieldset[disabled] .btn-warning:focus,
+fieldset[disabled] .btn-warning:hover {
+	background-color: #f0ad4e;
+	border-color: #eea236
+}
+
+.btn-warning .badge {
+	color: #f0ad4e;
+	background-color: #fff
+}
+
+.btn-danger {
+	color: #fff;
+	background-color: #d9534f;
+	border-color: #d43f3a
+}
+
+.btn-danger.focus,
+.btn-danger:focus {
+	color: #fff;
+	background-color: #c9302c;
+	border-color: #761c19
+}
+
+.btn-danger:hover {
+	color: #fff;
+	background-color: #c9302c;
+	border-color: #ac2925
+}
+
+.btn-danger.active,
+.btn-danger:active,
+.open>.dropdown-toggle.btn-danger {
+	color: #fff;
+	background-color: #c9302c;
+	border-color: #ac2925
+}
+
+.btn-danger.active.focus,
+.btn-danger.active:focus,
+.btn-danger.active:hover,
+.btn-danger:active.focus,
+.btn-danger:active:focus,
+.btn-danger:active:hover,
+.open>.dropdown-toggle.btn-danger.focus,
+.open>.dropdown-toggle.btn-danger:focus,
+.open>.dropdown-toggle.btn-danger:hover {
+	color: #fff;
+	background-color: #ac2925;
+	border-color: #761c19
+}
+
+.btn-danger.active,
+.btn-danger:active,
+.open>.dropdown-toggle.btn-danger {
+	background-image: none
+}
+
+.btn-danger.disabled.focus,
+.btn-danger.disabled:focus,
+.btn-danger.disabled:hover,
+.btn-danger[disabled].focus,
+.btn-danger[disabled]:focus,
+.btn-danger[disabled]:hover,
+fieldset[disabled] .btn-danger.focus,
+fieldset[disabled] .btn-danger:focus,
+fieldset[disabled] .btn-danger:hover {
+	background-color: #d9534f;
+	border-color: #d43f3a
+}
+
+.btn-danger .badge {
+	color: #d9534f;
+	background-color: #fff
+}
+
+.btn-link {
+	font-weight: 400;
+	color: #337ab7;
+	border-radius: 0
+}
+
+.btn-link,
+.btn-link.active,
+.btn-link:active,
+.btn-link[disabled],
+fieldset[disabled] .btn-link {
+	background-color: transparent;
+	-webkit-box-shadow: none;
+	box-shadow: none
+}
+
+.btn-link,
+.btn-link:active,
+.btn-link:focus,
+.btn-link:hover {
+	border-color: transparent
+}
+
+.btn-link:focus,
+.btn-link:hover {
+	color: #23527c;
+	text-decoration: underline;
+	background-color: transparent
+}
+
+.btn-link[disabled]:focus,
+.btn-link[disabled]:hover,
+fieldset[disabled] .btn-link:focus,
+fieldset[disabled] .btn-link:hover {
+	color: #777;
+	text-decoration: none
+}
+
+.btn-group-lg>.btn,
+.btn-lg {
+	padding: 10px 16px;
+	font-size: 18px;
+	line-height: 1.3333333;
+	border-radius: 6px
+}
+
+.btn-group-sm>.btn,
+.btn-sm {
+	padding: 5px 10px;
+	font-size: 12px;
+	line-height: 1.5;
+	border-radius: 3px
+}
+
+.btn-group-xs>.btn,
+.btn-xs {
+	padding: 1px 5px;
+	font-size: 12px;
+	line-height: 1.5;
+	border-radius: 3px
+}
+
+.btn-block {
+	display: block;
+	width: 100%
+}
+
+.btn-block+.btn-block {
+	margin-top: 5px
+}
+
+input[type=button].btn-block,
+input[type=reset].btn-block,
+input[type=submit].btn-block {
+	width: 100%
+}
+
+.fade {
+	opacity: 0;
+	-webkit-transition: opacity .15s linear;
+	-o-transition: opacity .15s linear;
+	transition: opacity .15s linear
+}
+
+.fade.in {
+	opacity: 1
+}
+
+.collapse {
+	display: none
+}
+
+.collapse.in {
+	display: block
+}
+
+tr.collapse.in {
+	display: table-row
+}
+
+tbody.collapse.in {
+	display: table-row-group
+}
+
+.collapsing {
+	position: relative;
+	height: 0;
+	overflow: hidden;
+	-webkit-transition-timing-function: ease;
+	-o-transition-timing-function: ease;
+	transition-timing-function: ease;
+	-webkit-transition-duration: .35s;
+	-o-transition-duration: .35s;
+	transition-duration: .35s;
+	-webkit-transition-property: height, visibility;
+	-o-transition-property: height, visibility;
+	transition-property: height, visibility
+}
+
+.caret {
+	display: inline-block;
+	width: 0;
+	height: 0;
+	margin-left: 2px;
+	vertical-align: middle;
+	border-top: 4px dashed;
+	border-top: 4px solid\9;
+	border-right: 4px solid transparent;
+	border-left: 4px solid transparent
+}
+
+.dropdown,
+.dropup {
+	position: relative
+}
+
+.dropdown-toggle:focus {
+	outline: 0
+}
+
+.dropdown-menu {
+	position: absolute;
+	top: 100%;
+	left: 0;
+	z-index: 1000;
+	display: none;
+	float: left;
+	min-width: 160px;
+	padding: 5px 0;
+	margin: 2px 0 0;
+	font-size: 14px;
+	text-align: left;
+	list-style: none;
+	background-color: #fff;
+	-webkit-background-clip: padding-box;
+	background-clip: padding-box;
+	border: 1px solid #ccc;
+	border: 1px solid rgba(0, 0, 0, .15);
+	border-radius: 4px;
+	-webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, .175);
+	box-shadow: 0 6px 12px rgba(0, 0, 0, .175)
+}
+
+.dropdown-menu.pull-right {
+	right: 0;
+	left: auto
+}
+
+.dropdown-menu .divider {
+	height: 1px;
+	margin: 9px 0;
+	overflow: hidden;
+	background-color: #e5e5e5
+}
+
+.dropdown-menu>li>a {
+	display: block;
+	padding: 3px 20px;
+	clear: both;
+	font-weight: 400;
+	line-height: 1.42857143;
+	color: #333;
+	white-space: nowrap
+}
+
+.dropdown-menu>li>a:focus,
+.dropdown-menu>li>a:hover {
+	color: #262626;
+	text-decoration: none;
+	background-color: #f5f5f5
+}
+
+.dropdown-menu>.active>a,
+.dropdown-menu>.active>a:focus,
+.dropdown-menu>.active>a:hover {
+	color: #fff;
+	text-decoration: none;
+	background-color: #337ab7;
+	outline: 0
+}
+
+.dropdown-menu>.disabled>a,
+.dropdown-menu>.disabled>a:focus,
+.dropdown-menu>.disabled>a:hover {
+	color: #777
+}
+
+.dropdown-menu>.disabled>a:focus,
+.dropdown-menu>.disabled>a:hover {
+	text-decoration: none;
+	cursor: not-allowed;
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.gradient(enabled=false)
+}
+
+.open>.dropdown-menu {
+	display: block
+}
+
+.open>a {
+	outline: 0
+}
+
+.dropdown-menu-right {
+	right: 0;
+	left: auto
+}
+
+.dropdown-menu-left {
+	right: auto;
+	left: 0
+}
+
+.dropdown-header {
+	display: block;
+	padding: 3px 20px;
+	font-size: 12px;
+	line-height: 1.42857143;
+	color: #777;
+	white-space: nowrap
+}
+
+.dropdown-backdrop {
+	position: fixed;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	left: 0;
+	z-index: 990
+}
+
+.pull-right>.dropdown-menu {
+	right: 0;
+	left: auto
+}
+
+.dropup .caret,
+.navbar-fixed-bottom .dropdown .caret {
+	content: "";
+	border-top: 0;
+	border-bottom: 4px dashed;
+	border-bottom: 4px solid\9
+}
+
+.dropup .dropdown-menu,
+.navbar-fixed-bottom .dropdown .dropdown-menu {
+	top: auto;
+	bottom: 100%;
+	margin-bottom: 2px
+}
+
+@media (min-width:768px) {
+	.navbar-right .dropdown-menu {
+		right: 0;
+		left: auto
+	}
+	.navbar-right .dropdown-menu-left {
+		right: auto;
+		left: 0
+	}
+}
+
+.btn-group,
+.btn-group-vertical {
+	position: relative;
+	display: inline-block;
+	vertical-align: middle
+}
+
+.btn-group-vertical>.btn,
+.btn-group>.btn {
+	position: relative;
+	float: left
+}
+
+.btn-group-vertical>.btn.active,
+.btn-group-vertical>.btn:active,
+.btn-group-vertical>.btn:focus,
+.btn-group-vertical>.btn:hover,
+.btn-group>.btn.active,
+.btn-group>.btn:active,
+.btn-group>.btn:focus,
+.btn-group>.btn:hover {
+	z-index: 2
+}
+
+.btn-group .btn+.btn,
+.btn-group .btn+.btn-group,
+.btn-group .btn-group+.btn,
+.btn-group .btn-group+.btn-group {
+	margin-left: -1px
+}
+
+.btn-toolbar {
+	margin-left: -5px
+}
+
+.btn-toolbar .btn,
+.btn-toolbar .btn-group,
+.btn-toolbar .input-group {
+	float: left
+}
+
+.btn-toolbar>.btn,
+.btn-toolbar>.btn-group,
+.btn-toolbar>.input-group {
+	margin-left: 5px
+}
+
+.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle) {
+	border-radius: 0
+}
+
+.btn-group>.btn:first-child {
+	margin-left: 0
+}
+
+.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle) {
+	border-top-right-radius: 0;
+	border-bottom-right-radius: 0
+}
+
+.btn-group>.btn:last-child:not(:first-child),
+.btn-group>.dropdown-toggle:not(:first-child) {
+	border-top-left-radius: 0;
+	border-bottom-left-radius: 0
+}
+
+.btn-group>.btn-group {
+	float: left
+}
+
+.btn-group>.btn-group:not(:first-child):not(:last-child)>.btn {
+	border-radius: 0
+}
+
+.btn-group>.btn-group:first-child:not(:last-child)>.btn:last-child,
+.btn-group>.btn-group:first-child:not(:last-child)>.dropdown-toggle {
+	border-top-right-radius: 0;
+	border-bottom-right-radius: 0
+}
+
+.btn-group>.btn-group:last-child:not(:first-child)>.btn:first-child {
+	border-top-left-radius: 0;
+	border-bottom-left-radius: 0
+}
+
+.btn-group .dropdown-toggle:active,
+.btn-group.open .dropdown-toggle {
+	outline: 0
+}
+
+.btn-group>.btn+.dropdown-toggle {
+	padding-right: 8px;
+	padding-left: 8px
+}
+
+.btn-group>.btn-lg+.dropdown-toggle {
+	padding-right: 12px;
+	padding-left: 12px
+}
+
+.btn-group.open .dropdown-toggle {
+	-webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
+	box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125)
+}
+
+.btn-group.open .dropdown-toggle.btn-link {
+	-webkit-box-shadow: none;
+	box-shadow: none
+}
+
+.btn .caret {
+	margin-left: 0
+}
+
+.btn-lg .caret {
+	border-width: 5px 5px 0;
+	border-bottom-width: 0
+}
+
+.dropup .btn-lg .caret {
+	border-width: 0 5px 5px
+}
+
+.btn-group-vertical>.btn,
+.btn-group-vertical>.btn-group,
+.btn-group-vertical>.btn-group>.btn {
+	display: block;
+	float: none;
+	width: 100%;
+	max-width: 100%
+}
+
+.btn-group-vertical>.btn-group>.btn {
+	float: none
+}
+
+.btn-group-vertical>.btn+.btn,
+.btn-group-vertical>.btn+.btn-group,
+.btn-group-vertical>.btn-group+.btn,
+.btn-group-vertical>.btn-group+.btn-group {
+	margin-top: -1px;
+	margin-left: 0
+}
+
+.btn-group-vertical>.btn:not(:first-child):not(:last-child) {
+	border-radius: 0
+}
+
+.btn-group-vertical>.btn:first-child:not(:last-child) {
+	border-top-left-radius: 4px;
+	border-top-right-radius: 4px;
+	border-bottom-right-radius: 0;
+	border-bottom-left-radius: 0
+}
+
+.btn-group-vertical>.btn:last-child:not(:first-child) {
+	border-top-left-radius: 0;
+	border-top-right-radius: 0;
+	border-bottom-right-radius: 4px;
+	border-bottom-left-radius: 4px
+}
+
+.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn {
+	border-radius: 0
+}
+
+.btn-group-vertical>.btn-group:first-child:not(:last-child)>.btn:last-child,
+.btn-group-vertical>.btn-group:first-child:not(:last-child)>.dropdown-toggle {
+	border-bottom-right-radius: 0;
+	border-bottom-left-radius: 0
+}
+
+.btn-group-vertical>.btn-group:last-child:not(:first-child)>.btn:first-child {
+	border-top-left-radius: 0;
+	border-top-right-radius: 0
+}
+
+.btn-group-justified {
+	display: table;
+	width: 100%;
+	table-layout: fixed;
+	border-collapse: separate
+}
+
+.btn-group-justified>.btn,
+.btn-group-justified>.btn-group {
+	display: table-cell;
+	float: none;
+	width: 1%
+}
+
+.btn-group-justified>.btn-group .btn {
+	width: 100%
+}
+
+.btn-group-justified>.btn-group .dropdown-menu {
+	left: auto
+}
+
+[data-toggle=buttons]>.btn input[type=checkbox],
+[data-toggle=buttons]>.btn input[type=radio],
+[data-toggle=buttons]>.btn-group>.btn input[type=checkbox],
+[data-toggle=buttons]>.btn-group>.btn input[type=radio] {
+	position: absolute;
+	clip: rect(0, 0, 0, 0);
+	pointer-events: none
+}
+
+.input-group {
+	position: relative;
+	display: table;
+	border-collapse: separate
+}
+
+.input-group[class*=col-] {
+	float: none;
+	padding-right: 0;
+	padding-left: 0
+}
+
+.input-group .form-control {
+	position: relative;
+	z-index: 2;
+	float: left;
+	width: 100%;
+	margin-bottom: 0
+}
+
+.input-group .form-control:focus {
+	z-index: 3
+}
+
+.input-group-lg>.form-control,
+.input-group-lg>.input-group-addon,
+.input-group-lg>.input-group-btn>.btn {
+	height: 46px;
+	padding: 10px 16px;
+	font-size: 18px;
+	line-height: 1.3333333;
+	border-radius: 6px
+}
+
+select.input-group-lg>.form-control,
+select.input-group-lg>.input-group-addon,
+select.input-group-lg>.input-group-btn>.btn {
+	height: 46px;
+	line-height: 46px
+}
+
+select[multiple].input-group-lg>.form-control,
+select[multiple].input-group-lg>.input-group-addon,
+select[multiple].input-group-lg>.input-group-btn>.btn,
+textarea.input-group-lg>.form-control,
+textarea.input-group-lg>.input-group-addon,
+textarea.input-group-lg>.input-group-btn>.btn {
+	height: auto
+}
+
+.input-group-sm>.form-control,
+.input-group-sm>.input-group-addon,
+.input-group-sm>.input-group-btn>.btn {
+	height: 30px;
+	padding: 5px 10px;
+	font-size: 12px;
+	line-height: 1.5;
+	border-radius: 3px
+}
+
+select.input-group-sm>.form-control,
+select.input-group-sm>.input-group-addon,
+select.input-group-sm>.input-group-btn>.btn {
+	height: 30px;
+	line-height: 30px
+}
+
+select[multiple].input-group-sm>.form-control,
+select[multiple].input-group-sm>.input-group-addon,
+select[multiple].input-group-sm>.input-group-btn>.btn,
+textarea.input-group-sm>.form-control,
+textarea.input-group-sm>.input-group-addon,
+textarea.input-group-sm>.input-group-btn>.btn {
+	height: auto
+}
+
+.input-group .form-control,
+.input-group-addon,
+.input-group-btn {
+	display: table-cell
+}
+
+.input-group .form-control:not(:first-child):not(:last-child),
+.input-group-addon:not(:first-child):not(:last-child),
+.input-group-btn:not(:first-child):not(:last-child) {
+	border-radius: 0
+}
+
+.input-group-addon,
+.input-group-btn {
+	width: 1%;
+	white-space: nowrap;
+	vertical-align: middle
+}
+
+.input-group-addon {
+	padding: 6px 12px;
+	font-size: 14px;
+	font-weight: 400;
+	line-height: 1;
+	color: #555;
+	text-align: center;
+	background-color: #eee;
+	border: 1px solid #ccc;
+	border-radius: 4px
+}
+
+.input-group-addon.input-sm {
+	padding: 5px 10px;
+	font-size: 12px;
+	border-radius: 3px
+}
+
+.input-group-addon.input-lg {
+	padding: 10px 16px;
+	font-size: 18px;
+	border-radius: 6px
+}
+
+.input-group-addon input[type=checkbox],
+.input-group-addon input[type=radio] {
+	margin-top: 0
+}
+
+.input-group .form-control:first-child,
+.input-group-addon:first-child,
+.input-group-btn:first-child>.btn,
+.input-group-btn:first-child>.btn-group>.btn,
+.input-group-btn:first-child>.dropdown-toggle,
+.input-group-btn:last-child>.btn-group:not(:last-child)>.btn,
+.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle) {
+	border-top-right-radius: 0;
+	border-bottom-right-radius: 0
+}
+
+.input-group-addon:first-child {
+	border-right: 0
+}
+
+.input-group .form-control:last-child,
+.input-group-addon:last-child,
+.input-group-btn:first-child>.btn-group:not(:first-child)>.btn,
+.input-group-btn:first-child>.btn:not(:first-child),
+.input-group-btn:last-child>.btn,
+.input-group-btn:last-child>.btn-group>.btn,
+.input-group-btn:last-child>.dropdown-toggle {
+	border-top-left-radius: 0;
+	border-bottom-left-radius: 0
+}
+
+.input-group-addon:last-child {
+	border-left: 0
+}
+
+.input-group-btn {
+	position: relative;
+	font-size: 0;
+	white-space: nowrap
+}
+
+.input-group-btn>.btn {
+	position: relative
+}
+
+.input-group-btn>.btn+.btn {
+	margin-left: -1px
+}
+
+.input-group-btn>.btn:active,
+.input-group-btn>.btn:focus,
+.input-group-btn>.btn:hover {
+	z-index: 2
+}
+
+.input-group-btn:first-child>.btn,
+.input-group-btn:first-child>.btn-group {
+	margin-right: -1px
+}
+
+.input-group-btn:last-child>.btn,
+.input-group-btn:last-child>.btn-group {
+	z-index: 2;
+	margin-left: -1px
+}
+
+.nav {
+	padding-left: 0;
+	margin-bottom: 0;
+	list-style: none
+}
+
+.nav>li {
+	position: relative;
+	display: block
+}
+
+.nav>li>a {
+	position: relative;
+	display: block;
+	padding:5px 10px
+}
+
+.nav>li>a:focus,
+.nav>li>a:hover {
+	text-decoration: none;
+	background-color: #eee
+}
+
+.nav>li.disabled>a {
+	color: #777
+}
+
+.nav>li.disabled>a:focus,
+.nav>li.disabled>a:hover {
+	color: #777;
+	text-decoration: none;
+	cursor: not-allowed;
+	background-color: transparent
+}
+
+.nav .open>a,
+.nav .open>a:focus,
+.nav .open>a:hover {
+	background-color: #eee;
+	border-color: #337ab7
+}
+
+.nav .nav-divider {
+	height: 1px;
+	margin: 9px 0;
+	overflow: hidden;
+	background-color: #e5e5e5
+}
+
+.nav>li>a>img {
+	max-width: none
+}
+
+.nav-tabs {
+	border-bottom: 1px solid #ddd
+}
+
+.nav-tabs>li {
+	float: left;
+	margin-bottom: -1px
+}
+
+.nav-tabs>li>a {
+	margin-right: 2px;
+	line-height: 1.42857143;
+	border: 1px solid transparent;
+	border-radius: 4px 4px 0 0
+}
+
+.nav-tabs>li>a:hover {
+	border-color: #eee #eee #eee
+}
+
+.nav-tabs>li.active>a,
+.nav-tabs>li.active>a:focus,
+.nav-tabs>li.active>a:hover {
+	color: #555;
+	cursor: default;
+	background-color: #fff;
+	border: 1px solid #ddd;
+	border-bottom-color: transparent
+}
+
+.nav-tabs.nav-justified {
+	width: 100%;
+	border-bottom: 0
+}
+
+.nav-tabs.nav-justified>li {
+	float: none
+}
+
+.nav-tabs.nav-justified>li>a {
+	margin-bottom: 5px;
+	text-align: center
+}
+
+.nav-tabs.nav-justified>.dropdown .dropdown-menu {
+	top: auto;
+	left: auto
+}
+
+@media (min-width:768px) {
+	.nav-tabs.nav-justified>li {
+		display: table-cell;
+		width: 1%
+	}
+	.nav-tabs.nav-justified>li>a {
+		margin-bottom: 0
+	}
+}
+
+.nav-tabs.nav-justified>li>a {
+	margin-right: 0;
+	border-radius: 4px
+}
+
+.nav-tabs.nav-justified>.active>a,
+.nav-tabs.nav-justified>.active>a:focus,
+.nav-tabs.nav-justified>.active>a:hover {
+	border: 1px solid #ddd
+}
+
+@media (min-width:768px) {
+	.nav-tabs.nav-justified>li>a {
+		border-bottom: 1px solid #ddd;
+		border-radius: 4px 4px 0 0
+	}
+	.nav-tabs.nav-justified>.active>a,
+	.nav-tabs.nav-justified>.active>a:focus,
+	.nav-tabs.nav-justified>.active>a:hover {
+		border-bottom-color: #fff
+	}
+}
+
+.nav-pills>li {
+	float: left
+}
+
+.nav-pills>li>a {
+	border-radius: 4px
+}
+
+.nav-pills>li+li {
+	margin-left: 2px
+}
+
+.nav-pills>li.active>a,
+.nav-pills>li.active>a:focus,
+.nav-pills>li.active>a:hover {
+	color: #fff;
+	background-color: #337ab7
+}
+
+.nav-stacked>li {
+	float: none
+}
+
+.nav-stacked>li+li {
+	margin-top: 2px;
+	margin-left: 0
+}
+
+.nav-justified {
+	width: 100%
+}
+
+.nav-justified>li {
+	float: none
+}
+
+.nav-justified>li>a {
+	margin-bottom: 5px;
+	text-align: center
+}
+
+.nav-justified>.dropdown .dropdown-menu {
+	top: auto;
+	left: auto
+}
+
+@media (min-width:768px) {
+	.nav-justified>li {
+		display: table-cell;
+		width: 1%
+	}
+	.nav-justified>li>a {
+		margin-bottom: 0
+	}
+}
+
+.nav-tabs-justified {
+	border-bottom: 0
+}
+
+.nav-tabs-justified>li>a {
+	margin-right: 0;
+	border-radius: 4px
+}
+
+.nav-tabs-justified>.active>a,
+.nav-tabs-justified>.active>a:focus,
+.nav-tabs-justified>.active>a:hover {
+	border: 1px solid #ddd
+}
+
+@media (min-width:768px) {
+	.nav-tabs-justified>li>a {
+		border-bottom: 1px solid #ddd;
+		border-radius: 4px 4px 0 0
+	}
+	.nav-tabs-justified>.active>a,
+	.nav-tabs-justified>.active>a:focus,
+	.nav-tabs-justified>.active>a:hover {
+		border-bottom-color: #fff
+	}
+}
+
+.tab-content>.tab-pane {
+	display: none
+}
+
+.tab-content>.active {
+	display: block
+}
+
+.nav-tabs .dropdown-menu {
+	margin-top: -1px;
+	border-top-left-radius: 0;
+	border-top-right-radius: 0
+}
+
+.navbar {
+	position: relative;
+	min-height: 45px;
+	margin-bottom: 20px;
+	border: 1px solid transparent
+}
+
+@media (min-width:768px) {
+	.navbar {
+		border-radius: 4px
+	}
+}
+
+@media (min-width:768px) {
+	.navbar-header {
+		float: left
+	}
+}
+
+.navbar-collapse {
+	overflow-x: visible;
+	-webkit-overflow-scrolling: touch;
+	border-top: 1px solid transparent;
+	-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1);
+	box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1)
+}
+
+.navbar-collapse.in {
+	overflow-y: auto
+}
+
+@media (min-width:768px) {
+	.navbar-collapse {
+		width: auto;
+		border-top: 0;
+		-webkit-box-shadow: none;
+		box-shadow: none
+	}
+	.navbar-collapse.collapse {
+		display: block!important;
+		height: auto!important;
+		padding-bottom: 0;
+		overflow: visible!important
+	}
+	.navbar-collapse.in {
+		overflow-y: visible
+	}
+	.navbar-fixed-bottom .navbar-collapse,
+	.navbar-fixed-top .navbar-collapse,
+	.navbar-static-top .navbar-collapse {
+		padding-right: 0;
+		padding-left: 0
+	}
+}
+
+.navbar-fixed-bottom .navbar-collapse,
+.navbar-fixed-top .navbar-collapse {
+	max-height: 340px
+}
+
+@media (max-device-width:480px) and (orientation:landscape) {
+	.navbar-fixed-bottom .navbar-collapse,
+	.navbar-fixed-top .navbar-collapse {
+		max-height: 200px
+	}
+}
+
+.container-fluid>.navbar-collapse,
+.container-fluid>.navbar-header,
+.container>.navbar-collapse,
+.container>.navbar-header {
+	margin-right: -15px;
+	margin-left: -15px
+}
+
+@media (min-width:768px) {
+	.container-fluid>.navbar-collapse,
+	.container-fluid>.navbar-header,
+	.container>.navbar-collapse,
+	.container>.navbar-header {
+		margin-right: 0;
+		margin-left: 0
+	}
+}
+
+.navbar-static-top {
+	z-index: 1000;
+	border-width: 0 0 1px
+}
+
+@media (min-width:768px) {
+	.navbar-static-top {
+		border-radius: 0
+	}
+}
+
+.navbar-fixed-bottom,
+.navbar-fixed-top {
+	position: fixed;
+	right: 0;
+	left: 0;
+	z-index: 1030
+}
+
+@media (min-width:768px) {
+	.navbar-fixed-bottom,
+	.navbar-fixed-top {
+		border-radius: 0
+	}
+}
+
+.navbar-fixed-top {
+	top: 0;
+	border-width: 0 0 1px
+}
+
+.navbar-fixed-bottom {
+	bottom: 0;
+	margin-bottom: 0;
+	border-width: 1px 0 0
+}
+
+.navbar-brand {
+	float: left;
+	height: 50px;
+	padding: 15px 15px;
+	font-size: 18px;
+	line-height: 20px
+}
+
+.navbar-brand:focus,
+.navbar-brand:hover {
+	text-decoration: none
+}
+
+.navbar-brand>img {
+	display: block
+}
+
+@media (min-width:768px) {
+	.navbar>.container .navbar-brand,
+	.navbar>.container-fluid .navbar-brand {
+		margin-left: -15px
+	}
+}
+
+.navbar-toggle {
+	position: relative;
+	float: right;
+	padding: 9px 10px;
+	margin-top: 8px;
+	margin-right: 15px;
+	margin-bottom: 8px;
+	background-color: transparent;
+	background-image: none;
+	border: 1px solid transparent;
+	border-radius: 4px
+}
+
+.navbar-toggle:focus {
+	outline: 0
+}
+
+.navbar-toggle .icon-bar {
+	display: block;
+	width: 22px;
+	height: 2px;
+	border-radius: 1px
+}
+
+.navbar-toggle .icon-bar+.icon-bar {
+	margin-top: 4px
+}
+
+@media (min-width:768px) {
+	.navbar-toggle {
+		display: none
+	}
+}
+.navbar-container{
+	box-shadow: 0 2px 4px 0 rgba(0, 0, 0, .25);
+}
+.navbar-nav {
+	margin: 7.5px -15px;
+}
+
+.navbar-nav>li>a {
+	padding-top: 10px;
+	padding-bottom: 10px;
+	line-height: 20px
+}
+
+@media (max-width:767px) {
+	.navbar-nav .open .dropdown-menu {
+		position: static;
+		float: none;
+		width: auto;
+		margin-top: 0;
+		background-color: transparent;
+		border: 0;
+		-webkit-box-shadow: none;
+		box-shadow: none
+	}
+	.navbar-nav .open .dropdown-menu .dropdown-header,
+	.navbar-nav .open .dropdown-menu>li>a {
+		padding: 5px 15px 5px 25px
+	}
+	.navbar-nav .open .dropdown-menu>li>a {
+		line-height: 20px
+	}
+	.navbar-nav .open .dropdown-menu>li>a:focus,
+	.navbar-nav .open .dropdown-menu>li>a:hover {
+		background-image: none
+	}
+}
+
+@media (min-width:768px) {
+	.navbar-nav {
+		float: left;
+		margin: 0;
+	}
+	.navbar-nav>li {
+		float: left
+	}
+	
+}
+
+.navbar-form {
+	padding: 10px 15px;
+	margin-top: 8px;
+	margin-right: -15px;
+	margin-bottom: 8px;
+	margin-left: -15px;
+	border-top: 1px solid transparent;
+	border-bottom: 1px solid transparent;
+	-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1), 0 1px 0 rgba(255, 255, 255, .1);
+	box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1), 0 1px 0 rgba(255, 255, 255, .1)
+}
+
+@media (min-width:768px) {
+	.navbar-form .form-group {
+		display: inline-block;
+		margin-bottom: 0;
+		vertical-align: middle
+	}
+	.navbar-form .form-control {
+		display: inline-block;
+		width: auto;
+		vertical-align: middle
+	}
+	.navbar-form .form-control-static {
+		display: inline-block
+	}
+	.navbar-form .input-group {
+		display: inline-table;
+		vertical-align: middle
+	}
+	.navbar-form .input-group .form-control,
+	.navbar-form .input-group .input-group-addon,
+	.navbar-form .input-group .input-group-btn {
+		width: auto
+	}
+	.navbar-form .input-group>.form-control {
+		width: 100%
+	}
+	.navbar-form .control-label {
+		margin-bottom: 0;
+		vertical-align: middle
+	}
+	.navbar-form .checkbox,
+	.navbar-form .radio {
+		display: inline-block;
+		margin-top: 0;
+		margin-bottom: 0;
+		vertical-align: middle
+	}
+	.navbar-form .checkbox label,
+	.navbar-form .radio label {
+		padding-left: 0
+	}
+	.navbar-form .checkbox input[type=checkbox],
+	.navbar-form .radio input[type=radio] {
+		position: relative;
+		margin-left: 0
+	}
+	.navbar-form .has-feedback .form-control-feedback {
+		top: 0
+	}
+}
+
+@media (max-width:767px) {
+	.navbar-form .form-group {
+		margin-bottom: 5px
+	}
+	.navbar-form .form-group:last-child {
+		margin-bottom: 0
+	}
+}
+
+@media (min-width:768px) {
+	.navbar-form {
+		width: auto;
+		padding-top: 0;
+		padding-bottom: 0;
+		margin-right: 0;
+		margin-left: 0;
+		border: 0;
+		-webkit-box-shadow: none;
+		box-shadow: none
+	}
+}
+
+.navbar-nav>li>.dropdown-menu {
+	margin-top: 0;
+	border-top-left-radius: 0;
+	border-top-right-radius: 0
+}
+
+.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu {
+	margin-bottom: 0;
+	border-top-left-radius: 4px;
+	border-top-right-radius: 4px;
+	border-bottom-right-radius: 0;
+	border-bottom-left-radius: 0
+}
+
+.navbar-btn {
+	margin-top: 8px;
+	margin-bottom: 8px
+}
+
+.navbar-btn.btn-sm {
+	margin-top: 10px;
+	margin-bottom: 10px
+}
+
+.navbar-btn.btn-xs {
+	margin-top: 14px;
+	margin-bottom: 14px
+}
+
+.navbar-text {
+	margin-top: 15px;
+	margin-bottom: 15px
+}
+
+@media (min-width:768px) {
+	.navbar-text {
+		float: left;
+		margin-right: 15px;
+		margin-left: 15px
+	}
+}
+
+@media (min-width:768px) {
+	.navbar-left {
+		float: left!important
+	}
+	.navbar-right {
+		float: right!important;
+		margin-right: -15px
+	}
+	.navbar-right~.navbar-right {
+		margin-right: 0
+	}
+}
+
+.navbar-default {
+	background-color: #f8f8f8;
+	border-color: #e7e7e7
+}
+
+.navbar-default .navbar-brand {
+	color: #777
+}
+
+.navbar-default .navbar-brand:focus,
+.navbar-default .navbar-brand:hover {
+	color: #5e5e5e;
+	background-color: transparent
+}
+
+.navbar-default .navbar-text {
+	color: #777
+}
+
+.navbar-default .navbar-nav>li>a {
+	color: #777
+}
+
+.navbar-default .navbar-nav>li>a:focus,
+.navbar-default .navbar-nav>li>a:hover {
+	color: #333;
+	background-color: transparent
+}
+
+.navbar-default .navbar-nav>.active>a,
+.navbar-default .navbar-nav>.active>a:focus,
+.navbar-default .navbar-nav>.active>a:hover {
+	color: #555;
+	background-color: #e7e7e7
+}
+
+.navbar-default .navbar-nav>.disabled>a,
+.navbar-default .navbar-nav>.disabled>a:focus,
+.navbar-default .navbar-nav>.disabled>a:hover {
+	color: #ccc;
+	background-color: transparent
+}
+
+.navbar-default .navbar-toggle {
+	border-color: #ddd
+}
+
+.navbar-default .navbar-toggle:focus,
+.navbar-default .navbar-toggle:hover {
+	background-color: #ddd
+}
+
+.navbar-default .navbar-toggle .icon-bar {
+	background-color: #888
+}
+
+.navbar-default .navbar-collapse,
+.navbar-default .navbar-form {
+	border-color: #e7e7e7
+}
+
+.navbar-default .navbar-nav>.open>a,
+.navbar-default .navbar-nav>.open>a:focus,
+.navbar-default .navbar-nav>.open>a:hover {
+	color: #555;
+	background-color: #e7e7e7
+}
+
+@media (max-width:767px) {
+	.navbar-default .navbar-nav .open .dropdown-menu>li>a {
+		color: #777
+	}
+	.navbar-default .navbar-nav .open .dropdown-menu>li>a:focus,
+	.navbar-default .navbar-nav .open .dropdown-menu>li>a:hover {
+		color: #333;
+		background-color: transparent
+	}
+	.navbar-default .navbar-nav .open .dropdown-menu>.active>a,
+	.navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus,
+	.navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover {
+		color: #555;
+		background-color: #e7e7e7
+	}
+	.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a,
+	.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:focus,
+	.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:hover {
+		color: #ccc;
+		background-color: transparent
+	}
+}
+
+.navbar-default .navbar-link {
+	color: #777
+}
+
+.navbar-default .navbar-link:hover {
+	color: #333
+}
+
+.navbar-default .btn-link {
+	color: #777
+}
+
+.navbar-default .btn-link:focus,
+.navbar-default .btn-link:hover {
+	color: #333
+}
+
+.navbar-default .btn-link[disabled]:focus,
+.navbar-default .btn-link[disabled]:hover,
+fieldset[disabled] .navbar-default .btn-link:focus,
+fieldset[disabled] .navbar-default .btn-link:hover {
+	color: #ccc
+}
+
+.navbar-inverse {
+	background-color: #222;
+	border-color: #080808
+}
+
+.navbar-inverse .navbar-brand {
+	color: #9d9d9d
+}
+
+.navbar-inverse .navbar-brand:focus,
+.navbar-inverse .navbar-brand:hover {
+	color: #fff;
+	background-color: transparent
+}
+
+.navbar-inverse .navbar-text {
+	color: #9d9d9d
+}
+
+.navbar-inverse .navbar-nav>li>a {
+	color: #9d9d9d
+}
+
+.navbar-inverse .navbar-nav>li>a:focus,
+.navbar-inverse .navbar-nav>li>a:hover {
+	color: #fff;
+	background-color: transparent
+}
+
+.navbar-inverse .navbar-nav>.active>a,
+.navbar-inverse .navbar-nav>.active>a:focus,
+.navbar-inverse .navbar-nav>.active>a:hover {
+	color: #fff;
+	background-color: #080808
+}
+
+.navbar-inverse .navbar-nav>.disabled>a,
+.navbar-inverse .navbar-nav>.disabled>a:focus,
+.navbar-inverse .navbar-nav>.disabled>a:hover {
+	color: #444;
+	background-color: transparent
+}
+
+.navbar-inverse .navbar-toggle {
+	border-color: #333
+}
+
+.navbar-inverse .navbar-toggle:focus,
+.navbar-inverse .navbar-toggle:hover {
+	background-color: #333
+}
+
+.navbar-inverse .navbar-toggle .icon-bar {
+	background-color: #fff
+}
+
+.navbar-inverse .navbar-collapse,
+.navbar-inverse .navbar-form {
+	border-color: #101010
+}
+
+.navbar-inverse .navbar-nav>.open>a,
+.navbar-inverse .navbar-nav>.open>a:focus,
+.navbar-inverse .navbar-nav>.open>a:hover {
+	color: #fff;
+	background-color: #080808
+}
+
+@media (max-width:767px) {
+	.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header {
+		border-color: #080808
+	}
+	.navbar-inverse .navbar-nav .open .dropdown-menu .divider {
+		background-color: #080808
+	}
+	.navbar-inverse .navbar-nav .open .dropdown-menu>li>a {
+		color: #9d9d9d
+	}
+	.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus,
+	.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover {
+		color: #fff;
+		background-color: transparent
+	}
+	.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,
+	.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus,
+	.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover {
+		color: #fff;
+		background-color: #080808
+	}
+	.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a,
+	.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:focus,
+	.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:hover {
+		color: #444;
+		background-color: transparent
+	}
+}
+
+.navbar-inverse .navbar-link {
+	color: #9d9d9d
+}
+
+.navbar-inverse .navbar-link:hover {
+	color: #fff
+}
+
+.navbar-inverse .btn-link {
+	color: #9d9d9d
+}
+
+.navbar-inverse .btn-link:focus,
+.navbar-inverse .btn-link:hover {
+	color: #fff
+}
+
+.navbar-inverse .btn-link[disabled]:focus,
+.navbar-inverse .btn-link[disabled]:hover,
+fieldset[disabled] .navbar-inverse .btn-link:focus,
+fieldset[disabled] .navbar-inverse .btn-link:hover {
+	color: #444
+}
+
+.breadcrumb {
+	padding: 8px 15px;
+	margin-bottom: 20px;
+	list-style: none;
+	background-color: #f5f5f5;
+	border-radius: 4px
+}
+
+.breadcrumb>li {
+	display: inline-block
+}
+
+.breadcrumb>li+li:before {
+	padding: 0 5px;
+	color: #ccc;
+	content: "/\00a0"
+}
+
+.breadcrumb>.active {
+	color: #777
+}
+
+.pagination ul {
+	display: inline-block;
+	*display: inline;
+	margin-bottom: 0;
+	margin-left: 0;
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+	*zoom: 1;
+	-webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+	-moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+	box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05)
+}
+
+.pagination ul>li {
+	display: inline
+}
+
+.pagination ul>li>a,
+.pagination ul>li>span {
+	float: left;
+	padding: 4px 12px;
+	line-height: 20px;
+	text-decoration: none;
+	background-color: #fff;
+	border: 1px solid #ddd;
+	border-left-width: 0;
+	color:#999
+}
+
+.pagination ul>li>a:hover,
+.pagination ul>li>a:focus,
+.pagination ul>.active>a,
+.pagination ul>.active>span {
+	background-color: #f5f5f5
+}
+
+.pagination ul>.active>a,
+.pagination ul>.active>span {
+	color: #0d638f;
+	cursor: default
+}
+
+.pagination ul>.disabled>span,
+.pagination ul>.disabled>a,
+.pagination ul>.disabled>a:hover,
+.pagination ul>.disabled>a:focus {
+	color: #0d638f;
+	cursor: default;
+	background-color: transparent
+}
+
+.pagination ul>li:first-child>a,
+.pagination ul>li:first-child>span {
+	border-left-width: 1px;
+	-webkit-border-bottom-left-radius: 4px;
+	border-bottom-left-radius: 4px;
+	-webkit-border-top-left-radius: 4px;
+	border-top-left-radius: 4px;
+	-moz-border-radius-bottomleft: 4px;
+	-moz-border-radius-topleft: 4px
+}
+
+.pagination ul>li:last-child>a,
+.pagination ul>li:last-child>span {
+	-webkit-border-top-right-radius: 4px;
+	border-top-right-radius: 4px;
+	-webkit-border-bottom-right-radius: 4px;
+	border-bottom-right-radius: 4px;
+	-moz-border-radius-topright: 4px;
+	-moz-border-radius-bottomright: 4px
+}
+.pager {
+	padding-left: 0;
+	margin: 20px 0;
+	text-align: center;
+	list-style: none
+}
+
+.pager li {
+	display: inline
+}
+
+.pager li>a,
+.pager li>span {
+	display: inline-block;
+	padding: 5px 14px;
+	background-color: #fff;
+	border: 1px solid #ddd;
+	border-radius: 15px
+}
+
+.pager li>a:focus,
+.pager li>a:hover {
+	text-decoration: none;
+	background-color: #eee
+}
+
+.pager .next>a,
+.pager .next>span {
+	float: right
+}
+
+.pager .previous>a,
+.pager .previous>span {
+	float: left
+}
+
+.pager .disabled>a,
+.pager .disabled>a:focus,
+.pager .disabled>a:hover,
+.pager .disabled>span {
+	color: #777;
+	cursor: not-allowed;
+	background-color: #fff
+}
+
+.label {
+	display: inline;
+	padding: .2em .6em .3em;
+	font-size: 75%;
+	font-weight: 700;
+	line-height: 1;
+	color: #fff;
+	text-align: center;
+	white-space: nowrap;
+	vertical-align: baseline;
+	border-radius: .25em
+}
+
+a.label:focus,
+a.label:hover {
+	color: #fff;
+	text-decoration: none;
+	cursor: pointer
+}
+
+.label:empty {
+	display: none
+}
+
+.btn .label {
+	position: relative;
+	top: -1px
+}
+
+.label-default {
+	background-color: #777
+}
+
+.label-default[href]:focus,
+.label-default[href]:hover {
+	background-color: #5e5e5e
+}
+
+.label-primary {
+	background-color: #337ab7
+}
+
+.label-primary[href]:focus,
+.label-primary[href]:hover {
+	background-color: #286090
+}
+
+.label-success {
+	background-color: #5cb85c
+}
+
+.label-success[href]:focus,
+.label-success[href]:hover {
+	background-color: #449d44
+}
+
+.label-info {
+	background-color: #5bc0de
+}
+
+.label-info[href]:focus,
+.label-info[href]:hover {
+	background-color: #31b0d5
+}
+
+.label-warning {
+	background-color: #f0ad4e
+}
+
+.label-warning[href]:focus,
+.label-warning[href]:hover {
+	background-color: #ec971f
+}
+
+.label-danger {
+	background-color: #d9534f
+}
+
+.label-danger[href]:focus,
+.label-danger[href]:hover {
+	background-color: #c9302c
+}
+
+.badge {
+	display: inline-block;
+	min-width: 10px;
+	padding: 3px 7px;
+	font-size: 12px;
+	font-weight: 700;
+	line-height: 1;
+	color: #fff;
+	text-align: center;
+	white-space: nowrap;
+	vertical-align: middle;
+	background-color: #777;
+	border-radius: 10px
+}
+
+.badge:empty {
+	display: none
+}
+
+.btn .badge {
+	position: relative;
+	top: -1px
+}
+
+.btn-group-xs>.btn .badge,
+.btn-xs .badge {
+	top: 0;
+	padding: 1px 5px
+}
+
+a.badge:focus,
+a.badge:hover {
+	color: #fff;
+	text-decoration: none;
+	cursor: pointer
+}
+
+.list-group-item.active>.badge,
+.nav-pills>.active>a>.badge {
+	color: #337ab7;
+	background-color: #fff
+}
+
+.list-group-item>.badge {
+	float: right
+}
+
+.list-group-item>.badge+.badge {
+	margin-right: 5px
+}
+
+.nav-pills>li>a>.badge {
+	margin-left: 3px
+}
+
+.jumbotron {
+	padding-top: 30px;
+	padding-bottom: 30px;
+	margin-bottom: 30px;
+	color: inherit;
+	background-color: #eee
+}
+
+.jumbotron .h1,
+.jumbotron h1 {
+	color: inherit
+}
+
+.jumbotron p {
+	margin-bottom: 15px;
+	font-size: 21px;
+	font-weight: 200
+}
+
+.jumbotron>hr {
+	border-top-color: #d5d5d5
+}
+
+.container .jumbotron,
+.container-fluid .jumbotron {
+	padding-right: 15px;
+	padding-left: 15px;
+	border-radius: 6px
+}
+
+.jumbotron .container {
+	max-width: 100%
+}
+
+@media screen and (min-width:768px) {
+	.jumbotron {
+		padding-top: 48px;
+		padding-bottom: 48px
+	}
+	.container .jumbotron,
+	.container-fluid .jumbotron {
+		padding-right: 60px;
+		padding-left: 60px
+	}
+	.jumbotron .h1,
+	.jumbotron h1 {
+		font-size: 63px
+	}
+}
+
+.thumbnail {
+	display: block;
+	padding: 4px;
+	margin-bottom: 20px;
+	line-height: 1.42857143;
+	background-color: #fff;
+	border: 1px solid #ddd;
+	border-radius: 4px;
+	-webkit-transition: border .2s ease-in-out;
+	-o-transition: border .2s ease-in-out;
+	transition: border .2s ease-in-out
+}
+
+.thumbnail a>img,
+.thumbnail>img {
+	margin-right: auto;
+	margin-left: auto
+}
+
+a.thumbnail.active,
+a.thumbnail:focus,
+a.thumbnail:hover {
+	border-color: #337ab7
+}
+
+.thumbnail .caption {
+	padding: 9px;
+	color: #333
+}
+
+.alert {
+	padding: 15px;
+	margin-bottom: 20px;
+	border: 1px solid transparent;
+	border-radius: 4px
+}
+
+.alert h4 {
+	margin-top: 0;
+	color: inherit
+}
+
+.alert .alert-link {
+	font-weight: 700
+}
+
+.alert>p,
+.alert>ul {
+	margin-bottom: 0
+}
+
+.alert>p+p {
+	margin-top: 5px
+}
+
+.alert-dismissable,
+.alert-dismissible {
+	padding-right: 35px
+}
+
+.alert-dismissable .close,
+.alert-dismissible .close {
+	position: relative;
+	top: -2px;
+	right: -21px;
+	color: inherit
+}
+
+.alert-success {
+	color: #3c763d;
+	background-color: #dff0d8;
+	border-color: #d6e9c6
+}
+
+.alert-success hr {
+	border-top-color: #c9e2b3
+}
+
+.alert-success .alert-link {
+	color: #2b542c
+}
+
+.alert-info {
+	color: #31708f;
+	background-color: #d9edf7;
+	border-color: #bce8f1
+}
+
+.alert-info hr {
+	border-top-color: #a6e1ec
+}
+
+.alert-info .alert-link {
+	color: #245269
+}
+
+.alert-warning {
+	color: #8a6d3b;
+	background-color: #fcf8e3;
+	border-color: #faebcc
+}
+
+.alert-warning hr {
+	border-top-color: #f7e1b5
+}
+
+.alert-warning .alert-link {
+	color: #66512c
+}
+
+.alert-danger {
+	color: #a94442;
+	background-color: #f2dede;
+	border-color: #ebccd1
+}
+
+.alert-danger hr {
+	border-top-color: #e4b9c0
+}
+
+.alert-danger .alert-link {
+	color: #843534
+}
+
+@-webkit-keyframes progress-bar-stripes {
+	from {
+		background-position: 40px 0
+	}
+	to {
+		background-position: 0 0
+	}
+}
+
+@-o-keyframes progress-bar-stripes {
+	from {
+		background-position: 40px 0
+	}
+	to {
+		background-position: 0 0
+	}
+}
+
+@keyframes progress-bar-stripes {
+	from {
+		background-position: 40px 0
+	}
+	to {
+		background-position: 0 0
+	}
+}
+
+.progress {
+	height: 20px;
+	margin-bottom: 20px;
+	overflow: hidden;
+	background-color: #f5f5f5;
+	border-radius: 4px;
+	-webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, .1);
+	box-shadow: inset 0 1px 2px rgba(0, 0, 0, .1)
+}
+
+.progress-bar {
+	float: left;
+	width: 0;
+	height: 100%;
+	font-size: 12px;
+	line-height: 20px;
+	color: #fff;
+	text-align: center;
+	background-color: #337ab7;
+	-webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .15);
+	box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .15);
+	-webkit-transition: width .6s ease;
+	-o-transition: width .6s ease;
+	transition: width .6s ease
+}
+
+.progress-bar-striped,
+.progress-striped .progress-bar {
+	background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+	background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+	background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+	-webkit-background-size: 40px 40px;
+	background-size: 40px 40px
+}
+
+.progress-bar.active,
+.progress.active .progress-bar {
+	-webkit-animation: progress-bar-stripes 2s linear infinite;
+	-o-animation: progress-bar-stripes 2s linear infinite;
+	animation: progress-bar-stripes 2s linear infinite
+}
+
+.progress-bar-success {
+	background-color: #5cb85c
+}
+
+.progress-striped .progress-bar-success {
+	background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+	background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+	background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent)
+}
+
+.progress-bar-info {
+	background-color: #5bc0de
+}
+
+.progress-striped .progress-bar-info {
+	background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+	background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+	background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent)
+}
+
+.progress-bar-warning {
+	background-color: #f0ad4e
+}
+
+.progress-striped .progress-bar-warning {
+	background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+	background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+	background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent)
+}
+
+.progress-bar-danger {
+	background-color: #d9534f
+}
+
+.progress-striped .progress-bar-danger {
+	background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+	background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+	background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent)
+}
+
+.media {
+	margin-top: 15px
+}
+
+.media:first-child {
+	margin-top: 0
+}
+
+.media,
+.media-body {
+	overflow: hidden;
+	zoom: 1
+}
+
+.media-body {
+	width: 10000px
+}
+
+.media-object {
+	display: block
+}
+
+.media-object.img-thumbnail {
+	max-width: none
+}
+
+.media-right,
+.media>.pull-right {
+	padding-left: 10px
+}
+
+.media-left,
+.media>.pull-left {
+	padding-right: 10px
+}
+
+.media-body,
+.media-left,
+.media-right {
+	display: table-cell;
+	vertical-align: top
+}
+
+.media-middle {
+	vertical-align: middle
+}
+
+.media-bottom {
+	vertical-align: bottom
+}
+
+.media-heading {
+	margin-top: 0;
+	margin-bottom: 5px
+}
+
+.media-list {
+	padding-left: 0;
+	list-style: none
+}
+
+.list-group {
+	padding-left: 0;
+	margin-bottom: 20px
+}
+
+.list-group-item {
+	position: relative;
+	display: block;
+	padding: 10px 15px;
+	margin-bottom: -1px;
+	background-color: #fff;
+	border: 1px solid #ddd
+}
+
+.list-group-item:first-child {
+	border-top-left-radius: 4px;
+	border-top-right-radius: 4px
+}
+
+.list-group-item:last-child {
+	margin-bottom: 0;
+	border-bottom-right-radius: 4px;
+	border-bottom-left-radius: 4px
+}
+
+a.list-group-item,
+button.list-group-item {
+	color: #555
+}
+
+a.list-group-item .list-group-item-heading,
+button.list-group-item .list-group-item-heading {
+	color: #333
+}
+
+a.list-group-item:focus,
+a.list-group-item:hover,
+button.list-group-item:focus,
+button.list-group-item:hover {
+	color: #555;
+	text-decoration: none;
+	background-color: #f5f5f5
+}
+
+button.list-group-item {
+	width: 100%;
+	text-align: left
+}
+
+.list-group-item.disabled,
+.list-group-item.disabled:focus,
+.list-group-item.disabled:hover {
+	color: #777;
+	cursor: not-allowed;
+	background-color: #eee
+}
+
+.list-group-item.disabled .list-group-item-heading,
+.list-group-item.disabled:focus .list-group-item-heading,
+.list-group-item.disabled:hover .list-group-item-heading {
+	color: inherit
+}
+
+.list-group-item.disabled .list-group-item-text,
+.list-group-item.disabled:focus .list-group-item-text,
+.list-group-item.disabled:hover .list-group-item-text {
+	color: #777
+}
+
+.list-group-item.active,
+.list-group-item.active:focus,
+.list-group-item.active:hover {
+	z-index: 2;
+	color: #fff;
+	background-color: #337ab7;
+	border-color: #337ab7
+}
+
+.list-group-item.active .list-group-item-heading,
+.list-group-item.active .list-group-item-heading>.small,
+.list-group-item.active .list-group-item-heading>small,
+.list-group-item.active:focus .list-group-item-heading,
+.list-group-item.active:focus .list-group-item-heading>.small,
+.list-group-item.active:focus .list-group-item-heading>small,
+.list-group-item.active:hover .list-group-item-heading,
+.list-group-item.active:hover .list-group-item-heading>.small,
+.list-group-item.active:hover .list-group-item-heading>small {
+	color: inherit
+}
+
+.list-group-item.active .list-group-item-text,
+.list-group-item.active:focus .list-group-item-text,
+.list-group-item.active:hover .list-group-item-text {
+	color: #c7ddef
+}
+
+.list-group-item-success {
+	color: #3c763d;
+	background-color: #dff0d8
+}
+
+a.list-group-item-success,
+button.list-group-item-success {
+	color: #3c763d
+}
+
+a.list-group-item-success .list-group-item-heading,
+button.list-group-item-success .list-group-item-heading {
+	color: inherit
+}
+
+a.list-group-item-success:focus,
+a.list-group-item-success:hover,
+button.list-group-item-success:focus,
+button.list-group-item-success:hover {
+	color: #3c763d;
+	background-color: #d0e9c6
+}
+
+a.list-group-item-success.active,
+a.list-group-item-success.active:focus,
+a.list-group-item-success.active:hover,
+button.list-group-item-success.active,
+button.list-group-item-success.active:focus,
+button.list-group-item-success.active:hover {
+	color: #fff;
+	background-color: #3c763d;
+	border-color: #3c763d
+}
+
+.list-group-item-info {
+	color: #31708f;
+	background-color: #d9edf7
+}
+
+a.list-group-item-info,
+button.list-group-item-info {
+	color: #31708f
+}
+
+a.list-group-item-info .list-group-item-heading,
+button.list-group-item-info .list-group-item-heading {
+	color: inherit
+}
+
+a.list-group-item-info:focus,
+a.list-group-item-info:hover,
+button.list-group-item-info:focus,
+button.list-group-item-info:hover {
+	color: #31708f;
+	background-color: #c4e3f3
+}
+
+a.list-group-item-info.active,
+a.list-group-item-info.active:focus,
+a.list-group-item-info.active:hover,
+button.list-group-item-info.active,
+button.list-group-item-info.active:focus,
+button.list-group-item-info.active:hover {
+	color: #fff;
+	background-color: #31708f;
+	border-color: #31708f
+}
+
+.list-group-item-warning {
+	color: #8a6d3b;
+	background-color: #fcf8e3
+}
+
+a.list-group-item-warning,
+button.list-group-item-warning {
+	color: #8a6d3b
+}
+
+a.list-group-item-warning .list-group-item-heading,
+button.list-group-item-warning .list-group-item-heading {
+	color: inherit
+}
+
+a.list-group-item-warning:focus,
+a.list-group-item-warning:hover,
+button.list-group-item-warning:focus,
+button.list-group-item-warning:hover {
+	color: #8a6d3b;
+	background-color: #faf2cc
+}
+
+a.list-group-item-warning.active,
+a.list-group-item-warning.active:focus,
+a.list-group-item-warning.active:hover,
+button.list-group-item-warning.active,
+button.list-group-item-warning.active:focus,
+button.list-group-item-warning.active:hover {
+	color: #fff;
+	background-color: #8a6d3b;
+	border-color: #8a6d3b
+}
+
+.list-group-item-danger {
+	color: #a94442;
+	background-color: #f2dede
+}
+
+a.list-group-item-danger,
+button.list-group-item-danger {
+	color: #a94442
+}
+
+a.list-group-item-danger .list-group-item-heading,
+button.list-group-item-danger .list-group-item-heading {
+	color: inherit
+}
+
+a.list-group-item-danger:focus,
+a.list-group-item-danger:hover,
+button.list-group-item-danger:focus,
+button.list-group-item-danger:hover {
+	color: #a94442;
+	background-color: #ebcccc
+}
+
+a.list-group-item-danger.active,
+a.list-group-item-danger.active:focus,
+a.list-group-item-danger.active:hover,
+button.list-group-item-danger.active,
+button.list-group-item-danger.active:focus,
+button.list-group-item-danger.active:hover {
+	color: #fff;
+	background-color: #a94442;
+	border-color: #a94442
+}
+
+.list-group-item-heading {
+	margin-top: 0;
+	margin-bottom: 5px
+}
+
+.list-group-item-text {
+	margin-bottom: 0;
+	line-height: 1.3
+}
+
+.panel {
+	margin-bottom: 20px;
+	background-color: #fff;
+	border: 1px solid transparent;
+	border-radius: 4px;
+	-webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, .05);
+	box-shadow: 0 1px 1px rgba(0, 0, 0, .05)
+}
+
+.panel-body {
+	padding: 15px
+}
+
+.panel-heading {
+	padding: 10px 15px;
+	border-bottom: 1px solid transparent;
+	border-top-left-radius: 3px;
+	border-top-right-radius: 3px
+}
+
+.panel-heading>.dropdown .dropdown-toggle {
+	color: inherit
+}
+
+.panel-title {
+	margin-top: 0;
+	margin-bottom: 0;
+	font-size: 16px;
+	color: inherit
+}
+
+.panel-title>.small,
+.panel-title>.small>a,
+.panel-title>a,
+.panel-title>small,
+.panel-title>small>a {
+	color: inherit
+}
+
+.panel-footer {
+	padding: 10px 15px;
+	background-color: #f5f5f5;
+	border-top: 1px solid #ddd;
+	border-bottom-right-radius: 3px;
+	border-bottom-left-radius: 3px
+}
+
+.panel>.list-group,
+.panel>.panel-collapse>.list-group {
+	margin-bottom: 0
+}
+
+.panel>.list-group .list-group-item,
+.panel>.panel-collapse>.list-group .list-group-item {
+	border-width: 1px 0;
+	border-radius: 0
+}
+
+.panel>.list-group:first-child .list-group-item:first-child,
+.panel>.panel-collapse>.list-group:first-child .list-group-item:first-child {
+	border-top: 0;
+	border-top-left-radius: 3px;
+	border-top-right-radius: 3px
+}
+
+.panel>.list-group:last-child .list-group-item:last-child,
+.panel>.panel-collapse>.list-group:last-child .list-group-item:last-child {
+	border-bottom: 0;
+	border-bottom-right-radius: 3px;
+	border-bottom-left-radius: 3px
+}
+
+.panel>.panel-heading+.panel-collapse>.list-group .list-group-item:first-child {
+	border-top-left-radius: 0;
+	border-top-right-radius: 0
+}
+
+.panel-heading+.list-group .list-group-item:first-child {
+	border-top-width: 0
+}
+
+.list-group+.panel-footer {
+	border-top-width: 0
+}
+
+.panel>.panel-collapse>.table,
+.panel>.table,
+.panel>.table-responsive>.table {
+	margin-bottom: 0
+}
+
+.panel>.panel-collapse>.table caption,
+.panel>.table caption,
+.panel>.table-responsive>.table caption {
+	padding-right: 15px;
+	padding-left: 15px
+}
+
+.panel>.table-responsive:first-child>.table:first-child,
+.panel>.table:first-child {
+	border-top-left-radius: 3px;
+	border-top-right-radius: 3px
+}
+
+.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child,
+.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child,
+.panel>.table:first-child>tbody:first-child>tr:first-child,
+.panel>.table:first-child>thead:first-child>tr:first-child {
+	border-top-left-radius: 3px;
+	border-top-right-radius: 3px
+}
+
+.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:first-child,
+.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:first-child,
+.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:first-child,
+.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:first-child,
+.panel>.table:first-child>tbody:first-child>tr:first-child td:first-child,
+.panel>.table:first-child>tbody:first-child>tr:first-child th:first-child,
+.panel>.table:first-child>thead:first-child>tr:first-child td:first-child,
+.panel>.table:first-child>thead:first-child>tr:first-child th:first-child {
+	border-top-left-radius: 3px
+}
+
+.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:last-child,
+.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:last-child,
+.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:last-child,
+.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:last-child,
+.panel>.table:first-child>tbody:first-child>tr:first-child td:last-child,
+.panel>.table:first-child>tbody:first-child>tr:first-child th:last-child,
+.panel>.table:first-child>thead:first-child>tr:first-child td:last-child,
+.panel>.table:first-child>thead:first-child>tr:first-child th:last-child {
+	border-top-right-radius: 3px
+}
+
+.panel>.table-responsive:last-child>.table:last-child,
+.panel>.table:last-child {
+	border-bottom-right-radius: 3px;
+	border-bottom-left-radius: 3px
+}
+
+.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child,
+.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child,
+.panel>.table:last-child>tbody:last-child>tr:last-child,
+.panel>.table:last-child>tfoot:last-child>tr:last-child {
+	border-bottom-right-radius: 3px;
+	border-bottom-left-radius: 3px
+}
+
+.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:first-child,
+.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:first-child,
+.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:first-child,
+.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:first-child,
+.panel>.table:last-child>tbody:last-child>tr:last-child td:first-child,
+.panel>.table:last-child>tbody:last-child>tr:last-child th:first-child,
+.panel>.table:last-child>tfoot:last-child>tr:last-child td:first-child,
+.panel>.table:last-child>tfoot:last-child>tr:last-child th:first-child {
+	border-bottom-left-radius: 3px
+}
+
+.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:last-child,
+.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:last-child,
+.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:last-child,
+.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:last-child,
+.panel>.table:last-child>tbody:last-child>tr:last-child td:last-child,
+.panel>.table:last-child>tbody:last-child>tr:last-child th:last-child,
+.panel>.table:last-child>tfoot:last-child>tr:last-child td:last-child,
+.panel>.table:last-child>tfoot:last-child>tr:last-child th:last-child {
+	border-bottom-right-radius: 3px
+}
+
+.panel>.panel-body+.table,
+.panel>.panel-body+.table-responsive,
+.panel>.table+.panel-body,
+.panel>.table-responsive+.panel-body {
+	border-top: 1px solid #ddd
+}
+
+.panel>.table>tbody:first-child>tr:first-child td,
+.panel>.table>tbody:first-child>tr:first-child th {
+	border-top: 0
+}
+
+.panel>.table-bordered,
+.panel>.table-responsive>.table-bordered {
+	border: 0
+}
+
+.panel>.table-bordered>tbody>tr>td:first-child,
+.panel>.table-bordered>tbody>tr>th:first-child,
+.panel>.table-bordered>tfoot>tr>td:first-child,
+.panel>.table-bordered>tfoot>tr>th:first-child,
+.panel>.table-bordered>thead>tr>td:first-child,
+.panel>.table-bordered>thead>tr>th:first-child,
+.panel>.table-responsive>.table-bordered>tbody>tr>td:first-child,
+.panel>.table-responsive>.table-bordered>tbody>tr>th:first-child,
+.panel>.table-responsive>.table-bordered>tfoot>tr>td:first-child,
+.panel>.table-responsive>.table-bordered>tfoot>tr>th:first-child,
+.panel>.table-responsive>.table-bordered>thead>tr>td:first-child,
+.panel>.table-responsive>.table-bordered>thead>tr>th:first-child {
+	border-left: 0
+}
+
+.panel>.table-bordered>tbody>tr>td:last-child,
+.panel>.table-bordered>tbody>tr>th:last-child,
+.panel>.table-bordered>tfoot>tr>td:last-child,
+.panel>.table-bordered>tfoot>tr>th:last-child,
+.panel>.table-bordered>thead>tr>td:last-child,
+.panel>.table-bordered>thead>tr>th:last-child,
+.panel>.table-responsive>.table-bordered>tbody>tr>td:last-child,
+.panel>.table-responsive>.table-bordered>tbody>tr>th:last-child,
+.panel>.table-responsive>.table-bordered>tfoot>tr>td:last-child,
+.panel>.table-responsive>.table-bordered>tfoot>tr>th:last-child,
+.panel>.table-responsive>.table-bordered>thead>tr>td:last-child,
+.panel>.table-responsive>.table-bordered>thead>tr>th:last-child {
+	border-right: 0
+}
+
+.panel>.table-bordered>tbody>tr:first-child>td,
+.panel>.table-bordered>tbody>tr:first-child>th,
+.panel>.table-bordered>thead>tr:first-child>td,
+.panel>.table-bordered>thead>tr:first-child>th,
+.panel>.table-responsive>.table-bordered>tbody>tr:first-child>td,
+.panel>.table-responsive>.table-bordered>tbody>tr:first-child>th,
+.panel>.table-responsive>.table-bordered>thead>tr:first-child>td,
+.panel>.table-responsive>.table-bordered>thead>tr:first-child>th {
+	border-bottom: 0
+}
+
+.panel>.table-bordered>tbody>tr:last-child>td,
+.panel>.table-bordered>tbody>tr:last-child>th,
+.panel>.table-bordered>tfoot>tr:last-child>td,
+.panel>.table-bordered>tfoot>tr:last-child>th,
+.panel>.table-responsive>.table-bordered>tbody>tr:last-child>td,
+.panel>.table-responsive>.table-bordered>tbody>tr:last-child>th,
+.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>td,
+.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>th {
+	border-bottom: 0
+}
+
+.panel>.table-responsive {
+	margin-bottom: 0;
+	border: 0
+}
+
+.panel-group {
+	margin-bottom: 20px
+}
+
+.panel-group .panel {
+	margin-bottom: 0;
+	border-radius: 4px
+}
+
+.panel-group .panel+.panel {
+	margin-top: 5px
+}
+
+.panel-group .panel-heading {
+	border-bottom: 0
+}
+
+.panel-group .panel-heading+.panel-collapse>.list-group,
+.panel-group .panel-heading+.panel-collapse>.panel-body {
+	border-top: 1px solid #ddd
+}
+
+.panel-group .panel-footer {
+	border-top: 0
+}
+
+.panel-group .panel-footer+.panel-collapse .panel-body {
+	border-bottom: 1px solid #ddd
+}
+
+.panel-default {
+	border-color: #ddd
+}
+
+.panel-default>.panel-heading {
+	color: #333;
+	background-color: #f5f5f5;
+	border-color: #ddd
+}
+
+.panel-default>.panel-heading+.panel-collapse>.panel-body {
+	border-top-color: #ddd
+}
+
+.panel-default>.panel-heading .badge {
+	color: #f5f5f5;
+	background-color: #333
+}
+
+.panel-default>.panel-footer+.panel-collapse>.panel-body {
+	border-bottom-color: #ddd
+}
+
+.panel-primary {
+	border-color: #337ab7
+}
+
+.panel-primary>.panel-heading {
+	color: #fff;
+	background-color: #337ab7;
+	border-color: #337ab7
+}
+
+.panel-primary>.panel-heading+.panel-collapse>.panel-body {
+	border-top-color: #337ab7
+}
+
+.panel-primary>.panel-heading .badge {
+	color: #337ab7;
+	background-color: #fff
+}
+
+.panel-primary>.panel-footer+.panel-collapse>.panel-body {
+	border-bottom-color: #337ab7
+}
+
+.panel-success {
+	border-color: #d6e9c6
+}
+
+.panel-success>.panel-heading {
+	color: #3c763d;
+	background-color: #dff0d8;
+	border-color: #d6e9c6
+}
+
+.panel-success>.panel-heading+.panel-collapse>.panel-body {
+	border-top-color: #d6e9c6
+}
+
+.panel-success>.panel-heading .badge {
+	color: #dff0d8;
+	background-color: #3c763d
+}
+
+.panel-success>.panel-footer+.panel-collapse>.panel-body {
+	border-bottom-color: #d6e9c6
+}
+
+.panel-info {
+	border-color: #bce8f1
+}
+
+.panel-info>.panel-heading {
+	color: #31708f;
+	background-color: #d9edf7;
+	border-color: #bce8f1
+}
+
+.panel-info>.panel-heading+.panel-collapse>.panel-body {
+	border-top-color: #bce8f1
+}
+
+.panel-info>.panel-heading .badge {
+	color: #d9edf7;
+	background-color: #31708f
+}
+
+.panel-info>.panel-footer+.panel-collapse>.panel-body {
+	border-bottom-color: #bce8f1
+}
+
+.panel-warning {
+	border-color: #faebcc
+}
+
+.panel-warning>.panel-heading {
+	color: #8a6d3b;
+	background-color: #fcf8e3;
+	border-color: #faebcc
+}
+
+.panel-warning>.panel-heading+.panel-collapse>.panel-body {
+	border-top-color: #faebcc
+}
+
+.panel-warning>.panel-heading .badge {
+	color: #fcf8e3;
+	background-color: #8a6d3b
+}
+
+.panel-warning>.panel-footer+.panel-collapse>.panel-body {
+	border-bottom-color: #faebcc
+}
+
+.panel-danger {
+	border-color: #ebccd1
+}
+
+.panel-danger>.panel-heading {
+	color: #a94442;
+	background-color: #f2dede;
+	border-color: #ebccd1
+}
+
+.panel-danger>.panel-heading+.panel-collapse>.panel-body {
+	border-top-color: #ebccd1
+}
+
+.panel-danger>.panel-heading .badge {
+	color: #f2dede;
+	background-color: #a94442
+}
+
+.panel-danger>.panel-footer+.panel-collapse>.panel-body {
+	border-bottom-color: #ebccd1
+}
+
+.embed-responsive {
+	position: relative;
+	display: block;
+	height: 0;
+	padding: 0;
+	overflow: hidden
+}
+
+.embed-responsive .embed-responsive-item,
+.embed-responsive embed,
+.embed-responsive iframe,
+.embed-responsive object,
+.embed-responsive video {
+	position: absolute;
+	top: 0;
+	bottom: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	border: 0
+}
+
+.embed-responsive-16by9 {
+	padding-bottom: 56.25%
+}
+
+.embed-responsive-4by3 {
+	padding-bottom: 75%
+}
+
+.well {
+	min-height: 20px;
+	padding: 19px;
+	margin-bottom: 20px;
+	background-color: #f5f5f5;
+	border: 1px solid #e3e3e3;
+	border-radius: 4px;
+	-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05);
+	box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05)
+}
+
+.well blockquote {
+	border-color: #ddd;
+	border-color: rgba(0, 0, 0, .15)
+}
+
+.well-lg {
+	padding: 24px;
+	border-radius: 6px
+}
+
+.well-sm {
+	padding: 9px;
+	border-radius: 3px
+}
+
+.close {
+	float: right;
+	font-size: 21px;
+	font-weight: 700;
+	line-height: 1;
+	color: #000;
+	text-shadow: 0 1px 0 #fff;
+	filter: alpha(opacity=20);
+	opacity: .2
+}
+
+.close:focus,
+.close:hover {
+	color: #000;
+	text-decoration: none;
+	cursor: pointer;
+	filter: alpha(opacity=50);
+	opacity: .5
+}
+
+button.close {
+	-webkit-appearance: none;
+	padding: 0;
+	cursor: pointer;
+	background: 0 0;
+	border: 0
+}
+
+.modal-open {
+	overflow: hidden
+}
+
+.modal {
+	position: fixed;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	left: 0;
+	z-index: 1050;
+	display: none;
+	overflow: hidden;
+	-webkit-overflow-scrolling: touch;
+	outline: 0
+}
+
+.modal.fade .modal-dialog {
+	-webkit-transition: -webkit-transform .3s ease-out;
+	-o-transition: -o-transform .3s ease-out;
+	transition: transform .3s ease-out;
+	-webkit-transform: translate(0, -25%);
+	-ms-transform: translate(0, -25%);
+	-o-transform: translate(0, -25%);
+	transform: translate(0, -25%)
+}
+
+.modal.in .modal-dialog {
+	-webkit-transform: translate(0, 0);
+	-ms-transform: translate(0, 0);
+	-o-transform: translate(0, 0);
+	transform: translate(0, 0)
+}
+
+.modal-open .modal {
+	overflow-x: hidden;
+	overflow-y: auto
+}
+
+.modal-dialog {
+	position: relative;
+	width: auto;
+	margin: 10px
+}
+
+.modal-content {
+	position: relative;
+	background-color: #fff;
+	-webkit-background-clip: padding-box;
+	background-clip: padding-box;
+	border: 1px solid #999;
+	border: 1px solid rgba(0, 0, 0, .2);
+	border-radius: 6px;
+	outline: 0;
+	-webkit-box-shadow: 0 3px 9px rgba(0, 0, 0, .5);
+	box-shadow: 0 3px 9px rgba(0, 0, 0, .5)
+}
+
+.modal-backdrop {
+	position: fixed;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	left: 0;
+	z-index: 1040;
+	background-color: #000
+}
+
+.modal-backdrop.fade {
+	filter: alpha(opacity=0);
+	opacity: 0
+}
+
+.modal-backdrop.in {
+	filter: alpha(opacity=50);
+	opacity: .5
+}
+
+.modal-header {
+	padding: 15px;
+	border-bottom: 1px solid #e5e5e5
+}
+
+.modal-header .close {
+	margin-top: -2px
+}
+
+.modal-title {
+	margin: 0;
+	line-height: 1.42857143
+}
+
+.modal-body {
+	position: relative;
+	padding: 15px
+}
+
+.modal-footer {
+	padding: 15px;
+	text-align: right;
+	border-top: 1px solid #e5e5e5
+}
+
+.modal-footer .btn+.btn {
+	margin-bottom: 0;
+	margin-left: 5px
+}
+
+.modal-footer .btn-group .btn+.btn {
+	margin-left: -1px
+}
+
+.modal-footer .btn-block+.btn-block {
+	margin-left: 0
+}
+
+.modal-scrollbar-measure {
+	position: absolute;
+	top: -9999px;
+	width: 50px;
+	height: 50px;
+	overflow: scroll
+}
+
+@media (min-width:768px) {
+	.modal-dialog {
+		width: 600px;
+		margin: 30px auto
+	}
+	.modal-content {
+		-webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, .5);
+		box-shadow: 0 5px 15px rgba(0, 0, 0, .5)
+	}
+	.modal-sm {
+		width: 300px
+	}
+}
+
+@media (min-width:992px) {
+	.modal-lg {
+		width: 900px
+	}
+}
+
+.tooltip {
+	position: absolute;
+	z-index: 1070;
+	display: block;
+	font-family: "Helvetica Neue", Helvetica, Tahoma, Arial, 'Microsoft Yahei', 'Hiragino Sans GB', 'WenQuanYi Micro Hei', sans-serif;
+	font-size: 12px;
+	font-style: normal;
+	font-weight: 400;
+	line-height: 1.42857143;
+	text-align: left;
+	text-align: start;
+	text-decoration: none;
+	text-shadow: none;
+	text-transform: none;
+	letter-spacing: normal;
+	word-break: normal;
+	word-spacing: normal;
+	word-wrap: normal;
+	white-space: normal;
+	filter: alpha(opacity=0);
+	opacity: 0;
+	line-break: auto
+}
+
+.tooltip.in {
+	filter: alpha(opacity=90);
+	opacity: .9
+}
+
+.tooltip.top {
+	padding: 5px 0;
+	margin-top: -3px
+}
+
+.tooltip.right {
+	padding: 0 5px;
+	margin-left: 3px
+}
+
+.tooltip.bottom {
+	padding: 5px 0;
+	margin-top: 3px
+}
+
+.tooltip.left {
+	padding: 0 5px;
+	margin-left: -3px
+}
+
+.tooltip-inner {
+	max-width: 200px;
+	padding: 3px 8px;
+	color: #fff;
+	text-align: center;
+	background-color: #000;
+	border-radius: 4px
+}
+
+.tooltip-arrow {
+	position: absolute;
+	width: 0;
+	height: 0;
+	border-color: transparent;
+	border-style: solid
+}
+
+.tooltip.top .tooltip-arrow {
+	bottom: 0;
+	left: 50%;
+	margin-left: -5px;
+	border-width: 5px 5px 0;
+	border-top-color: #000
+}
+
+.tooltip.top-left .tooltip-arrow {
+	right: 5px;
+	bottom: 0;
+	margin-bottom: -5px;
+	border-width: 5px 5px 0;
+	border-top-color: #000
+}
+
+.tooltip.top-right .tooltip-arrow {
+	bottom: 0;
+	left: 5px;
+	margin-bottom: -5px;
+	border-width: 5px 5px 0;
+	border-top-color: #000
+}
+
+.tooltip.right .tooltip-arrow {
+	top: 50%;
+	left: 0;
+	margin-top: -5px;
+	border-width: 5px 5px 5px 0;
+	border-right-color: #000
+}
+
+.tooltip.left .tooltip-arrow {
+	top: 50%;
+	right: 0;
+	margin-top: -5px;
+	border-width: 5px 0 5px 5px;
+	border-left-color: #000
+}
+
+.tooltip.bottom .tooltip-arrow {
+	top: 0;
+	left: 50%;
+	margin-left: -5px;
+	border-width: 0 5px 5px;
+	border-bottom-color: #000
+}
+
+.tooltip.bottom-left .tooltip-arrow {
+	top: 0;
+	right: 5px;
+	margin-top: -5px;
+	border-width: 0 5px 5px;
+	border-bottom-color: #000
+}
+
+.tooltip.bottom-right .tooltip-arrow {
+	top: 0;
+	left: 5px;
+	margin-top: -5px;
+	border-width: 0 5px 5px;
+	border-bottom-color: #000
+}
+
+.popover {
+	position: absolute;
+	top: 0;
+	left: 0;
+	z-index: 1060;
+	display: none;
+	max-width: 276px;
+	padding: 1px;
+	font-family: "Helvetica Neue", Helvetica, Tahoma, Arial, 'Microsoft Yahei', 'Hiragino Sans GB', 'WenQuanYi Micro Hei', sans-serif;
+	font-size: 14px;
+	font-style: normal;
+	font-weight: 400;
+	line-height: 1.42857143;
+	text-align: left;
+	text-align: start;
+	text-decoration: none;
+	text-shadow: none;
+	text-transform: none;
+	letter-spacing: normal;
+	word-break: normal;
+	word-spacing: normal;
+	word-wrap: normal;
+	white-space: normal;
+	background-color: #fff;
+	-webkit-background-clip: padding-box;
+	background-clip: padding-box;
+	border: 1px solid #ccc;
+	border: 1px solid rgba(0, 0, 0, .2);
+	border-radius: 6px;
+	-webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, .2);
+	box-shadow: 0 5px 10px rgba(0, 0, 0, .2);
+	line-break: auto
+}
+
+.popover.top {
+	margin-top: -10px
+}
+
+.popover.right {
+	margin-left: 10px
+}
+
+.popover.bottom {
+	margin-top: 10px
+}
+
+.popover.left {
+	margin-left: -10px
+}
+
+.popover-title {
+	padding: 8px 14px;
+	margin: 0;
+	font-size: 14px;
+	background-color: #f7f7f7;
+	border-bottom: 1px solid #ebebeb;
+	border-radius: 5px 5px 0 0
+}
+
+.popover-content {
+	padding: 9px 14px
+}
+
+.popover>.arrow,
+.popover>.arrow:after {
+	position: absolute;
+	display: block;
+	width: 0;
+	height: 0;
+	border-color: transparent;
+	border-style: solid
+}
+
+.popover>.arrow {
+	border-width: 11px
+}
+
+.popover>.arrow:after {
+	content: "";
+	border-width: 10px
+}
+
+.popover.top>.arrow {
+	bottom: -11px;
+	left: 50%;
+	margin-left: -11px;
+	border-top-color: #999;
+	border-top-color: rgba(0, 0, 0, .25);
+	border-bottom-width: 0
+}
+
+.popover.top>.arrow:after {
+	bottom: 1px;
+	margin-left: -10px;
+	content: " ";
+	border-top-color: #fff;
+	border-bottom-width: 0
+}
+
+.popover.right>.arrow {
+	top: 50%;
+	left: -11px;
+	margin-top: -11px;
+	border-right-color: #999;
+	border-right-color: rgba(0, 0, 0, .25);
+	border-left-width: 0
+}
+
+.popover.right>.arrow:after {
+	bottom: -10px;
+	left: 1px;
+	content: " ";
+	border-right-color: #fff;
+	border-left-width: 0
+}
+
+.popover.bottom>.arrow {
+	top: -11px;
+	left: 50%;
+	margin-left: -11px;
+	border-top-width: 0;
+	border-bottom-color: #999;
+	border-bottom-color: rgba(0, 0, 0, .25)
+}
+
+.popover.bottom>.arrow:after {
+	top: 1px;
+	margin-left: -10px;
+	content: " ";
+	border-top-width: 0;
+	border-bottom-color: #fff
+}
+
+.popover.left>.arrow {
+	top: 50%;
+	right: -11px;
+	margin-top: -11px;
+	border-right-width: 0;
+	border-left-color: #999;
+	border-left-color: rgba(0, 0, 0, .25)
+}
+
+.popover.left>.arrow:after {
+	right: 1px;
+	bottom: -10px;
+	content: " ";
+	border-right-width: 0;
+	border-left-color: #fff
+}
+
+.carousel {
+	position: relative
+}
+
+.carousel-inner {
+	position: relative;
+	width: 100%;
+	overflow: hidden
+}
+
+.carousel-inner>.item {
+	position: relative;
+	display: none;
+	-webkit-transition: .6s ease-in-out left;
+	-o-transition: .6s ease-in-out left;
+	transition: .6s ease-in-out left
+}
+
+.carousel-inner>.item>a>img,
+.carousel-inner>.item>img {
+	line-height: 1
+}
+
+@media all and (transform-3d),
+(-webkit-transform-3d) {
+	.carousel-inner>.item {
+		-webkit-transition: -webkit-transform .6s ease-in-out;
+		-o-transition: -o-transform .6s ease-in-out;
+		transition: transform .6s ease-in-out;
+		-webkit-backface-visibility: hidden;
+		backface-visibility: hidden;
+		-webkit-perspective: 1000px;
+		perspective: 1000px
+	}
+	.carousel-inner>.item.active.right,
+	.carousel-inner>.item.next {
+		left: 0;
+		-webkit-transform: translate3d(100%, 0, 0);
+		transform: translate3d(100%, 0, 0)
+	}
+	.carousel-inner>.item.active.left,
+	.carousel-inner>.item.prev {
+		left: 0;
+		-webkit-transform: translate3d(-100%, 0, 0);
+		transform: translate3d(-100%, 0, 0)
+	}
+	.carousel-inner>.item.active,
+	.carousel-inner>.item.next.left,
+	.carousel-inner>.item.prev.right {
+		left: 0;
+		-webkit-transform: translate3d(0, 0, 0);
+		transform: translate3d(0, 0, 0)
+	}
+}
+
+.carousel-inner>.active,
+.carousel-inner>.next,
+.carousel-inner>.prev {
+	display: block
+}
+
+.carousel-inner>.active {
+	left: 0
+}
+
+.carousel-inner>.next,
+.carousel-inner>.prev {
+	position: absolute;
+	top: 0;
+	width: 100%
+}
+
+.carousel-inner>.next {
+	left: 100%
+}
+
+.carousel-inner>.prev {
+	left: -100%
+}
+
+.carousel-inner>.next.left,
+.carousel-inner>.prev.right {
+	left: 0
+}
+
+.carousel-inner>.active.left {
+	left: -100%
+}
+
+.carousel-inner>.active.right {
+	left: 100%
+}
+
+.carousel-control {
+	position: absolute;
+	top: 0;
+	bottom: 0;
+	left: 0;
+	width: 15%;
+	font-size: 20px;
+	color: #fff;
+	text-align: center;
+	text-shadow: 0 1px 2px rgba(0, 0, 0, .6);
+	background-color: rgba(0, 0, 0, 0);
+	filter: alpha(opacity=50);
+	opacity: .5
+}
+
+.carousel-control.left {
+	background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, .5) 0, rgba(0, 0, 0, .0001) 100%);
+	background-image: -o-linear-gradient(left, rgba(0, 0, 0, .5) 0, rgba(0, 0, 0, .0001) 100%);
+	background-image: -webkit-gradient(linear, left top, right top, from(rgba(0, 0, 0, .5)), to(rgba(0, 0, 0, .0001)));
+	background-image: linear-gradient(to right, rgba(0, 0, 0, .5) 0, rgba(0, 0, 0, .0001) 100%);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1);
+	background-repeat: repeat-x
+}
+
+.carousel-control.right {
+	right: 0;
+	left: auto;
+	background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, .0001) 0, rgba(0, 0, 0, .5) 100%);
+	background-image: -o-linear-gradient(left, rgba(0, 0, 0, .0001) 0, rgba(0, 0, 0, .5) 100%);
+	background-image: -webkit-gradient(linear, left top, right top, from(rgba(0, 0, 0, .0001)), to(rgba(0, 0, 0, .5)));
+	background-image: linear-gradient(to right, rgba(0, 0, 0, .0001) 0, rgba(0, 0, 0, .5) 100%);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1);
+	background-repeat: repeat-x
+}
+
+.carousel-control:focus,
+.carousel-control:hover {
+	color: #fff;
+	text-decoration: none;
+	filter: alpha(opacity=90);
+	outline: 0;
+	opacity: .9
+}
+
+.carousel-control .glyphicon-chevron-left,
+.carousel-control .glyphicon-chevron-right,
+.carousel-control .icon-next,
+.carousel-control .icon-prev {
+	position: absolute;
+	top: 50%;
+	z-index: 5;
+	display: inline-block;
+	margin-top: -10px
+}
+
+.carousel-control .glyphicon-chevron-left,
+.carousel-control .icon-prev {
+	left: 50%;
+	margin-left: -10px
+}
+
+.carousel-control .glyphicon-chevron-right,
+.carousel-control .icon-next {
+	right: 50%;
+	margin-right: -10px
+}
+
+.carousel-control .icon-next,
+.carousel-control .icon-prev {
+	width: 20px;
+	height: 20px;
+	font-family: serif;
+	line-height: 1
+}
+
+.carousel-control .icon-prev:before {
+	content: '\2039'
+}
+
+.carousel-control .icon-next:before {
+	content: '\203a'
+}
+
+.carousel-indicators {
+	position: absolute;
+	bottom: 10px;
+	left: 50%;
+	z-index: 15;
+	width: 60%;
+	padding-left: 0;
+	margin-left: -30%;
+	text-align: center;
+	list-style: none
+}
+
+.carousel-indicators li {
+	display: inline-block;
+	width: 10px;
+	height: 10px;
+	margin: 1px;
+	text-indent: -999px;
+	cursor: pointer;
+	background-color: #000\9;
+	background-color: rgba(0, 0, 0, 0);
+	border: 1px solid #fff;
+	border-radius: 10px
+}
+
+.carousel-indicators .active {
+	width: 12px;
+	height: 12px;
+	margin: 0;
+	background-color: #fff
+}
+
+.carousel-caption {
+	position: absolute;
+	right: 15%;
+	bottom: 20px;
+	left: 15%;
+	z-index: 10;
+	padding-top: 20px;
+	padding-bottom: 20px;
+	color: #fff;
+	text-align: center;
+	text-shadow: 0 1px 2px rgba(0, 0, 0, .6)
+}
+
+.carousel-caption .btn {
+	text-shadow: none
+}
+
+@media screen and (min-width:768px) {
+	.carousel-control .glyphicon-chevron-left,
+	.carousel-control .glyphicon-chevron-right,
+	.carousel-control .icon-next,
+	.carousel-control .icon-prev {
+		width: 30px;
+		height: 30px;
+		margin-top: -10px;
+		font-size: 30px
+	}
+	.carousel-control .glyphicon-chevron-left,
+	.carousel-control .icon-prev {
+		margin-left: -10px
+	}
+	.carousel-control .glyphicon-chevron-right,
+	.carousel-control .icon-next {
+		margin-right: -10px
+	}
+	.carousel-caption {
+		right: 20%;
+		left: 20%;
+		padding-bottom: 30px
+	}
+	.carousel-indicators {
+		bottom: 20px
+	}
+}
+
+.btn-group-vertical>.btn-group:after,
+.btn-group-vertical>.btn-group:before,
+.btn-toolbar:after,
+.btn-toolbar:before,
+.clearfix:after,
+.clearfix:before,
+.container-fluid:after,
+.container-fluid:before,
+.container:after,
+.container:before,
+.dl-horizontal dd:after,
+.dl-horizontal dd:before,
+.form-horizontal .form-group:after,
+.form-horizontal .form-group:before,
+.modal-footer:after,
+.modal-footer:before,
+.modal-header:after,
+.modal-header:before,
+.nav:after,
+.nav:before,
+.navbar-collapse:after,
+.navbar-collapse:before,
+.navbar-header:after,
+.navbar-header:before,
+.navbar:after,
+.navbar:before,
+.pager:after,
+.pager:before,
+.panel-body:after,
+.panel-body:before,
+.row:after,
+.row:before {
+	display: table;
+	content: " "
+}
+
+.btn-group-vertical>.btn-group:after,
+.btn-toolbar:after,
+.clearfix:after,
+.container-fluid:after,
+.container:after,
+.dl-horizontal dd:after,
+.form-horizontal .form-group:after,
+.modal-footer:after,
+.modal-header:after,
+.nav:after,
+.navbar-collapse:after,
+.navbar-header:after,
+.navbar:after,
+.pager:after,
+.panel-body:after,
+.row:after {
+	clear: both
+}
+
+.center-block {
+	display: block;
+	margin-right: auto;
+	margin-left: auto
+}
+
+.pull-right {
+	float: right!important
+}
+
+.pull-left {
+	float: left!important
+}
+
+.hide {
+	display: none!important
+}
+
+.show {
+	display: block!important
+}
+
+.invisible {
+	visibility: hidden
+}
+
+.text-hide {
+	font: 0/0 a;
+	color: transparent;
+	text-shadow: none;
+	background-color: transparent;
+	border: 0
+}
+
+.hidden {
+	display: none!important
+}
+
+.affix {
+	position: fixed
+}
+
+@-ms-viewport {
+	width: device-width
+}
+
+.visible-lg,
+.visible-md,
+.visible-sm,
+.visible-xs {
+	display: none!important
+}
+
+.visible-lg-block,
+.visible-lg-inline,
+.visible-lg-inline-block,
+.visible-md-block,
+.visible-md-inline,
+.visible-md-inline-block,
+.visible-sm-block,
+.visible-sm-inline,
+.visible-sm-inline-block,
+.visible-xs-block,
+.visible-xs-inline,
+.visible-xs-inline-block {
+	display: none!important
+}
+
+@media (max-width:767px) {
+	.visible-xs {
+		display: block!important
+	}
+	table.visible-xs {
+		display: table!important
+	}
+	tr.visible-xs {
+		display: table-row!important
+	}
+	td.visible-xs,
+	th.visible-xs {
+		display: table-cell!important
+	}
+}
+
+@media (max-width:767px) {
+	.visible-xs-block {
+		display: block!important
+	}
+}
+
+@media (max-width:767px) {
+	.visible-xs-inline {
+		display: inline!important
+	}
+}
+
+@media (max-width:767px) {
+	.visible-xs-inline-block {
+		display: inline-block!important
+	}
+}
+
+@media (min-width:768px) and (max-width:991px) {
+	.visible-sm {
+		display: block!important
+	}
+	table.visible-sm {
+		display: table!important
+	}
+	tr.visible-sm {
+		display: table-row!important
+	}
+	td.visible-sm,
+	th.visible-sm {
+		display: table-cell!important
+	}
+}
+
+@media (min-width:768px) and (max-width:991px) {
+	.visible-sm-block {
+		display: block!important
+	}
+}
+
+@media (min-width:768px) and (max-width:991px) {
+	.visible-sm-inline {
+		display: inline!important
+	}
+}
+
+@media (min-width:768px) and (max-width:991px) {
+	.visible-sm-inline-block {
+		display: inline-block!important
+	}
+}
+
+@media (min-width:992px) and (max-width:1199px) {
+	.visible-md {
+		display: block!important
+	}
+	table.visible-md {
+		display: table!important
+	}
+	tr.visible-md {
+		display: table-row!important
+	}
+	td.visible-md,
+	th.visible-md {
+		display: table-cell!important
+	}
+}
+
+@media (min-width:992px) and (max-width:1199px) {
+	.visible-md-block {
+		display: block!important
+	}
+}
+
+@media (min-width:992px) and (max-width:1199px) {
+	.visible-md-inline {
+		display: inline!important
+	}
+}
+
+@media (min-width:992px) and (max-width:1199px) {
+	.visible-md-inline-block {
+		display: inline-block!important
+	}
+}
+
+@media (min-width:1200px) {
+	.visible-lg {
+		display: block!important
+	}
+	table.visible-lg {
+		display: table!important
+	}
+	tr.visible-lg {
+		display: table-row!important
+	}
+	td.visible-lg,
+	th.visible-lg {
+		display: table-cell!important
+	}
+}
+
+@media (min-width:1200px) {
+	.visible-lg-block {
+		display: block!important
+	}
+}
+
+@media (min-width:1200px) {
+	.visible-lg-inline {
+		display: inline!important
+	}
+}
+
+@media (min-width:1200px) {
+	.visible-lg-inline-block {
+		display: inline-block!important
+	}
+}
+
+@media (max-width:767px) {
+	.hidden-xs {
+		display: none!important
+	}
+}
+
+@media (min-width:768px) and (max-width:991px) {
+	.hidden-sm {
+		display: none!important
+	}
+}
+
+@media (min-width:992px) and (max-width:1199px) {
+	.hidden-md {
+		display: none!important
+	}
+}
+
+@media (min-width:1200px) {
+	.hidden-lg {
+		display: none!important
+	}
+}
+
+.visible-print {
+	display: none!important
+}
+
+@media print {
+	.visible-print {
+		display: block!important
+	}
+	table.visible-print {
+		display: table!important
+	}
+	tr.visible-print {
+		display: table-row!important
+	}
+	td.visible-print,
+	th.visible-print {
+		display: table-cell!important
+	}
+}
+
+.visible-print-block {
+	display: none!important
+}
+
+@media print {
+	.visible-print-block {
+		display: block!important
+	}
+}
+
+.visible-print-inline {
+	display: none!important
+}
+
+@media print {
+	.visible-print-inline {
+		display: inline!important
+	}
+}
+
+.visible-print-inline-block {
+	display: none!important
+}
+
+@media print {
+	.visible-print-inline-block {
+		display: inline-block!important
+	}
+}
+
+@media print {
+	.hidden-print {
+		display: none!important
+	}
+}
+
+.dropdown-menu-lg {
+	width: 230px
+}
+
+.dropdown-menu-lg li {
+	overflow: hidden;
+}
+
+.btn.blue {
+	background: #007BFF;
+	color: #fff;
+}
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/css/common.css b/pluss-manage-page/src/main/resources/static/resources/auth/css/common.css
new file mode 100644
index 0000000..a4c0545
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/css/common.css
@@ -0,0 +1,298 @@
+.breadcrumb {
+	margin-top: 10px;
+}
+.btn-bar {
+	margin-bottom : 10px;
+}
+.form-inline {
+	overflow:hidden;
+}
+.form-inline .control-group.inline label {
+	width: 80px;
+	text-align: right;
+	margin-right: 10px;
+}
+
+.form-horizontal .controls {
+	margin-left: 90px;
+}
+
+@media ( max-width : 480px) {
+	.form-inline .control-group.inline label {
+		width: 80px;
+		text-align: left;
+		float: none;
+	}
+	.form-horizontal .controls {
+		margin-left: 0px;
+	}
+}
+
+.form-horizontal .control-label {
+	width: 80px;
+	margin-right: 10px;
+}
+
+.radio.inline,.checkbox.inline {
+	margin-left: 0px !important;
+	margin-right: 10px;
+}
+
+label span.help-inline {
+	color: #FF0000;
+}
+
+.form-inline .control-group {
+	margin-right: 15px;
+	margin-bottom: 15px;
+}
+
+.form-btns {
+	margin: 20px auto;
+	text-align: center;
+}
+
+.form-btns button,.form-btns input {
+	margin-right: 15px;
+}
+
+.form-inline .pull-right button {
+	margin-right: 15px;
+}
+
+.control-group .controls button{
+	margin-right: 15px;
+}
+
+.uploadify {
+	display: inline-block;
+	margin: auto 10px;
+}
+
+.input-text-medium {
+	width: 140px;
+}
+
+.toolbar {
+	margin: 10px 0px;
+}
+
+.toolbar button,.toolbar input {
+	margin: auto 10px;
+}
+
+.select-all {
+	font-weight: bold;
+}
+
+.ellipsis {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
+.inline {
+	display: inline-block;
+}
+
+.date-picker {
+	cursor: pointer !important;
+}
+
+/*dialog*/
+.ui-widget-overlay {
+        position: fixed;
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 100%;
+        background: #aaaaaa ;
+        opacity: .3;
+        filter: Alpha(Opacity=30);
+}
+
+/* Sidenav for Docs
+-------------------------------------------------- */
+
+.bs-docs-sidenav {
+    /* width: 228px; */
+    margin: 30px 0 0;
+    padding: 0;
+    background-color: #fff;
+    /* -webkit-border-radius: 6px;
+    -moz-border-radius: 6px;
+    border-radius: 6px; */
+    -webkit-box-shadow: 0 1px 4px rgba(0,0,0,.065);
+    -moz-box-shadow: 0 1px 4px rgba(0,0,0,.065);
+    box-shadow: 0 1px 4px rgba(0,0,0,.065);
+}
+.bs-docs-sidenav > li > a {
+    display: block;
+    margin: 0 0 -1px;
+    padding: 8px 14px;
+    border: 1px solid #e5e5e5;
+}
+/* .bs-docs-sidenav > li:first-child > a {
+    -webkit-border-radius: 6px 6px 0 0;
+    -moz-border-radius: 6px 6px 0 0;
+    border-radius: 6px 6px 0 0;
+}
+.bs-docs-sidenav > li:last-child > a {
+    -webkit-border-radius: 0 0 6px 6px;
+    -moz-border-radius: 0 0 6px 6px;
+    border-radius: 0 0 6px 6px;
+} */
+.bs-docs-sidenav > li.active > a {
+    position: relative;
+    z-index: 2;
+    padding: 9px 15px;
+    border: 0;
+    text-shadow: 0 1px 0 rgba(0,0,0,.15);
+    -webkit-box-shadow: inset 1px 0 0 rgba(0,0,0,.1), inset -1px 0 0 rgba(0,0,0,.1);
+    -moz-box-shadow: inset 1px 0 0 rgba(0,0,0,.1), inset -1px 0 0 rgba(0,0,0,.1);
+    box-shadow: inset 1px 0 0 rgba(0,0,0,.1), inset -1px 0 0 rgba(0,0,0,.1);
+}
+/* Chevrons */
+.bs-docs-sidenav .icon-chevron-right {
+    float: right;
+    margin-top: 2px;
+    margin-right: -6px;
+    opacity: .25;
+}
+.bs-docs-sidenav > li > a:hover {
+    background-color: #f5f5f5;
+}
+.bs-docs-sidenav a:hover .icon-chevron-right {
+    opacity: .5;
+}
+.bs-docs-sidenav .active .icon-chevron-right,
+.bs-docs-sidenav .active a:hover .icon-chevron-right {
+    opacity: 1;
+}
+.bs-docs-sidenav.affix {
+    /* top: 40px; */
+}
+.bs-docs-sidenav.affix-bottom {
+    position: absolute;
+    top: auto;
+    bottom: 270px;
+}
+
+.ui-accordion .ui-accordion-content { 
+  padding: 1em 1em; 
+}
+
+/*multiselect*/
+.ui-multiselect {
+	height: 30px;
+	margin-right : 0 !important;
+}
+
+.ui-multiselect-menu input[type="checkbox"] {
+	margin-top: -3px;
+	margin-right: 5px;
+}
+
+/*Blocks*/
+.block {
+	border: 1px solid #ccc;
+	background: white;
+	margin: 1em 0em;
+}
+
+.dialog .block {
+	-webkit-box-shadow: 1px 1px 0px #ffffff;
+	-moz-box-shadow: 1px 1px 0px #ffffff;
+	box-shadow: 1px 1px 0px #ffffff;
+}
+
+.block-heading {
+	border-bottom: 1px solid #a6a6a6;
+	border-left: none;
+	color: #505050;
+	display: block;
+	margin-bottom: 0px;
+	text-shadow: none;
+	text-transform: none;
+	font-weight: bold;
+	font-size: .85em;
+	line-height: 3em;
+}
+
+.block-heading .block-icon {
+	border-right: 1px solid #AAA;
+	border-left: none;
+}
+
+.block-heading .block-icon a {
+	padding: 0em;
+}
+
+.block-heading .block-icon [class*="icon-"] {
+	padding: 0em 1em;
+	line-height: 1em;
+}
+
+.block-heading .block-icon.pull-right {
+	border-left: 1px solid #AAA;
+	border-right: none;
+}
+
+.block-heading .label {
+	float: right;
+	margin-top: .5em;
+	margin-right: .75em;
+	line-height: 1.5em;
+	-webkit-box-shadow: 1px 1px 0px #ffffff;
+	-moz-box-shadow: 1px 1px 0px #ffffff;
+	box-shadow: 1px 1px 0px #ffffff;
+}
+
+p.block-heading,a.block-heading,.block-heading a {
+	color: #505050;
+	background: #dddddd;
+	background: -webkit-gradient(linear, left bottom, left top, color-stop(0, #dddddd),
+		color-stop(1, #fafafa) );
+	background: -ms-linear-gradient(bottom, #dddddd, #fafafa);
+	background: -moz-linear-gradient(center bottom, #dddddd 0%, #fafafa 100%);
+	background: -o-linear-gradient(bottom, #dddddd, #fafafa);
+	filter: progid:dximagetransform.microsoft.gradient(startColorStr='#4d5b76',
+		EndColorStr='#6c7a95' );
+	-ms-filter:
+		"progid:DXImageTransform.Microsoft.gradient(startColorStr='#fafafa',EndColorStr='#dddddd')";
+	display: block;
+	padding-left: 1em;
+	border-top: 1px solid #fff;
+	outline: none;
+}
+
+a.block-heading:hover,.block-heading a:hover {
+	background: #dddddd;
+	background: -webkit-gradient(linear, left bottom, left top, color-stop(0, #dddddd),
+		color-stop(1, #fdfdfd) );
+	background: -ms-linear-gradient(bottom, #dddddd, #fdfdfd);
+	background: -moz-linear-gradient(center bottom, #dddddd 0%, #fdfdfd 100%);
+	background: -o-linear-gradient(bottom, #dddddd, #fdfdfd);
+	filter: progid:dximagetransform.microsoft.gradient(startColorStr='#4d5b76',
+		EndColorStr='#6c7a95' );
+	-ms-filter:
+		"progid:DXImageTransform.Microsoft.gradient(startColorStr='#fdfdfd',EndColorStr='#dddddd')";
+	color: #505050;
+	text-decoration: none;
+}
+
+.block-body {
+	margin: 1em;
+	min-height: .25em;
+	overflow : auto;
+}
+
+.block-body h1,.block-body h2,.block-body h3,.block-body h4,.block-body h5,.block-body h6,.block-body table
+	{
+	margin-top: 12px;
+}
+
+.block-body.collapse {
+	margin-top: 0em;
+	margin-bottom: 0em;
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/css/font-awesome.min.css b/pluss-manage-page/src/main/resources/static/resources/auth/css/font-awesome.min.css
new file mode 100644
index 0000000..540440c
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/css/font-awesome.min.css
@@ -0,0 +1,4 @@
+/*!
+ *  Font Awesome 4.7.0 by @davegandy - http://fontawesome.io - @fontawesome
+ *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
+ */@font-face{font-family:'FontAwesome';src:url('../fonts/fontawesome-webfont.eot?v=4.7.0');src:url('../fonts/fontawesome-webfont.eot?#iefix&v=4.7.0') format('embedded-opentype'),url('../fonts/fontawesome-webfont.woff2?v=4.7.0') format('woff2'),url('../fonts/fontawesome-webfont.woff?v=4.7.0') format('woff'),url('../fonts/fontawesome-webfont.ttf?v=4.7.0') format('truetype'),url('../fonts/fontawesome-webfont.svg?v=4.7.0#fontawesomeregular') format('svg');font-weight:normal;font-style:normal}.fa{display:inline-block;font:normal normal normal 14px/1 FontAwesome;font-size:inherit;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fa-lg{font-size:1.33333333em;line-height:.75em;vertical-align:-15%}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-fw{width:1.28571429em;text-align:center}.fa-ul{padding-left:0;margin-left:2.14285714em;list-style-type:none}.fa-ul>li{position:relative}.fa-li{position:absolute;left:-2.14285714em;width:2.14285714em;top:.14285714em;text-align:center}.fa-li.fa-lg{left:-1.85714286em}.fa-border{padding:.2em .25em .15em;border:solid .08em #eee;border-radius:.1em}.fa-pull-left{float:left}.fa-pull-right{float:right}.fa.fa-pull-left{margin-right:.3em}.fa.fa-pull-right{margin-left:.3em}.pull-right{float:right}.pull-left{float:left}.fa.pull-left{margin-right:.3em}.fa.pull-right{margin-left:.3em}.fa-spin{-webkit-animation:fa-spin 2s infinite linear;animation:fa-spin 2s infinite linear}.fa-pulse{-webkit-animation:fa-spin 1s infinite steps(8);animation:fa-spin 1s infinite steps(8)}@-webkit-keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}.fa-rotate-90{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=1)";-webkit-transform:rotate(90deg);-ms-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2)";-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=3)";-webkit-transform:rotate(270deg);-ms-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)";-webkit-transform:scale(-1, 1);-ms-transform:scale(-1, 1);transform:scale(-1, 1)}.fa-flip-vertical{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)";-webkit-transform:scale(1, -1);-ms-transform:scale(1, -1);transform:scale(1, -1)}:root .fa-rotate-90,:root .fa-rotate-180,:root .fa-rotate-270,:root .fa-flip-horizontal,:root .fa-flip-vertical{filter:none}.fa-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:middle}.fa-stack-1x,.fa-stack-2x{position:absolute;left:0;width:100%;text-align:center}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-glass:before{content:"\f000"}.fa-music:before{content:"\f001"}.fa-search:before{content:"\f002"}.fa-envelope-o:before{content:"\f003"}.fa-heart:before{content:"\f004"}.fa-star:before{content:"\f005"}.fa-star-o:before{content:"\f006"}.fa-user:before{content:"\f007"}.fa-film:before{content:"\f008"}.fa-th-large:before{content:"\f009"}.fa-th:before{content:"\f00a"}.fa-th-list:before{content:"\f00b"}.fa-check:before{content:"\f00c"}.fa-remove:before,.fa-close:before,.fa-times:before{content:"\f00d"}.fa-search-plus:before{content:"\f00e"}.fa-search-minus:before{content:"\f010"}.fa-power-off:before{content:"\f011"}.fa-signal:before{content:"\f012"}.fa-gear:before,.fa-cog:before{content:"\f013"}.fa-trash-o:before{content:"\f014"}.fa-home:before{content:"\f015"}.fa-file-o:before{content:"\f016"}.fa-clock-o:before{content:"\f017"}.fa-road:before{content:"\f018"}.fa-download:before{content:"\f019"}.fa-arrow-circle-o-down:before{content:"\f01a"}.fa-arrow-circle-o-up:before{content:"\f01b"}.fa-inbox:before{content:"\f01c"}.fa-play-circle-o:before{content:"\f01d"}.fa-rotate-right:before,.fa-repeat:before{content:"\f01e"}.fa-refresh:before{content:"\f021"}.fa-list-alt:before{content:"\f022"}.fa-lock:before{content:"\f023"}.fa-flag:before{content:"\f024"}.fa-headphones:before{content:"\f025"}.fa-volume-off:before{content:"\f026"}.fa-volume-down:before{content:"\f027"}.fa-volume-up:before{content:"\f028"}.fa-qrcode:before{content:"\f029"}.fa-barcode:before{content:"\f02a"}.fa-tag:before{content:"\f02b"}.fa-tags:before{content:"\f02c"}.fa-book:before{content:"\f02d"}.fa-bookmark:before{content:"\f02e"}.fa-print:before{content:"\f02f"}.fa-camera:before{content:"\f030"}.fa-font:before{content:"\f031"}.fa-bold:before{content:"\f032"}.fa-italic:before{content:"\f033"}.fa-text-height:before{content:"\f034"}.fa-text-width:before{content:"\f035"}.fa-align-left:before{content:"\f036"}.fa-align-center:before{content:"\f037"}.fa-align-right:before{content:"\f038"}.fa-align-justify:before{content:"\f039"}.fa-list:before{content:"\f03a"}.fa-dedent:before,.fa-outdent:before{content:"\f03b"}.fa-indent:before{content:"\f03c"}.fa-video-camera:before{content:"\f03d"}.fa-photo:before,.fa-image:before,.fa-picture-o:before{content:"\f03e"}.fa-pencil:before{content:"\f040"}.fa-map-marker:before{content:"\f041"}.fa-adjust:before{content:"\f042"}.fa-tint:before{content:"\f043"}.fa-edit:before,.fa-pencil-square-o:before{content:"\f044"}.fa-share-square-o:before{content:"\f045"}.fa-check-square-o:before{content:"\f046"}.fa-arrows:before{content:"\f047"}.fa-step-backward:before{content:"\f048"}.fa-fast-backward:before{content:"\f049"}.fa-backward:before{content:"\f04a"}.fa-play:before{content:"\f04b"}.fa-pause:before{content:"\f04c"}.fa-stop:before{content:"\f04d"}.fa-forward:before{content:"\f04e"}.fa-fast-forward:before{content:"\f050"}.fa-step-forward:before{content:"\f051"}.fa-eject:before{content:"\f052"}.fa-chevron-left:before{content:"\f053"}.fa-chevron-right:before{content:"\f054"}.fa-plus-circle:before{content:"\f055"}.fa-minus-circle:before{content:"\f056"}.fa-times-circle:before{content:"\f057"}.fa-check-circle:before{content:"\f058"}.fa-question-circle:before{content:"\f059"}.fa-info-circle:before{content:"\f05a"}.fa-crosshairs:before{content:"\f05b"}.fa-times-circle-o:before{content:"\f05c"}.fa-check-circle-o:before{content:"\f05d"}.fa-ban:before{content:"\f05e"}.fa-arrow-left:before{content:"\f060"}.fa-arrow-right:before{content:"\f061"}.fa-arrow-up:before{content:"\f062"}.fa-arrow-down:before{content:"\f063"}.fa-mail-forward:before,.fa-share:before{content:"\f064"}.fa-expand:before{content:"\f065"}.fa-compress:before{content:"\f066"}.fa-plus:before{content:"\f067"}.fa-minus:before{content:"\f068"}.fa-asterisk:before{content:"\f069"}.fa-exclamation-circle:before{content:"\f06a"}.fa-gift:before{content:"\f06b"}.fa-leaf:before{content:"\f06c"}.fa-fire:before{content:"\f06d"}.fa-eye:before{content:"\f06e"}.fa-eye-slash:before{content:"\f070"}.fa-warning:before,.fa-exclamation-triangle:before{content:"\f071"}.fa-plane:before{content:"\f072"}.fa-calendar:before{content:"\f073"}.fa-random:before{content:"\f074"}.fa-comment:before{content:"\f075"}.fa-magnet:before{content:"\f076"}.fa-chevron-up:before{content:"\f077"}.fa-chevron-down:before{content:"\f078"}.fa-retweet:before{content:"\f079"}.fa-shopping-cart:before{content:"\f07a"}.fa-folder:before{content:"\f07b"}.fa-folder-open:before{content:"\f07c"}.fa-arrows-v:before{content:"\f07d"}.fa-arrows-h:before{content:"\f07e"}.fa-bar-chart-o:before,.fa-bar-chart:before{content:"\f080"}.fa-twitter-square:before{content:"\f081"}.fa-facebook-square:before{content:"\f082"}.fa-camera-retro:before{content:"\f083"}.fa-key:before{content:"\f084"}.fa-gears:before,.fa-cogs:before{content:"\f085"}.fa-comments:before{content:"\f086"}.fa-thumbs-o-up:before{content:"\f087"}.fa-thumbs-o-down:before{content:"\f088"}.fa-star-half:before{content:"\f089"}.fa-heart-o:before{content:"\f08a"}.fa-sign-out:before{content:"\f08b"}.fa-linkedin-square:before{content:"\f08c"}.fa-thumb-tack:before{content:"\f08d"}.fa-external-link:before{content:"\f08e"}.fa-sign-in:before{content:"\f090"}.fa-trophy:before{content:"\f091"}.fa-github-square:before{content:"\f092"}.fa-upload:before{content:"\f093"}.fa-lemon-o:before{content:"\f094"}.fa-phone:before{content:"\f095"}.fa-square-o:before{content:"\f096"}.fa-bookmark-o:before{content:"\f097"}.fa-phone-square:before{content:"\f098"}.fa-twitter:before{content:"\f099"}.fa-facebook-f:before,.fa-facebook:before{content:"\f09a"}.fa-github:before{content:"\f09b"}.fa-unlock:before{content:"\f09c"}.fa-credit-card:before{content:"\f09d"}.fa-feed:before,.fa-rss:before{content:"\f09e"}.fa-hdd-o:before{content:"\f0a0"}.fa-bullhorn:before{content:"\f0a1"}.fa-bell:before{content:"\f0f3"}.fa-certificate:before{content:"\f0a3"}.fa-hand-o-right:before{content:"\f0a4"}.fa-hand-o-left:before{content:"\f0a5"}.fa-hand-o-up:before{content:"\f0a6"}.fa-hand-o-down:before{content:"\f0a7"}.fa-arrow-circle-left:before{content:"\f0a8"}.fa-arrow-circle-right:before{content:"\f0a9"}.fa-arrow-circle-up:before{content:"\f0aa"}.fa-arrow-circle-down:before{content:"\f0ab"}.fa-globe:before{content:"\f0ac"}.fa-wrench:before{content:"\f0ad"}.fa-tasks:before{content:"\f0ae"}.fa-filter:before{content:"\f0b0"}.fa-briefcase:before{content:"\f0b1"}.fa-arrows-alt:before{content:"\f0b2"}.fa-group:before,.fa-users:before{content:"\f0c0"}.fa-chain:before,.fa-link:before{content:"\f0c1"}.fa-cloud:before{content:"\f0c2"}.fa-flask:before{content:"\f0c3"}.fa-cut:before,.fa-scissors:before{content:"\f0c4"}.fa-copy:before,.fa-files-o:before{content:"\f0c5"}.fa-paperclip:before{content:"\f0c6"}.fa-save:before,.fa-floppy-o:before{content:"\f0c7"}.fa-square:before{content:"\f0c8"}.fa-navicon:before,.fa-reorder:before,.fa-bars:before{content:"\f0c9"}.fa-list-ul:before{content:"\f0ca"}.fa-list-ol:before{content:"\f0cb"}.fa-strikethrough:before{content:"\f0cc"}.fa-underline:before{content:"\f0cd"}.fa-table:before{content:"\f0ce"}.fa-magic:before{content:"\f0d0"}.fa-truck:before{content:"\f0d1"}.fa-pinterest:before{content:"\f0d2"}.fa-pinterest-square:before{content:"\f0d3"}.fa-google-plus-square:before{content:"\f0d4"}.fa-google-plus:before{content:"\f0d5"}.fa-money:before{content:"\f0d6"}.fa-caret-down:before{content:"\f0d7"}.fa-caret-up:before{content:"\f0d8"}.fa-caret-left:before{content:"\f0d9"}.fa-caret-right:before{content:"\f0da"}.fa-columns:before{content:"\f0db"}.fa-unsorted:before,.fa-sort:before{content:"\f0dc"}.fa-sort-down:before,.fa-sort-desc:before{content:"\f0dd"}.fa-sort-up:before,.fa-sort-asc:before{content:"\f0de"}.fa-envelope:before{content:"\f0e0"}.fa-linkedin:before{content:"\f0e1"}.fa-rotate-left:before,.fa-undo:before{content:"\f0e2"}.fa-legal:before,.fa-gavel:before{content:"\f0e3"}.fa-dashboard:before,.fa-tachometer:before{content:"\f0e4"}.fa-comment-o:before{content:"\f0e5"}.fa-comments-o:before{content:"\f0e6"}.fa-flash:before,.fa-bolt:before{content:"\f0e7"}.fa-sitemap:before{content:"\f0e8"}.fa-umbrella:before{content:"\f0e9"}.fa-paste:before,.fa-clipboard:before{content:"\f0ea"}.fa-lightbulb-o:before{content:"\f0eb"}.fa-exchange:before{content:"\f0ec"}.fa-cloud-download:before{content:"\f0ed"}.fa-cloud-upload:before{content:"\f0ee"}.fa-user-md:before{content:"\f0f0"}.fa-stethoscope:before{content:"\f0f1"}.fa-suitcase:before{content:"\f0f2"}.fa-bell-o:before{content:"\f0a2"}.fa-coffee:before{content:"\f0f4"}.fa-cutlery:before{content:"\f0f5"}.fa-file-text-o:before{content:"\f0f6"}.fa-building-o:before{content:"\f0f7"}.fa-hospital-o:before{content:"\f0f8"}.fa-ambulance:before{content:"\f0f9"}.fa-medkit:before{content:"\f0fa"}.fa-fighter-jet:before{content:"\f0fb"}.fa-beer:before{content:"\f0fc"}.fa-h-square:before{content:"\f0fd"}.fa-plus-square:before{content:"\f0fe"}.fa-angle-double-left:before{content:"\f100"}.fa-angle-double-right:before{content:"\f101"}.fa-angle-double-up:before{content:"\f102"}.fa-angle-double-down:before{content:"\f103"}.fa-angle-left:before{content:"\f104"}.fa-angle-right:before{content:"\f105"}.fa-angle-up:before{content:"\f106"}.fa-angle-down:before{content:"\f107"}.fa-desktop:before{content:"\f108"}.fa-laptop:before{content:"\f109"}.fa-tablet:before{content:"\f10a"}.fa-mobile-phone:before,.fa-mobile:before{content:"\f10b"}.fa-circle-o:before{content:"\f10c"}.fa-quote-left:before{content:"\f10d"}.fa-quote-right:before{content:"\f10e"}.fa-spinner:before{content:"\f110"}.fa-circle:before{content:"\f111"}.fa-mail-reply:before,.fa-reply:before{content:"\f112"}.fa-github-alt:before{content:"\f113"}.fa-folder-o:before{content:"\f114"}.fa-folder-open-o:before{content:"\f115"}.fa-smile-o:before{content:"\f118"}.fa-frown-o:before{content:"\f119"}.fa-meh-o:before{content:"\f11a"}.fa-gamepad:before{content:"\f11b"}.fa-keyboard-o:before{content:"\f11c"}.fa-flag-o:before{content:"\f11d"}.fa-flag-checkered:before{content:"\f11e"}.fa-terminal:before{content:"\f120"}.fa-code:before{content:"\f121"}.fa-mail-reply-all:before,.fa-reply-all:before{content:"\f122"}.fa-star-half-empty:before,.fa-star-half-full:before,.fa-star-half-o:before{content:"\f123"}.fa-location-arrow:before{content:"\f124"}.fa-crop:before{content:"\f125"}.fa-code-fork:before{content:"\f126"}.fa-unlink:before,.fa-chain-broken:before{content:"\f127"}.fa-question:before{content:"\f128"}.fa-info:before{content:"\f129"}.fa-exclamation:before{content:"\f12a"}.fa-superscript:before{content:"\f12b"}.fa-subscript:before{content:"\f12c"}.fa-eraser:before{content:"\f12d"}.fa-puzzle-piece:before{content:"\f12e"}.fa-microphone:before{content:"\f130"}.fa-microphone-slash:before{content:"\f131"}.fa-shield:before{content:"\f132"}.fa-calendar-o:before{content:"\f133"}.fa-fire-extinguisher:before{content:"\f134"}.fa-rocket:before{content:"\f135"}.fa-maxcdn:before{content:"\f136"}.fa-chevron-circle-left:before{content:"\f137"}.fa-chevron-circle-right:before{content:"\f138"}.fa-chevron-circle-up:before{content:"\f139"}.fa-chevron-circle-down:before{content:"\f13a"}.fa-html5:before{content:"\f13b"}.fa-css3:before{content:"\f13c"}.fa-anchor:before{content:"\f13d"}.fa-unlock-alt:before{content:"\f13e"}.fa-bullseye:before{content:"\f140"}.fa-ellipsis-h:before{content:"\f141"}.fa-ellipsis-v:before{content:"\f142"}.fa-rss-square:before{content:"\f143"}.fa-play-circle:before{content:"\f144"}.fa-ticket:before{content:"\f145"}.fa-minus-square:before{content:"\f146"}.fa-minus-square-o:before{content:"\f147"}.fa-level-up:before{content:"\f148"}.fa-level-down:before{content:"\f149"}.fa-check-square:before{content:"\f14a"}.fa-pencil-square:before{content:"\f14b"}.fa-external-link-square:before{content:"\f14c"}.fa-share-square:before{content:"\f14d"}.fa-compass:before{content:"\f14e"}.fa-toggle-down:before,.fa-caret-square-o-down:before{content:"\f150"}.fa-toggle-up:before,.fa-caret-square-o-up:before{content:"\f151"}.fa-toggle-right:before,.fa-caret-square-o-right:before{content:"\f152"}.fa-euro:before,.fa-eur:before{content:"\f153"}.fa-gbp:before{content:"\f154"}.fa-dollar:before,.fa-usd:before{content:"\f155"}.fa-rupee:before,.fa-inr:before{content:"\f156"}.fa-cny:before,.fa-rmb:before,.fa-yen:before,.fa-jpy:before{content:"\f157"}.fa-ruble:before,.fa-rouble:before,.fa-rub:before{content:"\f158"}.fa-won:before,.fa-krw:before{content:"\f159"}.fa-bitcoin:before,.fa-btc:before{content:"\f15a"}.fa-file:before{content:"\f15b"}.fa-file-text:before{content:"\f15c"}.fa-sort-alpha-asc:before{content:"\f15d"}.fa-sort-alpha-desc:before{content:"\f15e"}.fa-sort-amount-asc:before{content:"\f160"}.fa-sort-amount-desc:before{content:"\f161"}.fa-sort-numeric-asc:before{content:"\f162"}.fa-sort-numeric-desc:before{content:"\f163"}.fa-thumbs-up:before{content:"\f164"}.fa-thumbs-down:before{content:"\f165"}.fa-youtube-square:before{content:"\f166"}.fa-youtube:before{content:"\f167"}.fa-xing:before{content:"\f168"}.fa-xing-square:before{content:"\f169"}.fa-youtube-play:before{content:"\f16a"}.fa-dropbox:before{content:"\f16b"}.fa-stack-overflow:before{content:"\f16c"}.fa-instagram:before{content:"\f16d"}.fa-flickr:before{content:"\f16e"}.fa-adn:before{content:"\f170"}.fa-bitbucket:before{content:"\f171"}.fa-bitbucket-square:before{content:"\f172"}.fa-tumblr:before{content:"\f173"}.fa-tumblr-square:before{content:"\f174"}.fa-long-arrow-down:before{content:"\f175"}.fa-long-arrow-up:before{content:"\f176"}.fa-long-arrow-left:before{content:"\f177"}.fa-long-arrow-right:before{content:"\f178"}.fa-apple:before{content:"\f179"}.fa-windows:before{content:"\f17a"}.fa-android:before{content:"\f17b"}.fa-linux:before{content:"\f17c"}.fa-dribbble:before{content:"\f17d"}.fa-skype:before{content:"\f17e"}.fa-foursquare:before{content:"\f180"}.fa-trello:before{content:"\f181"}.fa-female:before{content:"\f182"}.fa-male:before{content:"\f183"}.fa-gittip:before,.fa-gratipay:before{content:"\f184"}.fa-sun-o:before{content:"\f185"}.fa-moon-o:before{content:"\f186"}.fa-archive:before{content:"\f187"}.fa-bug:before{content:"\f188"}.fa-vk:before{content:"\f189"}.fa-weibo:before{content:"\f18a"}.fa-renren:before{content:"\f18b"}.fa-pagelines:before{content:"\f18c"}.fa-stack-exchange:before{content:"\f18d"}.fa-arrow-circle-o-right:before{content:"\f18e"}.fa-arrow-circle-o-left:before{content:"\f190"}.fa-toggle-left:before,.fa-caret-square-o-left:before{content:"\f191"}.fa-dot-circle-o:before{content:"\f192"}.fa-wheelchair:before{content:"\f193"}.fa-vimeo-square:before{content:"\f194"}.fa-turkish-lira:before,.fa-try:before{content:"\f195"}.fa-plus-square-o:before{content:"\f196"}.fa-space-shuttle:before{content:"\f197"}.fa-slack:before{content:"\f198"}.fa-envelope-square:before{content:"\f199"}.fa-wordpress:before{content:"\f19a"}.fa-openid:before{content:"\f19b"}.fa-institution:before,.fa-bank:before,.fa-university:before{content:"\f19c"}.fa-mortar-board:before,.fa-graduation-cap:before{content:"\f19d"}.fa-yahoo:before{content:"\f19e"}.fa-google:before{content:"\f1a0"}.fa-reddit:before{content:"\f1a1"}.fa-reddit-square:before{content:"\f1a2"}.fa-stumbleupon-circle:before{content:"\f1a3"}.fa-stumbleupon:before{content:"\f1a4"}.fa-delicious:before{content:"\f1a5"}.fa-digg:before{content:"\f1a6"}.fa-pied-piper-pp:before{content:"\f1a7"}.fa-pied-piper-alt:before{content:"\f1a8"}.fa-drupal:before{content:"\f1a9"}.fa-joomla:before{content:"\f1aa"}.fa-language:before{content:"\f1ab"}.fa-fax:before{content:"\f1ac"}.fa-building:before{content:"\f1ad"}.fa-child:before{content:"\f1ae"}.fa-paw:before{content:"\f1b0"}.fa-spoon:before{content:"\f1b1"}.fa-cube:before{content:"\f1b2"}.fa-cubes:before{content:"\f1b3"}.fa-behance:before{content:"\f1b4"}.fa-behance-square:before{content:"\f1b5"}.fa-steam:before{content:"\f1b6"}.fa-steam-square:before{content:"\f1b7"}.fa-recycle:before{content:"\f1b8"}.fa-automobile:before,.fa-car:before{content:"\f1b9"}.fa-cab:before,.fa-taxi:before{content:"\f1ba"}.fa-tree:before{content:"\f1bb"}.fa-spotify:before{content:"\f1bc"}.fa-deviantart:before{content:"\f1bd"}.fa-soundcloud:before{content:"\f1be"}.fa-database:before{content:"\f1c0"}.fa-file-pdf-o:before{content:"\f1c1"}.fa-file-word-o:before{content:"\f1c2"}.fa-file-excel-o:before{content:"\f1c3"}.fa-file-powerpoint-o:before{content:"\f1c4"}.fa-file-photo-o:before,.fa-file-picture-o:before,.fa-file-image-o:before{content:"\f1c5"}.fa-file-zip-o:before,.fa-file-archive-o:before{content:"\f1c6"}.fa-file-sound-o:before,.fa-file-audio-o:before{content:"\f1c7"}.fa-file-movie-o:before,.fa-file-video-o:before{content:"\f1c8"}.fa-file-code-o:before{content:"\f1c9"}.fa-vine:before{content:"\f1ca"}.fa-codepen:before{content:"\f1cb"}.fa-jsfiddle:before{content:"\f1cc"}.fa-life-bouy:before,.fa-life-buoy:before,.fa-life-saver:before,.fa-support:before,.fa-life-ring:before{content:"\f1cd"}.fa-circle-o-notch:before{content:"\f1ce"}.fa-ra:before,.fa-resistance:before,.fa-rebel:before{content:"\f1d0"}.fa-ge:before,.fa-empire:before{content:"\f1d1"}.fa-git-square:before{content:"\f1d2"}.fa-git:before{content:"\f1d3"}.fa-y-combinator-square:before,.fa-yc-square:before,.fa-hacker-news:before{content:"\f1d4"}.fa-tencent-weibo:before{content:"\f1d5"}.fa-qq:before{content:"\f1d6"}.fa-wechat:before,.fa-weixin:before{content:"\f1d7"}.fa-send:before,.fa-paper-plane:before{content:"\f1d8"}.fa-send-o:before,.fa-paper-plane-o:before{content:"\f1d9"}.fa-history:before{content:"\f1da"}.fa-circle-thin:before{content:"\f1db"}.fa-header:before{content:"\f1dc"}.fa-paragraph:before{content:"\f1dd"}.fa-sliders:before{content:"\f1de"}.fa-share-alt:before{content:"\f1e0"}.fa-share-alt-square:before{content:"\f1e1"}.fa-bomb:before{content:"\f1e2"}.fa-soccer-ball-o:before,.fa-futbol-o:before{content:"\f1e3"}.fa-tty:before{content:"\f1e4"}.fa-binoculars:before{content:"\f1e5"}.fa-plug:before{content:"\f1e6"}.fa-slideshare:before{content:"\f1e7"}.fa-twitch:before{content:"\f1e8"}.fa-yelp:before{content:"\f1e9"}.fa-newspaper-o:before{content:"\f1ea"}.fa-wifi:before{content:"\f1eb"}.fa-calculator:before{content:"\f1ec"}.fa-paypal:before{content:"\f1ed"}.fa-google-wallet:before{content:"\f1ee"}.fa-cc-visa:before{content:"\f1f0"}.fa-cc-mastercard:before{content:"\f1f1"}.fa-cc-discover:before{content:"\f1f2"}.fa-cc-amex:before{content:"\f1f3"}.fa-cc-paypal:before{content:"\f1f4"}.fa-cc-stripe:before{content:"\f1f5"}.fa-bell-slash:before{content:"\f1f6"}.fa-bell-slash-o:before{content:"\f1f7"}.fa-trash:before{content:"\f1f8"}.fa-copyright:before{content:"\f1f9"}.fa-at:before{content:"\f1fa"}.fa-eyedropper:before{content:"\f1fb"}.fa-paint-brush:before{content:"\f1fc"}.fa-birthday-cake:before{content:"\f1fd"}.fa-area-chart:before{content:"\f1fe"}.fa-pie-chart:before{content:"\f200"}.fa-line-chart:before{content:"\f201"}.fa-lastfm:before{content:"\f202"}.fa-lastfm-square:before{content:"\f203"}.fa-toggle-off:before{content:"\f204"}.fa-toggle-on:before{content:"\f205"}.fa-bicycle:before{content:"\f206"}.fa-bus:before{content:"\f207"}.fa-ioxhost:before{content:"\f208"}.fa-angellist:before{content:"\f209"}.fa-cc:before{content:"\f20a"}.fa-shekel:before,.fa-sheqel:before,.fa-ils:before{content:"\f20b"}.fa-meanpath:before{content:"\f20c"}.fa-buysellads:before{content:"\f20d"}.fa-connectdevelop:before{content:"\f20e"}.fa-dashcube:before{content:"\f210"}.fa-forumbee:before{content:"\f211"}.fa-leanpub:before{content:"\f212"}.fa-sellsy:before{content:"\f213"}.fa-shirtsinbulk:before{content:"\f214"}.fa-simplybuilt:before{content:"\f215"}.fa-skyatlas:before{content:"\f216"}.fa-cart-plus:before{content:"\f217"}.fa-cart-arrow-down:before{content:"\f218"}.fa-diamond:before{content:"\f219"}.fa-ship:before{content:"\f21a"}.fa-user-secret:before{content:"\f21b"}.fa-motorcycle:before{content:"\f21c"}.fa-street-view:before{content:"\f21d"}.fa-heartbeat:before{content:"\f21e"}.fa-venus:before{content:"\f221"}.fa-mars:before{content:"\f222"}.fa-mercury:before{content:"\f223"}.fa-intersex:before,.fa-transgender:before{content:"\f224"}.fa-transgender-alt:before{content:"\f225"}.fa-venus-double:before{content:"\f226"}.fa-mars-double:before{content:"\f227"}.fa-venus-mars:before{content:"\f228"}.fa-mars-stroke:before{content:"\f229"}.fa-mars-stroke-v:before{content:"\f22a"}.fa-mars-stroke-h:before{content:"\f22b"}.fa-neuter:before{content:"\f22c"}.fa-genderless:before{content:"\f22d"}.fa-facebook-official:before{content:"\f230"}.fa-pinterest-p:before{content:"\f231"}.fa-whatsapp:before{content:"\f232"}.fa-server:before{content:"\f233"}.fa-user-plus:before{content:"\f234"}.fa-user-times:before{content:"\f235"}.fa-hotel:before,.fa-bed:before{content:"\f236"}.fa-viacoin:before{content:"\f237"}.fa-train:before{content:"\f238"}.fa-subway:before{content:"\f239"}.fa-medium:before{content:"\f23a"}.fa-yc:before,.fa-y-combinator:before{content:"\f23b"}.fa-optin-monster:before{content:"\f23c"}.fa-opencart:before{content:"\f23d"}.fa-expeditedssl:before{content:"\f23e"}.fa-battery-4:before,.fa-battery:before,.fa-battery-full:before{content:"\f240"}.fa-battery-3:before,.fa-battery-three-quarters:before{content:"\f241"}.fa-battery-2:before,.fa-battery-half:before{content:"\f242"}.fa-battery-1:before,.fa-battery-quarter:before{content:"\f243"}.fa-battery-0:before,.fa-battery-empty:before{content:"\f244"}.fa-mouse-pointer:before{content:"\f245"}.fa-i-cursor:before{content:"\f246"}.fa-object-group:before{content:"\f247"}.fa-object-ungroup:before{content:"\f248"}.fa-sticky-note:before{content:"\f249"}.fa-sticky-note-o:before{content:"\f24a"}.fa-cc-jcb:before{content:"\f24b"}.fa-cc-diners-club:before{content:"\f24c"}.fa-clone:before{content:"\f24d"}.fa-balance-scale:before{content:"\f24e"}.fa-hourglass-o:before{content:"\f250"}.fa-hourglass-1:before,.fa-hourglass-start:before{content:"\f251"}.fa-hourglass-2:before,.fa-hourglass-half:before{content:"\f252"}.fa-hourglass-3:before,.fa-hourglass-end:before{content:"\f253"}.fa-hourglass:before{content:"\f254"}.fa-hand-grab-o:before,.fa-hand-rock-o:before{content:"\f255"}.fa-hand-stop-o:before,.fa-hand-paper-o:before{content:"\f256"}.fa-hand-scissors-o:before{content:"\f257"}.fa-hand-lizard-o:before{content:"\f258"}.fa-hand-spock-o:before{content:"\f259"}.fa-hand-pointer-o:before{content:"\f25a"}.fa-hand-peace-o:before{content:"\f25b"}.fa-trademark:before{content:"\f25c"}.fa-registered:before{content:"\f25d"}.fa-creative-commons:before{content:"\f25e"}.fa-gg:before{content:"\f260"}.fa-gg-circle:before{content:"\f261"}.fa-tripadvisor:before{content:"\f262"}.fa-odnoklassniki:before{content:"\f263"}.fa-odnoklassniki-square:before{content:"\f264"}.fa-get-pocket:before{content:"\f265"}.fa-wikipedia-w:before{content:"\f266"}.fa-safari:before{content:"\f267"}.fa-chrome:before{content:"\f268"}.fa-firefox:before{content:"\f269"}.fa-opera:before{content:"\f26a"}.fa-internet-explorer:before{content:"\f26b"}.fa-tv:before,.fa-television:before{content:"\f26c"}.fa-contao:before{content:"\f26d"}.fa-500px:before{content:"\f26e"}.fa-amazon:before{content:"\f270"}.fa-calendar-plus-o:before{content:"\f271"}.fa-calendar-minus-o:before{content:"\f272"}.fa-calendar-times-o:before{content:"\f273"}.fa-calendar-check-o:before{content:"\f274"}.fa-industry:before{content:"\f275"}.fa-map-pin:before{content:"\f276"}.fa-map-signs:before{content:"\f277"}.fa-map-o:before{content:"\f278"}.fa-map:before{content:"\f279"}.fa-commenting:before{content:"\f27a"}.fa-commenting-o:before{content:"\f27b"}.fa-houzz:before{content:"\f27c"}.fa-vimeo:before{content:"\f27d"}.fa-black-tie:before{content:"\f27e"}.fa-fonticons:before{content:"\f280"}.fa-reddit-alien:before{content:"\f281"}.fa-edge:before{content:"\f282"}.fa-credit-card-alt:before{content:"\f283"}.fa-codiepie:before{content:"\f284"}.fa-modx:before{content:"\f285"}.fa-fort-awesome:before{content:"\f286"}.fa-usb:before{content:"\f287"}.fa-product-hunt:before{content:"\f288"}.fa-mixcloud:before{content:"\f289"}.fa-scribd:before{content:"\f28a"}.fa-pause-circle:before{content:"\f28b"}.fa-pause-circle-o:before{content:"\f28c"}.fa-stop-circle:before{content:"\f28d"}.fa-stop-circle-o:before{content:"\f28e"}.fa-shopping-bag:before{content:"\f290"}.fa-shopping-basket:before{content:"\f291"}.fa-hashtag:before{content:"\f292"}.fa-bluetooth:before{content:"\f293"}.fa-bluetooth-b:before{content:"\f294"}.fa-percent:before{content:"\f295"}.fa-gitlab:before{content:"\f296"}.fa-wpbeginner:before{content:"\f297"}.fa-wpforms:before{content:"\f298"}.fa-envira:before{content:"\f299"}.fa-universal-access:before{content:"\f29a"}.fa-wheelchair-alt:before{content:"\f29b"}.fa-question-circle-o:before{content:"\f29c"}.fa-blind:before{content:"\f29d"}.fa-audio-description:before{content:"\f29e"}.fa-volume-control-phone:before{content:"\f2a0"}.fa-braille:before{content:"\f2a1"}.fa-assistive-listening-systems:before{content:"\f2a2"}.fa-asl-interpreting:before,.fa-american-sign-language-interpreting:before{content:"\f2a3"}.fa-deafness:before,.fa-hard-of-hearing:before,.fa-deaf:before{content:"\f2a4"}.fa-glide:before{content:"\f2a5"}.fa-glide-g:before{content:"\f2a6"}.fa-signing:before,.fa-sign-language:before{content:"\f2a7"}.fa-low-vision:before{content:"\f2a8"}.fa-viadeo:before{content:"\f2a9"}.fa-viadeo-square:before{content:"\f2aa"}.fa-snapchat:before{content:"\f2ab"}.fa-snapchat-ghost:before{content:"\f2ac"}.fa-snapchat-square:before{content:"\f2ad"}.fa-pied-piper:before{content:"\f2ae"}.fa-first-order:before{content:"\f2b0"}.fa-yoast:before{content:"\f2b1"}.fa-themeisle:before{content:"\f2b2"}.fa-google-plus-circle:before,.fa-google-plus-official:before{content:"\f2b3"}.fa-fa:before,.fa-font-awesome:before{content:"\f2b4"}.fa-handshake-o:before{content:"\f2b5"}.fa-envelope-open:before{content:"\f2b6"}.fa-envelope-open-o:before{content:"\f2b7"}.fa-linode:before{content:"\f2b8"}.fa-address-book:before{content:"\f2b9"}.fa-address-book-o:before{content:"\f2ba"}.fa-vcard:before,.fa-address-card:before{content:"\f2bb"}.fa-vcard-o:before,.fa-address-card-o:before{content:"\f2bc"}.fa-user-circle:before{content:"\f2bd"}.fa-user-circle-o:before{content:"\f2be"}.fa-user-o:before{content:"\f2c0"}.fa-id-badge:before{content:"\f2c1"}.fa-drivers-license:before,.fa-id-card:before{content:"\f2c2"}.fa-drivers-license-o:before,.fa-id-card-o:before{content:"\f2c3"}.fa-quora:before{content:"\f2c4"}.fa-free-code-camp:before{content:"\f2c5"}.fa-telegram:before{content:"\f2c6"}.fa-thermometer-4:before,.fa-thermometer:before,.fa-thermometer-full:before{content:"\f2c7"}.fa-thermometer-3:before,.fa-thermometer-three-quarters:before{content:"\f2c8"}.fa-thermometer-2:before,.fa-thermometer-half:before{content:"\f2c9"}.fa-thermometer-1:before,.fa-thermometer-quarter:before{content:"\f2ca"}.fa-thermometer-0:before,.fa-thermometer-empty:before{content:"\f2cb"}.fa-shower:before{content:"\f2cc"}.fa-bathtub:before,.fa-s15:before,.fa-bath:before{content:"\f2cd"}.fa-podcast:before{content:"\f2ce"}.fa-window-maximize:before{content:"\f2d0"}.fa-window-minimize:before{content:"\f2d1"}.fa-window-restore:before{content:"\f2d2"}.fa-times-rectangle:before,.fa-window-close:before{content:"\f2d3"}.fa-times-rectangle-o:before,.fa-window-close-o:before{content:"\f2d4"}.fa-bandcamp:before{content:"\f2d5"}.fa-grav:before{content:"\f2d6"}.fa-etsy:before{content:"\f2d7"}.fa-imdb:before{content:"\f2d8"}.fa-ravelry:before{content:"\f2d9"}.fa-eercast:before{content:"\f2da"}.fa-microchip:before{content:"\f2db"}.fa-snowflake-o:before{content:"\f2dc"}.fa-superpowers:before{content:"\f2dd"}.fa-wpexplorer:before{content:"\f2de"}.fa-meetup:before{content:"\f2e0"}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0, 0, 0, 0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/css/jquery.mCustomScrollbar.css b/pluss-manage-page/src/main/resources/static/resources/auth/css/jquery.mCustomScrollbar.css
new file mode 100644
index 0000000..515d469
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/css/jquery.mCustomScrollbar.css
@@ -0,0 +1,468 @@
+/* basic scrollbar styling */
+/* vertical scrollbar */
+.mCSB_container{
+	width:auto;
+}
+.mCSB_container.mCS_no_scrollbar{
+	margin-right:0;
+}
+.mCS_disabled>.mCustomScrollBox>.mCSB_container.mCS_no_scrollbar,
+.mCS_destroyed>.mCustomScrollBox>.mCSB_container.mCS_no_scrollbar{
+	margin-right:30px;
+}
+.mCustomScrollBox>.mCSB_scrollTools{
+	width:16px;
+	height:100%;
+	top:0;
+	right:0;
+}
+.mCSB_scrollTools .mCSB_draggerContainer{
+	position:absolute;
+	top:0;
+	left:0;
+	bottom:0;
+	right:0; 
+	height:auto;
+}
+.mCSB_scrollTools a+.mCSB_draggerContainer{
+	margin:20px 0;
+}
+.mCSB_scrollTools .mCSB_draggerRail{
+	width:2px;
+	height:100%;
+	margin:0 auto;
+	-webkit-border-radius:10px;
+	-moz-border-radius:10px;
+	border-radius:10px;
+}
+.mCSB_scrollTools .mCSB_dragger{
+	cursor:pointer;
+	width:100%;
+	height:30px;
+}
+.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{
+	width:4px;
+	height:100px;
+	margin:0 auto;
+	-webkit-border-radius:10px;
+	-moz-border-radius:10px;
+	border-radius:10px;
+	text-align:center;
+}
+.mCSB_scrollTools .mCSB_buttonUp,
+.mCSB_scrollTools .mCSB_buttonDown{
+	display:block;
+	position:relative;
+	height:20px;
+	margin:0 auto;
+	cursor:pointer;
+}
+.mCSB_scrollTools .mCSB_buttonDown{
+	top:100%;
+	margin-top:-40px;
+}
+/* horizontal scrollbar */
+.mCSB_horizontal>.mCSB_container{
+	height:auto;
+	margin-right:0;
+	margin-bottom:30px;
+}
+.mCSB_horizontal>.mCSB_container.mCS_no_scrollbar{
+	margin-bottom:0;
+}
+.mCS_disabled>.mCSB_horizontal>.mCSB_container.mCS_no_scrollbar,
+.mCS_destroyed>.mCSB_horizontal>.mCSB_container.mCS_no_scrollbar{
+	margin-right:0;
+	margin-bottom:30px;
+}
+.mCSB_horizontal.mCustomScrollBox>.mCSB_scrollTools{
+	width:100%;
+	height:16px;
+	top:auto;
+	right:auto;
+	bottom:0;
+	left:0;
+}
+.mCSB_horizontal>.mCSB_scrollTools a+.mCSB_draggerContainer{
+	margin:0 20px;
+}
+.mCSB_horizontal>.mCSB_scrollTools .mCSB_draggerRail{
+	width:100%;
+	height:2px;
+	margin:7px 0;
+	-webkit-border-radius:10px;
+	-moz-border-radius:10px;
+	border-radius:10px;
+}
+.mCSB_horizontal>.mCSB_scrollTools .mCSB_dragger{
+	width:30px;
+	height:100%;
+}
+.mCSB_horizontal>.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{
+	width:100%;
+	height:4px;
+	margin:6px auto;
+	-webkit-border-radius:10px;
+	-moz-border-radius:10px;
+	border-radius:10px;
+}
+.mCSB_horizontal>.mCSB_scrollTools .mCSB_buttonLeft,
+.mCSB_horizontal>.mCSB_scrollTools .mCSB_buttonRight{
+	display:block;
+	position:relative;
+	width:20px;
+	height:100%;
+	margin:0 auto;
+	cursor:pointer;
+	float:left;
+}
+.mCSB_horizontal>.mCSB_scrollTools .mCSB_buttonRight{
+	margin-left:-40px;
+	float:right;
+}
+.mCustomScrollBox{
+	-ms-touch-action:none; /*MSPointer events - direct all pointer events to js*/
+}
+
+/* default scrollbar colors and backgrounds (default theme) */
+.mCustomScrollBox>.mCSB_scrollTools{
+	opacity:0.75;
+	filter:"alpha(opacity=75)"; -ms-filter:"alpha(opacity=75)"; /* old ie */
+}
+.mCustomScrollBox:hover>.mCSB_scrollTools{
+	opacity:1;
+	filter:"alpha(opacity=100)"; -ms-filter:"alpha(opacity=100)"; /* old ie */
+}
+.mCSB_scrollTools .mCSB_draggerRail{
+	background:#000; /* rgba fallback */
+	background:rgba(0,0,0,0.4);
+	filter:"alpha(opacity=40)"; -ms-filter:"alpha(opacity=40)"; /* old ie */
+}
+.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{
+	background:#fff; /* rgba fallback */
+	background:rgba(255,255,255,0.75);
+	filter:"alpha(opacity=75)"; -ms-filter:"alpha(opacity=75)"; /* old ie */
+}
+.mCSB_scrollTools .mCSB_dragger:hover .mCSB_dragger_bar{
+	background:rgba(255,255,255,0.85);
+	filter:"alpha(opacity=85)"; -ms-filter:"alpha(opacity=85)"; /* old ie */
+}
+.mCSB_scrollTools .mCSB_dragger:active .mCSB_dragger_bar,
+.mCSB_scrollTools .mCSB_dragger.mCSB_dragger_onDrag .mCSB_dragger_bar{
+	background:rgba(255,255,255,0.9);
+	filter:"alpha(opacity=90)"; -ms-filter:"alpha(opacity=90)"; /* old ie */
+}
+.mCSB_scrollTools .mCSB_buttonUp,
+.mCSB_scrollTools .mCSB_buttonDown,
+.mCSB_scrollTools .mCSB_buttonLeft,
+.mCSB_scrollTools .mCSB_buttonRight{
+	background-image:url(mCSB_buttons.png);
+	background-repeat:no-repeat;
+	opacity:0.4;
+	filter:"alpha(opacity=40)"; -ms-filter:"alpha(opacity=40)"; /* old ie */
+}
+.mCSB_scrollTools .mCSB_buttonUp{
+	background-position:0 0;
+	/* 
+	sprites locations are 0 0/-16px 0/-32px 0/-48px 0 (light) and -80px 0/-96px 0/-112px 0/-128px 0 (dark) 
+	*/
+}
+.mCSB_scrollTools .mCSB_buttonDown{
+	background-position:0 -20px;
+	/* 
+	sprites locations are 0 -20px/-16px -20px/-32px -20px/-48px -20px (light) and -80px -20px/-96px -20px/-112px -20px/-128px -20px (dark) 
+	*/
+}
+.mCSB_scrollTools .mCSB_buttonLeft{
+	background-position:0 -40px;
+	/* 
+	sprites locations are 0 -40px/-20px -40px/-40px -40px/-60px -40px (light) and -80px -40px/-100px -40px/-120px -40px/-140px -40px (dark) 
+	*/
+}
+.mCSB_scrollTools .mCSB_buttonRight{
+	background-position:0 -56px;
+	/* 
+	sprites locations are 0 -56px/-20px -56px/-40px -56px/-60px -56px (light) and -80px -56px/-100px -56px/-120px -56px/-140px -56px (dark) 
+	*/
+}
+.mCSB_scrollTools .mCSB_buttonUp:hover,
+.mCSB_scrollTools .mCSB_buttonDown:hover,
+.mCSB_scrollTools .mCSB_buttonLeft:hover,
+.mCSB_scrollTools .mCSB_buttonRight:hover{
+	opacity:0.75;
+	filter:"alpha(opacity=75)"; -ms-filter:"alpha(opacity=75)"; /* old ie */
+}
+.mCSB_scrollTools .mCSB_buttonUp:active,
+.mCSB_scrollTools .mCSB_buttonDown:active,
+.mCSB_scrollTools .mCSB_buttonLeft:active,
+.mCSB_scrollTools .mCSB_buttonRight:active{
+	opacity:0.9;
+	filter:"alpha(opacity=90)"; -ms-filter:"alpha(opacity=90)"; /* old ie */
+}
+
+/*scrollbar themes*/
+/*dark (dark colored scrollbar)*/
+.mCS-dark>.mCSB_scrollTools .mCSB_draggerRail{
+	background:#000; /* rgba fallback */
+	background:rgba(0,0,0,0.15);
+}
+.mCS-dark>.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{
+	background:#000; /* rgba fallback */
+	background:rgba(0,0,0,0.75);
+}
+.mCS-dark>.mCSB_scrollTools .mCSB_dragger:hover .mCSB_dragger_bar{
+	background:rgba(0,0,0,0.85);
+}
+.mCS-dark>.mCSB_scrollTools .mCSB_dragger:active .mCSB_dragger_bar,
+.mCS-dark>.mCSB_scrollTools .mCSB_dragger.mCSB_dragger_onDrag .mCSB_dragger_bar{
+	background:rgba(0,0,0,0.9);
+}
+.mCS-dark>.mCSB_scrollTools .mCSB_buttonUp{
+	background-position:-80px 0;
+}
+.mCS-dark>.mCSB_scrollTools .mCSB_buttonDown{
+	background-position:-80px -20px;
+}
+.mCS-dark>.mCSB_scrollTools .mCSB_buttonLeft{
+	background-position:-80px -40px;
+}
+.mCS-dark>.mCSB_scrollTools .mCSB_buttonRight{
+	background-position:-80px -56px;
+}
+/*light-2*/
+.mCS-light-2>.mCSB_scrollTools .mCSB_draggerRail{
+	width:4px;
+	background:#fff; /* rgba fallback */
+	background:rgba(255,255,255,0.1);
+	-webkit-border-radius:1px;
+	-moz-border-radius:1px;
+	border-radius:1px;
+}
+.mCS-light-2>.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{
+	width:4px;
+	background:#fff; /* rgba fallback */
+	background:rgba(255,255,255,0.75);
+	-webkit-border-radius:1px;
+	-moz-border-radius:1px;
+	border-radius:1px;
+}
+.mCS-light-2.mCSB_horizontal>.mCSB_scrollTools .mCSB_draggerRail{
+	width:100%;
+	height:4px;
+	margin:6px 0;
+}
+.mCS-light-2.mCSB_horizontal>.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{
+	width:100%;
+	height:4px;
+	margin:6px auto;
+}
+.mCS-light-2>.mCSB_scrollTools .mCSB_dragger:hover .mCSB_dragger_bar{
+	background:rgba(255,255,255,0.85);
+}
+.mCS-light-2>.mCSB_scrollTools .mCSB_dragger:active .mCSB_dragger_bar,
+.mCS-light-2>.mCSB_scrollTools .mCSB_dragger.mCSB_dragger_onDrag .mCSB_dragger_bar{
+	background:rgba(255,255,255,0.9);
+}
+.mCS-light-2>.mCSB_scrollTools .mCSB_buttonUp{
+	background-position:-32px 0;
+}
+.mCS-light-2>.mCSB_scrollTools .mCSB_buttonDown{
+	background-position:-32px -20px;
+}
+.mCS-light-2>.mCSB_scrollTools .mCSB_buttonLeft{
+	background-position:-40px -40px;
+}
+.mCS-light-2>.mCSB_scrollTools .mCSB_buttonRight{
+	background-position:-40px -56px;
+}
+/*dark-2*/
+.mCS-dark-2>.mCSB_scrollTools .mCSB_draggerRail{
+	width:4px;
+	background:#000; /* rgba fallback */
+	background:rgba(0,0,0,0.1);
+	-webkit-border-radius:1px;
+	-moz-border-radius:1px;
+	border-radius:1px;
+}
+.mCS-dark-2>.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{
+	width:4px;
+	background:#000; /* rgba fallback */
+	background:rgba(0,0,0,0.75);
+	-webkit-border-radius:1px;
+	-moz-border-radius:1px;
+	border-radius:1px;
+}
+.mCS-dark-2.mCSB_horizontal>.mCSB_scrollTools .mCSB_draggerRail{
+	width:100%;
+	height:4px;
+	margin:6px 0;
+}
+.mCS-dark-2.mCSB_horizontal>.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{
+	width:100%;
+	height:4px;
+	margin:6px auto;
+}
+.mCS-dark-2>.mCSB_scrollTools .mCSB_dragger:hover .mCSB_dragger_bar{
+	background:rgba(0,0,0,0.85);
+}
+.mCS-dark-2>.mCSB_scrollTools .mCSB_dragger:active .mCSB_dragger_bar,
+.mCS-dark-2>.mCSB_scrollTools .mCSB_dragger.mCSB_dragger_onDrag .mCSB_dragger_bar{
+	background:rgba(0,0,0,0.9);
+}
+.mCS-dark-2>.mCSB_scrollTools .mCSB_buttonUp{
+	background-position:-112px 0;
+}
+.mCS-dark-2>.mCSB_scrollTools .mCSB_buttonDown{
+	background-position:-112px -20px;
+}
+.mCS-dark-2>.mCSB_scrollTools .mCSB_buttonLeft{
+	background-position:-120px -40px;
+}
+.mCS-dark-2>.mCSB_scrollTools .mCSB_buttonRight{
+	background-position:-120px -56px;
+}
+/*light-thick*/
+.mCS-light-thick>.mCSB_scrollTools .mCSB_draggerRail{
+	width:4px;
+	background:#fff; /* rgba fallback */
+	background:rgba(255,255,255,0.1);
+	-webkit-border-radius:2px;
+	-moz-border-radius:2px;
+	border-radius:2px;
+}
+.mCS-light-thick>.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{
+	width:6px;
+	background:#fff; /* rgba fallback */
+	background:rgba(255,255,255,0.75);
+	-webkit-border-radius:2px;
+	-moz-border-radius:2px;
+	border-radius:2px;
+}
+.mCS-light-thick.mCSB_horizontal>.mCSB_scrollTools .mCSB_draggerRail{
+	width:100%;
+	height:4px;
+	margin:6px 0;
+}
+.mCS-light-thick.mCSB_horizontal>.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{
+	width:100%;
+	height:6px;
+	margin:5px auto;
+}
+.mCS-light-thick>.mCSB_scrollTools .mCSB_dragger:hover .mCSB_dragger_bar{
+	background:rgba(255,255,255,0.85);
+}
+.mCS-light-thick>.mCSB_scrollTools .mCSB_dragger:active .mCSB_dragger_bar,
+.mCS-light-thick>.mCSB_scrollTools .mCSB_dragger.mCSB_dragger_onDrag .mCSB_dragger_bar{
+	background:rgba(255,255,255,0.9);
+}
+.mCS-light-thick>.mCSB_scrollTools .mCSB_buttonUp{
+	background-position:-16px 0;
+}
+.mCS-light-thick>.mCSB_scrollTools .mCSB_buttonDown{
+	background-position:-16px -20px;
+}
+.mCS-light-thick>.mCSB_scrollTools .mCSB_buttonLeft{
+	background-position:-20px -40px;
+}
+.mCS-light-thick>.mCSB_scrollTools .mCSB_buttonRight{
+	background-position:-20px -56px;
+}
+/*dark-thick*/
+.mCS-dark-thick>.mCSB_scrollTools .mCSB_draggerRail{
+	width:4px;
+	background:#000; /* rgba fallback */
+	background:rgba(0,0,0,0.1);
+	-webkit-border-radius:2px;
+	-moz-border-radius:2px;
+	border-radius:2px;
+}
+.mCS-dark-thick>.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{
+	width:6px;
+	background:#000; /* rgba fallback */
+	background:rgba(0,0,0,0.75);
+	-webkit-border-radius:2px;
+	-moz-border-radius:2px;
+	border-radius:2px;
+}
+.mCS-dark-thick.mCSB_horizontal>.mCSB_scrollTools .mCSB_draggerRail{
+	width:100%;
+	height:4px;
+	margin:6px 0;
+}
+.mCS-dark-thick.mCSB_horizontal>.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{
+	width:100%;
+	height:6px;
+	margin:5px auto;
+}
+.mCS-dark-thick>.mCSB_scrollTools .mCSB_dragger:hover .mCSB_dragger_bar{
+	background:rgba(0,0,0,0.85);
+}
+.mCS-dark-thick>.mCSB_scrollTools .mCSB_dragger:active .mCSB_dragger_bar,
+.mCS-dark-thick>.mCSB_scrollTools .mCSB_dragger.mCSB_dragger_onDrag .mCSB_dragger_bar{
+	background:rgba(0,0,0,0.9);
+}
+.mCS-dark-thick>.mCSB_scrollTools .mCSB_buttonUp{
+	background-position:-96px 0;
+}
+.mCS-dark-thick>.mCSB_scrollTools .mCSB_buttonDown{
+	background-position:-96px -20px;
+}
+.mCS-dark-thick>.mCSB_scrollTools .mCSB_buttonLeft{
+	background-position:-100px -40px;
+}
+.mCS-dark-thick>.mCSB_scrollTools .mCSB_buttonRight{
+	background-position:-100px -56px;
+}
+/*light-thin*/
+.mCS-light-thin>.mCSB_scrollTools .mCSB_draggerRail{
+	background:#fff; /* rgba fallback */
+	background:rgba(255,255,255,0.1);
+}
+.mCS-light-thin>.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{
+	width:2px;
+}
+.mCS-light-thin.mCSB_horizontal>.mCSB_scrollTools .mCSB_draggerRail{
+	width:100%;
+}
+.mCS-light-thin.mCSB_horizontal>.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{
+	width:100%;
+	height:2px;
+	margin:7px auto;
+}
+/*dark-thin*/
+.mCS-dark-thin>.mCSB_scrollTools .mCSB_draggerRail{
+	background:#000; /* rgba fallback */
+	background:rgba(0,0,0,0.15);
+}
+.mCS-dark-thin>.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{
+	width:2px;
+	background:#000; /* rgba fallback */
+	background:rgba(0,0,0,0.75);
+}
+.mCS-dark-thin.mCSB_horizontal>.mCSB_scrollTools .mCSB_draggerRail{
+	width:100%;
+}
+.mCS-dark-thin.mCSB_horizontal>.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{
+	width:100%;
+	height:2px;
+	margin:7px auto;
+}
+.mCS-dark-thin>.mCSB_scrollTools .mCSB_dragger:hover .mCSB_dragger_bar{
+	background:rgba(0,0,0,0.85);
+}
+.mCS-dark-thin>.mCSB_scrollTools .mCSB_dragger:active .mCSB_dragger_bar,
+.mCS-dark-thin>.mCSB_scrollTools .mCSB_dragger.mCSB_dragger_onDrag .mCSB_dragger_bar{
+	background:rgba(0,0,0,0.9);
+}
+.mCS-dark-thin>.mCSB_scrollTools .mCSB_buttonUp{
+	background-position:-80px 0;
+}
+.mCS-dark-thin>.mCSB_scrollTools .mCSB_buttonDown{
+	background-position:-80px -20px;
+}
+.mCS-dark-thin>.mCSB_scrollTools .mCSB_buttonLeft{
+	background-position:-80px -40px;
+}
+.mCS-dark-thin>.mCSB_scrollTools .mCSB_buttonRight{
+	background-position:-80px -56px;
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/css/layui.css b/pluss-manage-page/src/main/resources/static/resources/auth/css/layui.css
new file mode 100644
index 0000000..ba7cad2
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/css/layui.css
@@ -0,0 +1 @@
+.layui-inline,img{display:inline-block;vertical-align:middle}h1,h2,h3,h4,h5,h6{font-weight:400}a,body{color:#333}.layui-edge,.layui-header,.layui-inline,.layui-main{position:relative}.layui-edge,hr{height:0;overflow:hidden}.layui-layout-body,.layui-side,.layui-side-scroll{overflow-x:hidden}.layui-btn,.layui-edge,.layui-inline,img{vertical-align:middle}.layui-btn,.layui-disabled,.layui-icon,.layui-unselect{-moz-user-select:none;-webkit-user-select:none;-ms-user-select:none}.layui-edge,.layui-elip,hr{overflow:hidden}blockquote,body,button,dd,div,dl,dt,form,h1,h2,h3,h4,h5,h6,input,li,ol,p,pre,td,textarea,th,ul{margin:0;padding:0;-webkit-tap-highlight-color:rgba(0,0,0,0)}a:active,a:hover{outline:0}img{border:none}li{list-style:none}table{border-collapse:collapse;border-spacing:0}h4,h5,h6{font-size:100%}button,input,optgroup,option,select,textarea{font-family:inherit;font-size:inherit;font-style:inherit;font-weight:inherit;outline:0}pre{white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space:-o-pre-wrap;word-wrap:break-word}body{line-height:1.6;color:rgba(0,0,0,.85);font:14px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif}hr{line-height:0;margin:10px 0;padding:0;border:none!important;border-bottom:1px solid #eee!important;clear:both;background:0 0}a{text-decoration:none}a:hover{color:#777}a cite{font-style:normal;*cursor:pointer}.layui-border-box,.layui-border-box *{box-sizing:border-box}.layui-box,.layui-box *{box-sizing:content-box}.layui-clear{clear:both;*zoom:1}.layui-clear:after{content:'\20';clear:both;*zoom:1;display:block;height:0}.layui-inline{*display:inline;*zoom:1}.layui-btn,.layui-btn-group,.layui-edge{display:inline-block}.layui-edge{width:0;border-width:6px;border-style:dashed;border-color:transparent}.layui-edge-top{top:-4px;border-bottom-color:#999;border-bottom-style:solid}.layui-edge-right{border-left-color:#999;border-left-style:solid}.layui-edge-bottom{top:2px;border-top-color:#999;border-top-style:solid}.layui-edge-left{border-right-color:#999;border-right-style:solid}.layui-elip{text-overflow:ellipsis;white-space:nowrap}.layui-disabled,.layui-disabled:hover{color:#d2d2d2!important;cursor:not-allowed!important}.layui-circle{border-radius:100%}.layui-show{display:block!important}.layui-hide{display:none!important}.layui-show-v{visibility:visible!important}.layui-hide-v{visibility:hidden!important}@font-face{font-family:layui-icon;src:url(../font/iconfont.eot?v=256);src:url(../font/iconfont.eot?v=256#iefix) format('embedded-opentype'),url(../font/iconfont.woff2?v=256) format('woff2'),url(../font/iconfont.woff?v=256) format('woff'),url(../font/iconfont.ttf?v=256) format('truetype'),url(../font/iconfont.svg?v=256#layui-icon) format('svg')}.layui-icon{font-family:layui-icon!important;font-size:16px;font-style:normal;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.layui-icon-reply-fill:before{content:"\e611"}.layui-icon-set-fill:before{content:"\e614"}.layui-icon-menu-fill:before{content:"\e60f"}.layui-icon-search:before{content:"\e615"}.layui-icon-share:before{content:"\e641"}.layui-icon-set-sm:before{content:"\e620"}.layui-icon-engine:before{content:"\e628"}.layui-icon-close:before{content:"\1006"}.layui-icon-close-fill:before{content:"\1007"}.layui-icon-chart-screen:before{content:"\e629"}.layui-icon-star:before{content:"\e600"}.layui-icon-circle-dot:before{content:"\e617"}.layui-icon-chat:before{content:"\e606"}.layui-icon-release:before{content:"\e609"}.layui-icon-list:before{content:"\e60a"}.layui-icon-chart:before{content:"\e62c"}.layui-icon-ok-circle:before{content:"\1005"}.layui-icon-layim-theme:before{content:"\e61b"}.layui-icon-table:before{content:"\e62d"}.layui-icon-right:before{content:"\e602"}.layui-icon-left:before{content:"\e603"}.layui-icon-cart-simple:before{content:"\e698"}.layui-icon-face-cry:before{content:"\e69c"}.layui-icon-face-smile:before{content:"\e6af"}.layui-icon-survey:before{content:"\e6b2"}.layui-icon-tree:before{content:"\e62e"}.layui-icon-ie:before{content:"\e7bb"}.layui-icon-upload-circle:before{content:"\e62f"}.layui-icon-add-circle:before{content:"\e61f"}.layui-icon-download-circle:before{content:"\e601"}.layui-icon-templeate-1:before{content:"\e630"}.layui-icon-util:before{content:"\e631"}.layui-icon-face-surprised:before{content:"\e664"}.layui-icon-edit:before{content:"\e642"}.layui-icon-speaker:before{content:"\e645"}.layui-icon-down:before{content:"\e61a"}.layui-icon-file:before{content:"\e621"}.layui-icon-layouts:before{content:"\e632"}.layui-icon-rate-half:before{content:"\e6c9"}.layui-icon-add-circle-fine:before{content:"\e608"}.layui-icon-prev-circle:before{content:"\e633"}.layui-icon-read:before{content:"\e705"}.layui-icon-404:before{content:"\e61c"}.layui-icon-carousel:before{content:"\e634"}.layui-icon-help:before{content:"\e607"}.layui-icon-code-circle:before{content:"\e635"}.layui-icon-windows:before{content:"\e67f"}.layui-icon-water:before{content:"\e636"}.layui-icon-username:before{content:"\e66f"}.layui-icon-find-fill:before{content:"\e670"}.layui-icon-about:before{content:"\e60b"}.layui-icon-location:before{content:"\e715"}.layui-icon-up:before{content:"\e619"}.layui-icon-pause:before{content:"\e651"}.layui-icon-date:before{content:"\e637"}.layui-icon-layim-uploadfile:before{content:"\e61d"}.layui-icon-delete:before{content:"\e640"}.layui-icon-play:before{content:"\e652"}.layui-icon-top:before{content:"\e604"}.layui-icon-firefox:before{content:"\e686"}.layui-icon-friends:before{content:"\e612"}.layui-icon-refresh-3:before{content:"\e9aa"}.layui-icon-ok:before{content:"\e605"}.layui-icon-layer:before{content:"\e638"}.layui-icon-face-smile-fine:before{content:"\e60c"}.layui-icon-dollar:before{content:"\e659"}.layui-icon-group:before{content:"\e613"}.layui-icon-layim-download:before{content:"\e61e"}.layui-icon-picture-fine:before{content:"\e60d"}.layui-icon-link:before{content:"\e64c"}.layui-icon-diamond:before{content:"\e735"}.layui-icon-log:before{content:"\e60e"}.layui-icon-key:before{content:"\e683"}.layui-icon-rate-solid:before{content:"\e67a"}.layui-icon-fonts-del:before{content:"\e64f"}.layui-icon-unlink:before{content:"\e64d"}.layui-icon-fonts-clear:before{content:"\e639"}.layui-icon-triangle-r:before{content:"\e623"}.layui-icon-circle:before{content:"\e63f"}.layui-icon-radio:before{content:"\e643"}.layui-icon-align-center:before{content:"\e647"}.layui-icon-align-right:before{content:"\e648"}.layui-icon-align-left:before{content:"\e649"}.layui-icon-loading-1:before{content:"\e63e"}.layui-icon-return:before{content:"\e65c"}.layui-icon-fonts-strong:before{content:"\e62b"}.layui-icon-upload:before{content:"\e67c"}.layui-icon-dialogue:before{content:"\e63a"}.layui-icon-video:before{content:"\e6ed"}.layui-icon-headset:before{content:"\e6fc"}.layui-icon-cellphone-fine:before{content:"\e63b"}.layui-icon-add-1:before{content:"\e654"}.layui-icon-face-smile-b:before{content:"\e650"}.layui-icon-fonts-html:before{content:"\e64b"}.layui-icon-screen-full:before{content:"\e622"}.layui-icon-form:before{content:"\e63c"}.layui-icon-cart:before{content:"\e657"}.layui-icon-camera-fill:before{content:"\e65d"}.layui-icon-tabs:before{content:"\e62a"}.layui-icon-heart-fill:before{content:"\e68f"}.layui-icon-fonts-code:before{content:"\e64e"}.layui-icon-ios:before{content:"\e680"}.layui-icon-at:before{content:"\e687"}.layui-icon-fire:before{content:"\e756"}.layui-icon-set:before{content:"\e716"}.layui-icon-fonts-u:before{content:"\e646"}.layui-icon-triangle-d:before{content:"\e625"}.layui-icon-tips:before{content:"\e702"}.layui-icon-picture:before{content:"\e64a"}.layui-icon-more-vertical:before{content:"\e671"}.layui-icon-bluetooth:before{content:"\e689"}.layui-icon-flag:before{content:"\e66c"}.layui-icon-loading:before{content:"\e63d"}.layui-icon-fonts-i:before{content:"\e644"}.layui-icon-refresh-1:before{content:"\e666"}.layui-icon-rmb:before{content:"\e65e"}.layui-icon-addition:before{content:"\e624"}.layui-icon-home:before{content:"\e68e"}.layui-icon-time:before{content:"\e68d"}.layui-icon-user:before{content:"\e770"}.layui-icon-notice:before{content:"\e667"}.layui-icon-chrome:before{content:"\e68a"}.layui-icon-edge:before{content:"\e68b"}.layui-icon-login-weibo:before{content:"\e675"}.layui-icon-voice:before{content:"\e688"}.layui-icon-upload-drag:before{content:"\e681"}.layui-icon-login-qq:before{content:"\e676"}.layui-icon-snowflake:before{content:"\e6b1"}.layui-icon-heart:before{content:"\e68c"}.layui-icon-logout:before{content:"\e682"}.layui-icon-file-b:before{content:"\e655"}.layui-icon-template:before{content:"\e663"}.layui-icon-transfer:before{content:"\e691"}.layui-icon-auz:before{content:"\e672"}.layui-icon-console:before{content:"\e665"}.layui-icon-app:before{content:"\e653"}.layui-icon-prev:before{content:"\e65a"}.layui-icon-website:before{content:"\e7ae"}.layui-icon-next:before{content:"\e65b"}.layui-icon-component:before{content:"\e857"}.layui-icon-android:before{content:"\e684"}.layui-icon-more:before{content:"\e65f"}.layui-icon-login-wechat:before{content:"\e677"}.layui-icon-shrink-right:before{content:"\e668"}.layui-icon-spread-left:before{content:"\e66b"}.layui-icon-camera:before{content:"\e660"}.layui-icon-note:before{content:"\e66e"}.layui-icon-refresh:before{content:"\e669"}.layui-icon-female:before{content:"\e661"}.layui-icon-male:before{content:"\e662"}.layui-icon-screen-restore:before{content:"\e758"}.layui-icon-password:before{content:"\e673"}.layui-icon-senior:before{content:"\e674"}.layui-icon-theme:before{content:"\e66a"}.layui-icon-tread:before{content:"\e6c5"}.layui-icon-praise:before{content:"\e6c6"}.layui-icon-star-fill:before{content:"\e658"}.layui-icon-rate:before{content:"\e67b"}.layui-icon-template-1:before{content:"\e656"}.layui-icon-vercode:before{content:"\e679"}.layui-icon-service:before{content:"\e626"}.layui-icon-cellphone:before{content:"\e678"}.layui-icon-print:before{content:"\e66d"}.layui-icon-cols:before{content:"\e610"}.layui-icon-wifi:before{content:"\e7e0"}.layui-icon-export:before{content:"\e67d"}.layui-icon-rss:before{content:"\e808"}.layui-icon-slider:before{content:"\e714"}.layui-icon-email:before{content:"\e618"}.layui-icon-subtraction:before{content:"\e67e"}.layui-icon-mike:before{content:"\e6dc"}.layui-icon-light:before{content:"\e748"}.layui-icon-gift:before{content:"\e627"}.layui-icon-mute:before{content:"\e685"}.layui-icon-reduce-circle:before{content:"\e616"}.layui-icon-music:before{content:"\e690"}.layui-main{width:1140px;margin:0 auto}.layui-header{z-index:1000;height:60px}.layui-header a:hover{transition:all .5s;-webkit-transition:all .5s}.layui-side{position:fixed;left:0;top:0;bottom:0;z-index:999;width:200px}.layui-side-scroll{position:relative;width:220px;height:100%}.layui-body{position:relative;left:200px;right:0;top:0;bottom:0;z-index:900;width:auto;box-sizing:border-box}.layui-layout-admin .layui-header{position:fixed;top:0;left:0;right:0;background-color:#23262E}.layui-layout-admin .layui-side{top:60px;width:200px;overflow-x:hidden}.layui-layout-admin .layui-body{position:absolute;top:60px;padding-bottom:44px}.layui-layout-admin .layui-main{width:auto;margin:0 15px}.layui-layout-admin .layui-footer{position:fixed;left:200px;right:0;bottom:0;z-index:990;height:44px;line-height:44px;padding:0 15px;box-shadow:-1px 0 4px rgb(0 0 0 / 12%);background-color:#FAFAFA}.layui-layout-admin .layui-logo{position:absolute;left:0;top:0;width:200px;height:100%;line-height:60px;text-align:center;color:#009688;font-size:16px;box-shadow:0 1px 2px 0 rgb(0 0 0 / 15%)}.layui-layout-admin .layui-header .layui-nav{background:0 0}.layui-layout-left{position:absolute!important;left:200px;top:0}.layui-layout-right{position:absolute!important;right:0;top:0}.layui-container{position:relative;margin:0 auto;padding:0 15px;box-sizing:border-box}.layui-fluid{position:relative;margin:0 auto;padding:0 15px}.layui-row:after,.layui-row:before{content:"";display:block;clear:both}.layui-col-lg1,.layui-col-lg10,.layui-col-lg11,.layui-col-lg12,.layui-col-lg2,.layui-col-lg3,.layui-col-lg4,.layui-col-lg5,.layui-col-lg6,.layui-col-lg7,.layui-col-lg8,.layui-col-lg9,.layui-col-md1,.layui-col-md10,.layui-col-md11,.layui-col-md12,.layui-col-md2,.layui-col-md3,.layui-col-md4,.layui-col-md5,.layui-col-md6,.layui-col-md7,.layui-col-md8,.layui-col-md9,.layui-col-sm1,.layui-col-sm10,.layui-col-sm11,.layui-col-sm12,.layui-col-sm2,.layui-col-sm3,.layui-col-sm4,.layui-col-sm5,.layui-col-sm6,.layui-col-sm7,.layui-col-sm8,.layui-col-sm9,.layui-col-xs1,.layui-col-xs10,.layui-col-xs11,.layui-col-xs12,.layui-col-xs2,.layui-col-xs3,.layui-col-xs4,.layui-col-xs5,.layui-col-xs6,.layui-col-xs7,.layui-col-xs8,.layui-col-xs9{position:relative;display:block;box-sizing:border-box}.layui-col-xs1,.layui-col-xs10,.layui-col-xs11,.layui-col-xs12,.layui-col-xs2,.layui-col-xs3,.layui-col-xs4,.layui-col-xs5,.layui-col-xs6,.layui-col-xs7,.layui-col-xs8,.layui-col-xs9{float:left}.layui-col-xs1{width:8.33333333%}.layui-col-xs2{width:16.66666667%}.layui-col-xs3{width:25%}.layui-col-xs4{width:33.33333333%}.layui-col-xs5{width:41.66666667%}.layui-col-xs6{width:50%}.layui-col-xs7{width:58.33333333%}.layui-col-xs8{width:66.66666667%}.layui-col-xs9{width:75%}.layui-col-xs10{width:83.33333333%}.layui-col-xs11{width:91.66666667%}.layui-col-xs12{width:100%}.layui-col-xs-offset1{margin-left:8.33333333%}.layui-col-xs-offset2{margin-left:16.66666667%}.layui-col-xs-offset3{margin-left:25%}.layui-col-xs-offset4{margin-left:33.33333333%}.layui-col-xs-offset5{margin-left:41.66666667%}.layui-col-xs-offset6{margin-left:50%}.layui-col-xs-offset7{margin-left:58.33333333%}.layui-col-xs-offset8{margin-left:66.66666667%}.layui-col-xs-offset9{margin-left:75%}.layui-col-xs-offset10{margin-left:83.33333333%}.layui-col-xs-offset11{margin-left:91.66666667%}.layui-col-xs-offset12{margin-left:100%}@media screen and (max-width:768px){.layui-hide-xs{display:none!important}.layui-show-xs-block{display:block!important}.layui-show-xs-inline{display:inline!important}.layui-show-xs-inline-block{display:inline-block!important}}@media screen and (min-width:768px){.layui-container{width:750px}.layui-hide-sm{display:none!important}.layui-show-sm-block{display:block!important}.layui-show-sm-inline{display:inline!important}.layui-show-sm-inline-block{display:inline-block!important}.layui-col-sm1,.layui-col-sm10,.layui-col-sm11,.layui-col-sm12,.layui-col-sm2,.layui-col-sm3,.layui-col-sm4,.layui-col-sm5,.layui-col-sm6,.layui-col-sm7,.layui-col-sm8,.layui-col-sm9{float:left}.layui-col-sm1{width:8.33333333%}.layui-col-sm2{width:16.66666667%}.layui-col-sm3{width:25%}.layui-col-sm4{width:33.33333333%}.layui-col-sm5{width:41.66666667%}.layui-col-sm6{width:50%}.layui-col-sm7{width:58.33333333%}.layui-col-sm8{width:66.66666667%}.layui-col-sm9{width:75%}.layui-col-sm10{width:83.33333333%}.layui-col-sm11{width:91.66666667%}.layui-col-sm12{width:100%}.layui-col-sm-offset1{margin-left:8.33333333%}.layui-col-sm-offset2{margin-left:16.66666667%}.layui-col-sm-offset3{margin-left:25%}.layui-col-sm-offset4{margin-left:33.33333333%}.layui-col-sm-offset5{margin-left:41.66666667%}.layui-col-sm-offset6{margin-left:50%}.layui-col-sm-offset7{margin-left:58.33333333%}.layui-col-sm-offset8{margin-left:66.66666667%}.layui-col-sm-offset9{margin-left:75%}.layui-col-sm-offset10{margin-left:83.33333333%}.layui-col-sm-offset11{margin-left:91.66666667%}.layui-col-sm-offset12{margin-left:100%}}@media screen and (min-width:992px){.layui-container{width:970px}.layui-hide-md{display:none!important}.layui-show-md-block{display:block!important}.layui-show-md-inline{display:inline!important}.layui-show-md-inline-block{display:inline-block!important}.layui-col-md1,.layui-col-md10,.layui-col-md11,.layui-col-md12,.layui-col-md2,.layui-col-md3,.layui-col-md4,.layui-col-md5,.layui-col-md6,.layui-col-md7,.layui-col-md8,.layui-col-md9{float:left}.layui-col-md1{width:8.33333333%}.layui-col-md2{width:16.66666667%}.layui-col-md3{width:25%}.layui-col-md4{width:33.33333333%}.layui-col-md5{width:41.66666667%}.layui-col-md6{width:50%}.layui-col-md7{width:58.33333333%}.layui-col-md8{width:66.66666667%}.layui-col-md9{width:75%}.layui-col-md10{width:83.33333333%}.layui-col-md11{width:91.66666667%}.layui-col-md12{width:100%}.layui-col-md-offset1{margin-left:8.33333333%}.layui-col-md-offset2{margin-left:16.66666667%}.layui-col-md-offset3{margin-left:25%}.layui-col-md-offset4{margin-left:33.33333333%}.layui-col-md-offset5{margin-left:41.66666667%}.layui-col-md-offset6{margin-left:50%}.layui-col-md-offset7{margin-left:58.33333333%}.layui-col-md-offset8{margin-left:66.66666667%}.layui-col-md-offset9{margin-left:75%}.layui-col-md-offset10{margin-left:83.33333333%}.layui-col-md-offset11{margin-left:91.66666667%}.layui-col-md-offset12{margin-left:100%}}@media screen and (min-width:1200px){.layui-container{width:1170px}.layui-hide-lg{display:none!important}.layui-show-lg-block{display:block!important}.layui-show-lg-inline{display:inline!important}.layui-show-lg-inline-block{display:inline-block!important}.layui-col-lg1,.layui-col-lg10,.layui-col-lg11,.layui-col-lg12,.layui-col-lg2,.layui-col-lg3,.layui-col-lg4,.layui-col-lg5,.layui-col-lg6,.layui-col-lg7,.layui-col-lg8,.layui-col-lg9{float:left}.layui-col-lg1{width:8.33333333%}.layui-col-lg2{width:16.66666667%}.layui-col-lg3{width:25%}.layui-col-lg4{width:33.33333333%}.layui-col-lg5{width:41.66666667%}.layui-col-lg6{width:50%}.layui-col-lg7{width:58.33333333%}.layui-col-lg8{width:66.66666667%}.layui-col-lg9{width:75%}.layui-col-lg10{width:83.33333333%}.layui-col-lg11{width:91.66666667%}.layui-col-lg12{width:100%}.layui-col-lg-offset1{margin-left:8.33333333%}.layui-col-lg-offset2{margin-left:16.66666667%}.layui-col-lg-offset3{margin-left:25%}.layui-col-lg-offset4{margin-left:33.33333333%}.layui-col-lg-offset5{margin-left:41.66666667%}.layui-col-lg-offset6{margin-left:50%}.layui-col-lg-offset7{margin-left:58.33333333%}.layui-col-lg-offset8{margin-left:66.66666667%}.layui-col-lg-offset9{margin-left:75%}.layui-col-lg-offset10{margin-left:83.33333333%}.layui-col-lg-offset11{margin-left:91.66666667%}.layui-col-lg-offset12{margin-left:100%}}.layui-col-space1{margin:-.5px}.layui-col-space1>*{padding:.5px}.layui-col-space2{margin:-1px}.layui-col-space2>*{padding:1px}.layui-col-space4{margin:-2px}.layui-col-space4>*{padding:2px}.layui-col-space5{margin:-2.5px}.layui-col-space5>*{padding:2.5px}.layui-col-space6{margin:-3px}.layui-col-space6>*{padding:3px}.layui-col-space8{margin:-4px}.layui-col-space8>*{padding:4px}.layui-col-space10{margin:-5px}.layui-col-space10>*{padding:5px}.layui-col-space12{margin:-6px}.layui-col-space12>*{padding:6px}.layui-col-space14{margin:-7px}.layui-col-space14>*{padding:7px}.layui-col-space15{margin:-7.5px}.layui-col-space15>*{padding:7.5px}.layui-col-space16{margin:-8px}.layui-col-space16>*{padding:8px}.layui-col-space18{margin:-9px}.layui-col-space18>*{padding:9px}.layui-col-space20{margin:-10px}.layui-col-space20>*{padding:10px}.layui-col-space22{margin:-11px}.layui-col-space22>*{padding:11px}.layui-col-space24{margin:-12px}.layui-col-space24>*{padding:12px}.layui-col-space25{margin:-12.5px}.layui-col-space25>*{padding:12.5px}.layui-col-space26{margin:-13px}.layui-col-space26>*{padding:13px}.layui-col-space28{margin:-14px}.layui-col-space28>*{padding:14px}.layui-col-space30{margin:-15px}.layui-col-space30>*{padding:15px}.layui-btn,.layui-input,.layui-select,.layui-textarea,.layui-upload-button{outline:0;-webkit-appearance:none;transition:all .3s;-webkit-transition:all .3s;box-sizing:border-box}.layui-elem-quote{margin-bottom:10px;padding:15px;line-height:1.6;border-left:5px solid #5FB878;border-radius:0 2px 2px 0;background-color:#FAFAFA}.layui-quote-nm{border-style:solid;border-width:1px 1px 1px 5px;background:0 0}.layui-elem-field{margin-bottom:10px;padding:0;border-width:1px;border-style:solid}.layui-elem-field legend{margin-left:20px;padding:0 10px;font-size:20px;font-weight:300}.layui-field-title{margin:10px 0 20px;border-width:1px 0 0}.layui-field-box{padding:15px}.layui-field-title .layui-field-box{padding:10px 0}.layui-progress{position:relative;height:6px;border-radius:20px;background-color:#eee}.layui-progress-bar{position:absolute;left:0;top:0;width:0;max-width:100%;height:6px;border-radius:20px;text-align:right;background-color:#5FB878;transition:all .3s;-webkit-transition:all .3s}.layui-progress-big,.layui-progress-big .layui-progress-bar{height:18px;line-height:18px}.layui-progress-text{position:relative;top:-20px;line-height:18px;font-size:12px;color:#666}.layui-progress-big .layui-progress-text{position:static;padding:0 10px;color:#fff}.layui-collapse{border-width:1px;border-style:solid;border-radius:2px}.layui-colla-content,.layui-colla-item{border-top-width:1px;border-top-style:solid}.layui-colla-item:first-child{border-top:none}.layui-colla-title{position:relative;height:42px;line-height:42px;padding:0 15px 0 35px;color:#333;background-color:#FAFAFA;cursor:pointer;font-size:14px;overflow:hidden}.layui-colla-content{display:none;padding:10px 15px;line-height:1.6;color:#666}.layui-colla-icon{position:absolute;left:15px;top:0;font-size:14px}.layui-card-body,.layui-card-header,.layui-form-label,.layui-form-mid,.layui-form-select,.layui-input-block,.layui-input-inline,.layui-panel,.layui-textarea{position:relative}.layui-card{margin-bottom:15px;border-radius:2px;background-color:#fff;box-shadow:0 1px 2px 0 rgba(0,0,0,.05)}.layui-card:last-child{margin-bottom:0}.layui-card-header{height:42px;line-height:42px;padding:0 15px;border-bottom:1px solid #f6f6f6;color:#333;border-radius:2px 2px 0 0;font-size:14px}.layui-card-body{padding:10px 15px;line-height:24px}.layui-card-body[pad15]{padding:15px}.layui-card-body[pad20]{padding:20px}.layui-card-body .layui-table{margin:5px 0}.layui-card .layui-tab{margin:0}.layui-panel{border-width:1px;border-style:solid;border-radius:2px;box-shadow:1px 1px 4px rgb(0 0 0 / 8%);background-color:#fff;color:#666}.layui-bg-black,.layui-bg-blue,.layui-bg-cyan,.layui-bg-green,.layui-bg-orange,.layui-bg-red{color:#fff!important}.layui-panel-window{position:relative;padding:15px;border-radius:0;border-top:5px solid #eee;background-color:#fff}.layui-border,.layui-border-black,.layui-border-blue,.layui-border-cyan,.layui-border-green,.layui-border-orange,.layui-border-red{border-width:1px;border-style:solid}.layui-auxiliar-moving{position:fixed;left:0;right:0;top:0;bottom:0;width:100%;height:100%;background:0 0;z-index:9999999999}.layui-bg-red{background-color:#FF5722!important}.layui-bg-orange{background-color:#FFB800!important}.layui-bg-green{background-color:#009688!important}.layui-bg-cyan{background-color:#2F4056!important}.layui-bg-blue{background-color:#1E9FFF!important}.layui-bg-black{background-color:#393D49!important}.layui-bg-gray{background-color:#FAFAFA!important;color:#666!important}.layui-badge-rim,.layui-border,.layui-colla-content,.layui-colla-item,.layui-collapse,.layui-elem-field,.layui-form-pane .layui-form-item[pane],.layui-form-pane .layui-form-label,.layui-input,.layui-layedit,.layui-layedit-tool,.layui-panel,.layui-quote-nm,.layui-select,.layui-tab-bar,.layui-tab-card,.layui-tab-title,.layui-tab-title .layui-this:after,.layui-textarea{border-color:#eee}.layui-border{color:#666!important}.layui-border-red{border-color:#FF5722!important;color:#FF5722!important}.layui-border-orange{border-color:#FFB800!important;color:#FFB800!important}.layui-border-green{border-color:#009688!important;color:#009688!important}.layui-border-cyan{border-color:#2F4056!important;color:#2F4056!important}.layui-border-blue{border-color:#1E9FFF!important;color:#1E9FFF!important}.layui-border-black{border-color:#393D49!important;color:#393D49!important}.layui-timeline-item:before{background-color:#eee}.layui-text{line-height:1.6;font-size:14px;color:#666}.layui-text h1,.layui-text h2,.layui-text h3{font-weight:500;color:#333}.layui-text h1{font-size:30px}.layui-text h2{font-size:24px}.layui-text h3{font-size:18px}.layui-text a:not(.layui-btn){color:#01AAED}.layui-text a:not(.layui-btn):hover{text-decoration:underline}.layui-text ul{padding:5px 0 5px 15px}.layui-text ul li{margin-top:5px;list-style-type:disc}.layui-text em,.layui-word-aux{color:#999!important;padding-left:5px!important;padding-right:5px!important}.layui-text p{margin:10px 0}.layui-text p:first-child{margin-top:0}.layui-font-12{font-size:12px!important}.layui-font-14{font-size:14px!important}.layui-font-16{font-size:16px!important}.layui-font-18{font-size:18px!important}.layui-font-20{font-size:20px!important}.layui-font-red{color:#FF5722!important}.layui-font-orange{color:#FFB800!important}.layui-font-green{color:#009688!important}.layui-font-cyan{color:#2F4056!important}.layui-font-blue{color:#01AAED!important}.layui-font-black{color:#000!important}.layui-font-gray{color:#c2c2c2!important}.layui-btn{height:38px;line-height:38px;border:1px solid transparent;padding:0 18px;background-color:#009688;color:#fff;white-space:nowrap;text-align:center;font-size:14px;border-radius:2px;cursor:pointer}.layui-btn:hover{opacity:.8;filter:alpha(opacity=80);color:#fff}.layui-btn:active{opacity:1;filter:alpha(opacity=100)}.layui-btn+.layui-btn{margin-left:10px}.layui-btn-container{font-size:0}.layui-btn-container .layui-btn{margin-right:10px;margin-bottom:10px}.layui-btn-container .layui-btn+.layui-btn{margin-left:0}.layui-table .layui-btn-container .layui-btn{margin-bottom:9px}.layui-btn-radius{border-radius:100px}.layui-btn .layui-icon{padding:0 2px;vertical-align:middle\9;vertical-align:bottom}.layui-btn-primary{border-color:#d2d2d2;background:0 0;color:#666}.layui-btn-primary:hover{border-color:#009688;color:#333}.layui-btn-normal{background-color:#1E9FFF}.layui-btn-warm{background-color:#FFB800}.layui-btn-danger{background-color:#FF5722}.layui-btn-checked{background-color:#5FB878}.layui-btn-disabled,.layui-btn-disabled:active,.layui-btn-disabled:hover{border-color:#eee!important;background-color:#FBFBFB!important;color:#d2d2d2!important;cursor:not-allowed!important;opacity:1}.layui-btn-lg{height:44px;line-height:44px;padding:0 25px;font-size:16px}.layui-btn-sm{height:30px;line-height:30px;padding:0 10px;font-size:12px}.layui-btn-xs{height:22px;line-height:22px;padding:0 5px;font-size:12px}.layui-btn-xs i{font-size:12px!important}.layui-btn-group{vertical-align:middle;font-size:0}.layui-btn-group .layui-btn{margin-left:0!important;margin-right:0!important;border-left:1px solid rgba(255,255,255,.5);border-radius:0}.layui-btn-group .layui-btn-primary{border-left:none}.layui-btn-group .layui-btn-primary:hover{border-color:#d2d2d2;color:#009688}.layui-btn-group .layui-btn:first-child{border-left:none;border-radius:2px 0 0 2px}.layui-btn-group .layui-btn-primary:first-child{border-left:1px solid #d2d2d2}.layui-btn-group .layui-btn:last-child{border-radius:0 2px 2px 0}.layui-btn-group .layui-btn+.layui-btn{margin-left:0}.layui-btn-group+.layui-btn-group{margin-left:10px}.layui-btn-fluid{width:100%}.layui-input,.layui-select,.layui-textarea{height:38px;line-height:1.3;line-height:38px\9;border-width:1px;border-style:solid;background-color:#fff;border-radius:2px}.layui-input::-webkit-input-placeholder,.layui-select::-webkit-input-placeholder,.layui-textarea::-webkit-input-placeholder{line-height:1.3}.layui-input,.layui-textarea{display:block;width:100%;padding-left:10px}.layui-input:hover,.layui-textarea:hover{border-color:#eee!important}.layui-input:focus,.layui-textarea:focus{border-color:#d2d2d2!important}.layui-textarea{min-height:100px;height:auto;line-height:20px;padding:6px 10px;resize:vertical}.layui-select{padding:0 10px}.layui-form input[type=checkbox],.layui-form input[type=radio],.layui-form select{display:none}.layui-form [lay-ignore]{display:initial}.layui-form-item{margin-bottom:15px;clear:both;*zoom:1}.layui-form-item:after{content:'\20';clear:both;*zoom:1;display:block;height:0}.layui-form-label{float:left;display:block;padding:9px 15px;width:80px;font-weight:400;line-height:20px;text-align:right}.layui-form-label-col{display:block;float:none;padding:9px 0;line-height:20px;text-align:left}.layui-form-item .layui-inline{margin-bottom:5px;margin-right:10px}.layui-input-block{margin-left:110px;min-height:36px}.layui-input-inline{display:inline-block;vertical-align:middle}.layui-form-item .layui-input-inline{float:left;width:190px;margin-right:10px}.layui-form-text .layui-input-inline{width:auto}.layui-form-mid{float:left;display:block;padding:9px 0!important;line-height:20px;margin-right:10px}.layui-form-danger+.layui-form-select .layui-input,.layui-form-danger:focus{border-color:#FF5722!important}.layui-form-select .layui-input{padding-right:30px;cursor:pointer}.layui-form-select .layui-edge{position:absolute;right:10px;top:50%;margin-top:-3px;cursor:pointer;border-width:6px;border-top-color:#c2c2c2;border-top-style:solid;transition:all .3s;-webkit-transition:all .3s}.layui-form-select dl{display:none;position:absolute;left:0;top:42px;padding:5px 0;z-index:899;min-width:100%;border:1px solid #d2d2d2;max-height:300px;overflow-y:auto;background-color:#fff;border-radius:2px;box-shadow:0 2px 4px rgba(0,0,0,.12);box-sizing:border-box}.layui-form-select dl dd,.layui-form-select dl dt{padding:0 10px;line-height:36px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}.layui-form-select dl dt{font-size:12px;color:#999}.layui-form-select dl dd{cursor:pointer}.layui-form-select dl dd:hover{background-color:#F6F6F6;-webkit-transition:.5s all;transition:.5s all}.layui-form-select .layui-select-group dd{padding-left:20px}.layui-form-select dl dd.layui-select-tips{padding-left:10px!important;color:#999}.layui-form-select dl dd.layui-this{background-color:#5FB878;color:#fff}.layui-form-checkbox,.layui-form-select dl dd.layui-disabled{background-color:#fff}.layui-form-selected dl{display:block}.layui-form-checkbox,.layui-form-checkbox *,.layui-form-switch{display:inline-block;vertical-align:middle}.layui-form-selected .layui-edge{margin-top:-9px;-webkit-transform:rotate(180deg);transform:rotate(180deg);margin-top:-3px\9}:root .layui-form-selected .layui-edge{margin-top:-9px\0/IE9}.layui-form-selectup dl{top:auto;bottom:42px}.layui-select-none{margin:5px 0;text-align:center;color:#999}.layui-select-disabled .layui-disabled{border-color:#eee!important}.layui-select-disabled .layui-edge{border-top-color:#d2d2d2}.layui-form-checkbox{position:relative;height:30px;line-height:30px;margin-right:10px;padding-right:30px;cursor:pointer;font-size:0;-webkit-transition:.1s linear;transition:.1s linear;box-sizing:border-box}.layui-form-checkbox span{padding:0 10px;height:100%;font-size:14px;border-radius:2px 0 0 2px;background-color:#d2d2d2;color:#fff;overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.layui-form-checkbox:hover span{background-color:#c2c2c2}.layui-form-checkbox i{position:absolute;right:0;top:0;width:30px;height:28px;border:1px solid #d2d2d2;border-left:none;border-radius:0 2px 2px 0;color:#fff;font-size:20px;text-align:center}.layui-form-checkbox:hover i{border-color:#c2c2c2;color:#c2c2c2}.layui-form-checked,.layui-form-checked:hover{border-color:#5FB878}.layui-form-checked span,.layui-form-checked:hover span{background-color:#5FB878}.layui-form-checked i,.layui-form-checked:hover i{color:#5FB878}.layui-form-item .layui-form-checkbox{margin-top:4px}.layui-form-checkbox[lay-skin=primary]{height:auto!important;line-height:normal!important;min-width:18px;min-height:18px;border:none!important;margin-right:0;padding-left:28px;padding-right:0;background:0 0}.layui-form-checkbox[lay-skin=primary] span{padding-left:0;padding-right:15px;line-height:18px;background:0 0;color:#666}.layui-form-checkbox[lay-skin=primary] i{right:auto;left:0;width:16px;height:16px;line-height:16px;border:1px solid #d2d2d2;font-size:12px;border-radius:2px;background-color:#fff;-webkit-transition:.1s linear;transition:.1s linear}.layui-form-checkbox[lay-skin=primary]:hover i{border-color:#5FB878;color:#fff}.layui-form-checked[lay-skin=primary] i{border-color:#5FB878!important;background-color:#5FB878;color:#fff}.layui-checkbox-disbaled[lay-skin=primary] span{background:0 0!important;color:#c2c2c2!important}.layui-checkbox-disbaled[lay-skin=primary]:hover i{border-color:#d2d2d2}.layui-form-item .layui-form-checkbox[lay-skin=primary]{margin-top:10px}.layui-form-switch{position:relative;height:22px;line-height:22px;min-width:35px;padding:0 5px;margin-top:8px;border:1px solid #d2d2d2;border-radius:20px;cursor:pointer;background-color:#fff;-webkit-transition:.1s linear;transition:.1s linear}.layui-form-switch i{position:absolute;left:5px;top:3px;width:16px;height:16px;border-radius:20px;background-color:#d2d2d2;-webkit-transition:.1s linear;transition:.1s linear}.layui-form-switch em{position:relative;top:0;width:25px;margin-left:21px;padding:0!important;text-align:center!important;color:#999!important;font-style:normal!important;font-size:12px}.layui-form-onswitch{border-color:#5FB878;background-color:#5FB878}.layui-checkbox-disbaled,.layui-checkbox-disbaled i{border-color:#eee!important}.layui-form-onswitch i{left:100%;margin-left:-21px;background-color:#fff}.layui-form-onswitch em{margin-left:5px;margin-right:21px;color:#fff!important}.layui-checkbox-disbaled span{background-color:#eee!important}.layui-checkbox-disbaled em{color:#d2d2d2!important}.layui-checkbox-disbaled:hover i{color:#fff!important}[lay-radio]{display:none}.layui-form-radio,.layui-form-radio *{display:inline-block;vertical-align:middle}.layui-form-radio{line-height:28px;margin:6px 10px 0 0;padding-right:10px;cursor:pointer;font-size:0}.layui-form-radio *{font-size:14px}.layui-form-radio>i{margin-right:8px;font-size:22px;color:#c2c2c2}.layui-form-radio:hover *,.layui-form-radioed,.layui-form-radioed>i{color:#5FB878}.layui-radio-disbaled>i{color:#eee!important}.layui-radio-disbaled *{color:#c2c2c2!important}.layui-form-pane .layui-form-label{width:110px;padding:8px 15px;height:38px;line-height:20px;border-width:1px;border-style:solid;border-radius:2px 0 0 2px;text-align:center;background-color:#FBFBFB;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;box-sizing:border-box}.layui-form-pane .layui-input-inline{margin-left:-1px}.layui-form-pane .layui-input-block{margin-left:110px;left:-1px}.layui-form-pane .layui-input{border-radius:0 2px 2px 0}.layui-form-pane .layui-form-text .layui-form-label{float:none;width:100%;border-radius:2px;box-sizing:border-box;text-align:left}.layui-form-pane .layui-form-text .layui-input-inline{display:block;margin:0;top:-1px;clear:both}.layui-form-pane .layui-form-text .layui-input-block{margin:0;left:0;top:-1px}.layui-form-pane .layui-form-text .layui-textarea{min-height:100px;border-radius:0 0 2px 2px}.layui-form-pane .layui-form-checkbox{margin:4px 0 4px 10px}.layui-form-pane .layui-form-radio,.layui-form-pane .layui-form-switch{margin-top:6px;margin-left:10px}.layui-form-pane .layui-form-item[pane]{position:relative;border-width:1px;border-style:solid}.layui-form-pane .layui-form-item[pane] .layui-form-label{position:absolute;left:0;top:0;height:100%;border-width:0 1px 0 0}.layui-form-pane .layui-form-item[pane] .layui-input-inline{margin-left:110px}@media screen and (max-width:450px){.layui-form-item .layui-form-label{text-overflow:ellipsis;overflow:hidden;white-space:nowrap}.layui-form-item .layui-inline{display:block;margin-right:0;margin-bottom:20px;clear:both}.layui-form-item .layui-inline:after{content:'\20';clear:both;display:block;height:0}.layui-form-item .layui-input-inline{display:block;float:none;left:-3px;width:auto!important;margin:0 0 10px 112px}.layui-form-item .layui-input-inline+.layui-form-mid{margin-left:110px;top:-5px;padding:0}.layui-form-item .layui-form-checkbox{margin-right:5px;margin-bottom:5px}}.layui-layedit{border-width:1px;border-style:solid;border-radius:2px}.layui-layedit-tool{padding:3px 5px;border-bottom-width:1px;border-bottom-style:solid;font-size:0}.layedit-tool-fixed{position:fixed;top:0;border-top:1px solid #eee}.layui-layedit-tool .layedit-tool-mid,.layui-layedit-tool .layui-icon{display:inline-block;vertical-align:middle;text-align:center;font-size:14px}.layui-layedit-tool .layui-icon{position:relative;width:32px;height:30px;line-height:30px;margin:3px 5px;color:#777;cursor:pointer;border-radius:2px}.layui-layedit-tool .layui-icon:hover{color:#393D49}.layui-layedit-tool .layui-icon:active{color:#000}.layui-layedit-tool .layedit-tool-active{background-color:#eee;color:#000}.layui-layedit-tool .layui-disabled,.layui-layedit-tool .layui-disabled:hover{color:#d2d2d2;cursor:not-allowed}.layui-layedit-tool .layedit-tool-mid{width:1px;height:18px;margin:0 10px;background-color:#d2d2d2}.layedit-tool-html{width:50px!important;font-size:30px!important}.layedit-tool-b,.layedit-tool-code,.layedit-tool-help{font-size:16px!important}.layedit-tool-d,.layedit-tool-face,.layedit-tool-image,.layedit-tool-unlink{font-size:18px!important}.layedit-tool-image input{position:absolute;font-size:0;left:0;top:0;width:100%;height:100%;opacity:.01;filter:Alpha(opacity=1);cursor:pointer}.layui-layedit-iframe iframe{display:block;width:100%}#LAY_layedit_code{overflow:hidden}.layui-laypage{display:inline-block;*display:inline;*zoom:1;vertical-align:middle;margin:10px 0;font-size:0}.layui-laypage>a:first-child,.layui-laypage>a:first-child em{border-radius:2px 0 0 2px}.layui-laypage>a:last-child,.layui-laypage>a:last-child em{border-radius:0 2px 2px 0}.layui-laypage>:first-child{margin-left:0!important}.layui-laypage>:last-child{margin-right:0!important}.layui-laypage a,.layui-laypage button,.layui-laypage input,.layui-laypage select,.layui-laypage span{border:1px solid #eee}.layui-laypage a,.layui-laypage span{display:inline-block;*display:inline;*zoom:1;vertical-align:middle;padding:0 15px;height:28px;line-height:28px;margin:0 -1px 5px 0;background-color:#fff;color:#333;font-size:12px}.layui-flow-more a *,.layui-laypage input,.layui-table-view select[lay-ignore]{display:inline-block}.layui-laypage a:hover{color:#009688}.layui-laypage em{font-style:normal}.layui-laypage .layui-laypage-spr{color:#999;font-weight:700}.layui-laypage a{text-decoration:none}.layui-laypage .layui-laypage-curr{position:relative}.layui-laypage .layui-laypage-curr em{position:relative;color:#fff}.layui-laypage .layui-laypage-curr .layui-laypage-em{position:absolute;left:-1px;top:-1px;padding:1px;width:100%;height:100%;background-color:#009688}.layui-laypage-em{border-radius:2px}.layui-laypage-next em,.layui-laypage-prev em{font-family:Sim sun;font-size:16px}.layui-laypage .layui-laypage-count,.layui-laypage .layui-laypage-limits,.layui-laypage .layui-laypage-refresh,.layui-laypage .layui-laypage-skip{margin-left:10px;margin-right:10px;padding:0;border:none}.layui-laypage .layui-laypage-limits,.layui-laypage .layui-laypage-refresh{vertical-align:top}.layui-laypage .layui-laypage-refresh i{font-size:18px;cursor:pointer}.layui-laypage select{height:22px;padding:3px;border-radius:2px;cursor:pointer}.layui-laypage .layui-laypage-skip{height:30px;line-height:30px;color:#999}.layui-laypage button,.layui-laypage input{height:30px;line-height:30px;border-radius:2px;vertical-align:top;background-color:#fff;box-sizing:border-box}.layui-laypage input{width:40px;margin:0 10px;padding:0 3px;text-align:center}.layui-laypage input:focus,.layui-laypage select:focus{border-color:#009688!important}.layui-laypage button{margin-left:10px;padding:0 10px;cursor:pointer}.layui-table,.layui-table-view{margin:10px 0}.layui-flow-more{margin:10px 0;text-align:center;color:#999;font-size:14px}.layui-flow-more a{height:32px;line-height:32px}.layui-flow-more a *{vertical-align:top}.layui-flow-more a cite{padding:0 20px;border-radius:3px;background-color:#eee;color:#333;font-style:normal}.layui-flow-more a cite:hover{opacity:.8}.layui-flow-more a i{font-size:30px;color:#737383}.layui-table{width:100%;background-color:#fff;color:#666}.layui-table tr{transition:all .3s;-webkit-transition:all .3s}.layui-table th{text-align:left;font-weight:400}.layui-table tbody tr:hover,.layui-table thead tr,.layui-table-click,.layui-table-header,.layui-table-hover,.layui-table-mend,.layui-table-patch,.layui-table-tool,.layui-table-total,.layui-table-total tr,.layui-table[lay-even] tr:nth-child(even){background-color:#FAFAFA}.layui-table td,.layui-table th,.layui-table-col-set,.layui-table-fixed-r,.layui-table-grid-down,.layui-table-header,.layui-table-page,.layui-table-tips-main,.layui-table-tool,.layui-table-total,.layui-table-view,.layui-table[lay-skin=line],.layui-table[lay-skin=row]{border-width:1px;border-style:solid;border-color:#eee}.layui-table td,.layui-table th{position:relative;padding:9px 15px;min-height:20px;line-height:20px;font-size:14px}.layui-table[lay-skin=line] td,.layui-table[lay-skin=line] th{border-width:0 0 1px}.layui-table[lay-skin=row] td,.layui-table[lay-skin=row] th{border-width:0 1px 0 0}.layui-table[lay-skin=nob] td,.layui-table[lay-skin=nob] th{border:none}.layui-table img{max-width:100px}.layui-table[lay-size=lg] td,.layui-table[lay-size=lg] th{padding:15px 30px}.layui-table-view .layui-table[lay-size=lg] .layui-table-cell{height:40px;line-height:40px}.layui-table[lay-size=sm] td,.layui-table[lay-size=sm] th{font-size:12px;padding:5px 10px}.layui-table-view .layui-table[lay-size=sm] .layui-table-cell{height:20px;line-height:20px}.layui-table[lay-data]{display:none}.layui-table-box{position:relative;overflow:hidden}.layui-table-view .layui-table{position:relative;width:auto;margin:0}.layui-table-view .layui-table[lay-skin=line]{border-width:0 1px 0 0}.layui-table-view .layui-table[lay-skin=row]{border-width:0 0 1px}.layui-table-view .layui-table td,.layui-table-view .layui-table th{padding:5px 0;border-top:none;border-left:none}.layui-table-view .layui-table th.layui-unselect .layui-table-cell span{cursor:pointer}.layui-table-view .layui-table td{cursor:default}.layui-table-view .layui-table td[data-edit=text]{cursor:text}.layui-table-view .layui-form-checkbox[lay-skin=primary] i{width:18px;height:18px}.layui-table-view .layui-form-radio{line-height:0;padding:0}.layui-table-view .layui-form-radio>i{margin:0;font-size:20px}.layui-table-init{position:absolute;left:0;top:0;width:100%;height:100%;text-align:center;z-index:110}.layui-table-init .layui-icon{position:absolute;left:50%;top:50%;margin:-15px 0 0 -15px;font-size:30px;color:#c2c2c2}.layui-table-header{border-width:0 0 1px;overflow:hidden}.layui-table-header .layui-table{margin-bottom:-1px}.layui-table-tool .layui-inline[lay-event]{position:relative;width:26px;height:26px;padding:5px;line-height:16px;margin-right:10px;text-align:center;color:#333;border:1px solid #ccc;cursor:pointer;-webkit-transition:.5s all;transition:.5s all}.layui-table-tool .layui-inline[lay-event]:hover{border:1px solid #999}.layui-table-tool-temp{padding-right:120px}.layui-table-tool-self{position:absolute;right:17px;top:10px}.layui-table-tool .layui-table-tool-self .layui-inline[lay-event]{margin:0 0 0 10px}.layui-table-tool-panel{position:absolute;top:29px;left:-1px;padding:5px 0;min-width:150px;min-height:40px;border:1px solid #d2d2d2;text-align:left;overflow-y:auto;background-color:#fff;box-shadow:0 2px 4px rgba(0,0,0,.12)}.layui-table-cell,.layui-table-tool-panel li{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.layui-table-tool-panel li{padding:0 10px;line-height:30px;-webkit-transition:.5s all;transition:.5s all}.layui-menu li,.layui-menu-body-title a:hover,.layui-menu-body-title>.layui-icon:hover{transition:all .3s}.layui-table-tool-panel li .layui-form-checkbox[lay-skin=primary]{width:100%;padding-left:28px}.layui-table-tool-panel li:hover{background-color:#F6F6F6}.layui-table-tool-panel li .layui-form-checkbox[lay-skin=primary] i{position:absolute;left:0;top:0}.layui-table-tool-panel li .layui-form-checkbox[lay-skin=primary] span{padding:0}.layui-table-tool .layui-table-tool-self .layui-table-tool-panel{left:auto;right:-1px}.layui-table-col-set{position:absolute;right:0;top:0;width:20px;height:100%;border-width:0 0 0 1px;background-color:#fff}.layui-table-sort{width:10px;height:20px;margin-left:5px;cursor:pointer!important}.layui-table-sort .layui-edge{position:absolute;left:5px;border-width:5px}.layui-table-sort .layui-table-sort-asc{top:3px;border-top:none;border-bottom-style:solid;border-bottom-color:#b2b2b2}.layui-table-sort .layui-table-sort-asc:hover{border-bottom-color:#666}.layui-table-sort .layui-table-sort-desc{bottom:5px;border-bottom:none;border-top-style:solid;border-top-color:#b2b2b2}.layui-table-sort .layui-table-sort-desc:hover{border-top-color:#666}.layui-table-sort[lay-sort=asc] .layui-table-sort-asc{border-bottom-color:#000}.layui-table-sort[lay-sort=desc] .layui-table-sort-desc{border-top-color:#000}.layui-table-cell{height:28px;line-height:28px;padding:0 15px;position:relative;box-sizing:border-box}.layui-table-cell .layui-form-checkbox[lay-skin=primary]{top:-1px;padding:0}.layui-table-cell .layui-table-link{color:#01AAED}.laytable-cell-checkbox,.laytable-cell-numbers,.laytable-cell-radio,.laytable-cell-space{padding:0;text-align:center}.layui-table-body{position:relative;overflow:auto;margin-right:-1px;margin-bottom:-1px}.layui-table-body .layui-none{line-height:26px;padding:30px 15px;text-align:center;color:#999}.layui-table-fixed{position:absolute;left:0;top:0;z-index:101}.layui-table-fixed .layui-table-body{overflow:hidden}.layui-table-fixed-l{box-shadow:0 -1px 8px rgba(0,0,0,.08)}.layui-table-fixed-r{left:auto;right:-1px;border-width:0 0 0 1px;box-shadow:-1px 0 8px rgba(0,0,0,.08)}.layui-table-fixed-r .layui-table-header{position:relative;overflow:visible}.layui-table-mend{position:absolute;right:-49px;top:0;height:100%;width:50px}.layui-table-tool{position:relative;z-index:890;width:100%;min-height:50px;line-height:30px;padding:10px 15px;border-width:0 0 1px}.layui-table-tool .layui-btn-container{margin-bottom:-10px}.layui-table-page,.layui-table-total{border-width:1px 0 0;margin-bottom:-1px;overflow:hidden}.layui-table-page{position:relative;width:100%;padding:7px 7px 0;height:41px;font-size:12px;white-space:nowrap}.layui-table-page>div{height:26px}.layui-table-page .layui-laypage{margin:0}.layui-table-page .layui-laypage a,.layui-table-page .layui-laypage span{height:26px;line-height:26px;margin-bottom:10px;border:none;background:0 0}.layui-table-page .layui-laypage a,.layui-table-page .layui-laypage span.layui-laypage-curr{padding:0 12px}.layui-table-page .layui-laypage span{margin-left:0;padding:0}.layui-table-page .layui-laypage .layui-laypage-prev{margin-left:-7px!important}.layui-table-page .layui-laypage .layui-laypage-curr .layui-laypage-em{left:0;top:0;padding:0}.layui-table-page .layui-laypage button,.layui-table-page .layui-laypage input{height:26px;line-height:26px}.layui-table-page .layui-laypage input{width:40px}.layui-table-page .layui-laypage button{padding:0 10px}.layui-table-page select{height:18px}.layui-table-patch .layui-table-cell{padding:0;width:30px}.layui-table-edit{position:absolute;left:0;top:0;width:100%;height:100%;padding:0 14px 1px;border-radius:0;box-shadow:1px 1px 20px rgba(0,0,0,.15)}.layui-table-edit:focus{border-color:#5FB878!important}select.layui-table-edit{padding:0 0 0 10px;border-color:#d2d2d2}.layui-table-view .layui-form-checkbox,.layui-table-view .layui-form-radio,.layui-table-view .layui-form-switch{top:0;margin:0;box-sizing:content-box}.layui-colorpicker-alpha-slider,.layui-colorpicker-side-slider,.layui-menu,.layui-menu *,.layui-nav{box-sizing:border-box}.layui-table-view .layui-form-checkbox{top:-1px;height:26px;line-height:26px}.layui-table-view .layui-form-checkbox i{height:26px}.layui-table-grid .layui-table-cell{overflow:visible}.layui-table-grid-down{position:absolute;top:0;right:0;width:26px;height:100%;padding:5px 0;border-width:0 0 0 1px;text-align:center;background-color:#fff;color:#999;cursor:pointer}.layui-table-grid-down .layui-icon{position:absolute;top:50%;left:50%;margin:-8px 0 0 -8px}.layui-table-grid-down:hover{background-color:#fbfbfb}body .layui-table-tips .layui-layer-content{background:0 0;padding:0;box-shadow:0 1px 6px rgba(0,0,0,.12)}.layui-table-tips-main{margin:-44px 0 0 -1px;max-height:150px;padding:8px 15px;font-size:14px;overflow-y:scroll;background-color:#fff;color:#666}.layui-table-tips-c{position:absolute;right:-3px;top:-13px;width:20px;height:20px;padding:3px;cursor:pointer;background-color:#666;border-radius:50%;color:#fff}.layui-table-tips-c:hover{background-color:#777}.layui-table-tips-c:before{position:relative;right:-2px}.layui-upload-file{display:none!important;opacity:.01;filter:Alpha(opacity=1)}.layui-upload-drag,.layui-upload-form,.layui-upload-wrap{display:inline-block}.layui-upload-list{margin:10px 0}.layui-upload-choose{max-width:200px;padding:0 10px;color:#999;font-size:14px;text-overflow:ellipsis;overflow:hidden;white-space:nowrap}.layui-upload-drag{position:relative;padding:30px;border:1px dashed #e2e2e2;background-color:#fff;text-align:center;cursor:pointer;color:#999}.layui-upload-drag .layui-icon{font-size:50px;color:#009688}.layui-upload-drag[lay-over]{border-color:#009688}.layui-upload-iframe{position:absolute;width:0;height:0;border:0;visibility:hidden}.layui-upload-wrap{position:relative;vertical-align:middle}.layui-upload-wrap .layui-upload-file{display:block!important;position:absolute;left:0;top:0;z-index:10;font-size:100px;width:100%;height:100%;opacity:.01;filter:Alpha(opacity=1);cursor:pointer}.layui-btn-container .layui-upload-choose{padding-left:0}.layui-menu{position:relative;margin:5px 0;background-color:#fff}.layui-menu li,.layui-menu-body-title a{padding:5px 15px}.layui-menu li{position:relative;margin:1px 0;width:calc(100% + 1px);line-height:26px;color:rgba(0,0,0,.8);font-size:14px;white-space:nowrap;cursor:pointer}.layui-menu li:hover{background-color:#F6F6F6}.layui-menu-item-parent:hover>.layui-menu-body-panel{display:block;animation-name:layui-fadein;animation-duration:.3s;animation-fill-mode:both;animation-delay:.2s}.layui-menu-item-group .layui-menu-body-title,.layui-menu-item-parent .layui-menu-body-title{padding-right:25px}.layui-menu .layui-menu-item-divider:hover,.layui-menu .layui-menu-item-group:hover,.layui-menu .layui-menu-item-none:hover{background:0 0;cursor:default}.layui-menu .layui-menu-item-group>ul{margin:5px 0 -5px}.layui-menu .layui-menu-item-group>.layui-menu-body-title{color:rgba(0,0,0,.35);user-select:none}.layui-menu .layui-menu-item-none{color:rgba(0,0,0,.35);cursor:default;text-align:center}.layui-menu .layui-menu-item-divider{margin:5px 0;padding:0;height:0;line-height:0;border-bottom:1px solid #eee;overflow:hidden}.layui-menu .layui-menu-item-down:hover,.layui-menu .layui-menu-item-up:hover{cursor:pointer}.layui-menu .layui-menu-item-up>.layui-menu-body-title{color:rgba(0,0,0,.8)}.layui-menu .layui-menu-item-up>ul{visibility:hidden;height:0;overflow:hidden}.layui-menu .layui-menu-item-down:hover>.layui-menu-body-title>.layui-icon,.layui-menu .layui-menu-item-up>.layui-menu-body-title:hover>.layui-icon{color:rgba(0,0,0,1)}.layui-menu .layui-menu-item-down>ul{visibility:visible;height:auto}.layui-breadcrumb,.layui-tree-btnGroup{visibility:hidden}.layui-menu .layui-menu-item-checked,.layui-menu .layui-menu-item-checked2{background-color:#F6F6F6!important;color:#5FB878}.layui-menu .layui-menu-item-checked a,.layui-menu .layui-menu-item-checked2 a{color:#5FB878}.layui-menu .layui-menu-item-checked:after{position:absolute;right:0;top:0;bottom:0;border-right:3px solid #5FB878;content:""}.layui-menu-body-title{position:relative;overflow:hidden;text-overflow:ellipsis}.layui-menu-body-title a{display:block;margin:-5px -15px;color:rgba(0,0,0,.8)}.layui-menu-body-title>.layui-icon{position:absolute;right:0;top:0;font-size:14px}.layui-menu-body-title>.layui-icon-right{right:-1px}.layui-menu-body-panel{display:none;position:absolute;top:-7px;left:100%;z-index:1000;margin-left:13px;padding:5px 0}.layui-menu-body-panel:before{content:"";position:absolute;width:20px;left:-16px;top:0;bottom:0}.layui-menu-body-panel-left{left:auto;right:100%;margin:0 13px}.layui-menu-body-panel-left:before{left:auto;right:-16px}.layui-menu-lg li{line-height:32px}.layui-menu-lg .layui-menu-body-title a:hover,.layui-menu-lg li:hover{background:0 0;color:#5FB878}.layui-menu-lg li .layui-menu-body-panel{margin-left:14px}.layui-menu-lg li .layui-menu-body-panel-left{margin:0 15px}.layui.dropdown{position:absolute;left:-999999px;top:-999999px;z-index:66666666;margin:5px 0;min-width:100px}.layui.dropdown:before{content:"";position:absolute;width:100%;height:6px;left:0;top:-6px}.layui-nav{position:relative;padding:0 20px;background-color:#393D49;color:#fff;border-radius:2px;font-size:0}.layui-nav *{font-size:14px}.layui-nav .layui-nav-item{position:relative;display:inline-block;*display:inline;*zoom:1;vertical-align:middle;line-height:60px}.layui-nav .layui-nav-item a{display:block;padding:0 20px;color:#fff;color:rgba(255,255,255,.7);transition:all .3s;-webkit-transition:all .3s}.layui-nav .layui-this:after,.layui-nav-bar{content:"";position:absolute;left:0;top:0;width:0;height:5px;background-color:#5FB878;transition:all .2s;-webkit-transition:all .2s;pointer-events:none}.layui-nav-bar{z-index:1000}.layui-nav[lay-bar=disabled] .layui-nav-bar{display:none}.layui-nav .layui-nav-item a:hover,.layui-nav .layui-this a{color:#fff}.layui-nav .layui-this:after{top:auto;bottom:0;width:100%}.layui-nav-img{width:30px;height:30px;margin-right:10px;border-radius:50%}.layui-nav .layui-nav-more{position:absolute;top:0;right:3px;left:auto!important;margin-top:0;font-size:12px;cursor:pointer;transition:all .2s;-webkit-transition:all .2s}.layui-nav .layui-nav-mored,.layui-nav-itemed>a .layui-nav-more{transform:rotate(180deg)}.layui-nav-child{display:none;position:absolute;left:0;top:65px;min-width:100%;line-height:36px;padding:5px 0;box-shadow:0 2px 4px rgba(0,0,0,.12);border:1px solid #eee;background-color:#fff;z-index:100;border-radius:2px;white-space:nowrap}.layui-nav .layui-nav-child a{color:#666;color:rgba(0,0,0,.8)}.layui-nav .layui-nav-child a:hover{background-color:#F6F6F6;color:rgba(0,0,0,.8)}.layui-nav-child dd{margin:1px 0;position:relative}.layui-nav-child dd.layui-this{background-color:#F6F6F6;color:#000}.layui-nav-child dd.layui-this:after{display:none}.layui-nav-child-r{left:auto;right:0}.layui-nav-child-c{text-align:center}.layui-nav-tree{width:200px;padding:0}.layui-nav-tree .layui-nav-item{display:block;width:100%;line-height:40px}.layui-nav-tree .layui-nav-item a{position:relative;height:40px;line-height:40px;text-overflow:ellipsis;overflow:hidden;white-space:nowrap}.layui-nav-tree .layui-nav-item>a{padding-top:5px;padding-bottom:5px}.layui-nav-tree .layui-nav-more{right:15px}.layui-nav-tree .layui-nav-item>a .layui-nav-more{padding:5px 0}.layui-nav-tree .layui-nav-bar{width:5px;height:0;background-color:#009688}.layui-side .layui-nav-tree .layui-nav-bar{width:2px}.layui-nav-tree .layui-nav-child dd.layui-this,.layui-nav-tree .layui-nav-child dd.layui-this a,.layui-nav-tree .layui-this,.layui-nav-tree .layui-this>a,.layui-nav-tree .layui-this>a:hover{background-color:#009688;color:#fff}.layui-nav-tree .layui-this:after{display:none}.layui-nav-itemed>a,.layui-nav-tree .layui-nav-title a,.layui-nav-tree .layui-nav-title a:hover{color:#fff!important}.layui-nav-tree .layui-nav-child{position:relative;z-index:0;top:0;border:none;box-shadow:none}.layui-nav-tree .layui-nav-child dd{margin:0}.layui-nav-tree .layui-nav-child a{color:#fff;color:rgba(255,255,255,.7)}.layui-nav-tree .layui-nav-child,.layui-nav-tree .layui-nav-child a:hover{background:0 0;color:#fff}.layui-nav-itemed>.layui-nav-child{display:block;background-color:rgba(0,0,0,.3)!important}.layui-nav-itemed>.layui-nav-child>.layui-this>.layui-nav-child{display:block}.layui-nav-side{position:fixed;top:0;bottom:0;left:0;overflow-x:hidden;z-index:999}.layui-breadcrumb{font-size:0}.layui-breadcrumb>*{font-size:14px}.layui-breadcrumb a{color:#999!important}.layui-breadcrumb a:hover{color:#5FB878!important}.layui-breadcrumb a cite{color:#666;font-style:normal}.layui-breadcrumb span[lay-separator]{margin:0 10px;color:#999}.layui-tab{margin:10px 0;text-align:left!important}.layui-tab[overflow]>.layui-tab-title{overflow:hidden}.layui-tab-title{position:relative;left:0;height:40px;white-space:nowrap;font-size:0;border-bottom-width:1px;border-bottom-style:solid;transition:all .2s;-webkit-transition:all .2s}.layui-tab-title li{display:inline-block;*display:inline;*zoom:1;vertical-align:middle;font-size:14px;transition:all .2s;-webkit-transition:all .2s;position:relative;line-height:40px;min-width:65px;padding:0 15px;text-align:center;cursor:pointer}.layui-tab-title li a{display:block;padding:0 15px;margin:0 -15px}.layui-tab-title .layui-this{color:#000}.layui-tab-title .layui-this:after{position:absolute;left:0;top:0;content:"";width:100%;height:41px;border-width:1px;border-style:solid;border-bottom-color:#fff;border-radius:2px 2px 0 0;box-sizing:border-box;pointer-events:none}.layui-tab-bar{position:absolute;right:0;top:0;z-index:10;width:30px;height:39px;line-height:39px;border-width:1px;border-style:solid;border-radius:2px;text-align:center;background-color:#fff;cursor:pointer}.layui-tab-bar .layui-icon{position:relative;display:inline-block;top:3px;transition:all .3s;-webkit-transition:all .3s}.layui-tab-item{display:none}.layui-tab-more{padding-right:30px;height:auto!important;white-space:normal!important}.layui-tab-more li.layui-this:after{border-bottom-color:#eee;border-radius:2px}.layui-tab-more .layui-tab-bar .layui-icon{top:-2px;top:3px\9;-webkit-transform:rotate(180deg);transform:rotate(180deg)}:root .layui-tab-more .layui-tab-bar .layui-icon{top:-2px\0/IE9}.layui-tab-content{padding:15px 0}.layui-tab-title li .layui-tab-close{position:relative;display:inline-block;width:18px;height:18px;line-height:20px;margin-left:8px;top:1px;text-align:center;font-size:14px;color:#c2c2c2;transition:all .2s;-webkit-transition:all .2s}.layui-tab-title li .layui-tab-close:hover{border-radius:2px;background-color:#FF5722;color:#fff}.layui-tab-brief>.layui-tab-title .layui-this{color:#009688}.layui-tab-brief>.layui-tab-more li.layui-this:after,.layui-tab-brief>.layui-tab-title .layui-this:after{border:none;border-radius:0;border-bottom:2px solid #5FB878}.layui-tab-brief[overflow]>.layui-tab-title .layui-this:after{top:-1px}.layui-tab-card{border-width:1px;border-style:solid;border-radius:2px;box-shadow:0 2px 5px 0 rgba(0,0,0,.1)}.layui-tab-card>.layui-tab-title{background-color:#FAFAFA}.layui-tab-card>.layui-tab-title li{margin-right:-1px;margin-left:-1px}.layui-tab-card>.layui-tab-title .layui-this{background-color:#fff}.layui-tab-card>.layui-tab-title .layui-this:after{border-top:none;border-width:1px;border-bottom-color:#fff}.layui-tab-card>.layui-tab-title .layui-tab-bar{height:40px;line-height:40px;border-radius:0;border-top:none;border-right:none}.layui-tab-card>.layui-tab-more .layui-this{background:0 0;color:#5FB878}.layui-tab-card>.layui-tab-more .layui-this:after{border:none}.layui-timeline{padding-left:5px}.layui-timeline-item{position:relative;padding-bottom:20px}.layui-timeline-axis{position:absolute;left:-5px;top:0;z-index:10;width:20px;height:20px;line-height:20px;background-color:#fff;color:#5FB878;border-radius:50%;text-align:center;cursor:pointer}.layui-timeline-axis:hover{color:#FF5722}.layui-timeline-item:before{content:"";position:absolute;left:5px;top:0;z-index:0;width:1px;height:100%}.layui-timeline-item:first-child:before{display:block}.layui-timeline-item:last-child:before{display:none}.layui-timeline-content{padding-left:25px}.layui-timeline-title{position:relative;margin-bottom:10px;line-height:22px}.layui-badge,.layui-badge-dot,.layui-badge-rim{position:relative;display:inline-block;padding:0 6px;font-size:12px;text-align:center;background-color:#FF5722;color:#fff;border-radius:2px}.layui-badge{height:18px;line-height:18px}.layui-badge-dot{width:8px;height:8px;padding:0;border-radius:50%}.layui-badge-rim{height:18px;line-height:18px;border-width:1px;border-style:solid;background-color:#fff;color:#666}.layui-btn .layui-badge,.layui-btn .layui-badge-dot{margin-left:5px}.layui-nav .layui-badge,.layui-nav .layui-badge-dot{position:absolute;top:50%;margin:-5px 6px 0}.layui-nav .layui-badge{margin-top:-10px}.layui-tab-title .layui-badge,.layui-tab-title .layui-badge-dot{left:5px;top:-2px}.layui-carousel{position:relative;left:0;top:0;background-color:#f8f8f8}.layui-carousel>[carousel-item]{position:relative;width:100%;height:100%;overflow:hidden}.layui-carousel>[carousel-item]:before{position:absolute;content:'\e63d';left:50%;top:50%;width:100px;line-height:20px;margin:-10px 0 0 -50px;text-align:center;color:#c2c2c2;font-family:layui-icon!important;font-size:30px;font-style:normal;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.layui-carousel>[carousel-item]>*{display:none;position:absolute;left:0;top:0;width:100%;height:100%;background-color:#f8f8f8;transition-duration:.3s;-webkit-transition-duration:.3s}.layui-carousel-updown>*{-webkit-transition:.3s ease-in-out up;transition:.3s ease-in-out up}.layui-carousel-arrow{display:none\9;opacity:0;position:absolute;left:10px;top:50%;margin-top:-18px;width:36px;height:36px;line-height:36px;text-align:center;font-size:20px;border:0;border-radius:50%;background-color:rgba(0,0,0,.2);color:#fff;-webkit-transition-duration:.3s;transition-duration:.3s;cursor:pointer}.layui-carousel-arrow[lay-type=add]{left:auto!important;right:10px}.layui-carousel:hover .layui-carousel-arrow[lay-type=add],.layui-carousel[lay-arrow=always] .layui-carousel-arrow[lay-type=add]{right:20px}.layui-carousel[lay-arrow=always] .layui-carousel-arrow{opacity:1;left:20px}.layui-carousel[lay-arrow=none] .layui-carousel-arrow{display:none}.layui-carousel-arrow:hover,.layui-carousel-ind ul:hover{background-color:rgba(0,0,0,.35)}.layui-carousel:hover .layui-carousel-arrow{display:block\9;opacity:1;left:20px}.layui-carousel-ind{position:relative;top:-35px;width:100%;line-height:0!important;text-align:center;font-size:0}.layui-carousel[lay-indicator=outside]{margin-bottom:30px}.layui-carousel[lay-indicator=outside] .layui-carousel-ind{top:10px}.layui-carousel[lay-indicator=outside] .layui-carousel-ind ul{background-color:rgba(0,0,0,.5)}.layui-carousel[lay-indicator=none] .layui-carousel-ind{display:none}.layui-carousel-ind ul{display:inline-block;padding:5px;background-color:rgba(0,0,0,.2);border-radius:10px;-webkit-transition-duration:.3s;transition-duration:.3s}.layui-carousel-ind li{display:inline-block;width:10px;height:10px;margin:0 3px;font-size:14px;background-color:#eee;background-color:rgba(255,255,255,.5);border-radius:50%;cursor:pointer;-webkit-transition-duration:.3s;transition-duration:.3s}.layui-carousel-ind li:hover{background-color:rgba(255,255,255,.7)}.layui-carousel-ind li.layui-this{background-color:#fff}.layui-carousel>[carousel-item]>.layui-carousel-next,.layui-carousel>[carousel-item]>.layui-carousel-prev,.layui-carousel>[carousel-item]>.layui-this{display:block}.layui-carousel>[carousel-item]>.layui-this{left:0}.layui-carousel>[carousel-item]>.layui-carousel-prev{left:-100%}.layui-carousel>[carousel-item]>.layui-carousel-next{left:100%}.layui-carousel>[carousel-item]>.layui-carousel-next.layui-carousel-left,.layui-carousel>[carousel-item]>.layui-carousel-prev.layui-carousel-right{left:0}.layui-carousel>[carousel-item]>.layui-this.layui-carousel-left{left:-100%}.layui-carousel>[carousel-item]>.layui-this.layui-carousel-right{left:100%}.layui-carousel[lay-anim=updown] .layui-carousel-arrow{left:50%!important;top:20px;margin:0 0 0 -18px}.layui-carousel[lay-anim=updown]>[carousel-item]>*,.layui-carousel[lay-anim=fade]>[carousel-item]>*{left:0!important}.layui-carousel[lay-anim=updown] .layui-carousel-arrow[lay-type=add]{top:auto!important;bottom:20px}.layui-carousel[lay-anim=updown] .layui-carousel-ind{position:absolute;top:50%;right:20px;width:auto;height:auto}.layui-carousel[lay-anim=updown] .layui-carousel-ind ul{padding:3px 5px}.layui-carousel[lay-anim=updown] .layui-carousel-ind li{display:block;margin:6px 0}.layui-carousel[lay-anim=updown]>[carousel-item]>.layui-this{top:0}.layui-carousel[lay-anim=updown]>[carousel-item]>.layui-carousel-prev{top:-100%}.layui-carousel[lay-anim=updown]>[carousel-item]>.layui-carousel-next{top:100%}.layui-carousel[lay-anim=updown]>[carousel-item]>.layui-carousel-next.layui-carousel-left,.layui-carousel[lay-anim=updown]>[carousel-item]>.layui-carousel-prev.layui-carousel-right{top:0}.layui-carousel[lay-anim=updown]>[carousel-item]>.layui-this.layui-carousel-left{top:-100%}.layui-carousel[lay-anim=updown]>[carousel-item]>.layui-this.layui-carousel-right{top:100%}.layui-carousel[lay-anim=fade]>[carousel-item]>.layui-carousel-next,.layui-carousel[lay-anim=fade]>[carousel-item]>.layui-carousel-prev{opacity:0}.layui-carousel[lay-anim=fade]>[carousel-item]>.layui-carousel-next.layui-carousel-left,.layui-carousel[lay-anim=fade]>[carousel-item]>.layui-carousel-prev.layui-carousel-right{opacity:1}.layui-carousel[lay-anim=fade]>[carousel-item]>.layui-this.layui-carousel-left,.layui-carousel[lay-anim=fade]>[carousel-item]>.layui-this.layui-carousel-right{opacity:0}.layui-fixbar{position:fixed;right:15px;bottom:15px;z-index:999999}.layui-fixbar li{width:50px;height:50px;line-height:50px;margin-bottom:1px;text-align:center;cursor:pointer;font-size:30px;background-color:#9F9F9F;color:#fff;border-radius:2px;opacity:.95}.layui-fixbar li:hover{opacity:.85}.layui-fixbar li:active{opacity:1}.layui-fixbar .layui-fixbar-top{display:none;font-size:40px}body .layui-util-face{border:none;background:0 0}body .layui-util-face .layui-layer-content{padding:0;background-color:#fff;color:#666;box-shadow:none}.layui-util-face .layui-layer-TipsG{display:none}.layui-transfer-active,.layui-transfer-box{display:inline-block;vertical-align:middle}.layui-util-face ul{position:relative;width:372px;padding:10px;border:1px solid #D9D9D9;background-color:#fff;box-shadow:0 0 20px rgba(0,0,0,.2)}.layui-util-face ul li{cursor:pointer;float:left;border:1px solid #e8e8e8;height:22px;width:26px;overflow:hidden;margin:-1px 0 0 -1px;padding:4px 2px;text-align:center}.layui-util-face ul li:hover{position:relative;z-index:2;border:1px solid #eb7350;background:#fff9ec}.layui-code{position:relative;margin:10px 0;padding:15px;line-height:20px;border:1px solid #eee;border-left-width:6px;background-color:#FAFAFA;color:#333;font-family:Courier New;font-size:12px}.layui-transfer-box,.layui-transfer-header,.layui-transfer-search{border-width:0;border-style:solid;border-color:#eee}.layui-transfer-box{position:relative;border-width:1px;width:200px;height:360px;border-radius:2px;background-color:#fff}.layui-transfer-box .layui-form-checkbox{width:100%;margin:0!important}.layui-transfer-header{height:38px;line-height:38px;padding:0 10px;border-bottom-width:1px}.layui-transfer-search{position:relative;padding:10px;border-bottom-width:1px}.layui-transfer-search .layui-input{height:32px;padding-left:30px;font-size:12px}.layui-transfer-search .layui-icon-search{position:absolute;left:20px;top:50%;margin-top:-8px;color:#666}.layui-transfer-active{margin:0 15px}.layui-transfer-active .layui-btn{display:block;margin:0;padding:0 15px;background-color:#5FB878;border-color:#5FB878;color:#fff}.layui-transfer-active .layui-btn-disabled{background-color:#FBFBFB;border-color:#eee;color:#d2d2d2}.layui-transfer-active .layui-btn:first-child{margin-bottom:15px}.layui-transfer-active .layui-btn .layui-icon{margin:0;font-size:14px!important}.layui-transfer-data{padding:5px 0;overflow:auto}.layui-transfer-data li{height:32px;line-height:32px;padding:0 10px}.layui-transfer-data li:hover{background-color:#F6F6F6;transition:.5s all}.layui-transfer-data .layui-none{padding:15px 10px;text-align:center;color:#999}.layui-rate,.layui-rate *{display:inline-block;vertical-align:middle}.layui-rate{padding:10px 5px 10px 0;font-size:0}.layui-rate li i.layui-icon{font-size:20px;color:#FFB800;margin-right:5px;transition:all .3s;-webkit-transition:all .3s}.layui-rate li i:hover{cursor:pointer;transform:scale(1.12);-webkit-transform:scale(1.12)}.layui-rate[readonly] li i:hover{cursor:default;transform:scale(1)}.layui-colorpicker{width:26px;height:26px;border:1px solid #eee;padding:5px;border-radius:2px;line-height:24px;display:inline-block;cursor:pointer;transition:all .3s;-webkit-transition:all .3s}.layui-colorpicker:hover{border-color:#d2d2d2}.layui-colorpicker.layui-colorpicker-lg{width:34px;height:34px;line-height:32px}.layui-colorpicker.layui-colorpicker-sm{width:24px;height:24px;line-height:22px}.layui-colorpicker.layui-colorpicker-xs{width:22px;height:22px;line-height:20px}.layui-colorpicker-trigger-bgcolor{display:block;background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAIAAADZF8uwAAAAGUlEQVQYV2M4gwH+YwCGIasIUwhT25BVBADtzYNYrHvv4gAAAABJRU5ErkJggg==);border-radius:2px}.layui-colorpicker-trigger-span{display:block;height:100%;box-sizing:border-box;border:1px solid rgba(0,0,0,.15);border-radius:2px;text-align:center}.layui-colorpicker-trigger-i{display:inline-block;color:#FFF;font-size:12px}.layui-colorpicker-trigger-i.layui-icon-close{color:#999}.layui-colorpicker-main{position:absolute;z-index:66666666;width:280px;padding:7px;background:#FFF;border:1px solid #d2d2d2;border-radius:2px;box-shadow:0 2px 4px rgba(0,0,0,.12)}.layui-colorpicker-main-wrapper{height:180px;position:relative}.layui-colorpicker-basis{width:260px;height:100%;position:relative}.layui-colorpicker-basis-white{width:100%;height:100%;position:absolute;top:0;left:0;background:linear-gradient(90deg,#FFF,hsla(0,0%,100%,0))}.layui-colorpicker-basis-black{width:100%;height:100%;position:absolute;top:0;left:0;background:linear-gradient(0deg,#000,transparent)}.layui-colorpicker-basis-cursor{width:10px;height:10px;border:1px solid #FFF;border-radius:50%;position:absolute;top:-3px;right:-3px;cursor:pointer}.layui-colorpicker-side{position:absolute;top:0;right:0;width:12px;height:100%;background:linear-gradient(red,#FF0,#0F0,#0FF,#00F,#F0F,red)}.layui-colorpicker-side-slider{width:100%;height:5px;box-shadow:0 0 1px #888;background:#FFF;border-radius:1px;border:1px solid #f0f0f0;cursor:pointer;position:absolute;left:0}.layui-colorpicker-main-alpha{display:none;height:12px;margin-top:7px;background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAIAAADZF8uwAAAAGUlEQVQYV2M4gwH+YwCGIasIUwhT25BVBADtzYNYrHvv4gAAAABJRU5ErkJggg==)}.layui-colorpicker-alpha-bgcolor{height:100%;position:relative}.layui-colorpicker-alpha-slider{width:5px;height:100%;box-shadow:0 0 1px #888;background:#FFF;border-radius:1px;border:1px solid #f0f0f0;cursor:pointer;position:absolute;top:0}.layui-colorpicker-main-pre{padding-top:7px;font-size:0}.layui-colorpicker-pre{width:20px;height:20px;border-radius:2px;display:inline-block;margin-left:6px;margin-bottom:7px;cursor:pointer}.layui-colorpicker-pre:nth-child(11n+1){margin-left:0}.layui-colorpicker-pre-isalpha{background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAIAAADZF8uwAAAAGUlEQVQYV2M4gwH+YwCGIasIUwhT25BVBADtzYNYrHvv4gAAAABJRU5ErkJggg==)}.layui-colorpicker-pre.layui-this{box-shadow:0 0 3px 2px rgba(0,0,0,.15)}.layui-colorpicker-pre>div{height:100%;border-radius:2px}.layui-colorpicker-main-input{text-align:right;padding-top:7px}.layui-colorpicker-main-input .layui-btn-container .layui-btn{margin:0 0 0 10px}.layui-colorpicker-main-input div.layui-inline{float:left;margin-right:10px;font-size:14px}.layui-colorpicker-main-input input.layui-input{width:150px;height:30px;color:#666}.layui-slider{height:4px;background:#eee;border-radius:3px;position:relative;cursor:pointer}.layui-slider-bar{border-radius:3px;position:absolute;height:100%}.layui-slider-step{position:absolute;top:0;width:4px;height:4px;border-radius:50%;background:#FFF;-webkit-transform:translateX(-50%);transform:translateX(-50%)}.layui-slider-wrap{width:36px;height:36px;position:absolute;top:-16px;-webkit-transform:translateX(-50%);transform:translateX(-50%);z-index:10;text-align:center}.layui-slider-wrap-btn{width:12px;height:12px;border-radius:50%;background:#FFF;display:inline-block;vertical-align:middle;cursor:pointer;transition:.3s}.layui-slider-wrap:after{content:"";height:100%;display:inline-block;vertical-align:middle}.layui-slider-wrap-btn.layui-slider-hover,.layui-slider-wrap-btn:hover{transform:scale(1.2)}.layui-slider-wrap-btn.layui-disabled:hover{transform:scale(1)!important}.layui-slider-tips{position:absolute;top:-42px;z-index:66666666;white-space:nowrap;display:none;-webkit-transform:translateX(-50%);transform:translateX(-50%);color:#FFF;background:#000;border-radius:3px;height:25px;line-height:25px;padding:0 10px}.layui-slider-tips:after{content:"";position:absolute;bottom:-12px;left:50%;margin-left:-6px;width:0;height:0;border-width:6px;border-style:solid;border-color:#000 transparent transparent}.layui-slider-input{width:70px;height:32px;border:1px solid #eee;border-radius:3px;font-size:16px;line-height:32px;position:absolute;right:0;top:-14px}.layui-slider-input-btn{position:absolute;top:0;right:0;width:20px;height:100%;border-left:1px solid #eee}.layui-slider-input-btn i{cursor:pointer;position:absolute;right:0;bottom:0;width:20px;height:50%;font-size:12px;line-height:16px;text-align:center;color:#999}.layui-slider-input-btn i:first-child{top:0;border-bottom:1px solid #eee}.layui-slider-input-txt{height:100%;font-size:14px}.layui-slider-input-txt input{height:100%;border:none}.layui-slider-input-btn i:hover{color:#009688}.layui-slider-vertical{width:4px;margin-left:33px}.layui-slider-vertical .layui-slider-bar{width:4px}.layui-slider-vertical .layui-slider-step{top:auto;left:0;-webkit-transform:translateY(50%);transform:translateY(50%)}.layui-slider-vertical .layui-slider-wrap{top:auto;left:-16px;-webkit-transform:translateY(50%);transform:translateY(50%)}.layui-slider-vertical .layui-slider-tips{top:auto;left:2px}@media \0screen{.layui-slider-wrap-btn{margin-left:-20px}.layui-slider-vertical .layui-slider-wrap-btn{margin-left:0;margin-bottom:-20px}.layui-slider-vertical .layui-slider-tips{margin-left:-8px}.layui-slider>span{margin-left:8px}}.layui-tree{line-height:22px}.layui-tree .layui-form-checkbox{margin:0!important}.layui-tree-set{width:100%;position:relative}.layui-tree-pack{display:none;padding-left:20px;position:relative}.layui-tree-iconClick,.layui-tree-main{display:inline-block;vertical-align:middle}.layui-tree-line .layui-tree-pack{padding-left:27px}.layui-tree-line .layui-tree-set .layui-tree-set:after{content:"";position:absolute;top:14px;left:-9px;width:17px;height:0;border-top:1px dotted #c0c4cc}.layui-tree-entry{position:relative;padding:3px 0;height:20px;white-space:nowrap}.layui-tree-entry:hover{background-color:#eee}.layui-tree-line .layui-tree-entry:hover{background-color:rgba(0,0,0,0)}.layui-tree-line .layui-tree-entry:hover .layui-tree-txt{color:#999;text-decoration:underline;transition:.3s}.layui-tree-main{cursor:pointer;padding-right:10px}.layui-tree-line .layui-tree-set:before{content:"";position:absolute;top:0;left:-9px;width:0;height:100%;border-left:1px dotted #c0c4cc}.layui-tree-line .layui-tree-set.layui-tree-setLineShort:before{height:13px}.layui-tree-line .layui-tree-set.layui-tree-setHide:before{height:0}.layui-tree-iconClick{position:relative;height:20px;line-height:20px;margin:0 10px;color:#c0c4cc}.layui-tree-icon{height:12px;line-height:12px;width:12px;text-align:center;border:1px solid #c0c4cc}.layui-tree-iconClick .layui-icon{font-size:18px}.layui-tree-icon .layui-icon{font-size:12px;color:#666}.layui-tree-iconArrow{padding:0 5px}.layui-tree-iconArrow:after{content:"";position:absolute;left:4px;top:3px;z-index:100;width:0;height:0;border-width:5px;border-style:solid;border-color:transparent transparent transparent #c0c4cc;transition:.5s}.layui-tree-btnGroup,.layui-tree-editInput{position:relative;vertical-align:middle;display:inline-block}.layui-tree-spread>.layui-tree-entry>.layui-tree-iconClick>.layui-tree-iconArrow:after{transform:rotate(90deg) translate(3px,4px)}.layui-tree-txt{display:inline-block;vertical-align:middle;color:#555}.layui-tree-search{margin-bottom:15px;color:#666}.layui-tree-btnGroup .layui-icon{display:inline-block;vertical-align:middle;padding:0 2px;cursor:pointer}.layui-tree-btnGroup .layui-icon:hover{color:#999;transition:.3s}.layui-tree-entry:hover .layui-tree-btnGroup{visibility:visible}.layui-tree-editInput{height:20px;line-height:20px;padding:0 3px;border:none;background-color:rgba(0,0,0,.05)}.layui-tree-emptyText{text-align:center;color:#999}.layui-anim{-webkit-animation-duration:.3s;-webkit-animation-fill-mode:both;animation-duration:.3s;animation-fill-mode:both}.layui-anim.layui-icon{display:inline-block}.layui-anim-loop{-webkit-animation-iteration-count:infinite;animation-iteration-count:infinite}.layui-trans,.layui-trans a{transition:all .2s;-webkit-transition:all .2s}@-webkit-keyframes layui-rotate{from{-webkit-transform:rotate(0)}to{-webkit-transform:rotate(360deg)}}@keyframes layui-rotate{from{transform:rotate(0)}to{transform:rotate(360deg)}}.layui-anim-rotate{-webkit-animation-name:layui-rotate;animation-name:layui-rotate;-webkit-animation-duration:1s;animation-duration:1s;-webkit-animation-timing-function:linear;animation-timing-function:linear}@-webkit-keyframes layui-up{from{-webkit-transform:translate3d(0,100%,0);opacity:.3}to{-webkit-transform:translate3d(0,0,0);opacity:1}}@keyframes layui-up{from{transform:translate3d(0,100%,0);opacity:.3}to{transform:translate3d(0,0,0);opacity:1}}.layui-anim-up{-webkit-animation-name:layui-up;animation-name:layui-up}@-webkit-keyframes layui-upbit{from{-webkit-transform:translate3d(0,15px,0);opacity:.3}to{-webkit-transform:translate3d(0,0,0);opacity:1}}@keyframes layui-upbit{from{transform:translate3d(0,15px,0);opacity:.3}to{transform:translate3d(0,0,0);opacity:1}}.layui-anim-upbit{-webkit-animation-name:layui-upbit;animation-name:layui-upbit}@keyframes layui-down{0%{opacity:.3;transform:translate3d(0,-100%,0)}100%{opacity:1;transform:translate3d(0,0,0)}}.layui-anim-down{animation-name:layui-down}@keyframes layui-downbit{0%{opacity:.3;transform:translate3d(0,-5px,0)}100%{opacity:1;transform:translate3d(0,0,0)}}.layui-anim-downbit{animation-name:layui-downbit}@-webkit-keyframes layui-scale{0%{opacity:.3;-webkit-transform:scale(.5)}100%{opacity:1;-webkit-transform:scale(1)}}@keyframes layui-scale{0%{opacity:.3;-ms-transform:scale(.5);transform:scale(.5)}100%{opacity:1;-ms-transform:scale(1);transform:scale(1)}}.layui-anim-scale{-webkit-animation-name:layui-scale;animation-name:layui-scale}@-webkit-keyframes layui-scale-spring{0%{opacity:.5;-webkit-transform:scale(.5)}80%{opacity:.8;-webkit-transform:scale(1.1)}100%{opacity:1;-webkit-transform:scale(1)}}@keyframes layui-scale-spring{0%{opacity:.5;transform:scale(.5)}80%{opacity:.8;transform:scale(1.1)}100%{opacity:1;transform:scale(1)}}.layui-anim-scaleSpring{-webkit-animation-name:layui-scale-spring;animation-name:layui-scale-spring}@keyframes layui-scalesmall{0%{opacity:.3;transform:scale(1.5)}100%{opacity:1;transform:scale(1)}}.layui-anim-scalesmall{animation-name:layui-scalesmall}@keyframes layui-scalesmall-spring{0%{opacity:.3;transform:scale(1.5)}80%{opacity:.8;transform:scale(.9)}100%{opacity:1;transform:scale(1)}}.layui-anim-scalesmall-spring{animation-name:layui-scalesmall-spring}@-webkit-keyframes layui-fadein{0%{opacity:0}100%{opacity:1}}@keyframes layui-fadein{0%{opacity:0}100%{opacity:1}}.layui-anim-fadein{-webkit-animation-name:layui-fadein;animation-name:layui-fadein}@-webkit-keyframes layui-fadeout{0%{opacity:1}100%{opacity:0}}@keyframes layui-fadeout{0%{opacity:1}100%{opacity:0}}.layui-anim-fadeout{-webkit-animation-name:layui-fadeout;animation-name:layui-fadeout}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/css/login.css b/pluss-manage-page/src/main/resources/static/resources/auth/css/login.css
new file mode 100644
index 0000000..12c9d28
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/css/login.css
@@ -0,0 +1,672 @@
+/***
+Login page
+***/
+a, button,div, img, input, label{
+    -webkit-border-radius: 0!important;
+    -moz-border-radius: 0!important;
+    border-radius: 4px!important;
+ }
+.login {
+  background-color: #ccc !important; }
+
+.login .logo {
+  margin: 50px auto 20px auto;
+  padding: 15px;
+  text-align: center; }
+
+.login .logo div {
+    font-size: 30px;
+    color: #ffffff;
+}
+
+.login .content {
+/*   background: url(../images/login/bg-white-lock.png) repeat; */
+    background: #fff;
+    box-shadow: 0 0 20px rgba(0,0,0,.08), inset 0 0 3px #fff;
+  width: 360px;
+  margin: 0 auto;
+  margin-bottom: 0px;
+  padding: 30px;
+  padding-top: 20px;
+  padding-bottom: 15px;
+  -webkit-border-radius: 7px;
+  -moz-border-radius: 7px;
+  -ms-border-radius: 7px;
+  -o-border-radius: 7px;
+  border-radius: 7px; }
+
+.login .content h3 {
+     color: #4d5250;}
+
+.login .content h4 {
+      color: #4d5250;}
+
+.login .content p,
+.login .content label {
+  color: #afafaf; }
+
+.login .mt-checkbox > span:after {
+  border-color: #69d0d1; }
+
+.login .content .login-form{
+  padding: 0px;
+  margin: 0px; }
+
+.login .content .form-control {
+    background-color: #fff !important;
+    border-color: #e4e4e4;
+    border: 1px solid #e4e4e4;
+    border-radius: 0;
+    -webkit-transition: border 150ms linear;
+    transition: border 150ms linear;
+    box-shadow: none;}
+  
+.login .content .create-account {
+    border-top: 1px solid #eee;
+    text-align: center;
+    padding-top: 20px;
+    margin-left: -30px;
+    margin-right: -30px;
+}
+
+.login .content .form-title {
+  font-weight: 300;
+  margin-bottom: 25px; }
+
+.login .content .form-actions {
+  background-color: transparent;
+  clear: both;
+  border: 0px;
+  padding: 5px 30px 40px 30px;
+  margin-left: -30px;
+  margin-right: -30px; }
+
+.login .content .form-actions .rememberme {
+  display: inline-block; 
+  font-weight: 100;}
+
+.login .content .form-actions .btn {
+  border-radius: 4px!important;
+  margin-top: 1px; }
+
+/* footer copyright */
+.login .copyright {
+  text-align: center;
+  margin: 0 auto;
+  padding: 10px;
+  color: #eee;
+  font-size: 13px; }
+  
+  .login .copyright a{
+    color: #eee !important;
+  }
+  
+
+@media (max-width: 480px) {
+  /***
+  Login page
+  ***/
+  .login .logo {
+    margin-top: 10px; }
+  .login .content {
+    padding: 30px;
+    /* width: 222px; */ }
+  .login .content h3 {
+    font-size: 22px; }
+  .login .checkbox {
+    font-size: 13px; } }
+    
+.btn.green {
+    color: #FFF;
+    background-color: #3385ff;
+    border-color: #2d78f4;
+}    
+
+  .form-control:focus {
+       border: 1px solid #4b8df9 !important; }
+/***
+Input icons
+***/
+.input-icon {
+  position: relative;
+  left: 0; }
+  .input-icon > .form-control {
+    padding-left: 33px; }
+    .input-group .input-icon > .form-control {
+      -webkit-border-radius: 4px 0 0 4px;
+      -moz-border-radius: 4px 0 0 4px;
+      -ms-border-radius: 4px 0 0 4px;
+      -o-border-radius: 4px 0 0 4px;
+      border-radius: 4px 0 0 4px; }
+  .input-icon > i {
+    color: #ccc;
+    display: block;
+    position: absolute;
+    margin: 11px 2px 4px 10px;
+    z-index: 3;
+    width: 16px;
+    font-size: 16px;
+    text-align: center;
+    left: 0; }
+    .modal .input-icon > i {
+      z-index: 10055; }
+    .has-success .input-icon > i {
+      color: #36c6d3; }
+    .has-warning .input-icon > i {
+      color: #F1C40F; }
+    .has-info .input-icon > i {
+      color: #659be0; }
+    .has-error .input-icon > i {
+      color: #ed6b75; }
+  .input-icon.right {
+    left: auto;
+    right: 0; }
+    .input-icon.right > .form-control {
+      padding-right: 33px;
+      padding-left: 12px; }
+      .input-group .input-icon.right > .form-control {
+        -webkit-border-radius: 0 4px 4px 0;
+        -moz-border-radius: 0 4px 4px 0;
+        -ms-border-radius: 0 4px 4px 0;
+        -o-border-radius: 0 4px 4px 0;
+        border-radius: 0 4px 4px 0; }
+    .input-icon.right > i {
+      left: auto;
+      right: 8px;
+      float: right; }
+  .input-icon.input-icon-lg > i {
+    margin-top: 16px; }
+  .input-icon.input-icon-sm > i {
+    margin-top: 8px;
+    font-size: 13px; }    
+    
+[class^="fa-"],
+[class*=" fa-"]{
+  display: inline-block;
+  *margin-right: .3em;
+  line-height: 12px;
+  -webkit-font-smoothing: antialiased; }
+    
+.red{
+	color: red;
+}
+ /***
+checkbox
+***/   
+   .mt-radio,
+.mt-checkbox {
+  display: inline-block;
+  position: relative;
+  padding-left: 30px;
+  margin-bottom: 15px;
+  cursor: pointer;
+  font-size: 14px;
+  webkit-transition: all 0.3s;
+  -moz-transition: all 0.3s;
+  -ms-transition: all 0.3s;
+  -o-transition: all 0.3s;
+  transition: all 0.3s; }
+  .mt-radio.mt-radio-disabled, .mt-radio.mt-checkbox-disabled,
+  .mt-checkbox.mt-radio-disabled,
+  .mt-checkbox.mt-checkbox-disabled {
+    opacity: 0.6 ;
+    filter: alpha(opacity=60) ; }
+  .mt-radio > input,
+  .mt-checkbox > input {
+    position: absolute;
+    z-index: -1;
+    opacity: 0 ;
+    filter: alpha(opacity=0) ; }
+  .mt-radio > span,
+  .mt-checkbox > span {
+    border: 1px solid transparent;
+    position: absolute;
+    top: 0px;
+    left: 0;
+    height: 19px;
+    width: 19px;
+    background: #E6E6E6; }
+    .mt-radio > span:after,
+    .mt-checkbox > span:after {
+      content: '';
+      position: absolute;
+      display: none; }
+  .mt-radio:hover > input:not([disabled]) ~ span,
+  .mt-radio > input:focus ~ span,
+  .mt-checkbox:hover > input:not([disabled]) ~ span,
+  .mt-checkbox > input:focus ~ span {
+    background: #d9d9d9;
+    webkit-transition: all 0.3s;
+    -moz-transition: all 0.3s;
+    -ms-transition: all 0.3s;
+    -o-transition: all 0.3s;
+    transition: all 0.3s; }
+  .mt-radio > input:checked ~ span,
+  .mt-checkbox > input:checked ~ span {
+    webkit-transition: all 0.3s;
+    -moz-transition: all 0.3s;
+    -ms-transition: all 0.3s;
+    -o-transition: all 0.3s;
+    transition: all 0.3s;
+    background: #d9d9d9; }
+    .mt-radio > input:checked ~ span:after,
+    .mt-checkbox > input:checked ~ span:after {
+      display: block; }
+  .mt-radio:hover > input:not([disabled]):checked ~ span,
+  .mt-radio > input:checked ~ span,
+  .mt-checkbox:hover > input:not([disabled]):checked ~ span,
+  .mt-checkbox > input:checked ~ span {
+    webkit-transition: all 0.3s;
+    -moz-transition: all 0.3s;
+    -ms-transition: all 0.3s;
+    -o-transition: all 0.3s;
+    transition: all 0.3s;
+    background: #d9d9d9; }
+  .mt-radio > input:disabled ~ span,
+  .mt-checkbox > input:disabled ~ span {
+    opacity: 0.6 ;
+    filter: alpha(opacity=60) ;
+    pointer-events: none; }
+  .mt-radio.mt-radio-outline > span, .mt-radio.mt-checkbox-outline > span,
+  .mt-checkbox.mt-radio-outline > span,
+  .mt-checkbox.mt-checkbox-outline > span {
+    border: 1px solid #d9d9d9;
+    background: none; }
+  .mt-radio.mt-radio-outline:hover > input:not([disabled]) ~ span,
+  .mt-radio.mt-radio-outline > input:focus ~ span, .mt-radio.mt-checkbox-outline:hover > input:not([disabled]) ~ span,
+  .mt-radio.mt-checkbox-outline > input:focus ~ span,
+  .mt-checkbox.mt-radio-outline:hover > input:not([disabled]) ~ span,
+  .mt-checkbox.mt-radio-outline > input:focus ~ span,
+  .mt-checkbox.mt-checkbox-outline:hover > input:not([disabled]) ~ span,
+  .mt-checkbox.mt-checkbox-outline > input:focus ~ span {
+    border: 1px solid #d9d9d9;
+    background: none; }
+  .mt-radio.mt-radio-outline > input:checked ~ span, .mt-radio.mt-checkbox-outline > input:checked ~ span,
+  .mt-checkbox.mt-radio-outline > input:checked ~ span,
+  .mt-checkbox.mt-checkbox-outline > input:checked ~ span {
+    border: 1px solid #d9d9d9;
+    background: none; }
+  .mt-radio.mt-radio-outline:hover > input:not([disabled]):checked ~ span,
+  .mt-radio.mt-radio-outline > input:checked ~ span, .mt-radio.mt-checkbox-outline:hover > input:not([disabled]):checked ~ span,
+  .mt-radio.mt-checkbox-outline > input:checked ~ span,
+  .mt-checkbox.mt-radio-outline:hover > input:not([disabled]):checked ~ span,
+  .mt-checkbox.mt-radio-outline > input:checked ~ span,
+  .mt-checkbox.mt-checkbox-outline:hover > input:not([disabled]):checked ~ span,
+  .mt-checkbox.mt-checkbox-outline > input:checked ~ span {
+    border: 1px solid #d9d9d9;
+    background: none; } 
+ .mt-checkbox > span:after {
+  left: 6px;
+  top: 3px;
+  width: 5px;
+  height: 10px;
+  border: solid #666666;
+  border-width: 0 2px 2px 0;
+  transform: rotate(45deg); }
+
+.mt-checkbox > input:disabled ~ span:after {
+  border-color: #666666; }
+
+.form-inline .mt-checkbox {
+  margin-left: 15px;
+  margin-right: 15px; }
+
+
+.mt-checkbox-list,
+.mt-radio-list {
+  padding: 10px 0; }
+  .form-horizontal .form-group .mt-checkbox-list, .form-horizontal .form-group
+  .mt-radio-list {
+    padding-top: 0; }
+  .mt-checkbox-list .mt-checkbox,
+  .mt-checkbox-list .mt-radio,
+  .mt-radio-list .mt-checkbox,
+  .mt-radio-list .mt-radio {
+    display: block; }
+
+.mt-checkbox-inline,
+.mt-radio-inline {
+  padding: 10px 0; }
+  .form-horizontal .form-group .mt-checkbox-inline, .form-horizontal .form-group
+  .mt-radio-inline {
+    padding-top: 8px; }
+  .mt-checkbox-inline .mt-checkbox,
+  .mt-checkbox-inline .mt-radio,
+  .mt-radio-inline .mt-checkbox,
+  .mt-radio-inline .mt-radio {
+    display: inline-block;
+    margin-right: 15px; }
+    .mt-checkbox-inline .mt-checkbox:last-child,
+    .mt-checkbox-inline .mt-radio:last-child,
+    .mt-radio-inline .mt-checkbox:last-child,
+    .mt-radio-inline .mt-radio:last-child {
+      margin-right: 0; }   
+    
+    
+    /* IE8 & IE9 mode utilities */
+.visible-ie8 {
+  display: none; }
+
+.ie8 .visible-ie8 {
+  display: inherit !important; }
+
+.visible-ie9 {
+  display: none; }
+
+.ie9 .visible-ie9 {
+  display: inherit !important; }
+
+.hidden-ie8 {
+  display: inherit; }
+
+.ie8 .hidden-ie8 {
+  display: none !important; }
+
+.hidden-ie9 {
+  display: inherit; }
+
+.ie9 .hidden-ie9 {
+  display: none !important; }
+    
+.align-right {
+    text-align: right !important;
+}
+    
+
+.subsystem-container {
+    text-align: left;
+    font-size: 0;
+   padding: 10px 0 12px 5px;
+  -moz-transition: border-left-color 0.5s, box-shadow 0.5s, background-color 0.5s;
+  -o-transition: border-left-color 0.5s, box-shadow 0.5s, background-color 0.5s;
+  -webkit-transition: border-left-color 0.5s, box-shadow 0.5s, background-color 0.5s;
+  transition: border-left-color 0.5s, box-shadow 0.5s, background-color 0.5s;
+ border-top: 1px  solid #EAEEF0;
+}
+.subsystem {
+  display: inline-block;
+  width: 300px;
+  height: 66px;
+  color: #555;
+  box-shadow: none;
+  border-radius: 0;
+  margin: -1px 0 0 -1px;
+  padding: 8px 3px 6px 9px;
+/*   border: 1px dotted;
+  border-color: #D8D8D8 !important; */
+ border-bottom: 1px dotted #D8D8D8;
+  vertical-align: middle;
+  text-align: left;
+  position: relative;
+  cursor:pointer;
+}
+.subsystem > .subsystem-icon {
+  display: inline-block;
+  vertical-align: top;
+  width: 44px;
+}
+.subsystem > .subsystem-icon > .ibps-icon {
+  display: inline-block;
+  height: 42px;
+  margin: 0;
+  padding: 1px 1px 0 2px;
+   background-color: transparent;
+  border-width: 0;
+  text-align: center;
+  position: relative;
+  border-radius: 100%;
+  -webkit-box-shadow: 1px 1px 0 rgba(0,0,0,0.2);
+  box-shadow: 1px 1px 0 rgba(0,0,0,0.2);
+}
+.subsystem > .subsystem-icon > .ibps-icon:before {
+    font-size: 24px;
+    display: block;
+    padding: 12px 0 15px;
+    width: 40px;
+    text-align: center;
+    border-radius: 100%;
+    color: #FFFFFF;
+    background-color: transparent;
+    background-color: rgba(255, 255, 255, 0.2);
+    text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.14);
+}
+
+.subsystem > .subsystem-data {
+  display: inline-block;
+  border-width: 0;
+  border-top-width: 0;
+  font-size: 18px;
+  text-align: left;
+  min-width: 130px;
+  padding-left: 8px;
+  top: 10px;
+  width: 240px;
+   position:relative;
+   line-height:23px;
+   overflow:hidden;
+    white-space: nowrap;
+}
+.subsystem > .subsystem-data::after {
+    font-weight:bold;
+    position:absolute;
+    bottom:0;
+    right:0;
+    padding:0 20px 1px 45px;
+}
+.subsystem-button{
+	padding:5px;
+}
+
+
+.subsystem-blue {
+  color: #6fb3e0;
+  border-color: #6fb3e0;
+}
+.subsystem-blue > .subsystem-icon > .ibps-icon {
+  background-color: #6fb3e0;
+}
+.subsystem-blue > .subsystem-icon > .ibps-image {
+  background: #6fb3e0;
+}
+.subsystem-blue.subsystem-dark {
+  background-color: #6fb3e0;
+  border-color: #6fb3e0;
+}
+.subsystem-blue2 {
+  color: #3983c2;
+  border-color: #3983c2;
+}
+.subsystem-blue2 > .subsystem-icon > .ibps-icon {
+  background-color: #3983c2;
+}
+.subsystem-blue2 > .subsystem-icon > .ibps-image {
+  background: #3983c2;
+}
+.subsystem-blue2.subsystem-dark {
+  background-color: #3983c2;
+  border-color: #3983c2;
+}
+.subsystem-blue3 {
+  color: #1144eb;
+  border-color: #1144eb;
+}
+.subsystem-blue3 > .subsystem-icon > .ibps-icon {
+  background-color: #1144eb;
+}
+.subsystem-blue3 > .subsystem-icon > .ibps-image {
+  background: #1144eb;
+}
+
+.subsystem-blue3.subsystem-dark {
+  background-color: #1144eb;
+  border-color: #1144eb;
+}
+.subsystem-red {
+  color: #d53f40;
+  border-color: #d53f40;
+}
+.subsystem-red > .subsystem-icon > .ibps-icon {
+  background-color: #d53f40;
+}
+.subsystem-red > .subsystem-icon > .ibps-image {
+  background: #d53f40;
+}
+.subsystem-red.subsystem-dark {
+  background-color: #d53f40;
+  border-color: #d53f40;
+}
+.subsystem-brown {
+  color: #c67a3e;
+  border-color: #c67a3e;
+}
+.subsystem-brown > .subsystem-icon > .ibps-icon {
+  background-color: #c67a3e;
+}
+.subsystem-brown > .subsystem-icon > .ibps-image {
+  background: #c67a3e;
+}
+.subsystem-brown.subsystem-dark {
+  background-color: #c67a3e;
+  border-color: #c67a3e;
+}
+.subsystem-wood {
+  color: #7b3f25;
+  border-color: #7b3f25;
+}
+.subsystem-wood > .subsystem-icon > .ibps-icon {
+  background-color: #7b3f25;
+}
+.subsystem-wood > .subsystem-icon > .ibps-image {
+  background: #7b3f25;
+}
+.subsystem-wood.subsystem-dark {
+  background-color: #7b3f25;
+  border-color: #7b3f25;
+}
+.subsystem-light-brown {
+  color: #cebea5;
+  border-color: #cebea5;
+}
+.subsystem-light-brown > .subsystem-icon > .ibps-icon {
+  background-color: #cebea5;
+}
+.subsystem-light-brown  > .subsystem-icon > .ibps-image {
+  background: #cebea5;
+}
+.subsystem-light-brown.subsystem-dark {
+  background-color: #cebea5;
+  border-color: #cebea5;
+}
+.subsystem-orange {
+  color: #e8b110;
+  border-color: #e8b110;
+}
+.subsystem-orange > .subsystem-icon > .ibps-icon {
+  background-color: #e8b110;
+}
+.subsystem-orange  > .subsystem-icon > .ibps-image {
+  background: #e8b110;
+}
+.subsystem-orange.subsystem-dark {
+  background-color: #e8b110;
+  border-color: #e8b110;
+}
+.subsystem-orange2 {
+  color: #f79263;
+  border-color: #f79263;
+}
+.subsystem-orange2 > .subsystem-icon > .ibps-icon {
+  background-color: #f79263;
+}
+.subsystem-orange2  > .subsystem-icon > .ibps-image {
+  background: #f79263;
+}
+.subsystem-orange2.subsystem-dark {
+  background-color: #f79263;
+  border-color: #f79263;
+}
+.subsystem-green {
+  color: #9abc32;
+  border-color: #9abc32;
+}
+.subsystem-green > .subsystem-icon > .ibps-icon {
+  background-color: #9abc32;
+}
+.subsystem-green  > .subsystem-icon > .ibps-image {
+  background: #9abc32;
+}
+.subsystem-green.subsystem-dark {
+  background-color: #9abc32;
+  border-color: #9abc32;
+}
+.subsystem-green2 {
+  color: #0490a6;
+  border-color: #0490a6;
+}
+.subsystem-green2 > .subsystem-icon > .ibps-icon {
+  background-color: #0490a6;
+}
+.subsystem-green2  > .subsystem-icon > .ibps-image {
+  background: #0490a6;
+}
+.subsystem-green2.subsystem-dark {
+  background-color: #0490a6;
+  border-color: #0490a6;
+}
+.subsystem-grey {
+  color: #999999;
+  border-color: #999999;
+}
+.subsystem-grey > .subsystem-icon > .ibps-icon {
+  background-color: #999999;
+}
+.subsystem-grey  > .subsystem-icon > .ibps-image {
+  background: #999999;
+}
+.subsystem-grey.subsystem-dark {
+  background-color: #999999;
+  border-color: #999999;
+}
+.subsystem-black {
+  color: #393939;
+  border-color: #393939;
+}
+.subsystem-black > .subsystem-icon > .ibps-icon {
+  background-color: #393939;
+}
+.subsystem-black  > .subsystem-icon > .ibps-image {
+  background: #393939;
+}
+.subsystem-black.subsystem-dark {
+  background-color: #393939;
+  border-color: #393939;
+}
+
+
+
+  input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill {
+    background-color: rgb(250, 255, 189); 
+    background-image: none;
+    color: rgb(0, 0, 0);
+  }
+
+.style-toggle {
+    float: right;
+    margin-top: -5px;
+    padding: 10px;
+}
+.btn-sm {
+    padding: 3px 10px;
+    font-size: 12px;
+    line-height: 1.5;
+    border-radius: 2px !important;
+}
+/*在线帮助*/
+.suspend{width:40px;height:198px;position:fixed;top:200px;right:0;overflow:hidden;z-index:9999;}
+.suspend dl{width:120px;height:198px;border-radius:25px 0 0 25px;padding-left:40px;box-shadow:0 0 5px #e4e8ec;}
+.suspend dl dt{width:40px;height:198px;background:url(../images/suspend.png);position:absolute;top:0;left:0;cursor:pointer;}
+.suspend dl dd.suspendQQ{width:120px;height:85px;background:#ffffff;}
+.suspend dl dd.suspendQQ a{width:120px;height:85px;display:block;background:url(../images/suspend.png) -40px 0;overflow:hidden;}
+.suspend dl dd.suspendTel{width:120px;height:112px;background:#ffffff;border-top:1px solid #e4e8ec;}
+.suspend dl dd.suspendTel a{width:120px;height:112px;display:block;background:url(../images/suspend.png) -40px -86px;overflow:hidden;}
+/** html .suspend{position:absolute;left:expression(eval(document.documentElement.scrollRight));top:expression(eval(document.documentElement.scrollTop+200))}*/
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/css/modules/code.css b/pluss-manage-page/src/main/resources/static/resources/auth/css/modules/code.css
new file mode 100644
index 0000000..9143a25
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/css/modules/code.css
@@ -0,0 +1,2 @@
+/** layui-v2.5.6 MIT License By https://www.layui.com */
+ html #layuicss-skincodecss{display:none;position:absolute;width:1989px}.layui-code-h3,.layui-code-view{position:relative;font-size:12px}.layui-code-view{display:block;margin:10px 0;padding:0;border:1px solid #e2e2e2;border-left-width:6px;background-color:#F2F2F2;color:#333;font-family:Courier New}.layui-code-h3{padding:0 10px;height:32px;line-height:32px;border-bottom:1px solid #e2e2e2}.layui-code-h3 a{position:absolute;right:10px;top:0;color:#999}.layui-code-view .layui-code-ol{position:relative;overflow:auto}.layui-code-view .layui-code-ol li{position:relative;margin-left:45px;line-height:20px;padding:0 5px;border-left:1px solid #e2e2e2;list-style-type:decimal-leading-zero;*list-style-type:decimal;background-color:#fff}.layui-code-view pre{margin:0}.layui-code-notepad{border:1px solid #0C0C0C;border-left-color:#3F3F3F;background-color:#0C0C0C;color:#C2BE9E}.layui-code-notepad .layui-code-h3{border-bottom:none}.layui-code-notepad .layui-code-ol li{background-color:#3F3F3F;border-left:none}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/css/modules/laydate/default/laydate.css b/pluss-manage-page/src/main/resources/static/resources/auth/css/modules/laydate/default/laydate.css
new file mode 100644
index 0000000..b900971
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/css/modules/laydate/default/laydate.css
@@ -0,0 +1,2 @@
+/** layui-v2.5.6 MIT License By https://www.layui.com */
+ .laydate-set-ym,.layui-laydate,.layui-laydate *,.layui-laydate-list{box-sizing:border-box}html #layuicss-laydate{display:none;position:absolute;width:1989px}.layui-laydate *{margin:0;padding:0}.layui-laydate{position:absolute;z-index:66666666;margin:5px 0;border-radius:2px;font-size:14px;-webkit-animation-duration:.3s;animation-duration:.3s;-webkit-animation-fill-mode:both;animation-fill-mode:both;-webkit-animation-name:laydate-upbit;animation-name:laydate-upbit}.layui-laydate-main{width:272px}.layui-laydate-content td,.layui-laydate-header *,.layui-laydate-list li{transition-duration:.3s;-webkit-transition-duration:.3s}@-webkit-keyframes laydate-upbit{from{-webkit-transform:translate3d(0,20px,0);opacity:.3}to{-webkit-transform:translate3d(0,0,0);opacity:1}}@keyframes laydate-upbit{from{transform:translate3d(0,20px,0);opacity:.3}to{transform:translate3d(0,0,0);opacity:1}}.layui-laydate-static{position:relative;z-index:0;display:inline-block;margin:0;-webkit-animation:none;animation:none}.laydate-ym-show .laydate-next-m,.laydate-ym-show .laydate-prev-m{display:none!important}.laydate-ym-show .laydate-next-y,.laydate-ym-show .laydate-prev-y{display:inline-block!important}.laydate-time-show .laydate-set-ym span[lay-type=month],.laydate-time-show .laydate-set-ym span[lay-type=year],.laydate-time-show .layui-laydate-header .layui-icon,.laydate-ym-show .laydate-set-ym span[lay-type=month]{display:none!important}.layui-laydate-header{position:relative;line-height:30px;padding:10px 70px 5px}.laydate-set-ym span,.layui-laydate-header i{padding:0 5px;cursor:pointer}.layui-laydate-header *{display:inline-block;vertical-align:bottom}.layui-laydate-header i{position:absolute;top:10px;color:#999;font-size:18px}.layui-laydate-header i.laydate-prev-y{left:15px}.layui-laydate-header i.laydate-prev-m{left:45px}.layui-laydate-header i.laydate-next-y{right:15px}.layui-laydate-header i.laydate-next-m{right:45px}.laydate-set-ym{width:100%;text-align:center;text-overflow:ellipsis;overflow:hidden;white-space:nowrap}.laydate-time-text{cursor:default!important}.layui-laydate-content{position:relative;padding:10px;-moz-user-select:none;-webkit-user-select:none;-ms-user-select:none}.layui-laydate-content table{border-collapse:collapse;border-spacing:0}.layui-laydate-content td,.layui-laydate-content th{width:36px;height:30px;padding:5px;text-align:center}.layui-laydate-content td{position:relative;cursor:pointer}.laydate-day-mark{position:absolute;left:0;top:0;width:100%;height:100%;line-height:30px;font-size:12px;overflow:hidden}.laydate-day-mark::after{position:absolute;content:'';right:2px;top:2px;width:5px;height:5px;border-radius:50%}.layui-laydate-footer{position:relative;height:46px;line-height:26px;padding:10px 20px}.layui-laydate-footer span{margin-right:15px;display:inline-block;cursor:pointer;font-size:12px}.layui-laydate-footer span:hover{color:#5FB878}.laydate-footer-btns{position:absolute;right:10px;top:10px}.laydate-footer-btns span{height:26px;line-height:26px;margin:0 0 0 -1px;padding:0 10px;border:1px solid #C9C9C9;background-color:#fff;white-space:nowrap;vertical-align:top;border-radius:2px}.layui-laydate-list>li,.layui-laydate-range .layui-laydate-main{display:inline-block;vertical-align:middle}.layui-laydate-list{position:absolute;left:0;top:0;width:100%;height:100%;padding:10px;background-color:#fff}.layui-laydate-list>li{position:relative;width:33.3%;height:36px;line-height:36px;margin:3px 0;text-align:center;cursor:pointer}.laydate-month-list>li{width:25%;margin:17px 0}.laydate-time-list>li{height:100%;margin:0;line-height:normal;cursor:default}.laydate-time-list p{position:relative;top:-4px;line-height:29px}.laydate-time-list ol{height:181px;overflow:hidden}.laydate-time-list>li:hover ol{overflow-y:auto}.laydate-time-list ol li{width:130%;padding-left:33px;line-height:30px;text-align:left;cursor:pointer}.layui-laydate-hint{position:absolute;top:115px;left:50%;width:250px;margin-left:-125px;line-height:20px;padding:15px;text-align:center;font-size:12px}.layui-laydate-range{width:546px}.layui-laydate-range .laydate-main-list-0 .laydate-next-m,.layui-laydate-range .laydate-main-list-0 .laydate-next-y,.layui-laydate-range .laydate-main-list-1 .laydate-prev-m,.layui-laydate-range .laydate-main-list-1 .laydate-prev-y{display:none}.layui-laydate-range .laydate-main-list-1 .layui-laydate-content{border-left:1px solid #e2e2e2}.layui-laydate,.layui-laydate-hint{border:1px solid #d2d2d2;box-shadow:0 2px 4px rgba(0,0,0,.12);background-color:#fff;color:#666}.layui-laydate-header{border-bottom:1px solid #e2e2e2}.layui-laydate-header i:hover,.layui-laydate-header span:hover{color:#5FB878}.layui-laydate-content{border-top:none 0;border-bottom:none 0}.layui-laydate-content th{font-weight:400;color:#333}.layui-laydate-content td{color:#666}.layui-laydate-content td.laydate-selected{background-color:#00F7DE}.laydate-selected:hover{background-color:#00F7DE!important}.layui-laydate-content td:hover,.layui-laydate-list li:hover{background-color:#eaeaea;color:#333}.laydate-time-list li ol{margin:0;padding:0;border:1px solid #e2e2e2;border-left-width:0}.laydate-time-list li:first-child ol{border-left-width:1px}.laydate-time-list>li:hover{background:0 0}.layui-laydate-content .laydate-day-next,.layui-laydate-content .laydate-day-prev{color:#d2d2d2}.laydate-selected.laydate-day-next,.laydate-selected.laydate-day-prev{background-color:#f8f8f8!important}.layui-laydate-footer{border-top:1px solid #e2e2e2}.layui-laydate-hint{color:#FF5722}.laydate-day-mark::after{background-color:#5FB878}.layui-laydate-content td.layui-this .laydate-day-mark::after{display:none}.layui-laydate-footer span[lay-type=date]{color:#5FB878}.layui-laydate .layui-this{background-color:#009688!important;color:#fff!important}.layui-laydate .laydate-disabled,.layui-laydate .laydate-disabled:hover{background:0 0!important;color:#d2d2d2!important;cursor:not-allowed!important;-moz-user-select:none;-webkit-user-select:none;-ms-user-select:none}.laydate-theme-molv{border:none}.laydate-theme-molv.layui-laydate-range{width:548px}.laydate-theme-molv .layui-laydate-main{width:274px}.laydate-theme-molv .layui-laydate-header{border:none;background-color:#009688}.laydate-theme-molv .layui-laydate-header i,.laydate-theme-molv .layui-laydate-header span{color:#f6f6f6}.laydate-theme-molv .layui-laydate-header i:hover,.laydate-theme-molv .layui-laydate-header span:hover{color:#fff}.laydate-theme-molv .layui-laydate-content{border:1px solid #e2e2e2;border-top:none;border-bottom:none}.laydate-theme-molv .laydate-main-list-1 .layui-laydate-content{border-left:none}.laydate-theme-grid .laydate-month-list>li,.laydate-theme-grid .laydate-year-list>li,.laydate-theme-grid .layui-laydate-content td,.laydate-theme-grid .layui-laydate-content thead,.laydate-theme-molv .layui-laydate-footer{border:1px solid #e2e2e2}.laydate-theme-grid .laydate-selected,.laydate-theme-grid .laydate-selected:hover{background-color:#f2f2f2!important;color:#009688!important}.laydate-theme-grid .laydate-selected.laydate-day-next,.laydate-theme-grid .laydate-selected.laydate-day-prev{color:#d2d2d2!important}.laydate-theme-grid .laydate-month-list,.laydate-theme-grid .laydate-year-list{margin:1px 0 0 1px}.laydate-theme-grid .laydate-month-list>li,.laydate-theme-grid .laydate-year-list>li{margin:0 -1px -1px 0}.laydate-theme-grid .laydate-year-list>li{height:43px;line-height:43px}.laydate-theme-grid .laydate-month-list>li{height:71px;line-height:71px}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/css/modules/laydialog/default/icon-ext.png b/pluss-manage-page/src/main/resources/static/resources/auth/css/modules/laydialog/default/icon-ext.png
new file mode 100644
index 0000000..bbbb669
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/css/modules/laydialog/default/icon-ext.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/css/modules/laydialog/default/icon.png b/pluss-manage-page/src/main/resources/static/resources/auth/css/modules/laydialog/default/icon.png
new file mode 100644
index 0000000..3e17da8
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/css/modules/laydialog/default/icon.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/css/modules/laydialog/default/laydialog.css b/pluss-manage-page/src/main/resources/static/resources/auth/css/modules/laydialog/default/laydialog.css
new file mode 100644
index 0000000..219814d
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/css/modules/laydialog/default/laydialog.css
@@ -0,0 +1,182 @@
+/**
+ 
+ @Name: laydialog
+ @Author: 贤心
+ 
+ **/
+
+/* *html{background-image: url(about:blank); background-attachment: fixed;} */
+html #layuicss-laydialog{display: none; position: absolute; width: 1989px;}
+
+/* common */
+.layui-laydialog-shade, .layui-laydialog{position:fixed; _position:absolute; pointer-events: auto;}
+.layui-laydialog-shade{top:0; left:0; width:100%; height:100%; _height:expression(document.body.offsetHeight+"px");}
+.layui-laydialog{-webkit-overflow-scrolling: touch;}
+.layui-laydialog{top:150px; left: 0; margin:0; padding:0; background-color:#fff; -webkit-background-clip: content; border-radius: 2px; box-shadow: 1px 1px 50px rgba(0,0,0,.3);}
+.layui-laydialog-close{position:absolute;}
+.layui-laydialog-content{position:relative;}
+.layui-laydialog-border{border: 1px solid #B2B2B2; border: 1px solid rgba(0,0,0,.1); box-shadow: 1px 1px 5px rgba(0,0,0,.2);}
+.layui-laydialog-load{background:url('data:image/gif;base64,R0lGODlhPAAYALMPAPPJp/HYxfSwkf50Df5TD/+HAPe5bvqHR/twOviZavyrMu/m3f9EAP9mAP+ZAO7u7iH/C05FVFNDQVBFMi4wAwEAAAAh/wtYTVAgRGF0YVhNUDw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYwIDYxLjEzNDc3NywgMjAxMC8wMi8xMi0xNzozMjowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wUmlnaHRzPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvcmlnaHRzLyIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcFJpZ2h0czpNYXJrZWQ9IkZhbHNlIiB4bXBNTTpPcmlnaW5hbERvY3VtZW50SUQ9InhtcC5kaWQ6QUNDRERBRjMxRTIwNjgxMTg4QzZERjVGQ0I0MDI1NDkiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NTlDMEI5MzU5RTY2MTFFMTkxRDY5NkVCMDBGOTBFRUYiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NTlDMEI5MzQ5RTY2MTFFMTkxRDY5NkVCMDBGOTBFRUYiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNSBNYWNpbnRvc2giPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpENzU2N0YwMTMyMjA2ODExODhDNkRGNUZDQjQwMjU0OSIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpBQ0NEREFGMzFFMjA2ODExODhDNkRGNUZDQjQwMjU0OSIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PgH//v38+/r5+Pf29fTz8vHw7+7t7Ovq6ejn5uXk4+Lh4N/e3dzb2tnY19bV1NPS0dDPzs3My8rJyMfGxcTDwsHAv769vLu6ubi3trW0s7KxsK+urayrqqmop6alpKOioaCfnp2cm5qZmJeWlZSTkpGQj46NjIuKiYiHhoWEg4KBgH9+fXx7enl4d3Z1dHNycXBvbm1sa2ppaGdmZWRjYmFgX15dXFtaWVhXVlVUU1JRUE9OTUxLSklIR0ZFRENCQUA/Pj08Ozo5ODc2NTQzMjEwLy4tLCsqKSgnJiUkIyIhIB8eHRwbGhkYFxYVFBMSERAPDg0MCwoJCAcGBQQDAgEAACH5BAkFAA8ALAAAAAA8ABgAAATy8MlJq7046827/2AWCEdpCkGodkHSvHCcLGttLUOsw0NqW4EDYog4+CyInbJxwAQMiqjCcMQkGNgsNmFxLZXcisFBLpMNGYF2zRBQAt9vFWCuOwCXAJt9FMSXbhILdnY0FQd7a00SB39Kiw9jhGZoFQSJWgQTjksTCpNmChaYa5ucOxOgdaOkWaanMamqZRaXrZoSObAvA56zDqKHrQyQjbtME5KqlW/DRwbHDcwBv1UTV5hhEnDHVcqEzF2J2te75BLflBsCCFoIgRU4pwOGFQCfZQp4PxUBSX8IrPELscDLkhkDB7bQxQthwocQI0rMEAEAIfkECQUADwAsAAAAADwAGAAABOjwyUmrvTjrzbv/ILcAiWCUQKh+y9G88DsIa40JcQ4ji30JCIZQeAhcAgOdMvEYKZ5PQA8UHFoZtEpSuVQ4vmCHwuhJXK+EqcTA5YbfYrUmcD4jKNt2rAB/GzoHdWdTAXo6fXByGASCV1k4hjADiG8pG41XTA9skS98lGB/l5hDmgmdnqChHIykWBKQnZOqDpYaVaRkAKgvtA6KFwCudxO8DZ+UCh64grYPp7yqwBgLzFYEWRNIvAlecGMhAq1DCGQVu7JNBn7THQDvAObBeVwJ7T4gLW2i+P0PAQkOCBQoxZ/BgwgTYogAACH5BAkFAA8ALAAAAAA8ABgAAATV8MlJq7046827/2AojmMgHE2aIslCckAcb8Kg3umQvFhCMEAgYXcR4HCFpEJhCPAkiKAUiLAEbMdGwcHtcg28w3R8qKCyA6/aASABxvC2JJBNrdcuURQ+rUqMWVt3XmAhC3xweWdHg2oKIm+IU3KLOI1qkJKTEpU3l14iAZpSTg+dKp9cjyKjQRMGdYKXhSFio2VzdQ2ppSEBP5IEvQ9YR7J3tCICmgIVALrHhE+/cMIXCboDxwpy0z5BQ8POxUcD3U88CwnkKQni6E8yMXnw9fb3+BURACH5BAkFAA8ALAAAAAA8ABgAAATe8MlJq7046827/2AojqQUCEeaJkC5CUgcJ0G2JE2u60jrVgICY0gcIhaXQ25QaDp1vt8jUKwaLbhGwcHtcgeNQe23EFqrAkogt/W6cwlp4mwlICW4gXvvyI1LZnRFaRJgfHtghCRUglUIJjmHbgUNBy4AjY4SAGGSXpSWJZiZRI8PnHqeXKAujKQMpmsNqquVP4GZioa0iT8Hrwx/Sqmefj8BuHRxE5xanmChPwKZRxVKznxgDX8/AAh00RQL18S1YYpSDzffpVEXAjvxB9zpiwnaOQfo9fz9/v8ApUQAACH5BAkFAA8ALAAAAAA8ABgAAATO8MlJq7046827/2AojmS1AIkhJEBQasFBMDRDHC62JE3v97iXJVEr1hKThUHBdBQGv99gIZwIjFiG4AFweL/eQtSHqD4Cs2yR0AW7xeOGoXpQYwvuPHQ8FabtNA15g3ENWyUBgEUDg3mFBy8AijV4jWB7UZAlkpMMlZZemD+aJImdjKBej0KdDIKpDoWHJXWdn42iPzmIrQagcGOkL0SKSG15wFF9ZgJ/WLMBvpeFCLtmMVhBOjxxB1RmJgDiAN8bAQkH6Qcs4O3u7/Dx4BEAIfkECQUADwAsAAAAADwAGAAABMrwyUmrvTjrzbv/YCiOV5AgKCosZIsFCCPPc5KZQ6M3QxK4lgWBRuMVFEgDS5LYOXc24CRGlBUc2CwW8BA8vw2BtFuVDbRoByAHdg6WrmG1kU63v9EWoMy41rVsdzoDQAllBH9oBYJOPy2GVYiJWYuMOlyPh5OUlpcuApqbDpWWjiQBfH6TgYxSVER0m50NeS2gZap1BrOmLpBVuVpcTYy1QLdzuQamAqxuYmMTMGUJcBYmeL3REgAJ3gkC2hgLAOUA1tvp6uvs7R8RACH5BAkFAA8ALAAAAAA8ABgAAATs8MlJq7046827/2AojpmQICgqBGSLCQgjz3OyZEFy7LvgXoDZoEAsDBoyxGWRaDifzgHgNwkQGA2HdqstyBKWA3TsZFEPDAJ37RjIzBIBmTy4uQKyAnuNPEwWR3NjPi4CWHtrXgQTcoJjAz8xA4hrbxJijmNwIzF6lFtXUw+YmU+iJJ2foAyipKUNp5wMk6oOV2aupZsihlmqioyvUT94DJ6USEoSAcINYJGHlF6sFE2lA7sjxQ3HXNN+FAu5ZIRUAlcEtF1IDAh2FQaC2FQUATE0NOVACYENAyv0LMCgQeBAtoAIEypcyLDhhAgAIfkECQUADwAsAAAAADwAGAAABODwyUmrvTjrzbv/YCiOWiAgTJoiSUC+V0KodEokZWIIugtPAYNCUSgMZjWV4BI4NJ7QxsH3Mjiu2OsgqaJKFoOoeLB4AbJoR4PLQFQQ4rh7tEin2QyqIM5fiqx2WVtcfg9hfGMjCoFZBWxzC4h8Xh6MaI8SAJJxACKWWZgPmptRnSGLn45ccwGkUWUhgJaDSTgSh6QDIwGfDkhJeq4Ntn+zbAQUYLmwI7Joa2ymQLhxA5QiAKhXBdBcBxcLcHEHzD+Zv0kEhRcACQfvCdLmFAEytdfzZgD7AOX5/wADCrwQAQAh+QQJBQAPACwAAAAAPAAYAAAE6fDJSau9OOvNu/8gFiQkKSxh+gkE474uEqj0tSBw/gq1twCKYBCAOuiOhJllkRg0no0BDxRQOK5YhyJx7BIsAKj4ifgsrNlsodtNUBbOsdjgMaTvA7buOznI5UoaC3eELXowSgF/cm4bAIR3DYcwUwKLYwMcdpBZkpMujQaXY5qcnZ+gEgmjYhyPpleen42WrFEcg7AOqC4AEoq2Bx1onGu8FAi2vriwvAzCE2Gj0B1VhApGqEkVAnFyByhmm1gGKDifUxULfmN0PerZbATLGD8A9+8ZLF0y+f4PAhAIFJgg0L+DCBMqrBABACH5BAkFAA8ALAAAAAA8ABgAAATz8MlJq7046827/2AWCEhpCkGodkHCvHCcpGtdBUSswwRt3waFUGHwVRC7JAOBaR2eh9nG4KhaqwaLS5lMaBvgMNiLAVzPDgAlwOUaBeJ4Q3BZoNGLiaCtpEsWcnJGElR3V1kSSHw7TBIJgXFkFAqGVwoTi0oTA5BiAxaVZ5iZOxOdcaChVqOkMaanYRaUqpcSOa0vBJuwDZ8VhaGID4q4jQ+PsJITAaoOPlu4kgG8g4TBa7gvRsiQyr+GwhMHuAcWBpDhFwCzVQpqFgu3iwR5FgAHYgfvP2vEXAj7+K1YMI7LgXoCf7SQx4CAlIQQI0qcmCECACH5BAkFAA8ALAAAAAA8ABgAAATe8MlJq7046827/2AXACQZnuCSEEzrEkmAzpjAunhLCDRmKI5g0LC4BHJIl+wRSByeh1hKSBUWKYtbMkdQNb7gb+IDrFIVlcR2iwi7GzwOwGwGTI7r5Pu91NDpEwJ5SAR7bmMaC39mVweDOYZuAxsBi1VLCI84kW6UllSYmi6cYZ6fQaGiDKRfkxunQRNqqoWkiBoGpwaBqi2sfRmKn1cPWb21hreUZWYKwA+zogkGhrsguVVEF5maCBIAB2EHdicLAecBxBYL3HkI6j0zgmvK8T1NWgwwz/b9/v8AMUQAACH5BAkFAA8ALAAAAAA8ABgAAATY8MlJq7046827/+AXACQQhCi4CATjvoSwpFww2nMWtG/vEieaZQFwGI8ORbCy4Pl6hMZhmlimFMiswypBPKGNsDicoBm02pxE8IWN3w0BaoHWGijOLxzO5RTrWRMBbT97b2UgWIBIQQmEDIZvAyGKi0aNj5FvlJZHmISaYyFnnVtrmaENkyCknRMAj1GhiB90nXcTeU+pfRytgGoPjoSyhrQqlWgATLo+xW+4NH9ZCsGCzT5vB8tCEkQG4Aa9EwtehAjW3TQLCdgJ6erdAgn0CXLx+Pn6+xwRACH5BAkFAA8ALAAAAAA8ABgAAATM8MlJq7046827/2AojuSzCAeiqsJSaoChzIoBaALB7DyfvJaAwkEsEhWBS6LHIDQaTt0PKFkMjViFiwLoOZ/gJ0FAfVyx2Ypu9w2HB9QAeu5ISgQ9t75BfhnoaAYTCDxte08HQIBzE2sMh25wL4toE3mQYYqURpY8mJmTm0WdO59gQH+ighKEbKaJLwCiDjd3l5h9L2eAChQBjoZ7di9ylMMSS4WHBFNUVnRaSkx6DM1lDwC7CgBbFwCOTAy51yQLCeDM3eTr7O3u7yMRACH5BAkFAA8ALAAAAAA8ABgAAATO8MlJq7046827/2AojiQVCEmaCEGpLYbizI5iLFlwMHzPHy1XJSCjGRVBU6JBYDZ8PEJSuCgaj7jJssHtMqGIrKt6LdeyAq/660sIHwaz2fBYrNdQxnRkldMUD1t3XQRQAi4BfmYBA4NqYIiKZQGOjz4IkZJGlJVdkCULmkYLjZ1Pl0KiNIGmhT6HLnGidJyVeXsioaJZgneuPZhviZJicIO/UcVjfVgWAAeWl7hjskY3GQsIeTxhbxcLAeEByhjPCOcIBwDe7O3u7/DxEhEAIfkECQUADwAsAAAAADwAGAAABMHwyUmrvTjrzbv/YCiOWGACgbcALEpygeHMtGNoAsLsPCG8GEBt6FAAEofkIRE48J68A7ASIBILjay2QYB6f9PHQmElDrbarveZmsrKRLR2/USE4dazXE1ntElVeENYcg19O2CAgoOFhocJQIGLM4RyhwyQL5KTlWiXiSSTNHpofHR/JG+TjZcEYQuinWmfYQ9CgrJZpmtStQ+bRAYAB1sHAAKHoLUxVjcZOV4+vhYxBtYACx0CCdwJytPg4eLj5B8RACH5BAkFAA8ALAAAAAA8ABgAAATI8MlJq7046827/2AojtgCGKgBLGSbLYojz7LClgnC7AyS3C7KgkacJQKWAIHHZBCQQQmsSG0khMsmkwB0GajUQkMg1WmbiO5oCKYOGsjE+Xz1tt3WR3a+DX7vRGIDAXxnUCQxgDRiDQCFWgAuiYoyjI6PTJEtk5SChJg8hyMAlDNvV3uPBEFspQ1wD3KgdZKlYnULqXNcUa2ADQYUn3xPURIBnFQHmkJmWmnGE1NUNi+yTD/RFQEGCt4KBqIvAOQr2ufo6errIhEAIfkECQUADwAsAAAAADwAGAAABLTwyUmrvTjrzbv/YCiO2QIYSqoYxkK+GODMdG1owoHsyCHAF0NtSLtZAgiGcqlEBIATGXEKqCwIzCyD4IIqplNFJanNIqBSMLEqAZTL7NdXTRRLDm/tAUgHT7B5TAR8fUQTgVqEhTWHiEyKizN/jkqDMHORdg9kjmcwaYtxApQMPzALkTNdEpx5nkBCi0YTAYgEcbCFsxQLrUwIq1APAXS4Fjm/AsHCDwsoQy3M0tPU1dbXGBEAIfkECQUADwAsAAAAADwAGAAABNbwyUmrvTjrzbv/4BWMZGiCC+CsrKMYyyljQWuvSqAFQA/os0kgcSjejoqYRYBgOJ8EQDDRqDYKR6Ql8ew+EzKBtTHIZqUTgHfNQKPGDXNWQWmyuwgTdSzPAgN3a0AfA2NYfTcGEgKBXgIhcIeILYoPXI1fkIaTNpWXmAxgIIVWZZwsaIygDI8ge1Wmpw5/qwyDHgFwsisUBKAEJ69XspUSapitJgabk0kVB40HQQAHsJy3ab5eUUEWCwpyzhkCCeUJbt0VCwZZMOnvxgbyBujw9vf4+RcRACH5BAUFAA8ALAAAAAA8ABgAAATi8MlJq7046827/2AWjGRogovirKyjAMspY0Zrr0owe0Fy/IeE7gG4GRWxS4LAaDIIiaQn0ahaq0KjVmEJMJ1gwpAjuJob2jSgggC7GYjO4nwdpLcUwfst4FDpVQV3WlJfe04EHAOAVYNaaw8Bh29jGIyNjjcGEgCTbpAZl2iZNptEnmCgGIuMpKUSkqhNlUqXgq4roIaTiRsBtrgrUgmyCR1/dHa4XBMLu28EUhsGgAYqrrReh2IgAAdXB2sLrqYWS24H0juR13flFwsA8jDr8DVq9fkB9ywKBur5AgocSPBCBAA7') #eee center center no-repeat;}
+.layui-laydialog-ico{ background:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAANIAAAA9CAMAAADvVccnAAAC7lBMVEUAAAA9pX1UqeQmJTQjIzN0dHRUqeT0mxHwfSYuje3qT0BgYGYsKzrpUUI4m912dnYQzW0Au5x1dXX0xQDrVDsAupt1dXXqTz92dnboTj/zmxEAupt2dnbqUUH0mxJTqeHoVER1dXV2dnYsKzoQzmwQzmzpUEAnJzIQzWz0xQAQzW12dnboU0ToVEXoVEXnTTzpVER2dnboVEQQzWzoTTx1dXX2xwDqTj8Qzm33yADpU0P1xgD4yQB1dXX6tAl2dnboTT31xgD0nBEAuprpUUEuje31mxDqUkL0rQoHw4p2dnZVqePnTDzzxAB3d3d2dnb0xQDoTz8QzWx2dnYFwY8GwYx2dnYlJDUQzW3oVETzmxEQzW3zmxL1xgDnTT12dnZUqeR1dXXoTT12dnYuje0QzWz3xwDrVEPqTj4uje1zc3PoUEF1dXXpTT31xgDnTDzzmhHsUEAAvJz2xwAAupslJDT0xAB2dnbnTT12dnYAu5vpTj7zmxEAupoQz242kuz3mBD2xgARzWznTDx1dXUQzm3zmxEAuproVEX0xQAAupvoUUF2dnYAupv1xgB1dXXoTz/7ywBUqeMQz27oVEUAupsQzm3nU0UAupsuje3ymhEuje11dXXymxD0xAD0xgB0dHTzmxH1xgAQzWxzc3P7nRAAvZ37nREAuZoAupoAupv1xgDoTDwQzmxUquMlJTTzmhH0mRLpU0QAupsAupsAupsuje1VquQlJDTznBH3xwBzc3MQzW0Aupr0xQD1mhAlJTQrKjrnTDzzmxBVqeQlJTV1dXUAuZsQzWzoUED4nBAuje0uje0lJDQuje0uje3zmxHzxQAQzW3ymhD6nRAlIzX3mBD0xQAMyHrymxLnTDwQzm3zxQBUqeQkIzPpSzsoJTYQzWwuje31xQBzc3PzmxFTqORUquTzmhFUqeQQzW1TqOR3d3cuje1VquQmJTUAupsRzW30xQDzmxHoVEXmTT3nTT3oU0R4eHgtLDvZ3m1xAAAA7HRSTlMABM/PLlIuKwRSFAh3jgf5yGUj9Aj0RxoZDvnRrjTiF8I504BGOisWEvz07c/89fDg3tvRy3NlVU9GMC0aEAnY2M+mj4V4MyIOC+nf38LAubetkWobDvK3cWTy6+rp5uS3fHFtbGtoZ2RdWE8wHuK2n0dFIunf18mhn4l8YVAsJhwT+vfBvru2tqqjmpaBgWFdVEQi6OHd1sbBuK+nlpGNhnlzYV1aVUssIhPIk4Ln58zKx8Ktm5aNjYyIfXhrXlpB+8Kunp6SXlcmE+3p3tjUypuYdnRbVzszwbyrWVhIPx+fnpqQi3pozrWjdJwlHLUAAAy/SURBVGje7JhpTFRXFMfvfCCQMXQGGNkxQJCAoMPIAIIga2TJ4LDoREAgYFhSQBAMu4QCbqUqBquGUIu4F0xcP2hdEk3cPqltqlUT07RNmuZ+eOvM195377szj3mDsU2Tfuk/4b17OZnh/bjnnHfOAU4Vjf70e97Vq3m//zRaBFT67vK9WwfCwg7cunf5O7VVW9gyeTAx8eBkS6FWbf2ip/nXstzcsl+be75QGVcEe82adBDCemulfxb4e4obaXqXrNcnv2saiVMZn1/cz/N8aHV1KLrOXCxyA7oQxjDMSiR0C7vgBqVNO+kQ1q5DWis4TqZp3YCO9XJcfABSPMf1HnOD8p/TQV1CvclUX2KDMLx9BViqoA+LZosoWsyLH4JUQE+TWZZdg4RuyU/doDbP8PyOa11nhofPdF3bwfOPvJXW7hsM83XY4BM/vyeDYV8zzI1upXV3pENISiyYqqqaKkhMEhyRu5XW9FKO25V7535q6v07ubs4rjRdeUSVOlgysTMqGICs9nNWE4RzSw6qsNFotxtzkKR7YyFQKkbPsvqKs6uRzlZI6xiF0ed8KL8qb7OTL28VH3reh24/80NA+Vvpdms+gvL7jG4NrYKQ5Bvk/K/6JglCq4FuN6UioNOZdJt5GkGlbqLbrDmoC28HTgV/VQLD/V37VotoXGyNCEGKaF00ipYp4NJ2ln23YRvdbduwjx3b7rL+wPP7CRCFQl74A90cZpibl5TWSzcZ5jDdFAhCeazSGlsuCAV0c4TjDm1UWjce4rgjlCgclqSAJQrsgybKpO0XxYJYxRcXiOKkge4qWHa7BihUfJdlK+jmPM9/A9z0Dc+fxwsNOqN8d2s+OifyfS2Otb7uVt+1jhZy+s1c/LfkeNLn59PJYX0bzzUTD5iDpkDgpmArDM8iRG/FnIilxogcsVOO1Lvsmhjgpg1r2O3ykYQ6iZ4PDz93MoV64zhimEGg0iDDdOM4EtYWqK3o5HA8pXPxd4Ck1wscUulrvLnDcTiePocJgU6S4BV0FQ0f48Wk2KlKCEGd4iR5epaNASrFyL/dtJ/fT+PmR57/kcbXfv4RcvriU8xN4EEHmFPFAIRECuWerAeFyBD0zaXcIZIiArjesrJerpYwlXGl6JuDTZB6nf/3fdmzFC/QBqXwahRzEJGKKUdslJxMT8+DisaXXoMe/SK/wxuokYD3Dv6ij+YCs+cS8KBLe5gLGp80x/EMgMjanC7f0SZ5RsZxR5qPzzGuFsdREWLoQWG0wJUV4Xiq5Y75aI7CCUoUDSesCXCnHBq/wfAVoKNuPBZ4UOx4XYf06Ps0nqyafexZ9Pd+5vMA1WhX1yigyuNnNm0Lo4GkDqewbSEnSSC1OdZnyETXHWkknE6GFPXKgZQuo70O4NLlcOotWmHSecmZfAs8CkB7NgyUXa8e+hsW7UPAowrsvj5xNWtWS+uRiqdA1tmKEeKQNXFglN+xGXjU5urQ0cvMnq3ATVu7t0nXPczlQsdx7Byx64WkWEwUKazHi6DjQmEPV0sSwntuwQf7cin3niSLWq6nHWZTTyPBEwV/A0ThsDJIrNPijwAqutHWjWtj2H34QdCbdrUzipKlB9Xo0W8e8NeUGEq8a/wDP+aUO9G2m8wF6R7G3GsRrsupaL1wEvlDISKSk1Si0JLKLdDEPU/uvfIpgVyuuQEOAKJKiI9LE90nv2bP2axp9kW0MBSY+7XOMCo3N0r3RXtaBXtFWr1hWbaJJkCWxcd0BZlu812KsujFi+euXRd/+0vmsDvRl8zKbuJ5t/rXDgEnU2TQs+uEiHje5KH4I0CpnlKuTC6HTse/HNBVAqLP4VGM1JctZ732kvpye5oUkna73fl2bUSbZ+ieZi/Xj8XgT1TU6KeJcURfU6EhnqcHeaFnAHClBJIqiM6E5t1Y+URFtGcvXvmtPBC5bgoomBIdTiJQte5gacB9oFDmAg4prNSAsi02OXSirNAUbrVat0Bd5QoaTGaj9E2Fol1sc5YSdvt4ofSXjOYTKJSwpjEGxpPZVq9JBlerhxVIq1YpkIar/whb6Yc/sFX+bDEhIkhhieuqAFVGoiBEPgMupMTcgFQF0aZDXMAx4ETKjS7xJyVEHxyw9k1s6eubjbZFEXM2rMsJkRZTnUOuSBrq3I2DyWJhT8SBZbT1xNjHkX6Wkd6cGqREKwmRZyTD8kjzXO17sASpnWRwkxUADZB+vGgxYYJ2jORRITn2jyNhx1MhUcfrkh2vmxR1lMiz462X4mk5x8vMlUs76nhWmxfxsuxwdE2ZDUYuGB0oO16CMccAlpE2pw47nkrU8Wh6UCKp00PxPczkIlKnB0dSRkYSZVKnh427Amgg0fSQokCa0CE3DJSRohKyzcZY4Ekklkh60IxMA4WmRzQkPeAkrkJSJ3GJKV9BRJO4iygC3RCTVp3EScWwqwcvaBKvhOEKpLnHwIW0UzfbiTIekWG371uL5a3vB3psU/bOKziJx53QKwsHPfZGZCKvWiWS+lVLi28FkfpVi8sHdE7Xn5FXrYO8aqkyAwLIhr5q/WF9FkYyzaKrl+SF7TLSBPRqFeX6vs1irDOXl5vrxi1t8vmLreRVq/lTqn6omthXGvKqpQWRGokWRIPO7M3s/XhBRJjaVAURVjrtZmlBNEE8zz+7PqWh4auvGhoaZkll3m6zBXfYcTCF9IvmKS2OoEaz6BtCskNHXA32vOmamjdA1puammlaEOGyVY2kLluLn+xVl60CLlu1rrI1oioIl60CLlt3bQRqkbIVBMLoYKnCewxLEhLq6xMSEnQTOK9b4ZzG0G9vRI//UERXqkax0yBd+w20bI1ha5qK8bM11bAxctnq1lx4V1d7/9vNBdEX8824P6fNBXkhYc+Lcspfg+sjGyKLNRqDQMjQkjFGWqMBVeh1z1zNxYYxNvlVU9OrZHZsA20u3FpAw4MHhr/XAjo8t4AOVwtINB8f0CwvaQsYpYMpQKVA1GWQkHmoVVu1ZnFI2QJOv2IljVVMy8Xrhk9s1AdVRK5GXfDUqAvKRp0OIY4At0b9HLSlqIhMyO3wf7dc7NeqiMrFcgNt1MnTx61ualodp2zU6Thlxhso5D3z0XHKgY+OUw56Gqdkzs9n4jgqw2xEDVA3EAwU0nxfAmez5MrbLD6Mdev/HtofhrjGKXeLl1Sf0jjlPx96ac7pYHRKFqDymtApBnkdneJ4awdwqqN13F6uVQ699i0dei1t3r0fodHkCzKafLHMaDLfDynf02gSQSX6ViH5JiIgT6PJ06n376eeVo0mQVQf1JnCd34e1e5VOZBtg/VeinGroWBctAy1FRrQsrBtyCKOD33KaJKq6OJM6CcOkE/t9TRAFtYhCYLjepunATIXgIRuC+4D5KzALRDqbAklNh2EpqPBbsWPr12015k7O811aOEb8ekDZDrmvy2N+W8vM+b3I2N+v3805n8pjflfqsb8GMr/6GNrdPSWgYb2YLU1I63fYhRFo6U/LcPjmP+XZKRfpDH///qrHft3TRyM4zj+8UcEiaTg0EkQ6uDQ2fHolKWCS4euV8xS9w6d8g8IBTdxvfluU6GLhevUXjs5esgNLccldo3bPfk+z9fEH3hSgmeoLyTJgy5vnofEPHt7H0sif9YsFJpn+cTqr22r2+l0LTuBuNArtVNHOK1VdCwzzPajKzy2TQPxoB05M0caFmWf3ZnnLOLgwplzgXmmO8fE7rv1nDne7WJR3Jo0Z4mGQNZdksVKL59DXoDSeUgJJBmgcSqAyOgnzpITHcx4cpc8GSA5EL5ItjIzrSSQGqRnBimQSYDGbwFEJVGhiMOGR+czOWeVBBeZcl7UXFnybBoUcqea1EWySKPiV6HoJ5VpXP4mlLeYlK+ppeY3eQ21DGt5SHZbLbUsn3xtW6ZMaTmVpjlwErGrE04i6R93nJRROCmtRJlUP6aGAw2a54nDAQ2P65CsB5eb5IE8WICMKalDOClTbalZ4qKBmqUAJ7Eok64d4jkN3NygIS5IE9IvV7nEpfjwqAtuytFUqSQugkriIsikJFNJKRZtUsFhX/yNF1aA1HGDJlHEOlByU1p1KomLYKskVYQxJU2YSnpjO5tk0PG1BcFP+iR/MYCwzaRr1eDJhec57194f3rCCOCkXF8YApsk7ert4XU06n0PklLD4bB/v/Wk4CZed9bexK3NbuKtcFIZ+Ln9JH7UanV13ztc/ai11GSte9RunkTPp1ASPZ928g9R0TBEkuGjpLGuiyTdN15IIkFSxDTPWeC972/r76rQQ5WI2Tq/Evq4Ivf/Sorny0WGqXGagexfAT/ai3p4O6W+fjvFist2SmjTCysZvOmFvb3/7C/DRJIh08ft/wAAAABJRU5ErkJggg==') no-repeat;}
+.layui-laydialog-dialog .layui-laydialog-ico,
+.layui-laydialog-setwin a,
+.layui-laydialog-btn a{display:inline-block; *display:inline; *zoom:1; vertical-align:top;}
+
+.layui-laydialog-move{display: none; position: fixed; *position: absolute; left: 0px; top: 0px; width: 100%; height: 100%; cursor: move; opacity: 0; filter:alpha(opacity=0); background-color: #fff; z-index: 2147483647;}
+.layui-laydialog-resize{position: absolute; width: 15px; height: 15px; right: 0; bottom: 0; cursor: se-resize;}
+
+/* 动画 */
+.laydialog-anim{-webkit-animation-fill-mode: both; animation-fill-mode: both; -webkit-animation-duration:.3s; animation-duration:.3s;}
+
+@-webkit-keyframes laydialog-bounceIn { /* 默认 */
+	0% {opacity: 0; -webkit-transform: scale(.5); transform: scale(.5)}
+	100% {opacity: 1; -webkit-transform: scale(1); transform: scale(1)}
+}
+@keyframes laydialog-bounceIn {
+	0% {opacity: 0; -webkit-transform: scale(.5); -ms-transform: scale(.5); transform: scale(.5)}
+	100% {opacity: 1; -webkit-transform: scale(1); -ms-transform: scale(1); transform: scale(1)}
+}
+.laydialog-anim-00{-webkit-animation-name: laydialog-bounceIn;animation-name: laydialog-bounceIn}
+
+@-webkit-keyframes laydialog-zoomInDown{0%{opacity:0;-webkit-transform:scale(.1) translateY(-2000px);transform:scale(.1) translateY(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateY(60px);transform:scale(.475) translateY(60px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}@keyframes laydialog-zoomInDown{0%{opacity:0;-webkit-transform:scale(.1) translateY(-2000px);-ms-transform:scale(.1) translateY(-2000px);transform:scale(.1) translateY(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateY(60px);-ms-transform:scale(.475) translateY(60px);transform:scale(.475) translateY(60px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}.laydialog-anim-01{-webkit-animation-name:laydialog-zoomInDown;animation-name:laydialog-zoomInDown}
+
+@-webkit-keyframes laydialog-fadeInUpBig{0%{opacity:0;-webkit-transform:translateY(2000px);transform:translateY(2000px)}100%{opacity:1;-webkit-transform:translateY(0);transform:translateY(0)}}@keyframes laydialog-fadeInUpBig{0%{opacity:0;-webkit-transform:translateY(2000px);-ms-transform:translateY(2000px);transform:translateY(2000px)}100%{opacity:1;-webkit-transform:translateY(0);-ms-transform:translateY(0);transform:translateY(0)}}.laydialog-anim-02{-webkit-animation-name:laydialog-fadeInUpBig;animation-name:laydialog-fadeInUpBig}
+
+@-webkit-keyframes laydialog-zoomInLeft{0%{opacity:0;-webkit-transform:scale(.1) translateX(-2000px);transform:scale(.1) translateX(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateX(48px);transform:scale(.475) translateX(48px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}@keyframes laydialog-zoomInLeft{0%{opacity:0;-webkit-transform:scale(.1) translateX(-2000px);-ms-transform:scale(.1) translateX(-2000px);transform:scale(.1) translateX(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateX(48px);-ms-transform:scale(.475) translateX(48px);transform:scale(.475) translateX(48px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}.laydialog-anim-03{-webkit-animation-name:laydialog-zoomInLeft;animation-name:laydialog-zoomInLeft}
+
+@-webkit-keyframes laydialog-rollIn{0%{opacity:0;-webkit-transform:translateX(-100%) rotate(-120deg);transform:translateX(-100%) rotate(-120deg)}100%{opacity:1;-webkit-transform:translateX(0px) rotate(0deg);transform:translateX(0px) rotate(0deg)}}@keyframes laydialog-rollIn{0%{opacity:0;-webkit-transform:translateX(-100%) rotate(-120deg);-ms-transform:translateX(-100%) rotate(-120deg);transform:translateX(-100%) rotate(-120deg)}100%{opacity:1;-webkit-transform:translateX(0px) rotate(0deg);-ms-transform:translateX(0px) rotate(0deg);transform:translateX(0px) rotate(0deg)}}.laydialog-anim-04{-webkit-animation-name:laydialog-rollIn;animation-name:laydialog-rollIn}
+
+@keyframes laydialog-fadeIn{0%{opacity:0}100%{opacity:1}}.laydialog-anim-05{-webkit-animation-name:laydialog-fadeIn;animation-name:laydialog-fadeIn}
+
+@-webkit-keyframes laydialog-shake{0%,100%{-webkit-transform:translateX(0);transform:translateX(0)}10%,30%,50%,70%,90%{-webkit-transform:translateX(-10px);transform:translateX(-10px)}20%,40%,60%,80%{-webkit-transform:translateX(10px);transform:translateX(10px)}}@keyframes laydialog-shake{0%,100%{-webkit-transform:translateX(0);-ms-transform:translateX(0);transform:translateX(0)}10%,30%,50%,70%,90%{-webkit-transform:translateX(-10px);-ms-transform:translateX(-10px);transform:translateX(-10px)}20%,40%,60%,80%{-webkit-transform:translateX(10px);-ms-transform:translateX(10px);transform:translateX(10px)}}.laydialog-anim-06{-webkit-animation-name:laydialog-shake;animation-name:laydialog-shake}@-webkit-keyframes fadeIn{0%{opacity:0}100%{opacity:1}}
+
+/* 标题栏 */
+.layui-laydialog-title{padding:0 80px 0 20px; height:42px; line-height:42px; border-bottom:1px solid #eee; font-size:14px; color:#333; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; background-color: #F8F8F8; border-radius: 2px 2px 0 0;}
+.layui-laydialog-setwin{position:absolute; right:15px; *right:0; top:15px; font-size:0; line-height: initial;}
+.layui-laydialog-setwin a{position:relative; width: 16px; height:16px; margin-left:10px; font-size:12px; _overflow:hidden;}
+.layui-laydialog-setwin .layui-laydialog-min cite{position:absolute; width:14px; height:2px; left:0; top:50%; margin-top:-1px; background-color:#2E2D3C; cursor:pointer; _overflow:hidden;}
+.layui-laydialog-setwin .layui-laydialog-min:hover cite{background-color:#2D93CA; }
+.layui-laydialog-setwin .layui-laydialog-max{background-position:-32px -40px;}
+.layui-laydialog-setwin .layui-laydialog-max:hover{background-position:-16px -40px;}
+.layui-laydialog-setwin .layui-laydialog-maxmin{background-position:-65px -40px;}
+.layui-laydialog-setwin .layui-laydialog-maxmin:hover{background-position:-49px -40px;}
+.layui-laydialog-setwin .layui-laydialog-close1{background-position: 1px -40px; cursor: pointer;}
+.layui-laydialog-setwin .layui-laydialog-close1:hover{opacity:0.7;}
+.layui-laydialog-setwin .layui-laydialog-close2{position:absolute; right:-28px; top:-28px; width:30px; height:30px;  margin-left:0; background-position:-149px -31px; *right:-18px; _display:none;}
+.layui-laydialog-setwin .layui-laydialog-close2:hover{ background-position:-180px -31px;}
+
+/* 按钮栏 */
+.layui-laydialog-btn{text-align: right; padding: 0 10px 12px; pointer-events: auto; user-select: none; -webkit-user-select: none;}
+.layui-laydialog-btn a{height: 28px; line-height: 28px; margin: 0 6px; padding: 0 15px;border-radius: 2px; font-weight:400; cursor:pointer; text-decoration: none;}
+.layui-laydialog-btn a:hover{opacity: 0.9; text-decoration: none;}
+.layui-laydialog-btn a:active{opacity: 0.8;}
+/* .layui-laydialog-btn .layui-laydialog-btn0{border-color: #4898d5; background-color: #2e8ded; color:#fff;}
+ */
+.layui-laydialog-btn-l{text-align: left;}
+.layui-laydialog-btn-c{text-align: center;}
+
+/* 定制化 */
+.layui-laydialog-dialog{min-width:260px;}
+.layui-laydialog-dialog .layui-laydialog-content{position: relative; padding:20px; line-height:24px; word-break: break-all; overflow:hidden; font-size:14px; overflow-x: hidden; overflow-y:auto;}
+.layui-laydialog-dialog .layui-laydialog-content .layui-laydialog-ico{position:absolute; top:16px; left:15px; _left:-40px; width:30px; height:30px;}
+.layui-laydialog-ico1{background-position:-30px 0 }
+.layui-laydialog-ico2{background-position:-60px 0;}
+.layui-laydialog-ico3{background-position:-90px 0;}
+.layui-laydialog-ico4{background-position:-120px 0;}
+.layui-laydialog-ico5{background-position:-150px 0;}
+.layui-laydialog-ico6{background-position:-180px 0;}
+.layui-laydialog-rim{border:6px solid #8D8D8D; border:6px solid rgba(0,0,0,.3); border-radius:5px; box-shadow: none;}
+.layui-laydialog-msg{min-width:180px; border:1px solid #D3D4D3; box-shadow: none;}
+.layui-laydialog-hui{min-width:100px;  background-color: #000; filter:alpha(opacity=60); background-color: rgba(0,0,0,0.6); color: #fff; border:none;}
+.layui-laydialog-hui .layui-laydialog-content{padding:12px 25px; text-align:center;}
+.layui-laydialog-dialog .layui-laydialog-padding{padding: 20px 20px 20px 55px; text-align: left;}
+.layui-laydialog-page .layui-laydialog-content{position:relative; overflow:auto;}
+.layui-laydialog-page .layui-laydialog-btn,.layui-laydialog-iframe .layui-laydialog-btn{padding-top:10px;}
+.layui-laydialog-nobg{background:none;}
+.layui-laydialog-iframe iframe{display: block; width: 100%;}
+
+.layui-laydialog-loading{border-radius:100%; background:none;  box-shadow:none;  border:none;}
+.layui-laydialog-loading .layui-laydialog-content{width:60px; height:24px;background:url('data:image/gif;base64,R0lGODlhPAAYALMPAPPJp/HYxfSwkf50Df5TD/+HAPe5bvqHR/twOviZavyrMu/m3f9EAP9mAP+ZAO7u7iH/C05FVFNDQVBFMi4wAwEAAAAh/wtYTVAgRGF0YVhNUDw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYwIDYxLjEzNDc3NywgMjAxMC8wMi8xMi0xNzozMjowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wUmlnaHRzPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvcmlnaHRzLyIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcFJpZ2h0czpNYXJrZWQ9IkZhbHNlIiB4bXBNTTpPcmlnaW5hbERvY3VtZW50SUQ9InhtcC5kaWQ6QUNDRERBRjMxRTIwNjgxMTg4QzZERjVGQ0I0MDI1NDkiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NTlDMEI5MzU5RTY2MTFFMTkxRDY5NkVCMDBGOTBFRUYiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NTlDMEI5MzQ5RTY2MTFFMTkxRDY5NkVCMDBGOTBFRUYiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNSBNYWNpbnRvc2giPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpENzU2N0YwMTMyMjA2ODExODhDNkRGNUZDQjQwMjU0OSIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpBQ0NEREFGMzFFMjA2ODExODhDNkRGNUZDQjQwMjU0OSIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PgH//v38+/r5+Pf29fTz8vHw7+7t7Ovq6ejn5uXk4+Lh4N/e3dzb2tnY19bV1NPS0dDPzs3My8rJyMfGxcTDwsHAv769vLu6ubi3trW0s7KxsK+urayrqqmop6alpKOioaCfnp2cm5qZmJeWlZSTkpGQj46NjIuKiYiHhoWEg4KBgH9+fXx7enl4d3Z1dHNycXBvbm1sa2ppaGdmZWRjYmFgX15dXFtaWVhXVlVUU1JRUE9OTUxLSklIR0ZFRENCQUA/Pj08Ozo5ODc2NTQzMjEwLy4tLCsqKSgnJiUkIyIhIB8eHRwbGhkYFxYVFBMSERAPDg0MCwoJCAcGBQQDAgEAACH5BAkFAA8ALAAAAAA8ABgAAATy8MlJq7046827/2AWCEdpCkGodkHSvHCcLGttLUOsw0NqW4EDYog4+CyInbJxwAQMiqjCcMQkGNgsNmFxLZXcisFBLpMNGYF2zRBQAt9vFWCuOwCXAJt9FMSXbhILdnY0FQd7a00SB39Kiw9jhGZoFQSJWgQTjksTCpNmChaYa5ucOxOgdaOkWaanMamqZRaXrZoSObAvA56zDqKHrQyQjbtME5KqlW/DRwbHDcwBv1UTV5hhEnDHVcqEzF2J2te75BLflBsCCFoIgRU4pwOGFQCfZQp4PxUBSX8IrPELscDLkhkDB7bQxQthwocQI0rMEAEAIfkECQUADwAsAAAAADwAGAAABOjwyUmrvTjrzbv/ILcAiWCUQKh+y9G88DsIa40JcQ4ji30JCIZQeAhcAgOdMvEYKZ5PQA8UHFoZtEpSuVQ4vmCHwuhJXK+EqcTA5YbfYrUmcD4jKNt2rAB/GzoHdWdTAXo6fXByGASCV1k4hjADiG8pG41XTA9skS98lGB/l5hDmgmdnqChHIykWBKQnZOqDpYaVaRkAKgvtA6KFwCudxO8DZ+UCh64grYPp7yqwBgLzFYEWRNIvAlecGMhAq1DCGQVu7JNBn7THQDvAObBeVwJ7T4gLW2i+P0PAQkOCBQoxZ/BgwgTYogAACH5BAkFAA8ALAAAAAA8ABgAAATV8MlJq7046827/2AojmMgHE2aIslCckAcb8Kg3umQvFhCMEAgYXcR4HCFpEJhCPAkiKAUiLAEbMdGwcHtcg28w3R8qKCyA6/aASABxvC2JJBNrdcuURQ+rUqMWVt3XmAhC3xweWdHg2oKIm+IU3KLOI1qkJKTEpU3l14iAZpSTg+dKp9cjyKjQRMGdYKXhSFio2VzdQ2ppSEBP5IEvQ9YR7J3tCICmgIVALrHhE+/cMIXCboDxwpy0z5BQ8POxUcD3U88CwnkKQni6E8yMXnw9fb3+BURACH5BAkFAA8ALAAAAAA8ABgAAATe8MlJq7046827/2AojqQUCEeaJkC5CUgcJ0G2JE2u60jrVgICY0gcIhaXQ25QaDp1vt8jUKwaLbhGwcHtcgeNQe23EFqrAkogt/W6cwlp4mwlICW4gXvvyI1LZnRFaRJgfHtghCRUglUIJjmHbgUNBy4AjY4SAGGSXpSWJZiZRI8PnHqeXKAujKQMpmsNqquVP4GZioa0iT8Hrwx/Sqmefj8BuHRxE5xanmChPwKZRxVKznxgDX8/AAh00RQL18S1YYpSDzffpVEXAjvxB9zpiwnaOQfo9fz9/v8ApUQAACH5BAkFAA8ALAAAAAA8ABgAAATO8MlJq7046827/2AojmS1AIkhJEBQasFBMDRDHC62JE3v97iXJVEr1hKThUHBdBQGv99gIZwIjFiG4AFweL/eQtSHqD4Cs2yR0AW7xeOGoXpQYwvuPHQ8FabtNA15g3ENWyUBgEUDg3mFBy8AijV4jWB7UZAlkpMMlZZemD+aJImdjKBej0KdDIKpDoWHJXWdn42iPzmIrQagcGOkL0SKSG15wFF9ZgJ/WLMBvpeFCLtmMVhBOjxxB1RmJgDiAN8bAQkH6Qcs4O3u7/Dx4BEAIfkECQUADwAsAAAAADwAGAAABMrwyUmrvTjrzbv/YCiOV5AgKCosZIsFCCPPc5KZQ6M3QxK4lgWBRuMVFEgDS5LYOXc24CRGlBUc2CwW8BA8vw2BtFuVDbRoByAHdg6WrmG1kU63v9EWoMy41rVsdzoDQAllBH9oBYJOPy2GVYiJWYuMOlyPh5OUlpcuApqbDpWWjiQBfH6TgYxSVER0m50NeS2gZap1BrOmLpBVuVpcTYy1QLdzuQamAqxuYmMTMGUJcBYmeL3REgAJ3gkC2hgLAOUA1tvp6uvs7R8RACH5BAkFAA8ALAAAAAA8ABgAAATs8MlJq7046827/2AojpmQICgqBGSLCQgjz3OyZEFy7LvgXoDZoEAsDBoyxGWRaDifzgHgNwkQGA2HdqstyBKWA3TsZFEPDAJ37RjIzBIBmTy4uQKyAnuNPEwWR3NjPi4CWHtrXgQTcoJjAz8xA4hrbxJijmNwIzF6lFtXUw+YmU+iJJ2foAyipKUNp5wMk6oOV2aupZsihlmqioyvUT94DJ6USEoSAcINYJGHlF6sFE2lA7sjxQ3HXNN+FAu5ZIRUAlcEtF1IDAh2FQaC2FQUATE0NOVACYENAyv0LMCgQeBAtoAIEypcyLDhhAgAIfkECQUADwAsAAAAADwAGAAABODwyUmrvTjrzbv/YCiOWiAgTJoiSUC+V0KodEokZWIIugtPAYNCUSgMZjWV4BI4NJ7QxsH3Mjiu2OsgqaJKFoOoeLB4AbJoR4PLQFQQ4rh7tEin2QyqIM5fiqx2WVtcfg9hfGMjCoFZBWxzC4h8Xh6MaI8SAJJxACKWWZgPmptRnSGLn45ccwGkUWUhgJaDSTgSh6QDIwGfDkhJeq4Ntn+zbAQUYLmwI7Joa2ymQLhxA5QiAKhXBdBcBxcLcHEHzD+Zv0kEhRcACQfvCdLmFAEytdfzZgD7AOX5/wADCrwQAQAh+QQJBQAPACwAAAAAPAAYAAAE6fDJSau9OOvNu/8gFiQkKSxh+gkE474uEqj0tSBw/gq1twCKYBCAOuiOhJllkRg0no0BDxRQOK5YhyJx7BIsAKj4ifgsrNlsodtNUBbOsdjgMaTvA7buOznI5UoaC3eELXowSgF/cm4bAIR3DYcwUwKLYwMcdpBZkpMujQaXY5qcnZ+gEgmjYhyPpleen42WrFEcg7AOqC4AEoq2Bx1onGu8FAi2vriwvAzCE2Gj0B1VhApGqEkVAnFyByhmm1gGKDifUxULfmN0PerZbATLGD8A9+8ZLF0y+f4PAhAIFJgg0L+DCBMqrBABACH5BAkFAA8ALAAAAAA8ABgAAATz8MlJq7046827/2AWCEhpCkGodkHCvHCcpGtdBUSswwRt3waFUGHwVRC7JAOBaR2eh9nG4KhaqwaLS5lMaBvgMNiLAVzPDgAlwOUaBeJ4Q3BZoNGLiaCtpEsWcnJGElR3V1kSSHw7TBIJgXFkFAqGVwoTi0oTA5BiAxaVZ5iZOxOdcaChVqOkMaanYRaUqpcSOa0vBJuwDZ8VhaGID4q4jQ+PsJITAaoOPlu4kgG8g4TBa7gvRsiQyr+GwhMHuAcWBpDhFwCzVQpqFgu3iwR5FgAHYgfvP2vEXAj7+K1YMI7LgXoCf7SQx4CAlIQQI0qcmCECACH5BAkFAA8ALAAAAAA8ABgAAATe8MlJq7046827/2AXACQZnuCSEEzrEkmAzpjAunhLCDRmKI5g0LC4BHJIl+wRSByeh1hKSBUWKYtbMkdQNb7gb+IDrFIVlcR2iwi7GzwOwGwGTI7r5Pu91NDpEwJ5SAR7bmMaC39mVweDOYZuAxsBi1VLCI84kW6UllSYmi6cYZ6fQaGiDKRfkxunQRNqqoWkiBoGpwaBqi2sfRmKn1cPWb21hreUZWYKwA+zogkGhrsguVVEF5maCBIAB2EHdicLAecBxBYL3HkI6j0zgmvK8T1NWgwwz/b9/v8AMUQAACH5BAkFAA8ALAAAAAA8ABgAAATY8MlJq7046827/+AXACQQhCi4CATjvoSwpFww2nMWtG/vEieaZQFwGI8ORbCy4Pl6hMZhmlimFMiswypBPKGNsDicoBm02pxE8IWN3w0BaoHWGijOLxzO5RTrWRMBbT97b2UgWIBIQQmEDIZvAyGKi0aNj5FvlJZHmISaYyFnnVtrmaENkyCknRMAj1GhiB90nXcTeU+pfRytgGoPjoSyhrQqlWgATLo+xW+4NH9ZCsGCzT5vB8tCEkQG4Aa9EwtehAjW3TQLCdgJ6erdAgn0CXLx+Pn6+xwRACH5BAkFAA8ALAAAAAA8ABgAAATM8MlJq7046827/2AojuSzCAeiqsJSaoChzIoBaALB7DyfvJaAwkEsEhWBS6LHIDQaTt0PKFkMjViFiwLoOZ/gJ0FAfVyx2Ypu9w2HB9QAeu5ISgQ9t75BfhnoaAYTCDxte08HQIBzE2sMh25wL4toE3mQYYqURpY8mJmTm0WdO59gQH+ighKEbKaJLwCiDjd3l5h9L2eAChQBjoZ7di9ylMMSS4WHBFNUVnRaSkx6DM1lDwC7CgBbFwCOTAy51yQLCeDM3eTr7O3u7yMRACH5BAkFAA8ALAAAAAA8ABgAAATO8MlJq7046827/2AojiQVCEmaCEGpLYbizI5iLFlwMHzPHy1XJSCjGRVBU6JBYDZ8PEJSuCgaj7jJssHtMqGIrKt6LdeyAq/660sIHwaz2fBYrNdQxnRkldMUD1t3XQRQAi4BfmYBA4NqYIiKZQGOjz4IkZJGlJVdkCULmkYLjZ1Pl0KiNIGmhT6HLnGidJyVeXsioaJZgneuPZhviZJicIO/UcVjfVgWAAeWl7hjskY3GQsIeTxhbxcLAeEByhjPCOcIBwDe7O3u7/DxEhEAIfkECQUADwAsAAAAADwAGAAABMHwyUmrvTjrzbv/YCiOWGACgbcALEpygeHMtGNoAsLsPCG8GEBt6FAAEofkIRE48J68A7ASIBILjay2QYB6f9PHQmElDrbarveZmsrKRLR2/USE4dazXE1ntElVeENYcg19O2CAgoOFhocJQIGLM4RyhwyQL5KTlWiXiSSTNHpofHR/JG+TjZcEYQuinWmfYQ9CgrJZpmtStQ+bRAYAB1sHAAKHoLUxVjcZOV4+vhYxBtYACx0CCdwJytPg4eLj5B8RACH5BAkFAA8ALAAAAAA8ABgAAATI8MlJq7046827/2AojtgCGKgBLGSbLYojz7LClgnC7AyS3C7KgkacJQKWAIHHZBCQQQmsSG0khMsmkwB0GajUQkMg1WmbiO5oCKYOGsjE+Xz1tt3WR3a+DX7vRGIDAXxnUCQxgDRiDQCFWgAuiYoyjI6PTJEtk5SChJg8hyMAlDNvV3uPBEFspQ1wD3KgdZKlYnULqXNcUa2ADQYUn3xPURIBnFQHmkJmWmnGE1NUNi+yTD/RFQEGCt4KBqIvAOQr2ufo6errIhEAIfkECQUADwAsAAAAADwAGAAABLTwyUmrvTjrzbv/YCiO2QIYSqoYxkK+GODMdG1owoHsyCHAF0NtSLtZAgiGcqlEBIATGXEKqCwIzCyD4IIqplNFJanNIqBSMLEqAZTL7NdXTRRLDm/tAUgHT7B5TAR8fUQTgVqEhTWHiEyKizN/jkqDMHORdg9kjmcwaYtxApQMPzALkTNdEpx5nkBCi0YTAYgEcbCFsxQLrUwIq1APAXS4Fjm/AsHCDwsoQy3M0tPU1dbXGBEAIfkECQUADwAsAAAAADwAGAAABNbwyUmrvTjrzbv/4BWMZGiCC+CsrKMYyyljQWuvSqAFQA/os0kgcSjejoqYRYBgOJ8EQDDRqDYKR6Ql8ew+EzKBtTHIZqUTgHfNQKPGDXNWQWmyuwgTdSzPAgN3a0AfA2NYfTcGEgKBXgIhcIeILYoPXI1fkIaTNpWXmAxgIIVWZZwsaIygDI8ge1Wmpw5/qwyDHgFwsisUBKAEJ69XspUSapitJgabk0kVB40HQQAHsJy3ab5eUUEWCwpyzhkCCeUJbt0VCwZZMOnvxgbyBujw9vf4+RcRACH5BAUFAA8ALAAAAAA8ABgAAATi8MlJq7046827/2AWjGRogovirKyjAMspY0Zrr0owe0Fy/IeE7gG4GRWxS4LAaDIIiaQn0ahaq0KjVmEJMJ1gwpAjuJob2jSgggC7GYjO4nwdpLcUwfst4FDpVQV3WlJfe04EHAOAVYNaaw8Bh29jGIyNjjcGEgCTbpAZl2iZNptEnmCgGIuMpKUSkqhNlUqXgq4roIaTiRsBtrgrUgmyCR1/dHa4XBMLu28EUhsGgAYqrrReh2IgAAdXB2sLrqYWS24H0juR13flFwsA8jDr8DVq9fkB9ywKBur5AgocSPBCBAA7') no-repeat;}
+.layui-laydialog-loading .layui-laydialog-loading1{width:37px; height:37px; background:url('data:image/gif;base64,R0lGODlhJQAlAJECAL3L2AYrTv///wAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQFCgACACwAAAAAJQAlAAACi5SPqcvtDyGYIFpF690i8xUw3qJBwUlSadmcLqYmGQu6KDIeM13beGzYWWy3DlB4IYaMk+Dso2RWkFCfLPcRvFbZxFLUDTt21BW56TyjRep1e20+i+eYMR145W2eefj+6VFmgTQi+ECVY8iGxcg35phGo/iDFwlTyXWphwlm1imGRdcnuqhHeop6UAAAIfkEBQoAAgAsEAACAAQACwAAAgWMj6nLXAAh+QQFCgACACwVAAUACgALAAACFZQvgRi92dyJcVJlLobUdi8x4bIhBQAh+QQFCgACACwXABEADAADAAACBYyPqcsFACH5BAUKAAIALBUAFQAKAAsAAAITlGKZwWoMHYxqtmplxlNT7ixGAQAh+QQFCgACACwQABgABAALAAACBYyPqctcACH5BAUKAAIALAUAFQAKAAsAAAIVlC+BGL3Z3IlxUmUuhtR2LzHhsiEFACH5BAUKAAIALAEAEQAMAAMAAAIFjI+pywUAIfkEBQoAAgAsBQAFAAoACwAAAhOUYJnAagwdjGq2amXGU1PuLEYBACH5BAUKAAIALBAAAgAEAAsAAAIFhI+py1wAIfkEBQoAAgAsFQAFAAoACwAAAhWUL4AIvdnciXFSZS6G1HYvMeGyIQUAIfkEBQoAAgAsFwARAAwAAwAAAgWEj6nLBQAh+QQFCgACACwVABUACgALAAACE5RgmcBqDB2MarZqZcZTU+4sRgEAIfkEBQoAAgAsEAAYAAQACwAAAgWEj6nLXAAh+QQFCgACACwFABUACgALAAACFZQvgAi92dyJcVJlLobUdi8x4bIhBQAh+QQFCgACACwBABEADAADAAACBYSPqcsFADs=') no-repeat;}
+.layui-laydialog-loading .layui-laydialog-loading2, .layui-laydialog-ico16{width:32px; height:32px; background:url('data:image/gif;base64,R0lGODlhIAAgALMAAP///7Ozs/v7+9bW1uHh4fLy8rq6uoGBgTQ0NAEBARsbG8TExJeXl/39/VRUVAAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQFBQAAACwAAAAAIAAgAAAE5xDISSlLrOrNp0pKNRCdFhxVolJLEJQUoSgOpSYT4RowNSsvyW1icA16k8MMMRkCBjskBTFDAZyuAEkqCfxIQ2hgQRFvAQEEIjNxVDW6XNE4YagRjuBCwe60smQUDnd4Rz1ZAQZnFAGDd0hihh12CEE9kjAEVlycXIg7BAsMB6SlnJ87paqbSKiKoqusnbMdmDC2tXQlkUhziYtyWTxIfy6BE8WJt5YEvpJivxNaGmLHT0VnOgGYf0dZXS7APdpB309RnHOG5gDqXGLDaC457D1zZ/V/nmOM82XiHQjYKhKP1oZmADdEAAAh+QQFBQAAACwAAAAAGAAXAAAEchDISasKNeuJFKoHs4mUYlJIkmjIV54Soypsa0wmLSnqoTEtBw52mG0AjhYpBxioEqRNy8V0qFzNw+GGwlJki4lBqx1IBgjMkRIghwjrzcDti2/Gh7D9qN774wQGAYOEfwCChIV/gYmDho+QkZKTR3p7EQAh+QQFBQAAACwBAAAAHQAOAAAEchDISWdANesNHHJZwE2DUSEo5SjKKB2HOKGYFLD1CB/DnEoIlkti2PlyuKGEATMBaAACSyGbEDYD4zN1YIEmh0SCQQgYehNmTNNaKsQJXmBuuEYPi9ECAU/UFnNzeUp9VBQEBoFOLmFxWHNoQw6RWEocEQAh+QQFBQAAACwHAAAAGQARAAAEaRDICdZZNOvNDsvfBhBDdpwZgohBgE3nQaki0AYEjEqOGmqDlkEnAzBUjhrA0CoBYhLVSkm4SaAAWkahCFAWTU0A4RxzFWJnzXFWJJWb9pTihRu5dvghl+/7NQmBggo/fYKHCX8AiAmEEQAh+QQFBQAAACwOAAAAEgAYAAAEZXCwAaq9ODAMDOUAI17McYDhWA3mCYpb1RooXBktmsbt944BU6zCQCBQiwPB4jAihiCK86irTB20qvWp7Xq/FYV4TNWNz4oqWoEIgL0HX/eQSLi69boCikTkE2VVDAp5d1p0CW4RACH5BAUFAAAALA4AAAASAB4AAASAkBgCqr3YBIMXvkEIMsxXhcFFpiZqBaTXisBClibgAnd+ijYGq2I4HAamwXBgNHJ8BEbzgPNNjz7LwpnFDLvgLGJMdnw/5DRCrHaE3xbKm6FQwOt1xDnpwCvcJgcJMgEIeCYOCQlrF4YmBIoJVV2CCXZvCooHbwGRcAiKcmFUJhEAIfkEBQUAAAAsDwABABEAHwAABHsQyAkGoRivELInnOFlBjeM1BCiFBdcbMUtKQdTN0CUJru5NJQrYMh5VIFTTKJcOj2HqJQRhEqvqGuU+uw6AwgEwxkOO55lxIihoDjKY8pBoThPxmpAYi+hKzoeewkTdHkZghMIdCOIhIuHfBMOjxiNLR4KCW1ODAlxSxEAIfkEBQUAAAAsCAAOABgAEgAABGwQyEkrCDgbYvvMoOF5ILaNaIoGKroch9hacD3MFMHUBzMHiBtgwJMBFolDB4GoGGBCACKRcAAUWAmzOWJQExysQsJgWj0KqvKalTiYPhp1LBFTtp10Is6mT5gdVFx1bRN8FTsVCAqDOB9+KhEAIfkEBQUAAAAsAgASAB0ADgAABHgQyEmrBePS4bQdQZBdR5IcHmWEgUFQgWKaKbWwwSIhc4LonsXhBSCsQoOSScGQDJiWwOHQnAxWBIYJNXEoFCiEWDI9jCzESey7GwMM5doEwW4jJoypQQ743u1WcTV0CgFzbhJ5XClfHYd/EwZnHoYVDgiOfHKQNREAIfkEBQUAAAAsAAAPABkAEQAABGeQqUQruDjrW3vaYCZ5X2ie6EkcKaooTAsi7ytnTq046BBsNcTvItz4AotMwKZBIC6H6CVAJaCcT0CUBTgaTg5nTCu9GKiDEMPJg5YBBOpwlnVzLwtqyKnZagZWahoMB2M3GgsHSRsRACH5BAUFAAAALAEACAARABgAAARcMKR0gL34npkUyyCAcAmyhBijkGi2UW02VHFt33iu7yiDIDaD4/erEYGDlu/nuBAOJ9Dvc2EcDgFAYIuaXS3bbOh6MIC5IAP5Eh5fk2exC4tpgwZyiyFgvhEMBBEAIfkEBQUAAAAsAAACAA4AHQAABHMQyAnYoViSlFDGXBJ808Ep5KRwV8qEg+pRCOeoioKMwJK0Ekcu54h9AoghKgXIMZgAApQZcCCu2Ax2O6NUud2pmJcyHA4L0uDM/ljYDCnGfGakJQE5YH0wUBYBAUYfBIFkHwaBgxkDgX5lgXpHAXcpBIsRADs=') no-repeat;}
+.layui-laydialog-tips{background: none; box-shadow:none; border:none;}
+.layui-laydialog-tips .layui-laydialog-content{position: relative; line-height: 22px; min-width: 12px; padding: 8px 15px; font-size: 12px; _float:left; border-radius: 2px; box-shadow: 1px 1px 3px rgba(0,0,0,.2); background-color: #000; color: #fff;}
+.layui-laydialog-tips .layui-laydialog-close{right:-2px; top:-1px;}
+.layui-laydialog-tips i.layui-laydialog-TipsG{ position:absolute;  width:0; height:0; border-width:8px; border-color:transparent; border-style:dashed; *overflow:hidden;}
+.layui-laydialog-tips i.layui-laydialog-TipsT, .layui-laydialog-tips i.layui-laydialog-TipsB{left:5px; border-right-style:solid; border-right-color: #000;}
+.layui-laydialog-tips i.layui-laydialog-TipsT{bottom:-8px;}
+.layui-laydialog-tips i.layui-laydialog-TipsB{top:-8px;}
+.layui-laydialog-tips i.layui-laydialog-TipsR, .layui-laydialog-tips i.layui-laydialog-TipsL{top: 5px; border-bottom-style:solid; border-bottom-color: #000;}
+.layui-laydialog-tips i.layui-laydialog-TipsR{left:-8px;}
+.layui-laydialog-tips i.layui-laydialog-TipsL{right:-8px;}
+
+/* skin */
+.layui-laydialog-lan[type="dialog"]{min-width:280px;}
+.layui-laydialog-lan .layui-laydialog-title{background:#4476A7; color:#fff; border: none;}
+.layui-laydialog-lan .layui-laydialog-btn{padding: 5px 10px 10px; text-align: right; border-top:1px solid #E9E7E7}
+.layui-laydialog-lan .layui-laydialog-btn a{background: #fff; border-color: #E9E7E7; color: #333;}
+.layui-laydialog-lan .layui-laydialog-btn .layui-laydialog-btn1{background:#C9C5C5;}
+.layui-laydialog-molv .layui-laydialog-title{background: #009f95; color:#fff; border: none;}
+.layui-laydialog-molv .layui-laydialog-btn a{background: #009f95; border-color: #009f95;}
+.layui-laydialog-molv .layui-laydialog-btn .layui-laydialog-btn1{background:#92B8B1;}
+
+
+/**
+ 
+ @Name: laydialog拓展样式
+ 
+ */
+
+.layui-laydialog-iconext{background:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAALQAAABkCAYAAAAv8xodAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAK6wAACusBgosNWgAAABZ0RVh0Q3JlYXRpb24gVGltZQAwNS8xMS8xNNdPc0oAAAAcdEVYdFNvZnR3YXJlAEFkb2JlIEZpcmV3b3JrcyBDUzbovLKMAAAWb0lEQVR4nO2de2wU172Av5l92t4Hti/YQHmVmFcSE7+WR0h0uRRVVC2pKldpCFJQEJAiFwg4diikgLEghEhpVLVQNblBSFEUVYoi+hc0FQoE87B52JQAiQnBJDY2wfix633O7P1jdwbbxe9d7yx3PgnJc87iM2M+js+cx+8nhMNhdHQeFcRE34COTizRhdZ5pNCF1nmk0IXWeaQwPqxQEIRYtpEKOABL9NoLtAKhWDbSDRF4EsgAbEBHtL3LAIN9CV6+fHlSvS0fOXLkof9oj8pzDJZ499A2YCxgWbJkiSUnJ8cApADZgCEO7ZmAImAyYFuxYsV4Iv+ZpgIFcWhPR2PEU2gbkAlQU1Mz67PPPvvvq1ev/s/f/va3LCIyp8e4PROQD4wrLi7Oam9vP/Dhhx/+9f79+3/Kz8+3AxPi0KaOxoiX0KrM169ff6KgoGAKgMFgEF944YWZ0c9Y+vrLw8BEpAceV1xcnHX48OE3HQ7HRIAxY8ZM2bdv39Lo5zJi2KaOBomH0D1knjFjxsTulX6/Pxj9Uo5Re4rMY1esWDH+8OHDb6akpGR2/4Db7fZEv4zXuF1HI8Ra6H5lDgQC0ttvv/1l9NIfg/Z6yPzee+/t6S1zY2PjpdWrV/8retkagzZ1NEwshR5Q5j179pzfu3dvOxBg5HINKHNTU1Ody+WqbG1tDQENQOcI29TROA+dthsGGYAd+pd5165d94nIfHeE7Q1K5qKioorvv/8+ANwGakfYZlwIh8MEg0F1OtFoNGIwxGMCKL4Eg0G6urqQJAlRFElNTcVsNo/6fcSih84A7BaLRRiCzCMZy5qAQoYm86URtBc3FJnNZjMzZswgKyuLQCCAJEmJvrUhEQwGcbvdZGdn88ILL5CTk0NnZ2dCnmOkPbQqc11d3eMPk3n37t01lZWVbcRW5v966aWXJh44cKAyWWWWZZlgMIjD4aCoqIj09HRkWeb48eO0tbUlTS+tyDxz5kz2799Peno6LS0trFq1Cr/fT2pq6qjez0iE1mUeJorM6enpFBUVkZaWRigUIhgMEgwGB/4GGiEQCOB2u5kzZw779u0jPT0yze/xeJAkKdYrzoNiuELrMg8TSZIIBoNkZWVRWFiI2WwmHA7j8/k4d+4cnZ2dCRl7DhWlZ37iiSd46623cDgcANy5c4c33ngDj8eD0+kc9fsajtC6zMMkGAwiSRKTJk0iLy9PHVZ4PB7Onj1LR0cHZrMZUdT2njGlZ87Ly2P//v1YrVYAmpqaKC0tpaGhAbvdnpBh01CFHm2ZzURmMx4ZmadNm0Zubi6iKCIIAm1tbZw5cwav14vJZNK8zH6/H7fbTWFhIXv27Okh85YtW7h9+zY2mw2TyZSQ+xuK0KrMly9ffiInJ2dC98pEyNzY2HjJ5XJVJoPMoVCI2bNnM2vWLCCyo/Hu3bucPXuWUCiE2WxOyJhzKCgyL1y4kMrKSiyWyO6Fb7/9li1bttDS0pJQmWHwQidU5oMHD+6xWq09NhYlg8zKtJwsy+Tm5vLYY48RDocRRZGmpiaqq6uRZRmTyaR5mX0+Hx6Ph2eeeYbdu3er0jY0NFBaWqoJmWFwQg8kc2j37t3ndZl70l3mvLw8pk6dSjgcxmAw8O2333LhwgVEUUyKF0C/36/KXFFRoUpbX19PaWkp9+7dw263YzTGap1u+Ax0B7rMwyAcDhMIBDAajbhcLsaPH48sy4iiyNdff01tbS1GozHhvdlgUHrmpUuXsmPHDvU3ybVr1ygtLaW9vV0zMkP/QusyDwNljtlsNlNUVMS4ceNUma9evcrVq1eTSma3282yZcvYvn27KvP169cpKyujo6NDUzJD30Kn8UDmJ3NycsZ3r4yDzABzeURkTklJweVykZGRQTgcRhAEamtr+eabbzCZTJoSoC+UnvnnP/85W7duVWWuq6ujtLQUn8+XsKm5/ujrJ2sDuHDhwpxRktkJZC9evDg92WV2OBy4XC5sNhuyLCPLMpcuXaKhoQGj0ZgUMnu9XtxuN7/61a947bXX1PLa2lrKy8s1KzP0LbR18uTJ4uzZs3vMM0uSJMdBZohuOy0rK1vUW+bm5uZ/a11mgFAohM1mY8GCBaSmpiJJEj6fj9raWpqbmzGZTJoUoDfBYBCPx/MfMl+8eJGtW7fS1dWlWZmhn912zc3N4WCvjQUGg0H85S9/mR29NEf/xAIvQGNj43/skU5PT//xypUrp0YvHUQO2WoOWZZxOp04HA4kScJgMNDS0sKdO3cQRVGzAvQmGAwyZswY1q5dq5bduHGD9evX4/F4cDgcmn6WvoTu8vv94YMHD16WJKnHUamCgoIpNTU1s6KXY4mEKRgprQAlJSWn6+vrP+9eYTabUysqKirKy8tnEBmaFKFBqUVR5M6dO9y+fRuj0YgkSUyePJk5c+aoG4+SAYPBgMfj4cqVK2rZhAkT+NnPfoYsywQCgQTe3cD0JXQrENq4ceMPf/7zny+OgtR+4JbX65Vzc3PfSUapTSYTsixz7tw5Ghoa1F5s5syZ5Ofnq2NsraM8x86dO6mpqQEgJSWF7du3s3z5ctxuN16vN8F32Td9CS0BzYyu1HUksdSCIKiLJDU1Ndy4cQODwUA4HGbatGkUFhYC9DidokVEUcThcODz+Xj99deprq4GIs9XXl5OcXExbrebrq6uBN/pw+lvJ0wIXeoho2wwunTpEteuXUMURWRZZtKkSbhcLkRR1LzUBoMBu91OIBDg97//PefOnVPrNm/ezPPPP4/H49Gk1ANt7dKlHgbKXPOVK1e4fPkygiAgyzLZ2dksXLgQq9WaFFI7HA78fj9btmzhxIkTat2mTZt48cUXNSn1YPYq6lIPA5PJhMlk4uuvv+bChQuqvJmZmcyfP5/U1FQCgQCyHKvwJLFHGX4IgsCOHTt6SF1SUsKqVavweDx4PJ5+vsvoMtjNt7rUw0BZ4r516xbV1dWEQiHC4TBOp5OFCxfidDrVDUxaRZFalmXeeOMNjh8/rtatW7eOl19+ma6uLs1IPZTd5LrUw8BgMGAymWhsbOTs2bP4/ZH4OmlpaSxcuJCxY8eqm/+1iiiK2O12ALZv386xY8fUujVr1rBu3To8Hg9utztRt6gy1OMRutTDwGAwYDabaWlpoaqqSh13WiwWXC4X2dnZSSO10Whk9+7dHD16VK1btWoVJSUlmuiph3PeR5d6GCh7n9vb2zl16hSdnZ0IgoDRaKSoqIgpU6aoJ1u0ijL8EEWRHTt2cOTIEbVu5cqVbNiwIeE99XAPsOlSDwNRFDGZTHg8Hqqqqrh37x6CIGAwGMjPz2f69OlIkqRpqQVBwG63Y7Va2bt3L59++qlat2LFCkpLS+nq6kqY1CM5kalLPQyUntrn81FVVUVzc7N6MDY3N1cNOKNllOGHxWJh3759fPLJJ2pdcXExr776Kj6fLyHL5CM9YqxLPQwEQVCXmM+cOUNDQwMQ2bap5d65O0pPrUj90UcfqXW/+MUvyMjISMizxOLMvC71MFCkFgSB6upqTp06xcmTJ+no6EiKPdPwQOqUlBTeffddDh48yHfffcfHH39MW1tbQk7lxCoIxHCkHmkE/6FKnTvC9uKCsgBz7949fD5fUgSa6Y4gCDgcDiwWC4cOHWLdunUcOHAAs9mc1ELDIKU+fvz4tOilPQZtDkrq4uLiLGAcGk1JocxVJ0Ogmb5wOp2MGzcOg8FAdnY2NpstIfcR65/egFIXFRVNjn4ZqxwrA0q9fv36Z6KXmhRaJ3bEozvoV+qOjg5l5j2Wm4P7lbq+vv776JeJX8rSiSvxevtQpM7auHHjD62trTWrV6+e5vP5gqWlpV9HPxOLHCvdqQPwer1TcnNz3zly5MjN3Nxc16VLl86sXbv2dLQ9PcfKI47wsC2MMQxLZSTyAtj77KEXaIlVI73IBaY8pPwk0KZnktU2I80kG+/5oRDQRORwq5VIKjcf8f3VX0fkdHg2kTFza/Qe2uLYpo5GiHcPrTm0vKleZ+T010ObiaQStkavfUR6uViPfbujJJ13EOnFlaTzo74W/Kj8qn5UnmOw9DXLYQbGA9a8vDxTXl6eiYjY2TwQPNYUEEky74gmnbcRSUJfRCSKv47OgPQl9BiAo0ePTjl//vzi8+fPL/7nP/+pLIhkEXup04EJ+fn59vv37//pww8//Gt7e/uBbgsi+ehS6wyCvoROcTqdwpIlS2YIUX7yk5/M+Pzzz6dH62MtdQbAvn37lo4ZM2YKgMPhmHj48OE3dal1hkKfCys+nw9Jknpsl3r22Wcfi5PUIeiRZB6AlJSUzF5SF6BLrdMP/YYC++CDD/4d7jUt8Oyzzz526tSpx6KXsZK6FWD16tX/amxs7BGMUZE6Oq4eiy61Tj/0FwpMeuWVV+6+//77tb2lXrhw4fQYS90JNLS2toZcLldlU1NTXffKlJSUzPfee2+PLrXOQAwUCkxas2ZN8/vvv1/be5NRHKSuBW5///33gaKioopklFqSJPx+P36/n0AgkLRz3oFAgLa2NlpbW2lvb0+KmHwK/W1OCtJN6g8++KBuEFKPdBP9JZJUakmSCAQCZGVlkZOTg8lk0nx0pIchSRJut5ucnBx+85vfkJWVhdvtThqpB9ptFwTuMHipxzH6UheiAaklSSIzM5Onn36auXPnsmjRIjU+nNbPCHbH7/fjdDrZu3cvJSUlHDhwgJycnKSRerChwAaUuqqqKid6OWpSv/TSSxOB/0IjUgeDQfx+P6FQCKfTyfz580lPT9d8dKTuCIKAJElq7JDMzEz279/PrFmz6OzsTNr40L0ZUOoFCxb8eLSlPnDgQKVWpDYajbjdbk6fPo3f7yccDpOamsqCBQsYN24cgUBA04FkFMxmM263mz/84Q+0tEQ2RGZmZvL222/z+OOPa76nHmooMF3qPlBibrS2tlJVVaVGEDKbzcybN48f/ehHBINBTcsAD0Lp3rx5k82bN9Pc3AxEjli9++67PPXUU5ruqYcTCiyhUj9snlprUnd0dPDFF1/Q0dGhBpIpKChg6tSpSJKkealNJhM2m41bt26xefNm7ty5A4DVauXNN98kPz8ft9utxunTEsMNBZYwqV0uV+UgpU5IzmFFap/PxxdffMEPP/yAIAgIgsBTTz3FzJkzkyLniiJ1Q0MDJSUl3Lp1CwCbzcZbb73FvHnz8Hg8mpN6JKHAtC51AQmSWom5EQwGOX36tJoJC2DOnDk8+eSThEIhzc9VK1I3Nzfz2muvcfv2bQA1DNjTTz+N2+3G5/Ml+E4fMNJQYANKfe7cuVGV+uDBg3u0IrXZbEaWZU6fPq0mEgqHw+Tk5JCXl6cmEtK61Ha7naamJjZu3Mg333wDRN4NKioqWLRokaZ66liEAutX6qKiolGV2mq1pmtFaniQc6Wmpob6+no1PcW0adOYN28eoihqvqc2Go3Y7Xbu3r3Lpk2buH79OhAJB7x3716WLFmimZ46VqHAdKn7Qcki2z2RUDgcZuLEicybNw+z2az5BRhF6ra2NsrKyvjqq6+AyDvDrl27+OlPf4rH40m41LEMBTZUqUcaaGaoUs8dYXsjQomMdPXqVerq6hAEgXA4TFZWFvPnz1cTCSWD1Pfv3+d3v/sdly9fBiLDq+3bt7Ns2bKESx3rUGADSt0tFJgjBm32kPq777670L1SkXrx4sXpRI6POWPQ5rBRktffuHGDCxcuIEkSsiyTkZHBokWLcDgcmpdamaf2er2UlZVRVxdZGhBFkW3btiU8OWc8QoH1kLr3B+bNm6fEzIhVKDBV6vnz5+9pbm7+d/dKq9WaXlZWtih6mRmjNoeNkkiooaGB6upqvF4vsixjt9uZP38+NptN8yF1Fak9Hg/l5eXU1tYCkZ66rKyM5557Do/Hk5CpyXiEAnMABovFIixZsiS7d6XX61Veh2O1DpwSbZOVK1dOTU9P/3HvDzQ2NioRkzSR09dgMCCKIk1NTbS0tGAwGJAkCafTidPp1HQPraDkMXS73fz2t7/lxo0bQETqdevWqRm+RptYC50B2C0Wi3D16tXcadOm9RA6EAgEKysrlazosRhopRA5Fe4sLy+fUVFRUWE2m3vEnq6vr/+8pKTkdPRSE6HAlFwqc+bMYfLkyUiShNFo5Pbt2zQ1NSVNBFLlRXbZsmVMmDBBLf/yyy/p6upS852PJrGMnDSgzK+//nrNO++800Ektsf9EbY3KJlzc3Pf8Xq9MnCL+MYUGRTKGDk/P5+pU6ciyzIGg4GGhgY1QWci4ioPFa/Xi8fj4bnnnqOsrEwNTlRTU8POnTuRZTkhzxEroYcq890Rtjccmf9jPD+ahMNhdWxcWFjIpEmTVJlv3LhBXV2dmn9F6yjp237961+zefNmtby6upqtW7cSCATUbFmjTSyEzgRsQ5R5JOPnpJQ5GAxiMBgoLCxk/PjxyLKMKIpcu3aNK1euqC+LWkeR+fnnn2fTpk1q+blz59i2bRuBQAC73Z6Q4QaMXOhMwOZ0OoWLFy/qMj8ERWar1UpRUREZGRnIsowgCFy+fJmvvvoq6WR+8cUXKSkpUctPnDjBtm3b1PQUiXwHGInQuswDoOzVSEtLw+VyMWbMGMLhMOFwmIsXL3Lr1i1MJlNSJAnyeDx0dXWxatUq1q1bp5afOHGCHTt2aEJmGL7QuswDoMjsdDpxuVykpaWp4+jz58/T2NioLolrHUXml19+mTVr1qjlx48fZ+fOnQCakBmGJ7Qu8wAo2WDHjh1LYWEhFktkDcnv91NTU0NLS0vSyOx2u+nq6uKVV15h1apVavmxY8fYtWuXuhyuBZlh6ELrMg+AciJl/PjxFBQUqGPjrq4uzp49S1tbW9KkblN65pKSElauXKmWHz16lMrKSs3JDEMTWpd5AEKhEKFQiClTpjB37lxEUUQQBDo6Ojhz5gwejydpZFZ65g0bNrBixQq1/MiRI+zZsweLxYLD4dBccPzBCq3LPAChUAhJkpg+fTq5uQ9yfN67d0/ds5EseQgVmUtLSykuLlbLP/30U/bt24fVasVms2lOZhic0LrMg0CWZdLT01WZlb0a1dXVSJKE2WzWpAC9CQQC+P1+Xn311R4yf/LJJ+zfvx+LxYLdbtfsswwktC7zEAiFQni9XlJSUmhoaOD8+fM9cnonA6FQiIyMDJYvX66WffTRR/zxj38kJSVF0zJD/0LrMg8Bo9FIZ2cnJ0+eJC0tTd1FlwwLJt0xmUy0tbXx8ccfs3TpUv7xj39w6NChpJAZ+hY6jdGVGSL5BZNSZugZvsDn8yXNtFxvlJM1f/nLX/j73/9Oa2ur+gKYDPQltA2gqqpqzijJnAGMKy4uzkpGmRVEUUyKl76BsNlsavL5sWPHJvhuhkZfP32r0+kUZs+ePbF7YZxkhmiOlfXr1z+TrDLraIO+hA62t7eHOzo6upSCOMoM0cyy3ZLME73WZdYZEn0J7QcoLy+/ePPmzeabN2/e2bBhw9k4yQyRkyT+tWvXnj527Nj/trS0fPnZZ58d0mXWGSp9pUYWiIQa6J1mwgf8QGxlVhgDPPOQ8pjKrCev1zbxSl4fJpKOwsGD09l+oGMkjQ1AG3CSSAZbJen8HUZ+VEvn/xEP7aF1dJKV5J9j0tHphi60ziOFLrTOI4UutM4jhS60ziPF/wHgvbfirVNMHAAAAABJRU5ErkJggg==') no-repeat;}
+
+/* prompt模式 */
+.layui-laydialog-prompt .layui-laydialog-input{display: block; width: 230px; height: 36px; margin: 0 auto; line-height: 30px; padding-left: 10px; border: 1px solid #e6e6e6; color: #333;}
+.layui-laydialog-prompt textarea.layui-laydialog-input{width: 300px; height: 100px; line-height: 20px; padding: 6px 10px;}
+.layui-laydialog-prompt .layui-laydialog-content{padding: 20px;}
+.layui-laydialog-prompt .layui-laydialog-btn{padding-top: 0;}
+
+/* tab模式 */
+.layui-laydialog-tab{box-shadow:1px 1px 50px rgba(0,0,0,.4);}
+.layui-laydialog-tab .layui-laydialog-title{padding-left:0; overflow: visible;}
+.layui-laydialog-tab .layui-laydialog-title span{position:relative; float:left; min-width:80px; max-width:260px; padding:0 20px; text-align:center; cursor:default; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; cursor: pointer;}
+.layui-laydialog-tab .layui-laydialog-title span.layui-this{height: 43px; border-left: 1px solid #eee; border-right: 1px solid #eee; background-color: #fff; z-index: 10;}
+.layui-laydialog-tab .layui-laydialog-title span:first-child{border-left:none;}
+.layui-laydialog-tabmain{line-height:24px; clear:both;}
+.layui-laydialog-tabmain .layui-laydialog-tabli{display:none;}
+.layui-laydialog-tabmain .layui-laydialog-tabli.layui-this{display: block;}
+
+/* photo模式 */
+.layui-laydialog-photos{-webkit-animation-duration: .8s; animation-duration: .8s;}
+.layui-laydialog-photos .layui-laydialog-content{overflow:hidden; text-align: center;}
+.layui-laydialog-photos .layui-laydialog-phimg img{position: relative; width:100%; display: inline-block; *display:inline; *zoom:1; vertical-align:top;}
+.layui-laydialog-imguide,.layui-laydialog-imgbar{display:none;}
+.layui-laydialog-imgprev, .layui-laydialog-imgnext{position:absolute; top:50%; width:27px; _width:44px; height:44px;  margin-top:-22px; outline:none;blr:expression(this.onFocus=this.blur());}
+.layui-laydialog-imgprev{left:10px; background-position:-5px -5px; _background-position:-70px -5px;}
+.layui-laydialog-imgprev:hover{background-position:-33px -5px; _background-position:-120px -5px;}
+.layui-laydialog-imgnext{right:10px; _right:8px; background-position:-5px -50px; _background-position:-70px -50px;}
+.layui-laydialog-imgnext:hover{background-position:-33px -50px; _background-position:-120px -50px;}
+.layui-laydialog-imgbar{position:absolute; left:0; bottom:0; width:100%; height:32px; line-height:32px; background-color:rgba(0,0,0,.8); background-color:#000\9; filter:Alpha(opacity=80); color:#fff; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; font-size:0;}
+.layui-laydialog-imgtit{/*position:absolute; left:20px;*/}
+.layui-laydialog-imgtit *{display:inline-block; *display:inline; *zoom:1; vertical-align:top; font-size:12px;}
+.layui-laydialog-imgtit a{max-width:65%;  text-overflow: ellipsis; overflow: hidden; white-space: nowrap; color:#fff;}
+.layui-laydialog-imgtit a:hover{color:#fff; text-decoration:underline;}
+.layui-laydialog-imgtit em{padding-left:10px; font-style: normal;}
+
+/* 关闭动画 */
+@-webkit-keyframes laydialog-bounceOut {
+  100% {opacity: 0; -webkit-transform: scale(.7); transform: scale(.7)}
+  30% {-webkit-transform: scale(1.05); transform: scale(1.05)}
+  0% {-webkit-transform: scale(1); transform: scale(1);}
+}
+@keyframes laydialog-bounceOut {
+  100% {opacity: 0; -webkit-transform: scale(.7); -ms-transform: scale(.7); transform: scale(.7);}
+  30% {-webkit-transform: scale(1.05); -ms-transform: scale(1.05); transform: scale(1.05);}
+  0% {-webkit-transform: scale(1); -ms-transform: scale(1);transform: scale(1);}
+}
+.laydialog-anim-close{-webkit-animation-name: laydialog-bounceOut; animation-name: laydialog-bounceOut; -webkit-animation-fill-mode: both; animation-fill-mode: both; -webkit-animation-duration:.2s; animation-duration:.2s;}
+
+@media screen and (max-width: 1100px) {
+  .layui-laydialog-iframe{overflow-y: auto; -webkit-overflow-scrolling: touch;}
+}
+
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/css/modules/laydialog/default/loading-0.gif b/pluss-manage-page/src/main/resources/static/resources/auth/css/modules/laydialog/default/loading-0.gif
new file mode 100644
index 0000000..6f3c953
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/css/modules/laydialog/default/loading-0.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/css/modules/laydialog/default/loading-1.gif b/pluss-manage-page/src/main/resources/static/resources/auth/css/modules/laydialog/default/loading-1.gif
new file mode 100644
index 0000000..db3a483
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/css/modules/laydialog/default/loading-1.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/css/modules/laydialog/default/loading-2.gif b/pluss-manage-page/src/main/resources/static/resources/auth/css/modules/laydialog/default/loading-2.gif
new file mode 100644
index 0000000..5bb90fd
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/css/modules/laydialog/default/loading-2.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/css/modules/layer/default/icon-ext.png b/pluss-manage-page/src/main/resources/static/resources/auth/css/modules/layer/default/icon-ext.png
new file mode 100644
index 0000000..bbbb669
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/css/modules/layer/default/icon-ext.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/css/modules/layer/default/icon.png b/pluss-manage-page/src/main/resources/static/resources/auth/css/modules/layer/default/icon.png
new file mode 100644
index 0000000..3e17da8
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/css/modules/layer/default/icon.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/css/modules/layer/default/layer.css b/pluss-manage-page/src/main/resources/static/resources/auth/css/modules/layer/default/layer.css
new file mode 100644
index 0000000..032ae12
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/css/modules/layer/default/layer.css
@@ -0,0 +1,2 @@
+/** layui-v2.5.6 MIT License By https://www.layui.com */
+ .layui-layer-imgbar,.layui-layer-imgtit a,.layui-layer-tab .layui-layer-title span,.layui-layer-title{text-overflow:ellipsis;white-space:nowrap}html #layuicss-layer{display:none;position:absolute;width:1989px}.layui-layer,.layui-layer-shade{position:fixed;_position:absolute;pointer-events:auto}.layui-layer-shade{top:0;left:0;width:100%;height:100%;_height:expression(document.body.offsetHeight+"px")}.layui-layer{-webkit-overflow-scrolling:touch;top:150px;left:0;margin:0;padding:0;background-color:#fff;-webkit-background-clip:content;border-radius:2px;box-shadow:1px 1px 50px rgba(0,0,0,.3)}.layui-layer-close{position:absolute}.layui-layer-content{position:relative}.layui-layer-border{border:1px solid #B2B2B2;border:1px solid rgba(0,0,0,.1);box-shadow:1px 1px 5px rgba(0,0,0,.2)}.layui-layer-load{background:url(loading-1.gif) center center no-repeat #eee}.layui-layer-ico{background:url(icon.png) no-repeat}.layui-layer-btn a,.layui-layer-dialog .layui-layer-ico,.layui-layer-setwin a{display:inline-block;*display:inline;*zoom:1;vertical-align:top}.layui-layer-move{display:none;position:fixed;*position:absolute;left:0;top:0;width:100%;height:100%;cursor:move;opacity:0;filter:alpha(opacity=0);background-color:#fff;z-index:2147483647}.layui-layer-resize{position:absolute;width:15px;height:15px;right:0;bottom:0;cursor:se-resize}.layer-anim{-webkit-animation-fill-mode:both;animation-fill-mode:both;-webkit-animation-duration:.3s;animation-duration:.3s}@-webkit-keyframes layer-bounceIn{0%{opacity:0;-webkit-transform:scale(.5);transform:scale(.5)}100%{opacity:1;-webkit-transform:scale(1);transform:scale(1)}}@keyframes layer-bounceIn{0%{opacity:0;-webkit-transform:scale(.5);-ms-transform:scale(.5);transform:scale(.5)}100%{opacity:1;-webkit-transform:scale(1);-ms-transform:scale(1);transform:scale(1)}}.layer-anim-00{-webkit-animation-name:layer-bounceIn;animation-name:layer-bounceIn}@-webkit-keyframes layer-zoomInDown{0%{opacity:0;-webkit-transform:scale(.1) translateY(-2000px);transform:scale(.1) translateY(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateY(60px);transform:scale(.475) translateY(60px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}@keyframes layer-zoomInDown{0%{opacity:0;-webkit-transform:scale(.1) translateY(-2000px);-ms-transform:scale(.1) translateY(-2000px);transform:scale(.1) translateY(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateY(60px);-ms-transform:scale(.475) translateY(60px);transform:scale(.475) translateY(60px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}.layer-anim-01{-webkit-animation-name:layer-zoomInDown;animation-name:layer-zoomInDown}@-webkit-keyframes layer-fadeInUpBig{0%{opacity:0;-webkit-transform:translateY(2000px);transform:translateY(2000px)}100%{opacity:1;-webkit-transform:translateY(0);transform:translateY(0)}}@keyframes layer-fadeInUpBig{0%{opacity:0;-webkit-transform:translateY(2000px);-ms-transform:translateY(2000px);transform:translateY(2000px)}100%{opacity:1;-webkit-transform:translateY(0);-ms-transform:translateY(0);transform:translateY(0)}}.layer-anim-02{-webkit-animation-name:layer-fadeInUpBig;animation-name:layer-fadeInUpBig}@-webkit-keyframes layer-zoomInLeft{0%{opacity:0;-webkit-transform:scale(.1) translateX(-2000px);transform:scale(.1) translateX(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateX(48px);transform:scale(.475) translateX(48px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}@keyframes layer-zoomInLeft{0%{opacity:0;-webkit-transform:scale(.1) translateX(-2000px);-ms-transform:scale(.1) translateX(-2000px);transform:scale(.1) translateX(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateX(48px);-ms-transform:scale(.475) translateX(48px);transform:scale(.475) translateX(48px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}.layer-anim-03{-webkit-animation-name:layer-zoomInLeft;animation-name:layer-zoomInLeft}@-webkit-keyframes layer-rollIn{0%{opacity:0;-webkit-transform:translateX(-100%) rotate(-120deg);transform:translateX(-100%) rotate(-120deg)}100%{opacity:1;-webkit-transform:translateX(0) rotate(0);transform:translateX(0) rotate(0)}}@keyframes layer-rollIn{0%{opacity:0;-webkit-transform:translateX(-100%) rotate(-120deg);-ms-transform:translateX(-100%) rotate(-120deg);transform:translateX(-100%) rotate(-120deg)}100%{opacity:1;-webkit-transform:translateX(0) rotate(0);-ms-transform:translateX(0) rotate(0);transform:translateX(0) rotate(0)}}.layer-anim-04{-webkit-animation-name:layer-rollIn;animation-name:layer-rollIn}@keyframes layer-fadeIn{0%{opacity:0}100%{opacity:1}}.layer-anim-05{-webkit-animation-name:layer-fadeIn;animation-name:layer-fadeIn}@-webkit-keyframes layer-shake{0%,100%{-webkit-transform:translateX(0);transform:translateX(0)}10%,30%,50%,70%,90%{-webkit-transform:translateX(-10px);transform:translateX(-10px)}20%,40%,60%,80%{-webkit-transform:translateX(10px);transform:translateX(10px)}}@keyframes layer-shake{0%,100%{-webkit-transform:translateX(0);-ms-transform:translateX(0);transform:translateX(0)}10%,30%,50%,70%,90%{-webkit-transform:translateX(-10px);-ms-transform:translateX(-10px);transform:translateX(-10px)}20%,40%,60%,80%{-webkit-transform:translateX(10px);-ms-transform:translateX(10px);transform:translateX(10px)}}.layer-anim-06{-webkit-animation-name:layer-shake;animation-name:layer-shake}@-webkit-keyframes fadeIn{0%{opacity:0}100%{opacity:1}}.layui-layer-title{padding:0 80px 0 20px;height:42px;line-height:42px;border-bottom:1px solid #eee;font-size:14px;color:#333;overflow:hidden;background-color:#F8F8F8;border-radius:2px 2px 0 0}.layui-layer-setwin{position:absolute;right:15px;*right:0;top:15px;font-size:0;line-height:initial}.layui-layer-setwin a{position:relative;width:16px;height:16px;margin-left:10px;font-size:12px;_overflow:hidden}.layui-layer-setwin .layui-layer-min cite{position:absolute;width:14px;height:2px;left:0;top:50%;margin-top:-1px;background-color:#2E2D3C;cursor:pointer;_overflow:hidden}.layui-layer-setwin .layui-layer-min:hover cite{background-color:#2D93CA}.layui-layer-setwin .layui-layer-max{background-position:-32px -40px}.layui-layer-setwin .layui-layer-max:hover{background-position:-16px -40px}.layui-layer-setwin .layui-layer-maxmin{background-position:-65px -40px}.layui-layer-setwin .layui-layer-maxmin:hover{background-position:-49px -40px}.layui-layer-setwin .layui-layer-close1{background-position:1px -40px;cursor:pointer}.layui-layer-setwin .layui-layer-close1:hover{opacity:.7}.layui-layer-setwin .layui-layer-close2{position:absolute;right:-28px;top:-28px;width:30px;height:30px;margin-left:0;background-position:-149px -31px;*right:-18px;_display:none}.layui-layer-setwin .layui-layer-close2:hover{background-position:-180px -31px}.layui-layer-btn{text-align:right;padding:0 15px 12px;pointer-events:auto;user-select:none;-webkit-user-select:none}.layui-layer-btn a{height:28px;line-height:28px;margin:5px 5px 0;padding:0 15px;border:1px solid #dedede;background-color:#fff;color:#333;border-radius:2px;font-weight:400;cursor:pointer;text-decoration:none}.layui-layer-btn a:hover{opacity:.9;text-decoration:none}.layui-layer-btn a:active{opacity:.8}.layui-layer-btn .layui-layer-btn0{border-color:#1E9FFF;background-color:#1E9FFF;color:#fff}.layui-layer-btn-l{text-align:left}.layui-layer-btn-c{text-align:center}.layui-layer-dialog{min-width:260px}.layui-layer-dialog .layui-layer-content{position:relative;padding:20px;line-height:24px;word-break:break-all;overflow:hidden;font-size:14px;overflow-x:hidden;overflow-y:auto}.layui-layer-dialog .layui-layer-content .layui-layer-ico{position:absolute;top:16px;left:15px;_left:-40px;width:30px;height:30px}.layui-layer-ico1{background-position:-30px 0}.layui-layer-ico2{background-position:-60px 0}.layui-layer-ico3{background-position:-90px 0}.layui-layer-ico4{background-position:-120px 0}.layui-layer-ico5{background-position:-150px 0}.layui-layer-ico6{background-position:-180px 0}.layui-layer-rim{border:6px solid #8D8D8D;border:6px solid rgba(0,0,0,.3);border-radius:5px;box-shadow:none}.layui-layer-msg{min-width:180px;border:1px solid #D3D4D3;box-shadow:none}.layui-layer-hui{min-width:100px;background-color:#000;filter:alpha(opacity=60);background-color:rgba(0,0,0,.6);color:#fff;border:none}.layui-layer-hui .layui-layer-content{padding:12px 25px;text-align:center}.layui-layer-dialog .layui-layer-padding{padding:20px 20px 20px 55px;text-align:left}.layui-layer-page .layui-layer-content{position:relative;overflow:auto}.layui-layer-iframe .layui-layer-btn,.layui-layer-page .layui-layer-btn{padding-top:10px}.layui-layer-nobg{background:0 0}.layui-layer-iframe iframe{display:block;width:100%}.layui-layer-loading{border-radius:100%;background:0 0;box-shadow:none;border:none}.layui-layer-loading .layui-layer-content{width:60px;height:24px;background:url(loading-0.gif) no-repeat}.layui-layer-loading .layui-layer-loading1{width:37px;height:37px;background:url(loading-1.gif) no-repeat}.layui-layer-ico16,.layui-layer-loading .layui-layer-loading2{width:32px;height:32px;background:url(loading-2.gif) no-repeat}.layui-layer-tips{background:0 0;box-shadow:none;border:none}.layui-layer-tips .layui-layer-content{position:relative;line-height:22px;min-width:12px;padding:8px 15px;font-size:12px;_float:left;border-radius:2px;box-shadow:1px 1px 3px rgba(0,0,0,.2);background-color:#000;color:#fff}.layui-layer-tips .layui-layer-close{right:-2px;top:-1px}.layui-layer-tips i.layui-layer-TipsG{position:absolute;width:0;height:0;border-width:8px;border-color:transparent;border-style:dashed;*overflow:hidden}.layui-layer-tips i.layui-layer-TipsB,.layui-layer-tips i.layui-layer-TipsT{left:5px;border-right-style:solid;border-right-color:#000}.layui-layer-tips i.layui-layer-TipsT{bottom:-8px}.layui-layer-tips i.layui-layer-TipsB{top:-8px}.layui-layer-tips i.layui-layer-TipsL,.layui-layer-tips i.layui-layer-TipsR{top:5px;border-bottom-style:solid;border-bottom-color:#000}.layui-layer-tips i.layui-layer-TipsR{left:-8px}.layui-layer-tips i.layui-layer-TipsL{right:-8px}.layui-layer-lan[type=dialog]{min-width:280px}.layui-layer-lan .layui-layer-title{background:#4476A7;color:#fff;border:none}.layui-layer-lan .layui-layer-btn{padding:5px 10px 10px;text-align:right;border-top:1px solid #E9E7E7}.layui-layer-lan .layui-layer-btn a{background:#fff;border-color:#E9E7E7;color:#333}.layui-layer-lan .layui-layer-btn .layui-layer-btn1{background:#C9C5C5}.layui-layer-molv .layui-layer-title{background:#009f95;color:#fff;border:none}.layui-layer-molv .layui-layer-btn a{background:#009f95;border-color:#009f95}.layui-layer-molv .layui-layer-btn .layui-layer-btn1{background:#92B8B1}.layui-layer-iconext{background:url(icon-ext.png) no-repeat}.layui-layer-prompt .layui-layer-input{display:block;width:230px;height:36px;margin:0 auto;line-height:30px;padding-left:10px;border:1px solid #e6e6e6;color:#333}.layui-layer-prompt textarea.layui-layer-input{width:300px;height:100px;line-height:20px;padding:6px 10px}.layui-layer-prompt .layui-layer-content{padding:20px}.layui-layer-prompt .layui-layer-btn{padding-top:0}.layui-layer-tab{box-shadow:1px 1px 50px rgba(0,0,0,.4)}.layui-layer-tab .layui-layer-title{padding-left:0;overflow:visible}.layui-layer-tab .layui-layer-title span{position:relative;float:left;min-width:80px;max-width:260px;padding:0 20px;text-align:center;overflow:hidden;cursor:pointer}.layui-layer-tab .layui-layer-title span.layui-this{height:43px;border-left:1px solid #eee;border-right:1px solid #eee;background-color:#fff;z-index:10}.layui-layer-tab .layui-layer-title span:first-child{border-left:none}.layui-layer-tabmain{line-height:24px;clear:both}.layui-layer-tabmain .layui-layer-tabli{display:none}.layui-layer-tabmain .layui-layer-tabli.layui-this{display:block}.layui-layer-photos{-webkit-animation-duration:.8s;animation-duration:.8s}.layui-layer-photos .layui-layer-content{overflow:hidden;text-align:center}.layui-layer-photos .layui-layer-phimg img{position:relative;width:100%;display:inline-block;*display:inline;*zoom:1;vertical-align:top}.layui-layer-imgbar,.layui-layer-imguide{display:none}.layui-layer-imgnext,.layui-layer-imgprev{position:absolute;top:50%;width:27px;_width:44px;height:44px;margin-top:-22px;outline:0;blr:expression(this.onFocus=this.blur())}.layui-layer-imgprev{left:10px;background-position:-5px -5px;_background-position:-70px -5px}.layui-layer-imgprev:hover{background-position:-33px -5px;_background-position:-120px -5px}.layui-layer-imgnext{right:10px;_right:8px;background-position:-5px -50px;_background-position:-70px -50px}.layui-layer-imgnext:hover{background-position:-33px -50px;_background-position:-120px -50px}.layui-layer-imgbar{position:absolute;left:0;bottom:0;width:100%;height:32px;line-height:32px;background-color:rgba(0,0,0,.8);background-color:#000\9;filter:Alpha(opacity=80);color:#fff;overflow:hidden;font-size:0}.layui-layer-imgtit *{display:inline-block;*display:inline;*zoom:1;vertical-align:top;font-size:12px}.layui-layer-imgtit a{max-width:65%;overflow:hidden;color:#fff}.layui-layer-imgtit a:hover{color:#fff;text-decoration:underline}.layui-layer-imgtit em{padding-left:10px;font-style:normal}@-webkit-keyframes layer-bounceOut{100%{opacity:0;-webkit-transform:scale(.7);transform:scale(.7)}30%{-webkit-transform:scale(1.05);transform:scale(1.05)}0%{-webkit-transform:scale(1);transform:scale(1)}}@keyframes layer-bounceOut{100%{opacity:0;-webkit-transform:scale(.7);-ms-transform:scale(.7);transform:scale(.7)}30%{-webkit-transform:scale(1.05);-ms-transform:scale(1.05);transform:scale(1.05)}0%{-webkit-transform:scale(1);-ms-transform:scale(1);transform:scale(1)}}.layer-anim-close{-webkit-animation-name:layer-bounceOut;animation-name:layer-bounceOut;-webkit-animation-fill-mode:both;animation-fill-mode:both;-webkit-animation-duration:.2s;animation-duration:.2s}@media screen and (max-width:1100px){.layui-layer-iframe{overflow-y:auto;-webkit-overflow-scrolling:touch}}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/css/modules/layer/default/loading-0.gif b/pluss-manage-page/src/main/resources/static/resources/auth/css/modules/layer/default/loading-0.gif
new file mode 100644
index 0000000..6f3c953
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/css/modules/layer/default/loading-0.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/css/modules/layer/default/loading-1.gif b/pluss-manage-page/src/main/resources/static/resources/auth/css/modules/layer/default/loading-1.gif
new file mode 100644
index 0000000..db3a483
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/css/modules/layer/default/loading-1.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/css/modules/layer/default/loading-2.gif b/pluss-manage-page/src/main/resources/static/resources/auth/css/modules/layer/default/loading-2.gif
new file mode 100644
index 0000000..5bb90fd
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/css/modules/layer/default/loading-2.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/css/modules/laypage/default/laypage.css b/pluss-manage-page/src/main/resources/static/resources/auth/css/modules/laypage/default/laypage.css
new file mode 100644
index 0000000..6c49f65
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/css/modules/laypage/default/laypage.css
@@ -0,0 +1,118 @@
+/*!
+ laypage默认样式
+*/
+.laypage_main a, .laypage_main input,.laypage_main select, .laypage_main span {
+	height: 26px;
+	line-height: 26px
+}
+
+/* .laypage_main button, .laypage_main input, .laypageskin_default a {
+	border: 1px solid #ccc;
+	background-color: #fff
+} */
+
+
+.laypage_main {
+	font-size: 0;
+	clear: both;
+	color: #666
+}
+
+.laypage_main * {
+	display: inline-block;
+	vertical-align: top;
+	font-size: 12px
+}
+
+.laypage_main a {
+	text-decoration: none;
+	color: #666
+}
+
+.laypage_main a, .laypage_main span {
+	margin: 0 3px 6px;
+	padding: 0 5px
+}
+.laypage_main  .disabled{
+	opacity: .35;
+    filter: Alpha(Opacity=35);
+    background-image: none;
+}
+
+.laypage_main input {
+	width: 40px;
+	margin: 0 5px;
+	padding: 0 5px
+}
+.laypage_main select {
+	width: 50px;
+	margin: 0 5px;
+	padding: 0 5px
+}
+
+
+.laypage_main button {
+	height: 28px;
+	line-height: 28px;
+	margin-left: 5px;
+	padding: 0 10px;
+	color: #666
+}
+
+.laypageskin_default span {
+	height: 28px;
+	line-height: 28px;
+	color: #999
+}
+
+.laypageskin_default .laypage_curr {
+	font-weight: 700;
+	color: #666
+}
+
+.laypageskin_molv a, .laypageskin_molv span {
+	padding: 0 12px;
+	border-radius: 2px
+}
+
+.laypageskin_molv a {
+	background-color: #f1eff0
+}
+
+.laypageskin_molv .laypage_curr {
+	background-color: #00AA91;
+	color: #fff
+}
+
+.laypageskin_molv input {
+	height: 24px;
+	line-height: 24px
+}
+
+.laypageskin_molv button {
+	height: 26px;
+	line-height: 26px
+}
+
+.laypageskin_yahei {
+	color: #333
+}
+
+.laypageskin_yahei a, .laypageskin_yahei span {
+	padding: 0 13px;
+	border-radius: 2px;
+	color: #333
+}
+
+.laypageskin_yahei .laypage_curr {
+	background-color: #333;
+	color: #fff
+}
+
+.laypageskin_flow {
+	text-align: center
+}
+
+.laypageskin_flow .page_nomore {
+	color: #999
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/css/pagination.css b/pluss-manage-page/src/main/resources/static/resources/auth/css/pagination.css
new file mode 100644
index 0000000..1b781c3
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/css/pagination.css
@@ -0,0 +1,86 @@
+@charset "UTF-8";
+.pagination {
+    position: relative;
+    text-align: center;
+    zoom: 1;
+}
+
+.pagination:before,
+.pagination:after {
+    content: "";
+    display: table;
+}
+
+.pagination:after {
+    clear: both;
+    overflow: hidden;
+}
+
+.pagination span {
+    float: left;
+    padding:0 13px;
+    height: 30px;
+    line-height: 30px;
+    color: #bdbdbd;
+    font-size: 12px;
+    box-sizing: border-box;
+}
+
+.pagination .active {
+    float: left;
+    padding:0 13px;
+    height: 30px;
+    line-height: 30px;
+    background: #1E9FFF;
+    color: #fff;
+    font-size: 12px;
+    border: 1px solid #1E9FFF;
+}
+
+.pagination a {
+    float: left;
+     padding:0 13px;
+     height: 30px;
+    line-height: 30px;
+    background: #fff;
+    border: 1px solid #ebebeb;
+    color: #bdbdbd;
+    font-size: 12px;
+     margin-right:-1px;
+}
+
+.pagination a:hover {
+    color: #1E9FFF;
+}
+
+.pagination .next,
+.pagination .prev {
+    font-family: "Simsun";
+    font-size: 12px;
+}
+
+.now,
+.count {
+    padding: 0 5px;
+    color: #1E9FFF;
+}
+
+.eg img {
+    max-width: 800px;
+    min-height: 500px;
+}
+
+.pagination input{
+    float: left;
+    margin: 0 2px;
+    width: 30px;
+    height: 30px;
+    line-height: 30px;
+    text-align: center;
+    background: #fff;
+    border: 1px solid #ebebeb;
+    outline: none;
+    color: #bdbdbd;
+    font-size: 12px;
+    border-radius: 2px;
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/css/reset.css b/pluss-manage-page/src/main/resources/static/resources/auth/css/reset.css
new file mode 100644
index 0000000..adaa8ca
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/css/reset.css
@@ -0,0 +1,4229 @@
+/*----main.css v1.0.6(2015.05.27) 作者：宣梦梦----*/
+/**********单独设置项**********/
+
+a {
+	text-decoration: none;
+	display: block;
+	color: #333
+}
+::-webkit-scrollbar {
+    width: 6px;
+    height: 6px;
+    background-color: #f5f5f5;
+    }
+    ::-webkit-scrollbar-thumb {
+    background-color: #3d4a5dd9;
+}
+:active, :focus, :visited, a, a:active, a:focus, a:visited,a:hover{
+    outline: 0;
+    text-decoration: none;
+}
+::-webkit-scrollbar-track {
+	background-color: #F5F5F5;
+}
+
+::-webkit-scrollbar {
+    width: 6px;
+    height: 9px;
+	background-color: #F5F5F5;
+}
+
+::-webkit-scrollbar-thumb {
+	background-color: #999;
+}
+.white {
+	color: #FFF
+}
+
+.red {
+	color: #F00
+}
+
+.green {
+	color: #1FB5AD
+}
+
+.blue {
+	color: #2584c6
+}
+
+.dblue {
+	color: #59ACE2
+}
+
+.yellow {
+	color: #bdbd3f
+}
+
+.lblue {
+	color: #798eab;
+}
+.dddbg {
+	background-color: #f9f9f9
+}
+
+.black {
+	color: #000
+}
+
+.brown {
+	color: #3c1c05
+}
+
+.dgray {
+	color: #AEB2B7
+}
+
+.mgray {
+	color: #666
+}
+
+.bgray {
+	color: #aeb2b7
+}
+
+.lgray {
+	color: #9c9c9c
+}
+
+.orange {
+	color: #FA8564
+}
+
+.whitebg {
+	background: #FFF
+}
+
+.gwhitebg {
+	background: #F6F6F6
+}
+
+.redbg {
+	background: #F00
+}
+
+.greenbg {
+	background: #34cb1c
+}
+
+.lgreenbg {
+	background: #1FB5AD
+}
+
+.bluebg {
+	background: #0090ff
+}
+.purple {
+	color: #6379bb
+}
+.yellowbg {
+	background: #fec400
+}
+
+.orangebg {
+	background: #FA8564
+}
+
+.purplebg {
+	background: #a52bf2
+}
+
+.lbluebg {
+	background: #F2F9FD
+}
+
+.blackbg {
+	background: #000
+}
+
+.brownbg {
+	background: #3c1c05
+}
+
+.graybg {
+	background: gray
+}
+
+.dgraybg {
+	background: #444
+}
+
+.mgraybg {
+	background: #c7cbd6
+}
+
+.bgraybg {
+	background: #32323A
+}
+
+.lgraybg {
+	background: #f2f2f2
+}
+
+.agraybg {
+	background-color: #E0E1E7
+}
+.dbluebg{
+	background-color:#2b3643;
+}
+
+/**********初始化**********/
+
+* {
+	margin: 0;
+	padding: 0
+}
+
+address,
+cite,
+dfn,
+em,
+i,
+var,
+caption {
+	font-style: normal
+}
+
+code,
+kbd,
+pre,
+samp {
+	font-family: courier new, courier, monospace
+}
+
+sup {
+	vertical-align: text-top
+}
+
+sub {
+	vertical-align: text-bottom
+}
+
+small {
+	font-size: 12px
+}
+
+legend {
+	color: #000
+}
+
+p {
+	word-wrap: break-word
+}
+
+q:before,
+q:after {
+	content: '';
+	cursor: pointer
+}
+
+ul,
+ol,
+li {
+	list-style: none
+}
+
+a,
+a img,
+button {
+	cursor: pointer
+}
+
+button,
+input,
+select,
+textarea {
+	font-size: 100%;
+	
+}
+input:-internal-autofill-selected{
+	box-shadow: 0 0 0px 1000px white inset;
+}
+table {
+	border-collapse: collapse;
+	border-spacing: 0
+}
+
+img,
+input,
+select,
+button {
+	border: 0;
+	vertical-align: middle
+}
+
+a,
+area {
+	blr: expression_r(this.onFocus=this.blur())
+}
+
+a:focus,
+input:focus,
+button:focus {
+	outline: 0
+}
+
+::-ms-clear {
+	display: none
+}
+
+::-ms-reveal {
+	display: none
+}
+
+body {
+	font-size: 12px;
+	font-family: "Helvetica Neue", Helvetica, Tahoma, Arial, 'Microsoft Yahei', 'Hiragino Sans GB', 'WenQuanYi Micro Hei', sans-serif;
+	color: #8a8a8a;
+	position: relative
+}
+select {
+	outline: 0
+}
+
+ul {
+	list-style: none
+}
+
+a {
+	text-decoration: none
+}
+
+textarea {
+	resize: none;
+	border: none;
+	outline: 0;
+}
+
+/**********块元素设置**********/
+
+.dline {
+	display: inline
+}
+
+.dnone {
+	display: none
+}
+
+.dblock {
+	display: block
+}
+
+.dlblock {
+	display: inline-block;
+}
+
+
+/**********字体大小**********/
+
+.f12 {
+	font-size: 12px
+}
+.f13 {
+	font-size: 13px
+}
+.f14 {
+	font-size: 14px
+}
+
+.f16 {
+	font-size: 16px
+}
+
+.f18 {
+	font-size: 18px
+}
+
+.f20 {
+	font-size: 20px
+}
+
+.f22 {
+	font-size: 22px
+}
+
+.f24 {
+	font-size: 24px
+}
+
+.f26 {
+	font-size: 26px
+}
+
+.f28 {
+	font-size: 28px
+}
+
+.f30 {
+	font-size: 30px
+}
+
+.f32 {
+	font-size: 32px
+}
+
+.f48 {
+	font-size: 48px
+}
+
+.f64 {
+	font-size: 64px
+}
+
+.f72 {
+	font-size: 72px
+}
+
+
+/**********字体粗细**********/
+
+.fw400 {
+	font-weight: 400
+}
+
+.fw600 {
+	font-weight: 600
+}
+
+.fw800 {
+	font-weight: 800
+}
+
+
+/**********行高**********/
+
+.lh50 {
+	line-height: 50px
+}
+
+.lh80 {
+	line-height: 80px
+}
+
+.lh100 {
+	line-height: 100%
+}
+
+.lh150 {
+	line-height: 150%
+}
+
+.lh180 {
+	line-height: 180%
+}
+
+.lh200 {
+	line-height: 200%
+}
+
+.lh250 {
+	line-height: 250%
+}
+
+.lh300 {
+	line-height: 300%
+}
+
+
+/**********字体描述**********/
+
+.unl {
+	text-decoration: underline
+}
+
+.crossline {
+	text-decoration: line-through
+}
+
+.nounl {
+	text-decoration: none
+}
+
+
+/**********字体**********/
+
+.simsun {
+	font-family: \5B8B\4F53
+}
+
+.simhei {
+	font-family: \9ED1\4F53
+}
+
+.yahei {
+	font-family: \5FAE\8F6F\96C5\9ED1
+}
+
+
+/**********首行缩进**********/
+
+.tit0 {
+	text-indent: 0
+}
+
+.tit1 {
+	text-indent: 1em
+}
+
+.tit2 {
+	text-indent: 2em
+}
+
+.tit3 {
+	text-indent: 3em
+}
+
+.tit4 {
+	text-indent: 4em
+}
+
+.tit5 {
+	text-indent: 5em
+}
+
+.tit6 {
+	text-indent: 6em
+}
+
+.tit7 {
+	text-indent: 7em
+}
+
+.tit8 {
+	text-indent: 8em
+}
+
+.tit9 {
+	text-indent: 9em
+}
+
+
+/**********文字水平对齐**********/
+
+.textl {
+	text-align: left
+}
+
+.textc {
+	text-align: center
+}
+
+.textr {
+	text-align: right
+}
+
+
+/**********文字垂直对齐**********/
+
+.vt {
+	vertical-align: top
+}
+
+.vm {
+	vertical-align: middle
+}
+
+.vb {
+	vertical-align: bottom
+}
+
+
+/**********容器浮动**********/
+
+.fl {
+	float: left
+}
+
+.fr {
+	display: block !important;
+	float: right
+}
+
+.fc {
+	margin: 0 auto
+}
+
+
+/**********外间距**********/
+
+.mg5 {
+	margin: 2px
+}
+
+.mg5 {
+	margin: 5px
+}
+
+.mg10 {
+	margin: 10px
+}
+
+.mg15 {
+	margin: 15px
+}
+
+.mg20 {
+	margin: 20px
+}
+
+.mg25 {
+	margin: 25px
+}
+
+.mg30 {
+	margin: 30px
+}
+
+
+/**********上外间距**********/
+
+.mt1 {
+	margin-top: 1px
+}
+
+.mt2 {
+	margin-top: 2px
+}
+
+.mt3 {
+	margin-top: 3px
+}
+
+.mt4 {
+	margin-top: 4px
+}
+
+.mt5 {
+	margin-top: 5px
+}
+
+.mt6 {
+	margin-top: 6px
+}
+
+.mt7 {
+	margin-top: 7px
+}
+
+.mt8 {
+	margin-top: 8px
+}
+
+.mt9 {
+	margin-top: 9px
+}
+
+.mt10 {
+	margin-top: 10px
+}
+
+.mt15 {
+	margin-top: 15px
+}
+
+.mt20 {
+	margin-top: 20px
+}
+
+.mt25 {
+	margin-top: 25px
+}
+
+.mt30 {
+	margin-top: 30px
+}
+
+.mt35 {
+	margin-top: 35px
+}
+
+.mt40 {
+	margin-top: 40px
+}
+
+.mt45 {
+	margin-top: 45px
+}
+
+.mt50 {
+	margin-top: 50px
+}
+
+.mt55 {
+	margin-top: 55px
+}
+
+.mt60 {
+	margin-top: 60px
+}
+
+.mt65 {
+	margin-top: 65px
+}
+
+.mt70 {
+	margin-top: 70px
+}
+
+.mt75 {
+	margin-top: 75px
+}
+
+.mt80 {
+	margin-top: 80px
+}
+
+.mt85 {
+	margin-top: 85px
+}
+
+.mt90 {
+	margin-top: 90px
+}
+
+.mt95 {
+	margin-top: 90px
+}
+
+.mt100 {
+	margin-top: 100px
+}
+
+.mt200 {
+	margin-top: 200px
+}
+
+
+/**********左外间距**********/
+.ml0{
+	margin-left: 0px
+}
+.ml1 {
+	margin-left: 1px
+}
+
+.ml2 {
+	margin-left: 2px
+}
+
+.ml3 {
+	margin-left: 3px
+}
+
+.ml4 {
+	margin-left: 4px
+}
+
+.ml5 {
+	margin-left: 5px
+}
+
+.ml6 {
+	margin-left: 6px
+}
+
+.ml7 {
+	margin-left: 7px
+}
+
+.ml8 {
+	margin-left: 8px
+}
+
+.ml9 {
+	margin-left: 9px
+}
+
+.ml10 {
+	margin-left: 10px
+}
+
+.ml15 {
+	margin-left: 15px
+}
+
+.ml20 {
+	margin-left: 20px
+}
+
+.ml25 {
+	margin-left: 25px
+}
+
+.ml30 {
+	margin-left: 30px
+}
+
+.ml35 {
+	margin-left: 35px
+}
+
+.ml40 {
+	margin-left: 40px
+}
+
+.ml45 {
+	margin-left: 45px
+}
+
+.ml50 {
+	margin-left: 50px
+}
+
+.ml55 {
+	margin-left: 55px
+}
+
+.ml60 {
+	margin-left: 60px
+}
+
+.ml65 {
+	margin-left: 65px
+}
+
+.ml70 {
+	margin-left: 70px
+}
+
+.ml75 {
+	margin-left: 75px
+}
+
+.ml80 {
+	margin-left: 80px
+}
+
+.ml85 {
+	margin-left: 85px
+}
+
+.ml90 {
+	margin-left: 90px
+}
+
+.ml95 {
+	margin-left: 95px
+}
+
+.ml100 {
+	margin-left: 100px
+}
+.ml105 {
+	margin-left: 105px
+}
+.ml120 {
+	margin-left: 120px
+}
+.ml190 {
+	margin-left: 190px
+}
+.ml240 {
+	margin-left: 240px
+}
+
+.ml330 {
+	margin-left: 330px
+}
+
+
+/**********右外间距**********/
+.mr0 {
+	margin-right: 0px
+}
+.mr1 {
+	margin-right: 1px
+}
+
+.mr2 {
+	margin-right: 2px
+}
+
+.mr3 {
+	margin-right: 3px
+}
+
+.mr4 {
+	margin-right: 4px
+}
+
+.mr5 {
+	margin-right: 5px
+}
+
+.mr6 {
+	margin-right: 6px
+}
+
+.mr7 {
+	margin-right: 7px
+}
+
+.mr8 {
+	margin-right: 8px
+}
+
+.mr9 {
+	margin-right: 9px
+}
+
+.mr10 {
+	margin-right: 10px
+}
+
+.mr15 {
+	margin-right: 15px
+}
+
+.mr20 {
+	margin-right: 20px
+}
+
+.mr25 {
+	margin-right: 25px
+}
+
+.mr30 {
+	margin-right: 30px
+}
+
+.mr35 {
+	margin-right: 35px
+}
+
+.mr40 {
+	margin-right: 40px
+}
+
+.mr45 {
+	margin-right: 45px
+}
+
+.mr50 {
+	margin-right: 50px
+}
+
+.mr55 {
+	margin-right: 55px
+}
+
+.mr60 {
+	margin-right: 60px
+}
+
+.mr65 {
+	margin-right: 65px
+}
+
+.mr70 {
+	margin-right: 70px
+}
+
+.mr75 {
+	margin-right: 75px
+}
+
+.mr80 {
+	margin-right: 80px
+}
+
+.mr85 {
+	margin-right: 85px
+}
+
+.mr90 {
+	margin-right: 90px
+}
+
+.mr95 {
+	margin-right: 95px
+}
+
+.mr100 {
+	margin-right: 100px
+}
+
+.mr200 {
+	margin-right: 200px
+}
+
+
+/**********下外间距**********/
+
+.mb1 {
+	margin-bottom: 1px
+}
+
+.mb2 {
+	margin-bottom: 2px
+}
+
+.mb3 {
+	margin-bottom: 3px
+}
+
+.mb4 {
+	margin-bottom: 4px
+}
+
+.mb5 {
+	margin-bottom: 5px
+}
+
+.mb6 {
+	margin-bottom: 6px
+}
+
+.mb7 {
+	margin-bottom: 7px
+}
+
+.mb8 {
+	margin-bottom: 8px
+}
+
+.mb9 {
+	margin-bottom: 9px
+}
+
+.mb10 {
+	margin-bottom: 10px
+}
+
+.mb15 {
+	margin-bottom: 15px
+}
+
+.mb20 {
+	margin-bottom: 20px
+}
+
+.mb25 {
+	margin-bottom: 25px
+}
+
+.mb30 {
+	margin-bottom: 30px
+}
+
+.mb35 {
+	margin-bottom: 35px
+}
+
+.mb40 {
+	margin-bottom: 40px
+}
+
+.mb45 {
+	margin-bottom: 45px
+}
+
+.mb50 {
+	margin-bottom: 50px
+}
+
+.mb55 {
+	margin-bottom: 55px
+}
+
+.mb60 {
+	margin-bottom: 60px
+}
+
+.mb65 {
+	margin-bottom: 65px
+}
+
+.mb70 {
+	margin-bottom: 70px
+}
+
+.mb75 {
+	margin-bottom: 75px
+}
+
+.mb80 {
+	margin-bottom: 80px
+}
+
+.mb85 {
+	margin-bottom: 85px
+}
+
+.mb90 {
+	margin-bottom: 90px
+}
+
+.mb100 {
+	margin-bottom: 100px
+}
+
+.mb200 {
+	margin-bottom: 200px
+}
+
+
+/**********内间距**********/
+
+.pd2 {
+	padding: 2px
+}
+
+.pd5 {
+	padding: 5px
+}
+
+.pd7 {
+	padding: 7px
+}
+
+.pd10 {
+	padding: 10px
+}
+
+.pd15 {
+	padding: 15px
+}
+
+.pd20 {
+	padding: 20px
+}
+
+.pd25 {
+	padding: 25px
+}
+
+.pd30 {
+	padding: 30px
+}
+
+.pd40 {
+	padding: 40px
+}
+
+
+/**********上内间距**********/
+
+.pt1 {
+	padding-top: 1px
+}
+
+.pt2 {
+	padding-top: 2px
+}
+
+.pt3 {
+	padding-top: 3px
+}
+
+.pt4 {
+	padding-top: 4px
+}
+
+.pt5 {
+	padding-top: 5px
+}
+
+.pt6 {
+	padding-top: 6px
+}
+
+.pt7 {
+	padding-top: 7px
+}
+
+.pt8 {
+	padding-top: 8px
+}
+
+.pt9 {
+	padding-top: 9px
+}
+
+.pt10 {
+	padding-top: 10px
+}
+.pt12 {
+	padding-top: 12px
+}
+.pt13 {
+	padding-top: 13px
+}
+.pt15 {
+	padding-top: 15px
+}
+
+.pt20 {
+	padding-top: 20px
+}
+
+.pt25 {
+	padding-top: 25px
+}
+
+.pt30 {
+	padding-top: 30px
+}
+
+.pt35 {
+	padding-top: 35px
+}
+
+.pt40 {
+	padding-top: 40px
+}
+
+.pt45 {
+	padding-top: 45px
+}
+
+.pt50 {
+	padding-top: 50px
+}
+
+
+/**********左内间距**********/
+
+.pl1 {
+	padding-left: 1px
+}
+
+.pl2 {
+	padding-left: 2px
+}
+
+.pl3 {
+	padding-left: 3px
+}
+
+.pl4 {
+	padding-left: 4px
+}
+
+.pl5 {
+	padding-left: 5px
+}
+
+.pl6 {
+	padding-left: 6px
+}
+
+.pl7 {
+	padding-left: 7px
+}
+
+.pl8 {
+	padding-left: 8px
+}
+
+.pl9 {
+	padding-left: 9px
+}
+
+.pl10 {
+	padding-left: 10px
+}
+
+.pl15 {
+	padding-left: 15px
+}
+
+.pl20 {
+	padding-left: 20px
+}
+
+.pl25 {
+	padding-left: 25px
+}
+
+.pl30 {
+	padding-left: 30px
+}
+
+.pl35 {
+	padding-left: 35px
+}
+
+.pl40 {
+	padding-left: 40px
+}
+
+.pl45 {
+	padding-left: 45px
+}
+
+.pl50 {
+	padding-left: 50px
+}
+
+.pl60 {
+	padding-left: 60px
+}
+
+.pl70 {
+	padding-left: 70px
+}
+
+.pl80 {
+	padding-left: 80px
+}
+
+.pl90 {
+	padding-left: 90px
+}
+.pl190 {
+	padding-left: 190px
+}
+
+
+/**********右内间距**********/
+
+.pr1 {
+	padding-right: 1px
+}
+
+.pr2 {
+	padding-right: 2px
+}
+
+.pr3 {
+	padding-right: 3px
+}
+
+.pr4 {
+	padding-right: 4px
+}
+
+.pr5 {
+	padding-right: 5px
+}
+
+.pr6 {
+	padding-right: 6px
+}
+
+.pr7 {
+	padding-right: 7px
+}
+
+.pr8 {
+	padding-right: 8px
+}
+
+.pr9 {
+	padding-right: 9px
+}
+
+.pr10 {
+	padding-right: 10px
+}
+
+.pr15 {
+	padding-right: 15px
+}
+
+.pr20 {
+	padding-right: 20px
+}
+
+.pr25 {
+	padding-right: 25px
+}
+
+.pr30 {
+	padding-right: 30px
+}
+
+.pr35 {
+	padding-right: 35px
+}
+
+.pr40 {
+	padding-right: 40px
+}
+
+.pr45 {
+	padding-right: 45px
+}
+
+.pr50 {
+	padding-right: 50px
+}
+
+.pr60 {
+	padding-right: 60px
+}
+
+.pr70 {
+	padding-right: 70px
+}
+
+.pr80 {
+	padding-right: 80px
+}
+
+.pr90 {
+	padding-right: 90px
+}
+
+.pr100 {
+	padding-right: 100px
+}
+
+.pr150 {
+	padding-right: 150px
+}
+
+.pr185 {
+	padding-right: 185px
+}
+
+.pr200 {
+	padding-right: 200px
+}
+
+
+/**********下内间距**********/
+
+.pb1 {
+	padding-bottom: 1px
+}
+
+.pb2 {
+	padding-bottom: 2px
+}
+
+.pb3 {
+	padding-bottom: 3px
+}
+
+.pb4 {
+	padding-bottom: 4px
+}
+
+.pb5 {
+	padding-bottom: 5px
+}
+
+.pb6 {
+	padding-bottom: 6px
+}
+
+.pb7 {
+	padding-bottom: 7px
+}
+
+.pb8 {
+	padding-bottom: 8px
+}
+
+.pb9 {
+	padding-bottom: 9px
+}
+
+.pb10 {
+	padding-bottom: 10px
+}
+.pb12 {
+	padding-bottom: 12px
+}
+.pb13 {
+	padding-bottom: 13px
+}
+.pb15 {
+	padding-bottom: 15px
+}
+
+.pb20 {
+	padding-bottom: 20px
+}
+
+.pb25 {
+	padding-bottom: 25px
+}
+
+.pb30 {
+	padding-bottom: 30px
+}
+
+.pb35 {
+	padding-bottom: 35px
+}
+
+.pb40 {
+	padding-bottom: 40px
+}
+
+.pb45 {
+	padding-bottom: 45px
+}
+
+.pb50 {
+	padding-bottom: 50px
+}
+
+
+/**********宽度**********/
+
+.w10 {
+	width: 10px
+}
+
+.w15 {
+	width: 15px
+}
+.w16 {
+	width: 16px
+}
+.h16 {
+    height: 16px
+}
+.w20 {
+	width: 20px
+}
+
+.w25 {
+	width: 25px
+}
+
+.w30 {
+	width: 30px
+}
+
+.w36 {
+	width: 36px
+}
+
+.w40 {
+	width: 40px
+}
+
+.w50 {
+	width: 50px
+}
+
+.w60 {
+	width: 60px
+}
+
+.w70 {
+	width: 70px
+}
+
+.w80 {
+	width: 80px
+}
+
+.w90 {
+	width: 90px
+}
+
+.w100 {
+	width: 100px
+}
+.w105 {
+	width: 105px
+}
+.w110 {
+	width: 110px
+}
+
+.w120 {
+	width: 120px
+}
+
+.w130 {
+	width: 130px
+}
+
+.w140 {
+	width: 140px
+}
+
+.w150 {
+	width: 150px
+}
+
+.w160 {
+	width: 160px
+}
+
+.w170 {
+	width: 170px
+}
+
+.w180 {
+	width: 180px
+}
+
+.w190 {
+	width: 190px
+}
+
+.w200 {
+	width: 200px
+}
+
+.w210 {
+	width: 210px
+}
+
+.w220 {
+	width: 220px
+}
+
+.w230 {
+	width: 230px
+}
+
+.w240 {
+	width: 240px
+}
+
+.w250 {
+	width: 250px
+}
+
+.w260 {
+	width: 260px
+}
+
+.w270 {
+	width: 270px
+}
+
+.w280 {
+	width: 280px
+}
+
+.w290 {
+	width: 290px
+}
+
+.w300 {
+	width: 300px
+}
+
+.w320 {
+	width: 320px
+}
+
+.w400 {
+	width: 400px
+}
+
+.w500 {
+	width: 500px
+}
+
+.w600 {
+	width: 600px
+}
+
+.w700 {
+	width: 700px
+}
+
+.w800 {
+	width: 800px
+}
+
+.w900 {
+	width: 900px
+}
+
+.w1000 {
+	width: 1000px
+}
+
+
+/**********高度**********/
+
+.h10 {
+	height: 10px
+}
+
+.h15 {
+	height: 15px
+}
+
+.h20 {
+	height: 20px
+}
+
+.h25 {
+	height: 25px
+}
+
+.h30 {
+	height: 30px
+}
+.h32 {
+	height: 32px
+}
+.h35 {
+	height: 35px
+}
+
+.h40 {
+	height: 40px
+}
+
+.h45 {
+	height: 45px
+}
+
+.h50 {
+	height: 50px
+}
+
+.h55 {
+	height: 55px
+}
+
+.h60 {
+	height: 60px
+}
+
+.h65 {
+	height: 65px
+}
+
+.h70 {
+	height: 70px
+}
+
+.h75 {
+	height: 75px
+}
+
+.h80 {
+	height: 80px
+}
+
+.h85 {
+	height: 85px
+}
+
+.h90 {
+	height: 90px
+}
+
+.h95 {
+	height: 95px
+}
+
+.h100 {
+	height: 100px
+}
+
+.h110 {
+	height: 110px
+}
+
+.h120 {
+	height: 120px
+}
+
+.h130 {
+	height: 130px
+}
+
+.h140 {
+	height: 140px
+}
+
+.h150 {
+	height: 150px
+}
+
+.h160 {
+	height: 160px
+}
+
+.h170 {
+	height: 170px
+}
+
+.h180 {
+	height: 180px
+}
+
+.h190 {
+	height: 190px
+}
+
+.h200 {
+	height: 200px
+}
+
+.h210 {
+	height: 210px
+}
+
+.h220 {
+	height: 220px
+}
+
+.h230 {
+	height: 230px
+}
+
+.h240 {
+	height: 240px
+}
+
+.h250 {
+	height: 250px
+}
+
+.h260 {
+	height: 260px
+}
+
+.h270 {
+	height: 270px
+}
+
+.h280 {
+	height: 280px
+}
+
+.h290 {
+	height: 290px
+}
+
+.h300 {
+	height: 300px
+}
+
+.h400 {
+	height: 400px
+}
+
+.h500 {
+	height: 500px
+}
+
+.h600 {
+	height: 600px
+}
+
+.h700 {
+	height: 700px
+}
+
+.h800 {
+	height: 800px
+}
+
+.h900 {
+	height: 900px
+}
+
+
+/**********边框**********/
+
+.bdf {
+	border: 1px solid #fff
+}
+
+.bde {
+	border: 1px solid #eee
+}
+
+.bdd {
+	border: 1px solid #ddd
+}
+
+.bdc {
+	border: 1px solid #ccc
+}
+
+.bdb {
+	border: 1px solid #bbb
+}
+
+.bdd {
+	border: 1px solid #ddd
+}
+
+.bda {
+	border: 1px solid #aaa
+}
+
+.bd9 {
+	border: 1px solid #999
+}
+
+.bd8 {
+	border: 1px solid #888
+}
+
+.bd7 {
+	border: 1px solid #777
+}
+
+.bd6 {
+	border: 1px solid #666
+}
+
+.bd5 {
+	border: 1px solid #555
+}
+
+.bd4 {
+	border: 1px solid #444
+}
+
+.bd3 {
+	border: 1px solid #333
+}
+
+.bd2 {
+	border: 1px solid #222
+}
+
+.bd1 {
+	border: 1px solid #111
+}
+
+.bd0 {
+	border: 1px solid #000
+}
+
+
+/**********左边框**********/
+
+.bdlf {
+	border-left: 1px solid #fff
+}
+
+.bdle {
+	border-left: 1px solid #eee
+}
+
+.bdld {
+	border-left: 1px solid #ddd
+}
+
+.bdlc {
+	border-left: 1px solid #ccc
+}
+
+.bdlb {
+	border-left: 1px solid #bbb
+}
+
+.bdla {
+	border-left: 1px solid #aaa
+}
+
+.bdl9 {
+	border-left: 1px solid #999
+}
+
+.bdl8 {
+	border-left: 1px solid #888
+}
+
+.bdl7 {
+	border-left: 1px solid #777
+}
+
+.bdl6 {
+	border-left: 1px solid #666
+}
+
+.bdl5 {
+	border-left: 1px solid #555
+}
+
+.bdl4 {
+	border-left: 1px solid #444
+}
+
+.bdl3 {
+	border-left: 1px solid #333
+}
+
+.bdl2 {
+	border-left: 1px solid #222
+}
+
+.bdl1 {
+	border-left: 1px solid #111
+}
+
+.bdl0 {
+	border-left: 1px solid #000
+}
+
+
+/**********右边框**********/
+
+.bdrf {
+	border-right: 1px solid #fff
+}
+
+.bdre {
+	border-right: 1px solid #eee
+}
+
+.bdrd {
+	border-right: 1px solid #ddd
+}
+
+.bdrc {
+	border-right: 1px solid #ccc
+}
+
+.bdrb {
+	border-right: 1px solid #bbb
+}
+
+.bdra {
+	border-right: 1px solid #aaa
+}
+
+.bdr9 {
+	border-right: 1px solid #999
+}
+
+.bdr8 {
+	border-right: 1px solid #888
+}
+
+.bdr7 {
+	border-right: 1px solid #777
+}
+
+.bdr6 {
+	border-right: 1px solid #666
+}
+
+.bdr5 {
+	border-right: 1px solid #555
+}
+
+.bdr4 {
+	border-right: 1px solid #444
+}
+
+.bdr3 {
+	border-right: 1px solid #333
+}
+
+.bdr2 {
+	border-right: 1px solid #222
+}
+
+.bdr1 {
+	border-right: 1px solid #111
+}
+
+.bdr0 {
+	border-right: 1px solid #000
+}
+
+
+/**********上边框**********/
+
+.bdtf {
+	border-top: 1px solid #fff
+}
+
+.bdte {
+	border-top: 1px solid #eee
+}
+
+.bdtd {
+	border-top: 1px solid #ddd
+}
+
+.bdtc {
+	border-top: 1px solid #ccc
+}
+
+.bdtb {
+	border-top: 1px solid #bbb
+}
+
+.bdta {
+	border-top: 1px solid #aaa
+}
+
+.bdt9 {
+	border-top: 1px solid #999
+}
+
+.bdt8 {
+	border-top: 1px solid #888
+}
+
+.bdt7 {
+	border-top: 1px solid #777
+}
+
+.bdt6 {
+	border-top: 1px solid #666
+}
+
+.bdt5 {
+	border-top: 1px solid #555
+}
+
+.bdt4 {
+	border-top: 1px solid #444
+}
+
+.bdt3 {
+	border-top: 1px solid #333
+}
+
+.bdt2 {
+	border-top: 1px solid #222
+}
+
+.bdt1 {
+	border-top: 1px solid #111
+}
+
+.bdt0 {
+	border-top: 1px solid #000
+}
+
+
+/**********下边框**********/
+
+.bdbf {
+	border-bottom: 1px solid #fff
+}
+
+.bdbe {
+	border-bottom: 1px solid #eee
+}
+
+.bdbd {
+	border-bottom: 1px solid #ddd
+}
+
+.bdbc {
+	border-bottom: 1px solid #ccc
+}
+
+.bdbb {
+	border-bottom: 1px solid #bbb
+}
+
+.bdba {
+	border-bottom: 1px solid #aaa
+}
+
+.bdb9 {
+	border-bottom: 1px solid #999
+}
+
+.bdb8 {
+	border-bottom: 1px solid #888
+}
+
+.bdb7 {
+	border-bottom: 1px solid #777
+}
+
+.bdb6 {
+	border-bottom: 1px solid #666
+}
+
+.bdb5 {
+	border-bottom: 1px solid #555
+}
+
+.bdb4 {
+	border-bottom: 1px solid #444
+}
+
+.bdb3 {
+	border-bottom: 1px solid #333
+}
+
+.bdb2 {
+	border-bottom: 1px solid #222
+}
+
+.bdb1 {
+	border-bottom: 1px solid #3f4e54
+}
+
+.bdb0 {
+	border-bottom: 1px solid #000
+}
+
+.bdbg {
+	border-bottom: 1px solid #3C3C44
+}
+.bddot{
+	border: 1px dashed #E0E1E7
+}
+
+/**********百分比宽度**********/
+
+.wp7 {
+	width: 7%
+}
+
+.wp10 {
+	width: 10%
+}
+
+.wp11 {
+	width: 11%
+}
+
+.wp14 {
+	width: 14%
+}
+
+.wp15 {
+	width: 15%
+}
+
+.wp20 {
+	width: 20%
+}
+
+.wp25 {
+	width: 25%
+}
+
+.wp30 {
+	width: 30%
+}
+
+.wp33 {
+	width: 33.33%
+}
+
+.wp34 {
+	width: 34%
+}
+
+.wp40 {
+	width: 40%
+}
+.wp50 {
+	width: 50%
+}
+
+.wp55 {
+	width: 55%
+}
+
+.wp60 {
+	width: 60%
+}
+
+.wp70 {
+	width: 70%
+}
+
+.wp80 {
+	width: 80%
+}
+
+.wp90 {
+	width: 90%
+}
+
+.wp92 {
+	width: 92%
+}
+
+.wp94 {
+	width: 94%
+}
+
+.wp96 {
+	width: 96%
+}
+
+.wp98 {
+	width: 98%
+}
+
+.wp100 {
+	width: 100%
+}
+
+
+/**********清除样式**********/
+
+.clear {
+	display: block;
+	clear: both;
+	font-size: 0;
+	line-height: 0;
+	height: 0;
+	overflow: hidden;
+	content: ".";
+}
+
+.clearfix:after {
+	content: "\200B";
+	display: block;
+	height: 0;
+	clear: both;
+}
+
+
+/*定位样式*/
+
+.positionr {
+	position: relative;
+}
+
+.positionf {
+	position: fixed;
+}
+
+.positiona {
+	position: absolute;
+}
+
+.top0 {
+	top: 0
+}
+.top36{
+	top: 36px;
+}
+.top45{
+	top: 45px;
+}
+.top60{
+	top: 60px;
+}
+.top130{
+	top: 130px;
+}
+.left130 {
+	left: 130px
+}
+.leftp50{
+	left:50%;
+}
+.right10 {
+	right: 10px
+}
+
+.right125 {
+	right: 125px
+}
+
+.bottom0 {
+	bottom: 0
+}
+
+.bottom20 {
+	bottom: 20px;
+}
+.bottom60 {
+	bottom: 60px;
+}
+.zd98 {
+	z-index: 98;
+}
+
+.zd99 {
+	z-index: 99;
+}
+
+.zd100 {
+	z-index: 100;
+}
+
+.zd101 {
+	z-index: 101;
+}
+.zd1000 {
+	z-index: 1000;
+}
+.dn {
+	display: none;
+}
+
+
+/*鼠标样式*/
+
+.cursor {
+	cursor: pointer;
+}
+
+
+/*透明度*/
+
+.opacity0 {
+	filter: alpha(opacity=100);
+	/* IE */
+	-moz-opacity: 0;
+	/* 老版Mozilla */
+	-khtml-opacity: 0;
+	/* 老版Safari */
+	opacity: 0;
+	/* 支持opacity的浏览器*/
+	background: rgba(43, 48, 60, 10);
+}
+
+.opacity09 {
+	filter: alpha(opacity=90);
+	/* IE */
+	-moz-opacity: 0.9;
+	/* 老版Mozilla */
+	-khtml-opacity: 0.9;
+	/* 老版Safari */
+	opacity: 0.9;
+	/* 支持opacity的浏览器*/
+	background: rgba(43, 48, 60, 0.9);
+}
+
+
+/*圆角*/
+
+.radius3 {
+	border-radius: 3px;
+}
+
+.radius5 {
+	border-radius: 5px;
+}
+
+.radius10 {
+	border-radius: 10px;
+}
+
+.radiusp50 {
+	border-radius: 50%;
+}
+
+.radiustlr {
+	border-top-left-radius: 5px;
+	border-top-right-radius: 5px;
+}
+/*placeholder颜色*/
+
+.white::-webkit-input-placeholder {
+	/* WebKit, Blink, Edge */
+	color: #fff;
+}
+
+.white:-moz-placeholder {
+	/* Mozilla Firefox 4 to 18 */
+	color: #fff;
+}
+
+.white::-moz-placeholder {
+	/* Mozilla Firefox 19+ */
+	color: #fff;
+}
+
+.white:-ms-input-placeholder {
+	/* Internet Explorer 10-11 */
+	color: #fff;
+}
+
+
+/*纵向横向滚动*/
+
+.overflowy {
+	overflow-y: auto;
+}
+
+.overflowx {
+	overflow-x: auto;
+}
+.box-flex {
+	display: -webkit-box;
+	display: -moz-box;
+	display: -ms-flexbox;
+	display: -webkit-flex;
+	display: flex;
+}
+
+.flex1 {
+	flex: 1;
+	-webkit-flex: 1;
+	-ms-flex: 1;
+	-moz-flex: 1;
+}
+
+.flex2 {
+	flex: 2;
+	-webkit-flex: 2;
+	-ms-flex: 2;
+	-moz-flex: 2;
+}
+
+.flex3 {
+	flex: 3;
+	-webkit-flex: 3;
+	-ms-flex: 3;
+	-moz-flex: 3;
+}
+
+.flex4 {
+	flex: 4;
+	-webkit-flex: 4;
+	-ms-flex: 4;
+	-moz-flex: 4;
+}
+
+.flex5 {
+	flex: 5;
+	-webkit-flex: 5;
+	-ms-flex: 5;
+	-moz-flex: 5;
+}
+
+.flex6 {
+	flex: 6;
+	-webkit-flex: 6;
+	-ms-flex: 6;
+	-moz-flex: 6;
+}
+
+.flex7 {
+	flex: 7;
+	-webkit-flex: 7;
+	-ms-flex: 7;
+	-moz-flex: 7;
+}
+
+.flex8 {
+	flex: 8;
+	-webkit-flex: 8;
+	-ms-flex: 8;
+	-moz-flex: 8;
+}
+
+
+/*层级*/
+
+.zIndex99 {
+	z-index: 99;
+}
+
+.zIndex999 {
+	z-index: 999;
+}
+
+.zIndex9999 {
+	z-index: 9999;
+}
+
+
+/*超出1行后省略*/
+
+.overFont {
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	-ms-text-overflow: ellipsis;
+	-o-text-overflow: ellipsis;
+}
+
+
+/*超出2行后省略  */
+
+.overFont2 {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	-ms-text-overflow: ellipsis;
+	-o-text-overflow: ellipsis;
+	display: -webkit-box !important;
+	-webkit-box-orient: vertical;
+	-webkit-line-clamp: 2;
+	word-break: break-word;
+}
+
+.borderBox {
+	box-sizing: border-box;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+}
+
+.left0 {
+	left: 0;
+}
+.left80 {
+	left: 80px;
+}
+
+.right0 {
+	right: 0;
+}
+
+.right500 {
+	right: 500px;
+}
+
+.top28 {
+	top: 28px;
+}
+
+.top40 {
+	top: 40px;
+}
+
+.top80 {
+	top: 80px;
+}
+
+.w380 {
+	width: 380px;
+}
+.wp88{
+	width: 88%;
+}
+.bottom50{
+  bottom:50px;
+}
+.boxsizing{
+	box-sizing: content-box;
+}
+/*侧导航栏*/
+.slidebar-list>ul>li a{
+  white-space:nowrap;
+}
+.slidebar-list>ul>li:hover{
+    background:#d5e9ed;
+}
+.slidebar-list>ul>li.current a{
+    background: #0088DD;
+    color: #fff;
+}
+.slidebar-list .sub-nav li.current a {
+    color: white;
+}
+.slidebar-list>ul>li>a i.icon:before {
+    -webkit-transition: all 0.4s ease;
+    -o-transition: all 0.4s ease;
+    transition: all 0.4s ease;
+    -webkit-transform: rotate(0deg);
+    -ms-transform: rotate(0deg);
+    -o-transform: rotate(0deg);
+    transform: rotate(0deg);
+}
+.nav-wrap-up{
+	 -webkit-transition: all 0.4s ease;
+    -o-transition: all 0.4s ease;
+    transition: all 0.4s ease;
+}
+.slidebar-list>ul>li>a.current i.icon:before {
+    -webkit-transform: rotate(90deg);
+    -ms-transform: rotate(90deg);
+    -o-transform: rotate(90deg);
+    transform: rotate(90deg);
+}
+div.selector,
+div.selector span,
+div.checker span,
+div.radio span,
+div.uploader,
+div.uploader span.action,
+div.button,
+div.button span {
+	background-image: url("../images/sprite.png");
+	background-repeat: no-repeat;
+	-webkit-font-smoothing: antialiased;
+}
+
+div.selector,
+div.checker,
+div.button,
+div.radio,
+div.uploader {
+	display: -moz-inline-box;
+	display: inline-block;
+	*display: inline;
+	zoom: 1;
+	vertical-align: middle;
+	/* Keeping this as :focus to remove browser styles */
+}
+
+div.selector:focus,
+div.checker:focus,
+div.button:focus,
+div.radio:focus,
+div.uploader:focus {
+	outline: 0;
+}
+
+div.selector,
+div.selector *,
+div.radio,
+div.radio *,
+div.checker,
+div.checker *,
+div.uploader,
+div.uploader *,
+div.button,
+div.button * {
+	margin: 0;
+	padding: 0;
+}
+div.checker,
+div.checker span,
+div.checker input {
+	width: 19px;
+	height: 19px;
+}
+
+div.checker span {
+	display: -moz-inline-box;
+	display: inline-block;
+	*display: inline;
+	zoom: 1;
+	text-align: center;
+	background-position: 0 -260px;
+}
+
+div.checker span.checked {
+	background-position: -76px -260px;
+}
+
+div.checker input {
+	opacity: 0;
+	filter: alpha(opacity=0);
+	-moz-opacity: 0;
+	border: none;
+	background: none;
+	display: -moz-inline-box;
+	display: inline-block;
+	*display: inline;
+	zoom: 1;
+}
+
+div.checker.active span {
+	background-position: -19px -260px;
+}
+
+div.checker.active span.checked {
+	background-position: -95px -260px;
+}
+
+div.checker.hover span,
+div.checker.focus span {
+	background-position: -38px -260px;
+}
+
+div.checker.hover span.checked,
+div.checker.focus span.checked {
+	background-position: -114px -260px;
+}
+
+div.checker.hover.active span,
+div.checker.focus.active span {
+	background-position: -57px -260px;
+}
+
+div.checker.hover.active span.checked,
+div.checker.focus.active span.checked {
+	background-position: -133px -260px;
+}
+
+div.checker.disabled,
+div.checker.disabled.active {
+	background-position: -152px -260px;
+}
+
+div.checker.disabled span.checked,
+div.checker.disabled.active span.checked {
+	background-position: -171px -260px;
+}
+
+
+/* Radio */
+
+div.radio {
+	position: relative;
+}
+
+div.radio,
+div.radio span,
+div.radio input {
+	width: 18px;
+	height: 18px;
+}
+
+div.radio span {
+	display: -moz-inline-box;
+	display: inline-block;
+	*display: inline;
+	zoom: 1;
+	text-align: center;
+	background-position: 0 -279px;
+}
+
+div.radio span.checked {
+	background-position: -72px -279px;
+}
+
+div.radio input {
+	opacity: 0;
+	filter: alpha(opacity=0);
+	-moz-opacity: 0;
+	border: none;
+	background: none;
+	display: -moz-inline-box;
+	display: inline-block;
+	*display: inline;
+	zoom: 1;
+	text-align: center;
+}
+
+div.radio.active span {
+	background-position: -18px -18px -279px;
+}
+
+div.radio.active span.checked {
+	background-position: -90px -279px;
+}
+
+div.radio.hover span,
+div.radio.focus span {
+	background-position: -36px -36px -279px;
+}
+
+div.radio.hover span.checked,
+div.radio.focus span.checked {
+	background-position: -108px -279px;
+}
+
+div.radio.hover.active span,
+div.radio.focus.active span {
+	background-position: -54px -279px;
+}
+
+div.radio.hover.active span.checked,
+div.radio.focus.active span.checked {
+	background-position: -126px -279px;
+}
+
+div.radio.disabled span,
+div.radio.disabled.active span {
+	background-position: -144px -279px;
+}
+
+div.radio.disabled span.checked,
+div.radio.disabled.active span.checked {
+	background-position: -162px -279px;
+}
+.navbar-nav>.selected>a,
+.navbar-nav>.selected>a:focus, 
+.navbar-nav>.selected>a:hover {
+ background: #36c6d3 !important;
+    color: #fff !important
+}
+.icon-animated-bell {
+	display: inline-block;
+	-moz-animation: ringing 2s 5 ease 1s;
+	-webkit-animation: ringing 2s 5 ease 1s;
+	-o-animation: ringing 2s 5 ease 1s;
+	-ms-animation: ringing 2s 5 ease 1s;
+	animation: ringing 2s 5 ease 1s;
+	-moz-transform-origin: 50% 0;
+	-webkit-transform-origin: 50% 0;
+	-o-transform-origin: 50% 0;
+	-ms-transform-origin: 50% 0;
+	transform-origin: 50% 0
+}
+
+@-moz-keyframes ringing {
+  0% {
+    -moz-transform: rotate(-15deg);
+  }
+  2% {
+    -moz-transform: rotate(15deg);
+  }
+  4% {
+    -moz-transform: rotate(-18deg);
+  }
+  6% {
+    -moz-transform: rotate(18deg);
+  }
+  8% {
+    -moz-transform: rotate(-22deg);
+  }
+  10% {
+    -moz-transform: rotate(22deg);
+  }
+  12% {
+    -moz-transform: rotate(-18deg);
+  }
+  14% {
+    -moz-transform: rotate(18deg);
+  }
+  16% {
+    -moz-transform: rotate(-12deg);
+  }
+  18% {
+    -moz-transform: rotate(12deg);
+  }
+  20% {
+    -moz-transform: rotate(0deg);
+  }
+}
+@-webkit-keyframes ringing {
+  0% {
+    -webkit-transform: rotate(-15deg);
+  }
+  2% {
+    -webkit-transform: rotate(15deg);
+  }
+  4% {
+    -webkit-transform: rotate(-18deg);
+  }
+  6% {
+    -webkit-transform: rotate(18deg);
+  }
+  8% {
+    -webkit-transform: rotate(-22deg);
+  }
+  10% {
+    -webkit-transform: rotate(22deg);
+  }
+  12% {
+    -webkit-transform: rotate(-18deg);
+  }
+  14% {
+    -webkit-transform: rotate(18deg);
+  }
+  16% {
+    -webkit-transform: rotate(-12deg);
+  }
+  18% {
+    -webkit-transform: rotate(12deg);
+  }
+  20% {
+    -webkit-transform: rotate(0deg);
+  }
+}
+@-ms-keyframes ringing {
+  0% {
+    -ms-transform: rotate(-15deg);
+  }
+  2% {
+    -ms-transform: rotate(15deg);
+  }
+  4% {
+    -ms-transform: rotate(-18deg);
+  }
+  6% {
+    -ms-transform: rotate(18deg);
+  }
+  8% {
+    -ms-transform: rotate(-22deg);
+  }
+  10% {
+    -ms-transform: rotate(22deg);
+  }
+  12% {
+    -ms-transform: rotate(-18deg);
+  }
+  14% {
+    -ms-transform: rotate(18deg);
+  }
+  16% {
+    -ms-transform: rotate(-12deg);
+  }
+  18% {
+    -ms-transform: rotate(12deg);
+  }
+  20% {
+    -ms-transform: rotate(0deg);
+  }
+}
+@keyframes ringing {
+  0% {
+    transform: rotate(-15deg);
+  }
+  2% {
+    transform: rotate(15deg);
+  }
+  4% {
+    transform: rotate(-18deg);
+  }
+  6% {
+    transform: rotate(18deg);
+  }
+  8% {
+    transform: rotate(-22deg);
+  }
+  10% {
+    transform: rotate(22deg);
+  }
+  12% {
+    transform: rotate(-18deg);
+  }
+  14% {
+    transform: rotate(18deg);
+  }
+  16% {
+    transform: rotate(-12deg);
+  }
+  18% {
+    transform: rotate(12deg);
+  }
+  20% {
+    transform: rotate(0deg);
+  }
+}
+.icon-animated-vertical {
+	display: inline-block;
+	-moz-animation: vertical 2s 5 ease 2s;
+	-webkit-animation: vertical 2s 5 ease 2s;
+	-o-animation: vertical 2s 5 ease 2s;
+	-ms-animation: vertical 2s 5 ease 2s;
+	animation: vertical 2s 5 ease 2s
+}
+@-moz-keyframes vertical {
+  0% {
+    -moz-transform: translate(0, -3px);
+  }
+  4% {
+    -moz-transform: translate(0, 3px);
+  }
+  8% {
+    -moz-transform: translate(0, -3px);
+  }
+  12% {
+    -moz-transform: translate(0, 3px);
+  }
+  16% {
+    -moz-transform: translate(0, -3px);
+  }
+  20% {
+    -moz-transform: translate(0, 3px);
+  }
+  22% {
+    -moz-transform: translate(0, 0);
+  }
+}
+@-webkit-keyframes vertical {
+  0% {
+    -webkit-transform: translate(0, -3px);
+  }
+  4% {
+    -webkit-transform: translate(0, 3px);
+  }
+  8% {
+    -webkit-transform: translate(0, -3px);
+  }
+  12% {
+    -webkit-transform: translate(0, 3px);
+  }
+  16% {
+    -webkit-transform: translate(0, -3px);
+  }
+  20% {
+    -webkit-transform: translate(0, 3px);
+  }
+  22% {
+    -webkit-transform: translate(0, 0);
+  }
+}
+@-ms-keyframes vertical {
+  0% {
+    -ms-transform: translate(0, -3px);
+  }
+  4% {
+    -ms-transform: translate(0, 3px);
+  }
+  8% {
+    -ms-transform: translate(0, -3px);
+  }
+  12% {
+    -ms-transform: translate(0, 3px);
+  }
+  16% {
+    -ms-transform: translate(0, -3px);
+  }
+  20% {
+    -ms-transform: translate(0, 3px);
+  }
+  22% {
+    -ms-transform: translate(0, 0);
+  }
+}
+@keyframes vertical {
+  0% {
+    transform: translate(0, -3px);
+  }
+  4% {
+    transform: translate(0, 3px);
+  }
+  8% {
+    transform: translate(0, -3px);
+  }
+  12% {
+    transform: translate(0, 3px);
+  }
+  16% {
+    transform: translate(0, -3px);
+  }
+  20% {
+    transform: translate(0, 3px);
+  }
+  22% {
+    transform: translate(0, 0);
+  }
+}
+.icon-animated-hand-pointer {
+  display: inline-block;
+  -moz-animation: hand-pointer 2.0s 4 ease 2.0s;
+  -webkit-animation: hand-pointer 2.0s 4 ease 2.0s;
+  -o-animation: hand-pointer 2.0s 4 ease 2.0s;
+  -ms-animation: hand-pointer 2.0s 4 ease 2.0s;
+  animation: hand-pointer 2.0s 4 ease 2.0s;
+}
+@-moz-keyframes hand-pointer {
+  0% {
+    -moz-transform: translate(0, 0);
+  }
+  6% {
+    -moz-transform: translate(5px, 0);
+  }
+  12% {
+    -moz-transform: translate(0, 0);
+  }
+  18% {
+    -moz-transform: translate(5px, 0);
+  }
+  24% {
+    -moz-transform: translate(0, 0);
+  }
+  30% {
+    -moz-transform: translate(5px, 0);
+  }
+  36% {
+    -moz-transform: translate(0, 0);
+  }
+}
+.icon-animated-wrench {
+  display: inline-block;
+  -moz-animation: wrenching 2.5s 4 ease;
+  -webkit-animation: wrenching 2.5s 4 ease;
+  -o-animation: wrenching 2.5s 4 ease;
+  -ms-animation: wrenching 2.5s 4 ease;
+  animation: wrenching 2.5s 4 ease;
+  -moz-transform-origin: 90% 35%;
+  -webkit-transform-origin: 90% 35%;
+  -o-transform-origin: 90% 35%;
+  -ms-transform-origin: 90% 35%;
+  transform-origin: 90% 35%;
+}
+@-moz-keyframes wrenching {
+  0% {
+    -moz-transform: rotate(-12deg);
+  }
+  8% {
+    -moz-transform: rotate(12deg);
+  }
+  10% {
+    -moz-transform: rotate(24deg);
+  }
+  18% {
+    -moz-transform: rotate(-24deg);
+  }
+  20% {
+    -moz-transform: rotate(-24deg);
+  }
+  28% {
+    -moz-transform: rotate(24deg);
+  }
+  30% {
+    -moz-transform: rotate(24deg);
+  }
+  38% {
+    -moz-transform: rotate(-24deg);
+  }
+  40% {
+    -moz-transform: rotate(-24deg);
+  }
+  48% {
+    -moz-transform: rotate(24deg);
+  }
+  50% {
+    -moz-transform: rotate(24deg);
+  }
+  58% {
+    -moz-transform: rotate(-24deg);
+  }
+  60% {
+    -moz-transform: rotate(-24deg);
+  }
+  68% {
+    -moz-transform: rotate(24deg);
+  }
+  75% {
+    -moz-transform: rotate(0deg);
+  }
+}
+@-webkit-keyframes wrenching {
+  0% {
+    -webkit-transform: rotate(-12deg);
+  }
+  8% {
+    -webkit-transform: rotate(12deg);
+  }
+  10% {
+    -webkit-transform: rotate(24deg);
+  }
+  18% {
+    -webkit-transform: rotate(-24deg);
+  }
+  20% {
+    -webkit-transform: rotate(-24deg);
+  }
+  28% {
+    -webkit-transform: rotate(24deg);
+  }
+  30% {
+    -webkit-transform: rotate(24deg);
+  }
+  38% {
+    -webkit-transform: rotate(-24deg);
+  }
+  40% {
+    -webkit-transform: rotate(-24deg);
+  }
+  48% {
+    -webkit-transform: rotate(24deg);
+  }
+  50% {
+    -webkit-transform: rotate(24deg);
+  }
+  58% {
+    -webkit-transform: rotate(-24deg);
+  }
+  60% {
+    -webkit-transform: rotate(-24deg);
+  }
+  68% {
+    -webkit-transform: rotate(24deg);
+  }
+  75% {
+    -webkit-transform: rotate(0deg);
+  }
+}
+@-o-keyframes wrenching {
+  0% {
+    -o-transform: rotate(-12deg);
+  }
+  8% {
+    -o-transform: rotate(12deg);
+  }
+  10% {
+    -o-transform: rotate(24deg);
+  }
+  18% {
+    -o-transform: rotate(-24deg);
+  }
+  20% {
+    -o-transform: rotate(-24deg);
+  }
+  28% {
+    -o-transform: rotate(24deg);
+  }
+  30% {
+    -o-transform: rotate(24deg);
+  }
+  38% {
+    -o-transform: rotate(-24deg);
+  }
+  40% {
+    -o-transform: rotate(-24deg);
+  }
+  48% {
+    -o-transform: rotate(24deg);
+  }
+  50% {
+    -o-transform: rotate(24deg);
+  }
+  58% {
+    -o-transform: rotate(-24deg);
+  }
+  60% {
+    -o-transform: rotate(-24deg);
+  }
+  68% {
+    -o-transform: rotate(24deg);
+  }
+  75% {
+    -o-transform: rotate(0deg);
+  }
+}
+@-ms-keyframes wrenching {
+  0% {
+    -ms-transform: rotate(-12deg);
+  }
+  8% {
+    -ms-transform: rotate(12deg);
+  }
+  10% {
+    -ms-transform: rotate(24deg);
+  }
+  18% {
+    -ms-transform: rotate(-24deg);
+  }
+  20% {
+    -ms-transform: rotate(-24deg);
+  }
+  28% {
+    -ms-transform: rotate(24deg);
+  }
+  30% {
+    -ms-transform: rotate(24deg);
+  }
+  38% {
+    -ms-transform: rotate(-24deg);
+  }
+  40% {
+    -ms-transform: rotate(-24deg);
+  }
+  48% {
+    -ms-transform: rotate(24deg);
+  }
+  50% {
+    -ms-transform: rotate(24deg);
+  }
+  58% {
+    -ms-transform: rotate(-24deg);
+  }
+  60% {
+    -ms-transform: rotate(-24deg);
+  }
+  68% {
+    -ms-transform: rotate(24deg);
+  }
+  75% {
+    -ms-transform: rotate(0deg);
+  }
+}
+@keyframes wrenching {
+  0% {
+    transform: rotate(-12deg);
+  }
+  8% {
+    transform: rotate(12deg);
+  }
+  10% {
+    transform: rotate(24deg);
+  }
+  18% {
+    transform: rotate(-24deg);
+  }
+  20% {
+    transform: rotate(-24deg);
+  }
+  28% {
+    transform: rotate(24deg);
+  }
+  30% {
+    transform: rotate(24deg);
+  }
+  38% {
+    transform: rotate(-24deg);
+  }
+  40% {
+    transform: rotate(-24deg);
+  }
+  48% {
+    transform: rotate(24deg);
+  }
+  50% {
+    transform: rotate(24deg);
+  }
+  58% {
+    transform: rotate(-24deg);
+  }
+  60% {
+    transform: rotate(-24deg);
+  }
+  68% {
+    transform: rotate(24deg);
+  }
+  75% {
+    transform: rotate(0deg);
+  }
+}
+@-moz-keyframes blinking {
+  0% {
+    opacity: 1;
+  }
+  40% {
+    opacity: 0;
+  }
+  80% {
+    opacity: 1;
+  }
+}
+@-webkit-keyframes blinking {
+  0% {
+    opacity: 1;
+  }
+  40% {
+    opacity: 0;
+  }
+  80% {
+    opacity: 1;
+  }
+}
+@-ms-keyframes blinking {
+  0% {
+    opacity: 1;
+  }
+  40% {
+    opacity: 0;
+  }
+  80% {
+    opacity: 1;
+  }
+}
+@keyframes blinking {
+  0% {
+    opacity: 1;
+  }
+  40% {
+    opacity: 0;
+  }
+  80% {
+    opacity: 1;
+  }
+}
+@-moz-keyframes pulsating {
+  0% {
+    -moz-transform: scale(1);
+  }
+  5% {
+    -moz-transform: scale(0.75);
+  }
+  10% {
+    -moz-transform: scale(1);
+  }
+  15% {
+    -moz-transform: scale(1.25);
+  }
+  20% {
+    -moz-transform: scale(1);
+  }
+  25% {
+    -moz-transform: scale(0.75);
+  }
+  30% {
+    -moz-transform: scale(1);
+  }
+  35% {
+    -moz-transform: scale(1.25);
+  }
+  40% {
+    -moz-transform: scale(1);
+  }
+}
+@-webkit-keyframes pulsating {
+  0% {
+    -webkit-transform: scale(1);
+  }
+  5% {
+    -webkit-transform: scale(0.75);
+  }
+  10% {
+    -webkit-transform: scale(1);
+  }
+  15% {
+    -webkit-transform: scale(1.25);
+  }
+  20% {
+    -webkit-transform: scale(1);
+  }
+  25% {
+    -webkit-transform: scale(0.75);
+  }
+  30% {
+    -webkit-transform: scale(1);
+  }
+  35% {
+    -webkit-transform: scale(1.25);
+  }
+  40% {
+    -webkit-transform: scale(1);
+  }
+}
+@-ms-keyframes pulsating {
+  0% {
+    -ms-transform: scale(1);
+  }
+  5% {
+    -ms-transform: scale(0.75);
+  }
+  10% {
+    -ms-transform: scale(1);
+  }
+  15% {
+    -ms-transform: scale(1.25);
+  }
+  20% {
+    -ms-transform: scale(1);
+  }
+  25% {
+    -ms-transform: scale(0.75);
+  }
+  30% {
+    -ms-transform: scale(1);
+  }
+  35% {
+    -ms-transform: scale(1.25);
+  }
+  40% {
+    -ms-transform: scale(1);
+  }
+}
+@keyframes pulsating {
+  0% {
+    transform: scale(1);
+  }
+  5% {
+    transform: scale(0.75);
+  }
+  10% {
+    transform: scale(1);
+  }
+  15% {
+    transform: scale(1.25);
+  }
+  20% {
+    transform: scale(1);
+  }
+  25% {
+    transform: scale(0.75);
+  }
+  30% {
+    transform: scale(1);
+  }
+  35% {
+    transform: scale(1.25);
+  }
+  40% {
+    transform: scale(1);
+  }
+}
+.btn-scroll-up {
+	border-width: 0;
+	position: fixed;
+	right: 2px;
+	z-index: 99;
+	-webkit-transition-duration: .3s;
+	transition-duration: .3s;
+	opacity: 0;
+	filter: alpha(opacity = 0);
+	bottom: -24px;
+	visibility: hidden
+}
+
+.btn-scroll-up.display {
+	opacity: .7;
+	filter: alpha(opacity = 70);
+	bottom: 2px;
+	visibility: visible
+}
+
+.btn-scroll-up:hover {
+	opacity: 1;
+	filter: alpha(opacity = 100)
+}
+
+.btn-scroll-up:focus {
+	outline: 0
+}
+
+@media ( min-width :768px) {
+	.main-container.container>.btn-scroll-up {
+		right: auto;
+		margin-left: 714px
+	}
+}
+
+@media ( min-width :992px) {
+	.main-container.container>.btn-scroll-up {
+		right: auto;
+		margin-left: 934px
+	}
+}
+
+@media ( min-width :1200px) {
+	.main-container.container>.btn-scroll-up {
+		right: auto;
+		margin-left: 1134px
+	}
+}
+
+.sidebar:before {
+	content: "";
+	display: block;
+	width: inherit;
+	position: absolute;
+	top: 0;
+	bottom: 0;
+	z-index: -1;
+	background-color: inherit;
+	border-style: inherit;
+	border-color: inherit;
+	border-width: inherit
+}
+.sidebar .sidebar-toggle:before {
+	content: "";
+	display: block;
+	height: 0;
+	border-top: 1px solid #f2f2f2;
+	border-color: inherit;
+	position: absolute;
+	left: 5px;
+	right: 5px;
+	top: 16px
+}
+/* skin 1 */
+.nav-list > li > a {
+  background-color: #364150;
+  color: #bac2c8;
+  padding:8px 10px;
+}
+
+.nav-list > li.open > a,
+.nav-list > li.open:hover > a {
+  color: #85c0ec;
+  background-color: #364150;
+}
+.nav-list > li > a:hover{
+	background: #36c6d3;
+    color: #fff;
+}
+.nav-list > li.active > a, .nav > li.selected > a {
+    background: #36c6d3;
+    color: #fff;
+}
+.nav-list > li.active > .submenu li.active > a:after {
+  top: 5px;
+}
+.nav-list > li .submenu {
+  background-color: #333d3f;
+}
+.nav-list > li .submenu > li > a:hover {
+  background-color: #2d3638;
+}
+.nav-list > li.active .submenu > li > a {
+    border-top-color: #454d4e;
+    background-color: #2d3638;
+}
+.nav-list > li.active .submenu > li > a:hover {
+  background-color: #14191a;
+}
+.nav-list > li > .submenu {
+  border-top-color: #505a5b;
+}
+.nav-list > li.active > .submenu {
+  border-top-color: #2f3e44;
+}
+.nav-list > li > .submenu > li > a {
+  color: #d9dfe6;
+}
+.nav-list > li > .submenu > li:hover > a {
+  color: #8ab4de;
+}
+.nav-list > li > .submenu > li.active > a {
+  	color: #b4bcc8;
+    background-color: #3e4b5c;
+}
+.nav-list > li > .submenu:before,
+.nav-list > li > .submenu > li:before {
+  border-color: #646c70;
+}
+.nav-list > li.active > .submenu:before,
+.nav-list > li.active > .submenu > li:before {
+  border-color: #3f4e54;
+}
+.nav-list > li .submenu li > .submenu li > a {
+  color: #d9dfe6;
+}
+.nav-list > li .submenu li > .submenu li:hover > a {
+  color: #8ab4de;
+}
+.nav-list > li .submenu li.open > a,
+.nav-list > li .submenu li > .submenu > li.open > a {
+  color: #85c0ec;
+}
+.nav-list > li .submenu li > .submenu li.active > a {
+  color: #61a8dd;
+}
+.nav-list > li .submenu li > .submenu li.active:hover > a {
+  color: #85c0ec;
+}
+.sidebar .nav-list > li.active.highlight,
+.sidebar .nav-list > li.active.highlight + li {
+  border-color: #506b7f;
+}
+.sidebar .nav-list > li.active.highlight + li:last-child {
+  border-bottom-color: #3f4e54;
+}
+.sidebar .nav-list > li.active.highlight > a:after {
+  border-right-color: transparent;
+  -moz-border-right-colors: none;
+  border-left-color: #141a1b;
+  -moz-border-left-colors: #141a1b;
+  border-width: 20px 0 20px 10px;
+  z-index: 1;
+  top: 0;
+  right: -10px;
+}
+.sidebar .nav-list > li.active.highlight > a:before {
+  border-left-color: #506b7f;
+  -moz-border-left-colors: #506b7f;
+  border-style: solid;
+  border-color: transparent;
+  border-width: 20px 0 20px 10px;
+  content: "";
+  position: absolute;
+  right: -11px;
+  top: 0;
+  z-index: 1;
+}
+.sidebar-shortcuts,
+.sidebar-shortcuts-mini {
+  background-color: #364150;
+  border-color: #3f4e54;
+}
+.sidebar > .nav-search {
+  background-color: #364150;
+  border-color: #3f4e54;
+}
+
+@media (min-width: 992px) {
+  .breadcrumbs.breadcrumbs-fixed {
+    border-bottom-width: 1px;
+  }
+}
+@media only screen and (max-width: 991px) {
+  .sidebar.responsive {
+    border-width: 0;
+    -webkit-box-shadow: none;
+    box-shadow: none;
+  }
+}
+.sidebar.menu-min{
+    width: 43px;
+}
+.sidebar.menu-min .sidebar-toggle{
+	padding-bottom:4px;
+}
+.sidebar.menu-min .nav-wrap-up .nav-wrap{
+	top:30px;
+}
+.sidebar.menu-min .sidebar-toggle>.ibps-icon {
+    font-size: 13px;
+    width:17px;
+    height:17px;
+    line-height: 14px;
+    border-width: 1px;
+}
+.sidebar.menu-min .nav-list > li.open > a {
+  background-color: #364150;
+  color: #bac2c8;
+}
+.sidebar.menu-min .nav-list > li.active > a:after {
+  border-width: 9px 6px;
+  top: 10px;
+}
+.sidebar.menu-min .nav-list > li.active.highlight > a:after {
+  border-width: 20px 0 20px 10px;
+  top: 0;
+}
+.sidebar.menu-min .nav-list > li.active:hover > a:after {
+  border-right-color: #242a2b;
+}
+
+.sidebar.menu-min .nav-list > li:hover > a {
+  color: #e1eaf1;
+}
+.sidebar.menu-min .nav-list > li > a > .menu-text {
+  background-color: #414b51;
+}
+.sidebar.menu-min .nav-list > li.active > a > .menu-text {
+  background-color: #242a2b;
+  border: 0px solid #3b4547;
+  border-width: 1px 1px 0;
+  border-left-color: #305675;
+}
+.sidebar.menu-min .nav-list > li.active > a:not(.dropdown-toggle) > .menu-text {
+  border-width: 1px;
+  border-top-color: #4a5c63;
+  border-bottom-color: #4a5c63;
+  border-right-color: #4a5c63;
+}
+.sidebar.menu-min .nav-list > li.open.active > a {
+  background-color: #141a1b;
+}
+.sidebar.menu-min .nav-list > li > .submenu:after {
+  display: none;
+}
+.sidebar .nav-list > li > .submenu {
+  background-color: #333d3f;
+  border-top-color: #5a606a;
+  border-top-width: 1px !important;
+}
+.sidebar.menu-min .sidebar-shortcuts-large {
+  background-color: #364150;
+  -webkit-box-shadow: none;
+  box-shadow: none;
+  border: 1px solid #4a5c63;
+  border-width: 0 1px 1px 0;
+  top: 0;
+}
+@media (max-width: 991px) {
+  .sidebar.responsive-min .nav-list > li.open > a {
+    background-color: #222a2d;
+    color: #bac2c8;
+  }
+  .sidebar.responsive-min .nav-list > li.active > a:after {
+    border-width: 9px 6px;
+    top: 10px;
+  }
+  .sidebar.responsive-min .nav-list > li.active.highlight > a:after {
+    border-width: 20px 0 20px 10px;
+    top: 0;
+  }
+  .sidebar.responsive-min .nav-list > li.active:hover > a:after {
+    border-right-color: #242a2b;
+  }
+  .sidebar.responsive-min .nav-list > li.active > a,
+  .sidebar.responsive-min .nav-list > li.active > a:hover {
+    background-color: #141a1b;
+    color: #7bb7e5;
+  }
+  .sidebar.responsive-min .nav-list > li:hover > a {
+    color: #e1eaf1;
+  }
+  .sidebar.responsive-min .nav-list > li > a > .menu-text {
+    background-color: #414b51;
+  }
+  .sidebar.responsive-min .nav-list > li.active > a > .menu-text {
+    background-color: #242a2b;
+    border: 0px solid #3b4547;
+    border-width: 1px 1px 0;
+    border-left-color: #305675;
+  }
+  .sidebar.responsive-min .nav-list > li.active > a:not(.dropdown-toggle) > .menu-text {
+    border-width: 1px;
+    border-top-color: #4a5c63;
+    border-bottom-color: #4a5c63;
+    border-right-color: #4a5c63;
+  }
+  .sidebar.responsive-min .nav-list > li.active:hover > a,
+  .sidebar.responsive-min .nav-list > li.active > a > .menu-text {
+    color: #7bb7e5;
+  }
+  .sidebar.responsive-min .nav-list > li.open.active > a {
+    background-color: #141a1b;
+  }
+  .sidebar.responsive-min .nav-list > li > a > .menu-text,
+  .sidebar.responsive-min .nav-list > li > .submenu {
+    border-width: 0;
+    border-left: 1px solid #181d1f;
+    -webkit-box-shadow: none;
+    box-shadow: none;
+  }
+  .sidebar.responsive-min .nav-list > li > .submenu {
+    border-top: 1px solid #3f4e54;
+  }
+  .sidebar.responsive-min .nav-list > li > .submenu:after {
+    display: none;
+  }
+  .sidebar.responsive-min .nav-list > li > .submenu {
+    background-color: #333d3f;
+    border-top-color: #5a606a;
+    border-top-width: 1px !important;
+  }
+  .sidebar.responsive-min .nav-list > li.active > .submenu {
+    background-color: #181e20;
+    border-top-color: #3b4547;
+    border-left-color: #305675;
+  }
+  .sidebar.responsive-min .nav-list > li > .arrow:after {
+    border-right-color: #414b51;
+    -moz-border-right-colors: #414b51;
+  }
+  .sidebar.responsive-min .nav-list > li > .arrow:before {
+    border-right-color: #111415;
+    -moz-border-right-colors: #242a2b;
+  }
+  .sidebar.responsive-min .nav-list > li.active > .arrow:after {
+    border-right-color: #242a2b;
+    -moz-border-right-colors: #242a2b;
+  }
+  .sidebar.responsive-min .nav-list > li.active > .arrow:before {
+    border-right-color: #50a0dd;
+    -moz-border-right-colors: #50a0dd;
+  }
+  .sidebar.responsive-min .sidebar-shortcuts-large {
+    background-color: #222a2d;
+    -webkit-box-shadow: none;
+    box-shadow: none;
+    border: 1px solid #4a5c63;
+    border-width: 0 1px 1px 0;
+    top: 0;
+  }
+}
+@media only screen and (min-width: 992px) {
+  .nav-list > li.active > .submenu li.hover > .submenu {
+    border-left-color: #475561;
+  }
+  .nav-list > li.active > .submenu li.hover > .submenu {
+    background-color: #171e1f;
+  }
+}
+@media only screen and (min-width: 992px) and (max-width: 991px) {
+  .sidebar.navbar-collapse .nav-list li.hover > .submenu {
+    padding-bottom: 0;
+  }
+  .sidebar.navbar-collapse .nav-list li.hover > .submenu {
+    border-top-color: #505a5b;
+  }
+  .sidebar.navbar-collapse .nav-list li.hover.active > .submenu {
+    border-top-color: #2f3e44;
+  }
+  .sidebar.navbar-collapse .nav-list li.hover.active > .submenu,
+  .sidebar.navbar-collapse .nav-list > li > .submenu li.hover > .submenu,
+  .sidebar.navbar-collapse .nav-list li.active > .submenu li.hover.active > .submenu {
+    border-left-width: 0;
+  }
+  .sidebar.navbar-collapse .nav-list > li > .submenu li.hover > .submenu {
+    padding: 0;
+  }
+  .sidebar.navbar-collapse .nav-list li li.hover > .submenu > li:first-child > a {
+    border-top-width: 1px;
+  }
+}
+.sidebar.navbar-collapse .nav-list > li .submenu > li.hover:hover > a {
+  background-color: #2d3638;
+}
+.sidebar.navbar-collapse .nav-list > li.active .submenu > li.hover:hover > a {
+  background-color: #2d3638;
+}
+@media only screen and (min-width: 992px) {
+  .sidebar:not(.navbar-collapse) .nav-list > li .submenu > li.hover:hover > a {
+    background-color: #2d3638;
+  }
+  .sidebar:not(.navbar-collapse) .nav-list > li.active .submenu > li.hover:hover > a {
+    background-color: #14191a;
+  }
+}
+.nav-list li > .arrow:after {
+  border-right-color: #353c3d;
+  -moz-border-right-colors: #353c3d;
+}
+.nav-list li > .arrow:before {
+  border-right-color: #1d2122;
+  -moz-border-right-colors: #1d2122;
+}
+.nav-list > li.active > .arrow:after {
+  border-right-color: #171e1f;
+  -moz-border-right-colors: #171e1f;
+}
+.nav-list > li.active > .arrow:before {
+  border-right-color: #50a0dd;
+  -moz-border-right-colors: #50a0dd;
+}
+.nav-list > li.active > .submenu li.hover > .arrow:before {
+  border-right-color: #4f6e86;
+  -moz-border-right-colors: #8fb6d5;
+}
+.nav-list > li.active > .submenu li.hover.active > .arrow:before {
+  border-right-color: #305675;
+  -moz-border-right-colors: #2290e9;
+}
+.nav-list > li.active > .submenu li.hover > .arrow:after {
+  border-right-color: #171e1f;
+  -moz-border-right-colors: #171e1f;
+}
+.nav-list li.pull_up > .arrow:after {
+  border-right-color: #353c3d !important;
+  -moz-border-right-colors: #353c3d !important;
+}
+.nav-list li.pull_up > .arrow:before {
+  border-right-color: #1d2122 !important;
+  -moz-border-right-colors: #1d2122 !important;
+}
+.nav-list li.pull_up.active > .arrow:after {
+  border-right-color: #171e1f !important;
+  -moz-border-right-colors: #171e1f !important;
+}
+.nav-list li.pull_up.active > .arrow:before {
+  border-right-color: #50a0dd !important;
+  -moz-border-right-colors: #50a0dd !important;
+}
+.main-container .menu-toggler {
+  background-color: #444444;
+}
+.main-container .menu-toggler:before {
+  border-top-color: #87b87f;
+  border-bottom-color: #6fb3e0;
+}
+.main-container .menu-toggler:after {
+  border-top-color: #ffa24d;
+  border-bottom-color: #d15b47;
+}
+.main-container .menu-toggler > .toggler-text {
+  border-top-color: #444444;
+  -moz-border-top-colors: #444444;
+}
+.skin-1.display {
+  background-color: #5d82a2;
+}
+.skin-1.display:before {
+  border-top-color: #b5d3b0;
+  border-bottom-color: #aed4ee;
+}
+.skin-1.display:after {
+  border-top-color: #ffca9a;
+  border-bottom-color: #e09284;
+}
+.skin-1.display > .toggler-text {
+  border-top-color: #5d82a2;
+  -moz-border-top-colors: #5d82a2;
+}
+.navbar .navbar-toggle {
+  background-color: #4D9DCC;
+}
+.navbar .navbar-toggle:focus {
+  background-color: #4D9DCC;
+  border-color: transparent;
+}
+.navbar .navbar-toggle:hover {
+  background-color: #3992c6;
+  border-color: rgba(255, 255, 255, 0.1);
+}
+.navbar .navbar-toggle.display,
+.navbar .navbar-toggle[data-toggle=collapse]:not(.collapsed) {
+  background-color: #3384b3;
+  box-shadow: inset 1px 1px 2px 0 rgba(0, 0, 0, 0.25);
+  border-color: rgba(255, 255, 255, 0.35);
+}
+@media only screen and (min-width: 768px) {
+  .container.main-container:before {
+    box-shadow: 0 0 0 1px rgba(255, 255, 255, 0.1);
+  }
+}
+.nav-list>li:hover:before{
+	content: "";
+	position: absolute;
+	top: 0;
+	left: 0;
+	z-index: 1;
+	bottom: 0;
+	width: 3px;
+	background-color: #629cc9
+}
+.top23{
+	top:23px;
+}
+/*.nav-list li.active>a:after {
+	display: block;
+	content: "";
+	position: absolute;
+	right: 0;
+	top: 15px;
+	border: 8px solid transparent;
+	border-width: 14px 10px;
+    border-right-color: #FFF;
+    z-index:99;
+}*/
+.nav-list li.hover-show>.arrow {
+    display: block;
+    position: absolute;
+    top: 8px;
+    right: 1px;
+    z-index: 100;
+}
+.nav-list li.hover-show>.arrow:before, .nav-list li.hover-show>.arrow:after {
+    border: 1px solid transparent;
+    display: block;
+    height: 0;
+    width: 0;
+    position: absolute;
+    left: -19px;
+    top: 0;
+    right: auto;
+    bottom: auto;
+    content: "";
+    border-width: 10px;
+  
+}
+.nav-list li.hover-show>.arrow:before {
+    border-right-color: #000;
+    -moz-border-right-colors: #000;
+    left:-20px;
+}
+.nav-list li.hover-show>.arrow:after {
+    border-right-color: #353c3d;
+    -moz-border-right-colors: #353c3d;
+}
+.nav-list li.active.hover-show>a:after {
+	display: none;
+}
+.menu-min li.hover-show>.arrow:after{
+	 border-right-color: #414b51;
+    -moz-border-right-colors: #414b51;
+}
+.nav-list li.hover>.submenu {
+		position: absolute;
+		left: 100%;
+		margin-left: -1px;
+		top: -10px;
+		bottom: auto;
+		z-index:99;
+		width: 176px;
+		border: 1px solid #000000;
+		display: none;
+		
+}
+.label-important, .label.label-important, .badge.badge-important, .badge-important {
+    background-color: #d15b47;
+}
+.label-success, .label.label-success, .badge.badge-success, .badge-success {
+    background-color: #82af6f;
+}
+.menutext{
+	text-shadow:0 1px 0 rgba(0, 0, 0, .25);
+}
+.navbar-header a:hover{
+	text-decoration:none;
+	color:white;
+}
+.navbar-nav>li>a:hover{
+	background:#202b37;
+	color:#fff;
+}
+.ibps-nav>li.purple>a {
+	background-color: #892e65
+}
+
+.ibps-nav>li.purple>a:hover,.ibps-nav>li.purple>a:focus,.ibps-nav>li.open.purple>a
+	{
+	background-color: #762c59
+}
+
+.ibps-nav>li.green>a {
+	background-color: #2e8965
+}
+
+.ibps-nav>li.green>a:hover,.ibps-nav>li.green>a:focus,.ibps-nav>li.open.green>a
+	{
+	background-color: #2c7659
+}
+
+.ibps-nav>li.light-blue>a {
+	background-color: #62a8d1
+}
+
+.ibps-nav>li.light-blue>a:hover,.ibps-nav>li.light-blue>a:focus,.ibps-nav>li.open.light-blue>a
+	{
+		color:#fff;
+	background-color: #579ec8
+}
+.sidebar.menu-min .nav-list>li>a{
+	padding:7px 5px;
+	overflow: inherit;
+}
+.sidebar.menu-min .nav-list>li>a>.menu-text{
+	display: none;
+    text-align: left;
+    position: absolute;
+    top: -5px;
+    left: 37px;
+    z-index: 100;
+    width: 176px;
+    height: 43px;
+    line-height: 43px;
+    padding-left: 12px;
+    border-left:1px solid #181d1f;
+}
+.menu-icon{
+	width:10px;
+	height:10px;
+	line-height: inherit;
+	vertical-align:sub;
+}
+.menu-min .nav-list li.hover>.submenu{
+	top:41px;
+}
+.menu-min .nav-list > li.hover-show>a .menu-text {
+display:inline-block;
+}
+/*内容body*/
+/*CONTENTTABS*/
+.page-tabs a.active {
+    background: #ff5e5f;
+    color: #fff;
+}
+.breadcrumbs {
+  border-width: 0;
+  background-color: #f0f0f0;
+}
+.content-tabs button:hover {
+	background: #fafafa;
+}
+nav.page-tabs {
+	overflow: hidden;
+	height:32px;
+}
+.page-tabs a i:hover ,.page-tabs a.active i:hover  {
+	color: #c00 !important;
+}
+.content-tabs .roll-nav:hover {
+	color: #777;
+	background: #f2f2f2;
+	cursor: pointer;
+}
+.page-tabs a {
+	color: #999;
+	border-radius: 4px;
+}
+.roll-right.J_tabClose {
+	right: 0;
+	width: 80px;
+}
+.roll-right.J_tabExit {
+	background: #fff;
+	height: 40px;
+	width: 60px;
+	outline: none;
+}
+.dropdown-menu-right {
+	left: auto;
+}
+.J_mainContent {
+    height: calc(100% - 30px);
+}
+.tabs-container .nav-tabs>li.active>a, .tabs-container .nav-tabs>li.active>a:hover, .tabs-container .nav-tabs>li.active>a:focus {
+    border-left: 1px solid #e7eaec;
+    border-right: 1px solid #e7eaec;
+    border-top: 3px solid #0d70b3;
+    border-bottom-color: #fff;
+    color:#0d70b3;
+}
+.ops_itemDiv{
+	border-radius: 8px;
+    box-shadow: 2px 2px 5px #969696;
+    padding: 2px;
+    right: 10px;
+    top: -8px;
+	display:none;
+}
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/css/swiper.min.css b/pluss-manage-page/src/main/resources/static/resources/auth/css/swiper.min.css
new file mode 100644
index 0000000..6adcd71
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/css/swiper.min.css
@@ -0,0 +1,12 @@
+/**
+ * Swiper 4.4.6
+ * Most modern mobile touch slider and framework with hardware accelerated transitions
+ * http://www.idangero.us/swiper/
+ *
+ * Copyright 2014-2018 Vladimir Kharlampidi
+ *
+ * Released under the MIT License
+ *
+ * Released on: December 19, 2018
+ */
+.swiper-container{margin:0 auto;position:relative;overflow:hidden;list-style:none;padding:0;z-index:1}.swiper-container-no-flexbox .swiper-slide{float:left}.swiper-container-vertical>.swiper-wrapper{-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column}.swiper-wrapper{position:relative;width:100%;height:100%;z-index:1;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-transition-property:-webkit-transform;transition-property:-webkit-transform;-o-transition-property:transform;transition-property:transform;transition-property:transform,-webkit-transform;-webkit-box-sizing:content-box;box-sizing:content-box}.swiper-container-android .swiper-slide,.swiper-wrapper{-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}.swiper-container-multirow>.swiper-wrapper{-webkit-flex-wrap:wrap;-ms-flex-wrap:wrap;flex-wrap:wrap}.swiper-container-free-mode>.swiper-wrapper{-webkit-transition-timing-function:ease-out;-o-transition-timing-function:ease-out;transition-timing-function:ease-out;margin:0 auto}.swiper-slide{-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0;width:100%;height:100%;position:relative;-webkit-transition-property:-webkit-transform;transition-property:-webkit-transform;-o-transition-property:transform;transition-property:transform;transition-property:transform,-webkit-transform}.swiper-slide-invisible-blank{visibility:hidden}.swiper-container-autoheight,.swiper-container-autoheight .swiper-slide{height:auto}.swiper-container-autoheight .swiper-wrapper{-webkit-box-align:start;-webkit-align-items:flex-start;-ms-flex-align:start;align-items:flex-start;-webkit-transition-property:height,-webkit-transform;transition-property:height,-webkit-transform;-o-transition-property:transform,height;transition-property:transform,height;transition-property:transform,height,-webkit-transform}.swiper-container-3d{-webkit-perspective:1200px;perspective:1200px}.swiper-container-3d .swiper-cube-shadow,.swiper-container-3d .swiper-slide,.swiper-container-3d .swiper-slide-shadow-bottom,.swiper-container-3d .swiper-slide-shadow-left,.swiper-container-3d .swiper-slide-shadow-right,.swiper-container-3d .swiper-slide-shadow-top,.swiper-container-3d .swiper-wrapper{-webkit-transform-style:preserve-3d;transform-style:preserve-3d}.swiper-container-3d .swiper-slide-shadow-bottom,.swiper-container-3d .swiper-slide-shadow-left,.swiper-container-3d .swiper-slide-shadow-right,.swiper-container-3d .swiper-slide-shadow-top{position:absolute;left:0;top:0;width:100%;height:100%;pointer-events:none;z-index:10}.swiper-container-3d .swiper-slide-shadow-left{background-image:-webkit-gradient(linear,right top,left top,from(rgba(0,0,0,.5)),to(rgba(0,0,0,0)));background-image:-webkit-linear-gradient(right,rgba(0,0,0,.5),rgba(0,0,0,0));background-image:-o-linear-gradient(right,rgba(0,0,0,.5),rgba(0,0,0,0));background-image:linear-gradient(to left,rgba(0,0,0,.5),rgba(0,0,0,0))}.swiper-container-3d .swiper-slide-shadow-right{background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.5)),to(rgba(0,0,0,0)));background-image:-webkit-linear-gradient(left,rgba(0,0,0,.5),rgba(0,0,0,0));background-image:-o-linear-gradient(left,rgba(0,0,0,.5),rgba(0,0,0,0));background-image:linear-gradient(to right,rgba(0,0,0,.5),rgba(0,0,0,0))}.swiper-container-3d .swiper-slide-shadow-top{background-image:-webkit-gradient(linear,left bottom,left top,from(rgba(0,0,0,.5)),to(rgba(0,0,0,0)));background-image:-webkit-linear-gradient(bottom,rgba(0,0,0,.5),rgba(0,0,0,0));background-image:-o-linear-gradient(bottom,rgba(0,0,0,.5),rgba(0,0,0,0));background-image:linear-gradient(to top,rgba(0,0,0,.5),rgba(0,0,0,0))}.swiper-container-3d .swiper-slide-shadow-bottom{background-image:-webkit-gradient(linear,left top,left bottom,from(rgba(0,0,0,.5)),to(rgba(0,0,0,0)));background-image:-webkit-linear-gradient(top,rgba(0,0,0,.5),rgba(0,0,0,0));background-image:-o-linear-gradient(top,rgba(0,0,0,.5),rgba(0,0,0,0));background-image:linear-gradient(to bottom,rgba(0,0,0,.5),rgba(0,0,0,0))}.swiper-container-wp8-horizontal,.swiper-container-wp8-horizontal>.swiper-wrapper{-ms-touch-action:pan-y;touch-action:pan-y}.swiper-container-wp8-vertical,.swiper-container-wp8-vertical>.swiper-wrapper{-ms-touch-action:pan-x;touch-action:pan-x}.swiper-button-next,.swiper-button-prev{position:absolute;top:50%;width:27px;height:44px;margin-top:-22px;z-index:10;cursor:pointer;background-size:27px 44px;background-position:center;background-repeat:no-repeat}.swiper-button-next.swiper-button-disabled,.swiper-button-prev.swiper-button-disabled{opacity:.35;cursor:auto;pointer-events:none}.swiper-button-prev,.swiper-container-rtl .swiper-button-next{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2027%2044'%3E%3Cpath%20d%3D'M0%2C22L22%2C0l2.1%2C2.1L4.2%2C22l19.9%2C19.9L22%2C44L0%2C22L0%2C22L0%2C22z'%20fill%3D'%23007aff'%2F%3E%3C%2Fsvg%3E");left:10px;right:auto}.swiper-button-next,.swiper-container-rtl .swiper-button-prev{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2027%2044'%3E%3Cpath%20d%3D'M27%2C22L27%2C22L5%2C44l-2.1-2.1L22.8%2C22L2.9%2C2.1L5%2C0L27%2C22L27%2C22z'%20fill%3D'%23007aff'%2F%3E%3C%2Fsvg%3E");right:10px;left:auto}.swiper-button-prev.swiper-button-white,.swiper-container-rtl .swiper-button-next.swiper-button-white{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2027%2044'%3E%3Cpath%20d%3D'M0%2C22L22%2C0l2.1%2C2.1L4.2%2C22l19.9%2C19.9L22%2C44L0%2C22L0%2C22L0%2C22z'%20fill%3D'%23ffffff'%2F%3E%3C%2Fsvg%3E")}.swiper-button-next.swiper-button-white,.swiper-container-rtl .swiper-button-prev.swiper-button-white{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2027%2044'%3E%3Cpath%20d%3D'M27%2C22L27%2C22L5%2C44l-2.1-2.1L22.8%2C22L2.9%2C2.1L5%2C0L27%2C22L27%2C22z'%20fill%3D'%23ffffff'%2F%3E%3C%2Fsvg%3E")}.swiper-button-prev.swiper-button-black,.swiper-container-rtl .swiper-button-next.swiper-button-black{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2027%2044'%3E%3Cpath%20d%3D'M0%2C22L22%2C0l2.1%2C2.1L4.2%2C22l19.9%2C19.9L22%2C44L0%2C22L0%2C22L0%2C22z'%20fill%3D'%23000000'%2F%3E%3C%2Fsvg%3E")}.swiper-button-next.swiper-button-black,.swiper-container-rtl .swiper-button-prev.swiper-button-black{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2027%2044'%3E%3Cpath%20d%3D'M27%2C22L27%2C22L5%2C44l-2.1-2.1L22.8%2C22L2.9%2C2.1L5%2C0L27%2C22L27%2C22z'%20fill%3D'%23000000'%2F%3E%3C%2Fsvg%3E")}.swiper-button-lock{display:none}.swiper-pagination{position:absolute;text-align:center;-webkit-transition:.3s opacity;-o-transition:.3s opacity;transition:.3s opacity;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0);z-index:10}.swiper-pagination.swiper-pagination-hidden{opacity:0}.swiper-container-horizontal>.swiper-pagination-bullets,.swiper-pagination-custom,.swiper-pagination-fraction{bottom:10px;left:0;width:100%}.swiper-pagination-bullets-dynamic{overflow:hidden;font-size:0}.swiper-pagination-bullets-dynamic .swiper-pagination-bullet{-webkit-transform:scale(.33);-ms-transform:scale(.33);transform:scale(.33);position:relative}.swiper-pagination-bullets-dynamic .swiper-pagination-bullet-active{-webkit-transform:scale(1);-ms-transform:scale(1);transform:scale(1)}.swiper-pagination-bullets-dynamic .swiper-pagination-bullet-active-main{-webkit-transform:scale(1);-ms-transform:scale(1);transform:scale(1)}.swiper-pagination-bullets-dynamic .swiper-pagination-bullet-active-prev{-webkit-transform:scale(.66);-ms-transform:scale(.66);transform:scale(.66)}.swiper-pagination-bullets-dynamic .swiper-pagination-bullet-active-prev-prev{-webkit-transform:scale(.33);-ms-transform:scale(.33);transform:scale(.33)}.swiper-pagination-bullets-dynamic .swiper-pagination-bullet-active-next{-webkit-transform:scale(.66);-ms-transform:scale(.66);transform:scale(.66)}.swiper-pagination-bullets-dynamic .swiper-pagination-bullet-active-next-next{-webkit-transform:scale(.33);-ms-transform:scale(.33);transform:scale(.33)}.swiper-pagination-bullet{width:8px;height:8px;display:inline-block;border-radius:100%;background:#000;opacity:.2}button.swiper-pagination-bullet{border:none;margin:0;padding:0;-webkit-box-shadow:none;box-shadow:none;-webkit-appearance:none;-moz-appearance:none;appearance:none}.swiper-pagination-clickable .swiper-pagination-bullet{cursor:pointer}.swiper-pagination-bullet-active{opacity:1;background:#007aff}.swiper-container-vertical>.swiper-pagination-bullets{right:10px;top:50%;-webkit-transform:translate3d(0,-50%,0);transform:translate3d(0,-50%,0)}.swiper-container-vertical>.swiper-pagination-bullets .swiper-pagination-bullet{margin:6px 0;display:block}.swiper-container-vertical>.swiper-pagination-bullets.swiper-pagination-bullets-dynamic{top:50%;-webkit-transform:translateY(-50%);-ms-transform:translateY(-50%);transform:translateY(-50%);width:8px}.swiper-container-vertical>.swiper-pagination-bullets.swiper-pagination-bullets-dynamic .swiper-pagination-bullet{display:inline-block;-webkit-transition:.2s top,.2s -webkit-transform;transition:.2s top,.2s -webkit-transform;-o-transition:.2s transform,.2s top;transition:.2s transform,.2s top;transition:.2s transform,.2s top,.2s -webkit-transform}.swiper-container-horizontal>.swiper-pagination-bullets .swiper-pagination-bullet{margin:0 4px}.swiper-container-horizontal>.swiper-pagination-bullets.swiper-pagination-bullets-dynamic{left:50%;-webkit-transform:translateX(-50%);-ms-transform:translateX(-50%);transform:translateX(-50%);white-space:nowrap}.swiper-container-horizontal>.swiper-pagination-bullets.swiper-pagination-bullets-dynamic .swiper-pagination-bullet{-webkit-transition:.2s left,.2s -webkit-transform;transition:.2s left,.2s -webkit-transform;-o-transition:.2s transform,.2s left;transition:.2s transform,.2s left;transition:.2s transform,.2s left,.2s -webkit-transform}.swiper-container-horizontal.swiper-container-rtl>.swiper-pagination-bullets-dynamic .swiper-pagination-bullet{-webkit-transition:.2s right,.2s -webkit-transform;transition:.2s right,.2s -webkit-transform;-o-transition:.2s transform,.2s right;transition:.2s transform,.2s right;transition:.2s transform,.2s right,.2s -webkit-transform}.swiper-pagination-progressbar{background:rgba(0,0,0,.25);position:absolute}.swiper-pagination-progressbar .swiper-pagination-progressbar-fill{background:#007aff;position:absolute;left:0;top:0;width:100%;height:100%;-webkit-transform:scale(0);-ms-transform:scale(0);transform:scale(0);-webkit-transform-origin:left top;-ms-transform-origin:left top;transform-origin:left top}.swiper-container-rtl .swiper-pagination-progressbar .swiper-pagination-progressbar-fill{-webkit-transform-origin:right top;-ms-transform-origin:right top;transform-origin:right top}.swiper-container-horizontal>.swiper-pagination-progressbar,.swiper-container-vertical>.swiper-pagination-progressbar.swiper-pagination-progressbar-opposite{width:100%;height:4px;left:0;top:0}.swiper-container-horizontal>.swiper-pagination-progressbar.swiper-pagination-progressbar-opposite,.swiper-container-vertical>.swiper-pagination-progressbar{width:4px;height:100%;left:0;top:0}.swiper-pagination-white .swiper-pagination-bullet-active{background:#fff}.swiper-pagination-progressbar.swiper-pagination-white{background:rgba(255,255,255,.25)}.swiper-pagination-progressbar.swiper-pagination-white .swiper-pagination-progressbar-fill{background:#fff}.swiper-pagination-black .swiper-pagination-bullet-active{background:#000}.swiper-pagination-progressbar.swiper-pagination-black{background:rgba(0,0,0,.25)}.swiper-pagination-progressbar.swiper-pagination-black .swiper-pagination-progressbar-fill{background:#000}.swiper-pagination-lock{display:none}.swiper-scrollbar{border-radius:10px;position:relative;-ms-touch-action:none;background:rgba(0,0,0,.1)}.swiper-container-horizontal>.swiper-scrollbar{position:absolute;left:1%;bottom:3px;z-index:50;height:5px;width:98%}.swiper-container-vertical>.swiper-scrollbar{position:absolute;right:3px;top:1%;z-index:50;width:5px;height:98%}.swiper-scrollbar-drag{height:100%;width:100%;position:relative;background:rgba(0,0,0,.5);border-radius:10px;left:0;top:0}.swiper-scrollbar-cursor-drag{cursor:move}.swiper-scrollbar-lock{display:none}.swiper-zoom-container{width:100%;height:100%;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;text-align:center}.swiper-zoom-container>canvas,.swiper-zoom-container>img,.swiper-zoom-container>svg{max-width:100%;max-height:100%;-o-object-fit:contain;object-fit:contain}.swiper-slide-zoomed{cursor:move}.swiper-lazy-preloader{width:42px;height:42px;position:absolute;left:50%;top:50%;margin-left:-21px;margin-top:-21px;z-index:10;-webkit-transform-origin:50%;-ms-transform-origin:50%;transform-origin:50%;-webkit-animation:swiper-preloader-spin 1s steps(12,end) infinite;animation:swiper-preloader-spin 1s steps(12,end) infinite}.swiper-lazy-preloader:after{display:block;content:'';width:100%;height:100%;background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg%20viewBox%3D'0%200%20120%20120'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20xmlns%3Axlink%3D'http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink'%3E%3Cdefs%3E%3Cline%20id%3D'l'%20x1%3D'60'%20x2%3D'60'%20y1%3D'7'%20y2%3D'27'%20stroke%3D'%236c6c6c'%20stroke-width%3D'11'%20stroke-linecap%3D'round'%2F%3E%3C%2Fdefs%3E%3Cg%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(30%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(60%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(90%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(120%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(150%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.37'%20transform%3D'rotate(180%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.46'%20transform%3D'rotate(210%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.56'%20transform%3D'rotate(240%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.66'%20transform%3D'rotate(270%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.75'%20transform%3D'rotate(300%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.85'%20transform%3D'rotate(330%2060%2C60)'%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E");background-position:50%;background-size:100%;background-repeat:no-repeat}.swiper-lazy-preloader-white:after{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg%20viewBox%3D'0%200%20120%20120'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20xmlns%3Axlink%3D'http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink'%3E%3Cdefs%3E%3Cline%20id%3D'l'%20x1%3D'60'%20x2%3D'60'%20y1%3D'7'%20y2%3D'27'%20stroke%3D'%23fff'%20stroke-width%3D'11'%20stroke-linecap%3D'round'%2F%3E%3C%2Fdefs%3E%3Cg%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(30%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(60%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(90%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(120%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(150%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.37'%20transform%3D'rotate(180%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.46'%20transform%3D'rotate(210%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.56'%20transform%3D'rotate(240%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.66'%20transform%3D'rotate(270%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.75'%20transform%3D'rotate(300%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.85'%20transform%3D'rotate(330%2060%2C60)'%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E")}@-webkit-keyframes swiper-preloader-spin{100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes swiper-preloader-spin{100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.swiper-container .swiper-notification{position:absolute;left:0;top:0;pointer-events:none;opacity:0;z-index:-1000}.swiper-container-fade.swiper-container-free-mode .swiper-slide{-webkit-transition-timing-function:ease-out;-o-transition-timing-function:ease-out;transition-timing-function:ease-out}.swiper-container-fade .swiper-slide{pointer-events:none;-webkit-transition-property:opacity;-o-transition-property:opacity;transition-property:opacity}.swiper-container-fade .swiper-slide .swiper-slide{pointer-events:none}.swiper-container-fade .swiper-slide-active,.swiper-container-fade .swiper-slide-active .swiper-slide-active{pointer-events:auto}.swiper-container-cube{overflow:visible}.swiper-container-cube .swiper-slide{pointer-events:none;-webkit-backface-visibility:hidden;backface-visibility:hidden;z-index:1;visibility:hidden;-webkit-transform-origin:0 0;-ms-transform-origin:0 0;transform-origin:0 0;width:100%;height:100%}.swiper-container-cube .swiper-slide .swiper-slide{pointer-events:none}.swiper-container-cube.swiper-container-rtl .swiper-slide{-webkit-transform-origin:100% 0;-ms-transform-origin:100% 0;transform-origin:100% 0}.swiper-container-cube .swiper-slide-active,.swiper-container-cube .swiper-slide-active .swiper-slide-active{pointer-events:auto}.swiper-container-cube .swiper-slide-active,.swiper-container-cube .swiper-slide-next,.swiper-container-cube .swiper-slide-next+.swiper-slide,.swiper-container-cube .swiper-slide-prev{pointer-events:auto;visibility:visible}.swiper-container-cube .swiper-slide-shadow-bottom,.swiper-container-cube .swiper-slide-shadow-left,.swiper-container-cube .swiper-slide-shadow-right,.swiper-container-cube .swiper-slide-shadow-top{z-index:0;-webkit-backface-visibility:hidden;backface-visibility:hidden}.swiper-container-cube .swiper-cube-shadow{position:absolute;left:0;bottom:0;width:100%;height:100%;background:#000;opacity:.6;-webkit-filter:blur(50px);filter:blur(50px);z-index:0}.swiper-container-flip{overflow:visible}.swiper-container-flip .swiper-slide{pointer-events:none;-webkit-backface-visibility:hidden;backface-visibility:hidden;z-index:1}.swiper-container-flip .swiper-slide .swiper-slide{pointer-events:none}.swiper-container-flip .swiper-slide-active,.swiper-container-flip .swiper-slide-active .swiper-slide-active{pointer-events:auto}.swiper-container-flip .swiper-slide-shadow-bottom,.swiper-container-flip .swiper-slide-shadow-left,.swiper-container-flip .swiper-slide-shadow-right,.swiper-container-flip .swiper-slide-shadow-top{z-index:0;-webkit-backface-visibility:hidden;backface-visibility:hidden}.swiper-container-coverflow .swiper-wrapper{-ms-perspective:1200px}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/dataTables/images/Sorting icons.psd b/pluss-manage-page/src/main/resources/static/resources/auth/dataTables/images/Sorting icons.psd
new file mode 100644
index 0000000..d1ae24d
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/dataTables/images/Sorting icons.psd differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/dataTables/images/back_disabled.png b/pluss-manage-page/src/main/resources/static/resources/auth/dataTables/images/back_disabled.png
new file mode 100644
index 0000000..881de79
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/dataTables/images/back_disabled.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/dataTables/images/back_enabled.png b/pluss-manage-page/src/main/resources/static/resources/auth/dataTables/images/back_enabled.png
new file mode 100644
index 0000000..c608682
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/dataTables/images/back_enabled.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/dataTables/images/back_enabled_hover.png b/pluss-manage-page/src/main/resources/static/resources/auth/dataTables/images/back_enabled_hover.png
new file mode 100644
index 0000000..d300f10
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/dataTables/images/back_enabled_hover.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/dataTables/images/favicon.ico b/pluss-manage-page/src/main/resources/static/resources/auth/dataTables/images/favicon.ico
new file mode 100644
index 0000000..a6f4818
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/dataTables/images/favicon.ico differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/dataTables/images/forward_disabled.png b/pluss-manage-page/src/main/resources/static/resources/auth/dataTables/images/forward_disabled.png
new file mode 100644
index 0000000..6a6ded7
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/dataTables/images/forward_disabled.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/dataTables/images/forward_enabled.png b/pluss-manage-page/src/main/resources/static/resources/auth/dataTables/images/forward_enabled.png
new file mode 100644
index 0000000..a4e6b53
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/dataTables/images/forward_enabled.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/dataTables/images/forward_enabled_hover.png b/pluss-manage-page/src/main/resources/static/resources/auth/dataTables/images/forward_enabled_hover.png
new file mode 100644
index 0000000..fc46c5e
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/dataTables/images/forward_enabled_hover.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/dataTables/images/sort_asc.png b/pluss-manage-page/src/main/resources/static/resources/auth/dataTables/images/sort_asc.png
new file mode 100644
index 0000000..a88d797
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/dataTables/images/sort_asc.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/dataTables/images/sort_asc_disabled.png b/pluss-manage-page/src/main/resources/static/resources/auth/dataTables/images/sort_asc_disabled.png
new file mode 100644
index 0000000..4e144cf
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/dataTables/images/sort_asc_disabled.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/dataTables/images/sort_both.png b/pluss-manage-page/src/main/resources/static/resources/auth/dataTables/images/sort_both.png
new file mode 100644
index 0000000..1867040
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/dataTables/images/sort_both.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/dataTables/images/sort_desc.png b/pluss-manage-page/src/main/resources/static/resources/auth/dataTables/images/sort_desc.png
new file mode 100644
index 0000000..def071e
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/dataTables/images/sort_desc.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/dataTables/images/sort_desc_disabled.png b/pluss-manage-page/src/main/resources/static/resources/auth/dataTables/images/sort_desc_disabled.png
new file mode 100644
index 0000000..7824973
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/dataTables/images/sort_desc_disabled.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/dataTables/jquery.dataTables.bs.css b/pluss-manage-page/src/main/resources/static/resources/auth/dataTables/jquery.dataTables.bs.css
new file mode 100644
index 0000000..feb15fc
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/dataTables/jquery.dataTables.bs.css
@@ -0,0 +1,114 @@
+.dataTables_paginate {
+	float: right;
+}
+
+.dataTables_paginate input {
+	width: 70px;
+	height: 20px;
+	float: left;
+}
+
+.dataTables_paginate  .paginate_button {
+	cursor: pointer;
+}
+
+.dataTables_paginate  .paginate_button,.paginate_active {
+	-moz-border-bottom-colors: none;
+	-moz-border-left-colors: none;
+	-moz-border-right-colors: none;
+	-moz-border-top-colors: none;
+	background-color: #FFFFFF;
+	border-color: #DDDDDD;
+	border-image: none;
+	border-style: solid;
+	border-width: 1px 1px 1px 0;
+	float: left;
+	line-height: 20px;
+	padding: 4px 12px;
+	text-decoration: none;
+	height: 20px;
+}
+
+.dataTables_paginate>span>.paginate_button {
+	color: #0088CC;
+}
+
+.dataTables_paginate .first {
+	border-bottom-left-radius: 4px;
+	border-left-width: 1px;
+	border-top-left-radius: 4px;
+}
+
+.dataTables_length {
+	float: left;
+	width: 80px;
+	margin-right : 10px;
+}
+
+.dataTables_length div {
+	width : 100%;
+}
+
+.dataTables_length select {
+	width: 100%;
+}
+
+.dataTables_paginate {
+	float: right;
+	width: auth;
+}
+
+.datatable-scroll {
+	overflow-x: auto;
+	overflow-y: visible;
+}
+
+.datatable-bottom {
+	margin-top : 10px;
+}
+
+.sorting_asc {
+	cursor: pointer;
+	background: url("./images/sort_asc.png") no-repeat scroll right center
+		transparent;
+}
+
+.sorting_desc {
+	cursor: pointer;
+	background: url("./images/sort_desc.png") no-repeat scroll right center
+		transparent;
+}
+
+.sorting {
+	cursor: pointer;
+	background: url("./images/sort_both.png") no-repeat scroll right center
+		transparent;
+}
+
+.dataTables_info {
+	float: left;
+	padding-top: 5px;
+}
+
+.dataTables_wrapper .table{
+    table-layout: fixed;
+    margin-bottom : 5px;
+}
+
+.dataTables_wrapper table th, .dataTables_wrapper table td {
+	text-align : center;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
+.dataTables_wrapper .table th,.dataTables_wrapper .table td {
+	text-align : center;
+}
+
+.dataTables_wrapper .align-left {
+	text-align : left !important;
+}
+.dataTables_wrapper .align-right {
+	text-align : right !important;
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/dataTables/jquery.dataTables.css b/pluss-manage-page/src/main/resources/static/resources/auth/dataTables/jquery.dataTables.css
new file mode 100644
index 0000000..aba546b
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/dataTables/jquery.dataTables.css
@@ -0,0 +1,221 @@
+
+/*
+ * Table
+ */
+table.dataTable {
+	margin: 0 auto;
+	clear: both;
+	width: 100%;
+}
+
+table.dataTable thead th {
+	padding: 3px 18px 3px 10px;
+	border-bottom: 1px solid black;
+	font-weight: bold;
+	cursor: pointer;
+	*cursor: hand;
+}
+
+table.dataTable tfoot th {
+	padding: 3px 18px 3px 10px;
+	border-top: 1px solid black;
+	font-weight: bold;
+}
+
+table.dataTable td {
+	padding: 3px 10px;
+}
+
+table.dataTable td.center,
+table.dataTable td.dataTables_empty {
+	text-align: center;
+}
+
+table.dataTable tr.odd { background-color: #E2E4FF; }
+table.dataTable tr.even { background-color: white; }
+
+table.dataTable tr.odd td.sorting_1 { background-color: #D3D6FF; }
+table.dataTable tr.odd td.sorting_2 { background-color: #DADCFF; }
+table.dataTable tr.odd td.sorting_3 { background-color: #E0E2FF; }
+table.dataTable tr.even td.sorting_1 { background-color: #EAEBFF; }
+table.dataTable tr.even td.sorting_2 { background-color: #F2F3FF; }
+table.dataTable tr.even td.sorting_3 { background-color: #F9F9FF; }
+
+
+/*
+ * Table wrapper
+ */
+.dataTables_wrapper {
+	position: relative;
+	clear: both;
+	*zoom: 1;
+}
+
+
+/*
+ * Page length menu
+ */
+.dataTables_length {
+	float: left;
+}
+
+
+/*
+ * Filter
+ */
+.dataTables_filter {
+	float: right;
+	text-align: right;
+}
+
+
+/*
+ * Table information
+ */
+.dataTables_info {
+	clear: both;
+	float: left;
+}
+
+
+/*
+ * Pagination
+ */
+.dataTables_paginate {
+	float: right;
+	text-align: right;
+}
+
+/* Two button pagination - previous / next */
+.paginate_disabled_previous,
+.paginate_enabled_previous,
+.paginate_disabled_next,
+.paginate_enabled_next {
+	height: 19px;
+	float: left;
+	cursor: pointer;
+	*cursor: hand;
+	color: #111 !important;
+}
+.paginate_disabled_previous:hover,
+.paginate_enabled_previous:hover,
+.paginate_disabled_next:hover,
+.paginate_enabled_next:hover {
+	text-decoration: none !important;
+}
+.paginate_disabled_previous:active,
+.paginate_enabled_previous:active,
+.paginate_disabled_next:active,
+.paginate_enabled_next:active {
+	outline: none;
+}
+
+.paginate_disabled_previous,
+.paginate_disabled_next {
+	color: #666 !important;
+}
+.paginate_disabled_previous,
+.paginate_enabled_previous {
+	padding-left: 23px;
+}
+.paginate_disabled_next,
+.paginate_enabled_next {
+	padding-right: 23px;
+	margin-left: 10px;
+}
+
+.paginate_enabled_previous { background: url('images/back_enabled.png') no-repeat top left; }
+.paginate_enabled_previous:hover { background: url('images/back_enabled_hover.png') no-repeat top left; }
+.paginate_disabled_previous { background: url('images/back_disabled.png') no-repeat top left; }
+
+.paginate_enabled_next { background: url('images/forward_enabled.png') no-repeat top right; }
+.paginate_enabled_next:hover { background: url('images/forward_enabled_hover.png') no-repeat top right; }
+.paginate_disabled_next { background: url('images/forward_disabled.png') no-repeat top right; }
+
+/* Full number pagination */
+.paging_full_numbers {
+	height: 22px;
+	line-height: 22px;
+}
+.paging_full_numbers a:active {
+	outline: none
+}
+.paging_full_numbers a:hover {
+	text-decoration: none;
+}
+
+.paging_full_numbers a.paginate_button,
+.paging_full_numbers a.paginate_active {
+	border: 1px solid #aaa;
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+	padding: 2px 5px;
+	margin: 0 3px;
+	cursor: pointer;
+	*cursor: hand;
+	color: #333 !important;
+}
+
+.paging_full_numbers a.paginate_button {
+	background-color: #ddd;
+}
+
+.paging_full_numbers a.paginate_button:hover {
+	background-color: #ccc;
+	text-decoration: none !important;
+}
+
+.paging_full_numbers a.paginate_active {
+	background-color: #99B3FF;
+}
+
+
+/*
+ * Processing indicator
+ */
+.dataTables_processing {
+	position: absolute;
+	top: 50%;
+	left: 50%;
+	width: 250px;
+	height: 30px;
+	margin-left: -125px;
+	margin-top: -15px;
+	padding: 14px 0 2px 0;
+	border: 1px solid #ddd;
+	text-align: center;
+	color: #999;
+	font-size: 14px;
+	background-color: white;
+}
+
+
+/*
+ * Sorting
+ */
+.list-table .sorting { background: url('images/sort_both.png') no-repeat center right; }
+.list-table  .sorting_asc { background: url('images/sort_asc.png') no-repeat center right; }
+.list-table .sorting_desc { background: url('images/sort_desc.png') no-repeat center right; }
+
+.sorting_asc_disabled { background: url('images/sort_asc_disabled.png') no-repeat center right; }
+.sorting_desc_disabled { background: url('images/sort_desc_disabled.png') no-repeat center right; }
+ 
+table.dataTable thead th:active,
+table.dataTable thead td:active {
+	outline: none;
+}
+
+
+/*
+ * Scrolling
+ */
+.dataTables_scroll {
+	clear: both;
+}
+
+.dataTables_scrollBody {
+	*margin-top: -1px;
+	-webkit-overflow-scrolling: touch;
+}
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/dataTables/jquery.dataTables.js b/pluss-manage-page/src/main/resources/static/resources/auth/dataTables/jquery.dataTables.js
new file mode 100644
index 0000000..bd97285
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/dataTables/jquery.dataTables.js
@@ -0,0 +1,6881 @@
+/*
+ * File:        jquery.dataTables.js
+ * Version:     1.7.6
+ * Description: Paginate, search and sort HTML tables
+ * Author:      Allan Jardine (www.sprymedia.co.uk)
+ * Created:     28/3/2008
+ * Language:    Javascript
+ * License:     GPL v2 or BSD 3 point style
+ * Project:     Mtaala
+ * Contact:     allan.jardine@sprymedia.co.uk
+ * 
+ * Copyright 2008-2010 Allan Jardine, all rights reserved.
+ *
+ * This source file is free software, under either the GPL v2 license or a
+ * BSD style license, as supplied with this software.
+ * 
+ * This source file is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the license files for details.
+ * 
+ * For details please refer to: http://www.datatables.net
+ */
+
+/*
+ * When considering jsLint, we need to allow eval() as it it is used for reading cookies and 
+ * building the dynamic multi-column sort functions.
+ */
+/*jslint evil: true, undef: true, browser: true */
+/*globals $, jQuery,_fnExternApiFunc,_fnInitalise,_fnInitComplete,_fnLanguageProcess,_fnAddColumn,_fnColumnOptions,_fnAddData,_fnGatherData,_fnDrawHead,_fnDraw,_fnReDraw,_fnAjaxUpdate,_fnAjaxUpdateDraw,_fnAddOptionsHtml,_fnFeatureHtmlTable,_fnScrollDraw,_fnAjustColumnSizing,_fnFeatureHtmlFilter,_fnFilterComplete,_fnFilterCustom,_fnFilterColumn,_fnFilter,_fnBuildSearchArray,_fnBuildSearchRow,_fnFilterCreateSearch,_fnDataToSearch,_fnSort,_fnSortAttachListener,_fnSortingClasses,_fnFeatureHtmlPaginate,_fnPageChange,_fnFeatureHtmlInfo,_fnUpdateInfo,_fnFeatureHtmlLength,_fnFeatureHtmlProcessing,_fnProcessingDisplay,_fnVisibleToColumnIndex,_fnColumnIndexToVisible,_fnNodeToDataIndex,_fnVisbleColumns,_fnCalculateEnd,_fnConvertToWidth,_fnCalculateColumnWidths,_fnScrollingWidthAdjust,_fnGetWidestNode,_fnGetMaxLenString,_fnStringToCss,_fnArrayCmp,_fnDetectType,_fnSettingsFromNode,_fnGetDataMaster,_fnGetTrNodes,_fnGetTdNodes,_fnEscapeRegex,_fnDeleteIndex,_fnReOrderIndex,_fnColumnOrdering,_fnLog,_fnClearTable,_fnSaveState,_fnLoadState,_fnCreateCookie,_fnReadCookie,_fnGetUniqueThs,_fnScrollBarWidth,_fnApplyToChildren,_fnMap*/
+
+(function($, window, document) {
+	/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+	 * Section - DataTables variables
+	 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+	
+	/*
+	 * Variable: dataTableSettings
+	 * Purpose:  Store the settings for each dataTables instance
+	 * Scope:    jQuery.fn
+	 */
+	$.fn.dataTableSettings = [];
+	var _aoSettings = $.fn.dataTableSettings; /* Short reference for fast internal lookup */
+	
+	/*
+	 * Variable: dataTableExt
+	 * Purpose:  Container for customisable parts of DataTables
+	 * Scope:    jQuery.fn
+	 */
+	$.fn.dataTableExt = {};
+	var _oExt = $.fn.dataTableExt;
+	
+	
+	/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+	 * Section - DataTables extensible objects
+	 * 
+	 * The _oExt object is used to provide an area where user dfined plugins can be 
+	 * added to DataTables. The following properties of the object are used:
+	 *   oApi - Plug-in API functions
+	 *   aTypes - Auto-detection of types
+	 *   oSort - Sorting functions used by DataTables (based on the type)
+	 *   oPagination - Pagination functions for different input styles
+	 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+	
+	/*
+	 * Variable: sVersion
+	 * Purpose:  Version string for plug-ins to check compatibility
+	 * Scope:    jQuery.fn.dataTableExt
+	 * Notes:    Allowed format is a.b.c.d.e where:
+	 *   a:int, b:int, c:int, d:string(dev|beta), e:int. d and e are optional
+	 */
+	_oExt.sVersion = "1.7.6";
+	
+	/*
+	 * Variable: sErrMode
+	 * Purpose:  How should DataTables report an error. Can take the value 'alert' or 'throw'
+	 * Scope:    jQuery.fn.dataTableExt
+	 */
+	_oExt.sErrMode = "alert";
+	
+	/*
+	 * Variable: iApiIndex
+	 * Purpose:  Index for what 'this' index API functions should use
+	 * Scope:    jQuery.fn.dataTableExt
+	 */
+	_oExt.iApiIndex = 0;
+	
+	/*
+	 * Variable: oApi
+	 * Purpose:  Container for plugin API functions
+	 * Scope:    jQuery.fn.dataTableExt
+	 */
+	_oExt.oApi = { };
+	
+	/*
+	 * Variable: aFiltering
+	 * Purpose:  Container for plugin filtering functions
+	 * Scope:    jQuery.fn.dataTableExt
+	 */
+	_oExt.afnFiltering = [ ];
+	
+	/*
+	 * Variable: aoFeatures
+	 * Purpose:  Container for plugin function functions
+	 * Scope:    jQuery.fn.dataTableExt
+	 * Notes:    Array of objects with the following parameters:
+	 *   fnInit: Function for initialisation of Feature. Takes oSettings and returns node
+	 *   cFeature: Character that will be matched in sDom - case sensitive
+	 *   sFeature: Feature name - just for completeness :-)
+	 */
+	_oExt.aoFeatures = [ ];
+	
+	/*
+	 * Variable: ofnSearch
+	 * Purpose:  Container for custom filtering functions
+	 * Scope:    jQuery.fn.dataTableExt
+	 * Notes:    This is an object (the name should match the type) for custom filtering function,
+	 *   which can be used for live DOM checking or formatted text filtering
+	 */
+	_oExt.ofnSearch = { };
+	
+	/*
+	 * Variable: afnSortData
+	 * Purpose:  Container for custom sorting data source functions
+	 * Scope:    jQuery.fn.dataTableExt
+	 * Notes:    Array (associative) of functions which is run prior to a column of this 
+	 *   'SortDataType' being sorted upon.
+	 *   Function input parameters:
+	 *     object:oSettings-  DataTables settings object
+	 *     int:iColumn - Target column number
+	 *   Return value: Array of data which exactly matched the full data set size for the column to
+	 *     be sorted upon
+	 */
+	_oExt.afnSortData = [ ];
+	
+	/*
+	 * Variable: oStdClasses
+	 * Purpose:  Storage for the various classes that DataTables uses
+	 * Scope:    jQuery.fn.dataTableExt
+	 */
+	_oExt.oStdClasses = {
+		/* Two buttons buttons */
+		"sPagePrevEnabled": "paginate_enabled_previous",
+		"sPagePrevDisabled": "paginate_disabled_previous",
+		"sPageNextEnabled": "paginate_enabled_next",
+		"sPageNextDisabled": "paginate_disabled_next",
+		"sPageJUINext": "",
+		"sPageJUIPrev": "",
+		
+		/* Full numbers paging buttons */
+		"sPageButton": "paginate_button",
+		"sPageButtonActive": "paginate_active",
+		"sPageButtonStaticDisabled": "paginate_button",
+		"sPageFirst": "first",
+		"sPagePrevious": "previous",
+		"sPageNext": "next",
+		"sPageLast": "last",
+		
+		/* Stripping classes */
+		"sStripOdd": "odd",
+		"sStripEven": "even",
+		
+		/* Empty row */
+		"sRowEmpty": "dataTables_empty",
+		
+		/* Features */
+		"sWrapper": "dataTables_wrapper",
+		"sFilter": "dataTables_filter",
+		"sInfo": "dataTables_info",
+		"sPaging": "dataTables_paginate paging_", /* Note that the type is postfixed */
+		"sLength": "dataTables_length",
+		"sProcessing": "dataTables_processing",
+		
+		/* Sorting */
+		"sSortAsc": "sorting_asc",
+		"sSortDesc": "sorting_desc",
+		"sSortable": "sorting", /* Sortable in both directions */
+		"sSortableAsc": "sorting_asc_disabled",
+		"sSortableDesc": "sorting_desc_disabled",
+		"sSortableNone": "sorting_disabled",
+		"sSortColumn": "sorting_", /* Note that an int is postfixed for the sorting order */
+		"sSortJUIAsc": "",
+		"sSortJUIDesc": "",
+		"sSortJUI": "",
+		"sSortJUIAscAllowed": "",
+		"sSortJUIDescAllowed": "",
+		"sSortJUIWrapper": "",
+		
+		/* Scrolling */
+		"sScrollWrapper": "dataTables_scroll",
+		"sScrollHead": "dataTables_scrollHead",
+		"sScrollHeadInner": "dataTables_scrollHeadInner",
+		"sScrollBody": "dataTables_scrollBody",
+		"sScrollFoot": "dataTables_scrollFoot",
+		"sScrollFootInner": "dataTables_scrollFootInner",
+		
+		/* Misc */
+		"sFooterTH": ""
+	};
+	
+	/*
+	 * Variable: oJUIClasses
+	 * Purpose:  Storage for the various classes that DataTables uses - jQuery UI suitable
+	 * Scope:    jQuery.fn.dataTableExt
+	 */
+	_oExt.oJUIClasses = {
+		/* Two buttons buttons */
+		"sPagePrevEnabled": "fg-button ui-button ui-state-default ui-corner-left",
+		"sPagePrevDisabled": "fg-button ui-button ui-state-default ui-corner-left ui-state-disabled",
+		"sPageNextEnabled": "fg-button ui-button ui-state-default ui-corner-right",
+		"sPageNextDisabled": "fg-button ui-button ui-state-default ui-corner-right ui-state-disabled",
+		"sPageJUINext": "ui-icon ui-icon-circle-arrow-e",
+		"sPageJUIPrev": "ui-icon ui-icon-circle-arrow-w",
+		
+		/* Full numbers paging buttons */
+		"sPageButton": "fg-button ui-button ui-state-default",
+		"sPageButtonActive": "fg-button ui-button ui-state-default ui-state-disabled",
+		"sPageButtonStaticDisabled": "fg-button ui-button ui-state-default ui-state-disabled",
+		"sPageFirst": "first ui-corner-tl ui-corner-bl",
+		"sPagePrevious": "previous",
+		"sPageNext": "next",
+		"sPageLast": "last ui-corner-tr ui-corner-br",
+		
+		/* Stripping classes */
+		"sStripOdd": "odd",
+		"sStripEven": "even",
+		
+		/* Empty row */
+		"sRowEmpty": "dataTables_empty",
+		
+		/* Features */
+		"sWrapper": "dataTables_wrapper",
+		"sFilter": "dataTables_filter",
+		"sInfo": "dataTables_info",
+		"sPaging": "dataTables_paginate fg-buttonset ui-buttonset fg-buttonset-multi "+
+			"ui-buttonset-multi paging_", /* Note that the type is postfixed */
+		"sLength": "dataTables_length",
+		"sProcessing": "dataTables_processing",
+		
+		/* Sorting */
+		"sSortAsc": "ui-state-default",
+		"sSortDesc": "ui-state-default",
+		"sSortable": "ui-state-default",
+		"sSortableAsc": "ui-state-default",
+		"sSortableDesc": "ui-state-default",
+		"sSortableNone": "ui-state-default",
+		"sSortColumn": "sorting_", /* Note that an int is postfixed for the sorting order */
+		"sSortJUIAsc": "css_right ui-icon ui-icon-triangle-1-n",
+		"sSortJUIDesc": "css_right ui-icon ui-icon-triangle-1-s",
+		"sSortJUI": "css_right ui-icon ui-icon-carat-2-n-s",
+		"sSortJUIAscAllowed": "css_right ui-icon ui-icon-carat-1-n",
+		"sSortJUIDescAllowed": "css_right ui-icon ui-icon-carat-1-s",
+		"sSortJUIWrapper": "DataTables_sort_wrapper",
+		
+		/* Scrolling */
+		"sScrollWrapper": "dataTables_scroll",
+		"sScrollHead": "dataTables_scrollHead ui-state-default",
+		"sScrollHeadInner": "dataTables_scrollHeadInner",
+		"sScrollBody": "dataTables_scrollBody",
+		"sScrollFoot": "dataTables_scrollFoot ui-state-default",
+		"sScrollFootInner": "dataTables_scrollFootInner",
+		
+		/* Misc */
+		"sFooterTH": "ui-state-default"
+	};
+	
+	/*
+	 * Variable: oPagination
+	 * Purpose:  Container for the various type of pagination that dataTables supports
+	 * Scope:    jQuery.fn.dataTableExt
+	 */
+	_oExt.oPagination = {
+		/*
+		 * Variable: two_button
+		 * Purpose:  Standard two button (forward/back) pagination
+	 	 * Scope:    jQuery.fn.dataTableExt.oPagination
+		 */
+		"two_button": {
+			/*
+			 * Function: oPagination.two_button.fnInit
+			 * Purpose:  Initalise dom elements required for pagination with forward/back buttons only
+			 * Returns:  -
+	 		 * Inputs:   object:oSettings - dataTables settings object
+	     *           node:nPaging - the DIV which contains this pagination control
+			 *           function:fnCallbackDraw - draw function which must be called on update
+			 */
+			"fnInit": function ( oSettings, nPaging, fnCallbackDraw )
+			{
+				var nPrevious, nNext, nPreviousInner, nNextInner;
+				
+				/* Store the next and previous elements in the oSettings object as they can be very
+				 * usful for automation - particularly testing
+				 */
+				if ( !oSettings.bJUI )
+				{
+					nPrevious = document.createElement( 'div' );
+					nNext = document.createElement( 'div' );
+				}
+				else
+				{
+					nPrevious = document.createElement( 'a' );
+					nNext = document.createElement( 'a' );
+					
+					nNextInner = document.createElement('span');
+					nNextInner.className = oSettings.oClasses.sPageJUINext;
+					nNext.appendChild( nNextInner );
+					
+					nPreviousInner = document.createElement('span');
+					nPreviousInner.className = oSettings.oClasses.sPageJUIPrev;
+					nPrevious.appendChild( nPreviousInner );
+				}
+				
+				nPrevious.className = oSettings.oClasses.sPagePrevDisabled;
+				nNext.className = oSettings.oClasses.sPageNextDisabled;
+				
+				nPrevious.title = oSettings.oLanguage.oPaginate.sPrevious;
+				nNext.title = oSettings.oLanguage.oPaginate.sNext;
+				
+				nPaging.appendChild( nPrevious );
+				nPaging.appendChild( nNext );
+				
+				$(nPrevious).bind( 'click.DT', function() {
+					if ( oSettings.oApi._fnPageChange( oSettings, "previous" ) )
+					{
+						/* Only draw when the page has actually changed */
+						fnCallbackDraw( oSettings );
+					}
+				} );
+				
+				$(nNext).bind( 'click.DT', function() {
+					if ( oSettings.oApi._fnPageChange( oSettings, "next" ) )
+					{
+						fnCallbackDraw( oSettings );
+					}
+				} );
+				
+				/* Take the brutal approach to cancelling text selection */
+				$(nPrevious).bind( 'selectstart.DT', function () { return false; } );
+				$(nNext).bind( 'selectstart.DT', function () { return false; } );
+				
+				/* ID the first elements only */
+				if ( oSettings.sTableId !== '' && typeof oSettings.aanFeatures.p == "undefined" )
+				{
+					nPaging.setAttribute( 'id', oSettings.sTableId+'_paginate' );
+					nPrevious.setAttribute( 'id', oSettings.sTableId+'_previous' );
+					nNext.setAttribute( 'id', oSettings.sTableId+'_next' );
+				}
+			},
+			
+			/*
+			 * Function: oPagination.two_button.fnUpdate
+			 * Purpose:  Update the two button pagination at the end of the draw
+			 * Returns:  -
+	 		 * Inputs:   object:oSettings - dataTables settings object
+			 *           function:fnCallbackDraw - draw function to call on page change
+			 */
+			"fnUpdate": function ( oSettings, fnCallbackDraw )
+			{
+				if ( !oSettings.aanFeatures.p )
+				{
+					return;
+				}
+				
+				/* Loop over each instance of the pager */
+				var an = oSettings.aanFeatures.p;
+				for ( var i=0, iLen=an.length ; i<iLen ; i++ )
+				{
+					if ( an[i].childNodes.length !== 0 )
+					{
+						an[i].childNodes[0].className = 
+							( oSettings._iDisplayStart === 0 ) ? 
+							oSettings.oClasses.sPagePrevDisabled : oSettings.oClasses.sPagePrevEnabled;
+						
+						an[i].childNodes[1].className = 
+							( oSettings.fnDisplayEnd() == oSettings.fnRecordsDisplay() ) ? 
+							oSettings.oClasses.sPageNextDisabled : oSettings.oClasses.sPageNextEnabled;
+					}
+				}
+			}
+		},
+		
+		
+		/*
+		 * Variable: iFullNumbersShowPages
+		 * Purpose:  Change the number of pages which can be seen
+	 	 * Scope:    jQuery.fn.dataTableExt.oPagination
+		 */
+		"iFullNumbersShowPages": 5,
+		
+		/*
+		 * Variable: full_numbers
+		 * Purpose:  Full numbers pagination
+	 	 * Scope:    jQuery.fn.dataTableExt.oPagination
+		 */
+		"full_numbers": {
+			/*
+			 * Function: oPagination.full_numbers.fnInit
+			 * Purpose:  Initalise dom elements required for pagination with a list of the pages
+			 * Returns:  -
+	 		 * Inputs:   object:oSettings - dataTables settings object
+	     *           node:nPaging - the DIV which contains this pagination control
+			 *           function:fnCallbackDraw - draw function which must be called on update
+			 */
+			"fnInit": function ( oSettings, nPaging, fnCallbackDraw )
+			{
+				var nFirst = document.createElement( 'span' );
+				var nPrevious = document.createElement( 'span' );
+				var nList = document.createElement( 'span' );
+				var nNext = document.createElement( 'span' );
+				var nLast = document.createElement( 'span' );
+				var nInput = document.createElement( 'input' );
+				var nButton = document.createElement( 'span' );
+				var nInputObj = $(nInput);
+				var nButtonObj = $(nButton);
+				nInputObj.addClass("jumpinput");
+				nInputObj.attr("type","text");
+				nInputObj.attr("placeholder","输入跳转页");
+				nInputObj.attr("maxLength","6");
+				nInputObj.attr("size","6");
+				nButtonObj.addClass("jumpbutton");
+				nButtonObj.addClass("paginate_button");
+				
+				nFirst.innerHTML = oSettings.oLanguage.oPaginate.sFirst;
+				nPrevious.innerHTML = oSettings.oLanguage.oPaginate.sPrevious;
+				nNext.innerHTML = oSettings.oLanguage.oPaginate.sNext;
+				nLast.innerHTML = oSettings.oLanguage.oPaginate.sLast;
+				nButton.innerHTML = "跳转";
+				
+				var oClasses = oSettings.oClasses;
+				nFirst.className = oClasses.sPageButton+" "+oClasses.sPageFirst;
+				nPrevious.className = oClasses.sPageButton+" "+oClasses.sPagePrevious;
+				nNext.className= oClasses.sPageButton+" "+oClasses.sPageNext;
+				nLast.className = oClasses.sPageButton+" "+oClasses.sPageLast;
+				
+				nPaging.appendChild( nFirst );
+				nPaging.appendChild( nPrevious );
+				nPaging.appendChild( nList );
+				nPaging.appendChild( nNext );
+				nPaging.appendChild( nLast );
+				nPaging.appendChild( nInput );
+				nPaging.appendChild( nButton );
+				
+				$(nFirst).bind( 'click.DT', function () {
+					if ( oSettings.oApi._fnPageChange( oSettings, "first" ) )
+					{
+						fnCallbackDraw( oSettings );
+					}
+				} );
+				
+				nButtonObj.bind( 'click.DT',function(){
+					var $jumpSpan = $(this).parent().find("span.jumpnum");
+					$jumpSpan[0].innerHTML = nInput.value;
+					$jumpSpan.click();
+				} );
+				
+				$(nPrevious).bind( 'click.DT', function() {
+					if ( oSettings.oApi._fnPageChange( oSettings, "previous" ) )
+					{
+						fnCallbackDraw( oSettings );
+					}
+				} );
+				
+				$(nNext).bind( 'click.DT', function() {
+					if ( oSettings.oApi._fnPageChange( oSettings, "next" ) )
+					{
+						fnCallbackDraw( oSettings );
+					}
+				} );
+				
+				$(nLast).bind( 'click.DT', function() {
+					if ( oSettings.oApi._fnPageChange( oSettings, "last" ) )
+					{
+						fnCallbackDraw( oSettings );
+					}
+				} );
+				
+				/* Take the brutal approach to cancelling text selection */
+				$('span', nPaging)
+					.bind( 'mousedown.DT', function () { return false; } )
+					.bind( 'selectstart.DT', function () { return false; } );
+				
+				/* ID the first elements only */
+				if ( oSettings.sTableId !== '' && typeof oSettings.aanFeatures.p == "undefined" )
+				{
+					nPaging.setAttribute( 'id', oSettings.sTableId+'_paginate' );
+					nFirst.setAttribute( 'id', oSettings.sTableId+'_first' );
+					nPrevious.setAttribute( 'id', oSettings.sTableId+'_previous' );
+					nNext.setAttribute( 'id', oSettings.sTableId+'_next' );
+					nLast.setAttribute( 'id', oSettings.sTableId+'_last' );
+				}
+			},
+			
+			/*
+			 * Function: oPagination.full_numbers.fnUpdate
+			 * Purpose:  Update the list of page buttons shows
+			 * Returns:  -
+	 		 * Inputs:   object:oSettings - dataTables settings object
+			 *           function:fnCallbackDraw - draw function to call on page change
+			 */
+			"fnUpdate": function ( oSettings, fnCallbackDraw )
+			{
+				if ( !oSettings.aanFeatures.p )
+				{
+					return;
+				}
+				
+				var iPageCount = _oExt.oPagination.iFullNumbersShowPages;
+				var iPageCountHalf = Math.floor(iPageCount / 2);
+				var iPages = Math.ceil((oSettings.fnRecordsDisplay()) / oSettings._iDisplayLength);
+				var iCurrentPage = Math.ceil(oSettings._iDisplayStart / oSettings._iDisplayLength) + 1;
+				var sList = "";
+				var iStartButton, iEndButton, i, iLen;
+				var oClasses = oSettings.oClasses;
+				
+				/* Pages calculation */
+				if (iPages < iPageCount)
+				{
+					iStartButton = 1;
+					iEndButton = iPages;
+				}
+				else
+				{
+					if (iCurrentPage <= iPageCountHalf)
+					{
+						iStartButton = 1;
+						iEndButton = iPageCount;
+					}
+					else
+					{
+						if (iCurrentPage >= (iPages - iPageCountHalf))
+						{
+							iStartButton = iPages - iPageCount + 1;
+							iEndButton = iPages;
+						}
+						else
+						{
+							iStartButton = iCurrentPage - Math.ceil(iPageCount / 2) + 1;
+							iEndButton = iStartButton + iPageCount - 1;
+						}
+					}
+				}
+				
+				/* Build the dynamic list */
+				for ( i=iStartButton ; i<=iEndButton ; i++ )
+				{
+					if ( iCurrentPage != i )
+					{
+						sList += '<span class="'+oClasses.sPageButton+'">'+i+'</span>';
+					}
+					else
+					{
+						sList += '<span class="'+oClasses.sPageButtonActive+'">'+i+'</span>';
+					}
+				}
+				sList += '<span class="'+oClasses.sPageButton+', jumpnum" style="display:none">' + iCurrentPage + '</span>';
+				/* Loop over each instance of the pager */
+				var an = oSettings.aanFeatures.p;
+				var anButtons, anStatic;
+				var fnClick = function() {
+					/* Use the information in the element to jump to the required page */
+					if(!/^[0-9]+$/.test(this.innerHTML)){
+						return false;
+					}
+					var iTarget = (this.innerHTML * 1) - 1;
+					if(iTarget >= iPages){
+						iTarget = iPages - 1;
+					}
+					if(iTarget < 0){
+						iTarget = 0;
+					}
+					oSettings._iDisplayStart = iTarget * oSettings._iDisplayLength;
+					fnCallbackDraw( oSettings );
+					return false;
+				};
+				var fnFalse = function () { return false; };
+				
+				for ( i=0, iLen=an.length ; i<iLen ; i++ )
+				{
+					if ( an[i].childNodes.length === 0 )
+					{
+						continue;
+					}
+					
+					/* Build up the dynamic list forst - html and listeners */
+					var qjPaginateList = $('span:eq(2)', an[i]);
+					qjPaginateList.html( sList );
+					$('span', qjPaginateList).bind( 'click.DT', fnClick ).bind( 'mousedown.DT', fnFalse )
+						.bind( 'selectstart.DT', fnFalse );
+					
+					/* Update the 'premanent botton's classes */
+					anButtons = an[i].getElementsByTagName('span');
+					anStatic = [
+						anButtons[0], anButtons[1], 
+						anButtons[anButtons.length-2], anButtons[anButtons.length-1]
+					];
+					$(anStatic).removeClass( oClasses.sPageButton+" "+oClasses.sPageButtonActive+" "+oClasses.sPageButtonStaticDisabled );
+					if ( iCurrentPage == 1 )
+					{
+						anStatic[0].className += " "+oClasses.sPageButtonStaticDisabled;
+						anStatic[1].className += " "+oClasses.sPageButtonStaticDisabled;
+					}
+					else
+					{
+						anStatic[0].className += " "+oClasses.sPageButton;
+						anStatic[1].className += " "+oClasses.sPageButton;
+					}
+					
+					if ( iPages === 0 || iCurrentPage == iPages || oSettings._iDisplayLength == -1 )
+					{
+						anStatic[2].className += " "+oClasses.sPageButtonStaticDisabled;
+						anStatic[3].className += " "+oClasses.sPageButtonStaticDisabled;
+					}
+					else
+					{
+						anStatic[2].className += " "+oClasses.sPageButton;
+						anStatic[3].className += " "+oClasses.sPageButton;
+					}
+				}
+			}
+		}
+	};
+	
+	/*
+	 * Variable: oSort
+	 * Purpose:  Wrapper for the sorting functions that can be used in DataTables
+	 * Scope:    jQuery.fn.dataTableExt
+	 * Notes:    The functions provided in this object are basically standard javascript sort
+	 *   functions - they expect two inputs which they then compare and then return a priority
+	 *   result. For each sort method added, two functions need to be defined, an ascending sort and
+	 *   a descending sort.
+	 */
+	_oExt.oSort = {
+		/*
+		 * text sorting
+		 */
+		"string-asc": function ( a, b )
+		{
+			var x = a.toLowerCase();
+			var y = b.toLowerCase();
+			return ((x < y) ? -1 : ((x > y) ? 1 : 0));
+		},
+		
+		"string-desc": function ( a, b )
+		{
+			var x = a.toLowerCase();
+			var y = b.toLowerCase();
+			return ((x < y) ? 1 : ((x > y) ? -1 : 0));
+		},
+		
+		
+		/*
+		 * html sorting (ignore html tags)
+		 */
+		"html-asc": function ( a, b )
+		{
+			var x = a.replace( /<.*?>/g, "" ).toLowerCase();
+			var y = b.replace( /<.*?>/g, "" ).toLowerCase();
+			return ((x < y) ? -1 : ((x > y) ? 1 : 0));
+		},
+		
+		"html-desc": function ( a, b )
+		{
+			var x = a.replace( /<.*?>/g, "" ).toLowerCase();
+			var y = b.replace( /<.*?>/g, "" ).toLowerCase();
+			return ((x < y) ? 1 : ((x > y) ? -1 : 0));
+		},
+		
+		
+		/*
+		 * date sorting
+		 */
+		"date-asc": function ( a, b )
+		{
+			var x = Date.parse( a );
+			var y = Date.parse( b );
+			
+			if ( isNaN(x) || x==="" )
+			{
+    		x = Date.parse( "01/01/1970 00:00:00" );
+			}
+			if ( isNaN(y) || y==="" )
+			{
+				y =	Date.parse( "01/01/1970 00:00:00" );
+			}
+			
+			return x - y;
+		},
+		
+		"date-desc": function ( a, b )
+		{
+			var x = Date.parse( a );
+			var y = Date.parse( b );
+			
+			if ( isNaN(x) || x==="" )
+			{
+    		x = Date.parse( "01/01/1970 00:00:00" );
+			}
+			if ( isNaN(y) || y==="" )
+			{
+				y =	Date.parse( "01/01/1970 00:00:00" );
+			}
+			
+			return y - x;
+		},
+		
+		
+		/*
+		 * numerical sorting
+		 */
+		"numeric-asc": function ( a, b )
+		{
+			var x = (a=="-" || a==="") ? 0 : a*1;
+			var y = (b=="-" || b==="") ? 0 : b*1;
+			return x - y;
+		},
+		
+		"numeric-desc": function ( a, b )
+		{
+			var x = (a=="-" || a==="") ? 0 : a*1;
+			var y = (b=="-" || b==="") ? 0 : b*1;
+			return y - x;
+		}
+	};
+	
+	
+	/*
+	 * Variable: aTypes
+	 * Purpose:  Container for the various type of type detection that dataTables supports
+	 * Scope:    jQuery.fn.dataTableExt
+	 * Notes:    The functions in this array are expected to parse a string to see if it is a data
+	 *   type that it recognises. If so then the function should return the name of the type (a
+	 *   corresponding sort function should be defined!), if the type is not recognised then the
+	 *   function should return null such that the parser and move on to check the next type.
+	 *   Note that ordering is important in this array - the functions are processed linearly,
+	 *   starting at index 0.
+	 *   Note that the input for these functions is always a string! It cannot be any other data
+	 *   type
+	 */
+	_oExt.aTypes = [
+		/*
+		 * Function: -
+		 * Purpose:  Check to see if a string is numeric
+		 * Returns:  string:'numeric' or null
+		 * Inputs:   string:sText - string to check
+		 */
+		function ( sData )
+		{
+			/* Allow zero length strings as a number */
+			if ( sData.length === 0 )
+			{
+				return 'numeric';
+			}
+			
+			var sValidFirstChars = "0123456789-";
+			var sValidChars = "0123456789.";
+			var Char;
+			var bDecimal = false;
+			
+			/* Check for a valid first char (no period and allow negatives) */
+			Char = sData.charAt(0); 
+			if (sValidFirstChars.indexOf(Char) == -1) 
+			{
+				return null;
+			}
+			
+			/* Check all the other characters are valid */
+			for ( var i=1 ; i<sData.length ; i++ ) 
+			{
+				Char = sData.charAt(i); 
+				if (sValidChars.indexOf(Char) == -1) 
+				{
+					return null;
+				}
+				
+				/* Only allowed one decimal place... */
+				if ( Char == "." )
+				{
+					if ( bDecimal )
+					{
+						return null;
+					}
+					bDecimal = true;
+				}
+			}
+			
+			return 'numeric';
+		},
+		
+		/*
+		 * Function: -
+		 * Purpose:  Check to see if a string is actually a formatted date
+		 * Returns:  string:'date' or null
+		 * Inputs:   string:sText - string to check
+		 */
+		function ( sData )
+		{
+			var iParse = Date.parse(sData);
+			if ( (iParse !== null && !isNaN(iParse)) || sData.length === 0 )
+			{
+				return 'date';
+			}
+			return null;
+		},
+		
+		/*
+		 * Function: -
+		 * Purpose:  Check to see if a string should be treated as an HTML string
+		 * Returns:  string:'html' or null
+		 * Inputs:   string:sText - string to check
+		 */
+		function ( sData )
+		{
+			if ( sData.indexOf('<') != -1 && sData.indexOf('>') != -1 )
+			{
+				return 'html';
+			}
+			return null;
+		}
+	];
+	
+	/*
+	 * Function: fnVersionCheck
+	 * Purpose:  Check a version string against this version of DataTables. Useful for plug-ins
+	 * Returns:  bool:true -this version of DataTables is greater or equal to the required version
+	 *                false -this version of DataTales is not suitable
+	 * Inputs:   string:sVersion - the version to check against. May be in the following formats:
+	 *             "a", "a.b" or "a.b.c"
+	 * Notes:    This function will only check the first three parts of a version string. It is
+	 *   assumed that beta and dev versions will meet the requirements. This might change in future
+	 */
+	_oExt.fnVersionCheck = function( sVersion )
+	{
+		/* This is cheap, but very effective */
+		var fnZPad = function (Zpad, count)
+		{
+			while(Zpad.length < count) {
+				Zpad += '0';
+			}
+			return Zpad;
+		};
+		var aThis = _oExt.sVersion.split('.');
+		var aThat = sVersion.split('.');
+		var sThis = '', sThat = '';
+		
+		for ( var i=0, iLen=aThat.length ; i<iLen ; i++ )
+		{
+			sThis += fnZPad( aThis[i], 3 );
+			sThat += fnZPad( aThat[i], 3 );
+		}
+		
+		return parseInt(sThis, 10) >= parseInt(sThat, 10);
+	};
+	
+	/*
+	 * Variable: _oExternConfig
+	 * Purpose:  Store information for DataTables to access globally about other instances
+	 * Scope:    jQuery.fn.dataTableExt
+	 */
+	_oExt._oExternConfig = {
+		/* int:iNextUnique - next unique number for an instance */
+		"iNextUnique": 0
+	};
+	
+	
+	/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+	 * Section - DataTables prototype
+	 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+	
+	/*
+	 * Function: dataTable
+	 * Purpose:  DataTables information
+	 * Returns:  -
+	 * Inputs:   object:oInit - initalisation options for the table
+	 */
+	$.fn.dataTable = function( oInit )
+	{
+		/*
+		 * Function: classSettings
+		 * Purpose:  Settings container function for all 'class' properties which are required
+		 *   by dataTables
+		 * Returns:  -
+		 * Inputs:   -
+		 */
+		function classSettings ()
+		{
+			this.fnRecordsTotal = function ()
+			{
+				if ( this.oFeatures.bServerSide ) {
+					return parseInt(this._iRecordsTotal, 10);
+				} else {
+					return this.aiDisplayMaster.length;
+				}
+			};
+			
+			this.fnRecordsDisplay = function ()
+			{
+				if ( this.oFeatures.bServerSide ) {
+					return parseInt(this._iRecordsDisplay, 10);
+				} else {
+					return this.aiDisplay.length;
+				}
+			};
+			
+			this.fnDisplayEnd = function ()
+			{
+				if ( this.oFeatures.bServerSide ) {
+					if ( this.oFeatures.bPaginate === false || this._iDisplayLength == -1 ) {
+						return this._iDisplayStart+this.aiDisplay.length;
+					} else {
+						return Math.min( this._iDisplayStart+this._iDisplayLength, 
+							this._iRecordsDisplay );
+					}
+				} else {
+					return this._iDisplayEnd;
+				}
+			};
+			
+			/*
+			 * Variable: oInstance
+			 * Purpose:  The DataTables object for this table
+			 * Scope:    jQuery.dataTable.classSettings 
+			 */
+			this.oInstance = null;
+			
+			/*
+			 * Variable: sInstance
+			 * Purpose:  Unique idendifier for each instance of the DataTables object
+			 * Scope:    jQuery.dataTable.classSettings 
+			 */
+			this.sInstance = null;
+			
+			/*
+			 * Variable: oFeatures
+			 * Purpose:  Indicate the enablement of key dataTable features
+			 * Scope:    jQuery.dataTable.classSettings 
+			 */
+			this.oFeatures = {
+				"bPaginate": true,
+				"bLengthChange": true,
+				"bFilter": true,
+				"bSort": true,
+				"bInfo": true,
+				"bAutoWidth": true,
+				"bProcessing": false,
+				"bSortClasses": true,
+				"bStateSave": false,
+				"bServerSide": false
+			};
+			
+			/*
+			 * Variable: oScroll
+			 * Purpose:  Container for scrolling options
+			 * Scope:    jQuery.dataTable.classSettings 
+			 */
+			this.oScroll = {
+				"sX": "",
+				"sXInner": "",
+				"sY": "",
+				"bCollapse": false,
+				"bInfinite": false,
+				"iLoadGap": 100,
+				"iBarWidth": 0,
+				"bAutoCss": true
+			};
+			
+			/*
+			 * Variable: aanFeatures
+			 * Purpose:  Array referencing the nodes which are used for the features
+			 * Scope:    jQuery.dataTable.classSettings 
+			 * Notes:    The parameters of this object match what is allowed by sDom - i.e.
+			 *   'l' - Length changing
+			 *   'f' - Filtering input
+			 *   't' - The table!
+			 *   'i' - Information
+			 *   'p' - Pagination
+			 *   'r' - pRocessing
+			 */
+			this.aanFeatures = [];
+			
+			/*
+			 * Variable: oLanguage
+			 * Purpose:  Store the language strings used by dataTables
+			 * Scope:    jQuery.dataTable.classSettings
+			 * Notes:    The words in the format _VAR_ are variables which are dynamically replaced
+			 *   by javascript
+			 */
+			this.oLanguage = {
+				"sProcessing": "Processing...",
+				"sLengthMenu": "Show _MENU_ entries",
+				"sZeroRecords": "No matching records found",
+				"sEmptyTable": "No data available in table",
+				"sInfo": "Showing _START_ to _END_ of _TOTAL_ entries",
+				"sInfoEmpty": "Showing 0 to 0 of 0 entries",
+				"sInfoFiltered": "(filtered from _MAX_ total entries)",
+				"sInfoPostFix": "",
+				"sSearch": "Search:",
+				"sUrl": "",
+				"oPaginate": {
+					"sFirst":    "First",
+					"sPrevious": "Previous",
+					"sNext":     "Next",
+					"sLast":     "Last"
+				},
+				"fnInfoCallback": null
+			};
+			
+			/*
+			 * Variable: aoData
+			 * Purpose:  Store data information
+			 * Scope:    jQuery.dataTable.classSettings 
+			 * Notes:    This is an array of objects with the following parameters:
+			 *   int: _iId - internal id for tracking
+			 *   array: _aData - internal data - used for sorting / filtering etc
+			 *   node: nTr - display node
+			 *   array node: _anHidden - hidden TD nodes
+			 *   string: _sRowStripe
+			 */
+			this.aoData = [];
+			
+			/*
+			 * Variable: aiDisplay
+			 * Purpose:  Array of indexes which are in the current display (after filtering etc)
+			 * Scope:    jQuery.dataTable.classSettings
+			 */
+			this.aiDisplay = [];
+			
+			/*
+			 * Variable: aiDisplayMaster
+			 * Purpose:  Array of indexes for display - no filtering
+			 * Scope:    jQuery.dataTable.classSettings
+			 */
+			this.aiDisplayMaster = [];
+							
+			/*
+			 * Variable: aoColumns
+			 * Purpose:  Store information about each column that is in use
+			 * Scope:    jQuery.dataTable.classSettings 
+			 */
+			this.aoColumns = [];
+			
+			/* Scope:    jQuery.dataTable.classSettings 
+			 */
+			this.iNextId = 0;
+			
+			/*
+			 * Variable: asDataSearch
+			 * Purpose:  Search data array for regular expression searching
+			 * Scope:    jQuery.dataTable.classSettings
+			 */
+			this.asDataSearch = [];
+			
+			/*
+			 * Variable: oPreviousSearch
+			 * Purpose:  Store the previous search incase we want to force a re-search
+			 *   or compare the old search to a new one
+			 * Scope:    jQuery.dataTable.classSettings
+			 */
+			this.oPreviousSearch = {
+				"sSearch": "",
+				"bRegex": false,
+				"bSmart": true
+			};
+			
+			/*
+			 * Variable: aoPreSearchCols
+			 * Purpose:  Store the previous search for each column
+			 * Scope:    jQuery.dataTable.classSettings
+			 */
+			this.aoPreSearchCols = [];
+			
+			/*
+			 * Variable: aaSorting
+			 * Purpose:  Sorting information
+			 * Scope:    jQuery.dataTable.classSettings
+			 * Notes:    Index 0 - column number
+			 *           Index 1 - current sorting direction
+			 *           Index 2 - index of asSorting for this column
+			 */
+			this.aaSorting = [ [0, 'asc', 0] ];
+			
+			/*
+			 * Variable: aaSortingFixed
+			 * Purpose:  Sorting information that is always applied
+			 * Scope:    jQuery.dataTable.classSettings
+			 */
+			this.aaSortingFixed = null;
+			
+			/*
+			 * Variable: asStripClasses
+			 * Purpose:  Classes to use for the striping of a table
+			 * Scope:    jQuery.dataTable.classSettings
+			 */
+			this.asStripClasses = [];
+			
+			/*
+			 * Variable: asDestoryStrips
+			 * Purpose:  If restoring a table - we should restore it's striping classes as well
+			 * Scope:    jQuery.dataTable.classSettings
+			 */
+			this.asDestoryStrips = [];
+			
+			/*
+			 * Variable: sDestroyWidth
+			 * Purpose:  If restoring a table - we should restore it's width
+			 * Scope:    jQuery.dataTable.classSettings
+			 */
+			this.sDestroyWidth = 0;
+			
+			/*
+			 * Variable: fnRowCallback
+			 * Purpose:  Call this function every time a row is inserted (draw)
+			 * Scope:    jQuery.dataTable.classSettings
+			 */
+			this.fnRowCallback = null;
+			
+			/*
+			 * Variable: fnHeaderCallback
+			 * Purpose:  Callback function for the header on each draw
+			 * Scope:    jQuery.dataTable.classSettings
+			 */
+			this.fnHeaderCallback = null;
+			
+			/*
+			 * Variable: fnFooterCallback
+			 * Purpose:  Callback function for the footer on each draw
+			 * Scope:    jQuery.dataTable.classSettings
+			 */
+			this.fnFooterCallback = null;
+			
+			/*
+			 * Variable: aoDrawCallback
+			 * Purpose:  Array of callback functions for draw callback functions
+			 * Scope:    jQuery.dataTable.classSettings
+			 * Notes:    Each array element is an object with the following parameters:
+			 *   function:fn - function to call
+			 *   string:sName - name callback (feature). useful for arranging array
+			 */
+			this.aoDrawCallback = [];
+			
+			/*
+			 * Variable: fnInitComplete
+			 * Purpose:  Callback function for when the table has been initalised
+			 * Scope:    jQuery.dataTable.classSettings
+			 */
+			this.fnInitComplete = null;
+			
+			/*
+			 * Variable: sTableId
+			 * Purpose:  Cache the table ID for quick access
+			 * Scope:    jQuery.dataTable.classSettings
+			 */
+			this.sTableId = "";
+			
+			/*
+			 * Variable: nTable
+			 * Purpose:  Cache the table node for quick access
+			 * Scope:    jQuery.dataTable.classSettings
+			 */
+			this.nTable = null;
+			
+			/*
+			 * Variable: nTHead
+			 * Purpose:  Permanent ref to the thead element
+			 * Scope:    jQuery.dataTable.classSettings
+			 */
+			this.nTHead = null;
+			
+			/*
+			 * Variable: nTFoot
+			 * Purpose:  Permanent ref to the tfoot element - if it exists
+			 * Scope:    jQuery.dataTable.classSettings
+			 */
+			this.nTFoot = null;
+			
+			/*
+			 * Variable: nTBody
+			 * Purpose:  Permanent ref to the tbody element
+			 * Scope:    jQuery.dataTable.classSettings
+			 */
+			this.nTBody = null;
+			
+			/*
+			 * Variable: nTableWrapper
+			 * Purpose:  Cache the wrapper node (contains all DataTables controlled elements)
+			 * Scope:    jQuery.dataTable.classSettings
+			 */
+			this.nTableWrapper = null;
+			
+			/*
+			 * Variable: bInitialised
+			 * Purpose:  Indicate if all required information has been read in
+			 * Scope:    jQuery.dataTable.classSettings
+			 */
+			this.bInitialised = false;
+			
+			/*
+			 * Variable: aoOpenRows
+			 * Purpose:  Information about open rows
+			 * Scope:    jQuery.dataTable.classSettings
+			 * Notes:    Has the parameters 'nTr' and 'nParent'
+			 */
+			this.aoOpenRows = [];
+			
+			/*
+			 * Variable: sDom
+			 * Purpose:  Dictate the positioning that the created elements will take
+			 * Scope:    jQuery.dataTable.classSettings
+			 * Notes:    
+			 *   The following options are allowed:
+			 *     'l' - Length changing
+			 *     'f' - Filtering input
+			 *     't' - The table!
+			 *     'i' - Information
+			 *     'p' - Pagination
+			 *     'r' - pRocessing
+			 *   The following constants are allowed:
+			 *     'H' - jQueryUI theme "header" classes
+			 *     'F' - jQueryUI theme "footer" classes
+			 *   The following syntax is expected:
+			 *     '<' and '>' - div elements
+			 *     '<"class" and '>' - div with a class
+			 *   Examples:
+			 *     '<"wrapper"flipt>', '<lf<t>ip>'
+			 */
+			this.sDom = 'lfrtip';
+			
+			/*
+			 * Variable: sPaginationType
+			 * Purpose:  Note which type of sorting should be used
+			 * Scope:    jQuery.dataTable.classSettings
+			 */
+			this.sPaginationType = "two_button";
+			
+			/*
+			 * Variable: iCookieDuration
+			 * Purpose:  The cookie duration (for bStateSave) in seconds - default 2 hours
+			 * Scope:    jQuery.dataTable.classSettings
+			 */
+			this.iCookieDuration = 60 * 60 * 2;
+			
+			/*
+			 * Variable: sCookiePrefix
+			 * Purpose:  The cookie name prefix
+			 * Scope:    jQuery.dataTable.classSettings
+			 */
+			this.sCookiePrefix = "SpryMedia_DataTables_";
+			
+			/*
+			 * Variable: fnCookieCallback
+			 * Purpose:  Callback function for cookie creation
+			 * Scope:    jQuery.dataTable.classSettings
+			 */
+			this.fnCookieCallback = null;
+			
+			/*
+			 * Variable: aoStateSave
+			 * Purpose:  Array of callback functions for state saving
+			 * Scope:    jQuery.dataTable.classSettings
+			 * Notes:    Each array element is an object with the following parameters:
+			 *   function:fn - function to call. Takes two parameters, oSettings and the JSON string to
+			 *     save that has been thus far created. Returns a JSON string to be inserted into a 
+			 *     json object (i.e. '"param": [ 0, 1, 2]')
+			 *   string:sName - name of callback
+			 */
+			this.aoStateSave = [];
+			
+			/*
+			 * Variable: aoStateLoad
+			 * Purpose:  Array of callback functions for state loading
+			 * Scope:    jQuery.dataTable.classSettings
+			 * Notes:    Each array element is an object with the following parameters:
+			 *   function:fn - function to call. Takes two parameters, oSettings and the object stored.
+			 *     May return false to cancel state loading.
+			 *   string:sName - name of callback
+			 */
+			this.aoStateLoad = [];
+			
+			/*
+			 * Variable: oLoadedState
+			 * Purpose:  State that was loaded from the cookie. Useful for back reference
+			 * Scope:    jQuery.dataTable.classSettings
+			 */
+			this.oLoadedState = null;
+			
+			/*
+			 * Variable: sAjaxSource
+			 * Purpose:  Source url for AJAX data for the table
+			 * Scope:    jQuery.dataTable.classSettings
+			 */
+			this.sAjaxSource = null;
+			
+			/*
+			 * Variable: bAjaxDataGet
+			 * Purpose:  Note if draw should be blocked while getting data
+			 * Scope:    jQuery.dataTable.classSettings
+			 */
+			this.bAjaxDataGet = true;
+			
+			/*
+			 * Variable: fnServerData
+			 * Purpose:  Function to get the server-side data - can be overruled by the developer
+			 * Scope:    jQuery.dataTable.classSettings
+			 */
+			this.fnServerData = function ( url, data, callback ) {
+				$.ajax( {
+					"type": "post",
+					"url": url,
+					"data": data,
+					"success": callback,
+					"dataType": "json",
+					"cache": false,
+					"error": function (xhr, error, thrown) {
+						if ( error == "parsererror" ) {
+							alert( "DataTables warning: JSON data from server could not be parsed. "+
+								"This is caused by a JSON formatting error." );
+						}
+					}
+				} );
+			};
+			
+			/*
+			 * Variable: fnFormatNumber
+			 * Purpose:  Format numbers for display
+			 * Scope:    jQuery.dataTable.classSettings
+			 */
+			this.fnFormatNumber = function ( iIn )
+			{
+				if ( iIn < 1000 )
+				{
+					/* A small optimisation for what is likely to be the vast majority of use cases */
+					return iIn;
+				}
+				else
+				{
+					var s=(iIn+""), a=s.split(""), out="", iLen=s.length;
+					
+					for ( var i=0 ; i<iLen ; i++ )
+					{
+						if ( i%3 === 0 && i !== 0 )
+						{
+							out = ','+out;
+						}
+						out = a[iLen-i-1]+out;
+					}
+				}
+				return out;
+			};
+			
+			/*
+			 * Variable: aLengthMenu
+			 * Purpose:  List of options that can be used for the user selectable length menu
+			 * Scope:    jQuery.dataTable.classSettings
+			 * Note:     This varaible can take for form of a 1D array, in which case the value and the 
+			 *   displayed value in the menu are the same, or a 2D array in which case the value comes
+			 *   from the first array, and the displayed value to the end user comes from the second
+			 *   array. 2D example: [ [ 10, 25, 50, 100, -1 ], [ 10, 25, 50, 100, 'All' ] ];
+			 */
+			this.aLengthMenu = [ 10, 25, 50, 100 ];
+			
+			/*
+			 * Variable: iDraw
+			 * Purpose:  Counter for the draws that the table does. Also used as a tracker for
+			 *   server-side processing
+			 * Scope:    jQuery.dataTable.classSettings
+			 */
+			this.iDraw = 0;
+			
+			/*
+			 * Variable: bDrawing
+			 * Purpose:  Indicate if a redraw is being done - useful for Ajax
+			 * Scope:    jQuery.dataTable.classSettings
+			 */
+			this.bDrawing = 0;
+			
+			/*
+			 * Variable: iDrawError
+			 * Purpose:  Last draw error
+			 * Scope:    jQuery.dataTable.classSettings
+			 */
+			this.iDrawError = -1;
+			
+			/*
+			 * Variable: _iDisplayLength, _iDisplayStart, _iDisplayEnd
+			 * Purpose:  Display length variables
+			 * Scope:    jQuery.dataTable.classSettings
+			 * Notes:    These variable must NOT be used externally to get the data length. Rather, use
+			 *   the fnRecordsTotal() (etc) functions.
+			 */
+			this._iDisplayLength = 10;
+			this._iDisplayStart = 0;
+			this._iDisplayEnd = 10;
+			
+			/*
+			 * Variable: _iRecordsTotal, _iRecordsDisplay
+			 * Purpose:  Display length variables used for server side processing
+			 * Scope:    jQuery.dataTable.classSettings
+			 * Notes:    These variable must NOT be used externally to get the data length. Rather, use
+			 *   the fnRecordsTotal() (etc) functions.
+			 */
+			this._iRecordsTotal = 0;
+			this._iRecordsDisplay = 0;
+			
+			/*
+			 * Variable: bJUI
+			 * Purpose:  Should we add the markup needed for jQuery UI theming?
+			 * Scope:    jQuery.dataTable.classSettings
+			 */
+			this.bJUI = false;
+			
+			/*
+			 * Variable: bJUI
+			 * Purpose:  Should we add the markup needed for jQuery UI theming?
+			 * Scope:    jQuery.dataTable.classSettings
+			 */
+			this.oClasses = _oExt.oStdClasses;
+			
+			/*
+			 * Variable: bFiltered and bSorted
+			 * Purpose:  Flags to allow callback functions to see what actions have been performed
+			 * Scope:    jQuery.dataTable.classSettings
+			 */
+			this.bFiltered = false;
+			this.bSorted = false;
+			
+			/*
+			 * Variable: oInit
+			 * Purpose:  Initialisation object that is used for the table
+			 * Scope:    jQuery.dataTable.classSettings
+			 */
+			this.oInit = null;
+		}
+		
+		/*
+		 * Variable: oApi
+		 * Purpose:  Container for publicly exposed 'private' functions
+		 * Scope:    jQuery.dataTable
+		 */
+		this.oApi = {};
+		
+		
+		/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+		 * Section - API functions
+		 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+		
+		/*
+		 * Function: fnDraw
+		 * Purpose:  Redraw the table
+		 * Returns:  -
+		 * Inputs:   bool:bComplete - Refilter and resort (if enabled) the table before the draw.
+		 *             Optional: default - true
+		 */
+		this.fnDraw = function( bComplete )
+		{
+			var oSettings = _fnSettingsFromNode( this[_oExt.iApiIndex] );
+			if ( typeof bComplete != 'undefined' && bComplete === false )
+			{
+				_fnCalculateEnd( oSettings );
+				_fnDraw( oSettings );
+			}
+			else
+			{
+				_fnReDraw( oSettings );
+			}
+		};
+		
+		/*
+		 * Function: fnFilter
+		 * Purpose:  Filter the input based on data
+		 * Returns:  -
+		 * Inputs:   string:sInput - string to filter the table on
+		 *           int:iColumn - optional - column to limit filtering to
+		 *           bool:bRegex - optional - treat as regular expression or not - default false
+		 *           bool:bSmart - optional - perform smart filtering or not - default true
+		 *           bool:bShowGlobal - optional - show the input global filter in it's input box(es)
+		 *              - default true
+		 */
+		this.fnFilter = function( sInput, iColumn, bRegex, bSmart, bShowGlobal )
+		{
+			var oSettings = _fnSettingsFromNode( this[_oExt.iApiIndex] );
+			
+			if ( !oSettings.oFeatures.bFilter )
+			{
+				return;
+			}
+			
+			if ( typeof bRegex == 'undefined' )
+			{
+				bRegex = false;
+			}
+			
+			if ( typeof bSmart == 'undefined' )
+			{
+				bSmart = true;
+			}
+			
+			if ( typeof bShowGlobal == 'undefined' )
+			{
+				bShowGlobal = true;
+			}
+			
+			if ( typeof iColumn == "undefined" || iColumn === null )
+			{
+				/* Global filter */
+				_fnFilterComplete( oSettings, {
+					"sSearch":sInput,
+					"bRegex": bRegex,
+					"bSmart": bSmart
+				}, 1 );
+				
+				if ( bShowGlobal && typeof oSettings.aanFeatures.f != 'undefined' )
+				{
+					var n = oSettings.aanFeatures.f;
+					for ( var i=0, iLen=n.length ; i<iLen ; i++ )
+					{
+						$('input', n[i]).val( sInput );
+					}
+				}
+			}
+			else
+			{
+				/* Single column filter */
+				oSettings.aoPreSearchCols[ iColumn ].sSearch = sInput;
+				oSettings.aoPreSearchCols[ iColumn ].bRegex = bRegex;
+				oSettings.aoPreSearchCols[ iColumn ].bSmart = bSmart;
+				_fnFilterComplete( oSettings, oSettings.oPreviousSearch, 1 );
+			}
+		};
+		
+		/*
+		 * Function: fnSettings
+		 * Purpose:  Get the settings for a particular table for extern. manipulation
+		 * Returns:  -
+		 * Inputs:   -
+		 */
+		this.fnSettings = function( nNode  )
+		{
+			return _fnSettingsFromNode( this[_oExt.iApiIndex] );
+		};
+		
+		/*
+		 * Function: fnVersionCheck
+		 * Notes:    The function is the same as the 'static' function provided in the ext variable
+		 */
+		this.fnVersionCheck = _oExt.fnVersionCheck;
+		
+		/*
+		 * Function: fnSort
+		 * Purpose:  Sort the table by a particular row
+		 * Returns:  -
+		 * Inputs:   int:iCol - the data index to sort on. Note that this will
+		 *   not match the 'display index' if you have hidden data entries
+		 */
+		this.fnSort = function( aaSort )
+		{
+			var oSettings = _fnSettingsFromNode( this[_oExt.iApiIndex] );
+			oSettings.aaSorting = aaSort;
+			_fnSort( oSettings );
+		};
+		
+		/*
+		 * Function: fnSortListener
+		 * Purpose:  Attach a sort listener to an element for a given column
+		 * Returns:  -
+		 * Inputs:   node:nNode - the element to attach the sort listener to
+		 *           int:iColumn - the column that a click on this node will sort on
+		 *           function:fnCallback - callback function when sort is run - optional
+		 */
+		this.fnSortListener = function( nNode, iColumn, fnCallback )
+		{
+			_fnSortAttachListener( _fnSettingsFromNode( this[_oExt.iApiIndex] ), nNode, iColumn,
+			 	fnCallback );
+		};
+		
+		/*
+		 * Function: fnAddData
+		 * Purpose:  Add new row(s) into the table
+		 * Returns:  array int: array of indexes (aoData) which have been added (zero length on error)
+		 * Inputs:   array:mData - the data to be added. The length must match
+		 *               the original data from the DOM
+		 *             or
+		 *             array array:mData - 2D array of data to be added
+		 *           bool:bRedraw - redraw the table or not - default true
+		 * Notes:    Warning - the refilter here will cause the table to redraw
+		 *             starting at zero
+		 * Notes:    Thanks to Yekimov Denis for contributing the basis for this function!
+		 */
+		this.fnAddData = function( mData, bRedraw )
+		{
+			if ( mData.length === 0 )
+			{
+				return [];
+			}
+			
+			var aiReturn = [];
+			var iTest;
+			
+			/* Find settings from table node */
+			var oSettings = _fnSettingsFromNode( this[_oExt.iApiIndex] );
+			
+			/* Check if we want to add multiple rows or not */
+			if ( typeof mData[0] == "object" )
+			{
+				for ( var i=0 ; i<mData.length ; i++ )
+				{
+					iTest = _fnAddData( oSettings, mData[i] );
+					if ( iTest == -1 )
+					{
+						return aiReturn;
+					}
+					aiReturn.push( iTest );
+				}
+			}
+			else
+			{
+				iTest = _fnAddData( oSettings, mData );
+				if ( iTest == -1 )
+				{
+					return aiReturn;
+				}
+				aiReturn.push( iTest );
+			}
+			
+			oSettings.aiDisplay = oSettings.aiDisplayMaster.slice();
+			
+			if ( typeof bRedraw == 'undefined' || bRedraw )
+			{
+				_fnReDraw( oSettings );
+			}
+			return aiReturn;
+		};
+		
+		/*
+		 * Function: fnDeleteRow
+		 * Purpose:  Remove a row for the table
+		 * Returns:  array:aReturn - the row that was deleted
+		 * Inputs:   mixed:mTarget - 
+		 *             int: - index of aoData to be deleted, or
+		 *             node(TR): - TR element you want to delete
+		 *           function:fnCallBack - callback function - default null
+		 *           bool:bRedraw - redraw the table or not - default true
+		 */
+		this.fnDeleteRow = function( mTarget, fnCallBack, bRedraw )
+		{
+			/* Find settings from table node */
+			var oSettings = _fnSettingsFromNode( this[_oExt.iApiIndex] );
+			var iAODataIndex;
+			
+			iAODataIndex = (typeof mTarget == 'object') ? 
+				_fnNodeToDataIndex(oSettings, mTarget) : mTarget;
+			
+			/* Return the data array from this row */
+			var oData = oSettings.aoData.splice( iAODataIndex, 1 );
+			
+			/* Remove the target row from the search array */
+			var iDisplayIndex = $.inArray( iAODataIndex, oSettings.aiDisplay );
+			oSettings.asDataSearch.splice( iDisplayIndex, 1 );
+			
+			/* Delete from the display arrays */
+			_fnDeleteIndex( oSettings.aiDisplayMaster, iAODataIndex );
+			_fnDeleteIndex( oSettings.aiDisplay, iAODataIndex );
+			
+			/* If there is a user callback function - call it */
+			if ( typeof fnCallBack == "function" )
+			{
+				fnCallBack.call( this, oSettings, oData );
+			}
+			
+			/* Check for an 'overflow' they case for dislaying the table */
+			if ( oSettings._iDisplayStart >= oSettings.aiDisplay.length )
+			{
+				oSettings._iDisplayStart -= oSettings._iDisplayLength;
+				if ( oSettings._iDisplayStart < 0 )
+				{
+					oSettings._iDisplayStart = 0;
+				}
+			}
+			
+			if ( typeof bRedraw == 'undefined' || bRedraw )
+			{
+				_fnCalculateEnd( oSettings );
+				_fnDraw( oSettings );
+			}
+			
+			return oData;
+		};
+		
+		/*
+		 * Function: fnClearTable
+		 * Purpose:  Quickly and simply clear a table
+		 * Returns:  -
+		 * Inputs:   bool:bRedraw - redraw the table or not - default true
+		 * Notes:    Thanks to Yekimov Denis for contributing the basis for this function!
+		 */
+		this.fnClearTable = function( bRedraw )
+		{
+			/* Find settings from table node */
+			var oSettings = _fnSettingsFromNode( this[_oExt.iApiIndex] );
+			_fnClearTable( oSettings );
+			
+			if ( typeof bRedraw == 'undefined' || bRedraw )
+			{
+				_fnDraw( oSettings );
+			}
+		};
+		
+		/*
+		 * Function: fnOpen
+		 * Purpose:  Open a display row (append a row after the row in question)
+		 * Returns:  node:nNewRow - the row opened
+		 * Inputs:   node:nTr - the table row to 'open'
+		 *           string:sHtml - the HTML to put into the row
+		 *           string:sClass - class to give the new TD cell
+		 */
+		this.fnOpen = function( nTr, sHtml, sClass )
+		{
+			/* Find settings from table node */
+			var oSettings = _fnSettingsFromNode( this[_oExt.iApiIndex] );
+			
+			/* the old open one if there is one */
+			this.fnClose( nTr );
+			
+			var nNewRow = document.createElement("tr");
+			var nNewCell = document.createElement("td");
+			nNewRow.appendChild( nNewCell );
+			nNewCell.className = sClass;
+			nNewCell.colSpan = _fnVisbleColumns( oSettings );
+			nNewCell.innerHTML = sHtml;
+			
+			/* If the nTr isn't on the page at the moment - then we don't insert at the moment */
+			var nTrs = $('tr', oSettings.nTBody);
+			if ( $.inArray(nTr, nTrs) != -1 )
+			{
+				$(nNewRow).insertAfter(nTr);
+			}
+			
+			oSettings.aoOpenRows.push( {
+				"nTr": nNewRow,
+				"nParent": nTr
+			} );
+			
+			return nNewRow;
+		};
+		
+		/*
+		 * Function: fnClose
+		 * Purpose:  Close a display row
+		 * Returns:  int: 0 (success) or 1 (failed)
+		 * Inputs:   node:nTr - the table row to 'close'
+		 */
+		this.fnClose = function( nTr )
+		{
+			/* Find settings from table node */
+			var oSettings = _fnSettingsFromNode( this[_oExt.iApiIndex] );
+			
+			for ( var i=0 ; i<oSettings.aoOpenRows.length ; i++ )
+			{
+				if ( oSettings.aoOpenRows[i].nParent == nTr )
+				{
+					var nTrParent = oSettings.aoOpenRows[i].nTr.parentNode;
+					if ( nTrParent )
+					{
+						/* Remove it if it is currently on display */
+						nTrParent.removeChild( oSettings.aoOpenRows[i].nTr );
+					}
+					oSettings.aoOpenRows.splice( i, 1 );
+					return 0;
+				}
+			}
+			return 1;
+		};
+		
+		/*
+		 * Function: fnGetData
+		 * Purpose:  Return an array with the data which is used to make up the table
+		 * Returns:  array array string: 2d data array ([row][column]) or array string: 1d data array
+		 *           or
+		 *           array string (if iRow specified)
+		 * Inputs:   mixed:mRow - optional - if not present, then the full 2D array for the table 
+		 *             if given then:
+		 *               int: - return 1D array for aoData entry of this index
+		 *               node(TR): - return 1D array for this TR element
+		 * Inputs:   int:iRow - optional - if present then the array returned will be the data for
+		 *             the row with the index 'iRow'
+		 */
+		this.fnGetData = function( mRow )
+		{
+			var oSettings = _fnSettingsFromNode( this[_oExt.iApiIndex] );
+			
+			if ( typeof mRow != 'undefined' )
+			{
+				var iRow = (typeof mRow == 'object') ? 
+					_fnNodeToDataIndex(oSettings, mRow) : mRow;
+				return ( (aRowData = oSettings.aoData[iRow]) ? aRowData._aData : null);
+			}
+			return _fnGetDataMaster( oSettings );
+		};
+		
+		/*
+		 * Function: fnGetNodes
+		 * Purpose:  Return an array with the TR nodes used for drawing the table
+		 * Returns:  array node: TR elements
+		 *           or
+		 *           node (if iRow specified)
+		 * Inputs:   int:iRow - optional - if present then the array returned will be the node for
+		 *             the row with the index 'iRow'
+		 */
+		this.fnGetNodes = function( iRow )
+		{
+			var oSettings = _fnSettingsFromNode( this[_oExt.iApiIndex] );
+			
+			if ( typeof iRow != 'undefined' )
+			{
+				return ( (aRowData = oSettings.aoData[iRow]) ? aRowData.nTr : null );
+			}
+			return _fnGetTrNodes( oSettings );
+		};
+		
+		/*
+		 * Function: fnGetPosition
+		 * Purpose:  Get the array indexes of a particular cell from it's DOM element
+		 * Returns:  int: - row index, or array[ int, int, int ]: - row index, column index (visible)
+		 *             and column index including hidden columns
+		 * Inputs:   node:nNode - this can either be a TR or a TD in the table, the return is
+		 *             dependent on this input
+		 */
+		this.fnGetPosition = function( nNode )
+		{
+			var oSettings = _fnSettingsFromNode( this[_oExt.iApiIndex] );
+			if ( nNode.nodeName.toUpperCase() == "TR" )
+			{
+				return _fnNodeToDataIndex(oSettings, nNode);
+			}
+			else if ( nNode.nodeName.toUpperCase() == "TD" )
+			{
+				var iDataIndex = _fnNodeToDataIndex(oSettings, nNode.parentNode);
+				var iCorrector = 0;
+				for ( var j=0 ; j<oSettings.aoColumns.length ; j++ )
+				{
+					if ( oSettings.aoColumns[j].bVisible )
+					{
+						if ( oSettings.aoData[iDataIndex].nTr.getElementsByTagName('td')[j-iCorrector] == nNode )
+						{
+							return [ iDataIndex, j-iCorrector, j ];
+						}
+					}
+					else
+					{
+						iCorrector++;
+					}
+				}
+			}
+			return null;
+		};
+		
+		/*
+		 * Function: fnUpdate
+		 * Purpose:  Update a table cell or row
+		 * Returns:  int: 0 okay, 1 error
+		 * Inputs:   array string 'or' string:mData - data to update the cell/row with
+		 *           mixed:mRow - 
+		 *             int: - index of aoData to be updated, or
+		 *             node(TR): - TR element you want to update
+		 *           int:iColumn - the column to update - optional (not used of mData is 2D)
+		 *           bool:bRedraw - redraw the table or not - default true
+		 *           bool:bAction - perform predraw actions or not (you will want this as 'true' if
+		 *             you have bRedraw as true) - default true
+		 */
+		this.fnUpdate = function( mData, mRow, iColumn, bRedraw, bAction )
+		{
+			var oSettings = _fnSettingsFromNode( this[_oExt.iApiIndex] );
+			var iVisibleColumn;
+			var sDisplay;
+			var iRow = (typeof mRow == 'object') ? 
+				_fnNodeToDataIndex(oSettings, mRow) : mRow;
+			
+			if ( typeof mData != 'object' )
+			{
+				sDisplay = mData;
+				oSettings.aoData[iRow]._aData[iColumn] = sDisplay;
+				
+				if ( oSettings.aoColumns[iColumn].fnRender !== null )
+				{
+					sDisplay = oSettings.aoColumns[iColumn].fnRender( {
+						"iDataRow": iRow,
+						"iDataColumn": iColumn,
+						"aData": oSettings.aoData[iRow]._aData,
+						"oSettings": oSettings
+					} );
+					
+					if ( oSettings.aoColumns[iColumn].bUseRendered )
+					{
+						oSettings.aoData[iRow]._aData[iColumn] = sDisplay;
+					}
+				}
+				
+				iVisibleColumn = _fnColumnIndexToVisible( oSettings, iColumn );
+				if ( iVisibleColumn !== null )
+				{
+					oSettings.aoData[iRow].nTr.getElementsByTagName('td')[iVisibleColumn].innerHTML = 
+						sDisplay;
+				}
+				else
+				{
+					oSettings.aoData[iRow]._anHidden[iColumn].innerHTML = sDisplay;
+				}
+			}
+			else
+			{
+				if ( mData.length != oSettings.aoColumns.length )
+				{
+					_fnLog( oSettings, 0, 'An array passed to fnUpdate must have the same number of '+
+						'columns as the table in question - in this case '+oSettings.aoColumns.length );
+					return 1;
+				}
+				
+				for ( var i=0 ; i<mData.length ; i++ )
+				{
+					sDisplay = mData[i];
+					oSettings.aoData[iRow]._aData[i] = sDisplay;
+					
+					if ( oSettings.aoColumns[i].fnRender !== null )
+					{
+						sDisplay = oSettings.aoColumns[i].fnRender( {
+							"iDataRow": iRow,
+							"iDataColumn": i,
+							"aData": oSettings.aoData[iRow]._aData,
+							"oSettings": oSettings
+						} );
+						
+						if ( oSettings.aoColumns[i].bUseRendered )
+						{
+							oSettings.aoData[iRow]._aData[i] = sDisplay;
+						}
+					}
+					
+					iVisibleColumn = _fnColumnIndexToVisible( oSettings, i );
+					if ( iVisibleColumn !== null )
+					{
+						oSettings.aoData[iRow].nTr.getElementsByTagName('td')[iVisibleColumn].innerHTML = 
+							sDisplay;
+					}
+					else
+					{
+						oSettings.aoData[iRow]._anHidden[i].innerHTML = sDisplay;
+					}
+				}
+			}
+			
+			/* Modify the search index for this row (strictly this is likely not needed, since fnReDraw
+			 * will rebuild the search array - however, the redraw might be disabled by the user)
+			 */
+			var iDisplayIndex = $.inArray( iRow, oSettings.aiDisplay );
+			oSettings.asDataSearch[iDisplayIndex] = _fnBuildSearchRow( oSettings, 
+				oSettings.aoData[iRow]._aData );
+			
+			/* Perform pre-draw actions */
+			if ( typeof bAction == 'undefined' || bAction )
+			{
+				_fnAjustColumnSizing( oSettings );
+			}
+			
+			/* Redraw the table */
+			if ( typeof bRedraw == 'undefined' || bRedraw )
+			{
+				_fnReDraw( oSettings );
+			}
+			return 0;
+		};
+		
+		
+		/*
+		 * Function: fnShowColoumn
+		 * Purpose:  Show a particular column
+		 * Returns:  -
+		 * Inputs:   int:iCol - the column whose display should be changed
+		 *           bool:bShow - show (true) or hide (false) the column
+		 *           bool:bRedraw - redraw the table or not - default true
+		 */
+		this.fnSetColumnVis = function ( iCol, bShow, bRedraw )
+		{
+			var oSettings = _fnSettingsFromNode( this[_oExt.iApiIndex] );
+			var i, iLen;
+			var iColumns = oSettings.aoColumns.length;
+			var nTd, anTds, nCell, anTrs, jqChildren;
+			
+			/* No point in doing anything if we are requesting what is already true */
+			if ( oSettings.aoColumns[iCol].bVisible == bShow )
+			{
+				return;
+			}
+			
+			var nTrHead = $('>tr', oSettings.nTHead)[0];
+			var nTrFoot = $('>tr', oSettings.nTFoot)[0];
+			var anTheadTh = [];
+			var anTfootTh = [];
+			for ( i=0 ; i<iColumns ; i++ )
+			{
+				anTheadTh.push( oSettings.aoColumns[i].nTh );
+				anTfootTh.push( oSettings.aoColumns[i].nTf );
+			}
+			
+			/* Show the column */
+			if ( bShow )
+			{
+				var iInsert = 0;
+				for ( i=0 ; i<iCol ; i++ )
+				{
+					if ( oSettings.aoColumns[i].bVisible )
+					{
+						iInsert++;
+					}
+				}
+				
+				/* Need to decide if we should use appendChild or insertBefore */
+				if ( iInsert >= _fnVisbleColumns( oSettings ) )
+				{
+					nTrHead.appendChild( anTheadTh[iCol] );
+					anTrs = $('>tr', oSettings.nTHead);
+					for ( i=1, iLen=anTrs.length ; i<iLen ; i++ )
+					{
+						anTrs[i].appendChild( oSettings.aoColumns[iCol].anThExtra[i-1] );
+					}	
+					
+					if ( nTrFoot )
+					{
+						nTrFoot.appendChild( anTfootTh[iCol] );
+						anTrs = $('>tr', oSettings.nTFoot);
+						for ( i=1, iLen=anTrs.length ; i<iLen ; i++ )
+						{
+							anTrs[i].appendChild( oSettings.aoColumns[iCol].anTfExtra[i-1] );
+						}	
+					}
+					
+					for ( i=0, iLen=oSettings.aoData.length ; i<iLen ; i++ )
+					{
+						nTd = oSettings.aoData[i]._anHidden[iCol];
+						oSettings.aoData[i].nTr.appendChild( nTd );
+					}
+				}
+				else
+				{
+					/* Which coloumn should we be inserting before? */
+					var iBefore = null;
+					for ( i=iCol ; i<iColumns ; i++ )
+					{
+						iBefore = _fnColumnIndexToVisible( oSettings, i );
+						if ( iBefore !== null )
+						{
+							break;
+						}
+					}
+					
+					nTrHead.insertBefore( anTheadTh[iCol], nTrHead.getElementsByTagName('th')[iBefore] );
+					anTrs = $('>tr', oSettings.nTHead);
+					for ( i=1, iLen=anTrs.length ; i<iLen ; i++ )
+					{
+						jqChildren = $(anTrs[i]).children();
+						anTrs[i].insertBefore( oSettings.aoColumns[iCol].anThExtra[i-1], jqChildren[iBefore] );
+					}	
+					
+					if ( nTrFoot )
+					{
+						nTrFoot.insertBefore( anTfootTh[iCol], nTrFoot.getElementsByTagName('th')[iBefore] );
+						anTrs = $('>tr', oSettings.nTFoot);
+						for ( i=1, iLen=anTrs.length ; i<iLen ; i++ )
+						{
+							jqChildren = $(anTrs[i]).children();
+							anTrs[i].insertBefore( oSettings.aoColumns[iCol].anTfExtra[i-1], jqChildren[iBefore] );
+						}	
+					}
+					
+					anTds = _fnGetTdNodes( oSettings );
+					for ( i=0, iLen=oSettings.aoData.length ; i<iLen ; i++ )
+					{
+						nTd = oSettings.aoData[i]._anHidden[iCol];
+						oSettings.aoData[i].nTr.insertBefore( nTd, $('>td:eq('+iBefore+')', 
+							oSettings.aoData[i].nTr)[0] );
+					}
+				}
+				
+				oSettings.aoColumns[iCol].bVisible = true;
+			}
+			else
+			{
+				/* Remove a column from display */
+				nTrHead.removeChild( anTheadTh[iCol] );
+				for ( i=0, iLen=oSettings.aoColumns[iCol].anThExtra.length ; i<iLen ; i++ )
+				{
+					nCell = oSettings.aoColumns[iCol].anThExtra[i];
+					nCell.parentNode.removeChild( nCell );
+				}
+				
+				if ( nTrFoot )
+				{
+					nTrFoot.removeChild( anTfootTh[iCol] );
+					for ( i=0, iLen=oSettings.aoColumns[iCol].anTfExtra.length ; i<iLen ; i++ )
+					{
+						nCell = oSettings.aoColumns[iCol].anTfExtra[i];
+						nCell.parentNode.removeChild( nCell );
+					}
+				}
+				
+				anTds = _fnGetTdNodes( oSettings );
+				for ( i=0, iLen=oSettings.aoData.length ; i<iLen ; i++ )
+				{
+					nTd = anTds[ ( i*oSettings.aoColumns.length) + (iCol*1) ];
+					oSettings.aoData[i]._anHidden[iCol] = nTd;
+					nTd.parentNode.removeChild( nTd );
+				}
+				
+				oSettings.aoColumns[iCol].bVisible = false;
+			}
+			
+			/* If there are any 'open' rows, then we need to alter the colspan for this col change */
+			for ( i=0, iLen=oSettings.aoOpenRows.length ; i<iLen ; i++ )
+			{
+				oSettings.aoOpenRows[i].nTr.colSpan = _fnVisbleColumns( oSettings );
+			}
+			
+			/* Do a redraw incase anything depending on the table columns needs it 
+			 * (built-in: scrolling) 
+			 */
+			if ( typeof bRedraw == 'undefined' || bRedraw )
+			{
+				_fnAjustColumnSizing( oSettings );
+				_fnDraw( oSettings );
+			}
+			
+			_fnSaveState( oSettings );
+		};
+		
+		/*
+		 * Function: fnPageChange
+		 * Purpose:  Change the pagination
+		 * Returns:  -
+		 * Inputs:   string:sAction - paging action to take: "first", "previous", "next" or "last"
+		 *           bool:bRedraw - redraw the table or not - optional - default true
+		 */
+		this.fnPageChange = function ( sAction, bRedraw )
+		{
+			var oSettings = _fnSettingsFromNode( this[_oExt.iApiIndex] );
+			_fnPageChange( oSettings, sAction );
+			_fnCalculateEnd( oSettings );
+			
+			if ( typeof bRedraw == 'undefined' || bRedraw )
+			{
+				_fnDraw( oSettings );
+			}
+		};
+		
+		/*
+		 * Function: fnDestroy
+		 * Purpose:  Destructor for the DataTable
+		 * Returns:  -
+		 * Inputs:   -
+		 */
+		this.fnDestroy = function ( )
+		{
+			var oSettings = _fnSettingsFromNode( this[_oExt.iApiIndex] );
+			var nOrig = oSettings.nTableWrapper.parentNode;
+			var nBody = oSettings.nTBody;
+			var i, iLen;
+			
+			/* Flag to note that the table is currently being destoryed - no action should be taken */
+			oSettings.bDestroying = true;
+			
+			/* Blitz all DT events */
+			$(oSettings.nTableWrapper).find('*').andSelf().unbind('.DT');
+			
+			/* Restore hidden columns */
+			for ( i=0, iLen=oSettings.aoColumns.length ; i<iLen ; i++ )
+			{
+				if ( oSettings.aoColumns[i].bVisible === false )
+				{
+					this.fnSetColumnVis( i, true );
+				}
+			}
+			
+			/* If there is an 'empty' indicator row, remove it */
+			$('tbody>tr>td.'+oSettings.oClasses.sRowEmpty, oSettings.nTable).parent().remove();
+			
+			/* When scrolling we had to break the table up - restore it */
+			if ( oSettings.nTable != oSettings.nTHead.parentNode )
+			{
+				$('>thead', oSettings.nTable).remove();
+				oSettings.nTable.appendChild( oSettings.nTHead );
+			}
+			
+			if ( oSettings.nTFoot && oSettings.nTable != oSettings.nTFoot.parentNode )
+			{
+				$('>tfoot', oSettings.nTable).remove();
+				oSettings.nTable.appendChild( oSettings.nTFoot );
+			}
+			
+			/* Remove the DataTables generated nodes, events and classes */
+			oSettings.nTable.parentNode.removeChild( oSettings.nTable );
+			$(oSettings.nTableWrapper).remove();
+			
+			oSettings.aaSorting = [];
+			oSettings.aaSortingFixed = [];
+			_fnSortingClasses( oSettings );
+			
+			$(_fnGetTrNodes( oSettings )).removeClass( oSettings.asStripClasses.join(' ') );
+			
+			if ( !oSettings.bJUI )
+			{
+				$('th', oSettings.nTHead).removeClass( [ _oExt.oStdClasses.sSortable,
+					_oExt.oStdClasses.sSortableAsc,
+					_oExt.oStdClasses.sSortableDesc,
+					_oExt.oStdClasses.sSortableNone ].join(' ')
+				);
+			}
+			else
+			{
+				$('th', oSettings.nTHead).removeClass( [ _oExt.oStdClasses.sSortable,
+					_oExt.oJUIClasses.sSortableAsc,
+					_oExt.oJUIClasses.sSortableDesc,
+					_oExt.oJUIClasses.sSortableNone ].join(' ')
+				);
+				$('th span', oSettings.nTHead).remove();
+			}
+			
+			/* Add the TR elements back into the table in their original order */
+			nOrig.appendChild( oSettings.nTable );
+			for ( i=0, iLen=oSettings.aoData.length ; i<iLen ; i++ )
+			{
+				nBody.appendChild( oSettings.aoData[i].nTr );
+			}
+			
+			/* Restore the width of the original table */
+			oSettings.nTable.style.width = _fnStringToCss(oSettings.sDestroyWidth);
+			
+			/* If the were originally odd/even type classes - then we add them back here. Note
+			 * this is not fool proof (for example if not all rows as odd/even classes - but 
+			 * it's a good effort without getting carried away
+			 */
+			$('>tr:even', nBody).addClass( oSettings.asDestoryStrips[0] );
+			$('>tr:odd', nBody).addClass( oSettings.asDestoryStrips[1] );
+			
+			/* Remove the settings object from the settings array */
+			for ( i=0, iLen=_aoSettings.length ; i<iLen ; i++ )
+			{
+				if ( _aoSettings[i] == oSettings )
+				{
+					_aoSettings.splice( i, 1 );
+				}
+			}
+			
+			/* End it all */
+			oSettings = null;
+		};
+		
+		/*
+		 * Function: fnAjustColumnSizing
+		 * Purpose:  Update tale sizing based on content. This would most likely be used for scrolling
+		 *   and will typically need a redraw after it.
+		 * Returns:  -
+		 * Inputs:   bool:bRedraw - redraw the table or not, you will typically want to - default true
+		 */
+		this.fnAdjustColumnSizing = function ( bRedraw )
+		{
+			var oSettings = _fnSettingsFromNode(this[_oExt.iApiIndex]);
+			_fnAjustColumnSizing( oSettings );
+			
+			if ( typeof bRedraw == 'undefined' || bRedraw )
+			{
+				this.fnDraw( false );
+			}
+			else if ( oSettings.oScroll.sX !== "" || oSettings.oScroll.sY !== "" )
+			{
+				/* If not redrawing, but scrolling, we want to apply the new column sizes anyway */
+				this.oApi._fnScrollDraw(oSettings);
+			}
+		};
+		
+		/*
+		 * Plugin API functions
+		 * 
+		 * This call will add the functions which are defined in _oExt.oApi to the
+		 * DataTables object, providing a rather nice way to allow plug-in API functions. Note that
+		 * this is done here, so that API function can actually override the built in API functions if
+		 * required for a particular purpose.
+		 */
+		
+		/*
+		 * Function: _fnExternApiFunc
+		 * Purpose:  Create a wrapper function for exporting an internal func to an external API func
+		 * Returns:  function: - wrapped function
+		 * Inputs:   string:sFunc - API function name
+		 */
+		function _fnExternApiFunc (sFunc)
+		{
+			return function() {
+					var aArgs = [_fnSettingsFromNode(this[_oExt.iApiIndex])].concat( 
+						Array.prototype.slice.call(arguments) );
+					return _oExt.oApi[sFunc].apply( this, aArgs );
+				};
+		}
+		
+		for ( var sFunc in _oExt.oApi )
+		{
+			if ( sFunc )
+			{
+				/*
+				 * Function: anon
+				 * Purpose:  Wrap the plug-in API functions in order to provide the settings as 1st arg 
+				 *   and execute in this scope
+				 * Returns:  -
+				 * Inputs:   -
+				 */
+				this[sFunc] = _fnExternApiFunc(sFunc);
+			}
+		}
+		
+		
+		
+		/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+		 * Section - Local functions
+		 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+		
+		/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+		 * Section - Initalisation
+		 */
+		
+		/*
+		 * Function: _fnInitalise
+		 * Purpose:  Draw the table for the first time, adding all required features
+		 * Returns:  -
+		 * Inputs:   object:oSettings - dataTables settings object
+		 */
+		function _fnInitalise ( oSettings )
+		{
+			var i, iLen;
+			
+			/* Ensure that the table data is fully initialised */
+			if ( oSettings.bInitialised === false )
+			{
+				setTimeout( function(){ _fnInitalise( oSettings ); }, 200 );
+				return;
+			}
+			
+			/* Show the display HTML options */
+			_fnAddOptionsHtml( oSettings );
+			
+			/* Draw the headers for the table */
+			_fnDrawHead( oSettings );
+			
+			/* Okay to show that something is going on now */
+			_fnProcessingDisplay( oSettings, true );
+			
+			/* Calculate sizes for columns */
+			if ( oSettings.oFeatures.bAutoWidth )
+			{
+				_fnCalculateColumnWidths( oSettings );
+			}
+			
+			for ( i=0, iLen=oSettings.aoColumns.length ; i<iLen ; i++ )
+			{
+				if ( oSettings.aoColumns[i].sWidth !== null )
+				{
+					oSettings.aoColumns[i].nTh.style.width = _fnStringToCss( oSettings.aoColumns[i].sWidth );
+				}
+			}
+			
+			/* If there is default sorting required - let's do it. The sort function will do the
+			 * drawing for us. Otherwise we draw the table regardless of the Ajax source - this allows
+			 * the table to look initialised for Ajax sourcing data (show 'loading' message possibly)
+			 */
+			if ( oSettings.oFeatures.bSort )
+			{
+				_fnSort( oSettings );
+			}
+			else
+			{
+				oSettings.aiDisplay = oSettings.aiDisplayMaster.slice();
+				_fnCalculateEnd( oSettings );
+				_fnDraw( oSettings );
+			}
+			
+			/* if there is an ajax source load the data */
+			if ( oSettings.sAjaxSource !== null && !oSettings.oFeatures.bServerSide )
+			{
+				oSettings.fnServerData.call( oSettings.oInstance, oSettings.sAjaxSource, [], function(json) {
+					/* Got the data - add it to the table */
+					for ( i=0 ; i<json.aaData.length ; i++ )
+					{
+						_fnAddData( oSettings, json.aaData[i] );
+					}
+					
+					/* Reset the init display for cookie saving. We've already done a filter, and
+					 * therefore cleared it before. So we need to make it appear 'fresh'
+					 */
+					oSettings.iInitDisplayStart = oSettings._iDisplayStart;
+					
+					if ( oSettings.oFeatures.bSort )
+					{
+						_fnSort( oSettings );
+					}
+					else
+					{
+						oSettings.aiDisplay = oSettings.aiDisplayMaster.slice();
+						_fnCalculateEnd( oSettings );
+						_fnDraw( oSettings );
+					}
+					
+					_fnProcessingDisplay( oSettings, false );
+					_fnInitComplete( oSettings, json );
+				} );
+				return;
+			}
+			
+			/* Server-side processing initialisation complete is done at the end of _fnDraw */
+			if ( !oSettings.oFeatures.bServerSide )
+			{
+				_fnProcessingDisplay( oSettings, false );
+				_fnInitComplete( oSettings );
+			}
+		}
+		
+		/*
+		 * Function: _fnInitalise
+		 * Purpose:  Draw the table for the first time, adding all required features
+		 * Returns:  -
+		 * Inputs:   object:oSettings - dataTables settings object
+		 */
+		function _fnInitComplete ( oSettings, json )
+		{
+			oSettings._bInitComplete = true;
+			if ( typeof oSettings.fnInitComplete == 'function' )
+			{
+				if ( typeof json != 'undefined' )
+				{
+					oSettings.fnInitComplete.call( oSettings.oInstance, oSettings, json );
+				}
+				else
+				{
+					oSettings.fnInitComplete.call( oSettings.oInstance, oSettings );
+				}
+			}
+		}
+		
+		/*
+		 * Function: _fnLanguageProcess
+		 * Purpose:  Copy language variables from remote object to a local one
+		 * Returns:  -
+		 * Inputs:   object:oSettings - dataTables settings object
+		 *           object:oLanguage - Language information
+		 *           bool:bInit - init once complete
+		 */
+		function _fnLanguageProcess( oSettings, oLanguage, bInit )
+		{
+			_fnMap( oSettings.oLanguage, oLanguage, 'sProcessing' );
+			_fnMap( oSettings.oLanguage, oLanguage, 'sLengthMenu' );
+			_fnMap( oSettings.oLanguage, oLanguage, 'sEmptyTable' );
+			_fnMap( oSettings.oLanguage, oLanguage, 'sZeroRecords' );
+			_fnMap( oSettings.oLanguage, oLanguage, 'sInfo' );
+			_fnMap( oSettings.oLanguage, oLanguage, 'sInfoEmpty' );
+			_fnMap( oSettings.oLanguage, oLanguage, 'sInfoFiltered' );
+			_fnMap( oSettings.oLanguage, oLanguage, 'sInfoPostFix' );
+			_fnMap( oSettings.oLanguage, oLanguage, 'sSearch' );
+			
+			if ( typeof oLanguage.oPaginate != 'undefined' )
+			{
+				_fnMap( oSettings.oLanguage.oPaginate, oLanguage.oPaginate, 'sFirst' );
+				_fnMap( oSettings.oLanguage.oPaginate, oLanguage.oPaginate, 'sPrevious' );
+				_fnMap( oSettings.oLanguage.oPaginate, oLanguage.oPaginate, 'sNext' );
+				_fnMap( oSettings.oLanguage.oPaginate, oLanguage.oPaginate, 'sLast' );
+			}
+			
+			/* Backwards compatibility - if there is no sEmptyTable given, then use the same as
+			 * sZeroRecords - assuming that is given.
+			 */
+			if ( typeof oLanguage.sEmptyTable == 'undefined' && 
+			     typeof oLanguage.sZeroRecords != 'undefined' )
+			{
+				_fnMap( oSettings.oLanguage, oLanguage, 'sZeroRecords', 'sEmptyTable' );
+			}
+			
+			if ( bInit )
+			{
+				_fnInitalise( oSettings );
+			}
+		}
+		
+		/*
+		 * Function: _fnAddColumn
+		 * Purpose:  Add a column to the list used for the table with default values
+		 * Returns:  -
+		 * Inputs:   object:oSettings - dataTables settings object
+		 *           node:nTh - the th element for this column
+		 */
+		function _fnAddColumn( oSettings, nTh )
+		{
+			oSettings.aoColumns[ oSettings.aoColumns.length++ ] = {
+				"sType": null,
+				"_bAutoType": true,
+				"bVisible": true,
+				"bSearchable": true,
+				"bSortable": true,
+				"asSorting": [ 'asc', 'desc' ],
+				"sSortingClass": oSettings.oClasses.sSortable,
+				"sSortingClassJUI": oSettings.oClasses.sSortJUI,
+				"sTitle": nTh ? nTh.innerHTML : '',
+				"sName": '',
+				"sWidth": null,
+				"sWidthOrig": null,
+				"sClass": null,
+				"fnRender": null,
+				"bUseRendered": true,
+				"iDataSort": oSettings.aoColumns.length-1,
+				"sSortDataType": 'std',
+				"nTh": nTh ? nTh : document.createElement('th'),
+				"nTf": null,
+				"anThExtra": [],
+				"anTfExtra": []
+			};
+			
+			var iCol = oSettings.aoColumns.length-1;
+			/* Add a column specific filter */
+			if ( typeof oSettings.aoPreSearchCols[ iCol ] == 'undefined' ||
+			     oSettings.aoPreSearchCols[ iCol ] === null )
+			{
+				oSettings.aoPreSearchCols[ iCol ] = {
+					"sSearch": "",
+					"bRegex": false,
+					"bSmart": true
+				};
+			}
+			else
+			{
+				/* Don't require that the user must specify bRegex and / or bSmart */
+				if ( typeof oSettings.aoPreSearchCols[ iCol ].bRegex == 'undefined' )
+				{
+					oSettings.aoPreSearchCols[ iCol ].bRegex = true;
+				}
+				
+				if ( typeof oSettings.aoPreSearchCols[ iCol ].bSmart == 'undefined' )
+				{
+					oSettings.aoPreSearchCols[ iCol ].bSmart = true;
+				}
+			} 
+			
+			/* Use the column options function to initialise classes etc */
+			_fnColumnOptions( oSettings, iCol, null );
+		}
+		
+		/*
+		 * Function: _fnColumnOptions
+		 * Purpose:  Apply options for a column
+		 * Returns:  -
+		 * Inputs:   object:oSettings - dataTables settings object
+		 *           int:iCol - column index to consider
+		 *           object:oOptions - object with sType, bVisible and bSearchable
+		 */
+		function _fnColumnOptions( oSettings, iCol, oOptions )
+		{
+			var oCol = oSettings.aoColumns[ iCol ];
+			
+			/* User specified column options */
+			if ( typeof oOptions != 'undefined' && oOptions !== null )
+			{
+				if ( typeof oOptions.sType != 'undefined' )
+				{
+					oCol.sType = oOptions.sType;
+					oCol._bAutoType = false;
+				}
+				
+				_fnMap( oCol, oOptions, "bVisible" );
+				_fnMap( oCol, oOptions, "bSearchable" );
+				_fnMap( oCol, oOptions, "bSortable" );
+				_fnMap( oCol, oOptions, "sTitle" );
+				_fnMap( oCol, oOptions, "sName" );
+				_fnMap( oCol, oOptions, "sWidth" );
+				_fnMap( oCol, oOptions, "sWidth", "sWidthOrig" );
+				_fnMap( oCol, oOptions, "sClass" );
+				_fnMap( oCol, oOptions, "fnRender" );
+				_fnMap( oCol, oOptions, "bUseRendered" );
+				_fnMap( oCol, oOptions, "iDataSort" );
+				_fnMap( oCol, oOptions, "asSorting" );
+				_fnMap( oCol, oOptions, "sSortDataType" );
+			}
+			
+			/* Feature sorting overrides column specific when off */
+			if ( !oSettings.oFeatures.bSort )
+			{
+				oCol.bSortable = false;
+			}
+			
+			/* Check that the class assignment is correct for sorting */
+			if ( !oCol.bSortable ||
+					 ($.inArray('asc', oCol.asSorting) == -1 && $.inArray('desc', oCol.asSorting) == -1) )
+			{
+				oCol.sSortingClass = oSettings.oClasses.sSortableNone;
+				oCol.sSortingClassJUI = "";
+			}
+			else if ( $.inArray('asc', oCol.asSorting) != -1 && $.inArray('desc', oCol.asSorting) == -1 )
+			{
+				oCol.sSortingClass = oSettings.oClasses.sSortableAsc;
+				oCol.sSortingClassJUI = oSettings.oClasses.sSortJUIAscAllowed;
+			}
+			else if ( $.inArray('asc', oCol.asSorting) == -1 && $.inArray('desc', oCol.asSorting) != -1 )
+			{
+				oCol.sSortingClass = oSettings.oClasses.sSortableDesc;
+				oCol.sSortingClassJUI = oSettings.oClasses.sSortJUIDescAllowed;
+			}
+		}
+		
+		/*
+		 * Function: _fnAddData
+		 * Purpose:  Add a data array to the table, creating DOM node etc
+		 * Returns:  int: - >=0 if successful (index of new aoData entry), -1 if failed
+		 * Inputs:   object:oSettings - dataTables settings object
+		 *           array:aData - data array to be added
+		 * Notes:    There are two basic methods for DataTables to get data to display - a JS array
+		 *   (which is dealt with by this function), and the DOM, which has it's own optimised
+		 *   function (_fnGatherData). Be careful to make the same changes here as there and vice-versa
+		 */
+		function _fnAddData ( oSettings, aDataSupplied )
+		{
+			/* Sanity check the length of the new array */
+			if ( aDataSupplied.length != oSettings.aoColumns.length &&
+				oSettings.iDrawError != oSettings.iDraw )
+			{
+				_fnLog( oSettings, 0, "Added data (size "+aDataSupplied.length+") does not match known "+
+					"number of columns ("+oSettings.aoColumns.length+")" );
+				oSettings.iDrawError = oSettings.iDraw;
+				return -1;
+			}
+			
+			
+			/* Create the object for storing information about this new row */
+			var aData = aDataSupplied.slice();
+			var iThisIndex = oSettings.aoData.length;
+			oSettings.aoData.push( {
+				"nTr": document.createElement('tr'),
+				"_iId": oSettings.iNextId++,
+				"_aData": aData,
+				"_anHidden": [],
+				"_sRowStripe": ''
+			} );
+			
+			/* Create the cells */
+			var nTd, sThisType;
+			for ( var i=0 ; i<aData.length ; i++ )
+			{
+				nTd = document.createElement('td');
+				
+				/* Allow null data (from a data array) - simply deal with it as a blank string */
+				if ( aData[i] === null )
+				{
+					aData[i] = '';
+				}
+				
+				if ( typeof oSettings.aoColumns[i].fnRender == 'function' )
+				{
+					var sRendered = oSettings.aoColumns[i].fnRender( {
+							"iDataRow": iThisIndex,
+							"iDataColumn": i,
+							"aData": aData,
+							"oSettings": oSettings
+						} );
+					nTd.innerHTML = sRendered;
+					if ( oSettings.aoColumns[i].bUseRendered )
+					{
+						/* Use the rendered data for filtering/sorting */
+						oSettings.aoData[iThisIndex]._aData[i] = sRendered;
+					}
+				}
+				else
+				{
+					nTd.innerHTML = aData[i];
+				}
+				
+				/* Cast everything as a string - so we can treat everything equally when sorting */
+				if ( typeof aData[i] != 'string' )
+				{
+					aData[i] += "";
+				}
+				aData[i] = $.trim(aData[i]);
+				
+				/* Add user defined class */
+				if ( oSettings.aoColumns[i].sClass !== null )
+				{
+					nTd.className = oSettings.aoColumns[i].sClass;
+				}
+				
+				/* See if we should auto-detect the column type */
+				if ( oSettings.aoColumns[i]._bAutoType && oSettings.aoColumns[i].sType != 'string' )
+				{
+					/* Attempt to auto detect the type - same as _fnGatherData() */
+					sThisType = _fnDetectType( oSettings.aoData[iThisIndex]._aData[i] );
+					if ( oSettings.aoColumns[i].sType === null )
+					{
+						oSettings.aoColumns[i].sType = sThisType;
+					}
+					else if ( oSettings.aoColumns[i].sType != sThisType )
+					{
+						/* String is always the 'fallback' option */
+						oSettings.aoColumns[i].sType = 'string';
+					}
+				}
+					
+				if ( oSettings.aoColumns[i].bVisible )
+				{
+					oSettings.aoData[iThisIndex].nTr.appendChild( nTd );
+					oSettings.aoData[iThisIndex]._anHidden[i] = null;
+				}
+				else
+				{
+					oSettings.aoData[iThisIndex]._anHidden[i] = nTd;
+				}
+			}
+			
+			/* Add to the display array */
+			oSettings.aiDisplayMaster.push( iThisIndex );
+			return iThisIndex;
+		}
+		
+		/*
+		 * Function: _fnGatherData
+		 * Purpose:  Read in the data from the target table from the DOM
+		 * Returns:  -
+		 * Inputs:   object:oSettings - dataTables settings object
+		 * Notes:    This is a optimised version of _fnAddData (more or less) for reading information
+		 *   from the DOM. The basic actions must be identical in the two functions.
+		 */
+		function _fnGatherData( oSettings )
+		{
+			var i, iLen, j, jLen, jInner,
+			 	nTds, nTrs, nTd, aLocalData, iThisIndex,
+				iRow, iRows, iColumn, iColumns;
+			
+			/*
+			 * Process by row first
+			 * Add the data object for the whole table - storing the tr node. Note - no point in getting
+			 * DOM based data if we are going to go and replace it with Ajax source data.
+			 */
+			if ( oSettings.sAjaxSource === null )
+			{
+				nTrs = oSettings.nTBody.childNodes;
+				for ( i=0, iLen=nTrs.length ; i<iLen ; i++ )
+				{
+					if ( nTrs[i].nodeName.toUpperCase() == "TR" )
+					{
+						iThisIndex = oSettings.aoData.length;
+						oSettings.aoData.push( {
+							"nTr": nTrs[i],
+							"_iId": oSettings.iNextId++,
+							"_aData": [],
+							"_anHidden": [],
+							"_sRowStripe": ''
+						} );
+						
+						oSettings.aiDisplayMaster.push( iThisIndex );
+						
+						aLocalData = oSettings.aoData[iThisIndex]._aData;
+						nTds = nTrs[i].childNodes;
+						jInner = 0;
+						
+						for ( j=0, jLen=nTds.length ; j<jLen ; j++ )
+						{
+							if ( nTds[j].nodeName.toUpperCase() == "TD" )
+							{
+								aLocalData[jInner] = $.trim(nTds[j].innerHTML);
+								jInner++;
+							}
+						}
+					}
+				}
+			}
+			
+			/* Gather in the TD elements of the Table - note that this is basically the same as
+			 * fnGetTdNodes, but that function takes account of hidden columns, which we haven't yet
+			 * setup!
+			 */
+			nTrs = _fnGetTrNodes( oSettings );
+			nTds = [];
+			for ( i=0, iLen=nTrs.length ; i<iLen ; i++ )
+			{
+				for ( j=0, jLen=nTrs[i].childNodes.length ; j<jLen ; j++ )
+				{
+					nTd = nTrs[i].childNodes[j];
+					if ( nTd.nodeName.toUpperCase() == "TD" )
+					{
+						nTds.push( nTd );
+					}
+				}
+			}
+			
+			/* Sanity check */
+			if ( nTds.length != nTrs.length * oSettings.aoColumns.length )
+			{
+				_fnLog( oSettings, 1, "Unexpected number of TD elements. Expected "+
+					(nTrs.length * oSettings.aoColumns.length)+" and got "+nTds.length+". DataTables does "+
+					"not support rowspan / colspan in the table body, and there must be one cell for each "+
+					"row/column combination." );
+			}
+			
+			/* Now process by column */
+			for ( iColumn=0, iColumns=oSettings.aoColumns.length ; iColumn<iColumns ; iColumn++ )
+			{
+				/* Get the title of the column - unless there is a user set one */
+				if ( oSettings.aoColumns[iColumn].sTitle === null )
+				{
+					oSettings.aoColumns[iColumn].sTitle = oSettings.aoColumns[iColumn].nTh.innerHTML;
+				}
+				
+				var
+					bAutoType = oSettings.aoColumns[iColumn]._bAutoType,
+					bRender = typeof oSettings.aoColumns[iColumn].fnRender == 'function',
+					bClass = oSettings.aoColumns[iColumn].sClass !== null,
+					bVisible = oSettings.aoColumns[iColumn].bVisible,
+					nCell, sThisType, sRendered;
+				
+				/* A single loop to rule them all (and be more efficient) */
+				if ( bAutoType || bRender || bClass || !bVisible )
+				{
+					for ( iRow=0, iRows=oSettings.aoData.length ; iRow<iRows ; iRow++ )
+					{
+						nCell = nTds[ (iRow*iColumns) + iColumn ];
+						
+						/* Type detection */
+						if ( bAutoType )
+						{
+							if ( oSettings.aoColumns[iColumn].sType != 'string' )
+							{
+								sThisType = _fnDetectType( oSettings.aoData[iRow]._aData[iColumn] );
+								if ( oSettings.aoColumns[iColumn].sType === null )
+								{
+									oSettings.aoColumns[iColumn].sType = sThisType;
+								}
+								else if ( oSettings.aoColumns[iColumn].sType != sThisType )
+								{
+									/* String is always the 'fallback' option */
+									oSettings.aoColumns[iColumn].sType = 'string';
+								}
+							}
+						}
+						
+						/* Rendering */
+						if ( bRender )
+						{
+							sRendered = oSettings.aoColumns[iColumn].fnRender( {
+									"iDataRow": iRow,
+									"iDataColumn": iColumn,
+									"aData": oSettings.aoData[iRow]._aData,
+									"oSettings": oSettings
+								} );
+							nCell.innerHTML = sRendered;
+							if ( oSettings.aoColumns[iColumn].bUseRendered )
+							{
+								/* Use the rendered data for filtering/sorting */
+								oSettings.aoData[iRow]._aData[iColumn] = sRendered;
+							}
+						}
+						
+						/* Classes */
+						if ( bClass )
+						{
+							nCell.className += ' '+oSettings.aoColumns[iColumn].sClass;
+						}
+						
+						/* Column visability */
+						if ( !bVisible )
+						{
+							oSettings.aoData[iRow]._anHidden[iColumn] = nCell;
+							nCell.parentNode.removeChild( nCell );
+						}
+						else
+						{
+							oSettings.aoData[iRow]._anHidden[iColumn] = null;
+						}
+					}
+				}
+			}
+		}
+		
+		
+		
+		/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+		 * Section - Drawing functions
+		 */
+		
+		/*
+		 * Function: _fnDrawHead
+		 * Purpose:  Create the HTML header for the table
+		 * Returns:  -
+		 * Inputs:   object:oSettings - dataTables settings object
+		 */
+		function _fnDrawHead( oSettings )
+		{
+			var i, nTh, iLen, j, jLen;
+			var anTr = oSettings.nTHead.getElementsByTagName('tr');
+			var iThs = oSettings.nTHead.getElementsByTagName('th').length;
+			var iCorrector = 0;
+			var jqChildren;
+			
+			/* If there is a header in place - then use it - otherwise it's going to get nuked... */
+			if ( iThs !== 0 )
+			{
+				/* We've got a thead from the DOM, so remove hidden columns and apply width to vis cols */
+				for ( i=0, iLen=oSettings.aoColumns.length ; i<iLen ; i++ )
+				{
+					nTh = oSettings.aoColumns[i].nTh;
+					
+					if ( oSettings.aoColumns[i].sClass !== null )
+					{
+						$(nTh).addClass( oSettings.aoColumns[i].sClass );
+					}
+					
+					/* Cache and remove (if needed) any extra elements for this column in the header */
+					for ( j=1, jLen=anTr.length ; j<jLen ; j++ )
+					{
+						jqChildren = $(anTr[j]).children();
+						oSettings.aoColumns[i].anThExtra.push( jqChildren[i-iCorrector] );
+						if ( !oSettings.aoColumns[i].bVisible )
+						{
+							anTr[j].removeChild( jqChildren[i-iCorrector] );
+						}
+					}
+					
+					if ( oSettings.aoColumns[i].bVisible )
+					{
+						/* Set the title of the column if it is user defined (not what was auto detected) */
+						if ( oSettings.aoColumns[i].sTitle != nTh.innerHTML )
+						{
+							nTh.innerHTML = oSettings.aoColumns[i].sTitle;
+						}
+					}
+					else
+					{
+						nTh.parentNode.removeChild( nTh );
+						iCorrector++;
+					}
+				}
+			}
+			else
+			{
+				/* We don't have a header in the DOM - so we are going to have to create one */
+				var nTr = document.createElement( "tr" );
+				
+				for ( i=0, iLen=oSettings.aoColumns.length ; i<iLen ; i++ )
+				{
+					nTh = oSettings.aoColumns[i].nTh;
+					nTh.innerHTML = oSettings.aoColumns[i].sTitle;
+					
+					if ( oSettings.aoColumns[i].sClass !== null )
+					{
+						$(nTh).addClass( oSettings.aoColumns[i].sClass );
+					}
+					
+					if ( oSettings.aoColumns[i].bVisible )
+					{
+						nTr.appendChild( nTh );
+					}
+				}
+				$(oSettings.nTHead).html( '' )[0].appendChild( nTr );
+			}
+			
+			/* Add the extra markup needed by jQuery UI's themes */
+			if ( oSettings.bJUI )
+			{
+				for ( i=0, iLen=oSettings.aoColumns.length ; i<iLen ; i++ )
+				{
+					nTh = oSettings.aoColumns[i].nTh;
+					
+					var nDiv = document.createElement('div');
+					nDiv.className = oSettings.oClasses.sSortJUIWrapper;
+					$(nTh).contents().appendTo(nDiv);
+					
+					nDiv.appendChild( document.createElement('span') );
+					nTh.appendChild( nDiv );
+				}
+			}
+			
+			/* Add sort listener */
+			var fnNoSelect = function (e) {
+				this.onselectstart = function() { return false; };
+				return false;
+			};
+			
+			if ( oSettings.oFeatures.bSort )
+			{
+				for ( i=0 ; i<oSettings.aoColumns.length ; i++ )
+				{
+					if ( oSettings.aoColumns[i].bSortable !== false )
+					{
+						_fnSortAttachListener( oSettings, oSettings.aoColumns[i].nTh, i );
+						
+						/* Take the brutal approach to cancelling text selection in header */
+						$(oSettings.aoColumns[i].nTh).bind( 'mousedown.DT', fnNoSelect );
+					}
+					else
+					{
+						$(oSettings.aoColumns[i].nTh).addClass( oSettings.oClasses.sSortableNone );
+					}
+				}
+			}
+			
+			/* Cache the footer elements */
+			if ( oSettings.nTFoot !== null )
+			{
+				iCorrector = 0;
+				anTr = oSettings.nTFoot.getElementsByTagName('tr');
+				var nTfs = anTr[0].getElementsByTagName('th');
+				
+				for ( i=0, iLen=nTfs.length ; i<iLen ; i++ )
+				{
+					if ( typeof oSettings.aoColumns[i] != 'undefined' )
+					{
+						oSettings.aoColumns[i].nTf = nTfs[i-iCorrector];
+						
+						if ( oSettings.oClasses.sFooterTH !== "" )
+						{
+							oSettings.aoColumns[i].nTf.className += " "+oSettings.oClasses.sFooterTH;
+						}
+						
+						/* Deal with any extra elements for this column from the footer */
+						for ( j=1, jLen=anTr.length ; j<jLen ; j++ )
+						{
+							jqChildren = $(anTr[j]).children();
+							oSettings.aoColumns[i].anTfExtra.push( jqChildren[i-iCorrector] );
+							if ( !oSettings.aoColumns[i].bVisible )
+							{
+								anTr[j].removeChild( jqChildren[i-iCorrector] );
+							}
+						}
+						
+						if ( !oSettings.aoColumns[i].bVisible )
+						{
+							nTfs[i-iCorrector].parentNode.removeChild( nTfs[i-iCorrector] );
+							iCorrector++;
+						}
+					}
+				}
+			}
+		}
+		
+		/*
+		 * Function: _fnDraw
+		 * Purpose:  Insert the required TR nodes into the table for display
+		 * Returns:  -
+		 * Inputs:   object:oSettings - dataTables settings object
+		 */
+		function _fnDraw( oSettings )
+		{
+			var i, iLen;
+			var anRows = [];
+			var iRowCount = 0;
+			var bRowError = false;
+			var iStrips = oSettings.asStripClasses.length;
+			var iOpenRows = oSettings.aoOpenRows.length;
+			
+			oSettings.bDrawing = true;
+			
+			/* Check and see if we have an initial draw position from state saving */
+			if ( typeof oSettings.iInitDisplayStart != 'undefined' && oSettings.iInitDisplayStart != -1 )
+			{
+				if ( oSettings.oFeatures.bServerSide )
+				{
+					oSettings._iDisplayStart = oSettings.iInitDisplayStart;
+				}
+				else
+				{
+					oSettings._iDisplayStart = (oSettings.iInitDisplayStart >= oSettings.fnRecordsDisplay()) ?
+						0 : oSettings.iInitDisplayStart;
+				}
+				oSettings.iInitDisplayStart = -1;
+				_fnCalculateEnd( oSettings );
+			}
+			
+			/* If we are dealing with Ajax - do it here */
+			if ( !oSettings.bDestroying && oSettings.oFeatures.bServerSide && 
+			     !_fnAjaxUpdate( oSettings ) )
+			{
+				return;
+			}
+			else if ( !oSettings.oFeatures.bServerSide )
+			{
+				oSettings.iDraw++;
+			}
+			
+			if ( oSettings.aiDisplay.length !== 0 )
+			{
+				var iStart = oSettings._iDisplayStart;
+				var iEnd = oSettings._iDisplayEnd;
+				
+				if ( oSettings.oFeatures.bServerSide )
+				{
+					iStart = 0;
+					iEnd = oSettings.aoData.length;
+				}
+				
+				for ( var j=iStart ; j<iEnd ; j++ )
+				{
+					var aoData = oSettings.aoData[ oSettings.aiDisplay[j] ];
+					var nRow = aoData.nTr;
+					
+					/* Remove the old stripping classes and then add the new one */
+					if ( iStrips !== 0 )
+					{
+						var sStrip = oSettings.asStripClasses[ iRowCount % iStrips ];
+						if ( aoData._sRowStripe != sStrip )
+						{
+							$(nRow).removeClass( aoData._sRowStripe ).addClass( sStrip );
+							aoData._sRowStripe = sStrip;
+						}
+					}
+					
+					/* Custom row callback function - might want to manipule the row */
+					if ( typeof oSettings.fnRowCallback == "function" )
+					{
+						nRow = oSettings.fnRowCallback.call( oSettings.oInstance, nRow, 
+							oSettings.aoData[ oSettings.aiDisplay[j] ]._aData, iRowCount, j );
+						if ( !nRow && !bRowError )
+						{
+							_fnLog( oSettings, 0, "A node was not returned by fnRowCallback" );
+							bRowError = true;
+						}
+					}
+					
+					anRows.push( nRow );
+					iRowCount++;
+					
+					/* If there is an open row - and it is attached to this parent - attach it on redraw */
+					if ( iOpenRows !== 0 )
+					{
+						for ( var k=0 ; k<iOpenRows ; k++ )
+						{
+							if ( nRow == oSettings.aoOpenRows[k].nParent )
+							{
+								anRows.push( oSettings.aoOpenRows[k].nTr );
+							}
+						}
+					}
+				}
+			}
+			else
+			{
+				/* Table is empty - create a row with an empty message in it */
+				anRows[ 0 ] = document.createElement( 'tr' );
+				
+				if ( typeof oSettings.asStripClasses[0] != 'undefined' )
+				{
+					anRows[ 0 ].className = oSettings.asStripClasses[0];
+				}
+				
+				var nTd = document.createElement( 'td' );
+				nTd.setAttribute( 'valign', "top" );
+				nTd.colSpan = _fnVisbleColumns( oSettings );
+				nTd.className = oSettings.oClasses.sRowEmpty;
+				if ( typeof oSettings.oLanguage.sEmptyTable != 'undefined' &&
+				     oSettings.fnRecordsTotal() === 0 )
+				{
+					nTd.innerHTML = oSettings.oLanguage.sEmptyTable;
+				}
+				else
+				{
+					nTd.innerHTML = oSettings.oLanguage.sZeroRecords.replace(
+						'_MAX_', oSettings.fnFormatNumber(oSettings.fnRecordsTotal()) );
+				}
+				
+				anRows[ iRowCount ].appendChild( nTd );
+			}
+			
+			/* Callback the header and footer custom funcation if there is one */
+			if ( typeof oSettings.fnHeaderCallback == 'function' )
+			{
+				oSettings.fnHeaderCallback.call( oSettings.oInstance, $('>tr', oSettings.nTHead)[0], 
+					_fnGetDataMaster( oSettings ), oSettings._iDisplayStart, oSettings.fnDisplayEnd(),
+					oSettings.aiDisplay );
+			}
+			
+			if ( typeof oSettings.fnFooterCallback == 'function' )
+			{
+				oSettings.fnFooterCallback.call( oSettings.oInstance, $('>tr', oSettings.nTFoot)[0], 
+					_fnGetDataMaster( oSettings ), oSettings._iDisplayStart, oSettings.fnDisplayEnd(),
+					oSettings.aiDisplay );
+			}
+			
+			/* 
+			 * Need to remove any old row from the display - note we can't just empty the tbody using
+			 * $().html('') since this will unbind the jQuery event handlers (even although the node 
+			 * still exists!) - equally we can't use innerHTML, since IE throws an exception.
+			 */
+			var
+				nAddFrag = document.createDocumentFragment(),
+				nRemoveFrag = document.createDocumentFragment(),
+				nBodyPar, nTrs;
+			
+			if ( oSettings.nTBody )
+			{
+				nBodyPar = oSettings.nTBody.parentNode;
+				nRemoveFrag.appendChild( oSettings.nTBody );
+				
+				/* When doing infinite scrolling, only remove child rows when sorting, filtering or start
+				 * up. When not infinite scroll, always do it.
+				 */
+				if ( !oSettings.oScroll.bInfinite || !oSettings._bInitComplete ||
+				 	oSettings.bSorted || oSettings.bFiltered )
+				{
+					nTrs = oSettings.nTBody.childNodes;
+					for ( i=nTrs.length-1 ; i>=0 ; i-- )
+					{
+						nTrs[i].parentNode.removeChild( nTrs[i] );
+					}
+				}
+				
+				/* Put the draw table into the dom */
+				for ( i=0, iLen=anRows.length ; i<iLen ; i++ )
+				{
+					nAddFrag.appendChild( anRows[i] );
+				}
+				
+				oSettings.nTBody.appendChild( nAddFrag );
+				if ( nBodyPar !== null )
+				{
+					nBodyPar.appendChild( oSettings.nTBody );
+				}
+			}
+			
+			/* Call all required callback functions for the end of a draw */
+			for ( i=oSettings.aoDrawCallback.length-1 ; i>=0 ; i-- )
+			{
+				oSettings.aoDrawCallback[i].fn.call( oSettings.oInstance, oSettings );
+			}
+			
+			/* Draw is complete, sorting and filtering must be as well */
+			oSettings.bSorted = false;
+			oSettings.bFiltered = false;
+			oSettings.bDrawing = false;
+			
+			if ( oSettings.oFeatures.bServerSide )
+			{
+				_fnProcessingDisplay( oSettings, false );
+				if ( typeof oSettings._bInitComplete == 'undefined' )
+				{
+					_fnInitComplete( oSettings );
+				}
+			}
+		}
+		
+		/*
+		 * Function: _fnReDraw
+		 * Purpose:  Redraw the table - taking account of the various features which are enabled
+		 * Returns:  -
+		 * Inputs:   object:oSettings - dataTables settings object
+		 */
+		function _fnReDraw( oSettings )
+		{
+			if ( oSettings.oFeatures.bSort )
+			{
+				/* Sorting will refilter and draw for us */
+				_fnSort( oSettings, oSettings.oPreviousSearch );
+			}
+			else if ( oSettings.oFeatures.bFilter )
+			{
+				/* Filtering will redraw for us */
+				_fnFilterComplete( oSettings, oSettings.oPreviousSearch );
+			}
+			else
+			{
+				_fnCalculateEnd( oSettings );
+				_fnDraw( oSettings );
+			}
+		}
+		
+		/*
+		 * Function: _fnAjaxUpdate
+		 * Purpose:  Update the table using an Ajax call
+		 * Returns:  bool: block the table drawing or not
+		 * Inputs:   object:oSettings - dataTables settings object
+		 */
+		function _fnAjaxUpdate( oSettings )
+		{
+			if ( oSettings.bAjaxDataGet )
+			{
+				_fnProcessingDisplay( oSettings, true );
+				var iColumns = oSettings.aoColumns.length;
+				var aoData = [];
+				var i;
+				
+				/* Paging and general */
+				oSettings.iDraw++;
+				aoData.push( { "name": "sEcho",          "value": oSettings.iDraw } );
+				aoData.push( { "name": "iColumns",       "value": iColumns } );
+				aoData.push( { "name": "sColumns",       "value": _fnColumnOrdering(oSettings) } );
+				aoData.push( { "name": "iDisplayStart",  "value": oSettings._iDisplayStart } );
+				aoData.push( { "name": "iDisplayLength", "value": oSettings.oFeatures.bPaginate !== false ?
+					oSettings._iDisplayLength : -1 } );
+				
+				/* Filtering */
+				if ( oSettings.oFeatures.bFilter !== false )
+				{
+					aoData.push( { "name": "sSearch", "value": oSettings.oPreviousSearch.sSearch } );
+					aoData.push( { "name": "bRegex",  "value": oSettings.oPreviousSearch.bRegex } );
+					for ( i=0 ; i<iColumns ; i++ )
+					{
+						aoData.push( { "name": "sSearch_"+i,     "value": oSettings.aoPreSearchCols[i].sSearch } );
+						aoData.push( { "name": "bRegex_"+i,      "value": oSettings.aoPreSearchCols[i].bRegex } );
+						aoData.push( { "name": "bSearchable_"+i, "value": oSettings.aoColumns[i].bSearchable } );
+					}
+				}
+				
+				/* Sorting */
+				if ( oSettings.oFeatures.bSort !== false )
+				{
+					var iFixed = oSettings.aaSortingFixed !== null ? oSettings.aaSortingFixed.length : 0;
+					var iUser = oSettings.aaSorting.length;
+					aoData.push( { "name": "iSortingCols",   "value": iFixed+iUser } );
+					for ( i=0 ; i<iFixed ; i++ )
+					{
+						aoData.push( { "name": "iSortCol_"+i,  "value": oSettings.aaSortingFixed[i][0] } );
+						aoData.push( { "name": "sSortDir_"+i,  "value": oSettings.aaSortingFixed[i][1] } );
+					}
+					
+					for ( i=0 ; i<iUser ; i++ )
+					{
+						aoData.push( { "name": "iSortCol_"+(i+iFixed),  "value": oSettings.aaSorting[i][0] } );
+						aoData.push( { "name": "sSortDir_"+(i+iFixed),  "value": oSettings.aaSorting[i][1] } );
+					}
+					
+					for ( i=0 ; i<iColumns ; i++ )
+					{
+						aoData.push( { "name": "bSortable_"+i,  "value": oSettings.aoColumns[i].bSortable } );
+					}
+				}
+				
+				oSettings.fnServerData.call( oSettings.oInstance, oSettings.sAjaxSource, aoData,
+					function(json) {
+						_fnAjaxUpdateDraw( oSettings, json );
+					} );
+				return false;
+			}
+			else
+			{
+				return true;
+			}
+		}
+		
+		/*
+		 * Function: _fnAjaxUpdateDraw
+		 * Purpose:  Data the data from the server (nuking the old) and redraw the table
+		 * Returns:  -
+		 * Inputs:   object:oSettings - dataTables settings object
+		 *           object:json - json data return from the server.
+		 *             The following must be defined:
+		 *               iTotalRecords, iTotalDisplayRecords, aaData
+		 *             The following may be defined:
+		 *               sColumns
+		 */
+		function _fnAjaxUpdateDraw ( oSettings, json )
+		{
+			if ( typeof json.sEcho != 'undefined' )
+			{
+				/* Protect against old returns over-writing a new one. Possible when you get
+				 * very fast interaction, and later queires are completed much faster
+				 */
+				if ( json.sEcho*1 < oSettings.iDraw )
+				{
+					return;
+				}
+				else
+				{
+					oSettings.iDraw = json.sEcho * 1;
+				}
+			}
+			
+			if ( !oSettings.oScroll.bInfinite ||
+				   (oSettings.oScroll.bInfinite && (oSettings.bSorted || oSettings.bFiltered)) )
+			{
+				_fnClearTable( oSettings );
+			}
+			oSettings._iRecordsTotal = json.iTotalRecords;
+			oSettings._iRecordsDisplay = json.iTotalDisplayRecords;
+			
+			/* Determine if reordering is required */
+			var sOrdering = _fnColumnOrdering(oSettings);
+			var bReOrder = (typeof json.sColumns != 'undefined' && sOrdering !== "" && json.sColumns != sOrdering );
+			if ( bReOrder )
+			{
+				var aiIndex = _fnReOrderIndex( oSettings, json.sColumns );
+			}
+			
+			for ( var i=0, iLen=json.aaData.length ; i<iLen ; i++ )
+			{
+				if ( bReOrder )
+				{
+					/* If we need to re-order, then create a new array with the correct order and add it */
+					var aData = [];
+					for ( var j=0, jLen=oSettings.aoColumns.length ; j<jLen ; j++ )
+					{
+						aData.push( json.aaData[i][ aiIndex[j] ] );
+					}
+					_fnAddData( oSettings, aData );
+				}
+				else
+				{
+					/* No re-order required, sever got it "right" - just straight add */
+					_fnAddData( oSettings, json.aaData[i] );
+				}
+			}
+			oSettings.aiDisplay = oSettings.aiDisplayMaster.slice();
+			
+			oSettings.bAjaxDataGet = false;
+			_fnDraw( oSettings );
+			oSettings.bAjaxDataGet = true;
+			_fnProcessingDisplay( oSettings, false );
+		}
+		
+		
+		/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+		 * Section - Options (features) HTML
+		 */
+		
+		/*
+		 * Function: _fnAddOptionsHtml
+		 * Purpose:  Add the options to the page HTML for the table
+		 * Returns:  -
+		 * Inputs:   object:oSettings - dataTables settings object
+		 */
+		function _fnAddOptionsHtml ( oSettings )
+		{
+			/*
+			 * Create a temporary, empty, div which we can later on replace with what we have generated
+			 * we do it this way to rendering the 'options' html offline - speed :-)
+			 */
+			var nHolding = document.createElement( 'div' );
+			oSettings.nTable.parentNode.insertBefore( nHolding, oSettings.nTable );
+			
+			/* 
+			 * All DataTables are wrapped in a div - this is not currently optional - backwards 
+			 * compatability. It can be removed if you don't want it.
+			 */
+			oSettings.nTableWrapper = document.createElement( 'div' );
+			oSettings.nTableWrapper.className = oSettings.oClasses.sWrapper;
+			if ( oSettings.sTableId !== '' )
+			{
+				oSettings.nTableWrapper.setAttribute( 'id', oSettings.sTableId+'_wrapper' );
+			}
+			
+			/* Track where we want to insert the option */
+			var nInsertNode = oSettings.nTableWrapper;
+			
+			/* Loop over the user set positioning and place the elements as needed */
+			var aDom = oSettings.sDom.split('');
+			var nTmp = null, iPushFeature, cOption, nNewNode, cNext, sAttr, j;
+			for ( var i=0 ; i<aDom.length ; i++ )
+			{
+				iPushFeature = 0;
+				cOption = aDom[i];
+				
+				if ( cOption == '<' )
+				{
+					/* New container div */
+					nNewNode = document.createElement( 'div' );
+					
+					/* Check to see if we should append an id and/or a class name to the container */
+					cNext = aDom[i+1];
+					if ( cNext == "'" || cNext == '"' )
+					{
+						sAttr = "";
+						j = 2;
+						while ( aDom[i+j] != cNext )
+						{
+							sAttr += aDom[i+j];
+							j++;
+						}
+						
+						/* Replace jQuery UI constants */
+						if ( sAttr == "H" )
+						{
+							sAttr = "fg-toolbar ui-toolbar ui-widget-header ui-corner-tl ui-corner-tr ui-helper-clearfix";
+						}
+						else if ( sAttr == "F" )
+						{
+							sAttr = "fg-toolbar ui-toolbar ui-widget-header ui-corner-bl ui-corner-br ui-helper-clearfix";
+						}
+						
+						/* The attribute can be in the format of "#id.class", "#id" or "class" This logic
+						 * breaks the string into parts and applies them as needed
+						 */
+						if ( sAttr.indexOf('.') != -1 )
+						{
+							var aSplit = sAttr.split('.');
+							nNewNode.setAttribute('id', aSplit[0].substr(1, aSplit[0].length-1) );
+							nNewNode.className = aSplit[1];
+						}
+						else if ( sAttr.charAt(0) == "#" )
+						{
+							nNewNode.setAttribute('id', sAttr.substr(1, sAttr.length-1) );
+						}
+						else
+						{
+							nNewNode.className = sAttr;
+						}
+						
+						i += j; /* Move along the position array */
+					}
+					
+					nInsertNode.appendChild( nNewNode );
+					nInsertNode = nNewNode;
+				}
+				else if ( cOption == '>' )
+				{
+					/* End container div */
+					nInsertNode = nInsertNode.parentNode;
+				}
+				else if ( cOption == 'l' && oSettings.oFeatures.bPaginate && oSettings.oFeatures.bLengthChange )
+				{
+					/* Length */
+					nTmp = _fnFeatureHtmlLength( oSettings );
+					iPushFeature = 1;
+				}
+				else if ( cOption == 'f' && oSettings.oFeatures.bFilter )
+				{
+					/* Filter */
+					nTmp = _fnFeatureHtmlFilter( oSettings );
+					iPushFeature = 1;
+				}
+				else if ( cOption == 'r' && oSettings.oFeatures.bProcessing )
+				{
+					/* pRocessing */
+					nTmp = _fnFeatureHtmlProcessing( oSettings );
+					iPushFeature = 1;
+				}
+				else if ( cOption == 't' )
+				{
+					/* Table */
+					nTmp = _fnFeatureHtmlTable( oSettings );
+					iPushFeature = 1;
+				}
+				else if ( cOption ==  'i' && oSettings.oFeatures.bInfo )
+				{
+					/* Info */
+					nTmp = _fnFeatureHtmlInfo( oSettings );
+					iPushFeature = 1;
+				}
+				else if ( cOption == 'p' && oSettings.oFeatures.bPaginate )
+				{
+					/* Pagination */
+					nTmp = _fnFeatureHtmlPaginate( oSettings );
+					iPushFeature = 1;
+				}
+				else if ( _oExt.aoFeatures.length !== 0 )
+				{
+					/* Plug-in features */
+					var aoFeatures = _oExt.aoFeatures;
+					for ( var k=0, kLen=aoFeatures.length ; k<kLen ; k++ )
+					{
+						if ( cOption == aoFeatures[k].cFeature )
+						{
+							nTmp = aoFeatures[k].fnInit( oSettings );
+							if ( nTmp )
+							{
+								iPushFeature = 1;
+							}
+							break;
+						}
+					}
+				}
+				
+				/* Add to the 2D features array */
+				if ( iPushFeature == 1 && nTmp !== null )
+				{
+					if ( typeof oSettings.aanFeatures[cOption] != 'object' )
+					{
+						oSettings.aanFeatures[cOption] = [];
+					}
+					oSettings.aanFeatures[cOption].push( nTmp );
+					nInsertNode.appendChild( nTmp );
+				}
+			}
+			
+			/* Built our DOM structure - replace the holding div with what we want */
+			nHolding.parentNode.replaceChild( oSettings.nTableWrapper, nHolding );
+		}
+		
+		
+		/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+		 * Section - Feature: Filtering
+		 */
+		
+		/*
+		 * Function: _fnFeatureHtmlTable
+		 * Purpose:  Add any control elements for the table - specifically scrolling
+		 * Returns:  node: - Node to add to the DOM
+		 * Inputs:   object:oSettings - dataTables settings object
+		 */
+		function _fnFeatureHtmlTable ( oSettings )
+		{
+			/* Chack if scrolling is enabled or not - if not then leave the DOM unaltered */
+			if ( oSettings.oScroll.sX === "" && oSettings.oScroll.sY === "" )
+			{
+				return oSettings.nTable;
+			}
+			
+			/*
+			 * The HTML structure that we want to generate in this function is:
+			 *  div - nScroller
+			 *    div - nScrollHead
+			 *      div - nScrollHeadInner
+			 *        table - nScrollHeadTable
+			 *          thead - nThead
+			 *    div - nScrollBody
+			 *      table - oSettings.nTable
+			 *        thead - nTheadSize
+			 *        tbody - nTbody
+			 *    div - nScrollFoot
+			 *      div - nScrollFootInner
+			 *        table - nScrollFootTable
+			 *          tfoot - nTfoot
+			 */
+			var
+			 	nScroller = document.createElement('div'),
+			 	nScrollHead = document.createElement('div'),
+			 	nScrollHeadInner = document.createElement('div'),
+			 	nScrollBody = document.createElement('div'),
+			 	nScrollFoot = document.createElement('div'),
+			 	nScrollFootInner = document.createElement('div'),
+			 	nScrollHeadTable = oSettings.nTable.cloneNode(false),
+			 	nScrollFootTable = oSettings.nTable.cloneNode(false),
+				nThead = oSettings.nTable.getElementsByTagName('thead')[0],
+			 	nTfoot = oSettings.nTable.getElementsByTagName('tfoot').length === 0 ? null : 
+					oSettings.nTable.getElementsByTagName('tfoot')[0],
+				oClasses = (typeof oInit.bJQueryUI != 'undefined' && oInit.bJQueryUI) ?
+			 		_oExt.oJUIClasses : _oExt.oStdClasses;
+			
+			nScrollHead.appendChild( nScrollHeadInner );
+			nScrollFoot.appendChild( nScrollFootInner );
+			nScrollBody.appendChild( oSettings.nTable );
+			nScroller.appendChild( nScrollHead );
+			nScroller.appendChild( nScrollBody );
+			nScrollHeadInner.appendChild( nScrollHeadTable );
+			nScrollHeadTable.appendChild( nThead );
+			if ( nTfoot !== null )
+			{
+				nScroller.appendChild( nScrollFoot );
+				nScrollFootInner.appendChild( nScrollFootTable );
+				nScrollFootTable.appendChild( nTfoot );
+			}
+			
+			nScroller.className = oClasses.sScrollWrapper;
+			nScrollHead.className = oClasses.sScrollHead;
+			nScrollHeadInner.className = oClasses.sScrollHeadInner;
+			nScrollBody.className = oClasses.sScrollBody;
+			nScrollFoot.className = oClasses.sScrollFoot;
+			nScrollFootInner.className = oClasses.sScrollFootInner;
+			
+			if ( oSettings.oScroll.bAutoCss )
+			{
+				nScrollHead.style.overflow = "hidden";
+				nScrollHead.style.position = "relative";
+				nScrollFoot.style.overflow = "hidden";
+				nScrollBody.style.overflow = "auto";
+			}
+			
+			nScrollHead.style.border = "0";
+			nScrollHead.style.width = "100%";
+			nScrollFoot.style.border = "0";
+			nScrollHeadInner.style.width = "150%"; /* will be overwritten */
+			
+			/* Modify attributes to respect the clones */
+			nScrollHeadTable.removeAttribute('id');
+			nScrollHeadTable.style.marginLeft = "0";
+			oSettings.nTable.style.marginLeft = "0";
+			if ( nTfoot !== null )
+			{
+				nScrollFootTable.removeAttribute('id');
+				nScrollFootTable.style.marginLeft = "0";
+			}
+			
+			/* Move any caption elements from the body to the header */
+			var nCaptions = $('>caption', oSettings.nTable);
+			for ( var i=0, iLen=nCaptions.length ; i<iLen ; i++ )
+			{
+				nScrollHeadTable.appendChild( nCaptions[i] );
+			}
+			
+			/*
+			 * Sizing
+			 */
+			/* When xscrolling add the width and a scroller to move the header with the body */
+			if ( oSettings.oScroll.sX !== "" )
+			{
+				nScrollHead.style.width = _fnStringToCss( oSettings.oScroll.sX );
+				nScrollBody.style.width = _fnStringToCss( oSettings.oScroll.sX );
+				
+				if ( nTfoot !== null )
+				{
+					nScrollFoot.style.width = _fnStringToCss( oSettings.oScroll.sX );	
+				}
+				
+				/* When the body is scrolled, then we also want to scroll the headers */
+				$(nScrollBody).scroll( function (e) {
+					nScrollHead.scrollLeft = this.scrollLeft;
+					
+					if ( nTfoot !== null )
+					{
+						nScrollFoot.scrollLeft = this.scrollLeft;
+					}
+				} );
+			}
+			
+			/* When yscrolling, add the height */
+			if ( oSettings.oScroll.sY !== "" )
+			{
+				nScrollBody.style.height = _fnStringToCss( oSettings.oScroll.sY );
+			}
+			
+			/* Redraw - align columns across the tables */
+			oSettings.aoDrawCallback.push( {
+				"fn": _fnScrollDraw,
+				"sName": "scrolling"
+			} );
+			
+			/* Infinite scrolling event handlers */
+			if ( oSettings.oScroll.bInfinite )
+			{
+				$(nScrollBody).scroll( function() {
+					/* Use a blocker to stop scrolling from loading more data while other data is still loading */
+					if ( !oSettings.bDrawing )
+					{
+						/* Check if we should load the next data set */
+						if ( $(this).scrollTop() + $(this).height() > 
+							$(oSettings.nTable).height() - oSettings.oScroll.iLoadGap )
+						{
+							/* Only do the redraw if we have to - we might be at the end of the data */
+							if ( oSettings.fnDisplayEnd() < oSettings.fnRecordsDisplay() )
+							{
+								_fnPageChange( oSettings, 'next' );
+								_fnCalculateEnd( oSettings );
+								_fnDraw( oSettings );
+							}
+						}
+					}
+				} );
+			}
+			
+			oSettings.nScrollHead = nScrollHead;
+			oSettings.nScrollFoot = nScrollFoot;
+			
+			return nScroller;
+		}
+		
+		/*
+		 * Function: _fnScrollDraw
+		 * Purpose:  Update the various tables for resizing
+		 * Returns:  node: - Node to add to the DOM
+		 * Inputs:   object:o - dataTables settings object
+		 * Notes:    It's a bit of a pig this function, but basically the idea to:
+		 *   1. Re-create the table inside the scrolling div
+		 *   2. Take live measurements from the DOM
+		 *   3. Apply the measurements
+		 *   4. Clean up
+		 */
+		function _fnScrollDraw ( o )
+		{
+			var
+				nScrollHeadInner = o.nScrollHead.getElementsByTagName('div')[0],
+				nScrollHeadTable = nScrollHeadInner.getElementsByTagName('table')[0],
+				nScrollBody = o.nTable.parentNode,
+				i, iLen, anHeadToSize, anHeadSizers, anFootSizers = null, anFootToSize, oStyle, iVis,
+				iWidth, aApplied=[], iSanityWidth;
+			
+			/*
+			 * 1. Re-create the table inside the scrolling div
+			 */
+			
+			/* Remove the old minimised thead and tfoot elements in the inner table */
+			var nTheadSize = o.nTable.getElementsByTagName('thead');
+			if ( nTheadSize.length > 0 )
+			{
+				o.nTable.removeChild( nTheadSize[0] );
+			}
+			
+			if ( o.nTFoot !== null )
+			{
+				/* Remove the old minimised footer element in the cloned header */
+				var nTfootSize = o.nTable.getElementsByTagName('tfoot');
+				if ( nTfootSize.length > 0 )
+				{
+					o.nTable.removeChild( nTfootSize[0] );
+				}
+			}
+			
+			/* Clone the current header and footer elements and then place it into the inner table */
+			nTheadSize = o.nTHead.cloneNode(true);
+			o.nTable.insertBefore( nTheadSize, o.nTable.childNodes[0] );
+			
+			if ( o.nTFoot !== null )
+			{
+				nTfootSize = o.nTFoot.cloneNode(true);
+				o.nTable.insertBefore( nTfootSize, o.nTable.childNodes[1] );
+			}
+			
+			/*
+			 * 2. Take live measurements from the DOM - do not alter the DOM itself!
+			 */
+			
+			/* Remove old sizing and apply the calculated column widths
+			 * Get the unique column headers in the newly created (cloned) header. We want to apply the
+			 * calclated sizes to this header
+			 */
+			var nThs = _fnGetUniqueThs( nTheadSize );
+			for ( i=0, iLen=nThs.length ; i<iLen ; i++ )
+			{
+				iVis = _fnVisibleToColumnIndex( o, i );
+				nThs[i].style.width = o.aoColumns[iVis].sWidth;
+			}
+			
+			if ( o.nTFoot !== null )
+			{
+				_fnApplyToChildren( function(n) {
+					n.style.width = "";
+				}, nTfootSize.getElementsByTagName('tr') );
+			}
+			
+			/* Size the table as a whole */
+			iSanityWidth = $(o.nTable).outerWidth();
+			if ( o.oScroll.sX === "" )
+			{
+				/* No x scrolling */
+				o.nTable.style.width = "100%";
+				
+				/* I know this is rubbish - but IE7 will make the width of the table when 100% include
+				 * the scrollbar - which is shouldn't. This needs feature detection in future - to do
+				 */
+				if ( $.browser.msie && $.browser.version <= 7 )
+				{
+					o.nTable.style.width = _fnStringToCss( $(o.nTable).outerWidth()-o.oScroll.iBarWidth );
+				}
+			}
+			else
+			{
+				if ( o.oScroll.sXInner !== "" )
+				{
+					/* x scroll inner has been given - use it */
+					o.nTable.style.width = _fnStringToCss(o.oScroll.sXInner);
+				}
+				else if ( iSanityWidth == $(nScrollBody).width() &&
+				   $(nScrollBody).height() < $(o.nTable).height() )
+				{
+					/* There is y-scrolling - try to take account of the y scroll bar */
+					o.nTable.style.width = _fnStringToCss( iSanityWidth-o.oScroll.iBarWidth );
+					if ( $(o.nTable).outerWidth() > iSanityWidth-o.oScroll.iBarWidth )
+					{
+						/* Not possible to take account of it */
+						o.nTable.style.width = _fnStringToCss( iSanityWidth );
+					}
+				}
+				else
+				{
+					/* All else fails */
+					o.nTable.style.width = _fnStringToCss( iSanityWidth );
+				}
+			}
+			
+			/* Recalculate the sanity width - now that we've applied the required width, before it was
+			 * a temporary variable. This is required because the column width calculation is done
+			 * before this table DOM is created.
+			 */
+			iSanityWidth = $(o.nTable).outerWidth();
+			
+			/* We want the hidden header to have zero height, so remove padding and borders. Then
+			 * set the width based on the real headers
+			 */
+			anHeadToSize = o.nTHead.getElementsByTagName('tr');
+			anHeadSizers = nTheadSize.getElementsByTagName('tr');
+			
+			_fnApplyToChildren( function(nSizer, nToSize) {
+				oStyle = nSizer.style;
+				oStyle.paddingTop = "0";
+				oStyle.paddingBottom = "0";
+				oStyle.borderTopWidth = "0";
+				oStyle.borderBottomWidth = "0";
+				oStyle.height = 0;
+				
+				iWidth = $(nSizer).width();
+				nToSize.style.width = _fnStringToCss( iWidth );
+				aApplied.push( iWidth );
+			}, anHeadSizers, anHeadToSize );
+			$(anHeadSizers).height(0);
+			
+			if ( o.nTFoot !== null )
+			{
+				/* Clone the current footer and then place it into the body table as a "hidden header" */
+				anFootSizers = nTfootSize.getElementsByTagName('tr');
+				anFootToSize = o.nTFoot.getElementsByTagName('tr');
+				
+				_fnApplyToChildren( function(nSizer, nToSize) {
+					oStyle = nSizer.style;
+					oStyle.paddingTop = "0";
+					oStyle.paddingBottom = "0";
+					oStyle.borderTopWidth = "0";
+					oStyle.borderBottomWidth = "0";
+					oStyle.height = 0;
+					
+					iWidth = $(nSizer).width();
+					nToSize.style.width = _fnStringToCss( iWidth );
+					aApplied.push( iWidth );
+				}, anFootSizers, anFootToSize );
+				$(anFootSizers).height(0);
+			}
+			
+			/*
+			 * 3. Apply the measurements
+			 */
+			
+			/* "Hide" the header and footer that we used for the sizing. We want to also fix their width
+			 * to what they currently are
+			 */
+			_fnApplyToChildren( function(nSizer) {
+				nSizer.innerHTML = "";
+				nSizer.style.width = _fnStringToCss( aApplied.shift() );
+			}, anHeadSizers );
+			
+			if ( o.nTFoot !== null )
+			{
+				_fnApplyToChildren( function(nSizer) {
+					nSizer.innerHTML = "";
+					nSizer.style.width = _fnStringToCss( aApplied.shift() );
+				}, anFootSizers );
+			}
+			
+			/* Sanity check that the table is of a sensible width. If not then we are going to get
+			 * misalignment
+			 */
+			if ( $(o.nTable).outerWidth() < iSanityWidth )
+			{
+				if ( o.oScroll.sX === "" )
+				{
+					_fnLog( o, 1, "The table cannot fit into the current element which will cause column"+
+						" misalignment. It is suggested that you enable x-scrolling or increase the width"+
+						" the table has in which to be drawn" );
+				}
+				else if ( o.oScroll.sXInner !== "" )
+				{
+					_fnLog( o, 1, "The table cannot fit into the current element which will cause column"+
+						" misalignment. It is suggested that you increase the sScrollXInner property to"+
+						" allow it to draw in a larger area, or simply remove that parameter to allow"+
+						" automatic calculation" );
+				}
+			}
+			
+			
+			/*
+			 * 4. Clean up
+			 */
+			
+			if ( o.oScroll.sY === "" )
+			{
+				/* IE7< puts a vertical scrollbar in place (when it shouldn't be) due to subtracting
+				 * the scrollbar height from the visible display, rather than adding it on. We need to
+				 * set the height in order to sort this. Don't want to do it in any other browsers.
+				 */
+				if ( $.browser.msie && $.browser.version <= 7 )
+				{
+					nScrollBody.style.height = _fnStringToCss( o.nTable.offsetHeight+o.oScroll.iBarWidth );
+				}
+			}
+			
+			if ( o.oScroll.sY !== "" && o.oScroll.bCollapse )
+			{
+				nScrollBody.style.height = _fnStringToCss( o.oScroll.sY );
+				
+				var iExtra = (o.oScroll.sX !== "" && o.nTable.offsetWidth > nScrollBody.offsetWidth) ?
+				 	o.oScroll.iBarWidth : 0;
+				if ( o.nTable.offsetHeight < nScrollBody.offsetHeight )
+				{
+					nScrollBody.style.height = _fnStringToCss( $(o.nTable).height()+iExtra );
+				}
+			}
+			
+			/* Finally set the width's of the header and footer tables */
+			var iOuterWidth = $(o.nTable).outerWidth();
+			nScrollHeadTable.style.width = _fnStringToCss( iOuterWidth );
+			nScrollHeadInner.style.width = _fnStringToCss( iOuterWidth+o.oScroll.iBarWidth );
+			
+			if ( o.nTFoot !== null )
+			{
+				var
+					nScrollFootInner = o.nScrollFoot.getElementsByTagName('div')[0],
+					nScrollFootTable = nScrollFootInner.getElementsByTagName('table')[0];
+				
+				nScrollFootInner.style.width = _fnStringToCss( o.nTable.offsetWidth+o.oScroll.iBarWidth );
+				nScrollFootTable.style.width = _fnStringToCss( o.nTable.offsetWidth );
+			}
+			
+			/* If sorting or filtering has occured, jump the scrolling back to the top */
+			if ( o.bSorted || o.bFiltered )
+			{
+				nScrollBody.scrollTop = 0;
+			}
+		}
+		
+		/*
+		 * Function: _fnAjustColumnSizing
+		 * Purpose:  Ajust the table column widths for new data
+		 * Returns:  -
+		 * Inputs:   object:oSettings - dataTables settings object
+		 * Notes:    You would probably want to do a redraw after calling this function!
+		 */
+		function _fnAjustColumnSizing ( oSettings )
+		{
+			/* Not interested in doing column width calculation if autowidth is disabled */
+			if ( oSettings.oFeatures.bAutoWidth === false )
+			{
+				return false;
+			}
+			
+			_fnCalculateColumnWidths( oSettings );
+			for ( var i=0 , iLen=oSettings.aoColumns.length ; i<iLen ; i++ )
+			{
+				oSettings.aoColumns[i].nTh.style.width = oSettings.aoColumns[i].sWidth;
+			}
+		}
+		
+		
+		/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+		 * Section - Feature: Filtering
+		 */
+		
+		/*
+		 * Function: _fnFeatureHtmlFilter
+		 * Purpose:  Generate the node required for filtering text
+		 * Returns:  node
+		 * Inputs:   object:oSettings - dataTables settings object
+		 */
+		function _fnFeatureHtmlFilter ( oSettings )
+		{
+			var nFilter = document.createElement( 'div' );
+			if ( oSettings.sTableId !== '' && typeof oSettings.aanFeatures.f == "undefined" )
+			{
+				nFilter.setAttribute( 'id', oSettings.sTableId+'_filter' );
+			}
+			nFilter.className = oSettings.oClasses.sFilter;
+			var sSpace = oSettings.oLanguage.sSearch==="" ? "" : " ";
+			nFilter.innerHTML = oSettings.oLanguage.sSearch+sSpace+'<input type="text" />';
+			
+			var jqFilter = $("input", nFilter);
+			jqFilter.val( oSettings.oPreviousSearch.sSearch.replace('"','&quot;') );
+			jqFilter.bind( 'keyup.DT', function(e) {
+				/* Update all other filter input elements for the new display */
+				var n = oSettings.aanFeatures.f;
+				for ( var i=0, iLen=n.length ; i<iLen ; i++ )
+				{
+					if ( n[i] != this.parentNode )
+					{
+						$('input', n[i]).val( this.value );
+					}
+				}
+				
+				/* Now do the filter */
+				if ( this.value != oSettings.oPreviousSearch.sSearch )
+				{
+					_fnFilterComplete( oSettings, { 
+						"sSearch": this.value, 
+						"bRegex":  oSettings.oPreviousSearch.bRegex,
+						"bSmart":  oSettings.oPreviousSearch.bSmart 
+					} );
+				}
+			} );
+			
+			jqFilter.bind( 'keypress.DT', function(e) {
+				/* Prevent default */
+				if ( e.keyCode == 13 )
+				{
+					return false;
+				}
+			} );
+			
+			return nFilter;
+		}
+		
+		/*
+		 * Function: _fnFilterComplete
+		 * Purpose:  Filter the table using both the global filter and column based filtering
+		 * Returns:  -
+		 * Inputs:   object:oSettings - dataTables settings object
+		 *           object:oSearch: search information
+		 *           int:iForce - optional - force a research of the master array (1) or not (undefined or 0)
+		 */
+		function _fnFilterComplete ( oSettings, oInput, iForce )
+		{
+			/* Filter on everything */
+			_fnFilter( oSettings, oInput.sSearch, iForce, oInput.bRegex, oInput.bSmart );
+			
+			/* Now do the individual column filter */
+			for ( var i=0 ; i<oSettings.aoPreSearchCols.length ; i++ )
+			{
+				_fnFilterColumn( oSettings, oSettings.aoPreSearchCols[i].sSearch, i, 
+					oSettings.aoPreSearchCols[i].bRegex, oSettings.aoPreSearchCols[i].bSmart );
+			}
+			
+			/* Custom filtering */
+			if ( _oExt.afnFiltering.length !== 0 )
+			{
+				_fnFilterCustom( oSettings );
+			}
+			
+			/* Tell the draw function we have been filtering */
+			oSettings.bFiltered = true;
+			
+			/* Redraw the table */
+			oSettings._iDisplayStart = 0;
+			_fnCalculateEnd( oSettings );
+			_fnDraw( oSettings );
+			
+			/* Rebuild search array 'offline' */
+			_fnBuildSearchArray( oSettings, 0 );
+		}
+		
+		/*
+		 * Function: _fnFilterCustom
+		 * Purpose:  Apply custom filtering functions
+		 * Returns:  -
+		 * Inputs:   object:oSettings - dataTables settings object
+		 */
+		function _fnFilterCustom( oSettings )
+		{
+			var afnFilters = _oExt.afnFiltering;
+			for ( var i=0, iLen=afnFilters.length ; i<iLen ; i++ )
+			{
+				var iCorrector = 0;
+				for ( var j=0, jLen=oSettings.aiDisplay.length ; j<jLen ; j++ )
+				{
+					var iDisIndex = oSettings.aiDisplay[j-iCorrector];
+					
+					/* Check if we should use this row based on the filtering function */
+					if ( !afnFilters[i]( oSettings, oSettings.aoData[iDisIndex]._aData, iDisIndex ) )
+					{
+						oSettings.aiDisplay.splice( j-iCorrector, 1 );
+						iCorrector++;
+					}
+				}
+			}
+		}
+		
+		/*
+		 * Function: _fnFilterColumn
+		 * Purpose:  Filter the table on a per-column basis
+		 * Returns:  -
+		 * Inputs:   object:oSettings - dataTables settings object
+		 *           string:sInput - string to filter on
+		 *           int:iColumn - column to filter
+		 *           bool:bRegex - treat search string as a regular expression or not
+		 *           bool:bSmart - use smart filtering or not
+		 */
+		function _fnFilterColumn ( oSettings, sInput, iColumn, bRegex, bSmart )
+		{
+			if ( sInput === "" )
+			{
+				return;
+			}
+			
+			var iIndexCorrector = 0;
+			var rpSearch = _fnFilterCreateSearch( sInput, bRegex, bSmart );
+			
+			for ( var i=oSettings.aiDisplay.length-1 ; i>=0 ; i-- )
+			{
+				var sData = _fnDataToSearch( oSettings.aoData[ oSettings.aiDisplay[i] ]._aData[iColumn],
+					oSettings.aoColumns[iColumn].sType );
+				if ( ! rpSearch.test( sData ) )
+				{
+					oSettings.aiDisplay.splice( i, 1 );
+					iIndexCorrector++;
+				}
+			}
+		}
+		
+		/*
+		 * Function: _fnFilter
+		 * Purpose:  Filter the data table based on user input and draw the table
+		 * Returns:  -
+		 * Inputs:   object:oSettings - dataTables settings object
+		 *           string:sInput - string to filter on
+		 *           int:iForce - optional - force a research of the master array (1) or not (undefined or 0)
+		 *           bool:bRegex - treat as a regular expression or not
+		 *           bool:bSmart - perform smart filtering or not
+		 */
+		function _fnFilter( oSettings, sInput, iForce, bRegex, bSmart )
+		{
+			var i;
+			var rpSearch = _fnFilterCreateSearch( sInput, bRegex, bSmart );
+			
+			/* Check if we are forcing or not - optional parameter */
+			if ( typeof iForce == 'undefined' || iForce === null )
+			{
+				iForce = 0;
+			}
+			
+			/* Need to take account of custom filtering functions - always filter */
+			if ( _oExt.afnFiltering.length !== 0 )
+			{
+				iForce = 1;
+			}
+			
+			/*
+			 * If the input is blank - we want the full data set
+			 */
+			if ( sInput.length <= 0 )
+			{
+				oSettings.aiDisplay.splice( 0, oSettings.aiDisplay.length);
+				oSettings.aiDisplay = oSettings.aiDisplayMaster.slice();
+			}
+			else
+			{
+				/*
+				 * We are starting a new search or the new search string is smaller 
+				 * then the old one (i.e. delete). Search from the master array
+			 	 */
+				if ( oSettings.aiDisplay.length == oSettings.aiDisplayMaster.length ||
+					   oSettings.oPreviousSearch.sSearch.length > sInput.length || iForce == 1 ||
+					   sInput.indexOf(oSettings.oPreviousSearch.sSearch) !== 0 )
+				{
+					/* Nuke the old display array - we are going to rebuild it */
+					oSettings.aiDisplay.splice( 0, oSettings.aiDisplay.length);
+					
+					/* Force a rebuild of the search array */
+					_fnBuildSearchArray( oSettings, 1 );
+					
+					/* Search through all records to populate the search array
+					 * The the oSettings.aiDisplayMaster and asDataSearch arrays have 1 to 1 
+					 * mapping
+					 */
+					for ( i=0 ; i<oSettings.aiDisplayMaster.length ; i++ )
+					{
+						if ( rpSearch.test(oSettings.asDataSearch[i]) )
+						{
+							oSettings.aiDisplay.push( oSettings.aiDisplayMaster[i] );
+						}
+					}
+			  }
+			  else
+				{
+			  	/* Using old search array - refine it - do it this way for speed
+			  	 * Don't have to search the whole master array again
+			 		 */
+			  	var iIndexCorrector = 0;
+			  	
+			  	/* Search the current results */
+			  	for ( i=0 ; i<oSettings.asDataSearch.length ; i++ )
+					{
+			  		if ( ! rpSearch.test(oSettings.asDataSearch[i]) )
+						{
+			  			oSettings.aiDisplay.splice( i-iIndexCorrector, 1 );
+			  			iIndexCorrector++;
+			  		}
+			  	}
+			  }
+			}
+			oSettings.oPreviousSearch.sSearch = sInput;
+			oSettings.oPreviousSearch.bRegex = bRegex;
+			oSettings.oPreviousSearch.bSmart = bSmart;
+		}
+		
+		/*
+		 * Function: _fnBuildSearchArray
+		 * Purpose:  Create an array which can be quickly search through
+		 * Returns:  -
+		 * Inputs:   object:oSettings - dataTables settings object
+		 *           int:iMaster - use the master data array - optional
+		 */
+		function _fnBuildSearchArray ( oSettings, iMaster )
+		{
+			/* Clear out the old data */
+			oSettings.asDataSearch.splice( 0, oSettings.asDataSearch.length );
+			
+			var aArray = (typeof iMaster != 'undefined' && iMaster == 1) ?
+			 	oSettings.aiDisplayMaster : oSettings.aiDisplay;
+			
+			for ( var i=0, iLen=aArray.length ; i<iLen ; i++ )
+			{
+				oSettings.asDataSearch[i] = _fnBuildSearchRow( oSettings, 
+					oSettings.aoData[ aArray[i] ]._aData );
+			}
+		}
+		
+		/*
+		 * Function: _fnBuildSearchRow
+		 * Purpose:  Create a searchable string from a single data row
+		 * Returns:  -
+		 * Inputs:   object:oSettings - dataTables settings object
+		 *           array:aData - aoData[]._aData array to use for the data to search
+		 */
+		function _fnBuildSearchRow( oSettings, aData )
+		{
+			var sSearch = '';
+			var nTmp = document.createElement('div');
+			
+			for ( var j=0, jLen=oSettings.aoColumns.length ; j<jLen ; j++ )
+			{
+				if ( oSettings.aoColumns[j].bSearchable )
+				{
+					var sData = aData[j];
+					sSearch += _fnDataToSearch( sData, oSettings.aoColumns[j].sType )+'  ';
+				}
+			}
+			
+			/* If it looks like there is an HTML entity in the string, attempt to decode it */
+			if ( sSearch.indexOf('&') !== -1 )
+			{
+				nTmp.innerHTML = sSearch;
+				sSearch = nTmp.textContent ? nTmp.textContent : nTmp.innerText;
+				
+				/* IE and Opera appear to put an newline where there is a <br> tag - remove it */
+				sSearch = sSearch.replace(/\n/g," ").replace(/\r/g,"");
+			}
+			
+			return sSearch;
+		}
+		
+		/*
+		 * Function: _fnFilterCreateSearch
+		 * Purpose:  Build a regular expression object suitable for searching a table
+		 * Returns:  RegExp: - constructed object
+		 * Inputs:   string:sSearch - string to search for
+		 *           bool:bRegex - treat as a regular expression or not
+		 *           bool:bSmart - perform smart filtering or not
+		 */
+		function _fnFilterCreateSearch( sSearch, bRegex, bSmart )
+		{
+			var asSearch, sRegExpString;
+			
+			if ( bSmart )
+			{
+				/* Generate the regular expression to use. Something along the lines of:
+				 * ^(?=.*?\bone\b)(?=.*?\btwo\b)(?=.*?\bthree\b).*$
+				 */
+				asSearch = bRegex ? sSearch.split( ' ' ) : _fnEscapeRegex( sSearch ).split( ' ' );
+				sRegExpString = '^(?=.*?'+asSearch.join( ')(?=.*?' )+').*$';
+				return new RegExp( sRegExpString, "i" );
+			}
+			else
+			{
+				sSearch = bRegex ? sSearch : _fnEscapeRegex( sSearch );
+				return new RegExp( sSearch, "i" );
+			}
+		}
+		
+		/*
+		 * Function: _fnDataToSearch
+		 * Purpose:  Convert raw data into something that the user can search on
+		 * Returns:  string: - search string
+		 * Inputs:   string:sData - data to be modified
+		 *           string:sType - data type
+		 */
+		function _fnDataToSearch ( sData, sType )
+		{
+			if ( typeof _oExt.ofnSearch[sType] == "function" )
+			{
+				return _oExt.ofnSearch[sType]( sData );
+			}
+			else if ( sType == "html" )
+			{
+				return sData.replace(/\n/g," ").replace( /<.*?>/g, "" );
+			}
+			else if ( typeof sData == "string" )
+			{
+				return sData.replace(/\n/g," ");
+			}
+			return sData;
+		}
+		
+		
+		/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+		 * Section - Feature: Sorting
+		 */
+		
+		/*
+	 	 * Function: _fnSort
+		 * Purpose:  Change the order of the table
+		 * Returns:  -
+		 * Inputs:   object:oSettings - dataTables settings object
+		 *           bool:bApplyClasses - optional - should we apply classes or not
+		 * Notes:    We always sort the master array and then apply a filter again
+		 *   if it is needed. This probably isn't optimal - but atm I can't think
+		 *   of any other way which is (each has disadvantages). we want to sort aiDisplayMaster - 
+		 *   but according to aoData[]._aData
+		 */
+		function _fnSort ( oSettings, bApplyClasses )
+		{
+			var
+				iDataSort, iDataType,
+				i, iLen, j, jLen,
+				aaSort = [],
+			 	aiOrig = [],
+				oSort = _oExt.oSort,
+				aoData = oSettings.aoData,
+				aoColumns = oSettings.aoColumns;
+			
+			/* No sorting required if server-side or no sorting array */
+			if ( !oSettings.oFeatures.bServerSide && 
+				(oSettings.aaSorting.length !== 0 || oSettings.aaSortingFixed !== null) )
+			{
+				if ( oSettings.aaSortingFixed !== null )
+				{
+					aaSort = oSettings.aaSortingFixed.concat( oSettings.aaSorting );
+				}
+				else
+				{
+					aaSort = oSettings.aaSorting.slice();
+				}
+				
+				/* If there is a sorting data type, and a fuction belonging to it, then we need to
+				 * get the data from the developer's function and apply it for this column
+				 */
+				for ( i=0 ; i<aaSort.length ; i++ )
+				{
+					var iColumn = aaSort[i][0];
+					var iVisColumn = _fnColumnIndexToVisible( oSettings, iColumn );
+					var sDataType = oSettings.aoColumns[ iColumn ].sSortDataType;
+					if ( typeof _oExt.afnSortData[sDataType] != 'undefined' )
+					{
+						var aData = _oExt.afnSortData[sDataType]( oSettings, iColumn, iVisColumn );
+						for ( j=0, jLen=aoData.length ; j<jLen ; j++ )
+						{
+							aoData[j]._aData[iColumn] = aData[j];
+						}
+					}
+				}
+				
+				/* Create a value - key array of the current row positions such that we can use their
+				 * current position during the sort, if values match, in order to perform stable sorting
+				 */
+				for ( i=0, iLen=oSettings.aiDisplayMaster.length ; i<iLen ; i++ )
+				{
+					aiOrig[ oSettings.aiDisplayMaster[i] ] = i;
+				}
+				
+				/* Do the sort - here we want multi-column sorting based on a given data source (column)
+				 * and sorting function (from oSort) in a certain direction. It's reasonably complex to
+				 * follow on it's own, but this is what we want (example two column sorting):
+				 *  fnLocalSorting = function(a,b){
+				 *  	var iTest;
+				 *  	iTest = oSort['string-asc']('data11', 'data12');
+				 *  	if (iTest !== 0)
+				 *  		return iTest;
+				 *    iTest = oSort['numeric-desc']('data21', 'data22');
+				 *    if (iTest !== 0)
+				 *  		return iTest;
+				 *  	return oSort['numeric-asc']( aiOrig[a], aiOrig[b] );
+				 *  }
+				 * Basically we have a test for each sorting column, if the data in that column is equal,
+				 * test the next column. If all columns match, then we use a numeric sort on the row 
+				 * positions in the original data array to provide a stable sort.
+				 */
+				var iSortLen = aaSort.length;
+				oSettings.aiDisplayMaster.sort( function ( a, b ) {
+					var iTest;
+					for ( i=0 ; i<iSortLen ; i++ )
+					{
+						iDataSort = aoColumns[ aaSort[i][0] ].iDataSort;
+						iDataType = aoColumns[ iDataSort ].sType;
+						iTest = oSort[ iDataType+"-"+aaSort[i][1] ](
+							aoData[a]._aData[iDataSort],
+							aoData[b]._aData[iDataSort]
+						);
+						
+						if ( iTest !== 0 )
+						{
+							return iTest;
+						}
+					}
+					
+					return oSort['numeric-asc']( aiOrig[a], aiOrig[b] );
+				} );
+			}
+			
+			/* Alter the sorting classes to take account of the changes */
+			if ( typeof bApplyClasses == 'undefined' || bApplyClasses )
+			{
+				_fnSortingClasses( oSettings );
+			}
+			
+			/* Tell the draw function that we have sorted the data */
+			oSettings.bSorted = true;
+			
+			/* Copy the master data into the draw array and re-draw */
+			if ( oSettings.oFeatures.bFilter )
+			{
+				/* _fnFilter() will redraw the table for us */
+				_fnFilterComplete( oSettings, oSettings.oPreviousSearch, 1 );
+			}
+			else
+			{
+				oSettings.aiDisplay = oSettings.aiDisplayMaster.slice();
+				oSettings._iDisplayStart = 0; /* reset display back to page 0 */
+				_fnCalculateEnd( oSettings );
+				_fnDraw( oSettings );
+			}
+		}
+		
+		/*
+		 * Function: _fnSortAttachListener
+		 * Purpose:  Attach a sort handler (click) to a node
+		 * Returns:  -
+		 * Inputs:   object:oSettings - dataTables settings object
+		 *           node:nNode - node to attach the handler to
+		 *           int:iDataIndex - column sorting index
+		 *           function:fnCallback - callback function - optional
+		 */
+		function _fnSortAttachListener ( oSettings, nNode, iDataIndex, fnCallback )
+		{
+			$(nNode).bind( 'click.DT', function (e) {
+				/* If the column is not sortable - don't to anything */
+				if ( oSettings.aoColumns[iDataIndex].bSortable === false )
+				{
+					return;
+				}
+				
+				/*
+				 * This is a little bit odd I admit... I declare a temporary function inside the scope of
+				 * _fnDrawHead and the click handler in order that the code presented here can be used 
+				 * twice - once for when bProcessing is enabled, and another time for when it is 
+				 * disabled, as we need to perform slightly different actions.
+				 *   Basically the issue here is that the Javascript engine in modern browsers don't 
+				 * appear to allow the rendering engine to update the display while it is still excuting
+				 * it's thread (well - it does but only after long intervals). This means that the 
+				 * 'processing' display doesn't appear for a table sort. To break the js thread up a bit
+				 * I force an execution break by using setTimeout - but this breaks the expected 
+				 * thread continuation for the end-developer's point of view (their code would execute
+				 * too early), so we on;y do it when we absolutely have to.
+				 */
+				var fnInnerSorting = function () {
+					var iColumn, iNextSort;
+					
+					/* If the shift key is pressed then we are multipe column sorting */
+					if ( e.shiftKey )
+					{
+						/* Are we already doing some kind of sort on this column? */
+						var bFound = false;
+						for ( var i=0 ; i<oSettings.aaSorting.length ; i++ )
+						{
+							if ( oSettings.aaSorting[i][0] == iDataIndex )
+							{
+								bFound = true;
+								iColumn = oSettings.aaSorting[i][0];
+								iNextSort = oSettings.aaSorting[i][2]+1;
+								
+								if ( typeof oSettings.aoColumns[iColumn].asSorting[iNextSort] == 'undefined' )
+								{
+									/* Reached the end of the sorting options, remove from multi-col sort */
+									oSettings.aaSorting.splice( i, 1 );
+								}
+								else
+								{
+									/* Move onto next sorting direction */
+									oSettings.aaSorting[i][1] = oSettings.aoColumns[iColumn].asSorting[iNextSort];
+									oSettings.aaSorting[i][2] = iNextSort;
+								}
+								break;
+							}
+						}
+						
+						/* No sort yet - add it in */
+						if ( bFound === false )
+						{
+							oSettings.aaSorting.push( [ iDataIndex, 
+								oSettings.aoColumns[iDataIndex].asSorting[0], 0 ] );
+						}
+					}
+					else
+					{
+						/* If no shift key then single column sort */
+						if ( oSettings.aaSorting.length == 1 && oSettings.aaSorting[0][0] == iDataIndex )
+						{
+							iColumn = oSettings.aaSorting[0][0];
+							iNextSort = oSettings.aaSorting[0][2]+1;
+							if ( typeof oSettings.aoColumns[iColumn].asSorting[iNextSort] == 'undefined' )
+							{
+								iNextSort = 0;
+							}
+							oSettings.aaSorting[0][1] = oSettings.aoColumns[iColumn].asSorting[iNextSort];
+							oSettings.aaSorting[0][2] = iNextSort;
+						}
+						else
+						{
+							oSettings.aaSorting.splice( 0, oSettings.aaSorting.length );
+							oSettings.aaSorting.push( [ iDataIndex, 
+								oSettings.aoColumns[iDataIndex].asSorting[0], 0 ] );
+						}
+					}
+					
+					/* Run the sort */
+					_fnSort( oSettings );
+				}; /* /fnInnerSorting */
+				
+				if ( !oSettings.oFeatures.bProcessing )
+				{
+					fnInnerSorting();
+				}
+				else
+				{
+					_fnProcessingDisplay( oSettings, true );
+					setTimeout( function() {
+						fnInnerSorting();
+						if ( !oSettings.oFeatures.bServerSide )
+						{
+							_fnProcessingDisplay( oSettings, false );
+						}
+					}, 0 );
+				}
+				
+				/* Call the user specified callback function - used for async user interaction */
+				if ( typeof fnCallback == 'function' )
+				{
+					fnCallback( oSettings );
+				}
+			} );
+		}
+		
+		/*
+		 * Function: _fnSortingClasses
+		 * Purpose:  Set the sortting classes on the header
+		 * Returns:  -
+		 * Inputs:   object:oSettings - dataTables settings object
+		 * Notes:    It is safe to call this function when bSort and bSortClasses are false
+		 */
+		function _fnSortingClasses( oSettings )
+		{
+			var i, j, jLen, iFound;
+			var aaSort, sClass;
+			var iColumns = oSettings.aoColumns.length;
+			var oClasses = oSettings.oClasses;
+			
+			for ( i=0 ; i<iColumns ; i++ )
+			{
+				if ( oSettings.aoColumns[i].bSortable )
+				{
+					$(oSettings.aoColumns[i].nTh).removeClass( oClasses.sSortAsc +" "+ oClasses.sSortDesc +
+				 		" "+ oSettings.aoColumns[i].sSortingClass );
+				}
+			}
+			
+			if ( oSettings.aaSortingFixed !== null )
+			{
+				aaSort = oSettings.aaSortingFixed.concat( oSettings.aaSorting );
+			}
+			else
+			{
+				aaSort = oSettings.aaSorting.slice();
+			}
+			
+			/* Apply the required classes to the header */
+			for ( i=0 ; i<oSettings.aoColumns.length ; i++ )
+			{
+				if ( oSettings.aoColumns[i].bSortable )
+				{
+					sClass = oSettings.aoColumns[i].sSortingClass;
+					iFound = -1;
+					for ( j=0 ; j<aaSort.length ; j++ )
+					{
+						if ( aaSort[j][0] == i )
+						{
+							sClass = ( aaSort[j][1] == "asc" ) ?
+								oClasses.sSortAsc : oClasses.sSortDesc;
+							iFound = j;
+							break;
+						}
+					}
+					$(oSettings.aoColumns[i].nTh).addClass( sClass );
+					
+					if ( oSettings.bJUI )
+					{
+						/* jQuery UI uses extra markup */
+						var jqSpan = $("span", oSettings.aoColumns[i].nTh);
+						jqSpan.removeClass(oClasses.sSortJUIAsc +" "+ oClasses.sSortJUIDesc +" "+ 
+							oClasses.sSortJUI +" "+ oClasses.sSortJUIAscAllowed +" "+ oClasses.sSortJUIDescAllowed );
+						
+						var sSpanClass;
+						if ( iFound == -1 )
+						{
+						 	sSpanClass = oSettings.aoColumns[i].sSortingClassJUI;
+						}
+						else if ( aaSort[iFound][1] == "asc" )
+						{
+							sSpanClass = oClasses.sSortJUIAsc;
+						}
+						else
+						{
+							sSpanClass = oClasses.sSortJUIDesc;
+						}
+						
+						jqSpan.addClass( sSpanClass );
+					}
+				}
+				else
+				{
+					/* No sorting on this column, so add the base class. This will have been assigned by
+					 * _fnAddColumn
+					 */
+					$(oSettings.aoColumns[i].nTh).addClass( oSettings.aoColumns[i].sSortingClass );
+				}
+			}
+			
+			/* 
+			 * Apply the required classes to the table body
+			 * Note that this is given as a feature switch since it can significantly slow down a sort
+			 * on large data sets (adding and removing of classes is always slow at the best of times..)
+			 * Further to this, note that this code is admitadly fairly ugly. It could be made a lot 
+			 * simpiler using jQuery selectors and add/removeClass, but that is significantly slower
+			 * (on the order of 5 times slower) - hence the direct DOM manipulation here.
+			 */
+			sClass = oClasses.sSortColumn;
+			
+			if ( oSettings.oFeatures.bSort && oSettings.oFeatures.bSortClasses )
+			{
+				var nTds = _fnGetTdNodes( oSettings );
+				
+				/* Remove the old classes */
+				if ( nTds.length >= iColumns )
+				{
+					for ( i=0 ; i<iColumns ; i++ )
+					{
+						if ( nTds[i].className.indexOf(sClass+"1") != -1 )
+						{
+							for ( j=0, jLen=(nTds.length/iColumns) ; j<jLen ; j++ )
+							{
+								nTds[(iColumns*j)+i].className = 
+									$.trim( nTds[(iColumns*j)+i].className.replace( sClass+"1", "" ) );
+							}
+						}
+						else if ( nTds[i].className.indexOf(sClass+"2") != -1 )
+						{
+							for ( j=0, jLen=(nTds.length/iColumns) ; j<jLen ; j++ )
+							{
+								nTds[(iColumns*j)+i].className = 
+									$.trim( nTds[(iColumns*j)+i].className.replace( sClass+"2", "" ) );
+							}
+						}
+						else if ( nTds[i].className.indexOf(sClass+"3") != -1 )
+						{
+							for ( j=0, jLen=(nTds.length/iColumns) ; j<jLen ; j++ )
+							{
+								nTds[(iColumns*j)+i].className = 
+									$.trim( nTds[(iColumns*j)+i].className.replace( " "+sClass+"3", "" ) );
+							}
+						}
+					}
+				}
+				
+				/* Add the new classes to the table */
+				var iClass = 1, iTargetCol;
+				for ( i=0 ; i<aaSort.length ; i++ )
+				{
+					iTargetCol = parseInt( aaSort[i][0], 10 );
+					for ( j=0, jLen=(nTds.length/iColumns) ; j<jLen ; j++ )
+					{
+						nTds[(iColumns*j)+iTargetCol].className += " "+sClass+iClass;
+					}
+					
+					if ( iClass < 3 )
+					{
+						iClass++;
+					}
+				}
+			}
+		}
+		
+		
+		/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+		 * Section - Feature: Pagination. Note that most of the paging logic is done in 
+		 * _oExt.oPagination
+		 */
+		
+		/*
+		 * Function: _fnFeatureHtmlPaginate
+		 * Purpose:  Generate the node required for default pagination
+		 * Returns:  node
+		 * Inputs:   object:oSettings - dataTables settings object
+		 */
+		function _fnFeatureHtmlPaginate ( oSettings )
+		{
+			if ( oSettings.oScroll.bInfinite )
+			{
+				return null;
+			}
+			
+			var nPaginate = document.createElement( 'div' );
+			nPaginate.className = oSettings.oClasses.sPaging+oSettings.sPaginationType;
+			
+			_oExt.oPagination[ oSettings.sPaginationType ].fnInit( oSettings, nPaginate, 
+				function( oSettings ) {
+					_fnCalculateEnd( oSettings );
+					_fnDraw( oSettings );
+				}
+			);
+			
+			/* Add a draw callback for the pagination on first instance, to update the paging display */
+			if ( typeof oSettings.aanFeatures.p == "undefined" )
+			{
+				oSettings.aoDrawCallback.push( {
+					"fn": function( oSettings ) {
+						_oExt.oPagination[ oSettings.sPaginationType ].fnUpdate( oSettings, function( oSettings ) {
+							_fnCalculateEnd( oSettings );
+							_fnDraw( oSettings );
+						} );
+					},
+					"sName": "pagination"
+				} );
+			}
+			return nPaginate;
+		}
+		
+		/*
+		 * Function: _fnPageChange
+		 * Purpose:  Alter the display settings to change the page
+		 * Returns:  bool:true - page has changed, false - no change (no effect) eg 'first' on page 1
+		 * Inputs:   object:oSettings - dataTables settings object
+		 *           string:sAction - paging action to take: "first", "previous", "next" or "last"
+		 */
+		function _fnPageChange ( oSettings, sAction )
+		{
+			var iOldStart = oSettings._iDisplayStart;
+			
+			if ( sAction == "first" )
+			{
+				oSettings._iDisplayStart = 0;
+			}
+			else if ( sAction == "previous" )
+			{
+				oSettings._iDisplayStart = oSettings._iDisplayLength>=0 ?
+					oSettings._iDisplayStart - oSettings._iDisplayLength :
+					0;
+				
+				/* Correct for underrun */
+				if ( oSettings._iDisplayStart < 0 )
+				{
+				  oSettings._iDisplayStart = 0;
+				}
+			}
+			else if ( sAction == "next" )
+			{
+				if ( oSettings._iDisplayLength >= 0 )
+				{
+					/* Make sure we are not over running the display array */
+					if ( oSettings._iDisplayStart + oSettings._iDisplayLength < oSettings.fnRecordsDisplay() )
+					{
+						oSettings._iDisplayStart += oSettings._iDisplayLength;
+					}
+				}
+				else
+				{
+					oSettings._iDisplayStart = 0;
+				}
+			}
+			else if ( sAction == "last" )
+			{
+				if ( oSettings._iDisplayLength >= 0 )
+				{
+					var iPages = parseInt( (oSettings.fnRecordsDisplay()-1) / oSettings._iDisplayLength, 10 ) + 1;
+					oSettings._iDisplayStart = (iPages-1) * oSettings._iDisplayLength;
+				}
+				else
+				{
+					oSettings._iDisplayStart = 0;
+				}
+			}
+			else
+			{
+				_fnLog( oSettings, 0, "Unknown paging action: "+sAction );
+			}
+			
+			return iOldStart != oSettings._iDisplayStart;
+		}
+		
+		
+		/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+		 * Section - Feature: HTML info
+		 */
+		
+		/*
+		 * Function: _fnFeatureHtmlInfo
+		 * Purpose:  Generate the node required for the info display
+		 * Returns:  node
+		 * Inputs:   object:oSettings - dataTables settings object
+		 */
+		function _fnFeatureHtmlInfo ( oSettings )
+		{
+			var nInfo = document.createElement( 'div' );
+			nInfo.className = oSettings.oClasses.sInfo;
+			
+			/* Actions that are to be taken once only for this feature */
+			if ( typeof oSettings.aanFeatures.i == "undefined" )
+			{
+				/* Add draw callback */
+				oSettings.aoDrawCallback.push( {
+					"fn": _fnUpdateInfo,
+					"sName": "information"
+				} );
+				
+				/* Add id */
+				if ( oSettings.sTableId !== '' )
+				{
+					nInfo.setAttribute( 'id', oSettings.sTableId+'_info' );
+				}
+			}
+			
+			return nInfo;
+		}
+		
+		/*
+		 * Function: _fnUpdateInfo
+		 * Purpose:  Update the information elements in the display
+		 * Returns:  -
+		 * Inputs:   object:oSettings - dataTables settings object
+		 */
+		function _fnUpdateInfo ( oSettings )
+		{
+			/* Show information about the table */
+			if ( !oSettings.oFeatures.bInfo || oSettings.aanFeatures.i.length === 0 )
+			{
+				return;
+			}
+			
+			var
+				iStart = oSettings._iDisplayStart+1, iEnd = oSettings.fnDisplayEnd(),
+				iMax = oSettings.fnRecordsTotal(), iTotal = oSettings.fnRecordsDisplay(),
+				sStart = oSettings.fnFormatNumber( iStart ), sEnd = oSettings.fnFormatNumber( iEnd ),
+				sMax = oSettings.fnFormatNumber( iMax ), sTotal = oSettings.fnFormatNumber( iTotal ),
+				sOut;
+			
+			/* When infinite scrolling, we are always starting at 1. _iDisplayStart is used only
+			 * internally
+			 */
+			if ( oSettings.oScroll.bInfinite )
+			{
+				sStart = oSettings.fnFormatNumber( 1 );
+			}
+			
+			if ( oSettings.fnRecordsDisplay() === 0 && 
+				   oSettings.fnRecordsDisplay() == oSettings.fnRecordsTotal() )
+			{
+				/* Empty record set */
+				sOut = oSettings.oLanguage.sInfoEmpty+ oSettings.oLanguage.sInfoPostFix;
+			}
+			else if ( oSettings.fnRecordsDisplay() === 0 )
+			{
+				/* Rmpty record set after filtering */
+				sOut = oSettings.oLanguage.sInfoEmpty +' '+ 
+					oSettings.oLanguage.sInfoFiltered.replace('_MAX_', sMax)+
+						oSettings.oLanguage.sInfoPostFix;
+			}
+			else if ( oSettings.fnRecordsDisplay() == oSettings.fnRecordsTotal() )
+			{
+				/* Normal record set */
+				sOut = oSettings.oLanguage.sInfo.
+						replace('_START_', sStart).
+						replace('_END_',   sEnd).
+						replace('_TOTAL_', sTotal).
+						replace('_PAGENUM_',oSettings.fnFormatNumber(Math.ceil(iTotal/oSettings._iDisplayLength)))+ 
+					oSettings.oLanguage.sInfoPostFix;
+			}
+			else
+			{
+				/* Record set after filtering (sEnd-sStart+1)*/
+				sOut = oSettings.oLanguage.sInfo.
+						replace('_START_', sStart).
+						replace('_END_',   sEnd).
+						replace('_TOTAL_', sTotal).
+						replace('_PAGENUM_',oSettings.fnFormatNumber(Math.ceil(iTotal/oSettings._iDisplayLength))) +' '+ 
+					oSettings.oLanguage.sInfoFiltered.replace('_MAX_', 
+						oSettings.fnFormatNumber(oSettings.fnRecordsTotal()))+ 
+					oSettings.oLanguage.sInfoPostFix;
+			}
+			
+			if ( oSettings.oLanguage.fnInfoCallback !== null )
+			{
+				sOut = oSettings.oLanguage.fnInfoCallback( oSettings, iStart, iEnd, iMax, iTotal, sOut );
+			}
+			
+			var n = oSettings.aanFeatures.i;
+			for ( var i=0, iLen=n.length ; i<iLen ; i++ )
+			{
+				$(n[i]).html( sOut );
+			}
+		}
+		
+		
+		/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+		 * Section - Feature: Length change
+		 */
+		
+		/*
+		 * Function: _fnFeatureHtmlLength
+		 * Purpose:  Generate the node required for user display length changing
+		 * Returns:  node
+		 * Inputs:   object:oSettings - dataTables settings object
+		 */
+		function _fnFeatureHtmlLength ( oSettings )
+		{
+			if ( oSettings.oScroll.bInfinite )
+			{
+				return null;
+			}
+			
+			/* This can be overruled by not using the _MENU_ var/macro in the language variable */
+			var sName = (oSettings.sTableId === "") ? "" : 'name="'+oSettings.sTableId+'_length"';
+			var sStdMenu = '<select size="1" '+sName+'>';
+			var i, iLen;
+			
+			if ( oSettings.aLengthMenu.length == 2 && typeof oSettings.aLengthMenu[0] == 'object' && 
+					typeof oSettings.aLengthMenu[1] == 'object' )
+			{
+				for ( i=0, iLen=oSettings.aLengthMenu[0].length ; i<iLen ; i++ )
+				{
+					sStdMenu += '<option value="'+oSettings.aLengthMenu[0][i]+'">'+
+						oSettings.aLengthMenu[1][i]+'</option>';
+				}
+			}
+			else
+			{
+				for ( i=0, iLen=oSettings.aLengthMenu.length ; i<iLen ; i++ )
+				{
+					sStdMenu += '<option value="'+oSettings.aLengthMenu[i]+'">'+
+						oSettings.aLengthMenu[i]+'</option>';
+				}
+			}
+			sStdMenu += '</select>';
+			
+			var nLength = document.createElement( 'div' );
+			if ( oSettings.sTableId !== '' && typeof oSettings.aanFeatures.l == "undefined" )
+			{
+				nLength.setAttribute( 'id', oSettings.sTableId+'_length' );
+			}
+			nLength.className = oSettings.oClasses.sLength;
+			nLength.innerHTML = oSettings.oLanguage.sLengthMenu.replace( '_MENU_', sStdMenu );
+			
+			/*
+			 * Set the length to the current display length - thanks to Andrea Pavlovic for this fix,
+			 * and Stefan Skopnik for fixing the fix!
+			 */
+			$('select option[value="'+oSettings._iDisplayLength+'"]',nLength).attr("selected",true);
+			
+			$('select', nLength).bind( 'change.DT', function(e) {
+				var iVal = $(this).val();
+				
+				/* Update all other length options for the new display */
+				var n = oSettings.aanFeatures.l;
+				for ( i=0, iLen=n.length ; i<iLen ; i++ )
+				{
+					if ( n[i] != this.parentNode )
+					{
+						$('select', n[i]).val( iVal );
+					}
+				}
+				
+				/* Redraw the table */
+				oSettings._iDisplayLength = parseInt(iVal, 10);
+				_fnCalculateEnd( oSettings );
+				
+				/* If we have space to show extra rows (backing up from the end point - then do so */
+				if ( oSettings.fnDisplayEnd() == oSettings.fnRecordsDisplay() )
+				{
+					oSettings._iDisplayStart = oSettings.fnDisplayEnd() - oSettings._iDisplayLength;
+					if ( oSettings._iDisplayStart < 0 )
+					{
+						oSettings._iDisplayStart = 0;
+					}
+				}
+				
+				if ( oSettings._iDisplayLength == -1 )
+				{
+					oSettings._iDisplayStart = 0;
+				}
+				
+				_fnDraw( oSettings );
+			} );
+			
+			return nLength;
+		}
+		
+		
+		/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+		 * Section - Feature: Processing incidator
+		 */
+		
+		/*
+		 * Function: _fnFeatureHtmlProcessing
+		 * Purpose:  Generate the node required for the processing node
+		 * Returns:  node
+		 * Inputs:   object:oSettings - dataTables settings object
+		 */
+		function _fnFeatureHtmlProcessing ( oSettings )
+		{
+			var nProcessing = document.createElement( 'div' );
+			
+			if ( oSettings.sTableId !== '' && typeof oSettings.aanFeatures.r == "undefined" )
+			{
+				nProcessing.setAttribute( 'id', oSettings.sTableId+'_processing' );
+			}
+			nProcessing.innerHTML = oSettings.oLanguage.sProcessing;
+			nProcessing.className = oSettings.oClasses.sProcessing;
+			oSettings.nTable.parentNode.insertBefore( nProcessing, oSettings.nTable );
+			
+			return nProcessing;
+		}
+		
+		/*
+		 * Function: _fnProcessingDisplay
+		 * Purpose:  Display or hide the processing indicator
+		 * Returns:  -
+		 * Inputs:   object:oSettings - dataTables settings object
+		 *           bool:
+		 *   true - show the processing indicator
+		 *   false - don't show
+		 */
+		function _fnProcessingDisplay ( oSettings, bShow )
+		{
+			if ( oSettings.oFeatures.bProcessing )
+			{
+				var an = oSettings.aanFeatures.r;
+				for ( var i=0, iLen=an.length ; i<iLen ; i++ )
+				{
+					an[i].style.visibility = bShow ? "visible" : "hidden";
+				}
+			}
+		}
+		
+		
+		/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+		 * Section - Support functions
+		 */
+		
+		/*
+		 * Function: _fnVisibleToColumnIndex
+		 * Purpose:  Covert the index of a visible column to the index in the data array (take account
+		 *   of hidden columns)
+		 * Returns:  int:i - the data index
+		 * Inputs:   object:oSettings - dataTables settings object
+		 */
+		function _fnVisibleToColumnIndex( oSettings, iMatch )
+		{
+			var iColumn = -1;
+			
+			for ( var i=0 ; i<oSettings.aoColumns.length ; i++ )
+			{
+				if ( oSettings.aoColumns[i].bVisible === true )
+				{
+					iColumn++;
+				}
+				
+				if ( iColumn == iMatch )
+				{
+					return i;
+				}
+			}
+			
+			return null;
+		}
+		
+		/*
+		 * Function: _fnColumnIndexToVisible
+		 * Purpose:  Covert the index of an index in the data array and convert it to the visible
+		 *   column index (take account of hidden columns)
+		 * Returns:  int:i - the data index
+		 * Inputs:   object:oSettings - dataTables settings object
+		 */
+		function _fnColumnIndexToVisible( oSettings, iMatch )
+		{
+			var iVisible = -1;
+			for ( var i=0 ; i<oSettings.aoColumns.length ; i++ )
+			{
+				if ( oSettings.aoColumns[i].bVisible === true )
+				{
+					iVisible++;
+				}
+				
+				if ( i == iMatch )
+				{
+					return oSettings.aoColumns[i].bVisible === true ? iVisible : null;
+				}
+			}
+			
+			return null;
+		}
+		
+		
+		/*
+		 * Function: _fnNodeToDataIndex
+		 * Purpose:  Take a TR element and convert it to an index in aoData
+		 * Returns:  int:i - index if found, null if not
+		 * Inputs:   object:s - dataTables settings object
+		 *           node:n - the TR element to find
+		 */
+		function _fnNodeToDataIndex( s, n )
+		{
+			var i, iLen;
+			
+			/* Optimisation - see if the nodes which are currently visible match, since that is
+			 * the most likely node to be asked for (a selector or event for example)
+			 */
+			for ( i=s._iDisplayStart, iLen=s._iDisplayEnd ; i<iLen ; i++ )
+			{
+				if ( s.aoData[ s.aiDisplay[i] ].nTr == n )
+				{
+					return s.aiDisplay[i];
+				}
+			}
+			
+			/* Otherwise we are in for a slog through the whole data cache */
+			for ( i=0, iLen=s.aoData.length ; i<iLen ; i++ )
+			{
+				if ( s.aoData[i].nTr == n )
+				{
+					return i;
+				}
+			}
+			return null;
+		}
+		
+		/*
+		 * Function: _fnVisbleColumns
+		 * Purpose:  Get the number of visible columns
+		 * Returns:  int:i - the number of visible columns
+		 * Inputs:   object:oS - dataTables settings object
+		 */
+		function _fnVisbleColumns( oS )
+		{
+			var iVis = 0;
+			for ( var i=0 ; i<oS.aoColumns.length ; i++ )
+			{
+				if ( oS.aoColumns[i].bVisible === true )
+				{
+					iVis++;
+				}
+			}
+			return iVis;
+		}
+		
+		/*
+		 * Function: _fnCalculateEnd
+		 * Purpose:  Rcalculate the end point based on the start point
+		 * Returns:  -
+		 * Inputs:   object:oSettings - dataTables settings object
+		 */
+		function _fnCalculateEnd( oSettings )
+		{
+			if ( oSettings.oFeatures.bPaginate === false )
+			{
+				oSettings._iDisplayEnd = oSettings.aiDisplay.length;
+			}
+			else
+			{
+				/* Set the end point of the display - based on how many elements there are
+				 * still to display
+				 */
+				if ( oSettings._iDisplayStart + oSettings._iDisplayLength > oSettings.aiDisplay.length ||
+					   oSettings._iDisplayLength == -1 )
+				{
+					oSettings._iDisplayEnd = oSettings.aiDisplay.length;
+				}
+				else
+				{
+					oSettings._iDisplayEnd = oSettings._iDisplayStart + oSettings._iDisplayLength;
+				}
+			}
+		}
+		
+		/*
+		 * Function: _fnConvertToWidth
+		 * Purpose:  Convert a CSS unit width to pixels (e.g. 2em)
+		 * Returns:  int:iWidth - width in pixels
+		 * Inputs:   string:sWidth - width to be converted
+		 *           node:nParent - parent to get the with for (required for
+		 *             relative widths) - optional
+		 */
+		function _fnConvertToWidth ( sWidth, nParent )
+		{
+			if ( !sWidth || sWidth === null || sWidth === '' )
+			{
+				return 0;
+			}
+			
+			if ( typeof nParent == "undefined" )
+			{
+				nParent = document.getElementsByTagName('body')[0];
+			}
+			
+			var iWidth;
+			var nTmp = document.createElement( "div" );
+			nTmp.style.width = sWidth;
+			
+			nParent.appendChild( nTmp );
+			iWidth = nTmp.offsetWidth;
+			nParent.removeChild( nTmp );
+			
+			return ( iWidth );
+		}
+		
+		/*
+		 * Function: _fnCalculateColumnWidths
+		 * Purpose:  Calculate the width of columns for the table
+		 * Returns:  -
+		 * Inputs:   object:oSettings - dataTables settings object
+		 */
+		function _fnCalculateColumnWidths ( oSettings )
+		{
+			var iUserInputs = 0;
+			var iTmpWidth;
+			var iVisibleColumns = 0;
+			var iColums = oSettings.aoColumns.length;
+			var i;
+			var oHeaders = $('th', oSettings.nTHead);
+			
+			/* Convert any user input sizes into pixel sizes */
+			for ( i=0 ; i<iColums ; i++ )
+			{
+				if ( oSettings.aoColumns[i].bVisible )
+				{
+					iVisibleColumns++;
+					
+					if ( oSettings.aoColumns[i].sWidth !== null )
+					{
+						iTmpWidth = _fnConvertToWidth( oSettings.aoColumns[i].sWidthOrig, 
+							oSettings.nTable.parentNode );
+						if ( iTmpWidth !== null )
+						{
+							oSettings.aoColumns[i].sWidth = _fnStringToCss( iTmpWidth );
+						}
+							
+						iUserInputs++;
+					}
+				}
+			}
+			
+			/* If the number of columns in the DOM equals the number that we have to process in 
+			 * DataTables, then we can use the offsets that are created by the web-browser. No custom 
+			 * sizes can be set in order for this to happen, nor scrolling used
+			 */
+			if ( iColums == oHeaders.length && iUserInputs === 0 && iVisibleColumns == iColums &&
+				oSettings.oScroll.sX === "" && oSettings.oScroll.sY === "" )
+			{
+				for ( i=0 ; i<oSettings.aoColumns.length ; i++ )
+				{
+					iTmpWidth = $(oHeaders[i]).width();
+					if ( iTmpWidth !== null )
+					{
+						oSettings.aoColumns[i].sWidth = _fnStringToCss( iTmpWidth );
+					}
+				}
+			}
+			else
+			{
+				/* Otherwise we are going to have to do some calculations to get the width of each column.
+				 * Construct a 1 row table with the widest node in the data, and any user defined widths,
+				 * then insert it into the DOM and allow the browser to do all the hard work of
+				 * calculating table widths.
+				 */
+				var
+					nCalcTmp = oSettings.nTable.cloneNode( false ),
+					nBody = document.createElement( 'tbody' ),
+					nTr = document.createElement( 'tr' );
+				
+				nCalcTmp.removeAttribute( "id" );
+				nCalcTmp.appendChild( oSettings.nTHead.cloneNode(true) );
+				if ( oSettings.nTFoot !== null )
+				{
+					nCalcTmp.appendChild( oSettings.nTFoot.cloneNode(true) );
+					_fnApplyToChildren( function(n) {
+						n.style.width = "";
+					}, nCalcTmp.getElementsByTagName('tr') );
+				}
+				
+				nCalcTmp.appendChild( nBody );
+				nBody.appendChild( nTr );
+				
+				/* Remove any sizing that was previously applied by the styles */
+				var jqColSizing = $('thead th', nCalcTmp);
+				if ( jqColSizing.length === 0 )
+				{
+					jqColSizing = $('tbody tr:eq(0)>td', nCalcTmp);
+				}
+				jqColSizing.each( function (i) {
+					this.style.width = "";
+					
+					var iIndex = _fnVisibleToColumnIndex( oSettings, i );
+					if ( iIndex !== null && oSettings.aoColumns[iIndex].sWidthOrig !== "" )
+					{
+						this.style.width = oSettings.aoColumns[iIndex].sWidthOrig;
+					}
+				} );
+				
+				/* Find the biggest td for each column and put it into the table */
+				for ( i=0 ; i<iColums ; i++ )
+				{
+					if ( oSettings.aoColumns[i].bVisible )
+					{
+						var nTd = _fnGetWidestNode( oSettings, i );
+						if ( nTd !== null )
+						{
+							nTd = nTd.cloneNode(true);
+							nTr.appendChild( nTd );
+						}
+					}
+				}
+				
+				/* Build the table and 'display' it */
+				var nWrapper = oSettings.nTable.parentNode;
+				nWrapper.appendChild( nCalcTmp );
+				
+				/* When scrolling (X or Y) we want to set the width of the table as appropriate. However,
+				 * when not scrolling leave the table width as it is. This results in slightly different,
+				 * but I think correct behaviour
+				 */
+				if ( oSettings.oScroll.sX !== "" && oSettings.oScroll.sXInner !== "" )
+				{
+					nCalcTmp.style.width = _fnStringToCss(oSettings.oScroll.sXInner);
+				}
+				else if ( oSettings.oScroll.sX !== "" )
+				{
+					nCalcTmp.style.width = "";
+					if ( $(nCalcTmp).width() < nWrapper.offsetWidth )
+					{
+						nCalcTmp.style.width = _fnStringToCss( nWrapper.offsetWidth );
+					}
+				}
+				else if ( oSettings.oScroll.sY !== "" )
+				{
+					nCalcTmp.style.width = _fnStringToCss( nWrapper.offsetWidth );
+				}
+				nCalcTmp.style.visibility = "hidden";
+				
+				/* Scrolling considerations */
+				_fnScrollingWidthAdjust( oSettings, nCalcTmp );
+				
+				/* Read the width's calculated by the browser and store them for use by the caller. We
+				 * first of all try to use the elements in the body, but it is possible that there are
+				 * no elements there, under which circumstances we use the header elements
+				 */
+				var oNodes = $("tbody tr:eq(0)>td", nCalcTmp);
+				if ( oNodes.length === 0 )
+				{
+					oNodes = $("thead tr:eq(0)>th", nCalcTmp);
+				}
+				
+				var iCorrector = 0, iWidth;
+				for ( i=0 ; i<oSettings.aoColumns.length ; i++ )
+				{
+					if ( oSettings.aoColumns[i].bVisible )
+					{
+						iWidth = $(oNodes[iCorrector]).width();
+						if ( iWidth !== null && iWidth > 0 )
+						{
+							oSettings.aoColumns[i].sWidth = _fnStringToCss( iWidth );
+						}
+						iCorrector++;
+					}
+				}
+				
+				oSettings.nTable.style.width = _fnStringToCss( $(nCalcTmp).outerWidth() );
+				nCalcTmp.parentNode.removeChild( nCalcTmp );
+			}
+		}
+		
+		/*
+		 * Function: _fnScrollingWidthAdjust
+		 * Purpose:  Adjust a table's width to take account of scrolling
+		 * Returns:  -
+		 * Inputs:   object:oSettings - dataTables settings object
+		 *           node:n - table node
+		 */
+		function _fnScrollingWidthAdjust ( oSettings, n )
+		{
+			if ( oSettings.oScroll.sX === "" && oSettings.oScroll.sY !== "" )
+			{
+				n.style.width = _fnStringToCss( $(n).outerWidth()-oSettings.oScroll.iBarWidth );
+			}
+			else if ( oSettings.oScroll.sX !== "" )
+			{
+				/* When x-scrolling both ways, fix the table at it's current size, without adjusting */
+				n.style.width = _fnStringToCss( $(n).outerWidth() );
+			}
+		}
+		
+		/*
+		 * Function: _fnGetWidestNode
+		 * Purpose:  Get the widest node
+		 * Returns:  string: - max strlens for each column
+		 * Inputs:   object:oSettings - dataTables settings object
+		 *           int:iCol - column of interest
+		 *           boolean:bFast - Should we use fast (but non-accurate) calculation - optional,
+		 *             default true
+		 * Notes:    This operation is _expensive_ (!!!). It requires a lot of DOM interaction, but
+		 *   this is the only way to reliably get the widest string. For example 'mmm' would be wider
+		 *   than 'iiii' so we can't just ocunt characters. If this can be optimised it would be good
+		 *   to do so!
+		 */
+		function _fnGetWidestNode( oSettings, iCol, bFast )
+		{
+			/* Use fast not non-accurate calculate based on the strlen */
+			if ( typeof bFast == 'undefined' || bFast )
+			{
+				var iMaxLen = _fnGetMaxLenString( oSettings, iCol );
+				var iFastVis = _fnColumnIndexToVisible( oSettings, iCol);
+				if ( iMaxLen < 0 )
+				{
+					return null;
+				}
+				return oSettings.aoData[iMaxLen].nTr.getElementsByTagName('td')[iFastVis];
+			}
+			
+			/* Use the slow approach, but get high quality answers - note that this code is not actually
+			 * used by DataTables by default. If you want to use it you can alter the call to 
+			 * _fnGetWidestNode to pass 'false' as the third argument
+			 */
+			var
+				iMax = -1, i, iLen,
+				iMaxIndex = -1,
+				n = document.createElement('div');
+			
+			n.style.visibility = "hidden";
+			n.style.position = "absolute";
+			document.body.appendChild( n );
+			
+			for ( i=0, iLen=oSettings.aoData.length ; i<iLen ; i++ )
+			{
+				n.innerHTML = oSettings.aoData[i]._aData[iCol];
+				if ( n.offsetWidth > iMax )
+				{
+					iMax = n.offsetWidth;
+					iMaxIndex = i;
+				}
+			}
+			document.body.removeChild( n );
+			
+			if ( iMaxIndex >= 0 )
+			{
+				var iVis = _fnColumnIndexToVisible( oSettings, iCol);
+				var nRet = oSettings.aoData[iMaxIndex].nTr.getElementsByTagName('td')[iVis];
+				if ( nRet )
+				{
+					return nRet;
+				}
+			}
+			return null;
+		}
+		
+		/*
+		 * Function: _fnGetMaxLenString
+		 * Purpose:  Get the maximum strlen for each data column
+		 * Returns:  string: - max strlens for each column
+		 * Inputs:   object:oSettings - dataTables settings object
+		 *           int:iCol - column of interest
+		 */
+		function _fnGetMaxLenString( oSettings, iCol )
+		{
+			var iMax = -1;
+			var iMaxIndex = -1;
+			
+			for ( var i=0 ; i<oSettings.aoData.length ; i++ )
+			{
+				var s = oSettings.aoData[i]._aData[iCol];
+				if ( s.length > iMax )
+				{
+					iMax = s.length;
+					iMaxIndex = i;
+				}
+			}
+			
+			return iMaxIndex;
+		}
+		
+		/*
+		 * Function: _fnStringToCss
+		 * Purpose:  Append a CSS unit (only if required) to a string
+		 * Returns:  0 if match, 1 if length is different, 2 if no match
+		 * Inputs:   array:aArray1 - first array
+		 *           array:aArray2 - second array
+		 */
+		function _fnStringToCss( s )
+		{
+			if ( s === null )
+			{
+				return "0px";
+			}
+			
+			if ( typeof s == 'number' )
+			{
+				if ( s < 0 )
+				{
+					return "0px";
+				}
+				return s+"px";
+			}
+			
+			/* Check if the last character is not 0-9 */
+			var c = s.charCodeAt( s.length-1 );
+			if (c < 0x30 || c > 0x39)
+			{
+				return s;
+			}
+			return s+"px";
+		}
+		
+		/*
+		 * Function: _fnArrayCmp
+		 * Purpose:  Compare two arrays
+		 * Returns:  0 if match, 1 if length is different, 2 if no match
+		 * Inputs:   array:aArray1 - first array
+		 *           array:aArray2 - second array
+		 */
+		function _fnArrayCmp( aArray1, aArray2 )
+		{
+			if ( aArray1.length != aArray2.length )
+			{
+				return 1;
+			}
+			
+			for ( var i=0 ; i<aArray1.length ; i++ )
+			{
+				if ( aArray1[i] != aArray2[i] )
+				{
+					return 2;
+				}
+			}
+			
+			return 0;
+		}
+		
+		/*
+		 * Function: _fnDetectType
+		 * Purpose:  Get the sort type based on an input string
+		 * Returns:  string: - type (defaults to 'string' if no type can be detected)
+		 * Inputs:   string:sData - data we wish to know the type of
+		 * Notes:    This function makes use of the DataTables plugin objct _oExt 
+		 *   (.aTypes) such that new types can easily be added.
+		 */
+		function _fnDetectType( sData )
+		{
+			var aTypes = _oExt.aTypes;
+			var iLen = aTypes.length;
+			
+			for ( var i=0 ; i<iLen ; i++ )
+			{
+				var sType = aTypes[i]( sData );
+				if ( sType !== null )
+				{
+					return sType;
+				}
+			}
+			
+			return 'string';
+		}
+		
+		/*
+		 * Function: _fnSettingsFromNode
+		 * Purpose:  Return the settings object for a particular table
+		 * Returns:  object: Settings object - or null if not found
+		 * Inputs:   node:nTable - table we are using as a dataTable
+		 */
+		function _fnSettingsFromNode ( nTable )
+		{
+			for ( var i=0 ; i<_aoSettings.length ; i++ )
+			{
+				if ( _aoSettings[i].nTable == nTable )
+				{
+					return _aoSettings[i];
+				}
+			}
+			
+			return null;
+		}
+		
+		/*
+		 * Function: _fnGetDataMaster
+		 * Purpose:  Return an array with the full table data
+		 * Returns:  array array:aData - Master data array
+		 * Inputs:   object:oSettings - dataTables settings object
+		 */
+		function _fnGetDataMaster ( oSettings )
+		{
+			var aData = [];
+			var iLen = oSettings.aoData.length;
+			for ( var i=0 ; i<iLen; i++ )
+			{
+				aData.push( oSettings.aoData[i]._aData );
+			}
+			return aData;
+		}
+		
+		/*
+		 * Function: _fnGetTrNodes
+		 * Purpose:  Return an array with the TR nodes for the table
+		 * Returns:  array: - TR array
+		 * Inputs:   object:oSettings - dataTables settings object
+		 */
+		function _fnGetTrNodes ( oSettings )
+		{
+			var aNodes = [];
+			var iLen = oSettings.aoData.length;
+			for ( var i=0 ; i<iLen ; i++ )
+			{
+				aNodes.push( oSettings.aoData[i].nTr );
+			}
+			return aNodes;
+		}
+		
+		/*
+		 * Function: _fnGetTdNodes
+		 * Purpose:  Return an array with the TD nodes for the table
+		 * Returns:  array: - TD array
+		 * Inputs:   object:oSettings - dataTables settings object
+		 */
+		function _fnGetTdNodes ( oSettings )
+		{
+			var nTrs = _fnGetTrNodes( oSettings );
+			var nTds = [], nTd;
+			var anReturn = [];
+			var iCorrector;
+			var iRow, iRows, iColumn, iColumns;
+			
+			for ( iRow=0, iRows=nTrs.length ; iRow<iRows ; iRow++ )
+			{
+				nTds = [];
+				for ( iColumn=0, iColumns=nTrs[iRow].childNodes.length ; iColumn<iColumns ; iColumn++ )
+				{
+					nTd = nTrs[iRow].childNodes[iColumn];
+					if ( nTd.nodeName.toUpperCase() == "TD" )
+					{
+						nTds.push( nTd );
+					}
+				}
+				
+				iCorrector = 0;
+				for ( iColumn=0, iColumns=oSettings.aoColumns.length ; iColumn<iColumns ; iColumn++ )
+				{
+					if ( oSettings.aoColumns[iColumn].bVisible )
+					{
+						anReturn.push( nTds[iColumn-iCorrector] );
+					}
+					else
+					{
+						anReturn.push( oSettings.aoData[iRow]._anHidden[iColumn] );
+						iCorrector++;
+					}
+				}
+			}
+			return anReturn;
+		}
+		
+		/*
+		 * Function: _fnEscapeRegex
+		 * Purpose:  scape a string stuch that it can be used in a regular expression
+		 * Returns:  string: - escaped string
+		 * Inputs:   string:sVal - string to escape
+		 */
+		function _fnEscapeRegex ( sVal )
+		{
+			var acEscape = [ '/', '.', '*', '+', '?', '|', '(', ')', '[', ']', '{', '}', '\\', '$', '^' ];
+		  var reReplace = new RegExp( '(\\' + acEscape.join('|\\') + ')', 'g' );
+		  return sVal.replace(reReplace, '\\$1');
+		}
+		
+		/*
+		 * Function: _fnDeleteIndex
+		 * Purpose:  Take an array of integers (index array) and remove a target integer (value - not 
+		 *             the key!)
+		 * Returns:  -
+		 * Inputs:   a:array int - Index array to target
+		 *           int:iTarget - value to find
+		 */
+		function _fnDeleteIndex( a, iTarget )
+		{
+			var iTargetIndex = -1;
+			
+			for ( var i=0, iLen=a.length ; i<iLen ; i++ )
+			{
+				if ( a[i] == iTarget )
+				{
+					iTargetIndex = i;
+				}
+				else if ( a[i] > iTarget )
+				{
+					a[i]--;
+				}
+			}
+			
+			if ( iTargetIndex != -1 )
+			{
+				a.splice( iTargetIndex, 1 );
+			}
+		}
+		
+		/*
+		 * Function: _fnReOrderIndex
+		 * Purpose:  Figure out how to reorder a display list
+		 * Returns:  array int:aiReturn - index list for reordering
+		 * Inputs:   object:oSettings - dataTables settings object
+		 */
+		function _fnReOrderIndex ( oSettings, sColumns )
+		{
+			var aColumns = sColumns.split(',');
+			var aiReturn = [];
+			
+			for ( var i=0, iLen=oSettings.aoColumns.length ; i<iLen ; i++ )
+			{
+				for ( var j=0 ; j<iLen ; j++ )
+				{
+					if ( oSettings.aoColumns[i].sName == aColumns[j] )
+					{
+						aiReturn.push( j );
+						break;
+					}
+				}
+			}
+			
+			return aiReturn;
+		}
+		
+		/*
+		 * Function: _fnColumnOrdering
+		 * Purpose:  Get the column ordering that DataTables expects
+		 * Returns:  string: - comma separated list of names
+		 * Inputs:   object:oSettings - dataTables settings object
+		 */
+		function _fnColumnOrdering ( oSettings )
+		{
+			var sNames = '';
+			for ( var i=0, iLen=oSettings.aoColumns.length ; i<iLen ; i++ )
+			{
+				sNames += oSettings.aoColumns[i].sName+',';
+			}
+			if ( sNames.length == iLen )
+			{
+				return "";
+			}
+			return sNames.slice(0, -1);
+		}
+		
+		/*
+		 * Function: _fnLog
+		 * Purpose:  Log an error message
+		 * Returns:  -
+		 * Inputs:   int:iLevel - log error messages, or display them to the user
+		 *           string:sMesg - error message
+		 */
+		function _fnLog( oSettings, iLevel, sMesg )
+		{
+			var sAlert = oSettings.sTableId === "" ?
+			 	"DataTables warning: " +sMesg :
+			 	"DataTables warning (table id = '"+oSettings.sTableId+"'): " +sMesg;
+			
+			if ( iLevel === 0 )
+			{
+				if ( _oExt.sErrMode == 'alert' )
+				{
+					alert( sAlert );
+				}
+				else
+				{
+					throw sAlert;
+				}
+				return;
+			}
+			else if ( typeof console != 'undefined' && typeof console.log != 'undefined' )
+			{
+				console.log( sAlert );
+			}
+		}
+		
+		/*
+		 * Function: _fnClearTable
+		 * Purpose:  Nuke the table
+		 * Returns:  -
+		 * Inputs:   object:oSettings - dataTables settings object
+		 */
+		function _fnClearTable( oSettings )
+		{
+			oSettings.aoData.splice( 0, oSettings.aoData.length );
+			oSettings.aiDisplayMaster.splice( 0, oSettings.aiDisplayMaster.length );
+			oSettings.aiDisplay.splice( 0, oSettings.aiDisplay.length );
+			_fnCalculateEnd( oSettings );
+		}
+		
+		/*
+		 * Function: _fnSaveState
+		 * Purpose:  Save the state of a table in a cookie such that the page can be reloaded
+		 * Returns:  -
+		 * Inputs:   object:oSettings - dataTables settings object
+		 */
+		function _fnSaveState ( oSettings )
+		{
+			if ( !oSettings.oFeatures.bStateSave || typeof oSettings.bDestroying != 'undefined' )
+			{
+				return;
+			}
+			
+			/* Store the interesting variables */
+			var i, iLen, sTmp;
+			var sValue = "{";
+			sValue += '"iCreate":'+ new Date().getTime()+',';
+			sValue += '"iStart":'+ oSettings._iDisplayStart+',';
+			sValue += '"iEnd":'+ oSettings._iDisplayEnd+',';
+			sValue += '"iLength":'+ oSettings._iDisplayLength+',';
+			sValue += '"sFilter":"'+ encodeURIComponent(oSettings.oPreviousSearch.sSearch)+'",';
+			sValue += '"sFilterEsc":'+ !oSettings.oPreviousSearch.bRegex+',';
+			
+			sValue += '"aaSorting":[ ';
+			for ( i=0 ; i<oSettings.aaSorting.length ; i++ )
+			{
+				sValue += '['+oSettings.aaSorting[i][0]+',"'+oSettings.aaSorting[i][1]+'"],';
+			}
+			sValue = sValue.substring(0, sValue.length-1);
+			sValue += "],";
+			
+			sValue += '"aaSearchCols":[ ';
+			for ( i=0 ; i<oSettings.aoPreSearchCols.length ; i++ )
+			{
+				sValue += '["'+encodeURIComponent(oSettings.aoPreSearchCols[i].sSearch)+
+					'",'+!oSettings.aoPreSearchCols[i].bRegex+'],';
+			}
+			sValue = sValue.substring(0, sValue.length-1);
+			sValue += "],";
+			
+			sValue += '"abVisCols":[ ';
+			for ( i=0 ; i<oSettings.aoColumns.length ; i++ )
+			{
+				sValue += oSettings.aoColumns[i].bVisible+",";
+			}
+			sValue = sValue.substring(0, sValue.length-1);
+			sValue += "]";
+			
+			/* Save state from any plug-ins */
+			for ( i=0, iLen=oSettings.aoStateSave.length ; i<iLen ; i++ )
+			{
+				sTmp = oSettings.aoStateSave[i].fn( oSettings, sValue );
+				if ( sTmp !== "" )
+				{
+					sValue = sTmp;
+				}
+			}
+			
+			sValue += "}";
+			
+			_fnCreateCookie( oSettings.sCookiePrefix+oSettings.sInstance, sValue, 
+				oSettings.iCookieDuration, oSettings.sCookiePrefix, oSettings.fnCookieCallback );
+		}
+		
+		/*
+		 * Function: _fnLoadState
+		 * Purpose:  Attempt to load a saved table state from a cookie
+		 * Returns:  -
+		 * Inputs:   object:oSettings - dataTables settings object
+		 *           object:oInit - DataTables init object so we can override settings
+		 */
+		function _fnLoadState ( oSettings, oInit )
+		{
+			if ( !oSettings.oFeatures.bStateSave )
+			{
+				return;
+			}
+			
+			var oData, i, iLen;
+			var sData = _fnReadCookie( oSettings.sCookiePrefix+oSettings.sInstance );
+			if ( sData !== null && sData !== '' )
+			{
+				/* Try/catch the JSON eval - if it is bad then we ignore it - note that 1.7.0 and before
+				 * incorrectly used single quotes for some strings - hence the replace below
+				 */
+				try
+				{
+					oData = (typeof $.parseJSON == 'function') ? 
+						$.parseJSON( sData.replace(/'/g, '"') ) : eval( '('+sData+')' );
+				}
+				catch( e )
+				{
+					return;
+				}
+				
+				/* Allow custom and plug-in manipulation functions to alter the data set which was
+				 * saved, and also reject any saved state by returning false
+				 */
+				for ( i=0, iLen=oSettings.aoStateLoad.length ; i<iLen ; i++ )
+				{
+					if ( !oSettings.aoStateLoad[i].fn( oSettings, oData ) )
+					{
+						return;
+					}
+				}
+				
+				/* Store the saved state so it might be accessed at any time (particualrly a plug-in */
+				oSettings.oLoadedState = $.extend( true, {}, oData );
+				
+				/* Restore key features */
+				oSettings._iDisplayStart = oData.iStart;
+				oSettings.iInitDisplayStart = oData.iStart;
+				oSettings._iDisplayEnd = oData.iEnd;
+				oSettings._iDisplayLength = oData.iLength;
+				oSettings.oPreviousSearch.sSearch = decodeURIComponent(oData.sFilter);
+				oSettings.aaSorting = oData.aaSorting.slice();
+				oSettings.saved_aaSorting = oData.aaSorting.slice();
+				
+				/*
+				 * Search filtering - global reference added in 1.4.1
+				 * Note that we use a 'not' for the value of the regular expression indicator to maintain
+				 * compatibility with pre 1.7 versions, where this was basically inverted. Added in 1.7.0
+				 */
+				if ( typeof oData.sFilterEsc != 'undefined' )
+				{
+					oSettings.oPreviousSearch.bRegex = !oData.sFilterEsc;
+				}
+				
+				/* Column filtering - added in 1.5.0 beta 6 */
+				if ( typeof oData.aaSearchCols != 'undefined' )
+				{
+					for ( i=0 ; i<oData.aaSearchCols.length ; i++ )
+					{
+						oSettings.aoPreSearchCols[i] = {
+							"sSearch": decodeURIComponent(oData.aaSearchCols[i][0]),
+							"bRegex": !oData.aaSearchCols[i][1]
+						};
+					}
+				}
+				
+				/* Column visibility state - added in 1.5.0 beta 10 */
+				if ( typeof oData.abVisCols != 'undefined' )
+				{
+					/* Pass back visibiliy settings to the init handler, but to do not here override
+					 * the init object that the user might have passed in
+					 */
+					oInit.saved_aoColumns = [];
+					for ( i=0 ; i<oData.abVisCols.length ; i++ )
+					{
+						oInit.saved_aoColumns[i] = {};
+						oInit.saved_aoColumns[i].bVisible = oData.abVisCols[i];
+					}
+				}
+			}
+		}
+		
+		/*
+		 * Function: _fnCreateCookie
+		 * Purpose:  Create a new cookie with a value to store the state of a table
+		 * Returns:  -
+		 * Inputs:   string:sName - name of the cookie to create
+		 *           string:sValue - the value the cookie should take
+		 *           int:iSecs - duration of the cookie
+		 *           string:sBaseName - sName is made up of the base + file name - this is the base
+		 *           function:fnCallback - User definable function to modify the cookie
+		 */
+		function _fnCreateCookie ( sName, sValue, iSecs, sBaseName, fnCallback )
+		{
+			var date = new Date();
+			date.setTime( date.getTime()+(iSecs*1000) );
+			
+			/* 
+			 * Shocking but true - it would appear IE has major issues with having the path not having
+			 * a trailing slash on it. We need the cookie to be available based on the path, so we
+			 * have to append the file name to the cookie name. Appalling. Thanks to vex for adding the
+			 * patch to use at least some of the path
+			 */
+			var aParts = window.location.pathname.split('/');
+			var sNameFile = sName + '_' + aParts.pop().replace(/[\/:]/g,"").toLowerCase();
+			var sFullCookie, oData;
+			
+			if ( fnCallback !== null )
+			{
+				oData = (typeof $.parseJSON == 'function') ? 
+					$.parseJSON( sValue ) : eval( '('+sValue+')' );
+				sFullCookie = fnCallback( sNameFile, oData, date.toGMTString(),
+					aParts.join('/')+"/" );
+			}
+			else
+			{
+				sFullCookie = sNameFile + "=" + encodeURIComponent(sValue) +
+					"; expires=" + date.toGMTString() +"; path=" + aParts.join('/')+"/";
+			}
+			
+			/* Are we going to go over the cookie limit of 4KiB? If so, try to delete a cookies
+			 * belonging to DataTables. This is FAR from bullet proof
+			 */
+			var sOldName="", iOldTime=9999999999999;
+			var iLength = _fnReadCookie( sNameFile )!==null ? document.cookie.length : 
+				sFullCookie.length + document.cookie.length;
+			
+			if ( iLength+10 > 4096 ) /* Magic 10 for padding */
+			{
+				var aCookies =document.cookie.split(';');
+				for ( var i=0, iLen=aCookies.length ; i<iLen ; i++ )
+				{
+					if ( aCookies[i].indexOf( sBaseName ) != -1 )
+					{
+						/* It's a DataTables cookie, so eval it and check the time stamp */
+						var aSplitCookie = aCookies[i].split('=');
+						try { oData = eval( '('+decodeURIComponent(aSplitCookie[1])+')' ); }
+						catch( e ) { continue; }
+						
+						if ( typeof oData.iCreate != 'undefined' && oData.iCreate < iOldTime )
+						{
+							sOldName = aSplitCookie[0];
+							iOldTime = oData.iCreate;
+						}
+					}
+				}
+				
+				if ( sOldName !== "" )
+				{
+					document.cookie = sOldName+"=; expires=Thu, 01-Jan-1970 00:00:01 GMT; path="+
+						aParts.join('/') + "/";
+				}
+			}
+			
+			document.cookie = sFullCookie;
+		}
+		
+		/*
+		 * Function: _fnReadCookie
+		 * Purpose:  Read an old cookie to get a cookie with an old table state
+		 * Returns:  string: - contents of the cookie - or null if no cookie with that name found
+		 * Inputs:   string:sName - name of the cookie to read
+		 */
+		function _fnReadCookie ( sName )
+		{
+			var
+				aParts = window.location.pathname.split('/'),
+				sNameEQ = sName + '_' + aParts[aParts.length-1].replace(/[\/:]/g,"").toLowerCase() + '=',
+			 	sCookieContents = document.cookie.split(';');
+			
+			for( var i=0 ; i<sCookieContents.length ; i++ )
+			{
+				var c = sCookieContents[i];
+				
+				while (c.charAt(0)==' ')
+				{
+					c = c.substring(1,c.length);
+				}
+				
+				if (c.indexOf(sNameEQ) === 0)
+				{
+					return decodeURIComponent( c.substring(sNameEQ.length,c.length) );
+				}
+			}
+			return null;
+		}
+		
+		/*
+		 * Function: _fnGetUniqueThs
+		 * Purpose:  Get an array of unique th elements, one for each column
+		 * Returns:  array node:aReturn - list of unique ths
+		 * Inputs:   node:nThead - The thead element for the table
+		 */
+		function _fnGetUniqueThs ( nThead )
+		{
+			var nTrs = nThead.getElementsByTagName('tr');
+			
+			/* Nice simple case */
+			if ( nTrs.length == 1 )
+			{
+				return nTrs[0].getElementsByTagName('th');
+			}
+			
+			/* Otherwise we need to figure out the layout array to get the nodes */
+			var aLayout = [], aReturn = [];
+			var ROWSPAN = 2, COLSPAN = 3, TDELEM = 4;
+			var i, j, k, iLen, jLen, iColumnShifted;
+			var fnShiftCol = function ( a, i, j ) {
+				while ( typeof a[i][j] != 'undefined' ) {
+					j++;
+				}
+				return j;
+			};
+			var fnAddRow = function ( i ) {
+				if ( typeof aLayout[i] == 'undefined' ) {
+					aLayout[i] = [];
+				}
+			};
+			
+			/* Calculate a layout array */
+			for ( i=0, iLen=nTrs.length ; i<iLen ; i++ )
+			{
+				fnAddRow( i );
+				var iColumn = 0;
+				var nTds = [];
+				
+				for ( j=0, jLen=nTrs[i].childNodes.length ; j<jLen ; j++ )
+				{
+					if ( nTrs[i].childNodes[j].nodeName.toUpperCase() == "TD" ||
+					     nTrs[i].childNodes[j].nodeName.toUpperCase() == "TH" )
+					{
+						nTds.push( nTrs[i].childNodes[j] );
+					}
+				}
+				
+				for ( j=0, jLen=nTds.length ; j<jLen ; j++ )
+				{
+					var iColspan = nTds[j].getAttribute('colspan') * 1;
+					var iRowspan = nTds[j].getAttribute('rowspan') * 1;
+					
+					if ( !iColspan || iColspan===0 || iColspan===1 )
+					{
+						iColumnShifted = fnShiftCol( aLayout, i, iColumn );
+						aLayout[i][iColumnShifted] = (nTds[j].nodeName.toUpperCase()=="TD") ? TDELEM : nTds[j];
+						if ( iRowspan || iRowspan===0 || iRowspan===1 )
+						{
+							for ( k=1 ; k<iRowspan ; k++ )
+							{
+								fnAddRow( i+k );
+								aLayout[i+k][iColumnShifted] = ROWSPAN;
+							}
+						}
+						iColumn++;
+					}
+					else
+					{
+						iColumnShifted = fnShiftCol( aLayout, i, iColumn );
+						for ( k=0 ; k<iColspan ; k++ )
+						{
+							aLayout[i][iColumnShifted+k] = COLSPAN;
+						}
+						iColumn += iColspan;
+					}
+				}
+			}
+			
+			/* Convert the layout array into a node array */
+			for ( i=0, iLen=aLayout.length ; i<iLen ; i++ )
+			{
+				for ( j=0, jLen=aLayout[i].length ; j<jLen ; j++ )
+				{
+					if ( typeof aLayout[i][j] == 'object' && typeof aReturn[j] == 'undefined' )
+					{
+						aReturn[j] = aLayout[i][j];
+					}
+				}
+			}
+			
+			return aReturn;
+		}
+		
+		/*
+		 * Function: _fnScrollBarWidth
+		 * Purpose:  Get the width of a scroll bar in this browser being used
+		 * Returns:  int: - width in pixels
+		 * Inputs:   -
+		 * Notes:    All credit for this function belongs to Alexandre Gomes. Thanks for sharing!
+		 *   http://www.alexandre-gomes.com/?p=115
+		 */
+		function _fnScrollBarWidth ()
+		{  
+			var inner = document.createElement('p');  
+			var style = inner.style;
+			style.width = "100%";  
+			style.height = "200px";  
+			
+			var outer = document.createElement('div');  
+			style = outer.style;
+			style.position = "absolute";  
+			style.top = "0px";  
+			style.left = "0px";  
+			style.visibility = "hidden";  
+			style.width = "200px";  
+			style.height = "150px";  
+			style.overflow = "hidden";  
+			outer.appendChild(inner);  
+			
+			document.body.appendChild(outer);  
+			var w1 = inner.offsetWidth;  
+			outer.style.overflow = 'scroll';  
+			var w2 = inner.offsetWidth;  
+			if ( w1 == w2 )
+			{
+				w2 = outer.clientWidth;  
+			}
+			
+			document.body.removeChild(outer); 
+			return (w1 - w2);  
+		}
+		
+		/*
+		 * Function: _fnApplyToChildren
+		 * Purpose:  Apply a given function to the display child nodes of an element array (typically
+		 *   TD children of TR rows
+		 * Returns:  - (done by reference)
+		 * Inputs:   function:fn - Method to apply to the objects
+		 *           array nodes:an1 - List of elements to look through for display children
+		 *           array nodes:an2 - Another list (identical structure to the first) - optional
+		 */
+		function _fnApplyToChildren( fn, an1, an2 )
+		{
+			for ( var i=0, iLen=an1.length ; i<iLen ; i++ )
+			{
+				for ( var j=0, jLen=an1[i].childNodes.length ; j<jLen ; j++ )
+				{
+					if ( an1[i].childNodes[j].nodeType == 1 )
+					{
+						if ( typeof an2 != 'undefined' )
+						{
+							fn( an1[i].childNodes[j], an2[i].childNodes[j] );
+						}
+						else
+						{
+							fn( an1[i].childNodes[j] );
+						}
+					}
+				}
+			}
+		}
+		
+		/*
+		 * Function: _fnMap
+		 * Purpose:  See if a property is defined on one object, if so assign it to the other object
+		 * Returns:  - (done by reference)
+		 * Inputs:   object:oRet - target object
+		 *           object:oSrc - source object
+		 *           string:sName - property
+		 *           string:sMappedName - name to map too - optional, sName used if not given
+		 */
+		function _fnMap( oRet, oSrc, sName, sMappedName )
+		{
+			if ( typeof sMappedName == 'undefined' )
+			{
+				sMappedName = sName;
+			}
+			if ( typeof oSrc[sName] != 'undefined' )
+			{
+				oRet[sMappedName] = oSrc[sName];
+			}
+		}
+		
+		/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+		 * Section - API
+		 * 
+		 * I'm not overly happy with this solution - I'd much rather that there was a way of getting
+		 * a list of all the private functions and do what we need to dynamically - but that doesn't
+		 * appear to be possible. Bonkers. A better solution would be to provide a 'bind' type object
+		 * To do - bind type method in DTs 2.x.
+		 */
+		this.oApi._fnExternApiFunc = _fnExternApiFunc;
+		this.oApi._fnInitalise = _fnInitalise;
+		this.oApi._fnLanguageProcess = _fnLanguageProcess;
+		this.oApi._fnAddColumn = _fnAddColumn;
+		this.oApi._fnColumnOptions = _fnColumnOptions;
+		this.oApi._fnAddData = _fnAddData;
+		this.oApi._fnGatherData = _fnGatherData;
+		this.oApi._fnDrawHead = _fnDrawHead;
+		this.oApi._fnDraw = _fnDraw;
+		this.oApi._fnReDraw = _fnReDraw;
+		this.oApi._fnAjaxUpdate = _fnAjaxUpdate;
+		this.oApi._fnAjaxUpdateDraw = _fnAjaxUpdateDraw;
+		this.oApi._fnAddOptionsHtml = _fnAddOptionsHtml;
+		this.oApi._fnFeatureHtmlTable = _fnFeatureHtmlTable;
+		this.oApi._fnScrollDraw = _fnScrollDraw;
+		this.oApi._fnAjustColumnSizing = _fnAjustColumnSizing;
+		this.oApi._fnFeatureHtmlFilter = _fnFeatureHtmlFilter;
+		this.oApi._fnFilterComplete = _fnFilterComplete;
+		this.oApi._fnFilterCustom = _fnFilterCustom;
+		this.oApi._fnFilterColumn = _fnFilterColumn;
+		this.oApi._fnFilter = _fnFilter;
+		this.oApi._fnBuildSearchArray = _fnBuildSearchArray;
+		this.oApi._fnBuildSearchRow = _fnBuildSearchRow;
+		this.oApi._fnFilterCreateSearch = _fnFilterCreateSearch;
+		this.oApi._fnDataToSearch = _fnDataToSearch;
+		this.oApi._fnSort = _fnSort;
+		this.oApi._fnSortAttachListener = _fnSortAttachListener;
+		this.oApi._fnSortingClasses = _fnSortingClasses;
+		this.oApi._fnFeatureHtmlPaginate = _fnFeatureHtmlPaginate;
+		this.oApi._fnPageChange = _fnPageChange;
+		this.oApi._fnFeatureHtmlInfo = _fnFeatureHtmlInfo;
+		this.oApi._fnUpdateInfo = _fnUpdateInfo;
+		this.oApi._fnFeatureHtmlLength = _fnFeatureHtmlLength;
+		this.oApi._fnFeatureHtmlProcessing = _fnFeatureHtmlProcessing;
+		this.oApi._fnProcessingDisplay = _fnProcessingDisplay;
+		this.oApi._fnVisibleToColumnIndex = _fnVisibleToColumnIndex;
+		this.oApi._fnColumnIndexToVisible = _fnColumnIndexToVisible;
+		this.oApi._fnNodeToDataIndex = _fnNodeToDataIndex;
+		this.oApi._fnVisbleColumns = _fnVisbleColumns;
+		this.oApi._fnCalculateEnd = _fnCalculateEnd;
+		this.oApi._fnConvertToWidth = _fnConvertToWidth;
+		this.oApi._fnCalculateColumnWidths = _fnCalculateColumnWidths;
+		this.oApi._fnScrollingWidthAdjust = _fnScrollingWidthAdjust;
+		this.oApi._fnGetWidestNode = _fnGetWidestNode;
+		this.oApi._fnGetMaxLenString = _fnGetMaxLenString;
+		this.oApi._fnStringToCss = _fnStringToCss;
+		this.oApi._fnArrayCmp = _fnArrayCmp;
+		this.oApi._fnDetectType = _fnDetectType;
+		this.oApi._fnSettingsFromNode = _fnSettingsFromNode;
+		this.oApi._fnGetDataMaster = _fnGetDataMaster;
+		this.oApi._fnGetTrNodes = _fnGetTrNodes;
+		this.oApi._fnGetTdNodes = _fnGetTdNodes;
+		this.oApi._fnEscapeRegex = _fnEscapeRegex;
+		this.oApi._fnDeleteIndex = _fnDeleteIndex;
+		this.oApi._fnReOrderIndex = _fnReOrderIndex;
+		this.oApi._fnColumnOrdering = _fnColumnOrdering;
+		this.oApi._fnLog = _fnLog;
+		this.oApi._fnClearTable = _fnClearTable;
+		this.oApi._fnSaveState = _fnSaveState;
+		this.oApi._fnLoadState = _fnLoadState;
+		this.oApi._fnCreateCookie = _fnCreateCookie;
+		this.oApi._fnReadCookie = _fnReadCookie;
+		this.oApi._fnGetUniqueThs = _fnGetUniqueThs;
+		this.oApi._fnScrollBarWidth = _fnScrollBarWidth;
+		this.oApi._fnApplyToChildren = _fnApplyToChildren;
+		this.oApi._fnMap = _fnMap;
+		
+		
+		/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+		 * Section - Constructor
+		 */
+		
+		/* Want to be able to reference "this" inside the this.each function */
+		var _that = this;
+		return this.each(function()
+		{
+			var i=0, iLen, j, jLen, k, kLen;
+			
+			/* Check to see if we are re-initalising a table */
+			for ( i=0, iLen=_aoSettings.length ; i<iLen ; i++ )
+			{
+				/* Base check on table node */
+				if ( _aoSettings[i].nTable == this )
+				{
+					if ( typeof oInit == 'undefined' || 
+					   ( typeof oInit.bRetrieve != 'undefined' && oInit.bRetrieve === true ) )
+					{
+						return _aoSettings[i].oInstance;
+					}
+					else if ( typeof oInit.bDestroy != 'undefined' && oInit.bDestroy === true )
+					{
+						_aoSettings[i].oInstance.fnDestroy();
+						break;
+					}
+					else
+					{
+						_fnLog( _aoSettings[i], 0, "Cannot reinitialise DataTable.\n\n"+
+							"To retrieve the DataTables object for this table, please pass either no arguments "+
+							"to the dataTable() function, or set bRetrieve to true. Alternatively, to destory "+
+							"the old table and create a new one, set bDestroy to true (note that a lot of "+
+							"changes to the configuration can be made through the API which is usually much "+
+							"faster)." );
+						return;
+					}
+				}
+				
+				/* If the element we are initialising has the same ID as a table which was previously
+				 * initialised, but the table nodes don't match (from before) then we destory the old
+				 * instance by simply deleting it. This is under the assumption that the table has been
+				 * destroyed by other methods. Anyone using non-id selectors will need to do this manually
+				 */
+				if ( _aoSettings[i].sTableId !== "" && _aoSettings[i].sTableId == this.getAttribute('id') )
+				{
+					_aoSettings.splice( i, 1 );
+					break;
+				}
+			}
+			
+			/* Make a complete and independent copy of the settings object */
+			var oSettings = new classSettings();
+			_aoSettings.push( oSettings );
+			
+			var bInitHandedOff = false;
+			var bUsePassedData = false;
+			
+			/* Set the id */
+			var sId = this.getAttribute( 'id' );
+			if ( sId !== null )
+			{
+				oSettings.sTableId = sId;
+				oSettings.sInstance = sId;
+			}
+			else
+			{
+				oSettings.sInstance = _oExt._oExternConfig.iNextUnique ++;
+			}
+			
+			/* Sanity check */
+			if ( this.nodeName.toLowerCase() != 'table' )
+			{
+				_fnLog( oSettings, 0, "Attempted to initialise DataTables on a node which is not a "+
+					"table: "+this.nodeName );
+				return;
+			}
+			
+			/* Set the table node */
+			oSettings.nTable = this;
+			
+			/* Keep a reference to the 'this' instance for the table. Note that if this table is being
+			 * created with others, we retrieve a unique instance to ease API access.
+			 */
+			oSettings.oInstance = _that.length == 1 ? _that : $(this).dataTable();
+			
+			/* Bind the API functions to the settings, so we can perform actions whenever oSettings is
+			 * available
+			 */
+			oSettings.oApi = _that.oApi;
+			
+			/* State the table's width for if a destroy is called at a later time */
+			oSettings.sDestroyWidth = $(this).width();
+			
+			/* Store the features that we have available */
+			if ( typeof oInit != 'undefined' && oInit !== null )
+			{
+				oSettings.oInit = oInit;
+				_fnMap( oSettings.oFeatures, oInit, "bPaginate" );
+				_fnMap( oSettings.oFeatures, oInit, "bLengthChange" );
+				_fnMap( oSettings.oFeatures, oInit, "bFilter" );
+				_fnMap( oSettings.oFeatures, oInit, "bSort" );
+				_fnMap( oSettings.oFeatures, oInit, "bInfo" );
+				_fnMap( oSettings.oFeatures, oInit, "bProcessing" );
+				_fnMap( oSettings.oFeatures, oInit, "bAutoWidth" );
+				_fnMap( oSettings.oFeatures, oInit, "bSortClasses" );
+				_fnMap( oSettings.oFeatures, oInit, "bServerSide" );
+				_fnMap( oSettings.oScroll, oInit, "sScrollX", "sX" );
+				_fnMap( oSettings.oScroll, oInit, "sScrollXInner", "sXInner" );
+				_fnMap( oSettings.oScroll, oInit, "sScrollY", "sY" );
+				_fnMap( oSettings.oScroll, oInit, "bScrollCollapse", "bCollapse" );
+				_fnMap( oSettings.oScroll, oInit, "bScrollInfinite", "bInfinite" );
+				_fnMap( oSettings.oScroll, oInit, "iScrollLoadGap", "iLoadGap" );
+				_fnMap( oSettings.oScroll, oInit, "bScrollAutoCss", "bAutoCss" );
+				_fnMap( oSettings, oInit, "asStripClasses" );
+				_fnMap( oSettings, oInit, "fnRowCallback" );
+				_fnMap( oSettings, oInit, "fnHeaderCallback" );
+				_fnMap( oSettings, oInit, "fnFooterCallback" );
+				_fnMap( oSettings, oInit, "fnCookieCallback" );
+				_fnMap( oSettings, oInit, "fnInitComplete" );
+				_fnMap( oSettings, oInit, "fnServerData" );
+				_fnMap( oSettings, oInit, "fnFormatNumber" );
+				_fnMap( oSettings, oInit, "aaSorting" );
+				_fnMap( oSettings, oInit, "aaSortingFixed" );
+				_fnMap( oSettings, oInit, "aLengthMenu" );
+				_fnMap( oSettings, oInit, "sPaginationType" );
+				_fnMap( oSettings, oInit, "sAjaxSource" );
+				_fnMap( oSettings, oInit, "iCookieDuration" );
+				_fnMap( oSettings, oInit, "sCookiePrefix" );
+				_fnMap( oSettings, oInit, "sDom" );
+				_fnMap( oSettings, oInit, "oSearch", "oPreviousSearch" );
+				_fnMap( oSettings, oInit, "aoSearchCols", "aoPreSearchCols" );
+				_fnMap( oSettings, oInit, "iDisplayLength", "_iDisplayLength" );
+				_fnMap( oSettings, oInit, "bJQueryUI", "bJUI" );
+				_fnMap( oSettings.oLanguage, oInit, "fnInfoCallback" );
+				
+				/* Callback functions which are array driven */
+				if ( typeof oInit.fnDrawCallback == 'function' )
+				{
+					oSettings.aoDrawCallback.push( {
+						"fn": oInit.fnDrawCallback,
+						"sName": "user"
+					} );
+				}
+				
+				if ( typeof oInit.fnStateSaveCallback == 'function' )
+				{
+					oSettings.aoStateSave.push( {
+						"fn": oInit.fnStateSaveCallback,
+						"sName": "user"
+					} );
+				}
+				
+				if ( typeof oInit.fnStateLoadCallback == 'function' )
+				{
+					oSettings.aoStateLoad.push( {
+						"fn": oInit.fnStateLoadCallback,
+						"sName": "user"
+					} );
+				}
+				
+				if ( oSettings.oFeatures.bServerSide && oSettings.oFeatures.bSort &&
+					   oSettings.oFeatures.bSortClasses )
+				{
+					/* Enable sort classes for server-side processing. Safe to do it here, since server-side
+					 * processing must be enabled by the developer
+					 */
+					oSettings.aoDrawCallback.push( {
+						"fn": _fnSortingClasses,
+						"sName": "server_side_sort_classes"
+					} );
+				}
+				
+				if ( typeof oInit.bJQueryUI != 'undefined' && oInit.bJQueryUI )
+				{
+					/* Use the JUI classes object for display. You could clone the oStdClasses object if 
+					 * you want to have multiple tables with multiple independent classes 
+					 */
+					oSettings.oClasses = _oExt.oJUIClasses;
+					
+					if ( typeof oInit.sDom == 'undefined' )
+					{
+						/* Set the DOM to use a layout suitable for jQuery UI's theming */
+						oSettings.sDom = '<"H"lfr>t<"F"ip>';
+					}
+				}
+				
+				/* Calculate the scroll bar width and cache it for use later on */
+				if ( oSettings.oScroll.sX !== "" || oSettings.oScroll.sY !== "" )
+				{
+					oSettings.oScroll.iBarWidth = _fnScrollBarWidth();
+				}
+				
+				if ( typeof oInit.iDisplayStart != 'undefined' && 
+				     typeof oSettings.iInitDisplayStart == 'undefined' )
+				{
+					/* Display start point, taking into account the save saving */
+					oSettings.iInitDisplayStart = oInit.iDisplayStart;
+					oSettings._iDisplayStart = oInit.iDisplayStart;
+				}
+				
+				/* Must be done after everything which can be overridden by a cookie! */
+				if ( typeof oInit.bStateSave != 'undefined' )
+				{
+					oSettings.oFeatures.bStateSave = oInit.bStateSave;
+					_fnLoadState( oSettings, oInit );
+					oSettings.aoDrawCallback.push( {
+						"fn": _fnSaveState,
+						"sName": "state_save"
+					} );
+				}
+				
+				if ( typeof oInit.aaData != 'undefined' )
+				{
+					bUsePassedData = true;
+				}
+				
+				/* Backwards compatability */
+				/* aoColumns / aoData - remove at some point... */
+				if ( typeof oInit != 'undefined' && typeof oInit.aoData != 'undefined' )
+				{
+					oInit.aoColumns = oInit.aoData;
+				}
+				
+				/* Language definitions */
+				if ( typeof oInit.oLanguage != 'undefined' )
+				{
+					if ( typeof oInit.oLanguage.sUrl != 'undefined' && oInit.oLanguage.sUrl !== "" )
+					{
+						/* Get the language definitions from a file */
+						oSettings.oLanguage.sUrl = oInit.oLanguage.sUrl;
+						$.getJSON( oSettings.oLanguage.sUrl, null, function( json ) { 
+							_fnLanguageProcess( oSettings, json, true ); } );
+						bInitHandedOff = true;
+					}
+					else
+					{
+						_fnLanguageProcess( oSettings, oInit.oLanguage, false );
+					}
+				}
+				/* Warning: The _fnLanguageProcess function is async to the remainder of this function due
+				 * to the XHR. We use _bInitialised in _fnLanguageProcess() to check this the processing 
+				 * below is complete. The reason for spliting it like this is optimisation - we can fire
+				 * off the XHR (if needed) and then continue processing the data.
+				 */
+			}
+			else
+			{
+				/* Create a dummy object for quick manipulation later on. */
+				oInit = {};
+			}
+			
+			/*
+			 * Stripes
+			 * Add the strip classes now that we know which classes to apply - unless overruled
+			 */
+			if ( typeof oInit.asStripClasses == 'undefined' )
+			{
+				oSettings.asStripClasses.push( oSettings.oClasses.sStripOdd );
+				oSettings.asStripClasses.push( oSettings.oClasses.sStripEven );
+			}
+			
+			/* Remove row stripe classes if they are already on the table row */
+			var bStripeRemove = false;
+			var anRows = $('>tbody>tr', this);
+			for ( i=0, iLen=oSettings.asStripClasses.length ; i<iLen ; i++ )
+			{
+				if ( anRows.filter(":lt(2)").hasClass( oSettings.asStripClasses[i]) )
+				{
+					bStripeRemove = true;
+					break;
+				}
+			}
+					
+			if ( bStripeRemove )
+			{
+				/* Store the classes which we are about to remove so they can be readded on destory */
+				oSettings.asDestoryStrips = [ '', '' ];
+				if ( $(anRows[0]).hasClass(oSettings.oClasses.sStripOdd) )
+				{
+					oSettings.asDestoryStrips[0] += oSettings.oClasses.sStripOdd+" ";
+				}
+				if ( $(anRows[0]).hasClass(oSettings.oClasses.sStripEven) )
+				{
+					oSettings.asDestoryStrips[0] += oSettings.oClasses.sStripEven;
+				}
+				if ( $(anRows[1]).hasClass(oSettings.oClasses.sStripOdd) )
+				{
+					oSettings.asDestoryStrips[1] += oSettings.oClasses.sStripOdd+" ";
+				}
+				if ( $(anRows[1]).hasClass(oSettings.oClasses.sStripEven) )
+				{
+					oSettings.asDestoryStrips[1] += oSettings.oClasses.sStripEven;
+				}
+				
+				anRows.removeClass( oSettings.asStripClasses.join(' ') );
+			}
+			
+			/*
+			 * Columns
+			 * See if we should load columns automatically or use defined ones
+			 */
+			var nThead = this.getElementsByTagName('thead');
+			var anThs = nThead.length===0 ? [] : _fnGetUniqueThs( nThead[0] );
+			var aoColumnsInit;
+			
+			/* If not given a column array, generate one with nulls */
+			if ( typeof oInit.aoColumns == 'undefined' )
+			{
+				aoColumnsInit = [];
+				for ( i=0, iLen=anThs.length ; i<iLen ; i++ )
+				{
+					aoColumnsInit.push( null );
+				}
+			}
+			else
+			{
+				aoColumnsInit = oInit.aoColumns;
+			}
+			
+			/* Add the columns */
+			for ( i=0, iLen=aoColumnsInit.length ; i<iLen ; i++ )
+			{
+				/* Check if we have column visibilty state to restore */
+				if ( typeof oInit.saved_aoColumns != 'undefined' && oInit.saved_aoColumns.length == iLen )
+				{
+					if ( aoColumnsInit[i] === null )
+					{
+						aoColumnsInit[i] = {};
+					}
+					aoColumnsInit[i].bVisible = oInit.saved_aoColumns[i].bVisible;
+				}
+				
+				_fnAddColumn( oSettings, anThs ? anThs[i] : null );
+			}
+			
+			/* Add options from column definations */
+			if ( typeof oInit.aoColumnDefs != 'undefined' )
+			{
+				/* Loop over the column defs array - loop in reverse so first instace has priority */
+				for ( i=oInit.aoColumnDefs.length-1 ; i>=0 ; i-- )
+				{
+					/* Each column def can target multiple columns, as it is an array */
+					var aTargets = oInit.aoColumnDefs[i].aTargets;
+					if ( !$.isArray( aTargets ) )
+					{
+						_fnLog( oSettings, 1, 'aTargets must be an array of targets, not a '+(typeof aTargets) );
+					}
+					for ( j=0, jLen=aTargets.length ; j<jLen ; j++ )
+					{
+						if ( typeof aTargets[j] == 'number' && aTargets[j] >= 0 )
+						{
+							/* 0+ integer, left to right column counting. We add columns which are unknown
+							 * automatically. Is this the right behaviour for this? We should at least
+							 * log it in future. We cannot do this for the negative or class targets, only here.
+							 */
+							while( oSettings.aoColumns.length <= aTargets[j] )
+							{
+								_fnAddColumn( oSettings );
+							}
+							_fnColumnOptions( oSettings, aTargets[j], oInit.aoColumnDefs[i] );
+						}
+						else if ( typeof aTargets[j] == 'number' && aTargets[j] < 0 )
+						{
+							/* Negative integer, right to left column counting */
+							_fnColumnOptions( oSettings, oSettings.aoColumns.length+aTargets[j], 
+								oInit.aoColumnDefs[i] );
+						}
+						else if ( typeof aTargets[j] == 'string' )
+						{
+							/* Class name matching on TH element */
+							for ( k=0, kLen=oSettings.aoColumns.length ; k<kLen ; k++ )
+							{
+								if ( aTargets[j] == "_all" ||
+								     oSettings.aoColumns[k].nTh.className.indexOf( aTargets[j] ) != -1 )
+								{
+									_fnColumnOptions( oSettings, k, oInit.aoColumnDefs[i] );
+								}
+							}
+						}
+					}
+				}
+			}
+			
+			/* Add options from column array - after the defs array so this has priority */
+			if ( typeof aoColumnsInit != 'undefined' )
+			{
+				for ( i=0, iLen=aoColumnsInit.length ; i<iLen ; i++ )
+				{
+					_fnColumnOptions( oSettings, i, aoColumnsInit[i] );
+				}
+			}
+			
+			/*
+			 * Sorting
+			 * Check the aaSorting array
+			 */
+			for ( i=0, iLen=oSettings.aaSorting.length ; i<iLen ; i++ )
+			{
+				if ( oSettings.aaSorting[i][0] >= oSettings.aoColumns.length )
+				{
+					oSettings.aaSorting[i][0] = 0;
+				}
+				var oColumn = oSettings.aoColumns[ oSettings.aaSorting[i][0] ];
+				
+				/* Add a default sorting index */
+				if ( typeof oSettings.aaSorting[i][2] == 'undefined' )
+				{
+					oSettings.aaSorting[i][2] = 0;
+				}
+				
+				/* If aaSorting is not defined, then we use the first indicator in asSorting */
+				if ( typeof oInit.aaSorting == "undefined" && 
+						 typeof oSettings.saved_aaSorting == "undefined" )
+				{
+					oSettings.aaSorting[i][1] = oColumn.asSorting[0];
+				}
+				
+				/* Set the current sorting index based on aoColumns.asSorting */
+				for ( j=0, jLen=oColumn.asSorting.length ; j<jLen ; j++ )
+				{
+					if ( oSettings.aaSorting[i][1] == oColumn.asSorting[j] )
+					{
+						oSettings.aaSorting[i][2] = j;
+						break;
+					}
+				}
+			}
+				
+			/* Do a first pass on the sorting classes (allows any size changes to be taken into
+			 * account, and also will apply sorting disabled classes if disabled
+			 */
+			_fnSortingClasses( oSettings );
+			
+			/*
+			 * Final init
+			 * Sanity check that there is a thead and tbody. If not let's just create them
+			 */
+			if ( this.getElementsByTagName('thead').length === 0 )
+			{
+				this.appendChild( document.createElement( 'thead' ) );
+			}
+			
+			if ( this.getElementsByTagName('tbody').length === 0 )
+			{
+				this.appendChild( document.createElement( 'tbody' ) );
+			}
+			
+			oSettings.nTHead = this.getElementsByTagName('thead')[0];
+			oSettings.nTBody = this.getElementsByTagName('tbody')[0];
+			if ( this.getElementsByTagName('tfoot').length > 0 )
+			{
+				oSettings.nTFoot = this.getElementsByTagName('tfoot')[0];
+			}
+			
+			/* Check if there is data passing into the constructor */
+			if ( bUsePassedData )
+			{
+				for ( i=0 ; i<oInit.aaData.length ; i++ )
+				{
+					_fnAddData( oSettings, oInit.aaData[ i ] );
+				}
+			}
+			else
+			{
+				/* Grab the data from the page */
+				_fnGatherData( oSettings );
+			}
+			
+			/* Copy the data index array */
+			oSettings.aiDisplay = oSettings.aiDisplayMaster.slice();
+			
+			/* Initialisation complete - table can be drawn */
+			oSettings.bInitialised = true;
+			
+			/* Check if we need to initialise the table (it might not have been handed off to the
+			 * language processor)
+			 */
+			if ( bInitHandedOff === false )
+			{
+				_fnInitalise( oSettings );
+			}
+		});
+	};
+})(jQuery, window, document);
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/fonts/FontAwesome.otf b/pluss-manage-page/src/main/resources/static/resources/auth/fonts/FontAwesome.otf
new file mode 100644
index 0000000..5318014
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/fonts/FontAwesome.otf differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/fonts/fontawesome-webfont.eot b/pluss-manage-page/src/main/resources/static/resources/auth/fonts/fontawesome-webfont.eot
new file mode 100644
index 0000000..b6ec065
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/fonts/fontawesome-webfont.eot differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/fonts/fontawesome-webfont.svg b/pluss-manage-page/src/main/resources/static/resources/auth/fonts/fontawesome-webfont.svg
new file mode 100644
index 0000000..855c845
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/fonts/fontawesome-webfont.svg
@@ -0,0 +1,2671 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg>
+<metadata>
+Created by FontForge 20120731 at Mon Oct 24 17:37:40 2016
+ By ,,,
+Copyright Dave Gandy 2016. All rights reserved.
+</metadata>
+<defs>
+<font id="FontAwesome" horiz-adv-x="1536" >
+  <font-face 
+    font-family="FontAwesome"
+    font-weight="400"
+    font-stretch="normal"
+    units-per-em="1792"
+    panose-1="0 0 0 0 0 0 0 0 0 0"
+    ascent="1536"
+    descent="-256"
+    bbox="-1.02083 -256.962 2304.6 1537.02"
+    underline-thickness="0"
+    underline-position="0"
+    unicode-range="U+0020-F500"
+  />
+<missing-glyph horiz-adv-x="896" 
+d="M224 112h448v1312h-448v-1312zM112 0v1536h672v-1536h-672z" />
+    <glyph glyph-name=".notdef" horiz-adv-x="896" 
+d="M224 112h448v1312h-448v-1312zM112 0v1536h672v-1536h-672z" />
+    <glyph glyph-name=".null" horiz-adv-x="0" 
+ />
+    <glyph glyph-name="nonmarkingreturn" horiz-adv-x="597" 
+ />
+    <glyph glyph-name="space" unicode=" " horiz-adv-x="448" 
+ />
+    <glyph glyph-name="dieresis" unicode="&#xa8;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="copyright" unicode="&#xa9;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="registered" unicode="&#xae;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="acute" unicode="&#xb4;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="AE" unicode="&#xc6;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="Oslash" unicode="&#xd8;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="trademark" unicode="&#x2122;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="infinity" unicode="&#x221e;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="notequal" unicode="&#x2260;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="glass" unicode="&#xf000;" horiz-adv-x="1792" 
+d="M1699 1350q0 -35 -43 -78l-632 -632v-768h320q26 0 45 -19t19 -45t-19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45t45 19h320v768l-632 632q-43 43 -43 78q0 23 18 36.5t38 17.5t43 4h1408q23 0 43 -4t38 -17.5t18 -36.5z" />
+    <glyph glyph-name="music" unicode="&#xf001;" 
+d="M1536 1312v-1120q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v537l-768 -237v-709q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89
+t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v967q0 31 19 56.5t49 35.5l832 256q12 4 28 4q40 0 68 -28t28 -68z" />
+    <glyph glyph-name="search" unicode="&#xf002;" horiz-adv-x="1664" 
+d="M1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -52 -38 -90t-90 -38q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5
+t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z" />
+    <glyph glyph-name="envelope" unicode="&#xf003;" horiz-adv-x="1792" 
+d="M1664 32v768q-32 -36 -69 -66q-268 -206 -426 -338q-51 -43 -83 -67t-86.5 -48.5t-102.5 -24.5h-1h-1q-48 0 -102.5 24.5t-86.5 48.5t-83 67q-158 132 -426 338q-37 30 -69 66v-768q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1664 1083v11v13.5t-0.5 13
+t-3 12.5t-5.5 9t-9 7.5t-14 2.5h-1472q-13 0 -22.5 -9.5t-9.5 -22.5q0 -168 147 -284q193 -152 401 -317q6 -5 35 -29.5t46 -37.5t44.5 -31.5t50.5 -27.5t43 -9h1h1q20 0 43 9t50.5 27.5t44.5 31.5t46 37.5t35 29.5q208 165 401 317q54 43 100.5 115.5t46.5 131.5z
+M1792 1120v-1088q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="heart" unicode="&#xf004;" horiz-adv-x="1792" 
+d="M896 -128q-26 0 -44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5q224 0 351 -124t127 -344q0 -221 -229 -450l-623 -600
+q-18 -18 -44 -18z" />
+    <glyph glyph-name="star" unicode="&#xf005;" horiz-adv-x="1664" 
+d="M1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -21 -10.5 -35.5t-30.5 -14.5q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455
+l502 -73q56 -9 56 -46z" />
+    <glyph glyph-name="star_empty" unicode="&#xf006;" horiz-adv-x="1664" 
+d="M1137 532l306 297l-422 62l-189 382l-189 -382l-422 -62l306 -297l-73 -421l378 199l377 -199zM1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -50 -41 -50q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500
+l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455l502 -73q56 -9 56 -46z" />
+    <glyph glyph-name="user" unicode="&#xf007;" horiz-adv-x="1280" 
+d="M1280 137q0 -109 -62.5 -187t-150.5 -78h-854q-88 0 -150.5 78t-62.5 187q0 85 8.5 160.5t31.5 152t58.5 131t94 89t134.5 34.5q131 -128 313 -128t313 128q76 0 134.5 -34.5t94 -89t58.5 -131t31.5 -152t8.5 -160.5zM1024 1024q0 -159 -112.5 -271.5t-271.5 -112.5
+t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5z" />
+    <glyph glyph-name="film" unicode="&#xf008;" horiz-adv-x="1920" 
+d="M384 -64v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 320v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 704v128q0 26 -19 45t-45 19h-128
+q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1408 -64v512q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-512q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM384 1088v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45
+t45 -19h128q26 0 45 19t19 45zM1792 -64v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1408 704v512q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-512q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1792 320v128
+q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1792 704v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1792 1088v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19
+t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1920 1248v-1344q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1344q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="th_large" unicode="&#xf009;" horiz-adv-x="1664" 
+d="M768 512v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM768 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 512v-384q0 -52 -38 -90t-90 -38
+h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="th" unicode="&#xf00a;" horiz-adv-x="1792" 
+d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 288v-192q0 -40 -28 -68t-68 -28h-320
+q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28
+h320q40 0 68 -28t28 -68zM1792 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 800v-192
+q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68z" />
+    <glyph glyph-name="th_list" unicode="&#xf00b;" horiz-adv-x="1792" 
+d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 288v-192q0 -40 -28 -68t-68 -28h-960
+q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h960q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 800v-192q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v192q0 40 28 68t68 28
+h960q40 0 68 -28t28 -68zM1792 1312v-192q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h960q40 0 68 -28t28 -68z" />
+    <glyph glyph-name="ok" unicode="&#xf00c;" horiz-adv-x="1792" 
+d="M1671 970q0 -40 -28 -68l-724 -724l-136 -136q-28 -28 -68 -28t-68 28l-136 136l-362 362q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -295l656 657q28 28 68 28t68 -28l136 -136q28 -28 28 -68z" />
+    <glyph glyph-name="remove" unicode="&#xf00d;" horiz-adv-x="1408" 
+d="M1298 214q0 -40 -28 -68l-136 -136q-28 -28 -68 -28t-68 28l-294 294l-294 -294q-28 -28 -68 -28t-68 28l-136 136q-28 28 -28 68t28 68l294 294l-294 294q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -294l294 294q28 28 68 28t68 -28l136 -136q28 -28 28 -68
+t-28 -68l-294 -294l294 -294q28 -28 28 -68z" />
+    <glyph glyph-name="zoom_in" unicode="&#xf00e;" horiz-adv-x="1664" 
+d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-224q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v224h-224q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h224v224q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5v-224h224
+q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5
+t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z" />
+    <glyph glyph-name="zoom_out" unicode="&#xf010;" horiz-adv-x="1664" 
+d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-576q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h576q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5z
+M1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z
+" />
+    <glyph glyph-name="off" unicode="&#xf011;" 
+d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61t-298 61t-245 164t-164 245t-61 298q0 182 80.5 343t226.5 270q43 32 95.5 25t83.5 -50q32 -42 24.5 -94.5t-49.5 -84.5q-98 -74 -151.5 -181t-53.5 -228q0 -104 40.5 -198.5t109.5 -163.5t163.5 -109.5
+t198.5 -40.5t198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5q0 121 -53.5 228t-151.5 181q-42 32 -49.5 84.5t24.5 94.5q31 43 84 50t95 -25q146 -109 226.5 -270t80.5 -343zM896 1408v-640q0 -52 -38 -90t-90 -38t-90 38t-38 90v640q0 52 38 90t90 38t90 -38t38 -90z" />
+    <glyph glyph-name="signal" unicode="&#xf012;" horiz-adv-x="1792" 
+d="M256 96v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM640 224v-320q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1024 480v-576q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23
+v576q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1408 864v-960q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 1376v-1472q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1472q0 14 9 23t23 9h192q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="cog" unicode="&#xf013;" 
+d="M1024 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1536 749v-222q0 -12 -8 -23t-20 -13l-185 -28q-19 -54 -39 -91q35 -50 107 -138q10 -12 10 -25t-9 -23q-27 -37 -99 -108t-94 -71q-12 0 -26 9l-138 108q-44 -23 -91 -38
+q-16 -136 -29 -186q-7 -28 -36 -28h-222q-14 0 -24.5 8.5t-11.5 21.5l-28 184q-49 16 -90 37l-141 -107q-10 -9 -25 -9q-14 0 -25 11q-126 114 -165 168q-7 10 -7 23q0 12 8 23q15 21 51 66.5t54 70.5q-27 50 -41 99l-183 27q-13 2 -21 12.5t-8 23.5v222q0 12 8 23t19 13
+l186 28q14 46 39 92q-40 57 -107 138q-10 12 -10 24q0 10 9 23q26 36 98.5 107.5t94.5 71.5q13 0 26 -10l138 -107q44 23 91 38q16 136 29 186q7 28 36 28h222q14 0 24.5 -8.5t11.5 -21.5l28 -184q49 -16 90 -37l142 107q9 9 24 9q13 0 25 -10q129 -119 165 -170q7 -8 7 -22
+q0 -12 -8 -23q-15 -21 -51 -66.5t-54 -70.5q26 -50 41 -98l183 -28q13 -2 21 -12.5t8 -23.5z" />
+    <glyph glyph-name="trash" unicode="&#xf014;" horiz-adv-x="1408" 
+d="M512 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM768 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1024 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576
+q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1152 76v948h-896v-948q0 -22 7 -40.5t14.5 -27t10.5 -8.5h832q3 0 10.5 8.5t14.5 27t7 40.5zM480 1152h448l-48 117q-7 9 -17 11h-317q-10 -2 -17 -11zM1408 1120v-64q0 -14 -9 -23t-23 -9h-96v-948q0 -83 -47 -143.5t-113 -60.5h-832
+q-66 0 -113 58.5t-47 141.5v952h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h309l70 167q15 37 54 63t79 26h320q40 0 79 -26t54 -63l70 -167h309q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="home" unicode="&#xf015;" horiz-adv-x="1664" 
+d="M1408 544v-480q0 -26 -19 -45t-45 -19h-384v384h-256v-384h-384q-26 0 -45 19t-19 45v480q0 1 0.5 3t0.5 3l575 474l575 -474q1 -2 1 -6zM1631 613l-62 -74q-8 -9 -21 -11h-3q-13 0 -21 7l-692 577l-692 -577q-12 -8 -24 -7q-13 2 -21 11l-62 74q-8 10 -7 23.5t11 21.5
+l719 599q32 26 76 26t76 -26l244 -204v195q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-408l219 -182q10 -8 11 -21.5t-7 -23.5z" />
+    <glyph glyph-name="file_alt" unicode="&#xf016;" 
+d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+" />
+    <glyph glyph-name="time" unicode="&#xf017;" 
+d="M896 992v-448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640
+q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="road" unicode="&#xf018;" horiz-adv-x="1920" 
+d="M1111 540v4l-24 320q-1 13 -11 22.5t-23 9.5h-186q-13 0 -23 -9.5t-11 -22.5l-24 -320v-4q-1 -12 8 -20t21 -8h244q12 0 21 8t8 20zM1870 73q0 -73 -46 -73h-704q13 0 22 9.5t8 22.5l-20 256q-1 13 -11 22.5t-23 9.5h-272q-13 0 -23 -9.5t-11 -22.5l-20 -256
+q-1 -13 8 -22.5t22 -9.5h-704q-46 0 -46 73q0 54 26 116l417 1044q8 19 26 33t38 14h339q-13 0 -23 -9.5t-11 -22.5l-15 -192q-1 -14 8 -23t22 -9h166q13 0 22 9t8 23l-15 192q-1 13 -11 22.5t-23 9.5h339q20 0 38 -14t26 -33l417 -1044q26 -62 26 -116z" />
+    <glyph glyph-name="download_alt" unicode="&#xf019;" horiz-adv-x="1664" 
+d="M1280 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 416v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h465l135 -136
+q58 -56 136 -56t136 56l136 136h464q40 0 68 -28t28 -68zM1339 985q17 -41 -14 -70l-448 -448q-18 -19 -45 -19t-45 19l-448 448q-31 29 -14 70q17 39 59 39h256v448q0 26 19 45t45 19h256q26 0 45 -19t19 -45v-448h256q42 0 59 -39z" />
+    <glyph glyph-name="download" unicode="&#xf01a;" 
+d="M1120 608q0 -12 -10 -24l-319 -319q-11 -9 -23 -9t-23 9l-320 320q-15 16 -7 35q8 20 30 20h192v352q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-352h192q14 0 23 -9t9 -23zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273
+t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="upload" unicode="&#xf01b;" 
+d="M1118 660q-8 -20 -30 -20h-192v-352q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v352h-192q-14 0 -23 9t-9 23q0 12 10 24l319 319q11 9 23 9t23 -9l320 -320q15 -16 7 -35zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198
+t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="inbox" unicode="&#xf01c;" 
+d="M1023 576h316q-1 3 -2.5 8.5t-2.5 7.5l-212 496h-708l-212 -496q-1 -3 -2.5 -8.5t-2.5 -7.5h316l95 -192h320zM1536 546v-482q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v482q0 62 25 123l238 552q10 25 36.5 42t52.5 17h832q26 0 52.5 -17t36.5 -42l238 -552
+q25 -61 25 -123z" />
+    <glyph glyph-name="play_circle" unicode="&#xf01d;" 
+d="M1184 640q0 -37 -32 -55l-544 -320q-15 -9 -32 -9q-16 0 -32 8q-32 19 -32 56v640q0 37 32 56q33 18 64 -1l544 -320q32 -18 32 -55zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640
+q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="repeat" unicode="&#xf01e;" 
+d="M1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l138 138q-148 137 -349 137q-104 0 -198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5q119 0 225 52t179 147q7 10 23 12q15 0 25 -9
+l137 -138q9 -8 9.5 -20.5t-7.5 -22.5q-109 -132 -264 -204.5t-327 -72.5q-156 0 -298 61t-245 164t-164 245t-61 298t61 298t164 245t245 164t298 61q147 0 284.5 -55.5t244.5 -156.5l130 129q29 31 70 14q39 -17 39 -59z" />
+    <glyph glyph-name="refresh" unicode="&#xf021;" 
+d="M1511 480q0 -5 -1 -7q-64 -268 -268 -434.5t-478 -166.5q-146 0 -282.5 55t-243.5 157l-129 -129q-19 -19 -45 -19t-45 19t-19 45v448q0 26 19 45t45 19h448q26 0 45 -19t19 -45t-19 -45l-137 -137q71 -66 161 -102t187 -36q134 0 250 65t186 179q11 17 53 117
+q8 23 30 23h192q13 0 22.5 -9.5t9.5 -22.5zM1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-26 0 -45 19t-19 45t19 45l138 138q-148 137 -349 137q-134 0 -250 -65t-186 -179q-11 -17 -53 -117q-8 -23 -30 -23h-199q-13 0 -22.5 9.5t-9.5 22.5v7q65 268 270 434.5t480 166.5
+q146 0 284 -55.5t245 -156.5l130 129q19 19 45 19t45 -19t19 -45z" />
+    <glyph glyph-name="list_alt" unicode="&#xf022;" horiz-adv-x="1792" 
+d="M384 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M384 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1536 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5t9.5 -22.5z
+M1536 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5t9.5 -22.5zM1536 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5
+t9.5 -22.5zM1664 160v832q0 13 -9.5 22.5t-22.5 9.5h-1472q-13 0 -22.5 -9.5t-9.5 -22.5v-832q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1792 1248v-1088q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1472q66 0 113 -47
+t47 -113z" />
+    <glyph glyph-name="lock" unicode="&#xf023;" horiz-adv-x="1152" 
+d="M320 768h512v192q0 106 -75 181t-181 75t-181 -75t-75 -181v-192zM1152 672v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v192q0 184 132 316t316 132t316 -132t132 -316v-192h32q40 0 68 -28t28 -68z" />
+    <glyph glyph-name="flag" unicode="&#xf024;" horiz-adv-x="1792" 
+d="M320 1280q0 -72 -64 -110v-1266q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v1266q-64 38 -64 110q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -25 -12.5 -38.5t-39.5 -27.5q-215 -116 -369 -116q-61 0 -123.5 22t-108.5 48
+t-115.5 48t-142.5 22q-192 0 -464 -146q-17 -9 -33 -9q-26 0 -45 19t-19 45v742q0 32 31 55q21 14 79 43q236 120 421 120q107 0 200 -29t219 -88q38 -19 88 -19q54 0 117.5 21t110 47t88 47t54.5 21q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="headphones" unicode="&#xf025;" horiz-adv-x="1664" 
+d="M1664 650q0 -166 -60 -314l-20 -49l-185 -33q-22 -83 -90.5 -136.5t-156.5 -53.5v-32q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-32q71 0 130 -35.5t93 -95.5l68 12q29 95 29 193q0 148 -88 279t-236.5 209t-315.5 78
+t-315.5 -78t-236.5 -209t-88 -279q0 -98 29 -193l68 -12q34 60 93 95.5t130 35.5v32q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v32q-88 0 -156.5 53.5t-90.5 136.5l-185 33l-20 49q-60 148 -60 314q0 151 67 291t179 242.5
+t266 163.5t320 61t320 -61t266 -163.5t179 -242.5t67 -291z" />
+    <glyph glyph-name="volume_off" unicode="&#xf026;" horiz-adv-x="768" 
+d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45z" />
+    <glyph glyph-name="volume_down" unicode="&#xf027;" horiz-adv-x="1152" 
+d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 36
+t12 56.5t-12 56.5t-29 36t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142z" />
+    <glyph glyph-name="volume_up" unicode="&#xf028;" horiz-adv-x="1664" 
+d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 36
+t12 56.5t-12 56.5t-29 36t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142zM1408 640q0 -153 -85 -282.5t-225 -188.5q-13 -5 -25 -5q-27 0 -46 19t-19 45q0 39 39 59q56 29 76 44q74 54 115.5 135.5t41.5 173.5t-41.5 173.5
+t-115.5 135.5q-20 15 -76 44q-39 20 -39 59q0 26 19 45t45 19q13 0 26 -5q140 -59 225 -188.5t85 -282.5zM1664 640q0 -230 -127 -422.5t-338 -283.5q-13 -5 -26 -5q-26 0 -45 19t-19 45q0 36 39 59q7 4 22.5 10.5t22.5 10.5q46 25 82 51q123 91 192 227t69 289t-69 289
+t-192 227q-36 26 -82 51q-7 4 -22.5 10.5t-22.5 10.5q-39 23 -39 59q0 26 19 45t45 19q13 0 26 -5q211 -91 338 -283.5t127 -422.5z" />
+    <glyph glyph-name="qrcode" unicode="&#xf029;" horiz-adv-x="1408" 
+d="M384 384v-128h-128v128h128zM384 1152v-128h-128v128h128zM1152 1152v-128h-128v128h128zM128 129h384v383h-384v-383zM128 896h384v384h-384v-384zM896 896h384v384h-384v-384zM640 640v-640h-640v640h640zM1152 128v-128h-128v128h128zM1408 128v-128h-128v128h128z
+M1408 640v-384h-384v128h-128v-384h-128v640h384v-128h128v128h128zM640 1408v-640h-640v640h640zM1408 1408v-640h-640v640h640z" />
+    <glyph glyph-name="barcode" unicode="&#xf02a;" horiz-adv-x="1792" 
+d="M63 0h-63v1408h63v-1408zM126 1h-32v1407h32v-1407zM220 1h-31v1407h31v-1407zM377 1h-31v1407h31v-1407zM534 1h-62v1407h62v-1407zM660 1h-31v1407h31v-1407zM723 1h-31v1407h31v-1407zM786 1h-31v1407h31v-1407zM943 1h-63v1407h63v-1407zM1100 1h-63v1407h63v-1407z
+M1226 1h-63v1407h63v-1407zM1352 1h-63v1407h63v-1407zM1446 1h-63v1407h63v-1407zM1635 1h-94v1407h94v-1407zM1698 1h-32v1407h32v-1407zM1792 0h-63v1408h63v-1408z" />
+    <glyph glyph-name="tag" unicode="&#xf02b;" 
+d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5
+l715 -714q37 -39 37 -91z" />
+    <glyph glyph-name="tags" unicode="&#xf02c;" horiz-adv-x="1920" 
+d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5
+l715 -714q37 -39 37 -91zM1899 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-36 0 -59 14t-53 45l470 470q37 37 37 90q0 52 -37 91l-715 714q-38 38 -102 64.5t-117 26.5h224q53 0 117 -26.5t102 -64.5l715 -714q37 -39 37 -91z" />
+    <glyph glyph-name="book" unicode="&#xf02d;" horiz-adv-x="1664" 
+d="M1639 1058q40 -57 18 -129l-275 -906q-19 -64 -76.5 -107.5t-122.5 -43.5h-923q-77 0 -148.5 53.5t-99.5 131.5q-24 67 -2 127q0 4 3 27t4 37q1 8 -3 21.5t-3 19.5q2 11 8 21t16.5 23.5t16.5 23.5q23 38 45 91.5t30 91.5q3 10 0.5 30t-0.5 28q3 11 17 28t17 23
+q21 36 42 92t25 90q1 9 -2.5 32t0.5 28q4 13 22 30.5t22 22.5q19 26 42.5 84.5t27.5 96.5q1 8 -3 25.5t-2 26.5q2 8 9 18t18 23t17 21q8 12 16.5 30.5t15 35t16 36t19.5 32t26.5 23.5t36 11.5t47.5 -5.5l-1 -3q38 9 51 9h761q74 0 114 -56t18 -130l-274 -906
+q-36 -119 -71.5 -153.5t-128.5 -34.5h-869q-27 0 -38 -15q-11 -16 -1 -43q24 -70 144 -70h923q29 0 56 15.5t35 41.5l300 987q7 22 5 57q38 -15 59 -43zM575 1056q-4 -13 2 -22.5t20 -9.5h608q13 0 25.5 9.5t16.5 22.5l21 64q4 13 -2 22.5t-20 9.5h-608q-13 0 -25.5 -9.5
+t-16.5 -22.5zM492 800q-4 -13 2 -22.5t20 -9.5h608q13 0 25.5 9.5t16.5 22.5l21 64q4 13 -2 22.5t-20 9.5h-608q-13 0 -25.5 -9.5t-16.5 -22.5z" />
+    <glyph glyph-name="bookmark" unicode="&#xf02e;" horiz-adv-x="1280" 
+d="M1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289q0 34 19.5 62t52.5 41q21 9 44 9h1048z" />
+    <glyph glyph-name="print" unicode="&#xf02f;" horiz-adv-x="1664" 
+d="M384 0h896v256h-896v-256zM384 640h896v384h-160q-40 0 -68 28t-28 68v160h-640v-640zM1536 576q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 576v-416q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-160q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68
+v160h-224q-13 0 -22.5 9.5t-9.5 22.5v416q0 79 56.5 135.5t135.5 56.5h64v544q0 40 28 68t68 28h672q40 0 88 -20t76 -48l152 -152q28 -28 48 -76t20 -88v-256h64q79 0 135.5 -56.5t56.5 -135.5z" />
+    <glyph glyph-name="camera" unicode="&#xf030;" horiz-adv-x="1920" 
+d="M960 864q119 0 203.5 -84.5t84.5 -203.5t-84.5 -203.5t-203.5 -84.5t-203.5 84.5t-84.5 203.5t84.5 203.5t203.5 84.5zM1664 1280q106 0 181 -75t75 -181v-896q0 -106 -75 -181t-181 -75h-1408q-106 0 -181 75t-75 181v896q0 106 75 181t181 75h224l51 136
+q19 49 69.5 84.5t103.5 35.5h512q53 0 103.5 -35.5t69.5 -84.5l51 -136h224zM960 128q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+    <glyph glyph-name="font" unicode="&#xf031;" horiz-adv-x="1664" 
+d="M725 977l-170 -450q33 0 136.5 -2t160.5 -2q19 0 57 2q-87 253 -184 452zM0 -128l2 79q23 7 56 12.5t57 10.5t49.5 14.5t44.5 29t31 50.5l237 616l280 724h75h53q8 -14 11 -21l205 -480q33 -78 106 -257.5t114 -274.5q15 -34 58 -144.5t72 -168.5q20 -45 35 -57
+q19 -15 88 -29.5t84 -20.5q6 -38 6 -57q0 -5 -0.5 -13.5t-0.5 -12.5q-63 0 -190 8t-191 8q-76 0 -215 -7t-178 -8q0 43 4 78l131 28q1 0 12.5 2.5t15.5 3.5t14.5 4.5t15 6.5t11 8t9 11t2.5 14q0 16 -31 96.5t-72 177.5t-42 100l-450 2q-26 -58 -76.5 -195.5t-50.5 -162.5
+q0 -22 14 -37.5t43.5 -24.5t48.5 -13.5t57 -8.5t41 -4q1 -19 1 -58q0 -9 -2 -27q-58 0 -174.5 10t-174.5 10q-8 0 -26.5 -4t-21.5 -4q-80 -14 -188 -14z" />
+    <glyph glyph-name="bold" unicode="&#xf032;" horiz-adv-x="1408" 
+d="M555 15q74 -32 140 -32q376 0 376 335q0 114 -41 180q-27 44 -61.5 74t-67.5 46.5t-80.5 25t-84 10.5t-94.5 2q-73 0 -101 -10q0 -53 -0.5 -159t-0.5 -158q0 -8 -1 -67.5t-0.5 -96.5t4.5 -83.5t12 -66.5zM541 761q42 -7 109 -7q82 0 143 13t110 44.5t74.5 89.5t25.5 142
+q0 70 -29 122.5t-79 82t-108 43.5t-124 14q-50 0 -130 -13q0 -50 4 -151t4 -152q0 -27 -0.5 -80t-0.5 -79q0 -46 1 -69zM0 -128l2 94q15 4 85 16t106 27q7 12 12.5 27t8.5 33.5t5.5 32.5t3 37.5t0.5 34v35.5v30q0 982 -22 1025q-4 8 -22 14.5t-44.5 11t-49.5 7t-48.5 4.5
+t-30.5 3l-4 83q98 2 340 11.5t373 9.5q23 0 68 -0.5t68 -0.5q70 0 136.5 -13t128.5 -42t108 -71t74 -104.5t28 -137.5q0 -52 -16.5 -95.5t-39 -72t-64.5 -57.5t-73 -45t-84 -40q154 -35 256.5 -134t102.5 -248q0 -100 -35 -179.5t-93.5 -130.5t-138 -85.5t-163.5 -48.5
+t-176 -14q-44 0 -132 3t-132 3q-106 0 -307 -11t-231 -12z" />
+    <glyph glyph-name="italic" unicode="&#xf033;" horiz-adv-x="1024" 
+d="M0 -126l17 85q22 7 61.5 16.5t72 19t59.5 23.5q28 35 41 101q1 7 62 289t114 543.5t52 296.5v25q-24 13 -54.5 18.5t-69.5 8t-58 5.5l19 103q33 -2 120 -6.5t149.5 -7t120.5 -2.5q48 0 98.5 2.5t121 7t98.5 6.5q-5 -39 -19 -89q-30 -10 -101.5 -28.5t-108.5 -33.5
+q-8 -19 -14 -42.5t-9 -40t-7.5 -45.5t-6.5 -42q-27 -148 -87.5 -419.5t-77.5 -355.5q-2 -9 -13 -58t-20 -90t-16 -83.5t-6 -57.5l1 -18q17 -4 185 -31q-3 -44 -16 -99q-11 0 -32.5 -1.5t-32.5 -1.5q-29 0 -87 10t-86 10q-138 2 -206 2q-51 0 -143 -9t-121 -11z" />
+    <glyph glyph-name="text_height" unicode="&#xf034;" horiz-adv-x="1792" 
+d="M1744 128q33 0 42 -18.5t-11 -44.5l-126 -162q-20 -26 -49 -26t-49 26l-126 162q-20 26 -11 44.5t42 18.5h80v1024h-80q-33 0 -42 18.5t11 44.5l126 162q20 26 49 26t49 -26l126 -162q20 -26 11 -44.5t-42 -18.5h-80v-1024h80zM81 1407l54 -27q12 -5 211 -5q44 0 132 2
+t132 2q36 0 107.5 -0.5t107.5 -0.5h293q6 0 21 -0.5t20.5 0t16 3t17.5 9t15 17.5l42 1q4 0 14 -0.5t14 -0.5q2 -112 2 -336q0 -80 -5 -109q-39 -14 -68 -18q-25 44 -54 128q-3 9 -11 48t-14.5 73.5t-7.5 35.5q-6 8 -12 12.5t-15.5 6t-13 2.5t-18 0.5t-16.5 -0.5
+q-17 0 -66.5 0.5t-74.5 0.5t-64 -2t-71 -6q-9 -81 -8 -136q0 -94 2 -388t2 -455q0 -16 -2.5 -71.5t0 -91.5t12.5 -69q40 -21 124 -42.5t120 -37.5q5 -40 5 -50q0 -14 -3 -29l-34 -1q-76 -2 -218 8t-207 10q-50 0 -151 -9t-152 -9q-3 51 -3 52v9q17 27 61.5 43t98.5 29t78 27
+q19 42 19 383q0 101 -3 303t-3 303v117q0 2 0.5 15.5t0.5 25t-1 25.5t-3 24t-5 14q-11 12 -162 12q-33 0 -93 -12t-80 -26q-19 -13 -34 -72.5t-31.5 -111t-42.5 -53.5q-42 26 -56 44v383z" />
+    <glyph glyph-name="text_width" unicode="&#xf035;" 
+d="M81 1407l54 -27q12 -5 211 -5q44 0 132 2t132 2q70 0 246.5 1t304.5 0.5t247 -4.5q33 -1 56 31l42 1q4 0 14 -0.5t14 -0.5q2 -112 2 -336q0 -80 -5 -109q-39 -14 -68 -18q-25 44 -54 128q-3 9 -11 47.5t-15 73.5t-7 36q-10 13 -27 19q-5 2 -66 2q-30 0 -93 1t-103 1
+t-94 -2t-96 -7q-9 -81 -8 -136l1 -152v52q0 -55 1 -154t1.5 -180t0.5 -153q0 -16 -2.5 -71.5t0 -91.5t12.5 -69q40 -21 124 -42.5t120 -37.5q5 -40 5 -50q0 -14 -3 -29l-34 -1q-76 -2 -218 8t-207 10q-50 0 -151 -9t-152 -9q-3 51 -3 52v9q17 27 61.5 43t98.5 29t78 27
+q7 16 11.5 74t6 145.5t1.5 155t-0.5 153.5t-0.5 89q0 7 -2.5 21.5t-2.5 22.5q0 7 0.5 44t1 73t0 76.5t-3 67.5t-6.5 32q-11 12 -162 12q-41 0 -163 -13.5t-138 -24.5q-19 -12 -34 -71.5t-31.5 -111.5t-42.5 -54q-42 26 -56 44v383zM1310 125q12 0 42 -19.5t57.5 -41.5
+t59.5 -49t36 -30q26 -21 26 -49t-26 -49q-4 -3 -36 -30t-59.5 -49t-57.5 -41.5t-42 -19.5q-13 0 -20.5 10.5t-10 28.5t-2.5 33.5t1.5 33t1.5 19.5h-1024q0 -2 1.5 -19.5t1.5 -33t-2.5 -33.5t-10 -28.5t-20.5 -10.5q-12 0 -42 19.5t-57.5 41.5t-59.5 49t-36 30q-26 21 -26 49
+t26 49q4 3 36 30t59.5 49t57.5 41.5t42 19.5q13 0 20.5 -10.5t10 -28.5t2.5 -33.5t-1.5 -33t-1.5 -19.5h1024q0 2 -1.5 19.5t-1.5 33t2.5 33.5t10 28.5t20.5 10.5z" />
+    <glyph glyph-name="align_left" unicode="&#xf036;" horiz-adv-x="1792" 
+d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45
+t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="align_center" unicode="&#xf037;" horiz-adv-x="1792" 
+d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h896q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45t-45 -19
+h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h640q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="align_right" unicode="&#xf038;" horiz-adv-x="1792" 
+d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45
+t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="align_justify" unicode="&#xf039;" horiz-adv-x="1792" 
+d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45
+t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="list" unicode="&#xf03a;" horiz-adv-x="1792" 
+d="M256 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM256 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5
+t9.5 -22.5zM256 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1344
+q13 0 22.5 -9.5t9.5 -22.5zM256 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5
+t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192
+q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5z" />
+    <glyph glyph-name="indent_left" unicode="&#xf03b;" horiz-adv-x="1792" 
+d="M384 992v-576q0 -13 -9.5 -22.5t-22.5 -9.5q-14 0 -23 9l-288 288q-9 9 -9 23t9 23l288 288q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5
+t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088
+q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5t9.5 -22.5z" />
+    <glyph glyph-name="indent_right" unicode="&#xf03c;" horiz-adv-x="1792" 
+d="M352 704q0 -14 -9 -23l-288 -288q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v576q0 13 9.5 22.5t22.5 9.5q14 0 23 -9l288 -288q9 -9 9 -23zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5
+t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088
+q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5t9.5 -22.5z" />
+    <glyph glyph-name="facetime_video" unicode="&#xf03d;" horiz-adv-x="1792" 
+d="M1792 1184v-1088q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-403 403v-166q0 -119 -84.5 -203.5t-203.5 -84.5h-704q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h704q119 0 203.5 -84.5t84.5 -203.5v-165l403 402q18 19 45 19q12 0 25 -5
+q39 -17 39 -59z" />
+    <glyph glyph-name="picture" unicode="&#xf03e;" horiz-adv-x="1920" 
+d="M640 960q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1664 576v-448h-1408v192l320 320l160 -160l512 512zM1760 1280h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-1216q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5v1216
+q0 13 -9.5 22.5t-22.5 9.5zM1920 1248v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="pencil" unicode="&#xf040;" 
+d="M363 0l91 91l-235 235l-91 -91v-107h128v-128h107zM886 928q0 22 -22 22q-10 0 -17 -7l-542 -542q-7 -7 -7 -17q0 -22 22 -22q10 0 17 7l542 542q7 7 7 17zM832 1120l416 -416l-832 -832h-416v416zM1515 1024q0 -53 -37 -90l-166 -166l-416 416l166 165q36 38 90 38
+q53 0 91 -38l235 -234q37 -39 37 -91z" />
+    <glyph glyph-name="map_marker" unicode="&#xf041;" horiz-adv-x="1024" 
+d="M768 896q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1024 896q0 -109 -33 -179l-364 -774q-16 -33 -47.5 -52t-67.5 -19t-67.5 19t-46.5 52l-365 774q-33 70 -33 179q0 212 150 362t362 150t362 -150t150 -362z" />
+    <glyph glyph-name="adjust" unicode="&#xf042;" 
+d="M768 96v1088q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="tint" unicode="&#xf043;" horiz-adv-x="1024" 
+d="M512 384q0 36 -20 69q-1 1 -15.5 22.5t-25.5 38t-25 44t-21 50.5q-4 16 -21 16t-21 -16q-7 -23 -21 -50.5t-25 -44t-25.5 -38t-15.5 -22.5q-20 -33 -20 -69q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 512q0 -212 -150 -362t-362 -150t-362 150t-150 362
+q0 145 81 275q6 9 62.5 90.5t101 151t99.5 178t83 201.5q9 30 34 47t51 17t51.5 -17t33.5 -47q28 -93 83 -201.5t99.5 -178t101 -151t62.5 -90.5q81 -127 81 -275z" />
+    <glyph glyph-name="edit" unicode="&#xf044;" horiz-adv-x="1792" 
+d="M888 352l116 116l-152 152l-116 -116v-56h96v-96h56zM1328 1072q-16 16 -33 -1l-350 -350q-17 -17 -1 -33t33 1l350 350q17 17 1 33zM1408 478v-190q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832
+q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-14 -14 -32 -8q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v126q0 13 9 22l64 64q15 15 35 7t20 -29zM1312 1216l288 -288l-672 -672h-288v288zM1756 1084l-92 -92
+l-288 288l92 92q28 28 68 28t68 -28l152 -152q28 -28 28 -68t-28 -68z" />
+    <glyph glyph-name="share" unicode="&#xf045;" horiz-adv-x="1664" 
+d="M1408 547v-259q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h255v0q13 0 22.5 -9.5t9.5 -22.5q0 -27 -26 -32q-77 -26 -133 -60q-10 -4 -16 -4h-112q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832
+q66 0 113 47t47 113v214q0 19 18 29q28 13 54 37q16 16 35 8q21 -9 21 -29zM1645 1043l-384 -384q-18 -19 -45 -19q-12 0 -25 5q-39 17 -39 59v192h-160q-323 0 -438 -131q-119 -137 -74 -473q3 -23 -20 -34q-8 -2 -12 -2q-16 0 -26 13q-10 14 -21 31t-39.5 68.5t-49.5 99.5
+t-38.5 114t-17.5 122q0 49 3.5 91t14 90t28 88t47 81.5t68.5 74t94.5 61.5t124.5 48.5t159.5 30.5t196.5 11h160v192q0 42 39 59q13 5 25 5q26 0 45 -19l384 -384q19 -19 19 -45t-19 -45z" />
+    <glyph glyph-name="check" unicode="&#xf046;" horiz-adv-x="1664" 
+d="M1408 606v-318q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-10 -10 -23 -10q-3 0 -9 2q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832
+q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v254q0 13 9 22l64 64q10 10 23 10q6 0 12 -3q20 -8 20 -29zM1639 1095l-814 -814q-24 -24 -57 -24t-57 24l-430 430q-24 24 -24 57t24 57l110 110q24 24 57 24t57 -24l263 -263l647 647q24 24 57 24t57 -24l110 -110
+q24 -24 24 -57t-24 -57z" />
+    <glyph glyph-name="move" unicode="&#xf047;" horiz-adv-x="1792" 
+d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-384v-384h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v384h-384v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45
+t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h384v384h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45t-19 -45t-45 -19h-128v-384h384v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z" />
+    <glyph glyph-name="step_backward" unicode="&#xf048;" horiz-adv-x="1024" 
+d="M979 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 10 13 19z" />
+    <glyph glyph-name="fast_backward" unicode="&#xf049;" horiz-adv-x="1792" 
+d="M1747 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 10 13 19l710 710
+q19 19 32 13t13 -32v-710q4 10 13 19z" />
+    <glyph glyph-name="backward" unicode="&#xf04a;" horiz-adv-x="1664" 
+d="M1619 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-19 19 -19 45t19 45l710 710q19 19 32 13t13 -32v-710q4 10 13 19z" />
+    <glyph glyph-name="play" unicode="&#xf04b;" horiz-adv-x="1408" 
+d="M1384 609l-1328 -738q-23 -13 -39.5 -3t-16.5 36v1472q0 26 16.5 36t39.5 -3l1328 -738q23 -13 23 -31t-23 -31z" />
+    <glyph glyph-name="pause" unicode="&#xf04c;" 
+d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45zM640 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="stop" unicode="&#xf04d;" 
+d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="forward" unicode="&#xf04e;" horiz-adv-x="1664" 
+d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q9 -9 13 -19v710q0 26 13 32t32 -13l710 -710q19 -19 19 -45t-19 -45l-710 -710q-19 -19 -32 -13t-13 32v710q-4 -10 -13 -19z" />
+    <glyph glyph-name="fast_forward" unicode="&#xf050;" horiz-adv-x="1792" 
+d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q9 -9 13 -19v710q0 26 13 32t32 -13l710 -710q9 -9 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-4 -10 -13 -19l-710 -710
+q-19 -19 -32 -13t-13 32v710q-4 -10 -13 -19z" />
+    <glyph glyph-name="step_forward" unicode="&#xf051;" horiz-adv-x="1024" 
+d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q9 -9 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-4 -10 -13 -19z" />
+    <glyph glyph-name="eject" unicode="&#xf052;" horiz-adv-x="1538" 
+d="M14 557l710 710q19 19 45 19t45 -19l710 -710q19 -19 13 -32t-32 -13h-1472q-26 0 -32 13t13 32zM1473 0h-1408q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1408q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19z" />
+    <glyph glyph-name="chevron_left" unicode="&#xf053;" horiz-adv-x="1280" 
+d="M1171 1235l-531 -531l531 -531q19 -19 19 -45t-19 -45l-166 -166q-19 -19 -45 -19t-45 19l-742 742q-19 19 -19 45t19 45l742 742q19 19 45 19t45 -19l166 -166q19 -19 19 -45t-19 -45z" />
+    <glyph glyph-name="chevron_right" unicode="&#xf054;" horiz-adv-x="1280" 
+d="M1107 659l-742 -742q-19 -19 -45 -19t-45 19l-166 166q-19 19 -19 45t19 45l531 531l-531 531q-19 19 -19 45t19 45l166 166q19 19 45 19t45 -19l742 -742q19 -19 19 -45t-19 -45z" />
+    <glyph glyph-name="plus_sign" unicode="&#xf055;" 
+d="M1216 576v128q0 26 -19 45t-45 19h-256v256q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-256h-256q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h256v-256q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v256h256q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5
+t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="minus_sign" unicode="&#xf056;" 
+d="M1216 576v128q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5
+t103 -385.5z" />
+    <glyph glyph-name="remove_sign" unicode="&#xf057;" 
+d="M1149 414q0 26 -19 45l-181 181l181 181q19 19 19 45q0 27 -19 46l-90 90q-19 19 -46 19q-26 0 -45 -19l-181 -181l-181 181q-19 19 -45 19q-27 0 -46 -19l-90 -90q-19 -19 -19 -46q0 -26 19 -45l181 -181l-181 -181q-19 -19 -19 -45q0 -27 19 -46l90 -90q19 -19 46 -19
+q26 0 45 19l181 181l181 -181q19 -19 45 -19q27 0 46 19l90 90q19 19 19 46zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="ok_sign" unicode="&#xf058;" 
+d="M1284 802q0 28 -18 46l-91 90q-19 19 -45 19t-45 -19l-408 -407l-226 226q-19 19 -45 19t-45 -19l-91 -90q-18 -18 -18 -46q0 -27 18 -45l362 -362q19 -19 45 -19q27 0 46 19l543 543q18 18 18 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103
+t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="question_sign" unicode="&#xf059;" 
+d="M896 160v192q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h192q14 0 23 9t9 23zM1152 832q0 88 -55.5 163t-138.5 116t-170 41q-243 0 -371 -213q-15 -24 8 -42l132 -100q7 -6 19 -6q16 0 25 12q53 68 86 92q34 24 86 24q48 0 85.5 -26t37.5 -59
+q0 -38 -20 -61t-68 -45q-63 -28 -115.5 -86.5t-52.5 -125.5v-36q0 -14 9 -23t23 -9h192q14 0 23 9t9 23q0 19 21.5 49.5t54.5 49.5q32 18 49 28.5t46 35t44.5 48t28 60.5t12.5 81zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5
+t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="info_sign" unicode="&#xf05a;" 
+d="M1024 160v160q0 14 -9 23t-23 9h-96v512q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h96v-320h-96q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h448q14 0 23 9t9 23zM896 1056v160q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23
+t23 -9h192q14 0 23 9t9 23zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="screenshot" unicode="&#xf05b;" 
+d="M1197 512h-109q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h109q-32 108 -112.5 188.5t-188.5 112.5v-109q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v109q-108 -32 -188.5 -112.5t-112.5 -188.5h109q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-109
+q32 -108 112.5 -188.5t188.5 -112.5v109q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-109q108 32 188.5 112.5t112.5 188.5zM1536 704v-128q0 -26 -19 -45t-45 -19h-143q-37 -161 -154.5 -278.5t-278.5 -154.5v-143q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v143
+q-161 37 -278.5 154.5t-154.5 278.5h-143q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h143q37 161 154.5 278.5t278.5 154.5v143q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-143q161 -37 278.5 -154.5t154.5 -278.5h143q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="remove_circle" unicode="&#xf05c;" 
+d="M1097 457l-146 -146q-10 -10 -23 -10t-23 10l-137 137l-137 -137q-10 -10 -23 -10t-23 10l-146 146q-10 10 -10 23t10 23l137 137l-137 137q-10 10 -10 23t10 23l146 146q10 10 23 10t23 -10l137 -137l137 137q10 10 23 10t23 -10l146 -146q10 -10 10 -23t-10 -23
+l-137 -137l137 -137q10 -10 10 -23t-10 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5
+t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="ok_circle" unicode="&#xf05d;" 
+d="M1171 723l-422 -422q-19 -19 -45 -19t-45 19l-294 294q-19 19 -19 45t19 45l102 102q19 19 45 19t45 -19l147 -147l275 275q19 19 45 19t45 -19l102 -102q19 -19 19 -45t-19 -45zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198
+t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="ban_circle" unicode="&#xf05e;" 
+d="M1312 643q0 161 -87 295l-754 -753q137 -89 297 -89q111 0 211.5 43.5t173.5 116.5t116 174.5t43 212.5zM313 344l755 754q-135 91 -300 91q-148 0 -273 -73t-198 -199t-73 -274q0 -162 89 -299zM1536 643q0 -157 -61 -300t-163.5 -246t-245 -164t-298.5 -61t-298.5 61
+t-245 164t-163.5 246t-61 300t61 299.5t163.5 245.5t245 164t298.5 61t298.5 -61t245 -164t163.5 -245.5t61 -299.5z" />
+    <glyph glyph-name="arrow_left" unicode="&#xf060;" 
+d="M1536 640v-128q0 -53 -32.5 -90.5t-84.5 -37.5h-704l293 -294q38 -36 38 -90t-38 -90l-75 -76q-37 -37 -90 -37q-52 0 -91 37l-651 652q-37 37 -37 90q0 52 37 91l651 650q38 38 91 38q52 0 90 -38l75 -74q38 -38 38 -91t-38 -91l-293 -293h704q52 0 84.5 -37.5
+t32.5 -90.5z" />
+    <glyph glyph-name="arrow_right" unicode="&#xf061;" 
+d="M1472 576q0 -54 -37 -91l-651 -651q-39 -37 -91 -37q-51 0 -90 37l-75 75q-38 38 -38 91t38 91l293 293h-704q-52 0 -84.5 37.5t-32.5 90.5v128q0 53 32.5 90.5t84.5 37.5h704l-293 294q-38 36 -38 90t38 90l75 75q38 38 90 38q53 0 91 -38l651 -651q37 -35 37 -90z" />
+    <glyph glyph-name="arrow_up" unicode="&#xf062;" horiz-adv-x="1664" 
+d="M1611 565q0 -51 -37 -90l-75 -75q-38 -38 -91 -38q-54 0 -90 38l-294 293v-704q0 -52 -37.5 -84.5t-90.5 -32.5h-128q-53 0 -90.5 32.5t-37.5 84.5v704l-294 -293q-36 -38 -90 -38t-90 38l-75 75q-38 38 -38 90q0 53 38 91l651 651q35 37 90 37q54 0 91 -37l651 -651
+q37 -39 37 -91z" />
+    <glyph glyph-name="arrow_down" unicode="&#xf063;" horiz-adv-x="1664" 
+d="M1611 704q0 -53 -37 -90l-651 -652q-39 -37 -91 -37q-53 0 -90 37l-651 652q-38 36 -38 90q0 53 38 91l74 75q39 37 91 37q53 0 90 -37l294 -294v704q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-704l294 294q37 37 90 37q52 0 91 -37l75 -75q37 -39 37 -91z" />
+    <glyph glyph-name="share_alt" unicode="&#xf064;" horiz-adv-x="1792" 
+d="M1792 896q0 -26 -19 -45l-512 -512q-19 -19 -45 -19t-45 19t-19 45v256h-224q-98 0 -175.5 -6t-154 -21.5t-133 -42.5t-105.5 -69.5t-80 -101t-48.5 -138.5t-17.5 -181q0 -55 5 -123q0 -6 2.5 -23.5t2.5 -26.5q0 -15 -8.5 -25t-23.5 -10q-16 0 -28 17q-7 9 -13 22
+t-13.5 30t-10.5 24q-127 285 -127 451q0 199 53 333q162 403 875 403h224v256q0 26 19 45t45 19t45 -19l512 -512q19 -19 19 -45z" />
+    <glyph glyph-name="resize_full" unicode="&#xf065;" 
+d="M755 480q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23zM1536 1344v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332
+q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="resize_small" unicode="&#xf066;" 
+d="M768 576v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45zM1523 1248q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45
+t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23z" />
+    <glyph glyph-name="plus" unicode="&#xf067;" horiz-adv-x="1408" 
+d="M1408 800v-192q0 -40 -28 -68t-68 -28h-416v-416q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v416h-416q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h416v416q0 40 28 68t68 28h192q40 0 68 -28t28 -68v-416h416q40 0 68 -28t28 -68z" />
+    <glyph glyph-name="minus" unicode="&#xf068;" horiz-adv-x="1408" 
+d="M1408 800v-192q0 -40 -28 -68t-68 -28h-1216q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h1216q40 0 68 -28t28 -68z" />
+    <glyph glyph-name="asterisk" unicode="&#xf069;" horiz-adv-x="1664" 
+d="M1482 486q46 -26 59.5 -77.5t-12.5 -97.5l-64 -110q-26 -46 -77.5 -59.5t-97.5 12.5l-266 153v-307q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v307l-266 -153q-46 -26 -97.5 -12.5t-77.5 59.5l-64 110q-26 46 -12.5 97.5t59.5 77.5l266 154l-266 154
+q-46 26 -59.5 77.5t12.5 97.5l64 110q26 46 77.5 59.5t97.5 -12.5l266 -153v307q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-307l266 153q46 26 97.5 12.5t77.5 -59.5l64 -110q26 -46 12.5 -97.5t-59.5 -77.5l-266 -154z" />
+    <glyph glyph-name="exclamation_sign" unicode="&#xf06a;" 
+d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM896 161v190q0 14 -9 23.5t-22 9.5h-192q-13 0 -23 -10t-10 -23v-190q0 -13 10 -23t23 -10h192
+q13 0 22 9.5t9 23.5zM894 505l18 621q0 12 -10 18q-10 8 -24 8h-220q-14 0 -24 -8q-10 -6 -10 -18l17 -621q0 -10 10 -17.5t24 -7.5h185q14 0 23.5 7.5t10.5 17.5z" />
+    <glyph glyph-name="gift" unicode="&#xf06b;" 
+d="M928 180v56v468v192h-320v-192v-468v-56q0 -25 18 -38.5t46 -13.5h192q28 0 46 13.5t18 38.5zM472 1024h195l-126 161q-26 31 -69 31q-40 0 -68 -28t-28 -68t28 -68t68 -28zM1160 1120q0 40 -28 68t-68 28q-43 0 -69 -31l-125 -161h194q40 0 68 28t28 68zM1536 864v-320
+q0 -14 -9 -23t-23 -9h-96v-416q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v416h-96q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h440q-93 0 -158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5q107 0 168 -77l128 -165l128 165q61 77 168 77q93 0 158.5 -65.5t65.5 -158.5
+t-65.5 -158.5t-158.5 -65.5h440q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="leaf" unicode="&#xf06c;" horiz-adv-x="1792" 
+d="M1280 832q0 26 -19 45t-45 19q-172 0 -318 -49.5t-259.5 -134t-235.5 -219.5q-19 -21 -19 -45q0 -26 19 -45t45 -19q24 0 45 19q27 24 74 71t67 66q137 124 268.5 176t313.5 52q26 0 45 19t19 45zM1792 1030q0 -95 -20 -193q-46 -224 -184.5 -383t-357.5 -268
+q-214 -108 -438 -108q-148 0 -286 47q-15 5 -88 42t-96 37q-16 0 -39.5 -32t-45 -70t-52.5 -70t-60 -32q-43 0 -63.5 17.5t-45.5 59.5q-2 4 -6 11t-5.5 10t-3 9.5t-1.5 13.5q0 35 31 73.5t68 65.5t68 56t31 48q0 4 -14 38t-16 44q-9 51 -9 104q0 115 43.5 220t119 184.5
+t170.5 139t204 95.5q55 18 145 25.5t179.5 9t178.5 6t163.5 24t113.5 56.5l29.5 29.5t29.5 28t27 20t36.5 16t43.5 4.5q39 0 70.5 -46t47.5 -112t24 -124t8 -96z" />
+    <glyph glyph-name="fire" unicode="&#xf06d;" horiz-adv-x="1408" 
+d="M1408 -160v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1152 896q0 -78 -24.5 -144t-64 -112.5t-87.5 -88t-96 -77.5t-87.5 -72t-64 -81.5t-24.5 -96.5q0 -96 67 -224l-4 1l1 -1
+q-90 41 -160 83t-138.5 100t-113.5 122.5t-72.5 150.5t-27.5 184q0 78 24.5 144t64 112.5t87.5 88t96 77.5t87.5 72t64 81.5t24.5 96.5q0 94 -66 224l3 -1l-1 1q90 -41 160 -83t138.5 -100t113.5 -122.5t72.5 -150.5t27.5 -184z" />
+    <glyph glyph-name="eye_open" unicode="&#xf06e;" horiz-adv-x="1792" 
+d="M1664 576q-152 236 -381 353q61 -104 61 -225q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 121 61 225q-229 -117 -381 -353q133 -205 333.5 -326.5t434.5 -121.5t434.5 121.5t333.5 326.5zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5
+t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1792 576q0 -34 -20 -69q-140 -230 -376.5 -368.5t-499.5 -138.5t-499.5 139t-376.5 368q-20 35 -20 69t20 69q140 229 376.5 368t499.5 139t499.5 -139t376.5 -368q20 -35 20 -69z" />
+    <glyph glyph-name="eye_close" unicode="&#xf070;" horiz-adv-x="1792" 
+d="M555 201l78 141q-87 63 -136 159t-49 203q0 121 61 225q-229 -117 -381 -353q167 -258 427 -375zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1307 1151q0 -7 -1 -9
+q-106 -189 -316 -567t-315 -566l-49 -89q-10 -16 -28 -16q-12 0 -134 70q-16 10 -16 28q0 12 44 87q-143 65 -263.5 173t-208.5 245q-20 31 -20 69t20 69q153 235 380 371t496 136q89 0 180 -17l54 97q10 16 28 16q5 0 18 -6t31 -15.5t33 -18.5t31.5 -18.5t19.5 -11.5
+q16 -10 16 -27zM1344 704q0 -139 -79 -253.5t-209 -164.5l280 502q8 -45 8 -84zM1792 576q0 -35 -20 -69q-39 -64 -109 -145q-150 -172 -347.5 -267t-419.5 -95l74 132q212 18 392.5 137t301.5 307q-115 179 -282 294l63 112q95 -64 182.5 -153t144.5 -184q20 -34 20 -69z
+" />
+    <glyph glyph-name="warning_sign" unicode="&#xf071;" horiz-adv-x="1792" 
+d="M1024 161v190q0 14 -9.5 23.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -23.5v-190q0 -14 9.5 -23.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 23.5zM1022 535l18 459q0 12 -10 19q-13 11 -24 11h-220q-11 0 -24 -11q-10 -7 -10 -21l17 -457q0 -10 10 -16.5t24 -6.5h185
+q14 0 23.5 6.5t10.5 16.5zM1008 1469l768 -1408q35 -63 -2 -126q-17 -29 -46.5 -46t-63.5 -17h-1536q-34 0 -63.5 17t-46.5 46q-37 63 -2 126l768 1408q17 31 47 49t65 18t65 -18t47 -49z" />
+    <glyph glyph-name="plane" unicode="&#xf072;" horiz-adv-x="1408" 
+d="M1376 1376q44 -52 12 -148t-108 -172l-161 -161l160 -696q5 -19 -12 -33l-128 -96q-7 -6 -19 -6q-4 0 -7 1q-15 3 -21 16l-279 508l-259 -259l53 -194q5 -17 -8 -31l-96 -96q-9 -9 -23 -9h-2q-15 2 -24 13l-189 252l-252 189q-11 7 -13 23q-1 13 9 25l96 97q9 9 23 9
+q6 0 8 -1l194 -53l259 259l-508 279q-14 8 -17 24q-2 16 9 27l128 128q14 13 30 8l665 -159l160 160q76 76 172 108t148 -12z" />
+    <glyph glyph-name="calendar" unicode="&#xf073;" horiz-adv-x="1664" 
+d="M128 -128h288v288h-288v-288zM480 -128h320v288h-320v-288zM128 224h288v320h-288v-320zM480 224h320v320h-320v-320zM128 608h288v288h-288v-288zM864 -128h320v288h-320v-288zM480 608h320v288h-320v-288zM1248 -128h288v288h-288v-288zM864 224h320v320h-320v-320z
+M512 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1248 224h288v320h-288v-320zM864 608h320v288h-320v-288zM1248 608h288v288h-288v-288zM1280 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64
+q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1664 1152v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47
+h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="random" unicode="&#xf074;" horiz-adv-x="1792" 
+d="M666 1055q-60 -92 -137 -273q-22 45 -37 72.5t-40.5 63.5t-51 56.5t-63 35t-81.5 14.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q250 0 410 -225zM1792 256q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v192q-32 0 -85 -0.5t-81 -1t-73 1
+t-71 5t-64 10.5t-63 18.5t-58 28.5t-59 40t-55 53.5t-56 69.5q59 93 136 273q22 -45 37 -72.5t40.5 -63.5t51 -56.5t63 -35t81.5 -14.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23zM1792 1152q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5
+v192h-256q-48 0 -87 -15t-69 -45t-51 -61.5t-45 -77.5q-32 -62 -78 -171q-29 -66 -49.5 -111t-54 -105t-64 -100t-74 -83t-90 -68.5t-106.5 -42t-128 -16.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q48 0 87 15t69 45t51 61.5t45 77.5q32 62 78 171q29 66 49.5 111
+t54 105t64 100t74 83t90 68.5t106.5 42t128 16.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z" />
+    <glyph glyph-name="comment" unicode="&#xf075;" horiz-adv-x="1792" 
+d="M1792 640q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22q-17 -2 -30.5 9t-17.5 29v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281
+q0 130 71 248.5t191 204.5t286 136.5t348 50.5q244 0 450 -85.5t326 -233t120 -321.5z" />
+    <glyph glyph-name="magnet" unicode="&#xf076;" 
+d="M1536 704v-128q0 -201 -98.5 -362t-274 -251.5t-395.5 -90.5t-395.5 90.5t-274 251.5t-98.5 362v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-128q0 -52 23.5 -90t53.5 -57t71 -30t64 -13t44 -2t44 2t64 13t71 30t53.5 57t23.5 90v128q0 26 19 45t45 19h384
+q26 0 45 -19t19 -45zM512 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45zM1536 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="chevron_up" unicode="&#xf077;" horiz-adv-x="1792" 
+d="M1683 205l-166 -165q-19 -19 -45 -19t-45 19l-531 531l-531 -531q-19 -19 -45 -19t-45 19l-166 165q-19 19 -19 45.5t19 45.5l742 741q19 19 45 19t45 -19l742 -741q19 -19 19 -45.5t-19 -45.5z" />
+    <glyph glyph-name="chevron_down" unicode="&#xf078;" horiz-adv-x="1792" 
+d="M1683 728l-742 -741q-19 -19 -45 -19t-45 19l-742 741q-19 19 -19 45.5t19 45.5l166 165q19 19 45 19t45 -19l531 -531l531 531q19 19 45 19t45 -19l166 -165q19 -19 19 -45.5t-19 -45.5z" />
+    <glyph glyph-name="retweet" unicode="&#xf079;" horiz-adv-x="1920" 
+d="M1280 32q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-8 0 -13.5 2t-9 7t-5.5 8t-3 11.5t-1 11.5v13v11v160v416h-192q-26 0 -45 19t-19 45q0 24 15 41l320 384q19 22 49 22t49 -22l320 -384q15 -17 15 -41q0 -26 -19 -45t-45 -19h-192v-384h576q16 0 25 -11l160 -192q7 -10 7 -21
+zM1920 448q0 -24 -15 -41l-320 -384q-20 -23 -49 -23t-49 23l-320 384q-15 17 -15 41q0 26 19 45t45 19h192v384h-576q-16 0 -25 12l-160 192q-7 9 -7 20q0 13 9.5 22.5t22.5 9.5h960q8 0 13.5 -2t9 -7t5.5 -8t3 -11.5t1 -11.5v-13v-11v-160v-416h192q26 0 45 -19t19 -45z
+" />
+    <glyph glyph-name="shopping_cart" unicode="&#xf07a;" horiz-adv-x="1664" 
+d="M640 0q0 -52 -38 -90t-90 -38t-90 38t-38 90t38 90t90 38t90 -38t38 -90zM1536 0q0 -52 -38 -90t-90 -38t-90 38t-38 90t38 90t90 38t90 -38t38 -90zM1664 1088v-512q0 -24 -16.5 -42.5t-40.5 -21.5l-1044 -122q13 -60 13 -70q0 -16 -24 -64h920q26 0 45 -19t19 -45
+t-19 -45t-45 -19h-1024q-26 0 -45 19t-19 45q0 11 8 31.5t16 36t21.5 40t15.5 29.5l-177 823h-204q-26 0 -45 19t-19 45t19 45t45 19h256q16 0 28.5 -6.5t19.5 -15.5t13 -24.5t8 -26t5.5 -29.5t4.5 -26h1201q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="folder_close" unicode="&#xf07b;" horiz-adv-x="1664" 
+d="M1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />
+    <glyph glyph-name="folder_open" unicode="&#xf07c;" horiz-adv-x="1920" 
+d="M1879 584q0 -31 -31 -66l-336 -396q-43 -51 -120.5 -86.5t-143.5 -35.5h-1088q-34 0 -60.5 13t-26.5 43q0 31 31 66l336 396q43 51 120.5 86.5t143.5 35.5h1088q34 0 60.5 -13t26.5 -43zM1536 928v-160h-832q-94 0 -197 -47.5t-164 -119.5l-337 -396l-5 -6q0 4 -0.5 12.5
+t-0.5 12.5v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158z" />
+    <glyph glyph-name="resize_vertical" unicode="&#xf07d;" horiz-adv-x="768" 
+d="M704 1216q0 -26 -19 -45t-45 -19h-128v-1024h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v1024h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45z" />
+    <glyph glyph-name="resize_horizontal" unicode="&#xf07e;" horiz-adv-x="1792" 
+d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-1024v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h1024v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z" />
+    <glyph glyph-name="bar_chart" unicode="&#xf080;" horiz-adv-x="2048" 
+d="M640 640v-512h-256v512h256zM1024 1152v-1024h-256v1024h256zM2048 0v-128h-2048v1536h128v-1408h1920zM1408 896v-768h-256v768h256zM1792 1280v-1152h-256v1152h256z" />
+    <glyph glyph-name="twitter_sign" unicode="&#xf081;" 
+d="M1280 926q-56 -25 -121 -34q68 40 93 117q-65 -38 -134 -51q-61 66 -153 66q-87 0 -148.5 -61.5t-61.5 -148.5q0 -29 5 -48q-129 7 -242 65t-192 155q-29 -50 -29 -106q0 -114 91 -175q-47 1 -100 26v-2q0 -75 50 -133.5t123 -72.5q-29 -8 -51 -8q-13 0 -39 4
+q21 -63 74.5 -104t121.5 -42q-116 -90 -261 -90q-26 0 -50 3q148 -94 322 -94q112 0 210 35.5t168 95t120.5 137t75 162t24.5 168.5q0 18 -1 27q63 45 105 109zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5
+t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="facebook_sign" unicode="&#xf082;" 
+d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-188v595h199l30 232h-229v148q0 56 23.5 84t91.5 28l122 1v207q-63 9 -178 9q-136 0 -217.5 -80t-81.5 -226v-171h-200v-232h200v-595h-532q-119 0 -203.5 84.5t-84.5 203.5v960
+q0 119 84.5 203.5t203.5 84.5h960z" />
+    <glyph glyph-name="camera_retro" unicode="&#xf083;" horiz-adv-x="1792" 
+d="M928 704q0 14 -9 23t-23 9q-66 0 -113 -47t-47 -113q0 -14 9 -23t23 -9t23 9t9 23q0 40 28 68t68 28q14 0 23 9t9 23zM1152 574q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM128 0h1536v128h-1536v-128zM1280 574q0 159 -112.5 271.5
+t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM256 1216h384v128h-384v-128zM128 1024h1536v118v138h-828l-64 -128h-644v-128zM1792 1280v-1280q0 -53 -37.5 -90.5t-90.5 -37.5h-1536q-53 0 -90.5 37.5t-37.5 90.5v1280
+q0 53 37.5 90.5t90.5 37.5h1536q53 0 90.5 -37.5t37.5 -90.5z" />
+    <glyph glyph-name="key" unicode="&#xf084;" horiz-adv-x="1792" 
+d="M832 1024q0 80 -56 136t-136 56t-136 -56t-56 -136q0 -42 19 -83q-41 19 -83 19q-80 0 -136 -56t-56 -136t56 -136t136 -56t136 56t56 136q0 42 -19 83q41 -19 83 -19q80 0 136 56t56 136zM1683 320q0 -17 -49 -66t-66 -49q-9 0 -28.5 16t-36.5 33t-38.5 40t-24.5 26
+l-96 -96l220 -220q28 -28 28 -68q0 -42 -39 -81t-81 -39q-40 0 -68 28l-671 671q-176 -131 -365 -131q-163 0 -265.5 102.5t-102.5 265.5q0 160 95 313t248 248t313 95q163 0 265.5 -102.5t102.5 -265.5q0 -189 -131 -365l355 -355l96 96q-3 3 -26 24.5t-40 38.5t-33 36.5
+t-16 28.5q0 17 49 66t66 49q13 0 23 -10q6 -6 46 -44.5t82 -79.5t86.5 -86t73 -78t28.5 -41z" />
+    <glyph glyph-name="cogs" unicode="&#xf085;" horiz-adv-x="1920" 
+d="M896 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1664 128q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 1152q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5
+t90.5 37.5t37.5 90.5zM1280 731v-185q0 -10 -7 -19.5t-16 -10.5l-155 -24q-11 -35 -32 -76q34 -48 90 -115q7 -11 7 -20q0 -12 -7 -19q-23 -30 -82.5 -89.5t-78.5 -59.5q-11 0 -21 7l-115 90q-37 -19 -77 -31q-11 -108 -23 -155q-7 -24 -30 -24h-186q-11 0 -20 7.5t-10 17.5
+l-23 153q-34 10 -75 31l-118 -89q-7 -7 -20 -7q-11 0 -21 8q-144 133 -144 160q0 9 7 19q10 14 41 53t47 61q-23 44 -35 82l-152 24q-10 1 -17 9.5t-7 19.5v185q0 10 7 19.5t16 10.5l155 24q11 35 32 76q-34 48 -90 115q-7 11 -7 20q0 12 7 20q22 30 82 89t79 59q11 0 21 -7
+l115 -90q34 18 77 32q11 108 23 154q7 24 30 24h186q11 0 20 -7.5t10 -17.5l23 -153q34 -10 75 -31l118 89q8 7 20 7q11 0 21 -8q144 -133 144 -160q0 -8 -7 -19q-12 -16 -42 -54t-45 -60q23 -48 34 -82l152 -23q10 -2 17 -10.5t7 -19.5zM1920 198v-140q0 -16 -149 -31
+q-12 -27 -30 -52q51 -113 51 -138q0 -4 -4 -7q-122 -71 -124 -71q-8 0 -46 47t-52 68q-20 -2 -30 -2t-30 2q-14 -21 -52 -68t-46 -47q-2 0 -124 71q-4 3 -4 7q0 25 51 138q-18 25 -30 52q-149 15 -149 31v140q0 16 149 31q13 29 30 52q-51 113 -51 138q0 4 4 7q4 2 35 20
+t59 34t30 16q8 0 46 -46.5t52 -67.5q20 2 30 2t30 -2q51 71 92 112l6 2q4 0 124 -70q4 -3 4 -7q0 -25 -51 -138q17 -23 30 -52q149 -15 149 -31zM1920 1222v-140q0 -16 -149 -31q-12 -27 -30 -52q51 -113 51 -138q0 -4 -4 -7q-122 -71 -124 -71q-8 0 -46 47t-52 68
+q-20 -2 -30 -2t-30 2q-14 -21 -52 -68t-46 -47q-2 0 -124 71q-4 3 -4 7q0 25 51 138q-18 25 -30 52q-149 15 -149 31v140q0 16 149 31q13 29 30 52q-51 113 -51 138q0 4 4 7q4 2 35 20t59 34t30 16q8 0 46 -46.5t52 -67.5q20 2 30 2t30 -2q51 71 92 112l6 2q4 0 124 -70
+q4 -3 4 -7q0 -25 -51 -138q17 -23 30 -52q149 -15 149 -31z" />
+    <glyph glyph-name="comments" unicode="&#xf086;" horiz-adv-x="1792" 
+d="M1408 768q0 -139 -94 -257t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q-124 72 -195 177t-71 224
+q0 139 94 257t256.5 186.5t353.5 68.5t353.5 -68.5t256.5 -186.5t94 -257zM1792 512q0 -120 -71 -224.5t-195 -176.5q10 -24 20.5 -44t25 -38.5t22.5 -29t26 -29.5t23 -25q1 -1 4 -4.5t4.5 -5t4 -5t3.5 -5.5l2.5 -5t2 -6t0.5 -6.5t-1 -6.5q-3 -14 -13 -22t-22 -7
+q-50 7 -86 16q-154 40 -278 128q-90 -16 -176 -16q-271 0 -472 132q58 -4 88 -4q161 0 309 45t264 129q125 92 192 212t67 254q0 77 -23 152q129 -71 204 -178t75 -230z" />
+    <glyph glyph-name="thumbs_up_alt" unicode="&#xf087;" 
+d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 768q0 51 -39 89.5t-89 38.5h-352q0 58 48 159.5t48 160.5q0 98 -32 145t-128 47q-26 -26 -38 -85t-30.5 -125.5t-59.5 -109.5q-22 -23 -77 -91q-4 -5 -23 -30t-31.5 -41t-34.5 -42.5
+t-40 -44t-38.5 -35.5t-40 -27t-35.5 -9h-32v-640h32q13 0 31.5 -3t33 -6.5t38 -11t35 -11.5t35.5 -12.5t29 -10.5q211 -73 342 -73h121q192 0 192 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 47.5q32 1 53.5 47t21.5 81zM1536 769
+q0 -89 -49 -163q9 -33 9 -69q0 -77 -38 -144q3 -21 3 -43q0 -101 -60 -178q1 -139 -85 -219.5t-227 -80.5h-36h-93q-96 0 -189.5 22.5t-216.5 65.5q-116 40 -138 40h-288q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5h274q36 24 137 155q58 75 107 128
+q24 25 35.5 85.5t30.5 126.5t62 108q39 37 90 37q84 0 151 -32.5t102 -101.5t35 -186q0 -93 -48 -192h176q104 0 180 -76t76 -179z" />
+    <glyph glyph-name="thumbs_down_alt" unicode="&#xf088;" 
+d="M256 1088q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 512q0 35 -21.5 81t-53.5 47q15 17 25 47.5t10 55.5q0 69 -53 119q18 31 18 69q0 37 -17.5 73.5t-47.5 52.5q5 30 5 56q0 85 -49 126t-136 41h-128q-131 0 -342 -73q-5 -2 -29 -10.5
+t-35.5 -12.5t-35 -11.5t-38 -11t-33 -6.5t-31.5 -3h-32v-640h32q16 0 35.5 -9t40 -27t38.5 -35.5t40 -44t34.5 -42.5t31.5 -41t23 -30q55 -68 77 -91q41 -43 59.5 -109.5t30.5 -125.5t38 -85q96 0 128 47t32 145q0 59 -48 160.5t-48 159.5h352q50 0 89 38.5t39 89.5z
+M1536 511q0 -103 -76 -179t-180 -76h-176q48 -99 48 -192q0 -118 -35 -186q-35 -69 -102 -101.5t-151 -32.5q-51 0 -90 37q-34 33 -54 82t-25.5 90.5t-17.5 84.5t-31 64q-48 50 -107 127q-101 131 -137 155h-274q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5
+h288q22 0 138 40q128 44 223 66t200 22h112q140 0 226.5 -79t85.5 -216v-5q60 -77 60 -178q0 -22 -3 -43q38 -67 38 -144q0 -36 -9 -69q49 -73 49 -163z" />
+    <glyph glyph-name="star_half" unicode="&#xf089;" horiz-adv-x="896" 
+d="M832 1504v-1339l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41z" />
+    <glyph glyph-name="heart_empty" unicode="&#xf08a;" horiz-adv-x="1792" 
+d="M1664 940q0 81 -21.5 143t-55 98.5t-81.5 59.5t-94 31t-98 8t-112 -25.5t-110.5 -64t-86.5 -72t-60 -61.5q-18 -22 -49 -22t-49 22q-24 28 -60 61.5t-86.5 72t-110.5 64t-112 25.5t-98 -8t-94 -31t-81.5 -59.5t-55 -98.5t-21.5 -143q0 -168 187 -355l581 -560l580 559
+q188 188 188 356zM1792 940q0 -221 -229 -450l-623 -600q-18 -18 -44 -18t-44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5
+q224 0 351 -124t127 -344z" />
+    <glyph glyph-name="signout" unicode="&#xf08b;" horiz-adv-x="1664" 
+d="M640 96q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h320q13 0 22.5 -9.5t9.5 -22.5q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-66 0 -113 -47t-47 -113v-704
+q0 -66 47 -113t113 -47h288h11h13t11.5 -1t11.5 -3t8 -5.5t7 -9t2 -13.5zM1568 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45z" />
+    <glyph glyph-name="linkedin_sign" unicode="&#xf08c;" 
+d="M237 122h231v694h-231v-694zM483 1030q-1 52 -36 86t-93 34t-94.5 -34t-36.5 -86q0 -51 35.5 -85.5t92.5 -34.5h1q59 0 95 34.5t36 85.5zM1068 122h231v398q0 154 -73 233t-193 79q-136 0 -209 -117h2v101h-231q3 -66 0 -694h231v388q0 38 7 56q15 35 45 59.5t74 24.5
+q116 0 116 -157v-371zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="pushpin" unicode="&#xf08d;" horiz-adv-x="1152" 
+d="M480 672v448q0 14 -9 23t-23 9t-23 -9t-9 -23v-448q0 -14 9 -23t23 -9t23 9t9 23zM1152 320q0 -26 -19 -45t-45 -19h-429l-51 -483q-2 -12 -10.5 -20.5t-20.5 -8.5h-1q-27 0 -32 27l-76 485h-404q-26 0 -45 19t-19 45q0 123 78.5 221.5t177.5 98.5v512q-52 0 -90 38
+t-38 90t38 90t90 38h640q52 0 90 -38t38 -90t-38 -90t-90 -38v-512q99 0 177.5 -98.5t78.5 -221.5z" />
+    <glyph glyph-name="external_link" unicode="&#xf08e;" horiz-adv-x="1792" 
+d="M1408 608v-320q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h704q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v320
+q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1792 1472v-512q0 -26 -19 -45t-45 -19t-45 19l-176 176l-652 -652q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l652 652l-176 176q-19 19 -19 45t19 45t45 19h512q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="signin" unicode="&#xf090;" 
+d="M1184 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45zM1536 992v-704q0 -119 -84.5 -203.5t-203.5 -84.5h-320q-13 0 -22.5 9.5t-9.5 22.5
+q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q66 0 113 47t47 113v704q0 66 -47 113t-113 47h-288h-11h-13t-11.5 1t-11.5 3t-8 5.5t-7 9t-2 13.5q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="trophy" unicode="&#xf091;" horiz-adv-x="1664" 
+d="M458 653q-74 162 -74 371h-256v-96q0 -78 94.5 -162t235.5 -113zM1536 928v96h-256q0 -209 -74 -371q141 29 235.5 113t94.5 162zM1664 1056v-128q0 -71 -41.5 -143t-112 -130t-173 -97.5t-215.5 -44.5q-42 -54 -95 -95q-38 -34 -52.5 -72.5t-14.5 -89.5q0 -54 30.5 -91
+t97.5 -37q75 0 133.5 -45.5t58.5 -114.5v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 69 58.5 114.5t133.5 45.5q67 0 97.5 37t30.5 91q0 51 -14.5 89.5t-52.5 72.5q-53 41 -95 95q-113 5 -215.5 44.5t-173 97.5t-112 130t-41.5 143v128q0 40 28 68t68 28h288v96
+q0 66 47 113t113 47h576q66 0 113 -47t47 -113v-96h288q40 0 68 -28t28 -68z" />
+    <glyph glyph-name="github_sign" unicode="&#xf092;" 
+d="M519 336q4 6 -3 13q-9 7 -14 2q-4 -6 3 -13q9 -7 14 -2zM491 377q-5 7 -12 4q-6 -4 0 -12q7 -8 12 -5q6 4 0 13zM450 417q2 4 -5 8q-7 2 -8 -2q-3 -5 4 -8q8 -2 9 2zM471 394q2 1 1.5 4.5t-3.5 5.5q-6 7 -10 3t1 -11q6 -6 11 -2zM557 319q2 7 -9 11q-9 3 -13 -4
+q-2 -7 9 -11q9 -3 13 4zM599 316q0 8 -12 8q-10 0 -10 -8t11 -8t11 8zM638 323q-2 7 -13 5t-9 -9q2 -8 12 -6t10 10zM1280 640q0 212 -150 362t-362 150t-362 -150t-150 -362q0 -167 98 -300.5t252 -185.5q18 -3 26.5 5t8.5 20q0 52 -1 95q-6 -1 -15.5 -2.5t-35.5 -2t-48 4
+t-43.5 20t-29.5 41.5q-23 59 -57 74q-2 1 -4.5 3.5l-8 8t-7 9.5t4 7.5t19.5 3.5q6 0 15 -2t30 -15.5t33 -35.5q16 -28 37.5 -42t43.5 -14t38 3.5t30 9.5q7 47 33 69q-49 6 -86 18.5t-73 39t-55.5 76t-19.5 119.5q0 79 53 137q-24 62 5 136q19 6 54.5 -7.5t60.5 -29.5l26 -16
+q58 17 128 17t128 -17q11 7 28.5 18t55.5 26t57 9q29 -74 5 -136q53 -58 53 -137q0 -57 -14 -100.5t-35.5 -70t-53.5 -44.5t-62.5 -26t-68.5 -12q35 -31 35 -95q0 -40 -0.5 -89t-0.5 -51q0 -12 8.5 -20t26.5 -5q154 52 252 185.5t98 300.5zM1536 1120v-960
+q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="upload_alt" unicode="&#xf093;" horiz-adv-x="1664" 
+d="M1280 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 288v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h427q21 -56 70.5 -92
+t110.5 -36h256q61 0 110.5 36t70.5 92h427q40 0 68 -28t28 -68zM1339 936q-17 -40 -59 -40h-256v-448q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v448h-256q-42 0 -59 40q-17 39 14 69l448 448q18 19 45 19t45 -19l448 -448q31 -30 14 -69z" />
+    <glyph glyph-name="lemon" unicode="&#xf094;" 
+d="M1407 710q0 44 -7 113.5t-18 96.5q-12 30 -17 44t-9 36.5t-4 48.5q0 23 5 68.5t5 67.5q0 37 -10 55q-4 1 -13 1q-19 0 -58 -4.5t-59 -4.5q-60 0 -176 24t-175 24q-43 0 -94.5 -11.5t-85 -23.5t-89.5 -34q-137 -54 -202 -103q-96 -73 -159.5 -189.5t-88 -236t-24.5 -248.5
+q0 -40 12.5 -120t12.5 -121q0 -23 -11 -66.5t-11 -65.5t12 -36.5t34 -14.5q24 0 72.5 11t73.5 11q57 0 169.5 -15.5t169.5 -15.5q181 0 284 36q129 45 235.5 152.5t166 245.5t59.5 275zM1535 712q0 -165 -70 -327.5t-196 -288t-281 -180.5q-124 -44 -326 -44
+q-57 0 -170 14.5t-169 14.5q-24 0 -72.5 -14.5t-73.5 -14.5q-73 0 -123.5 55.5t-50.5 128.5q0 24 11 68t11 67q0 40 -12.5 120.5t-12.5 121.5q0 111 18 217.5t54.5 209.5t100.5 194t150 156q78 59 232 120q194 78 316 78q60 0 175.5 -24t173.5 -24q19 0 57 5t58 5
+q81 0 118 -50.5t37 -134.5q0 -23 -5 -68t-5 -68q0 -13 2 -25t3.5 -16.5t7.5 -20.5t8 -20q16 -40 25 -118.5t9 -136.5z" />
+    <glyph glyph-name="phone" unicode="&#xf095;" horiz-adv-x="1408" 
+d="M1408 296q0 -27 -10 -70.5t-21 -68.5q-21 -50 -122 -106q-94 -51 -186 -51q-27 0 -53 3.5t-57.5 12.5t-47 14.5t-55.5 20.5t-49 18q-98 35 -175 83q-127 79 -264 216t-216 264q-48 77 -83 175q-3 9 -18 49t-20.5 55.5t-14.5 47t-12.5 57.5t-3.5 53q0 92 51 186
+q56 101 106 122q25 11 68.5 21t70.5 10q14 0 21 -3q18 -6 53 -76q11 -19 30 -54t35 -63.5t31 -53.5q3 -4 17.5 -25t21.5 -35.5t7 -28.5q0 -20 -28.5 -50t-62 -55t-62 -53t-28.5 -46q0 -9 5 -22.5t8.5 -20.5t14 -24t11.5 -19q76 -137 174 -235t235 -174q2 -1 19 -11.5t24 -14
+t20.5 -8.5t22.5 -5q18 0 46 28.5t53 62t55 62t50 28.5q14 0 28.5 -7t35.5 -21.5t25 -17.5q25 -15 53.5 -31t63.5 -35t54 -30q70 -35 76 -53q3 -7 3 -21z" />
+    <glyph glyph-name="check_empty" unicode="&#xf096;" horiz-adv-x="1408" 
+d="M1120 1280h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v832q0 66 -47 113t-113 47zM1408 1120v-832q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832
+q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="bookmark_empty" unicode="&#xf097;" horiz-adv-x="1280" 
+d="M1152 1280h-1024v-1242l423 406l89 85l89 -85l423 -406v1242zM1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289
+q0 34 19.5 62t52.5 41q21 9 44 9h1048z" />
+    <glyph glyph-name="phone_sign" unicode="&#xf098;" 
+d="M1280 343q0 11 -2 16t-18 16.5t-40.5 25t-47.5 26.5t-45.5 25t-28.5 15q-5 3 -19 13t-25 15t-21 5q-15 0 -36.5 -20.5t-39.5 -45t-38.5 -45t-33.5 -20.5q-7 0 -16.5 3.5t-15.5 6.5t-17 9.5t-14 8.5q-99 55 -170 126.5t-127 170.5q-2 3 -8.5 14t-9.5 17t-6.5 15.5
+t-3.5 16.5q0 13 20.5 33.5t45 38.5t45 39.5t20.5 36.5q0 10 -5 21t-15 25t-13 19q-3 6 -15 28.5t-25 45.5t-26.5 47.5t-25 40.5t-16.5 18t-16 2q-48 0 -101 -22q-46 -21 -80 -94.5t-34 -130.5q0 -16 2.5 -34t5 -30.5t9 -33t10 -29.5t12.5 -33t11 -30q60 -164 216.5 -320.5
+t320.5 -216.5q6 -2 30 -11t33 -12.5t29.5 -10t33 -9t30.5 -5t34 -2.5q57 0 130.5 34t94.5 80q22 53 22 101zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z
+" />
+    <glyph glyph-name="twitter" unicode="&#xf099;" horiz-adv-x="1664" 
+d="M1620 1128q-67 -98 -162 -167q1 -14 1 -42q0 -130 -38 -259.5t-115.5 -248.5t-184.5 -210.5t-258 -146t-323 -54.5q-271 0 -496 145q35 -4 78 -4q225 0 401 138q-105 2 -188 64.5t-114 159.5q33 -5 61 -5q43 0 85 11q-112 23 -185.5 111.5t-73.5 205.5v4q68 -38 146 -41
+q-66 44 -105 115t-39 154q0 88 44 163q121 -149 294.5 -238.5t371.5 -99.5q-8 38 -8 74q0 134 94.5 228.5t228.5 94.5q140 0 236 -102q109 21 205 78q-37 -115 -142 -178q93 10 186 50z" />
+    <glyph glyph-name="facebook" unicode="&#xf09a;" horiz-adv-x="1024" 
+d="M959 1524v-264h-157q-86 0 -116 -36t-30 -108v-189h293l-39 -296h-254v-759h-306v759h-255v296h255v218q0 186 104 288.5t277 102.5q147 0 228 -12z" />
+    <glyph glyph-name="github" unicode="&#xf09b;" 
+d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5q0 -251 -146.5 -451.5t-378.5 -277.5q-27 -5 -40 7t-13 30q0 3 0.5 76.5t0.5 134.5q0 97 -52 142q57 6 102.5 18t94 39t81 66.5t53 105t20.5 150.5q0 119 -79 206q37 91 -8 204q-28 9 -81 -11t-92 -44l-38 -24
+q-93 26 -192 26t-192 -26q-16 11 -42.5 27t-83.5 38.5t-85 13.5q-45 -113 -8 -204q-79 -87 -79 -206q0 -85 20.5 -150t52.5 -105t80.5 -67t94 -39t102.5 -18q-39 -36 -49 -103q-21 -10 -45 -15t-57 -5t-65.5 21.5t-55.5 62.5q-19 32 -48.5 52t-49.5 24l-20 3q-21 0 -29 -4.5
+t-5 -11.5t9 -14t13 -12l7 -5q22 -10 43.5 -38t31.5 -51l10 -23q13 -38 44 -61.5t67 -30t69.5 -7t55.5 3.5l23 4q0 -38 0.5 -88.5t0.5 -54.5q0 -18 -13 -30t-40 -7q-232 77 -378.5 277.5t-146.5 451.5q0 209 103 385.5t279.5 279.5t385.5 103zM291 305q3 7 -7 12
+q-10 3 -13 -2q-3 -7 7 -12q9 -6 13 2zM322 271q7 5 -2 16q-10 9 -16 3q-7 -5 2 -16q10 -10 16 -3zM352 226q9 7 0 19q-8 13 -17 6q-9 -5 0 -18t17 -7zM394 184q8 8 -4 19q-12 12 -20 3q-9 -8 4 -19q12 -12 20 -3zM451 159q3 11 -13 16q-15 4 -19 -7t13 -15q15 -6 19 6z
+M514 154q0 13 -17 11q-16 0 -16 -11q0 -13 17 -11q16 0 16 11zM572 164q-2 11 -18 9q-16 -3 -14 -15t18 -8t14 14z" />
+    <glyph glyph-name="unlock" unicode="&#xf09c;" horiz-adv-x="1664" 
+d="M1664 960v-256q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45v256q0 106 -75 181t-181 75t-181 -75t-75 -181v-192h96q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h672v192q0 185 131.5 316.5t316.5 131.5
+t316.5 -131.5t131.5 -316.5z" />
+    <glyph glyph-name="credit_card" unicode="&#xf09d;" horiz-adv-x="1920" 
+d="M1760 1408q66 0 113 -47t47 -113v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600zM160 1280q-13 0 -22.5 -9.5t-9.5 -22.5v-224h1664v224q0 13 -9.5 22.5t-22.5 9.5h-1600zM1760 0q13 0 22.5 9.5t9.5 22.5v608h-1664v-608
+q0 -13 9.5 -22.5t22.5 -9.5h1600zM256 128v128h256v-128h-256zM640 128v128h384v-128h-384z" />
+    <glyph glyph-name="rss" unicode="&#xf09e;" horiz-adv-x="1408" 
+d="M384 192q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 69q2 -28 -17 -48q-18 -21 -47 -21h-135q-25 0 -43 16.5t-20 41.5q-22 229 -184.5 391.5t-391.5 184.5q-25 2 -41.5 20t-16.5 43v135q0 29 21 47q17 17 43 17h5q160 -13 306 -80.5
+t259 -181.5q114 -113 181.5 -259t80.5 -306zM1408 67q2 -27 -18 -47q-18 -20 -46 -20h-143q-26 0 -44.5 17.5t-19.5 42.5q-12 215 -101 408.5t-231.5 336t-336 231.5t-408.5 102q-25 1 -42.5 19.5t-17.5 43.5v143q0 28 20 46q18 18 44 18h3q262 -13 501.5 -120t425.5 -294
+q187 -186 294 -425.5t120 -501.5z" />
+    <glyph glyph-name="hdd" unicode="&#xf0a0;" 
+d="M1040 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1296 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1408 160v320q0 13 -9.5 22.5t-22.5 9.5
+h-1216q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h1216q13 0 22.5 9.5t9.5 22.5zM178 640h1180l-157 482q-4 13 -16 21.5t-26 8.5h-782q-14 0 -26 -8.5t-16 -21.5zM1536 480v-320q0 -66 -47 -113t-113 -47h-1216q-66 0 -113 47t-47 113v320q0 25 16 75
+l197 606q17 53 63 86t101 33h782q55 0 101 -33t63 -86l197 -606q16 -50 16 -75z" />
+    <glyph glyph-name="bullhorn" unicode="&#xf0a1;" horiz-adv-x="1792" 
+d="M1664 896q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5v-384q0 -52 -38 -90t-90 -38q-417 347 -812 380q-58 -19 -91 -66t-31 -100.5t40 -92.5q-20 -33 -23 -65.5t6 -58t33.5 -55t48 -50t61.5 -50.5q-29 -58 -111.5 -83t-168.5 -11.5t-132 55.5q-7 23 -29.5 87.5
+t-32 94.5t-23 89t-15 101t3.5 98.5t22 110.5h-122q-66 0 -113 47t-47 113v192q0 66 47 113t113 47h480q435 0 896 384q52 0 90 -38t38 -90v-384zM1536 292v954q-394 -302 -768 -343v-270q377 -42 768 -341z" />
+    <glyph glyph-name="bell" unicode="&#xf0a2;" horiz-adv-x="1792" 
+d="M912 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM246 128h1300q-266 300 -266 832q0 51 -24 105t-69 103t-121.5 80.5t-169.5 31.5t-169.5 -31.5t-121.5 -80.5t-69 -103t-24 -105q0 -532 -266 -832z
+M1728 128q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q50 42 91 88t85 119.5t74.5 158.5t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q190 -28 307 -158.5
+t117 -282.5q0 -139 19.5 -260t50 -206t74.5 -158.5t85 -119.5t91 -88z" />
+    <glyph glyph-name="certificate" unicode="&#xf0a3;" 
+d="M1376 640l138 -135q30 -28 20 -70q-12 -41 -52 -51l-188 -48l53 -186q12 -41 -19 -70q-29 -31 -70 -19l-186 53l-48 -188q-10 -40 -51 -52q-12 -2 -19 -2q-31 0 -51 22l-135 138l-135 -138q-28 -30 -70 -20q-41 11 -51 52l-48 188l-186 -53q-41 -12 -70 19q-31 29 -19 70
+l53 186l-188 48q-40 10 -52 51q-10 42 20 70l138 135l-138 135q-30 28 -20 70q12 41 52 51l188 48l-53 186q-12 41 19 70q29 31 70 19l186 -53l48 188q10 41 51 51q41 12 70 -19l135 -139l135 139q29 30 70 19q41 -10 51 -51l48 -188l186 53q41 12 70 -19q31 -29 19 -70
+l-53 -186l188 -48q40 -10 52 -51q10 -42 -20 -70z" />
+    <glyph glyph-name="hand_right" unicode="&#xf0a4;" horiz-adv-x="1792" 
+d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 768q0 51 -39 89.5t-89 38.5h-576q0 20 15 48.5t33 55t33 68t15 84.5q0 67 -44.5 97.5t-115.5 30.5q-24 0 -90 -139q-24 -44 -37 -65q-40 -64 -112 -145q-71 -81 -101 -106
+q-69 -57 -140 -57h-32v-640h32q72 0 167 -32t193.5 -64t179.5 -32q189 0 189 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 47.5h331q52 0 90 38t38 90zM1792 769q0 -105 -75.5 -181t-180.5 -76h-169q-4 -62 -37 -119q3 -21 3 -43
+q0 -101 -60 -178q1 -139 -85 -219.5t-227 -80.5q-133 0 -322 69q-164 59 -223 59h-288q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5h288q10 0 21.5 4.5t23.5 14t22.5 18t24 22.5t20.5 21.5t19 21.5t14 17q65 74 100 129q13 21 33 62t37 72t40.5 63t55 49.5
+t69.5 17.5q125 0 206.5 -67t81.5 -189q0 -68 -22 -128h374q104 0 180 -76t76 -179z" />
+    <glyph glyph-name="hand_left" unicode="&#xf0a5;" horiz-adv-x="1792" 
+d="M1376 128h32v640h-32q-35 0 -67.5 12t-62.5 37t-50 46t-49 54q-8 9 -12 14q-72 81 -112 145q-14 22 -38 68q-1 3 -10.5 22.5t-18.5 36t-20 35.5t-21.5 30.5t-18.5 11.5q-71 0 -115.5 -30.5t-44.5 -97.5q0 -43 15 -84.5t33 -68t33 -55t15 -48.5h-576q-50 0 -89 -38.5
+t-39 -89.5q0 -52 38 -90t90 -38h331q-15 -17 -25 -47.5t-10 -55.5q0 -69 53 -119q-18 -32 -18 -69t17.5 -73.5t47.5 -52.5q-4 -24 -4 -56q0 -85 48.5 -126t135.5 -41q84 0 183 32t194 64t167 32zM1664 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45z
+M1792 768v-640q0 -53 -37.5 -90.5t-90.5 -37.5h-288q-59 0 -223 -59q-190 -69 -317 -69q-142 0 -230 77.5t-87 217.5l1 5q-61 76 -61 178q0 22 3 43q-33 57 -37 119h-169q-105 0 -180.5 76t-75.5 181q0 103 76 179t180 76h374q-22 60 -22 128q0 122 81.5 189t206.5 67
+q38 0 69.5 -17.5t55 -49.5t40.5 -63t37 -72t33 -62q35 -55 100 -129q2 -3 14 -17t19 -21.5t20.5 -21.5t24 -22.5t22.5 -18t23.5 -14t21.5 -4.5h288q53 0 90.5 -37.5t37.5 -90.5z" />
+    <glyph glyph-name="hand_up" unicode="&#xf0a6;" 
+d="M1280 -64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 700q0 189 -167 189q-26 0 -56 -5q-16 30 -52.5 47.5t-73.5 17.5t-69 -18q-50 53 -119 53q-25 0 -55.5 -10t-47.5 -25v331q0 52 -38 90t-90 38q-51 0 -89.5 -39t-38.5 -89v-576
+q-20 0 -48.5 15t-55 33t-68 33t-84.5 15q-67 0 -97.5 -44.5t-30.5 -115.5q0 -24 139 -90q44 -24 65 -37q64 -40 145 -112q81 -71 106 -101q57 -69 57 -140v-32h640v32q0 72 32 167t64 193.5t32 179.5zM1536 705q0 -133 -69 -322q-59 -164 -59 -223v-288q0 -53 -37.5 -90.5
+t-90.5 -37.5h-640q-53 0 -90.5 37.5t-37.5 90.5v288q0 10 -4.5 21.5t-14 23.5t-18 22.5t-22.5 24t-21.5 20.5t-21.5 19t-17 14q-74 65 -129 100q-21 13 -62 33t-72 37t-63 40.5t-49.5 55t-17.5 69.5q0 125 67 206.5t189 81.5q68 0 128 -22v374q0 104 76 180t179 76
+q105 0 181 -75.5t76 -180.5v-169q62 -4 119 -37q21 3 43 3q101 0 178 -60q139 1 219.5 -85t80.5 -227z" />
+    <glyph glyph-name="hand_down" unicode="&#xf0a7;" 
+d="M1408 576q0 84 -32 183t-64 194t-32 167v32h-640v-32q0 -35 -12 -67.5t-37 -62.5t-46 -50t-54 -49q-9 -8 -14 -12q-81 -72 -145 -112q-22 -14 -68 -38q-3 -1 -22.5 -10.5t-36 -18.5t-35.5 -20t-30.5 -21.5t-11.5 -18.5q0 -71 30.5 -115.5t97.5 -44.5q43 0 84.5 15t68 33
+t55 33t48.5 15v-576q0 -50 38.5 -89t89.5 -39q52 0 90 38t38 90v331q46 -35 103 -35q69 0 119 53q32 -18 69 -18t73.5 17.5t52.5 47.5q24 -4 56 -4q85 0 126 48.5t41 135.5zM1280 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 580
+q0 -142 -77.5 -230t-217.5 -87l-5 1q-76 -61 -178 -61q-22 0 -43 3q-54 -30 -119 -37v-169q0 -105 -76 -180.5t-181 -75.5q-103 0 -179 76t-76 180v374q-54 -22 -128 -22q-121 0 -188.5 81.5t-67.5 206.5q0 38 17.5 69.5t49.5 55t63 40.5t72 37t62 33q55 35 129 100
+q3 2 17 14t21.5 19t21.5 20.5t22.5 24t18 22.5t14 23.5t4.5 21.5v288q0 53 37.5 90.5t90.5 37.5h640q53 0 90.5 -37.5t37.5 -90.5v-288q0 -59 59 -223q69 -190 69 -317z" />
+    <glyph glyph-name="circle_arrow_left" unicode="&#xf0a8;" 
+d="M1280 576v128q0 26 -19 45t-45 19h-502l189 189q19 19 19 45t-19 45l-91 91q-18 18 -45 18t-45 -18l-362 -362l-91 -91q-18 -18 -18 -45t18 -45l91 -91l362 -362q18 -18 45 -18t45 18l91 91q18 18 18 45t-18 45l-189 189h502q26 0 45 19t19 45zM1536 640
+q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="circle_arrow_right" unicode="&#xf0a9;" 
+d="M1285 640q0 27 -18 45l-91 91l-362 362q-18 18 -45 18t-45 -18l-91 -91q-18 -18 -18 -45t18 -45l189 -189h-502q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h502l-189 -189q-19 -19 -19 -45t19 -45l91 -91q18 -18 45 -18t45 18l362 362l91 91q18 18 18 45zM1536 640
+q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="circle_arrow_up" unicode="&#xf0aa;" 
+d="M1284 641q0 27 -18 45l-362 362l-91 91q-18 18 -45 18t-45 -18l-91 -91l-362 -362q-18 -18 -18 -45t18 -45l91 -91q18 -18 45 -18t45 18l189 189v-502q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v502l189 -189q19 -19 45 -19t45 19l91 91q18 18 18 45zM1536 640
+q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="circle_arrow_down" unicode="&#xf0ab;" 
+d="M1284 639q0 27 -18 45l-91 91q-18 18 -45 18t-45 -18l-189 -189v502q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-502l-189 189q-19 19 -45 19t-45 -19l-91 -91q-18 -18 -18 -45t18 -45l362 -362l91 -91q18 -18 45 -18t45 18l91 91l362 362q18 18 18 45zM1536 640
+q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="globe" unicode="&#xf0ac;" 
+d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1042 887q-2 -1 -9.5 -9.5t-13.5 -9.5q2 0 4.5 5t5 11t3.5 7q6 7 22 15q14 6 52 12q34 8 51 -11
+q-2 2 9.5 13t14.5 12q3 2 15 4.5t15 7.5l2 22q-12 -1 -17.5 7t-6.5 21q0 -2 -6 -8q0 7 -4.5 8t-11.5 -1t-9 -1q-10 3 -15 7.5t-8 16.5t-4 15q-2 5 -9.5 11t-9.5 10q-1 2 -2.5 5.5t-3 6.5t-4 5.5t-5.5 2.5t-7 -5t-7.5 -10t-4.5 -5q-3 2 -6 1.5t-4.5 -1t-4.5 -3t-5 -3.5
+q-3 -2 -8.5 -3t-8.5 -2q15 5 -1 11q-10 4 -16 3q9 4 7.5 12t-8.5 14h5q-1 4 -8.5 8.5t-17.5 8.5t-13 6q-8 5 -34 9.5t-33 0.5q-5 -6 -4.5 -10.5t4 -14t3.5 -12.5q1 -6 -5.5 -13t-6.5 -12q0 -7 14 -15.5t10 -21.5q-3 -8 -16 -16t-16 -12q-5 -8 -1.5 -18.5t10.5 -16.5
+q2 -2 1.5 -4t-3.5 -4.5t-5.5 -4t-6.5 -3.5l-3 -2q-11 -5 -20.5 6t-13.5 26q-7 25 -16 30q-23 8 -29 -1q-5 13 -41 26q-25 9 -58 4q6 1 0 15q-7 15 -19 12q3 6 4 17.5t1 13.5q3 13 12 23q1 1 7 8.5t9.5 13.5t0.5 6q35 -4 50 11q5 5 11.5 17t10.5 17q9 6 14 5.5t14.5 -5.5
+t14.5 -5q14 -1 15.5 11t-7.5 20q12 -1 3 17q-4 7 -8 9q-12 4 -27 -5q-8 -4 2 -8q-1 1 -9.5 -10.5t-16.5 -17.5t-16 5q-1 1 -5.5 13.5t-9.5 13.5q-8 0 -16 -15q3 8 -11 15t-24 8q19 12 -8 27q-7 4 -20.5 5t-19.5 -4q-5 -7 -5.5 -11.5t5 -8t10.5 -5.5t11.5 -4t8.5 -3
+q14 -10 8 -14q-2 -1 -8.5 -3.5t-11.5 -4.5t-6 -4q-3 -4 0 -14t-2 -14q-5 5 -9 17.5t-7 16.5q7 -9 -25 -6l-10 1q-4 0 -16 -2t-20.5 -1t-13.5 8q-4 8 0 20q1 4 4 2q-4 3 -11 9.5t-10 8.5q-46 -15 -94 -41q6 -1 12 1q5 2 13 6.5t10 5.5q34 14 42 7l5 5q14 -16 20 -25
+q-7 4 -30 1q-20 -6 -22 -12q7 -12 5 -18q-4 3 -11.5 10t-14.5 11t-15 5q-16 0 -22 -1q-146 -80 -235 -222q7 -7 12 -8q4 -1 5 -9t2.5 -11t11.5 3q9 -8 3 -19q1 1 44 -27q19 -17 21 -21q3 -11 -10 -18q-1 2 -9 9t-9 4q-3 -5 0.5 -18.5t10.5 -12.5q-7 0 -9.5 -16t-2.5 -35.5
+t-1 -23.5l2 -1q-3 -12 5.5 -34.5t21.5 -19.5q-13 -3 20 -43q6 -8 8 -9q3 -2 12 -7.5t15 -10t10 -10.5q4 -5 10 -22.5t14 -23.5q-2 -6 9.5 -20t10.5 -23q-1 0 -2.5 -1t-2.5 -1q3 -7 15.5 -14t15.5 -13q1 -3 2 -10t3 -11t8 -2q2 20 -24 62q-15 25 -17 29q-3 5 -5.5 15.5
+t-4.5 14.5q2 0 6 -1.5t8.5 -3.5t7.5 -4t2 -3q-3 -7 2 -17.5t12 -18.5t17 -19t12 -13q6 -6 14 -19.5t0 -13.5q9 0 20 -10.5t17 -19.5q5 -8 8 -26t5 -24q2 -7 8.5 -13.5t12.5 -9.5l16 -8t13 -7q5 -2 18.5 -10.5t21.5 -11.5q10 -4 16 -4t14.5 2.5t13.5 3.5q15 2 29 -15t21 -21
+q36 -19 55 -11q-2 -1 0.5 -7.5t8 -15.5t9 -14.5t5.5 -8.5q5 -6 18 -15t18 -15q6 4 7 9q-3 -8 7 -20t18 -10q14 3 14 32q-31 -15 -49 18q0 1 -2.5 5.5t-4 8.5t-2.5 8.5t0 7.5t5 3q9 0 10 3.5t-2 12.5t-4 13q-1 8 -11 20t-12 15q-5 -9 -16 -8t-16 9q0 -1 -1.5 -5.5t-1.5 -6.5
+q-13 0 -15 1q1 3 2.5 17.5t3.5 22.5q1 4 5.5 12t7.5 14.5t4 12.5t-4.5 9.5t-17.5 2.5q-19 -1 -26 -20q-1 -3 -3 -10.5t-5 -11.5t-9 -7q-7 -3 -24 -2t-24 5q-13 8 -22.5 29t-9.5 37q0 10 2.5 26.5t3 25t-5.5 24.5q3 2 9 9.5t10 10.5q2 1 4.5 1.5t4.5 0t4 1.5t3 6q-1 1 -4 3
+q-3 3 -4 3q7 -3 28.5 1.5t27.5 -1.5q15 -11 22 2q0 1 -2.5 9.5t-0.5 13.5q5 -27 29 -9q3 -3 15.5 -5t17.5 -5q3 -2 7 -5.5t5.5 -4.5t5 0.5t8.5 6.5q10 -14 12 -24q11 -40 19 -44q7 -3 11 -2t4.5 9.5t0 14t-1.5 12.5l-1 8v18l-1 8q-15 3 -18.5 12t1.5 18.5t15 18.5q1 1 8 3.5
+t15.5 6.5t12.5 8q21 19 15 35q7 0 11 9q-1 0 -5 3t-7.5 5t-4.5 2q9 5 2 16q5 3 7.5 11t7.5 10q9 -12 21 -2q8 8 1 16q5 7 20.5 10.5t18.5 9.5q7 -2 8 2t1 12t3 12q4 5 15 9t13 5l17 11q3 4 0 4q18 -2 31 11q10 11 -6 20q3 6 -3 9.5t-15 5.5q3 1 11.5 0.5t10.5 1.5
+q15 10 -7 16q-17 5 -43 -12zM879 10q206 36 351 189q-3 3 -12.5 4.5t-12.5 3.5q-18 7 -24 8q1 7 -2.5 13t-8 9t-12.5 8t-11 7q-2 2 -7 6t-7 5.5t-7.5 4.5t-8.5 2t-10 -1l-3 -1q-3 -1 -5.5 -2.5t-5.5 -3t-4 -3t0 -2.5q-21 17 -36 22q-5 1 -11 5.5t-10.5 7t-10 1.5t-11.5 -7
+q-5 -5 -6 -15t-2 -13q-7 5 0 17.5t2 18.5q-3 6 -10.5 4.5t-12 -4.5t-11.5 -8.5t-9 -6.5t-8.5 -5.5t-8.5 -7.5q-3 -4 -6 -12t-5 -11q-2 4 -11.5 6.5t-9.5 5.5q2 -10 4 -35t5 -38q7 -31 -12 -48q-27 -25 -29 -40q-4 -22 12 -26q0 -7 -8 -20.5t-7 -21.5q0 -6 2 -16z" />
+    <glyph glyph-name="wrench" unicode="&#xf0ad;" horiz-adv-x="1664" 
+d="M384 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1028 484l-682 -682q-37 -37 -90 -37q-52 0 -91 37l-106 108q-38 36 -38 90q0 53 38 91l681 681q39 -98 114.5 -173.5t173.5 -114.5zM1662 919q0 -39 -23 -106q-47 -134 -164.5 -217.5
+t-258.5 -83.5q-185 0 -316.5 131.5t-131.5 316.5t131.5 316.5t316.5 131.5q58 0 121.5 -16.5t107.5 -46.5q16 -11 16 -28t-16 -28l-293 -169v-224l193 -107q5 3 79 48.5t135.5 81t70.5 35.5q15 0 23.5 -10t8.5 -25z" />
+    <glyph glyph-name="tasks" unicode="&#xf0ae;" horiz-adv-x="1792" 
+d="M1024 128h640v128h-640v-128zM640 640h1024v128h-1024v-128zM1280 1152h384v128h-384v-128zM1792 320v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 832v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19
+t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="filter" unicode="&#xf0b0;" horiz-adv-x="1408" 
+d="M1403 1241q17 -41 -14 -70l-493 -493v-742q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-256 256q-19 19 -19 45v486l-493 493q-31 29 -14 70q17 39 59 39h1280q42 0 59 -39z" />
+    <glyph glyph-name="briefcase" unicode="&#xf0b1;" horiz-adv-x="1792" 
+d="M640 1280h512v128h-512v-128zM1792 640v-480q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v480h672v-160q0 -26 19 -45t45 -19h320q26 0 45 19t19 45v160h672zM1024 640v-128h-256v128h256zM1792 1120v-384h-1792v384q0 66 47 113t113 47h352v160q0 40 28 68
+t68 28h576q40 0 68 -28t28 -68v-160h352q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="fullscreen" unicode="&#xf0b2;" 
+d="M1283 995l-355 -355l355 -355l144 144q29 31 70 14q39 -17 39 -59v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l144 144l-355 355l-355 -355l144 -144q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l144 -144
+l355 355l-355 355l-144 -144q-19 -19 -45 -19q-12 0 -24 5q-40 17 -40 59v448q0 26 19 45t45 19h448q42 0 59 -40q17 -39 -14 -69l-144 -144l355 -355l355 355l-144 144q-31 30 -14 69q17 40 59 40h448q26 0 45 -19t19 -45v-448q0 -42 -39 -59q-13 -5 -25 -5q-26 0 -45 19z
+" />
+    <glyph glyph-name="group" unicode="&#xf0c0;" horiz-adv-x="1920" 
+d="M593 640q-162 -5 -265 -128h-134q-82 0 -138 40.5t-56 118.5q0 353 124 353q6 0 43.5 -21t97.5 -42.5t119 -21.5q67 0 133 23q-5 -37 -5 -66q0 -139 81 -256zM1664 3q0 -120 -73 -189.5t-194 -69.5h-874q-121 0 -194 69.5t-73 189.5q0 53 3.5 103.5t14 109t26.5 108.5
+t43 97.5t62 81t85.5 53.5t111.5 20q10 0 43 -21.5t73 -48t107 -48t135 -21.5t135 21.5t107 48t73 48t43 21.5q61 0 111.5 -20t85.5 -53.5t62 -81t43 -97.5t26.5 -108.5t14 -109t3.5 -103.5zM640 1280q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75
+t75 -181zM1344 896q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5zM1920 671q0 -78 -56 -118.5t-138 -40.5h-134q-103 123 -265 128q81 117 81 256q0 29 -5 66q66 -23 133 -23q59 0 119 21.5t97.5 42.5
+t43.5 21q124 0 124 -353zM1792 1280q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181z" />
+    <glyph glyph-name="link" unicode="&#xf0c1;" horiz-adv-x="1664" 
+d="M1456 320q0 40 -28 68l-208 208q-28 28 -68 28q-42 0 -72 -32q3 -3 19 -18.5t21.5 -21.5t15 -19t13 -25.5t3.5 -27.5q0 -40 -28 -68t-68 -28q-15 0 -27.5 3.5t-25.5 13t-19 15t-21.5 21.5t-18.5 19q-33 -31 -33 -73q0 -40 28 -68l206 -207q27 -27 68 -27q40 0 68 26
+l147 146q28 28 28 67zM753 1025q0 40 -28 68l-206 207q-28 28 -68 28q-39 0 -68 -27l-147 -146q-28 -28 -28 -67q0 -40 28 -68l208 -208q27 -27 68 -27q42 0 72 31q-3 3 -19 18.5t-21.5 21.5t-15 19t-13 25.5t-3.5 27.5q0 40 28 68t68 28q15 0 27.5 -3.5t25.5 -13t19 -15
+t21.5 -21.5t18.5 -19q33 31 33 73zM1648 320q0 -120 -85 -203l-147 -146q-83 -83 -203 -83q-121 0 -204 85l-206 207q-83 83 -83 203q0 123 88 209l-88 88q-86 -88 -208 -88q-120 0 -204 84l-208 208q-84 84 -84 204t85 203l147 146q83 83 203 83q121 0 204 -85l206 -207
+q83 -83 83 -203q0 -123 -88 -209l88 -88q86 88 208 88q120 0 204 -84l208 -208q84 -84 84 -204z" />
+    <glyph glyph-name="cloud" unicode="&#xf0c2;" horiz-adv-x="1920" 
+d="M1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088q-185 0 -316.5 131.5t-131.5 316.5q0 132 71 241.5t187 163.5q-2 28 -2 43q0 212 150 362t362 150q158 0 286.5 -88t187.5 -230q70 62 166 62q106 0 181 -75t75 -181q0 -75 -41 -138q129 -30 213 -134.5t84 -239.5z
+" />
+    <glyph glyph-name="beaker" unicode="&#xf0c3;" horiz-adv-x="1664" 
+d="M1527 88q56 -89 21.5 -152.5t-140.5 -63.5h-1152q-106 0 -140.5 63.5t21.5 152.5l503 793v399h-64q-26 0 -45 19t-19 45t19 45t45 19h512q26 0 45 -19t19 -45t-19 -45t-45 -19h-64v-399zM748 813l-272 -429h712l-272 429l-20 31v37v399h-128v-399v-37z" />
+    <glyph glyph-name="cut" unicode="&#xf0c4;" horiz-adv-x="1792" 
+d="M960 640q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1260 576l507 -398q28 -20 25 -56q-5 -35 -35 -51l-128 -64q-13 -7 -29 -7q-17 0 -31 8l-690 387l-110 -66q-8 -4 -12 -5q14 -49 10 -97q-7 -77 -56 -147.5t-132 -123.5q-132 -84 -277 -84
+q-136 0 -222 78q-90 84 -79 207q7 76 56 147t131 124q132 84 278 84q83 0 151 -31q9 13 22 22l122 73l-122 73q-13 9 -22 22q-68 -31 -151 -31q-146 0 -278 84q-82 53 -131 124t-56 147q-5 59 15.5 113t63.5 93q85 79 222 79q145 0 277 -84q83 -52 132 -123t56 -148
+q4 -48 -10 -97q4 -1 12 -5l110 -66l690 387q14 8 31 8q16 0 29 -7l128 -64q30 -16 35 -51q3 -36 -25 -56zM579 836q46 42 21 108t-106 117q-92 59 -192 59q-74 0 -113 -36q-46 -42 -21 -108t106 -117q92 -59 192 -59q74 0 113 36zM494 91q81 51 106 117t-21 108
+q-39 36 -113 36q-100 0 -192 -59q-81 -51 -106 -117t21 -108q39 -36 113 -36q100 0 192 59zM672 704l96 -58v11q0 36 33 56l14 8l-79 47l-26 -26q-3 -3 -10 -11t-12 -12q-2 -2 -4 -3.5t-3 -2.5zM896 480l96 -32l736 576l-128 64l-768 -431v-113l-160 -96l9 -8q2 -2 7 -6
+q4 -4 11 -12t11 -12l26 -26zM1600 64l128 64l-520 408l-177 -138q-2 -3 -13 -7z" />
+    <glyph glyph-name="copy" unicode="&#xf0c5;" horiz-adv-x="1792" 
+d="M1696 1152q40 0 68 -28t28 -68v-1216q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v288h-544q-40 0 -68 28t-28 68v672q0 40 20 88t48 76l408 408q28 28 76 48t88 20h416q40 0 68 -28t28 -68v-328q68 40 128 40h416zM1152 939l-299 -299h299v299zM512 1323l-299 -299
+h299v299zM708 676l316 316v416h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h512v256q0 40 20 88t48 76zM1664 -128v1152h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h896z" />
+    <glyph glyph-name="paper_clip" unicode="&#xf0c6;" horiz-adv-x="1408" 
+d="M1404 151q0 -117 -79 -196t-196 -79q-135 0 -235 100l-777 776q-113 115 -113 271q0 159 110 270t269 111q158 0 273 -113l605 -606q10 -10 10 -22q0 -16 -30.5 -46.5t-46.5 -30.5q-13 0 -23 10l-606 607q-79 77 -181 77q-106 0 -179 -75t-73 -181q0 -105 76 -181
+l776 -777q63 -63 145 -63q64 0 106 42t42 106q0 82 -63 145l-581 581q-26 24 -60 24q-29 0 -48 -19t-19 -48q0 -32 25 -59l410 -410q10 -10 10 -22q0 -16 -31 -47t-47 -31q-12 0 -22 10l-410 410q-63 61 -63 149q0 82 57 139t139 57q88 0 149 -63l581 -581q100 -98 100 -235
+z" />
+    <glyph glyph-name="save" unicode="&#xf0c7;" 
+d="M384 0h768v384h-768v-384zM1280 0h128v896q0 14 -10 38.5t-20 34.5l-281 281q-10 10 -34 20t-39 10v-416q0 -40 -28 -68t-68 -28h-576q-40 0 -68 28t-28 68v416h-128v-1280h128v416q0 40 28 68t68 28h832q40 0 68 -28t28 -68v-416zM896 928v320q0 13 -9.5 22.5t-22.5 9.5
+h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5zM1536 896v-928q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h928q40 0 88 -20t76 -48l280 -280q28 -28 48 -76t20 -88z" />
+    <glyph glyph-name="sign_blank" unicode="&#xf0c8;" 
+d="M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="reorder" unicode="&#xf0c9;" 
+d="M1536 192v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 704v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 1216v-128q0 -26 -19 -45
+t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="ul" unicode="&#xf0ca;" horiz-adv-x="1792" 
+d="M384 128q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM384 640q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5
+t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5zM384 1152q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1792 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z
+M1792 1248v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z" />
+    <glyph glyph-name="ol" unicode="&#xf0cb;" horiz-adv-x="1792" 
+d="M381 -84q0 -80 -54.5 -126t-135.5 -46q-106 0 -172 66l57 88q49 -45 106 -45q29 0 50.5 14.5t21.5 42.5q0 64 -105 56l-26 56q8 10 32.5 43.5t42.5 54t37 38.5v1q-16 0 -48.5 -1t-48.5 -1v-53h-106v152h333v-88l-95 -115q51 -12 81 -49t30 -88zM383 543v-159h-362
+q-6 36 -6 54q0 51 23.5 93t56.5 68t66 47.5t56.5 43.5t23.5 45q0 25 -14.5 38.5t-39.5 13.5q-46 0 -81 -58l-85 59q24 51 71.5 79.5t105.5 28.5q73 0 123 -41.5t50 -112.5q0 -50 -34 -91.5t-75 -64.5t-75.5 -50.5t-35.5 -52.5h127v60h105zM1792 224v-192q0 -13 -9.5 -22.5
+t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 14 9 23t23 9h1216q13 0 22.5 -9.5t9.5 -22.5zM384 1123v-99h-335v99h107q0 41 0.5 121.5t0.5 121.5v12h-2q-8 -17 -50 -54l-71 76l136 127h106v-404h108zM1792 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216
+q-13 0 -22.5 9.5t-9.5 22.5v192q0 14 9 23t23 9h1216q13 0 22.5 -9.5t9.5 -22.5zM1792 1248v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z" />
+    <glyph glyph-name="strikethrough" unicode="&#xf0cc;" horiz-adv-x="1792" 
+d="M1760 640q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1728q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h1728zM483 704q-28 35 -51 80q-48 98 -48 188q0 181 134 309q133 127 393 127q50 0 167 -19q66 -12 177 -48q10 -38 21 -118q14 -123 14 -183q0 -18 -5 -45l-12 -3l-84 6
+l-14 2q-50 149 -103 205q-88 91 -210 91q-114 0 -182 -59q-67 -58 -67 -146q0 -73 66 -140t279 -129q69 -20 173 -66q58 -28 95 -52h-743zM990 448h411q7 -39 7 -92q0 -111 -41 -212q-23 -56 -71 -104q-37 -35 -109 -81q-80 -48 -153 -66q-80 -21 -203 -21q-114 0 -195 23
+l-140 40q-57 16 -72 28q-8 8 -8 22v13q0 108 -2 156q-1 30 0 68l2 37v44l102 2q15 -34 30 -71t22.5 -56t12.5 -27q35 -57 80 -94q43 -36 105 -57q59 -22 132 -22q64 0 139 27q77 26 122 86q47 61 47 129q0 84 -81 157q-34 29 -137 71z" />
+    <glyph glyph-name="underline" unicode="&#xf0cd;" 
+d="M48 1313q-37 2 -45 4l-3 88q13 1 40 1q60 0 112 -4q132 -7 166 -7q86 0 168 3q116 4 146 5q56 0 86 2l-1 -14l2 -64v-9q-60 -9 -124 -9q-60 0 -79 -25q-13 -14 -13 -132q0 -13 0.5 -32.5t0.5 -25.5l1 -229l14 -280q6 -124 51 -202q35 -59 96 -92q88 -47 177 -47
+q104 0 191 28q56 18 99 51q48 36 65 64q36 56 53 114q21 73 21 229q0 79 -3.5 128t-11 122.5t-13.5 159.5l-4 59q-5 67 -24 88q-34 35 -77 34l-100 -2l-14 3l2 86h84l205 -10q76 -3 196 10l18 -2q6 -38 6 -51q0 -7 -4 -31q-45 -12 -84 -13q-73 -11 -79 -17q-15 -15 -15 -41
+q0 -7 1.5 -27t1.5 -31q8 -19 22 -396q6 -195 -15 -304q-15 -76 -41 -122q-38 -65 -112 -123q-75 -57 -182 -89q-109 -33 -255 -33q-167 0 -284 46q-119 47 -179 122q-61 76 -83 195q-16 80 -16 237v333q0 188 -17 213q-25 36 -147 39zM1536 -96v64q0 14 -9 23t-23 9h-1472
+q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h1472q14 0 23 9t9 23z" />
+    <glyph glyph-name="table" unicode="&#xf0ce;" horiz-adv-x="1664" 
+d="M512 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM512 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23
+v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM512 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 160v192
+q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192
+q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1664 1248v-1088q0 -66 -47 -113t-113 -47h-1344q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1344q66 0 113 -47t47 -113
+z" />
+    <glyph glyph-name="magic" unicode="&#xf0d0;" horiz-adv-x="1664" 
+d="M1190 955l293 293l-107 107l-293 -293zM1637 1248q0 -27 -18 -45l-1286 -1286q-18 -18 -45 -18t-45 18l-198 198q-18 18 -18 45t18 45l1286 1286q18 18 45 18t45 -18l198 -198q18 -18 18 -45zM286 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM636 1276
+l196 -60l-196 -60l-60 -196l-60 196l-196 60l196 60l60 196zM1566 798l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM926 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98z" />
+    <glyph glyph-name="truck" unicode="&#xf0d1;" horiz-adv-x="1792" 
+d="M640 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM256 640h384v256h-158q-13 0 -22 -9l-195 -195q-9 -9 -9 -22v-30zM1536 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM1792 1216v-1024q0 -15 -4 -26.5t-13.5 -18.5
+t-16.5 -11.5t-23.5 -6t-22.5 -2t-25.5 0t-22.5 0.5q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-64q-3 0 -22.5 -0.5t-25.5 0t-22.5 2t-23.5 6t-16.5 11.5t-13.5 18.5t-4 26.5q0 26 19 45t45 19v320q0 8 -0.5 35t0 38
+t2.5 34.5t6.5 37t14 30.5t22.5 30l198 198q19 19 50.5 32t58.5 13h160v192q0 26 19 45t45 19h1024q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="pinterest" unicode="&#xf0d2;" 
+d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103q-111 0 -218 32q59 93 78 164q9 34 54 211q20 -39 73 -67.5t114 -28.5q121 0 216 68.5t147 188.5t52 270q0 114 -59.5 214t-172.5 163t-255 63q-105 0 -196 -29t-154.5 -77t-109 -110.5t-67 -129.5t-21.5 -134
+q0 -104 40 -183t117 -111q30 -12 38 20q2 7 8 31t8 30q6 23 -11 43q-51 61 -51 151q0 151 104.5 259.5t273.5 108.5q151 0 235.5 -82t84.5 -213q0 -170 -68.5 -289t-175.5 -119q-61 0 -98 43.5t-23 104.5q8 35 26.5 93.5t30 103t11.5 75.5q0 50 -27 83t-77 33
+q-62 0 -105 -57t-43 -142q0 -73 25 -122l-99 -418q-17 -70 -13 -177q-206 91 -333 281t-127 423q0 209 103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="pinterest_sign" unicode="&#xf0d3;" 
+d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-725q85 122 108 210q9 34 53 209q21 -39 73.5 -67t112.5 -28q181 0 295.5 147.5t114.5 373.5q0 84 -35 162.5t-96.5 139t-152.5 97t-197 36.5q-104 0 -194.5 -28.5t-153 -76.5
+t-107.5 -109.5t-66.5 -128t-21.5 -132.5q0 -102 39.5 -180t116.5 -110q13 -5 23.5 0t14.5 19q10 44 15 61q6 23 -11 42q-50 62 -50 150q0 150 103.5 256.5t270.5 106.5q149 0 232.5 -81t83.5 -210q0 -168 -67.5 -286t-173.5 -118q-60 0 -97 43.5t-23 103.5q8 34 26.5 92.5
+t29.5 102t11 74.5q0 49 -26.5 81.5t-75.5 32.5q-61 0 -103.5 -56.5t-42.5 -139.5q0 -72 24 -121l-98 -414q-24 -100 -7 -254h-183q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960z" />
+    <glyph glyph-name="google_plus_sign" unicode="&#xf0d4;" 
+d="M917 631q0 26 -6 64h-362v-132h217q-3 -24 -16.5 -50t-37.5 -53t-66.5 -44.5t-96.5 -17.5q-99 0 -169 71t-70 171t70 171t169 71q92 0 153 -59l104 101q-108 100 -257 100q-160 0 -272 -112.5t-112 -271.5t112 -271.5t272 -112.5q165 0 266.5 105t101.5 270zM1262 585
+h109v110h-109v110h-110v-110h-110v-110h110v-110h110v110zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="google_plus" unicode="&#xf0d5;" horiz-adv-x="2304" 
+d="M1437 623q0 -208 -87 -370.5t-248 -254t-369 -91.5q-149 0 -285 58t-234 156t-156 234t-58 285t58 285t156 234t234 156t285 58q286 0 491 -192l-199 -191q-117 113 -292 113q-123 0 -227.5 -62t-165.5 -168.5t-61 -232.5t61 -232.5t165.5 -168.5t227.5 -62
+q83 0 152.5 23t114.5 57.5t78.5 78.5t49 83t21.5 74h-416v252h692q12 -63 12 -122zM2304 745v-210h-209v-209h-210v209h-209v210h209v209h210v-209h209z" />
+    <glyph glyph-name="money" unicode="&#xf0d6;" horiz-adv-x="1920" 
+d="M768 384h384v96h-128v448h-114l-148 -137l77 -80q42 37 55 57h2v-288h-128v-96zM1280 640q0 -70 -21 -142t-59.5 -134t-101.5 -101t-138 -39t-138 39t-101.5 101t-59.5 134t-21 142t21 142t59.5 134t101.5 101t138 39t138 -39t101.5 -101t59.5 -134t21 -142zM1792 384
+v512q-106 0 -181 75t-75 181h-1152q0 -106 -75 -181t-181 -75v-512q106 0 181 -75t75 -181h1152q0 106 75 181t181 75zM1920 1216v-1152q0 -26 -19 -45t-45 -19h-1792q-26 0 -45 19t-19 45v1152q0 26 19 45t45 19h1792q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="caret_down" unicode="&#xf0d7;" horiz-adv-x="1024" 
+d="M1024 832q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="caret_up" unicode="&#xf0d8;" horiz-adv-x="1024" 
+d="M1024 320q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
+    <glyph glyph-name="caret_left" unicode="&#xf0d9;" horiz-adv-x="640" 
+d="M640 1088v-896q0 -26 -19 -45t-45 -19t-45 19l-448 448q-19 19 -19 45t19 45l448 448q19 19 45 19t45 -19t19 -45z" />
+    <glyph glyph-name="caret_right" unicode="&#xf0da;" horiz-adv-x="640" 
+d="M576 640q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19t-19 45v896q0 26 19 45t45 19t45 -19l448 -448q19 -19 19 -45z" />
+    <glyph glyph-name="columns" unicode="&#xf0db;" horiz-adv-x="1664" 
+d="M160 0h608v1152h-640v-1120q0 -13 9.5 -22.5t22.5 -9.5zM1536 32v1120h-640v-1152h608q13 0 22.5 9.5t9.5 22.5zM1664 1248v-1216q0 -66 -47 -113t-113 -47h-1344q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1344q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="sort" unicode="&#xf0dc;" horiz-adv-x="1024" 
+d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45zM1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
+    <glyph glyph-name="sort_down" unicode="&#xf0dd;" horiz-adv-x="1024" 
+d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="sort_up" unicode="&#xf0de;" horiz-adv-x="1024" 
+d="M1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
+    <glyph glyph-name="envelope_alt" unicode="&#xf0e0;" horiz-adv-x="1792" 
+d="M1792 826v-794q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v794q44 -49 101 -87q362 -246 497 -345q57 -42 92.5 -65.5t94.5 -48t110 -24.5h1h1q51 0 110 24.5t94.5 48t92.5 65.5q170 123 498 345q57 39 100 87zM1792 1120q0 -79 -49 -151t-122 -123
+q-376 -261 -468 -325q-10 -7 -42.5 -30.5t-54 -38t-52 -32.5t-57.5 -27t-50 -9h-1h-1q-23 0 -50 9t-57.5 27t-52 32.5t-54 38t-42.5 30.5q-91 64 -262 182.5t-205 142.5q-62 42 -117 115.5t-55 136.5q0 78 41.5 130t118.5 52h1472q65 0 112.5 -47t47.5 -113z" />
+    <glyph glyph-name="linkedin" unicode="&#xf0e1;" 
+d="M349 911v-991h-330v991h330zM370 1217q1 -73 -50.5 -122t-135.5 -49h-2q-82 0 -132 49t-50 122q0 74 51.5 122.5t134.5 48.5t133 -48.5t51 -122.5zM1536 488v-568h-329v530q0 105 -40.5 164.5t-126.5 59.5q-63 0 -105.5 -34.5t-63.5 -85.5q-11 -30 -11 -81v-553h-329
+q2 399 2 647t-1 296l-1 48h329v-144h-2q20 32 41 56t56.5 52t87 43.5t114.5 15.5q171 0 275 -113.5t104 -332.5z" />
+    <glyph glyph-name="undo" unicode="&#xf0e2;" 
+d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61q-172 0 -327 72.5t-264 204.5q-7 10 -6.5 22.5t8.5 20.5l137 138q10 9 25 9q16 -2 23 -12q73 -95 179 -147t225 -52q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5
+t-163.5 109.5t-198.5 40.5q-98 0 -188 -35.5t-160 -101.5l137 -138q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l130 -129q107 101 244.5 156.5t284.5 55.5q156 0 298 -61t245 -164t164 -245t61 -298z" />
+    <glyph glyph-name="legal" unicode="&#xf0e3;" horiz-adv-x="1792" 
+d="M1771 0q0 -53 -37 -90l-107 -108q-39 -37 -91 -37q-53 0 -90 37l-363 364q-38 36 -38 90q0 53 43 96l-256 256l-126 -126q-14 -14 -34 -14t-34 14q2 -2 12.5 -12t12.5 -13t10 -11.5t10 -13.5t6 -13.5t5.5 -16.5t1.5 -18q0 -38 -28 -68q-3 -3 -16.5 -18t-19 -20.5
+t-18.5 -16.5t-22 -15.5t-22 -9t-26 -4.5q-40 0 -68 28l-408 408q-28 28 -28 68q0 13 4.5 26t9 22t15.5 22t16.5 18.5t20.5 19t18 16.5q30 28 68 28q10 0 18 -1.5t16.5 -5.5t13.5 -6t13.5 -10t11.5 -10t13 -12.5t12 -12.5q-14 14 -14 34t14 34l348 348q14 14 34 14t34 -14
+q-2 2 -12.5 12t-12.5 13t-10 11.5t-10 13.5t-6 13.5t-5.5 16.5t-1.5 18q0 38 28 68q3 3 16.5 18t19 20.5t18.5 16.5t22 15.5t22 9t26 4.5q40 0 68 -28l408 -408q28 -28 28 -68q0 -13 -4.5 -26t-9 -22t-15.5 -22t-16.5 -18.5t-20.5 -19t-18 -16.5q-30 -28 -68 -28
+q-10 0 -18 1.5t-16.5 5.5t-13.5 6t-13.5 10t-11.5 10t-13 12.5t-12 12.5q14 -14 14 -34t-14 -34l-126 -126l256 -256q43 43 96 43q52 0 91 -37l363 -363q37 -39 37 -91z" />
+    <glyph glyph-name="dashboard" unicode="&#xf0e4;" horiz-adv-x="1792" 
+d="M384 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM576 832q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1004 351l101 382q6 26 -7.5 48.5t-38.5 29.5
+t-48 -6.5t-30 -39.5l-101 -382q-60 -5 -107 -43.5t-63 -98.5q-20 -77 20 -146t117 -89t146 20t89 117q16 60 -6 117t-72 91zM1664 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 1024q0 53 -37.5 90.5
+t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1472 832q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1792 384q0 -261 -141 -483q-19 -29 -54 -29h-1402q-35 0 -54 29
+q-141 221 -141 483q0 182 71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="comment_alt" unicode="&#xf0e5;" horiz-adv-x="1792" 
+d="M896 1152q-204 0 -381.5 -69.5t-282 -187.5t-104.5 -255q0 -112 71.5 -213.5t201.5 -175.5l87 -50l-27 -96q-24 -91 -70 -172q152 63 275 171l43 38l57 -6q69 -8 130 -8q204 0 381.5 69.5t282 187.5t104.5 255t-104.5 255t-282 187.5t-381.5 69.5zM1792 640
+q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22h-5q-15 0 -27 10.5t-16 27.5v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281q0 174 120 321.5
+t326 233t450 85.5t450 -85.5t326 -233t120 -321.5z" />
+    <glyph glyph-name="comments_alt" unicode="&#xf0e6;" horiz-adv-x="1792" 
+d="M704 1152q-153 0 -286 -52t-211.5 -141t-78.5 -191q0 -82 53 -158t149 -132l97 -56l-35 -84q34 20 62 39l44 31l53 -10q78 -14 153 -14q153 0 286 52t211.5 141t78.5 191t-78.5 191t-211.5 141t-286 52zM704 1280q191 0 353.5 -68.5t256.5 -186.5t94 -257t-94 -257
+t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q-124 72 -195 177t-71 224q0 139 94 257t256.5 186.5
+t353.5 68.5zM1526 111q10 -24 20.5 -44t25 -38.5t22.5 -29t26 -29.5t23 -25q1 -1 4 -4.5t4.5 -5t4 -5t3.5 -5.5l2.5 -5t2 -6t0.5 -6.5t-1 -6.5q-3 -14 -13 -22t-22 -7q-50 7 -86 16q-154 40 -278 128q-90 -16 -176 -16q-271 0 -472 132q58 -4 88 -4q161 0 309 45t264 129
+q125 92 192 212t67 254q0 77 -23 152q129 -71 204 -178t75 -230q0 -120 -71 -224.5t-195 -176.5z" />
+    <glyph glyph-name="bolt" unicode="&#xf0e7;" horiz-adv-x="896" 
+d="M885 970q18 -20 7 -44l-540 -1157q-13 -25 -42 -25q-4 0 -14 2q-17 5 -25.5 19t-4.5 30l197 808l-406 -101q-4 -1 -12 -1q-18 0 -31 11q-18 15 -13 39l201 825q4 14 16 23t28 9h328q19 0 32 -12.5t13 -29.5q0 -8 -5 -18l-171 -463l396 98q8 2 12 2q19 0 34 -15z" />
+    <glyph glyph-name="sitemap" unicode="&#xf0e8;" horiz-adv-x="1792" 
+d="M1792 288v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320
+q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192q0 52 38 90t90 38h512v192h-96q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h320q40 0 68 -28t28 -68v-320q0 -40 -28 -68t-68 -28h-96v-192h512q52 0 90 -38t38 -90v-192h96q40 0 68 -28t28 -68
+z" />
+    <glyph glyph-name="umbrella" unicode="&#xf0e9;" horiz-adv-x="1664" 
+d="M896 708v-580q0 -104 -76 -180t-180 -76t-180 76t-76 180q0 26 19 45t45 19t45 -19t19 -45q0 -50 39 -89t89 -39t89 39t39 89v580q33 11 64 11t64 -11zM1664 681q0 -13 -9.5 -22.5t-22.5 -9.5q-11 0 -23 10q-49 46 -93 69t-102 23q-68 0 -128 -37t-103 -97
+q-7 -10 -17.5 -28t-14.5 -24q-11 -17 -28 -17q-18 0 -29 17q-4 6 -14.5 24t-17.5 28q-43 60 -102.5 97t-127.5 37t-127.5 -37t-102.5 -97q-7 -10 -17.5 -28t-14.5 -24q-11 -17 -29 -17q-17 0 -28 17q-4 6 -14.5 24t-17.5 28q-43 60 -103 97t-128 37q-58 0 -102 -23t-93 -69
+q-12 -10 -23 -10q-13 0 -22.5 9.5t-9.5 22.5q0 5 1 7q45 183 172.5 319.5t298 204.5t360.5 68q140 0 274.5 -40t246.5 -113.5t194.5 -187t115.5 -251.5q1 -2 1 -7zM896 1408v-98q-42 2 -64 2t-64 -2v98q0 26 19 45t45 19t45 -19t19 -45z" />
+    <glyph glyph-name="paste" unicode="&#xf0ea;" horiz-adv-x="1792" 
+d="M768 -128h896v640h-416q-40 0 -68 28t-28 68v416h-384v-1152zM1024 1312v64q0 13 -9.5 22.5t-22.5 9.5h-704q-13 0 -22.5 -9.5t-9.5 -22.5v-64q0 -13 9.5 -22.5t22.5 -9.5h704q13 0 22.5 9.5t9.5 22.5zM1280 640h299l-299 299v-299zM1792 512v-672q0 -40 -28 -68t-68 -28
+h-960q-40 0 -68 28t-28 68v160h-544q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h1088q40 0 68 -28t28 -68v-328q21 -13 36 -28l408 -408q28 -28 48 -76t20 -88z" />
+    <glyph glyph-name="light_bulb" unicode="&#xf0eb;" horiz-adv-x="1024" 
+d="M736 960q0 -13 -9.5 -22.5t-22.5 -9.5t-22.5 9.5t-9.5 22.5q0 46 -54 71t-106 25q-13 0 -22.5 9.5t-9.5 22.5t9.5 22.5t22.5 9.5q50 0 99.5 -16t87 -54t37.5 -90zM896 960q0 72 -34.5 134t-90 101.5t-123 62t-136.5 22.5t-136.5 -22.5t-123 -62t-90 -101.5t-34.5 -134
+q0 -101 68 -180q10 -11 30.5 -33t30.5 -33q128 -153 141 -298h228q13 145 141 298q10 11 30.5 33t30.5 33q68 79 68 180zM1024 960q0 -155 -103 -268q-45 -49 -74.5 -87t-59.5 -95.5t-34 -107.5q47 -28 47 -82q0 -37 -25 -64q25 -27 25 -64q0 -52 -45 -81q13 -23 13 -47
+q0 -46 -31.5 -71t-77.5 -25q-20 -44 -60 -70t-87 -26t-87 26t-60 70q-46 0 -77.5 25t-31.5 71q0 24 13 47q-45 29 -45 81q0 37 25 64q-25 27 -25 64q0 54 47 82q-4 50 -34 107.5t-59.5 95.5t-74.5 87q-103 113 -103 268q0 99 44.5 184.5t117 142t164 89t186.5 32.5
+t186.5 -32.5t164 -89t117 -142t44.5 -184.5z" />
+    <glyph glyph-name="exchange" unicode="&#xf0ec;" horiz-adv-x="1792" 
+d="M1792 352v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5q-12 0 -24 10l-319 320q-9 9 -9 22q0 14 9 23l320 320q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5v-192h1376q13 0 22.5 -9.5t9.5 -22.5zM1792 896q0 -14 -9 -23l-320 -320q-9 -9 -23 -9
+q-13 0 -22.5 9.5t-9.5 22.5v192h-1376q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1376v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z" />
+    <glyph glyph-name="cloud_download" unicode="&#xf0ed;" horiz-adv-x="1920" 
+d="M1280 608q0 14 -9 23t-23 9h-224v352q0 13 -9.5 22.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-352h-224q-13 0 -22.5 -9.5t-9.5 -22.5q0 -14 9 -23l352 -352q9 -9 23 -9t23 9l351 351q10 12 10 24zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088
+q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z" />
+    <glyph glyph-name="cloud_upload" unicode="&#xf0ee;" horiz-adv-x="1920" 
+d="M1280 672q0 14 -9 23l-352 352q-9 9 -23 9t-23 -9l-351 -351q-10 -12 -10 -24q0 -14 9 -23t23 -9h224v-352q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5v352h224q13 0 22.5 9.5t9.5 22.5zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088
+q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z" />
+    <glyph glyph-name="user_md" unicode="&#xf0f0;" horiz-adv-x="1408" 
+d="M384 192q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45zM1408 131q0 -121 -73 -190t-194 -69h-874q-121 0 -194 69t-73 190q0 68 5.5 131t24 138t47.5 132.5t81 103t120 60.5q-22 -52 -22 -120v-203q-58 -20 -93 -70t-35 -111q0 -80 56 -136t136 -56
+t136 56t56 136q0 61 -35.5 111t-92.5 70v203q0 62 25 93q132 -104 295 -104t295 104q25 -31 25 -93v-64q-106 0 -181 -75t-75 -181v-89q-32 -29 -32 -71q0 -40 28 -68t68 -28t68 28t28 68q0 42 -32 71v89q0 52 38 90t90 38t90 -38t38 -90v-89q-32 -29 -32 -71q0 -40 28 -68
+t68 -28t68 28t28 68q0 42 -32 71v89q0 68 -34.5 127.5t-93.5 93.5q0 10 0.5 42.5t0 48t-2.5 41.5t-7 47t-13 40q68 -15 120 -60.5t81 -103t47.5 -132.5t24 -138t5.5 -131zM1088 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5
+t271.5 -112.5t112.5 -271.5z" />
+    <glyph glyph-name="stethoscope" unicode="&#xf0f1;" horiz-adv-x="1408" 
+d="M1280 832q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 832q0 -62 -35.5 -111t-92.5 -70v-395q0 -159 -131.5 -271.5t-316.5 -112.5t-316.5 112.5t-131.5 271.5v132q-164 20 -274 128t-110 252v512q0 26 19 45t45 19q6 0 16 -2q17 30 47 48
+t65 18q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5q-33 0 -64 18v-402q0 -106 94 -181t226 -75t226 75t94 181v402q-31 -18 -64 -18q-53 0 -90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5q35 0 65 -18t47 -48q10 2 16 2q26 0 45 -19t19 -45v-512q0 -144 -110 -252
+t-274 -128v-132q0 -106 94 -181t226 -75t226 75t94 181v395q-57 21 -92.5 70t-35.5 111q0 80 56 136t136 56t136 -56t56 -136z" />
+    <glyph glyph-name="suitcase" unicode="&#xf0f2;" horiz-adv-x="1792" 
+d="M640 1152h512v128h-512v-128zM288 1152v-1280h-64q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h64zM1408 1152v-1280h-1024v1280h128v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h128zM1792 928v-832q0 -92 -66 -158t-158 -66h-64v1280h64q92 0 158 -66
+t66 -158z" />
+    <glyph glyph-name="bell_alt" unicode="&#xf0f3;" horiz-adv-x="1792" 
+d="M912 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM1728 128q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q50 42 91 88t85 119.5t74.5 158.5
+t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q190 -28 307 -158.5t117 -282.5q0 -139 19.5 -260t50 -206t74.5 -158.5t85 -119.5t91 -88z" />
+    <glyph glyph-name="coffee" unicode="&#xf0f4;" horiz-adv-x="1920" 
+d="M1664 896q0 80 -56 136t-136 56h-64v-384h64q80 0 136 56t56 136zM0 128h1792q0 -106 -75 -181t-181 -75h-1280q-106 0 -181 75t-75 181zM1856 896q0 -159 -112.5 -271.5t-271.5 -112.5h-64v-32q0 -92 -66 -158t-158 -66h-704q-92 0 -158 66t-66 158v736q0 26 19 45
+t45 19h1152q159 0 271.5 -112.5t112.5 -271.5z" />
+    <glyph glyph-name="food" unicode="&#xf0f5;" horiz-adv-x="1408" 
+d="M640 1472v-640q0 -61 -35.5 -111t-92.5 -70v-779q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v779q-57 20 -92.5 70t-35.5 111v640q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45
+t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45zM1408 1472v-1600q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v512h-224q-13 0 -22.5 9.5t-9.5 22.5v800q0 132 94 226t226 94h256q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="file_text_alt" unicode="&#xf0f6;" 
+d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+M384 736q0 14 9 23t23 9h704q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64zM1120 512q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704zM1120 256q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704
+q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704z" />
+    <glyph glyph-name="building" unicode="&#xf0f7;" horiz-adv-x="1408" 
+d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M1152 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M640 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M1152 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M640 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M1152 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M640 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M896 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M896 -128h384v1536h-1152v-1536h384v224q0 13 9.5 22.5t22.5 9.5h320q13 0 22.5 -9.5t9.5 -22.5v-224zM1408 1472v-1664q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h1280q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="hospital" unicode="&#xf0f8;" horiz-adv-x="1408" 
+d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M1152 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M640 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M896 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M896 -128h384v1152h-256v-32q0 -40 -28 -68t-68 -28h-448q-40 0 -68 28t-28 68v32h-256v-1152h384v224q0 13 9.5 22.5t22.5 9.5h320q13 0 22.5 -9.5t9.5 -22.5v-224zM896 1056v320q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-96h-128v96q0 13 -9.5 22.5
+t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5v96h128v-96q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1408 1088v-1280q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1280q0 26 19 45t45 19h320
+v288q0 40 28 68t68 28h448q40 0 68 -28t28 -68v-288h320q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="ambulance" unicode="&#xf0f9;" horiz-adv-x="1920" 
+d="M640 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM256 640h384v256h-158q-14 -2 -22 -9l-195 -195q-7 -12 -9 -22v-30zM1536 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5
+t90.5 37.5t37.5 90.5zM1664 800v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v224h224q14 0 23 9t9 23zM1920 1344v-1152
+q0 -26 -19 -45t-45 -19h-192q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-128q-26 0 -45 19t-19 45t19 45t45 19v416q0 26 13 58t32 51l198 198q19 19 51 32t58 13h160v320q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="medkit" unicode="&#xf0fa;" horiz-adv-x="1792" 
+d="M1280 416v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v224h224q14 0 23 9t9 23zM640 1152h512v128h-512v-128zM256 1152v-1280h-32
+q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h32zM1440 1152v-1280h-1088v1280h160v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h160zM1792 928v-832q0 -92 -66 -158t-158 -66h-32v1280h32q92 0 158 -66t66 -158z" />
+    <glyph glyph-name="fighter_jet" unicode="&#xf0fb;" horiz-adv-x="1920" 
+d="M1920 576q-1 -32 -288 -96l-352 -32l-224 -64h-64l-293 -352h69q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-96h-160h-64v32h64v416h-160l-192 -224h-96l-32 32v192h32v32h128v8l-192 24v128l192 24v8h-128v32h-32v192l32 32h96l192 -224h160v416h-64v32h64h160h96
+q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-69l293 -352h64l224 -64l352 -32q128 -28 200 -52t80 -34z" />
+    <glyph glyph-name="beer" unicode="&#xf0fc;" horiz-adv-x="1664" 
+d="M640 640v384h-256v-256q0 -53 37.5 -90.5t90.5 -37.5h128zM1664 192v-192h-1152v192l128 192h-128q-159 0 -271.5 112.5t-112.5 271.5v320l-64 64l32 128h480l32 128h960l32 -192l-64 -32v-800z" />
+    <glyph glyph-name="h_sign" unicode="&#xf0fd;" 
+d="M1280 192v896q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-512v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-896q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h512v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1536 1120v-960
+q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="f0fe" unicode="&#xf0fe;" 
+d="M1280 576v128q0 26 -19 45t-45 19h-320v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-320q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h320v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h320q26 0 45 19t19 45zM1536 1120v-960
+q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="double_angle_left" unicode="&#xf100;" horiz-adv-x="1024" 
+d="M627 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23zM1011 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23
+t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23z" />
+    <glyph glyph-name="double_angle_right" unicode="&#xf101;" horiz-adv-x="1024" 
+d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM979 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23
+l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
+    <glyph glyph-name="double_angle_up" unicode="&#xf102;" horiz-adv-x="1152" 
+d="M1075 224q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM1075 608q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393
+q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
+    <glyph glyph-name="double_angle_down" unicode="&#xf103;" horiz-adv-x="1152" 
+d="M1075 672q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23zM1075 1056q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23
+t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
+    <glyph glyph-name="angle_left" unicode="&#xf104;" horiz-adv-x="640" 
+d="M627 992q0 -13 -10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
+    <glyph glyph-name="angle_right" unicode="&#xf105;" horiz-adv-x="640" 
+d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
+    <glyph glyph-name="angle_up" unicode="&#xf106;" horiz-adv-x="1152" 
+d="M1075 352q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
+    <glyph glyph-name="angle_down" unicode="&#xf107;" horiz-adv-x="1152" 
+d="M1075 800q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
+    <glyph glyph-name="desktop" unicode="&#xf108;" horiz-adv-x="1920" 
+d="M1792 544v832q0 13 -9.5 22.5t-22.5 9.5h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-832q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5zM1920 1376v-1088q0 -66 -47 -113t-113 -47h-544q0 -37 16 -77.5t32 -71t16 -43.5q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19
+t-19 45q0 14 16 44t32 70t16 78h-544q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="laptop" unicode="&#xf109;" horiz-adv-x="1920" 
+d="M416 256q-66 0 -113 47t-47 113v704q0 66 47 113t113 47h1088q66 0 113 -47t47 -113v-704q0 -66 -47 -113t-113 -47h-1088zM384 1120v-704q0 -13 9.5 -22.5t22.5 -9.5h1088q13 0 22.5 9.5t9.5 22.5v704q0 13 -9.5 22.5t-22.5 9.5h-1088q-13 0 -22.5 -9.5t-9.5 -22.5z
+M1760 192h160v-96q0 -40 -47 -68t-113 -28h-1600q-66 0 -113 28t-47 68v96h160h1600zM1040 96q16 0 16 16t-16 16h-160q-16 0 -16 -16t16 -16h160z" />
+    <glyph glyph-name="tablet" unicode="&#xf10a;" horiz-adv-x="1152" 
+d="M640 128q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1024 288v960q0 13 -9.5 22.5t-22.5 9.5h-832q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h832q13 0 22.5 9.5t9.5 22.5zM1152 1248v-1088q0 -66 -47 -113t-113 -47h-832
+q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h832q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="mobile_phone" unicode="&#xf10b;" horiz-adv-x="768" 
+d="M464 128q0 33 -23.5 56.5t-56.5 23.5t-56.5 -23.5t-23.5 -56.5t23.5 -56.5t56.5 -23.5t56.5 23.5t23.5 56.5zM672 288v704q0 13 -9.5 22.5t-22.5 9.5h-512q-13 0 -22.5 -9.5t-9.5 -22.5v-704q0 -13 9.5 -22.5t22.5 -9.5h512q13 0 22.5 9.5t9.5 22.5zM480 1136
+q0 16 -16 16h-160q-16 0 -16 -16t16 -16h160q16 0 16 16zM768 1152v-1024q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v1024q0 52 38 90t90 38h512q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="circle_blank" unicode="&#xf10c;" 
+d="M768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103
+t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="quote_left" unicode="&#xf10d;" horiz-adv-x="1664" 
+d="M768 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 -181v-32q0 -40 28 -68t68 -28h224q80 0 136 -56t56 -136z
+M1664 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 -181v-32q0 -40 28 -68t68 -28h224q80 0 136 -56t56 -136z" />
+    <glyph glyph-name="quote_right" unicode="&#xf10e;" horiz-adv-x="1664" 
+d="M768 1216v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 56 136t136 56h384q80 0 136 -56t56 -136zM1664 1216
+v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 56 136t136 56h384q80 0 136 -56t56 -136z" />
+    <glyph glyph-name="spinner" unicode="&#xf110;" horiz-adv-x="1792" 
+d="M526 142q0 -53 -37.5 -90.5t-90.5 -37.5q-52 0 -90 38t-38 90q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1024 -64q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM320 640q0 -53 -37.5 -90.5t-90.5 -37.5
+t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1522 142q0 -52 -38 -90t-90 -38q-53 0 -90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM558 1138q0 -66 -47 -113t-113 -47t-113 47t-47 113t47 113t113 47t113 -47t47 -113z
+M1728 640q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1088 1344q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1618 1138q0 -93 -66 -158.5t-158 -65.5q-93 0 -158.5 65.5t-65.5 158.5
+q0 92 65.5 158t158.5 66q92 0 158 -66t66 -158z" />
+    <glyph glyph-name="circle" unicode="&#xf111;" 
+d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="reply" unicode="&#xf112;" horiz-adv-x="1792" 
+d="M1792 416q0 -166 -127 -451q-3 -7 -10.5 -24t-13.5 -30t-13 -22q-12 -17 -28 -17q-15 0 -23.5 10t-8.5 25q0 9 2.5 26.5t2.5 23.5q5 68 5 123q0 101 -17.5 181t-48.5 138.5t-80 101t-105.5 69.5t-133 42.5t-154 21.5t-175.5 6h-224v-256q0 -26 -19 -45t-45 -19t-45 19
+l-512 512q-19 19 -19 45t19 45l512 512q19 19 45 19t45 -19t19 -45v-256h224q713 0 875 -403q53 -134 53 -333z" />
+    <glyph glyph-name="github_alt" unicode="&#xf113;" horiz-adv-x="1664" 
+d="M640 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1280 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1440 320
+q0 120 -69 204t-187 84q-41 0 -195 -21q-71 -11 -157 -11t-157 11q-152 21 -195 21q-118 0 -187 -84t-69 -204q0 -88 32 -153.5t81 -103t122 -60t140 -29.5t149 -7h168q82 0 149 7t140 29.5t122 60t81 103t32 153.5zM1664 496q0 -207 -61 -331q-38 -77 -105.5 -133t-141 -86
+t-170 -47.5t-171.5 -22t-167 -4.5q-78 0 -142 3t-147.5 12.5t-152.5 30t-137 51.5t-121 81t-86 115q-62 123 -62 331q0 237 136 396q-27 82 -27 170q0 116 51 218q108 0 190 -39.5t189 -123.5q147 35 309 35q148 0 280 -32q105 82 187 121t189 39q51 -102 51 -218
+q0 -87 -27 -168q136 -160 136 -398z" />
+    <glyph glyph-name="folder_close_alt" unicode="&#xf114;" horiz-adv-x="1664" 
+d="M1536 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68v-960q0 -40 28 -68t68 -28h1216q40 0 68 28t28 68zM1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320
+q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />
+    <glyph glyph-name="folder_open_alt" unicode="&#xf115;" horiz-adv-x="1920" 
+d="M1781 605q0 35 -53 35h-1088q-40 0 -85.5 -21.5t-71.5 -52.5l-294 -363q-18 -24 -18 -40q0 -35 53 -35h1088q40 0 86 22t71 53l294 363q18 22 18 39zM640 768h768v160q0 40 -28 68t-68 28h-576q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68
+v-853l256 315q44 53 116 87.5t140 34.5zM1909 605q0 -62 -46 -120l-295 -363q-43 -53 -116 -87.5t-140 -34.5h-1088q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158v-160h192q54 0 99 -24.5t67 -70.5q15 -32 15 -68z
+" />
+    <glyph glyph-name="expand_alt" unicode="&#xf116;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="collapse_alt" unicode="&#xf117;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="smile" unicode="&#xf118;" 
+d="M1134 461q-37 -121 -138 -195t-228 -74t-228 74t-138 195q-8 25 4 48.5t38 31.5q25 8 48.5 -4t31.5 -38q25 -80 92.5 -129.5t151.5 -49.5t151.5 49.5t92.5 129.5q8 26 32 38t49 4t37 -31.5t4 -48.5zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5
+t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5
+t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="frown" unicode="&#xf119;" 
+d="M1134 307q8 -25 -4 -48.5t-37 -31.5t-49 4t-32 38q-25 80 -92.5 129.5t-151.5 49.5t-151.5 -49.5t-92.5 -129.5q-8 -26 -31.5 -38t-48.5 -4q-26 8 -38 31.5t-4 48.5q37 121 138 195t228 74t228 -74t138 -195zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5
+t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204
+t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="meh" unicode="&#xf11a;" 
+d="M1152 448q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h640q26 0 45 -19t19 -45zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5
+t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640
+q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="gamepad" unicode="&#xf11b;" horiz-adv-x="1920" 
+d="M832 448v128q0 14 -9 23t-23 9h-192v192q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-192h-192q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h192v-192q0 -14 9 -23t23 -9h128q14 0 23 9t9 23v192h192q14 0 23 9t9 23zM1408 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5
+t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 640q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1920 512q0 -212 -150 -362t-362 -150q-192 0 -338 128h-220q-146 -128 -338 -128q-212 0 -362 150
+t-150 362t150 362t362 150h896q212 0 362 -150t150 -362z" />
+    <glyph glyph-name="keyboard" unicode="&#xf11c;" horiz-adv-x="1920" 
+d="M384 368v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM512 624v-96q0 -16 -16 -16h-224q-16 0 -16 16v96q0 16 16 16h224q16 0 16 -16zM384 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1408 368v-96q0 -16 -16 -16
+h-864q-16 0 -16 16v96q0 16 16 16h864q16 0 16 -16zM768 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM640 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1024 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16
+h96q16 0 16 -16zM896 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1280 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1664 368v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1152 880v-96
+q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1408 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1664 880v-352q0 -16 -16 -16h-224q-16 0 -16 16v96q0 16 16 16h112v240q0 16 16 16h96q16 0 16 -16zM1792 128v896h-1664v-896
+h1664zM1920 1024v-896q0 -53 -37.5 -90.5t-90.5 -37.5h-1664q-53 0 -90.5 37.5t-37.5 90.5v896q0 53 37.5 90.5t90.5 37.5h1664q53 0 90.5 -37.5t37.5 -90.5z" />
+    <glyph glyph-name="flag_alt" unicode="&#xf11d;" horiz-adv-x="1792" 
+d="M1664 491v616q-169 -91 -306 -91q-82 0 -145 32q-100 49 -184 76.5t-178 27.5q-173 0 -403 -127v-599q245 113 433 113q55 0 103.5 -7.5t98 -26t77 -31t82.5 -39.5l28 -14q44 -22 101 -22q120 0 293 92zM320 1280q0 -35 -17.5 -64t-46.5 -46v-1266q0 -14 -9 -23t-23 -9
+h-64q-14 0 -23 9t-9 23v1266q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -39 -35 -57q-10 -5 -17 -9q-218 -116 -369 -116q-88 0 -158 35l-28 14q-64 33 -99 48t-91 29t-114 14q-102 0 -235.5 -44t-228.5 -102
+q-15 -9 -33 -9q-16 0 -32 8q-32 19 -32 56v742q0 35 31 55q35 21 78.5 42.5t114 52t152.5 49.5t155 19q112 0 209 -31t209 -86q38 -19 89 -19q122 0 310 112q22 12 31 17q31 16 62 -2q31 -20 31 -55z" />
+    <glyph glyph-name="flag_checkered" unicode="&#xf11e;" horiz-adv-x="1792" 
+d="M832 536v192q-181 -16 -384 -117v-185q205 96 384 110zM832 954v197q-172 -8 -384 -126v-189q215 111 384 118zM1664 491v184q-235 -116 -384 -71v224q-20 6 -39 15q-5 3 -33 17t-34.5 17t-31.5 15t-34.5 15.5t-32.5 13t-36 12.5t-35 8.5t-39.5 7.5t-39.5 4t-44 2
+q-23 0 -49 -3v-222h19q102 0 192.5 -29t197.5 -82q19 -9 39 -15v-188q42 -17 91 -17q120 0 293 92zM1664 918v189q-169 -91 -306 -91q-45 0 -78 8v-196q148 -42 384 90zM320 1280q0 -35 -17.5 -64t-46.5 -46v-1266q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v1266
+q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -39 -35 -57q-10 -5 -17 -9q-218 -116 -369 -116q-88 0 -158 35l-28 14q-64 33 -99 48t-91 29t-114 14q-102 0 -235.5 -44t-228.5 -102q-15 -9 -33 -9q-16 0 -32 8
+q-32 19 -32 56v742q0 35 31 55q35 21 78.5 42.5t114 52t152.5 49.5t155 19q112 0 209 -31t209 -86q38 -19 89 -19q122 0 310 112q22 12 31 17q31 16 62 -2q31 -20 31 -55z" />
+    <glyph glyph-name="terminal" unicode="&#xf120;" horiz-adv-x="1664" 
+d="M585 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23t-10 -23zM1664 96v-64q0 -14 -9 -23t-23 -9h-960q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h960q14 0 23 -9
+t9 -23z" />
+    <glyph glyph-name="code" unicode="&#xf121;" horiz-adv-x="1920" 
+d="M617 137l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23zM1208 1204l-373 -1291q-4 -13 -15.5 -19.5t-23.5 -2.5l-62 17q-13 4 -19.5 15.5t-2.5 24.5
+l373 1291q4 13 15.5 19.5t23.5 2.5l62 -17q13 -4 19.5 -15.5t2.5 -24.5zM1865 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23t-10 -23z" />
+    <glyph glyph-name="reply_all" unicode="&#xf122;" horiz-adv-x="1792" 
+d="M640 454v-70q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-69l-397 -398q-19 -19 -19 -45t19 -45zM1792 416q0 -58 -17 -133.5t-38.5 -138t-48 -125t-40.5 -90.5l-20 -40q-8 -17 -28 -17q-6 0 -9 1
+q-25 8 -23 34q43 400 -106 565q-64 71 -170.5 110.5t-267.5 52.5v-251q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-262q411 -28 599 -221q169 -173 169 -509z" />
+    <glyph glyph-name="star_half_empty" unicode="&#xf123;" horiz-adv-x="1664" 
+d="M1186 579l257 250l-356 52l-66 10l-30 60l-159 322v-963l59 -31l318 -168l-60 355l-12 66zM1638 841l-363 -354l86 -500q5 -33 -6 -51.5t-34 -18.5q-17 0 -40 12l-449 236l-449 -236q-23 -12 -40 -12q-23 0 -34 18.5t-6 51.5l86 500l-364 354q-32 32 -23 59.5t54 34.5
+l502 73l225 455q20 41 49 41q28 0 49 -41l225 -455l502 -73q45 -7 54 -34.5t-24 -59.5z" />
+    <glyph glyph-name="location_arrow" unicode="&#xf124;" horiz-adv-x="1408" 
+d="M1401 1187l-640 -1280q-17 -35 -57 -35q-5 0 -15 2q-22 5 -35.5 22.5t-13.5 39.5v576h-576q-22 0 -39.5 13.5t-22.5 35.5t4 42t29 30l1280 640q13 7 29 7q27 0 45 -19q15 -14 18.5 -34.5t-6.5 -39.5z" />
+    <glyph glyph-name="crop" unicode="&#xf125;" horiz-adv-x="1664" 
+d="M557 256h595v595zM512 301l595 595h-595v-595zM1664 224v-192q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v224h-864q-14 0 -23 9t-9 23v864h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224v224q0 14 9 23t23 9h192q14 0 23 -9t9 -23
+v-224h851l246 247q10 9 23 9t23 -9q9 -10 9 -23t-9 -23l-247 -246v-851h224q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="code_fork" unicode="&#xf126;" horiz-adv-x="1024" 
+d="M288 64q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM288 1216q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM928 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1024 1088q0 -52 -26 -96.5t-70 -69.5
+q-2 -287 -226 -414q-67 -38 -203 -81q-128 -40 -169.5 -71t-41.5 -100v-26q44 -25 70 -69.5t26 -96.5q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 52 26 96.5t70 69.5v820q-44 25 -70 69.5t-26 96.5q0 80 56 136t136 56t136 -56t56 -136q0 -52 -26 -96.5t-70 -69.5v-497
+q54 26 154 57q55 17 87.5 29.5t70.5 31t59 39.5t40.5 51t28 69.5t8.5 91.5q-44 25 -70 69.5t-26 96.5q0 80 56 136t136 56t136 -56t56 -136z" />
+    <glyph glyph-name="unlink" unicode="&#xf127;" horiz-adv-x="1664" 
+d="M439 265l-256 -256q-11 -9 -23 -9t-23 9q-9 10 -9 23t9 23l256 256q10 9 23 9t23 -9q9 -10 9 -23t-9 -23zM608 224v-320q0 -14 -9 -23t-23 -9t-23 9t-9 23v320q0 14 9 23t23 9t23 -9t9 -23zM384 448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23t9 23t23 9h320
+q14 0 23 -9t9 -23zM1648 320q0 -120 -85 -203l-147 -146q-83 -83 -203 -83q-121 0 -204 85l-334 335q-21 21 -42 56l239 18l273 -274q27 -27 68 -27.5t68 26.5l147 146q28 28 28 67q0 40 -28 68l-274 275l18 239q35 -21 56 -42l336 -336q84 -86 84 -204zM1031 1044l-239 -18
+l-273 274q-28 28 -68 28q-39 0 -68 -27l-147 -146q-28 -28 -28 -67q0 -40 28 -68l274 -274l-18 -240q-35 21 -56 42l-336 336q-84 86 -84 204q0 120 85 203l147 146q83 83 203 83q121 0 204 -85l334 -335q21 -21 42 -56zM1664 960q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9
+t-9 23t9 23t23 9h320q14 0 23 -9t9 -23zM1120 1504v-320q0 -14 -9 -23t-23 -9t-23 9t-9 23v320q0 14 9 23t23 9t23 -9t9 -23zM1527 1353l-256 -256q-11 -9 -23 -9t-23 9q-9 10 -9 23t9 23l256 256q10 9 23 9t23 -9q9 -10 9 -23t-9 -23z" />
+    <glyph glyph-name="question" unicode="&#xf128;" horiz-adv-x="1024" 
+d="M704 280v-240q0 -16 -12 -28t-28 -12h-240q-16 0 -28 12t-12 28v240q0 16 12 28t28 12h240q16 0 28 -12t12 -28zM1020 880q0 -54 -15.5 -101t-35 -76.5t-55 -59.5t-57.5 -43.5t-61 -35.5q-41 -23 -68.5 -65t-27.5 -67q0 -17 -12 -32.5t-28 -15.5h-240q-15 0 -25.5 18.5
+t-10.5 37.5v45q0 83 65 156.5t143 108.5q59 27 84 56t25 76q0 42 -46.5 74t-107.5 32q-65 0 -108 -29q-35 -25 -107 -115q-13 -16 -31 -16q-12 0 -25 8l-164 125q-13 10 -15.5 25t5.5 28q160 266 464 266q80 0 161 -31t146 -83t106 -127.5t41 -158.5z" />
+    <glyph glyph-name="_279" unicode="&#xf129;" horiz-adv-x="640" 
+d="M640 192v-128q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64v384h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-576h64q26 0 45 -19t19 -45zM512 1344v-192q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v192
+q0 26 19 45t45 19h256q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="exclamation" unicode="&#xf12a;" horiz-adv-x="640" 
+d="M512 288v-224q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v224q0 26 19 45t45 19h256q26 0 45 -19t19 -45zM542 1344l-28 -768q-1 -26 -20.5 -45t-45.5 -19h-256q-26 0 -45.5 19t-20.5 45l-28 768q-1 26 17.5 45t44.5 19h320q26 0 44.5 -19t17.5 -45z" />
+    <glyph glyph-name="superscript" unicode="&#xf12b;" 
+d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3q-1 -3 -2.5 -6.5t-3.5 -8t-3 -6.5q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109z
+M1534 846v-206h-514l-3 27q-4 28 -4 46q0 64 26 117t65 86.5t84 65t84 54.5t65 54t26 64q0 38 -29.5 62.5t-70.5 24.5q-51 0 -97 -39q-14 -11 -36 -38l-105 92q26 37 63 66q83 65 188 65q110 0 178 -59.5t68 -158.5q0 -56 -24.5 -103t-62 -76.5t-81.5 -58.5t-82 -50.5
+t-65.5 -51.5t-30.5 -63h232v80h126z" />
+    <glyph glyph-name="subscript" unicode="&#xf12c;" 
+d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3q-1 -3 -2.5 -6.5t-3.5 -8t-3 -6.5q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109z
+M1536 -50v-206h-514l-4 27q-3 45 -3 46q0 64 26 117t65 86.5t84 65t84 54.5t65 54t26 64q0 38 -29.5 62.5t-70.5 24.5q-51 0 -97 -39q-14 -11 -36 -38l-105 92q26 37 63 66q80 65 188 65q110 0 178 -59.5t68 -158.5q0 -66 -34.5 -118.5t-84 -86t-99.5 -62.5t-87 -63t-41 -73
+h232v80h126z" />
+    <glyph glyph-name="_283" unicode="&#xf12d;" horiz-adv-x="1920" 
+d="M896 128l336 384h-768l-336 -384h768zM1909 1205q15 -34 9.5 -71.5t-30.5 -65.5l-896 -1024q-38 -44 -96 -44h-768q-38 0 -69.5 20.5t-47.5 54.5q-15 34 -9.5 71.5t30.5 65.5l896 1024q38 44 96 44h768q38 0 69.5 -20.5t47.5 -54.5z" />
+    <glyph glyph-name="puzzle_piece" unicode="&#xf12e;" horiz-adv-x="1664" 
+d="M1664 438q0 -81 -44.5 -135t-123.5 -54q-41 0 -77.5 17.5t-59 38t-56.5 38t-71 17.5q-110 0 -110 -124q0 -39 16 -115t15 -115v-5q-22 0 -33 -1q-34 -3 -97.5 -11.5t-115.5 -13.5t-98 -5q-61 0 -103 26.5t-42 83.5q0 37 17.5 71t38 56.5t38 59t17.5 77.5q0 79 -54 123.5
+t-135 44.5q-84 0 -143 -45.5t-59 -127.5q0 -43 15 -83t33.5 -64.5t33.5 -53t15 -50.5q0 -45 -46 -89q-37 -35 -117 -35q-95 0 -245 24q-9 2 -27.5 4t-27.5 4l-13 2q-1 0 -3 1q-2 0 -2 1v1024q2 -1 17.5 -3.5t34 -5t21.5 -3.5q150 -24 245 -24q80 0 117 35q46 44 46 89
+q0 22 -15 50.5t-33.5 53t-33.5 64.5t-15 83q0 82 59 127.5t144 45.5q80 0 134 -44.5t54 -123.5q0 -41 -17.5 -77.5t-38 -59t-38 -56.5t-17.5 -71q0 -57 42 -83.5t103 -26.5q64 0 180 15t163 17v-2q-1 -2 -3.5 -17.5t-5 -34t-3.5 -21.5q-24 -150 -24 -245q0 -80 35 -117
+q44 -46 89 -46q22 0 50.5 15t53 33.5t64.5 33.5t83 15q82 0 127.5 -59t45.5 -143z" />
+    <glyph glyph-name="microphone" unicode="&#xf130;" horiz-adv-x="1152" 
+d="M1152 832v-128q0 -221 -147.5 -384.5t-364.5 -187.5v-132h256q26 0 45 -19t19 -45t-19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h256v132q-217 24 -364.5 187.5t-147.5 384.5v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -185 131.5 -316.5t316.5 -131.5
+t316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45zM896 1216v-512q0 -132 -94 -226t-226 -94t-226 94t-94 226v512q0 132 94 226t226 94t226 -94t94 -226z" />
+    <glyph glyph-name="microphone_off" unicode="&#xf131;" horiz-adv-x="1408" 
+d="M271 591l-101 -101q-42 103 -42 214v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -53 15 -113zM1385 1193l-361 -361v-128q0 -132 -94 -226t-226 -94q-55 0 -109 19l-96 -96q97 -51 205 -51q185 0 316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45v-128
+q0 -221 -147.5 -384.5t-364.5 -187.5v-132h256q26 0 45 -19t19 -45t-19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h256v132q-125 13 -235 81l-254 -254q-10 -10 -23 -10t-23 10l-82 82q-10 10 -10 23t10 23l1234 1234q10 10 23 10t23 -10l82 -82q10 -10 10 -23
+t-10 -23zM1005 1325l-621 -621v512q0 132 94 226t226 94q102 0 184.5 -59t116.5 -152z" />
+    <glyph glyph-name="shield" unicode="&#xf132;" horiz-adv-x="1280" 
+d="M1088 576v640h-448v-1137q119 63 213 137q235 184 235 360zM1280 1344v-768q0 -86 -33.5 -170.5t-83 -150t-118 -127.5t-126.5 -103t-121 -77.5t-89.5 -49.5t-42.5 -20q-12 -6 -26 -6t-26 6q-16 7 -42.5 20t-89.5 49.5t-121 77.5t-126.5 103t-118 127.5t-83 150
+t-33.5 170.5v768q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="calendar_empty" unicode="&#xf133;" horiz-adv-x="1664" 
+d="M128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280
+q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="fire_extinguisher" unicode="&#xf134;" horiz-adv-x="1408" 
+d="M512 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 1376v-320q0 -16 -12 -25q-8 -7 -20 -7q-4 0 -7 1l-448 96q-11 2 -18 11t-7 20h-256v-102q111 -23 183.5 -111t72.5 -203v-800q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v800
+q0 106 62.5 190.5t161.5 114.5v111h-32q-59 0 -115 -23.5t-91.5 -53t-66 -66.5t-40.5 -53.5t-14 -24.5q-17 -35 -57 -35q-16 0 -29 7q-23 12 -31.5 37t3.5 49q5 10 14.5 26t37.5 53.5t60.5 70t85 67t108.5 52.5q-25 42 -25 86q0 66 47 113t113 47t113 -47t47 -113
+q0 -33 -14 -64h302q0 11 7 20t18 11l448 96q3 1 7 1q12 0 20 -7q12 -9 12 -25z" />
+    <glyph glyph-name="rocket" unicode="&#xf135;" horiz-adv-x="1664" 
+d="M1440 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1664 1376q0 -249 -75.5 -430.5t-253.5 -360.5q-81 -80 -195 -176l-20 -379q-2 -16 -16 -26l-384 -224q-7 -4 -16 -4q-12 0 -23 9l-64 64q-13 14 -8 32l85 276l-281 281l-276 -85q-3 -1 -9 -1
+q-14 0 -23 9l-64 64q-17 19 -5 39l224 384q10 14 26 16l379 20q96 114 176 195q188 187 358 258t431 71q14 0 24 -9.5t10 -22.5z" />
+    <glyph glyph-name="maxcdn" unicode="&#xf136;" horiz-adv-x="1792" 
+d="M1745 763l-164 -763h-334l178 832q13 56 -15 88q-27 33 -83 33h-169l-204 -953h-334l204 953h-286l-204 -953h-334l204 953l-153 327h1276q101 0 189.5 -40.5t147.5 -113.5q60 -73 81 -168.5t0 -194.5z" />
+    <glyph glyph-name="chevron_sign_left" unicode="&#xf137;" 
+d="M909 141l102 102q19 19 19 45t-19 45l-307 307l307 307q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5
+t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="chevron_sign_right" unicode="&#xf138;" 
+d="M717 141l454 454q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l307 -307l-307 -307q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5
+t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="chevron_sign_up" unicode="&#xf139;" 
+d="M1165 397l102 102q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l307 307l307 -307q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5
+t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="chevron_sign_down" unicode="&#xf13a;" 
+d="M813 237l454 454q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-307 -307l-307 307q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5
+t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="html5" unicode="&#xf13b;" horiz-adv-x="1408" 
+d="M1130 939l16 175h-884l47 -534h612l-22 -228l-197 -53l-196 53l-13 140h-175l22 -278l362 -100h4v1l359 99l50 544h-644l-15 181h674zM0 1408h1408l-128 -1438l-578 -162l-574 162z" />
+    <glyph glyph-name="css3" unicode="&#xf13c;" horiz-adv-x="1792" 
+d="M275 1408h1505l-266 -1333l-804 -267l-698 267l71 356h297l-29 -147l422 -161l486 161l68 339h-1208l58 297h1209l38 191h-1208z" />
+    <glyph glyph-name="anchor" unicode="&#xf13d;" horiz-adv-x="1792" 
+d="M960 1280q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1792 352v-352q0 -22 -20 -30q-8 -2 -12 -2q-12 0 -23 9l-93 93q-119 -143 -318.5 -226.5t-429.5 -83.5t-429.5 83.5t-318.5 226.5l-93 -93q-9 -9 -23 -9q-4 0 -12 2q-20 8 -20 30v352
+q0 14 9 23t23 9h352q22 0 30 -20q8 -19 -7 -35l-100 -100q67 -91 189.5 -153.5t271.5 -82.5v647h-192q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h192v163q-58 34 -93 92.5t-35 128.5q0 106 75 181t181 75t181 -75t75 -181q0 -70 -35 -128.5t-93 -92.5v-163h192q26 0 45 -19
+t19 -45v-128q0 -26 -19 -45t-45 -19h-192v-647q149 20 271.5 82.5t189.5 153.5l-100 100q-15 16 -7 35q8 20 30 20h352q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="unlock_alt" unicode="&#xf13e;" horiz-adv-x="1152" 
+d="M1056 768q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v320q0 185 131.5 316.5t316.5 131.5t316.5 -131.5t131.5 -316.5q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45q0 106 -75 181t-181 75t-181 -75t-75 -181
+v-320h736z" />
+    <glyph glyph-name="bullseye" unicode="&#xf140;" 
+d="M1024 640q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM1152 640q0 159 -112.5 271.5t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM1280 640q0 -212 -150 -362t-362 -150t-362 150
+t-150 362t150 362t362 150t362 -150t150 -362zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640
+q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="ellipsis_horizontal" unicode="&#xf141;" horiz-adv-x="1408" 
+d="M384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM896 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM1408 800v-192q0 -40 -28 -68t-68 -28h-192
+q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" />
+    <glyph glyph-name="ellipsis_vertical" unicode="&#xf142;" horiz-adv-x="384" 
+d="M384 288v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 1312v-192q0 -40 -28 -68t-68 -28h-192
+q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" />
+    <glyph glyph-name="_303" unicode="&#xf143;" 
+d="M512 256q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM863 162q-13 233 -176.5 396.5t-396.5 176.5q-14 1 -24 -9t-10 -23v-128q0 -13 8.5 -22t21.5 -10q154 -11 264 -121t121 -264q1 -13 10 -21.5t22 -8.5h128
+q13 0 23 10t9 24zM1247 161q-5 154 -56 297.5t-139.5 260t-205 205t-260 139.5t-297.5 56q-14 1 -23 -9q-10 -10 -10 -23v-128q0 -13 9 -22t22 -10q204 -7 378 -111.5t278.5 -278.5t111.5 -378q1 -13 10 -22t22 -9h128q13 0 23 10q11 9 9 23zM1536 1120v-960
+q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="play_sign" unicode="&#xf144;" 
+d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1152 585q32 18 32 55t-32 55l-544 320q-31 19 -64 1q-32 -19 -32 -56v-640q0 -37 32 -56
+q16 -8 32 -8q17 0 32 9z" />
+    <glyph glyph-name="ticket" unicode="&#xf145;" horiz-adv-x="1792" 
+d="M1024 1084l316 -316l-572 -572l-316 316zM813 105l618 618q19 19 19 45t-19 45l-362 362q-18 18 -45 18t-45 -18l-618 -618q-19 -19 -19 -45t19 -45l362 -362q18 -18 45 -18t45 18zM1702 742l-907 -908q-37 -37 -90.5 -37t-90.5 37l-126 126q56 56 56 136t-56 136
+t-136 56t-136 -56l-125 126q-37 37 -37 90.5t37 90.5l907 906q37 37 90.5 37t90.5 -37l125 -125q-56 -56 -56 -136t56 -136t136 -56t136 56l126 -125q37 -37 37 -90.5t-37 -90.5z" />
+    <glyph glyph-name="minus_sign_alt" unicode="&#xf146;" 
+d="M1280 576v128q0 26 -19 45t-45 19h-896q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h896q26 0 45 19t19 45zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5
+t84.5 -203.5z" />
+    <glyph glyph-name="check_minus" unicode="&#xf147;" horiz-adv-x="1408" 
+d="M1152 736v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h832q14 0 23 -9t9 -23zM1280 288v832q0 66 -47 113t-113 47h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113zM1408 1120v-832q0 -119 -84.5 -203.5
+t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="level_up" unicode="&#xf148;" horiz-adv-x="1024" 
+d="M1018 933q-18 -37 -58 -37h-192v-864q0 -14 -9 -23t-23 -9h-704q-21 0 -29 18q-8 20 4 35l160 192q9 11 25 11h320v640h-192q-40 0 -58 37q-17 37 9 68l320 384q18 22 49 22t49 -22l320 -384q27 -32 9 -68z" />
+    <glyph glyph-name="level_down" unicode="&#xf149;" horiz-adv-x="1024" 
+d="M32 1280h704q13 0 22.5 -9.5t9.5 -23.5v-863h192q40 0 58 -37t-9 -69l-320 -384q-18 -22 -49 -22t-49 22l-320 384q-26 31 -9 69q18 37 58 37h192v640h-320q-14 0 -25 11l-160 192q-13 14 -4 34q9 19 29 19z" />
+    <glyph glyph-name="check_sign" unicode="&#xf14a;" 
+d="M685 237l614 614q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-467 -467l-211 211q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l358 -358q19 -19 45 -19t45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5
+t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="edit_sign" unicode="&#xf14b;" 
+d="M404 428l152 -152l-52 -52h-56v96h-96v56zM818 818q14 -13 -3 -30l-291 -291q-17 -17 -30 -3q-14 13 3 30l291 291q17 17 30 3zM544 128l544 544l-288 288l-544 -544v-288h288zM1152 736l92 92q28 28 28 68t-28 68l-152 152q-28 28 -68 28t-68 -28l-92 -92zM1536 1120
+v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="_312" unicode="&#xf14c;" 
+d="M1280 608v480q0 26 -19 45t-45 19h-480q-42 0 -59 -39q-17 -41 14 -70l144 -144l-534 -534q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l534 534l144 -144q18 -19 45 -19q12 0 25 5q39 17 39 59zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960
+q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="share_sign" unicode="&#xf14d;" 
+d="M1005 435l352 352q19 19 19 45t-19 45l-352 352q-30 31 -69 14q-40 -17 -40 -59v-160q-119 0 -216 -19.5t-162.5 -51t-114 -79t-76.5 -95.5t-44.5 -109t-21.5 -111.5t-5 -110.5q0 -181 167 -404q11 -12 25 -12q7 0 13 3q22 9 19 33q-44 354 62 473q46 52 130 75.5
+t224 23.5v-160q0 -42 40 -59q12 -5 24 -5q26 0 45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="compass" unicode="&#xf14e;" 
+d="M640 448l256 128l-256 128v-256zM1024 1039v-542l-512 -256v542zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103
+t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="collapse" unicode="&#xf150;" 
+d="M1145 861q18 -35 -5 -66l-320 -448q-19 -27 -52 -27t-52 27l-320 448q-23 31 -5 66q17 35 57 35h640q40 0 57 -35zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120
+v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="collapse_top" unicode="&#xf151;" 
+d="M1145 419q-17 -35 -57 -35h-640q-40 0 -57 35q-18 35 5 66l320 448q19 27 52 27t52 -27l320 -448q23 -31 5 -66zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120v-960
+q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="_317" unicode="&#xf152;" 
+d="M1088 640q0 -33 -27 -52l-448 -320q-31 -23 -66 -5q-35 17 -35 57v640q0 40 35 57q35 18 66 -5l448 -320q27 -19 27 -52zM1280 160v960q0 14 -9 23t-23 9h-960q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h960q14 0 23 9t9 23zM1536 1120v-960q0 -119 -84.5 -203.5
+t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="eur" unicode="&#xf153;" horiz-adv-x="1024" 
+d="M976 229l35 -159q3 -12 -3 -22.5t-17 -14.5l-5 -1q-4 -2 -10.5 -3.5t-16 -4.5t-21.5 -5.5t-25.5 -5t-30 -5t-33.5 -4.5t-36.5 -3t-38.5 -1q-234 0 -409 130.5t-238 351.5h-95q-13 0 -22.5 9.5t-9.5 22.5v113q0 13 9.5 22.5t22.5 9.5h66q-2 57 1 105h-67q-14 0 -23 9
+t-9 23v114q0 14 9 23t23 9h98q67 210 243.5 338t400.5 128q102 0 194 -23q11 -3 20 -15q6 -11 3 -24l-43 -159q-3 -13 -14 -19.5t-24 -2.5l-4 1q-4 1 -11.5 2.5l-17.5 3.5t-22.5 3.5t-26 3t-29 2.5t-29.5 1q-126 0 -226 -64t-150 -176h468q16 0 25 -12q10 -12 7 -26
+l-24 -114q-5 -26 -32 -26h-488q-3 -37 0 -105h459q15 0 25 -12q9 -12 6 -27l-24 -112q-2 -11 -11 -18.5t-20 -7.5h-387q48 -117 149.5 -185.5t228.5 -68.5q18 0 36 1.5t33.5 3.5t29.5 4.5t24.5 5t18.5 4.5l12 3l5 2q13 5 26 -2q12 -7 15 -21z" />
+    <glyph glyph-name="gbp" unicode="&#xf154;" horiz-adv-x="1024" 
+d="M1020 399v-367q0 -14 -9 -23t-23 -9h-956q-14 0 -23 9t-9 23v150q0 13 9.5 22.5t22.5 9.5h97v383h-95q-14 0 -23 9.5t-9 22.5v131q0 14 9 23t23 9h95v223q0 171 123.5 282t314.5 111q185 0 335 -125q9 -8 10 -20.5t-7 -22.5l-103 -127q-9 -11 -22 -12q-13 -2 -23 7
+q-5 5 -26 19t-69 32t-93 18q-85 0 -137 -47t-52 -123v-215h305q13 0 22.5 -9t9.5 -23v-131q0 -13 -9.5 -22.5t-22.5 -9.5h-305v-379h414v181q0 13 9 22.5t23 9.5h162q14 0 23 -9.5t9 -22.5z" />
+    <glyph glyph-name="usd" unicode="&#xf155;" horiz-adv-x="1024" 
+d="M978 351q0 -153 -99.5 -263.5t-258.5 -136.5v-175q0 -14 -9 -23t-23 -9h-135q-13 0 -22.5 9.5t-9.5 22.5v175q-66 9 -127.5 31t-101.5 44.5t-74 48t-46.5 37.5t-17.5 18q-17 21 -2 41l103 135q7 10 23 12q15 2 24 -9l2 -2q113 -99 243 -125q37 -8 74 -8q81 0 142.5 43
+t61.5 122q0 28 -15 53t-33.5 42t-58.5 37.5t-66 32t-80 32.5q-39 16 -61.5 25t-61.5 26.5t-62.5 31t-56.5 35.5t-53.5 42.5t-43.5 49t-35.5 58t-21 66.5t-8.5 78q0 138 98 242t255 134v180q0 13 9.5 22.5t22.5 9.5h135q14 0 23 -9t9 -23v-176q57 -6 110.5 -23t87 -33.5
+t63.5 -37.5t39 -29t15 -14q17 -18 5 -38l-81 -146q-8 -15 -23 -16q-14 -3 -27 7q-3 3 -14.5 12t-39 26.5t-58.5 32t-74.5 26t-85.5 11.5q-95 0 -155 -43t-60 -111q0 -26 8.5 -48t29.5 -41.5t39.5 -33t56 -31t60.5 -27t70 -27.5q53 -20 81 -31.5t76 -35t75.5 -42.5t62 -50
+t53 -63.5t31.5 -76.5t13 -94z" />
+    <glyph glyph-name="inr" unicode="&#xf156;" horiz-adv-x="898" 
+d="M898 1066v-102q0 -14 -9 -23t-23 -9h-168q-23 -144 -129 -234t-276 -110q167 -178 459 -536q14 -16 4 -34q-8 -18 -29 -18h-195q-16 0 -25 12q-306 367 -498 571q-9 9 -9 22v127q0 13 9.5 22.5t22.5 9.5h112q132 0 212.5 43t102.5 125h-427q-14 0 -23 9t-9 23v102
+q0 14 9 23t23 9h413q-57 113 -268 113h-145q-13 0 -22.5 9.5t-9.5 22.5v133q0 14 9 23t23 9h832q14 0 23 -9t9 -23v-102q0 -14 -9 -23t-23 -9h-233q47 -61 64 -144h171q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="jpy" unicode="&#xf157;" horiz-adv-x="1027" 
+d="M603 0h-172q-13 0 -22.5 9t-9.5 23v330h-288q-13 0 -22.5 9t-9.5 23v103q0 13 9.5 22.5t22.5 9.5h288v85h-288q-13 0 -22.5 9t-9.5 23v104q0 13 9.5 22.5t22.5 9.5h214l-321 578q-8 16 0 32q10 16 28 16h194q19 0 29 -18l215 -425q19 -38 56 -125q10 24 30.5 68t27.5 61
+l191 420q8 19 29 19h191q17 0 27 -16q9 -14 1 -31l-313 -579h215q13 0 22.5 -9.5t9.5 -22.5v-104q0 -14 -9.5 -23t-22.5 -9h-290v-85h290q13 0 22.5 -9.5t9.5 -22.5v-103q0 -14 -9.5 -23t-22.5 -9h-290v-330q0 -13 -9.5 -22.5t-22.5 -9.5z" />
+    <glyph glyph-name="rub" unicode="&#xf158;" horiz-adv-x="1280" 
+d="M1043 971q0 100 -65 162t-171 62h-320v-448h320q106 0 171 62t65 162zM1280 971q0 -193 -126.5 -315t-326.5 -122h-340v-118h505q14 0 23 -9t9 -23v-128q0 -14 -9 -23t-23 -9h-505v-192q0 -14 -9.5 -23t-22.5 -9h-167q-14 0 -23 9t-9 23v192h-224q-14 0 -23 9t-9 23v128
+q0 14 9 23t23 9h224v118h-224q-14 0 -23 9t-9 23v149q0 13 9 22.5t23 9.5h224v629q0 14 9 23t23 9h539q200 0 326.5 -122t126.5 -315z" />
+    <glyph glyph-name="krw" unicode="&#xf159;" horiz-adv-x="1792" 
+d="M514 341l81 299h-159l75 -300q1 -1 1 -3t1 -3q0 1 0.5 3.5t0.5 3.5zM630 768l35 128h-292l32 -128h225zM822 768h139l-35 128h-70zM1271 340l78 300h-162l81 -299q0 -1 0.5 -3.5t1.5 -3.5q0 1 0.5 3t0.5 3zM1382 768l33 128h-297l34 -128h230zM1792 736v-64q0 -14 -9 -23
+t-23 -9h-213l-164 -616q-7 -24 -31 -24h-159q-24 0 -31 24l-166 616h-209l-167 -616q-7 -24 -31 -24h-159q-11 0 -19.5 7t-10.5 17l-160 616h-208q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h175l-33 128h-142q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h109l-89 344q-5 15 5 28
+q10 12 26 12h137q26 0 31 -24l90 -360h359l97 360q7 24 31 24h126q24 0 31 -24l98 -360h365l93 360q5 24 31 24h137q16 0 26 -12q10 -13 5 -28l-91 -344h111q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-145l-34 -128h179q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="btc" unicode="&#xf15a;" horiz-adv-x="1280" 
+d="M1167 896q18 -182 -131 -258q117 -28 175 -103t45 -214q-7 -71 -32.5 -125t-64.5 -89t-97 -58.5t-121.5 -34.5t-145.5 -15v-255h-154v251q-80 0 -122 1v-252h-154v255q-18 0 -54 0.5t-55 0.5h-200l31 183h111q50 0 58 51v402h16q-6 1 -16 1v287q-13 68 -89 68h-111v164
+l212 -1q64 0 97 1v252h154v-247q82 2 122 2v245h154v-252q79 -7 140 -22.5t113 -45t82.5 -78t36.5 -114.5zM952 351q0 36 -15 64t-37 46t-57.5 30.5t-65.5 18.5t-74 9t-69 3t-64.5 -1t-47.5 -1v-338q8 0 37 -0.5t48 -0.5t53 1.5t58.5 4t57 8.5t55.5 14t47.5 21t39.5 30
+t24.5 40t9.5 51zM881 827q0 33 -12.5 58.5t-30.5 42t-48 28t-55 16.5t-61.5 8t-58 2.5t-54 -1t-39.5 -0.5v-307q5 0 34.5 -0.5t46.5 0t50 2t55 5.5t51.5 11t48.5 18.5t37 27t27 38.5t9 51z" />
+    <glyph glyph-name="file" unicode="&#xf15b;" 
+d="M1024 1024v472q22 -14 36 -28l408 -408q14 -14 28 -36h-472zM896 992q0 -40 28 -68t68 -28h544v-1056q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h800v-544z" />
+    <glyph glyph-name="file_text" unicode="&#xf15c;" 
+d="M1468 1060q14 -14 28 -36h-472v472q22 -14 36 -28zM992 896h544v-1056q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h800v-544q0 -40 28 -68t68 -28zM1152 160v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704
+q14 0 23 9t9 23zM1152 416v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM1152 672v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23z" />
+    <glyph glyph-name="sort_by_alphabet" unicode="&#xf15d;" horiz-adv-x="1664" 
+d="M1191 1128h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1572 -23
+v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567v-89l-369 -530q-6 -8 -21 -26l-11 -11v-2l14 2q9 2 30 2h248v119h121zM1661 874v-106h-288v106h75l-47 144h-243l-47 -144h75v-106h-287v106h70l230 662h162
+l230 -662h70z" />
+    <glyph glyph-name="_329" unicode="&#xf15e;" horiz-adv-x="1664" 
+d="M1191 104h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1661 -150
+v-106h-288v106h75l-47 144h-243l-47 -144h75v-106h-287v106h70l230 662h162l230 -662h70zM1572 1001v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567v-89l-369 -530q-6 -8 -21 -26l-11 -10v-3l14 3q9 1 30 1h248
+v119h121z" />
+    <glyph glyph-name="sort_by_attributes" unicode="&#xf160;" horiz-adv-x="1792" 
+d="M736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1792 -32v-192q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h832
+q14 0 23 -9t9 -23zM1600 480v-192q0 -14 -9 -23t-23 -9h-640q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h640q14 0 23 -9t9 -23zM1408 992v-192q0 -14 -9 -23t-23 -9h-448q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h448q14 0 23 -9t9 -23zM1216 1504v-192q0 -14 -9 -23t-23 -9h-256
+q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h256q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="sort_by_attributes_alt" unicode="&#xf161;" horiz-adv-x="1792" 
+d="M1216 -32v-192q0 -14 -9 -23t-23 -9h-256q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h256q14 0 23 -9t9 -23zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192
+q14 0 23 -9t9 -23zM1408 480v-192q0 -14 -9 -23t-23 -9h-448q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h448q14 0 23 -9t9 -23zM1600 992v-192q0 -14 -9 -23t-23 -9h-640q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h640q14 0 23 -9t9 -23zM1792 1504v-192q0 -14 -9 -23t-23 -9h-832
+q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h832q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="sort_by_order" unicode="&#xf162;" 
+d="M1346 223q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23
+zM1486 165q0 -62 -13 -121.5t-41 -114t-68 -95.5t-98.5 -65.5t-127.5 -24.5q-62 0 -108 16q-24 8 -42 15l39 113q15 -7 31 -11q37 -13 75 -13q84 0 134.5 58.5t66.5 145.5h-2q-21 -23 -61.5 -37t-84.5 -14q-106 0 -173 71.5t-67 172.5q0 105 72 178t181 73q123 0 205 -94.5
+t82 -252.5zM1456 882v-114h-469v114h167v432q0 7 0.5 19t0.5 17v16h-2l-7 -12q-8 -13 -26 -31l-62 -58l-82 86l192 185h123v-654h165z" />
+    <glyph glyph-name="sort_by_order_alt" unicode="&#xf163;" 
+d="M1346 1247q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9
+t9 -23zM1456 -142v-114h-469v114h167v432q0 7 0.5 19t0.5 17v16h-2l-7 -12q-8 -13 -26 -31l-62 -58l-82 86l192 185h123v-654h165zM1486 1189q0 -62 -13 -121.5t-41 -114t-68 -95.5t-98.5 -65.5t-127.5 -24.5q-62 0 -108 16q-24 8 -42 15l39 113q15 -7 31 -11q37 -13 75 -13
+q84 0 134.5 58.5t66.5 145.5h-2q-21 -23 -61.5 -37t-84.5 -14q-106 0 -173 71.5t-67 172.5q0 105 72 178t181 73q123 0 205 -94.5t82 -252.5z" />
+    <glyph glyph-name="_334" unicode="&#xf164;" horiz-adv-x="1664" 
+d="M256 192q0 26 -19 45t-45 19q-27 0 -45.5 -19t-18.5 -45q0 -27 18.5 -45.5t45.5 -18.5q26 0 45 18.5t19 45.5zM416 704v-640q0 -26 -19 -45t-45 -19h-288q-26 0 -45 19t-19 45v640q0 26 19 45t45 19h288q26 0 45 -19t19 -45zM1600 704q0 -86 -55 -149q15 -44 15 -76
+q3 -76 -43 -137q17 -56 0 -117q-15 -57 -54 -94q9 -112 -49 -181q-64 -76 -197 -78h-36h-76h-17q-66 0 -144 15.5t-121.5 29t-120.5 39.5q-123 43 -158 44q-26 1 -45 19.5t-19 44.5v641q0 25 18 43.5t43 20.5q24 2 76 59t101 121q68 87 101 120q18 18 31 48t17.5 48.5
+t13.5 60.5q7 39 12.5 61t19.5 52t34 50q19 19 45 19q46 0 82.5 -10.5t60 -26t40 -40.5t24 -45t12 -50t5 -45t0.5 -39q0 -38 -9.5 -76t-19 -60t-27.5 -56q-3 -6 -10 -18t-11 -22t-8 -24h277q78 0 135 -57t57 -135z" />
+    <glyph glyph-name="_335" unicode="&#xf165;" horiz-adv-x="1664" 
+d="M256 960q0 -26 -19 -45t-45 -19q-27 0 -45.5 19t-18.5 45q0 27 18.5 45.5t45.5 18.5q26 0 45 -18.5t19 -45.5zM416 448v640q0 26 -19 45t-45 19h-288q-26 0 -45 -19t-19 -45v-640q0 -26 19 -45t45 -19h288q26 0 45 19t19 45zM1545 597q55 -61 55 -149q-1 -78 -57.5 -135
+t-134.5 -57h-277q4 -14 8 -24t11 -22t10 -18q18 -37 27 -57t19 -58.5t10 -76.5q0 -24 -0.5 -39t-5 -45t-12 -50t-24 -45t-40 -40.5t-60 -26t-82.5 -10.5q-26 0 -45 19q-20 20 -34 50t-19.5 52t-12.5 61q-9 42 -13.5 60.5t-17.5 48.5t-31 48q-33 33 -101 120q-49 64 -101 121
+t-76 59q-25 2 -43 20.5t-18 43.5v641q0 26 19 44.5t45 19.5q35 1 158 44q77 26 120.5 39.5t121.5 29t144 15.5h17h76h36q133 -2 197 -78q58 -69 49 -181q39 -37 54 -94q17 -61 0 -117q46 -61 43 -137q0 -32 -15 -76z" />
+    <glyph glyph-name="youtube_sign" unicode="&#xf166;" 
+d="M919 233v157q0 50 -29 50q-17 0 -33 -16v-224q16 -16 33 -16q29 0 29 49zM1103 355h66v34q0 51 -33 51t-33 -51v-34zM532 621v-70h-80v-423h-74v423h-78v70h232zM733 495v-367h-67v40q-39 -45 -76 -45q-33 0 -42 28q-6 17 -6 54v290h66v-270q0 -24 1 -26q1 -15 15 -15
+q20 0 42 31v280h67zM985 384v-146q0 -52 -7 -73q-12 -42 -53 -42q-35 0 -68 41v-36h-67v493h67v-161q32 40 68 40q41 0 53 -42q7 -21 7 -74zM1236 255v-9q0 -29 -2 -43q-3 -22 -15 -40q-27 -40 -80 -40q-52 0 -81 38q-21 27 -21 86v129q0 59 20 86q29 38 80 38t78 -38
+q21 -29 21 -86v-76h-133v-65q0 -51 34 -51q24 0 30 26q0 1 0.5 7t0.5 16.5v21.5h68zM785 1079v-156q0 -51 -32 -51t-32 51v156q0 52 32 52t32 -52zM1318 366q0 177 -19 260q-10 44 -43 73.5t-76 34.5q-136 15 -412 15q-275 0 -411 -15q-44 -5 -76.5 -34.5t-42.5 -73.5
+q-20 -87 -20 -260q0 -176 20 -260q10 -43 42.5 -73t75.5 -35q137 -15 412 -15t412 15q43 5 75.5 35t42.5 73q20 84 20 260zM563 1017l90 296h-75l-51 -195l-53 195h-78q7 -23 23 -69l24 -69q35 -103 46 -158v-201h74v201zM852 936v130q0 58 -21 87q-29 38 -78 38
+q-51 0 -78 -38q-21 -29 -21 -87v-130q0 -58 21 -87q27 -38 78 -38q49 0 78 38q21 27 21 87zM1033 816h67v370h-67v-283q-22 -31 -42 -31q-15 0 -16 16q-1 2 -1 26v272h-67v-293q0 -37 6 -55q11 -27 43 -27q36 0 77 45v-40zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5
+h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="youtube" unicode="&#xf167;" 
+d="M971 292v-211q0 -67 -39 -67q-23 0 -45 22v301q22 22 45 22q39 0 39 -67zM1309 291v-46h-90v46q0 68 45 68t45 -68zM343 509h107v94h-312v-94h105v-569h100v569zM631 -60h89v494h-89v-378q-30 -42 -57 -42q-18 0 -21 21q-1 3 -1 35v364h-89v-391q0 -49 8 -73
+q12 -37 58 -37q48 0 102 61v-54zM1060 88v197q0 73 -9 99q-17 56 -71 56q-50 0 -93 -54v217h-89v-663h89v48q45 -55 93 -55q54 0 71 55q9 27 9 100zM1398 98v13h-91q0 -51 -2 -61q-7 -36 -40 -36q-46 0 -46 69v87h179v103q0 79 -27 116q-39 51 -106 51q-68 0 -107 -51
+q-28 -37 -28 -116v-173q0 -79 29 -116q39 -51 108 -51q72 0 108 53q18 27 21 54q2 9 2 58zM790 1011v210q0 69 -43 69t-43 -69v-210q0 -70 43 -70t43 70zM1509 260q0 -234 -26 -350q-14 -59 -58 -99t-102 -46q-184 -21 -555 -21t-555 21q-58 6 -102.5 46t-57.5 99
+q-26 112 -26 350q0 234 26 350q14 59 58 99t103 47q183 20 554 20t555 -20q58 -7 102.5 -47t57.5 -99q26 -112 26 -350zM511 1536h102l-121 -399v-271h-100v271q-14 74 -61 212q-37 103 -65 187h106l71 -263zM881 1203v-175q0 -81 -28 -118q-38 -51 -106 -51q-67 0 -105 51
+q-28 38 -28 118v175q0 80 28 117q38 51 105 51q68 0 106 -51q28 -37 28 -117zM1216 1365v-499h-91v55q-53 -62 -103 -62q-46 0 -59 37q-8 24 -8 75v394h91v-367q0 -33 1 -35q3 -22 21 -22q27 0 57 43v381h91z" />
+    <glyph glyph-name="xing" unicode="&#xf168;" horiz-adv-x="1408" 
+d="M597 869q-10 -18 -257 -456q-27 -46 -65 -46h-239q-21 0 -31 17t0 36l253 448q1 0 0 1l-161 279q-12 22 -1 37q9 15 32 15h239q40 0 66 -45zM1403 1511q11 -16 0 -37l-528 -934v-1l336 -615q11 -20 1 -37q-10 -15 -32 -15h-239q-42 0 -66 45l-339 622q18 32 531 942
+q25 45 64 45h241q22 0 31 -15z" />
+    <glyph glyph-name="xing_sign" unicode="&#xf169;" 
+d="M685 771q0 1 -126 222q-21 34 -52 34h-184q-18 0 -26 -11q-7 -12 1 -29l125 -216v-1l-196 -346q-9 -14 0 -28q8 -13 24 -13h185q31 0 50 36zM1309 1268q-7 12 -24 12h-187q-30 0 -49 -35l-411 -729q1 -2 262 -481q20 -35 52 -35h184q18 0 25 12q8 13 -1 28l-260 476v1
+l409 723q8 16 0 28zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="youtube_play" unicode="&#xf16a;" horiz-adv-x="1792" 
+d="M711 408l484 250l-484 253v-503zM896 1270q168 0 324.5 -4.5t229.5 -9.5l73 -4q1 0 17 -1.5t23 -3t23.5 -4.5t28.5 -8t28 -13t31 -19.5t29 -26.5q6 -6 15.5 -18.5t29 -58.5t26.5 -101q8 -64 12.5 -136.5t5.5 -113.5v-40v-136q1 -145 -18 -290q-7 -55 -25 -99.5t-32 -61.5
+l-14 -17q-14 -15 -29 -26.5t-31 -19t-28 -12.5t-28.5 -8t-24 -4.5t-23 -3t-16.5 -1.5q-251 -19 -627 -19q-207 2 -359.5 6.5t-200.5 7.5l-49 4l-36 4q-36 5 -54.5 10t-51 21t-56.5 41q-6 6 -15.5 18.5t-29 58.5t-26.5 101q-8 64 -12.5 136.5t-5.5 113.5v40v136
+q-1 145 18 290q7 55 25 99.5t32 61.5l14 17q14 15 29 26.5t31 19.5t28 13t28.5 8t23.5 4.5t23 3t17 1.5q251 18 627 18z" />
+    <glyph glyph-name="dropbox" unicode="&#xf16b;" horiz-adv-x="1792" 
+d="M402 829l494 -305l-342 -285l-490 319zM1388 274v-108l-490 -293v-1l-1 1l-1 -1v1l-489 293v108l147 -96l342 284v2l1 -1l1 1v-2l343 -284zM554 1418l342 -285l-494 -304l-338 270zM1390 829l338 -271l-489 -319l-343 285zM1239 1418l489 -319l-338 -270l-494 304z" />
+    <glyph glyph-name="stackexchange" unicode="&#xf16c;" 
+d="M1289 -96h-1118v480h-160v-640h1438v640h-160v-480zM347 428l33 157l783 -165l-33 -156zM450 802l67 146l725 -339l-67 -145zM651 1158l102 123l614 -513l-102 -123zM1048 1536l477 -641l-128 -96l-477 641zM330 65v159h800v-159h-800z" />
+    <glyph glyph-name="instagram" unicode="&#xf16d;" 
+d="M1024 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1162 640q0 -164 -115 -279t-279 -115t-279 115t-115 279t115 279t279 115t279 -115t115 -279zM1270 1050q0 -38 -27 -65t-65 -27t-65 27t-27 65t27 65t65 27t65 -27t27 -65zM768 1270
+q-7 0 -76.5 0.5t-105.5 0t-96.5 -3t-103 -10t-71.5 -18.5q-50 -20 -88 -58t-58 -88q-11 -29 -18.5 -71.5t-10 -103t-3 -96.5t0 -105.5t0.5 -76.5t-0.5 -76.5t0 -105.5t3 -96.5t10 -103t18.5 -71.5q20 -50 58 -88t88 -58q29 -11 71.5 -18.5t103 -10t96.5 -3t105.5 0t76.5 0.5
+t76.5 -0.5t105.5 0t96.5 3t103 10t71.5 18.5q50 20 88 58t58 88q11 29 18.5 71.5t10 103t3 96.5t0 105.5t-0.5 76.5t0.5 76.5t0 105.5t-3 96.5t-10 103t-18.5 71.5q-20 50 -58 88t-88 58q-29 11 -71.5 18.5t-103 10t-96.5 3t-105.5 0t-76.5 -0.5zM1536 640q0 -229 -5 -317
+q-10 -208 -124 -322t-322 -124q-88 -5 -317 -5t-317 5q-208 10 -322 124t-124 322q-5 88 -5 317t5 317q10 208 124 322t322 124q88 5 317 5t317 -5q208 -10 322 -124t124 -322q5 -88 5 -317z" />
+    <glyph glyph-name="flickr" unicode="&#xf16e;" 
+d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM698 640q0 88 -62 150t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150zM1262 640q0 88 -62 150
+t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150z" />
+    <glyph glyph-name="adn" unicode="&#xf170;" 
+d="M768 914l201 -306h-402zM1133 384h94l-459 691l-459 -691h94l104 160h522zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="f171" unicode="&#xf171;" horiz-adv-x="1408" 
+d="M815 677q8 -63 -50.5 -101t-111.5 -6q-39 17 -53.5 58t-0.5 82t52 58q36 18 72.5 12t64 -35.5t27.5 -67.5zM926 698q-14 107 -113 164t-197 13q-63 -28 -100.5 -88.5t-34.5 -129.5q4 -91 77.5 -155t165.5 -56q91 8 152 84t50 168zM1165 1240q-20 27 -56 44.5t-58 22
+t-71 12.5q-291 47 -566 -2q-43 -7 -66 -12t-55 -22t-50 -43q30 -28 76 -45.5t73.5 -22t87.5 -11.5q228 -29 448 -1q63 8 89.5 12t72.5 21.5t75 46.5zM1222 205q-8 -26 -15.5 -76.5t-14 -84t-28.5 -70t-58 -56.5q-86 -48 -189.5 -71.5t-202 -22t-201.5 18.5q-46 8 -81.5 18
+t-76.5 27t-73 43.5t-52 61.5q-25 96 -57 292l6 16l18 9q223 -148 506.5 -148t507.5 148q21 -6 24 -23t-5 -45t-8 -37zM1403 1166q-26 -167 -111 -655q-5 -30 -27 -56t-43.5 -40t-54.5 -31q-252 -126 -610 -88q-248 27 -394 139q-15 12 -25.5 26.5t-17 35t-9 34t-6 39.5
+t-5.5 35q-9 50 -26.5 150t-28 161.5t-23.5 147.5t-22 158q3 26 17.5 48.5t31.5 37.5t45 30t46 22.5t48 18.5q125 46 313 64q379 37 676 -50q155 -46 215 -122q16 -20 16.5 -51t-5.5 -54z" />
+    <glyph glyph-name="bitbucket_sign" unicode="&#xf172;" 
+d="M848 666q0 43 -41 66t-77 1q-43 -20 -42.5 -72.5t43.5 -70.5q39 -23 81 4t36 72zM928 682q8 -66 -36 -121t-110 -61t-119 40t-56 113q-2 49 25.5 93t72.5 64q70 31 141.5 -10t81.5 -118zM1100 1073q-20 -21 -53.5 -34t-53 -16t-63.5 -8q-155 -20 -324 0q-44 6 -63 9.5
+t-52.5 16t-54.5 32.5q13 19 36 31t40 15.5t47 8.5q198 35 408 1q33 -5 51 -8.5t43 -16t39 -31.5zM1142 327q0 7 5.5 26.5t3 32t-17.5 16.5q-161 -106 -365 -106t-366 106l-12 -6l-5 -12q26 -154 41 -210q47 -81 204 -108q249 -46 428 53q34 19 49 51.5t22.5 85.5t12.5 71z
+M1272 1020q9 53 -8 75q-43 55 -155 88q-216 63 -487 36q-132 -12 -226 -46q-38 -15 -59.5 -25t-47 -34t-29.5 -54q8 -68 19 -138t29 -171t24 -137q1 -5 5 -31t7 -36t12 -27t22 -28q105 -80 284 -100q259 -28 440 63q24 13 39.5 23t31 29t19.5 40q48 267 80 473zM1536 1120
+v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="tumblr" unicode="&#xf173;" horiz-adv-x="1024" 
+d="M944 207l80 -237q-23 -35 -111 -66t-177 -32q-104 -2 -190.5 26t-142.5 74t-95 106t-55.5 120t-16.5 118v544h-168v215q72 26 129 69.5t91 90t58 102t34 99t15 88.5q1 5 4.5 8.5t7.5 3.5h244v-424h333v-252h-334v-518q0 -30 6.5 -56t22.5 -52.5t49.5 -41.5t81.5 -14
+q78 2 134 29z" />
+    <glyph glyph-name="tumblr_sign" unicode="&#xf174;" 
+d="M1136 75l-62 183q-44 -22 -103 -22q-36 -1 -62 10.5t-38.5 31.5t-17.5 40.5t-5 43.5v398h257v194h-256v326h-188q-8 0 -9 -10q-5 -44 -17.5 -87t-39 -95t-77 -95t-118.5 -68v-165h130v-418q0 -57 21.5 -115t65 -111t121 -85.5t176.5 -30.5q69 1 136.5 25t85.5 50z
+M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="long_arrow_down" unicode="&#xf175;" horiz-adv-x="768" 
+d="M765 237q8 -19 -5 -35l-350 -384q-10 -10 -23 -10q-14 0 -24 10l-355 384q-13 16 -5 35q9 19 29 19h224v1248q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1248h224q21 0 29 -19z" />
+    <glyph glyph-name="long_arrow_up" unicode="&#xf176;" horiz-adv-x="768" 
+d="M765 1043q-9 -19 -29 -19h-224v-1248q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1248h-224q-21 0 -29 19t5 35l350 384q10 10 23 10q14 0 24 -10l355 -384q13 -16 5 -35z" />
+    <glyph glyph-name="long_arrow_left" unicode="&#xf177;" horiz-adv-x="1792" 
+d="M1792 736v-192q0 -14 -9 -23t-23 -9h-1248v-224q0 -21 -19 -29t-35 5l-384 350q-10 10 -10 23q0 14 10 24l384 354q16 14 35 6q19 -9 19 -29v-224h1248q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="long_arrow_right" unicode="&#xf178;" horiz-adv-x="1792" 
+d="M1728 643q0 -14 -10 -24l-384 -354q-16 -14 -35 -6q-19 9 -19 29v224h-1248q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h1248v224q0 21 19 29t35 -5l384 -350q10 -10 10 -23z" />
+    <glyph glyph-name="apple" unicode="&#xf179;" horiz-adv-x="1408" 
+d="M1393 321q-39 -125 -123 -250q-129 -196 -257 -196q-49 0 -140 32q-86 32 -151 32q-61 0 -142 -33q-81 -34 -132 -34q-152 0 -301 259q-147 261 -147 503q0 228 113 374q113 144 284 144q72 0 177 -30q104 -30 138 -30q45 0 143 34q102 34 173 34q119 0 213 -65
+q52 -36 104 -100q-79 -67 -114 -118q-65 -94 -65 -207q0 -124 69 -223t158 -126zM1017 1494q0 -61 -29 -136q-30 -75 -93 -138q-54 -54 -108 -72q-37 -11 -104 -17q3 149 78 257q74 107 250 148q1 -3 2.5 -11t2.5 -11q0 -4 0.5 -10t0.5 -10z" />
+    <glyph glyph-name="windows" unicode="&#xf17a;" horiz-adv-x="1664" 
+d="M682 530v-651l-682 94v557h682zM682 1273v-659h-682v565zM1664 530v-786l-907 125v661h907zM1664 1408v-794h-907v669z" />
+    <glyph glyph-name="android" unicode="&#xf17b;" horiz-adv-x="1408" 
+d="M493 1053q16 0 27.5 11.5t11.5 27.5t-11.5 27.5t-27.5 11.5t-27 -11.5t-11 -27.5t11 -27.5t27 -11.5zM915 1053q16 0 27 11.5t11 27.5t-11 27.5t-27 11.5t-27.5 -11.5t-11.5 -27.5t11.5 -27.5t27.5 -11.5zM103 869q42 0 72 -30t30 -72v-430q0 -43 -29.5 -73t-72.5 -30
+t-73 30t-30 73v430q0 42 30 72t73 30zM1163 850v-666q0 -46 -32 -78t-77 -32h-75v-227q0 -43 -30 -73t-73 -30t-73 30t-30 73v227h-138v-227q0 -43 -30 -73t-73 -30q-42 0 -72 30t-30 73l-1 227h-74q-46 0 -78 32t-32 78v666h918zM931 1255q107 -55 171 -153.5t64 -215.5
+h-925q0 117 64 215.5t172 153.5l-71 131q-7 13 5 20q13 6 20 -6l72 -132q95 42 201 42t201 -42l72 132q7 12 20 6q12 -7 5 -20zM1408 767v-430q0 -43 -30 -73t-73 -30q-42 0 -72 30t-30 73v430q0 43 30 72.5t72 29.5q43 0 73 -29.5t30 -72.5z" />
+    <glyph glyph-name="linux" unicode="&#xf17c;" 
+d="M663 1125q-11 -1 -15.5 -10.5t-8.5 -9.5q-5 -1 -5 5q0 12 19 15h10zM750 1111q-4 -1 -11.5 6.5t-17.5 4.5q24 11 32 -2q3 -6 -3 -9zM399 684q-4 1 -6 -3t-4.5 -12.5t-5.5 -13.5t-10 -13q-10 -11 -1 -12q4 -1 12.5 7t12.5 18q1 3 2 7t2 6t1.5 4.5t0.5 4v3t-1 2.5t-3 2z
+M1254 325q0 18 -55 42q4 15 7.5 27.5t5 26t3 21.5t0.5 22.5t-1 19.5t-3.5 22t-4 20.5t-5 25t-5.5 26.5q-10 48 -47 103t-72 75q24 -20 57 -83q87 -162 54 -278q-11 -40 -50 -42q-31 -4 -38.5 18.5t-8 83.5t-11.5 107q-9 39 -19.5 69t-19.5 45.5t-15.5 24.5t-13 15t-7.5 7
+q-14 62 -31 103t-29.5 56t-23.5 33t-15 40q-4 21 6 53.5t4.5 49.5t-44.5 25q-15 3 -44.5 18t-35.5 16q-8 1 -11 26t8 51t36 27q37 3 51 -30t4 -58q-11 -19 -2 -26.5t30 -0.5q13 4 13 36v37q-5 30 -13.5 50t-21 30.5t-23.5 15t-27 7.5q-107 -8 -89 -134q0 -15 -1 -15
+q-9 9 -29.5 10.5t-33 -0.5t-15.5 5q1 57 -16 90t-45 34q-27 1 -41.5 -27.5t-16.5 -59.5q-1 -15 3.5 -37t13 -37.5t15.5 -13.5q10 3 16 14q4 9 -7 8q-7 0 -15.5 14.5t-9.5 33.5q-1 22 9 37t34 14q17 0 27 -21t9.5 -39t-1.5 -22q-22 -15 -31 -29q-8 -12 -27.5 -23.5
+t-20.5 -12.5q-13 -14 -15.5 -27t7.5 -18q14 -8 25 -19.5t16 -19t18.5 -13t35.5 -6.5q47 -2 102 15q2 1 23 7t34.5 10.5t29.5 13t21 17.5q9 14 20 8q5 -3 6.5 -8.5t-3 -12t-16.5 -9.5q-20 -6 -56.5 -21.5t-45.5 -19.5q-44 -19 -70 -23q-25 -5 -79 2q-10 2 -9 -2t17 -19
+q25 -23 67 -22q17 1 36 7t36 14t33.5 17.5t30 17t24.5 12t17.5 2.5t8.5 -11q0 -2 -1 -4.5t-4 -5t-6 -4.5t-8.5 -5t-9 -4.5t-10 -5t-9.5 -4.5q-28 -14 -67.5 -44t-66.5 -43t-49 -1q-21 11 -63 73q-22 31 -25 22q-1 -3 -1 -10q0 -25 -15 -56.5t-29.5 -55.5t-21 -58t11.5 -63
+q-23 -6 -62.5 -90t-47.5 -141q-2 -18 -1.5 -69t-5.5 -59q-8 -24 -29 -3q-32 31 -36 94q-2 28 4 56q4 19 -1 18q-2 -1 -4 -5q-36 -65 10 -166q5 -12 25 -28t24 -20q20 -23 104 -90.5t93 -76.5q16 -15 17.5 -38t-14 -43t-45.5 -23q8 -15 29 -44.5t28 -54t7 -70.5q46 24 7 92
+q-4 8 -10.5 16t-9.5 12t-2 6q3 5 13 9.5t20 -2.5q46 -52 166 -36q133 15 177 87q23 38 34 30q12 -6 10 -52q-1 -25 -23 -92q-9 -23 -6 -37.5t24 -15.5q3 19 14.5 77t13.5 90q2 21 -6.5 73.5t-7.5 97t23 70.5q15 18 51 18q1 37 34.5 53t72.5 10.5t60 -22.5zM626 1152
+q3 17 -2.5 30t-11.5 15q-9 2 -9 -7q2 -5 5 -6q10 0 7 -15q-3 -20 8 -20q3 0 3 3zM1045 955q-2 8 -6.5 11.5t-13 5t-14.5 5.5q-5 3 -9.5 8t-7 8t-5.5 6.5t-4 4t-4 -1.5q-14 -16 7 -43.5t39 -31.5q9 -1 14.5 8t3.5 20zM867 1168q0 11 -5 19.5t-11 12.5t-9 3q-6 0 -8 -2t0 -4
+t5 -3q14 -4 18 -31q0 -3 8 2q2 2 2 3zM921 1401q0 2 -2.5 5t-9 7t-9.5 6q-15 15 -24 15q-9 -1 -11.5 -7.5t-1 -13t-0.5 -12.5q-1 -4 -6 -10.5t-6 -9t3 -8.5q4 -3 8 0t11 9t15 9q1 1 9 1t15 2t9 7zM1486 60q20 -12 31 -24.5t12 -24t-2.5 -22.5t-15.5 -22t-23.5 -19.5
+t-30 -18.5t-31.5 -16.5t-32 -15.5t-27 -13q-38 -19 -85.5 -56t-75.5 -64q-17 -16 -68 -19.5t-89 14.5q-18 9 -29.5 23.5t-16.5 25.5t-22 19.5t-47 9.5q-44 1 -130 1q-19 0 -57 -1.5t-58 -2.5q-44 -1 -79.5 -15t-53.5 -30t-43.5 -28.5t-53.5 -11.5q-29 1 -111 31t-146 43
+q-19 4 -51 9.5t-50 9t-39.5 9.5t-33.5 14.5t-17 19.5q-10 23 7 66.5t18 54.5q1 16 -4 40t-10 42.5t-4.5 36.5t10.5 27q14 12 57 14t60 12q30 18 42 35t12 51q21 -73 -32 -106q-32 -20 -83 -15q-34 3 -43 -10q-13 -15 5 -57q2 -6 8 -18t8.5 -18t4.5 -17t1 -22q0 -15 -17 -49
+t-14 -48q3 -17 37 -26q20 -6 84.5 -18.5t99.5 -20.5q24 -6 74 -22t82.5 -23t55.5 -4q43 6 64.5 28t23 48t-7.5 58.5t-19 52t-20 36.5q-121 190 -169 242q-68 74 -113 40q-11 -9 -15 15q-3 16 -2 38q1 29 10 52t24 47t22 42q8 21 26.5 72t29.5 78t30 61t39 54
+q110 143 124 195q-12 112 -16 310q-2 90 24 151.5t106 104.5q39 21 104 21q53 1 106 -13.5t89 -41.5q57 -42 91.5 -121.5t29.5 -147.5q-5 -95 30 -214q34 -113 133 -218q55 -59 99.5 -163t59.5 -191q8 -49 5 -84.5t-12 -55.5t-20 -22q-10 -2 -23.5 -19t-27 -35.5
+t-40.5 -33.5t-61 -14q-18 1 -31.5 5t-22.5 13.5t-13.5 15.5t-11.5 20.5t-9 19.5q-22 37 -41 30t-28 -49t7 -97q20 -70 1 -195q-10 -65 18 -100.5t73 -33t85 35.5q59 49 89.5 66.5t103.5 42.5q53 18 77 36.5t18.5 34.5t-25 28.5t-51.5 23.5q-33 11 -49.5 48t-15 72.5
+t15.5 47.5q1 -31 8 -56.5t14.5 -40.5t20.5 -28.5t21 -19t21.5 -13t16.5 -9.5z" />
+    <glyph glyph-name="dribble" unicode="&#xf17d;" 
+d="M1024 36q-42 241 -140 498h-2l-2 -1q-16 -6 -43 -16.5t-101 -49t-137 -82t-131 -114.5t-103 -148l-15 11q184 -150 418 -150q132 0 256 52zM839 643q-21 49 -53 111q-311 -93 -673 -93q-1 -7 -1 -21q0 -124 44 -236.5t124 -201.5q50 89 123.5 166.5t142.5 124.5t130.5 81
+t99.5 48l37 13q4 1 13 3.5t13 4.5zM732 855q-120 213 -244 378q-138 -65 -234 -186t-128 -272q302 0 606 80zM1416 536q-210 60 -409 29q87 -239 128 -469q111 75 185 189.5t96 250.5zM611 1277q-1 0 -2 -1q1 1 2 1zM1201 1132q-185 164 -433 164q-76 0 -155 -19
+q131 -170 246 -382q69 26 130 60.5t96.5 61.5t65.5 57t37.5 40.5zM1424 647q-3 232 -149 410l-1 -1q-9 -12 -19 -24.5t-43.5 -44.5t-71 -60.5t-100 -65t-131.5 -64.5q25 -53 44 -95q2 -5 6.5 -17t7.5 -17q36 5 74.5 7t73.5 2t69 -1.5t64 -4t56.5 -5.5t48 -6.5t36.5 -6
+t25 -4.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="skype" unicode="&#xf17e;" 
+d="M1173 473q0 50 -19.5 91.5t-48.5 68.5t-73 49t-82.5 34t-87.5 23l-104 24q-30 7 -44 10.5t-35 11.5t-30 16t-16.5 21t-7.5 30q0 77 144 77q43 0 77 -12t54 -28.5t38 -33.5t40 -29t48 -12q47 0 75.5 32t28.5 77q0 55 -56 99.5t-142 67.5t-182 23q-68 0 -132 -15.5
+t-119.5 -47t-89 -87t-33.5 -128.5q0 -61 19 -106.5t56 -75.5t80 -48.5t103 -32.5l146 -36q90 -22 112 -36q32 -20 32 -60q0 -39 -40 -64.5t-105 -25.5q-51 0 -91.5 16t-65 38.5t-45.5 45t-46 38.5t-54 16q-50 0 -75.5 -30t-25.5 -75q0 -92 122 -157.5t291 -65.5
+q73 0 140 18.5t122.5 53.5t88.5 93.5t33 131.5zM1536 256q0 -159 -112.5 -271.5t-271.5 -112.5q-130 0 -234 80q-77 -16 -150 -16q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5q0 73 16 150q-80 104 -80 234q0 159 112.5 271.5t271.5 112.5q130 0 234 -80
+q77 16 150 16q143 0 273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -73 -16 -150q80 -104 80 -234z" />
+    <glyph glyph-name="foursquare" unicode="&#xf180;" horiz-adv-x="1280" 
+d="M1000 1102l37 194q5 23 -9 40t-35 17h-712q-23 0 -38.5 -17t-15.5 -37v-1101q0 -7 6 -1l291 352q23 26 38 33.5t48 7.5h239q22 0 37 14.5t18 29.5q24 130 37 191q4 21 -11.5 40t-36.5 19h-294q-29 0 -48 19t-19 48v42q0 29 19 47.5t48 18.5h346q18 0 35 13.5t20 29.5z
+M1227 1324q-15 -73 -53.5 -266.5t-69.5 -350t-35 -173.5q-6 -22 -9 -32.5t-14 -32.5t-24.5 -33t-38.5 -21t-58 -10h-271q-13 0 -22 -10q-8 -9 -426 -494q-22 -25 -58.5 -28.5t-48.5 5.5q-55 22 -55 98v1410q0 55 38 102.5t120 47.5h888q95 0 127 -53t10 -159zM1227 1324
+l-158 -790q4 17 35 173.5t69.5 350t53.5 266.5z" />
+    <glyph glyph-name="trello" unicode="&#xf181;" 
+d="M704 192v1024q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-1024q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1376 576v640q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-640q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408
+q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="female" unicode="&#xf182;" horiz-adv-x="1280" 
+d="M1280 480q0 -40 -28 -68t-68 -28q-51 0 -80 43l-227 341h-45v-132l247 -411q9 -15 9 -33q0 -26 -19 -45t-45 -19h-192v-272q0 -46 -33 -79t-79 -33h-160q-46 0 -79 33t-33 79v272h-192q-26 0 -45 19t-19 45q0 18 9 33l247 411v132h-45l-227 -341q-29 -43 -80 -43
+q-40 0 -68 28t-28 68q0 29 16 53l256 384q73 107 176 107h384q103 0 176 -107l256 -384q16 -24 16 -53zM864 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
+    <glyph glyph-name="male" unicode="&#xf183;" horiz-adv-x="1024" 
+d="M1024 832v-416q0 -40 -28 -68t-68 -28t-68 28t-28 68v352h-64v-912q0 -46 -33 -79t-79 -33t-79 33t-33 79v464h-64v-464q0 -46 -33 -79t-79 -33t-79 33t-33 79v912h-64v-352q0 -40 -28 -68t-68 -28t-68 28t-28 68v416q0 80 56 136t136 56h640q80 0 136 -56t56 -136z
+M736 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
+    <glyph glyph-name="gittip" unicode="&#xf184;" 
+d="M773 234l350 473q16 22 24.5 59t-6 85t-61.5 79q-40 26 -83 25.5t-73.5 -17.5t-54.5 -45q-36 -40 -96 -40q-59 0 -95 40q-24 28 -54.5 45t-73.5 17.5t-84 -25.5q-46 -31 -60.5 -79t-6 -85t24.5 -59zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103
+t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="sun" unicode="&#xf185;" horiz-adv-x="1792" 
+d="M1472 640q0 117 -45.5 223.5t-123 184t-184 123t-223.5 45.5t-223.5 -45.5t-184 -123t-123 -184t-45.5 -223.5t45.5 -223.5t123 -184t184 -123t223.5 -45.5t223.5 45.5t184 123t123 184t45.5 223.5zM1748 363q-4 -15 -20 -20l-292 -96v-306q0 -16 -13 -26q-15 -10 -29 -4
+l-292 94l-180 -248q-10 -13 -26 -13t-26 13l-180 248l-292 -94q-14 -6 -29 4q-13 10 -13 26v306l-292 96q-16 5 -20 20q-5 17 4 29l180 248l-180 248q-9 13 -4 29q4 15 20 20l292 96v306q0 16 13 26q15 10 29 4l292 -94l180 248q9 12 26 12t26 -12l180 -248l292 94
+q14 6 29 -4q13 -10 13 -26v-306l292 -96q16 -5 20 -20q5 -16 -4 -29l-180 -248l180 -248q9 -12 4 -29z" />
+    <glyph glyph-name="_366" unicode="&#xf186;" 
+d="M1262 233q-54 -9 -110 -9q-182 0 -337 90t-245 245t-90 337q0 192 104 357q-201 -60 -328.5 -229t-127.5 -384q0 -130 51 -248.5t136.5 -204t204 -136.5t248.5 -51q144 0 273.5 61.5t220.5 171.5zM1465 318q-94 -203 -283.5 -324.5t-413.5 -121.5q-156 0 -298 61
+t-245 164t-164 245t-61 298q0 153 57.5 292.5t156 241.5t235.5 164.5t290 68.5q44 2 61 -39q18 -41 -15 -72q-86 -78 -131.5 -181.5t-45.5 -218.5q0 -148 73 -273t198 -198t273 -73q118 0 228 51q41 18 72 -13q14 -14 17.5 -34t-4.5 -38z" />
+    <glyph glyph-name="archive" unicode="&#xf187;" horiz-adv-x="1792" 
+d="M1088 704q0 26 -19 45t-45 19h-256q-26 0 -45 -19t-19 -45t19 -45t45 -19h256q26 0 45 19t19 45zM1664 896v-960q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v960q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1728 1344v-256q0 -26 -19 -45t-45 -19h-1536
+q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1536q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="bug" unicode="&#xf188;" horiz-adv-x="1664" 
+d="M1632 576q0 -26 -19 -45t-45 -19h-224q0 -171 -67 -290l208 -209q19 -19 19 -45t-19 -45q-18 -19 -45 -19t-45 19l-198 197q-5 -5 -15 -13t-42 -28.5t-65 -36.5t-82 -29t-97 -13v896h-128v-896q-51 0 -101.5 13.5t-87 33t-66 39t-43.5 32.5l-15 14l-183 -207
+q-20 -21 -48 -21q-24 0 -43 16q-19 18 -20.5 44.5t15.5 46.5l202 227q-58 114 -58 274h-224q-26 0 -45 19t-19 45t19 45t45 19h224v294l-173 173q-19 19 -19 45t19 45t45 19t45 -19l173 -173h844l173 173q19 19 45 19t45 -19t19 -45t-19 -45l-173 -173v-294h224q26 0 45 -19
+t19 -45zM1152 1152h-640q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5z" />
+    <glyph glyph-name="vk" unicode="&#xf189;" horiz-adv-x="1920" 
+d="M1917 1016q23 -64 -150 -294q-24 -32 -65 -85q-40 -51 -55 -72t-30.5 -49.5t-12 -42t13 -34.5t32.5 -43t57 -53q4 -2 5 -4q141 -131 191 -221q3 -5 6.5 -12.5t7 -26.5t-0.5 -34t-25 -27.5t-59 -12.5l-256 -4q-24 -5 -56 5t-52 22l-20 12q-30 21 -70 64t-68.5 77.5t-61 58
+t-56.5 15.5q-3 -1 -8 -3.5t-17 -14.5t-21.5 -29.5t-17 -52t-6.5 -77.5q0 -15 -3.5 -27.5t-7.5 -18.5l-4 -5q-18 -19 -53 -22h-115q-71 -4 -146 16.5t-131.5 53t-103 66t-70.5 57.5l-25 24q-10 10 -27.5 30t-71.5 91t-106 151t-122.5 211t-130.5 272q-6 16 -6 27t3 16l4 6
+q15 19 57 19l274 2q12 -2 23 -6.5t16 -8.5l5 -3q16 -11 24 -32q20 -50 46 -103.5t41 -81.5l16 -29q29 -60 56 -104t48.5 -68.5t41.5 -38.5t34 -14t27 5q2 1 5 5t12 22t13.5 47t9.5 81t0 125q-2 40 -9 73t-14 46l-6 12q-25 34 -85 43q-13 2 5 24q16 19 38 30q53 26 239 24
+q82 -1 135 -13q20 -5 33.5 -13.5t20.5 -24t10.5 -32t3.5 -45.5t-1 -55t-2.5 -70.5t-1.5 -82.5q0 -11 -1 -42t-0.5 -48t3.5 -40.5t11.5 -39t22.5 -24.5q8 -2 17 -4t26 11t38 34.5t52 67t68 107.5q60 104 107 225q4 10 10 17.5t11 10.5l4 3l5 2.5t13 3t20 0.5l288 2
+q39 5 64 -2.5t31 -16.5z" />
+    <glyph glyph-name="weibo" unicode="&#xf18a;" horiz-adv-x="1792" 
+d="M675 252q21 34 11 69t-45 50q-34 14 -73 1t-60 -46q-22 -34 -13 -68.5t43 -50.5t74.5 -2.5t62.5 47.5zM769 373q8 13 3.5 26.5t-17.5 18.5q-14 5 -28.5 -0.5t-21.5 -18.5q-17 -31 13 -45q14 -5 29 0.5t22 18.5zM943 266q-45 -102 -158 -150t-224 -12
+q-107 34 -147.5 126.5t6.5 187.5q47 93 151.5 139t210.5 19q111 -29 158.5 -119.5t2.5 -190.5zM1255 426q-9 96 -89 170t-208.5 109t-274.5 21q-223 -23 -369.5 -141.5t-132.5 -264.5q9 -96 89 -170t208.5 -109t274.5 -21q223 23 369.5 141.5t132.5 264.5zM1563 422
+q0 -68 -37 -139.5t-109 -137t-168.5 -117.5t-226 -83t-270.5 -31t-275 33.5t-240.5 93t-171.5 151t-65 199.5q0 115 69.5 245t197.5 258q169 169 341.5 236t246.5 -7q65 -64 20 -209q-4 -14 -1 -20t10 -7t14.5 0.5t13.5 3.5l6 2q139 59 246 59t153 -61q45 -63 0 -178
+q-2 -13 -4.5 -20t4.5 -12.5t12 -7.5t17 -6q57 -18 103 -47t80 -81.5t34 -116.5zM1489 1046q42 -47 54.5 -108.5t-6.5 -117.5q-8 -23 -29.5 -34t-44.5 -4q-23 8 -34 29.5t-4 44.5q20 63 -24 111t-107 35q-24 -5 -45 8t-25 37q-5 24 8 44.5t37 25.5q60 13 119 -5.5t101 -65.5z
+M1670 1209q87 -96 112.5 -222.5t-13.5 -241.5q-9 -27 -34 -40t-52 -4t-40 34t-5 52q28 82 10 172t-80 158q-62 69 -148 95.5t-173 8.5q-28 -6 -52 9.5t-30 43.5t9.5 51.5t43.5 29.5q123 26 244 -11.5t208 -134.5z" />
+    <glyph glyph-name="renren" unicode="&#xf18b;" 
+d="M1133 -34q-171 -94 -368 -94q-196 0 -367 94q138 87 235.5 211t131.5 268q35 -144 132.5 -268t235.5 -211zM638 1394v-485q0 -252 -126.5 -459.5t-330.5 -306.5q-181 215 -181 495q0 187 83.5 349.5t229.5 269.5t325 137zM1536 638q0 -280 -181 -495
+q-204 99 -330.5 306.5t-126.5 459.5v485q179 -30 325 -137t229.5 -269.5t83.5 -349.5z" />
+    <glyph glyph-name="_372" unicode="&#xf18c;" horiz-adv-x="1408" 
+d="M1402 433q-32 -80 -76 -138t-91 -88.5t-99 -46.5t-101.5 -14.5t-96.5 8.5t-86.5 22t-69.5 27.5t-46 22.5l-17 10q-113 -228 -289.5 -359.5t-384.5 -132.5q-19 0 -32 13t-13 32t13 31.5t32 12.5q173 1 322.5 107.5t251.5 294.5q-36 -14 -72 -23t-83 -13t-91 2.5t-93 28.5
+t-92 59t-84.5 100t-74.5 146q114 47 214 57t167.5 -7.5t124.5 -56.5t88.5 -77t56.5 -82q53 131 79 291q-7 -1 -18 -2.5t-46.5 -2.5t-69.5 0.5t-81.5 10t-88.5 23t-84 42.5t-75 65t-54.5 94.5t-28.5 127.5q70 28 133.5 36.5t112.5 -1t92 -30t73.5 -50t56 -61t42 -63t27.5 -56
+t16 -39.5l4 -16q12 122 12 195q-8 6 -21.5 16t-49 44.5t-63.5 71.5t-54 93t-33 112.5t12 127t70 138.5q73 -25 127.5 -61.5t84.5 -76.5t48 -85t20.5 -89t-0.5 -85.5t-13 -76.5t-19 -62t-17 -42l-7 -15q1 -4 1 -50t-1 -72q3 7 10 18.5t30.5 43t50.5 58t71 55.5t91.5 44.5
+t112 14.5t132.5 -24q-2 -78 -21.5 -141.5t-50 -104.5t-69.5 -71.5t-81.5 -45.5t-84.5 -24t-80 -9.5t-67.5 1t-46.5 4.5l-17 3q-23 -147 -73 -283q6 7 18 18.5t49.5 41t77.5 52.5t99.5 42t117.5 20t129 -23.5t137 -77.5z" />
+    <glyph glyph-name="stack_exchange" unicode="&#xf18d;" horiz-adv-x="1280" 
+d="M1259 283v-66q0 -85 -57.5 -144.5t-138.5 -59.5h-57l-260 -269v269h-529q-81 0 -138.5 59.5t-57.5 144.5v66h1238zM1259 609v-255h-1238v255h1238zM1259 937v-255h-1238v255h1238zM1259 1077v-67h-1238v67q0 84 57.5 143.5t138.5 59.5h846q81 0 138.5 -59.5t57.5 -143.5z
+" />
+    <glyph glyph-name="_374" unicode="&#xf18e;" 
+d="M1152 640q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v192h-352q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h352v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198
+t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="arrow_circle_alt_left" unicode="&#xf190;" 
+d="M1152 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-352v-192q0 -14 -9 -23t-23 -9q-12 0 -24 10l-319 319q-9 9 -9 23t9 23l320 320q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5v-192h352q13 0 22.5 -9.5t9.5 -22.5zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198
+t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="_376" unicode="&#xf191;" 
+d="M1024 960v-640q0 -26 -19 -45t-45 -19q-20 0 -37 12l-448 320q-27 19 -27 52t27 52l448 320q17 12 37 12q26 0 45 -19t19 -45zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5z
+M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="dot_circle_alt" unicode="&#xf192;" 
+d="M1024 640q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5
+t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="_378" unicode="&#xf193;" horiz-adv-x="1664" 
+d="M1023 349l102 -204q-58 -179 -210 -290t-339 -111q-156 0 -288.5 77.5t-210 210t-77.5 288.5q0 181 104.5 330t274.5 211l17 -131q-122 -54 -195 -165.5t-73 -244.5q0 -185 131.5 -316.5t316.5 -131.5q126 0 232.5 65t165 175.5t49.5 236.5zM1571 249l58 -114l-256 -128
+q-13 -7 -29 -7q-40 0 -57 35l-239 477h-472q-24 0 -42.5 16.5t-21.5 40.5l-96 779q-2 17 6 42q14 51 57 82.5t97 31.5q66 0 113 -47t47 -113q0 -69 -52 -117.5t-120 -41.5l37 -289h423v-128h-407l16 -128h455q40 0 57 -35l228 -455z" />
+    <glyph glyph-name="vimeo_square" unicode="&#xf194;" 
+d="M1292 898q10 216 -161 222q-231 8 -312 -261q44 19 82 19q85 0 74 -96q-4 -57 -74 -167t-105 -110q-43 0 -82 169q-13 54 -45 255q-30 189 -160 177q-59 -7 -164 -100l-81 -72l-81 -72l52 -67q76 52 87 52q57 0 107 -179q15 -55 45 -164.5t45 -164.5q68 -179 164 -179
+q157 0 383 294q220 283 226 444zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="_380" unicode="&#xf195;" horiz-adv-x="1152" 
+d="M1152 704q0 -191 -94.5 -353t-256.5 -256.5t-353 -94.5h-160q-14 0 -23 9t-9 23v611l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v93l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v250q0 14 9 23t23 9h160
+q14 0 23 -9t9 -23v-181l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-93l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-487q188 13 318 151t130 328q0 14 9 23t23 9h160q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="plus_square_o" unicode="&#xf196;" horiz-adv-x="1408" 
+d="M1152 736v-64q0 -14 -9 -23t-23 -9h-352v-352q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v352h-352q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h352v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-352h352q14 0 23 -9t9 -23zM1280 288v832q0 66 -47 113t-113 47h-832
+q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113zM1408 1120v-832q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="_382" unicode="&#xf197;" horiz-adv-x="2176" 
+d="M620 416q-110 -64 -268 -64h-128v64h-64q-13 0 -22.5 23.5t-9.5 56.5q0 24 7 49q-58 2 -96.5 10.5t-38.5 20.5t38.5 20.5t96.5 10.5q-7 25 -7 49q0 33 9.5 56.5t22.5 23.5h64v64h128q158 0 268 -64h1113q42 -7 106.5 -18t80.5 -14q89 -15 150 -40.5t83.5 -47.5t22.5 -40
+t-22.5 -40t-83.5 -47.5t-150 -40.5q-16 -3 -80.5 -14t-106.5 -18h-1113zM1739 668q53 -36 53 -92t-53 -92l81 -30q68 48 68 122t-68 122zM625 400h1015q-217 -38 -456 -80q-57 0 -113 -24t-83 -48l-28 -24l-288 -288q-26 -26 -70.5 -45t-89.5 -19h-96l-93 464h29
+q157 0 273 64zM352 816h-29l93 464h96q46 0 90 -19t70 -45l288 -288q4 -4 11 -10.5t30.5 -23t48.5 -29t61.5 -23t72.5 -10.5l456 -80h-1015q-116 64 -273 64z" />
+    <glyph glyph-name="_383" unicode="&#xf198;" horiz-adv-x="1664" 
+d="M1519 760q62 0 103.5 -40.5t41.5 -101.5q0 -97 -93 -130l-172 -59l56 -167q7 -21 7 -47q0 -59 -42 -102t-101 -43q-47 0 -85.5 27t-53.5 72l-55 165l-310 -106l55 -164q8 -24 8 -47q0 -59 -42 -102t-102 -43q-47 0 -85 27t-53 72l-55 163l-153 -53q-29 -9 -50 -9
+q-61 0 -101.5 40t-40.5 101q0 47 27.5 85t71.5 53l156 53l-105 313l-156 -54q-26 -8 -48 -8q-60 0 -101 40.5t-41 100.5q0 47 27.5 85t71.5 53l157 53l-53 159q-8 24 -8 47q0 60 42 102.5t102 42.5q47 0 85 -27t53 -72l54 -160l310 105l-54 160q-8 24 -8 47q0 59 42.5 102
+t101.5 43q47 0 85.5 -27.5t53.5 -71.5l53 -161l162 55q21 6 43 6q60 0 102.5 -39.5t42.5 -98.5q0 -45 -30 -81.5t-74 -51.5l-157 -54l105 -316l164 56q24 8 46 8zM725 498l310 105l-105 315l-310 -107z" />
+    <glyph glyph-name="_384" unicode="&#xf199;" 
+d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM1280 352v436q-31 -35 -64 -55q-34 -22 -132.5 -85t-151.5 -99q-98 -69 -164 -69v0v0q-66 0 -164 69
+q-47 32 -142 92.5t-142 92.5q-12 8 -33 27t-31 27v-436q0 -40 28 -68t68 -28h832q40 0 68 28t28 68zM1280 925q0 41 -27.5 70t-68.5 29h-832q-40 0 -68 -28t-28 -68q0 -37 30.5 -76.5t67.5 -64.5q47 -32 137.5 -89t129.5 -83q3 -2 17 -11.5t21 -14t21 -13t23.5 -13
+t21.5 -9.5t22.5 -7.5t20.5 -2.5t20.5 2.5t22.5 7.5t21.5 9.5t23.5 13t21 13t21 14t17 11.5l267 174q35 23 66.5 62.5t31.5 73.5z" />
+    <glyph glyph-name="_385" unicode="&#xf19a;" horiz-adv-x="1792" 
+d="M127 640q0 163 67 313l367 -1005q-196 95 -315 281t-119 411zM1415 679q0 -19 -2.5 -38.5t-10 -49.5t-11.5 -44t-17.5 -59t-17.5 -58l-76 -256l-278 826q46 3 88 8q19 2 26 18.5t-2.5 31t-28.5 13.5l-205 -10q-75 1 -202 10q-12 1 -20.5 -5t-11.5 -15t-1.5 -18.5t9 -16.5
+t19.5 -8l80 -8l120 -328l-168 -504l-280 832q46 3 88 8q19 2 26 18.5t-2.5 31t-28.5 13.5l-205 -10q-7 0 -23 0.5t-26 0.5q105 160 274.5 253.5t367.5 93.5q147 0 280.5 -53t238.5 -149h-10q-55 0 -92 -40.5t-37 -95.5q0 -12 2 -24t4 -21.5t8 -23t9 -21t12 -22.5t12.5 -21
+t14.5 -24t14 -23q63 -107 63 -212zM909 573l237 -647q1 -6 5 -11q-126 -44 -255 -44q-112 0 -217 32zM1570 1009q95 -174 95 -369q0 -209 -104 -385.5t-279 -278.5l235 678q59 169 59 276q0 42 -6 79zM896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286
+t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM896 -215q173 0 331.5 68t273 182.5t182.5 273t68 331.5t-68 331.5t-182.5 273t-273 182.5t-331.5 68t-331.5 -68t-273 -182.5t-182.5 -273t-68 -331.5t68 -331.5t182.5 -273
+t273 -182.5t331.5 -68z" />
+    <glyph glyph-name="_386" unicode="&#xf19b;" horiz-adv-x="1792" 
+d="M1086 1536v-1536l-272 -128q-228 20 -414 102t-293 208.5t-107 272.5q0 140 100.5 263.5t275 205.5t391.5 108v-172q-217 -38 -356.5 -150t-139.5 -255q0 -152 154.5 -267t388.5 -145v1360zM1755 954l37 -390l-525 114l147 83q-119 70 -280 99v172q277 -33 481 -157z" />
+    <glyph glyph-name="_387" unicode="&#xf19c;" horiz-adv-x="2048" 
+d="M960 1536l960 -384v-128h-128q0 -26 -20.5 -45t-48.5 -19h-1526q-28 0 -48.5 19t-20.5 45h-128v128zM256 896h256v-768h128v768h256v-768h128v768h256v-768h128v768h256v-768h59q28 0 48.5 -19t20.5 -45v-64h-1664v64q0 26 20.5 45t48.5 19h59v768zM1851 -64
+q28 0 48.5 -19t20.5 -45v-128h-1920v128q0 26 20.5 45t48.5 19h1782z" />
+    <glyph glyph-name="_388" unicode="&#xf19d;" horiz-adv-x="2304" 
+d="M1774 700l18 -316q4 -69 -82 -128t-235 -93.5t-323 -34.5t-323 34.5t-235 93.5t-82 128l18 316l574 -181q22 -7 48 -7t48 7zM2304 1024q0 -23 -22 -31l-1120 -352q-4 -1 -10 -1t-10 1l-652 206q-43 -34 -71 -111.5t-34 -178.5q63 -36 63 -109q0 -69 -58 -107l58 -433
+q2 -14 -8 -25q-9 -11 -24 -11h-192q-15 0 -24 11q-10 11 -8 25l58 433q-58 38 -58 107q0 73 65 111q11 207 98 330l-333 104q-22 8 -22 31t22 31l1120 352q4 1 10 1t10 -1l1120 -352q22 -8 22 -31z" />
+    <glyph glyph-name="_389" unicode="&#xf19e;" 
+d="M859 579l13 -707q-62 11 -105 11q-41 0 -105 -11l13 707q-40 69 -168.5 295.5t-216.5 374.5t-181 287q58 -15 108 -15q44 0 111 15q63 -111 133.5 -229.5t167 -276.5t138.5 -227q37 61 109.5 177.5t117.5 190t105 176t107 189.5q54 -14 107 -14q56 0 114 14v0
+q-28 -39 -60 -88.5t-49.5 -78.5t-56.5 -96t-49 -84q-146 -248 -353 -610z" />
+    <glyph glyph-name="uniF1A0" unicode="&#xf1a0;" 
+d="M768 750h725q12 -67 12 -128q0 -217 -91 -387.5t-259.5 -266.5t-386.5 -96q-157 0 -299 60.5t-245 163.5t-163.5 245t-60.5 299t60.5 299t163.5 245t245 163.5t299 60.5q300 0 515 -201l-209 -201q-123 119 -306 119q-129 0 -238.5 -65t-173.5 -176.5t-64 -243.5
+t64 -243.5t173.5 -176.5t238.5 -65q87 0 160 24t120 60t82 82t51.5 87t22.5 78h-436v264z" />
+    <glyph glyph-name="f1a1" unicode="&#xf1a1;" horiz-adv-x="1792" 
+d="M1095 369q16 -16 0 -31q-62 -62 -199 -62t-199 62q-16 15 0 31q6 6 15 6t15 -6q48 -49 169 -49q120 0 169 49q6 6 15 6t15 -6zM788 550q0 -37 -26 -63t-63 -26t-63.5 26t-26.5 63q0 38 26.5 64t63.5 26t63 -26.5t26 -63.5zM1183 550q0 -37 -26.5 -63t-63.5 -26t-63 26
+t-26 63t26 63.5t63 26.5t63.5 -26t26.5 -64zM1434 670q0 49 -35 84t-85 35t-86 -36q-130 90 -311 96l63 283l200 -45q0 -37 26 -63t63 -26t63.5 26.5t26.5 63.5t-26.5 63.5t-63.5 26.5q-54 0 -80 -50l-221 49q-19 5 -25 -16l-69 -312q-180 -7 -309 -97q-35 37 -87 37
+q-50 0 -85 -35t-35 -84q0 -35 18.5 -64t49.5 -44q-6 -27 -6 -56q0 -142 140 -243t337 -101q198 0 338 101t140 243q0 32 -7 57q30 15 48 43.5t18 63.5zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191
+t348 71t348 -71t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="_392" unicode="&#xf1a2;" 
+d="M939 407q13 -13 0 -26q-53 -53 -171 -53t-171 53q-13 13 0 26q5 6 13 6t13 -6q42 -42 145 -42t145 42q5 6 13 6t13 -6zM676 563q0 -31 -23 -54t-54 -23t-54 23t-23 54q0 32 22.5 54.5t54.5 22.5t54.5 -22.5t22.5 -54.5zM1014 563q0 -31 -23 -54t-54 -23t-54 23t-23 54
+q0 32 22.5 54.5t54.5 22.5t54.5 -22.5t22.5 -54.5zM1229 666q0 42 -30 72t-73 30q-42 0 -73 -31q-113 78 -267 82l54 243l171 -39q1 -32 23.5 -54t53.5 -22q32 0 54.5 22.5t22.5 54.5t-22.5 54.5t-54.5 22.5q-48 0 -69 -43l-189 42q-17 5 -21 -13l-60 -268q-154 -6 -265 -83
+q-30 32 -74 32q-43 0 -73 -30t-30 -72q0 -30 16 -55t42 -38q-5 -25 -5 -48q0 -122 120 -208.5t289 -86.5q170 0 290 86.5t120 208.5q0 25 -6 49q25 13 40.5 37.5t15.5 54.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960
+q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="_393" unicode="&#xf1a3;" 
+d="M866 697l90 27v62q0 79 -58 135t-138 56t-138 -55.5t-58 -134.5v-283q0 -20 -14 -33.5t-33 -13.5t-32.5 13.5t-13.5 33.5v120h-151v-122q0 -82 57.5 -139t139.5 -57q81 0 138.5 56.5t57.5 136.5v280q0 19 13.5 33t33.5 14q19 0 32.5 -14t13.5 -33v-54zM1199 502v122h-150
+v-126q0 -20 -13.5 -33.5t-33.5 -13.5q-19 0 -32.5 14t-13.5 33v123l-90 -26l-60 28v-123q0 -80 58 -137t139 -57t138.5 57t57.5 139zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103
+t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="f1a4" unicode="&#xf1a4;" horiz-adv-x="1920" 
+d="M1062 824v118q0 42 -30 72t-72 30t-72 -30t-30 -72v-612q0 -175 -126 -299t-303 -124q-178 0 -303.5 125.5t-125.5 303.5v266h328v-262q0 -43 30 -72.5t72 -29.5t72 29.5t30 72.5v620q0 171 126.5 292t301.5 121q176 0 302 -122t126 -294v-136l-195 -58zM1592 602h328
+v-266q0 -178 -125.5 -303.5t-303.5 -125.5q-177 0 -303 124.5t-126 300.5v268l131 -61l195 58v-270q0 -42 30 -71.5t72 -29.5t72 29.5t30 71.5v275z" />
+    <glyph glyph-name="_395" unicode="&#xf1a5;" 
+d="M1472 160v480h-704v704h-480q-93 0 -158.5 -65.5t-65.5 -158.5v-480h704v-704h480q93 0 158.5 65.5t65.5 158.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5
+t84.5 -203.5z" />
+    <glyph glyph-name="_396" unicode="&#xf1a6;" horiz-adv-x="2048" 
+d="M328 1254h204v-983h-532v697h328v286zM328 435v369h-123v-369h123zM614 968v-697h205v697h-205zM614 1254v-204h205v204h-205zM901 968h533v-942h-533v163h328v82h-328v697zM1229 435v369h-123v-369h123zM1516 968h532v-942h-532v163h327v82h-327v697zM1843 435v369h-123
+v-369h123z" />
+    <glyph glyph-name="_397" unicode="&#xf1a7;" 
+d="M1046 516q0 -64 -38 -109t-91 -45q-43 0 -70 15v277q28 17 70 17q53 0 91 -45.5t38 -109.5zM703 944q0 -64 -38 -109.5t-91 -45.5q-43 0 -70 15v277q28 17 70 17q53 0 91 -45t38 -109zM1265 513q0 134 -88 229t-213 95q-20 0 -39 -3q-23 -78 -78 -136q-87 -95 -211 -101
+v-636l211 41v206q51 -19 117 -19q125 0 213 95t88 229zM922 940q0 134 -88.5 229t-213.5 95q-74 0 -141 -36h-186v-840l211 41v206q55 -19 116 -19q125 0 213.5 95t88.5 229zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960
+q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="_398" unicode="&#xf1a8;" horiz-adv-x="2038" 
+d="M1222 607q75 3 143.5 -20.5t118 -58.5t101 -94.5t84 -108t75.5 -120.5q33 -56 78.5 -109t75.5 -80.5t99 -88.5q-48 -30 -108.5 -57.5t-138.5 -59t-114 -47.5q-44 37 -74 115t-43.5 164.5t-33 180.5t-42.5 168.5t-72.5 123t-122.5 48.5l-10 -2l-6 -4q4 -5 13 -14
+q6 -5 28 -23.5t25.5 -22t19 -18t18 -20.5t11.5 -21t10.5 -27.5t4.5 -31t4 -40.5l1 -33q1 -26 -2.5 -57.5t-7.5 -52t-12.5 -58.5t-11.5 -53q-35 1 -101 -9.5t-98 -10.5q-39 0 -72 10q-2 16 -2 47q0 74 3 96q2 13 31.5 41.5t57 59t26.5 51.5q-24 2 -43 -24
+q-36 -53 -111.5 -99.5t-136.5 -46.5q-25 0 -75.5 63t-106.5 139.5t-84 96.5q-6 4 -27 30q-482 -112 -513 -112q-16 0 -28 11t-12 27q0 15 8.5 26.5t22.5 14.5l486 106q-8 14 -8 25t5.5 17.5t16 11.5t20 7t23 4.5t18.5 4.5q4 1 15.5 7.5t17.5 6.5q15 0 28 -16t20 -33
+q163 37 172 37q17 0 29.5 -11t12.5 -28q0 -15 -8.5 -26t-23.5 -14l-182 -40l-1 -16q-1 -26 81.5 -117.5t104.5 -91.5q47 0 119 80t72 129q0 36 -23.5 53t-51 18.5t-51 11.5t-23.5 34q0 16 10 34l-68 19q43 44 43 117q0 26 -5 58q82 16 144 16q44 0 71.5 -1.5t48.5 -8.5
+t31 -13.5t20.5 -24.5t15.5 -33.5t17 -47.5t24 -60l50 25q-3 -40 -23 -60t-42.5 -21t-40 -6.5t-16.5 -20.5zM1282 842q-5 5 -13.5 15.5t-12 14.5t-10.5 11.5t-10 10.5l-8 8t-8.5 7.5t-8 5t-8.5 4.5q-7 3 -14.5 5t-20.5 2.5t-22 0.5h-32.5h-37.5q-126 0 -217 -43
+q16 30 36 46.5t54 29.5t65.5 36t46 36.5t50 55t43.5 50.5q12 -9 28 -31.5t32 -36.5t38 -13l12 1v-76l22 -1q247 95 371 190q28 21 50 39t42.5 37.5t33 31t29.5 34t24 31t24.5 37t23 38t27 47.5t29.5 53l7 9q-2 -53 -43 -139q-79 -165 -205 -264t-306 -142q-14 -3 -42 -7.5
+t-50 -9.5t-39 -14q3 -19 24.5 -46t21.5 -34q0 -11 -26 -30zM1061 -79q39 26 131.5 47.5t146.5 21.5q9 0 22.5 -15.5t28 -42.5t26 -50t24 -51t14.5 -33q-121 -45 -244 -45q-61 0 -125 11zM822 568l48 12l109 -177l-73 -48zM1323 51q3 -15 3 -16q0 -7 -17.5 -14.5t-46 -13
+t-54 -9.5t-53.5 -7.5t-32 -4.5l-7 43q21 2 60.5 8.5t72 10t60.5 3.5h14zM866 679l-96 -20l-6 17q10 1 32.5 7t34.5 6q19 0 35 -10zM1061 45h31l10 -83l-41 -12v95zM1950 1535v1v-1zM1950 1535l-1 -5l-2 -2l1 3zM1950 1535l1 1z" />
+    <glyph glyph-name="_399" unicode="&#xf1a9;" 
+d="M1167 -50q-5 19 -24 5q-30 -22 -87 -39t-131 -17q-129 0 -193 49q-5 4 -13 4q-11 0 -26 -12q-7 -6 -7.5 -16t7.5 -20q34 -32 87.5 -46t102.5 -12.5t99 4.5q41 4 84.5 20.5t65 30t28.5 20.5q12 12 7 29zM1128 65q-19 47 -39 61q-23 15 -76 15q-47 0 -71 -10
+q-29 -12 -78 -56q-26 -24 -12 -44q9 -8 17.5 -4.5t31.5 23.5q3 2 10.5 8.5t10.5 8.5t10 7t11.5 7t12.5 5t15 4.5t16.5 2.5t20.5 1q27 0 44.5 -7.5t23 -14.5t13.5 -22q10 -17 12.5 -20t12.5 1q23 12 14 34zM1483 346q0 22 -5 44.5t-16.5 45t-34 36.5t-52.5 14
+q-33 0 -97 -41.5t-129 -83.5t-101 -42q-27 -1 -63.5 19t-76 49t-83.5 58t-100 49t-111 19q-115 -1 -197 -78.5t-84 -178.5q-2 -112 74 -164q29 -20 62.5 -28.5t103.5 -8.5q57 0 132 32.5t134 71t120 70.5t93 31q26 -1 65 -31.5t71.5 -67t68 -67.5t55.5 -32q35 -3 58.5 14
+t55.5 63q28 41 42.5 101t14.5 106zM1536 506q0 -164 -62 -304.5t-166 -236t-242.5 -149.5t-290.5 -54t-293 57.5t-247.5 157t-170.5 241.5t-64 302q0 89 19.5 172.5t49 145.5t70.5 118.5t78.5 94t78.5 69.5t64.5 46.5t42.5 24.5q14 8 51 26.5t54.5 28.5t48 30t60.5 44
+q36 28 58 72.5t30 125.5q129 -155 186 -193q44 -29 130 -68t129 -66q21 -13 39 -25t60.5 -46.5t76 -70.5t75 -95t69 -122t47 -148.5t19.5 -177.5z" />
+    <glyph glyph-name="_400" unicode="&#xf1aa;" 
+d="M1070 463l-160 -160l-151 -152l-30 -30q-65 -64 -151.5 -87t-171.5 -2q-16 -70 -72 -115t-129 -45q-85 0 -145 60.5t-60 145.5q0 72 44.5 128t113.5 72q-22 86 1 173t88 152l12 12l151 -152l-11 -11q-37 -37 -37 -89t37 -90q37 -37 89 -37t89 37l30 30l151 152l161 160z
+M729 1145l12 -12l-152 -152l-12 12q-37 37 -89 37t-89 -37t-37 -89.5t37 -89.5l29 -29l152 -152l160 -160l-151 -152l-161 160l-151 152l-30 30q-68 67 -90 159.5t5 179.5q-70 15 -115 71t-45 129q0 85 60 145.5t145 60.5q76 0 133.5 -49t69.5 -123q84 20 169.5 -3.5
+t149.5 -87.5zM1536 78q0 -85 -60 -145.5t-145 -60.5q-74 0 -131 47t-71 118q-86 -28 -179.5 -6t-161.5 90l-11 12l151 152l12 -12q37 -37 89 -37t89 37t37 89t-37 89l-30 30l-152 152l-160 160l152 152l160 -160l152 -152l29 -30q64 -64 87.5 -150.5t2.5 -171.5
+q76 -11 126.5 -68.5t50.5 -134.5zM1534 1202q0 -77 -51 -135t-127 -69q26 -85 3 -176.5t-90 -158.5l-12 -12l-151 152l12 12q37 37 37 89t-37 89t-89 37t-89 -37l-30 -30l-152 -152l-160 -160l-152 152l161 160l152 152l29 30q67 67 159 89.5t178 -3.5q11 75 68.5 126
+t135.5 51q85 0 145 -60.5t60 -145.5z" />
+    <glyph glyph-name="f1ab" unicode="&#xf1ab;" 
+d="M654 458q-1 -3 -12.5 0.5t-31.5 11.5l-20 9q-44 20 -87 49q-7 5 -41 31.5t-38 28.5q-67 -103 -134 -181q-81 -95 -105 -110q-4 -2 -19.5 -4t-18.5 0q6 4 82 92q21 24 85.5 115t78.5 118q17 30 51 98.5t36 77.5q-8 1 -110 -33q-8 -2 -27.5 -7.5t-34.5 -9.5t-17 -5
+q-2 -2 -2 -10.5t-1 -9.5q-5 -10 -31 -15q-23 -7 -47 0q-18 4 -28 21q-4 6 -5 23q6 2 24.5 5t29.5 6q58 16 105 32q100 35 102 35q10 2 43 19.5t44 21.5q9 3 21.5 8t14.5 5.5t6 -0.5q2 -12 -1 -33q0 -2 -12.5 -27t-26.5 -53.5t-17 -33.5q-25 -50 -77 -131l64 -28
+q12 -6 74.5 -32t67.5 -28q4 -1 10.5 -25.5t4.5 -30.5zM449 944q3 -15 -4 -28q-12 -23 -50 -38q-30 -12 -60 -12q-26 3 -49 26q-14 15 -18 41l1 3q3 -3 19.5 -5t26.5 0t58 16q36 12 55 14q17 0 21 -17zM1147 815l63 -227l-139 42zM39 15l694 232v1032l-694 -233v-1031z
+M1280 332l102 -31l-181 657l-100 31l-216 -536l102 -31l45 110l211 -65zM777 1294l573 -184v380zM1088 -29l158 -13l-54 -160l-40 66q-130 -83 -276 -108q-58 -12 -91 -12h-84q-79 0 -199.5 39t-183.5 85q-8 7 -8 16q0 8 5 13.5t13 5.5q4 0 18 -7.5t30.5 -16.5t20.5 -11
+q73 -37 159.5 -61.5t157.5 -24.5q95 0 167 14.5t157 50.5q15 7 30.5 15.5t34 19t28.5 16.5zM1536 1050v-1079l-774 246q-14 -6 -375 -127.5t-368 -121.5q-13 0 -18 13q0 1 -1 3v1078q3 9 4 10q5 6 20 11q107 36 149 50v384l558 -198q2 0 160.5 55t316 108.5t161.5 53.5
+q20 0 20 -21v-418z" />
+    <glyph glyph-name="_402" unicode="&#xf1ac;" horiz-adv-x="1792" 
+d="M288 1152q66 0 113 -47t47 -113v-1088q0 -66 -47 -113t-113 -47h-128q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h128zM1664 989q58 -34 93 -93t35 -128v-768q0 -106 -75 -181t-181 -75h-864q-66 0 -113 47t-47 113v1536q0 40 28 68t68 28h672q40 0 88 -20t76 -48
+l152 -152q28 -28 48 -76t20 -88v-163zM928 0v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM928 256v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM928 512v128q0 14 -9 23
+t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1184 0v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1184 256v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128
+q14 0 23 9t9 23zM1184 512v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1440 0v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1440 256v128q0 14 -9 23t-23 9h-128
+q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1440 512v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1536 896v256h-160q-40 0 -68 28t-28 68v160h-640v-512h896z" />
+    <glyph glyph-name="_403" unicode="&#xf1ad;" 
+d="M1344 1536q26 0 45 -19t19 -45v-1664q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h1280zM512 1248v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM512 992v-64q0 -14 9 -23t23 -9h64q14 0 23 9
+t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM512 736v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM512 480v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM384 160v64
+q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM384 416v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM384 672v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64
+q14 0 23 9t9 23zM384 928v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM384 1184v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 -96v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9
+t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM896 416v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 672v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 928v64
+q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 1184v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 160v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64
+q14 0 23 9t9 23zM1152 416v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 672v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 928v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9
+t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 1184v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23z" />
+    <glyph glyph-name="_404" unicode="&#xf1ae;" horiz-adv-x="1280" 
+d="M1188 988l-292 -292v-824q0 -46 -33 -79t-79 -33t-79 33t-33 79v384h-64v-384q0 -46 -33 -79t-79 -33t-79 33t-33 79v824l-292 292q-28 28 -28 68t28 68q29 28 68.5 28t67.5 -28l228 -228h368l228 228q28 28 68 28t68 -28q28 -29 28 -68.5t-28 -67.5zM864 1152
+q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
+    <glyph glyph-name="uniF1B1" unicode="&#xf1b0;" horiz-adv-x="1664" 
+d="M780 1064q0 -60 -19 -113.5t-63 -92.5t-105 -39q-76 0 -138 57.5t-92 135.5t-30 151q0 60 19 113.5t63 92.5t105 39q77 0 138.5 -57.5t91.5 -135t30 -151.5zM438 581q0 -80 -42 -139t-119 -59q-76 0 -141.5 55.5t-100.5 133.5t-35 152q0 80 42 139.5t119 59.5
+q76 0 141.5 -55.5t100.5 -134t35 -152.5zM832 608q118 0 255 -97.5t229 -237t92 -254.5q0 -46 -17 -76.5t-48.5 -45t-64.5 -20t-76 -5.5q-68 0 -187.5 45t-182.5 45q-66 0 -192.5 -44.5t-200.5 -44.5q-183 0 -183 146q0 86 56 191.5t139.5 192.5t187.5 146t193 59zM1071 819
+q-61 0 -105 39t-63 92.5t-19 113.5q0 74 30 151.5t91.5 135t138.5 57.5q61 0 105 -39t63 -92.5t19 -113.5q0 -73 -30 -151t-92 -135.5t-138 -57.5zM1503 923q77 0 119 -59.5t42 -139.5q0 -74 -35 -152t-100.5 -133.5t-141.5 -55.5q-77 0 -119 59t-42 139q0 74 35 152.5
+t100.5 134t141.5 55.5z" />
+    <glyph glyph-name="_406" unicode="&#xf1b1;" horiz-adv-x="768" 
+d="M704 1008q0 -145 -57 -243.5t-152 -135.5l45 -821q2 -26 -16 -45t-44 -19h-192q-26 0 -44 19t-16 45l45 821q-95 37 -152 135.5t-57 243.5q0 128 42.5 249.5t117.5 200t160 78.5t160 -78.5t117.5 -200t42.5 -249.5z" />
+    <glyph glyph-name="_407" unicode="&#xf1b2;" horiz-adv-x="1792" 
+d="M896 -93l640 349v636l-640 -233v-752zM832 772l698 254l-698 254l-698 -254zM1664 1024v-768q0 -35 -18 -65t-49 -47l-704 -384q-28 -16 -61 -16t-61 16l-704 384q-31 17 -49 47t-18 65v768q0 40 23 73t61 47l704 256q22 8 44 8t44 -8l704 -256q38 -14 61 -47t23 -73z
+" />
+    <glyph glyph-name="_408" unicode="&#xf1b3;" horiz-adv-x="2304" 
+d="M640 -96l384 192v314l-384 -164v-342zM576 358l404 173l-404 173l-404 -173zM1664 -96l384 192v314l-384 -164v-342zM1600 358l404 173l-404 173l-404 -173zM1152 651l384 165v266l-384 -164v-267zM1088 1030l441 189l-441 189l-441 -189zM2176 512v-416q0 -36 -19 -67
+t-52 -47l-448 -224q-25 -14 -57 -14t-57 14l-448 224q-4 2 -7 4q-2 -2 -7 -4l-448 -224q-25 -14 -57 -14t-57 14l-448 224q-33 16 -52 47t-19 67v416q0 38 21.5 70t56.5 48l434 186v400q0 38 21.5 70t56.5 48l448 192q23 10 50 10t50 -10l448 -192q35 -16 56.5 -48t21.5 -70
+v-400l434 -186q36 -16 57 -48t21 -70z" />
+    <glyph glyph-name="_409" unicode="&#xf1b4;" horiz-adv-x="2048" 
+d="M1848 1197h-511v-124h511v124zM1596 771q-90 0 -146 -52.5t-62 -142.5h408q-18 195 -200 195zM1612 186q63 0 122 32t76 87h221q-100 -307 -427 -307q-214 0 -340.5 132t-126.5 347q0 208 130.5 345.5t336.5 137.5q138 0 240.5 -68t153 -179t50.5 -248q0 -17 -2 -47h-658
+q0 -111 57.5 -171.5t166.5 -60.5zM277 236h296q205 0 205 167q0 180 -199 180h-302v-347zM277 773h281q78 0 123.5 36.5t45.5 113.5q0 144 -190 144h-260v-294zM0 1282h594q87 0 155 -14t126.5 -47.5t90 -96.5t31.5 -154q0 -181 -172 -263q114 -32 172 -115t58 -204
+q0 -75 -24.5 -136.5t-66 -103.5t-98.5 -71t-121 -42t-134 -13h-611v1260z" />
+    <glyph glyph-name="_410" unicode="&#xf1b5;" 
+d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM499 1041h-371v-787h382q117 0 197 57.5t80 170.5q0 158 -143 200q107 52 107 164q0 57 -19.5 96.5
+t-56.5 60.5t-79 29.5t-97 8.5zM477 723h-176v184h163q119 0 119 -90q0 -94 -106 -94zM486 388h-185v217h189q124 0 124 -113q0 -104 -128 -104zM1136 356q-68 0 -104 38t-36 107h411q1 10 1 30q0 132 -74.5 220.5t-203.5 88.5q-128 0 -210 -86t-82 -216q0 -135 79 -217
+t213 -82q205 0 267 191h-138q-11 -34 -47.5 -54t-75.5 -20zM1126 722q113 0 124 -122h-254q4 56 39 89t91 33zM964 988h319v-77h-319v77z" />
+    <glyph glyph-name="_411" unicode="&#xf1b6;" horiz-adv-x="1792" 
+d="M1582 954q0 -101 -71.5 -172.5t-172.5 -71.5t-172.5 71.5t-71.5 172.5t71.5 172.5t172.5 71.5t172.5 -71.5t71.5 -172.5zM812 212q0 104 -73 177t-177 73q-27 0 -54 -6l104 -42q77 -31 109.5 -106.5t1.5 -151.5q-31 -77 -107 -109t-152 -1q-21 8 -62 24.5t-61 24.5
+q32 -60 91 -96.5t130 -36.5q104 0 177 73t73 177zM1642 953q0 126 -89.5 215.5t-215.5 89.5q-127 0 -216.5 -89.5t-89.5 -215.5q0 -127 89.5 -216t216.5 -89q126 0 215.5 89t89.5 216zM1792 953q0 -189 -133.5 -322t-321.5 -133l-437 -319q-12 -129 -109 -218t-229 -89
+q-121 0 -214 76t-118 192l-230 92v429l389 -157q79 48 173 48q13 0 35 -2l284 407q2 187 135.5 319t320.5 132q188 0 321.5 -133.5t133.5 -321.5z" />
+    <glyph glyph-name="_412" unicode="&#xf1b7;" 
+d="M1242 889q0 80 -57 136.5t-137 56.5t-136.5 -57t-56.5 -136q0 -80 56.5 -136.5t136.5 -56.5t137 56.5t57 136.5zM632 301q0 -83 -58 -140.5t-140 -57.5q-56 0 -103 29t-72 77q52 -20 98 -40q60 -24 120 1.5t85 86.5q24 60 -1.5 120t-86.5 84l-82 33q22 5 42 5
+q82 0 140 -57.5t58 -140.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v153l172 -69q20 -92 93.5 -152t168.5 -60q104 0 181 70t87 173l345 252q150 0 255.5 105.5t105.5 254.5q0 150 -105.5 255.5t-255.5 105.5
+q-148 0 -253 -104.5t-107 -252.5l-225 -322q-9 1 -28 1q-75 0 -137 -37l-297 119v468q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5zM1289 887q0 -100 -71 -170.5t-171 -70.5t-170.5 70.5t-70.5 170.5t70.5 171t170.5 71q101 0 171.5 -70.5t70.5 -171.5z
+" />
+    <glyph glyph-name="_413" unicode="&#xf1b8;" horiz-adv-x="1792" 
+d="M836 367l-15 -368l-2 -22l-420 29q-36 3 -67 31.5t-47 65.5q-11 27 -14.5 55t4 65t12 55t21.5 64t19 53q78 -12 509 -28zM449 953l180 -379l-147 92q-63 -72 -111.5 -144.5t-72.5 -125t-39.5 -94.5t-18.5 -63l-4 -21l-190 357q-17 26 -18 56t6 47l8 18q35 63 114 188
+l-140 86zM1680 436l-188 -359q-12 -29 -36.5 -46.5t-43.5 -20.5l-18 -4q-71 -7 -219 -12l8 -164l-230 367l211 362l7 -173q170 -16 283 -5t170 33zM895 1360q-47 -63 -265 -435l-317 187l-19 12l225 356q20 31 60 45t80 10q24 -2 48.5 -12t42 -21t41.5 -33t36 -34.5
+t36 -39.5t32 -35zM1550 1053l212 -363q18 -37 12.5 -76t-27.5 -74q-13 -20 -33 -37t-38 -28t-48.5 -22t-47 -16t-51.5 -14t-46 -12q-34 72 -265 436l313 195zM1407 1279l142 83l-220 -373l-419 20l151 86q-34 89 -75 166t-75.5 123.5t-64.5 80t-47 46.5l-17 13l405 -1
+q31 3 58 -10.5t39 -28.5l11 -15q39 -61 112 -190z" />
+    <glyph glyph-name="_414" unicode="&#xf1b9;" horiz-adv-x="2048" 
+d="M480 448q0 66 -47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47t113 47t47 113zM516 768h1016l-89 357q-2 8 -14 17.5t-21 9.5h-768q-9 0 -21 -9.5t-14 -17.5zM1888 448q0 66 -47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47t113 47t47 113zM2048 544v-384
+q0 -14 -9 -23t-23 -9h-96v-128q0 -80 -56 -136t-136 -56t-136 56t-56 136v128h-1024v-128q0 -80 -56 -136t-136 -56t-136 56t-56 136v128h-96q-14 0 -23 9t-9 23v384q0 93 65.5 158.5t158.5 65.5h28l105 419q23 94 104 157.5t179 63.5h768q98 0 179 -63.5t104 -157.5
+l105 -419h28q93 0 158.5 -65.5t65.5 -158.5z" />
+    <glyph glyph-name="_415" unicode="&#xf1ba;" horiz-adv-x="2048" 
+d="M1824 640q93 0 158.5 -65.5t65.5 -158.5v-384q0 -14 -9 -23t-23 -9h-96v-64q0 -80 -56 -136t-136 -56t-136 56t-56 136v64h-1024v-64q0 -80 -56 -136t-136 -56t-136 56t-56 136v64h-96q-14 0 -23 9t-9 23v384q0 93 65.5 158.5t158.5 65.5h28l105 419q23 94 104 157.5
+t179 63.5h128v224q0 14 9 23t23 9h448q14 0 23 -9t9 -23v-224h128q98 0 179 -63.5t104 -157.5l105 -419h28zM320 160q66 0 113 47t47 113t-47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47zM516 640h1016l-89 357q-2 8 -14 17.5t-21 9.5h-768q-9 0 -21 -9.5t-14 -17.5z
+M1728 160q66 0 113 47t47 113t-47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47z" />
+    <glyph glyph-name="_416" unicode="&#xf1bb;" 
+d="M1504 64q0 -26 -19 -45t-45 -19h-462q1 -17 6 -87.5t5 -108.5q0 -25 -18 -42.5t-43 -17.5h-320q-25 0 -43 17.5t-18 42.5q0 38 5 108.5t6 87.5h-462q-26 0 -45 19t-19 45t19 45l402 403h-229q-26 0 -45 19t-19 45t19 45l402 403h-197q-26 0 -45 19t-19 45t19 45l384 384
+q19 19 45 19t45 -19l384 -384q19 -19 19 -45t-19 -45t-45 -19h-197l402 -403q19 -19 19 -45t-19 -45t-45 -19h-229l402 -403q19 -19 19 -45z" />
+    <glyph glyph-name="_417" unicode="&#xf1bc;" 
+d="M1127 326q0 32 -30 51q-193 115 -447 115q-133 0 -287 -34q-42 -9 -42 -52q0 -20 13.5 -34.5t35.5 -14.5q5 0 37 8q132 27 243 27q226 0 397 -103q19 -11 33 -11q19 0 33 13.5t14 34.5zM1223 541q0 40 -35 61q-237 141 -548 141q-153 0 -303 -42q-48 -13 -48 -64
+q0 -25 17.5 -42.5t42.5 -17.5q7 0 37 8q122 33 251 33q279 0 488 -124q24 -13 38 -13q25 0 42.5 17.5t17.5 42.5zM1331 789q0 47 -40 70q-126 73 -293 110.5t-343 37.5q-204 0 -364 -47q-23 -7 -38.5 -25.5t-15.5 -48.5q0 -31 20.5 -52t51.5 -21q11 0 40 8q133 37 307 37
+q159 0 309.5 -34t253.5 -95q21 -12 40 -12q29 0 50.5 20.5t21.5 51.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="_418" unicode="&#xf1bd;" horiz-adv-x="1024" 
+d="M1024 1233l-303 -582l24 -31h279v-415h-507l-44 -30l-142 -273l-30 -30h-301v303l303 583l-24 30h-279v415h507l44 30l142 273l30 30h301v-303z" />
+    <glyph glyph-name="_419" unicode="&#xf1be;" horiz-adv-x="2304" 
+d="M784 164l16 241l-16 523q-1 10 -7.5 17t-16.5 7q-9 0 -16 -7t-7 -17l-14 -523l14 -241q1 -10 7.5 -16.5t15.5 -6.5q22 0 24 23zM1080 193l11 211l-12 586q0 16 -13 24q-8 5 -16 5t-16 -5q-13 -8 -13 -24l-1 -6l-10 -579q0 -1 11 -236v-1q0 -10 6 -17q9 -11 23 -11
+q11 0 20 9q9 7 9 20zM35 533l20 -128l-20 -126q-2 -9 -9 -9t-9 9l-17 126l17 128q2 9 9 9t9 -9zM121 612l26 -207l-26 -203q-2 -9 -10 -9q-9 0 -9 10l-23 202l23 207q0 9 9 9q8 0 10 -9zM401 159zM213 650l25 -245l-25 -237q0 -11 -11 -11q-10 0 -12 11l-21 237l21 245
+q2 12 12 12q11 0 11 -12zM307 657l23 -252l-23 -244q-2 -13 -14 -13q-13 0 -13 13l-21 244l21 252q0 13 13 13q12 0 14 -13zM401 639l21 -234l-21 -246q-2 -16 -16 -16q-6 0 -10.5 4.5t-4.5 11.5l-20 246l20 234q0 6 4.5 10.5t10.5 4.5q14 0 16 -15zM784 164zM495 785
+l21 -380l-21 -246q0 -7 -5 -12.5t-12 -5.5q-16 0 -18 18l-18 246l18 380q2 18 18 18q7 0 12 -5.5t5 -12.5zM589 871l19 -468l-19 -244q0 -8 -5.5 -13.5t-13.5 -5.5q-18 0 -20 19l-16 244l16 468q2 19 20 19q8 0 13.5 -5.5t5.5 -13.5zM687 911l18 -506l-18 -242
+q-2 -21 -22 -21q-19 0 -21 21l-16 242l16 506q0 9 6.5 15.5t14.5 6.5q9 0 15 -6.5t7 -15.5zM1079 169v0v0v0zM881 915l15 -510l-15 -239q0 -10 -7.5 -17.5t-17.5 -7.5t-17 7t-8 18l-14 239l14 510q0 11 7.5 18t17.5 7t17.5 -7t7.5 -18zM980 896l14 -492l-14 -236
+q0 -11 -8 -19t-19 -8t-19 8t-9 19l-12 236l12 492q1 12 9 20t19 8t18.5 -8t8.5 -20zM1192 404l-14 -231v0q0 -13 -9 -22t-22 -9t-22 9t-10 22l-6 114l-6 117l12 636v3q2 15 12 24q9 7 20 7q8 0 15 -5q14 -8 16 -26zM2304 423q0 -117 -83 -199.5t-200 -82.5h-786
+q-13 2 -22 11t-9 22v899q0 23 28 33q85 34 181 34q195 0 338 -131.5t160 -323.5q53 22 110 22q117 0 200 -83t83 -201z" />
+    <glyph glyph-name="uniF1C0" unicode="&#xf1c0;" 
+d="M768 768q237 0 443 43t325 127v-170q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5t-103 128v170q119 -84 325 -127t443 -43zM768 0q237 0 443 43t325 127v-170q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5t-103 128v170q119 -84 325 -127
+t443 -43zM768 384q237 0 443 43t325 127v-170q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5t-103 128v170q119 -84 325 -127t443 -43zM768 1536q208 0 385 -34.5t280 -93.5t103 -128v-128q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5
+t-103 128v128q0 69 103 128t280 93.5t385 34.5z" />
+    <glyph glyph-name="uniF1C1" unicode="&#xf1c1;" 
+d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+M894 465q33 -26 84 -56q59 7 117 7q147 0 177 -49q16 -22 2 -52q0 -1 -1 -2l-2 -2v-1q-6 -38 -71 -38q-48 0 -115 20t-130 53q-221 -24 -392 -83q-153 -262 -242 -262q-15 0 -28 7l-24 12q-1 1 -6 5q-10 10 -6 36q9 40 56 91.5t132 96.5q14 9 23 -6q2 -2 2 -4q52 85 107 197
+q68 136 104 262q-24 82 -30.5 159.5t6.5 127.5q11 40 42 40h21h1q23 0 35 -15q18 -21 9 -68q-2 -6 -4 -8q1 -3 1 -8v-30q-2 -123 -14 -192q55 -164 146 -238zM318 54q52 24 137 158q-51 -40 -87.5 -84t-49.5 -74zM716 974q-15 -42 -2 -132q1 7 7 44q0 3 7 43q1 4 4 8
+q-1 1 -1 2q-1 2 -1 3q-1 22 -13 36q0 -1 -1 -2v-2zM592 313q135 54 284 81q-2 1 -13 9.5t-16 13.5q-76 67 -127 176q-27 -86 -83 -197q-30 -56 -45 -83zM1238 329q-24 24 -140 24q76 -28 124 -28q14 0 18 1q0 1 -2 3z" />
+    <glyph glyph-name="_422" unicode="&#xf1c2;" 
+d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+M233 768v-107h70l164 -661h159l128 485q7 20 10 46q2 16 2 24h4l3 -24q1 -3 3.5 -20t5.5 -26l128 -485h159l164 661h70v107h-300v-107h90l-99 -438q-5 -20 -7 -46l-2 -21h-4q0 3 -0.5 6.5t-1.5 8t-1 6.5q-1 5 -4 21t-5 25l-144 545h-114l-144 -545q-2 -9 -4.5 -24.5
+t-3.5 -21.5l-4 -21h-4l-2 21q-2 26 -7 46l-99 438h90v107h-300z" />
+    <glyph glyph-name="_423" unicode="&#xf1c3;" 
+d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+M429 106v-106h281v106h-75l103 161q5 7 10 16.5t7.5 13.5t3.5 4h2q1 -4 5 -10q2 -4 4.5 -7.5t6 -8t6.5 -8.5l107 -161h-76v-106h291v106h-68l-192 273l195 282h67v107h-279v-107h74l-103 -159q-4 -7 -10 -16.5t-9 -13.5l-2 -3h-2q-1 4 -5 10q-6 11 -17 23l-106 159h76v107
+h-290v-107h68l189 -272l-194 -283h-68z" />
+    <glyph glyph-name="_424" unicode="&#xf1c4;" 
+d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+M416 106v-106h327v106h-93v167h137q76 0 118 15q67 23 106.5 87t39.5 146q0 81 -37 141t-100 87q-48 19 -130 19h-368v-107h92v-555h-92zM769 386h-119v268h120q52 0 83 -18q56 -33 56 -115q0 -89 -62 -120q-31 -15 -78 -15z" />
+    <glyph glyph-name="_425" unicode="&#xf1c5;" 
+d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+M1280 320v-320h-1024v192l192 192l128 -128l384 384zM448 512q-80 0 -136 56t-56 136t56 136t136 56t136 -56t56 -136t-56 -136t-136 -56z" />
+    <glyph glyph-name="_426" unicode="&#xf1c6;" 
+d="M640 1152v128h-128v-128h128zM768 1024v128h-128v-128h128zM640 896v128h-128v-128h128zM768 768v128h-128v-128h128zM1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400
+v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-128v-128h-128v128h-512v-1536h1280zM781 593l107 -349q8 -27 8 -52q0 -83 -72.5 -137.5t-183.5 -54.5t-183.5 54.5t-72.5 137.5q0 25 8 52q21 63 120 396v128h128v-128h79
+q22 0 39 -13t23 -34zM640 128q53 0 90.5 19t37.5 45t-37.5 45t-90.5 19t-90.5 -19t-37.5 -45t37.5 -45t90.5 -19z" />
+    <glyph glyph-name="_427" unicode="&#xf1c7;" 
+d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+M620 686q20 -8 20 -30v-544q0 -22 -20 -30q-8 -2 -12 -2q-12 0 -23 9l-166 167h-131q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h131l166 167q16 15 35 7zM1037 -3q31 0 50 24q129 159 129 363t-129 363q-16 21 -43 24t-47 -14q-21 -17 -23.5 -43.5t14.5 -47.5
+q100 -123 100 -282t-100 -282q-17 -21 -14.5 -47.5t23.5 -42.5q18 -15 40 -15zM826 145q27 0 47 20q87 93 87 219t-87 219q-18 19 -45 20t-46 -17t-20 -44.5t18 -46.5q52 -57 52 -131t-52 -131q-19 -20 -18 -46.5t20 -44.5q20 -17 44 -17z" />
+    <glyph glyph-name="_428" unicode="&#xf1c8;" 
+d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+M768 768q52 0 90 -38t38 -90v-384q0 -52 -38 -90t-90 -38h-384q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h384zM1260 766q20 -8 20 -30v-576q0 -22 -20 -30q-8 -2 -12 -2q-14 0 -23 9l-265 266v90l265 266q9 9 23 9q4 0 12 -2z" />
+    <glyph glyph-name="_429" unicode="&#xf1c9;" 
+d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+M480 768q8 11 21 12.5t24 -6.5l51 -38q11 -8 12.5 -21t-6.5 -24l-182 -243l182 -243q8 -11 6.5 -24t-12.5 -21l-51 -38q-11 -8 -24 -6.5t-21 12.5l-226 301q-14 19 0 38zM1282 467q14 -19 0 -38l-226 -301q-8 -11 -21 -12.5t-24 6.5l-51 38q-11 8 -12.5 21t6.5 24l182 243
+l-182 243q-8 11 -6.5 24t12.5 21l51 38q11 8 24 6.5t21 -12.5zM662 6q-13 2 -20.5 13t-5.5 24l138 831q2 13 13 20.5t24 5.5l63 -10q13 -2 20.5 -13t5.5 -24l-138 -831q-2 -13 -13 -20.5t-24 -5.5z" />
+    <glyph glyph-name="_430" unicode="&#xf1ca;" 
+d="M1497 709v-198q-101 -23 -198 -23q-65 -136 -165.5 -271t-181.5 -215.5t-128 -106.5q-80 -45 -162 3q-28 17 -60.5 43.5t-85 83.5t-102.5 128.5t-107.5 184t-105.5 244t-91.5 314.5t-70.5 390h283q26 -218 70 -398.5t104.5 -317t121.5 -235.5t140 -195q169 169 287 406
+q-142 72 -223 220t-81 333q0 192 104 314.5t284 122.5q178 0 273 -105.5t95 -297.5q0 -159 -58 -286q-7 -1 -19.5 -3t-46 -2t-63 6t-62 25.5t-50.5 51.5q31 103 31 184q0 87 -29 132t-79 45q-53 0 -85 -49.5t-32 -140.5q0 -186 105 -293.5t267 -107.5q62 0 121 14z" />
+    <glyph glyph-name="_431" unicode="&#xf1cb;" horiz-adv-x="1792" 
+d="M216 367l603 -402v359l-334 223zM154 511l193 129l-193 129v-258zM973 -35l603 402l-269 180l-334 -223v-359zM896 458l272 182l-272 182l-272 -182zM485 733l334 223v359l-603 -402zM1445 640l193 -129v258zM1307 733l269 180l-603 402v-359zM1792 913v-546
+q0 -41 -34 -64l-819 -546q-21 -13 -43 -13t-43 13l-819 546q-34 23 -34 64v546q0 41 34 64l819 546q21 13 43 13t43 -13l819 -546q34 -23 34 -64z" />
+    <glyph glyph-name="_432" unicode="&#xf1cc;" horiz-adv-x="2048" 
+d="M1800 764q111 -46 179.5 -145.5t68.5 -221.5q0 -164 -118 -280.5t-285 -116.5q-4 0 -11.5 0.5t-10.5 0.5h-1209h-1h-2h-5q-170 10 -288 125.5t-118 280.5q0 110 55 203t147 147q-12 39 -12 82q0 115 82 196t199 81q95 0 172 -58q75 154 222.5 248t326.5 94
+q166 0 306 -80.5t221.5 -218.5t81.5 -301q0 -6 -0.5 -18t-0.5 -18zM468 498q0 -122 84 -193t208 -71q137 0 240 99q-16 20 -47.5 56.5t-43.5 50.5q-67 -65 -144 -65q-55 0 -93.5 33.5t-38.5 87.5q0 53 38.5 87t91.5 34q44 0 84.5 -21t73 -55t65 -75t69 -82t77 -75t97 -55
+t121.5 -21q121 0 204.5 71.5t83.5 190.5q0 121 -84 192t-207 71q-143 0 -241 -97l93 -108q66 64 142 64q52 0 92 -33t40 -84q0 -57 -37 -91.5t-94 -34.5q-43 0 -82.5 21t-72 55t-65.5 75t-69.5 82t-77.5 75t-96.5 55t-118.5 21q-122 0 -207 -70.5t-85 -189.5z" />
+    <glyph glyph-name="_433" unicode="&#xf1cd;" horiz-adv-x="1792" 
+d="M896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM896 1408q-190 0 -361 -90l194 -194q82 28 167 28t167 -28l194 194q-171 90 -361 90zM218 279l194 194
+q-28 82 -28 167t28 167l-194 194q-90 -171 -90 -361t90 -361zM896 -128q190 0 361 90l-194 194q-82 -28 -167 -28t-167 28l-194 -194q171 -90 361 -90zM896 256q159 0 271.5 112.5t112.5 271.5t-112.5 271.5t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5
+t271.5 -112.5zM1380 473l194 -194q90 171 90 361t-90 361l-194 -194q28 -82 28 -167t-28 -167z" />
+    <glyph glyph-name="_434" unicode="&#xf1ce;" horiz-adv-x="1792" 
+d="M1760 640q0 -176 -68.5 -336t-184 -275.5t-275.5 -184t-336 -68.5t-336 68.5t-275.5 184t-184 275.5t-68.5 336q0 213 97 398.5t265 305.5t374 151v-228q-221 -45 -366.5 -221t-145.5 -406q0 -130 51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5
+t136.5 204t51 248.5q0 230 -145.5 406t-366.5 221v228q206 -31 374 -151t265 -305.5t97 -398.5z" />
+    <glyph glyph-name="uniF1D0" unicode="&#xf1d0;" horiz-adv-x="1792" 
+d="M19 662q8 217 116 406t305 318h5q0 -1 -1 -3q-8 -8 -28 -33.5t-52 -76.5t-60 -110.5t-44.5 -135.5t-14 -150.5t39 -157.5t108.5 -154q50 -50 102 -69.5t90.5 -11.5t69.5 23.5t47 32.5l16 16q39 51 53 116.5t6.5 122.5t-21 107t-26.5 80l-14 29q-10 25 -30.5 49.5t-43 41
+t-43.5 29.5t-35 19l-13 6l104 115q39 -17 78 -52t59 -61l19 -27q1 48 -18.5 103.5t-40.5 87.5l-20 31l161 183l160 -181q-33 -46 -52.5 -102.5t-22.5 -90.5l-4 -33q22 37 61.5 72.5t67.5 52.5l28 17l103 -115q-44 -14 -85 -50t-60 -65l-19 -29q-31 -56 -48 -133.5t-7 -170
+t57 -156.5q33 -45 77.5 -60.5t85 -5.5t76 26.5t57.5 33.5l21 16q60 53 96.5 115t48.5 121.5t10 121.5t-18 118t-37 107.5t-45.5 93t-45 72t-34.5 47.5l-13 17q-14 13 -7 13l10 -3q40 -29 62.5 -46t62 -50t64 -58t58.5 -65t55.5 -77t45.5 -88t38 -103t23.5 -117t10.5 -136
+q3 -259 -108 -465t-312 -321t-456 -115q-185 0 -351 74t-283.5 198t-184 293t-60.5 353z" />
+    <glyph glyph-name="uniF1D1" unicode="&#xf1d1;" horiz-adv-x="1792" 
+d="M874 -102v-66q-208 6 -385 109.5t-283 275.5l58 34q29 -49 73 -99l65 57q148 -168 368 -212l-17 -86q65 -12 121 -13zM276 428l-83 -28q22 -60 49 -112l-57 -33q-98 180 -98 385t98 385l57 -33q-30 -56 -49 -112l82 -28q-35 -100 -35 -212q0 -109 36 -212zM1528 251
+l58 -34q-106 -172 -283 -275.5t-385 -109.5v66q56 1 121 13l-17 86q220 44 368 212l65 -57q44 50 73 99zM1377 805l-233 -80q14 -42 14 -85t-14 -85l232 -80q-31 -92 -98 -169l-185 162q-57 -67 -147 -85l48 -241q-52 -10 -98 -10t-98 10l48 241q-90 18 -147 85l-185 -162
+q-67 77 -98 169l232 80q-14 42 -14 85t14 85l-233 80q33 93 99 169l185 -162q59 68 147 86l-48 240q44 10 98 10t98 -10l-48 -240q88 -18 147 -86l185 162q66 -76 99 -169zM874 1448v-66q-65 -2 -121 -13l17 -86q-220 -42 -368 -211l-65 56q-38 -42 -73 -98l-57 33
+q106 172 282 275.5t385 109.5zM1705 640q0 -205 -98 -385l-57 33q27 52 49 112l-83 28q36 103 36 212q0 112 -35 212l82 28q-19 56 -49 112l57 33q98 -180 98 -385zM1585 1063l-57 -33q-35 56 -73 98l-65 -56q-148 169 -368 211l17 86q-56 11 -121 13v66q209 -6 385 -109.5
+t282 -275.5zM1748 640q0 173 -67.5 331t-181.5 272t-272 181.5t-331 67.5t-331 -67.5t-272 -181.5t-181.5 -272t-67.5 -331t67.5 -331t181.5 -272t272 -181.5t331 -67.5t331 67.5t272 181.5t181.5 272t67.5 331zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71
+t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="uniF1D2" unicode="&#xf1d2;" 
+d="M582 228q0 -66 -93 -66q-107 0 -107 63q0 64 98 64q102 0 102 -61zM546 694q0 -85 -74 -85q-77 0 -77 84q0 90 77 90q36 0 55 -25.5t19 -63.5zM712 769v125q-78 -29 -135 -29q-50 29 -110 29q-86 0 -145 -57t-59 -143q0 -50 29.5 -102t73.5 -67v-3q-38 -17 -38 -85
+q0 -53 41 -77v-3q-113 -37 -113 -139q0 -45 20 -78.5t54 -51t72 -25.5t81 -8q224 0 224 188q0 67 -48 99t-126 46q-27 5 -51.5 20.5t-24.5 39.5q0 44 49 52q77 15 122 70t45 134q0 24 -10 52q37 9 49 13zM771 350h137q-2 27 -2 82v387q0 46 2 69h-137q3 -23 3 -71v-392
+q0 -50 -3 -75zM1280 366v121q-30 -21 -68 -21q-53 0 -53 82v225h52q9 0 26.5 -1t26.5 -1v117h-105q0 82 3 102h-140q4 -24 4 -55v-47h-60v-117q36 3 37 3q3 0 11 -0.5t12 -0.5v-2h-2v-217q0 -37 2.5 -64t11.5 -56.5t24.5 -48.5t43.5 -31t66 -12q64 0 108 24zM924 1072
+q0 36 -24 63.5t-60 27.5t-60.5 -27t-24.5 -64q0 -36 25 -62.5t60 -26.5t59.5 27t24.5 62zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="_438" unicode="&#xf1d3;" horiz-adv-x="1792" 
+d="M595 22q0 100 -165 100q-158 0 -158 -104q0 -101 172 -101q151 0 151 105zM536 777q0 61 -30 102t-89 41q-124 0 -124 -145q0 -135 124 -135q119 0 119 137zM805 1101v-202q-36 -12 -79 -22q16 -43 16 -84q0 -127 -73 -216.5t-197 -112.5q-40 -8 -59.5 -27t-19.5 -58
+q0 -31 22.5 -51.5t58 -32t78.5 -22t86 -25.5t78.5 -37.5t58 -64t22.5 -98.5q0 -304 -363 -304q-69 0 -130 12.5t-116 41t-87.5 82t-32.5 127.5q0 165 182 225v4q-67 41 -67 126q0 109 63 137v4q-72 24 -119.5 108.5t-47.5 165.5q0 139 95 231.5t235 92.5q96 0 178 -47
+q98 0 218 47zM1123 220h-222q4 45 4 134v609q0 94 -4 128h222q-4 -33 -4 -124v-613q0 -89 4 -134zM1724 442v-196q-71 -39 -174 -39q-62 0 -107 20t-70 50t-39.5 78t-18.5 92t-4 103v351h2v4q-7 0 -19 1t-18 1q-21 0 -59 -6v190h96v76q0 54 -6 89h227q-6 -41 -6 -165h171
+v-190q-15 0 -43.5 2t-42.5 2h-85v-365q0 -131 87 -131q61 0 109 33zM1148 1389q0 -58 -39 -101.5t-96 -43.5q-58 0 -98 43.5t-40 101.5q0 59 39.5 103t98.5 44q58 0 96.5 -44.5t38.5 -102.5z" />
+    <glyph glyph-name="_439" unicode="&#xf1d4;" 
+d="M809 532l266 499h-112l-157 -312q-24 -48 -44 -92l-42 92l-155 312h-120l263 -493v-324h101v318zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="uniF1D5" unicode="&#xf1d5;" horiz-adv-x="1280" 
+d="M842 964q0 -80 -57 -136.5t-136 -56.5q-60 0 -111 35q-62 -67 -115 -146q-247 -371 -202 -859q1 -22 -12.5 -38.5t-34.5 -18.5h-5q-20 0 -35 13.5t-17 33.5q-14 126 -3.5 247.5t29.5 217t54 186t69 155.5t74 125q61 90 132 165q-16 35 -16 77q0 80 56.5 136.5t136.5 56.5
+t136.5 -56.5t56.5 -136.5zM1223 953q0 -158 -78 -292t-212.5 -212t-292.5 -78q-64 0 -131 14q-21 5 -32.5 23.5t-6.5 39.5q5 20 23 31.5t39 7.5q51 -13 108 -13q97 0 186 38t153 102t102 153t38 186t-38 186t-102 153t-153 102t-186 38t-186 -38t-153 -102t-102 -153
+t-38 -186q0 -114 52 -218q10 -20 3.5 -40t-25.5 -30t-39.5 -3t-30.5 26q-64 123 -64 265q0 119 46.5 227t124.5 186t186 124t226 46q158 0 292.5 -78t212.5 -212.5t78 -292.5z" />
+    <glyph glyph-name="uniF1D6" unicode="&#xf1d6;" horiz-adv-x="1792" 
+d="M270 730q-8 19 -8 52q0 20 11 49t24 45q-1 22 7.5 53t22.5 43q0 139 92.5 288.5t217.5 209.5q139 66 324 66q133 0 266 -55q49 -21 90 -48t71 -56t55 -68t42 -74t32.5 -84.5t25.5 -89.5t22 -98l1 -5q55 -83 55 -150q0 -14 -9 -40t-9 -38q0 -1 1.5 -3.5t3.5 -5t2 -3.5
+q77 -114 120.5 -214.5t43.5 -208.5q0 -43 -19.5 -100t-55.5 -57q-9 0 -19.5 7.5t-19 17.5t-19 26t-16 26.5t-13.5 26t-9 17.5q-1 1 -3 1l-5 -4q-59 -154 -132 -223q20 -20 61.5 -38.5t69 -41.5t35.5 -65q-2 -4 -4 -16t-7 -18q-64 -97 -302 -97q-53 0 -110.5 9t-98 20
+t-104.5 30q-15 5 -23 7q-14 4 -46 4.5t-40 1.5q-41 -45 -127.5 -65t-168.5 -20q-35 0 -69 1.5t-93 9t-101 20.5t-74.5 40t-32.5 64q0 40 10 59.5t41 48.5q11 2 40.5 13t49.5 12q4 0 14 2q2 2 2 4l-2 3q-48 11 -108 105.5t-73 156.5l-5 3q-4 0 -12 -20q-18 -41 -54.5 -74.5
+t-77.5 -37.5h-1q-4 0 -6 4.5t-5 5.5q-23 54 -23 100q0 275 252 466z" />
+    <glyph glyph-name="uniF1D7" unicode="&#xf1d7;" horiz-adv-x="2048" 
+d="M580 1075q0 41 -25 66t-66 25q-43 0 -76 -25.5t-33 -65.5q0 -39 33 -64.5t76 -25.5q41 0 66 24.5t25 65.5zM1323 568q0 28 -25.5 50t-65.5 22q-27 0 -49.5 -22.5t-22.5 -49.5q0 -28 22.5 -50.5t49.5 -22.5q40 0 65.5 22t25.5 51zM1087 1075q0 41 -24.5 66t-65.5 25
+q-43 0 -76 -25.5t-33 -65.5q0 -39 33 -64.5t76 -25.5q41 0 65.5 24.5t24.5 65.5zM1722 568q0 28 -26 50t-65 22q-27 0 -49.5 -22.5t-22.5 -49.5q0 -28 22.5 -50.5t49.5 -22.5q39 0 65 22t26 51zM1456 965q-31 4 -70 4q-169 0 -311 -77t-223.5 -208.5t-81.5 -287.5
+q0 -78 23 -152q-35 -3 -68 -3q-26 0 -50 1.5t-55 6.5t-44.5 7t-54.5 10.5t-50 10.5l-253 -127l72 218q-290 203 -290 490q0 169 97.5 311t264 223.5t363.5 81.5q176 0 332.5 -66t262 -182.5t136.5 -260.5zM2048 404q0 -117 -68.5 -223.5t-185.5 -193.5l55 -181l-199 109
+q-150 -37 -218 -37q-169 0 -311 70.5t-223.5 191.5t-81.5 264t81.5 264t223.5 191.5t311 70.5q161 0 303 -70.5t227.5 -192t85.5 -263.5z" />
+    <glyph glyph-name="_443" unicode="&#xf1d8;" horiz-adv-x="1792" 
+d="M1764 1525q33 -24 27 -64l-256 -1536q-5 -29 -32 -45q-14 -8 -31 -8q-11 0 -24 5l-453 185l-242 -295q-18 -23 -49 -23q-13 0 -22 4q-19 7 -30.5 23.5t-11.5 36.5v349l864 1059l-1069 -925l-395 162q-37 14 -40 55q-2 40 32 59l1664 960q15 9 32 9q20 0 36 -11z" />
+    <glyph glyph-name="_444" unicode="&#xf1d9;" horiz-adv-x="1792" 
+d="M1764 1525q33 -24 27 -64l-256 -1536q-5 -29 -32 -45q-14 -8 -31 -8q-11 0 -24 5l-527 215l-298 -327q-18 -21 -47 -21q-14 0 -23 4q-19 7 -30 23.5t-11 36.5v452l-472 193q-37 14 -40 55q-3 39 32 59l1664 960q35 21 68 -2zM1422 26l221 1323l-1434 -827l336 -137
+l863 639l-478 -797z" />
+    <glyph glyph-name="_445" unicode="&#xf1da;" 
+d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61q-172 0 -327 72.5t-264 204.5q-7 10 -6.5 22.5t8.5 20.5l137 138q10 9 25 9q16 -2 23 -12q73 -95 179 -147t225 -52q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5
+t-163.5 109.5t-198.5 40.5q-98 0 -188 -35.5t-160 -101.5l137 -138q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l130 -129q107 101 244.5 156.5t284.5 55.5q156 0 298 -61t245 -164t164 -245t61 -298zM896 928v-448q0 -14 -9 -23
+t-23 -9h-320q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="_446" unicode="&#xf1db;" 
+d="M768 1280q-130 0 -248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5t-51 248.5t-136.5 204t-204 136.5t-248.5 51zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103
+t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="_447" unicode="&#xf1dc;" horiz-adv-x="1792" 
+d="M1682 -128q-44 0 -132.5 3.5t-133.5 3.5q-44 0 -132 -3.5t-132 -3.5q-24 0 -37 20.5t-13 45.5q0 31 17 46t39 17t51 7t45 15q33 21 33 140l-1 391q0 21 -1 31q-13 4 -50 4h-675q-38 0 -51 -4q-1 -10 -1 -31l-1 -371q0 -142 37 -164q16 -10 48 -13t57 -3.5t45 -15
+t20 -45.5q0 -26 -12.5 -48t-36.5 -22q-47 0 -139.5 3.5t-138.5 3.5q-43 0 -128 -3.5t-127 -3.5q-23 0 -35.5 21t-12.5 45q0 30 15.5 45t36 17.5t47.5 7.5t42 15q33 23 33 143l-1 57v813q0 3 0.5 26t0 36.5t-1.5 38.5t-3.5 42t-6.5 36.5t-11 31.5t-16 18q-15 10 -45 12t-53 2
+t-41 14t-18 45q0 26 12 48t36 22q46 0 138.5 -3.5t138.5 -3.5q42 0 126.5 3.5t126.5 3.5q25 0 37.5 -22t12.5 -48q0 -30 -17 -43.5t-38.5 -14.5t-49.5 -4t-43 -13q-35 -21 -35 -160l1 -320q0 -21 1 -32q13 -3 39 -3h699q25 0 38 3q1 11 1 32l1 320q0 139 -35 160
+q-18 11 -58.5 12.5t-66 13t-25.5 49.5q0 26 12.5 48t37.5 22q44 0 132 -3.5t132 -3.5q43 0 129 3.5t129 3.5q25 0 37.5 -22t12.5 -48q0 -30 -17.5 -44t-40 -14.5t-51.5 -3t-44 -12.5q-35 -23 -35 -161l1 -943q0 -119 34 -140q16 -10 46 -13.5t53.5 -4.5t41.5 -15.5t18 -44.5
+q0 -26 -12 -48t-36 -22z" />
+    <glyph glyph-name="_448" unicode="&#xf1dd;" horiz-adv-x="1280" 
+d="M1278 1347v-73q0 -29 -18.5 -61t-42.5 -32q-50 0 -54 -1q-26 -6 -32 -31q-3 -11 -3 -64v-1152q0 -25 -18 -43t-43 -18h-108q-25 0 -43 18t-18 43v1218h-143v-1218q0 -25 -17.5 -43t-43.5 -18h-108q-26 0 -43.5 18t-17.5 43v496q-147 12 -245 59q-126 58 -192 179
+q-64 117 -64 259q0 166 88 286q88 118 209 159q111 37 417 37h479q25 0 43 -18t18 -43z" />
+    <glyph glyph-name="_449" unicode="&#xf1de;" 
+d="M352 128v-128h-352v128h352zM704 256q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h256zM864 640v-128h-864v128h864zM224 1152v-128h-224v128h224zM1536 128v-128h-736v128h736zM576 1280q26 0 45 -19t19 -45v-256
+q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h256zM1216 768q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h256zM1536 640v-128h-224v128h224zM1536 1152v-128h-864v128h864z" />
+    <glyph glyph-name="uniF1E0" unicode="&#xf1e0;" 
+d="M1216 512q133 0 226.5 -93.5t93.5 -226.5t-93.5 -226.5t-226.5 -93.5t-226.5 93.5t-93.5 226.5q0 12 2 34l-360 180q-92 -86 -218 -86q-133 0 -226.5 93.5t-93.5 226.5t93.5 226.5t226.5 93.5q126 0 218 -86l360 180q-2 22 -2 34q0 133 93.5 226.5t226.5 93.5
+t226.5 -93.5t93.5 -226.5t-93.5 -226.5t-226.5 -93.5q-126 0 -218 86l-360 -180q2 -22 2 -34t-2 -34l360 -180q92 86 218 86z" />
+    <glyph glyph-name="_451" unicode="&#xf1e1;" 
+d="M1280 341q0 88 -62.5 151t-150.5 63q-84 0 -145 -58l-241 120q2 16 2 23t-2 23l241 120q61 -58 145 -58q88 0 150.5 63t62.5 151t-62.5 150.5t-150.5 62.5t-151 -62.5t-63 -150.5q0 -7 2 -23l-241 -120q-62 57 -145 57q-88 0 -150.5 -62.5t-62.5 -150.5t62.5 -150.5
+t150.5 -62.5q83 0 145 57l241 -120q-2 -16 -2 -23q0 -88 63 -150.5t151 -62.5t150.5 62.5t62.5 150.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="_452" unicode="&#xf1e2;" horiz-adv-x="1792" 
+d="M571 947q-10 25 -34 35t-49 0q-108 -44 -191 -127t-127 -191q-10 -25 0 -49t35 -34q13 -5 24 -5q42 0 60 40q34 84 98.5 148.5t148.5 98.5q25 11 35 35t0 49zM1513 1303l46 -46l-244 -243l68 -68q19 -19 19 -45.5t-19 -45.5l-64 -64q89 -161 89 -343q0 -143 -55.5 -273.5
+t-150 -225t-225 -150t-273.5 -55.5t-273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5q182 0 343 -89l64 64q19 19 45.5 19t45.5 -19l68 -68zM1521 1359q-10 -10 -22 -10q-13 0 -23 10l-91 90q-9 10 -9 23t9 23q10 9 23 9t23 -9l90 -91
+q10 -9 10 -22.5t-10 -22.5zM1751 1129q-11 -9 -23 -9t-23 9l-90 91q-10 9 -10 22.5t10 22.5q9 10 22.5 10t22.5 -10l91 -90q9 -10 9 -23t-9 -23zM1792 1312q0 -14 -9 -23t-23 -9h-96q-14 0 -23 9t-9 23t9 23t23 9h96q14 0 23 -9t9 -23zM1600 1504v-96q0 -14 -9 -23t-23 -9
+t-23 9t-9 23v96q0 14 9 23t23 9t23 -9t9 -23zM1751 1449l-91 -90q-10 -10 -22 -10q-13 0 -23 10q-10 9 -10 22.5t10 22.5l90 91q10 9 23 9t23 -9q9 -10 9 -23t-9 -23z" />
+    <glyph glyph-name="_453" unicode="&#xf1e3;" horiz-adv-x="1792" 
+d="M609 720l287 208l287 -208l-109 -336h-355zM896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM1515 186q149 203 149 454v3l-102 -89l-240 224l63 323
+l134 -12q-150 206 -389 282l53 -124l-287 -159l-287 159l53 124q-239 -76 -389 -282l135 12l62 -323l-240 -224l-102 89v-3q0 -251 149 -454l30 132l326 -40l139 -298l-116 -69q117 -39 240 -39t240 39l-116 69l139 298l326 40z" />
+    <glyph glyph-name="_454" unicode="&#xf1e4;" horiz-adv-x="1792" 
+d="M448 224v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM256 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM832 224v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23
+v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM640 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM66 768q-28 0 -47 19t-19 46v129h514v-129q0 -27 -19 -46t-46 -19h-383zM1216 224v-192q0 -14 -9 -23t-23 -9h-192
+q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1024 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1600 224v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23
+zM1408 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 1016v-13h-514v10q0 104 -382 102q-382 -1 -382 -102v-10h-514v13q0 17 8.5 43t34 64t65.5 75.5t110.5 76t160 67.5t224 47.5t293.5 18.5t293 -18.5t224 -47.5
+t160.5 -67.5t110.5 -76t65.5 -75.5t34 -64t8.5 -43zM1792 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 962v-129q0 -27 -19 -46t-46 -19h-384q-27 0 -46 19t-19 46v129h514z" />
+    <glyph glyph-name="_455" unicode="&#xf1e5;" horiz-adv-x="1792" 
+d="M704 1216v-768q0 -26 -19 -45t-45 -19v-576q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v512l249 873q7 23 31 23h424zM1024 1216v-704h-256v704h256zM1792 320v-512q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v576q-26 0 -45 19t-19 45v768h424q24 0 31 -23z
+M736 1504v-224h-352v224q0 14 9 23t23 9h288q14 0 23 -9t9 -23zM1408 1504v-224h-352v224q0 14 9 23t23 9h288q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="_456" unicode="&#xf1e6;" horiz-adv-x="1792" 
+d="M1755 1083q37 -38 37 -90.5t-37 -90.5l-401 -400l150 -150l-160 -160q-163 -163 -389.5 -186.5t-411.5 100.5l-362 -362h-181v181l362 362q-124 185 -100.5 411.5t186.5 389.5l160 160l150 -150l400 401q38 37 91 37t90 -37t37 -90.5t-37 -90.5l-400 -401l234 -234
+l401 400q38 37 91 37t90 -37z" />
+    <glyph glyph-name="_457" unicode="&#xf1e7;" horiz-adv-x="1792" 
+d="M873 796q0 -83 -63.5 -142.5t-152.5 -59.5t-152.5 59.5t-63.5 142.5q0 84 63.5 143t152.5 59t152.5 -59t63.5 -143zM1375 796q0 -83 -63 -142.5t-153 -59.5q-89 0 -152.5 59.5t-63.5 142.5q0 84 63.5 143t152.5 59q90 0 153 -59t63 -143zM1600 616v667q0 87 -32 123.5
+t-111 36.5h-1112q-83 0 -112.5 -34t-29.5 -126v-673q43 -23 88.5 -40t81 -28t81 -18.5t71 -11t70 -4t58.5 -0.5t56.5 2t44.5 2q68 1 95 -27q6 -6 10 -9q26 -25 61 -51q7 91 118 87q5 0 36.5 -1.5t43 -2t45.5 -1t53 1t54.5 4.5t61 8.5t62 13.5t67 19.5t67.5 27t72 34.5z
+M1763 621q-121 -149 -372 -252q84 -285 -23 -465q-66 -113 -183 -148q-104 -32 -182 15q-86 51 -82 164l-1 326v1q-8 2 -24.5 6t-23.5 5l-1 -338q4 -114 -83 -164q-79 -47 -183 -15q-117 36 -182 150q-105 180 -22 463q-251 103 -372 252q-25 37 -4 63t60 -1q4 -2 11.5 -7
+t10.5 -8v694q0 72 47 123t114 51h1257q67 0 114 -51t47 -123v-694l21 15q39 27 60 1t-4 -63z" />
+    <glyph glyph-name="_458" unicode="&#xf1e8;" horiz-adv-x="1792" 
+d="M896 1102v-434h-145v434h145zM1294 1102v-434h-145v434h145zM1294 342l253 254v795h-1194v-1049h326v-217l217 217h398zM1692 1536v-1013l-434 -434h-326l-217 -217h-217v217h-398v1158l109 289h1483z" />
+    <glyph glyph-name="_459" unicode="&#xf1e9;" 
+d="M773 217v-127q-1 -292 -6 -305q-12 -32 -51 -40q-54 -9 -181.5 38t-162.5 89q-13 15 -17 36q-1 12 4 26q4 10 34 47t181 216q1 0 60 70q15 19 39.5 24.5t49.5 -3.5q24 -10 37.5 -29t12.5 -42zM624 468q-3 -55 -52 -70l-120 -39q-275 -88 -292 -88q-35 2 -54 36
+q-12 25 -17 75q-8 76 1 166.5t30 124.5t56 32q13 0 202 -77q71 -29 115 -47l84 -34q23 -9 35.5 -30.5t11.5 -48.5zM1450 171q-7 -54 -91.5 -161t-135.5 -127q-37 -14 -63 7q-14 10 -184 287l-47 77q-14 21 -11.5 46t19.5 46q35 43 83 26q1 -1 119 -40q203 -66 242 -79.5
+t47 -20.5q28 -22 22 -61zM778 803q5 -102 -54 -122q-58 -17 -114 71l-378 598q-8 35 19 62q41 43 207.5 89.5t224.5 31.5q40 -10 49 -45q3 -18 22 -305.5t24 -379.5zM1440 695q3 -39 -26 -59q-15 -10 -329 -86q-67 -15 -91 -23l1 2q-23 -6 -46 4t-37 32q-30 47 0 87
+q1 1 75 102q125 171 150 204t34 39q28 19 65 2q48 -23 123 -133.5t81 -167.5v-3z" />
+    <glyph glyph-name="_460" unicode="&#xf1ea;" horiz-adv-x="2048" 
+d="M1024 1024h-384v-384h384v384zM1152 384v-128h-640v128h640zM1152 1152v-640h-640v640h640zM1792 384v-128h-512v128h512zM1792 640v-128h-512v128h512zM1792 896v-128h-512v128h512zM1792 1152v-128h-512v128h512zM256 192v960h-128v-960q0 -26 19 -45t45 -19t45 19
+t19 45zM1920 192v1088h-1536v-1088q0 -33 -11 -64h1483q26 0 45 19t19 45zM2048 1408v-1216q0 -80 -56 -136t-136 -56h-1664q-80 0 -136 56t-56 136v1088h256v128h1792z" />
+    <glyph glyph-name="_461" unicode="&#xf1eb;" horiz-adv-x="2048" 
+d="M1024 13q-20 0 -93 73.5t-73 93.5q0 32 62.5 54t103.5 22t103.5 -22t62.5 -54q0 -20 -73 -93.5t-93 -73.5zM1294 284q-2 0 -40 25t-101.5 50t-128.5 25t-128.5 -25t-101 -50t-40.5 -25q-18 0 -93.5 75t-75.5 93q0 13 10 23q78 77 196 121t233 44t233 -44t196 -121
+q10 -10 10 -23q0 -18 -75.5 -93t-93.5 -75zM1567 556q-11 0 -23 8q-136 105 -252 154.5t-268 49.5q-85 0 -170.5 -22t-149 -53t-113.5 -62t-79 -53t-31 -22q-17 0 -92 75t-75 93q0 12 10 22q132 132 320 205t380 73t380 -73t320 -205q10 -10 10 -22q0 -18 -75 -93t-92 -75z
+M1838 827q-11 0 -22 9q-179 157 -371.5 236.5t-420.5 79.5t-420.5 -79.5t-371.5 -236.5q-11 -9 -22 -9q-17 0 -92.5 75t-75.5 93q0 13 10 23q187 186 445 288t527 102t527 -102t445 -288q10 -10 10 -23q0 -18 -75.5 -93t-92.5 -75z" />
+    <glyph glyph-name="_462" unicode="&#xf1ec;" horiz-adv-x="1792" 
+d="M384 0q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM768 0q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM384 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5
+t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1152 0q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM768 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5
+t37.5 90.5zM384 768q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1152 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM768 768q0 53 -37.5 90.5t-90.5 37.5
+t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1536 0v384q0 52 -38 90t-90 38t-90 -38t-38 -90v-384q0 -52 38 -90t90 -38t90 38t38 90zM1152 768q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5z
+M1536 1088v256q0 26 -19 45t-45 19h-1280q-26 0 -45 -19t-19 -45v-256q0 -26 19 -45t45 -19h1280q26 0 45 19t19 45zM1536 768q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 1408v-1536q0 -52 -38 -90t-90 -38
+h-1408q-52 0 -90 38t-38 90v1536q0 52 38 90t90 38h1408q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="_463" unicode="&#xf1ed;" 
+d="M1519 890q18 -84 -4 -204q-87 -444 -565 -444h-44q-25 0 -44 -16.5t-24 -42.5l-4 -19l-55 -346l-2 -15q-5 -26 -24.5 -42.5t-44.5 -16.5h-251q-21 0 -33 15t-9 36q9 56 26.5 168t26.5 168t27 167.5t27 167.5q5 37 43 37h131q133 -2 236 21q175 39 287 144q102 95 155 246
+q24 70 35 133q1 6 2.5 7.5t3.5 1t6 -3.5q79 -59 98 -162zM1347 1172q0 -107 -46 -236q-80 -233 -302 -315q-113 -40 -252 -42q0 -1 -90 -1l-90 1q-100 0 -118 -96q-2 -8 -85 -530q-1 -10 -12 -10h-295q-22 0 -36.5 16.5t-11.5 38.5l232 1471q5 29 27.5 48t51.5 19h598
+q34 0 97.5 -13t111.5 -32q107 -41 163.5 -123t56.5 -196z" />
+    <glyph glyph-name="_464" unicode="&#xf1ee;" horiz-adv-x="1792" 
+d="M441 864q33 0 52 -26q266 -364 362 -774h-446q-127 441 -367 749q-12 16 -3 33.5t29 17.5h373zM1000 507q-49 -199 -125 -393q-79 310 -256 594q40 221 44 449q211 -340 337 -650zM1099 1216q235 -324 384.5 -698.5t184.5 -773.5h-451q-41 665 -553 1472h435zM1792 640
+q0 -424 -101 -812q-67 560 -359 1083q-25 301 -106 584q-4 16 5.5 28.5t25.5 12.5h359q21 0 38.5 -13t22.5 -33q115 -409 115 -850z" />
+    <glyph glyph-name="uniF1F0" unicode="&#xf1f0;" horiz-adv-x="2304" 
+d="M1975 546h-138q14 37 66 179l3 9q4 10 10 26t9 26l12 -55zM531 611l-58 295q-11 54 -75 54h-268l-2 -13q311 -79 403 -336zM710 960l-162 -438l-17 89q-26 70 -85 129.5t-131 88.5l135 -510h175l261 641h-176zM849 318h166l104 642h-166zM1617 944q-69 27 -149 27
+q-123 0 -201 -59t-79 -153q-1 -102 145 -174q48 -23 67 -41t19 -39q0 -30 -30 -46t-69 -16q-86 0 -156 33l-22 11l-23 -144q74 -34 185 -34q130 -1 208.5 59t80.5 160q0 106 -140 174q-49 25 -71 42t-22 38q0 22 24.5 38.5t70.5 16.5q70 1 124 -24l15 -8zM2042 960h-128
+q-65 0 -87 -54l-246 -588h174l35 96h212q5 -22 20 -96h154zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="_466" unicode="&#xf1f1;" horiz-adv-x="2304" 
+d="M1119 1195q-128 85 -281 85q-103 0 -197.5 -40.5t-162.5 -108.5t-108.5 -162t-40.5 -197q0 -104 40.5 -198t108.5 -162t162 -108.5t198 -40.5q153 0 281 85q-131 107 -178 265.5t0.5 316.5t177.5 265zM1152 1171q-126 -99 -172 -249.5t-0.5 -300.5t172.5 -249
+q127 99 172.5 249t-0.5 300.5t-172 249.5zM1185 1195q130 -107 177.5 -265.5t0.5 -317t-178 -264.5q128 -85 281 -85q104 0 198 40.5t162 108.5t108.5 162t40.5 198q0 103 -40.5 197t-108.5 162t-162.5 108.5t-197.5 40.5q-153 0 -281 -85zM1926 473h7v3h-17v-3h7v-17h3v17z
+M1955 456h4v20h-5l-6 -13l-6 13h-5v-20h3v15l6 -13h4l5 13v-15zM1947 16v-2h-2h-3v3h3h2v-1zM1947 7h3l-4 5h2l1 1q1 1 1 3t-1 3l-1 1h-3h-6v-13h3v5h1zM685 75q0 19 11 31t30 12q18 0 29 -12.5t11 -30.5q0 -19 -11 -31t-29 -12q-19 0 -30 12t-11 31zM1158 119q30 0 35 -32
+h-70q5 32 35 32zM1514 75q0 19 11 31t29 12t29.5 -12.5t11.5 -30.5q0 -19 -11 -31t-30 -12q-18 0 -29 12t-11 31zM1786 75q0 18 11.5 30.5t29.5 12.5t29.5 -12.5t11.5 -30.5q0 -19 -11.5 -31t-29.5 -12t-29.5 12.5t-11.5 30.5zM1944 3q-2 0 -4 1q-1 0 -3 2t-2 3q-1 2 -1 4
+q0 3 1 4q0 2 2 4l1 1q2 0 2 1q2 1 4 1q3 0 4 -1l4 -2l2 -4v-1q1 -2 1 -3l-1 -1v-3t-1 -1l-1 -2q-2 -2 -4 -2q-1 -1 -4 -1zM599 7h30v85q0 24 -14.5 38.5t-39.5 15.5q-32 0 -47 -24q-14 24 -45 24q-24 0 -39 -20v16h-30v-135h30v75q0 36 33 36q30 0 30 -36v-75h29v75
+q0 36 33 36q30 0 30 -36v-75zM765 7h29v68v67h-29v-16q-17 20 -43 20q-29 0 -48 -20t-19 -51t19 -51t48 -20q28 0 43 20v-17zM943 48q0 34 -47 40l-14 2q-23 4 -23 14q0 15 25 15q23 0 43 -11l12 24q-22 14 -55 14q-26 0 -41 -12t-15 -32q0 -33 47 -39l13 -2q24 -4 24 -14
+q0 -17 -31 -17q-25 0 -45 14l-13 -23q25 -17 58 -17q29 0 45.5 12t16.5 32zM1073 14l-8 25q-13 -7 -26 -7q-19 0 -19 22v61h48v27h-48v41h-30v-41h-28v-27h28v-61q0 -50 47 -50q21 0 36 10zM1159 146q-29 0 -48 -20t-19 -51q0 -32 19.5 -51.5t49.5 -19.5q33 0 55 19l-14 22
+q-18 -15 -39 -15q-34 0 -41 33h101v12q0 32 -18 51.5t-46 19.5zM1318 146q-23 0 -35 -20v16h-30v-135h30v76q0 35 29 35q10 0 18 -4l9 28q-9 4 -21 4zM1348 75q0 -31 19.5 -51t52.5 -20q29 0 48 16l-14 24q-18 -13 -35 -12q-18 0 -29.5 12t-11.5 31t11.5 31t29.5 12
+q19 0 35 -12l14 24q-20 16 -48 16q-33 0 -52.5 -20t-19.5 -51zM1593 7h30v68v67h-30v-16q-15 20 -42 20q-29 0 -48.5 -20t-19.5 -51t19.5 -51t48.5 -20q28 0 42 20v-17zM1726 146q-23 0 -35 -20v16h-29v-135h29v76q0 35 29 35q10 0 18 -4l9 28q-8 4 -21 4zM1866 7h29v68v122
+h-29v-71q-15 20 -43 20t-47.5 -20.5t-19.5 -50.5t19.5 -50.5t47.5 -20.5q29 0 43 20v-17zM1944 27l-2 -1h-3q-2 -1 -4 -3q-3 -1 -3 -4q-1 -2 -1 -6q0 -3 1 -5q0 -2 3 -4q2 -2 4 -3t5 -1q4 0 6 1q0 1 2 2l2 1q1 1 3 4q1 2 1 5q0 4 -1 6q-1 1 -3 4q0 1 -2 2l-2 1q-1 0 -3 0.5
+t-3 0.5zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="_467" unicode="&#xf1f2;" horiz-adv-x="2304" 
+d="M313 759q0 -51 -36 -84q-29 -26 -89 -26h-17v220h17q61 0 89 -27q36 -31 36 -83zM2089 824q0 -52 -64 -52h-19v101h20q63 0 63 -49zM380 759q0 74 -50 120.5t-129 46.5h-95v-333h95q74 0 119 38q60 51 60 128zM410 593h65v333h-65v-333zM730 694q0 40 -20.5 62t-75.5 42
+q-29 10 -39.5 19t-10.5 23q0 16 13.5 26.5t34.5 10.5q29 0 53 -27l34 44q-41 37 -98 37q-44 0 -74 -27.5t-30 -67.5q0 -35 18 -55.5t64 -36.5q37 -13 45 -19q19 -12 19 -34q0 -20 -14 -33.5t-36 -13.5q-48 0 -71 44l-42 -40q44 -64 115 -64q51 0 83 30.5t32 79.5zM1008 604
+v77q-37 -37 -78 -37q-49 0 -80.5 32.5t-31.5 82.5q0 48 31.5 81.5t77.5 33.5q43 0 81 -38v77q-40 20 -80 20q-74 0 -125.5 -50.5t-51.5 -123.5t51 -123.5t125 -50.5q42 0 81 19zM2240 0v527q-65 -40 -144.5 -84t-237.5 -117t-329.5 -137.5t-417.5 -134.5t-504 -118h1569
+q26 0 45 19t19 45zM1389 757q0 75 -53 128t-128 53t-128 -53t-53 -128t53 -128t128 -53t128 53t53 128zM1541 584l144 342h-71l-90 -224l-89 224h-71l142 -342h35zM1714 593h184v56h-119v90h115v56h-115v74h119v57h-184v-333zM2105 593h80l-105 140q76 16 76 94q0 47 -31 73
+t-87 26h-97v-333h65v133h9zM2304 1274v-1268q0 -56 -38.5 -95t-93.5 -39h-2040q-55 0 -93.5 39t-38.5 95v1268q0 56 38.5 95t93.5 39h2040q55 0 93.5 -39t38.5 -95z" />
+    <glyph glyph-name="f1f3" unicode="&#xf1f3;" horiz-adv-x="2304" 
+d="M119 854h89l-45 108zM740 328l74 79l-70 79h-163v-49h142v-55h-142v-54h159zM898 406l99 -110v217zM1186 453q0 33 -40 33h-84v-69h83q41 0 41 36zM1475 457q0 29 -42 29h-82v-61h81q43 0 43 32zM1197 923q0 29 -42 29h-82v-60h81q43 0 43 31zM1656 854h89l-44 108z
+M699 1009v-271h-66v212l-94 -212h-57l-94 212v-212h-132l-25 60h-135l-25 -60h-70l116 271h96l110 -257v257h106l85 -184l77 184h108zM1255 453q0 -20 -5.5 -35t-14 -25t-22.5 -16.5t-26 -10t-31.5 -4.5t-31.5 -1t-32.5 0.5t-29.5 0.5v-91h-126l-80 90l-83 -90h-256v271h260
+l80 -89l82 89h207q109 0 109 -89zM964 794v-56h-217v271h217v-57h-152v-49h148v-55h-148v-54h152zM2304 235v-229q0 -55 -38.5 -94.5t-93.5 -39.5h-2040q-55 0 -93.5 39.5t-38.5 94.5v678h111l25 61h55l25 -61h218v46l19 -46h113l20 47v-47h541v99l10 1q10 0 10 -14v-86h279
+v23q23 -12 55 -18t52.5 -6.5t63 0.5t51.5 1l25 61h56l25 -61h227v58l34 -58h182v378h-180v-44l-25 44h-185v-44l-23 44h-249q-69 0 -109 -22v22h-172v-22q-24 22 -73 22h-628l-43 -97l-43 97h-198v-44l-22 44h-169l-78 -179v391q0 55 38.5 94.5t93.5 39.5h2040
+q55 0 93.5 -39.5t38.5 -94.5v-678h-120q-51 0 -81 -22v22h-177q-55 0 -78 -22v22h-316v-22q-31 22 -87 22h-209v-22q-23 22 -91 22h-234l-54 -58l-50 58h-349v-378h343l55 59l52 -59h211v89h21q59 0 90 13v-102h174v99h8q8 0 10 -2t2 -10v-87h529q57 0 88 24v-24h168
+q60 0 95 17zM1546 469q0 -23 -12 -43t-34 -29q25 -9 34 -26t9 -46v-54h-65v45q0 33 -12 43.5t-46 10.5h-69v-99h-65v271h154q48 0 77 -15t29 -58zM1269 936q0 -24 -12.5 -44t-33.5 -29q26 -9 34.5 -25.5t8.5 -46.5v-53h-65q0 9 0.5 26.5t0 25t-3 18.5t-8.5 16t-17.5 8.5
+t-29.5 3.5h-70v-98h-64v271l153 -1q49 0 78 -14.5t29 -57.5zM1798 327v-56h-216v271h216v-56h-151v-49h148v-55h-148v-54zM1372 1009v-271h-66v271h66zM2065 357q0 -86 -102 -86h-126v58h126q34 0 34 25q0 16 -17 21t-41.5 5t-49.5 3.5t-42 22.5t-17 55q0 39 26 60t66 21
+h130v-57h-119q-36 0 -36 -25q0 -16 17.5 -20.5t42 -4t49 -2.5t42 -21.5t17.5 -54.5zM2304 407v-101q-24 -35 -88 -35h-125v58h125q33 0 33 25q0 13 -12.5 19t-31 5.5t-40 2t-40 8t-31 24t-12.5 48.5q0 39 26.5 60t66.5 21h129v-57h-118q-36 0 -36 -25q0 -20 29 -22t68.5 -5
+t56.5 -26zM2139 1008v-270h-92l-122 203v-203h-132l-26 60h-134l-25 -60h-75q-129 0 -129 133q0 138 133 138h63v-59q-7 0 -28 1t-28.5 0.5t-23 -2t-21.5 -6.5t-14.5 -13.5t-11.5 -23t-3 -33.5q0 -38 13.5 -58t49.5 -20h29l92 213h97l109 -256v256h99l114 -188v188h66z" />
+    <glyph glyph-name="_469" unicode="&#xf1f4;" horiz-adv-x="2304" 
+d="M745 630q0 -37 -25.5 -61.5t-62.5 -24.5q-29 0 -46.5 16t-17.5 44q0 37 25 62.5t62 25.5q28 0 46.5 -16.5t18.5 -45.5zM1530 779q0 -42 -22 -57t-66 -15l-32 -1l17 107q2 11 13 11h18q22 0 35 -2t25 -12.5t12 -30.5zM1881 630q0 -36 -25.5 -61t-61.5 -25q-29 0 -47 16
+t-18 44q0 37 25 62.5t62 25.5q28 0 46.5 -16.5t18.5 -45.5zM513 801q0 59 -38.5 85.5t-100.5 26.5h-160q-19 0 -21 -19l-65 -408q-1 -6 3 -11t10 -5h76q20 0 22 19l18 110q1 8 7 13t15 6.5t17 1.5t19 -1t14 -1q86 0 135 48.5t49 134.5zM822 489l41 261q1 6 -3 11t-10 5h-76
+q-14 0 -17 -33q-27 40 -95 40q-72 0 -122.5 -54t-50.5 -127q0 -59 34.5 -94t92.5 -35q28 0 58 12t48 32q-4 -12 -4 -21q0 -16 13 -16h69q19 0 22 19zM1269 752q0 5 -4 9.5t-9 4.5h-77q-11 0 -18 -10l-106 -156l-44 150q-5 16 -22 16h-75q-5 0 -9 -4.5t-4 -9.5q0 -2 19.5 -59
+t42 -123t23.5 -70q-82 -112 -82 -120q0 -13 13 -13h77q11 0 18 10l255 368q2 2 2 7zM1649 801q0 59 -38.5 85.5t-100.5 26.5h-159q-20 0 -22 -19l-65 -408q-1 -6 3 -11t10 -5h82q12 0 16 13l18 116q1 8 7 13t15 6.5t17 1.5t19 -1t14 -1q86 0 135 48.5t49 134.5zM1958 489
+l41 261q1 6 -3 11t-10 5h-76q-14 0 -17 -33q-26 40 -95 40q-72 0 -122.5 -54t-50.5 -127q0 -59 34.5 -94t92.5 -35q29 0 59 12t47 32q0 -1 -2 -9t-2 -12q0 -16 13 -16h69q19 0 22 19zM2176 898v1q0 14 -13 14h-74q-11 0 -13 -11l-65 -416l-1 -2q0 -5 4 -9.5t10 -4.5h66
+q19 0 21 19zM392 764q-5 -35 -26 -46t-60 -11l-33 -1l17 107q2 11 13 11h19q40 0 58 -11.5t12 -48.5zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="_470" unicode="&#xf1f5;" horiz-adv-x="2304" 
+d="M1597 633q0 -69 -21 -106q-19 -35 -52 -35q-23 0 -41 9v224q29 30 57 30q57 0 57 -122zM2035 669h-110q6 98 56 98q51 0 54 -98zM476 534q0 59 -33 91.5t-101 57.5q-36 13 -52 24t-16 25q0 26 38 26q58 0 124 -33l18 112q-67 32 -149 32q-77 0 -123 -38q-48 -39 -48 -109
+q0 -58 32.5 -90.5t99.5 -56.5q39 -14 54.5 -25.5t15.5 -27.5q0 -31 -48 -31q-29 0 -70 12.5t-72 30.5l-18 -113q72 -41 168 -41q81 0 129 37q51 41 51 117zM771 749l19 111h-96v135l-129 -21l-18 -114l-46 -8l-17 -103h62v-219q0 -84 44 -120q38 -30 111 -30q32 0 79 11v118
+q-32 -7 -44 -7q-42 0 -42 50v197h77zM1087 724v139q-15 3 -28 3q-32 0 -55.5 -16t-33.5 -46l-10 56h-131v-471h150v306q26 31 82 31q16 0 26 -2zM1124 389h150v471h-150v-471zM1746 638q0 122 -45 179q-40 52 -111 52q-64 0 -117 -56l-8 47h-132v-645l150 25v151
+q36 -11 68 -11q83 0 134 56q61 65 61 202zM1278 986q0 33 -23 56t-56 23t-56 -23t-23 -56t23 -56.5t56 -23.5t56 23.5t23 56.5zM2176 629q0 113 -48 176q-50 64 -144 64q-96 0 -151.5 -66t-55.5 -180q0 -128 63 -188q55 -55 161 -55q101 0 160 40l-16 103q-57 -31 -128 -31
+q-43 0 -63 19q-23 19 -28 66h248q2 14 2 52zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="_471" unicode="&#xf1f6;" horiz-adv-x="2048" 
+d="M1558 684q61 -356 298 -556q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-180.5 74.5t-75.5 180.5zM1024 -176q16 0 16 16t-16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5zM2026 1424q8 -10 7.5 -23.5t-10.5 -22.5
+l-1872 -1622q-10 -8 -23.5 -7t-21.5 11l-84 96q-8 10 -7.5 23.5t10.5 21.5l186 161q-19 32 -19 66q50 42 91 88t85 119.5t74.5 158.5t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q124 -18 219 -82.5t148 -157.5
+l418 363q10 8 23.5 7t21.5 -11z" />
+    <glyph glyph-name="_472" unicode="&#xf1f7;" horiz-adv-x="2048" 
+d="M1040 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM503 315l877 760q-42 88 -132.5 146.5t-223.5 58.5q-93 0 -169.5 -31.5t-121.5 -80.5t-69 -103t-24 -105q0 -384 -137 -645zM1856 128
+q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-180.5 74.5t-75.5 180.5l149 129h757q-166 187 -227 459l111 97q61 -356 298 -556zM1942 1520l84 -96q8 -10 7.5 -23.5t-10.5 -22.5l-1872 -1622q-10 -8 -23.5 -7t-21.5 11l-84 96q-8 10 -7.5 23.5t10.5 21.5l186 161
+q-19 32 -19 66q50 42 91 88t85 119.5t74.5 158.5t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q124 -18 219 -82.5t148 -157.5l418 363q10 8 23.5 7t21.5 -11z" />
+    <glyph glyph-name="_473" unicode="&#xf1f8;" horiz-adv-x="1408" 
+d="M512 160v704q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-704q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM768 160v704q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-704q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1024 160v704q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-704
+q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM480 1152h448l-48 117q-7 9 -17 11h-317q-10 -2 -17 -11zM1408 1120v-64q0 -14 -9 -23t-23 -9h-96v-948q0 -83 -47 -143.5t-113 -60.5h-832q-66 0 -113 58.5t-47 141.5v952h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h309l70 167
+q15 37 54 63t79 26h320q40 0 79 -26t54 -63l70 -167h309q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="_474" unicode="&#xf1f9;" 
+d="M1150 462v-109q0 -50 -36.5 -89t-94 -60.5t-118 -32.5t-117.5 -11q-205 0 -342.5 139t-137.5 346q0 203 136 339t339 136q34 0 75.5 -4.5t93 -18t92.5 -34t69 -56.5t28 -81v-109q0 -16 -16 -16h-118q-16 0 -16 16v70q0 43 -65.5 67.5t-137.5 24.5q-140 0 -228.5 -91.5
+t-88.5 -237.5q0 -151 91.5 -249.5t233.5 -98.5q68 0 138 24t70 66v70q0 7 4.5 11.5t10.5 4.5h119q6 0 11 -4.5t5 -11.5zM768 1280q-130 0 -248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5
+t-51 248.5t-136.5 204t-204 136.5t-248.5 51zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="_475" unicode="&#xf1fa;" 
+d="M972 761q0 108 -53.5 169t-147.5 61q-63 0 -124 -30.5t-110 -84.5t-79.5 -137t-30.5 -180q0 -112 53.5 -173t150.5 -61q96 0 176 66.5t122.5 166t42.5 203.5zM1536 640q0 -111 -37 -197t-98.5 -135t-131.5 -74.5t-145 -27.5q-6 0 -15.5 -0.5t-16.5 -0.5q-95 0 -142 53
+q-28 33 -33 83q-52 -66 -131.5 -110t-173.5 -44q-161 0 -249.5 95.5t-88.5 269.5q0 157 66 290t179 210.5t246 77.5q87 0 155 -35.5t106 -99.5l2 19l11 56q1 6 5.5 12t9.5 6h118q5 0 13 -11q5 -5 3 -16l-120 -614q-5 -24 -5 -48q0 -39 12.5 -52t44.5 -13q28 1 57 5.5t73 24
+t77 50t57 89.5t24 137q0 292 -174 466t-466 174q-130 0 -248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51q228 0 405 144q11 9 24 8t21 -12l41 -49q8 -12 7 -24q-2 -13 -12 -22q-102 -83 -227.5 -128t-258.5 -45q-156 0 -298 61
+t-245 164t-164 245t-61 298t61 298t164 245t245 164t298 61q344 0 556 -212t212 -556z" />
+    <glyph glyph-name="_476" unicode="&#xf1fb;" horiz-adv-x="1792" 
+d="M1698 1442q94 -94 94 -226.5t-94 -225.5l-225 -223l104 -104q10 -10 10 -23t-10 -23l-210 -210q-10 -10 -23 -10t-23 10l-105 105l-603 -603q-37 -37 -90 -37h-203l-256 -128l-64 64l128 256v203q0 53 37 90l603 603l-105 105q-10 10 -10 23t10 23l210 210q10 10 23 10
+t23 -10l104 -104l223 225q93 94 225.5 94t226.5 -94zM512 64l576 576l-192 192l-576 -576v-192h192z" />
+    <glyph glyph-name="f1fc" unicode="&#xf1fc;" horiz-adv-x="1792" 
+d="M1615 1536q70 0 122.5 -46.5t52.5 -116.5q0 -63 -45 -151q-332 -629 -465 -752q-97 -91 -218 -91q-126 0 -216.5 92.5t-90.5 219.5q0 128 92 212l638 579q59 54 130 54zM706 502q39 -76 106.5 -130t150.5 -76l1 -71q4 -213 -129.5 -347t-348.5 -134q-123 0 -218 46.5
+t-152.5 127.5t-86.5 183t-29 220q7 -5 41 -30t62 -44.5t59 -36.5t46 -17q41 0 55 37q25 66 57.5 112.5t69.5 76t88 47.5t103 25.5t125 10.5z" />
+    <glyph glyph-name="_478" unicode="&#xf1fd;" horiz-adv-x="1792" 
+d="M1792 128v-384h-1792v384q45 0 85 14t59 27.5t47 37.5q30 27 51.5 38t56.5 11q24 0 44 -7t31 -15t33 -27q29 -25 47 -38t58 -27t86 -14q45 0 85 14.5t58 27t48 37.5q21 19 32.5 27t31 15t43.5 7q35 0 56.5 -11t51.5 -38q28 -24 47 -37.5t59 -27.5t85 -14t85 14t59 27.5
+t47 37.5q30 27 51.5 38t56.5 11q34 0 55.5 -11t51.5 -38q28 -24 47 -37.5t59 -27.5t85 -14zM1792 448v-192q-24 0 -44 7t-31 15t-33 27q-29 25 -47 38t-58 27t-85 14q-46 0 -86 -14t-58 -27t-47 -38q-22 -19 -33 -27t-31 -15t-44 -7q-35 0 -56.5 11t-51.5 38q-29 25 -47 38
+t-58 27t-86 14q-45 0 -85 -14.5t-58 -27t-48 -37.5q-21 -19 -32.5 -27t-31 -15t-43.5 -7q-35 0 -56.5 11t-51.5 38q-28 24 -47 37.5t-59 27.5t-85 14q-46 0 -86 -14t-58 -27t-47 -38q-30 -27 -51.5 -38t-56.5 -11v192q0 80 56 136t136 56h64v448h256v-448h256v448h256v-448
+h256v448h256v-448h64q80 0 136 -56t56 -136zM512 1312q0 -77 -36 -118.5t-92 -41.5q-53 0 -90.5 37.5t-37.5 90.5q0 29 9.5 51t23.5 34t31 28t31 31.5t23.5 44.5t9.5 67q38 0 83 -74t45 -150zM1024 1312q0 -77 -36 -118.5t-92 -41.5q-53 0 -90.5 37.5t-37.5 90.5
+q0 29 9.5 51t23.5 34t31 28t31 31.5t23.5 44.5t9.5 67q38 0 83 -74t45 -150zM1536 1312q0 -77 -36 -118.5t-92 -41.5q-53 0 -90.5 37.5t-37.5 90.5q0 29 9.5 51t23.5 34t31 28t31 31.5t23.5 44.5t9.5 67q38 0 83 -74t45 -150z" />
+    <glyph glyph-name="_479" unicode="&#xf1fe;" horiz-adv-x="2048" 
+d="M2048 0v-128h-2048v1536h128v-1408h1920zM1664 1024l256 -896h-1664v576l448 576l576 -576z" />
+    <glyph glyph-name="_480" unicode="&#xf200;" horiz-adv-x="1792" 
+d="M768 646l546 -546q-106 -108 -247.5 -168t-298.5 -60q-209 0 -385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103v-762zM955 640h773q0 -157 -60 -298.5t-168 -247.5zM1664 768h-768v768q209 0 385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="_481" unicode="&#xf201;" horiz-adv-x="2048" 
+d="M2048 0v-128h-2048v1536h128v-1408h1920zM1920 1248v-435q0 -21 -19.5 -29.5t-35.5 7.5l-121 121l-633 -633q-10 -10 -23 -10t-23 10l-233 233l-416 -416l-192 192l585 585q10 10 23 10t23 -10l233 -233l464 464l-121 121q-16 16 -7.5 35.5t29.5 19.5h435q14 0 23 -9
+t9 -23z" />
+    <glyph glyph-name="_482" unicode="&#xf202;" horiz-adv-x="1792" 
+d="M1292 832q0 -6 10 -41q10 -29 25 -49.5t41 -34t44 -20t55 -16.5q325 -91 325 -332q0 -146 -105.5 -242.5t-254.5 -96.5q-59 0 -111.5 18.5t-91.5 45.5t-77 74.5t-63 87.5t-53.5 103.5t-43.5 103t-39.5 106.5t-35.5 95q-32 81 -61.5 133.5t-73.5 96.5t-104 64t-142 20
+q-96 0 -183 -55.5t-138 -144.5t-51 -185q0 -160 106.5 -279.5t263.5 -119.5q177 0 258 95q56 63 83 116l84 -152q-15 -34 -44 -70l1 -1q-131 -152 -388 -152q-147 0 -269.5 79t-190.5 207.5t-68 274.5q0 105 43.5 206t116 176.5t172 121.5t204.5 46q87 0 159 -19t123.5 -50
+t95 -80t72.5 -99t58.5 -117t50.5 -124.5t50 -130.5t55 -127q96 -200 233 -200q81 0 138.5 48.5t57.5 128.5q0 42 -19 72t-50.5 46t-72.5 31.5t-84.5 27t-87.5 34t-81 52t-65 82t-39 122.5q-3 16 -3 33q0 110 87.5 192t198.5 78q78 -3 120.5 -14.5t90.5 -53.5h-1
+q12 -11 23 -24.5t26 -36t19 -27.5l-129 -99q-26 49 -54 70v1q-23 21 -97 21q-49 0 -84 -33t-35 -83z" />
+    <glyph glyph-name="_483" unicode="&#xf203;" 
+d="M1432 484q0 173 -234 239q-35 10 -53 16.5t-38 25t-29 46.5q0 2 -2 8.5t-3 12t-1 7.5q0 36 24.5 59.5t60.5 23.5q54 0 71 -15h-1q20 -15 39 -51l93 71q-39 54 -49 64q-33 29 -67.5 39t-85.5 10q-80 0 -142 -57.5t-62 -137.5q0 -7 2 -23q16 -96 64.5 -140t148.5 -73
+q29 -8 49 -15.5t45 -21.5t38.5 -34.5t13.5 -46.5v-5q1 -58 -40.5 -93t-100.5 -35q-97 0 -167 144q-23 47 -51.5 121.5t-48 125.5t-54 110.5t-74 95.5t-103.5 60.5t-147 24.5q-101 0 -192 -56t-144 -148t-50 -192v-1q4 -108 50.5 -199t133.5 -147.5t196 -56.5q186 0 279 110
+q20 27 31 51l-60 109q-42 -80 -99 -116t-146 -36q-115 0 -191 87t-76 204q0 105 82 189t186 84q112 0 170 -53.5t104 -172.5q8 -21 25.5 -68.5t28.5 -76.5t31.5 -74.5t38.5 -74t45.5 -62.5t55.5 -53.5t66 -33t80 -13.5q107 0 183 69.5t76 174.5zM1536 1120v-960
+q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="_484" unicode="&#xf204;" horiz-adv-x="2048" 
+d="M1152 640q0 104 -40.5 198.5t-109.5 163.5t-163.5 109.5t-198.5 40.5t-198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5t198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5zM1920 640q0 104 -40.5 198.5
+t-109.5 163.5t-163.5 109.5t-198.5 40.5h-386q119 -90 188.5 -224t69.5 -288t-69.5 -288t-188.5 -224h386q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5zM2048 640q0 -130 -51 -248.5t-136.5 -204t-204 -136.5t-248.5 -51h-768q-130 0 -248.5 51t-204 136.5
+t-136.5 204t-51 248.5t51 248.5t136.5 204t204 136.5t248.5 51h768q130 0 248.5 -51t204 -136.5t136.5 -204t51 -248.5z" />
+    <glyph glyph-name="_485" unicode="&#xf205;" horiz-adv-x="2048" 
+d="M0 640q0 130 51 248.5t136.5 204t204 136.5t248.5 51h768q130 0 248.5 -51t204 -136.5t136.5 -204t51 -248.5t-51 -248.5t-136.5 -204t-204 -136.5t-248.5 -51h-768q-130 0 -248.5 51t-204 136.5t-136.5 204t-51 248.5zM1408 128q104 0 198.5 40.5t163.5 109.5
+t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5t-163.5 109.5t-198.5 40.5t-198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5z" />
+    <glyph glyph-name="_486" unicode="&#xf206;" horiz-adv-x="2304" 
+d="M762 384h-314q-40 0 -57.5 35t6.5 67l188 251q-65 31 -137 31q-132 0 -226 -94t-94 -226t94 -226t226 -94q115 0 203 72.5t111 183.5zM576 512h186q-18 85 -75 148zM1056 512l288 384h-480l-99 -132q105 -103 126 -252h165zM2176 448q0 132 -94 226t-226 94
+q-60 0 -121 -24l174 -260q15 -23 10 -49t-27 -40q-15 -11 -36 -11q-35 0 -53 29l-174 260q-93 -95 -93 -225q0 -132 94 -226t226 -94t226 94t94 226zM2304 448q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 97 39.5 183.5t109.5 149.5l-65 98l-353 -469
+q-18 -26 -51 -26h-197q-23 -164 -149 -274t-294 -110q-185 0 -316.5 131.5t-131.5 316.5t131.5 316.5t316.5 131.5q114 0 215 -55l137 183h-224q-26 0 -45 19t-19 45t19 45t45 19h384v-128h435l-85 128h-222q-26 0 -45 19t-19 45t19 45t45 19h256q33 0 53 -28l267 -400
+q91 44 192 44q185 0 316.5 -131.5t131.5 -316.5z" />
+    <glyph glyph-name="_487" unicode="&#xf207;" 
+d="M384 320q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1408 320q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1362 716l-72 384q-5 23 -22.5 37.5t-40.5 14.5
+h-918q-23 0 -40.5 -14.5t-22.5 -37.5l-72 -384q-5 -30 14 -53t49 -23h1062q30 0 49 23t14 53zM1136 1328q0 20 -14 34t-34 14h-640q-20 0 -34 -14t-14 -34t14 -34t34 -14h640q20 0 34 14t14 34zM1536 603v-603h-128v-128q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5
+t-37.5 90.5v128h-768v-128q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5v128h-128v603q0 112 25 223l103 454q9 78 97.5 137t230 89t312.5 30t312.5 -30t230 -89t97.5 -137l105 -454q23 -102 23 -223z" />
+    <glyph glyph-name="_488" unicode="&#xf208;" horiz-adv-x="2048" 
+d="M1463 704q0 -35 -25 -60.5t-61 -25.5h-702q-36 0 -61 25.5t-25 60.5t25 60.5t61 25.5h702q36 0 61 -25.5t25 -60.5zM1677 704q0 86 -23 170h-982q-36 0 -61 25t-25 60q0 36 25 61t61 25h908q-88 143 -235 227t-320 84q-177 0 -327.5 -87.5t-238 -237.5t-87.5 -327
+q0 -86 23 -170h982q36 0 61 -25t25 -60q0 -36 -25 -61t-61 -25h-908q88 -143 235.5 -227t320.5 -84q132 0 253 51.5t208 139t139 208t52 253.5zM2048 959q0 -35 -25 -60t-61 -25h-131q17 -85 17 -170q0 -167 -65.5 -319.5t-175.5 -263t-262.5 -176t-319.5 -65.5
+q-246 0 -448.5 133t-301.5 350h-189q-36 0 -61 25t-25 61q0 35 25 60t61 25h132q-17 85 -17 170q0 167 65.5 319.5t175.5 263t262.5 176t320.5 65.5q245 0 447.5 -133t301.5 -350h188q36 0 61 -25t25 -61z" />
+    <glyph glyph-name="_489" unicode="&#xf209;" horiz-adv-x="1280" 
+d="M953 1158l-114 -328l117 -21q165 451 165 518q0 56 -38 56q-57 0 -130 -225zM654 471l33 -88q37 42 71 67l-33 5.5t-38.5 7t-32.5 8.5zM362 1367q0 -98 159 -521q17 10 49 10q15 0 75 -5l-121 351q-75 220 -123 220q-19 0 -29 -17.5t-10 -37.5zM283 608q0 -36 51.5 -119
+t117.5 -153t100 -70q14 0 25.5 13t11.5 27q0 24 -32 102q-13 32 -32 72t-47.5 89t-61.5 81t-62 32q-20 0 -45.5 -27t-25.5 -47zM125 273q0 -41 25 -104q59 -145 183.5 -227t281.5 -82q227 0 382 170q152 169 152 427q0 43 -1 67t-11.5 62t-30.5 56q-56 49 -211.5 75.5
+t-270.5 26.5q-37 0 -49 -11q-12 -5 -12 -35q0 -34 21.5 -60t55.5 -40t77.5 -23.5t87.5 -11.5t85 -4t70 0h23q24 0 40 -19q15 -19 19 -55q-28 -28 -96 -54q-61 -22 -93 -46q-64 -46 -108.5 -114t-44.5 -137q0 -31 18.5 -88.5t18.5 -87.5l-3 -12q-4 -12 -4 -14
+q-137 10 -146 216q-8 -2 -41 -2q2 -7 2 -21q0 -53 -40.5 -89.5t-94.5 -36.5q-82 0 -166.5 78t-84.5 159q0 34 33 67q52 -64 60 -76q77 -104 133 -104q12 0 26.5 8.5t14.5 20.5q0 34 -87.5 145t-116.5 111q-43 0 -70 -44.5t-27 -90.5zM11 264q0 101 42.5 163t136.5 88
+q-28 74 -28 104q0 62 61 123t122 61q29 0 70 -15q-163 462 -163 567q0 80 41 130.5t119 50.5q131 0 325 -581q6 -17 8 -23q6 16 29 79.5t43.5 118.5t54 127.5t64.5 123t70.5 86.5t76.5 36q71 0 112 -49t41 -122q0 -108 -159 -550q61 -15 100.5 -46t58.5 -78t26 -93.5
+t7 -110.5q0 -150 -47 -280t-132 -225t-211 -150t-278 -55q-111 0 -223 42q-149 57 -258 191.5t-109 286.5z" />
+    <glyph glyph-name="_490" unicode="&#xf20a;" horiz-adv-x="2048" 
+d="M785 528h207q-14 -158 -98.5 -248.5t-214.5 -90.5q-162 0 -254.5 116t-92.5 316q0 194 93 311.5t233 117.5q148 0 232 -87t97 -247h-203q-5 64 -35.5 99t-81.5 35q-57 0 -88.5 -60.5t-31.5 -177.5q0 -48 5 -84t18 -69.5t40 -51.5t66 -18q95 0 109 139zM1497 528h206
+q-14 -158 -98 -248.5t-214 -90.5q-162 0 -254.5 116t-92.5 316q0 194 93 311.5t233 117.5q148 0 232 -87t97 -247h-204q-4 64 -35 99t-81 35q-57 0 -88.5 -60.5t-31.5 -177.5q0 -48 5 -84t18 -69.5t39.5 -51.5t65.5 -18q49 0 76.5 38t33.5 101zM1856 647q0 207 -15.5 307
+t-60.5 161q-6 8 -13.5 14t-21.5 15t-16 11q-86 63 -697 63q-625 0 -710 -63q-5 -4 -17.5 -11.5t-21 -14t-14.5 -14.5q-45 -60 -60 -159.5t-15 -308.5q0 -208 15 -307.5t60 -160.5q6 -8 15 -15t20.5 -14t17.5 -12q44 -33 239.5 -49t470.5 -16q610 0 697 65q5 4 17 11t20.5 14
+t13.5 16q46 60 61 159t15 309zM2048 1408v-1536h-2048v1536h2048z" />
+    <glyph glyph-name="_491" unicode="&#xf20b;" 
+d="M992 912v-496q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v496q0 112 -80 192t-192 80h-272v-1152q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v1344q0 14 9 23t23 9h464q135 0 249 -66.5t180.5 -180.5t66.5 -249zM1376 1376v-880q0 -135 -66.5 -249t-180.5 -180.5
+t-249 -66.5h-464q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h160q14 0 23 -9t9 -23v-768h272q112 0 192 80t80 192v880q0 14 9 23t23 9h160q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="_492" unicode="&#xf20c;" 
+d="M1311 694v-114q0 -24 -13.5 -38t-37.5 -14h-202q-24 0 -38 14t-14 38v114q0 24 14 38t38 14h202q24 0 37.5 -14t13.5 -38zM821 464v250q0 53 -32.5 85.5t-85.5 32.5h-133q-68 0 -96 -52q-28 52 -96 52h-130q-53 0 -85.5 -32.5t-32.5 -85.5v-250q0 -22 21 -22h55
+q22 0 22 22v230q0 24 13.5 38t38.5 14h94q24 0 38 -14t14 -38v-230q0 -22 21 -22h54q22 0 22 22v230q0 24 14 38t38 14h97q24 0 37.5 -14t13.5 -38v-230q0 -22 22 -22h55q21 0 21 22zM1410 560v154q0 53 -33 85.5t-86 32.5h-264q-53 0 -86 -32.5t-33 -85.5v-410
+q0 -21 22 -21h55q21 0 21 21v180q31 -42 94 -42h191q53 0 86 32.5t33 85.5zM1536 1176v-1072q0 -96 -68 -164t-164 -68h-1072q-96 0 -164 68t-68 164v1072q0 96 68 164t164 68h1072q96 0 164 -68t68 -164z" />
+    <glyph glyph-name="_493" unicode="&#xf20d;" 
+d="M915 450h-294l147 551zM1001 128h311l-324 1024h-440l-324 -1024h311l383 314zM1536 1120v-960q0 -118 -85 -203t-203 -85h-960q-118 0 -203 85t-85 203v960q0 118 85 203t203 85h960q118 0 203 -85t85 -203z" />
+    <glyph glyph-name="_494" unicode="&#xf20e;" horiz-adv-x="2048" 
+d="M2048 641q0 -21 -13 -36.5t-33 -19.5l-205 -356q3 -9 3 -18q0 -20 -12.5 -35.5t-32.5 -19.5l-193 -337q3 -8 3 -16q0 -23 -16.5 -40t-40.5 -17q-25 0 -41 18h-400q-17 -20 -43 -20t-43 20h-399q-17 -20 -43 -20q-23 0 -40 16.5t-17 40.5q0 8 4 20l-193 335
+q-20 4 -32.5 19.5t-12.5 35.5q0 9 3 18l-206 356q-20 5 -32.5 20.5t-12.5 35.5q0 21 13.5 36.5t33.5 19.5l199 344q0 1 -0.5 3t-0.5 3q0 36 34 51l209 363q-4 10 -4 18q0 24 17 40.5t40 16.5q26 0 44 -21h396q16 21 43 21t43 -21h398q18 21 44 21q23 0 40 -16.5t17 -40.5
+q0 -6 -4 -18l207 -358q23 -1 39 -17.5t16 -38.5q0 -13 -7 -27l187 -324q19 -4 31.5 -19.5t12.5 -35.5zM1063 -158h389l-342 354h-143l-342 -354h360q18 16 39 16t39 -16zM112 654q1 -4 1 -13q0 -10 -2 -15l208 -360l15 -6l188 199v347l-187 194q-13 -8 -29 -10zM986 1438
+h-388l190 -200l554 200h-280q-16 -16 -38 -16t-38 16zM1689 226q1 6 5 11l-64 68l-17 -79h76zM1583 226l22 105l-252 266l-296 -307l63 -64h463zM1495 -142l16 28l65 310h-427l333 -343q8 4 13 5zM578 -158h5l342 354h-373v-335l4 -6q14 -5 22 -13zM552 226h402l64 66
+l-309 321l-157 -166v-221zM359 226h163v189l-168 -177q4 -8 5 -12zM358 1051q0 -1 0.5 -2t0.5 -2q0 -16 -8 -29l171 -177v269zM552 1121v-311l153 -157l297 314l-223 236zM556 1425l-4 -8v-264l205 74l-191 201q-6 -2 -10 -3zM1447 1438h-16l-621 -224l213 -225zM1023 946
+l-297 -315l311 -319l296 307zM688 634l-136 141v-284zM1038 270l-42 -44h85zM1374 618l238 -251l132 624l-3 5l-1 1zM1718 1018q-8 13 -8 29v2l-216 376q-5 1 -13 5l-437 -463l310 -327zM522 1142v223l-163 -282zM522 196h-163l163 -283v283zM1607 196l-48 -227l130 227h-82
+zM1729 266l207 361q-2 10 -2 14q0 1 3 16l-171 296l-129 -612l77 -82q5 3 15 7z" />
+    <glyph glyph-name="f210" unicode="&#xf210;" 
+d="M0 856q0 131 91.5 226.5t222.5 95.5h742l352 358v-1470q0 -132 -91.5 -227t-222.5 -95h-780q-131 0 -222.5 95t-91.5 227v790zM1232 102l-176 180v425q0 46 -32 79t-78 33h-484q-46 0 -78 -33t-32 -79v-492q0 -46 32.5 -79.5t77.5 -33.5h770z" />
+    <glyph glyph-name="_496" unicode="&#xf211;" 
+d="M934 1386q-317 -121 -556 -362.5t-358 -560.5q-20 89 -20 176q0 208 102.5 384.5t278.5 279t384 102.5q82 0 169 -19zM1203 1267q93 -65 164 -155q-389 -113 -674.5 -400.5t-396.5 -676.5q-93 72 -155 162q112 386 395 671t667 399zM470 -67q115 356 379.5 622t619.5 384
+q40 -92 54 -195q-292 -120 -516 -345t-343 -518q-103 14 -194 52zM1536 -125q-193 50 -367 115q-135 -84 -290 -107q109 205 274 370.5t369 275.5q-21 -152 -101 -284q65 -175 115 -370z" />
+    <glyph glyph-name="f212" unicode="&#xf212;" horiz-adv-x="2048" 
+d="M1893 1144l155 -1272q-131 0 -257 57q-200 91 -393 91q-226 0 -374 -148q-148 148 -374 148q-193 0 -393 -91q-128 -57 -252 -57h-5l155 1272q224 127 482 127q233 0 387 -106q154 106 387 106q258 0 482 -127zM1398 157q129 0 232 -28.5t260 -93.5l-124 1021
+q-171 78 -368 78q-224 0 -374 -141q-150 141 -374 141q-197 0 -368 -78l-124 -1021q105 43 165.5 65t148.5 39.5t178 17.5q202 0 374 -108q172 108 374 108zM1438 191l-55 907q-211 -4 -359 -155q-152 155 -374 155q-176 0 -336 -66l-114 -941q124 51 228.5 76t221.5 25
+q209 0 374 -102q172 107 374 102z" />
+    <glyph glyph-name="_498" unicode="&#xf213;" horiz-adv-x="2048" 
+d="M1500 165v733q0 21 -15 36t-35 15h-93q-20 0 -35 -15t-15 -36v-733q0 -20 15 -35t35 -15h93q20 0 35 15t15 35zM1216 165v531q0 20 -15 35t-35 15h-101q-20 0 -35 -15t-15 -35v-531q0 -20 15 -35t35 -15h101q20 0 35 15t15 35zM924 165v429q0 20 -15 35t-35 15h-101
+q-20 0 -35 -15t-15 -35v-429q0 -20 15 -35t35 -15h101q20 0 35 15t15 35zM632 165v362q0 20 -15 35t-35 15h-101q-20 0 -35 -15t-15 -35v-362q0 -20 15 -35t35 -15h101q20 0 35 15t15 35zM2048 311q0 -166 -118 -284t-284 -118h-1244q-166 0 -284 118t-118 284
+q0 116 63 214.5t168 148.5q-10 34 -10 73q0 113 80.5 193.5t193.5 80.5q102 0 180 -67q45 183 194 300t338 117q149 0 275 -73.5t199.5 -199.5t73.5 -275q0 -66 -14 -122q135 -33 221 -142.5t86 -247.5z" />
+    <glyph glyph-name="_499" unicode="&#xf214;" 
+d="M0 1536h1536v-1392l-776 -338l-760 338v1392zM1436 209v926h-1336v-926l661 -294zM1436 1235v201h-1336v-201h1336zM181 937v-115h-37v115h37zM181 789v-115h-37v115h37zM181 641v-115h-37v115h37zM181 493v-115h-37v115h37zM181 345v-115h-37v115h37zM207 202l15 34
+l105 -47l-15 -33zM343 142l15 34l105 -46l-15 -34zM478 82l15 34l105 -46l-15 -34zM614 23l15 33l104 -46l-15 -34zM797 10l105 46l15 -33l-105 -47zM932 70l105 46l15 -34l-105 -46zM1068 130l105 46l15 -34l-105 -46zM1203 189l105 47l15 -34l-105 -46zM259 1389v-36h-114
+v36h114zM421 1389v-36h-115v36h115zM583 1389v-36h-115v36h115zM744 1389v-36h-114v36h114zM906 1389v-36h-114v36h114zM1068 1389v-36h-115v36h115zM1230 1389v-36h-115v36h115zM1391 1389v-36h-114v36h114zM181 1049v-79h-37v115h115v-36h-78zM421 1085v-36h-115v36h115z
+M583 1085v-36h-115v36h115zM744 1085v-36h-114v36h114zM906 1085v-36h-114v36h114zM1068 1085v-36h-115v36h115zM1230 1085v-36h-115v36h115zM1355 970v79h-78v36h115v-115h-37zM1355 822v115h37v-115h-37zM1355 674v115h37v-115h-37zM1355 526v115h37v-115h-37zM1355 378
+v115h37v-115h-37zM1355 230v115h37v-115h-37zM760 265q-129 0 -221 91.5t-92 221.5q0 129 92 221t221 92q130 0 221.5 -92t91.5 -221q0 -130 -91.5 -221.5t-221.5 -91.5zM595 646q0 -36 19.5 -56.5t49.5 -25t64 -7t64 -2t49.5 -9t19.5 -30.5q0 -49 -112 -49q-97 0 -123 51
+h-3l-31 -63q67 -42 162 -42q29 0 56.5 5t55.5 16t45.5 33t17.5 53q0 46 -27.5 69.5t-67.5 27t-79.5 3t-67 5t-27.5 25.5q0 21 20.5 33t40.5 15t41 3q34 0 70.5 -11t51.5 -34h3l30 58q-3 1 -21 8.5t-22.5 9t-19.5 7t-22 7t-20 4.5t-24 4t-23 1q-29 0 -56.5 -5t-54 -16.5
+t-43 -34t-16.5 -53.5z" />
+    <glyph glyph-name="_500" unicode="&#xf215;" horiz-adv-x="2048" 
+d="M863 504q0 112 -79.5 191.5t-191.5 79.5t-191 -79.5t-79 -191.5t79 -191t191 -79t191.5 79t79.5 191zM1726 505q0 112 -79 191t-191 79t-191.5 -79t-79.5 -191q0 -113 79.5 -192t191.5 -79t191 79.5t79 191.5zM2048 1314v-1348q0 -44 -31.5 -75.5t-76.5 -31.5h-1832
+q-45 0 -76.5 31.5t-31.5 75.5v1348q0 44 31.5 75.5t76.5 31.5h431q44 0 76 -31.5t32 -75.5v-161h754v161q0 44 32 75.5t76 31.5h431q45 0 76.5 -31.5t31.5 -75.5z" />
+    <glyph glyph-name="_501" unicode="&#xf216;" horiz-adv-x="2048" 
+d="M1430 953zM1690 749q148 0 253 -98.5t105 -244.5q0 -157 -109 -261.5t-267 -104.5q-85 0 -162 27.5t-138 73.5t-118 106t-109 126t-103.5 132.5t-108.5 126.5t-117 106t-136 73.5t-159 27.5q-154 0 -251.5 -91.5t-97.5 -244.5q0 -157 104 -250t263 -93q100 0 208 37.5
+t193 98.5q5 4 21 18.5t30 24t22 9.5q14 0 24.5 -10.5t10.5 -24.5q0 -24 -60 -77q-101 -88 -234.5 -142t-260.5 -54q-133 0 -245.5 58t-180 165t-67.5 241q0 205 141.5 341t347.5 136q120 0 226.5 -43.5t185.5 -113t151.5 -153t139 -167.5t133.5 -153.5t149.5 -113
+t172.5 -43.5q102 0 168.5 61.5t66.5 162.5q0 95 -64.5 159t-159.5 64q-30 0 -81.5 -18.5t-68.5 -18.5q-20 0 -35.5 15t-15.5 35q0 18 8.5 57t8.5 59q0 159 -107.5 263t-266.5 104q-58 0 -111.5 -18.5t-84 -40.5t-55.5 -40.5t-33 -18.5q-15 0 -25.5 10.5t-10.5 25.5
+q0 19 25 46q59 67 147 103.5t182 36.5q191 0 318 -125.5t127 -315.5q0 -37 -4 -66q57 15 115 15z" />
+    <glyph glyph-name="_502" unicode="&#xf217;" horiz-adv-x="1664" 
+d="M1216 832q0 26 -19 45t-45 19h-128v128q0 26 -19 45t-45 19t-45 -19t-19 -45v-128h-128q-26 0 -45 -19t-19 -45t19 -45t45 -19h128v-128q0 -26 19 -45t45 -19t45 19t19 45v128h128q26 0 45 19t19 45zM640 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5
+t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1536 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1664 1088v-512q0 -24 -16 -42.5t-41 -21.5l-1044 -122q1 -7 4.5 -21.5t6 -26.5t2.5 -22q0 -16 -24 -64h920
+q26 0 45 -19t19 -45t-19 -45t-45 -19h-1024q-26 0 -45 19t-19 45q0 14 11 39.5t29.5 59.5t20.5 38l-177 823h-204q-26 0 -45 19t-19 45t19 45t45 19h256q16 0 28.5 -6.5t20 -15.5t13 -24.5t7.5 -26.5t5.5 -29.5t4.5 -25.5h1201q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="_503" unicode="&#xf218;" horiz-adv-x="1664" 
+d="M1280 832q0 26 -19 45t-45 19t-45 -19l-147 -146v293q0 26 -19 45t-45 19t-45 -19t-19 -45v-293l-147 146q-19 19 -45 19t-45 -19t-19 -45t19 -45l256 -256q19 -19 45 -19t45 19l256 256q19 19 19 45zM640 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5
+t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1536 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1664 1088v-512q0 -24 -16 -42.5t-41 -21.5l-1044 -122q1 -7 4.5 -21.5t6 -26.5t2.5 -22q0 -16 -24 -64h920
+q26 0 45 -19t19 -45t-19 -45t-45 -19h-1024q-26 0 -45 19t-19 45q0 14 11 39.5t29.5 59.5t20.5 38l-177 823h-204q-26 0 -45 19t-19 45t19 45t45 19h256q16 0 28.5 -6.5t20 -15.5t13 -24.5t7.5 -26.5t5.5 -29.5t4.5 -25.5h1201q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="_504" unicode="&#xf219;" horiz-adv-x="2048" 
+d="M212 768l623 -665l-300 665h-323zM1024 -4l349 772h-698zM538 896l204 384h-262l-288 -384h346zM1213 103l623 665h-323zM683 896h682l-204 384h-274zM1510 896h346l-288 384h-262zM1651 1382l384 -512q14 -18 13 -41.5t-17 -40.5l-960 -1024q-18 -20 -47 -20t-47 20
+l-960 1024q-16 17 -17 40.5t13 41.5l384 512q18 26 51 26h1152q33 0 51 -26z" />
+    <glyph glyph-name="_505" unicode="&#xf21a;" horiz-adv-x="2048" 
+d="M1811 -19q19 19 45 19t45 -19l128 -128l-90 -90l-83 83l-83 -83q-18 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83
+q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-128 128l90 90l83 -83l83 83q19 19 45 19t45 -19l83 -83l83 83q19 19 45 19t45 -19l83 -83l83 83q19 19 45 19t45 -19l83 -83l83 83q19 19 45 19t45 -19l83 -83l83 83q19 19 45 19t45 -19l83 -83l83 83
+q19 19 45 19t45 -19l83 -83zM237 19q-19 -19 -45 -19t-45 19l-128 128l90 90l83 -82l83 82q19 19 45 19t45 -19l83 -82l64 64v293l-210 314q-17 26 -7 56.5t40 40.5l177 58v299h128v128h256v128h256v-128h256v-128h128v-299l177 -58q30 -10 40 -40.5t-7 -56.5l-210 -314
+v-293l19 18q19 19 45 19t45 -19l83 -82l83 82q19 19 45 19t45 -19l128 -128l-90 -90l-83 83l-83 -83q-18 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83
+q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83zM640 1152v-128l384 128l384 -128v128h-128v128h-512v-128h-128z" />
+    <glyph glyph-name="_506" unicode="&#xf21b;" 
+d="M576 0l96 448l-96 128l-128 64zM832 0l128 640l-128 -64l-96 -128zM992 1010q-2 4 -4 6q-10 8 -96 8q-70 0 -167 -19q-7 -2 -21 -2t-21 2q-97 19 -167 19q-86 0 -96 -8q-2 -2 -4 -6q2 -18 4 -27q2 -3 7.5 -6.5t7.5 -10.5q2 -4 7.5 -20.5t7 -20.5t7.5 -17t8.5 -17t9 -14
+t12 -13.5t14 -9.5t17.5 -8t20.5 -4t24.5 -2q36 0 59 12.5t32.5 30t14.5 34.5t11.5 29.5t17.5 12.5h12q11 0 17.5 -12.5t11.5 -29.5t14.5 -34.5t32.5 -30t59 -12.5q13 0 24.5 2t20.5 4t17.5 8t14 9.5t12 13.5t9 14t8.5 17t7.5 17t7 20.5t7.5 20.5q2 7 7.5 10.5t7.5 6.5
+q2 9 4 27zM1408 131q0 -121 -73 -190t-194 -69h-874q-121 0 -194 69t-73 190q0 61 4.5 118t19 125.5t37.5 123.5t63.5 103.5t93.5 74.5l-90 220h214q-22 64 -22 128q0 12 2 32q-194 40 -194 96q0 57 210 99q17 62 51.5 134t70.5 114q32 37 76 37q30 0 84 -31t84 -31t84 31
+t84 31q44 0 76 -37q36 -42 70.5 -114t51.5 -134q210 -42 210 -99q0 -56 -194 -96q7 -81 -20 -160h214l-82 -225q63 -33 107.5 -96.5t65.5 -143.5t29 -151.5t8 -148.5z" />
+    <glyph glyph-name="_507" unicode="&#xf21c;" horiz-adv-x="2304" 
+d="M2301 500q12 -103 -22 -198.5t-99 -163.5t-158.5 -106t-196.5 -31q-161 11 -279.5 125t-134.5 274q-12 111 27.5 210.5t118.5 170.5l-71 107q-96 -80 -151 -194t-55 -244q0 -27 -18.5 -46.5t-45.5 -19.5h-256h-69q-23 -164 -149 -274t-294 -110q-185 0 -316.5 131.5
+t-131.5 316.5t131.5 316.5t316.5 131.5q76 0 152 -27l24 45q-123 110 -304 110h-64q-26 0 -45 19t-19 45t19 45t45 19h128q78 0 145 -13.5t116.5 -38.5t71.5 -39.5t51 -36.5h512h115l-85 128h-222q-30 0 -49 22.5t-14 52.5q4 23 23 38t43 15h253q33 0 53 -28l70 -105
+l114 114q19 19 46 19h101q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-179l115 -172q131 63 275 36q143 -26 244 -134.5t118 -253.5zM448 128q115 0 203 72.5t111 183.5h-314q-35 0 -55 31q-18 32 -1 63l147 277q-47 13 -91 13q-132 0 -226 -94t-94 -226t94 -226
+t226 -94zM1856 128q132 0 226 94t94 226t-94 226t-226 94q-60 0 -121 -24l174 -260q15 -23 10 -49t-27 -40q-15 -11 -36 -11q-35 0 -53 29l-174 260q-93 -95 -93 -225q0 -132 94 -226t226 -94z" />
+    <glyph glyph-name="_508" unicode="&#xf21d;" 
+d="M1408 0q0 -63 -61.5 -113.5t-164 -81t-225 -46t-253.5 -15.5t-253.5 15.5t-225 46t-164 81t-61.5 113.5q0 49 33 88.5t91 66.5t118 44.5t131 29.5q26 5 48 -10.5t26 -41.5q5 -26 -10.5 -48t-41.5 -26q-58 -10 -106 -23.5t-76.5 -25.5t-48.5 -23.5t-27.5 -19.5t-8.5 -12
+q3 -11 27 -26.5t73 -33t114 -32.5t160.5 -25t201.5 -10t201.5 10t160.5 25t114 33t73 33.5t27 27.5q-1 4 -8.5 11t-27.5 19t-48.5 23.5t-76.5 25t-106 23.5q-26 4 -41.5 26t-10.5 48q4 26 26 41.5t48 10.5q71 -12 131 -29.5t118 -44.5t91 -66.5t33 -88.5zM1024 896v-384
+q0 -26 -19 -45t-45 -19h-64v-384q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v384h-64q-26 0 -45 19t-19 45v384q0 53 37.5 90.5t90.5 37.5h384q53 0 90.5 -37.5t37.5 -90.5zM928 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5
+t158.5 -65.5t65.5 -158.5z" />
+    <glyph glyph-name="_509" unicode="&#xf21e;" horiz-adv-x="1792" 
+d="M1280 512h305q-5 -6 -10 -10.5t-9 -7.5l-3 -4l-623 -600q-18 -18 -44 -18t-44 18l-624 602q-5 2 -21 20h369q22 0 39.5 13.5t22.5 34.5l70 281l190 -667q6 -20 23 -33t39 -13q21 0 38 13t23 33l146 485l56 -112q18 -35 57 -35zM1792 940q0 -145 -103 -300h-369l-111 221
+q-8 17 -25.5 27t-36.5 8q-45 -5 -56 -46l-129 -430l-196 686q-6 20 -23.5 33t-39.5 13t-39 -13.5t-22 -34.5l-116 -464h-423q-103 155 -103 300q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5q224 0 351 -124
+t127 -344z" />
+    <glyph glyph-name="venus" unicode="&#xf221;" horiz-adv-x="1280" 
+d="M1152 960q0 -221 -147.5 -384.5t-364.5 -187.5v-260h224q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-224q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v260q-150 16 -271.5 103t-186 224t-52.5 292
+q11 134 80.5 249t182 188t245.5 88q170 19 319 -54t236 -212t87 -306zM128 960q0 -185 131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5z" />
+    <glyph glyph-name="_511" unicode="&#xf222;" 
+d="M1472 1408q26 0 45 -19t19 -45v-416q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v262l-382 -383q126 -156 126 -359q0 -117 -45.5 -223.5t-123 -184t-184 -123t-223.5 -45.5t-223.5 45.5t-184 123t-123 184t-45.5 223.5t45.5 223.5t123 184t184 123t223.5 45.5
+q203 0 359 -126l382 382h-261q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h416zM576 0q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+    <glyph glyph-name="_512" unicode="&#xf223;" horiz-adv-x="1280" 
+d="M830 1220q145 -72 233.5 -210.5t88.5 -305.5q0 -221 -147.5 -384.5t-364.5 -187.5v-132h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96v-96q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v96h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96v132q-217 24 -364.5 187.5
+t-147.5 384.5q0 167 88.5 305.5t233.5 210.5q-165 96 -228 273q-6 16 3.5 29.5t26.5 13.5h69q21 0 29 -20q44 -106 140 -171t214 -65t214 65t140 171q8 20 37 20h61q17 0 26.5 -13.5t3.5 -29.5q-63 -177 -228 -273zM576 256q185 0 316.5 131.5t131.5 316.5t-131.5 316.5
+t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+    <glyph glyph-name="_513" unicode="&#xf224;" 
+d="M1024 1504q0 14 9 23t23 9h288q26 0 45 -19t19 -45v-288q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v134l-254 -255q126 -158 126 -359q0 -221 -147.5 -384.5t-364.5 -187.5v-132h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96v-96q0 -14 -9 -23t-23 -9h-64
+q-14 0 -23 9t-9 23v96h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96v132q-149 16 -270.5 103t-186.5 223.5t-53 291.5q16 204 160 353.5t347 172.5q118 14 228 -19t198 -103l255 254h-134q-14 0 -23 9t-9 23v64zM576 256q185 0 316.5 131.5t131.5 316.5t-131.5 316.5
+t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+    <glyph glyph-name="_514" unicode="&#xf225;" horiz-adv-x="1792" 
+d="M1280 1504q0 14 9 23t23 9h288q26 0 45 -19t19 -45v-288q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v134l-254 -255q126 -158 126 -359q0 -221 -147.5 -384.5t-364.5 -187.5v-132h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96v-96q0 -14 -9 -23t-23 -9h-64
+q-14 0 -23 9t-9 23v96h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96v132q-217 24 -364.5 187.5t-147.5 384.5q0 201 126 359l-52 53l-101 -111q-9 -10 -22 -10.5t-23 7.5l-48 44q-10 8 -10.5 21.5t8.5 23.5l105 115l-111 112v-134q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9
+t-9 23v288q0 26 19 45t45 19h288q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-133l106 -107l86 94q9 10 22 10.5t23 -7.5l48 -44q10 -8 10.5 -21.5t-8.5 -23.5l-90 -99l57 -56q158 126 359 126t359 -126l255 254h-134q-14 0 -23 9t-9 23v64zM832 256q185 0 316.5 131.5
+t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+    <glyph glyph-name="_515" unicode="&#xf226;" horiz-adv-x="1792" 
+d="M1790 1007q12 -155 -52.5 -292t-186 -224t-271.5 -103v-260h224q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-512v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-224q-14 0 -23 9t-9 23v64q0 14 9 23
+t23 9h224v260q-150 16 -271.5 103t-186 224t-52.5 292q17 206 164.5 356.5t352.5 169.5q206 21 377 -94q171 115 377 94q205 -19 352.5 -169.5t164.5 -356.5zM896 647q128 131 128 313t-128 313q-128 -131 -128 -313t128 -313zM576 512q115 0 218 57q-154 165 -154 391
+q0 224 154 391q-103 57 -218 57q-185 0 -316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5zM1152 128v260q-137 15 -256 94q-119 -79 -256 -94v-260h512zM1216 512q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5q-115 0 -218 -57q154 -167 154 -391
+q0 -226 -154 -391q103 -57 218 -57z" />
+    <glyph glyph-name="_516" unicode="&#xf227;" horiz-adv-x="1920" 
+d="M1536 1120q0 14 9 23t23 9h288q26 0 45 -19t19 -45v-288q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v134l-254 -255q76 -95 107.5 -214t9.5 -247q-31 -182 -166 -312t-318 -156q-210 -29 -384.5 80t-241.5 300q-117 6 -221 57.5t-177.5 133t-113.5 192.5t-32 230
+q9 135 78 252t182 191.5t248 89.5q118 14 227.5 -19t198.5 -103l255 254h-134q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h288q26 0 45 -19t19 -45v-288q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v134l-254 -255q59 -74 93 -169q182 -9 328 -124l255 254h-134q-14 0 -23 9
+t-9 23v64zM1024 704q0 20 -4 58q-162 -25 -271 -150t-109 -292q0 -20 4 -58q162 25 271 150t109 292zM128 704q0 -168 111 -294t276 -149q-3 29 -3 59q0 210 135 369.5t338 196.5q-53 120 -163.5 193t-245.5 73q-185 0 -316.5 -131.5t-131.5 -316.5zM1088 -128
+q185 0 316.5 131.5t131.5 316.5q0 168 -111 294t-276 149q3 -28 3 -59q0 -210 -135 -369.5t-338 -196.5q53 -120 163.5 -193t245.5 -73z" />
+    <glyph glyph-name="_517" unicode="&#xf228;" horiz-adv-x="2048" 
+d="M1664 1504q0 14 9 23t23 9h288q26 0 45 -19t19 -45v-288q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v134l-254 -255q76 -95 107.5 -214t9.5 -247q-32 -180 -164.5 -310t-313.5 -157q-223 -34 -409 90q-117 -78 -256 -93v-132h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23
+t-23 -9h-96v-96q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v96h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96v132q-155 17 -279.5 109.5t-187 237.5t-39.5 307q25 187 159.5 322.5t320.5 164.5q224 34 410 -90q146 97 320 97q201 0 359 -126l255 254h-134q-14 0 -23 9
+t-9 23v64zM896 391q128 131 128 313t-128 313q-128 -131 -128 -313t128 -313zM128 704q0 -185 131.5 -316.5t316.5 -131.5q117 0 218 57q-154 167 -154 391t154 391q-101 57 -218 57q-185 0 -316.5 -131.5t-131.5 -316.5zM1216 256q185 0 316.5 131.5t131.5 316.5
+t-131.5 316.5t-316.5 131.5q-117 0 -218 -57q154 -167 154 -391t-154 -391q101 -57 218 -57z" />
+    <glyph glyph-name="_518" unicode="&#xf229;" 
+d="M1472 1408q26 0 45 -19t19 -45v-416q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v262l-213 -214l140 -140q9 -10 9 -23t-9 -22l-46 -46q-9 -9 -22 -9t-23 9l-140 141l-78 -79q126 -156 126 -359q0 -117 -45.5 -223.5t-123 -184t-184 -123t-223.5 -45.5t-223.5 45.5
+t-184 123t-123 184t-45.5 223.5t45.5 223.5t123 184t184 123t223.5 45.5q203 0 359 -126l78 78l-172 172q-9 10 -9 23t9 22l46 46q9 9 22 9t23 -9l172 -172l213 213h-261q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h416zM576 0q185 0 316.5 131.5t131.5 316.5t-131.5 316.5
+t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+    <glyph glyph-name="_519" unicode="&#xf22a;" horiz-adv-x="1280" 
+d="M640 892q217 -24 364.5 -187.5t147.5 -384.5q0 -167 -87 -306t-236 -212t-319 -54q-133 15 -245.5 88t-182 188t-80.5 249q-12 155 52.5 292t186 224t271.5 103v132h-160q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h160v165l-92 -92q-10 -9 -23 -9t-22 9l-46 46q-9 9 -9 22
+t9 23l202 201q19 19 45 19t45 -19l202 -201q9 -10 9 -23t-9 -22l-46 -46q-9 -9 -22 -9t-23 9l-92 92v-165h160q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-160v-132zM576 -128q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5
+t131.5 -316.5t316.5 -131.5z" />
+    <glyph glyph-name="_520" unicode="&#xf22b;" horiz-adv-x="2048" 
+d="M1901 621q19 -19 19 -45t-19 -45l-294 -294q-9 -10 -22.5 -10t-22.5 10l-45 45q-10 9 -10 22.5t10 22.5l185 185h-294v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-132q-24 -217 -187.5 -364.5t-384.5 -147.5q-167 0 -306 87t-212 236t-54 319q15 133 88 245.5
+t188 182t249 80.5q155 12 292 -52.5t224 -186t103 -271.5h132v224q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-224h294l-185 185q-10 9 -10 22.5t10 22.5l45 45q9 10 22.5 10t22.5 -10zM576 128q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5
+t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+    <glyph glyph-name="_521" unicode="&#xf22c;" horiz-adv-x="1280" 
+d="M1152 960q0 -221 -147.5 -384.5t-364.5 -187.5v-612q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v612q-217 24 -364.5 187.5t-147.5 384.5q0 117 45.5 223.5t123 184t184 123t223.5 45.5t223.5 -45.5t184 -123t123 -184t45.5 -223.5zM576 512q185 0 316.5 131.5
+t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+    <glyph glyph-name="_522" unicode="&#xf22d;" horiz-adv-x="1280" 
+d="M1024 576q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1152 576q0 -117 -45.5 -223.5t-123 -184t-184 -123t-223.5 -45.5t-223.5 45.5t-184 123t-123 184t-45.5 223.5t45.5 223.5t123 184t184 123
+t223.5 45.5t223.5 -45.5t184 -123t123 -184t45.5 -223.5z" />
+    <glyph glyph-name="_523" unicode="&#xf22e;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="_524" unicode="&#xf22f;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="_525" unicode="&#xf230;" 
+d="M1451 1408q35 0 60 -25t25 -60v-1366q0 -35 -25 -60t-60 -25h-391v595h199l30 232h-229v148q0 56 23.5 84t91.5 28l122 1v207q-63 9 -178 9q-136 0 -217.5 -80t-81.5 -226v-171h-200v-232h200v-595h-735q-35 0 -60 25t-25 60v1366q0 35 25 60t60 25h1366z" />
+    <glyph glyph-name="_526" unicode="&#xf231;" horiz-adv-x="1280" 
+d="M0 939q0 108 37.5 203.5t103.5 166.5t152 123t185 78t202 26q158 0 294 -66.5t221 -193.5t85 -287q0 -96 -19 -188t-60 -177t-100 -149.5t-145 -103t-189 -38.5q-68 0 -135 32t-96 88q-10 -39 -28 -112.5t-23.5 -95t-20.5 -71t-26 -71t-32 -62.5t-46 -77.5t-62 -86.5
+l-14 -5l-9 10q-15 157 -15 188q0 92 21.5 206.5t66.5 287.5t52 203q-32 65 -32 169q0 83 52 156t132 73q61 0 95 -40.5t34 -102.5q0 -66 -44 -191t-44 -187q0 -63 45 -104.5t109 -41.5q55 0 102 25t78.5 68t56 95t38 110.5t20 111t6.5 99.5q0 173 -109.5 269.5t-285.5 96.5
+q-200 0 -334 -129.5t-134 -328.5q0 -44 12.5 -85t27 -65t27 -45.5t12.5 -30.5q0 -28 -15 -73t-37 -45q-2 0 -17 3q-51 15 -90.5 56t-61 94.5t-32.5 108t-11 106.5z" />
+    <glyph glyph-name="_527" unicode="&#xf232;" 
+d="M985 562q13 0 97.5 -44t89.5 -53q2 -5 2 -15q0 -33 -17 -76q-16 -39 -71 -65.5t-102 -26.5q-57 0 -190 62q-98 45 -170 118t-148 185q-72 107 -71 194v8q3 91 74 158q24 22 52 22q6 0 18 -1.5t19 -1.5q19 0 26.5 -6.5t15.5 -27.5q8 -20 33 -88t25 -75q0 -21 -34.5 -57.5
+t-34.5 -46.5q0 -7 5 -15q34 -73 102 -137q56 -53 151 -101q12 -7 22 -7q15 0 54 48.5t52 48.5zM782 32q127 0 243.5 50t200.5 134t134 200.5t50 243.5t-50 243.5t-134 200.5t-200.5 134t-243.5 50t-243.5 -50t-200.5 -134t-134 -200.5t-50 -243.5q0 -203 120 -368l-79 -233
+l242 77q158 -104 345 -104zM782 1414q153 0 292.5 -60t240.5 -161t161 -240.5t60 -292.5t-60 -292.5t-161 -240.5t-240.5 -161t-292.5 -60q-195 0 -365 94l-417 -134l136 405q-108 178 -108 389q0 153 60 292.5t161 240.5t240.5 161t292.5 60z" />
+    <glyph glyph-name="_528" unicode="&#xf233;" horiz-adv-x="1792" 
+d="M128 128h1024v128h-1024v-128zM128 640h1024v128h-1024v-128zM1696 192q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM128 1152h1024v128h-1024v-128zM1696 704q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1696 1216
+q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1792 384v-384h-1792v384h1792zM1792 896v-384h-1792v384h1792zM1792 1408v-384h-1792v384h1792z" />
+    <glyph glyph-name="_529" unicode="&#xf234;" horiz-adv-x="2048" 
+d="M704 640q-159 0 -271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5t-112.5 -271.5t-271.5 -112.5zM1664 512h352q13 0 22.5 -9.5t9.5 -22.5v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-352v-352q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5
+t-9.5 22.5v352h-352q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h352v352q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5v-352zM928 288q0 -52 38 -90t90 -38h256v-238q-68 -50 -171 -50h-874q-121 0 -194 69t-73 190q0 53 3.5 103.5t14 109t26.5 108.5
+t43 97.5t62 81t85.5 53.5t111.5 20q19 0 39 -17q79 -61 154.5 -91.5t164.5 -30.5t164.5 30.5t154.5 91.5q20 17 39 17q132 0 217 -96h-223q-52 0 -90 -38t-38 -90v-192z" />
+    <glyph glyph-name="_530" unicode="&#xf235;" horiz-adv-x="2048" 
+d="M704 640q-159 0 -271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5t-112.5 -271.5t-271.5 -112.5zM1781 320l249 -249q9 -9 9 -23q0 -13 -9 -22l-136 -136q-9 -9 -22 -9q-14 0 -23 9l-249 249l-249 -249q-9 -9 -23 -9q-13 0 -22 9l-136 136
+q-9 9 -9 22q0 14 9 23l249 249l-249 249q-9 9 -9 23q0 13 9 22l136 136q9 9 22 9q14 0 23 -9l249 -249l249 249q9 9 23 9q13 0 22 -9l136 -136q9 -9 9 -22q0 -14 -9 -23zM1283 320l-181 -181q-37 -37 -37 -91q0 -53 37 -90l83 -83q-21 -3 -44 -3h-874q-121 0 -194 69
+t-73 190q0 53 3.5 103.5t14 109t26.5 108.5t43 97.5t62 81t85.5 53.5t111.5 20q19 0 39 -17q154 -122 319 -122t319 122q20 17 39 17q28 0 57 -6q-28 -27 -41 -50t-13 -56q0 -54 37 -91z" />
+    <glyph glyph-name="_531" unicode="&#xf236;" horiz-adv-x="2048" 
+d="M256 512h1728q26 0 45 -19t19 -45v-448h-256v256h-1536v-256h-256v1216q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-704zM832 832q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM2048 576v64q0 159 -112.5 271.5t-271.5 112.5h-704
+q-26 0 -45 -19t-19 -45v-384h1152z" />
+    <glyph glyph-name="_532" unicode="&#xf237;" 
+d="M1536 1536l-192 -448h192v-192h-274l-55 -128h329v-192h-411l-357 -832l-357 832h-411v192h329l-55 128h-274v192h192l-192 448h256l323 -768h378l323 768h256zM768 320l108 256h-216z" />
+    <glyph glyph-name="_533" unicode="&#xf238;" 
+d="M1088 1536q185 0 316.5 -93.5t131.5 -226.5v-896q0 -130 -125.5 -222t-305.5 -97l213 -202q16 -15 8 -35t-30 -20h-1056q-22 0 -30 20t8 35l213 202q-180 5 -305.5 97t-125.5 222v896q0 133 131.5 226.5t316.5 93.5h640zM768 192q80 0 136 56t56 136t-56 136t-136 56
+t-136 -56t-56 -136t56 -136t136 -56zM1344 768v512h-1152v-512h1152z" />
+    <glyph glyph-name="_534" unicode="&#xf239;" 
+d="M1088 1536q185 0 316.5 -93.5t131.5 -226.5v-896q0 -130 -125.5 -222t-305.5 -97l213 -202q16 -15 8 -35t-30 -20h-1056q-22 0 -30 20t8 35l213 202q-180 5 -305.5 97t-125.5 222v896q0 133 131.5 226.5t316.5 93.5h640zM288 224q66 0 113 47t47 113t-47 113t-113 47
+t-113 -47t-47 -113t47 -113t113 -47zM704 768v512h-544v-512h544zM1248 224q66 0 113 47t47 113t-47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47zM1408 768v512h-576v-512h576z" />
+    <glyph glyph-name="_535" unicode="&#xf23a;" horiz-adv-x="1792" 
+d="M597 1115v-1173q0 -25 -12.5 -42.5t-36.5 -17.5q-17 0 -33 8l-465 233q-21 10 -35.5 33.5t-14.5 46.5v1140q0 20 10 34t29 14q14 0 44 -15l511 -256q3 -3 3 -5zM661 1014l534 -866l-534 266v600zM1792 996v-1054q0 -25 -14 -40.5t-38 -15.5t-47 13l-441 220zM1789 1116
+q0 -3 -256.5 -419.5t-300.5 -487.5l-390 634l324 527q17 28 52 28q14 0 26 -6l541 -270q4 -2 4 -6z" />
+    <glyph glyph-name="_536" unicode="&#xf23b;" 
+d="M809 532l266 499h-112l-157 -312q-24 -48 -44 -92l-42 92l-155 312h-120l263 -493v-324h101v318zM1536 1408v-1536h-1536v1536h1536z" />
+    <glyph glyph-name="_537" unicode="&#xf23c;" horiz-adv-x="2296" 
+d="M478 -139q-8 -16 -27 -34.5t-37 -25.5q-25 -9 -51.5 3.5t-28.5 31.5q-1 22 40 55t68 38q23 4 34 -21.5t2 -46.5zM1819 -139q7 -16 26 -34.5t38 -25.5q25 -9 51.5 3.5t27.5 31.5q2 22 -39.5 55t-68.5 38q-22 4 -33 -21.5t-2 -46.5zM1867 -30q13 -27 56.5 -59.5t77.5 -41.5
+q45 -13 82 4.5t37 50.5q0 46 -67.5 100.5t-115.5 59.5q-40 5 -63.5 -37.5t-6.5 -76.5zM428 -30q-13 -27 -56 -59.5t-77 -41.5q-45 -13 -82 4.5t-37 50.5q0 46 67.5 100.5t115.5 59.5q40 5 63 -37.5t6 -76.5zM1158 1094h1q-41 0 -76 -15q27 -8 44 -30.5t17 -49.5
+q0 -35 -27 -60t-65 -25q-52 0 -80 43q-5 -23 -5 -42q0 -74 56 -126.5t135 -52.5q80 0 136 52.5t56 126.5t-56 126.5t-136 52.5zM1462 1312q-99 109 -220.5 131.5t-245.5 -44.5q27 60 82.5 96.5t118 39.5t121.5 -17t99.5 -74.5t44.5 -131.5zM2212 73q8 -11 -11 -42
+q7 -23 7 -40q1 -56 -44.5 -112.5t-109.5 -91.5t-118 -37q-48 -2 -92 21.5t-66 65.5q-687 -25 -1259 0q-23 -41 -66.5 -65t-92.5 -22q-86 3 -179.5 80.5t-92.5 160.5q2 22 7 40q-19 31 -11 42q6 10 31 1q14 22 41 51q-7 29 2 38q11 10 39 -4q29 20 59 34q0 29 13 37
+q23 12 51 -16q35 5 61 -2q18 -4 38 -19v73q-11 0 -18 2q-53 10 -97 44.5t-55 87.5q-9 38 0 81q15 62 93 95q2 17 19 35.5t36 23.5t33 -7.5t19 -30.5h13q46 -5 60 -23q3 -3 5 -7q10 1 30.5 3.5t30.5 3.5q-15 11 -30 17q-23 40 -91 43q0 6 1 10q-62 2 -118.5 18.5t-84.5 47.5
+q-32 36 -42.5 92t-2.5 112q16 126 90 179q23 16 52 4.5t32 -40.5q0 -1 1.5 -14t2.5 -21t3 -20t5.5 -19t8.5 -10q27 -14 76 -12q48 46 98 74q-40 4 -162 -14l47 46q61 58 163 111q145 73 282 86q-20 8 -41 15.5t-47 14t-42.5 10.5t-47.5 11t-43 10q595 126 904 -139
+q98 -84 158 -222q85 -10 121 9h1q5 3 8.5 10t5.5 19t3 19.5t3 21.5l1 14q3 28 32 40t52 -5q73 -52 91 -178q7 -57 -3.5 -113t-42.5 -91q-28 -32 -83.5 -48.5t-115.5 -18.5v-10q-71 -2 -95 -43q-14 -5 -31 -17q11 -1 32 -3.5t30 -3.5q1 5 5 8q16 18 60 23h13q5 18 19 30t33 8
+t36 -23t19 -36q79 -32 93 -95q9 -40 1 -81q-12 -53 -56 -88t-97 -44q-10 -2 -17 -2q0 -49 -1 -73q20 15 38 19q26 7 61 2q28 28 51 16q14 -9 14 -37q33 -16 59 -34q27 13 38 4q10 -10 2 -38q28 -30 41 -51q23 8 31 -1zM1937 1025q0 -29 -9 -54q82 -32 112 -132
+q4 37 -9.5 98.5t-41.5 90.5q-20 19 -36 17t-16 -20zM1859 925q35 -42 47.5 -108.5t-0.5 -124.5q67 13 97 45q13 14 18 28q-3 64 -31 114.5t-79 66.5q-15 -15 -52 -21zM1822 921q-30 0 -44 1q42 -115 53 -239q21 0 43 3q16 68 1 135t-53 100zM258 839q30 100 112 132
+q-9 25 -9 54q0 18 -16.5 20t-35.5 -17q-28 -29 -41.5 -90.5t-9.5 -98.5zM294 737q29 -31 97 -45q-13 58 -0.5 124.5t47.5 108.5v0q-37 6 -52 21q-51 -16 -78.5 -66t-31.5 -115q9 -17 18 -28zM471 683q14 124 73 235q-19 -4 -55 -18l-45 -19v1q-46 -89 -20 -196q25 -3 47 -3z
+M1434 644q8 -38 16.5 -108.5t11.5 -89.5q3 -18 9.5 -21.5t23.5 4.5q40 20 62 85.5t23 125.5q-24 2 -146 4zM1152 1285q-116 0 -199 -82.5t-83 -198.5q0 -117 83 -199.5t199 -82.5t199 82.5t83 199.5q0 116 -83 198.5t-199 82.5zM1380 646q-105 2 -211 0v1q-1 -27 2.5 -86
+t13.5 -66q29 -14 93.5 -14.5t95.5 10.5q9 3 11 39t-0.5 69.5t-4.5 46.5zM1112 447q8 4 9.5 48t-0.5 88t-4 63v1q-212 -3 -214 -3q-4 -20 -7 -62t0 -83t14 -46q34 -15 101 -16t101 10zM718 636q-16 -59 4.5 -118.5t77.5 -84.5q15 -8 24 -5t12 21q3 16 8 90t10 103
+q-69 -2 -136 -6zM591 510q3 -23 -34 -36q132 -141 271.5 -240t305.5 -154q172 49 310.5 146t293.5 250q-33 13 -30 34q0 2 0.5 3.5t1.5 3t1 2.5v1v-1q-17 2 -50 5.5t-48 4.5q-26 -90 -82 -132q-51 -38 -82 1q-5 6 -9 14q-7 13 -17 62q-2 -5 -5 -9t-7.5 -7t-8 -5.5t-9.5 -4
+l-10 -2.5t-12 -2l-12 -1.5t-13.5 -1t-13.5 -0.5q-106 -9 -163 11q-4 -17 -10 -26.5t-21 -15t-23 -7t-36 -3.5q-6 -1 -9 -1q-179 -17 -203 40q-2 -63 -56 -54q-47 8 -91 54q-12 13 -20 26q-17 29 -26 65q-58 -6 -87 -10q1 -2 4 -10zM507 -118q3 14 3 30q-17 71 -51 130
+t-73 70q-41 12 -101.5 -14.5t-104.5 -80t-39 -107.5q35 -53 100 -93t119 -42q51 -2 94 28t53 79zM510 53q23 -63 27 -119q195 113 392 174q-98 52 -180.5 120t-179.5 165q-6 -4 -29 -13q0 -1 -1 -4t-1 -5q31 -18 22 -37q-12 -23 -56 -34q-10 -13 -29 -24h-1q-2 -83 1 -150
+q19 -34 35 -73zM579 -113q532 -21 1145 0q-254 147 -428 196q-76 -35 -156 -57q-8 -3 -16 0q-65 21 -129 49q-208 -60 -416 -188h-1v-1q1 0 1 1zM1763 -67q4 54 28 120q14 38 33 71l-1 -1q3 77 3 153q-15 8 -30 25q-42 9 -56 33q-9 20 22 38q-2 4 -2 9q-16 4 -28 12
+q-204 -190 -383 -284q198 -59 414 -176zM2155 -90q5 54 -39 107.5t-104 80t-102 14.5q-38 -11 -72.5 -70.5t-51.5 -129.5q0 -16 3 -30q10 -49 53 -79t94 -28q54 2 119 42t100 93z" />
+    <glyph glyph-name="_538" unicode="&#xf23d;" horiz-adv-x="2304" 
+d="M1524 -25q0 -68 -48 -116t-116 -48t-116.5 48t-48.5 116t48.5 116.5t116.5 48.5t116 -48.5t48 -116.5zM775 -25q0 -68 -48.5 -116t-116.5 -48t-116 48t-48 116t48 116.5t116 48.5t116.5 -48.5t48.5 -116.5zM0 1469q57 -60 110.5 -104.5t121 -82t136 -63t166 -45.5
+t200 -31.5t250 -18.5t304 -9.5t372.5 -2.5q139 0 244.5 -5t181 -16.5t124 -27.5t71 -39.5t24 -51.5t-19.5 -64t-56.5 -76.5t-89.5 -91t-116 -104.5t-139 -119q-185 -157 -286 -247q29 51 76.5 109t94 105.5t94.5 98.5t83 91.5t54 80.5t13 70t-45.5 55.5t-116.5 41t-204 23.5
+t-304 5q-168 -2 -314 6t-256 23t-204.5 41t-159.5 51.5t-122.5 62.5t-91.5 66.5t-68 71.5t-50.5 69.5t-40 68t-36.5 59.5z" />
+    <glyph glyph-name="_539" unicode="&#xf23e;" horiz-adv-x="1792" 
+d="M896 1472q-169 0 -323 -66t-265.5 -177.5t-177.5 -265.5t-66 -323t66 -323t177.5 -265.5t265.5 -177.5t323 -66t323 66t265.5 177.5t177.5 265.5t66 323t-66 323t-177.5 265.5t-265.5 177.5t-323 66zM896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348
+t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM496 704q16 0 16 -16v-480q0 -16 -16 -16h-32q-16 0 -16 16v480q0 16 16 16h32zM896 640q53 0 90.5 -37.5t37.5 -90.5q0 -35 -17.5 -64t-46.5 -46v-114q0 -14 -9 -23
+t-23 -9h-64q-14 0 -23 9t-9 23v114q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5zM896 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM544 928v-96
+q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v96q0 93 65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5v-96q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v96q0 146 -103 249t-249 103t-249 -103t-103 -249zM1408 192v512q0 26 -19 45t-45 19h-896q-26 0 -45 -19t-19 -45v-512
+q0 -26 19 -45t45 -19h896q26 0 45 19t19 45z" />
+    <glyph glyph-name="_540" unicode="&#xf240;" horiz-adv-x="2304" 
+d="M1920 1024v-768h-1664v768h1664zM2048 448h128v384h-128v288q0 14 -9 23t-23 9h-1856q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h1856q14 0 23 9t9 23v288zM2304 832v-384q0 -53 -37.5 -90.5t-90.5 -37.5v-160q0 -66 -47 -113t-113 -47h-1856q-66 0 -113 47t-47 113
+v960q0 66 47 113t113 47h1856q66 0 113 -47t47 -113v-160q53 0 90.5 -37.5t37.5 -90.5z" />
+    <glyph glyph-name="_541" unicode="&#xf241;" horiz-adv-x="2304" 
+d="M256 256v768h1280v-768h-1280zM2176 960q53 0 90.5 -37.5t37.5 -90.5v-384q0 -53 -37.5 -90.5t-90.5 -37.5v-160q0 -66 -47 -113t-113 -47h-1856q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1856q66 0 113 -47t47 -113v-160zM2176 448v384h-128v288q0 14 -9 23t-23 9
+h-1856q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h1856q14 0 23 9t9 23v288h128z" />
+    <glyph glyph-name="_542" unicode="&#xf242;" horiz-adv-x="2304" 
+d="M256 256v768h896v-768h-896zM2176 960q53 0 90.5 -37.5t37.5 -90.5v-384q0 -53 -37.5 -90.5t-90.5 -37.5v-160q0 -66 -47 -113t-113 -47h-1856q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1856q66 0 113 -47t47 -113v-160zM2176 448v384h-128v288q0 14 -9 23t-23 9
+h-1856q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h1856q14 0 23 9t9 23v288h128z" />
+    <glyph glyph-name="_543" unicode="&#xf243;" horiz-adv-x="2304" 
+d="M256 256v768h512v-768h-512zM2176 960q53 0 90.5 -37.5t37.5 -90.5v-384q0 -53 -37.5 -90.5t-90.5 -37.5v-160q0 -66 -47 -113t-113 -47h-1856q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1856q66 0 113 -47t47 -113v-160zM2176 448v384h-128v288q0 14 -9 23t-23 9
+h-1856q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h1856q14 0 23 9t9 23v288h128z" />
+    <glyph glyph-name="_544" unicode="&#xf244;" horiz-adv-x="2304" 
+d="M2176 960q53 0 90.5 -37.5t37.5 -90.5v-384q0 -53 -37.5 -90.5t-90.5 -37.5v-160q0 -66 -47 -113t-113 -47h-1856q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1856q66 0 113 -47t47 -113v-160zM2176 448v384h-128v288q0 14 -9 23t-23 9h-1856q-14 0 -23 -9t-9 -23
+v-960q0 -14 9 -23t23 -9h1856q14 0 23 9t9 23v288h128z" />
+    <glyph glyph-name="_545" unicode="&#xf245;" horiz-adv-x="1280" 
+d="M1133 493q31 -30 14 -69q-17 -40 -59 -40h-382l201 -476q10 -25 0 -49t-34 -35l-177 -75q-25 -10 -49 0t-35 34l-191 452l-312 -312q-19 -19 -45 -19q-12 0 -24 5q-40 17 -40 59v1504q0 42 40 59q12 5 24 5q27 0 45 -19z" />
+    <glyph glyph-name="_546" unicode="&#xf246;" horiz-adv-x="1024" 
+d="M832 1408q-320 0 -320 -224v-416h128v-128h-128v-544q0 -224 320 -224h64v-128h-64q-272 0 -384 146q-112 -146 -384 -146h-64v128h64q320 0 320 224v544h-128v128h128v416q0 224 -320 224h-64v128h64q272 0 384 -146q112 146 384 146h64v-128h-64z" />
+    <glyph glyph-name="_547" unicode="&#xf247;" horiz-adv-x="2048" 
+d="M2048 1152h-128v-1024h128v-384h-384v128h-1280v-128h-384v384h128v1024h-128v384h384v-128h1280v128h384v-384zM1792 1408v-128h128v128h-128zM128 1408v-128h128v128h-128zM256 -128v128h-128v-128h128zM1664 0v128h128v1024h-128v128h-1280v-128h-128v-1024h128v-128
+h1280zM1920 -128v128h-128v-128h128zM1280 896h384v-768h-896v256h-384v768h896v-256zM512 512h640v512h-640v-512zM1536 256v512h-256v-384h-384v-128h640z" />
+    <glyph glyph-name="_548" unicode="&#xf248;" horiz-adv-x="2304" 
+d="M2304 768h-128v-640h128v-384h-384v128h-896v-128h-384v384h128v128h-384v-128h-384v384h128v640h-128v384h384v-128h896v128h384v-384h-128v-128h384v128h384v-384zM2048 1024v-128h128v128h-128zM1408 1408v-128h128v128h-128zM128 1408v-128h128v128h-128zM256 256
+v128h-128v-128h128zM1536 384h-128v-128h128v128zM384 384h896v128h128v640h-128v128h-896v-128h-128v-640h128v-128zM896 -128v128h-128v-128h128zM2176 -128v128h-128v-128h128zM2048 128v640h-128v128h-384v-384h128v-384h-384v128h-384v-128h128v-128h896v128h128z" />
+    <glyph glyph-name="_549" unicode="&#xf249;" 
+d="M1024 288v-416h-928q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h1344q40 0 68 -28t28 -68v-928h-416q-40 0 -68 -28t-28 -68zM1152 256h381q-15 -82 -65 -132l-184 -184q-50 -50 -132 -65v381z" />
+    <glyph glyph-name="_550" unicode="&#xf24a;" 
+d="M1400 256h-248v-248q29 10 41 22l185 185q12 12 22 41zM1120 384h288v896h-1280v-1280h896v288q0 40 28 68t68 28zM1536 1312v-1024q0 -40 -20 -88t-48 -76l-184 -184q-28 -28 -76 -48t-88 -20h-1024q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h1344q40 0 68 -28t28 -68
+z" />
+    <glyph glyph-name="_551" unicode="&#xf24b;" horiz-adv-x="2304" 
+d="M1951 538q0 -26 -15.5 -44.5t-38.5 -23.5q-8 -2 -18 -2h-153v140h153q10 0 18 -2q23 -5 38.5 -23.5t15.5 -44.5zM1933 751q0 -25 -15 -42t-38 -21q-3 -1 -15 -1h-139v129h139q3 0 8.5 -0.5t6.5 -0.5q23 -4 38 -21.5t15 -42.5zM728 587v308h-228v-308q0 -58 -38 -94.5
+t-105 -36.5q-108 0 -229 59v-112q53 -15 121 -23t109 -9l42 -1q328 0 328 217zM1442 403v113q-99 -52 -200 -59q-108 -8 -169 41t-61 142t61 142t169 41q101 -7 200 -58v112q-48 12 -100 19.5t-80 9.5l-28 2q-127 6 -218.5 -14t-140.5 -60t-71 -88t-22 -106t22 -106t71 -88
+t140.5 -60t218.5 -14q101 4 208 31zM2176 518q0 54 -43 88.5t-109 39.5v3q57 8 89 41.5t32 79.5q0 55 -41 88t-107 36q-3 0 -12 0.5t-14 0.5h-455v-510h491q74 0 121.5 36.5t47.5 96.5zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90
+t90 38h2048q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="_552" unicode="&#xf24c;" horiz-adv-x="2304" 
+d="M858 295v693q-106 -41 -172 -135.5t-66 -211.5t66 -211.5t172 -134.5zM1362 641q0 117 -66 211.5t-172 135.5v-694q106 41 172 135.5t66 211.5zM1577 641q0 -159 -78.5 -294t-213.5 -213.5t-294 -78.5q-119 0 -227.5 46.5t-187 125t-125 187t-46.5 227.5q0 159 78.5 294
+t213.5 213.5t294 78.5t294 -78.5t213.5 -213.5t78.5 -294zM1960 634q0 139 -55.5 261.5t-147.5 205.5t-213.5 131t-252.5 48h-301q-176 0 -323.5 -81t-235 -230t-87.5 -335q0 -171 87 -317.5t236 -231.5t323 -85h301q129 0 251.5 50.5t214.5 135t147.5 202.5t55.5 246z
+M2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="_553" unicode="&#xf24d;" horiz-adv-x="1792" 
+d="M1664 -96v1088q0 13 -9.5 22.5t-22.5 9.5h-1088q-13 0 -22.5 -9.5t-9.5 -22.5v-1088q0 -13 9.5 -22.5t22.5 -9.5h1088q13 0 22.5 9.5t9.5 22.5zM1792 992v-1088q0 -66 -47 -113t-113 -47h-1088q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1088q66 0 113 -47t47 -113
+zM1408 1376v-160h-128v160q0 13 -9.5 22.5t-22.5 9.5h-1088q-13 0 -22.5 -9.5t-9.5 -22.5v-1088q0 -13 9.5 -22.5t22.5 -9.5h160v-128h-160q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1088q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="_554" unicode="&#xf24e;" horiz-adv-x="2304" 
+d="M1728 1088l-384 -704h768zM448 1088l-384 -704h768zM1269 1280q-14 -40 -45.5 -71.5t-71.5 -45.5v-1291h608q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1344q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h608v1291q-40 14 -71.5 45.5t-45.5 71.5h-491q-14 0 -23 9t-9 23v64
+q0 14 9 23t23 9h491q21 57 70 92.5t111 35.5t111 -35.5t70 -92.5h491q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-491zM1088 1264q33 0 56.5 23.5t23.5 56.5t-23.5 56.5t-56.5 23.5t-56.5 -23.5t-23.5 -56.5t23.5 -56.5t56.5 -23.5zM2176 384q0 -73 -46.5 -131t-117.5 -91
+t-144.5 -49.5t-139.5 -16.5t-139.5 16.5t-144.5 49.5t-117.5 91t-46.5 131q0 11 35 81t92 174.5t107 195.5t102 184t56 100q18 33 56 33t56 -33q4 -7 56 -100t102 -184t107 -195.5t92 -174.5t35 -81zM896 384q0 -73 -46.5 -131t-117.5 -91t-144.5 -49.5t-139.5 -16.5
+t-139.5 16.5t-144.5 49.5t-117.5 91t-46.5 131q0 11 35 81t92 174.5t107 195.5t102 184t56 100q18 33 56 33t56 -33q4 -7 56 -100t102 -184t107 -195.5t92 -174.5t35 -81z" />
+    <glyph glyph-name="_555" unicode="&#xf250;" 
+d="M1408 1408q0 -261 -106.5 -461.5t-266.5 -306.5q160 -106 266.5 -306.5t106.5 -461.5h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1472q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96q0 261 106.5 461.5t266.5 306.5q-160 106 -266.5 306.5t-106.5 461.5h-96q-14 0 -23 9
+t-9 23v64q0 14 9 23t23 9h1472q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96zM874 700q77 29 149 92.5t129.5 152.5t92.5 210t35 253h-1024q0 -132 35 -253t92.5 -210t129.5 -152.5t149 -92.5q19 -7 30.5 -23.5t11.5 -36.5t-11.5 -36.5t-30.5 -23.5q-77 -29 -149 -92.5
+t-129.5 -152.5t-92.5 -210t-35 -253h1024q0 132 -35 253t-92.5 210t-129.5 152.5t-149 92.5q-19 7 -30.5 23.5t-11.5 36.5t11.5 36.5t30.5 23.5z" />
+    <glyph glyph-name="_556" unicode="&#xf251;" 
+d="M1408 1408q0 -261 -106.5 -461.5t-266.5 -306.5q160 -106 266.5 -306.5t106.5 -461.5h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1472q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96q0 261 106.5 461.5t266.5 306.5q-160 106 -266.5 306.5t-106.5 461.5h-96q-14 0 -23 9
+t-9 23v64q0 14 9 23t23 9h1472q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96zM1280 1408h-1024q0 -66 9 -128h1006q9 61 9 128zM1280 -128q0 130 -34 249.5t-90.5 208t-126.5 152t-146 94.5h-230q-76 -31 -146 -94.5t-126.5 -152t-90.5 -208t-34 -249.5h1024z" />
+    <glyph glyph-name="_557" unicode="&#xf252;" 
+d="M1408 1408q0 -261 -106.5 -461.5t-266.5 -306.5q160 -106 266.5 -306.5t106.5 -461.5h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1472q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96q0 261 106.5 461.5t266.5 306.5q-160 106 -266.5 306.5t-106.5 461.5h-96q-14 0 -23 9
+t-9 23v64q0 14 9 23t23 9h1472q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96zM1280 1408h-1024q0 -206 85 -384h854q85 178 85 384zM1223 192q-54 141 -145.5 241.5t-194.5 142.5h-230q-103 -42 -194.5 -142.5t-145.5 -241.5h910z" />
+    <glyph glyph-name="_558" unicode="&#xf253;" 
+d="M1408 1408q0 -261 -106.5 -461.5t-266.5 -306.5q160 -106 266.5 -306.5t106.5 -461.5h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1472q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96q0 261 106.5 461.5t266.5 306.5q-160 106 -266.5 306.5t-106.5 461.5h-96q-14 0 -23 9
+t-9 23v64q0 14 9 23t23 9h1472q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96zM874 700q77 29 149 92.5t129.5 152.5t92.5 210t35 253h-1024q0 -132 35 -253t92.5 -210t129.5 -152.5t149 -92.5q19 -7 30.5 -23.5t11.5 -36.5t-11.5 -36.5t-30.5 -23.5q-137 -51 -244 -196
+h700q-107 145 -244 196q-19 7 -30.5 23.5t-11.5 36.5t11.5 36.5t30.5 23.5z" />
+    <glyph glyph-name="_559" unicode="&#xf254;" 
+d="M1504 -64q14 0 23 -9t9 -23v-128q0 -14 -9 -23t-23 -9h-1472q-14 0 -23 9t-9 23v128q0 14 9 23t23 9h1472zM130 0q3 55 16 107t30 95t46 87t53.5 76t64.5 69.5t66 60t70.5 55t66.5 47.5t65 43q-43 28 -65 43t-66.5 47.5t-70.5 55t-66 60t-64.5 69.5t-53.5 76t-46 87
+t-30 95t-16 107h1276q-3 -55 -16 -107t-30 -95t-46 -87t-53.5 -76t-64.5 -69.5t-66 -60t-70.5 -55t-66.5 -47.5t-65 -43q43 -28 65 -43t66.5 -47.5t70.5 -55t66 -60t64.5 -69.5t53.5 -76t46 -87t30 -95t16 -107h-1276zM1504 1536q14 0 23 -9t9 -23v-128q0 -14 -9 -23t-23 -9
+h-1472q-14 0 -23 9t-9 23v128q0 14 9 23t23 9h1472z" />
+    <glyph glyph-name="_560" unicode="&#xf255;" 
+d="M768 1152q-53 0 -90.5 -37.5t-37.5 -90.5v-128h-32v93q0 48 -32 81.5t-80 33.5q-46 0 -79 -33t-33 -79v-429l-32 30v172q0 48 -32 81.5t-80 33.5q-46 0 -79 -33t-33 -79v-224q0 -47 35 -82l310 -296q39 -39 39 -102q0 -26 19 -45t45 -19h640q26 0 45 19t19 45v25
+q0 41 10 77l108 436q10 36 10 77v246q0 48 -32 81.5t-80 33.5q-46 0 -79 -33t-33 -79v-32h-32v125q0 40 -25 72.5t-64 40.5q-14 2 -23 2q-46 0 -79 -33t-33 -79v-128h-32v122q0 51 -32.5 89.5t-82.5 43.5q-5 1 -13 1zM768 1280q84 0 149 -50q57 34 123 34q59 0 111 -27
+t86 -76q27 7 59 7q100 0 170 -71.5t70 -171.5v-246q0 -51 -13 -108l-109 -436q-6 -24 -6 -71q0 -80 -56 -136t-136 -56h-640q-84 0 -138 58.5t-54 142.5l-308 296q-76 73 -76 175v224q0 99 70.5 169.5t169.5 70.5q11 0 16 -1q6 95 75.5 160t164.5 65q52 0 98 -21
+q72 69 174 69z" />
+    <glyph glyph-name="_561" unicode="&#xf256;" horiz-adv-x="1792" 
+d="M880 1408q-46 0 -79 -33t-33 -79v-656h-32v528q0 46 -33 79t-79 33t-79 -33t-33 -79v-528v-256l-154 205q-38 51 -102 51q-53 0 -90.5 -37.5t-37.5 -90.5q0 -43 26 -77l384 -512q38 -51 102 -51h688q34 0 61 22t34 56l76 405q5 32 5 59v498q0 46 -33 79t-79 33t-79 -33
+t-33 -79v-272h-32v528q0 46 -33 79t-79 33t-79 -33t-33 -79v-528h-32v656q0 46 -33 79t-79 33zM880 1536q68 0 125.5 -35.5t88.5 -96.5q19 4 42 4q99 0 169.5 -70.5t70.5 -169.5v-17q105 6 180.5 -64t75.5 -175v-498q0 -40 -8 -83l-76 -404q-14 -79 -76.5 -131t-143.5 -52
+h-688q-60 0 -114.5 27.5t-90.5 74.5l-384 512q-51 68 -51 154q0 106 75 181t181 75q78 0 128 -34v434q0 99 70.5 169.5t169.5 70.5q23 0 42 -4q31 61 88.5 96.5t125.5 35.5z" />
+    <glyph glyph-name="_562" unicode="&#xf257;" horiz-adv-x="1792" 
+d="M1073 -128h-177q-163 0 -226 141q-23 49 -23 102v5q-62 30 -98.5 88.5t-36.5 127.5q0 38 5 48h-261q-106 0 -181 75t-75 181t75 181t181 75h113l-44 17q-74 28 -119.5 93.5t-45.5 145.5q0 106 75 181t181 75q46 0 91 -17l628 -239h401q106 0 181 -75t75 -181v-668
+q0 -88 -54 -157.5t-140 -90.5l-339 -85q-92 -23 -186 -23zM1024 583l-155 -71l-163 -74q-30 -14 -48 -41.5t-18 -60.5q0 -46 33 -79t79 -33q26 0 46 10l338 154q-49 10 -80.5 50t-31.5 90v55zM1344 272q0 46 -33 79t-79 33q-26 0 -46 -10l-290 -132q-28 -13 -37 -17
+t-30.5 -17t-29.5 -23.5t-16 -29t-8 -40.5q0 -50 31.5 -82t81.5 -32q20 0 38 9l352 160q30 14 48 41.5t18 60.5zM1112 1024l-650 248q-24 8 -46 8q-53 0 -90.5 -37.5t-37.5 -90.5q0 -40 22.5 -73t59.5 -47l526 -200v-64h-640q-53 0 -90.5 -37.5t-37.5 -90.5t37.5 -90.5
+t90.5 -37.5h535l233 106v198q0 63 46 106l111 102h-69zM1073 0q82 0 155 19l339 85q43 11 70 45.5t27 78.5v668q0 53 -37.5 90.5t-90.5 37.5h-308l-136 -126q-36 -33 -36 -82v-296q0 -46 33 -77t79 -31t79 35t33 81v208h32v-208q0 -70 -57 -114q52 -8 86.5 -48.5t34.5 -93.5
+q0 -42 -23 -78t-61 -53l-310 -141h91z" />
+    <glyph glyph-name="_563" unicode="&#xf258;" horiz-adv-x="2048" 
+d="M1151 1536q61 0 116 -28t91 -77l572 -781q118 -159 118 -359v-355q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v177l-286 143h-546q-80 0 -136 56t-56 136v32q0 119 84.5 203.5t203.5 84.5h420l42 128h-686q-100 0 -173.5 67.5t-81.5 166.5q-65 79 -65 182v32
+q0 80 56 136t136 56h959zM1920 -64v355q0 157 -93 284l-573 781q-39 52 -103 52h-959q-26 0 -45 -19t-19 -45q0 -32 1.5 -49.5t9.5 -40.5t25 -43q10 31 35.5 50t56.5 19h832v-32h-832q-26 0 -45 -19t-19 -45q0 -44 3 -58q8 -44 44 -73t81 -29h640h91q40 0 68 -28t28 -68
+q0 -15 -5 -30l-64 -192q-10 -29 -35 -47.5t-56 -18.5h-443q-66 0 -113 -47t-47 -113v-32q0 -26 19 -45t45 -19h561q16 0 29 -7l317 -158q24 -13 38.5 -36t14.5 -50v-197q0 -26 19 -45t45 -19h384q26 0 45 19t19 45z" />
+    <glyph glyph-name="_564" unicode="&#xf259;" horiz-adv-x="2048" 
+d="M459 -256q-77 0 -137.5 47.5t-79.5 122.5l-101 401q-13 57 -13 108q0 45 -5 67l-116 477q-7 27 -7 57q0 93 62 161t155 78q17 85 82.5 139t152.5 54q83 0 148 -51.5t85 -132.5l83 -348l103 428q20 81 85 132.5t148 51.5q89 0 155.5 -57.5t80.5 -144.5q92 -10 152 -79
+t60 -162q0 -24 -7 -59l-123 -512q10 7 37.5 28.5t38.5 29.5t35 23t41 20.5t41.5 11t49.5 5.5q105 0 180 -74t75 -179q0 -62 -28.5 -118t-78.5 -94l-507 -380q-68 -51 -153 -51h-694zM1104 1408q-38 0 -68.5 -24t-39.5 -62l-164 -682h-127l-145 602q-9 38 -39.5 62t-68.5 24
+q-48 0 -80 -33t-32 -80q0 -15 3 -28l132 -547h-26l-99 408q-9 37 -40 62.5t-69 25.5q-47 0 -80 -33t-33 -79q0 -14 3 -26l116 -478q7 -28 9 -86t10 -88l100 -401q8 -32 34 -52.5t59 -20.5h694q42 0 76 26l507 379q56 43 56 110q0 52 -37.5 88.5t-89.5 36.5q-43 0 -77 -26
+l-307 -230v227q0 4 32 138t68 282t39 161q4 18 4 29q0 47 -32 81t-79 34q-39 0 -69.5 -24t-39.5 -62l-116 -482h-26l150 624q3 14 3 28q0 48 -31.5 82t-79.5 34z" />
+    <glyph glyph-name="_565" unicode="&#xf25a;" horiz-adv-x="1792" 
+d="M640 1408q-53 0 -90.5 -37.5t-37.5 -90.5v-512v-384l-151 202q-41 54 -107 54q-52 0 -89 -38t-37 -90q0 -43 26 -77l384 -512q38 -51 102 -51h718q22 0 39.5 13.5t22.5 34.5l92 368q24 96 24 194v217q0 41 -28 71t-68 30t-68 -28t-28 -68h-32v61q0 48 -32 81.5t-80 33.5
+q-46 0 -79 -33t-33 -79v-64h-32v90q0 55 -37 94.5t-91 39.5q-53 0 -90.5 -37.5t-37.5 -90.5v-96h-32v570q0 55 -37 94.5t-91 39.5zM640 1536q107 0 181.5 -77.5t74.5 -184.5v-220q22 2 32 2q99 0 173 -69q47 21 99 21q113 0 184 -87q27 7 56 7q94 0 159 -67.5t65 -161.5
+v-217q0 -116 -28 -225l-92 -368q-16 -64 -68 -104.5t-118 -40.5h-718q-60 0 -114.5 27.5t-90.5 74.5l-384 512q-51 68 -51 154q0 105 74.5 180.5t179.5 75.5q71 0 130 -35v547q0 106 75 181t181 75zM768 128v384h-32v-384h32zM1024 128v384h-32v-384h32zM1280 128v384h-32
+v-384h32z" />
+    <glyph glyph-name="_566" unicode="&#xf25b;" 
+d="M1288 889q60 0 107 -23q141 -63 141 -226v-177q0 -94 -23 -186l-85 -339q-21 -86 -90.5 -140t-157.5 -54h-668q-106 0 -181 75t-75 181v401l-239 628q-17 45 -17 91q0 106 75 181t181 75q80 0 145.5 -45.5t93.5 -119.5l17 -44v113q0 106 75 181t181 75t181 -75t75 -181
+v-261q27 5 48 5q69 0 127.5 -36.5t88.5 -98.5zM1072 896q-33 0 -60.5 -18t-41.5 -48l-74 -163l-71 -155h55q50 0 90 -31.5t50 -80.5l154 338q10 20 10 46q0 46 -33 79t-79 33zM1293 761q-22 0 -40.5 -8t-29 -16t-23.5 -29.5t-17 -30.5t-17 -37l-132 -290q-10 -20 -10 -46
+q0 -46 33 -79t79 -33q33 0 60.5 18t41.5 48l160 352q9 18 9 38q0 50 -32 81.5t-82 31.5zM128 1120q0 -22 8 -46l248 -650v-69l102 111q43 46 106 46h198l106 233v535q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5v-640h-64l-200 526q-14 37 -47 59.5t-73 22.5
+q-53 0 -90.5 -37.5t-37.5 -90.5zM1180 -128q44 0 78.5 27t45.5 70l85 339q19 73 19 155v91l-141 -310q-17 -38 -53 -61t-78 -23q-53 0 -93.5 34.5t-48.5 86.5q-44 -57 -114 -57h-208v32h208q46 0 81 33t35 79t-31 79t-77 33h-296q-49 0 -82 -36l-126 -136v-308
+q0 -53 37.5 -90.5t90.5 -37.5h668z" />
+    <glyph glyph-name="_567" unicode="&#xf25c;" horiz-adv-x="1973" 
+d="M857 992v-117q0 -13 -9.5 -22t-22.5 -9h-298v-812q0 -13 -9 -22.5t-22 -9.5h-135q-13 0 -22.5 9t-9.5 23v812h-297q-13 0 -22.5 9t-9.5 22v117q0 14 9 23t23 9h793q13 0 22.5 -9.5t9.5 -22.5zM1895 995l77 -961q1 -13 -8 -24q-10 -10 -23 -10h-134q-12 0 -21 8.5
+t-10 20.5l-46 588l-189 -425q-8 -19 -29 -19h-120q-20 0 -29 19l-188 427l-45 -590q-1 -12 -10 -20.5t-21 -8.5h-135q-13 0 -23 10q-9 10 -9 24l78 961q1 12 10 20.5t21 8.5h142q20 0 29 -19l220 -520q10 -24 20 -51q3 7 9.5 24.5t10.5 26.5l221 520q9 19 29 19h141
+q13 0 22 -8.5t10 -20.5z" />
+    <glyph glyph-name="_568" unicode="&#xf25d;" horiz-adv-x="1792" 
+d="M1042 833q0 88 -60 121q-33 18 -117 18h-123v-281h162q66 0 102 37t36 105zM1094 548l205 -373q8 -17 -1 -31q-8 -16 -27 -16h-152q-20 0 -28 17l-194 365h-155v-350q0 -14 -9 -23t-23 -9h-134q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h294q128 0 190 -24q85 -31 134 -109
+t49 -180q0 -92 -42.5 -165.5t-115.5 -109.5q6 -10 9 -16zM896 1376q-150 0 -286 -58.5t-234.5 -157t-157 -234.5t-58.5 -286t58.5 -286t157 -234.5t234.5 -157t286 -58.5t286 58.5t234.5 157t157 234.5t58.5 286t-58.5 286t-157 234.5t-234.5 157t-286 58.5zM1792 640
+q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="_569" unicode="&#xf25e;" horiz-adv-x="1792" 
+d="M605 303q153 0 257 104q14 18 3 36l-45 82q-6 13 -24 17q-16 2 -27 -11l-4 -3q-4 -4 -11.5 -10t-17.5 -13.5t-23.5 -14.5t-28.5 -13t-33.5 -9.5t-37.5 -3.5q-76 0 -125 50t-49 127q0 76 48 125.5t122 49.5q37 0 71.5 -14t50.5 -28l16 -14q11 -11 26 -10q16 2 24 14l53 78
+q13 20 -2 39q-3 4 -11 12t-30 23.5t-48.5 28t-67.5 22.5t-86 10q-148 0 -246 -96.5t-98 -240.5q0 -146 97 -241.5t247 -95.5zM1235 303q153 0 257 104q14 18 4 36l-45 82q-8 14 -25 17q-16 2 -27 -11l-4 -3q-4 -4 -11.5 -10t-17.5 -13.5t-23.5 -14.5t-28.5 -13t-33.5 -9.5
+t-37.5 -3.5q-76 0 -125 50t-49 127q0 76 48 125.5t122 49.5q37 0 71.5 -14t50.5 -28l16 -14q11 -11 26 -10q16 2 24 14l53 78q13 20 -2 39q-3 4 -11 12t-30 23.5t-48.5 28t-67.5 22.5t-86 10q-147 0 -245.5 -96.5t-98.5 -240.5q0 -146 97 -241.5t247 -95.5zM896 1376
+q-150 0 -286 -58.5t-234.5 -157t-157 -234.5t-58.5 -286t58.5 -286t157 -234.5t234.5 -157t286 -58.5t286 58.5t234.5 157t157 234.5t58.5 286t-58.5 286t-157 234.5t-234.5 157t-286 58.5zM896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286t-286 -191
+t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71z" />
+    <glyph glyph-name="f260" unicode="&#xf260;" horiz-adv-x="2048" 
+d="M736 736l384 -384l-384 -384l-672 672l672 672l168 -168l-96 -96l-72 72l-480 -480l480 -480l193 193l-289 287zM1312 1312l672 -672l-672 -672l-168 168l96 96l72 -72l480 480l-480 480l-193 -193l289 -287l-96 -96l-384 384z" />
+    <glyph glyph-name="f261" unicode="&#xf261;" horiz-adv-x="1792" 
+d="M717 182l271 271l-279 279l-88 -88l192 -191l-96 -96l-279 279l279 279l40 -40l87 87l-127 128l-454 -454zM1075 190l454 454l-454 454l-271 -271l279 -279l88 88l-192 191l96 96l279 -279l-279 -279l-40 40l-87 -88zM1792 640q0 -182 -71 -348t-191 -286t-286 -191
+t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="_572" unicode="&#xf262;" horiz-adv-x="2304" 
+d="M651 539q0 -39 -27.5 -66.5t-65.5 -27.5q-39 0 -66.5 27.5t-27.5 66.5q0 38 27.5 65.5t66.5 27.5q38 0 65.5 -27.5t27.5 -65.5zM1805 540q0 -39 -27.5 -66.5t-66.5 -27.5t-66.5 27.5t-27.5 66.5t27.5 66t66.5 27t66.5 -27t27.5 -66zM765 539q0 79 -56.5 136t-136.5 57
+t-136.5 -56.5t-56.5 -136.5t56.5 -136.5t136.5 -56.5t136.5 56.5t56.5 136.5zM1918 540q0 80 -56.5 136.5t-136.5 56.5q-79 0 -136 -56.5t-57 -136.5t56.5 -136.5t136.5 -56.5t136.5 56.5t56.5 136.5zM850 539q0 -116 -81.5 -197.5t-196.5 -81.5q-116 0 -197.5 82t-81.5 197
+t82 196.5t197 81.5t196.5 -81.5t81.5 -196.5zM2004 540q0 -115 -81.5 -196.5t-197.5 -81.5q-115 0 -196.5 81.5t-81.5 196.5t81.5 196.5t196.5 81.5q116 0 197.5 -81.5t81.5 -196.5zM1040 537q0 191 -135.5 326.5t-326.5 135.5q-125 0 -231 -62t-168 -168.5t-62 -231.5
+t62 -231.5t168 -168.5t231 -62q191 0 326.5 135.5t135.5 326.5zM1708 1110q-254 111 -556 111q-319 0 -573 -110q117 0 223 -45.5t182.5 -122.5t122 -183t45.5 -223q0 115 43.5 219.5t118 180.5t177.5 123t217 50zM2187 537q0 191 -135 326.5t-326 135.5t-326.5 -135.5
+t-135.5 -326.5t135.5 -326.5t326.5 -135.5t326 135.5t135 326.5zM1921 1103h383q-44 -51 -75 -114.5t-40 -114.5q110 -151 110 -337q0 -156 -77 -288t-209 -208.5t-287 -76.5q-133 0 -249 56t-196 155q-47 -56 -129 -179q-11 22 -53.5 82.5t-74.5 97.5
+q-80 -99 -196.5 -155.5t-249.5 -56.5q-155 0 -287 76.5t-209 208.5t-77 288q0 186 110 337q-9 51 -40 114.5t-75 114.5h365q149 100 355 156.5t432 56.5q224 0 421 -56t348 -157z" />
+    <glyph glyph-name="f263" unicode="&#xf263;" horiz-adv-x="1280" 
+d="M640 629q-188 0 -321 133t-133 320q0 188 133 321t321 133t321 -133t133 -321q0 -187 -133 -320t-321 -133zM640 1306q-92 0 -157.5 -65.5t-65.5 -158.5q0 -92 65.5 -157.5t157.5 -65.5t157.5 65.5t65.5 157.5q0 93 -65.5 158.5t-157.5 65.5zM1163 574q13 -27 15 -49.5
+t-4.5 -40.5t-26.5 -38.5t-42.5 -37t-61.5 -41.5q-115 -73 -315 -94l73 -72l267 -267q30 -31 30 -74t-30 -73l-12 -13q-31 -30 -74 -30t-74 30q-67 68 -267 268l-267 -268q-31 -30 -74 -30t-73 30l-12 13q-31 30 -31 73t31 74l267 267l72 72q-203 21 -317 94
+q-39 25 -61.5 41.5t-42.5 37t-26.5 38.5t-4.5 40.5t15 49.5q10 20 28 35t42 22t56 -2t65 -35q5 -4 15 -11t43 -24.5t69 -30.5t92 -24t113 -11q91 0 174 25.5t120 50.5l38 25q33 26 65 35t56 2t42 -22t28 -35z" />
+    <glyph glyph-name="_574" unicode="&#xf264;" 
+d="M927 956q0 -66 -46.5 -112.5t-112.5 -46.5t-112.5 46.5t-46.5 112.5t46.5 112.5t112.5 46.5t112.5 -46.5t46.5 -112.5zM1141 593q-10 20 -28 32t-47.5 9.5t-60.5 -27.5q-10 -8 -29 -20t-81 -32t-127 -20t-124 18t-86 36l-27 18q-31 25 -60.5 27.5t-47.5 -9.5t-28 -32
+q-22 -45 -2 -74.5t87 -73.5q83 -53 226 -67l-51 -52q-142 -142 -191 -190q-22 -22 -22 -52.5t22 -52.5l9 -9q22 -22 52.5 -22t52.5 22l191 191q114 -115 191 -191q22 -22 52.5 -22t52.5 22l9 9q22 22 22 52.5t-22 52.5l-191 190l-52 52q141 14 225 67q67 44 87 73.5t-2 74.5
+zM1092 956q0 134 -95 229t-229 95t-229 -95t-95 -229t95 -229t229 -95t229 95t95 229zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="_575" unicode="&#xf265;" horiz-adv-x="1720" 
+d="M1565 1408q65 0 110 -45.5t45 -110.5v-519q0 -176 -68 -336t-182.5 -275t-274 -182.5t-334.5 -67.5q-176 0 -335.5 67.5t-274.5 182.5t-183 275t-68 336v519q0 64 46 110t110 46h1409zM861 344q47 0 82 33l404 388q37 35 37 85q0 49 -34.5 83.5t-83.5 34.5q-47 0 -82 -33
+l-323 -310l-323 310q-35 33 -81 33q-49 0 -83.5 -34.5t-34.5 -83.5q0 -51 36 -85l405 -388q33 -33 81 -33z" />
+    <glyph glyph-name="_576" unicode="&#xf266;" horiz-adv-x="2304" 
+d="M1494 -103l-295 695q-25 -49 -158.5 -305.5t-198.5 -389.5q-1 -1 -27.5 -0.5t-26.5 1.5q-82 193 -255.5 587t-259.5 596q-21 50 -66.5 107.5t-103.5 100.5t-102 43q0 5 -0.5 24t-0.5 27h583v-50q-39 -2 -79.5 -16t-66.5 -43t-10 -64q26 -59 216.5 -499t235.5 -540
+q31 61 140 266.5t131 247.5q-19 39 -126 281t-136 295q-38 69 -201 71v50l513 -1v-47q-60 -2 -93.5 -25t-12.5 -69q33 -70 87 -189.5t86 -187.5q110 214 173 363q24 55 -10 79.5t-129 26.5q1 7 1 25v24q64 0 170.5 0.5t180 1t92.5 0.5v-49q-62 -2 -119 -33t-90 -81
+l-213 -442q13 -33 127.5 -290t121.5 -274l441 1017q-14 38 -49.5 62.5t-65 31.5t-55.5 8v50l460 -4l1 -2l-1 -44q-139 -4 -201 -145q-526 -1216 -559 -1291h-49z" />
+    <glyph glyph-name="_577" unicode="&#xf267;" horiz-adv-x="1792" 
+d="M949 643q0 -26 -16.5 -45t-41.5 -19q-26 0 -45 16.5t-19 41.5q0 26 17 45t42 19t44 -16.5t19 -41.5zM964 585l350 581q-9 -8 -67.5 -62.5t-125.5 -116.5t-136.5 -127t-117 -110.5t-50.5 -51.5l-349 -580q7 7 67 62t126 116.5t136 127t117 111t50 50.5zM1611 640
+q0 -201 -104 -371q-3 2 -17 11t-26.5 16.5t-16.5 7.5q-13 0 -13 -13q0 -10 59 -44q-74 -112 -184.5 -190.5t-241.5 -110.5l-16 67q-1 10 -15 10q-5 0 -8 -5.5t-2 -9.5l16 -68q-72 -15 -146 -15q-199 0 -372 105q1 2 13 20.5t21.5 33.5t9.5 19q0 13 -13 13q-6 0 -17 -14.5
+t-22.5 -34.5t-13.5 -23q-113 75 -192 187.5t-110 244.5l69 15q10 3 10 15q0 5 -5.5 8t-10.5 2l-68 -15q-14 72 -14 139q0 206 109 379q2 -1 18.5 -12t30 -19t17.5 -8q13 0 13 12q0 6 -12.5 15.5t-32.5 21.5l-20 12q77 112 189 189t244 107l15 -67q2 -10 15 -10q5 0 8 5.5
+t2 10.5l-15 66q71 13 134 13q204 0 379 -109q-39 -56 -39 -65q0 -13 12 -13q11 0 48 64q111 -75 187.5 -186t107.5 -241l-56 -12q-10 -2 -10 -16q0 -5 5.5 -8t9.5 -2l57 13q14 -72 14 -140zM1696 640q0 163 -63.5 311t-170.5 255t-255 170.5t-311 63.5t-311 -63.5
+t-255 -170.5t-170.5 -255t-63.5 -311t63.5 -311t170.5 -255t255 -170.5t311 -63.5t311 63.5t255 170.5t170.5 255t63.5 311zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191
+t191 -286t71 -348z" />
+    <glyph glyph-name="_578" unicode="&#xf268;" horiz-adv-x="1792" 
+d="M893 1536q240 2 451 -120q232 -134 352 -372l-742 39q-160 9 -294 -74.5t-185 -229.5l-276 424q128 159 311 245.5t383 87.5zM146 1131l337 -663q72 -143 211 -217t293 -45l-230 -451q-212 33 -385 157.5t-272.5 316t-99.5 411.5q0 267 146 491zM1732 962
+q58 -150 59.5 -310.5t-48.5 -306t-153 -272t-246 -209.5q-230 -133 -498 -119l405 623q88 131 82.5 290.5t-106.5 277.5zM896 942q125 0 213.5 -88.5t88.5 -213.5t-88.5 -213.5t-213.5 -88.5t-213.5 88.5t-88.5 213.5t88.5 213.5t213.5 88.5z" />
+    <glyph glyph-name="_579" unicode="&#xf269;" horiz-adv-x="1792" 
+d="M903 -256q-283 0 -504.5 150.5t-329.5 398.5q-58 131 -67 301t26 332.5t111 312t179 242.5l-11 -281q11 14 68 15.5t70 -15.5q42 81 160.5 138t234.5 59q-54 -45 -119.5 -148.5t-58.5 -163.5q25 -8 62.5 -13.5t63 -7.5t68 -4t50.5 -3q15 -5 9.5 -45.5t-30.5 -75.5
+q-5 -7 -16.5 -18.5t-56.5 -35.5t-101 -34l15 -189l-139 67q-18 -43 -7.5 -81.5t36 -66.5t65.5 -41.5t81 -6.5q51 9 98 34.5t83.5 45t73.5 17.5q61 -4 89.5 -33t19.5 -65q-1 -2 -2.5 -5.5t-8.5 -12.5t-18 -15.5t-31.5 -10.5t-46.5 -1q-60 -95 -144.5 -135.5t-209.5 -29.5
+q74 -61 162.5 -82.5t168.5 -6t154.5 52t128 87.5t80.5 104q43 91 39 192.5t-37.5 188.5t-78.5 125q87 -38 137 -79.5t77 -112.5q15 170 -57.5 343t-209.5 284q265 -77 412 -279.5t151 -517.5q2 -127 -40.5 -255t-123.5 -238t-189 -196t-247.5 -135.5t-288.5 -49.5z" />
+    <glyph glyph-name="_580" unicode="&#xf26a;" horiz-adv-x="1792" 
+d="M1493 1308q-165 110 -359 110q-155 0 -293 -73t-240 -200q-75 -93 -119.5 -218t-48.5 -266v-42q4 -141 48.5 -266t119.5 -218q102 -127 240 -200t293 -73q194 0 359 110q-121 -108 -274.5 -168t-322.5 -60q-29 0 -43 1q-175 8 -333 82t-272 193t-181 281t-67 339
+q0 182 71 348t191 286t286 191t348 71h3q168 -1 320.5 -60.5t273.5 -167.5zM1792 640q0 -192 -77 -362.5t-213 -296.5q-104 -63 -222 -63q-137 0 -255 84q154 56 253.5 233t99.5 405q0 227 -99 404t-253 234q119 83 254 83q119 0 226 -65q135 -125 210.5 -295t75.5 -361z
+" />
+    <glyph glyph-name="_581" unicode="&#xf26b;" horiz-adv-x="1792" 
+d="M1792 599q0 -56 -7 -104h-1151q0 -146 109.5 -244.5t257.5 -98.5q99 0 185.5 46.5t136.5 130.5h423q-56 -159 -170.5 -281t-267.5 -188.5t-321 -66.5q-187 0 -356 83q-228 -116 -394 -116q-237 0 -237 263q0 115 45 275q17 60 109 229q199 360 475 606
+q-184 -79 -427 -354q63 274 283.5 449.5t501.5 175.5q30 0 45 -1q255 117 433 117q64 0 116 -13t94.5 -40.5t66.5 -76.5t24 -115q0 -116 -75 -286q101 -182 101 -390zM1722 1239q0 83 -53 132t-137 49q-108 0 -254 -70q121 -47 222.5 -131.5t170.5 -195.5q51 135 51 216z
+M128 2q0 -86 48.5 -132.5t134.5 -46.5q115 0 266 83q-122 72 -213.5 183t-137.5 245q-98 -205 -98 -332zM632 715h728q-5 142 -113 237t-251 95q-144 0 -251.5 -95t-112.5 -237z" />
+    <glyph glyph-name="_582" unicode="&#xf26c;" horiz-adv-x="2048" 
+d="M1792 288v960q0 13 -9.5 22.5t-22.5 9.5h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5zM1920 1248v-960q0 -66 -47 -113t-113 -47h-736v-128h352q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23
+v64q0 14 9 23t23 9h352v128h-736q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="_583" unicode="&#xf26d;" horiz-adv-x="1792" 
+d="M138 1408h197q-70 -64 -126 -149q-36 -56 -59 -115t-30 -125.5t-8.5 -120t10.5 -132t21 -126t28 -136.5q4 -19 6 -28q51 -238 81 -329q57 -171 152 -275h-272q-48 0 -82 34t-34 82v1304q0 48 34 82t82 34zM1346 1408h308q48 0 82 -34t34 -82v-1304q0 -48 -34 -82t-82 -34
+h-178q212 210 196 565l-469 -101q-2 -45 -12 -82t-31 -72t-59.5 -59.5t-93.5 -36.5q-123 -26 -199 40q-32 27 -53 61t-51.5 129t-64.5 258q-35 163 -45.5 263t-5.5 139t23 77q20 41 62.5 73t102.5 45q45 12 83.5 6.5t67 -17t54 -35t43 -48t34.5 -56.5l468 100
+q-68 175 -180 287z" />
+    <glyph glyph-name="_584" unicode="&#xf26e;" 
+d="M1401 -11l-6 -6q-113 -113 -259 -175q-154 -64 -317 -64q-165 0 -317 64q-148 63 -259 175q-113 112 -175 258q-42 103 -54 189q-4 28 48 36q51 8 56 -20q1 -1 1 -4q18 -90 46 -159q50 -124 152 -226q98 -98 226 -152q132 -56 276 -56q143 0 276 56q128 55 225 152l6 6
+q10 10 25 6q12 -3 33 -22q36 -37 17 -58zM929 604l-66 -66l63 -63q21 -21 -7 -49q-17 -17 -32 -17q-10 0 -19 10l-62 61l-66 -66q-5 -5 -15 -5q-15 0 -31 16l-2 2q-18 15 -18 29q0 7 8 17l66 65l-66 66q-16 16 14 45q18 18 31 18q6 0 13 -5l65 -66l65 65q18 17 48 -13
+q27 -27 11 -44zM1400 547q0 -118 -46 -228q-45 -105 -126 -186q-80 -80 -187 -126t-228 -46t-228 46t-187 126q-82 82 -125 186q-15 33 -15 40h-1q-9 27 43 44q50 16 60 -12q37 -99 97 -167h1v339v2q3 136 102 232q105 103 253 103q147 0 251 -103t104 -249
+q0 -147 -104.5 -251t-250.5 -104q-58 0 -112 16q-28 11 -13 61q16 51 44 43l14 -3q14 -3 33 -6t30 -3q104 0 176 71.5t72 174.5q0 101 -72 171q-71 71 -175 71q-107 0 -178 -80q-64 -72 -64 -160v-413q110 -67 242 -67q96 0 185 36.5t156 103.5t103.5 155t36.5 183
+q0 198 -141 339q-140 140 -339 140q-200 0 -340 -140q-53 -53 -77 -87l-2 -2q-8 -11 -13 -15.5t-21.5 -9.5t-38.5 3q-21 5 -36.5 16.5t-15.5 26.5v680q0 15 10.5 26.5t27.5 11.5h877q30 0 30 -55t-30 -55h-811v-483h1q40 42 102 84t108 61q109 46 231 46q121 0 228 -46
+t187 -126q81 -81 126 -186q46 -112 46 -229zM1369 1128q9 -8 9 -18t-5.5 -18t-16.5 -21q-26 -26 -39 -26q-9 0 -16 7q-106 91 -207 133q-128 56 -276 56q-133 0 -262 -49q-27 -10 -45 37q-9 25 -8 38q3 16 16 20q130 57 299 57q164 0 316 -64q137 -58 235 -152z" />
+    <glyph glyph-name="_585" unicode="&#xf270;" horiz-adv-x="1792" 
+d="M1551 60q15 6 26 3t11 -17.5t-15 -33.5q-13 -16 -44 -43.5t-95.5 -68t-141 -74t-188 -58t-229.5 -24.5q-119 0 -238 31t-209 76.5t-172.5 104t-132.5 105t-84 87.5q-8 9 -10 16.5t1 12t8 7t11.5 2t11.5 -4.5q192 -117 300 -166q389 -176 799 -90q190 40 391 135z
+M1758 175q11 -16 2.5 -69.5t-28.5 -102.5q-34 -83 -85 -124q-17 -14 -26 -9t0 24q21 45 44.5 121.5t6.5 98.5q-5 7 -15.5 11.5t-27 6t-29.5 2.5t-35 0t-31.5 -2t-31 -3t-22.5 -2q-6 -1 -13 -1.5t-11 -1t-8.5 -1t-7 -0.5h-5.5h-4.5t-3 0.5t-2 1.5l-1.5 3q-6 16 47 40t103 30
+q46 7 108 1t76 -24zM1364 618q0 -31 13.5 -64t32 -58t37.5 -46t33 -32l13 -11l-227 -224q-40 37 -79 75.5t-58 58.5l-19 20q-11 11 -25 33q-38 -59 -97.5 -102.5t-127.5 -63.5t-140 -23t-137.5 21t-117.5 65.5t-83 113t-31 162.5q0 84 28 154t72 116.5t106.5 83t122.5 57
+t130 34.5t119.5 18.5t99.5 6.5v127q0 65 -21 97q-34 53 -121 53q-6 0 -16.5 -1t-40.5 -12t-56 -29.5t-56 -59.5t-48 -96l-294 27q0 60 22 119t67 113t108 95t151.5 65.5t190.5 24.5q100 0 181 -25t129.5 -61.5t81 -83t45 -86t12.5 -73.5v-589zM692 597q0 -86 70 -133
+q66 -44 139 -22q84 25 114 123q14 45 14 101v162q-59 -2 -111 -12t-106.5 -33.5t-87 -71t-32.5 -114.5z" />
+    <glyph glyph-name="_586" unicode="&#xf271;" horiz-adv-x="1792" 
+d="M1536 1280q52 0 90 -38t38 -90v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128zM1152 1376v-288q0 -14 9 -23t23 -9
+h64q14 0 23 9t9 23v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM384 1376v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM1536 -128v1024h-1408v-1024h1408zM896 448h224q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-224
+v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-224q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v224q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-224z" />
+    <glyph glyph-name="_587" unicode="&#xf272;" horiz-adv-x="1792" 
+d="M1152 416v-64q0 -14 -9 -23t-23 -9h-576q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h576q14 0 23 -9t9 -23zM128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23
+t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47
+t47 -113v-96h128q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="_588" unicode="&#xf273;" horiz-adv-x="1792" 
+d="M1111 151l-46 -46q-9 -9 -22 -9t-23 9l-188 189l-188 -189q-10 -9 -23 -9t-22 9l-46 46q-9 9 -9 22t9 23l189 188l-189 188q-9 10 -9 23t9 22l46 46q9 9 22 9t23 -9l188 -188l188 188q10 9 23 9t22 -9l46 -46q9 -9 9 -22t-9 -23l-188 -188l188 -188q9 -10 9 -23t-9 -22z
+M128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280
+q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="_589" unicode="&#xf274;" horiz-adv-x="1792" 
+d="M1303 572l-512 -512q-10 -9 -23 -9t-23 9l-288 288q-9 10 -9 23t9 22l46 46q9 9 22 9t23 -9l220 -220l444 444q10 9 23 9t22 -9l46 -46q9 -9 9 -22t-9 -23zM128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23
+t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47
+t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="_590" unicode="&#xf275;" horiz-adv-x="1792" 
+d="M448 1536q26 0 45 -19t19 -45v-891l536 429q17 14 40 14q26 0 45 -19t19 -45v-379l536 429q17 14 40 14q26 0 45 -19t19 -45v-1152q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h384z" />
+    <glyph glyph-name="_591" unicode="&#xf276;" horiz-adv-x="1024" 
+d="M512 448q66 0 128 15v-655q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v655q62 -15 128 -15zM512 1536q212 0 362 -150t150 -362t-150 -362t-362 -150t-362 150t-150 362t150 362t362 150zM512 1312q14 0 23 9t9 23t-9 23t-23 9q-146 0 -249 -103t-103 -249
+q0 -14 9 -23t23 -9t23 9t9 23q0 119 84.5 203.5t203.5 84.5z" />
+    <glyph glyph-name="_592" unicode="&#xf277;" horiz-adv-x="1792" 
+d="M1745 1239q10 -10 10 -23t-10 -23l-141 -141q-28 -28 -68 -28h-1344q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h576v64q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-64h512q40 0 68 -28zM768 320h256v-512q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v512zM1600 768
+q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19h-1344q-40 0 -68 28l-141 141q-10 10 -10 23t10 23l141 141q28 28 68 28h512v192h256v-192h576z" />
+    <glyph glyph-name="_593" unicode="&#xf278;" horiz-adv-x="2048" 
+d="M2020 1525q28 -20 28 -53v-1408q0 -20 -11 -36t-29 -23l-640 -256q-24 -11 -48 0l-616 246l-616 -246q-10 -5 -24 -5q-19 0 -36 11q-28 20 -28 53v1408q0 20 11 36t29 23l640 256q24 11 48 0l616 -246l616 246q32 13 60 -6zM736 1390v-1270l576 -230v1270zM128 1173
+v-1270l544 217v1270zM1920 107v1270l-544 -217v-1270z" />
+    <glyph glyph-name="_594" unicode="&#xf279;" horiz-adv-x="1792" 
+d="M512 1536q13 0 22.5 -9.5t9.5 -22.5v-1472q0 -20 -17 -28l-480 -256q-7 -4 -15 -4q-13 0 -22.5 9.5t-9.5 22.5v1472q0 20 17 28l480 256q7 4 15 4zM1760 1536q13 0 22.5 -9.5t9.5 -22.5v-1472q0 -20 -17 -28l-480 -256q-7 -4 -15 -4q-13 0 -22.5 9.5t-9.5 22.5v1472
+q0 20 17 28l480 256q7 4 15 4zM640 1536q8 0 14 -3l512 -256q18 -10 18 -29v-1472q0 -13 -9.5 -22.5t-22.5 -9.5q-8 0 -14 3l-512 256q-18 10 -18 29v1472q0 13 9.5 22.5t22.5 9.5z" />
+    <glyph glyph-name="_595" unicode="&#xf27a;" horiz-adv-x="1792" 
+d="M640 640q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 640q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1408 640q0 53 -37.5 90.5t-90.5 37.5
+t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1792 640q0 -174 -120 -321.5t-326 -233t-450 -85.5q-110 0 -211 18q-173 -173 -435 -229q-52 -10 -86 -13q-12 -1 -22 6t-13 18q-4 15 20 37q5 5 23.5 21.5t25.5 23.5t23.5 25.5t24 31.5t20.5 37
+t20 48t14.5 57.5t12.5 72.5q-146 90 -229.5 216.5t-83.5 269.5q0 174 120 321.5t326 233t450 85.5t450 -85.5t326 -233t120 -321.5z" />
+    <glyph glyph-name="_596" unicode="&#xf27b;" horiz-adv-x="1792" 
+d="M640 640q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1024 640q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 -53 -37.5 -90.5t-90.5 -37.5
+t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM896 1152q-204 0 -381.5 -69.5t-282 -187.5t-104.5 -255q0 -112 71.5 -213.5t201.5 -175.5l87 -50l-27 -96q-24 -91 -70 -172q152 63 275 171l43 38l57 -6q69 -8 130 -8q204 0 381.5 69.5t282 187.5
+t104.5 255t-104.5 255t-282 187.5t-381.5 69.5zM1792 640q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22h-5q-15 0 -27 10.5t-16 27.5v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51
+t27 59t26 76q-157 89 -247.5 220t-90.5 281q0 130 71 248.5t191 204.5t286 136.5t348 50.5t348 -50.5t286 -136.5t191 -204.5t71 -248.5z" />
+    <glyph glyph-name="_597" unicode="&#xf27c;" horiz-adv-x="1024" 
+d="M512 345l512 295v-591l-512 -296v592zM0 640v-591l512 296zM512 1527v-591l-512 -296v591zM512 936l512 295v-591z" />
+    <glyph glyph-name="_598" unicode="&#xf27d;" horiz-adv-x="1792" 
+d="M1709 1018q-10 -236 -332 -651q-333 -431 -562 -431q-142 0 -240 263q-44 160 -132 482q-72 262 -157 262q-18 0 -127 -76l-77 98q24 21 108 96.5t130 115.5q156 138 241 146q95 9 153 -55.5t81 -203.5q44 -287 66 -373q55 -249 120 -249q51 0 154 161q101 161 109 246
+q13 139 -109 139q-57 0 -121 -26q120 393 459 382q251 -8 236 -326z" />
+    <glyph glyph-name="f27e" unicode="&#xf27e;" 
+d="M0 1408h1536v-1536h-1536v1536zM1085 293l-221 631l221 297h-634l221 -297l-221 -631l317 -304z" />
+    <glyph glyph-name="uniF280" unicode="&#xf280;" 
+d="M0 1408h1536v-1536h-1536v1536zM908 1088l-12 -33l75 -83l-31 -114l25 -25l107 57l107 -57l25 25l-31 114l75 83l-12 33h-95l-53 96h-32l-53 -96h-95zM641 925q32 0 44.5 -16t11.5 -63l174 21q0 55 -17.5 92.5t-50.5 56t-69 25.5t-85 7q-133 0 -199 -57.5t-66 -182.5v-72
+h-96v-128h76q20 0 20 -8v-382q0 -14 -5 -20t-18 -7l-73 -7v-88h448v86l-149 14q-6 1 -8.5 1.5t-3.5 2.5t-0.5 4t1 7t0.5 10v387h191l38 128h-231q-6 0 -2 6t4 9v80q0 27 1.5 40.5t7.5 28t19.5 20t36.5 5.5zM1248 96v86l-54 9q-7 1 -9.5 2.5t-2.5 3t1 7.5t1 12v520h-275
+l-23 -101l83 -22q23 -7 23 -27v-370q0 -14 -6 -18.5t-20 -6.5l-70 -9v-86h352z" />
+    <glyph glyph-name="uniF281" unicode="&#xf281;" horiz-adv-x="1792" 
+d="M1792 690q0 -58 -29.5 -105.5t-79.5 -72.5q12 -46 12 -96q0 -155 -106.5 -287t-290.5 -208.5t-400 -76.5t-399.5 76.5t-290 208.5t-106.5 287q0 47 11 94q-51 25 -82 73.5t-31 106.5q0 82 58 140.5t141 58.5q85 0 145 -63q218 152 515 162l116 521q3 13 15 21t26 5
+l369 -81q18 37 54 59.5t79 22.5q62 0 106 -43.5t44 -105.5t-44 -106t-106 -44t-105.5 43.5t-43.5 105.5l-334 74l-104 -472q300 -9 519 -160q58 61 143 61q83 0 141 -58.5t58 -140.5zM418 491q0 -62 43.5 -106t105.5 -44t106 44t44 106t-44 105.5t-106 43.5q-61 0 -105 -44
+t-44 -105zM1228 136q11 11 11 26t-11 26q-10 10 -25 10t-26 -10q-41 -42 -121 -62t-160 -20t-160 20t-121 62q-11 10 -26 10t-25 -10q-11 -10 -11 -25.5t11 -26.5q43 -43 118.5 -68t122.5 -29.5t91 -4.5t91 4.5t122.5 29.5t118.5 68zM1225 341q62 0 105.5 44t43.5 106
+q0 61 -44 105t-105 44q-62 0 -106 -43.5t-44 -105.5t44 -106t106 -44z" />
+    <glyph glyph-name="_602" unicode="&#xf282;" horiz-adv-x="1792" 
+d="M69 741h1q16 126 58.5 241.5t115 217t167.5 176t223.5 117.5t276.5 43q231 0 414 -105.5t294 -303.5q104 -187 104 -442v-188h-1125q1 -111 53.5 -192.5t136.5 -122.5t189.5 -57t213 -3t208 46.5t173.5 84.5v-377q-92 -55 -229.5 -92t-312.5 -38t-316 53
+q-189 73 -311.5 249t-124.5 372q-3 242 111 412t325 268q-48 -60 -78 -125.5t-46 -159.5h635q8 77 -8 140t-47 101.5t-70.5 66.5t-80.5 41t-75 20.5t-56 8.5l-22 1q-135 -5 -259.5 -44.5t-223.5 -104.5t-176 -140.5t-138 -163.5z" />
+    <glyph glyph-name="_603" unicode="&#xf283;" horiz-adv-x="2304" 
+d="M0 32v608h2304v-608q0 -66 -47 -113t-113 -47h-1984q-66 0 -113 47t-47 113zM640 256v-128h384v128h-384zM256 256v-128h256v128h-256zM2144 1408q66 0 113 -47t47 -113v-224h-2304v224q0 66 47 113t113 47h1984z" />
+    <glyph glyph-name="_604" unicode="&#xf284;" horiz-adv-x="1792" 
+d="M1584 246l-218 111q-74 -120 -196.5 -189t-263.5 -69q-147 0 -271 72t-196 196t-72 270q0 110 42.5 209.5t115 172t172 115t209.5 42.5q131 0 247.5 -60.5t192.5 -168.5l215 125q-110 169 -286.5 265t-378.5 96q-161 0 -308 -63t-253 -169t-169 -253t-63 -308t63 -308
+t169 -253t253 -169t308 -63q213 0 397.5 107t290.5 292zM1030 643l693 -352q-116 -253 -334.5 -400t-492.5 -147q-182 0 -348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71q260 0 470.5 -133.5t335.5 -366.5zM1543 640h-39v-160h-96v352h136q32 0 54.5 -20
+t28.5 -48t1 -56t-27.5 -48t-57.5 -20z" />
+    <glyph glyph-name="uniF285" unicode="&#xf285;" horiz-adv-x="1792" 
+d="M1427 827l-614 386l92 151h855zM405 562l-184 116v858l1183 -743zM1424 697l147 -95v-858l-532 335zM1387 718l-500 -802h-855l356 571z" />
+    <glyph glyph-name="uniF286" unicode="&#xf286;" horiz-adv-x="1792" 
+d="M640 528v224q0 16 -16 16h-96q-16 0 -16 -16v-224q0 -16 16 -16h96q16 0 16 16zM1152 528v224q0 16 -16 16h-96q-16 0 -16 -16v-224q0 -16 16 -16h96q16 0 16 16zM1664 496v-752h-640v320q0 80 -56 136t-136 56t-136 -56t-56 -136v-320h-640v752q0 16 16 16h96
+q16 0 16 -16v-112h128v624q0 16 16 16h96q16 0 16 -16v-112h128v112q0 16 16 16h96q16 0 16 -16v-112h128v112q0 6 2.5 9.5t8.5 5t9.5 2t11.5 0t9 -0.5v391q-32 15 -32 50q0 23 16.5 39t38.5 16t38.5 -16t16.5 -39q0 -35 -32 -50v-17q45 10 83 10q21 0 59.5 -7.5t54.5 -7.5
+q17 0 47 7.5t37 7.5q16 0 16 -16v-210q0 -15 -35 -21.5t-62 -6.5q-18 0 -54.5 7.5t-55.5 7.5q-40 0 -90 -12v-133q1 0 9 0.5t11.5 0t9.5 -2t8.5 -5t2.5 -9.5v-112h128v112q0 16 16 16h96q16 0 16 -16v-112h128v112q0 16 16 16h96q16 0 16 -16v-624h128v112q0 16 16 16h96
+q16 0 16 -16z" />
+    <glyph glyph-name="_607" unicode="&#xf287;" horiz-adv-x="2304" 
+d="M2288 731q16 -8 16 -27t-16 -27l-320 -192q-8 -5 -16 -5q-9 0 -16 4q-16 10 -16 28v128h-858q37 -58 83 -165q16 -37 24.5 -55t24 -49t27 -47t27 -34t31.5 -26t33 -8h96v96q0 14 9 23t23 9h320q14 0 23 -9t9 -23v-320q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23v96h-96
+q-32 0 -61 10t-51 23.5t-45 40.5t-37 46t-33.5 57t-28.5 57.5t-28 60.5q-23 53 -37 81.5t-36 65t-44.5 53.5t-46.5 17h-360q-22 -84 -91 -138t-157 -54q-106 0 -181 75t-75 181t75 181t181 75q88 0 157 -54t91 -138h104q24 0 46.5 17t44.5 53.5t36 65t37 81.5q19 41 28 60.5
+t28.5 57.5t33.5 57t37 46t45 40.5t51 23.5t61 10h107q21 57 70 92.5t111 35.5q80 0 136 -56t56 -136t-56 -136t-136 -56q-62 0 -111 35.5t-70 92.5h-107q-17 0 -33 -8t-31.5 -26t-27 -34t-27 -47t-24 -49t-24.5 -55q-46 -107 -83 -165h1114v128q0 18 16 28t32 -1z" />
+    <glyph glyph-name="_608" unicode="&#xf288;" horiz-adv-x="1792" 
+d="M1150 774q0 -56 -39.5 -95t-95.5 -39h-253v269h253q56 0 95.5 -39.5t39.5 -95.5zM1329 774q0 130 -91.5 222t-222.5 92h-433v-896h180v269h253q130 0 222 91.5t92 221.5zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348
+t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="_609" unicode="&#xf289;" horiz-adv-x="2304" 
+d="M1645 438q0 59 -34 106.5t-87 68.5q-7 -45 -23 -92q-7 -24 -27.5 -38t-44.5 -14q-12 0 -24 3q-31 10 -45 38.5t-4 58.5q23 71 23 143q0 123 -61 227.5t-166 165.5t-228 61q-134 0 -247 -73t-167 -194q108 -28 188 -106q22 -23 22 -55t-22 -54t-54 -22t-55 22
+q-75 75 -180 75q-106 0 -181 -74.5t-75 -180.5t75 -180.5t181 -74.5h1046q79 0 134.5 55.5t55.5 133.5zM1798 438q0 -142 -100.5 -242t-242.5 -100h-1046q-169 0 -289 119.5t-120 288.5q0 153 100 267t249 136q62 184 221 298t354 114q235 0 408.5 -158.5t196.5 -389.5
+q116 -25 192.5 -118.5t76.5 -214.5zM2048 438q0 -175 -97 -319q-23 -33 -64 -33q-24 0 -43 13q-26 17 -32 48.5t12 57.5q71 104 71 233t-71 233q-18 26 -12 57t32 49t57.5 11.5t49.5 -32.5q97 -142 97 -318zM2304 438q0 -244 -134 -443q-23 -34 -64 -34q-23 0 -42 13
+q-26 18 -32.5 49t11.5 57q108 164 108 358q0 195 -108 357q-18 26 -11.5 57.5t32.5 48.5q26 18 57 12t49 -33q134 -198 134 -442z" />
+    <glyph glyph-name="_610" unicode="&#xf28a;" 
+d="M1500 -13q0 -89 -63 -152.5t-153 -63.5t-153.5 63.5t-63.5 152.5q0 90 63.5 153.5t153.5 63.5t153 -63.5t63 -153.5zM1267 268q-115 -15 -192.5 -102.5t-77.5 -205.5q0 -74 33 -138q-146 -78 -379 -78q-109 0 -201 21t-153.5 54.5t-110.5 76.5t-76 85t-44.5 83
+t-23.5 66.5t-6 39.5q0 19 4.5 42.5t18.5 56t36.5 58t64 43.5t94.5 18t94 -17.5t63 -41t35.5 -53t17.5 -49t4 -33.5q0 -34 -23 -81q28 -27 82 -42t93 -17l40 -1q115 0 190 51t75 133q0 26 -9 48.5t-31.5 44.5t-49.5 41t-74 44t-93.5 47.5t-119.5 56.5q-28 13 -43 20
+q-116 55 -187 100t-122.5 102t-72 125.5t-20.5 162.5q0 78 20.5 150t66 137.5t112.5 114t166.5 77t221.5 28.5q120 0 220 -26t164.5 -67t109.5 -94t64 -105.5t19 -103.5q0 -46 -15 -82.5t-36.5 -58t-48.5 -36t-49 -19.5t-39 -5h-8h-32t-39 5t-44 14t-41 28t-37 46t-24 70.5
+t-10 97.5q-15 16 -59 25.5t-81 10.5l-37 1q-68 0 -117.5 -31t-70.5 -70t-21 -76q0 -24 5 -43t24 -46t53 -51t97 -53.5t150 -58.5q76 -25 138.5 -53.5t109 -55.5t83 -59t60.5 -59.5t41 -62.5t26.5 -62t14.5 -63.5t6 -62t1 -62.5z" />
+    <glyph glyph-name="_611" unicode="&#xf28b;" 
+d="M704 352v576q0 14 -9 23t-23 9h-256q-14 0 -23 -9t-9 -23v-576q0 -14 9 -23t23 -9h256q14 0 23 9t9 23zM1152 352v576q0 14 -9 23t-23 9h-256q-14 0 -23 -9t-9 -23v-576q0 -14 9 -23t23 -9h256q14 0 23 9t9 23zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103
+t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="_612" unicode="&#xf28c;" 
+d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM768 96q148 0 273 73t198 198t73 273t-73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273
+t73 -273t198 -198t273 -73zM864 320q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-192zM480 320q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-192z" />
+    <glyph glyph-name="_613" unicode="&#xf28d;" 
+d="M1088 352v576q0 14 -9 23t-23 9h-576q-14 0 -23 -9t-9 -23v-576q0 -14 9 -23t23 -9h576q14 0 23 9t9 23zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5
+t103 -385.5z" />
+    <glyph glyph-name="_614" unicode="&#xf28e;" 
+d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM768 96q148 0 273 73t198 198t73 273t-73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273
+t73 -273t198 -198t273 -73zM480 320q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h576q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-576z" />
+    <glyph glyph-name="_615" unicode="&#xf290;" horiz-adv-x="1792" 
+d="M1757 128l35 -313q3 -28 -16 -50q-19 -21 -48 -21h-1664q-29 0 -48 21q-19 22 -16 50l35 313h1722zM1664 967l86 -775h-1708l86 775q3 24 21 40.5t43 16.5h256v-128q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5v128h384v-128q0 -53 37.5 -90.5t90.5 -37.5
+t90.5 37.5t37.5 90.5v128h256q25 0 43 -16.5t21 -40.5zM1280 1152v-256q0 -26 -19 -45t-45 -19t-45 19t-19 45v256q0 106 -75 181t-181 75t-181 -75t-75 -181v-256q0 -26 -19 -45t-45 -19t-45 19t-19 45v256q0 159 112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5z" />
+    <glyph glyph-name="_616" unicode="&#xf291;" horiz-adv-x="2048" 
+d="M1920 768q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5h-15l-115 -662q-8 -46 -44 -76t-82 -30h-1280q-46 0 -82 30t-44 76l-115 662h-15q-53 0 -90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5h1792zM485 -32q26 2 43.5 22.5t15.5 46.5l-32 416q-2 26 -22.5 43.5
+t-46.5 15.5t-43.5 -22.5t-15.5 -46.5l32 -416q2 -25 20.5 -42t43.5 -17h5zM896 32v416q0 26 -19 45t-45 19t-45 -19t-19 -45v-416q0 -26 19 -45t45 -19t45 19t19 45zM1280 32v416q0 26 -19 45t-45 19t-45 -19t-19 -45v-416q0 -26 19 -45t45 -19t45 19t19 45zM1632 27l32 416
+q2 26 -15.5 46.5t-43.5 22.5t-46.5 -15.5t-22.5 -43.5l-32 -416q-2 -26 15.5 -46.5t43.5 -22.5h5q25 0 43.5 17t20.5 42zM476 1244l-93 -412h-132l101 441q19 88 89 143.5t160 55.5h167q0 26 19 45t45 19h384q26 0 45 -19t19 -45h167q90 0 160 -55.5t89 -143.5l101 -441
+h-132l-93 412q-11 44 -45.5 72t-79.5 28h-167q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45h-167q-45 0 -79.5 -28t-45.5 -72z" />
+    <glyph glyph-name="_617" unicode="&#xf292;" horiz-adv-x="1792" 
+d="M991 512l64 256h-254l-64 -256h254zM1759 1016l-56 -224q-7 -24 -31 -24h-327l-64 -256h311q15 0 25 -12q10 -14 6 -28l-56 -224q-5 -24 -31 -24h-327l-81 -328q-7 -24 -31 -24h-224q-16 0 -26 12q-9 12 -6 28l78 312h-254l-81 -328q-7 -24 -31 -24h-225q-15 0 -25 12
+q-9 12 -6 28l78 312h-311q-15 0 -25 12q-9 12 -6 28l56 224q7 24 31 24h327l64 256h-311q-15 0 -25 12q-10 14 -6 28l56 224q5 24 31 24h327l81 328q7 24 32 24h224q15 0 25 -12q9 -12 6 -28l-78 -312h254l81 328q7 24 32 24h224q15 0 25 -12q9 -12 6 -28l-78 -312h311
+q15 0 25 -12q9 -12 6 -28z" />
+    <glyph glyph-name="_618" unicode="&#xf293;" 
+d="M841 483l148 -148l-149 -149zM840 1094l149 -149l-148 -148zM710 -130l464 464l-306 306l306 306l-464 464v-611l-255 255l-93 -93l320 -321l-320 -321l93 -93l255 255v-611zM1429 640q0 -209 -32 -365.5t-87.5 -257t-140.5 -162.5t-181.5 -86.5t-219.5 -24.5
+t-219.5 24.5t-181.5 86.5t-140.5 162.5t-87.5 257t-32 365.5t32 365.5t87.5 257t140.5 162.5t181.5 86.5t219.5 24.5t219.5 -24.5t181.5 -86.5t140.5 -162.5t87.5 -257t32 -365.5z" />
+    <glyph glyph-name="_619" unicode="&#xf294;" horiz-adv-x="1024" 
+d="M596 113l173 172l-173 172v-344zM596 823l173 172l-173 172v-344zM628 640l356 -356l-539 -540v711l-297 -296l-108 108l372 373l-372 373l108 108l297 -296v711l539 -540z" />
+    <glyph glyph-name="_620" unicode="&#xf295;" 
+d="M1280 256q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM512 1024q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM1536 256q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5
+t112.5 -271.5zM1440 1344q0 -20 -13 -38l-1056 -1408q-19 -26 -51 -26h-160q-26 0 -45 19t-19 45q0 20 13 38l1056 1408q19 26 51 26h160q26 0 45 -19t19 -45zM768 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5
+t271.5 -112.5t112.5 -271.5z" />
+    <glyph glyph-name="_621" unicode="&#xf296;" horiz-adv-x="1792" 
+d="M104 830l792 -1015l-868 630q-18 13 -25 34.5t0 42.5l101 308v0zM566 830h660l-330 -1015v0zM368 1442l198 -612h-462l198 612q8 23 33 23t33 -23zM1688 830l101 -308q7 -21 0 -42.5t-25 -34.5l-868 -630l792 1015v0zM1688 830h-462l198 612q8 23 33 23t33 -23z" />
+    <glyph glyph-name="_622" unicode="&#xf297;" horiz-adv-x="1792" 
+d="M384 704h160v224h-160v-224zM1221 372v92q-104 -36 -243 -38q-135 -1 -259.5 46.5t-220.5 122.5l1 -96q88 -80 212 -128.5t272 -47.5q129 0 238 49zM640 704h640v224h-640v-224zM1792 736q0 -187 -99 -352q89 -102 89 -229q0 -157 -129.5 -268t-313.5 -111
+q-122 0 -225 52.5t-161 140.5q-19 -1 -57 -1t-57 1q-58 -88 -161 -140.5t-225 -52.5q-184 0 -313.5 111t-129.5 268q0 127 89 229q-99 165 -99 352q0 209 120 385.5t326.5 279.5t449.5 103t449.5 -103t326.5 -279.5t120 -385.5z" />
+    <glyph glyph-name="_623" unicode="&#xf298;" 
+d="M515 625v-128h-252v128h252zM515 880v-127h-252v127h252zM1273 369v-128h-341v128h341zM1273 625v-128h-672v128h672zM1273 880v-127h-672v127h672zM1408 20v1240q0 8 -6 14t-14 6h-32l-378 -256l-210 171l-210 -171l-378 256h-32q-8 0 -14 -6t-6 -14v-1240q0 -8 6 -14
+t14 -6h1240q8 0 14 6t6 14zM553 1130l185 150h-406zM983 1130l221 150h-406zM1536 1260v-1240q0 -62 -43 -105t-105 -43h-1240q-62 0 -105 43t-43 105v1240q0 62 43 105t105 43h1240q62 0 105 -43t43 -105z" />
+    <glyph glyph-name="_624" unicode="&#xf299;" horiz-adv-x="1792" 
+d="M896 720q-104 196 -160 278q-139 202 -347 318q-34 19 -70 36q-89 40 -94 32t34 -38l39 -31q62 -43 112.5 -93.5t94.5 -116.5t70.5 -113t70.5 -131q9 -17 13 -25q44 -84 84 -153t98 -154t115.5 -150t131 -123.5t148.5 -90.5q153 -66 154 -60q1 3 -49 37q-53 36 -81 57
+q-77 58 -179 211t-185 310zM549 177q-76 60 -132.5 125t-98 143.5t-71 154.5t-58.5 186t-52 209t-60.5 252t-76.5 289q273 0 497.5 -36t379 -92t271 -144.5t185.5 -172.5t110 -198.5t56 -199.5t12.5 -198.5t-9.5 -173t-20 -143.5t-13 -107l323 -327h-104l-281 285
+q-22 -2 -91.5 -14t-121.5 -19t-138 -6t-160.5 17t-167.5 59t-179 111z" />
+    <glyph glyph-name="_625" unicode="&#xf29a;" horiz-adv-x="1792" 
+d="M1374 879q-6 26 -28.5 39.5t-48.5 7.5q-261 -62 -401 -62t-401 62q-26 6 -48.5 -7.5t-28.5 -39.5t7.5 -48.5t39.5 -28.5q194 -46 303 -58q-2 -158 -15.5 -269t-26.5 -155.5t-41 -115.5l-9 -21q-10 -25 1 -49t36 -34q9 -4 23 -4q44 0 60 41l8 20q54 139 71 259h42
+q17 -120 71 -259l8 -20q16 -41 60 -41q14 0 23 4q25 10 36 34t1 49l-9 21q-28 71 -41 115.5t-26.5 155.5t-15.5 269q109 12 303 58q26 6 39.5 28.5t7.5 48.5zM1024 1024q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5z
+M1600 640q0 -143 -55.5 -273.5t-150 -225t-225 -150t-273.5 -55.5t-273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5zM896 1408q-156 0 -298 -61t-245 -164t-164 -245t-61 -298t61 -298
+t164 -245t245 -164t298 -61t298 61t245 164t164 245t61 298t-61 298t-164 245t-245 164t-298 61zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="_626" unicode="&#xf29b;" 
+d="M1438 723q34 -35 29 -82l-44 -551q-4 -42 -34.5 -70t-71.5 -28q-6 0 -9 1q-44 3 -72.5 36.5t-25.5 77.5l35 429l-143 -8q55 -113 55 -240q0 -216 -148 -372l-137 137q91 101 91 235q0 145 -102.5 248t-247.5 103q-134 0 -236 -92l-137 138q120 114 284 141l264 300
+l-149 87l-181 -161q-33 -30 -77 -27.5t-73 35.5t-26.5 77t34.5 73l239 213q26 23 60 26.5t64 -14.5l488 -283q36 -21 48 -68q17 -67 -26 -117l-205 -232l371 20q49 3 83 -32zM1240 1180q-74 0 -126 52t-52 126t52 126t126 52t126.5 -52t52.5 -126t-52.5 -126t-126.5 -52z
+M613 -62q106 0 196 61l139 -139q-146 -116 -335 -116q-148 0 -273.5 73t-198.5 198t-73 273q0 188 116 336l139 -139q-60 -88 -60 -197q0 -145 102.5 -247.5t247.5 -102.5z" />
+    <glyph glyph-name="_627" unicode="&#xf29c;" 
+d="M880 336v-160q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v160q0 14 9 23t23 9h160q14 0 23 -9t9 -23zM1136 832q0 -50 -15 -90t-45.5 -69t-52 -44t-59.5 -36q-32 -18 -46.5 -28t-26 -24t-11.5 -29v-32q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v68q0 35 10.5 64.5
+t24 47.5t39 35.5t41 25.5t44.5 21q53 25 75 43t22 49q0 42 -43.5 71.5t-95.5 29.5q-56 0 -95 -27q-29 -20 -80 -83q-9 -12 -25 -12q-11 0 -19 6l-108 82q-10 7 -12 20t5 23q122 192 349 192q129 0 238.5 -89.5t109.5 -214.5zM768 1280q-130 0 -248.5 -51t-204 -136.5
+t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5t-51 248.5t-136.5 204t-204 136.5t-248.5 51zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5
+t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="_628" unicode="&#xf29d;" horiz-adv-x="1408" 
+d="M366 1225q-64 0 -110 45.5t-46 110.5q0 64 46 109.5t110 45.5t109.5 -45.5t45.5 -109.5q0 -65 -45.5 -110.5t-109.5 -45.5zM917 583q0 -50 -30 -67.5t-63.5 -6.5t-47.5 34l-367 438q-7 12 -14 15.5t-11 1.5l-3 -3q-7 -8 4 -21l122 -139l1 -354l-161 -457
+q-67 -192 -92 -234q-15 -26 -28 -32q-50 -26 -103 -1q-29 13 -41.5 43t-9.5 57q2 17 197 618l5 416l-85 -164l35 -222q4 -24 -1 -42t-14 -27.5t-19 -16t-17 -7.5l-7 -2q-19 -3 -34.5 3t-24 16t-14 22t-7.5 19.5t-2 9.5l-46 299l211 381q23 34 113 34q75 0 107 -40l424 -521
+q7 -5 14 -17l3 -3l-1 -1q7 -13 7 -29zM514 433q43 -113 88.5 -225t69.5 -168l24 -55q36 -93 42 -125q11 -70 -36 -97q-35 -22 -66 -16t-51 22t-29 35h-1q-6 16 -8 25l-124 351zM1338 -159q31 -49 31 -57q0 -5 -3 -7q-9 -5 -14.5 0.5t-15.5 26t-16 30.5q-114 172 -423 661
+q3 -1 7 1t7 4l3 2q11 9 11 17z" />
+    <glyph glyph-name="_629" unicode="&#xf29e;" horiz-adv-x="2304" 
+d="M504 542h171l-1 265zM1530 641q0 87 -50.5 140t-146.5 53h-54v-388h52q91 0 145 57t54 138zM956 1018l1 -756q0 -14 -9.5 -24t-23.5 -10h-216q-14 0 -23.5 10t-9.5 24v62h-291l-55 -81q-10 -15 -28 -15h-267q-21 0 -30.5 18t3.5 35l556 757q9 14 27 14h332q14 0 24 -10
+t10 -24zM1783 641q0 -193 -125.5 -303t-324.5 -110h-270q-14 0 -24 10t-10 24v756q0 14 10 24t24 10h268q200 0 326 -109t126 -302zM1939 640q0 -11 -0.5 -29t-8 -71.5t-21.5 -102t-44.5 -108t-73.5 -102.5h-51q38 45 66.5 104.5t41.5 112t21 98t9 72.5l1 27q0 8 -0.5 22.5
+t-7.5 60t-20 91.5t-41 111.5t-66 124.5h43q41 -47 72 -107t45.5 -111.5t23 -96t10.5 -70.5zM2123 640q0 -11 -0.5 -29t-8 -71.5t-21.5 -102t-45 -108t-74 -102.5h-51q38 45 66.5 104.5t41.5 112t21 98t9 72.5l1 27q0 8 -0.5 22.5t-7.5 60t-19.5 91.5t-40.5 111.5t-66 124.5
+h43q41 -47 72 -107t45.5 -111.5t23 -96t10.5 -70.5zM2304 640q0 -11 -0.5 -29t-8 -71.5t-21.5 -102t-44.5 -108t-73.5 -102.5h-51q38 45 66 104.5t41 112t21 98t9 72.5l1 27q0 8 -0.5 22.5t-7.5 60t-19.5 91.5t-40.5 111.5t-66 124.5h43q41 -47 72 -107t45.5 -111.5t23 -96
+t9.5 -70.5z" />
+    <glyph glyph-name="uniF2A0" unicode="&#xf2a0;" horiz-adv-x="1408" 
+d="M617 -153q0 11 -13 58t-31 107t-20 69q-1 4 -5 26.5t-8.5 36t-13.5 21.5q-15 14 -51 14q-23 0 -70 -5.5t-71 -5.5q-34 0 -47 11q-6 5 -11 15.5t-7.5 20t-6.5 24t-5 18.5q-37 128 -37 255t37 255q1 4 5 18.5t6.5 24t7.5 20t11 15.5q13 11 47 11q24 0 71 -5.5t70 -5.5
+q36 0 51 14q9 8 13.5 21.5t8.5 36t5 26.5q2 9 20 69t31 107t13 58q0 22 -43.5 52.5t-75.5 42.5q-20 8 -45 8q-34 0 -98 -18q-57 -17 -96.5 -40.5t-71 -66t-46 -70t-45.5 -94.5q-6 -12 -9 -19q-49 -107 -68 -216t-19 -244t19 -244t68 -216q56 -122 83 -161q63 -91 179 -127
+l6 -2q64 -18 98 -18q25 0 45 8q32 12 75.5 42.5t43.5 52.5zM776 760q-26 0 -45 19t-19 45.5t19 45.5q37 37 37 90q0 52 -37 91q-19 19 -19 45t19 45t45 19t45 -19q75 -75 75 -181t-75 -181q-21 -19 -45 -19zM957 579q-27 0 -45 19q-19 19 -19 45t19 45q112 114 112 272
+t-112 272q-19 19 -19 45t19 45t45 19t45 -19q150 -150 150 -362t-150 -362q-18 -19 -45 -19zM1138 398q-27 0 -45 19q-19 19 -19 45t19 45q90 91 138.5 208t48.5 245t-48.5 245t-138.5 208q-19 19 -19 45t19 45t45 19t45 -19q109 -109 167 -249t58 -294t-58 -294t-167 -249
+q-18 -19 -45 -19z" />
+    <glyph glyph-name="uniF2A1" unicode="&#xf2a1;" horiz-adv-x="2176" 
+d="M192 352q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM704 352q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM704 864q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM1472 352
+q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM1984 352q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM1472 864q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM1984 864
+q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM1984 1376q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM384 192q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 192q0 -80 -56 -136
+t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM384 704q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 704q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM384 1216q0 -80 -56 -136t-136 -56
+t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1664 192q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 1216q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM2176 192q0 -80 -56 -136t-136 -56t-136 56
+t-56 136t56 136t136 56t136 -56t56 -136zM1664 704q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM2176 704q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1664 1216q0 -80 -56 -136t-136 -56t-136 56t-56 136
+t56 136t136 56t136 -56t56 -136zM2176 1216q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136z" />
+    <glyph glyph-name="uniF2A2" unicode="&#xf2a2;" horiz-adv-x="1792" 
+d="M128 -192q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45zM320 0q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45zM365 365l256 -256l-90 -90l-256 256zM704 384q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45z
+M1411 704q0 -59 -11.5 -108.5t-37.5 -93.5t-44 -67.5t-53 -64.5q-31 -35 -45.5 -54t-33.5 -50t-26.5 -64t-7.5 -74q0 -159 -112.5 -271.5t-271.5 -112.5q-26 0 -45 19t-19 45t19 45t45 19q106 0 181 75t75 181q0 57 11.5 105.5t37 91t43.5 66.5t52 63q40 46 59.5 72
+t37.5 74.5t18 103.5q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5q0 -26 -19 -45t-45 -19t-45 19t-19 45q0 117 45.5 223.5t123 184t184 123t223.5 45.5t223.5 -45.5t184 -123t123 -184t45.5 -223.5zM896 576q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45
+t45 19t45 -19t19 -45zM1184 704q0 -26 -19 -45t-45 -19t-45 19t-19 45q0 93 -65.5 158.5t-158.5 65.5q-92 0 -158 -65.5t-66 -158.5q0 -26 -19 -45t-45 -19t-45 19t-19 45q0 146 103 249t249 103t249 -103t103 -249zM1578 993q10 -25 -1 -49t-36 -34q-9 -4 -23 -4
+q-19 0 -35.5 11t-23.5 30q-68 178 -224 295q-21 16 -25 42t12 47q17 21 43 25t47 -12q183 -137 266 -351zM1788 1074q9 -25 -1.5 -49t-35.5 -34q-11 -4 -23 -4q-44 0 -60 41q-92 238 -297 393q-22 16 -25.5 42t12.5 47q16 22 42 25.5t47 -12.5q235 -175 341 -449z" />
+    <glyph glyph-name="uniF2A3" unicode="&#xf2a3;" horiz-adv-x="2304" 
+d="M1032 576q-59 2 -84 55q-17 34 -48 53.5t-68 19.5q-53 0 -90.5 -37.5t-37.5 -90.5q0 -56 36 -89l10 -8q34 -31 82 -31q37 0 68 19.5t48 53.5q25 53 84 55zM1600 704q0 56 -36 89l-10 8q-34 31 -82 31q-37 0 -68 -19.5t-48 -53.5q-25 -53 -84 -55q59 -2 84 -55
+q17 -34 48 -53.5t68 -19.5q53 0 90.5 37.5t37.5 90.5zM1174 925q-17 -35 -55 -48t-73 4q-62 31 -134 31q-51 0 -99 -17q3 0 9.5 0.5t9.5 0.5q92 0 170.5 -50t118.5 -133q17 -36 3.5 -73.5t-49.5 -54.5q-18 -9 -39 -9q21 0 39 -9q36 -17 49.5 -54.5t-3.5 -73.5
+q-40 -83 -118.5 -133t-170.5 -50h-6q-16 2 -44 4l-290 27l-239 -120q-14 -7 -29 -7q-40 0 -57 35l-160 320q-11 23 -4 47.5t29 37.5l209 119l148 267q17 155 91.5 291.5t195.5 236.5q31 25 70.5 21.5t64.5 -34.5t21.5 -70t-34.5 -65q-70 -59 -117 -128q123 84 267 101
+q40 5 71.5 -19t35.5 -64q5 -40 -19 -71.5t-64 -35.5q-84 -10 -159 -55q46 10 99 10q115 0 218 -50q36 -18 49 -55.5t-5 -73.5zM2137 1085l160 -320q11 -23 4 -47.5t-29 -37.5l-209 -119l-148 -267q-17 -155 -91.5 -291.5t-195.5 -236.5q-26 -22 -61 -22q-45 0 -74 35
+q-25 31 -21.5 70t34.5 65q70 59 117 128q-123 -84 -267 -101q-4 -1 -12 -1q-36 0 -63.5 24t-31.5 60q-5 40 19 71.5t64 35.5q84 10 159 55q-46 -10 -99 -10q-115 0 -218 50q-36 18 -49 55.5t5 73.5q17 35 55 48t73 -4q62 -31 134 -31q51 0 99 17q-3 0 -9.5 -0.5t-9.5 -0.5
+q-92 0 -170.5 50t-118.5 133q-17 36 -3.5 73.5t49.5 54.5q18 9 39 9q-21 0 -39 9q-36 17 -49.5 54.5t3.5 73.5q40 83 118.5 133t170.5 50h6h1q14 -2 42 -4l291 -27l239 120q14 7 29 7q40 0 57 -35z" />
+    <glyph glyph-name="uniF2A4" unicode="&#xf2a4;" horiz-adv-x="1792" 
+d="M1056 704q0 -26 19 -45t45 -19t45 19t19 45q0 146 -103 249t-249 103t-249 -103t-103 -249q0 -26 19 -45t45 -19t45 19t19 45q0 93 66 158.5t158 65.5t158 -65.5t66 -158.5zM835 1280q-117 0 -223.5 -45.5t-184 -123t-123 -184t-45.5 -223.5q0 -26 19 -45t45 -19t45 19
+t19 45q0 185 131.5 316.5t316.5 131.5t316.5 -131.5t131.5 -316.5q0 -55 -18 -103.5t-37.5 -74.5t-59.5 -72q-34 -39 -52 -63t-43.5 -66.5t-37 -91t-11.5 -105.5q0 -106 -75 -181t-181 -75q-26 0 -45 -19t-19 -45t19 -45t45 -19q159 0 271.5 112.5t112.5 271.5q0 41 7.5 74
+t26.5 64t33.5 50t45.5 54q35 41 53 64.5t44 67.5t37.5 93.5t11.5 108.5q0 117 -45.5 223.5t-123 184t-184 123t-223.5 45.5zM591 561l226 -226l-579 -579q-12 -12 -29 -12t-29 12l-168 168q-12 12 -12 29t12 29zM1612 1524l168 -168q12 -12 12 -29t-12 -30l-233 -233
+l-26 -25l-71 -71q-66 153 -195 258l91 91l207 207q13 12 30 12t29 -12z" />
+    <glyph glyph-name="uniF2A5" unicode="&#xf2a5;" 
+d="M866 1021q0 -27 -13 -94q-11 -50 -31.5 -150t-30.5 -150q-2 -11 -4.5 -12.5t-13.5 -2.5q-20 -2 -31 -2q-58 0 -84 49.5t-26 113.5q0 88 35 174t103 124q28 14 51 14q28 0 36.5 -16.5t8.5 -47.5zM1352 597q0 14 -39 75.5t-52 66.5q-21 8 -34 8q-91 0 -226 -77l-2 2
+q3 22 27.5 135t24.5 178q0 233 -242 233q-24 0 -68 -6q-94 -17 -168.5 -89.5t-111.5 -166.5t-37 -189q0 -146 80.5 -225t227.5 -79q25 0 25 -3t-1 -5q-4 -34 -26 -117q-14 -52 -51.5 -101t-82.5 -49q-42 0 -42 47q0 24 10.5 47.5t25 39.5t29.5 28.5t26 20t11 8.5q0 3 -7 10
+q-24 22 -58.5 36.5t-65.5 14.5q-35 0 -63.5 -34t-41 -75t-12.5 -75q0 -88 51.5 -142t138.5 -54q82 0 155 53t117.5 126t65.5 153q6 22 15.5 66.5t14.5 66.5q3 12 14 18q118 60 227 60q48 0 127 -18q1 -1 4 -1q5 0 9.5 4.5t4.5 8.5zM1536 1120v-960q0 -119 -84.5 -203.5
+t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="uniF2A6" unicode="&#xf2a6;" horiz-adv-x="1535" 
+d="M744 1231q0 24 -2 38.5t-8.5 30t-21 23t-37.5 7.5q-39 0 -78 -23q-105 -58 -159 -190.5t-54 -269.5q0 -44 8.5 -85.5t26.5 -80.5t52.5 -62.5t81.5 -23.5q4 0 18 -0.5t20 0t16 3t15 8.5t7 16q16 77 48 231.5t48 231.5q19 91 19 146zM1498 575q0 -7 -7.5 -13.5t-15.5 -6.5
+l-6 1q-22 3 -62 11t-72 12.5t-63 4.5q-167 0 -351 -93q-15 -8 -21 -27q-10 -36 -24.5 -105.5t-22.5 -100.5q-23 -91 -70 -179.5t-112.5 -164.5t-154.5 -123t-185 -47q-135 0 -214.5 83.5t-79.5 219.5q0 53 19.5 117t63 116.5t97.5 52.5q38 0 120 -33.5t83 -61.5
+q0 -1 -16.5 -12.5t-39.5 -31t-46 -44.5t-39 -61t-16 -74q0 -33 16.5 -53t48.5 -20q45 0 85 31.5t66.5 78t48 105.5t32.5 107t16 90v9q0 2 -3.5 3.5t-8.5 1.5h-10t-10 -0.5t-6 -0.5q-227 0 -352 122.5t-125 348.5q0 108 34.5 221t96 210t156 167.5t204.5 89.5q52 9 106 9
+q374 0 374 -360q0 -98 -38 -273t-43 -211l3 -3q101 57 182.5 88t167.5 31q22 0 53 -13q19 -7 80 -102.5t61 -116.5z" />
+    <glyph glyph-name="uniF2A7" unicode="&#xf2a7;" horiz-adv-x="1664" 
+d="M831 863q32 0 59 -18l222 -148q61 -40 110 -97l146 -170q40 -46 29 -106l-72 -413q-6 -32 -29.5 -53.5t-55.5 -25.5l-527 -56l-352 -32h-9q-39 0 -67.5 28t-28.5 68q0 37 27 64t65 32l260 32h-448q-41 0 -69.5 30t-26.5 71q2 39 32 65t69 26l442 1l-521 64q-41 5 -66 37
+t-19 73q6 35 34.5 57.5t65.5 22.5h10l481 -60l-351 94q-38 10 -62 41.5t-18 68.5q6 36 33 58.5t62 22.5q6 0 20 -2l448 -96l217 -37q1 0 3 -0.5t3 -0.5q23 0 30.5 23t-12.5 36l-186 125q-35 23 -42 63.5t18 73.5q27 38 76 38zM761 661l186 -125l-218 37l-5 2l-36 38
+l-238 262q-1 1 -2.5 3.5t-2.5 3.5q-24 31 -18.5 70t37.5 64q31 23 68 17.5t64 -33.5l142 -147q-2 -1 -5 -3.5t-4 -4.5q-32 -45 -23 -99t55 -85zM1648 1115l15 -266q4 -73 -11 -147l-48 -219q-12 -59 -67 -87l-106 -54q2 62 -39 109l-146 170q-53 61 -117 103l-222 148
+q-34 23 -76 23q-51 0 -88 -37l-235 312q-25 33 -18 73.5t41 63.5q33 22 71.5 14t62.5 -40l266 -352l-262 455q-21 35 -10.5 75t47.5 59q35 18 72.5 6t57.5 -46l241 -420l-136 337q-15 35 -4.5 74t44.5 56q37 19 76 6t56 -51l193 -415l101 -196q8 -15 23 -17.5t27 7.5t11 26
+l-12 224q-2 41 26 71t69 31q39 0 67 -28.5t30 -67.5z" />
+    <glyph glyph-name="uniF2A8" unicode="&#xf2a8;" horiz-adv-x="1792" 
+d="M335 180q-2 0 -6 2q-86 57 -168.5 145t-139.5 180q-21 30 -21 69q0 9 2 19t4 18t7 18t8.5 16t10.5 17t10 15t12 15.5t11 14.5q184 251 452 365q-110 198 -110 211q0 19 17 29q116 64 128 64q18 0 28 -16l124 -229q92 19 192 19q266 0 497.5 -137.5t378.5 -369.5
+q20 -31 20 -69t-20 -69q-91 -142 -218.5 -253.5t-278.5 -175.5q110 -198 110 -211q0 -20 -17 -29q-116 -64 -127 -64q-19 0 -29 16l-124 229l-64 119l-444 820l7 7q-58 -24 -99 -47q3 -5 127 -234t243 -449t119 -223q0 -7 -9 -9q-13 -3 -72 -3q-57 0 -60 7l-456 841
+q-39 -28 -82 -68q24 -43 214 -393.5t190 -354.5q0 -10 -11 -10q-14 0 -82.5 22t-72.5 28l-106 197l-224 413q-44 -53 -78 -106q2 -3 18 -25t23 -34l176 -327q0 -10 -10 -10zM1165 282l49 -91q273 111 450 385q-180 277 -459 389q67 -64 103 -148.5t36 -176.5
+q0 -106 -47 -200.5t-132 -157.5zM848 896q0 -20 14 -34t34 -14q86 0 147 -61t61 -147q0 -20 14 -34t34 -14t34 14t14 34q0 126 -89 215t-215 89q-20 0 -34 -14t-14 -34zM1214 961l-9 4l7 -7z" />
+    <glyph glyph-name="uniF2A9" unicode="&#xf2a9;" horiz-adv-x="1280" 
+d="M1050 430q0 -215 -147 -374q-148 -161 -378 -161q-232 0 -378 161q-147 159 -147 374q0 147 68 270.5t189 196.5t268 73q96 0 182 -31q-32 -62 -39 -126q-66 28 -143 28q-167 0 -280.5 -123t-113.5 -291q0 -170 112.5 -288.5t281.5 -118.5t281 118.5t112 288.5
+q0 89 -32 166q66 13 123 49q41 -98 41 -212zM846 619q0 -192 -79.5 -345t-238.5 -253l-14 -1q-29 0 -62 5q83 32 146.5 102.5t99.5 154.5t58.5 189t30 192.5t7.5 178.5q0 69 -3 103q55 -160 55 -326zM791 947v-2q-73 214 -206 440q88 -59 142.5 -186.5t63.5 -251.5z
+M1035 744q-83 0 -160 75q218 120 290 247q19 37 21 56q-42 -94 -139.5 -166.5t-204.5 -97.5q-35 54 -35 113q0 37 17 79t43 68q46 44 157 74q59 16 106 58.5t74 100.5q74 -105 74 -253q0 -109 -24 -170q-32 -77 -88.5 -130.5t-130.5 -53.5z" />
+    <glyph glyph-name="uniF2AA" unicode="&#xf2aa;" 
+d="M1050 495q0 78 -28 147q-41 -25 -85 -34q22 -50 22 -114q0 -117 -77 -198.5t-193 -81.5t-193.5 81.5t-77.5 198.5q0 115 78 199.5t193 84.5q53 0 98 -19q4 43 27 87q-60 21 -125 21q-154 0 -257.5 -108.5t-103.5 -263.5t103.5 -261t257.5 -106t257.5 106.5t103.5 260.5z
+M872 850q2 -24 2 -71q0 -63 -5 -123t-20.5 -132.5t-40.5 -130t-68.5 -106t-100.5 -70.5q21 -3 42 -3h10q219 139 219 411q0 116 -38 225zM872 850q-4 80 -44 171.5t-98 130.5q92 -156 142 -302zM1207 955q0 102 -51 174q-41 -86 -124 -109q-69 -19 -109 -53.5t-40 -99.5
+q0 -40 24 -77q74 17 140.5 67t95.5 115q-4 -52 -74.5 -111.5t-138.5 -97.5q52 -52 110 -52q51 0 90 37t60 90q17 42 17 117zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5
+t84.5 -203.5z" />
+    <glyph glyph-name="uniF2AB" unicode="&#xf2ab;" 
+d="M1279 388q0 22 -22 27q-67 15 -118 59t-80 108q-7 19 -7 25q0 15 19.5 26t43 17t43 20.5t19.5 36.5q0 19 -18.5 31.5t-38.5 12.5q-12 0 -32 -8t-31 -8q-4 0 -12 2q5 95 5 114q0 79 -17 114q-36 78 -103 121.5t-152 43.5q-199 0 -275 -165q-17 -35 -17 -114q0 -19 5 -114
+q-4 -2 -14 -2q-12 0 -32 7.5t-30 7.5q-21 0 -38.5 -12t-17.5 -32q0 -21 19.5 -35.5t43 -20.5t43 -17t19.5 -26q0 -6 -7 -25q-64 -138 -198 -167q-22 -5 -22 -27q0 -46 137 -68q2 -5 6 -26t11.5 -30.5t23.5 -9.5q12 0 37.5 4.5t39.5 4.5q35 0 67 -15t54 -32.5t57.5 -32.5
+t76.5 -15q43 0 79 15t57.5 32.5t53.5 32.5t67 15q14 0 39.5 -4t38.5 -4q16 0 23 10t11 30t6 25q137 22 137 68zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5
+t103 -385.5z" />
+    <glyph glyph-name="uniF2AC" unicode="&#xf2ac;" horiz-adv-x="1664" 
+d="M848 1408q134 1 240.5 -68.5t163.5 -192.5q27 -58 27 -179q0 -47 -9 -191q14 -7 28 -7q18 0 51 13.5t51 13.5q29 0 56 -18t27 -46q0 -32 -31.5 -54t-69 -31.5t-69 -29t-31.5 -47.5q0 -15 12 -43q37 -82 102.5 -150t144.5 -101q28 -12 80 -23q28 -6 28 -35
+q0 -70 -219 -103q-7 -11 -11 -39t-14 -46.5t-33 -18.5q-20 0 -62 6.5t-64 6.5q-37 0 -62 -5q-32 -5 -63 -22.5t-58 -38t-58 -40.5t-76 -33.5t-99 -13.5q-52 0 -96.5 13.5t-75 33.5t-57.5 40.5t-58 38t-62 22.5q-26 5 -63 5q-24 0 -65.5 -7.5t-58.5 -7.5q-25 0 -35 18.5
+t-14 47.5t-11 40q-219 33 -219 103q0 29 28 35q52 11 80 23q78 32 144.5 101t102.5 150q12 28 12 43q0 28 -31.5 47.5t-69.5 29.5t-69.5 31.5t-31.5 52.5q0 27 26 45.5t55 18.5q15 0 48 -13t53 -13q18 0 32 7q-9 142 -9 190q0 122 27 180q64 137 172 198t264 63z" />
+    <glyph glyph-name="uniF2AD" unicode="&#xf2ad;" 
+d="M1280 388q0 22 -22 27q-67 14 -118 58t-80 109q-7 14 -7 25q0 15 19.5 26t42.5 17t42.5 20.5t19.5 36.5q0 19 -18.5 31.5t-38.5 12.5q-11 0 -31 -8t-32 -8q-4 0 -12 2q5 63 5 115q0 78 -17 114q-36 78 -102.5 121.5t-152.5 43.5q-198 0 -275 -165q-18 -38 -18 -115
+q0 -38 6 -114q-10 -2 -15 -2q-11 0 -31.5 8t-30.5 8q-20 0 -37.5 -12.5t-17.5 -32.5q0 -21 19.5 -35.5t42.5 -20.5t42.5 -17t19.5 -26q0 -11 -7 -25q-64 -138 -198 -167q-22 -5 -22 -27q0 -47 138 -69q2 -5 6 -26t11 -30.5t23 -9.5q13 0 38.5 5t38.5 5q35 0 67.5 -15
+t54.5 -32.5t57.5 -32.5t76.5 -15q43 0 79 15t57.5 32.5t54 32.5t67.5 15q13 0 39 -4.5t39 -4.5q15 0 22.5 9.5t11.5 31t5 24.5q138 22 138 69zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960
+q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="uniF2AE" unicode="&#xf2ae;" horiz-adv-x="2304" 
+d="M2304 1536q-69 -46 -125 -92t-89 -81t-59.5 -71.5t-37.5 -57.5t-22 -44.5t-14 -29.5q-10 -18 -35.5 -136.5t-48.5 -164.5q-15 -29 -50 -60.5t-67.5 -50.5t-72.5 -41t-48 -28q-47 -31 -151 -231q-341 14 -630 -158q-92 -53 -303 -179q47 16 86 31t55 22l15 7
+q71 27 163 64.5t133.5 53.5t108 34.5t142.5 31.5q186 31 465 -7q1 0 10 -3q11 -6 14 -17t-3 -22l-194 -345q-15 -29 -47 -22q-128 24 -354 24q-146 0 -402 -44.5t-392 -46.5q-82 -1 -149 13t-107 37t-61 40t-33 34l-1 1v2q0 6 6 6q138 0 371 55q192 366 374.5 524t383.5 158
+q5 0 14.5 -0.5t38 -5t55 -12t61.5 -24.5t63 -39.5t54 -59t40 -82.5l102 177q2 4 21 42.5t44.5 86.5t61 109.5t84 133.5t100.5 137q66 82 128 141.5t121.5 96.5t92.5 53.5t88 39.5z" />
+    <glyph glyph-name="uniF2B0" unicode="&#xf2b0;" 
+d="M1322 640q0 -45 -5 -76l-236 14l224 -78q-19 -73 -58 -141l-214 103l177 -158q-44 -61 -107 -108l-157 178l103 -215q-61 -37 -140 -59l-79 228l14 -240q-38 -6 -76 -6t-76 6l14 238l-78 -226q-74 19 -140 59l103 215l-157 -178q-59 43 -108 108l178 158l-214 -104
+q-39 69 -58 141l224 79l-237 -14q-5 42 -5 76q0 35 5 77l238 -14l-225 79q19 73 58 140l214 -104l-177 159q46 61 107 108l158 -178l-103 215q67 39 140 58l77 -224l-13 236q36 6 75 6q38 0 76 -6l-14 -237l78 225q74 -19 140 -59l-103 -214l158 178q61 -47 107 -108
+l-177 -159l213 104q37 -62 58 -141l-224 -78l237 14q5 -31 5 -77zM1352 640q0 160 -78.5 295.5t-213 214t-292.5 78.5q-119 0 -227 -46.5t-186.5 -125t-124.5 -187.5t-46 -229q0 -119 46 -228t124.5 -187.5t186.5 -125t227 -46.5q158 0 292.5 78.5t213 214t78.5 294.5z
+M1425 1023v-766l-657 -383l-657 383v766l657 383zM768 -183l708 412v823l-708 411l-708 -411v-823zM1536 1088v-896l-768 -448l-768 448v896l768 448z" />
+    <glyph glyph-name="uniF2B1" unicode="&#xf2b1;" horiz-adv-x="1664" 
+d="M339 1318h691l-26 -72h-665q-110 0 -188.5 -79t-78.5 -189v-771q0 -95 60.5 -169.5t153.5 -93.5q23 -5 98 -5v-72h-45q-140 0 -239.5 100t-99.5 240v771q0 140 99.5 240t239.5 100zM1190 1536h247l-482 -1294q-23 -61 -40.5 -103.5t-45 -98t-54 -93.5t-64.5 -78.5
+t-79.5 -65t-95.5 -41t-116 -18.5v195q163 26 220 182q20 52 20 105q0 54 -20 106l-285 733h228l187 -585zM1664 978v-1111h-795q37 55 45 73h678v1038q0 85 -49.5 155t-129.5 99l25 67q101 -34 163.5 -123.5t62.5 -197.5z" />
+    <glyph glyph-name="uniF2B2" unicode="&#xf2b2;" horiz-adv-x="1792" 
+d="M852 1227q0 -29 -17 -52.5t-45 -23.5t-45 23.5t-17 52.5t17 52.5t45 23.5t45 -23.5t17 -52.5zM688 -149v114q0 30 -20.5 51.5t-50.5 21.5t-50 -21.5t-20 -51.5v-114q0 -30 20.5 -52t49.5 -22q30 0 50.5 22t20.5 52zM860 -149v114q0 30 -20 51.5t-50 21.5t-50.5 -21.5
+t-20.5 -51.5v-114q0 -30 20.5 -52t50.5 -22q29 0 49.5 22t20.5 52zM1034 -149v114q0 30 -20.5 51.5t-50.5 21.5t-50.5 -21.5t-20.5 -51.5v-114q0 -30 20.5 -52t50.5 -22t50.5 22t20.5 52zM1208 -149v114q0 30 -20.5 51.5t-50.5 21.5t-50.5 -21.5t-20.5 -51.5v-114
+q0 -30 20.5 -52t50.5 -22t50.5 22t20.5 52zM1476 535q-84 -160 -232 -259.5t-323 -99.5q-123 0 -229.5 51.5t-178.5 137t-113 197.5t-41 232q0 88 21 174q-104 -175 -104 -390q0 -162 65 -312t185 -251q30 57 91 57q56 0 86 -50q32 50 87 50q56 0 86 -50q32 50 87 50t87 -50
+q30 50 86 50q28 0 52.5 -15.5t37.5 -40.5q112 94 177 231.5t73 287.5zM1326 564q0 75 -72 75q-17 0 -47 -6q-95 -19 -149 -19q-226 0 -226 243q0 86 30 204q-83 -127 -83 -275q0 -150 89 -260.5t235 -110.5q111 0 210 70q13 48 13 79zM884 1223q0 50 -32 89.5t-81 39.5
+t-81 -39.5t-32 -89.5q0 -51 31.5 -90.5t81.5 -39.5t81.5 39.5t31.5 90.5zM1513 884q0 96 -37.5 179t-113 137t-173.5 54q-77 0 -149 -35t-127 -94q-48 -159 -48 -268q0 -104 45.5 -157t147.5 -53q53 0 142 19q36 6 53 6q51 0 77.5 -28t26.5 -80q0 -26 -4 -46
+q75 68 117.5 165.5t42.5 200.5zM1792 667q0 -111 -33.5 -249.5t-93.5 -204.5q-58 -64 -195 -142.5t-228 -104.5l-4 -1v-114q0 -43 -29.5 -75t-72.5 -32q-56 0 -86 50q-32 -50 -87 -50t-87 50q-30 -50 -86 -50q-55 0 -87 50q-30 -50 -86 -50q-47 0 -75 33.5t-28 81.5
+q-90 -68 -198 -68q-118 0 -211 80q54 1 106 20q-113 31 -182 127q32 -7 71 -7q89 0 164 46q-192 192 -240 306q-24 56 -24 160q0 57 9 125.5t31.5 146.5t55 141t86.5 105t120 42q59 0 81 -52q19 29 42 54q2 3 12 13t13 16q10 15 23 38t25 42t28 39q87 111 211.5 177
+t260.5 66q35 0 62 -4q59 64 146 64q83 0 140 -57q5 -5 5 -12q0 -5 -6 -13.5t-12.5 -16t-16 -17l-10.5 -10.5q17 -6 36 -18t19 -24q0 -6 -16 -25q157 -138 197 -378q25 30 60 30q45 0 100 -49q90 -80 90 -279z" />
+    <glyph glyph-name="uniF2B3" unicode="&#xf2b3;" 
+d="M917 631q0 33 -6 64h-362v-132h217q-12 -76 -74.5 -120.5t-142.5 -44.5q-99 0 -169 71.5t-70 170.5t70 170.5t169 71.5q93 0 153 -59l104 101q-108 100 -257 100q-160 0 -272 -112.5t-112 -271.5t112 -271.5t272 -112.5q165 0 266.5 105t101.5 270zM1262 585h109v110
+h-109v110h-110v-110h-110v-110h110v-110h110v110zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="uniF2B4" unicode="&#xf2b4;" 
+d="M1536 1024v-839q0 -48 -49 -62q-174 -52 -338 -52q-73 0 -215.5 29.5t-227.5 29.5q-164 0 -370 -48v-338h-160v1368q-63 25 -101 81t-38 124q0 91 64 155t155 64t155 -64t64 -155q0 -68 -38 -124t-101 -81v-68q190 44 343 44q99 0 198 -15q14 -2 111.5 -22.5t149.5 -20.5
+q77 0 165 18q11 2 80 21t89 19q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="uniF2B5" unicode="&#xf2b5;" horiz-adv-x="2304" 
+d="M192 384q40 0 56 32t0 64t-56 32t-56 -32t0 -64t56 -32zM1665 442q-10 13 -38.5 50t-41.5 54t-38 49t-42.5 53t-40.5 47t-45 49l-125 -140q-83 -94 -208.5 -92t-205.5 98q-57 69 -56.5 158t58.5 157l177 206q-22 11 -51 16.5t-47.5 6t-56.5 -0.5t-49 -1q-92 0 -158 -66
+l-158 -158h-155v-544q5 0 21 0.5t22 0t19.5 -2t20.5 -4.5t17.5 -8.5t18.5 -13.5l297 -292q115 -111 227 -111q78 0 125 47q57 -20 112.5 8t72.5 85q74 -6 127 44q20 18 36 45.5t14 50.5q10 -10 43 -10q43 0 77 21t49.5 53t12 71.5t-30.5 73.5zM1824 384h96v512h-93l-157 180
+q-66 76 -169 76h-167q-89 0 -146 -67l-209 -243q-28 -33 -28 -75t27 -75q43 -51 110 -52t111 49l193 218q25 23 53.5 21.5t47 -27t8.5 -56.5q16 -19 56 -63t60 -68q29 -36 82.5 -105.5t64.5 -84.5q52 -66 60 -140zM2112 384q40 0 56 32t0 64t-56 32t-56 -32t0 -64t56 -32z
+M2304 960v-640q0 -26 -19 -45t-45 -19h-434q-27 -65 -82 -106.5t-125 -51.5q-33 -48 -80.5 -81.5t-102.5 -45.5q-42 -53 -104.5 -81.5t-128.5 -24.5q-60 -34 -126 -39.5t-127.5 14t-117 53.5t-103.5 81l-287 282h-358q-26 0 -45 19t-19 45v672q0 26 19 45t45 19h421
+q14 14 47 48t47.5 48t44 40t50.5 37.5t51 25.5t62 19.5t68 5.5h117q99 0 181 -56q82 56 181 56h167q35 0 67 -6t56.5 -14.5t51.5 -26.5t44.5 -31t43 -39.5t39 -42t41 -48t41.5 -48.5h355q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="uniF2B6" unicode="&#xf2b6;" horiz-adv-x="1792" 
+d="M1792 882v-978q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v978q0 15 11 24q8 7 39 34.5t41.5 36t45.5 37.5t70 55.5t96 73t143.5 107t192.5 140.5q5 4 52.5 40t71.5 52.5t64 35t69 18.5t69 -18.5t65 -35.5t71 -52t52 -40q110 -80 192.5 -140.5t143.5 -107
+t96 -73t70 -55.5t45.5 -37.5t41.5 -36t39 -34.5q11 -9 11 -24zM1228 297q263 191 345 252q11 8 12.5 20.5t-6.5 23.5l-38 52q-8 11 -21 12.5t-24 -6.5q-231 -169 -343 -250q-5 -3 -52 -39t-71.5 -52.5t-64.5 -35t-69 -18.5t-69 18.5t-64.5 35t-71.5 52.5t-52 39
+q-186 134 -343 250q-11 8 -24 6.5t-21 -12.5l-38 -52q-8 -11 -6.5 -23.5t12.5 -20.5q82 -61 345 -252q10 -8 50 -38t65 -47t64 -39.5t77.5 -33.5t75.5 -11t75.5 11t79 34.5t64.5 39.5t65 47.5t48 36.5z" />
+    <glyph glyph-name="uniF2B7" unicode="&#xf2b7;" horiz-adv-x="1792" 
+d="M1474 623l39 -51q8 -11 6.5 -23.5t-11.5 -20.5q-43 -34 -126.5 -98.5t-146.5 -113t-67 -51.5q-39 -32 -60 -48t-60.5 -41t-76.5 -36.5t-74 -11.5h-1h-1q-37 0 -74 11.5t-76 36.5t-61 41.5t-60 47.5q-5 4 -65 50.5t-143.5 111t-122.5 94.5q-11 8 -12.5 20.5t6.5 23.5
+l37 52q8 11 21.5 13t24.5 -7q94 -73 306 -236q5 -4 43.5 -35t60.5 -46.5t56.5 -32.5t58.5 -17h1h1q24 0 58.5 17t56.5 32.5t60.5 46.5t43.5 35q258 198 313 242q11 8 24 6.5t21 -12.5zM1664 -96v928q-90 83 -159 139q-91 74 -389 304q-3 2 -43 35t-61 48t-56 32.5t-59 17.5
+h-1h-1q-24 0 -59 -17.5t-56 -32.5t-61 -48t-43 -35q-215 -166 -315.5 -245.5t-129.5 -104t-82 -74.5q-14 -12 -21 -19v-928q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1792 832v-928q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v928q0 56 41 94
+q123 114 350 290.5t233 181.5q36 30 59 47.5t61.5 42t76 36.5t74.5 12h1h1q37 0 74.5 -12t76 -36.5t61.5 -42t59 -47.5q43 -36 156 -122t226 -177t201 -173q41 -38 41 -94z" />
+    <glyph glyph-name="uniF2B8" unicode="&#xf2b8;" 
+d="M330 1l202 -214l-34 236l-216 213zM556 -225l274 218l-11 245l-300 -215zM245 413l227 -213l-48 327l-245 204zM495 189l317 214l-14 324l-352 -200zM843 178l95 -80l-2 239l-103 79q0 -1 1 -8.5t0 -12t-5 -7.5l-78 -52l85 -70q7 -6 7 -88zM138 930l256 -200l-68 465
+l-279 173zM1173 267l15 234l-230 -164l2 -240zM417 722l373 194l-19 441l-423 -163zM1270 357l20 233l-226 142l-2 -105l144 -95q6 -4 4 -9l-7 -119zM1461 496l30 222l-179 -128l-20 -228zM1273 329l-71 49l-8 -117q0 -5 -4 -8l-234 -187q-7 -5 -14 0l-98 83l7 -161
+q0 -5 -4 -8l-293 -234q-4 -2 -6 -2q-8 2 -8 3l-228 242q-4 4 -59 277q-2 7 5 11l61 37q-94 86 -95 92l-72 351q-2 7 6 12l94 45q-133 100 -135 108l-96 466q-2 10 7 13l433 135q5 0 8 -1l317 -153q6 -4 6 -9l20 -463q0 -7 -6 -10l-118 -61l126 -85q5 -2 5 -8l5 -123l121 74
+q5 4 11 0l84 -56l3 110q0 6 5 9l206 126q6 3 11 0l245 -135q4 -4 5 -7t-6.5 -60t-17.5 -124.5t-10 -70.5q0 -5 -4 -7l-191 -153q-6 -5 -13 0z" />
+    <glyph glyph-name="uniF2B9" unicode="&#xf2b9;" horiz-adv-x="1664" 
+d="M1201 298q0 57 -5.5 107t-21 100.5t-39.5 86t-64 58t-91 22.5q-6 -4 -33.5 -20.5t-42.5 -24.5t-40.5 -20t-49 -17t-46.5 -5t-46.5 5t-49 17t-40.5 20t-42.5 24.5t-33.5 20.5q-51 0 -91 -22.5t-64 -58t-39.5 -86t-21 -100.5t-5.5 -107q0 -73 42 -121.5t103 -48.5h576
+q61 0 103 48.5t42 121.5zM1028 892q0 108 -76.5 184t-183.5 76t-183.5 -76t-76.5 -184q0 -107 76.5 -183t183.5 -76t183.5 76t76.5 183zM1664 352v-192q0 -14 -9 -23t-23 -9h-96v-224q0 -66 -47 -113t-113 -47h-1216q-66 0 -113 47t-47 113v1472q0 66 47 113t113 47h1216
+q66 0 113 -47t47 -113v-224h96q14 0 23 -9t9 -23v-192q0 -14 -9 -23t-23 -9h-96v-128h96q14 0 23 -9t9 -23v-192q0 -14 -9 -23t-23 -9h-96v-128h96q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="uniF2BA" unicode="&#xf2ba;" horiz-adv-x="1664" 
+d="M1028 892q0 -107 -76.5 -183t-183.5 -76t-183.5 76t-76.5 183q0 108 76.5 184t183.5 76t183.5 -76t76.5 -184zM980 672q46 0 82.5 -17t60 -47.5t39.5 -67t24 -81t11.5 -82.5t3.5 -79q0 -67 -39.5 -118.5t-105.5 -51.5h-576q-66 0 -105.5 51.5t-39.5 118.5q0 48 4.5 93.5
+t18.5 98.5t36.5 91.5t63 64.5t93.5 26h5q7 -4 32 -19.5t35.5 -21t33 -17t37 -16t35 -9t39.5 -4.5t39.5 4.5t35 9t37 16t33 17t35.5 21t32 19.5zM1664 928q0 -13 -9.5 -22.5t-22.5 -9.5h-96v-128h96q13 0 22.5 -9.5t9.5 -22.5v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-96v-128h96
+q13 0 22.5 -9.5t9.5 -22.5v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-96v-224q0 -66 -47 -113t-113 -47h-1216q-66 0 -113 47t-47 113v1472q0 66 47 113t113 47h1216q66 0 113 -47t47 -113v-224h96q13 0 22.5 -9.5t9.5 -22.5v-192zM1408 -96v1472q0 13 -9.5 22.5t-22.5 9.5h-1216
+q-13 0 -22.5 -9.5t-9.5 -22.5v-1472q0 -13 9.5 -22.5t22.5 -9.5h1216q13 0 22.5 9.5t9.5 22.5z" />
+    <glyph glyph-name="uniF2BB" unicode="&#xf2bb;" horiz-adv-x="2048" 
+d="M1024 405q0 64 -9 117.5t-29.5 103t-60.5 78t-97 28.5q-6 -4 -30 -18t-37.5 -21.5t-35.5 -17.5t-43 -14.5t-42 -4.5t-42 4.5t-43 14.5t-35.5 17.5t-37.5 21.5t-30 18q-57 0 -97 -28.5t-60.5 -78t-29.5 -103t-9 -117.5t37 -106.5t91 -42.5h512q54 0 91 42.5t37 106.5z
+M867 925q0 94 -66.5 160.5t-160.5 66.5t-160.5 -66.5t-66.5 -160.5t66.5 -160.5t160.5 -66.5t160.5 66.5t66.5 160.5zM1792 416v64q0 14 -9 23t-23 9h-576q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h576q14 0 23 9t9 23zM1792 676v56q0 15 -10.5 25.5t-25.5 10.5h-568
+q-15 0 -25.5 -10.5t-10.5 -25.5v-56q0 -15 10.5 -25.5t25.5 -10.5h568q15 0 25.5 10.5t10.5 25.5zM1792 928v64q0 14 -9 23t-23 9h-576q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h576q14 0 23 9t9 23zM2048 1248v-1216q0 -66 -47 -113t-113 -47h-352v96q0 14 -9 23t-23 9
+h-64q-14 0 -23 -9t-9 -23v-96h-768v96q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-96h-352q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1728q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2BC" unicode="&#xf2bc;" horiz-adv-x="2048" 
+d="M1024 405q0 -64 -37 -106.5t-91 -42.5h-512q-54 0 -91 42.5t-37 106.5t9 117.5t29.5 103t60.5 78t97 28.5q6 -4 30 -18t37.5 -21.5t35.5 -17.5t43 -14.5t42 -4.5t42 4.5t43 14.5t35.5 17.5t37.5 21.5t30 18q57 0 97 -28.5t60.5 -78t29.5 -103t9 -117.5zM867 925
+q0 -94 -66.5 -160.5t-160.5 -66.5t-160.5 66.5t-66.5 160.5t66.5 160.5t160.5 66.5t160.5 -66.5t66.5 -160.5zM1792 480v-64q0 -14 -9 -23t-23 -9h-576q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h576q14 0 23 -9t9 -23zM1792 732v-56q0 -15 -10.5 -25.5t-25.5 -10.5h-568
+q-15 0 -25.5 10.5t-10.5 25.5v56q0 15 10.5 25.5t25.5 10.5h568q15 0 25.5 -10.5t10.5 -25.5zM1792 992v-64q0 -14 -9 -23t-23 -9h-576q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h576q14 0 23 -9t9 -23zM1920 32v1216q0 13 -9.5 22.5t-22.5 9.5h-1728q-13 0 -22.5 -9.5
+t-9.5 -22.5v-1216q0 -13 9.5 -22.5t22.5 -9.5h352v96q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-96h768v96q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-96h352q13 0 22.5 9.5t9.5 22.5zM2048 1248v-1216q0 -66 -47 -113t-113 -47h-1728q-66 0 -113 47t-47 113v1216q0 66 47 113
+t113 47h1728q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2BD" unicode="&#xf2bd;" horiz-adv-x="1792" 
+d="M1523 197q-22 155 -87.5 257.5t-184.5 118.5q-67 -74 -159.5 -115.5t-195.5 -41.5t-195.5 41.5t-159.5 115.5q-119 -16 -184.5 -118.5t-87.5 -257.5q106 -150 271 -237.5t356 -87.5t356 87.5t271 237.5zM1280 896q0 159 -112.5 271.5t-271.5 112.5t-271.5 -112.5
+t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM1792 640q0 -182 -71 -347.5t-190.5 -286t-285.5 -191.5t-349 -71q-182 0 -348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="uniF2BE" unicode="&#xf2be;" horiz-adv-x="1792" 
+d="M896 1536q182 0 348 -71t286 -191t191 -286t71 -348q0 -181 -70.5 -347t-190.5 -286t-286 -191.5t-349 -71.5t-349 71t-285.5 191.5t-190.5 286t-71 347.5t71 348t191 286t286 191t348 71zM1515 185q149 205 149 455q0 156 -61 298t-164 245t-245 164t-298 61t-298 -61
+t-245 -164t-164 -245t-61 -298q0 -250 149 -455q66 327 306 327q131 -128 313 -128t313 128q240 0 306 -327zM1280 832q0 159 -112.5 271.5t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5z" />
+    <glyph glyph-name="uniF2C0" unicode="&#xf2c0;" 
+d="M1201 752q47 -14 89.5 -38t89 -73t79.5 -115.5t55 -172t22 -236.5q0 -154 -100 -263.5t-241 -109.5h-854q-141 0 -241 109.5t-100 263.5q0 131 22 236.5t55 172t79.5 115.5t89 73t89.5 38q-79 125 -79 272q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5
+t198.5 -40.5t163.5 -109.5t109.5 -163.5t40.5 -198.5q0 -147 -79 -272zM768 1408q-159 0 -271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5t-112.5 271.5t-271.5 112.5zM1195 -128q88 0 150.5 71.5t62.5 173.5q0 239 -78.5 377t-225.5 145
+q-145 -127 -336 -127t-336 127q-147 -7 -225.5 -145t-78.5 -377q0 -102 62.5 -173.5t150.5 -71.5h854z" />
+    <glyph glyph-name="uniF2C1" unicode="&#xf2c1;" horiz-adv-x="1280" 
+d="M1024 278q0 -64 -37 -107t-91 -43h-512q-54 0 -91 43t-37 107t9 118t29.5 104t61 78.5t96.5 28.5q80 -75 188 -75t188 75q56 0 96.5 -28.5t61 -78.5t29.5 -104t9 -118zM870 797q0 -94 -67.5 -160.5t-162.5 -66.5t-162.5 66.5t-67.5 160.5t67.5 160.5t162.5 66.5
+t162.5 -66.5t67.5 -160.5zM1152 -96v1376h-1024v-1376q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1280 1376v-1472q0 -66 -47 -113t-113 -47h-960q-66 0 -113 47t-47 113v1472q0 66 47 113t113 47h352v-96q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v96h352
+q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2C2" unicode="&#xf2c2;" horiz-adv-x="2048" 
+d="M896 324q0 54 -7.5 100.5t-24.5 90t-51 68.5t-81 25q-64 -64 -156 -64t-156 64q-47 0 -81 -25t-51 -68.5t-24.5 -90t-7.5 -100.5q0 -55 31.5 -93.5t75.5 -38.5h426q44 0 75.5 38.5t31.5 93.5zM768 768q0 80 -56 136t-136 56t-136 -56t-56 -136t56 -136t136 -56t136 56
+t56 136zM1792 288v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM1408 544v64q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1792 544v64q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23
+v-64q0 -14 9 -23t23 -9h192q14 0 23 9t9 23zM1792 800v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM128 1152h1792v96q0 14 -9 23t-23 9h-1728q-14 0 -23 -9t-9 -23v-96zM2048 1248v-1216q0 -66 -47 -113t-113 -47h-1728
+q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1728q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2C3" unicode="&#xf2c3;" horiz-adv-x="2048" 
+d="M896 324q0 -55 -31.5 -93.5t-75.5 -38.5h-426q-44 0 -75.5 38.5t-31.5 93.5q0 54 7.5 100.5t24.5 90t51 68.5t81 25q64 -64 156 -64t156 64q47 0 81 -25t51 -68.5t24.5 -90t7.5 -100.5zM768 768q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136z
+M1792 352v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704q14 0 23 -9t9 -23zM1408 608v-64q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h320q14 0 23 -9t9 -23zM1792 608v-64q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v64
+q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 864v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704q14 0 23 -9t9 -23zM1920 32v1120h-1792v-1120q0 -13 9.5 -22.5t22.5 -9.5h1728q13 0 22.5 9.5t9.5 22.5zM2048 1248v-1216q0 -66 -47 -113t-113 -47
+h-1728q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1728q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2C4" unicode="&#xf2c4;" horiz-adv-x="1792" 
+d="M1255 749q0 318 -105 474.5t-330 156.5q-222 0 -326 -157t-104 -474q0 -316 104 -471.5t326 -155.5q74 0 131 17q-22 43 -39 73t-44 65t-53.5 56.5t-63 36t-77.5 14.5q-46 0 -79 -16l-49 97q105 91 276 91q132 0 215.5 -54t150.5 -155q67 149 67 402zM1645 117h117
+q3 -27 -2 -67t-26.5 -95t-58 -100.5t-107 -78t-162.5 -32.5q-71 0 -130.5 19t-105.5 56t-79 78t-66 96q-97 -27 -205 -27q-150 0 -292.5 58t-253 158.5t-178 249t-67.5 317.5q0 170 67.5 319.5t178.5 250.5t253.5 159t291.5 58q121 0 238.5 -36t217 -106t176 -164.5
+t119.5 -219t43 -261.5q0 -190 -80.5 -347.5t-218.5 -264.5q47 -70 93.5 -106.5t104.5 -36.5q61 0 94 37.5t38 85.5z" />
+    <glyph glyph-name="uniF2C5" unicode="&#xf2c5;" horiz-adv-x="2304" 
+d="M453 -101q0 -21 -16 -37.5t-37 -16.5q-1 0 -13 3q-63 15 -162 140q-225 284 -225 676q0 341 213 614q39 51 95 103.5t94 52.5q19 0 35 -13.5t16 -32.5q0 -27 -63 -90q-98 -102 -147 -184q-119 -199 -119 -449q0 -281 123 -491q50 -85 136 -173q2 -3 14.5 -16t19.5 -21
+t17 -20.5t14.5 -23.5t4.5 -21zM1796 33q0 -29 -17.5 -48.5t-46.5 -19.5h-1081q-26 0 -45 19t-19 45q0 29 17.5 48.5t46.5 19.5h1081q26 0 45 -19t19 -45zM1581 644q0 -134 -67 -233q-25 -38 -69.5 -78.5t-83.5 -60.5q-16 -10 -27 -10q-7 0 -15 6t-8 12q0 9 19 30t42 46
+t42 67.5t19 88.5q0 76 -35 130q-29 42 -46 42q-3 0 -3 -5q0 -12 7.5 -35.5t7.5 -36.5q0 -22 -21.5 -35t-44.5 -13q-66 0 -66 76q0 15 1.5 44t1.5 44q0 25 -10 46q-13 25 -42 53.5t-51 28.5q-5 0 -7 -0.5t-3.5 -2.5t-1.5 -6q0 -2 16 -26t16 -54q0 -37 -19 -68t-46 -54
+t-53.5 -46t-45.5 -54t-19 -68q0 -98 42 -160q29 -43 79 -63q16 -5 17 -10q1 -2 1 -5q0 -16 -18 -16q-6 0 -33 11q-119 43 -195 139.5t-76 218.5q0 55 24.5 115.5t60 115t70.5 108.5t59.5 113.5t24.5 111.5q0 53 -25 94q-29 48 -56 64q-19 9 -19 21q0 20 41 20q50 0 110 -29
+q41 -19 71 -44.5t49.5 -51t33.5 -62.5t22 -69t16 -80q0 -1 3 -17.5t4.5 -25t5.5 -25t9 -27t11 -21.5t14.5 -16.5t18.5 -5.5q23 0 37 14t14 37q0 25 -20 67t-20 52t10 10q27 0 93 -70q72 -76 102.5 -156t30.5 -186zM2304 615q0 -274 -138 -503q-19 -32 -48 -72t-68 -86.5
+t-81 -77t-74 -30.5q-16 0 -31 15.5t-15 31.5q0 15 29 50.5t68.5 77t48.5 52.5q183 230 183 531q0 131 -20.5 235t-72.5 211q-58 119 -163 228q-2 3 -13 13.5t-16.5 16.5t-15 17.5t-15 20t-9.5 18.5t-4 19q0 19 16 35.5t35 16.5q70 0 196 -169q98 -131 146 -273t60 -314
+q2 -42 2 -64z" />
+    <glyph glyph-name="uniF2C6" unicode="&#xf2c6;" horiz-adv-x="1792" 
+d="M1189 229l147 693q9 44 -10.5 63t-51.5 7l-864 -333q-29 -11 -39.5 -25t-2.5 -26.5t32 -19.5l221 -69l513 323q21 14 32 6q7 -5 -4 -15l-415 -375v0v0l-16 -228q23 0 45 22l108 104l224 -165q64 -36 81 38zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71
+t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="uniF2C7" unicode="&#xf2c7;" horiz-adv-x="1024" 
+d="M640 192q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 60 35 110t93 71v907h128v-907q58 -21 93 -71t35 -110zM768 192q0 77 -34 144t-94 112v768q0 80 -56 136t-136 56t-136 -56t-56 -136v-768q-60 -45 -94 -112t-34 -144q0 -133 93.5 -226.5t226.5 -93.5t226.5 93.5
+t93.5 226.5zM896 192q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 182 128 313v711q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5v-711q128 -131 128 -313zM1024 768v-128h-192v128h192zM1024 1024v-128h-192v128h192zM1024 1280v-128h-192
+v128h192z" />
+    <glyph glyph-name="uniF2C8" unicode="&#xf2c8;" horiz-adv-x="1024" 
+d="M640 192q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 60 35 110t93 71v651h128v-651q58 -21 93 -71t35 -110zM768 192q0 77 -34 144t-94 112v768q0 80 -56 136t-136 56t-136 -56t-56 -136v-768q-60 -45 -94 -112t-34 -144q0 -133 93.5 -226.5t226.5 -93.5t226.5 93.5
+t93.5 226.5zM896 192q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 182 128 313v711q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5v-711q128 -131 128 -313zM1024 768v-128h-192v128h192zM1024 1024v-128h-192v128h192zM1024 1280v-128h-192
+v128h192z" />
+    <glyph glyph-name="uniF2C9" unicode="&#xf2c9;" horiz-adv-x="1024" 
+d="M640 192q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 60 35 110t93 71v395h128v-395q58 -21 93 -71t35 -110zM768 192q0 77 -34 144t-94 112v768q0 80 -56 136t-136 56t-136 -56t-56 -136v-768q-60 -45 -94 -112t-34 -144q0 -133 93.5 -226.5t226.5 -93.5t226.5 93.5
+t93.5 226.5zM896 192q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 182 128 313v711q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5v-711q128 -131 128 -313zM1024 768v-128h-192v128h192zM1024 1024v-128h-192v128h192zM1024 1280v-128h-192
+v128h192z" />
+    <glyph glyph-name="uniF2CA" unicode="&#xf2ca;" horiz-adv-x="1024" 
+d="M640 192q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 60 35 110t93 71v139h128v-139q58 -21 93 -71t35 -110zM768 192q0 77 -34 144t-94 112v768q0 80 -56 136t-136 56t-136 -56t-56 -136v-768q-60 -45 -94 -112t-34 -144q0 -133 93.5 -226.5t226.5 -93.5t226.5 93.5
+t93.5 226.5zM896 192q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 182 128 313v711q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5v-711q128 -131 128 -313zM1024 768v-128h-192v128h192zM1024 1024v-128h-192v128h192zM1024 1280v-128h-192
+v128h192z" />
+    <glyph glyph-name="uniF2CB" unicode="&#xf2cb;" horiz-adv-x="1024" 
+d="M640 192q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 79 56 135.5t136 56.5t136 -56.5t56 -135.5zM768 192q0 77 -34 144t-94 112v768q0 80 -56 136t-136 56t-136 -56t-56 -136v-768q-60 -45 -94 -112t-34 -144q0 -133 93.5 -226.5t226.5 -93.5t226.5 93.5t93.5 226.5z
+M896 192q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 182 128 313v711q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5v-711q128 -131 128 -313zM1024 768v-128h-192v128h192zM1024 1024v-128h-192v128h192zM1024 1280v-128h-192v128h192z" />
+    <glyph glyph-name="uniF2CC" unicode="&#xf2cc;" horiz-adv-x="1920" 
+d="M1433 1287q10 -10 10 -23t-10 -23l-626 -626q-10 -10 -23 -10t-23 10l-82 82q-10 10 -10 23t10 23l44 44q-72 91 -81.5 207t46.5 215q-74 71 -176 71q-106 0 -181 -75t-75 -181v-1280h-256v1280q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5q106 0 201 -41
+t166 -115q94 39 197 24.5t185 -79.5l44 44q10 10 23 10t23 -10zM1344 1024q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1600 896q-26 0 -45 19t-19 45t19 45t45 19t45 -19t19 -45t-19 -45t-45 -19zM1856 1024q26 0 45 -19t19 -45t-19 -45t-45 -19
+t-45 19t-19 45t19 45t45 19zM1216 896q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1408 832q0 26 19 45t45 19t45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45zM1728 896q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1088 768
+q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1344 640q-26 0 -45 19t-19 45t19 45t45 19t45 -19t19 -45t-19 -45t-45 -19zM1600 768q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1216 512q-26 0 -45 19t-19 45t19 45t45 19t45 -19
+t19 -45t-19 -45t-45 -19zM1472 640q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1088 512q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1344 512q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1216 384
+q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1088 256q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19z" />
+    <glyph glyph-name="uniF2CD" unicode="&#xf2cd;" horiz-adv-x="1792" 
+d="M1664 448v-192q0 -169 -128 -286v-194q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v118q-63 -22 -128 -22h-768q-65 0 -128 22v-110q0 -17 -9.5 -28.5t-22.5 -11.5h-64q-13 0 -22.5 11.5t-9.5 28.5v186q-128 117 -128 286v192h1536zM704 864q0 -14 -9 -23t-23 -9t-23 9
+t-9 23t9 23t23 9t23 -9t9 -23zM768 928q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM704 992q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM832 992q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM768 1056q0 -14 -9 -23t-23 -9t-23 9
+t-9 23t9 23t23 9t23 -9t9 -23zM704 1120q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM1792 608v-64q0 -14 -9 -23t-23 -9h-1728q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96v640q0 106 75 181t181 75q108 0 184 -78q46 19 98 12t93 -39l22 22q11 11 22 0l42 -42
+q11 -11 0 -22l-314 -314q-11 -11 -22 0l-42 42q-11 11 0 22l22 22q-36 46 -40.5 104t23.5 108q-37 35 -88 35q-53 0 -90.5 -37.5t-37.5 -90.5v-640h1504q14 0 23 -9t9 -23zM896 1056q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM832 1120q0 -14 -9 -23t-23 -9
+t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM768 1184q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM960 1120q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM896 1184q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM832 1248q0 -14 -9 -23
+t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM1024 1184q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM960 1248q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM1088 1248q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23z" />
+    <glyph glyph-name="uniF2CE" unicode="&#xf2ce;" 
+d="M994 344q0 -86 -17 -197q-31 -215 -55 -313q-22 -90 -152 -90t-152 90q-24 98 -55 313q-17 110 -17 197q0 168 224 168t224 -168zM1536 768q0 -240 -134 -434t-350 -280q-8 -3 -15 3t-6 15q7 48 10 66q4 32 6 47q1 9 9 12q159 81 255.5 234t96.5 337q0 180 -91 330.5
+t-247 234.5t-337 74q-124 -7 -237 -61t-193.5 -140.5t-128 -202t-46.5 -240.5q1 -184 99 -336.5t257 -231.5q7 -3 9 -12q3 -21 6 -45q1 -9 5 -32.5t6 -35.5q1 -9 -6.5 -15t-15.5 -2q-148 58 -261 169.5t-173.5 264t-52.5 319.5q7 143 66 273.5t154.5 227t225 157.5t272.5 70
+q164 10 315.5 -46.5t261 -160.5t175 -250.5t65.5 -308.5zM994 800q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5zM1282 768q0 -122 -53.5 -228.5t-146.5 -177.5q-8 -6 -16 -2t-10 14q-6 52 -29 92q-7 10 3 20
+q58 54 91 127t33 155q0 111 -58.5 204t-157.5 141.5t-212 36.5q-133 -15 -229 -113t-109 -231q-10 -92 23.5 -176t98.5 -144q10 -10 3 -20q-24 -41 -29 -93q-2 -9 -10 -13t-16 2q-95 74 -148.5 183t-51.5 234q3 131 69 244t177 181.5t241 74.5q144 7 268 -60t196.5 -187.5
+t72.5 -263.5z" />
+    <glyph glyph-name="uniF2D0" unicode="&#xf2d0;" horiz-adv-x="1792" 
+d="M256 128h1280v768h-1280v-768zM1792 1248v-1216q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2D1" unicode="&#xf2d1;" horiz-adv-x="1792" 
+d="M1792 224v-192q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v192q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2D2" unicode="&#xf2d2;" horiz-adv-x="2048" 
+d="M256 0h768v512h-768v-512zM1280 512h512v768h-768v-256h96q66 0 113 -47t47 -113v-352zM2048 1376v-960q0 -66 -47 -113t-113 -47h-608v-352q0 -66 -47 -113t-113 -47h-960q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h608v352q0 66 47 113t113 47h960q66 0 113 -47
+t47 -113z" />
+    <glyph glyph-name="uniF2D3" unicode="&#xf2d3;" horiz-adv-x="1792" 
+d="M1175 215l146 146q10 10 10 23t-10 23l-233 233l233 233q10 10 10 23t-10 23l-146 146q-10 10 -23 10t-23 -10l-233 -233l-233 233q-10 10 -23 10t-23 -10l-146 -146q-10 -10 -10 -23t10 -23l233 -233l-233 -233q-10 -10 -10 -23t10 -23l146 -146q10 -10 23 -10t23 10
+l233 233l233 -233q10 -10 23 -10t23 10zM1792 1248v-1216q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2D4" unicode="&#xf2d4;" horiz-adv-x="1792" 
+d="M1257 425l-146 -146q-10 -10 -23 -10t-23 10l-169 169l-169 -169q-10 -10 -23 -10t-23 10l-146 146q-10 10 -10 23t10 23l169 169l-169 169q-10 10 -10 23t10 23l146 146q10 10 23 10t23 -10l169 -169l169 169q10 10 23 10t23 -10l146 -146q10 -10 10 -23t-10 -23
+l-169 -169l169 -169q10 -10 10 -23t-10 -23zM256 128h1280v1024h-1280v-1024zM1792 1248v-1216q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2D5" unicode="&#xf2d5;" horiz-adv-x="1792" 
+d="M1070 358l306 564h-654l-306 -564h654zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="uniF2D6" unicode="&#xf2d6;" horiz-adv-x="1794" 
+d="M1291 1060q-15 17 -35 8.5t-26 -28.5t5 -38q14 -17 40 -14.5t34 20.5t-18 52zM895 814q-8 -8 -19.5 -8t-18.5 8q-8 8 -8 19t8 18q7 8 18.5 8t19.5 -8q7 -7 7 -18t-7 -19zM1060 740l-35 -35q-12 -13 -29.5 -13t-30.5 13l-38 38q-12 13 -12 30t12 30l35 35q12 12 29.5 12
+t30.5 -12l38 -39q12 -12 12 -29.5t-12 -29.5zM951 870q-7 -8 -18.5 -8t-19.5 8q-7 8 -7 19t7 19q8 8 19 8t19 -8t8 -19t-8 -19zM1354 968q-34 -64 -107.5 -85.5t-127.5 16.5q-38 28 -61 66.5t-21 87.5t39 92t75.5 53t70.5 -5t70 -51q2 -2 13 -12.5t14.5 -13.5t13 -13.5
+t12.5 -15.5t10 -15.5t8.5 -18t4 -18.5t1 -21t-5 -22t-9.5 -24zM1555 486q3 20 -8.5 34.5t-27.5 21.5t-33 17t-23 20q-40 71 -84 98.5t-113 11.5q19 13 40 18.5t33 4.5l12 -1q2 45 -34 90q6 20 6.5 40.5t-2.5 30.5l-3 10q43 24 71 65t34 91q10 84 -43 150.5t-137 76.5
+q-60 7 -114 -18.5t-82 -74.5q-30 -51 -33.5 -101t14.5 -87t43.5 -64t56.5 -42q-45 4 -88 36t-57 88q-28 108 32 222q-16 21 -29 32q-50 0 -89 -19q19 24 42 37t36 14l13 1q0 50 -13 78q-10 21 -32.5 28.5t-47 -3.5t-37.5 -40q2 4 4 7q-7 -28 -6.5 -75.5t19 -117t48.5 -122.5
+q-25 -14 -47 -36q-35 -16 -85.5 -70.5t-84.5 -101.5l-33 -46q-90 -34 -181 -125.5t-75 -162.5q1 -16 11 -27q-15 -12 -30 -30q-21 -25 -21 -54t21.5 -40t63.5 6q41 19 77 49.5t55 60.5q-2 2 -6.5 5t-20.5 7.5t-33 3.5q23 5 51 12.5t40 10t27.5 6t26 4t23.5 0.5q14 -7 22 34
+q7 37 7 90q0 102 -40 150q106 -103 101 -219q-1 -29 -15 -50t-27 -27l-13 -6q-4 -7 -19 -32t-26 -45.5t-26.5 -52t-25 -61t-17 -63t-6.5 -66.5t10 -63q-35 54 -37 80q-22 -24 -34.5 -39t-33.5 -42t-30.5 -46t-16.5 -41t-0.5 -38t25.5 -27q45 -25 144 64t190.5 221.5
+t122.5 228.5q86 52 145 115.5t86 119.5q47 -93 154 -178q104 -83 167 -80q39 2 46 43zM1794 640q0 -182 -71 -348t-191 -286t-286.5 -191t-348.5 -71t-348.5 71t-286.5 191t-191 286t-71 348t71 348t191 286t286.5 191t348.5 71t348.5 -71t286.5 -191t191 -286t71 -348z" />
+    <glyph glyph-name="uniF2D7" unicode="&#xf2d7;" 
+d="M518 1353v-655q103 -1 191.5 1.5t125.5 5.5l37 3q68 2 90.5 24.5t39.5 94.5l33 142h103l-14 -322l7 -319h-103l-29 127q-15 68 -45 93t-84 26q-87 8 -352 8v-556q0 -78 43.5 -115.5t133.5 -37.5h357q35 0 59.5 2t55 7.5t54 18t48.5 32t46 50.5t39 73l93 216h89
+q-6 -37 -31.5 -252t-30.5 -276q-146 5 -263.5 8t-162.5 4h-44h-628l-376 -12v102l127 25q67 13 91.5 37t25.5 79l8 643q3 402 -8 645q-2 61 -25.5 84t-91.5 36l-127 24v102l376 -12h702q139 0 374 27q-6 -68 -14 -194.5t-12 -219.5l-5 -92h-93l-32 124q-31 121 -74 179.5
+t-113 58.5h-548q-28 0 -35.5 -8.5t-7.5 -30.5z" />
+    <glyph glyph-name="uniF2D8" unicode="&#xf2d8;" 
+d="M922 739v-182q0 -4 0.5 -15t0 -15l-1.5 -12t-3.5 -11.5t-6.5 -7.5t-11 -5.5t-16 -1.5v309q9 0 16 -1t11 -5t6.5 -5.5t3.5 -9.5t1 -10.5v-13.5v-14zM1238 643v-121q0 -1 0.5 -12.5t0 -15.5t-2.5 -11.5t-7.5 -10.5t-13.5 -3q-9 0 -14 9q-4 10 -4 165v7v8.5v9t1.5 8.5l3.5 7
+t5 5.5t8 1.5q6 0 10 -1.5t6.5 -4.5t4 -6t2 -8.5t0.5 -8v-9.5v-9zM180 407h122v472h-122v-472zM614 407h106v472h-159l-28 -221q-20 148 -32 221h-158v-472h107v312l45 -312h76l43 319v-319zM1039 712q0 67 -5 90q-3 16 -11 28.5t-17 20.5t-25 14t-26.5 8.5t-31 4t-29 1.5
+h-29.5h-12h-91v-472h56q169 -1 197 24.5t25 180.5q-1 62 -1 100zM1356 515v133q0 29 -2 45t-9.5 33.5t-24.5 25t-46 7.5q-46 0 -77 -34v154h-117v-472h110l7 30q30 -36 77 -36q50 0 66 30.5t16 83.5zM1536 1248v-1216q0 -66 -47 -113t-113 -47h-1216q-66 0 -113 47t-47 113
+v1216q0 66 47 113t113 47h1216q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2D9" unicode="&#xf2d9;" horiz-adv-x="2176" 
+d="M1143 -197q-6 1 -11 4q-13 8 -36 23t-86 65t-116.5 104.5t-112 140t-89.5 172.5q-17 3 -175 37q66 -213 235 -362t391 -184zM502 409l168 -28q-25 76 -41 167.5t-19 145.5l-4 53q-84 -82 -121 -224q5 -65 17 -114zM612 1018q-43 -64 -77 -148q44 46 74 68zM2049 584
+q0 161 -62 307t-167.5 252t-250.5 168.5t-304 62.5q-147 0 -281 -52.5t-240 -148.5q-30 -58 -45 -160q60 51 143 83.5t158.5 43t143 13.5t108.5 -1l40 -3q33 -1 53 -15.5t24.5 -33t6.5 -37t-1 -28.5q-126 11 -227.5 0.5t-183 -43.5t-142.5 -71.5t-131 -98.5
+q4 -36 11.5 -92.5t35.5 -178t62 -179.5q123 -6 247.5 14.5t214.5 53.5t162.5 67t109.5 59l37 24q22 16 39.5 20.5t30.5 -5t17 -34.5q14 -97 -39 -121q-208 -97 -467 -134q-135 -20 -317 -16q41 -96 110 -176.5t137 -127t130.5 -79t101.5 -43.5l39 -12q143 -23 263 15
+q195 99 314 289t119 418zM2123 621q-14 -135 -40 -212q-70 -208 -181.5 -346.5t-318.5 -253.5q-48 -33 -82 -44q-72 -26 -163 -16q-36 -3 -73 -3q-283 0 -504.5 173t-295.5 442q-1 0 -4 0.5t-5 0.5q-6 -50 2.5 -112.5t26 -115t36 -98t31.5 -71.5l14 -26q8 -12 54 -82
+q-71 38 -124.5 106.5t-78.5 140t-39.5 137t-17.5 107.5l-2 42q-5 2 -33.5 12.5t-48.5 18t-53 20.5t-57.5 25t-50 25.5t-42.5 27t-25 25.5q19 -10 50.5 -25.5t113 -45.5t145.5 -38l2 32q11 149 94 290q41 202 176 365q28 115 81 214q15 28 32 45t49 32q158 74 303.5 104
+t302 11t306.5 -97q220 -115 333 -336t87 -474z" />
+    <glyph glyph-name="uniF2DA" unicode="&#xf2da;" horiz-adv-x="1792" 
+d="M1341 752q29 44 -6.5 129.5t-121.5 142.5q-58 39 -125.5 53.5t-118 4.5t-68.5 -37q-12 -23 -4.5 -28t42.5 -10q23 -3 38.5 -5t44.5 -9.5t56 -17.5q36 -13 67.5 -31.5t53 -37t40 -38.5t30.5 -38t22 -34.5t16.5 -28.5t12 -18.5t10.5 -6t11 9.5zM1704 178
+q-52 -127 -148.5 -220t-214.5 -141.5t-253 -60.5t-266 13.5t-251 91t-210 161.5t-141.5 235.5t-46.5 303.5q1 41 8.5 84.5t12.5 64t24 80.5t23 73q-51 -208 1 -397t173 -318t291 -206t346 -83t349 74.5t289 244.5q20 27 18 14q0 -4 -4 -14zM1465 627q0 -104 -40.5 -199
+t-108.5 -164t-162 -109.5t-198 -40.5t-198 40.5t-162 109.5t-108.5 164t-40.5 199t40.5 199t108.5 164t162 109.5t198 40.5t198 -40.5t162 -109.5t108.5 -164t40.5 -199zM1752 915q-65 147 -180.5 251t-253 153.5t-292 53.5t-301 -36.5t-275.5 -129t-220 -211.5t-131 -297
+t-10 -373q-49 161 -51.5 311.5t35.5 272.5t109 227t165.5 180.5t207 126t232 71t242.5 9t236 -54t216 -124.5t178 -197q33 -50 62 -121t31 -112zM1690 573q12 244 -136.5 416t-396.5 240q-8 0 -10 5t24 8q125 -4 230 -50t173 -120t116 -168.5t58.5 -199t-1 -208
+t-61.5 -197.5t-122.5 -167t-185 -117.5t-248.5 -46.5q108 30 201.5 80t174 123t129.5 176.5t55 225.5z" />
+    <glyph glyph-name="uniF2DB" unicode="&#xf2db;" 
+d="M192 256v-128h-112q-16 0 -16 16v16h-48q-16 0 -16 16v32q0 16 16 16h48v16q0 16 16 16h112zM192 512v-128h-112q-16 0 -16 16v16h-48q-16 0 -16 16v32q0 16 16 16h48v16q0 16 16 16h112zM192 768v-128h-112q-16 0 -16 16v16h-48q-16 0 -16 16v32q0 16 16 16h48v16
+q0 16 16 16h112zM192 1024v-128h-112q-16 0 -16 16v16h-48q-16 0 -16 16v32q0 16 16 16h48v16q0 16 16 16h112zM192 1280v-128h-112q-16 0 -16 16v16h-48q-16 0 -16 16v32q0 16 16 16h48v16q0 16 16 16h112zM1280 1440v-1472q0 -40 -28 -68t-68 -28h-832q-40 0 -68 28
+t-28 68v1472q0 40 28 68t68 28h832q40 0 68 -28t28 -68zM1536 208v-32q0 -16 -16 -16h-48v-16q0 -16 -16 -16h-112v128h112q16 0 16 -16v-16h48q16 0 16 -16zM1536 464v-32q0 -16 -16 -16h-48v-16q0 -16 -16 -16h-112v128h112q16 0 16 -16v-16h48q16 0 16 -16zM1536 720v-32
+q0 -16 -16 -16h-48v-16q0 -16 -16 -16h-112v128h112q16 0 16 -16v-16h48q16 0 16 -16zM1536 976v-32q0 -16 -16 -16h-48v-16q0 -16 -16 -16h-112v128h112q16 0 16 -16v-16h48q16 0 16 -16zM1536 1232v-32q0 -16 -16 -16h-48v-16q0 -16 -16 -16h-112v128h112q16 0 16 -16v-16
+h48q16 0 16 -16z" />
+    <glyph glyph-name="uniF2DC" unicode="&#xf2dc;" horiz-adv-x="1664" 
+d="M1566 419l-167 -33l186 -107q23 -13 29.5 -38.5t-6.5 -48.5q-14 -23 -39 -29.5t-48 6.5l-186 106l55 -160q13 -38 -12 -63.5t-60.5 -20.5t-48.5 42l-102 300l-271 156v-313l208 -238q16 -18 17 -39t-11 -36.5t-28.5 -25t-37 -5.5t-36.5 22l-112 128v-214q0 -26 -19 -45
+t-45 -19t-45 19t-19 45v214l-112 -128q-16 -18 -36.5 -22t-37 5.5t-28.5 25t-11 36.5t17 39l208 238v313l-271 -156l-102 -300q-13 -37 -48.5 -42t-60.5 20.5t-12 63.5l55 160l-186 -106q-23 -13 -48 -6.5t-39 29.5q-13 23 -6.5 48.5t29.5 38.5l186 107l-167 33
+q-29 6 -42 29t-8.5 46.5t25.5 40t50 10.5l310 -62l271 157l-271 157l-310 -62q-4 -1 -13 -1q-27 0 -44 18t-19 40t11 43t40 26l167 33l-186 107q-23 13 -29.5 38.5t6.5 48.5t39 30t48 -7l186 -106l-55 160q-13 38 12 63.5t60.5 20.5t48.5 -42l102 -300l271 -156v313
+l-208 238q-16 18 -17 39t11 36.5t28.5 25t37 5.5t36.5 -22l112 -128v214q0 26 19 45t45 19t45 -19t19 -45v-214l112 128q16 18 36.5 22t37 -5.5t28.5 -25t11 -36.5t-17 -39l-208 -238v-313l271 156l102 300q13 37 48.5 42t60.5 -20.5t12 -63.5l-55 -160l186 106
+q23 13 48 6.5t39 -29.5q13 -23 6.5 -48.5t-29.5 -38.5l-186 -107l167 -33q27 -5 40 -26t11 -43t-19 -40t-44 -18q-9 0 -13 1l-310 62l-271 -157l271 -157l310 62q29 6 50 -10.5t25.5 -40t-8.5 -46.5t-42 -29z" />
+    <glyph glyph-name="uniF2DD" unicode="&#xf2dd;" horiz-adv-x="1792" 
+d="M1473 607q7 118 -33 226.5t-113 189t-177 131t-221 57.5q-116 7 -225.5 -32t-192 -110.5t-135 -175t-59.5 -220.5q-7 -118 33 -226.5t113 -189t177.5 -131t221.5 -57.5q155 -9 293 59t224 195.5t94 283.5zM1792 1536l-349 -348q120 -117 180.5 -272t50.5 -321
+q-11 -183 -102 -339t-241 -255.5t-332 -124.5l-999 -132l347 347q-120 116 -180.5 271.5t-50.5 321.5q11 184 102 340t241.5 255.5t332.5 124.5q167 22 500 66t500 66z" />
+    <glyph glyph-name="uniF2DE" unicode="&#xf2de;" horiz-adv-x="1792" 
+d="M948 508l163 -329h-51l-175 350l-171 -350h-49l179 374l-78 33l21 49l240 -102l-21 -50zM563 1100l304 -130l-130 -304l-304 130zM907 915l240 -103l-103 -239l-239 102zM1188 765l191 -81l-82 -190l-190 81zM1680 640q0 159 -62 304t-167.5 250.5t-250.5 167.5t-304 62
+t-304 -62t-250.5 -167.5t-167.5 -250.5t-62 -304t62 -304t167.5 -250.5t250.5 -167.5t304 -62t304 62t250.5 167.5t167.5 250.5t62 304zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71
+t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="uniF2E0" unicode="&#xf2e0;" horiz-adv-x="1920" 
+d="M1334 302q-4 24 -27.5 34t-49.5 10.5t-48.5 12.5t-25.5 38q-5 47 33 139.5t75 181t32 127.5q-14 101 -117 103q-45 1 -75 -16l-3 -2l-5 -2.5t-4.5 -2t-5 -2t-5 -0.5t-6 1.5t-6 3.5t-6.5 5q-3 2 -9 8.5t-9 9t-8.5 7.5t-9.5 7.5t-9.5 5.5t-11 4.5t-11.5 2.5q-30 5 -48 -3
+t-45 -31q-1 -1 -9 -8.5t-12.5 -11t-15 -10t-16.5 -5.5t-17 3q-54 27 -84 40q-41 18 -94 -5t-76 -65q-16 -28 -41 -98.5t-43.5 -132.5t-40 -134t-21.5 -73q-22 -69 18.5 -119t110.5 -46q30 2 50.5 15t38.5 46q7 13 79 199.5t77 194.5q6 11 21.5 18t29.5 0q27 -15 21 -53
+q-2 -18 -51 -139.5t-50 -132.5q-6 -38 19.5 -56.5t60.5 -7t55 49.5q4 8 45.5 92t81.5 163.5t46 88.5q20 29 41 28q29 0 25 -38q-2 -16 -65.5 -147.5t-70.5 -159.5q-12 -53 13 -103t74 -74q17 -9 51 -15.5t71.5 -8t62.5 14t20 48.5zM383 86q3 -15 -5 -27.5t-23 -15.5
+q-14 -3 -26.5 5t-15.5 23q-3 14 5 27t22 16t27 -5t16 -23zM953 -177q12 -17 8.5 -37.5t-20.5 -32.5t-37.5 -8t-32.5 21q-11 17 -7.5 37.5t20.5 32.5t37.5 8t31.5 -21zM177 635q-18 -27 -49.5 -33t-57.5 13q-26 18 -32 50t12 58q18 27 49.5 33t57.5 -12q26 -19 32 -50.5
+t-12 -58.5zM1467 -42q19 -28 13 -61.5t-34 -52.5t-60.5 -13t-51.5 34t-13 61t33 53q28 19 60.5 13t52.5 -34zM1579 562q69 -113 42.5 -244.5t-134.5 -207.5q-90 -63 -199 -60q-20 -80 -84.5 -127t-143.5 -44.5t-140 57.5q-12 -9 -13 -10q-103 -71 -225 -48.5t-193 126.5
+q-50 73 -53 164q-83 14 -142.5 70.5t-80.5 128t-2 152t81 138.5q-36 60 -38 128t24.5 125t79.5 98.5t121 50.5q32 85 99 148t146.5 91.5t168 17t159.5 -66.5q72 21 140 17.5t128.5 -36t104.5 -80t67.5 -115t17.5 -140.5q52 -16 87 -57t45.5 -89t-5.5 -99.5t-58 -87.5z
+M455 1222q14 -20 9.5 -44.5t-24.5 -38.5q-19 -14 -43.5 -9.5t-37.5 24.5q-14 20 -9.5 44.5t24.5 38.5q19 14 43.5 9.5t37.5 -24.5zM614 1503q4 -16 -5 -30.5t-26 -18.5t-31 5.5t-18 26.5q-3 17 6.5 31t25.5 18q17 4 31 -5.5t17 -26.5zM1800 555q4 -20 -6.5 -37t-30.5 -21
+q-19 -4 -36 6.5t-21 30.5t6.5 37t30.5 22q20 4 36.5 -7.5t20.5 -30.5zM1136 1448q16 -27 8.5 -58.5t-35.5 -47.5q-27 -16 -57.5 -8.5t-46.5 34.5q-16 28 -8.5 59t34.5 48t58 9t47 -36zM1882 792q4 -15 -4 -27.5t-23 -16.5q-15 -3 -27.5 5.5t-15.5 22.5q-3 15 5 28t23 16
+q14 3 26.5 -5t15.5 -23zM1691 1033q15 -22 10.5 -49t-26.5 -43q-22 -15 -49 -10t-42 27t-10 49t27 43t48.5 11t41.5 -28z" />
+    <glyph glyph-name="uniF2E1" unicode="&#xf2e1;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2E2" unicode="&#xf2e2;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2E3" unicode="&#xf2e3;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2E4" unicode="&#xf2e4;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2E5" unicode="&#xf2e5;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2E6" unicode="&#xf2e6;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2E7" unicode="&#xf2e7;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="_698" unicode="&#xf2e8;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2E9" unicode="&#xf2e9;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2EA" unicode="&#xf2ea;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2EB" unicode="&#xf2eb;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2EC" unicode="&#xf2ec;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2ED" unicode="&#xf2ed;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2EE" unicode="&#xf2ee;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="lessequal" unicode="&#xf500;" horiz-adv-x="1792" 
+ />
+  </font>
+</defs></svg>
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/fonts/fontawesome-webfont.ttf b/pluss-manage-page/src/main/resources/static/resources/auth/fonts/fontawesome-webfont.ttf
new file mode 100644
index 0000000..0f2d103
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/fonts/fontawesome-webfont.ttf differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/fonts/fontawesome-webfont.woff b/pluss-manage-page/src/main/resources/static/resources/auth/fonts/fontawesome-webfont.woff
new file mode 100644
index 0000000..4d19205
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/fonts/fontawesome-webfont.woff differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/fonts/fontawesome-webfont.woff2 b/pluss-manage-page/src/main/resources/static/resources/auth/fonts/fontawesome-webfont.woff2
new file mode 100644
index 0000000..90bf1e9
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/fonts/fontawesome-webfont.woff2 differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/image/index/bg1.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/image/index/bg1.jpg
new file mode 100644
index 0000000..a5e87a2
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/image/index/bg1.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/image/index/bg2.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/image/index/bg2.jpg
new file mode 100644
index 0000000..2739a3e
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/image/index/bg2.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/image/index/bg3.png b/pluss-manage-page/src/main/resources/static/resources/auth/image/index/bg3.png
new file mode 100644
index 0000000..296ebe6
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/image/index/bg3.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/image/index/bg4.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/image/index/bg4.jpg
new file mode 100644
index 0000000..d1f8d1f
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/image/index/bg4.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/image/index/bg5.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/image/index/bg5.jpg
new file mode 100644
index 0000000..3ab588e
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/image/index/bg5.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/image/index/h1.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/image/index/h1.jpg
new file mode 100644
index 0000000..79d2310
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/image/index/h1.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/image/index/h1.png b/pluss-manage-page/src/main/resources/static/resources/auth/image/index/h1.png
new file mode 100644
index 0000000..00e91cf
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/image/index/h1.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/image/index/icon.png b/pluss-manage-page/src/main/resources/static/resources/auth/image/index/icon.png
new file mode 100644
index 0000000..66794f9
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/image/index/icon.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/image/upload/37f6898a-dd6f-4576-b7e2-ab7789e91021.png b/pluss-manage-page/src/main/resources/static/resources/auth/image/upload/37f6898a-dd6f-4576-b7e2-ab7789e91021.png
new file mode 100644
index 0000000..d01a59e
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/image/upload/37f6898a-dd6f-4576-b7e2-ab7789e91021.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/image/upload/4a177a93-155b-4e21-b4e8-cea3e73c9379.png b/pluss-manage-page/src/main/resources/static/resources/auth/image/upload/4a177a93-155b-4e21-b4e8-cea3e73c9379.png
new file mode 100644
index 0000000..d01a59e
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/image/upload/4a177a93-155b-4e21-b4e8-cea3e73c9379.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/image/upload/52ccbf9c-2d73-4ef5-a5be-5f7dd82a8748.png b/pluss-manage-page/src/main/resources/static/resources/auth/image/upload/52ccbf9c-2d73-4ef5-a5be-5f7dd82a8748.png
new file mode 100644
index 0000000..d01a59e
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/image/upload/52ccbf9c-2d73-4ef5-a5be-5f7dd82a8748.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/image/upload/5b6697e1-47c9-4b3a-bb9f-74eb84287fb6.png b/pluss-manage-page/src/main/resources/static/resources/auth/image/upload/5b6697e1-47c9-4b3a-bb9f-74eb84287fb6.png
new file mode 100644
index 0000000..d01a59e
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/image/upload/5b6697e1-47c9-4b3a-bb9f-74eb84287fb6.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/image/upload/5d979108-09a0-4154-b861-11af5dbdd029.png b/pluss-manage-page/src/main/resources/static/resources/auth/image/upload/5d979108-09a0-4154-b861-11af5dbdd029.png
new file mode 100644
index 0000000..d01a59e
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/image/upload/5d979108-09a0-4154-b861-11af5dbdd029.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/image/upload/9e1544d9-19e5-49d9-92c3-0b5a4606f1c6.png b/pluss-manage-page/src/main/resources/static/resources/auth/image/upload/9e1544d9-19e5-49d9-92c3-0b5a4606f1c6.png
new file mode 100644
index 0000000..d01a59e
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/image/upload/9e1544d9-19e5-49d9-92c3-0b5a4606f1c6.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/image/upload/a8bf96ad-7f5a-4bb4-a207-d59913f4bf96.png b/pluss-manage-page/src/main/resources/static/resources/auth/image/upload/a8bf96ad-7f5a-4bb4-a207-d59913f4bf96.png
new file mode 100644
index 0000000..d01a59e
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/image/upload/a8bf96ad-7f5a-4bb4-a207-d59913f4bf96.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/image/upload/be3d6c1b-e582-4322-ad54-3201d2d1523e.png b/pluss-manage-page/src/main/resources/static/resources/auth/image/upload/be3d6c1b-e582-4322-ad54-3201d2d1523e.png
new file mode 100644
index 0000000..6afd53c
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/image/upload/be3d6c1b-e582-4322-ad54-3201d2d1523e.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/images/1.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/images/1.jpg
new file mode 100644
index 0000000..794d2b5
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/images/1.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/images/1.png b/pluss-manage-page/src/main/resources/static/resources/auth/images/1.png
new file mode 100644
index 0000000..f0e4c7d
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/images/1.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/images/2.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/images/2.jpg
new file mode 100644
index 0000000..741a8fb
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/images/2.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/images/3.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/images/3.jpg
new file mode 100644
index 0000000..ceee8b5
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/images/3.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/images/4.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/images/4.jpg
new file mode 100644
index 0000000..c612f86
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/images/4.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/images/alert.png b/pluss-manage-page/src/main/resources/static/resources/auth/images/alert.png
new file mode 100644
index 0000000..71e3de6
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/images/alert.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/images/bg.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/images/bg.jpg
new file mode 100644
index 0000000..ce3d599
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/images/bg.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/images/cloud.png b/pluss-manage-page/src/main/resources/static/resources/auth/images/cloud.png
new file mode 100644
index 0000000..d49e1fa
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/images/cloud.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/images/cloudnest/account.png b/pluss-manage-page/src/main/resources/static/resources/auth/images/cloudnest/account.png
new file mode 100644
index 0000000..c1f44e0
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/images/cloudnest/account.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/images/cloudnest/app.png b/pluss-manage-page/src/main/resources/static/resources/auth/images/cloudnest/app.png
new file mode 100644
index 0000000..eda97f3
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/images/cloudnest/app.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/images/cloudnest/bottom.png b/pluss-manage-page/src/main/resources/static/resources/auth/images/cloudnest/bottom.png
new file mode 100644
index 0000000..b61365c
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/images/cloudnest/bottom.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/images/cloudnest/btn_bg.png b/pluss-manage-page/src/main/resources/static/resources/auth/images/cloudnest/btn_bg.png
new file mode 100644
index 0000000..10e0bcb
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/images/cloudnest/btn_bg.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/images/cloudnest/character.png b/pluss-manage-page/src/main/resources/static/resources/auth/images/cloudnest/character.png
new file mode 100644
index 0000000..338d2e5
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/images/cloudnest/character.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/images/cloudnest/cloud.png b/pluss-manage-page/src/main/resources/static/resources/auth/images/cloudnest/cloud.png
new file mode 100644
index 0000000..4744454
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/images/cloudnest/cloud.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/images/cloudnest/customer.png b/pluss-manage-page/src/main/resources/static/resources/auth/images/cloudnest/customer.png
new file mode 100644
index 0000000..687930f
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/images/cloudnest/customer.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/images/cloudnest/error_bg.png b/pluss-manage-page/src/main/resources/static/resources/auth/images/cloudnest/error_bg.png
new file mode 100644
index 0000000..f0a6901
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/images/cloudnest/error_bg.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/images/cloudnest/head_bg.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/images/cloudnest/head_bg.jpg
new file mode 100644
index 0000000..f903098
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/images/cloudnest/head_bg.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/images/cloudnest/login_bg.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/images/cloudnest/login_bg.jpg
new file mode 100644
index 0000000..d1e0c7b
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/images/cloudnest/login_bg.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/images/cloudnest/login_bg.png b/pluss-manage-page/src/main/resources/static/resources/auth/images/cloudnest/login_bg.png
new file mode 100644
index 0000000..fbc80a8
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/images/cloudnest/login_bg.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/images/cloudnest/logo.png b/pluss-manage-page/src/main/resources/static/resources/auth/images/cloudnest/logo.png
new file mode 100644
index 0000000..56c1b4b
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/images/cloudnest/logo.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/images/cloudnest/member.png b/pluss-manage-page/src/main/resources/static/resources/auth/images/cloudnest/member.png
new file mode 100644
index 0000000..174b3a1
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/images/cloudnest/member.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/images/cloudnest/merchant.png b/pluss-manage-page/src/main/resources/static/resources/auth/images/cloudnest/merchant.png
new file mode 100644
index 0000000..e3e1177
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/images/cloudnest/merchant.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/images/cloudnest/order.png b/pluss-manage-page/src/main/resources/static/resources/auth/images/cloudnest/order.png
new file mode 100644
index 0000000..1c10a41
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/images/cloudnest/order.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/images/cloudnest/password.png b/pluss-manage-page/src/main/resources/static/resources/auth/images/cloudnest/password.png
new file mode 100644
index 0000000..3266c58
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/images/cloudnest/password.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/images/code.png b/pluss-manage-page/src/main/resources/static/resources/auth/images/code.png
new file mode 100644
index 0000000..233b881
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/images/code.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/images/cube.png b/pluss-manage-page/src/main/resources/static/resources/auth/images/cube.png
new file mode 100644
index 0000000..986218a
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/images/cube.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/images/default_use_image.png b/pluss-manage-page/src/main/resources/static/resources/auth/images/default_use_image.png
new file mode 100644
index 0000000..9a2d220
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/images/default_use_image.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/images/develop.png b/pluss-manage-page/src/main/resources/static/resources/auth/images/develop.png
new file mode 100644
index 0000000..161c1ab
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/images/develop.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/images/index.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/images/index.jpg
new file mode 100644
index 0000000..dc6a92f
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/images/index.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/images/left.png b/pluss-manage-page/src/main/resources/static/resources/auth/images/left.png
new file mode 100644
index 0000000..5c4411f
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/images/left.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/images/loginbg.png b/pluss-manage-page/src/main/resources/static/resources/auth/images/loginbg.png
new file mode 100644
index 0000000..252c0ac
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/images/loginbg.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/images/logo.png b/pluss-manage-page/src/main/resources/static/resources/auth/images/logo.png
new file mode 100644
index 0000000..c17a378
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/images/logo.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/images/logobig.png b/pluss-manage-page/src/main/resources/static/resources/auth/images/logobig.png
new file mode 100644
index 0000000..1cbbf7e
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/images/logobig.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/images/pass.png b/pluss-manage-page/src/main/resources/static/resources/auth/images/pass.png
new file mode 100644
index 0000000..9fd0fe7
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/images/pass.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/images/password.png b/pluss-manage-page/src/main/resources/static/resources/auth/images/password.png
new file mode 100644
index 0000000..89b1c4f
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/images/password.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/images/pic.png b/pluss-manage-page/src/main/resources/static/resources/auth/images/pic.png
new file mode 100644
index 0000000..de6a075
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/images/pic.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/images/project.png b/pluss-manage-page/src/main/resources/static/resources/auth/images/project.png
new file mode 100644
index 0000000..986218a
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/images/project.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/images/setting.png b/pluss-manage-page/src/main/resources/static/resources/auth/images/setting.png
new file mode 100644
index 0000000..986218a
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/images/setting.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/images/tel.png b/pluss-manage-page/src/main/resources/static/resources/auth/images/tel.png
new file mode 100644
index 0000000..f53dc12
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/images/tel.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/images/title.png b/pluss-manage-page/src/main/resources/static/resources/auth/images/title.png
new file mode 100644
index 0000000..4ad292f
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/images/title.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/images/user.png b/pluss-manage-page/src/main/resources/static/resources/auth/images/user.png
new file mode 100644
index 0000000..ac5084c
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/images/user.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/images/web.png b/pluss-manage-page/src/main/resources/static/resources/auth/images/web.png
new file mode 100644
index 0000000..9f51499
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/images/web.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/advertising.png b/pluss-manage-page/src/main/resources/static/resources/auth/img/advertising.png
new file mode 100644
index 0000000..5c53029
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/advertising.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/button_register.png b/pluss-manage-page/src/main/resources/static/resources/auth/img/button_register.png
new file mode 100644
index 0000000..d727d95
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/button_register.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/button_register_press.png b/pluss-manage-page/src/main/resources/static/resources/auth/img/button_register_press.png
new file mode 100644
index 0000000..97a1ef2
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/button_register_press.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/carousel/1.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/carousel/1.jpg
new file mode 100644
index 0000000..ae3931d
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/carousel/1.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/carousel/2.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/carousel/2.jpg
new file mode 100644
index 0000000..e1c20fd
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/carousel/2.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/carousel/3.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/carousel/3.jpg
new file mode 100644
index 0000000..82bdf03
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/carousel/3.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/carousel/4.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/carousel/4.jpg
new file mode 100644
index 0000000..3a3c739
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/carousel/4.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/index/above_part_bg.png b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/above_part_bg.png
new file mode 100644
index 0000000..452d27f
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/above_part_bg.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/index/above_part_bg.psd b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/above_part_bg.psd
new file mode 100644
index 0000000..2688908
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/above_part_bg.psd differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/index/banner01.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/banner01.jpg
new file mode 100644
index 0000000..ccc0d6a
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/banner01.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/index/binding_account.png b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/binding_account.png
new file mode 100644
index 0000000..ed44209
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/binding_account.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/index/header_bg.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/header_bg.jpg
new file mode 100644
index 0000000..e81ff71
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/header_bg.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/index/helpcenter_btn.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/helpcenter_btn.jpg
new file mode 100644
index 0000000..738b72c
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/helpcenter_btn.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/index/helpcenter_btn_hover.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/helpcenter_btn_hover.jpg
new file mode 100644
index 0000000..06f8152
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/helpcenter_btn_hover.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/index/hidebtn.png b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/hidebtn.png
new file mode 100644
index 0000000..92506d5
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/hidebtn.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/index/home.png b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/home.png
new file mode 100644
index 0000000..72e20a4
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/home.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/index/hot.png b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/hot.png
new file mode 100644
index 0000000..f3e81e9
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/hot.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/index/index_btn.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/index_btn.jpg
new file mode 100644
index 0000000..b84efe1
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/index_btn.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/index/index_btn_hover.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/index_btn_hover.jpg
new file mode 100644
index 0000000..21a9ab3
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/index_btn_hover.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/index/index_mr_bg.png b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/index_mr_bg.png
new file mode 100644
index 0000000..ab90582
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/index_mr_bg.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/index/intro_above_lbg.png b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/intro_above_lbg.png
new file mode 100644
index 0000000..bc9b779
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/intro_above_lbg.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/index/intro_above_rbg.png b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/intro_above_rbg.png
new file mode 100644
index 0000000..930cbd0
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/intro_above_rbg.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/index/intro_content_bg.png b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/intro_content_bg.png
new file mode 100644
index 0000000..0d3f460
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/intro_content_bg.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/index/intro_middle_lbg.png b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/intro_middle_lbg.png
new file mode 100644
index 0000000..c18aa97
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/intro_middle_lbg.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/index/intro_middle_rbg.png b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/intro_middle_rbg.png
new file mode 100644
index 0000000..de82a83
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/intro_middle_rbg.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/index/logo.png b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/logo.png
new file mode 100644
index 0000000..b377251
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/logo.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/index/microevent.png b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/microevent.png
new file mode 100644
index 0000000..631c145
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/microevent.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/index/micromember.png b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/micromember.png
new file mode 100644
index 0000000..f925694
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/micromember.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/index/micropart_btn.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/micropart_btn.jpg
new file mode 100644
index 0000000..0057fd5
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/micropart_btn.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/index/micropart_btn_hover.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/micropart_btn_hover.jpg
new file mode 100644
index 0000000..d50e7b8
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/micropart_btn_hover.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/index/microsettings.png b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/microsettings.png
new file mode 100644
index 0000000..8338600
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/microsettings.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/index/microui.png b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/microui.png
new file mode 100644
index 0000000..afb3213
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/microui.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/index/mircoindex.png b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/mircoindex.png
new file mode 100644
index 0000000..fbed11c
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/mircoindex.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/index/offenfuc_big01.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/offenfuc_big01.jpg
new file mode 100644
index 0000000..907b7dc
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/offenfuc_big01.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/index/offenfunc01.png b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/offenfunc01.png
new file mode 100644
index 0000000..8ba1cd0
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/offenfunc01.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/index/sys_setting.png b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/sys_setting.png
new file mode 100644
index 0000000..f7779a6
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/sys_setting.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/index/userimg.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/userimg.jpg
new file mode 100644
index 0000000..7a5f9ce
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/userimg.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/index/usersub_body.png b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/usersub_body.png
new file mode 100644
index 0000000..4b662c1
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/usersub_body.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/index/usersub_foot.png b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/usersub_foot.png
new file mode 100644
index 0000000..76e8e7c
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/usersub_foot.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/index/usersub_head.png b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/usersub_head.png
new file mode 100644
index 0000000..5e86770
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/usersub_head.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/index/常用功能色块.psd b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/常用功能色块.psd
new file mode 100644
index 0000000..31c55ab
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/常用功能色块.psd differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/index/甯哥敤鍔熻兘鑹插潡.psd b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/甯哥敤鍔熻兘鑹插潡.psd
new file mode 100644
index 0000000..94f56e9
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/index/甯哥敤鍔熻兘鑹插潡.psd differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/input-box_below.png b/pluss-manage-page/src/main/resources/static/resources/auth/img/input-box_below.png
new file mode 100644
index 0000000..9443ef3
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/input-box_below.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/input-box_header.png b/pluss-manage-page/src/main/resources/static/resources/auth/img/input-box_header.png
new file mode 100644
index 0000000..2eeaa79
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/input-box_header.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/land.png b/pluss-manage-page/src/main/resources/static/resources/auth/img/land.png
new file mode 100644
index 0000000..221f0bd
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/land.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/bg_03.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/bg_03.jpg
new file mode 100644
index 0000000..0231a37
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/bg_03.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/big-zs_03.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/big-zs_03.jpg
new file mode 100644
index 0000000..90f7ddf
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/big-zs_03.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/big-zs_15.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/big-zs_15.jpg
new file mode 100644
index 0000000..34033ee
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/big-zs_15.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/big-zs_17.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/big-zs_17.jpg
new file mode 100644
index 0000000..4887bf2
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/big-zs_17.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/body-bg_15.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/body-bg_15.jpg
new file mode 100644
index 0000000..a05148f
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/body-bg_15.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/down4.png b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/down4.png
new file mode 100644
index 0000000..2aa9eca
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/down4.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/dropdown_menu.png b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/dropdown_menu.png
new file mode 100644
index 0000000..2ba7352
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/dropdown_menu.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/footer_03.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/footer_03.jpg
new file mode 100644
index 0000000..8c5da69
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/footer_03.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/h-ico1.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/h-ico1.jpg
new file mode 100644
index 0000000..6193f22
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/h-ico1.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/h-ico2.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/h-ico2.jpg
new file mode 100644
index 0000000..0d45eb4
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/h-ico2.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/h-img_10.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/h-img_10.jpg
new file mode 100644
index 0000000..9b07d6c
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/h-img_10.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/ico1.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/ico1.jpg
new file mode 100644
index 0000000..a8b3c41
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/ico1.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/ico1.png b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/ico1.png
new file mode 100644
index 0000000..7503463
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/ico1.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/ico1_03.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/ico1_03.jpg
new file mode 100644
index 0000000..a246efc
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/ico1_03.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/ico2.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/ico2.jpg
new file mode 100644
index 0000000..521caae
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/ico2.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/ico2.png b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/ico2.png
new file mode 100644
index 0000000..3c3121e
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/ico2.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/ico3.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/ico3.jpg
new file mode 100644
index 0000000..7e8d81d
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/ico3.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/ico3.png b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/ico3.png
new file mode 100644
index 0000000..8f0f00a
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/ico3.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/ico4.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/ico4.jpg
new file mode 100644
index 0000000..062f6a9
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/ico4.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/ico4.png b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/ico4.png
new file mode 100644
index 0000000..544c608
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/ico4.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/ico5.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/ico5.jpg
new file mode 100644
index 0000000..6f64323
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/ico5.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/ico6.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/ico6.jpg
new file mode 100644
index 0000000..cfa60f1
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/ico6.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img-30.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img-30.jpg
new file mode 100644
index 0000000..650ef6e
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img-30.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img-31.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img-31.jpg
new file mode 100644
index 0000000..c88ddd7
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img-31.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img-34.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img-34.jpg
new file mode 100644
index 0000000..f8de1c7
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img-34.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img-35.png b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img-35.png
new file mode 100644
index 0000000..99f918f
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img-35.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img-back_03.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img-back_03.jpg
new file mode 100644
index 0000000..e0eee0f
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img-back_03.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img34_03.png b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img34_03.png
new file mode 100644
index 0000000..12241fc
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img34_03.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img_02.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img_02.jpg
new file mode 100644
index 0000000..074a68e
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img_02.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img_03.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img_03.jpg
new file mode 100644
index 0000000..4f658a3
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img_03.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img_05.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img_05.jpg
new file mode 100644
index 0000000..778643f
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img_05.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img_05_bak.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img_05_bak.jpg
new file mode 100644
index 0000000..95792e3
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img_05_bak.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img_07.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img_07.jpg
new file mode 100644
index 0000000..210133b
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img_07.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img_11.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img_11.jpg
new file mode 100644
index 0000000..7c4ef55
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img_11.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img_15.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img_15.jpg
new file mode 100644
index 0000000..fcd2b9b
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img_15.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img_16.png b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img_16.png
new file mode 100644
index 0000000..064f339
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img_16.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img_18.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img_18.jpg
new file mode 100644
index 0000000..c3f54b0
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img_18.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img_19.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img_19.jpg
new file mode 100644
index 0000000..d31daea
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img_19.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img_22.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img_22.jpg
new file mode 100644
index 0000000..2f3c448
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img_22.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img_29.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img_29.jpg
new file mode 100644
index 0000000..261a697
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img_29.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img_50.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img_50.jpg
new file mode 100644
index 0000000..2eb15e9
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img_50.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img_59.png b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img_59.png
new file mode 100644
index 0000000..6a6ca3e
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img_59.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img_63.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img_63.jpg
new file mode 100644
index 0000000..d9f51ec
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img_63.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img_68.png b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img_68.png
new file mode 100644
index 0000000..490424f
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img_68.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img_70.png b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img_70.png
new file mode 100644
index 0000000..f670275
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img_70.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img_72.png b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img_72.png
new file mode 100644
index 0000000..4f50637
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img_72.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img_75.png b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img_75.png
new file mode 100644
index 0000000..1238d7d
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img_75.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img_78.png b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img_78.png
new file mode 100644
index 0000000..79223a0
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/img_78.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/jt-img_03.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/jt-img_03.jpg
new file mode 100644
index 0000000..5ee4646
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/jt-img_03.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/jt1_03.png b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/jt1_03.png
new file mode 100644
index 0000000..e77699c
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/jt1_03.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/jt_07.png b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/jt_07.png
new file mode 100644
index 0000000..6123f44
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/jt_07.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/key.png b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/key.png
new file mode 100644
index 0000000..b17de76
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/key.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/left-bg_07.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/left-bg_07.jpg
new file mode 100644
index 0000000..121786c
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/left-bg_07.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/list.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/list.jpg
new file mode 100644
index 0000000..f11da12
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/list.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/login_01.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/login_01.jpg
new file mode 100644
index 0000000..be9477e
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/login_01.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/login_02.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/login_02.jpg
new file mode 100644
index 0000000..60c3052
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/login_02.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/login_03.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/login_03.jpg
new file mode 100644
index 0000000..9aae40a
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/login_03.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/login_04.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/login_04.jpg
new file mode 100644
index 0000000..80c310a
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/login_04.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/login_05.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/login_05.jpg
new file mode 100644
index 0000000..1c17972
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/login_05.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/login_06.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/login_06.jpg
new file mode 100644
index 0000000..4aac55c
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/login_06.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/login_07.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/login_07.jpg
new file mode 100644
index 0000000..cc62742
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/login_07.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/login_08.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/login_08.jpg
new file mode 100644
index 0000000..217ddab
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/login_08.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/login_09.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/login_09.jpg
new file mode 100644
index 0000000..66c59b4
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/login_09.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/login_10.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/login_10.jpg
new file mode 100644
index 0000000..95d87ec
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/login_10.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/loginno.png b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/loginno.png
new file mode 100644
index 0000000..7d5aa02
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/loginno.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/loginyes.png b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/loginyes.png
new file mode 100644
index 0000000..9eb5dcf
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/loginyes.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/logo.png b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/logo.png
new file mode 100644
index 0000000..821965a
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/logo.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/main_bg.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/main_bg.jpg
new file mode 100644
index 0000000..881697f
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/main_bg.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/msgIcon.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/msgIcon.jpg
new file mode 100644
index 0000000..ab4bb81
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/msgIcon.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/msgIcon.png b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/msgIcon.png
new file mode 100644
index 0000000..f2cea12
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/msgIcon.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/nav-top.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/nav-top.jpg
new file mode 100644
index 0000000..9bd6181
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/nav-top.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/password_bg.png b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/password_bg.png
new file mode 100644
index 0000000..b440121
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/password_bg.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/phoneIcon.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/phoneIcon.jpg
new file mode 100644
index 0000000..5ddd408
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/phoneIcon.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/phoneIcon.png b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/phoneIcon.png
new file mode 100644
index 0000000..73d369f
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/phoneIcon.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/qrcode.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/qrcode.jpg
new file mode 100644
index 0000000..c341cf1
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/qrcode.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/qrcode.png b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/qrcode.png
new file mode 100644
index 0000000..ed4d599
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/qrcode.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/span.gif b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/span.gif
new file mode 100644
index 0000000..5bfd67a
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/span.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/tc-img.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/tc-img.jpg
new file mode 100644
index 0000000..e620377
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/tc-img.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/title.png b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/title.png
new file mode 100644
index 0000000..4ff8835
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/title.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/top-bg.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/top-bg.jpg
new file mode 100644
index 0000000..41e1994
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/top-bg.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/top-bg_03.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/top-bg_03.jpg
new file mode 100644
index 0000000..84261c5
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/top-bg_03.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/top_bg.png b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/top_bg.png
new file mode 100644
index 0000000..4b55ebd
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/top_bg.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/tx-img.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/tx-img.jpg
new file mode 100644
index 0000000..77344da
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/tx-img.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/tx-img.png b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/tx-img.png
new file mode 100644
index 0000000..acd48b1
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/tx-img.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/tx.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/tx.jpg
new file mode 100644
index 0000000..6c4f0c3
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/tx.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/user.png b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/user.png
new file mode 100644
index 0000000..114305a
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/user.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/user_bg.png b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/user_bg.png
new file mode 100644
index 0000000..3ea8a8b
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/user_bg.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/verify.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/verify.jpg
new file mode 100644
index 0000000..29ed5bf
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/verify.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/后_03.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/后_03.jpg
new file mode 100644
index 0000000..2264a7c
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/后_03.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/login/鍚巁03.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/鍚巁03.jpg
new file mode 100644
index 0000000..2264a7c
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/login/鍚巁03.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/logo.png1 b/pluss-manage-page/src/main/resources/static/resources/auth/img/logo.png1
new file mode 100644
index 0000000..1a2de36
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/logo.png1 differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/menu-action.png b/pluss-manage-page/src/main/resources/static/resources/auth/img/menu-action.png
new file mode 100644
index 0000000..fe7b6ad
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/menu-action.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/password.png b/pluss-manage-page/src/main/resources/static/resources/auth/img/password.png
new file mode 100644
index 0000000..63483f5
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/password.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/split-bar/down.gif b/pluss-manage-page/src/main/resources/static/resources/auth/img/split-bar/down.gif
new file mode 100644
index 0000000..2cc87a5
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/split-bar/down.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/split-bar/left.gif b/pluss-manage-page/src/main/resources/static/resources/auth/img/split-bar/left.gif
new file mode 100644
index 0000000..bc1d358
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/split-bar/left.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/split-bar/right.gif b/pluss-manage-page/src/main/resources/static/resources/auth/img/split-bar/right.gif
new file mode 100644
index 0000000..45ffa58
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/split-bar/right.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/split-bar/up.gif b/pluss-manage-page/src/main/resources/static/resources/auth/img/split-bar/up.gif
new file mode 100644
index 0000000..626e993
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/split-bar/up.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/img/upload.png b/pluss-manage-page/src/main/resources/static/resources/auth/img/upload.png
new file mode 100644
index 0000000..4c25a9a
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/img/upload.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/index/Browser.png b/pluss-manage-page/src/main/resources/static/resources/auth/index/Browser.png
new file mode 100644
index 0000000..c4852f9
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/index/Browser.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/index/dashboard.css b/pluss-manage-page/src/main/resources/static/resources/auth/index/dashboard.css
new file mode 100644
index 0000000..4bf6795
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/index/dashboard.css
@@ -0,0 +1,57 @@
+html,body {
+	margin: 0;
+	padding: 0;
+	background:
+		url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAQACAIAAAAP+8yGAAACoklEQVR4Xu3dwQ0CMQxEUTtKvbRCC3RqjtwR3g3WSwP/MDOObaIlH89XdJ4VzQcAACBiZzcgMvs1AAAAAFCu3WiR3YCYcKMBACh2AKopgFJBA7Xoo4Fip1TQAEAtkmQASXZlalsAJLk/aC59AICdSQNJ7ge4DwRN0ORAbypociAHgsamliHWmlwkB7oKnZ0caH7lQA40v3LApmqRHPiBAsBCSvsOYCHFpuZkfZEcsCmbsqn2/XSbchGAHLApm3q9D6Cz07YAaB19oZWLaCAHbHoiwBf52BRADtiUTb1KAJAD384B8Gkbzx4APOyWAwAjlKCx6eQky4GgyYGgCZocAAiapSCAoLkPJBnA03QASZZkGgAoFVpHczKAWmQIVIsAAOxNARQ7AAB9kUEcQLn+/gCopgAAbjQ3Gg1cOAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANV8aAAAAADwi7Pr/5+DVt2tAQAAgGK3I6oZUANEBgDQtigVACFoYQBhUwBBEzQAORA0NmVTOWBTADYlMptyEQCbEhnAOzsALjpPA88e6rJ3FUTmIi7Sm3IRF3ERkS1miaxUEFmpILJSURN6UyIT2QhlALHxIjKRiUxk+yKTPpGJbNInMpEN4sMARAawDBG06SIL2goi21UIGpFpcJlNjbFENuEQmQY0MGUaQEyZRBY0QRM0U6YpkwZEFjTrHFMmDTS/RCayKdOUacoUNH+4I2hENmX2AIhMZGMskWlgjCUyke2LNF5EJjINiExkGy8bL8uQCSIbxIlspcZFJn0iE1mpsEogsjGWi7iIi4jMRVzERfamAJaC52sAwEUANl5sCsCmXGRG89e6bEoDOWBTADmQAwBBk4MRAABJFjQAAIBqPvdrAPAGv7GBbaSCtb0AAAAASUVORK5CYII=");
+	background-attachment: fixed;
+	background-size: contain;
+}
+
+.sys-icons .promptumenu_window {
+	margin: 0 auto;
+	border: none;
+	border-radius: 0;
+	-webkit-border-radius: 0;
+	background: transparent none;
+	cursor : auto;
+}
+
+.sys-icons ul li {
+	cursor: pointer;
+}
+
+.sys-icons ul li img {
+	width: 96px;
+	height: 96px;
+	display: block;
+	margin: 15px auto;
+	border-radius : 10px;
+	-moz-border-radius : 15px;
+	-webkit-border-radius : 15px;
+}
+
+.sys-icons ul li a {
+	display: block;
+	margin: 10px auto;
+	text-align: center;
+	color: rgb(255, 255, 255);
+	text-shadow: rgba(0, 0, 0, 0.247059) 0px 7px 15px;
+	font-family: "Microsoft YaHei";
+	line-height: 1.2;
+	font-weight: 300;
+	-webkit-font-smoothing: antialiased;
+	text-decoration: none;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	max-width: 150px;
+}
+
+/**消除当前焦点虚框 */
+:focus,:active {
+	outline: 0 !important;
+}
+
+* {
+	-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/index/dashboard.js b/pluss-manage-page/src/main/resources/static/resources/auth/index/dashboard.js
new file mode 100644
index 0000000..45f463f
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/index/dashboard.js
@@ -0,0 +1,94 @@
+//给Date类型增加格式化原型方法
+Date.prototype.format = function(format) {
+	var o = {
+		"M+" : this.getMonth() + 1, // month
+		"d+" : this.getDate(), // day
+		"H+" : this.getHours(), // hour
+		"h+" : this.getHours(),
+		//"h+" : this.getHours()%12, //12 hour
+		"m+" : this.getMinutes(), // minute
+		"s+" : this.getSeconds(), // second
+		"q+" : Math.floor((this.getMonth() + 3) / 3), // quarter
+		"S" : this.getMilliseconds()
+	// millisecond
+	}
+	if (/(y+)/.test(format))
+		format = format.replace(RegExp.$1, (this.getFullYear() + "")
+				.substr(4 - RegExp.$1.length));
+	for ( var k in o)
+		if (new RegExp("(" + k + ")").test(format))
+			format = format.replace(RegExp.$1, RegExp.$1.length == 1 ? o[k]
+					: ("00" + o[k]).substr(("" + o[k]).length));
+	return format;
+}
+
+String.prototype.format = function() {
+	var args = arguments;
+	return this.replace(/\{(\d+)\}/g, function(m, i) {
+		return args[i];
+	});
+}
+
+String.prototype.replaceAll = function stringReplaceAll(AFindText, ARepText) {
+	raRegExp = new RegExp(AFindText, "g");
+	return this.replace(raRegExp, ARepText);
+};
+
+String.prototype.endWith = function(str) {
+	if (str == null || str == "" || this.length == 0 || str.length > this.length)
+		return false;
+	if (this.substring(this.length - str.length) == str)
+		return true;
+	else
+		return false;
+	return true;
+}
+String.prototype.startWith = function(str) {
+	if (str == null || str == "" || this.length == 0 || str.length > this.length)
+		return false;
+	if (this.substr(0, str.length) == str)
+		return true;
+	else
+		return false;
+	return true;
+}
+
+var g_menus = [];
+
+$(function(){
+	window.parent.hideSidebar();
+	initMenu();
+	
+	$(document).on("click",".sys-icons ul li",function(){
+		var $this = $(this);
+		if(!$.browser.msie){
+			$this.css("opacity","0.5");
+		}
+		setTimeout(function(){
+			try{
+				var id = $this.find("a").attr("id");
+				window.parent.showSidebar();
+				window.parent.loadMenu(window.parent.findMenuById(id));
+				window.parent.showBlank();
+			}catch(e){
+			}
+			$this.css("opacity","1");
+		},200);
+	})
+})
+
+function initMenu() {
+	var roots = window.parent.findRootMenus();
+	$('.sys-icons ul').empty();
+	$.each(roots, function(i, root) {
+		var iconUrl = root.iconUrl?root.iconUrl : ctx + '/resources/auth/index/Browser.png';
+		$('.sys-icons ul').append("<li><img src='{0}'/><a href='javascript:void(0);' id='{1}'>{2}</a></li>".format(iconUrl,root.id,root.name));
+	})
+	$('.sys-icons ul').promptumenu({
+		'height' : $(window).height(),
+		'rows': 3,
+		'columns': 3,
+		'direction': 'horizontal',
+		'pages': true
+	});
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/index/favicon.ico b/pluss-manage-page/src/main/resources/static/resources/auth/index/favicon.ico
new file mode 100644
index 0000000..83fd7be
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/index/favicon.ico differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/index/home.png b/pluss-manage-page/src/main/resources/static/resources/auth/index/home.png
new file mode 100644
index 0000000..72e20a4
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/index/home.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/index/iehack.js b/pluss-manage-page/src/main/resources/static/resources/auth/index/iehack.js
new file mode 100644
index 0000000..279eb07
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/index/iehack.js
@@ -0,0 +1,2 @@
+/* IE7/IE8.js - copyright 2004-2008, Dean Edwards */
+(function(){IE7={toString:function(){return"IE7 version 2.0 (beta)"}};var u=K();var v=/ie7_debug/.test(top.location.search);var w=IE7.appVersion=navigator.appVersion.match(/MSIE (\d\.\d)/)[1];var x=document.compatMode!="CSS1Compat";var y,z,A;var B="!";var C=/^[\w\.]+[^:]*$/;function D(a,b){if(C.test(a))a=(b||"")+a;return a};function E(a,b){a=D(a,b);return a.slice(0,a.lastIndexOf("/")+1)};var F=document.scripts[document.scripts.length-1];try{eval(F.innerHTML)}catch(e){}var G=E(F.src);try{var H=new ActiveXObject("Microsoft.XMLHTTP")}catch(e){}var I={};function J(a,b){try{a=D(a,b);if(!I[a]){H.open("GET",a,false);H.send();if(H.status==0||H.status==200){I[a]=H.responseText}}}catch(e){}finally{return I[a]||""}};if(w<5.5){undefined=u();if("".replace(/^/,String)){var L=/(g|gi)$/;var M=String.prototype.replace;String.prototype.replace=function(a,b){if(typeof b=="function"){if(a&&a.constructor==RegExp){var c=a;var d=c.global;if(d==null)d=L.test(c);if(d)c=new RegExp(c.source)}else{c=new RegExp(bj(a))}var e,f=this,g="";while(f&&(e=c.exec(f))){g+=f.slice(0,e.index)+b.apply(this,e);f=f.slice(e.index+e[0].length);if(!d)break}return g+f}return M.apply(this,arguments)}}B="HTML:!";Array.prototype.pop=function(){if(this.length){var i=this[this.length-1];this.length--;return i}return undefined};Array.prototype.push=function(){for(var i=0;i<arguments.length;i++){this[this.length]=arguments[i]}return this.length};var N=this;Function.prototype.apply=function(o,a){if(o===undefined)o=N;else if(o==null)o=window;else if(typeof o=="string")o=new String(o);else if(typeof o=="number")o=new Number(o);else if(typeof o=="boolean")o=new Boolean(o);if(arguments.length==1)a=[];else if(a[0]&&a[0].writeln)a[0]=a[0].documentElement.document||a[0];var $="#ie7_apply",r;o[$]=this;switch(a.length){case 0:r=o[$]();break;case 1:r=o[$](a[0]);break;case 2:r=o[$](a[0],a[1]);break;case 3:r=o[$](a[0],a[1],a[2]);break;case 4:r=o[$](a[0],a[1],a[2],a[3]);break;case 5:r=o[$](a[0],a[1],a[2],a[3],a[4]);break;default:var b=[],i=a.length-1;do b[i]="a["+i+"]";while(i--);eval("r=o[$]("+b+")")}if(typeof o.valueOf=="function"){delete o[$]}else{o[$]=undefined;if(r&&r.writeln)r=r.documentElement.document||r}return r};Function.prototype.call=function(o){return this.apply(o,O.apply(arguments,[1]))};ct+="address,blockquote,body,dd,div,dt,fieldset,form,"+"frame,frameset,h1,h2,h3,h4,h5,h6,iframe,noframes,object,p,"+"hr,applet,center,dir,menu,pre,dl,li,ol,ul{display:block}"}var O=Array.prototype.slice;var P=/%([1-9])/g;var R=/^\s\s*/;var S=/\s\s*$/;var T=/([\/()[\]{}|*+-.,^$?\\])/g;var U=/\bbase\b/;var V=["constructor","toString"];var W;function X(){};X.extend=function(a,b){W=true;var c=new this;be(c,a);W=false;var d=c.constructor;function e(){if(!W)d.apply(this,arguments)};c.constructor=e;e.extend=arguments.callee;be(e,b);e.prototype=c;return e};X.prototype.extend=function(a){return be(this,a)};var Y="#";var Z="~";var ba=/\\./g;var bb=/\(\?[:=!]|\[[^\]]+\]/g;var bc=/\(/g;var bd=X.extend({constructor:function(a){this[Z]=[];this.merge(a)},exec:function(f,g){f+='';if(arguments.length==1){var h=this;var j=this[Z];g=function(a){if(a){var b,c=1,i=0;while((b=h[Y+j[i++]])){var d=c+b.length+1;if(arguments[c]){var e=b.replacement;switch(typeof e){case"function":return e.apply(h,O.call(arguments,c,d));case"number":return arguments[c+e];default:return e}}c=d}}return""}}return f.replace(new RegExp(this,this.ignoreCase?"gi":"g"),g)},add:function(a,b){if(a instanceof RegExp){a=a.source}if(!this[Y+a])this[Z].push(String(a));this[Y+a]=new bd.Item(a,b)},merge:function(a){for(var i in a)this.add(i,a[i])},toString:function(){return"("+this[Z].join(")|(")+")"}},{IGNORE:"$0",Item:X.extend({constructor:function(a,b){a=a instanceof RegExp?a.source:String(a);if(typeof b=="number")b=String(b);else if(b==null)b="";if(typeof b=="string"&&/\$(\d+)/.test(b)){if(/^\$\d+$/.test(b)){b=parseInt(b.slice(1))}else{var Q=/'/.test(b.replace(/\\./g,""))?'"':"'";b=b.replace(/\n/g,"\\n").replace(/\r/g,"\\r").replace(/\$(\d+)/g,Q+"+(arguments[$1]||"+Q+Q+")+"+Q);b=new Function("return "+Q+b.replace(/(['"])\1\+(.*)\+\1\1$/,"$1")+Q)}}this.length=bd.count(a);this.replacement=b;this.toString=K(a)}}),count:function(a){a=String(a).replace(ba,"").replace(bb,"");return bi(a,bc).length}});function be(a,b){if(a&&b){if(arguments.length>2){var c=b;b={};b[c]=arguments[2]}var d=(typeof b=="function"?Function:Object).prototype;var i=V.length,c;if(W)while(c=V[--i]){var e=b[c];if(e!=d[c]){if(U.test(e)){bf(a,c,e)}else{a[c]=e}}}for(c in b)if(d[c]===undefined){var e=b[c];if(a[c]&&typeof e=="function"&&U.test(e)){bf(a,c,e)}else{a[c]=e}}}return a};function bf(c,d,e){var f=c[d];c[d]=function(){var a=this.base;this.base=f;var b=e.apply(this,arguments);this.base=a;return b}};function bg(a,b){if(!b)b=a;var c={};for(var i in a)c[i]=b[i];return c};function bh(c){var d=arguments;var e=new RegExp("%([1-"+arguments.length+"])","g");return String(c).replace(e,function(a,b){return b<d.length?d[b]:a})};function bi(a,b){return String(a).match(b)||[]};function bj(a){return String(a).replace(T,"\\$1")};function bk(a){return String(a).replace(R,"").replace(S,"")};function K(k){return function(){return k}};var bl=new bd({Width:"Height",width:"height",Left:"Top",left:"top",Right:"Bottom",right:"bottom",X:"Y"});function bm(a){return bl.exec(a)};var bn=X.extend({constructor:function(){this.fixes=[];this.recalcs=[]},init:u});function bo(){if(/ie7_off/.test(top.location.search)||w<5)return;y=document.documentElement;z=document.body;IE7._0=A=x?z:y;if(x)cO();IE7.CSS.init();IE7.HTML.init();IE7.HTML.apply();IE7.CSS.apply();br()};var bp=[];function bq(a){bp.push(a)};function br(){IE7.HTML.recalc();IE7.CSS.recalc();for(var i=0;i<bp.length;i++)bp[i]()};var bs=bd.extend({ignoreCase:true});function bt(a,b,c){if(!bP[a]){bK=[];var d="";var e=bQ.escape(a).split(",");for(var i=0;i<e.length;i++){bM=bL=bN=0;bO=e.length>1?2:0;var f=bQ.exec(e[i])||"if(0){";if(bM){f+=bh("if(e%1.nodeName!='!'){",bL)}var g=bO>1?bH:"";f+=bh(g+bI,bL);f+=Array(bi(f,/\{/g).length+1).join("}");d+=f}eval(bh(bJ,bK)+bQ.unescape(d)+"return s?null:r}");bP[a]=_1}return bP[a](b||document,c)};var bu=w<6;IE7._2=1;IE7._3=function(a,b){var c=a.all[b]||null;if(!c||c.id==b)return c;for(var i=0;i<c.length;i++){if(c[i].id==b)return c[i]}return null};var bv=/^(href|src)$/;var bw={"class":"className","for":"htmlFor"};IE7._4=function(a,b){if(b=="src"&&a.pngSrc)return a.pngSrc;var c=bu?(a.attributes[b]||a.attributes[bw[b.toLowerCase()]]):a.getAttributeNode(b);if(c&&(c.specified||b=="value")){if(bv.test(b)){return a.getAttribute(b,2)}else if(b=="style"){return a.style.cssText}else{return c.nodeValue}}return null};var bx="colSpan,rowSpan,vAlign,dateTime,accessKey,tabIndex,encType,maxLength,readOnly,longDesc";be(bw,bg(bx.toLowerCase().split(","),bx.split(",")));IE7._5=function(a){while(a&&(a=a.nextSibling)&&(a.nodeType!=1||a.nodeName=="!"))continue;return a};IE7._6=function(a){while(a&&(a=a.previousSibling)&&(a.nodeType!=1||a.nodeName=="!"))continue;return a};var by=/([\s>+~,]|[^(]\+|^)([#.:\[])/g,bz=/(^|,)([^\s>+~])/g,bA=/\s*([\s>+~(),]|^|$)\s*/g,bB=/\s\*\s/g;var bC=bd.extend({constructor:function(a){this.base(a);this.cache={};this.sorter=new bd;this.sorter.add(/:not\([^)]*\)/,bd.IGNORE);this.sorter.add(/([ >](\*|[\w-]+))([^: >+~]*)(:\w+-child(\([^)]+\))?)([^: >+~]*)/,"$1$3$6$4")},ignoreCase:true,escape:function(a){return this.optimise(this.format(a))},format:function(a){return a.replace(bA,"$1").replace(bz,"$1 $2").replace(by,"$1*$2")},optimise:function(a){return this.sorter.exec(a.replace(bB,">* "))},parse:function(a){return this.cache[a]||(this.cache[a]=this.unescape(this.exec(this.escape(a))))},unescape:function(a){return bZ(a)}});var bD={"":"%1!=null","=":"%1=='%2'","~=":/(^| )%1( |$)/,"|=":/^%1(-|$)/,"^=":/^%1/,"$=":/%1$/,"*=":/%1/};var bE={"first-child":"!IE7._6(e%1)","link":"e%1.currentStyle['ie7-link']=='link'","visited":"e%1.currentStyle['ie7-link']=='visited'"};var bF="var p%2=0,i%2,e%2,n%2=e%1.";var bG="e%1.sourceIndex";var bH="var g="+bG+";if(!p[g]){p[g]=1;";var bI="r[r.length]=e%1;if(s)return e%1;";var bJ="var _1=function(e0,s){IE7._2++;var r=[],p={},reg=[%1],d=document;";var bK;var bL;var bM;var bN;var bO;var bP={};var bQ=new bC({" (\\*|[\\w-]+)#([\\w-]+)":function(a,b,c){bM=false;var d="var e%2=IE7._3(d,'%4');if(e%2&&";if(b!="*")d+="e%2.nodeName=='%3'&&";d+="e%1==d||e%1.contains(e%2)){";if(bN)d+=bh("i%1=n%1.length;",bN);return bh(d,bL++,bL,b.toUpperCase(),c)}," (\\*|[\\w-]+)":function(a,b){bO++;bM=b=="*";var c=bF;c+=(bM&&bu)?"all":"getElementsByTagName('%3')";c+=";for(i%2=0;(e%2=n%2[i%2]);i%2++){";return bh(c,bL++,bN=bL,b.toUpperCase())},">(\\*|[\\w-]+)":function(a,b){var c=bN;bM=b=="*";var d=bF;d+=c?"children":"childNodes";if(!bM&&c)d+=".tags('%3')";d+=";for(i%2=0;(e%2=n%2[i%2]);i%2++){";if(bM){d+="if(e%2.nodeType==1){";bM=bu}else{if(!c)d+="if(e%2.nodeName=='%3'){"}return bh(d,bL++,bN=bL,b.toUpperCase())},"\\+(\\*|[\\w-]+)":function(a,b){var c="";if(bM)c+="if(e%1.nodeName!='!'){";bM=false;c+="e%1=IE7._5(e%1);if(e%1";if(b!="*")c+="&&e%1.nodeName=='%2'";c+="){";return bh(c,bL,b.toUpperCase())},"~(\\*|[\\w-]+)":function(a,b){var c="";if(bM)c+="if(e%1.nodeName!='!'){";bM=false;bO=2;c+="while(e%1=e%1.nextSibling){if(e%1.ie7_adjacent==IE7._2)break;if(";if(b=="*"){c+="e%1.nodeType==1";if(bu)c+="&&e%1.nodeName!='!'"}else c+="e%1.nodeName=='%2'";c+="){e%1.ie7_adjacent=IE7._2;";return bh(c,bL,b.toUpperCase())},"#([\\w-]+)":function(a,b){bM=false;var c="if(e%1.id=='%2'){";if(bN)c+=bh("i%1=n%1.length;",bN);return bh(c,bL,b)},"\\.([\\w-]+)":function(a,b){bM=false;bK.push(new RegExp("(^|\\s)"+bj(b)+"(\\s|$)"));return bh("if(e%1.className&&reg[%2].test(e%1.className)){",bL,bK.length-1)},"\\[([\\w-]+)\\s*([^=]?=)?\\s*([^\\]]*)\\]":function(a,b,c,d){var e=bw[b]||b;if(c){var f="e%1.getAttribute('%2',2)";if(!bv.test(b)){f="e%1.%3||"+f}b=bh("("+f+")",bL,b,e)}else{b=bh("IE7._4(e%1,'%2')",bL,b)}var g=bD[c||""];if(g&&g.source){bK.push(new RegExp(bh(g.source,bj(bQ.unescape(d)))));g="reg[%2].test(%1)";d=bK.length-1}return"if("+bh(g,b,d)+"){"},":([\\w-]+)(\\(([^)]+)\\))?":function(a,b,c,d){return"if("+bh(bE[b]||"false",bL,d||"")+"){"}});var bR=/'/g,bS=/^\x01/;var bT=[];var bU=new bs({"<!\\-\\-|\\-\\->":"","\\/\\*[^*]*\\*+([^\\/][^*]*\\*+)*\\/":"","@(namespace|import)[^;\\n]+[;\\n]":"","'(\\\\.|[^'\\\\])*'":bW,'"(\\\\.|[^"\\\\])*"':bW,"\\s+":" "});function bV(a){return bU.exec(a)};function bW(c){return"\x01"+bT.push(c.replace(/\\([\da-fA-F]{1,4})/g,function(a,b){return"\\u"+"0000".slice(b.length)+a}).slice(1,-1).replace(bR,"\\'"))};function bX(a){return bS.test(a)?bT[a.slice(1)-1]:a};var bY=new bs({"\\x01(\\d+)":function(a,b){return bT[b-1]}});function bZ(a){return bY.exec(a)};var ca=[];function cb(a){bq(a);cc(window,"onresize",a)};function cc(a,b,c){a.attachEvent(b,c);ca.push(arguments)};function cd(a,b,c){try{a.detachEvent(b,c)}catch(ignore){}};cc(window,"onunload",function(){var a;while(a=ca.pop()){cd(a[0],a[1],a[2])}});function ce(a,b,c){if(!a.elements)a.elements={};if(c)a.elements[b.uniqueID]=b;else delete a.elements[b.uniqueID];return c};cc(window,"onbeforeprint",function(){if(!IE7.CSS.print)new cv("print");IE7.CSS.print.recalc()});var cf=/^\d+(px)?$/i;var cg=/^\d+%$/;var ch=function(a,b){if(cf.test(b))return parseInt(b);var c=a.style.left;var d=a.runtimeStyle.left;a.runtimeStyle.left=a.currentStyle.left;a.style.left=b||0;b=a.style.pixelLeft;a.style.left=c;a.runtimeStyle.left=d;return b};function ci(a){var b=document.createElement(a||"object");b.style.cssText="position:absolute;padding:0;display:block;border:none;clip:rect(0 0 0 0);left:-9999";b.ie7_anon=true;return b};var cj="ie7-";function ck(a){return a.currentStyle["ie7-position"]=="fixed"};function cl(a,b){return a.currentStyle[cj+b]||a.currentStyle[b]};function cm(a,b,c){if(a.currentStyle[cj+b]==null){a.runtimeStyle[cj+b]=a.currentStyle[b]}a.runtimeStyle[b]=c};var cn=/a(#[\w-]+)?(\.[\w-]+)?:(hover|active)/i;var co=/\s*\{\s*/,cp=/\s*\}\s*/,cq=/\s*\,\s*/;var cr=/(.*)(:first-(line|letter))/;var cs=/UNKNOWN|([:.])\w+\1/;var ct=":link{ie7-link:link}:visited{ie7-link:visited}";var cu=document.styleSheets;IE7.CSS=new(bn.extend({parser:new bs,screen:"",print:"",styles:[],rules:[],pseudoClasses:w<7?"first\\-child":"",dynamicPseudoClasses:{toString:function(){var a=[];for(var b in this)a.push(b);return a.join("|")}},init:function(){var a="^\x01$";var b=[];if(this.pseudoClasses)b.push(this.pseudoClasses);var c=this.dynamicPseudoClasses.toString();if(c)b.push(c);b=b.join("|");var d=w<7?["[>+~[(]|([:.])\\w+\\1"]:[];if(b)d.push(":("+b+")");this.UNKNOWN=new RegExp(d.join("|")||a,"i");var e=w<7?["\\[[^\\]]+\\]|[^\\s(\\[]+\\s*[+~]"]:[];var f=e.concat();if(b)f.push(":("+b+")");cx.COMPLEX=new RegExp(f.join("|")||a,"gi");if(c)e.push(":("+c+")");cy.COMPLEX=new RegExp(e.join("|")||a,"gi");cy.MATCH=new RegExp(c?"(.*):("+c+")(.*)":a,"i");this.createStyleSheet();this.refresh()},refresh:function(){this.styleSheet.cssText=ct+this.screen+this.print},getInlineStyles:function(){var a=document.getElementsByTagName("style"),b;for(var i=a.length-1;(b=a[i]);i--){if(!b.disabled&&!b.ie7){this.styles.push(b.innerHTML)}}},apply:function(){this.getInlineStyles();new cv("screen");this.trash()},addFix:function(a,b){this.parser.add(a,b)},recalc:function(){this.screen.recalc();var a=/ie7_recalc\d+/g;var b=ct.match(/[{,]/g).length;var c=b+(this.screen.cssText.match(/\{/g)||"").length;var d=this.styleSheet.rules,e;var f,g,h,l,i,j,k,m;for(i=b;i<c;i++){e=d[i];if(e&&(f=e.style.cssText.match(a))){h=bt(e.selectorText);if(h.length)for(j=0;j<f.length;j++){m=f[j];g=IE7.CSS.recalcs[m.slice(10)][2];for(k=0;(l=h[k]);k++){if(l.currentStyle[m])g(l)}}}}},addRecalc:function(d,e,f,g){e=new RegExp("([{;\\s])"+d+"\\s*:\\s*"+e+"[^;}]*");var h=this.recalcs.length;if(g)g=d+":"+g;this.addFix(e,function(a,b,c){return(g?b+g:a)+";ie7-"+a.slice(1)+";ie7_recalc"+h+":1"});this.recalcs.push(arguments);return h},getText:function(a,b){var c=a.cssText;if(H&&cs.test(c))c=J(a.href,b)||c;return c},createStyleSheet:function(){this.styleSheet=document.createStyleSheet();this.styleSheet.ie7=true;this.styleSheet.owningElement.ie7=true;this.styleSheet.cssText=ct},trash:function(){for(var i=0;i<cu.length;i++){if(!cu[i].ie7&&cu[i].cssText){cu[i].cssText=""}}}}));var cv=X.extend({constructor:function(a){this.media=a;this.load();IE7.CSS[a]=this;IE7.CSS.refresh()},createRule:function(a,b){if(IE7.CSS.UNKNOWN.test(a)){var c;if(cw&&(c=a.match(cw.MATCH))){return new cw(c[1],c[2],b)}else if(c=a.match(cy.MATCH)){if(!cn.test(c)||cy.COMPLEX.test(c)){return new cy(a,c[1],c[2],c[3],b)}}else return new cx(a,b)}return a+" {"+b+"}"},load:function(){this.cssText="";this.getText();this.parse();this.cssText=bZ(this.cssText);I={}},getText:function(){var f=[].concat(IE7.CSS.styles);var g=/@media\s+([^{]*)\{([^@]+\})\s*\}/gi;var h=/\ball\b|^$/i,j=/\bscreen\b/i,k=/\bprint\b/i;function l(a,b){m.value=b;return a.replace(g,m)};function m(a,b,c){b=n(b);switch(b){case"screen":case"print":if(b!=m.value)return"";case"all":return c}return""};function n(a){if(h.test(a))return"all";else if(j.test(a))return(k.test(a))?"all":"screen";else if(k.test(a))return"print"};var o=this;function p(a,b,c,d){var e="";if(!d){c=n(a.media);d=0}if(c=="all"||c==o.media){if(d<3){for(var i=0;i<a.imports.length;i++){e+=p(a.imports[i],E(a.href,b),c,d+1)}}e+=bV(a.href?r(a,b):f.pop()||"");e=l(e,o.media)}return e};var q={};function r(a,b){var c=D(a.href,b);if(q[c])return"";q[c]=(a.disabled)?"":t(IE7.CSS.getText(a,b),E(a.href,b));return q[c]};var s=/(url\s*\(\s*['"]?)([\w\.]+[^:\)]*['"]?\))/gi;function t(a,b){return a.replace(s,"$1"+b.slice(0,b.lastIndexOf("/")+1)+"$2")};for(var i=0;i<cu.length;i++){if(!cu[i].disabled&&!cu[i].ie7){this.cssText+=p(cu[i])}}},parse:function(){this.cssText=IE7.CSS.parser.exec(this.cssText);var a=IE7.CSS.rules.length;var b=this.cssText.split(cp),c;var d,e,i,j;for(i=0;i<b.length;i++){c=b[i].split(co);d=c[0].split(cq);e=c[1];for(j=0;j<d.length;j++){d[j]=e?this.createRule(d[j],e):""}b[i]=d.join("\n")}this.cssText=b.join("\n");this.rules=IE7.CSS.rules.slice(a)},recalc:function(){var a,i;for(i=0;(a=this.rules[i]);i++)a.recalc()},toString:function(){return"@media "+this.media+"{"+this.cssText+"}"}});var cw;var cx=X.extend({constructor:function(a,b){this.id=IE7.CSS.rules.length;this.className=cx.PREFIX+this.id;a=(a).match(cr)||a||"*";this.selector=a[1]||a;this.selectorText=cx.simple(this.selector)+"."+this.className+(a[2]||"");this.cssText=b;this.MATCH=new RegExp("\\s"+this.className+"(\\s|$)","g");IE7.CSS.rules.push(this);this.init()},init:u,add:function(a){a.className+=" "+this.className},remove:function(a){a.className=a.className.replace(this.MATCH,"$1")},recalc:function(){var a=bt(this.selector);for(i=0;i<a.length;i++)this.add(a[i])},toString:function(){return this.selectorText+" {"+this.cssText+"}"}},{PREFIX:"ie7_class",CHILD:/>/g,simple:function(a){return a.replace(this.CHILD," ").replace(this.COMPLEX,"").replace()}});var cy=cx.extend({constructor:function(a,b,c,d,e){this.attach=b||"*";this.dynamicPseudoClass=IE7.CSS.dynamicPseudoClasses[c];this.target=d;this.base(a,e)},recalc:function(){var a=bt(this.attach),b;for(var i=0;b=a[i];i++){var c=this.target?bt(this.target,b):[b];if(c.length)this.dynamicPseudoClass.apply(b,c,this)}}});var cz=X.extend({constructor:function(a,b){this.name=a;this.apply=b;this.instances={};IE7.CSS.dynamicPseudoClasses[a]=this},register:function(a){var b=a[2];a.id=b.id+a[0].uniqueID;if(!this.instances[a.id]){var c=a[1],j;for(j=0;j<c.length;j++)b.add(c[j]);this.instances[a.id]=a}},unregister:function(a){if(this.instances[a.id]){var b=a[2];var c=a[1],j;for(j=0;j<c.length;j++)b.remove(c[j]);delete this.instances[a.id]}}});if(w<7){var cA=new cz("hover",function(a){var b=arguments;cc(a,w<5.5?"onmouseover":"onmouseenter",function(){cA.register(b)});cc(a,w<5.5?"onmouseout":"onmouseleave",function(){cA.unregister(b)})});cc(document,"onmouseup",function(){var a=cA.instances;for(var i in a)if(!a[i][0].contains(event.srcElement))cA.unregister(a[i])})}var cB=w<5.5?"HTML:":"";ct+="h1{font-size:2em}h2{font-size:1.5em;}h3{font-size:1.17em;}h4{font-size:1em}h5{font-size:.83em}h6{font-size:.67em}";IE7.HTML=new(bn.extend({fixed:{},init:u,addFix:function(){this.fixes.push(arguments)},apply:function(){for(var i=0;i<this.fixes.length;i++){var a=bt(this.fixes[i][0]);var b=this.fixes[i][1]||this.fixElement;for(var j=0;j<a.length;j++)b(a[j])}},addRecalc:function(){this.recalcs.push(arguments)},fixElement:function(a){var b=document.createElement("<"+cB+a.outerHTML.slice(1));if(a.outerHTML.slice(-2)!="/>"){var c="</"+a.tagName+">",d;while((d=a.nextSibling)&&d.outerHTML!=c){b.appendChild(d)}if(d)d.removeNode()}a.parentNode.replaceChild(b,a)},recalc:function(){for(var i=0;i<this.recalcs.length;i++){var a=bt(this.recalcs[i][0]);var b=this.recalcs[i][1],c;var d=Math.pow(2,i);for(var j=0;(c=a[j]);j++){var e=c.uniqueID;if((this.fixed[e]&d)==0){c=b(c)||c;this.fixed[e]|=d}}}}}));if(w<7){IE7.HTML.addFix("abbr");IE7.HTML.addRecalc("label",function(a){if(!a.htmlFor){var b=bt("input,textarea",a,true);if(b){cc(a,"onclick",function(){b.click()})}}})}var cC="[.\\d]";new function(_){var layout=IE7.Layout=this;ct+="*{boxSizing:content-box}";IE7.hasLayout=w<5.5?function(a){return a.clientWidth}:function(a){return a.currentStyle.hasLayout};layout.boxSizing=function(a){if(!IE7.hasLayout(a)){a.style.height="0cm";if(a.currentStyle.verticalAlign=="auto")a.runtimeStyle.verticalAlign="top";collapseMargins(a)}};function collapseMargins(a){if(a!=A&&a.currentStyle.position!="absolute"){collapseMargin(a,"marginTop");collapseMargin(a,"marginBottom")}};function collapseMargin(a,b){if(!a.runtimeStyle[b]){var c=a.parentElement;if(c&&IE7.hasLayout(c)&&!IE7[b=="marginTop"?"_6":"_5"](a))return;var d=bt(">*:"+(b=="marginTop"?"first":"last")+"-child",a,true);if(d&&d.currentStyle.styleFloat=="none"&&IE7.hasLayout(d)){collapseMargin(d,b);margin=_7(a,a.currentStyle[b]);childMargin=_7(d,d.currentStyle[b]);if(margin<0||childMargin<0){a.runtimeStyle[b]=margin+childMargin}else{a.runtimeStyle[b]=Math.max(childMargin,margin)}d.runtimeStyle[b]="0px"}}};function _7(a,b){return b=="auto"?0:ch(a,b)};var UNIT=/^[.\d][\w%]*$/,AUTO=/^(auto|0cm)$/;var applyWidth,applyHeight;IE7.Layout.borderBox=function(a){applyWidth(a);applyHeight(a)};var fixWidth=function(e){applyWidth=function(a){if(!cg.test(a.currentStyle.width))f(a);collapseMargins(a)};function f(a,b){if(!a.runtimeStyle.fixedWidth){if(!b)b=a.currentStyle.width;a.runtimeStyle.fixedWidth=(UNIT.test(b))?Math.max(0,j(a,b)):b;cm(a,"width",a.runtimeStyle.fixedWidth)}};function g(a){if(!ck(a)){var b=a.offsetParent;while(b&&!IE7.hasLayout(b))b=b.offsetParent}return(b||A).clientWidth};function h(a,b){if(cg.test(b))return parseInt(parseFloat(b)/100*g(a));return ch(a,b)};var j=function(a,b){var c=a.currentStyle["box-sizing"]=="border-box";var d=0;if(x&&!c)d+=k(a)+l(a,"padding");else if(!x&&c)d-=k(a)+l(a,"padding");return h(a,b)+d};function k(a){return a.offsetWidth-a.clientWidth};function l(a,b){return h(a,a.currentStyle[b+"Left"])+h(a,a.currentStyle[b+"Right"])};ct+="*{minWidth:none;maxWidth:none;min-width:none;max-width:none}";layout.minWidth=function(a){if(a.currentStyle["min-width"]!=null){a.style.minWidth=a.currentStyle["min-width"]}if(ce(arguments.callee,a,a.currentStyle.minWidth!="none")){layout.boxSizing(a);f(a);m(a)}};eval("IE7.Layout.maxWidth="+String(layout.minWidth).replace(/min/g,"max"));function m(a){var b=a.getBoundingClientRect();var c=b.right-b.left;if(a.currentStyle.minWidth!="none"&&c<=j(a,a.currentStyle.minWidth)){a.runtimeStyle.width=j(a,a.currentStyle.minWidth)}else if(a.currentStyle.maxWidth!="none"&&c>=j(a,a.currentStyle.maxWidth)){a.runtimeStyle.width=j(a,a.currentStyle.maxWidth)}else{a.runtimeStyle.width=a.runtimeStyle.fixedWidth}};function n(a){if(ce(n,a,/^(fixed|absolute)$/.test(a.currentStyle.position)&&cl(a,"left")!="auto"&&cl(a,"right")!="auto"&&AUTO.test(cl(a,"width")))){o(a);IE7.Layout.boxSizing(a)}};IE7.Layout.fixRight=n;function o(a){var b=h(a,a.runtimeStyle._8||a.currentStyle.left);var c=g(a)-h(a,a.currentStyle.right)-b-l(a,"margin");if(parseInt(a.runtimeStyle.width)==c)return;a.runtimeStyle.width="";if(ck(a)||e||a.offsetWidth<c){if(!x)c-=k(a)+l(a,"padding");if(c<0)c=0;a.runtimeStyle.fixedWidth=c;cm(a,"width",c)}};var p=0;cb(function(){var i,a=(p<A.clientWidth);p=A.clientWidth;var b=layout.minWidth.elements;for(i in b){var c=b[i];var d=(parseInt(c.runtimeStyle.width)==j(c,c.currentStyle.minWidth));if(a&&d)c.runtimeStyle.width="";if(a==d)m(c)}var b=layout.maxWidth.elements;for(i in b){var c=b[i];var d=(parseInt(c.runtimeStyle.width)==j(c,c.currentStyle.maxWidth));if(!a&&d)c.runtimeStyle.width="";if(a!=d)m(c)}for(i in n.elements)o(n.elements[i])});if(x&&window.IE7_BOX_MODEL!==false){IE7.CSS.addRecalc("width",cC,applyWidth)}if(w<7){IE7.CSS.addRecalc("min-width",cC,layout.minWidth);IE7.CSS.addRecalc("max-width",cC,layout.maxWidth);IE7.CSS.addRecalc("right",cC,n)}};eval("var fixHeight="+bm(fixWidth));fixWidth();fixHeight(true)};var cD=D("blank.gif",G);var cE="DXImageTransform.Microsoft.AlphaImageLoader";var cF="progid:"+cE+"(src='%1',sizingMethod='%2')";var cG=new RegExp((window.IE7_PNG_SUFFIX||"-trans.png")+"$","i");var cH=[];function cI(a){if(cG.test(a.src)){var b=new Image(a.width,a.height);b.onload=function(){a.width=b.width;a.height=b.height;b=null};b.src=a.src;a.pngSrc=a.src;cL(a)}};if(w>=5.5&&w<7){var cJ=/background(-image)?\s*:\s*([^\(};]*)url\(([^\)]+)\)([^;}]*)/;IE7.CSS.addFix(cJ,function(a,b,c,d,e){d=bX(d);return cG.test(d)?"filter:"+bh(cF,d,"crop")+";zoom:1;background"+b+":"+c+"none"+e:a});IE7.HTML.addRecalc("img,input",function(a){if(a.tagName=="INPUT"&&a.type!="image")return;cI(a);cc(a,"onpropertychange",function(){if(!cK&&event.propertyName=="src"&&a.src.indexOf(cD)==-1)cI(a)})});var cK=false;cc(window,"onbeforeprint",function(){cK=true;for(var i=0;i<cH.length;i++)cM(cH[i])});cc(window,"onafterprint",function(){for(var i=0;i<cH.length;i++)cL(cH[i]);cK=false})}function cL(a,b){var c=a.filters[cE];if(c){c.src=a.src;c.enabled=true}else{a.runtimeStyle.filter=bh(cF,a.src,b||"scale");cH.push(a)}a.src=cD};function cM(a){a.src=a.pngSrc;a.filters[cE].enabled=false};new function(_){if(w>=7)return;IE7.CSS.addRecalc("position","fixed",_9,"absolute");IE7.CSS.addRecalc("background(-attachment)?","[^};]*fixed",_10);var $viewport=x?"body":"documentElement";function _11(){if(z.currentStyle.backgroundAttachment!="fixed"){if(z.currentStyle.backgroundImage=="none"){z.runtimeStyle.backgroundRepeat="no-repeat";z.runtimeStyle.backgroundImage="url("+cD+")"}z.runtimeStyle.backgroundAttachment="fixed"}_11=u};var _12=ci("img");function _13(a){return a?ck(a)||_13(a.parentElement):false};function _14(a,b,c){setTimeout("document.all."+a.uniqueID+".runtimeStyle.setExpression('"+b+"','"+c+"')",0)};function _10(a){if(ce(_10,a,a.currentStyle.backgroundAttachment=="fixed"&&!a.contains(z))){_11();bgLeft(a);bgTop(a);_15(a)}};function _15(a){_12.src=a.currentStyle.backgroundImage.slice(5,-2);var b=a.canHaveChildren?a:a.parentElement;b.appendChild(_12);setOffsetLeft(a);setOffsetTop(a);b.removeChild(_12)};function bgLeft(a){a.style.backgroundPositionX=a.currentStyle.backgroundPositionX;if(!_13(a)){_14(a,"backgroundPositionX","(parseInt(runtimeStyle.offsetLeft)+document."+$viewport+".scrollLeft)||0")}};eval(bm(bgLeft));function setOffsetLeft(a){var b=_13(a)?"backgroundPositionX":"offsetLeft";a.runtimeStyle[b]=getOffsetLeft(a,a.style.backgroundPositionX)-a.getBoundingClientRect().left-a.clientLeft+2};eval(bm(setOffsetLeft));function getOffsetLeft(a,b){switch(b){case"left":case"top":return 0;case"right":case"bottom":return A.clientWidth-_12.offsetWidth;case"center":return(A.clientWidth-_12.offsetWidth)/2;default:if(cg.test(b)){return parseInt((A.clientWidth-_12.offsetWidth)*parseFloat(b)/100)}_12.style.left=b;return _12.offsetLeft}};eval(bm(getOffsetLeft));function _9(a){if(ce(_9,a,ck(a))){cm(a,"position","absolute");cm(a,"left",a.currentStyle.left);cm(a,"top",a.currentStyle.top);_11();IE7.Layout.fixRight(a);_16(a)}};function _16(a,b){positionTop(a,b);positionLeft(a,b,true);if(!a.runtimeStyle.autoLeft&&a.currentStyle.marginLeft=="auto"&&a.currentStyle.right!="auto"){var c=A.clientWidth-getPixelWidth(a,a.currentStyle.right)-getPixelWidth(a,a.runtimeStyle._8)-a.clientWidth;if(a.currentStyle.marginRight=="auto")c=parseInt(c/2);if(_13(a.offsetParent))a.runtimeStyle.pixelLeft+=c;else a.runtimeStyle.shiftLeft=c}clipWidth(a);clipHeight(a)};function clipWidth(a){if(a.currentStyle.width!="auto"){var b=a.getBoundingClientRect();var c=a.offsetWidth-A.clientWidth+b.left-2;if(c>=0){c=Math.max(ch(a,a.currentStyle.width)-c,0);cm(a,"width",c)}}};eval(bm(clipWidth));function positionLeft(a,b){if(!b&&cg.test(a.currentStyle.width)){a.runtimeStyle.fixWidth=a.currentStyle.width}if(a.runtimeStyle.fixWidth){a.runtimeStyle.width=getPixelWidth(a,a.runtimeStyle.fixWidth)}if(b){if(!a.runtimeStyle.autoLeft)return}else{a.runtimeStyle.shiftLeft=0;a.runtimeStyle._8=a.currentStyle.left;a.runtimeStyle.autoLeft=a.currentStyle.right!="auto"&&a.currentStyle.left=="auto"}a.runtimeStyle.left="";a.runtimeStyle.screenLeft=getScreenLeft(a);a.runtimeStyle.pixelLeft=a.runtimeStyle.screenLeft;if(!b&&!_13(a.offsetParent)){_14(a,"pixelLeft","runtimeStyle.screenLeft+runtimeStyle.shiftLeft+document."+$viewport+".scrollLeft")}};eval(bm(positionLeft));function getScreenLeft(a){var b=a.offsetLeft,c=1;if(a.runtimeStyle.autoLeft){b=A.clientWidth-a.offsetWidth-getPixelWidth(a,a.currentStyle.right)}if(a.currentStyle.marginLeft!="auto"){b-=getPixelWidth(a,a.currentStyle.marginLeft)}while(a=a.offsetParent){if(a.currentStyle.position!="static")c=-1;b+=a.offsetLeft*c}return b};eval(bm(getScreenLeft));function getPixelWidth(a,b){return cg.test(b)?parseInt(parseFloat(b)/100*A.clientWidth):ch(a,b)};eval(bm(getPixelWidth));function _17(){var a=_10.elements;for(var i in a)_15(a[i]);a=_9.elements;for(i in a){_16(a[i],true);_16(a[i],true)}_18=0};var _18;cb(function(){if(!_18)_18=setTimeout(_17,0)})};var cN={backgroundColor:"transparent",backgroundImage:"none",backgroundPositionX:null,backgroundPositionY:null,backgroundRepeat:null,borderTopWidth:0,borderRightWidth:0,borderBottomWidth:0,borderLeftStyle:"none",borderTopStyle:"none",borderRightStyle:"none",borderBottomStyle:"none",borderLeftWidth:0,height:null,marginTop:0,marginBottom:0,marginRight:0,marginLeft:0,width:"100%"};IE7.CSS.addRecalc("overflow","visible",function(a){if(a.parentNode.ie7_wrapped)return;if(IE7.Layout&&a.currentStyle["max-height"]!="auto"){IE7.Layout.maxHeight(a)}if(a.currentStyle.marginLeft=="auto")a.style.marginLeft=0;if(a.currentStyle.marginRight=="auto")a.style.marginRight=0;var b=document.createElement(B);b.ie7_wrapped=a;for(var c in cN){b.style[c]=a.currentStyle[c];if(cN[c]!=null){a.runtimeStyle[c]=cN[c]}}b.style.display="block";b.style.position="relative";a.runtimeStyle.position="absolute";a.parentNode.insertBefore(b,a);b.appendChild(a)});function cO(){var e="xx-small,x-small,small,medium,large,x-large,xx-large".split(",");for(var i=0;i<e.length;i++){e[e[i]]=e[i-1]||"0.67em"}var f=/^\-/,g=/(em|ex)$/i;var h=/em$/i,j=/ex$/i;var k=ci();IE7.CSS.addFix(new RegExp("(font(-size)?\\s*:\\s*)([\\w\\-\\.]+)"),function(a,b,c,d){return b+(e[d]||d)});function l(a){var b=1;k.style.fontFamily=a.currentStyle.fontFamily;k.style.lineHeight=a.currentStyle.lineHeight;while(a!=z){var c=a.currentStyle["ie7-font-size"];if(c){if(h.test(c))b*=parseFloat(c);else if(cg.test(c))b*=(parseFloat(c)/100);else if(j.test(c))b*=(parseFloat(c)/2);else{k.style.fontSize=c;return 1}}a=a.parentElement}return b};ch=function(a,b){if(cf.test(b||0))return parseInt(b||0);var c=f.test(b)?-1:1;if(g.test(b))c*=l(a);k.style.width=(c<0)?b.slice(1):b;z.appendChild(k);b=c*k.offsetWidth;k.removeNode();return parseInt(b)};ct=ct.replace(/(font(-size)?\s*:\s*([^\s;}\/]*))/gi,"ie7-font-size:$3;$1");IE7.CSS.addFix(/cursor\s*:\s*pointer/,"cursor:hand");IE7.CSS.addFix(/display\s*:\s*list-item/,"display:block");function m(a){return ch(a,a.currentStyle.paddingLeft)+ch(a,a.currentStyle.paddingRight)};function n(a){if(w<5.5)IE7.Layout.boxSizing(a.parentElement);var b=a.parentElement;var c=b.offsetWidth-a.offsetWidth-m(b);var d=(a.currentStyle["ie7-margin"]&&a.currentStyle.marginRight=="auto")||a.currentStyle["ie7-margin-right"]=="auto";switch(b.currentStyle.textAlign){case"right":c=(d)?parseInt(c/2):0;a.runtimeStyle.marginRight=parseInt(c)+"px";break;case"center":if(d)c=0;default:if(d)c=parseInt(c/2);a.runtimeStyle.marginLeft=parseInt(c)+"px"}};IE7.CSS.addRecalc("margin(-left|-right)?","[^};]*auto",function(a){if(ce(n,a,a.parentElement&&a.currentStyle.display=="block"&&a.currentStyle.marginLeft=="auto"&&a.currentStyle.position!="absolute")){n(a)}});cb(function(){for(var i in n.elements){element=n.elements[i];element.runtimeStyle.marginLeft=element.runtimeStyle.marginRight="";n(element)}})};document.write("<script id=__ready defer src=//:><\/script>");document.all.__ready.onreadystatechange=function(){if(this.readyState=="complete"){this.removeNode();bo()}}})();
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/index/index.css b/pluss-manage-page/src/main/resources/static/resources/auth/index/index.css
new file mode 100644
index 0000000..fa44ff5
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/index/index.css
@@ -0,0 +1,310 @@
+body,html {
+	height: 100%;
+	background: #eee;
+}
+
+/**消除当前焦点虚框 */
+:focus,:active {
+	outline: 0 !important;
+}
+
+* {
+	-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+}
+
+/*navbar*/
+.navbar {
+	position: relative;
+	margin: 0px;
+	padding: 0px;
+	-webkit-box-shadow: 0px 0px 3px #cccccc;
+	-moz-box-shadow: 0px 0px 3px #cccccc;
+	box-shadow: 0px 0px 3px #cccccc;
+}
+
+.navbar .nav>li>a,.navbar .nav>li>a:hover,.nav>li>a:active,.nav>li>a:focus
+	{
+	color: #fff !important;
+	text-shadow: none;
+	outline: none;
+}
+
+.navbar,.navbar .navbar-inner,.navbar .nav {
+	background-color: #57B1EF;
+	border-color: #57B1EF;
+}
+
+.navbar .navbar-inner {
+	background: #57B1EF;
+	background: -webkit-gradient(linear, left bottom, left top, color-stop(0, #57B1EF),
+		color-stop(1, #57B1EF) );
+	background: -ms-linear-gradient(bottom, #57B1EF, #57B1EF);
+	background: -moz-linear-gradient(center bottom, #57B1EF 0%, #57B1EF 100%);
+	background: -o-linear-gradient(bottom, #57B1EF, #57B1EF);
+	filter: progid:dximagetransform.microsoft.gradient(startColorStr='#57B1EF',
+		EndColorStr='#57B1EF' );
+	-ms-filter:
+		"progid:DXImageTransform.Microsoft.gradient(startColorStr='#57B1EF',EndColorStr='#57B1EF')";
+	padding: 0em 1em;
+	margin: 0px;
+	-webkit-border-radius: 0px;
+	-moz-border-radius: 0px;
+	border-radius: 0px;
+	-moz-background-clip: padding;
+	-webkit-background-clip: padding-box;
+	background-clip: padding-box;
+	border: 0px;
+	border-bottom: none;
+}
+
+.navbar .nav li.dropdown.open>.dropdown-toggle,.navbar .nav li.dropdown.active>.dropdown-toggle,.navbar .nav li.dropdown.open.active>.dropdown-toggle
+	{
+	color: #fff;
+	background-color: #3791CF;
+}
+
+.navbar .nav li.dropdown>.dropdown-toggle .caret {
+	border-top-color: #fff !important;
+	border-bottom-color: #fff !important;
+}
+
+.navbar .brand {
+	color: white;
+	text-shadow: none;
+	font-family: 'Microsoft YaHei';
+}
+
+/*Navigation*/
+.sidebar-nav {
+	width: 210px;
+	position: absolute;
+	border-top: none;
+	border-left: none;
+	left: 0;
+	/* background:#4d4d4d; */
+	top: 55px;
+	bottom: 0;
+	margin-bottom: 30px;
+	overflow-y: auto;
+	font-family: "Microsoft YaHei";
+}
+
+.sidebar-nav .nav-header {
+	border-top: 1px solid #ffffff;
+	border-bottom: 1px solid #c8c8cb;
+	border-left: none;
+	color: #444;
+	display: block;
+	background: #f9f9f9;
+	font-weight: bold;
+	font-size: 0.95em;
+	line-height: 2.5em;
+	padding: 0em 0.8em;
+	margin-bottom: 0px;
+	text-shadow: none;
+	text-transform: none;
+	text-decoration: none;
+	/*Change the arrow direction if the item is collapsed*/
+}
+
+.sidebar-nav .nav-header .label {
+	float: right;
+	margin-top: .7em;
+	line-height: 1.5em;
+	margin-right: .25em;
+}
+
+.sidebar-nav .nav-header i[class^="icon-"] {
+	margin-right: .75em;
+	margin-top: .7em;
+}
+
+.sidebar-nav .nav-header .icon-chevron-down {
+	float: right;
+}
+
+.sidebar-nav .nav-header.collapsed .icon-chevron-down {
+	background-position: -288px -120px;
+	opacity: .25;
+}
+
+.sidebar-nav .nav-list {
+	margin: 0px;
+	border: 0px;
+	background: #f6f6f6;
+	background: #fff;
+}
+
+.sidebar-nav .nav-list>li>a {
+	display: block;
+	margin: 0 0 -1px;
+	padding: 8px 14px;
+	border: 1px solid #e5e5e5;
+	padding: 8px 14px;
+}
+.sidebar-nav .nav-list>li>a:hover {
+	background: rgb(245, 245, 245);
+}
+
+.sidebar-nav .nav-list>li.active>a:hover {
+	background: #47A1DF;
+}
+
+.sidebar-nav .nav-list>li>a .icon-chevron-right {
+	float: right;
+	margin-top: 2px;
+	margin-right: -6px;
+	opacity: .25;
+}
+.sidebar-nav .nav-list>li.active>a .icon-chevron-right {
+	opacity:1;
+}
+
+.sidebar-nav .nav-list.collapse.in {
+	border-bottom: 1px solid #ccc;
+}
+
+.content {
+	position: absolute;
+	left: 0;
+	right: 0;
+	top: 0;
+	bottom: 0;
+	background: #ccc;
+	margin-top: 55px;  
+	height:100%;
+}
+
+.content>.split {
+	z-index: 100;
+	position: absolute;
+	background-color: #ccc;
+	cursor: pointer;
+}
+
+.content>.split.left,.content>.split.right {
+	left: -4px;
+	top: 45%;
+	width: 4px;
+	height: 50px;
+}
+
+.content>.split .caret {
+	position: absolute;
+	display: block;
+	z-index: 101;
+	top: 45%;
+}
+
+.content>.split.left .caret {
+	border-top: 4px solid transparent;
+	border-right: 4px solid #999;
+	border-left: 0px solid transparent;
+	border-bottom: 4px solid transparent;
+}
+
+.content>.split.right .caret {
+	border-top: 4px solid transparent;
+	border-right: 0px solid transparent;
+	border-left: 4px solid #999;
+	border-bottom: 4px solid transparent;
+}
+
+.content>.breadcrumb {
+	-webkit-box-shadow: none;
+	-moz-box-shadow: none;
+	box-shadow: none;
+	-webkit-border-radius: 0px;
+	-moz-border-radius: 0px;
+	border-radius: 0px;
+	-moz-background-clip: padding;
+	-webkit-background-clip: padding-box;
+	background-clip: padding-box;
+	border-bottom: 1px solid #aaa;
+	margin-bottom: .5em;
+	display : none;
+}
+
+.content>.breadcrumb>li {
+	margin-right: 5px;
+}
+
+.content>.iframe-wrap {
+	position: absolute;
+	left: 0;
+	right: 0;
+	top: 0;
+	bottom: 0;
+	margin-top: 40px;
+	margin-top:0;
+	display:none;
+}
+
+.content > .sys-icons {
+	position: absolute;
+	left: 0;
+	width:210px;
+	 background:url(../img/login/left-bg_07.jpg);
+	top:0;
+	bottom:0;
+	overflow:hidden;
+}
+
+.sys-icons .promptumenu_window {
+	margin: 0 auto;
+	border: none;
+	border-radius: 0;
+	-webkit-border-radius: 0;
+	background: transparent none;
+	cursor : auto;
+}
+
+.sys-icons ul li a {
+	cursor: pointer;
+	display : inline-block;
+	text-align: center;
+	color:#707070;
+	/* color: rgb(255, 255, 255); */
+	/* text-shadow: rgba(0, 0, 0, 0.247059) 0px 7px 15px; */
+	/* font-family: "Microsoft YaHei"; */
+	line-height: 1.5em;
+	margin-top:10px;
+	font-weight: 300;
+	-webkit-font-smoothing: antialiased;
+	text-decoration: none;
+	/* overflow: hidden; */
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	max-width: 120px;
+	min-width: 100px;
+}
+
+.sys-icons ul li a img {
+	width: 24px;
+	height: 24px;
+	float:left;
+}
+
+.sidebar-nav .nav-header:hover {
+  background: #efeff0;
+  background: -webkit-gradient(linear, left bottom, left top, color-stop(0, #efeff0), color-stop(1, #ffffff));
+  background: -ms-linear-gradient(bottom, #efeff0, #ffffff);
+  background: -moz-linear-gradient(center bottom, #efeff0 0%, #ffffff 100%);
+  background: -o-linear-gradient(bottom, #efeff0, #ffffff);
+  filter: progid:dximagetransform.microsoft.gradient(startColorStr='#4d5b76', EndColorStr='#6c7a95');
+  -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorStr='#ffffff',EndColorStr='#efeff0')";
+}
+
+.footer {
+	background:url(../img/login/footer_03.jpg) repeat-x; 
+	width:100%; 
+	height:40px; 
+	line-height:42px; 
+	text-align:center; 
+	color:#fff;
+	position: absolute;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	border-top: 0px solid #bbb;
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/index/index.js b/pluss-manage-page/src/main/resources/static/resources/auth/index/index.js
new file mode 100644
index 0000000..44d7079
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/index/index.js
@@ -0,0 +1,365 @@
+//给Date类型增加格式化原型方法
+Date.prototype.format = function(format) {
+	var o = {
+		"M+" : this.getMonth() + 1, // month
+		"d+" : this.getDate(), // day
+		"H+" : this.getHours(), // hour
+		"h+" : this.getHours(),
+		//"h+" : this.getHours()%12, //12 hour
+		"m+" : this.getMinutes(), // minute
+		"s+" : this.getSeconds(), // second
+		"q+" : Math.floor((this.getMonth() + 3) / 3), // quarter
+		"S" : this.getMilliseconds()
+	// millisecond
+	}
+	if (/(y+)/.test(format))
+		format = format.replace(RegExp.$1, (this.getFullYear() + "")
+				.substr(4 - RegExp.$1.length));
+	for ( var k in o)
+		if (new RegExp("(" + k + ")").test(format))
+			format = format.replace(RegExp.$1, RegExp.$1.length == 1 ? o[k]
+					: ("00" + o[k]).substr(("" + o[k]).length));
+	return format;
+}
+
+String.prototype.format = function() {
+	var args = arguments;
+	return this.replace(/\{(\d+)\}/g, function(m, i) {
+		return args[i];
+	});
+}
+
+String.prototype.replaceAll = function stringReplaceAll(AFindText, ARepText) {
+	raRegExp = new RegExp(AFindText, "g");
+	return this.replace(raRegExp, ARepText);
+};
+
+String.prototype.endWith = function(str) {
+	if (str == null || str == "" || this.length == 0 || str.length > this.length)
+		return false;
+	if (this.substring(this.length - str.length) == str)
+		return true;
+	else
+		return false;
+	return true;
+}
+String.prototype.startWith = function(str) {
+	if (str == null || str == "" || this.length == 0 || str.length > this.length)
+		return false;
+	if (this.substr(0, str.length) == str)
+		return true;
+	else
+		return false;
+	return true;
+}
+
+var IframeOnClick = {
+	resolution : 200,
+	iframes : [],
+	interval : null,
+	Iframe : function() {
+		this.element = arguments[0];
+		this.cb = arguments[1];
+		this.hasTracked = false;
+	},
+	track : function(element, cb) {
+		this.iframes.push(new this.Iframe(element, cb));
+		if (!this.interval) {
+			var _this = this;
+			this.interval = setInterval(function() {
+				_this.checkClick();
+			}, this.resolution);
+		}
+	},
+	checkClick : function() {
+		if (document.activeElement) {
+			var activeElement = document.activeElement;
+			for ( var i in this.iframes) {
+				if (activeElement === this.iframes[i].element) { // user is in this
+																													// Iframe
+					if (this.iframes[i].hasTracked == false) {
+						this.iframes[i].cb.apply(window, []);
+						this.iframes[i].hasTracked = true;
+					}
+				} else {
+					this.iframes[i].hasTracked = false;
+				}
+			}
+		}
+	}
+};
+
+var g_menus = [];
+
+function initMenu() {
+	$.ajax({
+		url : ctx + '/auth!getPermissionMenusOnceAll.do',
+		type : 'post',
+		data : [ {
+			name : 'loginName',
+			value : loginName
+		} ],
+		dataType : 'json',
+		async : false,
+		success : function(menus) {
+			g_menus = menus;
+			var tops = findRootMenus();
+			$.each(tops,function(i,top){
+				var roots = findChildMenus(top.id);
+				if(top.name!=null&&top.name.indexOf('左边菜单')>=0){
+					//加载子系统
+					$('.sys-icons ul').empty();
+					$.each(roots, function(i, root) {
+						var iconUrl = root.iconUrl?root.iconUrl : res + '/auth/index/home.png';
+						$('.sys-icons ul').append("<li><a id='{1}'><img src='{0}'/>{2}</a></li>".format(iconUrl,root.id,root.name));
+					})
+				}else if(top.name!=null&&top.name.indexOf('设置')>=0){
+					/*$.each(roots, function(i, root) {
+						var iconUrl = root.iconUrl?root.iconUrl : res + '/auth/index/home.png';
+						$('#subNavDiv1').append("<a class='s2' style='color:black;text-decoration:none;' id='{1}'><span style='background:url({0}) no-repeat;display:block;width:45px;height:45px;'></span><span style='font-size: 0.8em;'>{2}</span></a>".format(iconUrl,root.id,root.name));
+					})*/
+				}else if(top.name!=null&&top.name.indexOf('微行业')>=0){
+					if(roots.length>1){
+						$("#set1").css({"background":"url("+res+"/auth/img/login/img_18.jpg) right center no-repeat"});
+						$.each(roots, function(i, root) {
+							var iconUrl = root.iconUrl?root.iconUrl : res + '/auth/index/home.png';
+							$('#subNavDiv2').append("<a class='s2' style='color:black;text-decoration:none;' id='{1}'><span style='background:url({0}) no-repeat;display:block;width:45px;height:45px;'></span><span style='font-size: 0.8em;'>{2}</span></a>".format(iconUrl,root.id,root.name));
+						})
+					}else if(roots.length==1){
+						set1Flag=1;
+						$("#set1").css({"background":""});
+						var iconUrl = roots[0].iconUrl?roots[0].iconUrl : res + '/auth/index/home.png';
+						$("#parentNav2").empty().append("<a href='javascript:goIndexPage2(this);oneMenu("+roots[0].id+")' style='color: #fff;' target='_top'>"+roots[0].name+"</a>");
+						$('#subNavDiv2').hide();
+						//$('#subNavDiv2').append("<a class='s2' style='color:black;text-decoration:none;' id='{1}'><span style='background:url({0}) no-repeat;display:block;width:45px;height:45px;'></span><span style='font-size: 0.8em;'>{2}</span></a>".format(iconUrl,roots[0].id,roots[0].name));
+					}
+				}
+			});
+			/*$('.sys-icons ul').promptumenu({
+				'height' : $('.sys-icons').height(),
+				'rows': 3,
+				'columns': 3,
+				'direction': 'horizontal',
+				'pages': true
+			});*/
+		}
+	})
+}
+
+function loadMenu(root){
+	$("#kinMax").hide();
+	$("#brand").text(root.description?root.description:root.name);
+	$("#brand").data("menu-id",root.id);
+	if(typeof(root.link)=='undefined'){
+		root.link='';
+	}
+	var home = root.link.replace(/\/?#*$/,"");
+	var path = home.substr(home.lastIndexOf('/'));
+	$("#logout_link").attr("href",home + "/home!logout.do");
+	var $sidebar = $("#side_menu").empty();
+	var $folder = $("<div></div>").setTemplateElement("menu_tmpl");
+	var folders = findChildMenus(root.id);
+	$.each(folders,function(i,menu){
+		var iconUrl = menu.iconUrl?menu.iconUrl : res + '/auth/index/home.png';
+		menu.iconUrl = iconUrl;
+		var $html = $folder.processTemplate(menu);
+		var ul = $html.find("ul.nav-list").empty();
+		var children = findChildMenus(menu.id);
+		$.each(children,function(j,child){
+			var link = child.link;
+			if(!link.startWith("http") && !link.startWith("https")) {
+				if(link.startWith(path)){
+					link = link.replace(path,"");
+				}
+				if(!link.startWith("/")){
+					link = "/" + link;
+				}
+				link = home + link;
+			}
+			var iconUrl = child.iconUrl?child.iconUrl : res + '/auth/index/home.png';
+			if(link.indexOf("?") > 0){
+				ul.append("<li id='submenu_{0}'><a href='{1}&parentMenu={3}&childMenu={2}' target='main_frame'><img src='{4}' width='14' height='14' style='margin-right:10px;'/>{2}<i class='icon-chevron-right'></i></a></li>".format(child.id,link,child.name,menu.name,iconUrl));
+			}else{
+				ul.append("<li id='submenu_{0}'><a href='{1}?parentMenu={3}&childMenu={2}' target='main_frame'><img src='{4}' width='14' height='14' style='margin-right:10px;'/>{2}<i class='icon-chevron-right'></i></a></li>".format(child.id,link,child.name,menu.name,iconUrl));
+			}
+		})
+		$html.find("li:first").css("margin-top","1em");
+		$html.find("li:last").css("margin-bottom","1em");
+		$sidebar.append($html.html());
+	});
+
+}
+
+function findRootMenus(){
+	var roots = [];
+	$.each(g_menus,function(i,menu){
+		if(!menu.parent){
+			roots.push(menu);
+		}
+	})
+	return roots;
+}
+
+function findChildMenus(pid) {
+	var children = [];
+	if(!pid) {
+		return findRootMenus();
+	}
+
+	$.each(g_menus,function(i,menu){
+		
+		if(menu.parentId && menu.parentId == pid) {
+			children.push(menu);
+		}
+	}) 
+	return children;
+}
+
+function findMenuById(id) {
+	var ret = null;
+	$.each(g_menus,function(i,menu){
+		if(menu.id == id) {
+			ret = menu;
+			return false;
+		}
+	});
+	return ret;
+}
+
+function initAuthUrl(){
+	$.ajax({
+		url : ctx + '/anon/getAuthUrl',
+		type : 'POST',
+		success : function(data) {
+			if(data) {
+				$("#auth_link").attr("href",data);
+				$("#pwd_link").attr("href",data + '/user/changePwd');
+			}
+		}
+	});
+}
+
+function hideBreadcrumb(){
+	$(".content .breadcrumb").hide();
+	$(".content .iframe-wrap").css("margin-top","0");
+}
+
+function showBreadcrumb(){
+	var $el = $(".content .breadcrumb").show();
+	$(".content .iframe-wrap").css("margin-top",$el.height()+"px");
+}
+
+function hideSidebar(){
+	$(".content .split").hide();
+	$(".content").css({
+		"margin-left" : 0,
+		"border-left" : 0
+	});
+}
+
+function showSidebar(){
+	$(".content").css({
+		"border-left" : "4px solid #999"
+	});
+	$(".content .split").show();
+	$(".content").animate({
+		"margin-left" : $(".sidebar-nav").width()
+	},function(){
+		showFrame();
+		$(".sidebar-nav a.nav-header:first").trigger("click");
+	});
+}
+
+function showFrame(){
+	$(".sys-icons").hide();
+	$(".iframe-wrap").show();
+}
+
+function showBlank(){
+	$("#main_frame").removeAttr("src");
+}
+
+$(function(){
+	
+	$(document).on("click",".content .split.left",function(){
+		$(this).removeClass("left");
+		$(this).addClass("right");
+		$(".content").animate({
+			'margin-left' : 0
+		})
+	});
+	
+	$(document).on("click",".content .split.right",function(){
+		$(this).removeClass("right");
+		$(this).addClass("left");
+		$(".content").animate({
+			'margin-left' : $(".sidebar-nav").width()
+		})
+	});
+	
+	$(document).on("click",".sidebar-nav .nav-list>li",function(){
+		$(".sidebar-nav .nav-list>li").removeClass("active");
+		$(this).addClass("active");
+		var pText = $(this).closest("ul").prev("a:first").text();
+		var text = $(this).find("a:first").text();
+		var bread = $(".content .breadcrumb").empty();
+		bread.append("<li class='active'>{0}<span class='divider'>/</span></li>".format(pText));
+		bread.append("<li class='active'>{0}</li>".format(text));
+	});
+	
+	$(document).on("click",".sys-icons ul li a",function(){
+		var $this = $(this);
+		if(!$.browser.msie){
+			$this.css("opacity","0.5");
+		}
+		setTimeout(function(){
+			try{
+				var id = $this.attr("id");
+				showSidebar();
+				loadMenu(findMenuById(id));
+				showBlank();
+			}catch(e){
+			}
+			$(".leftside_content").css("width",0);
+			$this.css("opacity","1");
+		},200);
+	})
+	
+	$(document).on("click",".subNav a",function(){
+		var $this = $(this);
+		if(!$.browser.msie){
+			$this.css("opacity","0.5");
+		}
+		setTimeout(function(){
+			try{
+				var id = $this.attr("id");
+				var _content = $this.children("span").last().text();
+				modifyNavTitle(_content);
+				showSidebar();
+				loadMenu(findMenuById(id));
+				showBlank();
+			}catch(e){
+			}
+			$this.css("opacity","1");
+		},200);
+	})
+	
+	$(document).on("mouseover",".subNav a",function(){  
+		$(this).css("background","#f9f9f9");
+	}); 
+	$(document).on("mouseout",".subNav a",function(){  
+		$(this).css("background","none");
+	}); 
+	
+	IframeOnClick.track(document.getElementById("main_frame"), function() { 
+		$(document).trigger("click");
+	});
+	
+	initMenu();
+})
+
+function oneMenu(id){
+	showSidebar();
+	loadMenu(findMenuById(id));
+	showBlank();
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/index/jquery-jtemplates.js b/pluss-manage-page/src/main/resources/static/resources/auth/index/jquery-jtemplates.js
new file mode 100644
index 0000000..8a90d6f
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/index/jquery-jtemplates.js
@@ -0,0 +1,2 @@
+/* jTemplates 0.8.4 (http://jtemplates.tpython.com) Copyright (c) 2007-2013 Tomasz Gloc */
+eval(function(p,a,c,k,e,r){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}('6(3w.b&&!3w.b.3x){(7(b){9 j=7(s,H,m){5.1g=[];5.1D={};5.2M=u;5.1W={};5.1h={};5.m=b.1i({1X:1c,3y:1x,2N:1c,2O:1c,3z:1x,3A:1x},m);5.1E=(5.m.1E!==D)?(5.m.1E):(R.2g);5.13=(5.m.13!==D)?(5.m.13):(R.3B);5.2h=(5.m.2h!==D)?(5.m.2h):((5.m.1X)?(b.2P):(R.2P));6(s==u){c}5.3C(s,H);6(s){5.1F(5.1h[\'2i\'],H,5.m)}5.1h=u};j.4k=\'0.8.4\';j.J=1c;j.3D=4l;j.1y=0;j.z.3C=7(s,H){9 2Q=/\\{#1d *(\\w+) *(.*?) *\\}/g,2j,1G,U,1H=u,2R=[],i;2k((2j=2Q.4m(s))!==u){1H=2Q.1H;1G=2j[1];U=s.1Y(\'{#/1d \'+1G+\'}\',1H);6(U===-1){E p V(\'14: j "\'+1G+\'" 2S 2l 4n.\');}5.1h[1G]=s.1Z(1H,U);2R[1G]=R.2T(2j[2])}6(1H===u){5.1h[\'2i\']=s;c}K(i 2m 5.1h){6(i!==\'2i\'){5.1W[i]=p j()}}K(i 2m 5.1h){6(i!==\'2i\'){5.1W[i].1F(5.1h[i],b.1i({},H||{},5.1W||{}),b.1i({},5.m,2R[i]));5.1h[i]=u}}};j.z.1F=7(s,H,m){6(s==D){5.1g.x(p 1p(\'\',1,5));c}s=s.15(/[\\n\\r]/g,\'\');s=s.15(/\\{\\*.*?\\*\\}/g,\'\');5.2M=b.1i({},5.1W||{},H||{});5.m=p 2n(m);9 A=5.1g,20=s.1j(/\\{#.*?\\}/g),16=0,U=0,e,1q=0,i,l;K(i=0,l=(20)?(20.X):(0);i<l;++i){9 10=20[i];6(1q){U=s.1Y(\'{#/1I}\',16);6(U===-1){E p V("14: 4o 21 3E 1I.");}6(U>16){A.x(p 1p(s.1Z(16,U),1,5))}16=U+11;1q=0;2k(i<l&&20[i]!==\'{#/1I}\'){i++}22}U=s.1Y(10,16);6(U>16){A.x(p 1p(s.1Z(16,U),1q,5))}10.1j(/\\{#([\\w\\/]+).*?\\}/);9 2o=L.$1;2U(2o){B\'4p\':A.2V(10);F;B\'6\':e=p 1z(A,5);e.2V(10);A.x(e);A=e;F;B\'W\':A.2W();F;B\'/6\':B\'/K\':B\'/2X\':A=A.2Y();F;B\'2X\':e=p 1A(10,A,5);A.x(e);A=e;F;B\'K\':e=3F(10,A,5);A.x(e);A=e;F;B\'22\':B\'F\':A.x(p 17(2o));F;B\'2Z\':A.x(p 30(10,5.2M,5));F;B\'h\':A.x(p 31(10,5));F;B\'9\':A.x(p 32(10,5));F;B\'33\':A.x(p 34(10));F;B\'4q\':A.x(p 1p(\'{\',1,5));F;B\'4r\':A.x(p 1p(\'}\',1,5));F;B\'1I\':1q=1;F;B\'/1I\':6(j.J){E p V("14: 4s 35 3E 1I.");}F;3G:6(j.J){E p V(\'14: 4t 4u: \'+2o+\'.\');}}16=U+10.X}6(s.X>16){A.x(p 1p(s.3H(16),1q,5))}};j.z.M=7(d,h,q,I){++I;6(I==1&&q!=D){b.36(q,"2p")}9 $T=d,$P,18=\'\';6(5.m.3z){$T=5.1E(d,{2q:(5.m.3y&&I==1),23:5.m.1X},5.13)}6(!5.m.3A){$P=b.1i({},5.1D,h)}W{$P=b.1i({},5.1E(5.1D,{2q:(5.m.2N),23:1c},5.13),5.1E(h,{2q:(5.m.2N&&I==1),23:1c},5.13))}K(9 i=0,l=5.1g.X;i<l;++i){18+=5.1g[i].M($T,$P,q,I)}5.2r=u;--I;c 18};j.z.12=7(){6(5.2r==u){5.2r=p 2s(5)}c 5.2r};j.z.37=7(24,1B){5.1D[24]=1B};R=7(){};R.3B=7(3I){c 3I.15(/&/g,\'&4v;\').15(/>/g,\'&3J;\').15(/</g,\'&3K;\').15(/"/g,\'&4w;\').15(/\'/g,\'&#39;\')};R.2g=7(d,1J,13){6(d==u){c d}2U(d.38){B 2n:9 o={};K(9 i 2m d){o[i]=R.2g(d[i],1J,13)}6(!1J.23){6(d.4x("3a")){o.3a=d.3a}}c o;B 4y:9 a=[];K(9 i=0,l=d.X;i<l;++i){a[i]=R.2g(d[i],1J,13)}c a;B 3b:c(1J.2q)?(13(d)):(d);B 3L:6(1J.23){6(j.J){E p V("14: 4z 4A 2l 4B.");}W{c D}}}c d};R.2T=7(2t){6(2t===u||2t===D){c{}}9 o=2t.4C(/[= ]/);6(o[0]===\'\'){o.4D()}9 25={};K(9 i=0,l=o.X;i<l;i+=2){25[o[i]]=o[i+1]}c 25};R.2P=7(G){6(1K G!=="4E"||!G){c u}1k{c(p 3L("c "+b.3M(G)))()}1l(e){6(j.J){E p V("14: 4F 4G");}c{}}};R.3N=7(26,1y,3c){2k(26!=u){9 d=b.G(26,\'2p\');6(d!=D&&d.1y==1y&&d.d[3c]!=D){c d.d[3c]}26=26.4H}c u};9 1p=7(3d,1q,1d){5.27=3d;5.3O=1q;5.O=1d};1p.z.M=7(d,h,q,I){6(5.3O){c 5.27}9 s=5.27;9 19="";9 i=-1;9 28=0;9 29=-1;9 1L=0;2k(1x){9 1M=s.1Y("{",i+1);9 1N=s.1Y("}",i+1);6(1M<0&&1N<0){F}6((1M!=-1&&1M<1N)||(1N==-1)){i=1M;6(++28==1){29=1M;19+=s.1Z(1L,i);1L=-1}}W{i=1N;6(--28===0){6(29>=0){19+=5.O.12().3P(d,h,q,s.1Z(29,1N+1));29=-1;1L=i+1}}W 6(28<0){28=0}}}6(1L>-1){19+=s.3H(1L)}c 19};2s=7(t){5.3e=t};2s.z.3P=7($T,$P,$Q,2u){1k{9 19=3f(2u);6(b.4I(19)){6(5.3e.m.1X||!5.3e.m.2O){c\'\'}19=19($T,$P,$Q)}c(19===D)?(""):(3b(19))}1l(e){6(j.J){6(e 1C 17){e.1m="4J"}E e;}c""}};2s.z.1a=7($T,$P,$Q,2u){c 3f(2u)};9 1z=7(1O,1r){5.2v=1O;5.1P=1r;5.2a=[];5.1g=[];5.1Q=u};1z.z.x=7(e){5.1Q.x(e)};1z.z.2Y=7(){c 5.2v};1z.z.2V=7(N){N.1j(/\\{#(?:W)*6 (.*?)\\}/);5.2a.x(L.$1);5.1Q=[];5.1g.x(5.1Q)};1z.z.2W=7(){5.2a.x(1x);5.1Q=[];5.1g.x(5.1Q)};1z.z.M=7(d,h,q,I){9 18=\'\';1k{K(9 2b=0,3Q=5.2a.X;2b<3Q;++2b){6(5.1P.12().1a(d,h,q,5.2a[2b])){9 t=5.1g[2b];K(9 i=0,l=t.X;i<l;++i){18+=t[i].M(d,h,q,I)}c 18}}}1l(e){6(j.J||(e 1C 17)){E e;}}c 18};3F=7(N,1O,1d){6(N.1j(/\\{#K (\\w+?) *= *(\\S+?) +4K +(\\S+?) *(?:1b=(\\S+?))*\\}/)){9 f=p 1A(u,1O,1d);f.C=L.$1;f.Y={\'35\':(L.$2||0),\'21\':(L.$3||-1),\'1b\':(L.$4||1),\'y\':\'$T\'};f.3g=(7(i){c i});c f}W{E p V(\'14: 4L 4M "3R": \'+N);}};9 1A=7(N,1O,1d){5.2v=1O;5.O=1d;6(N!=u){N.1j(/\\{#2X +(.+?) +3S +(\\w+?)( .+)*\\}/);5.3T=L.$1;5.C=L.$2;5.Y=L.$3||u;5.Y=R.2T(5.Y)}5.2w=[];5.2x=[];5.3h=5.2w};1A.z.x=7(e){5.3h.x(e)};1A.z.2Y=7(){c 5.2v};1A.z.2W=7(){5.3h=5.2x};1A.z.M=7(d,h,q,I){1k{9 1s=(5.3g===D)?(5.O.12().1a(d,h,q,5.3T)):(5.3g);6(1s===$){E p V("2c: 4N \'$\' 4O 4P 4Q 3S 3U-7");}9 2d=[];9 1R=1K 1s;6(1R==\'3V\'){9 3i=[];b.1t(1s,7(k,v){2d.x(k);3i.x(v)});1s=3i}9 y=(5.Y.y!==D)?(5.O.12().1a(d,h,q,5.Y.y)):((d!=u)?(d):({}));6(y==u){y={}}9 s=2e(5.O.12().1a(d,h,q,5.Y.35)||0),e;9 1b=2e(5.O.12().1a(d,h,q,5.Y.1b)||1);6(1R!=\'7\'){e=1s.X}W{6(5.Y.21===D||5.Y.21===u){e=2e.4R}W{e=2e(5.O.12().1a(d,h,q,5.Y.21))+((1b>0)?(1):(-1))}}9 18=\'\';9 i,l;6(5.Y.2f){9 3j=s+2e(5.O.12().1a(d,h,q,5.Y.2f));e=(3j>e)?(e):(3j)}6((e>s&&1b>0)||(e<s&&1b<0)){9 1S=0;9 3W=(1R!=\'7\')?(4S.4T((e-s)/1b)):D;9 1u,1n;9 3k=0;K(;((1b>0)?(s<e):(s>e));s+=1b,++1S,++3k){6(j.J&&3k>j.3D){E p V("2c: 4U 3U 4V 4W 4X");}1u=2d[s];6(1R!=\'7\'){1n=1s[s]}W{1n=1s(s);6(1n===D||1n===u){F}}6((1K 1n==\'7\')&&(5.O.m.1X||!5.O.m.2O)){22}6((1R==\'3V\')&&(1u 2m 2n)&&(1n===2n[1u])){22}9 3X=y[5.C];y[5.C]=1n;y[5.C+\'$3Y\']=s;y[5.C+\'$1S\']=1S;y[5.C+\'$3Z\']=(1S===0);y[5.C+\'$40\']=(s+1b>=e);y[5.C+\'$41\']=3W;y[5.C+\'$2d\']=(1u!==D&&1u.38==3b)?(5.O.13(1u)):(1u);y[5.C+\'$1K\']=1K 1n;K(i=0,l=5.2w.X;i<l;++i){1k{18+=5.2w[i].M(y,h,q,I)}1l(1T){6(1T 1C 17){2U(1T.1m){B\'22\':i=l;F;B\'F\':i=l;s=e;F;3G:E 1T;}}W{E 1T;}}}1v y[5.C+\'$3Y\'];1v y[5.C+\'$1S\'];1v y[5.C+\'$3Z\'];1v y[5.C+\'$40\'];1v y[5.C+\'$41\'];1v y[5.C+\'$2d\'];1v y[5.C+\'$1K\'];1v y[5.C];y[5.C]=3X}}W{K(i=0,l=5.2x.X;i<l;++i){18+=5.2x[i].M(d,h,q,I)}}c 18}1l(e){6(j.J||(e 1C 17)){E e;}c""}};9 17=7(1m){5.1m=1m};17.z=V;17.z.M=7(d){E 5;};9 30=7(N,H,1r){N.1j(/\\{#2Z (.*?)(?: 4Y=(.*?))?\\}/);5.O=H[L.$1];6(5.O==D){6(j.J){E p V(\'14: 4Z 3R 2Z: \'+L.$1);}}5.42=L.$2;5.43=1r};30.z.M=7(d,h,q,I){1k{c 5.O.M(5.43.12().1a(d,h,q,5.42),h,q,I)}1l(e){6(j.J||(e 1C 17)){E e;}}c\'\'};9 31=7(N,1r){N.1j(/\\{#h 24=(\\w*?) 1B=(.*?)\\}/);5.C=L.$1;5.27=L.$2;5.1P=1r};31.z.M=7(d,h,q,I){1k{h[5.C]=5.1P.12().1a(d,h,q,5.27)}1l(e){6(j.J||(e 1C 17)){E e;}h[5.C]=D}c\'\'};9 32=7(N,1r){N.1j(/\\{#9 (.*?)\\}/);5.44=L.$1;5.1P=1r};32.z.M=7(d,h,q,I){1k{6(q==D){c""}9 25=5.1P.12().1a(d,h,q,5.44);9 1U=b.G(q,"2p");6(1U==D){1U={1y:(++j.1y),d:[]}}9 i=1U.d.x(25);b.G(q,"2p",1U);c"(R.3N(5,"+1U.1y+","+(i-1)+"))"}1l(e){6(j.J||(e 1C 17)){E e;}c\'\'}};9 34=7(N){N.1j(/\\{#33 50=(.*?)\\}/);5.3l=3f(L.$1);5.3m=5.3l.X;6(5.3m<=0){E p V(\'14: 51 52 K 33\');}5.3n=0;5.3o=-1};34.z.M=7(d,h,q,I){9 3p=b.G(q,\'2y\');6(3p!=5.3o){5.3o=3p;5.3n=0}9 i=5.3n++%5.3m;c 5.3l[i]};b.1e.1F=7(s,H,m){c b(5).1t(7(){9 t=(s&&s.38==j)?s:p j(s,H,m);b.G(5,\'2c\',t);b.G(5,\'2y\',0)})};b.1e.53=7(1V,H,m){9 s=b.2z({1w:1V,2A:\'2B\',2C:1c,1m:\'45\'}).46;c b(5).1F(s,H,m)};b.1e.54=7(3q,H,m){9 s=b(\'#\'+3q).3d();6(s==u){s=b(\'#\'+3q).47();s=s.15(/&3K;/g,"<").15(/&3J;/g,">")}s=b.3M(s);s=s.15(/^<\\!\\[55\\[([\\s\\S]*)\\]\\]>$/48,\'$1\');s=s.15(/^<\\!--([\\s\\S]*)-->$/48,\'$1\');c b(5).1F(s,H,m)};b.1e.56=7(){9 2f=0;b(5).1t(7(){6(b.2D(5)){++2f}});c 2f};b.1e.57=7(){b(5).49();c b(5).1t(7(){b.36(5,\'2c\')})};b.1e.37=7(24,1B){c b(5).1t(7(){9 t=b.2D(5);6(t!=u){t.37(24,1B)}W 6(j.J){E p V(\'14: j 2S 2l 4a.\');}})};b.1e.3r=7(d,h,1o){c b(5).1t(7(){9 t=b.2D(5);6(t!=u){6(1o!=D&&1o.3s){d=t.2h(d)}b.G(5,\'2y\',b.G(5,\'2y\')+1);b(5).47(t.M(d,h,5,0))}W 6(j.J){E p V(\'14: j 2S 2l 4a.\');}})};b.1e.58=7(1V,h,1o){9 Z=5;9 o=b.1i({2E:1c},b.59);o=b.1i(o,1o);b.2z({1w:1V,1m:o.1m,G:o.G,4b:o.4b,2C:o.2C,2F:o.2F,2E:o.2E,4c:o.4c,2A:\'2B\',4d:7(d){9 r=b(Z).3r(d,h,{3s:1x});6(o.2G){o.2G(r)}},5a:o.5b,5c:o.5d});c 5};9 3t=7(1w,h,2H,2I,1f,1o){5.4e=1w;5.1D=h;5.4f=2H;5.4g=2I;5.1f=1f;5.4h=u;5.2J=1o||{};9 Z=5;b(1f).1t(7(){b.G(5,\'3u\',Z)});5.3v()};3t.z.3v=7(){5.1f=b.4i(5.1f,7(2K){c(b.5e(5f.5g,2K.5h?2K[0]:2K))});6(5.1f.X===0){c}9 Z=5;b.2z({1w:5.4e,2A:\'2B\',G:5.4g,2E:1c,2F:Z.2J.2F,4d:7(d){1k{9 r=b(Z.1f).3r(d,Z.1D,{3s:1x});6(Z.2J.2G){Z.2J.2G(r)}}1l(1T){}}});5.4h=5i(7(){Z.3v()},5.4f)};b.1e.5j=7(1w,h,2H,2I,1o){c p 3t(1w,h,2H,2I,5,1o)};b.1e.49=7(){c b(5).1t(7(){9 2L=b.G(5,\'3u\');6(2L==u){c}9 Z=5;2L.1f=b.4i(2L.1f,7(o){c o!=Z});b.36(5,\'3u\')})};b.1i({3x:7(s,H,m){c p j(s,H,m)},5k:7(1V,H,m){9 s=b.2z({1w:1V,2A:\'2B\',2C:1c,1m:\'45\'}).46;c p j(s,H,m)},2D:7(q){c b.G(q,\'2c\')},5l:7(1d,G,4j){c 1d.M(G,4j,D,0)},5m:7(1B){j.J=1B}})})(b)};',62,333,'|||||this|if|function||var||jQuery|return|||||param||Template|||settings|||new|element||||null|||push|extData|prototype|node|case|_name|undefined|throw|break|data|includes|deep|DEBUG_MODE|for|RegExp|get|oper|_template|||TemplateUtils|||se|Error|else|length|_option|that|this_op||getBin|f_escapeString|jTemplates|replace|ss|JTException|ret|result|evaluate|step|false|template|fn|objs|_tree|_templates_code|extend|match|try|catch|type|cval|options|TextNode|literalMode|templ|fcount|each|ckey|delete|url|true|guid|opIF|opFOREACH|value|instanceof|_param|f_cloneData|setTemplate|tname|lastIndex|literal|filter|typeof|sExpr|lm|rm|par|_templ|_curr|mode|iteration|ex|refobj|url_|_templates|disallow_functions|indexOf|substring|op|end|continue|noFunc|name|obj|el|_value|nested|sText|_cond|ci|jTemplate|key|Number|count|cloneData|f_parseJSON|MAIN|iter|while|not|in|Object|op_|jTemplatesRef|escapeData|EvalObj|EvalClass|optionText|__value|_parent|_onTrue|_onFalse|jTemplateSID|ajax|dataType|text|async|getTemplate|cache|headers|on_success|interval|args|_options|elem|updater|_includes|filter_params|runnable_functions|parseJSON|reg|_template_settings|is|optionToObject|switch|addCond|switchToElse|foreach|getParent|include|Include|UserParam|UserVariable|cycle|Cycle|begin|removeData|setParam|constructor||toString|String|id|val|__templ|eval|_runFunc|_currentState|arr|tmp|loopCounter|_values|_length|_index|_lastSessionID|sid|elementName|processTemplate|StrToJSON|Updater|jTemplateUpdater|run|window|createTemplate|filter_data|clone_data|clone_params|escapeHTML|splitTemplates|FOREACH_LOOP_LIMIT|of|opFORFactory|default|substr|txt|gt|lt|Function|trim|ReturnRefValue|_literalMode|evaluateContent|cl|find|as|_arg|loop|object|_total|prevValue|index|first|last|total|_root|_mainTempl|_id|GET|responseText|html|im|processTemplateStop|defined|dataFilter|timeout|success|_url|_interval|_args|timer|grep|parameter|version|10000|exec|closed|No|elseif|ldelim|rdelim|Missing|unknown|tag|amp|quot|hasOwnProperty|Array|Functions|are|allowed|split|shift|string|Invalid|JSON|parentNode|isFunction|subtemplate|to|Operator|failed|Variable|cannot|be|used|MAX_VALUE|Math|ceil|Foreach|limit|was|exceed|root|Cannot|values|no|elements|setTemplateURL|setTemplateElement|CDATA|hasTemplate|removeTemplate|processTemplateURL|ajaxSettings|error|on_error|complete|on_complete|contains|document|body|jquery|setTimeout|processTemplateStart|createTemplateURL|processTemplateToText|jTemplatesDebugMode'.split('|'),0,{}));
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/index/transit.js b/pluss-manage-page/src/main/resources/static/resources/auth/index/transit.js
new file mode 100644
index 0000000..b3c1dc3
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/index/transit.js
@@ -0,0 +1,68 @@
+//给Date类型增加格式化原型方法
+Date.prototype.format = function(format) {
+	var o = {
+		"M+" : this.getMonth() + 1, // month
+		"d+" : this.getDate(), // day
+		"H+" : this.getHours(), // hour
+		"h+" : this.getHours(),
+		//"h+" : this.getHours()%12, //12 hour
+		"m+" : this.getMinutes(), // minute
+		"s+" : this.getSeconds(), // second
+		"q+" : Math.floor((this.getMonth() + 3) / 3), // quarter
+		"S" : this.getMilliseconds()
+	// millisecond
+	}
+	if (/(y+)/.test(format))
+		format = format.replace(RegExp.$1, (this.getFullYear() + "")
+				.substr(4 - RegExp.$1.length));
+	for ( var k in o)
+		if (new RegExp("(" + k + ")").test(format))
+			format = format.replace(RegExp.$1, RegExp.$1.length == 1 ? o[k]
+					: ("00" + o[k]).substr(("" + o[k]).length));
+	return format;
+}
+
+String.prototype.format = function() {
+	var args = arguments;
+	return this.replace(/\{(\d+)\}/g, function(m, i) {
+		return args[i];
+	});
+}
+
+var g_menus = [];
+function initMenu() {
+	$.ajax({
+		url : ctx + '/anon/getPermissionMenusOnceAll',
+		type : 'post',
+		data : [ {
+			name : 'loginName',
+			value : loginName
+		} ],
+		dataType : 'json',
+		success : function(menus) {
+			g_menus = menus;
+			var roots = findRootMenus();
+
+			//加载子系统
+			$('.under_part ul').empty();
+			$.each(roots, function(i, root) {
+				var iconUrl = root.iconUrl?root.iconUrl : ctx + '/resources/auth/img/index/mircoindex.png';
+				$('.under_part ul').append("<li><span><a id='{1}' href='{3}'><img src='{0}' width='24' height='24' /><span class='micromenulname'>{2}</span></a></span></li>".format(iconUrl,root.id,root.name,root.link));
+			})
+		}
+	})
+}
+
+function findRootMenus(){
+	var roots = [];
+	$.each(g_menus,function(i,menu){
+		if(!menu.parent){
+			roots.push(menu);
+		}
+	})
+	return roots;
+}
+
+$(function(){
+	initMenu();
+})
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-loadmask-0.4/demo/example.html b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-loadmask-0.4/demo/example.html
new file mode 100644
index 0000000..281d277
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-loadmask-0.4/demo/example.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html PUBLIC  "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

+<html>

+	<head>

+		<title>jQuery LoadMask Demo</title>

+		<link href="../jquery.loadmask.css" rel="stylesheet" type="text/css" />

+		<script type="text/javascript" src="http://code.jquery.com/jquery-latest.pack.js"></script>

+		<script type='text/javascript' src='../jquery.loadmask.js'></script>

+		<style>

+			body{font-size:11px;font-family:tahoma;}

+			#content { padding:5px;width:200px; }

+			#buttons { padding-left:40px; }

+		</style>

+	</head>

+	<body>

+		Please fill out the form:

+		<div id="content">

+			<div>Field1: <input type="text"></div>

+			<div>Field2: <input type="text"></div>

+			<div>Field3: <input type="text"></div>

+			<div>Field4: <input type="text"></div>

+		</div>

+		<div id="buttons">

+			<input type="button" value="Process" id="process">

+			<input type="button" value="Cancel" id="cancel">

+		</div>

+		

+		<script>

+			$(document).ready(function(){

+				$("#process").bind("click", function () {

+					$("#content").mask("Waiting...");

+				});

+				

+				$("#cancel").bind("click", function () {

+					$("#content").unmask();

+				});

+			});

+		</script>

+	</body>

+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-loadmask-0.4/images/loading.gif b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-loadmask-0.4/images/loading.gif
new file mode 100644
index 0000000..e846e1d
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-loadmask-0.4/images/loading.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-loadmask-0.4/jquery.loadmask.css b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-loadmask-0.4/jquery.loadmask.css
new file mode 100644
index 0000000..d9db63a
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-loadmask-0.4/jquery.loadmask.css
@@ -0,0 +1,40 @@
+.loadmask {
+    z-index: 100;
+    position: absolute;
+    top:0;
+    left:0;
+    -moz-opacity: 0.5;
+    opacity: .50;
+    filter: alpha(opacity=50);
+    background-color: #CCC;
+    width: 100%;
+    height: 100%;
+    zoom: 1;
+}
+.loadmask-msg {
+    z-index: 20001;
+    position: absolute;
+    top: 0;
+    left: 0;
+    border:1px solid #6593cf;
+    background: #c3daf9;
+    padding:2px;
+}
+.loadmask-msg div {
+    padding:5px 10px 5px 25px;
+    background: #fbfbfb url('../images/loading.gif') no-repeat 5px 5px;
+    line-height: 16px;
+	border:1px solid #a3bad9;
+    color:#222;
+    font:normal 11px tahoma, arial, helvetica, sans-serif;
+    cursor:wait;
+}
+.masked {
+    overflow: hidden !important;
+}
+.masked-relative {
+    position: relative !important;
+}
+.masked-hidden {
+    visibility: hidden !important;
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-loadmask-0.4/jquery.loadmask.js b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-loadmask-0.4/jquery.loadmask.js
new file mode 100644
index 0000000..862eb24
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-loadmask-0.4/jquery.loadmask.js
@@ -0,0 +1,108 @@
+/**
+ * Copyright (c) 2009 Sergiy Kovalchuk (serg472@gmail.com)
+ * 
+ * Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php)
+ * and GPL (http://www.opensource.org/licenses/gpl-license.php) licenses.
+ *  
+ * Following code is based on Element.mask() implementation from ExtJS framework (http://extjs.com/)
+ *
+ */
+;(function($){
+	
+	/**
+	 * Displays loading mask over selected element(s). Accepts both single and multiple selectors.
+	 *
+	 * @param label Text message that will be displayed on top of the mask besides a spinner (optional). 
+	 * 				If not provided only mask will be displayed without a label or a spinner.  	
+	 * @param delay Delay in milliseconds before element is masked (optional). If unmask() is called 
+	 *              before the delay times out, no mask is displayed. This can be used to prevent unnecessary 
+	 *              mask display for quick processes.   	
+	 */
+	$.fn.mask = function(label, delay){
+		$(this).each(function() {
+			if(delay !== undefined && delay > 0) {
+		        var element = $(this);
+		        element.data("_mask_timeout", setTimeout(function() { $.maskElement(element, label)}, delay));
+			} else {
+				$.maskElement($(this), label);
+			}
+		});
+	};
+	
+	/**
+	 * Removes mask from the element(s). Accepts both single and multiple selectors.
+	 */
+	$.fn.unmask = function(){
+		$(this).each(function() {
+			$.unmaskElement($(this));
+		});
+	};
+	
+	/**
+	 * Checks if a single element is masked. Returns false if mask is delayed or not displayed. 
+	 */
+	$.fn.isMasked = function(){
+		return this.hasClass("masked");
+	};
+
+	$.maskElement = function(element, label){
+	
+		//if this element has delayed mask scheduled then remove it and display the new one
+		if (element.data("_mask_timeout") !== undefined) {
+			clearTimeout(element.data("_mask_timeout"));
+			element.removeData("_mask_timeout");
+		}
+
+		if(element.isMasked()) {
+			$.unmaskElement(element);
+		}
+		
+		if(element.css("position") == "static") {
+			element.addClass("masked-relative");
+		}
+		
+		element.addClass("masked");
+		
+		var maskDiv = $('<div class="loadmask"></div>');
+		
+		//auto height fix for IE
+		if(navigator.userAgent.toLowerCase().indexOf("msie") > -1){
+			maskDiv.height(element.height() + parseInt(element.css("padding-top")) + parseInt(element.css("padding-bottom")));
+			maskDiv.width(element.width() + parseInt(element.css("padding-left")) + parseInt(element.css("padding-right")));
+		}
+		
+		//fix for z-index bug with selects in IE6
+		if(navigator.userAgent.toLowerCase().indexOf("msie 6") > -1){
+			element.find("select").addClass("masked-hidden");
+		}
+		
+		element.append(maskDiv);
+		
+		if(label !== undefined) {
+			var maskMsgDiv = $('<div class="loadmask-msg" style="display:none;"></div>');
+			maskMsgDiv.append('<div>' + label + '</div>');
+			element.append(maskMsgDiv);
+			
+			//calculate center position
+			maskMsgDiv.css("top", Math.round(element.height() / 2 - (maskMsgDiv.height() - parseInt(maskMsgDiv.css("padding-top")) - parseInt(maskMsgDiv.css("padding-bottom"))) / 2)+"px");
+			maskMsgDiv.css("left", Math.round(element.width() / 2 - (maskMsgDiv.width() - parseInt(maskMsgDiv.css("padding-left")) - parseInt(maskMsgDiv.css("padding-right"))) / 2)+"px");
+			
+			maskMsgDiv.show();
+		}
+		
+	};
+	
+	$.unmaskElement = function(element){
+		//if this element has delayed mask scheduled then remove it
+		if (element.data("_mask_timeout") !== undefined) {
+			clearTimeout(element.data("_mask_timeout"));
+			element.removeData("_mask_timeout");
+		}
+		
+		element.find(".loadmask-msg,.loadmask").remove();
+		element.removeClass("masked");
+		element.removeClass("masked-relative");
+		element.find("select").removeClass("masked-hidden");
+	};
+ 
+})(jQuery);
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-loadmask-0.4/jquery.loadmask.min.js b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-loadmask-0.4/jquery.loadmask.min.js
new file mode 100644
index 0000000..1afa3ca
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-loadmask-0.4/jquery.loadmask.min.js
@@ -0,0 +1,10 @@
+/**
+ * Copyright (c) 2009 Sergiy Kovalchuk (serg472@gmail.com)
+ * 
+ * Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php)
+ * and GPL (http://www.opensource.org/licenses/gpl-license.php) licenses.
+ *  
+ * Following code is based on Element.mask() implementation from ExtJS framework (http://extjs.com/)
+ *
+ */
+(function(a){a.fn.mask=function(c,b){a(this).each(function(){if(b!==undefined&&b>0){var d=a(this);d.data("_mask_timeout",setTimeout(function(){a.maskElement(d,c)},b))}else{a.maskElement(a(this),c)}})};a.fn.unmask=function(){a(this).each(function(){a.unmaskElement(a(this))})};a.fn.isMasked=function(){return this.hasClass("masked")};a.maskElement=function(d,c){if(d.data("_mask_timeout")!==undefined){clearTimeout(d.data("_mask_timeout"));d.removeData("_mask_timeout")}if(d.isMasked()){a.unmaskElement(d)}if(d.css("position")=="static"){d.addClass("masked-relative")}d.addClass("masked");var e=a('<div class="loadmask"></div>');if(navigator.userAgent.toLowerCase().indexOf("msie")>-1){e.height(d.height()+parseInt(d.css("padding-top"))+parseInt(d.css("padding-bottom")));e.width(d.width()+parseInt(d.css("padding-left"))+parseInt(d.css("padding-right")))}if(navigator.userAgent.toLowerCase().indexOf("msie 6")>-1){d.find("select").addClass("masked-hidden")}d.append(e);if(c!==undefined){var b=a('<div class="loadmask-msg" style="display:none;"></div>');b.append("<div>"+c+"</div>");d.append(b);b.css("top",Math.round(d.height()/2-(b.height()-parseInt(b.css("padding-top"))-parseInt(b.css("padding-bottom")))/2)+"px");b.css("left",Math.round(d.width()/2-(b.width()-parseInt(b.css("padding-left"))-parseInt(b.css("padding-right")))/2)+"px");b.show()}};a.unmaskElement=function(b){if(b.data("_mask_timeout")!==undefined){clearTimeout(b.data("_mask_timeout"));b.removeData("_mask_timeout")}b.find(".loadmask-msg,.loadmask").remove();b.removeClass("masked");b.removeClass("masked-relative");b.find("select").removeClass("masked-hidden")}})(jQuery);
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/README.md b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/README.md
new file mode 100644
index 0000000..6d44f9f
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/README.md
@@ -0,0 +1,44 @@
+#jQuery UI Bootstrap
+
+##Summary
+
+This is a project I started to bring the beauty of Twitter's Bootstrap to jQuery UI widgets. 
+
+Twitter's Bootstrap was one of my favorite projects to come out of 2011, but having used it regularly it left me wanting two things:
+
+* The ability to work side-by-side with jQuery UI (something which caused a number of widgets to break visually)
+* The ability to theme jQuery UI widgets using Bootstrap styles. Whilst I love jQuery UI, I (like others) find some of the current themes to look a little dated. My hope is that this theme provides a decent alternative for others that feel the same.
+
+To clarify, this project doesn't aim or intend to replace Twitter Bootstrap. It merely provides a jQuery UI-compatible theme inspired by Bootstrap's design. It also provides a version of Bootstrap CSS with a few (minor) sections commented out which enable the theme to work along-side it.
+
+I welcome any and all feedback as I'd very much like this theme to be as solid as possible.
+
+##Browser-support
+
+All modern browsers are targeted by this theme with 'lo-res' experiences (i.e no gradients, border-radius etc.) provided for users using older browsers. 
+
+There *are* some minor known issues lingering that I'm working on, but the hope is that in time those will all get ironed out. 
+
+##jQuery UI support
+
+This theme targets jQuery UI 1.9.2 and the default version of jQuery included in the (current) jQuery UI builds (jQuery 1.6.2).
+I'm aware of jQuery 1.8.2 and intend on upgrading anything necessary in the theme to use it when the jQuery UI team officially include it in their theme packs.
+
+##Project status
+
+This project is under active, but slow development. There has been a great deal
+of work done in branches to introduce compatibility with jQuery UI 1.9 and further
+work done to move us towards using LESS and improved parity with Bootstrap 2.x.
+
+At this time, I am seeking contributors interested in helping us finally complete
+the work needed to be Bootstrap 2.x compatible. This would involve helping in your
+spare time across a few weeks and you would be given credit in the project README.
+
+As one of the (currently) more popular open-source jQuery UI themes I would love to
+get out a new release sometime soon and your help with this would be greatly appreciated.
+
+##Demo
+
+For a live preview of the current theme, see [http://addyosmani.github.com/jquery-ui-bootstrap](http://addyosmani.github.com/jquery-ui-bootstrap).
+
+A [blog post](http://addyosmani.com/blog/jquery-ui-bootstrap/) with some more details about the project is also available.
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/css/bootstrap-responsive.css b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/css/bootstrap-responsive.css
new file mode 100644
index 0000000..c0bba15
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/css/bootstrap-responsive.css
@@ -0,0 +1,1109 @@
+/*!
+ * Bootstrap Responsive v2.3.2
+ *
+ * Copyright 2013 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world by @mdo and @fat.
+ */
+
+.clearfix {
+  *zoom: 1;
+}
+
+.clearfix:before,
+.clearfix:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.clearfix:after {
+  clear: both;
+}
+
+.hide-text {
+  font: 0/0 a;
+  color: transparent;
+  text-shadow: none;
+  background-color: transparent;
+  border: 0;
+}
+
+.input-block-level {
+  display: block;
+  width: 100%;
+  min-height: 30px;
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+          box-sizing: border-box;
+}
+
+@-ms-viewport {
+  width: device-width;
+}
+
+.hidden {
+  display: none;
+  visibility: hidden;
+}
+
+.visible-phone {
+  display: none !important;
+}
+
+.visible-tablet {
+  display: none !important;
+}
+
+.hidden-desktop {
+  display: none !important;
+}
+
+.visible-desktop {
+  display: inherit !important;
+}
+
+@media (min-width: 768px) and (max-width: 979px) {
+  .hidden-desktop {
+    display: inherit !important;
+  }
+  .visible-desktop {
+    display: none !important ;
+  }
+  .visible-tablet {
+    display: inherit !important;
+  }
+  .hidden-tablet {
+    display: none !important;
+  }
+}
+
+@media (max-width: 767px) {
+  .hidden-desktop {
+    display: inherit !important;
+  }
+  .visible-desktop {
+    display: none !important;
+  }
+  .visible-phone {
+    display: inherit !important;
+  }
+  .hidden-phone {
+    display: none !important;
+  }
+}
+
+.visible-print {
+  display: none !important;
+}
+
+@media print {
+  .visible-print {
+    display: inherit !important;
+  }
+  .hidden-print {
+    display: none !important;
+  }
+}
+
+@media (min-width: 1200px) {
+  .row {
+    margin-left: -30px;
+    *zoom: 1;
+  }
+  .row:before,
+  .row:after {
+    display: table;
+    line-height: 0;
+    content: "";
+  }
+  .row:after {
+    clear: both;
+  }
+  [class*="span"] {
+    float: left;
+    min-height: 1px;
+    margin-left: 30px;
+  }
+  .container,
+  .navbar-static-top .container,
+  .navbar-fixed-top .container,
+  .navbar-fixed-bottom .container {
+    width: 1170px;
+  }
+  .span12 {
+    width: 1170px;
+  }
+  .span11 {
+    width: 1070px;
+  }
+  .span10 {
+    width: 970px;
+  }
+  .span9 {
+    width: 870px;
+  }
+  .span8 {
+    width: 770px;
+  }
+  .span7 {
+    width: 670px;
+  }
+  .span6 {
+    width: 570px;
+  }
+  .span5 {
+    width: 470px;
+  }
+  .span4 {
+    width: 370px;
+  }
+  .span3 {
+    width: 270px;
+  }
+  .span2 {
+    width: 170px;
+  }
+  .span1 {
+    width: 70px;
+  }
+  .offset12 {
+    margin-left: 1230px;
+  }
+  .offset11 {
+    margin-left: 1130px;
+  }
+  .offset10 {
+    margin-left: 1030px;
+  }
+  .offset9 {
+    margin-left: 930px;
+  }
+  .offset8 {
+    margin-left: 830px;
+  }
+  .offset7 {
+    margin-left: 730px;
+  }
+  .offset6 {
+    margin-left: 630px;
+  }
+  .offset5 {
+    margin-left: 530px;
+  }
+  .offset4 {
+    margin-left: 430px;
+  }
+  .offset3 {
+    margin-left: 330px;
+  }
+  .offset2 {
+    margin-left: 230px;
+  }
+  .offset1 {
+    margin-left: 130px;
+  }
+  .row-fluid {
+    width: 100%;
+    *zoom: 1;
+  }
+  .row-fluid:before,
+  .row-fluid:after {
+    display: table;
+    line-height: 0;
+    content: "";
+  }
+  .row-fluid:after {
+    clear: both;
+  }
+  .row-fluid [class*="span"] {
+    display: block;
+    float: left;
+    width: 100%;
+    min-height: 30px;
+    margin-left: 2.564102564102564%;
+    *margin-left: 2.5109110747408616%;
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+            box-sizing: border-box;
+  }
+  .row-fluid [class*="span"]:first-child {
+    margin-left: 0;
+  }
+  .row-fluid .controls-row [class*="span"] + [class*="span"] {
+    margin-left: 2.564102564102564%;
+  }
+  .row-fluid .span12 {
+    width: 100%;
+    *width: 99.94680851063829%;
+  }
+  .row-fluid .span11 {
+    width: 91.45299145299145%;
+    *width: 91.39979996362975%;
+  }
+  .row-fluid .span10 {
+    width: 82.90598290598291%;
+    *width: 82.8527914166212%;
+  }
+  .row-fluid .span9 {
+    width: 74.35897435897436%;
+    *width: 74.30578286961266%;
+  }
+  .row-fluid .span8 {
+    width: 65.81196581196582%;
+    *width: 65.75877432260411%;
+  }
+  .row-fluid .span7 {
+    width: 57.26495726495726%;
+    *width: 57.21176577559556%;
+  }
+  .row-fluid .span6 {
+    width: 48.717948717948715%;
+    *width: 48.664757228587014%;
+  }
+  .row-fluid .span5 {
+    width: 40.17094017094017%;
+    *width: 40.11774868157847%;
+  }
+  .row-fluid .span4 {
+    width: 31.623931623931625%;
+    *width: 31.570740134569924%;
+  }
+  .row-fluid .span3 {
+    width: 23.076923076923077%;
+    *width: 23.023731587561375%;
+  }
+  .row-fluid .span2 {
+    width: 14.52991452991453%;
+    *width: 14.476723040552828%;
+  }
+  .row-fluid .span1 {
+    width: 5.982905982905983%;
+    *width: 5.929714493544281%;
+  }
+  .row-fluid .offset12 {
+    margin-left: 105.12820512820512%;
+    *margin-left: 105.02182214948171%;
+  }
+  .row-fluid .offset12:first-child {
+    margin-left: 102.56410256410257%;
+    *margin-left: 102.45771958537915%;
+  }
+  .row-fluid .offset11 {
+    margin-left: 96.58119658119658%;
+    *margin-left: 96.47481360247316%;
+  }
+  .row-fluid .offset11:first-child {
+    margin-left: 94.01709401709402%;
+    *margin-left: 93.91071103837061%;
+  }
+  .row-fluid .offset10 {
+    margin-left: 88.03418803418803%;
+    *margin-left: 87.92780505546462%;
+  }
+  .row-fluid .offset10:first-child {
+    margin-left: 85.47008547008548%;
+    *margin-left: 85.36370249136206%;
+  }
+  .row-fluid .offset9 {
+    margin-left: 79.48717948717949%;
+    *margin-left: 79.38079650845607%;
+  }
+  .row-fluid .offset9:first-child {
+    margin-left: 76.92307692307693%;
+    *margin-left: 76.81669394435352%;
+  }
+  .row-fluid .offset8 {
+    margin-left: 70.94017094017094%;
+    *margin-left: 70.83378796144753%;
+  }
+  .row-fluid .offset8:first-child {
+    margin-left: 68.37606837606839%;
+    *margin-left: 68.26968539734497%;
+  }
+  .row-fluid .offset7 {
+    margin-left: 62.393162393162385%;
+    *margin-left: 62.28677941443899%;
+  }
+  .row-fluid .offset7:first-child {
+    margin-left: 59.82905982905982%;
+    *margin-left: 59.72267685033642%;
+  }
+  .row-fluid .offset6 {
+    margin-left: 53.84615384615384%;
+    *margin-left: 53.739770867430444%;
+  }
+  .row-fluid .offset6:first-child {
+    margin-left: 51.28205128205128%;
+    *margin-left: 51.175668303327875%;
+  }
+  .row-fluid .offset5 {
+    margin-left: 45.299145299145295%;
+    *margin-left: 45.1927623204219%;
+  }
+  .row-fluid .offset5:first-child {
+    margin-left: 42.73504273504273%;
+    *margin-left: 42.62865975631933%;
+  }
+  .row-fluid .offset4 {
+    margin-left: 36.75213675213675%;
+    *margin-left: 36.645753773413354%;
+  }
+  .row-fluid .offset4:first-child {
+    margin-left: 34.18803418803419%;
+    *margin-left: 34.081651209310785%;
+  }
+  .row-fluid .offset3 {
+    margin-left: 28.205128205128204%;
+    *margin-left: 28.0987452264048%;
+  }
+  .row-fluid .offset3:first-child {
+    margin-left: 25.641025641025642%;
+    *margin-left: 25.53464266230224%;
+  }
+  .row-fluid .offset2 {
+    margin-left: 19.65811965811966%;
+    *margin-left: 19.551736679396257%;
+  }
+  .row-fluid .offset2:first-child {
+    margin-left: 17.094017094017094%;
+    *margin-left: 16.98763411529369%;
+  }
+  .row-fluid .offset1 {
+    margin-left: 11.11111111111111%;
+    *margin-left: 11.004728132387708%;
+  }
+  .row-fluid .offset1:first-child {
+    margin-left: 8.547008547008547%;
+    *margin-left: 8.440625568285142%;
+  }
+  input,
+  textarea,
+  .uneditable-input {
+    margin-left: 0;
+  }
+  .controls-row [class*="span"] + [class*="span"] {
+    margin-left: 30px;
+  }
+  input.span12,
+  textarea.span12,
+  .uneditable-input.span12 {
+    width: 1156px;
+  }
+  input.span11,
+  textarea.span11,
+  .uneditable-input.span11 {
+    width: 1056px;
+  }
+  input.span10,
+  textarea.span10,
+  .uneditable-input.span10 {
+    width: 956px;
+  }
+  input.span9,
+  textarea.span9,
+  .uneditable-input.span9 {
+    width: 856px;
+  }
+  input.span8,
+  textarea.span8,
+  .uneditable-input.span8 {
+    width: 756px;
+  }
+  input.span7,
+  textarea.span7,
+  .uneditable-input.span7 {
+    width: 656px;
+  }
+  input.span6,
+  textarea.span6,
+  .uneditable-input.span6 {
+    width: 556px;
+  }
+  input.span5,
+  textarea.span5,
+  .uneditable-input.span5 {
+    width: 456px;
+  }
+  input.span4,
+  textarea.span4,
+  .uneditable-input.span4 {
+    width: 356px;
+  }
+  input.span3,
+  textarea.span3,
+  .uneditable-input.span3 {
+    width: 256px;
+  }
+  input.span2,
+  textarea.span2,
+  .uneditable-input.span2 {
+    width: 156px;
+  }
+  input.span1,
+  textarea.span1,
+  .uneditable-input.span1 {
+    width: 56px;
+  }
+  .thumbnails {
+    margin-left: -30px;
+  }
+  .thumbnails > li {
+    margin-left: 30px;
+  }
+  .row-fluid .thumbnails {
+    margin-left: 0;
+  }
+}
+
+@media (min-width: 768px) and (max-width: 979px) {
+  .row {
+    margin-left: -20px;
+    *zoom: 1;
+  }
+  .row:before,
+  .row:after {
+    display: table;
+    line-height: 0;
+    content: "";
+  }
+  .row:after {
+    clear: both;
+  }
+  [class*="span"] {
+    float: left;
+    min-height: 1px;
+    margin-left: 20px;
+  }
+  .container,
+  .navbar-static-top .container,
+  .navbar-fixed-top .container,
+  .navbar-fixed-bottom .container {
+    width: 724px;
+  }
+  .span12 {
+    width: 724px;
+  }
+  .span11 {
+    width: 662px;
+  }
+  .span10 {
+    width: 600px;
+  }
+  .span9 {
+    width: 538px;
+  }
+  .span8 {
+    width: 476px;
+  }
+  .span7 {
+    width: 414px;
+  }
+  .span6 {
+    width: 352px;
+  }
+  .span5 {
+    width: 290px;
+  }
+  .span4 {
+    width: 228px;
+  }
+  .span3 {
+    width: 166px;
+  }
+  .span2 {
+    width: 104px;
+  }
+  .span1 {
+    width: 42px;
+  }
+  .offset12 {
+    margin-left: 764px;
+  }
+  .offset11 {
+    margin-left: 702px;
+  }
+  .offset10 {
+    margin-left: 640px;
+  }
+  .offset9 {
+    margin-left: 578px;
+  }
+  .offset8 {
+    margin-left: 516px;
+  }
+  .offset7 {
+    margin-left: 454px;
+  }
+  .offset6 {
+    margin-left: 392px;
+  }
+  .offset5 {
+    margin-left: 330px;
+  }
+  .offset4 {
+    margin-left: 268px;
+  }
+  .offset3 {
+    margin-left: 206px;
+  }
+  .offset2 {
+    margin-left: 144px;
+  }
+  .offset1 {
+    margin-left: 82px;
+  }
+  .row-fluid {
+    width: 100%;
+    *zoom: 1;
+  }
+  .row-fluid:before,
+  .row-fluid:after {
+    display: table;
+    line-height: 0;
+    content: "";
+  }
+  .row-fluid:after {
+    clear: both;
+  }
+  .row-fluid [class*="span"] {
+    display: block;
+    float: left;
+    width: 100%;
+    min-height: 30px;
+    margin-left: 2.7624309392265194%;
+    *margin-left: 2.709239449864817%;
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+            box-sizing: border-box;
+  }
+  .row-fluid [class*="span"]:first-child {
+    margin-left: 0;
+  }
+  .row-fluid .controls-row [class*="span"] + [class*="span"] {
+    margin-left: 2.7624309392265194%;
+  }
+  .row-fluid .span12 {
+    width: 100%;
+    *width: 99.94680851063829%;
+  }
+  .row-fluid .span11 {
+    width: 91.43646408839778%;
+    *width: 91.38327259903608%;
+  }
+  .row-fluid .span10 {
+    width: 82.87292817679558%;
+    *width: 82.81973668743387%;
+  }
+  .row-fluid .span9 {
+    width: 74.30939226519337%;
+    *width: 74.25620077583166%;
+  }
+  .row-fluid .span8 {
+    width: 65.74585635359117%;
+    *width: 65.69266486422946%;
+  }
+  .row-fluid .span7 {
+    width: 57.18232044198895%;
+    *width: 57.12912895262725%;
+  }
+  .row-fluid .span6 {
+    width: 48.61878453038674%;
+    *width: 48.56559304102504%;
+  }
+  .row-fluid .span5 {
+    width: 40.05524861878453%;
+    *width: 40.00205712942283%;
+  }
+  .row-fluid .span4 {
+    width: 31.491712707182323%;
+    *width: 31.43852121782062%;
+  }
+  .row-fluid .span3 {
+    width: 22.92817679558011%;
+    *width: 22.87498530621841%;
+  }
+  .row-fluid .span2 {
+    width: 14.3646408839779%;
+    *width: 14.311449394616199%;
+  }
+  .row-fluid .span1 {
+    width: 5.801104972375691%;
+    *width: 5.747913483013988%;
+  }
+  .row-fluid .offset12 {
+    margin-left: 105.52486187845304%;
+    *margin-left: 105.41847889972962%;
+  }
+  .row-fluid .offset12:first-child {
+    margin-left: 102.76243093922652%;
+    *margin-left: 102.6560479605031%;
+  }
+  .row-fluid .offset11 {
+    margin-left: 96.96132596685082%;
+    *margin-left: 96.8549429881274%;
+  }
+  .row-fluid .offset11:first-child {
+    margin-left: 94.1988950276243%;
+    *margin-left: 94.09251204890089%;
+  }
+  .row-fluid .offset10 {
+    margin-left: 88.39779005524862%;
+    *margin-left: 88.2914070765252%;
+  }
+  .row-fluid .offset10:first-child {
+    margin-left: 85.6353591160221%;
+    *margin-left: 85.52897613729868%;
+  }
+  .row-fluid .offset9 {
+    margin-left: 79.8342541436464%;
+    *margin-left: 79.72787116492299%;
+  }
+  .row-fluid .offset9:first-child {
+    margin-left: 77.07182320441989%;
+    *margin-left: 76.96544022569647%;
+  }
+  .row-fluid .offset8 {
+    margin-left: 71.2707182320442%;
+    *margin-left: 71.16433525332079%;
+  }
+  .row-fluid .offset8:first-child {
+    margin-left: 68.50828729281768%;
+    *margin-left: 68.40190431409427%;
+  }
+  .row-fluid .offset7 {
+    margin-left: 62.70718232044199%;
+    *margin-left: 62.600799341718584%;
+  }
+  .row-fluid .offset7:first-child {
+    margin-left: 59.94475138121547%;
+    *margin-left: 59.838368402492065%;
+  }
+  .row-fluid .offset6 {
+    margin-left: 54.14364640883978%;
+    *margin-left: 54.037263430116376%;
+  }
+  .row-fluid .offset6:first-child {
+    margin-left: 51.38121546961326%;
+    *margin-left: 51.27483249088986%;
+  }
+  .row-fluid .offset5 {
+    margin-left: 45.58011049723757%;
+    *margin-left: 45.47372751851417%;
+  }
+  .row-fluid .offset5:first-child {
+    margin-left: 42.81767955801105%;
+    *margin-left: 42.71129657928765%;
+  }
+  .row-fluid .offset4 {
+    margin-left: 37.01657458563536%;
+    *margin-left: 36.91019160691196%;
+  }
+  .row-fluid .offset4:first-child {
+    margin-left: 34.25414364640884%;
+    *margin-left: 34.14776066768544%;
+  }
+  .row-fluid .offset3 {
+    margin-left: 28.45303867403315%;
+    *margin-left: 28.346655695309746%;
+  }
+  .row-fluid .offset3:first-child {
+    margin-left: 25.69060773480663%;
+    *margin-left: 25.584224756083227%;
+  }
+  .row-fluid .offset2 {
+    margin-left: 19.88950276243094%;
+    *margin-left: 19.783119783707537%;
+  }
+  .row-fluid .offset2:first-child {
+    margin-left: 17.12707182320442%;
+    *margin-left: 17.02068884448102%;
+  }
+  .row-fluid .offset1 {
+    margin-left: 11.32596685082873%;
+    *margin-left: 11.219583872105325%;
+  }
+  .row-fluid .offset1:first-child {
+    margin-left: 8.56353591160221%;
+    *margin-left: 8.457152932878806%;
+  }
+  input,
+  textarea,
+  .uneditable-input {
+    margin-left: 0;
+  }
+  .controls-row [class*="span"] + [class*="span"] {
+    margin-left: 20px;
+  }
+  input.span12,
+  textarea.span12,
+  .uneditable-input.span12 {
+    width: 710px;
+  }
+  input.span11,
+  textarea.span11,
+  .uneditable-input.span11 {
+    width: 648px;
+  }
+  input.span10,
+  textarea.span10,
+  .uneditable-input.span10 {
+    width: 586px;
+  }
+  input.span9,
+  textarea.span9,
+  .uneditable-input.span9 {
+    width: 524px;
+  }
+  input.span8,
+  textarea.span8,
+  .uneditable-input.span8 {
+    width: 462px;
+  }
+  input.span7,
+  textarea.span7,
+  .uneditable-input.span7 {
+    width: 400px;
+  }
+  input.span6,
+  textarea.span6,
+  .uneditable-input.span6 {
+    width: 338px;
+  }
+  input.span5,
+  textarea.span5,
+  .uneditable-input.span5 {
+    width: 276px;
+  }
+  input.span4,
+  textarea.span4,
+  .uneditable-input.span4 {
+    width: 214px;
+  }
+  input.span3,
+  textarea.span3,
+  .uneditable-input.span3 {
+    width: 152px;
+  }
+  input.span2,
+  textarea.span2,
+  .uneditable-input.span2 {
+    width: 90px;
+  }
+  input.span1,
+  textarea.span1,
+  .uneditable-input.span1 {
+    width: 28px;
+  }
+}
+
+@media (max-width: 767px) {
+  body {
+    padding-right: 20px;
+    padding-left: 20px;
+  }
+  .navbar-fixed-top,
+  .navbar-fixed-bottom,
+  .navbar-static-top {
+    margin-right: -20px;
+    margin-left: -20px;
+  }
+  .container-fluid {
+    padding: 0;
+  }
+  .dl-horizontal dt {
+    float: none;
+    width: auto;
+    clear: none;
+    text-align: left;
+  }
+  .dl-horizontal dd {
+    margin-left: 0;
+  }
+  .container {
+    width: auto;
+  }
+  .row-fluid {
+    width: 100%;
+  }
+  .row,
+  .thumbnails {
+    margin-left: 0;
+  }
+  .thumbnails > li {
+    float: none;
+    margin-left: 0;
+  }
+  [class*="span"],
+  .uneditable-input[class*="span"],
+  .row-fluid [class*="span"] {
+    display: block;
+    float: none;
+    width: 100%;
+    margin-left: 0;
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+            box-sizing: border-box;
+  }
+  .span12,
+  .row-fluid .span12 {
+    width: 100%;
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+            box-sizing: border-box;
+  }
+  .row-fluid [class*="offset"]:first-child {
+    margin-left: 0;
+  }
+  .input-large,
+  .input-xlarge,
+  .input-xxlarge,
+  input[class*="span"],
+  select[class*="span"],
+  textarea[class*="span"],
+  .uneditable-input {
+    display: block;
+    width: 100%;
+    min-height: 30px;
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+            box-sizing: border-box;
+  }
+  .input-prepend input,
+  .input-append input,
+  .input-prepend input[class*="span"],
+  .input-append input[class*="span"] {
+    display: inline-block;
+    width: auto;
+  }
+  .controls-row [class*="span"] + [class*="span"] {
+    margin-left: 0;
+  }
+  .modal {
+    position: fixed;
+    top: 20px;
+    right: 20px;
+    left: 20px;
+    width: auto;
+    margin: 0;
+  }
+  .modal.fade {
+    top: -100px;
+  }
+  .modal.fade.in {
+    top: 20px;
+  }
+}
+
+@media (max-width: 480px) {
+  .nav-collapse {
+    -webkit-transform: translate3d(0, 0, 0);
+  }
+  .page-header h1 small {
+    display: block;
+    line-height: 20px;
+  }
+  input[type="checkbox"],
+  input[type="radio"] {
+    border: 1px solid #ccc;
+  }
+  .form-horizontal .control-label {
+    float: none;
+    width: auto;
+    padding-top: 0;
+    text-align: left;
+  }
+  .form-horizontal .controls {
+    margin-left: 0;
+  }
+  .form-horizontal .control-list {
+    padding-top: 0;
+  }
+  .form-horizontal .form-actions {
+    padding-right: 10px;
+    padding-left: 10px;
+  }
+  .media .pull-left,
+  .media .pull-right {
+    display: block;
+    float: none;
+    margin-bottom: 10px;
+  }
+  .media-object {
+    margin-right: 0;
+    margin-left: 0;
+  }
+  .modal {
+    top: 10px;
+    right: 10px;
+    left: 10px;
+  }
+  .modal-header .close {
+    padding: 10px;
+    margin: -10px;
+  }
+  .carousel-caption {
+    position: static;
+  }
+}
+
+@media (max-width: 979px) {
+  body {
+    padding-top: 0;
+  }
+  .navbar-fixed-top,
+  .navbar-fixed-bottom {
+    position: static;
+  }
+  .navbar-fixed-top {
+    margin-bottom: 20px;
+  }
+  .navbar-fixed-bottom {
+    margin-top: 20px;
+  }
+  .navbar-fixed-top .navbar-inner,
+  .navbar-fixed-bottom .navbar-inner {
+    padding: 5px;
+  }
+  .navbar .container {
+    width: auto;
+    padding: 0;
+  }
+  .navbar .brand {
+    padding-right: 10px;
+    padding-left: 10px;
+    margin: 0 0 0 -5px;
+  }
+  .nav-collapse {
+    clear: both;
+  }
+  .nav-collapse .nav {
+    float: none;
+    margin: 0 0 10px;
+  }
+  .nav-collapse .nav > li {
+    float: none;
+  }
+  .nav-collapse .nav > li > a {
+    margin-bottom: 2px;
+  }
+  .nav-collapse .nav > .divider-vertical {
+    display: none;
+  }
+  .nav-collapse .nav .nav-header {
+    color: #777777;
+    text-shadow: none;
+  }
+  .nav-collapse .nav > li > a,
+  .nav-collapse .dropdown-menu a {
+    padding: 9px 15px;
+    font-weight: bold;
+    color: #777777;
+    -webkit-border-radius: 3px;
+       -moz-border-radius: 3px;
+            border-radius: 3px;
+  }
+  .nav-collapse .btn {
+    padding: 4px 10px 4px;
+    font-weight: normal;
+    -webkit-border-radius: 4px;
+       -moz-border-radius: 4px;
+            border-radius: 4px;
+  }
+  .nav-collapse .dropdown-menu li + li a {
+    margin-bottom: 2px;
+  }
+  .nav-collapse .nav > li > a:hover,
+  .nav-collapse .nav > li > a:focus,
+  .nav-collapse .dropdown-menu a:hover,
+  .nav-collapse .dropdown-menu a:focus {
+    background-color: #f2f2f2;
+  }
+  .navbar-inverse .nav-collapse .nav > li > a,
+  .navbar-inverse .nav-collapse .dropdown-menu a {
+    color: #999999;
+  }
+  .navbar-inverse .nav-collapse .nav > li > a:hover,
+  .navbar-inverse .nav-collapse .nav > li > a:focus,
+  .navbar-inverse .nav-collapse .dropdown-menu a:hover,
+  .navbar-inverse .nav-collapse .dropdown-menu a:focus {
+    background-color: #111111;
+  }
+  .nav-collapse.in .btn-group {
+    padding: 0;
+    margin-top: 5px;
+  }
+  .nav-collapse .dropdown-menu {
+    position: static;
+    top: auto;
+    left: auto;
+    display: none;
+    float: none;
+    max-width: none;
+    padding: 0;
+    margin: 0 15px;
+    background-color: transparent;
+    border: none;
+    -webkit-border-radius: 0;
+       -moz-border-radius: 0;
+            border-radius: 0;
+    -webkit-box-shadow: none;
+       -moz-box-shadow: none;
+            box-shadow: none;
+  }
+  .nav-collapse .open > .dropdown-menu {
+    display: block;
+  }
+  .nav-collapse .dropdown-menu:before,
+  .nav-collapse .dropdown-menu:after {
+    display: none;
+  }
+  .nav-collapse .dropdown-menu .divider {
+    display: none;
+  }
+  .nav-collapse .nav > li > .dropdown-menu:before,
+  .nav-collapse .nav > li > .dropdown-menu:after {
+    display: none;
+  }
+  .nav-collapse .navbar-form,
+  .nav-collapse .navbar-search {
+    float: none;
+    padding: 10px 15px;
+    margin: 10px 0;
+    border-top: 1px solid #f2f2f2;
+    border-bottom: 1px solid #f2f2f2;
+    -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
+       -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
+            box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
+  }
+  .navbar-inverse .nav-collapse .navbar-form,
+  .navbar-inverse .nav-collapse .navbar-search {
+    border-top-color: #111111;
+    border-bottom-color: #111111;
+  }
+  .navbar .nav-collapse .nav.pull-right {
+    float: none;
+    margin-left: 0;
+  }
+  .nav-collapse,
+  .nav-collapse.collapse {
+    height: 0;
+    overflow: hidden;
+  }
+  .navbar .btn-navbar {
+    display: block;
+  }
+  .navbar-static .navbar-inner {
+    padding-right: 10px;
+    padding-left: 10px;
+  }
+}
+
+@media (min-width: 980px) {
+  .nav-collapse.collapse {
+    height: auto !important;
+    overflow: visible !important;
+  }
+}
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/css/bootstrap-responsive.min.css b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/css/bootstrap-responsive.min.css
new file mode 100644
index 0000000..96a435b
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/css/bootstrap-responsive.min.css
@@ -0,0 +1,9 @@
+/*!
+ * Bootstrap Responsive v2.3.2
+ *
+ * Copyright 2013 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world by @mdo and @fat.
+ */.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;line-height:0;content:""}.clearfix:after{clear:both}.hide-text{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.input-block-level{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}@-ms-viewport{width:device-width}.hidden{display:none;visibility:hidden}.visible-phone{display:none!important}.visible-tablet{display:none!important}.hidden-desktop{display:none!important}.visible-desktop{display:inherit!important}@media(min-width:768px) and (max-width:979px){.hidden-desktop{display:inherit!important}.visible-desktop{display:none!important}.visible-tablet{display:inherit!important}.hidden-tablet{display:none!important}}@media(max-width:767px){.hidden-desktop{display:inherit!important}.visible-desktop{display:none!important}.visible-phone{display:inherit!important}.hidden-phone{display:none!important}}.visible-print{display:none!important}@media print{.visible-print{display:inherit!important}.hidden-print{display:none!important}}@media(min-width:1200px){.row{margin-left:-30px;*zoom:1}.row:before,.row:after{display:table;line-height:0;content:""}.row:after{clear:both}[class*="span"]{float:left;min-height:1px;margin-left:30px}.container,.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:1170px}.span12{width:1170px}.span11{width:1070px}.span10{width:970px}.span9{width:870px}.span8{width:770px}.span7{width:670px}.span6{width:570px}.span5{width:470px}.span4{width:370px}.span3{width:270px}.span2{width:170px}.span1{width:70px}.offset12{margin-left:1230px}.offset11{margin-left:1130px}.offset10{margin-left:1030px}.offset9{margin-left:930px}.offset8{margin-left:830px}.offset7{margin-left:730px}.offset6{margin-left:630px}.offset5{margin-left:530px}.offset4{margin-left:430px}.offset3{margin-left:330px}.offset2{margin-left:230px}.offset1{margin-left:130px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;line-height:0;content:""}.row-fluid:after{clear:both}.row-fluid [class*="span"]{display:block;float:left;width:100%;min-height:30px;margin-left:2.564102564102564%;*margin-left:2.5109110747408616%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="span"]:first-child{margin-left:0}.row-fluid .controls-row [class*="span"]+[class*="span"]{margin-left:2.564102564102564%}.row-fluid .span12{width:100%;*width:99.94680851063829%}.row-fluid .span11{width:91.45299145299145%;*width:91.39979996362975%}.row-fluid .span10{width:82.90598290598291%;*width:82.8527914166212%}.row-fluid .span9{width:74.35897435897436%;*width:74.30578286961266%}.row-fluid .span8{width:65.81196581196582%;*width:65.75877432260411%}.row-fluid .span7{width:57.26495726495726%;*width:57.21176577559556%}.row-fluid .span6{width:48.717948717948715%;*width:48.664757228587014%}.row-fluid .span5{width:40.17094017094017%;*width:40.11774868157847%}.row-fluid .span4{width:31.623931623931625%;*width:31.570740134569924%}.row-fluid .span3{width:23.076923076923077%;*width:23.023731587561375%}.row-fluid .span2{width:14.52991452991453%;*width:14.476723040552828%}.row-fluid .span1{width:5.982905982905983%;*width:5.929714493544281%}.row-fluid .offset12{margin-left:105.12820512820512%;*margin-left:105.02182214948171%}.row-fluid .offset12:first-child{margin-left:102.56410256410257%;*margin-left:102.45771958537915%}.row-fluid .offset11{margin-left:96.58119658119658%;*margin-left:96.47481360247316%}.row-fluid .offset11:first-child{margin-left:94.01709401709402%;*margin-left:93.91071103837061%}.row-fluid .offset10{margin-left:88.03418803418803%;*margin-left:87.92780505546462%}.row-fluid .offset10:first-child{margin-left:85.47008547008548%;*margin-left:85.36370249136206%}.row-fluid .offset9{margin-left:79.48717948717949%;*margin-left:79.38079650845607%}.row-fluid .offset9:first-child{margin-left:76.92307692307693%;*margin-left:76.81669394435352%}.row-fluid .offset8{margin-left:70.94017094017094%;*margin-left:70.83378796144753%}.row-fluid .offset8:first-child{margin-left:68.37606837606839%;*margin-left:68.26968539734497%}.row-fluid .offset7{margin-left:62.393162393162385%;*margin-left:62.28677941443899%}.row-fluid .offset7:first-child{margin-left:59.82905982905982%;*margin-left:59.72267685033642%}.row-fluid .offset6{margin-left:53.84615384615384%;*margin-left:53.739770867430444%}.row-fluid .offset6:first-child{margin-left:51.28205128205128%;*margin-left:51.175668303327875%}.row-fluid .offset5{margin-left:45.299145299145295%;*margin-left:45.1927623204219%}.row-fluid .offset5:first-child{margin-left:42.73504273504273%;*margin-left:42.62865975631933%}.row-fluid .offset4{margin-left:36.75213675213675%;*margin-left:36.645753773413354%}.row-fluid .offset4:first-child{margin-left:34.18803418803419%;*margin-left:34.081651209310785%}.row-fluid .offset3{margin-left:28.205128205128204%;*margin-left:28.0987452264048%}.row-fluid .offset3:first-child{margin-left:25.641025641025642%;*margin-left:25.53464266230224%}.row-fluid .offset2{margin-left:19.65811965811966%;*margin-left:19.551736679396257%}.row-fluid .offset2:first-child{margin-left:17.094017094017094%;*margin-left:16.98763411529369%}.row-fluid .offset1{margin-left:11.11111111111111%;*margin-left:11.004728132387708%}.row-fluid .offset1:first-child{margin-left:8.547008547008547%;*margin-left:8.440625568285142%}input,textarea,.uneditable-input{margin-left:0}.controls-row [class*="span"]+[class*="span"]{margin-left:30px}input.span12,textarea.span12,.uneditable-input.span12{width:1156px}input.span11,textarea.span11,.uneditable-input.span11{width:1056px}input.span10,textarea.span10,.uneditable-input.span10{width:956px}input.span9,textarea.span9,.uneditable-input.span9{width:856px}input.span8,textarea.span8,.uneditable-input.span8{width:756px}input.span7,textarea.span7,.uneditable-input.span7{width:656px}input.span6,textarea.span6,.uneditable-input.span6{width:556px}input.span5,textarea.span5,.uneditable-input.span5{width:456px}input.span4,textarea.span4,.uneditable-input.span4{width:356px}input.span3,textarea.span3,.uneditable-input.span3{width:256px}input.span2,textarea.span2,.uneditable-input.span2{width:156px}input.span1,textarea.span1,.uneditable-input.span1{width:56px}.thumbnails{margin-left:-30px}.thumbnails>li{margin-left:30px}.row-fluid .thumbnails{margin-left:0}}@media(min-width:768px) and (max-width:979px){.row{margin-left:-20px;*zoom:1}.row:before,.row:after{display:table;line-height:0;content:""}.row:after{clear:both}[class*="span"]{float:left;min-height:1px;margin-left:20px}.container,.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:724px}.span12{width:724px}.span11{width:662px}.span10{width:600px}.span9{width:538px}.span8{width:476px}.span7{width:414px}.span6{width:352px}.span5{width:290px}.span4{width:228px}.span3{width:166px}.span2{width:104px}.span1{width:42px}.offset12{margin-left:764px}.offset11{margin-left:702px}.offset10{margin-left:640px}.offset9{margin-left:578px}.offset8{margin-left:516px}.offset7{margin-left:454px}.offset6{margin-left:392px}.offset5{margin-left:330px}.offset4{margin-left:268px}.offset3{margin-left:206px}.offset2{margin-left:144px}.offset1{margin-left:82px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;line-height:0;content:""}.row-fluid:after{clear:both}.row-fluid [class*="span"]{display:block;float:left;width:100%;min-height:30px;margin-left:2.7624309392265194%;*margin-left:2.709239449864817%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="span"]:first-child{margin-left:0}.row-fluid .controls-row [class*="span"]+[class*="span"]{margin-left:2.7624309392265194%}.row-fluid .span12{width:100%;*width:99.94680851063829%}.row-fluid .span11{width:91.43646408839778%;*width:91.38327259903608%}.row-fluid .span10{width:82.87292817679558%;*width:82.81973668743387%}.row-fluid .span9{width:74.30939226519337%;*width:74.25620077583166%}.row-fluid .span8{width:65.74585635359117%;*width:65.69266486422946%}.row-fluid .span7{width:57.18232044198895%;*width:57.12912895262725%}.row-fluid .span6{width:48.61878453038674%;*width:48.56559304102504%}.row-fluid .span5{width:40.05524861878453%;*width:40.00205712942283%}.row-fluid .span4{width:31.491712707182323%;*width:31.43852121782062%}.row-fluid .span3{width:22.92817679558011%;*width:22.87498530621841%}.row-fluid .span2{width:14.3646408839779%;*width:14.311449394616199%}.row-fluid .span1{width:5.801104972375691%;*width:5.747913483013988%}.row-fluid .offset12{margin-left:105.52486187845304%;*margin-left:105.41847889972962%}.row-fluid .offset12:first-child{margin-left:102.76243093922652%;*margin-left:102.6560479605031%}.row-fluid .offset11{margin-left:96.96132596685082%;*margin-left:96.8549429881274%}.row-fluid .offset11:first-child{margin-left:94.1988950276243%;*margin-left:94.09251204890089%}.row-fluid .offset10{margin-left:88.39779005524862%;*margin-left:88.2914070765252%}.row-fluid .offset10:first-child{margin-left:85.6353591160221%;*margin-left:85.52897613729868%}.row-fluid .offset9{margin-left:79.8342541436464%;*margin-left:79.72787116492299%}.row-fluid .offset9:first-child{margin-left:77.07182320441989%;*margin-left:76.96544022569647%}.row-fluid .offset8{margin-left:71.2707182320442%;*margin-left:71.16433525332079%}.row-fluid .offset8:first-child{margin-left:68.50828729281768%;*margin-left:68.40190431409427%}.row-fluid .offset7{margin-left:62.70718232044199%;*margin-left:62.600799341718584%}.row-fluid .offset7:first-child{margin-left:59.94475138121547%;*margin-left:59.838368402492065%}.row-fluid .offset6{margin-left:54.14364640883978%;*margin-left:54.037263430116376%}.row-fluid .offset6:first-child{margin-left:51.38121546961326%;*margin-left:51.27483249088986%}.row-fluid .offset5{margin-left:45.58011049723757%;*margin-left:45.47372751851417%}.row-fluid .offset5:first-child{margin-left:42.81767955801105%;*margin-left:42.71129657928765%}.row-fluid .offset4{margin-left:37.01657458563536%;*margin-left:36.91019160691196%}.row-fluid .offset4:first-child{margin-left:34.25414364640884%;*margin-left:34.14776066768544%}.row-fluid .offset3{margin-left:28.45303867403315%;*margin-left:28.346655695309746%}.row-fluid .offset3:first-child{margin-left:25.69060773480663%;*margin-left:25.584224756083227%}.row-fluid .offset2{margin-left:19.88950276243094%;*margin-left:19.783119783707537%}.row-fluid .offset2:first-child{margin-left:17.12707182320442%;*margin-left:17.02068884448102%}.row-fluid .offset1{margin-left:11.32596685082873%;*margin-left:11.219583872105325%}.row-fluid .offset1:first-child{margin-left:8.56353591160221%;*margin-left:8.457152932878806%}input,textarea,.uneditable-input{margin-left:0}.controls-row [class*="span"]+[class*="span"]{margin-left:20px}input.span12,textarea.span12,.uneditable-input.span12{width:710px}input.span11,textarea.span11,.uneditable-input.span11{width:648px}input.span10,textarea.span10,.uneditable-input.span10{width:586px}input.span9,textarea.span9,.uneditable-input.span9{width:524px}input.span8,textarea.span8,.uneditable-input.span8{width:462px}input.span7,textarea.span7,.uneditable-input.span7{width:400px}input.span6,textarea.span6,.uneditable-input.span6{width:338px}input.span5,textarea.span5,.uneditable-input.span5{width:276px}input.span4,textarea.span4,.uneditable-input.span4{width:214px}input.span3,textarea.span3,.uneditable-input.span3{width:152px}input.span2,textarea.span2,.uneditable-input.span2{width:90px}input.span1,textarea.span1,.uneditable-input.span1{width:28px}}@media(max-width:767px){body{padding-right:20px;padding-left:20px}.navbar-fixed-top,.navbar-fixed-bottom,.navbar-static-top{margin-right:-20px;margin-left:-20px}.container-fluid{padding:0}.dl-horizontal dt{float:none;width:auto;clear:none;text-align:left}.dl-horizontal dd{margin-left:0}.container{width:auto}.row-fluid{width:100%}.row,.thumbnails{margin-left:0}.thumbnails>li{float:none;margin-left:0}[class*="span"],.uneditable-input[class*="span"],.row-fluid [class*="span"]{display:block;float:none;width:100%;margin-left:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.span12,.row-fluid .span12{width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="offset"]:first-child{margin-left:0}.input-large,.input-xlarge,.input-xxlarge,input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.input-prepend input,.input-append input,.input-prepend input[class*="span"],.input-append input[class*="span"]{display:inline-block;width:auto}.controls-row [class*="span"]+[class*="span"]{margin-left:0}.modal{position:fixed;top:20px;right:20px;left:20px;width:auto;margin:0}.modal.fade{top:-100px}.modal.fade.in{top:20px}}@media(max-width:480px){.nav-collapse{-webkit-transform:translate3d(0,0,0)}.page-header h1 small{display:block;line-height:20px}input[type="checkbox"],input[type="radio"]{border:1px solid #ccc}.form-horizontal .control-label{float:none;width:auto;padding-top:0;text-align:left}.form-horizontal .controls{margin-left:0}.form-horizontal .control-list{padding-top:0}.form-horizontal .form-actions{padding-right:10px;padding-left:10px}.media .pull-left,.media .pull-right{display:block;float:none;margin-bottom:10px}.media-object{margin-right:0;margin-left:0}.modal{top:10px;right:10px;left:10px}.modal-header .close{padding:10px;margin:-10px}.carousel-caption{position:static}}@media(max-width:979px){body{padding-top:0}.navbar-fixed-top,.navbar-fixed-bottom{position:static}.navbar-fixed-top{margin-bottom:20px}.navbar-fixed-bottom{margin-top:20px}.navbar-fixed-top .navbar-inner,.navbar-fixed-bottom .navbar-inner{padding:5px}.navbar .container{width:auto;padding:0}.navbar .brand{padding-right:10px;padding-left:10px;margin:0 0 0 -5px}.nav-collapse{clear:both}.nav-collapse .nav{float:none;margin:0 0 10px}.nav-collapse .nav>li{float:none}.nav-collapse .nav>li>a{margin-bottom:2px}.nav-collapse .nav>.divider-vertical{display:none}.nav-collapse .nav .nav-header{color:#777;text-shadow:none}.nav-collapse .nav>li>a,.nav-collapse .dropdown-menu a{padding:9px 15px;font-weight:bold;color:#777;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.nav-collapse .btn{padding:4px 10px 4px;font-weight:normal;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.nav-collapse .dropdown-menu li+li a{margin-bottom:2px}.nav-collapse .nav>li>a:hover,.nav-collapse .nav>li>a:focus,.nav-collapse .dropdown-menu a:hover,.nav-collapse .dropdown-menu a:focus{background-color:#f2f2f2}.navbar-inverse .nav-collapse .nav>li>a,.navbar-inverse .nav-collapse .dropdown-menu a{color:#999}.navbar-inverse .nav-collapse .nav>li>a:hover,.navbar-inverse .nav-collapse .nav>li>a:focus,.navbar-inverse .nav-collapse .dropdown-menu a:hover,.navbar-inverse .nav-collapse .dropdown-menu a:focus{background-color:#111}.nav-collapse.in .btn-group{padding:0;margin-top:5px}.nav-collapse .dropdown-menu{position:static;top:auto;left:auto;display:none;float:none;max-width:none;padding:0;margin:0 15px;background-color:transparent;border:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.nav-collapse .open>.dropdown-menu{display:block}.nav-collapse .dropdown-menu:before,.nav-collapse .dropdown-menu:after{display:none}.nav-collapse .dropdown-menu .divider{display:none}.nav-collapse .nav>li>.dropdown-menu:before,.nav-collapse .nav>li>.dropdown-menu:after{display:none}.nav-collapse .navbar-form,.nav-collapse .navbar-search{float:none;padding:10px 15px;margin:10px 0;border-top:1px solid #f2f2f2;border-bottom:1px solid #f2f2f2;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1);box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1)}.navbar-inverse .nav-collapse .navbar-form,.navbar-inverse .nav-collapse .navbar-search{border-top-color:#111;border-bottom-color:#111}.navbar .nav-collapse .nav.pull-right{float:none;margin-left:0}.nav-collapse,.nav-collapse.collapse{height:0;overflow:hidden}.navbar .btn-navbar{display:block}.navbar-static .navbar-inner{padding-right:10px;padding-left:10px}}@media(min-width:980px){.nav-collapse.collapse{height:auto!important;overflow:visible!important}}
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/css/bootstrap.css b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/css/bootstrap.css
new file mode 100644
index 0000000..4defba3
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/css/bootstrap.css
@@ -0,0 +1,6139 @@
+/*!
+ * Bootstrap v2.3.2
+ *
+ * Copyright 2013 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world by @mdo and @fat.
+ */
+
+.clearfix {
+  *zoom: 1;
+}
+
+.clearfix:before,
+.clearfix:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.clearfix:after {
+  clear: both;
+}
+
+.hide-text {
+  font: 0/0 a;
+  color: transparent;
+  text-shadow: none;
+  background-color: transparent;
+  border: 0;
+}
+
+.input-block-level {
+  display: block;
+  width: 100%;
+  min-height: 30px;
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+          box-sizing: border-box;
+}
+
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+nav,
+section {
+  display: block;
+}
+
+audio,
+canvas,
+video {
+  display: inline-block;
+  *display: inline;
+  *zoom: 1;
+}
+
+audio:not([controls]) {
+  display: none;
+}
+
+html {
+  font-size: 100%;
+  -webkit-text-size-adjust: 100%;
+      -ms-text-size-adjust: 100%;
+}
+
+a:focus {
+  outline: thin dotted #333;
+  outline: 5px auto -webkit-focus-ring-color;
+  outline-offset: -2px;
+}
+
+a:hover,
+a:active {
+  outline: 0;
+}
+
+sub,
+sup {
+  position: relative;
+  font-size: 75%;
+  line-height: 0;
+  vertical-align: baseline;
+}
+
+sup {
+  top: -0.5em;
+}
+
+sub {
+  bottom: -0.25em;
+}
+
+img {
+  width: auto\9;
+  height: auto;
+  max-width: 100%;
+  vertical-align: middle;
+  border: 0;
+  -ms-interpolation-mode: bicubic;
+}
+
+#map_canvas img,
+.google-maps img {
+  max-width: none;
+}
+
+button,
+input,
+select,
+textarea {
+  margin: 0;
+  font-size: 100%;
+  vertical-align: middle;
+}
+
+button,
+input {
+  *overflow: visible;
+  line-height: normal;
+}
+
+button::-moz-focus-inner,
+input::-moz-focus-inner {
+  padding: 0;
+  border: 0;
+}
+
+button,
+html input[type="button"],
+input[type="reset"],
+input[type="submit"] {
+  cursor: pointer;
+  -webkit-appearance: button;
+}
+
+label,
+select,
+button,
+input[type="button"],
+input[type="reset"],
+input[type="submit"],
+input[type="radio"],
+input[type="checkbox"] {
+  cursor: pointer;
+}
+
+input[type="search"] {
+  -webkit-box-sizing: content-box;
+     -moz-box-sizing: content-box;
+          box-sizing: content-box;
+  -webkit-appearance: textfield;
+}
+
+input[type="search"]::-webkit-search-decoration,
+input[type="search"]::-webkit-search-cancel-button {
+  -webkit-appearance: none;
+}
+
+textarea {
+  overflow: auto;
+  vertical-align: top;
+}
+
+@media print {
+  * {
+    color: #000 !important;
+    text-shadow: none !important;
+    background: transparent !important;
+    box-shadow: none !important;
+  }
+  a,
+  a:visited {
+    text-decoration: underline;
+  }
+  a[href]:after {
+    content: " (" attr(href) ")";
+  }
+  abbr[title]:after {
+    content: " (" attr(title) ")";
+  }
+  .ir a:after,
+  a[href^="javascript:"]:after,
+  a[href^="#"]:after {
+    content: "";
+  }
+  pre,
+  blockquote {
+    border: 1px solid #999;
+    page-break-inside: avoid;
+  }
+  thead {
+    display: table-header-group;
+  }
+  tr,
+  img {
+    page-break-inside: avoid;
+  }
+  img {
+    max-width: 100% !important;
+  }
+  @page  {
+    margin: 0.5cm;
+  }
+  p,
+  h2,
+  h3 {
+    orphans: 3;
+    widows: 3;
+  }
+  h2,
+  h3 {
+    page-break-after: avoid;
+  }
+}
+
+body {
+  margin: 0;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 14px;
+  line-height: 20px;
+  color: #333333;
+  background-color: #ffffff;
+}
+
+a {
+  color: #0088cc;
+  text-decoration: none;
+}
+
+a:hover,
+a:focus {
+  color: #005580;
+  text-decoration: underline;
+}
+
+.img-rounded {
+  -webkit-border-radius: 6px;
+     -moz-border-radius: 6px;
+          border-radius: 6px;
+}
+
+.img-polaroid {
+  padding: 4px;
+  background-color: #fff;
+  border: 1px solid #ccc;
+  border: 1px solid rgba(0, 0, 0, 0.2);
+  -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+     -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+          box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+}
+
+.img-circle {
+  -webkit-border-radius: 500px;
+     -moz-border-radius: 500px;
+          border-radius: 500px;
+}
+
+.row {
+  margin-left: -20px;
+  *zoom: 1;
+}
+
+.row:before,
+.row:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.row:after {
+  clear: both;
+}
+
+[class*="span"] {
+  float: left;
+  min-height: 1px;
+  margin-left: 20px;
+}
+
+.container,
+.navbar-static-top .container,
+.navbar-fixed-top .container,
+.navbar-fixed-bottom .container {
+  width: 940px;
+}
+
+.span12 {
+  width: 940px;
+}
+
+.span11 {
+  width: 860px;
+}
+
+.span10 {
+  width: 780px;
+}
+
+.span9 {
+  width: 700px;
+}
+
+.span8 {
+  width: 620px;
+}
+
+.span7 {
+  width: 540px;
+}
+
+.span6 {
+  width: 460px;
+}
+
+.span5 {
+  width: 380px;
+}
+
+.span4 {
+  width: 300px;
+}
+
+.span3 {
+  width: 220px;
+}
+
+.span2 {
+  width: 140px;
+}
+
+.span1 {
+  width: 60px;
+}
+
+.offset12 {
+  margin-left: 980px;
+}
+
+.offset11 {
+  margin-left: 900px;
+}
+
+.offset10 {
+  margin-left: 820px;
+}
+
+.offset9 {
+  margin-left: 740px;
+}
+
+.offset8 {
+  margin-left: 660px;
+}
+
+.offset7 {
+  margin-left: 580px;
+}
+
+.offset6 {
+  margin-left: 500px;
+}
+
+.offset5 {
+  margin-left: 420px;
+}
+
+.offset4 {
+  margin-left: 340px;
+}
+
+.offset3 {
+  margin-left: 260px;
+}
+
+.offset2 {
+  margin-left: 180px;
+}
+
+.offset1 {
+  margin-left: 100px;
+}
+
+.row-fluid {
+  width: 100%;
+  *zoom: 1;
+}
+
+.row-fluid:before,
+.row-fluid:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.row-fluid:after {
+  clear: both;
+}
+
+.row-fluid [class*="span"] {
+  display: block;
+  float: left;
+  width: 100%;
+  min-height: 30px;
+  margin-left: 2.127659574468085%;
+  *margin-left: 2.074468085106383%;
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+          box-sizing: border-box;
+}
+
+.row-fluid [class*="span"]:first-child {
+  margin-left: 0;
+}
+
+.row-fluid .controls-row [class*="span"] + [class*="span"] {
+  margin-left: 2.127659574468085%;
+}
+
+.row-fluid .span12 {
+  width: 100%;
+  *width: 99.94680851063829%;
+}
+
+.row-fluid .span11 {
+  width: 91.48936170212765%;
+  *width: 91.43617021276594%;
+}
+
+.row-fluid .span10 {
+  width: 82.97872340425532%;
+  *width: 82.92553191489361%;
+}
+
+.row-fluid .span9 {
+  width: 74.46808510638297%;
+  *width: 74.41489361702126%;
+}
+
+.row-fluid .span8 {
+  width: 65.95744680851064%;
+  *width: 65.90425531914893%;
+}
+
+.row-fluid .span7 {
+  width: 57.44680851063829%;
+  *width: 57.39361702127659%;
+}
+
+.row-fluid .span6 {
+  width: 48.93617021276595%;
+  *width: 48.88297872340425%;
+}
+
+.row-fluid .span5 {
+  width: 40.42553191489362%;
+  *width: 40.37234042553192%;
+}
+
+.row-fluid .span4 {
+  width: 31.914893617021278%;
+  *width: 31.861702127659576%;
+}
+
+.row-fluid .span3 {
+  width: 23.404255319148934%;
+  *width: 23.351063829787233%;
+}
+
+.row-fluid .span2 {
+  width: 14.893617021276595%;
+  *width: 14.840425531914894%;
+}
+
+.row-fluid .span1 {
+  width: 6.382978723404255%;
+  *width: 6.329787234042553%;
+}
+
+.row-fluid .offset12 {
+  margin-left: 104.25531914893617%;
+  *margin-left: 104.14893617021275%;
+}
+
+.row-fluid .offset12:first-child {
+  margin-left: 102.12765957446808%;
+  *margin-left: 102.02127659574467%;
+}
+
+.row-fluid .offset11 {
+  margin-left: 95.74468085106382%;
+  *margin-left: 95.6382978723404%;
+}
+
+.row-fluid .offset11:first-child {
+  margin-left: 93.61702127659574%;
+  *margin-left: 93.51063829787232%;
+}
+
+.row-fluid .offset10 {
+  margin-left: 87.23404255319149%;
+  *margin-left: 87.12765957446807%;
+}
+
+.row-fluid .offset10:first-child {
+  margin-left: 85.1063829787234%;
+  *margin-left: 84.99999999999999%;
+}
+
+.row-fluid .offset9 {
+  margin-left: 78.72340425531914%;
+  *margin-left: 78.61702127659572%;
+}
+
+.row-fluid .offset9:first-child {
+  margin-left: 76.59574468085106%;
+  *margin-left: 76.48936170212764%;
+}
+
+.row-fluid .offset8 {
+  margin-left: 70.2127659574468%;
+  *margin-left: 70.10638297872339%;
+}
+
+.row-fluid .offset8:first-child {
+  margin-left: 68.08510638297872%;
+  *margin-left: 67.9787234042553%;
+}
+
+.row-fluid .offset7 {
+  margin-left: 61.70212765957446%;
+  *margin-left: 61.59574468085106%;
+}
+
+.row-fluid .offset7:first-child {
+  margin-left: 59.574468085106375%;
+  *margin-left: 59.46808510638297%;
+}
+
+.row-fluid .offset6 {
+  margin-left: 53.191489361702125%;
+  *margin-left: 53.085106382978715%;
+}
+
+.row-fluid .offset6:first-child {
+  margin-left: 51.063829787234035%;
+  *margin-left: 50.95744680851063%;
+}
+
+.row-fluid .offset5 {
+  margin-left: 44.68085106382979%;
+  *margin-left: 44.57446808510638%;
+}
+
+.row-fluid .offset5:first-child {
+  margin-left: 42.5531914893617%;
+  *margin-left: 42.4468085106383%;
+}
+
+.row-fluid .offset4 {
+  margin-left: 36.170212765957444%;
+  *margin-left: 36.06382978723405%;
+}
+
+.row-fluid .offset4:first-child {
+  margin-left: 34.04255319148936%;
+  *margin-left: 33.93617021276596%;
+}
+
+.row-fluid .offset3 {
+  margin-left: 27.659574468085104%;
+  *margin-left: 27.5531914893617%;
+}
+
+.row-fluid .offset3:first-child {
+  margin-left: 25.53191489361702%;
+  *margin-left: 25.425531914893618%;
+}
+
+.row-fluid .offset2 {
+  margin-left: 19.148936170212764%;
+  *margin-left: 19.04255319148936%;
+}
+
+.row-fluid .offset2:first-child {
+  margin-left: 17.02127659574468%;
+  *margin-left: 16.914893617021278%;
+}
+
+.row-fluid .offset1 {
+  margin-left: 10.638297872340425%;
+  *margin-left: 10.53191489361702%;
+}
+
+.row-fluid .offset1:first-child {
+  margin-left: 8.51063829787234%;
+  *margin-left: 8.404255319148938%;
+}
+
+[class*="span"].hide,
+.row-fluid [class*="span"].hide {
+  display: none;
+}
+
+[class*="span"].pull-right,
+.row-fluid [class*="span"].pull-right {
+  float: right;
+}
+
+.container {
+  margin-right: auto;
+  margin-left: auto;
+  *zoom: 1;
+}
+
+.container:before,
+.container:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.container:after {
+  clear: both;
+}
+
+.container-fluid {
+  padding-right: 20px;
+  padding-left: 20px;
+  *zoom: 1;
+}
+
+.container-fluid:before,
+.container-fluid:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.container-fluid:after {
+  clear: both;
+}
+
+p {
+  margin: 0 0 10px;
+}
+
+.lead {
+  margin-bottom: 20px;
+  font-size: 21px;
+  font-weight: 200;
+  line-height: 30px;
+}
+
+small {
+  font-size: 85%;
+}
+
+strong {
+  font-weight: bold;
+}
+
+em {
+  font-style: italic;
+}
+
+cite {
+  font-style: normal;
+}
+
+.muted {
+  color: #999999;
+}
+
+a.muted:hover,
+a.muted:focus {
+  color: #808080;
+}
+
+.text-warning {
+  color: #c09853;
+}
+
+a.text-warning:hover,
+a.text-warning:focus {
+  color: #a47e3c;
+}
+
+.text-error {
+  color: #b94a48;
+}
+
+a.text-error:hover,
+a.text-error:focus {
+  color: #953b39;
+}
+
+.text-info {
+  color: #3a87ad;
+}
+
+a.text-info:hover,
+a.text-info:focus {
+  color: #2d6987;
+}
+
+.text-success {
+  color: #468847;
+}
+
+a.text-success:hover,
+a.text-success:focus {
+  color: #356635;
+}
+
+.text-left {
+  text-align: left;
+}
+
+.text-right {
+  text-align: right;
+}
+
+.text-center {
+  text-align: center;
+}
+
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+  margin: 10px 0;
+  font-family: inherit;
+  font-weight: bold;
+  line-height: 20px;
+  color: inherit;
+  text-rendering: optimizelegibility;
+}
+
+h1 small,
+h2 small,
+h3 small,
+h4 small,
+h5 small,
+h6 small {
+  font-weight: normal;
+  line-height: 1;
+  color: #999999;
+}
+
+h1,
+h2,
+h3 {
+  line-height: 40px;
+}
+
+h1 {
+  font-size: 38.5px;
+}
+
+h2 {
+  font-size: 31.5px;
+}
+
+h3 {
+  font-size: 24.5px;
+}
+
+h4 {
+  font-size: 17.5px;
+}
+
+h5 {
+  font-size: 14px;
+}
+
+h6 {
+  font-size: 11.9px;
+}
+
+h1 small {
+  font-size: 24.5px;
+}
+
+h2 small {
+  font-size: 17.5px;
+}
+
+h3 small {
+  font-size: 14px;
+}
+
+h4 small {
+  font-size: 14px;
+}
+
+.page-header {
+  padding-bottom: 9px;
+  margin: 20px 0 30px;
+  border-bottom: 1px solid #eeeeee;
+}
+
+ul,
+ol {
+  padding: 0;
+  margin: 0 0 10px 25px;
+}
+
+ul ul,
+ul ol,
+ol ol,
+ol ul {
+  margin-bottom: 0;
+}
+
+li {
+  line-height: 20px;
+}
+
+ul.unstyled,
+ol.unstyled {
+  margin-left: 0;
+  list-style: none;
+}
+
+ul.inline,
+ol.inline {
+  margin-left: 0;
+  list-style: none;
+}
+
+ul.inline > li,
+ol.inline > li {
+  display: inline-block;
+  *display: inline;
+  padding-right: 5px;
+  padding-left: 5px;
+  *zoom: 1;
+}
+
+dl {
+  margin-bottom: 20px;
+}
+
+dt,
+dd {
+  line-height: 20px;
+}
+
+dt {
+  font-weight: bold;
+}
+
+dd {
+  margin-left: 10px;
+}
+
+.dl-horizontal {
+  *zoom: 1;
+}
+
+.dl-horizontal:before,
+.dl-horizontal:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.dl-horizontal:after {
+  clear: both;
+}
+
+.dl-horizontal dt {
+  float: left;
+  width: 160px;
+  overflow: hidden;
+  clear: left;
+  text-align: right;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.dl-horizontal dd {
+  margin-left: 180px;
+}
+
+hr {
+  margin: 20px 0;
+  border: 0;
+  border-top: 1px solid #eeeeee;
+  border-bottom: 1px solid #ffffff;
+}
+
+abbr[title],
+abbr[data-original-title] {
+  cursor: help;
+  border-bottom: 1px dotted #999999;
+}
+
+abbr.initialism {
+  font-size: 90%;
+  text-transform: uppercase;
+}
+
+blockquote {
+  padding: 0 0 0 15px;
+  margin: 0 0 20px;
+  border-left: 5px solid #eeeeee;
+}
+
+blockquote p {
+  margin-bottom: 0;
+  font-size: 17.5px;
+  font-weight: 300;
+  line-height: 1.25;
+}
+
+blockquote small {
+  display: block;
+  line-height: 20px;
+  color: #999999;
+}
+
+blockquote small:before {
+  content: '\2014 \00A0';
+}
+
+blockquote.pull-right {
+  float: right;
+  padding-right: 15px;
+  padding-left: 0;
+  border-right: 5px solid #eeeeee;
+  border-left: 0;
+}
+
+blockquote.pull-right p,
+blockquote.pull-right small {
+  text-align: right;
+}
+
+blockquote.pull-right small:before {
+  content: '';
+}
+
+blockquote.pull-right small:after {
+  content: '\00A0 \2014';
+}
+
+q:before,
+q:after,
+blockquote:before,
+blockquote:after {
+  content: "";
+}
+
+address {
+  display: block;
+  margin-bottom: 20px;
+  font-style: normal;
+  line-height: 20px;
+}
+
+code,
+pre {
+  padding: 0 3px 2px;
+  font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
+  font-size: 12px;
+  color: #333333;
+  -webkit-border-radius: 3px;
+     -moz-border-radius: 3px;
+          border-radius: 3px;
+}
+
+code {
+  padding: 2px 4px;
+  color: #d14;
+  white-space: nowrap;
+  background-color: #f7f7f9;
+  border: 1px solid #e1e1e8;
+}
+
+pre {
+  display: block;
+  padding: 9.5px;
+  margin: 0 0 10px;
+  font-size: 13px;
+  line-height: 20px;
+  word-break: break-all;
+  word-wrap: break-word;
+  white-space: pre;
+  white-space: pre-wrap;
+  background-color: #f5f5f5;
+  border: 1px solid #ccc;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+}
+
+pre.prettyprint {
+  margin-bottom: 20px;
+}
+
+pre code {
+  padding: 0;
+  color: inherit;
+  white-space: pre;
+  white-space: pre-wrap;
+  background-color: transparent;
+  border: 0;
+}
+
+.pre-scrollable {
+  max-height: 340px;
+  overflow-y: scroll;
+}
+
+form {
+  margin: 0 0 20px;
+}
+
+fieldset {
+  padding: 0;
+  margin: 0;
+  border: 0;
+}
+
+legend {
+  display: block;
+  width: 100%;
+  padding: 0;
+  margin-bottom: 20px;
+  font-size: 21px;
+  line-height: 40px;
+  color: #333333;
+  border: 0;
+  border-bottom: 1px solid #e5e5e5;
+}
+
+legend small {
+  font-size: 15px;
+  color: #999999;
+}
+
+label,
+input,
+button,
+select,
+textarea {
+  font-size: 14px;
+  font-weight: normal;
+  line-height: 20px;
+}
+
+input,
+button,
+select,
+textarea {
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
+
+label {
+  display: block;
+  margin-bottom: 5px;
+}
+
+select,
+textarea,
+input[type="text"],
+input[type="password"],
+input[type="datetime"],
+input[type="datetime-local"],
+input[type="date"],
+input[type="month"],
+input[type="time"],
+input[type="week"],
+input[type="number"],
+input[type="email"],
+input[type="url"],
+input[type="search"],
+input[type="tel"],
+input[type="color"],
+.uneditable-input {
+  display: inline-block;
+  height: 20px;
+  padding: 4px 6px;
+  margin-bottom: 10px;
+  font-size: 14px;
+  line-height: 20px;
+  color: #555555;
+  vertical-align: middle;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+}
+
+input,
+textarea,
+.uneditable-input {
+  width: 206px;
+}
+
+textarea {
+  height: auto;
+}
+
+textarea,
+input[type="text"],
+input[type="password"],
+input[type="datetime"],
+input[type="datetime-local"],
+input[type="date"],
+input[type="month"],
+input[type="time"],
+input[type="week"],
+input[type="number"],
+input[type="email"],
+input[type="url"],
+input[type="search"],
+input[type="tel"],
+input[type="color"],
+.uneditable-input {
+  background-color: #ffffff;
+  border: 1px solid #cccccc;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  -webkit-transition: border linear 0.2s, box-shadow linear 0.2s;
+     -moz-transition: border linear 0.2s, box-shadow linear 0.2s;
+       -o-transition: border linear 0.2s, box-shadow linear 0.2s;
+          transition: border linear 0.2s, box-shadow linear 0.2s;
+}
+
+textarea:focus,
+input[type="text"]:focus,
+input[type="password"]:focus,
+input[type="datetime"]:focus,
+input[type="datetime-local"]:focus,
+input[type="date"]:focus,
+input[type="month"]:focus,
+input[type="time"]:focus,
+input[type="week"]:focus,
+input[type="number"]:focus,
+input[type="email"]:focus,
+input[type="url"]:focus,
+input[type="search"]:focus,
+input[type="tel"]:focus,
+input[type="color"]:focus,
+.uneditable-input:focus {
+  border-color: rgba(82, 168, 236, 0.8);
+  outline: 0;
+  outline: thin dotted \9;
+  /* IE6-9 */
+
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
+}
+
+input[type="radio"],
+input[type="checkbox"] {
+  margin: 4px 0 0;
+  margin-top: 1px \9;
+  *margin-top: 0;
+  line-height: normal;
+}
+
+input[type="file"],
+input[type="image"],
+input[type="submit"],
+input[type="reset"],
+input[type="button"],
+input[type="radio"],
+input[type="checkbox"] {
+  width: auto;
+}
+
+select,
+input[type="file"] {
+  height: 30px;
+  /* In IE7, the height of the select element cannot be changed by height, only font-size */
+
+  *margin-top: 4px;
+  /* For IE7, add top margin to align select with labels */
+
+  line-height: 30px;
+}
+
+select {
+  width: 220px;
+  background-color: #ffffff;
+  border: 1px solid #cccccc;
+}
+
+select[multiple],
+select[size] {
+  height: auto;
+}
+
+select:focus,
+input[type="file"]:focus,
+input[type="radio"]:focus,
+input[type="checkbox"]:focus {
+  outline: thin dotted #333;
+  outline: 5px auto -webkit-focus-ring-color;
+  outline-offset: -2px;
+}
+
+.uneditable-input,
+.uneditable-textarea {
+  color: #999999;
+  cursor: not-allowed;
+  background-color: #fcfcfc;
+  border-color: #cccccc;
+  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
+     -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
+          box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
+}
+
+.uneditable-input {
+  overflow: hidden;
+  white-space: nowrap;
+}
+
+.uneditable-textarea {
+  width: auto;
+  height: auto;
+}
+
+input:-moz-placeholder,
+textarea:-moz-placeholder {
+  color: #999999;
+}
+
+input:-ms-input-placeholder,
+textarea:-ms-input-placeholder {
+  color: #999999;
+}
+
+input::-webkit-input-placeholder,
+textarea::-webkit-input-placeholder {
+  color: #999999;
+}
+
+.radio,
+.checkbox {
+  min-height: 20px;
+  padding-left: 20px;
+}
+
+.radio input[type="radio"],
+.checkbox input[type="checkbox"] {
+  float: left;
+  margin-left: -20px;
+}
+
+.controls > .radio:first-child,
+.controls > .checkbox:first-child {
+  padding-top: 5px;
+}
+
+.radio.inline,
+.checkbox.inline {
+  display: inline-block;
+  padding-top: 5px;
+  margin-bottom: 0;
+  vertical-align: middle;
+}
+
+.radio.inline + .radio.inline,
+.checkbox.inline + .checkbox.inline {
+  margin-left: 10px;
+}
+
+.input-mini {
+  width: 60px;
+}
+
+.input-small {
+  width: 90px;
+}
+
+.input-medium {
+  width: 150px;
+}
+
+.input-large {
+  width: 210px;
+}
+
+.input-xlarge {
+  width: 270px;
+}
+
+.input-xxlarge {
+  width: 530px;
+}
+
+input[class*="span"],
+select[class*="span"],
+textarea[class*="span"],
+.uneditable-input[class*="span"],
+.row-fluid input[class*="span"],
+.row-fluid select[class*="span"],
+.row-fluid textarea[class*="span"],
+.row-fluid .uneditable-input[class*="span"] {
+  float: none;
+  margin-left: 0;
+}
+
+.input-append input[class*="span"],
+.input-append .uneditable-input[class*="span"],
+.input-prepend input[class*="span"],
+.input-prepend .uneditable-input[class*="span"],
+.row-fluid input[class*="span"],
+.row-fluid select[class*="span"],
+.row-fluid textarea[class*="span"],
+.row-fluid .uneditable-input[class*="span"],
+.row-fluid .input-prepend [class*="span"],
+.row-fluid .input-append [class*="span"] {
+  display: inline-block;
+}
+
+input,
+textarea,
+.uneditable-input {
+  margin-left: 0;
+}
+
+.controls-row [class*="span"] + [class*="span"] {
+  margin-left: 20px;
+}
+
+input.span12,
+textarea.span12,
+.uneditable-input.span12 {
+  width: 926px;
+}
+
+input.span11,
+textarea.span11,
+.uneditable-input.span11 {
+  width: 846px;
+}
+
+input.span10,
+textarea.span10,
+.uneditable-input.span10 {
+  width: 766px;
+}
+
+input.span9,
+textarea.span9,
+.uneditable-input.span9 {
+  width: 686px;
+}
+
+input.span8,
+textarea.span8,
+.uneditable-input.span8 {
+  width: 606px;
+}
+
+input.span7,
+textarea.span7,
+.uneditable-input.span7 {
+  width: 526px;
+}
+
+input.span6,
+textarea.span6,
+.uneditable-input.span6 {
+  width: 446px;
+}
+
+input.span5,
+textarea.span5,
+.uneditable-input.span5 {
+  width: 366px;
+}
+
+input.span4,
+textarea.span4,
+.uneditable-input.span4 {
+  width: 286px;
+}
+
+input.span3,
+textarea.span3,
+.uneditable-input.span3 {
+  width: 206px;
+}
+
+input.span2,
+textarea.span2,
+.uneditable-input.span2 {
+  width: 126px;
+}
+
+input.span1,
+textarea.span1,
+.uneditable-input.span1 {
+  width: 46px;
+}
+
+.controls-row {
+  *zoom: 1;
+}
+
+.controls-row:before,
+.controls-row:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.controls-row:after {
+  clear: both;
+}
+
+.controls-row [class*="span"],
+.row-fluid .controls-row [class*="span"] {
+  float: left;
+}
+
+.controls-row .checkbox[class*="span"],
+.controls-row .radio[class*="span"] {
+  padding-top: 5px;
+}
+
+input[disabled],
+select[disabled],
+textarea[disabled],
+input[readonly],
+select[readonly],
+textarea[readonly] {
+  cursor: not-allowed;
+  background-color: #eeeeee;
+}
+
+input[type="radio"][disabled],
+input[type="checkbox"][disabled],
+input[type="radio"][readonly],
+input[type="checkbox"][readonly] {
+  background-color: transparent;
+}
+
+.control-group.warning .control-label,
+.control-group.warning .help-block,
+.control-group.warning .help-inline {
+  color: #c09853;
+}
+
+.control-group.warning .checkbox,
+.control-group.warning .radio,
+.control-group.warning input,
+.control-group.warning select,
+.control-group.warning textarea {
+  color: #c09853;
+}
+
+.control-group.warning input,
+.control-group.warning select,
+.control-group.warning textarea {
+  border-color: #c09853;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+}
+
+.control-group.warning input:focus,
+.control-group.warning select:focus,
+.control-group.warning textarea:focus {
+  border-color: #a47e3c;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
+}
+
+.control-group.warning .input-prepend .add-on,
+.control-group.warning .input-append .add-on {
+  color: #c09853;
+  background-color: #fcf8e3;
+  border-color: #c09853;
+}
+
+.control-group.error .control-label,
+.control-group.error .help-block,
+.control-group.error .help-inline {
+  color: #b94a48;
+}
+
+.control-group.error .checkbox,
+.control-group.error .radio,
+.control-group.error input,
+.control-group.error select,
+.control-group.error textarea {
+  color: #b94a48;
+}
+
+.control-group.error input,
+.control-group.error select,
+.control-group.error textarea {
+  border-color: #b94a48;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+}
+
+.control-group.error input:focus,
+.control-group.error select:focus,
+.control-group.error textarea:focus {
+  border-color: #953b39;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
+}
+
+.control-group.error .input-prepend .add-on,
+.control-group.error .input-append .add-on {
+  color: #b94a48;
+  background-color: #f2dede;
+  border-color: #b94a48;
+}
+
+.control-group.success .control-label,
+.control-group.success .help-block,
+.control-group.success .help-inline {
+  color: #468847;
+}
+
+.control-group.success .checkbox,
+.control-group.success .radio,
+.control-group.success input,
+.control-group.success select,
+.control-group.success textarea {
+  color: #468847;
+}
+
+.control-group.success input,
+.control-group.success select,
+.control-group.success textarea {
+  border-color: #468847;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+}
+
+.control-group.success input:focus,
+.control-group.success select:focus,
+.control-group.success textarea:focus {
+  border-color: #356635;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
+}
+
+.control-group.success .input-prepend .add-on,
+.control-group.success .input-append .add-on {
+  color: #468847;
+  background-color: #dff0d8;
+  border-color: #468847;
+}
+
+.control-group.info .control-label,
+.control-group.info .help-block,
+.control-group.info .help-inline {
+  color: #3a87ad;
+}
+
+.control-group.info .checkbox,
+.control-group.info .radio,
+.control-group.info input,
+.control-group.info select,
+.control-group.info textarea {
+  color: #3a87ad;
+}
+
+.control-group.info input,
+.control-group.info select,
+.control-group.info textarea {
+  border-color: #3a87ad;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+}
+
+.control-group.info input:focus,
+.control-group.info select:focus,
+.control-group.info textarea:focus {
+  border-color: #2d6987;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3;
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3;
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3;
+}
+
+.control-group.info .input-prepend .add-on,
+.control-group.info .input-append .add-on {
+  color: #3a87ad;
+  background-color: #d9edf7;
+  border-color: #3a87ad;
+}
+
+input:focus:invalid,
+textarea:focus:invalid,
+select:focus:invalid {
+  color: #b94a48;
+  border-color: #ee5f5b;
+}
+
+input:focus:invalid:focus,
+textarea:focus:invalid:focus,
+select:focus:invalid:focus {
+  border-color: #e9322d;
+  -webkit-box-shadow: 0 0 6px #f8b9b7;
+     -moz-box-shadow: 0 0 6px #f8b9b7;
+          box-shadow: 0 0 6px #f8b9b7;
+}
+
+.form-actions {
+  padding: 19px 20px 20px;
+  margin-top: 20px;
+  margin-bottom: 20px;
+  background-color: #f5f5f5;
+  border-top: 1px solid #e5e5e5;
+  *zoom: 1;
+}
+
+.form-actions:before,
+.form-actions:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.form-actions:after {
+  clear: both;
+}
+
+.help-block,
+.help-inline {
+  color: #595959;
+}
+
+.help-block {
+  display: block;
+  margin-bottom: 10px;
+}
+
+.help-inline {
+  display: inline-block;
+  *display: inline;
+  padding-left: 5px;
+  vertical-align: middle;
+  *zoom: 1;
+}
+
+.input-append,
+.input-prepend {
+  display: inline-block;
+  margin-bottom: 10px;
+  font-size: 0;
+  white-space: nowrap;
+  vertical-align: middle;
+}
+
+.input-append input,
+.input-prepend input,
+.input-append select,
+.input-prepend select,
+.input-append .uneditable-input,
+.input-prepend .uneditable-input,
+.input-append .dropdown-menu,
+.input-prepend .dropdown-menu,
+.input-append .popover,
+.input-prepend .popover {
+  font-size: 14px;
+}
+
+.input-append input,
+.input-prepend input,
+.input-append select,
+.input-prepend select,
+.input-append .uneditable-input,
+.input-prepend .uneditable-input {
+  position: relative;
+  margin-bottom: 0;
+  *margin-left: 0;
+  vertical-align: top;
+  -webkit-border-radius: 0 4px 4px 0;
+     -moz-border-radius: 0 4px 4px 0;
+          border-radius: 0 4px 4px 0;
+}
+
+.input-append input:focus,
+.input-prepend input:focus,
+.input-append select:focus,
+.input-prepend select:focus,
+.input-append .uneditable-input:focus,
+.input-prepend .uneditable-input:focus {
+  z-index: 2;
+}
+
+.input-append .add-on,
+.input-prepend .add-on {
+  display: inline-block;
+  width: auto;
+  height: 20px;
+  min-width: 16px;
+  padding: 4px 5px;
+  font-size: 14px;
+  font-weight: normal;
+  line-height: 20px;
+  text-align: center;
+  text-shadow: 0 1px 0 #ffffff;
+  background-color: #eeeeee;
+  border: 1px solid #ccc;
+}
+
+.input-append .add-on,
+.input-prepend .add-on,
+.input-append .btn,
+.input-prepend .btn,
+.input-append .btn-group > .dropdown-toggle,
+.input-prepend .btn-group > .dropdown-toggle {
+  vertical-align: top;
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+}
+
+.input-append .active,
+.input-prepend .active {
+  background-color: #a9dba9;
+  border-color: #46a546;
+}
+
+.input-prepend .add-on,
+.input-prepend .btn {
+  margin-right: -1px;
+}
+
+.input-prepend .add-on:first-child,
+.input-prepend .btn:first-child {
+  -webkit-border-radius: 4px 0 0 4px;
+     -moz-border-radius: 4px 0 0 4px;
+          border-radius: 4px 0 0 4px;
+}
+
+.input-append input,
+.input-append select,
+.input-append .uneditable-input {
+  -webkit-border-radius: 4px 0 0 4px;
+     -moz-border-radius: 4px 0 0 4px;
+          border-radius: 4px 0 0 4px;
+}
+
+.input-append input + .btn-group .btn:last-child,
+.input-append select + .btn-group .btn:last-child,
+.input-append .uneditable-input + .btn-group .btn:last-child {
+  -webkit-border-radius: 0 4px 4px 0;
+     -moz-border-radius: 0 4px 4px 0;
+          border-radius: 0 4px 4px 0;
+}
+
+.input-append .add-on,
+.input-append .btn,
+.input-append .btn-group {
+  margin-left: -1px;
+}
+
+.input-append .add-on:last-child,
+.input-append .btn:last-child,
+.input-append .btn-group:last-child > .dropdown-toggle {
+  -webkit-border-radius: 0 4px 4px 0;
+     -moz-border-radius: 0 4px 4px 0;
+          border-radius: 0 4px 4px 0;
+}
+
+.input-prepend.input-append input,
+.input-prepend.input-append select,
+.input-prepend.input-append .uneditable-input {
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+}
+
+.input-prepend.input-append input + .btn-group .btn,
+.input-prepend.input-append select + .btn-group .btn,
+.input-prepend.input-append .uneditable-input + .btn-group .btn {
+  -webkit-border-radius: 0 4px 4px 0;
+     -moz-border-radius: 0 4px 4px 0;
+          border-radius: 0 4px 4px 0;
+}
+
+.input-prepend.input-append .add-on:first-child,
+.input-prepend.input-append .btn:first-child {
+  margin-right: -1px;
+  -webkit-border-radius: 4px 0 0 4px;
+     -moz-border-radius: 4px 0 0 4px;
+          border-radius: 4px 0 0 4px;
+}
+
+.input-prepend.input-append .add-on:last-child,
+.input-prepend.input-append .btn:last-child {
+  margin-left: -1px;
+  -webkit-border-radius: 0 4px 4px 0;
+     -moz-border-radius: 0 4px 4px 0;
+          border-radius: 0 4px 4px 0;
+}
+
+.input-prepend.input-append .btn-group:first-child {
+  margin-left: 0;
+}
+
+input.search-query {
+  padding-right: 14px;
+  padding-right: 4px \9;
+  padding-left: 14px;
+  padding-left: 4px \9;
+  /* IE7-8 doesn't have border-radius, so don't indent the padding */
+
+  margin-bottom: 0;
+  -webkit-border-radius: 15px;
+     -moz-border-radius: 15px;
+          border-radius: 15px;
+}
+
+/* Allow for input prepend/append in search forms */
+
+.form-search .input-append .search-query,
+.form-search .input-prepend .search-query {
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+}
+
+.form-search .input-append .search-query {
+  -webkit-border-radius: 14px 0 0 14px;
+     -moz-border-radius: 14px 0 0 14px;
+          border-radius: 14px 0 0 14px;
+}
+
+.form-search .input-append .btn {
+  -webkit-border-radius: 0 14px 14px 0;
+     -moz-border-radius: 0 14px 14px 0;
+          border-radius: 0 14px 14px 0;
+}
+
+.form-search .input-prepend .search-query {
+  -webkit-border-radius: 0 14px 14px 0;
+     -moz-border-radius: 0 14px 14px 0;
+          border-radius: 0 14px 14px 0;
+}
+
+.form-search .input-prepend .btn {
+  -webkit-border-radius: 14px 0 0 14px;
+     -moz-border-radius: 14px 0 0 14px;
+          border-radius: 14px 0 0 14px;
+}
+
+.form-search input,
+.form-inline input,
+.form-horizontal input,
+.form-search textarea,
+.form-inline textarea,
+.form-horizontal textarea,
+.form-search select,
+.form-inline select,
+.form-horizontal select,
+.form-search .help-inline,
+.form-inline .help-inline,
+.form-horizontal .help-inline,
+.form-search .uneditable-input,
+.form-inline .uneditable-input,
+.form-horizontal .uneditable-input,
+.form-search .input-prepend,
+.form-inline .input-prepend,
+.form-horizontal .input-prepend,
+.form-search .input-append,
+.form-inline .input-append,
+.form-horizontal .input-append {
+  display: inline-block;
+  *display: inline;
+  margin-bottom: 0;
+  vertical-align: middle;
+  *zoom: 1;
+}
+
+.form-search .hide,
+.form-inline .hide,
+.form-horizontal .hide {
+  display: none;
+}
+
+.form-search label,
+.form-inline label,
+.form-search .btn-group,
+.form-inline .btn-group {
+  display: inline-block;
+}
+
+.form-search .input-append,
+.form-inline .input-append,
+.form-search .input-prepend,
+.form-inline .input-prepend {
+  margin-bottom: 0;
+}
+
+.form-search .radio,
+.form-search .checkbox,
+.form-inline .radio,
+.form-inline .checkbox {
+  padding-left: 0;
+  margin-bottom: 0;
+  vertical-align: middle;
+}
+
+.form-search .radio input[type="radio"],
+.form-search .checkbox input[type="checkbox"],
+.form-inline .radio input[type="radio"],
+.form-inline .checkbox input[type="checkbox"] {
+  float: left;
+  margin-right: 3px;
+  margin-left: 0;
+}
+
+.control-group {
+  margin-bottom: 10px;
+}
+
+legend + .control-group {
+  margin-top: 20px;
+  -webkit-margin-top-collapse: separate;
+}
+
+.form-horizontal .control-group {
+  margin-bottom: 20px;
+  *zoom: 1;
+}
+
+.form-horizontal .control-group:before,
+.form-horizontal .control-group:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.form-horizontal .control-group:after {
+  clear: both;
+}
+
+.form-horizontal .control-label {
+  float: left;
+  width: 160px;
+  padding-top: 5px;
+  text-align: right;
+}
+
+.form-horizontal .controls {
+  *display: inline-block;
+  *padding-left: 20px;
+  margin-left: 180px;
+  *margin-left: 0;
+}
+
+.form-horizontal .controls:first-child {
+  *padding-left: 180px;
+}
+
+.form-horizontal .help-block {
+  margin-bottom: 0;
+}
+
+.form-horizontal input + .help-block,
+.form-horizontal select + .help-block,
+.form-horizontal textarea + .help-block,
+.form-horizontal .uneditable-input + .help-block,
+.form-horizontal .input-prepend + .help-block,
+.form-horizontal .input-append + .help-block {
+  margin-top: 10px;
+}
+
+.form-horizontal .form-actions {
+  padding-left: 180px;
+}
+
+table {
+  max-width: 100%;
+  background-color: transparent;
+  border-collapse: collapse;
+  border-spacing: 0;
+}
+
+.table {
+  width: 100%;
+  margin-bottom: 20px;
+}
+
+.table th,
+.table td {
+  padding: 8px;
+  line-height: 20px;
+  text-align: left;
+  vertical-align: top;
+  border-top: 1px solid #dddddd;
+}
+
+.table th {
+  font-weight: bold;
+}
+
+.table thead th {
+  vertical-align: bottom;
+}
+
+.table caption + thead tr:first-child th,
+.table caption + thead tr:first-child td,
+.table colgroup + thead tr:first-child th,
+.table colgroup + thead tr:first-child td,
+.table thead:first-child tr:first-child th,
+.table thead:first-child tr:first-child td {
+  border-top: 0;
+}
+
+.table tbody + tbody {
+  border-top: 2px solid #dddddd;
+}
+
+.table .table {
+  background-color: #ffffff;
+}
+
+.table-condensed th,
+.table-condensed td {
+  padding: 4px 5px;
+}
+
+.table-bordered {
+  border: 1px solid #dddddd;
+  border-collapse: separate;
+  *border-collapse: collapse;
+  border-left: 0;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+}
+
+.table-bordered th,
+.table-bordered td {
+  border-left: 1px solid #dddddd;
+}
+
+.table-bordered caption + thead tr:first-child th,
+.table-bordered caption + tbody tr:first-child th,
+.table-bordered caption + tbody tr:first-child td,
+.table-bordered colgroup + thead tr:first-child th,
+.table-bordered colgroup + tbody tr:first-child th,
+.table-bordered colgroup + tbody tr:first-child td,
+.table-bordered thead:first-child tr:first-child th,
+.table-bordered tbody:first-child tr:first-child th,
+.table-bordered tbody:first-child tr:first-child td {
+  border-top: 0;
+}
+
+.table-bordered thead:first-child tr:first-child > th:first-child,
+.table-bordered tbody:first-child tr:first-child > td:first-child,
+.table-bordered tbody:first-child tr:first-child > th:first-child {
+  -webkit-border-top-left-radius: 4px;
+          border-top-left-radius: 4px;
+  -moz-border-radius-topleft: 4px;
+}
+
+.table-bordered thead:first-child tr:first-child > th:last-child,
+.table-bordered tbody:first-child tr:first-child > td:last-child,
+.table-bordered tbody:first-child tr:first-child > th:last-child {
+  -webkit-border-top-right-radius: 4px;
+          border-top-right-radius: 4px;
+  -moz-border-radius-topright: 4px;
+}
+
+.table-bordered thead:last-child tr:last-child > th:first-child,
+.table-bordered tbody:last-child tr:last-child > td:first-child,
+.table-bordered tbody:last-child tr:last-child > th:first-child,
+.table-bordered tfoot:last-child tr:last-child > td:first-child,
+.table-bordered tfoot:last-child tr:last-child > th:first-child {
+  -webkit-border-bottom-left-radius: 4px;
+          border-bottom-left-radius: 4px;
+  -moz-border-radius-bottomleft: 4px;
+}
+
+.table-bordered thead:last-child tr:last-child > th:last-child,
+.table-bordered tbody:last-child tr:last-child > td:last-child,
+.table-bordered tbody:last-child tr:last-child > th:last-child,
+.table-bordered tfoot:last-child tr:last-child > td:last-child,
+.table-bordered tfoot:last-child tr:last-child > th:last-child {
+  -webkit-border-bottom-right-radius: 4px;
+          border-bottom-right-radius: 4px;
+  -moz-border-radius-bottomright: 4px;
+}
+
+.table-bordered tfoot + tbody:last-child tr:last-child td:first-child {
+  -webkit-border-bottom-left-radius: 0;
+          border-bottom-left-radius: 0;
+  -moz-border-radius-bottomleft: 0;
+}
+
+.table-bordered tfoot + tbody:last-child tr:last-child td:last-child {
+  -webkit-border-bottom-right-radius: 0;
+          border-bottom-right-radius: 0;
+  -moz-border-radius-bottomright: 0;
+}
+
+.table-bordered caption + thead tr:first-child th:first-child,
+.table-bordered caption + tbody tr:first-child td:first-child,
+.table-bordered colgroup + thead tr:first-child th:first-child,
+.table-bordered colgroup + tbody tr:first-child td:first-child {
+  -webkit-border-top-left-radius: 4px;
+          border-top-left-radius: 4px;
+  -moz-border-radius-topleft: 4px;
+}
+
+.table-bordered caption + thead tr:first-child th:last-child,
+.table-bordered caption + tbody tr:first-child td:last-child,
+.table-bordered colgroup + thead tr:first-child th:last-child,
+.table-bordered colgroup + tbody tr:first-child td:last-child {
+  -webkit-border-top-right-radius: 4px;
+          border-top-right-radius: 4px;
+  -moz-border-radius-topright: 4px;
+}
+
+.table-striped tbody > tr:nth-child(odd) > td,
+.table-striped tbody > tr:nth-child(odd) > th {
+  background-color: #f9f9f9;
+}
+
+.table-hover tbody tr:hover > td,
+.table-hover tbody tr:hover > th {
+  background-color: #f5f5f5;
+}
+
+table td[class*="span"],
+table th[class*="span"],
+.row-fluid table td[class*="span"],
+.row-fluid table th[class*="span"] {
+  display: table-cell;
+  float: none;
+  margin-left: 0;
+}
+
+.table td.span1,
+.table th.span1 {
+  float: none;
+  width: 44px;
+  margin-left: 0;
+}
+
+.table td.span2,
+.table th.span2 {
+  float: none;
+  width: 124px;
+  margin-left: 0;
+}
+
+.table td.span3,
+.table th.span3 {
+  float: none;
+  width: 204px;
+  margin-left: 0;
+}
+
+.table td.span4,
+.table th.span4 {
+  float: none;
+  width: 284px;
+  margin-left: 0;
+}
+
+.table td.span5,
+.table th.span5 {
+  float: none;
+  width: 364px;
+  margin-left: 0;
+}
+
+.table td.span6,
+.table th.span6 {
+  float: none;
+  width: 444px;
+  margin-left: 0;
+}
+
+.table td.span7,
+.table th.span7 {
+  float: none;
+  width: 524px;
+  margin-left: 0;
+}
+
+.table td.span8,
+.table th.span8 {
+  float: none;
+  width: 604px;
+  margin-left: 0;
+}
+
+.table td.span9,
+.table th.span9 {
+  float: none;
+  width: 684px;
+  margin-left: 0;
+}
+
+.table td.span10,
+.table th.span10 {
+  float: none;
+  width: 764px;
+  margin-left: 0;
+}
+
+.table td.span11,
+.table th.span11 {
+  float: none;
+  width: 844px;
+  margin-left: 0;
+}
+
+.table td.span12,
+.table th.span12 {
+  float: none;
+  width: 924px;
+  margin-left: 0;
+}
+
+.table tbody tr.success > td {
+  background-color: #dff0d8;
+}
+
+.table tbody tr.error > td {
+  background-color: #f2dede;
+}
+
+.table tbody tr.warning > td {
+  background-color: #fcf8e3;
+}
+
+.table tbody tr.info > td {
+  background-color: #d9edf7;
+}
+
+.table-hover tbody tr.success:hover > td {
+  background-color: #d0e9c6;
+}
+
+.table-hover tbody tr.error:hover > td {
+  background-color: #ebcccc;
+}
+
+.table-hover tbody tr.warning:hover > td {
+  background-color: #faf2cc;
+}
+
+.table-hover tbody tr.info:hover > td {
+  background-color: #c4e3f3;
+}
+
+[class^="icon-"],
+[class*=" icon-"] {
+  display: inline-block;
+  width: 14px;
+  height: 14px;
+  margin-top: 1px;
+  *margin-right: .3em;
+  line-height: 14px;
+  vertical-align: text-top;
+  background-image: url("../img/glyphicons-halflings.png");
+  background-position: 14px 14px;
+  background-repeat: no-repeat;
+}
+
+/* White icons with optional class, or on hover/focus/active states of certain elements */
+
+.icon-white,
+.nav-pills > .active > a > [class^="icon-"],
+.nav-pills > .active > a > [class*=" icon-"],
+.nav-list > .active > a > [class^="icon-"],
+.nav-list > .active > a > [class*=" icon-"],
+.navbar-inverse .nav > .active > a > [class^="icon-"],
+.navbar-inverse .nav > .active > a > [class*=" icon-"],
+.dropdown-menu > li > a:hover > [class^="icon-"],
+.dropdown-menu > li > a:focus > [class^="icon-"],
+.dropdown-menu > li > a:hover > [class*=" icon-"],
+.dropdown-menu > li > a:focus > [class*=" icon-"],
+.dropdown-menu > .active > a > [class^="icon-"],
+.dropdown-menu > .active > a > [class*=" icon-"],
+.dropdown-submenu:hover > a > [class^="icon-"],
+.dropdown-submenu:focus > a > [class^="icon-"],
+.dropdown-submenu:hover > a > [class*=" icon-"],
+.dropdown-submenu:focus > a > [class*=" icon-"] {
+  background-image: url("../img/glyphicons-halflings-white.png");
+}
+
+.icon-glass {
+  background-position: 0      0;
+}
+
+.icon-music {
+  background-position: -24px 0;
+}
+
+.icon-search {
+  background-position: -48px 0;
+}
+
+.icon-envelope {
+  background-position: -72px 0;
+}
+
+.icon-heart {
+  background-position: -96px 0;
+}
+
+.icon-star {
+  background-position: -120px 0;
+}
+
+.icon-star-empty {
+  background-position: -144px 0;
+}
+
+.icon-user {
+  background-position: -168px 0;
+}
+
+.icon-film {
+  background-position: -192px 0;
+}
+
+.icon-th-large {
+  background-position: -216px 0;
+}
+
+.icon-th {
+  background-position: -240px 0;
+}
+
+.icon-th-list {
+  background-position: -264px 0;
+}
+
+.icon-ok {
+  background-position: -288px 0;
+}
+
+.icon-remove {
+  background-position: -312px 0;
+}
+
+.icon-zoom-in {
+  background-position: -336px 0;
+}
+
+.icon-zoom-out {
+  background-position: -360px 0;
+}
+
+.icon-off {
+  background-position: -384px 0;
+}
+
+.icon-signal {
+  background-position: -408px 0;
+}
+
+.icon-cog {
+  background-position: -432px 0;
+}
+
+.icon-trash {
+  background-position: -456px 0;
+}
+
+.icon-home {
+  background-position: 0 -24px;
+}
+
+.icon-file {
+  background-position: -24px -24px;
+}
+
+.icon-time {
+  background-position: -48px -24px;
+}
+
+.icon-road {
+  background-position: -72px -24px;
+}
+
+.icon-download-alt {
+  background-position: -96px -24px;
+}
+
+.icon-download {
+  background-position: -120px -24px;
+}
+
+.icon-upload {
+  background-position: -144px -24px;
+}
+
+.icon-inbox {
+  background-position: -168px -24px;
+}
+
+.icon-play-circle {
+  background-position: -192px -24px;
+}
+
+.icon-repeat {
+  background-position: -216px -24px;
+}
+
+.icon-refresh {
+  background-position: -240px -24px;
+}
+
+.icon-list-alt {
+  background-position: -264px -24px;
+}
+
+.icon-lock {
+  background-position: -287px -24px;
+}
+
+.icon-flag {
+  background-position: -312px -24px;
+}
+
+.icon-headphones {
+  background-position: -336px -24px;
+}
+
+.icon-volume-off {
+  background-position: -360px -24px;
+}
+
+.icon-volume-down {
+  background-position: -384px -24px;
+}
+
+.icon-volume-up {
+  background-position: -408px -24px;
+}
+
+.icon-qrcode {
+  background-position: -432px -24px;
+}
+
+.icon-barcode {
+  background-position: -456px -24px;
+}
+
+.icon-tag {
+  background-position: 0 -48px;
+}
+
+.icon-tags {
+  background-position: -25px -48px;
+}
+
+.icon-book {
+  background-position: -48px -48px;
+}
+
+.icon-bookmark {
+  background-position: -72px -48px;
+}
+
+.icon-print {
+  background-position: -96px -48px;
+}
+
+.icon-camera {
+  background-position: -120px -48px;
+}
+
+.icon-font {
+  background-position: -144px -48px;
+}
+
+.icon-bold {
+  background-position: -167px -48px;
+}
+
+.icon-italic {
+  background-position: -192px -48px;
+}
+
+.icon-text-height {
+  background-position: -216px -48px;
+}
+
+.icon-text-width {
+  background-position: -240px -48px;
+}
+
+.icon-align-left {
+  background-position: -264px -48px;
+}
+
+.icon-align-center {
+  background-position: -288px -48px;
+}
+
+.icon-align-right {
+  background-position: -312px -48px;
+}
+
+.icon-align-justify {
+  background-position: -336px -48px;
+}
+
+.icon-list {
+  background-position: -360px -48px;
+}
+
+.icon-indent-left {
+  background-position: -384px -48px;
+}
+
+.icon-indent-right {
+  background-position: -408px -48px;
+}
+
+.icon-facetime-video {
+  background-position: -432px -48px;
+}
+
+.icon-picture {
+  background-position: -456px -48px;
+}
+
+.icon-pencil {
+  background-position: 0 -72px;
+}
+
+.icon-map-marker {
+  background-position: -24px -72px;
+}
+
+.icon-adjust {
+  background-position: -48px -72px;
+}
+
+.icon-tint {
+  background-position: -72px -72px;
+}
+
+.icon-edit {
+  background-position: -96px -72px;
+}
+
+.icon-share {
+  background-position: -120px -72px;
+}
+
+.icon-check {
+  background-position: -144px -72px;
+}
+
+.icon-move {
+  background-position: -168px -72px;
+}
+
+.icon-step-backward {
+  background-position: -192px -72px;
+}
+
+.icon-fast-backward {
+  background-position: -216px -72px;
+}
+
+.icon-backward {
+  background-position: -240px -72px;
+}
+
+.icon-play {
+  background-position: -264px -72px;
+}
+
+.icon-pause {
+  background-position: -288px -72px;
+}
+
+.icon-stop {
+  background-position: -312px -72px;
+}
+
+.icon-forward {
+  background-position: -336px -72px;
+}
+
+.icon-fast-forward {
+  background-position: -360px -72px;
+}
+
+.icon-step-forward {
+  background-position: -384px -72px;
+}
+
+.icon-eject {
+  background-position: -408px -72px;
+}
+
+.icon-chevron-left {
+  background-position: -432px -72px;
+}
+
+.icon-chevron-right {
+  background-position: -456px -72px;
+}
+
+.icon-plus-sign {
+  background-position: 0 -96px;
+}
+
+.icon-minus-sign {
+  background-position: -24px -96px;
+}
+
+.icon-remove-sign {
+  background-position: -48px -96px;
+}
+
+.icon-ok-sign {
+  background-position: -72px -96px;
+}
+
+.icon-question-sign {
+  background-position: -96px -96px;
+}
+
+.icon-info-sign {
+  background-position: -120px -96px;
+}
+
+.icon-screenshot {
+  background-position: -144px -96px;
+}
+
+.icon-remove-circle {
+  background-position: -168px -96px;
+}
+
+.icon-ok-circle {
+  background-position: -192px -96px;
+}
+
+.icon-ban-circle {
+  background-position: -216px -96px;
+}
+
+.icon-arrow-left {
+  background-position: -240px -96px;
+}
+
+.icon-arrow-right {
+  background-position: -264px -96px;
+}
+
+.icon-arrow-up {
+  background-position: -289px -96px;
+}
+
+.icon-arrow-down {
+  background-position: -312px -96px;
+}
+
+.icon-share-alt {
+  background-position: -336px -96px;
+}
+
+.icon-resize-full {
+  background-position: -360px -96px;
+}
+
+.icon-resize-small {
+  background-position: -384px -96px;
+}
+
+.icon-plus {
+  background-position: -408px -96px;
+}
+
+.icon-minus {
+  background-position: -433px -96px;
+}
+
+.icon-asterisk {
+  background-position: -456px -96px;
+}
+
+.icon-exclamation-sign {
+  background-position: 0 -120px;
+}
+
+.icon-gift {
+  background-position: -24px -120px;
+}
+
+.icon-leaf {
+  background-position: -48px -120px;
+}
+
+.icon-fire {
+  background-position: -72px -120px;
+}
+
+.icon-eye-open {
+  background-position: -96px -120px;
+}
+
+.icon-eye-close {
+  background-position: -120px -120px;
+}
+
+.icon-warning-sign {
+  background-position: -144px -120px;
+}
+
+.icon-plane {
+  background-position: -168px -120px;
+}
+
+.icon-calendar {
+  background-position: -192px -120px;
+}
+
+.icon-random {
+  width: 16px;
+  background-position: -216px -120px;
+}
+
+.icon-comment {
+  background-position: -240px -120px;
+}
+
+.icon-magnet {
+  background-position: -264px -120px;
+}
+
+.icon-chevron-up {
+  background-position: -288px -120px;
+}
+
+.icon-chevron-down {
+  background-position: -313px -119px;
+}
+
+.icon-retweet {
+  background-position: -336px -120px;
+}
+
+.icon-shopping-cart {
+  background-position: -360px -120px;
+}
+
+.icon-folder-close {
+  width: 16px;
+  background-position: -384px -120px;
+}
+
+.icon-folder-open {
+  width: 16px;
+  background-position: -408px -120px;
+}
+
+.icon-resize-vertical {
+  background-position: -432px -119px;
+}
+
+.icon-resize-horizontal {
+  background-position: -456px -118px;
+}
+
+.icon-hdd {
+  background-position: 0 -144px;
+}
+
+.icon-bullhorn {
+  background-position: -24px -144px;
+}
+
+.icon-bell {
+  background-position: -48px -144px;
+}
+
+.icon-certificate {
+  background-position: -72px -144px;
+}
+
+.icon-thumbs-up {
+  background-position: -96px -144px;
+}
+
+.icon-thumbs-down {
+  background-position: -120px -144px;
+}
+
+.icon-hand-right {
+  background-position: -144px -144px;
+}
+
+.icon-hand-left {
+  background-position: -168px -144px;
+}
+
+.icon-hand-up {
+  background-position: -192px -144px;
+}
+
+.icon-hand-down {
+  background-position: -216px -144px;
+}
+
+.icon-circle-arrow-right {
+  background-position: -240px -144px;
+}
+
+.icon-circle-arrow-left {
+  background-position: -264px -144px;
+}
+
+.icon-circle-arrow-up {
+  background-position: -288px -144px;
+}
+
+.icon-circle-arrow-down {
+  background-position: -312px -144px;
+}
+
+.icon-globe {
+  background-position: -336px -144px;
+}
+
+.icon-wrench {
+  background-position: -360px -144px;
+}
+
+.icon-tasks {
+  background-position: -384px -144px;
+}
+
+.icon-filter {
+  background-position: -408px -144px;
+}
+
+.icon-briefcase {
+  background-position: -432px -144px;
+}
+
+.icon-fullscreen {
+  background-position: -456px -144px;
+}
+
+.dropup,
+.dropdown {
+  position: relative;
+}
+
+.dropdown-toggle {
+  *margin-bottom: -3px;
+}
+
+.dropdown-toggle:active,
+.open .dropdown-toggle {
+  outline: 0;
+}
+
+.caret {
+  display: inline-block;
+  width: 0;
+  height: 0;
+  vertical-align: top;
+  border-top: 4px solid #000000;
+  border-right: 4px solid transparent;
+  border-left: 4px solid transparent;
+  content: "";
+}
+
+.dropdown .caret {
+  margin-top: 8px;
+  margin-left: 2px;
+}
+
+.dropdown-menu {
+  position: absolute;
+  top: 100%;
+  left: 0;
+  z-index: 1000;
+  display: none;
+  float: left;
+  min-width: 160px;
+  padding: 5px 0;
+  margin: 2px 0 0;
+  list-style: none;
+  background-color: #ffffff;
+  border: 1px solid #ccc;
+  border: 1px solid rgba(0, 0, 0, 0.2);
+  *border-right-width: 2px;
+  *border-bottom-width: 2px;
+  -webkit-border-radius: 6px;
+     -moz-border-radius: 6px;
+          border-radius: 6px;
+  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+     -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+          box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  -webkit-background-clip: padding-box;
+     -moz-background-clip: padding;
+          background-clip: padding-box;
+}
+
+.dropdown-menu.pull-right {
+  right: 0;
+  left: auto;
+}
+
+.dropdown-menu .divider {
+  *width: 100%;
+  height: 1px;
+  margin: 9px 1px;
+  *margin: -5px 0 5px;
+  overflow: hidden;
+  background-color: #e5e5e5;
+  border-bottom: 1px solid #ffffff;
+}
+
+.dropdown-menu > li > a {
+  display: block;
+  padding: 3px 20px;
+  clear: both;
+  font-weight: normal;
+  line-height: 20px;
+  color: #333333;
+  white-space: nowrap;
+}
+
+.dropdown-menu > li > a:hover,
+.dropdown-menu > li > a:focus,
+.dropdown-submenu:hover > a,
+.dropdown-submenu:focus > a {
+  color: #ffffff;
+  text-decoration: none;
+  background-color: #0081c2;
+  background-image: -moz-linear-gradient(top, #27a9e3, #27a9e3);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#27a9e3), to(#27a9e3));
+  background-image: -webkit-linear-gradient(top, #27a9e3, #27a9e3);
+  background-image: -o-linear-gradient(top, #27a9e3, #27a9e3);
+  background-image: linear-gradient(to bottom, #27a9e3, #27a9e3);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff27a9e3', endColorstr='#ff27a9e3', GradientType=0);
+}
+
+.dropdown-menu > .active > a,
+.dropdown-menu > .active > a:hover,
+.dropdown-menu > .active > a:focus {
+  color: #ffffff;
+  text-decoration: none;
+  background-color: #0081c2;
+  background-image: -moz-linear-gradient(top, #27a9e3, #27a9e3);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#27a9e3), to(#27a9e3));
+  background-image: -webkit-linear-gradient(top, #27a9e3, #27a9e3);
+  background-image: -o-linear-gradient(top, #27a9e3, #27a9e3);
+  background-image: linear-gradient(to bottom, #27a9e3, #27a9e3);
+  background-repeat: repeat-x;
+  outline: 0;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff27a9e3', endColorstr='#ff27a9e3', GradientType=0);
+}
+
+.dropdown-menu > .disabled > a,
+.dropdown-menu > .disabled > a:hover,
+.dropdown-menu > .disabled > a:focus {
+  color: #999999;
+}
+
+.dropdown-menu > .disabled > a:hover,
+.dropdown-menu > .disabled > a:focus {
+  text-decoration: none;
+  cursor: default;
+  background-color: transparent;
+  background-image: none;
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+}
+
+.open {
+  *z-index: 1000;
+}
+
+.open > .dropdown-menu {
+  display: block;
+}
+
+.dropdown-backdrop {
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 990;
+}
+
+.pull-right > .dropdown-menu {
+  right: 0;
+  left: auto;
+}
+
+.dropup .caret,
+.navbar-fixed-bottom .dropdown .caret {
+  border-top: 0;
+  border-bottom: 4px solid #000000;
+  content: "";
+}
+
+.dropup .dropdown-menu,
+.navbar-fixed-bottom .dropdown .dropdown-menu {
+  top: auto;
+  bottom: 100%;
+  margin-bottom: 1px;
+}
+
+.dropdown-submenu {
+  position: relative;
+}
+
+.dropdown-submenu > .dropdown-menu {
+  top: 0;
+  left: 100%;
+  margin-top: -6px;
+  margin-left: -1px;
+  -webkit-border-radius: 0 6px 6px 6px;
+     -moz-border-radius: 0 6px 6px 6px;
+          border-radius: 0 6px 6px 6px;
+}
+
+.dropdown-submenu:hover > .dropdown-menu {
+  display: block;
+}
+
+.dropup .dropdown-submenu > .dropdown-menu {
+  top: auto;
+  bottom: 0;
+  margin-top: 0;
+  margin-bottom: -2px;
+  -webkit-border-radius: 5px 5px 5px 0;
+     -moz-border-radius: 5px 5px 5px 0;
+          border-radius: 5px 5px 5px 0;
+}
+
+.dropdown-submenu > a:after {
+  display: block;
+  float: right;
+  width: 0;
+  height: 0;
+  margin-top: 5px;
+  margin-right: -10px;
+  border-color: transparent;
+  border-left-color: #cccccc;
+  border-style: solid;
+  border-width: 5px 0 5px 5px;
+  content: " ";
+}
+
+.dropdown-submenu:hover > a:after {
+  border-left-color: #ffffff;
+}
+
+.dropdown-submenu.pull-left {
+  float: none;
+}
+
+.dropdown-submenu.pull-left > .dropdown-menu {
+  left: -100%;
+  margin-left: 10px;
+  -webkit-border-radius: 6px 0 6px 6px;
+     -moz-border-radius: 6px 0 6px 6px;
+          border-radius: 6px 0 6px 6px;
+}
+
+.dropdown .dropdown-menu .nav-header {
+  padding-right: 20px;
+  padding-left: 20px;
+}
+
+.typeahead {
+  z-index: 1051;
+  margin-top: 2px;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+}
+
+.well {
+  min-height: 20px;
+  padding: 19px;
+  margin-bottom: 20px;
+  background-color: #f5f5f5;
+  border: 1px solid #e3e3e3;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
+}
+
+.well blockquote {
+  border-color: #ddd;
+  border-color: rgba(0, 0, 0, 0.15);
+}
+
+.well-large {
+  padding: 24px;
+  -webkit-border-radius: 6px;
+     -moz-border-radius: 6px;
+          border-radius: 6px;
+}
+
+.well-small {
+  padding: 9px;
+  -webkit-border-radius: 3px;
+     -moz-border-radius: 3px;
+          border-radius: 3px;
+}
+
+.fade {
+  opacity: 0;
+  -webkit-transition: opacity 0.15s linear;
+     -moz-transition: opacity 0.15s linear;
+       -o-transition: opacity 0.15s linear;
+          transition: opacity 0.15s linear;
+}
+
+.fade.in {
+  opacity: 1;
+}
+
+.collapse {
+  position: relative;
+  height: 0;
+  overflow: hidden;
+  -webkit-transition: height 0.35s ease;
+     -moz-transition: height 0.35s ease;
+       -o-transition: height 0.35s ease;
+          transition: height 0.35s ease;
+}
+
+.collapse.in {
+  height: auto;
+}
+
+.close {
+  float: right;
+  font-size: 20px;
+  font-weight: bold;
+  line-height: 20px;
+  color: #000000;
+  text-shadow: 0 1px 0 #ffffff;
+  opacity: 0.2;
+  filter: alpha(opacity=20);
+}
+
+.close:hover,
+.close:focus {
+  color: #000000;
+  text-decoration: none;
+  cursor: pointer;
+  opacity: 0.4;
+  filter: alpha(opacity=40);
+}
+
+button.close {
+  padding: 0;
+  cursor: pointer;
+  background: transparent;
+  border: 0;
+  -webkit-appearance: none;
+}
+
+.btn {
+  display: inline-block;
+  *display: inline;
+  padding: 4px 12px;
+  margin-bottom: 0;
+  *margin-left: .3em;
+  font-size: 14px;
+  line-height: 20px;
+  color: #000;
+  text-align: center;
+  vertical-align: middle;
+  cursor: pointer;
+  background-color: #ff5e5f;
+  *border: 0;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+  *zoom: 1;
+}
+
+.btn:hover,
+.btn:focus,
+.btn:active,
+.btn.active,
+.btn.disabled,
+.btn[disabled] {
+  color: #333333;
+  background-color: #e6e6e6;
+  *background-color: #d9d9d9;
+}
+
+.btn:active,
+.btn.active {
+  background-color: #cccccc \9;
+}
+
+.btn:first-child {
+  *margin-left: 0;
+}
+
+.btn:hover,
+.btn:focus {
+  color: #333333;
+  text-decoration: none;
+  background-position: 0 -15px;
+  -webkit-transition: background-position 0.1s linear;
+     -moz-transition: background-position 0.1s linear;
+       -o-transition: background-position 0.1s linear;
+          transition: background-position 0.1s linear;
+}
+
+.btn:focus {
+  outline: thin dotted #333;
+  outline: 5px auto -webkit-focus-ring-color;
+  outline-offset: -2px;
+}
+
+.btn.active,
+.btn:active {
+  background-image: none;
+  outline: 0;
+  -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+     -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+          box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+
+.btn.disabled,
+.btn[disabled] {
+  cursor: default;
+  background-image: none;
+  opacity: 0.65;
+  filter: alpha(opacity=65);
+  -webkit-box-shadow: none;
+     -moz-box-shadow: none;
+          box-shadow: none;
+}
+
+.btn-large {
+  padding: 11px 19px;
+  font-size: 17.5px;
+  -webkit-border-radius: 6px;
+     -moz-border-radius: 6px;
+          border-radius: 6px;
+}
+
+.btn-large [class^="icon-"],
+.btn-large [class*=" icon-"] {
+  margin-top: 4px;
+}
+
+.btn-small {
+  padding: 2px 10px;
+  font-size: 11.9px;
+  -webkit-border-radius: 3px;
+     -moz-border-radius: 3px;
+          border-radius: 3px;
+}
+
+.btn-small [class^="icon-"],
+.btn-small [class*=" icon-"] {
+  margin-top: 0;
+}
+
+.btn-mini [class^="icon-"],
+.btn-mini [class*=" icon-"] {
+  margin-top: -1px;
+}
+
+.btn-mini {
+  padding: 0 6px;
+  font-size: 10.5px;
+  -webkit-border-radius: 3px;
+     -moz-border-radius: 3px;
+          border-radius: 3px;
+}
+
+.btn-block {
+  display: block;
+  width: 100%;
+  padding-right: 0;
+  padding-left: 0;
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+          box-sizing: border-box;
+}
+
+.btn-block + .btn-block {
+  margin-top: 5px;
+}
+
+input[type="submit"].btn-block,
+input[type="reset"].btn-block,
+input[type="button"].btn-block {
+  width: 100%;
+}
+
+.btn-primary.active,
+.btn-warning.active,
+.btn-danger.active,
+.btn-success.active,
+.btn-info.active,
+.btn-inverse.active {
+  color: rgba(255, 255, 255, 0.75);
+}
+
+.btn-primary {
+  color: #ffffff;
+  background-color: #ff5e5f;
+}
+
+.btn-primary:hover,
+.btn-primary:focus,
+.btn-primary:active,
+.btn-primary.active,
+.btn-primary.disabled,
+.btn-primary[disabled] {
+  color: #ffffff;
+  background-color: #ff5e5f;
+}
+
+.btn-primary:active,
+.btn-primary.active {
+  background-color: #ff5e5f;
+}
+
+.btn-warning {
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #faa732;
+  *background-color: #f89406;
+  background-image: -moz-linear-gradient(top, #fbb450, #f89406);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));
+  background-image: -webkit-linear-gradient(top, #fbb450, #f89406);
+  background-image: -o-linear-gradient(top, #fbb450, #f89406);
+  background-image: linear-gradient(to bottom, #fbb450, #f89406);
+  background-repeat: repeat-x;
+  border-color: #f89406 #f89406 #ad6704;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+}
+
+.btn-warning:hover,
+.btn-warning:focus,
+.btn-warning:active,
+.btn-warning.active,
+.btn-warning.disabled,
+.btn-warning[disabled] {
+  color: #ffffff;
+  background-color: #f89406;
+  *background-color: #df8505;
+}
+
+.btn-warning:active,
+.btn-warning.active {
+  background-color: #c67605 \9;
+}
+
+.btn-danger {
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #da4f49;
+  *background-color: #bd362f;
+  background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f));
+  background-image: -webkit-linear-gradient(top, #ee5f5b, #bd362f);
+  background-image: -o-linear-gradient(top, #ee5f5b, #bd362f);
+  background-image: linear-gradient(to bottom, #ee5f5b, #bd362f);
+  background-repeat: repeat-x;
+  border-color: #bd362f #bd362f #802420;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffbd362f', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+}
+
+.btn-danger:hover,
+.btn-danger:focus,
+.btn-danger:active,
+.btn-danger.active,
+.btn-danger.disabled,
+.btn-danger[disabled] {
+  color: #ffffff;
+  background-color: #bd362f;
+  *background-color: #a9302a;
+}
+
+.btn-danger:active,
+.btn-danger.active {
+  background-color: #942a25 \9;
+}
+
+.btn-success {
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #5bb75b;
+  *background-color: #51a351;
+  background-image: -moz-linear-gradient(top, #62c462, #51a351);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351));
+  background-image: -webkit-linear-gradient(top, #62c462, #51a351);
+  background-image: -o-linear-gradient(top, #62c462, #51a351);
+  background-image: linear-gradient(to bottom, #62c462, #51a351);
+  background-repeat: repeat-x;
+  border-color: #51a351 #51a351 #387038;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff51a351', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+}
+
+.btn-success:hover,
+.btn-success:focus,
+.btn-success:active,
+.btn-success.active,
+.btn-success.disabled,
+.btn-success[disabled] {
+  color: #ffffff;
+  background-color: #51a351;
+  *background-color: #499249;
+}
+
+.btn-success:active,
+.btn-success.active {
+  background-color: #408140 \9;
+}
+
+.btn-info {
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #49afcd;
+  *background-color: #2f96b4;
+  background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4));
+  background-image: -webkit-linear-gradient(top, #5bc0de, #2f96b4);
+  background-image: -o-linear-gradient(top, #5bc0de, #2f96b4);
+  background-image: linear-gradient(to bottom, #5bc0de, #2f96b4);
+  background-repeat: repeat-x;
+  border-color: #2f96b4 #2f96b4 #1f6377;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2f96b4', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+}
+
+.btn-info:hover,
+.btn-info:focus,
+.btn-info:active,
+.btn-info.active,
+.btn-info.disabled,
+.btn-info[disabled] {
+  color: #ffffff;
+  background-color: #2f96b4;
+  *background-color: #2a85a0;
+}
+
+.btn-info:active,
+.btn-info.active {
+  background-color: #24748c \9;
+}
+
+.btn-inverse {
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #363636;
+  *background-color: #222222;
+  background-image: -moz-linear-gradient(top, #444444, #222222);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#444444), to(#222222));
+  background-image: -webkit-linear-gradient(top, #444444, #222222);
+  background-image: -o-linear-gradient(top, #444444, #222222);
+  background-image: linear-gradient(to bottom, #444444, #222222);
+  background-repeat: repeat-x;
+  border-color: #222222 #222222 #000000;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff444444', endColorstr='#ff222222', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+}
+
+.btn-inverse:hover,
+.btn-inverse:focus,
+.btn-inverse:active,
+.btn-inverse.active,
+.btn-inverse.disabled,
+.btn-inverse[disabled] {
+  color: #ffffff;
+  background-color: #222222;
+  *background-color: #151515;
+}
+
+.btn-inverse:active,
+.btn-inverse.active {
+  background-color: #080808 \9;
+}
+
+button.btn,
+input[type="submit"].btn {
+  *padding-top: 3px;
+  *padding-bottom: 3px;
+}
+
+button.btn::-moz-focus-inner,
+input[type="submit"].btn::-moz-focus-inner {
+  padding: 0;
+  border: 0;
+}
+
+button.btn.btn-large,
+input[type="submit"].btn.btn-large {
+  *padding-top: 7px;
+  *padding-bottom: 7px;
+}
+
+button.btn.btn-small,
+input[type="submit"].btn.btn-small {
+  *padding-top: 3px;
+  *padding-bottom: 3px;
+}
+
+button.btn.btn-mini,
+input[type="submit"].btn.btn-mini {
+  *padding-top: 1px;
+  *padding-bottom: 1px;
+}
+
+.btn-link,
+.btn-link:active,
+.btn-link[disabled] {
+  background-color: transparent;
+  background-image: none;
+  -webkit-box-shadow: none;
+     -moz-box-shadow: none;
+          box-shadow: none;
+}
+
+.btn-link {
+  color: #0088cc;
+  cursor: pointer;
+  border-color: transparent;
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+}
+
+.btn-link:hover,
+.btn-link:focus {
+  color: #005580;
+  text-decoration: underline;
+  background-color: transparent;
+}
+
+.btn-link[disabled]:hover,
+.btn-link[disabled]:focus {
+  color: #333333;
+  text-decoration: none;
+}
+
+.btn-group {
+  position: relative;
+  display: inline-block;
+  *display: inline;
+  *margin-left: .3em;
+  font-size: 0;
+  white-space: nowrap;
+  vertical-align: middle;
+  *zoom: 1;
+}
+
+.btn-group:first-child {
+  *margin-left: 0;
+}
+
+.btn-group + .btn-group {
+  margin-left: 5px;
+}
+
+.btn-toolbar {
+  margin-top: 10px;
+  margin-bottom: 10px;
+  font-size: 0;
+}
+
+.btn-toolbar > .btn + .btn,
+.btn-toolbar > .btn-group + .btn,
+.btn-toolbar > .btn + .btn-group {
+  margin-left: 5px;
+}
+
+.btn-group > .btn {
+  position: relative;
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+}
+
+.btn-group > .btn + .btn {
+  margin-left: -1px;
+}
+
+.btn-group > .btn,
+.btn-group > .dropdown-menu,
+.btn-group > .popover {
+  font-size: 14px;
+}
+
+.btn-group > .btn-mini {
+  font-size: 10.5px;
+}
+
+.btn-group > .btn-small {
+  font-size: 11.9px;
+}
+
+.btn-group > .btn-large {
+  font-size: 17.5px;
+}
+
+.btn-group > .btn:first-child {
+  margin-left: 0;
+  -webkit-border-bottom-left-radius: 4px;
+          border-bottom-left-radius: 4px;
+  -webkit-border-top-left-radius: 4px;
+          border-top-left-radius: 4px;
+  -moz-border-radius-bottomleft: 4px;
+  -moz-border-radius-topleft: 4px;
+}
+
+.btn-group > .btn:last-child,
+.btn-group > .dropdown-toggle {
+  -webkit-border-top-right-radius: 4px;
+          border-top-right-radius: 4px;
+  -webkit-border-bottom-right-radius: 4px;
+          border-bottom-right-radius: 4px;
+  -moz-border-radius-topright: 4px;
+  -moz-border-radius-bottomright: 4px;
+}
+
+.btn-group > .btn.large:first-child {
+  margin-left: 0;
+  -webkit-border-bottom-left-radius: 6px;
+          border-bottom-left-radius: 6px;
+  -webkit-border-top-left-radius: 6px;
+          border-top-left-radius: 6px;
+  -moz-border-radius-bottomleft: 6px;
+  -moz-border-radius-topleft: 6px;
+}
+
+.btn-group > .btn.large:last-child,
+.btn-group > .large.dropdown-toggle {
+  -webkit-border-top-right-radius: 6px;
+          border-top-right-radius: 6px;
+  -webkit-border-bottom-right-radius: 6px;
+          border-bottom-right-radius: 6px;
+  -moz-border-radius-topright: 6px;
+  -moz-border-radius-bottomright: 6px;
+}
+
+.btn-group > .btn:hover,
+.btn-group > .btn:focus,
+.btn-group > .btn:active,
+.btn-group > .btn.active {
+  z-index: 2;
+}
+
+.btn-group .dropdown-toggle:active,
+.btn-group.open .dropdown-toggle {
+  outline: 0;
+}
+
+.btn-group > .btn + .dropdown-toggle {
+  *padding-top: 5px;
+  padding-right: 8px;
+  *padding-bottom: 5px;
+  padding-left: 8px;
+  -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+     -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+          box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+
+.btn-group > .btn-mini + .dropdown-toggle {
+  *padding-top: 2px;
+  padding-right: 5px;
+  *padding-bottom: 2px;
+  padding-left: 5px;
+}
+
+.btn-group > .btn-small + .dropdown-toggle {
+  *padding-top: 5px;
+  *padding-bottom: 4px;
+}
+
+.btn-group > .btn-large + .dropdown-toggle {
+  *padding-top: 7px;
+  padding-right: 12px;
+  *padding-bottom: 7px;
+  padding-left: 12px;
+}
+
+.btn-group.open .dropdown-toggle {
+  background-image: none;
+  -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+     -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+          box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+
+.btn-group.open .btn.dropdown-toggle {
+  background-color: #e6e6e6;
+}
+
+.btn-group.open .btn-primary.dropdown-toggle {
+  background-color: #0044cc;
+}
+
+.btn-group.open .btn-warning.dropdown-toggle {
+  background-color: #f89406;
+}
+
+.btn-group.open .btn-danger.dropdown-toggle {
+  background-color: #bd362f;
+}
+
+.btn-group.open .btn-success.dropdown-toggle {
+  background-color: #51a351;
+}
+
+.btn-group.open .btn-info.dropdown-toggle {
+  background-color: #2f96b4;
+}
+
+.btn-group.open .btn-inverse.dropdown-toggle {
+  background-color: #222222;
+}
+
+.btn .caret {
+  margin-top: 8px;
+  margin-left: 0;
+}
+
+.btn-large .caret {
+  margin-top: 6px;
+}
+
+.btn-large .caret {
+  border-top-width: 5px;
+  border-right-width: 5px;
+  border-left-width: 5px;
+}
+
+.btn-mini .caret,
+.btn-small .caret {
+  margin-top: 8px;
+}
+
+.dropup .btn-large .caret {
+  border-bottom-width: 5px;
+}
+
+.btn-primary .caret,
+.btn-warning .caret,
+.btn-danger .caret,
+.btn-info .caret,
+.btn-success .caret,
+.btn-inverse .caret {
+  border-top-color: #ffffff;
+  border-bottom-color: #ffffff;
+}
+
+.btn-group-vertical {
+  display: inline-block;
+  *display: inline;
+  /* IE7 inline-block hack */
+
+  *zoom: 1;
+}
+
+.btn-group-vertical > .btn {
+  display: block;
+  float: none;
+  max-width: 100%;
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+}
+
+.btn-group-vertical > .btn + .btn {
+  margin-top: -1px;
+  margin-left: 0;
+}
+
+.btn-group-vertical > .btn:first-child {
+  -webkit-border-radius: 4px 4px 0 0;
+     -moz-border-radius: 4px 4px 0 0;
+          border-radius: 4px 4px 0 0;
+}
+
+.btn-group-vertical > .btn:last-child {
+  -webkit-border-radius: 0 0 4px 4px;
+     -moz-border-radius: 0 0 4px 4px;
+          border-radius: 0 0 4px 4px;
+}
+
+.btn-group-vertical > .btn-large:first-child {
+  -webkit-border-radius: 6px 6px 0 0;
+     -moz-border-radius: 6px 6px 0 0;
+          border-radius: 6px 6px 0 0;
+}
+
+.btn-group-vertical > .btn-large:last-child {
+  -webkit-border-radius: 0 0 6px 6px;
+     -moz-border-radius: 0 0 6px 6px;
+          border-radius: 0 0 6px 6px;
+}
+
+.alert {
+  padding: 8px 35px 8px 14px;
+  margin-bottom: 20px;
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+  background-color: #fcf8e3;
+  border: 1px solid #fbeed5;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+}
+
+.alert,
+.alert h4 {
+  color: #c09853;
+}
+
+.alert h4 {
+  margin: 0;
+}
+
+.alert .close {
+  position: relative;
+  top: -2px;
+  right: -21px;
+  line-height: 20px;
+}
+
+.alert-success {
+  color: #468847;
+  background-color: #dff0d8;
+  border-color: #d6e9c6;
+}
+
+.alert-success h4 {
+  color: #468847;
+}
+
+.alert-danger,
+.alert-error {
+  color: #b94a48;
+  background-color: #f2dede;
+  border-color: #eed3d7;
+}
+
+.alert-danger h4,
+.alert-error h4 {
+  color: #b94a48;
+}
+
+.alert-info {
+  color: #3a87ad;
+  background-color: #d9edf7;
+  border-color: #bce8f1;
+}
+
+.alert-info h4 {
+  color: #3a87ad;
+}
+
+.alert-block {
+  padding-top: 14px;
+  padding-bottom: 14px;
+}
+
+.alert-block > p,
+.alert-block > ul {
+  margin-bottom: 0;
+}
+
+.alert-block p + p {
+  margin-top: 5px;
+}
+
+.nav {
+  margin-bottom: 20px;
+  margin-left: 0;
+  list-style: none;
+}
+
+.nav > li > a {
+  display: block;
+}
+
+.nav > li > a:hover,
+.nav > li > a:focus {
+  text-decoration: none;
+  background-color: #eeeeee;
+}
+
+.nav > li > a > img {
+  max-width: none;
+}
+
+.nav > .pull-right {
+  float: right;
+}
+
+.nav-header {
+  display: block;
+  padding: 3px 15px;
+  font-size: 11px;
+  font-weight: bold;
+  line-height: 20px;
+  color: #999999;
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+  text-transform: uppercase;
+}
+
+.nav li + .nav-header {
+  margin-top: 9px;
+}
+
+.nav-list {
+  padding-right: 15px;
+  padding-left: 15px;
+  margin-bottom: 0;
+}
+
+.nav-list > li > a,
+.nav-list .nav-header {
+  margin-right: -15px;
+  margin-left: -15px;
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+}
+
+.nav-list > li > a {
+  padding: 3px 15px;
+}
+
+.nav-list > .active > a,
+.nav-list > .active > a:hover,
+.nav-list > .active > a:focus {
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2);
+  background-color: #0088cc;
+}
+
+.nav-list [class^="icon-"],
+.nav-list [class*=" icon-"] {
+  margin-right: 2px;
+}
+
+.nav-list .divider {
+  *width: 100%;
+  height: 1px;
+  margin: 9px 1px;
+  *margin: -5px 0 5px;
+  overflow: hidden;
+  background-color: #e5e5e5;
+  border-bottom: 1px solid #ffffff;
+}
+
+.nav-tabs,
+.nav-pills {
+  *zoom: 1;
+}
+
+.nav-tabs:before,
+.nav-pills:before,
+.nav-tabs:after,
+.nav-pills:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.nav-tabs:after,
+.nav-pills:after {
+  clear: both;
+}
+
+.nav-tabs > li,
+.nav-pills > li {
+  float: left;
+}
+
+.nav-tabs > li > a,
+.nav-pills > li > a {
+  padding-right: 12px;
+  padding-left: 12px;
+  margin-right: 2px;
+  line-height: 14px;
+}
+
+.nav-tabs {
+  border-bottom: 1px solid #ddd;
+}
+
+.nav-tabs > li {
+  margin-bottom: -1px;
+}
+
+.nav-tabs > li > a {
+  padding-top: 8px;
+  padding-bottom: 8px;
+  line-height: 20px;
+  border: 1px solid transparent;
+  -webkit-border-radius: 4px 4px 0 0;
+     -moz-border-radius: 4px 4px 0 0;
+          border-radius: 4px 4px 0 0;
+}
+
+.nav-tabs > li > a:hover,
+.nav-tabs > li > a:focus {
+  border-color: #eeeeee #eeeeee #dddddd;
+}
+
+.nav-tabs > .active > a,
+.nav-tabs > .active > a:hover,
+.nav-tabs > .active > a:focus {
+  color: #555555;
+  cursor: default;
+  background-color: #ffffff;
+  border: 1px solid #ddd;
+  border-bottom-color: transparent;
+}
+
+.nav-pills > li > a {
+  padding-top: 8px;
+  padding-bottom: 8px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+  -webkit-border-radius: 5px;
+     -moz-border-radius: 5px;
+          border-radius: 5px;
+}
+
+.nav-pills > .active > a,
+.nav-pills > .active > a:hover,
+.nav-pills > .active > a:focus {
+  color: #ffffff;
+  background-color: #0088cc;
+}
+
+.nav-stacked > li {
+  float: none;
+}
+
+.nav-stacked > li > a {
+  margin-right: 0;
+}
+
+.nav-tabs.nav-stacked {
+  border-bottom: 0;
+}
+
+.nav-tabs.nav-stacked > li > a {
+  border: 1px solid #ddd;
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+}
+
+.nav-tabs.nav-stacked > li:first-child > a {
+  -webkit-border-top-right-radius: 4px;
+          border-top-right-radius: 4px;
+  -webkit-border-top-left-radius: 4px;
+          border-top-left-radius: 4px;
+  -moz-border-radius-topright: 4px;
+  -moz-border-radius-topleft: 4px;
+}
+
+.nav-tabs.nav-stacked > li:last-child > a {
+  -webkit-border-bottom-right-radius: 4px;
+          border-bottom-right-radius: 4px;
+  -webkit-border-bottom-left-radius: 4px;
+          border-bottom-left-radius: 4px;
+  -moz-border-radius-bottomright: 4px;
+  -moz-border-radius-bottomleft: 4px;
+}
+
+.nav-tabs.nav-stacked > li > a:hover,
+.nav-tabs.nav-stacked > li > a:focus {
+  z-index: 2;
+  border-color: #ddd;
+}
+
+.nav-pills.nav-stacked > li > a {
+  margin-bottom: 3px;
+}
+
+.nav-pills.nav-stacked > li:last-child > a {
+  margin-bottom: 1px;
+}
+
+.nav-tabs .dropdown-menu {
+  -webkit-border-radius: 0 0 6px 6px;
+     -moz-border-radius: 0 0 6px 6px;
+          border-radius: 0 0 6px 6px;
+}
+
+.nav-pills .dropdown-menu {
+  -webkit-border-radius: 6px;
+     -moz-border-radius: 6px;
+          border-radius: 6px;
+}
+
+.nav .dropdown-toggle .caret {
+  margin-top: 6px;
+  border-top-color: #0088cc;
+  border-bottom-color: #0088cc;
+}
+
+.nav .dropdown-toggle:hover .caret,
+.nav .dropdown-toggle:focus .caret {
+  border-top-color: #005580;
+  border-bottom-color: #005580;
+}
+
+/* move down carets for tabs */
+
+.nav-tabs .dropdown-toggle .caret {
+  margin-top: 8px;
+}
+
+.nav .active .dropdown-toggle .caret {
+  border-top-color: #fff;
+  border-bottom-color: #fff;
+}
+
+.nav-tabs .active .dropdown-toggle .caret {
+  border-top-color: #555555;
+  border-bottom-color: #555555;
+}
+
+.nav > .dropdown.active > a:hover,
+.nav > .dropdown.active > a:focus {
+  cursor: pointer;
+}
+
+.nav-tabs .open .dropdown-toggle,
+.nav-pills .open .dropdown-toggle,
+.nav > li.dropdown.open.active > a:hover,
+.nav > li.dropdown.open.active > a:focus {
+  color: #ffffff;
+  background-color: #999999;
+  border-color: #999999;
+}
+
+.nav li.dropdown.open .caret,
+.nav li.dropdown.open.active .caret,
+.nav li.dropdown.open a:hover .caret,
+.nav li.dropdown.open a:focus .caret {
+  border-top-color: #ffffff;
+  border-bottom-color: #ffffff;
+  opacity: 1;
+  filter: alpha(opacity=100);
+}
+
+.tabs-stacked .open > a:hover,
+.tabs-stacked .open > a:focus {
+  border-color: #999999;
+}
+
+.tabbable {
+  *zoom: 1;
+}
+
+.tabbable:before,
+.tabbable:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.tabbable:after {
+  clear: both;
+}
+
+.tab-content {
+  overflow: auto;
+}
+
+.tabs-below > .nav-tabs,
+.tabs-right > .nav-tabs,
+.tabs-left > .nav-tabs {
+  border-bottom: 0;
+}
+
+.tab-content > .tab-pane,
+.pill-content > .pill-pane {
+  display: none;
+}
+
+.tab-content > .active,
+.pill-content > .active {
+  display: block;
+}
+
+.tabs-below > .nav-tabs {
+  border-top: 1px solid #ddd;
+}
+
+.tabs-below > .nav-tabs > li {
+  margin-top: -1px;
+  margin-bottom: 0;
+}
+
+.tabs-below > .nav-tabs > li > a {
+  -webkit-border-radius: 0 0 4px 4px;
+     -moz-border-radius: 0 0 4px 4px;
+          border-radius: 0 0 4px 4px;
+}
+
+.tabs-below > .nav-tabs > li > a:hover,
+.tabs-below > .nav-tabs > li > a:focus {
+  border-top-color: #ddd;
+  border-bottom-color: transparent;
+}
+
+.tabs-below > .nav-tabs > .active > a,
+.tabs-below > .nav-tabs > .active > a:hover,
+.tabs-below > .nav-tabs > .active > a:focus {
+  border-color: transparent #ddd #ddd #ddd;
+}
+
+.tabs-left > .nav-tabs > li,
+.tabs-right > .nav-tabs > li {
+  float: none;
+}
+
+.tabs-left > .nav-tabs > li > a,
+.tabs-right > .nav-tabs > li > a {
+  min-width: 74px;
+  margin-right: 0;
+  margin-bottom: 3px;
+}
+
+.tabs-left > .nav-tabs {
+  float: left;
+  margin-right: 19px;
+  border-right: 1px solid #ddd;
+}
+
+.tabs-left > .nav-tabs > li > a {
+  margin-right: -1px;
+  -webkit-border-radius: 4px 0 0 4px;
+     -moz-border-radius: 4px 0 0 4px;
+          border-radius: 4px 0 0 4px;
+}
+
+.tabs-left > .nav-tabs > li > a:hover,
+.tabs-left > .nav-tabs > li > a:focus {
+  border-color: #eeeeee #dddddd #eeeeee #eeeeee;
+}
+
+.tabs-left > .nav-tabs .active > a,
+.tabs-left > .nav-tabs .active > a:hover,
+.tabs-left > .nav-tabs .active > a:focus {
+  border-color: #ddd transparent #ddd #ddd;
+  *border-right-color: #ffffff;
+}
+
+.tabs-right > .nav-tabs {
+  float: right;
+  margin-left: 19px;
+  border-left: 1px solid #ddd;
+}
+
+.tabs-right > .nav-tabs > li > a {
+  margin-left: -1px;
+  -webkit-border-radius: 0 4px 4px 0;
+     -moz-border-radius: 0 4px 4px 0;
+          border-radius: 0 4px 4px 0;
+}
+
+.tabs-right > .nav-tabs > li > a:hover,
+.tabs-right > .nav-tabs > li > a:focus {
+  border-color: #eeeeee #eeeeee #eeeeee #dddddd;
+}
+
+.tabs-right > .nav-tabs .active > a,
+.tabs-right > .nav-tabs .active > a:hover,
+.tabs-right > .nav-tabs .active > a:focus {
+  border-color: #ddd #ddd #ddd transparent;
+  *border-left-color: #ffffff;
+}
+
+.nav > .disabled > a {
+  color: #999999;
+}
+
+.nav > .disabled > a:hover,
+.nav > .disabled > a:focus {
+  text-decoration: none;
+  cursor: default;
+  background-color: transparent;
+}
+
+.navbar {
+  *position: relative;
+  *z-index: 2;
+  margin-bottom: 20px;
+  overflow: visible;
+}
+
+.navbar-inner {
+  min-height: 40px;
+  padding-right: 20px;
+  padding-left: 20px;
+  background-color: #fafafa;
+  background-image: -moz-linear-gradient(top, #ffffff, #f2f2f2);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f2f2f2));
+  background-image: -webkit-linear-gradient(top, #ffffff, #f2f2f2);
+  background-image: -o-linear-gradient(top, #ffffff, #f2f2f2);
+  background-image: linear-gradient(to bottom, #ffffff, #f2f2f2);
+  background-repeat: repeat-x;
+  border: 1px solid #d4d4d4;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0);
+  *zoom: 1;
+  -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
+     -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
+          box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
+}
+
+.navbar-inner:before,
+.navbar-inner:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.navbar-inner:after {
+  clear: both;
+}
+
+.navbar .container {
+  width: auto;
+}
+
+.nav-collapse.collapse {
+  height: auto;
+  overflow: visible;
+}
+
+.navbar .brand {
+  display: block;
+  float: left;
+  padding: 10px 20px 10px;
+  margin-left: -20px;
+  font-size: 20px;
+  font-weight: 200;
+  color: #777777;
+  text-shadow: 0 1px 0 #ffffff;
+}
+
+.navbar .brand:hover,
+.navbar .brand:focus {
+  text-decoration: none;
+}
+
+.navbar-text {
+  margin-bottom: 0;
+  line-height: 40px;
+  color: #777777;
+}
+
+.navbar-link {
+  color: #777777;
+}
+
+.navbar-link:hover,
+.navbar-link:focus {
+  color: #333333;
+}
+
+.navbar .divider-vertical {
+  height: 40px;
+  margin: 0 9px;
+  border-right: 1px solid #ffffff;
+  border-left: 1px solid #f2f2f2;
+}
+
+.navbar .btn,
+.navbar .btn-group {
+  margin-top: 5px;
+}
+
+.navbar .btn-group .btn,
+.navbar .input-prepend .btn,
+.navbar .input-append .btn,
+.navbar .input-prepend .btn-group,
+.navbar .input-append .btn-group {
+  margin-top: 0;
+}
+
+.navbar-form {
+  margin-bottom: 0;
+  *zoom: 1;
+}
+
+.navbar-form:before,
+.navbar-form:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.navbar-form:after {
+  clear: both;
+}
+
+.navbar-form input,
+.navbar-form select,
+.navbar-form .radio,
+.navbar-form .checkbox {
+  margin-top: 5px;
+}
+
+.navbar-form input,
+.navbar-form select,
+.navbar-form .btn {
+  display: inline-block;
+  margin-bottom: 0;
+}
+
+.navbar-form input[type="image"],
+.navbar-form input[type="checkbox"],
+.navbar-form input[type="radio"] {
+  margin-top: 3px;
+}
+
+.navbar-form .input-append,
+.navbar-form .input-prepend {
+  margin-top: 5px;
+  white-space: nowrap;
+}
+
+.navbar-form .input-append input,
+.navbar-form .input-prepend input {
+  margin-top: 0;
+}
+
+.navbar-search {
+  position: relative;
+  float: left;
+  margin-top: 5px;
+  margin-bottom: 0;
+}
+
+.navbar-search .search-query {
+  padding: 4px 14px;
+  margin-bottom: 0;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 13px;
+  font-weight: normal;
+  line-height: 1;
+  -webkit-border-radius: 15px;
+     -moz-border-radius: 15px;
+          border-radius: 15px;
+}
+
+.navbar-static-top {
+  position: static;
+  margin-bottom: 0;
+}
+
+.navbar-static-top .navbar-inner {
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+}
+
+.navbar-fixed-top,
+.navbar-fixed-bottom {
+  position: fixed;
+  right: 0;
+  left: 0;
+  z-index: 1030;
+  margin-bottom: 0;
+}
+
+.navbar-fixed-top .navbar-inner,
+.navbar-static-top .navbar-inner {
+  border-width: 0 0 1px;
+}
+
+.navbar-fixed-bottom .navbar-inner {
+  border-width: 1px 0 0;
+}
+
+.navbar-fixed-top .navbar-inner,
+.navbar-fixed-bottom .navbar-inner {
+  padding-right: 0;
+  padding-left: 0;
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+}
+
+.navbar-static-top .container,
+.navbar-fixed-top .container,
+.navbar-fixed-bottom .container {
+  width: 940px;
+}
+
+.navbar-fixed-top {
+  top: 0;
+}
+
+.navbar-fixed-top .navbar-inner,
+.navbar-static-top .navbar-inner {
+  -webkit-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1);
+     -moz-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1);
+          box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1);
+}
+
+.navbar-fixed-bottom {
+  bottom: 0;
+}
+
+.navbar-fixed-bottom .navbar-inner {
+  -webkit-box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1);
+     -moz-box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1);
+          box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1);
+}
+
+.navbar .nav {
+  position: relative;
+  left: 0;
+  display: block;
+  float: left;
+  margin: 0 10px 0 0;
+}
+
+.navbar .nav.pull-right {
+  float: right;
+  margin-right: 0;
+}
+
+.navbar .nav > li {
+  float: left;
+}
+
+.navbar .nav > li > a {
+  float: none;
+  padding: 10px 15px 10px;
+  color: #777777;
+  text-decoration: none;
+  text-shadow: 0 1px 0 #ffffff;
+}
+
+.navbar .nav .dropdown-toggle .caret {
+  margin-top: 8px;
+}
+
+.navbar .nav > li > a:focus,
+.navbar .nav > li > a:hover {
+  color: #333333;
+  text-decoration: none;
+  background-color: transparent;
+}
+
+.navbar .nav > .active > a,
+.navbar .nav > .active > a:hover,
+.navbar .nav > .active > a:focus {
+  color: #555555;
+  text-decoration: none;
+  background-color: #e5e5e5;
+  -webkit-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125);
+     -moz-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125);
+          box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125);
+}
+
+.navbar .btn-navbar {
+  display: none;
+  float: right;
+  padding: 7px 10px;
+  margin-right: 5px;
+  margin-left: 5px;
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #ededed;
+  *background-color: #e5e5e5;
+  background-image: -moz-linear-gradient(top, #f2f2f2, #e5e5e5);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f2f2f2), to(#e5e5e5));
+  background-image: -webkit-linear-gradient(top, #f2f2f2, #e5e5e5);
+  background-image: -o-linear-gradient(top, #f2f2f2, #e5e5e5);
+  background-image: linear-gradient(to bottom, #f2f2f2, #e5e5e5);
+  background-repeat: repeat-x;
+  border-color: #e5e5e5 #e5e5e5 #bfbfbf;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2', endColorstr='#ffe5e5e5', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
+     -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
+          box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
+}
+
+.navbar .btn-navbar:hover,
+.navbar .btn-navbar:focus,
+.navbar .btn-navbar:active,
+.navbar .btn-navbar.active,
+.navbar .btn-navbar.disabled,
+.navbar .btn-navbar[disabled] {
+  color: #ffffff;
+  background-color: #e5e5e5;
+  *background-color: #d9d9d9;
+}
+
+.navbar .btn-navbar:active,
+.navbar .btn-navbar.active {
+  background-color: #cccccc \9;
+}
+
+.navbar .btn-navbar .icon-bar {
+  display: block;
+  width: 18px;
+  height: 2px;
+  background-color: #f5f5f5;
+  -webkit-border-radius: 1px;
+     -moz-border-radius: 1px;
+          border-radius: 1px;
+  -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
+     -moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
+          box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
+}
+
+.btn-navbar .icon-bar + .icon-bar {
+  margin-top: 3px;
+}
+
+.navbar .nav > li > .dropdown-menu:before {
+  position: absolute;
+  top: -7px;
+  left: 9px;
+  display: inline-block;
+  border-right: 7px solid transparent;
+  border-bottom: 7px solid #ccc;
+  border-left: 7px solid transparent;
+  border-bottom-color: rgba(0, 0, 0, 0.2);
+  content: '';
+}
+
+.navbar .nav > li > .dropdown-menu:after {
+  position: absolute;
+  top: -6px;
+  left: 10px;
+  display: inline-block;
+  border-right: 6px solid transparent;
+  border-bottom: 6px solid #ffffff;
+  border-left: 6px solid transparent;
+  content: '';
+}
+
+.navbar-fixed-bottom .nav > li > .dropdown-menu:before {
+  top: auto;
+  bottom: -7px;
+  border-top: 7px solid #ccc;
+  border-bottom: 0;
+  border-top-color: rgba(0, 0, 0, 0.2);
+}
+
+.navbar-fixed-bottom .nav > li > .dropdown-menu:after {
+  top: auto;
+  bottom: -6px;
+  border-top: 6px solid #ffffff;
+  border-bottom: 0;
+}
+
+.navbar .nav li.dropdown > a:hover .caret,
+.navbar .nav li.dropdown > a:focus .caret {
+  border-top-color: #333333;
+  border-bottom-color: #333333;
+}
+
+.navbar .nav li.dropdown.open > .dropdown-toggle,
+.navbar .nav li.dropdown.active > .dropdown-toggle,
+.navbar .nav li.dropdown.open.active > .dropdown-toggle {
+  color: #555555;
+  background-color: #e5e5e5;
+}
+
+.navbar .nav li.dropdown > .dropdown-toggle .caret {
+  border-top-color: #777777;
+  border-bottom-color: #777777;
+}
+
+.navbar .nav li.dropdown.open > .dropdown-toggle .caret,
+.navbar .nav li.dropdown.active > .dropdown-toggle .caret,
+.navbar .nav li.dropdown.open.active > .dropdown-toggle .caret {
+  border-top-color: #555555;
+  border-bottom-color: #555555;
+}
+
+.navbar .pull-right > li > .dropdown-menu,
+.navbar .nav > li > .dropdown-menu.pull-right {
+  right: 0;
+  left: auto;
+}
+
+.navbar .pull-right > li > .dropdown-menu:before,
+.navbar .nav > li > .dropdown-menu.pull-right:before {
+  right: 12px;
+  left: auto;
+}
+
+.navbar .pull-right > li > .dropdown-menu:after,
+.navbar .nav > li > .dropdown-menu.pull-right:after {
+  right: 13px;
+  left: auto;
+}
+
+.navbar .pull-right > li > .dropdown-menu .dropdown-menu,
+.navbar .nav > li > .dropdown-menu.pull-right .dropdown-menu {
+  right: 100%;
+  left: auto;
+  margin-right: -1px;
+  margin-left: 0;
+  -webkit-border-radius: 6px 0 6px 6px;
+     -moz-border-radius: 6px 0 6px 6px;
+          border-radius: 6px 0 6px 6px;
+}
+
+.navbar-inverse .navbar-inner {
+  background-color: #1b1b1b;
+  background-image: -moz-linear-gradient(top, #222222, #111111);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#222222), to(#111111));
+  background-image: -webkit-linear-gradient(top, #222222, #111111);
+  background-image: -o-linear-gradient(top, #222222, #111111);
+  background-image: linear-gradient(to bottom, #222222, #111111);
+  background-repeat: repeat-x;
+  border-color: #252525;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff111111', GradientType=0);
+}
+
+.navbar-inverse .brand,
+.navbar-inverse .nav > li > a {
+  color: #999999;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+}
+
+.navbar-inverse .brand:hover,
+.navbar-inverse .nav > li > a:hover,
+.navbar-inverse .brand:focus,
+.navbar-inverse .nav > li > a:focus {
+  color: #ffffff;
+}
+
+.navbar-inverse .brand {
+  color: #999999;
+}
+
+.navbar-inverse .navbar-text {
+  color: #999999;
+}
+
+.navbar-inverse .nav > li > a:focus,
+.navbar-inverse .nav > li > a:hover {
+  color: #ffffff;
+  background-color: transparent;
+}
+
+.navbar-inverse .nav .active > a,
+.navbar-inverse .nav .active > a:hover,
+.navbar-inverse .nav .active > a:focus {
+  color: #ffffff;
+  background-color: #111111;
+}
+
+.navbar-inverse .navbar-link {
+  color: #999999;
+}
+
+.navbar-inverse .navbar-link:hover,
+.navbar-inverse .navbar-link:focus {
+  color: #ffffff;
+}
+
+.navbar-inverse .divider-vertical {
+  border-right-color: #222222;
+  border-left-color: #111111;
+}
+
+.navbar-inverse .nav li.dropdown.open > .dropdown-toggle,
+.navbar-inverse .nav li.dropdown.active > .dropdown-toggle,
+.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle {
+  color: #ffffff;
+  background-color: #111111;
+}
+
+.navbar-inverse .nav li.dropdown > a:hover .caret,
+.navbar-inverse .nav li.dropdown > a:focus .caret {
+  border-top-color: #ffffff;
+  border-bottom-color: #ffffff;
+}
+
+.navbar-inverse .nav li.dropdown > .dropdown-toggle .caret {
+  border-top-color: #999999;
+  border-bottom-color: #999999;
+}
+
+.navbar-inverse .nav li.dropdown.open > .dropdown-toggle .caret,
+.navbar-inverse .nav li.dropdown.active > .dropdown-toggle .caret,
+.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle .caret {
+  border-top-color: #ffffff;
+  border-bottom-color: #ffffff;
+}
+
+.navbar-inverse .navbar-search .search-query {
+  color: #ffffff;
+  background-color: #515151;
+  border-color: #111111;
+  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
+     -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
+          box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
+  -webkit-transition: none;
+     -moz-transition: none;
+       -o-transition: none;
+          transition: none;
+}
+
+.navbar-inverse .navbar-search .search-query:-moz-placeholder {
+  color: #cccccc;
+}
+
+.navbar-inverse .navbar-search .search-query:-ms-input-placeholder {
+  color: #cccccc;
+}
+
+.navbar-inverse .navbar-search .search-query::-webkit-input-placeholder {
+  color: #cccccc;
+}
+
+.navbar-inverse .navbar-search .search-query:focus,
+.navbar-inverse .navbar-search .search-query.focused {
+  padding: 5px 15px;
+  color: #333333;
+  text-shadow: 0 1px 0 #ffffff;
+  background-color: #ffffff;
+  border: 0;
+  outline: 0;
+  -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
+     -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
+          box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
+}
+
+.navbar-inverse .btn-navbar {
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #0e0e0e;
+  *background-color: #040404;
+  background-image: -moz-linear-gradient(top, #151515, #040404);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#151515), to(#040404));
+  background-image: -webkit-linear-gradient(top, #151515, #040404);
+  background-image: -o-linear-gradient(top, #151515, #040404);
+  background-image: linear-gradient(to bottom, #151515, #040404);
+  background-repeat: repeat-x;
+  border-color: #040404 #040404 #000000;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff151515', endColorstr='#ff040404', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+}
+
+.navbar-inverse .btn-navbar:hover,
+.navbar-inverse .btn-navbar:focus,
+.navbar-inverse .btn-navbar:active,
+.navbar-inverse .btn-navbar.active,
+.navbar-inverse .btn-navbar.disabled,
+.navbar-inverse .btn-navbar[disabled] {
+  color: #ffffff;
+  background-color: #040404;
+  *background-color: #000000;
+}
+
+.navbar-inverse .btn-navbar:active,
+.navbar-inverse .btn-navbar.active {
+  background-color: #000000 \9;
+}
+
+.breadcrumb {
+  padding: 8px 15px;
+  margin: 0 0 20px;
+  list-style: none;
+  background-color: #f5f5f5;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+}
+
+.breadcrumb > li {
+  display: inline-block;
+  *display: inline;
+  text-shadow: 0 1px 0 #ffffff;
+  *zoom: 1;
+}
+
+.breadcrumb > li > .divider {
+  padding: 0 5px;
+  color: #ccc;
+}
+
+.breadcrumb > .active {
+  color: #999999;
+}
+
+.pagination {
+  margin: 20px 0;
+}
+
+.pagination ul {
+  display: inline-block;
+  *display: inline;
+  margin-bottom: 0;
+  margin-left: 0;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+  *zoom: 1;
+  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+     -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+          box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+
+.pagination ul > li {
+  display: inline;
+}
+
+.pagination ul > li > a,
+.pagination ul > li > span {
+  float: left;
+  padding: 4px 12px;
+  line-height: 20px;
+  text-decoration: none;
+  background-color: #ffffff;
+  border: 1px solid #dddddd;
+  border-left-width: 0;
+}
+
+.pagination ul > li > a:hover,
+.pagination ul > li > a:focus,
+.pagination ul > .active > a,
+.pagination ul > .active > span {
+  background-color: #f5f5f5;
+}
+
+.pagination ul > .active > a,
+.pagination ul > .active > span {
+  color: #999999;
+  cursor: default;
+}
+
+.pagination ul > .disabled > span,
+.pagination ul > .disabled > a,
+.pagination ul > .disabled > a:hover,
+.pagination ul > .disabled > a:focus {
+  color: #999999;
+  cursor: default;
+  background-color: transparent;
+}
+
+.pagination ul > li:first-child > a,
+.pagination ul > li:first-child > span {
+  border-left-width: 1px;
+  -webkit-border-bottom-left-radius: 4px;
+          border-bottom-left-radius: 4px;
+  -webkit-border-top-left-radius: 4px;
+          border-top-left-radius: 4px;
+  -moz-border-radius-bottomleft: 4px;
+  -moz-border-radius-topleft: 4px;
+}
+
+.pagination ul > li:last-child > a,
+.pagination ul > li:last-child > span {
+  -webkit-border-top-right-radius: 4px;
+          border-top-right-radius: 4px;
+  -webkit-border-bottom-right-radius: 4px;
+          border-bottom-right-radius: 4px;
+  -moz-border-radius-topright: 4px;
+  -moz-border-radius-bottomright: 4px;
+}
+
+.pagination-centered {
+  text-align: center;
+}
+
+.pagination-right {
+  text-align: right;
+}
+
+.pagination-large ul > li > a,
+.pagination-large ul > li > span {
+  padding: 11px 19px;
+  font-size: 17.5px;
+}
+
+.pagination-large ul > li:first-child > a,
+.pagination-large ul > li:first-child > span {
+  -webkit-border-bottom-left-radius: 6px;
+          border-bottom-left-radius: 6px;
+  -webkit-border-top-left-radius: 6px;
+          border-top-left-radius: 6px;
+  -moz-border-radius-bottomleft: 6px;
+  -moz-border-radius-topleft: 6px;
+}
+
+.pagination-large ul > li:last-child > a,
+.pagination-large ul > li:last-child > span {
+  -webkit-border-top-right-radius: 6px;
+          border-top-right-radius: 6px;
+  -webkit-border-bottom-right-radius: 6px;
+          border-bottom-right-radius: 6px;
+  -moz-border-radius-topright: 6px;
+  -moz-border-radius-bottomright: 6px;
+}
+
+.pagination-mini ul > li:first-child > a,
+.pagination-small ul > li:first-child > a,
+.pagination-mini ul > li:first-child > span,
+.pagination-small ul > li:first-child > span {
+  -webkit-border-bottom-left-radius: 3px;
+          border-bottom-left-radius: 3px;
+  -webkit-border-top-left-radius: 3px;
+          border-top-left-radius: 3px;
+  -moz-border-radius-bottomleft: 3px;
+  -moz-border-radius-topleft: 3px;
+}
+
+.pagination-mini ul > li:last-child > a,
+.pagination-small ul > li:last-child > a,
+.pagination-mini ul > li:last-child > span,
+.pagination-small ul > li:last-child > span {
+  -webkit-border-top-right-radius: 3px;
+          border-top-right-radius: 3px;
+  -webkit-border-bottom-right-radius: 3px;
+          border-bottom-right-radius: 3px;
+  -moz-border-radius-topright: 3px;
+  -moz-border-radius-bottomright: 3px;
+}
+
+.pagination-small ul > li > a,
+.pagination-small ul > li > span {
+  padding: 2px 10px;
+  font-size: 11.9px;
+}
+
+.pagination-mini ul > li > a,
+.pagination-mini ul > li > span {
+  padding: 0 6px;
+  font-size: 10.5px;
+}
+
+.pager {
+  margin: 20px 0;
+  text-align: center;
+  list-style: none;
+  *zoom: 1;
+}
+
+.pager:before,
+.pager:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.pager:after {
+  clear: both;
+}
+
+.pager li {
+  display: inline;
+}
+
+.pager li > a,
+.pager li > span {
+  display: inline-block;
+  padding: 5px 14px;
+  background-color: #fff;
+  border: 1px solid #ddd;
+  -webkit-border-radius: 15px;
+     -moz-border-radius: 15px;
+          border-radius: 15px;
+}
+
+.pager li > a:hover,
+.pager li > a:focus {
+  text-decoration: none;
+  background-color: #f5f5f5;
+}
+
+.pager .next > a,
+.pager .next > span {
+  float: right;
+}
+
+.pager .previous > a,
+.pager .previous > span {
+  float: left;
+}
+
+.pager .disabled > a,
+.pager .disabled > a:hover,
+.pager .disabled > a:focus,
+.pager .disabled > span {
+  color: #999999;
+  cursor: default;
+  background-color: #fff;
+}
+
+.modal-backdrop {
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 1040;
+  background-color: #000000;
+}
+
+.modal-backdrop.fade {
+  opacity: 0;
+}
+
+.modal-backdrop,
+.modal-backdrop.fade.in {
+  opacity: 0.8;
+  filter: alpha(opacity=80);
+}
+
+.modal {
+  position: fixed;
+  top: 10%;
+  left: 50%;
+  z-index: 1050;
+  width: 560px;
+  margin-left: -280px;
+  background-color: #ffffff;
+  border: 1px solid #999;
+  border: 1px solid rgba(0, 0, 0, 0.3);
+  *border: 1px solid #999;
+  -webkit-border-radius: 6px;
+     -moz-border-radius: 6px;
+          border-radius: 6px;
+  outline: none;
+  -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
+     -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
+          box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
+  -webkit-background-clip: padding-box;
+     -moz-background-clip: padding-box;
+          background-clip: padding-box;
+}
+
+.modal.fade {
+  top: -25%;
+  -webkit-transition: opacity 0.3s linear, top 0.3s ease-out;
+     -moz-transition: opacity 0.3s linear, top 0.3s ease-out;
+       -o-transition: opacity 0.3s linear, top 0.3s ease-out;
+          transition: opacity 0.3s linear, top 0.3s ease-out;
+}
+
+.modal.fade.in {
+  top: 10%;
+}
+
+.modal-header {
+  padding: 9px 15px;
+  border-bottom: 1px solid #eee;
+}
+
+.modal-header .close {
+  margin-top: 2px;
+}
+
+.modal-header h3 {
+  margin: 0;
+  line-height: 30px;
+}
+
+.modal-body {
+  position: relative;
+  max-height: 400px;
+  padding: 15px;
+  overflow-y: auto;
+}
+
+.modal-form {
+  margin-bottom: 0;
+}
+
+.modal-footer {
+  padding: 14px 15px 15px;
+  margin-bottom: 0;
+  text-align: right;
+  background-color: #f5f5f5;
+  border-top: 1px solid #ddd;
+  -webkit-border-radius: 0 0 6px 6px;
+     -moz-border-radius: 0 0 6px 6px;
+          border-radius: 0 0 6px 6px;
+  *zoom: 1;
+  -webkit-box-shadow: inset 0 1px 0 #ffffff;
+     -moz-box-shadow: inset 0 1px 0 #ffffff;
+          box-shadow: inset 0 1px 0 #ffffff;
+}
+
+.modal-footer:before,
+.modal-footer:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.modal-footer:after {
+  clear: both;
+}
+
+.modal-footer .btn + .btn {
+  margin-bottom: 0;
+  margin-left: 5px;
+}
+
+.modal-footer .btn-group .btn + .btn {
+  margin-left: -1px;
+}
+
+.modal-footer .btn-block + .btn-block {
+  margin-left: 0;
+}
+
+.tooltip {
+  position: absolute;
+  z-index: 1030;
+  display: block;
+  font-size: 11px;
+  line-height: 1.4;
+  opacity: 0;
+  filter: alpha(opacity=0);
+  visibility: visible;
+}
+
+.tooltip.in {
+  opacity: 0.8;
+  filter: alpha(opacity=80);
+}
+
+.tooltip.top {
+  padding: 5px 0;
+  margin-top: -3px;
+}
+
+.tooltip.right {
+  padding: 0 5px;
+  margin-left: 3px;
+}
+
+.tooltip.bottom {
+  padding: 5px 0;
+  margin-top: 3px;
+}
+
+.tooltip.left {
+  padding: 0 5px;
+  margin-left: -3px;
+}
+
+.tooltip-inner {
+  max-width: 200px;
+  padding: 8px;
+  color: #ffffff;
+  text-align: center;
+  text-decoration: none;
+  background-color: #000000;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+}
+
+.tooltip-arrow {
+  position: absolute;
+  width: 0;
+  height: 0;
+  border-color: transparent;
+  border-style: solid;
+}
+
+.tooltip.top .tooltip-arrow {
+  bottom: 0;
+  left: 50%;
+  margin-left: -5px;
+  border-top-color: #000000;
+  border-width: 5px 5px 0;
+}
+
+.tooltip.right .tooltip-arrow {
+  top: 50%;
+  left: 0;
+  margin-top: -5px;
+  border-right-color: #000000;
+  border-width: 5px 5px 5px 0;
+}
+
+.tooltip.left .tooltip-arrow {
+  top: 50%;
+  right: 0;
+  margin-top: -5px;
+  border-left-color: #000000;
+  border-width: 5px 0 5px 5px;
+}
+
+.tooltip.bottom .tooltip-arrow {
+  top: 0;
+  left: 50%;
+  margin-left: -5px;
+  border-bottom-color: #000000;
+  border-width: 0 5px 5px;
+}
+
+.popover {
+  position: absolute;
+  top: 0;
+  left: 0;
+  z-index: 1010;
+  display: none;
+  max-width: 276px;
+  padding: 1px;
+  text-align: left;
+  white-space: normal;
+  background-color: #ffffff;
+  border: 1px solid #ccc;
+  border: 1px solid rgba(0, 0, 0, 0.2);
+  -webkit-border-radius: 6px;
+     -moz-border-radius: 6px;
+          border-radius: 6px;
+  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+     -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+          box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  -webkit-background-clip: padding-box;
+     -moz-background-clip: padding;
+          background-clip: padding-box;
+}
+
+.popover.top {
+  margin-top: -10px;
+}
+
+.popover.right {
+  margin-left: 10px;
+}
+
+.popover.bottom {
+  margin-top: 10px;
+}
+
+.popover.left {
+  margin-left: -10px;
+}
+
+.popover-title {
+  padding: 8px 14px;
+  margin: 0;
+  font-size: 14px;
+  font-weight: normal;
+  line-height: 18px;
+  background-color: #f7f7f7;
+  border-bottom: 1px solid #ebebeb;
+  -webkit-border-radius: 5px 5px 0 0;
+     -moz-border-radius: 5px 5px 0 0;
+          border-radius: 5px 5px 0 0;
+}
+
+.popover-title:empty {
+  display: none;
+}
+
+.popover-content {
+  padding: 9px 14px;
+}
+
+.popover .arrow,
+.popover .arrow:after {
+  position: absolute;
+  display: block;
+  width: 0;
+  height: 0;
+  border-color: transparent;
+  border-style: solid;
+}
+
+.popover .arrow {
+  border-width: 11px;
+}
+
+.popover .arrow:after {
+  border-width: 10px;
+  content: "";
+}
+
+.popover.top .arrow {
+  bottom: -11px;
+  left: 50%;
+  margin-left: -11px;
+  border-top-color: #999;
+  border-top-color: rgba(0, 0, 0, 0.25);
+  border-bottom-width: 0;
+}
+
+.popover.top .arrow:after {
+  bottom: 1px;
+  margin-left: -10px;
+  border-top-color: #ffffff;
+  border-bottom-width: 0;
+}
+
+.popover.right .arrow {
+  top: 50%;
+  left: -11px;
+  margin-top: -11px;
+  border-right-color: #999;
+  border-right-color: rgba(0, 0, 0, 0.25);
+  border-left-width: 0;
+}
+
+.popover.right .arrow:after {
+  bottom: -10px;
+  left: 1px;
+  border-right-color: #ffffff;
+  border-left-width: 0;
+}
+
+.popover.bottom .arrow {
+  top: -11px;
+  left: 50%;
+  margin-left: -11px;
+  border-bottom-color: #999;
+  border-bottom-color: rgba(0, 0, 0, 0.25);
+  border-top-width: 0;
+}
+
+.popover.bottom .arrow:after {
+  top: 1px;
+  margin-left: -10px;
+  border-bottom-color: #ffffff;
+  border-top-width: 0;
+}
+
+.popover.left .arrow {
+  top: 50%;
+  right: -11px;
+  margin-top: -11px;
+  border-left-color: #999;
+  border-left-color: rgba(0, 0, 0, 0.25);
+  border-right-width: 0;
+}
+
+.popover.left .arrow:after {
+  right: 1px;
+  bottom: -10px;
+  border-left-color: #ffffff;
+  border-right-width: 0;
+}
+
+.thumbnails {
+  margin-left: -20px;
+  list-style: none;
+  *zoom: 1;
+}
+
+.thumbnails:before,
+.thumbnails:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.thumbnails:after {
+  clear: both;
+}
+
+.row-fluid .thumbnails {
+  margin-left: 0;
+}
+
+.thumbnails > li {
+  float: left;
+  margin-bottom: 20px;
+  margin-left: 20px;
+}
+
+.thumbnail {
+  display: block;
+  padding: 4px;
+  line-height: 20px;
+  border: 1px solid #ddd;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+  -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055);
+     -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055);
+          box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055);
+  -webkit-transition: all 0.2s ease-in-out;
+     -moz-transition: all 0.2s ease-in-out;
+       -o-transition: all 0.2s ease-in-out;
+          transition: all 0.2s ease-in-out;
+}
+
+a.thumbnail:hover,
+a.thumbnail:focus {
+  border-color: #0088cc;
+  -webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
+     -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
+          box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
+}
+
+.thumbnail > img {
+  display: block;
+  max-width: 100%;
+  margin-right: auto;
+  margin-left: auto;
+}
+
+.thumbnail .caption {
+  padding: 9px;
+  color: #555555;
+}
+
+.media,
+.media-body {
+  overflow: hidden;
+  *overflow: visible;
+  zoom: 1;
+}
+
+.media,
+.media .media {
+  margin-top: 15px;
+}
+
+.media:first-child {
+  margin-top: 0;
+}
+
+.media-object {
+  display: block;
+}
+
+.media-heading {
+  margin: 0 0 5px;
+}
+
+.media > .pull-left {
+  margin-right: 10px;
+}
+
+.media > .pull-right {
+  margin-left: 10px;
+}
+
+.media-list {
+  margin-left: 0;
+  list-style: none;
+}
+
+.label,
+.badge {
+  display: inline-block;
+  padding: 2px 4px;
+  font-size: 11.844px;
+  font-weight: bold;
+  line-height: 14px;
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  white-space: nowrap;
+  vertical-align: baseline;
+  background-color: #999999;
+}
+
+.label {
+  -webkit-border-radius: 3px;
+     -moz-border-radius: 3px;
+          border-radius: 3px;
+}
+
+.badge {
+  padding-right: 9px;
+  padding-left: 9px;
+  -webkit-border-radius: 9px;
+     -moz-border-radius: 9px;
+          border-radius: 9px;
+}
+
+.label:empty,
+.badge:empty {
+  display: none;
+}
+
+a.label:hover,
+a.label:focus,
+a.badge:hover,
+a.badge:focus {
+  color: #ffffff;
+  text-decoration: none;
+  cursor: pointer;
+}
+
+.label-important,
+.badge-important {
+  background-color: #b94a48;
+}
+
+.label-important[href],
+.badge-important[href] {
+  background-color: #953b39;
+}
+
+.label-warning,
+.badge-warning {
+  background-color: #f89406;
+}
+
+.label-warning[href],
+.badge-warning[href] {
+  background-color: #c67605;
+}
+
+.label-success,
+.badge-success {
+  background-color: #468847;
+}
+
+.label-success[href],
+.badge-success[href] {
+  background-color: #356635;
+}
+
+.label-info,
+.badge-info {
+  background-color: #3a87ad;
+}
+
+.label-info[href],
+.badge-info[href] {
+  background-color: #2d6987;
+}
+
+.label-inverse,
+.badge-inverse {
+  background-color: #333333;
+}
+
+.label-inverse[href],
+.badge-inverse[href] {
+  background-color: #1a1a1a;
+}
+
+.btn .label,
+.btn .badge {
+  position: relative;
+  top: -1px;
+}
+
+.btn-mini .label,
+.btn-mini .badge {
+  top: 0;
+}
+
+@-webkit-keyframes progress-bar-stripes {
+  from {
+    background-position: 40px 0;
+  }
+  to {
+    background-position: 0 0;
+  }
+}
+
+@-moz-keyframes progress-bar-stripes {
+  from {
+    background-position: 40px 0;
+  }
+  to {
+    background-position: 0 0;
+  }
+}
+
+@-ms-keyframes progress-bar-stripes {
+  from {
+    background-position: 40px 0;
+  }
+  to {
+    background-position: 0 0;
+  }
+}
+
+@-o-keyframes progress-bar-stripes {
+  from {
+    background-position: 0 0;
+  }
+  to {
+    background-position: 40px 0;
+  }
+}
+
+@keyframes progress-bar-stripes {
+  from {
+    background-position: 40px 0;
+  }
+  to {
+    background-position: 0 0;
+  }
+}
+
+.progress {
+  height: 20px;
+  margin-bottom: 20px;
+  overflow: hidden;
+  background-color: #f7f7f7;
+  background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9));
+  background-image: -webkit-linear-gradient(top, #f5f5f5, #f9f9f9);
+  background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9);
+  background-image: linear-gradient(to bottom, #f5f5f5, #f9f9f9);
+  background-repeat: repeat-x;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#fff9f9f9', GradientType=0);
+  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
+     -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
+          box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
+}
+
+.progress .bar {
+  float: left;
+  width: 0;
+  height: 100%;
+  font-size: 12px;
+  color: #ffffff;
+  text-align: center;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #0e90d2;
+  background-image: -moz-linear-gradient(top, #149bdf, #0480be);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be));
+  background-image: -webkit-linear-gradient(top, #149bdf, #0480be);
+  background-image: -o-linear-gradient(top, #149bdf, #0480be);
+  background-image: linear-gradient(to bottom, #149bdf, #0480be);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff149bdf', endColorstr='#ff0480be', GradientType=0);
+  -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+     -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+          box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+          box-sizing: border-box;
+  -webkit-transition: width 0.6s ease;
+     -moz-transition: width 0.6s ease;
+       -o-transition: width 0.6s ease;
+          transition: width 0.6s ease;
+}
+
+.progress .bar + .bar {
+  -webkit-box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+     -moz-box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+          box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+}
+
+.progress-striped .bar {
+  background-color: #149bdf;
+  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
+  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  -webkit-background-size: 40px 40px;
+     -moz-background-size: 40px 40px;
+       -o-background-size: 40px 40px;
+          background-size: 40px 40px;
+}
+
+.progress.active .bar {
+  -webkit-animation: progress-bar-stripes 2s linear infinite;
+     -moz-animation: progress-bar-stripes 2s linear infinite;
+      -ms-animation: progress-bar-stripes 2s linear infinite;
+       -o-animation: progress-bar-stripes 2s linear infinite;
+          animation: progress-bar-stripes 2s linear infinite;
+}
+
+.progress-danger .bar,
+.progress .bar-danger {
+  background-color: #dd514c;
+  background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35));
+  background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: -o-linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: linear-gradient(to bottom, #ee5f5b, #c43c35);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffc43c35', GradientType=0);
+}
+
+.progress-danger.progress-striped .bar,
+.progress-striped .bar-danger {
+  background-color: #ee5f5b;
+  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
+  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+}
+
+.progress-success .bar,
+.progress .bar-success {
+  background-color: #5eb95e;
+  background-image: -moz-linear-gradient(top, #62c462, #57a957);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957));
+  background-image: -webkit-linear-gradient(top, #62c462, #57a957);
+  background-image: -o-linear-gradient(top, #62c462, #57a957);
+  background-image: linear-gradient(to bottom, #62c462, #57a957);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff57a957', GradientType=0);
+}
+
+.progress-success.progress-striped .bar,
+.progress-striped .bar-success {
+  background-color: #62c462;
+  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
+  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+}
+
+.progress-info .bar,
+.progress .bar-info {
+  background-color: #4bb1cf;
+  background-image: -moz-linear-gradient(top, #5bc0de, #339bb9);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9));
+  background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9);
+  background-image: -o-linear-gradient(top, #5bc0de, #339bb9);
+  background-image: linear-gradient(to bottom, #5bc0de, #339bb9);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff339bb9', GradientType=0);
+}
+
+.progress-info.progress-striped .bar,
+.progress-striped .bar-info {
+  background-color: #5bc0de;
+  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
+  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+}
+
+.progress-warning .bar,
+.progress .bar-warning {
+  background-color: #faa732;
+  background-image: -moz-linear-gradient(top, #fbb450, #f89406);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));
+  background-image: -webkit-linear-gradient(top, #fbb450, #f89406);
+  background-image: -o-linear-gradient(top, #fbb450, #f89406);
+  background-image: linear-gradient(to bottom, #fbb450, #f89406);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0);
+}
+
+.progress-warning.progress-striped .bar,
+.progress-striped .bar-warning {
+  background-color: #fbb450;
+  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
+  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+}
+
+.accordion {
+  margin-bottom: 20px;
+}
+
+.accordion-group {
+  margin-bottom: 2px;
+  border: 1px solid #e5e5e5;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+}
+
+.accordion-heading {
+  border-bottom: 0;
+}
+
+.accordion-heading .accordion-toggle {
+  display: block;
+  padding: 8px 15px;
+}
+
+.accordion-toggle {
+  cursor: pointer;
+}
+
+.accordion-inner {
+  padding: 9px 15px;
+  border-top: 1px solid #e5e5e5;
+}
+
+.carousel {
+  position: relative;
+  margin-bottom: 20px;
+  line-height: 1;
+}
+
+.carousel-inner {
+  position: relative;
+  width: 100%;
+  overflow: hidden;
+}
+
+.carousel-inner > .item {
+  position: relative;
+  display: none;
+  -webkit-transition: 0.6s ease-in-out left;
+     -moz-transition: 0.6s ease-in-out left;
+       -o-transition: 0.6s ease-in-out left;
+          transition: 0.6s ease-in-out left;
+}
+
+.carousel-inner > .item > img,
+.carousel-inner > .item > a > img {
+  display: block;
+  line-height: 1;
+}
+
+.carousel-inner > .active,
+.carousel-inner > .next,
+.carousel-inner > .prev {
+  display: block;
+}
+
+.carousel-inner > .active {
+  left: 0;
+}
+
+.carousel-inner > .next,
+.carousel-inner > .prev {
+  position: absolute;
+  top: 0;
+  width: 100%;
+}
+
+.carousel-inner > .next {
+  left: 100%;
+}
+
+.carousel-inner > .prev {
+  left: -100%;
+}
+
+.carousel-inner > .next.left,
+.carousel-inner > .prev.right {
+  left: 0;
+}
+
+.carousel-inner > .active.left {
+  left: -100%;
+}
+
+.carousel-inner > .active.right {
+  left: 100%;
+}
+
+.carousel-control {
+  position: absolute;
+  top: 40%;
+  left: 15px;
+  width: 40px;
+  height: 40px;
+  margin-top: -20px;
+  font-size: 60px;
+  font-weight: 100;
+  line-height: 30px;
+  color: #ffffff;
+  text-align: center;
+  background: #222222;
+  border: 3px solid #ffffff;
+  -webkit-border-radius: 23px;
+     -moz-border-radius: 23px;
+          border-radius: 23px;
+  opacity: 0.5;
+  filter: alpha(opacity=50);
+}
+
+.carousel-control.right {
+  right: 15px;
+  left: auto;
+}
+
+.carousel-control:hover,
+.carousel-control:focus {
+  color: #ffffff;
+  text-decoration: none;
+  opacity: 0.9;
+  filter: alpha(opacity=90);
+}
+
+.carousel-indicators {
+  position: absolute;
+  top: 15px;
+  right: 15px;
+  z-index: 5;
+  margin: 0;
+  list-style: none;
+}
+
+.carousel-indicators li {
+  display: block;
+  float: left;
+  width: 10px;
+  height: 10px;
+  margin-left: 5px;
+  text-indent: -999px;
+  background-color: #ccc;
+  background-color: rgba(255, 255, 255, 0.25);
+  border-radius: 5px;
+}
+
+.carousel-indicators .active {
+  background-color: #fff;
+}
+
+.carousel-caption {
+  position: absolute;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  padding: 15px;
+  background: #333333;
+  background: rgba(0, 0, 0, 0.75);
+}
+
+.carousel-caption h4,
+.carousel-caption p {
+  line-height: 20px;
+  color: #ffffff;
+}
+
+.carousel-caption h4 {
+  margin: 0 0 5px;
+}
+
+.carousel-caption p {
+  margin-bottom: 0;
+}
+
+.hero-unit {
+  padding: 60px;
+  margin-bottom: 30px;
+  font-size: 18px;
+  font-weight: 200;
+  line-height: 30px;
+  color: inherit;
+  background-color: #eeeeee;
+  -webkit-border-radius: 6px;
+     -moz-border-radius: 6px;
+          border-radius: 6px;
+}
+
+.hero-unit h1 {
+  margin-bottom: 0;
+  font-size: 60px;
+  line-height: 1;
+  letter-spacing: -1px;
+  color: inherit;
+}
+
+.hero-unit li {
+  line-height: 30px;
+}
+
+.pull-right {
+  float: right;
+}
+
+.pull-left {
+  float: left;
+}
+
+.hide {
+  display: none;
+}
+
+.show {
+  display: block;
+}
+
+.invisible {
+  visibility: hidden;
+}
+
+.affix {
+  position: fixed;
+}
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/css/bootstrap.min.css b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/css/bootstrap.min.css
new file mode 100644
index 0000000..df96c86
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/css/bootstrap.min.css
@@ -0,0 +1,9 @@
+/*!
+ * Bootstrap v2.3.2
+ *
+ * Copyright 2013 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world by @mdo and @fat.
+ */.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;line-height:0;content:""}.clearfix:after{clear:both}.hide-text{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.input-block-level{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block}audio,canvas,video{display:inline-block;*display:inline;*zoom:1}audio:not([controls]){display:none}html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}a:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}a:hover,a:active{outline:0}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{width:auto\9;height:auto;max-width:100%;vertical-align:middle;border:0;-ms-interpolation-mode:bicubic}#map_canvas img,.google-maps img{max-width:none}button,input,select,textarea{margin:0;font-size:100%;vertical-align:middle}button,input{*overflow:visible;line-height:normal}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}button,html input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button}label,select,button,input[type="button"],input[type="reset"],input[type="submit"],input[type="radio"],input[type="checkbox"]{cursor:pointer}input[type="search"]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type="search"]::-webkit-search-decoration,input[type="search"]::-webkit-search-cancel-button{-webkit-appearance:none}textarea{overflow:auto;vertical-align:top}@media print{*{color:#000!important;text-shadow:none!important;background:transparent!important;box-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}.ir a:after,a[href^="javascript:"]:after,a[href^="#"]:after{content:""}pre,blockquote{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}tr,img{page-break-inside:avoid}img{max-width:100%!important}@page{margin:.5cm}p,h2,h3{orphans:3;widows:3}h2,h3{page-break-after:avoid}}body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:20px;color:#333;background-color:#fff}a{color:#08c;text-decoration:none}a:hover,a:focus{color:#005580;text-decoration:underline}.img-rounded{-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.img-polaroid{padding:4px;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);-webkit-box-shadow:0 1px 3px rgba(0,0,0,0.1);-moz-box-shadow:0 1px 3px rgba(0,0,0,0.1);box-shadow:0 1px 3px rgba(0,0,0,0.1)}.img-circle{-webkit-border-radius:500px;-moz-border-radius:500px;border-radius:500px}.row{margin-left:-20px;*zoom:1}.row:before,.row:after{display:table;line-height:0;content:""}.row:after{clear:both}[class*="span"]{float:left;min-height:1px;margin-left:20px}.container,.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:940px}.span12{width:940px}.span11{width:860px}.span10{width:780px}.span9{width:700px}.span8{width:620px}.span7{width:540px}.span6{width:460px}.span5{width:380px}.span4{width:300px}.span3{width:220px}.span2{width:140px}.span1{width:60px}.offset12{margin-left:980px}.offset11{margin-left:900px}.offset10{margin-left:820px}.offset9{margin-left:740px}.offset8{margin-left:660px}.offset7{margin-left:580px}.offset6{margin-left:500px}.offset5{margin-left:420px}.offset4{margin-left:340px}.offset3{margin-left:260px}.offset2{margin-left:180px}.offset1{margin-left:100px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;line-height:0;content:""}.row-fluid:after{clear:both}.row-fluid [class*="span"]{display:block;float:left;width:100%;min-height:30px;margin-left:2.127659574468085%;*margin-left:2.074468085106383%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="span"]:first-child{margin-left:0}.row-fluid .controls-row [class*="span"]+[class*="span"]{margin-left:2.127659574468085%}.row-fluid .span12{width:100%;*width:99.94680851063829%}.row-fluid .span11{width:91.48936170212765%;*width:91.43617021276594%}.row-fluid .span10{width:82.97872340425532%;*width:82.92553191489361%}.row-fluid .span9{width:74.46808510638297%;*width:74.41489361702126%}.row-fluid .span8{width:65.95744680851064%;*width:65.90425531914893%}.row-fluid .span7{width:57.44680851063829%;*width:57.39361702127659%}.row-fluid .span6{width:48.93617021276595%;*width:48.88297872340425%}.row-fluid .span5{width:40.42553191489362%;*width:40.37234042553192%}.row-fluid .span4{width:31.914893617021278%;*width:31.861702127659576%}.row-fluid .span3{width:23.404255319148934%;*width:23.351063829787233%}.row-fluid .span2{width:14.893617021276595%;*width:14.840425531914894%}.row-fluid .span1{width:6.382978723404255%;*width:6.329787234042553%}.row-fluid .offset12{margin-left:104.25531914893617%;*margin-left:104.14893617021275%}.row-fluid .offset12:first-child{margin-left:102.12765957446808%;*margin-left:102.02127659574467%}.row-fluid .offset11{margin-left:95.74468085106382%;*margin-left:95.6382978723404%}.row-fluid .offset11:first-child{margin-left:93.61702127659574%;*margin-left:93.51063829787232%}.row-fluid .offset10{margin-left:87.23404255319149%;*margin-left:87.12765957446807%}.row-fluid .offset10:first-child{margin-left:85.1063829787234%;*margin-left:84.99999999999999%}.row-fluid .offset9{margin-left:78.72340425531914%;*margin-left:78.61702127659572%}.row-fluid .offset9:first-child{margin-left:76.59574468085106%;*margin-left:76.48936170212764%}.row-fluid .offset8{margin-left:70.2127659574468%;*margin-left:70.10638297872339%}.row-fluid .offset8:first-child{margin-left:68.08510638297872%;*margin-left:67.9787234042553%}.row-fluid .offset7{margin-left:61.70212765957446%;*margin-left:61.59574468085106%}.row-fluid .offset7:first-child{margin-left:59.574468085106375%;*margin-left:59.46808510638297%}.row-fluid .offset6{margin-left:53.191489361702125%;*margin-left:53.085106382978715%}.row-fluid .offset6:first-child{margin-left:51.063829787234035%;*margin-left:50.95744680851063%}.row-fluid .offset5{margin-left:44.68085106382979%;*margin-left:44.57446808510638%}.row-fluid .offset5:first-child{margin-left:42.5531914893617%;*margin-left:42.4468085106383%}.row-fluid .offset4{margin-left:36.170212765957444%;*margin-left:36.06382978723405%}.row-fluid .offset4:first-child{margin-left:34.04255319148936%;*margin-left:33.93617021276596%}.row-fluid .offset3{margin-left:27.659574468085104%;*margin-left:27.5531914893617%}.row-fluid .offset3:first-child{margin-left:25.53191489361702%;*margin-left:25.425531914893618%}.row-fluid .offset2{margin-left:19.148936170212764%;*margin-left:19.04255319148936%}.row-fluid .offset2:first-child{margin-left:17.02127659574468%;*margin-left:16.914893617021278%}.row-fluid .offset1{margin-left:10.638297872340425%;*margin-left:10.53191489361702%}.row-fluid .offset1:first-child{margin-left:8.51063829787234%;*margin-left:8.404255319148938%}[class*="span"].hide,.row-fluid [class*="span"].hide{display:none}[class*="span"].pull-right,.row-fluid [class*="span"].pull-right{float:right}.container{margin-right:auto;margin-left:auto;*zoom:1}.container:before,.container:after{display:table;line-height:0;content:""}.container:after{clear:both}.container-fluid{padding-right:20px;padding-left:20px;*zoom:1}.container-fluid:before,.container-fluid:after{display:table;line-height:0;content:""}.container-fluid:after{clear:both}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:21px;font-weight:200;line-height:30px}small{font-size:85%}strong{font-weight:bold}em{font-style:italic}cite{font-style:normal}.muted{color:#999}a.muted:hover,a.muted:focus{color:#808080}.text-warning{color:#c09853}a.text-warning:hover,a.text-warning:focus{color:#a47e3c}.text-error{color:#b94a48}a.text-error:hover,a.text-error:focus{color:#953b39}.text-info{color:#3a87ad}a.text-info:hover,a.text-info:focus{color:#2d6987}.text-success{color:#468847}a.text-success:hover,a.text-success:focus{color:#356635}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}h1,h2,h3,h4,h5,h6{margin:10px 0;font-family:inherit;font-weight:bold;line-height:20px;color:inherit;text-rendering:optimizelegibility}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{font-weight:normal;line-height:1;color:#999}h1,h2,h3{line-height:40px}h1{font-size:38.5px}h2{font-size:31.5px}h3{font-size:24.5px}h4{font-size:17.5px}h5{font-size:14px}h6{font-size:11.9px}h1 small{font-size:24.5px}h2 small{font-size:17.5px}h3 small{font-size:14px}h4 small{font-size:14px}.page-header{padding-bottom:9px;margin:20px 0 30px;border-bottom:1px solid #eee}ul,ol{padding:0;margin:0 0 10px 25px}ul ul,ul ol,ol ol,ol ul{margin-bottom:0}li{line-height:20px}ul.unstyled,ol.unstyled{margin-left:0;list-style:none}ul.inline,ol.inline{margin-left:0;list-style:none}ul.inline>li,ol.inline>li{display:inline-block;*display:inline;padding-right:5px;padding-left:5px;*zoom:1}dl{margin-bottom:20px}dt,dd{line-height:20px}dt{font-weight:bold}dd{margin-left:10px}.dl-horizontal{*zoom:1}.dl-horizontal:before,.dl-horizontal:after{display:table;line-height:0;content:""}.dl-horizontal:after{clear:both}.dl-horizontal dt{float:left;width:160px;overflow:hidden;clear:left;text-align:right;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}hr{margin:20px 0;border:0;border-top:1px solid #eee;border-bottom:1px solid #fff}abbr[title],abbr[data-original-title]{cursor:help;border-bottom:1px dotted #999}abbr.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:0 0 0 15px;margin:0 0 20px;border-left:5px solid #eee}blockquote p{margin-bottom:0;font-size:17.5px;font-weight:300;line-height:1.25}blockquote small{display:block;line-height:20px;color:#999}blockquote small:before{content:'\2014 \00A0'}blockquote.pull-right{float:right;padding-right:15px;padding-left:0;border-right:5px solid #eee;border-left:0}blockquote.pull-right p,blockquote.pull-right small{text-align:right}blockquote.pull-right small:before{content:''}blockquote.pull-right small:after{content:'\00A0 \2014'}q:before,q:after,blockquote:before,blockquote:after{content:""}address{display:block;margin-bottom:20px;font-style:normal;line-height:20px}code,pre{padding:0 3px 2px;font-family:Monaco,Menlo,Consolas,"Courier New",monospace;font-size:12px;color:#333;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}code{padding:2px 4px;color:#d14;white-space:nowrap;background-color:#f7f7f9;border:1px solid #e1e1e8}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:20px;word-break:break-all;word-wrap:break-word;white-space:pre;white-space:pre-wrap;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.15);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}pre.prettyprint{margin-bottom:20px}pre code{padding:0;color:inherit;white-space:pre;white-space:pre-wrap;background-color:transparent;border:0}.pre-scrollable{max-height:340px;overflow-y:scroll}form{margin:0 0 20px}fieldset{padding:0;margin:0;border:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:40px;color:#333;border:0;border-bottom:1px solid #e5e5e5}legend small{font-size:15px;color:#999}label,input,button,select,textarea{font-size:14px;font-weight:normal;line-height:20px}input,button,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif}label{display:block;margin-bottom:5px}select,textarea,input[type="text"],input[type="password"],input[type="datetime"],input[type="datetime-local"],input[type="date"],input[type="month"],input[type="time"],input[type="week"],input[type="number"],input[type="email"],input[type="url"],input[type="search"],input[type="tel"],input[type="color"],.uneditable-input{display:inline-block;height:20px;padding:4px 6px;margin-bottom:10px;font-size:14px;line-height:20px;color:#555;vertical-align:middle;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}input,textarea,.uneditable-input{width:206px}textarea{height:auto}textarea,input[type="text"],input[type="password"],input[type="datetime"],input[type="datetime-local"],input[type="date"],input[type="month"],input[type="time"],input[type="week"],input[type="number"],input[type="email"],input[type="url"],input[type="search"],input[type="tel"],input[type="color"],.uneditable-input{background-color:#fff;border:1px solid #ccc;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-webkit-transition:border linear .2s,box-shadow linear .2s;-moz-transition:border linear .2s,box-shadow linear .2s;-o-transition:border linear .2s,box-shadow linear .2s;transition:border linear .2s,box-shadow linear .2s}textarea:focus,input[type="text"]:focus,input[type="password"]:focus,input[type="datetime"]:focus,input[type="datetime-local"]:focus,input[type="date"]:focus,input[type="month"]:focus,input[type="time"]:focus,input[type="week"]:focus,input[type="number"]:focus,input[type="email"]:focus,input[type="url"]:focus,input[type="search"]:focus,input[type="tel"]:focus,input[type="color"]:focus,.uneditable-input:focus{border-color:rgba(82,168,236,0.8);outline:0;outline:thin dotted \9;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6)}input[type="radio"],input[type="checkbox"]{margin:4px 0 0;margin-top:1px \9;*margin-top:0;line-height:normal}input[type="file"],input[type="image"],input[type="submit"],input[type="reset"],input[type="button"],input[type="radio"],input[type="checkbox"]{width:auto}select,input[type="file"]{height:30px;*margin-top:4px;line-height:30px}select{width:220px;background-color:#fff;border:1px solid #ccc}select[multiple],select[size]{height:auto}select:focus,input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.uneditable-input,.uneditable-textarea{color:#999;cursor:not-allowed;background-color:#fcfcfc;border-color:#ccc;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.025);-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,0.025);box-shadow:inset 0 1px 2px rgba(0,0,0,0.025)}.uneditable-input{overflow:hidden;white-space:nowrap}.uneditable-textarea{width:auto;height:auto}input:-moz-placeholder,textarea:-moz-placeholder{color:#999}input:-ms-input-placeholder,textarea:-ms-input-placeholder{color:#999}input::-webkit-input-placeholder,textarea::-webkit-input-placeholder{color:#999}.radio,.checkbox{min-height:20px;padding-left:20px}.radio input[type="radio"],.checkbox input[type="checkbox"]{float:left;margin-left:-20px}.controls>.radio:first-child,.controls>.checkbox:first-child{padding-top:5px}.radio.inline,.checkbox.inline{display:inline-block;padding-top:5px;margin-bottom:0;vertical-align:middle}.radio.inline+.radio.inline,.checkbox.inline+.checkbox.inline{margin-left:10px}.input-mini{width:60px}.input-small{width:90px}.input-medium{width:150px}.input-large{width:210px}.input-xlarge{width:270px}.input-xxlarge{width:530px}input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input[class*="span"],.row-fluid input[class*="span"],.row-fluid select[class*="span"],.row-fluid textarea[class*="span"],.row-fluid .uneditable-input[class*="span"]{float:none;margin-left:0}.input-append input[class*="span"],.input-append .uneditable-input[class*="span"],.input-prepend input[class*="span"],.input-prepend .uneditable-input[class*="span"],.row-fluid input[class*="span"],.row-fluid select[class*="span"],.row-fluid textarea[class*="span"],.row-fluid .uneditable-input[class*="span"],.row-fluid .input-prepend [class*="span"],.row-fluid .input-append [class*="span"]{display:inline-block}input,textarea,.uneditable-input{margin-left:0}.controls-row [class*="span"]+[class*="span"]{margin-left:20px}input.span12,textarea.span12,.uneditable-input.span12{width:926px}input.span11,textarea.span11,.uneditable-input.span11{width:846px}input.span10,textarea.span10,.uneditable-input.span10{width:766px}input.span9,textarea.span9,.uneditable-input.span9{width:686px}input.span8,textarea.span8,.uneditable-input.span8{width:606px}input.span7,textarea.span7,.uneditable-input.span7{width:526px}input.span6,textarea.span6,.uneditable-input.span6{width:446px}input.span5,textarea.span5,.uneditable-input.span5{width:366px}input.span4,textarea.span4,.uneditable-input.span4{width:286px}input.span3,textarea.span3,.uneditable-input.span3{width:206px}input.span2,textarea.span2,.uneditable-input.span2{width:126px}input.span1,textarea.span1,.uneditable-input.span1{width:46px}.controls-row{*zoom:1}.controls-row:before,.controls-row:after{display:table;line-height:0;content:""}.controls-row:after{clear:both}.controls-row [class*="span"],.row-fluid .controls-row [class*="span"]{float:left}.controls-row .checkbox[class*="span"],.controls-row .radio[class*="span"]{padding-top:5px}input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{cursor:not-allowed;background-color:#eee}input[type="radio"][disabled],input[type="checkbox"][disabled],input[type="radio"][readonly],input[type="checkbox"][readonly]{background-color:transparent}.control-group.warning .control-label,.control-group.warning .help-block,.control-group.warning .help-inline{color:#c09853}.control-group.warning .checkbox,.control-group.warning .radio,.control-group.warning input,.control-group.warning select,.control-group.warning textarea{color:#c09853}.control-group.warning input,.control-group.warning select,.control-group.warning textarea{border-color:#c09853;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.control-group.warning input:focus,.control-group.warning select:focus,.control-group.warning textarea:focus{border-color:#a47e3c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #dbc59e;-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #dbc59e;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #dbc59e}.control-group.warning .input-prepend .add-on,.control-group.warning .input-append .add-on{color:#c09853;background-color:#fcf8e3;border-color:#c09853}.control-group.error .control-label,.control-group.error .help-block,.control-group.error .help-inline{color:#b94a48}.control-group.error .checkbox,.control-group.error .radio,.control-group.error input,.control-group.error select,.control-group.error textarea{color:#b94a48}.control-group.error input,.control-group.error select,.control-group.error textarea{border-color:#b94a48;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.control-group.error input:focus,.control-group.error select:focus,.control-group.error textarea:focus{border-color:#953b39;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #d59392;-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #d59392;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #d59392}.control-group.error .input-prepend .add-on,.control-group.error .input-append .add-on{color:#b94a48;background-color:#f2dede;border-color:#b94a48}.control-group.success .control-label,.control-group.success .help-block,.control-group.success .help-inline{color:#468847}.control-group.success .checkbox,.control-group.success .radio,.control-group.success input,.control-group.success select,.control-group.success textarea{color:#468847}.control-group.success input,.control-group.success select,.control-group.success textarea{border-color:#468847;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.control-group.success input:focus,.control-group.success select:focus,.control-group.success textarea:focus{border-color:#356635;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7aba7b;-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7aba7b;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7aba7b}.control-group.success .input-prepend .add-on,.control-group.success .input-append .add-on{color:#468847;background-color:#dff0d8;border-color:#468847}.control-group.info .control-label,.control-group.info .help-block,.control-group.info .help-inline{color:#3a87ad}.control-group.info .checkbox,.control-group.info .radio,.control-group.info input,.control-group.info select,.control-group.info textarea{color:#3a87ad}.control-group.info input,.control-group.info select,.control-group.info textarea{border-color:#3a87ad;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.control-group.info input:focus,.control-group.info select:focus,.control-group.info textarea:focus{border-color:#2d6987;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7ab5d3;-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7ab5d3;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7ab5d3}.control-group.info .input-prepend .add-on,.control-group.info .input-append .add-on{color:#3a87ad;background-color:#d9edf7;border-color:#3a87ad}input:focus:invalid,textarea:focus:invalid,select:focus:invalid{color:#b94a48;border-color:#ee5f5b}input:focus:invalid:focus,textarea:focus:invalid:focus,select:focus:invalid:focus{border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7}.form-actions{padding:19px 20px 20px;margin-top:20px;margin-bottom:20px;background-color:#f5f5f5;border-top:1px solid #e5e5e5;*zoom:1}.form-actions:before,.form-actions:after{display:table;line-height:0;content:""}.form-actions:after{clear:both}.help-block,.help-inline{color:#595959}.help-block{display:block;margin-bottom:10px}.help-inline{display:inline-block;*display:inline;padding-left:5px;vertical-align:middle;*zoom:1}.input-append,.input-prepend{display:inline-block;margin-bottom:10px;font-size:0;white-space:nowrap;vertical-align:middle}.input-append input,.input-prepend input,.input-append select,.input-prepend select,.input-append .uneditable-input,.input-prepend .uneditable-input,.input-append .dropdown-menu,.input-prepend .dropdown-menu,.input-append .popover,.input-prepend .popover{font-size:14px}.input-append input,.input-prepend input,.input-append select,.input-prepend select,.input-append .uneditable-input,.input-prepend .uneditable-input{position:relative;margin-bottom:0;*margin-left:0;vertical-align:top;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.input-append input:focus,.input-prepend input:focus,.input-append select:focus,.input-prepend select:focus,.input-append .uneditable-input:focus,.input-prepend .uneditable-input:focus{z-index:2}.input-append .add-on,.input-prepend .add-on{display:inline-block;width:auto;height:20px;min-width:16px;padding:4px 5px;font-size:14px;font-weight:normal;line-height:20px;text-align:center;text-shadow:0 1px 0 #fff;background-color:#eee;border:1px solid #ccc}.input-append .add-on,.input-prepend .add-on,.input-append .btn,.input-prepend .btn,.input-append .btn-group>.dropdown-toggle,.input-prepend .btn-group>.dropdown-toggle{vertical-align:top;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.input-append .active,.input-prepend .active{background-color:#a9dba9;border-color:#46a546}.input-prepend .add-on,.input-prepend .btn{margin-right:-1px}.input-prepend .add-on:first-child,.input-prepend .btn:first-child{-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}.input-append input,.input-append select,.input-append .uneditable-input{-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}.input-append input+.btn-group .btn:last-child,.input-append select+.btn-group .btn:last-child,.input-append .uneditable-input+.btn-group .btn:last-child{-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.input-append .add-on,.input-append .btn,.input-append .btn-group{margin-left:-1px}.input-append .add-on:last-child,.input-append .btn:last-child,.input-append .btn-group:last-child>.dropdown-toggle{-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.input-prepend.input-append input,.input-prepend.input-append select,.input-prepend.input-append .uneditable-input{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.input-prepend.input-append input+.btn-group .btn,.input-prepend.input-append select+.btn-group .btn,.input-prepend.input-append .uneditable-input+.btn-group .btn{-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.input-prepend.input-append .add-on:first-child,.input-prepend.input-append .btn:first-child{margin-right:-1px;-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}.input-prepend.input-append .add-on:last-child,.input-prepend.input-append .btn:last-child{margin-left:-1px;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.input-prepend.input-append .btn-group:first-child{margin-left:0}input.search-query{padding-right:14px;padding-right:4px \9;padding-left:14px;padding-left:4px \9;margin-bottom:0;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px}.form-search .input-append .search-query,.form-search .input-prepend .search-query{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.form-search .input-append .search-query{-webkit-border-radius:14px 0 0 14px;-moz-border-radius:14px 0 0 14px;border-radius:14px 0 0 14px}.form-search .input-append .btn{-webkit-border-radius:0 14px 14px 0;-moz-border-radius:0 14px 14px 0;border-radius:0 14px 14px 0}.form-search .input-prepend .search-query{-webkit-border-radius:0 14px 14px 0;-moz-border-radius:0 14px 14px 0;border-radius:0 14px 14px 0}.form-search .input-prepend .btn{-webkit-border-radius:14px 0 0 14px;-moz-border-radius:14px 0 0 14px;border-radius:14px 0 0 14px}.form-search input,.form-inline input,.form-horizontal input,.form-search textarea,.form-inline textarea,.form-horizontal textarea,.form-search select,.form-inline select,.form-horizontal select,.form-search .help-inline,.form-inline .help-inline,.form-horizontal .help-inline,.form-search .uneditable-input,.form-inline .uneditable-input,.form-horizontal .uneditable-input,.form-search .input-prepend,.form-inline .input-prepend,.form-horizontal .input-prepend,.form-search .input-append,.form-inline .input-append,.form-horizontal .input-append{display:inline-block;*display:inline;margin-bottom:0;vertical-align:middle;*zoom:1}.form-search .hide,.form-inline .hide,.form-horizontal .hide{display:none}.form-search label,.form-inline label,.form-search .btn-group,.form-inline .btn-group{display:inline-block}.form-search .input-append,.form-inline .input-append,.form-search .input-prepend,.form-inline .input-prepend{margin-bottom:0}.form-search .radio,.form-search .checkbox,.form-inline .radio,.form-inline .checkbox{padding-left:0;margin-bottom:0;vertical-align:middle}.form-search .radio input[type="radio"],.form-search .checkbox input[type="checkbox"],.form-inline .radio input[type="radio"],.form-inline .checkbox input[type="checkbox"]{float:left;margin-right:3px;margin-left:0}.control-group{margin-bottom:10px}legend+.control-group{margin-top:20px;-webkit-margin-top-collapse:separate}.form-horizontal .control-group{margin-bottom:20px;*zoom:1}.form-horizontal .control-group:before,.form-horizontal .control-group:after{display:table;line-height:0;content:""}.form-horizontal .control-group:after{clear:both}.form-horizontal .control-label{float:left;width:160px;padding-top:5px;text-align:right}.form-horizontal .controls{*display:inline-block;*padding-left:20px;margin-left:180px;*margin-left:0}.form-horizontal .controls:first-child{*padding-left:180px}.form-horizontal .help-block{margin-bottom:0}.form-horizontal input+.help-block,.form-horizontal select+.help-block,.form-horizontal textarea+.help-block,.form-horizontal .uneditable-input+.help-block,.form-horizontal .input-prepend+.help-block,.form-horizontal .input-append+.help-block{margin-top:10px}.form-horizontal .form-actions{padding-left:180px}table{max-width:100%;background-color:transparent;border-collapse:collapse;border-spacing:0}.table{width:100%;margin-bottom:20px}.table th,.table td{padding:8px;line-height:20px;text-align:left;vertical-align:top;border-top:1px solid #ddd}.table th{font-weight:bold}.table thead th{vertical-align:bottom}.table caption+thead tr:first-child th,.table caption+thead tr:first-child td,.table colgroup+thead tr:first-child th,.table colgroup+thead tr:first-child td,.table thead:first-child tr:first-child th,.table thead:first-child tr:first-child td{border-top:0}.table tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.table-condensed th,.table-condensed td{padding:4px 5px}.table-bordered{border:1px solid #ddd;border-collapse:separate;*border-collapse:collapse;border-left:0;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.table-bordered th,.table-bordered td{border-left:1px solid #ddd}.table-bordered caption+thead tr:first-child th,.table-bordered caption+tbody tr:first-child th,.table-bordered caption+tbody tr:first-child td,.table-bordered colgroup+thead tr:first-child th,.table-bordered colgroup+tbody tr:first-child th,.table-bordered colgroup+tbody tr:first-child td,.table-bordered thead:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child td{border-top:0}.table-bordered thead:first-child tr:first-child>th:first-child,.table-bordered tbody:first-child tr:first-child>td:first-child,.table-bordered tbody:first-child tr:first-child>th:first-child{-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-topleft:4px}.table-bordered thead:first-child tr:first-child>th:last-child,.table-bordered tbody:first-child tr:first-child>td:last-child,.table-bordered tbody:first-child tr:first-child>th:last-child{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-moz-border-radius-topright:4px}.table-bordered thead:last-child tr:last-child>th:first-child,.table-bordered tbody:last-child tr:last-child>td:first-child,.table-bordered tbody:last-child tr:last-child>th:first-child,.table-bordered tfoot:last-child tr:last-child>td:first-child,.table-bordered tfoot:last-child tr:last-child>th:first-child{-webkit-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-moz-border-radius-bottomleft:4px}.table-bordered thead:last-child tr:last-child>th:last-child,.table-bordered tbody:last-child tr:last-child>td:last-child,.table-bordered tbody:last-child tr:last-child>th:last-child,.table-bordered tfoot:last-child tr:last-child>td:last-child,.table-bordered tfoot:last-child tr:last-child>th:last-child{-webkit-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-moz-border-radius-bottomright:4px}.table-bordered tfoot+tbody:last-child tr:last-child td:first-child{-webkit-border-bottom-left-radius:0;border-bottom-left-radius:0;-moz-border-radius-bottomleft:0}.table-bordered tfoot+tbody:last-child tr:last-child td:last-child{-webkit-border-bottom-right-radius:0;border-bottom-right-radius:0;-moz-border-radius-bottomright:0}.table-bordered caption+thead tr:first-child th:first-child,.table-bordered caption+tbody tr:first-child td:first-child,.table-bordered colgroup+thead tr:first-child th:first-child,.table-bordered colgroup+tbody tr:first-child td:first-child{-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-topleft:4px}.table-bordered caption+thead tr:first-child th:last-child,.table-bordered caption+tbody tr:first-child td:last-child,.table-bordered colgroup+thead tr:first-child th:last-child,.table-bordered colgroup+tbody tr:first-child td:last-child{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-moz-border-radius-topright:4px}.table-striped tbody>tr:nth-child(odd)>td,.table-striped tbody>tr:nth-child(odd)>th{background-color:#f9f9f9}.table-hover tbody tr:hover>td,.table-hover tbody tr:hover>th{background-color:#f5f5f5}table td[class*="span"],table th[class*="span"],.row-fluid table td[class*="span"],.row-fluid table th[class*="span"]{display:table-cell;float:none;margin-left:0}.table td.span1,.table th.span1{float:none;width:44px;margin-left:0}.table td.span2,.table th.span2{float:none;width:124px;margin-left:0}.table td.span3,.table th.span3{float:none;width:204px;margin-left:0}.table td.span4,.table th.span4{float:none;width:284px;margin-left:0}.table td.span5,.table th.span5{float:none;width:364px;margin-left:0}.table td.span6,.table th.span6{float:none;width:444px;margin-left:0}.table td.span7,.table th.span7{float:none;width:524px;margin-left:0}.table td.span8,.table th.span8{float:none;width:604px;margin-left:0}.table td.span9,.table th.span9{float:none;width:684px;margin-left:0}.table td.span10,.table th.span10{float:none;width:764px;margin-left:0}.table td.span11,.table th.span11{float:none;width:844px;margin-left:0}.table td.span12,.table th.span12{float:none;width:924px;margin-left:0}.table tbody tr.success>td{background-color:#dff0d8}.table tbody tr.error>td{background-color:#f2dede}.table tbody tr.warning>td{background-color:#fcf8e3}.table tbody tr.info>td{background-color:#d9edf7}.table-hover tbody tr.success:hover>td{background-color:#d0e9c6}.table-hover tbody tr.error:hover>td{background-color:#ebcccc}.table-hover tbody tr.warning:hover>td{background-color:#faf2cc}.table-hover tbody tr.info:hover>td{background-color:#c4e3f3}[class^="icon-"],[class*=" icon-"]{display:inline-block;width:14px;height:14px;margin-top:1px;*margin-right:.3em;line-height:14px;vertical-align:text-top;background-image:url("../img/glyphicons-halflings.png");background-position:14px 14px;background-repeat:no-repeat}.icon-white,.nav-pills>.active>a>[class^="icon-"],.nav-pills>.active>a>[class*=" icon-"],.nav-list>.active>a>[class^="icon-"],.nav-list>.active>a>[class*=" icon-"],.navbar-inverse .nav>.active>a>[class^="icon-"],.navbar-inverse .nav>.active>a>[class*=" icon-"],.dropdown-menu>li>a:hover>[class^="icon-"],.dropdown-menu>li>a:focus>[class^="icon-"],.dropdown-menu>li>a:hover>[class*=" icon-"],.dropdown-menu>li>a:focus>[class*=" icon-"],.dropdown-menu>.active>a>[class^="icon-"],.dropdown-menu>.active>a>[class*=" icon-"],.dropdown-submenu:hover>a>[class^="icon-"],.dropdown-submenu:focus>a>[class^="icon-"],.dropdown-submenu:hover>a>[class*=" icon-"],.dropdown-submenu:focus>a>[class*=" icon-"]{background-image:url("../img/glyphicons-halflings-white.png")}.icon-glass{background-position:0 0}.icon-music{background-position:-24px 0}.icon-search{background-position:-48px 0}.icon-envelope{background-position:-72px 0}.icon-heart{background-position:-96px 0}.icon-star{background-position:-120px 0}.icon-star-empty{background-position:-144px 0}.icon-user{background-position:-168px 0}.icon-film{background-position:-192px 0}.icon-th-large{background-position:-216px 0}.icon-th{background-position:-240px 0}.icon-th-list{background-position:-264px 0}.icon-ok{background-position:-288px 0}.icon-remove{background-position:-312px 0}.icon-zoom-in{background-position:-336px 0}.icon-zoom-out{background-position:-360px 0}.icon-off{background-position:-384px 0}.icon-signal{background-position:-408px 0}.icon-cog{background-position:-432px 0}.icon-trash{background-position:-456px 0}.icon-home{background-position:0 -24px}.icon-file{background-position:-24px -24px}.icon-time{background-position:-48px -24px}.icon-road{background-position:-72px -24px}.icon-download-alt{background-position:-96px -24px}.icon-download{background-position:-120px -24px}.icon-upload{background-position:-144px -24px}.icon-inbox{background-position:-168px -24px}.icon-play-circle{background-position:-192px -24px}.icon-repeat{background-position:-216px -24px}.icon-refresh{background-position:-240px -24px}.icon-list-alt{background-position:-264px -24px}.icon-lock{background-position:-287px -24px}.icon-flag{background-position:-312px -24px}.icon-headphones{background-position:-336px -24px}.icon-volume-off{background-position:-360px -24px}.icon-volume-down{background-position:-384px -24px}.icon-volume-up{background-position:-408px -24px}.icon-qrcode{background-position:-432px -24px}.icon-barcode{background-position:-456px -24px}.icon-tag{background-position:0 -48px}.icon-tags{background-position:-25px -48px}.icon-book{background-position:-48px -48px}.icon-bookmark{background-position:-72px -48px}.icon-print{background-position:-96px -48px}.icon-camera{background-position:-120px -48px}.icon-font{background-position:-144px -48px}.icon-bold{background-position:-167px -48px}.icon-italic{background-position:-192px -48px}.icon-text-height{background-position:-216px -48px}.icon-text-width{background-position:-240px -48px}.icon-align-left{background-position:-264px -48px}.icon-align-center{background-position:-288px -48px}.icon-align-right{background-position:-312px -48px}.icon-align-justify{background-position:-336px -48px}.icon-list{background-position:-360px -48px}.icon-indent-left{background-position:-384px -48px}.icon-indent-right{background-position:-408px -48px}.icon-facetime-video{background-position:-432px -48px}.icon-picture{background-position:-456px -48px}.icon-pencil{background-position:0 -72px}.icon-map-marker{background-position:-24px -72px}.icon-adjust{background-position:-48px -72px}.icon-tint{background-position:-72px -72px}.icon-edit{background-position:-96px -72px}.icon-share{background-position:-120px -72px}.icon-check{background-position:-144px -72px}.icon-move{background-position:-168px -72px}.icon-step-backward{background-position:-192px -72px}.icon-fast-backward{background-position:-216px -72px}.icon-backward{background-position:-240px -72px}.icon-play{background-position:-264px -72px}.icon-pause{background-position:-288px -72px}.icon-stop{background-position:-312px -72px}.icon-forward{background-position:-336px -72px}.icon-fast-forward{background-position:-360px -72px}.icon-step-forward{background-position:-384px -72px}.icon-eject{background-position:-408px -72px}.icon-chevron-left{background-position:-432px -72px}.icon-chevron-right{background-position:-456px -72px}.icon-plus-sign{background-position:0 -96px}.icon-minus-sign{background-position:-24px -96px}.icon-remove-sign{background-position:-48px -96px}.icon-ok-sign{background-position:-72px -96px}.icon-question-sign{background-position:-96px -96px}.icon-info-sign{background-position:-120px -96px}.icon-screenshot{background-position:-144px -96px}.icon-remove-circle{background-position:-168px -96px}.icon-ok-circle{background-position:-192px -96px}.icon-ban-circle{background-position:-216px -96px}.icon-arrow-left{background-position:-240px -96px}.icon-arrow-right{background-position:-264px -96px}.icon-arrow-up{background-position:-289px -96px}.icon-arrow-down{background-position:-312px -96px}.icon-share-alt{background-position:-336px -96px}.icon-resize-full{background-position:-360px -96px}.icon-resize-small{background-position:-384px -96px}.icon-plus{background-position:-408px -96px}.icon-minus{background-position:-433px -96px}.icon-asterisk{background-position:-456px -96px}.icon-exclamation-sign{background-position:0 -120px}.icon-gift{background-position:-24px -120px}.icon-leaf{background-position:-48px -120px}.icon-fire{background-position:-72px -120px}.icon-eye-open{background-position:-96px -120px}.icon-eye-close{background-position:-120px -120px}.icon-warning-sign{background-position:-144px -120px}.icon-plane{background-position:-168px -120px}.icon-calendar{background-position:-192px -120px}.icon-random{width:16px;background-position:-216px -120px}.icon-comment{background-position:-240px -120px}.icon-magnet{background-position:-264px -120px}.icon-chevron-up{background-position:-288px -120px}.icon-chevron-down{background-position:-313px -119px}.icon-retweet{background-position:-336px -120px}.icon-shopping-cart{background-position:-360px -120px}.icon-folder-close{width:16px;background-position:-384px -120px}.icon-folder-open{width:16px;background-position:-408px -120px}.icon-resize-vertical{background-position:-432px -119px}.icon-resize-horizontal{background-position:-456px -118px}.icon-hdd{background-position:0 -144px}.icon-bullhorn{background-position:-24px -144px}.icon-bell{background-position:-48px -144px}.icon-certificate{background-position:-72px -144px}.icon-thumbs-up{background-position:-96px -144px}.icon-thumbs-down{background-position:-120px -144px}.icon-hand-right{background-position:-144px -144px}.icon-hand-left{background-position:-168px -144px}.icon-hand-up{background-position:-192px -144px}.icon-hand-down{background-position:-216px -144px}.icon-circle-arrow-right{background-position:-240px -144px}.icon-circle-arrow-left{background-position:-264px -144px}.icon-circle-arrow-up{background-position:-288px -144px}.icon-circle-arrow-down{background-position:-312px -144px}.icon-globe{background-position:-336px -144px}.icon-wrench{background-position:-360px -144px}.icon-tasks{background-position:-384px -144px}.icon-filter{background-position:-408px -144px}.icon-briefcase{background-position:-432px -144px}.icon-fullscreen{background-position:-456px -144px}.dropup,.dropdown{position:relative}.dropdown-toggle{*margin-bottom:-3px}.dropdown-toggle:active,.open .dropdown-toggle{outline:0}.caret{display:inline-block;width:0;height:0;vertical-align:top;border-top:4px solid #000;border-right:4px solid transparent;border-left:4px solid transparent;content:""}.dropdown .caret{margin-top:8px;margin-left:2px}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;list-style:none;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);*border-right-width:2px;*border-bottom-width:2px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);-moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{*width:100%;height:1px;margin:9px 1px;*margin:-5px 0 5px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #fff}.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:normal;line-height:20px;color:#333;white-space:nowrap}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus,.dropdown-submenu:hover>a,.dropdown-submenu:focus>a{color:#fff;text-decoration:none;background-color:#0081c2;background-image:-moz-linear-gradient(top,#08c,#0077b3);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#0077b3));background-image:-webkit-linear-gradient(top,#08c,#0077b3);background-image:-o-linear-gradient(top,#08c,#0077b3);background-image:linear-gradient(to bottom,#08c,#0077b3);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0077b3',GradientType=0)}.dropdown-menu>.active>a,.dropdown-menu>.active>a:hover,.dropdown-menu>.active>a:focus{color:#fff;text-decoration:none;background-color:#0081c2;background-image:-moz-linear-gradient(top,#08c,#0077b3);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#0077b3));background-image:-webkit-linear-gradient(top,#08c,#0077b3);background-image:-o-linear-gradient(top,#08c,#0077b3);background-image:linear-gradient(to bottom,#08c,#0077b3);background-repeat:repeat-x;outline:0;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0077b3',GradientType=0)}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{color:#999}.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{text-decoration:none;cursor:default;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.open{*z-index:1000}.open>.dropdown-menu{display:block}.dropdown-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:990}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{border-top:0;border-bottom:4px solid #000;content:""}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:1px}.dropdown-submenu{position:relative}.dropdown-submenu>.dropdown-menu{top:0;left:100%;margin-top:-6px;margin-left:-1px;-webkit-border-radius:0 6px 6px 6px;-moz-border-radius:0 6px 6px 6px;border-radius:0 6px 6px 6px}.dropdown-submenu:hover>.dropdown-menu{display:block}.dropup .dropdown-submenu>.dropdown-menu{top:auto;bottom:0;margin-top:0;margin-bottom:-2px;-webkit-border-radius:5px 5px 5px 0;-moz-border-radius:5px 5px 5px 0;border-radius:5px 5px 5px 0}.dropdown-submenu>a:after{display:block;float:right;width:0;height:0;margin-top:5px;margin-right:-10px;border-color:transparent;border-left-color:#ccc;border-style:solid;border-width:5px 0 5px 5px;content:" "}.dropdown-submenu:hover>a:after{border-left-color:#fff}.dropdown-submenu.pull-left{float:none}.dropdown-submenu.pull-left>.dropdown-menu{left:-100%;margin-left:10px;-webkit-border-radius:6px 0 6px 6px;-moz-border-radius:6px 0 6px 6px;border-radius:6px 0 6px 6px}.dropdown .dropdown-menu .nav-header{padding-right:20px;padding-left:20px}.typeahead{z-index:1051;margin-top:2px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);box-shadow:inset 0 1px 1px rgba(0,0,0,0.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,0.15)}.well-large{padding:24px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.well-small{padding:9px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.fade{opacity:0;-webkit-transition:opacity .15s linear;-moz-transition:opacity .15s linear;-o-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{position:relative;height:0;overflow:hidden;-webkit-transition:height .35s ease;-moz-transition:height .35s ease;-o-transition:height .35s ease;transition:height .35s ease}.collapse.in{height:auto}.close{float:right;font-size:20px;font-weight:bold;line-height:20px;color:#000;text-shadow:0 1px 0 #fff;opacity:.2;filter:alpha(opacity=20)}.close:hover,.close:focus{color:#000;text-decoration:none;cursor:pointer;opacity:.4;filter:alpha(opacity=40)}button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-appearance:none}.btn{display:inline-block;*display:inline;padding:4px 12px;margin-bottom:0;*margin-left:.3em;font-size:14px;line-height:20px;color:#333;text-align:center;text-shadow:0 1px 1px rgba(255,255,255,0.75);vertical-align:middle;cursor:pointer;background-color:#f5f5f5;*background-color:#e6e6e6;background-image:-moz-linear-gradient(top,#fff,#e6e6e6);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#e6e6e6));background-image:-webkit-linear-gradient(top,#fff,#e6e6e6);background-image:-o-linear-gradient(top,#fff,#e6e6e6);background-image:linear-gradient(to bottom,#fff,#e6e6e6);background-repeat:repeat-x;border:1px solid #ccc;*border:0;border-color:#e6e6e6 #e6e6e6 #bfbfbf;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);border-bottom-color:#b3b3b3;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffe6e6e6',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);*zoom:1;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05)}.btn:hover,.btn:focus,.btn:active,.btn.active,.btn.disabled,.btn[disabled]{color:#333;background-color:#e6e6e6;*background-color:#d9d9d9}.btn:active,.btn.active{background-color:#ccc \9}.btn:first-child{*margin-left:0}.btn:hover,.btn:focus{color:#333;text-decoration:none;background-position:0 -15px;-webkit-transition:background-position .1s linear;-moz-transition:background-position .1s linear;-o-transition:background-position .1s linear;transition:background-position .1s linear}.btn:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn.active,.btn:active{background-image:none;outline:0;-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05)}.btn.disabled,.btn[disabled]{cursor:default;background-image:none;opacity:.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.btn-large{padding:11px 19px;font-size:17.5px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.btn-large [class^="icon-"],.btn-large [class*=" icon-"]{margin-top:4px}.btn-small{padding:2px 10px;font-size:11.9px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.btn-small [class^="icon-"],.btn-small [class*=" icon-"]{margin-top:0}.btn-mini [class^="icon-"],.btn-mini [class*=" icon-"]{margin-top:-1px}.btn-mini{padding:0 6px;font-size:10.5px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.btn-block{display:block;width:100%;padding-right:0;padding-left:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.btn-block+.btn-block{margin-top:5px}input[type="submit"].btn-block,input[type="reset"].btn-block,input[type="button"].btn-block{width:100%}.btn-primary.active,.btn-warning.active,.btn-danger.active,.btn-success.active,.btn-info.active,.btn-inverse.active{color:rgba(255,255,255,0.75)}.btn-primary{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#006dcc;*background-color:#04c;background-image:-moz-linear-gradient(top,#08c,#04c);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#04c));background-image:-webkit-linear-gradient(top,#08c,#04c);background-image:-o-linear-gradient(top,#08c,#04c);background-image:linear-gradient(to bottom,#08c,#04c);background-repeat:repeat-x;border-color:#04c #04c #002a80;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0044cc',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-primary:hover,.btn-primary:focus,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{color:#fff;background-color:#04c;*background-color:#003bb3}.btn-primary:active,.btn-primary.active{background-color:#039 \9}.btn-warning{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#faa732;*background-color:#f89406;background-image:-moz-linear-gradient(top,#fbb450,#f89406);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fbb450),to(#f89406));background-image:-webkit-linear-gradient(top,#fbb450,#f89406);background-image:-o-linear-gradient(top,#fbb450,#f89406);background-image:linear-gradient(to bottom,#fbb450,#f89406);background-repeat:repeat-x;border-color:#f89406 #f89406 #ad6704;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450',endColorstr='#fff89406',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-warning:hover,.btn-warning:focus,.btn-warning:active,.btn-warning.active,.btn-warning.disabled,.btn-warning[disabled]{color:#fff;background-color:#f89406;*background-color:#df8505}.btn-warning:active,.btn-warning.active{background-color:#c67605 \9}.btn-danger{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#da4f49;*background-color:#bd362f;background-image:-moz-linear-gradient(top,#ee5f5b,#bd362f);background-image:-webkit-gradient(linear,0 0,0 100%,from(#ee5f5b),to(#bd362f));background-image:-webkit-linear-gradient(top,#ee5f5b,#bd362f);background-image:-o-linear-gradient(top,#ee5f5b,#bd362f);background-image:linear-gradient(to bottom,#ee5f5b,#bd362f);background-repeat:repeat-x;border-color:#bd362f #bd362f #802420;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b',endColorstr='#ffbd362f',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-danger:hover,.btn-danger:focus,.btn-danger:active,.btn-danger.active,.btn-danger.disabled,.btn-danger[disabled]{color:#fff;background-color:#bd362f;*background-color:#a9302a}.btn-danger:active,.btn-danger.active{background-color:#942a25 \9}.btn-success{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#5bb75b;*background-color:#51a351;background-image:-moz-linear-gradient(top,#62c462,#51a351);background-image:-webkit-gradient(linear,0 0,0 100%,from(#62c462),to(#51a351));background-image:-webkit-linear-gradient(top,#62c462,#51a351);background-image:-o-linear-gradient(top,#62c462,#51a351);background-image:linear-gradient(to bottom,#62c462,#51a351);background-repeat:repeat-x;border-color:#51a351 #51a351 #387038;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462',endColorstr='#ff51a351',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-success:hover,.btn-success:focus,.btn-success:active,.btn-success.active,.btn-success.disabled,.btn-success[disabled]{color:#fff;background-color:#51a351;*background-color:#499249}.btn-success:active,.btn-success.active{background-color:#408140 \9}.btn-info{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#49afcd;*background-color:#2f96b4;background-image:-moz-linear-gradient(top,#5bc0de,#2f96b4);background-image:-webkit-gradient(linear,0 0,0 100%,from(#5bc0de),to(#2f96b4));background-image:-webkit-linear-gradient(top,#5bc0de,#2f96b4);background-image:-o-linear-gradient(top,#5bc0de,#2f96b4);background-image:linear-gradient(to bottom,#5bc0de,#2f96b4);background-repeat:repeat-x;border-color:#2f96b4 #2f96b4 #1f6377;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de',endColorstr='#ff2f96b4',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-info:hover,.btn-info:focus,.btn-info:active,.btn-info.active,.btn-info.disabled,.btn-info[disabled]{color:#fff;background-color:#2f96b4;*background-color:#2a85a0}.btn-info:active,.btn-info.active{background-color:#24748c \9}.btn-inverse{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#363636;*background-color:#222;background-image:-moz-linear-gradient(top,#444,#222);background-image:-webkit-gradient(linear,0 0,0 100%,from(#444),to(#222));background-image:-webkit-linear-gradient(top,#444,#222);background-image:-o-linear-gradient(top,#444,#222);background-image:linear-gradient(to bottom,#444,#222);background-repeat:repeat-x;border-color:#222 #222 #000;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff444444',endColorstr='#ff222222',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-inverse:hover,.btn-inverse:focus,.btn-inverse:active,.btn-inverse.active,.btn-inverse.disabled,.btn-inverse[disabled]{color:#fff;background-color:#222;*background-color:#151515}.btn-inverse:active,.btn-inverse.active{background-color:#080808 \9}button.btn,input[type="submit"].btn{*padding-top:3px;*padding-bottom:3px}button.btn::-moz-focus-inner,input[type="submit"].btn::-moz-focus-inner{padding:0;border:0}button.btn.btn-large,input[type="submit"].btn.btn-large{*padding-top:7px;*padding-bottom:7px}button.btn.btn-small,input[type="submit"].btn.btn-small{*padding-top:3px;*padding-bottom:3px}button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding-bottom:1px}.btn-link,.btn-link:active,.btn-link[disabled]{background-color:transparent;background-image:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.btn-link{color:#08c;cursor:pointer;border-color:transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.btn-link:hover,.btn-link:focus{color:#005580;text-decoration:underline;background-color:transparent}.btn-link[disabled]:hover,.btn-link[disabled]:focus{color:#333;text-decoration:none}.btn-group{position:relative;display:inline-block;*display:inline;*margin-left:.3em;font-size:0;white-space:nowrap;vertical-align:middle;*zoom:1}.btn-group:first-child{*margin-left:0}.btn-group+.btn-group{margin-left:5px}.btn-toolbar{margin-top:10px;margin-bottom:10px;font-size:0}.btn-toolbar>.btn+.btn,.btn-toolbar>.btn-group+.btn,.btn-toolbar>.btn+.btn-group{margin-left:5px}.btn-group>.btn{position:relative;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.btn-group>.btn+.btn{margin-left:-1px}.btn-group>.btn,.btn-group>.dropdown-menu,.btn-group>.popover{font-size:14px}.btn-group>.btn-mini{font-size:10.5px}.btn-group>.btn-small{font-size:11.9px}.btn-group>.btn-large{font-size:17.5px}.btn-group>.btn:first-child{margin-left:0;-webkit-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-bottomleft:4px;-moz-border-radius-topleft:4px}.btn-group>.btn:last-child,.btn-group>.dropdown-toggle{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-webkit-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-moz-border-radius-topright:4px;-moz-border-radius-bottomright:4px}.btn-group>.btn.large:first-child{margin-left:0;-webkit-border-bottom-left-radius:6px;border-bottom-left-radius:6px;-webkit-border-top-left-radius:6px;border-top-left-radius:6px;-moz-border-radius-bottomleft:6px;-moz-border-radius-topleft:6px}.btn-group>.btn.large:last-child,.btn-group>.large.dropdown-toggle{-webkit-border-top-right-radius:6px;border-top-right-radius:6px;-webkit-border-bottom-right-radius:6px;border-bottom-right-radius:6px;-moz-border-radius-topright:6px;-moz-border-radius-bottomright:6px}.btn-group>.btn:hover,.btn-group>.btn:focus,.btn-group>.btn:active,.btn-group>.btn.active{z-index:2}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group>.btn+.dropdown-toggle{*padding-top:5px;padding-right:8px;*padding-bottom:5px;padding-left:8px;-webkit-box-shadow:inset 1px 0 0 rgba(255,255,255,0.125),inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 1px 0 0 rgba(255,255,255,0.125),inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 1px 0 0 rgba(255,255,255,0.125),inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05)}.btn-group>.btn-mini+.dropdown-toggle{*padding-top:2px;padding-right:5px;*padding-bottom:2px;padding-left:5px}.btn-group>.btn-small+.dropdown-toggle{*padding-top:5px;*padding-bottom:4px}.btn-group>.btn-large+.dropdown-toggle{*padding-top:7px;padding-right:12px;*padding-bottom:7px;padding-left:12px}.btn-group.open .dropdown-toggle{background-image:none;-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05)}.btn-group.open .btn.dropdown-toggle{background-color:#e6e6e6}.btn-group.open .btn-primary.dropdown-toggle{background-color:#04c}.btn-group.open .btn-warning.dropdown-toggle{background-color:#f89406}.btn-group.open .btn-danger.dropdown-toggle{background-color:#bd362f}.btn-group.open .btn-success.dropdown-toggle{background-color:#51a351}.btn-group.open .btn-info.dropdown-toggle{background-color:#2f96b4}.btn-group.open .btn-inverse.dropdown-toggle{background-color:#222}.btn .caret{margin-top:8px;margin-left:0}.btn-large .caret{margin-top:6px}.btn-large .caret{border-top-width:5px;border-right-width:5px;border-left-width:5px}.btn-mini .caret,.btn-small .caret{margin-top:8px}.dropup .btn-large .caret{border-bottom-width:5px}.btn-primary .caret,.btn-warning .caret,.btn-danger .caret,.btn-info .caret,.btn-success .caret,.btn-inverse .caret{border-top-color:#fff;border-bottom-color:#fff}.btn-group-vertical{display:inline-block;*display:inline;*zoom:1}.btn-group-vertical>.btn{display:block;float:none;max-width:100%;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.btn-group-vertical>.btn+.btn{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn:first-child{-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0}.btn-group-vertical>.btn:last-child{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px}.btn-group-vertical>.btn-large:first-child{-webkit-border-radius:6px 6px 0 0;-moz-border-radius:6px 6px 0 0;border-radius:6px 6px 0 0}.btn-group-vertical>.btn-large:last-child{-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px}.alert{padding:8px 35px 8px 14px;margin-bottom:20px;text-shadow:0 1px 0 rgba(255,255,255,0.5);background-color:#fcf8e3;border:1px solid #fbeed5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.alert,.alert h4{color:#c09853}.alert h4{margin:0}.alert .close{position:relative;top:-2px;right:-21px;line-height:20px}.alert-success{color:#468847;background-color:#dff0d8;border-color:#d6e9c6}.alert-success h4{color:#468847}.alert-danger,.alert-error{color:#b94a48;background-color:#f2dede;border-color:#eed3d7}.alert-danger h4,.alert-error h4{color:#b94a48}.alert-info{color:#3a87ad;background-color:#d9edf7;border-color:#bce8f1}.alert-info h4{color:#3a87ad}.alert-block{padding-top:14px;padding-bottom:14px}.alert-block>p,.alert-block>ul{margin-bottom:0}.alert-block p+p{margin-top:5px}.nav{margin-bottom:20px;margin-left:0;list-style:none}.nav>li>a{display:block}.nav>li>a:hover,.nav>li>a:focus{text-decoration:none;background-color:#eee}.nav>li>a>img{max-width:none}.nav>.pull-right{float:right}.nav-header{display:block;padding:3px 15px;font-size:11px;font-weight:bold;line-height:20px;color:#999;text-shadow:0 1px 0 rgba(255,255,255,0.5);text-transform:uppercase}.nav li+.nav-header{margin-top:9px}.nav-list{padding-right:15px;padding-left:15px;margin-bottom:0}.nav-list>li>a,.nav-list .nav-header{margin-right:-15px;margin-left:-15px;text-shadow:0 1px 0 rgba(255,255,255,0.5)}.nav-list>li>a{padding:3px 15px}.nav-list>.active>a,.nav-list>.active>a:hover,.nav-list>.active>a:focus{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.2);background-color:#08c}.nav-list [class^="icon-"],.nav-list [class*=" icon-"]{margin-right:2px}.nav-list .divider{*width:100%;height:1px;margin:9px 1px;*margin:-5px 0 5px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #fff}.nav-tabs,.nav-pills{*zoom:1}.nav-tabs:before,.nav-pills:before,.nav-tabs:after,.nav-pills:after{display:table;line-height:0;content:""}.nav-tabs:after,.nav-pills:after{clear:both}.nav-tabs>li,.nav-pills>li{float:left}.nav-tabs>li>a,.nav-pills>li>a{padding-right:12px;padding-left:12px;margin-right:2px;line-height:14px}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{margin-bottom:-1px}.nav-tabs>li>a{padding-top:8px;padding-bottom:8px;line-height:20px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover,.nav-tabs>li>a:focus{border-color:#eee #eee #ddd}.nav-tabs>.active>a,.nav-tabs>.active>a:hover,.nav-tabs>.active>a:focus{color:#555;cursor:default;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent}.nav-pills>li>a{padding-top:8px;padding-bottom:8px;margin-top:2px;margin-bottom:2px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}.nav-pills>.active>a,.nav-pills>.active>a:hover,.nav-pills>.active>a:focus{color:#fff;background-color:#08c}.nav-stacked>li{float:none}.nav-stacked>li>a{margin-right:0}.nav-tabs.nav-stacked{border-bottom:0}.nav-tabs.nav-stacked>li>a{border:1px solid #ddd;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.nav-tabs.nav-stacked>li:first-child>a{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-topright:4px;-moz-border-radius-topleft:4px}.nav-tabs.nav-stacked>li:last-child>a{-webkit-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-webkit-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-moz-border-radius-bottomright:4px;-moz-border-radius-bottomleft:4px}.nav-tabs.nav-stacked>li>a:hover,.nav-tabs.nav-stacked>li>a:focus{z-index:2;border-color:#ddd}.nav-pills.nav-stacked>li>a{margin-bottom:3px}.nav-pills.nav-stacked>li:last-child>a{margin-bottom:1px}.nav-tabs .dropdown-menu{-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px}.nav-pills .dropdown-menu{-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.nav .dropdown-toggle .caret{margin-top:6px;border-top-color:#08c;border-bottom-color:#08c}.nav .dropdown-toggle:hover .caret,.nav .dropdown-toggle:focus .caret{border-top-color:#005580;border-bottom-color:#005580}.nav-tabs .dropdown-toggle .caret{margin-top:8px}.nav .active .dropdown-toggle .caret{border-top-color:#fff;border-bottom-color:#fff}.nav-tabs .active .dropdown-toggle .caret{border-top-color:#555;border-bottom-color:#555}.nav>.dropdown.active>a:hover,.nav>.dropdown.active>a:focus{cursor:pointer}.nav-tabs .open .dropdown-toggle,.nav-pills .open .dropdown-toggle,.nav>li.dropdown.open.active>a:hover,.nav>li.dropdown.open.active>a:focus{color:#fff;background-color:#999;border-color:#999}.nav li.dropdown.open .caret,.nav li.dropdown.open.active .caret,.nav li.dropdown.open a:hover .caret,.nav li.dropdown.open a:focus .caret{border-top-color:#fff;border-bottom-color:#fff;opacity:1;filter:alpha(opacity=100)}.tabs-stacked .open>a:hover,.tabs-stacked .open>a:focus{border-color:#999}.tabbable{*zoom:1}.tabbable:before,.tabbable:after{display:table;line-height:0;content:""}.tabbable:after{clear:both}.tab-content{overflow:auto}.tabs-below>.nav-tabs,.tabs-right>.nav-tabs,.tabs-left>.nav-tabs{border-bottom:0}.tab-content>.tab-pane,.pill-content>.pill-pane{display:none}.tab-content>.active,.pill-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:hover,.tabs-below>.nav-tabs>li>a:focus{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:hover,.tabs-below>.nav-tabs>.active>a:focus{border-color:transparent #ddd #ddd #ddd}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{min-width:74px;margin-right:0;margin-bottom:3px}.tabs-left>.nav-tabs{float:left;margin-right:19px;border-right:1px solid #ddd}.tabs-left>.nav-tabs>li>a{margin-right:-1px;-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:hover,.tabs-left>.nav-tabs>li>a:focus{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs .active>a,.tabs-left>.nav-tabs .active>a:hover,.tabs-left>.nav-tabs .active>a:focus{border-color:#ddd transparent #ddd #ddd;*border-right-color:#fff}.tabs-right>.nav-tabs{float:right;margin-left:19px;border-left:1px solid #ddd}.tabs-right>.nav-tabs>li>a{margin-left:-1px;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:hover,.tabs-right>.nav-tabs>li>a:focus{border-color:#eee #eee #eee #ddd}.tabs-right>.nav-tabs .active>a,.tabs-right>.nav-tabs .active>a:hover,.tabs-right>.nav-tabs .active>a:focus{border-color:#ddd #ddd #ddd transparent;*border-left-color:#fff}.nav>.disabled>a{color:#999}.nav>.disabled>a:hover,.nav>.disabled>a:focus{text-decoration:none;cursor:default;background-color:transparent}.navbar{*position:relative;*z-index:2;margin-bottom:20px;overflow:visible}.navbar-inner{min-height:40px;padding-right:20px;padding-left:20px;background-color:#fafafa;background-image:-moz-linear-gradient(top,#fff,#f2f2f2);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#f2f2f2));background-image:-webkit-linear-gradient(top,#fff,#f2f2f2);background-image:-o-linear-gradient(top,#fff,#f2f2f2);background-image:linear-gradient(to bottom,#fff,#f2f2f2);background-repeat:repeat-x;border:1px solid #d4d4d4;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#fff2f2f2',GradientType=0);*zoom:1;-webkit-box-shadow:0 1px 4px rgba(0,0,0,0.065);-moz-box-shadow:0 1px 4px rgba(0,0,0,0.065);box-shadow:0 1px 4px rgba(0,0,0,0.065)}.navbar-inner:before,.navbar-inner:after{display:table;line-height:0;content:""}.navbar-inner:after{clear:both}.navbar .container{width:auto}.nav-collapse.collapse{height:auto;overflow:visible}.navbar .brand{display:block;float:left;padding:10px 20px 10px;margin-left:-20px;font-size:20px;font-weight:200;color:#777;text-shadow:0 1px 0 #fff}.navbar .brand:hover,.navbar .brand:focus{text-decoration:none}.navbar-text{margin-bottom:0;line-height:40px;color:#777}.navbar-link{color:#777}.navbar-link:hover,.navbar-link:focus{color:#333}.navbar .divider-vertical{height:40px;margin:0 9px;border-right:1px solid #fff;border-left:1px solid #f2f2f2}.navbar .btn,.navbar .btn-group{margin-top:5px}.navbar .btn-group .btn,.navbar .input-prepend .btn,.navbar .input-append .btn,.navbar .input-prepend .btn-group,.navbar .input-append .btn-group{margin-top:0}.navbar-form{margin-bottom:0;*zoom:1}.navbar-form:before,.navbar-form:after{display:table;line-height:0;content:""}.navbar-form:after{clear:both}.navbar-form input,.navbar-form select,.navbar-form .radio,.navbar-form .checkbox{margin-top:5px}.navbar-form input,.navbar-form select,.navbar-form .btn{display:inline-block;margin-bottom:0}.navbar-form input[type="image"],.navbar-form input[type="checkbox"],.navbar-form input[type="radio"]{margin-top:3px}.navbar-form .input-append,.navbar-form .input-prepend{margin-top:5px;white-space:nowrap}.navbar-form .input-append input,.navbar-form .input-prepend input{margin-top:0}.navbar-search{position:relative;float:left;margin-top:5px;margin-bottom:0}.navbar-search .search-query{padding:4px 14px;margin-bottom:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px}.navbar-static-top{position:static;margin-bottom:0}.navbar-static-top .navbar-inner{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.navbar-fixed-top,.navbar-fixed-bottom{position:fixed;right:0;left:0;z-index:1030;margin-bottom:0}.navbar-fixed-top .navbar-inner,.navbar-static-top .navbar-inner{border-width:0 0 1px}.navbar-fixed-bottom .navbar-inner{border-width:1px 0 0}.navbar-fixed-top .navbar-inner,.navbar-fixed-bottom .navbar-inner{padding-right:0;padding-left:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:940px}.navbar-fixed-top{top:0}.navbar-fixed-top .navbar-inner,.navbar-static-top .navbar-inner{-webkit-box-shadow:0 1px 10px rgba(0,0,0,0.1);-moz-box-shadow:0 1px 10px rgba(0,0,0,0.1);box-shadow:0 1px 10px rgba(0,0,0,0.1)}.navbar-fixed-bottom{bottom:0}.navbar-fixed-bottom .navbar-inner{-webkit-box-shadow:0 -1px 10px rgba(0,0,0,0.1);-moz-box-shadow:0 -1px 10px rgba(0,0,0,0.1);box-shadow:0 -1px 10px rgba(0,0,0,0.1)}.navbar .nav{position:relative;left:0;display:block;float:left;margin:0 10px 0 0}.navbar .nav.pull-right{float:right;margin-right:0}.navbar .nav>li{float:left}.navbar .nav>li>a{float:none;padding:10px 15px 10px;color:#777;text-decoration:none;text-shadow:0 1px 0 #fff}.navbar .nav .dropdown-toggle .caret{margin-top:8px}.navbar .nav>li>a:focus,.navbar .nav>li>a:hover{color:#333;text-decoration:none;background-color:transparent}.navbar .nav>.active>a,.navbar .nav>.active>a:hover,.navbar .nav>.active>a:focus{color:#555;text-decoration:none;background-color:#e5e5e5;-webkit-box-shadow:inset 0 3px 8px rgba(0,0,0,0.125);-moz-box-shadow:inset 0 3px 8px rgba(0,0,0,0.125);box-shadow:inset 0 3px 8px rgba(0,0,0,0.125)}.navbar .btn-navbar{display:none;float:right;padding:7px 10px;margin-right:5px;margin-left:5px;color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#ededed;*background-color:#e5e5e5;background-image:-moz-linear-gradient(top,#f2f2f2,#e5e5e5);background-image:-webkit-gradient(linear,0 0,0 100%,from(#f2f2f2),to(#e5e5e5));background-image:-webkit-linear-gradient(top,#f2f2f2,#e5e5e5);background-image:-o-linear-gradient(top,#f2f2f2,#e5e5e5);background-image:linear-gradient(to bottom,#f2f2f2,#e5e5e5);background-repeat:repeat-x;border-color:#e5e5e5 #e5e5e5 #bfbfbf;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2',endColorstr='#ffe5e5e5',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.075);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.075);box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.075)}.navbar .btn-navbar:hover,.navbar .btn-navbar:focus,.navbar .btn-navbar:active,.navbar .btn-navbar.active,.navbar .btn-navbar.disabled,.navbar .btn-navbar[disabled]{color:#fff;background-color:#e5e5e5;*background-color:#d9d9d9}.navbar .btn-navbar:active,.navbar .btn-navbar.active{background-color:#ccc \9}.navbar .btn-navbar .icon-bar{display:block;width:18px;height:2px;background-color:#f5f5f5;-webkit-border-radius:1px;-moz-border-radius:1px;border-radius:1px;-webkit-box-shadow:0 1px 0 rgba(0,0,0,0.25);-moz-box-shadow:0 1px 0 rgba(0,0,0,0.25);box-shadow:0 1px 0 rgba(0,0,0,0.25)}.btn-navbar .icon-bar+.icon-bar{margin-top:3px}.navbar .nav>li>.dropdown-menu:before{position:absolute;top:-7px;left:9px;display:inline-block;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-left:7px solid transparent;border-bottom-color:rgba(0,0,0,0.2);content:''}.navbar .nav>li>.dropdown-menu:after{position:absolute;top:-6px;left:10px;display:inline-block;border-right:6px solid transparent;border-bottom:6px solid #fff;border-left:6px solid transparent;content:''}.navbar-fixed-bottom .nav>li>.dropdown-menu:before{top:auto;bottom:-7px;border-top:7px solid #ccc;border-bottom:0;border-top-color:rgba(0,0,0,0.2)}.navbar-fixed-bottom .nav>li>.dropdown-menu:after{top:auto;bottom:-6px;border-top:6px solid #fff;border-bottom:0}.navbar .nav li.dropdown>a:hover .caret,.navbar .nav li.dropdown>a:focus .caret{border-top-color:#333;border-bottom-color:#333}.navbar .nav li.dropdown.open>.dropdown-toggle,.navbar .nav li.dropdown.active>.dropdown-toggle,.navbar .nav li.dropdown.open.active>.dropdown-toggle{color:#555;background-color:#e5e5e5}.navbar .nav li.dropdown>.dropdown-toggle .caret{border-top-color:#777;border-bottom-color:#777}.navbar .nav li.dropdown.open>.dropdown-toggle .caret,.navbar .nav li.dropdown.active>.dropdown-toggle .caret,.navbar .nav li.dropdown.open.active>.dropdown-toggle .caret{border-top-color:#555;border-bottom-color:#555}.navbar .pull-right>li>.dropdown-menu,.navbar .nav>li>.dropdown-menu.pull-right{right:0;left:auto}.navbar .pull-right>li>.dropdown-menu:before,.navbar .nav>li>.dropdown-menu.pull-right:before{right:12px;left:auto}.navbar .pull-right>li>.dropdown-menu:after,.navbar .nav>li>.dropdown-menu.pull-right:after{right:13px;left:auto}.navbar .pull-right>li>.dropdown-menu .dropdown-menu,.navbar .nav>li>.dropdown-menu.pull-right .dropdown-menu{right:100%;left:auto;margin-right:-1px;margin-left:0;-webkit-border-radius:6px 0 6px 6px;-moz-border-radius:6px 0 6px 6px;border-radius:6px 0 6px 6px}.navbar-inverse .navbar-inner{background-color:#1b1b1b;background-image:-moz-linear-gradient(top,#222,#111);background-image:-webkit-gradient(linear,0 0,0 100%,from(#222),to(#111));background-image:-webkit-linear-gradient(top,#222,#111);background-image:-o-linear-gradient(top,#222,#111);background-image:linear-gradient(to bottom,#222,#111);background-repeat:repeat-x;border-color:#252525;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222',endColorstr='#ff111111',GradientType=0)}.navbar-inverse .brand,.navbar-inverse .nav>li>a{color:#999;text-shadow:0 -1px 0 rgba(0,0,0,0.25)}.navbar-inverse .brand:hover,.navbar-inverse .nav>li>a:hover,.navbar-inverse .brand:focus,.navbar-inverse .nav>li>a:focus{color:#fff}.navbar-inverse .brand{color:#999}.navbar-inverse .navbar-text{color:#999}.navbar-inverse .nav>li>a:focus,.navbar-inverse .nav>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .nav .active>a,.navbar-inverse .nav .active>a:hover,.navbar-inverse .nav .active>a:focus{color:#fff;background-color:#111}.navbar-inverse .navbar-link{color:#999}.navbar-inverse .navbar-link:hover,.navbar-inverse .navbar-link:focus{color:#fff}.navbar-inverse .divider-vertical{border-right-color:#222;border-left-color:#111}.navbar-inverse .nav li.dropdown.open>.dropdown-toggle,.navbar-inverse .nav li.dropdown.active>.dropdown-toggle,.navbar-inverse .nav li.dropdown.open.active>.dropdown-toggle{color:#fff;background-color:#111}.navbar-inverse .nav li.dropdown>a:hover .caret,.navbar-inverse .nav li.dropdown>a:focus .caret{border-top-color:#fff;border-bottom-color:#fff}.navbar-inverse .nav li.dropdown>.dropdown-toggle .caret{border-top-color:#999;border-bottom-color:#999}.navbar-inverse .nav li.dropdown.open>.dropdown-toggle .caret,.navbar-inverse .nav li.dropdown.active>.dropdown-toggle .caret,.navbar-inverse .nav li.dropdown.open.active>.dropdown-toggle .caret{border-top-color:#fff;border-bottom-color:#fff}.navbar-inverse .navbar-search .search-query{color:#fff;background-color:#515151;border-color:#111;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1),0 1px 0 rgba(255,255,255,0.15);-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1),0 1px 0 rgba(255,255,255,0.15);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1),0 1px 0 rgba(255,255,255,0.15);-webkit-transition:none;-moz-transition:none;-o-transition:none;transition:none}.navbar-inverse .navbar-search .search-query:-moz-placeholder{color:#ccc}.navbar-inverse .navbar-search .search-query:-ms-input-placeholder{color:#ccc}.navbar-inverse .navbar-search .search-query::-webkit-input-placeholder{color:#ccc}.navbar-inverse .navbar-search .search-query:focus,.navbar-inverse .navbar-search .search-query.focused{padding:5px 15px;color:#333;text-shadow:0 1px 0 #fff;background-color:#fff;border:0;outline:0;-webkit-box-shadow:0 0 3px rgba(0,0,0,0.15);-moz-box-shadow:0 0 3px rgba(0,0,0,0.15);box-shadow:0 0 3px rgba(0,0,0,0.15)}.navbar-inverse .btn-navbar{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#0e0e0e;*background-color:#040404;background-image:-moz-linear-gradient(top,#151515,#040404);background-image:-webkit-gradient(linear,0 0,0 100%,from(#151515),to(#040404));background-image:-webkit-linear-gradient(top,#151515,#040404);background-image:-o-linear-gradient(top,#151515,#040404);background-image:linear-gradient(to bottom,#151515,#040404);background-repeat:repeat-x;border-color:#040404 #040404 #000;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff151515',endColorstr='#ff040404',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.navbar-inverse .btn-navbar:hover,.navbar-inverse .btn-navbar:focus,.navbar-inverse .btn-navbar:active,.navbar-inverse .btn-navbar.active,.navbar-inverse .btn-navbar.disabled,.navbar-inverse .btn-navbar[disabled]{color:#fff;background-color:#040404;*background-color:#000}.navbar-inverse .btn-navbar:active,.navbar-inverse .btn-navbar.active{background-color:#000 \9}.breadcrumb{padding:8px 15px;margin:0 0 20px;list-style:none;background-color:#f5f5f5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.breadcrumb>li{display:inline-block;*display:inline;text-shadow:0 1px 0 #fff;*zoom:1}.breadcrumb>li>.divider{padding:0 5px;color:#ccc}.breadcrumb>.active{color:#999}.pagination{margin:20px 0}.pagination ul{display:inline-block;*display:inline;margin-bottom:0;margin-left:0;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;*zoom:1;-webkit-box-shadow:0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:0 1px 2px rgba(0,0,0,0.05);box-shadow:0 1px 2px rgba(0,0,0,0.05)}.pagination ul>li{display:inline}.pagination ul>li>a,.pagination ul>li>span{float:left;padding:4px 12px;line-height:20px;text-decoration:none;background-color:#fff;border:1px solid #ddd;border-left-width:0}.pagination ul>li>a:hover,.pagination ul>li>a:focus,.pagination ul>.active>a,.pagination ul>.active>span{background-color:#f5f5f5}.pagination ul>.active>a,.pagination ul>.active>span{color:#999;cursor:default}.pagination ul>.disabled>span,.pagination ul>.disabled>a,.pagination ul>.disabled>a:hover,.pagination ul>.disabled>a:focus{color:#999;cursor:default;background-color:transparent}.pagination ul>li:first-child>a,.pagination ul>li:first-child>span{border-left-width:1px;-webkit-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-bottomleft:4px;-moz-border-radius-topleft:4px}.pagination ul>li:last-child>a,.pagination ul>li:last-child>span{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-webkit-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-moz-border-radius-topright:4px;-moz-border-radius-bottomright:4px}.pagination-centered{text-align:center}.pagination-right{text-align:right}.pagination-large ul>li>a,.pagination-large ul>li>span{padding:11px 19px;font-size:17.5px}.pagination-large ul>li:first-child>a,.pagination-large ul>li:first-child>span{-webkit-border-bottom-left-radius:6px;border-bottom-left-radius:6px;-webkit-border-top-left-radius:6px;border-top-left-radius:6px;-moz-border-radius-bottomleft:6px;-moz-border-radius-topleft:6px}.pagination-large ul>li:last-child>a,.pagination-large ul>li:last-child>span{-webkit-border-top-right-radius:6px;border-top-right-radius:6px;-webkit-border-bottom-right-radius:6px;border-bottom-right-radius:6px;-moz-border-radius-topright:6px;-moz-border-radius-bottomright:6px}.pagination-mini ul>li:first-child>a,.pagination-small ul>li:first-child>a,.pagination-mini ul>li:first-child>span,.pagination-small ul>li:first-child>span{-webkit-border-bottom-left-radius:3px;border-bottom-left-radius:3px;-webkit-border-top-left-radius:3px;border-top-left-radius:3px;-moz-border-radius-bottomleft:3px;-moz-border-radius-topleft:3px}.pagination-mini ul>li:last-child>a,.pagination-small ul>li:last-child>a,.pagination-mini ul>li:last-child>span,.pagination-small ul>li:last-child>span{-webkit-border-top-right-radius:3px;border-top-right-radius:3px;-webkit-border-bottom-right-radius:3px;border-bottom-right-radius:3px;-moz-border-radius-topright:3px;-moz-border-radius-bottomright:3px}.pagination-small ul>li>a,.pagination-small ul>li>span{padding:2px 10px;font-size:11.9px}.pagination-mini ul>li>a,.pagination-mini ul>li>span{padding:0 6px;font-size:10.5px}.pager{margin:20px 0;text-align:center;list-style:none;*zoom:1}.pager:before,.pager:after{display:table;line-height:0;content:""}.pager:after{clear:both}.pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px}.pager li>a:hover,.pager li>a:focus{text-decoration:none;background-color:#f5f5f5}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:hover,.pager .disabled>a:focus,.pager .disabled>span{color:#999;cursor:default;background-color:#fff}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000}.modal-backdrop.fade{opacity:0}.modal-backdrop,.modal-backdrop.fade.in{opacity:.8;filter:alpha(opacity=80)}.modal{position:fixed;top:10%;left:50%;z-index:1050;width:560px;margin-left:-280px;background-color:#fff;border:1px solid #999;border:1px solid rgba(0,0,0,0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;outline:0;-webkit-box-shadow:0 3px 7px rgba(0,0,0,0.3);-moz-box-shadow:0 3px 7px rgba(0,0,0,0.3);box-shadow:0 3px 7px rgba(0,0,0,0.3);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box}.modal.fade{top:-25%;-webkit-transition:opacity .3s linear,top .3s ease-out;-moz-transition:opacity .3s linear,top .3s ease-out;-o-transition:opacity .3s linear,top .3s ease-out;transition:opacity .3s linear,top .3s ease-out}.modal.fade.in{top:10%}.modal-header{padding:9px 15px;border-bottom:1px solid #eee}.modal-header .close{margin-top:2px}.modal-header h3{margin:0;line-height:30px}.modal-body{position:relative;max-height:400px;padding:15px;overflow-y:auto}.modal-form{margin-bottom:0}.modal-footer{padding:14px 15px 15px;margin-bottom:0;text-align:right;background-color:#f5f5f5;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;*zoom:1;-webkit-box-shadow:inset 0 1px 0 #fff;-moz-box-shadow:inset 0 1px 0 #fff;box-shadow:inset 0 1px 0 #fff}.modal-footer:before,.modal-footer:after{display:table;line-height:0;content:""}.modal-footer:after{clear:both}.modal-footer .btn+.btn{margin-bottom:0;margin-left:5px}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}.tooltip{position:absolute;z-index:1030;display:block;font-size:11px;line-height:1.4;opacity:0;filter:alpha(opacity=0);visibility:visible}.tooltip.in{opacity:.8;filter:alpha(opacity=80)}.tooltip.top{padding:5px 0;margin-top:-3px}.tooltip.right{padding:0 5px;margin-left:3px}.tooltip.bottom{padding:5px 0;margin-top:3px}.tooltip.left{padding:0 5px;margin-left:-3px}.tooltip-inner{max-width:200px;padding:8px;color:#fff;text-align:center;text-decoration:none;background-color:#000;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-top-color:#000;border-width:5px 5px 0}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-right-color:#000;border-width:5px 5px 5px 0}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-left-color:#000;border-width:5px 0 5px 5px}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-bottom-color:#000;border-width:0 5px 5px}.popover{position:absolute;top:0;left:0;z-index:1010;display:none;max-width:276px;padding:1px;text-align:left;white-space:normal;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);-moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box}.popover.top{margin-top:-10px}.popover.right{margin-left:10px}.popover.bottom{margin-top:10px}.popover.left{margin-left:-10px}.popover-title{padding:8px 14px;margin:0;font-size:14px;font-weight:normal;line-height:18px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;-webkit-border-radius:5px 5px 0 0;-moz-border-radius:5px 5px 0 0;border-radius:5px 5px 0 0}.popover-title:empty{display:none}.popover-content{padding:9px 14px}.popover .arrow,.popover .arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.popover .arrow{border-width:11px}.popover .arrow:after{border-width:10px;content:""}.popover.top .arrow{bottom:-11px;left:50%;margin-left:-11px;border-top-color:#999;border-top-color:rgba(0,0,0,0.25);border-bottom-width:0}.popover.top .arrow:after{bottom:1px;margin-left:-10px;border-top-color:#fff;border-bottom-width:0}.popover.right .arrow{top:50%;left:-11px;margin-top:-11px;border-right-color:#999;border-right-color:rgba(0,0,0,0.25);border-left-width:0}.popover.right .arrow:after{bottom:-10px;left:1px;border-right-color:#fff;border-left-width:0}.popover.bottom .arrow{top:-11px;left:50%;margin-left:-11px;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,0.25);border-top-width:0}.popover.bottom .arrow:after{top:1px;margin-left:-10px;border-bottom-color:#fff;border-top-width:0}.popover.left .arrow{top:50%;right:-11px;margin-top:-11px;border-left-color:#999;border-left-color:rgba(0,0,0,0.25);border-right-width:0}.popover.left .arrow:after{right:1px;bottom:-10px;border-left-color:#fff;border-right-width:0}.thumbnails{margin-left:-20px;list-style:none;*zoom:1}.thumbnails:before,.thumbnails:after{display:table;line-height:0;content:""}.thumbnails:after{clear:both}.row-fluid .thumbnails{margin-left:0}.thumbnails>li{float:left;margin-bottom:20px;margin-left:20px}.thumbnail{display:block;padding:4px;line-height:20px;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 3px rgba(0,0,0,0.055);-moz-box-shadow:0 1px 3px rgba(0,0,0,0.055);box-shadow:0 1px 3px rgba(0,0,0,0.055);-webkit-transition:all .2s ease-in-out;-moz-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out}a.thumbnail:hover,a.thumbnail:focus{border-color:#08c;-webkit-box-shadow:0 1px 4px rgba(0,105,214,0.25);-moz-box-shadow:0 1px 4px rgba(0,105,214,0.25);box-shadow:0 1px 4px rgba(0,105,214,0.25)}.thumbnail>img{display:block;max-width:100%;margin-right:auto;margin-left:auto}.thumbnail .caption{padding:9px;color:#555}.media,.media-body{overflow:hidden;*overflow:visible;zoom:1}.media,.media .media{margin-top:15px}.media:first-child{margin-top:0}.media-object{display:block}.media-heading{margin:0 0 5px}.media>.pull-left{margin-right:10px}.media>.pull-right{margin-left:10px}.media-list{margin-left:0;list-style:none}.label,.badge{display:inline-block;padding:2px 4px;font-size:11.844px;font-weight:bold;line-height:14px;color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);white-space:nowrap;vertical-align:baseline;background-color:#999}.label{-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.badge{padding-right:9px;padding-left:9px;-webkit-border-radius:9px;-moz-border-radius:9px;border-radius:9px}.label:empty,.badge:empty{display:none}a.label:hover,a.label:focus,a.badge:hover,a.badge:focus{color:#fff;text-decoration:none;cursor:pointer}.label-important,.badge-important{background-color:#b94a48}.label-important[href],.badge-important[href]{background-color:#953b39}.label-warning,.badge-warning{background-color:#f89406}.label-warning[href],.badge-warning[href]{background-color:#c67605}.label-success,.badge-success{background-color:#468847}.label-success[href],.badge-success[href]{background-color:#356635}.label-info,.badge-info{background-color:#3a87ad}.label-info[href],.badge-info[href]{background-color:#2d6987}.label-inverse,.badge-inverse{background-color:#333}.label-inverse[href],.badge-inverse[href]{background-color:#1a1a1a}.btn .label,.btn .badge{position:relative;top:-1px}.btn-mini .label,.btn-mini .badge{top:0}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-moz-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-ms-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-o-keyframes progress-bar-stripes{from{background-position:0 0}to{background-position:40px 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}.progress{height:20px;margin-bottom:20px;overflow:hidden;background-color:#f7f7f7;background-image:-moz-linear-gradient(top,#f5f5f5,#f9f9f9);background-image:-webkit-gradient(linear,0 0,0 100%,from(#f5f5f5),to(#f9f9f9));background-image:-webkit-linear-gradient(top,#f5f5f5,#f9f9f9);background-image:-o-linear-gradient(top,#f5f5f5,#f9f9f9);background-image:linear-gradient(to bottom,#f5f5f5,#f9f9f9);background-repeat:repeat-x;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5',endColorstr='#fff9f9f9',GradientType=0);-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1)}.progress .bar{float:left;width:0;height:100%;font-size:12px;color:#fff;text-align:center;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#0e90d2;background-image:-moz-linear-gradient(top,#149bdf,#0480be);background-image:-webkit-gradient(linear,0 0,0 100%,from(#149bdf),to(#0480be));background-image:-webkit-linear-gradient(top,#149bdf,#0480be);background-image:-o-linear-gradient(top,#149bdf,#0480be);background-image:linear-gradient(to bottom,#149bdf,#0480be);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff149bdf',endColorstr='#ff0480be',GradientType=0);-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);-moz-box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-transition:width .6s ease;-moz-transition:width .6s ease;-o-transition:width .6s ease;transition:width .6s ease}.progress .bar+.bar{-webkit-box-shadow:inset 1px 0 0 rgba(0,0,0,0.15),inset 0 -1px 0 rgba(0,0,0,0.15);-moz-box-shadow:inset 1px 0 0 rgba(0,0,0,0.15),inset 0 -1px 0 rgba(0,0,0,0.15);box-shadow:inset 1px 0 0 rgba(0,0,0,0.15),inset 0 -1px 0 rgba(0,0,0,0.15)}.progress-striped .bar{background-color:#149bdf;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);-webkit-background-size:40px 40px;-moz-background-size:40px 40px;-o-background-size:40px 40px;background-size:40px 40px}.progress.active .bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-moz-animation:progress-bar-stripes 2s linear infinite;-ms-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-danger .bar,.progress .bar-danger{background-color:#dd514c;background-image:-moz-linear-gradient(top,#ee5f5b,#c43c35);background-image:-webkit-gradient(linear,0 0,0 100%,from(#ee5f5b),to(#c43c35));background-image:-webkit-linear-gradient(top,#ee5f5b,#c43c35);background-image:-o-linear-gradient(top,#ee5f5b,#c43c35);background-image:linear-gradient(to bottom,#ee5f5b,#c43c35);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b',endColorstr='#ffc43c35',GradientType=0)}.progress-danger.progress-striped .bar,.progress-striped .bar-danger{background-color:#ee5f5b;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-success .bar,.progress .bar-success{background-color:#5eb95e;background-image:-moz-linear-gradient(top,#62c462,#57a957);background-image:-webkit-gradient(linear,0 0,0 100%,from(#62c462),to(#57a957));background-image:-webkit-linear-gradient(top,#62c462,#57a957);background-image:-o-linear-gradient(top,#62c462,#57a957);background-image:linear-gradient(to bottom,#62c462,#57a957);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462',endColorstr='#ff57a957',GradientType=0)}.progress-success.progress-striped .bar,.progress-striped .bar-success{background-color:#62c462;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-info .bar,.progress .bar-info{background-color:#4bb1cf;background-image:-moz-linear-gradient(top,#5bc0de,#339bb9);background-image:-webkit-gradient(linear,0 0,0 100%,from(#5bc0de),to(#339bb9));background-image:-webkit-linear-gradient(top,#5bc0de,#339bb9);background-image:-o-linear-gradient(top,#5bc0de,#339bb9);background-image:linear-gradient(to bottom,#5bc0de,#339bb9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de',endColorstr='#ff339bb9',GradientType=0)}.progress-info.progress-striped .bar,.progress-striped .bar-info{background-color:#5bc0de;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-warning .bar,.progress .bar-warning{background-color:#faa732;background-image:-moz-linear-gradient(top,#fbb450,#f89406);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fbb450),to(#f89406));background-image:-webkit-linear-gradient(top,#fbb450,#f89406);background-image:-o-linear-gradient(top,#fbb450,#f89406);background-image:linear-gradient(to bottom,#fbb450,#f89406);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450',endColorstr='#fff89406',GradientType=0)}.progress-warning.progress-striped .bar,.progress-striped .bar-warning{background-color:#fbb450;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.accordion{margin-bottom:20px}.accordion-group{margin-bottom:2px;border:1px solid #e5e5e5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.accordion-heading{border-bottom:0}.accordion-heading .accordion-toggle{display:block;padding:8px 15px}.accordion-toggle{cursor:pointer}.accordion-inner{padding:9px 15px;border-top:1px solid #e5e5e5}.carousel{position:relative;margin-bottom:20px;line-height:1}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel-inner>.item{position:relative;display:none;-webkit-transition:.6s ease-in-out left;-moz-transition:.6s ease-in-out left;-o-transition:.6s ease-in-out left;transition:.6s ease-in-out left}.carousel-inner>.item>img,.carousel-inner>.item>a>img{display:block;line-height:1}.carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block}.carousel-inner>.active{left:0}.carousel-inner>.next,.carousel-inner>.prev{position:absolute;top:0;width:100%}.carousel-inner>.next{left:100%}.carousel-inner>.prev{left:-100%}.carousel-inner>.next.left,.carousel-inner>.prev.right{left:0}.carousel-inner>.active.left{left:-100%}.carousel-inner>.active.right{left:100%}.carousel-control{position:absolute;top:40%;left:15px;width:40px;height:40px;margin-top:-20px;font-size:60px;font-weight:100;line-height:30px;color:#fff;text-align:center;background:#222;border:3px solid #fff;-webkit-border-radius:23px;-moz-border-radius:23px;border-radius:23px;opacity:.5;filter:alpha(opacity=50)}.carousel-control.right{right:15px;left:auto}.carousel-control:hover,.carousel-control:focus{color:#fff;text-decoration:none;opacity:.9;filter:alpha(opacity=90)}.carousel-indicators{position:absolute;top:15px;right:15px;z-index:5;margin:0;list-style:none}.carousel-indicators li{display:block;float:left;width:10px;height:10px;margin-left:5px;text-indent:-999px;background-color:#ccc;background-color:rgba(255,255,255,0.25);border-radius:5px}.carousel-indicators .active{background-color:#fff}.carousel-caption{position:absolute;right:0;bottom:0;left:0;padding:15px;background:#333;background:rgba(0,0,0,0.75)}.carousel-caption h4,.carousel-caption p{line-height:20px;color:#fff}.carousel-caption h4{margin:0 0 5px}.carousel-caption p{margin-bottom:0}.hero-unit{padding:60px;margin-bottom:30px;font-size:18px;font-weight:200;line-height:30px;color:inherit;background-color:#eee;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;letter-spacing:-1px;color:inherit}.hero-unit li{line-height:30px}.pull-right{float:right}.pull-left{float:left}.hide{display:none}.show{display:block}.invisible{visibility:hidden}.affix{position:fixed}
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/css/docs.css b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/css/docs.css
new file mode 100644
index 0000000..6085fbe
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/css/docs.css
@@ -0,0 +1,807 @@
+/* Body and structure
+-------------------------------------------------- */
+
+body {
+    position: relative;
+    padding-top: 40px;
+}
+
+/* Code in headings */
+h3 code {
+    font-size: 14px;
+    font-weight: normal;
+}
+
+/* Sections
+-------------------------------------------------- */
+
+/* padding for in-page bookmarks and fixed navbar */
+.page-header {
+    border-bottom: 1px solid #EEEEEE;
+    margin: 20px 0;
+    padding-bottom: 9px;
+}
+.page-header > h1{
+    color: #5A5A5A;
+}
+section {
+    padding-top: 20px;
+}
+section > .page-header,
+section > .lead {
+    color: #5a5a5a;
+}
+section > ul li {
+    margin-bottom: 5px;
+}
+
+/* Separators (hr) */
+.bs-docs-separator {
+    margin: 40px 0 39px;
+}
+
+/* Faded out hr */
+hr.soften {
+    height: 1px;
+    margin: 70px 0;
+    background-image: -webkit-linear-gradient(left, rgba(0,0,0,0), rgba(0,0,0,.1), rgba(0,0,0,0));
+    background-image:    -moz-linear-gradient(left, rgba(0,0,0,0), rgba(0,0,0,.1), rgba(0,0,0,0));
+    background-image:     -ms-linear-gradient(left, rgba(0,0,0,0), rgba(0,0,0,.1), rgba(0,0,0,0));
+    background-image:      -o-linear-gradient(left, rgba(0,0,0,0), rgba(0,0,0,.1), rgba(0,0,0,0));
+    border: 0;
+}
+
+
+
+/* Jumbotrons
+-------------------------------------------------- */
+
+/* Base class
+------------------------- */
+.jumbotron {
+    position: relative;
+    padding: 40px 0;
+    color: #fff;
+    text-align: center;
+    text-shadow: 0 1px 3px rgba(0,0,0,.4), 0 0 30px rgba(0,0,0,.075);
+    background: #B24926; /* Old browsers */
+    background: -moz-linear-gradient(45deg,  #B24926 0%, #FAA523 100%); /* FF3.6+ */
+    background: -webkit-gradient(linear, left bottom, right top, color-stop(0%,#B24926), color-stop(100%,#FAA523)); /* Chrome,Safari4+ */
+    background: -webkit-linear-gradient(45deg,  #B24926 0%,#FAA523 100%); /* Chrome10+,Safari5.1+ */
+    background: -o-linear-gradient(45deg,  #B24926 0%,#FAA523 100%); /* Opera 11.10+ */
+    background: -ms-linear-gradient(45deg,  #B24926 0%,#FAA523 100%); /* IE10+ */
+    background: linear-gradient(45deg,  #B24926 0%,#FAA523 100%); /* W3C */
+    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#B24926', endColorstr='#FAA523',GradientType=1 ); /* IE6-9 fallback on horizontal gradient */
+    -webkit-box-shadow: inset 0 3px 7px rgba(0,0,0,.2), inset 0 -3px 7px rgba(0,0,0,.2);
+    -moz-box-shadow: inset 0 3px 7px rgba(0,0,0,.2), inset 0 -3px 7px rgba(0,0,0,.2);
+    box-shadow: inset 0 3px 7px rgba(0,0,0,.2), inset 0 -3px 7px rgba(0,0,0,.2);
+}
+.jumbotron h1 {
+    font-size: 80px;
+    font-weight: bold;
+    letter-spacing: -1px;
+    line-height: 1;
+}
+.jumbotron p {
+    font-size: 24px;
+    font-weight: 300;
+    line-height: 1.25;
+    margin-bottom: 30px;
+}
+
+/* Link styles (used on .masthead-links as well) */
+.jumbotron a {
+    color: #fff;
+    color: rgba(255,255,255,.5);
+    -webkit-transition: all .2s ease-in-out;
+    -moz-transition: all .2s ease-in-out;
+    transition: all .2s ease-in-out;
+}
+.jumbotron a:hover {
+    color: #fff;
+    text-shadow: 0 0 10px rgba(255,255,255,.25);
+}
+
+/* Download button */
+.masthead .btn {
+    padding: 19px 24px;
+    font-size: 24px;
+    font-weight: 200;
+    color: #fff; /* redeclare to override the `.jumbotron a` */
+    border: 0;
+    -webkit-border-radius: 6px;
+    -moz-border-radius: 6px;
+    border-radius: 6px;
+    -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25);
+    -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25);
+    box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25);
+    -webkit-transition: none;
+    -moz-transition: none;
+    transition: none;
+}
+.masthead .btn:hover {
+    -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25);
+    -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25);
+    box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25);
+}
+.masthead .btn:active {
+    -webkit-box-shadow: inset 0 2px 4px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.1);
+    -moz-box-shadow: inset 0 2px 4px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.1);
+    box-shadow: inset 0 2px 4px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.1);
+}
+
+
+/* Pattern overlay
+------------------------- */
+.jumbotron .container {
+    position: relative;
+    z-index: 2;
+}
+.jumbotron:after {
+    content: '';
+    display: block;
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    background: url(../img/bs-docs-masthead-pattern.png) repeat center center;
+    opacity: .4;
+}
+@media
+only screen and (-webkit-min-device-pixel-ratio: 2),
+only screen and (   min--moz-device-pixel-ratio: 2),
+only screen and (     -o-min-device-pixel-ratio: 2/1) {
+
+    .jumbotron:after {
+        background-size: 150px 150px;
+    }
+
+}
+
+/* Masthead (docs home)
+------------------------- */
+.masthead {
+    padding: 70px 0 80px;
+    margin-bottom: 0;
+    color: #fff;
+}
+.masthead h1 {
+    font-size: 120px;
+    line-height: 1;
+    letter-spacing: -2px;
+}
+.masthead p {
+    font-size: 40px;
+    font-weight: 200;
+    line-height: 1.25;
+}
+
+/* Textual links in masthead */
+.masthead-links {
+    margin: 0;
+    list-style: none;
+}
+.masthead-links li {
+    display: inline;
+    padding: 0 10px;
+    color: rgba(255,255,255,.25);
+}
+
+/* Social proof buttons from GitHub & Twitter */
+.bs-docs-social {
+    padding: 15px 0;
+    text-align: center;
+    background-color: #f5f5f5;
+    border-top: 1px solid #fff;
+    border-bottom: 1px solid #ddd;
+}
+
+/* Quick links on Home */
+.bs-docs-social-buttons {
+    margin-left: 0;
+    margin-bottom: 0;
+    padding-left: 0;
+    list-style: none;
+}
+.bs-docs-social-buttons li {
+    display: inline-block;
+    padding: 5px 8px;
+    line-height: 1;
+    *display: inline;
+    *zoom: 1;
+}
+
+/* Subhead (other pages)
+------------------------- */
+.subhead {
+    text-align: left;
+    border-bottom: 1px solid #ddd;
+}
+.subhead h1 {
+    font-size: 60px;
+}
+.subhead p {
+    margin-bottom: 20px;
+}
+.subhead .navbar {
+    display: none;
+}
+
+
+
+/* Marketing section of Overview
+-------------------------------------------------- */
+
+.marketing {
+    text-align: center;
+    color: #5a5a5a;
+}
+.marketing h1 {
+    margin: 60px 0 10px;
+    font-size: 60px;
+    font-weight: 200;
+    line-height: 1;
+    letter-spacing: -1px;
+}
+.marketing h2 {
+    font-weight: 200;
+    margin-bottom: 5px;
+}
+.marketing p {
+    font-size: 16px;
+    line-height: 1.5;
+}
+.marketing .marketing-byline {
+    margin-bottom: 40px;
+    font-size: 20px;
+    font-weight: 300;
+    line-height: 1.25;
+    color: #999;
+}
+.marketing-img {
+    display: block;
+    margin: 0 auto 30px;
+    max-height: 145px;
+}
+
+
+
+/* Footer
+-------------------------------------------------- */
+
+.footer {
+    text-align: center;
+    padding: 30px 0;
+    margin-top: 70px;
+    border-top: 1px solid #e5e5e5;
+    background-color: #f5f5f5;
+}
+.footer p {
+    margin-bottom: 0;
+    color: #777;
+}
+.footer-links {
+    margin: 10px 0;
+}
+.footer-links li {
+    display: inline;
+    padding: 0 2px;
+}
+.footer-links li:first-child {
+    padding-left: 0;
+}
+
+/* Bootstrap code examples
+-------------------------------------------------- */
+
+/* Base class */
+.bs-docs-example {
+    position: relative;
+    margin: 15px 0;
+    padding: 39px 19px 14px;
+    *padding-top: 19px;
+    background-color: #fff;
+    border: 1px solid #ddd;
+    -webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+    border-radius: 4px;
+}
+
+/* Echo out a label for the example */
+.bs-docs-example:after {
+    content: "Example";
+    position: absolute;
+    top: -1px;
+    left: -1px;
+    padding: 3px 7px;
+    font-size: 12px;
+    font-weight: bold;
+    background-color: #f5f5f5;
+    border: 1px solid #ddd;
+    color: #9da0a4;
+    -webkit-border-radius: 4px 0 4px 0;
+    -moz-border-radius: 4px 0 4px 0;
+    border-radius: 4px 0 4px 0;
+}
+
+/* Remove spacing between an example and it's code */
+.bs-docs-example + .prettyprint {
+    margin-top: -20px;
+    padding-top: 15px;
+}
+
+/* Tweak examples
+------------------------- */
+.bs-docs-example > p:last-child {
+    margin-bottom: 0;
+}
+.bs-docs-example .table,
+.bs-docs-example .progress,
+.bs-docs-example .well,
+.bs-docs-example .alert,
+.bs-docs-example .hero-unit,
+.bs-docs-example .pagination,
+.bs-docs-example .navbar,
+.bs-docs-example > .nav,
+.bs-docs-example blockquote {
+    margin-bottom: 5px;
+}
+.bs-docs-example .pagination {
+    margin-top: 0;
+}
+.bs-navbar-top-example,
+.bs-navbar-bottom-example {
+    z-index: 1;
+    padding: 0;
+    height: 90px;
+    overflow: hidden; /* cut the drop shadows off */
+}
+.bs-navbar-top-example .navbar-fixed-top,
+.bs-navbar-bottom-example .navbar-fixed-bottom {
+    margin-left: 0;
+    margin-right: 0;
+}
+.bs-navbar-top-example {
+    -webkit-border-radius: 0 0 4px 4px;
+    -moz-border-radius: 0 0 4px 4px;
+    border-radius: 0 0 4px 4px;
+}
+.bs-navbar-top-example:after {
+    top: auto;
+    bottom: -1px;
+    -webkit-border-radius: 0 4px 0 4px;
+    -moz-border-radius: 0 4px 0 4px;
+    border-radius: 0 4px 0 4px;
+}
+.bs-navbar-bottom-example {
+    -webkit-border-radius: 4px 4px 0 0;
+    -moz-border-radius: 4px 4px 0 0;
+    border-radius: 4px 4px 0 0;
+}
+.bs-navbar-bottom-example .navbar {
+    margin-bottom: 0;
+}
+form.bs-docs-example {
+    padding-bottom: 19px;
+}
+
+/* Images */
+.bs-docs-example-images img {
+    margin: 10px;
+    display: inline-block;
+}
+
+/* Tooltips */
+.bs-docs-tooltip-examples {
+    text-align: center;
+    margin: 0 0 10px;
+    list-style: none;
+}
+.bs-docs-tooltip-examples li {
+    display: inline;
+    padding: 0 10px;
+}
+
+/* Popovers */
+.bs-docs-example-popover {
+    padding-bottom: 24px;
+    background-color: #f9f9f9;
+}
+.bs-docs-example-popover .popover {
+    position: relative;
+    display: block;
+    float: left;
+    width: 260px;
+    margin: 20px;
+}
+
+/* Dropdowns */
+.bs-docs-example-submenus {
+    min-height: 180px;
+}
+.bs-docs-example-submenus > .pull-left + .pull-left {
+    margin-left: 20px;
+}
+.bs-docs-example-submenus .dropup > .dropdown-menu,
+.bs-docs-example-submenus .dropdown > .dropdown-menu {
+    display: block;
+    position: static;
+    margin-bottom: 5px;
+    *width: 180px;
+}
+
+/* Sidenav for Docs
+-------------------------------------------------- */
+
+.bs-docs-sidenav {
+    width: 228px;
+    margin: 30px 0 0;
+    padding: 0;
+    background-color: #fff;
+    -webkit-border-radius: 6px;
+    -moz-border-radius: 6px;
+    border-radius: 6px;
+    -webkit-box-shadow: 0 1px 4px rgba(0,0,0,.065);
+    -moz-box-shadow: 0 1px 4px rgba(0,0,0,.065);
+    box-shadow: 0 1px 4px rgba(0,0,0,.065);
+}
+.bs-docs-sidenav > li > a {
+    display: block;
+    width: 190px \9;
+    margin: 0 0 -1px;
+    padding: 8px 14px;
+    border: 1px solid #e5e5e5;
+}
+.bs-docs-sidenav > li:first-child > a {
+    -webkit-border-radius: 6px 6px 0 0;
+    -moz-border-radius: 6px 6px 0 0;
+    border-radius: 6px 6px 0 0;
+}
+.bs-docs-sidenav > li:last-child > a {
+    -webkit-border-radius: 0 0 6px 6px;
+    -moz-border-radius: 0 0 6px 6px;
+    border-radius: 0 0 6px 6px;
+}
+.bs-docs-sidenav > li.active > a {
+    background: #B24926; /* Old browsers */
+    background: -moz-linear-gradient(45deg,  #B24926 0%, #FAA523 100%); /* FF3.6+ */
+    background: -webkit-gradient(linear, left bottom, right top, color-stop(0%,#B24926), color-stop(100%,#FAA523)); /* Chrome,Safari4+ */
+    background: -webkit-linear-gradient(45deg,  #B24926 0%,#FAA523 100%); /* Chrome10+,Safari5.1+ */
+    background: -o-linear-gradient(45deg,  #B24926 0%,#FAA523 100%); /* Opera 11.10+ */
+    background: -ms-linear-gradient(45deg,  #B24926 0%,#FAA523 100%); /* IE10+ */
+    background: linear-gradient(45deg,  #B24926 0%,#FAA523 100%); /* W3C */
+    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#B24926', endColorstr='#FAA523',GradientType=1 ); /* IE6-9 fallback on horizontal gradient */
+    position: relative;
+    z-index: 2;
+    padding: 9px 15px;
+    border: 0;
+    text-shadow: 0 1px 0 rgba(0,0,0,.15);
+    -webkit-box-shadow: inset 1px 0 0 rgba(0,0,0,.1), inset -1px 0 0 rgba(0,0,0,.1);
+    -moz-box-shadow: inset 1px 0 0 rgba(0,0,0,.1), inset -1px 0 0 rgba(0,0,0,.1);
+    box-shadow: inset 1px 0 0 rgba(0,0,0,.1), inset -1px 0 0 rgba(0,0,0,.1);
+}
+/* Chevrons */
+.bs-docs-sidenav .icon-chevron-right {
+    float: right;
+    margin-top: 2px;
+    margin-right: -6px;
+    opacity: .25;
+}
+.bs-docs-sidenav > li > a:hover {
+    background-color: #f5f5f5;
+}
+.bs-docs-sidenav a:hover .icon-chevron-right {
+    opacity: .5;
+}
+.bs-docs-sidenav .active .icon-chevron-right,
+.bs-docs-sidenav .active a:hover .icon-chevron-right {
+    opacity: 1;
+}
+.bs-docs-sidenav.affix {
+    top: 40px;
+}
+.bs-docs-sidenav.affix-bottom {
+    position: absolute;
+    top: auto;
+    bottom: 270px;
+}
+/* Desktop
+------------------------- */
+@media (max-width: 980px) {
+    /* Unfloat brand */
+    body > .navbar-fixed-top .brand {
+        float: left;
+        margin-left: 0;
+        padding-left: 10px;
+        padding-right: 10px;
+    }
+
+    /* Inline-block quick links for more spacing */
+    .quick-links li {
+        display: inline-block;
+        margin: 5px;
+    }
+
+    /* When affixed, space properly */
+    .bs-docs-sidenav {
+        top: 0;
+        width: 218px;
+        margin-top: 30px;
+        margin-right: 0;
+    }
+}
+
+/* Tablet to desktop
+------------------------- */
+@media (min-width: 768px) and (max-width: 979px) {
+    /* Remove any padding from the body */
+    body {
+        padding-top: 0;
+    }
+    /* Widen masthead and social buttons to fill body padding */
+    .jumbotron {
+        margin-top: -20px; /* Offset bottom margin on .navbar */
+    }
+    /* Adjust sidenav width */
+    .bs-docs-sidenav {
+        width: 166px;
+        margin-top: 20px;
+    }
+    .bs-docs-sidenav.affix {
+        top: 0;
+    }
+}
+
+/* Tablet
+------------------------- */
+@media (max-width: 767px) {
+    /* Remove any padding from the body */
+    body {
+        padding-top: 0;
+    }
+
+    /* Widen masthead and social buttons to fill body padding */
+    .jumbotron {
+        padding: 40px 20px;
+        margin-top:   -20px; /* Offset bottom margin on .navbar */
+        margin-right: -20px;
+        margin-left:  -20px;
+    }
+    .masthead h1 {
+        font-size: 90px;
+    }
+    .masthead p,
+    .masthead .btn {
+        font-size: 24px;
+    }
+    .marketing .span4 {
+        margin-bottom: 40px;
+    }
+    .bs-docs-social {
+        margin: 0 -20px;
+    }
+
+    /* Space out the show-grid examples */
+    .show-grid [class*="span"] {
+        margin-bottom: 5px;
+    }
+
+    /* Sidenav */
+    .bs-docs-sidenav {
+        width: auto;
+        margin-bottom: 20px;
+    }
+    .bs-docs-sidenav.affix {
+        position: static;
+        width: auto;
+        top: 0;
+    }
+
+    /* Unfloat the back to top link in footer */
+    .footer {
+        margin-left: -20px;
+        margin-right: -20px;
+        padding-left: 20px;
+        padding-right: 20px;
+    }
+    .footer p {
+        margin-bottom: 9px;
+    }
+}
+
+/* Landscape phones
+------------------------- */
+@media (max-width: 480px) {
+    /* Remove padding above jumbotron */
+    body {
+        padding-top: 0;
+    }
+
+    /* Change up some type stuff */
+    h2 small {
+        display: block;
+    }
+
+    /* Downsize the jumbotrons */
+    .jumbotron h1 {
+        font-size: 45px;
+    }
+    .jumbotron p,
+    .jumbotron .btn {
+        font-size: 18px;
+    }
+    .jumbotron .btn {
+        display: block;
+        margin: 0 auto;
+    }
+
+    /* center align subhead text like the masthead */
+    .subhead h1,
+    .subhead p {
+        text-align: center;
+    }
+
+    /* Marketing on home */
+    .marketing h1 {
+        font-size: 30px;
+    }
+    .marketing-byline {
+        font-size: 18px;
+    }
+
+    /* Do our best to make tables work in narrow viewports */
+    table code {
+        white-space: normal;
+        word-wrap: break-word;
+        word-break: break-all;
+    }
+
+    /* Examples: dropdowns */
+    .bs-docs-example-submenus > .pull-left {
+        float: none;
+        clear: both;
+    }
+    .bs-docs-example-submenus > .pull-left,
+    .bs-docs-example-submenus > .pull-left + .pull-left {
+        margin-left: 0;
+    }
+    .bs-docs-example-submenus p {
+        margin-bottom: 0;
+    }
+    .bs-docs-example-submenus .dropup > .dropdown-menu,
+    .bs-docs-example-submenus .dropdown > .dropdown-menu {
+        margin-bottom: 10px;
+        float: none;
+        max-width: 180px;
+    }
+
+    /* Tighten up footer */
+    .footer {
+        padding-top: 20px;
+        padding-bottom: 20px;
+    }
+}
+
+#twitter-share{
+    padding-top:5px;
+}
+.docs-lead{margin-bottom:20px;font-size:15px;font-weight:200;line-height:30px;}
+
+/* Download */
+.download-btn:hover{
+    text-decoration: none;
+    color: #333333;
+}
+.download-btn.ui-button-primary:hover{
+    color: #FFFFFF;
+}
+/* Accordion */
+#menu-collapse{
+    margin-bottom:20px;
+}
+/*Dialog*/
+#dialog_link,#modal_link {
+    padding: .4em 1em .4em 20px;
+    text-decoration: none;
+    position: relative;
+}
+
+#dialog_link span.ui-icon, #modal_link span.ui-icon {
+    margin: 0 5px 0 0;
+    position: absolute;
+    left: .2em;
+    top: 50%;
+    margin-top: -8px;
+}
+
+ul#icons {
+    margin: 0;
+    padding: 0;
+}
+
+ul#icons li {
+    margin: 2px;
+    position: relative;
+    padding: 4px 0;
+    cursor: pointer;
+    float: left;
+    list-style: none;
+}
+
+ul#icons span.ui-icon {
+    float: left;
+    margin: 0 4px;
+}
+
+#buttons button {
+    float: left;
+    margin-right: 4px;
+}
+.dialog-button{
+    margin-bottom: 20px;
+}
+/*Tabs*/
+#tabs2 li .ui-icon-close {
+    float: left;
+    margin: 0.4em 0.2em 0 0;
+    cursor: pointer;
+}
+
+#add_tab {
+    cursor: pointer;
+}
+
+/*shadow*/
+.window-contain{
+    position: relative;
+    height: 200px;
+    padding:1% 4%;
+    overflow:hidden;
+}
+
+/*Toolbar*/
+#toolbar {
+    padding: 5px 0 5px 5px;
+}
+/*
+* Bug chrome with toolbar and bootstrap inheritance
+*/
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+    #toolbar input{display:block;float:left;}
+}
+/*Datepicker*/
+#datepicker{
+    margin-bottom: 20px;
+}
+/*slider*/
+#amount{
+    color:#f6931f; 
+    font-weight:bold;
+}
+#h-slider,#v-slider{
+    margin-bottom: 20px;
+}
+/*Autocomplete*/
+#tags{
+    margin-bottom: 20px;
+}
+
+/**
+* fix bug position button customfile
+*/
+.input-append.customfile, .input-prepend {
+    font-size: 0;
+    margin-bottom: 5px;
+    white-space: normal;
+}
+.input-append.customfile .add-on{
+    height:20px;
+    font-size:14px;
+    line-height:18px;
+    min-width: 70px;
+}
+/* Wijmo */
+#wijmo-container{
+    margin-bottom: 20px;
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/ico/apple-touch-icon-114-precomposed.png b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/ico/apple-touch-icon-114-precomposed.png
new file mode 100644
index 0000000..790a64f
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/ico/apple-touch-icon-114-precomposed.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/ico/apple-touch-icon-144-precomposed.png b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/ico/apple-touch-icon-144-precomposed.png
new file mode 100644
index 0000000..6d0e463
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/ico/apple-touch-icon-144-precomposed.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/ico/apple-touch-icon-57-precomposed.png b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/ico/apple-touch-icon-57-precomposed.png
new file mode 100644
index 0000000..4936cca
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/ico/apple-touch-icon-57-precomposed.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/ico/apple-touch-icon-72-precomposed.png b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/ico/apple-touch-icon-72-precomposed.png
new file mode 100644
index 0000000..b1165bd
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/ico/apple-touch-icon-72-precomposed.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/ico/favicon.ico b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/ico/favicon.ico
new file mode 100644
index 0000000..bb3ec2b
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/ico/favicon.ico differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/ico/favicon.png b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/ico/favicon.png
new file mode 100644
index 0000000..073c13c
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/ico/favicon.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/img/bs-docs-masthead-pattern.png b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/img/bs-docs-masthead-pattern.png
new file mode 100644
index 0000000..75c46a1
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/img/bs-docs-masthead-pattern.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/img/glyphicons-halflings-white.png b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/img/glyphicons-halflings-white.png
new file mode 100644
index 0000000..3bf6484
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/img/glyphicons-halflings-white.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/img/glyphicons-halflings.png b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/img/glyphicons-halflings.png
new file mode 100644
index 0000000..a996999
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/img/glyphicons-halflings.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/js/bootstrap.min.js b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/js/bootstrap.min.js
new file mode 100644
index 0000000..6d0f758
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/js/bootstrap.min.js
@@ -0,0 +1,7 @@
+/**
+* Bootstrap.js by @fat & @mdo
+* plugins: bootstrap-transition.js, bootstrap-modal.js, bootstrap-mDropdown.js, bootstrap-scrollspy.js, bootstrap-tab.js, bootstrap-affix.js, bootstrap-alert.js, bootstrap-collapse.js, bootstrap-carousel.js, bootstrap-typeahead.js
+* Copyright 2012 Twitter, Inc.
+* http://www.apache.org/licenses/LICENSE-2.0.txt
+*/
+!function(a){a(function(){a.support.transition=function(){var a=function(){var a=document.createElement("bootstrap"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"},c;for(c in b)if(a.style[c]!==undefined)return b[c]}();return a&&{end:a}}()})}(window.jQuery),!function(a){var b=function(b,c){this.options=c,this.$element=a(b).delegate('[data-dismiss="modal"]',"click.dismiss.modal",a.proxy(this.hide,this)),this.options.remote&&this.$element.find(".modal-body").load(this.options.remote)};b.prototype={constructor:b,toggle:function(){return this[this.isShown?"hide":"show"]()},show:function(){var b=this,c=a.Event("show");this.$element.trigger(c);if(this.isShown||c.isDefaultPrevented())return;this.isShown=!0,this.escape(),this.backdrop(function(){var c=a.support.transition&&b.$element.hasClass("fade");b.$element.parent().length||b.$element.appendTo(document.body),b.$element.show(),c&&b.$element[0].offsetWidth,b.$element.addClass("in").attr("aria-hidden",!1),b.enforceFocus(),c?b.$element.one(a.support.transition.end,function(){b.$element.focus().trigger("shown")}):b.$element.focus().trigger("shown")})},hide:function(b){b&&b.preventDefault();var c=this;b=a.Event("hide"),this.$element.trigger(b);if(!this.isShown||b.isDefaultPrevented())return;this.isShown=!1,this.escape(),a(document).off("focusin.modal"),this.$element.removeClass("in").attr("aria-hidden",!0),a.support.transition&&this.$element.hasClass("fade")?this.hideWithTransition():this.hideModal()},enforceFocus:function(){var b=this;a(document).on("focusin.modal",function(a){b.$element[0]!==a.target&&!b.$element.has(a.target).length&&b.$element.focus()})},escape:function(){var a=this;this.isShown&&this.options.keyboard?this.$element.on("keyup.dismiss.modal",function(b){b.which==27&&a.hide()}):this.isShown||this.$element.off("keyup.dismiss.modal")},hideWithTransition:function(){var b=this,c=setTimeout(function(){b.$element.off(a.support.transition.end),b.hideModal()},500);this.$element.one(a.support.transition.end,function(){clearTimeout(c),b.hideModal()})},hideModal:function(a){this.$element.hide().trigger("hidden"),this.backdrop()},removeBackdrop:function(){this.$backdrop.remove(),this.$backdrop=null},backdrop:function(b){var c=this,d=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var e=a.support.transition&&d;this.$backdrop=a('<div class="modal-backdrop '+d+'" />').appendTo(document.body),this.$backdrop.click(this.options.backdrop=="static"?a.proxy(this.$element[0].focus,this.$element[0]):a.proxy(this.hide,this)),e&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),e?this.$backdrop.one(a.support.transition.end,b):b()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),a.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(a.support.transition.end,a.proxy(this.removeBackdrop,this)):this.removeBackdrop()):b&&b()}};var c=a.fn.modal;a.fn.modal=function(c){return this.each(function(){var d=a(this),e=d.data("modal"),f=a.extend({},a.fn.modal.defaults,d.data(),typeof c=="object"&&c);e||d.data("modal",e=new b(this,f)),typeof c=="string"?e[c]():f.show&&e.show()})},a.fn.modal.defaults={backdrop:!0,keyboard:!0,show:!0},a.fn.modal.Constructor=b,a.fn.modal.noConflict=function(){return a.fn.modal=c,this},a(document).on("click.modal.data-api",'[data-toggle="modal"]',function(b){var c=a(this),d=c.attr("href"),e=a(c.attr("data-target")||d&&d.replace(/.*(?=#[^\s]+$)/,"")),f=e.data("modal")?"toggle":a.extend({remote:!/#/.test(d)&&d},e.data(),c.data());b.preventDefault(),e.modal(f).one("hide",function(){c.focus()})})}(window.jQuery),!function(a){function d(){a(b).each(function(){e(a(this)).removeClass("open")})}function e(b){var c=b.attr("data-target"),d;return c||(c=b.attr("href"),c=c&&/#/.test(c)&&c.replace(/.*(?=#[^\s]*$)/,"")),d=a(c),d.length||(d=b.parent()),d}var b="[data-toggle=dropdown]",c=function(b){var c=a(b).on("click.dropdown.data-api",this.toggle);a("html").on("click.dropdown.data-api",function(){c.parent().removeClass("open")})};c.prototype={constructor:c,toggle:function(b){var c=a(this),f,g;if(c.is(".disabled, :disabled"))return;return f=e(c),g=f.hasClass("open"),d(),g||f.toggleClass("open"),c.focus(),!1},keydown:function(b){var c,d,f,g,h,i;if(!/(38|40|27)/.test(b.keyCode))return;c=a(this),b.preventDefault(),b.stopPropagation();if(c.is(".disabled, :disabled"))return;g=e(c),h=g.hasClass("open");if(!h||h&&b.keyCode==27)return c.click();d=a("[role=menu] li:not(.divider):visible a",g);if(!d.length)return;i=d.index(d.filter(":focus")),b.keyCode==38&&i>0&&i--,b.keyCode==40&&i<d.length-1&&i++,~i||(i=0),d.eq(i).focus()}};var f=a.fn.dropdown;a.fn.dropdown=function(b){return this.each(function(){var d=a(this),e=d.data("dropdown");e||d.data("dropdown",e=new c(this)),typeof b=="string"&&e[b].call(d)})},a.fn.dropdown.Constructor=c,a.fn.dropdown.noConflict=function(){return a.fn.dropdown=f,this},a(document).on("click.dropdown.data-api touchstart.dropdown.data-api",d).on("click.dropdown touchstart.dropdown.data-api",".dropdown form",function(a){a.stopPropagation()}).on("touchstart.dropdown.data-api",".dropdown-menu",function(a){a.stopPropagation()}).on("click.dropdown.data-api touchstart.dropdown.data-api",b,c.prototype.toggle).on("keydown.dropdown.data-api touchstart.dropdown.data-api",b+", [role=menu]",c.prototype.keydown)}(window.jQuery),!function(a){function b(b,c){var d=a.proxy(this.process,this),e=a(b).is("body")?a(window):a(b),f;this.options=a.extend({},a.fn.scrollspy.defaults,c),this.$scrollElement=e.on("scroll.scroll-spy.data-api",d),this.selector=(this.options.target||(f=a(b).attr("href"))&&f.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.$body=a("body"),this.refresh(),this.process()}b.prototype={constructor:b,refresh:function(){var b=this,c;this.offsets=a([]),this.targets=a([]),c=this.$body.find(this.selector).map(function(){var c=a(this),d=c.data("target")||c.attr("href"),e=/^#\w/.test(d)&&a(d);return e&&e.length&&[[e.position().top+b.$scrollElement.scrollTop(),d]]||null}).sort(function(a,b){return a[0]-b[0]}).each(function(){b.offsets.push(this[0]),b.targets.push(this[1])})},process:function(){var a=this.$scrollElement.scrollTop()+this.options.offset,b=this.$scrollElement[0].scrollHeight||this.$body[0].scrollHeight,c=b-this.$scrollElement.height(),d=this.offsets,e=this.targets,f=this.activeTarget,g;if(a>=c)return f!=(g=e.last()[0])&&this.activate(g);for(g=d.length;g--;)f!=e[g]&&a>=d[g]&&(!d[g+1]||a<=d[g+1])&&this.activate(e[g])},activate:function(b){var c,d;this.activeTarget=b,a(this.selector).parent(".active").removeClass("active"),d=this.selector+'[data-target="'+b+'"],'+this.selector+'[href="'+b+'"]',c=a(d).parent("li").addClass("active"),c.parent(".dropdown-menu").length&&(c=c.closest("li.dropdown").addClass("active")),c.trigger("activate")}};var c=a.fn.scrollspy;a.fn.scrollspy=function(c){return this.each(function(){var d=a(this),e=d.data("scrollspy"),f=typeof c=="object"&&c;e||d.data("scrollspy",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.scrollspy.Constructor=b,a.fn.scrollspy.defaults={offset:10},a.fn.scrollspy.noConflict=function(){return a.fn.scrollspy=c,this},a(window).on("load",function(){a('[data-spy="scroll"]').each(function(){var b=a(this);b.scrollspy(b.data())})})}(window.jQuery),!function(a){var b=function(b){this.element=a(b)};b.prototype={constructor:b,show:function(){var b=this.element,c=b.closest("ul:not(.dropdown-menu)"),d=b.attr("data-target"),e,f,g;d||(d=b.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,""));if(b.parent("li").hasClass("active"))return;e=c.find(".active:last a")[0],g=a.Event("show",{relatedTarget:e}),b.trigger(g);if(g.isDefaultPrevented())return;f=a(d),this.activate(b.parent("li"),c),this.activate(f,f.parent(),function(){b.trigger({type:"shown",relatedTarget:e})})},activate:function(b,c,d){function g(){e.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),b.addClass("active"),f?(b[0].offsetWidth,b.addClass("in")):b.removeClass("fade"),b.parent(".dropdown-menu")&&b.closest("li.dropdown").addClass("active"),d&&d()}var e=c.find("> .active"),f=d&&a.support.transition&&e.hasClass("fade");f?e.one(a.support.transition.end,g):g(),e.removeClass("in")}};var c=a.fn.tab;a.fn.tab=function(c){return this.each(function(){var d=a(this),e=d.data("tab");e||d.data("tab",e=new b(this)),typeof c=="string"&&e[c]()})},a.fn.tab.Constructor=b,a.fn.tab.noConflict=function(){return a.fn.tab=c,this},a(document).on("click.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(b){b.preventDefault(),a(this).tab("show")})}(window.jQuery),!function(a){var b=function(b,c){this.options=a.extend({},a.fn.affix.defaults,c),this.$window=a(window).on("scroll.affix.data-api",a.proxy(this.checkPosition,this)).on("click.affix.data-api",a.proxy(function(){setTimeout(a.proxy(this.checkPosition,this),1)},this)),this.$element=a(b),this.checkPosition()};b.prototype.checkPosition=function(){if(!this.$element.is(":visible"))return;var b=a(document).height(),c=this.$window.scrollTop(),d=this.$element.offset(),e=this.options.offset,f=e.bottom,g=e.top,h="affix affix-top affix-bottom",i;typeof e!="object"&&(f=g=e),typeof g=="function"&&(g=e.top()),typeof f=="function"&&(f=e.bottom()),i=this.unpin!=null&&c+this.unpin<=d.top?!1:f!=null&&d.top+this.$element.height()>=b-f?"bottom":g!=null&&c<=g?"top":!1;if(this.affixed===i)return;this.affixed=i,this.unpin=i=="bottom"?d.top-c:null,this.$element.removeClass(h).addClass("affix"+(i?"-"+i:""))};var c=a.fn.affix;a.fn.affix=function(c){return this.each(function(){var d=a(this),e=d.data("affix"),f=typeof c=="object"&&c;e||d.data("affix",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.affix.Constructor=b,a.fn.affix.defaults={offset:0},a.fn.affix.noConflict=function(){return a.fn.affix=c,this},a(window).on("load",function(){a('[data-spy="affix"]').each(function(){var b=a(this),c=b.data();c.offset=c.offset||{},c.offsetBottom&&(c.offset.bottom=c.offsetBottom),c.offsetTop&&(c.offset.top=c.offsetTop),b.affix(c)})})}(window.jQuery),!function(a){var b='[data-dismiss="alert"]',c=function(c){a(c).on("click",b,this.close)};c.prototype.close=function(b){function f(){e.trigger("closed").remove()}var c=a(this),d=c.attr("data-target"),e;d||(d=c.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,"")),e=a(d),b&&b.preventDefault(),e.length||(e=c.hasClass("alert")?c:c.parent()),e.trigger(b=a.Event("close"));if(b.isDefaultPrevented())return;e.removeClass("in"),a.support.transition&&e.hasClass("fade")?e.on(a.support.transition.end,f):f()};var d=a.fn.alert;a.fn.alert=function(b){return this.each(function(){var d=a(this),e=d.data("alert");e||d.data("alert",e=new c(this)),typeof b=="string"&&e[b].call(d)})},a.fn.alert.Constructor=c,a.fn.alert.noConflict=function(){return a.fn.alert=d,this},a(document).on("click.alert.data-api",b,c.prototype.close)}(window.jQuery),!function(a){var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.collapse.defaults,c),this.options.parent&&(this.$parent=a(this.options.parent)),this.options.toggle&&this.toggle()};b.prototype={constructor:b,dimension:function(){var a=this.$element.hasClass("width");return a?"width":"height"},show:function(){var b,c,d,e;if(this.transitioning)return;b=this.dimension(),c=a.camelCase(["scroll",b].join("-")),d=this.$parent&&this.$parent.find("> .accordion-group > .in");if(d&&d.length){e=d.data("collapse");if(e&&e.transitioning)return;d.collapse("hide"),e||d.data("collapse",null)}this.$element[b](0),this.transition("addClass",a.Event("show"),"shown"),a.support.transition&&this.$element[b](this.$element[0][c])},hide:function(){var b;if(this.transitioning)return;b=this.dimension(),this.reset(this.$element[b]()),this.transition("removeClass",a.Event("hide"),"hidden"),this.$element[b](0)},reset:function(a){var b=this.dimension();return this.$element.removeClass("collapse")[b](a||"auto")[0].offsetWidth,this.$element[a!==null?"addClass":"removeClass"]("collapse"),this},transition:function(b,c,d){var e=this,f=function(){c.type=="show"&&e.reset(),e.transitioning=0,e.$element.trigger(d)};this.$element.trigger(c);if(c.isDefaultPrevented())return;this.transitioning=1,this.$element[b]("in"),a.support.transition&&this.$element.hasClass("collapse")?this.$element.one(a.support.transition.end,f):f()},toggle:function(){this[this.$element.hasClass("in")?"hide":"show"]()}};var c=a.fn.collapse;a.fn.collapse=function(c){return this.each(function(){var d=a(this),e=d.data("collapse"),f=typeof c=="object"&&c;e||d.data("collapse",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.collapse.defaults={toggle:!0},a.fn.collapse.Constructor=b,a.fn.collapse.noConflict=function(){return a.fn.collapse=c,this},a(document).on("click.collapse.data-api","[data-toggle=collapse]",function(b){var c=a(this),d,e=c.attr("data-target")||b.preventDefault()||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,""),f=a(e).data("collapse")?"toggle":c.data();c[a(e).hasClass("in")?"addClass":"removeClass"]("collapsed"),a(e).collapse(f)})}(window.jQuery),!function(a){var b=function(b,c){this.$element=a(b),this.options=c,this.options.pause=="hover"&&this.$element.on("mouseenter",a.proxy(this.pause,this)).on("mouseleave",a.proxy(this.cycle,this))};b.prototype={cycle:function(b){return b||(this.paused=!1),this.options.interval&&!this.paused&&(this.interval=setInterval(a.proxy(this.next,this),this.options.interval)),this},to:function(b){var c=this.$element.find(".item.active"),d=c.parent().children(),e=d.index(c),f=this;if(b>d.length-1||b<0)return;return this.sliding?this.$element.one("slid",function(){f.to(b)}):e==b?this.pause().cycle():this.slide(b>e?"next":"prev",a(d[b]))},pause:function(b){return b||(this.paused=!0),this.$element.find(".next, .prev").length&&a.support.transition.end&&(this.$element.trigger(a.support.transition.end),this.cycle()),clearInterval(this.interval),this.interval=null,this},next:function(){if(this.sliding)return;return this.slide("next")},prev:function(){if(this.sliding)return;return this.slide("prev")},slide:function(b,c){var d=this.$element.find(".item.active"),e=c||d[b](),f=this.interval,g=b=="next"?"left":"right",h=b=="next"?"first":"last",i=this,j;this.sliding=!0,f&&this.pause(),e=e.length?e:this.$element.find(".item")[h](),j=a.Event("slide",{relatedTarget:e[0]});if(e.hasClass("active"))return;if(a.support.transition&&this.$element.hasClass("slide")){this.$element.trigger(j);if(j.isDefaultPrevented())return;e.addClass(b),e[0].offsetWidth,d.addClass(g),e.addClass(g),this.$element.one(a.support.transition.end,function(){e.removeClass([b,g].join(" ")).addClass("active"),d.removeClass(["active",g].join(" ")),i.sliding=!1,setTimeout(function(){i.$element.trigger("slid")},0)})}else{this.$element.trigger(j);if(j.isDefaultPrevented())return;d.removeClass("active"),e.addClass("active"),this.sliding=!1,this.$element.trigger("slid")}return f&&this.cycle(),this}};var c=a.fn.carousel;a.fn.carousel=function(c){return this.each(function(){var d=a(this),e=d.data("carousel"),f=a.extend({},a.fn.carousel.defaults,typeof c=="object"&&c),g=typeof c=="string"?c:f.slide;e||d.data("carousel",e=new b(this,f)),typeof c=="number"?e.to(c):g?e[g]():f.interval&&e.cycle()})},a.fn.carousel.defaults={interval:5e3,pause:"hover"},a.fn.carousel.Constructor=b,a.fn.carousel.noConflict=function(){return a.fn.carousel=c,this},a(document).on("click.carousel.data-api","[data-slide]",function(b){var c=a(this),d,e=a(c.attr("data-target")||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,"")),f=a.extend({},e.data(),c.data());e.carousel(f),b.preventDefault()})}(window.jQuery),!function(a){var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.typeahead.defaults,c),this.matcher=this.options.matcher||this.matcher,this.sorter=this.options.sorter||this.sorter,this.highlighter=this.options.highlighter||this.highlighter,this.updater=this.options.updater||this.updater,this.source=this.options.source,this.$menu=a(this.options.menu),this.shown=!1,this.listen()};b.prototype={constructor:b,select:function(){var a=this.$menu.find(".active").attr("data-value");return this.$element.val(this.updater(a)).change(),this.hide()},updater:function(a){return a},show:function(){var b=a.extend({},this.$element.position(),{height:this.$element[0].offsetHeight});return this.$menu.insertAfter(this.$element).css({top:b.top+b.height,left:b.left}).show(),this.shown=!0,this},hide:function(){return this.$menu.hide(),this.shown=!1,this},lookup:function(b){var c;return this.query=this.$element.val(),!this.query||this.query.length<this.options.minLength?this.shown?this.hide():this:(c=a.isFunction(this.source)?this.source(this.query,a.proxy(this.process,this)):this.source,c?this.process(c):this)},process:function(b){var c=this;return b=a.grep(b,function(a){return c.matcher(a)}),b=this.sorter(b),b.length?this.render(b.slice(0,this.options.items)).show():this.shown?this.hide():this},matcher:function(a){return~a.toLowerCase().indexOf(this.query.toLowerCase())},sorter:function(a){var b=[],c=[],d=[],e;while(e=a.shift())e.toLowerCase().indexOf(this.query.toLowerCase())?~e.indexOf(this.query)?c.push(e):d.push(e):b.push(e);return b.concat(c,d)},highlighter:function(a){var b=this.query.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&");return a.replace(new RegExp("("+b+")","ig"),function(a,b){return"<strong>"+b+"</strong>"})},render:function(b){var c=this;return b=a(b).map(function(b,d){return b=a(c.options.item).attr("data-value",d),b.find("a").html(c.highlighter(d)),b[0]}),b.first().addClass("active"),this.$menu.html(b),this},next:function(b){var c=this.$menu.find(".active").removeClass("active"),d=c.next();d.length||(d=a(this.$menu.find("li")[0])),d.addClass("active")},prev:function(a){var b=this.$menu.find(".active").removeClass("active"),c=b.prev();c.length||(c=this.$menu.find("li").last()),c.addClass("active")},listen:function(){this.$element.on("blur",a.proxy(this.blur,this)).on("keypress",a.proxy(this.keypress,this)).on("keyup",a.proxy(this.keyup,this)),this.eventSupported("keydown")&&this.$element.on("keydown",a.proxy(this.keydown,this)),this.$menu.on("click",a.proxy(this.click,this)).on("mouseenter","li",a.proxy(this.mouseenter,this))},eventSupported:function(a){var b=a in this.$element;return b||(this.$element.setAttribute(a,"return;"),b=typeof this.$element[a]=="function"),b},move:function(a){if(!this.shown)return;switch(a.keyCode){case 9:case 13:case 27:a.preventDefault();break;case 38:a.preventDefault(),this.prev();break;case 40:a.preventDefault(),this.next()}a.stopPropagation()},keydown:function(b){this.suppressKeyPressRepeat=~a.inArray(b.keyCode,[40,38,9,13,27]),this.move(b)},keypress:function(a){if(this.suppressKeyPressRepeat)return;this.move(a)},keyup:function(a){switch(a.keyCode){case 40:case 38:case 16:case 17:case 18:break;case 9:case 13:if(!this.shown)return;this.select();break;case 27:if(!this.shown)return;this.hide();break;default:this.lookup()}a.stopPropagation(),a.preventDefault()},blur:function(a){var b=this;setTimeout(function(){b.hide()},150)},click:function(a){a.stopPropagation(),a.preventDefault(),this.select()},mouseenter:function(b){this.$menu.find(".active").removeClass("active"),a(b.currentTarget).addClass("active")}};var c=a.fn.typeahead;a.fn.typeahead=function(c){return this.each(function(){var d=a(this),e=d.data("typeahead"),f=typeof c=="object"&&c;e||d.data("typeahead",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.typeahead.defaults={source:[],items:8,menu:'<ul class="typeahead dropdown-menu"></ul>',item:'<li><a href="#"></a></li>',minLength:1},a.fn.typeahead.Constructor=b,a.fn.typeahead.noConflict=function(){return a.fn.typeahead=c,this},a(document).on("focus.typeahead.data-api",'[data-provide="typeahead"]',function(b){var c=a(this);if(c.data("typeahead"))return;b.preventDefault(),c.typeahead(c.data())})}(window.jQuery)
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/js/demo.js b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/js/demo.js
new file mode 100644
index 0000000..ea72355
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/js/demo.js
@@ -0,0 +1,239 @@
+$(function () {
+    //####### Buttons
+    $('button,.button,#sampleButton').button();
+
+    // Buttonset
+    $('#radioset').buttonset();
+    $("#format").buttonset();
+
+    //####### Toolbar
+    $("#play, #shuffle").button();
+    $("#repeat").buttonset();
+
+    //####### Accordion
+    $("#menu-collapse").accordion({
+        header: "h3"
+    });
+
+    // Dialog Link
+    $('#dialog_link').click(function () {
+        $('#dialog_simple').dialog('open');
+        return false;
+    });
+
+    // Modal Link
+    $('#modal_link').click(function () {
+        $('#dialog-message').dialog('open');
+        return false;
+    });
+    //hover states on the static widgets
+    $('#dialog_link, #modal_link, ul#icons li').hover(
+        function () {
+            $(this).addClass('ui-state-hover');
+        }, function () {
+            $(this).removeClass('ui-state-hover');
+        }
+    );
+
+    // Dialog Simple
+    $('#dialog_simple').dialog({
+        autoOpen: false,
+        width: 600,
+        buttons: {
+            "Ok": function () {
+                $(this).dialog("close");
+            },
+            "Cancel": function () {
+                $(this).dialog("close");
+            }
+        }
+    });
+
+    //####### Dialogs
+    $("#dialog-message").dialog({
+        autoOpen: false,
+        modal: true,
+        buttons: {
+            Ok: function () {
+                $(this).dialog("close");
+            }
+        }
+    });
+
+    // Remove focus from buttons
+    $('.ui-dialog :button').blur();
+
+    //####### Tabs
+    $('#tabs2, #tabs, #tabs3').tabs();
+
+    // Dynamic tabs
+    var tabTitle = $( "#tab_title" ),
+        tabContent = $( "#tab_content" ),
+        tabTemplate = "<li><a href='#{href}'>#{label}</a> <span class='ui-icon ui-icon-close'>Remove Tab</span></li>",
+        tabCounter = 2;
+
+    var tabs = $( "#tabs2" ).tabs();
+
+    // modal dialog init: custom buttons and a "close" callback reseting the form inside
+    var dialog = $( "#dialog2" ).dialog({
+        autoOpen: false,
+        modal: true,
+        buttons: {
+            Add: function() {
+                addTab();
+                $( this ).dialog( "close" );
+            },
+            Cancel: function() {
+                $( this ).dialog( "close" );
+            }
+        },
+        close: function() {
+            form[ 0 ].reset();
+        }
+    });
+
+    // addTab form: calls addTab function on submit and closes the dialog
+    var form = dialog.find( "form" ).submit(function( event ) {
+        addTab();
+        dialog.dialog( "close" );
+        event.preventDefault();
+    });
+
+    // actual addTab function: adds new tab using the input from the form above
+    function addTab() {
+        var label = tabTitle.val() || "Tab " + tabCounter,
+            id = "tabs-" + tabCounter,
+            li = $( tabTemplate.replace( /#\{href\}/g, "#" + id ).replace( /#\{label\}/g, label ) ),
+            tabContentHtml = tabContent.val() || "Tab " + tabCounter + " content.";
+
+        tabs.find( ".ui-tabs-nav" ).append( li );
+        tabs.append( "<div id='" + id + "'><p>" + tabContentHtml + "</p></div>" );
+        tabs.tabs( "refresh" );
+        tabCounter++;
+    }
+
+    // addTab button: just opens the dialog
+    $( "#add_tab" )
+        .button()
+        .click(function() {
+            dialog.dialog( "open" );
+        });
+
+    // close icon: removing the tab on click
+    $( "#tabs2" ).on( "click",'span.ui-icon-close', function() {
+
+        var panelId = $( this ).closest( "li" ).remove().attr( "aria-controls" );
+        $( "#" + panelId ).remove();
+        tabs.tabs( "refresh" );
+    });
+
+    //Combination examples (tabs) and open dialog
+    $('#sampleButton').on('click', function(event){
+        event.preventDefault();
+        $('#dialog_simple').dialog({
+            autoOpen: true,
+            modal: true,
+            width: 600,
+            buttons: {
+                "Save": function () {
+                    $(this).dialog("close");
+                },
+                "Cancel": function () {
+                    $(this).dialog("close");
+                }
+            }
+        });
+    });
+
+    //####### Datepicker
+    $('#datepicker').datepicker({
+        inline: true
+    });
+
+    //####### Slider
+
+    // Horizontal slider
+    $('#h-slider').slider({
+        range: true,
+        values: [17, 67]
+    });
+
+    // Vertical slider
+    $("#v-slider").slider({
+        orientation: "vertical",
+        range: "min",
+        min: 0,
+        max: 100,
+        value: 60,
+        slide: function (event, ui) {
+            $("#amount").val(ui.value);
+        }
+    });
+    $("#amount").val($("#v-slider").slider("value"));
+
+    // Autocomplete
+    var availableTags = ["ActionScript", "AppleScript", "Asp", "BASIC", "C", "C++", "Clojure", "COBOL", "ColdFusion", "Erlang", "Fortran", "Groovy", "Haskell", "Java", "JavaScript", "Lisp", "Perl", "PHP", "Python", "Ruby", "Scala", "Scheme"];
+
+    $("#tags").autocomplete({
+        source: availableTags
+    });
+
+    //####### Menu
+    $("#menu").menu();
+
+    //####### Spinner
+
+    var spinner = $( "#spinner" ).spinner();
+
+    $( "#disable" ).click(function() {
+        if ( spinner.spinner( "option", "disabled" ) ) {
+            spinner.spinner( "enable" );
+        } else {
+            spinner.spinner( "disable" );
+        }
+    });
+    $( "#destroy" ).click(function() {
+        if ( spinner.data( "ui-spinner" ) ) {
+            spinner.spinner( "destroy" );
+        } else {
+            spinner.spinner();
+        }
+    });
+    $( "#getvalue" ).click(function() {
+        alert( spinner.spinner( "value" ) );
+    });
+    $( "#setvalue" ).click(function() {
+        spinner.spinner( "value", 5 );
+    });
+
+    //####### Tooltip
+
+    $( "#tooltip" ).tooltip();
+
+    // File input (using http://filamentgroup.com/lab/jquery_custom_file_input_book_designing_with_progressive_enhancement/)
+    $('#file').customFileInput({
+        button_position : 'right'
+    });
+
+    //####### Wijmo
+
+    $("#menu1").wijmenu({ trigger: ".wijmo-wijmenu-item", triggerEvent: "click" });
+
+    // Select a Date Range with datepicker
+    $( "#rangeBa" ).datepicker({
+        defaultDate: "+1w",
+        changeMonth: true,
+        numberOfMonths: 3,
+        onClose: function( selectedDate ) {
+            $( "#rangeBb" ).datepicker( "option", "minDate", selectedDate );
+        }
+    });
+    $( "#rangeBb" ).datepicker({
+        defaultDate: "+1w",
+        changeMonth: true,
+        numberOfMonths: 3,
+        onClose: function( selectedDate ) {
+            $( "#rangeBa" ).datepicker( "option", "maxDate", selectedDate );
+        }
+    });
+});
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/js/docs.js b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/js/docs.js
new file mode 100644
index 0000000..709ca6e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/js/docs.js
@@ -0,0 +1,30 @@
+// NOTICE!! DO NOT USE ANY OF THIS JAVASCRIPT
+// IT'S ALL JUST JUNK FOR OUR DOCS!
+// ++++++++++++++++++++++++++++++++++++++++++
+
+!function ($) {
+
+    $(function(){
+
+        var $window = $(window);
+
+        // Disable certain links in docs
+        $('section [href^=#]').click(function (e) {
+            e.preventDefault()
+        });
+
+        // side bar
+        $('.bs-docs-sidenav').affix({
+            offset: {
+                top: function () { return $window.width() <= 980 ? 290 : 210 }
+                , bottom: 270
+            }
+        });
+        // Buttons download
+        $('.download-btn').button();
+
+        // make code pretty
+        window.prettyPrint && prettyPrint();
+
+    })
+}(window.jQuery);
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/js/google-code-prettify/prettify.css b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/js/google-code-prettify/prettify.css
new file mode 100644
index 0000000..d437aff
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/js/google-code-prettify/prettify.css
@@ -0,0 +1,30 @@
+.com { color: #93a1a1; }
+.lit { color: #195f91; }
+.pun, .opn, .clo { color: #93a1a1; }
+.fun { color: #dc322f; }
+.str, .atv { color: #D14; }
+.kwd, .prettyprint .tag { color: #1e347b; }
+.typ, .atn, .dec, .var { color: teal; }
+.pln { color: #48484c; }
+
+.prettyprint {
+  padding: 8px;
+  background-color: #f7f7f9;
+  border: 1px solid #e1e1e8;
+}
+.prettyprint.linenums {
+  -webkit-box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0;
+     -moz-box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0;
+          box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0;
+}
+
+/* Specify class=linenums on a pre to get line numbering */
+ol.linenums {
+  margin: 0 0 0 33px; /* IE indents via margin-left */
+}
+ol.linenums li {
+  padding-left: 12px;
+  color: #bebec5;
+  line-height: 20px;
+  text-shadow: 0 1px 0 #fff;
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/js/google-code-prettify/prettify.js b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/js/google-code-prettify/prettify.js
new file mode 100644
index 0000000..eef5ad7
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/js/google-code-prettify/prettify.js
@@ -0,0 +1,28 @@
+var q=null;window.PR_SHOULD_USE_CONTINUATION=!0;
+(function(){function L(a){function m(a){var f=a.charCodeAt(0);if(f!==92)return f;var b=a.charAt(1);return(f=r[b])?f:"0"<=b&&b<="7"?parseInt(a.substring(1),8):b==="u"||b==="x"?parseInt(a.substring(2),16):a.charCodeAt(1)}function e(a){if(a<32)return(a<16?"\\x0":"\\x")+a.toString(16);a=String.fromCharCode(a);if(a==="\\"||a==="-"||a==="["||a==="]")a="\\"+a;return a}function h(a){for(var f=a.substring(1,a.length-1).match(/\\u[\dA-Fa-f]{4}|\\x[\dA-Fa-f]{2}|\\[0-3][0-7]{0,2}|\\[0-7]{1,2}|\\[\S\s]|[^\\]/g),a=
+[],b=[],o=f[0]==="^",c=o?1:0,i=f.length;c<i;++c){var j=f[c];if(/\\[bdsw]/i.test(j))a.push(j);else{var j=m(j),d;c+2<i&&"-"===f[c+1]?(d=m(f[c+2]),c+=2):d=j;b.push([j,d]);d<65||j>122||(d<65||j>90||b.push([Math.max(65,j)|32,Math.min(d,90)|32]),d<97||j>122||b.push([Math.max(97,j)&-33,Math.min(d,122)&-33]))}}b.sort(function(a,f){return a[0]-f[0]||f[1]-a[1]});f=[];j=[NaN,NaN];for(c=0;c<b.length;++c)i=b[c],i[0]<=j[1]+1?j[1]=Math.max(j[1],i[1]):f.push(j=i);b=["["];o&&b.push("^");b.push.apply(b,a);for(c=0;c<
+f.length;++c)i=f[c],b.push(e(i[0])),i[1]>i[0]&&(i[1]+1>i[0]&&b.push("-"),b.push(e(i[1])));b.push("]");return b.join("")}function y(a){for(var f=a.source.match(/\[(?:[^\\\]]|\\[\S\s])*]|\\u[\dA-Fa-f]{4}|\\x[\dA-Fa-f]{2}|\\\d+|\\[^\dux]|\(\?[!:=]|[()^]|[^()[\\^]+/g),b=f.length,d=[],c=0,i=0;c<b;++c){var j=f[c];j==="("?++i:"\\"===j.charAt(0)&&(j=+j.substring(1))&&j<=i&&(d[j]=-1)}for(c=1;c<d.length;++c)-1===d[c]&&(d[c]=++t);for(i=c=0;c<b;++c)j=f[c],j==="("?(++i,d[i]===void 0&&(f[c]="(?:")):"\\"===j.charAt(0)&&
+(j=+j.substring(1))&&j<=i&&(f[c]="\\"+d[i]);for(i=c=0;c<b;++c)"^"===f[c]&&"^"!==f[c+1]&&(f[c]="");if(a.ignoreCase&&s)for(c=0;c<b;++c)j=f[c],a=j.charAt(0),j.length>=2&&a==="["?f[c]=h(j):a!=="\\"&&(f[c]=j.replace(/[A-Za-z]/g,function(a){a=a.charCodeAt(0);return"["+String.fromCharCode(a&-33,a|32)+"]"}));return f.join("")}for(var t=0,s=!1,l=!1,p=0,d=a.length;p<d;++p){var g=a[p];if(g.ignoreCase)l=!0;else if(/[a-z]/i.test(g.source.replace(/\\u[\da-f]{4}|\\x[\da-f]{2}|\\[^UXux]/gi,""))){s=!0;l=!1;break}}for(var r=
+{b:8,t:9,n:10,v:11,f:12,r:13},n=[],p=0,d=a.length;p<d;++p){g=a[p];if(g.global||g.multiline)throw Error(""+g);n.push("(?:"+y(g)+")")}return RegExp(n.join("|"),l?"gi":"g")}function M(a){function m(a){switch(a.nodeType){case 1:if(e.test(a.className))break;for(var g=a.firstChild;g;g=g.nextSibling)m(g);g=a.nodeName;if("BR"===g||"LI"===g)h[s]="\n",t[s<<1]=y++,t[s++<<1|1]=a;break;case 3:case 4:g=a.nodeValue,g.length&&(g=p?g.replace(/\r\n?/g,"\n"):g.replace(/[\t\n\r ]+/g," "),h[s]=g,t[s<<1]=y,y+=g.length,
+t[s++<<1|1]=a)}}var e=/(?:^|\s)nocode(?:\s|$)/,h=[],y=0,t=[],s=0,l;a.currentStyle?l=a.currentStyle.whiteSpace:window.getComputedStyle&&(l=document.defaultView.getComputedStyle(a,q).getPropertyValue("white-space"));var p=l&&"pre"===l.substring(0,3);m(a);return{a:h.join("").replace(/\n$/,""),c:t}}function B(a,m,e,h){m&&(a={a:m,d:a},e(a),h.push.apply(h,a.e))}function x(a,m){function e(a){for(var l=a.d,p=[l,"pln"],d=0,g=a.a.match(y)||[],r={},n=0,z=g.length;n<z;++n){var f=g[n],b=r[f],o=void 0,c;if(typeof b===
+"string")c=!1;else{var i=h[f.charAt(0)];if(i)o=f.match(i[1]),b=i[0];else{for(c=0;c<t;++c)if(i=m[c],o=f.match(i[1])){b=i[0];break}o||(b="pln")}if((c=b.length>=5&&"lang-"===b.substring(0,5))&&!(o&&typeof o[1]==="string"))c=!1,b="src";c||(r[f]=b)}i=d;d+=f.length;if(c){c=o[1];var j=f.indexOf(c),k=j+c.length;o[2]&&(k=f.length-o[2].length,j=k-c.length);b=b.substring(5);B(l+i,f.substring(0,j),e,p);B(l+i+j,c,C(b,c),p);B(l+i+k,f.substring(k),e,p)}else p.push(l+i,b)}a.e=p}var h={},y;(function(){for(var e=a.concat(m),
+l=[],p={},d=0,g=e.length;d<g;++d){var r=e[d],n=r[3];if(n)for(var k=n.length;--k>=0;)h[n.charAt(k)]=r;r=r[1];n=""+r;p.hasOwnProperty(n)||(l.push(r),p[n]=q)}l.push(/[\S\s]/);y=L(l)})();var t=m.length;return e}function u(a){var m=[],e=[];a.tripleQuotedStrings?m.push(["str",/^(?:'''(?:[^'\\]|\\[\S\s]|''?(?=[^']))*(?:'''|$)|"""(?:[^"\\]|\\[\S\s]|""?(?=[^"]))*(?:"""|$)|'(?:[^'\\]|\\[\S\s])*(?:'|$)|"(?:[^"\\]|\\[\S\s])*(?:"|$))/,q,"'\""]):a.multiLineStrings?m.push(["str",/^(?:'(?:[^'\\]|\\[\S\s])*(?:'|$)|"(?:[^"\\]|\\[\S\s])*(?:"|$)|`(?:[^\\`]|\\[\S\s])*(?:`|$))/,
+q,"'\"`"]):m.push(["str",/^(?:'(?:[^\n\r'\\]|\\.)*(?:'|$)|"(?:[^\n\r"\\]|\\.)*(?:"|$))/,q,"\"'"]);a.verbatimStrings&&e.push(["str",/^@"(?:[^"]|"")*(?:"|$)/,q]);var h=a.hashComments;h&&(a.cStyleComments?(h>1?m.push(["com",/^#(?:##(?:[^#]|#(?!##))*(?:###|$)|.*)/,q,"#"]):m.push(["com",/^#(?:(?:define|elif|else|endif|error|ifdef|include|ifndef|line|pragma|undef|warning)\b|[^\n\r]*)/,q,"#"]),e.push(["str",/^<(?:(?:(?:\.\.\/)*|\/?)(?:[\w-]+(?:\/[\w-]+)+)?[\w-]+\.h|[a-z]\w*)>/,q])):m.push(["com",/^#[^\n\r]*/,
+q,"#"]));a.cStyleComments&&(e.push(["com",/^\/\/[^\n\r]*/,q]),e.push(["com",/^\/\*[\S\s]*?(?:\*\/|$)/,q]));a.regexLiterals&&e.push(["lang-regex",/^(?:^^\.?|[!+-]|!=|!==|#|%|%=|&|&&|&&=|&=|\(|\*|\*=|\+=|,|-=|->|\/|\/=|:|::|;|<|<<|<<=|<=|=|==|===|>|>=|>>|>>=|>>>|>>>=|[?@[^]|\^=|\^\^|\^\^=|{|\||\|=|\|\||\|\|=|~|break|case|continue|delete|do|else|finally|instanceof|return|throw|try|typeof)\s*(\/(?=[^*/])(?:[^/[\\]|\\[\S\s]|\[(?:[^\\\]]|\\[\S\s])*(?:]|$))+\/)/]);(h=a.types)&&e.push(["typ",h]);a=(""+a.keywords).replace(/^ | $/g,
+"");a.length&&e.push(["kwd",RegExp("^(?:"+a.replace(/[\s,]+/g,"|")+")\\b"),q]);m.push(["pln",/^\s+/,q," \r\n\t\xa0"]);e.push(["lit",/^@[$_a-z][\w$@]*/i,q],["typ",/^(?:[@_]?[A-Z]+[a-z][\w$@]*|\w+_t\b)/,q],["pln",/^[$_a-z][\w$@]*/i,q],["lit",/^(?:0x[\da-f]+|(?:\d(?:_\d+)*\d*(?:\.\d*)?|\.\d\+)(?:e[+-]?\d+)?)[a-z]*/i,q,"0123456789"],["pln",/^\\[\S\s]?/,q],["pun",/^.[^\s\w"-$'./@\\`]*/,q]);return x(m,e)}function D(a,m){function e(a){switch(a.nodeType){case 1:if(k.test(a.className))break;if("BR"===a.nodeName)h(a),
+a.parentNode&&a.parentNode.removeChild(a);else for(a=a.firstChild;a;a=a.nextSibling)e(a);break;case 3:case 4:if(p){var b=a.nodeValue,d=b.match(t);if(d){var c=b.substring(0,d.index);a.nodeValue=c;(b=b.substring(d.index+d[0].length))&&a.parentNode.insertBefore(s.createTextNode(b),a.nextSibling);h(a);c||a.parentNode.removeChild(a)}}}}function h(a){function b(a,d){var e=d?a.cloneNode(!1):a,f=a.parentNode;if(f){var f=b(f,1),g=a.nextSibling;f.appendChild(e);for(var h=g;h;h=g)g=h.nextSibling,f.appendChild(h)}return e}
+for(;!a.nextSibling;)if(a=a.parentNode,!a)return;for(var a=b(a.nextSibling,0),e;(e=a.parentNode)&&e.nodeType===1;)a=e;d.push(a)}var k=/(?:^|\s)nocode(?:\s|$)/,t=/\r\n?|\n/,s=a.ownerDocument,l;a.currentStyle?l=a.currentStyle.whiteSpace:window.getComputedStyle&&(l=s.defaultView.getComputedStyle(a,q).getPropertyValue("white-space"));var p=l&&"pre"===l.substring(0,3);for(l=s.createElement("LI");a.firstChild;)l.appendChild(a.firstChild);for(var d=[l],g=0;g<d.length;++g)e(d[g]);m===(m|0)&&d[0].setAttribute("value",
+m);var r=s.createElement("OL");r.className="linenums";for(var n=Math.max(0,m-1|0)||0,g=0,z=d.length;g<z;++g)l=d[g],l.className="L"+(g+n)%10,l.firstChild||l.appendChild(s.createTextNode("\xa0")),r.appendChild(l);a.appendChild(r)}function k(a,m){for(var e=m.length;--e>=0;){var h=m[e];A.hasOwnProperty(h)?window.console&&console.warn("cannot override language handler %s",h):A[h]=a}}function C(a,m){if(!a||!A.hasOwnProperty(a))a=/^\s*</.test(m)?"default-markup":"default-code";return A[a]}function E(a){var m=
+a.g;try{var e=M(a.h),h=e.a;a.a=h;a.c=e.c;a.d=0;C(m,h)(a);var k=/\bMSIE\b/.test(navigator.userAgent),m=/\n/g,t=a.a,s=t.length,e=0,l=a.c,p=l.length,h=0,d=a.e,g=d.length,a=0;d[g]=s;var r,n;for(n=r=0;n<g;)d[n]!==d[n+2]?(d[r++]=d[n++],d[r++]=d[n++]):n+=2;g=r;for(n=r=0;n<g;){for(var z=d[n],f=d[n+1],b=n+2;b+2<=g&&d[b+1]===f;)b+=2;d[r++]=z;d[r++]=f;n=b}for(d.length=r;h<p;){var o=l[h+2]||s,c=d[a+2]||s,b=Math.min(o,c),i=l[h+1],j;if(i.nodeType!==1&&(j=t.substring(e,b))){k&&(j=j.replace(m,"\r"));i.nodeValue=
+j;var u=i.ownerDocument,v=u.createElement("SPAN");v.className=d[a+1];var x=i.parentNode;x.replaceChild(v,i);v.appendChild(i);e<o&&(l[h+1]=i=u.createTextNode(t.substring(b,o)),x.insertBefore(i,v.nextSibling))}e=b;e>=o&&(h+=2);e>=c&&(a+=2)}}catch(w){"console"in window&&console.log(w&&w.stack?w.stack:w)}}var v=["break,continue,do,else,for,if,return,while"],w=[[v,"auto,case,char,const,default,double,enum,extern,float,goto,int,long,register,short,signed,sizeof,static,struct,switch,typedef,union,unsigned,void,volatile"],
+"catch,class,delete,false,import,new,operator,private,protected,public,this,throw,true,try,typeof"],F=[w,"alignof,align_union,asm,axiom,bool,concept,concept_map,const_cast,constexpr,decltype,dynamic_cast,explicit,export,friend,inline,late_check,mutable,namespace,nullptr,reinterpret_cast,static_assert,static_cast,template,typeid,typename,using,virtual,where"],G=[w,"abstract,boolean,byte,extends,final,finally,implements,import,instanceof,null,native,package,strictfp,super,synchronized,throws,transient"],
+H=[G,"as,base,by,checked,decimal,delegate,descending,dynamic,event,fixed,foreach,from,group,implicit,in,interface,internal,into,is,lock,object,out,override,orderby,params,partial,readonly,ref,sbyte,sealed,stackalloc,string,select,uint,ulong,unchecked,unsafe,ushort,var"],w=[w,"debugger,eval,export,function,get,null,set,undefined,var,with,Infinity,NaN"],I=[v,"and,as,assert,class,def,del,elif,except,exec,finally,from,global,import,in,is,lambda,nonlocal,not,or,pass,print,raise,try,with,yield,False,True,None"],
+J=[v,"alias,and,begin,case,class,def,defined,elsif,end,ensure,false,in,module,next,nil,not,or,redo,rescue,retry,self,super,then,true,undef,unless,until,when,yield,BEGIN,END"],v=[v,"case,done,elif,esac,eval,fi,function,in,local,set,then,until"],K=/^(DIR|FILE|vector|(de|priority_)?queue|list|stack|(const_)?iterator|(multi)?(set|map)|bitset|u?(int|float)\d*)/,N=/\S/,O=u({keywords:[F,H,w,"caller,delete,die,do,dump,elsif,eval,exit,foreach,for,goto,if,import,last,local,my,next,no,our,print,package,redo,require,sub,undef,unless,until,use,wantarray,while,BEGIN,END"+
+I,J,v],hashComments:!0,cStyleComments:!0,multiLineStrings:!0,regexLiterals:!0}),A={};k(O,["default-code"]);k(x([],[["pln",/^[^<?]+/],["dec",/^<!\w[^>]*(?:>|$)/],["com",/^<\!--[\S\s]*?(?:--\>|$)/],["lang-",/^<\?([\S\s]+?)(?:\?>|$)/],["lang-",/^<%([\S\s]+?)(?:%>|$)/],["pun",/^(?:<[%?]|[%?]>)/],["lang-",/^<xmp\b[^>]*>([\S\s]+?)<\/xmp\b[^>]*>/i],["lang-js",/^<script\b[^>]*>([\S\s]*?)(<\/script\b[^>]*>)/i],["lang-css",/^<style\b[^>]*>([\S\s]*?)(<\/style\b[^>]*>)/i],["lang-in.tag",/^(<\/?[a-z][^<>]*>)/i]]),
+["default-markup","htm","html","mxml","xhtml","xml","xsl"]);k(x([["pln",/^\s+/,q," \t\r\n"],["atv",/^(?:"[^"]*"?|'[^']*'?)/,q,"\"'"]],[["tag",/^^<\/?[a-z](?:[\w-.:]*\w)?|\/?>$/i],["atn",/^(?!style[\s=]|on)[a-z](?:[\w:-]*\w)?/i],["lang-uq.val",/^=\s*([^\s"'>]*(?:[^\s"'/>]|\/(?=\s)))/],["pun",/^[/<->]+/],["lang-js",/^on\w+\s*=\s*"([^"]+)"/i],["lang-js",/^on\w+\s*=\s*'([^']+)'/i],["lang-js",/^on\w+\s*=\s*([^\s"'>]+)/i],["lang-css",/^style\s*=\s*"([^"]+)"/i],["lang-css",/^style\s*=\s*'([^']+)'/i],["lang-css",
+/^style\s*=\s*([^\s"'>]+)/i]]),["in.tag"]);k(x([],[["atv",/^[\S\s]+/]]),["uq.val"]);k(u({keywords:F,hashComments:!0,cStyleComments:!0,types:K}),["c","cc","cpp","cxx","cyc","m"]);k(u({keywords:"null,true,false"}),["json"]);k(u({keywords:H,hashComments:!0,cStyleComments:!0,verbatimStrings:!0,types:K}),["cs"]);k(u({keywords:G,cStyleComments:!0}),["java"]);k(u({keywords:v,hashComments:!0,multiLineStrings:!0}),["bsh","csh","sh"]);k(u({keywords:I,hashComments:!0,multiLineStrings:!0,tripleQuotedStrings:!0}),
+["cv","py"]);k(u({keywords:"caller,delete,die,do,dump,elsif,eval,exit,foreach,for,goto,if,import,last,local,my,next,no,our,print,package,redo,require,sub,undef,unless,until,use,wantarray,while,BEGIN,END",hashComments:!0,multiLineStrings:!0,regexLiterals:!0}),["perl","pl","pm"]);k(u({keywords:J,hashComments:!0,multiLineStrings:!0,regexLiterals:!0}),["rb"]);k(u({keywords:w,cStyleComments:!0,regexLiterals:!0}),["js"]);k(u({keywords:"all,and,by,catch,class,else,extends,false,finally,for,if,in,is,isnt,loop,new,no,not,null,of,off,on,or,return,super,then,true,try,unless,until,when,while,yes",
+hashComments:3,cStyleComments:!0,multilineStrings:!0,tripleQuotedStrings:!0,regexLiterals:!0}),["coffee"]);k(x([],[["str",/^[\S\s]+/]]),["regex"]);window.prettyPrintOne=function(a,m,e){var h=document.createElement("PRE");h.innerHTML=a;e&&D(h,e);E({g:m,i:e,h:h});return h.innerHTML};window.prettyPrint=function(a){function m(){for(var e=window.PR_SHOULD_USE_CONTINUATION?l.now()+250:Infinity;p<h.length&&l.now()<e;p++){var n=h[p],k=n.className;if(k.indexOf("prettyprint")>=0){var k=k.match(g),f,b;if(b=
+!k){b=n;for(var o=void 0,c=b.firstChild;c;c=c.nextSibling)var i=c.nodeType,o=i===1?o?b:c:i===3?N.test(c.nodeValue)?b:o:o;b=(f=o===b?void 0:o)&&"CODE"===f.tagName}b&&(k=f.className.match(g));k&&(k=k[1]);b=!1;for(o=n.parentNode;o;o=o.parentNode)if((o.tagName==="pre"||o.tagName==="code"||o.tagName==="xmp")&&o.className&&o.className.indexOf("prettyprint")>=0){b=!0;break}b||((b=(b=n.className.match(/\blinenums\b(?::(\d+))?/))?b[1]&&b[1].length?+b[1]:!0:!1)&&D(n,b),d={g:k,h:n,i:b},E(d))}}p<h.length?setTimeout(m,
+250):a&&a()}for(var e=[document.getElementsByTagName("pre"),document.getElementsByTagName("code"),document.getElementsByTagName("xmp")],h=[],k=0;k<e.length;++k)for(var t=0,s=e[k].length;t<s;++t)h.push(e[k][t]);var e=q,l=Date;l.now||(l={now:function(){return+new Date}});var p=0,d,g=/\blang(?:uage)?-([\w.]+)(?!\S)/;m()};window.PR={createSimpleLexer:x,registerLangHandler:k,sourceDecorator:u,PR_ATTRIB_NAME:"atn",PR_ATTRIB_VALUE:"atv",PR_COMMENT:"com",PR_DECLARATION:"dec",PR_KEYWORD:"kwd",PR_LITERAL:"lit",
+PR_NOCODE:"nocode",PR_PLAIN:"pln",PR_PUNCTUATION:"pun",PR_SOURCE:"src",PR_STRING:"str",PR_TAG:"tag",PR_TYPE:"typ"}})();
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/js/jquery-1.8.3.min.js b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/js/jquery-1.8.3.min.js
new file mode 100644
index 0000000..3883779
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/js/jquery-1.8.3.min.js
@@ -0,0 +1,2 @@
+/*! jQuery v1.8.3 jquery.com | jquery.org/license */
+(function(e,t){function _(e){var t=M[e]={};return v.each(e.split(y),function(e,n){t[n]=!0}),t}function H(e,n,r){if(r===t&&e.nodeType===1){var i="data-"+n.replace(P,"-$1").toLowerCase();r=e.getAttribute(i);if(typeof r=="string"){try{r=r==="true"?!0:r==="false"?!1:r==="null"?null:+r+""===r?+r:D.test(r)?v.parseJSON(r):r}catch(s){}v.data(e,n,r)}else r=t}return r}function B(e){var t;for(t in e){if(t==="data"&&v.isEmptyObject(e[t]))continue;if(t!=="toJSON")return!1}return!0}function et(){return!1}function tt(){return!0}function ut(e){return!e||!e.parentNode||e.parentNode.nodeType===11}function at(e,t){do e=e[t];while(e&&e.nodeType!==1);return e}function ft(e,t,n){t=t||0;if(v.isFunction(t))return v.grep(e,function(e,r){var i=!!t.call(e,r,e);return i===n});if(t.nodeType)return v.grep(e,function(e,r){return e===t===n});if(typeof t=="string"){var r=v.grep(e,function(e){return e.nodeType===1});if(it.test(t))return v.filter(t,r,!n);t=v.filter(t,r)}return v.grep(e,function(e,r){return v.inArray(e,t)>=0===n})}function lt(e){var t=ct.split("|"),n=e.createDocumentFragment();if(n.createElement)while(t.length)n.createElement(t.pop());return n}function Lt(e,t){return e.getElementsByTagName(t)[0]||e.appendChild(e.ownerDocument.createElement(t))}function At(e,t){if(t.nodeType!==1||!v.hasData(e))return;var n,r,i,s=v._data(e),o=v._data(t,s),u=s.events;if(u){delete o.handle,o.events={};for(n in u)for(r=0,i=u[n].length;r<i;r++)v.event.add(t,n,u[n][r])}o.data&&(o.data=v.extend({},o.data))}function Ot(e,t){var n;if(t.nodeType!==1)return;t.clearAttributes&&t.clearAttributes(),t.mergeAttributes&&t.mergeAttributes(e),n=t.nodeName.toLowerCase(),n==="object"?(t.parentNode&&(t.outerHTML=e.outerHTML),v.support.html5Clone&&e.innerHTML&&!v.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):n==="input"&&Et.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):n==="option"?t.selected=e.defaultSelected:n==="input"||n==="textarea"?t.defaultValue=e.defaultValue:n==="script"&&t.text!==e.text&&(t.text=e.text),t.removeAttribute(v.expando)}function Mt(e){return typeof e.getElementsByTagName!="undefined"?e.getElementsByTagName("*"):typeof e.querySelectorAll!="undefined"?e.querySelectorAll("*"):[]}function _t(e){Et.test(e.type)&&(e.defaultChecked=e.checked)}function Qt(e,t){if(t in e)return t;var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=Jt.length;while(i--){t=Jt[i]+n;if(t in e)return t}return r}function Gt(e,t){return e=t||e,v.css(e,"display")==="none"||!v.contains(e.ownerDocument,e)}function Yt(e,t){var n,r,i=[],s=0,o=e.length;for(;s<o;s++){n=e[s];if(!n.style)continue;i[s]=v._data(n,"olddisplay"),t?(!i[s]&&n.style.display==="none"&&(n.style.display=""),n.style.display===""&&Gt(n)&&(i[s]=v._data(n,"olddisplay",nn(n.nodeName)))):(r=Dt(n,"display"),!i[s]&&r!=="none"&&v._data(n,"olddisplay",r))}for(s=0;s<o;s++){n=e[s];if(!n.style)continue;if(!t||n.style.display==="none"||n.style.display==="")n.style.display=t?i[s]||"":"none"}return e}function Zt(e,t,n){var r=Rt.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function en(e,t,n,r){var i=n===(r?"border":"content")?4:t==="width"?1:0,s=0;for(;i<4;i+=2)n==="margin"&&(s+=v.css(e,n+$t[i],!0)),r?(n==="content"&&(s-=parseFloat(Dt(e,"padding"+$t[i]))||0),n!=="margin"&&(s-=parseFloat(Dt(e,"border"+$t[i]+"Width"))||0)):(s+=parseFloat(Dt(e,"padding"+$t[i]))||0,n!=="padding"&&(s+=parseFloat(Dt(e,"border"+$t[i]+"Width"))||0));return s}function tn(e,t,n){var r=t==="width"?e.offsetWidth:e.offsetHeight,i=!0,s=v.support.boxSizing&&v.css(e,"boxSizing")==="border-box";if(r<=0||r==null){r=Dt(e,t);if(r<0||r==null)r=e.style[t];if(Ut.test(r))return r;i=s&&(v.support.boxSizingReliable||r===e.style[t]),r=parseFloat(r)||0}return r+en(e,t,n||(s?"border":"content"),i)+"px"}function nn(e){if(Wt[e])return Wt[e];var t=v("<"+e+">").appendTo(i.body),n=t.css("display");t.remove();if(n==="none"||n===""){Pt=i.body.appendChild(Pt||v.extend(i.createElement("iframe"),{frameBorder:0,width:0,height:0}));if(!Ht||!Pt.createElement)Ht=(Pt.contentWindow||Pt.contentDocument).document,Ht.write("<!doctype html><html><body>"),Ht.close();t=Ht.body.appendChild(Ht.createElement(e)),n=Dt(t,"display"),i.body.removeChild(Pt)}return Wt[e]=n,n}function fn(e,t,n,r){var i;if(v.isArray(t))v.each(t,function(t,i){n||sn.test(e)?r(e,i):fn(e+"["+(typeof i=="object"?t:"")+"]",i,n,r)});else if(!n&&v.type(t)==="object")for(i in t)fn(e+"["+i+"]",t[i],n,r);else r(e,t)}function Cn(e){return function(t,n){typeof t!="string"&&(n=t,t="*");var r,i,s,o=t.toLowerCase().split(y),u=0,a=o.length;if(v.isFunction(n))for(;u<a;u++)r=o[u],s=/^\+/.test(r),s&&(r=r.substr(1)||"*"),i=e[r]=e[r]||[],i[s?"unshift":"push"](n)}}function kn(e,n,r,i,s,o){s=s||n.dataTypes[0],o=o||{},o[s]=!0;var u,a=e[s],f=0,l=a?a.length:0,c=e===Sn;for(;f<l&&(c||!u);f++)u=a[f](n,r,i),typeof u=="string"&&(!c||o[u]?u=t:(n.dataTypes.unshift(u),u=kn(e,n,r,i,u,o)));return(c||!u)&&!o["*"]&&(u=kn(e,n,r,i,"*",o)),u}function Ln(e,n){var r,i,s=v.ajaxSettings.flatOptions||{};for(r in n)n[r]!==t&&((s[r]?e:i||(i={}))[r]=n[r]);i&&v.extend(!0,e,i)}function An(e,n,r){var i,s,o,u,a=e.contents,f=e.dataTypes,l=e.responseFields;for(s in l)s in r&&(n[l[s]]=r[s]);while(f[0]==="*")f.shift(),i===t&&(i=e.mimeType||n.getResponseHeader("content-type"));if(i)for(s in a)if(a[s]&&a[s].test(i)){f.unshift(s);break}if(f[0]in r)o=f[0];else{for(s in r){if(!f[0]||e.converters[s+" "+f[0]]){o=s;break}u||(u=s)}o=o||u}if(o)return o!==f[0]&&f.unshift(o),r[o]}function On(e,t){var n,r,i,s,o=e.dataTypes.slice(),u=o[0],a={},f=0;e.dataFilter&&(t=e.dataFilter(t,e.dataType));if(o[1])for(n in e.converters)a[n.toLowerCase()]=e.converters[n];for(;i=o[++f];)if(i!=="*"){if(u!=="*"&&u!==i){n=a[u+" "+i]||a["* "+i];if(!n)for(r in a){s=r.split(" ");if(s[1]===i){n=a[u+" "+s[0]]||a["* "+s[0]];if(n){n===!0?n=a[r]:a[r]!==!0&&(i=s[0],o.splice(f--,0,i));break}}}if(n!==!0)if(n&&e["throws"])t=n(t);else try{t=n(t)}catch(l){return{state:"parsererror",error:n?l:"No conversion from "+u+" to "+i}}}u=i}return{state:"success",data:t}}function Fn(){try{return new e.XMLHttpRequest}catch(t){}}function In(){try{return new e.ActiveXObject("Microsoft.XMLHTTP")}catch(t){}}function $n(){return setTimeout(function(){qn=t},0),qn=v.now()}function Jn(e,t){v.each(t,function(t,n){var r=(Vn[t]||[]).concat(Vn["*"]),i=0,s=r.length;for(;i<s;i++)if(r[i].call(e,t,n))return})}function Kn(e,t,n){var r,i=0,s=0,o=Xn.length,u=v.Deferred().always(function(){delete a.elem}),a=function(){var t=qn||$n(),n=Math.max(0,f.startTime+f.duration-t),r=n/f.duration||0,i=1-r,s=0,o=f.tweens.length;for(;s<o;s++)f.tweens[s].run(i);return u.notifyWith(e,[f,i,n]),i<1&&o?n:(u.resolveWith(e,[f]),!1)},f=u.promise({elem:e,props:v.extend({},t),opts:v.extend(!0,{specialEasing:{}},n),originalProperties:t,originalOptions:n,startTime:qn||$n(),duration:n.duration,tweens:[],createTween:function(t,n,r){var i=v.Tween(e,f.opts,t,n,f.opts.specialEasing[t]||f.opts.easing);return f.tweens.push(i),i},stop:function(t){var n=0,r=t?f.tweens.length:0;for(;n<r;n++)f.tweens[n].run(1);return t?u.resolveWith(e,[f,t]):u.rejectWith(e,[f,t]),this}}),l=f.props;Qn(l,f.opts.specialEasing);for(;i<o;i++){r=Xn[i].call(f,e,l,f.opts);if(r)return r}return Jn(f,l),v.isFunction(f.opts.start)&&f.opts.start.call(e,f),v.fx.timer(v.extend(a,{anim:f,queue:f.opts.queue,elem:e})),f.progress(f.opts.progress).done(f.opts.done,f.opts.complete).fail(f.opts.fail).always(f.opts.always)}function Qn(e,t){var n,r,i,s,o;for(n in e){r=v.camelCase(n),i=t[r],s=e[n],v.isArray(s)&&(i=s[1],s=e[n]=s[0]),n!==r&&(e[r]=s,delete e[n]),o=v.cssHooks[r];if(o&&"expand"in o){s=o.expand(s),delete e[r];for(n in s)n in e||(e[n]=s[n],t[n]=i)}else t[r]=i}}function Gn(e,t,n){var r,i,s,o,u,a,f,l,c,h=this,p=e.style,d={},m=[],g=e.nodeType&&Gt(e);n.queue||(l=v._queueHooks(e,"fx"),l.unqueued==null&&(l.unqueued=0,c=l.empty.fire,l.empty.fire=function(){l.unqueued||c()}),l.unqueued++,h.always(function(){h.always(function(){l.unqueued--,v.queue(e,"fx").length||l.empty.fire()})})),e.nodeType===1&&("height"in t||"width"in t)&&(n.overflow=[p.overflow,p.overflowX,p.overflowY],v.css(e,"display")==="inline"&&v.css(e,"float")==="none"&&(!v.support.inlineBlockNeedsLayout||nn(e.nodeName)==="inline"?p.display="inline-block":p.zoom=1)),n.overflow&&(p.overflow="hidden",v.support.shrinkWrapBlocks||h.done(function(){p.overflow=n.overflow[0],p.overflowX=n.overflow[1],p.overflowY=n.overflow[2]}));for(r in t){s=t[r];if(Un.exec(s)){delete t[r],a=a||s==="toggle";if(s===(g?"hide":"show"))continue;m.push(r)}}o=m.length;if(o){u=v._data(e,"fxshow")||v._data(e,"fxshow",{}),"hidden"in u&&(g=u.hidden),a&&(u.hidden=!g),g?v(e).show():h.done(function(){v(e).hide()}),h.done(function(){var t;v.removeData(e,"fxshow",!0);for(t in d)v.style(e,t,d[t])});for(r=0;r<o;r++)i=m[r],f=h.createTween(i,g?u[i]:0),d[i]=u[i]||v.style(e,i),i in u||(u[i]=f.start,g&&(f.end=f.start,f.start=i==="width"||i==="height"?1:0))}}function Yn(e,t,n,r,i){return new Yn.prototype.init(e,t,n,r,i)}function Zn(e,t){var n,r={height:e},i=0;t=t?1:0;for(;i<4;i+=2-t)n=$t[i],r["margin"+n]=r["padding"+n]=e;return t&&(r.opacity=r.width=e),r}function tr(e){return v.isWindow(e)?e:e.nodeType===9?e.defaultView||e.parentWindow:!1}var n,r,i=e.document,s=e.location,o=e.navigator,u=e.jQuery,a=e.$,f=Array.prototype.push,l=Array.prototype.slice,c=Array.prototype.indexOf,h=Object.prototype.toString,p=Object.prototype.hasOwnProperty,d=String.prototype.trim,v=function(e,t){return new v.fn.init(e,t,n)},m=/[\-+]?(?:\d*\.|)\d+(?:[eE][\-+]?\d+|)/.source,g=/\S/,y=/\s+/,b=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,w=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,E=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,S=/^[\],:{}\s]*$/,x=/(?:^|:|,)(?:\s*\[)+/g,T=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,N=/"[^"\\\r\n]*"|true|false|null|-?(?:\d\d*\.|)\d+(?:[eE][\-+]?\d+|)/g,C=/^-ms-/,k=/-([\da-z])/gi,L=function(e,t){return(t+"").toUpperCase()},A=function(){i.addEventListener?(i.removeEventListener("DOMContentLoaded",A,!1),v.ready()):i.readyState==="complete"&&(i.detachEvent("onreadystatechange",A),v.ready())},O={};v.fn=v.prototype={constructor:v,init:function(e,n,r){var s,o,u,a;if(!e)return this;if(e.nodeType)return this.context=this[0]=e,this.length=1,this;if(typeof e=="string"){e.charAt(0)==="<"&&e.charAt(e.length-1)===">"&&e.length>=3?s=[null,e,null]:s=w.exec(e);if(s&&(s[1]||!n)){if(s[1])return n=n instanceof v?n[0]:n,a=n&&n.nodeType?n.ownerDocument||n:i,e=v.parseHTML(s[1],a,!0),E.test(s[1])&&v.isPlainObject(n)&&this.attr.call(e,n,!0),v.merge(this,e);o=i.getElementById(s[2]);if(o&&o.parentNode){if(o.id!==s[2])return r.find(e);this.length=1,this[0]=o}return this.context=i,this.selector=e,this}return!n||n.jquery?(n||r).find(e):this.constructor(n).find(e)}return v.isFunction(e)?r.ready(e):(e.selector!==t&&(this.selector=e.selector,this.context=e.context),v.makeArray(e,this))},selector:"",jquery:"1.8.3",length:0,size:function(){return this.length},toArray:function(){return l.call(this)},get:function(e){return e==null?this.toArray():e<0?this[this.length+e]:this[e]},pushStack:function(e,t,n){var r=v.merge(this.constructor(),e);return r.prevObject=this,r.context=this.context,t==="find"?r.selector=this.selector+(this.selector?" ":"")+n:t&&(r.selector=this.selector+"."+t+"("+n+")"),r},each:function(e,t){return v.each(this,e,t)},ready:function(e){return v.ready.promise().done(e),this},eq:function(e){return e=+e,e===-1?this.slice(e):this.slice(e,e+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(l.apply(this,arguments),"slice",l.call(arguments).join(","))},map:function(e){return this.pushStack(v.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:[].sort,splice:[].splice},v.fn.init.prototype=v.fn,v.extend=v.fn.extend=function(){var e,n,r,i,s,o,u=arguments[0]||{},a=1,f=arguments.length,l=!1;typeof u=="boolean"&&(l=u,u=arguments[1]||{},a=2),typeof u!="object"&&!v.isFunction(u)&&(u={}),f===a&&(u=this,--a);for(;a<f;a++)if((e=arguments[a])!=null)for(n in e){r=u[n],i=e[n];if(u===i)continue;l&&i&&(v.isPlainObject(i)||(s=v.isArray(i)))?(s?(s=!1,o=r&&v.isArray(r)?r:[]):o=r&&v.isPlainObject(r)?r:{},u[n]=v.extend(l,o,i)):i!==t&&(u[n]=i)}return u},v.extend({noConflict:function(t){return e.$===v&&(e.$=a),t&&e.jQuery===v&&(e.jQuery=u),v},isReady:!1,readyWait:1,holdReady:function(e){e?v.readyWait++:v.ready(!0)},ready:function(e){if(e===!0?--v.readyWait:v.isReady)return;if(!i.body)return setTimeout(v.ready,1);v.isReady=!0;if(e!==!0&&--v.readyWait>0)return;r.resolveWith(i,[v]),v.fn.trigger&&v(i).trigger("ready").off("ready")},isFunction:function(e){return v.type(e)==="function"},isArray:Array.isArray||function(e){return v.type(e)==="array"},isWindow:function(e){return e!=null&&e==e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){return e==null?String(e):O[h.call(e)]||"object"},isPlainObject:function(e){if(!e||v.type(e)!=="object"||e.nodeType||v.isWindow(e))return!1;try{if(e.constructor&&!p.call(e,"constructor")&&!p.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(n){return!1}var r;for(r in e);return r===t||p.call(e,r)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},error:function(e){throw new Error(e)},parseHTML:function(e,t,n){var r;return!e||typeof e!="string"?null:(typeof t=="boolean"&&(n=t,t=0),t=t||i,(r=E.exec(e))?[t.createElement(r[1])]:(r=v.buildFragment([e],t,n?null:[]),v.merge([],(r.cacheable?v.clone(r.fragment):r.fragment).childNodes)))},parseJSON:function(t){if(!t||typeof t!="string")return null;t=v.trim(t);if(e.JSON&&e.JSON.parse)return e.JSON.parse(t);if(S.test(t.replace(T,"@").replace(N,"]").replace(x,"")))return(new Function("return "+t))();v.error("Invalid JSON: "+t)},parseXML:function(n){var r,i;if(!n||typeof n!="string")return null;try{e.DOMParser?(i=new DOMParser,r=i.parseFromString(n,"text/xml")):(r=new ActiveXObject("Microsoft.XMLDOM"),r.async="false",r.loadXML(n))}catch(s){r=t}return(!r||!r.documentElement||r.getElementsByTagName("parsererror").length)&&v.error("Invalid XML: "+n),r},noop:function(){},globalEval:function(t){t&&g.test(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(C,"ms-").replace(k,L)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,n,r){var i,s=0,o=e.length,u=o===t||v.isFunction(e);if(r){if(u){for(i in e)if(n.apply(e[i],r)===!1)break}else for(;s<o;)if(n.apply(e[s++],r)===!1)break}else if(u){for(i in e)if(n.call(e[i],i,e[i])===!1)break}else for(;s<o;)if(n.call(e[s],s,e[s++])===!1)break;return e},trim:d&&!d.call("\ufeff\u00a0")?function(e){return e==null?"":d.call(e)}:function(e){return e==null?"":(e+"").replace(b,"")},makeArray:function(e,t){var n,r=t||[];return e!=null&&(n=v.type(e),e.length==null||n==="string"||n==="function"||n==="regexp"||v.isWindow(e)?f.call(r,e):v.merge(r,e)),r},inArray:function(e,t,n){var r;if(t){if(c)return c.call(t,e,n);r=t.length,n=n?n<0?Math.max(0,r+n):n:0;for(;n<r;n++)if(n in t&&t[n]===e)return n}return-1},merge:function(e,n){var r=n.length,i=e.length,s=0;if(typeof r=="number")for(;s<r;s++)e[i++]=n[s];else while(n[s]!==t)e[i++]=n[s++];return e.length=i,e},grep:function(e,t,n){var r,i=[],s=0,o=e.length;n=!!n;for(;s<o;s++)r=!!t(e[s],s),n!==r&&i.push(e[s]);return i},map:function(e,n,r){var i,s,o=[],u=0,a=e.length,f=e instanceof v||a!==t&&typeof a=="number"&&(a>0&&e[0]&&e[a-1]||a===0||v.isArray(e));if(f)for(;u<a;u++)i=n(e[u],u,r),i!=null&&(o[o.length]=i);else for(s in e)i=n(e[s],s,r),i!=null&&(o[o.length]=i);return o.concat.apply([],o)},guid:1,proxy:function(e,n){var r,i,s;return typeof n=="string"&&(r=e[n],n=e,e=r),v.isFunction(e)?(i=l.call(arguments,2),s=function(){return e.apply(n,i.concat(l.call(arguments)))},s.guid=e.guid=e.guid||v.guid++,s):t},access:function(e,n,r,i,s,o,u){var a,f=r==null,l=0,c=e.length;if(r&&typeof r=="object"){for(l in r)v.access(e,n,l,r[l],1,o,i);s=1}else if(i!==t){a=u===t&&v.isFunction(i),f&&(a?(a=n,n=function(e,t,n){return a.call(v(e),n)}):(n.call(e,i),n=null));if(n)for(;l<c;l++)n(e[l],r,a?i.call(e[l],l,n(e[l],r)):i,u);s=1}return s?e:f?n.call(e):c?n(e[0],r):o},now:function(){return(new Date).getTime()}}),v.ready.promise=function(t){if(!r){r=v.Deferred();if(i.readyState==="complete")setTimeout(v.ready,1);else if(i.addEventListener)i.addEventListener("DOMContentLoaded",A,!1),e.addEventListener("load",v.ready,!1);else{i.attachEvent("onreadystatechange",A),e.attachEvent("onload",v.ready);var n=!1;try{n=e.frameElement==null&&i.documentElement}catch(s){}n&&n.doScroll&&function o(){if(!v.isReady){try{n.doScroll("left")}catch(e){return setTimeout(o,50)}v.ready()}}()}}return r.promise(t)},v.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(e,t){O["[object "+t+"]"]=t.toLowerCase()}),n=v(i);var M={};v.Callbacks=function(e){e=typeof e=="string"?M[e]||_(e):v.extend({},e);var n,r,i,s,o,u,a=[],f=!e.once&&[],l=function(t){n=e.memory&&t,r=!0,u=s||0,s=0,o=a.length,i=!0;for(;a&&u<o;u++)if(a[u].apply(t[0],t[1])===!1&&e.stopOnFalse){n=!1;break}i=!1,a&&(f?f.length&&l(f.shift()):n?a=[]:c.disable())},c={add:function(){if(a){var t=a.length;(function r(t){v.each(t,function(t,n){var i=v.type(n);i==="function"?(!e.unique||!c.has(n))&&a.push(n):n&&n.length&&i!=="string"&&r(n)})})(arguments),i?o=a.length:n&&(s=t,l(n))}return this},remove:function(){return a&&v.each(arguments,function(e,t){var n;while((n=v.inArray(t,a,n))>-1)a.splice(n,1),i&&(n<=o&&o--,n<=u&&u--)}),this},has:function(e){return v.inArray(e,a)>-1},empty:function(){return a=[],this},disable:function(){return a=f=n=t,this},disabled:function(){return!a},lock:function(){return f=t,n||c.disable(),this},locked:function(){return!f},fireWith:function(e,t){return t=t||[],t=[e,t.slice?t.slice():t],a&&(!r||f)&&(i?f.push(t):l(t)),this},fire:function(){return c.fireWith(this,arguments),this},fired:function(){return!!r}};return c},v.extend({Deferred:function(e){var t=[["resolve","done",v.Callbacks("once memory"),"resolved"],["reject","fail",v.Callbacks("once memory"),"rejected"],["notify","progress",v.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return v.Deferred(function(n){v.each(t,function(t,r){var s=r[0],o=e[t];i[r[1]](v.isFunction(o)?function(){var e=o.apply(this,arguments);e&&v.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[s+"With"](this===i?n:this,[e])}:n[s])}),e=null}).promise()},promise:function(e){return e!=null?v.extend(e,r):r}},i={};return r.pipe=r.then,v.each(t,function(e,s){var o=s[2],u=s[3];r[s[1]]=o.add,u&&o.add(function(){n=u},t[e^1][2].disable,t[2][2].lock),i[s[0]]=o.fire,i[s[0]+"With"]=o.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t=0,n=l.call(arguments),r=n.length,i=r!==1||e&&v.isFunction(e.promise)?r:0,s=i===1?e:v.Deferred(),o=function(e,t,n){return function(r){t[e]=this,n[e]=arguments.length>1?l.call(arguments):r,n===u?s.notifyWith(t,n):--i||s.resolveWith(t,n)}},u,a,f;if(r>1){u=new Array(r),a=new Array(r),f=new Array(r);for(;t<r;t++)n[t]&&v.isFunction(n[t].promise)?n[t].promise().done(o(t,f,n)).fail(s.reject).progress(o(t,a,u)):--i}return i||s.resolveWith(f,n),s.promise()}}),v.support=function(){var t,n,r,s,o,u,a,f,l,c,h,p=i.createElement("div");p.setAttribute("className","t"),p.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",n=p.getElementsByTagName("*"),r=p.getElementsByTagName("a")[0];if(!n||!r||!n.length)return{};s=i.createElement("select"),o=s.appendChild(i.createElement("option")),u=p.getElementsByTagName("input")[0],r.style.cssText="top:1px;float:left;opacity:.5",t={leadingWhitespace:p.firstChild.nodeType===3,tbody:!p.getElementsByTagName("tbody").length,htmlSerialize:!!p.getElementsByTagName("link").length,style:/top/.test(r.getAttribute("style")),hrefNormalized:r.getAttribute("href")==="/a",opacity:/^0.5/.test(r.style.opacity),cssFloat:!!r.style.cssFloat,checkOn:u.value==="on",optSelected:o.selected,getSetAttribute:p.className!=="t",enctype:!!i.createElement("form").enctype,html5Clone:i.createElement("nav").cloneNode(!0).outerHTML!=="<:nav></:nav>",boxModel:i.compatMode==="CSS1Compat",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,boxSizingReliable:!0,pixelPosition:!1},u.checked=!0,t.noCloneChecked=u.cloneNode(!0).checked,s.disabled=!0,t.optDisabled=!o.disabled;try{delete p.test}catch(d){t.deleteExpando=!1}!p.addEventListener&&p.attachEvent&&p.fireEvent&&(p.attachEvent("onclick",h=function(){t.noCloneEvent=!1}),p.cloneNode(!0).fireEvent("onclick"),p.detachEvent("onclick",h)),u=i.createElement("input"),u.value="t",u.setAttribute("type","radio"),t.radioValue=u.value==="t",u.setAttribute("checked","checked"),u.setAttribute("name","t"),p.appendChild(u),a=i.createDocumentFragment(),a.appendChild(p.lastChild),t.checkClone=a.cloneNode(!0).cloneNode(!0).lastChild.checked,t.appendChecked=u.checked,a.removeChild(u),a.appendChild(p);if(p.attachEvent)for(l in{submit:!0,change:!0,focusin:!0})f="on"+l,c=f in p,c||(p.setAttribute(f,"return;"),c=typeof p[f]=="function"),t[l+"Bubbles"]=c;return v(function(){var n,r,s,o,u="padding:0;margin:0;border:0;display:block;overflow:hidden;",a=i.getElementsByTagName("body")[0];if(!a)return;n=i.createElement("div"),n.style.cssText="visibility:hidden;border:0;width:0;height:0;position:static;top:0;margin-top:1px",a.insertBefore(n,a.firstChild),r=i.createElement("div"),n.appendChild(r),r.innerHTML="<table><tr><td></td><td>t</td></tr></table>",s=r.getElementsByTagName("td"),s[0].style.cssText="padding:0;margin:0;border:0;display:none",c=s[0].offsetHeight===0,s[0].style.display="",s[1].style.display="none",t.reliableHiddenOffsets=c&&s[0].offsetHeight===0,r.innerHTML="",r.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",t.boxSizing=r.offsetWidth===4,t.doesNotIncludeMarginInBodyOffset=a.offsetTop!==1,e.getComputedStyle&&(t.pixelPosition=(e.getComputedStyle(r,null)||{}).top!=="1%",t.boxSizingReliable=(e.getComputedStyle(r,null)||{width:"4px"}).width==="4px",o=i.createElement("div"),o.style.cssText=r.style.cssText=u,o.style.marginRight=o.style.width="0",r.style.width="1px",r.appendChild(o),t.reliableMarginRight=!parseFloat((e.getComputedStyle(o,null)||{}).marginRight)),typeof r.style.zoom!="undefined"&&(r.innerHTML="",r.style.cssText=u+"width:1px;padding:1px;display:inline;zoom:1",t.inlineBlockNeedsLayout=r.offsetWidth===3,r.style.display="block",r.style.overflow="visible",r.innerHTML="<div></div>",r.firstChild.style.width="5px",t.shrinkWrapBlocks=r.offsetWidth!==3,n.style.zoom=1),a.removeChild(n),n=r=s=o=null}),a.removeChild(p),n=r=s=o=u=a=p=null,t}();var D=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,P=/([A-Z])/g;v.extend({cache:{},deletedIds:[],uuid:0,expando:"jQuery"+(v.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(e){return e=e.nodeType?v.cache[e[v.expando]]:e[v.expando],!!e&&!B(e)},data:function(e,n,r,i){if(!v.acceptData(e))return;var s,o,u=v.expando,a=typeof n=="string",f=e.nodeType,l=f?v.cache:e,c=f?e[u]:e[u]&&u;if((!c||!l[c]||!i&&!l[c].data)&&a&&r===t)return;c||(f?e[u]=c=v.deletedIds.pop()||v.guid++:c=u),l[c]||(l[c]={},f||(l[c].toJSON=v.noop));if(typeof n=="object"||typeof n=="function")i?l[c]=v.extend(l[c],n):l[c].data=v.extend(l[c].data,n);return s=l[c],i||(s.data||(s.data={}),s=s.data),r!==t&&(s[v.camelCase(n)]=r),a?(o=s[n],o==null&&(o=s[v.camelCase(n)])):o=s,o},removeData:function(e,t,n){if(!v.acceptData(e))return;var r,i,s,o=e.nodeType,u=o?v.cache:e,a=o?e[v.expando]:v.expando;if(!u[a])return;if(t){r=n?u[a]:u[a].data;if(r){v.isArray(t)||(t in r?t=[t]:(t=v.camelCase(t),t in r?t=[t]:t=t.split(" ")));for(i=0,s=t.length;i<s;i++)delete r[t[i]];if(!(n?B:v.isEmptyObject)(r))return}}if(!n){delete u[a].data;if(!B(u[a]))return}o?v.cleanData([e],!0):v.support.deleteExpando||u!=u.window?delete u[a]:u[a]=null},_data:function(e,t,n){return v.data(e,t,n,!0)},acceptData:function(e){var t=e.nodeName&&v.noData[e.nodeName.toLowerCase()];return!t||t!==!0&&e.getAttribute("classid")===t}}),v.fn.extend({data:function(e,n){var r,i,s,o,u,a=this[0],f=0,l=null;if(e===t){if(this.length){l=v.data(a);if(a.nodeType===1&&!v._data(a,"parsedAttrs")){s=a.attributes;for(u=s.length;f<u;f++)o=s[f].name,o.indexOf("data-")||(o=v.camelCase(o.substring(5)),H(a,o,l[o]));v._data(a,"parsedAttrs",!0)}}return l}return typeof e=="object"?this.each(function(){v.data(this,e)}):(r=e.split(".",2),r[1]=r[1]?"."+r[1]:"",i=r[1]+"!",v.access(this,function(n){if(n===t)return l=this.triggerHandler("getData"+i,[r[0]]),l===t&&a&&(l=v.data(a,e),l=H(a,e,l)),l===t&&r[1]?this.data(r[0]):l;r[1]=n,this.each(function(){var t=v(this);t.triggerHandler("setData"+i,r),v.data(this,e,n),t.triggerHandler("changeData"+i,r)})},null,n,arguments.length>1,null,!1))},removeData:function(e){return this.each(function(){v.removeData(this,e)})}}),v.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=v._data(e,t),n&&(!r||v.isArray(n)?r=v._data(e,t,v.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=v.queue(e,t),r=n.length,i=n.shift(),s=v._queueHooks(e,t),o=function(){v.dequeue(e,t)};i==="inprogress"&&(i=n.shift(),r--),i&&(t==="fx"&&n.unshift("inprogress"),delete s.stop,i.call(e,o,s)),!r&&s&&s.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return v._data(e,n)||v._data(e,n,{empty:v.Callbacks("once memory").add(function(){v.removeData(e,t+"queue",!0),v.removeData(e,n,!0)})})}}),v.fn.extend({queue:function(e,n){var r=2;return typeof e!="string"&&(n=e,e="fx",r--),arguments.length<r?v.queue(this[0],e):n===t?this:this.each(function(){var t=v.queue(this,e,n);v._queueHooks(this,e),e==="fx"&&t[0]!=="inprogress"&&v.dequeue(this,e)})},dequeue:function(e){return this.each(function(){v.dequeue(this,e)})},delay:function(e,t){return e=v.fx?v.fx.speeds[e]||e:e,t=t||"fx",this.queue(t,function(t,n){var r=setTimeout(t,e);n.stop=function(){clearTimeout(r)}})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,n){var r,i=1,s=v.Deferred(),o=this,u=this.length,a=function(){--i||s.resolveWith(o,[o])};typeof e!="string"&&(n=e,e=t),e=e||"fx";while(u--)r=v._data(o[u],e+"queueHooks"),r&&r.empty&&(i++,r.empty.add(a));return a(),s.promise(n)}});var j,F,I,q=/[\t\r\n]/g,R=/\r/g,U=/^(?:button|input)$/i,z=/^(?:button|input|object|select|textarea)$/i,W=/^a(?:rea|)$/i,X=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,V=v.support.getSetAttribute;v.fn.extend({attr:function(e,t){return v.access(this,v.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){v.removeAttr(this,e)})},prop:function(e,t){return v.access(this,v.prop,e,t,arguments.length>1)},removeProp:function(e){return e=v.propFix[e]||e,this.each(function(){try{this[e]=t,delete this[e]}catch(n){}})},addClass:function(e){var t,n,r,i,s,o,u;if(v.isFunction(e))return this.each(function(t){v(this).addClass(e.call(this,t,this.className))});if(e&&typeof e=="string"){t=e.split(y);for(n=0,r=this.length;n<r;n++){i=this[n];if(i.nodeType===1)if(!i.className&&t.length===1)i.className=e;else{s=" "+i.className+" ";for(o=0,u=t.length;o<u;o++)s.indexOf(" "+t[o]+" ")<0&&(s+=t[o]+" ");i.className=v.trim(s)}}}return this},removeClass:function(e){var n,r,i,s,o,u,a;if(v.isFunction(e))return this.each(function(t){v(this).removeClass(e.call(this,t,this.className))});if(e&&typeof e=="string"||e===t){n=(e||"").split(y);for(u=0,a=this.length;u<a;u++){i=this[u];if(i.nodeType===1&&i.className){r=(" "+i.className+" ").replace(q," ");for(s=0,o=n.length;s<o;s++)while(r.indexOf(" "+n[s]+" ")>=0)r=r.replace(" "+n[s]+" "," ");i.className=e?v.trim(r):""}}}return this},toggleClass:function(e,t){var n=typeof e,r=typeof t=="boolean";return v.isFunction(e)?this.each(function(n){v(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if(n==="string"){var i,s=0,o=v(this),u=t,a=e.split(y);while(i=a[s++])u=r?u:!o.hasClass(i),o[u?"addClass":"removeClass"](i)}else if(n==="undefined"||n==="boolean")this.className&&v._data(this,"__className__",this.className),this.className=this.className||e===!1?"":v._data(this,"__className__")||""})},hasClass:function(e){var t=" "+e+" ",n=0,r=this.length;for(;n<r;n++)if(this[n].nodeType===1&&(" "+this[n].className+" ").replace(q," ").indexOf(t)>=0)return!0;return!1},val:function(e){var n,r,i,s=this[0];if(!arguments.length){if(s)return n=v.valHooks[s.type]||v.valHooks[s.nodeName.toLowerCase()],n&&"get"in n&&(r=n.get(s,"value"))!==t?r:(r=s.value,typeof r=="string"?r.replace(R,""):r==null?"":r);return}return i=v.isFunction(e),this.each(function(r){var s,o=v(this);if(this.nodeType!==1)return;i?s=e.call(this,r,o.val()):s=e,s==null?s="":typeof s=="number"?s+="":v.isArray(s)&&(s=v.map(s,function(e){return e==null?"":e+""})),n=v.valHooks[this.type]||v.valHooks[this.nodeName.toLowerCase()];if(!n||!("set"in n)||n.set(this,s,"value")===t)this.value=s})}}),v.extend({valHooks:{option:{get:function(e){var t=e.attributes.value;return!t||t.specified?e.value:e.text}},select:{get:function(e){var t,n,r=e.options,i=e.selectedIndex,s=e.type==="select-one"||i<0,o=s?null:[],u=s?i+1:r.length,a=i<0?u:s?i:0;for(;a<u;a++){n=r[a];if((n.selected||a===i)&&(v.support.optDisabled?!n.disabled:n.getAttribute("disabled")===null)&&(!n.parentNode.disabled||!v.nodeName(n.parentNode,"optgroup"))){t=v(n).val();if(s)return t;o.push(t)}}return o},set:function(e,t){var n=v.makeArray(t);return v(e).find("option").each(function(){this.selected=v.inArray(v(this).val(),n)>=0}),n.length||(e.selectedIndex=-1),n}}},attrFn:{},attr:function(e,n,r,i){var s,o,u,a=e.nodeType;if(!e||a===3||a===8||a===2)return;if(i&&v.isFunction(v.fn[n]))return v(e)[n](r);if(typeof e.getAttribute=="undefined")return v.prop(e,n,r);u=a!==1||!v.isXMLDoc(e),u&&(n=n.toLowerCase(),o=v.attrHooks[n]||(X.test(n)?F:j));if(r!==t){if(r===null){v.removeAttr(e,n);return}return o&&"set"in o&&u&&(s=o.set(e,r,n))!==t?s:(e.setAttribute(n,r+""),r)}return o&&"get"in o&&u&&(s=o.get(e,n))!==null?s:(s=e.getAttribute(n),s===null?t:s)},removeAttr:function(e,t){var n,r,i,s,o=0;if(t&&e.nodeType===1){r=t.split(y);for(;o<r.length;o++)i=r[o],i&&(n=v.propFix[i]||i,s=X.test(i),s||v.attr(e,i,""),e.removeAttribute(V?i:n),s&&n in e&&(e[n]=!1))}},attrHooks:{type:{set:function(e,t){if(U.test(e.nodeName)&&e.parentNode)v.error("type property can't be changed");else if(!v.support.radioValue&&t==="radio"&&v.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}},value:{get:function(e,t){return j&&v.nodeName(e,"button")?j.get(e,t):t in e?e.value:null},set:function(e,t,n){if(j&&v.nodeName(e,"button"))return j.set(e,t,n);e.value=t}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(e,n,r){var i,s,o,u=e.nodeType;if(!e||u===3||u===8||u===2)return;return o=u!==1||!v.isXMLDoc(e),o&&(n=v.propFix[n]||n,s=v.propHooks[n]),r!==t?s&&"set"in s&&(i=s.set(e,r,n))!==t?i:e[n]=r:s&&"get"in s&&(i=s.get(e,n))!==null?i:e[n]},propHooks:{tabIndex:{get:function(e){var n=e.getAttributeNode("tabindex");return n&&n.specified?parseInt(n.value,10):z.test(e.nodeName)||W.test(e.nodeName)&&e.href?0:t}}}}),F={get:function(e,n){var r,i=v.prop(e,n);return i===!0||typeof i!="boolean"&&(r=e.getAttributeNode(n))&&r.nodeValue!==!1?n.toLowerCase():t},set:function(e,t,n){var r;return t===!1?v.removeAttr(e,n):(r=v.propFix[n]||n,r in e&&(e[r]=!0),e.setAttribute(n,n.toLowerCase())),n}},V||(I={name:!0,id:!0,coords:!0},j=v.valHooks.button={get:function(e,n){var r;return r=e.getAttributeNode(n),r&&(I[n]?r.value!=="":r.specified)?r.value:t},set:function(e,t,n){var r=e.getAttributeNode(n);return r||(r=i.createAttribute(n),e.setAttributeNode(r)),r.value=t+""}},v.each(["width","height"],function(e,t){v.attrHooks[t]=v.extend(v.attrHooks[t],{set:function(e,n){if(n==="")return e.setAttribute(t,"auto"),n}})}),v.attrHooks.contenteditable={get:j.get,set:function(e,t,n){t===""&&(t="false"),j.set(e,t,n)}}),v.support.hrefNormalized||v.each(["href","src","width","height"],function(e,n){v.attrHooks[n]=v.extend(v.attrHooks[n],{get:function(e){var r=e.getAttribute(n,2);return r===null?t:r}})}),v.support.style||(v.attrHooks.style={get:function(e){return e.style.cssText.toLowerCase()||t},set:function(e,t){return e.style.cssText=t+""}}),v.support.optSelected||(v.propHooks.selected=v.extend(v.propHooks.selected,{get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null}})),v.support.enctype||(v.propFix.enctype="encoding"),v.support.checkOn||v.each(["radio","checkbox"],function(){v.valHooks[this]={get:function(e){return e.getAttribute("value")===null?"on":e.value}}}),v.each(["radio","checkbox"],function(){v.valHooks[this]=v.extend(v.valHooks[this],{set:function(e,t){if(v.isArray(t))return e.checked=v.inArray(v(e).val(),t)>=0}})});var $=/^(?:textarea|input|select)$/i,J=/^([^\.]*|)(?:\.(.+)|)$/,K=/(?:^|\s)hover(\.\S+|)\b/,Q=/^key/,G=/^(?:mouse|contextmenu)|click/,Y=/^(?:focusinfocus|focusoutblur)$/,Z=function(e){return v.event.special.hover?e:e.replace(K,"mouseenter$1 mouseleave$1")};v.event={add:function(e,n,r,i,s){var o,u,a,f,l,c,h,p,d,m,g;if(e.nodeType===3||e.nodeType===8||!n||!r||!(o=v._data(e)))return;r.handler&&(d=r,r=d.handler,s=d.selector),r.guid||(r.guid=v.guid++),a=o.events,a||(o.events=a={}),u=o.handle,u||(o.handle=u=function(e){return typeof v=="undefined"||!!e&&v.event.triggered===e.type?t:v.event.dispatch.apply(u.elem,arguments)},u.elem=e),n=v.trim(Z(n)).split(" ");for(f=0;f<n.length;f++){l=J.exec(n[f])||[],c=l[1],h=(l[2]||"").split(".").sort(),g=v.event.special[c]||{},c=(s?g.delegateType:g.bindType)||c,g=v.event.special[c]||{},p=v.extend({type:c,origType:l[1],data:i,handler:r,guid:r.guid,selector:s,needsContext:s&&v.expr.match.needsContext.test(s),namespace:h.join(".")},d),m=a[c];if(!m){m=a[c]=[],m.delegateCount=0;if(!g.setup||g.setup.call(e,i,h,u)===!1)e.addEventListener?e.addEventListener(c,u,!1):e.attachEvent&&e.attachEvent("on"+c,u)}g.add&&(g.add.call(e,p),p.handler.guid||(p.handler.guid=r.guid)),s?m.splice(m.delegateCount++,0,p):m.push(p),v.event.global[c]=!0}e=null},global:{},remove:function(e,t,n,r,i){var s,o,u,a,f,l,c,h,p,d,m,g=v.hasData(e)&&v._data(e);if(!g||!(h=g.events))return;t=v.trim(Z(t||"")).split(" ");for(s=0;s<t.length;s++){o=J.exec(t[s])||[],u=a=o[1],f=o[2];if(!u){for(u in h)v.event.remove(e,u+t[s],n,r,!0);continue}p=v.event.special[u]||{},u=(r?p.delegateType:p.bindType)||u,d=h[u]||[],l=d.length,f=f?new RegExp("(^|\\.)"+f.split(".").sort().join("\\.(?:.*\\.|)")+"(\\.|$)"):null;for(c=0;c<d.length;c++)m=d[c],(i||a===m.origType)&&(!n||n.guid===m.guid)&&(!f||f.test(m.namespace))&&(!r||r===m.selector||r==="**"&&m.selector)&&(d.splice(c--,1),m.selector&&d.delegateCount--,p.remove&&p.remove.call(e,m));d.length===0&&l!==d.length&&((!p.teardown||p.teardown.call(e,f,g.handle)===!1)&&v.removeEvent(e,u,g.handle),delete h[u])}v.isEmptyObject(h)&&(delete g.handle,v.removeData(e,"events",!0))},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(n,r,s,o){if(!s||s.nodeType!==3&&s.nodeType!==8){var u,a,f,l,c,h,p,d,m,g,y=n.type||n,b=[];if(Y.test(y+v.event.triggered))return;y.indexOf("!")>=0&&(y=y.slice(0,-1),a=!0),y.indexOf(".")>=0&&(b=y.split("."),y=b.shift(),b.sort());if((!s||v.event.customEvent[y])&&!v.event.global[y])return;n=typeof n=="object"?n[v.expando]?n:new v.Event(y,n):new v.Event(y),n.type=y,n.isTrigger=!0,n.exclusive=a,n.namespace=b.join("."),n.namespace_re=n.namespace?new RegExp("(^|\\.)"+b.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,h=y.indexOf(":")<0?"on"+y:"";if(!s){u=v.cache;for(f in u)u[f].events&&u[f].events[y]&&v.event.trigger(n,r,u[f].handle.elem,!0);return}n.result=t,n.target||(n.target=s),r=r!=null?v.makeArray(r):[],r.unshift(n),p=v.event.special[y]||{};if(p.trigger&&p.trigger.apply(s,r)===!1)return;m=[[s,p.bindType||y]];if(!o&&!p.noBubble&&!v.isWindow(s)){g=p.delegateType||y,l=Y.test(g+y)?s:s.parentNode;for(c=s;l;l=l.parentNode)m.push([l,g]),c=l;c===(s.ownerDocument||i)&&m.push([c.defaultView||c.parentWindow||e,g])}for(f=0;f<m.length&&!n.isPropagationStopped();f++)l=m[f][0],n.type=m[f][1],d=(v._data(l,"events")||{})[n.type]&&v._data(l,"handle"),d&&d.apply(l,r),d=h&&l[h],d&&v.acceptData(l)&&d.apply&&d.apply(l,r)===!1&&n.preventDefault();return n.type=y,!o&&!n.isDefaultPrevented()&&(!p._default||p._default.apply(s.ownerDocument,r)===!1)&&(y!=="click"||!v.nodeName(s,"a"))&&v.acceptData(s)&&h&&s[y]&&(y!=="focus"&&y!=="blur"||n.target.offsetWidth!==0)&&!v.isWindow(s)&&(c=s[h],c&&(s[h]=null),v.event.triggered=y,s[y](),v.event.triggered=t,c&&(s[h]=c)),n.result}return},dispatch:function(n){n=v.event.fix(n||e.event);var r,i,s,o,u,a,f,c,h,p,d=(v._data(this,"events")||{})[n.type]||[],m=d.delegateCount,g=l.call(arguments),y=!n.exclusive&&!n.namespace,b=v.event.special[n.type]||{},w=[];g[0]=n,n.delegateTarget=this;if(b.preDispatch&&b.preDispatch.call(this,n)===!1)return;if(m&&(!n.button||n.type!=="click"))for(s=n.target;s!=this;s=s.parentNode||this)if(s.disabled!==!0||n.type!=="click"){u={},f=[];for(r=0;r<m;r++)c=d[r],h=c.selector,u[h]===t&&(u[h]=c.needsContext?v(h,this).index(s)>=0:v.find(h,this,null,[s]).length),u[h]&&f.push(c);f.length&&w.push({elem:s,matches:f})}d.length>m&&w.push({elem:this,matches:d.slice(m)});for(r=0;r<w.length&&!n.isPropagationStopped();r++){a=w[r],n.currentTarget=a.elem;for(i=0;i<a.matches.length&&!n.isImmediatePropagationStopped();i++){c=a.matches[i];if(y||!n.namespace&&!c.namespace||n.namespace_re&&n.namespace_re.test(c.namespace))n.data=c.data,n.handleObj=c,o=((v.event.special[c.origType]||{}).handle||c.handler).apply(a.elem,g),o!==t&&(n.result=o,o===!1&&(n.preventDefault(),n.stopPropagation()))}}return b.postDispatch&&b.postDispatch.call(this,n),n.result},props:"attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return e.which==null&&(e.which=t.charCode!=null?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,n){var r,s,o,u=n.button,a=n.fromElement;return e.pageX==null&&n.clientX!=null&&(r=e.target.ownerDocument||i,s=r.documentElement,o=r.body,e.pageX=n.clientX+(s&&s.scrollLeft||o&&o.scrollLeft||0)-(s&&s.clientLeft||o&&o.clientLeft||0),e.pageY=n.clientY+(s&&s.scrollTop||o&&o.scrollTop||0)-(s&&s.clientTop||o&&o.clientTop||0)),!e.relatedTarget&&a&&(e.relatedTarget=a===e.target?n.toElement:a),!e.which&&u!==t&&(e.which=u&1?1:u&2?3:u&4?2:0),e}},fix:function(e){if(e[v.expando])return e;var t,n,r=e,s=v.event.fixHooks[e.type]||{},o=s.props?this.props.concat(s.props):this.props;e=v.Event(r);for(t=o.length;t;)n=o[--t],e[n]=r[n];return e.target||(e.target=r.srcElement||i),e.target.nodeType===3&&(e.target=e.target.parentNode),e.metaKey=!!e.metaKey,s.filter?s.filter(e,r):e},special:{load:{noBubble:!0},focus:{delegateType:"focusin"},blur:{delegateType:"focusout"},beforeunload:{setup:function(e,t,n){v.isWindow(this)&&(this.onbeforeunload=n)},teardown:function(e,t){this.onbeforeunload===t&&(this.onbeforeunload=null)}}},simulate:function(e,t,n,r){var i=v.extend(new v.Event,n,{type:e,isSimulated:!0,originalEvent:{}});r?v.event.trigger(i,null,t):v.event.dispatch.call(t,i),i.isDefaultPrevented()&&n.preventDefault()}},v.event.handle=v.event.dispatch,v.removeEvent=i.removeEventListener?function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n,!1)}:function(e,t,n){var r="on"+t;e.detachEvent&&(typeof e[r]=="undefined"&&(e[r]=null),e.detachEvent(r,n))},v.Event=function(e,t){if(!(this instanceof v.Event))return new v.Event(e,t);e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||e.returnValue===!1||e.getPreventDefault&&e.getPreventDefault()?tt:et):this.type=e,t&&v.extend(this,t),this.timeStamp=e&&e.timeStamp||v.now(),this[v.expando]=!0},v.Event.prototype={preventDefault:function(){this.isDefaultPrevented=tt;var e=this.originalEvent;if(!e)return;e.preventDefault?e.preventDefault():e.returnValue=!1},stopPropagation:function(){this.isPropagationStopped=tt;var e=this.originalEvent;if(!e)return;e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=tt,this.stopPropagation()},isDefaultPrevented:et,isPropagationStopped:et,isImmediatePropagationStopped:et},v.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(e,t){v.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,s=e.handleObj,o=s.selector;if(!i||i!==r&&!v.contains(r,i))e.type=s.origType,n=s.handler.apply(this,arguments),e.type=t;return n}}}),v.support.submitBubbles||(v.event.special.submit={setup:function(){if(v.nodeName(this,"form"))return!1;v.event.add(this,"click._submit keypress._submit",function(e){var n=e.target,r=v.nodeName(n,"input")||v.nodeName(n,"button")?n.form:t;r&&!v._data(r,"_submit_attached")&&(v.event.add(r,"submit._submit",function(e){e._submit_bubble=!0}),v._data(r,"_submit_attached",!0))})},postDispatch:function(e){e._submit_bubble&&(delete e._submit_bubble,this.parentNode&&!e.isTrigger&&v.event.simulate("submit",this.parentNode,e,!0))},teardown:function(){if(v.nodeName(this,"form"))return!1;v.event.remove(this,"._submit")}}),v.support.changeBubbles||(v.event.special.change={setup:function(){if($.test(this.nodeName)){if(this.type==="checkbox"||this.type==="radio")v.event.add(this,"propertychange._change",function(e){e.originalEvent.propertyName==="checked"&&(this._just_changed=!0)}),v.event.add(this,"click._change",function(e){this._just_changed&&!e.isTrigger&&(this._just_changed=!1),v.event.simulate("change",this,e,!0)});return!1}v.event.add(this,"beforeactivate._change",function(e){var t=e.target;$.test(t.nodeName)&&!v._data(t,"_change_attached")&&(v.event.add(t,"change._change",function(e){this.parentNode&&!e.isSimulated&&!e.isTrigger&&v.event.simulate("change",this.parentNode,e,!0)}),v._data(t,"_change_attached",!0))})},handle:function(e){var t=e.target;if(this!==t||e.isSimulated||e.isTrigger||t.type!=="radio"&&t.type!=="checkbox")return e.handleObj.handler.apply(this,arguments)},teardown:function(){return v.event.remove(this,"._change"),!$.test(this.nodeName)}}),v.support.focusinBubbles||v.each({focus:"focusin",blur:"focusout"},function(e,t){var n=0,r=function(e){v.event.simulate(t,e.target,v.event.fix(e),!0)};v.event.special[t]={setup:function(){n++===0&&i.addEventListener(e,r,!0)},teardown:function(){--n===0&&i.removeEventListener(e,r,!0)}}}),v.fn.extend({on:function(e,n,r,i,s){var o,u;if(typeof e=="object"){typeof n!="string"&&(r=r||n,n=t);for(u in e)this.on(u,n,r,e[u],s);return this}r==null&&i==null?(i=n,r=n=t):i==null&&(typeof n=="string"?(i=r,r=t):(i=r,r=n,n=t));if(i===!1)i=et;else if(!i)return this;return s===1&&(o=i,i=function(e){return v().off(e),o.apply(this,arguments)},i.guid=o.guid||(o.guid=v.guid++)),this.each(function(){v.event.add(this,e,i,r,n)})},one:function(e,t,n,r){return this.on(e,t,n,r,1)},off:function(e,n,r){var i,s;if(e&&e.preventDefault&&e.handleObj)return i=e.handleObj,v(e.delegateTarget).off(i.namespace?i.origType+"."+i.namespace:i.origType,i.selector,i.handler),this;if(typeof e=="object"){for(s in e)this.off(s,n,e[s]);return this}if(n===!1||typeof n=="function")r=n,n=t;return r===!1&&(r=et),this.each(function(){v.event.remove(this,e,r,n)})},bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},live:function(e,t,n){return v(this.context).on(e,this.selector,t,n),this},die:function(e,t){return v(this.context).off(e,this.selector||"**",t),this},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return arguments.length===1?this.off(e,"**"):this.off(t,e||"**",n)},trigger:function(e,t){return this.each(function(){v.event.trigger(e,t,this)})},triggerHandler:function(e,t){if(this[0])return v.event.trigger(e,t,this[0],!0)},toggle:function(e){var t=arguments,n=e.guid||v.guid++,r=0,i=function(n){var i=(v._data(this,"lastToggle"+e.guid)||0)%r;return v._data(this,"lastToggle"+e.guid,i+1),n.preventDefault(),t[i].apply(this,arguments)||!1};i.guid=n;while(r<t.length)t[r++].guid=n;return this.click(i)},hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),v.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(e,t){v.fn[t]=function(e,n){return n==null&&(n=e,e=null),arguments.length>0?this.on(t,null,e,n):this.trigger(t)},Q.test(t)&&(v.event.fixHooks[t]=v.event.keyHooks),G.test(t)&&(v.event.fixHooks[t]=v.event.mouseHooks)}),function(e,t){function nt(e,t,n,r){n=n||[],t=t||g;var i,s,a,f,l=t.nodeType;if(!e||typeof e!="string")return n;if(l!==1&&l!==9)return[];a=o(t);if(!a&&!r)if(i=R.exec(e))if(f=i[1]){if(l===9){s=t.getElementById(f);if(!s||!s.parentNode)return n;if(s.id===f)return n.push(s),n}else if(t.ownerDocument&&(s=t.ownerDocument.getElementById(f))&&u(t,s)&&s.id===f)return n.push(s),n}else{if(i[2])return S.apply(n,x.call(t.getElementsByTagName(e),0)),n;if((f=i[3])&&Z&&t.getElementsByClassName)return S.apply(n,x.call(t.getElementsByClassName(f),0)),n}return vt(e.replace(j,"$1"),t,n,r,a)}function rt(e){return function(t){var n=t.nodeName.toLowerCase();return n==="input"&&t.type===e}}function it(e){return function(t){var n=t.nodeName.toLowerCase();return(n==="input"||n==="button")&&t.type===e}}function st(e){return N(function(t){return t=+t,N(function(n,r){var i,s=e([],n.length,t),o=s.length;while(o--)n[i=s[o]]&&(n[i]=!(r[i]=n[i]))})})}function ot(e,t,n){if(e===t)return n;var r=e.nextSibling;while(r){if(r===t)return-1;r=r.nextSibling}return 1}function ut(e,t){var n,r,s,o,u,a,f,l=L[d][e+" "];if(l)return t?0:l.slice(0);u=e,a=[],f=i.preFilter;while(u){if(!n||(r=F.exec(u)))r&&(u=u.slice(r[0].length)||u),a.push(s=[]);n=!1;if(r=I.exec(u))s.push(n=new m(r.shift())),u=u.slice(n.length),n.type=r[0].replace(j," ");for(o in i.filter)(r=J[o].exec(u))&&(!f[o]||(r=f[o](r)))&&(s.push(n=new m(r.shift())),u=u.slice(n.length),n.type=o,n.matches=r);if(!n)break}return t?u.length:u?nt.error(e):L(e,a).slice(0)}function at(e,t,r){var i=t.dir,s=r&&t.dir==="parentNode",o=w++;return t.first?function(t,n,r){while(t=t[i])if(s||t.nodeType===1)return e(t,n,r)}:function(t,r,u){if(!u){var a,f=b+" "+o+" ",l=f+n;while(t=t[i])if(s||t.nodeType===1){if((a=t[d])===l)return t.sizset;if(typeof a=="string"&&a.indexOf(f)===0){if(t.sizset)return t}else{t[d]=l;if(e(t,r,u))return t.sizset=!0,t;t.sizset=!1}}}else while(t=t[i])if(s||t.nodeType===1)if(e(t,r,u))return t}}function ft(e){return e.length>1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function lt(e,t,n,r,i){var s,o=[],u=0,a=e.length,f=t!=null;for(;u<a;u++)if(s=e[u])if(!n||n(s,r,i))o.push(s),f&&t.push(u);return o}function ct(e,t,n,r,i,s){return r&&!r[d]&&(r=ct(r)),i&&!i[d]&&(i=ct(i,s)),N(function(s,o,u,a){var f,l,c,h=[],p=[],d=o.length,v=s||dt(t||"*",u.nodeType?[u]:u,[]),m=e&&(s||!t)?lt(v,h,e,u,a):v,g=n?i||(s?e:d||r)?[]:o:m;n&&n(m,g,u,a);if(r){f=lt(g,p),r(f,[],u,a),l=f.length;while(l--)if(c=f[l])g[p[l]]=!(m[p[l]]=c)}if(s){if(i||e){if(i){f=[],l=g.length;while(l--)(c=g[l])&&f.push(m[l]=c);i(null,g=[],f,a)}l=g.length;while(l--)(c=g[l])&&(f=i?T.call(s,c):h[l])>-1&&(s[f]=!(o[f]=c))}}else g=lt(g===o?g.splice(d,g.length):g),i?i(null,o,g,a):S.apply(o,g)})}function ht(e){var t,n,r,s=e.length,o=i.relative[e[0].type],u=o||i.relative[" "],a=o?1:0,f=at(function(e){return e===t},u,!0),l=at(function(e){return T.call(t,e)>-1},u,!0),h=[function(e,n,r){return!o&&(r||n!==c)||((t=n).nodeType?f(e,n,r):l(e,n,r))}];for(;a<s;a++)if(n=i.relative[e[a].type])h=[at(ft(h),n)];else{n=i.filter[e[a].type].apply(null,e[a].matches);if(n[d]){r=++a;for(;r<s;r++)if(i.relative[e[r].type])break;return ct(a>1&&ft(h),a>1&&e.slice(0,a-1).join("").replace(j,"$1"),n,a<r&&ht(e.slice(a,r)),r<s&&ht(e=e.slice(r)),r<s&&e.join(""))}h.push(n)}return ft(h)}function pt(e,t){var r=t.length>0,s=e.length>0,o=function(u,a,f,l,h){var p,d,v,m=[],y=0,w="0",x=u&&[],T=h!=null,N=c,C=u||s&&i.find.TAG("*",h&&a.parentNode||a),k=b+=N==null?1:Math.E;T&&(c=a!==g&&a,n=o.el);for(;(p=C[w])!=null;w++){if(s&&p){for(d=0;v=e[d];d++)if(v(p,a,f)){l.push(p);break}T&&(b=k,n=++o.el)}r&&((p=!v&&p)&&y--,u&&x.push(p))}y+=w;if(r&&w!==y){for(d=0;v=t[d];d++)v(x,m,a,f);if(u){if(y>0)while(w--)!x[w]&&!m[w]&&(m[w]=E.call(l));m=lt(m)}S.apply(l,m),T&&!u&&m.length>0&&y+t.length>1&&nt.uniqueSort(l)}return T&&(b=k,c=N),x};return o.el=0,r?N(o):o}function dt(e,t,n){var r=0,i=t.length;for(;r<i;r++)nt(e,t[r],n);return n}function vt(e,t,n,r,s){var o,u,f,l,c,h=ut(e),p=h.length;if(!r&&h.length===1){u=h[0]=h[0].slice(0);if(u.length>2&&(f=u[0]).type==="ID"&&t.nodeType===9&&!s&&i.relative[u[1].type]){t=i.find.ID(f.matches[0].replace($,""),t,s)[0];if(!t)return n;e=e.slice(u.shift().length)}for(o=J.POS.test(e)?-1:u.length-1;o>=0;o--){f=u[o];if(i.relative[l=f.type])break;if(c=i.find[l])if(r=c(f.matches[0].replace($,""),z.test(u[0].type)&&t.parentNode||t,s)){u.splice(o,1),e=r.length&&u.join("");if(!e)return S.apply(n,x.call(r,0)),n;break}}}return a(e,h)(r,t,s,n,z.test(e)),n}function mt(){}var n,r,i,s,o,u,a,f,l,c,h=!0,p="undefined",d=("sizcache"+Math.random()).replace(".",""),m=String,g=e.document,y=g.documentElement,b=0,w=0,E=[].pop,S=[].push,x=[].slice,T=[].indexOf||function(e){var t=0,n=this.length;for(;t<n;t++)if(this[t]===e)return t;return-1},N=function(e,t){return e[d]=t==null||t,e},C=function(){var e={},t=[];return N(function(n,r){return t.push(n)>i.cacheLength&&delete e[t.shift()],e[n+" "]=r},e)},k=C(),L=C(),A=C(),O="[\\x20\\t\\r\\n\\f]",M="(?:\\\\.|[-\\w]|[^\\x00-\\xa0])+",_=M.replace("w","w#"),D="([*^$|!~]?=)",P="\\["+O+"*("+M+")"+O+"*(?:"+D+O+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+_+")|)|)"+O+"*\\]",H=":("+M+")(?:\\((?:(['\"])((?:\\\\.|[^\\\\])*?)\\2|([^()[\\]]*|(?:(?:"+P+")|[^:]|\\\\.)*|.*))\\)|)",B=":(even|odd|eq|gt|lt|nth|first|last)(?:\\("+O+"*((?:-\\d)?\\d*)"+O+"*\\)|)(?=[^-]|$)",j=new RegExp("^"+O+"+|((?:^|[^\\\\])(?:\\\\.)*)"+O+"+$","g"),F=new RegExp("^"+O+"*,"+O+"*"),I=new RegExp("^"+O+"*([\\x20\\t\\r\\n\\f>+~])"+O+"*"),q=new RegExp(H),R=/^(?:#([\w\-]+)|(\w+)|\.([\w\-]+))$/,U=/^:not/,z=/[\x20\t\r\n\f]*[+~]/,W=/:not\($/,X=/h\d/i,V=/input|select|textarea|button/i,$=/\\(?!\\)/g,J={ID:new RegExp("^#("+M+")"),CLASS:new RegExp("^\\.("+M+")"),NAME:new RegExp("^\\[name=['\"]?("+M+")['\"]?\\]"),TAG:new RegExp("^("+M.replace("w","w*")+")"),ATTR:new RegExp("^"+P),PSEUDO:new RegExp("^"+H),POS:new RegExp(B,"i"),CHILD:new RegExp("^:(only|nth|first|last)-child(?:\\("+O+"*(even|odd|(([+-]|)(\\d*)n|)"+O+"*(?:([+-]|)"+O+"*(\\d+)|))"+O+"*\\)|)","i"),needsContext:new RegExp("^"+O+"*[>+~]|"+B,"i")},K=function(e){var t=g.createElement("div");try{return e(t)}catch(n){return!1}finally{t=null}},Q=K(function(e){return e.appendChild(g.createComment("")),!e.getElementsByTagName("*").length}),G=K(function(e){return e.innerHTML="<a href='#'></a>",e.firstChild&&typeof e.firstChild.getAttribute!==p&&e.firstChild.getAttribute("href")==="#"}),Y=K(function(e){e.innerHTML="<select></select>";var t=typeof e.lastChild.getAttribute("multiple");return t!=="boolean"&&t!=="string"}),Z=K(function(e){return e.innerHTML="<div class='hidden e'></div><div class='hidden'></div>",!e.getElementsByClassName||!e.getElementsByClassName("e").length?!1:(e.lastChild.className="e",e.getElementsByClassName("e").length===2)}),et=K(function(e){e.id=d+0,e.innerHTML="<a name='"+d+"'></a><div name='"+d+"'></div>",y.insertBefore(e,y.firstChild);var t=g.getElementsByName&&g.getElementsByName(d).length===2+g.getElementsByName(d+0).length;return r=!g.getElementById(d),y.removeChild(e),t});try{x.call(y.childNodes,0)[0].nodeType}catch(tt){x=function(e){var t,n=[];for(;t=this[e];e++)n.push(t);return n}}nt.matches=function(e,t){return nt(e,null,null,t)},nt.matchesSelector=function(e,t){return nt(t,null,null,[e]).length>0},s=nt.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(i===1||i===9||i===11){if(typeof e.textContent=="string")return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=s(e)}else if(i===3||i===4)return e.nodeValue}else for(;t=e[r];r++)n+=s(t);return n},o=nt.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?t.nodeName!=="HTML":!1},u=nt.contains=y.contains?function(e,t){var n=e.nodeType===9?e.documentElement:e,r=t&&t.parentNode;return e===r||!!(r&&r.nodeType===1&&n.contains&&n.contains(r))}:y.compareDocumentPosition?function(e,t){return t&&!!(e.compareDocumentPosition(t)&16)}:function(e,t){while(t=t.parentNode)if(t===e)return!0;return!1},nt.attr=function(e,t){var n,r=o(e);return r||(t=t.toLowerCase()),(n=i.attrHandle[t])?n(e):r||Y?e.getAttribute(t):(n=e.getAttributeNode(t),n?typeof e[t]=="boolean"?e[t]?t:null:n.specified?n.value:null:null)},i=nt.selectors={cacheLength:50,createPseudo:N,match:J,attrHandle:G?{}:{href:function(e){return e.getAttribute("href",2)},type:function(e){return e.getAttribute("type")}},find:{ID:r?function(e,t,n){if(typeof t.getElementById!==p&&!n){var r=t.getElementById(e);return r&&r.parentNode?[r]:[]}}:function(e,n,r){if(typeof n.getElementById!==p&&!r){var i=n.getElementById(e);return i?i.id===e||typeof i.getAttributeNode!==p&&i.getAttributeNode("id").value===e?[i]:t:[]}},TAG:Q?function(e,t){if(typeof t.getElementsByTagName!==p)return t.getElementsByTagName(e)}:function(e,t){var n=t.getElementsByTagName(e);if(e==="*"){var r,i=[],s=0;for(;r=n[s];s++)r.nodeType===1&&i.push(r);return i}return n},NAME:et&&function(e,t){if(typeof t.getElementsByName!==p)return t.getElementsByName(name)},CLASS:Z&&function(e,t,n){if(typeof t.getElementsByClassName!==p&&!n)return t.getElementsByClassName(e)}},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace($,""),e[3]=(e[4]||e[5]||"").replace($,""),e[2]==="~="&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),e[1]==="nth"?(e[2]||nt.error(e[0]),e[3]=+(e[3]?e[4]+(e[5]||1):2*(e[2]==="even"||e[2]==="odd")),e[4]=+(e[6]+e[7]||e[2]==="odd")):e[2]&&nt.error(e[0]),e},PSEUDO:function(e){var t,n;if(J.CHILD.test(e[0]))return null;if(e[3])e[2]=e[3];else if(t=e[4])q.test(t)&&(n=ut(t,!0))&&(n=t.indexOf(")",t.length-n)-t.length)&&(t=t.slice(0,n),e[0]=e[0].slice(0,n)),e[2]=t;return e.slice(0,3)}},filter:{ID:r?function(e){return e=e.replace($,""),function(t){return t.getAttribute("id")===e}}:function(e){return e=e.replace($,""),function(t){var n=typeof t.getAttributeNode!==p&&t.getAttributeNode("id");return n&&n.value===e}},TAG:function(e){return e==="*"?function(){return!0}:(e=e.replace($,"").toLowerCase(),function(t){return t.nodeName&&t.nodeName.toLowerCase()===e})},CLASS:function(e){var t=k[d][e+" "];return t||(t=new RegExp("(^|"+O+")"+e+"("+O+"|$)"))&&k(e,function(e){return t.test(e.className||typeof e.getAttribute!==p&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r,i){var s=nt.attr(r,e);return s==null?t==="!=":t?(s+="",t==="="?s===n:t==="!="?s!==n:t==="^="?n&&s.indexOf(n)===0:t==="*="?n&&s.indexOf(n)>-1:t==="$="?n&&s.substr(s.length-n.length)===n:t==="~="?(" "+s+" ").indexOf(n)>-1:t==="|="?s===n||s.substr(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r){return e==="nth"?function(e){var t,i,s=e.parentNode;if(n===1&&r===0)return!0;if(s){i=0;for(t=s.firstChild;t;t=t.nextSibling)if(t.nodeType===1){i++;if(e===t)break}}return i-=r,i===n||i%n===0&&i/n>=0}:function(t){var n=t;switch(e){case"only":case"first":while(n=n.previousSibling)if(n.nodeType===1)return!1;if(e==="first")return!0;n=t;case"last":while(n=n.nextSibling)if(n.nodeType===1)return!1;return!0}}},PSEUDO:function(e,t){var n,r=i.pseudos[e]||i.setFilters[e.toLowerCase()]||nt.error("unsupported pseudo: "+e);return r[d]?r(t):r.length>1?(n=[e,e,"",t],i.setFilters.hasOwnProperty(e.toLowerCase())?N(function(e,n){var i,s=r(e,t),o=s.length;while(o--)i=T.call(e,s[o]),e[i]=!(n[i]=s[o])}):function(e){return r(e,0,n)}):r}},pseudos:{not:N(function(e){var t=[],n=[],r=a(e.replace(j,"$1"));return r[d]?N(function(e,t,n,i){var s,o=r(e,null,i,[]),u=e.length;while(u--)if(s=o[u])e[u]=!(t[u]=s)}):function(e,i,s){return t[0]=e,r(t,null,s,n),!n.pop()}}),has:N(function(e){return function(t){return nt(e,t).length>0}}),contains:N(function(e){return function(t){return(t.textContent||t.innerText||s(t)).indexOf(e)>-1}}),enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return t==="input"&&!!e.checked||t==="option"&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},parent:function(e){return!i.pseudos.empty(e)},empty:function(e){var t;e=e.firstChild;while(e){if(e.nodeName>"@"||(t=e.nodeType)===3||t===4)return!1;e=e.nextSibling}return!0},header:function(e){return X.test(e.nodeName)},text:function(e){var t,n;return e.nodeName.toLowerCase()==="input"&&(t=e.type)==="text"&&((n=e.getAttribute("type"))==null||n.toLowerCase()===t)},radio:rt("radio"),checkbox:rt("checkbox"),file:rt("file"),password:rt("password"),image:rt("image"),submit:it("submit"),reset:it("reset"),button:function(e){var t=e.nodeName.toLowerCase();return t==="input"&&e.type==="button"||t==="button"},input:function(e){return V.test(e.nodeName)},focus:function(e){var t=e.ownerDocument;return e===t.activeElement&&(!t.hasFocus||t.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},active:function(e){return e===e.ownerDocument.activeElement},first:st(function(){return[0]}),last:st(function(e,t){return[t-1]}),eq:st(function(e,t,n){return[n<0?n+t:n]}),even:st(function(e,t){for(var n=0;n<t;n+=2)e.push(n);return e}),odd:st(function(e,t){for(var n=1;n<t;n+=2)e.push(n);return e}),lt:st(function(e,t,n){for(var r=n<0?n+t:n;--r>=0;)e.push(r);return e}),gt:st(function(e,t,n){for(var r=n<0?n+t:n;++r<t;)e.push(r);return e})}},f=y.compareDocumentPosition?function(e,t){return e===t?(l=!0,0):(!e.compareDocumentPosition||!t.compareDocumentPosition?e.compareDocumentPosition:e.compareDocumentPosition(t)&4)?-1:1}:function(e,t){if(e===t)return l=!0,0;if(e.sourceIndex&&t.sourceIndex)return e.sourceIndex-t.sourceIndex;var n,r,i=[],s=[],o=e.parentNode,u=t.parentNode,a=o;if(o===u)return ot(e,t);if(!o)return-1;if(!u)return 1;while(a)i.unshift(a),a=a.parentNode;a=u;while(a)s.unshift(a),a=a.parentNode;n=i.length,r=s.length;for(var f=0;f<n&&f<r;f++)if(i[f]!==s[f])return ot(i[f],s[f]);return f===n?ot(e,s[f],-1):ot(i[f],t,1)},[0,0].sort(f),h=!l,nt.uniqueSort=function(e){var t,n=[],r=1,i=0;l=h,e.sort(f);if(l){for(;t=e[r];r++)t===e[r-1]&&(i=n.push(r));while(i--)e.splice(n[i],1)}return e},nt.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},a=nt.compile=function(e,t){var n,r=[],i=[],s=A[d][e+" "];if(!s){t||(t=ut(e)),n=t.length;while(n--)s=ht(t[n]),s[d]?r.push(s):i.push(s);s=A(e,pt(i,r))}return s},g.querySelectorAll&&function(){var e,t=vt,n=/'|\\/g,r=/\=[\x20\t\r\n\f]*([^'"\]]*)[\x20\t\r\n\f]*\]/g,i=[":focus"],s=[":active"],u=y.matchesSelector||y.mozMatchesSelector||y.webkitMatchesSelector||y.oMatchesSelector||y.msMatchesSelector;K(function(e){e.innerHTML="<select><option selected=''></option></select>",e.querySelectorAll("[selected]").length||i.push("\\["+O+"*(?:checked|disabled|ismap|multiple|readonly|selected|value)"),e.querySelectorAll(":checked").length||i.push(":checked")}),K(function(e){e.innerHTML="<p test=''></p>",e.querySelectorAll("[test^='']").length&&i.push("[*^$]="+O+"*(?:\"\"|'')"),e.innerHTML="<input type='hidden'/>",e.querySelectorAll(":enabled").length||i.push(":enabled",":disabled")}),i=new RegExp(i.join("|")),vt=function(e,r,s,o,u){if(!o&&!u&&!i.test(e)){var a,f,l=!0,c=d,h=r,p=r.nodeType===9&&e;if(r.nodeType===1&&r.nodeName.toLowerCase()!=="object"){a=ut(e),(l=r.getAttribute("id"))?c=l.replace(n,"\\$&"):r.setAttribute("id",c),c="[id='"+c+"'] ",f=a.length;while(f--)a[f]=c+a[f].join("");h=z.test(e)&&r.parentNode||r,p=a.join(",")}if(p)try{return S.apply(s,x.call(h.querySelectorAll(p),0)),s}catch(v){}finally{l||r.removeAttribute("id")}}return t(e,r,s,o,u)},u&&(K(function(t){e=u.call(t,"div");try{u.call(t,"[test!='']:sizzle"),s.push("!=",H)}catch(n){}}),s=new RegExp(s.join("|")),nt.matchesSelector=function(t,n){n=n.replace(r,"='$1']");if(!o(t)&&!s.test(n)&&!i.test(n))try{var a=u.call(t,n);if(a||e||t.document&&t.document.nodeType!==11)return a}catch(f){}return nt(n,null,null,[t]).length>0})}(),i.pseudos.nth=i.pseudos.eq,i.filters=mt.prototype=i.pseudos,i.setFilters=new mt,nt.attr=v.attr,v.find=nt,v.expr=nt.selectors,v.expr[":"]=v.expr.pseudos,v.unique=nt.uniqueSort,v.text=nt.getText,v.isXMLDoc=nt.isXML,v.contains=nt.contains}(e);var nt=/Until$/,rt=/^(?:parents|prev(?:Until|All))/,it=/^.[^:#\[\.,]*$/,st=v.expr.match.needsContext,ot={children:!0,contents:!0,next:!0,prev:!0};v.fn.extend({find:function(e){var t,n,r,i,s,o,u=this;if(typeof e!="string")return v(e).filter(function(){for(t=0,n=u.length;t<n;t++)if(v.contains(u[t],this))return!0});o=this.pushStack("","find",e);for(t=0,n=this.length;t<n;t++){r=o.length,v.find(e,this[t],o);if(t>0)for(i=r;i<o.length;i++)for(s=0;s<r;s++)if(o[s]===o[i]){o.splice(i--,1);break}}return o},has:function(e){var t,n=v(e,this),r=n.length;return this.filter(function(){for(t=0;t<r;t++)if(v.contains(this,n[t]))return!0})},not:function(e){return this.pushStack(ft(this,e,!1),"not",e)},filter:function(e){return this.pushStack(ft(this,e,!0),"filter",e)},is:function(e){return!!e&&(typeof e=="string"?st.test(e)?v(e,this.context).index(this[0])>=0:v.filter(e,this).length>0:this.filter(e).length>0)},closest:function(e,t){var n,r=0,i=this.length,s=[],o=st.test(e)||typeof e!="string"?v(e,t||this.context):0;for(;r<i;r++){n=this[r];while(n&&n.ownerDocument&&n!==t&&n.nodeType!==11){if(o?o.index(n)>-1:v.find.matchesSelector(n,e)){s.push(n);break}n=n.parentNode}}return s=s.length>1?v.unique(s):s,this.pushStack(s,"closest",e)},index:function(e){return e?typeof e=="string"?v.inArray(this[0],v(e)):v.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.prevAll().length:-1},add:function(e,t){var n=typeof e=="string"?v(e,t):v.makeArray(e&&e.nodeType?[e]:e),r=v.merge(this.get(),n);return this.pushStack(ut(n[0])||ut(r[0])?r:v.unique(r))},addBack:function(e){return this.add(e==null?this.prevObject:this.prevObject.filter(e))}}),v.fn.andSelf=v.fn.addBack,v.each({parent:function(e){var t=e.parentNode;return t&&t.nodeType!==11?t:null},parents:function(e){return v.dir(e,"parentNode")},parentsUntil:function(e,t,n){return v.dir(e,"parentNode",n)},next:function(e){return at(e,"nextSibling")},prev:function(e){return at(e,"previousSibling")},nextAll:function(e){return v.dir(e,"nextSibling")},prevAll:function(e){return v.dir(e,"previousSibling")},nextUntil:function(e,t,n){return v.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return v.dir(e,"previousSibling",n)},siblings:function(e){return v.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return v.sibling(e.firstChild)},contents:function(e){return v.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:v.merge([],e.childNodes)}},function(e,t){v.fn[e]=function(n,r){var i=v.map(this,t,n);return nt.test(e)||(r=n),r&&typeof r=="string"&&(i=v.filter(r,i)),i=this.length>1&&!ot[e]?v.unique(i):i,this.length>1&&rt.test(e)&&(i=i.reverse()),this.pushStack(i,e,l.call(arguments).join(","))}}),v.extend({filter:function(e,t,n){return n&&(e=":not("+e+")"),t.length===1?v.find.matchesSelector(t[0],e)?[t[0]]:[]:v.find.matches(e,t)},dir:function(e,n,r){var i=[],s=e[n];while(s&&s.nodeType!==9&&(r===t||s.nodeType!==1||!v(s).is(r)))s.nodeType===1&&i.push(s),s=s[n];return i},sibling:function(e,t){var n=[];for(;e;e=e.nextSibling)e.nodeType===1&&e!==t&&n.push(e);return n}});var ct="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",ht=/ jQuery\d+="(?:null|\d+)"/g,pt=/^\s+/,dt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,vt=/<([\w:]+)/,mt=/<tbody/i,gt=/<|&#?\w+;/,yt=/<(?:script|style|link)/i,bt=/<(?:script|object|embed|option|style)/i,wt=new RegExp("<(?:"+ct+")[\\s/>]","i"),Et=/^(?:checkbox|radio)$/,St=/checked\s*(?:[^=]|=\s*.checked.)/i,xt=/\/(java|ecma)script/i,Tt=/^\s*<!(?:\[CDATA\[|\-\-)|[\]\-]{2}>\s*$/g,Nt={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]},Ct=lt(i),kt=Ct.appendChild(i.createElement("div"));Nt.optgroup=Nt.option,Nt.tbody=Nt.tfoot=Nt.colgroup=Nt.caption=Nt.thead,Nt.th=Nt.td,v.support.htmlSerialize||(Nt._default=[1,"X<div>","</div>"]),v.fn.extend({text:function(e){return v.access(this,function(e){return e===t?v.text(this):this.empty().append((this[0]&&this[0].ownerDocument||i).createTextNode(e))},null,e,arguments.length)},wrapAll:function(e){if(v.isFunction(e))return this.each(function(t){v(this).wrapAll(e.call(this,t))});if(this[0]){var t=v(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstChild&&e.firstChild.nodeType===1)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return v.isFunction(e)?this.each(function(t){v(this).wrapInner(e.call(this,t))}):this.each(function(){var t=v(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=v.isFunction(e);return this.each(function(n){v(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){v.nodeName(this,"body")||v(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(e){(this.nodeType===1||this.nodeType===11)&&this.appendChild(e)})},prepend:function(){return this.domManip(arguments,!0,function(e){(this.nodeType===1||this.nodeType===11)&&this.insertBefore(e,this.firstChild)})},before:function(){if(!ut(this[0]))return this.domManip(arguments,!1,function(e){this.parentNode.insertBefore(e,this)});if(arguments.length){var e=v.clean(arguments);return this.pushStack(v.merge(e,this),"before",this.selector)}},after:function(){if(!ut(this[0]))return this.domManip(arguments,!1,function(e){this.parentNode.insertBefore(e,this.nextSibling)});if(arguments.length){var e=v.clean(arguments);return this.pushStack(v.merge(this,e),"after",this.selector)}},remove:function(e,t){var n,r=0;for(;(n=this[r])!=null;r++)if(!e||v.filter(e,[n]).length)!t&&n.nodeType===1&&(v.cleanData(n.getElementsByTagName("*")),v.cleanData([n])),n.parentNode&&n.parentNode.removeChild(n);return this},empty:function(){var e,t=0;for(;(e=this[t])!=null;t++){e.nodeType===1&&v.cleanData(e.getElementsByTagName("*"));while(e.firstChild)e.removeChild(e.firstChild)}return this},clone:function(e,t){return e=e==null?!1:e,t=t==null?e:t,this.map(function(){return v.clone(this,e,t)})},html:function(e){return v.access(this,function(e){var n=this[0]||{},r=0,i=this.length;if(e===t)return n.nodeType===1?n.innerHTML.replace(ht,""):t;if(typeof e=="string"&&!yt.test(e)&&(v.support.htmlSerialize||!wt.test(e))&&(v.support.leadingWhitespace||!pt.test(e))&&!Nt[(vt.exec(e)||["",""])[1].toLowerCase()]){e=e.replace(dt,"<$1></$2>");try{for(;r<i;r++)n=this[r]||{},n.nodeType===1&&(v.cleanData(n.getElementsByTagName("*")),n.innerHTML=e);n=0}catch(s){}}n&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(e){return ut(this[0])?this.length?this.pushStack(v(v.isFunction(e)?e():e),"replaceWith",e):this:v.isFunction(e)?this.each(function(t){var n=v(this),r=n.html();n.replaceWith(e.call(this,t,r))}):(typeof e!="string"&&(e=v(e).detach()),this.each(function(){var t=this.nextSibling,n=this.parentNode;v(this).remove(),t?v(t).before(e):v(n).append(e)}))},detach:function(e){return this.remove(e,!0)},domManip:function(e,n,r){e=[].concat.apply([],e);var i,s,o,u,a=0,f=e[0],l=[],c=this.length;if(!v.support.checkClone&&c>1&&typeof f=="string"&&St.test(f))return this.each(function(){v(this).domManip(e,n,r)});if(v.isFunction(f))return this.each(function(i){var s=v(this);e[0]=f.call(this,i,n?s.html():t),s.domManip(e,n,r)});if(this[0]){i=v.buildFragment(e,this,l),o=i.fragment,s=o.firstChild,o.childNodes.length===1&&(o=s);if(s){n=n&&v.nodeName(s,"tr");for(u=i.cacheable||c-1;a<c;a++)r.call(n&&v.nodeName(this[a],"table")?Lt(this[a],"tbody"):this[a],a===u?o:v.clone(o,!0,!0))}o=s=null,l.length&&v.each(l,function(e,t){t.src?v.ajax?v.ajax({url:t.src,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0}):v.error("no ajax"):v.globalEval((t.text||t.textContent||t.innerHTML||"").replace(Tt,"")),t.parentNode&&t.parentNode.removeChild(t)})}return this}}),v.buildFragment=function(e,n,r){var s,o,u,a=e[0];return n=n||i,n=!n.nodeType&&n[0]||n,n=n.ownerDocument||n,e.length===1&&typeof a=="string"&&a.length<512&&n===i&&a.charAt(0)==="<"&&!bt.test(a)&&(v.support.checkClone||!St.test(a))&&(v.support.html5Clone||!wt.test(a))&&(o=!0,s=v.fragments[a],u=s!==t),s||(s=n.createDocumentFragment(),v.clean(e,n,s,r),o&&(v.fragments[a]=u&&s)),{fragment:s,cacheable:o}},v.fragments={},v.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){v.fn[e]=function(n){var r,i=0,s=[],o=v(n),u=o.length,a=this.length===1&&this[0].parentNode;if((a==null||a&&a.nodeType===11&&a.childNodes.length===1)&&u===1)return o[t](this[0]),this;for(;i<u;i++)r=(i>0?this.clone(!0):this).get(),v(o[i])[t](r),s=s.concat(r);return this.pushStack(s,e,o.selector)}}),v.extend({clone:function(e,t,n){var r,i,s,o;v.support.html5Clone||v.isXMLDoc(e)||!wt.test("<"+e.nodeName+">")?o=e.cloneNode(!0):(kt.innerHTML=e.outerHTML,kt.removeChild(o=kt.firstChild));if((!v.support.noCloneEvent||!v.support.noCloneChecked)&&(e.nodeType===1||e.nodeType===11)&&!v.isXMLDoc(e)){Ot(e,o),r=Mt(e),i=Mt(o);for(s=0;r[s];++s)i[s]&&Ot(r[s],i[s])}if(t){At(e,o);if(n){r=Mt(e),i=Mt(o);for(s=0;r[s];++s)At(r[s],i[s])}}return r=i=null,o},clean:function(e,t,n,r){var s,o,u,a,f,l,c,h,p,d,m,g,y=t===i&&Ct,b=[];if(!t||typeof t.createDocumentFragment=="undefined")t=i;for(s=0;(u=e[s])!=null;s++){typeof u=="number"&&(u+="");if(!u)continue;if(typeof u=="string")if(!gt.test(u))u=t.createTextNode(u);else{y=y||lt(t),c=t.createElement("div"),y.appendChild(c),u=u.replace(dt,"<$1></$2>"),a=(vt.exec(u)||["",""])[1].toLowerCase(),f=Nt[a]||Nt._default,l=f[0],c.innerHTML=f[1]+u+f[2];while(l--)c=c.lastChild;if(!v.support.tbody){h=mt.test(u),p=a==="table"&&!h?c.firstChild&&c.firstChild.childNodes:f[1]==="<table>"&&!h?c.childNodes:[];for(o=p.length-1;o>=0;--o)v.nodeName(p[o],"tbody")&&!p[o].childNodes.length&&p[o].parentNode.removeChild(p[o])}!v.support.leadingWhitespace&&pt.test(u)&&c.insertBefore(t.createTextNode(pt.exec(u)[0]),c.firstChild),u=c.childNodes,c.parentNode.removeChild(c)}u.nodeType?b.push(u):v.merge(b,u)}c&&(u=c=y=null);if(!v.support.appendChecked)for(s=0;(u=b[s])!=null;s++)v.nodeName(u,"input")?_t(u):typeof u.getElementsByTagName!="undefined"&&v.grep(u.getElementsByTagName("input"),_t);if(n){m=function(e){if(!e.type||xt.test(e.type))return r?r.push(e.parentNode?e.parentNode.removeChild(e):e):n.appendChild(e)};for(s=0;(u=b[s])!=null;s++)if(!v.nodeName(u,"script")||!m(u))n.appendChild(u),typeof u.getElementsByTagName!="undefined"&&(g=v.grep(v.merge([],u.getElementsByTagName("script")),m),b.splice.apply(b,[s+1,0].concat(g)),s+=g.length)}return b},cleanData:function(e,t){var n,r,i,s,o=0,u=v.expando,a=v.cache,f=v.support.deleteExpando,l=v.event.special;for(;(i=e[o])!=null;o++)if(t||v.acceptData(i)){r=i[u],n=r&&a[r];if(n){if(n.events)for(s in n.events)l[s]?v.event.remove(i,s):v.removeEvent(i,s,n.handle);a[r]&&(delete a[r],f?delete i[u]:i.removeAttribute?i.removeAttribute(u):i[u]=null,v.deletedIds.push(r))}}}}),function(){var e,t;v.uaMatch=function(e){e=e.toLowerCase();var t=/(chrome)[ \/]([\w.]+)/.exec(e)||/(webkit)[ \/]([\w.]+)/.exec(e)||/(opera)(?:.*version|)[ \/]([\w.]+)/.exec(e)||/(msie) ([\w.]+)/.exec(e)||e.indexOf("compatible")<0&&/(mozilla)(?:.*? rv:([\w.]+)|)/.exec(e)||[];return{browser:t[1]||"",version:t[2]||"0"}},e=v.uaMatch(o.userAgent),t={},e.browser&&(t[e.browser]=!0,t.version=e.version),t.chrome?t.webkit=!0:t.webkit&&(t.safari=!0),v.browser=t,v.sub=function(){function e(t,n){return new e.fn.init(t,n)}v.extend(!0,e,this),e.superclass=this,e.fn=e.prototype=this(),e.fn.constructor=e,e.sub=this.sub,e.fn.init=function(r,i){return i&&i instanceof v&&!(i instanceof e)&&(i=e(i)),v.fn.init.call(this,r,i,t)},e.fn.init.prototype=e.fn;var t=e(i);return e}}();var Dt,Pt,Ht,Bt=/alpha\([^)]*\)/i,jt=/opacity=([^)]*)/,Ft=/^(top|right|bottom|left)$/,It=/^(none|table(?!-c[ea]).+)/,qt=/^margin/,Rt=new RegExp("^("+m+")(.*)$","i"),Ut=new RegExp("^("+m+")(?!px)[a-z%]+$","i"),zt=new RegExp("^([-+])=("+m+")","i"),Wt={BODY:"block"},Xt={position:"absolute",visibility:"hidden",display:"block"},Vt={letterSpacing:0,fontWeight:400},$t=["Top","Right","Bottom","Left"],Jt=["Webkit","O","Moz","ms"],Kt=v.fn.toggle;v.fn.extend({css:function(e,n){return v.access(this,function(e,n,r){return r!==t?v.style(e,n,r):v.css(e,n)},e,n,arguments.length>1)},show:function(){return Yt(this,!0)},hide:function(){return Yt(this)},toggle:function(e,t){var n=typeof e=="boolean";return v.isFunction(e)&&v.isFunction(t)?Kt.apply(this,arguments):this.each(function(){(n?e:Gt(this))?v(this).show():v(this).hide()})}}),v.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Dt(e,"opacity");return n===""?"1":n}}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":v.support.cssFloat?"cssFloat":"styleFloat"},style:function(e,n,r,i){if(!e||e.nodeType===3||e.nodeType===8||!e.style)return;var s,o,u,a=v.camelCase(n),f=e.style;n=v.cssProps[a]||(v.cssProps[a]=Qt(f,a)),u=v.cssHooks[n]||v.cssHooks[a];if(r===t)return u&&"get"in u&&(s=u.get(e,!1,i))!==t?s:f[n];o=typeof r,o==="string"&&(s=zt.exec(r))&&(r=(s[1]+1)*s[2]+parseFloat(v.css(e,n)),o="number");if(r==null||o==="number"&&isNaN(r))return;o==="number"&&!v.cssNumber[a]&&(r+="px");if(!u||!("set"in u)||(r=u.set(e,r,i))!==t)try{f[n]=r}catch(l){}},css:function(e,n,r,i){var s,o,u,a=v.camelCase(n);return n=v.cssProps[a]||(v.cssProps[a]=Qt(e.style,a)),u=v.cssHooks[n]||v.cssHooks[a],u&&"get"in u&&(s=u.get(e,!0,i)),s===t&&(s=Dt(e,n)),s==="normal"&&n in Vt&&(s=Vt[n]),r||i!==t?(o=parseFloat(s),r||v.isNumeric(o)?o||0:s):s},swap:function(e,t,n){var r,i,s={};for(i in t)s[i]=e.style[i],e.style[i]=t[i];r=n.call(e);for(i in t)e.style[i]=s[i];return r}}),e.getComputedStyle?Dt=function(t,n){var r,i,s,o,u=e.getComputedStyle(t,null),a=t.style;return u&&(r=u.getPropertyValue(n)||u[n],r===""&&!v.contains(t.ownerDocument,t)&&(r=v.style(t,n)),Ut.test(r)&&qt.test(n)&&(i=a.width,s=a.minWidth,o=a.maxWidth,a.minWidth=a.maxWidth=a.width=r,r=u.width,a.width=i,a.minWidth=s,a.maxWidth=o)),r}:i.documentElement.currentStyle&&(Dt=function(e,t){var n,r,i=e.currentStyle&&e.currentStyle[t],s=e.style;return i==null&&s&&s[t]&&(i=s[t]),Ut.test(i)&&!Ft.test(t)&&(n=s.left,r=e.runtimeStyle&&e.runtimeStyle.left,r&&(e.runtimeStyle.left=e.currentStyle.left),s.left=t==="fontSize"?"1em":i,i=s.pixelLeft+"px",s.left=n,r&&(e.runtimeStyle.left=r)),i===""?"auto":i}),v.each(["height","width"],function(e,t){v.cssHooks[t]={get:function(e,n,r){if(n)return e.offsetWidth===0&&It.test(Dt(e,"display"))?v.swap(e,Xt,function(){return tn(e,t,r)}):tn(e,t,r)},set:function(e,n,r){return Zt(e,n,r?en(e,t,r,v.support.boxSizing&&v.css(e,"boxSizing")==="border-box"):0)}}}),v.support.opacity||(v.cssHooks.opacity={get:function(e,t){return jt.test((t&&e.currentStyle?e.currentStyle.filter:e.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":t?"1":""},set:function(e,t){var n=e.style,r=e.currentStyle,i=v.isNumeric(t)?"alpha(opacity="+t*100+")":"",s=r&&r.filter||n.filter||"";n.zoom=1;if(t>=1&&v.trim(s.replace(Bt,""))===""&&n.removeAttribute){n.removeAttribute("filter");if(r&&!r.filter)return}n.filter=Bt.test(s)?s.replace(Bt,i):s+" "+i}}),v(function(){v.support.reliableMarginRight||(v.cssHooks.marginRight={get:function(e,t){return v.swap(e,{display:"inline-block"},function(){if(t)return Dt(e,"marginRight")})}}),!v.support.pixelPosition&&v.fn.position&&v.each(["top","left"],function(e,t){v.cssHooks[t]={get:function(e,n){if(n){var r=Dt(e,t);return Ut.test(r)?v(e).position()[t]+"px":r}}}})}),v.expr&&v.expr.filters&&(v.expr.filters.hidden=function(e){return e.offsetWidth===0&&e.offsetHeight===0||!v.support.reliableHiddenOffsets&&(e.style&&e.style.display||Dt(e,"display"))==="none"},v.expr.filters.visible=function(e){return!v.expr.filters.hidden(e)}),v.each({margin:"",padding:"",border:"Width"},function(e,t){v.cssHooks[e+t]={expand:function(n){var r,i=typeof n=="string"?n.split(" "):[n],s={};for(r=0;r<4;r++)s[e+$t[r]+t]=i[r]||i[r-2]||i[0];return s}},qt.test(e)||(v.cssHooks[e+t].set=Zt)});var rn=/%20/g,sn=/\[\]$/,on=/\r?\n/g,un=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,an=/^(?:select|textarea)/i;v.fn.extend({serialize:function(){return v.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?v.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||an.test(this.nodeName)||un.test(this.type))}).map(function(e,t){var n=v(this).val();return n==null?null:v.isArray(n)?v.map(n,function(e,n){return{name:t.name,value:e.replace(on,"\r\n")}}):{name:t.name,value:n.replace(on,"\r\n")}}).get()}}),v.param=function(e,n){var r,i=[],s=function(e,t){t=v.isFunction(t)?t():t==null?"":t,i[i.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};n===t&&(n=v.ajaxSettings&&v.ajaxSettings.traditional);if(v.isArray(e)||e.jquery&&!v.isPlainObject(e))v.each(e,function(){s(this.name,this.value)});else for(r in e)fn(r,e[r],n,s);return i.join("&").replace(rn,"+")};var ln,cn,hn=/#.*$/,pn=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,dn=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,vn=/^(?:GET|HEAD)$/,mn=/^\/\//,gn=/\?/,yn=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,bn=/([?&])_=[^&]*/,wn=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,En=v.fn.load,Sn={},xn={},Tn=["*/"]+["*"];try{cn=s.href}catch(Nn){cn=i.createElement("a"),cn.href="",cn=cn.href}ln=wn.exec(cn.toLowerCase())||[],v.fn.load=function(e,n,r){if(typeof e!="string"&&En)return En.apply(this,arguments);if(!this.length)return this;var i,s,o,u=this,a=e.indexOf(" ");return a>=0&&(i=e.slice(a,e.length),e=e.slice(0,a)),v.isFunction(n)?(r=n,n=t):n&&typeof n=="object"&&(s="POST"),v.ajax({url:e,type:s,dataType:"html",data:n,complete:function(e,t){r&&u.each(r,o||[e.responseText,t,e])}}).done(function(e){o=arguments,u.html(i?v("<div>").append(e.replace(yn,"")).find(i):e)}),this},v.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(e,t){v.fn[t]=function(e){return this.on(t,e)}}),v.each(["get","post"],function(e,n){v[n]=function(e,r,i,s){return v.isFunction(r)&&(s=s||i,i=r,r=t),v.ajax({type:n,url:e,data:r,success:i,dataType:s})}}),v.extend({getScript:function(e,n){return v.get(e,t,n,"script")},getJSON:function(e,t,n){return v.get(e,t,n,"json")},ajaxSetup:function(e,t){return t?Ln(e,v.ajaxSettings):(t=e,e=v.ajaxSettings),Ln(e,t),e},ajaxSettings:{url:cn,isLocal:dn.test(ln[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded; charset=UTF-8",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":Tn},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":e.String,"text html":!0,"text json":v.parseJSON,"text xml":v.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:Cn(Sn),ajaxTransport:Cn(xn),ajax:function(e,n){function T(e,n,s,a){var l,y,b,w,S,T=n;if(E===2)return;E=2,u&&clearTimeout(u),o=t,i=a||"",x.readyState=e>0?4:0,s&&(w=An(c,x,s));if(e>=200&&e<300||e===304)c.ifModified&&(S=x.getResponseHeader("Last-Modified"),S&&(v.lastModified[r]=S),S=x.getResponseHeader("Etag"),S&&(v.etag[r]=S)),e===304?(T="notmodified",l=!0):(l=On(c,w),T=l.state,y=l.data,b=l.error,l=!b);else{b=T;if(!T||e)T="error",e<0&&(e=0)}x.status=e,x.statusText=(n||T)+"",l?d.resolveWith(h,[y,T,x]):d.rejectWith(h,[x,T,b]),x.statusCode(g),g=t,f&&p.trigger("ajax"+(l?"Success":"Error"),[x,c,l?y:b]),m.fireWith(h,[x,T]),f&&(p.trigger("ajaxComplete",[x,c]),--v.active||v.event.trigger("ajaxStop"))}typeof e=="object"&&(n=e,e=t),n=n||{};var r,i,s,o,u,a,f,l,c=v.ajaxSetup({},n),h=c.context||c,p=h!==c&&(h.nodeType||h instanceof v)?v(h):v.event,d=v.Deferred(),m=v.Callbacks("once memory"),g=c.statusCode||{},b={},w={},E=0,S="canceled",x={readyState:0,setRequestHeader:function(e,t){if(!E){var n=e.toLowerCase();e=w[n]=w[n]||e,b[e]=t}return this},getAllResponseHeaders:function(){return E===2?i:null},getResponseHeader:function(e){var n;if(E===2){if(!s){s={};while(n=pn.exec(i))s[n[1].toLowerCase()]=n[2]}n=s[e.toLowerCase()]}return n===t?null:n},overrideMimeType:function(e){return E||(c.mimeType=e),this},abort:function(e){return e=e||S,o&&o.abort(e),T(0,e),this}};d.promise(x),x.success=x.done,x.error=x.fail,x.complete=m.add,x.statusCode=function(e){if(e){var t;if(E<2)for(t in e)g[t]=[g[t],e[t]];else t=e[x.status],x.always(t)}return this},c.url=((e||c.url)+"").replace(hn,"").replace(mn,ln[1]+"//"),c.dataTypes=v.trim(c.dataType||"*").toLowerCase().split(y),c.crossDomain==null&&(a=wn.exec(c.url.toLowerCase()),c.crossDomain=!(!a||a[1]===ln[1]&&a[2]===ln[2]&&(a[3]||(a[1]==="http:"?80:443))==(ln[3]||(ln[1]==="http:"?80:443)))),c.data&&c.processData&&typeof c.data!="string"&&(c.data=v.param(c.data,c.traditional)),kn(Sn,c,n,x);if(E===2)return x;f=c.global,c.type=c.type.toUpperCase(),c.hasContent=!vn.test(c.type),f&&v.active++===0&&v.event.trigger("ajaxStart");if(!c.hasContent){c.data&&(c.url+=(gn.test(c.url)?"&":"?")+c.data,delete c.data),r=c.url;if(c.cache===!1){var N=v.now(),C=c.url.replace(bn,"$1_="+N);c.url=C+(C===c.url?(gn.test(c.url)?"&":"?")+"_="+N:"")}}(c.data&&c.hasContent&&c.contentType!==!1||n.contentType)&&x.setRequestHeader("Content-Type",c.contentType),c.ifModified&&(r=r||c.url,v.lastModified[r]&&x.setRequestHeader("If-Modified-Since",v.lastModified[r]),v.etag[r]&&x.setRequestHeader("If-None-Match",v.etag[r])),x.setRequestHeader("Accept",c.dataTypes[0]&&c.accepts[c.dataTypes[0]]?c.accepts[c.dataTypes[0]]+(c.dataTypes[0]!=="*"?", "+Tn+"; q=0.01":""):c.accepts["*"]);for(l in c.headers)x.setRequestHeader(l,c.headers[l]);if(!c.beforeSend||c.beforeSend.call(h,x,c)!==!1&&E!==2){S="abort";for(l in{success:1,error:1,complete:1})x[l](c[l]);o=kn(xn,c,n,x);if(!o)T(-1,"No Transport");else{x.readyState=1,f&&p.trigger("ajaxSend",[x,c]),c.async&&c.timeout>0&&(u=setTimeout(function(){x.abort("timeout")},c.timeout));try{E=1,o.send(b,T)}catch(k){if(!(E<2))throw k;T(-1,k)}}return x}return x.abort()},active:0,lastModified:{},etag:{}});var Mn=[],_n=/\?/,Dn=/(=)\?(?=&|$)|\?\?/,Pn=v.now();v.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Mn.pop()||v.expando+"_"+Pn++;return this[e]=!0,e}}),v.ajaxPrefilter("json jsonp",function(n,r,i){var s,o,u,a=n.data,f=n.url,l=n.jsonp!==!1,c=l&&Dn.test(f),h=l&&!c&&typeof a=="string"&&!(n.contentType||"").indexOf("application/x-www-form-urlencoded")&&Dn.test(a);if(n.dataTypes[0]==="jsonp"||c||h)return s=n.jsonpCallback=v.isFunction(n.jsonpCallback)?n.jsonpCallback():n.jsonpCallback,o=e[s],c?n.url=f.replace(Dn,"$1"+s):h?n.data=a.replace(Dn,"$1"+s):l&&(n.url+=(_n.test(f)?"&":"?")+n.jsonp+"="+s),n.converters["script json"]=function(){return u||v.error(s+" was not called"),u[0]},n.dataTypes[0]="json",e[s]=function(){u=arguments},i.always(function(){e[s]=o,n[s]&&(n.jsonpCallback=r.jsonpCallback,Mn.push(s)),u&&v.isFunction(o)&&o(u[0]),u=o=t}),"script"}),v.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(e){return v.globalEval(e),e}}}),v.ajaxPrefilter("script",function(e){e.cache===t&&(e.cache=!1),e.crossDomain&&(e.type="GET",e.global=!1)}),v.ajaxTransport("script",function(e){if(e.crossDomain){var n,r=i.head||i.getElementsByTagName("head")[0]||i.documentElement;return{send:function(s,o){n=i.createElement("script"),n.async="async",e.scriptCharset&&(n.charset=e.scriptCharset),n.src=e.url,n.onload=n.onreadystatechange=function(e,i){if(i||!n.readyState||/loaded|complete/.test(n.readyState))n.onload=n.onreadystatechange=null,r&&n.parentNode&&r.removeChild(n),n=t,i||o(200,"success")},r.insertBefore(n,r.firstChild)},abort:function(){n&&n.onload(0,1)}}}});var Hn,Bn=e.ActiveXObject?function(){for(var e in Hn)Hn[e](0,1)}:!1,jn=0;v.ajaxSettings.xhr=e.ActiveXObject?function(){return!this.isLocal&&Fn()||In()}:Fn,function(e){v.extend(v.support,{ajax:!!e,cors:!!e&&"withCredentials"in e})}(v.ajaxSettings.xhr()),v.support.ajax&&v.ajaxTransport(function(n){if(!n.crossDomain||v.support.cors){var r;return{send:function(i,s){var o,u,a=n.xhr();n.username?a.open(n.type,n.url,n.async,n.username,n.password):a.open(n.type,n.url,n.async);if(n.xhrFields)for(u in n.xhrFields)a[u]=n.xhrFields[u];n.mimeType&&a.overrideMimeType&&a.overrideMimeType(n.mimeType),!n.crossDomain&&!i["X-Requested-With"]&&(i["X-Requested-With"]="XMLHttpRequest");try{for(u in i)a.setRequestHeader(u,i[u])}catch(f){}a.send(n.hasContent&&n.data||null),r=function(e,i){var u,f,l,c,h;try{if(r&&(i||a.readyState===4)){r=t,o&&(a.onreadystatechange=v.noop,Bn&&delete Hn[o]);if(i)a.readyState!==4&&a.abort();else{u=a.status,l=a.getAllResponseHeaders(),c={},h=a.responseXML,h&&h.documentElement&&(c.xml=h);try{c.text=a.responseText}catch(p){}try{f=a.statusText}catch(p){f=""}!u&&n.isLocal&&!n.crossDomain?u=c.text?200:404:u===1223&&(u=204)}}}catch(d){i||s(-1,d)}c&&s(u,f,c,l)},n.async?a.readyState===4?setTimeout(r,0):(o=++jn,Bn&&(Hn||(Hn={},v(e).unload(Bn)),Hn[o]=r),a.onreadystatechange=r):r()},abort:function(){r&&r(0,1)}}}});var qn,Rn,Un=/^(?:toggle|show|hide)$/,zn=new RegExp("^(?:([-+])=|)("+m+")([a-z%]*)$","i"),Wn=/queueHooks$/,Xn=[Gn],Vn={"*":[function(e,t){var n,r,i=this.createTween(e,t),s=zn.exec(t),o=i.cur(),u=+o||0,a=1,f=20;if(s){n=+s[2],r=s[3]||(v.cssNumber[e]?"":"px");if(r!=="px"&&u){u=v.css(i.elem,e,!0)||n||1;do a=a||".5",u/=a,v.style(i.elem,e,u+r);while(a!==(a=i.cur()/o)&&a!==1&&--f)}i.unit=r,i.start=u,i.end=s[1]?u+(s[1]+1)*n:n}return i}]};v.Animation=v.extend(Kn,{tweener:function(e,t){v.isFunction(e)?(t=e,e=["*"]):e=e.split(" ");var n,r=0,i=e.length;for(;r<i;r++)n=e[r],Vn[n]=Vn[n]||[],Vn[n].unshift(t)},prefilter:function(e,t){t?Xn.unshift(e):Xn.push(e)}}),v.Tween=Yn,Yn.prototype={constructor:Yn,init:function(e,t,n,r,i,s){this.elem=e,this.prop=n,this.easing=i||"swing",this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=s||(v.cssNumber[n]?"":"px")},cur:function(){var e=Yn.propHooks[this.prop];return e&&e.get?e.get(this):Yn.propHooks._default.get(this)},run:function(e){var t,n=Yn.propHooks[this.prop];return this.options.duration?this.pos=t=v.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):Yn.propHooks._default.set(this),this}},Yn.prototype.init.prototype=Yn.prototype,Yn.propHooks={_default:{get:function(e){var t;return e.elem[e.prop]==null||!!e.elem.style&&e.elem.style[e.prop]!=null?(t=v.css(e.elem,e.prop,!1,""),!t||t==="auto"?0:t):e.elem[e.prop]},set:function(e){v.fx.step[e.prop]?v.fx.step[e.prop](e):e.elem.style&&(e.elem.style[v.cssProps[e.prop]]!=null||v.cssHooks[e.prop])?v.style(e.elem,e.prop,e.now+e.unit):e.elem[e.prop]=e.now}}},Yn.propHooks.scrollTop=Yn.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},v.each(["toggle","show","hide"],function(e,t){var n=v.fn[t];v.fn[t]=function(r,i,s){return r==null||typeof r=="boolean"||!e&&v.isFunction(r)&&v.isFunction(i)?n.apply(this,arguments):this.animate(Zn(t,!0),r,i,s)}}),v.fn.extend({fadeTo:function(e,t,n,r){return this.filter(Gt).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(e,t,n,r){var i=v.isEmptyObject(e),s=v.speed(t,n,r),o=function(){var t=Kn(this,v.extend({},e),s);i&&t.stop(!0)};return i||s.queue===!1?this.each(o):this.queue(s.queue,o)},stop:function(e,n,r){var i=function(e){var t=e.stop;delete e.stop,t(r)};return typeof e!="string"&&(r=n,n=e,e=t),n&&e!==!1&&this.queue(e||"fx",[]),this.each(function(){var t=!0,n=e!=null&&e+"queueHooks",s=v.timers,o=v._data(this);if(n)o[n]&&o[n].stop&&i(o[n]);else for(n in o)o[n]&&o[n].stop&&Wn.test(n)&&i(o[n]);for(n=s.length;n--;)s[n].elem===this&&(e==null||s[n].queue===e)&&(s[n].anim.stop(r),t=!1,s.splice(n,1));(t||!r)&&v.dequeue(this,e)})}}),v.each({slideDown:Zn("show"),slideUp:Zn("hide"),slideToggle:Zn("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,t){v.fn[e]=function(e,n,r){return this.animate(t,e,n,r)}}),v.speed=function(e,t,n){var r=e&&typeof e=="object"?v.extend({},e):{complete:n||!n&&t||v.isFunction(e)&&e,duration:e,easing:n&&t||t&&!v.isFunction(t)&&t};r.duration=v.fx.off?0:typeof r.duration=="number"?r.duration:r.duration in v.fx.speeds?v.fx.speeds[r.duration]:v.fx.speeds._default;if(r.queue==null||r.queue===!0)r.queue="fx";return r.old=r.complete,r.complete=function(){v.isFunction(r.old)&&r.old.call(this),r.queue&&v.dequeue(this,r.queue)},r},v.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2}},v.timers=[],v.fx=Yn.prototype.init,v.fx.tick=function(){var e,n=v.timers,r=0;qn=v.now();for(;r<n.length;r++)e=n[r],!e()&&n[r]===e&&n.splice(r--,1);n.length||v.fx.stop(),qn=t},v.fx.timer=function(e){e()&&v.timers.push(e)&&!Rn&&(Rn=setInterval(v.fx.tick,v.fx.interval))},v.fx.interval=13,v.fx.stop=function(){clearInterval(Rn),Rn=null},v.fx.speeds={slow:600,fast:200,_default:400},v.fx.step={},v.expr&&v.expr.filters&&(v.expr.filters.animated=function(e){return v.grep(v.timers,function(t){return e===t.elem}).length});var er=/^(?:body|html)$/i;v.fn.offset=function(e){if(arguments.length)return e===t?this:this.each(function(t){v.offset.setOffset(this,e,t)});var n,r,i,s,o,u,a,f={top:0,left:0},l=this[0],c=l&&l.ownerDocument;if(!c)return;return(r=c.body)===l?v.offset.bodyOffset(l):(n=c.documentElement,v.contains(n,l)?(typeof l.getBoundingClientRect!="undefined"&&(f=l.getBoundingClientRect()),i=tr(c),s=n.clientTop||r.clientTop||0,o=n.clientLeft||r.clientLeft||0,u=i.pageYOffset||n.scrollTop,a=i.pageXOffset||n.scrollLeft,{top:f.top+u-s,left:f.left+a-o}):f)},v.offset={bodyOffset:function(e){var t=e.offsetTop,n=e.offsetLeft;return v.support.doesNotIncludeMarginInBodyOffset&&(t+=parseFloat(v.css(e,"marginTop"))||0,n+=parseFloat(v.css(e,"marginLeft"))||0),{top:t,left:n}},setOffset:function(e,t,n){var r=v.css(e,"position");r==="static"&&(e.style.position="relative");var i=v(e),s=i.offset(),o=v.css(e,"top"),u=v.css(e,"left"),a=(r==="absolute"||r==="fixed")&&v.inArray("auto",[o,u])>-1,f={},l={},c,h;a?(l=i.position(),c=l.top,h=l.left):(c=parseFloat(o)||0,h=parseFloat(u)||0),v.isFunction(t)&&(t=t.call(e,n,s)),t.top!=null&&(f.top=t.top-s.top+c),t.left!=null&&(f.left=t.left-s.left+h),"using"in t?t.using.call(e,f):i.css(f)}},v.fn.extend({position:function(){if(!this[0])return;var e=this[0],t=this.offsetParent(),n=this.offset(),r=er.test(t[0].nodeName)?{top:0,left:0}:t.offset();return n.top-=parseFloat(v.css(e,"marginTop"))||0,n.left-=parseFloat(v.css(e,"marginLeft"))||0,r.top+=parseFloat(v.css(t[0],"borderTopWidth"))||0,r.left+=parseFloat(v.css(t[0],"borderLeftWidth"))||0,{top:n.top-r.top,left:n.left-r.left}},offsetParent:function(){return this.map(function(){var e=this.offsetParent||i.body;while(e&&!er.test(e.nodeName)&&v.css(e,"position")==="static")e=e.offsetParent;return e||i.body})}}),v.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,n){var r=/Y/.test(n);v.fn[e]=function(i){return v.access(this,function(e,i,s){var o=tr(e);if(s===t)return o?n in o?o[n]:o.document.documentElement[i]:e[i];o?o.scrollTo(r?v(o).scrollLeft():s,r?s:v(o).scrollTop()):e[i]=s},e,i,arguments.length,null)}}),v.each({Height:"height",Width:"width"},function(e,n){v.each({padding:"inner"+e,content:n,"":"outer"+e},function(r,i){v.fn[i]=function(i,s){var o=arguments.length&&(r||typeof i!="boolean"),u=r||(i===!0||s===!0?"margin":"border");return v.access(this,function(n,r,i){var s;return v.isWindow(n)?n.document.documentElement["client"+e]:n.nodeType===9?(s=n.documentElement,Math.max(n.body["scroll"+e],s["scroll"+e],n.body["offset"+e],s["offset"+e],s["client"+e])):i===t?v.css(n,r,i,u):v.style(n,r,i,u)},n,o?i:t,o,null)}})}),e.jQuery=e.$=v,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return v})})(window);
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/js/jquery-1.9.0.min.js b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/js/jquery-1.9.0.min.js
new file mode 100644
index 0000000..50d1b22
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/js/jquery-1.9.0.min.js
@@ -0,0 +1,4 @@
+/*! jQuery v1.9.0 | (c) 2005, 2012 jQuery Foundation, Inc. | jquery.org/license */(function(e,t){"use strict";function n(e){var t=e.length,n=st.type(e);return st.isWindow(e)?!1:1===e.nodeType&&t?!0:"array"===n||"function"!==n&&(0===t||"number"==typeof t&&t>0&&t-1 in e)}function r(e){var t=Tt[e]={};return st.each(e.match(lt)||[],function(e,n){t[n]=!0}),t}function i(e,n,r,i){if(st.acceptData(e)){var o,a,s=st.expando,u="string"==typeof n,l=e.nodeType,c=l?st.cache:e,f=l?e[s]:e[s]&&s;if(f&&c[f]&&(i||c[f].data)||!u||r!==t)return f||(l?e[s]=f=K.pop()||st.guid++:f=s),c[f]||(c[f]={},l||(c[f].toJSON=st.noop)),("object"==typeof n||"function"==typeof n)&&(i?c[f]=st.extend(c[f],n):c[f].data=st.extend(c[f].data,n)),o=c[f],i||(o.data||(o.data={}),o=o.data),r!==t&&(o[st.camelCase(n)]=r),u?(a=o[n],null==a&&(a=o[st.camelCase(n)])):a=o,a}}function o(e,t,n){if(st.acceptData(e)){var r,i,o,a=e.nodeType,u=a?st.cache:e,l=a?e[st.expando]:st.expando;if(u[l]){if(t&&(r=n?u[l]:u[l].data)){st.isArray(t)?t=t.concat(st.map(t,st.camelCase)):t in r?t=[t]:(t=st.camelCase(t),t=t in r?[t]:t.split(" "));for(i=0,o=t.length;o>i;i++)delete r[t[i]];if(!(n?s:st.isEmptyObject)(r))return}(n||(delete u[l].data,s(u[l])))&&(a?st.cleanData([e],!0):st.support.deleteExpando||u!=u.window?delete u[l]:u[l]=null)}}}function a(e,n,r){if(r===t&&1===e.nodeType){var i="data-"+n.replace(Nt,"-$1").toLowerCase();if(r=e.getAttribute(i),"string"==typeof r){try{r="true"===r?!0:"false"===r?!1:"null"===r?null:+r+""===r?+r:wt.test(r)?st.parseJSON(r):r}catch(o){}st.data(e,n,r)}else r=t}return r}function s(e){var t;for(t in e)if(("data"!==t||!st.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}function u(){return!0}function l(){return!1}function c(e,t){do e=e[t];while(e&&1!==e.nodeType);return e}function f(e,t,n){if(t=t||0,st.isFunction(t))return st.grep(e,function(e,r){var i=!!t.call(e,r,e);return i===n});if(t.nodeType)return st.grep(e,function(e){return e===t===n});if("string"==typeof t){var r=st.grep(e,function(e){return 1===e.nodeType});if(Wt.test(t))return st.filter(t,r,!n);t=st.filter(t,r)}return st.grep(e,function(e){return st.inArray(e,t)>=0===n})}function p(e){var t=zt.split("|"),n=e.createDocumentFragment();if(n.createElement)for(;t.length;)n.createElement(t.pop());return n}function d(e,t){return e.getElementsByTagName(t)[0]||e.appendChild(e.ownerDocument.createElement(t))}function h(e){var t=e.getAttributeNode("type");return e.type=(t&&t.specified)+"/"+e.type,e}function g(e){var t=nn.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function m(e,t){for(var n,r=0;null!=(n=e[r]);r++)st._data(n,"globalEval",!t||st._data(t[r],"globalEval"))}function y(e,t){if(1===t.nodeType&&st.hasData(e)){var n,r,i,o=st._data(e),a=st._data(t,o),s=o.events;if(s){delete a.handle,a.events={};for(n in s)for(r=0,i=s[n].length;i>r;r++)st.event.add(t,n,s[n][r])}a.data&&(a.data=st.extend({},a.data))}}function v(e,t){var n,r,i;if(1===t.nodeType){if(n=t.nodeName.toLowerCase(),!st.support.noCloneEvent&&t[st.expando]){r=st._data(t);for(i in r.events)st.removeEvent(t,i,r.handle);t.removeAttribute(st.expando)}"script"===n&&t.text!==e.text?(h(t).text=e.text,g(t)):"object"===n?(t.parentNode&&(t.outerHTML=e.outerHTML),st.support.html5Clone&&e.innerHTML&&!st.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):"input"===n&&Zt.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):"option"===n?t.defaultSelected=t.selected=e.defaultSelected:("input"===n||"textarea"===n)&&(t.defaultValue=e.defaultValue)}}function b(e,n){var r,i,o=0,a=e.getElementsByTagName!==t?e.getElementsByTagName(n||"*"):e.querySelectorAll!==t?e.querySelectorAll(n||"*"):t;if(!a)for(a=[],r=e.childNodes||e;null!=(i=r[o]);o++)!n||st.nodeName(i,n)?a.push(i):st.merge(a,b(i,n));return n===t||n&&st.nodeName(e,n)?st.merge([e],a):a}function x(e){Zt.test(e.type)&&(e.defaultChecked=e.checked)}function T(e,t){if(t in e)return t;for(var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=Nn.length;i--;)if(t=Nn[i]+n,t in e)return t;return r}function w(e,t){return e=t||e,"none"===st.css(e,"display")||!st.contains(e.ownerDocument,e)}function N(e,t){for(var n,r=[],i=0,o=e.length;o>i;i++)n=e[i],n.style&&(r[i]=st._data(n,"olddisplay"),t?(r[i]||"none"!==n.style.display||(n.style.display=""),""===n.style.display&&w(n)&&(r[i]=st._data(n,"olddisplay",S(n.nodeName)))):r[i]||w(n)||st._data(n,"olddisplay",st.css(n,"display")));for(i=0;o>i;i++)n=e[i],n.style&&(t&&"none"!==n.style.display&&""!==n.style.display||(n.style.display=t?r[i]||"":"none"));return e}function C(e,t,n){var r=mn.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function k(e,t,n,r,i){for(var o=n===(r?"border":"content")?4:"width"===t?1:0,a=0;4>o;o+=2)"margin"===n&&(a+=st.css(e,n+wn[o],!0,i)),r?("content"===n&&(a-=st.css(e,"padding"+wn[o],!0,i)),"margin"!==n&&(a-=st.css(e,"border"+wn[o]+"Width",!0,i))):(a+=st.css(e,"padding"+wn[o],!0,i),"padding"!==n&&(a+=st.css(e,"border"+wn[o]+"Width",!0,i)));return a}function E(e,t,n){var r=!0,i="width"===t?e.offsetWidth:e.offsetHeight,o=ln(e),a=st.support.boxSizing&&"border-box"===st.css(e,"boxSizing",!1,o);if(0>=i||null==i){if(i=un(e,t,o),(0>i||null==i)&&(i=e.style[t]),yn.test(i))return i;r=a&&(st.support.boxSizingReliable||i===e.style[t]),i=parseFloat(i)||0}return i+k(e,t,n||(a?"border":"content"),r,o)+"px"}function S(e){var t=V,n=bn[e];return n||(n=A(e,t),"none"!==n&&n||(cn=(cn||st("<iframe frameborder='0' width='0' height='0'/>").css("cssText","display:block !important")).appendTo(t.documentElement),t=(cn[0].contentWindow||cn[0].contentDocument).document,t.write("<!doctype html><html><body>"),t.close(),n=A(e,t),cn.detach()),bn[e]=n),n}function A(e,t){var n=st(t.createElement(e)).appendTo(t.body),r=st.css(n[0],"display");return n.remove(),r}function j(e,t,n,r){var i;if(st.isArray(t))st.each(t,function(t,i){n||kn.test(e)?r(e,i):j(e+"["+("object"==typeof i?t:"")+"]",i,n,r)});else if(n||"object"!==st.type(t))r(e,t);else for(i in t)j(e+"["+i+"]",t[i],n,r)}function D(e){return function(t,n){"string"!=typeof t&&(n=t,t="*");var r,i=0,o=t.toLowerCase().match(lt)||[];if(st.isFunction(n))for(;r=o[i++];)"+"===r[0]?(r=r.slice(1)||"*",(e[r]=e[r]||[]).unshift(n)):(e[r]=e[r]||[]).push(n)}}function L(e,n,r,i){function o(u){var l;return a[u]=!0,st.each(e[u]||[],function(e,u){var c=u(n,r,i);return"string"!=typeof c||s||a[c]?s?!(l=c):t:(n.dataTypes.unshift(c),o(c),!1)}),l}var a={},s=e===$n;return o(n.dataTypes[0])||!a["*"]&&o("*")}function H(e,n){var r,i,o=st.ajaxSettings.flatOptions||{};for(r in n)n[r]!==t&&((o[r]?e:i||(i={}))[r]=n[r]);return i&&st.extend(!0,e,i),e}function M(e,n,r){var i,o,a,s,u=e.contents,l=e.dataTypes,c=e.responseFields;for(o in c)o in r&&(n[c[o]]=r[o]);for(;"*"===l[0];)l.shift(),i===t&&(i=e.mimeType||n.getResponseHeader("Content-Type"));if(i)for(o in u)if(u[o]&&u[o].test(i)){l.unshift(o);break}if(l[0]in r)a=l[0];else{for(o in r){if(!l[0]||e.converters[o+" "+l[0]]){a=o;break}s||(s=o)}a=a||s}return a?(a!==l[0]&&l.unshift(a),r[a]):t}function q(e,t){var n,r,i,o,a={},s=0,u=e.dataTypes.slice(),l=u[0];if(e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u[1])for(n in e.converters)a[n.toLowerCase()]=e.converters[n];for(;i=u[++s];)if("*"!==i){if("*"!==l&&l!==i){if(n=a[l+" "+i]||a["* "+i],!n)for(r in a)if(o=r.split(" "),o[1]===i&&(n=a[l+" "+o[0]]||a["* "+o[0]])){n===!0?n=a[r]:a[r]!==!0&&(i=o[0],u.splice(s--,0,i));break}if(n!==!0)if(n&&e["throws"])t=n(t);else try{t=n(t)}catch(c){return{state:"parsererror",error:n?c:"No conversion from "+l+" to "+i}}}l=i}return{state:"success",data:t}}function _(){try{return new e.XMLHttpRequest}catch(t){}}function F(){try{return new e.ActiveXObject("Microsoft.XMLHTTP")}catch(t){}}function O(){return setTimeout(function(){Qn=t}),Qn=st.now()}function B(e,t){st.each(t,function(t,n){for(var r=(rr[t]||[]).concat(rr["*"]),i=0,o=r.length;o>i;i++)if(r[i].call(e,t,n))return})}function P(e,t,n){var r,i,o=0,a=nr.length,s=st.Deferred().always(function(){delete u.elem}),u=function(){if(i)return!1;for(var t=Qn||O(),n=Math.max(0,l.startTime+l.duration-t),r=n/l.duration||0,o=1-r,a=0,u=l.tweens.length;u>a;a++)l.tweens[a].run(o);return s.notifyWith(e,[l,o,n]),1>o&&u?n:(s.resolveWith(e,[l]),!1)},l=s.promise({elem:e,props:st.extend({},t),opts:st.extend(!0,{specialEasing:{}},n),originalProperties:t,originalOptions:n,startTime:Qn||O(),duration:n.duration,tweens:[],createTween:function(t,n){var r=st.Tween(e,l.opts,t,n,l.opts.specialEasing[t]||l.opts.easing);return l.tweens.push(r),r},stop:function(t){var n=0,r=t?l.tweens.length:0;if(i)return this;for(i=!0;r>n;n++)l.tweens[n].run(1);return t?s.resolveWith(e,[l,t]):s.rejectWith(e,[l,t]),this}}),c=l.props;for(R(c,l.opts.specialEasing);a>o;o++)if(r=nr[o].call(l,e,c,l.opts))return r;return B(l,c),st.isFunction(l.opts.start)&&l.opts.start.call(e,l),st.fx.timer(st.extend(u,{elem:e,anim:l,queue:l.opts.queue})),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always)}function R(e,t){var n,r,i,o,a;for(n in e)if(r=st.camelCase(n),i=t[r],o=e[n],st.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),a=st.cssHooks[r],a&&"expand"in a){o=a.expand(o),delete e[r];for(n in o)n in e||(e[n]=o[n],t[n]=i)}else t[r]=i}function W(e,t,n){var r,i,o,a,s,u,l,c,f,p=this,d=e.style,h={},g=[],m=e.nodeType&&w(e);n.queue||(c=st._queueHooks(e,"fx"),null==c.unqueued&&(c.unqueued=0,f=c.empty.fire,c.empty.fire=function(){c.unqueued||f()}),c.unqueued++,p.always(function(){p.always(function(){c.unqueued--,st.queue(e,"fx").length||c.empty.fire()})})),1===e.nodeType&&("height"in t||"width"in t)&&(n.overflow=[d.overflow,d.overflowX,d.overflowY],"inline"===st.css(e,"display")&&"none"===st.css(e,"float")&&(st.support.inlineBlockNeedsLayout&&"inline"!==S(e.nodeName)?d.zoom=1:d.display="inline-block")),n.overflow&&(d.overflow="hidden",st.support.shrinkWrapBlocks||p.done(function(){d.overflow=n.overflow[0],d.overflowX=n.overflow[1],d.overflowY=n.overflow[2]}));for(r in t)if(o=t[r],Zn.exec(o)){if(delete t[r],u=u||"toggle"===o,o===(m?"hide":"show"))continue;g.push(r)}if(a=g.length){s=st._data(e,"fxshow")||st._data(e,"fxshow",{}),"hidden"in s&&(m=s.hidden),u&&(s.hidden=!m),m?st(e).show():p.done(function(){st(e).hide()}),p.done(function(){var t;st._removeData(e,"fxshow");for(t in h)st.style(e,t,h[t])});for(r=0;a>r;r++)i=g[r],l=p.createTween(i,m?s[i]:0),h[i]=s[i]||st.style(e,i),i in s||(s[i]=l.start,m&&(l.end=l.start,l.start="width"===i||"height"===i?1:0))}}function $(e,t,n,r,i){return new $.prototype.init(e,t,n,r,i)}function I(e,t){var n,r={height:e},i=0;for(t=t?1:0;4>i;i+=2-t)n=wn[i],r["margin"+n]=r["padding"+n]=e;return t&&(r.opacity=r.width=e),r}function z(e){return st.isWindow(e)?e:9===e.nodeType?e.defaultView||e.parentWindow:!1}var X,U,V=e.document,Y=e.location,J=e.jQuery,G=e.$,Q={},K=[],Z="1.9.0",et=K.concat,tt=K.push,nt=K.slice,rt=K.indexOf,it=Q.toString,ot=Q.hasOwnProperty,at=Z.trim,st=function(e,t){return new st.fn.init(e,t,X)},ut=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,lt=/\S+/g,ct=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,ft=/^(?:(<[\w\W]+>)[^>]*|#([\w-]*))$/,pt=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,dt=/^[\],:{}\s]*$/,ht=/(?:^|:|,)(?:\s*\[)+/g,gt=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,mt=/"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g,yt=/^-ms-/,vt=/-([\da-z])/gi,bt=function(e,t){return t.toUpperCase()},xt=function(){V.addEventListener?(V.removeEventListener("DOMContentLoaded",xt,!1),st.ready()):"complete"===V.readyState&&(V.detachEvent("onreadystatechange",xt),st.ready())};st.fn=st.prototype={jquery:Z,constructor:st,init:function(e,n,r){var i,o;if(!e)return this;if("string"==typeof e){if(i="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:ft.exec(e),!i||!i[1]&&n)return!n||n.jquery?(n||r).find(e):this.constructor(n).find(e);if(i[1]){if(n=n instanceof st?n[0]:n,st.merge(this,st.parseHTML(i[1],n&&n.nodeType?n.ownerDocument||n:V,!0)),pt.test(i[1])&&st.isPlainObject(n))for(i in n)st.isFunction(this[i])?this[i](n[i]):this.attr(i,n[i]);return this}if(o=V.getElementById(i[2]),o&&o.parentNode){if(o.id!==i[2])return r.find(e);this.length=1,this[0]=o}return this.context=V,this.selector=e,this}return e.nodeType?(this.context=this[0]=e,this.length=1,this):st.isFunction(e)?r.ready(e):(e.selector!==t&&(this.selector=e.selector,this.context=e.context),st.makeArray(e,this))},selector:"",length:0,size:function(){return this.length},toArray:function(){return nt.call(this)},get:function(e){return null==e?this.toArray():0>e?this[this.length+e]:this[e]},pushStack:function(e){var t=st.merge(this.constructor(),e);return t.prevObject=this,t.context=this.context,t},each:function(e,t){return st.each(this,e,t)},ready:function(e){return st.ready.promise().done(e),this},slice:function(){return this.pushStack(nt.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(0>e?t:0);return this.pushStack(n>=0&&t>n?[this[n]]:[])},map:function(e){return this.pushStack(st.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject||this.constructor(null)},push:tt,sort:[].sort,splice:[].splice},st.fn.init.prototype=st.fn,st.extend=st.fn.extend=function(){var e,n,r,i,o,a,s=arguments[0]||{},u=1,l=arguments.length,c=!1;for("boolean"==typeof s&&(c=s,s=arguments[1]||{},u=2),"object"==typeof s||st.isFunction(s)||(s={}),l===u&&(s=this,--u);l>u;u++)if(null!=(e=arguments[u]))for(n in e)r=s[n],i=e[n],s!==i&&(c&&i&&(st.isPlainObject(i)||(o=st.isArray(i)))?(o?(o=!1,a=r&&st.isArray(r)?r:[]):a=r&&st.isPlainObject(r)?r:{},s[n]=st.extend(c,a,i)):i!==t&&(s[n]=i));return s},st.extend({noConflict:function(t){return e.$===st&&(e.$=G),t&&e.jQuery===st&&(e.jQuery=J),st},isReady:!1,readyWait:1,holdReady:function(e){e?st.readyWait++:st.ready(!0)},ready:function(e){if(e===!0?!--st.readyWait:!st.isReady){if(!V.body)return setTimeout(st.ready);st.isReady=!0,e!==!0&&--st.readyWait>0||(U.resolveWith(V,[st]),st.fn.trigger&&st(V).trigger("ready").off("ready"))}},isFunction:function(e){return"function"===st.type(e)},isArray:Array.isArray||function(e){return"array"===st.type(e)},isWindow:function(e){return null!=e&&e==e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?Q[it.call(e)]||"object":typeof e},isPlainObject:function(e){if(!e||"object"!==st.type(e)||e.nodeType||st.isWindow(e))return!1;try{if(e.constructor&&!ot.call(e,"constructor")&&!ot.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(n){return!1}var r;for(r in e);return r===t||ot.call(e,r)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},error:function(e){throw Error(e)},parseHTML:function(e,t,n){if(!e||"string"!=typeof e)return null;"boolean"==typeof t&&(n=t,t=!1),t=t||V;var r=pt.exec(e),i=!n&&[];return r?[t.createElement(r[1])]:(r=st.buildFragment([e],t,i),i&&st(i).remove(),st.merge([],r.childNodes))},parseJSON:function(n){return e.JSON&&e.JSON.parse?e.JSON.parse(n):null===n?n:"string"==typeof n&&(n=st.trim(n),n&&dt.test(n.replace(gt,"@").replace(mt,"]").replace(ht,"")))?Function("return "+n)():(st.error("Invalid JSON: "+n),t)},parseXML:function(n){var r,i;if(!n||"string"!=typeof n)return null;try{e.DOMParser?(i=new DOMParser,r=i.parseFromString(n,"text/xml")):(r=new ActiveXObject("Microsoft.XMLDOM"),r.async="false",r.loadXML(n))}catch(o){r=t}return r&&r.documentElement&&!r.getElementsByTagName("parsererror").length||st.error("Invalid XML: "+n),r},noop:function(){},globalEval:function(t){t&&st.trim(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(yt,"ms-").replace(vt,bt)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t,r){var i,o=0,a=e.length,s=n(e);if(r){if(s)for(;a>o&&(i=t.apply(e[o],r),i!==!1);o++);else for(o in e)if(i=t.apply(e[o],r),i===!1)break}else if(s)for(;a>o&&(i=t.call(e[o],o,e[o]),i!==!1);o++);else for(o in e)if(i=t.call(e[o],o,e[o]),i===!1)break;return e},trim:at&&!at.call("\ufeff\u00a0")?function(e){return null==e?"":at.call(e)}:function(e){return null==e?"":(e+"").replace(ct,"")},makeArray:function(e,t){var r=t||[];return null!=e&&(n(Object(e))?st.merge(r,"string"==typeof e?[e]:e):tt.call(r,e)),r},inArray:function(e,t,n){var r;if(t){if(rt)return rt.call(t,e,n);for(r=t.length,n=n?0>n?Math.max(0,r+n):n:0;r>n;n++)if(n in t&&t[n]===e)return n}return-1},merge:function(e,n){var r=n.length,i=e.length,o=0;if("number"==typeof r)for(;r>o;o++)e[i++]=n[o];else for(;n[o]!==t;)e[i++]=n[o++];return e.length=i,e},grep:function(e,t,n){var r,i=[],o=0,a=e.length;for(n=!!n;a>o;o++)r=!!t(e[o],o),n!==r&&i.push(e[o]);return i},map:function(e,t,r){var i,o=0,a=e.length,s=n(e),u=[];if(s)for(;a>o;o++)i=t(e[o],o,r),null!=i&&(u[u.length]=i);else for(o in e)i=t(e[o],o,r),null!=i&&(u[u.length]=i);return et.apply([],u)},guid:1,proxy:function(e,n){var r,i,o;return"string"==typeof n&&(r=e[n],n=e,e=r),st.isFunction(e)?(i=nt.call(arguments,2),o=function(){return e.apply(n||this,i.concat(nt.call(arguments)))},o.guid=e.guid=e.guid||st.guid++,o):t},access:function(e,n,r,i,o,a,s){var u=0,l=e.length,c=null==r;if("object"===st.type(r)){o=!0;for(u in r)st.access(e,n,u,r[u],!0,a,s)}else if(i!==t&&(o=!0,st.isFunction(i)||(s=!0),c&&(s?(n.call(e,i),n=null):(c=n,n=function(e,t,n){return c.call(st(e),n)})),n))for(;l>u;u++)n(e[u],r,s?i:i.call(e[u],u,n(e[u],r)));return o?e:c?n.call(e):l?n(e[0],r):a},now:function(){return(new Date).getTime()}}),st.ready.promise=function(t){if(!U)if(U=st.Deferred(),"complete"===V.readyState)setTimeout(st.ready);else if(V.addEventListener)V.addEventListener("DOMContentLoaded",xt,!1),e.addEventListener("load",st.ready,!1);else{V.attachEvent("onreadystatechange",xt),e.attachEvent("onload",st.ready);var n=!1;try{n=null==e.frameElement&&V.documentElement}catch(r){}n&&n.doScroll&&function i(){if(!st.isReady){try{n.doScroll("left")}catch(e){return setTimeout(i,50)}st.ready()}}()}return U.promise(t)},st.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(e,t){Q["[object "+t+"]"]=t.toLowerCase()}),X=st(V);var Tt={};st.Callbacks=function(e){e="string"==typeof e?Tt[e]||r(e):st.extend({},e);var n,i,o,a,s,u,l=[],c=!e.once&&[],f=function(t){for(n=e.memory&&t,i=!0,u=a||0,a=0,s=l.length,o=!0;l&&s>u;u++)if(l[u].apply(t[0],t[1])===!1&&e.stopOnFalse){n=!1;break}o=!1,l&&(c?c.length&&f(c.shift()):n?l=[]:p.disable())},p={add:function(){if(l){var t=l.length;(function r(t){st.each(t,function(t,n){var i=st.type(n);"function"===i?e.unique&&p.has(n)||l.push(n):n&&n.length&&"string"!==i&&r(n)})})(arguments),o?s=l.length:n&&(a=t,f(n))}return this},remove:function(){return l&&st.each(arguments,function(e,t){for(var n;(n=st.inArray(t,l,n))>-1;)l.splice(n,1),o&&(s>=n&&s--,u>=n&&u--)}),this},has:function(e){return st.inArray(e,l)>-1},empty:function(){return l=[],this},disable:function(){return l=c=n=t,this},disabled:function(){return!l},lock:function(){return c=t,n||p.disable(),this},locked:function(){return!c},fireWith:function(e,t){return t=t||[],t=[e,t.slice?t.slice():t],!l||i&&!c||(o?c.push(t):f(t)),this},fire:function(){return p.fireWith(this,arguments),this},fired:function(){return!!i}};return p},st.extend({Deferred:function(e){var t=[["resolve","done",st.Callbacks("once memory"),"resolved"],["reject","fail",st.Callbacks("once memory"),"rejected"],["notify","progress",st.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return st.Deferred(function(n){st.each(t,function(t,o){var a=o[0],s=st.isFunction(e[t])&&e[t];i[o[1]](function(){var e=s&&s.apply(this,arguments);e&&st.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[a+"With"](this===r?n.promise():this,s?[e]:arguments)})}),e=null}).promise()},promise:function(e){return null!=e?st.extend(e,r):r}},i={};return r.pipe=r.then,st.each(t,function(e,o){var a=o[2],s=o[3];r[o[1]]=a.add,s&&a.add(function(){n=s},t[1^e][2].disable,t[2][2].lock),i[o[0]]=function(){return i[o[0]+"With"](this===i?r:this,arguments),this},i[o[0]+"With"]=a.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t,n,r,i=0,o=nt.call(arguments),a=o.length,s=1!==a||e&&st.isFunction(e.promise)?a:0,u=1===s?e:st.Deferred(),l=function(e,n,r){return function(i){n[e]=this,r[e]=arguments.length>1?nt.call(arguments):i,r===t?u.notifyWith(n,r):--s||u.resolveWith(n,r)}};if(a>1)for(t=Array(a),n=Array(a),r=Array(a);a>i;i++)o[i]&&st.isFunction(o[i].promise)?o[i].promise().done(l(i,r,o)).fail(u.reject).progress(l(i,n,t)):--s;return s||u.resolveWith(r,o),u.promise()}}),st.support=function(){var n,r,i,o,a,s,u,l,c,f,p=V.createElement("div");if(p.setAttribute("className","t"),p.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",r=p.getElementsByTagName("*"),i=p.getElementsByTagName("a")[0],!r||!i||!r.length)return{};o=V.createElement("select"),a=o.appendChild(V.createElement("option")),s=p.getElementsByTagName("input")[0],i.style.cssText="top:1px;float:left;opacity:.5",n={getSetAttribute:"t"!==p.className,leadingWhitespace:3===p.firstChild.nodeType,tbody:!p.getElementsByTagName("tbody").length,htmlSerialize:!!p.getElementsByTagName("link").length,style:/top/.test(i.getAttribute("style")),hrefNormalized:"/a"===i.getAttribute("href"),opacity:/^0.5/.test(i.style.opacity),cssFloat:!!i.style.cssFloat,checkOn:!!s.value,optSelected:a.selected,enctype:!!V.createElement("form").enctype,html5Clone:"<:nav></:nav>"!==V.createElement("nav").cloneNode(!0).outerHTML,boxModel:"CSS1Compat"===V.compatMode,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,boxSizingReliable:!0,pixelPosition:!1},s.checked=!0,n.noCloneChecked=s.cloneNode(!0).checked,o.disabled=!0,n.optDisabled=!a.disabled;try{delete p.test}catch(d){n.deleteExpando=!1}s=V.createElement("input"),s.setAttribute("value",""),n.input=""===s.getAttribute("value"),s.value="t",s.setAttribute("type","radio"),n.radioValue="t"===s.value,s.setAttribute("checked","t"),s.setAttribute("name","t"),u=V.createDocumentFragment(),u.appendChild(s),n.appendChecked=s.checked,n.checkClone=u.cloneNode(!0).cloneNode(!0).lastChild.checked,p.attachEvent&&(p.attachEvent("onclick",function(){n.noCloneEvent=!1}),p.cloneNode(!0).click());for(f in{submit:!0,change:!0,focusin:!0})p.setAttribute(l="on"+f,"t"),n[f+"Bubbles"]=l in e||p.attributes[l].expando===!1;return p.style.backgroundClip="content-box",p.cloneNode(!0).style.backgroundClip="",n.clearCloneStyle="content-box"===p.style.backgroundClip,st(function(){var r,i,o,a="padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;",s=V.getElementsByTagName("body")[0];s&&(r=V.createElement("div"),r.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px",s.appendChild(r).appendChild(p),p.innerHTML="<table><tr><td></td><td>t</td></tr></table>",o=p.getElementsByTagName("td"),o[0].style.cssText="padding:0;margin:0;border:0;display:none",c=0===o[0].offsetHeight,o[0].style.display="",o[1].style.display="none",n.reliableHiddenOffsets=c&&0===o[0].offsetHeight,p.innerHTML="",p.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",n.boxSizing=4===p.offsetWidth,n.doesNotIncludeMarginInBodyOffset=1!==s.offsetTop,e.getComputedStyle&&(n.pixelPosition="1%"!==(e.getComputedStyle(p,null)||{}).top,n.boxSizingReliable="4px"===(e.getComputedStyle(p,null)||{width:"4px"}).width,i=p.appendChild(V.createElement("div")),i.style.cssText=p.style.cssText=a,i.style.marginRight=i.style.width="0",p.style.width="1px",n.reliableMarginRight=!parseFloat((e.getComputedStyle(i,null)||{}).marginRight)),p.style.zoom!==t&&(p.innerHTML="",p.style.cssText=a+"width:1px;padding:1px;display:inline;zoom:1",n.inlineBlockNeedsLayout=3===p.offsetWidth,p.style.display="block",p.innerHTML="<div></div>",p.firstChild.style.width="5px",n.shrinkWrapBlocks=3!==p.offsetWidth,s.style.zoom=1),s.removeChild(r),r=p=o=i=null)}),r=o=u=a=i=s=null,n}();var wt=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,Nt=/([A-Z])/g;st.extend({cache:{},expando:"jQuery"+(Z+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(e){return e=e.nodeType?st.cache[e[st.expando]]:e[st.expando],!!e&&!s(e)},data:function(e,t,n){return i(e,t,n,!1)},removeData:function(e,t){return o(e,t,!1)},_data:function(e,t,n){return i(e,t,n,!0)},_removeData:function(e,t){return o(e,t,!0)},acceptData:function(e){var t=e.nodeName&&st.noData[e.nodeName.toLowerCase()];return!t||t!==!0&&e.getAttribute("classid")===t}}),st.fn.extend({data:function(e,n){var r,i,o=this[0],s=0,u=null;if(e===t){if(this.length&&(u=st.data(o),1===o.nodeType&&!st._data(o,"parsedAttrs"))){for(r=o.attributes;r.length>s;s++)i=r[s].name,i.indexOf("data-")||(i=st.camelCase(i.substring(5)),a(o,i,u[i]));st._data(o,"parsedAttrs",!0)}return u}return"object"==typeof e?this.each(function(){st.data(this,e)}):st.access(this,function(n){return n===t?o?a(o,e,st.data(o,e)):null:(this.each(function(){st.data(this,e,n)}),t)},null,n,arguments.length>1,null,!0)},removeData:function(e){return this.each(function(){st.removeData(this,e)})}}),st.extend({queue:function(e,n,r){var i;return e?(n=(n||"fx")+"queue",i=st._data(e,n),r&&(!i||st.isArray(r)?i=st._data(e,n,st.makeArray(r)):i.push(r)),i||[]):t},dequeue:function(e,t){t=t||"fx";var n=st.queue(e,t),r=n.length,i=n.shift(),o=st._queueHooks(e,t),a=function(){st.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),o.cur=i,i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,a,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return st._data(e,n)||st._data(e,n,{empty:st.Callbacks("once memory").add(function(){st._removeData(e,t+"queue"),st._removeData(e,n)})})}}),st.fn.extend({queue:function(e,n){var r=2;return"string"!=typeof e&&(n=e,e="fx",r--),r>arguments.length?st.queue(this[0],e):n===t?this:this.each(function(){var t=st.queue(this,e,n);st._queueHooks(this,e),"fx"===e&&"inprogress"!==t[0]&&st.dequeue(this,e)})},dequeue:function(e){return this.each(function(){st.dequeue(this,e)})},delay:function(e,t){return e=st.fx?st.fx.speeds[e]||e:e,t=t||"fx",this.queue(t,function(t,n){var r=setTimeout(t,e);n.stop=function(){clearTimeout(r)}})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,n){var r,i=1,o=st.Deferred(),a=this,s=this.length,u=function(){--i||o.resolveWith(a,[a])};for("string"!=typeof e&&(n=e,e=t),e=e||"fx";s--;)r=st._data(a[s],e+"queueHooks"),r&&r.empty&&(i++,r.empty.add(u));return u(),o.promise(n)}});var Ct,kt,Et=/[\t\r\n]/g,St=/\r/g,At=/^(?:input|select|textarea|button|object)$/i,jt=/^(?:a|area)$/i,Dt=/^(?:checked|selected|autofocus|autoplay|async|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped)$/i,Lt=/^(?:checked|selected)$/i,Ht=st.support.getSetAttribute,Mt=st.support.input;st.fn.extend({attr:function(e,t){return st.access(this,st.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){st.removeAttr(this,e)})},prop:function(e,t){return st.access(this,st.prop,e,t,arguments.length>1)},removeProp:function(e){return e=st.propFix[e]||e,this.each(function(){try{this[e]=t,delete this[e]}catch(n){}})},addClass:function(e){var t,n,r,i,o,a=0,s=this.length,u="string"==typeof e&&e;if(st.isFunction(e))return this.each(function(t){st(this).addClass(e.call(this,t,this.className))});if(u)for(t=(e||"").match(lt)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(Et," "):" ")){for(o=0;i=t[o++];)0>r.indexOf(" "+i+" ")&&(r+=i+" ");n.className=st.trim(r)}return this},removeClass:function(e){var t,n,r,i,o,a=0,s=this.length,u=0===arguments.length||"string"==typeof e&&e;if(st.isFunction(e))return this.each(function(t){st(this).removeClass(e.call(this,t,this.className))});if(u)for(t=(e||"").match(lt)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(Et," "):"")){for(o=0;i=t[o++];)for(;r.indexOf(" "+i+" ")>=0;)r=r.replace(" "+i+" "," ");n.className=e?st.trim(r):""}return this},toggleClass:function(e,t){var n=typeof e,r="boolean"==typeof t;return st.isFunction(e)?this.each(function(n){st(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if("string"===n)for(var i,o=0,a=st(this),s=t,u=e.match(lt)||[];i=u[o++];)s=r?s:!a.hasClass(i),a[s?"addClass":"removeClass"](i);else("undefined"===n||"boolean"===n)&&(this.className&&st._data(this,"__className__",this.className),this.className=this.className||e===!1?"":st._data(this,"__className__")||"")})},hasClass:function(e){for(var t=" "+e+" ",n=0,r=this.length;r>n;n++)if(1===this[n].nodeType&&(" "+this[n].className+" ").replace(Et," ").indexOf(t)>=0)return!0;return!1},val:function(e){var n,r,i,o=this[0];{if(arguments.length)return i=st.isFunction(e),this.each(function(r){var o,a=st(this);1===this.nodeType&&(o=i?e.call(this,r,a.val()):e,null==o?o="":"number"==typeof o?o+="":st.isArray(o)&&(o=st.map(o,function(e){return null==e?"":e+""})),n=st.valHooks[this.type]||st.valHooks[this.nodeName.toLowerCase()],n&&"set"in n&&n.set(this,o,"value")!==t||(this.value=o))});if(o)return n=st.valHooks[o.type]||st.valHooks[o.nodeName.toLowerCase()],n&&"get"in n&&(r=n.get(o,"value"))!==t?r:(r=o.value,"string"==typeof r?r.replace(St,""):null==r?"":r)}}}),st.extend({valHooks:{option:{get:function(e){var t=e.attributes.value;return!t||t.specified?e.value:e.text}},select:{get:function(e){for(var t,n,r=e.options,i=e.selectedIndex,o="select-one"===e.type||0>i,a=o?null:[],s=o?i+1:r.length,u=0>i?s:o?i:0;s>u;u++)if(n=r[u],!(!n.selected&&u!==i||(st.support.optDisabled?n.disabled:null!==n.getAttribute("disabled"))||n.parentNode.disabled&&st.nodeName(n.parentNode,"optgroup"))){if(t=st(n).val(),o)return t;a.push(t)}return a},set:function(e,t){var n=st.makeArray(t);return st(e).find("option").each(function(){this.selected=st.inArray(st(this).val(),n)>=0}),n.length||(e.selectedIndex=-1),n}}},attr:function(e,n,r){var i,o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return e.getAttribute===t?st.prop(e,n,r):(a=1!==s||!st.isXMLDoc(e),a&&(n=n.toLowerCase(),o=st.attrHooks[n]||(Dt.test(n)?kt:Ct)),r===t?o&&a&&"get"in o&&null!==(i=o.get(e,n))?i:(e.getAttribute!==t&&(i=e.getAttribute(n)),null==i?t:i):null!==r?o&&a&&"set"in o&&(i=o.set(e,r,n))!==t?i:(e.setAttribute(n,r+""),r):(st.removeAttr(e,n),t))},removeAttr:function(e,t){var n,r,i=0,o=t&&t.match(lt);if(o&&1===e.nodeType)for(;n=o[i++];)r=st.propFix[n]||n,Dt.test(n)?!Ht&&Lt.test(n)?e[st.camelCase("default-"+n)]=e[r]=!1:e[r]=!1:st.attr(e,n,""),e.removeAttribute(Ht?n:r)},attrHooks:{type:{set:function(e,t){if(!st.support.radioValue&&"radio"===t&&st.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(e,n,r){var i,o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return a=1!==s||!st.isXMLDoc(e),a&&(n=st.propFix[n]||n,o=st.propHooks[n]),r!==t?o&&"set"in o&&(i=o.set(e,r,n))!==t?i:e[n]=r:o&&"get"in o&&null!==(i=o.get(e,n))?i:e[n]},propHooks:{tabIndex:{get:function(e){var n=e.getAttributeNode("tabindex");return n&&n.specified?parseInt(n.value,10):At.test(e.nodeName)||jt.test(e.nodeName)&&e.href?0:t}}}}),kt={get:function(e,n){var r=st.prop(e,n),i="boolean"==typeof r&&e.getAttribute(n),o="boolean"==typeof r?Mt&&Ht?null!=i:Lt.test(n)?e[st.camelCase("default-"+n)]:!!i:e.getAttributeNode(n);return o&&o.value!==!1?n.toLowerCase():t},set:function(e,t,n){return t===!1?st.removeAttr(e,n):Mt&&Ht||!Lt.test(n)?e.setAttribute(!Ht&&st.propFix[n]||n,n):e[st.camelCase("default-"+n)]=e[n]=!0,n}},Mt&&Ht||(st.attrHooks.value={get:function(e,n){var r=e.getAttributeNode(n);return st.nodeName(e,"input")?e.defaultValue:r&&r.specified?r.value:t
+},set:function(e,n,r){return st.nodeName(e,"input")?(e.defaultValue=n,t):Ct&&Ct.set(e,n,r)}}),Ht||(Ct=st.valHooks.button={get:function(e,n){var r=e.getAttributeNode(n);return r&&("id"===n||"name"===n||"coords"===n?""!==r.value:r.specified)?r.value:t},set:function(e,n,r){var i=e.getAttributeNode(r);return i||e.setAttributeNode(i=e.ownerDocument.createAttribute(r)),i.value=n+="","value"===r||n===e.getAttribute(r)?n:t}},st.attrHooks.contenteditable={get:Ct.get,set:function(e,t,n){Ct.set(e,""===t?!1:t,n)}},st.each(["width","height"],function(e,n){st.attrHooks[n]=st.extend(st.attrHooks[n],{set:function(e,r){return""===r?(e.setAttribute(n,"auto"),r):t}})})),st.support.hrefNormalized||(st.each(["href","src","width","height"],function(e,n){st.attrHooks[n]=st.extend(st.attrHooks[n],{get:function(e){var r=e.getAttribute(n,2);return null==r?t:r}})}),st.each(["href","src"],function(e,t){st.propHooks[t]={get:function(e){return e.getAttribute(t,4)}}})),st.support.style||(st.attrHooks.style={get:function(e){return e.style.cssText||t},set:function(e,t){return e.style.cssText=t+""}}),st.support.optSelected||(st.propHooks.selected=st.extend(st.propHooks.selected,{get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null}})),st.support.enctype||(st.propFix.enctype="encoding"),st.support.checkOn||st.each(["radio","checkbox"],function(){st.valHooks[this]={get:function(e){return null===e.getAttribute("value")?"on":e.value}}}),st.each(["radio","checkbox"],function(){st.valHooks[this]=st.extend(st.valHooks[this],{set:function(e,n){return st.isArray(n)?e.checked=st.inArray(st(e).val(),n)>=0:t}})});var qt=/^(?:input|select|textarea)$/i,_t=/^key/,Ft=/^(?:mouse|contextmenu)|click/,Ot=/^(?:focusinfocus|focusoutblur)$/,Bt=/^([^.]*)(?:\.(.+)|)$/;st.event={global:{},add:function(e,n,r,i,o){var a,s,u,l,c,f,p,d,h,g,m,y=3!==e.nodeType&&8!==e.nodeType&&st._data(e);if(y){for(r.handler&&(a=r,r=a.handler,o=a.selector),r.guid||(r.guid=st.guid++),(l=y.events)||(l=y.events={}),(s=y.handle)||(s=y.handle=function(e){return st===t||e&&st.event.triggered===e.type?t:st.event.dispatch.apply(s.elem,arguments)},s.elem=e),n=(n||"").match(lt)||[""],c=n.length;c--;)u=Bt.exec(n[c])||[],h=m=u[1],g=(u[2]||"").split(".").sort(),p=st.event.special[h]||{},h=(o?p.delegateType:p.bindType)||h,p=st.event.special[h]||{},f=st.extend({type:h,origType:m,data:i,handler:r,guid:r.guid,selector:o,needsContext:o&&st.expr.match.needsContext.test(o),namespace:g.join(".")},a),(d=l[h])||(d=l[h]=[],d.delegateCount=0,p.setup&&p.setup.call(e,i,g,s)!==!1||(e.addEventListener?e.addEventListener(h,s,!1):e.attachEvent&&e.attachEvent("on"+h,s))),p.add&&(p.add.call(e,f),f.handler.guid||(f.handler.guid=r.guid)),o?d.splice(d.delegateCount++,0,f):d.push(f),st.event.global[h]=!0;e=null}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,m=st.hasData(e)&&st._data(e);if(m&&(u=m.events)){for(t=(t||"").match(lt)||[""],l=t.length;l--;)if(s=Bt.exec(t[l])||[],d=g=s[1],h=(s[2]||"").split(".").sort(),d){for(f=st.event.special[d]||{},d=(r?f.delegateType:f.bindType)||d,p=u[d]||[],s=s[2]&&RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=p.length;o--;)c=p[o],!i&&g!==c.origType||n&&n.guid!==c.guid||s&&!s.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(p.splice(o,1),c.selector&&p.delegateCount--,f.remove&&f.remove.call(e,c));a&&!p.length&&(f.teardown&&f.teardown.call(e,h,m.handle)!==!1||st.removeEvent(e,d,m.handle),delete u[d])}else for(d in u)st.event.remove(e,d+t[l],n,r,!0);st.isEmptyObject(u)&&(delete m.handle,st._removeData(e,"events"))}},trigger:function(n,r,i,o){var a,s,u,l,c,f,p,d=[i||V],h=n.type||n,g=n.namespace?n.namespace.split("."):[];if(s=u=i=i||V,3!==i.nodeType&&8!==i.nodeType&&!Ot.test(h+st.event.triggered)&&(h.indexOf(".")>=0&&(g=h.split("."),h=g.shift(),g.sort()),c=0>h.indexOf(":")&&"on"+h,n=n[st.expando]?n:new st.Event(h,"object"==typeof n&&n),n.isTrigger=!0,n.namespace=g.join("."),n.namespace_re=n.namespace?RegExp("(^|\\.)"+g.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,n.result=t,n.target||(n.target=i),r=null==r?[n]:st.makeArray(r,[n]),p=st.event.special[h]||{},o||!p.trigger||p.trigger.apply(i,r)!==!1)){if(!o&&!p.noBubble&&!st.isWindow(i)){for(l=p.delegateType||h,Ot.test(l+h)||(s=s.parentNode);s;s=s.parentNode)d.push(s),u=s;u===(i.ownerDocument||V)&&d.push(u.defaultView||u.parentWindow||e)}for(a=0;(s=d[a++])&&!n.isPropagationStopped();)n.type=a>1?l:p.bindType||h,f=(st._data(s,"events")||{})[n.type]&&st._data(s,"handle"),f&&f.apply(s,r),f=c&&s[c],f&&st.acceptData(s)&&f.apply&&f.apply(s,r)===!1&&n.preventDefault();if(n.type=h,!(o||n.isDefaultPrevented()||p._default&&p._default.apply(i.ownerDocument,r)!==!1||"click"===h&&st.nodeName(i,"a")||!st.acceptData(i)||!c||!i[h]||st.isWindow(i))){u=i[c],u&&(i[c]=null),st.event.triggered=h;try{i[h]()}catch(m){}st.event.triggered=t,u&&(i[c]=u)}return n.result}},dispatch:function(e){e=st.event.fix(e);var n,r,i,o,a,s=[],u=nt.call(arguments),l=(st._data(this,"events")||{})[e.type]||[],c=st.event.special[e.type]||{};if(u[0]=e,e.delegateTarget=this,!c.preDispatch||c.preDispatch.call(this,e)!==!1){for(s=st.event.handlers.call(this,e,l),n=0;(o=s[n++])&&!e.isPropagationStopped();)for(e.currentTarget=o.elem,r=0;(a=o.handlers[r++])&&!e.isImmediatePropagationStopped();)(!e.namespace_re||e.namespace_re.test(a.namespace))&&(e.handleObj=a,e.data=a.data,i=((st.event.special[a.origType]||{}).handle||a.handler).apply(o.elem,u),i!==t&&(e.result=i)===!1&&(e.preventDefault(),e.stopPropagation()));return c.postDispatch&&c.postDispatch.call(this,e),e.result}},handlers:function(e,n){var r,i,o,a,s=[],u=n.delegateCount,l=e.target;if(u&&l.nodeType&&(!e.button||"click"!==e.type))for(;l!=this;l=l.parentNode||this)if(l.disabled!==!0||"click"!==e.type){for(i=[],r=0;u>r;r++)a=n[r],o=a.selector+" ",i[o]===t&&(i[o]=a.needsContext?st(o,this).index(l)>=0:st.find(o,this,null,[l]).length),i[o]&&i.push(a);i.length&&s.push({elem:l,handlers:i})}return n.length>u&&s.push({elem:this,handlers:n.slice(u)}),s},fix:function(e){if(e[st.expando])return e;var t,n,r=e,i=st.event.fixHooks[e.type]||{},o=i.props?this.props.concat(i.props):this.props;for(e=new st.Event(r),t=o.length;t--;)n=o[t],e[n]=r[n];return e.target||(e.target=r.srcElement||V),3===e.target.nodeType&&(e.target=e.target.parentNode),e.metaKey=!!e.metaKey,i.filter?i.filter(e,r):e},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return null==e.which&&(e.which=null!=t.charCode?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,n){var r,i,o,a=n.button,s=n.fromElement;return null==e.pageX&&null!=n.clientX&&(r=e.target.ownerDocument||V,i=r.documentElement,o=r.body,e.pageX=n.clientX+(i&&i.scrollLeft||o&&o.scrollLeft||0)-(i&&i.clientLeft||o&&o.clientLeft||0),e.pageY=n.clientY+(i&&i.scrollTop||o&&o.scrollTop||0)-(i&&i.clientTop||o&&o.clientTop||0)),!e.relatedTarget&&s&&(e.relatedTarget=s===e.target?n.toElement:s),e.which||a===t||(e.which=1&a?1:2&a?3:4&a?2:0),e}},special:{load:{noBubble:!0},click:{trigger:function(){return st.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):t}},focus:{trigger:function(){if(this!==V.activeElement&&this.focus)try{return this.focus(),!1}catch(e){}},delegateType:"focusin"},blur:{trigger:function(){return this===V.activeElement&&this.blur?(this.blur(),!1):t},delegateType:"focusout"},beforeunload:{postDispatch:function(e){e.result!==t&&(e.originalEvent.returnValue=e.result)}}},simulate:function(e,t,n,r){var i=st.extend(new st.Event,n,{type:e,isSimulated:!0,originalEvent:{}});r?st.event.trigger(i,null,t):st.event.dispatch.call(t,i),i.isDefaultPrevented()&&n.preventDefault()}},st.removeEvent=V.removeEventListener?function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n,!1)}:function(e,n,r){var i="on"+n;e.detachEvent&&(e[i]===t&&(e[i]=null),e.detachEvent(i,r))},st.Event=function(e,n){return this instanceof st.Event?(e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||e.returnValue===!1||e.getPreventDefault&&e.getPreventDefault()?u:l):this.type=e,n&&st.extend(this,n),this.timeStamp=e&&e.timeStamp||st.now(),this[st.expando]=!0,t):new st.Event(e,n)},st.Event.prototype={isDefaultPrevented:l,isPropagationStopped:l,isImmediatePropagationStopped:l,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=u,e&&(e.preventDefault?e.preventDefault():e.returnValue=!1)},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=u,e&&(e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=u,this.stopPropagation()}},st.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(e,t){st.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,o=e.handleObj;return(!i||i!==r&&!st.contains(r,i))&&(e.type=o.origType,n=o.handler.apply(this,arguments),e.type=t),n}}}),st.support.submitBubbles||(st.event.special.submit={setup:function(){return st.nodeName(this,"form")?!1:(st.event.add(this,"click._submit keypress._submit",function(e){var n=e.target,r=st.nodeName(n,"input")||st.nodeName(n,"button")?n.form:t;r&&!st._data(r,"submitBubbles")&&(st.event.add(r,"submit._submit",function(e){e._submit_bubble=!0}),st._data(r,"submitBubbles",!0))}),t)},postDispatch:function(e){e._submit_bubble&&(delete e._submit_bubble,this.parentNode&&!e.isTrigger&&st.event.simulate("submit",this.parentNode,e,!0))},teardown:function(){return st.nodeName(this,"form")?!1:(st.event.remove(this,"._submit"),t)}}),st.support.changeBubbles||(st.event.special.change={setup:function(){return qt.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(st.event.add(this,"propertychange._change",function(e){"checked"===e.originalEvent.propertyName&&(this._just_changed=!0)}),st.event.add(this,"click._change",function(e){this._just_changed&&!e.isTrigger&&(this._just_changed=!1),st.event.simulate("change",this,e,!0)})),!1):(st.event.add(this,"beforeactivate._change",function(e){var t=e.target;qt.test(t.nodeName)&&!st._data(t,"changeBubbles")&&(st.event.add(t,"change._change",function(e){!this.parentNode||e.isSimulated||e.isTrigger||st.event.simulate("change",this.parentNode,e,!0)}),st._data(t,"changeBubbles",!0))}),t)},handle:function(e){var n=e.target;return this!==n||e.isSimulated||e.isTrigger||"radio"!==n.type&&"checkbox"!==n.type?e.handleObj.handler.apply(this,arguments):t},teardown:function(){return st.event.remove(this,"._change"),!qt.test(this.nodeName)}}),st.support.focusinBubbles||st.each({focus:"focusin",blur:"focusout"},function(e,t){var n=0,r=function(e){st.event.simulate(t,e.target,st.event.fix(e),!0)};st.event.special[t]={setup:function(){0===n++&&V.addEventListener(e,r,!0)},teardown:function(){0===--n&&V.removeEventListener(e,r,!0)}}}),st.fn.extend({on:function(e,n,r,i,o){var a,s;if("object"==typeof e){"string"!=typeof n&&(r=r||n,n=t);for(s in e)this.on(s,n,r,e[s],o);return this}if(null==r&&null==i?(i=n,r=n=t):null==i&&("string"==typeof n?(i=r,r=t):(i=r,r=n,n=t)),i===!1)i=l;else if(!i)return this;return 1===o&&(a=i,i=function(e){return st().off(e),a.apply(this,arguments)},i.guid=a.guid||(a.guid=st.guid++)),this.each(function(){st.event.add(this,e,i,r,n)})},one:function(e,t,n,r){return this.on(e,t,n,r,1)},off:function(e,n,r){var i,o;if(e&&e.preventDefault&&e.handleObj)return i=e.handleObj,st(e.delegateTarget).off(i.namespace?i.origType+"."+i.namespace:i.origType,i.selector,i.handler),this;if("object"==typeof e){for(o in e)this.off(o,n,e[o]);return this}return(n===!1||"function"==typeof n)&&(r=n,n=t),r===!1&&(r=l),this.each(function(){st.event.remove(this,e,r,n)})},bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},trigger:function(e,t){return this.each(function(){st.event.trigger(e,t,this)})},triggerHandler:function(e,n){var r=this[0];return r?st.event.trigger(e,n,r,!0):t},hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),st.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(e,t){st.fn[t]=function(e,n){return arguments.length>0?this.on(t,null,e,n):this.trigger(t)},_t.test(t)&&(st.event.fixHooks[t]=st.event.keyHooks),Ft.test(t)&&(st.event.fixHooks[t]=st.event.mouseHooks)}),function(e,t){function n(e){return ht.test(e+"")}function r(){var e,t=[];return e=function(n,r){return t.push(n+=" ")>C.cacheLength&&delete e[t.shift()],e[n]=r}}function i(e){return e[P]=!0,e}function o(e){var t=L.createElement("div");try{return e(t)}catch(n){return!1}finally{t=null}}function a(e,t,n,r){var i,o,a,s,u,l,c,d,h,g;if((t?t.ownerDocument||t:R)!==L&&D(t),t=t||L,n=n||[],!e||"string"!=typeof e)return n;if(1!==(s=t.nodeType)&&9!==s)return[];if(!M&&!r){if(i=gt.exec(e))if(a=i[1]){if(9===s){if(o=t.getElementById(a),!o||!o.parentNode)return n;if(o.id===a)return n.push(o),n}else if(t.ownerDocument&&(o=t.ownerDocument.getElementById(a))&&O(t,o)&&o.id===a)return n.push(o),n}else{if(i[2])return Q.apply(n,K.call(t.getElementsByTagName(e),0)),n;if((a=i[3])&&W.getByClassName&&t.getElementsByClassName)return Q.apply(n,K.call(t.getElementsByClassName(a),0)),n}if(W.qsa&&!q.test(e)){if(c=!0,d=P,h=t,g=9===s&&e,1===s&&"object"!==t.nodeName.toLowerCase()){for(l=f(e),(c=t.getAttribute("id"))?d=c.replace(vt,"\\$&"):t.setAttribute("id",d),d="[id='"+d+"'] ",u=l.length;u--;)l[u]=d+p(l[u]);h=dt.test(e)&&t.parentNode||t,g=l.join(",")}if(g)try{return Q.apply(n,K.call(h.querySelectorAll(g),0)),n}catch(m){}finally{c||t.removeAttribute("id")}}}return x(e.replace(at,"$1"),t,n,r)}function s(e,t){for(var n=e&&t&&e.nextSibling;n;n=n.nextSibling)if(n===t)return-1;return e?1:-1}function u(e){return function(t){var n=t.nodeName.toLowerCase();return"input"===n&&t.type===e}}function l(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function c(e){return i(function(t){return t=+t,i(function(n,r){for(var i,o=e([],n.length,t),a=o.length;a--;)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}function f(e,t){var n,r,i,o,s,u,l,c=X[e+" "];if(c)return t?0:c.slice(0);for(s=e,u=[],l=C.preFilter;s;){(!n||(r=ut.exec(s)))&&(r&&(s=s.slice(r[0].length)||s),u.push(i=[])),n=!1,(r=lt.exec(s))&&(n=r.shift(),i.push({value:n,type:r[0].replace(at," ")}),s=s.slice(n.length));for(o in C.filter)!(r=pt[o].exec(s))||l[o]&&!(r=l[o](r))||(n=r.shift(),i.push({value:n,type:o,matches:r}),s=s.slice(n.length));if(!n)break}return t?s.length:s?a.error(e):X(e,u).slice(0)}function p(e){for(var t=0,n=e.length,r="";n>t;t++)r+=e[t].value;return r}function d(e,t,n){var r=t.dir,i=n&&"parentNode"===t.dir,o=I++;return t.first?function(t,n,o){for(;t=t[r];)if(1===t.nodeType||i)return e(t,n,o)}:function(t,n,a){var s,u,l,c=$+" "+o;if(a){for(;t=t[r];)if((1===t.nodeType||i)&&e(t,n,a))return!0}else for(;t=t[r];)if(1===t.nodeType||i)if(l=t[P]||(t[P]={}),(u=l[r])&&u[0]===c){if((s=u[1])===!0||s===N)return s===!0}else if(u=l[r]=[c],u[1]=e(t,n,a)||N,u[1]===!0)return!0}}function h(e){return e.length>1?function(t,n,r){for(var i=e.length;i--;)if(!e[i](t,n,r))return!1;return!0}:e[0]}function g(e,t,n,r,i){for(var o,a=[],s=0,u=e.length,l=null!=t;u>s;s++)(o=e[s])&&(!n||n(o,r,i))&&(a.push(o),l&&t.push(s));return a}function m(e,t,n,r,o,a){return r&&!r[P]&&(r=m(r)),o&&!o[P]&&(o=m(o,a)),i(function(i,a,s,u){var l,c,f,p=[],d=[],h=a.length,m=i||b(t||"*",s.nodeType?[s]:s,[]),y=!e||!i&&t?m:g(m,p,e,s,u),v=n?o||(i?e:h||r)?[]:a:y;if(n&&n(y,v,s,u),r)for(l=g(v,d),r(l,[],s,u),c=l.length;c--;)(f=l[c])&&(v[d[c]]=!(y[d[c]]=f));if(i){if(o||e){if(o){for(l=[],c=v.length;c--;)(f=v[c])&&l.push(y[c]=f);o(null,v=[],l,u)}for(c=v.length;c--;)(f=v[c])&&(l=o?Z.call(i,f):p[c])>-1&&(i[l]=!(a[l]=f))}}else v=g(v===a?v.splice(h,v.length):v),o?o(null,a,v,u):Q.apply(a,v)})}function y(e){for(var t,n,r,i=e.length,o=C.relative[e[0].type],a=o||C.relative[" "],s=o?1:0,u=d(function(e){return e===t},a,!0),l=d(function(e){return Z.call(t,e)>-1},a,!0),c=[function(e,n,r){return!o&&(r||n!==j)||((t=n).nodeType?u(e,n,r):l(e,n,r))}];i>s;s++)if(n=C.relative[e[s].type])c=[d(h(c),n)];else{if(n=C.filter[e[s].type].apply(null,e[s].matches),n[P]){for(r=++s;i>r&&!C.relative[e[r].type];r++);return m(s>1&&h(c),s>1&&p(e.slice(0,s-1)).replace(at,"$1"),n,r>s&&y(e.slice(s,r)),i>r&&y(e=e.slice(r)),i>r&&p(e))}c.push(n)}return h(c)}function v(e,t){var n=0,r=t.length>0,o=e.length>0,s=function(i,s,u,l,c){var f,p,d,h=[],m=0,y="0",v=i&&[],b=null!=c,x=j,T=i||o&&C.find.TAG("*",c&&s.parentNode||s),w=$+=null==x?1:Math.E;for(b&&(j=s!==L&&s,N=n);null!=(f=T[y]);y++){if(o&&f){for(p=0;d=e[p];p++)if(d(f,s,u)){l.push(f);break}b&&($=w,N=++n)}r&&((f=!d&&f)&&m--,i&&v.push(f))}if(m+=y,r&&y!==m){for(p=0;d=t[p];p++)d(v,h,s,u);if(i){if(m>0)for(;y--;)v[y]||h[y]||(h[y]=G.call(l));h=g(h)}Q.apply(l,h),b&&!i&&h.length>0&&m+t.length>1&&a.uniqueSort(l)}return b&&($=w,j=x),v};return r?i(s):s}function b(e,t,n){for(var r=0,i=t.length;i>r;r++)a(e,t[r],n);return n}function x(e,t,n,r){var i,o,a,s,u,l=f(e);if(!r&&1===l.length){if(o=l[0]=l[0].slice(0),o.length>2&&"ID"===(a=o[0]).type&&9===t.nodeType&&!M&&C.relative[o[1].type]){if(t=C.find.ID(a.matches[0].replace(xt,Tt),t)[0],!t)return n;e=e.slice(o.shift().value.length)}for(i=pt.needsContext.test(e)?-1:o.length-1;i>=0&&(a=o[i],!C.relative[s=a.type]);i--)if((u=C.find[s])&&(r=u(a.matches[0].replace(xt,Tt),dt.test(o[0].type)&&t.parentNode||t))){if(o.splice(i,1),e=r.length&&p(o),!e)return Q.apply(n,K.call(r,0)),n;break}}return S(e,l)(r,t,M,n,dt.test(e)),n}function T(){}var w,N,C,k,E,S,A,j,D,L,H,M,q,_,F,O,B,P="sizzle"+-new Date,R=e.document,W={},$=0,I=0,z=r(),X=r(),U=r(),V=typeof t,Y=1<<31,J=[],G=J.pop,Q=J.push,K=J.slice,Z=J.indexOf||function(e){for(var t=0,n=this.length;n>t;t++)if(this[t]===e)return t;return-1},et="[\\x20\\t\\r\\n\\f]",tt="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",nt=tt.replace("w","w#"),rt="([*^$|!~]?=)",it="\\["+et+"*("+tt+")"+et+"*(?:"+rt+et+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+nt+")|)|)"+et+"*\\]",ot=":("+tt+")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+it.replace(3,8)+")*)|.*)\\)|)",at=RegExp("^"+et+"+|((?:^|[^\\\\])(?:\\\\.)*)"+et+"+$","g"),ut=RegExp("^"+et+"*,"+et+"*"),lt=RegExp("^"+et+"*([\\x20\\t\\r\\n\\f>+~])"+et+"*"),ct=RegExp(ot),ft=RegExp("^"+nt+"$"),pt={ID:RegExp("^#("+tt+")"),CLASS:RegExp("^\\.("+tt+")"),NAME:RegExp("^\\[name=['\"]?("+tt+")['\"]?\\]"),TAG:RegExp("^("+tt.replace("w","w*")+")"),ATTR:RegExp("^"+it),PSEUDO:RegExp("^"+ot),CHILD:RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+et+"*(even|odd|(([+-]|)(\\d*)n|)"+et+"*(?:([+-]|)"+et+"*(\\d+)|))"+et+"*\\)|)","i"),needsContext:RegExp("^"+et+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+et+"*((?:-\\d)?\\d*)"+et+"*\\)|)(?=[^-]|$)","i")},dt=/[\x20\t\r\n\f]*[+~]/,ht=/\{\s*\[native code\]\s*\}/,gt=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,mt=/^(?:input|select|textarea|button)$/i,yt=/^h\d$/i,vt=/'|\\/g,bt=/\=[\x20\t\r\n\f]*([^'"\]]*)[\x20\t\r\n\f]*\]/g,xt=/\\([\da-fA-F]{1,6}[\x20\t\r\n\f]?|.)/g,Tt=function(e,t){var n="0x"+t-65536;return n!==n?t:0>n?String.fromCharCode(n+65536):String.fromCharCode(55296|n>>10,56320|1023&n)};try{K.call(H.childNodes,0)[0].nodeType}catch(wt){K=function(e){for(var t,n=[];t=this[e];e++)n.push(t);return n}}E=a.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?"HTML"!==t.nodeName:!1},D=a.setDocument=function(e){var r=e?e.ownerDocument||e:R;return r!==L&&9===r.nodeType&&r.documentElement?(L=r,H=r.documentElement,M=E(r),W.tagNameNoComments=o(function(e){return e.appendChild(r.createComment("")),!e.getElementsByTagName("*").length}),W.attributes=o(function(e){e.innerHTML="<select></select>";var t=typeof e.lastChild.getAttribute("multiple");return"boolean"!==t&&"string"!==t}),W.getByClassName=o(function(e){return e.innerHTML="<div class='hidden e'></div><div class='hidden'></div>",e.getElementsByClassName&&e.getElementsByClassName("e").length?(e.lastChild.className="e",2===e.getElementsByClassName("e").length):!1}),W.getByName=o(function(e){e.id=P+0,e.innerHTML="<a name='"+P+"'></a><div name='"+P+"'></div>",H.insertBefore(e,H.firstChild);var t=r.getElementsByName&&r.getElementsByName(P).length===2+r.getElementsByName(P+0).length;return W.getIdNotName=!r.getElementById(P),H.removeChild(e),t}),C.attrHandle=o(function(e){return e.innerHTML="<a href='#'></a>",e.firstChild&&typeof e.firstChild.getAttribute!==V&&"#"===e.firstChild.getAttribute("href")})?{}:{href:function(e){return e.getAttribute("href",2)},type:function(e){return e.getAttribute("type")}},W.getIdNotName?(C.find.ID=function(e,t){if(typeof t.getElementById!==V&&!M){var n=t.getElementById(e);return n&&n.parentNode?[n]:[]}},C.filter.ID=function(e){var t=e.replace(xt,Tt);return function(e){return e.getAttribute("id")===t}}):(C.find.ID=function(e,n){if(typeof n.getElementById!==V&&!M){var r=n.getElementById(e);return r?r.id===e||typeof r.getAttributeNode!==V&&r.getAttributeNode("id").value===e?[r]:t:[]}},C.filter.ID=function(e){var t=e.replace(xt,Tt);return function(e){var n=typeof e.getAttributeNode!==V&&e.getAttributeNode("id");return n&&n.value===t}}),C.find.TAG=W.tagNameNoComments?function(e,n){return typeof n.getElementsByTagName!==V?n.getElementsByTagName(e):t}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){for(;n=o[i];i++)1===n.nodeType&&r.push(n);return r}return o},C.find.NAME=W.getByName&&function(e,n){return typeof n.getElementsByName!==V?n.getElementsByName(name):t},C.find.CLASS=W.getByClassName&&function(e,n){return typeof n.getElementsByClassName===V||M?t:n.getElementsByClassName(e)},_=[],q=[":focus"],(W.qsa=n(r.querySelectorAll))&&(o(function(e){e.innerHTML="<select><option selected=''></option></select>",e.querySelectorAll("[selected]").length||q.push("\\["+et+"*(?:checked|disabled|ismap|multiple|readonly|selected|value)"),e.querySelectorAll(":checked").length||q.push(":checked")}),o(function(e){e.innerHTML="<input type='hidden' i=''/>",e.querySelectorAll("[i^='']").length&&q.push("[*^$]="+et+"*(?:\"\"|'')"),e.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),q.push(",.*:")})),(W.matchesSelector=n(F=H.matchesSelector||H.mozMatchesSelector||H.webkitMatchesSelector||H.oMatchesSelector||H.msMatchesSelector))&&o(function(e){W.disconnectedMatch=F.call(e,"div"),F.call(e,"[s!='']:x"),_.push("!=",ot)}),q=RegExp(q.join("|")),_=RegExp(_.join("|")),O=n(H.contains)||H.compareDocumentPosition?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)for(;t=t.parentNode;)if(t===e)return!0;return!1},B=H.compareDocumentPosition?function(e,t){var n;return e===t?(A=!0,0):(n=t.compareDocumentPosition&&e.compareDocumentPosition&&e.compareDocumentPosition(t))?1&n||e.parentNode&&11===e.parentNode.nodeType?e===r||O(R,e)?-1:t===r||O(R,t)?1:0:4&n?-1:1:e.compareDocumentPosition?-1:1}:function(e,t){var n,i=0,o=e.parentNode,a=t.parentNode,u=[e],l=[t];if(e===t)return A=!0,0;if(e.sourceIndex&&t.sourceIndex)return(~t.sourceIndex||Y)-(O(R,e)&&~e.sourceIndex||Y);if(!o||!a)return e===r?-1:t===r?1:o?-1:a?1:0;if(o===a)return s(e,t);for(n=e;n=n.parentNode;)u.unshift(n);for(n=t;n=n.parentNode;)l.unshift(n);for(;u[i]===l[i];)i++;return i?s(u[i],l[i]):u[i]===R?-1:l[i]===R?1:0},A=!1,[0,0].sort(B),W.detectDuplicates=A,L):L},a.matches=function(e,t){return a(e,null,null,t)},a.matchesSelector=function(e,t){if((e.ownerDocument||e)!==L&&D(e),t=t.replace(bt,"='$1']"),!(!W.matchesSelector||M||_&&_.test(t)||q.test(t)))try{var n=F.call(e,t);if(n||W.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(r){}return a(t,L,null,[e]).length>0},a.contains=function(e,t){return(e.ownerDocument||e)!==L&&D(e),O(e,t)},a.attr=function(e,t){var n;return(e.ownerDocument||e)!==L&&D(e),M||(t=t.toLowerCase()),(n=C.attrHandle[t])?n(e):M||W.attributes?e.getAttribute(t):((n=e.getAttributeNode(t))||e.getAttribute(t))&&e[t]===!0?t:n&&n.specified?n.value:null},a.error=function(e){throw Error("Syntax error, unrecognized expression: "+e)},a.uniqueSort=function(e){var t,n=[],r=1,i=0;if(A=!W.detectDuplicates,e.sort(B),A){for(;t=e[r];r++)t===e[r-1]&&(i=n.push(r));for(;i--;)e.splice(n[i],1)}return e},k=a.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=k(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r];r++)n+=k(t);return n},C=a.selectors={cacheLength:50,createPseudo:i,match:pt,find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(xt,Tt),e[3]=(e[4]||e[5]||"").replace(xt,Tt),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||a.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&a.error(e[0]),e},PSEUDO:function(e){var t,n=!e[5]&&e[2];return pt.CHILD.test(e[0])?null:(e[4]?e[2]=e[4]:n&&ct.test(n)&&(t=f(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){return"*"===e?function(){return!0}:(e=e.replace(xt,Tt).toLowerCase(),function(t){return t.nodeName&&t.nodeName.toLowerCase()===e})},CLASS:function(e){var t=z[e+" "];return t||(t=RegExp("(^|"+et+")"+e+"("+et+"|$)"))&&z(e,function(e){return t.test(e.className||typeof e.getAttribute!==V&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=a.attr(r,e);return null==i?"!="===t:t?(i+="","="===t?i===n:"!="===t?i!==n:"^="===t?n&&0===i.indexOf(n):"*="===t?n&&i.indexOf(n)>-1:"$="===t?n&&i.substr(i.length-n.length)===n:"~="===t?(" "+i+" ").indexOf(n)>-1:"|="===t?i===n||i.substr(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,u){var l,c,f,p,d,h,g=o!==a?"nextSibling":"previousSibling",m=t.parentNode,y=s&&t.nodeName.toLowerCase(),v=!u&&!s;if(m){if(o){for(;g;){for(f=t;f=f[g];)if(s?f.nodeName.toLowerCase()===y:1===f.nodeType)return!1;h=g="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?m.firstChild:m.lastChild],a&&v){for(c=m[P]||(m[P]={}),l=c[e]||[],d=l[0]===$&&l[1],p=l[0]===$&&l[2],f=d&&m.childNodes[d];f=++d&&f&&f[g]||(p=d=0)||h.pop();)if(1===f.nodeType&&++p&&f===t){c[e]=[$,d,p];break}}else if(v&&(l=(t[P]||(t[P]={}))[e])&&l[0]===$)p=l[1];else for(;(f=++d&&f&&f[g]||(p=d=0)||h.pop())&&((s?f.nodeName.toLowerCase()!==y:1!==f.nodeType)||!++p||(v&&((f[P]||(f[P]={}))[e]=[$,p]),f!==t)););return p-=i,p===r||0===p%r&&p/r>=0}}},PSEUDO:function(e,t){var n,r=C.pseudos[e]||C.setFilters[e.toLowerCase()]||a.error("unsupported pseudo: "+e);return r[P]?r(t):r.length>1?(n=[e,e,"",t],C.setFilters.hasOwnProperty(e.toLowerCase())?i(function(e,n){for(var i,o=r(e,t),a=o.length;a--;)i=Z.call(e,o[a]),e[i]=!(n[i]=o[a])}):function(e){return r(e,0,n)}):r}},pseudos:{not:i(function(e){var t=[],n=[],r=S(e.replace(at,"$1"));return r[P]?i(function(e,t,n,i){for(var o,a=r(e,null,i,[]),s=e.length;s--;)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,i,o){return t[0]=e,r(t,null,o,n),!n.pop()}}),has:i(function(e){return function(t){return a(e,t).length>0}}),contains:i(function(e){return function(t){return(t.textContent||t.innerText||k(t)).indexOf(e)>-1}}),lang:i(function(e){return ft.test(e||"")||a.error("unsupported lang: "+e),e=e.replace(xt,Tt).toLowerCase(),function(t){var n;do if(n=M?t.getAttribute("xml:lang")||t.getAttribute("lang"):t.lang)return n=n.toLowerCase(),n===e||0===n.indexOf(e+"-");while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===H},focus:function(e){return e===L.activeElement&&(!L.hasFocus||L.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeName>"@"||3===e.nodeType||4===e.nodeType)return!1;return!0},parent:function(e){return!C.pseudos.empty(e)},header:function(e){return yt.test(e.nodeName)},input:function(e){return mt.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||t.toLowerCase()===e.type)},first:c(function(){return[0]}),last:c(function(e,t){return[t-1]}),eq:c(function(e,t,n){return[0>n?n+t:n]}),even:c(function(e,t){for(var n=0;t>n;n+=2)e.push(n);return e}),odd:c(function(e,t){for(var n=1;t>n;n+=2)e.push(n);return e}),lt:c(function(e,t,n){for(var r=0>n?n+t:n;--r>=0;)e.push(r);return e}),gt:c(function(e,t,n){for(var r=0>n?n+t:n;t>++r;)e.push(r);return e})}};for(w in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})C.pseudos[w]=u(w);for(w in{submit:!0,reset:!0})C.pseudos[w]=l(w);S=a.compile=function(e,t){var n,r=[],i=[],o=U[e+" "];if(!o){for(t||(t=f(e)),n=t.length;n--;)o=y(t[n]),o[P]?r.push(o):i.push(o);o=U(e,v(i,r))}return o},C.pseudos.nth=C.pseudos.eq,C.filters=T.prototype=C.pseudos,C.setFilters=new T,D(),a.attr=st.attr,st.find=a,st.expr=a.selectors,st.expr[":"]=st.expr.pseudos,st.unique=a.uniqueSort,st.text=a.getText,st.isXMLDoc=a.isXML,st.contains=a.contains}(e);var Pt=/Until$/,Rt=/^(?:parents|prev(?:Until|All))/,Wt=/^.[^:#\[\.,]*$/,$t=st.expr.match.needsContext,It={children:!0,contents:!0,next:!0,prev:!0};st.fn.extend({find:function(e){var t,n,r;if("string"!=typeof e)return r=this,this.pushStack(st(e).filter(function(){for(t=0;r.length>t;t++)if(st.contains(r[t],this))return!0}));for(n=[],t=0;this.length>t;t++)st.find(e,this[t],n);return n=this.pushStack(st.unique(n)),n.selector=(this.selector?this.selector+" ":"")+e,n},has:function(e){var t,n=st(e,this),r=n.length;return this.filter(function(){for(t=0;r>t;t++)if(st.contains(this,n[t]))return!0})},not:function(e){return this.pushStack(f(this,e,!1))},filter:function(e){return this.pushStack(f(this,e,!0))},is:function(e){return!!e&&("string"==typeof e?$t.test(e)?st(e,this.context).index(this[0])>=0:st.filter(e,this).length>0:this.filter(e).length>0)},closest:function(e,t){for(var n,r=0,i=this.length,o=[],a=$t.test(e)||"string"!=typeof e?st(e,t||this.context):0;i>r;r++)for(n=this[r];n&&n.ownerDocument&&n!==t&&11!==n.nodeType;){if(a?a.index(n)>-1:st.find.matchesSelector(n,e)){o.push(n);break}n=n.parentNode}return this.pushStack(o.length>1?st.unique(o):o)},index:function(e){return e?"string"==typeof e?st.inArray(this[0],st(e)):st.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){var n="string"==typeof e?st(e,t):st.makeArray(e&&e.nodeType?[e]:e),r=st.merge(this.get(),n);return this.pushStack(st.unique(r))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),st.fn.andSelf=st.fn.addBack,st.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return st.dir(e,"parentNode")},parentsUntil:function(e,t,n){return st.dir(e,"parentNode",n)},next:function(e){return c(e,"nextSibling")},prev:function(e){return c(e,"previousSibling")
+},nextAll:function(e){return st.dir(e,"nextSibling")},prevAll:function(e){return st.dir(e,"previousSibling")},nextUntil:function(e,t,n){return st.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return st.dir(e,"previousSibling",n)},siblings:function(e){return st.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return st.sibling(e.firstChild)},contents:function(e){return st.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:st.merge([],e.childNodes)}},function(e,t){st.fn[e]=function(n,r){var i=st.map(this,t,n);return Pt.test(e)||(r=n),r&&"string"==typeof r&&(i=st.filter(r,i)),i=this.length>1&&!It[e]?st.unique(i):i,this.length>1&&Rt.test(e)&&(i=i.reverse()),this.pushStack(i)}}),st.extend({filter:function(e,t,n){return n&&(e=":not("+e+")"),1===t.length?st.find.matchesSelector(t[0],e)?[t[0]]:[]:st.find.matches(e,t)},dir:function(e,n,r){for(var i=[],o=e[n];o&&9!==o.nodeType&&(r===t||1!==o.nodeType||!st(o).is(r));)1===o.nodeType&&i.push(o),o=o[n];return i},sibling:function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n}});var zt="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",Xt=/ jQuery\d+="(?:null|\d+)"/g,Ut=RegExp("<(?:"+zt+")[\\s/>]","i"),Vt=/^\s+/,Yt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,Jt=/<([\w:]+)/,Gt=/<tbody/i,Qt=/<|&#?\w+;/,Kt=/<(?:script|style|link)/i,Zt=/^(?:checkbox|radio)$/i,en=/checked\s*(?:[^=]|=\s*.checked.)/i,tn=/^$|\/(?:java|ecma)script/i,nn=/^true\/(.*)/,rn=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,on={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:st.support.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]},an=p(V),sn=an.appendChild(V.createElement("div"));on.optgroup=on.option,on.tbody=on.tfoot=on.colgroup=on.caption=on.thead,on.th=on.td,st.fn.extend({text:function(e){return st.access(this,function(e){return e===t?st.text(this):this.empty().append((this[0]&&this[0].ownerDocument||V).createTextNode(e))},null,e,arguments.length)},wrapAll:function(e){if(st.isFunction(e))return this.each(function(t){st(this).wrapAll(e.call(this,t))});if(this[0]){var t=st(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){for(var e=this;e.firstChild&&1===e.firstChild.nodeType;)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return st.isFunction(e)?this.each(function(t){st(this).wrapInner(e.call(this,t))}):this.each(function(){var t=st(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=st.isFunction(e);return this.each(function(n){st(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){st.nodeName(this,"body")||st(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(e){(1===this.nodeType||11===this.nodeType||9===this.nodeType)&&this.appendChild(e)})},prepend:function(){return this.domManip(arguments,!0,function(e){(1===this.nodeType||11===this.nodeType||9===this.nodeType)&&this.insertBefore(e,this.firstChild)})},before:function(){return this.domManip(arguments,!1,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return this.domManip(arguments,!1,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},remove:function(e,t){for(var n,r=0;null!=(n=this[r]);r++)(!e||st.filter(e,[n]).length>0)&&(t||1!==n.nodeType||st.cleanData(b(n)),n.parentNode&&(t&&st.contains(n.ownerDocument,n)&&m(b(n,"script")),n.parentNode.removeChild(n)));return this},empty:function(){for(var e,t=0;null!=(e=this[t]);t++){for(1===e.nodeType&&st.cleanData(b(e,!1));e.firstChild;)e.removeChild(e.firstChild);e.options&&st.nodeName(e,"select")&&(e.options.length=0)}return this},clone:function(e,t){return e=null==e?!1:e,t=null==t?e:t,this.map(function(){return st.clone(this,e,t)})},html:function(e){return st.access(this,function(e){var n=this[0]||{},r=0,i=this.length;if(e===t)return 1===n.nodeType?n.innerHTML.replace(Xt,""):t;if(!("string"!=typeof e||Kt.test(e)||!st.support.htmlSerialize&&Ut.test(e)||!st.support.leadingWhitespace&&Vt.test(e)||on[(Jt.exec(e)||["",""])[1].toLowerCase()])){e=e.replace(Yt,"<$1></$2>");try{for(;i>r;r++)n=this[r]||{},1===n.nodeType&&(st.cleanData(b(n,!1)),n.innerHTML=e);n=0}catch(o){}}n&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(e){var t=st.isFunction(e);return t||"string"==typeof e||(e=st(e).not(this).detach()),this.domManip([e],!0,function(e){var t=this.nextSibling,n=this.parentNode;(n&&1===this.nodeType||11===this.nodeType)&&(st(this).remove(),t?t.parentNode.insertBefore(e,t):n.appendChild(e))})},detach:function(e){return this.remove(e,!0)},domManip:function(e,n,r){e=et.apply([],e);var i,o,a,s,u,l,c=0,f=this.length,p=this,m=f-1,y=e[0],v=st.isFunction(y);if(v||!(1>=f||"string"!=typeof y||st.support.checkClone)&&en.test(y))return this.each(function(i){var o=p.eq(i);v&&(e[0]=y.call(this,i,n?o.html():t)),o.domManip(e,n,r)});if(f&&(i=st.buildFragment(e,this[0].ownerDocument,!1,this),o=i.firstChild,1===i.childNodes.length&&(i=o),o)){for(n=n&&st.nodeName(o,"tr"),a=st.map(b(i,"script"),h),s=a.length;f>c;c++)u=i,c!==m&&(u=st.clone(u,!0,!0),s&&st.merge(a,b(u,"script"))),r.call(n&&st.nodeName(this[c],"table")?d(this[c],"tbody"):this[c],u,c);if(s)for(l=a[a.length-1].ownerDocument,st.map(a,g),c=0;s>c;c++)u=a[c],tn.test(u.type||"")&&!st._data(u,"globalEval")&&st.contains(l,u)&&(u.src?st.ajax({url:u.src,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0}):st.globalEval((u.text||u.textContent||u.innerHTML||"").replace(rn,"")));i=o=null}return this}}),st.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){st.fn[e]=function(e){for(var n,r=0,i=[],o=st(e),a=o.length-1;a>=r;r++)n=r===a?this:this.clone(!0),st(o[r])[t](n),tt.apply(i,n.get());return this.pushStack(i)}}),st.extend({clone:function(e,t,n){var r,i,o,a,s,u=st.contains(e.ownerDocument,e);if(st.support.html5Clone||st.isXMLDoc(e)||!Ut.test("<"+e.nodeName+">")?s=e.cloneNode(!0):(sn.innerHTML=e.outerHTML,sn.removeChild(s=sn.firstChild)),!(st.support.noCloneEvent&&st.support.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||st.isXMLDoc(e)))for(r=b(s),i=b(e),a=0;null!=(o=i[a]);++a)r[a]&&v(o,r[a]);if(t)if(n)for(i=i||b(e),r=r||b(s),a=0;null!=(o=i[a]);a++)y(o,r[a]);else y(e,s);return r=b(s,"script"),r.length>0&&m(r,!u&&b(e,"script")),r=i=o=null,s},buildFragment:function(e,t,n,r){for(var i,o,a,s,u,l,c,f=e.length,d=p(t),h=[],g=0;f>g;g++)if(o=e[g],o||0===o)if("object"===st.type(o))st.merge(h,o.nodeType?[o]:o);else if(Qt.test(o)){for(s=s||d.appendChild(t.createElement("div")),a=(Jt.exec(o)||["",""])[1].toLowerCase(),u=on[a]||on._default,s.innerHTML=u[1]+o.replace(Yt,"<$1></$2>")+u[2],c=u[0];c--;)s=s.lastChild;if(!st.support.leadingWhitespace&&Vt.test(o)&&h.push(t.createTextNode(Vt.exec(o)[0])),!st.support.tbody)for(o="table"!==a||Gt.test(o)?"<table>"!==u[1]||Gt.test(o)?0:s:s.firstChild,c=o&&o.childNodes.length;c--;)st.nodeName(l=o.childNodes[c],"tbody")&&!l.childNodes.length&&o.removeChild(l);for(st.merge(h,s.childNodes),s.textContent="";s.firstChild;)s.removeChild(s.firstChild);s=d.lastChild}else h.push(t.createTextNode(o));for(s&&d.removeChild(s),st.support.appendChecked||st.grep(b(h,"input"),x),g=0;o=h[g++];)if((!r||-1===st.inArray(o,r))&&(i=st.contains(o.ownerDocument,o),s=b(d.appendChild(o),"script"),i&&m(s),n))for(c=0;o=s[c++];)tn.test(o.type||"")&&n.push(o);return s=null,d},cleanData:function(e,n){for(var r,i,o,a,s=0,u=st.expando,l=st.cache,c=st.support.deleteExpando,f=st.event.special;null!=(o=e[s]);s++)if((n||st.acceptData(o))&&(i=o[u],r=i&&l[i])){if(r.events)for(a in r.events)f[a]?st.event.remove(o,a):st.removeEvent(o,a,r.handle);l[i]&&(delete l[i],c?delete o[u]:o.removeAttribute!==t?o.removeAttribute(u):o[u]=null,K.push(i))}}});var un,ln,cn,fn=/alpha\([^)]*\)/i,pn=/opacity\s*=\s*([^)]*)/,dn=/^(top|right|bottom|left)$/,hn=/^(none|table(?!-c[ea]).+)/,gn=/^margin/,mn=RegExp("^("+ut+")(.*)$","i"),yn=RegExp("^("+ut+")(?!px)[a-z%]+$","i"),vn=RegExp("^([+-])=("+ut+")","i"),bn={BODY:"block"},xn={position:"absolute",visibility:"hidden",display:"block"},Tn={letterSpacing:0,fontWeight:400},wn=["Top","Right","Bottom","Left"],Nn=["Webkit","O","Moz","ms"];st.fn.extend({css:function(e,n){return st.access(this,function(e,n,r){var i,o,a={},s=0;if(st.isArray(n)){for(i=ln(e),o=n.length;o>s;s++)a[n[s]]=st.css(e,n[s],!1,i);return a}return r!==t?st.style(e,n,r):st.css(e,n)},e,n,arguments.length>1)},show:function(){return N(this,!0)},hide:function(){return N(this)},toggle:function(e){var t="boolean"==typeof e;return this.each(function(){(t?e:w(this))?st(this).show():st(this).hide()})}}),st.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=un(e,"opacity");return""===n?"1":n}}}},cssNumber:{columnCount:!0,fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":st.support.cssFloat?"cssFloat":"styleFloat"},style:function(e,n,r,i){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var o,a,s,u=st.camelCase(n),l=e.style;if(n=st.cssProps[u]||(st.cssProps[u]=T(l,u)),s=st.cssHooks[n]||st.cssHooks[u],r===t)return s&&"get"in s&&(o=s.get(e,!1,i))!==t?o:l[n];if(a=typeof r,"string"===a&&(o=vn.exec(r))&&(r=(o[1]+1)*o[2]+parseFloat(st.css(e,n)),a="number"),!(null==r||"number"===a&&isNaN(r)||("number"!==a||st.cssNumber[u]||(r+="px"),st.support.clearCloneStyle||""!==r||0!==n.indexOf("background")||(l[n]="inherit"),s&&"set"in s&&(r=s.set(e,r,i))===t)))try{l[n]=r}catch(c){}}},css:function(e,n,r,i){var o,a,s,u=st.camelCase(n);return n=st.cssProps[u]||(st.cssProps[u]=T(e.style,u)),s=st.cssHooks[n]||st.cssHooks[u],s&&"get"in s&&(o=s.get(e,!0,r)),o===t&&(o=un(e,n,i)),"normal"===o&&n in Tn&&(o=Tn[n]),r?(a=parseFloat(o),r===!0||st.isNumeric(a)?a||0:o):o},swap:function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];i=n.apply(e,r||[]);for(o in t)e.style[o]=a[o];return i}}),e.getComputedStyle?(ln=function(t){return e.getComputedStyle(t,null)},un=function(e,n,r){var i,o,a,s=r||ln(e),u=s?s.getPropertyValue(n)||s[n]:t,l=e.style;return s&&(""!==u||st.contains(e.ownerDocument,e)||(u=st.style(e,n)),yn.test(u)&&gn.test(n)&&(i=l.width,o=l.minWidth,a=l.maxWidth,l.minWidth=l.maxWidth=l.width=u,u=s.width,l.width=i,l.minWidth=o,l.maxWidth=a)),u}):V.documentElement.currentStyle&&(ln=function(e){return e.currentStyle},un=function(e,n,r){var i,o,a,s=r||ln(e),u=s?s[n]:t,l=e.style;return null==u&&l&&l[n]&&(u=l[n]),yn.test(u)&&!dn.test(n)&&(i=l.left,o=e.runtimeStyle,a=o&&o.left,a&&(o.left=e.currentStyle.left),l.left="fontSize"===n?"1em":u,u=l.pixelLeft+"px",l.left=i,a&&(o.left=a)),""===u?"auto":u}),st.each(["height","width"],function(e,n){st.cssHooks[n]={get:function(e,r,i){return r?0===e.offsetWidth&&hn.test(st.css(e,"display"))?st.swap(e,xn,function(){return E(e,n,i)}):E(e,n,i):t},set:function(e,t,r){var i=r&&ln(e);return C(e,t,r?k(e,n,r,st.support.boxSizing&&"border-box"===st.css(e,"boxSizing",!1,i),i):0)}}}),st.support.opacity||(st.cssHooks.opacity={get:function(e,t){return pn.test((t&&e.currentStyle?e.currentStyle.filter:e.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":t?"1":""},set:function(e,t){var n=e.style,r=e.currentStyle,i=st.isNumeric(t)?"alpha(opacity="+100*t+")":"",o=r&&r.filter||n.filter||"";n.zoom=1,(t>=1||""===t)&&""===st.trim(o.replace(fn,""))&&n.removeAttribute&&(n.removeAttribute("filter"),""===t||r&&!r.filter)||(n.filter=fn.test(o)?o.replace(fn,i):o+" "+i)}}),st(function(){st.support.reliableMarginRight||(st.cssHooks.marginRight={get:function(e,n){return n?st.swap(e,{display:"inline-block"},un,[e,"marginRight"]):t}}),!st.support.pixelPosition&&st.fn.position&&st.each(["top","left"],function(e,n){st.cssHooks[n]={get:function(e,r){return r?(r=un(e,n),yn.test(r)?st(e).position()[n]+"px":r):t}}})}),st.expr&&st.expr.filters&&(st.expr.filters.hidden=function(e){return 0===e.offsetWidth&&0===e.offsetHeight||!st.support.reliableHiddenOffsets&&"none"===(e.style&&e.style.display||st.css(e,"display"))},st.expr.filters.visible=function(e){return!st.expr.filters.hidden(e)}),st.each({margin:"",padding:"",border:"Width"},function(e,t){st.cssHooks[e+t]={expand:function(n){for(var r=0,i={},o="string"==typeof n?n.split(" "):[n];4>r;r++)i[e+wn[r]+t]=o[r]||o[r-2]||o[0];return i}},gn.test(e)||(st.cssHooks[e+t].set=C)});var Cn=/%20/g,kn=/\[\]$/,En=/\r?\n/g,Sn=/^(?:submit|button|image|reset)$/i,An=/^(?:input|select|textarea|keygen)/i;st.fn.extend({serialize:function(){return st.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=st.prop(this,"elements");return e?st.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!st(this).is(":disabled")&&An.test(this.nodeName)&&!Sn.test(e)&&(this.checked||!Zt.test(e))}).map(function(e,t){var n=st(this).val();return null==n?null:st.isArray(n)?st.map(n,function(e){return{name:t.name,value:e.replace(En,"\r\n")}}):{name:t.name,value:n.replace(En,"\r\n")}}).get()}}),st.param=function(e,n){var r,i=[],o=function(e,t){t=st.isFunction(t)?t():null==t?"":t,i[i.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};if(n===t&&(n=st.ajaxSettings&&st.ajaxSettings.traditional),st.isArray(e)||e.jquery&&!st.isPlainObject(e))st.each(e,function(){o(this.name,this.value)});else for(r in e)j(r,e[r],n,o);return i.join("&").replace(Cn,"+")};var jn,Dn,Ln=st.now(),Hn=/\?/,Mn=/#.*$/,qn=/([?&])_=[^&]*/,_n=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Fn=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,On=/^(?:GET|HEAD)$/,Bn=/^\/\//,Pn=/^([\w.+-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,Rn=st.fn.load,Wn={},$n={},In="*/".concat("*");try{Dn=Y.href}catch(zn){Dn=V.createElement("a"),Dn.href="",Dn=Dn.href}jn=Pn.exec(Dn.toLowerCase())||[],st.fn.load=function(e,n,r){if("string"!=typeof e&&Rn)return Rn.apply(this,arguments);var i,o,a,s=this,u=e.indexOf(" ");return u>=0&&(i=e.slice(u,e.length),e=e.slice(0,u)),st.isFunction(n)?(r=n,n=t):n&&"object"==typeof n&&(o="POST"),s.length>0&&st.ajax({url:e,type:o,dataType:"html",data:n}).done(function(e){a=arguments,s.html(i?st("<div>").append(st.parseHTML(e)).find(i):e)}).complete(r&&function(e,t){s.each(r,a||[e.responseText,t,e])}),this},st.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){st.fn[t]=function(e){return this.on(t,e)}}),st.each(["get","post"],function(e,n){st[n]=function(e,r,i,o){return st.isFunction(r)&&(o=o||i,i=r,r=t),st.ajax({url:e,type:n,dataType:o,data:r,success:i})}}),st.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Dn,type:"GET",isLocal:Fn.test(jn[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":In,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":e.String,"text html":!0,"text json":st.parseJSON,"text xml":st.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?H(H(e,st.ajaxSettings),t):H(st.ajaxSettings,e)},ajaxPrefilter:D(Wn),ajaxTransport:D($n),ajax:function(e,n){function r(e,n,r,s){var l,f,v,b,T,N=n;2!==x&&(x=2,u&&clearTimeout(u),i=t,a=s||"",w.readyState=e>0?4:0,r&&(b=M(p,w,r)),e>=200&&300>e||304===e?(p.ifModified&&(T=w.getResponseHeader("Last-Modified"),T&&(st.lastModified[o]=T),T=w.getResponseHeader("etag"),T&&(st.etag[o]=T)),304===e?(l=!0,N="notmodified"):(l=q(p,b),N=l.state,f=l.data,v=l.error,l=!v)):(v=N,(e||!N)&&(N="error",0>e&&(e=0))),w.status=e,w.statusText=(n||N)+"",l?g.resolveWith(d,[f,N,w]):g.rejectWith(d,[w,N,v]),w.statusCode(y),y=t,c&&h.trigger(l?"ajaxSuccess":"ajaxError",[w,p,l?f:v]),m.fireWith(d,[w,N]),c&&(h.trigger("ajaxComplete",[w,p]),--st.active||st.event.trigger("ajaxStop")))}"object"==typeof e&&(n=e,e=t),n=n||{};var i,o,a,s,u,l,c,f,p=st.ajaxSetup({},n),d=p.context||p,h=p.context&&(d.nodeType||d.jquery)?st(d):st.event,g=st.Deferred(),m=st.Callbacks("once memory"),y=p.statusCode||{},v={},b={},x=0,T="canceled",w={readyState:0,getResponseHeader:function(e){var t;if(2===x){if(!s)for(s={};t=_n.exec(a);)s[t[1].toLowerCase()]=t[2];t=s[e.toLowerCase()]}return null==t?null:t},getAllResponseHeaders:function(){return 2===x?a:null},setRequestHeader:function(e,t){var n=e.toLowerCase();return x||(e=b[n]=b[n]||e,v[e]=t),this},overrideMimeType:function(e){return x||(p.mimeType=e),this},statusCode:function(e){var t;if(e)if(2>x)for(t in e)y[t]=[y[t],e[t]];else w.always(e[w.status]);return this},abort:function(e){var t=e||T;return i&&i.abort(t),r(0,t),this}};if(g.promise(w).complete=m.add,w.success=w.done,w.error=w.fail,p.url=((e||p.url||Dn)+"").replace(Mn,"").replace(Bn,jn[1]+"//"),p.type=n.method||n.type||p.method||p.type,p.dataTypes=st.trim(p.dataType||"*").toLowerCase().match(lt)||[""],null==p.crossDomain&&(l=Pn.exec(p.url.toLowerCase()),p.crossDomain=!(!l||l[1]===jn[1]&&l[2]===jn[2]&&(l[3]||("http:"===l[1]?80:443))==(jn[3]||("http:"===jn[1]?80:443)))),p.data&&p.processData&&"string"!=typeof p.data&&(p.data=st.param(p.data,p.traditional)),L(Wn,p,n,w),2===x)return w;c=p.global,c&&0===st.active++&&st.event.trigger("ajaxStart"),p.type=p.type.toUpperCase(),p.hasContent=!On.test(p.type),o=p.url,p.hasContent||(p.data&&(o=p.url+=(Hn.test(o)?"&":"?")+p.data,delete p.data),p.cache===!1&&(p.url=qn.test(o)?o.replace(qn,"$1_="+Ln++):o+(Hn.test(o)?"&":"?")+"_="+Ln++)),p.ifModified&&(st.lastModified[o]&&w.setRequestHeader("If-Modified-Since",st.lastModified[o]),st.etag[o]&&w.setRequestHeader("If-None-Match",st.etag[o])),(p.data&&p.hasContent&&p.contentType!==!1||n.contentType)&&w.setRequestHeader("Content-Type",p.contentType),w.setRequestHeader("Accept",p.dataTypes[0]&&p.accepts[p.dataTypes[0]]?p.accepts[p.dataTypes[0]]+("*"!==p.dataTypes[0]?", "+In+"; q=0.01":""):p.accepts["*"]);for(f in p.headers)w.setRequestHeader(f,p.headers[f]);if(p.beforeSend&&(p.beforeSend.call(d,w,p)===!1||2===x))return w.abort();T="abort";for(f in{success:1,error:1,complete:1})w[f](p[f]);if(i=L($n,p,n,w)){w.readyState=1,c&&h.trigger("ajaxSend",[w,p]),p.async&&p.timeout>0&&(u=setTimeout(function(){w.abort("timeout")},p.timeout));try{x=1,i.send(v,r)}catch(N){if(!(2>x))throw N;r(-1,N)}}else r(-1,"No Transport");return w},getScript:function(e,n){return st.get(e,t,n,"script")},getJSON:function(e,t,n){return st.get(e,t,n,"json")}}),st.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(e){return st.globalEval(e),e}}}),st.ajaxPrefilter("script",function(e){e.cache===t&&(e.cache=!1),e.crossDomain&&(e.type="GET",e.global=!1)}),st.ajaxTransport("script",function(e){if(e.crossDomain){var n,r=V.head||st("head")[0]||V.documentElement;return{send:function(t,i){n=V.createElement("script"),n.async=!0,e.scriptCharset&&(n.charset=e.scriptCharset),n.src=e.url,n.onload=n.onreadystatechange=function(e,t){(t||!n.readyState||/loaded|complete/.test(n.readyState))&&(n.onload=n.onreadystatechange=null,n.parentNode&&n.parentNode.removeChild(n),n=null,t||i(200,"success"))},r.insertBefore(n,r.firstChild)},abort:function(){n&&n.onload(t,!0)}}}});var Xn=[],Un=/(=)\?(?=&|$)|\?\?/;st.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Xn.pop()||st.expando+"_"+Ln++;return this[e]=!0,e}}),st.ajaxPrefilter("json jsonp",function(n,r,i){var o,a,s,u=n.jsonp!==!1&&(Un.test(n.url)?"url":"string"==typeof n.data&&!(n.contentType||"").indexOf("application/x-www-form-urlencoded")&&Un.test(n.data)&&"data");return u||"jsonp"===n.dataTypes[0]?(o=n.jsonpCallback=st.isFunction(n.jsonpCallback)?n.jsonpCallback():n.jsonpCallback,u?n[u]=n[u].replace(Un,"$1"+o):n.jsonp!==!1&&(n.url+=(Hn.test(n.url)?"&":"?")+n.jsonp+"="+o),n.converters["script json"]=function(){return s||st.error(o+" was not called"),s[0]},n.dataTypes[0]="json",a=e[o],e[o]=function(){s=arguments},i.always(function(){e[o]=a,n[o]&&(n.jsonpCallback=r.jsonpCallback,Xn.push(o)),s&&st.isFunction(a)&&a(s[0]),s=a=t}),"script"):t});var Vn,Yn,Jn=0,Gn=e.ActiveXObject&&function(){var e;for(e in Vn)Vn[e](t,!0)};st.ajaxSettings.xhr=e.ActiveXObject?function(){return!this.isLocal&&_()||F()}:_,Yn=st.ajaxSettings.xhr(),st.support.cors=!!Yn&&"withCredentials"in Yn,Yn=st.support.ajax=!!Yn,Yn&&st.ajaxTransport(function(n){if(!n.crossDomain||st.support.cors){var r;return{send:function(i,o){var a,s,u=n.xhr();if(n.username?u.open(n.type,n.url,n.async,n.username,n.password):u.open(n.type,n.url,n.async),n.xhrFields)for(s in n.xhrFields)u[s]=n.xhrFields[s];n.mimeType&&u.overrideMimeType&&u.overrideMimeType(n.mimeType),n.crossDomain||i["X-Requested-With"]||(i["X-Requested-With"]="XMLHttpRequest");try{for(s in i)u.setRequestHeader(s,i[s])}catch(l){}u.send(n.hasContent&&n.data||null),r=function(e,i){var s,l,c,f,p;try{if(r&&(i||4===u.readyState))if(r=t,a&&(u.onreadystatechange=st.noop,Gn&&delete Vn[a]),i)4!==u.readyState&&u.abort();else{f={},s=u.status,p=u.responseXML,c=u.getAllResponseHeaders(),p&&p.documentElement&&(f.xml=p),"string"==typeof u.responseText&&(f.text=u.responseText);try{l=u.statusText}catch(d){l=""}s||!n.isLocal||n.crossDomain?1223===s&&(s=204):s=f.text?200:404}}catch(h){i||o(-1,h)}f&&o(s,l,f,c)},n.async?4===u.readyState?setTimeout(r):(a=++Jn,Gn&&(Vn||(Vn={},st(e).unload(Gn)),Vn[a]=r),u.onreadystatechange=r):r()},abort:function(){r&&r(t,!0)}}}});var Qn,Kn,Zn=/^(?:toggle|show|hide)$/,er=RegExp("^(?:([+-])=|)("+ut+")([a-z%]*)$","i"),tr=/queueHooks$/,nr=[W],rr={"*":[function(e,t){var n,r,i=this.createTween(e,t),o=er.exec(t),a=i.cur(),s=+a||0,u=1,l=20;if(o){if(n=+o[2],r=o[3]||(st.cssNumber[e]?"":"px"),"px"!==r&&s){s=st.css(i.elem,e,!0)||n||1;do u=u||".5",s/=u,st.style(i.elem,e,s+r);while(u!==(u=i.cur()/a)&&1!==u&&--l)}i.unit=r,i.start=s,i.end=o[1]?s+(o[1]+1)*n:n}return i}]};st.Animation=st.extend(P,{tweener:function(e,t){st.isFunction(e)?(t=e,e=["*"]):e=e.split(" ");for(var n,r=0,i=e.length;i>r;r++)n=e[r],rr[n]=rr[n]||[],rr[n].unshift(t)},prefilter:function(e,t){t?nr.unshift(e):nr.push(e)}}),st.Tween=$,$.prototype={constructor:$,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||"swing",this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(st.cssNumber[n]?"":"px")},cur:function(){var e=$.propHooks[this.prop];return e&&e.get?e.get(this):$.propHooks._default.get(this)},run:function(e){var t,n=$.propHooks[this.prop];return this.pos=t=this.options.duration?st.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):$.propHooks._default.set(this),this}},$.prototype.init.prototype=$.prototype,$.propHooks={_default:{get:function(e){var t;return null==e.elem[e.prop]||e.elem.style&&null!=e.elem.style[e.prop]?(t=st.css(e.elem,e.prop,"auto"),t&&"auto"!==t?t:0):e.elem[e.prop]},set:function(e){st.fx.step[e.prop]?st.fx.step[e.prop](e):e.elem.style&&(null!=e.elem.style[st.cssProps[e.prop]]||st.cssHooks[e.prop])?st.style(e.elem,e.prop,e.now+e.unit):e.elem[e.prop]=e.now}}},$.propHooks.scrollTop=$.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},st.each(["toggle","show","hide"],function(e,t){var n=st.fn[t];st.fn[t]=function(e,r,i){return null==e||"boolean"==typeof e?n.apply(this,arguments):this.animate(I(t,!0),e,r,i)}}),st.fn.extend({fadeTo:function(e,t,n,r){return this.filter(w).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(e,t,n,r){var i=st.isEmptyObject(e),o=st.speed(t,n,r),a=function(){var t=P(this,st.extend({},e),o);a.finish=function(){t.stop(!0)},(i||st._data(this,"finish"))&&t.stop(!0)};return a.finish=a,i||o.queue===!1?this.each(a):this.queue(o.queue,a)},stop:function(e,n,r){var i=function(e){var t=e.stop;delete e.stop,t(r)};return"string"!=typeof e&&(r=n,n=e,e=t),n&&e!==!1&&this.queue(e||"fx",[]),this.each(function(){var t=!0,n=null!=e&&e+"queueHooks",o=st.timers,a=st._data(this);if(n)a[n]&&a[n].stop&&i(a[n]);else for(n in a)a[n]&&a[n].stop&&tr.test(n)&&i(a[n]);for(n=o.length;n--;)o[n].elem!==this||null!=e&&o[n].queue!==e||(o[n].anim.stop(r),t=!1,o.splice(n,1));(t||!r)&&st.dequeue(this,e)})},finish:function(e){return e!==!1&&(e=e||"fx"),this.each(function(){var t,n=st._data(this),r=n[e+"queue"],i=n[e+"queueHooks"],o=st.timers,a=r?r.length:0;for(n.finish=!0,st.queue(this,e,[]),i&&i.cur&&i.cur.finish&&i.cur.finish.call(this),t=o.length;t--;)o[t].elem===this&&o[t].queue===e&&(o[t].anim.stop(!0),o.splice(t,1));for(t=0;a>t;t++)r[t]&&r[t].finish&&r[t].finish.call(this);delete n.finish})}}),st.each({slideDown:I("show"),slideUp:I("hide"),slideToggle:I("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,t){st.fn[e]=function(e,n,r){return this.animate(t,e,n,r)}}),st.speed=function(e,t,n){var r=e&&"object"==typeof e?st.extend({},e):{complete:n||!n&&t||st.isFunction(e)&&e,duration:e,easing:n&&t||t&&!st.isFunction(t)&&t};return r.duration=st.fx.off?0:"number"==typeof r.duration?r.duration:r.duration in st.fx.speeds?st.fx.speeds[r.duration]:st.fx.speeds._default,(null==r.queue||r.queue===!0)&&(r.queue="fx"),r.old=r.complete,r.complete=function(){st.isFunction(r.old)&&r.old.call(this),r.queue&&st.dequeue(this,r.queue)},r},st.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2}},st.timers=[],st.fx=$.prototype.init,st.fx.tick=function(){var e,n=st.timers,r=0;for(Qn=st.now();n.length>r;r++)e=n[r],e()||n[r]!==e||n.splice(r--,1);n.length||st.fx.stop(),Qn=t},st.fx.timer=function(e){e()&&st.timers.push(e)&&st.fx.start()},st.fx.interval=13,st.fx.start=function(){Kn||(Kn=setInterval(st.fx.tick,st.fx.interval))},st.fx.stop=function(){clearInterval(Kn),Kn=null},st.fx.speeds={slow:600,fast:200,_default:400},st.fx.step={},st.expr&&st.expr.filters&&(st.expr.filters.animated=function(e){return st.grep(st.timers,function(t){return e===t.elem}).length}),st.fn.offset=function(e){if(arguments.length)return e===t?this:this.each(function(t){st.offset.setOffset(this,e,t)});var n,r,i={top:0,left:0},o=this[0],a=o&&o.ownerDocument;if(a)return n=a.documentElement,st.contains(n,o)?(o.getBoundingClientRect!==t&&(i=o.getBoundingClientRect()),r=z(a),{top:i.top+(r.pageYOffset||n.scrollTop)-(n.clientTop||0),left:i.left+(r.pageXOffset||n.scrollLeft)-(n.clientLeft||0)}):i},st.offset={setOffset:function(e,t,n){var r=st.css(e,"position");"static"===r&&(e.style.position="relative");var i,o,a=st(e),s=a.offset(),u=st.css(e,"top"),l=st.css(e,"left"),c=("absolute"===r||"fixed"===r)&&st.inArray("auto",[u,l])>-1,f={},p={};c?(p=a.position(),i=p.top,o=p.left):(i=parseFloat(u)||0,o=parseFloat(l)||0),st.isFunction(t)&&(t=t.call(e,n,s)),null!=t.top&&(f.top=t.top-s.top+i),null!=t.left&&(f.left=t.left-s.left+o),"using"in t?t.using.call(e,f):a.css(f)}},st.fn.extend({position:function(){if(this[0]){var e,t,n={top:0,left:0},r=this[0];return"fixed"===st.css(r,"position")?t=r.getBoundingClientRect():(e=this.offsetParent(),t=this.offset(),st.nodeName(e[0],"html")||(n=e.offset()),n.top+=st.css(e[0],"borderTopWidth",!0),n.left+=st.css(e[0],"borderLeftWidth",!0)),{top:t.top-n.top-st.css(r,"marginTop",!0),left:t.left-n.left-st.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){for(var e=this.offsetParent||V.documentElement;e&&!st.nodeName(e,"html")&&"static"===st.css(e,"position");)e=e.offsetParent;return e||V.documentElement})}}),st.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,n){var r=/Y/.test(n);st.fn[e]=function(i){return st.access(this,function(e,i,o){var a=z(e);return o===t?a?n in a?a[n]:a.document.documentElement[i]:e[i]:(a?a.scrollTo(r?st(a).scrollLeft():o,r?o:st(a).scrollTop()):e[i]=o,t)},e,i,arguments.length,null)}}),st.each({Height:"height",Width:"width"},function(e,n){st.each({padding:"inner"+e,content:n,"":"outer"+e},function(r,i){st.fn[i]=function(i,o){var a=arguments.length&&(r||"boolean"!=typeof i),s=r||(i===!0||o===!0?"margin":"border");return st.access(this,function(n,r,i){var o;return st.isWindow(n)?n.document.documentElement["client"+e]:9===n.nodeType?(o=n.documentElement,Math.max(n.body["scroll"+e],o["scroll"+e],n.body["offset"+e],o["offset"+e],o["client"+e])):i===t?st.css(n,r,s):st.style(n,r,i,s)},n,a?i:t,a,null)}})}),e.jQuery=e.$=st,"function"==typeof define&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return st})})(window);
+//@ sourceMappingURL=jquery.min.map
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/js/jquery-ui-1.10.0.custom.min.js b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/js/jquery-ui-1.10.0.custom.min.js
new file mode 100644
index 0000000..9c44a8b
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/assets/js/jquery-ui-1.10.0.custom.min.js
@@ -0,0 +1,6 @@
+/*! jQuery UI - v1.10.0 - 2013-01-23
+* http://jqueryui.com
+* Includes: jquery.ui.core.js, jquery.ui.widget.js, jquery.ui.mouse.js, jquery.ui.position.js, jquery.ui.draggable.js, jquery.ui.droppable.js, jquery.ui.resizable.js, jquery.ui.selectable.js, jquery.ui.sortable.js, jquery.ui.accordion.js, jquery.ui.autocomplete.js, jquery.ui.button.js, jquery.ui.datepicker.js, jquery.ui.dialog.js, jquery.ui.menu.js, jquery.ui.progressbar.js, jquery.ui.slider.js, jquery.ui.spinner.js, jquery.ui.tabs.js, jquery.ui.tooltip.js, jquery.ui.effect.js, jquery.ui.effect-blind.js, jquery.ui.effect-bounce.js, jquery.ui.effect-clip.js, jquery.ui.effect-drop.js, jquery.ui.effect-explode.js, jquery.ui.effect-fade.js, jquery.ui.effect-fold.js, jquery.ui.effect-highlight.js, jquery.ui.effect-pulsate.js, jquery.ui.effect-scale.js, jquery.ui.effect-shake.js, jquery.ui.effect-slide.js, jquery.ui.effect-transfer.js
+* Copyright (c) 2013 jQuery Foundation and other contributors Licensed MIT */
+
+(function(e,t){function i(t,n){var r,i,o,u=t.nodeName.toLowerCase();return"area"===u?(r=t.parentNode,i=r.name,!t.href||!i||r.nodeName.toLowerCase()!=="map"?!1:(o=e("img[usemap=#"+i+"]")[0],!!o&&s(o))):(/input|select|textarea|button|object/.test(u)?!t.disabled:"a"===u?t.href||n:n)&&s(t)}function s(t){return e.expr.filters.visible(t)&&!e(t).parents().addBack().filter(function(){return e.css(this,"visibility")==="hidden"}).length}var n=0,r=/^ui-id-\d+$/;e.ui=e.ui||{};if(e.ui.version)return;e.extend(e.ui,{version:"1.10.0",keyCode:{BACKSPACE:8,COMMA:188,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,LEFT:37,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SPACE:32,TAB:9,UP:38}}),e.fn.extend({_focus:e.fn.focus,focus:function(t,n){return typeof t=="number"?this.each(function(){var r=this;setTimeout(function(){e(r).focus(),n&&n.call(r)},t)}):this._focus.apply(this,arguments)},scrollParent:function(){var t;return e.ui.ie&&/(static|relative)/.test(this.css("position"))||/absolute/.test(this.css("position"))?t=this.parents().filter(function(){return/(relative|absolute|fixed)/.test(e.css(this,"position"))&&/(auto|scroll)/.test(e.css(this,"overflow")+e.css(this,"overflow-y")+e.css(this,"overflow-x"))}).eq(0):t=this.parents().filter(function(){return/(auto|scroll)/.test(e.css(this,"overflow")+e.css(this,"overflow-y")+e.css(this,"overflow-x"))}).eq(0),/fixed/.test(this.css("position"))||!t.length?e(document):t},zIndex:function(n){if(n!==t)return this.css("zIndex",n);if(this.length){var r=e(this[0]),i,s;while(r.length&&r[0]!==document){i=r.css("position");if(i==="absolute"||i==="relative"||i==="fixed"){s=parseInt(r.css("zIndex"),10);if(!isNaN(s)&&s!==0)return s}r=r.parent()}}return 0},uniqueId:function(){return this.each(function(){this.id||(this.id="ui-id-"+ ++n)})},removeUniqueId:function(){return this.each(function(){r.test(this.id)&&e(this).removeAttr("id")})}}),e.extend(e.expr[":"],{data:e.expr.createPseudo?e.expr.createPseudo(function(t){return function(n){return!!e.data(n,t)}}):function(t,n,r){return!!e.data(t,r[3])},focusable:function(t){return i(t,!isNaN(e.attr(t,"tabindex")))},tabbable:function(t){var n=e.attr(t,"tabindex"),r=isNaN(n);return(r||n>=0)&&i(t,!r)}}),e("<a>").outerWidth(1).jquery||e.each(["Width","Height"],function(n,r){function u(t,n,r,s){return e.each(i,function(){n-=parseFloat(e.css(t,"padding"+this))||0,r&&(n-=parseFloat(e.css(t,"border"+this+"Width"))||0),s&&(n-=parseFloat(e.css(t,"margin"+this))||0)}),n}var i=r==="Width"?["Left","Right"]:["Top","Bottom"],s=r.toLowerCase(),o={innerWidth:e.fn.innerWidth,innerHeight:e.fn.innerHeight,outerWidth:e.fn.outerWidth,outerHeight:e.fn.outerHeight};e.fn["inner"+r]=function(n){return n===t?o["inner"+r].call(this):this.each(function(){e(this).css(s,u(this,n)+"px")})},e.fn["outer"+r]=function(t,n){return typeof t!="number"?o["outer"+r].call(this,t):this.each(function(){e(this).css(s,u(this,t,!0,n)+"px")})}}),e.fn.addBack||(e.fn.addBack=function(e){return this.add(e==null?this.prevObject:this.prevObject.filter(e))}),e("<a>").data("a-b","a").removeData("a-b").data("a-b")&&(e.fn.removeData=function(t){return function(n){return arguments.length?t.call(this,e.camelCase(n)):t.call(this)}}(e.fn.removeData)),e.ui.ie=!!/msie [\w.]+/.exec(navigator.userAgent.toLowerCase()),e.support.selectstart="onselectstart"in document.createElement("div"),e.fn.extend({disableSelection:function(){return this.bind((e.support.selectstart?"selectstart":"mousedown")+".ui-disableSelection",function(e){e.preventDefault()})},enableSelection:function(){return this.unbind(".ui-disableSelection")}}),e.extend(e.ui,{plugin:{add:function(t,n,r){var i,s=e.ui[t].prototype;for(i in r)s.plugins[i]=s.plugins[i]||[],s.plugins[i].push([n,r[i]])},call:function(e,t,n){var r,i=e.plugins[t];if(!i||!e.element[0].parentNode||e.element[0].parentNode.nodeType===11)return;for(r=0;r<i.length;r++)e.options[i[r][0]]&&i[r][1].apply(e.element,n)}},hasScroll:function(t,n){if(e(t).css("overflow")==="hidden")return!1;var r=n&&n==="left"?"scrollLeft":"scrollTop",i=!1;return t[r]>0?!0:(t[r]=1,i=t[r]>0,t[r]=0,i)}})})(jQuery);(function(e,t){var n=0,r=Array.prototype.slice,i=e.cleanData;e.cleanData=function(t){for(var n=0,r;(r=t[n])!=null;n++)try{e(r).triggerHandler("remove")}catch(s){}i(t)},e.widget=function(t,n,r){var i,s,o,u,a={},f=t.split(".")[0];t=t.split(".")[1],i=f+"-"+t,r||(r=n,n=e.Widget),e.expr[":"][i.toLowerCase()]=function(t){return!!e.data(t,i)},e[f]=e[f]||{},s=e[f][t],o=e[f][t]=function(e,t){if(!this._createWidget)return new o(e,t);arguments.length&&this._createWidget(e,t)},e.extend(o,s,{version:r.version,_proto:e.extend({},r),_childConstructors:[]}),u=new n,u.options=e.widget.extend({},u.options),e.each(r,function(t,r){if(!e.isFunction(r)){a[t]=r;return}a[t]=function(){var e=function(){return n.prototype[t].apply(this,arguments)},i=function(e){return n.prototype[t].apply(this,e)};return function(){var t=this._super,n=this._superApply,s;return this._super=e,this._superApply=i,s=r.apply(this,arguments),this._super=t,this._superApply=n,s}}()}),o.prototype=e.widget.extend(u,{widgetEventPrefix:s?u.widgetEventPrefix:t},a,{constructor:o,namespace:f,widgetName:t,widgetFullName:i}),s?(e.each(s._childConstructors,function(t,n){var r=n.prototype;e.widget(r.namespace+"."+r.widgetName,o,n._proto)}),delete s._childConstructors):n._childConstructors.push(o),e.widget.bridge(t,o)},e.widget.extend=function(n){var i=r.call(arguments,1),s=0,o=i.length,u,a;for(;s<o;s++)for(u in i[s])a=i[s][u],i[s].hasOwnProperty(u)&&a!==t&&(e.isPlainObject(a)?n[u]=e.isPlainObject(n[u])?e.widget.extend({},n[u],a):e.widget.extend({},a):n[u]=a);return n},e.widget.bridge=function(n,i){var s=i.prototype.widgetFullName||n;e.fn[n]=function(o){var u=typeof o=="string",a=r.call(arguments,1),f=this;return o=!u&&a.length?e.widget.extend.apply(null,[o].concat(a)):o,u?this.each(function(){var r,i=e.data(this,s);if(!i)return e.error("cannot call methods on "+n+" prior to initialization; "+"attempted to call method '"+o+"'");if(!e.isFunction(i[o])||o.charAt(0)==="_")return e.error("no such method '"+o+"' for "+n+" widget instance");r=i[o].apply(i,a);if(r!==i&&r!==t)return f=r&&r.jquery?f.pushStack(r.get()):r,!1}):this.each(function(){var t=e.data(this,s);t?t.option(o||{})._init():e.data(this,s,new i(o,this))}),f}},e.Widget=function(){},e.Widget._childConstructors=[],e.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",defaultElement:"<div>",options:{disabled:!1,create:null},_createWidget:function(t,r){r=e(r||this.defaultElement||this)[0],this.element=e(r),this.uuid=n++,this.eventNamespace="."+this.widgetName+this.uuid,this.options=e.widget.extend({},this.options,this._getCreateOptions(),t),this.bindings=e(),this.hoverable=e(),this.focusable=e(),r!==this&&(e.data(r,this.widgetFullName,this),this._on(!0,this.element,{remove:function(e){e.target===r&&this.destroy()}}),this.document=e(r.style?r.ownerDocument:r.document||r),this.window=e(this.document[0].defaultView||this.document[0].parentWindow)),this._create(),this._trigger("create",null,this._getCreateEventData()),this._init()},_getCreateOptions:e.noop,_getCreateEventData:e.noop,_create:e.noop,_init:e.noop,destroy:function(){this._destroy(),this.element.unbind(this.eventNamespace).removeData(this.widgetName).removeData(this.widgetFullName).removeData(e.camelCase(this.widgetFullName)),this.widget().unbind(this.eventNamespace).removeAttr("aria-disabled").removeClass(this.widgetFullName+"-disabled "+"ui-state-disabled"),this.bindings.unbind(this.eventNamespace),this.hoverable.removeClass("ui-state-hover"),this.focusable.removeClass("ui-state-focus")},_destroy:e.noop,widget:function(){return this.element},option:function(n,r){var i=n,s,o,u;if(arguments.length===0)return e.widget.extend({},this.options);if(typeof n=="string"){i={},s=n.split("."),n=s.shift();if(s.length){o=i[n]=e.widget.extend({},this.options[n]);for(u=0;u<s.length-1;u++)o[s[u]]=o[s[u]]||{},o=o[s[u]];n=s.pop();if(r===t)return o[n]===t?null:o[n];o[n]=r}else{if(r===t)return this.options[n]===t?null:this.options[n];i[n]=r}}return this._setOptions(i),this},_setOptions:function(e){var t;for(t in e)this._setOption(t,e[t]);return this},_setOption:function(e,t){return this.options[e]=t,e==="disabled"&&(this.widget().toggleClass(this.widgetFullName+"-disabled ui-state-disabled",!!t).attr("aria-disabled",t),this.hoverable.removeClass("ui-state-hover"),this.focusable.removeClass("ui-state-focus")),this},enable:function(){return this._setOption("disabled",!1)},disable:function(){return this._setOption("disabled",!0)},_on:function(t,n,r){var i,s=this;typeof t!="boolean"&&(r=n,n=t,t=!1),r?(n=i=e(n),this.bindings=this.bindings.add(n)):(r=n,n=this.element,i=this.widget()),e.each(r,function(r,o){function u(){if(!t&&(s.options.disabled===!0||e(this).hasClass("ui-state-disabled")))return;return(typeof o=="string"?s[o]:o).apply(s,arguments)}typeof o!="string"&&(u.guid=o.guid=o.guid||u.guid||e.guid++);var a=r.match(/^(\w+)\s*(.*)$/),f=a[1]+s.eventNamespace,l=a[2];l?i.delegate(l,f,u):n.bind(f,u)})},_off:function(e,t){t=(t||"").split(" ").join(this.eventNamespace+" ")+this.eventNamespace,e.unbind(t).undelegate(t)},_delay:function(e,t){function n(){return(typeof e=="string"?r[e]:e).apply(r,arguments)}var r=this;return setTimeout(n,t||0)},_hoverable:function(t){this.hoverable=this.hoverable.add(t),this._on(t,{mouseenter:function(t){e(t.currentTarget).addClass("ui-state-hover")},mouseleave:function(t){e(t.currentTarget).removeClass("ui-state-hover")}})},_focusable:function(t){this.focusable=this.focusable.add(t),this._on(t,{focusin:function(t){e(t.currentTarget).addClass("ui-state-focus")},focusout:function(t){e(t.currentTarget).removeClass("ui-state-focus")}})},_trigger:function(t,n,r){var i,s,o=this.options[t];r=r||{},n=e.Event(n),n.type=(t===this.widgetEventPrefix?t:this.widgetEventPrefix+t).toLowerCase(),n.target=this.element[0],s=n.originalEvent;if(s)for(i in s)i in n||(n[i]=s[i]);return this.element.trigger(n,r),!(e.isFunction(o)&&o.apply(this.element[0],[n].concat(r))===!1||n.isDefaultPrevented())}},e.each({show:"fadeIn",hide:"fadeOut"},function(t,n){e.Widget.prototype["_"+t]=function(r,i,s){typeof i=="string"&&(i={effect:i});var o,u=i?i===!0||typeof i=="number"?n:i.effect||n:t;i=i||{},typeof i=="number"&&(i={duration:i}),o=!e.isEmptyObject(i),i.complete=s,i.delay&&r.delay(i.delay),o&&e.effects&&e.effects.effect[u]?r[t](i):u!==t&&r[u]?r[u](i.duration,i.easing,s):r.queue(function(n){e(this)[t](),s&&s.call(r[0]),n()})}})})(jQuery);(function(e,t){var n=!1;e(document).mouseup(function(){n=!1}),e.widget("ui.mouse",{version:"1.10.0",options:{cancel:"input,textarea,button,select,option",distance:1,delay:0},_mouseInit:function(){var t=this;this.element.bind("mousedown."+this.widgetName,function(e){return t._mouseDown(e)}).bind("click."+this.widgetName,function(n){if(!0===e.data(n.target,t.widgetName+".preventClickEvent"))return e.removeData(n.target,t.widgetName+".preventClickEvent"),n.stopImmediatePropagation(),!1}),this.started=!1},_mouseDestroy:function(){this.element.unbind("."+this.widgetName),this._mouseMoveDelegate&&e(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate)},_mouseDown:function(t){if(n)return;this._mouseStarted&&this._mouseUp(t),this._mouseDownEvent=t;var r=this,i=t.which===1,s=typeof this.options.cancel=="string"&&t.target.nodeName?e(t.target).closest(this.options.cancel).length:!1;if(!i||s||!this._mouseCapture(t))return!0;this.mouseDelayMet=!this.options.delay,this.mouseDelayMet||(this._mouseDelayTimer=setTimeout(function(){r.mouseDelayMet=!0},this.options.delay));if(this._mouseDistanceMet(t)&&this._mouseDelayMet(t)){this._mouseStarted=this._mouseStart(t)!==!1;if(!this._mouseStarted)return t.preventDefault(),!0}return!0===e.data(t.target,this.widgetName+".preventClickEvent")&&e.removeData(t.target,this.widgetName+".preventClickEvent"),this._mouseMoveDelegate=function(e){return r._mouseMove(e)},this._mouseUpDelegate=function(e){return r._mouseUp(e)},e(document).bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate),t.preventDefault(),n=!0,!0},_mouseMove:function(t){return e.ui.ie&&(!document.documentMode||document.documentMode<9)&&!t.button?this._mouseUp(t):this._mouseStarted?(this._mouseDrag(t),t.preventDefault()):(this._mouseDistanceMet(t)&&this._mouseDelayMet(t)&&(this._mouseStarted=this._mouseStart(this._mouseDownEvent,t)!==!1,this._mouseStarted?this._mouseDrag(t):this._mouseUp(t)),!this._mouseStarted)},_mouseUp:function(t){return e(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate),this._mouseStarted&&(this._mouseStarted=!1,t.target===this._mouseDownEvent.target&&e.data(t.target,this.widgetName+".preventClickEvent",!0),this._mouseStop(t)),!1},_mouseDistanceMet:function(e){return Math.max(Math.abs(this._mouseDownEvent.pageX-e.pageX),Math.abs(this._mouseDownEvent.pageY-e.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return!0}})})(jQuery);(function(e,t){function h(e,t,n){return[parseInt(e[0],10)*(l.test(e[0])?t/100:1),parseInt(e[1],10)*(l.test(e[1])?n/100:1)]}function p(t,n){return parseInt(e.css(t,n),10)||0}function d(t){var n=t[0];return n.nodeType===9?{width:t.width(),height:t.height(),offset:{top:0,left:0}}:e.isWindow(n)?{width:t.width(),height:t.height(),offset:{top:t.scrollTop(),left:t.scrollLeft()}}:n.preventDefault?{width:0,height:0,offset:{top:n.pageY,left:n.pageX}}:{width:t.outerWidth(),height:t.outerHeight(),offset:t.offset()}}e.ui=e.ui||{};var n,r=Math.max,i=Math.abs,s=Math.round,o=/left|center|right/,u=/top|center|bottom/,a=/[\+\-]\d+%?/,f=/^\w+/,l=/%$/,c=e.fn.position;e.position={scrollbarWidth:function(){if(n!==t)return n;var r,i,s=e("<div style='display:block;width:50px;height:50px;overflow:hidden;'><div style='height:100px;width:auto;'></div></div>"),o=s.children()[0];return e("body").append(s),r=o.offsetWidth,s.css("overflow","scroll"),i=o.offsetWidth,r===i&&(i=s[0].clientWidth),s.remove(),n=r-i},getScrollInfo:function(t){var n=t.isWindow?"":t.element.css("overflow-x"),r=t.isWindow?"":t.element.css("overflow-y"),i=n==="scroll"||n==="auto"&&t.width<t.element[0].scrollWidth,s=r==="scroll"||r==="auto"&&t.height<t.element[0].scrollHeight;return{width:i?e.position.scrollbarWidth():0,height:s?e.position.scrollbarWidth():0}},getWithinInfo:function(t){var n=e(t||window),r=e.isWindow(n[0]);return{element:n,isWindow:r,offset:n.offset()||{left:0,top:0},scrollLeft:n.scrollLeft(),scrollTop:n.scrollTop(),width:r?n.width():n.outerWidth(),height:r?n.height():n.outerHeight()}}},e.fn.position=function(t){if(!t||!t.of)return c.apply(this,arguments);t=e.extend({},t);var n,l,v,m,g,y,b=e(t.of),w=e.position.getWithinInfo(t.within),E=e.position.getScrollInfo(w),S=(t.collision||"flip").split(" "),x={};return y=d(b),b[0].preventDefault&&(t.at="left top"),l=y.width,v=y.height,m=y.offset,g=e.extend({},m),e.each(["my","at"],function(){var e=(t[this]||"").split(" "),n,r;e.length===1&&(e=o.test(e[0])?e.concat(["center"]):u.test(e[0])?["center"].concat(e):["center","center"]),e[0]=o.test(e[0])?e[0]:"center",e[1]=u.test(e[1])?e[1]:"center",n=a.exec(e[0]),r=a.exec(e[1]),x[this]=[n?n[0]:0,r?r[0]:0],t[this]=[f.exec(e[0])[0],f.exec(e[1])[0]]}),S.length===1&&(S[1]=S[0]),t.at[0]==="right"?g.left+=l:t.at[0]==="center"&&(g.left+=l/2),t.at[1]==="bottom"?g.top+=v:t.at[1]==="center"&&(g.top+=v/2),n=h(x.at,l,v),g.left+=n[0],g.top+=n[1],this.each(function(){var o,u,a=e(this),f=a.outerWidth(),c=a.outerHeight(),d=p(this,"marginLeft"),y=p(this,"marginTop"),T=f+d+p(this,"marginRight")+E.width,N=c+y+p(this,"marginBottom")+E.height,C=e.extend({},g),k=h(x.my,a.outerWidth(),a.outerHeight());t.my[0]==="right"?C.left-=f:t.my[0]==="center"&&(C.left-=f/2),t.my[1]==="bottom"?C.top-=c:t.my[1]==="center"&&(C.top-=c/2),C.left+=k[0],C.top+=k[1],e.support.offsetFractions||(C.left=s(C.left),C.top=s(C.top)),o={marginLeft:d,marginTop:y},e.each(["left","top"],function(r,i){e.ui.position[S[r]]&&e.ui.position[S[r]][i](C,{targetWidth:l,targetHeight:v,elemWidth:f,elemHeight:c,collisionPosition:o,collisionWidth:T,collisionHeight:N,offset:[n[0]+k[0],n[1]+k[1]],my:t.my,at:t.at,within:w,elem:a})}),t.using&&(u=function(e){var n=m.left-C.left,s=n+l-f,o=m.top-C.top,u=o+v-c,h={target:{element:b,left:m.left,top:m.top,width:l,height:v},element:{element:a,left:C.left,top:C.top,width:f,height:c},horizontal:s<0?"left":n>0?"right":"center",vertical:u<0?"top":o>0?"bottom":"middle"};l<f&&i(n+s)<l&&(h.horizontal="center"),v<c&&i(o+u)<v&&(h.vertical="middle"),r(i(n),i(s))>r(i(o),i(u))?h.important="horizontal":h.important="vertical",t.using.call(this,e,h)}),a.offset(e.extend(C,{using:u}))})},e.ui.position={fit:{left:function(e,t){var n=t.within,i=n.isWindow?n.scrollLeft:n.offset.left,s=n.width,o=e.left-t.collisionPosition.marginLeft,u=i-o,a=o+t.collisionWidth-s-i,f;t.collisionWidth>s?u>0&&a<=0?(f=e.left+u+t.collisionWidth-s-i,e.left+=u-f):a>0&&u<=0?e.left=i:u>a?e.left=i+s-t.collisionWidth:e.left=i:u>0?e.left+=u:a>0?e.left-=a:e.left=r(e.left-o,e.left)},top:function(e,t){var n=t.within,i=n.isWindow?n.scrollTop:n.offset.top,s=t.within.height,o=e.top-t.collisionPosition.marginTop,u=i-o,a=o+t.collisionHeight-s-i,f;t.collisionHeight>s?u>0&&a<=0?(f=e.top+u+t.collisionHeight-s-i,e.top+=u-f):a>0&&u<=0?e.top=i:u>a?e.top=i+s-t.collisionHeight:e.top=i:u>0?e.top+=u:a>0?e.top-=a:e.top=r(e.top-o,e.top)}},flip:{left:function(e,t){var n=t.within,r=n.offset.left+n.scrollLeft,s=n.width,o=n.isWindow?n.scrollLeft:n.offset.left,u=e.left-t.collisionPosition.marginLeft,a=u-o,f=u+t.collisionWidth-s-o,l=t.my[0]==="left"?-t.elemWidth:t.my[0]==="right"?t.elemWidth:0,c=t.at[0]==="left"?t.targetWidth:t.at[0]==="right"?-t.targetWidth:0,h=-2*t.offset[0],p,d;if(a<0){p=e.left+l+c+h+t.collisionWidth-s-r;if(p<0||p<i(a))e.left+=l+c+h}else if(f>0){d=e.left-t.collisionPosition.marginLeft+l+c+h-o;if(d>0||i(d)<f)e.left+=l+c+h}},top:function(e,t){var n=t.within,r=n.offset.top+n.scrollTop,s=n.height,o=n.isWindow?n.scrollTop:n.offset.top,u=e.top-t.collisionPosition.marginTop,a=u-o,f=u+t.collisionHeight-s-o,l=t.my[1]==="top",c=l?-t.elemHeight:t.my[1]==="bottom"?t.elemHeight:0,h=t.at[1]==="top"?t.targetHeight:t.at[1]==="bottom"?-t.targetHeight:0,p=-2*t.offset[1],d,v;a<0?(v=e.top+c+h+p+t.collisionHeight-s-r,e.top+c+h+p>a&&(v<0||v<i(a))&&(e.top+=c+h+p)):f>0&&(d=e.top-t.collisionPosition.marginTop+c+h+p-o,e.top+c+h+p>f&&(d>0||i(d)<f)&&(e.top+=c+h+p))}},flipfit:{left:function(){e.ui.position.flip.left.apply(this,arguments),e.ui.position.fit.left.apply(this,arguments)},top:function(){e.ui.position.flip.top.apply(this,arguments),e.ui.position.fit.top.apply(this,arguments)}}},function(){var t,n,r,i,s,o=document.getElementsByTagName("body")[0],u=document.createElement("div");t=document.createElement(o?"div":"body"),r={visibility:"hidden",width:0,height:0,border:0,margin:0,background:"none"},o&&e.extend(r,{position:"absolute",left:"-1000px",top:"-1000px"});for(s in r)t.style[s]=r[s];t.appendChild(u),n=o||document.documentElement,n.insertBefore(t,n.firstChild),u.style.cssText="position: absolute; left: 10.7432222px;",i=e(u).offset().left,e.support.offsetFractions=i>10&&i<11,t.innerHTML="",n.removeChild(t)}()})(jQuery);(function(e,t){e.widget("ui.draggable",e.ui.mouse,{version:"1.10.0",widgetEventPrefix:"drag",options:{addClasses:!0,appendTo:"parent",axis:!1,connectToSortable:!1,containment:!1,cursor:"auto",cursorAt:!1,grid:!1,handle:!1,helper:"original",iframeFix:!1,opacity:!1,refreshPositions:!1,revert:!1,revertDuration:500,scope:"default",scroll:!0,scrollSensitivity:20,scrollSpeed:20,snap:!1,snapMode:"both",snapTolerance:20,stack:!1,zIndex:!1,drag:null,start:null,stop:null},_create:function(){this.options.helper==="original"&&!/^(?:r|a|f)/.test(this.element.css("position"))&&(this.element[0].style.position="relative"),this.options.addClasses&&this.element.addClass("ui-draggable"),this.options.disabled&&this.element.addClass("ui-draggable-disabled"),this._mouseInit()},_destroy:function(){this.element.removeClass("ui-draggable ui-draggable-dragging ui-draggable-disabled"),this._mouseDestroy()},_mouseCapture:function(t){var n=this.options;return this.helper||n.disabled||e(t.target).closest(".ui-resizable-handle").length>0?!1:(this.handle=this._getHandle(t),this.handle?(e(n.iframeFix===!0?"iframe":n.iframeFix).each(function(){e("<div class='ui-draggable-iframeFix' style='background: #fff;'></div>").css({width:this.offsetWidth+"px",height:this.offsetHeight+"px",position:"absolute",opacity:"0.001",zIndex:1e3}).css(e(this).offset()).appendTo("body")}),!0):!1)},_mouseStart:function(t){var n=this.options;return this.helper=this._createHelper(t),this.helper.addClass("ui-draggable-dragging"),this._cacheHelperProportions(),e.ui.ddmanager&&(e.ui.ddmanager.current=this),this._cacheMargins(),this.cssPosition=this.helper.css("position"),this.scrollParent=this.helper.scrollParent(),this.offset=this.positionAbs=this.element.offset(),this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left},e.extend(this.offset,{click:{left:t.pageX-this.offset.left,top:t.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()}),this.originalPosition=this.position=this._generatePosition(t),this.originalPageX=t.pageX,this.originalPageY=t.pageY,n.cursorAt&&this._adjustOffsetFromHelper(n.cursorAt),n.containment&&this._setContainment(),this._trigger("start",t)===!1?(this._clear(),!1):(this._cacheHelperProportions(),e.ui.ddmanager&&!n.dropBehaviour&&e.ui.ddmanager.prepareOffsets(this,t),this._mouseDrag(t,!0),e.ui.ddmanager&&e.ui.ddmanager.dragStart(this,t),!0)},_mouseDrag:function(t,n){this.position=this._generatePosition(t),this.positionAbs=this._convertPositionTo("absolute");if(!n){var r=this._uiHash();if(this._trigger("drag",t,r)===!1)return this._mouseUp({}),!1;this.position=r.position}if(!this.options.axis||this.options.axis!=="y")this.helper[0].style.left=this.position.left+"px";if(!this.options.axis||this.options.axis!=="x")this.helper[0].style.top=this.position.top+"px";return e.ui.ddmanager&&e.ui.ddmanager.drag(this,t),!1},_mouseStop:function(t){var n,r=this,i=!1,s=!1;e.ui.ddmanager&&!this.options.dropBehaviour&&(s=e.ui.ddmanager.drop(this,t)),this.dropped&&(s=this.dropped,this.dropped=!1),n=this.element[0];while(n&&(n=n.parentNode))n===document&&(i=!0);return!i&&this.options.helper==="original"?!1:(this.options.revert==="invalid"&&!s||this.options.revert==="valid"&&s||this.options.revert===!0||e.isFunction(this.options.revert)&&this.options.revert.call(this.element,s)?e(this.helper).animate(this.originalPosition,parseInt(this.options.revertDuration,10),function(){r._trigger("stop",t)!==!1&&r._clear()}):this._trigger("stop",t)!==!1&&this._clear(),!1)},_mouseUp:function(t){return e("div.ui-draggable-iframeFix").each(function(){this.parentNode.removeChild(this)}),e.ui.ddmanager&&e.ui.ddmanager.dragStop(this,t),e.ui.mouse.prototype._mouseUp.call(this,t)},cancel:function(){return this.helper.is(".ui-draggable-dragging")?this._mouseUp({}):this._clear(),this},_getHandle:function(t){var n=!this.options.handle||!e(this.options.handle,this.element).length?!0:!1;return e(this.options.handle,this.element).find("*").addBack().each(function(){this===t.target&&(n=!0)}),n},_createHelper:function(t){var n=this.options,r=e.isFunction(n.helper)?e(n.helper.apply(this.element[0],[t])):n.helper==="clone"?this.element.clone().removeAttr("id"):this.element;return r.parents("body").length||r.appendTo(n.appendTo==="parent"?this.element[0].parentNode:n.appendTo),r[0]!==this.element[0]&&!/(fixed|absolute)/.test(r.css("position"))&&r.css("position","absolute"),r},_adjustOffsetFromHelper:function(t){typeof t=="string"&&(t=t.split(" ")),e.isArray(t)&&(t={left:+t[0],top:+t[1]||0}),"left"in t&&(this.offset.click.left=t.left+this.margins.left),"right"in t&&(this.offset.click.left=this.helperProportions.width-t.right+this.margins.left),"top"in t&&(this.offset.click.top=t.top+this.margins.top),"bottom"in t&&(this.offset.click.top=this.helperProportions.height-t.bottom+this.margins.top)},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var t=this.offsetParent.offset();this.cssPosition==="absolute"&&this.scrollParent[0]!==document&&e.contains(this.scrollParent[0],this.offsetParent[0])&&(t.left+=this.scrollParent.scrollLeft(),t.top+=this.scrollParent.scrollTop());if(this.offsetParent[0]===document.body||this.offsetParent[0].tagName&&this.offsetParent[0].tagName.toLowerCase()==="html"&&e.ui.ie)t={top:0,left:0};return{top:t.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:t.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if(this.cssPosition==="relative"){var e=this.element.position();return{top:e.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:e.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.element.css("marginLeft"),10)||0,top:parseInt(this.element.css("marginTop"),10)||0,right:parseInt(this.element.css("marginRight"),10)||0,bottom:parseInt(this.element.css("marginBottom"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var t,n,r,i=this.options;i.containment==="parent"&&(i.containment=this.helper[0].parentNode);if(i.containment==="document"||i.containment==="window")this.containment=[i.containment==="document"?0:e(window).scrollLeft()-this.offset.relative.left-this.offset.parent.left,i.containment==="document"?0:e(window).scrollTop()-this.offset.relative.top-this.offset.parent.top,(i.containment==="document"?0:e(window).scrollLeft())+e(i.containment==="document"?document:window).width()-this.helperProportions.width-this.margins.left,(i.containment==="document"?0:e(window).scrollTop())+(e(i.containment==="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top];if(!/^(document|window|parent)$/.test(i.containment)&&i.containment.constructor!==Array){n=e(i.containment),r=n[0];if(!r)return;t=e(r).css("overflow")!=="hidden",this.containment=[(parseInt(e(r).css("borderLeftWidth"),10)||0)+(parseInt(e(r).css("paddingLeft"),10)||0),(parseInt(e(r).css("borderTopWidth"),10)||0)+(parseInt(e(r).css("paddingTop"),10)||0),(t?Math.max(r.scrollWidth,r.offsetWidth):r.offsetWidth)-(parseInt(e(r).css("borderLeftWidth"),10)||0)-(parseInt(e(r).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left-this.margins.right,(t?Math.max(r.scrollHeight,r.offsetHeight):r.offsetHeight)-(parseInt(e(r).css("borderTopWidth"),10)||0)-(parseInt(e(r).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top-this.margins.bottom],this.relative_container=n}else i.containment.constructor===Array&&(this.containment=i.containment)},_convertPositionTo:function(t,n){n||(n=this.position);var r=t==="absolute"?1:-1,i=this.cssPosition!=="absolute"||this.scrollParent[0]!==document&&!!e.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,s=/(html|body)/i.test(i[0].tagName);return{top:n.top+this.offset.relative.top*r+this.offset.parent.top*r-(this.cssPosition==="fixed"?-this.scrollParent.scrollTop():s?0:i.scrollTop())*r,left:n.left+this.offset.relative.left*r+this.offset.parent.left*r-(this.cssPosition==="fixed"?-this.scrollParent.scrollLeft():s?0:i.scrollLeft())*r}},_generatePosition:function(t){var n,r,i,s,o=this.options,u=this.cssPosition!=="absolute"||this.scrollParent[0]!==document&&!!e.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,a=/(html|body)/i.test(u[0].tagName),f=t.pageX,l=t.pageY;return this.originalPosition&&(this.containment&&(this.relative_container?(r=this.relative_container.offset(),n=[this.containment[0]+r.left,this.containment[1]+r.top,this.containment[2]+r.left,this.containment[3]+r.top]):n=this.containment,t.pageX-this.offset.click.left<n[0]&&(f=n[0]+this.offset.click.left),t.pageY-this.offset.click.top<n[1]&&(l=n[1]+this.offset.click.top),t.pageX-this.offset.click.left>n[2]&&(f=n[2]+this.offset.click.left),t.pageY-this.offset.click.top>n[3]&&(l=n[3]+this.offset.click.top)),o.grid&&(i=o.grid[1]?this.originalPageY+Math.round((l-this.originalPageY)/o.grid[1])*o.grid[1]:this.originalPageY,l=n?i-this.offset.click.top>=n[1]||i-this.offset.click.top>n[3]?i:i-this.offset.click.top>=n[1]?i-o.grid[1]:i+o.grid[1]:i,s=o.grid[0]?this.originalPageX+Math.round((f-this.originalPageX)/o.grid[0])*o.grid[0]:this.originalPageX,f=n?s-this.offset.click.left>=n[0]||s-this.offset.click.left>n[2]?s:s-this.offset.click.left>=n[0]?s-o.grid[0]:s+o.grid[0]:s)),{top:l-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+(this.cssPosition==="fixed"?-this.scrollParent.scrollTop():a?0:u.scrollTop()),left:f-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(this.cssPosition==="fixed"?-this.scrollParent.scrollLeft():a?0:u.scrollLeft())}},_clear:function(){this.helper.removeClass("ui-draggable-dragging"),this.helper[0]!==this.element[0]&&!this.cancelHelperRemoval&&this.helper.remove(),this.helper=null,this.cancelHelperRemoval=!1},_trigger:function(t,n,r){return r=r||this._uiHash(),e.ui.plugin.call(this,t,[n,r]),t==="drag"&&(this.positionAbs=this._convertPositionTo("absolute")),e.Widget.prototype._trigger.call(this,t,n,r)},plugins:{},_uiHash:function(){return{helper:this.helper,position:this.position,originalPosition:this.originalPosition,offset:this.positionAbs}}}),e.ui.plugin.add("draggable","connectToSortable",{start:function(t,n){var r=e(this).data("ui-draggable"),i=r.options,s=e.extend({},n,{item:r.element});r.sortables=[],e(i.connectToSortable).each(function(){var n=e.data(this,"ui-sortable");n&&!n.options.disabled&&(r.sortables.push({instance:n,shouldRevert:n.options.revert}),n.refreshPositions(),n._trigger("activate",t,s))})},stop:function(t,n){var r=e(this).data("ui-draggable"),i=e.extend({},n,{item:r.element});e.each(r.sortables,function(){this.instance.isOver?(this.instance.isOver=0,r.cancelHelperRemoval=!0,this.instance.cancelHelperRemoval=!1,this.shouldRevert&&(this.instance.options.revert=!0),this.instance._mouseStop(t),this.instance.options.helper=this.instance.options._helper,r.options.helper==="original"&&this.instance.currentItem.css({top:"auto",left:"auto"})):(this.instance.cancelHelperRemoval=!1,this.instance._trigger("deactivate",t,i))})},drag:function(t,n){var r=e(this).data("ui-draggable"),i=this;e.each(r.sortables,function(){var s=!1,o=this;this.instance.positionAbs=r.positionAbs,this.instance.helperProportions=r.helperProportions,this.instance.offset.click=r.offset.click,this.instance._intersectsWith(this.instance.containerCache)&&(s=!0,e.each(r.sortables,function(){return this.instance.positionAbs=r.positionAbs,this.instance.helperProportions=r.helperProportions,this.instance.offset.click=r.offset.click,this!==o&&this.instance._intersectsWith(this.instance.containerCache)&&e.ui.contains(o.instance.element[0],this.instance.element[0])&&(s=!1),s})),s?(this.instance.isOver||(this.instance.isOver=1,this.instance.currentItem=e(i).clone().removeAttr("id").appendTo(this.instance.element).data("ui-sortable-item",!0),this.instance.options._helper=this.instance.options.helper,this.instance.options.helper=function(){return n.helper[0]},t.target=this.instance.currentItem[0],this.instance._mouseCapture(t,!0),this.instance._mouseStart(t,!0,!0),this.instance.offset.click.top=r.offset.click.top,this.instance.offset.click.left=r.offset.click.left,this.instance.offset.parent.left-=r.offset.parent.left-this.instance.offset.parent.left,this.instance.offset.parent.top-=r.offset.parent.top-this.instance.offset.parent.top,r._trigger("toSortable",t),r.dropped=this.instance.element,r.currentItem=r.element,this.instance.fromOutside=r),this.instance.currentItem&&this.instance._mouseDrag(t)):this.instance.isOver&&(this.instance.isOver=0,this.instance.cancelHelperRemoval=!0,this.instance.options.revert=!1,this.instance._trigger("out",t,this.instance._uiHash(this.instance)),this.instance._mouseStop(t,!0),this.instance.options.helper=this.instance.options._helper,this.instance.currentItem.remove(),this.instance.placeholder&&this.instance.placeholder.remove(),r._trigger("fromSortable",t),r.dropped=!1)})}}),e.ui.plugin.add("draggable","cursor",{start:function(){var t=e("body"),n=e(this).data("ui-draggable").options;t.css("cursor")&&(n._cursor=t.css("cursor")),t.css("cursor",n.cursor)},stop:function(){var t=e(this).data("ui-draggable").options;t._cursor&&e("body").css("cursor",t._cursor)}}),e.ui.plugin.add("draggable","opacity",{start:function(t,n){var r=e(n.helper),i=e(this).data("ui-draggable").options;r.css("opacity")&&(i._opacity=r.css("opacity")),r.css("opacity",i.opacity)},stop:function(t,n){var r=e(this).data("ui-draggable").options;r._opacity&&e(n.helper).css("opacity",r._opacity)}}),e.ui.plugin.add("draggable","scroll",{start:function(){var t=e(this).data("ui-draggable");t.scrollParent[0]!==document&&t.scrollParent[0].tagName!=="HTML"&&(t.overflowOffset=t.scrollParent.offset())},drag:function(t){var n=e(this).data("ui-draggable"),r=n.options,i=!1;if(n.scrollParent[0]!==document&&n.scrollParent[0].tagName!=="HTML"){if(!r.axis||r.axis!=="x")n.overflowOffset.top+n.scrollParent[0].offsetHeight-t.pageY<r.scrollSensitivity?n.scrollParent[0].scrollTop=i=n.scrollParent[0].scrollTop+r.scrollSpeed:t.pageY-n.overflowOffset.top<r.scrollSensitivity&&(n.scrollParent[0].scrollTop=i=n.scrollParent[0].scrollTop-r.scrollSpeed);if(!r.axis||r.axis!=="y")n.overflowOffset.left+n.scrollParent[0].offsetWidth-t.pageX<r.scrollSensitivity?n.scrollParent[0].scrollLeft=i=n.scrollParent[0].scrollLeft+r.scrollSpeed:t.pageX-n.overflowOffset.left<r.scrollSensitivity&&(n.scrollParent[0].scrollLeft=i=n.scrollParent[0].scrollLeft-r.scrollSpeed)}else{if(!r.axis||r.axis!=="x")t.pageY-e(document).scrollTop()<r.scrollSensitivity?i=e(document).scrollTop(e(document).scrollTop()-r.scrollSpeed):e(window).height()-(t.pageY-e(document).scrollTop())<r.scrollSensitivity&&(i=e(document).scrollTop(e(document).scrollTop()+r.scrollSpeed));if(!r.axis||r.axis!=="y")t.pageX-e(document).scrollLeft()<r.scrollSensitivity?i=e(document).scrollLeft(e(document).scrollLeft()-r.scrollSpeed):e(window).width()-(t.pageX-e(document).scrollLeft())<r.scrollSensitivity&&(i=e(document).scrollLeft(e(document).scrollLeft()+r.scrollSpeed))}i!==!1&&e.ui.ddmanager&&!r.dropBehaviour&&e.ui.ddmanager.prepareOffsets(n,t)}}),e.ui.plugin.add("draggable","snap",{start:function(){var t=e(this).data("ui-draggable"),n=t.options;t.snapElements=[],e(n.snap.constructor!==String?n.snap.items||":data(ui-draggable)":n.snap).each(function(){var n=e(this),r=n.offset();this!==t.element[0]&&t.snapElements.push({item:this,width:n.outerWidth(),height:n.outerHeight(),top:r.top,left:r.left})})},drag:function(t,n){var r,i,s,o,u,a,f,l,c,h,p=e(this).data("ui-draggable"),d=p.options,v=d.snapTolerance,m=n.offset.left,g=m+p.helperProportions.width,y=n.offset.top,b=y+p.helperProportions.height;for(c=p.snapElements.length-1;c>=0;c--){u=p.snapElements[c].left,a=u+p.snapElements[c].width,f=p.snapElements[c].top,l=f+p.snapElements[c].height;if(!(u-v<m&&m<a+v&&f-v<y&&y<l+v||u-v<m&&m<a+v&&f-v<b&&b<l+v||u-v<g&&g<a+v&&f-v<y&&y<l+v||u-v<g&&g<a+v&&f-v<b&&b<l+v)){p.snapElements[c].snapping&&p.options.snap.release&&p.options.snap.release.call(p.element,t,e.extend(p._uiHash(),{snapItem:p.snapElements[c].item})),p.snapElements[c].snapping=!1;continue}d.snapMode!=="inner"&&(r=Math.abs(f-b)<=v,i=Math.abs(l-y)<=v,s=Math.abs(u-g)<=v,o=Math.abs(a-m)<=v,r&&(n.position.top=p._convertPositionTo("relative",{top:f-p.helperProportions.height,left:0}).top-p.margins.top),i&&(n.position.top=p._convertPositionTo("relative",{top:l,left:0}).top-p.margins.top),s&&(n.position.left=p._convertPositionTo("relative",{top:0,left:u-p.helperProportions.width}).left-p.margins.left),o&&(n.position.left=p._convertPositionTo("relative",{top:0,left:a}).left-p.margins.left)),h=r||i||s||o,d.snapMode!=="outer"&&(r=Math.abs(f-y)<=v,i=Math.abs(l-b)<=v,s=Math.abs(u-m)<=v,o=Math.abs(a-g)<=v,r&&(n.position.top=p._convertPositionTo("relative",{top:f,left:0}).top-p.margins.top),i&&(n.position.top=p._convertPositionTo("relative",{top:l-p.helperProportions.height,left:0}).top-p.margins.top),s&&(n.position.left=p._convertPositionTo("relative",{top:0,left:u}).left-p.margins.left),o&&(n.position.left=p._convertPositionTo("relative",{top:0,left:a-p.helperProportions.width}).left-p.margins.left)),!p.snapElements[c].snapping&&(r||i||s||o||h)&&p.options.snap.snap&&p.options.snap.snap.call(p.element,t,e.extend(p._uiHash(),{snapItem:p.snapElements[c].item})),p.snapElements[c].snapping=r||i||s||o||h}}}),e.ui.plugin.add("draggable","stack",{start:function(){var t,n=e(this).data("ui-draggable").options,r=e.makeArray(e(n.stack)).sort(function(t,n){return(parseInt(e(t).css("zIndex"),10)||0)-(parseInt(e(n).css("zIndex"),10)||0)});if(!r.length)return;t=parseInt(r[0].style.zIndex,10)||0,e(r).each(function(e){this.style.zIndex=t+e}),this[0].style.zIndex=t+r.length}}),e.ui.plugin.add("draggable","zIndex",{start:function(t,n){var r=e(n.helper),i=e(this).data("ui-draggable").options;r.css("zIndex")&&(i._zIndex=r.css("zIndex")),r.css("zIndex",i.zIndex)},stop:function(t,n){var r=e(this).data("ui-draggable").options;r._zIndex&&e(n.helper).css("zIndex",r._zIndex)}})})(jQuery);(function(e,t){function n(e,t,n){return e>t&&e<t+n}e.widget("ui.droppable",{version:"1.10.0",widgetEventPrefix:"drop",options:{accept:"*",activeClass:!1,addClasses:!0,greedy:!1,hoverClass:!1,scope:"default",tolerance:"intersect",activate:null,deactivate:null,drop:null,out:null,over:null},_create:function(){var t=this.options,n=t.accept;this.isover=!1,this.isout=!0,this.accept=e.isFunction(n)?n:function(e){return e.is(n)},this.proportions={width:this.element[0].offsetWidth,height:this.element[0].offsetHeight},e.ui.ddmanager.droppables[t.scope]=e.ui.ddmanager.droppables[t.scope]||[],e.ui.ddmanager.droppables[t.scope].push(this),t.addClasses&&this.element.addClass("ui-droppable")},_destroy:function(){var t=0,n=e.ui.ddmanager.droppables[this.options.scope];for(;t<n.length;t++)n[t]===this&&n.splice(t,1);this.element.removeClass("ui-droppable ui-droppable-disabled")},_setOption:function(t,n){t==="accept"&&(this.accept=e.isFunction(n)?n:function(e){return e.is(n)}),e.Widget.prototype._setOption.apply(this,arguments)},_activate:function(t){var n=e.ui.ddmanager.current;this.options.activeClass&&this.element.addClass(this.options.activeClass),n&&this._trigger("activate",t,this.ui(n))},_deactivate:function(t){var n=e.ui.ddmanager.current;this.options.activeClass&&this.element.removeClass(this.options.activeClass),n&&this._trigger("deactivate",t,this.ui(n))},_over:function(t){var n=e.ui.ddmanager.current;if(!n||(n.currentItem||n.element)[0]===this.element[0])return;this.accept.call(this.element[0],n.currentItem||n.element)&&(this.options.hoverClass&&this.element.addClass(this.options.hoverClass),this._trigger("over",t,this.ui(n)))},_out:function(t){var n=e.ui.ddmanager.current;if(!n||(n.currentItem||n.element)[0]===this.element[0])return;this.accept.call(this.element[0],n.currentItem||n.element)&&(this.options.hoverClass&&this.element.removeClass(this.options.hoverClass),this._trigger("out",t,this.ui(n)))},_drop:function(t,n){var r=n||e.ui.ddmanager.current,i=!1;return!r||(r.currentItem||r.element)[0]===this.element[0]?!1:(this.element.find(":data(ui-droppable)").not(".ui-draggable-dragging").each(function(){var t=e.data(this,"ui-droppable");if(t.options.greedy&&!t.options.disabled&&t.options.scope===r.options.scope&&t.accept.call(t.element[0],r.currentItem||r.element)&&e.ui.intersect(r,e.extend(t,{offset:t.element.offset()}),t.options.tolerance))return i=!0,!1}),i?!1:this.accept.call(this.element[0],r.currentItem||r.element)?(this.options.activeClass&&this.element.removeClass(this.options.activeClass),this.options.hoverClass&&this.element.removeClass(this.options.hoverClass),this._trigger("drop",t,this.ui(r)),this.element):!1)},ui:function(e){return{draggable:e.currentItem||e.element,helper:e.helper,position:e.position,offset:e.positionAbs}}}),e.ui.intersect=function(e,t,r){if(!t.offset)return!1;var i,s,o=(e.positionAbs||e.position.absolute).left,u=o+e.helperProportions.width,a=(e.positionAbs||e.position.absolute).top,f=a+e.helperProportions.height,l=t.offset.left,c=l+t.proportions.width,h=t.offset.top,p=h+t.proportions.height;switch(r){case"fit":return l<=o&&u<=c&&h<=a&&f<=p;case"intersect":return l<o+e.helperProportions.width/2&&u-e.helperProportions.width/2<c&&h<a+e.helperProportions.height/2&&f-e.helperProportions.height/2<p;case"pointer":return i=(e.positionAbs||e.position.absolute).left+(e.clickOffset||e.offset.click).left,s=(e.positionAbs||e.position.absolute).top+(e.clickOffset||e.offset.click).top,n(s,h,t.proportions.height)&&n(i,l,t.proportions.width);case"touch":return(a>=h&&a<=p||f>=h&&f<=p||a<h&&f>p)&&(o>=l&&o<=c||u>=l&&u<=c||o<l&&u>c);default:return!1}},e.ui.ddmanager={current:null,droppables:{"default":[]},prepareOffsets:function(t,n){var r,i,s=e.ui.ddmanager.droppables[t.options.scope]||[],o=n?n.type:null,u=(t.currentItem||t.element).find(":data(ui-droppable)").addBack();e:for(r=0;r<s.length;r++){if(s[r].options.disabled||t&&!s[r].accept.call(s[r].element[0],t.currentItem||t.element))continue;for(i=0;i<u.length;i++)if(u[i]===s[r].element[0]){s[r].proportions.height=0;continue e}s[r].visible=s[r].element.css("display")!=="none";if(!s[r].visible)continue;o==="mousedown"&&s[r]._activate.call(s[r],n),s[r].offset=s[r].element.offset(),s[r].proportions={width:s[r].element[0].offsetWidth,height:s[r].element[0].offsetHeight}}},drop:function(t,n){var r=!1;return e.each(e.ui.ddmanager.droppables[t.options.scope]||[],function(){if(!this.options)return;!this.options.disabled&&this.visible&&e.ui.intersect(t,this,this.options.tolerance)&&(r=this._drop.call(this,n)||r),!this.options.disabled&&this.visible&&this.accept.call(this.element[0],t.currentItem||t.element)&&(this.isout=!0,this.isover=!1,this._deactivate.call(this,n))}),r},dragStart:function(t,n){t.element.parentsUntil("body").bind("scroll.droppable",function(){t.options.refreshPositions||e.ui.ddmanager.prepareOffsets(t,n)})},drag:function(t,n){t.options.refreshPositions&&e.ui.ddmanager.prepareOffsets(t,n),e.each(e.ui.ddmanager.droppables[t.options.scope]||[],function(){if(this.options.disabled||this.greedyChild||!this.visible)return;var r,i,s,o=e.ui.intersect(t,this,this.options.tolerance),u=!o&&this.isover?"isout":o&&!this.isover?"isover":null;if(!u)return;this.options.greedy&&(i=this.options.scope,s=this.element.parents(":data(ui-droppable)").filter(function(){return e.data(this,"ui-droppable").options.scope===i}),s.length&&(r=e.data(s[0],"ui-droppable"),r.greedyChild=u==="isover")),r&&u==="isover"&&(r.isover=!1,r.isout=!0,r._out.call(r,n)),this[u]=!0,this[u==="isout"?"isover":"isout"]=!1,this[u==="isover"?"_over":"_out"].call(this,n),r&&u==="isout"&&(r.isout=!1,r.isover=!0,r._over.call(r,n))})},dragStop:function(t,n){t.element.parentsUntil("body").unbind("scroll.droppable"),t.options.refreshPositions||e.ui.ddmanager.prepareOffsets(t,n)}}})(jQuery);(function(e,t){function n(e){return parseInt(e,10)||0}function r(e){return!isNaN(parseInt(e,10))}e.widget("ui.resizable",e.ui.mouse,{version:"1.10.0",widgetEventPrefix:"resize",options:{alsoResize:!1,animate:!1,animateDuration:"slow",animateEasing:"swing",aspectRatio:!1,autoHide:!1,containment:!1,ghost:!1,grid:!1,handles:"e,s,se",helper:!1,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:90,resize:null,start:null,stop:null},_create:function(){var t,n,r,i,s,o=this,u=this.options;this.element.addClass("ui-resizable"),e.extend(this,{_aspectRatio:!!u.aspectRatio,aspectRatio:u.aspectRatio,originalElement:this.element,_proportionallyResizeElements:[],_helper:u.helper||u.ghost||u.animate?u.helper||"ui-resizable-helper":null}),this.element[0].nodeName.match(/canvas|textarea|input|select|button|img/i)&&(this.element.wrap(e("<div class='ui-wrapper' style='overflow: hidden;'></div>").css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),top:this.element.css("top"),left:this.element.css("left")})),this.element=this.element.parent().data("ui-resizable",this.element.data("ui-resizable")),this.elementIsWrapper=!0,this.element.css({marginLeft:this.originalElement.css("marginLeft"),marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom")}),this.originalElement.css({marginLeft:0,marginTop:0,marginRight:0,marginBottom:0}),this.originalResizeStyle=this.originalElement.css("resize"),this.originalElement.css("resize","none"),this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"})),this.originalElement.css({margin:this.originalElement.css("margin")}),this._proportionallyResize()),this.handles=u.handles||(e(".ui-resizable-handle",this.element).length?{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",nw:".ui-resizable-nw"}:"e,s,se");if(this.handles.constructor===String){this.handles==="all"&&(this.handles="n,e,s,w,se,sw,ne,nw"),t=this.handles.split(","),this.handles={};for(n=0;n<t.length;n++)r=e.trim(t[n]),s="ui-resizable-"+r,i=e("<div class='ui-resizable-handle "+s+"'></div>"),i.css({zIndex:u.zIndex}),"se"===r&&i.addClass("ui-icon ui-icon-gripsmall-diagonal-se"),this.handles[r]=".ui-resizable-"+r,this.element.append(i)}this._renderAxis=function(t){var n,r,i,s;t=t||this.element;for(n in this.handles){this.handles[n].constructor===String&&(this.handles[n]=e(this.handles[n],this.element).show()),this.elementIsWrapper&&this.originalElement[0].nodeName.match(/textarea|input|select|button/i)&&(r=e(this.handles[n],this.element),s=/sw|ne|nw|se|n|s/.test(n)?r.outerHeight():r.outerWidth(),i=["padding",/ne|nw|n/.test(n)?"Top":/se|sw|s/.test(n)?"Bottom":/^e$/.test(n)?"Right":"Left"].join(""),t.css(i,s),this._proportionallyResize());if(!e(this.handles[n]).length)continue}},this._renderAxis(this.element),this._handles=e(".ui-resizable-handle",this.element).disableSelection(),this._handles.mouseover(function(){o.resizing||(this.className&&(i=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i)),o.axis=i&&i[1]?i[1]:"se")}),u.autoHide&&(this._handles.hide(),e(this.element).addClass("ui-resizable-autohide").mouseenter(function(){if(u.disabled)return;e(this).removeClass("ui-resizable-autohide"),o._handles.show()}).mouseleave(function(){if(u.disabled)return;o.resizing||(e(this).addClass("ui-resizable-autohide"),o._handles.hide())})),this._mouseInit()},_destroy:function(){this._mouseDestroy();var t,n=function(t){e(t).removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing").removeData("resizable").removeData("ui-resizable").unbind(".resizable").find(".ui-resizable-handle").remove()};return this.elementIsWrapper&&(n(this.element),t=this.element,this.originalElement.css({position:t.css("position"),width:t.outerWidth(),height:t.outerHeight(),top:t.css("top"),left:t.css("left")}).insertAfter(t),t.remove()),this.originalElement.css("resize",this.originalResizeStyle),n(this.originalElement),this},_mouseCapture:function(t){var n,r,i=!1;for(n in this.handles){r=e(this.handles[n])[0];if(r===t.target||e.contains(r,t.target))i=!0}return!this.options.disabled&&i},_mouseStart:function(t){var r,i,s,o=this.options,u=this.element.position(),a=this.element;return this.resizing=!0,/absolute/.test(a.css("position"))?a.css({position:"absolute",top:a.css("top"),left:a.css("left")}):a.is(".ui-draggable")&&a.css({position:"absolute",top:u.top,left:u.left}),this._renderProxy(),r=n(this.helper.css("left")),i=n(this.helper.css("top")),o.containment&&(r+=e(o.containment).scrollLeft()||0,i+=e(o.containment).scrollTop()||0),this.offset=this.helper.offset(),this.position={left:r,top:i},this.size=this._helper?{width:a.outerWidth(),height:a.outerHeight()}:{width:a.width(),height:a.height()},this.originalSize=this._helper?{width:a.outerWidth(),height:a.outerHeight()}:{width:a.width(),height:a.height()},this.originalPosition={left:r,top:i},this.sizeDiff={width:a.outerWidth()-a.width(),height:a.outerHeight()-a.height()},this.originalMousePosition={left:t.pageX,top:t.pageY},this.aspectRatio=typeof o.aspectRatio=="number"?o.aspectRatio:this.originalSize.width/this.originalSize.height||1,s=e(".ui-resizable-"+this.axis).css("cursor"),e("body").css("cursor",s==="auto"?this.axis+"-resize":s),a.addClass("ui-resizable-resizing"),this._propagate("start",t),!0},_mouseDrag:function(t){var n,r=this.helper,i={},s=this.originalMousePosition,o=this.axis,u=this.position.top,a=this.position.left,f=this.size.width,l=this.size.height,c=t.pageX-s.left||0,h=t.pageY-s.top||0,p=this._change[o];if(!p)return!1;n=p.apply(this,[t,c,h]),this._updateVirtualBoundaries(t.shiftKey);if(this._aspectRatio||t.shiftKey)n=this._updateRatio(n,t);return n=this._respectSize(n,t),this._updateCache(n),this._propagate("resize",t),this.position.top!==u&&(i.top=this.position.top+"px"),this.position.left!==a&&(i.left=this.position.left+"px"),this.size.width!==f&&(i.width=this.size.width+"px"),this.size.height!==l&&(i.height=this.size.height+"px"),r.css(i),!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize(),e.isEmptyObject(i)||this._trigger("resize",t,this.ui()),!1},_mouseStop:function(t){this.resizing=!1;var n,r,i,s,o,u,a,f=this.options,l=this;return this._helper&&(n=this._proportionallyResizeElements,r=n.length&&/textarea/i.test(n[0].nodeName),i=r&&e.ui.hasScroll(n[0],"left")?0:l.sizeDiff.height,s=r?0:l.sizeDiff.width,o={width:l.helper.width()-s,height:l.helper.height()-i},u=parseInt(l.element.css("left"),10)+(l.position.left-l.originalPosition.left)||null,a=parseInt(l.element.css("top"),10)+(l.position.top-l.originalPosition.top)||null,f.animate||this.element.css(e.extend(o,{top:a,left:u})),l.helper.height(l.size.height),l.helper.width(l.size.width),this._helper&&!f.animate&&this._proportionallyResize()),e("body").css("cursor","auto"),this.element.removeClass("ui-resizable-resizing"),this._propagate("stop",t),this._helper&&this.helper.remove(),!1},_updateVirtualBoundaries:function(e){var t,n,i,s,o,u=this.options;o={minWidth:r(u.minWidth)?u.minWidth:0,maxWidth:r(u.maxWidth)?u.maxWidth:Infinity,minHeight:r(u.minHeight)?u.minHeight:0,maxHeight:r(u.maxHeight)?u.maxHeight:Infinity};if(this._aspectRatio||e)t=o.minHeight*this.aspectRatio,i=o.minWidth/this.aspectRatio,n=o.maxHeight*this.aspectRatio,s=o.maxWidth/this.aspectRatio,t>o.minWidth&&(o.minWidth=t),i>o.minHeight&&(o.minHeight=i),n<o.maxWidth&&(o.maxWidth=n),s<o.maxHeight&&(o.maxHeight=s);this._vBoundaries=o},_updateCache:function(e){this.offset=this.helper.offset(),r(e.left)&&(this.position.left=e.left),r(e.top)&&(this.position.top=e.top),r(e.height)&&(this.size.height=e.height),r(e.width)&&(this.size.width=e.width)},_updateRatio:function(e){var t=this.position,n=this.size,i=this.axis;return r(e.height)?e.width=e.height*this.aspectRatio:r(e.width)&&(e.height=e.width/this.aspectRatio),i==="sw"&&(e.left=t.left+(n.width-e.width),e.top=null),i==="nw"&&(e.top=t.top+(n.height-e.height),e.left=t.left+(n.width-e.width)),e},_respectSize:function(e){var t=this._vBoundaries,n=this.axis,i=r(e.width)&&t.maxWidth&&t.maxWidth<e.width,s=r(e.height)&&t.maxHeight&&t.maxHeight<e.height,o=r(e.width)&&t.minWidth&&t.minWidth>e.width,u=r(e.height)&&t.minHeight&&t.minHeight>e.height,a=this.originalPosition.left+this.originalSize.width,f=this.position.top+this.size.height,l=/sw|nw|w/.test(n),c=/nw|ne|n/.test(n);return o&&(e.width=t.minWidth),u&&(e.height=t.minHeight),i&&(e.width=t.maxWidth),s&&(e.height=t.maxHeight),o&&l&&(e.left=a-t.minWidth),i&&l&&(e.left=a-t.maxWidth),u&&c&&(e.top=f-t.minHeight),s&&c&&(e.top=f-t.maxHeight),!e.width&&!e.height&&!e.left&&e.top?e.top=null:!e.width&&!e.height&&!e.top&&e.left&&(e.left=null),e},_proportionallyResize:function(){if(!this._proportionallyResizeElements.length)return;var e,t,n,r,i,s=this.helper||this.element;for(e=0;e<this._proportionallyResizeElements.length;e++){i=this._proportionallyResizeElements[e];if(!this.borderDif){this.borderDif=[],n=[i.css("borderTopWidth"),i.css("borderRightWidth"),i.css("borderBottomWidth"),i.css("borderLeftWidth")],r=[i.css("paddingTop"),i.css("paddingRight"),i.css("paddingBottom"),i.css("paddingLeft")];for(t=0;t<n.length;t++)this.borderDif[t]=(parseInt(n[t],10)||0)+(parseInt(r[t],10)||0)}i.css({height:s.height()-this.borderDif[0]-this.borderDif[2]||0,width:s.width()-this.borderDif[1]-this.borderDif[3]||0})}},_renderProxy:function(){var t=this.element,n=this.options;this.elementOffset=t.offset(),this._helper?(this.helper=this.helper||e("<div style='overflow:hidden;'></div>"),this.helper.addClass(this._helper).css({width:this.element.outerWidth()-1,height:this.element.outerHeight()-1,position:"absolute",left:this.elementOffset.left+"px",top:this.elementOffset.top+"px",zIndex:++n.zIndex}),this.helper.appendTo("body").disableSelection()):this.helper=this.element},_change:{e:function(e,t){return{width:this.originalSize.width+t}},w:function(e,t){var n=this.originalSize,r=this.originalPosition;return{left:r.left+t,width:n.width-t}},n:function(e,t,n){var r=this.originalSize,i=this.originalPosition;return{top:i.top+n,height:r.height-n}},s:function(e,t,n){return{height:this.originalSize.height+n}},se:function(t,n,r){return e.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[t,n,r]))},sw:function(t,n,r){return e.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[t,n,r]))},ne:function(t,n,r){return e.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[t,n,r]))},nw:function(t,n,r){return e.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[t,n,r]))}},_propagate:function(t,n){e.ui.plugin.call(this,t,[n,this.ui()]),t!=="resize"&&this._trigger(t,n,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}}),e.ui.plugin.add("resizable","animate",{stop:function(t){var n=e(this).data("ui-resizable"),r=n.options,i=n._proportionallyResizeElements,s=i.length&&/textarea/i.test(i[0].nodeName),o=s&&e.ui.hasScroll(i[0],"left")?0:n.sizeDiff.height,u=s?0:n.sizeDiff.width,a={width:n.size.width-u,height:n.size.height-o},f=parseInt(n.element.css("left"),10)+(n.position.left-n.originalPosition.left)||null,l=parseInt(n.element.css("top"),10)+(n.position.top-n.originalPosition.top)||null;n.element.animate(e.extend(a,l&&f?{top:l,left:f}:{}),{duration:r.animateDuration,easing:r.animateEasing,step:function(){var r={width:parseInt(n.element.css("width"),10),height:parseInt(n.element.css("height"),10),top:parseInt(n.element.css("top"),10),left:parseInt(n.element.css("left"),10)};i&&i.length&&e(i[0]).css({width:r.width,height:r.height}),n._updateCache(r),n._propagate("resize",t)}})}}),e.ui.plugin.add("resizable","containment",{start:function(){var t,r,i,s,o,u,a,f=e(this).data("ui-resizable"),l=f.options,c=f.element,h=l.containment,p=h instanceof e?h.get(0):/parent/.test(h)?c.parent().get(0):h;if(!p)return;f.containerElement=e(p),/document/.test(h)||h===document?(f.containerOffset={left:0,top:0},f.containerPosition={left:0,top:0},f.parentData={element:e(document),left:0,top:0,width:e(document).width(),height:e(document).height()||document.body.parentNode.scrollHeight}):(t=e(p),r=[],e(["Top","Right","Left","Bottom"]).each(function(e,i){r[e]=n(t.css("padding"+i))}),f.containerOffset=t.offset(),f.containerPosition=t.position(),f.containerSize={height:t.innerHeight()-r[3],width:t.innerWidth()-r[1]},i=f.containerOffset,s=f.containerSize.height,o=f.containerSize.width,u=e.ui.hasScroll(p,"left")?p.scrollWidth:o,a=e.ui.hasScroll(p)?p.scrollHeight:s,f.parentData={element:p,left:i.left,top:i.top,width:u,height:a})},resize:function(t){var n,r,i,s,o=e(this).data("ui-resizable"),u=o.options,a=o.containerOffset,f=o.position,l=o._aspectRatio||t.shiftKey,c={top:0,left:0},h=o.containerElement;h[0]!==document&&/static/.test(h.css("position"))&&(c=a),f.left<(o._helper?a.left:0)&&(o.size.width=o.size.width+(o._helper?o.position.left-a.left:o.position.left-c.left),l&&(o.size.height=o.size.width/o.aspectRatio),o.position.left=u.helper?a.left:0),f.top<(o._helper?a.top:0)&&(o.size.height=o.size.height+(o._helper?o.position.top-a.top:o.position.top),l&&(o.size.width=o.size.height*o.aspectRatio),o.position.top=o._helper?a.top:0),o.offset.left=o.parentData.left+o.position.left,o.offset.top=o.parentData.top+o.position.top,n=Math.abs((o._helper?o.offset.left-c.left:o.offset.left-c.left)+o.sizeDiff.width),r=Math.abs((o._helper?o.offset.top-c.top:o.offset.top-a.top)+o.sizeDiff.height),i=o.containerElement.get(0)===o.element.parent().get(0),s=/relative|absolute/.test(o.containerElement.css("position")),i&&s&&(n-=o.parentData.left),n+o.size.width>=o.parentData.width&&(o.size.width=o.parentData.width-n,l&&(o.size.height=o.size.width/o.aspectRatio)),r+o.size.height>=o.parentData.height&&(o.size.height=o.parentData.height-r,l&&(o.size.width=o.size.height*o.aspectRatio))},stop:function(){var t=e(this).data("ui-resizable"),n=t.options,r=t.containerOffset,i=t.containerPosition,s=t.containerElement,o=e(t.helper),u=o.offset(),a=o.outerWidth()-t.sizeDiff.width,f=o.outerHeight()-t.sizeDiff.height;t._helper&&!n.animate&&/relative/.test(s.css("position"))&&e(this).css({left:u.left-i.left-r.left,width:a,height:f}),t._helper&&!n.animate&&/static/.test(s.css("position"))&&e(this).css({left:u.left-i.left-r.left,width:a,height:f})}}),e.ui.plugin.add("resizable","alsoResize",{start:function(){var t=e(this).data("ui-resizable"),n=t.options,r=function(t){e(t).each(function(){var t=e(this);t.data("ui-resizable-alsoresize",{width:parseInt(t.width(),10),height:parseInt(t.height(),10),left:parseInt(t.css("left"),10),top:parseInt(t.css("top"),10)})})};typeof n.alsoResize=="object"&&!n.alsoResize.parentNode?n.alsoResize.length?(n.alsoResize=n.alsoResize[0],r(n.alsoResize)):e.each(n.alsoResize,function(e){r(e)}):r(n.alsoResize)},resize:function(t,n){var r=e(this).data("ui-resizable"),i=r.options,s=r.originalSize,o=r.originalPosition,u={height:r.size.height-s.height||0,width:r.size.width-s.width||0,top:r.position.top-o.top||0,left:r.position.left-o.left||0},a=function(t,r){e(t).each(function(){var t=e(this),i=e(this).data("ui-resizable-alsoresize"),s={},o=r&&r.length?r:t.parents(n.originalElement[0]).length?["width","height"]:["width","height","top","left"];e.each(o,function(e,t){var n=(i[t]||0)+(u[t]||0);n&&n>=0&&(s[t]=n||null)}),t.css(s)})};typeof i.alsoResize=="object"&&!i.alsoResize.nodeType?e.each(i.alsoResize,function(e,t){a(e,t)}):a(i.alsoResize)},stop:function(){e(this).removeData("resizable-alsoresize")}}),e.ui.plugin.add("resizable","ghost",{start:function(){var t=e(this).data("ui-resizable"),n=t.options,r=t.size;t.ghost=t.originalElement.clone(),t.ghost.css({opacity:.25,display:"block",position:"relative",height:r.height,width:r.width,margin:0,left:0,top:0}).addClass("ui-resizable-ghost").addClass(typeof n.ghost=="string"?n.ghost:""),t.ghost.appendTo(t.helper)},resize:function(){var t=e(this).data("ui-resizable");t.ghost&&t.ghost.css({position:"relative",height:t.size.height,width:t.size.width})},stop:function(){var t=e(this).data("ui-resizable");t.ghost&&t.helper&&t.helper.get(0).removeChild(t.ghost.get(0))}}),e.ui.plugin.add("resizable","grid",{resize:function(){var t=e(this).data("ui-resizable"),n=t.options,r=t.size,i=t.originalSize,s=t.originalPosition,o=t.axis,u=typeof n.grid=="number"?[n.grid,n.grid]:n.grid,a=u[0]||1,f=u[1]||1,l=Math.round((r.width-i.width)/a)*a,c=Math.round((r.height-i.height)/f)*f,h=i.width+l,p=i.height+c,d=n.maxWidth&&n.maxWidth<h,v=n.maxHeight&&n.maxHeight<p,m=n.minWidth&&n.minWidth>h,g=n.minHeight&&n.minHeight>p;n.grid=u,m&&(h+=a),g&&(p+=f),d&&(h-=a),v&&(p-=f),/^(se|s|e)$/.test(o)?(t.size.width=h,t.size.height=p):/^(ne)$/.test(o)?(t.size.width=h,t.size.height=p,t.position.top=s.top-c):/^(sw)$/.test(o)?(t.size.width=h,t.size.height=p,t.position.left=s.left-l):(t.size.width=h,t.size.height=p,t.position.top=s.top-c,t.position.left=s.left-l)}})})(jQuery);(function(e,t){e.widget("ui.selectable",e.ui.mouse,{version:"1.10.0",options:{appendTo:"body",autoRefresh:!0,distance:0,filter:"*",tolerance:"touch",selected:null,selecting:null,start:null,stop:null,unselected:null,unselecting:null},_create:function(){var t,n=this;this.element.addClass("ui-selectable"),this.dragged=!1,this.refresh=function(){t=e(n.options.filter,n.element[0]),t.addClass("ui-selectee"),t.each(function(){var t=e(this),n=t.offset();e.data(this,"selectable-item",{element:this,$element:t,left:n.left,top:n.top,right:n.left+t.outerWidth(),bottom:n.top+t.outerHeight(),startselected:!1,selected:t.hasClass("ui-selected"),selecting:t.hasClass("ui-selecting"),unselecting:t.hasClass("ui-unselecting")})})},this.refresh(),this.selectees=t.addClass("ui-selectee"),this._mouseInit(),this.helper=e("<div class='ui-selectable-helper'></div>")},_destroy:function(){this.selectees.removeClass("ui-selectee").removeData("selectable-item"),this.element.removeClass("ui-selectable ui-selectable-disabled"),this._mouseDestroy()},_mouseStart:function(t){var n=this,r=this.options;this.opos=[t.pageX,t.pageY];if(this.options.disabled)return;this.selectees=e(r.filter,this.element[0]),this._trigger("start",t),e(r.appendTo).append(this.helper),this.helper.css({left:t.pageX,top:t.pageY,width:0,height:0}),r.autoRefresh&&this.refresh(),this.selectees.filter(".ui-selected").each(function(){var r=e.data(this,"selectable-item");r.startselected=!0,!t.metaKey&&!t.ctrlKey&&(r.$element.removeClass("ui-selected"),r.selected=!1,r.$element.addClass("ui-unselecting"),r.unselecting=!0,n._trigger("unselecting",t,{unselecting:r.element}))}),e(t.target).parents().addBack().each(function(){var r,i=e.data(this,"selectable-item");if(i)return r=!t.metaKey&&!t.ctrlKey||!i.$element.hasClass("ui-selected"),i.$element.removeClass(r?"ui-unselecting":"ui-selected").addClass(r?"ui-selecting":"ui-unselecting"),i.unselecting=!r,i.selecting=r,i.selected=r,r?n._trigger("selecting",t,{selecting:i.element}):n._trigger("unselecting",t,{unselecting:i.element}),!1})},_mouseDrag:function(t){this.dragged=!0;if(this.options.disabled)return;var n,r=this,i=this.options,s=this.opos[0],o=this.opos[1],u=t.pageX,a=t.pageY;return s>u&&(n=u,u=s,s=n),o>a&&(n=a,a=o,o=n),this.helper.css({left:s,top:o,width:u-s,height:a-o}),this.selectees.each(function(){var n=e.data(this,"selectable-item"),f=!1;if(!n||n.element===r.element[0])return;i.tolerance==="touch"?f=!(n.left>u||n.right<s||n.top>a||n.bottom<o):i.tolerance==="fit"&&(f=n.left>s&&n.right<u&&n.top>o&&n.bottom<a),f?(n.selected&&(n.$element.removeClass("ui-selected"),n.selected=!1),n.unselecting&&(n.$element.removeClass("ui-unselecting"),n.unselecting=!1),n.selecting||(n.$element.addClass("ui-selecting"),n.selecting=!0,r._trigger("selecting",t,{selecting:n.element}))):(n.selecting&&((t.metaKey||t.ctrlKey)&&n.startselected?(n.$element.removeClass("ui-selecting"),n.selecting=!1,n.$element.addClass("ui-selected"),n.selected=!0):(n.$element.removeClass("ui-selecting"),n.selecting=!1,n.startselected&&(n.$element.addClass("ui-unselecting"),n.unselecting=!0),r._trigger("unselecting",t,{unselecting:n.element}))),n.selected&&!t.metaKey&&!t.ctrlKey&&!n.startselected&&(n.$element.removeClass("ui-selected"),n.selected=!1,n.$element.addClass("ui-unselecting"),n.unselecting=!0,r._trigger("unselecting",t,{unselecting:n.element})))}),!1},_mouseStop:function(t){var n=this;return this.dragged=!1,e(".ui-unselecting",this.element[0]).each(function(){var r=e.data(this,"selectable-item");r.$element.removeClass("ui-unselecting"),r.unselecting=!1,r.startselected=!1,n._trigger("unselected",t,{unselected:r.element})}),e(".ui-selecting",this.element[0]).each(function(){var r=e.data(this,"selectable-item");r.$element.removeClass("ui-selecting").addClass("ui-selected"),r.selecting=!1,r.selected=!0,r.startselected=!0,n._trigger("selected",t,{selected:r.element})}),this._trigger("stop",t),this.helper.remove(),!1}})})(jQuery);(function(e,t){function n(e,t,n){return e>t&&e<t+n}e.widget("ui.sortable",e.ui.mouse,{version:"1.10.0",widgetEventPrefix:"sort",ready:!1,options:{appendTo:"parent",axis:!1,connectWith:!1,containment:!1,cursor:"auto",cursorAt:!1,dropOnEmpty:!0,forcePlaceholderSize:!1,forceHelperSize:!1,grid:!1,handle:!1,helper:"original",items:"> *",opacity:!1,placeholder:!1,revert:!1,scroll:!0,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1e3,activate:null,beforeStop:null,change:null,deactivate:null,out:null,over:null,receive:null,remove:null,sort:null,start:null,stop:null,update:null},_create:function(){var e=this.options;this.containerCache={},this.element.addClass("ui-sortable"),this.refresh(),this.floating=this.items.length?e.axis==="x"||/left|right/.test(this.items[0].item.css("float"))||/inline|table-cell/.test(this.items[0].item.css("display")):!1,this.offset=this.element.offset(),this._mouseInit(),this.ready=!0},_destroy:function(){this.element.removeClass("ui-sortable ui-sortable-disabled"),this._mouseDestroy();for(var e=this.items.length-1;e>=0;e--)this.items[e].item.removeData(this.widgetName+"-item");return this},_setOption:function(t,n){t==="disabled"?(this.options[t]=n,this.widget().toggleClass("ui-sortable-disabled",!!n)):e.Widget.prototype._setOption.apply(this,arguments)},_mouseCapture:function(t,n){var r=null,i=!1,s=this;if(this.reverting)return!1;if(this.options.disabled||this.options.type==="static")return!1;this._refreshItems(t),e(t.target).parents().each(function(){if(e.data(this,s.widgetName+"-item")===s)return r=e(this),!1}),e.data(t.target,s.widgetName+"-item")===s&&(r=e(t.target));if(!r)return!1;if(this.options.handle&&!n){e(this.options.handle,r).find("*").addBack().each(function(){this===t.target&&(i=!0)});if(!i)return!1}return this.currentItem=r,this._removeCurrentsFromItems(),!0},_mouseStart:function(t,n,r){var i,s=this.options;this.currentContainer=this,this.refreshPositions(),this.helper=this._createHelper(t),this._cacheHelperProportions(),this._cacheMargins(),this.scrollParent=this.helper.scrollParent(),this.offset=this.currentItem.offset(),this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left},e.extend(this.offset,{click:{left:t.pageX-this.offset.left,top:t.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()}),this.helper.css("position","absolute"),this.cssPosition=this.helper.css("position"),this.originalPosition=this._generatePosition(t),this.originalPageX=t.pageX,this.originalPageY=t.pageY,s.cursorAt&&this._adjustOffsetFromHelper(s.cursorAt),this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]},this.helper[0]!==this.currentItem[0]&&this.currentItem.hide(),this._createPlaceholder(),s.containment&&this._setContainment(),s.cursor&&(e("body").css("cursor")&&(this._storedCursor=e("body").css("cursor")),e("body").css("cursor",s.cursor)),s.opacity&&(this.helper.css("opacity")&&(this._storedOpacity=this.helper.css("opacity")),this.helper.css("opacity",s.opacity)),s.zIndex&&(this.helper.css("zIndex")&&(this._storedZIndex=this.helper.css("zIndex")),this.helper.css("zIndex",s.zIndex)),this.scrollParent[0]!==document&&this.scrollParent[0].tagName!=="HTML"&&(this.overflowOffset=this.scrollParent.offset()),this._trigger("start",t,this._uiHash()),this._preserveHelperProportions||this._cacheHelperProportions();if(!r)for(i=this.containers.length-1;i>=0;i--)this.containers[i]._trigger("activate",t,this._uiHash(this));return e.ui.ddmanager&&(e.ui.ddmanager.current=this),e.ui.ddmanager&&!s.dropBehaviour&&e.ui.ddmanager.prepareOffsets(this,t),this.dragging=!0,this.helper.addClass("ui-sortable-helper"),this._mouseDrag(t),!0},_mouseDrag:function(t){var n,r,i,s,o=this.options,u=!1;this.position=this._generatePosition(t),this.positionAbs=this._convertPositionTo("absolute"),this.lastPositionAbs||(this.lastPositionAbs=this.positionAbs),this.options.scroll&&(this.scrollParent[0]!==document&&this.scrollParent[0].tagName!=="HTML"?(this.overflowOffset.top+this.scrollParent[0].offsetHeight-t.pageY<o.scrollSensitivity?this.scrollParent[0].scrollTop=u=this.scrollParent[0].scrollTop+o.scrollSpeed:t.pageY-this.overflowOffset.top<o.scrollSensitivity&&(this.scrollParent[0].scrollTop=u=this.scrollParent[0].scrollTop-o.scrollSpeed),this.overflowOffset.left+this.scrollParent[0].offsetWidth-t.pageX<o.scrollSensitivity?this.scrollParent[0].scrollLeft=u=this.scrollParent[0].scrollLeft+o.scrollSpeed:t.pageX-this.overflowOffset.left<o.scrollSensitivity&&(this.scrollParent[0].scrollLeft=u=this.scrollParent[0].scrollLeft-o.scrollSpeed)):(t.pageY-e(document).scrollTop()<o.scrollSensitivity?u=e(document).scrollTop(e(document).scrollTop()-o.scrollSpeed):e(window).height()-(t.pageY-e(document).scrollTop())<o.scrollSensitivity&&(u=e(document).scrollTop(e(document).scrollTop()+o.scrollSpeed)),t.pageX-e(document).scrollLeft()<o.scrollSensitivity?u=e(document).scrollLeft(e(document).scrollLeft()-o.scrollSpeed):e(window).width()-(t.pageX-e(document).scrollLeft())<o.scrollSensitivity&&(u=e(document).scrollLeft(e(document).scrollLeft()+o.scrollSpeed))),u!==!1&&e.ui.ddmanager&&!o.dropBehaviour&&e.ui.ddmanager.prepareOffsets(this,t)),this.positionAbs=this._convertPositionTo("absolute");if(!this.options.axis||this.options.axis!=="y")this.helper[0].style.left=this.position.left+"px";if(!this.options.axis||this.options.axis!=="x")this.helper[0].style.top=this.position.top+"px";for(n=this.items.length-1;n>=0;n--){r=this.items[n],i=r.item[0],s=this._intersectsWithPointer(r);if(!s)continue;if(r.instance!==this.currentContainer)continue;if(i!==this.currentItem[0]&&this.placeholder[s===1?"next":"prev"]()[0]!==i&&!e.contains(this.placeholder[0],i)&&(this.options.type==="semi-dynamic"?!e.contains(this.element[0],i):!0)){this.direction=s===1?"down":"up";if(this.options.tolerance!=="pointer"&&!this._intersectsWithSides(r))break;this._rearrange(t,r),this._trigger("change",t,this._uiHash());break}}return this._contactContainers(t),e.ui.ddmanager&&e.ui.ddmanager.drag(this,t),this._trigger("sort",t,this._uiHash()),this.lastPositionAbs=this.positionAbs,!1},_mouseStop:function(t,n){if(!t)return;e.ui.ddmanager&&!this.options.dropBehaviour&&e.ui.ddmanager.drop(this,t);if(this.options.revert){var r=this,i=this.placeholder.offset();this.reverting=!0,e(this.helper).animate({left:i.left-this.offset.parent.left-this.margins.left+(this.offsetParent[0]===document.body?0:this.offsetParent[0].scrollLeft),top:i.top-this.offset.parent.top-this.margins.top+(this.offsetParent[0]===document.body?0:this.offsetParent[0].scrollTop)},parseInt(this.options.revert,10)||500,function(){r._clear(t)})}else this._clear(t,n);return!1},cancel:function(){if(this.dragging){this._mouseUp({target:null}),this.options.helper==="original"?this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper"):this.currentItem.show();for(var t=this.containers.length-1;t>=0;t--)this.containers[t]._trigger("deactivate",null,this._uiHash(this)),this.containers[t].containerCache.over&&(this.containers[t]._trigger("out",null,this._uiHash(this)),this.containers[t].containerCache.over=0)}return this.placeholder&&(this.placeholder[0].parentNode&&this.placeholder[0].parentNode.removeChild(this.placeholder[0]),this.options.helper!=="original"&&this.helper&&this.helper[0].parentNode&&this.helper.remove(),e.extend(this,{helper:null,dragging:!1,reverting:!1,_noFinalSort:null}),this.domPosition.prev?e(this.domPosition.prev).after(this.currentItem):e(this.domPosition.parent).prepend(this.currentItem)),this},serialize:function(t){var n=this._getItemsAsjQuery(t&&t.connected),r=[];return t=t||{},e(n).each(function(){var n=(e(t.item||this).attr(t.attribute||"id")||"").match(t.expression||/(.+)[\-=_](.+)/);n&&r.push((t.key||n[1]+"[]")+"="+(t.key&&t.expression?n[1]:n[2]))}),!r.length&&t.key&&r.push(t.key+"="),r.join("&")},toArray:function(t){var n=this._getItemsAsjQuery(t&&t.connected),r=[];return t=t||{},n.each(function(){r.push(e(t.item||this).attr(t.attribute||"id")||"")}),r},_intersectsWith:function(e){var t=this.positionAbs.left,n=t+this.helperProportions.width,r=this.positionAbs.top,i=r+this.helperProportions.height,s=e.left,o=s+e.width,u=e.top,a=u+e.height,f=this.offset.click.top,l=this.offset.click.left,c=r+f>u&&r+f<a&&t+l>s&&t+l<o;return this.options.tolerance==="pointer"||this.options.forcePointerForContainers||this.options.tolerance!=="pointer"&&this.helperProportions[this.floating?"width":"height"]>e[this.floating?"width":"height"]?c:s<t+this.helperProportions.width/2&&n-this.helperProportions.width/2<o&&u<r+this.helperProportions.height/2&&i-this.helperProportions.height/2<a},_intersectsWithPointer:function(e){var t=this.options.axis==="x"||n(this.positionAbs.top+this.offset.click.top,e.top,e.height),r=this.options.axis==="y"||n(this.positionAbs.left+this.offset.click.left,e.left,e.width),i=t&&r,s=this._getDragVerticalDirection(),o=this._getDragHorizontalDirection();return i?this.floating?o&&o==="right"||s==="down"?2:1:s&&(s==="down"?2:1):!1},_intersectsWithSides:function(e){var t=n(this.positionAbs.top+this.offset.click.top,e.top+e.height/2,e.height),r=n(this.positionAbs.left+this.offset.click.left,e.left+e.width/2,e.width),i=this._getDragVerticalDirection(),s=this._getDragHorizontalDirection();return this.floating&&s?s==="right"&&r||s==="left"&&!r:i&&(i==="down"&&t||i==="up"&&!t)},_getDragVerticalDirection:function(){var e=this.positionAbs.top-this.lastPositionAbs.top;return e!==0&&(e>0?"down":"up")},_getDragHorizontalDirection:function(){var e=this.positionAbs.left-this.lastPositionAbs.left;return e!==0&&(e>0?"right":"left")},refresh:function(e){return this._refreshItems(e),this.refreshPositions(),this},_connectWith:function(){var e=this.options;return e.connectWith.constructor===String?[e.connectWith]:e.connectWith},_getItemsAsjQuery:function(t){var n,r,i,s,o=[],u=[],a=this._connectWith();if(a&&t)for(n=a.length-1;n>=0;n--){i=e(a[n]);for(r=i.length-1;r>=0;r--)s=e.data(i[r],this.widgetFullName),s&&s!==this&&!s.options.disabled&&u.push([e.isFunction(s.options.items)?s.options.items.call(s.element):e(s.options.items,s.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),s])}u.push([e.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):e(this.options.items,this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),this]);for(n=u.length-1;n>=0;n--)u[n][0].each(function(){o.push(this)});return e(o)},_removeCurrentsFromItems:function(){var t=this.currentItem.find(":data("+this.widgetName+"-item)");this.items=e.grep(this.items,function(e){for(var n=0;n<t.length;n++)if(t[n]===e.item[0])return!1;return!0})},_refreshItems:function(t){this.items=[],this.containers=[this];var n,r,i,s,o,u,a,f,l=this.items,c=[[e.isFunction(this.options.items)?this.options.items.call(this.element[0],t,{item:this.currentItem}):e(this.options.items,this.element),this]],h=this._connectWith();if(h&&this.ready)for(n=h.length-1;n>=0;n--){i=e(h[n]);for(r=i.length-1;r>=0;r--)s=e.data(i[r],this.widgetFullName),s&&s!==this&&!s.options.disabled&&(c.push([e.isFunction(s.options.items)?s.options.items.call(s.element[0],t,{item:this.currentItem}):e(s.options.items,s.element),s]),this.containers.push(s))}for(n=c.length-1;n>=0;n--){o=c[n][1],u=c[n][0];for(r=0,f=u.length;r<f;r++)a=e(u[r]),a.data(this.widgetName+"-item",o),l.push({item:a,instance:o,width:0,height:0,left:0,top:0})}},refreshPositions:function(t){this.offsetParent&&this.helper&&(this.offset.parent=this._getParentOffset());var n,r,i,s;for(n=this.items.length-1;n>=0;n--){r=this.items[n];if(r.instance!==this.currentContainer&&this.currentContainer&&r.item[0]!==this.currentItem[0])continue;i=this.options.toleranceElement?e(this.options.toleranceElement,r.item):r.item,t||(r.width=i.outerWidth(),r.height=i.outerHeight()),s=i.offset(),r.left=s.left,r.top=s.top}if(this.options.custom&&this.options.custom.refreshContainers)this.options.custom.refreshContainers.call(this);else for(n=this.containers.length-1;n>=0;n--)s=this.containers[n].element.offset(),this.containers[n].containerCache.left=s.left,this.containers[n].containerCache.top=s.top,this.containers[n].containerCache.width=this.containers[n].element.outerWidth(),this.containers[n].containerCache.height=this.containers[n].element.outerHeight();return this},_createPlaceholder:function(t){t=t||this;var n,r=t.options;if(!r.placeholder||r.placeholder.constructor===String)n=r.placeholder,r.placeholder={element:function(){var r=e(document.createElement(t.currentItem[0].nodeName)).addClass(n||t.currentItem[0].className+" ui-sortable-placeholder").removeClass("ui-sortable-helper")[0];return n||(r.style.visibility="hidden"),r},update:function(e,i){if(n&&!r.forcePlaceholderSize)return;i.height()||i.height(t.currentItem.innerHeight()-parseInt(t.currentItem.css("paddingTop")||0,10)-parseInt(t.currentItem.css("paddingBottom")||0,10)),i.width()||i.width(t.currentItem.innerWidth()-parseInt(t.currentItem.css("paddingLeft")||0,10)-parseInt(t.currentItem.css("paddingRight")||0,10))}};t.placeholder=e(r.placeholder.element.call(t.element,t.currentItem)),t.currentItem.after(t.placeholder),r.placeholder.update(t,t.placeholder)},_contactContainers:function(t){var n,r,i,s,o,u,a,f,l,c=null,h=null;for(n=this.containers.length-1;n>=0;n--){if(e.contains(this.currentItem[0],this.containers[n].element[0]))continue;if(this._intersectsWith(this.containers[n].containerCache)){if(c&&e.contains(this.containers[n].element[0],c.element[0]))continue;c=this.containers[n],h=n}else this.containers[n].containerCache.over&&(this.containers[n]._trigger("out",t,this._uiHash(this)),this.containers[n].containerCache.over=0)}if(!c)return;if(this.containers.length===1)this.containers[h]._trigger("over",t,this._uiHash(this)),this.containers[h].containerCache.over=1;else{i=1e4,s=null,o=this.containers[h].floating?"left":"top",u=this.containers[h].floating?"width":"height",a=this.positionAbs[o]+this.offset.click[o];for(r=this.items.length-1;r>=0;r--){if(!e.contains(this.containers[h].element[0],this.items[r].item[0]))continue;if(this.items[r].item[0]===this.currentItem[0])continue;f=this.items[r].item.offset()[o],l=!1,Math.abs(f-a)>Math.abs(f+this.items[r][u]-a)&&(l=!0,f+=this.items[r][u]),Math.abs(f-a)<i&&(i=Math.abs(f-a),s=this.items[r],this.direction=l?"up":"down")}if(!s&&!this.options.dropOnEmpty)return;this.currentContainer=this.containers[h],s?this._rearrange(t,s,null,!0):this._rearrange(t,null,this.containers[h].element,!0),this._trigger("change",t,this._uiHash()),this.containers[h]._trigger("change",t,this._uiHash(this)),this.options.placeholder.update(this.currentContainer,this.placeholder),this.containers[h]._trigger("over",t,this._uiHash(this)),this.containers[h].containerCache.over=1}},_createHelper:function(t){var n=this.options,r=e.isFunction(n.helper)?e(n.helper.apply(this.element[0],[t,this.currentItem])):n.helper==="clone"?this.currentItem.clone():this.currentItem;return r.parents("body").length||e(n.appendTo!=="parent"?n.appendTo:this.currentItem[0].parentNode)[0].appendChild(r[0]),r[0]===this.currentItem[0]&&(this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")}),(!r[0].style.width||n.forceHelperSize)&&r.width(this.currentItem.width()),(!r[0].style.height||n.forceHelperSize)&&r.height(this.currentItem.height()),r},_adjustOffsetFromHelper:function(t){typeof t=="string"&&(t=t.split(" ")),e.isArray(t)&&(t={left:+t[0],top:+t[1]||0}),"left"in t&&(this.offset.click.left=t.left+this.margins.left),"right"in t&&(this.offset.click.left=this.helperProportions.width-t.right+this.margins.left),"top"in t&&(this.offset.click.top=t.top+this.margins.top),"bottom"in t&&(this.offset.click.top=this.helperProportions.height-t.bottom+this.margins.top)},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var t=this.offsetParent.offset();this.cssPosition==="absolute"&&this.scrollParent[0]!==document&&e.contains(this.scrollParent[0],this.offsetParent[0])&&(t.left+=this.scrollParent.scrollLeft(),t.top+=this.scrollParent.scrollTop());if(this.offsetParent[0]===document.body||this.offsetParent[0].tagName&&this.offsetParent[0].tagName.toLowerCase()==="html"&&e.ui.ie)t={top:0,left:0};return{top:t.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:t.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if(this.cssPosition==="relative"){var e=this.currentItem.position();return{top:e.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:e.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.currentItem.css("marginLeft"),10)||0,top:parseInt(this.currentItem.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var t,n,r,i=this.options;i.containment==="parent"&&(i.containment=this.helper[0].parentNode);if(i.containment==="document"||i.containment==="window")this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,e(i.containment==="document"?document:window).width()-this.helperProportions.width-this.margins.left,(e(i.containment==="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top];/^(document|window|parent)$/.test(i.containment)||(t=e(i.containment)[0],n=e(i.containment).offset(),r=e(t).css("overflow")!=="hidden",this.containment=[n.left+(parseInt(e(t).css("borderLeftWidth"),10)||0)+(parseInt(e(t).css("paddingLeft"),10)||0)-this.margins.left,n.top+(parseInt(e(t).css("borderTopWidth"),10)||0)+(parseInt(e(t).css("paddingTop"),10)||0)-this.margins.top,n.left+(r?Math.max(t.scrollWidth,t.offsetWidth):t.offsetWidth)-(parseInt(e(t).css("borderLeftWidth"),10)||0)-(parseInt(e(t).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,n.top+(r?Math.max(t.scrollHeight,t.offsetHeight):t.offsetHeight)-(parseInt(e(t).css("borderTopWidth"),10)||0)-(parseInt(e(t).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top])},_convertPositionTo:function(t,n){n||(n=this.position);var r=t==="absolute"?1:-1,i=this.cssPosition!=="absolute"||this.scrollParent[0]!==document&&!!e.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,s=/(html|body)/i.test(i[0].tagName);return{top:n.top+this.offset.relative.top*r+this.offset.parent.top*r-(this.cssPosition==="fixed"?-this.scrollParent.scrollTop():s?0:i.scrollTop())*r,left:n.left+this.offset.relative.left*r+this.offset.parent.left*r-(this.cssPosition==="fixed"?-this.scrollParent.scrollLeft():s?0:i.scrollLeft())*r}},_generatePosition:function(t){var n,r,i=this.options,s=t.pageX,o=t.pageY,u=this.cssPosition!=="absolute"||this.scrollParent[0]!==document&&!!e.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,a=/(html|body)/i.test(u[0].tagName);return this.cssPosition==="relative"&&(this.scrollParent[0]===document||this.scrollParent[0]===this.offsetParent[0])&&(this.offset.relative=this._getRelativeOffset()),this.originalPosition&&(this.containment&&(t.pageX-this.offset.click.left<this.containment[0]&&(s=this.containment[0]+this.offset.click.left),t.pageY-this.offset.click.top<this.containment[1]&&(o=this.containment[1]+this.offset.click.top),t.pageX-this.offset.click.left>this.containment[2]&&(s=this.containment[2]+this.offset.click.left),t.pageY-this.offset.click.top>this.containment[3]&&(o=this.containment[3]+this.offset.click.top)),i.grid&&(n=this.originalPageY+Math.round((o-this.originalPageY)/i.grid[1])*i.grid[1],o=this.containment?n-this.offset.click.top>=this.containment[1]&&n-this.offset.click.top<=this.containment[3]?n:n-this.offset.click.top>=this.containment[1]?n-i.grid[1]:n+i.grid[1]:n,r=this.originalPageX+Math.round((s-this.originalPageX)/i.grid[0])*i.grid[0],s=this.containment?r-this.offset.click.left>=this.containment[0]&&r-this.offset.click.left<=this.containment[2]?r:r-this.offset.click.left>=this.containment[0]?r-i.grid[0]:r+i.grid[0]:r)),{top:o-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+(this.cssPosition==="fixed"?-this.scrollParent.scrollTop():a?0:u.scrollTop()),left:s-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(this.cssPosition==="fixed"?-this.scrollParent.scrollLeft():a?0:u.scrollLeft())}},_rearrange:function(e,t,n,r){n?n[0].appendChild(this.placeholder[0]):t.item[0].parentNode.insertBefore(this.placeholder[0],this.direction==="down"?t.item[0]:t.item[0].nextSibling),this.counter=this.counter?++this.counter:1;var i=this.counter;this._delay(function(){i===this.counter&&this.refreshPositions(!r)})},_clear:function(t,n){this.reverting=!1;var r,i=[];!this._noFinalSort&&this.currentItem.parent().length&&this.placeholder.before(this.currentItem),this._noFinalSort=null;if(this.helper[0]===this.currentItem[0]){for(r in this._storedCSS)if(this._storedCSS[r]==="auto"||this._storedCSS[r]==="static")this._storedCSS[r]="";this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper")}else this.currentItem.show();this.fromOutside&&!n&&i.push(function(e){this._trigger("receive",e,this._uiHash(this.fromOutside))}),(this.fromOutside||this.domPosition.prev!==this.currentItem.prev().not(".ui-sortable-helper")[0]||this.domPosition.parent!==this.currentItem.parent()[0])&&!n&&i.push(function(e){this._trigger("update",e,this._uiHash())}),this!==this.currentContainer&&(n||(i.push(function(e){this._trigger("remove",e,this._uiHash())}),i.push(function(e){return function(t){e._trigger("receive",t,this._uiHash(this))}}.call(this,this.currentContainer)),i.push(function(e){return function(t){e._trigger("update",t,this._uiHash(this))}}.call(this,this.currentContainer))));for(r=this.containers.length-1;r>=0;r--)n||i.push(function(e){return function(t){e._trigger("deactivate",t,this._uiHash(this))}}.call(this,this.containers[r])),this.containers[r].containerCache.over&&(i.push(function(e){return function(t){e._trigger("out",t,this._uiHash(this))}}.call(this,this.containers[r])),this.containers[r].containerCache.over=0);this._storedCursor&&e("body").css("cursor",this._storedCursor),this._storedOpacity&&this.helper.css("opacity",this._storedOpacity),this._storedZIndex&&this.helper.css("zIndex",this._storedZIndex==="auto"?"":this._storedZIndex),this.dragging=!1;if(this.cancelHelperRemoval){if(!n){this._trigger("beforeStop",t,this._uiHash());for(r=0;r<i.length;r++)i[r].call(this,t);this._trigger("stop",t,this._uiHash())}return this.fromOutside=!1,!1}n||this._trigger("beforeStop",t,this._uiHash()),this.placeholder[0].parentNode.removeChild(this.placeholder[0]),this.helper[0]!==this.currentItem[0]&&this.helper.remove(),this.helper=null;if(!n){for(r=0;r<i.length;r++)i[r].call(this,t);this._trigger("stop",t,this._uiHash())}return this.fromOutside=!1,!0},_trigger:function(){e.Widget.prototype._trigger.apply(this,arguments)===!1&&this.cancel()},_uiHash:function(t){var n=t||this;return{helper:n.helper,placeholder:n.placeholder||e([]),position:n.position,originalPosition:n.originalPosition,offset:n.positionAbs,item:n.currentItem,sender:t?t.element:null}}})})(jQuery);(function(e,t){var n=0,r={},i={};r.height=r.paddingTop=r.paddingBottom=r.borderTopWidth=r.borderBottomWidth="hide",i.height=i.paddingTop=i.paddingBottom=i.borderTopWidth=i.borderBottomWidth="show",e.widget("ui.accordion",{version:"1.10.0",options:{active:0,animate:{},collapsible:!1,event:"click",header:"> li > :first-child,> :not(li):even",heightStyle:"auto",icons:{activeHeader:"ui-icon-triangle-1-s",header:"ui-icon-triangle-1-e"},activate:null,beforeActivate:null},_create:function(){var t=this.options;this.prevShow=this.prevHide=e(),this.element.addClass("ui-accordion ui-widget ui-helper-reset").attr("role","tablist"),!t.collapsible&&(t.active===!1||t.active==null)&&(t.active=0),this._processPanels(),t.active<0&&(t.active+=this.headers.length),this._refresh()},_getCreateEventData:function(){return{header:this.active,content:this.active.length?this.active.next():e()}},_createIcons:function(){var t=this.options.icons;t&&(e("<span>").addClass("ui-accordion-header-icon ui-icon "+t.header).prependTo(this.headers),this.active.children(".ui-accordion-header-icon").removeClass(t.header).addClass(t.activeHeader),this.headers.addClass("ui-accordion-icons"))},_destroyIcons:function(){this.headers.removeClass("ui-accordion-icons").children(".ui-accordion-header-icon").remove()},_destroy:function(){var e;this.element.removeClass("ui-accordion ui-widget ui-helper-reset").removeAttr("role"),this.headers.removeClass("ui-accordion-header ui-accordion-header-active ui-helper-reset ui-state-default ui-corner-all ui-state-active ui-state-disabled ui-corner-top").removeAttr("role").removeAttr("aria-selected").removeAttr("aria-controls").removeAttr("tabIndex").each(function(){/^ui-accordion/.test(this.id)&&this.removeAttribute("id")}),this._destroyIcons(),e=this.headers.next().css("display","").removeAttr("role").removeAttr("aria-expanded").removeAttr("aria-hidden").removeAttr("aria-labelledby").removeClass("ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content ui-accordion-content-active ui-state-disabled").each(function(){/^ui-accordion/.test(this.id)&&this.removeAttribute("id")}),this.options.heightStyle!=="content"&&e.css("height","")},_setOption:function(e,t){if(e==="active"){this._activate(t);return}e==="event"&&(this.options.event&&this._off(this.headers,this.options.event),this._setupEvents(t)),this._super(e,t),e==="collapsible"&&!t&&this.options.active===!1&&this._activate(0),e==="icons"&&(this._destroyIcons(),t&&this._createIcons()),e==="disabled"&&this.headers.add(this.headers.next()).toggleClass("ui-state-disabled",!!t)},_keydown:function(t){if(t.altKey||t.ctrlKey)return;var n=e.ui.keyCode,r=this.headers.length,i=this.headers.index(t.target),s=!1;switch(t.keyCode){case n.RIGHT:case n.DOWN:s=this.headers[(i+1)%r];break;case n.LEFT:case n.UP:s=this.headers[(i-1+r)%r];break;case n.SPACE:case n.ENTER:this._eventHandler(t);break;case n.HOME:s=this.headers[0];break;case n.END:s=this.headers[r-1]}s&&(e(t.target).attr("tabIndex",-1),e(s).attr("tabIndex",0),s.focus(),t.preventDefault())},_panelKeyDown:function(t){t.keyCode===e.ui.keyCode.UP&&t.ctrlKey&&e(t.currentTarget).prev().focus()},refresh:function(){var t=this.options;this._processPanels();if(t.active===!1&&t.collapsible===!0||!this.headers.length)t.active=!1,this.active=e();t.active===!1?this._activate(0):this.active.length&&!e.contains(this.element[0],this.active[0])?this.headers.length===this.headers.find(".ui-state-disabled").length?(t.active=!1,this.active=e()):this._activate(Math.max(0,t.active-1)):t.active=this.headers.index(this.active),this._destroyIcons(),this._refresh()},_processPanels:function(){this.headers=this.element.find(this.options.header).addClass("ui-accordion-header ui-helper-reset ui-state-default ui-corner-all"),this.headers.next().addClass("ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom").filter(":not(.ui-accordion-content-active)").hide()},_refresh:function(){var t,r=this.options,i=r.heightStyle,s=this.element.parent(),o=this.accordionId="ui-accordion-"+(this.element.attr("id")||++n);this.active=this._findActive(r.active).addClass("ui-accordion-header-active ui-state-active").toggleClass("ui-corner-all ui-corner-top"),this.active.next().addClass("ui-accordion-content-active").show(),this.headers.attr("role","tab").each(function(t){var n=e(this),r=n.attr("id"),i=n.next(),s=i.attr("id");r||(r=o+"-header-"+t,n.attr("id",r)),s||(s=o+"-panel-"+t,i.attr("id",s)),n.attr("aria-controls",s),i.attr("aria-labelledby",r)}).next().attr("role","tabpanel"),this.headers.not(this.active).attr({"aria-selected":"false",tabIndex:-1}).next().attr({"aria-expanded":"false","aria-hidden":"true"}).hide(),this.active.length?this.active.attr({"aria-selected":"true",tabIndex:0}).next().attr({"aria-expanded":"true","aria-hidden":"false"}):this.headers.eq(0).attr("tabIndex",0),this._createIcons(),this._setupEvents(r.event),i==="fill"?(t=s.height(),this.element.siblings(":visible").each(function(){var n=e(this),r=n.css("position");if(r==="absolute"||r==="fixed")return;t-=n.outerHeight(!0)}),this.headers.each(function(){t-=e(this).outerHeight(!0)}),this.headers.next().each(function(){e(this).height(Math.max(0,t-e(this).innerHeight()+e(this).height()))}).css("overflow","auto")):i==="auto"&&(t=0,this.headers.next().each(function(){t=Math.max(t,e(this).css("height","").height())}).height(t))},_activate:function(t){var n=this._findActive(t)[0];if(n===this.active[0])return;n=n||this.active[0],this._eventHandler({target:n,currentTarget:n,preventDefault:e.noop})},_findActive:function(t){return typeof t=="number"?this.headers.eq(t):e()},_setupEvents:function(t){var n={keydown:"_keydown"};t&&e.each(t.split(" "),function(e,t){n[t]="_eventHandler"}),this._off(this.headers.add(this.headers.next())),this._on(this.headers,n),this._on(this.headers.next(),{keydown:"_panelKeyDown"}),this._hoverable(this.headers),this._focusable(this.headers)},_eventHandler:function(t){var n=this.options,r=this.active,i=e(t.currentTarget),s=i[0]===r[0],o=s&&n.collapsible,u=o?e():i.next(),a=r.next(),f={oldHeader:r,oldPanel:a,newHeader:o?e():i,newPanel:u};t.preventDefault();if(s&&!n.collapsible||this._trigger("beforeActivate",t,f)===!1)return;n.active=o?!1:this.headers.index(i),this.active=s?e():i,this._toggle(f),r.removeClass("ui-accordion-header-active ui-state-active"),n.icons&&r.children(".ui-accordion-header-icon").removeClass(n.icons.activeHeader).addClass(n.icons.header),s||(i.removeClass("ui-corner-all").addClass("ui-accordion-header-active ui-state-active ui-corner-top"),n.icons&&i.children(".ui-accordion-header-icon").removeClass(n.icons.header).addClass(n.icons.activeHeader),i.next().addClass("ui-accordion-content-active"))},_toggle:function(t){var n=t.newPanel,r=this.prevShow.length?this.prevShow:t.oldPanel;this.prevShow.add(this.prevHide).stop(!0,!0),this.prevShow=n,this.prevHide=r,this.options.animate?this._animate(n,r,t):(r.hide(),n.show(),this._toggleComplete(t)),r.attr({"aria-expanded":"false","aria-hidden":"true"}),r.prev().attr("aria-selected","false"),n.length&&r.length?r.prev().attr("tabIndex",-1):n.length&&this.headers.filter(function(){return e(this).attr("tabIndex")===0}).attr("tabIndex",-1),n.attr({"aria-expanded":"true","aria-hidden":"false"}).prev().attr({"aria-selected":"true",tabIndex:0})},_animate:function(e,t,n){var s,o,u,a=this,f=0,l=e.length&&(!t.length||e.index()<t.index()),c=this.options.animate||{},h=l&&c.down||c,p=function(){a._toggleComplete(n)};typeof h=="number"&&(u=h),typeof h=="string"&&(o=h),o=o||h.easing||c.easing,u=u||h.duration||c.duration;if(!t.length)return e.animate(i,u,o,p);if(!e.length)return t.animate(r,u,o,p);s=e.show().outerHeight(),t.animate(r,{duration:u,easing:o,step:function(e,t){t.now=Math.round(e)}}),e.hide().animate(i,{duration:u,easing:o,complete:p,step:function(e,n){n.now=Math.round(e),n.prop!=="height"?f+=n.now:a.options.heightStyle!=="content"&&(n.now=Math.round(s-t.outerHeight()-f),f=0)}})},_toggleComplete:function(e){var t=e.oldPanel;t.removeClass("ui-accordion-content-active").prev().removeClass("ui-corner-top").addClass("ui-corner-all"),t.length&&(t.parent()[0].className=t.parent()[0].className),this._trigger("activate",null,e)}})})(jQuery);(function(e,t){var n=0;e.widget("ui.autocomplete",{version:"1.10.0",defaultElement:"<input>",options:{appendTo:null,autoFocus:!1,delay:300,minLength:1,position:{my:"left top",at:"left bottom",collision:"none"},source:null,change:null,close:null,focus:null,open:null,response:null,search:null,select:null},pending:0,_create:function(){var t,n,r;this.isMultiLine=this._isMultiLine(),this.valueMethod=this.element[this.element.is("input,textarea")?"val":"text"],this.isNewMenu=!0,this.element.addClass("ui-autocomplete-input").attr("autocomplete","off"),this._on(this.element,{keydown:function(i){if(this.element.prop("readOnly")){t=!0,r=!0,n=!0;return}t=!1,r=!1,n=!1;var s=e.ui.keyCode;switch(i.keyCode){case s.PAGE_UP:t=!0,this._move("previousPage",i);break;case s.PAGE_DOWN:t=!0,this._move("nextPage",i);break;case s.UP:t=!0,this._keyEvent("previous",i);break;case s.DOWN:t=!0,this._keyEvent("next",i);break;case s.ENTER:case s.NUMPAD_ENTER:this.menu.active&&(t=!0,i.preventDefault(),this.menu.select(i));break;case s.TAB:this.menu.active&&this.menu.select(i);break;case s.ESCAPE:this.menu.element.is(":visible")&&(this._value(this.term),this.close(i),i.preventDefault());break;default:n=!0,this._searchTimeout(i)}},keypress:function(r){if(t){t=!1,r.preventDefault();return}if(n)return;var i=e.ui.keyCode;switch(r.keyCode){case i.PAGE_UP:this._move("previousPage",r);break;case i.PAGE_DOWN:this._move("nextPage",r);break;case i.UP:this._keyEvent("previous",r);break;case i.DOWN:this._keyEvent("next",r)}},input:function(e){if(r){r=!1,e.preventDefault();return}this._searchTimeout(e)},focus:function(){this.selectedItem=null,this.previous=this._value()},blur:function(e){if(this.cancelBlur){delete this.cancelBlur;return}clearTimeout(this.searching),this.close(e),this._change(e)}}),this._initSource(),this.menu=e("<ul>").addClass("ui-autocomplete").appendTo(this._appendTo()).menu({input:e(),role:null}).zIndex(this.element.zIndex()+1).hide().data("ui-menu"),this._on(this.menu.element,{mousedown:function(t){t.preventDefault(),this.cancelBlur=!0,this._delay(function(){delete this.cancelBlur});var n=this.menu.element[0];e(t.target).closest(".ui-menu-item").length||this._delay(function(){var t=this;this.document.one("mousedown",function(r){r.target!==t.element[0]&&r.target!==n&&!e.contains(n,r.target)&&t.close()})})},menufocus:function(t,n){if(this.isNewMenu){this.isNewMenu=!1;if(t.originalEvent&&/^mouse/.test(t.originalEvent.type)){this.menu.blur(),this.document.one("mousemove",function(){e(t.target).trigger(t.originalEvent)});return}}var r=n.item.data("ui-autocomplete-item");!1!==this._trigger("focus",t,{item:r})?t.originalEvent&&/^key/.test(t.originalEvent.type)&&this._value(r.value):this.liveRegion.text(r.value)},menuselect:function(e,t){var n=t.item.data("ui-autocomplete-item"),r=this.previous;this.element[0]!==this.document[0].activeElement&&(this.element.focus(),this.previous=r,this._delay(function(){this.previous=r,this.selectedItem=n})),!1!==this._trigger("select",e,{item:n})&&this._value(n.value),this.term=this._value(),this.close(e),this.selectedItem=n}}),this.liveRegion=e("<span>",{role:"status","aria-live":"polite"}).addClass("ui-helper-hidden-accessible").insertAfter(this.element),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_destroy:function(){clearTimeout(this.searching),this.element.removeClass("ui-autocomplete-input").removeAttr("autocomplete"),this.menu.element.remove(),this.liveRegion.remove()},_setOption:function(e,t){this._super(e,t),e==="source"&&this._initSource(),e==="appendTo"&&this.menu.element.appendTo(this._appendTo()),e==="disabled"&&t&&this.xhr&&this.xhr.abort()},_appendTo:function(){var t=this.options.appendTo;return t&&(t=t.jquery||t.nodeType?e(t):this.document.find(t).eq(0)),t||(t=this.element.closest(".ui-front")),t.length||(t=this.document[0].body),t},_isMultiLine:function(){return this.element.is("textarea")?!0:this.element.is("input")?!1:this.element.prop("isContentEditable")},_initSource:function(){var t,n,r=this;e.isArray(this.options.source)?(t=this.options.source,this.source=function(n,r){r(e.ui.autocomplete.filter(t,n.term))}):typeof this.options.source=="string"?(n=this.options.source,this.source=function(t,i){r.xhr&&r.xhr.abort(),r.xhr=e.ajax({url:n,data:t,dataType:"json",success:function(e){i(e)},error:function(){i([])}})}):this.source=this.options.source},_searchTimeout:function(e){clearTimeout(this.searching),this.searching=this._delay(function(){this.term!==this._value()&&(this.selectedItem=null,this.search(null,e))},this.options.delay)},search:function(e,t){e=e!=null?e:this._value(),this.term=this._value();if(e.length<this.options.minLength)return this.close(t);if(this._trigger("search",t)===!1)return;return this._search(e)},_search:function(e){this.pending++,this.element.addClass("ui-autocomplete-loading"),this.cancelSearch=!1,this.source({term:e},this._response())},_response:function(){var e=this,t=++n;return function(r){t===n&&e.__response(r),e.pending--,e.pending||e.element.removeClass("ui-autocomplete-loading")}},__response:function(e){e&&(e=this._normalize(e)),this._trigger("response",null,{content:e}),!this.options.disabled&&e&&e.length&&!this.cancelSearch?(this._suggest(e),this._trigger("open")):this._close()},close:function(e){this.cancelSearch=!0,this._close(e)},_close:function(e){this.menu.element.is(":visible")&&(this.menu.element.hide(),this.menu.blur(),this.isNewMenu=!0,this._trigger("close",e))},_change:function(e){this.previous!==this._value()&&this._trigger("change",e,{item:this.selectedItem})},_normalize:function(t){return t.length&&t[0].label&&t[0].value?t:e.map(t,function(t){return typeof t=="string"?{label:t,value:t}:e.extend({label:t.label||t.value,value:t.value||t.label},t)})},_suggest:function(t){var n=this.menu.element.empty().zIndex(this.element.zIndex()+1);this._renderMenu(n,t),this.menu.refresh(),n.show(),this._resizeMenu(),n.position(e.extend({of:this.element},this.options.position)),this.options.autoFocus&&this.menu.next()},_resizeMenu:function(){var e=this.menu.element;e.outerWidth(Math.max(e.width("").outerWidth()+1,this.element.outerWidth()))},_renderMenu:function(t,n){var r=this;e.each(n,function(e,n){r._renderItemData(t,n)})},_renderItemData:function(e,t){return this._renderItem(e,t).data("ui-autocomplete-item",t)},_renderItem:function(t,n){return e("<li>").append(e("<a>").text(n.label)).appendTo(t)},_move:function(e,t){if(!this.menu.element.is(":visible")){this.search(null,t);return}if(this.menu.isFirstItem()&&/^previous/.test(e)||this.menu.isLastItem()&&/^next/.test(e)){this._value(this.term),this.menu.blur();return}this.menu[e](t)},widget:function(){return this.menu.element},_value:function(){return this.valueMethod.apply(this.element,arguments)},_keyEvent:function(e,t){if(!this.isMultiLine||this.menu.element.is(":visible"))this._move(e,t),t.preventDefault()}}),e.extend(e.ui.autocomplete,{escapeRegex:function(e){return e.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")},filter:function(t,n){var r=new RegExp(e.ui.autocomplete.escapeRegex(n),"i");return e.grep(t,function(e){return r.test(e.label||e.value||e)})}}),e.widget("ui.autocomplete",e.ui.autocomplete,{options:{messages:{noResults:"No search results.",results:function(e){return e+(e>1?" results are":" result is")+" available, use up and down arrow keys to navigate."}}},__response:function(e){var t;this._superApply(arguments);if(this.options.disabled||this.cancelSearch)return;e&&e.length?t=this.options.messages.results(e.length):t=this.options.messages.noResults,this.liveRegion.text(t)}})})(jQuery);(function(e,t){var n,r,i,s,o="ui-button ui-widget ui-state-default ui-corner-all",u="ui-state-hover ui-state-active ",a="ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only",f=function(){var t=e(this).find(":ui-button");setTimeout(function(){t.button("refresh")},1)},l=function(t){var n=t.name,r=t.form,i=e([]);return n&&(n=n.replace(/'/g,"\\'"),r?i=e(r).find("[name='"+n+"']"):i=e("[name='"+n+"']",t.ownerDocument).filter(function(){return!this.form})),i};e.widget("ui.button",{version:"1.10.0",defaultElement:"<button>",options:{disabled:null,text:!0,label:null,icons:{primary:null,secondary:null}},_create:function(){this.element.closest("form").unbind("reset"+this.eventNamespace).bind("reset"+this.eventNamespace,f),typeof this.options.disabled!="boolean"?this.options.disabled=!!this.element.prop("disabled"):this.element.prop("disabled",this.options.disabled),this._determineButtonType(),this.hasTitle=!!this.buttonElement.attr("title");var t=this,u=this.options,a=this.type==="checkbox"||this.type==="radio",c=a?"":"ui-state-active",h="ui-state-focus";u.label===null&&(u.label=this.type==="input"?this.buttonElement.val():this.buttonElement.html()),this._hoverable(this.buttonElement),this.buttonElement.addClass(o).attr("role","button").bind("mouseenter"+this.eventNamespace,function(){if(u.disabled)return;this===n&&e(this).addClass("ui-state-active")}).bind("mouseleave"+this.eventNamespace,function(){if(u.disabled)return;e(this).removeClass(c)}).bind("click"+this.eventNamespace,function(e){u.disabled&&(e.preventDefault(),e.stopImmediatePropagation())}),this.element.bind("focus"+this.eventNamespace,function(){t.buttonElement.addClass(h)}).bind("blur"+this.eventNamespace,function(){t.buttonElement.removeClass(h)}),a&&(this.element.bind("change"+this.eventNamespace,function(){if(s)return;t.refresh()}),this.buttonElement.bind("mousedown"+this.eventNamespace,function(e){if(u.disabled)return;s=!1,r=e.pageX,i=e.pageY}).bind("mouseup"+this.eventNamespace,function(e){if(u.disabled)return;if(r!==e.pageX||i!==e.pageY)s=!0})),this.type==="checkbox"?this.buttonElement.bind("click"+this.eventNamespace,function(){if(u.disabled||s)return!1}):this.type==="radio"?this.buttonElement.bind("click"+this.eventNamespace,function(){if(u.disabled||s)return!1;e(this).addClass("ui-state-active"),t.buttonElement.attr("aria-pressed","true");var n=t.element[0];l(n).not(n).map(function(){return e(this).button("widget")[0]}).removeClass("ui-state-active").attr("aria-pressed","false")}):(this.buttonElement.bind("mousedown"+this.eventNamespace,function(){if(u.disabled)return!1;e(this).addClass("ui-state-active"),n=this,t.document.one("mouseup",function(){n=null})}).bind("mouseup"+this.eventNamespace,function(){if(u.disabled)return!1;e(this).removeClass("ui-state-active")}).bind("keydown"+this.eventNamespace,function(t){if(u.disabled)return!1;(t.keyCode===e.ui.keyCode.SPACE||t.keyCode===e.ui.keyCode.ENTER)&&e(this).addClass("ui-state-active")}).bind("keyup"+this.eventNamespace+" blur"+this.eventNamespace,function(){e(this).removeClass("ui-state-active")}),this.buttonElement.is("a")&&this.buttonElement.keyup(function(t){t.keyCode===e.ui.keyCode.SPACE&&e(this).click()})),this._setOption("disabled",u.disabled),this._resetButton()},_determineButtonType:function(){var e,t,n;this.element.is("[type=checkbox]")?this.type="checkbox":this.element.is("[type=radio]")?this.type="radio":this.element.is("input")?this.type="input":this.type="button",this.type==="checkbox"||this.type==="radio"?(e=this.element.parents().last(),t="label[for='"+this.element.attr("id")+"']",this.buttonElement=e.find(t),this.buttonElement.length||(e=e.length?e.siblings():this.element.siblings(),this.buttonElement=e.filter(t),this.buttonElement.length||(this.buttonElement=e.find(t))),this.element.addClass("ui-helper-hidden-accessible"),n=this.element.is(":checked"),n&&this.buttonElement.addClass("ui-state-active"),this.buttonElement.prop("aria-pressed",n)):this.buttonElement=this.element},widget:function(){return this.buttonElement},_destroy:function(){this.element.removeClass("ui-helper-hidden-accessible"),this.buttonElement.removeClass(o+" "+u+" "+a).removeAttr("role").removeAttr("aria-pressed").html(this.buttonElement.find(".ui-button-text").html()),this.hasTitle||this.buttonElement.removeAttr("title")},_setOption:function(e,t){this._super(e,t);if(e==="disabled"){t?this.element.prop("disabled",!0):this.element.prop("disabled",!1);return}this._resetButton()},refresh:function(){var t=this.element.is("input, button")?this.element.is(":disabled"):this.element.hasClass("ui-button-disabled");t!==this.options.disabled&&this._setOption("disabled",t),this.type==="radio"?l(this.element[0]).each(function(){e(this).is(":checked")?e(this).button("widget").addClass("ui-state-active").attr("aria-pressed","true"):e(this).button("widget").removeClass("ui-state-active").attr("aria-pressed","false")}):this.type==="checkbox"&&(this.element.is(":checked")?this.buttonElement.addClass("ui-state-active").attr("aria-pressed","true"):this.buttonElement.removeClass("ui-state-active").attr("aria-pressed","false"))},_resetButton:function(){if(this.type==="input"){this.options.label&&this.element.val(this.options.label);return}var t=this.buttonElement.removeClass(a),n=e("<span></span>",this.document[0]).addClass("ui-button-text").html(this.options.label).appendTo(t.empty()).text(),r=this.options.icons,i=r.primary&&r.secondary,s=[];r.primary||r.secondary?(this.options.text&&s.push("ui-button-text-icon"+(i?"s":r.primary?"-primary":"-secondary")),r.primary&&t.prepend("<span class='ui-button-icon-primary ui-icon "+r.primary+"'></span>"),r.secondary&&t.append("<span class='ui-button-icon-secondary ui-icon "+r.secondary+"'></span>"),this.options.text||(s.push(i?"ui-button-icons-only":"ui-button-icon-only"),this.hasTitle||t.attr("title",e.trim(n)))):s.push("ui-button-text-only"),t.addClass(s.join(" "))}}),e.widget("ui.buttonset",{version:"1.10.0",options:{items:"button, input[type=button], input[type=submit], input[type=reset], input[type=checkbox], input[type=radio], a, :data(ui-button)"},_create:function(){this.element.addClass("ui-buttonset")},_init:function(){this.refresh()},_setOption:function(e,t){e==="disabled"&&this.buttons.button("option",e,t),this._super(e,t)},refresh:function(){var t=this.element.css("direction")==="rtl";this.buttons=this.element.find(this.options.items).filter(":ui-button").button("refresh").end().not(":ui-button").button().end().map(function(){return e(this).button("widget")[0]}).removeClass("ui-corner-all ui-corner-left ui-corner-right").filter(":first").addClass(t?"ui-corner-right":"ui-corner-left").end().filter(":last").addClass(t?"ui-corner-left":"ui-corner-right").end().end()},_destroy:function(){this.element.removeClass("ui-buttonset"),this.buttons.map(function(){return e(this).button("widget")[0]}).removeClass("ui-corner-left ui-corner-right").end().button("destroy")}})})(jQuery);(function(e,t){function s(){this._curInst=null,this._keyEvent=!1,this._disabledInputs=[],this._datepickerShowing=!1,this._inDialog=!1,this._mainDivId="ui-datepicker-div",this._inlineClass="ui-datepicker-inline",this._appendClass="ui-datepicker-append",this._triggerClass="ui-datepicker-trigger",this._dialogClass="ui-datepicker-dialog",this._disableClass="ui-datepicker-disabled",this._unselectableClass="ui-datepicker-unselectable",this._currentClass="ui-datepicker-current-day",this._dayOverClass="ui-datepicker-days-cell-over",this.regional=[],this.regional[""]={closeText:"Done",prevText:"Prev",nextText:"Next",currentText:"Today",monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayNamesMin:["Su","Mo","Tu","We","Th","Fr","Sa"],weekHeader:"Wk",dateFormat:"mm/dd/yy",firstDay:0,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""},this._defaults={showOn:"focus",showAnim:"fadeIn",showOptions:{},defaultDate:null,appendText:"",buttonText:"...",buttonImage:"",buttonImageOnly:!1,hideIfNoPrevNext:!1,navigationAsDateFormat:!1,gotoCurrent:!1,changeMonth:!1,changeYear:!1,yearRange:"c-10:c+10",showOtherMonths:!1,selectOtherMonths:!1,showWeek:!1,calculateWeek:this.iso8601Week,shortYearCutoff:"+10",minDate:null,maxDate:null,duration:"fast",beforeShowDay:null,beforeShow:null,onSelect:null,onChangeMonthYear:null,onClose:null,numberOfMonths:1,showCurrentAtPos:0,stepMonths:1,stepBigMonths:12,altField:"",altFormat:"",constrainInput:!0,showButtonPanel:!1,autoSize:!1,disabled:!1},e.extend(this._defaults,this.regional[""]),this.dpDiv=o(e("<div id='"+this._mainDivId+"' class='ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>"))}function o(t){var n="button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a";return t.delegate(n,"mouseout",function(){e(this).removeClass("ui-state-hover"),this.className.indexOf("ui-datepicker-prev")!==-1&&e(this).removeClass("ui-datepicker-prev-hover"),this.className.indexOf("ui-datepicker-next")!==-1&&e(this).removeClass("ui-datepicker-next-hover")}).delegate(n,"mouseover",function(){e.datepicker._isDisabledDatepicker(i.inline?t.parent()[0]:i.input[0])||(e(this).parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover"),e(this).addClass("ui-state-hover"),this.className.indexOf("ui-datepicker-prev")!==-1&&e(this).addClass("ui-datepicker-prev-hover"),this.className.indexOf("ui-datepicker-next")!==-1&&e(this).addClass("ui-datepicker-next-hover"))})}function u(t,n){e.extend(t,n);for(var r in n)n[r]==null&&(t[r]=n[r]);return t}e.extend(e.ui,{datepicker:{version:"1.10.0"}});var n="datepicker",r=(new Date).getTime(),i;e.extend(s.prototype,{markerClassName:"hasDatepicker",maxRows:4,_widgetDatepicker:function(){return this.dpDiv},setDefaults:function(e){return u(this._defaults,e||{}),this},_attachDatepicker:function(t,n){var r,i,s;r=t.nodeName.toLowerCase(),i=r==="div"||r==="span",t.id||(this.uuid+=1,t.id="dp"+this.uuid),s=this._newInst(e(t),i),s.settings=e.extend({},n||{}),r==="input"?this._connectDatepicker(t,s):i&&this._inlineDatepicker(t,s)},_newInst:function(t,n){var r=t[0].id.replace(/([^A-Za-z0-9_\-])/g,"\\\\$1");return{id:r,input:t,selectedDay:0,selectedMonth:0,selectedYear:0,drawMonth:0,drawYear:0,inline:n,dpDiv:n?o(e("<div class='"+this._inlineClass+" ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>")):this.dpDiv}},_connectDatepicker:function(t,r){var i=e(t);r.append=e([]),r.trigger=e([]);if(i.hasClass(this.markerClassName))return;this._attachments(i,r),i.addClass(this.markerClassName).keydown(this._doKeyDown).keypress(this._doKeyPress).keyup(this._doKeyUp),this._autoSize(r),e.data(t,n,r),r.settings.disabled&&this._disableDatepicker(t)},_attachments:function(t,n){var r,i,s,o=this._get(n,"appendText"),u=this._get(n,"isRTL");n.append&&n.append.remove(),o&&(n.append=e("<span class='"+this._appendClass+"'>"+o+"</span>"),t[u?"before":"after"](n.append)),t.unbind("focus",this._showDatepicker),n.trigger&&n.trigger.remove(),r=this._get(n,"showOn"),(r==="focus"||r==="both")&&t.focus(this._showDatepicker);if(r==="button"||r==="both")i=this._get(n,"buttonText"),s=this._get(n,"buttonImage"),n.trigger=e(this._get(n,"buttonImageOnly")?e("<img/>").addClass(this._triggerClass).attr({src:s,alt:i,title:i}):e("<button type='button'></button>").addClass(this._triggerClass).html(s?e("<img/>").attr({src:s,alt:i,title:i}):i)),t[u?"before":"after"](n.trigger),n.trigger.click(function(){return e.datepicker._datepickerShowing&&e.datepicker._lastInput===t[0]?e.datepicker._hideDatepicker():e.datepicker._datepickerShowing&&e.datepicker._lastInput!==t[0]?(e.datepicker._hideDatepicker(),e.datepicker._showDatepicker(t[0])):e.datepicker._showDatepicker(t[0]),!1})},_autoSize:function(e){if(this._get(e,"autoSize")&&!e.inline){var t,n,r,i,s=new Date(2009,11,20),o=this._get(e,"dateFormat");o.match(/[DM]/)&&(t=function(e){n=0,r=0;for(i=0;i<e.length;i++)e[i].length>n&&(n=e[i].length,r=i);return r},s.setMonth(t(this._get(e,o.match(/MM/)?"monthNames":"monthNamesShort"))),s.setDate(t(this._get(e,o.match(/DD/)?"dayNames":"dayNamesShort"))+20-s.getDay())),e.input.attr("size",this._formatDate(e,s).length)}},_inlineDatepicker:function(t,r){var i=e(t);if(i.hasClass(this.markerClassName))return;i.addClass(this.markerClassName).append(r.dpDiv),e.data(t,n,r),this._setDate(r,this._getDefaultDate(r),!0),this._updateDatepicker(r),this._updateAlternate(r),r.settings.disabled&&this._disableDatepicker(t),r.dpDiv.css("display","block")},_dialogDatepicker:function(t,r,i,s,o){var a,f,l,c,h,p=this._dialogInst;return p||(this.uuid+=1,a="dp"+this.uuid,this._dialogInput=e("<input type='text' id='"+a+"' style='position: absolute; top: -100px; width: 0px;'/>"),this._dialogInput.keydown(this._doKeyDown),e("body").append(this._dialogInput),p=this._dialogInst=this._newInst(this._dialogInput,!1),p.settings={},e.data(this._dialogInput[0],n,p)),u(p.settings,s||{}),r=r&&r.constructor===Date?this._formatDate(p,r):r,this._dialogInput.val(r),this._pos=o?o.length?o:[o.pageX,o.pageY]:null,this._pos||(f=document.documentElement.clientWidth,l=document.documentElement.clientHeight,c=document.documentElement.scrollLeft||document.body.scrollLeft,h=document.documentElement.scrollTop||document.body.scrollTop,this._pos=[f/2-100+c,l/2-150+h]),this._dialogInput.css("left",this._pos[0]+20+"px").css("top",this._pos[1]+"px"),p.settings.onSelect=i,this._inDialog=!0,this.dpDiv.addClass(this._dialogClass),this._showDatepicker(this._dialogInput[0]),e.blockUI&&e.blockUI(this.dpDiv),e.data(this._dialogInput[0],n,p),this},_destroyDatepicker:function(t){var r,i=e(t),s=e.data(t,n);if(!i.hasClass(this.markerClassName))return;r=t.nodeName.toLowerCase(),e.removeData(t,n),r==="input"?(s.append.remove(),s.trigger.remove(),i.removeClass(this.markerClassName).unbind("focus",this._showDatepicker).unbind("keydown",this._doKeyDown).unbind("keypress",this._doKeyPress).unbind("keyup",this._doKeyUp)):(r==="div"||r==="span")&&i.removeClass(this.markerClassName).empty()},_enableDatepicker:function(t){var r,i,s=e(t),o=e.data(t,n);if(!s.hasClass(this.markerClassName))return;r=t.nodeName.toLowerCase();if(r==="input")t.disabled=!1,o.trigger.filter("button").each(function(){this.disabled=!1}).end().filter("img").css({opacity:"1.0",cursor:""});else if(r==="div"||r==="span")i=s.children("."+this._inlineClass),i.children().removeClass("ui-state-disabled"),i.find("select.ui-datepicker-month, select.ui-datepicker-year").prop("disabled",!1);this._disabledInputs=e.map(this._disabledInputs,function(e){return e===t?null:e})},_disableDatepicker:function(t){var r,i,s=e(t),o=e.data(t,n);if(!s.hasClass(this.markerClassName))return;r=t.nodeName.toLowerCase();if(r==="input")t.disabled=!0,o.trigger.filter("button").each(function(){this.disabled=!0}).end().filter("img").css({opacity:"0.5",cursor:"default"});else if(r==="div"||r==="span")i=s.children("."+this._inlineClass),i.children().addClass("ui-state-disabled"),i.find("select.ui-datepicker-month, select.ui-datepicker-year").prop("disabled",!0);this._disabledInputs=e.map(this._disabledInputs,function(e){return e===t?null:e}),this._disabledInputs[this._disabledInputs.length]=t},_isDisabledDatepicker:function(e){if(!e)return!1;for(var t=0;t<this._disabledInputs.length;t++)if(this._disabledInputs[t]===e)return!0;return!1},_getInst:function(t){try{return e.data(t,n)}catch(r){throw"Missing instance data for this datepicker"}},_optionDatepicker:function(n,r,i){var s,o,a,f,l=this._getInst(n);if(arguments.length===2&&typeof r=="string")return r==="defaults"?e.extend({},e.datepicker._defaults):l?r==="all"?e.extend({},l.settings):this._get(l,r):null;s=r||{},typeof r=="string"&&(s={},s[r]=i),l&&(this._curInst===l&&this._hideDatepicker(),o=this._getDateDatepicker(n,!0),a=this._getMinMaxDate(l,"min"),f=this._getMinMaxDate(l,"max"),u(l.settings,s),a!==null&&s.dateFormat!==t&&s.minDate===t&&(l.settings.minDate=this._formatDate(l,a)),f!==null&&s.dateFormat!==t&&s.maxDate===t&&(l.settings.maxDate=this._formatDate(l,f)),"disabled"in s&&(s.disabled?this._disableDatepicker(n):this._enableDatepicker(n)),this._attachments(e(n),l),this._autoSize(l),this._setDate(l,o),this._updateAlternate(l),this._updateDatepicker(l))},_changeDatepicker:function(e,t,n){this._optionDatepicker(e,t,n)},_refreshDatepicker:function(e){var t=this._getInst(e);t&&this._updateDatepicker(t)},_setDateDatepicker:function(e,t){var n=this._getInst(e);n&&(this._setDate(n,t),this._updateDatepicker(n),this._updateAlternate(n))},_getDateDatepicker:function(e,t){var n=this._getInst(e);return n&&!n.inline&&this._setDateFromField(n,t),n?this._getDate(n):null},_doKeyDown:function(t){var n,r,i,s=e.datepicker._getInst(t.target),o=!0,u=s.dpDiv.is(".ui-datepicker-rtl");s._keyEvent=!0;if(e.datepicker._datepickerShowing)switch(t.keyCode){case 9:e.datepicker._hideDatepicker(),o=!1;break;case 13:return i=e("td."+e.datepicker._dayOverClass+":not(."+e.datepicker._currentClass+")",s.dpDiv),i[0]&&e.datepicker._selectDay(t.target,s.selectedMonth,s.selectedYear,i[0]),n=e.datepicker._get(s,"onSelect"),n?(r=e.datepicker._formatDate(s),n.apply(s.input?s.input[0]:null,[r,s])):e.datepicker._hideDatepicker(),!1;case 27:e.datepicker._hideDatepicker();break;case 33:e.datepicker._adjustDate(t.target,t.ctrlKey?-e.datepicker._get(s,"stepBigMonths"):-e.datepicker._get(s,"stepMonths"),"M");break;case 34:e.datepicker._adjustDate(t.target,t.ctrlKey?+e.datepicker._get(s,"stepBigMonths"):+e.datepicker._get(s,"stepMonths"),"M");break;case 35:(t.ctrlKey||t.metaKey)&&e.datepicker._clearDate(t.target),o=t.ctrlKey||t.metaKey;break;case 36:(t.ctrlKey||t.metaKey)&&e.datepicker._gotoToday(t.target),o=t.ctrlKey||t.metaKey;break;case 37:(t.ctrlKey||t.metaKey)&&e.datepicker._adjustDate(t.target,u?1:-1,"D"),o=t.ctrlKey||t.metaKey,t.originalEvent.altKey&&e.datepicker._adjustDate(t.target,t.ctrlKey?-e.datepicker._get(s,"stepBigMonths"):-e.datepicker._get(s,"stepMonths"),"M");break;case 38:(t.ctrlKey||t.metaKey)&&e.datepicker._adjustDate(t.target,-7,"D"),o=t.ctrlKey||t.metaKey;break;case 39:(t.ctrlKey||t.metaKey)&&e.datepicker._adjustDate(t.target,u?-1:1,"D"),o=t.ctrlKey||t.metaKey,t.originalEvent.altKey&&e.datepicker._adjustDate(t.target,t.ctrlKey?+e.datepicker._get(s,"stepBigMonths"):+e.datepicker._get(s,"stepMonths"),"M");break;case 40:(t.ctrlKey||t.metaKey)&&e.datepicker._adjustDate(t.target,7,"D"),o=t.ctrlKey||t.metaKey;break;default:o=!1}else t.keyCode===36&&t.ctrlKey?e.datepicker._showDatepicker(this):o=!1;o&&(t.preventDefault(),t.stopPropagation())},_doKeyPress:function(t){var n,r,i=e.datepicker._getInst(t.target);if(e.datepicker._get(i,"constrainInput"))return n=e.datepicker._possibleChars(e.datepicker._get(i,"dateFormat")),r=String.fromCharCode(t.charCode==null?t.keyCode:t.charCode),t.ctrlKey||t.metaKey||r<" "||!n||n.indexOf(r)>-1},_doKeyUp:function(t){var n,r=e.datepicker._getInst(t.target);if(r.input.val()!==r.lastVal)try{n=e.datepicker.parseDate(e.datepicker._get(r,"dateFormat"),r.input?r.input.val():null,e.datepicker._getFormatConfig(r)),n&&(e.datepicker._setDateFromField(r),e.datepicker._updateAlternate(r),e.datepicker._updateDatepicker(r))}catch(i){}return!0},_showDatepicker:function(t){t=t.target||t,t.nodeName.toLowerCase()!=="input"&&(t=e("input",t.parentNode)[0]);if(e.datepicker._isDisabledDatepicker(t)||e.datepicker._lastInput===t)return;var n,r,i,s,o,a,f;n=e.datepicker._getInst(t),e.datepicker._curInst&&e.datepicker._curInst!==n&&(e.datepicker._curInst.dpDiv.stop(!0,!0),n&&e.datepicker._datepickerShowing&&e.datepicker._hideDatepicker(e.datepicker._curInst.input[0])),r=e.datepicker._get(n,"beforeShow"),i=r?r.apply(t,[t,n]):{};if(i===!1)return;u(n.settings,i),n.lastVal=null,e.datepicker._lastInput=t,e.datepicker._setDateFromField(n),e.datepicker._inDialog&&(t.value=""),e.datepicker._pos||(e.datepicker._pos=e.datepicker._findPos(t),e.datepicker._pos[1]+=t.offsetHeight),s=!1,e(t).parents().each(function(){return s|=e(this).css("position")==="fixed",!s}),o={left:e.datepicker._pos[0],top:e.datepicker._pos[1]},e.datepicker._pos=null,n.dpDiv.empty(),n.dpDiv.css({position:"absolute",display:"block",top:"-1000px"}),e.datepicker._updateDatepicker(n),o=e.datepicker._checkOffset(n,o,s),n.dpDiv.css({position:e.datepicker._inDialog&&e.blockUI?"static":s?"fixed":"absolute",display:"none",left:o.left+"px",top:o.top+"px"}),n.inline||(a=e.datepicker._get(n,"showAnim"),f=e.datepicker._get(n,"duration"),n.dpDiv.zIndex(e(t).zIndex()+1),e.datepicker._datepickerShowing=!0,e.effects&&e.effects.effect[a]?n.dpDiv.show(a,e.datepicker._get(n,"showOptions"),f):n.dpDiv[a||"show"](a?f:null),n.input.is(":visible")&&!n.input.is(":disabled")&&n.input.focus(),e.datepicker._curInst=n)},_updateDatepicker:function(t){this.maxRows=4,i=t,t.dpDiv.empty().append(this._generateHTML(t)),this._attachHandlers(t),t.dpDiv.find("."+this._dayOverClass+" a").mouseover();var n,r=this._getNumberOfMonths(t),s=r[1],o=17;t.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width(""),s>1&&t.dpDiv.addClass("ui-datepicker-multi-"+s).css("width",o*s+"em"),t.dpDiv[(r[0]!==1||r[1]!==1?"add":"remove")+"Class"]("ui-datepicker-multi"),t.dpDiv[(this._get(t,"isRTL")?"add":"remove")+"Class"]("ui-datepicker-rtl"),t===e.datepicker._curInst&&e.datepicker._datepickerShowing&&t.input&&t.input.is(":visible")&&!t.input.is(":disabled")&&t.input[0]!==document.activeElement&&t.input.focus(),t.yearshtml&&(n=t.yearshtml,setTimeout(function(){n===t.yearshtml&&t.yearshtml&&t.dpDiv.find("select.ui-datepicker-year:first").replaceWith(t.yearshtml),n=t.yearshtml=null},0))},_getBorders:function(e){var t=function(e){return{thin:1,medium:2,thick:3}[e]||e};return[parseFloat(t(e.css("border-left-width"))),parseFloat(t(e.css("border-top-width")))]},_checkOffset:function(t,n,r){var i=t.dpDiv.outerWidth(),s=t.dpDiv.outerHeight(),o=t.input?t.input.outerWidth():0,u=t.input?t.input.outerHeight():0,a=document.documentElement.clientWidth+(r?0:e(document).scrollLeft()),f=document.documentElement.clientHeight+(r?0:e(document).scrollTop());return n.left-=this._get(t,"isRTL")?i-o:0,n.left-=r&&n.left===t.input.offset().left?e(document).scrollLeft():0,n.top-=r&&n.top===t.input.offset().top+u?e(document).scrollTop():0,n.left-=Math.min(n.left,n.left+i>a&&a>i?Math.abs(n.left+i-a):0),n.top-=Math.min(n.top,n.top+s>f&&f>s?Math.abs(s+u):0),n},_findPos:function(t){var n,r=this._getInst(t),i=this._get(r,"isRTL");while(t&&(t.type==="hidden"||t.nodeType!==1||e.expr.filters.hidden(t)))t=t[i?"previousSibling":"nextSibling"];return n=e(t).offset(),[n.left,n.top]},_hideDatepicker:function(t){var r,i,s,o,u=this._curInst;if(!u||t&&u!==e.data(t,n))return;this._datepickerShowing&&(r=this._get(u,"showAnim"),i=this._get(u,"duration"),s=function(){e.datepicker._tidyDialog(u)},e.effects&&(e.effects.effect[r]||e.effects[r])?u.dpDiv.hide(r,e.datepicker._get(u,"showOptions"),i,s):u.dpDiv[r==="slideDown"?"slideUp":r==="fadeIn"?"fadeOut":"hide"](r?i:null,s),r||s(),this._datepickerShowing=!1,o=this._get(u,"onClose"),o&&o.apply(u.input?u.input[0]:null,[u.input?u.input.val():"",u]),this._lastInput=null,this._inDialog&&(this._dialogInput.css({position:"absolute",left:"0",top:"-100px"}),e.blockUI&&(e.unblockUI(),e("body").append(this.dpDiv))),this._inDialog=!1)},_tidyDialog:function(e){e.dpDiv.removeClass(this._dialogClass).unbind(".ui-datepicker-calendar")},_checkExternalClick:function(t){if(!e.datepicker._curInst)return;var n=e(t.target),r=e.datepicker._getInst(n[0]);(n[0].id!==e.datepicker._mainDivId&&n.parents("#"+e.datepicker._mainDivId).length===0&&!n.hasClass(e.datepicker.markerClassName)&&!n.closest("."+e.datepicker._triggerClass).length&&e.datepicker._datepickerShowing&&(!e.datepicker._inDialog||!e.blockUI)||n.hasClass(e.datepicker.markerClassName)&&e.datepicker._curInst!==r)&&e.datepicker._hideDatepicker()},_adjustDate:function(t,n,r){var i=e(t),s=this._getInst(i[0]);if(this._isDisabledDatepicker(i[0]))return;this._adjustInstDate(s,n+(r==="M"?this._get(s,"showCurrentAtPos"):0),r),this._updateDatepicker(s)},_gotoToday:function(t){var n,r=e(t),i=this._getInst(r[0]);this._get(i,"gotoCurrent")&&i.currentDay?(i.selectedDay=i.currentDay,i.drawMonth=i.selectedMonth=i.currentMonth,i.drawYear=i.selectedYear=i.currentYear):(n=new Date,i.selectedDay=n.getDate(),i.drawMonth=i.selectedMonth=n.getMonth(),i.drawYear=i.selectedYear=n.getFullYear()),this._notifyChange(i),this._adjustDate(r)},_selectMonthYear:function(t,n,r){var i=e(t),s=this._getInst(i[0]);s["selected"+(r==="M"?"Month":"Year")]=s["draw"+(r==="M"?"Month":"Year")]=parseInt(n.options[n.selectedIndex].value,10),this._notifyChange(s),this._adjustDate(i)},_selectDay:function(t,n,r,i){var s,o=e(t);if(e(i).hasClass(this._unselectableClass)||this._isDisabledDatepicker(o[0]))return;s=this._getInst(o[0]),s.selectedDay=s.currentDay=e("a",i).html(),s.selectedMonth=s.currentMonth=n,s.selectedYear=s.currentYear=r,this._selectDate(t,this._formatDate(s,s.currentDay,s.currentMonth,s.currentYear))},_clearDate:function(t){var n=e(t);this._selectDate(n,"")},_selectDate:function(t,n){var r,i=e(t),s=this._getInst(i[0]);n=n!=null?n:this._formatDate(s),s.input&&s.input.val(n),this._updateAlternate(s),r=this._get(s,"onSelect"),r?r.apply(s.input?s.input[0]:null,[n,s]):s.input&&s.input.trigger("change"),s.inline?this._updateDatepicker(s):(this._hideDatepicker(),this._lastInput=s.input[0],typeof s.input[0]!="object"&&s.input.focus(),this._lastInput=null)},_updateAlternate:function(t){var n,r,i,s=this._get(t,"altField");s&&(n=this._get(t,"altFormat")||this._get(t,"dateFormat"),r=this._getDate(t),i=this.formatDate(n,r,this._getFormatConfig(t)),e(s).each(function(){e(this).val(i)}))},noWeekends:function(e){var t=e.getDay();return[t>0&&t<6,""]},iso8601Week:function(e){var t,n=new Date(e.getTime());return n.setDate(n.getDate()+4-(n.getDay()||7)),t=n.getTime(),n.setMonth(0),n.setDate(1),Math.floor(Math.round((t-n)/864e5)/7)+1},parseDate:function(t,n,r){if(t==null||n==null)throw"Invalid arguments";n=typeof n=="object"?n.toString():n+"";if(n==="")return null;var i,s,o,u=0,a=(r?r.shortYearCutoff:null)||this._defaults.shortYearCutoff,f=typeof a!="string"?a:(new Date).getFullYear()%100+parseInt(a,10),l=(r?r.dayNamesShort:null)||this._defaults.dayNamesShort,c=(r?r.dayNames:null)||this._defaults.dayNames,h=(r?r.monthNamesShort:null)||this._defaults.monthNamesShort,p=(r?r.monthNames:null)||this._defaults.monthNames,d=-1,v=-1,m=-1,g=-1,y=!1,b,w=function(e){var n=i+1<t.length&&t.charAt(i+1)===e;return n&&i++,n},E=function(e){var t=w(e),r=e==="@"?14:e==="!"?20:e==="y"&&t?4:e==="o"?3:2,i=new RegExp("^\\d{1,"+r+"}"),s=n.substring(u).match(i);if(!s)throw"Missing number at position "+u;return u+=s[0].length,parseInt(s[0],10)},S=function(t,r,i){var s=-1,o=e.map(w(t)?i:r,function(e,t){return[[t,e]]}).sort(function(e,t){return-(e[1].length-t[1].length)});e.each(o,function(e,t){var r=t[1];if(n.substr(u,r.length).toLowerCase()===r.toLowerCase())return s=t[0],u+=r.length,!1});if(s!==-1)return s+1;throw"Unknown name at position "+u},x=function(){if(n.charAt(u)!==t.charAt(i))throw"Unexpected literal at position "+u;u++};for(i=0;i<t.length;i++)if(y)t.charAt(i)==="'"&&!w("'")?y=!1:x();else switch(t.charAt(i)){case"d":m=E("d");break;case"D":S("D",l,c);break;case"o":g=E("o");break;case"m":v=E("m");break;case"M":v=S("M",h,p);break;case"y":d=E("y");break;case"@":b=new Date(E("@")),d=b.getFullYear(),v=b.getMonth()+1,m=b.getDate();break;case"!":b=new Date((E("!")-this._ticksTo1970)/1e4),d=b.getFullYear(),v=b.getMonth()+1,m=b.getDate();break;case"'":w("'")?x():y=!0;break;default:x()}if(u<n.length){o=n.substr(u);if(!/^\s+/.test(o))throw"Extra/unparsed characters found in date: "+o}d===-1?d=(new Date).getFullYear():d<100&&(d+=(new Date).getFullYear()-(new Date).getFullYear()%100+(d<=f?0:-100));if(g>-1){v=1,m=g;do{s=this._getDaysInMonth(d,v-1);if(m<=s)break;v++,m-=s}while(!0)}b=this._daylightSavingAdjust(new Date(d,v-1,m));if(b.getFullYear()!==d||b.getMonth()+1!==v||b.getDate()!==m)throw"Invalid date";return b},ATOM:"yy-mm-dd",COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd",RFC_822:"D, d M y",RFC_850:"DD, dd-M-y",RFC_1036:"D, d M y",RFC_1123:"D, d M yy",RFC_2822:"D, d M yy",RSS:"D, d M y",TICKS:"!",TIMESTAMP:"@",W3C:"yy-mm-dd",_ticksTo1970:(718685+Math.floor(492.5)-Math.floor(19.7)+Math.floor(4.925))*24*60*60*1e7,formatDate:function(e,t,n){if(!t)return"";var r,i=(n?n.dayNamesShort:null)||this._defaults.dayNamesShort,s=(n?n.dayNames:null)||this._defaults.dayNames,o=(n?n.monthNamesShort:null)||this._defaults.monthNamesShort,u=(n?n.monthNames:null)||this._defaults.monthNames,a=function(t){var n=r+1<e.length&&e.charAt(r+1)===t;return n&&r++,n},f=function(e,t,n){var r=""+t;if(a(e))while(r.length<n)r="0"+r;return r},l=function(e,t,n,r){return a(e)?r[t]:n[t]},c="",h=!1;if(t)for(r=0;r<e.length;r++)if(h)e.charAt(r)==="'"&&!a("'")?h=!1:c+=e.charAt(r);else switch(e.charAt(r)){case"d":c+=f("d",t.getDate(),2);break;case"D":c+=l("D",t.getDay(),i,s);break;case"o":c+=f("o",Math.round(((new Date(t.getFullYear(),t.getMonth(),t.getDate())).getTime()-(new Date(t.getFullYear(),0,0)).getTime())/864e5),3);break;case"m":c+=f("m",t.getMonth()+1,2);break;case"M":c+=l("M",t.getMonth(),o,u);break;case"y":c+=a("y")?t.getFullYear():(t.getYear()%100<10?"0":"")+t.getYear()%100;break;case"@":c+=t.getTime();break;case"!":c+=t.getTime()*1e4+this._ticksTo1970;break;case"'":a("'")?c+="'":h=!0;break;default:c+=e.charAt(r)}return c},_possibleChars:function(e){var t,n="",r=!1,i=function(n){var r=t+1<e.length&&e.charAt(t+1)===n;return r&&t++,r};for(t=0;t<e.length;t++)if(r)e.charAt(t)==="'"&&!i("'")?r=!1:n+=e.charAt(t);else switch(e.charAt(t)){case"d":case"m":case"y":case"@":n+="0123456789";break;case"D":case"M":return null;case"'":i("'")?n+="'":r=!0;break;default:n+=e.charAt(t)}return n},_get:function(e,n){return e.settings[n]!==t?e.settings[n]:this._defaults[n]},_setDateFromField:function(e,t){if(e.input.val()===e.lastVal)return;var n=this._get(e,"dateFormat"),r=e.lastVal=e.input?e.input.val():null,i=this._getDefaultDate(e),s=i,o=this._getFormatConfig(e);try{s=this.parseDate(n,r,o)||i}catch(u){r=t?"":r}e.selectedDay=s.getDate(),e.drawMonth=e.selectedMonth=s.getMonth(),e.drawYear=e.selectedYear=s.getFullYear(),e.currentDay=r?s.getDate():0,e.currentMonth=r?s.getMonth():0,e.currentYear=r?s.getFullYear():0,this._adjustInstDate(e)},_getDefaultDate:function(e){return this._restrictMinMax(e,this._determineDate(e,this._get(e,"defaultDate"),new Date))},_determineDate:function(t,n,r){var i=function(e){var t=new Date;return t.setDate(t.getDate()+e),t},s=function(n){try{return e.datepicker.parseDate(e.datepicker._get(t,"dateFormat"),n,e.datepicker._getFormatConfig(t))}catch(r){}var i=(n.toLowerCase().match(/^c/)?e.datepicker._getDate(t):null)||new Date,s=i.getFullYear(),o=i.getMonth(),u=i.getDate(),a=/([+\-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g,f=a.exec(n);while(f){switch(f[2]||"d"){case"d":case"D":u+=parseInt(f[1],10);break;case"w":case"W":u+=parseInt(f[1],10)*7;break;case"m":case"M":o+=parseInt(f[1],10),u=Math.min(u,e.datepicker._getDaysInMonth(s,o));break;case"y":case"Y":s+=parseInt(f[1],10),u=Math.min(u,e.datepicker._getDaysInMonth(s,o))}f=a.exec(n)}return new Date(s,o,u)},o=n==null||n===""?r:typeof n=="string"?s(n):typeof n=="number"?isNaN(n)?r:i(n):new Date(n.getTime());return o=o&&o.toString()==="Invalid Date"?r:o,o&&(o.setHours(0),o.setMinutes(0),o.setSeconds(0),o.setMilliseconds(0)),this._daylightSavingAdjust(o)},_daylightSavingAdjust:function(e){return e?(e.setHours(e.getHours()>12?e.getHours()+2:0),e):null},_setDate:function(e,t,n){var r=!t,i=e.selectedMonth,s=e.selectedYear,o=this._restrictMinMax(e,this._determineDate(e,t,new Date));e.selectedDay=e.currentDay=o.getDate(),e.drawMonth=e.selectedMonth=e.currentMonth=o.getMonth(),e.drawYear=e.selectedYear=e.currentYear=o.getFullYear(),(i!==e.selectedMonth||s!==e.selectedYear)&&!n&&this._notifyChange(e),this._adjustInstDate(e),e.input&&e.input.val(r?"":this._formatDate(e))},_getDate:function(e){var t=!e.currentYear||e.input&&e.input.val()===""?null:this._daylightSavingAdjust(new Date(e.currentYear,e.currentMonth,e.currentDay));return t},_attachHandlers:function(t){var n=this._get(t,"stepMonths"),i="#"+t.id.replace(/\\\\/g,"\\");t.dpDiv.find("[data-handler]").map(function(){var t={prev:function(){window["DP_jQuery_"+r].datepicker._adjustDate(i,-n,"M")},next:function(){window["DP_jQuery_"+r].datepicker._adjustDate(i,+n,"M")},hide:function(){window["DP_jQuery_"+r].datepicker._hideDatepicker()},today:function(){window["DP_jQuery_"+r].datepicker._gotoToday(i)},selectDay:function(){return window["DP_jQuery_"+r].datepicker._selectDay(i,+this.getAttribute("data-month"),+this.getAttribute("data-year"),this),!1},selectMonth:function(){return window["DP_jQuery_"+r].datepicker._selectMonthYear(i,this,"M"),!1},selectYear:function(){return window["DP_jQuery_"+r].datepicker._selectMonthYear(i,this,"Y"),!1}};e(this).bind(this.getAttribute("data-event"),t[this.getAttribute("data-handler")])})},_generateHTML:function(e){var t,n,r,i,s,o,u,a,f,l,c,h,p,d,v,m,g,y,b,w,E,S,x,T,N,C,k,L,A,O,M,_,D,P,H,B,j,F,I,q=new Date,R=this._daylightSavingAdjust(new Date(q.getFullYear(),q.getMonth(),q.getDate())),U=this._get(e,"isRTL"),z=this._get(e,"showButtonPanel"),W=this._get(e,"hideIfNoPrevNext"),X=this._get(e,"navigationAsDateFormat"),V=this._getNumberOfMonths(e),$=this._get(e,"showCurrentAtPos"),J=this._get(e,"stepMonths"),K=V[0]!==1||V[1]!==1,Q=this._daylightSavingAdjust(e.currentDay?new Date(e.currentYear,e.currentMonth,e.currentDay):new Date(9999,9,9)),G=this._getMinMaxDate(e,"min"),Y=this._getMinMaxDate(e,"max"),Z=e.drawMonth-$,et=e.drawYear;Z<0&&(Z+=12,et--);if(Y){t=this._daylightSavingAdjust(new Date(Y.getFullYear(),Y.getMonth()-V[0]*V[1]+1,Y.getDate())),t=G&&t<G?G:t;while(this._daylightSavingAdjust(new Date(et,Z,1))>t)Z--,Z<0&&(Z=11,et--)}e.drawMonth=Z,e.drawYear=et,n=this._get(e,"prevText"),n=X?this.formatDate(n,this._daylightSavingAdjust(new Date(et,Z-J,1)),this._getFormatConfig(e)):n,r=this._canAdjustMonth(e,-1,et,Z)?"<a class='ui-datepicker-prev ui-corner-all' data-handler='prev' data-event='click' title='"+n+"'><span class='ui-icon ui-icon-circle-triangle-"+(U?"e":"w")+"'>"+n+"</span></a>":W?"":"<a class='ui-datepicker-prev ui-corner-all ui-state-disabled' title='"+n+"'><span class='ui-icon ui-icon-circle-triangle-"+(U?"e":"w")+"'>"+n+"</span></a>",i=this._get(e,"nextText"),i=X?this.formatDate(i,this._daylightSavingAdjust(new Date(et,Z+J,1)),this._getFormatConfig(e)):i,s=this._canAdjustMonth(e,1,et,Z)?"<a class='ui-datepicker-next ui-corner-all' data-handler='next' data-event='click' title='"+i+"'><span class='ui-icon ui-icon-circle-triangle-"+(U?"w":"e")+"'>"+i+"</span></a>":W?"":"<a class='ui-datepicker-next ui-corner-all ui-state-disabled' title='"+i+"'><span class='ui-icon ui-icon-circle-triangle-"+(U?"w":"e")+"'>"+i+"</span></a>",o=this._get(e,"currentText"),u=this._get(e,"gotoCurrent")&&e.currentDay?Q:R,o=X?this.formatDate(o,u,this._getFormatConfig(e)):o,a=e.inline?"":"<button type='button' class='ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all' data-handler='hide' data-event='click'>"+this._get(e,"closeText")+"</button>",f=z?"<div class='ui-datepicker-buttonpane ui-widget-content'>"+(U?a:"")+(this._isInRange(e,u)?"<button type='button' class='ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all' data-handler='today' data-event='click'>"+o+"</button>":"")+(U?"":a)+"</div>":"",l=parseInt(this._get(e,"firstDay"),10),l=isNaN(l)?0:l,c=this._get(e,"showWeek"),h=this._get(e,"dayNames"),p=this._get(e,"dayNamesMin"),d=this._get(e,"monthNames"),v=this._get(e,"monthNamesShort"),m=this._get(e,"beforeShowDay"),g=this._get(e,"showOtherMonths"),y=this._get(e,"selectOtherMonths"),b=this._getDefaultDate(e),w="",E;for(S=0;S<V[0];S++){x="",this.maxRows=4;for(T=0;T<V[1];T++){N=this._daylightSavingAdjust(new Date(et,Z,e.selectedDay)),C=" ui-corner-all",k="";if(K){k+="<div class='ui-datepicker-group";if(V[1]>1)switch(T){case 0:k+=" ui-datepicker-group-first",C=" ui-corner-"+(U?"right":"left");break;case V[1]-1:k+=" ui-datepicker-group-last",C=" ui-corner-"+(U?"left":"right");break;default:k+=" ui-datepicker-group-middle",C=""}k+="'>"}k+="<div class='ui-datepicker-header ui-widget-header ui-helper-clearfix"+C+"'>"+(/all|left/.test(C)&&S===0?U?s:r:"")+(/all|right/.test(C)&&S===0?U?r:s:"")+this._generateMonthYearHeader(e,Z,et,G,Y,S>0||T>0,d,v)+"</div><table class='ui-datepicker-calendar'><thead>"+"<tr>",L=c?"<th class='ui-datepicker-week-col'>"+this._get(e,"weekHeader")+"</th>":"";for(E=0;E<7;E++)A=(E+l)%7,L+="<th"+((E+l+6)%7>=5?" class='ui-datepicker-week-end'":"")+">"+"<span title='"+h[A]+"'>"+p[A]+"</span></th>";k+=L+"</tr></thead><tbody>",O=this._getDaysInMonth(et,Z),et===e.selectedYear&&Z===e.selectedMonth&&(e.selectedDay=Math.min(e.selectedDay,O)),M=(this._getFirstDayOfMonth(et,Z)-l+7)%7,_=Math.ceil((M+O)/7),D=K?this.maxRows>_?this.maxRows:_:_,this.maxRows=D,P=this._daylightSavingAdjust(new Date(et,Z,1-M));for(H=0;H<D;H++){k+="<tr>",B=c?"<td class='ui-datepicker-week-col'>"+this._get(e,"calculateWeek")(P)+"</td>":"";for(E=0;E<7;E++)j=m?m.apply(e.input?e.input[0]:null,[P]):[!0,""],F=P.getMonth()!==Z,I=F&&!y||!j[0]||G&&P<G||Y&&P>Y,B+="<td class='"+((E+l+6)%7>=5?" ui-datepicker-week-end":"")+(F?" ui-datepicker-other-month":"")+(P.getTime()===N.getTime()&&Z===e.selectedMonth&&e._keyEvent||b.getTime()===P.getTime()&&b.getTime()===N.getTime()?" "+this._dayOverClass:"")+(I?" "+this._unselectableClass+" ui-state-disabled":"")+(F&&!g?"":" "+j[1]+(P.getTime()===Q.getTime()?" "+this._currentClass:"")+(P.getTime()===R.getTime()?" ui-datepicker-today":""))+"'"+((!F||g)&&j[2]?" title='"+j[2]+"'":"")+(I?"":" data-handler='selectDay' data-event='click' data-month='"+P.getMonth()+"' data-year='"+P.getFullYear()+"'")+">"+(F&&!g?"&#xa0;":I?"<span class='ui-state-default'>"+P.getDate()+"</span>":"<a class='ui-state-default"+(P.getTime()===R.getTime()?" ui-state-highlight":"")+(P.getTime()===Q.getTime()?" ui-state-active":"")+(F?" ui-priority-secondary":"")+"' href='#'>"+P.getDate()+"</a>")+"</td>",P.setDate(P.getDate()+1),P=this._daylightSavingAdjust(P);k+=B+"</tr>"}Z++,Z>11&&(Z=0,et++),k+="</tbody></table>"+(K?"</div>"+(V[0]>0&&T===V[1]-1?"<div class='ui-datepicker-row-break'></div>":""):""),x+=k}w+=x}return w+=f,e._keyEvent=!1,w},_generateMonthYearHeader:function(e,t,n,r,i,s,o,u){var a,f,l,c,h,p,d,v,m=this._get(e,"changeMonth"),g=this._get(e,"changeYear"),y=this._get(e,"showMonthAfterYear"),b="<div class='ui-datepicker-title'>",w="";if(s||!m)w+="<span class='ui-datepicker-month'>"+o[t]+"</span>";else{a=r&&r.getFullYear()===n,f=i&&i.getFullYear()===n,w+="<select class='ui-datepicker-month' data-handler='selectMonth' data-event='change'>";for(l=0;l<12;l++)(!a||l>=r.getMonth())&&(!f||l<=i.getMonth())&&(w+="<option value='"+l+"'"+(l===t?" selected='selected'":"")+">"+u[l]+"</option>");w+="</select>"}y||(b+=w+(s||!m||!g?"&#xa0;":""));if(!e.yearshtml){e.yearshtml="";if(s||!g)b+="<span class='ui-datepicker-year'>"+n+"</span>";else{c=this._get(e,"yearRange").split(":"),h=(new Date).getFullYear(),p=function(e){var t=e.match(/c[+\-].*/)?n+parseInt(e.substring(1),10):e.match(/[+\-].*/)?h+parseInt(e,10):parseInt(e,10);return isNaN(t)?h:t},d=p(c[0]),v=Math.max(d,p(c[1]||"")),d=r?Math.max(d,r.getFullYear()):d,v=i?Math.min(v,i.getFullYear()):v,e.yearshtml+="<select class='ui-datepicker-year' data-handler='selectYear' data-event='change'>";for(;d<=v;d++)e.yearshtml+="<option value='"+d+"'"+(d===n?" selected='selected'":"")+">"+d+"</option>";e.yearshtml+="</select>",b+=e.yearshtml,e.yearshtml=null}}return b+=this._get(e,"yearSuffix"),y&&(b+=(s||!m||!g?"&#xa0;":"")+w),b+="</div>",b},_adjustInstDate:function(e,t,n){var r=e.drawYear+(n==="Y"?t:0),i=e.drawMonth+(n==="M"?t:0),s=Math.min(e.selectedDay,this._getDaysInMonth(r,i))+(n==="D"?t:0),o=this._restrictMinMax(e,this._daylightSavingAdjust(new Date(r,i,s)));e.selectedDay=o.getDate(),e.drawMonth=e.selectedMonth=o.getMonth(),e.drawYear=e.selectedYear=o.getFullYear(),(n==="M"||n==="Y")&&this._notifyChange(e)},_restrictMinMax:function(e,t){var n=this._getMinMaxDate(e,"min"),r=this._getMinMaxDate(e,"max"),i=n&&t<n?n:t;return r&&i>r?r:i},_notifyChange:function(e){var t=this._get(e,"onChangeMonthYear");t&&t.apply(e.input?e.input[0]:null,[e.selectedYear,e.selectedMonth+1,e])},_getNumberOfMonths:function(e){var t=this._get(e,"numberOfMonths");return t==null?[1,1]:typeof t=="number"?[1,t]:t},_getMinMaxDate:function(e,t){return this._determineDate(e,this._get(e,t+"Date"),null)},_getDaysInMonth:function(e,t){return 32-this._daylightSavingAdjust(new Date(e,t,32)).getDate()},_getFirstDayOfMonth:function(e,t){return(new Date(e,t,1)).getDay()},_canAdjustMonth:function(e,t,n,r){var i=this._getNumberOfMonths(e),s=this._daylightSavingAdjust(new Date(n,r+(t<0?t:i[0]*i[1]),1));return t<0&&s.setDate(this._getDaysInMonth(s.getFullYear(),s.getMonth())),this._isInRange(e,s)},_isInRange:function(e,t){var n,r,i=this._getMinMaxDate(e,"min"),s=this._getMinMaxDate(e,"max"),o=null,u=null,a=this._get(e,"yearRange");return a&&(n=a.split(":"),r=(new Date).getFullYear(),o=parseInt(n[0],10)+r,u=parseInt(n[1],10)+r),(!i||t.getTime()>=i.getTime())&&(!s||t.getTime()<=s.getTime())&&(!o||t.getFullYear()>=o)&&(!u||t.getFullYear()<=u)},_getFormatConfig:function(e){var t=this._get(e,"shortYearCutoff");return t=typeof t!="string"?t:(new Date).getFullYear()%100+parseInt(t,10),{shortYearCutoff:t,dayNamesShort:this._get(e,"dayNamesShort"),dayNames:this._get(e,"dayNames"),monthNamesShort:this._get(e,"monthNamesShort"),monthNames:this._get(e,"monthNames")}},_formatDate:function(e,t,n,r){t||(e.currentDay=e.selectedDay,e.currentMonth=e.selectedMonth,e.currentYear=e.selectedYear);var i=t?typeof t=="object"?t:this._daylightSavingAdjust(new Date(r,n,t)):this._daylightSavingAdjust(new Date(e.currentYear,e.currentMonth,e.currentDay));return this.formatDate(this._get(e,"dateFormat"),i,this._getFormatConfig(e))}}),e.fn.datepicker=function(t){if(!this.length)return this;e.datepicker.initialized||(e(document).mousedown(e.datepicker._checkExternalClick),e.datepicker.initialized=!0),e("#"+e.datepicker._mainDivId).length===0&&e("body").append(e.datepicker.dpDiv);var n=Array.prototype.slice.call(arguments,1);return typeof t!="string"||t!=="isDisabled"&&t!=="getDate"&&t!=="widget"?t==="option"&&arguments.length===2&&typeof arguments[1]=="string"?e.datepicker["_"+t+"Datepicker"].apply(e.datepicker,[this[0]].concat(n)):this.each(function(){typeof t=="string"?e.datepicker["_"+t+"Datepicker"].apply(e.datepicker,[this].concat(n)):e.datepicker._attachDatepicker(this,t)}):e.datepicker["_"+t+"Datepicker"].apply(e.datepicker,[this[0]].concat(n))},e.datepicker=new s,e.datepicker.initialized=!1,e.datepicker.uuid=(new Date).getTime(),e.datepicker.version="1.10.0",window["DP_jQuery_"+r]=e})(jQuery);(function(e,t){var n={buttons:!0,height:!0,maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0,width:!0},r={maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0};e.widget("ui.dialog",{version:"1.10.0",options:{appendTo:"body",autoOpen:!0,buttons:[],closeOnEscape:!0,closeText:"close",dialogClass:"",draggable:!0,hide:null,height:"auto",maxHeight:null,maxWidth:null,minHeight:150,minWidth:150,modal:!1,position:{my:"center",at:"center",of:window,collision:"fit",using:function(t){var n=e(this).css(t).offset().top;n<0&&e(this).css("top",t.top-n)}},resizable:!0,show:null,title:null,width:300,beforeClose:null,close:null,drag:null,dragStart:null,dragStop:null,focus:null,open:null,resize:null,resizeStart:null,resizeStop:null},_create:function(){this.originalCss={display:this.element[0].style.display,width:this.element[0].style.width,minHeight:this.element[0].style.minHeight,maxHeight:this.element[0].style.maxHeight,height:this.element[0].style.height},this.originalPosition={parent:this.element.parent(),index:this.element.parent().children().index(this.element)},this.originalTitle=this.element.attr("title"),this.options.title=this.options.title||this.originalTitle,this._createWrapper(),this.element.show().removeAttr("title").addClass("ui-dialog-content ui-widget-content").appendTo(this.uiDialog),this._createTitlebar(),this._createButtonPane(),this.options.draggable&&e.fn.draggable&&this._makeDraggable(),this.options.resizable&&e.fn.resizable&&this._makeResizable(),this._isOpen=!1},_init:function(){this.options.autoOpen&&this.open()},_appendTo:function(){var t=this.options.appendTo;return t&&(t.jquery||t.nodeType)?e(t):this.document.find(t||"body").eq(0)},_destroy:function(){var e,t=this.originalPosition;this._destroyOverlay(),this.element.removeUniqueId().removeClass("ui-dialog-content ui-widget-content").css(this.originalCss).detach(),this.uiDialog.stop(!0,!0).remove(),this.originalTitle&&this.element.attr("title",this.originalTitle),e=t.parent.children().eq(t.index),e.length&&e[0]!==this.element[0]?e.before(this.element):t.parent.append(this.element)},widget:function(){return this.uiDialog},disable:e.noop,enable:e.noop,close:function(t){var n=this;if(!this._isOpen||this._trigger("beforeClose",t)===!1)return;this._isOpen=!1,this._destroyOverlay(),this.opener.filter(":focusable").focus().length||e(this.document[0].activeElement).blur(),this._hide(this.uiDialog,this.options.hide,function(){n._trigger("close",t)})},isOpen:function(){return this._isOpen},moveToTop:function(){this._moveToTop()},_moveToTop:function(e,t){var n=!!this.uiDialog.nextAll(":visible").insertBefore(this.uiDialog).length;return n&&!t&&this._trigger("focus",e),n},open:function(){if(this._isOpen){this._moveToTop()&&this._focusTabbable();return}this.opener=e(this.document[0].activeElement),this._size(),this._position(),this._createOverlay(),this._moveToTop(null,!0),this._show(this.uiDialog,this.options.show),this._focusTabbable(),this._isOpen=!0,this._trigger("open"),this._trigger("focus")},_focusTabbable:function(){var e=this.element.find("[autofocus]");e.length||(e=this.element.find(":tabbable")),e.length||(e=this.uiDialogButtonPane.find(":tabbable")),e.length||(e=this.uiDialogTitlebarClose.filter(":tabbable")),e.length||(e=this.uiDialog),e.eq(0).focus()},_keepFocus:function(t){function n(){var t=this.document[0].activeElement,n=this.uiDialog[0]===t||e.contains(this.uiDialog[0],t);n||this._focusTabbable()}t.preventDefault(),n.call(this),this._delay(n)},_createWrapper:function(){this.uiDialog=e("<div>").addClass("ui-dialog ui-widget ui-widget-content ui-corner-all ui-front "+this.options.dialogClass).hide().attr({tabIndex:-1,role:"dialog"}).appendTo(this._appendTo()),this._on(this.uiDialog,{keydown:function(t){if(this.options.closeOnEscape&&!t.isDefaultPrevented()&&t.keyCode&&t.keyCode===e.ui.keyCode.ESCAPE){t.preventDefault(),this.close(t);return}if(t.keyCode!==e.ui.keyCode.TAB)return;var n=this.uiDialog.find(":tabbable"),r=n.filter(":first"),i=n.filter(":last");t.target!==i[0]&&t.target!==this.uiDialog[0]||!!t.shiftKey?(t.target===r[0]||t.target===this.uiDialog[0])&&t.shiftKey&&(i.focus(1),t.preventDefault()):(r.focus(1),t.preventDefault())},mousedown:function(e){this._moveToTop(e)&&this._focusTabbable()}}),this.element.find("[aria-describedby]").length||this.uiDialog.attr({"aria-describedby":this.element.uniqueId().attr("id")})},_createTitlebar:function(){var t;this.uiDialogTitlebar=e("<div>").addClass("ui-dialog-titlebar ui-widget-header ui-corner-all ui-helper-clearfix").prependTo(this.uiDialog),this._on(this.uiDialogTitlebar,{mousedown:function(t){e(t.target).closest(".ui-dialog-titlebar-close")||this.uiDialog.focus()}}),this.uiDialogTitlebarClose=e("<button></button>").button({label:this.options.closeText,icons:{primary:"ui-icon-closethick"},text:!1}).addClass("ui-dialog-titlebar-close").appendTo(this.uiDialogTitlebar),this._on(this.uiDialogTitlebarClose,{click:function(e){e.preventDefault(),this.close(e)}}),t=e("<span>").uniqueId().addClass("ui-dialog-title").prependTo(this.uiDialogTitlebar),this._title(t),this.uiDialog.attr({"aria-labelledby":t.attr("id")})},_title:function(e){this.options.title||e.html("&#160;"),e.text(this.options.title)},_createButtonPane:function(){this.uiDialogButtonPane=e("<div>").addClass("ui-dialog-buttonpane ui-widget-content ui-helper-clearfix"),this.uiButtonSet=e("<div>").addClass("ui-dialog-buttonset").appendTo(this.uiDialogButtonPane),this._createButtons()},_createButtons:function(){var t=this,n=this.options.buttons;this.uiDialogButtonPane.remove(),this.uiButtonSet.empty();if(e.isEmptyObject(n)){this.uiDialog.removeClass("ui-dialog-buttons");return}e.each(n,function(n,r){var i,s;r=e.isFunction(r)?{click:r,text:n}:r,r=e.extend({type:"button"},r),i=r.click,r.click=function(){i.apply(t.element[0],arguments)},s={icons:r.icons,text:r.showText},delete r.icons,delete r.showText,e("<button></button>",r).button(s).appendTo(t.uiButtonSet)}),this.uiDialog.addClass("ui-dialog-buttons"),this.uiDialogButtonPane.appendTo(this.uiDialog)},_makeDraggable:function(){function r(e){return{position:e.position,offset:e.offset}}var t=this,n=this.options;this.uiDialog.draggable({cancel:".ui-dialog-content, .ui-dialog-titlebar-close",handle:".ui-dialog-titlebar",containment:"document",start:function(n,i){e(this).addClass("ui-dialog-dragging"),t._trigger("dragStart",n,r(i))},drag:function(e,n){t._trigger("drag",e,r(n))},stop:function(i,s){n.position=[s.position.left-t.document.scrollLeft(),s.position.top-t.document.scrollTop()],e(this).removeClass("ui-dialog-dragging"),t._trigger("dragStop",i,r(s))}})},_makeResizable:function(){function o(e){return{originalPosition:e.originalPosition,originalSize:e.originalSize,position:e.position,size:e.size}}var t=this,n=this.options,r=n.resizable,i=this.uiDialog.css("position"),s=typeof r=="string"?r:"n,e,s,w,se,sw,ne,nw";this.uiDialog.resizable({cancel:".ui-dialog-content",containment:"document",alsoResize:this.element,maxWidth:n.maxWidth,maxHeight:n.maxHeight,minWidth:n.minWidth,minHeight:this._minHeight(),handles:s,start:function(n,r){e(this).addClass("ui-dialog-resizing"),t._trigger("resizeStart",n,o(r))},resize:function(e,n){t._trigger("resize",e,o(n))},stop:function(r,i){n.height=e(this).height(),n.width=e(this).width(),e(this).removeClass("ui-dialog-resizing"),t._trigger("resizeStop",r,o(i))}}).css("position",i)},_minHeight:function(){var e=this.options;return e.height==="auto"?e.minHeight:Math.min(e.minHeight,e.height)},_position:function(){var e=this.uiDialog.is(":visible");e||this.uiDialog.show(),this.uiDialog.position(this.options.position),e||this.uiDialog.hide()},_setOptions:function(t){var i=this,s=!1,o={};e.each(t,function(e,t){i._setOption(e,t),e in n&&(s=!0),e in r&&(o[e]=t)}),s&&(this._size(),this._position()),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option",o)},_setOption:function(e,t){var n,r,i=this.uiDialog;e==="dialogClass"&&i.removeClass(this.options.dialogClass).addClass(t);if(e==="disabled")return;this._super(e,t),e==="appendTo"&&this.uiDialog.appendTo(this._appendTo()),e==="buttons"&&this._createButtons(),e==="closeText"&&this.uiDialogTitlebarClose.button({label:""+t}),e==="draggable"&&(n=i.is(":data(ui-draggable)"),n&&!t&&i.draggable("destroy"),!n&&t&&this._makeDraggable()),e==="position"&&this._position(),e==="resizable"&&(r=i.is(":data(ui-resizable)"),r&&!t&&i.resizable("destroy"),r&&typeof t=="string"&&i.resizable("option","handles",t),!r&&t!==!1&&this._makeResizable()),e==="title"&&this._title(this.uiDialogTitlebar.find(".ui-dialog-title"))},_size:function(){var e,t,n,r=this.options;this.element.show().css({width:"auto",minHeight:0,maxHeight:"none",height:0}),r.minWidth>r.width&&(r.width=r.minWidth),e=this.uiDialog.css({height:"auto",width:r.width}).outerHeight(),t=Math.max(0,r.minHeight-e),n=typeof r.maxHeight=="number"?Math.max(0,r.maxHeight-e):"none",r.height==="auto"?this.element.css({minHeight:t,maxHeight:n,height:"auto"}):this.element.height(Math.max(0,r.height-e)),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option","minHeight",this._minHeight())},_createOverlay:function(){if(!this.options.modal)return;e.ui.dialog.overlayInstances||this._delay(function(){e.ui.dialog.overlayInstances&&this._on(this.document,{focusin:function(t){e(t.target).closest(".ui-dialog").length||(t.preventDefault(),e(".ui-dialog:visible:last .ui-dialog-content").data("ui-dialog")._focusTabbable())}})}),this.overlay=e("<div>").addClass("ui-widget-overlay ui-front").appendTo(this.document[0].body),this._on(this.overlay,{mousedown:"_keepFocus"}),e.ui.dialog.overlayInstances++},_destroyOverlay:function(){if(!this.options.modal)return;e.ui.dialog.overlayInstances--,e.ui.dialog.overlayInstances||this._off(this.document,"focusin"),this.overlay.remove()}}),e.ui.dialog.overlayInstances=0,e.uiBackCompat!==!1&&e.widget("ui.dialog",e.ui.dialog,{_position:function(){var t=this.options.position,n=[],r=[0,0],i;if(t){if(typeof t=="string"||typeof t=="object"&&"0"in t)n=t.split?t.split(" "):[t[0],t[1]],n.length===1&&(n[1]=n[0]),e.each(["left","top"],function(e,t){+n[e]===n[e]&&(r[e]=n[e],n[e]=t)}),t={my:n[0]+(r[0]<0?r[0]:"+"+r[0])+" "+n[1]+(r[1]<0?r[1]:"+"+r[1]),at:n.join(" ")};t=e.extend({},e.ui.dialog.prototype.options.position,t)}else t=e.ui.dialog.prototype.options.position;i=this.uiDialog.is(":visible"),i||this.uiDialog.show(),this.uiDialog.position(t),i||this.uiDialog.hide()}})})(jQuery);(function(e,t){e.widget("ui.menu",{version:"1.10.0",defaultElement:"<ul>",delay:300,options:{icons:{submenu:"ui-icon-carat-1-e"},menus:"ul",position:{my:"left top",at:"right top"},role:"menu",blur:null,focus:null,select:null},_create:function(){this.activeMenu=this.element,this.mouseHandled=!1,this.element.uniqueId().addClass("ui-menu ui-widget ui-widget-content ui-corner-all").toggleClass("ui-menu-icons",!!this.element.find(".ui-icon").length).attr({role:this.options.role,tabIndex:0}).bind("click"+this.eventNamespace,e.proxy(function(e){this.options.disabled&&e.preventDefault()},this)),this.options.disabled&&this.element.addClass("ui-state-disabled").attr("aria-disabled","true"),this._on({"mousedown .ui-menu-item > a":function(e){e.preventDefault()},"click .ui-state-disabled > a":function(e){e.preventDefault()},"click .ui-menu-item:has(a)":function(t){var n=e(t.target).closest(".ui-menu-item");!this.mouseHandled&&n.not(".ui-state-disabled").length&&(this.mouseHandled=!0,this.select(t),n.has(".ui-menu").length?this.expand(t):this.element.is(":focus")||(this.element.trigger("focus",[!0]),this.active&&this.active.parents(".ui-menu").length===1&&clearTimeout(this.timer)))},"mouseenter .ui-menu-item":function(t){var n=e(t.currentTarget);n.siblings().children(".ui-state-active").removeClass("ui-state-active"),this.focus(t,n)},mouseleave:"collapseAll","mouseleave .ui-menu":"collapseAll",focus:function(e,t){var n=this.active||this.element.children(".ui-menu-item").eq(0);t||this.focus(e,n)},blur:function(t){this._delay(function(){e.contains(this.element[0],this.document[0].activeElement)||this.collapseAll(t)})},keydown:"_keydown"}),this.refresh(),this._on(this.document,{click:function(t){e(t.target).closest(".ui-menu").length||this.collapseAll(t),this.mouseHandled=!1}})},_destroy:function(){this.element.removeAttr("aria-activedescendant").find(".ui-menu").addBack().removeClass("ui-menu ui-widget ui-widget-content ui-corner-all ui-menu-icons").removeAttr("role").removeAttr("tabIndex").removeAttr("aria-labelledby").removeAttr("aria-expanded").removeAttr("aria-hidden").removeAttr("aria-disabled").removeUniqueId().show(),this.element.find(".ui-menu-item").removeClass("ui-menu-item").removeAttr("role").removeAttr("aria-disabled").children("a").removeUniqueId().removeClass("ui-corner-all ui-state-hover").removeAttr("tabIndex").removeAttr("role").removeAttr("aria-haspopup").children().each(function(){var t=e(this);t.data("ui-menu-submenu-carat")&&t.remove()}),this.element.find(".ui-menu-divider").removeClass("ui-menu-divider ui-widget-content")},_keydown:function(t){function a(e){return e.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")}var n,r,i,s,o,u=!0;switch(t.keyCode){case e.ui.keyCode.PAGE_UP:this.previousPage(t);break;case e.ui.keyCode.PAGE_DOWN:this.nextPage(t);break;case e.ui.keyCode.HOME:this._move("first","first",t);break;case e.ui.keyCode.END:this._move("last","last",t);break;case e.ui.keyCode.UP:this.previous(t);break;case e.ui.keyCode.DOWN:this.next(t);break;case e.ui.keyCode.LEFT:this.collapse(t);break;case e.ui.keyCode.RIGHT:this.active&&!this.active.is(".ui-state-disabled")&&this.expand(t);break;case e.ui.keyCode.ENTER:case e.ui.keyCode.SPACE:this._activate(t);break;case e.ui.keyCode.ESCAPE:this.collapse(t);break;default:u=!1,r=this.previousFilter||"",i=String.fromCharCode(t.keyCode),s=!1,clearTimeout(this.filterTimer),i===r?s=!0:i=r+i,o=new RegExp("^"+a(i),"i"),n=this.activeMenu.children(".ui-menu-item").filter(function(){return o.test(e(this).children("a").text())}),n=s&&n.index(this.active.next())!==-1?this.active.nextAll(".ui-menu-item"):n,n.length||(i=String.fromCharCode(t.keyCode),o=new RegExp("^"+a(i),"i"),n=this.activeMenu.children(".ui-menu-item").filter(function(){return o.test(e(this).children("a").text())})),n.length?(this.focus(t,n),n.length>1?(this.previousFilter=i,this.filterTimer=this._delay(function(){delete this.previousFilter},1e3)):delete this.previousFilter):delete this.previousFilter}u&&t.preventDefault()},_activate:function(e){this.active.is(".ui-state-disabled")||(this.active.children("a[aria-haspopup='true']").length?this.expand(e):this.select(e))},refresh:function(){var t,n=this.options.icons.submenu,r=this.element.find(this.options.menus);r.filter(":not(.ui-menu)").addClass("ui-menu ui-widget ui-widget-content ui-corner-all").hide().attr({role:this.options.role,"aria-hidden":"true","aria-expanded":"false"}).each(function(){var t=e(this),r=t.prev("a"),i=e("<span>").addClass("ui-menu-icon ui-icon "+n).data("ui-menu-submenu-carat",!0);r.attr("aria-haspopup","true").prepend(i),t.attr("aria-labelledby",r.attr("id"))}),t=r.add(this.element),t.children(":not(.ui-menu-item):has(a)").addClass("ui-menu-item").attr("role","presentation").children("a").uniqueId().addClass("ui-corner-all").attr({tabIndex:-1,role:this._itemRole()}),t.children(":not(.ui-menu-item)").each(function(){var t=e(this);/[^\-—–\s]/.test(t.text())||t.addClass("ui-widget-content ui-menu-divider")}),t.children(".ui-state-disabled").attr("aria-disabled","true"),this.active&&!e.contains(this.element[0],this.active[0])&&this.blur()},_itemRole:function(){return{menu:"menuitem",listbox:"option"}[this.options.role]},_setOption:function(e,t){e==="icons"&&this.element.find(".ui-menu-icon").removeClass(this.options.icons.submenu).addClass(t.submenu),this._super(e,t)},focus:function(e,t){var n,r;this.blur(e,e&&e.type==="focus"),this._scrollIntoView(t),this.active=t.first(),r=this.active.children("a").addClass("ui-state-focus"),this.options.role&&this.element.attr("aria-activedescendant",r.attr("id")),this.active.parent().closest(".ui-menu-item").children("a:first").addClass("ui-state-active"),e&&e.type==="keydown"?this._close():this.timer=this._delay(function(){this._close()},this.delay),n=t.children(".ui-menu"),n.length&&/^mouse/.test(e.type)&&this._startOpening(n),this.activeMenu=t.parent(),this._trigger("focus",e,{item:t})},_scrollIntoView:function(t){var n,r,i,s,o,u;this._hasScroll()&&(n=parseFloat(e.css(this.activeMenu[0],"borderTopWidth"))||0,r=parseFloat(e.css(this.activeMenu[0],"paddingTop"))||0,i=t.offset().top-this.activeMenu.offset().top-n-r,s=this.activeMenu.scrollTop(),o=this.activeMenu.height(),u=t.height(),i<0?this.activeMenu.scrollTop(s+i):i+u>o&&this.activeMenu.scrollTop(s+i-o+u))},blur:function(e,t){t||clearTimeout(this.timer);if(!this.active)return;this.active.children("a").removeClass("ui-state-focus"),this.active=null,this._trigger("blur",e,{item:this.active})},_startOpening:function(e){clearTimeout(this.timer);if(e.attr("aria-hidden")!=="true")return;this.timer=this._delay(function(){this._close(),this._open(e)},this.delay)},_open:function(t){var n=e.extend({of:this.active},this.options.position);clearTimeout(this.timer),this.element.find(".ui-menu").not(t.parents(".ui-menu")).hide().attr("aria-hidden","true"),t.show().removeAttr("aria-hidden").attr("aria-expanded","true").position(n)},collapseAll:function(t,n){clearTimeout(this.timer),this.timer=this._delay(function(){var r=n?this.element:e(t&&t.target).closest(this.element.find(".ui-menu"));r.length||(r=this.element),this._close(r),this.blur(t),this.activeMenu=r},this.delay)},_close:function(e){e||(e=this.active?this.active.parent():this.element),e.find(".ui-menu").hide().attr("aria-hidden","true").attr("aria-expanded","false").end().find("a.ui-state-active").removeClass("ui-state-active")},collapse:function(e){var t=this.active&&this.active.parent().closest(".ui-menu-item",this.element);t&&t.length&&(this._close(),this.focus(e,t))},expand:function(e){var t=this.active&&this.active.children(".ui-menu ").children(".ui-menu-item").first();t&&t.length&&(this._open(t.parent()),this._delay(function(){this.focus(e,t)}))},next:function(e){this._move("next","first",e)},previous:function(e){this._move("prev","last",e)},isFirstItem:function(){return this.active&&!this.active.prevAll(".ui-menu-item").length},isLastItem:function(){return this.active&&!this.active.nextAll(".ui-menu-item").length},_move:function(e,t,n){var r;this.active&&(e==="first"||e==="last"?r=this.active[e==="first"?"prevAll":"nextAll"](".ui-menu-item").eq(-1):r=this.active[e+"All"](".ui-menu-item").eq(0));if(!r||!r.length||!this.active)r=this.activeMenu.children(".ui-menu-item")[t]();this.focus(n,r)},nextPage:function(t){var n,r,i;if(!this.active){this.next(t);return}if(this.isLastItem())return;this._hasScroll()?(r=this.active.offset().top,i=this.element.height(),this.active.nextAll(".ui-menu-item").each(function(){return n=e(this),n.offset().top-r-i<0}),this.focus(t,n)):this.focus(t,this.activeMenu.children(".ui-menu-item")[this.active?"last":"first"]())},previousPage:function(t){var n,r,i;if(!this.active){this.next(t);return}if(this.isFirstItem())return;this._hasScroll()?(r=this.active.offset().top,i=this.element.height(),this.active.prevAll(".ui-menu-item").each(function(){return n=e(this),n.offset().top-r+i>0}),this.focus(t,n)):this.focus(t,this.activeMenu.children(".ui-menu-item").first())},_hasScroll:function(){return this.element.outerHeight()<this.element.prop("scrollHeight")},select:function(t){this.active=this.active||e(t.target).closest(".ui-menu-item");var n={item:this.active};this.active.has(".ui-menu").length||this.collapseAll(t,!0),this._trigger("select",t,n)}})})(jQuery);(function(e,t){e.widget("ui.progressbar",{version:"1.10.0",options:{max:100,value:0,change:null,complete:null},min:0,_create:function(){this.oldValue=this.options.value=this._constrainedValue(),this.element.addClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").attr({role:"progressbar","aria-valuemin":this.min}),this.valueDiv=e("<div class='ui-progressbar-value ui-widget-header ui-corner-left'></div>").appendTo(this.element),this._refreshValue()},_destroy:function(){this.element.removeClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").removeAttr("role").removeAttr("aria-valuemin").removeAttr("aria-valuemax").removeAttr("aria-valuenow"),this.valueDiv.remove()},value:function(e){if(e===t)return this.options.value;this.options.value=this._constrainedValue(e),this._refreshValue()},_constrainedValue:function(e){return e===t&&(e=this.options.value),this.indeterminate=e===!1,typeof e!="number"&&(e=0),this.indeterminate?!1:Math.min(this.options.max,Math.max(this.min,e))},_setOptions:function(e){var t=e.value;delete e.value,this._super(e),this.options.value=this._constrainedValue(t),this._refreshValue()},_setOption:function(e,t){e==="max"&&(t=Math.max(this.min,t)),this._super(e,t)},_percentage:function(){return this.indeterminate?100:100*(this.options.value-this.min)/(this.options.max-this.min)},_refreshValue:function(){var t=this.options.value,n=this._percentage();this.valueDiv.toggle(this.indeterminate||t>this.min).toggleClass("ui-corner-right",t===this.options.max).width(n.toFixed(0)+"%"),this.element.toggleClass("ui-progressbar-indeterminate",this.indeterminate),this.indeterminate?(this.element.removeAttr("aria-valuenow"),this.overlayDiv||(this.overlayDiv=e("<div class='ui-progressbar-overlay'></div>").appendTo(this.valueDiv))):(this.element.attr({"aria-valuemax":this.options.max,"aria-valuenow":t}),this.overlayDiv&&(this.overlayDiv.remove(),this.overlayDiv=null)),this.oldValue!==t&&(this.oldValue=t,this._trigger("change")),t===this.options.max&&this._trigger("complete")}})})(jQuery);(function(e,t){var n=5;e.widget("ui.slider",e.ui.mouse,{version:"1.10.0",widgetEventPrefix:"slide",options:{animate:!1,distance:0,max:100,min:0,orientation:"horizontal",range:!1,step:1,value:0,values:null,change:null,slide:null,start:null,stop:null},_create:function(){var t,n,r=this.options,i=this.element.find(".ui-slider-handle").addClass("ui-state-default ui-corner-all"),s="<a class='ui-slider-handle ui-state-default ui-corner-all' href='#'></a>",o=[];this._keySliding=!1,this._mouseSliding=!1,this._animateOff=!0,this._handleIndex=null,this._detectOrientation(),this._mouseInit(),this.element.addClass("ui-slider ui-slider-"+this.orientation+" ui-widget"+" ui-widget-content"+" ui-corner-all"),this.range=e([]),r.range&&(r.range===!0&&(r.values?r.values.length&&r.values.length!==2?r.values=[r.values[0],r.values[0]]:e.isArray(r.values)&&(r.values=r.values.slice(0)):r.values=[this._valueMin(),this._valueMin()]),this.range=e("<div></div>").appendTo(this.element).addClass("ui-slider-range ui-widget-header"+(r.range==="min"||r.range==="max"?" ui-slider-range-"+r.range:""))),n=r.values&&r.values.length||1;for(t=i.length;t<n;t++)o.push(s);this.handles=i.add(e(o.join("")).appendTo(this.element)),this.handle=this.handles.eq(0),this.handles.add(this.range).filter("a").click(function(e){e.preventDefault()}).mouseenter(function(){r.disabled||e(this).addClass("ui-state-hover")}).mouseleave(function(){e(this).removeClass("ui-state-hover")}).focus(function(){r.disabled?e(this).blur():(e(".ui-slider .ui-state-focus").removeClass("ui-state-focus"),e(this).addClass("ui-state-focus"))}).blur(function(){e(this).removeClass("ui-state-focus")}),this.handles.each(function(t){e(this).data("ui-slider-handle-index",t)}),this._setOption("disabled",r.disabled),this._on(this.handles,this._handleEvents),this._refreshValue(),this._animateOff=!1},_destroy:function(){this.handles.remove(),this.range.remove(),this.element.removeClass("ui-slider ui-slider-horizontal ui-slider-vertical ui-widget ui-widget-content ui-corner-all"),this._mouseDestroy()},_mouseCapture:function(t){var n,r,i,s,o,u,a,f,l=this,c=this.options;return c.disabled?!1:(this.elementSize={width:this.element.outerWidth(),height:this.element.outerHeight()},this.elementOffset=this.element.offset(),n={x:t.pageX,y:t.pageY},r=this._normValueFromMouse(n),i=this._valueMax()-this._valueMin()+1,this.handles.each(function(t){var n=Math.abs(r-l.values(t));if(i>n||i===n&&(t===l._lastChangedValue||l.values(t)===c.min))i=n,s=e(this),o=t}),u=this._start(t,o),u===!1?!1:(this._mouseSliding=!0,this._handleIndex=o,s.addClass("ui-state-active").focus(),a=s.offset(),f=!e(t.target).parents().addBack().is(".ui-slider-handle"),this._clickOffset=f?{left:0,top:0}:{left:t.pageX-a.left-s.width()/2,top:t.pageY-a.top-s.height()/2-(parseInt(s.css("borderTopWidth"),10)||0)-(parseInt(s.css("borderBottomWidth"),10)||0)+(parseInt(s.css("marginTop"),10)||0)},this.handles.hasClass("ui-state-hover")||this._slide(t,o,r),this._animateOff=!0,!0))},_mouseStart:function(){return!0},_mouseDrag:function(e){var t={x:e.pageX,y:e.pageY},n=this._normValueFromMouse(t);return this._slide(e,this._handleIndex,n),!1},_mouseStop:function(e){return this.handles.removeClass("ui-state-active"),this._mouseSliding=!1,this._stop(e,this._handleIndex),this._change(e,this._handleIndex),this._handleIndex=null,this._clickOffset=null,this._animateOff=!1,!1},_detectOrientation:function(){this.orientation=this.options.orientation==="vertical"?"vertical":"horizontal"},_normValueFromMouse:function(e){var t,n,r,i,s;return this.orientation==="horizontal"?(t=this.elementSize.width,n=e.x-this.elementOffset.left-(this._clickOffset?this._clickOffset.left:0)):(t=this.elementSize.height,n=e.y-this.elementOffset.top-(this._clickOffset?this._clickOffset.top:0)),r=n/t,r>1&&(r=1),r<0&&(r=0),this.orientation==="vertical"&&(r=1-r),i=this._valueMax()-this._valueMin(),s=this._valueMin()+r*i,this._trimAlignValue(s)},_start:function(e,t){var n={handle:this.handles[t],value:this.value()};return this.options.values&&this.options.values.length&&(n.value=this.values(t),n.values=this.values()),this._trigger("start",e,n)},_slide:function(e,t,n){var r,i,s;this.options.values&&this.options.values.length?(r=this.values(t?0:1),this.options.values.length===2&&this.options.range===!0&&(t===0&&n>r||t===1&&n<r)&&(n=r),n!==this.values(t)&&(i=this.values(),i[t]=n,s=this._trigger("slide",e,{handle:this.handles[t],value:n,values:i}),r=this.values(t?0:1),s!==!1&&this.values(t,n,!0))):n!==this.value()&&(s=this._trigger("slide",e,{handle:this.handles[t],value:n}),s!==!1&&this.value(n))},_stop:function(e,t){var n={handle:this.handles[t],value:this.value()};this.options.values&&this.options.values.length&&(n.value=this.values(t),n.values=this.values()),this._trigger("stop",e,n)},_change:function(e,t){if(!this._keySliding&&!this._mouseSliding){var n={handle:this.handles[t],value:this.value()};this.options.values&&this.options.values.length&&(n.value=this.values(t),n.values=this.values()),this._lastChangedValue=t,this._trigger("change",e,n)}},value:function(e){if(arguments.length){this.options.value=this._trimAlignValue(e),this._refreshValue(),this._change(null,0);return}return this._value()},values:function(t,n){var r,i,s;if(arguments.length>1){this.options.values[t]=this._trimAlignValue(n),this._refreshValue(),this._change(null,t);return}if(!arguments.length)return this._values();if(!e.isArray(arguments[0]))return this.options.values&&this.options.values.length?this._values(t):this.value();r=this.options.values,i=arguments[0];for(s=0;s<r.length;s+=1)r[s]=this._trimAlignValue(i[s]),this._change(null,s);this._refreshValue()},_setOption:function(t,n){var r,i=0;e.isArray(this.options.values)&&(i=this.options.values.length),e.Widget.prototype._setOption.apply(this,arguments);switch(t){case"disabled":n?(this.handles.filter(".ui-state-focus").blur(),this.handles.removeClass("ui-state-hover"),this.handles.prop("disabled",!0)):this.handles.prop("disabled",!1);break;case"orientation":this._detectOrientation(),this.element.removeClass("ui-slider-horizontal ui-slider-vertical").addClass("ui-slider-"+this.orientation),this._refreshValue();break;case"value":this._animateOff=!0,this._refreshValue(),this._change(null,0),this._animateOff=!1;break;case"values":this._animateOff=!0,this._refreshValue();for(r=0;r<i;r+=1)this._change(null,r);this._animateOff=!1;break;case"min":case"max":this._animateOff=!0,this._refreshValue(),this._animateOff=!1}},_value:function(){var e=this.options.value;return e=this._trimAlignValue(e),e},_values:function(e){var t,n,r;if(arguments.length)return t=this.options.values[e],t=this._trimAlignValue(t),t;n=this.options.values.slice();for(r=0;r<n.length;r+=1)n[r]=this._trimAlignValue(n[r]);return n},_trimAlignValue:function(e){if(e<=this._valueMin())return this._valueMin();if(e>=this._valueMax())return this._valueMax();var t=this.options.step>0?this.options.step:1,n=(e-this._valueMin())%t,r=e-n;return Math.abs(n)*2>=t&&(r+=n>0?t:-t),parseFloat(r.toFixed(5))},_valueMin:function(){return this.options.min},_valueMax:function(){return this.options.max},_refreshValue:function(){var t,n,r,i,s,o=this.options.range,u=this.options,a=this,f=this._animateOff?!1:u.animate,l={};this.options.values&&this.options.values.length?this.handles.each(function(r){n=(a.values(r)-a._valueMin())/(a._valueMax()-a._valueMin())*100,l[a.orientation==="horizontal"?"left":"bottom"]=n+"%",e(this).stop(1,1)[f?"animate":"css"](l,u.animate),a.options.range===!0&&(a.orientation==="horizontal"?(r===0&&a.range.stop(1,1)[f?"animate":"css"]({left:n+"%"},u.animate),r===1&&a.range[f?"animate":"css"]({width:n-t+"%"},{queue:!1,duration:u.animate})):(r===0&&a.range.stop(1,1)[f?"animate":"css"]({bottom:n+"%"},u.animate),r===1&&a.range[f?"animate":"css"]({height:n-t+"%"},{queue:!1,duration:u.animate}))),t=n}):(r=this.value(),i=this._valueMin(),s=this._valueMax(),n=s!==i?(r-i)/(s-i)*100:0,l[this.orientation==="horizontal"?"left":"bottom"]=n+"%",this.handle.stop(1,1)[f?"animate":"css"](l,u.animate),o==="min"&&this.orientation==="horizontal"&&this.range.stop(1,1)[f?"animate":"css"]({width:n+"%"},u.animate),o==="max"&&this.orientation==="horizontal"&&this.range[f?"animate":"css"]({width:100-n+"%"},{queue:!1,duration:u.animate}),o==="min"&&this.orientation==="vertical"&&this.range.stop(1,1)[f?"animate":"css"]({height:n+"%"},u.animate),o==="max"&&this.orientation==="vertical"&&this.range[f?"animate":"css"]({height:100-n+"%"},{queue:!1,duration:u.animate}))},_handleEvents:{keydown:function(t){var r,i,s,o,u=e(t.target).data("ui-slider-handle-index");switch(t.keyCode){case e.ui.keyCode.HOME:case e.ui.keyCode.END:case e.ui.keyCode.PAGE_UP:case e.ui.keyCode.PAGE_DOWN:case e.ui.keyCode.UP:case e.ui.keyCode.RIGHT:case e.ui.keyCode.DOWN:case e.ui.keyCode.LEFT:t.preventDefault();if(!this._keySliding){this._keySliding=!0,e(t.target).addClass("ui-state-active"),r=this._start(t,u);if(r===!1)return}}o=this.options.step,this.options.values&&this.options.values.length?i=s=this.values(u):i=s=this.value();switch(t.keyCode){case e.ui.keyCode.HOME:s=this._valueMin();break;case e.ui.keyCode.END:s=this._valueMax();break;case e.ui.keyCode.PAGE_UP:s=this._trimAlignValue(i+(this._valueMax()-this._valueMin())/n);break;case e.ui.keyCode.PAGE_DOWN:s=this._trimAlignValue(i-(this._valueMax()-this._valueMin())/n);break;case e.ui.keyCode.UP:case e.ui.keyCode.RIGHT:if(i===this._valueMax())return;s=this._trimAlignValue(i+o);break;case e.ui.keyCode.DOWN:case e.ui.keyCode.LEFT:if(i===this._valueMin())return;s=this._trimAlignValue(i-o)}this._slide(t,u,s)},keyup:function(t){var n=e(t.target).data("ui-slider-handle-index");this._keySliding&&(this._keySliding=!1,this._stop(t,n),this._change(t,n),e(t.target).removeClass("ui-state-active"))}}})})(jQuery);(function(e){function t(e){return function(){var t=this.element.val();e.apply(this,arguments),this._refresh(),t!==this.element.val()&&this._trigger("change")}}e.widget("ui.spinner",{version:"1.10.0",defaultElement:"<input>",widgetEventPrefix:"spin",options:{culture:null,icons:{down:"ui-icon-triangle-1-s",up:"ui-icon-triangle-1-n"},incremental:!0,max:null,min:null,numberFormat:null,page:10,step:1,change:null,spin:null,start:null,stop:null},_create:function(){this._setOption("max",this.options.max),this._setOption("min",this.options.min),this._setOption("step",this.options.step),this._value(this.element.val(),!0),this._draw(),this._on(this._events),this._refresh(),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_getCreateOptions:function(){var t={},n=this.element;return e.each(["min","max","step"],function(e,r){var i=n.attr(r);i!==undefined&&i.length&&(t[r]=i)}),t},_events:{keydown:function(e){this._start(e)&&this._keydown(e)&&e.preventDefault()},keyup:"_stop",focus:function(){this.previous=this.element.val()},blur:function(e){if(this.cancelBlur){delete this.cancelBlur;return}this._refresh(),this.previous!==this.element.val()&&this._trigger("change",e)},mousewheel:function(e,t){if(!t)return;if(!this.spinning&&!this._start(e))return!1;this._spin((t>0?1:-1)*this.options.step,e),clearTimeout(this.mousewheelTimer),this.mousewheelTimer=this._delay(function(){this.spinning&&this._stop(e)},100),e.preventDefault()},"mousedown .ui-spinner-button":function(t){function r(){var e=this.element[0]===this.document[0].activeElement;e||(this.element.focus(),this.previous=n,this._delay(function(){this.previous=n}))}var n;n=this.element[0]===this.document[0].activeElement?this.previous:this.element.val(),t.preventDefault(),r.call(this),this.cancelBlur=!0,this._delay(function(){delete this.cancelBlur,r.call(this)});if(this._start(t)===!1)return;this._repeat(null,e(t.currentTarget).hasClass("ui-spinner-up")?1:-1,t)},"mouseup .ui-spinner-button":"_stop","mouseenter .ui-spinner-button":function(t){if(!e(t.currentTarget).hasClass("ui-state-active"))return;if(this._start(t)===!1)return!1;this._repeat(null,e(t.currentTarget).hasClass("ui-spinner-up")?1:-1,t)},"mouseleave .ui-spinner-button":"_stop"},_draw:function(){var e=this.uiSpinner=this.element.addClass("ui-spinner-input").attr("autocomplete","off").wrap(this._uiSpinnerHtml()).parent().append(this._buttonHtml());this.element.attr("role","spinbutton"),this.buttons=e.find(".ui-spinner-button").attr("tabIndex",-1).button().removeClass("ui-corner-all"),this.buttons.height()>Math.ceil(e.height()*.5)&&e.height()>0&&e.height(e.height()),this.options.disabled&&this.disable()},_keydown:function(t){var n=this.options,r=e.ui.keyCode;switch(t.keyCode){case r.UP:return this._repeat(null,1,t),!0;case r.DOWN:return this._repeat(null,-1,t),!0;case r.PAGE_UP:return this._repeat(null,n.page,t),!0;case r.PAGE_DOWN:return this._repeat(null,-n.page,t),!0}return!1},_uiSpinnerHtml:function(){return"<span class='ui-spinner ui-widget ui-widget-content ui-corner-all'></span>"},_buttonHtml:function(){return"<a class='ui-spinner-button ui-spinner-up ui-corner-tr'><span class='ui-icon "+this.options.icons.up+"'>&#9650;</span>"+"</a>"+"<a class='ui-spinner-button ui-spinner-down ui-corner-br'>"+"<span class='ui-icon "+this.options.icons.down+"'>&#9660;</span>"+"</a>"},_start:function(e){return!this.spinning&&this._trigger("start",e)===!1?!1:(this.counter||(this.counter=1),this.spinning=!0,!0)},_repeat:function(e,t,n){e=e||500,clearTimeout(this.timer),this.timer=this._delay(function(){this._repeat(40,t,n)},e),this._spin(t*this.options.step,n)},_spin:function(e,t){var n=this.value()||0;this.counter||(this.counter=1),n=this._adjustValue(n+e*this._increment(this.counter));if(!this.spinning||this._trigger("spin",t,{value:n})!==!1)this._value(n),this.counter++},_increment:function(t){var n=this.options.incremental;return n?e.isFunction(n)?n(t):Math.floor(t*t*t/5e4-t*t/500+17*t/200+1):1},_precision:function(){var e=this._precisionOf(this.options.step);return this.options.min!==null&&(e=Math.max(e,this._precisionOf(this.options.min))),e},_precisionOf:function(e){var t=e.toString(),n=t.indexOf(".");return n===-1?0:t.length-n-1},_adjustValue:function(e){var t,n,r=this.options;return t=r.min!==null?r.min:0,n=e-t,n=Math.round(n/r.step)*r.step,e=t+n,e=parseFloat(e.toFixed(this._precision())),r.max!==null&&e>r.max?r.max:r.min!==null&&e<r.min?r.min:e},_stop:function(e){if(!this.spinning)return;clearTimeout(this.timer),clearTimeout(this.mousewheelTimer),this.counter=0,this.spinning=!1,this._trigger("stop",e)},_setOption:function(e,t){if(e==="culture"||e==="numberFormat"){var n=this._parse(this.element.val());this.options[e]=t,this.element.val(this._format(n));return}(e==="max"||e==="min"||e==="step")&&typeof t=="string"&&(t=this._parse(t)),e==="icons"&&(this.buttons.first().find(".ui-icon").removeClass(this.options.icons.up).addClass(t.up),this.buttons.last().find(".ui-icon").removeClass(this.options.icons.down).addClass(t.down)),this._super(e,t),e==="disabled"&&(t?(this.element.prop("disabled",!0),this.buttons.button("disable")):(this.element.prop("disabled",!1),this.buttons.button("enable")))},_setOptions:t(function(e){this._super(e),this._value(this.element.val())}),_parse:function(e){return typeof e=="string"&&e!==""&&(e=window.Globalize&&this.options.numberFormat?Globalize.parseFloat(e,10,this.options.culture):+e),e===""||isNaN(e)?null:e},_format:function(e){return e===""?"":window.Globalize&&this.options.numberFormat?Globalize.format(e,this.options.numberFormat,this.options.culture):e},_refresh:function(){this.element.attr({"aria-valuemin":this.options.min,"aria-valuemax":this.options.max,"aria-valuenow":this._parse(this.element.val())})},_value:function(e,t){var n;e!==""&&(n=this._parse(e),n!==null&&(t||(n=this._adjustValue(n)),e=this._format(n))),this.element.val(e),this._refresh()},_destroy:function(){this.element.removeClass("ui-spinner-input").prop("disabled",!1).removeAttr("autocomplete").removeAttr("role").removeAttr("aria-valuemin").removeAttr("aria-valuemax").removeAttr("aria-valuenow"),this.uiSpinner.replaceWith(this.element)},stepUp:t(function(e){this._stepUp(e)}),_stepUp:function(e){this._start()&&(this._spin((e||1)*this.options.step),this._stop())},stepDown:t(function(e){this._stepDown(e)}),_stepDown:function(e){this._start()&&(this._spin((e||1)*-this.options.step),this._stop())},pageUp:t(function(e){this._stepUp((e||1)*this.options.page)}),pageDown:t(function(e){this._stepDown((e||1)*this.options.page)}),value:function(e){if(!arguments.length)return this._parse(this.element.val());t(this._value).call(this,e)},widget:function(){return this.uiSpinner}})})(jQuery);(function(e,t){function i(){return++n}function s(e){return e.hash.length>1&&decodeURIComponent(e.href.replace(r,""))===decodeURIComponent(location.href.replace(r,""))}var n=0,r=/#.*$/;e.widget("ui.tabs",{version:"1.10.0",delay:300,options:{active:null,collapsible:!1,event:"click",heightStyle:"content",hide:null,show:null,activate:null,beforeActivate:null,beforeLoad:null,load:null},_create:function(){var t=this,n=this.options;this.running=!1,this.element.addClass("ui-tabs ui-widget ui-widget-content ui-corner-all").toggleClass("ui-tabs-collapsible",n.collapsible).delegate(".ui-tabs-nav > li","mousedown"+this.eventNamespace,function(t){e(this).is(".ui-state-disabled")&&t.preventDefault()}).delegate(".ui-tabs-anchor","focus"+this.eventNamespace,function(){e(this).closest("li").is(".ui-state-disabled")&&this.blur()}),this._processTabs(),n.active=this._initialActive(),e.isArray(n.disabled)&&(n.disabled=e.unique(n.disabled.concat(e.map(this.tabs.filter(".ui-state-disabled"),function(e){return t.tabs.index(e)}))).sort()),this.options.active!==!1&&this.anchors.length?this.active=this._findActive(n.active):this.active=e(),this._refresh(),this.active.length&&this.load(n.active)},_initialActive:function(){var t=this.options.active,n=this.options.collapsible,r=location.hash.substring(1);if(t===null){r&&this.tabs.each(function(n,i){if(e(i).attr("aria-controls")===r)return t=n,!1}),t===null&&(t=this.tabs.index(this.tabs.filter(".ui-tabs-active")));if(t===null||t===-1)t=this.tabs.length?0:!1}return t!==!1&&(t=this.tabs.index(this.tabs.eq(t)),t===-1&&(t=n?!1:0)),!n&&t===!1&&this.anchors.length&&(t=0),t},_getCreateEventData:function(){return{tab:this.active,panel:this.active.length?this._getPanelForTab(this.active):e()}},_tabKeydown:function(t){var n=e(this.document[0].activeElement).closest("li"),r=this.tabs.index(n),i=!0;if(this._handlePageNav(t))return;switch(t.keyCode){case e.ui.keyCode.RIGHT:case e.ui.keyCode.DOWN:r++;break;case e.ui.keyCode.UP:case e.ui.keyCode.LEFT:i=!1,r--;break;case e.ui.keyCode.END:r=this.anchors.length-1;break;case e.ui.keyCode.HOME:r=0;break;case e.ui.keyCode.SPACE:t.preventDefault(),clearTimeout(this.activating),this._activate(r);return;case e.ui.keyCode.ENTER:t.preventDefault(),clearTimeout(this.activating),this._activate(r===this.options.active?!1:r);return;default:return}t.preventDefault(),clearTimeout(this.activating),r=this._focusNextTab(r,i),t.ctrlKey||(n.attr("aria-selected","false"),this.tabs.eq(r).attr("aria-selected","true"),this.activating=this._delay(function(){this.option("active",r)},this.delay))},_panelKeydown:function(t){if(this._handlePageNav(t))return;t.ctrlKey&&t.keyCode===e.ui.keyCode.UP&&(t.preventDefault(),this.active.focus())},_handlePageNav:function(t){if(t.altKey&&t.keyCode===e.ui.keyCode.PAGE_UP)return this._activate(this._focusNextTab(this.options.active-1,!1)),!0;if(t.altKey&&t.keyCode===e.ui.keyCode.PAGE_DOWN)return this._activate(this._focusNextTab(this.options.active+1,!0)),!0},_findNextTab:function(t,n){function i(){return t>r&&(t=0),t<0&&(t=r),t}var r=this.tabs.length-1;while(e.inArray(i(),this.options.disabled)!==-1)t=n?t+1:t-1;return t},_focusNextTab:function(e,t){return e=this._findNextTab(e,t),this.tabs.eq(e).focus(),e},_setOption:function(e,t){if(e==="active"){this._activate(t);return}if(e==="disabled"){this._setupDisabled(t);return}this._super(e,t),e==="collapsible"&&(this.element.toggleClass("ui-tabs-collapsible",t),!t&&this.options.active===!1&&this._activate(0)),e==="event"&&this._setupEvents(t),e==="heightStyle"&&this._setupHeightStyle(t)},_tabId:function(e){return e.attr("aria-controls")||"ui-tabs-"+i()},_sanitizeSelector:function(e){return e?e.replace(/[!"$%&'()*+,.\/:;<=>?@\[\]\^`{|}~]/g,"\\$&"):""},refresh:function(){var t=this.options,n=this.tablist.children(":has(a[href])");t.disabled=e.map(n.filter(".ui-state-disabled"),function(e){return n.index(e)}),this._processTabs(),t.active===!1||!this.anchors.length?(t.active=!1,this.active=e()):this.active.length&&!e.contains(this.tablist[0],this.active[0])?this.tabs.length===t.disabled.length?(t.active=!1,this.active=e()):this._activate(this._findNextTab(Math.max(0,t.active-1),!1)):t.active=this.tabs.index(this.active),this._refresh()},_refresh:function(){this._setupDisabled(this.options.disabled),this._setupEvents(this.options.event),this._setupHeightStyle(this.options.heightStyle),this.tabs.not(this.active).attr({"aria-selected":"false",tabIndex:-1}),this.panels.not(this._getPanelForTab(this.active)).hide().attr({"aria-expanded":"false","aria-hidden":"true"}),this.active.length?(this.active.addClass("ui-tabs-active ui-state-active").attr({"aria-selected":"true",tabIndex:0}),this._getPanelForTab(this.active).show().attr({"aria-expanded":"true","aria-hidden":"false"})):this.tabs.eq(0).attr("tabIndex",0)},_processTabs:function(){var t=this;this.tablist=this._getList().addClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all").attr("role","tablist"),this.tabs=this.tablist.find("> li:has(a[href])").addClass("ui-state-default ui-corner-top").attr({role:"tab",tabIndex:-1}),this.anchors=this.tabs.map(function(){return e("a",this)[0]}).addClass("ui-tabs-anchor").attr({role:"presentation",tabIndex:-1}),this.panels=e(),this.anchors.each(function(n,r){var i,o,u,a=e(r).uniqueId().attr("id"),f=e(r).closest("li"),l=f.attr("aria-controls");s(r)?(i=r.hash,o=t.element.find(t._sanitizeSelector(i))):(u=t._tabId(f),i="#"+u,o=t.element.find(i),o.length||(o=t._createPanel(u),o.insertAfter(t.panels[n-1]||t.tablist)),o.attr("aria-live","polite")),o.length&&(t.panels=t.panels.add(o)),l&&f.data("ui-tabs-aria-controls",l),f.attr({"aria-controls":i.substring(1),"aria-labelledby":a}),o.attr("aria-labelledby",a)}),this.panels.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").attr("role","tabpanel")},_getList:function(){return this.element.find("ol,ul").eq(0)},_createPanel:function(t){return e("<div>").attr("id",t).addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").data("ui-tabs-destroy",!0)},_setupDisabled:function(t){e.isArray(t)&&(t.length?t.length===this.anchors.length&&(t=!0):t=!1);for(var n=0,r;r=this.tabs[n];n++)t===!0||e.inArray(n,t)!==-1?e(r).addClass("ui-state-disabled").attr("aria-disabled","true"):e(r).removeClass("ui-state-disabled").removeAttr("aria-disabled");this.options.disabled=t},_setupEvents:function(t){var n={click:function(e){e.preventDefault()}};t&&e.each(t.split(" "),function(e,t){n[t]="_eventHandler"}),this._off(this.anchors.add(this.tabs).add(this.panels)),this._on(this.anchors,n),this._on(this.tabs,{keydown:"_tabKeydown"}),this._on(this.panels,{keydown:"_panelKeydown"}),this._focusable(this.tabs),this._hoverable(this.tabs)},_setupHeightStyle:function(t){var n,r=this.element.parent();t==="fill"?(n=r.height(),n-=this.element.outerHeight()-this.element.height(),this.element.siblings(":visible").each(function(){var t=e(this),r=t.css("position");if(r==="absolute"||r==="fixed")return;n-=t.outerHeight(!0)}),this.element.children().not(this.panels).each(function(){n-=e(this).outerHeight(!0)}),this.panels.each(function(){e(this).height(Math.max(0,n-e(this).innerHeight()+e(this).height()))}).css("overflow","auto")):t==="auto"&&(n=0,this.panels.each(function(){n=Math.max(n,e(this).height("").height())}).height(n))},_eventHandler:function(t){var n=this.options,r=this.active,i=e(t.currentTarget),s=i.closest("li"),o=s[0]===r[0],u=o&&n.collapsible,a=u?e():this._getPanelForTab(s),f=r.length?this._getPanelForTab(r):e(),l={oldTab:r,oldPanel:f,newTab:u?e():s,newPanel:a};t.preventDefault();if(s.hasClass("ui-state-disabled")||s.hasClass("ui-tabs-loading")||this.running||o&&!n.collapsible||this._trigger("beforeActivate",t,l)===!1)return;n.active=u?!1:this.tabs.index(s),this.active=o?e():s,this.xhr&&this.xhr.abort(),!f.length&&!a.length&&e.error("jQuery UI Tabs: Mismatching fragment identifier."),a.length&&this.load(this.tabs.index(s),t),this._toggle(t,l)},_toggle:function(t,n){function o(){r.running=!1,r._trigger("activate",t,n)}function u(){n.newTab.closest("li").addClass("ui-tabs-active ui-state-active"),i.length&&r.options.show?r._show(i,r.options.show,o):(i.show(),o())}var r=this,i=n.newPanel,s=n.oldPanel;this.running=!0,s.length&&this.options.hide?this._hide(s,this.options.hide,function(){n.oldTab.closest("li").removeClass("ui-tabs-active ui-state-active"),u()}):(n.oldTab.closest("li").removeClass("ui-tabs-active ui-state-active"),s.hide(),u()),s.attr({"aria-expanded":"false","aria-hidden":"true"}),n.oldTab.attr("aria-selected","false"),i.length&&s.length?n.oldTab.attr("tabIndex",-1):i.length&&this.tabs.filter(function(){return e(this).attr("tabIndex")===0}).attr("tabIndex",-1),i.attr({"aria-expanded":"true","aria-hidden":"false"}),n.newTab.attr({"aria-selected":"true",tabIndex:0})},_activate:function(t){var n,r=this._findActive(t);if(r[0]===this.active[0])return;r.length||(r=this.active),n=r.find(".ui-tabs-anchor")[0],this._eventHandler({target:n,currentTarget:n,preventDefault:e.noop})},_findActive:function(t){return t===!1?e():this.tabs.eq(t)},_getIndex:function(e){return typeof e=="string"&&(e=this.anchors.index(this.anchors.filter("[href$='"+e+"']"))),e},_destroy:function(){this.xhr&&this.xhr.abort(),this.element.removeClass("ui-tabs ui-widget ui-widget-content ui-corner-all ui-tabs-collapsible"),this.tablist.removeClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all").removeAttr("role"),this.anchors.removeClass("ui-tabs-anchor").removeAttr("role").removeAttr("tabIndex").removeUniqueId(),this.tabs.add(this.panels).each(function(){e.data(this,"ui-tabs-destroy")?e(this).remove():e(this).removeClass("ui-state-default ui-state-active ui-state-disabled ui-corner-top ui-corner-bottom ui-widget-content ui-tabs-active ui-tabs-panel").removeAttr("tabIndex").removeAttr("aria-live").removeAttr("aria-busy").removeAttr("aria-selected").removeAttr("aria-labelledby").removeAttr("aria-hidden").removeAttr("aria-expanded").removeAttr("role")}),this.tabs.each(function(){var t=e(this),n=t.data("ui-tabs-aria-controls");n?t.attr("aria-controls",n).removeData("ui-tabs-aria-controls"):t.removeAttr("aria-controls")}),this.panels.show(),this.options.heightStyle!=="content"&&this.panels.css("height","")},enable:function(n){var r=this.options.disabled;if(r===!1)return;n===t?r=!1:(n=this._getIndex(n),e.isArray(r)?r=e.map(r,function(e){return e!==n?e:null}):r=e.map(this.tabs,function(e,t){return t!==n?t:null})),this._setupDisabled(r)},disable:function(n){var r=this.options.disabled;if(r===!0)return;if(n===t)r=!0;else{n=this._getIndex(n);if(e.inArray(n,r)!==-1)return;e.isArray(r)?r=e.merge([n],r).sort():r=[n]}this._setupDisabled(r)},load:function(t,n){t=this._getIndex(t);var r=this,i=this.tabs.eq(t),o=i.find(".ui-tabs-anchor"),u=this._getPanelForTab(i),a={tab:i,panel:u};if(s(o[0]))return;this.xhr=e.ajax(this._ajaxSettings(o,n,a)),this.xhr&&this.xhr.statusText!=="canceled"&&(i.addClass("ui-tabs-loading"),u.attr("aria-busy","true"),this.xhr.success(function(e){setTimeout(function(){u.html(e),r._trigger("load",n,a)},1)}).complete(function(e,t){setTimeout(function(){t==="abort"&&r.panels.stop(!1,!0),i.removeClass("ui-tabs-loading"),u.removeAttr("aria-busy"),e===r.xhr&&delete r.xhr},1)}))},_ajaxSettings:function(t,n,r){var i=this;return{url:t.attr("href"),beforeSend:function(t,s){return i._trigger("beforeLoad",n,e.extend({jqXHR:t,ajaxSettings:s},r))}}},_getPanelForTab:function(t){var n=e(t).attr("aria-controls");return this.element.find(this._sanitizeSelector("#"+n))}})})(jQuery);(function(e){function n(t,n){var r=(t.attr("aria-describedby")||"").split(/\s+/);r.push(n),t.data("ui-tooltip-id",n).attr("aria-describedby",e.trim(r.join(" ")))}function r(t){var n=t.data("ui-tooltip-id"),r=(t.attr("aria-describedby")||"").split(/\s+/),i=e.inArray(n,r);i!==-1&&r.splice(i,1),t.removeData("ui-tooltip-id"),r=e.trim(r.join(" ")),r?t.attr("aria-describedby",r):t.removeAttr("aria-describedby")}var t=0;e.widget("ui.tooltip",{version:"1.10.0",options:{content:function(){var t=e(this).attr("title")||"";return e("<a>").text(t).html()},hide:!0,items:"[title]:not([disabled])",position:{my:"left top+15",at:"left bottom",collision:"flipfit flip"},show:!0,tooltipClass:null,track:!1,close:null,open:null},_create:function(){this._on({mouseover:"open",focusin:"open"}),this.tooltips={},this.parents={},this.options.disabled&&this._disable()},_setOption:function(t,n){var r=this;if(t==="disabled"){this[n?"_disable":"_enable"](),this.options[t]=n;return}this._super(t,n),t==="content"&&e.each(this.tooltips,function(e,t){r._updateContent(t)})},_disable:function(){var t=this;e.each(this.tooltips,function(n,r){var i=e.Event("blur");i.target=i.currentTarget=r[0],t.close(i,!0)}),this.element.find(this.options.items).addBack().each(function(){var t=e(this);t.is("[title]")&&t.data("ui-tooltip-title",t.attr("title")).attr("title","")})},_enable:function(){this.element.find(this.options.items).addBack().each(function(){var t=e(this);t.data("ui-tooltip-title")&&t.attr("title",t.data("ui-tooltip-title"))})},open:function(t){var n=this,r=e(t?t.target:this.element).closest(this.options.items);if(!r.length||r.data("ui-tooltip-id"))return;r.attr("title")&&r.data("ui-tooltip-title",r.attr("title")),r.data("ui-tooltip-open",!0),t&&t.type==="mouseover"&&r.parents().each(function(){var t=e(this),r;t.data("ui-tooltip-open")&&(r=e.Event("blur"),r.target=r.currentTarget=this,n.close(r,!0)),t.attr("title")&&(t.uniqueId(),n.parents[this.id]={element:this,title:t.attr("title")},t.attr("title",""))}),this._updateContent(r,t)},_updateContent:function(e,t){var n,r=this.options.content,i=this,s=t?t.type:null;if(typeof r=="string")return this._open(t,e,r);n=r.call(e[0],function(n){if(!e.data("ui-tooltip-open"))return;i._delay(function(){t&&(t.type=s),this._open(t,e,n)})}),n&&this._open(t,e,n)},_open:function(t,r,i){function f(e){a.of=e;if(s.is(":hidden"))return;s.position(a)}var s,o,u,a=e.extend({},this.options.position);if(!i)return;s=this._find(r);if(s.length){s.find(".ui-tooltip-content").html(i);return}r.is("[title]")&&(t&&t.type==="mouseover"?r.attr("title",""):r.removeAttr("title")),s=this._tooltip(r),n(r,s.attr("id")),s.find(".ui-tooltip-content").html(i),this.options.track&&t&&/^mouse/.test(t.type)?(this._on(this.document,{mousemove:f}),f(t)):s.position(e.extend({of:r},this.options.position)),s.hide(),this._show(s,this.options.show),this.options.show&&this.options.show.delay&&(u=this.delayedShow=setInterval(function(){s.is(":visible")&&(f(a.of),clearInterval(u))},e.fx.interval)),this._trigger("open",t,{tooltip:s}),o={keyup:function(t){if(t.keyCode===e.ui.keyCode.ESCAPE){var n=e.Event(t);n.currentTarget=r[0],this.close(n,!0)}},remove:function(){this._removeTooltip(s)}};if(!t||t.type==="mouseover")o.mouseleave="close";if(!t||t.type==="focusin")o.focusout="close";this._on(!0,r,o)},close:function(t){var n=this,i=e(t?t.currentTarget:this.element),s=this._find(i);if(this.closing)return;clearInterval(this.delayedShow),i.data("ui-tooltip-title")&&i.attr("title",i.data("ui-tooltip-title")),r(i),s.stop(!0),this._hide(s,this.options.hide,function(){n._removeTooltip(e(this))}),i.removeData("ui-tooltip-open"),this._off(i,"mouseleave focusout keyup"),i[0]!==this.element[0]&&this._off(i,"remove"),this._off(this.document,"mousemove"),t&&t.type==="mouseleave"&&e.each(this.parents,function(t,r){e(r.element).attr("title",r.title),delete n.parents[t]}),this.closing=!0,this._trigger("close",t,{tooltip:s}),this.closing=!1},_tooltip:function(n){var r="ui-tooltip-"+t++,i=e("<div>").attr({id:r,role:"tooltip"}).addClass("ui-tooltip ui-widget ui-corner-all ui-widget-content "+(this.options.tooltipClass||""));return e("<div>").addClass("ui-tooltip-content").appendTo(i),i.appendTo(this.document[0].body),this.tooltips[r]=n,i},_find:function(t){var n=t.data("ui-tooltip-id");return n?e("#"+n):e()},_removeTooltip:function(e){e.remove(),delete this.tooltips[e.attr("id")]},_destroy:function(){var t=this;e.each(this.tooltips,function(n,r){var i=e.Event("blur");i.target=i.currentTarget=r[0],t.close(i,!0),e("#"+n).remove(),r.data("ui-tooltip-title")&&(r.attr("title",r.data("ui-tooltip-title")),r.removeData("ui-tooltip-title"))})}})})(jQuery);jQuery.effects||function(e,t){var n="ui-effects-";e.effects={effect:{}},function(e,t){function h(e,t,n){var r=u[t.type]||{};return e==null?n||!t.def?null:t.def:(e=r.floor?~~e:parseFloat(e),isNaN(e)?t.def:r.mod?(e+r.mod)%r.mod:0>e?0:r.max<e?r.max:e)}function p(t){var n=s(),r=n._rgba=[];return t=t.toLowerCase(),c(i,function(e,i){var s,u=i.re.exec(t),a=u&&i.parse(u),f=i.space||"rgba";if(a)return s=n[f](a),n[o[f].cache]=s[o[f].cache],r=n._rgba=s._rgba,!1}),r.length?(r.join()==="0,0,0,0"&&e.extend(r,l.transparent),n):l[t]}function d(e,t,n){return n=(n+1)%1,n*6<1?e+(t-e)*n*6:n*2<1?t:n*3<2?e+(t-e)*(2/3-n)*6:e}var n="backgroundColor borderBottomColor borderLeftColor borderRightColor borderTopColor color columnRuleColor outlineColor textDecorationColor textEmphasisColor",r=/^([\-+])=\s*(\d+\.?\d*)/,i=[{re:/rgba?\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,parse:function(e){return[e[1],e[2],e[3],e[4]]}},{re:/rgba?\(\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,parse:function(e){return[e[1]*2.55,e[2]*2.55,e[3]*2.55,e[4]]}},{re:/#([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})/,parse:function(e){return[parseInt(e[1],16),parseInt(e[2],16),parseInt(e[3],16)]}},{re:/#([a-f0-9])([a-f0-9])([a-f0-9])/,parse:function(e){return[parseInt(e[1]+e[1],16),parseInt(e[2]+e[2],16),parseInt(e[3]+e[3],16)]}},{re:/hsla?\(\s*(\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,space:"hsla",parse:function(e){return[e[1],e[2]/100,e[3]/100,e[4]]}}],s=e.Color=function(t,n,r,i){return new e.Color.fn.parse(t,n,r,i)},o={rgba:{props:{red:{idx:0,type:"byte"},green:{idx:1,type:"byte"},blue:{idx:2,type:"byte"}}},hsla:{props:{hue:{idx:0,type:"degrees"},saturation:{idx:1,type:"percent"},lightness:{idx:2,type:"percent"}}}},u={"byte":{floor:!0,max:255},percent:{max:1},degrees:{mod:360,floor:!0}},a=s.support={},f=e("<p>")[0],l,c=e.each;f.style.cssText="background-color:rgba(1,1,1,.5)",a.rgba=f.style.backgroundColor.indexOf("rgba")>-1,c(o,function(e,t){t.cache="_"+e,t.props.alpha={idx:3,type:"percent",def:1}}),s.fn=e.extend(s.prototype,{parse:function(n,r,i,u){if(n===t)return this._rgba=[null,null,null,null],this;if(n.jquery||n.nodeType)n=e(n).css(r),r=t;var a=this,f=e.type(n),d=this._rgba=[];r!==t&&(n=[n,r,i,u],f="array");if(f==="string")return this.parse(p(n)||l._default);if(f==="array")return c(o.rgba.props,function(e,t){d[t.idx]=h(n[t.idx],t)}),this;if(f==="object")return n instanceof s?c(o,function(e,t){n[t.cache]&&(a[t.cache]=n[t.cache].slice())}):c(o,function(t,r){var i=r.cache;c(r.props,function(e,t){if(!a[i]&&r.to){if(e==="alpha"||n[e]==null)return;a[i]=r.to(a._rgba)}a[i][t.idx]=h(n[e],t,!0)}),a[i]&&e.inArray(null,a[i].slice(0,3))<0&&(a[i][3]=1,r.from&&(a._rgba=r.from(a[i])))}),this},is:function(e){var t=s(e),n=!0,r=this;return c(o,function(e,i){var s,o=t[i.cache];return o&&(s=r[i.cache]||i.to&&i.to(r._rgba)||[],c(i.props,function(e,t){if(o[t.idx]!=null)return n=o[t.idx]===s[t.idx],n})),n}),n},_space:function(){var e=[],t=this;return c(o,function(n,r){t[r.cache]&&e.push(n)}),e.pop()},transition:function(e,t){var n=s(e),r=n._space(),i=o[r],a=this.alpha()===0?s("transparent"):this,f=a[i.cache]||i.to(a._rgba),l=f.slice();return n=n[i.cache],c(i.props,function(e,r){var i=r.idx,s=f[i],o=n[i],a=u[r.type]||{};if(o===null)return;s===null?l[i]=o:(a.mod&&(o-s>a.mod/2?s+=a.mod:s-o>a.mod/2&&(s-=a.mod)),l[i]=h((o-s)*t+s,r))}),this[r](l)},blend:function(t){if(this._rgba[3]===1)return this;var n=this._rgba.slice(),r=n.pop(),i=s(t)._rgba;return s(e.map(n,function(e,t){return(1-r)*i[t]+r*e}))},toRgbaString:function(){var t="rgba(",n=e.map(this._rgba,function(e,t){return e==null?t>2?1:0:e});return n[3]===1&&(n.pop(),t="rgb("),t+n.join()+")"},toHslaString:function(){var t="hsla(",n=e.map(this.hsla(),function(e,t){return e==null&&(e=t>2?1:0),t&&t<3&&(e=Math.round(e*100)+"%"),e});return n[3]===1&&(n.pop(),t="hsl("),t+n.join()+")"},toHexString:function(t){var n=this._rgba.slice(),r=n.pop();return t&&n.push(~~(r*255)),"#"+e.map(n,function(e){return e=(e||0).toString(16),e.length===1?"0"+e:e}).join("")},toString:function(){return this._rgba[3]===0?"transparent":this.toRgbaString()}}),s.fn.parse.prototype=s.fn,o.hsla.to=function(e){if(e[0]==null||e[1]==null||e[2]==null)return[null,null,null,e[3]];var t=e[0]/255,n=e[1]/255,r=e[2]/255,i=e[3],s=Math.max(t,n,r),o=Math.min(t,n,r),u=s-o,a=s+o,f=a*.5,l,c;return o===s?l=0:t===s?l=60*(n-r)/u+360:n===s?l=60*(r-t)/u+120:l=60*(t-n)/u+240,u===0?c=0:f<=.5?c=u/a:c=u/(2-a),[Math.round(l)%360,c,f,i==null?1:i]},o.hsla.from=function(e){if(e[0]==null||e[1]==null||e[2]==null)return[null,null,null,e[3]];var t=e[0]/360,n=e[1],r=e[2],i=e[3],s=r<=.5?r*(1+n):r+n-r*n,o=2*r-s;return[Math.round(d(o,s,t+1/3)*255),Math.round(d(o,s,t)*255),Math.round(d(o,s,t-1/3)*255),i]},c(o,function(n,i){var o=i.props,u=i.cache,a=i.to,f=i.from;s.fn[n]=function(n){a&&!this[u]&&(this[u]=a(this._rgba));if(n===t)return this[u].slice();var r,i=e.type(n),l=i==="array"||i==="object"?n:arguments,p=this[u].slice();return c(o,function(e,t){var n=l[i==="object"?e:t.idx];n==null&&(n=p[t.idx]),p[t.idx]=h(n,t)}),f?(r=s(f(p)),r[u]=p,r):s(p)},c(o,function(t,i){if(s.fn[t])return;s.fn[t]=function(s){var o=e.type(s),u=t==="alpha"?this._hsla?"hsla":"rgba":n,a=this[u](),f=a[i.idx],l;return o==="undefined"?f:(o==="function"&&(s=s.call(this,f),o=e.type(s)),s==null&&i.empty?this:(o==="string"&&(l=r.exec(s),l&&(s=f+parseFloat(l[2])*(l[1]==="+"?1:-1))),a[i.idx]=s,this[u](a)))}})}),s.hook=function(t){var n=t.split(" ");c(n,function(t,n){e.cssHooks[n]={set:function(t,r){var i,o,u="";if(r!=="transparent"&&(e.type(r)!=="string"||(i=p(r)))){r=s(i||r);if(!a.rgba&&r._rgba[3]!==1){o=n==="backgroundColor"?t.parentNode:t;while((u===""||u==="transparent")&&o&&o.style)try{u=e.css(o,"backgroundColor"),o=o.parentNode}catch(f){}r=r.blend(u&&u!=="transparent"?u:"_default")}r=r.toRgbaString()}try{t.style[n]=r}catch(f){}}},e.fx.step[n]=function(t){t.colorInit||(t.start=s(t.elem,n),t.end=s(t.end),t.colorInit=!0),e.cssHooks[n].set(t.elem,t.start.transition(t.end,t.pos))}})},s.hook(n),e.cssHooks.borderColor={expand:function(e){var t={};return c(["Top","Right","Bottom","Left"],function(n,r){t["border"+r+"Color"]=e}),t}},l=e.Color.names={aqua:"#00ffff",black:"#000000",blue:"#0000ff",fuchsia:"#ff00ff",gray:"#808080",green:"#008000",lime:"#00ff00",maroon:"#800000",navy:"#000080",olive:"#808000",purple:"#800080",red:"#ff0000",silver:"#c0c0c0",teal:"#008080",white:"#ffffff",yellow:"#ffff00",transparent:[null,null,null,0],_default:"#ffffff"}}(jQuery),function(){function i(t){var n,r,i=t.ownerDocument.defaultView?t.ownerDocument.defaultView.getComputedStyle(t,null):t.currentStyle,s={};if(i&&i.length&&i[0]&&i[i[0]]){r=i.length;while(r--)n=i[r],typeof i[n]=="string"&&(s[e.camelCase(n)]=i[n])}else for(n in i)typeof i[n]=="string"&&(s[n]=i[n]);return s}function s(t,n){var i={},s,o;for(s in n)o=n[s],t[s]!==o&&!r[s]&&(e.fx.step[s]||!isNaN(parseFloat(o)))&&(i[s]=o);return i}var n=["add","remove","toggle"],r={border:1,borderBottom:1,borderColor:1,borderLeft:1,borderRight:1,borderTop:1,borderWidth:1,margin:1,padding:1};e.each(["borderLeftStyle","borderRightStyle","borderBottomStyle","borderTopStyle"],function(t,n){e.fx.step[n]=function(e){if(e.end!=="none"&&!e.setAttr||e.pos===1&&!e.setAttr)jQuery.style(e.elem,n,e.end),e.setAttr=!0}}),e.fn.addBack||(e.fn.addBack=function(e){return this.add(e==null?this.prevObject:this.prevObject.filter(e))}),e.effects.animateClass=function(t,r,o,u){var a=e.speed(r,o,u);return this.queue(function(){var r=e(this),o=r.attr("class")||"",u,f=a.children?r.find("*").addBack():r;f=f.map(function(){var t=e(this);return{el:t,start:i(this)}}),u=function(){e.each(n,function(e,n){t[n]&&r[n+"Class"](t[n])})},u(),f=f.map(function(){return this.end=i(this.el[0]),this.diff=s(this.start,this.end),this}),r.attr("class",o),f=f.map(function(){var t=this,n=e.Deferred(),r=e.extend({},a,{queue:!1,complete:function(){n.resolve(t)}});return this.el.animate(this.diff,r),n.promise()}),e.when.apply(e,f.get()).done(function(){u(),e.each(arguments,function(){var t=this.el;e.each(this.diff,function(e){t.css(e,"")})}),a.complete.call(r[0])})})},e.fn.extend({_addClass:e.fn.addClass,addClass:function(t,n,r,i){return n?e.effects.animateClass.call(this,{add:t},n,r,i):this._addClass(t)},_removeClass:e.fn.removeClass,removeClass:function(t,n,r,i){return n?e.effects.animateClass.call(this,{remove:t},n,r,i):this._removeClass(t)},_toggleClass:e.fn.toggleClass,toggleClass:function(n,r,i,s,o){return typeof r=="boolean"||r===t?i?e.effects.animateClass.call(this,r?{add:n}:{remove:n},i,s,o):this._toggleClass(n,r):e.effects.animateClass.call(this,{toggle:n},r,i,s)},switchClass:function(t,n,r,i,s){return e.effects.animateClass.call(this,{add:n,remove:t},r,i,s)}})}(),function(){function r(t,n,r,i){e.isPlainObject(t)&&(n=t,t=t.effect),t={effect:t},n==null&&(n={}),e.isFunction(n)&&(i=n,r=null,n={});if(typeof n=="number"||e.fx.speeds[n])i=r,r=n,n={};return e.isFunction(r)&&(i=r,r=null),n&&e.extend(t,n),r=r||n.duration,t.duration=e.fx.off?0:typeof r=="number"?r:r in e.fx.speeds?e.fx.speeds[r]:e.fx.speeds._default,t.complete=i||n.complete,t}function i(t){return!t||typeof t=="number"||e.fx.speeds[t]?!0:typeof t=="string"&&!e.effects.effect[t]}e.extend(e.effects,{version:"1.10.0",save:function(e,t){for(var r=0;r<t.length;r++)t[r]!==null&&e.data(n+t[r],e[0].style[t[r]])},restore:function(e,r){var i,s;for(s=0;s<r.length;s++)r[s]!==null&&(i=e.data(n+r[s]),i===t&&(i=""),e.css(r[s],i))},setMode:function(e,t){return t==="toggle"&&(t=e.is(":hidden")?"show":"hide"),t},getBaseline:function(e,t){var n,r;switch(e[0]){case"top":n=0;break;case"middle":n=.5;break;case"bottom":n=1;break;default:n=e[0]/t.height}switch(e[1]){case"left":r=0;break;case"center":r=.5;break;case"right":r=1;break;default:r=e[1]/t.width}return{x:r,y:n}},createWrapper:function(t){if(t.parent().is(".ui-effects-wrapper"))return t.parent();var n={width:t.outerWidth(!0),height:t.outerHeight(!0),"float":t.css("float")},r=e("<div></div>").addClass("ui-effects-wrapper").css({fontSize:"100%",background:"transparent",border:"none",margin:0,padding:0}),i={width:t.width(),height:t.height()},s=document.activeElement;try{s.id}catch(o){s=document.body}return t.wrap(r),(t[0]===s||e.contains(t[0],s))&&e(s).focus(),r=t.parent(),t.css("position")==="static"?(r.css({position:"relative"}),t.css({position:"relative"})):(e.extend(n,{position:t.css("position"),zIndex:t.css("z-index")}),e.each(["top","left","bottom","right"],function(e,r){n[r]=t.css(r),isNaN(parseInt(n[r],10))&&(n[r]="auto")}),t.css({position:"relative",top:0,left:0,right:"auto",bottom:"auto"})),t.css(i),r.css(n).show()},removeWrapper:function(t){var n=document.activeElement;return t.parent().is(".ui-effects-wrapper")&&(t.parent().replaceWith(t),(t[0]===n||e.contains(t[0],n))&&e(n).focus()),t},setTransition:function(t,n,r,i){return i=i||{},e.each(n,function(e,n){var s=t.cssUnit(n);s[0]>0&&(i[n]=s[0]*r+s[1])}),i}}),e.fn.extend({effect:function(){function o(n){function u(){e.isFunction(i)&&i.call(r[0]),e.isFunction(n)&&n()}var r=e(this),i=t.complete,o=t.mode;(r.is(":hidden")?o==="hide":o==="show")?u():s.call(r[0],t,u)}var t=r.apply(this,arguments),n=t.mode,i=t.queue,s=e.effects.effect[t.effect];return e.fx.off||!s?n?this[n](t.duration,t.complete):this.each(function(){t.complete&&t.complete.call(this)}):i===!1?this.each(o):this.queue(i||"fx",o)},_show:e.fn.show,show:function(e){if(i(e))return this._show.apply(this,arguments);var t=r.apply(this,arguments);return t.mode="show",this.effect.call(this,t)},_hide:e.fn.hide,hide:function(e){if(i(e))return this._hide.apply(this,arguments);var t=r.apply(this,arguments);return t.mode="hide",this.effect.call(this,t)},__toggle:e.fn.toggle,toggle:function(t){if(i(t)||typeof t=="boolean"||e.isFunction(t))return this.__toggle.apply(this,arguments);var n=r.apply(this,arguments);return n.mode="toggle",this.effect.call(this,n)},cssUnit:function(t){var n=this.css(t),r=[];return e.each(["em","px","%","pt"],function(e,t){n.indexOf(t)>0&&(r=[parseFloat(n),t])}),r}})}(),function(){var t={};e.each(["Quad","Cubic","Quart","Quint","Expo"],function(e,n){t[n]=function(t){return Math.pow(t,e+2)}}),e.extend(t,{Sine:function(e){return 1-Math.cos(e*Math.PI/2)},Circ:function(e){return 1-Math.sqrt(1-e*e)},Elastic:function(e){return e===0||e===1?e:-Math.pow(2,8*(e-1))*Math.sin(((e-1)*80-7.5)*Math.PI/15)},Back:function(e){return e*e*(3*e-2)},Bounce:function(e){var t,n=4;while(e<((t=Math.pow(2,--n))-1)/11);return 1/Math.pow(4,3-n)-7.5625*Math.pow((t*3-2)/22-e,2)}}),e.each(t,function(t,n){e.easing["easeIn"+t]=n,e.easing["easeOut"+t]=function(e){return 1-n(1-e)},e.easing["easeInOut"+t]=function(e){return e<.5?n(e*2)/2:1-n(e*-2+2)/2}})}()}(jQuery);(function(e,t){var n=/up|down|vertical/,r=/up|left|vertical|horizontal/;e.effects.effect.blind=function(t,i){var s=e(this),o=["position","top","bottom","left","right","height","width"],u=e.effects.setMode(s,t.mode||"hide"),a=t.direction||"up",f=n.test(a),l=f?"height":"width",c=f?"top":"left",h=r.test(a),p={},d=u==="show",v,m,g;s.parent().is(".ui-effects-wrapper")?e.effects.save(s.parent(),o):e.effects.save(s,o),s.show(),v=e.effects.createWrapper(s).css({overflow:"hidden"}),m=v[l](),g=parseFloat(v.css(c))||0,p[l]=d?m:0,h||(s.css(f?"bottom":"right",0).css(f?"top":"left","auto").css({position:"absolute"}),p[c]=d?g:m+g),d&&(v.css(l,0),h||v.css(c,g+m)),v.animate(p,{duration:t.duration,easing:t.easing,queue:!1,complete:function(){u==="hide"&&s.hide(),e.effects.restore(s,o),e.effects.removeWrapper(s),i()}})}})(jQuery);(function(e,t){e.effects.effect.bounce=function(t,n){var r=e(this),i=["position","top","bottom","left","right","height","width"],s=e.effects.setMode(r,t.mode||"effect"),o=s==="hide",u=s==="show",a=t.direction||"up",f=t.distance,l=t.times||5,c=l*2+(u||o?1:0),h=t.duration/c,p=t.easing,d=a==="up"||a==="down"?"top":"left",v=a==="up"||a==="left",m,g,y,b=r.queue(),w=b.length;(u||o)&&i.push("opacity"),e.effects.save(r,i),r.show(),e.effects.createWrapper(r),f||(f=r[d==="top"?"outerHeight":"outerWidth"]()/3),u&&(y={opacity:1},y[d]=0,r.css("opacity",0).css(d,v?-f*2:f*2).animate(y,h,p)),o&&(f/=Math.pow(2,l-1)),y={},y[d]=0;for(m=0;m<l;m++)g={},g[d]=(v?"-=":"+=")+f,r.animate(g,h,p).animate(y,h,p),f=o?f*2:f/2;o&&(g={opacity:0},g[d]=(v?"-=":"+=")+f,r.animate(g,h,p)),r.queue(function(){o&&r.hide(),e.effects.restore(r,i),e.effects.removeWrapper(r),n()}),w>1&&b.splice.apply(b,[1,0].concat(b.splice(w,c+1))),r.dequeue()}})(jQuery);(function(e,t){e.effects.effect.clip=function(t,n){var r=e(this),i=["position","top","bottom","left","right","height","width"],s=e.effects.setMode(r,t.mode||"hide"),o=s==="show",u=t.direction||"vertical",a=u==="vertical",f=a?"height":"width",l=a?"top":"left",c={},h,p,d;e.effects.save(r,i),r.show(),h=e.effects.createWrapper(r).css({overflow:"hidden"}),p=r[0].tagName==="IMG"?h:r,d=p[f](),o&&(p.css(f,0),p.css(l,d/2)),c[f]=o?d:0,c[l]=o?0:d/2,p.animate(c,{queue:!1,duration:t.duration,easing:t.easing,complete:function(){o||r.hide(),e.effects.restore(r,i),e.effects.removeWrapper(r),n()}})}})(jQuery);(function(e,t){e.effects.effect.drop=function(t,n){var r=e(this),i=["position","top","bottom","left","right","opacity","height","width"],s=e.effects.setMode(r,t.mode||"hide"),o=s==="show",u=t.direction||"left",a=u==="up"||u==="down"?"top":"left",f=u==="up"||u==="left"?"pos":"neg",l={opacity:o?1:0},c;e.effects.save(r,i),r.show(),e.effects.createWrapper(r),c=t.distance||r[a==="top"?"outerHeight":"outerWidth"](!0)/2,o&&r.css("opacity",0).css(a,f==="pos"?-c:c),l[a]=(o?f==="pos"?"+=":"-=":f==="pos"?"-=":"+=")+c,r.animate(l,{queue:!1,duration:t.duration,easing:t.easing,complete:function(){s==="hide"&&r.hide(),e.effects.restore(r,i),e.effects.removeWrapper(r),n()}})}})(jQuery);(function(e,t){e.effects.effect.explode=function(t,n){function y(){c.push(this),c.length===r*i&&b()}function b(){s.css({visibility:"visible"}),e(c).remove(),u||s.hide(),n()}var r=t.pieces?Math.round(Math.sqrt(t.pieces)):3,i=r,s=e(this),o=e.effects.setMode(s,t.mode||"hide"),u=o==="show",a=s.show().css("visibility","hidden").offset(),f=Math.ceil(s.outerWidth()/i),l=Math.ceil(s.outerHeight()/r),c=[],h,p,d,v,m,g;for(h=0;h<r;h++){v=a.top+h*l,g=h-(r-1)/2;for(p=0;p<i;p++)d=a.left+p*f,m=p-(i-1)/2,s.clone().appendTo("body").wrap("<div></div>").css({position:"absolute",visibility:"visible",left:-p*f,top:-h*l}).parent().addClass("ui-effects-explode").css({position:"absolute",overflow:"hidden",width:f,height:l,left:d+(u?m*f:0),top:v+(u?g*l:0),opacity:u?0:1}).animate({left:d+(u?0:m*f),top:v+(u?0:g*l),opacity:u?1:0},t.duration||500,t.easing,y)}}})(jQuery);(function(e,t){e.effects.effect.fade=function(t,n){var r=e(this),i=e.effects.setMode(r,t.mode||"toggle");r.animate({opacity:i},{queue:!1,duration:t.duration,easing:t.easing,complete:n})}})(jQuery);(function(e,t){e.effects.effect.fold=function(t,n){var r=e(this),i=["position","top","bottom","left","right","height","width"],s=e.effects.setMode(r,t.mode||"hide"),o=s==="show",u=s==="hide",a=t.size||15,f=/([0-9]+)%/.exec(a),l=!!t.horizFirst,c=o!==l,h=c?["width","height"]:["height","width"],p=t.duration/2,d,v,m={},g={};e.effects.save(r,i),r.show(),d=e.effects.createWrapper(r).css({overflow:"hidden"}),v=c?[d.width(),d.height()]:[d.height(),d.width()],f&&(a=parseInt(f[1],10)/100*v[u?0:1]),o&&d.css(l?{height:0,width:a}:{height:a,width:0}),m[h[0]]=o?v[0]:a,g[h[1]]=o?v[1]:0,d.animate(m,p,t.easing).animate(g,p,t.easing,function(){u&&r.hide(),e.effects.restore(r,i),e.effects.removeWrapper(r),n()})}})(jQuery);(function(e,t){e.effects.effect.highlight=function(t,n){var r=e(this),i=["backgroundImage","backgroundColor","opacity"],s=e.effects.setMode(r,t.mode||"show"),o={backgroundColor:r.css("backgroundColor")};s==="hide"&&(o.opacity=0),e.effects.save(r,i),r.show().css({backgroundImage:"none",backgroundColor:t.color||"#ffff99"}).animate(o,{queue:!1,duration:t.duration,easing:t.easing,complete:function(){s==="hide"&&r.hide(),e.effects.restore(r,i),n()}})}})(jQuery);(function(e,t){e.effects.effect.pulsate=function(t,n){var r=e(this),i=e.effects.setMode(r,t.mode||"show"),s=i==="show",o=i==="hide",u=s||i==="hide",a=(t.times||5)*2+(u?1:0),f=t.duration/a,l=0,c=r.queue(),h=c.length,p;if(s||!r.is(":visible"))r.css("opacity",0).show(),l=1;for(p=1;p<a;p++)r.animate({opacity:l},f,t.easing),l=1-l;r.animate({opacity:l},f,t.easing),r.queue(function(){o&&r.hide(),n()}),h>1&&c.splice.apply(c,[1,0].concat(c.splice(h,a+1))),r.dequeue()}})(jQuery);(function(e,t){e.effects.effect.puff=function(t,n){var r=e(this),i=e.effects.setMode(r,t.mode||"hide"),s=i==="hide",o=parseInt(t.percent,10)||150,u=o/100,a={height:r.height(),width:r.width(),outerHeight:r.outerHeight(),outerWidth:r.outerWidth()};e.extend(t,{effect:"scale",queue:!1,fade:!0,mode:i,complete:n,percent:s?o:100,from:s?a:{height:a.height*u,width:a.width*u,outerHeight:a.outerHeight*u,outerWidth:a.outerWidth*u}}),r.effect(t)},e.effects.effect.scale=function(t,n){var r=e(this),i=e.extend(!0,{},t),s=e.effects.setMode(r,t.mode||"effect"),o=parseInt(t.percent,10)||(parseInt(t.percent,10)===0?0:s==="hide"?0:100),u=t.direction||"both",a=t.origin,f={height:r.height(),width:r.width(),outerHeight:r.outerHeight(),outerWidth:r.outerWidth()},l={y:u!=="horizontal"?o/100:1,x:u!=="vertical"?o/100:1};i.effect="size",i.queue=!1,i.complete=n,s!=="effect"&&(i.origin=a||["middle","center"],i.restore=!0),i.from=t.from||(s==="show"?{height:0,width:0,outerHeight:0,outerWidth:0}:f),i.to={height:f.height*l.y,width:f.width*l.x,outerHeight:f.outerHeight*l.y,outerWidth:f.outerWidth*l.x},i.fade&&(s==="show"&&(i.from.opacity=0,i.to.opacity=1),s==="hide"&&(i.from.opacity=1,i.to.opacity=0)),r.effect(i)},e.effects.effect.size=function(t,n){var r,i,s,o=e(this),u=["position","top","bottom","left","right","width","height","overflow","opacity"],a=["position","top","bottom","left","right","overflow","opacity"],f=["width","height","overflow"],l=["fontSize"],c=["borderTopWidth","borderBottomWidth","paddingTop","paddingBottom"],h=["borderLeftWidth","borderRightWidth","paddingLeft","paddingRight"],p=e.effects.setMode(o,t.mode||"effect"),d=t.restore||p!=="effect",v=t.scale||"both",m=t.origin||["middle","center"],g=o.css("position"),y=d?u:a,b={height:0,width:0,outerHeight:0,outerWidth:0};p==="show"&&o.show(),r={height:o.height(),width:o.width(),outerHeight:o.outerHeight(),outerWidth:o.outerWidth()},t.mode==="toggle"&&p==="show"?(o.from=t.to||b,o.to=t.from||r):(o.from=t.from||(p==="show"?b:r),o.to=t.to||(p==="hide"?b:r)),s={from:{y:o.from.height/r.height,x:o.from.width/r.width},to:{y:o.to.height/r.height,x:o.to.width/r.width}};if(v==="box"||v==="both")s.from.y!==s.to.y&&(y=y.concat(c),o.from=e.effects.setTransition(o,c,s.from.y,o.from),o.to=e.effects.setTransition(o,c,s.to.y,o.to)),s.from.x!==s.to.x&&(y=y.concat(h),o.from=e.effects.setTransition(o,h,s.from.x,o.from),o.to=e.effects.setTransition(o,h,s.to.x,o.to));(v==="content"||v==="both")&&s.from.y!==s.to.y&&(y=y.concat(l).concat(f),o.from=e.effects.setTransition(o,l,s.from.y,o.from),o.to=e.effects.setTransition(o,l,s.to.y,o.to)),e.effects.save(o,y),o.show(),e.effects.createWrapper(o),o.css("overflow","hidden").css(o.from),m&&(i=e.effects.getBaseline(m,r),o.from.top=(r.outerHeight-o.outerHeight())*i.y,o.from.left=(r.outerWidth-o.outerWidth())*i.x,o.to.top=(r.outerHeight-o.to.outerHeight)*i.y,o.to.left=(r.outerWidth-o.to.outerWidth)*i.x),o.css(o.from);if(v==="content"||v==="both")c=c.concat(["marginTop","marginBottom"]).concat(l),h=h.concat(["marginLeft","marginRight"]),f=u.concat(c).concat(h),o.find("*[width]").each(function(){var n=e(this),r={height:n.height(),width:n.width(),outerHeight:n.outerHeight(),outerWidth:n.outerWidth()};d&&e.effects.save(n,f),n.from={height:r.height*s.from.y,width:r.width*s.from.x,outerHeight:r.outerHeight*s.from.y,outerWidth:r.outerWidth*s.from.x},n.to={height:r.height*s.to.y,width:r.width*s.to.x,outerHeight:r.height*s.to.y,outerWidth:r.width*s.to.x},s.from.y!==s.to.y&&(n.from=e.effects.setTransition(n,c,s.from.y,n.from),n.to=e.effects.setTransition(n,c,s.to.y,n.to)),s.from.x!==s.to.x&&(n.from=e.effects.setTransition(n,h,s.from.x,n.from),n.to=e.effects.setTransition(n,h,s.to.x,n.to)),n.css(n.from),n.animate(n.to,t.duration,t.easing,function(){d&&e.effects.restore(n,f)})});o.animate(o.to,{queue:!1,duration:t.duration,easing:t.easing,complete:function(){o.to.opacity===0&&o.css("opacity",o.from.opacity),p==="hide"&&o.hide(),e.effects.restore(o,y),d||(g==="static"?o.css({position:"relative",top:o.to.top,left:o.to.left}):e.each(["top","left"],function(e,t){o.css(t,function(t,n){var r=parseInt(n,10),i=e?o.to.left:o.to.top;return n==="auto"?i+"px":r+i+"px"})})),e.effects.removeWrapper(o),n()}})}})(jQuery);(function(e,t){e.effects.effect.shake=function(t,n){var r=e(this),i=["position","top","bottom","left","right","height","width"],s=e.effects.setMode(r,t.mode||"effect"),o=t.direction||"left",u=t.distance||20,a=t.times||3,f=a*2+1,l=Math.round(t.duration/f),c=o==="up"||o==="down"?"top":"left",h=o==="up"||o==="left",p={},d={},v={},m,g=r.queue(),y=g.length;e.effects.save(r,i),r.show(),e.effects.createWrapper(r),p[c]=(h?"-=":"+=")+u,d[c]=(h?"+=":"-=")+u*2,v[c]=(h?"-=":"+=")+u*2,r.animate(p,l,t.easing);for(m=1;m<a;m++)r.animate(d,l,t.easing).animate(v,l,t.easing);r.animate(d,l,t.easing).animate(p,l/2,t.easing).queue(function(){s==="hide"&&r.hide(),e.effects.restore(r,i),e.effects.removeWrapper(r),n()}),y>1&&g.splice.apply(g,[1,0].concat(g.splice(y,f+1))),r.dequeue()}})(jQuery);(function(e,t){e.effects.effect.slide=function(t,n){var r=e(this),i=["position","top","bottom","left","right","width","height"],s=e.effects.setMode(r,t.mode||"show"),o=s==="show",u=t.direction||"left",a=u==="up"||u==="down"?"top":"left",f=u==="up"||u==="left",l,c={};e.effects.save(r,i),r.show(),l=t.distance||r[a==="top"?"outerHeight":"outerWidth"](!0),e.effects.createWrapper(r).css({overflow:"hidden"}),o&&r.css(a,f?isNaN(l)?"-"+l:-l:l),c[a]=(o?f?"+=":"-=":f?"-=":"+=")+l,r.animate(c,{queue:!1,duration:t.duration,easing:t.easing,complete:function(){s==="hide"&&r.hide(),e.effects.restore(r,i),e.effects.removeWrapper(r),n()}})}})(jQuery);(function(e,t){e.effects.effect.transfer=function(t,n){var r=e(this),i=e(t.to),s=i.css("position")==="fixed",o=e("body"),u=s?o.scrollTop():0,a=s?o.scrollLeft():0,f=i.offset(),l={top:f.top-u,left:f.left-a,height:i.innerHeight(),width:i.innerWidth()},c=r.offset(),h=e("<div class='ui-effects-transfer'></div>").appendTo(document.body).addClass(t.className).css({top:c.top-u,left:c.left-a,height:r.innerHeight(),width:r.innerWidth(),position:s?"fixed":"absolute"}).animate(l,t.duration,t.easing,function(){h.remove(),n()})}})(jQuery);
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/css/custom-theme/images/ui-bg_flat_0_aaaaaa_40x100.png b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/css/custom-theme/images/ui-bg_flat_0_aaaaaa_40x100.png
new file mode 100644
index 0000000..5b5dab2
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/css/custom-theme/images/ui-bg_flat_0_aaaaaa_40x100.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/css/custom-theme/images/ui-bg_glass_55_fbf9ee_1x400.png b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/css/custom-theme/images/ui-bg_glass_55_fbf9ee_1x400.png
new file mode 100644
index 0000000..ad3d634
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/css/custom-theme/images/ui-bg_glass_55_fbf9ee_1x400.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/css/custom-theme/images/ui-bg_glass_65_ffffff_1x400.png b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/css/custom-theme/images/ui-bg_glass_65_ffffff_1x400.png
new file mode 100644
index 0000000..42ccba2
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/css/custom-theme/images/ui-bg_glass_65_ffffff_1x400.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/css/custom-theme/images/ui-bg_glass_75_dadada_1x400.png b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/css/custom-theme/images/ui-bg_glass_75_dadada_1x400.png
new file mode 100644
index 0000000..5a46b47
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/css/custom-theme/images/ui-bg_glass_75_dadada_1x400.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/css/custom-theme/images/ui-bg_glass_75_e6e6e6_1x400.png b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/css/custom-theme/images/ui-bg_glass_75_e6e6e6_1x400.png
new file mode 100644
index 0000000..86c2baa
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/css/custom-theme/images/ui-bg_glass_75_e6e6e6_1x400.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/css/custom-theme/images/ui-bg_glass_75_ffffff_1x400.png b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/css/custom-theme/images/ui-bg_glass_75_ffffff_1x400.png
new file mode 100644
index 0000000..e65ca12
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/css/custom-theme/images/ui-bg_glass_75_ffffff_1x400.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/css/custom-theme/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/css/custom-theme/images/ui-bg_highlight-soft_75_cccccc_1x100.png
new file mode 100644
index 0000000..7c9fa6c
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/css/custom-theme/images/ui-bg_highlight-soft_75_cccccc_1x100.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/css/custom-theme/images/ui-bg_inset-soft_95_fef1ec_1x100.png b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/css/custom-theme/images/ui-bg_inset-soft_95_fef1ec_1x100.png
new file mode 100644
index 0000000..0e05810
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/css/custom-theme/images/ui-bg_inset-soft_95_fef1ec_1x100.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/css/custom-theme/images/ui-icons_222222_256x240.png b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/css/custom-theme/images/ui-icons_222222_256x240.png
new file mode 100644
index 0000000..b273ff1
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/css/custom-theme/images/ui-icons_222222_256x240.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/css/custom-theme/images/ui-icons_2e83ff_256x240.png b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/css/custom-theme/images/ui-icons_2e83ff_256x240.png
new file mode 100644
index 0000000..09d1cdc
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/css/custom-theme/images/ui-icons_2e83ff_256x240.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/css/custom-theme/images/ui-icons_454545_256x240.png b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/css/custom-theme/images/ui-icons_454545_256x240.png
new file mode 100644
index 0000000..59bd45b
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/css/custom-theme/images/ui-icons_454545_256x240.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/css/custom-theme/images/ui-icons_888888_256x240.png b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/css/custom-theme/images/ui-icons_888888_256x240.png
new file mode 100644
index 0000000..6d02426
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/css/custom-theme/images/ui-icons_888888_256x240.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/css/custom-theme/images/ui-icons_cd0a0a_256x240.png b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/css/custom-theme/images/ui-icons_cd0a0a_256x240.png
new file mode 100644
index 0000000..2ab019b
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/css/custom-theme/images/ui-icons_cd0a0a_256x240.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/css/custom-theme/images/ui-icons_f6cf3b_256x240.png b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/css/custom-theme/images/ui-icons_f6cf3b_256x240.png
new file mode 100644
index 0000000..c986935
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/css/custom-theme/images/ui-icons_f6cf3b_256x240.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/css/custom-theme/jquery-ui-1.10.0.custom.css b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/css/custom-theme/jquery-ui-1.10.0.custom.css
new file mode 100644
index 0000000..3d832ca
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/css/custom-theme/jquery-ui-1.10.0.custom.css
@@ -0,0 +1,1613 @@
+/*!
+ * jQuery UI Bootstrap (0.5)
+ * http://addyosmani.github.com/jquery-ui-bootstrap
+ *
+ * Copyright 2012 - 2013, Addy Osmani
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ *
+ * Portions copyright jQuery UI & Twitter Bootstrap
+ */
+
+
+/* Layout helpers
+----------------------------------*/
+.ui-helper-hidden { display: none; }
+.ui-helper-hidden-accessible { 
+  border: 0; clip: rect(0 0 0 0);
+  height: 1px; 
+  margin: -1px; 
+  overflow: hidden; 
+  padding: 0; 
+  position: absolute; 
+  width: 1px; 
+}
+.ui-helper-reset { 
+  margin: 0; 
+  padding: 0; 
+  border: 0; 
+  outline: 0; 
+  line-height: 1.3; 
+  text-decoration: none; 
+  font-size: 100%; 
+  list-style: none; 
+}
+.ui-helper-clearfix:before,
+.ui-helper-clearfix:after {
+  content: "";
+  display: table;
+}
+.ui-helper-clearfix:after { 
+  content: "."; 
+  display: block; 
+  height: 0; 
+  clear: both; 
+  visibility: hidden; 
+}
+.ui-helper-clearfix { 
+  /*display: inline-block; */
+  display:block;
+  min-height: 0; /* support: IE7 */
+}
+/* required comment for clearfix to work in Opera \*/
+* html .ui-helper-clearfix { 
+  height:1%; 
+}
+
+/* end clearfix */
+.ui-helper-zfix { 
+  width: 100%; 
+  height: 100%; 
+  top: 0; 
+  left: 0; 
+  position: absolute; 
+  opacity: 0; 
+  filter:Alpha(Opacity=0); 
+}
+.ui-front {
+  z-index: 100;
+}
+
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-disabled { cursor: default !important; }
+
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon { 
+  display: block; 
+  text-indent: -99999px; 
+  overflow: hidden; 
+  background-repeat: no-repeat; 
+}
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Overlays */
+.ui-widget-overlay { 
+  position: absolute; 
+  top: 0; 
+  left: 0; 
+  width: 100%; 
+  height: 100%; 
+}
+
+/*
+ * jQuery UI Resizable 1.10.0
+ *
+ * Copyright 2013, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://api.jqueryui.com/resizable/
+ */
+
+.ui-resizable { 
+  position: relative;
+}
+.ui-resizable-handle { 
+  position: absolute;
+  font-size: 0.1px;
+  z-index: 99999; 
+  display: block; 
+}
+.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { 
+  display: none; 
+}
+.ui-resizable-n { 
+  cursor: n-resize; 
+  height: 7px; 
+  width: 100%; 
+  top: -5px; 
+  left: 0; 
+}
+.ui-resizable-s { 
+  cursor: s-resize; 
+  height: 7px; 
+  width: 100%; 
+  bottom: -5px; 
+  left: 0; 
+}
+.ui-resizable-e { 
+  cursor: e-resize; 
+  width: 7px; 
+  right: -5px; 
+  top: 0; 
+  height: 100%; 
+}
+.ui-resizable-w { 
+  cursor: w-resize; 
+  width: 7px; 
+  left: -5px; 
+  top: 0; 
+  height: 100%; 
+}
+.ui-resizable-se { 
+  cursor: se-resize; 
+  width: 12px; 
+  height: 12px; 
+  right: 1px; 
+  bottom: 1px; 
+}
+.ui-resizable-sw { 
+  cursor: sw-resize; 
+  width: 9px; 
+  height: 9px; 
+  left: -5px; 
+  bottom: -5px; 
+}
+.ui-resizable-nw { 
+  cursor: nw-resize; 
+  width: 9px; 
+  height: 9px; 
+  left: -5px; 
+  top: -5px; 
+}
+.ui-resizable-ne { 
+  cursor: ne-resize; 
+  width: 9px; 
+  height: 9px; 
+  right: -5px; 
+  top: -5px;
+}
+
+/*
+ * jQuery UI Selectable 1.10.0
+ *
+ * Copyright 2013, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://jqueryui.com/selectable/
+ */
+.ui-selectable-helper { 
+  position: absolute; 
+  z-index: 100; 
+  border:1px dotted black; 
+}
+
+/*
+ * jQuery UI CSS Framework 1.10.0
+ *
+ * Copyright 2013, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * 
+ *
+ * To view and modify this theme, visit http://jqueryui.com/themeroller/
+ */
+
+/* Component containers
+----------------------------------*/
+.ui-widget {   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size:13px; }
+.ui-widget .ui-widget { font-size: 1em; }
+.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 1em; }
+.ui-widget-content { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_glass_75_ffffff_1x400.png) 50% 50% repeat-x; color: #404040; }
+.ui-widget-content a { color: #404040; }
+.ui-widget-header {
+  font-weight:bold;
+  border-color: #0064cd #0064cd #003f81;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  border:1px solid #666;
+
+ }
+.ui-widget-header a { color: #222222; }
+
+/* Interaction states
+----------------------------------*/
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default {
+
+  background-color: #e6e6e6;
+  background-repeat: no-repeat;
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));
+  background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+  background-image: -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);
+  background-image: -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+  background-image: -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+  background-image: linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);
+
+  text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
+
+  color: #333;
+  font-size: 13px;
+  line-height: normal;
+  border: 1px solid #ccc;
+  border-bottom-color: #bbb;
+  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+  -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+  box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+  -webkit-transition: 0.1s linear background-image;
+  -moz-transition: 0.1s linear background-image;
+  -ms-transition: 0.1s linear background-image;
+  -o-transition: 0.1s linear background-image;
+  transition: 0.1s linear background-image;
+   overflow: visible;
+
+ }
+
+
+.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #555555; text-decoration: none; }
+.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus {
+  background-position: 0 -15px;
+  color: #333;
+  text-decoration: none;
+ }
+
+.ui-state-hover a, .ui-state-hover a:hover, .ui-state-hover a:link, .ui-state-hover a:visited { color: #212121; text-decoration: none; }
+.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #aaaaaa;  font-weight: normal; color: #212121; }
+.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #212121; text-decoration: none; }
+.ui-widget :active { outline: none; }
+
+/* Interaction Cues
+----------------------------------*/
+
+
+.ui-state-highlight p, .ui-state-error p, .ui-state-default p{
+  font-size: 13px;
+  font-weight: normal;
+  line-height: 18px;
+  margin:7px 15px;
+}
+.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight  {
+
+
+  position: relative;
+  margin-bottom: 18px;
+  color: #404040;
+  background-color: #eedc94;
+  background-repeat: repeat-x;
+  background-image: -khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94));
+  background-image: -moz-linear-gradient(top, #fceec1, #eedc94);
+  background-image: -ms-linear-gradient(top, #fceec1, #eedc94);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceec1), color-stop(100%, #eedc94));
+  background-image: -webkit-linear-gradient(top, #fceec1, #eedc94);
+  background-image: -o-linear-gradient(top, #fceec1, #eedc94);
+  background-image: linear-gradient(top, #fceec1, #eedc94);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fceec1', endColorstr='#eedc94', GradientType=0);
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  border-color: #eedc94 #eedc94 #e4c652;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+  border-width: 1px;
+  border-style: solid;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
+  -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
+  box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
+
+
+}
+.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636; }
+.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {
+
+
+  position: relative;
+  margin-bottom: 18px;
+  color: #ffffff;
+  border-width: 1px;
+  border-style: solid;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
+  -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
+  box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
+ background-color: #c43c35;
+  background-repeat: repeat-x;
+  background-image: -khtml-gradient(linear, left top, left bottom, from(#ee5f5b), to(#c43c35));
+  background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ee5f5b), color-stop(100%, #c43c35));
+  background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: -o-linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: linear-gradient(top, #ee5f5b, #c43c35);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  border-color: #c43c35 #c43c35 #882a25;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+
+
+}
+.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #cd0a0a; }
+.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #cd0a0a; }
+.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; }
+.ui-priority-secondary, .ui-widget-content .ui-priority-secondary,  .ui-widget-header .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; }
+.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none;  }
+.ui-state-disabled .ui-icon { filter:Alpha(Opacity=35); } /* For IE8 - See #6059 */
+
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_222222_256x240.png); }
+.ui-widget-content .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); }
+.ui-widget-header .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); }
+.ui-state-default .ui-icon { background-image: url(images/ui-icons_888888_256x240.png); }
+.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); }
+.ui-state-active .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); }
+.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_2e83ff_256x240.png); }
+.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_f6cf3b_256x240.png); }
+
+/* positioning */
+.ui-icon-carat-1-n { background-position: 0 0; }
+.ui-icon-carat-1-ne { background-position: -16px 0; }
+.ui-icon-carat-1-e { background-position: -32px 0; }
+.ui-icon-carat-1-se { background-position: -48px 0; }
+.ui-icon-carat-1-s { background-position: -64px 0; }
+.ui-icon-carat-1-sw { background-position: -80px 0; }
+.ui-icon-carat-1-w { background-position: -96px 0; }
+.ui-icon-carat-1-nw { background-position: -112px 0; }
+.ui-icon-carat-2-n-s { background-position: -128px 0; }
+.ui-icon-carat-2-e-w { background-position: -144px 0; }
+.ui-icon-triangle-1-n { background-position: 0 -16px; }
+.ui-icon-triangle-1-ne { background-position: -16px -16px; }
+.ui-icon-triangle-1-e { background-position: -32px -16px; }
+.ui-icon-triangle-1-se { background-position: -48px -16px; }
+.ui-icon-triangle-1-s { background-position: -64px -16px; }
+.ui-icon-triangle-1-sw { background-position: -80px -16px; }
+.ui-icon-triangle-1-w { background-position: -96px -16px; }
+.ui-icon-triangle-1-nw { background-position: -112px -16px; }
+.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
+.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
+.ui-icon-arrow-1-n { background-position: 0 -32px; }
+.ui-icon-arrow-1-ne { background-position: -16px -32px; }
+.ui-icon-arrow-1-e { background-position: -32px -32px; }
+.ui-icon-arrow-1-se { background-position: -48px -32px; }
+.ui-icon-arrow-1-s { background-position: -64px -32px; }
+.ui-icon-arrow-1-sw { background-position: -80px -32px; }
+.ui-icon-arrow-1-w { background-position: -96px -32px; }
+.ui-icon-arrow-1-nw { background-position: -112px -32px; }
+.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
+.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
+.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
+.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
+.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
+.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
+.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
+.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
+.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
+.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
+.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
+.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
+.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
+.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
+.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
+.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
+.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
+.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
+.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
+.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
+.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
+.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
+.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
+.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
+.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
+.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
+.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
+.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
+.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
+.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
+.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
+.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
+.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
+.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
+.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
+.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
+.ui-icon-arrow-4 { background-position: 0 -80px; }
+.ui-icon-arrow-4-diag { background-position: -16px -80px; }
+.ui-icon-extlink { background-position: -32px -80px; }
+.ui-icon-newwin { background-position: -48px -80px; }
+.ui-icon-refresh { background-position: -64px -80px; }
+.ui-icon-shuffle { background-position: -80px -80px; }
+.ui-icon-transfer-e-w { background-position: -96px -80px; }
+.ui-icon-transferthick-e-w { background-position: -112px -80px; }
+.ui-icon-folder-collapsed { background-position: 0 -96px; }
+.ui-icon-folder-open { background-position: -16px -96px; }
+.ui-icon-document { background-position: -32px -96px; }
+.ui-icon-document-b { background-position: -48px -96px; }
+.ui-icon-note { background-position: -64px -96px; }
+.ui-icon-mail-closed { background-position: -80px -96px; }
+.ui-icon-mail-open { background-position: -96px -96px; }
+.ui-icon-suitcase { background-position: -112px -96px; }
+.ui-icon-comment { background-position: -128px -96px; }
+.ui-icon-person { background-position: -144px -96px; }
+.ui-icon-print { background-position: -160px -96px; }
+.ui-icon-trash { background-position: -176px -96px; }
+.ui-icon-locked { background-position: -192px -96px; }
+.ui-icon-unlocked { background-position: -208px -96px; }
+.ui-icon-bookmark { background-position: -224px -96px; }
+.ui-icon-tag { background-position: -240px -96px; }
+.ui-icon-home { background-position: 0 -112px; }
+.ui-icon-flag { background-position: -16px -112px; }
+.ui-icon-calendar { background-position: -32px -112px; }
+.ui-icon-cart { background-position: -48px -112px; }
+.ui-icon-pencil { background-position: -64px -112px; }
+.ui-icon-clock { background-position: -80px -112px; }
+.ui-icon-disk { background-position: -96px -112px; }
+.ui-icon-calculator { background-position: -112px -112px; }
+.ui-icon-zoomin { background-position: -128px -112px; }
+.ui-icon-zoomout { background-position: -144px -112px; }
+.ui-icon-search { background-position: -160px -112px; }
+.ui-icon-wrench { background-position: -176px -112px; }
+.ui-icon-gear { background-position: -192px -112px; }
+.ui-icon-heart { background-position: -208px -112px; }
+.ui-icon-star { background-position: -224px -112px; }
+.ui-icon-link { background-position: -240px -112px; }
+.ui-icon-cancel { background-position: 0 -128px; }
+.ui-icon-plus { background-position: -16px -128px; }
+.ui-icon-plusthick { background-position: -32px -128px; }
+.ui-icon-minus { background-position: -48px -128px; }
+.ui-icon-minusthick { background-position: -64px -128px; }
+.ui-icon-close { background-position: -80px -128px; }
+.ui-icon-closethick { background-position: -96px -128px; }
+.ui-icon-key { background-position: -112px -128px; }
+.ui-icon-lightbulb { background-position: -128px -128px; }
+.ui-icon-scissors { background-position: -144px -128px; }
+.ui-icon-clipboard { background-position: -160px -128px; }
+.ui-icon-copy { background-position: -176px -128px; }
+.ui-icon-contact { background-position: -192px -128px; }
+.ui-icon-image { background-position: -208px -128px; }
+.ui-icon-video { background-position: -224px -128px; }
+.ui-icon-script { background-position: -240px -128px; }
+.ui-icon-alert { background-position: 0 -144px; }
+.ui-icon-info { background-position: -16px -144px; }
+.ui-icon-notice { background-position: -32px -144px; }
+.ui-icon-help { background-position: -48px -144px; }
+.ui-icon-check { background-position: -64px -144px; }
+.ui-icon-bullet { background-position: -80px -144px; }
+.ui-icon-radio-off { background-position: -96px -144px; }
+.ui-icon-radio-on { background-position: -112px -144px; }
+.ui-icon-pin-w { background-position: -128px -144px; }
+.ui-icon-pin-s { background-position: -144px -144px; }
+.ui-icon-play { background-position: 0 -160px; }
+.ui-icon-pause { background-position: -16px -160px; }
+.ui-icon-seek-next { background-position: -32px -160px; }
+.ui-icon-seek-prev { background-position: -48px -160px; }
+.ui-icon-seek-end { background-position: -64px -160px; }
+.ui-icon-seek-start { background-position: -80px -160px; }
+/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
+.ui-icon-seek-first { background-position: -80px -160px; }
+.ui-icon-stop { background-position: -96px -160px; }
+.ui-icon-eject { background-position: -112px -160px; }
+.ui-icon-volume-off { background-position: -128px -160px; }
+.ui-icon-volume-on { background-position: -144px -160px; }
+.ui-icon-power { background-position: 0 -176px; }
+.ui-icon-signal-diag { background-position: -16px -176px; }
+.ui-icon-signal { background-position: -32px -176px; }
+.ui-icon-battery-0 { background-position: -48px -176px; }
+.ui-icon-battery-1 { background-position: -64px -176px; }
+.ui-icon-battery-2 { background-position: -80px -176px; }
+.ui-icon-battery-3 { background-position: -96px -176px; }
+.ui-icon-circle-plus { background-position: 0 -192px; }
+.ui-icon-circle-minus { background-position: -16px -192px; }
+.ui-icon-circle-close { background-position: -32px -192px; }
+.ui-icon-circle-triangle-e { background-position: -48px -192px; }
+.ui-icon-circle-triangle-s { background-position: -64px -192px; }
+.ui-icon-circle-triangle-w { background-position: -80px -192px; }
+.ui-icon-circle-triangle-n { background-position: -96px -192px; }
+.ui-icon-circle-arrow-e { background-position: -112px -192px; }
+.ui-icon-circle-arrow-s { background-position: -128px -192px; }
+.ui-icon-circle-arrow-w { background-position: -144px -192px; }
+.ui-icon-circle-arrow-n { background-position: -160px -192px; }
+.ui-icon-circle-zoomin { background-position: -176px -192px; }
+.ui-icon-circle-zoomout { background-position: -192px -192px; }
+.ui-icon-circle-check { background-position: -208px -192px; }
+.ui-icon-circlesmall-plus { background-position: 0 -208px; }
+.ui-icon-circlesmall-minus { background-position: -16px -208px; }
+.ui-icon-circlesmall-close { background-position: -32px -208px; }
+.ui-icon-squaresmall-plus { background-position: -48px -208px; }
+.ui-icon-squaresmall-minus { background-position: -64px -208px; }
+.ui-icon-squaresmall-close { background-position: -80px -208px; }
+.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
+.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
+.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
+.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
+.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
+.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Corner radius */
+.ui-corner-all, 
+.ui-corner-top, 
+.ui-corner-left, 
+.ui-corner-tl { 
+  -moz-border-radius-topleft: 4px; 
+  -webkit-border-top-left-radius: 4px; 
+  -khtml-border-top-left-radius: 4px; 
+  border-top-left-radius: 4px; 
+}
+.ui-corner-all, 
+.ui-corner-top, 
+.ui-corner-right, 
+.ui-corner-tr { 
+  -moz-border-radius-topright: 4px; 
+  -webkit-border-top-right-radius: 4px; 
+  -khtml-border-top-right-radius: 4px; 
+  border-top-right-radius: 4px; 
+}
+.ui-corner-all, 
+.ui-corner-bottom, 
+.ui-corner-left, 
+.ui-corner-bl { 
+  -moz-border-radius-bottomleft: 4px; 
+  -webkit-border-bottom-left-radius: 4px; 
+  -khtml-border-bottom-left-radius: 4px; 
+  border-bottom-left-radius: 4px; 
+}
+.ui-corner-all, 
+.ui-corner-bottom, 
+.ui-corner-right, 
+.ui-corner-br { 
+  -moz-border-radius-bottomright: 4px; 
+  -webkit-border-bottom-right-radius: 4px; 
+  -khtml-border-bottom-right-radius: 4px; 
+  border-bottom-right-radius: 4px; 
+}
+
+
+/* Overlays */
+
+.ui-widget-overlay { 
+  background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; 
+  opacity: .30;
+  filter:Alpha(Opacity=30); 
+}
+
+.ui-widget-shadow { 
+  margin: -8px 0 0 -8px; 
+  padding: 8px; 
+  background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; 
+  opacity: .30;filter:Alpha(Opacity=30); 
+  -moz-border-radius: 8px; 
+  -khtml-border-radius: 8px; 
+  -webkit-border-radius: 8px; 
+  border-radius: 8px; 
+}
+
+/*
+ * jQuery UI Accordion 1.10.0
+ *
+ * Copyright 2013, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://jqueryui.com/accordion/
+ */
+
+/* IE/Win - Fix animation bug - #4615 */
+
+.ui-accordion { 
+  width: 100%; 
+}
+.ui-accordion .ui-accordion-header { 
+  cursor: pointer; 
+  position: relative; 
+  margin-top: 1px; 
+  zoom: 1; 
+  font-weight:bold; 
+}
+.ui-accordion .ui-accordion-li-fix { 
+  display: inline; 
+}
+.ui-accordion .ui-accordion-header-active { 
+  border-bottom: 0 !important; 
+}
+.ui-accordion .ui-accordion-header a { 
+  display: block; 
+  font-size: 1em; 
+  padding: .5em .5em .5em 1.7em; 
+}
+.ui-accordion-icons .ui-accordion-header a { 
+  padding-left: 2.2em; 
+}
+.ui-accordion .ui-accordion-header .ui-icon { 
+  position: absolute; 
+  left: .5em; 
+  top: 50%; 
+  margin-top: -8px; 
+}
+.ui-accordion .ui-accordion-content { 
+  padding: 1em 2.2em; 
+  border-top: 0; 
+  margin-top: -2px; 
+  position: relative; 
+  top: 1px; 
+  margin-bottom: 2px; 
+  overflow: auto; 
+  display: none; 
+  zoom: 1; 
+}
+.ui-accordion .ui-accordion-content-active { 
+  display: block; 
+}
+
+/*
+ * jQuery UI Autocomplete 1.10.0
+ *
+ * Copyright 2013, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://jqueryui.com/autocomplete/
+ */
+
+.ui-autocomplete { 
+  position: absolute; 
+  top: 0;
+  left: 0;
+  cursor: default; 
+}
+
+/*
+ * jQuery UI Button 1.10.0
+ *
+ * Copyright 2013, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Button#theming
+ */
+
+.ui-button {
+
+  cursor: pointer;
+  display: inline-block;
+  background-color: #e6e6e6;
+  background-repeat: no-repeat;
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));
+  background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+  background-image: -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);
+  background-image: -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+  background-image: -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+  background-image: linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);
+  padding: 5px 14px 6px;
+  margin: 0;
+  text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
+  color: #333;
+  font-size: 13px;
+  line-height: normal;
+  border: 1px solid #ccc;
+  border-bottom-color: #bbb;
+
+  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+  -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+  box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+  -webkit-transition: 0.1s linear background-image;
+  -moz-transition: 0.1s linear background-image;
+  -ms-transition: 0.1s linear background-image;
+  -o-transition: 0.1s linear background-image;
+  transition: 0.1s linear background-image;
+   overflow: visible;
+} /* the overflow property removes extra width in IE */
+
+.ui-button-primary {
+  color: #ffffff;
+  background-color: #0064cd;
+  background-repeat: repeat-x;
+  background-image: -khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));
+  background-image: -moz-linear-gradient(top, #049cdb, #0064cd);
+  background-image: -ms-linear-gradient(top, #049cdb, #0064cd);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));
+  background-image: -webkit-linear-gradient(top, #049cdb, #0064cd);
+  background-image: -o-linear-gradient(top, #049cdb, #0064cd);
+  background-image: linear-gradient(top, #049cdb, #0064cd);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0);
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  border-color: #0064cd #0064cd #003f81;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+}
+
+
+.ui-button-success{
+  color:#ffffff;
+  background-color: #57a957;
+  background-repeat: repeat-x;
+  background-image: -khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957));
+  background-image: -moz-linear-gradient(top, #62c462, #57a957);
+  background-image: -ms-linear-gradient(top, #62c462, #57a957);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #62c462), color-stop(100%, #57a957));
+  background-image: -webkit-linear-gradient(top, #62c462, #57a957);
+  background-image: -o-linear-gradient(top, #62c462, #57a957);
+  background-image: linear-gradient(top, #62c462, #57a957);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  border-color: #57a957 #57a957 #3d773d;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+}
+
+.ui-button-error{
+  color:#ffffff;
+  background-color: #c43c35;
+  background-repeat: repeat-x;
+  background-image: -khtml-gradient(linear, left top, left bottom, from(#ee5f5b), to(#c43c35));
+  background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ee5f5b), color-stop(100%, #c43c35));
+  background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: -o-linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: linear-gradient(top, #ee5f5b, #c43c35);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  border-color: #c43c35 #c43c35 #882a25;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+}
+
+.ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */
+button.ui-button-icon-only { } /* button elements seem to need a little more width */
+.ui-button-icons-only { width: 3.4em; }
+button.ui-button-icons-only { width: 3.7em; }
+
+/*button text element */
+
+.ui-button .ui-button-text { display: block;   }
+.ui-button-text-only .ui-button-text {  }
+.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: .4em; text-indent: -9999999px; /*tempfix*/ display:none;}
+.ui-button-text-icon-primary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 1em .4em 2.1em; }
+.ui-button-text-icon-secondary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 2.1em .4em 1em; }
+.ui-button-text-icons .ui-button-text { padding-left: 2.1em; padding-right: 2.1em; }
+/* no icon support for input elements, provide padding by default */
+/* input.ui-button { padding: .4em 1em; } */
+
+/*button icon element(s) */
+.ui-button-icon-only .ui-icon, .ui-button-text-icon-primary .ui-icon, .ui-button-text-icon-secondary .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-icons-only .ui-icon { top: 50%; margin-top:-3px; margin-bottom:3px; }
+.ui-button-icon-only .ui-icon { left: 50%; margin-left: -8px; }
+.ui-button-text-icon-primary .ui-button-icon-primary, .ui-button-text-icons .ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary { left: .5em; }
+.ui-button-text-icon-secondary .ui-button-icon-secondary, .ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
+.ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
+
+/*button sets*/
+
+
+.ui-buttonset { margin-right: 7px; }
+.ui-buttonset .ui-state-active {
+  color: #ffffff;
+  background-color: #0064cd;
+  background-repeat: repeat-x;
+  background-image: -khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));
+  background-image: -moz-linear-gradient(top, #049cdb, #0064cd);
+  background-image: -ms-linear-gradient(top, #049cdb, #0064cd);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));
+  background-image: -webkit-linear-gradient(top, #049cdb, #0064cd);
+  background-image: -o-linear-gradient(top, #049cdb, #0064cd);
+  background-image: linear-gradient(top, #049cdb, #0064cd);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0);
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  border-color: #0064cd #0064cd #003f81;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+}
+.ui-buttonset .ui-button { margin-left: 0; margin-right: -.4em; }
+
+/* workarounds */
+button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */
+
+
+/*
+ * jQuery UI Menu 1.10.0
+ *
+* Copyright 2013, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Menu#theming
+ */
+
+.ui-menu { list-style:none; padding: 2px; margin: 0; display:block; float:left; outline: none; }
+.ui-menu .ui-menu { margin-top: -3px; position: absolute; }
+.ui-menu .ui-menu-item { margin: 0; padding: 0; zoom: 1;float: left;clear: left; width: 100%; }
+.ui-menu .ui-menu-divider { margin: 5px -2px 5px -2px; height: 0; font-size: 0; line-height: 0; border-width: 1px 0 0 0; }
+.ui-menu .ui-menu-item a { text-decoration: none; display: block; padding: 2px .4em; line-height: 1.5; zoom: 1; font-weight: normal; }
+.ui-menu .ui-menu-item a.ui-state-focus,
+.ui-menu .ui-menu-item a.ui-state-active { 
+  font-weight: normal; 
+  margin: 0; 
+  color: #ffffff;
+  background: #0064cd;
+  background-color: #0064cd;
+  background-repeat: repeat-x;
+  background-image: -khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));
+  background-image: -moz-linear-gradient(top, #049cdb, #0064cd);
+  background-image: -ms-linear-gradient(top, #049cdb, #0064cd);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));
+  background-image: -webkit-linear-gradient(top, #049cdb, #0064cd);
+  background-image: -o-linear-gradient(top, #049cdb, #0064cd);
+  background-image: linear-gradient(top, #049cdb, #0064cd);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0);
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  border-color: #0064cd #0064cd #003f81;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+}
+/* Fix problem with border in ui-state-active */
+.ui-menu .ui-menu-item a.ui-state-active {
+  padding: 1px .4em;
+}
+
+.ui-menu .ui-state-disabled { font-weight: normal; margin: .4em 0 .2em; line-height: 1.5; }
+.ui-menu .ui-state-disabled a { cursor: default; }
+
+/* icon support */
+.ui-menu-icons { position: relative; }
+.ui-menu-icons .ui-menu-item a { position: relative; padding-left: 2em; }
+
+/* left-aligned */
+.ui-menu .ui-icon { position: absolute; top: .2em; left: .2em; }
+
+/* right-aligned */
+.ui-menu .ui-menu-icon { position: static; float: right; }
+
+.ui-menu { width: 200px; margin-bottom: 2em; }
+
+
+/*
+ * jQuery UI spinner 1.10.0
+ *
+* Copyright 2013, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Menu#theming
+ */
+
+.ui-spinner { position:relative; display: inline-block; overflow: hidden; padding: 0; vertical-align: middle; }
+.ui-spinner-input { border: none; background: none; padding: 0; margin: .2em 0; vertical-align: middle; margin-left: .4em; margin-right: 22px; }
+.ui-spinner{}
+.ui-spinner-button { width: 16px; height: 50%; font-size: .5em; padding: 0; margin: 0; text-align: center; position: absolute; cursor: default; display: block; overflow: hidden; right: 0; }
+.ui-spinner a.ui-spinner-button { border-top: none; border-bottom: none; border-right: none; } /* more specificity required here to overide default borders */
+.ui-spinner .ui-icon { position: absolute; margin-top: -8px; top: 50%; left: 0; } /* vertical centre icon */
+.ui-spinner-up { top: 0; }
+.ui-spinner-down { bottom: 0; }
+
+/* TR overrides */
+.ui-spinner .ui-icon-triangle-1-s {
+    /* need to fix icons sprite */
+    background-position:-65px -16px;
+}
+
+/*
+ * jQuery UI Dialog 1.10.0
+ *
+ * Copyright 2013, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Dialog#theming
+ */
+.ui-dialog { 
+  position: absolute; 
+  top: 0; 
+  left: 0; 
+  padding: .2em; 
+  width: 300px; 
+  overflow: hidden; 
+  outline: 0; 
+  background-clip: padding-box;
+  background-color: #FFFFFF;
+  border: 1px solid rgba(0, 0, 0, 0.3);
+  border-radius: 6px 6px 6px 6px;
+  box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
+  /*left: 50%;
+  margin-left: -280px;*/
+  outline: medium none;
+  position: fixed;
+  /*top: 10%;
+  width: 560px;*/
+  z-index: 1050;
+}
+.ui-dialog .ui-dialog-titlebar { /*padding: .4em 1em;*/
+  position: relative;
+  padding:5px 15px;
+  border:0px 0px 0px 1px solid;
+  border-color: white;
+  padding: 5px 15px;
+  font-size: 18px;
+  text-decoration:none;
+  background:none;
+  -moz-border-radius-bottomright: 0px;
+  -webkit-border-bottom-right-radius: 0px;
+  -khtml-border-bottom-right-radius: 0px;
+
+  -moz-border-radius-bottomleft: 0px;
+  -webkit-border-bottom-left-radius: 0px;
+  -khtml-border-bottom-left-radius: 0px;
+  border-bottom-left-radius: 0px;
+  border-bottom:1px solid #ccc;
+}
+.ui-dialog .ui-dialog-title {
+  float: left;
+  color:#404040;
+  font-weight:bold;
+  margin-top:5px;
+  margin-bottom:5px;
+  padding:5px;
+  text-overflow: ellipsis;
+  overflow: hidden;
+}
+.ui-dialog .ui-dialog-titlebar-close {
+  position: absolute;
+  right: .3em;
+  top: 50%;
+  width: 19px;
+  margin: -20px 0 0 0;
+  padding: 1px;
+  height: 18px;
+  font-size: 20px;
+  font-weight: bold;
+  line-height: 13.5px;
+  text-shadow: 0 1px 0 #ffffff;
+  filter: alpha(opacity=25);
+  -khtml-opacity: 0.25;
+  -moz-opacity: 0.25;
+  opacity: 0.25;
+  background:none;
+  border-width: 0;
+  border:none;
+  box-shadow: none;
+}
+
+.ui-dialog .ui-dialog-titlebar-close span { 
+  display: block; 
+  margin: 1px;
+  text-indent: 9999px;
+}
+
+.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 1px;   filter: alpha(opacity=90);
+  -khtml-opacity: 0.90;
+  -moz-opacity: 0.90;
+  opacity: 0.90;   
+}
+
+.ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
+
+.ui-dialog .ui-dialog-buttonpane {
+  text-align: left;
+  border-width: 1px 0 0 0;
+  background-image: none;
+  margin: .5em 0 0 0;
+  background-color: #f5f5f5;
+  padding: 5px 15px 5px;
+  border-top: 1px solid #ddd;
+  -webkit-border-radius: 0 0 6px 6px;
+  -moz-border-radius: 0 0 6px 6px;
+  border-radius: 0 0 6px 6px;
+  -webkit-box-shadow: inset 0 1px 0 #ffffff;
+  -moz-box-shadow: inset 0 1px 0 #ffffff;
+  box-shadow: inset 0 1px 0 #ffffff;
+  zoom: 1;
+  margin-bottom: 0;
+
+}
+.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { float: right; }
+.ui-dialog .ui-dialog-buttonpane button { margin: .5em .4em .5em 0; cursor: pointer; }
+.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; }
+.ui-draggable .ui-dialog-titlebar { cursor: move; }
+
+.ui-dialog-buttonpane .ui-dialog-buttonset .ui-button{
+  color: #ffffff;
+  background-color: #0064cd;
+  background-repeat: repeat-x;
+  background-image: -khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));
+  background-image: -moz-linear-gradient(top, #049cdb, #0064cd);
+  background-image: -ms-linear-gradient(top, #049cdb, #0064cd);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));
+  background-image: -webkit-linear-gradient(top, #049cdb, #0064cd);
+  background-image: -o-linear-gradient(top, #049cdb, #0064cd);
+  background-image: linear-gradient(top, #049cdb, #0064cd);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0);
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  border-color: #0064cd #0064cd #003f81;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+}
+/*
+ * jQuery UI Slider 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Slider#theming
+ */
+.ui-slider { position: relative; text-align: left; }
+.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; }
+.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0;
+
+  color: #ffffff;
+  background-color: #0064cd;
+  background-repeat: repeat-x;
+  background-image: -khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));
+  background-image: -moz-linear-gradient(top, #049cdb, #0064cd);
+  background-image: -ms-linear-gradient(top, #049cdb, #0064cd);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));
+  background-image: -webkit-linear-gradient(top, #049cdb, #0064cd);
+  background-image: -o-linear-gradient(top, #049cdb, #0064cd);
+  background-image: linear-gradient(top, #049cdb, #0064cd);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0);
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  border-color: #0064cd #0064cd #003f81;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+
+}
+
+.ui-slider-horizontal { height: .8em; }
+.ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; }
+.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
+.ui-slider-horizontal .ui-slider-range-min { left: 0; }
+.ui-slider-horizontal .ui-slider-range-max { right: 0; }
+
+.ui-slider-vertical { width: .8em; height: 100px; }
+.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
+.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
+.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
+.ui-slider-vertical .ui-slider-range-max { top: 0; }
+
+/*
+ * jQuery UI Tabs 1.9.2
+ *
+ * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://jqueryui.com/tabs/
+ */
+ .ui-tabs .ui-tabs-nav{ background:none; border-color: #ddd;border-style: solid;border-width: 0 0 1px;}
+.ui-tabs { position: relative; padding: .2em; zoom: 1; border:0px;} /* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
+
+
+.ui-tabs .ui-tabs-nav li:hover, .ui-tabs .ui-tabs-nav li a:hover{
+  background:whiteSmoke;
+  border-bottom:1px solid #ddd;
+  padding-bottom:0px;
+   color:#00438A;
+}
+
+.ui-tabs .ui-tabs-nav { margin: 0; padding: .2em .2em 0; border-bottom:1px solid #DDD; }
+.ui-tabs .ui-tabs-nav li {  text-decoration: none; list-style: none; float: left; position: relative; top: 1px; padding: 0px 0px 1px 0px; white-space: nowrap; background:none; border:0px; }
+
+.ui-tabs-nav .ui-state-default{
+  -webkit-box-shadow: 0px 0px 0px #ffffff; /* Saf3-4, iOS 4.0.2 - 4.2, Android 2.3+ */
+     -moz-box-shadow: 0px 0px 0px #ffffff; /* FF3.5 - 3.6 */
+          box-shadow: 0px 0px 0px #ffffff; /* Opera 10.5, IE9, FF4+, Chrome 6+, iOS 5 */
+}
+.ui-tabs .ui-tabs-nav li a {
+  float: left;
+  text-decoration: none;
+  cursor: text;
+  padding: 0 15px;
+  margin-right: 2px;
+  line-height: 34px;
+  border: 1px solid transparent;
+  -webkit-border-radius: 4px 4px 0 0;
+  -moz-border-radius: 4px 4px 0 0;
+  border-radius: 4px 4px 0 0;
+
+
+ }
+
+.ui-tabs .ui-tabs-nav li.ui-tabs-active { margin-bottom: 0; padding-bottom: 0px; outline:none;}
+.ui-tabs .ui-tabs-nav li.ui-tabs-active , .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a {
+  background-color: #ffffff;
+  border: 1px solid #ddd;
+  border-bottom-color: #ffffff;
+  cursor: default;
+  color:gray;
+  outline:none;
+}
+.ui-tabs .ui-tabs-nav li.ui-tabs-active a{background-color: #ffffff;outline:none;border:none;}
+.ui-tabs .ui-tabs-nav li.ui-tabs-active:hover{
+  background:#ffffff;
+  outline:none;
+  margin-bottom:0px;
+}
+.ui-tabs .ui-tabs-nav li.ui-tabs-active a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-tabs-loading a { cursor: text; }
+.ui-tabs .ui-tabs-nav li a, .ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active a { cursor: pointer; color:#0069D6; background:none; font-weight:normal; margin-bottom:-1px;}
+/* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
+.ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; }
+.ui-tabs-panel .ui-button{text-decoration:none;}
+.ui-tabs .ui-tabs-hide { display: none !important; }
+
+
+/* IE fix for background inheritance from ui-widget*/
+.ui-tabs .ui-tabs-nav li{
+  filter:none;
+}
+
+/*
+ * jQuery UI Tooltip 1.9.0
+ *
+ * Copyright 2012-10-11, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://jqueryui.com/tooltip/
+ */
+.ui-tooltip {
+    padding:8px;
+    position:absolute;
+    z-index:9999;
+    max-width: 300px;
+    -o-box-shadow: 0 0 5px #ddd;
+    -moz-box-shadow: 0 0 5px #ddd;
+    -webkit-box-shadow: 0 0 5px #ddd;
+    /*box-shadow: 0 2px 5px #ddd;*/
+    box-shadow: inset 0 1px 0 #ffffff;
+}
+
+body .ui-tooltip { border-width:2px; }
+
+/*
+ * jQuery UI Datepicker 1.9.0
+ *
+ * Copyright 2012-10-11, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://jqueryui.com/datepicker/
+ */
+.ui-datepicker { width: 17em; padding: .2em .2em 0; display: none; }
+.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; border:0px; font-weight: bold; width: 100%; padding: 4px 0; background-color: #f5f5f5; color: #808080; }
+.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; }
+
+.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { /*top: 1px;*/ }
+.ui-datepicker .ui-datepicker-prev { left:2px; }
+.ui-datepicker .ui-datepicker-next { right:2px; }
+
+.ui-datepicker .ui-datepicker-prev-hover { /*left:1px;*/ }
+.ui-datepicker .ui-datepicker-next-hover { /*right:1px;*/ }
+
+.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px;  }
+.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; }
+.ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; }
+.ui-datepicker select.ui-datepicker-month-year {width: 100%;}
+.ui-datepicker select.ui-datepicker-month,
+.ui-datepicker select.ui-datepicker-year { width: 49%;}
+.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; }
+.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0;  }
+.ui-datepicker td { border: 0; padding: 1px; }
+.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; }
+.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; }
+.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; }
+.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; }
+
+/* with multiple calendars */
+.ui-datepicker.ui-datepicker-multi { width:auto; }
+.ui-datepicker-multi .ui-datepicker-group { float:left; }
+.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; }
+.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; }
+.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; }
+.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; }
+.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; }
+.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; }
+.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; }
+.ui-datepicker-row-break { clear:both; width:100%; font-size:0em; }
+
+/* RTL support */
+.ui-datepicker-rtl { direction: rtl; }
+.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; }
+.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; }
+.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; }
+.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; }
+.ui-datepicker-rtl .ui-datepicker-group { float:right; }
+.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+
+/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */
+.ui-datepicker-cover {
+  display: none; /*sorry for IE5*/
+  display/**/: block; /*sorry for IE5*/
+  position: absolute; /*must have*/
+  z-index: -1; /*must have*/
+  filter: mask(); /*must have*/
+  top: -4px; /*must have*/
+  left: -4px; /*must have*/
+  width: 200px; /*must have*/
+  height: 200px; /*must have*/
+}
+
+.ui-datepicker th{
+  font-weight: bold;
+  color: gray;
+}
+
+.ui-datepicker-today a:hover{
+  background-color: #808080;
+  color: #ffffff;
+
+}
+.ui-datepicker-today a{
+  background-color: #BFBFBF;
+  cursor: pointer;
+  padding: 0 4px;
+  margin-bottom:0px;
+
+}
+
+
+.ui-datepicker td a{
+  margin-bottom:0px;
+  border:0px;
+}
+
+.ui-datepicker td:hover{
+    color: #ffffff;
+}
+
+.ui-datepicker td .ui-state-default {
+  border:0px;
+  background:none;
+  margin-bottom:0px;
+  padding:5px;
+  color:gray;
+  text-align: center;
+  filter:none;
+}
+
+
+.ui-datepicker td .ui-state-active{
+  background:#BFBFBF;
+  margin-bottom:0px;
+  font-size:normal;
+  text-shadow: 0px;
+  color: #ffffff;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+}
+
+.ui-datepicker td .ui-state-hover {
+    color: #ffffff;
+    background: #0064cd;
+    background-color: #0064cd;
+    background-repeat: repeat-x;
+    background-image: -khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));
+    background-image: -moz-linear-gradient(top, #049cdb, #0064cd);
+    background-image: -ms-linear-gradient(top, #049cdb, #0064cd);
+    background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));
+    background-image: -webkit-linear-gradient(top, #049cdb, #0064cd);
+    background-image: -o-linear-gradient(top, #049cdb, #0064cd);
+    background-image: linear-gradient(top, #049cdb, #0064cd);
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0);
+    text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+    border-color: #0064cd #0064cd #003f81;
+    border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+    -webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+    -khtml-border-radius: 4px;
+    border-radius: 4px;
+}
+
+/*
+ * jQuery UI Progressbar 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Progressbar#theming
+ */
+.ui-progressbar { height:2em; text-align: left; }
+.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%;
+
+/*this can be removed if ui-widget-header is blue*/
+    color: #ffffff;
+  background-color: #0064cd;
+  background-repeat: repeat-x;
+  background-image: -khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));
+  background-image: -moz-linear-gradient(top, #049cdb, #0064cd);
+  background-image: -ms-linear-gradient(top, #049cdb, #0064cd);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));
+  background-image: -webkit-linear-gradient(top, #049cdb, #0064cd);
+  background-image: -o-linear-gradient(top, #049cdb, #0064cd);
+  background-image: linear-gradient(top, #049cdb, #0064cd);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0);
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  border-color: #0064cd #0064cd #003f81;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+ }
+
+
+
+/*** Input field styling from Bootstrap **/
+ input, textarea {
+  -webkit-transition: border linear 0.2s, box-shadow linear 0.2s;
+  -moz-transition: border linear 0.2s, box-shadow linear 0.2s;
+  -ms-transition: border linear 0.2s, box-shadow linear 0.2s;
+  -o-transition: border linear 0.2s, box-shadow linear 0.2s;
+  transition: border linear 0.2s, box-shadow linear 0.2s;
+  -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1);
+  -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1);
+  box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1);
+}
+input:focus, textarea:focus {
+  outline: 0;
+  border-color: rgba(82, 168, 236, 0.8);
+  -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
+  -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
+  box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
+}
+input[type=file]:focus, input[type=checkbox]:focus, select:focus {
+  -webkit-box-shadow: none;
+  -moz-box-shadow: none;
+  box-shadow: none;
+  outline: 1px dotted #666;
+}
+
+
+.ui-autocomplete-input,
+textarea,
+.uneditable-input {
+  display: inline-block;
+  padding: 4px;
+  font-size: 13px;
+  line-height: 18px;
+  color: #808080;
+  border: 1px solid #ccc;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+}
+
+
+
+/**Toolbar**/
+
+.ui-toolbar{
+  padding: 7px 14px;
+  margin: 0 0 18px;
+  background-color: #f5f5f5;
+  background-repeat: repeat-x;
+  background-image: -khtml-gradient(linear, left top, left bottom, from(#ffffff), to(#f5f5f5));
+  background-image: -moz-linear-gradient(top, #ffffff, #f5f5f5);
+  background-image: -ms-linear-gradient(top, #ffffff, #f5f5f5);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff), color-stop(100%, #f5f5f5));
+  background-image: -webkit-linear-gradient(top, #ffffff, #f5f5f5);
+  background-image: -o-linear-gradient(top, #ffffff, #f5f5f5);
+  background-image: linear-gradient(top, #ffffff, #f5f5f5);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);
+  border: 1px solid #ddd;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+  -webkit-box-shadow: inset 0 1px 0 #ffffff;
+  -moz-box-shadow: inset 0 1px 0 #ffffff;
+  box-shadow: inset 0 1px 0 #ffffff;
+}
+
+
+/***Dialog fixes**/
+
+.ui-dialog-buttonset .ui-button:nth-child(2){
+  cursor: pointer;
+  display: inline-block;
+  background-color: #e6e6e6;
+  background-repeat: no-repeat;
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));
+  background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+  background-image: -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);
+  background-image: -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+  background-image: -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+  background-image: linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);
+  padding: 5px 14px 6px;
+  text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
+  color: #333;
+  font-size: 13px;
+  line-height: normal;
+  border: 1px solid #ccc;
+  border-bottom-color: #bbb;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+  -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+  box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+  -webkit-transition: 0.1s linear all;
+  -moz-transition: 0.1s linear all;
+  -ms-transition: 0.1s linear all;
+  -o-transition: 0.1s linear all;
+  transition: 0.1s linear all;
+   overflow: visible;
+}
+
+
+
+/***Wijmo Theming**/
+
+div.wijmo-wijmenu{
+  padding:0 20px;
+  background-color: #222;
+  background-color: #222222;
+  background-repeat: repeat-x;
+  background-image: -khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));
+  background-image: -moz-linear-gradient(top, #333333, #222222);
+  background-image: -ms-linear-gradient(top, #333333, #222222);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));
+  background-image: -webkit-linear-gradient(top, #333333, #222222);
+  background-image: -o-linear-gradient(top, #333333, #222222);
+  background-image: linear-gradient(top, #333333, #222222);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);
+  -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
+  -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
+}
+
+.wijmo-wijmenu .ui-state-default{
+  box-shadow: none;
+  color:#BFBFBF;
+}
+
+.wijmo-wijmenu .ui-state-default .wijmo-wijmenu-text{    
+  color:#BFBFBF;
+}
+
+.wijmo-wijmenu .ui-state-hover{
+  background: #444;
+  background: rgba(255, 255, 255, 0.05);
+}
+
+.wijmo-wijmenu .ui-state-hover .wijmo-wijmenu-text{
+  color:#ffffff;
+}
+
+div.wijmo-wijmenu .ui-widget-header h3{
+  position: relative;
+  margin-top:1px;
+  padding:0;
+}
+
+.wijmo-wijmenu h3 a{
+  color: #FFFFFF;
+  display: block;
+  float: left;
+  font-size: 20px;
+  font-weight: 200;
+  line-height: 1;
+  margin-left: -20px;
+  margin-top:1px;
+  padding: 8px 20px 12px;
+}
+
+.wijmo-wijmenu h3 a:hover{
+  background-color: rgba(255, 255, 255, 0.05);
+  color: #FFFFFF;
+  text-decoration: none;
+}
+
+.wijmo-wijmenu .ui-widget-header{
+  border:0px;
+}
+
+.wijmo-wijmenu .wijmo-wijmenu-parent .wijmo-wijmenu-child{
+  padding: 0.3em 0;
+}
+
+div.wijmo-wijmenu .wijmo-wijmenu-item .wijmo-wijmenu-child{
+  background: #333;
+  border:0;
+  margin:0;
+  padding: 6px 0;
+  width:160px;
+  -webkit-border-radius: 0 0 6px 6px;
+  -moz-border-radius: 0 0 6px 6px;
+  border-radius: 0 0 6px 6px;
+  -webkit-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
+  -moz-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
+}
+
+div.wijmo-wijmenu .wijmo-wijmenu-item{
+  margin:0;
+  border:0;
+}
+
+.wijmo-wijmenu a.wijmo-wijmenu-link{
+  margin:0;
+  line-height: 19px;
+  padding: 10px 10px 11px;
+  border:0;
+  -webkit-border-radius: 0;
+  -moz-border-radius: 0;
+  border-radius:0;
+}
+
+div.wijmo-wijmenu .wijmo-wijmenu-child .wijmo-wijmenu-link{
+  display:block;
+  float:none;
+  padding: 4px 15px;
+  width:auto;
+}
+
+div.wijmo-wijmenu .wijmo-wijmenu-child .wijmo-wijmenu-text
+{
+  float:none;
+}
+
+.wijmo-wijmenu .wijmo-wijmenu-item .wijmo-wijmenu-child .ui-state-hover {
+  background: #191919;
+}
+
+.wijmo-wijmenu .wijmo-wijmenu-item .wijmo-wijmenu-separator{
+  padding: 5px 0;
+  background-image: none;
+  background-color: #222;
+  border-top: 1px solid #444;
+  border-bottom:0;
+  border-left:0;
+  border-right:0;
+}
+
+.wijmo-wijmenu .wijmo-wijmenu-item input {
+  -moz-transition: none 0s ease 0s;
+  background-color: rgba(255, 255, 255, 0.3);
+  border: 1px solid #111111;
+  border-radius: 4px 4px 4px 4px;
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1) inset, 0 1px 0 rgba(255, 255, 255, 0.25);
+  color: rgba(255, 255, 255, 0.75);
+  font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
+  line-height: 1;
+  margin: 5px 10px 0 10px;
+  padding: 4px 9px;
+  width:100px;
+}
+
+.wijmo-wijmenu .wijmo-wijmenu-item input:hover {
+  background-color: rgba(255, 255, 255, 0.5);
+  color: #FFFFFF;
+}
+
+.wijmo-wijmenu .wijmo-wijmenu-item input:focus {
+  background-color: #FFFFFF;
+  border: 0 none;
+  box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
+  color: #404040;
+  outline: 0 none;
+  padding: 5px 10px;
+  text-shadow: 0 1px 0 #FFFFFF;
+}
+
+
+.wijmo-wijmenu .ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default {
+  text-shadow:none;
+}
+
+
+.wijmo-wijmenu .ui-state-default{
+  box-shadow: none;
+  color:#BFBFBF;
+  filter: none;
+}
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/css/custom-theme/jquery-ui-1.9.2.custom.css b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/css/custom-theme/jquery-ui-1.9.2.custom.css
new file mode 100644
index 0000000..66e7599
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/css/custom-theme/jquery-ui-1.9.2.custom.css
@@ -0,0 +1,1393 @@
+/*!
+ * jQuery UI Bootstrap (0.22)
+ * http://addyosmani.github.com/jquery-ui-bootstrap
+ *
+ * Copyright 2012, Addy Osmani
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ *
+ * Portions copyright jQuery UI & Twitter Bootstrap
+ */
+
+
+/* Layout helpers
+----------------------------------*/
+.ui-helper-hidden { display: none; }
+.ui-helper-hidden-accessible { border: 0; clip: rect(0 0 0 0); height: 1px; margin: -1px; overflow: hidden; padding: 0; position: absolute; width: 1px; }
+.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }
+.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
+.ui-helper-clearfix { display: inline-block; }
+/* required comment for clearfix to work in Opera \*/
+* html .ui-helper-clearfix { height:1%; }
+.ui-helper-clearfix { display:block; }
+/* end clearfix */
+.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
+
+
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-disabled { cursor: default !important; }
+
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Overlays */
+.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
+
+
+/*
+ * jQuery UI CSS Framework 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Theming/API
+ *
+ * To view and modify this theme, visit http://jqueryui.com/themeroller/?ctl=themeroller
+ */
+
+
+/* Component containers
+----------------------------------*/
+.ui-widget {   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size:13px; }
+.ui-widget .ui-widget { font-size: 1em; }
+.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 1em; }
+.ui-widget-content { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_glass_75_ffffff_1x400.png) 50% 50% repeat-x; color: #404040; }
+.ui-widget-content a { color: #404040; }
+.ui-widget-header {
+  font-weight:bold;
+  border-color: #0064cd #0064cd #003f81;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  border:1px solid #666;
+
+ }
+.ui-widget-header a { color: #222222; }
+
+/* Interaction states
+----------------------------------*/
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default {
+
+  background-color: #e6e6e6;
+  background-repeat: no-repeat;
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));
+  background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+  background-image: -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);
+  background-image: -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+  background-image: -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+  background-image: linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);
+
+  text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
+
+  color: #333;
+  font-size: 13px;
+  line-height: normal;
+  border: 1px solid #ccc;
+  border-bottom-color: #bbb;
+  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+  -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+  box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+  -webkit-transition: 0.1s linear background-image;
+  -moz-transition: 0.1s linear background-image;
+  -ms-transition: 0.1s linear background-image;
+  -o-transition: 0.1s linear background-image;
+  transition: 0.1s linear background-image;
+   overflow: visible;
+
+ }
+
+
+.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #555555; text-decoration: none; }
+.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus {
+  background-position: 0 -15px;
+  color: #333;
+  text-decoration: none;
+
+
+ }
+.ui-state-hover a, .ui-state-hover a:hover, .ui-state-hover a:link, .ui-state-hover a:visited { color: #212121/*{fcHover}*/; text-decoration: none; }
+.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #aaaaaa;  font-weight: normal; color: #212121; }
+.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #212121; text-decoration: none; }
+.ui-widget :active { outline: none; }
+
+/* Interaction Cues
+----------------------------------*/
+
+
+.ui-state-highlight p, .ui-state-error p, .ui-state-default p{
+	font-size: 13px;
+	font-weight: normal;
+	line-height: 18px;
+	margin:7px 15px;
+}
+.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight  {
+
+
+  position: relative;
+  margin-bottom: 18px;
+  color: #404040;
+  background-color: #eedc94;
+  background-repeat: repeat-x;
+  background-image: -khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94));
+  background-image: -moz-linear-gradient(top, #fceec1, #eedc94);
+  background-image: -ms-linear-gradient(top, #fceec1, #eedc94);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceec1), color-stop(100%, #eedc94));
+  background-image: -webkit-linear-gradient(top, #fceec1, #eedc94);
+  background-image: -o-linear-gradient(top, #fceec1, #eedc94);
+  background-image: linear-gradient(top, #fceec1, #eedc94);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fceec1', endColorstr='#eedc94', GradientType=0);
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  border-color: #eedc94 #eedc94 #e4c652;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+  border-width: 1px;
+  border-style: solid;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
+  -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
+  box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
+
+
+}
+.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636; }
+.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {
+
+
+  position: relative;
+  margin-bottom: 18px;
+  color: #ffffff;
+  border-width: 1px;
+  border-style: solid;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
+  -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
+  box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
+ background-color: #c43c35;
+  background-repeat: repeat-x;
+  background-image: -khtml-gradient(linear, left top, left bottom, from(#ee5f5b), to(#c43c35));
+  background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ee5f5b), color-stop(100%, #c43c35));
+  background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: -o-linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: linear-gradient(top, #ee5f5b, #c43c35);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  border-color: #c43c35 #c43c35 #882a25;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+
+
+}
+.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #cd0a0a; }
+.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #cd0a0a; }
+.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; }
+.ui-priority-secondary, .ui-widget-content .ui-priority-secondary,  .ui-widget-header .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; }
+.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none;  }
+.ui-state-disabled .ui-icon { filter:Alpha(Opacity=35); } /* For IE8 - See #6059 */
+
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_222222_256x240.png); }
+.ui-widget-content .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); }
+.ui-widget-header .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); }
+.ui-state-default .ui-icon { background-image: url(images/ui-icons_888888_256x240.png); }
+.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); }
+.ui-state-active .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); }
+.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_2e83ff_256x240.png); }
+.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_f6cf3b_256x240.png); }
+
+/* positioning */
+.ui-icon-carat-1-n { background-position: 0 0; }
+.ui-icon-carat-1-ne { background-position: -16px 0; }
+.ui-icon-carat-1-e { background-position: -32px 0; }
+.ui-icon-carat-1-se { background-position: -48px 0; }
+.ui-icon-carat-1-s { background-position: -64px 0; }
+.ui-icon-carat-1-sw { background-position: -80px 0; }
+.ui-icon-carat-1-w { background-position: -96px 0; }
+.ui-icon-carat-1-nw { background-position: -112px 0; }
+.ui-icon-carat-2-n-s { background-position: -128px 0; }
+.ui-icon-carat-2-e-w { background-position: -144px 0; }
+.ui-icon-triangle-1-n { background-position: 0 -16px; }
+.ui-icon-triangle-1-ne { background-position: -16px -16px; }
+.ui-icon-triangle-1-e { background-position: -32px -16px; }
+.ui-icon-triangle-1-se { background-position: -48px -16px; }
+.ui-icon-triangle-1-s { background-position: -64px -16px; }
+.ui-icon-triangle-1-sw { background-position: -80px -16px; }
+.ui-icon-triangle-1-w { background-position: -96px -16px; }
+.ui-icon-triangle-1-nw { background-position: -112px -16px; }
+.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
+.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
+.ui-icon-arrow-1-n { background-position: 0 -32px; }
+.ui-icon-arrow-1-ne { background-position: -16px -32px; }
+.ui-icon-arrow-1-e { background-position: -32px -32px; }
+.ui-icon-arrow-1-se { background-position: -48px -32px; }
+.ui-icon-arrow-1-s { background-position: -64px -32px; }
+.ui-icon-arrow-1-sw { background-position: -80px -32px; }
+.ui-icon-arrow-1-w { background-position: -96px -32px; }
+.ui-icon-arrow-1-nw { background-position: -112px -32px; }
+.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
+.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
+.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
+.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
+.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
+.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
+.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
+.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
+.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
+.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
+.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
+.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
+.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
+.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
+.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
+.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
+.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
+.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
+.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
+.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
+.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
+.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
+.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
+.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
+.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
+.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
+.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
+.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
+.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
+.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
+.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
+.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
+.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
+.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
+.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
+.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
+.ui-icon-arrow-4 { background-position: 0 -80px; }
+.ui-icon-arrow-4-diag { background-position: -16px -80px; }
+.ui-icon-extlink { background-position: -32px -80px; }
+.ui-icon-newwin { background-position: -48px -80px; }
+.ui-icon-refresh { background-position: -64px -80px; }
+.ui-icon-shuffle { background-position: -80px -80px; }
+.ui-icon-transfer-e-w { background-position: -96px -80px; }
+.ui-icon-transferthick-e-w { background-position: -112px -80px; }
+.ui-icon-folder-collapsed { background-position: 0 -96px; }
+.ui-icon-folder-open { background-position: -16px -96px; }
+.ui-icon-document { background-position: -32px -96px; }
+.ui-icon-document-b { background-position: -48px -96px; }
+.ui-icon-note { background-position: -64px -96px; }
+.ui-icon-mail-closed { background-position: -80px -96px; }
+.ui-icon-mail-open { background-position: -96px -96px; }
+.ui-icon-suitcase { background-position: -112px -96px; }
+.ui-icon-comment { background-position: -128px -96px; }
+.ui-icon-person { background-position: -144px -96px; }
+.ui-icon-print { background-position: -160px -96px; }
+.ui-icon-trash { background-position: -176px -96px; }
+.ui-icon-locked { background-position: -192px -96px; }
+.ui-icon-unlocked { background-position: -208px -96px; }
+.ui-icon-bookmark { background-position: -224px -96px; }
+.ui-icon-tag { background-position: -240px -96px; }
+.ui-icon-home { background-position: 0 -112px; }
+.ui-icon-flag { background-position: -16px -112px; }
+.ui-icon-calendar { background-position: -32px -112px; }
+.ui-icon-cart { background-position: -48px -112px; }
+.ui-icon-pencil { background-position: -64px -112px; }
+.ui-icon-clock { background-position: -80px -112px; }
+.ui-icon-disk { background-position: -96px -112px; }
+.ui-icon-calculator { background-position: -112px -112px; }
+.ui-icon-zoomin { background-position: -128px -112px; }
+.ui-icon-zoomout { background-position: -144px -112px; }
+.ui-icon-search { background-position: -160px -112px; }
+.ui-icon-wrench { background-position: -176px -112px; }
+.ui-icon-gear { background-position: -192px -112px; }
+.ui-icon-heart { background-position: -208px -112px; }
+.ui-icon-star { background-position: -224px -112px; }
+.ui-icon-link { background-position: -240px -112px; }
+.ui-icon-cancel { background-position: 0 -128px; }
+.ui-icon-plus { background-position: -16px -128px; }
+.ui-icon-plusthick { background-position: -32px -128px; }
+.ui-icon-minus { background-position: -48px -128px; }
+.ui-icon-minusthick { background-position: -64px -128px; }
+.ui-icon-close { background-position: -80px -128px; }
+.ui-icon-closethick { background-position: -96px -128px; }
+.ui-icon-key { background-position: -112px -128px; }
+.ui-icon-lightbulb { background-position: -128px -128px; }
+.ui-icon-scissors { background-position: -144px -128px; }
+.ui-icon-clipboard { background-position: -160px -128px; }
+.ui-icon-copy { background-position: -176px -128px; }
+.ui-icon-contact { background-position: -192px -128px; }
+.ui-icon-image { background-position: -208px -128px; }
+.ui-icon-video { background-position: -224px -128px; }
+.ui-icon-script { background-position: -240px -128px; }
+.ui-icon-alert { background-position: 0 -144px; }
+.ui-icon-info { background-position: -16px -144px; }
+.ui-icon-notice { background-position: -32px -144px; }
+.ui-icon-help { background-position: -48px -144px; }
+.ui-icon-check { background-position: -64px -144px; }
+.ui-icon-bullet { background-position: -80px -144px; }
+.ui-icon-radio-off { background-position: -96px -144px; }
+.ui-icon-radio-on { background-position: -112px -144px; }
+.ui-icon-pin-w { background-position: -128px -144px; }
+.ui-icon-pin-s { background-position: -144px -144px; }
+.ui-icon-play { background-position: 0 -160px; }
+.ui-icon-pause { background-position: -16px -160px; }
+.ui-icon-seek-next { background-position: -32px -160px; }
+.ui-icon-seek-prev { background-position: -48px -160px; }
+.ui-icon-seek-end { background-position: -64px -160px; }
+.ui-icon-seek-start { background-position: -80px -160px; }
+/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
+.ui-icon-seek-first { background-position: -80px -160px; }
+.ui-icon-stop { background-position: -96px -160px; }
+.ui-icon-eject { background-position: -112px -160px; }
+.ui-icon-volume-off { background-position: -128px -160px; }
+.ui-icon-volume-on { background-position: -144px -160px; }
+.ui-icon-power { background-position: 0 -176px; }
+.ui-icon-signal-diag { background-position: -16px -176px; }
+.ui-icon-signal { background-position: -32px -176px; }
+.ui-icon-battery-0 { background-position: -48px -176px; }
+.ui-icon-battery-1 { background-position: -64px -176px; }
+.ui-icon-battery-2 { background-position: -80px -176px; }
+.ui-icon-battery-3 { background-position: -96px -176px; }
+.ui-icon-circle-plus { background-position: 0 -192px; }
+.ui-icon-circle-minus { background-position: -16px -192px; }
+.ui-icon-circle-close { background-position: -32px -192px; }
+.ui-icon-circle-triangle-e { background-position: -48px -192px; }
+.ui-icon-circle-triangle-s { background-position: -64px -192px; }
+.ui-icon-circle-triangle-w { background-position: -80px -192px; }
+.ui-icon-circle-triangle-n { background-position: -96px -192px; }
+.ui-icon-circle-arrow-e { background-position: -112px -192px; }
+.ui-icon-circle-arrow-s { background-position: -128px -192px; }
+.ui-icon-circle-arrow-w { background-position: -144px -192px; }
+.ui-icon-circle-arrow-n { background-position: -160px -192px; }
+.ui-icon-circle-zoomin { background-position: -176px -192px; }
+.ui-icon-circle-zoomout { background-position: -192px -192px; }
+.ui-icon-circle-check { background-position: -208px -192px; }
+.ui-icon-circlesmall-plus { background-position: 0 -208px; }
+.ui-icon-circlesmall-minus { background-position: -16px -208px; }
+.ui-icon-circlesmall-close { background-position: -32px -208px; }
+.ui-icon-squaresmall-plus { background-position: -48px -208px; }
+.ui-icon-squaresmall-minus { background-position: -64px -208px; }
+.ui-icon-squaresmall-close { background-position: -80px -208px; }
+.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
+.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
+.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
+.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
+.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
+.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Corner radius */
+.ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; -khtml-border-top-left-radius: 4px; border-top-left-radius: 4px; }
+.ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; -khtml-border-top-right-radius: 4px; border-top-right-radius: 4px; }
+.ui-corner-all, .ui-corner-bottom, .ui-corner-left, .ui-corner-bl { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; -khtml-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; }
+.ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; -khtml-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }
+
+
+/* Overlays */
+.ui-widget-overlay { background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); }
+.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -khtml-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }/*
+ * jQuery UI Resizable 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Resizable#theming
+ */
+.ui-resizable { position: relative;}
+.ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block; }
+.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; }
+.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0; }
+.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0; }
+.ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0; height: 100%; }
+.ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0; height: 100%; }
+.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; }
+.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; }
+.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; }
+.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/*
+ * jQuery UI Selectable 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Selectable#theming
+ */
+.ui-selectable-helper { position: absolute; z-index: 100; border:1px dotted black; }
+/*
+ * jQuery UI Accordion 1.9.0
+ *
+ * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Accordion#theming
+ */
+/* IE/Win - Fix animation bug - #4615 */
+.ui-accordion { width: 100%; }
+.ui-accordion .ui-accordion-header { cursor: pointer; position: relative; margin-top: 1px; zoom: 1; font-weight:bold; }
+.ui-accordion .ui-accordion-li-fix { display: inline; }
+.ui-accordion .ui-accordion-header-active { border-bottom: 0 !important; }
+.ui-accordion .ui-accordion-header a { display: block; font-size: 1em; padding: .5em .5em .5em 1.7em; }
+.ui-accordion-icons .ui-accordion-header a { padding-left: 2.2em; }
+.ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; }
+.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; zoom: 1; }
+.ui-accordion .ui-accordion-content-active { display: block; }
+/*
+ * jQuery UI Autocomplete 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Autocomplete#theming
+ */
+.ui-autocomplete { 
+	position: absolute; 
+	top: 0;
+	left: 0;
+	cursor: default; 
+}
+
+/* workarounds */
+* html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */
+
+/*
+ * jQuery UI Menu 1.9.0
+ *
+ * Copyright 2012-10-11, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Menu#theming
+ */
+
+.ui-menu { list-style:none; padding: 2px; margin: 0; display:block; float:left; outline: none; }
+.ui-menu .ui-menu { margin-top: -3px; position: absolute; }
+.ui-menu .ui-menu-item { margin: 0; padding: 0; zoom: 1;float: left;clear: left; width: 100%; }
+.ui-menu .ui-menu-divider { margin: 5px -2px 5px -2px; height: 0; font-size: 0; line-height: 0; border-width: 1px 0 0 0; }
+.ui-menu .ui-menu-item a { text-decoration: none; display: block; padding: 2px .4em; line-height: 1.5; zoom: 1; font-weight: normal; }
+.ui-menu .ui-menu-item a.ui-state-focus,
+.ui-menu .ui-menu-item a.ui-state-active { 
+  font-weight: normal; 
+  margin: 0; 
+  color: #ffffff;
+  background: #0064cd;
+  background-color: #0064cd;
+  background-repeat: repeat-x;
+  background-image: -khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));
+  background-image: -moz-linear-gradient(top, #049cdb, #0064cd);
+  background-image: -ms-linear-gradient(top, #049cdb, #0064cd);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));
+  background-image: -webkit-linear-gradient(top, #049cdb, #0064cd);
+  background-image: -o-linear-gradient(top, #049cdb, #0064cd);
+  background-image: linear-gradient(top, #049cdb, #0064cd);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0);
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  border-color: #0064cd #0064cd #003f81;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+}
+/* Fix problem with border in ui-state-active */
+.ui-menu .ui-menu-item a.ui-state-active {
+  padding: 1px .4em;
+}
+
+.ui-menu .ui-state-disabled { font-weight: normal; margin: .4em 0 .2em; line-height: 1.5; }
+.ui-menu .ui-state-disabled a { cursor: default; }
+
+/* icon support */
+.ui-menu-icons { position: relative; }
+.ui-menu-icons .ui-menu-item a { position: relative; padding-left: 2em; }
+
+/* left-aligned */
+.ui-menu .ui-icon { position: absolute; top: .2em; left: .2em; }
+
+/* right-aligned */
+.ui-menu .ui-menu-icon { position: static; float: right; }
+
+.ui-menu { width: 200px; margin-bottom: 2em; }
+
+/*
+ * jQuery UI Button 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Button#theming
+ */
+.ui-button {
+
+  cursor: pointer;
+  display: inline-block;
+  background-color: #e6e6e6;
+  background-repeat: no-repeat;
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));
+  background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+  background-image: -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);
+  background-image: -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+  background-image: -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+  background-image: linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);
+  padding: 5px 14px 6px;
+  margin: 0;
+  text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
+  color: #333;
+  font-size: 13px;
+  line-height: normal;
+  border: 1px solid #ccc;
+  border-bottom-color: #bbb;
+
+  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+  -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+  box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+  -webkit-transition: 0.1s linear background-image;
+  -moz-transition: 0.1s linear background-image;
+  -ms-transition: 0.1s linear background-image;
+  -o-transition: 0.1s linear background-image;
+  transition: 0.1s linear background-image;
+   overflow: visible;
+
+} /* the overflow property removes extra width in IE */
+
+.ui-button-primary {
+  color: #ffffff;
+  background-color: #0064cd;
+  background-repeat: repeat-x;
+  background-image: -khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));
+  background-image: -moz-linear-gradient(top, #049cdb, #0064cd);
+  background-image: -ms-linear-gradient(top, #049cdb, #0064cd);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));
+  background-image: -webkit-linear-gradient(top, #049cdb, #0064cd);
+  background-image: -o-linear-gradient(top, #049cdb, #0064cd);
+  background-image: linear-gradient(top, #049cdb, #0064cd);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0);
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  border-color: #0064cd #0064cd #003f81;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+
+}
+
+
+
+.ui-button-success{
+  color:#ffffff;
+  background-color: #57a957;
+  background-repeat: repeat-x;
+  background-image: -khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957));
+  background-image: -moz-linear-gradient(top, #62c462, #57a957);
+  background-image: -ms-linear-gradient(top, #62c462, #57a957);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #62c462), color-stop(100%, #57a957));
+  background-image: -webkit-linear-gradient(top, #62c462, #57a957);
+  background-image: -o-linear-gradient(top, #62c462, #57a957);
+  background-image: linear-gradient(top, #62c462, #57a957);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  border-color: #57a957 #57a957 #3d773d;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+}
+
+.ui-button-error{
+  color:#ffffff;
+  background-color: #c43c35;
+  background-repeat: repeat-x;
+  background-image: -khtml-gradient(linear, left top, left bottom, from(#ee5f5b), to(#c43c35));
+  background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ee5f5b), color-stop(100%, #c43c35));
+  background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: -o-linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: linear-gradient(top, #ee5f5b, #c43c35);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  border-color: #c43c35 #c43c35 #882a25;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+}
+
+.ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */
+button.ui-button-icon-only { } /* button elements seem to need a little more width */
+.ui-button-icons-only { width: 3.4em; }
+button.ui-button-icons-only { width: 3.7em; }
+
+/*button text element */
+
+.ui-button .ui-button-text { display: block;   }
+.ui-button-text-only .ui-button-text {  }
+.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: .4em; text-indent: -9999999px; /*tempfix*/ display:none;}
+.ui-button-text-icon-primary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 1em .4em 2.1em; }
+.ui-button-text-icon-secondary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 2.1em .4em 1em; }
+.ui-button-text-icons .ui-button-text { padding-left: 2.1em; padding-right: 2.1em; }
+/* no icon support for input elements, provide padding by default */
+/* input.ui-button { padding: .4em 1em; } */
+
+/*button icon element(s) */
+.ui-button-icon-only .ui-icon, .ui-button-text-icon-primary .ui-icon, .ui-button-text-icon-secondary .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-icons-only .ui-icon { top: 50%; margin-top:-3px; margin-bottom:3px; }
+.ui-button-icon-only .ui-icon { left: 50%; margin-left: -8px; }
+.ui-button-text-icon-primary .ui-button-icon-primary, .ui-button-text-icons .ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary { left: .5em; }
+.ui-button-text-icon-secondary .ui-button-icon-secondary, .ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
+.ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
+
+/*button sets*/
+
+
+.ui-buttonset { margin-right: 7px; }
+.ui-buttonset .ui-state-active {
+  color: #ffffff;
+  background-color: #0064cd;
+  background-repeat: repeat-x;
+  background-image: -khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));
+  background-image: -moz-linear-gradient(top, #049cdb, #0064cd);
+  background-image: -ms-linear-gradient(top, #049cdb, #0064cd);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));
+  background-image: -webkit-linear-gradient(top, #049cdb, #0064cd);
+  background-image: -o-linear-gradient(top, #049cdb, #0064cd);
+  background-image: linear-gradient(top, #049cdb, #0064cd);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0);
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  border-color: #0064cd #0064cd #003f81;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+}
+.ui-buttonset .ui-button { margin-left: 0; margin-right: -.4em; }
+
+/* workarounds */
+button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */
+
+/*
+ * jQuery UI spinner 1.9.0
+ *
+ * Copyright 2012-10-11, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Menu#theming
+ */
+
+.ui-spinner { position:relative; display: inline-block; overflow: hidden; padding: 0; vertical-align: middle; }
+.ui-spinner-input { border: none; background: none; padding: 0; margin: .2em 0; vertical-align: middle; margin-left: .4em; margin-right: 22px; }
+.ui-spinner{}
+.ui-spinner-button { width: 16px; height: 50%; font-size: .5em; padding: 0; margin: 0; text-align: center; position: absolute; cursor: default; display: block; overflow: hidden; right: 0; }
+.ui-spinner a.ui-spinner-button { border-top: none; border-bottom: none; border-right: none; } /* more specificity required here to overide default borders */
+.ui-spinner .ui-icon { position: absolute; margin-top: -8px; top: 50%; left: 0; } /* vertical centre icon */
+.ui-spinner-up { top: 0; }
+.ui-spinner-down { bottom: 0; }
+
+/* TR overrides */
+.ui-spinner .ui-icon-triangle-1-s {
+    /* need to fix icons sprite */
+    background-position:-65px -16px;
+}
+
+/*
+ * jQuery UI Dialog 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Dialog#theming
+ */
+.ui-dialog { position: absolute; top: 0; left: 0; padding: .2em; width: 300px; overflow: hidden; outline: 0; }
+.ui-dialog .ui-dialog-titlebar { /*padding: .4em 1em;*/
+
+  position: relative;
+  padding:5px 15px;
+
+  border:0px 0px 0px 1px solid;
+  border-color: white;
+  padding: 5px 15px;
+  font-size: 18px;
+  text-decoration:none;
+  background:none;
+  -moz-border-radius-bottomright: 0px;
+  -webkit-border-bottom-right-radius: 0px;
+  -khtml-border-bottom-right-radius: 0px;
+
+  -moz-border-radius-bottomleft: 0px;
+  -webkit-border-bottom-left-radius: 0px;
+  -khtml-border-bottom-left-radius: 0px;
+  border-bottom-left-radius: 0px;
+
+  border-bottom:1px solid #ccc;
+
+}
+.ui-dialog .ui-dialog-title {
+  float: left;
+  color:#404040;
+  font-weight:bold;
+  margin-top:5px;
+  margin-bottom:5px;
+  padding:5px;
+
+}
+.ui-dialog .ui-dialog-titlebar-close {
+  position: absolute;
+  right: .3em;
+  top: 50%;
+  width: 19px;
+  margin: -10px 0 0 0;
+  padding: 1px;
+  height: 18px;
+  font-size: 20px;
+  font-weight: bold;
+  line-height: 13.5px;
+  text-shadow: 0 1px 0 #ffffff;
+  filter: alpha(opacity=25);
+  -khtml-opacity: 0.25;
+  -moz-opacity: 0.25;
+  opacity: 0.25;
+}
+
+.ui-dialog .ui-dialog-titlebar-close span { 
+  display: block; 
+  margin: 1px;
+  text-indent: 9999px;
+}
+
+.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 1px;   filter: alpha(opacity=90);
+  -khtml-opacity: 0.90;
+  -moz-opacity: 0.90;
+  opacity: 0.90;   }
+
+.ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
+
+.ui-dialog .ui-dialog-buttonpane {
+  text-align: left;
+  border-width: 1px 0 0 0;
+  background-image: none;
+  margin: .5em 0 0 0;
+  background-color: #f5f5f5;
+  padding: 5px 15px 5px;
+  border-top: 1px solid #ddd;
+  -webkit-border-radius: 0 0 6px 6px;
+  -moz-border-radius: 0 0 6px 6px;
+  border-radius: 0 0 6px 6px;
+  -webkit-box-shadow: inset 0 1px 0 #ffffff;
+  -moz-box-shadow: inset 0 1px 0 #ffffff;
+  box-shadow: inset 0 1px 0 #ffffff;
+  zoom: 1;
+  margin-bottom: 0;
+
+}
+.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { float: right; }
+.ui-dialog .ui-dialog-buttonpane button { margin: .5em .4em .5em 0; cursor: pointer; }
+.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; }
+.ui-draggable .ui-dialog-titlebar { cursor: move; }
+
+.ui-dialog-buttonpane .ui-dialog-buttonset .ui-button{
+  color: #ffffff;
+  background-color: #0064cd;
+  background-repeat: repeat-x;
+  background-image: -khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));
+  background-image: -moz-linear-gradient(top, #049cdb, #0064cd);
+  background-image: -ms-linear-gradient(top, #049cdb, #0064cd);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));
+  background-image: -webkit-linear-gradient(top, #049cdb, #0064cd);
+  background-image: -o-linear-gradient(top, #049cdb, #0064cd);
+  background-image: linear-gradient(top, #049cdb, #0064cd);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0);
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  border-color: #0064cd #0064cd #003f81;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+}
+/*
+ * jQuery UI Slider 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Slider#theming
+ */
+.ui-slider { position: relative; text-align: left; }
+.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; }
+.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0;
+
+  color: #ffffff;
+  background-color: #0064cd;
+  background-repeat: repeat-x;
+  background-image: -khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));
+  background-image: -moz-linear-gradient(top, #049cdb, #0064cd);
+  background-image: -ms-linear-gradient(top, #049cdb, #0064cd);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));
+  background-image: -webkit-linear-gradient(top, #049cdb, #0064cd);
+  background-image: -o-linear-gradient(top, #049cdb, #0064cd);
+  background-image: linear-gradient(top, #049cdb, #0064cd);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0);
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  border-color: #0064cd #0064cd #003f81;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+
+}
+
+.ui-slider-horizontal { height: .8em; }
+.ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; }
+.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
+.ui-slider-horizontal .ui-slider-range-min { left: 0; }
+.ui-slider-horizontal .ui-slider-range-max { right: 0; }
+
+.ui-slider-vertical { width: .8em; height: 100px; }
+.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
+.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
+.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
+.ui-slider-vertical .ui-slider-range-max { top: 0; }
+
+/*
+ * jQuery UI Tabs 1.9.2
+ *
+ * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://jqueryui.com/tabs/
+ */
+ .ui-tabs .ui-tabs-nav{ background:none; border-color: #ddd;border-style: solid;border-width: 0 0 1px;}
+.ui-tabs { position: relative; padding: .2em; zoom: 1; border:0px;} /* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
+
+
+.ui-tabs .ui-tabs-nav li:hover, .ui-tabs .ui-tabs-nav li a:hover{
+  background:whiteSmoke;
+  border-bottom:1px solid #ddd;
+  padding-bottom:0px;
+   color:#00438A;
+}
+
+.ui-tabs .ui-tabs-nav { margin: 0; padding: .2em .2em 0; border-bottom:1px solid #DDD; }
+.ui-tabs .ui-tabs-nav li {  text-decoration: none; list-style: none; float: left; position: relative; top: 1px; padding: 0px 0px 1px 0px; white-space: nowrap; background:none; border:0px; }
+
+.ui-tabs-nav .ui-state-default{
+  -webkit-box-shadow: 0px 0px 0px #ffffff; /* Saf3-4, iOS 4.0.2 - 4.2, Android 2.3+ */
+     -moz-box-shadow: 0px 0px 0px #ffffff; /* FF3.5 - 3.6 */
+          box-shadow: 0px 0px 0px #ffffff; /* Opera 10.5, IE9, FF4+, Chrome 6+, iOS 5 */
+}
+.ui-tabs .ui-tabs-nav li a {
+  float: left;
+  text-decoration: none;
+  cursor: text;
+  padding: 0 15px;
+  margin-right: 2px;
+  line-height: 34px;
+  border: 1px solid transparent;
+  -webkit-border-radius: 4px 4px 0 0;
+  -moz-border-radius: 4px 4px 0 0;
+  border-radius: 4px 4px 0 0;
+
+
+ }
+
+.ui-tabs .ui-tabs-nav li.ui-tabs-active { margin-bottom: 0; padding-bottom: 0px; outline:none;}
+.ui-tabs .ui-tabs-nav li.ui-tabs-active , .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a {
+  background-color: #ffffff;
+  border: 1px solid #ddd;
+  border-bottom-color: #ffffff;
+  cursor: default;
+  color:gray;
+  outline:none;
+}
+.ui-tabs .ui-tabs-nav li.ui-tabs-active a{background-color: #ffffff;outline:none;border:none;}
+.ui-tabs .ui-tabs-nav li.ui-tabs-active:hover{
+  background:#ffffff;
+  outline:none;
+  margin-bottom:0px;
+}
+.ui-tabs .ui-tabs-nav li.ui-tabs-active a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-tabs-loading a { cursor: text; }
+.ui-tabs .ui-tabs-nav li a, .ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active a { cursor: pointer; color:#0069D6; background:none; font-weight:normal; margin-bottom:-1px;}
+/* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
+.ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; }
+.ui-tabs-panel .ui-button{text-decoration:none;}
+.ui-tabs .ui-tabs-hide { display: none !important; }
+
+
+/* IE fix for background inheritance from ui-widget*/
+.ui-tabs .ui-tabs-nav li{
+  filter:none;
+}
+
+/*
+ * jQuery UI Tooltip 1.9.0
+ *
+ * Copyright 2012-10-11, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://jqueryui.com/tooltip/
+ */
+.ui-tooltip {
+    padding:8px;
+    position:absolute;
+    z-index:9999;
+    max-width: 300px;
+    -o-box-shadow: 0 0 5px #ddd;
+    -moz-box-shadow: 0 0 5px #ddd;
+    -webkit-box-shadow: 0 0 5px #ddd;
+    /*box-shadow: 0 2px 5px #ddd;*/
+    box-shadow: inset 0 1px 0 #ffffff;
+}
+/* Fades and background-images don't work well together in IE6, drop the image */
+* html .ui-tooltip {
+    background-image: none;
+}
+body .ui-tooltip { border-width:2px; }
+
+/*
+ * jQuery UI Datepicker 1.9.0
+ *
+ * Copyright 2012-10-11, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://jqueryui.com/datepicker/
+ */
+.ui-datepicker { width: 17em; padding: .2em .2em 0; display: none; }
+.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; border:0px; font-weight: bold; width: 100%; padding: 4px 0; background-color: #f5f5f5; color: #808080; }
+.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; }
+
+.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { /*top: 1px;*/ }
+.ui-datepicker .ui-datepicker-prev { left:2px; }
+.ui-datepicker .ui-datepicker-next { right:2px; }
+
+.ui-datepicker .ui-datepicker-prev-hover { /*left:1px;*/ }
+.ui-datepicker .ui-datepicker-next-hover { /*right:1px;*/ }
+
+.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px;  }
+.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; }
+.ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; }
+.ui-datepicker select.ui-datepicker-month-year {width: 100%;}
+.ui-datepicker select.ui-datepicker-month,
+.ui-datepicker select.ui-datepicker-year { width: 49%;}
+.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; }
+.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0;  }
+.ui-datepicker td { border: 0; padding: 1px; }
+.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; }
+.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; }
+.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; }
+.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; }
+
+/* with multiple calendars */
+.ui-datepicker.ui-datepicker-multi { width:auto; }
+.ui-datepicker-multi .ui-datepicker-group { float:left; }
+.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; }
+.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; }
+.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; }
+.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; }
+.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; }
+.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; }
+.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; }
+.ui-datepicker-row-break { clear:both; width:100%; font-size:0em; }
+
+/* RTL support */
+.ui-datepicker-rtl { direction: rtl; }
+.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; }
+.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; }
+.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; }
+.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; }
+.ui-datepicker-rtl .ui-datepicker-group { float:right; }
+.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+
+/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */
+.ui-datepicker-cover {
+  display: none; /*sorry for IE5*/
+  display/**/: block; /*sorry for IE5*/
+  position: absolute; /*must have*/
+  z-index: -1; /*must have*/
+  filter: mask(); /*must have*/
+  top: -4px; /*must have*/
+  left: -4px; /*must have*/
+  width: 200px; /*must have*/
+  height: 200px; /*must have*/
+}
+
+.ui-datepicker th{
+  font-weight: bold;
+  color: gray;
+}
+
+.ui-datepicker-today a:hover{
+  background-color: #808080;
+  color: #ffffff;
+
+}
+.ui-datepicker-today a{
+  background-color: #BFBFBF;
+  cursor: pointer;
+  padding: 0 4px;
+  margin-bottom:0px;
+
+}
+
+
+.ui-datepicker td a{
+  margin-bottom:0px;
+  border:0px;
+}
+
+.ui-datepicker td:hover{
+    color: #ffffff;
+}
+
+.ui-datepicker td .ui-state-default {
+  border:0px;
+  background:none;
+  margin-bottom:0px;
+  padding:5px;
+  color:gray;
+  text-align: center;
+  filter:none;
+}
+
+
+.ui-datepicker td .ui-state-active{
+  background:#BFBFBF;
+  margin-bottom:0px;
+  font-size:normal;
+  text-shadow: 0px;
+  color: #ffffff;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+}
+
+.ui-datepicker td .ui-state-hover {
+    color: #ffffff;
+    background: #0064cd;
+    background-color: #0064cd;
+    background-repeat: repeat-x;
+    background-image: -khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));
+    background-image: -moz-linear-gradient(top, #049cdb, #0064cd);
+    background-image: -ms-linear-gradient(top, #049cdb, #0064cd);
+    background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));
+    background-image: -webkit-linear-gradient(top, #049cdb, #0064cd);
+    background-image: -o-linear-gradient(top, #049cdb, #0064cd);
+    background-image: linear-gradient(top, #049cdb, #0064cd);
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0);
+    text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+    border-color: #0064cd #0064cd #003f81;
+    border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+    -webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+    -khtml-border-radius: 4px;
+    border-radius: 4px;
+}
+
+/*
+ * jQuery UI Progressbar 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Progressbar#theming
+ */
+.ui-progressbar { height:2em; text-align: left; }
+.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%;
+
+/*this can be removed if ui-widget-header is blue*/
+    color: #ffffff;
+  background-color: #0064cd;
+  background-repeat: repeat-x;
+  background-image: -khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));
+  background-image: -moz-linear-gradient(top, #049cdb, #0064cd);
+  background-image: -ms-linear-gradient(top, #049cdb, #0064cd);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));
+  background-image: -webkit-linear-gradient(top, #049cdb, #0064cd);
+  background-image: -o-linear-gradient(top, #049cdb, #0064cd);
+  background-image: linear-gradient(top, #049cdb, #0064cd);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0);
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  border-color: #0064cd #0064cd #003f81;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+ }
+
+
+
+/*** Input field styling from Bootstrap **/
+ input, textarea {
+  -webkit-transition: border linear 0.2s, box-shadow linear 0.2s;
+  -moz-transition: border linear 0.2s, box-shadow linear 0.2s;
+  -ms-transition: border linear 0.2s, box-shadow linear 0.2s;
+  -o-transition: border linear 0.2s, box-shadow linear 0.2s;
+  transition: border linear 0.2s, box-shadow linear 0.2s;
+  -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1);
+  -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1);
+  box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1);
+}
+input:focus, textarea:focus {
+  outline: 0;
+  border-color: rgba(82, 168, 236, 0.8);
+  -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
+  -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
+  box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
+}
+input[type=file]:focus, input[type=checkbox]:focus, select:focus {
+  -webkit-box-shadow: none;
+  -moz-box-shadow: none;
+  box-shadow: none;
+  outline: 1px dotted #666;
+}
+
+input[type="text"],
+input[type="password"],
+.ui-autocomplete-input,
+textarea,
+.uneditable-input {
+  display: inline-block;
+  padding: 4px;
+  font-size: 13px;
+  line-height: 18px;
+  color: #808080;
+  border: 1px solid #ccc;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+}
+
+
+
+/**Toolbar**/
+
+.ui-toolbar{
+  padding: 7px 14px;
+  margin: 0 0 18px;
+  background-color: #f5f5f5;
+  background-repeat: repeat-x;
+  background-image: -khtml-gradient(linear, left top, left bottom, from(#ffffff), to(#f5f5f5));
+  background-image: -moz-linear-gradient(top, #ffffff, #f5f5f5);
+  background-image: -ms-linear-gradient(top, #ffffff, #f5f5f5);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff), color-stop(100%, #f5f5f5));
+  background-image: -webkit-linear-gradient(top, #ffffff, #f5f5f5);
+  background-image: -o-linear-gradient(top, #ffffff, #f5f5f5);
+  background-image: linear-gradient(top, #ffffff, #f5f5f5);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);
+  border: 1px solid #ddd;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+  -webkit-box-shadow: inset 0 1px 0 #ffffff;
+  -moz-box-shadow: inset 0 1px 0 #ffffff;
+  box-shadow: inset 0 1px 0 #ffffff;
+}
+
+
+/***Dialog fixes**/
+
+.ui-dialog-buttonset .ui-button:nth-child(2){
+  cursor: pointer;
+  display: inline-block;
+  background-color: #e6e6e6;
+  background-repeat: no-repeat;
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));
+  background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+  background-image: -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);
+  background-image: -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+  background-image: -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+  background-image: linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);
+  padding: 5px 14px 6px;
+  text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
+  color: #333;
+  font-size: 13px;
+  line-height: normal;
+  border: 1px solid #ccc;
+  border-bottom-color: #bbb;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+  -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+  box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+  -webkit-transition: 0.1s linear all;
+  -moz-transition: 0.1s linear all;
+  -ms-transition: 0.1s linear all;
+  -o-transition: 0.1s linear all;
+  transition: 0.1s linear all;
+   overflow: visible;
+}
+
+
+
+/***Wijmo Theming**/
+
+div.wijmo-wijmenu{
+  padding:0 20px;
+  background-color: #222;
+  background-color: #222222;
+  background-repeat: repeat-x;
+  background-image: -khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));
+  background-image: -moz-linear-gradient(top, #333333, #222222);
+  background-image: -ms-linear-gradient(top, #333333, #222222);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));
+  background-image: -webkit-linear-gradient(top, #333333, #222222);
+  background-image: -o-linear-gradient(top, #333333, #222222);
+  background-image: linear-gradient(top, #333333, #222222);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);
+  -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
+  -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
+}
+
+.wijmo-wijmenu .ui-state-default{
+  box-shadow: none;
+  color:#BFBFBF;
+}
+
+.wijmo-wijmenu .ui-state-default .wijmo-wijmenu-text{    
+  color:#BFBFBF;
+}
+
+.wijmo-wijmenu .ui-state-hover{
+  background: #444;
+  background: rgba(255, 255, 255, 0.05);
+}
+
+.wijmo-wijmenu .ui-state-hover .wijmo-wijmenu-text{
+  color:#ffffff;
+}
+
+div.wijmo-wijmenu .ui-widget-header h3{
+  position: relative;
+  margin-top:1px;
+  padding:0;
+}
+
+.wijmo-wijmenu h3 a{
+  color: #FFFFFF;
+  display: block;
+  float: left;
+  font-size: 20px;
+  font-weight: 200;
+  line-height: 1;
+  margin-left: -20px;
+  margin-top:1px;
+  padding: 8px 20px 12px;
+}
+
+.wijmo-wijmenu h3 a:hover{
+  background-color: rgba(255, 255, 255, 0.05);
+  color: #FFFFFF;
+  text-decoration: none;
+}
+
+.wijmo-wijmenu .ui-widget-header{
+  border:0px;
+}
+
+.wijmo-wijmenu .wijmo-wijmenu-parent .wijmo-wijmenu-child{
+  padding: 0.3em 0;
+}
+
+div.wijmo-wijmenu .wijmo-wijmenu-item .wijmo-wijmenu-child{
+  background: #333;
+  border:0;
+  margin:0;
+  padding: 6px 0;
+  width:160px;
+  -webkit-border-radius: 0 0 6px 6px;
+  -moz-border-radius: 0 0 6px 6px;
+  border-radius: 0 0 6px 6px;
+  -webkit-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
+  -moz-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
+}
+
+div.wijmo-wijmenu .wijmo-wijmenu-item{
+  margin:0;
+  border:0;
+}
+
+.wijmo-wijmenu a.wijmo-wijmenu-link{
+  margin:0;
+  line-height: 19px;
+  padding: 10px 10px 11px;
+  border:0;
+  -webkit-border-radius: 0;
+  -moz-border-radius: 0;
+  border-radius:0;
+}
+
+div.wijmo-wijmenu .wijmo-wijmenu-child .wijmo-wijmenu-link{
+  display:block;
+  float:none;
+  padding: 4px 15px;
+  width:auto;
+}
+
+div.wijmo-wijmenu .wijmo-wijmenu-child .wijmo-wijmenu-text
+{
+  float:none;
+}
+
+.wijmo-wijmenu .wijmo-wijmenu-item .wijmo-wijmenu-child .ui-state-hover {
+  background: #191919;
+}
+
+.wijmo-wijmenu .wijmo-wijmenu-item .wijmo-wijmenu-separator{
+  padding: 5px 0;
+  background-image: none;
+  background-color: #222;
+  border-top: 1px solid #444;
+  border-bottom:0;
+  border-left:0;
+  border-right:0;
+}
+
+.wijmo-wijmenu .wijmo-wijmenu-item input {
+  -moz-transition: none 0s ease 0s;
+  background-color: rgba(255, 255, 255, 0.3);
+  border: 1px solid #111111;
+  border-radius: 4px 4px 4px 4px;
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1) inset, 0 1px 0 rgba(255, 255, 255, 0.25);
+  color: rgba(255, 255, 255, 0.75);
+  font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
+  line-height: 1;
+  margin: 5px 10px 0 10px;
+  padding: 4px 9px;
+  width:100px;
+}
+
+.wijmo-wijmenu .wijmo-wijmenu-item input:hover {
+  background-color: rgba(255, 255, 255, 0.5);
+  color: #FFFFFF;
+}
+
+.wijmo-wijmenu .wijmo-wijmenu-item input:focus {
+  background-color: #FFFFFF;
+  border: 0 none;
+  box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
+  color: #404040;
+  outline: 0 none;
+  padding: 5px 10px;
+  text-shadow: 0 1px 0 #FFFFFF;
+}
+
+
+.wijmo-wijmenu .ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default {
+  text-shadow:none;
+}
+
+
+.wijmo-wijmenu .ui-state-default{
+  box-shadow: none;
+  color:#BFBFBF;
+  filter: none;
+}
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/css/custom-theme/jquery.ui.1.10.0.ie.css b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/css/custom-theme/jquery.ui.1.10.0.ie.css
new file mode 100644
index 0000000..b7392b0
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/css/custom-theme/jquery.ui.1.10.0.ie.css
@@ -0,0 +1,16 @@
+
+.ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-left, .ui-corner-bottom{ border-radius:0px;}
+/*
+ * jQuery UI Tabs 1.9.0
+ *
+ * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://jqueryui.com/tabs/
+ */
+
+.ui-state-active,.ui-tabs-selected { border-radius:0px;}
+.ui-tabs-selected { border-radius:0px;}
+.ui-tabs .ui-tabs-nav li{ filter:none;}
+.ui-tabs .ui-tabs-nav li a { border-radius:0px; }
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/css/custom-theme/jquery.ui.1.9.2.ie.css b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/css/custom-theme/jquery.ui.1.9.2.ie.css
new file mode 100644
index 0000000..b7392b0
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/css/custom-theme/jquery.ui.1.9.2.ie.css
@@ -0,0 +1,16 @@
+
+.ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-left, .ui-corner-bottom{ border-radius:0px;}
+/*
+ * jQuery UI Tabs 1.9.0
+ *
+ * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://jqueryui.com/tabs/
+ */
+
+.ui-state-active,.ui-tabs-selected { border-radius:0px;}
+.ui-tabs-selected { border-radius:0px;}
+.ui-tabs .ui-tabs-nav li{ filter:none;}
+.ui-tabs .ui-tabs-nav li a { border-radius:0px; }
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/css/demo.css b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/css/demo.css
new file mode 100644
index 0000000..7b705f7
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/css/demo.css
@@ -0,0 +1,200 @@
+/*!
+ * jQuery UI Bootstrap (0.22)
+ * http://addyosmani.github.com/jquery-ui-bootstrap
+ *
+ * Copyright 2012, Addy Osmani
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ *
+ * Portions copyright jQuery UI & Twitter Bootstrap
+ */
+h2 {
+    font-size: 24px;
+    line-height: 36px;
+}
+h2 small {
+    font-size: 14px;
+}
+h3,
+h4,
+h5,
+h6 {
+    line-height: 36px;
+}
+h3 {
+    font-size: 18px;
+}
+/* Override some defaults */
+html, body {
+    background-color: #eee;
+}
+body {
+    padding-top: 40px; /* 40px to make the container go all the way to the bottom of the topbar */
+}
+.container > footer p {
+    text-align: center; /* center align it with the container */
+}
+.container {
+    width: 820px; /* downsize our container to make the content feel a bit tighter and more cohesive. NOTE: this removes two full columns from the grid, meaning you only go to 14 columns and not 16. */
+}
+
+/* The white background content wrapper */
+.container > .content {
+    background-color: #fff;
+    padding: 20px;
+    margin: 0 -20px; /* negative indent the amount of the padding to maintain the grid system */
+    -webkit-border-radius: 0 0 6px 6px;
+    -moz-border-radius: 0 0 6px 6px;
+    border-radius: 0 0 6px 6px;
+    -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.15);
+    -moz-box-shadow: 0 1px 2px rgba(0,0,0,.15);
+    box-shadow: 0 1px 2px rgba(0,0,0,.15);
+}
+
+/* Page header tweaks */
+.page-header {
+    background-color: #f5f5f5;
+    padding: 20px 20px 10px;
+    margin: -20px -20px 20px;
+}
+
+/* Styles you shouldn't keep as they are for displaying this base example only */
+.content .span10,
+.content .span4 {
+    min-height: 500px;
+}
+/* Give a quick and non-cross-browser friendly divider */
+.content .span4 {
+    margin-left: 0;
+    padding-left: 19px;
+    border-left: 1px solid #eee;
+}
+
+.topbar .btn {
+    border: 0;
+}
+.demoHeaders {
+	margin-top: 1.5em;
+	margin-bottom: 1em;
+}
+
+#dialog_link,#modal_link {
+	padding: .4em 1em .4em 20px;
+	text-decoration: none;
+	position: relative;
+}
+
+#dialog_link span.ui-icon, #modal_link span.ui-icon {
+	margin: 0 5px 0 0;
+	position: absolute;
+	left: .2em;
+	top: 50%;
+	margin-top: -8px;
+}
+
+ul#icons {
+	margin: 0;
+	padding: 0;
+}
+
+ul#icons li {
+	margin: 2px;
+	position: relative;
+	padding: 4px 0;
+	cursor: pointer;
+	float: left;
+	list-style: none;
+}
+
+ul#icons span.ui-icon {
+	float: left;
+	margin: 0 4px;
+}
+
+#buttons button {
+	float: left;
+	margin-right: 4px;
+}
+
+#components {
+	margin: 2em 0 1em;
+	width: 900px;
+	margin: 0 auto;
+	padding: 50px;
+}
+
+#dialog2 label, #dialog2 input {
+	display: block;
+}
+
+#dialog2 label {
+	margin-top: 0.5em;
+}
+
+#dialog2 input, #dialog2 textarea {
+	width: 95%;
+}
+
+#tabs2 {
+	margin-top: 1em;
+}
+
+#tabs2 li .ui-icon-close {
+	float: left;
+	margin: 0.4em 0.2em 0 0;
+	cursor: pointer;
+}
+
+#add_tab {
+	cursor: pointer;
+}
+
+.span10 {
+	width: 500px;
+	margin-right: 10px;
+}
+
+.span4 {
+	width: 290px;
+}
+
+.ui-widget-overlay {
+	width: 500px;
+}
+
+.alert-message p{
+	line-height:18px;
+	margin-bottom:18px;
+}
+
+input[type="text"],
+input[type="password"],
+.ui-autocomplete-input,
+textarea,
+.uneditable-input{
+  width: 210px;
+  height: 18px;
+}
+
+#toolbar {
+	padding: 5px 0 5px 5px;
+}
+/*
+* Bug chrome with toolbar and bootstrap inheritance
+*/
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+	#toolbar input{display:block;float:left;}
+}
+
+/**
+* fix bug position button customfile
+*/
+.input-append.customfile, .input-prepend {
+    font-size: 0;
+    margin-bottom: 5px;
+    white-space: normal;
+}
+.input-append.customfile .add-on{
+	height:18px;
+	font-size:13px;
+	line-height:18px;
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/extra.html b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/extra.html
new file mode 100644
index 0000000..d72e0b4
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/extra.html
@@ -0,0 +1,225 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>jQuery UI Bootstrap</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="description" content="A preview of the jQuery UI Bootstrap theme">
+    <meta name="author" content="Addy Osmani">
+
+    <!-- Le styles -->
+    <link href="assets/css/bootstrap.min.css" rel="stylesheet">
+    <link type="text/css" href="css/custom-theme/jquery-ui-1.10.0.custom.css" rel="stylesheet" />
+    <link type="text/css" href="assets/css/font-awesome.min.css" rel="stylesheet" />
+    <!--[if IE 7]>
+    <link rel="stylesheet" href="assets/css/font-awesome-ie7.min.css">
+    <![endif]-->
+    <!--[if lt IE 9]>
+    <link rel="stylesheet" type="text/css" href="css/custom-theme/jquery.ui.1.10.0.ie.css"/>
+    <![endif]-->
+    <link href="assets/css/docs.css" rel="stylesheet">
+    <link href="assets/js/google-code-prettify/prettify.css" rel="stylesheet">
+    <!--begin wijmo menu-->
+    <link href="third-party/wijmo/jquery.wijmo-open.1.5.0.css" rel="stylesheet" type="text/css" />
+    <!--End wijmo menu-->
+    <!--begin file input-->
+    <link href="third-party/jQuery-UI-FileInput/css/enhanced.css" rel="Stylesheet">
+    <!--End file input-->
+    <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
+    <!--[if lt IE 9]>
+    <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+    <![endif]-->
+
+    <!-- Le fav and touch icons -->
+    <link rel="apple-touch-icon-precomposed" sizes="144x144" href="assets/ico/apple-touch-icon-144-precomposed.png">
+    <link rel="apple-touch-icon-precomposed" sizes="114x114" href="assets/ico/apple-touch-icon-114-precomposed.png">
+    <link rel="apple-touch-icon-precomposed" sizes="72x72" href="assets/ico/apple-touch-icon-72-precomposed.png">
+    <link rel="apple-touch-icon-precomposed" href="assets/ico/apple-touch-icon-57-precomposed.png">
+    <link rel="shortcut icon" href="assets/ico/favicon.png">
+
+</head>
+
+<body data-spy="scroll" data-target=".bs-docs-sidebar" data-twttr-rendered="true">
+
+<!-- Navbar
+================================================== -->
+<div class="navbar navbar-inverse navbar-fixed-top">
+    <div class="navbar-inner">
+        <div class="container">
+            <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+            </button>
+            <a class="brand" href="http://github.com/addyosmani/jquery-ui-bootstrap">jQuery UI Bootstrap</a>
+            <div class="nav-collapse collapse">
+                <ul class="nav">
+                    <li>
+                        <a href="./index.html">Home</a>
+                    </li>
+                    <li class="active">
+                        <a href="./extra.html">Extra</a>
+                    </li>
+                    <li>
+                        <a href="http://github.com/addyosmani/jquery-ui-bootstrap/issues">Feedback/Issues</a>
+                    </li>
+                    <li>
+                        <a href="http://twitter.com/addyosmani">Contact</a>
+                    </li>
+                </ul>
+                <div id="twitter-share" class="pull-right">
+                    <a href="https://twitter.com/share" class="twitter-share-button" data-url="http://addyosmani.github.com/jquery-ui-bootstrap/" data-text="A new jQuery UI Bootstrap theme" data-via="addyosmani" data-size="large">Tweet</a>
+                    <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+
+<!-- Subhead
+================================================== -->
+<header class="jumbotron subhead" id="overview">
+    <div class="container">
+        <h1>jQuery UI Bootstrap</h1>
+        <p class="lead">A Bootstrap-themed kickstart for jQuery UI widgets (v0.5).</p>
+    </div>
+</header>
+
+
+<div class="container">
+    <!-- Docs nav ================================================== -->
+    <div class="row">
+        <div class="span3 bs-docs-sidebar">
+            <ul class="nav nav-list bs-docs-sidenav">
+                <li><a href="#wijmo"><i class="icon-chevron-right"></i> Wijmo</a></li>
+                <li><a href="#file-input"><i class="icon-chevron-right"></i> File input</a></li>
+                <li><a href="#date-range"><i class="icon-chevron-right"></i> Date Range</a></li>
+            </ul>
+        </div>
+        <div class="span9">
+            <!-- Wijmo ================================================== -->
+            <section id="wijmo">
+                <div class="page-header">
+                    <h1>Wijmo</h1>
+                </div>
+                <p>
+                    This is an example of how to retheme one of the Wijmo jQuery UI components to match the Twitter Bootstrap theme. Whilst a menu component will be arriving to jQueryUI soon, you can find the menu in <a href="http://wijmo.com/widgets/wijmo-open/">Wijmo Open</a>.
+                </p>
+                <div id="wijmo-container" class="container-fluid">
+                    <ul id="menu1">
+                        <li>
+                            <h3>
+                                <a href="">Project Name</a></h3>
+                        </li>
+                        <li><a href="#">Home</a></li>
+                        <li><a href="#">Link</a></li>
+                        <li><a href="#">Link</a></li>
+                        <li><a href="#">Dropdown</a>
+                            <ul>
+                                <li><a href="#">Secondary link</a> </li>
+                                <li><a href="#">Something else here</a> </li>
+                                <li></li>
+                                <li><a href="#">Another link</a> </li>
+                            </ul>
+                        </li>
+                        <li>
+                            <input type="text" placeholder="Search">
+                        </li>
+                    </ul>
+                    <!-- End demo markup -->
+                </div>
+                <div class="clearfix"></div>
+<pre class="prettyprint linenums">
+$("#menu1").wijmenu({
+    trigger: ".wijmo-wijmenu-item",
+    triggerEvent: "click"
+});
+</pre>
+            </section>
+            <!-- File input -->
+            <section id="file-input">
+                <div class="page-header">
+                    <h1>File Input</h1>
+                </div>
+                <div class="container-fluid">
+                    <form>
+                        <input type="file" class="span3" name="file" id="file">
+                    </form>
+                </div>
+<pre class="prettyprint linenums">
+$('#file').customFileInput({
+    button_position : 'right'
+});
+</pre>
+            </section>
+            <!-- end file input -->
+            <!-- File input -->
+            <section id="date-range">
+                <div class="page-header">
+                    <h1>Select a Date Range with datepicker</h1>
+                </div>
+                <p>
+                    <input type="text" value="01/01/2013" id="rangeBa" />
+                    <input type="text" value="02/06/2013" id="rangeBb" />
+                </p>
+<pre class="prettyprint linenums">
+// Select a Date Range with datepicker
+$( "#rangeBa" ).datepicker({
+    defaultDate: "+1w",
+    changeMonth: true,
+    numberOfMonths: 3,
+    onClose: function( selectedDate ) {
+        $( "#rangeBb" ).datepicker( "option", "minDate", selectedDate );
+    }
+});
+$( "#rangeBb" ).datepicker({
+    defaultDate: "+1w",
+    changeMonth: true,
+    numberOfMonths: 3,
+    onClose: function( selectedDate ) {
+        $( "#rangeBa" ).datepicker( "option", "maxDate", selectedDate );
+    }
+});
+</pre>
+            </section>
+            <!-- end file input -->
+        </div>
+    </div>
+</div>
+
+<!-- Footer
+================================================== -->
+<footer class="footer">
+    <div class="container">
+        <p>
+            jQuery UI Bootstrap &copy; Addy Osmani 2012 - 2013.
+        </p>
+        <p>
+            Twitter Bootstrap &copy; Twitter 2012 - 2013
+        </p>
+        <ul class="footer-links">
+            <li><a href="http://addyosmani.com/blog/">Blog</a></li>
+            <li class="muted">&middot;</li>
+            <li><a href="https://github.com/addyosmani/jquery-ui-bootstrap/issues?state=open">Issues</a></li>
+        </ul>
+    </div>
+</footer>
+<!-- Placed at the end of the document so the pages load faster -->
+<script src="assets/js/jquery-1.9.0.min.js" type="text/javascript"></script>
+<script src="http://code.jquery.com/jquery-migrate-1.0.0.js"></script>
+<script src="assets/js/bootstrap.min.js" type="text/javascript"></script>
+<script src="assets/js/jquery-ui-1.10.0.custom.min.js" type="text/javascript"></script>
+<script src="assets/js/google-code-prettify/prettify.js" type="text/javascript"></script>
+<script src="assets/js/docs.js" type="text/javascript"></script>
+<!-- FileInput -->
+<script src="third-party/jQuery-UI-FileInput/js/enhance.min.js" type="text/javascript"></script>
+<script src="third-party/jQuery-UI-FileInput/js/fileinput.jquery.js" type="text/javascript"></script>
+<!-- End FileInput -->
+<!--wijmo-->
+<script src="third-party/wijmo/jquery.mousewheel.min.js" type="text/javascript"></script>
+<script src="third-party/wijmo/jquery.wijmo-open.1.5.0.min.js" type="text/javascript"></script>
+<!--End wijmo-->
+<script src="assets/js/demo.js" type="text/javascript"></script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/index.html b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/index.html
new file mode 100644
index 0000000..615edc5
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/index.html
@@ -0,0 +1,919 @@
+<!DOCTYPE html>
+        <html lang="en">
+        <head>
+            <meta charset="utf-8">
+            <title>jQuery UI Bootstrap</title>
+            <meta name="viewport" content="width=device-width, initial-scale=1.0">
+            <meta name="description" content="A preview of the jQuery UI Bootstrap theme">
+            <meta name="author" content="Addy Osmani">
+
+            <!-- Le styles -->
+            <link href="assets/css/bootstrap.min.css" rel="stylesheet">
+            <link type="text/css" href="css/custom-theme/jquery-ui-1.10.0.custom.css" rel="stylesheet" />
+            <link type="text/css" href="assets/css/font-awesome.min.css" rel="stylesheet" />
+            <!--[if IE 7]>
+            <link rel="stylesheet" href="assets/css/font-awesome-ie7.min.css">
+            <![endif]-->
+            <!--[if lt IE 9]>
+            <link rel="stylesheet" type="text/css" href="css/custom-theme/jquery.ui.1.10.0.ie.css"/>
+            <![endif]-->
+            <link href="assets/css/docs.css" rel="stylesheet">
+            <link href="assets/js/google-code-prettify/prettify.css" rel="stylesheet">
+
+            <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
+            <!--[if lt IE 9]>
+            <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+            <![endif]-->
+
+            <!-- Le fav and touch icons -->
+            <link rel="apple-touch-icon-precomposed" sizes="144x144" href="assets/ico/apple-touch-icon-144-precomposed.png">
+            <link rel="apple-touch-icon-precomposed" sizes="114x114" href="assets/ico/apple-touch-icon-114-precomposed.png">
+            <link rel="apple-touch-icon-precomposed" sizes="72x72" href="assets/ico/apple-touch-icon-72-precomposed.png">
+            <link rel="apple-touch-icon-precomposed" href="assets/ico/apple-touch-icon-57-precomposed.png">
+            <link rel="shortcut icon" href="assets/ico/favicon.png">
+
+        </head>
+
+        <body data-spy="scroll" data-target=".bs-docs-sidebar" data-twttr-rendered="true">
+
+        <!-- Navbar
+        ================================================== -->
+        <div class="navbar navbar-inverse navbar-fixed-top">
+            <div class="navbar-inner">
+                <div class="container">
+                    <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+                        <span class="icon-bar"></span>
+                        <span class="icon-bar"></span>
+                        <span class="icon-bar"></span>
+                    </button>
+                    <a class="brand" href="http://github.com/addyosmani/jquery-ui-bootstrap">jQuery UI Bootstrap</a>
+                    <div class="nav-collapse collapse">
+                        <ul class="nav">
+                            <li class="active">
+                                <a href="./index.html">Home</a>
+                            </li>
+                            <li>
+                                <a href="./extra.html">Extra</a>
+                            </li>
+                            <li>
+                                <a href="http://github.com/addyosmani/jquery-ui-bootstrap/issues">Feedback/Issues</a>
+                            </li>
+                            <li>
+                                <a href="http://twitter.com/addyosmani">Contact</a>
+                            </li>
+                        </ul>
+                        <div id="twitter-share" class="pull-right">
+                            <a href="https://twitter.com/share" class="twitter-share-button" data-url="http://addyosmani.github.com/jquery-ui-bootstrap/" data-text="A new jQuery UI Bootstrap theme" data-via="addyosmani" data-size="large">Tweet</a>
+                            <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+
+        <!-- Subhead
+        ================================================== -->
+        <header class="jumbotron subhead" id="overview">
+            <div class="container">
+                <h1>jQuery UI Bootstrap</h1>
+                <p class="lead">A Bootstrap-themed kickstart for jQuery UI widgets (v0.5).</p>
+            </div>
+        </header>
+
+
+        <div class="container">
+        <!-- Docs nav ================================================== -->
+        <div class="row">
+        <div class="span3 bs-docs-sidebar">
+            <ul class="nav nav-list bs-docs-sidenav">
+                <li><a href="#download-bootstrap"><i class="icon-chevron-right"></i> Download</a></li>
+                <li><a href="#button"><i class="icon-chevron-right"></i> Button</a></li>
+                <li><a href="#accordion"><i class="icon-chevron-right"></i> Accordion</a></li>
+                <li><a href="#dialog"><i class="icon-chevron-right"></i> Dialog</a></li>
+                <li><a href="#tabs-simple"><i class="icon-chevron-right"></i> Tabs</a></li>
+                <li><a href="#overlay"><i class="icon-chevron-right"></i> Overlay</a></li>
+                <li><a href="#block-state"><i class="icon-chevron-right"></i> Highlight/Error</a></li>
+                <li><a href="#calendar"><i class="icon-chevron-right"></i> Datepicker</a></li>
+                <li><a href="#slider"><i class="icon-chevron-right"></i> Slider</a></li>
+                <li><a href="#autocomplete"><i class="icon-chevron-right"></i> Autocomplete</a></li>
+                <li><a href="#block-menu"><i class="icon-chevron-right"></i> Menu</a></li>
+                <li><a href="#block-spinner"><i class="icon-chevron-right"></i> Spinner</a></li>
+                <li><a href="#block-icons"><i class="icon-chevron-right"></i> Icons</a></li>
+                <li><a href="#block-tooltip"><i class="icon-chevron-right"></i> Tooltip</a></li>
+            </ul>
+        </div>
+        <div class="span9">
+            <!-- Download ================================================== -->
+            <section id="download-bootstrap">
+                <div class="page-header">
+                    <h1>1. Download</h1>
+                </div>
+                <div class="row-fluid">
+                    <p class="docs-lead">
+                        Welcome! This is a live preview of the new jQuery UI Bootstrap theme - a project I started to bring the beauty of Twitter's <a href="http://twitter.github.com/bootstrap/">Bootstrap</a> to jQuery UI widgets.
+                        With this theme, not only do you get the ability to use Bootstrap-themed widgets, but you can now also use (most) of Twitter Bootstrap side-by-wide with it without components breaking visually.
+                        It's still a work-in-progress, but I hope you find it useful. Issues and pull requests are always welcome - <a href="http://twitter.com/addyosmani">@addyosmani</a></p>
+                    </p>
+                    <p>
+                        <a class="download-btn ui-button-primary"href="https://github.com/addyosmani/jquery-ui-bootstrap/zipball/v0.23">Download stable (v0.23)</a>
+                        <a class="download-btn" href="https://github.com/addyosmani/jquery-ui-bootstrap/zipball/master" >Download Latest (dev)</a>
+                    </p>
+                </div>
+            </section>
+            <div class="page-header">
+                <h1>2. Documentation</h1>
+            </div>
+            <div class="alert alert-info">
+                <span class="icon-info-sign"></span> This theme's support for more third-party widgets may improve over-time, based on requests and the popularity of the widgets.
+            </div>
+            <!-- Button -->
+            <section id="button">
+                <div class="page-header">
+                    <h1>Button</h1>
+                </div>
+                <!-- Buttons -->
+                <h2>Button default</h2>
+                <p>
+                    <button>Default</button>
+                    <button class="ui-button-primary">Primary</button>
+                    <button class="ui-button-success">Success</button>
+                    </br>
+                    </br>
+                    <button class="ui-button-error">Danger</button>
+                    <a class="button">Anchor</a>
+                    <input type="submit" class="button" value="Submit"/>
+                </p>
+
+<pre class="prettyprint linenums">
+// Button
+$('button').button();
+// Anchors, Submit
+$('.button').button();
+</pre>
+                <!-- Button set-->
+                <h2>Button set</h2>
+                <p>
+                    <form>
+                        <div id="radioset">
+                            <input type="radio" id="radio1" name="radio" /><label for="radio1">Choice 1</label>
+                            <input type="radio" id="radio2" name="radio" checked="checked" /><label for="radio2">Choice 2</label>
+                            <input type="radio" id="radio3" name="radio" /><label for="radio3">Choice 3</label>
+                        </div>
+                        </br>
+                        <div id="format">
+                            <input type="checkbox" id="check1" /><label for="check1">B</label>
+                            <input type="checkbox" id="check2" /><label for="check2">I</label>
+                            <input type="checkbox" id="check3" /><label for="check3">U</label>
+                        </div>
+                        </br>
+                    </form>
+                </p>
+<pre class="prettyprint linenums">
+// Buttonset
+$('#radioset').buttonset();
+$("#format").buttonset();
+</pre>
+            <h2>Simple toolbar</h2>
+                <div id="toolbar" class="span4 ui-toolbar ui-widget-header ui-corner-all">
+
+                <input type="checkbox" id="shuffle" /><label for="shuffle">Shuffle</label>
+                
+                <span id="repeat">
+                  <input type="radio" id="repeat0" name="repeat" checked="checked" /><label for="repeat0">No Repeat</label>
+                  <input type="radio" id="repeat1" name="repeat" /><label for="repeat1">Once</label>
+                  <input type="radio" id="repeatall" name="repeat" /><label for="repeatall">All</label>
+                </span>
+
+              </div>
+              <div class="clearfix"></div>
+<pre class="prettyprint linenums">
+//Toolbar
+$("#play, #shuffle").button();
+$("#repeat").buttonset();
+</pre>
+            </section>
+            <!-- Accordion -->
+            <section id="accordion">
+                <div class="page-header">
+                    <h1>Accordion</h1>
+                </div>
+                <div id="menu-collapse">
+                    <div>
+                        <h3><a href="#">First</a></h3>
+                        <div>Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet.</div>
+                    </div>
+                    <div>
+                        <h3><a href="#">Second</a></h3>
+                        <div>Phasellus mattis tincidunt nibh.</div>
+                    </div>
+                    <div>
+                        <h3><a href="#">Third</a></h3>
+                        <div>Nam dui erat, auctor a, dignissim quis.</div>
+                    </div>
+                </div>
+<pre class="prettyprint linenums">
+// Accordion
+$("#menu-collapse").accordion({
+    header: "h3"
+});
+</pre>
+            </section>
+            <!-- Dialog -->
+            <section id="dialog">
+                <div class="page-header">
+                    <h1>Dialog</h1>
+                </div>
+                <p class="dialog-button">
+                    <a href="#" id="dialog_link" class="ui-state-default ui-corner-all">
+                        <span class="ui-icon ui-icon-newwin"></span>Open Dialog
+                    </a>
+                    &nbsp;
+                    <a href="#" id="modal_link" class="ui-state-default ui-corner-all">
+                        <span class="ui-icon ui-icon-newwin"></span>
+                        Open Modal Dialog
+                    </a>
+                </p>
+                <!-- ui-dialog -->
+                <div id="dialog_simple" title="Dialog Simple Title">
+                    <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p>
+                </div>
+                <!--static dialog-->
+                <div id="dialog-message" title="Modal Dialog">
+                    <p>
+                        <span class="ui-icon ui-icon-circle-check" style="float:left; margin:0 7px 50px 0;"></span>
+                        Your files have downloaded successfully into the My Downloads folder.
+                    </p>
+                    <p>
+                        Currently using <b>36% of your storage space</b>.
+                    </p>
+                </div>
+                <!--end static dialog-->
+<pre class="prettyprint linenums">
+// Dialog Link
+$('#dialog_link').click(function () {
+    $('#dialog_simple').dialog('open');
+    return false;
+});
+
+// Modal Link
+$('#modal_link').click(function () {
+    $('#dialog-message').dialog('open');
+    return false;
+});
+
+// Dialog Simple
+$('#dialog_simple').dialog({
+    autoOpen: false,
+    width: 600,
+    buttons: {
+        "Ok": function () {
+            $(this).dialog("close");
+        },
+        "Cancel": function () {
+            $(this).dialog("close");
+        }
+    }
+});
+
+// Dialog message
+$("#dialog-message").dialog({
+    autoOpen: false,
+    modal: true,
+    buttons: {
+        Ok: function () {
+            $(this).dialog("close");
+        }
+    }
+});
+</pre>
+            </section>
+            <!-- Tabs -->
+            <section id="tabs-simple">
+                <div class="page-header">
+                    <h1>Tabs</h1>
+                </div>
+                <h2>Simple tabs</h2>
+                <!--Demo-->
+                <div id="tabs">
+                    <ul>
+                        <li><a href="#tabs-a">First</a></li>
+                        <li><a href="#tabs-b">Second</a></li>
+                        <li><a href="#tabs-c">Third</a></li>
+                    </ul>
+                    <div id="tabs-a">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</div>
+                    <div id="tabs-b">Phasellus mattis tincidunt nibh. Cras orci urna, blandit id, pretium vel, aliquet ornare, felis. Maecenas scelerisque sem non nisl. Fusce sed lorem in enim dictum bibendum.</div>
+                    <div id="tabs-c">Nam dui erat, auctor a, dignissim quis, sollicitudin eu, felis. Pellentesque nisi urna, interdum eget, sagittis et, consequat vestibulum, lacus. Mauris porttitor ullamcorper augue.</div>
+                </div>
+                <!-- End demo -->
+<pre class="prettyprint linenums">
+// Simple tabs
+$('#tabs').tabs();
+</pre>
+                <h2>Simple tabs adding and removing.</h2>
+                <!-- Demo -->
+                <div id="dialog2" title="Tab data">
+                    <form>
+                        <fieldset class="ui-helper-reset">
+                            <label for="tab_title">Title</label>
+                            <input type="text" name="tab_title" id="tab_title" value="" class="ui-widget-content ui-corner-all" />
+                            <label for="tab_content">Content</label>
+                            <textarea name="tab_content" id="tab_content" class="ui-widget-content ui-corner-all"></textarea>
+                        </fieldset>
+                    </form>
+                </div>
+
+                <button id="add_tab" class="ui-button-primary">Add Tab</button>
+
+                <div id="tabs2">
+                    <ul>
+                        <li><a href="#tabs-1">Nunc tincidunt</a></li>
+                    </ul>
+                    <div id="tabs-1">
+                        <p>Proin elit arcu, rutrum commodo, vehicula tempus, commodo a, risus. Curabitur nec arcu. Donec sollicitudin mi sit amet mauris. Nam elementum quam ullamcorper ante. Etiam aliquet massa et lorem. Mauris dapibus lacus auctor risus. Aenean tempor ullamcorper leo. Vivamus sed magna quis ligula eleifend adipiscing. Duis orci. Aliquam sodales tortor vitae ipsum. Aliquam nulla. Duis aliquam molestie erat. Ut et mauris vel pede varius sollicitudin. Sed ut dolor nec orci tincidunt interdum. Phasellus ipsum. Nunc tristique tempus lectus.</p>
+                    </div>
+                </div>
+                <!-- End demo -->
+<pre class="prettyprint linenums">
+// Simple tabs adding and removing
+$('#tabs2').tabs();
+
+// Dynamic tabs
+var tabTitle = $( "#tab_title" ),
+    tabContent = $( "#tab_content" ),
+    tabTemplate = "&lt;li&gt;&lt;a href='#{href}'>#{label}&lt;/a&gt; &lt;span class='ui-icon ui-icon-close'>Remove Tab&lt;/span&gt;&lt;/li&gt;",
+    tabCounter = 2;
+
+var tabs = $( "#tabs2" ).tabs();
+
+// modal dialog init: custom buttons and a "close" callback reseting the form inside
+var dialog = $( "#dialog2" ).dialog({
+    autoOpen: false,
+    modal: true,
+    buttons: {
+        Add: function() {
+            addTab();
+            $( this ).dialog( "close" );
+        },
+        Cancel: function() {
+            $( this ).dialog( "close" );
+        }
+    },
+    close: function() {
+        form[ 0 ].reset();
+    }
+});
+
+// addTab form: calls addTab function on submit and closes the dialog
+var form = dialog.find( "form" ).submit(function( event ) {
+    addTab();
+    dialog.dialog( "close" );
+    event.preventDefault();
+});
+
+// actual addTab function: adds new tab using the input from the form above
+function addTab() {
+    var label = tabTitle.val() || "Tab " + tabCounter,
+        id = "tabs-" + tabCounter,
+        li = $( tabTemplate.replace( /#\{href\}/g, "#" + id ).replace( /#\{label\}/g, label ) ),
+        tabContentHtml = tabContent.val() || "Tab " + tabCounter + " content.";
+
+    tabs.find( ".ui-tabs-nav" ).append( li );
+    tabs.append( "&lt;div id='" + id + "&gt;&lt;/div&gt;&lt;p&gt;" + tabContentHtml + "&lt;/p&gt;&lt;/div&gt;" );
+    tabs.tabs( "refresh" );
+    tabCounter++;
+}
+
+// addTab button: just opens the dialog
+$( "#add_tab" )
+    .button()
+    .click(function() {
+        dialog.dialog( "open" );
+    });
+
+// close icon: removing the tab on click
+$( "#tabs2" ).on( "click",'span.ui-icon-close', function() {
+
+    var panelId = $( this ).closest( "li" ).remove().attr( "aria-controls" );
+    $( "#" + panelId ).remove();
+    tabs.tabs( "refresh" );
+});
+</pre>
+                <h2>Combination examples</h2>
+                <!--start combinations-->
+                <div id="tabs3">
+                    <ul>
+                        <li><a href="#tabs3-1">First</a></li>
+                        <li><a href="#tabs3-2">Second</a></li>
+                        <li><a href="#tabs3-3">Third</a></li>
+                    </ul>
+                    <div id="tabs3-1">
+                        <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse eget diam nec urna hendrerit tempus. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum aliquam ligula non nulla cursus volutpat. Aliquam malesuada felis nec turpis auctor interdum. Cras et lobortis dolor. Nam sodales, dolor eu cursus faucibus, justo leo vestibulum turpis, id malesuada erat ipsum et leo. Integer id aliquam augue. Proin quis risus magna.</p>
+                        <a href="#" id="sampleButton">Change</a>
+                    </div>
+                    <div id="tabs3-2">Tab 2</div>
+                    <div id="tabs3-3">Tab 3</div>
+                </div>
+                <!--end combinations-->
+<pre class="prettyprint linenums">
+//Combination examples (tabs) and open dialog
+$('#sampleButton').on('click', function(event){
+    event.preventDefault();
+    $('#dialog_simple').dialog({
+        autoOpen: true,
+        modal: true,
+        width: 600,
+        buttons: {
+            "Save": function () {
+                $(this).dialog("close");
+            },
+            "Cancel": function () {
+                $(this).dialog("close");
+            }
+        }
+    });
+});
+</pre>
+            <!-- End tabs -->
+            </section>
+            <section id="overlay">
+                <div class="page-header">
+                    <h1>Overlay and Shadow Classes</h1>
+                </div>
+                <div class="window-contain">
+                    <p>Lorem ipsum dolor sit amet,  Nulla nec tortor. Donec id elit quis purus consectetur consequat. </p><p>Nam congue semper tellus. Sed erat dolor, dapibus sit amet, venenatis ornare, ultrices ut, nisi. Aliquam ante. Suspendisse scelerisque dui nec velit. Duis augue augue, gravida euismod, vulputate ac, facilisis id, sem. Morbi in orci. </p><p>Nulla purus lacus, pulvinar vel, malesuada ac, mattis nec, quam. Nam molestie scelerisque quam. Nullam feugiat cursus lacus.orem ipsum dolor sit amet, consectetur adipiscing elit. Donec libero risus, commodo vitae, pharetra mollis, posuere eu, pede. Nulla nec tortor. Donec id elit quis purus consectetur consequat. </p><p>Nam congue semper tellus. Sed erat dolor, dapibus sit amet, venenatis ornare, ultrices ut, nisi. Aliquam ante. Suspendisse scelerisque dui nec velit. Duis augue augue, gravida euismod, vulputate ac, facilisis id, sem. Morbi in orci. Nulla purus lacus, pulvinar vel, malesuada ac, mattis nec, quam. Nam molestie scelerisque quam. </p><p>Nullam feugiat cursus lacus.orem ipsum dolor sit amet, consectetur adipiscing elit. Donec libero risus, commodo vitae, pharetra mollis, posuere eu, pede. Nulla nec tortor. Donec id elit quis purus consectetur consequat. Nam congue semper tellus. Sed erat dolor, dapibus sit amet, venenatis ornare, ultrices ut, nisi. Aliquam ante. </p><p>Suspendisse scelerisque dui nec velit. Duis augue augue, gravida euismod, vulputate ac, facilisis id, sem. Morbi in orci. Nulla purus lacus, pulvinar vel, malesuada ac, mattis nec, quam. Nam molestie scelerisque quam. Nullam feugiat cursus lacus.orem ipsum dolor sit amet, consectetur adipiscing elit. Donec libero risus, commodo vitae, pharetra mollis, posuere eu, pede. Nulla nec tortor. Donec id elit quis purus consectetur consequat. Nam congue semper tellus. Sed erat dolor, dapibus sit amet, venenatis ornare, ultrices ut, nisi. </p>
+
+                    <!-- ui-overlay -->
+                    <div class="ui-overlay">
+                        <div class="ui-widget-overlay"></div>
+                        <div class="ui-widget-shadow ui-corner-all" style="width: 302px; height: 152px; position: absolute; left: 50px; top: 30px;"></div>
+                    </div>
+                    <div style="position: absolute; width: 280px; height: 130px;left: 50px; top: 30px; padding: 10px;" class="ui-widget ui-widget-content ui-corner-all">
+                        <div class="ui-dialog-content ui-widget-content" style="background: none; border: 0;">
+                            <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p>
+                        </div>
+                    </div>
+
+                </div>
+            </section>
+            <section id="block-state">
+                <div class="page-header">
+                    <h1>Highlight / Error</h1>
+                </div>
+                <!-- Highlight / Error -->
+                <h2>Highlight</h2>
+                <div class="ui-widget">
+                  <div class="ui-state-highlight ui-corner-all">
+                    <p><span class="ui-icon ui-icon-info" style="float: left; margin-right: .3em;"></span>
+                    <strong>Hey!</strong> Sample ui-state-highlight style.</p>
+                  </div>
+                </div>
+                <h2>Error</h2>
+                <div class="ui-widget">
+                  <div class="ui-state-error ui-corner-all">
+                    <p><span class="ui-icon ui-icon-alert" style="float: left; margin-right: .3em;"></span>
+                    <strong>Alert:</strong> Sample ui-state-error style.</p>
+                  </div>
+                </div>
+                <h2>Default</h2>
+                <div class="ui-widget">
+                  <div class="ui-state-default ui-corner-all">
+                    <p><span class="ui-icon ui-icon-mail-closed" style="float: left; margin-right: .3em;"></span>
+                    <strong>Hello:</strong> Sample ui-state-default style.</p>
+                  </div>
+                </div>
+            </section>
+            <!--end highlights-->
+            <!-- Datepicker -->
+            <section id="calendar">
+                <div class="page-header">
+                    <h1>Datepicker</h1>
+                </div>
+                <div id="datepicker"></div>
+<pre class="prettyprint linenums">
+// Datepicker
+$('#datepicker').datepicker({
+    inline: true
+});
+</pre>
+            </section>
+            <!--end datepicker-->
+            <!-- Slider -->
+            <section id="slider">
+                <div class="page-header">
+                    <h1>Slider</h1>
+                </div>
+                <h2>Horizontal Slider</h2>
+                <div id="h-slider"></div>
+<pre class="prettyprint linenums">
+// Horizontal slider
+$('#h-slider').slider({
+    range: true,
+    values: [17, 67]
+});
+</pre>
+                 <!-- Vertical Slider -->
+                <h2>Vertical Slider</h2>
+                <div class="row-fluid">
+                    <div class="span6">
+                        <p class="ui-state-default ui-corner-all ui-helper-clearfix" style="padding:4px;">
+                        <span class="ui-icon ui-icon-volume-on" style="float:left; margin:-2px 5px 0 0;"></span>
+                        Master volume
+                        </p>
+                        <p>
+                          <label for="amount">Volume:</label>
+                          <input type="text" id="amount" />
+                        </p>
+                    </div>
+                    <div class="span6">
+                        <div id="v-slider" style="height:200px;"></div>
+                    </div>
+                </div>
+<pre class="prettyprint linenums">
+// Vertical slider
+$("#v-slider").slider({
+    orientation: "vertical",
+    range: "min",
+    min: 0,
+    max: 100,
+    value: 60,
+    slide: function (event, ui) {
+        $("#amount").val(ui.value);
+    }
+});
+$("#amount").val($("#v-slider").slider("value"));
+</pre>
+            </section>
+            <!--end slider-->
+            <!-- Autocomplete -->
+            <section id="autocomplete">
+                <div class="page-header">
+                    <h1>Autocomplete</h1>
+                </div>
+                <div class="ui-widget">
+                    <label for="tags">Tags: </label>
+                    <input id="tags" />
+                </div>
+<pre class="prettyprint linenums">
+// Autocomplete
+var availableTags = ["ActionScript", "AppleScript", "Asp", "BASIC", "C", "C++", "Clojure", "COBOL", "ColdFusion", "Erlang", "Fortran", "Groovy", "Haskell", "Java", "JavaScript", "Lisp", "Perl", "PHP", "Python", "Ruby", "Scala", "Scheme"];
+
+$("#tags").autocomplete({
+    source: availableTags
+});
+</pre>
+            </section>
+            <!--end Autocomplete-->
+            <!-- Menu -->
+            <section id="block-menu">
+                <div class="page-header">
+                    <h1>Menu</h1>
+                </div>
+                <div class="clearfix">
+                    <ul id="menu">
+                      <li><a href="#">Aberdeen</a></li>
+                      <li><a href="#">Ada</a></li>
+                      <li><a href="#">Adamsville</a></li>
+                      <li><a href="#">Addyston</a></li>
+                      <li>
+                          <a href="#">Delphi</a>
+                          <ul>
+                              <li><a href="#">Ada</a></li>
+                              <li><a href="#">Saarland</a></li>
+                              <li><a href="#">Salzburg</a></li>
+                          </ul>
+                      </li>
+                      <li><a href="#">Saarland</a></li>
+                      <li>
+                          <a href="#">Salzburg</a>
+                          <ul>
+                              <li>
+                                  <a href="#">Delphi</a>
+                                  <ul>
+                                      <li><a href="#">Ada</a></li>
+                                      <li><a href="#">Saarland</a></li>
+                                      <li><a href="#">Salzburg</a></li>
+                                  </ul>
+                              </li>
+                              <li>
+                                  <a href="?Delphi">Delphi</a>
+                                  <ul>
+                                      <li><a href="#">Ada</a></li>
+                                      <li><a href="#">Saarland</a></li>
+                                      <li><a href="#">Salzburg</a></li>
+                                  </ul>
+                              </li>
+                              <li><a href="#">Perch</a></li>
+                          </ul>
+                      </li>
+                    </ul>
+                </div>
+<pre class="prettyprint linenums">
+//####### Menu
+$("#menu").menu();
+</pre>
+            </section>
+            <!--end Menu-->
+            <!-- Spinner -->
+            <section id="block-spinner">
+                <div class="page-header">
+                    <h1>Spinner</h1>
+                </div>
+                <h2>Spinner</h2>
+                <p>
+                  <label for="spinner">Select a value:</label>
+                  <input id="spinner" name="value" />
+                </p>
+
+                <p>
+                  <button id="disable">Toggle disable/enable</button>
+                  <button id="destroy">Toggle widget</button>
+                </p>
+
+                <p>
+                  <button id="getvalue">Get value</button>
+                  <button id="setvalue">Set value to 5</button>
+                </p>
+<pre class="prettyprint linenums">
+//####### Spinner
+
+var spinner = $( "#spinner" ).spinner();
+
+$( "#disable" ).click(function() {
+    if ( spinner.spinner( "option", "disabled" ) ) {
+        spinner.spinner( "enable" );
+    } else {
+        spinner.spinner( "disable" );
+    }
+});
+$( "#destroy" ).click(function() {
+    if ( spinner.data( "ui-spinner" ) ) {
+        spinner.spinner( "destroy" );
+    } else {
+        spinner.spinner();
+    }
+});
+$( "#getvalue" ).click(function() {
+    alert( spinner.spinner( "value" ) );
+});
+$( "#setvalue" ).click(function() {
+    spinner.spinner( "value", 5 );
+});
+
+</pre>
+            </section>
+            <!--end Spinner-->
+            <!-- Icons -->
+            <section id="block-icons">
+                <div class="page-header">
+                    <h1>Icons</h1>
+                </div>
+                <div class="clearfix">
+                    <ul id="icons" class="ui-widget ui-helper-clearfix">
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-carat-1-n"><span class="ui-icon ui-icon-carat-1-n"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-carat-1-ne"><span class="ui-icon ui-icon-carat-1-ne"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-carat-1-e"><span class="ui-icon ui-icon-carat-1-e"></span></li>
+
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-carat-1-se"><span class="ui-icon ui-icon-carat-1-se"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-carat-1-s"><span class="ui-icon ui-icon-carat-1-s"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-carat-1-sw"><span class="ui-icon ui-icon-carat-1-sw"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-carat-1-w"><span class="ui-icon ui-icon-carat-1-w"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-carat-1-nw"><span class="ui-icon ui-icon-carat-1-nw"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-carat-2-n-s"><span class="ui-icon ui-icon-carat-2-n-s"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-carat-2-e-w"><span class="ui-icon ui-icon-carat-2-e-w"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-triangle-1-n"><span class="ui-icon ui-icon-triangle-1-n"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-triangle-1-ne"><span class="ui-icon ui-icon-triangle-1-ne"></span></li>
+
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-triangle-1-e"><span class="ui-icon ui-icon-triangle-1-e"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-triangle-1-se"><span class="ui-icon ui-icon-triangle-1-se"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-triangle-1-s"><span class="ui-icon ui-icon-triangle-1-s"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-triangle-1-sw"><span class="ui-icon ui-icon-triangle-1-sw"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-triangle-1-w"><span class="ui-icon ui-icon-triangle-1-w"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-triangle-1-nw"><span class="ui-icon ui-icon-triangle-1-nw"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-triangle-2-n-s"><span class="ui-icon ui-icon-triangle-2-n-s"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-triangle-2-e-w"><span class="ui-icon ui-icon-triangle-2-e-w"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-1-n"><span class="ui-icon ui-icon-arrow-1-n"></span></li>
+
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-1-ne"><span class="ui-icon ui-icon-arrow-1-ne"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-1-e"><span class="ui-icon ui-icon-arrow-1-e"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-1-se"><span class="ui-icon ui-icon-arrow-1-se"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-1-s"><span class="ui-icon ui-icon-arrow-1-s"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-1-sw"><span class="ui-icon ui-icon-arrow-1-sw"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-1-w"><span class="ui-icon ui-icon-arrow-1-w"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-1-nw"><span class="ui-icon ui-icon-arrow-1-nw"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-2-n-s"><span class="ui-icon ui-icon-arrow-2-n-s"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-2-ne-sw"><span class="ui-icon ui-icon-arrow-2-ne-sw"></span></li>
+
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-2-e-w"><span class="ui-icon ui-icon-arrow-2-e-w"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-2-se-nw"><span class="ui-icon ui-icon-arrow-2-se-nw"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-arrowstop-1-n"><span class="ui-icon ui-icon-arrowstop-1-n"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-arrowstop-1-e"><span class="ui-icon ui-icon-arrowstop-1-e"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-arrowstop-1-s"><span class="ui-icon ui-icon-arrowstop-1-s"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-arrowstop-1-w"><span class="ui-icon ui-icon-arrowstop-1-w"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-1-n"><span class="ui-icon ui-icon-arrowthick-1-n"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-1-ne"><span class="ui-icon ui-icon-arrowthick-1-ne"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-1-e"><span class="ui-icon ui-icon-arrowthick-1-e"></span></li>
+
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-1-se"><span class="ui-icon ui-icon-arrowthick-1-se"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-1-s"><span class="ui-icon ui-icon-arrowthick-1-s"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-1-sw"><span class="ui-icon ui-icon-arrowthick-1-sw"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-1-w"><span class="ui-icon ui-icon-arrowthick-1-w"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-1-nw"><span class="ui-icon ui-icon-arrowthick-1-nw"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-2-n-s"><span class="ui-icon ui-icon-arrowthick-2-n-s"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-2-ne-sw"><span class="ui-icon ui-icon-arrowthick-2-ne-sw"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-2-e-w"><span class="ui-icon ui-icon-arrowthick-2-e-w"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-2-se-nw"><span class="ui-icon ui-icon-arrowthick-2-se-nw"></span></li>
+
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthickstop-1-n"><span class="ui-icon ui-icon-arrowthickstop-1-n"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthickstop-1-e"><span class="ui-icon ui-icon-arrowthickstop-1-e"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthickstop-1-s"><span class="ui-icon ui-icon-arrowthickstop-1-s"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthickstop-1-w"><span class="ui-icon ui-icon-arrowthickstop-1-w"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-arrowreturnthick-1-w"><span class="ui-icon ui-icon-arrowreturnthick-1-w"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-arrowreturnthick-1-n"><span class="ui-icon ui-icon-arrowreturnthick-1-n"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-arrowreturnthick-1-e"><span class="ui-icon ui-icon-arrowreturnthick-1-e"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-arrowreturnthick-1-s"><span class="ui-icon ui-icon-arrowreturnthick-1-s"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-arrowreturn-1-w"><span class="ui-icon ui-icon-arrowreturn-1-w"></span></li>
+
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-arrowreturn-1-n"><span class="ui-icon ui-icon-arrowreturn-1-n"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-arrowreturn-1-e"><span class="ui-icon ui-icon-arrowreturn-1-e"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-arrowreturn-1-s"><span class="ui-icon ui-icon-arrowreturn-1-s"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-arrowrefresh-1-w"><span class="ui-icon ui-icon-arrowrefresh-1-w"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-arrowrefresh-1-n"><span class="ui-icon ui-icon-arrowrefresh-1-n"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-arrowrefresh-1-e"><span class="ui-icon ui-icon-arrowrefresh-1-e"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-arrowrefresh-1-s"><span class="ui-icon ui-icon-arrowrefresh-1-s"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-4"><span class="ui-icon ui-icon-arrow-4"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-4-diag"><span class="ui-icon ui-icon-arrow-4-diag"></span></li>
+
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-extlink"><span class="ui-icon ui-icon-extlink"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-newwin"><span class="ui-icon ui-icon-newwin"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-refresh"><span class="ui-icon ui-icon-refresh"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-shuffle"><span class="ui-icon ui-icon-shuffle"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-transfer-e-w"><span class="ui-icon ui-icon-transfer-e-w"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-transferthick-e-w"><span class="ui-icon ui-icon-transferthick-e-w"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-folder-collapsed"><span class="ui-icon ui-icon-folder-collapsed"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-folder-open"><span class="ui-icon ui-icon-folder-open"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-document"><span class="ui-icon ui-icon-document"></span></li>
+
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-document-b"><span class="ui-icon ui-icon-document-b"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-note"><span class="ui-icon ui-icon-note"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-mail-closed"><span class="ui-icon ui-icon-mail-closed"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-mail-open"><span class="ui-icon ui-icon-mail-open"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-suitcase"><span class="ui-icon ui-icon-suitcase"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-comment"><span class="ui-icon ui-icon-comment"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-person"><span class="ui-icon ui-icon-person"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-print"><span class="ui-icon ui-icon-print"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-trash"><span class="ui-icon ui-icon-trash"></span></li>
+
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-locked"><span class="ui-icon ui-icon-locked"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-unlocked"><span class="ui-icon ui-icon-unlocked"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-bookmark"><span class="ui-icon ui-icon-bookmark"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-tag"><span class="ui-icon ui-icon-tag"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-home"><span class="ui-icon ui-icon-home"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-flag"><span class="ui-icon ui-icon-flag"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-calculator"><span class="ui-icon ui-icon-calculator"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-cart"><span class="ui-icon ui-icon-cart"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-pencil"><span class="ui-icon ui-icon-pencil"></span></li>
+
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-clock"><span class="ui-icon ui-icon-clock"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-disk"><span class="ui-icon ui-icon-disk"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-calendar"><span class="ui-icon ui-icon-calendar"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-zoomin"><span class="ui-icon ui-icon-zoomin"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-zoomout"><span class="ui-icon ui-icon-zoomout"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-search"><span class="ui-icon ui-icon-search"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-wrench"><span class="ui-icon ui-icon-wrench"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-gear"><span class="ui-icon ui-icon-gear"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-heart"><span class="ui-icon ui-icon-heart"></span></li>
+
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-star"><span class="ui-icon ui-icon-star"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-link"><span class="ui-icon ui-icon-link"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-cancel"><span class="ui-icon ui-icon-cancel"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-plus"><span class="ui-icon ui-icon-plus"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-plusthick"><span class="ui-icon ui-icon-plusthick"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-minus"><span class="ui-icon ui-icon-minus"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-minusthick"><span class="ui-icon ui-icon-minusthick"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-close"><span class="ui-icon ui-icon-close"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-closethick"><span class="ui-icon ui-icon-closethick"></span></li>
+
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-key"><span class="ui-icon ui-icon-key"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-lightbulb"><span class="ui-icon ui-icon-lightbulb"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-scissors"><span class="ui-icon ui-icon-scissors"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-clipboard"><span class="ui-icon ui-icon-clipboard"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-copy"><span class="ui-icon ui-icon-copy"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-contact"><span class="ui-icon ui-icon-contact"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-image"><span class="ui-icon ui-icon-image"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-video"><span class="ui-icon ui-icon-video"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-script"><span class="ui-icon ui-icon-script"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-alert"><span class="ui-icon ui-icon-alert"></span></li>
+
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-info"><span class="ui-icon ui-icon-info"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-notice"><span class="ui-icon ui-icon-notice"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-help"><span class="ui-icon ui-icon-help"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-check"><span class="ui-icon ui-icon-check"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-bullet"><span class="ui-icon ui-icon-bullet"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-radio-off"><span class="ui-icon ui-icon-radio-off"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-radio-on"><span class="ui-icon ui-icon-radio-on"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-pin-w"><span class="ui-icon ui-icon-pin-w"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-pin-s"><span class="ui-icon ui-icon-pin-s"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-play"><span class="ui-icon ui-icon-play"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-pause"><span class="ui-icon ui-icon-pause"></span></li>
+
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-seek-next"><span class="ui-icon ui-icon-seek-next"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-seek-prev"><span class="ui-icon ui-icon-seek-prev"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-seek-end"><span class="ui-icon ui-icon-seek-end"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-seek-first"><span class="ui-icon ui-icon-seek-first"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-stop"><span class="ui-icon ui-icon-stop"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-eject"><span class="ui-icon ui-icon-eject"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-volume-off"><span class="ui-icon ui-icon-volume-off"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-volume-on"><span class="ui-icon ui-icon-volume-on"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-power"><span class="ui-icon ui-icon-power"></span></li>
+
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-signal-diag"><span class="ui-icon ui-icon-signal-diag"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-signal"><span class="ui-icon ui-icon-signal"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-battery-0"><span class="ui-icon ui-icon-battery-0"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-battery-1"><span class="ui-icon ui-icon-battery-1"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-battery-2"><span class="ui-icon ui-icon-battery-2"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-battery-3"><span class="ui-icon ui-icon-battery-3"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-circle-plus"><span class="ui-icon ui-icon-circle-plus"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-circle-minus"><span class="ui-icon ui-icon-circle-minus"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-circle-close"><span class="ui-icon ui-icon-circle-close"></span></li>
+
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-circle-triangle-e"><span class="ui-icon ui-icon-circle-triangle-e"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-circle-triangle-s"><span class="ui-icon ui-icon-circle-triangle-s"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-circle-triangle-w"><span class="ui-icon ui-icon-circle-triangle-w"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-circle-triangle-n"><span class="ui-icon ui-icon-circle-triangle-n"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-circle-arrow-e"><span class="ui-icon ui-icon-circle-arrow-e"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-circle-arrow-s"><span class="ui-icon ui-icon-circle-arrow-s"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-circle-arrow-w"><span class="ui-icon ui-icon-circle-arrow-w"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-circle-arrow-n"><span class="ui-icon ui-icon-circle-arrow-n"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-circle-zoomin"><span class="ui-icon ui-icon-circle-zoomin"></span></li>
+
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-circle-zoomout"><span class="ui-icon ui-icon-circle-zoomout"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-circle-check"><span class="ui-icon ui-icon-circle-check"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-circlesmall-plus"><span class="ui-icon ui-icon-circlesmall-plus"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-circlesmall-minus"><span class="ui-icon ui-icon-circlesmall-minus"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-circlesmall-close"><span class="ui-icon ui-icon-circlesmall-close"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-squaresmall-plus"><span class="ui-icon ui-icon-squaresmall-plus"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-squaresmall-minus"><span class="ui-icon ui-icon-squaresmall-minus"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-squaresmall-close"><span class="ui-icon ui-icon-squaresmall-close"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-grip-dotted-vertical"><span class="ui-icon ui-icon-grip-dotted-vertical"></span></li>
+
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-grip-dotted-horizontal"><span class="ui-icon ui-icon-grip-dotted-horizontal"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-grip-solid-vertical"><span class="ui-icon ui-icon-grip-solid-vertical"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-grip-solid-horizontal"><span class="ui-icon ui-icon-grip-solid-horizontal"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-gripsmall-diagonal-se"><span class="ui-icon ui-icon-gripsmall-diagonal-se"></span></li>
+                        <li class="ui-state-default ui-corner-all" title=".ui-icon-grip-diagonal-se"><span class="ui-icon ui-icon-grip-diagonal-se"></span></li>
+                    </ul>
+                </div>
+            </section>
+            <!--end Icons-->
+            <!-- Datepicker -->
+            <section id="block-tooltip">
+                <div class="page-header">
+                    <h1>Tooltip</h1>
+                </div>
+                <div id="tooltip">
+                  <p><a href="#" title="That's what this widget is">Tooltips</a> can be attached to any element. When you hover
+                      the element with your mouse, the title attribute is displayed in a little box next to the element, just like a native tooltip.</p>
+                  <p>But as it's not a native tooltip, it can be styled. Any themes built with
+                      <a href="http://themeroller.com" title="ThemeRoller: jQuery UI's theme builder application">ThemeRoller</a>
+                      will also style tooltips accordingly.</p>
+                  <p>Tooltips are also useful for form elements, to show some additional information in the context of each field.</p>
+                  <p><label for="age">Your age:</label><input id="age" title="We ask for your age only for statistical purposes." /></p>
+                  <p>Hover the field to see the tooltip.</p>
+                </div>
+<pre class="prettyprint linenums">
+//####### Tooltip
+$( "#tooltip" ).tooltip();
+</pre>
+            </section>
+            <!--end datepicker-->
+        </div>
+    </div>
+</div>
+
+<!-- Footer
+================================================== -->
+<footer class="footer">
+    <div class="container">
+        <p>
+            jQuery UI Bootstrap &copy; Addy Osmani 2012 - 2013.
+        </p>
+        <p>
+            Twitter Bootstrap &copy; Twitter 2012 - 2013
+        </p>
+        <ul class="footer-links">
+            <li><a href="http://addyosmani.com/blog/">Blog</a></li>
+            <li class="muted">&middot;</li>
+            <li><a href="https://github.com/addyosmani/jquery-ui-bootstrap/issues?state=open">Issues</a></li>
+        </ul>
+    </div>
+</footer>
+<!-- Placed at the end of the document so the pages load faster -->
+<script src="assets/js/jquery-1.9.0.min.js" type="text/javascript"></script>
+<script src="assets/js/bootstrap.min.js" type="text/javascript"></script>
+<script src="assets/js/jquery-ui-1.10.0.custom.min.js" type="text/javascript"></script>
+<script src="assets/js/google-code-prettify/prettify.js" type="text/javascript"></script>
+<script src="assets/js/docs.js" type="text/javascript"></script>
+<script src="assets/js/demo.js" type="text/javascript"></script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/js/demo.js b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/js/demo.js
new file mode 100644
index 0000000..f31ed09
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/js/demo.js
@@ -0,0 +1,262 @@
+$(function () {
+
+    // Accordion
+    $("#accordion").accordion({
+        header: "h3"
+    });
+
+    // Tabs
+    $('#tabs2, #tabs, #tabs3').tabs();
+
+    // Buttons
+    $('button').button();
+
+    // Anchors, Submit
+    $('.button,#sampleButton').button();
+
+    // Buttonset
+    $('#radioset').buttonset();
+    $("#format").buttonset();
+
+
+    // Dialog
+    $('#dialog').dialog({
+        autoOpen: false,
+        width: 600,
+        buttons: {
+            "Ok": function () {
+                $(this).dialog("close");
+            },
+            "Cancel": function () {
+                $(this).dialog("close");
+            }
+        }
+    });
+
+    // Dialog Link
+    $('#dialog_link').click(function () {
+        $('#dialog').dialog('open');
+        return false;
+    });
+
+    // Modal Link
+    $('#modal_link').click(function () {
+        $('#dialog-message').dialog('open');
+        return false;
+    });
+
+    // Datepicker
+    $('#datepicker').datepicker({
+        inline: true
+    });
+
+    // Slider
+    $('#slider').slider({
+        range: true,
+        values: [17, 67]
+    });
+
+    // Progressbar
+    $("#progressbar").progressbar({
+        value: 20
+    });
+
+    //hover states on the static widgets
+    $('#dialog_link, #modal_link, ul#icons li').hover(
+
+    function () {
+        $(this).addClass('ui-state-hover');
+    }, function () {
+        $(this).removeClass('ui-state-hover');
+    });
+
+    // Autocomplete
+    var availableTags = ["ActionScript", "AppleScript", "Asp", "BASIC", "C", "C++", "Clojure", "COBOL", "ColdFusion", "Erlang", "Fortran", "Groovy", "Haskell", "Java", "JavaScript", "Lisp", "Perl", "PHP", "Python", "Ruby", "Scala", "Scheme"];
+
+    $("#tags").autocomplete({
+        source: availableTags
+    });
+
+
+    // Dialogs
+    $("#dialog-message").dialog({
+        autoOpen: false,
+        modal: true,
+        buttons: {
+            Ok: function () {
+                $(this).dialog("close");
+            }
+        }
+    });
+
+
+    // Remove focus from buttons
+    $('.ui-dialog :button').blur();
+
+
+
+    // Vertical slider
+    $("#slider-vertical").slider({
+        orientation: "vertical",
+        range: "min",
+        min: 0,
+        max: 100,
+        value: 60,
+        slide: function (event, ui) {
+            $("#amount").val(ui.value);
+        }
+    });
+    $("#amount").val($("#slider-vertical").slider("value"));
+
+    //Menu
+    $("#menu").menu();
+
+    //Spinner
+    var spinner = $( "#spinner" ).spinner();
+
+    $( "#disable" ).click(function() {
+        if ( spinner.spinner( "option", "disabled" ) ) {
+            spinner.spinner( "enable" );
+        } else {
+            spinner.spinner( "disable" );
+        }
+    });
+    $( "#destroy" ).click(function() {
+        if ( spinner.data( "ui-spinner" ) ) {
+            spinner.spinner( "destroy" );
+        } else {
+            spinner.spinner();
+        }
+    });
+    $( "#getvalue" ).click(function() {
+        alert( spinner.spinner( "value" ) );
+    });
+    $( "#setvalue" ).click(function() {
+        spinner.spinner( "value", 5 );
+    });
+
+    $( "button" ).button();
+
+    //Tooltip
+
+    $( "#tooltip" ).tooltip();
+
+    // Split button
+    $("#rerun").button().click(function () {
+        alert("Running the last action");
+    }).next().button({
+        text: false,
+        icons: {
+            primary: "ui-icon-triangle-1-s"
+        }
+    }).click(function () {
+        alert("Could display a menu to select an action");
+    }).parent().buttonset();
+
+
+    // Filament datepicker
+    $('#rangeA').daterangepicker();
+    $('#rangeBa, #rangeBb').daterangepicker();
+
+
+    // Dynamic tabs
+    var tabTitle = $( "#tab_title" ),
+            tabContent = $( "#tab_content" ),
+            tabTemplate = "<li><a href='#{href}'>#{label}</a> <span class='ui-icon ui-icon-close'>Remove Tab</span></li>",
+            tabCounter = 2;
+ 
+    var tabs = $( "#tabs2" ).tabs();
+
+    // modal dialog init: custom buttons and a "close" callback reseting the form inside
+    var dialog = $( "#dialog2" ).dialog({
+        autoOpen: false,
+        modal: true,
+        buttons: {
+            Add: function() {
+                addTab();
+                $( this ).dialog( "close" );
+            },
+            Cancel: function() {
+                $( this ).dialog( "close" );
+            }
+        },
+        close: function() {
+            form[ 0 ].reset();
+        }
+    });
+
+    // addTab form: calls addTab function on submit and closes the dialog
+    var form = dialog.find( "form" ).submit(function( event ) {
+        addTab();
+        dialog.dialog( "close" );
+        event.preventDefault();
+    });
+
+    // actual addTab function: adds new tab using the input from the form above
+    function addTab() {
+        var label = tabTitle.val() || "Tab " + tabCounter,
+            id = "tabs-" + tabCounter,
+            li = $( tabTemplate.replace( /#\{href\}/g, "#" + id ).replace( /#\{label\}/g, label ) ),
+            tabContentHtml = tabContent.val() || "Tab " + tabCounter + " content.";
+
+        tabs.find( ".ui-tabs-nav" ).append( li );
+        tabs.append( "<div id='" + id + "'><p>" + tabContentHtml + "</p></div>" );
+        tabs.tabs( "refresh" );
+        tabCounter++;
+    }
+
+    // addTab button: just opens the dialog
+    $( "#add_tab" )
+        .button()
+        .click(function() {
+            dialog.dialog( "open" );
+        });
+
+    // close icon: removing the tab on click
+    $( "#tabs2" ).on( "click",'span.ui-icon-close', function() {
+        
+        var panelId = $( this ).closest( "li" ).remove().attr( "aria-controls" );
+        $( "#" + panelId ).remove();
+        tabs.tabs( "refresh" );
+    });
+
+    //Combination examples (tabs) and open dialog
+    $('#sampleButton').on('click', function(event){
+        event.preventDefault();
+        $('#dialog').dialog({
+            autoOpen: true,
+            modal: true,
+            width: 600,
+            buttons: {
+                "Save": function () {
+                    $(this).dialog("close");
+                },
+                "Cancel": function () {
+                    $(this).dialog("close");
+                }
+            }
+        });
+    });
+    // File input (using http://filamentgroup.com/lab/jquery_custom_file_input_book_designing_with_progressive_enhancement/)
+    $('#file').customFileInput({
+        button_position : 'right'
+    });
+
+
+    //Wijmo
+    $("#menu1").wijmenu({ trigger: ".wijmo-wijmenu-item", triggerEvent: "click" });
+    //$(".wijmo-wijmenu-text").parent().bind("click", function () {
+    //    $("#menu1").wijmenu("hideAllMenus");
+    //});
+    //$(".wijmo-wijmenu-link").hover(function () {
+    //    $(this).addClass("ui-state-hover");
+    //}, function () {
+    //    $(this).removeClass("ui-state-hover");
+    //});
+
+    //Toolbar
+    $("#play, #shuffle").button();
+    $("#repeat").buttonset();
+
+
+});
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/js/jquery-1.10.0.js b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/js/jquery-1.10.0.js
new file mode 100644
index 0000000..f38148c
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/js/jquery-1.10.0.js
@@ -0,0 +1,9800 @@
+/*!
+ * jQuery JavaScript Library v1.10.0
+ * http://jquery.com/
+ *
+ * Includes Sizzle.js
+ * http://sizzlejs.com/
+ *
+ * Copyright 2005, 2013 jQuery Foundation, Inc. and other contributors
+ * Released under the MIT license
+ * http://jquery.org/license
+ *
+ * Date: 2013-05-24T18:39Z
+ */
+(function( window, undefined ) {
+
+// Can't do this because several apps including ASP.NET trace
+// the stack via arguments.caller.callee and Firefox dies if
+// you try to trace through "use strict" call chains. (#13335)
+// Support: Firefox 18+
+//"use strict";
+var
+	// The deferred used on DOM ready
+	readyList,
+
+	// A central reference to the root jQuery(document)
+	rootjQuery,
+
+	// Support: IE<10
+	// For `typeof xmlNode.method` instead of `xmlNode.method !== undefined`
+	core_strundefined = typeof undefined,
+
+	// Use the correct document accordingly with window argument (sandbox)
+	location = window.location,
+	document = window.document,
+	docElem = document.documentElement,
+
+	// Map over jQuery in case of overwrite
+	_jQuery = window.jQuery,
+
+	// Map over the $ in case of overwrite
+	_$ = window.$,
+
+	// [[Class]] -> type pairs
+	class2type = {},
+
+	// List of deleted data cache ids, so we can reuse them
+	core_deletedIds = [],
+
+	core_version = "1.10.0",
+
+	// Save a reference to some core methods
+	core_concat = core_deletedIds.concat,
+	core_push = core_deletedIds.push,
+	core_slice = core_deletedIds.slice,
+	core_indexOf = core_deletedIds.indexOf,
+	core_toString = class2type.toString,
+	core_hasOwn = class2type.hasOwnProperty,
+	core_trim = core_version.trim,
+
+	// Define a local copy of jQuery
+	jQuery = function( selector, context ) {
+		// The jQuery object is actually just the init constructor 'enhanced'
+		return new jQuery.fn.init( selector, context, rootjQuery );
+	},
+
+	// Used for matching numbers
+	core_pnum = /[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,
+
+	// Used for splitting on whitespace
+	core_rnotwhite = /\S+/g,
+
+	// Make sure we trim BOM and NBSP (here's looking at you, Safari 5.0 and IE)
+	rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,
+
+	// A simple way to check for HTML strings
+	// Prioritize #id over <tag> to avoid XSS via location.hash (#9521)
+	// Strict HTML recognition (#11290: must start with <)
+	rquickExpr = /^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,
+
+	// Match a standalone tag
+	rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>|)$/,
+
+	// JSON RegExp
+	rvalidchars = /^[\],:{}\s]*$/,
+	rvalidbraces = /(?:^|:|,)(?:\s*\[)+/g,
+	rvalidescape = /\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,
+	rvalidtokens = /"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g,
+
+	// Matches dashed string for camelizing
+	rmsPrefix = /^-ms-/,
+	rdashAlpha = /-([\da-z])/gi,
+
+	// Used by jQuery.camelCase as callback to replace()
+	fcamelCase = function( all, letter ) {
+		return letter.toUpperCase();
+	},
+
+	// The ready event handler
+	completed = function( event ) {
+
+		// readyState === "complete" is good enough for us to call the dom ready in oldIE
+		if ( document.addEventListener || event.type === "load" || document.readyState === "complete" ) {
+			detach();
+			jQuery.ready();
+		}
+	},
+	// Clean-up method for dom ready events
+	detach = function() {
+		if ( document.addEventListener ) {
+			document.removeEventListener( "DOMContentLoaded", completed, false );
+			window.removeEventListener( "load", completed, false );
+
+		} else {
+			document.detachEvent( "onreadystatechange", completed );
+			window.detachEvent( "onload", completed );
+		}
+	};
+
+jQuery.fn = jQuery.prototype = {
+	// The current version of jQuery being used
+	jquery: core_version,
+
+	constructor: jQuery,
+	init: function( selector, context, rootjQuery ) {
+		var match, elem;
+
+		// HANDLE: $(""), $(null), $(undefined), $(false)
+		if ( !selector ) {
+			return this;
+		}
+
+		// Handle HTML strings
+		if ( typeof selector === "string" ) {
+			if ( selector.charAt(0) === "<" && selector.charAt( selector.length - 1 ) === ">" && selector.length >= 3 ) {
+				// Assume that strings that start and end with <> are HTML and skip the regex check
+				match = [ null, selector, null ];
+
+			} else {
+				match = rquickExpr.exec( selector );
+			}
+
+			// Match html or make sure no context is specified for #id
+			if ( match && (match[1] || !context) ) {
+
+				// HANDLE: $(html) -> $(array)
+				if ( match[1] ) {
+					context = context instanceof jQuery ? context[0] : context;
+
+					// scripts is true for back-compat
+					jQuery.merge( this, jQuery.parseHTML(
+						match[1],
+						context && context.nodeType ? context.ownerDocument || context : document,
+						true
+					) );
+
+					// HANDLE: $(html, props)
+					if ( rsingleTag.test( match[1] ) && jQuery.isPlainObject( context ) ) {
+						for ( match in context ) {
+							// Properties of context are called as methods if possible
+							if ( jQuery.isFunction( this[ match ] ) ) {
+								this[ match ]( context[ match ] );
+
+							// ...and otherwise set as attributes
+							} else {
+								this.attr( match, context[ match ] );
+							}
+						}
+					}
+
+					return this;
+
+				// HANDLE: $(#id)
+				} else {
+					elem = document.getElementById( match[2] );
+
+					// Check parentNode to catch when Blackberry 4.6 returns
+					// nodes that are no longer in the document #6963
+					if ( elem && elem.parentNode ) {
+						// Handle the case where IE and Opera return items
+						// by name instead of ID
+						if ( elem.id !== match[2] ) {
+							return rootjQuery.find( selector );
+						}
+
+						// Otherwise, we inject the element directly into the jQuery object
+						this.length = 1;
+						this[0] = elem;
+					}
+
+					this.context = document;
+					this.selector = selector;
+					return this;
+				}
+
+			// HANDLE: $(expr, $(...))
+			} else if ( !context || context.jquery ) {
+				return ( context || rootjQuery ).find( selector );
+
+			// HANDLE: $(expr, context)
+			// (which is just equivalent to: $(context).find(expr)
+			} else {
+				return this.constructor( context ).find( selector );
+			}
+
+		// HANDLE: $(DOMElement)
+		} else if ( selector.nodeType ) {
+			this.context = this[0] = selector;
+			this.length = 1;
+			return this;
+
+		// HANDLE: $(function)
+		// Shortcut for document ready
+		} else if ( jQuery.isFunction( selector ) ) {
+			return rootjQuery.ready( selector );
+		}
+
+		if ( selector.selector !== undefined ) {
+			this.selector = selector.selector;
+			this.context = selector.context;
+		}
+
+		return jQuery.makeArray( selector, this );
+	},
+
+	// Start with an empty selector
+	selector: "",
+
+	// The default length of a jQuery object is 0
+	length: 0,
+
+	toArray: function() {
+		return core_slice.call( this );
+	},
+
+	// Get the Nth element in the matched element set OR
+	// Get the whole matched element set as a clean array
+	get: function( num ) {
+		return num == null ?
+
+			// Return a 'clean' array
+			this.toArray() :
+
+			// Return just the object
+			( num < 0 ? this[ this.length + num ] : this[ num ] );
+	},
+
+	// Take an array of elements and push it onto the stack
+	// (returning the new matched element set)
+	pushStack: function( elems ) {
+
+		// Build a new jQuery matched element set
+		var ret = jQuery.merge( this.constructor(), elems );
+
+		// Add the old object onto the stack (as a reference)
+		ret.prevObject = this;
+		ret.context = this.context;
+
+		// Return the newly-formed element set
+		return ret;
+	},
+
+	// Execute a callback for every element in the matched set.
+	// (You can seed the arguments with an array of args, but this is
+	// only used internally.)
+	each: function( callback, args ) {
+		return jQuery.each( this, callback, args );
+	},
+
+	ready: function( fn ) {
+		// Add the callback
+		jQuery.ready.promise().done( fn );
+
+		return this;
+	},
+
+	slice: function() {
+		return this.pushStack( core_slice.apply( this, arguments ) );
+	},
+
+	first: function() {
+		return this.eq( 0 );
+	},
+
+	last: function() {
+		return this.eq( -1 );
+	},
+
+	eq: function( i ) {
+		var len = this.length,
+			j = +i + ( i < 0 ? len : 0 );
+		return this.pushStack( j >= 0 && j < len ? [ this[j] ] : [] );
+	},
+
+	map: function( callback ) {
+		return this.pushStack( jQuery.map(this, function( elem, i ) {
+			return callback.call( elem, i, elem );
+		}));
+	},
+
+	end: function() {
+		return this.prevObject || this.constructor(null);
+	},
+
+	// For internal use only.
+	// Behaves like an Array's method, not like a jQuery method.
+	push: core_push,
+	sort: [].sort,
+	splice: [].splice
+};
+
+// Give the init function the jQuery prototype for later instantiation
+jQuery.fn.init.prototype = jQuery.fn;
+
+jQuery.extend = jQuery.fn.extend = function() {
+	var src, copyIsArray, copy, name, options, clone,
+		target = arguments[0] || {},
+		i = 1,
+		length = arguments.length,
+		deep = false;
+
+	// Handle a deep copy situation
+	if ( typeof target === "boolean" ) {
+		deep = target;
+		target = arguments[1] || {};
+		// skip the boolean and the target
+		i = 2;
+	}
+
+	// Handle case when target is a string or something (possible in deep copy)
+	if ( typeof target !== "object" && !jQuery.isFunction(target) ) {
+		target = {};
+	}
+
+	// extend jQuery itself if only one argument is passed
+	if ( length === i ) {
+		target = this;
+		--i;
+	}
+
+	for ( ; i < length; i++ ) {
+		// Only deal with non-null/undefined values
+		if ( (options = arguments[ i ]) != null ) {
+			// Extend the base object
+			for ( name in options ) {
+				src = target[ name ];
+				copy = options[ name ];
+
+				// Prevent never-ending loop
+				if ( target === copy ) {
+					continue;
+				}
+
+				// Recurse if we're merging plain objects or arrays
+				if ( deep && copy && ( jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)) ) ) {
+					if ( copyIsArray ) {
+						copyIsArray = false;
+						clone = src && jQuery.isArray(src) ? src : [];
+
+					} else {
+						clone = src && jQuery.isPlainObject(src) ? src : {};
+					}
+
+					// Never move original objects, clone them
+					target[ name ] = jQuery.extend( deep, clone, copy );
+
+				// Don't bring in undefined values
+				} else if ( copy !== undefined ) {
+					target[ name ] = copy;
+				}
+			}
+		}
+	}
+
+	// Return the modified object
+	return target;
+};
+
+jQuery.extend({
+	// Unique for each copy of jQuery on the page
+	// Non-digits removed to match rinlinejQuery
+	expando: "jQuery" + ( core_version + Math.random() ).replace( /\D/g, "" ),
+
+	noConflict: function( deep ) {
+		if ( window.$ === jQuery ) {
+			window.$ = _$;
+		}
+
+		if ( deep && window.jQuery === jQuery ) {
+			window.jQuery = _jQuery;
+		}
+
+		return jQuery;
+	},
+
+	// Is the DOM ready to be used? Set to true once it occurs.
+	isReady: false,
+
+	// A counter to track how many items to wait for before
+	// the ready event fires. See #6781
+	readyWait: 1,
+
+	// Hold (or release) the ready event
+	holdReady: function( hold ) {
+		if ( hold ) {
+			jQuery.readyWait++;
+		} else {
+			jQuery.ready( true );
+		}
+	},
+
+	// Handle when the DOM is ready
+	ready: function( wait ) {
+
+		// Abort if there are pending holds or we're already ready
+		if ( wait === true ? --jQuery.readyWait : jQuery.isReady ) {
+			return;
+		}
+
+		// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
+		if ( !document.body ) {
+			return setTimeout( jQuery.ready );
+		}
+
+		// Remember that the DOM is ready
+		jQuery.isReady = true;
+
+		// If a normal DOM Ready event fired, decrement, and wait if need be
+		if ( wait !== true && --jQuery.readyWait > 0 ) {
+			return;
+		}
+
+		// If there are functions bound, to execute
+		readyList.resolveWith( document, [ jQuery ] );
+
+		// Trigger any bound ready events
+		if ( jQuery.fn.trigger ) {
+			jQuery( document ).trigger("ready").off("ready");
+		}
+	},
+
+	// See test/unit/core.js for details concerning isFunction.
+	// Since version 1.3, DOM methods and functions like alert
+	// aren't supported. They return false on IE (#2968).
+	isFunction: function( obj ) {
+		return jQuery.type(obj) === "function";
+	},
+
+	isArray: Array.isArray || function( obj ) {
+		return jQuery.type(obj) === "array";
+	},
+
+	isWindow: function( obj ) {
+		/* jshint eqeqeq: false */
+		return obj != null && obj == obj.window;
+	},
+
+	isNumeric: function( obj ) {
+		return !isNaN( parseFloat(obj) ) && isFinite( obj );
+	},
+
+	type: function( obj ) {
+		if ( obj == null ) {
+			return String( obj );
+		}
+		return typeof obj === "object" || typeof obj === "function" ?
+			class2type[ core_toString.call(obj) ] || "object" :
+			typeof obj;
+	},
+
+	isPlainObject: function( obj ) {
+		var key;
+
+		// Must be an Object.
+		// Because of IE, we also have to check the presence of the constructor property.
+		// Make sure that DOM nodes and window objects don't pass through, as well
+		if ( !obj || jQuery.type(obj) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) {
+			return false;
+		}
+
+		try {
+			// Not own constructor property must be Object
+			if ( obj.constructor &&
+				!core_hasOwn.call(obj, "constructor") &&
+				!core_hasOwn.call(obj.constructor.prototype, "isPrototypeOf") ) {
+				return false;
+			}
+		} catch ( e ) {
+			// IE8,9 Will throw exceptions on certain host objects #9897
+			return false;
+		}
+
+		// Support: IE<9
+		// Handle iteration over inherited properties before own properties.
+		if ( jQuery.support.ownLast ) {
+			for ( key in obj ) {
+				return core_hasOwn.call( obj, key );
+			}
+		}
+
+		// Own properties are enumerated firstly, so to speed up,
+		// if last one is own, then all properties are own.
+		for ( key in obj ) {}
+
+		return key === undefined || core_hasOwn.call( obj, key );
+	},
+
+	isEmptyObject: function( obj ) {
+		var name;
+		for ( name in obj ) {
+			return false;
+		}
+		return true;
+	},
+
+	error: function( msg ) {
+		throw new Error( msg );
+	},
+
+	// data: string of html
+	// context (optional): If specified, the fragment will be created in this context, defaults to document
+	// keepScripts (optional): If true, will include scripts passed in the html string
+	parseHTML: function( data, context, keepScripts ) {
+		if ( !data || typeof data !== "string" ) {
+			return null;
+		}
+		if ( typeof context === "boolean" ) {
+			keepScripts = context;
+			context = false;
+		}
+		context = context || document;
+
+		var parsed = rsingleTag.exec( data ),
+			scripts = !keepScripts && [];
+
+		// Single tag
+		if ( parsed ) {
+			return [ context.createElement( parsed[1] ) ];
+		}
+
+		parsed = jQuery.buildFragment( [ data ], context, scripts );
+		if ( scripts ) {
+			jQuery( scripts ).remove();
+		}
+		return jQuery.merge( [], parsed.childNodes );
+	},
+
+	parseJSON: function( data ) {
+		// Attempt to parse using the native JSON parser first
+		if ( window.JSON && window.JSON.parse ) {
+			return window.JSON.parse( data );
+		}
+
+		if ( data === null ) {
+			return data;
+		}
+
+		if ( typeof data === "string" ) {
+
+			// Make sure leading/trailing whitespace is removed (IE can't handle it)
+			data = jQuery.trim( data );
+
+			if ( data ) {
+				// Make sure the incoming data is actual JSON
+				// Logic borrowed from http://json.org/json2.js
+				if ( rvalidchars.test( data.replace( rvalidescape, "@" )
+					.replace( rvalidtokens, "]" )
+					.replace( rvalidbraces, "")) ) {
+
+					return ( new Function( "return " + data ) )();
+				}
+			}
+		}
+
+		jQuery.error( "Invalid JSON: " + data );
+	},
+
+	// Cross-browser xml parsing
+	parseXML: function( data ) {
+		var xml, tmp;
+		if ( !data || typeof data !== "string" ) {
+			return null;
+		}
+		try {
+			if ( window.DOMParser ) { // Standard
+				tmp = new DOMParser();
+				xml = tmp.parseFromString( data , "text/xml" );
+			} else { // IE
+				xml = new ActiveXObject( "Microsoft.XMLDOM" );
+				xml.async = "false";
+				xml.loadXML( data );
+			}
+		} catch( e ) {
+			xml = undefined;
+		}
+		if ( !xml || !xml.documentElement || xml.getElementsByTagName( "parsererror" ).length ) {
+			jQuery.error( "Invalid XML: " + data );
+		}
+		return xml;
+	},
+
+	noop: function() {},
+
+	// Evaluates a script in a global context
+	// Workarounds based on findings by Jim Driscoll
+	// http://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context
+	globalEval: function( data ) {
+		if ( data && jQuery.trim( data ) ) {
+			// We use execScript on Internet Explorer
+			// We use an anonymous function so that context is window
+			// rather than jQuery in Firefox
+			( window.execScript || function( data ) {
+				window[ "eval" ].call( window, data );
+			} )( data );
+		}
+	},
+
+	// Convert dashed to camelCase; used by the css and data modules
+	// Microsoft forgot to hump their vendor prefix (#9572)
+	camelCase: function( string ) {
+		return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase );
+	},
+
+	nodeName: function( elem, name ) {
+		return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase();
+	},
+
+	// args is for internal usage only
+	each: function( obj, callback, args ) {
+		var value,
+			i = 0,
+			length = obj.length,
+			isArray = isArraylike( obj );
+
+		if ( args ) {
+			if ( isArray ) {
+				for ( ; i < length; i++ ) {
+					value = callback.apply( obj[ i ], args );
+
+					if ( value === false ) {
+						break;
+					}
+				}
+			} else {
+				for ( i in obj ) {
+					value = callback.apply( obj[ i ], args );
+
+					if ( value === false ) {
+						break;
+					}
+				}
+			}
+
+		// A special, fast, case for the most common use of each
+		} else {
+			if ( isArray ) {
+				for ( ; i < length; i++ ) {
+					value = callback.call( obj[ i ], i, obj[ i ] );
+
+					if ( value === false ) {
+						break;
+					}
+				}
+			} else {
+				for ( i in obj ) {
+					value = callback.call( obj[ i ], i, obj[ i ] );
+
+					if ( value === false ) {
+						break;
+					}
+				}
+			}
+		}
+
+		return obj;
+	},
+
+	// Use native String.trim function wherever possible
+	trim: core_trim && !core_trim.call("\uFEFF\xA0") ?
+		function( text ) {
+			return text == null ?
+				"" :
+				core_trim.call( text );
+		} :
+
+		// Otherwise use our own trimming functionality
+		function( text ) {
+			return text == null ?
+				"" :
+				( text + "" ).replace( rtrim, "" );
+		},
+
+	// results is for internal usage only
+	makeArray: function( arr, results ) {
+		var ret = results || [];
+
+		if ( arr != null ) {
+			if ( isArraylike( Object(arr) ) ) {
+				jQuery.merge( ret,
+					typeof arr === "string" ?
+					[ arr ] : arr
+				);
+			} else {
+				core_push.call( ret, arr );
+			}
+		}
+
+		return ret;
+	},
+
+	inArray: function( elem, arr, i ) {
+		var len;
+
+		if ( arr ) {
+			if ( core_indexOf ) {
+				return core_indexOf.call( arr, elem, i );
+			}
+
+			len = arr.length;
+			i = i ? i < 0 ? Math.max( 0, len + i ) : i : 0;
+
+			for ( ; i < len; i++ ) {
+				// Skip accessing in sparse arrays
+				if ( i in arr && arr[ i ] === elem ) {
+					return i;
+				}
+			}
+		}
+
+		return -1;
+	},
+
+	merge: function( first, second ) {
+		var l = second.length,
+			i = first.length,
+			j = 0;
+
+		if ( typeof l === "number" ) {
+			for ( ; j < l; j++ ) {
+				first[ i++ ] = second[ j ];
+			}
+		} else {
+			while ( second[j] !== undefined ) {
+				first[ i++ ] = second[ j++ ];
+			}
+		}
+
+		first.length = i;
+
+		return first;
+	},
+
+	grep: function( elems, callback, inv ) {
+		var retVal,
+			ret = [],
+			i = 0,
+			length = elems.length;
+		inv = !!inv;
+
+		// Go through the array, only saving the items
+		// that pass the validator function
+		for ( ; i < length; i++ ) {
+			retVal = !!callback( elems[ i ], i );
+			if ( inv !== retVal ) {
+				ret.push( elems[ i ] );
+			}
+		}
+
+		return ret;
+	},
+
+	// arg is for internal usage only
+	map: function( elems, callback, arg ) {
+		var value,
+			i = 0,
+			length = elems.length,
+			isArray = isArraylike( elems ),
+			ret = [];
+
+		// Go through the array, translating each of the items to their
+		if ( isArray ) {
+			for ( ; i < length; i++ ) {
+				value = callback( elems[ i ], i, arg );
+
+				if ( value != null ) {
+					ret[ ret.length ] = value;
+				}
+			}
+
+		// Go through every key on the object,
+		} else {
+			for ( i in elems ) {
+				value = callback( elems[ i ], i, arg );
+
+				if ( value != null ) {
+					ret[ ret.length ] = value;
+				}
+			}
+		}
+
+		// Flatten any nested arrays
+		return core_concat.apply( [], ret );
+	},
+
+	// A global GUID counter for objects
+	guid: 1,
+
+	// Bind a function to a context, optionally partially applying any
+	// arguments.
+	proxy: function( fn, context ) {
+		var args, proxy, tmp;
+
+		if ( typeof context === "string" ) {
+			tmp = fn[ context ];
+			context = fn;
+			fn = tmp;
+		}
+
+		// Quick check to determine if target is callable, in the spec
+		// this throws a TypeError, but we will just return undefined.
+		if ( !jQuery.isFunction( fn ) ) {
+			return undefined;
+		}
+
+		// Simulated bind
+		args = core_slice.call( arguments, 2 );
+		proxy = function() {
+			return fn.apply( context || this, args.concat( core_slice.call( arguments ) ) );
+		};
+
+		// Set the guid of unique handler to the same of original handler, so it can be removed
+		proxy.guid = fn.guid = fn.guid || jQuery.guid++;
+
+		return proxy;
+	},
+
+	// Multifunctional method to get and set values of a collection
+	// The value/s can optionally be executed if it's a function
+	access: function( elems, fn, key, value, chainable, emptyGet, raw ) {
+		var i = 0,
+			length = elems.length,
+			bulk = key == null;
+
+		// Sets many values
+		if ( jQuery.type( key ) === "object" ) {
+			chainable = true;
+			for ( i in key ) {
+				jQuery.access( elems, fn, i, key[i], true, emptyGet, raw );
+			}
+
+		// Sets one value
+		} else if ( value !== undefined ) {
+			chainable = true;
+
+			if ( !jQuery.isFunction( value ) ) {
+				raw = true;
+			}
+
+			if ( bulk ) {
+				// Bulk operations run against the entire set
+				if ( raw ) {
+					fn.call( elems, value );
+					fn = null;
+
+				// ...except when executing function values
+				} else {
+					bulk = fn;
+					fn = function( elem, key, value ) {
+						return bulk.call( jQuery( elem ), value );
+					};
+				}
+			}
+
+			if ( fn ) {
+				for ( ; i < length; i++ ) {
+					fn( elems[i], key, raw ? value : value.call( elems[i], i, fn( elems[i], key ) ) );
+				}
+			}
+		}
+
+		return chainable ?
+			elems :
+
+			// Gets
+			bulk ?
+				fn.call( elems ) :
+				length ? fn( elems[0], key ) : emptyGet;
+	},
+
+	now: function() {
+		return ( new Date() ).getTime();
+	},
+
+	// A method for quickly swapping in/out CSS properties to get correct calculations.
+	// Note: this method belongs to the css module but it's needed here for the support module.
+	// If support gets modularized, this method should be moved back to the css module.
+	swap: function( elem, options, callback, args ) {
+		var ret, name,
+			old = {};
+
+		// Remember the old values, and insert the new ones
+		for ( name in options ) {
+			old[ name ] = elem.style[ name ];
+			elem.style[ name ] = options[ name ];
+		}
+
+		ret = callback.apply( elem, args || [] );
+
+		// Revert the old values
+		for ( name in options ) {
+			elem.style[ name ] = old[ name ];
+		}
+
+		return ret;
+	}
+});
+
+jQuery.ready.promise = function( obj ) {
+	if ( !readyList ) {
+
+		readyList = jQuery.Deferred();
+
+		// Catch cases where $(document).ready() is called after the browser event has already occurred.
+		// we once tried to use readyState "interactive" here, but it caused issues like the one
+		// discovered by ChrisS here: http://bugs.jquery.com/ticket/12282#comment:15
+		if ( document.readyState === "complete" ) {
+			// Handle it asynchronously to allow scripts the opportunity to delay ready
+			setTimeout( jQuery.ready );
+
+		// Standards-based browsers support DOMContentLoaded
+		} else if ( document.addEventListener ) {
+			// Use the handy event callback
+			document.addEventListener( "DOMContentLoaded", completed, false );
+
+			// A fallback to window.onload, that will always work
+			window.addEventListener( "load", completed, false );
+
+		// If IE event model is used
+		} else {
+			// Ensure firing before onload, maybe late but safe also for iframes
+			document.attachEvent( "onreadystatechange", completed );
+
+			// A fallback to window.onload, that will always work
+			window.attachEvent( "onload", completed );
+
+			// If IE and not a frame
+			// continually check to see if the document is ready
+			var top = false;
+
+			try {
+				top = window.frameElement == null && document.documentElement;
+			} catch(e) {}
+
+			if ( top && top.doScroll ) {
+				(function doScrollCheck() {
+					if ( !jQuery.isReady ) {
+
+						try {
+							// Use the trick by Diego Perini
+							// http://javascript.nwbox.com/IEContentLoaded/
+							top.doScroll("left");
+						} catch(e) {
+							return setTimeout( doScrollCheck, 50 );
+						}
+
+						// detach all dom ready events
+						detach();
+
+						// and execute any waiting functions
+						jQuery.ready();
+					}
+				})();
+			}
+		}
+	}
+	return readyList.promise( obj );
+};
+
+// Populate the class2type map
+jQuery.each("Boolean Number String Function Array Date RegExp Object Error".split(" "), function(i, name) {
+	class2type[ "[object " + name + "]" ] = name.toLowerCase();
+});
+
+function isArraylike( obj ) {
+	var length = obj.length,
+		type = jQuery.type( obj );
+
+	if ( jQuery.isWindow( obj ) ) {
+		return false;
+	}
+
+	if ( obj.nodeType === 1 && length ) {
+		return true;
+	}
+
+	return type === "array" || type !== "function" &&
+		( length === 0 ||
+		typeof length === "number" && length > 0 && ( length - 1 ) in obj );
+}
+
+// All jQuery objects should point back to these
+rootjQuery = jQuery(document);
+/*!
+ * Sizzle CSS Selector Engine v1.9.4-pre
+ * http://sizzlejs.com/
+ *
+ * Copyright 2013 jQuery Foundation, Inc. and other contributors
+ * Released under the MIT license
+ * http://jquery.org/license
+ *
+ * Date: 2013-05-15
+ */
+(function( window, undefined ) {
+
+var i,
+	support,
+	cachedruns,
+	Expr,
+	getText,
+	isXML,
+	compile,
+	outermostContext,
+	sortInput,
+
+	// Local document vars
+	setDocument,
+	document,
+	docElem,
+	documentIsHTML,
+	rbuggyQSA,
+	rbuggyMatches,
+	matches,
+	contains,
+
+	// Instance-specific data
+	expando = "sizzle" + -(new Date()),
+	preferredDoc = window.document,
+	dirruns = 0,
+	done = 0,
+	classCache = createCache(),
+	tokenCache = createCache(),
+	compilerCache = createCache(),
+	hasDuplicate = false,
+	sortOrder = function() { return 0; },
+
+	// General-purpose constants
+	strundefined = typeof undefined,
+	MAX_NEGATIVE = 1 << 31,
+
+	// Instance methods
+	hasOwn = ({}).hasOwnProperty,
+	arr = [],
+	pop = arr.pop,
+	push_native = arr.push,
+	push = arr.push,
+	slice = arr.slice,
+	// Use a stripped-down indexOf if we can't use a native one
+	indexOf = arr.indexOf || function( elem ) {
+		var i = 0,
+			len = this.length;
+		for ( ; i < len; i++ ) {
+			if ( this[i] === elem ) {
+				return i;
+			}
+		}
+		return -1;
+	},
+
+	booleans = "checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",
+
+	// Regular expressions
+
+	// Whitespace characters http://www.w3.org/TR/css3-selectors/#whitespace
+	whitespace = "[\\x20\\t\\r\\n\\f]",
+	// http://www.w3.org/TR/css3-syntax/#characters
+	characterEncoding = "(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",
+
+	// Loosely modeled on CSS identifier characters
+	// An unquoted value should be a CSS identifier http://www.w3.org/TR/css3-selectors/#attribute-selectors
+	// Proper syntax: http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier
+	identifier = characterEncoding.replace( "w", "w#" ),
+
+	// Acceptable operators http://www.w3.org/TR/selectors/#attribute-selectors
+	attributes = "\\[" + whitespace + "*(" + characterEncoding + ")" + whitespace +
+		"*(?:([*^$|!~]?=)" + whitespace + "*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|(" + identifier + ")|)|)" + whitespace + "*\\]",
+
+	// Prefer arguments quoted,
+	//   then not containing pseudos/brackets,
+	//   then attribute selectors/non-parenthetical expressions,
+	//   then anything else
+	// These preferences are here to reduce the number of selectors
+	//   needing tokenize in the PSEUDO preFilter
+	pseudos = ":(" + characterEncoding + ")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|" + attributes.replace( 3, 8 ) + ")*)|.*)\\)|)",
+
+	// Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter
+	rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + whitespace + "+$", "g" ),
+
+	rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ),
+	rcombinators = new RegExp( "^" + whitespace + "*([>+~]|" + whitespace + ")" + whitespace + "*" ),
+
+	rsibling = new RegExp( whitespace + "*[+~]" ),
+	rattributeQuotes = new RegExp( "=" + whitespace + "*([^\\]'\"]*)" + whitespace + "*\\]", "g" ),
+
+	rpseudo = new RegExp( pseudos ),
+	ridentifier = new RegExp( "^" + identifier + "$" ),
+
+	matchExpr = {
+		"ID": new RegExp( "^#(" + characterEncoding + ")" ),
+		"CLASS": new RegExp( "^\\.(" + characterEncoding + ")" ),
+		"TAG": new RegExp( "^(" + characterEncoding.replace( "w", "w*" ) + ")" ),
+		"ATTR": new RegExp( "^" + attributes ),
+		"PSEUDO": new RegExp( "^" + pseudos ),
+		"CHILD": new RegExp( "^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" + whitespace +
+			"*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" + whitespace +
+			"*(\\d+)|))" + whitespace + "*\\)|)", "i" ),
+		"bool": new RegExp( "^(?:" + booleans + ")$", "i" ),
+		// For use in libraries implementing .is()
+		// We use this for POS matching in `select`
+		"needsContext": new RegExp( "^" + whitespace + "*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" +
+			whitespace + "*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", "i" )
+	},
+
+	rnative = /^[^{]+\{\s*\[native \w/,
+
+	// Easily-parseable/retrievable ID or TAG or CLASS selectors
+	rquickExpr = /^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,
+
+	rinputs = /^(?:input|select|textarea|button)$/i,
+	rheader = /^h\d$/i,
+
+	rescape = /'|\\/g,
+
+	// CSS escapes http://www.w3.org/TR/CSS21/syndata.html#escaped-characters
+	runescape = new RegExp( "\\\\([\\da-f]{1,6}" + whitespace + "?|(" + whitespace + ")|.)", "ig" ),
+	funescape = function( _, escaped, escapedWhitespace ) {
+		var high = "0x" + escaped - 0x10000;
+		// NaN means non-codepoint
+		// Support: Firefox
+		// Workaround erroneous numeric interpretation of +"0x"
+		return high !== high || escapedWhitespace ?
+			escaped :
+			// BMP codepoint
+			high < 0 ?
+				String.fromCharCode( high + 0x10000 ) :
+				// Supplemental Plane codepoint (surrogate pair)
+				String.fromCharCode( high >> 10 | 0xD800, high & 0x3FF | 0xDC00 );
+	};
+
+// Optimize for push.apply( _, NodeList )
+try {
+	push.apply(
+		(arr = slice.call( preferredDoc.childNodes )),
+		preferredDoc.childNodes
+	);
+	// Support: Android<4.0
+	// Detect silently failing push.apply
+	arr[ preferredDoc.childNodes.length ].nodeType;
+} catch ( e ) {
+	push = { apply: arr.length ?
+
+		// Leverage slice if possible
+		function( target, els ) {
+			push_native.apply( target, slice.call(els) );
+		} :
+
+		// Support: IE<9
+		// Otherwise append directly
+		function( target, els ) {
+			var j = target.length,
+				i = 0;
+			// Can't trust NodeList.length
+			while ( (target[j++] = els[i++]) ) {}
+			target.length = j - 1;
+		}
+	};
+}
+
+function Sizzle( selector, context, results, seed ) {
+	var match, elem, m, nodeType,
+		// QSA vars
+		i, groups, old, nid, newContext, newSelector;
+
+	if ( ( context ? context.ownerDocument || context : preferredDoc ) !== document ) {
+		setDocument( context );
+	}
+
+	context = context || document;
+	results = results || [];
+
+	if ( !selector || typeof selector !== "string" ) {
+		return results;
+	}
+
+	if ( (nodeType = context.nodeType) !== 1 && nodeType !== 9 ) {
+		return [];
+	}
+
+	if ( documentIsHTML && !seed ) {
+
+		// Shortcuts
+		if ( (match = rquickExpr.exec( selector )) ) {
+			// Speed-up: Sizzle("#ID")
+			if ( (m = match[1]) ) {
+				if ( nodeType === 9 ) {
+					elem = context.getElementById( m );
+					// Check parentNode to catch when Blackberry 4.6 returns
+					// nodes that are no longer in the document #6963
+					if ( elem && elem.parentNode ) {
+						// Handle the case where IE, Opera, and Webkit return items
+						// by name instead of ID
+						if ( elem.id === m ) {
+							results.push( elem );
+							return results;
+						}
+					} else {
+						return results;
+					}
+				} else {
+					// Context is not a document
+					if ( context.ownerDocument && (elem = context.ownerDocument.getElementById( m )) &&
+						contains( context, elem ) && elem.id === m ) {
+						results.push( elem );
+						return results;
+					}
+				}
+
+			// Speed-up: Sizzle("TAG")
+			} else if ( match[2] ) {
+				push.apply( results, context.getElementsByTagName( selector ) );
+				return results;
+
+			// Speed-up: Sizzle(".CLASS")
+			} else if ( (m = match[3]) && support.getElementsByClassName && context.getElementsByClassName ) {
+				push.apply( results, context.getElementsByClassName( m ) );
+				return results;
+			}
+		}
+
+		// QSA path
+		if ( support.qsa && (!rbuggyQSA || !rbuggyQSA.test( selector )) ) {
+			nid = old = expando;
+			newContext = context;
+			newSelector = nodeType === 9 && selector;
+
+			// qSA works strangely on Element-rooted queries
+			// We can work around this by specifying an extra ID on the root
+			// and working up from there (Thanks to Andrew Dupont for the technique)
+			// IE 8 doesn't work on object elements
+			if ( nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) {
+				groups = tokenize( selector );
+
+				if ( (old = context.getAttribute("id")) ) {
+					nid = old.replace( rescape, "\\$&" );
+				} else {
+					context.setAttribute( "id", nid );
+				}
+				nid = "[id='" + nid + "'] ";
+
+				i = groups.length;
+				while ( i-- ) {
+					groups[i] = nid + toSelector( groups[i] );
+				}
+				newContext = rsibling.test( selector ) && context.parentNode || context;
+				newSelector = groups.join(",");
+			}
+
+			if ( newSelector ) {
+				try {
+					push.apply( results,
+						newContext.querySelectorAll( newSelector )
+					);
+					return results;
+				} catch(qsaError) {
+				} finally {
+					if ( !old ) {
+						context.removeAttribute("id");
+					}
+				}
+			}
+		}
+	}
+
+	// All others
+	return select( selector.replace( rtrim, "$1" ), context, results, seed );
+}
+
+/**
+ * For feature detection
+ * @param {Function} fn The function to test for native support
+ */
+function isNative( fn ) {
+	return rnative.test( fn + "" );
+}
+
+/**
+ * Create key-value caches of limited size
+ * @returns {Function(string, Object)} Returns the Object data after storing it on itself with
+ *	property name the (space-suffixed) string and (if the cache is larger than Expr.cacheLength)
+ *	deleting the oldest entry
+ */
+function createCache() {
+	var keys = [];
+
+	function cache( key, value ) {
+		// Use (key + " ") to avoid collision with native prototype properties (see Issue #157)
+		if ( keys.push( key += " " ) > Expr.cacheLength ) {
+			// Only keep the most recent entries
+			delete cache[ keys.shift() ];
+		}
+		return (cache[ key ] = value);
+	}
+	return cache;
+}
+
+/**
+ * Mark a function for special use by Sizzle
+ * @param {Function} fn The function to mark
+ */
+function markFunction( fn ) {
+	fn[ expando ] = true;
+	return fn;
+}
+
+/**
+ * Support testing using an element
+ * @param {Function} fn Passed the created div and expects a boolean result
+ */
+function assert( fn ) {
+	var div = document.createElement("div");
+
+	try {
+		return !!fn( div );
+	} catch (e) {
+		return false;
+	} finally {
+		// Remove from its parent by default
+		if ( div.parentNode ) {
+			div.parentNode.removeChild( div );
+		}
+		// release memory in IE
+		div = null;
+	}
+}
+
+/**
+ * Adds the same handler for all of the specified attrs
+ * @param {String} attrs Pipe-separated list of attributes
+ * @param {Function} handler The method that will be applied if the test fails
+ * @param {Boolean} test The result of a test. If true, null will be set as the handler in leiu of the specified handler
+ */
+function addHandle( attrs, handler, test ) {
+	attrs = attrs.split("|");
+	var current,
+		i = attrs.length,
+		setHandle = test ? null : handler;
+
+	while ( i-- ) {
+		// Don't override a user's handler
+		if ( !(current = Expr.attrHandle[ attrs[i] ]) || current === handler ) {
+			Expr.attrHandle[ attrs[i] ] = setHandle;
+		}
+	}
+}
+
+/**
+ * Fetches boolean attributes by node
+ * @param {Element} elem
+ * @param {String} name
+ */
+function boolHandler( elem, name ) {
+	// XML does not need to be checked as this will not be assigned for XML documents
+	var val = elem.getAttributeNode( name );
+	return val && val.specified ?
+		val.value :
+		elem[ name ] === true ? name.toLowerCase() : null;
+}
+
+/**
+ * Fetches attributes without interpolation
+ * http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
+ * @param {Element} elem
+ * @param {String} name
+ */
+function interpolationHandler( elem, name ) {
+	// XML does not need to be checked as this will not be assigned for XML documents
+	return elem.getAttribute( name, name.toLowerCase() === "type" ? 1 : 2 );
+}
+
+/**
+ * Uses defaultValue to retrieve value in IE6/7
+ * @param {Element} elem
+ * @param {String} name
+ */
+function valueHandler( elem ) {
+	// Ignore the value *property* on inputs by using defaultValue
+	// Fallback to Sizzle.attr by returning undefined where appropriate
+	// XML does not need to be checked as this will not be assigned for XML documents
+	if ( elem.nodeName.toLowerCase() === "input" ) {
+		return elem.defaultValue;
+	}
+}
+
+/**
+ * Checks document order of two siblings
+ * @param {Element} a
+ * @param {Element} b
+ * @returns Returns -1 if a precedes b, 1 if a follows b
+ */
+function siblingCheck( a, b ) {
+	var cur = b && a,
+		diff = cur && a.nodeType === 1 && b.nodeType === 1 &&
+			( ~b.sourceIndex || MAX_NEGATIVE ) -
+			( ~a.sourceIndex || MAX_NEGATIVE );
+
+	// Use IE sourceIndex if available on both nodes
+	if ( diff ) {
+		return diff;
+	}
+
+	// Check if b follows a
+	if ( cur ) {
+		while ( (cur = cur.nextSibling) ) {
+			if ( cur === b ) {
+				return -1;
+			}
+		}
+	}
+
+	return a ? 1 : -1;
+}
+
+/**
+ * Returns a function to use in pseudos for input types
+ * @param {String} type
+ */
+function createInputPseudo( type ) {
+	return function( elem ) {
+		var name = elem.nodeName.toLowerCase();
+		return name === "input" && elem.type === type;
+	};
+}
+
+/**
+ * Returns a function to use in pseudos for buttons
+ * @param {String} type
+ */
+function createButtonPseudo( type ) {
+	return function( elem ) {
+		var name = elem.nodeName.toLowerCase();
+		return (name === "input" || name === "button") && elem.type === type;
+	};
+}
+
+/**
+ * Returns a function to use in pseudos for positionals
+ * @param {Function} fn
+ */
+function createPositionalPseudo( fn ) {
+	return markFunction(function( argument ) {
+		argument = +argument;
+		return markFunction(function( seed, matches ) {
+			var j,
+				matchIndexes = fn( [], seed.length, argument ),
+				i = matchIndexes.length;
+
+			// Match elements found at the specified indexes
+			while ( i-- ) {
+				if ( seed[ (j = matchIndexes[i]) ] ) {
+					seed[j] = !(matches[j] = seed[j]);
+				}
+			}
+		});
+	});
+}
+
+/**
+ * Detect xml
+ * @param {Element|Object} elem An element or a document
+ */
+isXML = Sizzle.isXML = function( elem ) {
+	// documentElement is verified for cases where it doesn't yet exist
+	// (such as loading iframes in IE - #4833)
+	var documentElement = elem && (elem.ownerDocument || elem).documentElement;
+	return documentElement ? documentElement.nodeName !== "HTML" : false;
+};
+
+// Expose support vars for convenience
+support = Sizzle.support = {};
+
+/**
+ * Sets document-related variables once based on the current document
+ * @param {Element|Object} [doc] An element or document object to use to set the document
+ * @returns {Object} Returns the current document
+ */
+setDocument = Sizzle.setDocument = function( node ) {
+	var doc = node ? node.ownerDocument || node : preferredDoc;
+
+	// If no document and documentElement is available, return
+	if ( doc === document || doc.nodeType !== 9 || !doc.documentElement ) {
+		return document;
+	}
+
+	// Set our document
+	document = doc;
+	docElem = doc.documentElement;
+
+	// Support tests
+	documentIsHTML = !isXML( doc );
+
+	/* Attributes
+	---------------------------------------------------------------------- */
+
+	// Support: IE<8
+	// Verify that getAttribute really returns attributes and not properties (excepting IE8 booleans)
+	support.attributes = assert(function( div ) {
+
+		// Support: IE<8
+		// Prevent attribute/property "interpolation"
+		div.innerHTML = "<a href='#'></a>";
+		addHandle( "type|href|height|width", interpolationHandler, div.firstChild.getAttribute("href") === "#" );
+
+		// Support: IE<9
+		// Use getAttributeNode to fetch booleans when getAttribute lies
+		addHandle( booleans, boolHandler, div.getAttribute("disabled") == null );
+
+		div.className = "i";
+		return !div.getAttribute("className");
+	});
+
+	// Support: IE<9
+	// Retrieving value should defer to defaultValue
+	support.input = assert(function( div ) {
+		div.innerHTML = "<input>";
+		div.firstChild.setAttribute( "value", "" );
+		return div.firstChild.getAttribute( "value" ) === "";
+	});
+
+	// IE6/7 still return empty string for value,
+	// but are actually retrieving the property
+	addHandle( "value", valueHandler, support.attributes && support.input );
+
+	/* getElement(s)By*
+	---------------------------------------------------------------------- */
+
+	// Check if getElementsByTagName("*") returns only elements
+	support.getElementsByTagName = assert(function( div ) {
+		div.appendChild( doc.createComment("") );
+		return !div.getElementsByTagName("*").length;
+	});
+
+	// Check if getElementsByClassName can be trusted
+	support.getElementsByClassName = assert(function( div ) {
+		div.innerHTML = "<div class='a'></div><div class='a i'></div>";
+
+		// Support: Safari<4
+		// Catch class over-caching
+		div.firstChild.className = "i";
+		// Support: Opera<10
+		// Catch gEBCN failure to find non-leading classes
+		return div.getElementsByClassName("i").length === 2;
+	});
+
+	// Support: IE<10
+	// Check if getElementById returns elements by name
+	// The broken getElementById methods don't pick up programatically-set names,
+	// so use a roundabout getElementsByName test
+	support.getById = assert(function( div ) {
+		docElem.appendChild( div ).id = expando;
+		return !doc.getElementsByName || !doc.getElementsByName( expando ).length;
+	});
+
+	// ID find and filter
+	if ( support.getById ) {
+		Expr.find["ID"] = function( id, context ) {
+			if ( typeof context.getElementById !== strundefined && documentIsHTML ) {
+				var m = context.getElementById( id );
+				// Check parentNode to catch when Blackberry 4.6 returns
+				// nodes that are no longer in the document #6963
+				return m && m.parentNode ? [m] : [];
+			}
+		};
+		Expr.filter["ID"] = function( id ) {
+			var attrId = id.replace( runescape, funescape );
+			return function( elem ) {
+				return elem.getAttribute("id") === attrId;
+			};
+		};
+	} else {
+		// Support: IE6/7
+		// getElementById is not reliable as a find shortcut
+		delete Expr.find["ID"];
+
+		Expr.filter["ID"] =  function( id ) {
+			var attrId = id.replace( runescape, funescape );
+			return function( elem ) {
+				var node = typeof elem.getAttributeNode !== strundefined && elem.getAttributeNode("id");
+				return node && node.value === attrId;
+			};
+		};
+	}
+
+	// Tag
+	Expr.find["TAG"] = support.getElementsByTagName ?
+		function( tag, context ) {
+			if ( typeof context.getElementsByTagName !== strundefined ) {
+				return context.getElementsByTagName( tag );
+			}
+		} :
+		function( tag, context ) {
+			var elem,
+				tmp = [],
+				i = 0,
+				results = context.getElementsByTagName( tag );
+
+			// Filter out possible comments
+			if ( tag === "*" ) {
+				while ( (elem = results[i++]) ) {
+					if ( elem.nodeType === 1 ) {
+						tmp.push( elem );
+					}
+				}
+
+				return tmp;
+			}
+			return results;
+		};
+
+	// Class
+	Expr.find["CLASS"] = support.getElementsByClassName && function( className, context ) {
+		if ( typeof context.getElementsByClassName !== strundefined && documentIsHTML ) {
+			return context.getElementsByClassName( className );
+		}
+	};
+
+	/* QSA/matchesSelector
+	---------------------------------------------------------------------- */
+
+	// QSA and matchesSelector support
+
+	// matchesSelector(:active) reports false when true (IE9/Opera 11.5)
+	rbuggyMatches = [];
+
+	// qSa(:focus) reports false when true (Chrome 21)
+	// We allow this because of a bug in IE8/9 that throws an error
+	// whenever `document.activeElement` is accessed on an iframe
+	// So, we allow :focus to pass through QSA all the time to avoid the IE error
+	// See http://bugs.jquery.com/ticket/13378
+	rbuggyQSA = [];
+
+	if ( (support.qsa = isNative(doc.querySelectorAll)) ) {
+		// Build QSA regex
+		// Regex strategy adopted from Diego Perini
+		assert(function( div ) {
+			// Select is set to empty string on purpose
+			// This is to test IE's treatment of not explicitly
+			// setting a boolean content attribute,
+			// since its presence should be enough
+			// http://bugs.jquery.com/ticket/12359
+			div.innerHTML = "<select><option selected=''></option></select>";
+
+			// Support: IE8
+			// Boolean attributes and "value" are not treated correctly
+			if ( !div.querySelectorAll("[selected]").length ) {
+				rbuggyQSA.push( "\\[" + whitespace + "*(?:value|" + booleans + ")" );
+			}
+
+			// Webkit/Opera - :checked should return selected option elements
+			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
+			// IE8 throws error here and will not see later tests
+			if ( !div.querySelectorAll(":checked").length ) {
+				rbuggyQSA.push(":checked");
+			}
+		});
+
+		assert(function( div ) {
+
+			// Support: Opera 10-12/IE8
+			// ^= $= *= and empty values
+			// Should not select anything
+			// Support: Windows 8 Native Apps
+			// The type attribute is restricted during .innerHTML assignment
+			var input = doc.createElement("input");
+			input.setAttribute( "type", "hidden" );
+			div.appendChild( input ).setAttribute( "t", "" );
+
+			if ( div.querySelectorAll("[t^='']").length ) {
+				rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:''|\"\")" );
+			}
+
+			// FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled)
+			// IE8 throws error here and will not see later tests
+			if ( !div.querySelectorAll(":enabled").length ) {
+				rbuggyQSA.push( ":enabled", ":disabled" );
+			}
+
+			// Opera 10-11 does not throw on post-comma invalid pseudos
+			div.querySelectorAll("*,:x");
+			rbuggyQSA.push(",.*:");
+		});
+	}
+
+	if ( (support.matchesSelector = isNative( (matches = docElem.webkitMatchesSelector ||
+		docElem.mozMatchesSelector ||
+		docElem.oMatchesSelector ||
+		docElem.msMatchesSelector) )) ) {
+
+		assert(function( div ) {
+			// Check to see if it's possible to do matchesSelector
+			// on a disconnected node (IE 9)
+			support.disconnectedMatch = matches.call( div, "div" );
+
+			// This should fail with an exception
+			// Gecko does not error, returns false instead
+			matches.call( div, "[s!='']:x" );
+			rbuggyMatches.push( "!=", pseudos );
+		});
+	}
+
+	rbuggyQSA = rbuggyQSA.length && new RegExp( rbuggyQSA.join("|") );
+	rbuggyMatches = rbuggyMatches.length && new RegExp( rbuggyMatches.join("|") );
+
+	/* Contains
+	---------------------------------------------------------------------- */
+
+	// Element contains another
+	// Purposefully does not implement inclusive descendent
+	// As in, an element does not contain itself
+	contains = isNative(docElem.contains) || docElem.compareDocumentPosition ?
+		function( a, b ) {
+			var adown = a.nodeType === 9 ? a.documentElement : a,
+				bup = b && b.parentNode;
+			return a === bup || !!( bup && bup.nodeType === 1 && (
+				adown.contains ?
+					adown.contains( bup ) :
+					a.compareDocumentPosition && a.compareDocumentPosition( bup ) & 16
+			));
+		} :
+		function( a, b ) {
+			if ( b ) {
+				while ( (b = b.parentNode) ) {
+					if ( b === a ) {
+						return true;
+					}
+				}
+			}
+			return false;
+		};
+
+	/* Sorting
+	---------------------------------------------------------------------- */
+
+	// Support: Webkit<537.32 - Safari 6.0.3/Chrome 25 (fixed in Chrome 27)
+	// Detached nodes confoundingly follow *each other*
+	support.sortDetached = assert(function( div1 ) {
+		// Should return 1, but returns 4 (following)
+		return div1.compareDocumentPosition( doc.createElement("div") ) & 1;
+	});
+
+	// Document order sorting
+	sortOrder = docElem.compareDocumentPosition ?
+	function( a, b ) {
+
+		// Flag for duplicate removal
+		if ( a === b ) {
+			hasDuplicate = true;
+			return 0;
+		}
+
+		var compare = b.compareDocumentPosition && a.compareDocumentPosition && a.compareDocumentPosition( b );
+
+		if ( compare ) {
+			// Disconnected nodes
+			if ( compare & 1 ||
+				(!support.sortDetached && b.compareDocumentPosition( a ) === compare) ) {
+
+				// Choose the first element that is related to our preferred document
+				if ( a === doc || contains(preferredDoc, a) ) {
+					return -1;
+				}
+				if ( b === doc || contains(preferredDoc, b) ) {
+					return 1;
+				}
+
+				// Maintain original order
+				return sortInput ?
+					( indexOf.call( sortInput, a ) - indexOf.call( sortInput, b ) ) :
+					0;
+			}
+
+			return compare & 4 ? -1 : 1;
+		}
+
+		// Not directly comparable, sort on existence of method
+		return a.compareDocumentPosition ? -1 : 1;
+	} :
+	function( a, b ) {
+		var cur,
+			i = 0,
+			aup = a.parentNode,
+			bup = b.parentNode,
+			ap = [ a ],
+			bp = [ b ];
+
+		// Exit early if the nodes are identical
+		if ( a === b ) {
+			hasDuplicate = true;
+			return 0;
+
+		// Parentless nodes are either documents or disconnected
+		} else if ( !aup || !bup ) {
+			return a === doc ? -1 :
+				b === doc ? 1 :
+				aup ? -1 :
+				bup ? 1 :
+				sortInput ?
+				( indexOf.call( sortInput, a ) - indexOf.call( sortInput, b ) ) :
+				0;
+
+		// If the nodes are siblings, we can do a quick check
+		} else if ( aup === bup ) {
+			return siblingCheck( a, b );
+		}
+
+		// Otherwise we need full lists of their ancestors for comparison
+		cur = a;
+		while ( (cur = cur.parentNode) ) {
+			ap.unshift( cur );
+		}
+		cur = b;
+		while ( (cur = cur.parentNode) ) {
+			bp.unshift( cur );
+		}
+
+		// Walk down the tree looking for a discrepancy
+		while ( ap[i] === bp[i] ) {
+			i++;
+		}
+
+		return i ?
+			// Do a sibling check if the nodes have a common ancestor
+			siblingCheck( ap[i], bp[i] ) :
+
+			// Otherwise nodes in our document sort first
+			ap[i] === preferredDoc ? -1 :
+			bp[i] === preferredDoc ? 1 :
+			0;
+	};
+
+	return doc;
+};
+
+Sizzle.matches = function( expr, elements ) {
+	return Sizzle( expr, null, null, elements );
+};
+
+Sizzle.matchesSelector = function( elem, expr ) {
+	// Set document vars if needed
+	if ( ( elem.ownerDocument || elem ) !== document ) {
+		setDocument( elem );
+	}
+
+	// Make sure that attribute selectors are quoted
+	expr = expr.replace( rattributeQuotes, "='$1']" );
+
+	if ( support.matchesSelector && documentIsHTML &&
+		( !rbuggyMatches || !rbuggyMatches.test( expr ) ) &&
+		( !rbuggyQSA     || !rbuggyQSA.test( expr ) ) ) {
+
+		try {
+			var ret = matches.call( elem, expr );
+
+			// IE 9's matchesSelector returns false on disconnected nodes
+			if ( ret || support.disconnectedMatch ||
+					// As well, disconnected nodes are said to be in a document
+					// fragment in IE 9
+					elem.document && elem.document.nodeType !== 11 ) {
+				return ret;
+			}
+		} catch(e) {}
+	}
+
+	return Sizzle( expr, document, null, [elem] ).length > 0;
+};
+
+Sizzle.contains = function( context, elem ) {
+	// Set document vars if needed
+	if ( ( context.ownerDocument || context ) !== document ) {
+		setDocument( context );
+	}
+	return contains( context, elem );
+};
+
+Sizzle.attr = function( elem, name ) {
+	// Set document vars if needed
+	if ( ( elem.ownerDocument || elem ) !== document ) {
+		setDocument( elem );
+	}
+
+	var fn = Expr.attrHandle[ name.toLowerCase() ],
+		// Don't get fooled by Object.prototype properties (jQuery #13807)
+		val = ( fn && hasOwn.call( Expr.attrHandle, name.toLowerCase() ) ?
+			fn( elem, name, !documentIsHTML ) :
+			undefined );
+
+	return val === undefined ?
+		support.attributes || !documentIsHTML ?
+			elem.getAttribute( name ) :
+			(val = elem.getAttributeNode(name)) && val.specified ?
+				val.value :
+				null :
+		val;
+};
+
+Sizzle.error = function( msg ) {
+	throw new Error( "Syntax error, unrecognized expression: " + msg );
+};
+
+/**
+ * Document sorting and removing duplicates
+ * @param {ArrayLike} results
+ */
+Sizzle.uniqueSort = function( results ) {
+	var elem,
+		duplicates = [],
+		j = 0,
+		i = 0;
+
+	// Unless we *know* we can detect duplicates, assume their presence
+	hasDuplicate = !support.detectDuplicates;
+	sortInput = !support.sortStable && results.slice( 0 );
+	results.sort( sortOrder );
+
+	if ( hasDuplicate ) {
+		while ( (elem = results[i++]) ) {
+			if ( elem === results[ i ] ) {
+				j = duplicates.push( i );
+			}
+		}
+		while ( j-- ) {
+			results.splice( duplicates[ j ], 1 );
+		}
+	}
+
+	return results;
+};
+
+/**
+ * Utility function for retrieving the text value of an array of DOM nodes
+ * @param {Array|Element} elem
+ */
+getText = Sizzle.getText = function( elem ) {
+	var node,
+		ret = "",
+		i = 0,
+		nodeType = elem.nodeType;
+
+	if ( !nodeType ) {
+		// If no nodeType, this is expected to be an array
+		for ( ; (node = elem[i]); i++ ) {
+			// Do not traverse comment nodes
+			ret += getText( node );
+		}
+	} else if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) {
+		// Use textContent for elements
+		// innerText usage removed for consistency of new lines (see #11153)
+		if ( typeof elem.textContent === "string" ) {
+			return elem.textContent;
+		} else {
+			// Traverse its children
+			for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
+				ret += getText( elem );
+			}
+		}
+	} else if ( nodeType === 3 || nodeType === 4 ) {
+		return elem.nodeValue;
+	}
+	// Do not include comment or processing instruction nodes
+
+	return ret;
+};
+
+Expr = Sizzle.selectors = {
+
+	// Can be adjusted by the user
+	cacheLength: 50,
+
+	createPseudo: markFunction,
+
+	match: matchExpr,
+
+	attrHandle: {},
+
+	find: {},
+
+	relative: {
+		">": { dir: "parentNode", first: true },
+		" ": { dir: "parentNode" },
+		"+": { dir: "previousSibling", first: true },
+		"~": { dir: "previousSibling" }
+	},
+
+	preFilter: {
+		"ATTR": function( match ) {
+			match[1] = match[1].replace( runescape, funescape );
+
+			// Move the given value to match[3] whether quoted or unquoted
+			match[3] = ( match[4] || match[5] || "" ).replace( runescape, funescape );
+
+			if ( match[2] === "~=" ) {
+				match[3] = " " + match[3] + " ";
+			}
+
+			return match.slice( 0, 4 );
+		},
+
+		"CHILD": function( match ) {
+			/* matches from matchExpr["CHILD"]
+				1 type (only|nth|...)
+				2 what (child|of-type)
+				3 argument (even|odd|\d*|\d*n([+-]\d+)?|...)
+				4 xn-component of xn+y argument ([+-]?\d*n|)
+				5 sign of xn-component
+				6 x of xn-component
+				7 sign of y-component
+				8 y of y-component
+			*/
+			match[1] = match[1].toLowerCase();
+
+			if ( match[1].slice( 0, 3 ) === "nth" ) {
+				// nth-* requires argument
+				if ( !match[3] ) {
+					Sizzle.error( match[0] );
+				}
+
+				// numeric x and y parameters for Expr.filter.CHILD
+				// remember that false/true cast respectively to 0/1
+				match[4] = +( match[4] ? match[5] + (match[6] || 1) : 2 * ( match[3] === "even" || match[3] === "odd" ) );
+				match[5] = +( ( match[7] + match[8] ) || match[3] === "odd" );
+
+			// other types prohibit arguments
+			} else if ( match[3] ) {
+				Sizzle.error( match[0] );
+			}
+
+			return match;
+		},
+
+		"PSEUDO": function( match ) {
+			var excess,
+				unquoted = !match[5] && match[2];
+
+			if ( matchExpr["CHILD"].test( match[0] ) ) {
+				return null;
+			}
+
+			// Accept quoted arguments as-is
+			if ( match[3] && match[4] !== undefined ) {
+				match[2] = match[4];
+
+			// Strip excess characters from unquoted arguments
+			} else if ( unquoted && rpseudo.test( unquoted ) &&
+				// Get excess from tokenize (recursively)
+				(excess = tokenize( unquoted, true )) &&
+				// advance to the next closing parenthesis
+				(excess = unquoted.indexOf( ")", unquoted.length - excess ) - unquoted.length) ) {
+
+				// excess is a negative index
+				match[0] = match[0].slice( 0, excess );
+				match[2] = unquoted.slice( 0, excess );
+			}
+
+			// Return only captures needed by the pseudo filter method (type and argument)
+			return match.slice( 0, 3 );
+		}
+	},
+
+	filter: {
+
+		"TAG": function( nodeNameSelector ) {
+			var nodeName = nodeNameSelector.replace( runescape, funescape ).toLowerCase();
+			return nodeNameSelector === "*" ?
+				function() { return true; } :
+				function( elem ) {
+					return elem.nodeName && elem.nodeName.toLowerCase() === nodeName;
+				};
+		},
+
+		"CLASS": function( className ) {
+			var pattern = classCache[ className + " " ];
+
+			return pattern ||
+				(pattern = new RegExp( "(^|" + whitespace + ")" + className + "(" + whitespace + "|$)" )) &&
+				classCache( className, function( elem ) {
+					return pattern.test( typeof elem.className === "string" && elem.className || typeof elem.getAttribute !== strundefined && elem.getAttribute("class") || "" );
+				});
+		},
+
+		"ATTR": function( name, operator, check ) {
+			return function( elem ) {
+				var result = Sizzle.attr( elem, name );
+
+				if ( result == null ) {
+					return operator === "!=";
+				}
+				if ( !operator ) {
+					return true;
+				}
+
+				result += "";
+
+				return operator === "=" ? result === check :
+					operator === "!=" ? result !== check :
+					operator === "^=" ? check && result.indexOf( check ) === 0 :
+					operator === "*=" ? check && result.indexOf( check ) > -1 :
+					operator === "$=" ? check && result.slice( -check.length ) === check :
+					operator === "~=" ? ( " " + result + " " ).indexOf( check ) > -1 :
+					operator === "|=" ? result === check || result.slice( 0, check.length + 1 ) === check + "-" :
+					false;
+			};
+		},
+
+		"CHILD": function( type, what, argument, first, last ) {
+			var simple = type.slice( 0, 3 ) !== "nth",
+				forward = type.slice( -4 ) !== "last",
+				ofType = what === "of-type";
+
+			return first === 1 && last === 0 ?
+
+				// Shortcut for :nth-*(n)
+				function( elem ) {
+					return !!elem.parentNode;
+				} :
+
+				function( elem, context, xml ) {
+					var cache, outerCache, node, diff, nodeIndex, start,
+						dir = simple !== forward ? "nextSibling" : "previousSibling",
+						parent = elem.parentNode,
+						name = ofType && elem.nodeName.toLowerCase(),
+						useCache = !xml && !ofType;
+
+					if ( parent ) {
+
+						// :(first|last|only)-(child|of-type)
+						if ( simple ) {
+							while ( dir ) {
+								node = elem;
+								while ( (node = node[ dir ]) ) {
+									if ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) {
+										return false;
+									}
+								}
+								// Reverse direction for :only-* (if we haven't yet done so)
+								start = dir = type === "only" && !start && "nextSibling";
+							}
+							return true;
+						}
+
+						start = [ forward ? parent.firstChild : parent.lastChild ];
+
+						// non-xml :nth-child(...) stores cache data on `parent`
+						if ( forward && useCache ) {
+							// Seek `elem` from a previously-cached index
+							outerCache = parent[ expando ] || (parent[ expando ] = {});
+							cache = outerCache[ type ] || [];
+							nodeIndex = cache[0] === dirruns && cache[1];
+							diff = cache[0] === dirruns && cache[2];
+							node = nodeIndex && parent.childNodes[ nodeIndex ];
+
+							while ( (node = ++nodeIndex && node && node[ dir ] ||
+
+								// Fallback to seeking `elem` from the start
+								(diff = nodeIndex = 0) || start.pop()) ) {
+
+								// When found, cache indexes on `parent` and break
+								if ( node.nodeType === 1 && ++diff && node === elem ) {
+									outerCache[ type ] = [ dirruns, nodeIndex, diff ];
+									break;
+								}
+							}
+
+						// Use previously-cached element index if available
+						} else if ( useCache && (cache = (elem[ expando ] || (elem[ expando ] = {}))[ type ]) && cache[0] === dirruns ) {
+							diff = cache[1];
+
+						// xml :nth-child(...) or :nth-last-child(...) or :nth(-last)?-of-type(...)
+						} else {
+							// Use the same loop as above to seek `elem` from the start
+							while ( (node = ++nodeIndex && node && node[ dir ] ||
+								(diff = nodeIndex = 0) || start.pop()) ) {
+
+								if ( ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) && ++diff ) {
+									// Cache the index of each encountered element
+									if ( useCache ) {
+										(node[ expando ] || (node[ expando ] = {}))[ type ] = [ dirruns, diff ];
+									}
+
+									if ( node === elem ) {
+										break;
+									}
+								}
+							}
+						}
+
+						// Incorporate the offset, then check against cycle size
+						diff -= last;
+						return diff === first || ( diff % first === 0 && diff / first >= 0 );
+					}
+				};
+		},
+
+		"PSEUDO": function( pseudo, argument ) {
+			// pseudo-class names are case-insensitive
+			// http://www.w3.org/TR/selectors/#pseudo-classes
+			// Prioritize by case sensitivity in case custom pseudos are added with uppercase letters
+			// Remember that setFilters inherits from pseudos
+			var args,
+				fn = Expr.pseudos[ pseudo ] || Expr.setFilters[ pseudo.toLowerCase() ] ||
+					Sizzle.error( "unsupported pseudo: " + pseudo );
+
+			// The user may use createPseudo to indicate that
+			// arguments are needed to create the filter function
+			// just as Sizzle does
+			if ( fn[ expando ] ) {
+				return fn( argument );
+			}
+
+			// But maintain support for old signatures
+			if ( fn.length > 1 ) {
+				args = [ pseudo, pseudo, "", argument ];
+				return Expr.setFilters.hasOwnProperty( pseudo.toLowerCase() ) ?
+					markFunction(function( seed, matches ) {
+						var idx,
+							matched = fn( seed, argument ),
+							i = matched.length;
+						while ( i-- ) {
+							idx = indexOf.call( seed, matched[i] );
+							seed[ idx ] = !( matches[ idx ] = matched[i] );
+						}
+					}) :
+					function( elem ) {
+						return fn( elem, 0, args );
+					};
+			}
+
+			return fn;
+		}
+	},
+
+	pseudos: {
+		// Potentially complex pseudos
+		"not": markFunction(function( selector ) {
+			// Trim the selector passed to compile
+			// to avoid treating leading and trailing
+			// spaces as combinators
+			var input = [],
+				results = [],
+				matcher = compile( selector.replace( rtrim, "$1" ) );
+
+			return matcher[ expando ] ?
+				markFunction(function( seed, matches, context, xml ) {
+					var elem,
+						unmatched = matcher( seed, null, xml, [] ),
+						i = seed.length;
+
+					// Match elements unmatched by `matcher`
+					while ( i-- ) {
+						if ( (elem = unmatched[i]) ) {
+							seed[i] = !(matches[i] = elem);
+						}
+					}
+				}) :
+				function( elem, context, xml ) {
+					input[0] = elem;
+					matcher( input, null, xml, results );
+					return !results.pop();
+				};
+		}),
+
+		"has": markFunction(function( selector ) {
+			return function( elem ) {
+				return Sizzle( selector, elem ).length > 0;
+			};
+		}),
+
+		"contains": markFunction(function( text ) {
+			return function( elem ) {
+				return ( elem.textContent || elem.innerText || getText( elem ) ).indexOf( text ) > -1;
+			};
+		}),
+
+		// "Whether an element is represented by a :lang() selector
+		// is based solely on the element's language value
+		// being equal to the identifier C,
+		// or beginning with the identifier C immediately followed by "-".
+		// The matching of C against the element's language value is performed case-insensitively.
+		// The identifier C does not have to be a valid language name."
+		// http://www.w3.org/TR/selectors/#lang-pseudo
+		"lang": markFunction( function( lang ) {
+			// lang value must be a valid identifier
+			if ( !ridentifier.test(lang || "") ) {
+				Sizzle.error( "unsupported lang: " + lang );
+			}
+			lang = lang.replace( runescape, funescape ).toLowerCase();
+			return function( elem ) {
+				var elemLang;
+				do {
+					if ( (elemLang = documentIsHTML ?
+						elem.lang :
+						elem.getAttribute("xml:lang") || elem.getAttribute("lang")) ) {
+
+						elemLang = elemLang.toLowerCase();
+						return elemLang === lang || elemLang.indexOf( lang + "-" ) === 0;
+					}
+				} while ( (elem = elem.parentNode) && elem.nodeType === 1 );
+				return false;
+			};
+		}),
+
+		// Miscellaneous
+		"target": function( elem ) {
+			var hash = window.location && window.location.hash;
+			return hash && hash.slice( 1 ) === elem.id;
+		},
+
+		"root": function( elem ) {
+			return elem === docElem;
+		},
+
+		"focus": function( elem ) {
+			return elem === document.activeElement && (!document.hasFocus || document.hasFocus()) && !!(elem.type || elem.href || ~elem.tabIndex);
+		},
+
+		// Boolean properties
+		"enabled": function( elem ) {
+			return elem.disabled === false;
+		},
+
+		"disabled": function( elem ) {
+			return elem.disabled === true;
+		},
+
+		"checked": function( elem ) {
+			// In CSS3, :checked should return both checked and selected elements
+			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
+			var nodeName = elem.nodeName.toLowerCase();
+			return (nodeName === "input" && !!elem.checked) || (nodeName === "option" && !!elem.selected);
+		},
+
+		"selected": function( elem ) {
+			// Accessing this property makes selected-by-default
+			// options in Safari work properly
+			if ( elem.parentNode ) {
+				elem.parentNode.selectedIndex;
+			}
+
+			return elem.selected === true;
+		},
+
+		// Contents
+		"empty": function( elem ) {
+			// http://www.w3.org/TR/selectors/#empty-pseudo
+			// :empty is only affected by element nodes and content nodes(including text(3), cdata(4)),
+			//   not comment, processing instructions, or others
+			// Thanks to Diego Perini for the nodeName shortcut
+			//   Greater than "@" means alpha characters (specifically not starting with "#" or "?")
+			for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
+				if ( elem.nodeName > "@" || elem.nodeType === 3 || elem.nodeType === 4 ) {
+					return false;
+				}
+			}
+			return true;
+		},
+
+		"parent": function( elem ) {
+			return !Expr.pseudos["empty"]( elem );
+		},
+
+		// Element/input types
+		"header": function( elem ) {
+			return rheader.test( elem.nodeName );
+		},
+
+		"input": function( elem ) {
+			return rinputs.test( elem.nodeName );
+		},
+
+		"button": function( elem ) {
+			var name = elem.nodeName.toLowerCase();
+			return name === "input" && elem.type === "button" || name === "button";
+		},
+
+		"text": function( elem ) {
+			var attr;
+			// IE6 and 7 will map elem.type to 'text' for new HTML5 types (search, etc)
+			// use getAttribute instead to test this case
+			return elem.nodeName.toLowerCase() === "input" &&
+				elem.type === "text" &&
+				( (attr = elem.getAttribute("type")) == null || attr.toLowerCase() === elem.type );
+		},
+
+		// Position-in-collection
+		"first": createPositionalPseudo(function() {
+			return [ 0 ];
+		}),
+
+		"last": createPositionalPseudo(function( matchIndexes, length ) {
+			return [ length - 1 ];
+		}),
+
+		"eq": createPositionalPseudo(function( matchIndexes, length, argument ) {
+			return [ argument < 0 ? argument + length : argument ];
+		}),
+
+		"even": createPositionalPseudo(function( matchIndexes, length ) {
+			var i = 0;
+			for ( ; i < length; i += 2 ) {
+				matchIndexes.push( i );
+			}
+			return matchIndexes;
+		}),
+
+		"odd": createPositionalPseudo(function( matchIndexes, length ) {
+			var i = 1;
+			for ( ; i < length; i += 2 ) {
+				matchIndexes.push( i );
+			}
+			return matchIndexes;
+		}),
+
+		"lt": createPositionalPseudo(function( matchIndexes, length, argument ) {
+			var i = argument < 0 ? argument + length : argument;
+			for ( ; --i >= 0; ) {
+				matchIndexes.push( i );
+			}
+			return matchIndexes;
+		}),
+
+		"gt": createPositionalPseudo(function( matchIndexes, length, argument ) {
+			var i = argument < 0 ? argument + length : argument;
+			for ( ; ++i < length; ) {
+				matchIndexes.push( i );
+			}
+			return matchIndexes;
+		})
+	}
+};
+
+// Add button/input type pseudos
+for ( i in { radio: true, checkbox: true, file: true, password: true, image: true } ) {
+	Expr.pseudos[ i ] = createInputPseudo( i );
+}
+for ( i in { submit: true, reset: true } ) {
+	Expr.pseudos[ i ] = createButtonPseudo( i );
+}
+
+function tokenize( selector, parseOnly ) {
+	var matched, match, tokens, type,
+		soFar, groups, preFilters,
+		cached = tokenCache[ selector + " " ];
+
+	if ( cached ) {
+		return parseOnly ? 0 : cached.slice( 0 );
+	}
+
+	soFar = selector;
+	groups = [];
+	preFilters = Expr.preFilter;
+
+	while ( soFar ) {
+
+		// Comma and first run
+		if ( !matched || (match = rcomma.exec( soFar )) ) {
+			if ( match ) {
+				// Don't consume trailing commas as valid
+				soFar = soFar.slice( match[0].length ) || soFar;
+			}
+			groups.push( tokens = [] );
+		}
+
+		matched = false;
+
+		// Combinators
+		if ( (match = rcombinators.exec( soFar )) ) {
+			matched = match.shift();
+			tokens.push({
+				value: matched,
+				// Cast descendant combinators to space
+				type: match[0].replace( rtrim, " " )
+			});
+			soFar = soFar.slice( matched.length );
+		}
+
+		// Filters
+		for ( type in Expr.filter ) {
+			if ( (match = matchExpr[ type ].exec( soFar )) && (!preFilters[ type ] ||
+				(match = preFilters[ type ]( match ))) ) {
+				matched = match.shift();
+				tokens.push({
+					value: matched,
+					type: type,
+					matches: match
+				});
+				soFar = soFar.slice( matched.length );
+			}
+		}
+
+		if ( !matched ) {
+			break;
+		}
+	}
+
+	// Return the length of the invalid excess
+	// if we're just parsing
+	// Otherwise, throw an error or return tokens
+	return parseOnly ?
+		soFar.length :
+		soFar ?
+			Sizzle.error( selector ) :
+			// Cache the tokens
+			tokenCache( selector, groups ).slice( 0 );
+}
+
+function toSelector( tokens ) {
+	var i = 0,
+		len = tokens.length,
+		selector = "";
+	for ( ; i < len; i++ ) {
+		selector += tokens[i].value;
+	}
+	return selector;
+}
+
+function addCombinator( matcher, combinator, base ) {
+	var dir = combinator.dir,
+		checkNonElements = base && dir === "parentNode",
+		doneName = done++;
+
+	return combinator.first ?
+		// Check against closest ancestor/preceding element
+		function( elem, context, xml ) {
+			while ( (elem = elem[ dir ]) ) {
+				if ( elem.nodeType === 1 || checkNonElements ) {
+					return matcher( elem, context, xml );
+				}
+			}
+		} :
+
+		// Check against all ancestor/preceding elements
+		function( elem, context, xml ) {
+			var data, cache, outerCache,
+				dirkey = dirruns + " " + doneName;
+
+			// We can't set arbitrary data on XML nodes, so they don't benefit from dir caching
+			if ( xml ) {
+				while ( (elem = elem[ dir ]) ) {
+					if ( elem.nodeType === 1 || checkNonElements ) {
+						if ( matcher( elem, context, xml ) ) {
+							return true;
+						}
+					}
+				}
+			} else {
+				while ( (elem = elem[ dir ]) ) {
+					if ( elem.nodeType === 1 || checkNonElements ) {
+						outerCache = elem[ expando ] || (elem[ expando ] = {});
+						if ( (cache = outerCache[ dir ]) && cache[0] === dirkey ) {
+							if ( (data = cache[1]) === true || data === cachedruns ) {
+								return data === true;
+							}
+						} else {
+							cache = outerCache[ dir ] = [ dirkey ];
+							cache[1] = matcher( elem, context, xml ) || cachedruns;
+							if ( cache[1] === true ) {
+								return true;
+							}
+						}
+					}
+				}
+			}
+		};
+}
+
+function elementMatcher( matchers ) {
+	return matchers.length > 1 ?
+		function( elem, context, xml ) {
+			var i = matchers.length;
+			while ( i-- ) {
+				if ( !matchers[i]( elem, context, xml ) ) {
+					return false;
+				}
+			}
+			return true;
+		} :
+		matchers[0];
+}
+
+function condense( unmatched, map, filter, context, xml ) {
+	var elem,
+		newUnmatched = [],
+		i = 0,
+		len = unmatched.length,
+		mapped = map != null;
+
+	for ( ; i < len; i++ ) {
+		if ( (elem = unmatched[i]) ) {
+			if ( !filter || filter( elem, context, xml ) ) {
+				newUnmatched.push( elem );
+				if ( mapped ) {
+					map.push( i );
+				}
+			}
+		}
+	}
+
+	return newUnmatched;
+}
+
+function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postSelector ) {
+	if ( postFilter && !postFilter[ expando ] ) {
+		postFilter = setMatcher( postFilter );
+	}
+	if ( postFinder && !postFinder[ expando ] ) {
+		postFinder = setMatcher( postFinder, postSelector );
+	}
+	return markFunction(function( seed, results, context, xml ) {
+		var temp, i, elem,
+			preMap = [],
+			postMap = [],
+			preexisting = results.length,
+
+			// Get initial elements from seed or context
+			elems = seed || multipleContexts( selector || "*", context.nodeType ? [ context ] : context, [] ),
+
+			// Prefilter to get matcher input, preserving a map for seed-results synchronization
+			matcherIn = preFilter && ( seed || !selector ) ?
+				condense( elems, preMap, preFilter, context, xml ) :
+				elems,
+
+			matcherOut = matcher ?
+				// If we have a postFinder, or filtered seed, or non-seed postFilter or preexisting results,
+				postFinder || ( seed ? preFilter : preexisting || postFilter ) ?
+
+					// ...intermediate processing is necessary
+					[] :
+
+					// ...otherwise use results directly
+					results :
+				matcherIn;
+
+		// Find primary matches
+		if ( matcher ) {
+			matcher( matcherIn, matcherOut, context, xml );
+		}
+
+		// Apply postFilter
+		if ( postFilter ) {
+			temp = condense( matcherOut, postMap );
+			postFilter( temp, [], context, xml );
+
+			// Un-match failing elements by moving them back to matcherIn
+			i = temp.length;
+			while ( i-- ) {
+				if ( (elem = temp[i]) ) {
+					matcherOut[ postMap[i] ] = !(matcherIn[ postMap[i] ] = elem);
+				}
+			}
+		}
+
+		if ( seed ) {
+			if ( postFinder || preFilter ) {
+				if ( postFinder ) {
+					// Get the final matcherOut by condensing this intermediate into postFinder contexts
+					temp = [];
+					i = matcherOut.length;
+					while ( i-- ) {
+						if ( (elem = matcherOut[i]) ) {
+							// Restore matcherIn since elem is not yet a final match
+							temp.push( (matcherIn[i] = elem) );
+						}
+					}
+					postFinder( null, (matcherOut = []), temp, xml );
+				}
+
+				// Move matched elements from seed to results to keep them synchronized
+				i = matcherOut.length;
+				while ( i-- ) {
+					if ( (elem = matcherOut[i]) &&
+						(temp = postFinder ? indexOf.call( seed, elem ) : preMap[i]) > -1 ) {
+
+						seed[temp] = !(results[temp] = elem);
+					}
+				}
+			}
+
+		// Add elements to results, through postFinder if defined
+		} else {
+			matcherOut = condense(
+				matcherOut === results ?
+					matcherOut.splice( preexisting, matcherOut.length ) :
+					matcherOut
+			);
+			if ( postFinder ) {
+				postFinder( null, results, matcherOut, xml );
+			} else {
+				push.apply( results, matcherOut );
+			}
+		}
+	});
+}
+
+function matcherFromTokens( tokens ) {
+	var checkContext, matcher, j,
+		len = tokens.length,
+		leadingRelative = Expr.relative[ tokens[0].type ],
+		implicitRelative = leadingRelative || Expr.relative[" "],
+		i = leadingRelative ? 1 : 0,
+
+		// The foundational matcher ensures that elements are reachable from top-level context(s)
+		matchContext = addCombinator( function( elem ) {
+			return elem === checkContext;
+		}, implicitRelative, true ),
+		matchAnyContext = addCombinator( function( elem ) {
+			return indexOf.call( checkContext, elem ) > -1;
+		}, implicitRelative, true ),
+		matchers = [ function( elem, context, xml ) {
+			return ( !leadingRelative && ( xml || context !== outermostContext ) ) || (
+				(checkContext = context).nodeType ?
+					matchContext( elem, context, xml ) :
+					matchAnyContext( elem, context, xml ) );
+		} ];
+
+	for ( ; i < len; i++ ) {
+		if ( (matcher = Expr.relative[ tokens[i].type ]) ) {
+			matchers = [ addCombinator(elementMatcher( matchers ), matcher) ];
+		} else {
+			matcher = Expr.filter[ tokens[i].type ].apply( null, tokens[i].matches );
+
+			// Return special upon seeing a positional matcher
+			if ( matcher[ expando ] ) {
+				// Find the next relative operator (if any) for proper handling
+				j = ++i;
+				for ( ; j < len; j++ ) {
+					if ( Expr.relative[ tokens[j].type ] ) {
+						break;
+					}
+				}
+				return setMatcher(
+					i > 1 && elementMatcher( matchers ),
+					i > 1 && toSelector(
+						// If the preceding token was a descendant combinator, insert an implicit any-element `*`
+						tokens.slice( 0, i - 1 ).concat({ value: tokens[ i - 2 ].type === " " ? "*" : "" })
+					).replace( rtrim, "$1" ),
+					matcher,
+					i < j && matcherFromTokens( tokens.slice( i, j ) ),
+					j < len && matcherFromTokens( (tokens = tokens.slice( j )) ),
+					j < len && toSelector( tokens )
+				);
+			}
+			matchers.push( matcher );
+		}
+	}
+
+	return elementMatcher( matchers );
+}
+
+function matcherFromGroupMatchers( elementMatchers, setMatchers ) {
+	// A counter to specify which element is currently being matched
+	var matcherCachedRuns = 0,
+		bySet = setMatchers.length > 0,
+		byElement = elementMatchers.length > 0,
+		superMatcher = function( seed, context, xml, results, expandContext ) {
+			var elem, j, matcher,
+				setMatched = [],
+				matchedCount = 0,
+				i = "0",
+				unmatched = seed && [],
+				outermost = expandContext != null,
+				contextBackup = outermostContext,
+				// We must always have either seed elements or context
+				elems = seed || byElement && Expr.find["TAG"]( "*", expandContext && context.parentNode || context ),
+				// Use integer dirruns iff this is the outermost matcher
+				dirrunsUnique = (dirruns += contextBackup == null ? 1 : Math.random() || 0.1);
+
+			if ( outermost ) {
+				outermostContext = context !== document && context;
+				cachedruns = matcherCachedRuns;
+			}
+
+			// Add elements passing elementMatchers directly to results
+			// Keep `i` a string if there are no elements so `matchedCount` will be "00" below
+			for ( ; (elem = elems[i]) != null; i++ ) {
+				if ( byElement && elem ) {
+					j = 0;
+					while ( (matcher = elementMatchers[j++]) ) {
+						if ( matcher( elem, context, xml ) ) {
+							results.push( elem );
+							break;
+						}
+					}
+					if ( outermost ) {
+						dirruns = dirrunsUnique;
+						cachedruns = ++matcherCachedRuns;
+					}
+				}
+
+				// Track unmatched elements for set filters
+				if ( bySet ) {
+					// They will have gone through all possible matchers
+					if ( (elem = !matcher && elem) ) {
+						matchedCount--;
+					}
+
+					// Lengthen the array for every element, matched or not
+					if ( seed ) {
+						unmatched.push( elem );
+					}
+				}
+			}
+
+			// Apply set filters to unmatched elements
+			matchedCount += i;
+			if ( bySet && i !== matchedCount ) {
+				j = 0;
+				while ( (matcher = setMatchers[j++]) ) {
+					matcher( unmatched, setMatched, context, xml );
+				}
+
+				if ( seed ) {
+					// Reintegrate element matches to eliminate the need for sorting
+					if ( matchedCount > 0 ) {
+						while ( i-- ) {
+							if ( !(unmatched[i] || setMatched[i]) ) {
+								setMatched[i] = pop.call( results );
+							}
+						}
+					}
+
+					// Discard index placeholder values to get only actual matches
+					setMatched = condense( setMatched );
+				}
+
+				// Add matches to results
+				push.apply( results, setMatched );
+
+				// Seedless set matches succeeding multiple successful matchers stipulate sorting
+				if ( outermost && !seed && setMatched.length > 0 &&
+					( matchedCount + setMatchers.length ) > 1 ) {
+
+					Sizzle.uniqueSort( results );
+				}
+			}
+
+			// Override manipulation of globals by nested matchers
+			if ( outermost ) {
+				dirruns = dirrunsUnique;
+				outermostContext = contextBackup;
+			}
+
+			return unmatched;
+		};
+
+	return bySet ?
+		markFunction( superMatcher ) :
+		superMatcher;
+}
+
+compile = Sizzle.compile = function( selector, group /* Internal Use Only */ ) {
+	var i,
+		setMatchers = [],
+		elementMatchers = [],
+		cached = compilerCache[ selector + " " ];
+
+	if ( !cached ) {
+		// Generate a function of recursive functions that can be used to check each element
+		if ( !group ) {
+			group = tokenize( selector );
+		}
+		i = group.length;
+		while ( i-- ) {
+			cached = matcherFromTokens( group[i] );
+			if ( cached[ expando ] ) {
+				setMatchers.push( cached );
+			} else {
+				elementMatchers.push( cached );
+			}
+		}
+
+		// Cache the compiled function
+		cached = compilerCache( selector, matcherFromGroupMatchers( elementMatchers, setMatchers ) );
+	}
+	return cached;
+};
+
+function multipleContexts( selector, contexts, results ) {
+	var i = 0,
+		len = contexts.length;
+	for ( ; i < len; i++ ) {
+		Sizzle( selector, contexts[i], results );
+	}
+	return results;
+}
+
+function select( selector, context, results, seed ) {
+	var i, tokens, token, type, find,
+		match = tokenize( selector );
+
+	if ( !seed ) {
+		// Try to minimize operations if there is only one group
+		if ( match.length === 1 ) {
+
+			// Take a shortcut and set the context if the root selector is an ID
+			tokens = match[0] = match[0].slice( 0 );
+			if ( tokens.length > 2 && (token = tokens[0]).type === "ID" &&
+					support.getById && context.nodeType === 9 && documentIsHTML &&
+					Expr.relative[ tokens[1].type ] ) {
+
+				context = ( Expr.find["ID"]( token.matches[0].replace(runescape, funescape), context ) || [] )[0];
+				if ( !context ) {
+					return results;
+				}
+				selector = selector.slice( tokens.shift().value.length );
+			}
+
+			// Fetch a seed set for right-to-left matching
+			i = matchExpr["needsContext"].test( selector ) ? 0 : tokens.length;
+			while ( i-- ) {
+				token = tokens[i];
+
+				// Abort if we hit a combinator
+				if ( Expr.relative[ (type = token.type) ] ) {
+					break;
+				}
+				if ( (find = Expr.find[ type ]) ) {
+					// Search, expanding context for leading sibling combinators
+					if ( (seed = find(
+						token.matches[0].replace( runescape, funescape ),
+						rsibling.test( tokens[0].type ) && context.parentNode || context
+					)) ) {
+
+						// If seed is empty or no tokens remain, we can return early
+						tokens.splice( i, 1 );
+						selector = seed.length && toSelector( tokens );
+						if ( !selector ) {
+							push.apply( results, seed );
+							return results;
+						}
+
+						break;
+					}
+				}
+			}
+		}
+	}
+
+	// Compile and execute a filtering function
+	// Provide `match` to avoid retokenization if we modified the selector above
+	compile( selector, match )(
+		seed,
+		context,
+		!documentIsHTML,
+		results,
+		rsibling.test( selector )
+	);
+	return results;
+}
+
+// Deprecated
+Expr.pseudos["nth"] = Expr.pseudos["eq"];
+
+// Easy API for creating new setFilters
+function setFilters() {}
+setFilters.prototype = Expr.filters = Expr.pseudos;
+Expr.setFilters = new setFilters();
+
+// One-time assignments
+
+// Sort stability
+support.sortStable = expando.split("").sort( sortOrder ).join("") === expando;
+
+// Initialize against the default document
+setDocument();
+
+// Support: Chrome<<14
+// Always assume duplicates if they aren't passed to the comparison function
+[0, 0].sort( sortOrder );
+support.detectDuplicates = hasDuplicate;
+
+jQuery.find = Sizzle;
+jQuery.expr = Sizzle.selectors;
+jQuery.expr[":"] = jQuery.expr.pseudos;
+jQuery.unique = Sizzle.uniqueSort;
+jQuery.text = Sizzle.getText;
+jQuery.isXMLDoc = Sizzle.isXML;
+jQuery.contains = Sizzle.contains;
+
+
+})( window );
+// String to Object options format cache
+var optionsCache = {};
+
+// Convert String-formatted options into Object-formatted ones and store in cache
+function createOptions( options ) {
+	var object = optionsCache[ options ] = {};
+	jQuery.each( options.match( core_rnotwhite ) || [], function( _, flag ) {
+		object[ flag ] = true;
+	});
+	return object;
+}
+
+/*
+ * Create a callback list using the following parameters:
+ *
+ *	options: an optional list of space-separated options that will change how
+ *			the callback list behaves or a more traditional option object
+ *
+ * By default a callback list will act like an event callback list and can be
+ * "fired" multiple times.
+ *
+ * Possible options:
+ *
+ *	once:			will ensure the callback list can only be fired once (like a Deferred)
+ *
+ *	memory:			will keep track of previous values and will call any callback added
+ *					after the list has been fired right away with the latest "memorized"
+ *					values (like a Deferred)
+ *
+ *	unique:			will ensure a callback can only be added once (no duplicate in the list)
+ *
+ *	stopOnFalse:	interrupt callings when a callback returns false
+ *
+ */
+jQuery.Callbacks = function( options ) {
+
+	// Convert options from String-formatted to Object-formatted if needed
+	// (we check in cache first)
+	options = typeof options === "string" ?
+		( optionsCache[ options ] || createOptions( options ) ) :
+		jQuery.extend( {}, options );
+
+	var // Flag to know if list is currently firing
+		firing,
+		// Last fire value (for non-forgettable lists)
+		memory,
+		// Flag to know if list was already fired
+		fired,
+		// End of the loop when firing
+		firingLength,
+		// Index of currently firing callback (modified by remove if needed)
+		firingIndex,
+		// First callback to fire (used internally by add and fireWith)
+		firingStart,
+		// Actual callback list
+		list = [],
+		// Stack of fire calls for repeatable lists
+		stack = !options.once && [],
+		// Fire callbacks
+		fire = function( data ) {
+			memory = options.memory && data;
+			fired = true;
+			firingIndex = firingStart || 0;
+			firingStart = 0;
+			firingLength = list.length;
+			firing = true;
+			for ( ; list && firingIndex < firingLength; firingIndex++ ) {
+				if ( list[ firingIndex ].apply( data[ 0 ], data[ 1 ] ) === false && options.stopOnFalse ) {
+					memory = false; // To prevent further calls using add
+					break;
+				}
+			}
+			firing = false;
+			if ( list ) {
+				if ( stack ) {
+					if ( stack.length ) {
+						fire( stack.shift() );
+					}
+				} else if ( memory ) {
+					list = [];
+				} else {
+					self.disable();
+				}
+			}
+		},
+		// Actual Callbacks object
+		self = {
+			// Add a callback or a collection of callbacks to the list
+			add: function() {
+				if ( list ) {
+					// First, we save the current length
+					var start = list.length;
+					(function add( args ) {
+						jQuery.each( args, function( _, arg ) {
+							var type = jQuery.type( arg );
+							if ( type === "function" ) {
+								if ( !options.unique || !self.has( arg ) ) {
+									list.push( arg );
+								}
+							} else if ( arg && arg.length && type !== "string" ) {
+								// Inspect recursively
+								add( arg );
+							}
+						});
+					})( arguments );
+					// Do we need to add the callbacks to the
+					// current firing batch?
+					if ( firing ) {
+						firingLength = list.length;
+					// With memory, if we're not firing then
+					// we should call right away
+					} else if ( memory ) {
+						firingStart = start;
+						fire( memory );
+					}
+				}
+				return this;
+			},
+			// Remove a callback from the list
+			remove: function() {
+				if ( list ) {
+					jQuery.each( arguments, function( _, arg ) {
+						var index;
+						while( ( index = jQuery.inArray( arg, list, index ) ) > -1 ) {
+							list.splice( index, 1 );
+							// Handle firing indexes
+							if ( firing ) {
+								if ( index <= firingLength ) {
+									firingLength--;
+								}
+								if ( index <= firingIndex ) {
+									firingIndex--;
+								}
+							}
+						}
+					});
+				}
+				return this;
+			},
+			// Check if a given callback is in the list.
+			// If no argument is given, return whether or not list has callbacks attached.
+			has: function( fn ) {
+				return fn ? jQuery.inArray( fn, list ) > -1 : !!( list && list.length );
+			},
+			// Remove all callbacks from the list
+			empty: function() {
+				list = [];
+				firingLength = 0;
+				return this;
+			},
+			// Have the list do nothing anymore
+			disable: function() {
+				list = stack = memory = undefined;
+				return this;
+			},
+			// Is it disabled?
+			disabled: function() {
+				return !list;
+			},
+			// Lock the list in its current state
+			lock: function() {
+				stack = undefined;
+				if ( !memory ) {
+					self.disable();
+				}
+				return this;
+			},
+			// Is it locked?
+			locked: function() {
+				return !stack;
+			},
+			// Call all callbacks with the given context and arguments
+			fireWith: function( context, args ) {
+				args = args || [];
+				args = [ context, args.slice ? args.slice() : args ];
+				if ( list && ( !fired || stack ) ) {
+					if ( firing ) {
+						stack.push( args );
+					} else {
+						fire( args );
+					}
+				}
+				return this;
+			},
+			// Call all the callbacks with the given arguments
+			fire: function() {
+				self.fireWith( this, arguments );
+				return this;
+			},
+			// To know if the callbacks have already been called at least once
+			fired: function() {
+				return !!fired;
+			}
+		};
+
+	return self;
+};
+jQuery.extend({
+
+	Deferred: function( func ) {
+		var tuples = [
+				// action, add listener, listener list, final state
+				[ "resolve", "done", jQuery.Callbacks("once memory"), "resolved" ],
+				[ "reject", "fail", jQuery.Callbacks("once memory"), "rejected" ],
+				[ "notify", "progress", jQuery.Callbacks("memory") ]
+			],
+			state = "pending",
+			promise = {
+				state: function() {
+					return state;
+				},
+				always: function() {
+					deferred.done( arguments ).fail( arguments );
+					return this;
+				},
+				then: function( /* fnDone, fnFail, fnProgress */ ) {
+					var fns = arguments;
+					return jQuery.Deferred(function( newDefer ) {
+						jQuery.each( tuples, function( i, tuple ) {
+							var action = tuple[ 0 ],
+								fn = jQuery.isFunction( fns[ i ] ) && fns[ i ];
+							// deferred[ done | fail | progress ] for forwarding actions to newDefer
+							deferred[ tuple[1] ](function() {
+								var returned = fn && fn.apply( this, arguments );
+								if ( returned && jQuery.isFunction( returned.promise ) ) {
+									returned.promise()
+										.done( newDefer.resolve )
+										.fail( newDefer.reject )
+										.progress( newDefer.notify );
+								} else {
+									newDefer[ action + "With" ]( this === promise ? newDefer.promise() : this, fn ? [ returned ] : arguments );
+								}
+							});
+						});
+						fns = null;
+					}).promise();
+				},
+				// Get a promise for this deferred
+				// If obj is provided, the promise aspect is added to the object
+				promise: function( obj ) {
+					return obj != null ? jQuery.extend( obj, promise ) : promise;
+				}
+			},
+			deferred = {};
+
+		// Keep pipe for back-compat
+		promise.pipe = promise.then;
+
+		// Add list-specific methods
+		jQuery.each( tuples, function( i, tuple ) {
+			var list = tuple[ 2 ],
+				stateString = tuple[ 3 ];
+
+			// promise[ done | fail | progress ] = list.add
+			promise[ tuple[1] ] = list.add;
+
+			// Handle state
+			if ( stateString ) {
+				list.add(function() {
+					// state = [ resolved | rejected ]
+					state = stateString;
+
+				// [ reject_list | resolve_list ].disable; progress_list.lock
+				}, tuples[ i ^ 1 ][ 2 ].disable, tuples[ 2 ][ 2 ].lock );
+			}
+
+			// deferred[ resolve | reject | notify ]
+			deferred[ tuple[0] ] = function() {
+				deferred[ tuple[0] + "With" ]( this === deferred ? promise : this, arguments );
+				return this;
+			};
+			deferred[ tuple[0] + "With" ] = list.fireWith;
+		});
+
+		// Make the deferred a promise
+		promise.promise( deferred );
+
+		// Call given func if any
+		if ( func ) {
+			func.call( deferred, deferred );
+		}
+
+		// All done!
+		return deferred;
+	},
+
+	// Deferred helper
+	when: function( subordinate /* , ..., subordinateN */ ) {
+		var i = 0,
+			resolveValues = core_slice.call( arguments ),
+			length = resolveValues.length,
+
+			// the count of uncompleted subordinates
+			remaining = length !== 1 || ( subordinate && jQuery.isFunction( subordinate.promise ) ) ? length : 0,
+
+			// the master Deferred. If resolveValues consist of only a single Deferred, just use that.
+			deferred = remaining === 1 ? subordinate : jQuery.Deferred(),
+
+			// Update function for both resolve and progress values
+			updateFunc = function( i, contexts, values ) {
+				return function( value ) {
+					contexts[ i ] = this;
+					values[ i ] = arguments.length > 1 ? core_slice.call( arguments ) : value;
+					if( values === progressValues ) {
+						deferred.notifyWith( contexts, values );
+					} else if ( !( --remaining ) ) {
+						deferred.resolveWith( contexts, values );
+					}
+				};
+			},
+
+			progressValues, progressContexts, resolveContexts;
+
+		// add listeners to Deferred subordinates; treat others as resolved
+		if ( length > 1 ) {
+			progressValues = new Array( length );
+			progressContexts = new Array( length );
+			resolveContexts = new Array( length );
+			for ( ; i < length; i++ ) {
+				if ( resolveValues[ i ] && jQuery.isFunction( resolveValues[ i ].promise ) ) {
+					resolveValues[ i ].promise()
+						.done( updateFunc( i, resolveContexts, resolveValues ) )
+						.fail( deferred.reject )
+						.progress( updateFunc( i, progressContexts, progressValues ) );
+				} else {
+					--remaining;
+				}
+			}
+		}
+
+		// if we're not waiting on anything, resolve the master
+		if ( !remaining ) {
+			deferred.resolveWith( resolveContexts, resolveValues );
+		}
+
+		return deferred.promise();
+	}
+});
+jQuery.support = (function( support ) {
+
+	var all, a, input, select, fragment, opt, eventName, isSupported, i,
+		div = document.createElement("div");
+
+	// Setup
+	div.setAttribute( "className", "t" );
+	div.innerHTML = "  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>";
+
+	// Finish early in limited (non-browser) environments
+	all = div.getElementsByTagName("*") || [];
+	a = div.getElementsByTagName("a")[ 0 ];
+	if ( !a || !a.style || !all.length ) {
+		return support;
+	}
+
+	// First batch of tests
+	select = document.createElement("select");
+	opt = select.appendChild( document.createElement("option") );
+	input = div.getElementsByTagName("input")[ 0 ];
+
+	a.style.cssText = "top:1px;float:left;opacity:.5";
+
+	// Test setAttribute on camelCase class. If it works, we need attrFixes when doing get/setAttribute (ie6/7)
+	support.getSetAttribute = div.className !== "t";
+
+	// IE strips leading whitespace when .innerHTML is used
+	support.leadingWhitespace = div.firstChild.nodeType === 3;
+
+	// Make sure that tbody elements aren't automatically inserted
+	// IE will insert them into empty tables
+	support.tbody = !div.getElementsByTagName("tbody").length;
+
+	// Make sure that link elements get serialized correctly by innerHTML
+	// This requires a wrapper element in IE
+	support.htmlSerialize = !!div.getElementsByTagName("link").length;
+
+	// Get the style information from getAttribute
+	// (IE uses .cssText instead)
+	support.style = /top/.test( a.getAttribute("style") );
+
+	// Make sure that URLs aren't manipulated
+	// (IE normalizes it by default)
+	support.hrefNormalized = a.getAttribute("href") === "/a";
+
+	// Make sure that element opacity exists
+	// (IE uses filter instead)
+	// Use a regex to work around a WebKit issue. See #5145
+	support.opacity = /^0.5/.test( a.style.opacity );
+
+	// Verify style float existence
+	// (IE uses styleFloat instead of cssFloat)
+	support.cssFloat = !!a.style.cssFloat;
+
+	// Check the default checkbox/radio value ("" on WebKit; "on" elsewhere)
+	support.checkOn = !!input.value;
+
+	// Make sure that a selected-by-default option has a working selected property.
+	// (WebKit defaults to false instead of true, IE too, if it's in an optgroup)
+	support.optSelected = opt.selected;
+
+	// Tests for enctype support on a form (#6743)
+	support.enctype = !!document.createElement("form").enctype;
+
+	// Makes sure cloning an html5 element does not cause problems
+	// Where outerHTML is undefined, this still works
+	support.html5Clone = document.createElement("nav").cloneNode( true ).outerHTML !== "<:nav></:nav>";
+
+	// Will be defined later
+	support.inlineBlockNeedsLayout = false;
+	support.shrinkWrapBlocks = false;
+	support.pixelPosition = false;
+	support.deleteExpando = true;
+	support.noCloneEvent = true;
+	support.reliableMarginRight = true;
+	support.boxSizingReliable = true;
+
+	// Make sure checked status is properly cloned
+	input.checked = true;
+	support.noCloneChecked = input.cloneNode( true ).checked;
+
+	// Make sure that the options inside disabled selects aren't marked as disabled
+	// (WebKit marks them as disabled)
+	select.disabled = true;
+	support.optDisabled = !opt.disabled;
+
+	// Support: IE<9
+	try {
+		delete div.test;
+	} catch( e ) {
+		support.deleteExpando = false;
+	}
+
+	// Check if we can trust getAttribute("value")
+	input = document.createElement("input");
+	input.setAttribute( "value", "" );
+	support.input = input.getAttribute( "value" ) === "";
+
+	// Check if an input maintains its value after becoming a radio
+	input.value = "t";
+	input.setAttribute( "type", "radio" );
+	support.radioValue = input.value === "t";
+
+	// #11217 - WebKit loses check when the name is after the checked attribute
+	input.setAttribute( "checked", "t" );
+	input.setAttribute( "name", "t" );
+
+	fragment = document.createDocumentFragment();
+	fragment.appendChild( input );
+
+	// Check if a disconnected checkbox will retain its checked
+	// value of true after appended to the DOM (IE6/7)
+	support.appendChecked = input.checked;
+
+	// WebKit doesn't clone checked state correctly in fragments
+	support.checkClone = fragment.cloneNode( true ).cloneNode( true ).lastChild.checked;
+
+	// Support: IE<9
+	// Opera does not clone events (and typeof div.attachEvent === undefined).
+	// IE9-10 clones events bound via attachEvent, but they don't trigger with .click()
+	if ( div.attachEvent ) {
+		div.attachEvent( "onclick", function() {
+			support.noCloneEvent = false;
+		});
+
+		div.cloneNode( true ).click();
+	}
+
+	// Support: IE<9 (lack submit/change bubble), Firefox 17+ (lack focusin event)
+	// Beware of CSP restrictions (https://developer.mozilla.org/en/Security/CSP)
+	for ( i in { submit: true, change: true, focusin: true }) {
+		div.setAttribute( eventName = "on" + i, "t" );
+
+		support[ i + "Bubbles" ] = eventName in window || div.attributes[ eventName ].expando === false;
+	}
+
+	div.style.backgroundClip = "content-box";
+	div.cloneNode( true ).style.backgroundClip = "";
+	support.clearCloneStyle = div.style.backgroundClip === "content-box";
+
+	// Support: IE<9
+	// Iteration over object's inherited properties before its own.
+	for ( i in jQuery( support ) ) {
+		break;
+	}
+	support.ownLast = i !== "0";
+
+	// Run tests that need a body at doc ready
+	jQuery(function() {
+		var container, marginDiv, tds,
+			divReset = "padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;",
+			body = document.getElementsByTagName("body")[0];
+
+		if ( !body ) {
+			// Return for frameset docs that don't have a body
+			return;
+		}
+
+		container = document.createElement("div");
+		container.style.cssText = "border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px";
+
+		body.appendChild( container ).appendChild( div );
+
+		// Support: IE8
+		// Check if table cells still have offsetWidth/Height when they are set
+		// to display:none and there are still other visible table cells in a
+		// table row; if so, offsetWidth/Height are not reliable for use when
+		// determining if an element has been hidden directly using
+		// display:none (it is still safe to use offsets if a parent element is
+		// hidden; don safety goggles and see bug #4512 for more information).
+		div.innerHTML = "<table><tr><td></td><td>t</td></tr></table>";
+		tds = div.getElementsByTagName("td");
+		tds[ 0 ].style.cssText = "padding:0;margin:0;border:0;display:none";
+		isSupported = ( tds[ 0 ].offsetHeight === 0 );
+
+		tds[ 0 ].style.display = "";
+		tds[ 1 ].style.display = "none";
+
+		// Support: IE8
+		// Check if empty table cells still have offsetWidth/Height
+		support.reliableHiddenOffsets = isSupported && ( tds[ 0 ].offsetHeight === 0 );
+
+		// Check box-sizing and margin behavior.
+		div.innerHTML = "";
+		div.style.cssText = "box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;";
+
+		// Workaround failing boxSizing test due to offsetWidth returning wrong value
+		// with some non-1 values of body zoom, ticket #13543
+		jQuery.swap( body, body.style.zoom != null ? { zoom: 1 } : {}, function() {
+			support.boxSizing = div.offsetWidth === 4;
+		});
+
+		// Use window.getComputedStyle because jsdom on node.js will break without it.
+		if ( window.getComputedStyle ) {
+			support.pixelPosition = ( window.getComputedStyle( div, null ) || {} ).top !== "1%";
+			support.boxSizingReliable = ( window.getComputedStyle( div, null ) || { width: "4px" } ).width === "4px";
+
+			// Check if div with explicit width and no margin-right incorrectly
+			// gets computed margin-right based on width of container. (#3333)
+			// Fails in WebKit before Feb 2011 nightlies
+			// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
+			marginDiv = div.appendChild( document.createElement("div") );
+			marginDiv.style.cssText = div.style.cssText = divReset;
+			marginDiv.style.marginRight = marginDiv.style.width = "0";
+			div.style.width = "1px";
+
+			support.reliableMarginRight =
+				!parseFloat( ( window.getComputedStyle( marginDiv, null ) || {} ).marginRight );
+		}
+
+		if ( typeof div.style.zoom !== core_strundefined ) {
+			// Support: IE<8
+			// Check if natively block-level elements act like inline-block
+			// elements when setting their display to 'inline' and giving
+			// them layout
+			div.innerHTML = "";
+			div.style.cssText = divReset + "width:1px;padding:1px;display:inline;zoom:1";
+			support.inlineBlockNeedsLayout = ( div.offsetWidth === 3 );
+
+			// Support: IE6
+			// Check if elements with layout shrink-wrap their children
+			div.style.display = "block";
+			div.innerHTML = "<div></div>";
+			div.firstChild.style.width = "5px";
+			support.shrinkWrapBlocks = ( div.offsetWidth !== 3 );
+
+			if ( support.inlineBlockNeedsLayout ) {
+				// Prevent IE 6 from affecting layout for positioned elements #11048
+				// Prevent IE from shrinking the body in IE 7 mode #12869
+				// Support: IE<8
+				body.style.zoom = 1;
+			}
+		}
+
+		body.removeChild( container );
+
+		// Null elements to avoid leaks in IE
+		container = div = tds = marginDiv = null;
+	});
+
+	// Null elements to avoid leaks in IE
+	all = select = fragment = opt = a = input = null;
+
+	return support;
+})({});
+
+var rbrace = /(?:\{[\s\S]*\}|\[[\s\S]*\])$/,
+	rmultiDash = /([A-Z])/g;
+
+function internalData( elem, name, data, pvt /* Internal Use Only */ ){
+	if ( !jQuery.acceptData( elem ) ) {
+		return;
+	}
+
+	var ret, thisCache,
+		internalKey = jQuery.expando,
+
+		// We have to handle DOM nodes and JS objects differently because IE6-7
+		// can't GC object references properly across the DOM-JS boundary
+		isNode = elem.nodeType,
+
+		// Only DOM nodes need the global jQuery cache; JS object data is
+		// attached directly to the object so GC can occur automatically
+		cache = isNode ? jQuery.cache : elem,
+
+		// Only defining an ID for JS objects if its cache already exists allows
+		// the code to shortcut on the same path as a DOM node with no cache
+		id = isNode ? elem[ internalKey ] : elem[ internalKey ] && internalKey;
+
+	// Avoid doing any more work than we need to when trying to get data on an
+	// object that has no data at all
+	if ( (!id || !cache[id] || (!pvt && !cache[id].data)) && data === undefined && typeof name === "string" ) {
+		return;
+	}
+
+	if ( !id ) {
+		// Only DOM nodes need a new unique ID for each element since their data
+		// ends up in the global cache
+		if ( isNode ) {
+			id = elem[ internalKey ] = core_deletedIds.pop() || jQuery.guid++;
+		} else {
+			id = internalKey;
+		}
+	}
+
+	if ( !cache[ id ] ) {
+		// Avoid exposing jQuery metadata on plain JS objects when the object
+		// is serialized using JSON.stringify
+		cache[ id ] = isNode ? {} : { toJSON: jQuery.noop };
+	}
+
+	// An object can be passed to jQuery.data instead of a key/value pair; this gets
+	// shallow copied over onto the existing cache
+	if ( typeof name === "object" || typeof name === "function" ) {
+		if ( pvt ) {
+			cache[ id ] = jQuery.extend( cache[ id ], name );
+		} else {
+			cache[ id ].data = jQuery.extend( cache[ id ].data, name );
+		}
+	}
+
+	thisCache = cache[ id ];
+
+	// jQuery data() is stored in a separate object inside the object's internal data
+	// cache in order to avoid key collisions between internal data and user-defined
+	// data.
+	if ( !pvt ) {
+		if ( !thisCache.data ) {
+			thisCache.data = {};
+		}
+
+		thisCache = thisCache.data;
+	}
+
+	if ( data !== undefined ) {
+		thisCache[ jQuery.camelCase( name ) ] = data;
+	}
+
+	// Check for both converted-to-camel and non-converted data property names
+	// If a data property was specified
+	if ( typeof name === "string" ) {
+
+		// First Try to find as-is property data
+		ret = thisCache[ name ];
+
+		// Test for null|undefined property data
+		if ( ret == null ) {
+
+			// Try to find the camelCased property
+			ret = thisCache[ jQuery.camelCase( name ) ];
+		}
+	} else {
+		ret = thisCache;
+	}
+
+	return ret;
+}
+
+function internalRemoveData( elem, name, pvt ) {
+	if ( !jQuery.acceptData( elem ) ) {
+		return;
+	}
+
+	var thisCache, i,
+		isNode = elem.nodeType,
+
+		// See jQuery.data for more information
+		cache = isNode ? jQuery.cache : elem,
+		id = isNode ? elem[ jQuery.expando ] : jQuery.expando;
+
+	// If there is already no cache entry for this object, there is no
+	// purpose in continuing
+	if ( !cache[ id ] ) {
+		return;
+	}
+
+	if ( name ) {
+
+		thisCache = pvt ? cache[ id ] : cache[ id ].data;
+
+		if ( thisCache ) {
+
+			// Support array or space separated string names for data keys
+			if ( !jQuery.isArray( name ) ) {
+
+				// try the string as a key before any manipulation
+				if ( name in thisCache ) {
+					name = [ name ];
+				} else {
+
+					// split the camel cased version by spaces unless a key with the spaces exists
+					name = jQuery.camelCase( name );
+					if ( name in thisCache ) {
+						name = [ name ];
+					} else {
+						name = name.split(" ");
+					}
+				}
+			} else {
+				// If "name" is an array of keys...
+				// When data is initially created, via ("key", "val") signature,
+				// keys will be converted to camelCase.
+				// Since there is no way to tell _how_ a key was added, remove
+				// both plain key and camelCase key. #12786
+				// This will only penalize the array argument path.
+				name = name.concat( jQuery.map( name, jQuery.camelCase ) );
+			}
+
+			i = name.length;
+			while ( i-- ) {
+				delete thisCache[ name[i] ];
+			}
+
+			// If there is no data left in the cache, we want to continue
+			// and let the cache object itself get destroyed
+			if ( pvt ? !isEmptyDataObject(thisCache) : !jQuery.isEmptyObject(thisCache) ) {
+				return;
+			}
+		}
+	}
+
+	// See jQuery.data for more information
+	if ( !pvt ) {
+		delete cache[ id ].data;
+
+		// Don't destroy the parent cache unless the internal data object
+		// had been the only thing left in it
+		if ( !isEmptyDataObject( cache[ id ] ) ) {
+			return;
+		}
+	}
+
+	// Destroy the cache
+	if ( isNode ) {
+		jQuery.cleanData( [ elem ], true );
+
+	// Use delete when supported for expandos or `cache` is not a window per isWindow (#10080)
+	/* jshint eqeqeq: false */
+	} else if ( jQuery.support.deleteExpando || cache != cache.window ) {
+		/* jshint eqeqeq: true */
+		delete cache[ id ];
+
+	// When all else fails, null
+	} else {
+		cache[ id ] = null;
+	}
+}
+
+jQuery.extend({
+	cache: {},
+
+	// The following elements throw uncatchable exceptions if you
+	// attempt to add expando properties to them.
+	noData: {
+		"applet": true,
+		"embed": true,
+		// Ban all objects except for Flash (which handle expandos)
+		"object": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
+	},
+
+	hasData: function( elem ) {
+		elem = elem.nodeType ? jQuery.cache[ elem[jQuery.expando] ] : elem[ jQuery.expando ];
+		return !!elem && !isEmptyDataObject( elem );
+	},
+
+	data: function( elem, name, data ) {
+		return internalData( elem, name, data );
+	},
+
+	removeData: function( elem, name ) {
+		return internalRemoveData( elem, name );
+	},
+
+	// For internal use only.
+	_data: function( elem, name, data ) {
+		return internalData( elem, name, data, true );
+	},
+
+	_removeData: function( elem, name ) {
+		return internalRemoveData( elem, name, true );
+	},
+
+	// A method for determining if a DOM node can handle the data expando
+	acceptData: function( elem ) {
+		// Do not set data on non-element because it will not be cleared (#8335).
+		if ( elem.nodeType && elem.nodeType !== 1 && elem.nodeType !== 9 ) {
+			return false;
+		}
+
+		var noData = elem.nodeName && jQuery.noData[ elem.nodeName.toLowerCase() ];
+
+		// nodes accept data unless otherwise specified; rejection can be conditional
+		return !noData || noData !== true && elem.getAttribute("classid") === noData;
+	}
+});
+
+jQuery.fn.extend({
+	data: function( key, value ) {
+		var attrs, name,
+			data = null,
+			i = 0,
+			elem = this[0];
+
+		// Special expections of .data basically thwart jQuery.access,
+		// so implement the relevant behavior ourselves
+
+		// Gets all values
+		if ( key === undefined ) {
+			if ( this.length ) {
+				data = jQuery.data( elem );
+
+				if ( elem.nodeType === 1 && !jQuery._data( elem, "parsedAttrs" ) ) {
+					attrs = elem.attributes;
+					for ( ; i < attrs.length; i++ ) {
+						name = attrs[i].name;
+
+						if ( name.indexOf("data-") === 0 ) {
+							name = jQuery.camelCase( name.slice(5) );
+
+							dataAttr( elem, name, data[ name ] );
+						}
+					}
+					jQuery._data( elem, "parsedAttrs", true );
+				}
+			}
+
+			return data;
+		}
+
+		// Sets multiple values
+		if ( typeof key === "object" ) {
+			return this.each(function() {
+				jQuery.data( this, key );
+			});
+		}
+
+		return arguments.length > 1 ?
+
+			// Sets one value
+			this.each(function() {
+				jQuery.data( this, key, value );
+			}) :
+
+			// Gets one value
+			// Try to fetch any internally stored data first
+			elem ? dataAttr( elem, key, jQuery.data( elem, key ) ) : null;
+	},
+
+	removeData: function( key ) {
+		return this.each(function() {
+			jQuery.removeData( this, key );
+		});
+	}
+});
+
+function dataAttr( elem, key, data ) {
+	// If nothing was found internally, try to fetch any
+	// data from the HTML5 data-* attribute
+	if ( data === undefined && elem.nodeType === 1 ) {
+
+		var name = "data-" + key.replace( rmultiDash, "-$1" ).toLowerCase();
+
+		data = elem.getAttribute( name );
+
+		if ( typeof data === "string" ) {
+			try {
+				data = data === "true" ? true :
+					data === "false" ? false :
+					data === "null" ? null :
+					// Only convert to a number if it doesn't change the string
+					+data + "" === data ? +data :
+					rbrace.test( data ) ? jQuery.parseJSON( data ) :
+						data;
+			} catch( e ) {}
+
+			// Make sure we set the data so it isn't changed later
+			jQuery.data( elem, key, data );
+
+		} else {
+			data = undefined;
+		}
+	}
+
+	return data;
+}
+
+// checks a cache object for emptiness
+function isEmptyDataObject( obj ) {
+	var name;
+	for ( name in obj ) {
+
+		// if the public data object is empty, the private is still empty
+		if ( name === "data" && jQuery.isEmptyObject( obj[name] ) ) {
+			continue;
+		}
+		if ( name !== "toJSON" ) {
+			return false;
+		}
+	}
+
+	return true;
+}
+jQuery.extend({
+	queue: function( elem, type, data ) {
+		var queue;
+
+		if ( elem ) {
+			type = ( type || "fx" ) + "queue";
+			queue = jQuery._data( elem, type );
+
+			// Speed up dequeue by getting out quickly if this is just a lookup
+			if ( data ) {
+				if ( !queue || jQuery.isArray(data) ) {
+					queue = jQuery._data( elem, type, jQuery.makeArray(data) );
+				} else {
+					queue.push( data );
+				}
+			}
+			return queue || [];
+		}
+	},
+
+	dequeue: function( elem, type ) {
+		type = type || "fx";
+
+		var queue = jQuery.queue( elem, type ),
+			startLength = queue.length,
+			fn = queue.shift(),
+			hooks = jQuery._queueHooks( elem, type ),
+			next = function() {
+				jQuery.dequeue( elem, type );
+			};
+
+		// If the fx queue is dequeued, always remove the progress sentinel
+		if ( fn === "inprogress" ) {
+			fn = queue.shift();
+			startLength--;
+		}
+
+		hooks.cur = fn;
+		if ( fn ) {
+
+			// Add a progress sentinel to prevent the fx queue from being
+			// automatically dequeued
+			if ( type === "fx" ) {
+				queue.unshift( "inprogress" );
+			}
+
+			// clear up the last queue stop function
+			delete hooks.stop;
+			fn.call( elem, next, hooks );
+		}
+
+		if ( !startLength && hooks ) {
+			hooks.empty.fire();
+		}
+	},
+
+	// not intended for public consumption - generates a queueHooks object, or returns the current one
+	_queueHooks: function( elem, type ) {
+		var key = type + "queueHooks";
+		return jQuery._data( elem, key ) || jQuery._data( elem, key, {
+			empty: jQuery.Callbacks("once memory").add(function() {
+				jQuery._removeData( elem, type + "queue" );
+				jQuery._removeData( elem, key );
+			})
+		});
+	}
+});
+
+jQuery.fn.extend({
+	queue: function( type, data ) {
+		var setter = 2;
+
+		if ( typeof type !== "string" ) {
+			data = type;
+			type = "fx";
+			setter--;
+		}
+
+		if ( arguments.length < setter ) {
+			return jQuery.queue( this[0], type );
+		}
+
+		return data === undefined ?
+			this :
+			this.each(function() {
+				var queue = jQuery.queue( this, type, data );
+
+				// ensure a hooks for this queue
+				jQuery._queueHooks( this, type );
+
+				if ( type === "fx" && queue[0] !== "inprogress" ) {
+					jQuery.dequeue( this, type );
+				}
+			});
+	},
+	dequeue: function( type ) {
+		return this.each(function() {
+			jQuery.dequeue( this, type );
+		});
+	},
+	// Based off of the plugin by Clint Helfers, with permission.
+	// http://blindsignals.com/index.php/2009/07/jquery-delay/
+	delay: function( time, type ) {
+		time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time;
+		type = type || "fx";
+
+		return this.queue( type, function( next, hooks ) {
+			var timeout = setTimeout( next, time );
+			hooks.stop = function() {
+				clearTimeout( timeout );
+			};
+		});
+	},
+	clearQueue: function( type ) {
+		return this.queue( type || "fx", [] );
+	},
+	// Get a promise resolved when queues of a certain type
+	// are emptied (fx is the type by default)
+	promise: function( type, obj ) {
+		var tmp,
+			count = 1,
+			defer = jQuery.Deferred(),
+			elements = this,
+			i = this.length,
+			resolve = function() {
+				if ( !( --count ) ) {
+					defer.resolveWith( elements, [ elements ] );
+				}
+			};
+
+		if ( typeof type !== "string" ) {
+			obj = type;
+			type = undefined;
+		}
+		type = type || "fx";
+
+		while( i-- ) {
+			tmp = jQuery._data( elements[ i ], type + "queueHooks" );
+			if ( tmp && tmp.empty ) {
+				count++;
+				tmp.empty.add( resolve );
+			}
+		}
+		resolve();
+		return defer.promise( obj );
+	}
+});
+var nodeHook, boolHook,
+	rclass = /[\t\r\n\f]/g,
+	rreturn = /\r/g,
+	rfocusable = /^(?:input|select|textarea|button|object)$/i,
+	rclickable = /^(?:a|area)$/i,
+	ruseDefault = /^(?:checked|selected)$/i,
+	getSetAttribute = jQuery.support.getSetAttribute,
+	getSetInput = jQuery.support.input;
+
+jQuery.fn.extend({
+	attr: function( name, value ) {
+		return jQuery.access( this, jQuery.attr, name, value, arguments.length > 1 );
+	},
+
+	removeAttr: function( name ) {
+		return this.each(function() {
+			jQuery.removeAttr( this, name );
+		});
+	},
+
+	prop: function( name, value ) {
+		return jQuery.access( this, jQuery.prop, name, value, arguments.length > 1 );
+	},
+
+	removeProp: function( name ) {
+		name = jQuery.propFix[ name ] || name;
+		return this.each(function() {
+			// try/catch handles cases where IE balks (such as removing a property on window)
+			try {
+				this[ name ] = undefined;
+				delete this[ name ];
+			} catch( e ) {}
+		});
+	},
+
+	addClass: function( value ) {
+		var classes, elem, cur, clazz, j,
+			i = 0,
+			len = this.length,
+			proceed = typeof value === "string" && value;
+
+		if ( jQuery.isFunction( value ) ) {
+			return this.each(function( j ) {
+				jQuery( this ).addClass( value.call( this, j, this.className ) );
+			});
+		}
+
+		if ( proceed ) {
+			// The disjunction here is for better compressibility (see removeClass)
+			classes = ( value || "" ).match( core_rnotwhite ) || [];
+
+			for ( ; i < len; i++ ) {
+				elem = this[ i ];
+				cur = elem.nodeType === 1 && ( elem.className ?
+					( " " + elem.className + " " ).replace( rclass, " " ) :
+					" "
+				);
+
+				if ( cur ) {
+					j = 0;
+					while ( (clazz = classes[j++]) ) {
+						if ( cur.indexOf( " " + clazz + " " ) < 0 ) {
+							cur += clazz + " ";
+						}
+					}
+					elem.className = jQuery.trim( cur );
+
+				}
+			}
+		}
+
+		return this;
+	},
+
+	removeClass: function( value ) {
+		var classes, elem, cur, clazz, j,
+			i = 0,
+			len = this.length,
+			proceed = arguments.length === 0 || typeof value === "string" && value;
+
+		if ( jQuery.isFunction( value ) ) {
+			return this.each(function( j ) {
+				jQuery( this ).removeClass( value.call( this, j, this.className ) );
+			});
+		}
+		if ( proceed ) {
+			classes = ( value || "" ).match( core_rnotwhite ) || [];
+
+			for ( ; i < len; i++ ) {
+				elem = this[ i ];
+				// This expression is here for better compressibility (see addClass)
+				cur = elem.nodeType === 1 && ( elem.className ?
+					( " " + elem.className + " " ).replace( rclass, " " ) :
+					""
+				);
+
+				if ( cur ) {
+					j = 0;
+					while ( (clazz = classes[j++]) ) {
+						// Remove *all* instances
+						while ( cur.indexOf( " " + clazz + " " ) >= 0 ) {
+							cur = cur.replace( " " + clazz + " ", " " );
+						}
+					}
+					elem.className = value ? jQuery.trim( cur ) : "";
+				}
+			}
+		}
+
+		return this;
+	},
+
+	toggleClass: function( value, stateVal ) {
+		var type = typeof value,
+			isBool = typeof stateVal === "boolean";
+
+		if ( jQuery.isFunction( value ) ) {
+			return this.each(function( i ) {
+				jQuery( this ).toggleClass( value.call(this, i, this.className, stateVal), stateVal );
+			});
+		}
+
+		return this.each(function() {
+			if ( type === "string" ) {
+				// toggle individual class names
+				var className,
+					i = 0,
+					self = jQuery( this ),
+					state = stateVal,
+					classNames = value.match( core_rnotwhite ) || [];
+
+				while ( (className = classNames[ i++ ]) ) {
+					// check each className given, space separated list
+					state = isBool ? state : !self.hasClass( className );
+					self[ state ? "addClass" : "removeClass" ]( className );
+				}
+
+			// Toggle whole class name
+			} else if ( type === core_strundefined || type === "boolean" ) {
+				if ( this.className ) {
+					// store className if set
+					jQuery._data( this, "__className__", this.className );
+				}
+
+				// If the element has a class name or if we're passed "false",
+				// then remove the whole classname (if there was one, the above saved it).
+				// Otherwise bring back whatever was previously saved (if anything),
+				// falling back to the empty string if nothing was stored.
+				this.className = this.className || value === false ? "" : jQuery._data( this, "__className__" ) || "";
+			}
+		});
+	},
+
+	hasClass: function( selector ) {
+		var className = " " + selector + " ",
+			i = 0,
+			l = this.length;
+		for ( ; i < l; i++ ) {
+			if ( this[i].nodeType === 1 && (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) >= 0 ) {
+				return true;
+			}
+		}
+
+		return false;
+	},
+
+	val: function( value ) {
+		var ret, hooks, isFunction,
+			elem = this[0];
+
+		if ( !arguments.length ) {
+			if ( elem ) {
+				hooks = jQuery.valHooks[ elem.type ] || jQuery.valHooks[ elem.nodeName.toLowerCase() ];
+
+				if ( hooks && "get" in hooks && (ret = hooks.get( elem, "value" )) !== undefined ) {
+					return ret;
+				}
+
+				ret = elem.value;
+
+				return typeof ret === "string" ?
+					// handle most common string cases
+					ret.replace(rreturn, "") :
+					// handle cases where value is null/undef or number
+					ret == null ? "" : ret;
+			}
+
+			return;
+		}
+
+		isFunction = jQuery.isFunction( value );
+
+		return this.each(function( i ) {
+			var val;
+
+			if ( this.nodeType !== 1 ) {
+				return;
+			}
+
+			if ( isFunction ) {
+				val = value.call( this, i, jQuery( this ).val() );
+			} else {
+				val = value;
+			}
+
+			// Treat null/undefined as ""; convert numbers to string
+			if ( val == null ) {
+				val = "";
+			} else if ( typeof val === "number" ) {
+				val += "";
+			} else if ( jQuery.isArray( val ) ) {
+				val = jQuery.map(val, function ( value ) {
+					return value == null ? "" : value + "";
+				});
+			}
+
+			hooks = jQuery.valHooks[ this.type ] || jQuery.valHooks[ this.nodeName.toLowerCase() ];
+
+			// If set returns undefined, fall back to normal setting
+			if ( !hooks || !("set" in hooks) || hooks.set( this, val, "value" ) === undefined ) {
+				this.value = val;
+			}
+		});
+	}
+});
+
+jQuery.extend({
+	valHooks: {
+		option: {
+			get: function( elem ) {
+				// Use proper attribute retrieval(#6932, #12072)
+				var val = jQuery.find.attr( elem, "value" );
+				return val != null ?
+					val :
+					elem.text;
+			}
+		},
+		select: {
+			get: function( elem ) {
+				var value, option,
+					options = elem.options,
+					index = elem.selectedIndex,
+					one = elem.type === "select-one" || index < 0,
+					values = one ? null : [],
+					max = one ? index + 1 : options.length,
+					i = index < 0 ?
+						max :
+						one ? index : 0;
+
+				// Loop through all the selected options
+				for ( ; i < max; i++ ) {
+					option = options[ i ];
+
+					// oldIE doesn't update selected after form reset (#2551)
+					if ( ( option.selected || i === index ) &&
+							// Don't return options that are disabled or in a disabled optgroup
+							( jQuery.support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null ) &&
+							( !option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" ) ) ) {
+
+						// Get the specific value for the option
+						value = jQuery( option ).val();
+
+						// We don't need an array for one selects
+						if ( one ) {
+							return value;
+						}
+
+						// Multi-Selects return an array
+						values.push( value );
+					}
+				}
+
+				return values;
+			},
+
+			set: function( elem, value ) {
+				var optionSet, option,
+					options = elem.options,
+					values = jQuery.makeArray( value ),
+					i = options.length;
+
+				while ( i-- ) {
+					option = options[ i ];
+					if ( (option.selected = jQuery.inArray( jQuery(option).val(), values ) >= 0) ) {
+						optionSet = true;
+					}
+				}
+
+				// force browsers to behave consistently when non-matching value is set
+				if ( !optionSet ) {
+					elem.selectedIndex = -1;
+				}
+				return values;
+			}
+		}
+	},
+
+	attr: function( elem, name, value ) {
+		var hooks, ret,
+			nType = elem.nodeType;
+
+		// don't get/set attributes on text, comment and attribute nodes
+		if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
+			return;
+		}
+
+		// Fallback to prop when attributes are not supported
+		if ( typeof elem.getAttribute === core_strundefined ) {
+			return jQuery.prop( elem, name, value );
+		}
+
+		// All attributes are lowercase
+		// Grab necessary hook if one is defined
+		if ( nType !== 1 || !jQuery.isXMLDoc( elem ) ) {
+			name = name.toLowerCase();
+			hooks = jQuery.attrHooks[ name ] ||
+				( jQuery.expr.match.bool.test( name ) ? boolHook : nodeHook );
+		}
+
+		if ( value !== undefined ) {
+
+			if ( value === null ) {
+				jQuery.removeAttr( elem, name );
+
+			} else if ( hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ) {
+				return ret;
+
+			} else {
+				elem.setAttribute( name, value + "" );
+				return value;
+			}
+
+		} else if ( hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ) {
+			return ret;
+
+		} else {
+			ret = jQuery.find.attr( elem, name );
+
+			// Non-existent attributes return null, we normalize to undefined
+			return ret == null ?
+				undefined :
+				ret;
+		}
+	},
+
+	removeAttr: function( elem, value ) {
+		var name, propName,
+			i = 0,
+			attrNames = value && value.match( core_rnotwhite );
+
+		if ( attrNames && elem.nodeType === 1 ) {
+			while ( (name = attrNames[i++]) ) {
+				propName = jQuery.propFix[ name ] || name;
+
+				// Boolean attributes get special treatment (#10870)
+				if ( jQuery.expr.match.bool.test( name ) ) {
+					// Set corresponding property to false
+					if ( getSetInput && getSetAttribute || !ruseDefault.test( name ) ) {
+						elem[ propName ] = false;
+					// Support: IE<9
+					// Also clear defaultChecked/defaultSelected (if appropriate)
+					} else {
+						elem[ jQuery.camelCase( "default-" + name ) ] =
+							elem[ propName ] = false;
+					}
+
+				// See #9699 for explanation of this approach (setting first, then removal)
+				} else {
+					jQuery.attr( elem, name, "" );
+				}
+
+				elem.removeAttribute( getSetAttribute ? name : propName );
+			}
+		}
+	},
+
+	attrHooks: {
+		type: {
+			set: function( elem, value ) {
+				if ( !jQuery.support.radioValue && value === "radio" && jQuery.nodeName(elem, "input") ) {
+					// Setting the type on a radio button after the value resets the value in IE6-9
+					// Reset value to default in case type is set after value during creation
+					var val = elem.value;
+					elem.setAttribute( "type", value );
+					if ( val ) {
+						elem.value = val;
+					}
+					return value;
+				}
+			}
+		}
+	},
+
+	propFix: {
+		"for": "htmlFor",
+		"class": "className"
+	},
+
+	prop: function( elem, name, value ) {
+		var ret, hooks, notxml,
+			nType = elem.nodeType;
+
+		// don't get/set properties on text, comment and attribute nodes
+		if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
+			return;
+		}
+
+		notxml = nType !== 1 || !jQuery.isXMLDoc( elem );
+
+		if ( notxml ) {
+			// Fix name and attach hooks
+			name = jQuery.propFix[ name ] || name;
+			hooks = jQuery.propHooks[ name ];
+		}
+
+		if ( value !== undefined ) {
+			return hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ?
+				ret :
+				( elem[ name ] = value );
+
+		} else {
+			return hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ?
+				ret :
+				elem[ name ];
+		}
+	},
+
+	propHooks: {
+		tabIndex: {
+			get: function( elem ) {
+				// elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set
+				// http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
+				// Use proper attribute retrieval(#12072)
+				var tabindex = jQuery.find.attr( elem, "tabindex" );
+
+				return tabindex ?
+					parseInt( tabindex, 10 ) :
+					rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ?
+						0 :
+						-1;
+			}
+		}
+	}
+});
+
+// Hooks for boolean attributes
+boolHook = {
+	set: function( elem, value, name ) {
+		if ( value === false ) {
+			// Remove boolean attributes when set to false
+			jQuery.removeAttr( elem, name );
+		} else if ( getSetInput && getSetAttribute || !ruseDefault.test( name ) ) {
+			// IE<8 needs the *property* name
+			elem.setAttribute( !getSetAttribute && jQuery.propFix[ name ] || name, name );
+
+		// Use defaultChecked and defaultSelected for oldIE
+		} else {
+			elem[ jQuery.camelCase( "default-" + name ) ] = elem[ name ] = true;
+		}
+
+		return name;
+	}
+};
+jQuery.each( jQuery.expr.match.bool.source.match( /\w+/g ), function( i, name ) {
+	var getter = jQuery.expr.attrHandle[ name ] || jQuery.find.attr;
+
+	jQuery.expr.attrHandle[ name ] = getSetInput && getSetAttribute || !ruseDefault.test( name ) ?
+		function( elem, name, isXML ) {
+			var fn = jQuery.expr.attrHandle[ name ],
+				ret = isXML ?
+					undefined :
+					/* jshint eqeqeq: false */
+					(jQuery.expr.attrHandle[ name ] = undefined) !=
+						getter( elem, name, isXML ) ?
+
+						name.toLowerCase() :
+						null;
+			jQuery.expr.attrHandle[ name ] = fn;
+			return ret;
+		} :
+		function( elem, name, isXML ) {
+			return isXML ?
+				undefined :
+				elem[ jQuery.camelCase( "default-" + name ) ] ?
+					name.toLowerCase() :
+					null;
+		};
+});
+
+// fix oldIE attroperties
+if ( !getSetInput || !getSetAttribute ) {
+	jQuery.attrHooks.value = {
+		set: function( elem, value, name ) {
+			if ( jQuery.nodeName( elem, "input" ) ) {
+				// Does not return so that setAttribute is also used
+				elem.defaultValue = value;
+			} else {
+				// Use nodeHook if defined (#1954); otherwise setAttribute is fine
+				return nodeHook && nodeHook.set( elem, value, name );
+			}
+		}
+	};
+}
+
+// IE6/7 do not support getting/setting some attributes with get/setAttribute
+if ( !getSetAttribute ) {
+
+	// Use this for any attribute in IE6/7
+	// This fixes almost every IE6/7 issue
+	nodeHook = {
+		set: function( elem, value, name ) {
+			// Set the existing or create a new attribute node
+			var ret = elem.getAttributeNode( name );
+			if ( !ret ) {
+				elem.setAttributeNode(
+					(ret = elem.ownerDocument.createAttribute( name ))
+				);
+			}
+
+			ret.value = value += "";
+
+			// Break association with cloned elements by also using setAttribute (#9646)
+			return name === "value" || value === elem.getAttribute( name ) ?
+				value :
+				undefined;
+		}
+	};
+	jQuery.expr.attrHandle.id = jQuery.expr.attrHandle.name = jQuery.expr.attrHandle.coords =
+		// Some attributes are constructed with empty-string values when not defined
+		function( elem, name, isXML ) {
+			var ret;
+			return isXML ?
+				undefined :
+				(ret = elem.getAttributeNode( name )) && ret.value !== "" ?
+					ret.value :
+					null;
+		};
+	jQuery.valHooks.button = {
+		get: function( elem, name ) {
+			var ret = elem.getAttributeNode( name );
+			return ret && ret.specified ?
+				ret.value :
+				undefined;
+		},
+		set: nodeHook.set
+	};
+
+	// Set contenteditable to false on removals(#10429)
+	// Setting to empty string throws an error as an invalid value
+	jQuery.attrHooks.contenteditable = {
+		set: function( elem, value, name ) {
+			nodeHook.set( elem, value === "" ? false : value, name );
+		}
+	};
+
+	// Set width and height to auto instead of 0 on empty string( Bug #8150 )
+	// This is for removals
+	jQuery.each([ "width", "height" ], function( i, name ) {
+		jQuery.attrHooks[ name ] = {
+			set: function( elem, value ) {
+				if ( value === "" ) {
+					elem.setAttribute( name, "auto" );
+					return value;
+				}
+			}
+		};
+	});
+}
+
+
+// Some attributes require a special call on IE
+// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
+if ( !jQuery.support.hrefNormalized ) {
+	// href/src property should get the full normalized URL (#10299/#12915)
+	jQuery.each([ "href", "src" ], function( i, name ) {
+		jQuery.propHooks[ name ] = {
+			get: function( elem ) {
+				return elem.getAttribute( name, 4 );
+			}
+		};
+	});
+}
+
+if ( !jQuery.support.style ) {
+	jQuery.attrHooks.style = {
+		get: function( elem ) {
+			// Return undefined in the case of empty string
+			// Note: IE uppercases css property names, but if we were to .toLowerCase()
+			// .cssText, that would destroy case senstitivity in URL's, like in "background"
+			return elem.style.cssText || undefined;
+		},
+		set: function( elem, value ) {
+			return ( elem.style.cssText = value + "" );
+		}
+	};
+}
+
+// Safari mis-reports the default selected property of an option
+// Accessing the parent's selectedIndex property fixes it
+if ( !jQuery.support.optSelected ) {
+	jQuery.propHooks.selected = {
+		get: function( elem ) {
+			var parent = elem.parentNode;
+
+			if ( parent ) {
+				parent.selectedIndex;
+
+				// Make sure that it also works with optgroups, see #5701
+				if ( parent.parentNode ) {
+					parent.parentNode.selectedIndex;
+				}
+			}
+			return null;
+		}
+	};
+}
+
+jQuery.each([
+	"tabIndex",
+	"readOnly",
+	"maxLength",
+	"cellSpacing",
+	"cellPadding",
+	"rowSpan",
+	"colSpan",
+	"useMap",
+	"frameBorder",
+	"contentEditable"
+], function() {
+	jQuery.propFix[ this.toLowerCase() ] = this;
+});
+
+// IE6/7 call enctype encoding
+if ( !jQuery.support.enctype ) {
+	jQuery.propFix.enctype = "encoding";
+}
+
+// Radios and checkboxes getter/setter
+jQuery.each([ "radio", "checkbox" ], function() {
+	jQuery.valHooks[ this ] = {
+		set: function( elem, value ) {
+			if ( jQuery.isArray( value ) ) {
+				return ( elem.checked = jQuery.inArray( jQuery(elem).val(), value ) >= 0 );
+			}
+		}
+	};
+	if ( !jQuery.support.checkOn ) {
+		jQuery.valHooks[ this ].get = function( elem ) {
+			// Support: Webkit
+			// "" is returned instead of "on" if a value isn't specified
+			return elem.getAttribute("value") === null ? "on" : elem.value;
+		};
+	}
+});
+var rformElems = /^(?:input|select|textarea)$/i,
+	rkeyEvent = /^key/,
+	rmouseEvent = /^(?:mouse|contextmenu)|click/,
+	rfocusMorph = /^(?:focusinfocus|focusoutblur)$/,
+	rtypenamespace = /^([^.]*)(?:\.(.+)|)$/;
+
+function returnTrue() {
+	return true;
+}
+
+function returnFalse() {
+	return false;
+}
+
+function safeActiveElement() {
+	try {
+		return document.activeElement;
+	} catch ( err ) { }
+}
+
+/*
+ * Helper functions for managing events -- not part of the public interface.
+ * Props to Dean Edwards' addEvent library for many of the ideas.
+ */
+jQuery.event = {
+
+	global: {},
+
+	add: function( elem, types, handler, data, selector ) {
+		var tmp, events, t, handleObjIn,
+			special, eventHandle, handleObj,
+			handlers, type, namespaces, origType,
+			elemData = jQuery._data( elem );
+
+		// Don't attach events to noData or text/comment nodes (but allow plain objects)
+		if ( !elemData ) {
+			return;
+		}
+
+		// Caller can pass in an object of custom data in lieu of the handler
+		if ( handler.handler ) {
+			handleObjIn = handler;
+			handler = handleObjIn.handler;
+			selector = handleObjIn.selector;
+		}
+
+		// Make sure that the handler has a unique ID, used to find/remove it later
+		if ( !handler.guid ) {
+			handler.guid = jQuery.guid++;
+		}
+
+		// Init the element's event structure and main handler, if this is the first
+		if ( !(events = elemData.events) ) {
+			events = elemData.events = {};
+		}
+		if ( !(eventHandle = elemData.handle) ) {
+			eventHandle = elemData.handle = function( e ) {
+				// Discard the second event of a jQuery.event.trigger() and
+				// when an event is called after a page has unloaded
+				return typeof jQuery !== core_strundefined && (!e || jQuery.event.triggered !== e.type) ?
+					jQuery.event.dispatch.apply( eventHandle.elem, arguments ) :
+					undefined;
+			};
+			// Add elem as a property of the handle fn to prevent a memory leak with IE non-native events
+			eventHandle.elem = elem;
+		}
+
+		// Handle multiple events separated by a space
+		types = ( types || "" ).match( core_rnotwhite ) || [""];
+		t = types.length;
+		while ( t-- ) {
+			tmp = rtypenamespace.exec( types[t] ) || [];
+			type = origType = tmp[1];
+			namespaces = ( tmp[2] || "" ).split( "." ).sort();
+
+			// There *must* be a type, no attaching namespace-only handlers
+			if ( !type ) {
+				continue;
+			}
+
+			// If event changes its type, use the special event handlers for the changed type
+			special = jQuery.event.special[ type ] || {};
+
+			// If selector defined, determine special event api type, otherwise given type
+			type = ( selector ? special.delegateType : special.bindType ) || type;
+
+			// Update special based on newly reset type
+			special = jQuery.event.special[ type ] || {};
+
+			// handleObj is passed to all event handlers
+			handleObj = jQuery.extend({
+				type: type,
+				origType: origType,
+				data: data,
+				handler: handler,
+				guid: handler.guid,
+				selector: selector,
+				needsContext: selector && jQuery.expr.match.needsContext.test( selector ),
+				namespace: namespaces.join(".")
+			}, handleObjIn );
+
+			// Init the event handler queue if we're the first
+			if ( !(handlers = events[ type ]) ) {
+				handlers = events[ type ] = [];
+				handlers.delegateCount = 0;
+
+				// Only use addEventListener/attachEvent if the special events handler returns false
+				if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) {
+					// Bind the global event handler to the element
+					if ( elem.addEventListener ) {
+						elem.addEventListener( type, eventHandle, false );
+
+					} else if ( elem.attachEvent ) {
+						elem.attachEvent( "on" + type, eventHandle );
+					}
+				}
+			}
+
+			if ( special.add ) {
+				special.add.call( elem, handleObj );
+
+				if ( !handleObj.handler.guid ) {
+					handleObj.handler.guid = handler.guid;
+				}
+			}
+
+			// Add to the element's handler list, delegates in front
+			if ( selector ) {
+				handlers.splice( handlers.delegateCount++, 0, handleObj );
+			} else {
+				handlers.push( handleObj );
+			}
+
+			// Keep track of which events have ever been used, for event optimization
+			jQuery.event.global[ type ] = true;
+		}
+
+		// Nullify elem to prevent memory leaks in IE
+		elem = null;
+	},
+
+	// Detach an event or set of events from an element
+	remove: function( elem, types, handler, selector, mappedTypes ) {
+		var j, handleObj, tmp,
+			origCount, t, events,
+			special, handlers, type,
+			namespaces, origType,
+			elemData = jQuery.hasData( elem ) && jQuery._data( elem );
+
+		if ( !elemData || !(events = elemData.events) ) {
+			return;
+		}
+
+		// Once for each type.namespace in types; type may be omitted
+		types = ( types || "" ).match( core_rnotwhite ) || [""];
+		t = types.length;
+		while ( t-- ) {
+			tmp = rtypenamespace.exec( types[t] ) || [];
+			type = origType = tmp[1];
+			namespaces = ( tmp[2] || "" ).split( "." ).sort();
+
+			// Unbind all events (on this namespace, if provided) for the element
+			if ( !type ) {
+				for ( type in events ) {
+					jQuery.event.remove( elem, type + types[ t ], handler, selector, true );
+				}
+				continue;
+			}
+
+			special = jQuery.event.special[ type ] || {};
+			type = ( selector ? special.delegateType : special.bindType ) || type;
+			handlers = events[ type ] || [];
+			tmp = tmp[2] && new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" );
+
+			// Remove matching events
+			origCount = j = handlers.length;
+			while ( j-- ) {
+				handleObj = handlers[ j ];
+
+				if ( ( mappedTypes || origType === handleObj.origType ) &&
+					( !handler || handler.guid === handleObj.guid ) &&
+					( !tmp || tmp.test( handleObj.namespace ) ) &&
+					( !selector || selector === handleObj.selector || selector === "**" && handleObj.selector ) ) {
+					handlers.splice( j, 1 );
+
+					if ( handleObj.selector ) {
+						handlers.delegateCount--;
+					}
+					if ( special.remove ) {
+						special.remove.call( elem, handleObj );
+					}
+				}
+			}
+
+			// Remove generic event handler if we removed something and no more handlers exist
+			// (avoids potential for endless recursion during removal of special event handlers)
+			if ( origCount && !handlers.length ) {
+				if ( !special.teardown || special.teardown.call( elem, namespaces, elemData.handle ) === false ) {
+					jQuery.removeEvent( elem, type, elemData.handle );
+				}
+
+				delete events[ type ];
+			}
+		}
+
+		// Remove the expando if it's no longer used
+		if ( jQuery.isEmptyObject( events ) ) {
+			delete elemData.handle;
+
+			// removeData also checks for emptiness and clears the expando if empty
+			// so use it instead of delete
+			jQuery._removeData( elem, "events" );
+		}
+	},
+
+	trigger: function( event, data, elem, onlyHandlers ) {
+		var handle, ontype, cur,
+			bubbleType, special, tmp, i,
+			eventPath = [ elem || document ],
+			type = core_hasOwn.call( event, "type" ) ? event.type : event,
+			namespaces = core_hasOwn.call( event, "namespace" ) ? event.namespace.split(".") : [];
+
+		cur = tmp = elem = elem || document;
+
+		// Don't do events on text and comment nodes
+		if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
+			return;
+		}
+
+		// focus/blur morphs to focusin/out; ensure we're not firing them right now
+		if ( rfocusMorph.test( type + jQuery.event.triggered ) ) {
+			return;
+		}
+
+		if ( type.indexOf(".") >= 0 ) {
+			// Namespaced trigger; create a regexp to match event type in handle()
+			namespaces = type.split(".");
+			type = namespaces.shift();
+			namespaces.sort();
+		}
+		ontype = type.indexOf(":") < 0 && "on" + type;
+
+		// Caller can pass in a jQuery.Event object, Object, or just an event type string
+		event = event[ jQuery.expando ] ?
+			event :
+			new jQuery.Event( type, typeof event === "object" && event );
+
+		// Trigger bitmask: & 1 for native handlers; & 2 for jQuery (always true)
+		event.isTrigger = onlyHandlers ? 2 : 3;
+		event.namespace = namespaces.join(".");
+		event.namespace_re = event.namespace ?
+			new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" ) :
+			null;
+
+		// Clean up the event in case it is being reused
+		event.result = undefined;
+		if ( !event.target ) {
+			event.target = elem;
+		}
+
+		// Clone any incoming data and prepend the event, creating the handler arg list
+		data = data == null ?
+			[ event ] :
+			jQuery.makeArray( data, [ event ] );
+
+		// Allow special events to draw outside the lines
+		special = jQuery.event.special[ type ] || {};
+		if ( !onlyHandlers && special.trigger && special.trigger.apply( elem, data ) === false ) {
+			return;
+		}
+
+		// Determine event propagation path in advance, per W3C events spec (#9951)
+		// Bubble up to document, then to window; watch for a global ownerDocument var (#9724)
+		if ( !onlyHandlers && !special.noBubble && !jQuery.isWindow( elem ) ) {
+
+			bubbleType = special.delegateType || type;
+			if ( !rfocusMorph.test( bubbleType + type ) ) {
+				cur = cur.parentNode;
+			}
+			for ( ; cur; cur = cur.parentNode ) {
+				eventPath.push( cur );
+				tmp = cur;
+			}
+
+			// Only add window if we got to document (e.g., not plain obj or detached DOM)
+			if ( tmp === (elem.ownerDocument || document) ) {
+				eventPath.push( tmp.defaultView || tmp.parentWindow || window );
+			}
+		}
+
+		// Fire handlers on the event path
+		i = 0;
+		while ( (cur = eventPath[i++]) && !event.isPropagationStopped() ) {
+
+			event.type = i > 1 ?
+				bubbleType :
+				special.bindType || type;
+
+			// jQuery handler
+			handle = ( jQuery._data( cur, "events" ) || {} )[ event.type ] && jQuery._data( cur, "handle" );
+			if ( handle ) {
+				handle.apply( cur, data );
+			}
+
+			// Native handler
+			handle = ontype && cur[ ontype ];
+			if ( handle && jQuery.acceptData( cur ) && handle.apply && handle.apply( cur, data ) === false ) {
+				event.preventDefault();
+			}
+		}
+		event.type = type;
+
+		// If nobody prevented the default action, do it now
+		if ( !onlyHandlers && !event.isDefaultPrevented() ) {
+
+			if ( (!special._default || special._default.apply( eventPath.pop(), data ) === false) &&
+				jQuery.acceptData( elem ) ) {
+
+				// Call a native DOM method on the target with the same name name as the event.
+				// Can't use an .isFunction() check here because IE6/7 fails that test.
+				// Don't do default actions on window, that's where global variables be (#6170)
+				if ( ontype && elem[ type ] && !jQuery.isWindow( elem ) ) {
+
+					// Don't re-trigger an onFOO event when we call its FOO() method
+					tmp = elem[ ontype ];
+
+					if ( tmp ) {
+						elem[ ontype ] = null;
+					}
+
+					// Prevent re-triggering of the same event, since we already bubbled it above
+					jQuery.event.triggered = type;
+					try {
+						elem[ type ]();
+					} catch ( e ) {
+						// IE<9 dies on focus/blur to hidden element (#1486,#12518)
+						// only reproducible on winXP IE8 native, not IE9 in IE8 mode
+					}
+					jQuery.event.triggered = undefined;
+
+					if ( tmp ) {
+						elem[ ontype ] = tmp;
+					}
+				}
+			}
+		}
+
+		return event.result;
+	},
+
+	dispatch: function( event ) {
+
+		// Make a writable jQuery.Event from the native event object
+		event = jQuery.event.fix( event );
+
+		var i, ret, handleObj, matched, j,
+			handlerQueue = [],
+			args = core_slice.call( arguments ),
+			handlers = ( jQuery._data( this, "events" ) || {} )[ event.type ] || [],
+			special = jQuery.event.special[ event.type ] || {};
+
+		// Use the fix-ed jQuery.Event rather than the (read-only) native event
+		args[0] = event;
+		event.delegateTarget = this;
+
+		// Call the preDispatch hook for the mapped type, and let it bail if desired
+		if ( special.preDispatch && special.preDispatch.call( this, event ) === false ) {
+			return;
+		}
+
+		// Determine handlers
+		handlerQueue = jQuery.event.handlers.call( this, event, handlers );
+
+		// Run delegates first; they may want to stop propagation beneath us
+		i = 0;
+		while ( (matched = handlerQueue[ i++ ]) && !event.isPropagationStopped() ) {
+			event.currentTarget = matched.elem;
+
+			j = 0;
+			while ( (handleObj = matched.handlers[ j++ ]) && !event.isImmediatePropagationStopped() ) {
+
+				// Triggered event must either 1) have no namespace, or
+				// 2) have namespace(s) a subset or equal to those in the bound event (both can have no namespace).
+				if ( !event.namespace_re || event.namespace_re.test( handleObj.namespace ) ) {
+
+					event.handleObj = handleObj;
+					event.data = handleObj.data;
+
+					ret = ( (jQuery.event.special[ handleObj.origType ] || {}).handle || handleObj.handler )
+							.apply( matched.elem, args );
+
+					if ( ret !== undefined ) {
+						if ( (event.result = ret) === false ) {
+							event.preventDefault();
+							event.stopPropagation();
+						}
+					}
+				}
+			}
+		}
+
+		// Call the postDispatch hook for the mapped type
+		if ( special.postDispatch ) {
+			special.postDispatch.call( this, event );
+		}
+
+		return event.result;
+	},
+
+	handlers: function( event, handlers ) {
+		var sel, handleObj, matches, i,
+			handlerQueue = [],
+			delegateCount = handlers.delegateCount,
+			cur = event.target;
+
+		// Find delegate handlers
+		// Black-hole SVG <use> instance trees (#13180)
+		// Avoid non-left-click bubbling in Firefox (#3861)
+		if ( delegateCount && cur.nodeType && (!event.button || event.type !== "click") ) {
+
+			/* jshint eqeqeq: false */
+			for ( ; cur != this; cur = cur.parentNode || this ) {
+				/* jshint eqeqeq: true */
+
+				// Don't check non-elements (#13208)
+				// Don't process clicks on disabled elements (#6911, #8165, #11382, #11764)
+				if ( cur.nodeType === 1 && (cur.disabled !== true || event.type !== "click") ) {
+					matches = [];
+					for ( i = 0; i < delegateCount; i++ ) {
+						handleObj = handlers[ i ];
+
+						// Don't conflict with Object.prototype properties (#13203)
+						sel = handleObj.selector + " ";
+
+						if ( matches[ sel ] === undefined ) {
+							matches[ sel ] = handleObj.needsContext ?
+								jQuery( sel, this ).index( cur ) >= 0 :
+								jQuery.find( sel, this, null, [ cur ] ).length;
+						}
+						if ( matches[ sel ] ) {
+							matches.push( handleObj );
+						}
+					}
+					if ( matches.length ) {
+						handlerQueue.push({ elem: cur, handlers: matches });
+					}
+				}
+			}
+		}
+
+		// Add the remaining (directly-bound) handlers
+		if ( delegateCount < handlers.length ) {
+			handlerQueue.push({ elem: this, handlers: handlers.slice( delegateCount ) });
+		}
+
+		return handlerQueue;
+	},
+
+	fix: function( event ) {
+		if ( event[ jQuery.expando ] ) {
+			return event;
+		}
+
+		// Create a writable copy of the event object and normalize some properties
+		var i, prop, copy,
+			type = event.type,
+			originalEvent = event,
+			fixHook = this.fixHooks[ type ];
+
+		if ( !fixHook ) {
+			this.fixHooks[ type ] = fixHook =
+				rmouseEvent.test( type ) ? this.mouseHooks :
+				rkeyEvent.test( type ) ? this.keyHooks :
+				{};
+		}
+		copy = fixHook.props ? this.props.concat( fixHook.props ) : this.props;
+
+		event = new jQuery.Event( originalEvent );
+
+		i = copy.length;
+		while ( i-- ) {
+			prop = copy[ i ];
+			event[ prop ] = originalEvent[ prop ];
+		}
+
+		// Support: IE<9
+		// Fix target property (#1925)
+		if ( !event.target ) {
+			event.target = originalEvent.srcElement || document;
+		}
+
+		// Support: Chrome 23+, Safari?
+		// Target should not be a text node (#504, #13143)
+		if ( event.target.nodeType === 3 ) {
+			event.target = event.target.parentNode;
+		}
+
+		// Support: IE<9
+		// For mouse/key events, metaKey==false if it's undefined (#3368, #11328)
+		event.metaKey = !!event.metaKey;
+
+		return fixHook.filter ? fixHook.filter( event, originalEvent ) : event;
+	},
+
+	// Includes some event props shared by KeyEvent and MouseEvent
+	props: "altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),
+
+	fixHooks: {},
+
+	keyHooks: {
+		props: "char charCode key keyCode".split(" "),
+		filter: function( event, original ) {
+
+			// Add which for key events
+			if ( event.which == null ) {
+				event.which = original.charCode != null ? original.charCode : original.keyCode;
+			}
+
+			return event;
+		}
+	},
+
+	mouseHooks: {
+		props: "button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),
+		filter: function( event, original ) {
+			var body, eventDoc, doc,
+				button = original.button,
+				fromElement = original.fromElement;
+
+			// Calculate pageX/Y if missing and clientX/Y available
+			if ( event.pageX == null && original.clientX != null ) {
+				eventDoc = event.target.ownerDocument || document;
+				doc = eventDoc.documentElement;
+				body = eventDoc.body;
+
+				event.pageX = original.clientX + ( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) - ( doc && doc.clientLeft || body && body.clientLeft || 0 );
+				event.pageY = original.clientY + ( doc && doc.scrollTop  || body && body.scrollTop  || 0 ) - ( doc && doc.clientTop  || body && body.clientTop  || 0 );
+			}
+
+			// Add relatedTarget, if necessary
+			if ( !event.relatedTarget && fromElement ) {
+				event.relatedTarget = fromElement === event.target ? original.toElement : fromElement;
+			}
+
+			// Add which for click: 1 === left; 2 === middle; 3 === right
+			// Note: button is not normalized, so don't use it
+			if ( !event.which && button !== undefined ) {
+				event.which = ( button & 1 ? 1 : ( button & 2 ? 3 : ( button & 4 ? 2 : 0 ) ) );
+			}
+
+			return event;
+		}
+	},
+
+	special: {
+		load: {
+			// Prevent triggered image.load events from bubbling to window.load
+			noBubble: true
+		},
+		focus: {
+			// Fire native event if possible so blur/focus sequence is correct
+			trigger: function() {
+				if ( this !== safeActiveElement() && this.focus ) {
+					try {
+						this.focus();
+						return false;
+					} catch ( e ) {
+						// Support: IE<9
+						// If we error on focus to hidden element (#1486, #12518),
+						// let .trigger() run the handlers
+					}
+				}
+			},
+			delegateType: "focusin"
+		},
+		blur: {
+			trigger: function() {
+				if ( this === safeActiveElement() && this.blur ) {
+					this.blur();
+					return false;
+				}
+			},
+			delegateType: "focusout"
+		},
+		click: {
+			// For checkbox, fire native event so checked state will be right
+			trigger: function() {
+				if ( jQuery.nodeName( this, "input" ) && this.type === "checkbox" && this.click ) {
+					this.click();
+					return false;
+				}
+			},
+
+			// For cross-browser consistency, don't fire native .click() on links
+			_default: function( event ) {
+				return jQuery.nodeName( event.target, "a" );
+			}
+		},
+
+		beforeunload: {
+			postDispatch: function( event ) {
+
+				// Even when returnValue equals to undefined Firefox will still show alert
+				if ( event.result !== undefined ) {
+					event.originalEvent.returnValue = event.result;
+				}
+			}
+		}
+	},
+
+	simulate: function( type, elem, event, bubble ) {
+		// Piggyback on a donor event to simulate a different one.
+		// Fake originalEvent to avoid donor's stopPropagation, but if the
+		// simulated event prevents default then we do the same on the donor.
+		var e = jQuery.extend(
+			new jQuery.Event(),
+			event,
+			{
+				type: type,
+				isSimulated: true,
+				originalEvent: {}
+			}
+		);
+		if ( bubble ) {
+			jQuery.event.trigger( e, null, elem );
+		} else {
+			jQuery.event.dispatch.call( elem, e );
+		}
+		if ( e.isDefaultPrevented() ) {
+			event.preventDefault();
+		}
+	}
+};
+
+jQuery.removeEvent = document.removeEventListener ?
+	function( elem, type, handle ) {
+		if ( elem.removeEventListener ) {
+			elem.removeEventListener( type, handle, false );
+		}
+	} :
+	function( elem, type, handle ) {
+		var name = "on" + type;
+
+		if ( elem.detachEvent ) {
+
+			// #8545, #7054, preventing memory leaks for custom events in IE6-8
+			// detachEvent needed property on element, by name of that event, to properly expose it to GC
+			if ( typeof elem[ name ] === core_strundefined ) {
+				elem[ name ] = null;
+			}
+
+			elem.detachEvent( name, handle );
+		}
+	};
+
+jQuery.Event = function( src, props ) {
+	// Allow instantiation without the 'new' keyword
+	if ( !(this instanceof jQuery.Event) ) {
+		return new jQuery.Event( src, props );
+	}
+
+	// Event object
+	if ( src && src.type ) {
+		this.originalEvent = src;
+		this.type = src.type;
+
+		// Events bubbling up the document may have been marked as prevented
+		// by a handler lower down the tree; reflect the correct value.
+		this.isDefaultPrevented = ( src.defaultPrevented || src.returnValue === false ||
+			src.getPreventDefault && src.getPreventDefault() ) ? returnTrue : returnFalse;
+
+	// Event type
+	} else {
+		this.type = src;
+	}
+
+	// Put explicitly provided properties onto the event object
+	if ( props ) {
+		jQuery.extend( this, props );
+	}
+
+	// Create a timestamp if incoming event doesn't have one
+	this.timeStamp = src && src.timeStamp || jQuery.now();
+
+	// Mark it as fixed
+	this[ jQuery.expando ] = true;
+};
+
+// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
+// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
+jQuery.Event.prototype = {
+	isDefaultPrevented: returnFalse,
+	isPropagationStopped: returnFalse,
+	isImmediatePropagationStopped: returnFalse,
+
+	preventDefault: function() {
+		var e = this.originalEvent;
+
+		this.isDefaultPrevented = returnTrue;
+		if ( !e ) {
+			return;
+		}
+
+		// If preventDefault exists, run it on the original event
+		if ( e.preventDefault ) {
+			e.preventDefault();
+
+		// Support: IE
+		// Otherwise set the returnValue property of the original event to false
+		} else {
+			e.returnValue = false;
+		}
+	},
+	stopPropagation: function() {
+		var e = this.originalEvent;
+
+		this.isPropagationStopped = returnTrue;
+		if ( !e ) {
+			return;
+		}
+		// If stopPropagation exists, run it on the original event
+		if ( e.stopPropagation ) {
+			e.stopPropagation();
+		}
+
+		// Support: IE
+		// Set the cancelBubble property of the original event to true
+		e.cancelBubble = true;
+	},
+	stopImmediatePropagation: function() {
+		this.isImmediatePropagationStopped = returnTrue;
+		this.stopPropagation();
+	}
+};
+
+// Create mouseenter/leave events using mouseover/out and event-time checks
+jQuery.each({
+	mouseenter: "mouseover",
+	mouseleave: "mouseout"
+}, function( orig, fix ) {
+	jQuery.event.special[ orig ] = {
+		delegateType: fix,
+		bindType: fix,
+
+		handle: function( event ) {
+			var ret,
+				target = this,
+				related = event.relatedTarget,
+				handleObj = event.handleObj;
+
+			// For mousenter/leave call the handler if related is outside the target.
+			// NB: No relatedTarget if the mouse left/entered the browser window
+			if ( !related || (related !== target && !jQuery.contains( target, related )) ) {
+				event.type = handleObj.origType;
+				ret = handleObj.handler.apply( this, arguments );
+				event.type = fix;
+			}
+			return ret;
+		}
+	};
+});
+
+// IE submit delegation
+if ( !jQuery.support.submitBubbles ) {
+
+	jQuery.event.special.submit = {
+		setup: function() {
+			// Only need this for delegated form submit events
+			if ( jQuery.nodeName( this, "form" ) ) {
+				return false;
+			}
+
+			// Lazy-add a submit handler when a descendant form may potentially be submitted
+			jQuery.event.add( this, "click._submit keypress._submit", function( e ) {
+				// Node name check avoids a VML-related crash in IE (#9807)
+				var elem = e.target,
+					form = jQuery.nodeName( elem, "input" ) || jQuery.nodeName( elem, "button" ) ? elem.form : undefined;
+				if ( form && !jQuery._data( form, "submitBubbles" ) ) {
+					jQuery.event.add( form, "submit._submit", function( event ) {
+						event._submit_bubble = true;
+					});
+					jQuery._data( form, "submitBubbles", true );
+				}
+			});
+			// return undefined since we don't need an event listener
+		},
+
+		postDispatch: function( event ) {
+			// If form was submitted by the user, bubble the event up the tree
+			if ( event._submit_bubble ) {
+				delete event._submit_bubble;
+				if ( this.parentNode && !event.isTrigger ) {
+					jQuery.event.simulate( "submit", this.parentNode, event, true );
+				}
+			}
+		},
+
+		teardown: function() {
+			// Only need this for delegated form submit events
+			if ( jQuery.nodeName( this, "form" ) ) {
+				return false;
+			}
+
+			// Remove delegated handlers; cleanData eventually reaps submit handlers attached above
+			jQuery.event.remove( this, "._submit" );
+		}
+	};
+}
+
+// IE change delegation and checkbox/radio fix
+if ( !jQuery.support.changeBubbles ) {
+
+	jQuery.event.special.change = {
+
+		setup: function() {
+
+			if ( rformElems.test( this.nodeName ) ) {
+				// IE doesn't fire change on a check/radio until blur; trigger it on click
+				// after a propertychange. Eat the blur-change in special.change.handle.
+				// This still fires onchange a second time for check/radio after blur.
+				if ( this.type === "checkbox" || this.type === "radio" ) {
+					jQuery.event.add( this, "propertychange._change", function( event ) {
+						if ( event.originalEvent.propertyName === "checked" ) {
+							this._just_changed = true;
+						}
+					});
+					jQuery.event.add( this, "click._change", function( event ) {
+						if ( this._just_changed && !event.isTrigger ) {
+							this._just_changed = false;
+						}
+						// Allow triggered, simulated change events (#11500)
+						jQuery.event.simulate( "change", this, event, true );
+					});
+				}
+				return false;
+			}
+			// Delegated event; lazy-add a change handler on descendant inputs
+			jQuery.event.add( this, "beforeactivate._change", function( e ) {
+				var elem = e.target;
+
+				if ( rformElems.test( elem.nodeName ) && !jQuery._data( elem, "changeBubbles" ) ) {
+					jQuery.event.add( elem, "change._change", function( event ) {
+						if ( this.parentNode && !event.isSimulated && !event.isTrigger ) {
+							jQuery.event.simulate( "change", this.parentNode, event, true );
+						}
+					});
+					jQuery._data( elem, "changeBubbles", true );
+				}
+			});
+		},
+
+		handle: function( event ) {
+			var elem = event.target;
+
+			// Swallow native change events from checkbox/radio, we already triggered them above
+			if ( this !== elem || event.isSimulated || event.isTrigger || (elem.type !== "radio" && elem.type !== "checkbox") ) {
+				return event.handleObj.handler.apply( this, arguments );
+			}
+		},
+
+		teardown: function() {
+			jQuery.event.remove( this, "._change" );
+
+			return !rformElems.test( this.nodeName );
+		}
+	};
+}
+
+// Create "bubbling" focus and blur events
+if ( !jQuery.support.focusinBubbles ) {
+	jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) {
+
+		// Attach a single capturing handler while someone wants focusin/focusout
+		var attaches = 0,
+			handler = function( event ) {
+				jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ), true );
+			};
+
+		jQuery.event.special[ fix ] = {
+			setup: function() {
+				if ( attaches++ === 0 ) {
+					document.addEventListener( orig, handler, true );
+				}
+			},
+			teardown: function() {
+				if ( --attaches === 0 ) {
+					document.removeEventListener( orig, handler, true );
+				}
+			}
+		};
+	});
+}
+
+jQuery.fn.extend({
+
+	on: function( types, selector, data, fn, /*INTERNAL*/ one ) {
+		var type, origFn;
+
+		// Types can be a map of types/handlers
+		if ( typeof types === "object" ) {
+			// ( types-Object, selector, data )
+			if ( typeof selector !== "string" ) {
+				// ( types-Object, data )
+				data = data || selector;
+				selector = undefined;
+			}
+			for ( type in types ) {
+				this.on( type, selector, data, types[ type ], one );
+			}
+			return this;
+		}
+
+		if ( data == null && fn == null ) {
+			// ( types, fn )
+			fn = selector;
+			data = selector = undefined;
+		} else if ( fn == null ) {
+			if ( typeof selector === "string" ) {
+				// ( types, selector, fn )
+				fn = data;
+				data = undefined;
+			} else {
+				// ( types, data, fn )
+				fn = data;
+				data = selector;
+				selector = undefined;
+			}
+		}
+		if ( fn === false ) {
+			fn = returnFalse;
+		} else if ( !fn ) {
+			return this;
+		}
+
+		if ( one === 1 ) {
+			origFn = fn;
+			fn = function( event ) {
+				// Can use an empty set, since event contains the info
+				jQuery().off( event );
+				return origFn.apply( this, arguments );
+			};
+			// Use same guid so caller can remove using origFn
+			fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ );
+		}
+		return this.each( function() {
+			jQuery.event.add( this, types, fn, data, selector );
+		});
+	},
+	one: function( types, selector, data, fn ) {
+		return this.on( types, selector, data, fn, 1 );
+	},
+	off: function( types, selector, fn ) {
+		var handleObj, type;
+		if ( types && types.preventDefault && types.handleObj ) {
+			// ( event )  dispatched jQuery.Event
+			handleObj = types.handleObj;
+			jQuery( types.delegateTarget ).off(
+				handleObj.namespace ? handleObj.origType + "." + handleObj.namespace : handleObj.origType,
+				handleObj.selector,
+				handleObj.handler
+			);
+			return this;
+		}
+		if ( typeof types === "object" ) {
+			// ( types-object [, selector] )
+			for ( type in types ) {
+				this.off( type, selector, types[ type ] );
+			}
+			return this;
+		}
+		if ( selector === false || typeof selector === "function" ) {
+			// ( types [, fn] )
+			fn = selector;
+			selector = undefined;
+		}
+		if ( fn === false ) {
+			fn = returnFalse;
+		}
+		return this.each(function() {
+			jQuery.event.remove( this, types, fn, selector );
+		});
+	},
+
+	trigger: function( type, data ) {
+		return this.each(function() {
+			jQuery.event.trigger( type, data, this );
+		});
+	},
+	triggerHandler: function( type, data ) {
+		var elem = this[0];
+		if ( elem ) {
+			return jQuery.event.trigger( type, data, elem, true );
+		}
+	}
+});
+var isSimple = /^.[^:#\[\.,]*$/,
+	rparentsprev = /^(?:parents|prev(?:Until|All))/,
+	rneedsContext = jQuery.expr.match.needsContext,
+	// methods guaranteed to produce a unique set when starting from a unique set
+	guaranteedUnique = {
+		children: true,
+		contents: true,
+		next: true,
+		prev: true
+	};
+
+jQuery.fn.extend({
+	find: function( selector ) {
+		var i,
+			ret = [],
+			self = this,
+			len = self.length;
+
+		if ( typeof selector !== "string" ) {
+			return this.pushStack( jQuery( selector ).filter(function() {
+				for ( i = 0; i < len; i++ ) {
+					if ( jQuery.contains( self[ i ], this ) ) {
+						return true;
+					}
+				}
+			}) );
+		}
+
+		for ( i = 0; i < len; i++ ) {
+			jQuery.find( selector, self[ i ], ret );
+		}
+
+		// Needed because $( selector, context ) becomes $( context ).find( selector )
+		ret = this.pushStack( len > 1 ? jQuery.unique( ret ) : ret );
+		ret.selector = this.selector ? this.selector + " " + selector : selector;
+		return ret;
+	},
+
+	has: function( target ) {
+		var i,
+			targets = jQuery( target, this ),
+			len = targets.length;
+
+		return this.filter(function() {
+			for ( i = 0; i < len; i++ ) {
+				if ( jQuery.contains( this, targets[i] ) ) {
+					return true;
+				}
+			}
+		});
+	},
+
+	not: function( selector ) {
+		return this.pushStack( winnow(this, selector || [], true) );
+	},
+
+	filter: function( selector ) {
+		return this.pushStack( winnow(this, selector || [], false) );
+	},
+
+	is: function( selector ) {
+		return !!winnow(
+			this,
+
+			// If this is a positional/relative selector, check membership in the returned set
+			// so $("p:first").is("p:last") won't return true for a doc with two "p".
+			typeof selector === "string" && rneedsContext.test( selector ) ?
+				jQuery( selector ) :
+				selector || [],
+			false
+		).length;
+	},
+
+	closest: function( selectors, context ) {
+		var cur,
+			i = 0,
+			l = this.length,
+			ret = [],
+			pos = rneedsContext.test( selectors ) || typeof selectors !== "string" ?
+				jQuery( selectors, context || this.context ) :
+				0;
+
+		for ( ; i < l; i++ ) {
+			for ( cur = this[i]; cur && cur !== context; cur = cur.parentNode ) {
+				// Always skip document fragments
+				if ( cur.nodeType < 11 && (pos ?
+					pos.index(cur) > -1 :
+
+					// Don't pass non-elements to Sizzle
+					cur.nodeType === 1 &&
+						jQuery.find.matchesSelector(cur, selectors)) ) {
+
+					cur = ret.push( cur );
+					break;
+				}
+			}
+		}
+
+		return this.pushStack( ret.length > 1 ? jQuery.unique( ret ) : ret );
+	},
+
+	// Determine the position of an element within
+	// the matched set of elements
+	index: function( elem ) {
+
+		// No argument, return index in parent
+		if ( !elem ) {
+			return ( this[0] && this[0].parentNode ) ? this.first().prevAll().length : -1;
+		}
+
+		// index in selector
+		if ( typeof elem === "string" ) {
+			return jQuery.inArray( this[0], jQuery( elem ) );
+		}
+
+		// Locate the position of the desired element
+		return jQuery.inArray(
+			// If it receives a jQuery object, the first element is used
+			elem.jquery ? elem[0] : elem, this );
+	},
+
+	add: function( selector, context ) {
+		var set = typeof selector === "string" ?
+				jQuery( selector, context ) :
+				jQuery.makeArray( selector && selector.nodeType ? [ selector ] : selector ),
+			all = jQuery.merge( this.get(), set );
+
+		return this.pushStack( jQuery.unique(all) );
+	},
+
+	addBack: function( selector ) {
+		return this.add( selector == null ?
+			this.prevObject : this.prevObject.filter(selector)
+		);
+	}
+});
+
+function sibling( cur, dir ) {
+	do {
+		cur = cur[ dir ];
+	} while ( cur && cur.nodeType !== 1 );
+
+	return cur;
+}
+
+jQuery.each({
+	parent: function( elem ) {
+		var parent = elem.parentNode;
+		return parent && parent.nodeType !== 11 ? parent : null;
+	},
+	parents: function( elem ) {
+		return jQuery.dir( elem, "parentNode" );
+	},
+	parentsUntil: function( elem, i, until ) {
+		return jQuery.dir( elem, "parentNode", until );
+	},
+	next: function( elem ) {
+		return sibling( elem, "nextSibling" );
+	},
+	prev: function( elem ) {
+		return sibling( elem, "previousSibling" );
+	},
+	nextAll: function( elem ) {
+		return jQuery.dir( elem, "nextSibling" );
+	},
+	prevAll: function( elem ) {
+		return jQuery.dir( elem, "previousSibling" );
+	},
+	nextUntil: function( elem, i, until ) {
+		return jQuery.dir( elem, "nextSibling", until );
+	},
+	prevUntil: function( elem, i, until ) {
+		return jQuery.dir( elem, "previousSibling", until );
+	},
+	siblings: function( elem ) {
+		return jQuery.sibling( ( elem.parentNode || {} ).firstChild, elem );
+	},
+	children: function( elem ) {
+		return jQuery.sibling( elem.firstChild );
+	},
+	contents: function( elem ) {
+		return jQuery.nodeName( elem, "iframe" ) ?
+			elem.contentDocument || elem.contentWindow.document :
+			jQuery.merge( [], elem.childNodes );
+	}
+}, function( name, fn ) {
+	jQuery.fn[ name ] = function( until, selector ) {
+		var ret = jQuery.map( this, fn, until );
+
+		if ( name.slice( -5 ) !== "Until" ) {
+			selector = until;
+		}
+
+		if ( selector && typeof selector === "string" ) {
+			ret = jQuery.filter( selector, ret );
+		}
+
+		if ( this.length > 1 ) {
+			// Remove duplicates
+			if ( !guaranteedUnique[ name ] ) {
+				ret = jQuery.unique( ret );
+			}
+
+			// Reverse order for parents* and prev-derivatives
+			if ( rparentsprev.test( name ) ) {
+				ret = ret.reverse();
+			}
+		}
+
+		return this.pushStack( ret );
+	};
+});
+
+jQuery.extend({
+	filter: function( expr, elems, not ) {
+		var elem = elems[ 0 ];
+
+		if ( not ) {
+			expr = ":not(" + expr + ")";
+		}
+
+		return elems.length === 1 && elem.nodeType === 1 ?
+			jQuery.find.matchesSelector( elem, expr ) ? [ elem ] : [] :
+			jQuery.find.matches( expr, jQuery.grep( elems, function( elem ) {
+				return elem.nodeType === 1;
+			}));
+	},
+
+	dir: function( elem, dir, until ) {
+		var matched = [],
+			cur = elem[ dir ];
+
+		while ( cur && cur.nodeType !== 9 && (until === undefined || cur.nodeType !== 1 || !jQuery( cur ).is( until )) ) {
+			if ( cur.nodeType === 1 ) {
+				matched.push( cur );
+			}
+			cur = cur[dir];
+		}
+		return matched;
+	},
+
+	sibling: function( n, elem ) {
+		var r = [];
+
+		for ( ; n; n = n.nextSibling ) {
+			if ( n.nodeType === 1 && n !== elem ) {
+				r.push( n );
+			}
+		}
+
+		return r;
+	}
+});
+
+// Implement the identical functionality for filter and not
+function winnow( elements, qualifier, not ) {
+	if ( jQuery.isFunction( qualifier ) ) {
+		return jQuery.grep( elements, function( elem, i ) {
+			/* jshint -W018 */
+			return !!qualifier.call( elem, i, elem ) !== not;
+		});
+
+	}
+
+	if ( qualifier.nodeType ) {
+		return jQuery.grep( elements, function( elem ) {
+			return ( elem === qualifier ) !== not;
+		});
+
+	}
+
+	if ( typeof qualifier === "string" ) {
+		if ( isSimple.test( qualifier ) ) {
+			return jQuery.filter( qualifier, elements, not );
+		}
+
+		qualifier = jQuery.filter( qualifier, elements );
+	}
+
+	return jQuery.grep( elements, function( elem ) {
+		return ( jQuery.inArray( elem, qualifier ) >= 0 ) !== not;
+	});
+}
+function createSafeFragment( document ) {
+	var list = nodeNames.split( "|" ),
+		safeFrag = document.createDocumentFragment();
+
+	if ( safeFrag.createElement ) {
+		while ( list.length ) {
+			safeFrag.createElement(
+				list.pop()
+			);
+		}
+	}
+	return safeFrag;
+}
+
+var nodeNames = "abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|" +
+		"header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",
+	rinlinejQuery = / jQuery\d+="(?:null|\d+)"/g,
+	rnoshimcache = new RegExp("<(?:" + nodeNames + ")[\\s/>]", "i"),
+	rleadingWhitespace = /^\s+/,
+	rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,
+	rtagName = /<([\w:]+)/,
+	rtbody = /<tbody/i,
+	rhtml = /<|&#?\w+;/,
+	rnoInnerhtml = /<(?:script|style|link)/i,
+	manipulation_rcheckableType = /^(?:checkbox|radio)$/i,
+	// checked="checked" or checked
+	rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,
+	rscriptType = /^$|\/(?:java|ecma)script/i,
+	rscriptTypeMasked = /^true\/(.*)/,
+	rcleanScript = /^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,
+
+	// We have to close these tags to support XHTML (#13200)
+	wrapMap = {
+		option: [ 1, "<select multiple='multiple'>", "</select>" ],
+		legend: [ 1, "<fieldset>", "</fieldset>" ],
+		area: [ 1, "<map>", "</map>" ],
+		param: [ 1, "<object>", "</object>" ],
+		thead: [ 1, "<table>", "</table>" ],
+		tr: [ 2, "<table><tbody>", "</tbody></table>" ],
+		col: [ 2, "<table><tbody></tbody><colgroup>", "</colgroup></table>" ],
+		td: [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ],
+
+		// IE6-8 can't serialize link, script, style, or any html5 (NoScope) tags,
+		// unless wrapped in a div with non-breaking characters in front of it.
+		_default: jQuery.support.htmlSerialize ? [ 0, "", "" ] : [ 1, "X<div>", "</div>"  ]
+	},
+	safeFragment = createSafeFragment( document ),
+	fragmentDiv = safeFragment.appendChild( document.createElement("div") );
+
+wrapMap.optgroup = wrapMap.option;
+wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
+wrapMap.th = wrapMap.td;
+
+jQuery.fn.extend({
+	text: function( value ) {
+		return jQuery.access( this, function( value ) {
+			return value === undefined ?
+				jQuery.text( this ) :
+				this.empty().append( ( this[0] && this[0].ownerDocument || document ).createTextNode( value ) );
+		}, null, value, arguments.length );
+	},
+
+	append: function() {
+		return this.domManip( arguments, function( elem ) {
+			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
+				var target = manipulationTarget( this, elem );
+				target.appendChild( elem );
+			}
+		});
+	},
+
+	prepend: function() {
+		return this.domManip( arguments, function( elem ) {
+			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
+				var target = manipulationTarget( this, elem );
+				target.insertBefore( elem, target.firstChild );
+			}
+		});
+	},
+
+	before: function() {
+		return this.domManip( arguments, function( elem ) {
+			if ( this.parentNode ) {
+				this.parentNode.insertBefore( elem, this );
+			}
+		});
+	},
+
+	after: function() {
+		return this.domManip( arguments, function( elem ) {
+			if ( this.parentNode ) {
+				this.parentNode.insertBefore( elem, this.nextSibling );
+			}
+		});
+	},
+
+	// keepData is for internal use only--do not document
+	remove: function( selector, keepData ) {
+		var elem,
+			elems = selector ? jQuery.filter( selector, this ) : this,
+			i = 0;
+
+		for ( ; (elem = elems[i]) != null; i++ ) {
+
+			if ( !keepData && elem.nodeType === 1 ) {
+				jQuery.cleanData( getAll( elem ) );
+			}
+
+			if ( elem.parentNode ) {
+				if ( keepData && jQuery.contains( elem.ownerDocument, elem ) ) {
+					setGlobalEval( getAll( elem, "script" ) );
+				}
+				elem.parentNode.removeChild( elem );
+			}
+		}
+
+		return this;
+	},
+
+	empty: function() {
+		var elem,
+			i = 0;
+
+		for ( ; (elem = this[i]) != null; i++ ) {
+			// Remove element nodes and prevent memory leaks
+			if ( elem.nodeType === 1 ) {
+				jQuery.cleanData( getAll( elem, false ) );
+			}
+
+			// Remove any remaining nodes
+			while ( elem.firstChild ) {
+				elem.removeChild( elem.firstChild );
+			}
+
+			// If this is a select, ensure that it displays empty (#12336)
+			// Support: IE<9
+			if ( elem.options && jQuery.nodeName( elem, "select" ) ) {
+				elem.options.length = 0;
+			}
+		}
+
+		return this;
+	},
+
+	clone: function( dataAndEvents, deepDataAndEvents ) {
+		dataAndEvents = dataAndEvents == null ? false : dataAndEvents;
+		deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents;
+
+		return this.map( function () {
+			return jQuery.clone( this, dataAndEvents, deepDataAndEvents );
+		});
+	},
+
+	html: function( value ) {
+		return jQuery.access( this, function( value ) {
+			var elem = this[0] || {},
+				i = 0,
+				l = this.length;
+
+			if ( value === undefined ) {
+				return elem.nodeType === 1 ?
+					elem.innerHTML.replace( rinlinejQuery, "" ) :
+					undefined;
+			}
+
+			// See if we can take a shortcut and just use innerHTML
+			if ( typeof value === "string" && !rnoInnerhtml.test( value ) &&
+				( jQuery.support.htmlSerialize || !rnoshimcache.test( value )  ) &&
+				( jQuery.support.leadingWhitespace || !rleadingWhitespace.test( value ) ) &&
+				!wrapMap[ ( rtagName.exec( value ) || ["", ""] )[1].toLowerCase() ] ) {
+
+				value = value.replace( rxhtmlTag, "<$1></$2>" );
+
+				try {
+					for (; i < l; i++ ) {
+						// Remove element nodes and prevent memory leaks
+						elem = this[i] || {};
+						if ( elem.nodeType === 1 ) {
+							jQuery.cleanData( getAll( elem, false ) );
+							elem.innerHTML = value;
+						}
+					}
+
+					elem = 0;
+
+				// If using innerHTML throws an exception, use the fallback method
+				} catch(e) {}
+			}
+
+			if ( elem ) {
+				this.empty().append( value );
+			}
+		}, null, value, arguments.length );
+	},
+
+	replaceWith: function() {
+		var
+			// Snapshot the DOM in case .domManip sweeps something relevant into its fragment
+			args = jQuery.map( this, function( elem ) {
+				return [ elem.nextSibling, elem.parentNode ];
+			}),
+			i = 0;
+
+		// Make the changes, replacing each context element with the new content
+		this.domManip( arguments, function( elem ) {
+			var next = args[ i++ ],
+				parent = args[ i++ ];
+
+			if ( parent ) {
+				// Don't use the snapshot next if it has moved (#13810)
+				if ( next && next.parentNode !== parent ) {
+					next = this.nextSibling;
+				}
+				jQuery( this ).remove();
+				parent.insertBefore( elem, next );
+			}
+		// Allow new content to include elements from the context set
+		}, true );
+
+		// Force removal if there was no new content (e.g., from empty arguments)
+		return i ? this : this.remove();
+	},
+
+	detach: function( selector ) {
+		return this.remove( selector, true );
+	},
+
+	domManip: function( args, callback, allowIntersection ) {
+
+		// Flatten any nested arrays
+		args = core_concat.apply( [], args );
+
+		var first, node, hasScripts,
+			scripts, doc, fragment,
+			i = 0,
+			l = this.length,
+			set = this,
+			iNoClone = l - 1,
+			value = args[0],
+			isFunction = jQuery.isFunction( value );
+
+		// We can't cloneNode fragments that contain checked, in WebKit
+		if ( isFunction || !( l <= 1 || typeof value !== "string" || jQuery.support.checkClone || !rchecked.test( value ) ) ) {
+			return this.each(function( index ) {
+				var self = set.eq( index );
+				if ( isFunction ) {
+					args[0] = value.call( this, index, self.html() );
+				}
+				self.domManip( args, callback, allowIntersection );
+			});
+		}
+
+		if ( l ) {
+			fragment = jQuery.buildFragment( args, this[ 0 ].ownerDocument, false, !allowIntersection && this );
+			first = fragment.firstChild;
+
+			if ( fragment.childNodes.length === 1 ) {
+				fragment = first;
+			}
+
+			if ( first ) {
+				scripts = jQuery.map( getAll( fragment, "script" ), disableScript );
+				hasScripts = scripts.length;
+
+				// Use the original fragment for the last item instead of the first because it can end up
+				// being emptied incorrectly in certain situations (#8070).
+				for ( ; i < l; i++ ) {
+					node = fragment;
+
+					if ( i !== iNoClone ) {
+						node = jQuery.clone( node, true, true );
+
+						// Keep references to cloned scripts for later restoration
+						if ( hasScripts ) {
+							jQuery.merge( scripts, getAll( node, "script" ) );
+						}
+					}
+
+					callback.call( this[i], node, i );
+				}
+
+				if ( hasScripts ) {
+					doc = scripts[ scripts.length - 1 ].ownerDocument;
+
+					// Reenable scripts
+					jQuery.map( scripts, restoreScript );
+
+					// Evaluate executable scripts on first document insertion
+					for ( i = 0; i < hasScripts; i++ ) {
+						node = scripts[ i ];
+						if ( rscriptType.test( node.type || "" ) &&
+							!jQuery._data( node, "globalEval" ) && jQuery.contains( doc, node ) ) {
+
+							if ( node.src ) {
+								// Hope ajax is available...
+								jQuery._evalUrl( node.src );
+							} else {
+								jQuery.globalEval( ( node.text || node.textContent || node.innerHTML || "" ).replace( rcleanScript, "" ) );
+							}
+						}
+					}
+				}
+
+				// Fix #11809: Avoid leaking memory
+				fragment = first = null;
+			}
+		}
+
+		return this;
+	}
+});
+
+// Support: IE<8
+// Manipulating tables requires a tbody
+function manipulationTarget( elem, content ) {
+	return jQuery.nodeName( elem, "table" ) &&
+		jQuery.nodeName( content.nodeType === 1 ? content : content.firstChild, "tr" ) ?
+
+		elem.getElementsByTagName("tbody")[0] ||
+			elem.appendChild( elem.ownerDocument.createElement("tbody") ) :
+		elem;
+}
+
+// Replace/restore the type attribute of script elements for safe DOM manipulation
+function disableScript( elem ) {
+	elem.type = (jQuery.find.attr( elem, "type" ) !== null) + "/" + elem.type;
+	return elem;
+}
+function restoreScript( elem ) {
+	var match = rscriptTypeMasked.exec( elem.type );
+	if ( match ) {
+		elem.type = match[1];
+	} else {
+		elem.removeAttribute("type");
+	}
+	return elem;
+}
+
+// Mark scripts as having already been evaluated
+function setGlobalEval( elems, refElements ) {
+	var elem,
+		i = 0;
+	for ( ; (elem = elems[i]) != null; i++ ) {
+		jQuery._data( elem, "globalEval", !refElements || jQuery._data( refElements[i], "globalEval" ) );
+	}
+}
+
+function cloneCopyEvent( src, dest ) {
+
+	if ( dest.nodeType !== 1 || !jQuery.hasData( src ) ) {
+		return;
+	}
+
+	var type, i, l,
+		oldData = jQuery._data( src ),
+		curData = jQuery._data( dest, oldData ),
+		events = oldData.events;
+
+	if ( events ) {
+		delete curData.handle;
+		curData.events = {};
+
+		for ( type in events ) {
+			for ( i = 0, l = events[ type ].length; i < l; i++ ) {
+				jQuery.event.add( dest, type, events[ type ][ i ] );
+			}
+		}
+	}
+
+	// make the cloned public data object a copy from the original
+	if ( curData.data ) {
+		curData.data = jQuery.extend( {}, curData.data );
+	}
+}
+
+function fixCloneNodeIssues( src, dest ) {
+	var nodeName, e, data;
+
+	// We do not need to do anything for non-Elements
+	if ( dest.nodeType !== 1 ) {
+		return;
+	}
+
+	nodeName = dest.nodeName.toLowerCase();
+
+	// IE6-8 copies events bound via attachEvent when using cloneNode.
+	if ( !jQuery.support.noCloneEvent && dest[ jQuery.expando ] ) {
+		data = jQuery._data( dest );
+
+		for ( e in data.events ) {
+			jQuery.removeEvent( dest, e, data.handle );
+		}
+
+		// Event data gets referenced instead of copied if the expando gets copied too
+		dest.removeAttribute( jQuery.expando );
+	}
+
+	// IE blanks contents when cloning scripts, and tries to evaluate newly-set text
+	if ( nodeName === "script" && dest.text !== src.text ) {
+		disableScript( dest ).text = src.text;
+		restoreScript( dest );
+
+	// IE6-10 improperly clones children of object elements using classid.
+	// IE10 throws NoModificationAllowedError if parent is null, #12132.
+	} else if ( nodeName === "object" ) {
+		if ( dest.parentNode ) {
+			dest.outerHTML = src.outerHTML;
+		}
+
+		// This path appears unavoidable for IE9. When cloning an object
+		// element in IE9, the outerHTML strategy above is not sufficient.
+		// If the src has innerHTML and the destination does not,
+		// copy the src.innerHTML into the dest.innerHTML. #10324
+		if ( jQuery.support.html5Clone && ( src.innerHTML && !jQuery.trim(dest.innerHTML) ) ) {
+			dest.innerHTML = src.innerHTML;
+		}
+
+	} else if ( nodeName === "input" && manipulation_rcheckableType.test( src.type ) ) {
+		// IE6-8 fails to persist the checked state of a cloned checkbox
+		// or radio button. Worse, IE6-7 fail to give the cloned element
+		// a checked appearance if the defaultChecked value isn't also set
+
+		dest.defaultChecked = dest.checked = src.checked;
+
+		// IE6-7 get confused and end up setting the value of a cloned
+		// checkbox/radio button to an empty string instead of "on"
+		if ( dest.value !== src.value ) {
+			dest.value = src.value;
+		}
+
+	// IE6-8 fails to return the selected option to the default selected
+	// state when cloning options
+	} else if ( nodeName === "option" ) {
+		dest.defaultSelected = dest.selected = src.defaultSelected;
+
+	// IE6-8 fails to set the defaultValue to the correct value when
+	// cloning other types of input fields
+	} else if ( nodeName === "input" || nodeName === "textarea" ) {
+		dest.defaultValue = src.defaultValue;
+	}
+}
+
+jQuery.each({
+	appendTo: "append",
+	prependTo: "prepend",
+	insertBefore: "before",
+	insertAfter: "after",
+	replaceAll: "replaceWith"
+}, function( name, original ) {
+	jQuery.fn[ name ] = function( selector ) {
+		var elems,
+			i = 0,
+			ret = [],
+			insert = jQuery( selector ),
+			last = insert.length - 1;
+
+		for ( ; i <= last; i++ ) {
+			elems = i === last ? this : this.clone(true);
+			jQuery( insert[i] )[ original ]( elems );
+
+			// Modern browsers can apply jQuery collections as arrays, but oldIE needs a .get()
+			core_push.apply( ret, elems.get() );
+		}
+
+		return this.pushStack( ret );
+	};
+});
+
+function getAll( context, tag ) {
+	var elems, elem,
+		i = 0,
+		found = typeof context.getElementsByTagName !== core_strundefined ? context.getElementsByTagName( tag || "*" ) :
+			typeof context.querySelectorAll !== core_strundefined ? context.querySelectorAll( tag || "*" ) :
+			undefined;
+
+	if ( !found ) {
+		for ( found = [], elems = context.childNodes || context; (elem = elems[i]) != null; i++ ) {
+			if ( !tag || jQuery.nodeName( elem, tag ) ) {
+				found.push( elem );
+			} else {
+				jQuery.merge( found, getAll( elem, tag ) );
+			}
+		}
+	}
+
+	return tag === undefined || tag && jQuery.nodeName( context, tag ) ?
+		jQuery.merge( [ context ], found ) :
+		found;
+}
+
+// Used in buildFragment, fixes the defaultChecked property
+function fixDefaultChecked( elem ) {
+	if ( manipulation_rcheckableType.test( elem.type ) ) {
+		elem.defaultChecked = elem.checked;
+	}
+}
+
+jQuery.extend({
+	clone: function( elem, dataAndEvents, deepDataAndEvents ) {
+		var destElements, node, clone, i, srcElements,
+			inPage = jQuery.contains( elem.ownerDocument, elem );
+
+		if ( jQuery.support.html5Clone || jQuery.isXMLDoc(elem) || !rnoshimcache.test( "<" + elem.nodeName + ">" ) ) {
+			clone = elem.cloneNode( true );
+
+		// IE<=8 does not properly clone detached, unknown element nodes
+		} else {
+			fragmentDiv.innerHTML = elem.outerHTML;
+			fragmentDiv.removeChild( clone = fragmentDiv.firstChild );
+		}
+
+		if ( (!jQuery.support.noCloneEvent || !jQuery.support.noCloneChecked) &&
+				(elem.nodeType === 1 || elem.nodeType === 11) && !jQuery.isXMLDoc(elem) ) {
+
+			// We eschew Sizzle here for performance reasons: http://jsperf.com/getall-vs-sizzle/2
+			destElements = getAll( clone );
+			srcElements = getAll( elem );
+
+			// Fix all IE cloning issues
+			for ( i = 0; (node = srcElements[i]) != null; ++i ) {
+				// Ensure that the destination node is not null; Fixes #9587
+				if ( destElements[i] ) {
+					fixCloneNodeIssues( node, destElements[i] );
+				}
+			}
+		}
+
+		// Copy the events from the original to the clone
+		if ( dataAndEvents ) {
+			if ( deepDataAndEvents ) {
+				srcElements = srcElements || getAll( elem );
+				destElements = destElements || getAll( clone );
+
+				for ( i = 0; (node = srcElements[i]) != null; i++ ) {
+					cloneCopyEvent( node, destElements[i] );
+				}
+			} else {
+				cloneCopyEvent( elem, clone );
+			}
+		}
+
+		// Preserve script evaluation history
+		destElements = getAll( clone, "script" );
+		if ( destElements.length > 0 ) {
+			setGlobalEval( destElements, !inPage && getAll( elem, "script" ) );
+		}
+
+		destElements = srcElements = node = null;
+
+		// Return the cloned set
+		return clone;
+	},
+
+	buildFragment: function( elems, context, scripts, selection ) {
+		var j, elem, contains,
+			tmp, tag, tbody, wrap,
+			l = elems.length,
+
+			// Ensure a safe fragment
+			safe = createSafeFragment( context ),
+
+			nodes = [],
+			i = 0;
+
+		for ( ; i < l; i++ ) {
+			elem = elems[ i ];
+
+			if ( elem || elem === 0 ) {
+
+				// Add nodes directly
+				if ( jQuery.type( elem ) === "object" ) {
+					jQuery.merge( nodes, elem.nodeType ? [ elem ] : elem );
+
+				// Convert non-html into a text node
+				} else if ( !rhtml.test( elem ) ) {
+					nodes.push( context.createTextNode( elem ) );
+
+				// Convert html into DOM nodes
+				} else {
+					tmp = tmp || safe.appendChild( context.createElement("div") );
+
+					// Deserialize a standard representation
+					tag = ( rtagName.exec( elem ) || ["", ""] )[1].toLowerCase();
+					wrap = wrapMap[ tag ] || wrapMap._default;
+
+					tmp.innerHTML = wrap[1] + elem.replace( rxhtmlTag, "<$1></$2>" ) + wrap[2];
+
+					// Descend through wrappers to the right content
+					j = wrap[0];
+					while ( j-- ) {
+						tmp = tmp.lastChild;
+					}
+
+					// Manually add leading whitespace removed by IE
+					if ( !jQuery.support.leadingWhitespace && rleadingWhitespace.test( elem ) ) {
+						nodes.push( context.createTextNode( rleadingWhitespace.exec( elem )[0] ) );
+					}
+
+					// Remove IE's autoinserted <tbody> from table fragments
+					if ( !jQuery.support.tbody ) {
+
+						// String was a <table>, *may* have spurious <tbody>
+						elem = tag === "table" && !rtbody.test( elem ) ?
+							tmp.firstChild :
+
+							// String was a bare <thead> or <tfoot>
+							wrap[1] === "<table>" && !rtbody.test( elem ) ?
+								tmp :
+								0;
+
+						j = elem && elem.childNodes.length;
+						while ( j-- ) {
+							if ( jQuery.nodeName( (tbody = elem.childNodes[j]), "tbody" ) && !tbody.childNodes.length ) {
+								elem.removeChild( tbody );
+							}
+						}
+					}
+
+					jQuery.merge( nodes, tmp.childNodes );
+
+					// Fix #12392 for WebKit and IE > 9
+					tmp.textContent = "";
+
+					// Fix #12392 for oldIE
+					while ( tmp.firstChild ) {
+						tmp.removeChild( tmp.firstChild );
+					}
+
+					// Remember the top-level container for proper cleanup
+					tmp = safe.lastChild;
+				}
+			}
+		}
+
+		// Fix #11356: Clear elements from fragment
+		if ( tmp ) {
+			safe.removeChild( tmp );
+		}
+
+		// Reset defaultChecked for any radios and checkboxes
+		// about to be appended to the DOM in IE 6/7 (#8060)
+		if ( !jQuery.support.appendChecked ) {
+			jQuery.grep( getAll( nodes, "input" ), fixDefaultChecked );
+		}
+
+		i = 0;
+		while ( (elem = nodes[ i++ ]) ) {
+
+			// #4087 - If origin and destination elements are the same, and this is
+			// that element, do not do anything
+			if ( selection && jQuery.inArray( elem, selection ) !== -1 ) {
+				continue;
+			}
+
+			contains = jQuery.contains( elem.ownerDocument, elem );
+
+			// Append to fragment
+			tmp = getAll( safe.appendChild( elem ), "script" );
+
+			// Preserve script evaluation history
+			if ( contains ) {
+				setGlobalEval( tmp );
+			}
+
+			// Capture executables
+			if ( scripts ) {
+				j = 0;
+				while ( (elem = tmp[ j++ ]) ) {
+					if ( rscriptType.test( elem.type || "" ) ) {
+						scripts.push( elem );
+					}
+				}
+			}
+		}
+
+		tmp = null;
+
+		return safe;
+	},
+
+	cleanData: function( elems, /* internal */ acceptData ) {
+		var elem, type, id, data,
+			i = 0,
+			internalKey = jQuery.expando,
+			cache = jQuery.cache,
+			deleteExpando = jQuery.support.deleteExpando,
+			special = jQuery.event.special;
+
+		for ( ; (elem = elems[i]) != null; i++ ) {
+
+			if ( acceptData || jQuery.acceptData( elem ) ) {
+
+				id = elem[ internalKey ];
+				data = id && cache[ id ];
+
+				if ( data ) {
+					if ( data.events ) {
+						for ( type in data.events ) {
+							if ( special[ type ] ) {
+								jQuery.event.remove( elem, type );
+
+							// This is a shortcut to avoid jQuery.event.remove's overhead
+							} else {
+								jQuery.removeEvent( elem, type, data.handle );
+							}
+						}
+					}
+
+					// Remove cache only if it was not already removed by jQuery.event.remove
+					if ( cache[ id ] ) {
+
+						delete cache[ id ];
+
+						// IE does not allow us to delete expando properties from nodes,
+						// nor does it have a removeAttribute function on Document nodes;
+						// we must handle all of these cases
+						if ( deleteExpando ) {
+							delete elem[ internalKey ];
+
+						} else if ( typeof elem.removeAttribute !== core_strundefined ) {
+							elem.removeAttribute( internalKey );
+
+						} else {
+							elem[ internalKey ] = null;
+						}
+
+						core_deletedIds.push( id );
+					}
+				}
+			}
+		}
+	},
+
+	_evalUrl: function( url ) {
+		return jQuery.ajax({
+			url: url,
+			type: "GET",
+			dataType: "script",
+			async: false,
+			global: false,
+			"throws": true
+		});
+	}
+});
+jQuery.fn.extend({
+	wrapAll: function( html ) {
+		if ( jQuery.isFunction( html ) ) {
+			return this.each(function(i) {
+				jQuery(this).wrapAll( html.call(this, i) );
+			});
+		}
+
+		if ( this[0] ) {
+			// The elements to wrap the target around
+			var wrap = jQuery( html, this[0].ownerDocument ).eq(0).clone(true);
+
+			if ( this[0].parentNode ) {
+				wrap.insertBefore( this[0] );
+			}
+
+			wrap.map(function() {
+				var elem = this;
+
+				while ( elem.firstChild && elem.firstChild.nodeType === 1 ) {
+					elem = elem.firstChild;
+				}
+
+				return elem;
+			}).append( this );
+		}
+
+		return this;
+	},
+
+	wrapInner: function( html ) {
+		if ( jQuery.isFunction( html ) ) {
+			return this.each(function(i) {
+				jQuery(this).wrapInner( html.call(this, i) );
+			});
+		}
+
+		return this.each(function() {
+			var self = jQuery( this ),
+				contents = self.contents();
+
+			if ( contents.length ) {
+				contents.wrapAll( html );
+
+			} else {
+				self.append( html );
+			}
+		});
+	},
+
+	wrap: function( html ) {
+		var isFunction = jQuery.isFunction( html );
+
+		return this.each(function(i) {
+			jQuery( this ).wrapAll( isFunction ? html.call(this, i) : html );
+		});
+	},
+
+	unwrap: function() {
+		return this.parent().each(function() {
+			if ( !jQuery.nodeName( this, "body" ) ) {
+				jQuery( this ).replaceWith( this.childNodes );
+			}
+		}).end();
+	}
+});
+var iframe, getStyles, curCSS,
+	ralpha = /alpha\([^)]*\)/i,
+	ropacity = /opacity\s*=\s*([^)]*)/,
+	rposition = /^(top|right|bottom|left)$/,
+	// swappable if display is none or starts with table except "table", "table-cell", or "table-caption"
+	// see here for display values: https://developer.mozilla.org/en-US/docs/CSS/display
+	rdisplayswap = /^(none|table(?!-c[ea]).+)/,
+	rmargin = /^margin/,
+	rnumsplit = new RegExp( "^(" + core_pnum + ")(.*)$", "i" ),
+	rnumnonpx = new RegExp( "^(" + core_pnum + ")(?!px)[a-z%]+$", "i" ),
+	rrelNum = new RegExp( "^([+-])=(" + core_pnum + ")", "i" ),
+	elemdisplay = { BODY: "block" },
+
+	cssShow = { position: "absolute", visibility: "hidden", display: "block" },
+	cssNormalTransform = {
+		letterSpacing: 0,
+		fontWeight: 400
+	},
+
+	cssExpand = [ "Top", "Right", "Bottom", "Left" ],
+	cssPrefixes = [ "Webkit", "O", "Moz", "ms" ];
+
+// return a css property mapped to a potentially vendor prefixed property
+function vendorPropName( style, name ) {
+
+	// shortcut for names that are not vendor prefixed
+	if ( name in style ) {
+		return name;
+	}
+
+	// check for vendor prefixed names
+	var capName = name.charAt(0).toUpperCase() + name.slice(1),
+		origName = name,
+		i = cssPrefixes.length;
+
+	while ( i-- ) {
+		name = cssPrefixes[ i ] + capName;
+		if ( name in style ) {
+			return name;
+		}
+	}
+
+	return origName;
+}
+
+function isHidden( elem, el ) {
+	// isHidden might be called from jQuery#filter function;
+	// in that case, element will be second argument
+	elem = el || elem;
+	return jQuery.css( elem, "display" ) === "none" || !jQuery.contains( elem.ownerDocument, elem );
+}
+
+function showHide( elements, show ) {
+	var display, elem, hidden,
+		values = [],
+		index = 0,
+		length = elements.length;
+
+	for ( ; index < length; index++ ) {
+		elem = elements[ index ];
+		if ( !elem.style ) {
+			continue;
+		}
+
+		values[ index ] = jQuery._data( elem, "olddisplay" );
+		display = elem.style.display;
+		if ( show ) {
+			// Reset the inline display of this element to learn if it is
+			// being hidden by cascaded rules or not
+			if ( !values[ index ] && display === "none" ) {
+				elem.style.display = "";
+			}
+
+			// Set elements which have been overridden with display: none
+			// in a stylesheet to whatever the default browser style is
+			// for such an element
+			if ( elem.style.display === "" && isHidden( elem ) ) {
+				values[ index ] = jQuery._data( elem, "olddisplay", css_defaultDisplay(elem.nodeName) );
+			}
+		} else {
+
+			if ( !values[ index ] ) {
+				hidden = isHidden( elem );
+
+				if ( display && display !== "none" || !hidden ) {
+					jQuery._data( elem, "olddisplay", hidden ? display : jQuery.css( elem, "display" ) );
+				}
+			}
+		}
+	}
+
+	// Set the display of most of the elements in a second loop
+	// to avoid the constant reflow
+	for ( index = 0; index < length; index++ ) {
+		elem = elements[ index ];
+		if ( !elem.style ) {
+			continue;
+		}
+		if ( !show || elem.style.display === "none" || elem.style.display === "" ) {
+			elem.style.display = show ? values[ index ] || "" : "none";
+		}
+	}
+
+	return elements;
+}
+
+jQuery.fn.extend({
+	css: function( name, value ) {
+		return jQuery.access( this, function( elem, name, value ) {
+			var len, styles,
+				map = {},
+				i = 0;
+
+			if ( jQuery.isArray( name ) ) {
+				styles = getStyles( elem );
+				len = name.length;
+
+				for ( ; i < len; i++ ) {
+					map[ name[ i ] ] = jQuery.css( elem, name[ i ], false, styles );
+				}
+
+				return map;
+			}
+
+			return value !== undefined ?
+				jQuery.style( elem, name, value ) :
+				jQuery.css( elem, name );
+		}, name, value, arguments.length > 1 );
+	},
+	show: function() {
+		return showHide( this, true );
+	},
+	hide: function() {
+		return showHide( this );
+	},
+	toggle: function( state ) {
+		var bool = typeof state === "boolean";
+
+		return this.each(function() {
+			if ( bool ? state : isHidden( this ) ) {
+				jQuery( this ).show();
+			} else {
+				jQuery( this ).hide();
+			}
+		});
+	}
+});
+
+jQuery.extend({
+	// Add in style property hooks for overriding the default
+	// behavior of getting and setting a style property
+	cssHooks: {
+		opacity: {
+			get: function( elem, computed ) {
+				if ( computed ) {
+					// We should always get a number back from opacity
+					var ret = curCSS( elem, "opacity" );
+					return ret === "" ? "1" : ret;
+				}
+			}
+		}
+	},
+
+	// Don't automatically add "px" to these possibly-unitless properties
+	cssNumber: {
+		"columnCount": true,
+		"fillOpacity": true,
+		"fontWeight": true,
+		"lineHeight": true,
+		"opacity": true,
+		"orphans": true,
+		"widows": true,
+		"zIndex": true,
+		"zoom": true
+	},
+
+	// Add in properties whose names you wish to fix before
+	// setting or getting the value
+	cssProps: {
+		// normalize float css property
+		"float": jQuery.support.cssFloat ? "cssFloat" : "styleFloat"
+	},
+
+	// Get and set the style property on a DOM Node
+	style: function( elem, name, value, extra ) {
+		// Don't set styles on text and comment nodes
+		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style ) {
+			return;
+		}
+
+		// Make sure that we're working with the right name
+		var ret, type, hooks,
+			origName = jQuery.camelCase( name ),
+			style = elem.style;
+
+		name = jQuery.cssProps[ origName ] || ( jQuery.cssProps[ origName ] = vendorPropName( style, origName ) );
+
+		// gets hook for the prefixed version
+		// followed by the unprefixed version
+		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
+
+		// Check if we're setting a value
+		if ( value !== undefined ) {
+			type = typeof value;
+
+			// convert relative number strings (+= or -=) to relative numbers. #7345
+			if ( type === "string" && (ret = rrelNum.exec( value )) ) {
+				value = ( ret[1] + 1 ) * ret[2] + parseFloat( jQuery.css( elem, name ) );
+				// Fixes bug #9237
+				type = "number";
+			}
+
+			// Make sure that NaN and null values aren't set. See: #7116
+			if ( value == null || type === "number" && isNaN( value ) ) {
+				return;
+			}
+
+			// If a number was passed in, add 'px' to the (except for certain CSS properties)
+			if ( type === "number" && !jQuery.cssNumber[ origName ] ) {
+				value += "px";
+			}
+
+			// Fixes #8908, it can be done more correctly by specifing setters in cssHooks,
+			// but it would mean to define eight (for every problematic property) identical functions
+			if ( !jQuery.support.clearCloneStyle && value === "" && name.indexOf("background") === 0 ) {
+				style[ name ] = "inherit";
+			}
+
+			// If a hook was provided, use that value, otherwise just set the specified value
+			if ( !hooks || !("set" in hooks) || (value = hooks.set( elem, value, extra )) !== undefined ) {
+
+				// Wrapped to prevent IE from throwing errors when 'invalid' values are provided
+				// Fixes bug #5509
+				try {
+					style[ name ] = value;
+				} catch(e) {}
+			}
+
+		} else {
+			// If a hook was provided get the non-computed value from there
+			if ( hooks && "get" in hooks && (ret = hooks.get( elem, false, extra )) !== undefined ) {
+				return ret;
+			}
+
+			// Otherwise just get the value from the style object
+			return style[ name ];
+		}
+	},
+
+	css: function( elem, name, extra, styles ) {
+		var num, val, hooks,
+			origName = jQuery.camelCase( name );
+
+		// Make sure that we're working with the right name
+		name = jQuery.cssProps[ origName ] || ( jQuery.cssProps[ origName ] = vendorPropName( elem.style, origName ) );
+
+		// gets hook for the prefixed version
+		// followed by the unprefixed version
+		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
+
+		// If a hook was provided get the computed value from there
+		if ( hooks && "get" in hooks ) {
+			val = hooks.get( elem, true, extra );
+		}
+
+		// Otherwise, if a way to get the computed value exists, use that
+		if ( val === undefined ) {
+			val = curCSS( elem, name, styles );
+		}
+
+		//convert "normal" to computed value
+		if ( val === "normal" && name in cssNormalTransform ) {
+			val = cssNormalTransform[ name ];
+		}
+
+		// Return, converting to number if forced or a qualifier was provided and val looks numeric
+		if ( extra === "" || extra ) {
+			num = parseFloat( val );
+			return extra === true || jQuery.isNumeric( num ) ? num || 0 : val;
+		}
+		return val;
+	}
+});
+
+// NOTE: we've included the "window" in window.getComputedStyle
+// because jsdom on node.js will break without it.
+if ( window.getComputedStyle ) {
+	getStyles = function( elem ) {
+		return window.getComputedStyle( elem, null );
+	};
+
+	curCSS = function( elem, name, _computed ) {
+		var width, minWidth, maxWidth,
+			computed = _computed || getStyles( elem ),
+
+			// getPropertyValue is only needed for .css('filter') in IE9, see #12537
+			ret = computed ? computed.getPropertyValue( name ) || computed[ name ] : undefined,
+			style = elem.style;
+
+		if ( computed ) {
+
+			if ( ret === "" && !jQuery.contains( elem.ownerDocument, elem ) ) {
+				ret = jQuery.style( elem, name );
+			}
+
+			// A tribute to the "awesome hack by Dean Edwards"
+			// Chrome < 17 and Safari 5.0 uses "computed value" instead of "used value" for margin-right
+			// Safari 5.1.7 (at least) returns percentage for a larger set of values, but width seems to be reliably pixels
+			// this is against the CSSOM draft spec: http://dev.w3.org/csswg/cssom/#resolved-values
+			if ( rnumnonpx.test( ret ) && rmargin.test( name ) ) {
+
+				// Remember the original values
+				width = style.width;
+				minWidth = style.minWidth;
+				maxWidth = style.maxWidth;
+
+				// Put in the new values to get a computed value out
+				style.minWidth = style.maxWidth = style.width = ret;
+				ret = computed.width;
+
+				// Revert the changed values
+				style.width = width;
+				style.minWidth = minWidth;
+				style.maxWidth = maxWidth;
+			}
+		}
+
+		return ret;
+	};
+} else if ( document.documentElement.currentStyle ) {
+	getStyles = function( elem ) {
+		return elem.currentStyle;
+	};
+
+	curCSS = function( elem, name, _computed ) {
+		var left, rs, rsLeft,
+			computed = _computed || getStyles( elem ),
+			ret = computed ? computed[ name ] : undefined,
+			style = elem.style;
+
+		// Avoid setting ret to empty string here
+		// so we don't default to auto
+		if ( ret == null && style && style[ name ] ) {
+			ret = style[ name ];
+		}
+
+		// From the awesome hack by Dean Edwards
+		// http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
+
+		// If we're not dealing with a regular pixel number
+		// but a number that has a weird ending, we need to convert it to pixels
+		// but not position css attributes, as those are proportional to the parent element instead
+		// and we can't measure the parent instead because it might trigger a "stacking dolls" problem
+		if ( rnumnonpx.test( ret ) && !rposition.test( name ) ) {
+
+			// Remember the original values
+			left = style.left;
+			rs = elem.runtimeStyle;
+			rsLeft = rs && rs.left;
+
+			// Put in the new values to get a computed value out
+			if ( rsLeft ) {
+				rs.left = elem.currentStyle.left;
+			}
+			style.left = name === "fontSize" ? "1em" : ret;
+			ret = style.pixelLeft + "px";
+
+			// Revert the changed values
+			style.left = left;
+			if ( rsLeft ) {
+				rs.left = rsLeft;
+			}
+		}
+
+		return ret === "" ? "auto" : ret;
+	};
+}
+
+function setPositiveNumber( elem, value, subtract ) {
+	var matches = rnumsplit.exec( value );
+	return matches ?
+		// Guard against undefined "subtract", e.g., when used as in cssHooks
+		Math.max( 0, matches[ 1 ] - ( subtract || 0 ) ) + ( matches[ 2 ] || "px" ) :
+		value;
+}
+
+function augmentWidthOrHeight( elem, name, extra, isBorderBox, styles ) {
+	var i = extra === ( isBorderBox ? "border" : "content" ) ?
+		// If we already have the right measurement, avoid augmentation
+		4 :
+		// Otherwise initialize for horizontal or vertical properties
+		name === "width" ? 1 : 0,
+
+		val = 0;
+
+	for ( ; i < 4; i += 2 ) {
+		// both box models exclude margin, so add it if we want it
+		if ( extra === "margin" ) {
+			val += jQuery.css( elem, extra + cssExpand[ i ], true, styles );
+		}
+
+		if ( isBorderBox ) {
+			// border-box includes padding, so remove it if we want content
+			if ( extra === "content" ) {
+				val -= jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
+			}
+
+			// at this point, extra isn't border nor margin, so remove border
+			if ( extra !== "margin" ) {
+				val -= jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
+			}
+		} else {
+			// at this point, extra isn't content, so add padding
+			val += jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
+
+			// at this point, extra isn't content nor padding, so add border
+			if ( extra !== "padding" ) {
+				val += jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
+			}
+		}
+	}
+
+	return val;
+}
+
+function getWidthOrHeight( elem, name, extra ) {
+
+	// Start with offset property, which is equivalent to the border-box value
+	var valueIsBorderBox = true,
+		val = name === "width" ? elem.offsetWidth : elem.offsetHeight,
+		styles = getStyles( elem ),
+		isBorderBox = jQuery.support.boxSizing && jQuery.css( elem, "boxSizing", false, styles ) === "border-box";
+
+	// some non-html elements return undefined for offsetWidth, so check for null/undefined
+	// svg - https://bugzilla.mozilla.org/show_bug.cgi?id=649285
+	// MathML - https://bugzilla.mozilla.org/show_bug.cgi?id=491668
+	if ( val <= 0 || val == null ) {
+		// Fall back to computed then uncomputed css if necessary
+		val = curCSS( elem, name, styles );
+		if ( val < 0 || val == null ) {
+			val = elem.style[ name ];
+		}
+
+		// Computed unit is not pixels. Stop here and return.
+		if ( rnumnonpx.test(val) ) {
+			return val;
+		}
+
+		// we need the check for style in case a browser which returns unreliable values
+		// for getComputedStyle silently falls back to the reliable elem.style
+		valueIsBorderBox = isBorderBox && ( jQuery.support.boxSizingReliable || val === elem.style[ name ] );
+
+		// Normalize "", auto, and prepare for extra
+		val = parseFloat( val ) || 0;
+	}
+
+	// use the active box-sizing model to add/subtract irrelevant styles
+	return ( val +
+		augmentWidthOrHeight(
+			elem,
+			name,
+			extra || ( isBorderBox ? "border" : "content" ),
+			valueIsBorderBox,
+			styles
+		)
+	) + "px";
+}
+
+// Try to determine the default display value of an element
+function css_defaultDisplay( nodeName ) {
+	var doc = document,
+		display = elemdisplay[ nodeName ];
+
+	if ( !display ) {
+		display = actualDisplay( nodeName, doc );
+
+		// If the simple way fails, read from inside an iframe
+		if ( display === "none" || !display ) {
+			// Use the already-created iframe if possible
+			iframe = ( iframe ||
+				jQuery("<iframe frameborder='0' width='0' height='0'/>")
+				.css( "cssText", "display:block !important" )
+			).appendTo( doc.documentElement );
+
+			// Always write a new HTML skeleton so Webkit and Firefox don't choke on reuse
+			doc = ( iframe[0].contentWindow || iframe[0].contentDocument ).document;
+			doc.write("<!doctype html><html><body>");
+			doc.close();
+
+			display = actualDisplay( nodeName, doc );
+			iframe.detach();
+		}
+
+		// Store the correct default display
+		elemdisplay[ nodeName ] = display;
+	}
+
+	return display;
+}
+
+// Called ONLY from within css_defaultDisplay
+function actualDisplay( name, doc ) {
+	var elem = jQuery( doc.createElement( name ) ).appendTo( doc.body ),
+		display = jQuery.css( elem[0], "display" );
+	elem.remove();
+	return display;
+}
+
+jQuery.each([ "height", "width" ], function( i, name ) {
+	jQuery.cssHooks[ name ] = {
+		get: function( elem, computed, extra ) {
+			if ( computed ) {
+				// certain elements can have dimension info if we invisibly show them
+				// however, it must have a current display style that would benefit from this
+				return elem.offsetWidth === 0 && rdisplayswap.test( jQuery.css( elem, "display" ) ) ?
+					jQuery.swap( elem, cssShow, function() {
+						return getWidthOrHeight( elem, name, extra );
+					}) :
+					getWidthOrHeight( elem, name, extra );
+			}
+		},
+
+		set: function( elem, value, extra ) {
+			var styles = extra && getStyles( elem );
+			return setPositiveNumber( elem, value, extra ?
+				augmentWidthOrHeight(
+					elem,
+					name,
+					extra,
+					jQuery.support.boxSizing && jQuery.css( elem, "boxSizing", false, styles ) === "border-box",
+					styles
+				) : 0
+			);
+		}
+	};
+});
+
+if ( !jQuery.support.opacity ) {
+	jQuery.cssHooks.opacity = {
+		get: function( elem, computed ) {
+			// IE uses filters for opacity
+			return ropacity.test( (computed && elem.currentStyle ? elem.currentStyle.filter : elem.style.filter) || "" ) ?
+				( 0.01 * parseFloat( RegExp.$1 ) ) + "" :
+				computed ? "1" : "";
+		},
+
+		set: function( elem, value ) {
+			var style = elem.style,
+				currentStyle = elem.currentStyle,
+				opacity = jQuery.isNumeric( value ) ? "alpha(opacity=" + value * 100 + ")" : "",
+				filter = currentStyle && currentStyle.filter || style.filter || "";
+
+			// IE has trouble with opacity if it does not have layout
+			// Force it by setting the zoom level
+			style.zoom = 1;
+
+			// if setting opacity to 1, and no other filters exist - attempt to remove filter attribute #6652
+			// if value === "", then remove inline opacity #12685
+			if ( ( value >= 1 || value === "" ) &&
+					jQuery.trim( filter.replace( ralpha, "" ) ) === "" &&
+					style.removeAttribute ) {
+
+				// Setting style.filter to null, "" & " " still leave "filter:" in the cssText
+				// if "filter:" is present at all, clearType is disabled, we want to avoid this
+				// style.removeAttribute is IE Only, but so apparently is this code path...
+				style.removeAttribute( "filter" );
+
+				// if there is no filter style applied in a css rule or unset inline opacity, we are done
+				if ( value === "" || currentStyle && !currentStyle.filter ) {
+					return;
+				}
+			}
+
+			// otherwise, set new filter values
+			style.filter = ralpha.test( filter ) ?
+				filter.replace( ralpha, opacity ) :
+				filter + " " + opacity;
+		}
+	};
+}
+
+// These hooks cannot be added until DOM ready because the support test
+// for it is not run until after DOM ready
+jQuery(function() {
+	if ( !jQuery.support.reliableMarginRight ) {
+		jQuery.cssHooks.marginRight = {
+			get: function( elem, computed ) {
+				if ( computed ) {
+					// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
+					// Work around by temporarily setting element display to inline-block
+					return jQuery.swap( elem, { "display": "inline-block" },
+						curCSS, [ elem, "marginRight" ] );
+				}
+			}
+		};
+	}
+
+	// Webkit bug: https://bugs.webkit.org/show_bug.cgi?id=29084
+	// getComputedStyle returns percent when specified for top/left/bottom/right
+	// rather than make the css module depend on the offset module, we just check for it here
+	if ( !jQuery.support.pixelPosition && jQuery.fn.position ) {
+		jQuery.each( [ "top", "left" ], function( i, prop ) {
+			jQuery.cssHooks[ prop ] = {
+				get: function( elem, computed ) {
+					if ( computed ) {
+						computed = curCSS( elem, prop );
+						// if curCSS returns percentage, fallback to offset
+						return rnumnonpx.test( computed ) ?
+							jQuery( elem ).position()[ prop ] + "px" :
+							computed;
+					}
+				}
+			};
+		});
+	}
+
+});
+
+if ( jQuery.expr && jQuery.expr.filters ) {
+	jQuery.expr.filters.hidden = function( elem ) {
+		// Support: Opera <= 12.12
+		// Opera reports offsetWidths and offsetHeights less than zero on some elements
+		return elem.offsetWidth <= 0 && elem.offsetHeight <= 0 ||
+			(!jQuery.support.reliableHiddenOffsets && ((elem.style && elem.style.display) || jQuery.css( elem, "display" )) === "none");
+	};
+
+	jQuery.expr.filters.visible = function( elem ) {
+		return !jQuery.expr.filters.hidden( elem );
+	};
+}
+
+// These hooks are used by animate to expand properties
+jQuery.each({
+	margin: "",
+	padding: "",
+	border: "Width"
+}, function( prefix, suffix ) {
+	jQuery.cssHooks[ prefix + suffix ] = {
+		expand: function( value ) {
+			var i = 0,
+				expanded = {},
+
+				// assumes a single number if not a string
+				parts = typeof value === "string" ? value.split(" ") : [ value ];
+
+			for ( ; i < 4; i++ ) {
+				expanded[ prefix + cssExpand[ i ] + suffix ] =
+					parts[ i ] || parts[ i - 2 ] || parts[ 0 ];
+			}
+
+			return expanded;
+		}
+	};
+
+	if ( !rmargin.test( prefix ) ) {
+		jQuery.cssHooks[ prefix + suffix ].set = setPositiveNumber;
+	}
+});
+var r20 = /%20/g,
+	rbracket = /\[\]$/,
+	rCRLF = /\r?\n/g,
+	rsubmitterTypes = /^(?:submit|button|image|reset|file)$/i,
+	rsubmittable = /^(?:input|select|textarea|keygen)/i;
+
+jQuery.fn.extend({
+	serialize: function() {
+		return jQuery.param( this.serializeArray() );
+	},
+	serializeArray: function() {
+		return this.map(function(){
+			// Can add propHook for "elements" to filter or add form elements
+			var elements = jQuery.prop( this, "elements" );
+			return elements ? jQuery.makeArray( elements ) : this;
+		})
+		.filter(function(){
+			var type = this.type;
+			// Use .is(":disabled") so that fieldset[disabled] works
+			return this.name && !jQuery( this ).is( ":disabled" ) &&
+				rsubmittable.test( this.nodeName ) && !rsubmitterTypes.test( type ) &&
+				( this.checked || !manipulation_rcheckableType.test( type ) );
+		})
+		.map(function( i, elem ){
+			var val = jQuery( this ).val();
+
+			return val == null ?
+				null :
+				jQuery.isArray( val ) ?
+					jQuery.map( val, function( val ){
+						return { name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
+					}) :
+					{ name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
+		}).get();
+	}
+});
+
+//Serialize an array of form elements or a set of
+//key/values into a query string
+jQuery.param = function( a, traditional ) {
+	var prefix,
+		s = [],
+		add = function( key, value ) {
+			// If value is a function, invoke it and return its value
+			value = jQuery.isFunction( value ) ? value() : ( value == null ? "" : value );
+			s[ s.length ] = encodeURIComponent( key ) + "=" + encodeURIComponent( value );
+		};
+
+	// Set traditional to true for jQuery <= 1.3.2 behavior.
+	if ( traditional === undefined ) {
+		traditional = jQuery.ajaxSettings && jQuery.ajaxSettings.traditional;
+	}
+
+	// If an array was passed in, assume that it is an array of form elements.
+	if ( jQuery.isArray( a ) || ( a.jquery && !jQuery.isPlainObject( a ) ) ) {
+		// Serialize the form elements
+		jQuery.each( a, function() {
+			add( this.name, this.value );
+		});
+
+	} else {
+		// If traditional, encode the "old" way (the way 1.3.2 or older
+		// did it), otherwise encode params recursively.
+		for ( prefix in a ) {
+			buildParams( prefix, a[ prefix ], traditional, add );
+		}
+	}
+
+	// Return the resulting serialization
+	return s.join( "&" ).replace( r20, "+" );
+};
+
+function buildParams( prefix, obj, traditional, add ) {
+	var name;
+
+	if ( jQuery.isArray( obj ) ) {
+		// Serialize array item.
+		jQuery.each( obj, function( i, v ) {
+			if ( traditional || rbracket.test( prefix ) ) {
+				// Treat each array item as a scalar.
+				add( prefix, v );
+
+			} else {
+				// Item is non-scalar (array or object), encode its numeric index.
+				buildParams( prefix + "[" + ( typeof v === "object" ? i : "" ) + "]", v, traditional, add );
+			}
+		});
+
+	} else if ( !traditional && jQuery.type( obj ) === "object" ) {
+		// Serialize object item.
+		for ( name in obj ) {
+			buildParams( prefix + "[" + name + "]", obj[ name ], traditional, add );
+		}
+
+	} else {
+		// Serialize scalar item.
+		add( prefix, obj );
+	}
+}
+jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblclick " +
+	"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
+	"change select submit keydown keypress keyup error contextmenu").split(" "), function( i, name ) {
+
+	// Handle event binding
+	jQuery.fn[ name ] = function( data, fn ) {
+		return arguments.length > 0 ?
+			this.on( name, null, data, fn ) :
+			this.trigger( name );
+	};
+});
+
+jQuery.fn.extend({
+	hover: function( fnOver, fnOut ) {
+		return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
+	},
+
+	bind: function( types, data, fn ) {
+		return this.on( types, null, data, fn );
+	},
+	unbind: function( types, fn ) {
+		return this.off( types, null, fn );
+	},
+
+	delegate: function( selector, types, data, fn ) {
+		return this.on( types, selector, data, fn );
+	},
+	undelegate: function( selector, types, fn ) {
+		// ( namespace ) or ( selector, types [, fn] )
+		return arguments.length === 1 ? this.off( selector, "**" ) : this.off( types, selector || "**", fn );
+	}
+});
+var
+	// Document location
+	ajaxLocParts,
+	ajaxLocation,
+	ajax_nonce = jQuery.now(),
+
+	ajax_rquery = /\?/,
+	rhash = /#.*$/,
+	rts = /([?&])_=[^&]*/,
+	rheaders = /^(.*?):[ \t]*([^\r\n]*)\r?$/mg, // IE leaves an \r character at EOL
+	// #7653, #8125, #8152: local protocol detection
+	rlocalProtocol = /^(?:about|app|app-storage|.+-extension|file|res|widget):$/,
+	rnoContent = /^(?:GET|HEAD)$/,
+	rprotocol = /^\/\//,
+	rurl = /^([\w.+-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,
+
+	// Keep a copy of the old load method
+	_load = jQuery.fn.load,
+
+	/* Prefilters
+	 * 1) They are useful to introduce custom dataTypes (see ajax/jsonp.js for an example)
+	 * 2) These are called:
+	 *    - BEFORE asking for a transport
+	 *    - AFTER param serialization (s.data is a string if s.processData is true)
+	 * 3) key is the dataType
+	 * 4) the catchall symbol "*" can be used
+	 * 5) execution will start with transport dataType and THEN continue down to "*" if needed
+	 */
+	prefilters = {},
+
+	/* Transports bindings
+	 * 1) key is the dataType
+	 * 2) the catchall symbol "*" can be used
+	 * 3) selection will start with transport dataType and THEN go to "*" if needed
+	 */
+	transports = {},
+
+	// Avoid comment-prolog char sequence (#10098); must appease lint and evade compression
+	allTypes = "*/".concat("*");
+
+// #8138, IE may throw an exception when accessing
+// a field from window.location if document.domain has been set
+try {
+	ajaxLocation = location.href;
+} catch( e ) {
+	// Use the href attribute of an A element
+	// since IE will modify it given document.location
+	ajaxLocation = document.createElement( "a" );
+	ajaxLocation.href = "";
+	ajaxLocation = ajaxLocation.href;
+}
+
+// Segment location into parts
+ajaxLocParts = rurl.exec( ajaxLocation.toLowerCase() ) || [];
+
+// Base "constructor" for jQuery.ajaxPrefilter and jQuery.ajaxTransport
+function addToPrefiltersOrTransports( structure ) {
+
+	// dataTypeExpression is optional and defaults to "*"
+	return function( dataTypeExpression, func ) {
+
+		if ( typeof dataTypeExpression !== "string" ) {
+			func = dataTypeExpression;
+			dataTypeExpression = "*";
+		}
+
+		var dataType,
+			i = 0,
+			dataTypes = dataTypeExpression.toLowerCase().match( core_rnotwhite ) || [];
+
+		if ( jQuery.isFunction( func ) ) {
+			// For each dataType in the dataTypeExpression
+			while ( (dataType = dataTypes[i++]) ) {
+				// Prepend if requested
+				if ( dataType[0] === "+" ) {
+					dataType = dataType.slice( 1 ) || "*";
+					(structure[ dataType ] = structure[ dataType ] || []).unshift( func );
+
+				// Otherwise append
+				} else {
+					(structure[ dataType ] = structure[ dataType ] || []).push( func );
+				}
+			}
+		}
+	};
+}
+
+// Base inspection function for prefilters and transports
+function inspectPrefiltersOrTransports( structure, options, originalOptions, jqXHR ) {
+
+	var inspected = {},
+		seekingTransport = ( structure === transports );
+
+	function inspect( dataType ) {
+		var selected;
+		inspected[ dataType ] = true;
+		jQuery.each( structure[ dataType ] || [], function( _, prefilterOrFactory ) {
+			var dataTypeOrTransport = prefilterOrFactory( options, originalOptions, jqXHR );
+			if( typeof dataTypeOrTransport === "string" && !seekingTransport && !inspected[ dataTypeOrTransport ] ) {
+				options.dataTypes.unshift( dataTypeOrTransport );
+				inspect( dataTypeOrTransport );
+				return false;
+			} else if ( seekingTransport ) {
+				return !( selected = dataTypeOrTransport );
+			}
+		});
+		return selected;
+	}
+
+	return inspect( options.dataTypes[ 0 ] ) || !inspected[ "*" ] && inspect( "*" );
+}
+
+// A special extend for ajax options
+// that takes "flat" options (not to be deep extended)
+// Fixes #9887
+function ajaxExtend( target, src ) {
+	var deep, key,
+		flatOptions = jQuery.ajaxSettings.flatOptions || {};
+
+	for ( key in src ) {
+		if ( src[ key ] !== undefined ) {
+			( flatOptions[ key ] ? target : ( deep || (deep = {}) ) )[ key ] = src[ key ];
+		}
+	}
+	if ( deep ) {
+		jQuery.extend( true, target, deep );
+	}
+
+	return target;
+}
+
+jQuery.fn.load = function( url, params, callback ) {
+	if ( typeof url !== "string" && _load ) {
+		return _load.apply( this, arguments );
+	}
+
+	var selector, response, type,
+		self = this,
+		off = url.indexOf(" ");
+
+	if ( off >= 0 ) {
+		selector = url.slice( off, url.length );
+		url = url.slice( 0, off );
+	}
+
+	// If it's a function
+	if ( jQuery.isFunction( params ) ) {
+
+		// We assume that it's the callback
+		callback = params;
+		params = undefined;
+
+	// Otherwise, build a param string
+	} else if ( params && typeof params === "object" ) {
+		type = "POST";
+	}
+
+	// If we have elements to modify, make the request
+	if ( self.length > 0 ) {
+		jQuery.ajax({
+			url: url,
+
+			// if "type" variable is undefined, then "GET" method will be used
+			type: type,
+			dataType: "html",
+			data: params
+		}).done(function( responseText ) {
+
+			// Save response for use in complete callback
+			response = arguments;
+
+			self.html( selector ?
+
+				// If a selector was specified, locate the right elements in a dummy div
+				// Exclude scripts to avoid IE 'Permission Denied' errors
+				jQuery("<div>").append( jQuery.parseHTML( responseText ) ).find( selector ) :
+
+				// Otherwise use the full result
+				responseText );
+
+		}).complete( callback && function( jqXHR, status ) {
+			self.each( callback, response || [ jqXHR.responseText, status, jqXHR ] );
+		});
+	}
+
+	return this;
+};
+
+// Attach a bunch of functions for handling common AJAX events
+jQuery.each( [ "ajaxStart", "ajaxStop", "ajaxComplete", "ajaxError", "ajaxSuccess", "ajaxSend" ], function( i, type ){
+	jQuery.fn[ type ] = function( fn ){
+		return this.on( type, fn );
+	};
+});
+
+jQuery.extend({
+
+	// Counter for holding the number of active queries
+	active: 0,
+
+	// Last-Modified header cache for next request
+	lastModified: {},
+	etag: {},
+
+	ajaxSettings: {
+		url: ajaxLocation,
+		type: "GET",
+		isLocal: rlocalProtocol.test( ajaxLocParts[ 1 ] ),
+		global: true,
+		processData: true,
+		async: true,
+		contentType: "application/x-www-form-urlencoded; charset=UTF-8",
+		/*
+		timeout: 0,
+		data: null,
+		dataType: null,
+		username: null,
+		password: null,
+		cache: null,
+		throws: false,
+		traditional: false,
+		headers: {},
+		*/
+
+		accepts: {
+			"*": allTypes,
+			text: "text/plain",
+			html: "text/html",
+			xml: "application/xml, text/xml",
+			json: "application/json, text/javascript"
+		},
+
+		contents: {
+			xml: /xml/,
+			html: /html/,
+			json: /json/
+		},
+
+		responseFields: {
+			xml: "responseXML",
+			text: "responseText",
+			json: "responseJSON"
+		},
+
+		// Data converters
+		// Keys separate source (or catchall "*") and destination types with a single space
+		converters: {
+
+			// Convert anything to text
+			"* text": String,
+
+			// Text to html (true = no transformation)
+			"text html": true,
+
+			// Evaluate text as a json expression
+			"text json": jQuery.parseJSON,
+
+			// Parse text as xml
+			"text xml": jQuery.parseXML
+		},
+
+		// For options that shouldn't be deep extended:
+		// you can add your own custom options here if
+		// and when you create one that shouldn't be
+		// deep extended (see ajaxExtend)
+		flatOptions: {
+			url: true,
+			context: true
+		}
+	},
+
+	// Creates a full fledged settings object into target
+	// with both ajaxSettings and settings fields.
+	// If target is omitted, writes into ajaxSettings.
+	ajaxSetup: function( target, settings ) {
+		return settings ?
+
+			// Building a settings object
+			ajaxExtend( ajaxExtend( target, jQuery.ajaxSettings ), settings ) :
+
+			// Extending ajaxSettings
+			ajaxExtend( jQuery.ajaxSettings, target );
+	},
+
+	ajaxPrefilter: addToPrefiltersOrTransports( prefilters ),
+	ajaxTransport: addToPrefiltersOrTransports( transports ),
+
+	// Main method
+	ajax: function( url, options ) {
+
+		// If url is an object, simulate pre-1.5 signature
+		if ( typeof url === "object" ) {
+			options = url;
+			url = undefined;
+		}
+
+		// Force options to be an object
+		options = options || {};
+
+		var // Cross-domain detection vars
+			parts,
+			// Loop variable
+			i,
+			// URL without anti-cache param
+			cacheURL,
+			// Response headers as string
+			responseHeadersString,
+			// timeout handle
+			timeoutTimer,
+
+			// To know if global events are to be dispatched
+			fireGlobals,
+
+			transport,
+			// Response headers
+			responseHeaders,
+			// Create the final options object
+			s = jQuery.ajaxSetup( {}, options ),
+			// Callbacks context
+			callbackContext = s.context || s,
+			// Context for global events is callbackContext if it is a DOM node or jQuery collection
+			globalEventContext = s.context && ( callbackContext.nodeType || callbackContext.jquery ) ?
+				jQuery( callbackContext ) :
+				jQuery.event,
+			// Deferreds
+			deferred = jQuery.Deferred(),
+			completeDeferred = jQuery.Callbacks("once memory"),
+			// Status-dependent callbacks
+			statusCode = s.statusCode || {},
+			// Headers (they are sent all at once)
+			requestHeaders = {},
+			requestHeadersNames = {},
+			// The jqXHR state
+			state = 0,
+			// Default abort message
+			strAbort = "canceled",
+			// Fake xhr
+			jqXHR = {
+				readyState: 0,
+
+				// Builds headers hashtable if needed
+				getResponseHeader: function( key ) {
+					var match;
+					if ( state === 2 ) {
+						if ( !responseHeaders ) {
+							responseHeaders = {};
+							while ( (match = rheaders.exec( responseHeadersString )) ) {
+								responseHeaders[ match[1].toLowerCase() ] = match[ 2 ];
+							}
+						}
+						match = responseHeaders[ key.toLowerCase() ];
+					}
+					return match == null ? null : match;
+				},
+
+				// Raw string
+				getAllResponseHeaders: function() {
+					return state === 2 ? responseHeadersString : null;
+				},
+
+				// Caches the header
+				setRequestHeader: function( name, value ) {
+					var lname = name.toLowerCase();
+					if ( !state ) {
+						name = requestHeadersNames[ lname ] = requestHeadersNames[ lname ] || name;
+						requestHeaders[ name ] = value;
+					}
+					return this;
+				},
+
+				// Overrides response content-type header
+				overrideMimeType: function( type ) {
+					if ( !state ) {
+						s.mimeType = type;
+					}
+					return this;
+				},
+
+				// Status-dependent callbacks
+				statusCode: function( map ) {
+					var code;
+					if ( map ) {
+						if ( state < 2 ) {
+							for ( code in map ) {
+								// Lazy-add the new callback in a way that preserves old ones
+								statusCode[ code ] = [ statusCode[ code ], map[ code ] ];
+							}
+						} else {
+							// Execute the appropriate callbacks
+							jqXHR.always( map[ jqXHR.status ] );
+						}
+					}
+					return this;
+				},
+
+				// Cancel the request
+				abort: function( statusText ) {
+					var finalText = statusText || strAbort;
+					if ( transport ) {
+						transport.abort( finalText );
+					}
+					done( 0, finalText );
+					return this;
+				}
+			};
+
+		// Attach deferreds
+		deferred.promise( jqXHR ).complete = completeDeferred.add;
+		jqXHR.success = jqXHR.done;
+		jqXHR.error = jqXHR.fail;
+
+		// Remove hash character (#7531: and string promotion)
+		// Add protocol if not provided (#5866: IE7 issue with protocol-less urls)
+		// Handle falsy url in the settings object (#10093: consistency with old signature)
+		// We also use the url parameter if available
+		s.url = ( ( url || s.url || ajaxLocation ) + "" ).replace( rhash, "" ).replace( rprotocol, ajaxLocParts[ 1 ] + "//" );
+
+		// Alias method option to type as per ticket #12004
+		s.type = options.method || options.type || s.method || s.type;
+
+		// Extract dataTypes list
+		s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().match( core_rnotwhite ) || [""];
+
+		// A cross-domain request is in order when we have a protocol:host:port mismatch
+		if ( s.crossDomain == null ) {
+			parts = rurl.exec( s.url.toLowerCase() );
+			s.crossDomain = !!( parts &&
+				( parts[ 1 ] !== ajaxLocParts[ 1 ] || parts[ 2 ] !== ajaxLocParts[ 2 ] ||
+					( parts[ 3 ] || ( parts[ 1 ] === "http:" ? "80" : "443" ) ) !==
+						( ajaxLocParts[ 3 ] || ( ajaxLocParts[ 1 ] === "http:" ? "80" : "443" ) ) )
+			);
+		}
+
+		// Convert data if not already a string
+		if ( s.data && s.processData && typeof s.data !== "string" ) {
+			s.data = jQuery.param( s.data, s.traditional );
+		}
+
+		// Apply prefilters
+		inspectPrefiltersOrTransports( prefilters, s, options, jqXHR );
+
+		// If request was aborted inside a prefilter, stop there
+		if ( state === 2 ) {
+			return jqXHR;
+		}
+
+		// We can fire global events as of now if asked to
+		fireGlobals = s.global;
+
+		// Watch for a new set of requests
+		if ( fireGlobals && jQuery.active++ === 0 ) {
+			jQuery.event.trigger("ajaxStart");
+		}
+
+		// Uppercase the type
+		s.type = s.type.toUpperCase();
+
+		// Determine if request has content
+		s.hasContent = !rnoContent.test( s.type );
+
+		// Save the URL in case we're toying with the If-Modified-Since
+		// and/or If-None-Match header later on
+		cacheURL = s.url;
+
+		// More options handling for requests with no content
+		if ( !s.hasContent ) {
+
+			// If data is available, append data to url
+			if ( s.data ) {
+				cacheURL = ( s.url += ( ajax_rquery.test( cacheURL ) ? "&" : "?" ) + s.data );
+				// #9682: remove data so that it's not used in an eventual retry
+				delete s.data;
+			}
+
+			// Add anti-cache in url if needed
+			if ( s.cache === false ) {
+				s.url = rts.test( cacheURL ) ?
+
+					// If there is already a '_' parameter, set its value
+					cacheURL.replace( rts, "$1_=" + ajax_nonce++ ) :
+
+					// Otherwise add one to the end
+					cacheURL + ( ajax_rquery.test( cacheURL ) ? "&" : "?" ) + "_=" + ajax_nonce++;
+			}
+		}
+
+		// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
+		if ( s.ifModified ) {
+			if ( jQuery.lastModified[ cacheURL ] ) {
+				jqXHR.setRequestHeader( "If-Modified-Since", jQuery.lastModified[ cacheURL ] );
+			}
+			if ( jQuery.etag[ cacheURL ] ) {
+				jqXHR.setRequestHeader( "If-None-Match", jQuery.etag[ cacheURL ] );
+			}
+		}
+
+		// Set the correct header, if data is being sent
+		if ( s.data && s.hasContent && s.contentType !== false || options.contentType ) {
+			jqXHR.setRequestHeader( "Content-Type", s.contentType );
+		}
+
+		// Set the Accepts header for the server, depending on the dataType
+		jqXHR.setRequestHeader(
+			"Accept",
+			s.dataTypes[ 0 ] && s.accepts[ s.dataTypes[0] ] ?
+				s.accepts[ s.dataTypes[0] ] + ( s.dataTypes[ 0 ] !== "*" ? ", " + allTypes + "; q=0.01" : "" ) :
+				s.accepts[ "*" ]
+		);
+
+		// Check for headers option
+		for ( i in s.headers ) {
+			jqXHR.setRequestHeader( i, s.headers[ i ] );
+		}
+
+		// Allow custom headers/mimetypes and early abort
+		if ( s.beforeSend && ( s.beforeSend.call( callbackContext, jqXHR, s ) === false || state === 2 ) ) {
+			// Abort if not done already and return
+			return jqXHR.abort();
+		}
+
+		// aborting is no longer a cancellation
+		strAbort = "abort";
+
+		// Install callbacks on deferreds
+		for ( i in { success: 1, error: 1, complete: 1 } ) {
+			jqXHR[ i ]( s[ i ] );
+		}
+
+		// Get transport
+		transport = inspectPrefiltersOrTransports( transports, s, options, jqXHR );
+
+		// If no transport, we auto-abort
+		if ( !transport ) {
+			done( -1, "No Transport" );
+		} else {
+			jqXHR.readyState = 1;
+
+			// Send global event
+			if ( fireGlobals ) {
+				globalEventContext.trigger( "ajaxSend", [ jqXHR, s ] );
+			}
+			// Timeout
+			if ( s.async && s.timeout > 0 ) {
+				timeoutTimer = setTimeout(function() {
+					jqXHR.abort("timeout");
+				}, s.timeout );
+			}
+
+			try {
+				state = 1;
+				transport.send( requestHeaders, done );
+			} catch ( e ) {
+				// Propagate exception as error if not done
+				if ( state < 2 ) {
+					done( -1, e );
+				// Simply rethrow otherwise
+				} else {
+					throw e;
+				}
+			}
+		}
+
+		// Callback for when everything is done
+		function done( status, nativeStatusText, responses, headers ) {
+			var isSuccess, success, error, response, modified,
+				statusText = nativeStatusText;
+
+			// Called once
+			if ( state === 2 ) {
+				return;
+			}
+
+			// State is "done" now
+			state = 2;
+
+			// Clear timeout if it exists
+			if ( timeoutTimer ) {
+				clearTimeout( timeoutTimer );
+			}
+
+			// Dereference transport for early garbage collection
+			// (no matter how long the jqXHR object will be used)
+			transport = undefined;
+
+			// Cache response headers
+			responseHeadersString = headers || "";
+
+			// Set readyState
+			jqXHR.readyState = status > 0 ? 4 : 0;
+
+			// Determine if successful
+			isSuccess = status >= 200 && status < 300 || status === 304;
+
+			// Get response data
+			if ( responses ) {
+				response = ajaxHandleResponses( s, jqXHR, responses );
+			}
+
+			// Convert no matter what (that way responseXXX fields are always set)
+			response = ajaxConvert( s, response, jqXHR, isSuccess );
+
+			// If successful, handle type chaining
+			if ( isSuccess ) {
+
+				// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
+				if ( s.ifModified ) {
+					modified = jqXHR.getResponseHeader("Last-Modified");
+					if ( modified ) {
+						jQuery.lastModified[ cacheURL ] = modified;
+					}
+					modified = jqXHR.getResponseHeader("etag");
+					if ( modified ) {
+						jQuery.etag[ cacheURL ] = modified;
+					}
+				}
+
+				// if no content
+				if ( status === 204 || s.type === "HEAD" ) {
+					statusText = "nocontent";
+
+				// if not modified
+				} else if ( status === 304 ) {
+					statusText = "notmodified";
+
+				// If we have data, let's convert it
+				} else {
+					statusText = response.state;
+					success = response.data;
+					error = response.error;
+					isSuccess = !error;
+				}
+			} else {
+				// We extract error from statusText
+				// then normalize statusText and status for non-aborts
+				error = statusText;
+				if ( status || !statusText ) {
+					statusText = "error";
+					if ( status < 0 ) {
+						status = 0;
+					}
+				}
+			}
+
+			// Set data for the fake xhr object
+			jqXHR.status = status;
+			jqXHR.statusText = ( nativeStatusText || statusText ) + "";
+
+			// Success/Error
+			if ( isSuccess ) {
+				deferred.resolveWith( callbackContext, [ success, statusText, jqXHR ] );
+			} else {
+				deferred.rejectWith( callbackContext, [ jqXHR, statusText, error ] );
+			}
+
+			// Status-dependent callbacks
+			jqXHR.statusCode( statusCode );
+			statusCode = undefined;
+
+			if ( fireGlobals ) {
+				globalEventContext.trigger( isSuccess ? "ajaxSuccess" : "ajaxError",
+					[ jqXHR, s, isSuccess ? success : error ] );
+			}
+
+			// Complete
+			completeDeferred.fireWith( callbackContext, [ jqXHR, statusText ] );
+
+			if ( fireGlobals ) {
+				globalEventContext.trigger( "ajaxComplete", [ jqXHR, s ] );
+				// Handle the global AJAX counter
+				if ( !( --jQuery.active ) ) {
+					jQuery.event.trigger("ajaxStop");
+				}
+			}
+		}
+
+		return jqXHR;
+	},
+
+	getJSON: function( url, data, callback ) {
+		return jQuery.get( url, data, callback, "json" );
+	},
+
+	getScript: function( url, callback ) {
+		return jQuery.get( url, undefined, callback, "script" );
+	}
+});
+
+jQuery.each( [ "get", "post" ], function( i, method ) {
+	jQuery[ method ] = function( url, data, callback, type ) {
+		// shift arguments if data argument was omitted
+		if ( jQuery.isFunction( data ) ) {
+			type = type || callback;
+			callback = data;
+			data = undefined;
+		}
+
+		return jQuery.ajax({
+			url: url,
+			type: method,
+			dataType: type,
+			data: data,
+			success: callback
+		});
+	};
+});
+
+/* Handles responses to an ajax request:
+ * - finds the right dataType (mediates between content-type and expected dataType)
+ * - returns the corresponding response
+ */
+function ajaxHandleResponses( s, jqXHR, responses ) {
+	var firstDataType, ct, finalDataType, type,
+		contents = s.contents,
+		dataTypes = s.dataTypes;
+
+	// Remove auto dataType and get content-type in the process
+	while( dataTypes[ 0 ] === "*" ) {
+		dataTypes.shift();
+		if ( ct === undefined ) {
+			ct = s.mimeType || jqXHR.getResponseHeader("Content-Type");
+		}
+	}
+
+	// Check if we're dealing with a known content-type
+	if ( ct ) {
+		for ( type in contents ) {
+			if ( contents[ type ] && contents[ type ].test( ct ) ) {
+				dataTypes.unshift( type );
+				break;
+			}
+		}
+	}
+
+	// Check to see if we have a response for the expected dataType
+	if ( dataTypes[ 0 ] in responses ) {
+		finalDataType = dataTypes[ 0 ];
+	} else {
+		// Try convertible dataTypes
+		for ( type in responses ) {
+			if ( !dataTypes[ 0 ] || s.converters[ type + " " + dataTypes[0] ] ) {
+				finalDataType = type;
+				break;
+			}
+			if ( !firstDataType ) {
+				firstDataType = type;
+			}
+		}
+		// Or just use first one
+		finalDataType = finalDataType || firstDataType;
+	}
+
+	// If we found a dataType
+	// We add the dataType to the list if needed
+	// and return the corresponding response
+	if ( finalDataType ) {
+		if ( finalDataType !== dataTypes[ 0 ] ) {
+			dataTypes.unshift( finalDataType );
+		}
+		return responses[ finalDataType ];
+	}
+}
+
+/* Chain conversions given the request and the original response
+ * Also sets the responseXXX fields on the jqXHR instance
+ */
+function ajaxConvert( s, response, jqXHR, isSuccess ) {
+	var conv2, current, conv, tmp, prev,
+		converters = {},
+		// Work with a copy of dataTypes in case we need to modify it for conversion
+		dataTypes = s.dataTypes.slice();
+
+	// Create converters map with lowercased keys
+	if ( dataTypes[ 1 ] ) {
+		for ( conv in s.converters ) {
+			converters[ conv.toLowerCase() ] = s.converters[ conv ];
+		}
+	}
+
+	current = dataTypes.shift();
+
+	// Convert to each sequential dataType
+	while ( current ) {
+
+		if ( s.responseFields[ current ] ) {
+			jqXHR[ s.responseFields[ current ] ] = response;
+		}
+
+		// Apply the dataFilter if provided
+		if ( !prev && isSuccess && s.dataFilter ) {
+			response = s.dataFilter( response, s.dataType );
+		}
+
+		prev = current;
+		current = dataTypes.shift();
+
+		if ( current ) {
+
+			// There's only work to do if current dataType is non-auto
+			if ( current === "*" ) {
+
+				current = prev;
+
+			// Convert response if prev dataType is non-auto and differs from current
+			} else if ( prev !== "*" && prev !== current ) {
+
+				// Seek a direct converter
+				conv = converters[ prev + " " + current ] || converters[ "* " + current ];
+
+				// If none found, seek a pair
+				if ( !conv ) {
+					for ( conv2 in converters ) {
+
+						// If conv2 outputs current
+						tmp = conv2.split( " " );
+						if ( tmp[ 1 ] === current ) {
+
+							// If prev can be converted to accepted input
+							conv = converters[ prev + " " + tmp[ 0 ] ] ||
+								converters[ "* " + tmp[ 0 ] ];
+							if ( conv ) {
+								// Condense equivalence converters
+								if ( conv === true ) {
+									conv = converters[ conv2 ];
+
+								// Otherwise, insert the intermediate dataType
+								} else if ( converters[ conv2 ] !== true ) {
+									current = tmp[ 0 ];
+									dataTypes.unshift( tmp[ 1 ] );
+								}
+								break;
+							}
+						}
+					}
+				}
+
+				// Apply converter (if not an equivalence)
+				if ( conv !== true ) {
+
+					// Unless errors are allowed to bubble, catch and return them
+					if ( conv && s[ "throws" ] ) {
+						response = conv( response );
+					} else {
+						try {
+							response = conv( response );
+						} catch ( e ) {
+							return { state: "parsererror", error: conv ? e : "No conversion from " + prev + " to " + current };
+						}
+					}
+				}
+			}
+		}
+	}
+
+	return { state: "success", data: response };
+}
+// Install script dataType
+jQuery.ajaxSetup({
+	accepts: {
+		script: "text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"
+	},
+	contents: {
+		script: /(?:java|ecma)script/
+	},
+	converters: {
+		"text script": function( text ) {
+			jQuery.globalEval( text );
+			return text;
+		}
+	}
+});
+
+// Handle cache's special case and global
+jQuery.ajaxPrefilter( "script", function( s ) {
+	if ( s.cache === undefined ) {
+		s.cache = false;
+	}
+	if ( s.crossDomain ) {
+		s.type = "GET";
+		s.global = false;
+	}
+});
+
+// Bind script tag hack transport
+jQuery.ajaxTransport( "script", function(s) {
+
+	// This transport only deals with cross domain requests
+	if ( s.crossDomain ) {
+
+		var script,
+			head = document.head || jQuery("head")[0] || document.documentElement;
+
+		return {
+
+			send: function( _, callback ) {
+
+				script = document.createElement("script");
+
+				script.async = true;
+
+				if ( s.scriptCharset ) {
+					script.charset = s.scriptCharset;
+				}
+
+				script.src = s.url;
+
+				// Attach handlers for all browsers
+				script.onload = script.onreadystatechange = function( _, isAbort ) {
+
+					if ( isAbort || !script.readyState || /loaded|complete/.test( script.readyState ) ) {
+
+						// Handle memory leak in IE
+						script.onload = script.onreadystatechange = null;
+
+						// Remove the script
+						if ( script.parentNode ) {
+							script.parentNode.removeChild( script );
+						}
+
+						// Dereference the script
+						script = null;
+
+						// Callback if not abort
+						if ( !isAbort ) {
+							callback( 200, "success" );
+						}
+					}
+				};
+
+				// Circumvent IE6 bugs with base elements (#2709 and #4378) by prepending
+				// Use native DOM manipulation to avoid our domManip AJAX trickery
+				head.insertBefore( script, head.firstChild );
+			},
+
+			abort: function() {
+				if ( script ) {
+					script.onload( undefined, true );
+				}
+			}
+		};
+	}
+});
+var oldCallbacks = [],
+	rjsonp = /(=)\?(?=&|$)|\?\?/;
+
+// Default jsonp settings
+jQuery.ajaxSetup({
+	jsonp: "callback",
+	jsonpCallback: function() {
+		var callback = oldCallbacks.pop() || ( jQuery.expando + "_" + ( ajax_nonce++ ) );
+		this[ callback ] = true;
+		return callback;
+	}
+});
+
+// Detect, normalize options and install callbacks for jsonp requests
+jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
+
+	var callbackName, overwritten, responseContainer,
+		jsonProp = s.jsonp !== false && ( rjsonp.test( s.url ) ?
+			"url" :
+			typeof s.data === "string" && !( s.contentType || "" ).indexOf("application/x-www-form-urlencoded") && rjsonp.test( s.data ) && "data"
+		);
+
+	// Handle iff the expected data type is "jsonp" or we have a parameter to set
+	if ( jsonProp || s.dataTypes[ 0 ] === "jsonp" ) {
+
+		// Get callback name, remembering preexisting value associated with it
+		callbackName = s.jsonpCallback = jQuery.isFunction( s.jsonpCallback ) ?
+			s.jsonpCallback() :
+			s.jsonpCallback;
+
+		// Insert callback into url or form data
+		if ( jsonProp ) {
+			s[ jsonProp ] = s[ jsonProp ].replace( rjsonp, "$1" + callbackName );
+		} else if ( s.jsonp !== false ) {
+			s.url += ( ajax_rquery.test( s.url ) ? "&" : "?" ) + s.jsonp + "=" + callbackName;
+		}
+
+		// Use data converter to retrieve json after script execution
+		s.converters["script json"] = function() {
+			if ( !responseContainer ) {
+				jQuery.error( callbackName + " was not called" );
+			}
+			return responseContainer[ 0 ];
+		};
+
+		// force json dataType
+		s.dataTypes[ 0 ] = "json";
+
+		// Install callback
+		overwritten = window[ callbackName ];
+		window[ callbackName ] = function() {
+			responseContainer = arguments;
+		};
+
+		// Clean-up function (fires after converters)
+		jqXHR.always(function() {
+			// Restore preexisting value
+			window[ callbackName ] = overwritten;
+
+			// Save back as free
+			if ( s[ callbackName ] ) {
+				// make sure that re-using the options doesn't screw things around
+				s.jsonpCallback = originalSettings.jsonpCallback;
+
+				// save the callback name for future use
+				oldCallbacks.push( callbackName );
+			}
+
+			// Call if it was a function and we have a response
+			if ( responseContainer && jQuery.isFunction( overwritten ) ) {
+				overwritten( responseContainer[ 0 ] );
+			}
+
+			responseContainer = overwritten = undefined;
+		});
+
+		// Delegate to script
+		return "script";
+	}
+});
+var xhrCallbacks, xhrSupported,
+	xhrId = 0,
+	// #5280: Internet Explorer will keep connections alive if we don't abort on unload
+	xhrOnUnloadAbort = window.ActiveXObject && function() {
+		// Abort all pending requests
+		var key;
+		for ( key in xhrCallbacks ) {
+			xhrCallbacks[ key ]( undefined, true );
+		}
+	};
+
+// Functions to create xhrs
+function createStandardXHR() {
+	try {
+		return new window.XMLHttpRequest();
+	} catch( e ) {}
+}
+
+function createActiveXHR() {
+	try {
+		return new window.ActiveXObject("Microsoft.XMLHTTP");
+	} catch( e ) {}
+}
+
+// Create the request object
+// (This is still attached to ajaxSettings for backward compatibility)
+jQuery.ajaxSettings.xhr = window.ActiveXObject ?
+	/* Microsoft failed to properly
+	 * implement the XMLHttpRequest in IE7 (can't request local files),
+	 * so we use the ActiveXObject when it is available
+	 * Additionally XMLHttpRequest can be disabled in IE7/IE8 so
+	 * we need a fallback.
+	 */
+	function() {
+		return !this.isLocal && createStandardXHR() || createActiveXHR();
+	} :
+	// For all other browsers, use the standard XMLHttpRequest object
+	createStandardXHR;
+
+// Determine support properties
+xhrSupported = jQuery.ajaxSettings.xhr();
+jQuery.support.cors = !!xhrSupported && ( "withCredentials" in xhrSupported );
+xhrSupported = jQuery.support.ajax = !!xhrSupported;
+
+// Create transport if the browser can provide an xhr
+if ( xhrSupported ) {
+
+	jQuery.ajaxTransport(function( s ) {
+		// Cross domain only allowed if supported through XMLHttpRequest
+		if ( !s.crossDomain || jQuery.support.cors ) {
+
+			var callback;
+
+			return {
+				send: function( headers, complete ) {
+
+					// Get a new xhr
+					var handle, i,
+						xhr = s.xhr();
+
+					// Open the socket
+					// Passing null username, generates a login popup on Opera (#2865)
+					if ( s.username ) {
+						xhr.open( s.type, s.url, s.async, s.username, s.password );
+					} else {
+						xhr.open( s.type, s.url, s.async );
+					}
+
+					// Apply custom fields if provided
+					if ( s.xhrFields ) {
+						for ( i in s.xhrFields ) {
+							xhr[ i ] = s.xhrFields[ i ];
+						}
+					}
+
+					// Override mime type if needed
+					if ( s.mimeType && xhr.overrideMimeType ) {
+						xhr.overrideMimeType( s.mimeType );
+					}
+
+					// X-Requested-With header
+					// For cross-domain requests, seeing as conditions for a preflight are
+					// akin to a jigsaw puzzle, we simply never set it to be sure.
+					// (it can always be set on a per-request basis or even using ajaxSetup)
+					// For same-domain requests, won't change header if already provided.
+					if ( !s.crossDomain && !headers["X-Requested-With"] ) {
+						headers["X-Requested-With"] = "XMLHttpRequest";
+					}
+
+					// Need an extra try/catch for cross domain requests in Firefox 3
+					try {
+						for ( i in headers ) {
+							xhr.setRequestHeader( i, headers[ i ] );
+						}
+					} catch( err ) {}
+
+					// Do send the request
+					// This may raise an exception which is actually
+					// handled in jQuery.ajax (so no try/catch here)
+					xhr.send( ( s.hasContent && s.data ) || null );
+
+					// Listener
+					callback = function( _, isAbort ) {
+						var status, responseHeaders, statusText, responses;
+
+						// Firefox throws exceptions when accessing properties
+						// of an xhr when a network error occurred
+						// http://helpful.knobs-dials.com/index.php/Component_returned_failure_code:_0x80040111_(NS_ERROR_NOT_AVAILABLE)
+						try {
+
+							// Was never called and is aborted or complete
+							if ( callback && ( isAbort || xhr.readyState === 4 ) ) {
+
+								// Only called once
+								callback = undefined;
+
+								// Do not keep as active anymore
+								if ( handle ) {
+									xhr.onreadystatechange = jQuery.noop;
+									if ( xhrOnUnloadAbort ) {
+										delete xhrCallbacks[ handle ];
+									}
+								}
+
+								// If it's an abort
+								if ( isAbort ) {
+									// Abort it manually if needed
+									if ( xhr.readyState !== 4 ) {
+										xhr.abort();
+									}
+								} else {
+									responses = {};
+									status = xhr.status;
+									responseHeaders = xhr.getAllResponseHeaders();
+
+									// When requesting binary data, IE6-9 will throw an exception
+									// on any attempt to access responseText (#11426)
+									if ( typeof xhr.responseText === "string" ) {
+										responses.text = xhr.responseText;
+									}
+
+									// Firefox throws an exception when accessing
+									// statusText for faulty cross-domain requests
+									try {
+										statusText = xhr.statusText;
+									} catch( e ) {
+										// We normalize with Webkit giving an empty statusText
+										statusText = "";
+									}
+
+									// Filter status for non standard behaviors
+
+									// If the request is local and we have data: assume a success
+									// (success with no data won't get notified, that's the best we
+									// can do given current implementations)
+									if ( !status && s.isLocal && !s.crossDomain ) {
+										status = responses.text ? 200 : 404;
+									// IE - #1450: sometimes returns 1223 when it should be 204
+									} else if ( status === 1223 ) {
+										status = 204;
+									}
+								}
+							}
+						} catch( firefoxAccessException ) {
+							if ( !isAbort ) {
+								complete( -1, firefoxAccessException );
+							}
+						}
+
+						// Call complete if needed
+						if ( responses ) {
+							complete( status, statusText, responses, responseHeaders );
+						}
+					};
+
+					if ( !s.async ) {
+						// if we're in sync mode we fire the callback
+						callback();
+					} else if ( xhr.readyState === 4 ) {
+						// (IE6 & IE7) if it's in cache and has been
+						// retrieved directly we need to fire the callback
+						setTimeout( callback );
+					} else {
+						handle = ++xhrId;
+						if ( xhrOnUnloadAbort ) {
+							// Create the active xhrs callbacks list if needed
+							// and attach the unload handler
+							if ( !xhrCallbacks ) {
+								xhrCallbacks = {};
+								jQuery( window ).unload( xhrOnUnloadAbort );
+							}
+							// Add to list of active xhrs callbacks
+							xhrCallbacks[ handle ] = callback;
+						}
+						xhr.onreadystatechange = callback;
+					}
+				},
+
+				abort: function() {
+					if ( callback ) {
+						callback( undefined, true );
+					}
+				}
+			};
+		}
+	});
+}
+var fxNow, timerId,
+	rfxtypes = /^(?:toggle|show|hide)$/,
+	rfxnum = new RegExp( "^(?:([+-])=|)(" + core_pnum + ")([a-z%]*)$", "i" ),
+	rrun = /queueHooks$/,
+	animationPrefilters = [ defaultPrefilter ],
+	tweeners = {
+		"*": [function( prop, value ) {
+			var tween = this.createTween( prop, value ),
+				target = tween.cur(),
+				parts = rfxnum.exec( value ),
+				unit = parts && parts[ 3 ] || ( jQuery.cssNumber[ prop ] ? "" : "px" ),
+
+				// Starting value computation is required for potential unit mismatches
+				start = ( jQuery.cssNumber[ prop ] || unit !== "px" && +target ) &&
+					rfxnum.exec( jQuery.css( tween.elem, prop ) ),
+				scale = 1,
+				maxIterations = 20;
+
+			if ( start && start[ 3 ] !== unit ) {
+				// Trust units reported by jQuery.css
+				unit = unit || start[ 3 ];
+
+				// Make sure we update the tween properties later on
+				parts = parts || [];
+
+				// Iteratively approximate from a nonzero starting point
+				start = +target || 1;
+
+				do {
+					// If previous iteration zeroed out, double until we get *something*
+					// Use a string for doubling factor so we don't accidentally see scale as unchanged below
+					scale = scale || ".5";
+
+					// Adjust and apply
+					start = start / scale;
+					jQuery.style( tween.elem, prop, start + unit );
+
+				// Update scale, tolerating zero or NaN from tween.cur()
+				// And breaking the loop if scale is unchanged or perfect, or if we've just had enough
+				} while ( scale !== (scale = tween.cur() / target) && scale !== 1 && --maxIterations );
+			}
+
+			// Update tween properties
+			if ( parts ) {
+				tween.unit = unit;
+				tween.start = +start || +target || 0;
+				// If a +=/-= token was provided, we're doing a relative animation
+				tween.end = parts[ 1 ] ?
+					start + ( parts[ 1 ] + 1 ) * parts[ 2 ] :
+					+parts[ 2 ];
+			}
+
+			return tween;
+		}]
+	};
+
+// Animations created synchronously will run synchronously
+function createFxNow() {
+	setTimeout(function() {
+		fxNow = undefined;
+	});
+	return ( fxNow = jQuery.now() );
+}
+
+function createTween( value, prop, animation ) {
+	var tween,
+		collection = ( tweeners[ prop ] || [] ).concat( tweeners[ "*" ] ),
+		index = 0,
+		length = collection.length;
+	for ( ; index < length; index++ ) {
+		if ( (tween = collection[ index ].call( animation, prop, value )) ) {
+
+			// we're done with this property
+			return tween;
+		}
+	}
+}
+
+function Animation( elem, properties, options ) {
+	var result,
+		stopped,
+		index = 0,
+		length = animationPrefilters.length,
+		deferred = jQuery.Deferred().always( function() {
+			// don't match elem in the :animated selector
+			delete tick.elem;
+		}),
+		tick = function() {
+			if ( stopped ) {
+				return false;
+			}
+			var currentTime = fxNow || createFxNow(),
+				remaining = Math.max( 0, animation.startTime + animation.duration - currentTime ),
+				// archaic crash bug won't allow us to use 1 - ( 0.5 || 0 ) (#12497)
+				temp = remaining / animation.duration || 0,
+				percent = 1 - temp,
+				index = 0,
+				length = animation.tweens.length;
+
+			for ( ; index < length ; index++ ) {
+				animation.tweens[ index ].run( percent );
+			}
+
+			deferred.notifyWith( elem, [ animation, percent, remaining ]);
+
+			if ( percent < 1 && length ) {
+				return remaining;
+			} else {
+				deferred.resolveWith( elem, [ animation ] );
+				return false;
+			}
+		},
+		animation = deferred.promise({
+			elem: elem,
+			props: jQuery.extend( {}, properties ),
+			opts: jQuery.extend( true, { specialEasing: {} }, options ),
+			originalProperties: properties,
+			originalOptions: options,
+			startTime: fxNow || createFxNow(),
+			duration: options.duration,
+			tweens: [],
+			createTween: function( prop, end ) {
+				var tween = jQuery.Tween( elem, animation.opts, prop, end,
+						animation.opts.specialEasing[ prop ] || animation.opts.easing );
+				animation.tweens.push( tween );
+				return tween;
+			},
+			stop: function( gotoEnd ) {
+				var index = 0,
+					// if we are going to the end, we want to run all the tweens
+					// otherwise we skip this part
+					length = gotoEnd ? animation.tweens.length : 0;
+				if ( stopped ) {
+					return this;
+				}
+				stopped = true;
+				for ( ; index < length ; index++ ) {
+					animation.tweens[ index ].run( 1 );
+				}
+
+				// resolve when we played the last frame
+				// otherwise, reject
+				if ( gotoEnd ) {
+					deferred.resolveWith( elem, [ animation, gotoEnd ] );
+				} else {
+					deferred.rejectWith( elem, [ animation, gotoEnd ] );
+				}
+				return this;
+			}
+		}),
+		props = animation.props;
+
+	propFilter( props, animation.opts.specialEasing );
+
+	for ( ; index < length ; index++ ) {
+		result = animationPrefilters[ index ].call( animation, elem, props, animation.opts );
+		if ( result ) {
+			return result;
+		}
+	}
+
+	jQuery.map( props, createTween, animation );
+
+	if ( jQuery.isFunction( animation.opts.start ) ) {
+		animation.opts.start.call( elem, animation );
+	}
+
+	jQuery.fx.timer(
+		jQuery.extend( tick, {
+			elem: elem,
+			anim: animation,
+			queue: animation.opts.queue
+		})
+	);
+
+	// attach callbacks from options
+	return animation.progress( animation.opts.progress )
+		.done( animation.opts.done, animation.opts.complete )
+		.fail( animation.opts.fail )
+		.always( animation.opts.always );
+}
+
+function propFilter( props, specialEasing ) {
+	var index, name, easing, value, hooks;
+
+	// camelCase, specialEasing and expand cssHook pass
+	for ( index in props ) {
+		name = jQuery.camelCase( index );
+		easing = specialEasing[ name ];
+		value = props[ index ];
+		if ( jQuery.isArray( value ) ) {
+			easing = value[ 1 ];
+			value = props[ index ] = value[ 0 ];
+		}
+
+		if ( index !== name ) {
+			props[ name ] = value;
+			delete props[ index ];
+		}
+
+		hooks = jQuery.cssHooks[ name ];
+		if ( hooks && "expand" in hooks ) {
+			value = hooks.expand( value );
+			delete props[ name ];
+
+			// not quite $.extend, this wont overwrite keys already present.
+			// also - reusing 'index' from above because we have the correct "name"
+			for ( index in value ) {
+				if ( !( index in props ) ) {
+					props[ index ] = value[ index ];
+					specialEasing[ index ] = easing;
+				}
+			}
+		} else {
+			specialEasing[ name ] = easing;
+		}
+	}
+}
+
+jQuery.Animation = jQuery.extend( Animation, {
+
+	tweener: function( props, callback ) {
+		if ( jQuery.isFunction( props ) ) {
+			callback = props;
+			props = [ "*" ];
+		} else {
+			props = props.split(" ");
+		}
+
+		var prop,
+			index = 0,
+			length = props.length;
+
+		for ( ; index < length ; index++ ) {
+			prop = props[ index ];
+			tweeners[ prop ] = tweeners[ prop ] || [];
+			tweeners[ prop ].unshift( callback );
+		}
+	},
+
+	prefilter: function( callback, prepend ) {
+		if ( prepend ) {
+			animationPrefilters.unshift( callback );
+		} else {
+			animationPrefilters.push( callback );
+		}
+	}
+});
+
+function defaultPrefilter( elem, props, opts ) {
+	/* jshint validthis: true */
+	var prop, value, toggle, tween, hooks, oldfire,
+		anim = this,
+		orig = {},
+		style = elem.style,
+		hidden = elem.nodeType && isHidden( elem ),
+		dataShow = jQuery._data( elem, "fxshow" );
+
+	// handle queue: false promises
+	if ( !opts.queue ) {
+		hooks = jQuery._queueHooks( elem, "fx" );
+		if ( hooks.unqueued == null ) {
+			hooks.unqueued = 0;
+			oldfire = hooks.empty.fire;
+			hooks.empty.fire = function() {
+				if ( !hooks.unqueued ) {
+					oldfire();
+				}
+			};
+		}
+		hooks.unqueued++;
+
+		anim.always(function() {
+			// doing this makes sure that the complete handler will be called
+			// before this completes
+			anim.always(function() {
+				hooks.unqueued--;
+				if ( !jQuery.queue( elem, "fx" ).length ) {
+					hooks.empty.fire();
+				}
+			});
+		});
+	}
+
+	// height/width overflow pass
+	if ( elem.nodeType === 1 && ( "height" in props || "width" in props ) ) {
+		// Make sure that nothing sneaks out
+		// Record all 3 overflow attributes because IE does not
+		// change the overflow attribute when overflowX and
+		// overflowY are set to the same value
+		opts.overflow = [ style.overflow, style.overflowX, style.overflowY ];
+
+		// Set display property to inline-block for height/width
+		// animations on inline elements that are having width/height animated
+		if ( jQuery.css( elem, "display" ) === "inline" &&
+				jQuery.css( elem, "float" ) === "none" ) {
+
+			// inline-level elements accept inline-block;
+			// block-level elements need to be inline with layout
+			if ( !jQuery.support.inlineBlockNeedsLayout || css_defaultDisplay( elem.nodeName ) === "inline" ) {
+				style.display = "inline-block";
+
+			} else {
+				style.zoom = 1;
+			}
+		}
+	}
+
+	if ( opts.overflow ) {
+		style.overflow = "hidden";
+		if ( !jQuery.support.shrinkWrapBlocks ) {
+			anim.always(function() {
+				style.overflow = opts.overflow[ 0 ];
+				style.overflowX = opts.overflow[ 1 ];
+				style.overflowY = opts.overflow[ 2 ];
+			});
+		}
+	}
+
+
+	// show/hide pass
+	for ( prop in props ) {
+		value = props[ prop ];
+		if ( rfxtypes.exec( value ) ) {
+			delete props[ prop ];
+			toggle = toggle || value === "toggle";
+			if ( value === ( hidden ? "hide" : "show" ) ) {
+				continue;
+			}
+			orig[ prop ] = dataShow && dataShow[ prop ] || jQuery.style( elem, prop );
+		}
+	}
+
+	if ( !jQuery.isEmptyObject( orig ) ) {
+		if ( dataShow ) {
+			if ( "hidden" in dataShow ) {
+				hidden = dataShow.hidden;
+			}
+		} else {
+			dataShow = jQuery._data( elem, "fxshow", {} );
+		}
+
+		// store state if its toggle - enables .stop().toggle() to "reverse"
+		if ( toggle ) {
+			dataShow.hidden = !hidden;
+		}
+		if ( hidden ) {
+			jQuery( elem ).show();
+		} else {
+			anim.done(function() {
+				jQuery( elem ).hide();
+			});
+		}
+		anim.done(function() {
+			var prop;
+			jQuery._removeData( elem, "fxshow" );
+			for ( prop in orig ) {
+				jQuery.style( elem, prop, orig[ prop ] );
+			}
+		});
+		for ( prop in orig ) {
+			tween = createTween( hidden ? dataShow[ prop ] : 0, prop, anim );
+
+			if ( !( prop in dataShow ) ) {
+				dataShow[ prop ] = tween.start;
+				if ( hidden ) {
+					tween.end = tween.start;
+					tween.start = prop === "width" || prop === "height" ? 1 : 0;
+				}
+			}
+		}
+	}
+}
+
+function Tween( elem, options, prop, end, easing ) {
+	return new Tween.prototype.init( elem, options, prop, end, easing );
+}
+jQuery.Tween = Tween;
+
+Tween.prototype = {
+	constructor: Tween,
+	init: function( elem, options, prop, end, easing, unit ) {
+		this.elem = elem;
+		this.prop = prop;
+		this.easing = easing || "swing";
+		this.options = options;
+		this.start = this.now = this.cur();
+		this.end = end;
+		this.unit = unit || ( jQuery.cssNumber[ prop ] ? "" : "px" );
+	},
+	cur: function() {
+		var hooks = Tween.propHooks[ this.prop ];
+
+		return hooks && hooks.get ?
+			hooks.get( this ) :
+			Tween.propHooks._default.get( this );
+	},
+	run: function( percent ) {
+		var eased,
+			hooks = Tween.propHooks[ this.prop ];
+
+		if ( this.options.duration ) {
+			this.pos = eased = jQuery.easing[ this.easing ](
+				percent, this.options.duration * percent, 0, 1, this.options.duration
+			);
+		} else {
+			this.pos = eased = percent;
+		}
+		this.now = ( this.end - this.start ) * eased + this.start;
+
+		if ( this.options.step ) {
+			this.options.step.call( this.elem, this.now, this );
+		}
+
+		if ( hooks && hooks.set ) {
+			hooks.set( this );
+		} else {
+			Tween.propHooks._default.set( this );
+		}
+		return this;
+	}
+};
+
+Tween.prototype.init.prototype = Tween.prototype;
+
+Tween.propHooks = {
+	_default: {
+		get: function( tween ) {
+			var result;
+
+			if ( tween.elem[ tween.prop ] != null &&
+				(!tween.elem.style || tween.elem.style[ tween.prop ] == null) ) {
+				return tween.elem[ tween.prop ];
+			}
+
+			// passing an empty string as a 3rd parameter to .css will automatically
+			// attempt a parseFloat and fallback to a string if the parse fails
+			// so, simple values such as "10px" are parsed to Float.
+			// complex values such as "rotate(1rad)" are returned as is.
+			result = jQuery.css( tween.elem, tween.prop, "" );
+			// Empty strings, null, undefined and "auto" are converted to 0.
+			return !result || result === "auto" ? 0 : result;
+		},
+		set: function( tween ) {
+			// use step hook for back compat - use cssHook if its there - use .style if its
+			// available and use plain properties where available
+			if ( jQuery.fx.step[ tween.prop ] ) {
+				jQuery.fx.step[ tween.prop ]( tween );
+			} else if ( tween.elem.style && ( tween.elem.style[ jQuery.cssProps[ tween.prop ] ] != null || jQuery.cssHooks[ tween.prop ] ) ) {
+				jQuery.style( tween.elem, tween.prop, tween.now + tween.unit );
+			} else {
+				tween.elem[ tween.prop ] = tween.now;
+			}
+		}
+	}
+};
+
+// Support: IE <=9
+// Panic based approach to setting things on disconnected nodes
+
+Tween.propHooks.scrollTop = Tween.propHooks.scrollLeft = {
+	set: function( tween ) {
+		if ( tween.elem.nodeType && tween.elem.parentNode ) {
+			tween.elem[ tween.prop ] = tween.now;
+		}
+	}
+};
+
+jQuery.each([ "toggle", "show", "hide" ], function( i, name ) {
+	var cssFn = jQuery.fn[ name ];
+	jQuery.fn[ name ] = function( speed, easing, callback ) {
+		return speed == null || typeof speed === "boolean" ?
+			cssFn.apply( this, arguments ) :
+			this.animate( genFx( name, true ), speed, easing, callback );
+	};
+});
+
+jQuery.fn.extend({
+	fadeTo: function( speed, to, easing, callback ) {
+
+		// show any hidden elements after setting opacity to 0
+		return this.filter( isHidden ).css( "opacity", 0 ).show()
+
+			// animate to the value specified
+			.end().animate({ opacity: to }, speed, easing, callback );
+	},
+	animate: function( prop, speed, easing, callback ) {
+		var empty = jQuery.isEmptyObject( prop ),
+			optall = jQuery.speed( speed, easing, callback ),
+			doAnimation = function() {
+				// Operate on a copy of prop so per-property easing won't be lost
+				var anim = Animation( this, jQuery.extend( {}, prop ), optall );
+				doAnimation.finish = function() {
+					anim.stop( true );
+				};
+				// Empty animations, or finishing resolves immediately
+				if ( empty || jQuery._data( this, "finish" ) ) {
+					anim.stop( true );
+				}
+			};
+			doAnimation.finish = doAnimation;
+
+		return empty || optall.queue === false ?
+			this.each( doAnimation ) :
+			this.queue( optall.queue, doAnimation );
+	},
+	stop: function( type, clearQueue, gotoEnd ) {
+		var stopQueue = function( hooks ) {
+			var stop = hooks.stop;
+			delete hooks.stop;
+			stop( gotoEnd );
+		};
+
+		if ( typeof type !== "string" ) {
+			gotoEnd = clearQueue;
+			clearQueue = type;
+			type = undefined;
+		}
+		if ( clearQueue && type !== false ) {
+			this.queue( type || "fx", [] );
+		}
+
+		return this.each(function() {
+			var dequeue = true,
+				index = type != null && type + "queueHooks",
+				timers = jQuery.timers,
+				data = jQuery._data( this );
+
+			if ( index ) {
+				if ( data[ index ] && data[ index ].stop ) {
+					stopQueue( data[ index ] );
+				}
+			} else {
+				for ( index in data ) {
+					if ( data[ index ] && data[ index ].stop && rrun.test( index ) ) {
+						stopQueue( data[ index ] );
+					}
+				}
+			}
+
+			for ( index = timers.length; index--; ) {
+				if ( timers[ index ].elem === this && (type == null || timers[ index ].queue === type) ) {
+					timers[ index ].anim.stop( gotoEnd );
+					dequeue = false;
+					timers.splice( index, 1 );
+				}
+			}
+
+			// start the next in the queue if the last step wasn't forced
+			// timers currently will call their complete callbacks, which will dequeue
+			// but only if they were gotoEnd
+			if ( dequeue || !gotoEnd ) {
+				jQuery.dequeue( this, type );
+			}
+		});
+	},
+	finish: function( type ) {
+		if ( type !== false ) {
+			type = type || "fx";
+		}
+		return this.each(function() {
+			var index,
+				data = jQuery._data( this ),
+				queue = data[ type + "queue" ],
+				hooks = data[ type + "queueHooks" ],
+				timers = jQuery.timers,
+				length = queue ? queue.length : 0;
+
+			// enable finishing flag on private data
+			data.finish = true;
+
+			// empty the queue first
+			jQuery.queue( this, type, [] );
+
+			if ( hooks && hooks.cur && hooks.cur.finish ) {
+				hooks.cur.finish.call( this );
+			}
+
+			// look for any active animations, and finish them
+			for ( index = timers.length; index--; ) {
+				if ( timers[ index ].elem === this && timers[ index ].queue === type ) {
+					timers[ index ].anim.stop( true );
+					timers.splice( index, 1 );
+				}
+			}
+
+			// look for any animations in the old queue and finish them
+			for ( index = 0; index < length; index++ ) {
+				if ( queue[ index ] && queue[ index ].finish ) {
+					queue[ index ].finish.call( this );
+				}
+			}
+
+			// turn off finishing flag
+			delete data.finish;
+		});
+	}
+});
+
+// Generate parameters to create a standard animation
+function genFx( type, includeWidth ) {
+	var which,
+		attrs = { height: type },
+		i = 0;
+
+	// if we include width, step value is 1 to do all cssExpand values,
+	// if we don't include width, step value is 2 to skip over Left and Right
+	includeWidth = includeWidth? 1 : 0;
+	for( ; i < 4 ; i += 2 - includeWidth ) {
+		which = cssExpand[ i ];
+		attrs[ "margin" + which ] = attrs[ "padding" + which ] = type;
+	}
+
+	if ( includeWidth ) {
+		attrs.opacity = attrs.width = type;
+	}
+
+	return attrs;
+}
+
+// Generate shortcuts for custom animations
+jQuery.each({
+	slideDown: genFx("show"),
+	slideUp: genFx("hide"),
+	slideToggle: genFx("toggle"),
+	fadeIn: { opacity: "show" },
+	fadeOut: { opacity: "hide" },
+	fadeToggle: { opacity: "toggle" }
+}, function( name, props ) {
+	jQuery.fn[ name ] = function( speed, easing, callback ) {
+		return this.animate( props, speed, easing, callback );
+	};
+});
+
+jQuery.speed = function( speed, easing, fn ) {
+	var opt = speed && typeof speed === "object" ? jQuery.extend( {}, speed ) : {
+		complete: fn || !fn && easing ||
+			jQuery.isFunction( speed ) && speed,
+		duration: speed,
+		easing: fn && easing || easing && !jQuery.isFunction( easing ) && easing
+	};
+
+	opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration :
+		opt.duration in jQuery.fx.speeds ? jQuery.fx.speeds[ opt.duration ] : jQuery.fx.speeds._default;
+
+	// normalize opt.queue - true/undefined/null -> "fx"
+	if ( opt.queue == null || opt.queue === true ) {
+		opt.queue = "fx";
+	}
+
+	// Queueing
+	opt.old = opt.complete;
+
+	opt.complete = function() {
+		if ( jQuery.isFunction( opt.old ) ) {
+			opt.old.call( this );
+		}
+
+		if ( opt.queue ) {
+			jQuery.dequeue( this, opt.queue );
+		}
+	};
+
+	return opt;
+};
+
+jQuery.easing = {
+	linear: function( p ) {
+		return p;
+	},
+	swing: function( p ) {
+		return 0.5 - Math.cos( p*Math.PI ) / 2;
+	}
+};
+
+jQuery.timers = [];
+jQuery.fx = Tween.prototype.init;
+jQuery.fx.tick = function() {
+	var timer,
+		timers = jQuery.timers,
+		i = 0;
+
+	fxNow = jQuery.now();
+
+	for ( ; i < timers.length; i++ ) {
+		timer = timers[ i ];
+		// Checks the timer has not already been removed
+		if ( !timer() && timers[ i ] === timer ) {
+			timers.splice( i--, 1 );
+		}
+	}
+
+	if ( !timers.length ) {
+		jQuery.fx.stop();
+	}
+	fxNow = undefined;
+};
+
+jQuery.fx.timer = function( timer ) {
+	if ( timer() && jQuery.timers.push( timer ) ) {
+		jQuery.fx.start();
+	}
+};
+
+jQuery.fx.interval = 13;
+
+jQuery.fx.start = function() {
+	if ( !timerId ) {
+		timerId = setInterval( jQuery.fx.tick, jQuery.fx.interval );
+	}
+};
+
+jQuery.fx.stop = function() {
+	clearInterval( timerId );
+	timerId = null;
+};
+
+jQuery.fx.speeds = {
+	slow: 600,
+	fast: 200,
+	// Default speed
+	_default: 400
+};
+
+// Back Compat <1.8 extension point
+jQuery.fx.step = {};
+
+if ( jQuery.expr && jQuery.expr.filters ) {
+	jQuery.expr.filters.animated = function( elem ) {
+		return jQuery.grep(jQuery.timers, function( fn ) {
+			return elem === fn.elem;
+		}).length;
+	};
+}
+jQuery.fn.offset = function( options ) {
+	if ( arguments.length ) {
+		return options === undefined ?
+			this :
+			this.each(function( i ) {
+				jQuery.offset.setOffset( this, options, i );
+			});
+	}
+
+	var docElem, win,
+		box = { top: 0, left: 0 },
+		elem = this[ 0 ],
+		doc = elem && elem.ownerDocument;
+
+	if ( !doc ) {
+		return;
+	}
+
+	docElem = doc.documentElement;
+
+	// Make sure it's not a disconnected DOM node
+	if ( !jQuery.contains( docElem, elem ) ) {
+		return box;
+	}
+
+	// If we don't have gBCR, just use 0,0 rather than error
+	// BlackBerry 5, iOS 3 (original iPhone)
+	if ( typeof elem.getBoundingClientRect !== core_strundefined ) {
+		box = elem.getBoundingClientRect();
+	}
+	win = getWindow( doc );
+	return {
+		top: box.top  + ( win.pageYOffset || docElem.scrollTop )  - ( docElem.clientTop  || 0 ),
+		left: box.left + ( win.pageXOffset || docElem.scrollLeft ) - ( docElem.clientLeft || 0 )
+	};
+};
+
+jQuery.offset = {
+
+	setOffset: function( elem, options, i ) {
+		var position = jQuery.css( elem, "position" );
+
+		// set position first, in-case top/left are set even on static elem
+		if ( position === "static" ) {
+			elem.style.position = "relative";
+		}
+
+		var curElem = jQuery( elem ),
+			curOffset = curElem.offset(),
+			curCSSTop = jQuery.css( elem, "top" ),
+			curCSSLeft = jQuery.css( elem, "left" ),
+			calculatePosition = ( position === "absolute" || position === "fixed" ) && jQuery.inArray("auto", [curCSSTop, curCSSLeft]) > -1,
+			props = {}, curPosition = {}, curTop, curLeft;
+
+		// need to be able to calculate position if either top or left is auto and position is either absolute or fixed
+		if ( calculatePosition ) {
+			curPosition = curElem.position();
+			curTop = curPosition.top;
+			curLeft = curPosition.left;
+		} else {
+			curTop = parseFloat( curCSSTop ) || 0;
+			curLeft = parseFloat( curCSSLeft ) || 0;
+		}
+
+		if ( jQuery.isFunction( options ) ) {
+			options = options.call( elem, i, curOffset );
+		}
+
+		if ( options.top != null ) {
+			props.top = ( options.top - curOffset.top ) + curTop;
+		}
+		if ( options.left != null ) {
+			props.left = ( options.left - curOffset.left ) + curLeft;
+		}
+
+		if ( "using" in options ) {
+			options.using.call( elem, props );
+		} else {
+			curElem.css( props );
+		}
+	}
+};
+
+
+jQuery.fn.extend({
+
+	position: function() {
+		if ( !this[ 0 ] ) {
+			return;
+		}
+
+		var offsetParent, offset,
+			parentOffset = { top: 0, left: 0 },
+			elem = this[ 0 ];
+
+		// fixed elements are offset from window (parentOffset = {top:0, left: 0}, because it is it's only offset parent
+		if ( jQuery.css( elem, "position" ) === "fixed" ) {
+			// we assume that getBoundingClientRect is available when computed position is fixed
+			offset = elem.getBoundingClientRect();
+		} else {
+			// Get *real* offsetParent
+			offsetParent = this.offsetParent();
+
+			// Get correct offsets
+			offset = this.offset();
+			if ( !jQuery.nodeName( offsetParent[ 0 ], "html" ) ) {
+				parentOffset = offsetParent.offset();
+			}
+
+			// Add offsetParent borders
+			parentOffset.top  += jQuery.css( offsetParent[ 0 ], "borderTopWidth", true );
+			parentOffset.left += jQuery.css( offsetParent[ 0 ], "borderLeftWidth", true );
+		}
+
+		// Subtract parent offsets and element margins
+		// note: when an element has margin: auto the offsetLeft and marginLeft
+		// are the same in Safari causing offset.left to incorrectly be 0
+		return {
+			top:  offset.top  - parentOffset.top - jQuery.css( elem, "marginTop", true ),
+			left: offset.left - parentOffset.left - jQuery.css( elem, "marginLeft", true)
+		};
+	},
+
+	offsetParent: function() {
+		return this.map(function() {
+			var offsetParent = this.offsetParent || docElem;
+			while ( offsetParent && ( !jQuery.nodeName( offsetParent, "html" ) && jQuery.css( offsetParent, "position") === "static" ) ) {
+				offsetParent = offsetParent.offsetParent;
+			}
+			return offsetParent || docElem;
+		});
+	}
+});
+
+
+// Create scrollLeft and scrollTop methods
+jQuery.each( {scrollLeft: "pageXOffset", scrollTop: "pageYOffset"}, function( method, prop ) {
+	var top = /Y/.test( prop );
+
+	jQuery.fn[ method ] = function( val ) {
+		return jQuery.access( this, function( elem, method, val ) {
+			var win = getWindow( elem );
+
+			if ( val === undefined ) {
+				return win ? (prop in win) ? win[ prop ] :
+					win.document.documentElement[ method ] :
+					elem[ method ];
+			}
+
+			if ( win ) {
+				win.scrollTo(
+					!top ? val : jQuery( win ).scrollLeft(),
+					top ? val : jQuery( win ).scrollTop()
+				);
+
+			} else {
+				elem[ method ] = val;
+			}
+		}, method, val, arguments.length, null );
+	};
+});
+
+function getWindow( elem ) {
+	return jQuery.isWindow( elem ) ?
+		elem :
+		elem.nodeType === 9 ?
+			elem.defaultView || elem.parentWindow :
+			false;
+}
+// Create innerHeight, innerWidth, height, width, outerHeight and outerWidth methods
+jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
+	jQuery.each( { padding: "inner" + name, content: type, "": "outer" + name }, function( defaultExtra, funcName ) {
+		// margin is only for outerHeight, outerWidth
+		jQuery.fn[ funcName ] = function( margin, value ) {
+			var chainable = arguments.length && ( defaultExtra || typeof margin !== "boolean" ),
+				extra = defaultExtra || ( margin === true || value === true ? "margin" : "border" );
+
+			return jQuery.access( this, function( elem, type, value ) {
+				var doc;
+
+				if ( jQuery.isWindow( elem ) ) {
+					// As of 5/8/2012 this will yield incorrect results for Mobile Safari, but there
+					// isn't a whole lot we can do. See pull request at this URL for discussion:
+					// https://github.com/jquery/jquery/pull/764
+					return elem.document.documentElement[ "client" + name ];
+				}
+
+				// Get document width or height
+				if ( elem.nodeType === 9 ) {
+					doc = elem.documentElement;
+
+					// Either scroll[Width/Height] or offset[Width/Height] or client[Width/Height], whichever is greatest
+					// unfortunately, this causes bug #3838 in IE6/8 only, but there is currently no good, small way to fix it.
+					return Math.max(
+						elem.body[ "scroll" + name ], doc[ "scroll" + name ],
+						elem.body[ "offset" + name ], doc[ "offset" + name ],
+						doc[ "client" + name ]
+					);
+				}
+
+				return value === undefined ?
+					// Get width or height on the element, requesting but not forcing parseFloat
+					jQuery.css( elem, type, extra ) :
+
+					// Set width or height on the element
+					jQuery.style( elem, type, value, extra );
+			}, type, chainable ? margin : undefined, chainable, null );
+		};
+	});
+});
+// Limit scope pollution from any deprecated API
+// (function() {
+
+// The number of elements contained in the matched element set
+jQuery.fn.size = function() {
+	return this.length;
+};
+
+jQuery.fn.andSelf = jQuery.fn.addBack;
+
+// })();
+if ( typeof module === "object" && typeof module.exports === "object" ) {
+	// Expose jQuery as module.exports in loaders that implement the Node
+	// module pattern (including browserify). Do not create the global, since
+	// the user will be storing it themselves locally, and globals are frowned
+	// upon in the Node module world.
+	module.exports = jQuery;
+} else {
+	// Otherwise expose jQuery to the global object as usual
+	window.jQuery = window.$ = jQuery;
+
+	// Register as a named AMD module, since jQuery can be concatenated with other
+	// files that may use define, but not via a proper concatenation script that
+	// understands anonymous AMD modules. A named AMD is safest and most robust
+	// way to register. Lowercase jquery is used because AMD module names are
+	// derived from file names, and jQuery is normally delivered in a lowercase
+	// file name. Do this after creating the global so that if an AMD module wants
+	// to call noConflict to hide this version of jQuery, it will work.
+	if ( typeof define === "function" && define.amd ) {
+		define( "jquery", [], function () { return jQuery; } );
+	}
+}
+
+})( window );
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/js/jquery-1.8.3.min.js b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/js/jquery-1.8.3.min.js
new file mode 100644
index 0000000..3883779
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/js/jquery-1.8.3.min.js
@@ -0,0 +1,2 @@
+/*! jQuery v1.8.3 jquery.com | jquery.org/license */
+(function(e,t){function _(e){var t=M[e]={};return v.each(e.split(y),function(e,n){t[n]=!0}),t}function H(e,n,r){if(r===t&&e.nodeType===1){var i="data-"+n.replace(P,"-$1").toLowerCase();r=e.getAttribute(i);if(typeof r=="string"){try{r=r==="true"?!0:r==="false"?!1:r==="null"?null:+r+""===r?+r:D.test(r)?v.parseJSON(r):r}catch(s){}v.data(e,n,r)}else r=t}return r}function B(e){var t;for(t in e){if(t==="data"&&v.isEmptyObject(e[t]))continue;if(t!=="toJSON")return!1}return!0}function et(){return!1}function tt(){return!0}function ut(e){return!e||!e.parentNode||e.parentNode.nodeType===11}function at(e,t){do e=e[t];while(e&&e.nodeType!==1);return e}function ft(e,t,n){t=t||0;if(v.isFunction(t))return v.grep(e,function(e,r){var i=!!t.call(e,r,e);return i===n});if(t.nodeType)return v.grep(e,function(e,r){return e===t===n});if(typeof t=="string"){var r=v.grep(e,function(e){return e.nodeType===1});if(it.test(t))return v.filter(t,r,!n);t=v.filter(t,r)}return v.grep(e,function(e,r){return v.inArray(e,t)>=0===n})}function lt(e){var t=ct.split("|"),n=e.createDocumentFragment();if(n.createElement)while(t.length)n.createElement(t.pop());return n}function Lt(e,t){return e.getElementsByTagName(t)[0]||e.appendChild(e.ownerDocument.createElement(t))}function At(e,t){if(t.nodeType!==1||!v.hasData(e))return;var n,r,i,s=v._data(e),o=v._data(t,s),u=s.events;if(u){delete o.handle,o.events={};for(n in u)for(r=0,i=u[n].length;r<i;r++)v.event.add(t,n,u[n][r])}o.data&&(o.data=v.extend({},o.data))}function Ot(e,t){var n;if(t.nodeType!==1)return;t.clearAttributes&&t.clearAttributes(),t.mergeAttributes&&t.mergeAttributes(e),n=t.nodeName.toLowerCase(),n==="object"?(t.parentNode&&(t.outerHTML=e.outerHTML),v.support.html5Clone&&e.innerHTML&&!v.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):n==="input"&&Et.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):n==="option"?t.selected=e.defaultSelected:n==="input"||n==="textarea"?t.defaultValue=e.defaultValue:n==="script"&&t.text!==e.text&&(t.text=e.text),t.removeAttribute(v.expando)}function Mt(e){return typeof e.getElementsByTagName!="undefined"?e.getElementsByTagName("*"):typeof e.querySelectorAll!="undefined"?e.querySelectorAll("*"):[]}function _t(e){Et.test(e.type)&&(e.defaultChecked=e.checked)}function Qt(e,t){if(t in e)return t;var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=Jt.length;while(i--){t=Jt[i]+n;if(t in e)return t}return r}function Gt(e,t){return e=t||e,v.css(e,"display")==="none"||!v.contains(e.ownerDocument,e)}function Yt(e,t){var n,r,i=[],s=0,o=e.length;for(;s<o;s++){n=e[s];if(!n.style)continue;i[s]=v._data(n,"olddisplay"),t?(!i[s]&&n.style.display==="none"&&(n.style.display=""),n.style.display===""&&Gt(n)&&(i[s]=v._data(n,"olddisplay",nn(n.nodeName)))):(r=Dt(n,"display"),!i[s]&&r!=="none"&&v._data(n,"olddisplay",r))}for(s=0;s<o;s++){n=e[s];if(!n.style)continue;if(!t||n.style.display==="none"||n.style.display==="")n.style.display=t?i[s]||"":"none"}return e}function Zt(e,t,n){var r=Rt.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function en(e,t,n,r){var i=n===(r?"border":"content")?4:t==="width"?1:0,s=0;for(;i<4;i+=2)n==="margin"&&(s+=v.css(e,n+$t[i],!0)),r?(n==="content"&&(s-=parseFloat(Dt(e,"padding"+$t[i]))||0),n!=="margin"&&(s-=parseFloat(Dt(e,"border"+$t[i]+"Width"))||0)):(s+=parseFloat(Dt(e,"padding"+$t[i]))||0,n!=="padding"&&(s+=parseFloat(Dt(e,"border"+$t[i]+"Width"))||0));return s}function tn(e,t,n){var r=t==="width"?e.offsetWidth:e.offsetHeight,i=!0,s=v.support.boxSizing&&v.css(e,"boxSizing")==="border-box";if(r<=0||r==null){r=Dt(e,t);if(r<0||r==null)r=e.style[t];if(Ut.test(r))return r;i=s&&(v.support.boxSizingReliable||r===e.style[t]),r=parseFloat(r)||0}return r+en(e,t,n||(s?"border":"content"),i)+"px"}function nn(e){if(Wt[e])return Wt[e];var t=v("<"+e+">").appendTo(i.body),n=t.css("display");t.remove();if(n==="none"||n===""){Pt=i.body.appendChild(Pt||v.extend(i.createElement("iframe"),{frameBorder:0,width:0,height:0}));if(!Ht||!Pt.createElement)Ht=(Pt.contentWindow||Pt.contentDocument).document,Ht.write("<!doctype html><html><body>"),Ht.close();t=Ht.body.appendChild(Ht.createElement(e)),n=Dt(t,"display"),i.body.removeChild(Pt)}return Wt[e]=n,n}function fn(e,t,n,r){var i;if(v.isArray(t))v.each(t,function(t,i){n||sn.test(e)?r(e,i):fn(e+"["+(typeof i=="object"?t:"")+"]",i,n,r)});else if(!n&&v.type(t)==="object")for(i in t)fn(e+"["+i+"]",t[i],n,r);else r(e,t)}function Cn(e){return function(t,n){typeof t!="string"&&(n=t,t="*");var r,i,s,o=t.toLowerCase().split(y),u=0,a=o.length;if(v.isFunction(n))for(;u<a;u++)r=o[u],s=/^\+/.test(r),s&&(r=r.substr(1)||"*"),i=e[r]=e[r]||[],i[s?"unshift":"push"](n)}}function kn(e,n,r,i,s,o){s=s||n.dataTypes[0],o=o||{},o[s]=!0;var u,a=e[s],f=0,l=a?a.length:0,c=e===Sn;for(;f<l&&(c||!u);f++)u=a[f](n,r,i),typeof u=="string"&&(!c||o[u]?u=t:(n.dataTypes.unshift(u),u=kn(e,n,r,i,u,o)));return(c||!u)&&!o["*"]&&(u=kn(e,n,r,i,"*",o)),u}function Ln(e,n){var r,i,s=v.ajaxSettings.flatOptions||{};for(r in n)n[r]!==t&&((s[r]?e:i||(i={}))[r]=n[r]);i&&v.extend(!0,e,i)}function An(e,n,r){var i,s,o,u,a=e.contents,f=e.dataTypes,l=e.responseFields;for(s in l)s in r&&(n[l[s]]=r[s]);while(f[0]==="*")f.shift(),i===t&&(i=e.mimeType||n.getResponseHeader("content-type"));if(i)for(s in a)if(a[s]&&a[s].test(i)){f.unshift(s);break}if(f[0]in r)o=f[0];else{for(s in r){if(!f[0]||e.converters[s+" "+f[0]]){o=s;break}u||(u=s)}o=o||u}if(o)return o!==f[0]&&f.unshift(o),r[o]}function On(e,t){var n,r,i,s,o=e.dataTypes.slice(),u=o[0],a={},f=0;e.dataFilter&&(t=e.dataFilter(t,e.dataType));if(o[1])for(n in e.converters)a[n.toLowerCase()]=e.converters[n];for(;i=o[++f];)if(i!=="*"){if(u!=="*"&&u!==i){n=a[u+" "+i]||a["* "+i];if(!n)for(r in a){s=r.split(" ");if(s[1]===i){n=a[u+" "+s[0]]||a["* "+s[0]];if(n){n===!0?n=a[r]:a[r]!==!0&&(i=s[0],o.splice(f--,0,i));break}}}if(n!==!0)if(n&&e["throws"])t=n(t);else try{t=n(t)}catch(l){return{state:"parsererror",error:n?l:"No conversion from "+u+" to "+i}}}u=i}return{state:"success",data:t}}function Fn(){try{return new e.XMLHttpRequest}catch(t){}}function In(){try{return new e.ActiveXObject("Microsoft.XMLHTTP")}catch(t){}}function $n(){return setTimeout(function(){qn=t},0),qn=v.now()}function Jn(e,t){v.each(t,function(t,n){var r=(Vn[t]||[]).concat(Vn["*"]),i=0,s=r.length;for(;i<s;i++)if(r[i].call(e,t,n))return})}function Kn(e,t,n){var r,i=0,s=0,o=Xn.length,u=v.Deferred().always(function(){delete a.elem}),a=function(){var t=qn||$n(),n=Math.max(0,f.startTime+f.duration-t),r=n/f.duration||0,i=1-r,s=0,o=f.tweens.length;for(;s<o;s++)f.tweens[s].run(i);return u.notifyWith(e,[f,i,n]),i<1&&o?n:(u.resolveWith(e,[f]),!1)},f=u.promise({elem:e,props:v.extend({},t),opts:v.extend(!0,{specialEasing:{}},n),originalProperties:t,originalOptions:n,startTime:qn||$n(),duration:n.duration,tweens:[],createTween:function(t,n,r){var i=v.Tween(e,f.opts,t,n,f.opts.specialEasing[t]||f.opts.easing);return f.tweens.push(i),i},stop:function(t){var n=0,r=t?f.tweens.length:0;for(;n<r;n++)f.tweens[n].run(1);return t?u.resolveWith(e,[f,t]):u.rejectWith(e,[f,t]),this}}),l=f.props;Qn(l,f.opts.specialEasing);for(;i<o;i++){r=Xn[i].call(f,e,l,f.opts);if(r)return r}return Jn(f,l),v.isFunction(f.opts.start)&&f.opts.start.call(e,f),v.fx.timer(v.extend(a,{anim:f,queue:f.opts.queue,elem:e})),f.progress(f.opts.progress).done(f.opts.done,f.opts.complete).fail(f.opts.fail).always(f.opts.always)}function Qn(e,t){var n,r,i,s,o;for(n in e){r=v.camelCase(n),i=t[r],s=e[n],v.isArray(s)&&(i=s[1],s=e[n]=s[0]),n!==r&&(e[r]=s,delete e[n]),o=v.cssHooks[r];if(o&&"expand"in o){s=o.expand(s),delete e[r];for(n in s)n in e||(e[n]=s[n],t[n]=i)}else t[r]=i}}function Gn(e,t,n){var r,i,s,o,u,a,f,l,c,h=this,p=e.style,d={},m=[],g=e.nodeType&&Gt(e);n.queue||(l=v._queueHooks(e,"fx"),l.unqueued==null&&(l.unqueued=0,c=l.empty.fire,l.empty.fire=function(){l.unqueued||c()}),l.unqueued++,h.always(function(){h.always(function(){l.unqueued--,v.queue(e,"fx").length||l.empty.fire()})})),e.nodeType===1&&("height"in t||"width"in t)&&(n.overflow=[p.overflow,p.overflowX,p.overflowY],v.css(e,"display")==="inline"&&v.css(e,"float")==="none"&&(!v.support.inlineBlockNeedsLayout||nn(e.nodeName)==="inline"?p.display="inline-block":p.zoom=1)),n.overflow&&(p.overflow="hidden",v.support.shrinkWrapBlocks||h.done(function(){p.overflow=n.overflow[0],p.overflowX=n.overflow[1],p.overflowY=n.overflow[2]}));for(r in t){s=t[r];if(Un.exec(s)){delete t[r],a=a||s==="toggle";if(s===(g?"hide":"show"))continue;m.push(r)}}o=m.length;if(o){u=v._data(e,"fxshow")||v._data(e,"fxshow",{}),"hidden"in u&&(g=u.hidden),a&&(u.hidden=!g),g?v(e).show():h.done(function(){v(e).hide()}),h.done(function(){var t;v.removeData(e,"fxshow",!0);for(t in d)v.style(e,t,d[t])});for(r=0;r<o;r++)i=m[r],f=h.createTween(i,g?u[i]:0),d[i]=u[i]||v.style(e,i),i in u||(u[i]=f.start,g&&(f.end=f.start,f.start=i==="width"||i==="height"?1:0))}}function Yn(e,t,n,r,i){return new Yn.prototype.init(e,t,n,r,i)}function Zn(e,t){var n,r={height:e},i=0;t=t?1:0;for(;i<4;i+=2-t)n=$t[i],r["margin"+n]=r["padding"+n]=e;return t&&(r.opacity=r.width=e),r}function tr(e){return v.isWindow(e)?e:e.nodeType===9?e.defaultView||e.parentWindow:!1}var n,r,i=e.document,s=e.location,o=e.navigator,u=e.jQuery,a=e.$,f=Array.prototype.push,l=Array.prototype.slice,c=Array.prototype.indexOf,h=Object.prototype.toString,p=Object.prototype.hasOwnProperty,d=String.prototype.trim,v=function(e,t){return new v.fn.init(e,t,n)},m=/[\-+]?(?:\d*\.|)\d+(?:[eE][\-+]?\d+|)/.source,g=/\S/,y=/\s+/,b=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,w=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,E=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,S=/^[\],:{}\s]*$/,x=/(?:^|:|,)(?:\s*\[)+/g,T=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,N=/"[^"\\\r\n]*"|true|false|null|-?(?:\d\d*\.|)\d+(?:[eE][\-+]?\d+|)/g,C=/^-ms-/,k=/-([\da-z])/gi,L=function(e,t){return(t+"").toUpperCase()},A=function(){i.addEventListener?(i.removeEventListener("DOMContentLoaded",A,!1),v.ready()):i.readyState==="complete"&&(i.detachEvent("onreadystatechange",A),v.ready())},O={};v.fn=v.prototype={constructor:v,init:function(e,n,r){var s,o,u,a;if(!e)return this;if(e.nodeType)return this.context=this[0]=e,this.length=1,this;if(typeof e=="string"){e.charAt(0)==="<"&&e.charAt(e.length-1)===">"&&e.length>=3?s=[null,e,null]:s=w.exec(e);if(s&&(s[1]||!n)){if(s[1])return n=n instanceof v?n[0]:n,a=n&&n.nodeType?n.ownerDocument||n:i,e=v.parseHTML(s[1],a,!0),E.test(s[1])&&v.isPlainObject(n)&&this.attr.call(e,n,!0),v.merge(this,e);o=i.getElementById(s[2]);if(o&&o.parentNode){if(o.id!==s[2])return r.find(e);this.length=1,this[0]=o}return this.context=i,this.selector=e,this}return!n||n.jquery?(n||r).find(e):this.constructor(n).find(e)}return v.isFunction(e)?r.ready(e):(e.selector!==t&&(this.selector=e.selector,this.context=e.context),v.makeArray(e,this))},selector:"",jquery:"1.8.3",length:0,size:function(){return this.length},toArray:function(){return l.call(this)},get:function(e){return e==null?this.toArray():e<0?this[this.length+e]:this[e]},pushStack:function(e,t,n){var r=v.merge(this.constructor(),e);return r.prevObject=this,r.context=this.context,t==="find"?r.selector=this.selector+(this.selector?" ":"")+n:t&&(r.selector=this.selector+"."+t+"("+n+")"),r},each:function(e,t){return v.each(this,e,t)},ready:function(e){return v.ready.promise().done(e),this},eq:function(e){return e=+e,e===-1?this.slice(e):this.slice(e,e+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(l.apply(this,arguments),"slice",l.call(arguments).join(","))},map:function(e){return this.pushStack(v.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:[].sort,splice:[].splice},v.fn.init.prototype=v.fn,v.extend=v.fn.extend=function(){var e,n,r,i,s,o,u=arguments[0]||{},a=1,f=arguments.length,l=!1;typeof u=="boolean"&&(l=u,u=arguments[1]||{},a=2),typeof u!="object"&&!v.isFunction(u)&&(u={}),f===a&&(u=this,--a);for(;a<f;a++)if((e=arguments[a])!=null)for(n in e){r=u[n],i=e[n];if(u===i)continue;l&&i&&(v.isPlainObject(i)||(s=v.isArray(i)))?(s?(s=!1,o=r&&v.isArray(r)?r:[]):o=r&&v.isPlainObject(r)?r:{},u[n]=v.extend(l,o,i)):i!==t&&(u[n]=i)}return u},v.extend({noConflict:function(t){return e.$===v&&(e.$=a),t&&e.jQuery===v&&(e.jQuery=u),v},isReady:!1,readyWait:1,holdReady:function(e){e?v.readyWait++:v.ready(!0)},ready:function(e){if(e===!0?--v.readyWait:v.isReady)return;if(!i.body)return setTimeout(v.ready,1);v.isReady=!0;if(e!==!0&&--v.readyWait>0)return;r.resolveWith(i,[v]),v.fn.trigger&&v(i).trigger("ready").off("ready")},isFunction:function(e){return v.type(e)==="function"},isArray:Array.isArray||function(e){return v.type(e)==="array"},isWindow:function(e){return e!=null&&e==e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){return e==null?String(e):O[h.call(e)]||"object"},isPlainObject:function(e){if(!e||v.type(e)!=="object"||e.nodeType||v.isWindow(e))return!1;try{if(e.constructor&&!p.call(e,"constructor")&&!p.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(n){return!1}var r;for(r in e);return r===t||p.call(e,r)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},error:function(e){throw new Error(e)},parseHTML:function(e,t,n){var r;return!e||typeof e!="string"?null:(typeof t=="boolean"&&(n=t,t=0),t=t||i,(r=E.exec(e))?[t.createElement(r[1])]:(r=v.buildFragment([e],t,n?null:[]),v.merge([],(r.cacheable?v.clone(r.fragment):r.fragment).childNodes)))},parseJSON:function(t){if(!t||typeof t!="string")return null;t=v.trim(t);if(e.JSON&&e.JSON.parse)return e.JSON.parse(t);if(S.test(t.replace(T,"@").replace(N,"]").replace(x,"")))return(new Function("return "+t))();v.error("Invalid JSON: "+t)},parseXML:function(n){var r,i;if(!n||typeof n!="string")return null;try{e.DOMParser?(i=new DOMParser,r=i.parseFromString(n,"text/xml")):(r=new ActiveXObject("Microsoft.XMLDOM"),r.async="false",r.loadXML(n))}catch(s){r=t}return(!r||!r.documentElement||r.getElementsByTagName("parsererror").length)&&v.error("Invalid XML: "+n),r},noop:function(){},globalEval:function(t){t&&g.test(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(C,"ms-").replace(k,L)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,n,r){var i,s=0,o=e.length,u=o===t||v.isFunction(e);if(r){if(u){for(i in e)if(n.apply(e[i],r)===!1)break}else for(;s<o;)if(n.apply(e[s++],r)===!1)break}else if(u){for(i in e)if(n.call(e[i],i,e[i])===!1)break}else for(;s<o;)if(n.call(e[s],s,e[s++])===!1)break;return e},trim:d&&!d.call("\ufeff\u00a0")?function(e){return e==null?"":d.call(e)}:function(e){return e==null?"":(e+"").replace(b,"")},makeArray:function(e,t){var n,r=t||[];return e!=null&&(n=v.type(e),e.length==null||n==="string"||n==="function"||n==="regexp"||v.isWindow(e)?f.call(r,e):v.merge(r,e)),r},inArray:function(e,t,n){var r;if(t){if(c)return c.call(t,e,n);r=t.length,n=n?n<0?Math.max(0,r+n):n:0;for(;n<r;n++)if(n in t&&t[n]===e)return n}return-1},merge:function(e,n){var r=n.length,i=e.length,s=0;if(typeof r=="number")for(;s<r;s++)e[i++]=n[s];else while(n[s]!==t)e[i++]=n[s++];return e.length=i,e},grep:function(e,t,n){var r,i=[],s=0,o=e.length;n=!!n;for(;s<o;s++)r=!!t(e[s],s),n!==r&&i.push(e[s]);return i},map:function(e,n,r){var i,s,o=[],u=0,a=e.length,f=e instanceof v||a!==t&&typeof a=="number"&&(a>0&&e[0]&&e[a-1]||a===0||v.isArray(e));if(f)for(;u<a;u++)i=n(e[u],u,r),i!=null&&(o[o.length]=i);else for(s in e)i=n(e[s],s,r),i!=null&&(o[o.length]=i);return o.concat.apply([],o)},guid:1,proxy:function(e,n){var r,i,s;return typeof n=="string"&&(r=e[n],n=e,e=r),v.isFunction(e)?(i=l.call(arguments,2),s=function(){return e.apply(n,i.concat(l.call(arguments)))},s.guid=e.guid=e.guid||v.guid++,s):t},access:function(e,n,r,i,s,o,u){var a,f=r==null,l=0,c=e.length;if(r&&typeof r=="object"){for(l in r)v.access(e,n,l,r[l],1,o,i);s=1}else if(i!==t){a=u===t&&v.isFunction(i),f&&(a?(a=n,n=function(e,t,n){return a.call(v(e),n)}):(n.call(e,i),n=null));if(n)for(;l<c;l++)n(e[l],r,a?i.call(e[l],l,n(e[l],r)):i,u);s=1}return s?e:f?n.call(e):c?n(e[0],r):o},now:function(){return(new Date).getTime()}}),v.ready.promise=function(t){if(!r){r=v.Deferred();if(i.readyState==="complete")setTimeout(v.ready,1);else if(i.addEventListener)i.addEventListener("DOMContentLoaded",A,!1),e.addEventListener("load",v.ready,!1);else{i.attachEvent("onreadystatechange",A),e.attachEvent("onload",v.ready);var n=!1;try{n=e.frameElement==null&&i.documentElement}catch(s){}n&&n.doScroll&&function o(){if(!v.isReady){try{n.doScroll("left")}catch(e){return setTimeout(o,50)}v.ready()}}()}}return r.promise(t)},v.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(e,t){O["[object "+t+"]"]=t.toLowerCase()}),n=v(i);var M={};v.Callbacks=function(e){e=typeof e=="string"?M[e]||_(e):v.extend({},e);var n,r,i,s,o,u,a=[],f=!e.once&&[],l=function(t){n=e.memory&&t,r=!0,u=s||0,s=0,o=a.length,i=!0;for(;a&&u<o;u++)if(a[u].apply(t[0],t[1])===!1&&e.stopOnFalse){n=!1;break}i=!1,a&&(f?f.length&&l(f.shift()):n?a=[]:c.disable())},c={add:function(){if(a){var t=a.length;(function r(t){v.each(t,function(t,n){var i=v.type(n);i==="function"?(!e.unique||!c.has(n))&&a.push(n):n&&n.length&&i!=="string"&&r(n)})})(arguments),i?o=a.length:n&&(s=t,l(n))}return this},remove:function(){return a&&v.each(arguments,function(e,t){var n;while((n=v.inArray(t,a,n))>-1)a.splice(n,1),i&&(n<=o&&o--,n<=u&&u--)}),this},has:function(e){return v.inArray(e,a)>-1},empty:function(){return a=[],this},disable:function(){return a=f=n=t,this},disabled:function(){return!a},lock:function(){return f=t,n||c.disable(),this},locked:function(){return!f},fireWith:function(e,t){return t=t||[],t=[e,t.slice?t.slice():t],a&&(!r||f)&&(i?f.push(t):l(t)),this},fire:function(){return c.fireWith(this,arguments),this},fired:function(){return!!r}};return c},v.extend({Deferred:function(e){var t=[["resolve","done",v.Callbacks("once memory"),"resolved"],["reject","fail",v.Callbacks("once memory"),"rejected"],["notify","progress",v.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return v.Deferred(function(n){v.each(t,function(t,r){var s=r[0],o=e[t];i[r[1]](v.isFunction(o)?function(){var e=o.apply(this,arguments);e&&v.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[s+"With"](this===i?n:this,[e])}:n[s])}),e=null}).promise()},promise:function(e){return e!=null?v.extend(e,r):r}},i={};return r.pipe=r.then,v.each(t,function(e,s){var o=s[2],u=s[3];r[s[1]]=o.add,u&&o.add(function(){n=u},t[e^1][2].disable,t[2][2].lock),i[s[0]]=o.fire,i[s[0]+"With"]=o.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t=0,n=l.call(arguments),r=n.length,i=r!==1||e&&v.isFunction(e.promise)?r:0,s=i===1?e:v.Deferred(),o=function(e,t,n){return function(r){t[e]=this,n[e]=arguments.length>1?l.call(arguments):r,n===u?s.notifyWith(t,n):--i||s.resolveWith(t,n)}},u,a,f;if(r>1){u=new Array(r),a=new Array(r),f=new Array(r);for(;t<r;t++)n[t]&&v.isFunction(n[t].promise)?n[t].promise().done(o(t,f,n)).fail(s.reject).progress(o(t,a,u)):--i}return i||s.resolveWith(f,n),s.promise()}}),v.support=function(){var t,n,r,s,o,u,a,f,l,c,h,p=i.createElement("div");p.setAttribute("className","t"),p.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",n=p.getElementsByTagName("*"),r=p.getElementsByTagName("a")[0];if(!n||!r||!n.length)return{};s=i.createElement("select"),o=s.appendChild(i.createElement("option")),u=p.getElementsByTagName("input")[0],r.style.cssText="top:1px;float:left;opacity:.5",t={leadingWhitespace:p.firstChild.nodeType===3,tbody:!p.getElementsByTagName("tbody").length,htmlSerialize:!!p.getElementsByTagName("link").length,style:/top/.test(r.getAttribute("style")),hrefNormalized:r.getAttribute("href")==="/a",opacity:/^0.5/.test(r.style.opacity),cssFloat:!!r.style.cssFloat,checkOn:u.value==="on",optSelected:o.selected,getSetAttribute:p.className!=="t",enctype:!!i.createElement("form").enctype,html5Clone:i.createElement("nav").cloneNode(!0).outerHTML!=="<:nav></:nav>",boxModel:i.compatMode==="CSS1Compat",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,boxSizingReliable:!0,pixelPosition:!1},u.checked=!0,t.noCloneChecked=u.cloneNode(!0).checked,s.disabled=!0,t.optDisabled=!o.disabled;try{delete p.test}catch(d){t.deleteExpando=!1}!p.addEventListener&&p.attachEvent&&p.fireEvent&&(p.attachEvent("onclick",h=function(){t.noCloneEvent=!1}),p.cloneNode(!0).fireEvent("onclick"),p.detachEvent("onclick",h)),u=i.createElement("input"),u.value="t",u.setAttribute("type","radio"),t.radioValue=u.value==="t",u.setAttribute("checked","checked"),u.setAttribute("name","t"),p.appendChild(u),a=i.createDocumentFragment(),a.appendChild(p.lastChild),t.checkClone=a.cloneNode(!0).cloneNode(!0).lastChild.checked,t.appendChecked=u.checked,a.removeChild(u),a.appendChild(p);if(p.attachEvent)for(l in{submit:!0,change:!0,focusin:!0})f="on"+l,c=f in p,c||(p.setAttribute(f,"return;"),c=typeof p[f]=="function"),t[l+"Bubbles"]=c;return v(function(){var n,r,s,o,u="padding:0;margin:0;border:0;display:block;overflow:hidden;",a=i.getElementsByTagName("body")[0];if(!a)return;n=i.createElement("div"),n.style.cssText="visibility:hidden;border:0;width:0;height:0;position:static;top:0;margin-top:1px",a.insertBefore(n,a.firstChild),r=i.createElement("div"),n.appendChild(r),r.innerHTML="<table><tr><td></td><td>t</td></tr></table>",s=r.getElementsByTagName("td"),s[0].style.cssText="padding:0;margin:0;border:0;display:none",c=s[0].offsetHeight===0,s[0].style.display="",s[1].style.display="none",t.reliableHiddenOffsets=c&&s[0].offsetHeight===0,r.innerHTML="",r.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",t.boxSizing=r.offsetWidth===4,t.doesNotIncludeMarginInBodyOffset=a.offsetTop!==1,e.getComputedStyle&&(t.pixelPosition=(e.getComputedStyle(r,null)||{}).top!=="1%",t.boxSizingReliable=(e.getComputedStyle(r,null)||{width:"4px"}).width==="4px",o=i.createElement("div"),o.style.cssText=r.style.cssText=u,o.style.marginRight=o.style.width="0",r.style.width="1px",r.appendChild(o),t.reliableMarginRight=!parseFloat((e.getComputedStyle(o,null)||{}).marginRight)),typeof r.style.zoom!="undefined"&&(r.innerHTML="",r.style.cssText=u+"width:1px;padding:1px;display:inline;zoom:1",t.inlineBlockNeedsLayout=r.offsetWidth===3,r.style.display="block",r.style.overflow="visible",r.innerHTML="<div></div>",r.firstChild.style.width="5px",t.shrinkWrapBlocks=r.offsetWidth!==3,n.style.zoom=1),a.removeChild(n),n=r=s=o=null}),a.removeChild(p),n=r=s=o=u=a=p=null,t}();var D=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,P=/([A-Z])/g;v.extend({cache:{},deletedIds:[],uuid:0,expando:"jQuery"+(v.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(e){return e=e.nodeType?v.cache[e[v.expando]]:e[v.expando],!!e&&!B(e)},data:function(e,n,r,i){if(!v.acceptData(e))return;var s,o,u=v.expando,a=typeof n=="string",f=e.nodeType,l=f?v.cache:e,c=f?e[u]:e[u]&&u;if((!c||!l[c]||!i&&!l[c].data)&&a&&r===t)return;c||(f?e[u]=c=v.deletedIds.pop()||v.guid++:c=u),l[c]||(l[c]={},f||(l[c].toJSON=v.noop));if(typeof n=="object"||typeof n=="function")i?l[c]=v.extend(l[c],n):l[c].data=v.extend(l[c].data,n);return s=l[c],i||(s.data||(s.data={}),s=s.data),r!==t&&(s[v.camelCase(n)]=r),a?(o=s[n],o==null&&(o=s[v.camelCase(n)])):o=s,o},removeData:function(e,t,n){if(!v.acceptData(e))return;var r,i,s,o=e.nodeType,u=o?v.cache:e,a=o?e[v.expando]:v.expando;if(!u[a])return;if(t){r=n?u[a]:u[a].data;if(r){v.isArray(t)||(t in r?t=[t]:(t=v.camelCase(t),t in r?t=[t]:t=t.split(" ")));for(i=0,s=t.length;i<s;i++)delete r[t[i]];if(!(n?B:v.isEmptyObject)(r))return}}if(!n){delete u[a].data;if(!B(u[a]))return}o?v.cleanData([e],!0):v.support.deleteExpando||u!=u.window?delete u[a]:u[a]=null},_data:function(e,t,n){return v.data(e,t,n,!0)},acceptData:function(e){var t=e.nodeName&&v.noData[e.nodeName.toLowerCase()];return!t||t!==!0&&e.getAttribute("classid")===t}}),v.fn.extend({data:function(e,n){var r,i,s,o,u,a=this[0],f=0,l=null;if(e===t){if(this.length){l=v.data(a);if(a.nodeType===1&&!v._data(a,"parsedAttrs")){s=a.attributes;for(u=s.length;f<u;f++)o=s[f].name,o.indexOf("data-")||(o=v.camelCase(o.substring(5)),H(a,o,l[o]));v._data(a,"parsedAttrs",!0)}}return l}return typeof e=="object"?this.each(function(){v.data(this,e)}):(r=e.split(".",2),r[1]=r[1]?"."+r[1]:"",i=r[1]+"!",v.access(this,function(n){if(n===t)return l=this.triggerHandler("getData"+i,[r[0]]),l===t&&a&&(l=v.data(a,e),l=H(a,e,l)),l===t&&r[1]?this.data(r[0]):l;r[1]=n,this.each(function(){var t=v(this);t.triggerHandler("setData"+i,r),v.data(this,e,n),t.triggerHandler("changeData"+i,r)})},null,n,arguments.length>1,null,!1))},removeData:function(e){return this.each(function(){v.removeData(this,e)})}}),v.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=v._data(e,t),n&&(!r||v.isArray(n)?r=v._data(e,t,v.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=v.queue(e,t),r=n.length,i=n.shift(),s=v._queueHooks(e,t),o=function(){v.dequeue(e,t)};i==="inprogress"&&(i=n.shift(),r--),i&&(t==="fx"&&n.unshift("inprogress"),delete s.stop,i.call(e,o,s)),!r&&s&&s.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return v._data(e,n)||v._data(e,n,{empty:v.Callbacks("once memory").add(function(){v.removeData(e,t+"queue",!0),v.removeData(e,n,!0)})})}}),v.fn.extend({queue:function(e,n){var r=2;return typeof e!="string"&&(n=e,e="fx",r--),arguments.length<r?v.queue(this[0],e):n===t?this:this.each(function(){var t=v.queue(this,e,n);v._queueHooks(this,e),e==="fx"&&t[0]!=="inprogress"&&v.dequeue(this,e)})},dequeue:function(e){return this.each(function(){v.dequeue(this,e)})},delay:function(e,t){return e=v.fx?v.fx.speeds[e]||e:e,t=t||"fx",this.queue(t,function(t,n){var r=setTimeout(t,e);n.stop=function(){clearTimeout(r)}})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,n){var r,i=1,s=v.Deferred(),o=this,u=this.length,a=function(){--i||s.resolveWith(o,[o])};typeof e!="string"&&(n=e,e=t),e=e||"fx";while(u--)r=v._data(o[u],e+"queueHooks"),r&&r.empty&&(i++,r.empty.add(a));return a(),s.promise(n)}});var j,F,I,q=/[\t\r\n]/g,R=/\r/g,U=/^(?:button|input)$/i,z=/^(?:button|input|object|select|textarea)$/i,W=/^a(?:rea|)$/i,X=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,V=v.support.getSetAttribute;v.fn.extend({attr:function(e,t){return v.access(this,v.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){v.removeAttr(this,e)})},prop:function(e,t){return v.access(this,v.prop,e,t,arguments.length>1)},removeProp:function(e){return e=v.propFix[e]||e,this.each(function(){try{this[e]=t,delete this[e]}catch(n){}})},addClass:function(e){var t,n,r,i,s,o,u;if(v.isFunction(e))return this.each(function(t){v(this).addClass(e.call(this,t,this.className))});if(e&&typeof e=="string"){t=e.split(y);for(n=0,r=this.length;n<r;n++){i=this[n];if(i.nodeType===1)if(!i.className&&t.length===1)i.className=e;else{s=" "+i.className+" ";for(o=0,u=t.length;o<u;o++)s.indexOf(" "+t[o]+" ")<0&&(s+=t[o]+" ");i.className=v.trim(s)}}}return this},removeClass:function(e){var n,r,i,s,o,u,a;if(v.isFunction(e))return this.each(function(t){v(this).removeClass(e.call(this,t,this.className))});if(e&&typeof e=="string"||e===t){n=(e||"").split(y);for(u=0,a=this.length;u<a;u++){i=this[u];if(i.nodeType===1&&i.className){r=(" "+i.className+" ").replace(q," ");for(s=0,o=n.length;s<o;s++)while(r.indexOf(" "+n[s]+" ")>=0)r=r.replace(" "+n[s]+" "," ");i.className=e?v.trim(r):""}}}return this},toggleClass:function(e,t){var n=typeof e,r=typeof t=="boolean";return v.isFunction(e)?this.each(function(n){v(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if(n==="string"){var i,s=0,o=v(this),u=t,a=e.split(y);while(i=a[s++])u=r?u:!o.hasClass(i),o[u?"addClass":"removeClass"](i)}else if(n==="undefined"||n==="boolean")this.className&&v._data(this,"__className__",this.className),this.className=this.className||e===!1?"":v._data(this,"__className__")||""})},hasClass:function(e){var t=" "+e+" ",n=0,r=this.length;for(;n<r;n++)if(this[n].nodeType===1&&(" "+this[n].className+" ").replace(q," ").indexOf(t)>=0)return!0;return!1},val:function(e){var n,r,i,s=this[0];if(!arguments.length){if(s)return n=v.valHooks[s.type]||v.valHooks[s.nodeName.toLowerCase()],n&&"get"in n&&(r=n.get(s,"value"))!==t?r:(r=s.value,typeof r=="string"?r.replace(R,""):r==null?"":r);return}return i=v.isFunction(e),this.each(function(r){var s,o=v(this);if(this.nodeType!==1)return;i?s=e.call(this,r,o.val()):s=e,s==null?s="":typeof s=="number"?s+="":v.isArray(s)&&(s=v.map(s,function(e){return e==null?"":e+""})),n=v.valHooks[this.type]||v.valHooks[this.nodeName.toLowerCase()];if(!n||!("set"in n)||n.set(this,s,"value")===t)this.value=s})}}),v.extend({valHooks:{option:{get:function(e){var t=e.attributes.value;return!t||t.specified?e.value:e.text}},select:{get:function(e){var t,n,r=e.options,i=e.selectedIndex,s=e.type==="select-one"||i<0,o=s?null:[],u=s?i+1:r.length,a=i<0?u:s?i:0;for(;a<u;a++){n=r[a];if((n.selected||a===i)&&(v.support.optDisabled?!n.disabled:n.getAttribute("disabled")===null)&&(!n.parentNode.disabled||!v.nodeName(n.parentNode,"optgroup"))){t=v(n).val();if(s)return t;o.push(t)}}return o},set:function(e,t){var n=v.makeArray(t);return v(e).find("option").each(function(){this.selected=v.inArray(v(this).val(),n)>=0}),n.length||(e.selectedIndex=-1),n}}},attrFn:{},attr:function(e,n,r,i){var s,o,u,a=e.nodeType;if(!e||a===3||a===8||a===2)return;if(i&&v.isFunction(v.fn[n]))return v(e)[n](r);if(typeof e.getAttribute=="undefined")return v.prop(e,n,r);u=a!==1||!v.isXMLDoc(e),u&&(n=n.toLowerCase(),o=v.attrHooks[n]||(X.test(n)?F:j));if(r!==t){if(r===null){v.removeAttr(e,n);return}return o&&"set"in o&&u&&(s=o.set(e,r,n))!==t?s:(e.setAttribute(n,r+""),r)}return o&&"get"in o&&u&&(s=o.get(e,n))!==null?s:(s=e.getAttribute(n),s===null?t:s)},removeAttr:function(e,t){var n,r,i,s,o=0;if(t&&e.nodeType===1){r=t.split(y);for(;o<r.length;o++)i=r[o],i&&(n=v.propFix[i]||i,s=X.test(i),s||v.attr(e,i,""),e.removeAttribute(V?i:n),s&&n in e&&(e[n]=!1))}},attrHooks:{type:{set:function(e,t){if(U.test(e.nodeName)&&e.parentNode)v.error("type property can't be changed");else if(!v.support.radioValue&&t==="radio"&&v.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}},value:{get:function(e,t){return j&&v.nodeName(e,"button")?j.get(e,t):t in e?e.value:null},set:function(e,t,n){if(j&&v.nodeName(e,"button"))return j.set(e,t,n);e.value=t}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(e,n,r){var i,s,o,u=e.nodeType;if(!e||u===3||u===8||u===2)return;return o=u!==1||!v.isXMLDoc(e),o&&(n=v.propFix[n]||n,s=v.propHooks[n]),r!==t?s&&"set"in s&&(i=s.set(e,r,n))!==t?i:e[n]=r:s&&"get"in s&&(i=s.get(e,n))!==null?i:e[n]},propHooks:{tabIndex:{get:function(e){var n=e.getAttributeNode("tabindex");return n&&n.specified?parseInt(n.value,10):z.test(e.nodeName)||W.test(e.nodeName)&&e.href?0:t}}}}),F={get:function(e,n){var r,i=v.prop(e,n);return i===!0||typeof i!="boolean"&&(r=e.getAttributeNode(n))&&r.nodeValue!==!1?n.toLowerCase():t},set:function(e,t,n){var r;return t===!1?v.removeAttr(e,n):(r=v.propFix[n]||n,r in e&&(e[r]=!0),e.setAttribute(n,n.toLowerCase())),n}},V||(I={name:!0,id:!0,coords:!0},j=v.valHooks.button={get:function(e,n){var r;return r=e.getAttributeNode(n),r&&(I[n]?r.value!=="":r.specified)?r.value:t},set:function(e,t,n){var r=e.getAttributeNode(n);return r||(r=i.createAttribute(n),e.setAttributeNode(r)),r.value=t+""}},v.each(["width","height"],function(e,t){v.attrHooks[t]=v.extend(v.attrHooks[t],{set:function(e,n){if(n==="")return e.setAttribute(t,"auto"),n}})}),v.attrHooks.contenteditable={get:j.get,set:function(e,t,n){t===""&&(t="false"),j.set(e,t,n)}}),v.support.hrefNormalized||v.each(["href","src","width","height"],function(e,n){v.attrHooks[n]=v.extend(v.attrHooks[n],{get:function(e){var r=e.getAttribute(n,2);return r===null?t:r}})}),v.support.style||(v.attrHooks.style={get:function(e){return e.style.cssText.toLowerCase()||t},set:function(e,t){return e.style.cssText=t+""}}),v.support.optSelected||(v.propHooks.selected=v.extend(v.propHooks.selected,{get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null}})),v.support.enctype||(v.propFix.enctype="encoding"),v.support.checkOn||v.each(["radio","checkbox"],function(){v.valHooks[this]={get:function(e){return e.getAttribute("value")===null?"on":e.value}}}),v.each(["radio","checkbox"],function(){v.valHooks[this]=v.extend(v.valHooks[this],{set:function(e,t){if(v.isArray(t))return e.checked=v.inArray(v(e).val(),t)>=0}})});var $=/^(?:textarea|input|select)$/i,J=/^([^\.]*|)(?:\.(.+)|)$/,K=/(?:^|\s)hover(\.\S+|)\b/,Q=/^key/,G=/^(?:mouse|contextmenu)|click/,Y=/^(?:focusinfocus|focusoutblur)$/,Z=function(e){return v.event.special.hover?e:e.replace(K,"mouseenter$1 mouseleave$1")};v.event={add:function(e,n,r,i,s){var o,u,a,f,l,c,h,p,d,m,g;if(e.nodeType===3||e.nodeType===8||!n||!r||!(o=v._data(e)))return;r.handler&&(d=r,r=d.handler,s=d.selector),r.guid||(r.guid=v.guid++),a=o.events,a||(o.events=a={}),u=o.handle,u||(o.handle=u=function(e){return typeof v=="undefined"||!!e&&v.event.triggered===e.type?t:v.event.dispatch.apply(u.elem,arguments)},u.elem=e),n=v.trim(Z(n)).split(" ");for(f=0;f<n.length;f++){l=J.exec(n[f])||[],c=l[1],h=(l[2]||"").split(".").sort(),g=v.event.special[c]||{},c=(s?g.delegateType:g.bindType)||c,g=v.event.special[c]||{},p=v.extend({type:c,origType:l[1],data:i,handler:r,guid:r.guid,selector:s,needsContext:s&&v.expr.match.needsContext.test(s),namespace:h.join(".")},d),m=a[c];if(!m){m=a[c]=[],m.delegateCount=0;if(!g.setup||g.setup.call(e,i,h,u)===!1)e.addEventListener?e.addEventListener(c,u,!1):e.attachEvent&&e.attachEvent("on"+c,u)}g.add&&(g.add.call(e,p),p.handler.guid||(p.handler.guid=r.guid)),s?m.splice(m.delegateCount++,0,p):m.push(p),v.event.global[c]=!0}e=null},global:{},remove:function(e,t,n,r,i){var s,o,u,a,f,l,c,h,p,d,m,g=v.hasData(e)&&v._data(e);if(!g||!(h=g.events))return;t=v.trim(Z(t||"")).split(" ");for(s=0;s<t.length;s++){o=J.exec(t[s])||[],u=a=o[1],f=o[2];if(!u){for(u in h)v.event.remove(e,u+t[s],n,r,!0);continue}p=v.event.special[u]||{},u=(r?p.delegateType:p.bindType)||u,d=h[u]||[],l=d.length,f=f?new RegExp("(^|\\.)"+f.split(".").sort().join("\\.(?:.*\\.|)")+"(\\.|$)"):null;for(c=0;c<d.length;c++)m=d[c],(i||a===m.origType)&&(!n||n.guid===m.guid)&&(!f||f.test(m.namespace))&&(!r||r===m.selector||r==="**"&&m.selector)&&(d.splice(c--,1),m.selector&&d.delegateCount--,p.remove&&p.remove.call(e,m));d.length===0&&l!==d.length&&((!p.teardown||p.teardown.call(e,f,g.handle)===!1)&&v.removeEvent(e,u,g.handle),delete h[u])}v.isEmptyObject(h)&&(delete g.handle,v.removeData(e,"events",!0))},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(n,r,s,o){if(!s||s.nodeType!==3&&s.nodeType!==8){var u,a,f,l,c,h,p,d,m,g,y=n.type||n,b=[];if(Y.test(y+v.event.triggered))return;y.indexOf("!")>=0&&(y=y.slice(0,-1),a=!0),y.indexOf(".")>=0&&(b=y.split("."),y=b.shift(),b.sort());if((!s||v.event.customEvent[y])&&!v.event.global[y])return;n=typeof n=="object"?n[v.expando]?n:new v.Event(y,n):new v.Event(y),n.type=y,n.isTrigger=!0,n.exclusive=a,n.namespace=b.join("."),n.namespace_re=n.namespace?new RegExp("(^|\\.)"+b.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,h=y.indexOf(":")<0?"on"+y:"";if(!s){u=v.cache;for(f in u)u[f].events&&u[f].events[y]&&v.event.trigger(n,r,u[f].handle.elem,!0);return}n.result=t,n.target||(n.target=s),r=r!=null?v.makeArray(r):[],r.unshift(n),p=v.event.special[y]||{};if(p.trigger&&p.trigger.apply(s,r)===!1)return;m=[[s,p.bindType||y]];if(!o&&!p.noBubble&&!v.isWindow(s)){g=p.delegateType||y,l=Y.test(g+y)?s:s.parentNode;for(c=s;l;l=l.parentNode)m.push([l,g]),c=l;c===(s.ownerDocument||i)&&m.push([c.defaultView||c.parentWindow||e,g])}for(f=0;f<m.length&&!n.isPropagationStopped();f++)l=m[f][0],n.type=m[f][1],d=(v._data(l,"events")||{})[n.type]&&v._data(l,"handle"),d&&d.apply(l,r),d=h&&l[h],d&&v.acceptData(l)&&d.apply&&d.apply(l,r)===!1&&n.preventDefault();return n.type=y,!o&&!n.isDefaultPrevented()&&(!p._default||p._default.apply(s.ownerDocument,r)===!1)&&(y!=="click"||!v.nodeName(s,"a"))&&v.acceptData(s)&&h&&s[y]&&(y!=="focus"&&y!=="blur"||n.target.offsetWidth!==0)&&!v.isWindow(s)&&(c=s[h],c&&(s[h]=null),v.event.triggered=y,s[y](),v.event.triggered=t,c&&(s[h]=c)),n.result}return},dispatch:function(n){n=v.event.fix(n||e.event);var r,i,s,o,u,a,f,c,h,p,d=(v._data(this,"events")||{})[n.type]||[],m=d.delegateCount,g=l.call(arguments),y=!n.exclusive&&!n.namespace,b=v.event.special[n.type]||{},w=[];g[0]=n,n.delegateTarget=this;if(b.preDispatch&&b.preDispatch.call(this,n)===!1)return;if(m&&(!n.button||n.type!=="click"))for(s=n.target;s!=this;s=s.parentNode||this)if(s.disabled!==!0||n.type!=="click"){u={},f=[];for(r=0;r<m;r++)c=d[r],h=c.selector,u[h]===t&&(u[h]=c.needsContext?v(h,this).index(s)>=0:v.find(h,this,null,[s]).length),u[h]&&f.push(c);f.length&&w.push({elem:s,matches:f})}d.length>m&&w.push({elem:this,matches:d.slice(m)});for(r=0;r<w.length&&!n.isPropagationStopped();r++){a=w[r],n.currentTarget=a.elem;for(i=0;i<a.matches.length&&!n.isImmediatePropagationStopped();i++){c=a.matches[i];if(y||!n.namespace&&!c.namespace||n.namespace_re&&n.namespace_re.test(c.namespace))n.data=c.data,n.handleObj=c,o=((v.event.special[c.origType]||{}).handle||c.handler).apply(a.elem,g),o!==t&&(n.result=o,o===!1&&(n.preventDefault(),n.stopPropagation()))}}return b.postDispatch&&b.postDispatch.call(this,n),n.result},props:"attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return e.which==null&&(e.which=t.charCode!=null?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,n){var r,s,o,u=n.button,a=n.fromElement;return e.pageX==null&&n.clientX!=null&&(r=e.target.ownerDocument||i,s=r.documentElement,o=r.body,e.pageX=n.clientX+(s&&s.scrollLeft||o&&o.scrollLeft||0)-(s&&s.clientLeft||o&&o.clientLeft||0),e.pageY=n.clientY+(s&&s.scrollTop||o&&o.scrollTop||0)-(s&&s.clientTop||o&&o.clientTop||0)),!e.relatedTarget&&a&&(e.relatedTarget=a===e.target?n.toElement:a),!e.which&&u!==t&&(e.which=u&1?1:u&2?3:u&4?2:0),e}},fix:function(e){if(e[v.expando])return e;var t,n,r=e,s=v.event.fixHooks[e.type]||{},o=s.props?this.props.concat(s.props):this.props;e=v.Event(r);for(t=o.length;t;)n=o[--t],e[n]=r[n];return e.target||(e.target=r.srcElement||i),e.target.nodeType===3&&(e.target=e.target.parentNode),e.metaKey=!!e.metaKey,s.filter?s.filter(e,r):e},special:{load:{noBubble:!0},focus:{delegateType:"focusin"},blur:{delegateType:"focusout"},beforeunload:{setup:function(e,t,n){v.isWindow(this)&&(this.onbeforeunload=n)},teardown:function(e,t){this.onbeforeunload===t&&(this.onbeforeunload=null)}}},simulate:function(e,t,n,r){var i=v.extend(new v.Event,n,{type:e,isSimulated:!0,originalEvent:{}});r?v.event.trigger(i,null,t):v.event.dispatch.call(t,i),i.isDefaultPrevented()&&n.preventDefault()}},v.event.handle=v.event.dispatch,v.removeEvent=i.removeEventListener?function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n,!1)}:function(e,t,n){var r="on"+t;e.detachEvent&&(typeof e[r]=="undefined"&&(e[r]=null),e.detachEvent(r,n))},v.Event=function(e,t){if(!(this instanceof v.Event))return new v.Event(e,t);e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||e.returnValue===!1||e.getPreventDefault&&e.getPreventDefault()?tt:et):this.type=e,t&&v.extend(this,t),this.timeStamp=e&&e.timeStamp||v.now(),this[v.expando]=!0},v.Event.prototype={preventDefault:function(){this.isDefaultPrevented=tt;var e=this.originalEvent;if(!e)return;e.preventDefault?e.preventDefault():e.returnValue=!1},stopPropagation:function(){this.isPropagationStopped=tt;var e=this.originalEvent;if(!e)return;e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=tt,this.stopPropagation()},isDefaultPrevented:et,isPropagationStopped:et,isImmediatePropagationStopped:et},v.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(e,t){v.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,s=e.handleObj,o=s.selector;if(!i||i!==r&&!v.contains(r,i))e.type=s.origType,n=s.handler.apply(this,arguments),e.type=t;return n}}}),v.support.submitBubbles||(v.event.special.submit={setup:function(){if(v.nodeName(this,"form"))return!1;v.event.add(this,"click._submit keypress._submit",function(e){var n=e.target,r=v.nodeName(n,"input")||v.nodeName(n,"button")?n.form:t;r&&!v._data(r,"_submit_attached")&&(v.event.add(r,"submit._submit",function(e){e._submit_bubble=!0}),v._data(r,"_submit_attached",!0))})},postDispatch:function(e){e._submit_bubble&&(delete e._submit_bubble,this.parentNode&&!e.isTrigger&&v.event.simulate("submit",this.parentNode,e,!0))},teardown:function(){if(v.nodeName(this,"form"))return!1;v.event.remove(this,"._submit")}}),v.support.changeBubbles||(v.event.special.change={setup:function(){if($.test(this.nodeName)){if(this.type==="checkbox"||this.type==="radio")v.event.add(this,"propertychange._change",function(e){e.originalEvent.propertyName==="checked"&&(this._just_changed=!0)}),v.event.add(this,"click._change",function(e){this._just_changed&&!e.isTrigger&&(this._just_changed=!1),v.event.simulate("change",this,e,!0)});return!1}v.event.add(this,"beforeactivate._change",function(e){var t=e.target;$.test(t.nodeName)&&!v._data(t,"_change_attached")&&(v.event.add(t,"change._change",function(e){this.parentNode&&!e.isSimulated&&!e.isTrigger&&v.event.simulate("change",this.parentNode,e,!0)}),v._data(t,"_change_attached",!0))})},handle:function(e){var t=e.target;if(this!==t||e.isSimulated||e.isTrigger||t.type!=="radio"&&t.type!=="checkbox")return e.handleObj.handler.apply(this,arguments)},teardown:function(){return v.event.remove(this,"._change"),!$.test(this.nodeName)}}),v.support.focusinBubbles||v.each({focus:"focusin",blur:"focusout"},function(e,t){var n=0,r=function(e){v.event.simulate(t,e.target,v.event.fix(e),!0)};v.event.special[t]={setup:function(){n++===0&&i.addEventListener(e,r,!0)},teardown:function(){--n===0&&i.removeEventListener(e,r,!0)}}}),v.fn.extend({on:function(e,n,r,i,s){var o,u;if(typeof e=="object"){typeof n!="string"&&(r=r||n,n=t);for(u in e)this.on(u,n,r,e[u],s);return this}r==null&&i==null?(i=n,r=n=t):i==null&&(typeof n=="string"?(i=r,r=t):(i=r,r=n,n=t));if(i===!1)i=et;else if(!i)return this;return s===1&&(o=i,i=function(e){return v().off(e),o.apply(this,arguments)},i.guid=o.guid||(o.guid=v.guid++)),this.each(function(){v.event.add(this,e,i,r,n)})},one:function(e,t,n,r){return this.on(e,t,n,r,1)},off:function(e,n,r){var i,s;if(e&&e.preventDefault&&e.handleObj)return i=e.handleObj,v(e.delegateTarget).off(i.namespace?i.origType+"."+i.namespace:i.origType,i.selector,i.handler),this;if(typeof e=="object"){for(s in e)this.off(s,n,e[s]);return this}if(n===!1||typeof n=="function")r=n,n=t;return r===!1&&(r=et),this.each(function(){v.event.remove(this,e,r,n)})},bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},live:function(e,t,n){return v(this.context).on(e,this.selector,t,n),this},die:function(e,t){return v(this.context).off(e,this.selector||"**",t),this},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return arguments.length===1?this.off(e,"**"):this.off(t,e||"**",n)},trigger:function(e,t){return this.each(function(){v.event.trigger(e,t,this)})},triggerHandler:function(e,t){if(this[0])return v.event.trigger(e,t,this[0],!0)},toggle:function(e){var t=arguments,n=e.guid||v.guid++,r=0,i=function(n){var i=(v._data(this,"lastToggle"+e.guid)||0)%r;return v._data(this,"lastToggle"+e.guid,i+1),n.preventDefault(),t[i].apply(this,arguments)||!1};i.guid=n;while(r<t.length)t[r++].guid=n;return this.click(i)},hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),v.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(e,t){v.fn[t]=function(e,n){return n==null&&(n=e,e=null),arguments.length>0?this.on(t,null,e,n):this.trigger(t)},Q.test(t)&&(v.event.fixHooks[t]=v.event.keyHooks),G.test(t)&&(v.event.fixHooks[t]=v.event.mouseHooks)}),function(e,t){function nt(e,t,n,r){n=n||[],t=t||g;var i,s,a,f,l=t.nodeType;if(!e||typeof e!="string")return n;if(l!==1&&l!==9)return[];a=o(t);if(!a&&!r)if(i=R.exec(e))if(f=i[1]){if(l===9){s=t.getElementById(f);if(!s||!s.parentNode)return n;if(s.id===f)return n.push(s),n}else if(t.ownerDocument&&(s=t.ownerDocument.getElementById(f))&&u(t,s)&&s.id===f)return n.push(s),n}else{if(i[2])return S.apply(n,x.call(t.getElementsByTagName(e),0)),n;if((f=i[3])&&Z&&t.getElementsByClassName)return S.apply(n,x.call(t.getElementsByClassName(f),0)),n}return vt(e.replace(j,"$1"),t,n,r,a)}function rt(e){return function(t){var n=t.nodeName.toLowerCase();return n==="input"&&t.type===e}}function it(e){return function(t){var n=t.nodeName.toLowerCase();return(n==="input"||n==="button")&&t.type===e}}function st(e){return N(function(t){return t=+t,N(function(n,r){var i,s=e([],n.length,t),o=s.length;while(o--)n[i=s[o]]&&(n[i]=!(r[i]=n[i]))})})}function ot(e,t,n){if(e===t)return n;var r=e.nextSibling;while(r){if(r===t)return-1;r=r.nextSibling}return 1}function ut(e,t){var n,r,s,o,u,a,f,l=L[d][e+" "];if(l)return t?0:l.slice(0);u=e,a=[],f=i.preFilter;while(u){if(!n||(r=F.exec(u)))r&&(u=u.slice(r[0].length)||u),a.push(s=[]);n=!1;if(r=I.exec(u))s.push(n=new m(r.shift())),u=u.slice(n.length),n.type=r[0].replace(j," ");for(o in i.filter)(r=J[o].exec(u))&&(!f[o]||(r=f[o](r)))&&(s.push(n=new m(r.shift())),u=u.slice(n.length),n.type=o,n.matches=r);if(!n)break}return t?u.length:u?nt.error(e):L(e,a).slice(0)}function at(e,t,r){var i=t.dir,s=r&&t.dir==="parentNode",o=w++;return t.first?function(t,n,r){while(t=t[i])if(s||t.nodeType===1)return e(t,n,r)}:function(t,r,u){if(!u){var a,f=b+" "+o+" ",l=f+n;while(t=t[i])if(s||t.nodeType===1){if((a=t[d])===l)return t.sizset;if(typeof a=="string"&&a.indexOf(f)===0){if(t.sizset)return t}else{t[d]=l;if(e(t,r,u))return t.sizset=!0,t;t.sizset=!1}}}else while(t=t[i])if(s||t.nodeType===1)if(e(t,r,u))return t}}function ft(e){return e.length>1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function lt(e,t,n,r,i){var s,o=[],u=0,a=e.length,f=t!=null;for(;u<a;u++)if(s=e[u])if(!n||n(s,r,i))o.push(s),f&&t.push(u);return o}function ct(e,t,n,r,i,s){return r&&!r[d]&&(r=ct(r)),i&&!i[d]&&(i=ct(i,s)),N(function(s,o,u,a){var f,l,c,h=[],p=[],d=o.length,v=s||dt(t||"*",u.nodeType?[u]:u,[]),m=e&&(s||!t)?lt(v,h,e,u,a):v,g=n?i||(s?e:d||r)?[]:o:m;n&&n(m,g,u,a);if(r){f=lt(g,p),r(f,[],u,a),l=f.length;while(l--)if(c=f[l])g[p[l]]=!(m[p[l]]=c)}if(s){if(i||e){if(i){f=[],l=g.length;while(l--)(c=g[l])&&f.push(m[l]=c);i(null,g=[],f,a)}l=g.length;while(l--)(c=g[l])&&(f=i?T.call(s,c):h[l])>-1&&(s[f]=!(o[f]=c))}}else g=lt(g===o?g.splice(d,g.length):g),i?i(null,o,g,a):S.apply(o,g)})}function ht(e){var t,n,r,s=e.length,o=i.relative[e[0].type],u=o||i.relative[" "],a=o?1:0,f=at(function(e){return e===t},u,!0),l=at(function(e){return T.call(t,e)>-1},u,!0),h=[function(e,n,r){return!o&&(r||n!==c)||((t=n).nodeType?f(e,n,r):l(e,n,r))}];for(;a<s;a++)if(n=i.relative[e[a].type])h=[at(ft(h),n)];else{n=i.filter[e[a].type].apply(null,e[a].matches);if(n[d]){r=++a;for(;r<s;r++)if(i.relative[e[r].type])break;return ct(a>1&&ft(h),a>1&&e.slice(0,a-1).join("").replace(j,"$1"),n,a<r&&ht(e.slice(a,r)),r<s&&ht(e=e.slice(r)),r<s&&e.join(""))}h.push(n)}return ft(h)}function pt(e,t){var r=t.length>0,s=e.length>0,o=function(u,a,f,l,h){var p,d,v,m=[],y=0,w="0",x=u&&[],T=h!=null,N=c,C=u||s&&i.find.TAG("*",h&&a.parentNode||a),k=b+=N==null?1:Math.E;T&&(c=a!==g&&a,n=o.el);for(;(p=C[w])!=null;w++){if(s&&p){for(d=0;v=e[d];d++)if(v(p,a,f)){l.push(p);break}T&&(b=k,n=++o.el)}r&&((p=!v&&p)&&y--,u&&x.push(p))}y+=w;if(r&&w!==y){for(d=0;v=t[d];d++)v(x,m,a,f);if(u){if(y>0)while(w--)!x[w]&&!m[w]&&(m[w]=E.call(l));m=lt(m)}S.apply(l,m),T&&!u&&m.length>0&&y+t.length>1&&nt.uniqueSort(l)}return T&&(b=k,c=N),x};return o.el=0,r?N(o):o}function dt(e,t,n){var r=0,i=t.length;for(;r<i;r++)nt(e,t[r],n);return n}function vt(e,t,n,r,s){var o,u,f,l,c,h=ut(e),p=h.length;if(!r&&h.length===1){u=h[0]=h[0].slice(0);if(u.length>2&&(f=u[0]).type==="ID"&&t.nodeType===9&&!s&&i.relative[u[1].type]){t=i.find.ID(f.matches[0].replace($,""),t,s)[0];if(!t)return n;e=e.slice(u.shift().length)}for(o=J.POS.test(e)?-1:u.length-1;o>=0;o--){f=u[o];if(i.relative[l=f.type])break;if(c=i.find[l])if(r=c(f.matches[0].replace($,""),z.test(u[0].type)&&t.parentNode||t,s)){u.splice(o,1),e=r.length&&u.join("");if(!e)return S.apply(n,x.call(r,0)),n;break}}}return a(e,h)(r,t,s,n,z.test(e)),n}function mt(){}var n,r,i,s,o,u,a,f,l,c,h=!0,p="undefined",d=("sizcache"+Math.random()).replace(".",""),m=String,g=e.document,y=g.documentElement,b=0,w=0,E=[].pop,S=[].push,x=[].slice,T=[].indexOf||function(e){var t=0,n=this.length;for(;t<n;t++)if(this[t]===e)return t;return-1},N=function(e,t){return e[d]=t==null||t,e},C=function(){var e={},t=[];return N(function(n,r){return t.push(n)>i.cacheLength&&delete e[t.shift()],e[n+" "]=r},e)},k=C(),L=C(),A=C(),O="[\\x20\\t\\r\\n\\f]",M="(?:\\\\.|[-\\w]|[^\\x00-\\xa0])+",_=M.replace("w","w#"),D="([*^$|!~]?=)",P="\\["+O+"*("+M+")"+O+"*(?:"+D+O+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+_+")|)|)"+O+"*\\]",H=":("+M+")(?:\\((?:(['\"])((?:\\\\.|[^\\\\])*?)\\2|([^()[\\]]*|(?:(?:"+P+")|[^:]|\\\\.)*|.*))\\)|)",B=":(even|odd|eq|gt|lt|nth|first|last)(?:\\("+O+"*((?:-\\d)?\\d*)"+O+"*\\)|)(?=[^-]|$)",j=new RegExp("^"+O+"+|((?:^|[^\\\\])(?:\\\\.)*)"+O+"+$","g"),F=new RegExp("^"+O+"*,"+O+"*"),I=new RegExp("^"+O+"*([\\x20\\t\\r\\n\\f>+~])"+O+"*"),q=new RegExp(H),R=/^(?:#([\w\-]+)|(\w+)|\.([\w\-]+))$/,U=/^:not/,z=/[\x20\t\r\n\f]*[+~]/,W=/:not\($/,X=/h\d/i,V=/input|select|textarea|button/i,$=/\\(?!\\)/g,J={ID:new RegExp("^#("+M+")"),CLASS:new RegExp("^\\.("+M+")"),NAME:new RegExp("^\\[name=['\"]?("+M+")['\"]?\\]"),TAG:new RegExp("^("+M.replace("w","w*")+")"),ATTR:new RegExp("^"+P),PSEUDO:new RegExp("^"+H),POS:new RegExp(B,"i"),CHILD:new RegExp("^:(only|nth|first|last)-child(?:\\("+O+"*(even|odd|(([+-]|)(\\d*)n|)"+O+"*(?:([+-]|)"+O+"*(\\d+)|))"+O+"*\\)|)","i"),needsContext:new RegExp("^"+O+"*[>+~]|"+B,"i")},K=function(e){var t=g.createElement("div");try{return e(t)}catch(n){return!1}finally{t=null}},Q=K(function(e){return e.appendChild(g.createComment("")),!e.getElementsByTagName("*").length}),G=K(function(e){return e.innerHTML="<a href='#'></a>",e.firstChild&&typeof e.firstChild.getAttribute!==p&&e.firstChild.getAttribute("href")==="#"}),Y=K(function(e){e.innerHTML="<select></select>";var t=typeof e.lastChild.getAttribute("multiple");return t!=="boolean"&&t!=="string"}),Z=K(function(e){return e.innerHTML="<div class='hidden e'></div><div class='hidden'></div>",!e.getElementsByClassName||!e.getElementsByClassName("e").length?!1:(e.lastChild.className="e",e.getElementsByClassName("e").length===2)}),et=K(function(e){e.id=d+0,e.innerHTML="<a name='"+d+"'></a><div name='"+d+"'></div>",y.insertBefore(e,y.firstChild);var t=g.getElementsByName&&g.getElementsByName(d).length===2+g.getElementsByName(d+0).length;return r=!g.getElementById(d),y.removeChild(e),t});try{x.call(y.childNodes,0)[0].nodeType}catch(tt){x=function(e){var t,n=[];for(;t=this[e];e++)n.push(t);return n}}nt.matches=function(e,t){return nt(e,null,null,t)},nt.matchesSelector=function(e,t){return nt(t,null,null,[e]).length>0},s=nt.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(i===1||i===9||i===11){if(typeof e.textContent=="string")return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=s(e)}else if(i===3||i===4)return e.nodeValue}else for(;t=e[r];r++)n+=s(t);return n},o=nt.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?t.nodeName!=="HTML":!1},u=nt.contains=y.contains?function(e,t){var n=e.nodeType===9?e.documentElement:e,r=t&&t.parentNode;return e===r||!!(r&&r.nodeType===1&&n.contains&&n.contains(r))}:y.compareDocumentPosition?function(e,t){return t&&!!(e.compareDocumentPosition(t)&16)}:function(e,t){while(t=t.parentNode)if(t===e)return!0;return!1},nt.attr=function(e,t){var n,r=o(e);return r||(t=t.toLowerCase()),(n=i.attrHandle[t])?n(e):r||Y?e.getAttribute(t):(n=e.getAttributeNode(t),n?typeof e[t]=="boolean"?e[t]?t:null:n.specified?n.value:null:null)},i=nt.selectors={cacheLength:50,createPseudo:N,match:J,attrHandle:G?{}:{href:function(e){return e.getAttribute("href",2)},type:function(e){return e.getAttribute("type")}},find:{ID:r?function(e,t,n){if(typeof t.getElementById!==p&&!n){var r=t.getElementById(e);return r&&r.parentNode?[r]:[]}}:function(e,n,r){if(typeof n.getElementById!==p&&!r){var i=n.getElementById(e);return i?i.id===e||typeof i.getAttributeNode!==p&&i.getAttributeNode("id").value===e?[i]:t:[]}},TAG:Q?function(e,t){if(typeof t.getElementsByTagName!==p)return t.getElementsByTagName(e)}:function(e,t){var n=t.getElementsByTagName(e);if(e==="*"){var r,i=[],s=0;for(;r=n[s];s++)r.nodeType===1&&i.push(r);return i}return n},NAME:et&&function(e,t){if(typeof t.getElementsByName!==p)return t.getElementsByName(name)},CLASS:Z&&function(e,t,n){if(typeof t.getElementsByClassName!==p&&!n)return t.getElementsByClassName(e)}},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace($,""),e[3]=(e[4]||e[5]||"").replace($,""),e[2]==="~="&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),e[1]==="nth"?(e[2]||nt.error(e[0]),e[3]=+(e[3]?e[4]+(e[5]||1):2*(e[2]==="even"||e[2]==="odd")),e[4]=+(e[6]+e[7]||e[2]==="odd")):e[2]&&nt.error(e[0]),e},PSEUDO:function(e){var t,n;if(J.CHILD.test(e[0]))return null;if(e[3])e[2]=e[3];else if(t=e[4])q.test(t)&&(n=ut(t,!0))&&(n=t.indexOf(")",t.length-n)-t.length)&&(t=t.slice(0,n),e[0]=e[0].slice(0,n)),e[2]=t;return e.slice(0,3)}},filter:{ID:r?function(e){return e=e.replace($,""),function(t){return t.getAttribute("id")===e}}:function(e){return e=e.replace($,""),function(t){var n=typeof t.getAttributeNode!==p&&t.getAttributeNode("id");return n&&n.value===e}},TAG:function(e){return e==="*"?function(){return!0}:(e=e.replace($,"").toLowerCase(),function(t){return t.nodeName&&t.nodeName.toLowerCase()===e})},CLASS:function(e){var t=k[d][e+" "];return t||(t=new RegExp("(^|"+O+")"+e+"("+O+"|$)"))&&k(e,function(e){return t.test(e.className||typeof e.getAttribute!==p&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r,i){var s=nt.attr(r,e);return s==null?t==="!=":t?(s+="",t==="="?s===n:t==="!="?s!==n:t==="^="?n&&s.indexOf(n)===0:t==="*="?n&&s.indexOf(n)>-1:t==="$="?n&&s.substr(s.length-n.length)===n:t==="~="?(" "+s+" ").indexOf(n)>-1:t==="|="?s===n||s.substr(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r){return e==="nth"?function(e){var t,i,s=e.parentNode;if(n===1&&r===0)return!0;if(s){i=0;for(t=s.firstChild;t;t=t.nextSibling)if(t.nodeType===1){i++;if(e===t)break}}return i-=r,i===n||i%n===0&&i/n>=0}:function(t){var n=t;switch(e){case"only":case"first":while(n=n.previousSibling)if(n.nodeType===1)return!1;if(e==="first")return!0;n=t;case"last":while(n=n.nextSibling)if(n.nodeType===1)return!1;return!0}}},PSEUDO:function(e,t){var n,r=i.pseudos[e]||i.setFilters[e.toLowerCase()]||nt.error("unsupported pseudo: "+e);return r[d]?r(t):r.length>1?(n=[e,e,"",t],i.setFilters.hasOwnProperty(e.toLowerCase())?N(function(e,n){var i,s=r(e,t),o=s.length;while(o--)i=T.call(e,s[o]),e[i]=!(n[i]=s[o])}):function(e){return r(e,0,n)}):r}},pseudos:{not:N(function(e){var t=[],n=[],r=a(e.replace(j,"$1"));return r[d]?N(function(e,t,n,i){var s,o=r(e,null,i,[]),u=e.length;while(u--)if(s=o[u])e[u]=!(t[u]=s)}):function(e,i,s){return t[0]=e,r(t,null,s,n),!n.pop()}}),has:N(function(e){return function(t){return nt(e,t).length>0}}),contains:N(function(e){return function(t){return(t.textContent||t.innerText||s(t)).indexOf(e)>-1}}),enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return t==="input"&&!!e.checked||t==="option"&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},parent:function(e){return!i.pseudos.empty(e)},empty:function(e){var t;e=e.firstChild;while(e){if(e.nodeName>"@"||(t=e.nodeType)===3||t===4)return!1;e=e.nextSibling}return!0},header:function(e){return X.test(e.nodeName)},text:function(e){var t,n;return e.nodeName.toLowerCase()==="input"&&(t=e.type)==="text"&&((n=e.getAttribute("type"))==null||n.toLowerCase()===t)},radio:rt("radio"),checkbox:rt("checkbox"),file:rt("file"),password:rt("password"),image:rt("image"),submit:it("submit"),reset:it("reset"),button:function(e){var t=e.nodeName.toLowerCase();return t==="input"&&e.type==="button"||t==="button"},input:function(e){return V.test(e.nodeName)},focus:function(e){var t=e.ownerDocument;return e===t.activeElement&&(!t.hasFocus||t.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},active:function(e){return e===e.ownerDocument.activeElement},first:st(function(){return[0]}),last:st(function(e,t){return[t-1]}),eq:st(function(e,t,n){return[n<0?n+t:n]}),even:st(function(e,t){for(var n=0;n<t;n+=2)e.push(n);return e}),odd:st(function(e,t){for(var n=1;n<t;n+=2)e.push(n);return e}),lt:st(function(e,t,n){for(var r=n<0?n+t:n;--r>=0;)e.push(r);return e}),gt:st(function(e,t,n){for(var r=n<0?n+t:n;++r<t;)e.push(r);return e})}},f=y.compareDocumentPosition?function(e,t){return e===t?(l=!0,0):(!e.compareDocumentPosition||!t.compareDocumentPosition?e.compareDocumentPosition:e.compareDocumentPosition(t)&4)?-1:1}:function(e,t){if(e===t)return l=!0,0;if(e.sourceIndex&&t.sourceIndex)return e.sourceIndex-t.sourceIndex;var n,r,i=[],s=[],o=e.parentNode,u=t.parentNode,a=o;if(o===u)return ot(e,t);if(!o)return-1;if(!u)return 1;while(a)i.unshift(a),a=a.parentNode;a=u;while(a)s.unshift(a),a=a.parentNode;n=i.length,r=s.length;for(var f=0;f<n&&f<r;f++)if(i[f]!==s[f])return ot(i[f],s[f]);return f===n?ot(e,s[f],-1):ot(i[f],t,1)},[0,0].sort(f),h=!l,nt.uniqueSort=function(e){var t,n=[],r=1,i=0;l=h,e.sort(f);if(l){for(;t=e[r];r++)t===e[r-1]&&(i=n.push(r));while(i--)e.splice(n[i],1)}return e},nt.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},a=nt.compile=function(e,t){var n,r=[],i=[],s=A[d][e+" "];if(!s){t||(t=ut(e)),n=t.length;while(n--)s=ht(t[n]),s[d]?r.push(s):i.push(s);s=A(e,pt(i,r))}return s},g.querySelectorAll&&function(){var e,t=vt,n=/'|\\/g,r=/\=[\x20\t\r\n\f]*([^'"\]]*)[\x20\t\r\n\f]*\]/g,i=[":focus"],s=[":active"],u=y.matchesSelector||y.mozMatchesSelector||y.webkitMatchesSelector||y.oMatchesSelector||y.msMatchesSelector;K(function(e){e.innerHTML="<select><option selected=''></option></select>",e.querySelectorAll("[selected]").length||i.push("\\["+O+"*(?:checked|disabled|ismap|multiple|readonly|selected|value)"),e.querySelectorAll(":checked").length||i.push(":checked")}),K(function(e){e.innerHTML="<p test=''></p>",e.querySelectorAll("[test^='']").length&&i.push("[*^$]="+O+"*(?:\"\"|'')"),e.innerHTML="<input type='hidden'/>",e.querySelectorAll(":enabled").length||i.push(":enabled",":disabled")}),i=new RegExp(i.join("|")),vt=function(e,r,s,o,u){if(!o&&!u&&!i.test(e)){var a,f,l=!0,c=d,h=r,p=r.nodeType===9&&e;if(r.nodeType===1&&r.nodeName.toLowerCase()!=="object"){a=ut(e),(l=r.getAttribute("id"))?c=l.replace(n,"\\$&"):r.setAttribute("id",c),c="[id='"+c+"'] ",f=a.length;while(f--)a[f]=c+a[f].join("");h=z.test(e)&&r.parentNode||r,p=a.join(",")}if(p)try{return S.apply(s,x.call(h.querySelectorAll(p),0)),s}catch(v){}finally{l||r.removeAttribute("id")}}return t(e,r,s,o,u)},u&&(K(function(t){e=u.call(t,"div");try{u.call(t,"[test!='']:sizzle"),s.push("!=",H)}catch(n){}}),s=new RegExp(s.join("|")),nt.matchesSelector=function(t,n){n=n.replace(r,"='$1']");if(!o(t)&&!s.test(n)&&!i.test(n))try{var a=u.call(t,n);if(a||e||t.document&&t.document.nodeType!==11)return a}catch(f){}return nt(n,null,null,[t]).length>0})}(),i.pseudos.nth=i.pseudos.eq,i.filters=mt.prototype=i.pseudos,i.setFilters=new mt,nt.attr=v.attr,v.find=nt,v.expr=nt.selectors,v.expr[":"]=v.expr.pseudos,v.unique=nt.uniqueSort,v.text=nt.getText,v.isXMLDoc=nt.isXML,v.contains=nt.contains}(e);var nt=/Until$/,rt=/^(?:parents|prev(?:Until|All))/,it=/^.[^:#\[\.,]*$/,st=v.expr.match.needsContext,ot={children:!0,contents:!0,next:!0,prev:!0};v.fn.extend({find:function(e){var t,n,r,i,s,o,u=this;if(typeof e!="string")return v(e).filter(function(){for(t=0,n=u.length;t<n;t++)if(v.contains(u[t],this))return!0});o=this.pushStack("","find",e);for(t=0,n=this.length;t<n;t++){r=o.length,v.find(e,this[t],o);if(t>0)for(i=r;i<o.length;i++)for(s=0;s<r;s++)if(o[s]===o[i]){o.splice(i--,1);break}}return o},has:function(e){var t,n=v(e,this),r=n.length;return this.filter(function(){for(t=0;t<r;t++)if(v.contains(this,n[t]))return!0})},not:function(e){return this.pushStack(ft(this,e,!1),"not",e)},filter:function(e){return this.pushStack(ft(this,e,!0),"filter",e)},is:function(e){return!!e&&(typeof e=="string"?st.test(e)?v(e,this.context).index(this[0])>=0:v.filter(e,this).length>0:this.filter(e).length>0)},closest:function(e,t){var n,r=0,i=this.length,s=[],o=st.test(e)||typeof e!="string"?v(e,t||this.context):0;for(;r<i;r++){n=this[r];while(n&&n.ownerDocument&&n!==t&&n.nodeType!==11){if(o?o.index(n)>-1:v.find.matchesSelector(n,e)){s.push(n);break}n=n.parentNode}}return s=s.length>1?v.unique(s):s,this.pushStack(s,"closest",e)},index:function(e){return e?typeof e=="string"?v.inArray(this[0],v(e)):v.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.prevAll().length:-1},add:function(e,t){var n=typeof e=="string"?v(e,t):v.makeArray(e&&e.nodeType?[e]:e),r=v.merge(this.get(),n);return this.pushStack(ut(n[0])||ut(r[0])?r:v.unique(r))},addBack:function(e){return this.add(e==null?this.prevObject:this.prevObject.filter(e))}}),v.fn.andSelf=v.fn.addBack,v.each({parent:function(e){var t=e.parentNode;return t&&t.nodeType!==11?t:null},parents:function(e){return v.dir(e,"parentNode")},parentsUntil:function(e,t,n){return v.dir(e,"parentNode",n)},next:function(e){return at(e,"nextSibling")},prev:function(e){return at(e,"previousSibling")},nextAll:function(e){return v.dir(e,"nextSibling")},prevAll:function(e){return v.dir(e,"previousSibling")},nextUntil:function(e,t,n){return v.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return v.dir(e,"previousSibling",n)},siblings:function(e){return v.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return v.sibling(e.firstChild)},contents:function(e){return v.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:v.merge([],e.childNodes)}},function(e,t){v.fn[e]=function(n,r){var i=v.map(this,t,n);return nt.test(e)||(r=n),r&&typeof r=="string"&&(i=v.filter(r,i)),i=this.length>1&&!ot[e]?v.unique(i):i,this.length>1&&rt.test(e)&&(i=i.reverse()),this.pushStack(i,e,l.call(arguments).join(","))}}),v.extend({filter:function(e,t,n){return n&&(e=":not("+e+")"),t.length===1?v.find.matchesSelector(t[0],e)?[t[0]]:[]:v.find.matches(e,t)},dir:function(e,n,r){var i=[],s=e[n];while(s&&s.nodeType!==9&&(r===t||s.nodeType!==1||!v(s).is(r)))s.nodeType===1&&i.push(s),s=s[n];return i},sibling:function(e,t){var n=[];for(;e;e=e.nextSibling)e.nodeType===1&&e!==t&&n.push(e);return n}});var ct="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",ht=/ jQuery\d+="(?:null|\d+)"/g,pt=/^\s+/,dt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,vt=/<([\w:]+)/,mt=/<tbody/i,gt=/<|&#?\w+;/,yt=/<(?:script|style|link)/i,bt=/<(?:script|object|embed|option|style)/i,wt=new RegExp("<(?:"+ct+")[\\s/>]","i"),Et=/^(?:checkbox|radio)$/,St=/checked\s*(?:[^=]|=\s*.checked.)/i,xt=/\/(java|ecma)script/i,Tt=/^\s*<!(?:\[CDATA\[|\-\-)|[\]\-]{2}>\s*$/g,Nt={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]},Ct=lt(i),kt=Ct.appendChild(i.createElement("div"));Nt.optgroup=Nt.option,Nt.tbody=Nt.tfoot=Nt.colgroup=Nt.caption=Nt.thead,Nt.th=Nt.td,v.support.htmlSerialize||(Nt._default=[1,"X<div>","</div>"]),v.fn.extend({text:function(e){return v.access(this,function(e){return e===t?v.text(this):this.empty().append((this[0]&&this[0].ownerDocument||i).createTextNode(e))},null,e,arguments.length)},wrapAll:function(e){if(v.isFunction(e))return this.each(function(t){v(this).wrapAll(e.call(this,t))});if(this[0]){var t=v(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstChild&&e.firstChild.nodeType===1)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return v.isFunction(e)?this.each(function(t){v(this).wrapInner(e.call(this,t))}):this.each(function(){var t=v(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=v.isFunction(e);return this.each(function(n){v(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){v.nodeName(this,"body")||v(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(e){(this.nodeType===1||this.nodeType===11)&&this.appendChild(e)})},prepend:function(){return this.domManip(arguments,!0,function(e){(this.nodeType===1||this.nodeType===11)&&this.insertBefore(e,this.firstChild)})},before:function(){if(!ut(this[0]))return this.domManip(arguments,!1,function(e){this.parentNode.insertBefore(e,this)});if(arguments.length){var e=v.clean(arguments);return this.pushStack(v.merge(e,this),"before",this.selector)}},after:function(){if(!ut(this[0]))return this.domManip(arguments,!1,function(e){this.parentNode.insertBefore(e,this.nextSibling)});if(arguments.length){var e=v.clean(arguments);return this.pushStack(v.merge(this,e),"after",this.selector)}},remove:function(e,t){var n,r=0;for(;(n=this[r])!=null;r++)if(!e||v.filter(e,[n]).length)!t&&n.nodeType===1&&(v.cleanData(n.getElementsByTagName("*")),v.cleanData([n])),n.parentNode&&n.parentNode.removeChild(n);return this},empty:function(){var e,t=0;for(;(e=this[t])!=null;t++){e.nodeType===1&&v.cleanData(e.getElementsByTagName("*"));while(e.firstChild)e.removeChild(e.firstChild)}return this},clone:function(e,t){return e=e==null?!1:e,t=t==null?e:t,this.map(function(){return v.clone(this,e,t)})},html:function(e){return v.access(this,function(e){var n=this[0]||{},r=0,i=this.length;if(e===t)return n.nodeType===1?n.innerHTML.replace(ht,""):t;if(typeof e=="string"&&!yt.test(e)&&(v.support.htmlSerialize||!wt.test(e))&&(v.support.leadingWhitespace||!pt.test(e))&&!Nt[(vt.exec(e)||["",""])[1].toLowerCase()]){e=e.replace(dt,"<$1></$2>");try{for(;r<i;r++)n=this[r]||{},n.nodeType===1&&(v.cleanData(n.getElementsByTagName("*")),n.innerHTML=e);n=0}catch(s){}}n&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(e){return ut(this[0])?this.length?this.pushStack(v(v.isFunction(e)?e():e),"replaceWith",e):this:v.isFunction(e)?this.each(function(t){var n=v(this),r=n.html();n.replaceWith(e.call(this,t,r))}):(typeof e!="string"&&(e=v(e).detach()),this.each(function(){var t=this.nextSibling,n=this.parentNode;v(this).remove(),t?v(t).before(e):v(n).append(e)}))},detach:function(e){return this.remove(e,!0)},domManip:function(e,n,r){e=[].concat.apply([],e);var i,s,o,u,a=0,f=e[0],l=[],c=this.length;if(!v.support.checkClone&&c>1&&typeof f=="string"&&St.test(f))return this.each(function(){v(this).domManip(e,n,r)});if(v.isFunction(f))return this.each(function(i){var s=v(this);e[0]=f.call(this,i,n?s.html():t),s.domManip(e,n,r)});if(this[0]){i=v.buildFragment(e,this,l),o=i.fragment,s=o.firstChild,o.childNodes.length===1&&(o=s);if(s){n=n&&v.nodeName(s,"tr");for(u=i.cacheable||c-1;a<c;a++)r.call(n&&v.nodeName(this[a],"table")?Lt(this[a],"tbody"):this[a],a===u?o:v.clone(o,!0,!0))}o=s=null,l.length&&v.each(l,function(e,t){t.src?v.ajax?v.ajax({url:t.src,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0}):v.error("no ajax"):v.globalEval((t.text||t.textContent||t.innerHTML||"").replace(Tt,"")),t.parentNode&&t.parentNode.removeChild(t)})}return this}}),v.buildFragment=function(e,n,r){var s,o,u,a=e[0];return n=n||i,n=!n.nodeType&&n[0]||n,n=n.ownerDocument||n,e.length===1&&typeof a=="string"&&a.length<512&&n===i&&a.charAt(0)==="<"&&!bt.test(a)&&(v.support.checkClone||!St.test(a))&&(v.support.html5Clone||!wt.test(a))&&(o=!0,s=v.fragments[a],u=s!==t),s||(s=n.createDocumentFragment(),v.clean(e,n,s,r),o&&(v.fragments[a]=u&&s)),{fragment:s,cacheable:o}},v.fragments={},v.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){v.fn[e]=function(n){var r,i=0,s=[],o=v(n),u=o.length,a=this.length===1&&this[0].parentNode;if((a==null||a&&a.nodeType===11&&a.childNodes.length===1)&&u===1)return o[t](this[0]),this;for(;i<u;i++)r=(i>0?this.clone(!0):this).get(),v(o[i])[t](r),s=s.concat(r);return this.pushStack(s,e,o.selector)}}),v.extend({clone:function(e,t,n){var r,i,s,o;v.support.html5Clone||v.isXMLDoc(e)||!wt.test("<"+e.nodeName+">")?o=e.cloneNode(!0):(kt.innerHTML=e.outerHTML,kt.removeChild(o=kt.firstChild));if((!v.support.noCloneEvent||!v.support.noCloneChecked)&&(e.nodeType===1||e.nodeType===11)&&!v.isXMLDoc(e)){Ot(e,o),r=Mt(e),i=Mt(o);for(s=0;r[s];++s)i[s]&&Ot(r[s],i[s])}if(t){At(e,o);if(n){r=Mt(e),i=Mt(o);for(s=0;r[s];++s)At(r[s],i[s])}}return r=i=null,o},clean:function(e,t,n,r){var s,o,u,a,f,l,c,h,p,d,m,g,y=t===i&&Ct,b=[];if(!t||typeof t.createDocumentFragment=="undefined")t=i;for(s=0;(u=e[s])!=null;s++){typeof u=="number"&&(u+="");if(!u)continue;if(typeof u=="string")if(!gt.test(u))u=t.createTextNode(u);else{y=y||lt(t),c=t.createElement("div"),y.appendChild(c),u=u.replace(dt,"<$1></$2>"),a=(vt.exec(u)||["",""])[1].toLowerCase(),f=Nt[a]||Nt._default,l=f[0],c.innerHTML=f[1]+u+f[2];while(l--)c=c.lastChild;if(!v.support.tbody){h=mt.test(u),p=a==="table"&&!h?c.firstChild&&c.firstChild.childNodes:f[1]==="<table>"&&!h?c.childNodes:[];for(o=p.length-1;o>=0;--o)v.nodeName(p[o],"tbody")&&!p[o].childNodes.length&&p[o].parentNode.removeChild(p[o])}!v.support.leadingWhitespace&&pt.test(u)&&c.insertBefore(t.createTextNode(pt.exec(u)[0]),c.firstChild),u=c.childNodes,c.parentNode.removeChild(c)}u.nodeType?b.push(u):v.merge(b,u)}c&&(u=c=y=null);if(!v.support.appendChecked)for(s=0;(u=b[s])!=null;s++)v.nodeName(u,"input")?_t(u):typeof u.getElementsByTagName!="undefined"&&v.grep(u.getElementsByTagName("input"),_t);if(n){m=function(e){if(!e.type||xt.test(e.type))return r?r.push(e.parentNode?e.parentNode.removeChild(e):e):n.appendChild(e)};for(s=0;(u=b[s])!=null;s++)if(!v.nodeName(u,"script")||!m(u))n.appendChild(u),typeof u.getElementsByTagName!="undefined"&&(g=v.grep(v.merge([],u.getElementsByTagName("script")),m),b.splice.apply(b,[s+1,0].concat(g)),s+=g.length)}return b},cleanData:function(e,t){var n,r,i,s,o=0,u=v.expando,a=v.cache,f=v.support.deleteExpando,l=v.event.special;for(;(i=e[o])!=null;o++)if(t||v.acceptData(i)){r=i[u],n=r&&a[r];if(n){if(n.events)for(s in n.events)l[s]?v.event.remove(i,s):v.removeEvent(i,s,n.handle);a[r]&&(delete a[r],f?delete i[u]:i.removeAttribute?i.removeAttribute(u):i[u]=null,v.deletedIds.push(r))}}}}),function(){var e,t;v.uaMatch=function(e){e=e.toLowerCase();var t=/(chrome)[ \/]([\w.]+)/.exec(e)||/(webkit)[ \/]([\w.]+)/.exec(e)||/(opera)(?:.*version|)[ \/]([\w.]+)/.exec(e)||/(msie) ([\w.]+)/.exec(e)||e.indexOf("compatible")<0&&/(mozilla)(?:.*? rv:([\w.]+)|)/.exec(e)||[];return{browser:t[1]||"",version:t[2]||"0"}},e=v.uaMatch(o.userAgent),t={},e.browser&&(t[e.browser]=!0,t.version=e.version),t.chrome?t.webkit=!0:t.webkit&&(t.safari=!0),v.browser=t,v.sub=function(){function e(t,n){return new e.fn.init(t,n)}v.extend(!0,e,this),e.superclass=this,e.fn=e.prototype=this(),e.fn.constructor=e,e.sub=this.sub,e.fn.init=function(r,i){return i&&i instanceof v&&!(i instanceof e)&&(i=e(i)),v.fn.init.call(this,r,i,t)},e.fn.init.prototype=e.fn;var t=e(i);return e}}();var Dt,Pt,Ht,Bt=/alpha\([^)]*\)/i,jt=/opacity=([^)]*)/,Ft=/^(top|right|bottom|left)$/,It=/^(none|table(?!-c[ea]).+)/,qt=/^margin/,Rt=new RegExp("^("+m+")(.*)$","i"),Ut=new RegExp("^("+m+")(?!px)[a-z%]+$","i"),zt=new RegExp("^([-+])=("+m+")","i"),Wt={BODY:"block"},Xt={position:"absolute",visibility:"hidden",display:"block"},Vt={letterSpacing:0,fontWeight:400},$t=["Top","Right","Bottom","Left"],Jt=["Webkit","O","Moz","ms"],Kt=v.fn.toggle;v.fn.extend({css:function(e,n){return v.access(this,function(e,n,r){return r!==t?v.style(e,n,r):v.css(e,n)},e,n,arguments.length>1)},show:function(){return Yt(this,!0)},hide:function(){return Yt(this)},toggle:function(e,t){var n=typeof e=="boolean";return v.isFunction(e)&&v.isFunction(t)?Kt.apply(this,arguments):this.each(function(){(n?e:Gt(this))?v(this).show():v(this).hide()})}}),v.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Dt(e,"opacity");return n===""?"1":n}}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":v.support.cssFloat?"cssFloat":"styleFloat"},style:function(e,n,r,i){if(!e||e.nodeType===3||e.nodeType===8||!e.style)return;var s,o,u,a=v.camelCase(n),f=e.style;n=v.cssProps[a]||(v.cssProps[a]=Qt(f,a)),u=v.cssHooks[n]||v.cssHooks[a];if(r===t)return u&&"get"in u&&(s=u.get(e,!1,i))!==t?s:f[n];o=typeof r,o==="string"&&(s=zt.exec(r))&&(r=(s[1]+1)*s[2]+parseFloat(v.css(e,n)),o="number");if(r==null||o==="number"&&isNaN(r))return;o==="number"&&!v.cssNumber[a]&&(r+="px");if(!u||!("set"in u)||(r=u.set(e,r,i))!==t)try{f[n]=r}catch(l){}},css:function(e,n,r,i){var s,o,u,a=v.camelCase(n);return n=v.cssProps[a]||(v.cssProps[a]=Qt(e.style,a)),u=v.cssHooks[n]||v.cssHooks[a],u&&"get"in u&&(s=u.get(e,!0,i)),s===t&&(s=Dt(e,n)),s==="normal"&&n in Vt&&(s=Vt[n]),r||i!==t?(o=parseFloat(s),r||v.isNumeric(o)?o||0:s):s},swap:function(e,t,n){var r,i,s={};for(i in t)s[i]=e.style[i],e.style[i]=t[i];r=n.call(e);for(i in t)e.style[i]=s[i];return r}}),e.getComputedStyle?Dt=function(t,n){var r,i,s,o,u=e.getComputedStyle(t,null),a=t.style;return u&&(r=u.getPropertyValue(n)||u[n],r===""&&!v.contains(t.ownerDocument,t)&&(r=v.style(t,n)),Ut.test(r)&&qt.test(n)&&(i=a.width,s=a.minWidth,o=a.maxWidth,a.minWidth=a.maxWidth=a.width=r,r=u.width,a.width=i,a.minWidth=s,a.maxWidth=o)),r}:i.documentElement.currentStyle&&(Dt=function(e,t){var n,r,i=e.currentStyle&&e.currentStyle[t],s=e.style;return i==null&&s&&s[t]&&(i=s[t]),Ut.test(i)&&!Ft.test(t)&&(n=s.left,r=e.runtimeStyle&&e.runtimeStyle.left,r&&(e.runtimeStyle.left=e.currentStyle.left),s.left=t==="fontSize"?"1em":i,i=s.pixelLeft+"px",s.left=n,r&&(e.runtimeStyle.left=r)),i===""?"auto":i}),v.each(["height","width"],function(e,t){v.cssHooks[t]={get:function(e,n,r){if(n)return e.offsetWidth===0&&It.test(Dt(e,"display"))?v.swap(e,Xt,function(){return tn(e,t,r)}):tn(e,t,r)},set:function(e,n,r){return Zt(e,n,r?en(e,t,r,v.support.boxSizing&&v.css(e,"boxSizing")==="border-box"):0)}}}),v.support.opacity||(v.cssHooks.opacity={get:function(e,t){return jt.test((t&&e.currentStyle?e.currentStyle.filter:e.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":t?"1":""},set:function(e,t){var n=e.style,r=e.currentStyle,i=v.isNumeric(t)?"alpha(opacity="+t*100+")":"",s=r&&r.filter||n.filter||"";n.zoom=1;if(t>=1&&v.trim(s.replace(Bt,""))===""&&n.removeAttribute){n.removeAttribute("filter");if(r&&!r.filter)return}n.filter=Bt.test(s)?s.replace(Bt,i):s+" "+i}}),v(function(){v.support.reliableMarginRight||(v.cssHooks.marginRight={get:function(e,t){return v.swap(e,{display:"inline-block"},function(){if(t)return Dt(e,"marginRight")})}}),!v.support.pixelPosition&&v.fn.position&&v.each(["top","left"],function(e,t){v.cssHooks[t]={get:function(e,n){if(n){var r=Dt(e,t);return Ut.test(r)?v(e).position()[t]+"px":r}}}})}),v.expr&&v.expr.filters&&(v.expr.filters.hidden=function(e){return e.offsetWidth===0&&e.offsetHeight===0||!v.support.reliableHiddenOffsets&&(e.style&&e.style.display||Dt(e,"display"))==="none"},v.expr.filters.visible=function(e){return!v.expr.filters.hidden(e)}),v.each({margin:"",padding:"",border:"Width"},function(e,t){v.cssHooks[e+t]={expand:function(n){var r,i=typeof n=="string"?n.split(" "):[n],s={};for(r=0;r<4;r++)s[e+$t[r]+t]=i[r]||i[r-2]||i[0];return s}},qt.test(e)||(v.cssHooks[e+t].set=Zt)});var rn=/%20/g,sn=/\[\]$/,on=/\r?\n/g,un=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,an=/^(?:select|textarea)/i;v.fn.extend({serialize:function(){return v.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?v.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||an.test(this.nodeName)||un.test(this.type))}).map(function(e,t){var n=v(this).val();return n==null?null:v.isArray(n)?v.map(n,function(e,n){return{name:t.name,value:e.replace(on,"\r\n")}}):{name:t.name,value:n.replace(on,"\r\n")}}).get()}}),v.param=function(e,n){var r,i=[],s=function(e,t){t=v.isFunction(t)?t():t==null?"":t,i[i.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};n===t&&(n=v.ajaxSettings&&v.ajaxSettings.traditional);if(v.isArray(e)||e.jquery&&!v.isPlainObject(e))v.each(e,function(){s(this.name,this.value)});else for(r in e)fn(r,e[r],n,s);return i.join("&").replace(rn,"+")};var ln,cn,hn=/#.*$/,pn=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,dn=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,vn=/^(?:GET|HEAD)$/,mn=/^\/\//,gn=/\?/,yn=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,bn=/([?&])_=[^&]*/,wn=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,En=v.fn.load,Sn={},xn={},Tn=["*/"]+["*"];try{cn=s.href}catch(Nn){cn=i.createElement("a"),cn.href="",cn=cn.href}ln=wn.exec(cn.toLowerCase())||[],v.fn.load=function(e,n,r){if(typeof e!="string"&&En)return En.apply(this,arguments);if(!this.length)return this;var i,s,o,u=this,a=e.indexOf(" ");return a>=0&&(i=e.slice(a,e.length),e=e.slice(0,a)),v.isFunction(n)?(r=n,n=t):n&&typeof n=="object"&&(s="POST"),v.ajax({url:e,type:s,dataType:"html",data:n,complete:function(e,t){r&&u.each(r,o||[e.responseText,t,e])}}).done(function(e){o=arguments,u.html(i?v("<div>").append(e.replace(yn,"")).find(i):e)}),this},v.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(e,t){v.fn[t]=function(e){return this.on(t,e)}}),v.each(["get","post"],function(e,n){v[n]=function(e,r,i,s){return v.isFunction(r)&&(s=s||i,i=r,r=t),v.ajax({type:n,url:e,data:r,success:i,dataType:s})}}),v.extend({getScript:function(e,n){return v.get(e,t,n,"script")},getJSON:function(e,t,n){return v.get(e,t,n,"json")},ajaxSetup:function(e,t){return t?Ln(e,v.ajaxSettings):(t=e,e=v.ajaxSettings),Ln(e,t),e},ajaxSettings:{url:cn,isLocal:dn.test(ln[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded; charset=UTF-8",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":Tn},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":e.String,"text html":!0,"text json":v.parseJSON,"text xml":v.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:Cn(Sn),ajaxTransport:Cn(xn),ajax:function(e,n){function T(e,n,s,a){var l,y,b,w,S,T=n;if(E===2)return;E=2,u&&clearTimeout(u),o=t,i=a||"",x.readyState=e>0?4:0,s&&(w=An(c,x,s));if(e>=200&&e<300||e===304)c.ifModified&&(S=x.getResponseHeader("Last-Modified"),S&&(v.lastModified[r]=S),S=x.getResponseHeader("Etag"),S&&(v.etag[r]=S)),e===304?(T="notmodified",l=!0):(l=On(c,w),T=l.state,y=l.data,b=l.error,l=!b);else{b=T;if(!T||e)T="error",e<0&&(e=0)}x.status=e,x.statusText=(n||T)+"",l?d.resolveWith(h,[y,T,x]):d.rejectWith(h,[x,T,b]),x.statusCode(g),g=t,f&&p.trigger("ajax"+(l?"Success":"Error"),[x,c,l?y:b]),m.fireWith(h,[x,T]),f&&(p.trigger("ajaxComplete",[x,c]),--v.active||v.event.trigger("ajaxStop"))}typeof e=="object"&&(n=e,e=t),n=n||{};var r,i,s,o,u,a,f,l,c=v.ajaxSetup({},n),h=c.context||c,p=h!==c&&(h.nodeType||h instanceof v)?v(h):v.event,d=v.Deferred(),m=v.Callbacks("once memory"),g=c.statusCode||{},b={},w={},E=0,S="canceled",x={readyState:0,setRequestHeader:function(e,t){if(!E){var n=e.toLowerCase();e=w[n]=w[n]||e,b[e]=t}return this},getAllResponseHeaders:function(){return E===2?i:null},getResponseHeader:function(e){var n;if(E===2){if(!s){s={};while(n=pn.exec(i))s[n[1].toLowerCase()]=n[2]}n=s[e.toLowerCase()]}return n===t?null:n},overrideMimeType:function(e){return E||(c.mimeType=e),this},abort:function(e){return e=e||S,o&&o.abort(e),T(0,e),this}};d.promise(x),x.success=x.done,x.error=x.fail,x.complete=m.add,x.statusCode=function(e){if(e){var t;if(E<2)for(t in e)g[t]=[g[t],e[t]];else t=e[x.status],x.always(t)}return this},c.url=((e||c.url)+"").replace(hn,"").replace(mn,ln[1]+"//"),c.dataTypes=v.trim(c.dataType||"*").toLowerCase().split(y),c.crossDomain==null&&(a=wn.exec(c.url.toLowerCase()),c.crossDomain=!(!a||a[1]===ln[1]&&a[2]===ln[2]&&(a[3]||(a[1]==="http:"?80:443))==(ln[3]||(ln[1]==="http:"?80:443)))),c.data&&c.processData&&typeof c.data!="string"&&(c.data=v.param(c.data,c.traditional)),kn(Sn,c,n,x);if(E===2)return x;f=c.global,c.type=c.type.toUpperCase(),c.hasContent=!vn.test(c.type),f&&v.active++===0&&v.event.trigger("ajaxStart");if(!c.hasContent){c.data&&(c.url+=(gn.test(c.url)?"&":"?")+c.data,delete c.data),r=c.url;if(c.cache===!1){var N=v.now(),C=c.url.replace(bn,"$1_="+N);c.url=C+(C===c.url?(gn.test(c.url)?"&":"?")+"_="+N:"")}}(c.data&&c.hasContent&&c.contentType!==!1||n.contentType)&&x.setRequestHeader("Content-Type",c.contentType),c.ifModified&&(r=r||c.url,v.lastModified[r]&&x.setRequestHeader("If-Modified-Since",v.lastModified[r]),v.etag[r]&&x.setRequestHeader("If-None-Match",v.etag[r])),x.setRequestHeader("Accept",c.dataTypes[0]&&c.accepts[c.dataTypes[0]]?c.accepts[c.dataTypes[0]]+(c.dataTypes[0]!=="*"?", "+Tn+"; q=0.01":""):c.accepts["*"]);for(l in c.headers)x.setRequestHeader(l,c.headers[l]);if(!c.beforeSend||c.beforeSend.call(h,x,c)!==!1&&E!==2){S="abort";for(l in{success:1,error:1,complete:1})x[l](c[l]);o=kn(xn,c,n,x);if(!o)T(-1,"No Transport");else{x.readyState=1,f&&p.trigger("ajaxSend",[x,c]),c.async&&c.timeout>0&&(u=setTimeout(function(){x.abort("timeout")},c.timeout));try{E=1,o.send(b,T)}catch(k){if(!(E<2))throw k;T(-1,k)}}return x}return x.abort()},active:0,lastModified:{},etag:{}});var Mn=[],_n=/\?/,Dn=/(=)\?(?=&|$)|\?\?/,Pn=v.now();v.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Mn.pop()||v.expando+"_"+Pn++;return this[e]=!0,e}}),v.ajaxPrefilter("json jsonp",function(n,r,i){var s,o,u,a=n.data,f=n.url,l=n.jsonp!==!1,c=l&&Dn.test(f),h=l&&!c&&typeof a=="string"&&!(n.contentType||"").indexOf("application/x-www-form-urlencoded")&&Dn.test(a);if(n.dataTypes[0]==="jsonp"||c||h)return s=n.jsonpCallback=v.isFunction(n.jsonpCallback)?n.jsonpCallback():n.jsonpCallback,o=e[s],c?n.url=f.replace(Dn,"$1"+s):h?n.data=a.replace(Dn,"$1"+s):l&&(n.url+=(_n.test(f)?"&":"?")+n.jsonp+"="+s),n.converters["script json"]=function(){return u||v.error(s+" was not called"),u[0]},n.dataTypes[0]="json",e[s]=function(){u=arguments},i.always(function(){e[s]=o,n[s]&&(n.jsonpCallback=r.jsonpCallback,Mn.push(s)),u&&v.isFunction(o)&&o(u[0]),u=o=t}),"script"}),v.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(e){return v.globalEval(e),e}}}),v.ajaxPrefilter("script",function(e){e.cache===t&&(e.cache=!1),e.crossDomain&&(e.type="GET",e.global=!1)}),v.ajaxTransport("script",function(e){if(e.crossDomain){var n,r=i.head||i.getElementsByTagName("head")[0]||i.documentElement;return{send:function(s,o){n=i.createElement("script"),n.async="async",e.scriptCharset&&(n.charset=e.scriptCharset),n.src=e.url,n.onload=n.onreadystatechange=function(e,i){if(i||!n.readyState||/loaded|complete/.test(n.readyState))n.onload=n.onreadystatechange=null,r&&n.parentNode&&r.removeChild(n),n=t,i||o(200,"success")},r.insertBefore(n,r.firstChild)},abort:function(){n&&n.onload(0,1)}}}});var Hn,Bn=e.ActiveXObject?function(){for(var e in Hn)Hn[e](0,1)}:!1,jn=0;v.ajaxSettings.xhr=e.ActiveXObject?function(){return!this.isLocal&&Fn()||In()}:Fn,function(e){v.extend(v.support,{ajax:!!e,cors:!!e&&"withCredentials"in e})}(v.ajaxSettings.xhr()),v.support.ajax&&v.ajaxTransport(function(n){if(!n.crossDomain||v.support.cors){var r;return{send:function(i,s){var o,u,a=n.xhr();n.username?a.open(n.type,n.url,n.async,n.username,n.password):a.open(n.type,n.url,n.async);if(n.xhrFields)for(u in n.xhrFields)a[u]=n.xhrFields[u];n.mimeType&&a.overrideMimeType&&a.overrideMimeType(n.mimeType),!n.crossDomain&&!i["X-Requested-With"]&&(i["X-Requested-With"]="XMLHttpRequest");try{for(u in i)a.setRequestHeader(u,i[u])}catch(f){}a.send(n.hasContent&&n.data||null),r=function(e,i){var u,f,l,c,h;try{if(r&&(i||a.readyState===4)){r=t,o&&(a.onreadystatechange=v.noop,Bn&&delete Hn[o]);if(i)a.readyState!==4&&a.abort();else{u=a.status,l=a.getAllResponseHeaders(),c={},h=a.responseXML,h&&h.documentElement&&(c.xml=h);try{c.text=a.responseText}catch(p){}try{f=a.statusText}catch(p){f=""}!u&&n.isLocal&&!n.crossDomain?u=c.text?200:404:u===1223&&(u=204)}}}catch(d){i||s(-1,d)}c&&s(u,f,c,l)},n.async?a.readyState===4?setTimeout(r,0):(o=++jn,Bn&&(Hn||(Hn={},v(e).unload(Bn)),Hn[o]=r),a.onreadystatechange=r):r()},abort:function(){r&&r(0,1)}}}});var qn,Rn,Un=/^(?:toggle|show|hide)$/,zn=new RegExp("^(?:([-+])=|)("+m+")([a-z%]*)$","i"),Wn=/queueHooks$/,Xn=[Gn],Vn={"*":[function(e,t){var n,r,i=this.createTween(e,t),s=zn.exec(t),o=i.cur(),u=+o||0,a=1,f=20;if(s){n=+s[2],r=s[3]||(v.cssNumber[e]?"":"px");if(r!=="px"&&u){u=v.css(i.elem,e,!0)||n||1;do a=a||".5",u/=a,v.style(i.elem,e,u+r);while(a!==(a=i.cur()/o)&&a!==1&&--f)}i.unit=r,i.start=u,i.end=s[1]?u+(s[1]+1)*n:n}return i}]};v.Animation=v.extend(Kn,{tweener:function(e,t){v.isFunction(e)?(t=e,e=["*"]):e=e.split(" ");var n,r=0,i=e.length;for(;r<i;r++)n=e[r],Vn[n]=Vn[n]||[],Vn[n].unshift(t)},prefilter:function(e,t){t?Xn.unshift(e):Xn.push(e)}}),v.Tween=Yn,Yn.prototype={constructor:Yn,init:function(e,t,n,r,i,s){this.elem=e,this.prop=n,this.easing=i||"swing",this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=s||(v.cssNumber[n]?"":"px")},cur:function(){var e=Yn.propHooks[this.prop];return e&&e.get?e.get(this):Yn.propHooks._default.get(this)},run:function(e){var t,n=Yn.propHooks[this.prop];return this.options.duration?this.pos=t=v.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):Yn.propHooks._default.set(this),this}},Yn.prototype.init.prototype=Yn.prototype,Yn.propHooks={_default:{get:function(e){var t;return e.elem[e.prop]==null||!!e.elem.style&&e.elem.style[e.prop]!=null?(t=v.css(e.elem,e.prop,!1,""),!t||t==="auto"?0:t):e.elem[e.prop]},set:function(e){v.fx.step[e.prop]?v.fx.step[e.prop](e):e.elem.style&&(e.elem.style[v.cssProps[e.prop]]!=null||v.cssHooks[e.prop])?v.style(e.elem,e.prop,e.now+e.unit):e.elem[e.prop]=e.now}}},Yn.propHooks.scrollTop=Yn.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},v.each(["toggle","show","hide"],function(e,t){var n=v.fn[t];v.fn[t]=function(r,i,s){return r==null||typeof r=="boolean"||!e&&v.isFunction(r)&&v.isFunction(i)?n.apply(this,arguments):this.animate(Zn(t,!0),r,i,s)}}),v.fn.extend({fadeTo:function(e,t,n,r){return this.filter(Gt).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(e,t,n,r){var i=v.isEmptyObject(e),s=v.speed(t,n,r),o=function(){var t=Kn(this,v.extend({},e),s);i&&t.stop(!0)};return i||s.queue===!1?this.each(o):this.queue(s.queue,o)},stop:function(e,n,r){var i=function(e){var t=e.stop;delete e.stop,t(r)};return typeof e!="string"&&(r=n,n=e,e=t),n&&e!==!1&&this.queue(e||"fx",[]),this.each(function(){var t=!0,n=e!=null&&e+"queueHooks",s=v.timers,o=v._data(this);if(n)o[n]&&o[n].stop&&i(o[n]);else for(n in o)o[n]&&o[n].stop&&Wn.test(n)&&i(o[n]);for(n=s.length;n--;)s[n].elem===this&&(e==null||s[n].queue===e)&&(s[n].anim.stop(r),t=!1,s.splice(n,1));(t||!r)&&v.dequeue(this,e)})}}),v.each({slideDown:Zn("show"),slideUp:Zn("hide"),slideToggle:Zn("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,t){v.fn[e]=function(e,n,r){return this.animate(t,e,n,r)}}),v.speed=function(e,t,n){var r=e&&typeof e=="object"?v.extend({},e):{complete:n||!n&&t||v.isFunction(e)&&e,duration:e,easing:n&&t||t&&!v.isFunction(t)&&t};r.duration=v.fx.off?0:typeof r.duration=="number"?r.duration:r.duration in v.fx.speeds?v.fx.speeds[r.duration]:v.fx.speeds._default;if(r.queue==null||r.queue===!0)r.queue="fx";return r.old=r.complete,r.complete=function(){v.isFunction(r.old)&&r.old.call(this),r.queue&&v.dequeue(this,r.queue)},r},v.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2}},v.timers=[],v.fx=Yn.prototype.init,v.fx.tick=function(){var e,n=v.timers,r=0;qn=v.now();for(;r<n.length;r++)e=n[r],!e()&&n[r]===e&&n.splice(r--,1);n.length||v.fx.stop(),qn=t},v.fx.timer=function(e){e()&&v.timers.push(e)&&!Rn&&(Rn=setInterval(v.fx.tick,v.fx.interval))},v.fx.interval=13,v.fx.stop=function(){clearInterval(Rn),Rn=null},v.fx.speeds={slow:600,fast:200,_default:400},v.fx.step={},v.expr&&v.expr.filters&&(v.expr.filters.animated=function(e){return v.grep(v.timers,function(t){return e===t.elem}).length});var er=/^(?:body|html)$/i;v.fn.offset=function(e){if(arguments.length)return e===t?this:this.each(function(t){v.offset.setOffset(this,e,t)});var n,r,i,s,o,u,a,f={top:0,left:0},l=this[0],c=l&&l.ownerDocument;if(!c)return;return(r=c.body)===l?v.offset.bodyOffset(l):(n=c.documentElement,v.contains(n,l)?(typeof l.getBoundingClientRect!="undefined"&&(f=l.getBoundingClientRect()),i=tr(c),s=n.clientTop||r.clientTop||0,o=n.clientLeft||r.clientLeft||0,u=i.pageYOffset||n.scrollTop,a=i.pageXOffset||n.scrollLeft,{top:f.top+u-s,left:f.left+a-o}):f)},v.offset={bodyOffset:function(e){var t=e.offsetTop,n=e.offsetLeft;return v.support.doesNotIncludeMarginInBodyOffset&&(t+=parseFloat(v.css(e,"marginTop"))||0,n+=parseFloat(v.css(e,"marginLeft"))||0),{top:t,left:n}},setOffset:function(e,t,n){var r=v.css(e,"position");r==="static"&&(e.style.position="relative");var i=v(e),s=i.offset(),o=v.css(e,"top"),u=v.css(e,"left"),a=(r==="absolute"||r==="fixed")&&v.inArray("auto",[o,u])>-1,f={},l={},c,h;a?(l=i.position(),c=l.top,h=l.left):(c=parseFloat(o)||0,h=parseFloat(u)||0),v.isFunction(t)&&(t=t.call(e,n,s)),t.top!=null&&(f.top=t.top-s.top+c),t.left!=null&&(f.left=t.left-s.left+h),"using"in t?t.using.call(e,f):i.css(f)}},v.fn.extend({position:function(){if(!this[0])return;var e=this[0],t=this.offsetParent(),n=this.offset(),r=er.test(t[0].nodeName)?{top:0,left:0}:t.offset();return n.top-=parseFloat(v.css(e,"marginTop"))||0,n.left-=parseFloat(v.css(e,"marginLeft"))||0,r.top+=parseFloat(v.css(t[0],"borderTopWidth"))||0,r.left+=parseFloat(v.css(t[0],"borderLeftWidth"))||0,{top:n.top-r.top,left:n.left-r.left}},offsetParent:function(){return this.map(function(){var e=this.offsetParent||i.body;while(e&&!er.test(e.nodeName)&&v.css(e,"position")==="static")e=e.offsetParent;return e||i.body})}}),v.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,n){var r=/Y/.test(n);v.fn[e]=function(i){return v.access(this,function(e,i,s){var o=tr(e);if(s===t)return o?n in o?o[n]:o.document.documentElement[i]:e[i];o?o.scrollTo(r?v(o).scrollLeft():s,r?s:v(o).scrollTop()):e[i]=s},e,i,arguments.length,null)}}),v.each({Height:"height",Width:"width"},function(e,n){v.each({padding:"inner"+e,content:n,"":"outer"+e},function(r,i){v.fn[i]=function(i,s){var o=arguments.length&&(r||typeof i!="boolean"),u=r||(i===!0||s===!0?"margin":"border");return v.access(this,function(n,r,i){var s;return v.isWindow(n)?n.document.documentElement["client"+e]:n.nodeType===9?(s=n.documentElement,Math.max(n.body["scroll"+e],s["scroll"+e],n.body["offset"+e],s["offset"+e],s["client"+e])):i===t?v.css(n,r,i,u):v.style(n,r,i,u)},n,o?i:t,o,null)}})}),e.jQuery=e.$=v,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return v})})(window);
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/js/jquery-ui-1.10.0.custom.min.js b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/js/jquery-ui-1.10.0.custom.min.js
new file mode 100644
index 0000000..02060f0
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/js/jquery-ui-1.10.0.custom.min.js
@@ -0,0 +1,6 @@
+/*! jQuery UI - v1.10.0 - 2013-01-23
+* http://jqueryui.com
+* Includes: jquery.ui.core.js, jquery.ui.widget.js, jquery.ui.mouse.js, jquery.ui.position.js, jquery.ui.draggable.js, jquery.ui.droppable.js, jquery.ui.resizable.js, jquery.ui.selectable.js, jquery.ui.sortable.js, jquery.ui.accordion.js, jquery.ui.autocomplete.js, jquery.ui.button.js, jquery.ui.datepicker.js, jquery.ui.dialog.js, jquery.ui.menu.js, jquery.ui.progressbar.js, jquery.ui.slider.js, jquery.ui.spinner.js, jquery.ui.tabs.js, jquery.ui.tooltip.js, jquery.ui.effect.js, jquery.ui.effect-blind.js, jquery.ui.effect-bounce.js, jquery.ui.effect-clip.js, jquery.ui.effect-drop.js, jquery.ui.effect-explode.js, jquery.ui.effect-fade.js, jquery.ui.effect-fold.js, jquery.ui.effect-highlight.js, jquery.ui.effect-pulsate.js, jquery.ui.effect-scale.js, jquery.ui.effect-shake.js, jquery.ui.effect-slide.js, jquery.ui.effect-transfer.js
+* Copyright (c) 2013 jQuery Foundation and other contributors Licensed MIT */
+
+(function(e,t){function i(t,n){var r,i,o,u=t.nodeName.toLowerCase();return"area"===u?(r=t.parentNode,i=r.name,!t.href||!i||r.nodeName.toLowerCase()!=="map"?!1:(o=e("img[usemap=#"+i+"]")[0],!!o&&s(o))):(/input|select|textarea|button|object/.test(u)?!t.disabled:"a"===u?t.href||n:n)&&s(t)}function s(t){return e.expr.filters.visible(t)&&!e(t).parents().addBack().filter(function(){return e.css(this,"visibility")==="hidden"}).length}var n=0,r=/^ui-id-\d+$/;e.ui=e.ui||{};if(e.ui.version)return;e.extend(e.ui,{version:"1.10.0",keyCode:{BACKSPACE:8,COMMA:188,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,LEFT:37,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SPACE:32,TAB:9,UP:38}}),e.fn.extend({_focus:e.fn.focus,focus:function(t,n){return typeof t=="number"?this.each(function(){var r=this;setTimeout(function(){e(r).focus(),n&&n.call(r)},t)}):this._focus.apply(this,arguments)},scrollParent:function(){var t;return e.ui.ie&&/(static|relative)/.test(this.css("position"))||/absolute/.test(this.css("position"))?t=this.parents().filter(function(){return/(relative|absolute|fixed)/.test(e.css(this,"position"))&&/(auto|scroll)/.test(e.css(this,"overflow")+e.css(this,"overflow-y")+e.css(this,"overflow-x"))}).eq(0):t=this.parents().filter(function(){return/(auto|scroll)/.test(e.css(this,"overflow")+e.css(this,"overflow-y")+e.css(this,"overflow-x"))}).eq(0),/fixed/.test(this.css("position"))||!t.length?e(document):t},zIndex:function(n){if(n!==t)return this.css("zIndex",n);if(this.length){var r=e(this[0]),i,s;while(r.length&&r[0]!==document){i=r.css("position");if(i==="absolute"||i==="relative"||i==="fixed"){s=parseInt(r.css("zIndex"),10);if(!isNaN(s)&&s!==0)return s}r=r.parent()}}return 0},uniqueId:function(){return this.each(function(){this.id||(this.id="ui-id-"+ ++n)})},removeUniqueId:function(){return this.each(function(){r.test(this.id)&&e(this).removeAttr("id")})}}),e.extend(e.expr[":"],{data:e.expr.createPseudo?e.expr.createPseudo(function(t){return function(n){return!!e.data(n,t)}}):function(t,n,r){return!!e.data(t,r[3])},focusable:function(t){return i(t,!isNaN(e.attr(t,"tabindex")))},tabbable:function(t){var n=e.attr(t,"tabindex"),r=isNaN(n);return(r||n>=0)&&i(t,!r)}}),e("<a>").outerWidth(1).jquery||e.each(["Width","Height"],function(n,r){function u(t,n,r,s){return e.each(i,function(){n-=parseFloat(e.css(t,"padding"+this))||0,r&&(n-=parseFloat(e.css(t,"border"+this+"Width"))||0),s&&(n-=parseFloat(e.css(t,"margin"+this))||0)}),n}var i=r==="Width"?["Left","Right"]:["Top","Bottom"],s=r.toLowerCase(),o={innerWidth:e.fn.innerWidth,innerHeight:e.fn.innerHeight,outerWidth:e.fn.outerWidth,outerHeight:e.fn.outerHeight};e.fn["inner"+r]=function(n){return n===t?o["inner"+r].call(this):this.each(function(){e(this).css(s,u(this,n)+"px")})},e.fn["outer"+r]=function(t,n){return typeof t!="number"?o["outer"+r].call(this,t):this.each(function(){e(this).css(s,u(this,t,!0,n)+"px")})}}),e.fn.addBack||(e.fn.addBack=function(e){return this.add(e==null?this.prevObject:this.prevObject.filter(e))}),e("<a>").data("a-b","a").removeData("a-b").data("a-b")&&(e.fn.removeData=function(t){return function(n){return arguments.length?t.call(this,e.camelCase(n)):t.call(this)}}(e.fn.removeData)),e.ui.ie=!!/msie [\w.]+/.exec(navigator.userAgent.toLowerCase()),e.support.selectstart="onselectstart"in document.createElement("div"),e.fn.extend({disableSelection:function(){return this.bind((e.support.selectstart?"selectstart":"mousedown")+".ui-disableSelection",function(e){e.preventDefault()})},enableSelection:function(){return this.unbind(".ui-disableSelection")}}),e.extend(e.ui,{plugin:{add:function(t,n,r){var i,s=e.ui[t].prototype;for(i in r)s.plugins[i]=s.plugins[i]||[],s.plugins[i].push([n,r[i]])},call:function(e,t,n){var r,i=e.plugins[t];if(!i||!e.element[0].parentNode||e.element[0].parentNode.nodeType===11)return;for(r=0;r<i.length;r++)e.options[i[r][0]]&&i[r][1].apply(e.element,n)}},hasScroll:function(t,n){if(e(t).css("overflow")==="hidden")return!1;var r=n&&n==="left"?"scrollLeft":"scrollTop",i=!1;return t[r]>0?!0:(t[r]=1,i=t[r]>0,t[r]=0,i)}})})(jQuery);(function(e,t){var n=0,r=Array.prototype.slice,i=e.cleanData;e.cleanData=function(t){for(var n=0,r;(r=t[n])!=null;n++)try{e(r).triggerHandler("remove")}catch(s){}i(t)},e.widget=function(t,n,r){var i,s,o,u,a={},f=t.split(".")[0];t=t.split(".")[1],i=f+"-"+t,r||(r=n,n=e.Widget),e.expr[":"][i.toLowerCase()]=function(t){return!!e.data(t,i)},e[f]=e[f]||{},s=e[f][t],o=e[f][t]=function(e,t){if(!this._createWidget)return new o(e,t);arguments.length&&this._createWidget(e,t)},e.extend(o,s,{version:r.version,_proto:e.extend({},r),_childConstructors:[]}),u=new n,u.options=e.widget.extend({},u.options),e.each(r,function(t,r){if(!e.isFunction(r)){a[t]=r;return}a[t]=function(){var e=function(){return n.prototype[t].apply(this,arguments)},i=function(e){return n.prototype[t].apply(this,e)};return function(){var t=this._super,n=this._superApply,s;return this._super=e,this._superApply=i,s=r.apply(this,arguments),this._super=t,this._superApply=n,s}}()}),o.prototype=e.widget.extend(u,{widgetEventPrefix:s?u.widgetEventPrefix:t},a,{constructor:o,namespace:f,widgetName:t,widgetFullName:i}),s?(e.each(s._childConstructors,function(t,n){var r=n.prototype;e.widget(r.namespace+"."+r.widgetName,o,n._proto)}),delete s._childConstructors):n._childConstructors.push(o),e.widget.bridge(t,o)},e.widget.extend=function(n){var i=r.call(arguments,1),s=0,o=i.length,u,a;for(;s<o;s++)for(u in i[s])a=i[s][u],i[s].hasOwnProperty(u)&&a!==t&&(e.isPlainObject(a)?n[u]=e.isPlainObject(n[u])?e.widget.extend({},n[u],a):e.widget.extend({},a):n[u]=a);return n},e.widget.bridge=function(n,i){var s=i.prototype.widgetFullName||n;e.fn[n]=function(o){var u=typeof o=="string",a=r.call(arguments,1),f=this;return o=!u&&a.length?e.widget.extend.apply(null,[o].concat(a)):o,u?this.each(function(){var r,i=e.data(this,s);if(!i)return e.error("cannot call methods on "+n+" prior to initialization; "+"attempted to call method '"+o+"'");if(!e.isFunction(i[o])||o.charAt(0)==="_")return e.error("no such method '"+o+"' for "+n+" widget instance");r=i[o].apply(i,a);if(r!==i&&r!==t)return f=r&&r.jquery?f.pushStack(r.get()):r,!1}):this.each(function(){var t=e.data(this,s);t?t.option(o||{})._init():e.data(this,s,new i(o,this))}),f}},e.Widget=function(){},e.Widget._childConstructors=[],e.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",defaultElement:"<div>",options:{disabled:!1,create:null},_createWidget:function(t,r){r=e(r||this.defaultElement||this)[0],this.element=e(r),this.uuid=n++,this.eventNamespace="."+this.widgetName+this.uuid,this.options=e.widget.extend({},this.options,this._getCreateOptions(),t),this.bindings=e(),this.hoverable=e(),this.focusable=e(),r!==this&&(e.data(r,this.widgetFullName,this),this._on(!0,this.element,{remove:function(e){e.target===r&&this.destroy()}}),this.document=e(r.style?r.ownerDocument:r.document||r),this.window=e(this.document[0].defaultView||this.document[0].parentWindow)),this._create(),this._trigger("create",null,this._getCreateEventData()),this._init()},_getCreateOptions:e.noop,_getCreateEventData:e.noop,_create:e.noop,_init:e.noop,destroy:function(){this._destroy(),this.element.unbind(this.eventNamespace).removeData(this.widgetName).removeData(this.widgetFullName).removeData(e.camelCase(this.widgetFullName)),this.widget().unbind(this.eventNamespace).removeAttr("aria-disabled").removeClass(this.widgetFullName+"-disabled "+"ui-state-disabled"),this.bindings.unbind(this.eventNamespace),this.hoverable.removeClass("ui-state-hover"),this.focusable.removeClass("ui-state-focus")},_destroy:e.noop,widget:function(){return this.element},option:function(n,r){var i=n,s,o,u;if(arguments.length===0)return e.widget.extend({},this.options);if(typeof n=="string"){i={},s=n.split("."),n=s.shift();if(s.length){o=i[n]=e.widget.extend({},this.options[n]);for(u=0;u<s.length-1;u++)o[s[u]]=o[s[u]]||{},o=o[s[u]];n=s.pop();if(r===t)return o[n]===t?null:o[n];o[n]=r}else{if(r===t)return this.options[n]===t?null:this.options[n];i[n]=r}}return this._setOptions(i),this},_setOptions:function(e){var t;for(t in e)this._setOption(t,e[t]);return this},_setOption:function(e,t){return this.options[e]=t,e==="disabled"&&(this.widget().toggleClass(this.widgetFullName+"-disabled ui-state-disabled",!!t).attr("aria-disabled",t),this.hoverable.removeClass("ui-state-hover"),this.focusable.removeClass("ui-state-focus")),this},enable:function(){return this._setOption("disabled",!1)},disable:function(){return this._setOption("disabled",!0)},_on:function(t,n,r){var i,s=this;typeof t!="boolean"&&(r=n,n=t,t=!1),r?(n=i=e(n),this.bindings=this.bindings.add(n)):(r=n,n=this.element,i=this.widget()),e.each(r,function(r,o){function u(){if(!t&&(s.options.disabled===!0||e(this).hasClass("ui-state-disabled")))return;return(typeof o=="string"?s[o]:o).apply(s,arguments)}typeof o!="string"&&(u.guid=o.guid=o.guid||u.guid||e.guid++);var a=r.match(/^(\w+)\s*(.*)$/),f=a[1]+s.eventNamespace,l=a[2];l?i.delegate(l,f,u):n.bind(f,u)})},_off:function(e,t){t=(t||"").split(" ").join(this.eventNamespace+" ")+this.eventNamespace,e.unbind(t).undelegate(t)},_delay:function(e,t){function n(){return(typeof e=="string"?r[e]:e).apply(r,arguments)}var r=this;return setTimeout(n,t||0)},_hoverable:function(t){this.hoverable=this.hoverable.add(t),this._on(t,{mouseenter:function(t){e(t.currentTarget).addClass("ui-state-hover")},mouseleave:function(t){e(t.currentTarget).removeClass("ui-state-hover")}})},_focusable:function(t){this.focusable=this.focusable.add(t),this._on(t,{focusin:function(t){e(t.currentTarget).addClass("ui-state-focus")},focusout:function(t){e(t.currentTarget).removeClass("ui-state-focus")}})},_trigger:function(t,n,r){var i,s,o=this.options[t];r=r||{},n=e.Event(n),n.type=(t===this.widgetEventPrefix?t:this.widgetEventPrefix+t).toLowerCase(),n.target=this.element[0],s=n.originalEvent;if(s)for(i in s)i in n||(n[i]=s[i]);return this.element.trigger(n,r),!(e.isFunction(o)&&o.apply(this.element[0],[n].concat(r))===!1||n.isDefaultPrevented())}},e.each({show:"fadeIn",hide:"fadeOut"},function(t,n){e.Widget.prototype["_"+t]=function(r,i,s){typeof i=="string"&&(i={effect:i});var o,u=i?i===!0||typeof i=="number"?n:i.effect||n:t;i=i||{},typeof i=="number"&&(i={duration:i}),o=!e.isEmptyObject(i),i.complete=s,i.delay&&r.delay(i.delay),o&&e.effects&&e.effects.effect[u]?r[t](i):u!==t&&r[u]?r[u](i.duration,i.easing,s):r.queue(function(n){e(this)[t](),s&&s.call(r[0]),n()})}})})(jQuery);(function(e,t){var n=!1;e(document).mouseup(function(){n=!1}),e.widget("ui.mouse",{version:"1.10.0",options:{cancel:"input,textarea,button,select,option",distance:1,delay:0},_mouseInit:function(){var t=this;this.element.bind("mousedown."+this.widgetName,function(e){return t._mouseDown(e)}).bind("click."+this.widgetName,function(n){if(!0===e.data(n.target,t.widgetName+".preventClickEvent"))return e.removeData(n.target,t.widgetName+".preventClickEvent"),n.stopImmediatePropagation(),!1}),this.started=!1},_mouseDestroy:function(){this.element.unbind("."+this.widgetName),this._mouseMoveDelegate&&e(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate)},_mouseDown:function(t){if(n)return;this._mouseStarted&&this._mouseUp(t),this._mouseDownEvent=t;var r=this,i=t.which===1,s=typeof this.options.cancel=="string"&&t.target.nodeName?e(t.target).closest(this.options.cancel).length:!1;if(!i||s||!this._mouseCapture(t))return!0;this.mouseDelayMet=!this.options.delay,this.mouseDelayMet||(this._mouseDelayTimer=setTimeout(function(){r.mouseDelayMet=!0},this.options.delay));if(this._mouseDistanceMet(t)&&this._mouseDelayMet(t)){this._mouseStarted=this._mouseStart(t)!==!1;if(!this._mouseStarted)return t.preventDefault(),!0}return!0===e.data(t.target,this.widgetName+".preventClickEvent")&&e.removeData(t.target,this.widgetName+".preventClickEvent"),this._mouseMoveDelegate=function(e){return r._mouseMove(e)},this._mouseUpDelegate=function(e){return r._mouseUp(e)},e(document).bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate),t.preventDefault(),n=!0,!0},_mouseMove:function(t){return e.ui.ie&&(!document.documentMode||document.documentMode<9)&&!t.button?this._mouseUp(t):this._mouseStarted?(this._mouseDrag(t),t.preventDefault()):(this._mouseDistanceMet(t)&&this._mouseDelayMet(t)&&(this._mouseStarted=this._mouseStart(this._mouseDownEvent,t)!==!1,this._mouseStarted?this._mouseDrag(t):this._mouseUp(t)),!this._mouseStarted)},_mouseUp:function(t){return e(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate),this._mouseStarted&&(this._mouseStarted=!1,t.target===this._mouseDownEvent.target&&e.data(t.target,this.widgetName+".preventClickEvent",!0),this._mouseStop(t)),!1},_mouseDistanceMet:function(e){return Math.max(Math.abs(this._mouseDownEvent.pageX-e.pageX),Math.abs(this._mouseDownEvent.pageY-e.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return!0}})})(jQuery);(function(e,t){function h(e,t,n){return[parseInt(e[0],10)*(l.test(e[0])?t/100:1),parseInt(e[1],10)*(l.test(e[1])?n/100:1)]}function p(t,n){return parseInt(e.css(t,n),10)||0}function d(t){var n=t[0];return n.nodeType===9?{width:t.width(),height:t.height(),offset:{top:0,left:0}}:e.isWindow(n)?{width:t.width(),height:t.height(),offset:{top:t.scrollTop(),left:t.scrollLeft()}}:n.preventDefault?{width:0,height:0,offset:{top:n.pageY,left:n.pageX}}:{width:t.outerWidth(),height:t.outerHeight(),offset:t.offset()}}e.ui=e.ui||{};var n,r=Math.max,i=Math.abs,s=Math.round,o=/left|center|right/,u=/top|center|bottom/,a=/[\+\-]\d+%?/,f=/^\w+/,l=/%$/,c=e.fn.position;e.position={scrollbarWidth:function(){if(n!==t)return n;var r,i,s=e("<div style='display:block;width:50px;height:50px;overflow:hidden;'><div style='height:100px;width:auto;'></div></div>"),o=s.children()[0];return e("body").append(s),r=o.offsetWidth,s.css("overflow","scroll"),i=o.offsetWidth,r===i&&(i=s[0].clientWidth),s.remove(),n=r-i},getScrollInfo:function(t){var n=t.isWindow?"":t.element.css("overflow-x"),r=t.isWindow?"":t.element.css("overflow-y"),i=n==="scroll"||n==="auto"&&t.width<t.element[0].scrollWidth,s=r==="scroll"||r==="auto"&&t.height<t.element[0].scrollHeight;return{width:i?e.position.scrollbarWidth():0,height:s?e.position.scrollbarWidth():0}},getWithinInfo:function(t){var n=e(t||window),r=e.isWindow(n[0]);return{element:n,isWindow:r,offset:n.offset()||{left:0,top:0},scrollLeft:n.scrollLeft(),scrollTop:n.scrollTop(),width:r?n.width():n.outerWidth(),height:r?n.height():n.outerHeight()}}},e.fn.position=function(t){if(!t||!t.of)return c.apply(this,arguments);t=e.extend({},t);var n,l,v,m,g,y,b=e(t.of),w=e.position.getWithinInfo(t.within),E=e.position.getScrollInfo(w),S=(t.collision||"flip").split(" "),x={};return y=d(b),b[0].preventDefault&&(t.at="left top"),l=y.width,v=y.height,m=y.offset,g=e.extend({},m),e.each(["my","at"],function(){var e=(t[this]||"").split(" "),n,r;e.length===1&&(e=o.test(e[0])?e.concat(["center"]):u.test(e[0])?["center"].concat(e):["center","center"]),e[0]=o.test(e[0])?e[0]:"center",e[1]=u.test(e[1])?e[1]:"center",n=a.exec(e[0]),r=a.exec(e[1]),x[this]=[n?n[0]:0,r?r[0]:0],t[this]=[f.exec(e[0])[0],f.exec(e[1])[0]]}),S.length===1&&(S[1]=S[0]),t.at[0]==="right"?g.left+=l:t.at[0]==="center"&&(g.left+=l/2),t.at[1]==="bottom"?g.top+=v:t.at[1]==="center"&&(g.top+=v/2),n=h(x.at,l,v),g.left+=n[0],g.top+=n[1],this.each(function(){var o,u,a=e(this),f=a.outerWidth(),c=a.outerHeight(),d=p(this,"marginLeft"),y=p(this,"marginTop"),T=f+d+p(this,"marginRight")+E.width,N=c+y+p(this,"marginBottom")+E.height,C=e.extend({},g),k=h(x.my,a.outerWidth(),a.outerHeight());t.my[0]==="right"?C.left-=f:t.my[0]==="center"&&(C.left-=f/2),t.my[1]==="bottom"?C.top-=c:t.my[1]==="center"&&(C.top-=c/2),C.left+=k[0],C.top+=k[1],e.support.offsetFractions||(C.left=s(C.left),C.top=s(C.top)),o={marginLeft:d,marginTop:y},e.each(["left","top"],function(r,i){e.ui.position[S[r]]&&e.ui.position[S[r]][i](C,{targetWidth:l,targetHeight:v,elemWidth:f,elemHeight:c,collisionPosition:o,collisionWidth:T,collisionHeight:N,offset:[n[0]+k[0],n[1]+k[1]],my:t.my,at:t.at,within:w,elem:a})}),t.using&&(u=function(e){var n=m.left-C.left,s=n+l-f,o=m.top-C.top,u=o+v-c,h={target:{element:b,left:m.left,top:m.top,width:l,height:v},element:{element:a,left:C.left,top:C.top,width:f,height:c},horizontal:s<0?"left":n>0?"right":"center",vertical:u<0?"top":o>0?"bottom":"middle"};l<f&&i(n+s)<l&&(h.horizontal="center"),v<c&&i(o+u)<v&&(h.vertical="middle"),r(i(n),i(s))>r(i(o),i(u))?h.important="horizontal":h.important="vertical",t.using.call(this,e,h)}),a.offset(e.extend(C,{using:u}))})},e.ui.position={fit:{left:function(e,t){var n=t.within,i=n.isWindow?n.scrollLeft:n.offset.left,s=n.width,o=e.left-t.collisionPosition.marginLeft,u=i-o,a=o+t.collisionWidth-s-i,f;t.collisionWidth>s?u>0&&a<=0?(f=e.left+u+t.collisionWidth-s-i,e.left+=u-f):a>0&&u<=0?e.left=i:u>a?e.left=i+s-t.collisionWidth:e.left=i:u>0?e.left+=u:a>0?e.left-=a:e.left=r(e.left-o,e.left)},top:function(e,t){var n=t.within,i=n.isWindow?n.scrollTop:n.offset.top,s=t.within.height,o=e.top-t.collisionPosition.marginTop,u=i-o,a=o+t.collisionHeight-s-i,f;t.collisionHeight>s?u>0&&a<=0?(f=e.top+u+t.collisionHeight-s-i,e.top+=u-f):a>0&&u<=0?e.top=i:u>a?e.top=i+s-t.collisionHeight:e.top=i:u>0?e.top+=u:a>0?e.top-=a:e.top=r(e.top-o,e.top)}},flip:{left:function(e,t){var n=t.within,r=n.offset.left+n.scrollLeft,s=n.width,o=n.isWindow?n.scrollLeft:n.offset.left,u=e.left-t.collisionPosition.marginLeft,a=u-o,f=u+t.collisionWidth-s-o,l=t.my[0]==="left"?-t.elemWidth:t.my[0]==="right"?t.elemWidth:0,c=t.at[0]==="left"?t.targetWidth:t.at[0]==="right"?-t.targetWidth:0,h=-2*t.offset[0],p,d;if(a<0){p=e.left+l+c+h+t.collisionWidth-s-r;if(p<0||p<i(a))e.left+=l+c+h}else if(f>0){d=e.left-t.collisionPosition.marginLeft+l+c+h-o;if(d>0||i(d)<f)e.left+=l+c+h}},top:function(e,t){var n=t.within,r=n.offset.top+n.scrollTop,s=n.height,o=n.isWindow?n.scrollTop:n.offset.top,u=e.top-t.collisionPosition.marginTop,a=u-o,f=u+t.collisionHeight-s-o,l=t.my[1]==="top",c=l?-t.elemHeight:t.my[1]==="bottom"?t.elemHeight:0,h=t.at[1]==="top"?t.targetHeight:t.at[1]==="bottom"?-t.targetHeight:0,p=-2*t.offset[1],d,v;a<0?(v=e.top+c+h+p+t.collisionHeight-s-r,e.top+c+h+p>a&&(v<0||v<i(a))&&(e.top+=c+h+p)):f>0&&(d=e.top-t.collisionPosition.marginTop+c+h+p-o,e.top+c+h+p>f&&(d>0||i(d)<f)&&(e.top+=c+h+p))}},flipfit:{left:function(){e.ui.position.flip.left.apply(this,arguments),e.ui.position.fit.left.apply(this,arguments)},top:function(){e.ui.position.flip.top.apply(this,arguments),e.ui.position.fit.top.apply(this,arguments)}}},function(){var t,n,r,i,s,o=document.getElementsByTagName("body")[0],u=document.createElement("div");t=document.createElement(o?"div":"body"),r={visibility:"hidden",width:0,height:0,border:0,margin:0,background:"none"},o&&e.extend(r,{position:"absolute",left:"-1000px",top:"-1000px"});for(s in r)t.style[s]=r[s];t.appendChild(u),n=o||document.documentElement,n.insertBefore(t,n.firstChild),u.style.cssText="position: absolute; left: 10.7432222px;",i=e(u).offset().left,e.support.offsetFractions=i>10&&i<11,t.innerHTML="",n.removeChild(t)}()})(jQuery);(function(e,t){e.widget("ui.draggable",e.ui.mouse,{version:"1.10.0",widgetEventPrefix:"drag",options:{addClasses:!0,appendTo:"parent",axis:!1,connectToSortable:!1,containment:!1,cursor:"auto",cursorAt:!1,grid:!1,handle:!1,helper:"original",iframeFix:!1,opacity:!1,refreshPositions:!1,revert:!1,revertDuration:500,scope:"default",scroll:!0,scrollSensitivity:20,scrollSpeed:20,snap:!1,snapMode:"both",snapTolerance:20,stack:!1,zIndex:!1,drag:null,start:null,stop:null},_create:function(){this.options.helper==="original"&&!/^(?:r|a|f)/.test(this.element.css("position"))&&(this.element[0].style.position="relative"),this.options.addClasses&&this.element.addClass("ui-draggable"),this.options.disabled&&this.element.addClass("ui-draggable-disabled"),this._mouseInit()},_destroy:function(){this.element.removeClass("ui-draggable ui-draggable-dragging ui-draggable-disabled"),this._mouseDestroy()},_mouseCapture:function(t){var n=this.options;return this.helper||n.disabled||e(t.target).closest(".ui-resizable-handle").length>0?!1:(this.handle=this._getHandle(t),this.handle?(e(n.iframeFix===!0?"iframe":n.iframeFix).each(function(){e("<div class='ui-draggable-iframeFix' style='background: #fff;'></div>").css({width:this.offsetWidth+"px",height:this.offsetHeight+"px",position:"absolute",opacity:"0.001",zIndex:1e3}).css(e(this).offset()).appendTo("body")}),!0):!1)},_mouseStart:function(t){var n=this.options;return this.helper=this._createHelper(t),this.helper.addClass("ui-draggable-dragging"),this._cacheHelperProportions(),e.ui.ddmanager&&(e.ui.ddmanager.current=this),this._cacheMargins(),this.cssPosition=this.helper.css("position"),this.scrollParent=this.helper.scrollParent(),this.offset=this.positionAbs=this.element.offset(),this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left},e.extend(this.offset,{click:{left:t.pageX-this.offset.left,top:t.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()}),this.originalPosition=this.position=this._generatePosition(t),this.originalPageX=t.pageX,this.originalPageY=t.pageY,n.cursorAt&&this._adjustOffsetFromHelper(n.cursorAt),n.containment&&this._setContainment(),this._trigger("start",t)===!1?(this._clear(),!1):(this._cacheHelperProportions(),e.ui.ddmanager&&!n.dropBehaviour&&e.ui.ddmanager.prepareOffsets(this,t),this._mouseDrag(t,!0),e.ui.ddmanager&&e.ui.ddmanager.dragStart(this,t),!0)},_mouseDrag:function(t,n){this.position=this._generatePosition(t),this.positionAbs=this._convertPositionTo("absolute");if(!n){var r=this._uiHash();if(this._trigger("drag",t,r)===!1)return this._mouseUp({}),!1;this.position=r.position}if(!this.options.axis||this.options.axis!=="y")this.helper[0].style.left=this.position.left+"px";if(!this.options.axis||this.options.axis!=="x")this.helper[0].style.top=this.position.top+"px";return e.ui.ddmanager&&e.ui.ddmanager.drag(this,t),!1},_mouseStop:function(t){var n,r=this,i=!1,s=!1;e.ui.ddmanager&&!this.options.dropBehaviour&&(s=e.ui.ddmanager.drop(this,t)),this.dropped&&(s=this.dropped,this.dropped=!1),n=this.element[0];while(n&&(n=n.parentNode))n===document&&(i=!0);return!i&&this.options.helper==="original"?!1:(this.options.revert==="invalid"&&!s||this.options.revert==="valid"&&s||this.options.revert===!0||e.isFunction(this.options.revert)&&this.options.revert.call(this.element,s)?e(this.helper).animate(this.originalPosition,parseInt(this.options.revertDuration,10),function(){r._trigger("stop",t)!==!1&&r._clear()}):this._trigger("stop",t)!==!1&&this._clear(),!1)},_mouseUp:function(t){return e("div.ui-draggable-iframeFix").each(function(){this.parentNode.removeChild(this)}),e.ui.ddmanager&&e.ui.ddmanager.dragStop(this,t),e.ui.mouse.prototype._mouseUp.call(this,t)},cancel:function(){return this.helper.is(".ui-draggable-dragging")?this._mouseUp({}):this._clear(),this},_getHandle:function(t){var n=!this.options.handle||!e(this.options.handle,this.element).length?!0:!1;return e(this.options.handle,this.element).find("*").addBack().each(function(){this===t.target&&(n=!0)}),n},_createHelper:function(t){var n=this.options,r=e.isFunction(n.helper)?e(n.helper.apply(this.element[0],[t])):n.helper==="clone"?this.element.clone().removeAttr("id"):this.element;return r.parents("body").length||r.appendTo(n.appendTo==="parent"?this.element[0].parentNode:n.appendTo),r[0]!==this.element[0]&&!/(fixed|absolute)/.test(r.css("position"))&&r.css("position","absolute"),r},_adjustOffsetFromHelper:function(t){typeof t=="string"&&(t=t.split(" ")),e.isArray(t)&&(t={left:+t[0],top:+t[1]||0}),"left"in t&&(this.offset.click.left=t.left+this.margins.left),"right"in t&&(this.offset.click.left=this.helperProportions.width-t.right+this.margins.left),"top"in t&&(this.offset.click.top=t.top+this.margins.top),"bottom"in t&&(this.offset.click.top=this.helperProportions.height-t.bottom+this.margins.top)},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var t=this.offsetParent.offset();this.cssPosition==="absolute"&&this.scrollParent[0]!==document&&e.contains(this.scrollParent[0],this.offsetParent[0])&&(t.left+=this.scrollParent.scrollLeft(),t.top+=this.scrollParent.scrollTop());if(this.offsetParent[0]===document.body||this.offsetParent[0].tagName&&this.offsetParent[0].tagName.toLowerCase()==="html"&&e.ui.ie)t={top:0,left:0};return{top:t.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:t.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if(this.cssPosition==="relative"){var e=this.element.position();return{top:e.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:e.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.element.css("marginLeft"),10)||0,top:parseInt(this.element.css("marginTop"),10)||0,right:parseInt(this.element.css("marginRight"),10)||0,bottom:parseInt(this.element.css("marginBottom"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var t,n,r,i=this.options;i.containment==="parent"&&(i.containment=this.helper[0].parentNode);if(i.containment==="document"||i.containment==="window")this.containment=[i.containment==="document"?0:e(window).scrollLeft()-this.offset.relative.left-this.offset.parent.left,i.containment==="document"?0:e(window).scrollTop()-this.offset.relative.top-this.offset.parent.top,(i.containment==="document"?0:e(window).scrollLeft())+e(i.containment==="document"?document:window).width()-this.helperProportions.width-this.margins.left,(i.containment==="document"?0:e(window).scrollTop())+(e(i.containment==="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top];if(!/^(document|window|parent)$/.test(i.containment)&&i.containment.constructor!==Array){n=e(i.containment),r=n[0];if(!r)return;t=e(r).css("overflow")!=="hidden",this.containment=[(parseInt(e(r).css("borderLeftWidth"),10)||0)+(parseInt(e(r).css("paddingLeft"),10)||0),(parseInt(e(r).css("borderTopWidth"),10)||0)+(parseInt(e(r).css("paddingTop"),10)||0),(t?Math.max(r.scrollWidth,r.offsetWidth):r.offsetWidth)-(parseInt(e(r).css("borderLeftWidth"),10)||0)-(parseInt(e(r).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left-this.margins.right,(t?Math.max(r.scrollHeight,r.offsetHeight):r.offsetHeight)-(parseInt(e(r).css("borderTopWidth"),10)||0)-(parseInt(e(r).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top-this.margins.bottom],this.relative_container=n}else i.containment.constructor===Array&&(this.containment=i.containment)},_convertPositionTo:function(t,n){n||(n=this.position);var r=t==="absolute"?1:-1,i=this.cssPosition!=="absolute"||this.scrollParent[0]!==document&&!!e.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,s=/(html|body)/i.test(i[0].tagName);return{top:n.top+this.offset.relative.top*r+this.offset.parent.top*r-(this.cssPosition==="fixed"?-this.scrollParent.scrollTop():s?0:i.scrollTop())*r,left:n.left+this.offset.relative.left*r+this.offset.parent.left*r-(this.cssPosition==="fixed"?-this.scrollParent.scrollLeft():s?0:i.scrollLeft())*r}},_generatePosition:function(t){var n,r,i,s,o=this.options,u=this.cssPosition!=="absolute"||this.scrollParent[0]!==document&&!!e.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,a=/(html|body)/i.test(u[0].tagName),f=t.pageX,l=t.pageY;return this.originalPosition&&(this.containment&&(this.relative_container?(r=this.relative_container.offset(),n=[this.containment[0]+r.left,this.containment[1]+r.top,this.containment[2]+r.left,this.containment[3]+r.top]):n=this.containment,t.pageX-this.offset.click.left<n[0]&&(f=n[0]+this.offset.click.left),t.pageY-this.offset.click.top<n[1]&&(l=n[1]+this.offset.click.top),t.pageX-this.offset.click.left>n[2]&&(f=n[2]+this.offset.click.left),t.pageY-this.offset.click.top>n[3]&&(l=n[3]+this.offset.click.top)),o.grid&&(i=o.grid[1]?this.originalPageY+Math.round((l-this.originalPageY)/o.grid[1])*o.grid[1]:this.originalPageY,l=n?i-this.offset.click.top>=n[1]||i-this.offset.click.top>n[3]?i:i-this.offset.click.top>=n[1]?i-o.grid[1]:i+o.grid[1]:i,s=o.grid[0]?this.originalPageX+Math.round((f-this.originalPageX)/o.grid[0])*o.grid[0]:this.originalPageX,f=n?s-this.offset.click.left>=n[0]||s-this.offset.click.left>n[2]?s:s-this.offset.click.left>=n[0]?s-o.grid[0]:s+o.grid[0]:s)),{top:l-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+(this.cssPosition==="fixed"?-this.scrollParent.scrollTop():a?0:u.scrollTop()),left:f-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(this.cssPosition==="fixed"?-this.scrollParent.scrollLeft():a?0:u.scrollLeft())}},_clear:function(){this.helper.removeClass("ui-draggable-dragging"),this.helper[0]!==this.element[0]&&!this.cancelHelperRemoval&&this.helper.remove(),this.helper=null,this.cancelHelperRemoval=!1},_trigger:function(t,n,r){return r=r||this._uiHash(),e.ui.plugin.call(this,t,[n,r]),t==="drag"&&(this.positionAbs=this._convertPositionTo("absolute")),e.Widget.prototype._trigger.call(this,t,n,r)},plugins:{},_uiHash:function(){return{helper:this.helper,position:this.position,originalPosition:this.originalPosition,offset:this.positionAbs}}}),e.ui.plugin.add("draggable","connectToSortable",{start:function(t,n){var r=e(this).data("ui-draggable"),i=r.options,s=e.extend({},n,{item:r.element});r.sortables=[],e(i.connectToSortable).each(function(){var n=e.data(this,"ui-sortable");n&&!n.options.disabled&&(r.sortables.push({instance:n,shouldRevert:n.options.revert}),n.refreshPositions(),n._trigger("activate",t,s))})},stop:function(t,n){var r=e(this).data("ui-draggable"),i=e.extend({},n,{item:r.element});e.each(r.sortables,function(){this.instance.isOver?(this.instance.isOver=0,r.cancelHelperRemoval=!0,this.instance.cancelHelperRemoval=!1,this.shouldRevert&&(this.instance.options.revert=!0),this.instance._mouseStop(t),this.instance.options.helper=this.instance.options._helper,r.options.helper==="original"&&this.instance.currentItem.css({top:"auto",left:"auto"})):(this.instance.cancelHelperRemoval=!1,this.instance._trigger("deactivate",t,i))})},drag:function(t,n){var r=e(this).data("ui-draggable"),i=this;e.each(r.sortables,function(){var s=!1,o=this;this.instance.positionAbs=r.positionAbs,this.instance.helperProportions=r.helperProportions,this.instance.offset.click=r.offset.click,this.instance._intersectsWith(this.instance.containerCache)&&(s=!0,e.each(r.sortables,function(){return this.instance.positionAbs=r.positionAbs,this.instance.helperProportions=r.helperProportions,this.instance.offset.click=r.offset.click,this!==o&&this.instance._intersectsWith(this.instance.containerCache)&&e.ui.contains(o.instance.element[0],this.instance.element[0])&&(s=!1),s})),s?(this.instance.isOver||(this.instance.isOver=1,this.instance.currentItem=e(i).clone().removeAttr("id").appendTo(this.instance.element).data("ui-sortable-item",!0),this.instance.options._helper=this.instance.options.helper,this.instance.options.helper=function(){return n.helper[0]},t.target=this.instance.currentItem[0],this.instance._mouseCapture(t,!0),this.instance._mouseStart(t,!0,!0),this.instance.offset.click.top=r.offset.click.top,this.instance.offset.click.left=r.offset.click.left,this.instance.offset.parent.left-=r.offset.parent.left-this.instance.offset.parent.left,this.instance.offset.parent.top-=r.offset.parent.top-this.instance.offset.parent.top,r._trigger("toSortable",t),r.dropped=this.instance.element,r.currentItem=r.element,this.instance.fromOutside=r),this.instance.currentItem&&this.instance._mouseDrag(t)):this.instance.isOver&&(this.instance.isOver=0,this.instance.cancelHelperRemoval=!0,this.instance.options.revert=!1,this.instance._trigger("out",t,this.instance._uiHash(this.instance)),this.instance._mouseStop(t,!0),this.instance.options.helper=this.instance.options._helper,this.instance.currentItem.remove(),this.instance.placeholder&&this.instance.placeholder.remove(),r._trigger("fromSortable",t),r.dropped=!1)})}}),e.ui.plugin.add("draggable","cursor",{start:function(){var t=e("body"),n=e(this).data("ui-draggable").options;t.css("cursor")&&(n._cursor=t.css("cursor")),t.css("cursor",n.cursor)},stop:function(){var t=e(this).data("ui-draggable").options;t._cursor&&e("body").css("cursor",t._cursor)}}),e.ui.plugin.add("draggable","opacity",{start:function(t,n){var r=e(n.helper),i=e(this).data("ui-draggable").options;r.css("opacity")&&(i._opacity=r.css("opacity")),r.css("opacity",i.opacity)},stop:function(t,n){var r=e(this).data("ui-draggable").options;r._opacity&&e(n.helper).css("opacity",r._opacity)}}),e.ui.plugin.add("draggable","scroll",{start:function(){var t=e(this).data("ui-draggable");t.scrollParent[0]!==document&&t.scrollParent[0].tagName!=="HTML"&&(t.overflowOffset=t.scrollParent.offset())},drag:function(t){var n=e(this).data("ui-draggable"),r=n.options,i=!1;if(n.scrollParent[0]!==document&&n.scrollParent[0].tagName!=="HTML"){if(!r.axis||r.axis!=="x")n.overflowOffset.top+n.scrollParent[0].offsetHeight-t.pageY<r.scrollSensitivity?n.scrollParent[0].scrollTop=i=n.scrollParent[0].scrollTop+r.scrollSpeed:t.pageY-n.overflowOffset.top<r.scrollSensitivity&&(n.scrollParent[0].scrollTop=i=n.scrollParent[0].scrollTop-r.scrollSpeed);if(!r.axis||r.axis!=="y")n.overflowOffset.left+n.scrollParent[0].offsetWidth-t.pageX<r.scrollSensitivity?n.scrollParent[0].scrollLeft=i=n.scrollParent[0].scrollLeft+r.scrollSpeed:t.pageX-n.overflowOffset.left<r.scrollSensitivity&&(n.scrollParent[0].scrollLeft=i=n.scrollParent[0].scrollLeft-r.scrollSpeed)}else{if(!r.axis||r.axis!=="x")t.pageY-e(document).scrollTop()<r.scrollSensitivity?i=e(document).scrollTop(e(document).scrollTop()-r.scrollSpeed):e(window).height()-(t.pageY-e(document).scrollTop())<r.scrollSensitivity&&(i=e(document).scrollTop(e(document).scrollTop()+r.scrollSpeed));if(!r.axis||r.axis!=="y")t.pageX-e(document).scrollLeft()<r.scrollSensitivity?i=e(document).scrollLeft(e(document).scrollLeft()-r.scrollSpeed):e(window).width()-(t.pageX-e(document).scrollLeft())<r.scrollSensitivity&&(i=e(document).scrollLeft(e(document).scrollLeft()+r.scrollSpeed))}i!==!1&&e.ui.ddmanager&&!r.dropBehaviour&&e.ui.ddmanager.prepareOffsets(n,t)}}),e.ui.plugin.add("draggable","snap",{start:function(){var t=e(this).data("ui-draggable"),n=t.options;t.snapElements=[],e(n.snap.constructor!==String?n.snap.items||":data(ui-draggable)":n.snap).each(function(){var n=e(this),r=n.offset();this!==t.element[0]&&t.snapElements.push({item:this,width:n.outerWidth(),height:n.outerHeight(),top:r.top,left:r.left})})},drag:function(t,n){var r,i,s,o,u,a,f,l,c,h,p=e(this).data("ui-draggable"),d=p.options,v=d.snapTolerance,m=n.offset.left,g=m+p.helperProportions.width,y=n.offset.top,b=y+p.helperProportions.height;for(c=p.snapElements.length-1;c>=0;c--){u=p.snapElements[c].left,a=u+p.snapElements[c].width,f=p.snapElements[c].top,l=f+p.snapElements[c].height;if(!(u-v<m&&m<a+v&&f-v<y&&y<l+v||u-v<m&&m<a+v&&f-v<b&&b<l+v||u-v<g&&g<a+v&&f-v<y&&y<l+v||u-v<g&&g<a+v&&f-v<b&&b<l+v)){p.snapElements[c].snapping&&p.options.snap.release&&p.options.snap.release.call(p.element,t,e.extend(p._uiHash(),{snapItem:p.snapElements[c].item})),p.snapElements[c].snapping=!1;continue}d.snapMode!=="inner"&&(r=Math.abs(f-b)<=v,i=Math.abs(l-y)<=v,s=Math.abs(u-g)<=v,o=Math.abs(a-m)<=v,r&&(n.position.top=p._convertPositionTo("relative",{top:f-p.helperProportions.height,left:0}).top-p.margins.top),i&&(n.position.top=p._convertPositionTo("relative",{top:l,left:0}).top-p.margins.top),s&&(n.position.left=p._convertPositionTo("relative",{top:0,left:u-p.helperProportions.width}).left-p.margins.left),o&&(n.position.left=p._convertPositionTo("relative",{top:0,left:a}).left-p.margins.left)),h=r||i||s||o,d.snapMode!=="outer"&&(r=Math.abs(f-y)<=v,i=Math.abs(l-b)<=v,s=Math.abs(u-m)<=v,o=Math.abs(a-g)<=v,r&&(n.position.top=p._convertPositionTo("relative",{top:f,left:0}).top-p.margins.top),i&&(n.position.top=p._convertPositionTo("relative",{top:l-p.helperProportions.height,left:0}).top-p.margins.top),s&&(n.position.left=p._convertPositionTo("relative",{top:0,left:u}).left-p.margins.left),o&&(n.position.left=p._convertPositionTo("relative",{top:0,left:a-p.helperProportions.width}).left-p.margins.left)),!p.snapElements[c].snapping&&(r||i||s||o||h)&&p.options.snap.snap&&p.options.snap.snap.call(p.element,t,e.extend(p._uiHash(),{snapItem:p.snapElements[c].item})),p.snapElements[c].snapping=r||i||s||o||h}}}),e.ui.plugin.add("draggable","stack",{start:function(){var t,n=e(this).data("ui-draggable").options,r=e.makeArray(e(n.stack)).sort(function(t,n){return(parseInt(e(t).css("zIndex"),10)||0)-(parseInt(e(n).css("zIndex"),10)||0)});if(!r.length)return;t=parseInt(r[0].style.zIndex,10)||0,e(r).each(function(e){this.style.zIndex=t+e}),this[0].style.zIndex=t+r.length}}),e.ui.plugin.add("draggable","zIndex",{start:function(t,n){var r=e(n.helper),i=e(this).data("ui-draggable").options;r.css("zIndex")&&(i._zIndex=r.css("zIndex")),r.css("zIndex",i.zIndex)},stop:function(t,n){var r=e(this).data("ui-draggable").options;r._zIndex&&e(n.helper).css("zIndex",r._zIndex)}})})(jQuery);(function(e,t){function n(e,t,n){return e>t&&e<t+n}e.widget("ui.droppable",{version:"1.10.0",widgetEventPrefix:"drop",options:{accept:"*",activeClass:!1,addClasses:!0,greedy:!1,hoverClass:!1,scope:"default",tolerance:"intersect",activate:null,deactivate:null,drop:null,out:null,over:null},_create:function(){var t=this.options,n=t.accept;this.isover=!1,this.isout=!0,this.accept=e.isFunction(n)?n:function(e){return e.is(n)},this.proportions={width:this.element[0].offsetWidth,height:this.element[0].offsetHeight},e.ui.ddmanager.droppables[t.scope]=e.ui.ddmanager.droppables[t.scope]||[],e.ui.ddmanager.droppables[t.scope].push(this),t.addClasses&&this.element.addClass("ui-droppable")},_destroy:function(){var t=0,n=e.ui.ddmanager.droppables[this.options.scope];for(;t<n.length;t++)n[t]===this&&n.splice(t,1);this.element.removeClass("ui-droppable ui-droppable-disabled")},_setOption:function(t,n){t==="accept"&&(this.accept=e.isFunction(n)?n:function(e){return e.is(n)}),e.Widget.prototype._setOption.apply(this,arguments)},_activate:function(t){var n=e.ui.ddmanager.current;this.options.activeClass&&this.element.addClass(this.options.activeClass),n&&this._trigger("activate",t,this.ui(n))},_deactivate:function(t){var n=e.ui.ddmanager.current;this.options.activeClass&&this.element.removeClass(this.options.activeClass),n&&this._trigger("deactivate",t,this.ui(n))},_over:function(t){var n=e.ui.ddmanager.current;if(!n||(n.currentItem||n.element)[0]===this.element[0])return;this.accept.call(this.element[0],n.currentItem||n.element)&&(this.options.hoverClass&&this.element.addClass(this.options.hoverClass),this._trigger("over",t,this.ui(n)))},_out:function(t){var n=e.ui.ddmanager.current;if(!n||(n.currentItem||n.element)[0]===this.element[0])return;this.accept.call(this.element[0],n.currentItem||n.element)&&(this.options.hoverClass&&this.element.removeClass(this.options.hoverClass),this._trigger("out",t,this.ui(n)))},_drop:function(t,n){var r=n||e.ui.ddmanager.current,i=!1;return!r||(r.currentItem||r.element)[0]===this.element[0]?!1:(this.element.find(":data(ui-droppable)").not(".ui-draggable-dragging").each(function(){var t=e.data(this,"ui-droppable");if(t.options.greedy&&!t.options.disabled&&t.options.scope===r.options.scope&&t.accept.call(t.element[0],r.currentItem||r.element)&&e.ui.intersect(r,e.extend(t,{offset:t.element.offset()}),t.options.tolerance))return i=!0,!1}),i?!1:this.accept.call(this.element[0],r.currentItem||r.element)?(this.options.activeClass&&this.element.removeClass(this.options.activeClass),this.options.hoverClass&&this.element.removeClass(this.options.hoverClass),this._trigger("drop",t,this.ui(r)),this.element):!1)},ui:function(e){return{draggable:e.currentItem||e.element,helper:e.helper,position:e.position,offset:e.positionAbs}}}),e.ui.intersect=function(e,t,r){if(!t.offset)return!1;var i,s,o=(e.positionAbs||e.position.absolute).left,u=o+e.helperProportions.width,a=(e.positionAbs||e.position.absolute).top,f=a+e.helperProportions.height,l=t.offset.left,c=l+t.proportions.width,h=t.offset.top,p=h+t.proportions.height;switch(r){case"fit":return l<=o&&u<=c&&h<=a&&f<=p;case"intersect":return l<o+e.helperProportions.width/2&&u-e.helperProportions.width/2<c&&h<a+e.helperProportions.height/2&&f-e.helperProportions.height/2<p;case"pointer":return i=(e.positionAbs||e.position.absolute).left+(e.clickOffset||e.offset.click).left,s=(e.positionAbs||e.position.absolute).top+(e.clickOffset||e.offset.click).top,n(s,h,t.proportions.height)&&n(i,l,t.proportions.width);case"touch":return(a>=h&&a<=p||f>=h&&f<=p||a<h&&f>p)&&(o>=l&&o<=c||u>=l&&u<=c||o<l&&u>c);default:return!1}},e.ui.ddmanager={current:null,droppables:{"default":[]},prepareOffsets:function(t,n){var r,i,s=e.ui.ddmanager.droppables[t.options.scope]||[],o=n?n.type:null,u=(t.currentItem||t.element).find(":data(ui-droppable)").addBack();e:for(r=0;r<s.length;r++){if(s[r].options.disabled||t&&!s[r].accept.call(s[r].element[0],t.currentItem||t.element))continue;for(i=0;i<u.length;i++)if(u[i]===s[r].element[0]){s[r].proportions.height=0;continue e}s[r].visible=s[r].element.css("display")!=="none";if(!s[r].visible)continue;o==="mousedown"&&s[r]._activate.call(s[r],n),s[r].offset=s[r].element.offset(),s[r].proportions={width:s[r].element[0].offsetWidth,height:s[r].element[0].offsetHeight}}},drop:function(t,n){var r=!1;return e.each(e.ui.ddmanager.droppables[t.options.scope]||[],function(){if(!this.options)return;!this.options.disabled&&this.visible&&e.ui.intersect(t,this,this.options.tolerance)&&(r=this._drop.call(this,n)||r),!this.options.disabled&&this.visible&&this.accept.call(this.element[0],t.currentItem||t.element)&&(this.isout=!0,this.isover=!1,this._deactivate.call(this,n))}),r},dragStart:function(t,n){t.element.parentsUntil("body").bind("scroll.droppable",function(){t.options.refreshPositions||e.ui.ddmanager.prepareOffsets(t,n)})},drag:function(t,n){t.options.refreshPositions&&e.ui.ddmanager.prepareOffsets(t,n),e.each(e.ui.ddmanager.droppables[t.options.scope]||[],function(){if(this.options.disabled||this.greedyChild||!this.visible)return;var r,i,s,o=e.ui.intersect(t,this,this.options.tolerance),u=!o&&this.isover?"isout":o&&!this.isover?"isover":null;if(!u)return;this.options.greedy&&(i=this.options.scope,s=this.element.parents(":data(ui-droppable)").filter(function(){return e.data(this,"ui-droppable").options.scope===i}),s.length&&(r=e.data(s[0],"ui-droppable"),r.greedyChild=u==="isover")),r&&u==="isover"&&(r.isover=!1,r.isout=!0,r._out.call(r,n)),this[u]=!0,this[u==="isout"?"isover":"isout"]=!1,this[u==="isover"?"_over":"_out"].call(this,n),r&&u==="isout"&&(r.isout=!1,r.isover=!0,r._over.call(r,n))})},dragStop:function(t,n){t.element.parentsUntil("body").unbind("scroll.droppable"),t.options.refreshPositions||e.ui.ddmanager.prepareOffsets(t,n)}}})(jQuery);(function(e,t){function n(e){return parseInt(e,10)||0}function r(e){return!isNaN(parseInt(e,10))}e.widget("ui.resizable",e.ui.mouse,{version:"1.10.0",widgetEventPrefix:"resize",options:{alsoResize:!1,animate:!1,animateDuration:"slow",animateEasing:"swing",aspectRatio:!1,autoHide:!1,containment:!1,ghost:!1,grid:!1,handles:"e,s,se",helper:!1,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:90,resize:null,start:null,stop:null},_create:function(){var t,n,r,i,s,o=this,u=this.options;this.element.addClass("ui-resizable"),e.extend(this,{_aspectRatio:!!u.aspectRatio,aspectRatio:u.aspectRatio,originalElement:this.element,_proportionallyResizeElements:[],_helper:u.helper||u.ghost||u.animate?u.helper||"ui-resizable-helper":null}),this.element[0].nodeName.match(/canvas|textarea|input|select|button|img/i)&&(this.element.wrap(e("<div class='ui-wrapper' style='overflow: hidden;'></div>").css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),top:this.element.css("top"),left:this.element.css("left")})),this.element=this.element.parent().data("ui-resizable",this.element.data("ui-resizable")),this.elementIsWrapper=!0,this.element.css({marginLeft:this.originalElement.css("marginLeft"),marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom")}),this.originalElement.css({marginLeft:0,marginTop:0,marginRight:0,marginBottom:0}),this.originalResizeStyle=this.originalElement.css("resize"),this.originalElement.css("resize","none"),this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"})),this.originalElement.css({margin:this.originalElement.css("margin")}),this._proportionallyResize()),this.handles=u.handles||(e(".ui-resizable-handle",this.element).length?{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",nw:".ui-resizable-nw"}:"e,s,se");if(this.handles.constructor===String){this.handles==="all"&&(this.handles="n,e,s,w,se,sw,ne,nw"),t=this.handles.split(","),this.handles={};for(n=0;n<t.length;n++)r=e.trim(t[n]),s="ui-resizable-"+r,i=e("<div class='ui-resizable-handle "+s+"'></div>"),i.css({zIndex:u.zIndex}),"se"===r&&i.addClass("ui-icon ui-icon-gripsmall-diagonal-se"),this.handles[r]=".ui-resizable-"+r,this.element.append(i)}this._renderAxis=function(t){var n,r,i,s;t=t||this.element;for(n in this.handles){this.handles[n].constructor===String&&(this.handles[n]=e(this.handles[n],this.element).show()),this.elementIsWrapper&&this.originalElement[0].nodeName.match(/textarea|input|select|button/i)&&(r=e(this.handles[n],this.element),s=/sw|ne|nw|se|n|s/.test(n)?r.outerHeight():r.outerWidth(),i=["padding",/ne|nw|n/.test(n)?"Top":/se|sw|s/.test(n)?"Bottom":/^e$/.test(n)?"Right":"Left"].join(""),t.css(i,s),this._proportionallyResize());if(!e(this.handles[n]).length)continue}},this._renderAxis(this.element),this._handles=e(".ui-resizable-handle",this.element).disableSelection(),this._handles.mouseover(function(){o.resizing||(this.className&&(i=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i)),o.axis=i&&i[1]?i[1]:"se")}),u.autoHide&&(this._handles.hide(),e(this.element).addClass("ui-resizable-autohide").mouseenter(function(){if(u.disabled)return;e(this).removeClass("ui-resizable-autohide"),o._handles.show()}).mouseleave(function(){if(u.disabled)return;o.resizing||(e(this).addClass("ui-resizable-autohide"),o._handles.hide())})),this._mouseInit()},_destroy:function(){this._mouseDestroy();var t,n=function(t){e(t).removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing").removeData("resizable").removeData("ui-resizable").unbind(".resizable").find(".ui-resizable-handle").remove()};return this.elementIsWrapper&&(n(this.element),t=this.element,this.originalElement.css({position:t.css("position"),width:t.outerWidth(),height:t.outerHeight(),top:t.css("top"),left:t.css("left")}).insertAfter(t),t.remove()),this.originalElement.css("resize",this.originalResizeStyle),n(this.originalElement),this},_mouseCapture:function(t){var n,r,i=!1;for(n in this.handles){r=e(this.handles[n])[0];if(r===t.target||e.contains(r,t.target))i=!0}return!this.options.disabled&&i},_mouseStart:function(t){var r,i,s,o=this.options,u=this.element.position(),a=this.element;return this.resizing=!0,/absolute/.test(a.css("position"))?a.css({position:"absolute",top:a.css("top"),left:a.css("left")}):a.is(".ui-draggable")&&a.css({position:"absolute",top:u.top,left:u.left}),this._renderProxy(),r=n(this.helper.css("left")),i=n(this.helper.css("top")),o.containment&&(r+=e(o.containment).scrollLeft()||0,i+=e(o.containment).scrollTop()||0),this.offset=this.helper.offset(),this.position={left:r,top:i},this.size=this._helper?{width:a.outerWidth(),height:a.outerHeight()}:{width:a.width(),height:a.height()},this.originalSize=this._helper?{width:a.outerWidth(),height:a.outerHeight()}:{width:a.width(),height:a.height()},this.originalPosition={left:r,top:i},this.sizeDiff={width:a.outerWidth()-a.width(),height:a.outerHeight()-a.height()},this.originalMousePosition={left:t.pageX,top:t.pageY},this.aspectRatio=typeof o.aspectRatio=="number"?o.aspectRatio:this.originalSize.width/this.originalSize.height||1,s=e(".ui-resizable-"+this.axis).css("cursor"),e("body").css("cursor",s==="auto"?this.axis+"-resize":s),a.addClass("ui-resizable-resizing"),this._propagate("start",t),!0},_mouseDrag:function(t){var n,r=this.helper,i={},s=this.originalMousePosition,o=this.axis,u=this.position.top,a=this.position.left,f=this.size.width,l=this.size.height,c=t.pageX-s.left||0,h=t.pageY-s.top||0,p=this._change[o];if(!p)return!1;n=p.apply(this,[t,c,h]),this._updateVirtualBoundaries(t.shiftKey);if(this._aspectRatio||t.shiftKey)n=this._updateRatio(n,t);return n=this._respectSize(n,t),this._updateCache(n),this._propagate("resize",t),this.position.top!==u&&(i.top=this.position.top+"px"),this.position.left!==a&&(i.left=this.position.left+"px"),this.size.width!==f&&(i.width=this.size.width+"px"),this.size.height!==l&&(i.height=this.size.height+"px"),r.css(i),!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize(),e.isEmptyObject(i)||this._trigger("resize",t,this.ui()),!1},_mouseStop:function(t){this.resizing=!1;var n,r,i,s,o,u,a,f=this.options,l=this;return this._helper&&(n=this._proportionallyResizeElements,r=n.length&&/textarea/i.test(n[0].nodeName),i=r&&e.ui.hasScroll(n[0],"left")?0:l.sizeDiff.height,s=r?0:l.sizeDiff.width,o={width:l.helper.width()-s,height:l.helper.height()-i},u=parseInt(l.element.css("left"),10)+(l.position.left-l.originalPosition.left)||null,a=parseInt(l.element.css("top"),10)+(l.position.top-l.originalPosition.top)||null,f.animate||this.element.css(e.extend(o,{top:a,left:u})),l.helper.height(l.size.height),l.helper.width(l.size.width),this._helper&&!f.animate&&this._proportionallyResize()),e("body").css("cursor","auto"),this.element.removeClass("ui-resizable-resizing"),this._propagate("stop",t),this._helper&&this.helper.remove(),!1},_updateVirtualBoundaries:function(e){var t,n,i,s,o,u=this.options;o={minWidth:r(u.minWidth)?u.minWidth:0,maxWidth:r(u.maxWidth)?u.maxWidth:Infinity,minHeight:r(u.minHeight)?u.minHeight:0,maxHeight:r(u.maxHeight)?u.maxHeight:Infinity};if(this._aspectRatio||e)t=o.minHeight*this.aspectRatio,i=o.minWidth/this.aspectRatio,n=o.maxHeight*this.aspectRatio,s=o.maxWidth/this.aspectRatio,t>o.minWidth&&(o.minWidth=t),i>o.minHeight&&(o.minHeight=i),n<o.maxWidth&&(o.maxWidth=n),s<o.maxHeight&&(o.maxHeight=s);this._vBoundaries=o},_updateCache:function(e){this.offset=this.helper.offset(),r(e.left)&&(this.position.left=e.left),r(e.top)&&(this.position.top=e.top),r(e.height)&&(this.size.height=e.height),r(e.width)&&(this.size.width=e.width)},_updateRatio:function(e){var t=this.position,n=this.size,i=this.axis;return r(e.height)?e.width=e.height*this.aspectRatio:r(e.width)&&(e.height=e.width/this.aspectRatio),i==="sw"&&(e.left=t.left+(n.width-e.width),e.top=null),i==="nw"&&(e.top=t.top+(n.height-e.height),e.left=t.left+(n.width-e.width)),e},_respectSize:function(e){var t=this._vBoundaries,n=this.axis,i=r(e.width)&&t.maxWidth&&t.maxWidth<e.width,s=r(e.height)&&t.maxHeight&&t.maxHeight<e.height,o=r(e.width)&&t.minWidth&&t.minWidth>e.width,u=r(e.height)&&t.minHeight&&t.minHeight>e.height,a=this.originalPosition.left+this.originalSize.width,f=this.position.top+this.size.height,l=/sw|nw|w/.test(n),c=/nw|ne|n/.test(n);return o&&(e.width=t.minWidth),u&&(e.height=t.minHeight),i&&(e.width=t.maxWidth),s&&(e.height=t.maxHeight),o&&l&&(e.left=a-t.minWidth),i&&l&&(e.left=a-t.maxWidth),u&&c&&(e.top=f-t.minHeight),s&&c&&(e.top=f-t.maxHeight),!e.width&&!e.height&&!e.left&&e.top?e.top=null:!e.width&&!e.height&&!e.top&&e.left&&(e.left=null),e},_proportionallyResize:function(){if(!this._proportionallyResizeElements.length)return;var e,t,n,r,i,s=this.helper||this.element;for(e=0;e<this._proportionallyResizeElements.length;e++){i=this._proportionallyResizeElements[e];if(!this.borderDif){this.borderDif=[],n=[i.css("borderTopWidth"),i.css("borderRightWidth"),i.css("borderBottomWidth"),i.css("borderLeftWidth")],r=[i.css("paddingTop"),i.css("paddingRight"),i.css("paddingBottom"),i.css("paddingLeft")];for(t=0;t<n.length;t++)this.borderDif[t]=(parseInt(n[t],10)||0)+(parseInt(r[t],10)||0)}i.css({height:s.height()-this.borderDif[0]-this.borderDif[2]||0,width:s.width()-this.borderDif[1]-this.borderDif[3]||0})}},_renderProxy:function(){var t=this.element,n=this.options;this.elementOffset=t.offset(),this._helper?(this.helper=this.helper||e("<div style='overflow:hidden;'></div>"),this.helper.addClass(this._helper).css({width:this.element.outerWidth()-1,height:this.element.outerHeight()-1,position:"absolute",left:this.elementOffset.left+"px",top:this.elementOffset.top+"px",zIndex:++n.zIndex}),this.helper.appendTo("body").disableSelection()):this.helper=this.element},_change:{e:function(e,t){return{width:this.originalSize.width+t}},w:function(e,t){var n=this.originalSize,r=this.originalPosition;return{left:r.left+t,width:n.width-t}},n:function(e,t,n){var r=this.originalSize,i=this.originalPosition;return{top:i.top+n,height:r.height-n}},s:function(e,t,n){return{height:this.originalSize.height+n}},se:function(t,n,r){return e.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[t,n,r]))},sw:function(t,n,r){return e.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[t,n,r]))},ne:function(t,n,r){return e.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[t,n,r]))},nw:function(t,n,r){return e.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[t,n,r]))}},_propagate:function(t,n){e.ui.plugin.call(this,t,[n,this.ui()]),t!=="resize"&&this._trigger(t,n,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}}),e.ui.plugin.add("resizable","animate",{stop:function(t){var n=e(this).data("ui-resizable"),r=n.options,i=n._proportionallyResizeElements,s=i.length&&/textarea/i.test(i[0].nodeName),o=s&&e.ui.hasScroll(i[0],"left")?0:n.sizeDiff.height,u=s?0:n.sizeDiff.width,a={width:n.size.width-u,height:n.size.height-o},f=parseInt(n.element.css("left"),10)+(n.position.left-n.originalPosition.left)||null,l=parseInt(n.element.css("top"),10)+(n.position.top-n.originalPosition.top)||null;n.element.animate(e.extend(a,l&&f?{top:l,left:f}:{}),{duration:r.animateDuration,easing:r.animateEasing,step:function(){var r={width:parseInt(n.element.css("width"),10),height:parseInt(n.element.css("height"),10),top:parseInt(n.element.css("top"),10),left:parseInt(n.element.css("left"),10)};i&&i.length&&e(i[0]).css({width:r.width,height:r.height}),n._updateCache(r),n._propagate("resize",t)}})}}),e.ui.plugin.add("resizable","containment",{start:function(){var t,r,i,s,o,u,a,f=e(this).data("ui-resizable"),l=f.options,c=f.element,h=l.containment,p=h instanceof e?h.get(0):/parent/.test(h)?c.parent().get(0):h;if(!p)return;f.containerElement=e(p),/document/.test(h)||h===document?(f.containerOffset={left:0,top:0},f.containerPosition={left:0,top:0},f.parentData={element:e(document),left:0,top:0,width:e(document).width(),height:e(document).height()||document.body.parentNode.scrollHeight}):(t=e(p),r=[],e(["Top","Right","Left","Bottom"]).each(function(e,i){r[e]=n(t.css("padding"+i))}),f.containerOffset=t.offset(),f.containerPosition=t.position(),f.containerSize={height:t.innerHeight()-r[3],width:t.innerWidth()-r[1]},i=f.containerOffset,s=f.containerSize.height,o=f.containerSize.width,u=e.ui.hasScroll(p,"left")?p.scrollWidth:o,a=e.ui.hasScroll(p)?p.scrollHeight:s,f.parentData={element:p,left:i.left,top:i.top,width:u,height:a})},resize:function(t){var n,r,i,s,o=e(this).data("ui-resizable"),u=o.options,a=o.containerOffset,f=o.position,l=o._aspectRatio||t.shiftKey,c={top:0,left:0},h=o.containerElement;h[0]!==document&&/static/.test(h.css("position"))&&(c=a),f.left<(o._helper?a.left:0)&&(o.size.width=o.size.width+(o._helper?o.position.left-a.left:o.position.left-c.left),l&&(o.size.height=o.size.width/o.aspectRatio),o.position.left=u.helper?a.left:0),f.top<(o._helper?a.top:0)&&(o.size.height=o.size.height+(o._helper?o.position.top-a.top:o.position.top),l&&(o.size.width=o.size.height*o.aspectRatio),o.position.top=o._helper?a.top:0),o.offset.left=o.parentData.left+o.position.left,o.offset.top=o.parentData.top+o.position.top,n=Math.abs((o._helper?o.offset.left-c.left:o.offset.left-c.left)+o.sizeDiff.width),r=Math.abs((o._helper?o.offset.top-c.top:o.offset.top-a.top)+o.sizeDiff.height),i=o.containerElement.get(0)===o.element.parent().get(0),s=/relative|absolute/.test(o.containerElement.css("position")),i&&s&&(n-=o.parentData.left),n+o.size.width>=o.parentData.width&&(o.size.width=o.parentData.width-n,l&&(o.size.height=o.size.width/o.aspectRatio)),r+o.size.height>=o.parentData.height&&(o.size.height=o.parentData.height-r,l&&(o.size.width=o.size.height*o.aspectRatio))},stop:function(){var t=e(this).data("ui-resizable"),n=t.options,r=t.containerOffset,i=t.containerPosition,s=t.containerElement,o=e(t.helper),u=o.offset(),a=o.outerWidth()-t.sizeDiff.width,f=o.outerHeight()-t.sizeDiff.height;t._helper&&!n.animate&&/relative/.test(s.css("position"))&&e(this).css({left:u.left-i.left-r.left,width:a,height:f}),t._helper&&!n.animate&&/static/.test(s.css("position"))&&e(this).css({left:u.left-i.left-r.left,width:a,height:f})}}),e.ui.plugin.add("resizable","alsoResize",{start:function(){var t=e(this).data("ui-resizable"),n=t.options,r=function(t){e(t).each(function(){var t=e(this);t.data("ui-resizable-alsoresize",{width:parseInt(t.width(),10),height:parseInt(t.height(),10),left:parseInt(t.css("left"),10),top:parseInt(t.css("top"),10)})})};typeof n.alsoResize=="object"&&!n.alsoResize.parentNode?n.alsoResize.length?(n.alsoResize=n.alsoResize[0],r(n.alsoResize)):e.each(n.alsoResize,function(e){r(e)}):r(n.alsoResize)},resize:function(t,n){var r=e(this).data("ui-resizable"),i=r.options,s=r.originalSize,o=r.originalPosition,u={height:r.size.height-s.height||0,width:r.size.width-s.width||0,top:r.position.top-o.top||0,left:r.position.left-o.left||0},a=function(t,r){e(t).each(function(){var t=e(this),i=e(this).data("ui-resizable-alsoresize"),s={},o=r&&r.length?r:t.parents(n.originalElement[0]).length?["width","height"]:["width","height","top","left"];e.each(o,function(e,t){var n=(i[t]||0)+(u[t]||0);n&&n>=0&&(s[t]=n||null)}),t.css(s)})};typeof i.alsoResize=="object"&&!i.alsoResize.nodeType?e.each(i.alsoResize,function(e,t){a(e,t)}):a(i.alsoResize)},stop:function(){e(this).removeData("resizable-alsoresize")}}),e.ui.plugin.add("resizable","ghost",{start:function(){var t=e(this).data("ui-resizable"),n=t.options,r=t.size;t.ghost=t.originalElement.clone(),t.ghost.css({opacity:.25,display:"block",position:"relative",height:r.height,width:r.width,margin:0,left:0,top:0}).addClass("ui-resizable-ghost").addClass(typeof n.ghost=="string"?n.ghost:""),t.ghost.appendTo(t.helper)},resize:function(){var t=e(this).data("ui-resizable");t.ghost&&t.ghost.css({position:"relative",height:t.size.height,width:t.size.width})},stop:function(){var t=e(this).data("ui-resizable");t.ghost&&t.helper&&t.helper.get(0).removeChild(t.ghost.get(0))}}),e.ui.plugin.add("resizable","grid",{resize:function(){var t=e(this).data("ui-resizable"),n=t.options,r=t.size,i=t.originalSize,s=t.originalPosition,o=t.axis,u=typeof n.grid=="number"?[n.grid,n.grid]:n.grid,a=u[0]||1,f=u[1]||1,l=Math.round((r.width-i.width)/a)*a,c=Math.round((r.height-i.height)/f)*f,h=i.width+l,p=i.height+c,d=n.maxWidth&&n.maxWidth<h,v=n.maxHeight&&n.maxHeight<p,m=n.minWidth&&n.minWidth>h,g=n.minHeight&&n.minHeight>p;n.grid=u,m&&(h+=a),g&&(p+=f),d&&(h-=a),v&&(p-=f),/^(se|s|e)$/.test(o)?(t.size.width=h,t.size.height=p):/^(ne)$/.test(o)?(t.size.width=h,t.size.height=p,t.position.top=s.top-c):/^(sw)$/.test(o)?(t.size.width=h,t.size.height=p,t.position.left=s.left-l):(t.size.width=h,t.size.height=p,t.position.top=s.top-c,t.position.left=s.left-l)}})})(jQuery);(function(e,t){e.widget("ui.selectable",e.ui.mouse,{version:"1.10.0",options:{appendTo:"body",autoRefresh:!0,distance:0,filter:"*",tolerance:"touch",selected:null,selecting:null,start:null,stop:null,unselected:null,unselecting:null},_create:function(){var t,n=this;this.element.addClass("ui-selectable"),this.dragged=!1,this.refresh=function(){t=e(n.options.filter,n.element[0]),t.addClass("ui-selectee"),t.each(function(){var t=e(this),n=t.offset();e.data(this,"selectable-item",{element:this,$element:t,left:n.left,top:n.top,right:n.left+t.outerWidth(),bottom:n.top+t.outerHeight(),startselected:!1,selected:t.hasClass("ui-selected"),selecting:t.hasClass("ui-selecting"),unselecting:t.hasClass("ui-unselecting")})})},this.refresh(),this.selectees=t.addClass("ui-selectee"),this._mouseInit(),this.helper=e("<div class='ui-selectable-helper'></div>")},_destroy:function(){this.selectees.removeClass("ui-selectee").removeData("selectable-item"),this.element.removeClass("ui-selectable ui-selectable-disabled"),this._mouseDestroy()},_mouseStart:function(t){var n=this,r=this.options;this.opos=[t.pageX,t.pageY];if(this.options.disabled)return;this.selectees=e(r.filter,this.element[0]),this._trigger("start",t),e(r.appendTo).append(this.helper),this.helper.css({left:t.pageX,top:t.pageY,width:0,height:0}),r.autoRefresh&&this.refresh(),this.selectees.filter(".ui-selected").each(function(){var r=e.data(this,"selectable-item");r.startselected=!0,!t.metaKey&&!t.ctrlKey&&(r.$element.removeClass("ui-selected"),r.selected=!1,r.$element.addClass("ui-unselecting"),r.unselecting=!0,n._trigger("unselecting",t,{unselecting:r.element}))}),e(t.target).parents().addBack().each(function(){var r,i=e.data(this,"selectable-item");if(i)return r=!t.metaKey&&!t.ctrlKey||!i.$element.hasClass("ui-selected"),i.$element.removeClass(r?"ui-unselecting":"ui-selected").addClass(r?"ui-selecting":"ui-unselecting"),i.unselecting=!r,i.selecting=r,i.selected=r,r?n._trigger("selecting",t,{selecting:i.element}):n._trigger("unselecting",t,{unselecting:i.element}),!1})},_mouseDrag:function(t){this.dragged=!0;if(this.options.disabled)return;var n,r=this,i=this.options,s=this.opos[0],o=this.opos[1],u=t.pageX,a=t.pageY;return s>u&&(n=u,u=s,s=n),o>a&&(n=a,a=o,o=n),this.helper.css({left:s,top:o,width:u-s,height:a-o}),this.selectees.each(function(){var n=e.data(this,"selectable-item"),f=!1;if(!n||n.element===r.element[0])return;i.tolerance==="touch"?f=!(n.left>u||n.right<s||n.top>a||n.bottom<o):i.tolerance==="fit"&&(f=n.left>s&&n.right<u&&n.top>o&&n.bottom<a),f?(n.selected&&(n.$element.removeClass("ui-selected"),n.selected=!1),n.unselecting&&(n.$element.removeClass("ui-unselecting"),n.unselecting=!1),n.selecting||(n.$element.addClass("ui-selecting"),n.selecting=!0,r._trigger("selecting",t,{selecting:n.element}))):(n.selecting&&((t.metaKey||t.ctrlKey)&&n.startselected?(n.$element.removeClass("ui-selecting"),n.selecting=!1,n.$element.addClass("ui-selected"),n.selected=!0):(n.$element.removeClass("ui-selecting"),n.selecting=!1,n.startselected&&(n.$element.addClass("ui-unselecting"),n.unselecting=!0),r._trigger("unselecting",t,{unselecting:n.element}))),n.selected&&!t.metaKey&&!t.ctrlKey&&!n.startselected&&(n.$element.removeClass("ui-selected"),n.selected=!1,n.$element.addClass("ui-unselecting"),n.unselecting=!0,r._trigger("unselecting",t,{unselecting:n.element})))}),!1},_mouseStop:function(t){var n=this;return this.dragged=!1,e(".ui-unselecting",this.element[0]).each(function(){var r=e.data(this,"selectable-item");r.$element.removeClass("ui-unselecting"),r.unselecting=!1,r.startselected=!1,n._trigger("unselected",t,{unselected:r.element})}),e(".ui-selecting",this.element[0]).each(function(){var r=e.data(this,"selectable-item");r.$element.removeClass("ui-selecting").addClass("ui-selected"),r.selecting=!1,r.selected=!0,r.startselected=!0,n._trigger("selected",t,{selected:r.element})}),this._trigger("stop",t),this.helper.remove(),!1}})})(jQuery);(function(e,t){function n(e,t,n){return e>t&&e<t+n}e.widget("ui.sortable",e.ui.mouse,{version:"1.10.0",widgetEventPrefix:"sort",ready:!1,options:{appendTo:"parent",axis:!1,connectWith:!1,containment:!1,cursor:"auto",cursorAt:!1,dropOnEmpty:!0,forcePlaceholderSize:!1,forceHelperSize:!1,grid:!1,handle:!1,helper:"original",items:"> *",opacity:!1,placeholder:!1,revert:!1,scroll:!0,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1e3,activate:null,beforeStop:null,change:null,deactivate:null,out:null,over:null,receive:null,remove:null,sort:null,start:null,stop:null,update:null},_create:function(){var e=this.options;this.containerCache={},this.element.addClass("ui-sortable"),this.refresh(),this.floating=this.items.length?e.axis==="x"||/left|right/.test(this.items[0].item.css("float"))||/inline|table-cell/.test(this.items[0].item.css("display")):!1,this.offset=this.element.offset(),this._mouseInit(),this.ready=!0},_destroy:function(){this.element.removeClass("ui-sortable ui-sortable-disabled"),this._mouseDestroy();for(var e=this.items.length-1;e>=0;e--)this.items[e].item.removeData(this.widgetName+"-item");return this},_setOption:function(t,n){t==="disabled"?(this.options[t]=n,this.widget().toggleClass("ui-sortable-disabled",!!n)):e.Widget.prototype._setOption.apply(this,arguments)},_mouseCapture:function(t,n){var r=null,i=!1,s=this;if(this.reverting)return!1;if(this.options.disabled||this.options.type==="static")return!1;this._refreshItems(t),e(t.target).parents().each(function(){if(e.data(this,s.widgetName+"-item")===s)return r=e(this),!1}),e.data(t.target,s.widgetName+"-item")===s&&(r=e(t.target));if(!r)return!1;if(this.options.handle&&!n){e(this.options.handle,r).find("*").addBack().each(function(){this===t.target&&(i=!0)});if(!i)return!1}return this.currentItem=r,this._removeCurrentsFromItems(),!0},_mouseStart:function(t,n,r){var i,s=this.options;this.currentContainer=this,this.refreshPositions(),this.helper=this._createHelper(t),this._cacheHelperProportions(),this._cacheMargins(),this.scrollParent=this.helper.scrollParent(),this.offset=this.currentItem.offset(),this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left},e.extend(this.offset,{click:{left:t.pageX-this.offset.left,top:t.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()}),this.helper.css("position","absolute"),this.cssPosition=this.helper.css("position"),this.originalPosition=this._generatePosition(t),this.originalPageX=t.pageX,this.originalPageY=t.pageY,s.cursorAt&&this._adjustOffsetFromHelper(s.cursorAt),this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]},this.helper[0]!==this.currentItem[0]&&this.currentItem.hide(),this._createPlaceholder(),s.containment&&this._setContainment(),s.cursor&&(e("body").css("cursor")&&(this._storedCursor=e("body").css("cursor")),e("body").css("cursor",s.cursor)),s.opacity&&(this.helper.css("opacity")&&(this._storedOpacity=this.helper.css("opacity")),this.helper.css("opacity",s.opacity)),s.zIndex&&(this.helper.css("zIndex")&&(this._storedZIndex=this.helper.css("zIndex")),this.helper.css("zIndex",s.zIndex)),this.scrollParent[0]!==document&&this.scrollParent[0].tagName!=="HTML"&&(this.overflowOffset=this.scrollParent.offset()),this._trigger("start",t,this._uiHash()),this._preserveHelperProportions||this._cacheHelperProportions();if(!r)for(i=this.containers.length-1;i>=0;i--)this.containers[i]._trigger("activate",t,this._uiHash(this));return e.ui.ddmanager&&(e.ui.ddmanager.current=this),e.ui.ddmanager&&!s.dropBehaviour&&e.ui.ddmanager.prepareOffsets(this,t),this.dragging=!0,this.helper.addClass("ui-sortable-helper"),this._mouseDrag(t),!0},_mouseDrag:function(t){var n,r,i,s,o=this.options,u=!1;this.position=this._generatePosition(t),this.positionAbs=this._convertPositionTo("absolute"),this.lastPositionAbs||(this.lastPositionAbs=this.positionAbs),this.options.scroll&&(this.scrollParent[0]!==document&&this.scrollParent[0].tagName!=="HTML"?(this.overflowOffset.top+this.scrollParent[0].offsetHeight-t.pageY<o.scrollSensitivity?this.scrollParent[0].scrollTop=u=this.scrollParent[0].scrollTop+o.scrollSpeed:t.pageY-this.overflowOffset.top<o.scrollSensitivity&&(this.scrollParent[0].scrollTop=u=this.scrollParent[0].scrollTop-o.scrollSpeed),this.overflowOffset.left+this.scrollParent[0].offsetWidth-t.pageX<o.scrollSensitivity?this.scrollParent[0].scrollLeft=u=this.scrollParent[0].scrollLeft+o.scrollSpeed:t.pageX-this.overflowOffset.left<o.scrollSensitivity&&(this.scrollParent[0].scrollLeft=u=this.scrollParent[0].scrollLeft-o.scrollSpeed)):(t.pageY-e(document).scrollTop()<o.scrollSensitivity?u=e(document).scrollTop(e(document).scrollTop()-o.scrollSpeed):e(window).height()-(t.pageY-e(document).scrollTop())<o.scrollSensitivity&&(u=e(document).scrollTop(e(document).scrollTop()+o.scrollSpeed)),t.pageX-e(document).scrollLeft()<o.scrollSensitivity?u=e(document).scrollLeft(e(document).scrollLeft()-o.scrollSpeed):e(window).width()-(t.pageX-e(document).scrollLeft())<o.scrollSensitivity&&(u=e(document).scrollLeft(e(document).scrollLeft()+o.scrollSpeed))),u!==!1&&e.ui.ddmanager&&!o.dropBehaviour&&e.ui.ddmanager.prepareOffsets(this,t)),this.positionAbs=this._convertPositionTo("absolute");if(!this.options.axis||this.options.axis!=="y")this.helper[0].style.left=this.position.left+"px";if(!this.options.axis||this.options.axis!=="x")this.helper[0].style.top=this.position.top+"px";for(n=this.items.length-1;n>=0;n--){r=this.items[n],i=r.item[0],s=this._intersectsWithPointer(r);if(!s)continue;if(r.instance!==this.currentContainer)continue;if(i!==this.currentItem[0]&&this.placeholder[s===1?"next":"prev"]()[0]!==i&&!e.contains(this.placeholder[0],i)&&(this.options.type==="semi-dynamic"?!e.contains(this.element[0],i):!0)){this.direction=s===1?"down":"up";if(this.options.tolerance!=="pointer"&&!this._intersectsWithSides(r))break;this._rearrange(t,r),this._trigger("change",t,this._uiHash());break}}return this._contactContainers(t),e.ui.ddmanager&&e.ui.ddmanager.drag(this,t),this._trigger("sort",t,this._uiHash()),this.lastPositionAbs=this.positionAbs,!1},_mouseStop:function(t,n){if(!t)return;e.ui.ddmanager&&!this.options.dropBehaviour&&e.ui.ddmanager.drop(this,t);if(this.options.revert){var r=this,i=this.placeholder.offset();this.reverting=!0,e(this.helper).animate({left:i.left-this.offset.parent.left-this.margins.left+(this.offsetParent[0]===document.body?0:this.offsetParent[0].scrollLeft),top:i.top-this.offset.parent.top-this.margins.top+(this.offsetParent[0]===document.body?0:this.offsetParent[0].scrollTop)},parseInt(this.options.revert,10)||500,function(){r._clear(t)})}else this._clear(t,n);return!1},cancel:function(){if(this.dragging){this._mouseUp({target:null}),this.options.helper==="original"?this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper"):this.currentItem.show();for(var t=this.containers.length-1;t>=0;t--)this.containers[t]._trigger("deactivate",null,this._uiHash(this)),this.containers[t].containerCache.over&&(this.containers[t]._trigger("out",null,this._uiHash(this)),this.containers[t].containerCache.over=0)}return this.placeholder&&(this.placeholder[0].parentNode&&this.placeholder[0].parentNode.removeChild(this.placeholder[0]),this.options.helper!=="original"&&this.helper&&this.helper[0].parentNode&&this.helper.remove(),e.extend(this,{helper:null,dragging:!1,reverting:!1,_noFinalSort:null}),this.domPosition.prev?e(this.domPosition.prev).after(this.currentItem):e(this.domPosition.parent).prepend(this.currentItem)),this},serialize:function(t){var n=this._getItemsAsjQuery(t&&t.connected),r=[];return t=t||{},e(n).each(function(){var n=(e(t.item||this).attr(t.attribute||"id")||"").match(t.expression||/(.+)[\-=_](.+)/);n&&r.push((t.key||n[1]+"[]")+"="+(t.key&&t.expression?n[1]:n[2]))}),!r.length&&t.key&&r.push(t.key+"="),r.join("&")},toArray:function(t){var n=this._getItemsAsjQuery(t&&t.connected),r=[];return t=t||{},n.each(function(){r.push(e(t.item||this).attr(t.attribute||"id")||"")}),r},_intersectsWith:function(e){var t=this.positionAbs.left,n=t+this.helperProportions.width,r=this.positionAbs.top,i=r+this.helperProportions.height,s=e.left,o=s+e.width,u=e.top,a=u+e.height,f=this.offset.click.top,l=this.offset.click.left,c=r+f>u&&r+f<a&&t+l>s&&t+l<o;return this.options.tolerance==="pointer"||this.options.forcePointerForContainers||this.options.tolerance!=="pointer"&&this.helperProportions[this.floating?"width":"height"]>e[this.floating?"width":"height"]?c:s<t+this.helperProportions.width/2&&n-this.helperProportions.width/2<o&&u<r+this.helperProportions.height/2&&i-this.helperProportions.height/2<a},_intersectsWithPointer:function(e){var t=this.options.axis==="x"||n(this.positionAbs.top+this.offset.click.top,e.top,e.height),r=this.options.axis==="y"||n(this.positionAbs.left+this.offset.click.left,e.left,e.width),i=t&&r,s=this._getDragVerticalDirection(),o=this._getDragHorizontalDirection();return i?this.floating?o&&o==="right"||s==="down"?2:1:s&&(s==="down"?2:1):!1},_intersectsWithSides:function(e){var t=n(this.positionAbs.top+this.offset.click.top,e.top+e.height/2,e.height),r=n(this.positionAbs.left+this.offset.click.left,e.left+e.width/2,e.width),i=this._getDragVerticalDirection(),s=this._getDragHorizontalDirection();return this.floating&&s?s==="right"&&r||s==="left"&&!r:i&&(i==="down"&&t||i==="up"&&!t)},_getDragVerticalDirection:function(){var e=this.positionAbs.top-this.lastPositionAbs.top;return e!==0&&(e>0?"down":"up")},_getDragHorizontalDirection:function(){var e=this.positionAbs.left-this.lastPositionAbs.left;return e!==0&&(e>0?"right":"left")},refresh:function(e){return this._refreshItems(e),this.refreshPositions(),this},_connectWith:function(){var e=this.options;return e.connectWith.constructor===String?[e.connectWith]:e.connectWith},_getItemsAsjQuery:function(t){var n,r,i,s,o=[],u=[],a=this._connectWith();if(a&&t)for(n=a.length-1;n>=0;n--){i=e(a[n]);for(r=i.length-1;r>=0;r--)s=e.data(i[r],this.widgetFullName),s&&s!==this&&!s.options.disabled&&u.push([e.isFunction(s.options.items)?s.options.items.call(s.element):e(s.options.items,s.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),s])}u.push([e.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):e(this.options.items,this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),this]);for(n=u.length-1;n>=0;n--)u[n][0].each(function(){o.push(this)});return e(o)},_removeCurrentsFromItems:function(){var t=this.currentItem.find(":data("+this.widgetName+"-item)");this.items=e.grep(this.items,function(e){for(var n=0;n<t.length;n++)if(t[n]===e.item[0])return!1;return!0})},_refreshItems:function(t){this.items=[],this.containers=[this];var n,r,i,s,o,u,a,f,l=this.items,c=[[e.isFunction(this.options.items)?this.options.items.call(this.element[0],t,{item:this.currentItem}):e(this.options.items,this.element),this]],h=this._connectWith();if(h&&this.ready)for(n=h.length-1;n>=0;n--){i=e(h[n]);for(r=i.length-1;r>=0;r--)s=e.data(i[r],this.widgetFullName),s&&s!==this&&!s.options.disabled&&(c.push([e.isFunction(s.options.items)?s.options.items.call(s.element[0],t,{item:this.currentItem}):e(s.options.items,s.element),s]),this.containers.push(s))}for(n=c.length-1;n>=0;n--){o=c[n][1],u=c[n][0];for(r=0,f=u.length;r<f;r++)a=e(u[r]),a.data(this.widgetName+"-item",o),l.push({item:a,instance:o,width:0,height:0,left:0,top:0})}},refreshPositions:function(t){this.offsetParent&&this.helper&&(this.offset.parent=this._getParentOffset());var n,r,i,s;for(n=this.items.length-1;n>=0;n--){r=this.items[n];if(r.instance!==this.currentContainer&&this.currentContainer&&r.item[0]!==this.currentItem[0])continue;i=this.options.toleranceElement?e(this.options.toleranceElement,r.item):r.item,t||(r.width=i.outerWidth(),r.height=i.outerHeight()),s=i.offset(),r.left=s.left,r.top=s.top}if(this.options.custom&&this.options.custom.refreshContainers)this.options.custom.refreshContainers.call(this);else for(n=this.containers.length-1;n>=0;n--)s=this.containers[n].element.offset(),this.containers[n].containerCache.left=s.left,this.containers[n].containerCache.top=s.top,this.containers[n].containerCache.width=this.containers[n].element.outerWidth(),this.containers[n].containerCache.height=this.containers[n].element.outerHeight();return this},_createPlaceholder:function(t){t=t||this;var n,r=t.options;if(!r.placeholder||r.placeholder.constructor===String)n=r.placeholder,r.placeholder={element:function(){var r=e(document.createElement(t.currentItem[0].nodeName)).addClass(n||t.currentItem[0].className+" ui-sortable-placeholder").removeClass("ui-sortable-helper")[0];return n||(r.style.visibility="hidden"),r},update:function(e,i){if(n&&!r.forcePlaceholderSize)return;i.height()||i.height(t.currentItem.innerHeight()-parseInt(t.currentItem.css("paddingTop")||0,10)-parseInt(t.currentItem.css("paddingBottom")||0,10)),i.width()||i.width(t.currentItem.innerWidth()-parseInt(t.currentItem.css("paddingLeft")||0,10)-parseInt(t.currentItem.css("paddingRight")||0,10))}};t.placeholder=e(r.placeholder.element.call(t.element,t.currentItem)),t.currentItem.after(t.placeholder),r.placeholder.update(t,t.placeholder)},_contactContainers:function(t){var n,r,i,s,o,u,a,f,l,c=null,h=null;for(n=this.containers.length-1;n>=0;n--){if(e.contains(this.currentItem[0],this.containers[n].element[0]))continue;if(this._intersectsWith(this.containers[n].containerCache)){if(c&&e.contains(this.containers[n].element[0],c.element[0]))continue;c=this.containers[n],h=n}else this.containers[n].containerCache.over&&(this.containers[n]._trigger("out",t,this._uiHash(this)),this.containers[n].containerCache.over=0)}if(!c)return;if(this.containers.length===1)this.containers[h]._trigger("over",t,this._uiHash(this)),this.containers[h].containerCache.over=1;else{i=1e4,s=null,o=this.containers[h].floating?"left":"top",u=this.containers[h].floating?"width":"height",a=this.positionAbs[o]+this.offset.click[o];for(r=this.items.length-1;r>=0;r--){if(!e.contains(this.containers[h].element[0],this.items[r].item[0]))continue;if(this.items[r].item[0]===this.currentItem[0])continue;f=this.items[r].item.offset()[o],l=!1,Math.abs(f-a)>Math.abs(f+this.items[r][u]-a)&&(l=!0,f+=this.items[r][u]),Math.abs(f-a)<i&&(i=Math.abs(f-a),s=this.items[r],this.direction=l?"up":"down")}if(!s&&!this.options.dropOnEmpty)return;this.currentContainer=this.containers[h],s?this._rearrange(t,s,null,!0):this._rearrange(t,null,this.containers[h].element,!0),this._trigger("change",t,this._uiHash()),this.containers[h]._trigger("change",t,this._uiHash(this)),this.options.placeholder.update(this.currentContainer,this.placeholder),this.containers[h]._trigger("over",t,this._uiHash(this)),this.containers[h].containerCache.over=1}},_createHelper:function(t){var n=this.options,r=e.isFunction(n.helper)?e(n.helper.apply(this.element[0],[t,this.currentItem])):n.helper==="clone"?this.currentItem.clone():this.currentItem;return r.parents("body").length||e(n.appendTo!=="parent"?n.appendTo:this.currentItem[0].parentNode)[0].appendChild(r[0]),r[0]===this.currentItem[0]&&(this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")}),(!r[0].style.width||n.forceHelperSize)&&r.width(this.currentItem.width()),(!r[0].style.height||n.forceHelperSize)&&r.height(this.currentItem.height()),r},_adjustOffsetFromHelper:function(t){typeof t=="string"&&(t=t.split(" ")),e.isArray(t)&&(t={left:+t[0],top:+t[1]||0}),"left"in t&&(this.offset.click.left=t.left+this.margins.left),"right"in t&&(this.offset.click.left=this.helperProportions.width-t.right+this.margins.left),"top"in t&&(this.offset.click.top=t.top+this.margins.top),"bottom"in t&&(this.offset.click.top=this.helperProportions.height-t.bottom+this.margins.top)},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var t=this.offsetParent.offset();this.cssPosition==="absolute"&&this.scrollParent[0]!==document&&e.contains(this.scrollParent[0],this.offsetParent[0])&&(t.left+=this.scrollParent.scrollLeft(),t.top+=this.scrollParent.scrollTop());if(this.offsetParent[0]===document.body||this.offsetParent[0].tagName&&this.offsetParent[0].tagName.toLowerCase()==="html"&&e.ui.ie)t={top:0,left:0};return{top:t.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:t.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if(this.cssPosition==="relative"){var e=this.currentItem.position();return{top:e.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:e.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.currentItem.css("marginLeft"),10)||0,top:parseInt(this.currentItem.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var t,n,r,i=this.options;i.containment==="parent"&&(i.containment=this.helper[0].parentNode);if(i.containment==="document"||i.containment==="window")this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,e(i.containment==="document"?document:window).width()-this.helperProportions.width-this.margins.left,(e(i.containment==="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top];/^(document|window|parent)$/.test(i.containment)||(t=e(i.containment)[0],n=e(i.containment).offset(),r=e(t).css("overflow")!=="hidden",this.containment=[n.left+(parseInt(e(t).css("borderLeftWidth"),10)||0)+(parseInt(e(t).css("paddingLeft"),10)||0)-this.margins.left,n.top+(parseInt(e(t).css("borderTopWidth"),10)||0)+(parseInt(e(t).css("paddingTop"),10)||0)-this.margins.top,n.left+(r?Math.max(t.scrollWidth,t.offsetWidth):t.offsetWidth)-(parseInt(e(t).css("borderLeftWidth"),10)||0)-(parseInt(e(t).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,n.top+(r?Math.max(t.scrollHeight,t.offsetHeight):t.offsetHeight)-(parseInt(e(t).css("borderTopWidth"),10)||0)-(parseInt(e(t).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top])},_convertPositionTo:function(t,n){n||(n=this.position);var r=t==="absolute"?1:-1,i=this.cssPosition!=="absolute"||this.scrollParent[0]!==document&&!!e.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,s=/(html|body)/i.test(i[0].tagName);return{top:n.top+this.offset.relative.top*r+this.offset.parent.top*r-(this.cssPosition==="fixed"?-this.scrollParent.scrollTop():s?0:i.scrollTop())*r,left:n.left+this.offset.relative.left*r+this.offset.parent.left*r-(this.cssPosition==="fixed"?-this.scrollParent.scrollLeft():s?0:i.scrollLeft())*r}},_generatePosition:function(t){var n,r,i=this.options,s=t.pageX,o=t.pageY,u=this.cssPosition!=="absolute"||this.scrollParent[0]!==document&&!!e.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,a=/(html|body)/i.test(u[0].tagName);return this.cssPosition==="relative"&&(this.scrollParent[0]===document||this.scrollParent[0]===this.offsetParent[0])&&(this.offset.relative=this._getRelativeOffset()),this.originalPosition&&(this.containment&&(t.pageX-this.offset.click.left<this.containment[0]&&(s=this.containment[0]+this.offset.click.left),t.pageY-this.offset.click.top<this.containment[1]&&(o=this.containment[1]+this.offset.click.top),t.pageX-this.offset.click.left>this.containment[2]&&(s=this.containment[2]+this.offset.click.left),t.pageY-this.offset.click.top>this.containment[3]&&(o=this.containment[3]+this.offset.click.top)),i.grid&&(n=this.originalPageY+Math.round((o-this.originalPageY)/i.grid[1])*i.grid[1],o=this.containment?n-this.offset.click.top>=this.containment[1]&&n-this.offset.click.top<=this.containment[3]?n:n-this.offset.click.top>=this.containment[1]?n-i.grid[1]:n+i.grid[1]:n,r=this.originalPageX+Math.round((s-this.originalPageX)/i.grid[0])*i.grid[0],s=this.containment?r-this.offset.click.left>=this.containment[0]&&r-this.offset.click.left<=this.containment[2]?r:r-this.offset.click.left>=this.containment[0]?r-i.grid[0]:r+i.grid[0]:r)),{top:o-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+(this.cssPosition==="fixed"?-this.scrollParent.scrollTop():a?0:u.scrollTop()),left:s-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(this.cssPosition==="fixed"?-this.scrollParent.scrollLeft():a?0:u.scrollLeft())}},_rearrange:function(e,t,n,r){n?n[0].appendChild(this.placeholder[0]):t.item[0].parentNode.insertBefore(this.placeholder[0],this.direction==="down"?t.item[0]:t.item[0].nextSibling),this.counter=this.counter?++this.counter:1;var i=this.counter;this._delay(function(){i===this.counter&&this.refreshPositions(!r)})},_clear:function(t,n){this.reverting=!1;var r,i=[];!this._noFinalSort&&this.currentItem.parent().length&&this.placeholder.before(this.currentItem),this._noFinalSort=null;if(this.helper[0]===this.currentItem[0]){for(r in this._storedCSS)if(this._storedCSS[r]==="auto"||this._storedCSS[r]==="static")this._storedCSS[r]="";this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper")}else this.currentItem.show();this.fromOutside&&!n&&i.push(function(e){this._trigger("receive",e,this._uiHash(this.fromOutside))}),(this.fromOutside||this.domPosition.prev!==this.currentItem.prev().not(".ui-sortable-helper")[0]||this.domPosition.parent!==this.currentItem.parent()[0])&&!n&&i.push(function(e){this._trigger("update",e,this._uiHash())}),this!==this.currentContainer&&(n||(i.push(function(e){this._trigger("remove",e,this._uiHash())}),i.push(function(e){return function(t){e._trigger("receive",t,this._uiHash(this))}}.call(this,this.currentContainer)),i.push(function(e){return function(t){e._trigger("update",t,this._uiHash(this))}}.call(this,this.currentContainer))));for(r=this.containers.length-1;r>=0;r--)n||i.push(function(e){return function(t){e._trigger("deactivate",t,this._uiHash(this))}}.call(this,this.containers[r])),this.containers[r].containerCache.over&&(i.push(function(e){return function(t){e._trigger("out",t,this._uiHash(this))}}.call(this,this.containers[r])),this.containers[r].containerCache.over=0);this._storedCursor&&e("body").css("cursor",this._storedCursor),this._storedOpacity&&this.helper.css("opacity",this._storedOpacity),this._storedZIndex&&this.helper.css("zIndex",this._storedZIndex==="auto"?"":this._storedZIndex),this.dragging=!1;if(this.cancelHelperRemoval){if(!n){this._trigger("beforeStop",t,this._uiHash());for(r=0;r<i.length;r++)i[r].call(this,t);this._trigger("stop",t,this._uiHash())}return this.fromOutside=!1,!1}n||this._trigger("beforeStop",t,this._uiHash()),this.placeholder[0].parentNode.removeChild(this.placeholder[0]),this.helper[0]!==this.currentItem[0]&&this.helper.remove(),this.helper=null;if(!n){for(r=0;r<i.length;r++)i[r].call(this,t);this._trigger("stop",t,this._uiHash())}return this.fromOutside=!1,!0},_trigger:function(){e.Widget.prototype._trigger.apply(this,arguments)===!1&&this.cancel()},_uiHash:function(t){var n=t||this;return{helper:n.helper,placeholder:n.placeholder||e([]),position:n.position,originalPosition:n.originalPosition,offset:n.positionAbs,item:n.currentItem,sender:t?t.element:null}}})})(jQuery);(function(e,t){var n=0,r={},i={};r.height=r.paddingTop=r.paddingBottom=r.borderTopWidth=r.borderBottomWidth="hide",i.height=i.paddingTop=i.paddingBottom=i.borderTopWidth=i.borderBottomWidth="show",e.widget("ui.accordion",{version:"1.10.0",options:{active:0,animate:{},collapsible:!1,event:"click",header:"> li > :first-child,> :not(li):even",heightStyle:"auto",icons:{activeHeader:"ui-icon-triangle-1-s",header:"ui-icon-triangle-1-e"},activate:null,beforeActivate:null},_create:function(){var t=this.options;this.prevShow=this.prevHide=e(),this.element.addClass("ui-accordion ui-widget ui-helper-reset").attr("role","tablist"),!t.collapsible&&(t.active===!1||t.active==null)&&(t.active=0),this._processPanels(),t.active<0&&(t.active+=this.headers.length),this._refresh()},_getCreateEventData:function(){return{header:this.active,content:this.active.length?this.active.next():e()}},_createIcons:function(){var t=this.options.icons;t&&(e("<span>").addClass("ui-accordion-header-icon ui-icon "+t.header).prependTo(this.headers),this.active.children(".ui-accordion-header-icon").removeClass(t.header).addClass(t.activeHeader),this.headers.addClass("ui-accordion-icons"))},_destroyIcons:function(){this.headers.removeClass("ui-accordion-icons").children(".ui-accordion-header-icon").remove()},_destroy:function(){var e;this.element.removeClass("ui-accordion ui-widget ui-helper-reset").removeAttr("role"),this.headers.removeClass("ui-accordion-header ui-accordion-header-active ui-helper-reset ui-state-default ui-corner-all ui-state-active ui-state-disabled ui-corner-top").removeAttr("role").removeAttr("aria-selected").removeAttr("aria-controls").removeAttr("tabIndex").each(function(){/^ui-accordion/.test(this.id)&&this.removeAttribute("id")}),this._destroyIcons(),e=this.headers.next().css("display","").removeAttr("role").removeAttr("aria-expanded").removeAttr("aria-hidden").removeAttr("aria-labelledby").removeClass("ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content ui-accordion-content-active ui-state-disabled").each(function(){/^ui-accordion/.test(this.id)&&this.removeAttribute("id")}),this.options.heightStyle!=="content"&&e.css("height","")},_setOption:function(e,t){if(e==="active"){this._activate(t);return}e==="event"&&(this.options.event&&this._off(this.headers,this.options.event),this._setupEvents(t)),this._super(e,t),e==="collapsible"&&!t&&this.options.active===!1&&this._activate(0),e==="icons"&&(this._destroyIcons(),t&&this._createIcons()),e==="disabled"&&this.headers.add(this.headers.next()).toggleClass("ui-state-disabled",!!t)},_keydown:function(t){if(t.altKey||t.ctrlKey)return;var n=e.ui.keyCode,r=this.headers.length,i=this.headers.index(t.target),s=!1;switch(t.keyCode){case n.RIGHT:case n.DOWN:s=this.headers[(i+1)%r];break;case n.LEFT:case n.UP:s=this.headers[(i-1+r)%r];break;case n.SPACE:case n.ENTER:this._eventHandler(t);break;case n.HOME:s=this.headers[0];break;case n.END:s=this.headers[r-1]}s&&(e(t.target).attr("tabIndex",-1),e(s).attr("tabIndex",0),s.focus(),t.preventDefault())},_panelKeyDown:function(t){t.keyCode===e.ui.keyCode.UP&&t.ctrlKey&&e(t.currentTarget).prev().focus()},refresh:function(){var t=this.options;this._processPanels();if(t.active===!1&&t.collapsible===!0||!this.headers.length)t.active=!1,this.active=e();t.active===!1?this._activate(0):this.active.length&&!e.contains(this.element[0],this.active[0])?this.headers.length===this.headers.find(".ui-state-disabled").length?(t.active=!1,this.active=e()):this._activate(Math.max(0,t.active-1)):t.active=this.headers.index(this.active),this._destroyIcons(),this._refresh()},_processPanels:function(){this.headers=this.element.find(this.options.header).addClass("ui-accordion-header ui-helper-reset ui-state-default ui-corner-all"),this.headers.next().addClass("ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom").filter(":not(.ui-accordion-content-active)").hide()},_refresh:function(){var t,r=this.options,i=r.heightStyle,s=this.element.parent(),o=this.accordionId="ui-accordion-"+(this.element.attr("id")||++n);this.active=this._findActive(r.active).addClass("ui-accordion-header-active ui-state-active").toggleClass("ui-corner-all ui-corner-top"),this.active.next().addClass("ui-accordion-content-active").show(),this.headers.attr("role","tab").each(function(t){var n=e(this),r=n.attr("id"),i=n.next(),s=i.attr("id");r||(r=o+"-header-"+t,n.attr("id",r)),s||(s=o+"-panel-"+t,i.attr("id",s)),n.attr("aria-controls",s),i.attr("aria-labelledby",r)}).next().attr("role","tabpanel"),this.headers.not(this.active).attr({"aria-selected":"false",tabIndex:-1}).next().attr({"aria-expanded":"false","aria-hidden":"true"}).hide(),this.active.length?this.active.attr({"aria-selected":"true",tabIndex:0}).next().attr({"aria-expanded":"true","aria-hidden":"false"}):this.headers.eq(0).attr("tabIndex",0),this._createIcons(),this._setupEvents(r.event),i==="fill"?(t=s.height(),this.element.siblings(":visible").each(function(){var n=e(this),r=n.css("position");if(r==="absolute"||r==="fixed")return;t-=n.outerHeight(!0)}),this.headers.each(function(){t-=e(this).outerHeight(!0)}),this.headers.next().each(function(){e(this).height(Math.max(0,t-e(this).innerHeight()+e(this).height()))}).css("overflow","auto")):i==="auto"&&(t=0,this.headers.next().each(function(){t=Math.max(t,e(this).css("height","").height())}).height(t))},_activate:function(t){var n=this._findActive(t)[0];if(n===this.active[0])return;n=n||this.active[0],this._eventHandler({target:n,currentTarget:n,preventDefault:e.noop})},_findActive:function(t){return typeof t=="number"?this.headers.eq(t):e()},_setupEvents:function(t){var n={keydown:"_keydown"};t&&e.each(t.split(" "),function(e,t){n[t]="_eventHandler"}),this._off(this.headers.add(this.headers.next())),this._on(this.headers,n),this._on(this.headers.next(),{keydown:"_panelKeyDown"}),this._hoverable(this.headers),this._focusable(this.headers)},_eventHandler:function(t){var n=this.options,r=this.active,i=e(t.currentTarget),s=i[0]===r[0],o=s&&n.collapsible,u=o?e():i.next(),a=r.next(),f={oldHeader:r,oldPanel:a,newHeader:o?e():i,newPanel:u};t.preventDefault();if(s&&!n.collapsible||this._trigger("beforeActivate",t,f)===!1)return;n.active=o?!1:this.headers.index(i),this.active=s?e():i,this._toggle(f),r.removeClass("ui-accordion-header-active ui-state-active"),n.icons&&r.children(".ui-accordion-header-icon").removeClass(n.icons.activeHeader).addClass(n.icons.header),s||(i.removeClass("ui-corner-all").addClass("ui-accordion-header-active ui-state-active ui-corner-top"),n.icons&&i.children(".ui-accordion-header-icon").removeClass(n.icons.header).addClass(n.icons.activeHeader),i.next().addClass("ui-accordion-content-active"))},_toggle:function(t){var n=t.newPanel,r=this.prevShow.length?this.prevShow:t.oldPanel;this.prevShow.add(this.prevHide).stop(!0,!0),this.prevShow=n,this.prevHide=r,this.options.animate?this._animate(n,r,t):(r.hide(),n.show(),this._toggleComplete(t)),r.attr({"aria-expanded":"false","aria-hidden":"true"}),r.prev().attr("aria-selected","false"),n.length&&r.length?r.prev().attr("tabIndex",-1):n.length&&this.headers.filter(function(){return e(this).attr("tabIndex")===0}).attr("tabIndex",-1),n.attr({"aria-expanded":"true","aria-hidden":"false"}).prev().attr({"aria-selected":"true",tabIndex:0})},_animate:function(e,t,n){var s,o,u,a=this,f=0,l=e.length&&(!t.length||e.index()<t.index()),c=this.options.animate||{},h=l&&c.down||c,p=function(){a._toggleComplete(n)};typeof h=="number"&&(u=h),typeof h=="string"&&(o=h),o=o||h.easing||c.easing,u=u||h.duration||c.duration;if(!t.length)return e.animate(i,u,o,p);if(!e.length)return t.animate(r,u,o,p);s=e.show().outerHeight(),t.animate(r,{duration:u,easing:o,step:function(e,t){t.now=Math.round(e)}}),e.hide().animate(i,{duration:u,easing:o,complete:p,step:function(e,n){n.now=Math.round(e),n.prop!=="height"?f+=n.now:a.options.heightStyle!=="content"&&(n.now=Math.round(s-t.outerHeight()-f),f=0)}})},_toggleComplete:function(e){var t=e.oldPanel;t.removeClass("ui-accordion-content-active").prev().removeClass("ui-corner-top").addClass("ui-corner-all"),t.length&&(t.parent()[0].className=t.parent()[0].className),this._trigger("activate",null,e)}})})(jQuery);(function(e,t){var n=0;e.widget("ui.autocomplete",{version:"1.10.0",defaultElement:"<input>",options:{appendTo:null,autoFocus:!1,delay:300,minLength:1,position:{my:"left top",at:"left bottom",collision:"none"},source:null,change:null,close:null,focus:null,open:null,response:null,search:null,select:null},pending:0,_create:function(){var t,n,r;this.isMultiLine=this._isMultiLine(),this.valueMethod=this.element[this.element.is("input,textarea")?"val":"text"],this.isNewMenu=!0,this.element.addClass("ui-autocomplete-input").attr("autocomplete","off"),this._on(this.element,{keydown:function(i){if(this.element.prop("readOnly")){t=!0,r=!0,n=!0;return}t=!1,r=!1,n=!1;var s=e.ui.keyCode;switch(i.keyCode){case s.PAGE_UP:t=!0,this._move("previousPage",i);break;case s.PAGE_DOWN:t=!0,this._move("nextPage",i);break;case s.UP:t=!0,this._keyEvent("previous",i);break;case s.DOWN:t=!0,this._keyEvent("next",i);break;case s.ENTER:case s.NUMPAD_ENTER:this.menu.active&&(t=!0,i.preventDefault(),this.menu.select(i));break;case s.TAB:this.menu.active&&this.menu.select(i);break;case s.ESCAPE:this.menu.element.is(":visible")&&(this._value(this.term),this.close(i),i.preventDefault());break;default:n=!0,this._searchTimeout(i)}},keypress:function(r){if(t){t=!1,r.preventDefault();return}if(n)return;var i=e.ui.keyCode;switch(r.keyCode){case i.PAGE_UP:this._move("previousPage",r);break;case i.PAGE_DOWN:this._move("nextPage",r);break;case i.UP:this._keyEvent("previous",r);break;case i.DOWN:this._keyEvent("next",r)}},input:function(e){if(r){r=!1,e.preventDefault();return}this._searchTimeout(e)},focus:function(){this.selectedItem=null,this.previous=this._value()},blur:function(e){if(this.cancelBlur){delete this.cancelBlur;return}clearTimeout(this.searching),this.close(e),this._change(e)}}),this._initSource(),this.menu=e("<ul>").addClass("ui-autocomplete").appendTo(this._appendTo()).menu({input:e(),role:null}).zIndex(this.element.zIndex()+1).hide().data("ui-menu"),this._on(this.menu.element,{mousedown:function(t){t.preventDefault(),this.cancelBlur=!0,this._delay(function(){delete this.cancelBlur});var n=this.menu.element[0];e(t.target).closest(".ui-menu-item").length||this._delay(function(){var t=this;this.document.one("mousedown",function(r){r.target!==t.element[0]&&r.target!==n&&!e.contains(n,r.target)&&t.close()})})},menufocus:function(t,n){if(this.isNewMenu){this.isNewMenu=!1;if(t.originalEvent&&/^mouse/.test(t.originalEvent.type)){this.menu.blur(),this.document.one("mousemove",function(){e(t.target).trigger(t.originalEvent)});return}}var r=n.item.data("ui-autocomplete-item");!1!==this._trigger("focus",t,{item:r})?t.originalEvent&&/^key/.test(t.originalEvent.type)&&this._value(r.value):this.liveRegion.text(r.value)},menuselect:function(e,t){var n=t.item.data("ui-autocomplete-item"),r=this.previous;this.element[0]!==this.document[0].activeElement&&(this.element.focus(),this.previous=r,this._delay(function(){this.previous=r,this.selectedItem=n})),!1!==this._trigger("select",e,{item:n})&&this._value(n.value),this.term=this._value(),this.close(e),this.selectedItem=n}}),this.liveRegion=e("<span>",{role:"status","aria-live":"polite"}).addClass("ui-helper-hidden-accessible").insertAfter(this.element),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_destroy:function(){clearTimeout(this.searching),this.element.removeClass("ui-autocomplete-input").removeAttr("autocomplete"),this.menu.element.remove(),this.liveRegion.remove()},_setOption:function(e,t){this._super(e,t),e==="source"&&this._initSource(),e==="appendTo"&&this.menu.element.appendTo(this._appendTo()),e==="disabled"&&t&&this.xhr&&this.xhr.abort()},_appendTo:function(){var t=this.options.appendTo;return t&&(t=t.jquery||t.nodeType?e(t):this.document.find(t).eq(0)),t||(t=this.element.closest(".ui-front")),t.length||(t=this.document[0].body),t},_isMultiLine:function(){return this.element.is("textarea")?!0:this.element.is("input")?!1:this.element.prop("isContentEditable")},_initSource:function(){var t,n,r=this;e.isArray(this.options.source)?(t=this.options.source,this.source=function(n,r){r(e.ui.autocomplete.filter(t,n.term))}):typeof this.options.source=="string"?(n=this.options.source,this.source=function(t,i){r.xhr&&r.xhr.abort(),r.xhr=e.ajax({url:n,data:t,dataType:"json",success:function(e){i(e)},error:function(){i([])}})}):this.source=this.options.source},_searchTimeout:function(e){clearTimeout(this.searching),this.searching=this._delay(function(){this.term!==this._value()&&(this.selectedItem=null,this.search(null,e))},this.options.delay)},search:function(e,t){e=e!=null?e:this._value(),this.term=this._value();if(e.length<this.options.minLength)return this.close(t);if(this._trigger("search",t)===!1)return;return this._search(e)},_search:function(e){this.pending++,this.element.addClass("ui-autocomplete-loading"),this.cancelSearch=!1,this.source({term:e},this._response())},_response:function(){var e=this,t=++n;return function(r){t===n&&e.__response(r),e.pending--,e.pending||e.element.removeClass("ui-autocomplete-loading")}},__response:function(e){e&&(e=this._normalize(e)),this._trigger("response",null,{content:e}),!this.options.disabled&&e&&e.length&&!this.cancelSearch?(this._suggest(e),this._trigger("open")):this._close()},close:function(e){this.cancelSearch=!0,this._close(e)},_close:function(e){this.menu.element.is(":visible")&&(this.menu.element.hide(),this.menu.blur(),this.isNewMenu=!0,this._trigger("close",e))},_change:function(e){this.previous!==this._value()&&this._trigger("change",e,{item:this.selectedItem})},_normalize:function(t){return t.length&&t[0].label&&t[0].value?t:e.map(t,function(t){return typeof t=="string"?{label:t,value:t}:e.extend({label:t.label||t.value,value:t.value||t.label},t)})},_suggest:function(t){var n=this.menu.element.empty().zIndex(this.element.zIndex()+1);this._renderMenu(n,t),this.menu.refresh(),n.show(),this._resizeMenu(),n.position(e.extend({of:this.element},this.options.position)),this.options.autoFocus&&this.menu.next()},_resizeMenu:function(){var e=this.menu.element;e.outerWidth(Math.max(e.width("").outerWidth()+1,this.element.outerWidth()))},_renderMenu:function(t,n){var r=this;e.each(n,function(e,n){r._renderItemData(t,n)})},_renderItemData:function(e,t){return this._renderItem(e,t).data("ui-autocomplete-item",t)},_renderItem:function(t,n){return e("<li>").append(e("<a>").text(n.label)).appendTo(t)},_move:function(e,t){if(!this.menu.element.is(":visible")){this.search(null,t);return}if(this.menu.isFirstItem()&&/^previous/.test(e)||this.menu.isLastItem()&&/^next/.test(e)){this._value(this.term),this.menu.blur();return}this.menu[e](t)},widget:function(){return this.menu.element},_value:function(){return this.valueMethod.apply(this.element,arguments)},_keyEvent:function(e,t){if(!this.isMultiLine||this.menu.element.is(":visible"))this._move(e,t),t.preventDefault()}}),e.extend(e.ui.autocomplete,{escapeRegex:function(e){return e.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")},filter:function(t,n){var r=new RegExp(e.ui.autocomplete.escapeRegex(n),"i");return e.grep(t,function(e){return r.test(e.label||e.value||e)})}}),e.widget("ui.autocomplete",e.ui.autocomplete,{options:{messages:{noResults:"No search results.",results:function(e){return e+(e>1?" results are":" result is")+" available, use up and down arrow keys to navigate."}}},__response:function(e){var t;this._superApply(arguments);if(this.options.disabled||this.cancelSearch)return;e&&e.length?t=this.options.messages.results(e.length):t=this.options.messages.noResults,this.liveRegion.text(t)}})})(jQuery);(function(e,t){var n,r,i,s,o="ui-button ui-widget ui-state-default ui-corner-all",u="ui-state-hover ui-state-active ",a="ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only",f=function(){var t=e(this).find(":ui-button");setTimeout(function(){t.button("refresh")},1)},l=function(t){var n=t.name,r=t.form,i=e([]);return n&&(n=n.replace(/'/g,"\\'"),r?i=e(r).find("[name='"+n+"']"):i=e("[name='"+n+"']",t.ownerDocument).filter(function(){return!this.form})),i};e.widget("ui.button",{version:"1.10.0",defaultElement:"<button>",options:{disabled:null,text:!0,label:null,icons:{primary:null,secondary:null}},_create:function(){this.element.closest("form").unbind("reset"+this.eventNamespace).bind("reset"+this.eventNamespace,f),typeof this.options.disabled!="boolean"?this.options.disabled=!!this.element.prop("disabled"):this.element.prop("disabled",this.options.disabled),this._determineButtonType(),this.hasTitle=!!this.buttonElement.attr("title");var t=this,u=this.options,a=this.type==="checkbox"||this.type==="radio",c=a?"":"ui-state-active",h="ui-state-focus";u.label===null&&(u.label=this.type==="input"?this.buttonElement.val():this.buttonElement.html()),this._hoverable(this.buttonElement),this.buttonElement.addClass(o).attr("role","button").bind("mouseenter"+this.eventNamespace,function(){if(u.disabled)return;this===n&&e(this).addClass("ui-state-active")}).bind("mouseleave"+this.eventNamespace,function(){if(u.disabled)return;e(this).removeClass(c)}).bind("click"+this.eventNamespace,function(e){u.disabled&&(e.preventDefault(),e.stopImmediatePropagation())}),this.element.bind("focus"+this.eventNamespace,function(){t.buttonElement.addClass(h)}).bind("blur"+this.eventNamespace,function(){t.buttonElement.removeClass(h)}),a&&(this.element.bind("change"+this.eventNamespace,function(){if(s)return;t.refresh()}),this.buttonElement.bind("mousedown"+this.eventNamespace,function(e){if(u.disabled)return;s=!1,r=e.pageX,i=e.pageY}).bind("mouseup"+this.eventNamespace,function(e){if(u.disabled)return;if(r!==e.pageX||i!==e.pageY)s=!0})),this.type==="checkbox"?this.buttonElement.bind("click"+this.eventNamespace,function(){if(u.disabled||s)return!1}):this.type==="radio"?this.buttonElement.bind("click"+this.eventNamespace,function(){if(u.disabled||s)return!1;e(this).addClass("ui-state-active"),t.buttonElement.attr("aria-pressed","true");var n=t.element[0];l(n).not(n).map(function(){return e(this).button("widget")[0]}).removeClass("ui-state-active").attr("aria-pressed","false")}):(this.buttonElement.bind("mousedown"+this.eventNamespace,function(){if(u.disabled)return!1;e(this).addClass("ui-state-active"),n=this,t.document.one("mouseup",function(){n=null})}).bind("mouseup"+this.eventNamespace,function(){if(u.disabled)return!1;e(this).removeClass("ui-state-active")}).bind("keydown"+this.eventNamespace,function(t){if(u.disabled)return!1;(t.keyCode===e.ui.keyCode.SPACE||t.keyCode===e.ui.keyCode.ENTER)&&e(this).addClass("ui-state-active")}).bind("keyup"+this.eventNamespace+" blur"+this.eventNamespace,function(){e(this).removeClass("ui-state-active")}),this.buttonElement.is("a")&&this.buttonElement.keyup(function(t){t.keyCode===e.ui.keyCode.SPACE&&e(this).click()})),this._setOption("disabled",u.disabled),this._resetButton()},_determineButtonType:function(){var e,t,n;this.element.is("[type=checkbox]")?this.type="checkbox":this.element.is("[type=radio]")?this.type="radio":this.element.is("input")?this.type="input":this.type="button",this.type==="checkbox"||this.type==="radio"?(e=this.element.parents().last(),t="label[for='"+this.element.attr("id")+"']",this.buttonElement=e.find(t),this.buttonElement.length||(e=e.length?e.siblings():this.element.siblings(),this.buttonElement=e.filter(t),this.buttonElement.length||(this.buttonElement=e.find(t))),this.element.addClass("ui-helper-hidden-accessible"),n=this.element.is(":checked"),n&&this.buttonElement.addClass("ui-state-active"),this.buttonElement.prop("aria-pressed",n)):this.buttonElement=this.element},widget:function(){return this.buttonElement},_destroy:function(){this.element.removeClass("ui-helper-hidden-accessible"),this.buttonElement.removeClass(o+" "+u+" "+a).removeAttr("role").removeAttr("aria-pressed").html(this.buttonElement.find(".ui-button-text").html()),this.hasTitle||this.buttonElement.removeAttr("title")},_setOption:function(e,t){this._super(e,t);if(e==="disabled"){t?this.element.prop("disabled",!0):this.element.prop("disabled",!1);return}this._resetButton()},refresh:function(){var t=this.element.is("input, button")?this.element.is(":disabled"):this.element.hasClass("ui-button-disabled");t!==this.options.disabled&&this._setOption("disabled",t),this.type==="radio"?l(this.element[0]).each(function(){e(this).is(":checked")?e(this).button("widget").addClass("ui-state-active").attr("aria-pressed","true"):e(this).button("widget").removeClass("ui-state-active").attr("aria-pressed","false")}):this.type==="checkbox"&&(this.element.is(":checked")?this.buttonElement.addClass("ui-state-active").attr("aria-pressed","true"):this.buttonElement.removeClass("ui-state-active").attr("aria-pressed","false"))},_resetButton:function(){if(this.type==="input"){this.options.label&&this.element.val(this.options.label);return}var t=this.buttonElement.removeClass(a),n=e("<span></span>",this.document[0]).addClass("ui-button-text").html(this.options.label).appendTo(t.empty()).text(),r=this.options.icons,i=r.primary&&r.secondary,s=[];r.primary||r.secondary?(this.options.text&&s.push("ui-button-text-icon"+(i?"s":r.primary?"-primary":"-secondary")),r.primary&&t.prepend("<span class='ui-button-icon-primary ui-icon "+r.primary+"'></span>"),r.secondary&&t.append("<span class='ui-button-icon-secondary ui-icon "+r.secondary+"'></span>"),this.options.text||(s.push(i?"ui-button-icons-only":"ui-button-icon-only"),this.hasTitle||t.attr("title",e.trim(n)))):s.push("ui-button-text-only"),t.addClass(s.join(" "))}}),e.widget("ui.buttonset",{version:"1.10.0",options:{items:"button, input[type=button], input[type=submit], input[type=reset], input[type=checkbox], input[type=radio], a, :data(ui-button)"},_create:function(){this.element.addClass("ui-buttonset")},_init:function(){this.refresh()},_setOption:function(e,t){e==="disabled"&&this.buttons.button("option",e,t),this._super(e,t)},refresh:function(){var t=this.element.css("direction")==="rtl";this.buttons=this.element.find(this.options.items).filter(":ui-button").button("refresh").end().not(":ui-button").button().end().map(function(){return e(this).button("widget")[0]}).removeClass("ui-corner-all ui-corner-left ui-corner-right").filter(":first").addClass(t?"ui-corner-right":"ui-corner-left").end().filter(":last").addClass(t?"ui-corner-left":"ui-corner-right").end().end()},_destroy:function(){this.element.removeClass("ui-buttonset"),this.buttons.map(function(){return e(this).button("widget")[0]}).removeClass("ui-corner-left ui-corner-right").end().button("destroy")}})})(jQuery);(function(e,t){function s(){this._curInst=null,this._keyEvent=!1,this._disabledInputs=[],this._datepickerShowing=!1,this._inDialog=!1,this._mainDivId="ui-datepicker-div",this._inlineClass="ui-datepicker-inline",this._appendClass="ui-datepicker-append",this._triggerClass="ui-datepicker-trigger",this._dialogClass="ui-datepicker-dialog",this._disableClass="ui-datepicker-disabled",this._unselectableClass="ui-datepicker-unselectable",this._currentClass="ui-datepicker-current-day",this._dayOverClass="ui-datepicker-days-cell-over",this.regional=[],this.regional[""]={closeText:"清空",prevText:"上月",nextText:"下月",currentText:"今天",monthNames:["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],monthNamesShort:["一","二","三","四","五","六","七","八","九","十","十一","十二"],dayNames:["星期日","星期一","星期二","星期三","星期四","星期五","星期六"],dayNamesShort:["周日","周一","周二","周三","周四","周五","周六"],dayNamesMin:["日","一","二","三","四","五","六"],weekHeader:"周",dateFormat:"yy-mm-dd",firstDay:0,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""},this._defaults={showOn:"focus",showAnim:"fadeIn",showOptions:{},defaultDate:null,appendText:"",buttonText:"...",buttonImage:"",buttonImageOnly:!1,hideIfNoPrevNext:!1,navigationAsDateFormat:!1,gotoCurrent:!1,changeMonth:!1,changeYear:!1,yearRange:"c-10:c+10",showOtherMonths:!1,selectOtherMonths:!1,showWeek:!1,calculateWeek:this.iso8601Week,shortYearCutoff:"+10",minDate:null,maxDate:null,duration:"fast",beforeShowDay:null,beforeShow:null,onSelect:null,onChangeMonthYear:null,onClose:null,numberOfMonths:1,showCurrentAtPos:0,stepMonths:1,stepBigMonths:12,altField:"",altFormat:"",constrainInput:!0,showButtonPanel:!1,autoSize:!1,disabled:!1},e.extend(this._defaults,this.regional[""]),this.dpDiv=o(e("<div id='"+this._mainDivId+"' class='ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>"))}function o(t){var n="button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a";return t.delegate(n,"mouseout",function(){e(this).removeClass("ui-state-hover"),this.className.indexOf("ui-datepicker-prev")!==-1&&e(this).removeClass("ui-datepicker-prev-hover"),this.className.indexOf("ui-datepicker-next")!==-1&&e(this).removeClass("ui-datepicker-next-hover")}).delegate(n,"mouseover",function(){e.datepicker._isDisabledDatepicker(i.inline?t.parent()[0]:i.input[0])||(e(this).parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover"),e(this).addClass("ui-state-hover"),this.className.indexOf("ui-datepicker-prev")!==-1&&e(this).addClass("ui-datepicker-prev-hover"),this.className.indexOf("ui-datepicker-next")!==-1&&e(this).addClass("ui-datepicker-next-hover"))})}function u(t,n){e.extend(t,n);for(var r in n)n[r]==null&&(t[r]=n[r]);return t}e.extend(e.ui,{datepicker:{version:"1.10.0"}});var n="datepicker",r=(new Date).getTime(),i;e.extend(s.prototype,{markerClassName:"hasDatepicker",maxRows:4,_widgetDatepicker:function(){return this.dpDiv},setDefaults:function(e){return u(this._defaults,e||{}),this},_attachDatepicker:function(t,n){var r,i,s;r=t.nodeName.toLowerCase(),i=r==="div"||r==="span",t.id||(this.uuid+=1,t.id="dp"+this.uuid),s=this._newInst(e(t),i),s.settings=e.extend({},n||{}),r==="input"?this._connectDatepicker(t,s):i&&this._inlineDatepicker(t,s)},_newInst:function(t,n){var r=t[0].id.replace(/([^A-Za-z0-9_\-])/g,"\\\\$1");return{id:r,input:t,selectedDay:0,selectedMonth:0,selectedYear:0,drawMonth:0,drawYear:0,inline:n,dpDiv:n?o(e("<div class='"+this._inlineClass+" ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>")):this.dpDiv}},_connectDatepicker:function(t,r){var i=e(t);r.append=e([]),r.trigger=e([]);if(i.hasClass(this.markerClassName))return;this._attachments(i,r),i.addClass(this.markerClassName).keydown(this._doKeyDown).keypress(this._doKeyPress).keyup(this._doKeyUp),this._autoSize(r),e.data(t,n,r),r.settings.disabled&&this._disableDatepicker(t)},_attachments:function(t,n){var r,i,s,o=this._get(n,"appendText"),u=this._get(n,"isRTL");n.append&&n.append.remove(),o&&(n.append=e("<span class='"+this._appendClass+"'>"+o+"</span>"),t[u?"before":"after"](n.append)),t.unbind("focus",this._showDatepicker),n.trigger&&n.trigger.remove(),r=this._get(n,"showOn"),(r==="focus"||r==="both")&&t.focus(this._showDatepicker);if(r==="button"||r==="both")i=this._get(n,"buttonText"),s=this._get(n,"buttonImage"),n.trigger=e(this._get(n,"buttonImageOnly")?e("<img/>").addClass(this._triggerClass).attr({src:s,alt:i,title:i}):e("<button type='button'></button>").addClass(this._triggerClass).html(s?e("<img/>").attr({src:s,alt:i,title:i}):i)),t[u?"before":"after"](n.trigger),n.trigger.click(function(){return e.datepicker._datepickerShowing&&e.datepicker._lastInput===t[0]?e.datepicker._hideDatepicker():e.datepicker._datepickerShowing&&e.datepicker._lastInput!==t[0]?(e.datepicker._hideDatepicker(),e.datepicker._showDatepicker(t[0])):e.datepicker._showDatepicker(t[0]),!1})},_autoSize:function(e){if(this._get(e,"autoSize")&&!e.inline){var t,n,r,i,s=new Date(2009,11,20),o=this._get(e,"dateFormat");o.match(/[DM]/)&&(t=function(e){n=0,r=0;for(i=0;i<e.length;i++)e[i].length>n&&(n=e[i].length,r=i);return r},s.setMonth(t(this._get(e,o.match(/MM/)?"monthNames":"monthNamesShort"))),s.setDate(t(this._get(e,o.match(/DD/)?"dayNames":"dayNamesShort"))+20-s.getDay())),e.input.attr("size",this._formatDate(e,s).length)}},_inlineDatepicker:function(t,r){var i=e(t);if(i.hasClass(this.markerClassName))return;i.addClass(this.markerClassName).append(r.dpDiv),e.data(t,n,r),this._setDate(r,this._getDefaultDate(r),!0),this._updateDatepicker(r),this._updateAlternate(r),r.settings.disabled&&this._disableDatepicker(t),r.dpDiv.css("display","block")},_dialogDatepicker:function(t,r,i,s,o){var a,f,l,c,h,p=this._dialogInst;return p||(this.uuid+=1,a="dp"+this.uuid,this._dialogInput=e("<input type='text' id='"+a+"' style='position: absolute; top: -100px; width: 0px;'/>"),this._dialogInput.keydown(this._doKeyDown),e("body").append(this._dialogInput),p=this._dialogInst=this._newInst(this._dialogInput,!1),p.settings={},e.data(this._dialogInput[0],n,p)),u(p.settings,s||{}),r=r&&r.constructor===Date?this._formatDate(p,r):r,this._dialogInput.val(r),this._pos=o?o.length?o:[o.pageX,o.pageY]:null,this._pos||(f=document.documentElement.clientWidth,l=document.documentElement.clientHeight,c=document.documentElement.scrollLeft||document.body.scrollLeft,h=document.documentElement.scrollTop||document.body.scrollTop,this._pos=[f/2-100+c,l/2-150+h]),this._dialogInput.css("left",this._pos[0]+20+"px").css("top",this._pos[1]+"px"),p.settings.onSelect=i,this._inDialog=!0,this.dpDiv.addClass(this._dialogClass),this._showDatepicker(this._dialogInput[0]),e.blockUI&&e.blockUI(this.dpDiv),e.data(this._dialogInput[0],n,p),this},_destroyDatepicker:function(t){var r,i=e(t),s=e.data(t,n);if(!i.hasClass(this.markerClassName))return;r=t.nodeName.toLowerCase(),e.removeData(t,n),r==="input"?(s.append.remove(),s.trigger.remove(),i.removeClass(this.markerClassName).unbind("focus",this._showDatepicker).unbind("keydown",this._doKeyDown).unbind("keypress",this._doKeyPress).unbind("keyup",this._doKeyUp)):(r==="div"||r==="span")&&i.removeClass(this.markerClassName).empty()},_enableDatepicker:function(t){var r,i,s=e(t),o=e.data(t,n);if(!s.hasClass(this.markerClassName))return;r=t.nodeName.toLowerCase();if(r==="input")t.disabled=!1,o.trigger.filter("button").each(function(){this.disabled=!1}).end().filter("img").css({opacity:"1.0",cursor:""});else if(r==="div"||r==="span")i=s.children("."+this._inlineClass),i.children().removeClass("ui-state-disabled"),i.find("select.ui-datepicker-month, select.ui-datepicker-year").prop("disabled",!1);this._disabledInputs=e.map(this._disabledInputs,function(e){return e===t?null:e})},_disableDatepicker:function(t){var r,i,s=e(t),o=e.data(t,n);if(!s.hasClass(this.markerClassName))return;r=t.nodeName.toLowerCase();if(r==="input")t.disabled=!0,o.trigger.filter("button").each(function(){this.disabled=!0}).end().filter("img").css({opacity:"0.5",cursor:"default"});else if(r==="div"||r==="span")i=s.children("."+this._inlineClass),i.children().addClass("ui-state-disabled"),i.find("select.ui-datepicker-month, select.ui-datepicker-year").prop("disabled",!0);this._disabledInputs=e.map(this._disabledInputs,function(e){return e===t?null:e}),this._disabledInputs[this._disabledInputs.length]=t},_isDisabledDatepicker:function(e){if(!e)return!1;for(var t=0;t<this._disabledInputs.length;t++)if(this._disabledInputs[t]===e)return!0;return!1},_getInst:function(t){try{return e.data(t,n)}catch(r){throw"Missing instance data for this datepicker"}},_optionDatepicker:function(n,r,i){var s,o,a,f,l=this._getInst(n);if(arguments.length===2&&typeof r=="string")return r==="defaults"?e.extend({},e.datepicker._defaults):l?r==="all"?e.extend({},l.settings):this._get(l,r):null;s=r||{},typeof r=="string"&&(s={},s[r]=i),l&&(this._curInst===l&&this._hideDatepicker(),o=this._getDateDatepicker(n,!0),a=this._getMinMaxDate(l,"min"),f=this._getMinMaxDate(l,"max"),u(l.settings,s),a!==null&&s.dateFormat!==t&&s.minDate===t&&(l.settings.minDate=this._formatDate(l,a)),f!==null&&s.dateFormat!==t&&s.maxDate===t&&(l.settings.maxDate=this._formatDate(l,f)),"disabled"in s&&(s.disabled?this._disableDatepicker(n):this._enableDatepicker(n)),this._attachments(e(n),l),this._autoSize(l),this._setDate(l,o),this._updateAlternate(l),this._updateDatepicker(l))},_changeDatepicker:function(e,t,n){this._optionDatepicker(e,t,n)},_refreshDatepicker:function(e){var t=this._getInst(e);t&&this._updateDatepicker(t)},_setDateDatepicker:function(e,t){var n=this._getInst(e);n&&(this._setDate(n,t),this._updateDatepicker(n),this._updateAlternate(n))},_getDateDatepicker:function(e,t){var n=this._getInst(e);return n&&!n.inline&&this._setDateFromField(n,t),n?this._getDate(n):null},_doKeyDown:function(t){var n,r,i,s=e.datepicker._getInst(t.target),o=!0,u=s.dpDiv.is(".ui-datepicker-rtl");s._keyEvent=!0;if(e.datepicker._datepickerShowing)switch(t.keyCode){case 9:e.datepicker._hideDatepicker(),o=!1;break;case 13:return i=e("td."+e.datepicker._dayOverClass+":not(."+e.datepicker._currentClass+")",s.dpDiv),i[0]&&e.datepicker._selectDay(t.target,s.selectedMonth,s.selectedYear,i[0]),n=e.datepicker._get(s,"onSelect"),n?(r=e.datepicker._formatDate(s),n.apply(s.input?s.input[0]:null,[r,s])):e.datepicker._hideDatepicker(),!1;case 27:e.datepicker._hideDatepicker();break;case 33:e.datepicker._adjustDate(t.target,t.ctrlKey?-e.datepicker._get(s,"stepBigMonths"):-e.datepicker._get(s,"stepMonths"),"M");break;case 34:e.datepicker._adjustDate(t.target,t.ctrlKey?+e.datepicker._get(s,"stepBigMonths"):+e.datepicker._get(s,"stepMonths"),"M");break;case 35:(t.ctrlKey||t.metaKey)&&e.datepicker._clearDate(t.target),o=t.ctrlKey||t.metaKey;break;case 36:(t.ctrlKey||t.metaKey)&&e.datepicker._gotoToday(t.target),o=t.ctrlKey||t.metaKey;break;case 37:(t.ctrlKey||t.metaKey)&&e.datepicker._adjustDate(t.target,u?1:-1,"D"),o=t.ctrlKey||t.metaKey,t.originalEvent.altKey&&e.datepicker._adjustDate(t.target,t.ctrlKey?-e.datepicker._get(s,"stepBigMonths"):-e.datepicker._get(s,"stepMonths"),"M");break;case 38:(t.ctrlKey||t.metaKey)&&e.datepicker._adjustDate(t.target,-7,"D"),o=t.ctrlKey||t.metaKey;break;case 39:(t.ctrlKey||t.metaKey)&&e.datepicker._adjustDate(t.target,u?-1:1,"D"),o=t.ctrlKey||t.metaKey,t.originalEvent.altKey&&e.datepicker._adjustDate(t.target,t.ctrlKey?+e.datepicker._get(s,"stepBigMonths"):+e.datepicker._get(s,"stepMonths"),"M");break;case 40:(t.ctrlKey||t.metaKey)&&e.datepicker._adjustDate(t.target,7,"D"),o=t.ctrlKey||t.metaKey;break;default:o=!1}else t.keyCode===36&&t.ctrlKey?e.datepicker._showDatepicker(this):o=!1;o&&(t.preventDefault(),t.stopPropagation())},_doKeyPress:function(t){var n,r,i=e.datepicker._getInst(t.target);if(e.datepicker._get(i,"constrainInput"))return n=e.datepicker._possibleChars(e.datepicker._get(i,"dateFormat")),r=String.fromCharCode(t.charCode==null?t.keyCode:t.charCode),t.ctrlKey||t.metaKey||r<" "||!n||n.indexOf(r)>-1},_doKeyUp:function(t){var n,r=e.datepicker._getInst(t.target);if(r.input.val()!==r.lastVal)try{n=e.datepicker.parseDate(e.datepicker._get(r,"dateFormat"),r.input?r.input.val():null,e.datepicker._getFormatConfig(r)),n&&(e.datepicker._setDateFromField(r),e.datepicker._updateAlternate(r),e.datepicker._updateDatepicker(r))}catch(i){}return!0},_showDatepicker:function(t){t=t.target||t,t.nodeName.toLowerCase()!=="input"&&(t=e("input",t.parentNode)[0]);if(e.datepicker._isDisabledDatepicker(t)||e.datepicker._lastInput===t)return;var n,r,i,s,o,a,f;n=e.datepicker._getInst(t),e.datepicker._curInst&&e.datepicker._curInst!==n&&(e.datepicker._curInst.dpDiv.stop(!0,!0),n&&e.datepicker._datepickerShowing&&e.datepicker._hideDatepicker(e.datepicker._curInst.input[0])),r=e.datepicker._get(n,"beforeShow"),i=r?r.apply(t,[t,n]):{};if(i===!1)return;u(n.settings,i),n.lastVal=null,e.datepicker._lastInput=t,e.datepicker._setDateFromField(n),e.datepicker._inDialog&&(t.value=""),e.datepicker._pos||(e.datepicker._pos=e.datepicker._findPos(t),e.datepicker._pos[1]+=t.offsetHeight),s=!1,e(t).parents().each(function(){return s|=e(this).css("position")==="fixed",!s}),o={left:e.datepicker._pos[0],top:e.datepicker._pos[1]},e.datepicker._pos=null,n.dpDiv.empty(),n.dpDiv.css({position:"absolute",display:"block",top:"-1000px"}),e.datepicker._updateDatepicker(n),o=e.datepicker._checkOffset(n,o,s),n.dpDiv.css({position:e.datepicker._inDialog&&e.blockUI?"static":s?"fixed":"absolute",display:"none",left:o.left+"px",top:o.top+"px"}),n.inline||(a=e.datepicker._get(n,"showAnim"),f=e.datepicker._get(n,"duration"),n.dpDiv.zIndex(e(t).zIndex()+1),e.datepicker._datepickerShowing=!0,e.effects&&e.effects.effect[a]?n.dpDiv.show(a,e.datepicker._get(n,"showOptions"),f):n.dpDiv[a||"show"](a?f:null),n.input.is(":visible")&&!n.input.is(":disabled")&&n.input.focus(),e.datepicker._curInst=n)},_updateDatepicker:function(t){this.maxRows=4,i=t,t.dpDiv.empty().append(this._generateHTML(t)),this._attachHandlers(t),t.dpDiv.find("."+this._dayOverClass+" a").mouseover();var n,r=this._getNumberOfMonths(t),s=r[1],o=17;t.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width(""),s>1&&t.dpDiv.addClass("ui-datepicker-multi-"+s).css("width",o*s+"em"),t.dpDiv[(r[0]!==1||r[1]!==1?"add":"remove")+"Class"]("ui-datepicker-multi"),t.dpDiv[(this._get(t,"isRTL")?"add":"remove")+"Class"]("ui-datepicker-rtl"),t===e.datepicker._curInst&&e.datepicker._datepickerShowing&&t.input&&t.input.is(":visible")&&!t.input.is(":disabled")&&t.input[0]!==document.activeElement&&t.input.focus(),t.yearshtml&&(n=t.yearshtml,setTimeout(function(){n===t.yearshtml&&t.yearshtml&&t.dpDiv.find("select.ui-datepicker-year:first").replaceWith(t.yearshtml),n=t.yearshtml=null},0))},_getBorders:function(e){var t=function(e){return{thin:1,medium:2,thick:3}[e]||e};return[parseFloat(t(e.css("border-left-width"))),parseFloat(t(e.css("border-top-width")))]},_checkOffset:function(t,n,r){var i=t.dpDiv.outerWidth(),s=t.dpDiv.outerHeight(),o=t.input?t.input.outerWidth():0,u=t.input?t.input.outerHeight():0,a=document.documentElement.clientWidth+(r?0:e(document).scrollLeft()),f=document.documentElement.clientHeight+(r?0:e(document).scrollTop());return n.left-=this._get(t,"isRTL")?i-o:0,n.left-=r&&n.left===t.input.offset().left?e(document).scrollLeft():0,n.top-=r&&n.top===t.input.offset().top+u?e(document).scrollTop():0,n.left-=Math.min(n.left,n.left+i>a&&a>i?Math.abs(n.left+i-a):0),n.top-=Math.min(n.top,n.top+s>f&&f>s?Math.abs(s+u):0),n},_findPos:function(t){var n,r=this._getInst(t),i=this._get(r,"isRTL");while(t&&(t.type==="hidden"||t.nodeType!==1||e.expr.filters.hidden(t)))t=t[i?"previousSibling":"nextSibling"];return n=e(t).offset(),[n.left,n.top]},_hideDatepicker:function(t){var r,i,s,o,u=this._curInst;if(!u||t&&u!==e.data(t,n))return;this._datepickerShowing&&(r=this._get(u,"showAnim"),i=this._get(u,"duration"),s=function(){e.datepicker._tidyDialog(u)},e.effects&&(e.effects.effect[r]||e.effects[r])?u.dpDiv.hide(r,e.datepicker._get(u,"showOptions"),i,s):u.dpDiv[r==="slideDown"?"slideUp":r==="fadeIn"?"fadeOut":"hide"](r?i:null,s),r||s(),this._datepickerShowing=!1,o=this._get(u,"onClose"),o&&o.apply(u.input?u.input[0]:null,[u.input?u.input.val():"",u]),this._lastInput=null,this._inDialog&&(this._dialogInput.css({position:"absolute",left:"0",top:"-100px"}),e.blockUI&&(e.unblockUI(),e("body").append(this.dpDiv))),this._inDialog=!1)},_tidyDialog:function(e){e.dpDiv.removeClass(this._dialogClass).unbind(".ui-datepicker-calendar")},_checkExternalClick:function(t){if(!e.datepicker._curInst)return;var n=e(t.target),r=e.datepicker._getInst(n[0]);(n[0].id!==e.datepicker._mainDivId&&n.parents("#"+e.datepicker._mainDivId).length===0&&!n.hasClass(e.datepicker.markerClassName)&&!n.closest("."+e.datepicker._triggerClass).length&&e.datepicker._datepickerShowing&&(!e.datepicker._inDialog||!e.blockUI)||n.hasClass(e.datepicker.markerClassName)&&e.datepicker._curInst!==r)&&e.datepicker._hideDatepicker()},_adjustDate:function(t,n,r){var i=e(t),s=this._getInst(i[0]);if(this._isDisabledDatepicker(i[0]))return;this._adjustInstDate(s,n+(r==="M"?this._get(s,"showCurrentAtPos"):0),r),this._updateDatepicker(s)},_gotoToday:function(t){var n,r=e(t),i=this._getInst(r[0]);this._get(i,"gotoCurrent")&&i.currentDay?(i.selectedDay=i.currentDay,i.drawMonth=i.selectedMonth=i.currentMonth,i.drawYear=i.selectedYear=i.currentYear):(n=new Date,i.selectedDay=n.getDate(),i.drawMonth=i.selectedMonth=n.getMonth(),i.drawYear=i.selectedYear=n.getFullYear()),this._notifyChange(i),this._adjustDate(r)},_selectMonthYear:function(t,n,r){var i=e(t),s=this._getInst(i[0]);s["selected"+(r==="M"?"Month":"Year")]=s["draw"+(r==="M"?"Month":"Year")]=parseInt(n.options[n.selectedIndex].value,10),this._notifyChange(s),this._adjustDate(i)},_selectDay:function(t,n,r,i){var s,o=e(t);if(e(i).hasClass(this._unselectableClass)||this._isDisabledDatepicker(o[0]))return;s=this._getInst(o[0]),s.selectedDay=s.currentDay=e("a",i).html(),s.selectedMonth=s.currentMonth=n,s.selectedYear=s.currentYear=r,this._selectDate(t,this._formatDate(s,s.currentDay,s.currentMonth,s.currentYear))},_clearDate:function(t){var n=e(t);this._selectDate(n,"")},_selectDate:function(t,n){var r,i=e(t),s=this._getInst(i[0]);n=n!=null?n:this._formatDate(s),s.input&&s.input.val(n),this._updateAlternate(s),r=this._get(s,"onSelect"),r?r.apply(s.input?s.input[0]:null,[n,s]):s.input&&s.input.trigger("change"),s.inline?this._updateDatepicker(s):(this._hideDatepicker(),this._lastInput=s.input[0],typeof s.input[0]!="object"&&s.input.focus(),this._lastInput=null)},_updateAlternate:function(t){var n,r,i,s=this._get(t,"altField");s&&(n=this._get(t,"altFormat")||this._get(t,"dateFormat"),r=this._getDate(t),i=this.formatDate(n,r,this._getFormatConfig(t)),e(s).each(function(){e(this).val(i)}))},noWeekends:function(e){var t=e.getDay();return[t>0&&t<6,""]},iso8601Week:function(e){var t,n=new Date(e.getTime());return n.setDate(n.getDate()+4-(n.getDay()||7)),t=n.getTime(),n.setMonth(0),n.setDate(1),Math.floor(Math.round((t-n)/864e5)/7)+1},parseDate:function(t,n,r){if(t==null||n==null)throw"Invalid arguments";n=typeof n=="object"?n.toString():n+"";if(n==="")return null;var i,s,o,u=0,a=(r?r.shortYearCutoff:null)||this._defaults.shortYearCutoff,f=typeof a!="string"?a:(new Date).getFullYear()%100+parseInt(a,10),l=(r?r.dayNamesShort:null)||this._defaults.dayNamesShort,c=(r?r.dayNames:null)||this._defaults.dayNames,h=(r?r.monthNamesShort:null)||this._defaults.monthNamesShort,p=(r?r.monthNames:null)||this._defaults.monthNames,d=-1,v=-1,m=-1,g=-1,y=!1,b,w=function(e){var n=i+1<t.length&&t.charAt(i+1)===e;return n&&i++,n},E=function(e){var t=w(e),r=e==="@"?14:e==="!"?20:e==="y"&&t?4:e==="o"?3:2,i=new RegExp("^\\d{1,"+r+"}"),s=n.substring(u).match(i);if(!s)throw"Missing number at position "+u;return u+=s[0].length,parseInt(s[0],10)},S=function(t,r,i){var s=-1,o=e.map(w(t)?i:r,function(e,t){return[[t,e]]}).sort(function(e,t){return-(e[1].length-t[1].length)});e.each(o,function(e,t){var r=t[1];if(n.substr(u,r.length).toLowerCase()===r.toLowerCase())return s=t[0],u+=r.length,!1});if(s!==-1)return s+1;throw"Unknown name at position "+u},x=function(){if(n.charAt(u)!==t.charAt(i))throw"Unexpected literal at position "+u;u++};for(i=0;i<t.length;i++)if(y)t.charAt(i)==="'"&&!w("'")?y=!1:x();else switch(t.charAt(i)){case"d":m=E("d");break;case"D":S("D",l,c);break;case"o":g=E("o");break;case"m":v=E("m");break;case"M":v=S("M",h,p);break;case"y":d=E("y");break;case"@":b=new Date(E("@")),d=b.getFullYear(),v=b.getMonth()+1,m=b.getDate();break;case"!":b=new Date((E("!")-this._ticksTo1970)/1e4),d=b.getFullYear(),v=b.getMonth()+1,m=b.getDate();break;case"'":w("'")?x():y=!0;break;default:x()}if(u<n.length){o=n.substr(u);if(!/^\s+/.test(o))throw"Extra/unparsed characters found in date: "+o}d===-1?d=(new Date).getFullYear():d<100&&(d+=(new Date).getFullYear()-(new Date).getFullYear()%100+(d<=f?0:-100));if(g>-1){v=1,m=g;do{s=this._getDaysInMonth(d,v-1);if(m<=s)break;v++,m-=s}while(!0)}b=this._daylightSavingAdjust(new Date(d,v-1,m));if(b.getFullYear()!==d||b.getMonth()+1!==v||b.getDate()!==m)throw"Invalid date";return b},ATOM:"yy-mm-dd",COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd",RFC_822:"D, d M y",RFC_850:"DD, dd-M-y",RFC_1036:"D, d M y",RFC_1123:"D, d M yy",RFC_2822:"D, d M yy",RSS:"D, d M y",TICKS:"!",TIMESTAMP:"@",W3C:"yy-mm-dd",_ticksTo1970:(718685+Math.floor(492.5)-Math.floor(19.7)+Math.floor(4.925))*24*60*60*1e7,formatDate:function(e,t,n){if(!t)return"";var r,i=(n?n.dayNamesShort:null)||this._defaults.dayNamesShort,s=(n?n.dayNames:null)||this._defaults.dayNames,o=(n?n.monthNamesShort:null)||this._defaults.monthNamesShort,u=(n?n.monthNames:null)||this._defaults.monthNames,a=function(t){var n=r+1<e.length&&e.charAt(r+1)===t;return n&&r++,n},f=function(e,t,n){var r=""+t;if(a(e))while(r.length<n)r="0"+r;return r},l=function(e,t,n,r){return a(e)?r[t]:n[t]},c="",h=!1;if(t)for(r=0;r<e.length;r++)if(h)e.charAt(r)==="'"&&!a("'")?h=!1:c+=e.charAt(r);else switch(e.charAt(r)){case"d":c+=f("d",t.getDate(),2);break;case"D":c+=l("D",t.getDay(),i,s);break;case"o":c+=f("o",Math.round(((new Date(t.getFullYear(),t.getMonth(),t.getDate())).getTime()-(new Date(t.getFullYear(),0,0)).getTime())/864e5),3);break;case"m":c+=f("m",t.getMonth()+1,2);break;case"M":c+=l("M",t.getMonth(),o,u);break;case"y":c+=a("y")?t.getFullYear():(t.getYear()%100<10?"0":"")+t.getYear()%100;break;case"@":c+=t.getTime();break;case"!":c+=t.getTime()*1e4+this._ticksTo1970;break;case"'":a("'")?c+="'":h=!0;break;default:c+=e.charAt(r)}return c},_possibleChars:function(e){var t,n="",r=!1,i=function(n){var r=t+1<e.length&&e.charAt(t+1)===n;return r&&t++,r};for(t=0;t<e.length;t++)if(r)e.charAt(t)==="'"&&!i("'")?r=!1:n+=e.charAt(t);else switch(e.charAt(t)){case"d":case"m":case"y":case"@":n+="0123456789";break;case"D":case"M":return null;case"'":i("'")?n+="'":r=!0;break;default:n+=e.charAt(t)}return n},_get:function(e,n){return e.settings[n]!==t?e.settings[n]:this._defaults[n]},_setDateFromField:function(e,t){if(e.input.val()===e.lastVal)return;var n=this._get(e,"dateFormat"),r=e.lastVal=e.input?e.input.val():null,i=this._getDefaultDate(e),s=i,o=this._getFormatConfig(e);try{s=this.parseDate(n,r,o)||i}catch(u){r=t?"":r}e.selectedDay=s.getDate(),e.drawMonth=e.selectedMonth=s.getMonth(),e.drawYear=e.selectedYear=s.getFullYear(),e.currentDay=r?s.getDate():0,e.currentMonth=r?s.getMonth():0,e.currentYear=r?s.getFullYear():0,this._adjustInstDate(e)},_getDefaultDate:function(e){return this._restrictMinMax(e,this._determineDate(e,this._get(e,"defaultDate"),new Date))},_determineDate:function(t,n,r){var i=function(e){var t=new Date;return t.setDate(t.getDate()+e),t},s=function(n){try{return e.datepicker.parseDate(e.datepicker._get(t,"dateFormat"),n,e.datepicker._getFormatConfig(t))}catch(r){}var i=(n.toLowerCase().match(/^c/)?e.datepicker._getDate(t):null)||new Date,s=i.getFullYear(),o=i.getMonth(),u=i.getDate(),a=/([+\-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g,f=a.exec(n);while(f){switch(f[2]||"d"){case"d":case"D":u+=parseInt(f[1],10);break;case"w":case"W":u+=parseInt(f[1],10)*7;break;case"m":case"M":o+=parseInt(f[1],10),u=Math.min(u,e.datepicker._getDaysInMonth(s,o));break;case"y":case"Y":s+=parseInt(f[1],10),u=Math.min(u,e.datepicker._getDaysInMonth(s,o))}f=a.exec(n)}return new Date(s,o,u)},o=n==null||n===""?r:typeof n=="string"?s(n):typeof n=="number"?isNaN(n)?r:i(n):new Date(n.getTime());return o=o&&o.toString()==="Invalid Date"?r:o,o&&(o.setHours(0),o.setMinutes(0),o.setSeconds(0),o.setMilliseconds(0)),this._daylightSavingAdjust(o)},_daylightSavingAdjust:function(e){return e?(e.setHours(e.getHours()>12?e.getHours()+2:0),e):null},_setDate:function(e,t,n){var r=!t,i=e.selectedMonth,s=e.selectedYear,o=this._restrictMinMax(e,this._determineDate(e,t,new Date));e.selectedDay=e.currentDay=o.getDate(),e.drawMonth=e.selectedMonth=e.currentMonth=o.getMonth(),e.drawYear=e.selectedYear=e.currentYear=o.getFullYear(),(i!==e.selectedMonth||s!==e.selectedYear)&&!n&&this._notifyChange(e),this._adjustInstDate(e),e.input&&e.input.val(r?"":this._formatDate(e))},_getDate:function(e){var t=!e.currentYear||e.input&&e.input.val()===""?null:this._daylightSavingAdjust(new Date(e.currentYear,e.currentMonth,e.currentDay));return t},_attachHandlers:function(t){var n=this._get(t,"stepMonths"),i="#"+t.id.replace(/\\\\/g,"\\");t.dpDiv.find("[data-handler]").map(function(){var t={prev:function(){window["DP_jQuery_"+r].datepicker._adjustDate(i,-n,"M")},next:function(){window["DP_jQuery_"+r].datepicker._adjustDate(i,+n,"M")},hide:function(){window["DP_jQuery_"+r].datepicker._hideDatepicker()},today:function(){window["DP_jQuery_"+r].datepicker._gotoToday(i)},selectDay:function(){return window["DP_jQuery_"+r].datepicker._selectDay(i,+this.getAttribute("data-month"),+this.getAttribute("data-year"),this),!1},selectMonth:function(){return window["DP_jQuery_"+r].datepicker._selectMonthYear(i,this,"M"),!1},selectYear:function(){return window["DP_jQuery_"+r].datepicker._selectMonthYear(i,this,"Y"),!1}};e(this).bind(this.getAttribute("data-event"),t[this.getAttribute("data-handler")])})},_generateHTML:function(e){var t,n,r,i,s,o,u,a,f,l,c,h,p,d,v,m,g,y,b,w,E,S,x,T,N,C,k,L,A,O,M,_,D,P,H,B,j,F,I,q=new Date,R=this._daylightSavingAdjust(new Date(q.getFullYear(),q.getMonth(),q.getDate())),U=this._get(e,"isRTL"),z=this._get(e,"showButtonPanel"),W=this._get(e,"hideIfNoPrevNext"),X=this._get(e,"navigationAsDateFormat"),V=this._getNumberOfMonths(e),$=this._get(e,"showCurrentAtPos"),J=this._get(e,"stepMonths"),K=V[0]!==1||V[1]!==1,Q=this._daylightSavingAdjust(e.currentDay?new Date(e.currentYear,e.currentMonth,e.currentDay):new Date(9999,9,9)),G=this._getMinMaxDate(e,"min"),Y=this._getMinMaxDate(e,"max"),Z=e.drawMonth-$,et=e.drawYear;Z<0&&(Z+=12,et--);if(Y){t=this._daylightSavingAdjust(new Date(Y.getFullYear(),Y.getMonth()-V[0]*V[1]+1,Y.getDate())),t=G&&t<G?G:t;while(this._daylightSavingAdjust(new Date(et,Z,1))>t)Z--,Z<0&&(Z=11,et--)}e.drawMonth=Z,e.drawYear=et,n=this._get(e,"prevText"),n=X?this.formatDate(n,this._daylightSavingAdjust(new Date(et,Z-J,1)),this._getFormatConfig(e)):n,r=this._canAdjustMonth(e,-1,et,Z)?"<a class='ui-datepicker-prev ui-corner-all' data-handler='prev' data-event='click' title='"+n+"'><span class='ui-icon ui-icon-circle-triangle-"+(U?"e":"w")+"'>"+n+"</span></a>":W?"":"<a class='ui-datepicker-prev ui-corner-all ui-state-disabled' title='"+n+"'><span class='ui-icon ui-icon-circle-triangle-"+(U?"e":"w")+"'>"+n+"</span></a>",i=this._get(e,"nextText"),i=X?this.formatDate(i,this._daylightSavingAdjust(new Date(et,Z+J,1)),this._getFormatConfig(e)):i,s=this._canAdjustMonth(e,1,et,Z)?"<a class='ui-datepicker-next ui-corner-all' data-handler='next' data-event='click' title='"+i+"'><span class='ui-icon ui-icon-circle-triangle-"+(U?"w":"e")+"'>"+i+"</span></a>":W?"":"<a class='ui-datepicker-next ui-corner-all ui-state-disabled' title='"+i+"'><span class='ui-icon ui-icon-circle-triangle-"+(U?"w":"e")+"'>"+i+"</span></a>",o=this._get(e,"currentText"),u=this._get(e,"gotoCurrent")&&e.currentDay?Q:R,o=X?this.formatDate(o,u,this._getFormatConfig(e)):o,a=e.inline?"":"<button type='button' class='ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all' data-handler='hide' data-event='click'>"+this._get(e,"closeText")+"</button>",f=z?"<div class='ui-datepicker-buttonpane ui-widget-content'>"+(U?a:"")+(this._isInRange(e,u)?"<button type='button' class='ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all' data-handler='today' data-event='click'>"+o+"</button>":"")+(U?"":a)+"</div>":"",l=parseInt(this._get(e,"firstDay"),10),l=isNaN(l)?0:l,c=this._get(e,"showWeek"),h=this._get(e,"dayNames"),p=this._get(e,"dayNamesMin"),d=this._get(e,"monthNames"),v=this._get(e,"monthNamesShort"),m=this._get(e,"beforeShowDay"),g=this._get(e,"showOtherMonths"),y=this._get(e,"selectOtherMonths"),b=this._getDefaultDate(e),w="",E;for(S=0;S<V[0];S++){x="",this.maxRows=4;for(T=0;T<V[1];T++){N=this._daylightSavingAdjust(new Date(et,Z,e.selectedDay)),C=" ui-corner-all",k="";if(K){k+="<div class='ui-datepicker-group";if(V[1]>1)switch(T){case 0:k+=" ui-datepicker-group-first",C=" ui-corner-"+(U?"right":"left");break;case V[1]-1:k+=" ui-datepicker-group-last",C=" ui-corner-"+(U?"left":"right");break;default:k+=" ui-datepicker-group-middle",C=""}k+="'>"}k+="<div class='ui-datepicker-header ui-widget-header ui-helper-clearfix"+C+"'>"+(/all|left/.test(C)&&S===0?U?s:r:"")+(/all|right/.test(C)&&S===0?U?r:s:"")+this._generateMonthYearHeader(e,Z,et,G,Y,S>0||T>0,d,v)+"</div><table class='ui-datepicker-calendar'><thead>"+"<tr>",L=c?"<th class='ui-datepicker-week-col'>"+this._get(e,"weekHeader")+"</th>":"";for(E=0;E<7;E++)A=(E+l)%7,L+="<th"+((E+l+6)%7>=5?" class='ui-datepicker-week-end'":"")+">"+"<span title='"+h[A]+"'>"+p[A]+"</span></th>";k+=L+"</tr></thead><tbody>",O=this._getDaysInMonth(et,Z),et===e.selectedYear&&Z===e.selectedMonth&&(e.selectedDay=Math.min(e.selectedDay,O)),M=(this._getFirstDayOfMonth(et,Z)-l+7)%7,_=Math.ceil((M+O)/7),D=K?this.maxRows>_?this.maxRows:_:_,this.maxRows=D,P=this._daylightSavingAdjust(new Date(et,Z,1-M));for(H=0;H<D;H++){k+="<tr>",B=c?"<td class='ui-datepicker-week-col'>"+this._get(e,"calculateWeek")(P)+"</td>":"";for(E=0;E<7;E++)j=m?m.apply(e.input?e.input[0]:null,[P]):[!0,""],F=P.getMonth()!==Z,I=F&&!y||!j[0]||G&&P<G||Y&&P>Y,B+="<td class='"+((E+l+6)%7>=5?" ui-datepicker-week-end":"")+(F?" ui-datepicker-other-month":"")+(P.getTime()===N.getTime()&&Z===e.selectedMonth&&e._keyEvent||b.getTime()===P.getTime()&&b.getTime()===N.getTime()?" "+this._dayOverClass:"")+(I?" "+this._unselectableClass+" ui-state-disabled":"")+(F&&!g?"":" "+j[1]+(P.getTime()===Q.getTime()?" "+this._currentClass:"")+(P.getTime()===R.getTime()?" ui-datepicker-today":""))+"'"+((!F||g)&&j[2]?" title='"+j[2]+"'":"")+(I?"":" data-handler='selectDay' data-event='click' data-month='"+P.getMonth()+"' data-year='"+P.getFullYear()+"'")+">"+(F&&!g?"&#xa0;":I?"<span class='ui-state-default'>"+P.getDate()+"</span>":"<a class='ui-state-default"+(P.getTime()===R.getTime()?" ui-state-highlight":"")+(P.getTime()===Q.getTime()?" ui-state-active":"")+(F?" ui-priority-secondary":"")+"' href='#'>"+P.getDate()+"</a>")+"</td>",P.setDate(P.getDate()+1),P=this._daylightSavingAdjust(P);k+=B+"</tr>"}Z++,Z>11&&(Z=0,et++),k+="</tbody></table>"+(K?"</div>"+(V[0]>0&&T===V[1]-1?"<div class='ui-datepicker-row-break'></div>":""):""),x+=k}w+=x}return w+=f,e._keyEvent=!1,w},_generateMonthYearHeader:function(e,t,n,r,i,s,o,u){var a,f,l,c,h,p,d,v,m=this._get(e,"changeMonth"),g=this._get(e,"changeYear"),y=this._get(e,"showMonthAfterYear"),b="<div class='ui-datepicker-title'>",w="";if(s||!m)w+="<span class='ui-datepicker-month'>"+o[t]+"</span>";else{a=r&&r.getFullYear()===n,f=i&&i.getFullYear()===n,w+="<select class='ui-datepicker-month' data-handler='selectMonth' data-event='change'>";for(l=0;l<12;l++)(!a||l>=r.getMonth())&&(!f||l<=i.getMonth())&&(w+="<option value='"+l+"'"+(l===t?" selected='selected'":"")+">"+u[l]+"</option>");w+="</select>"}y||(b+=w+(s||!m||!g?"&#xa0;":""));if(!e.yearshtml){e.yearshtml="";if(s||!g)b+="<span class='ui-datepicker-year'>"+n+"</span>";else{c=this._get(e,"yearRange").split(":"),h=(new Date).getFullYear(),p=function(e){var t=e.match(/c[+\-].*/)?n+parseInt(e.substring(1),10):e.match(/[+\-].*/)?h+parseInt(e,10):parseInt(e,10);return isNaN(t)?h:t},d=p(c[0]),v=Math.max(d,p(c[1]||"")),d=r?Math.max(d,r.getFullYear()):d,v=i?Math.min(v,i.getFullYear()):v,e.yearshtml+="<select class='ui-datepicker-year' data-handler='selectYear' data-event='change'>";for(;d<=v;d++)e.yearshtml+="<option value='"+d+"'"+(d===n?" selected='selected'":"")+">"+d+"</option>";e.yearshtml+="</select>",b+=e.yearshtml,e.yearshtml=null}}return b+=this._get(e,"yearSuffix"),y&&(b+=(s||!m||!g?"&#xa0;":"")+w),b+="</div>",b},_adjustInstDate:function(e,t,n){var r=e.drawYear+(n==="Y"?t:0),i=e.drawMonth+(n==="M"?t:0),s=Math.min(e.selectedDay,this._getDaysInMonth(r,i))+(n==="D"?t:0),o=this._restrictMinMax(e,this._daylightSavingAdjust(new Date(r,i,s)));e.selectedDay=o.getDate(),e.drawMonth=e.selectedMonth=o.getMonth(),e.drawYear=e.selectedYear=o.getFullYear(),(n==="M"||n==="Y")&&this._notifyChange(e)},_restrictMinMax:function(e,t){var n=this._getMinMaxDate(e,"min"),r=this._getMinMaxDate(e,"max"),i=n&&t<n?n:t;return r&&i>r?r:i},_notifyChange:function(e){var t=this._get(e,"onChangeMonthYear");t&&t.apply(e.input?e.input[0]:null,[e.selectedYear,e.selectedMonth+1,e])},_getNumberOfMonths:function(e){var t=this._get(e,"numberOfMonths");return t==null?[1,1]:typeof t=="number"?[1,t]:t},_getMinMaxDate:function(e,t){return this._determineDate(e,this._get(e,t+"Date"),null)},_getDaysInMonth:function(e,t){return 32-this._daylightSavingAdjust(new Date(e,t,32)).getDate()},_getFirstDayOfMonth:function(e,t){return(new Date(e,t,1)).getDay()},_canAdjustMonth:function(e,t,n,r){var i=this._getNumberOfMonths(e),s=this._daylightSavingAdjust(new Date(n,r+(t<0?t:i[0]*i[1]),1));return t<0&&s.setDate(this._getDaysInMonth(s.getFullYear(),s.getMonth())),this._isInRange(e,s)},_isInRange:function(e,t){var n,r,i=this._getMinMaxDate(e,"min"),s=this._getMinMaxDate(e,"max"),o=null,u=null,a=this._get(e,"yearRange");return a&&(n=a.split(":"),r=(new Date).getFullYear(),o=parseInt(n[0],10)+r,u=parseInt(n[1],10)+r),(!i||t.getTime()>=i.getTime())&&(!s||t.getTime()<=s.getTime())&&(!o||t.getFullYear()>=o)&&(!u||t.getFullYear()<=u)},_getFormatConfig:function(e){var t=this._get(e,"shortYearCutoff");return t=typeof t!="string"?t:(new Date).getFullYear()%100+parseInt(t,10),{shortYearCutoff:t,dayNamesShort:this._get(e,"dayNamesShort"),dayNames:this._get(e,"dayNames"),monthNamesShort:this._get(e,"monthNamesShort"),monthNames:this._get(e,"monthNames")}},_formatDate:function(e,t,n,r){t||(e.currentDay=e.selectedDay,e.currentMonth=e.selectedMonth,e.currentYear=e.selectedYear);var i=t?typeof t=="object"?t:this._daylightSavingAdjust(new Date(r,n,t)):this._daylightSavingAdjust(new Date(e.currentYear,e.currentMonth,e.currentDay));return this.formatDate(this._get(e,"dateFormat"),i,this._getFormatConfig(e))}}),e.fn.datepicker=function(t){if(!this.length)return this;e.datepicker.initialized||(e(document).mousedown(e.datepicker._checkExternalClick),e.datepicker.initialized=!0),e("#"+e.datepicker._mainDivId).length===0&&e("body").append(e.datepicker.dpDiv);var n=Array.prototype.slice.call(arguments,1);return typeof t!="string"||t!=="isDisabled"&&t!=="getDate"&&t!=="widget"?t==="option"&&arguments.length===2&&typeof arguments[1]=="string"?e.datepicker["_"+t+"Datepicker"].apply(e.datepicker,[this[0]].concat(n)):this.each(function(){typeof t=="string"?e.datepicker["_"+t+"Datepicker"].apply(e.datepicker,[this].concat(n)):e.datepicker._attachDatepicker(this,t)}):e.datepicker["_"+t+"Datepicker"].apply(e.datepicker,[this[0]].concat(n))},e.datepicker=new s,e.datepicker.initialized=!1,e.datepicker.uuid=(new Date).getTime(),e.datepicker.version="1.10.0",window["DP_jQuery_"+r]=e})(jQuery);(function(e,t){var n={buttons:!0,height:!0,maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0,width:!0},r={maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0};e.widget("ui.dialog",{version:"1.10.0",options:{appendTo:"body",autoOpen:!0,buttons:[],closeOnEscape:!0,closeText:"close",dialogClass:"",draggable:!0,hide:null,height:"auto",maxHeight:null,maxWidth:null,minHeight:150,minWidth:150,modal:!1,position:{my:"center",at:"center",of:window,collision:"fit",using:function(t){var n=e(this).css(t).offset().top;n<0&&e(this).css("top",t.top-n)}},resizable:!0,show:null,title:null,width:300,beforeClose:null,close:null,drag:null,dragStart:null,dragStop:null,focus:null,open:null,resize:null,resizeStart:null,resizeStop:null},_create:function(){this.originalCss={display:this.element[0].style.display,width:this.element[0].style.width,minHeight:this.element[0].style.minHeight,maxHeight:this.element[0].style.maxHeight,height:this.element[0].style.height},this.originalPosition={parent:this.element.parent(),index:this.element.parent().children().index(this.element)},this.originalTitle=this.element.attr("title"),this.options.title=this.options.title||this.originalTitle,this._createWrapper(),this.element.show().removeAttr("title").addClass("ui-dialog-content ui-widget-content").appendTo(this.uiDialog),this._createTitlebar(),this._createButtonPane(),this.options.draggable&&e.fn.draggable&&this._makeDraggable(),this.options.resizable&&e.fn.resizable&&this._makeResizable(),this._isOpen=!1},_init:function(){this.options.autoOpen&&this.open()},_appendTo:function(){var t=this.options.appendTo;return t&&(t.jquery||t.nodeType)?e(t):this.document.find(t||"body").eq(0)},_destroy:function(){var e,t=this.originalPosition;this._destroyOverlay(),this.element.removeUniqueId().removeClass("ui-dialog-content ui-widget-content").css(this.originalCss).detach(),this.uiDialog.stop(!0,!0).remove(),this.originalTitle&&this.element.attr("title",this.originalTitle),e=t.parent.children().eq(t.index),e.length&&e[0]!==this.element[0]?e.before(this.element):t.parent.append(this.element)},widget:function(){return this.uiDialog},disable:e.noop,enable:e.noop,close:function(t){var n=this;if(!this._isOpen||this._trigger("beforeClose",t)===!1)return;this._isOpen=!1,this._destroyOverlay(),this.opener.filter(":focusable").focus().length||e(this.document[0].activeElement).blur(),this._hide(this.uiDialog,this.options.hide,function(){n._trigger("close",t)})},isOpen:function(){return this._isOpen},moveToTop:function(){this._moveToTop()},_moveToTop:function(e,t){var n=!!this.uiDialog.nextAll(":visible").insertBefore(this.uiDialog).length;return n&&!t&&this._trigger("focus",e),n},open:function(){if(this._isOpen){this._moveToTop()&&this._focusTabbable();return}this.opener=e(this.document[0].activeElement),this._size(),this._position(),this._createOverlay(),this._moveToTop(null,!0),this._show(this.uiDialog,this.options.show),this._focusTabbable(),this._isOpen=!0,this._trigger("open"),this._trigger("focus")},_focusTabbable:function(){var e=this.element.find("[autofocus]");e.length||(e=this.element.find(":tabbable")),e.length||(e=this.uiDialogButtonPane.find(":tabbable")),e.length||(e=this.uiDialogTitlebarClose.filter(":tabbable")),e.length||(e=this.uiDialog),e.eq(0).focus()},_keepFocus:function(t){function n(){var t=this.document[0].activeElement,n=this.uiDialog[0]===t||e.contains(this.uiDialog[0],t);n||this._focusTabbable()}t.preventDefault(),n.call(this),this._delay(n)},_createWrapper:function(){this.uiDialog=e("<div>").addClass("ui-dialog ui-widget ui-widget-content ui-corner-all ui-front "+this.options.dialogClass).hide().attr({tabIndex:-1,role:"dialog"}).appendTo(this._appendTo()),this._on(this.uiDialog,{keydown:function(t){if(this.options.closeOnEscape&&!t.isDefaultPrevented()&&t.keyCode&&t.keyCode===e.ui.keyCode.ESCAPE){t.preventDefault(),this.close(t);return}if(t.keyCode!==e.ui.keyCode.TAB)return;var n=this.uiDialog.find(":tabbable"),r=n.filter(":first"),i=n.filter(":last");t.target!==i[0]&&t.target!==this.uiDialog[0]||!!t.shiftKey?(t.target===r[0]||t.target===this.uiDialog[0])&&t.shiftKey&&(i.focus(1),t.preventDefault()):(r.focus(1),t.preventDefault())},mousedown:function(e){this._moveToTop(e)&&this._focusTabbable()}}),this.element.find("[aria-describedby]").length||this.uiDialog.attr({"aria-describedby":this.element.uniqueId().attr("id")})},_createTitlebar:function(){var t;this.uiDialogTitlebar=e("<div>").addClass("ui-dialog-titlebar ui-widget-header ui-corner-all ui-helper-clearfix").prependTo(this.uiDialog),this._on(this.uiDialogTitlebar,{mousedown:function(t){e(t.target).closest(".ui-dialog-titlebar-close")||this.uiDialog.focus()}}),this.uiDialogTitlebarClose=e("<button></button>").button({label:this.options.closeText,icons:{primary:"ui-icon-closethick"},text:!1}).addClass("ui-dialog-titlebar-close").appendTo(this.uiDialogTitlebar),this._on(this.uiDialogTitlebarClose,{click:function(e){e.preventDefault(),this.close(e)}}),t=e("<span>").uniqueId().addClass("ui-dialog-title").prependTo(this.uiDialogTitlebar),this._title(t),this.uiDialog.attr({"aria-labelledby":t.attr("id")})},_title:function(e){this.options.title||e.html("&#160;"),e.text(this.options.title)},_createButtonPane:function(){this.uiDialogButtonPane=e("<div>").addClass("ui-dialog-buttonpane ui-widget-content ui-helper-clearfix"),this.uiButtonSet=e("<div>").addClass("ui-dialog-buttonset").appendTo(this.uiDialogButtonPane),this._createButtons()},_createButtons:function(){var t=this,n=this.options.buttons;this.uiDialogButtonPane.remove(),this.uiButtonSet.empty();if(e.isEmptyObject(n)){this.uiDialog.removeClass("ui-dialog-buttons");return}e.each(n,function(n,r){var i,s;r=e.isFunction(r)?{click:r,text:n}:r,r=e.extend({type:"button"},r),i=r.click,r.click=function(){i.apply(t.element[0],arguments)},s={icons:r.icons,text:r.showText},delete r.icons,delete r.showText,e("<button></button>",r).button(s).appendTo(t.uiButtonSet)}),this.uiDialog.addClass("ui-dialog-buttons"),this.uiDialogButtonPane.appendTo(this.uiDialog)},_makeDraggable:function(){function r(e){return{position:e.position,offset:e.offset}}var t=this,n=this.options;this.uiDialog.draggable({cancel:".ui-dialog-content, .ui-dialog-titlebar-close",handle:".ui-dialog-titlebar",containment:"document",start:function(n,i){e(this).addClass("ui-dialog-dragging"),t._trigger("dragStart",n,r(i))},drag:function(e,n){t._trigger("drag",e,r(n))},stop:function(i,s){n.position=[s.position.left-t.document.scrollLeft(),s.position.top-t.document.scrollTop()],e(this).removeClass("ui-dialog-dragging"),t._trigger("dragStop",i,r(s))}})},_makeResizable:function(){function o(e){return{originalPosition:e.originalPosition,originalSize:e.originalSize,position:e.position,size:e.size}}var t=this,n=this.options,r=n.resizable,i=this.uiDialog.css("position"),s=typeof r=="string"?r:"n,e,s,w,se,sw,ne,nw";this.uiDialog.resizable({cancel:".ui-dialog-content",containment:"document",alsoResize:this.element,maxWidth:n.maxWidth,maxHeight:n.maxHeight,minWidth:n.minWidth,minHeight:this._minHeight(),handles:s,start:function(n,r){e(this).addClass("ui-dialog-resizing"),t._trigger("resizeStart",n,o(r))},resize:function(e,n){t._trigger("resize",e,o(n))},stop:function(r,i){n.height=e(this).height(),n.width=e(this).width(),e(this).removeClass("ui-dialog-resizing"),t._trigger("resizeStop",r,o(i))}}).css("position",i)},_minHeight:function(){var e=this.options;return e.height==="auto"?e.minHeight:Math.min(e.minHeight,e.height)},_position:function(){var e=this.uiDialog.is(":visible");e||this.uiDialog.show(),this.uiDialog.position(this.options.position),e||this.uiDialog.hide()},_setOptions:function(t){var i=this,s=!1,o={};e.each(t,function(e,t){i._setOption(e,t),e in n&&(s=!0),e in r&&(o[e]=t)}),s&&(this._size(),this._position()),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option",o)},_setOption:function(e,t){var n,r,i=this.uiDialog;e==="dialogClass"&&i.removeClass(this.options.dialogClass).addClass(t);if(e==="disabled")return;this._super(e,t),e==="appendTo"&&this.uiDialog.appendTo(this._appendTo()),e==="buttons"&&this._createButtons(),e==="closeText"&&this.uiDialogTitlebarClose.button({label:""+t}),e==="draggable"&&(n=i.is(":data(ui-draggable)"),n&&!t&&i.draggable("destroy"),!n&&t&&this._makeDraggable()),e==="position"&&this._position(),e==="resizable"&&(r=i.is(":data(ui-resizable)"),r&&!t&&i.resizable("destroy"),r&&typeof t=="string"&&i.resizable("option","handles",t),!r&&t!==!1&&this._makeResizable()),e==="title"&&this._title(this.uiDialogTitlebar.find(".ui-dialog-title"))},_size:function(){var e,t,n,r=this.options;this.element.show().css({width:"auto",minHeight:0,maxHeight:"none",height:0}),r.minWidth>r.width&&(r.width=r.minWidth),e=this.uiDialog.css({height:"auto",width:r.width}).outerHeight(),t=Math.max(0,r.minHeight-e),n=typeof r.maxHeight=="number"?Math.max(0,r.maxHeight-e):"none",r.height==="auto"?this.element.css({minHeight:t,maxHeight:n,height:"auto"}):this.element.height(Math.max(0,r.height-e)),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option","minHeight",this._minHeight())},_createOverlay:function(){if(!this.options.modal)return;e.ui.dialog.overlayInstances||this._delay(function(){e.ui.dialog.overlayInstances&&this._on(this.document,{focusin:function(t){e(t.target).closest(".ui-dialog").length||(t.preventDefault(),e(".ui-dialog:visible:last .ui-dialog-content").data("ui-dialog")._focusTabbable())}})}),this.overlay=e("<div>").addClass("ui-widget-overlay ui-front").appendTo(this.document[0].body),this._on(this.overlay,{mousedown:"_keepFocus"}),e.ui.dialog.overlayInstances++},_destroyOverlay:function(){if(!this.options.modal)return;e.ui.dialog.overlayInstances--,e.ui.dialog.overlayInstances||this._off(this.document,"focusin"),this.overlay.remove()}}),e.ui.dialog.overlayInstances=0,e.uiBackCompat!==!1&&e.widget("ui.dialog",e.ui.dialog,{_position:function(){var t=this.options.position,n=[],r=[0,0],i;if(t){if(typeof t=="string"||typeof t=="object"&&"0"in t)n=t.split?t.split(" "):[t[0],t[1]],n.length===1&&(n[1]=n[0]),e.each(["left","top"],function(e,t){+n[e]===n[e]&&(r[e]=n[e],n[e]=t)}),t={my:n[0]+(r[0]<0?r[0]:"+"+r[0])+" "+n[1]+(r[1]<0?r[1]:"+"+r[1]),at:n.join(" ")};t=e.extend({},e.ui.dialog.prototype.options.position,t)}else t=e.ui.dialog.prototype.options.position;i=this.uiDialog.is(":visible"),i||this.uiDialog.show(),this.uiDialog.position(t),i||this.uiDialog.hide()}})})(jQuery);(function(e,t){e.widget("ui.menu",{version:"1.10.0",defaultElement:"<ul>",delay:300,options:{icons:{submenu:"ui-icon-carat-1-e"},menus:"ul",position:{my:"left top",at:"right top"},role:"menu",blur:null,focus:null,select:null},_create:function(){this.activeMenu=this.element,this.mouseHandled=!1,this.element.uniqueId().addClass("ui-menu ui-widget ui-widget-content ui-corner-all").toggleClass("ui-menu-icons",!!this.element.find(".ui-icon").length).attr({role:this.options.role,tabIndex:0}).bind("click"+this.eventNamespace,e.proxy(function(e){this.options.disabled&&e.preventDefault()},this)),this.options.disabled&&this.element.addClass("ui-state-disabled").attr("aria-disabled","true"),this._on({"mousedown .ui-menu-item > a":function(e){e.preventDefault()},"click .ui-state-disabled > a":function(e){e.preventDefault()},"click .ui-menu-item:has(a)":function(t){var n=e(t.target).closest(".ui-menu-item");!this.mouseHandled&&n.not(".ui-state-disabled").length&&(this.mouseHandled=!0,this.select(t),n.has(".ui-menu").length?this.expand(t):this.element.is(":focus")||(this.element.trigger("focus",[!0]),this.active&&this.active.parents(".ui-menu").length===1&&clearTimeout(this.timer)))},"mouseenter .ui-menu-item":function(t){var n=e(t.currentTarget);n.siblings().children(".ui-state-active").removeClass("ui-state-active"),this.focus(t,n)},mouseleave:"collapseAll","mouseleave .ui-menu":"collapseAll",focus:function(e,t){var n=this.active||this.element.children(".ui-menu-item").eq(0);t||this.focus(e,n)},blur:function(t){this._delay(function(){e.contains(this.element[0],this.document[0].activeElement)||this.collapseAll(t)})},keydown:"_keydown"}),this.refresh(),this._on(this.document,{click:function(t){e(t.target).closest(".ui-menu").length||this.collapseAll(t),this.mouseHandled=!1}})},_destroy:function(){this.element.removeAttr("aria-activedescendant").find(".ui-menu").addBack().removeClass("ui-menu ui-widget ui-widget-content ui-corner-all ui-menu-icons").removeAttr("role").removeAttr("tabIndex").removeAttr("aria-labelledby").removeAttr("aria-expanded").removeAttr("aria-hidden").removeAttr("aria-disabled").removeUniqueId().show(),this.element.find(".ui-menu-item").removeClass("ui-menu-item").removeAttr("role").removeAttr("aria-disabled").children("a").removeUniqueId().removeClass("ui-corner-all ui-state-hover").removeAttr("tabIndex").removeAttr("role").removeAttr("aria-haspopup").children().each(function(){var t=e(this);t.data("ui-menu-submenu-carat")&&t.remove()}),this.element.find(".ui-menu-divider").removeClass("ui-menu-divider ui-widget-content")},_keydown:function(t){function a(e){return e.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")}var n,r,i,s,o,u=!0;switch(t.keyCode){case e.ui.keyCode.PAGE_UP:this.previousPage(t);break;case e.ui.keyCode.PAGE_DOWN:this.nextPage(t);break;case e.ui.keyCode.HOME:this._move("first","first",t);break;case e.ui.keyCode.END:this._move("last","last",t);break;case e.ui.keyCode.UP:this.previous(t);break;case e.ui.keyCode.DOWN:this.next(t);break;case e.ui.keyCode.LEFT:this.collapse(t);break;case e.ui.keyCode.RIGHT:this.active&&!this.active.is(".ui-state-disabled")&&this.expand(t);break;case e.ui.keyCode.ENTER:case e.ui.keyCode.SPACE:this._activate(t);break;case e.ui.keyCode.ESCAPE:this.collapse(t);break;default:u=!1,r=this.previousFilter||"",i=String.fromCharCode(t.keyCode),s=!1,clearTimeout(this.filterTimer),i===r?s=!0:i=r+i,o=new RegExp("^"+a(i),"i"),n=this.activeMenu.children(".ui-menu-item").filter(function(){return o.test(e(this).children("a").text())}),n=s&&n.index(this.active.next())!==-1?this.active.nextAll(".ui-menu-item"):n,n.length||(i=String.fromCharCode(t.keyCode),o=new RegExp("^"+a(i),"i"),n=this.activeMenu.children(".ui-menu-item").filter(function(){return o.test(e(this).children("a").text())})),n.length?(this.focus(t,n),n.length>1?(this.previousFilter=i,this.filterTimer=this._delay(function(){delete this.previousFilter},1e3)):delete this.previousFilter):delete this.previousFilter}u&&t.preventDefault()},_activate:function(e){this.active.is(".ui-state-disabled")||(this.active.children("a[aria-haspopup='true']").length?this.expand(e):this.select(e))},refresh:function(){var t,n=this.options.icons.submenu,r=this.element.find(this.options.menus);r.filter(":not(.ui-menu)").addClass("ui-menu ui-widget ui-widget-content ui-corner-all").hide().attr({role:this.options.role,"aria-hidden":"true","aria-expanded":"false"}).each(function(){var t=e(this),r=t.prev("a"),i=e("<span>").addClass("ui-menu-icon ui-icon "+n).data("ui-menu-submenu-carat",!0);r.attr("aria-haspopup","true").prepend(i),t.attr("aria-labelledby",r.attr("id"))}),t=r.add(this.element),t.children(":not(.ui-menu-item):has(a)").addClass("ui-menu-item").attr("role","presentation").children("a").uniqueId().addClass("ui-corner-all").attr({tabIndex:-1,role:this._itemRole()}),t.children(":not(.ui-menu-item)").each(function(){var t=e(this);/[^\-—–\s]/.test(t.text())||t.addClass("ui-widget-content ui-menu-divider")}),t.children(".ui-state-disabled").attr("aria-disabled","true"),this.active&&!e.contains(this.element[0],this.active[0])&&this.blur()},_itemRole:function(){return{menu:"menuitem",listbox:"option"}[this.options.role]},_setOption:function(e,t){e==="icons"&&this.element.find(".ui-menu-icon").removeClass(this.options.icons.submenu).addClass(t.submenu),this._super(e,t)},focus:function(e,t){var n,r;this.blur(e,e&&e.type==="focus"),this._scrollIntoView(t),this.active=t.first(),r=this.active.children("a").addClass("ui-state-focus"),this.options.role&&this.element.attr("aria-activedescendant",r.attr("id")),this.active.parent().closest(".ui-menu-item").children("a:first").addClass("ui-state-active"),e&&e.type==="keydown"?this._close():this.timer=this._delay(function(){this._close()},this.delay),n=t.children(".ui-menu"),n.length&&/^mouse/.test(e.type)&&this._startOpening(n),this.activeMenu=t.parent(),this._trigger("focus",e,{item:t})},_scrollIntoView:function(t){var n,r,i,s,o,u;this._hasScroll()&&(n=parseFloat(e.css(this.activeMenu[0],"borderTopWidth"))||0,r=parseFloat(e.css(this.activeMenu[0],"paddingTop"))||0,i=t.offset().top-this.activeMenu.offset().top-n-r,s=this.activeMenu.scrollTop(),o=this.activeMenu.height(),u=t.height(),i<0?this.activeMenu.scrollTop(s+i):i+u>o&&this.activeMenu.scrollTop(s+i-o+u))},blur:function(e,t){t||clearTimeout(this.timer);if(!this.active)return;this.active.children("a").removeClass("ui-state-focus"),this.active=null,this._trigger("blur",e,{item:this.active})},_startOpening:function(e){clearTimeout(this.timer);if(e.attr("aria-hidden")!=="true")return;this.timer=this._delay(function(){this._close(),this._open(e)},this.delay)},_open:function(t){var n=e.extend({of:this.active},this.options.position);clearTimeout(this.timer),this.element.find(".ui-menu").not(t.parents(".ui-menu")).hide().attr("aria-hidden","true"),t.show().removeAttr("aria-hidden").attr("aria-expanded","true").position(n)},collapseAll:function(t,n){clearTimeout(this.timer),this.timer=this._delay(function(){var r=n?this.element:e(t&&t.target).closest(this.element.find(".ui-menu"));r.length||(r=this.element),this._close(r),this.blur(t),this.activeMenu=r},this.delay)},_close:function(e){e||(e=this.active?this.active.parent():this.element),e.find(".ui-menu").hide().attr("aria-hidden","true").attr("aria-expanded","false").end().find("a.ui-state-active").removeClass("ui-state-active")},collapse:function(e){var t=this.active&&this.active.parent().closest(".ui-menu-item",this.element);t&&t.length&&(this._close(),this.focus(e,t))},expand:function(e){var t=this.active&&this.active.children(".ui-menu ").children(".ui-menu-item").first();t&&t.length&&(this._open(t.parent()),this._delay(function(){this.focus(e,t)}))},next:function(e){this._move("next","first",e)},previous:function(e){this._move("prev","last",e)},isFirstItem:function(){return this.active&&!this.active.prevAll(".ui-menu-item").length},isLastItem:function(){return this.active&&!this.active.nextAll(".ui-menu-item").length},_move:function(e,t,n){var r;this.active&&(e==="first"||e==="last"?r=this.active[e==="first"?"prevAll":"nextAll"](".ui-menu-item").eq(-1):r=this.active[e+"All"](".ui-menu-item").eq(0));if(!r||!r.length||!this.active)r=this.activeMenu.children(".ui-menu-item")[t]();this.focus(n,r)},nextPage:function(t){var n,r,i;if(!this.active){this.next(t);return}if(this.isLastItem())return;this._hasScroll()?(r=this.active.offset().top,i=this.element.height(),this.active.nextAll(".ui-menu-item").each(function(){return n=e(this),n.offset().top-r-i<0}),this.focus(t,n)):this.focus(t,this.activeMenu.children(".ui-menu-item")[this.active?"last":"first"]())},previousPage:function(t){var n,r,i;if(!this.active){this.next(t);return}if(this.isFirstItem())return;this._hasScroll()?(r=this.active.offset().top,i=this.element.height(),this.active.prevAll(".ui-menu-item").each(function(){return n=e(this),n.offset().top-r+i>0}),this.focus(t,n)):this.focus(t,this.activeMenu.children(".ui-menu-item").first())},_hasScroll:function(){return this.element.outerHeight()<this.element.prop("scrollHeight")},select:function(t){this.active=this.active||e(t.target).closest(".ui-menu-item");var n={item:this.active};this.active.has(".ui-menu").length||this.collapseAll(t,!0),this._trigger("select",t,n)}})})(jQuery);(function(e,t){e.widget("ui.progressbar",{version:"1.10.0",options:{max:100,value:0,change:null,complete:null},min:0,_create:function(){this.oldValue=this.options.value=this._constrainedValue(),this.element.addClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").attr({role:"progressbar","aria-valuemin":this.min}),this.valueDiv=e("<div class='ui-progressbar-value ui-widget-header ui-corner-left'></div>").appendTo(this.element),this._refreshValue()},_destroy:function(){this.element.removeClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").removeAttr("role").removeAttr("aria-valuemin").removeAttr("aria-valuemax").removeAttr("aria-valuenow"),this.valueDiv.remove()},value:function(e){if(e===t)return this.options.value;this.options.value=this._constrainedValue(e),this._refreshValue()},_constrainedValue:function(e){return e===t&&(e=this.options.value),this.indeterminate=e===!1,typeof e!="number"&&(e=0),this.indeterminate?!1:Math.min(this.options.max,Math.max(this.min,e))},_setOptions:function(e){var t=e.value;delete e.value,this._super(e),this.options.value=this._constrainedValue(t),this._refreshValue()},_setOption:function(e,t){e==="max"&&(t=Math.max(this.min,t)),this._super(e,t)},_percentage:function(){return this.indeterminate?100:100*(this.options.value-this.min)/(this.options.max-this.min)},_refreshValue:function(){var t=this.options.value,n=this._percentage();this.valueDiv.toggle(this.indeterminate||t>this.min).toggleClass("ui-corner-right",t===this.options.max).width(n.toFixed(0)+"%"),this.element.toggleClass("ui-progressbar-indeterminate",this.indeterminate),this.indeterminate?(this.element.removeAttr("aria-valuenow"),this.overlayDiv||(this.overlayDiv=e("<div class='ui-progressbar-overlay'></div>").appendTo(this.valueDiv))):(this.element.attr({"aria-valuemax":this.options.max,"aria-valuenow":t}),this.overlayDiv&&(this.overlayDiv.remove(),this.overlayDiv=null)),this.oldValue!==t&&(this.oldValue=t,this._trigger("change")),t===this.options.max&&this._trigger("complete")}})})(jQuery);(function(e,t){var n=5;e.widget("ui.slider",e.ui.mouse,{version:"1.10.0",widgetEventPrefix:"slide",options:{animate:!1,distance:0,max:100,min:0,orientation:"horizontal",range:!1,step:1,value:0,values:null,change:null,slide:null,start:null,stop:null},_create:function(){var t,n,r=this.options,i=this.element.find(".ui-slider-handle").addClass("ui-state-default ui-corner-all"),s="<a class='ui-slider-handle ui-state-default ui-corner-all' href='#'></a>",o=[];this._keySliding=!1,this._mouseSliding=!1,this._animateOff=!0,this._handleIndex=null,this._detectOrientation(),this._mouseInit(),this.element.addClass("ui-slider ui-slider-"+this.orientation+" ui-widget"+" ui-widget-content"+" ui-corner-all"),this.range=e([]),r.range&&(r.range===!0&&(r.values?r.values.length&&r.values.length!==2?r.values=[r.values[0],r.values[0]]:e.isArray(r.values)&&(r.values=r.values.slice(0)):r.values=[this._valueMin(),this._valueMin()]),this.range=e("<div></div>").appendTo(this.element).addClass("ui-slider-range ui-widget-header"+(r.range==="min"||r.range==="max"?" ui-slider-range-"+r.range:""))),n=r.values&&r.values.length||1;for(t=i.length;t<n;t++)o.push(s);this.handles=i.add(e(o.join("")).appendTo(this.element)),this.handle=this.handles.eq(0),this.handles.add(this.range).filter("a").click(function(e){e.preventDefault()}).mouseenter(function(){r.disabled||e(this).addClass("ui-state-hover")}).mouseleave(function(){e(this).removeClass("ui-state-hover")}).focus(function(){r.disabled?e(this).blur():(e(".ui-slider .ui-state-focus").removeClass("ui-state-focus"),e(this).addClass("ui-state-focus"))}).blur(function(){e(this).removeClass("ui-state-focus")}),this.handles.each(function(t){e(this).data("ui-slider-handle-index",t)}),this._setOption("disabled",r.disabled),this._on(this.handles,this._handleEvents),this._refreshValue(),this._animateOff=!1},_destroy:function(){this.handles.remove(),this.range.remove(),this.element.removeClass("ui-slider ui-slider-horizontal ui-slider-vertical ui-widget ui-widget-content ui-corner-all"),this._mouseDestroy()},_mouseCapture:function(t){var n,r,i,s,o,u,a,f,l=this,c=this.options;return c.disabled?!1:(this.elementSize={width:this.element.outerWidth(),height:this.element.outerHeight()},this.elementOffset=this.element.offset(),n={x:t.pageX,y:t.pageY},r=this._normValueFromMouse(n),i=this._valueMax()-this._valueMin()+1,this.handles.each(function(t){var n=Math.abs(r-l.values(t));if(i>n||i===n&&(t===l._lastChangedValue||l.values(t)===c.min))i=n,s=e(this),o=t}),u=this._start(t,o),u===!1?!1:(this._mouseSliding=!0,this._handleIndex=o,s.addClass("ui-state-active").focus(),a=s.offset(),f=!e(t.target).parents().addBack().is(".ui-slider-handle"),this._clickOffset=f?{left:0,top:0}:{left:t.pageX-a.left-s.width()/2,top:t.pageY-a.top-s.height()/2-(parseInt(s.css("borderTopWidth"),10)||0)-(parseInt(s.css("borderBottomWidth"),10)||0)+(parseInt(s.css("marginTop"),10)||0)},this.handles.hasClass("ui-state-hover")||this._slide(t,o,r),this._animateOff=!0,!0))},_mouseStart:function(){return!0},_mouseDrag:function(e){var t={x:e.pageX,y:e.pageY},n=this._normValueFromMouse(t);return this._slide(e,this._handleIndex,n),!1},_mouseStop:function(e){return this.handles.removeClass("ui-state-active"),this._mouseSliding=!1,this._stop(e,this._handleIndex),this._change(e,this._handleIndex),this._handleIndex=null,this._clickOffset=null,this._animateOff=!1,!1},_detectOrientation:function(){this.orientation=this.options.orientation==="vertical"?"vertical":"horizontal"},_normValueFromMouse:function(e){var t,n,r,i,s;return this.orientation==="horizontal"?(t=this.elementSize.width,n=e.x-this.elementOffset.left-(this._clickOffset?this._clickOffset.left:0)):(t=this.elementSize.height,n=e.y-this.elementOffset.top-(this._clickOffset?this._clickOffset.top:0)),r=n/t,r>1&&(r=1),r<0&&(r=0),this.orientation==="vertical"&&(r=1-r),i=this._valueMax()-this._valueMin(),s=this._valueMin()+r*i,this._trimAlignValue(s)},_start:function(e,t){var n={handle:this.handles[t],value:this.value()};return this.options.values&&this.options.values.length&&(n.value=this.values(t),n.values=this.values()),this._trigger("start",e,n)},_slide:function(e,t,n){var r,i,s;this.options.values&&this.options.values.length?(r=this.values(t?0:1),this.options.values.length===2&&this.options.range===!0&&(t===0&&n>r||t===1&&n<r)&&(n=r),n!==this.values(t)&&(i=this.values(),i[t]=n,s=this._trigger("slide",e,{handle:this.handles[t],value:n,values:i}),r=this.values(t?0:1),s!==!1&&this.values(t,n,!0))):n!==this.value()&&(s=this._trigger("slide",e,{handle:this.handles[t],value:n}),s!==!1&&this.value(n))},_stop:function(e,t){var n={handle:this.handles[t],value:this.value()};this.options.values&&this.options.values.length&&(n.value=this.values(t),n.values=this.values()),this._trigger("stop",e,n)},_change:function(e,t){if(!this._keySliding&&!this._mouseSliding){var n={handle:this.handles[t],value:this.value()};this.options.values&&this.options.values.length&&(n.value=this.values(t),n.values=this.values()),this._lastChangedValue=t,this._trigger("change",e,n)}},value:function(e){if(arguments.length){this.options.value=this._trimAlignValue(e),this._refreshValue(),this._change(null,0);return}return this._value()},values:function(t,n){var r,i,s;if(arguments.length>1){this.options.values[t]=this._trimAlignValue(n),this._refreshValue(),this._change(null,t);return}if(!arguments.length)return this._values();if(!e.isArray(arguments[0]))return this.options.values&&this.options.values.length?this._values(t):this.value();r=this.options.values,i=arguments[0];for(s=0;s<r.length;s+=1)r[s]=this._trimAlignValue(i[s]),this._change(null,s);this._refreshValue()},_setOption:function(t,n){var r,i=0;e.isArray(this.options.values)&&(i=this.options.values.length),e.Widget.prototype._setOption.apply(this,arguments);switch(t){case"disabled":n?(this.handles.filter(".ui-state-focus").blur(),this.handles.removeClass("ui-state-hover"),this.handles.prop("disabled",!0)):this.handles.prop("disabled",!1);break;case"orientation":this._detectOrientation(),this.element.removeClass("ui-slider-horizontal ui-slider-vertical").addClass("ui-slider-"+this.orientation),this._refreshValue();break;case"value":this._animateOff=!0,this._refreshValue(),this._change(null,0),this._animateOff=!1;break;case"values":this._animateOff=!0,this._refreshValue();for(r=0;r<i;r+=1)this._change(null,r);this._animateOff=!1;break;case"min":case"max":this._animateOff=!0,this._refreshValue(),this._animateOff=!1}},_value:function(){var e=this.options.value;return e=this._trimAlignValue(e),e},_values:function(e){var t,n,r;if(arguments.length)return t=this.options.values[e],t=this._trimAlignValue(t),t;n=this.options.values.slice();for(r=0;r<n.length;r+=1)n[r]=this._trimAlignValue(n[r]);return n},_trimAlignValue:function(e){if(e<=this._valueMin())return this._valueMin();if(e>=this._valueMax())return this._valueMax();var t=this.options.step>0?this.options.step:1,n=(e-this._valueMin())%t,r=e-n;return Math.abs(n)*2>=t&&(r+=n>0?t:-t),parseFloat(r.toFixed(5))},_valueMin:function(){return this.options.min},_valueMax:function(){return this.options.max},_refreshValue:function(){var t,n,r,i,s,o=this.options.range,u=this.options,a=this,f=this._animateOff?!1:u.animate,l={};this.options.values&&this.options.values.length?this.handles.each(function(r){n=(a.values(r)-a._valueMin())/(a._valueMax()-a._valueMin())*100,l[a.orientation==="horizontal"?"left":"bottom"]=n+"%",e(this).stop(1,1)[f?"animate":"css"](l,u.animate),a.options.range===!0&&(a.orientation==="horizontal"?(r===0&&a.range.stop(1,1)[f?"animate":"css"]({left:n+"%"},u.animate),r===1&&a.range[f?"animate":"css"]({width:n-t+"%"},{queue:!1,duration:u.animate})):(r===0&&a.range.stop(1,1)[f?"animate":"css"]({bottom:n+"%"},u.animate),r===1&&a.range[f?"animate":"css"]({height:n-t+"%"},{queue:!1,duration:u.animate}))),t=n}):(r=this.value(),i=this._valueMin(),s=this._valueMax(),n=s!==i?(r-i)/(s-i)*100:0,l[this.orientation==="horizontal"?"left":"bottom"]=n+"%",this.handle.stop(1,1)[f?"animate":"css"](l,u.animate),o==="min"&&this.orientation==="horizontal"&&this.range.stop(1,1)[f?"animate":"css"]({width:n+"%"},u.animate),o==="max"&&this.orientation==="horizontal"&&this.range[f?"animate":"css"]({width:100-n+"%"},{queue:!1,duration:u.animate}),o==="min"&&this.orientation==="vertical"&&this.range.stop(1,1)[f?"animate":"css"]({height:n+"%"},u.animate),o==="max"&&this.orientation==="vertical"&&this.range[f?"animate":"css"]({height:100-n+"%"},{queue:!1,duration:u.animate}))},_handleEvents:{keydown:function(t){var r,i,s,o,u=e(t.target).data("ui-slider-handle-index");switch(t.keyCode){case e.ui.keyCode.HOME:case e.ui.keyCode.END:case e.ui.keyCode.PAGE_UP:case e.ui.keyCode.PAGE_DOWN:case e.ui.keyCode.UP:case e.ui.keyCode.RIGHT:case e.ui.keyCode.DOWN:case e.ui.keyCode.LEFT:t.preventDefault();if(!this._keySliding){this._keySliding=!0,e(t.target).addClass("ui-state-active"),r=this._start(t,u);if(r===!1)return}}o=this.options.step,this.options.values&&this.options.values.length?i=s=this.values(u):i=s=this.value();switch(t.keyCode){case e.ui.keyCode.HOME:s=this._valueMin();break;case e.ui.keyCode.END:s=this._valueMax();break;case e.ui.keyCode.PAGE_UP:s=this._trimAlignValue(i+(this._valueMax()-this._valueMin())/n);break;case e.ui.keyCode.PAGE_DOWN:s=this._trimAlignValue(i-(this._valueMax()-this._valueMin())/n);break;case e.ui.keyCode.UP:case e.ui.keyCode.RIGHT:if(i===this._valueMax())return;s=this._trimAlignValue(i+o);break;case e.ui.keyCode.DOWN:case e.ui.keyCode.LEFT:if(i===this._valueMin())return;s=this._trimAlignValue(i-o)}this._slide(t,u,s)},keyup:function(t){var n=e(t.target).data("ui-slider-handle-index");this._keySliding&&(this._keySliding=!1,this._stop(t,n),this._change(t,n),e(t.target).removeClass("ui-state-active"))}}})})(jQuery);(function(e){function t(e){return function(){var t=this.element.val();e.apply(this,arguments),this._refresh(),t!==this.element.val()&&this._trigger("change")}}e.widget("ui.spinner",{version:"1.10.0",defaultElement:"<input>",widgetEventPrefix:"spin",options:{culture:null,icons:{down:"ui-icon-triangle-1-s",up:"ui-icon-triangle-1-n"},incremental:!0,max:null,min:null,numberFormat:null,page:10,step:1,change:null,spin:null,start:null,stop:null},_create:function(){this._setOption("max",this.options.max),this._setOption("min",this.options.min),this._setOption("step",this.options.step),this._value(this.element.val(),!0),this._draw(),this._on(this._events),this._refresh(),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_getCreateOptions:function(){var t={},n=this.element;return e.each(["min","max","step"],function(e,r){var i=n.attr(r);i!==undefined&&i.length&&(t[r]=i)}),t},_events:{keydown:function(e){this._start(e)&&this._keydown(e)&&e.preventDefault()},keyup:"_stop",focus:function(){this.previous=this.element.val()},blur:function(e){if(this.cancelBlur){delete this.cancelBlur;return}this._refresh(),this.previous!==this.element.val()&&this._trigger("change",e)},mousewheel:function(e,t){if(!t)return;if(!this.spinning&&!this._start(e))return!1;this._spin((t>0?1:-1)*this.options.step,e),clearTimeout(this.mousewheelTimer),this.mousewheelTimer=this._delay(function(){this.spinning&&this._stop(e)},100),e.preventDefault()},"mousedown .ui-spinner-button":function(t){function r(){var e=this.element[0]===this.document[0].activeElement;e||(this.element.focus(),this.previous=n,this._delay(function(){this.previous=n}))}var n;n=this.element[0]===this.document[0].activeElement?this.previous:this.element.val(),t.preventDefault(),r.call(this),this.cancelBlur=!0,this._delay(function(){delete this.cancelBlur,r.call(this)});if(this._start(t)===!1)return;this._repeat(null,e(t.currentTarget).hasClass("ui-spinner-up")?1:-1,t)},"mouseup .ui-spinner-button":"_stop","mouseenter .ui-spinner-button":function(t){if(!e(t.currentTarget).hasClass("ui-state-active"))return;if(this._start(t)===!1)return!1;this._repeat(null,e(t.currentTarget).hasClass("ui-spinner-up")?1:-1,t)},"mouseleave .ui-spinner-button":"_stop"},_draw:function(){var e=this.uiSpinner=this.element.addClass("ui-spinner-input").attr("autocomplete","off").wrap(this._uiSpinnerHtml()).parent().append(this._buttonHtml());this.element.attr("role","spinbutton"),this.buttons=e.find(".ui-spinner-button").attr("tabIndex",-1).button().removeClass("ui-corner-all"),this.buttons.height()>Math.ceil(e.height()*.5)&&e.height()>0&&e.height(e.height()),this.options.disabled&&this.disable()},_keydown:function(t){var n=this.options,r=e.ui.keyCode;switch(t.keyCode){case r.UP:return this._repeat(null,1,t),!0;case r.DOWN:return this._repeat(null,-1,t),!0;case r.PAGE_UP:return this._repeat(null,n.page,t),!0;case r.PAGE_DOWN:return this._repeat(null,-n.page,t),!0}return!1},_uiSpinnerHtml:function(){return"<span class='ui-spinner ui-widget ui-widget-content ui-corner-all'></span>"},_buttonHtml:function(){return"<a class='ui-spinner-button ui-spinner-up ui-corner-tr'><span class='ui-icon "+this.options.icons.up+"'>&#9650;</span>"+"</a>"+"<a class='ui-spinner-button ui-spinner-down ui-corner-br'>"+"<span class='ui-icon "+this.options.icons.down+"'>&#9660;</span>"+"</a>"},_start:function(e){return!this.spinning&&this._trigger("start",e)===!1?!1:(this.counter||(this.counter=1),this.spinning=!0,!0)},_repeat:function(e,t,n){e=e||500,clearTimeout(this.timer),this.timer=this._delay(function(){this._repeat(40,t,n)},e),this._spin(t*this.options.step,n)},_spin:function(e,t){var n=this.value()||0;this.counter||(this.counter=1),n=this._adjustValue(n+e*this._increment(this.counter));if(!this.spinning||this._trigger("spin",t,{value:n})!==!1)this._value(n),this.counter++},_increment:function(t){var n=this.options.incremental;return n?e.isFunction(n)?n(t):Math.floor(t*t*t/5e4-t*t/500+17*t/200+1):1},_precision:function(){var e=this._precisionOf(this.options.step);return this.options.min!==null&&(e=Math.max(e,this._precisionOf(this.options.min))),e},_precisionOf:function(e){var t=e.toString(),n=t.indexOf(".");return n===-1?0:t.length-n-1},_adjustValue:function(e){var t,n,r=this.options;return t=r.min!==null?r.min:0,n=e-t,n=Math.round(n/r.step)*r.step,e=t+n,e=parseFloat(e.toFixed(this._precision())),r.max!==null&&e>r.max?r.max:r.min!==null&&e<r.min?r.min:e},_stop:function(e){if(!this.spinning)return;clearTimeout(this.timer),clearTimeout(this.mousewheelTimer),this.counter=0,this.spinning=!1,this._trigger("stop",e)},_setOption:function(e,t){if(e==="culture"||e==="numberFormat"){var n=this._parse(this.element.val());this.options[e]=t,this.element.val(this._format(n));return}(e==="max"||e==="min"||e==="step")&&typeof t=="string"&&(t=this._parse(t)),e==="icons"&&(this.buttons.first().find(".ui-icon").removeClass(this.options.icons.up).addClass(t.up),this.buttons.last().find(".ui-icon").removeClass(this.options.icons.down).addClass(t.down)),this._super(e,t),e==="disabled"&&(t?(this.element.prop("disabled",!0),this.buttons.button("disable")):(this.element.prop("disabled",!1),this.buttons.button("enable")))},_setOptions:t(function(e){this._super(e),this._value(this.element.val())}),_parse:function(e){return typeof e=="string"&&e!==""&&(e=window.Globalize&&this.options.numberFormat?Globalize.parseFloat(e,10,this.options.culture):+e),e===""||isNaN(e)?null:e},_format:function(e){return e===""?"":window.Globalize&&this.options.numberFormat?Globalize.format(e,this.options.numberFormat,this.options.culture):e},_refresh:function(){this.element.attr({"aria-valuemin":this.options.min,"aria-valuemax":this.options.max,"aria-valuenow":this._parse(this.element.val())})},_value:function(e,t){var n;e!==""&&(n=this._parse(e),n!==null&&(t||(n=this._adjustValue(n)),e=this._format(n))),this.element.val(e),this._refresh()},_destroy:function(){this.element.removeClass("ui-spinner-input").prop("disabled",!1).removeAttr("autocomplete").removeAttr("role").removeAttr("aria-valuemin").removeAttr("aria-valuemax").removeAttr("aria-valuenow"),this.uiSpinner.replaceWith(this.element)},stepUp:t(function(e){this._stepUp(e)}),_stepUp:function(e){this._start()&&(this._spin((e||1)*this.options.step),this._stop())},stepDown:t(function(e){this._stepDown(e)}),_stepDown:function(e){this._start()&&(this._spin((e||1)*-this.options.step),this._stop())},pageUp:t(function(e){this._stepUp((e||1)*this.options.page)}),pageDown:t(function(e){this._stepDown((e||1)*this.options.page)}),value:function(e){if(!arguments.length)return this._parse(this.element.val());t(this._value).call(this,e)},widget:function(){return this.uiSpinner}})})(jQuery);(function(e,t){function i(){return++n}function s(e){return e.hash.length>1&&decodeURIComponent(e.href.replace(r,""))===decodeURIComponent(location.href.replace(r,""))}var n=0,r=/#.*$/;e.widget("ui.tabs",{version:"1.10.0",delay:300,options:{active:null,collapsible:!1,event:"click",heightStyle:"content",hide:null,show:null,activate:null,beforeActivate:null,beforeLoad:null,load:null},_create:function(){var t=this,n=this.options;this.running=!1,this.element.addClass("ui-tabs ui-widget ui-widget-content ui-corner-all").toggleClass("ui-tabs-collapsible",n.collapsible).delegate(".ui-tabs-nav > li","mousedown"+this.eventNamespace,function(t){e(this).is(".ui-state-disabled")&&t.preventDefault()}).delegate(".ui-tabs-anchor","focus"+this.eventNamespace,function(){e(this).closest("li").is(".ui-state-disabled")&&this.blur()}),this._processTabs(),n.active=this._initialActive(),e.isArray(n.disabled)&&(n.disabled=e.unique(n.disabled.concat(e.map(this.tabs.filter(".ui-state-disabled"),function(e){return t.tabs.index(e)}))).sort()),this.options.active!==!1&&this.anchors.length?this.active=this._findActive(n.active):this.active=e(),this._refresh(),this.active.length&&this.load(n.active)},_initialActive:function(){var t=this.options.active,n=this.options.collapsible,r=location.hash.substring(1);if(t===null){r&&this.tabs.each(function(n,i){if(e(i).attr("aria-controls")===r)return t=n,!1}),t===null&&(t=this.tabs.index(this.tabs.filter(".ui-tabs-active")));if(t===null||t===-1)t=this.tabs.length?0:!1}return t!==!1&&(t=this.tabs.index(this.tabs.eq(t)),t===-1&&(t=n?!1:0)),!n&&t===!1&&this.anchors.length&&(t=0),t},_getCreateEventData:function(){return{tab:this.active,panel:this.active.length?this._getPanelForTab(this.active):e()}},_tabKeydown:function(t){var n=e(this.document[0].activeElement).closest("li"),r=this.tabs.index(n),i=!0;if(this._handlePageNav(t))return;switch(t.keyCode){case e.ui.keyCode.RIGHT:case e.ui.keyCode.DOWN:r++;break;case e.ui.keyCode.UP:case e.ui.keyCode.LEFT:i=!1,r--;break;case e.ui.keyCode.END:r=this.anchors.length-1;break;case e.ui.keyCode.HOME:r=0;break;case e.ui.keyCode.SPACE:t.preventDefault(),clearTimeout(this.activating),this._activate(r);return;case e.ui.keyCode.ENTER:t.preventDefault(),clearTimeout(this.activating),this._activate(r===this.options.active?!1:r);return;default:return}t.preventDefault(),clearTimeout(this.activating),r=this._focusNextTab(r,i),t.ctrlKey||(n.attr("aria-selected","false"),this.tabs.eq(r).attr("aria-selected","true"),this.activating=this._delay(function(){this.option("active",r)},this.delay))},_panelKeydown:function(t){if(this._handlePageNav(t))return;t.ctrlKey&&t.keyCode===e.ui.keyCode.UP&&(t.preventDefault(),this.active.focus())},_handlePageNav:function(t){if(t.altKey&&t.keyCode===e.ui.keyCode.PAGE_UP)return this._activate(this._focusNextTab(this.options.active-1,!1)),!0;if(t.altKey&&t.keyCode===e.ui.keyCode.PAGE_DOWN)return this._activate(this._focusNextTab(this.options.active+1,!0)),!0},_findNextTab:function(t,n){function i(){return t>r&&(t=0),t<0&&(t=r),t}var r=this.tabs.length-1;while(e.inArray(i(),this.options.disabled)!==-1)t=n?t+1:t-1;return t},_focusNextTab:function(e,t){return e=this._findNextTab(e,t),this.tabs.eq(e).focus(),e},_setOption:function(e,t){if(e==="active"){this._activate(t);return}if(e==="disabled"){this._setupDisabled(t);return}this._super(e,t),e==="collapsible"&&(this.element.toggleClass("ui-tabs-collapsible",t),!t&&this.options.active===!1&&this._activate(0)),e==="event"&&this._setupEvents(t),e==="heightStyle"&&this._setupHeightStyle(t)},_tabId:function(e){return e.attr("aria-controls")||"ui-tabs-"+i()},_sanitizeSelector:function(e){return e?e.replace(/[!"$%&'()*+,.\/:;<=>?@\[\]\^`{|}~]/g,"\\$&"):""},refresh:function(){var t=this.options,n=this.tablist.children(":has(a[href])");t.disabled=e.map(n.filter(".ui-state-disabled"),function(e){return n.index(e)}),this._processTabs(),t.active===!1||!this.anchors.length?(t.active=!1,this.active=e()):this.active.length&&!e.contains(this.tablist[0],this.active[0])?this.tabs.length===t.disabled.length?(t.active=!1,this.active=e()):this._activate(this._findNextTab(Math.max(0,t.active-1),!1)):t.active=this.tabs.index(this.active),this._refresh()},_refresh:function(){this._setupDisabled(this.options.disabled),this._setupEvents(this.options.event),this._setupHeightStyle(this.options.heightStyle),this.tabs.not(this.active).attr({"aria-selected":"false",tabIndex:-1}),this.panels.not(this._getPanelForTab(this.active)).hide().attr({"aria-expanded":"false","aria-hidden":"true"}),this.active.length?(this.active.addClass("ui-tabs-active ui-state-active").attr({"aria-selected":"true",tabIndex:0}),this._getPanelForTab(this.active).show().attr({"aria-expanded":"true","aria-hidden":"false"})):this.tabs.eq(0).attr("tabIndex",0)},_processTabs:function(){var t=this;this.tablist=this._getList().addClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all").attr("role","tablist"),this.tabs=this.tablist.find("> li:has(a[href])").addClass("ui-state-default ui-corner-top").attr({role:"tab",tabIndex:-1}),this.anchors=this.tabs.map(function(){return e("a",this)[0]}).addClass("ui-tabs-anchor").attr({role:"presentation",tabIndex:-1}),this.panels=e(),this.anchors.each(function(n,r){var i,o,u,a=e(r).uniqueId().attr("id"),f=e(r).closest("li"),l=f.attr("aria-controls");s(r)?(i=r.hash,o=t.element.find(t._sanitizeSelector(i))):(u=t._tabId(f),i="#"+u,o=t.element.find(i),o.length||(o=t._createPanel(u),o.insertAfter(t.panels[n-1]||t.tablist)),o.attr("aria-live","polite")),o.length&&(t.panels=t.panels.add(o)),l&&f.data("ui-tabs-aria-controls",l),f.attr({"aria-controls":i.substring(1),"aria-labelledby":a}),o.attr("aria-labelledby",a)}),this.panels.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").attr("role","tabpanel")},_getList:function(){return this.element.find("ol,ul").eq(0)},_createPanel:function(t){return e("<div>").attr("id",t).addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").data("ui-tabs-destroy",!0)},_setupDisabled:function(t){e.isArray(t)&&(t.length?t.length===this.anchors.length&&(t=!0):t=!1);for(var n=0,r;r=this.tabs[n];n++)t===!0||e.inArray(n,t)!==-1?e(r).addClass("ui-state-disabled").attr("aria-disabled","true"):e(r).removeClass("ui-state-disabled").removeAttr("aria-disabled");this.options.disabled=t},_setupEvents:function(t){var n={click:function(e){e.preventDefault()}};t&&e.each(t.split(" "),function(e,t){n[t]="_eventHandler"}),this._off(this.anchors.add(this.tabs).add(this.panels)),this._on(this.anchors,n),this._on(this.tabs,{keydown:"_tabKeydown"}),this._on(this.panels,{keydown:"_panelKeydown"}),this._focusable(this.tabs),this._hoverable(this.tabs)},_setupHeightStyle:function(t){var n,r=this.element.parent();t==="fill"?(n=r.height(),n-=this.element.outerHeight()-this.element.height(),this.element.siblings(":visible").each(function(){var t=e(this),r=t.css("position");if(r==="absolute"||r==="fixed")return;n-=t.outerHeight(!0)}),this.element.children().not(this.panels).each(function(){n-=e(this).outerHeight(!0)}),this.panels.each(function(){e(this).height(Math.max(0,n-e(this).innerHeight()+e(this).height()))}).css("overflow","auto")):t==="auto"&&(n=0,this.panels.each(function(){n=Math.max(n,e(this).height("").height())}).height(n))},_eventHandler:function(t){var n=this.options,r=this.active,i=e(t.currentTarget),s=i.closest("li"),o=s[0]===r[0],u=o&&n.collapsible,a=u?e():this._getPanelForTab(s),f=r.length?this._getPanelForTab(r):e(),l={oldTab:r,oldPanel:f,newTab:u?e():s,newPanel:a};t.preventDefault();if(s.hasClass("ui-state-disabled")||s.hasClass("ui-tabs-loading")||this.running||o&&!n.collapsible||this._trigger("beforeActivate",t,l)===!1)return;n.active=u?!1:this.tabs.index(s),this.active=o?e():s,this.xhr&&this.xhr.abort(),!f.length&&!a.length&&e.error("jQuery UI Tabs: Mismatching fragment identifier."),a.length&&this.load(this.tabs.index(s),t),this._toggle(t,l)},_toggle:function(t,n){function o(){r.running=!1,r._trigger("activate",t,n)}function u(){n.newTab.closest("li").addClass("ui-tabs-active ui-state-active"),i.length&&r.options.show?r._show(i,r.options.show,o):(i.show(),o())}var r=this,i=n.newPanel,s=n.oldPanel;this.running=!0,s.length&&this.options.hide?this._hide(s,this.options.hide,function(){n.oldTab.closest("li").removeClass("ui-tabs-active ui-state-active"),u()}):(n.oldTab.closest("li").removeClass("ui-tabs-active ui-state-active"),s.hide(),u()),s.attr({"aria-expanded":"false","aria-hidden":"true"}),n.oldTab.attr("aria-selected","false"),i.length&&s.length?n.oldTab.attr("tabIndex",-1):i.length&&this.tabs.filter(function(){return e(this).attr("tabIndex")===0}).attr("tabIndex",-1),i.attr({"aria-expanded":"true","aria-hidden":"false"}),n.newTab.attr({"aria-selected":"true",tabIndex:0})},_activate:function(t){var n,r=this._findActive(t);if(r[0]===this.active[0])return;r.length||(r=this.active),n=r.find(".ui-tabs-anchor")[0],this._eventHandler({target:n,currentTarget:n,preventDefault:e.noop})},_findActive:function(t){return t===!1?e():this.tabs.eq(t)},_getIndex:function(e){return typeof e=="string"&&(e=this.anchors.index(this.anchors.filter("[href$='"+e+"']"))),e},_destroy:function(){this.xhr&&this.xhr.abort(),this.element.removeClass("ui-tabs ui-widget ui-widget-content ui-corner-all ui-tabs-collapsible"),this.tablist.removeClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all").removeAttr("role"),this.anchors.removeClass("ui-tabs-anchor").removeAttr("role").removeAttr("tabIndex").removeUniqueId(),this.tabs.add(this.panels).each(function(){e.data(this,"ui-tabs-destroy")?e(this).remove():e(this).removeClass("ui-state-default ui-state-active ui-state-disabled ui-corner-top ui-corner-bottom ui-widget-content ui-tabs-active ui-tabs-panel").removeAttr("tabIndex").removeAttr("aria-live").removeAttr("aria-busy").removeAttr("aria-selected").removeAttr("aria-labelledby").removeAttr("aria-hidden").removeAttr("aria-expanded").removeAttr("role")}),this.tabs.each(function(){var t=e(this),n=t.data("ui-tabs-aria-controls");n?t.attr("aria-controls",n).removeData("ui-tabs-aria-controls"):t.removeAttr("aria-controls")}),this.panels.show(),this.options.heightStyle!=="content"&&this.panels.css("height","")},enable:function(n){var r=this.options.disabled;if(r===!1)return;n===t?r=!1:(n=this._getIndex(n),e.isArray(r)?r=e.map(r,function(e){return e!==n?e:null}):r=e.map(this.tabs,function(e,t){return t!==n?t:null})),this._setupDisabled(r)},disable:function(n){var r=this.options.disabled;if(r===!0)return;if(n===t)r=!0;else{n=this._getIndex(n);if(e.inArray(n,r)!==-1)return;e.isArray(r)?r=e.merge([n],r).sort():r=[n]}this._setupDisabled(r)},load:function(t,n){t=this._getIndex(t);var r=this,i=this.tabs.eq(t),o=i.find(".ui-tabs-anchor"),u=this._getPanelForTab(i),a={tab:i,panel:u};if(s(o[0]))return;this.xhr=e.ajax(this._ajaxSettings(o,n,a)),this.xhr&&this.xhr.statusText!=="canceled"&&(i.addClass("ui-tabs-loading"),u.attr("aria-busy","true"),this.xhr.success(function(e){setTimeout(function(){u.html(e),r._trigger("load",n,a)},1)}).complete(function(e,t){setTimeout(function(){t==="abort"&&r.panels.stop(!1,!0),i.removeClass("ui-tabs-loading"),u.removeAttr("aria-busy"),e===r.xhr&&delete r.xhr},1)}))},_ajaxSettings:function(t,n,r){var i=this;return{url:t.attr("href"),beforeSend:function(t,s){return i._trigger("beforeLoad",n,e.extend({jqXHR:t,ajaxSettings:s},r))}}},_getPanelForTab:function(t){var n=e(t).attr("aria-controls");return this.element.find(this._sanitizeSelector("#"+n))}})})(jQuery);(function(e){function n(t,n){var r=(t.attr("aria-describedby")||"").split(/\s+/);r.push(n),t.data("ui-tooltip-id",n).attr("aria-describedby",e.trim(r.join(" ")))}function r(t){var n=t.data("ui-tooltip-id"),r=(t.attr("aria-describedby")||"").split(/\s+/),i=e.inArray(n,r);i!==-1&&r.splice(i,1),t.removeData("ui-tooltip-id"),r=e.trim(r.join(" ")),r?t.attr("aria-describedby",r):t.removeAttr("aria-describedby")}var t=0;e.widget("ui.tooltip",{version:"1.10.0",options:{content:function(){var t=e(this).attr("title")||"";return e("<a>").text(t).html()},hide:!0,items:"[title]:not([disabled])",position:{my:"left top+15",at:"left bottom",collision:"flipfit flip"},show:!0,tooltipClass:null,track:!1,close:null,open:null},_create:function(){this._on({mouseover:"open",focusin:"open"}),this.tooltips={},this.parents={},this.options.disabled&&this._disable()},_setOption:function(t,n){var r=this;if(t==="disabled"){this[n?"_disable":"_enable"](),this.options[t]=n;return}this._super(t,n),t==="content"&&e.each(this.tooltips,function(e,t){r._updateContent(t)})},_disable:function(){var t=this;e.each(this.tooltips,function(n,r){var i=e.Event("blur");i.target=i.currentTarget=r[0],t.close(i,!0)}),this.element.find(this.options.items).addBack().each(function(){var t=e(this);t.is("[title]")&&t.data("ui-tooltip-title",t.attr("title")).attr("title","")})},_enable:function(){this.element.find(this.options.items).addBack().each(function(){var t=e(this);t.data("ui-tooltip-title")&&t.attr("title",t.data("ui-tooltip-title"))})},open:function(t){var n=this,r=e(t?t.target:this.element).closest(this.options.items);if(!r.length||r.data("ui-tooltip-id"))return;r.attr("title")&&r.data("ui-tooltip-title",r.attr("title")),r.data("ui-tooltip-open",!0),t&&t.type==="mouseover"&&r.parents().each(function(){var t=e(this),r;t.data("ui-tooltip-open")&&(r=e.Event("blur"),r.target=r.currentTarget=this,n.close(r,!0)),t.attr("title")&&(t.uniqueId(),n.parents[this.id]={element:this,title:t.attr("title")},t.attr("title",""))}),this._updateContent(r,t)},_updateContent:function(e,t){var n,r=this.options.content,i=this,s=t?t.type:null;if(typeof r=="string")return this._open(t,e,r);n=r.call(e[0],function(n){if(!e.data("ui-tooltip-open"))return;i._delay(function(){t&&(t.type=s),this._open(t,e,n)})}),n&&this._open(t,e,n)},_open:function(t,r,i){function f(e){a.of=e;if(s.is(":hidden"))return;s.position(a)}var s,o,u,a=e.extend({},this.options.position);if(!i)return;s=this._find(r);if(s.length){s.find(".ui-tooltip-content").html(i);return}r.is("[title]")&&(t&&t.type==="mouseover"?r.attr("title",""):r.removeAttr("title")),s=this._tooltip(r),n(r,s.attr("id")),s.find(".ui-tooltip-content").html(i),this.options.track&&t&&/^mouse/.test(t.type)?(this._on(this.document,{mousemove:f}),f(t)):s.position(e.extend({of:r},this.options.position)),s.hide(),this._show(s,this.options.show),this.options.show&&this.options.show.delay&&(u=this.delayedShow=setInterval(function(){s.is(":visible")&&(f(a.of),clearInterval(u))},e.fx.interval)),this._trigger("open",t,{tooltip:s}),o={keyup:function(t){if(t.keyCode===e.ui.keyCode.ESCAPE){var n=e.Event(t);n.currentTarget=r[0],this.close(n,!0)}},remove:function(){this._removeTooltip(s)}};if(!t||t.type==="mouseover")o.mouseleave="close";if(!t||t.type==="focusin")o.focusout="close";this._on(!0,r,o)},close:function(t){var n=this,i=e(t?t.currentTarget:this.element),s=this._find(i);if(this.closing)return;clearInterval(this.delayedShow),i.data("ui-tooltip-title")&&i.attr("title",i.data("ui-tooltip-title")),r(i),s.stop(!0),this._hide(s,this.options.hide,function(){n._removeTooltip(e(this))}),i.removeData("ui-tooltip-open"),this._off(i,"mouseleave focusout keyup"),i[0]!==this.element[0]&&this._off(i,"remove"),this._off(this.document,"mousemove"),t&&t.type==="mouseleave"&&e.each(this.parents,function(t,r){e(r.element).attr("title",r.title),delete n.parents[t]}),this.closing=!0,this._trigger("close",t,{tooltip:s}),this.closing=!1},_tooltip:function(n){var r="ui-tooltip-"+t++,i=e("<div>").attr({id:r,role:"tooltip"}).addClass("ui-tooltip ui-widget ui-corner-all ui-widget-content "+(this.options.tooltipClass||""));return e("<div>").addClass("ui-tooltip-content").appendTo(i),i.appendTo(this.document[0].body),this.tooltips[r]=n,i},_find:function(t){var n=t.data("ui-tooltip-id");return n?e("#"+n):e()},_removeTooltip:function(e){e.remove(),delete this.tooltips[e.attr("id")]},_destroy:function(){var t=this;e.each(this.tooltips,function(n,r){var i=e.Event("blur");i.target=i.currentTarget=r[0],t.close(i,!0),e("#"+n).remove(),r.data("ui-tooltip-title")&&(r.attr("title",r.data("ui-tooltip-title")),r.removeData("ui-tooltip-title"))})}})})(jQuery);jQuery.effects||function(e,t){var n="ui-effects-";e.effects={effect:{}},function(e,t){function h(e,t,n){var r=u[t.type]||{};return e==null?n||!t.def?null:t.def:(e=r.floor?~~e:parseFloat(e),isNaN(e)?t.def:r.mod?(e+r.mod)%r.mod:0>e?0:r.max<e?r.max:e)}function p(t){var n=s(),r=n._rgba=[];return t=t.toLowerCase(),c(i,function(e,i){var s,u=i.re.exec(t),a=u&&i.parse(u),f=i.space||"rgba";if(a)return s=n[f](a),n[o[f].cache]=s[o[f].cache],r=n._rgba=s._rgba,!1}),r.length?(r.join()==="0,0,0,0"&&e.extend(r,l.transparent),n):l[t]}function d(e,t,n){return n=(n+1)%1,n*6<1?e+(t-e)*n*6:n*2<1?t:n*3<2?e+(t-e)*(2/3-n)*6:e}var n="backgroundColor borderBottomColor borderLeftColor borderRightColor borderTopColor color columnRuleColor outlineColor textDecorationColor textEmphasisColor",r=/^([\-+])=\s*(\d+\.?\d*)/,i=[{re:/rgba?\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,parse:function(e){return[e[1],e[2],e[3],e[4]]}},{re:/rgba?\(\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,parse:function(e){return[e[1]*2.55,e[2]*2.55,e[3]*2.55,e[4]]}},{re:/#([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})/,parse:function(e){return[parseInt(e[1],16),parseInt(e[2],16),parseInt(e[3],16)]}},{re:/#([a-f0-9])([a-f0-9])([a-f0-9])/,parse:function(e){return[parseInt(e[1]+e[1],16),parseInt(e[2]+e[2],16),parseInt(e[3]+e[3],16)]}},{re:/hsla?\(\s*(\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,space:"hsla",parse:function(e){return[e[1],e[2]/100,e[3]/100,e[4]]}}],s=e.Color=function(t,n,r,i){return new e.Color.fn.parse(t,n,r,i)},o={rgba:{props:{red:{idx:0,type:"byte"},green:{idx:1,type:"byte"},blue:{idx:2,type:"byte"}}},hsla:{props:{hue:{idx:0,type:"degrees"},saturation:{idx:1,type:"percent"},lightness:{idx:2,type:"percent"}}}},u={"byte":{floor:!0,max:255},percent:{max:1},degrees:{mod:360,floor:!0}},a=s.support={},f=e("<p>")[0],l,c=e.each;f.style.cssText="background-color:rgba(1,1,1,.5)",a.rgba=f.style.backgroundColor.indexOf("rgba")>-1,c(o,function(e,t){t.cache="_"+e,t.props.alpha={idx:3,type:"percent",def:1}}),s.fn=e.extend(s.prototype,{parse:function(n,r,i,u){if(n===t)return this._rgba=[null,null,null,null],this;if(n.jquery||n.nodeType)n=e(n).css(r),r=t;var a=this,f=e.type(n),d=this._rgba=[];r!==t&&(n=[n,r,i,u],f="array");if(f==="string")return this.parse(p(n)||l._default);if(f==="array")return c(o.rgba.props,function(e,t){d[t.idx]=h(n[t.idx],t)}),this;if(f==="object")return n instanceof s?c(o,function(e,t){n[t.cache]&&(a[t.cache]=n[t.cache].slice())}):c(o,function(t,r){var i=r.cache;c(r.props,function(e,t){if(!a[i]&&r.to){if(e==="alpha"||n[e]==null)return;a[i]=r.to(a._rgba)}a[i][t.idx]=h(n[e],t,!0)}),a[i]&&e.inArray(null,a[i].slice(0,3))<0&&(a[i][3]=1,r.from&&(a._rgba=r.from(a[i])))}),this},is:function(e){var t=s(e),n=!0,r=this;return c(o,function(e,i){var s,o=t[i.cache];return o&&(s=r[i.cache]||i.to&&i.to(r._rgba)||[],c(i.props,function(e,t){if(o[t.idx]!=null)return n=o[t.idx]===s[t.idx],n})),n}),n},_space:function(){var e=[],t=this;return c(o,function(n,r){t[r.cache]&&e.push(n)}),e.pop()},transition:function(e,t){var n=s(e),r=n._space(),i=o[r],a=this.alpha()===0?s("transparent"):this,f=a[i.cache]||i.to(a._rgba),l=f.slice();return n=n[i.cache],c(i.props,function(e,r){var i=r.idx,s=f[i],o=n[i],a=u[r.type]||{};if(o===null)return;s===null?l[i]=o:(a.mod&&(o-s>a.mod/2?s+=a.mod:s-o>a.mod/2&&(s-=a.mod)),l[i]=h((o-s)*t+s,r))}),this[r](l)},blend:function(t){if(this._rgba[3]===1)return this;var n=this._rgba.slice(),r=n.pop(),i=s(t)._rgba;return s(e.map(n,function(e,t){return(1-r)*i[t]+r*e}))},toRgbaString:function(){var t="rgba(",n=e.map(this._rgba,function(e,t){return e==null?t>2?1:0:e});return n[3]===1&&(n.pop(),t="rgb("),t+n.join()+")"},toHslaString:function(){var t="hsla(",n=e.map(this.hsla(),function(e,t){return e==null&&(e=t>2?1:0),t&&t<3&&(e=Math.round(e*100)+"%"),e});return n[3]===1&&(n.pop(),t="hsl("),t+n.join()+")"},toHexString:function(t){var n=this._rgba.slice(),r=n.pop();return t&&n.push(~~(r*255)),"#"+e.map(n,function(e){return e=(e||0).toString(16),e.length===1?"0"+e:e}).join("")},toString:function(){return this._rgba[3]===0?"transparent":this.toRgbaString()}}),s.fn.parse.prototype=s.fn,o.hsla.to=function(e){if(e[0]==null||e[1]==null||e[2]==null)return[null,null,null,e[3]];var t=e[0]/255,n=e[1]/255,r=e[2]/255,i=e[3],s=Math.max(t,n,r),o=Math.min(t,n,r),u=s-o,a=s+o,f=a*.5,l,c;return o===s?l=0:t===s?l=60*(n-r)/u+360:n===s?l=60*(r-t)/u+120:l=60*(t-n)/u+240,u===0?c=0:f<=.5?c=u/a:c=u/(2-a),[Math.round(l)%360,c,f,i==null?1:i]},o.hsla.from=function(e){if(e[0]==null||e[1]==null||e[2]==null)return[null,null,null,e[3]];var t=e[0]/360,n=e[1],r=e[2],i=e[3],s=r<=.5?r*(1+n):r+n-r*n,o=2*r-s;return[Math.round(d(o,s,t+1/3)*255),Math.round(d(o,s,t)*255),Math.round(d(o,s,t-1/3)*255),i]},c(o,function(n,i){var o=i.props,u=i.cache,a=i.to,f=i.from;s.fn[n]=function(n){a&&!this[u]&&(this[u]=a(this._rgba));if(n===t)return this[u].slice();var r,i=e.type(n),l=i==="array"||i==="object"?n:arguments,p=this[u].slice();return c(o,function(e,t){var n=l[i==="object"?e:t.idx];n==null&&(n=p[t.idx]),p[t.idx]=h(n,t)}),f?(r=s(f(p)),r[u]=p,r):s(p)},c(o,function(t,i){if(s.fn[t])return;s.fn[t]=function(s){var o=e.type(s),u=t==="alpha"?this._hsla?"hsla":"rgba":n,a=this[u](),f=a[i.idx],l;return o==="undefined"?f:(o==="function"&&(s=s.call(this,f),o=e.type(s)),s==null&&i.empty?this:(o==="string"&&(l=r.exec(s),l&&(s=f+parseFloat(l[2])*(l[1]==="+"?1:-1))),a[i.idx]=s,this[u](a)))}})}),s.hook=function(t){var n=t.split(" ");c(n,function(t,n){e.cssHooks[n]={set:function(t,r){var i,o,u="";if(r!=="transparent"&&(e.type(r)!=="string"||(i=p(r)))){r=s(i||r);if(!a.rgba&&r._rgba[3]!==1){o=n==="backgroundColor"?t.parentNode:t;while((u===""||u==="transparent")&&o&&o.style)try{u=e.css(o,"backgroundColor"),o=o.parentNode}catch(f){}r=r.blend(u&&u!=="transparent"?u:"_default")}r=r.toRgbaString()}try{t.style[n]=r}catch(f){}}},e.fx.step[n]=function(t){t.colorInit||(t.start=s(t.elem,n),t.end=s(t.end),t.colorInit=!0),e.cssHooks[n].set(t.elem,t.start.transition(t.end,t.pos))}})},s.hook(n),e.cssHooks.borderColor={expand:function(e){var t={};return c(["Top","Right","Bottom","Left"],function(n,r){t["border"+r+"Color"]=e}),t}},l=e.Color.names={aqua:"#00ffff",black:"#000000",blue:"#0000ff",fuchsia:"#ff00ff",gray:"#808080",green:"#008000",lime:"#00ff00",maroon:"#800000",navy:"#000080",olive:"#808000",purple:"#800080",red:"#ff0000",silver:"#c0c0c0",teal:"#008080",white:"#ffffff",yellow:"#ffff00",transparent:[null,null,null,0],_default:"#ffffff"}}(jQuery),function(){function i(t){var n,r,i=t.ownerDocument.defaultView?t.ownerDocument.defaultView.getComputedStyle(t,null):t.currentStyle,s={};if(i&&i.length&&i[0]&&i[i[0]]){r=i.length;while(r--)n=i[r],typeof i[n]=="string"&&(s[e.camelCase(n)]=i[n])}else for(n in i)typeof i[n]=="string"&&(s[n]=i[n]);return s}function s(t,n){var i={},s,o;for(s in n)o=n[s],t[s]!==o&&!r[s]&&(e.fx.step[s]||!isNaN(parseFloat(o)))&&(i[s]=o);return i}var n=["add","remove","toggle"],r={border:1,borderBottom:1,borderColor:1,borderLeft:1,borderRight:1,borderTop:1,borderWidth:1,margin:1,padding:1};e.each(["borderLeftStyle","borderRightStyle","borderBottomStyle","borderTopStyle"],function(t,n){e.fx.step[n]=function(e){if(e.end!=="none"&&!e.setAttr||e.pos===1&&!e.setAttr)jQuery.style(e.elem,n,e.end),e.setAttr=!0}}),e.fn.addBack||(e.fn.addBack=function(e){return this.add(e==null?this.prevObject:this.prevObject.filter(e))}),e.effects.animateClass=function(t,r,o,u){var a=e.speed(r,o,u);return this.queue(function(){var r=e(this),o=r.attr("class")||"",u,f=a.children?r.find("*").addBack():r;f=f.map(function(){var t=e(this);return{el:t,start:i(this)}}),u=function(){e.each(n,function(e,n){t[n]&&r[n+"Class"](t[n])})},u(),f=f.map(function(){return this.end=i(this.el[0]),this.diff=s(this.start,this.end),this}),r.attr("class",o),f=f.map(function(){var t=this,n=e.Deferred(),r=e.extend({},a,{queue:!1,complete:function(){n.resolve(t)}});return this.el.animate(this.diff,r),n.promise()}),e.when.apply(e,f.get()).done(function(){u(),e.each(arguments,function(){var t=this.el;e.each(this.diff,function(e){t.css(e,"")})}),a.complete.call(r[0])})})},e.fn.extend({_addClass:e.fn.addClass,addClass:function(t,n,r,i){return n?e.effects.animateClass.call(this,{add:t},n,r,i):this._addClass(t)},_removeClass:e.fn.removeClass,removeClass:function(t,n,r,i){return n?e.effects.animateClass.call(this,{remove:t},n,r,i):this._removeClass(t)},_toggleClass:e.fn.toggleClass,toggleClass:function(n,r,i,s,o){return typeof r=="boolean"||r===t?i?e.effects.animateClass.call(this,r?{add:n}:{remove:n},i,s,o):this._toggleClass(n,r):e.effects.animateClass.call(this,{toggle:n},r,i,s)},switchClass:function(t,n,r,i,s){return e.effects.animateClass.call(this,{add:n,remove:t},r,i,s)}})}(),function(){function r(t,n,r,i){e.isPlainObject(t)&&(n=t,t=t.effect),t={effect:t},n==null&&(n={}),e.isFunction(n)&&(i=n,r=null,n={});if(typeof n=="number"||e.fx.speeds[n])i=r,r=n,n={};return e.isFunction(r)&&(i=r,r=null),n&&e.extend(t,n),r=r||n.duration,t.duration=e.fx.off?0:typeof r=="number"?r:r in e.fx.speeds?e.fx.speeds[r]:e.fx.speeds._default,t.complete=i||n.complete,t}function i(t){return!t||typeof t=="number"||e.fx.speeds[t]?!0:typeof t=="string"&&!e.effects.effect[t]}e.extend(e.effects,{version:"1.10.0",save:function(e,t){for(var r=0;r<t.length;r++)t[r]!==null&&e.data(n+t[r],e[0].style[t[r]])},restore:function(e,r){var i,s;for(s=0;s<r.length;s++)r[s]!==null&&(i=e.data(n+r[s]),i===t&&(i=""),e.css(r[s],i))},setMode:function(e,t){return t==="toggle"&&(t=e.is(":hidden")?"show":"hide"),t},getBaseline:function(e,t){var n,r;switch(e[0]){case"top":n=0;break;case"middle":n=.5;break;case"bottom":n=1;break;default:n=e[0]/t.height}switch(e[1]){case"left":r=0;break;case"center":r=.5;break;case"right":r=1;break;default:r=e[1]/t.width}return{x:r,y:n}},createWrapper:function(t){if(t.parent().is(".ui-effects-wrapper"))return t.parent();var n={width:t.outerWidth(!0),height:t.outerHeight(!0),"float":t.css("float")},r=e("<div></div>").addClass("ui-effects-wrapper").css({fontSize:"100%",background:"transparent",border:"none",margin:0,padding:0}),i={width:t.width(),height:t.height()},s=document.activeElement;try{s.id}catch(o){s=document.body}return t.wrap(r),(t[0]===s||e.contains(t[0],s))&&e(s).focus(),r=t.parent(),t.css("position")==="static"?(r.css({position:"relative"}),t.css({position:"relative"})):(e.extend(n,{position:t.css("position"),zIndex:t.css("z-index")}),e.each(["top","left","bottom","right"],function(e,r){n[r]=t.css(r),isNaN(parseInt(n[r],10))&&(n[r]="auto")}),t.css({position:"relative",top:0,left:0,right:"auto",bottom:"auto"})),t.css(i),r.css(n).show()},removeWrapper:function(t){var n=document.activeElement;return t.parent().is(".ui-effects-wrapper")&&(t.parent().replaceWith(t),(t[0]===n||e.contains(t[0],n))&&e(n).focus()),t},setTransition:function(t,n,r,i){return i=i||{},e.each(n,function(e,n){var s=t.cssUnit(n);s[0]>0&&(i[n]=s[0]*r+s[1])}),i}}),e.fn.extend({effect:function(){function o(n){function u(){e.isFunction(i)&&i.call(r[0]),e.isFunction(n)&&n()}var r=e(this),i=t.complete,o=t.mode;(r.is(":hidden")?o==="hide":o==="show")?u():s.call(r[0],t,u)}var t=r.apply(this,arguments),n=t.mode,i=t.queue,s=e.effects.effect[t.effect];return e.fx.off||!s?n?this[n](t.duration,t.complete):this.each(function(){t.complete&&t.complete.call(this)}):i===!1?this.each(o):this.queue(i||"fx",o)},_show:e.fn.show,show:function(e){if(i(e))return this._show.apply(this,arguments);var t=r.apply(this,arguments);return t.mode="show",this.effect.call(this,t)},_hide:e.fn.hide,hide:function(e){if(i(e))return this._hide.apply(this,arguments);var t=r.apply(this,arguments);return t.mode="hide",this.effect.call(this,t)},__toggle:e.fn.toggle,toggle:function(t){if(i(t)||typeof t=="boolean"||e.isFunction(t))return this.__toggle.apply(this,arguments);var n=r.apply(this,arguments);return n.mode="toggle",this.effect.call(this,n)},cssUnit:function(t){var n=this.css(t),r=[];return e.each(["em","px","%","pt"],function(e,t){n.indexOf(t)>0&&(r=[parseFloat(n),t])}),r}})}(),function(){var t={};e.each(["Quad","Cubic","Quart","Quint","Expo"],function(e,n){t[n]=function(t){return Math.pow(t,e+2)}}),e.extend(t,{Sine:function(e){return 1-Math.cos(e*Math.PI/2)},Circ:function(e){return 1-Math.sqrt(1-e*e)},Elastic:function(e){return e===0||e===1?e:-Math.pow(2,8*(e-1))*Math.sin(((e-1)*80-7.5)*Math.PI/15)},Back:function(e){return e*e*(3*e-2)},Bounce:function(e){var t,n=4;while(e<((t=Math.pow(2,--n))-1)/11);return 1/Math.pow(4,3-n)-7.5625*Math.pow((t*3-2)/22-e,2)}}),e.each(t,function(t,n){e.easing["easeIn"+t]=n,e.easing["easeOut"+t]=function(e){return 1-n(1-e)},e.easing["easeInOut"+t]=function(e){return e<.5?n(e*2)/2:1-n(e*-2+2)/2}})}()}(jQuery);(function(e,t){var n=/up|down|vertical/,r=/up|left|vertical|horizontal/;e.effects.effect.blind=function(t,i){var s=e(this),o=["position","top","bottom","left","right","height","width"],u=e.effects.setMode(s,t.mode||"hide"),a=t.direction||"up",f=n.test(a),l=f?"height":"width",c=f?"top":"left",h=r.test(a),p={},d=u==="show",v,m,g;s.parent().is(".ui-effects-wrapper")?e.effects.save(s.parent(),o):e.effects.save(s,o),s.show(),v=e.effects.createWrapper(s).css({overflow:"hidden"}),m=v[l](),g=parseFloat(v.css(c))||0,p[l]=d?m:0,h||(s.css(f?"bottom":"right",0).css(f?"top":"left","auto").css({position:"absolute"}),p[c]=d?g:m+g),d&&(v.css(l,0),h||v.css(c,g+m)),v.animate(p,{duration:t.duration,easing:t.easing,queue:!1,complete:function(){u==="hide"&&s.hide(),e.effects.restore(s,o),e.effects.removeWrapper(s),i()}})}})(jQuery);(function(e,t){e.effects.effect.bounce=function(t,n){var r=e(this),i=["position","top","bottom","left","right","height","width"],s=e.effects.setMode(r,t.mode||"effect"),o=s==="hide",u=s==="show",a=t.direction||"up",f=t.distance,l=t.times||5,c=l*2+(u||o?1:0),h=t.duration/c,p=t.easing,d=a==="up"||a==="down"?"top":"left",v=a==="up"||a==="left",m,g,y,b=r.queue(),w=b.length;(u||o)&&i.push("opacity"),e.effects.save(r,i),r.show(),e.effects.createWrapper(r),f||(f=r[d==="top"?"outerHeight":"outerWidth"]()/3),u&&(y={opacity:1},y[d]=0,r.css("opacity",0).css(d,v?-f*2:f*2).animate(y,h,p)),o&&(f/=Math.pow(2,l-1)),y={},y[d]=0;for(m=0;m<l;m++)g={},g[d]=(v?"-=":"+=")+f,r.animate(g,h,p).animate(y,h,p),f=o?f*2:f/2;o&&(g={opacity:0},g[d]=(v?"-=":"+=")+f,r.animate(g,h,p)),r.queue(function(){o&&r.hide(),e.effects.restore(r,i),e.effects.removeWrapper(r),n()}),w>1&&b.splice.apply(b,[1,0].concat(b.splice(w,c+1))),r.dequeue()}})(jQuery);(function(e,t){e.effects.effect.clip=function(t,n){var r=e(this),i=["position","top","bottom","left","right","height","width"],s=e.effects.setMode(r,t.mode||"hide"),o=s==="show",u=t.direction||"vertical",a=u==="vertical",f=a?"height":"width",l=a?"top":"left",c={},h,p,d;e.effects.save(r,i),r.show(),h=e.effects.createWrapper(r).css({overflow:"hidden"}),p=r[0].tagName==="IMG"?h:r,d=p[f](),o&&(p.css(f,0),p.css(l,d/2)),c[f]=o?d:0,c[l]=o?0:d/2,p.animate(c,{queue:!1,duration:t.duration,easing:t.easing,complete:function(){o||r.hide(),e.effects.restore(r,i),e.effects.removeWrapper(r),n()}})}})(jQuery);(function(e,t){e.effects.effect.drop=function(t,n){var r=e(this),i=["position","top","bottom","left","right","opacity","height","width"],s=e.effects.setMode(r,t.mode||"hide"),o=s==="show",u=t.direction||"left",a=u==="up"||u==="down"?"top":"left",f=u==="up"||u==="left"?"pos":"neg",l={opacity:o?1:0},c;e.effects.save(r,i),r.show(),e.effects.createWrapper(r),c=t.distance||r[a==="top"?"outerHeight":"outerWidth"](!0)/2,o&&r.css("opacity",0).css(a,f==="pos"?-c:c),l[a]=(o?f==="pos"?"+=":"-=":f==="pos"?"-=":"+=")+c,r.animate(l,{queue:!1,duration:t.duration,easing:t.easing,complete:function(){s==="hide"&&r.hide(),e.effects.restore(r,i),e.effects.removeWrapper(r),n()}})}})(jQuery);(function(e,t){e.effects.effect.explode=function(t,n){function y(){c.push(this),c.length===r*i&&b()}function b(){s.css({visibility:"visible"}),e(c).remove(),u||s.hide(),n()}var r=t.pieces?Math.round(Math.sqrt(t.pieces)):3,i=r,s=e(this),o=e.effects.setMode(s,t.mode||"hide"),u=o==="show",a=s.show().css("visibility","hidden").offset(),f=Math.ceil(s.outerWidth()/i),l=Math.ceil(s.outerHeight()/r),c=[],h,p,d,v,m,g;for(h=0;h<r;h++){v=a.top+h*l,g=h-(r-1)/2;for(p=0;p<i;p++)d=a.left+p*f,m=p-(i-1)/2,s.clone().appendTo("body").wrap("<div></div>").css({position:"absolute",visibility:"visible",left:-p*f,top:-h*l}).parent().addClass("ui-effects-explode").css({position:"absolute",overflow:"hidden",width:f,height:l,left:d+(u?m*f:0),top:v+(u?g*l:0),opacity:u?0:1}).animate({left:d+(u?0:m*f),top:v+(u?0:g*l),opacity:u?1:0},t.duration||500,t.easing,y)}}})(jQuery);(function(e,t){e.effects.effect.fade=function(t,n){var r=e(this),i=e.effects.setMode(r,t.mode||"toggle");r.animate({opacity:i},{queue:!1,duration:t.duration,easing:t.easing,complete:n})}})(jQuery);(function(e,t){e.effects.effect.fold=function(t,n){var r=e(this),i=["position","top","bottom","left","right","height","width"],s=e.effects.setMode(r,t.mode||"hide"),o=s==="show",u=s==="hide",a=t.size||15,f=/([0-9]+)%/.exec(a),l=!!t.horizFirst,c=o!==l,h=c?["width","height"]:["height","width"],p=t.duration/2,d,v,m={},g={};e.effects.save(r,i),r.show(),d=e.effects.createWrapper(r).css({overflow:"hidden"}),v=c?[d.width(),d.height()]:[d.height(),d.width()],f&&(a=parseInt(f[1],10)/100*v[u?0:1]),o&&d.css(l?{height:0,width:a}:{height:a,width:0}),m[h[0]]=o?v[0]:a,g[h[1]]=o?v[1]:0,d.animate(m,p,t.easing).animate(g,p,t.easing,function(){u&&r.hide(),e.effects.restore(r,i),e.effects.removeWrapper(r),n()})}})(jQuery);(function(e,t){e.effects.effect.highlight=function(t,n){var r=e(this),i=["backgroundImage","backgroundColor","opacity"],s=e.effects.setMode(r,t.mode||"show"),o={backgroundColor:r.css("backgroundColor")};s==="hide"&&(o.opacity=0),e.effects.save(r,i),r.show().css({backgroundImage:"none",backgroundColor:t.color||"#ffff99"}).animate(o,{queue:!1,duration:t.duration,easing:t.easing,complete:function(){s==="hide"&&r.hide(),e.effects.restore(r,i),n()}})}})(jQuery);(function(e,t){e.effects.effect.pulsate=function(t,n){var r=e(this),i=e.effects.setMode(r,t.mode||"show"),s=i==="show",o=i==="hide",u=s||i==="hide",a=(t.times||5)*2+(u?1:0),f=t.duration/a,l=0,c=r.queue(),h=c.length,p;if(s||!r.is(":visible"))r.css("opacity",0).show(),l=1;for(p=1;p<a;p++)r.animate({opacity:l},f,t.easing),l=1-l;r.animate({opacity:l},f,t.easing),r.queue(function(){o&&r.hide(),n()}),h>1&&c.splice.apply(c,[1,0].concat(c.splice(h,a+1))),r.dequeue()}})(jQuery);(function(e,t){e.effects.effect.puff=function(t,n){var r=e(this),i=e.effects.setMode(r,t.mode||"hide"),s=i==="hide",o=parseInt(t.percent,10)||150,u=o/100,a={height:r.height(),width:r.width(),outerHeight:r.outerHeight(),outerWidth:r.outerWidth()};e.extend(t,{effect:"scale",queue:!1,fade:!0,mode:i,complete:n,percent:s?o:100,from:s?a:{height:a.height*u,width:a.width*u,outerHeight:a.outerHeight*u,outerWidth:a.outerWidth*u}}),r.effect(t)},e.effects.effect.scale=function(t,n){var r=e(this),i=e.extend(!0,{},t),s=e.effects.setMode(r,t.mode||"effect"),o=parseInt(t.percent,10)||(parseInt(t.percent,10)===0?0:s==="hide"?0:100),u=t.direction||"both",a=t.origin,f={height:r.height(),width:r.width(),outerHeight:r.outerHeight(),outerWidth:r.outerWidth()},l={y:u!=="horizontal"?o/100:1,x:u!=="vertical"?o/100:1};i.effect="size",i.queue=!1,i.complete=n,s!=="effect"&&(i.origin=a||["middle","center"],i.restore=!0),i.from=t.from||(s==="show"?{height:0,width:0,outerHeight:0,outerWidth:0}:f),i.to={height:f.height*l.y,width:f.width*l.x,outerHeight:f.outerHeight*l.y,outerWidth:f.outerWidth*l.x},i.fade&&(s==="show"&&(i.from.opacity=0,i.to.opacity=1),s==="hide"&&(i.from.opacity=1,i.to.opacity=0)),r.effect(i)},e.effects.effect.size=function(t,n){var r,i,s,o=e(this),u=["position","top","bottom","left","right","width","height","overflow","opacity"],a=["position","top","bottom","left","right","overflow","opacity"],f=["width","height","overflow"],l=["fontSize"],c=["borderTopWidth","borderBottomWidth","paddingTop","paddingBottom"],h=["borderLeftWidth","borderRightWidth","paddingLeft","paddingRight"],p=e.effects.setMode(o,t.mode||"effect"),d=t.restore||p!=="effect",v=t.scale||"both",m=t.origin||["middle","center"],g=o.css("position"),y=d?u:a,b={height:0,width:0,outerHeight:0,outerWidth:0};p==="show"&&o.show(),r={height:o.height(),width:o.width(),outerHeight:o.outerHeight(),outerWidth:o.outerWidth()},t.mode==="toggle"&&p==="show"?(o.from=t.to||b,o.to=t.from||r):(o.from=t.from||(p==="show"?b:r),o.to=t.to||(p==="hide"?b:r)),s={from:{y:o.from.height/r.height,x:o.from.width/r.width},to:{y:o.to.height/r.height,x:o.to.width/r.width}};if(v==="box"||v==="both")s.from.y!==s.to.y&&(y=y.concat(c),o.from=e.effects.setTransition(o,c,s.from.y,o.from),o.to=e.effects.setTransition(o,c,s.to.y,o.to)),s.from.x!==s.to.x&&(y=y.concat(h),o.from=e.effects.setTransition(o,h,s.from.x,o.from),o.to=e.effects.setTransition(o,h,s.to.x,o.to));(v==="content"||v==="both")&&s.from.y!==s.to.y&&(y=y.concat(l).concat(f),o.from=e.effects.setTransition(o,l,s.from.y,o.from),o.to=e.effects.setTransition(o,l,s.to.y,o.to)),e.effects.save(o,y),o.show(),e.effects.createWrapper(o),o.css("overflow","hidden").css(o.from),m&&(i=e.effects.getBaseline(m,r),o.from.top=(r.outerHeight-o.outerHeight())*i.y,o.from.left=(r.outerWidth-o.outerWidth())*i.x,o.to.top=(r.outerHeight-o.to.outerHeight)*i.y,o.to.left=(r.outerWidth-o.to.outerWidth)*i.x),o.css(o.from);if(v==="content"||v==="both")c=c.concat(["marginTop","marginBottom"]).concat(l),h=h.concat(["marginLeft","marginRight"]),f=u.concat(c).concat(h),o.find("*[width]").each(function(){var n=e(this),r={height:n.height(),width:n.width(),outerHeight:n.outerHeight(),outerWidth:n.outerWidth()};d&&e.effects.save(n,f),n.from={height:r.height*s.from.y,width:r.width*s.from.x,outerHeight:r.outerHeight*s.from.y,outerWidth:r.outerWidth*s.from.x},n.to={height:r.height*s.to.y,width:r.width*s.to.x,outerHeight:r.height*s.to.y,outerWidth:r.width*s.to.x},s.from.y!==s.to.y&&(n.from=e.effects.setTransition(n,c,s.from.y,n.from),n.to=e.effects.setTransition(n,c,s.to.y,n.to)),s.from.x!==s.to.x&&(n.from=e.effects.setTransition(n,h,s.from.x,n.from),n.to=e.effects.setTransition(n,h,s.to.x,n.to)),n.css(n.from),n.animate(n.to,t.duration,t.easing,function(){d&&e.effects.restore(n,f)})});o.animate(o.to,{queue:!1,duration:t.duration,easing:t.easing,complete:function(){o.to.opacity===0&&o.css("opacity",o.from.opacity),p==="hide"&&o.hide(),e.effects.restore(o,y),d||(g==="static"?o.css({position:"relative",top:o.to.top,left:o.to.left}):e.each(["top","left"],function(e,t){o.css(t,function(t,n){var r=parseInt(n,10),i=e?o.to.left:o.to.top;return n==="auto"?i+"px":r+i+"px"})})),e.effects.removeWrapper(o),n()}})}})(jQuery);(function(e,t){e.effects.effect.shake=function(t,n){var r=e(this),i=["position","top","bottom","left","right","height","width"],s=e.effects.setMode(r,t.mode||"effect"),o=t.direction||"left",u=t.distance||20,a=t.times||3,f=a*2+1,l=Math.round(t.duration/f),c=o==="up"||o==="down"?"top":"left",h=o==="up"||o==="left",p={},d={},v={},m,g=r.queue(),y=g.length;e.effects.save(r,i),r.show(),e.effects.createWrapper(r),p[c]=(h?"-=":"+=")+u,d[c]=(h?"+=":"-=")+u*2,v[c]=(h?"-=":"+=")+u*2,r.animate(p,l,t.easing);for(m=1;m<a;m++)r.animate(d,l,t.easing).animate(v,l,t.easing);r.animate(d,l,t.easing).animate(p,l/2,t.easing).queue(function(){s==="hide"&&r.hide(),e.effects.restore(r,i),e.effects.removeWrapper(r),n()}),y>1&&g.splice.apply(g,[1,0].concat(g.splice(y,f+1))),r.dequeue()}})(jQuery);(function(e,t){e.effects.effect.slide=function(t,n){var r=e(this),i=["position","top","bottom","left","right","width","height"],s=e.effects.setMode(r,t.mode||"show"),o=s==="show",u=t.direction||"left",a=u==="up"||u==="down"?"top":"left",f=u==="up"||u==="left",l,c={};e.effects.save(r,i),r.show(),l=t.distance||r[a==="top"?"outerHeight":"outerWidth"](!0),e.effects.createWrapper(r).css({overflow:"hidden"}),o&&r.css(a,f?isNaN(l)?"-"+l:-l:l),c[a]=(o?f?"+=":"-=":f?"-=":"+=")+l,r.animate(c,{queue:!1,duration:t.duration,easing:t.easing,complete:function(){s==="hide"&&r.hide(),e.effects.restore(r,i),e.effects.removeWrapper(r),n()}})}})(jQuery);(function(e,t){e.effects.effect.transfer=function(t,n){var r=e(this),i=e(t.to),s=i.css("position")==="fixed",o=e("body"),u=s?o.scrollTop():0,a=s?o.scrollLeft():0,f=i.offset(),l={top:f.top-u,left:f.left-a,height:i.innerHeight(),width:i.innerWidth()},c=r.offset(),h=e("<div class='ui-effects-transfer'></div>").appendTo(document.body).addClass(t.className).css({top:c.top-u,left:c.left-a,height:r.innerHeight(),width:r.innerWidth(),position:s?"fixed":"absolute"}).animate(l,t.duration,t.easing,function(){h.remove(),n()})}})(jQuery);
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/js/jquery-ui-1.9.2.custom.min.js b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/js/jquery-ui-1.9.2.custom.min.js
new file mode 100644
index 0000000..20048c6
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/js/jquery-ui-1.9.2.custom.min.js
@@ -0,0 +1,6 @@
+/*! jQuery UI - v1.9.2 - 2012-11-26
+* http://jqueryui.com
+* Includes: jquery.ui.core.js, jquery.ui.widget.js, jquery.ui.mouse.js, jquery.ui.position.js, jquery.ui.draggable.js, jquery.ui.droppable.js, jquery.ui.resizable.js, jquery.ui.selectable.js, jquery.ui.sortable.js, jquery.ui.accordion.js, jquery.ui.autocomplete.js, jquery.ui.button.js, jquery.ui.datepicker.js, jquery.ui.dialog.js, jquery.ui.menu.js, jquery.ui.progressbar.js, jquery.ui.slider.js, jquery.ui.spinner.js, jquery.ui.tabs.js, jquery.ui.tooltip.js, jquery.ui.effect.js, jquery.ui.effect-blind.js, jquery.ui.effect-bounce.js, jquery.ui.effect-clip.js, jquery.ui.effect-drop.js, jquery.ui.effect-explode.js, jquery.ui.effect-fade.js, jquery.ui.effect-fold.js, jquery.ui.effect-highlight.js, jquery.ui.effect-pulsate.js, jquery.ui.effect-scale.js, jquery.ui.effect-shake.js, jquery.ui.effect-slide.js, jquery.ui.effect-transfer.js
+* Copyright (c) 2012 jQuery Foundation and other contributors Licensed MIT */
+
+(function(e,t){function i(t,n){var r,i,o,u=t.nodeName.toLowerCase();return"area"===u?(r=t.parentNode,i=r.name,!t.href||!i||r.nodeName.toLowerCase()!=="map"?!1:(o=e("img[usemap=#"+i+"]")[0],!!o&&s(o))):(/input|select|textarea|button|object/.test(u)?!t.disabled:"a"===u?t.href||n:n)&&s(t)}function s(t){return e.expr.filters.visible(t)&&!e(t).parents().andSelf().filter(function(){return e.css(this,"visibility")==="hidden"}).length}var n=0,r=/^ui-id-\d+$/;e.ui=e.ui||{};if(e.ui.version)return;e.extend(e.ui,{version:"1.9.2",keyCode:{BACKSPACE:8,COMMA:188,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,LEFT:37,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SPACE:32,TAB:9,UP:38}}),e.fn.extend({_focus:e.fn.focus,focus:function(t,n){return typeof t=="number"?this.each(function(){var r=this;setTimeout(function(){e(r).focus(),n&&n.call(r)},t)}):this._focus.apply(this,arguments)},scrollParent:function(){var t;return e.ui.ie&&/(static|relative)/.test(this.css("position"))||/absolute/.test(this.css("position"))?t=this.parents().filter(function(){return/(relative|absolute|fixed)/.test(e.css(this,"position"))&&/(auto|scroll)/.test(e.css(this,"overflow")+e.css(this,"overflow-y")+e.css(this,"overflow-x"))}).eq(0):t=this.parents().filter(function(){return/(auto|scroll)/.test(e.css(this,"overflow")+e.css(this,"overflow-y")+e.css(this,"overflow-x"))}).eq(0),/fixed/.test(this.css("position"))||!t.length?e(document):t},zIndex:function(n){if(n!==t)return this.css("zIndex",n);if(this.length){var r=e(this[0]),i,s;while(r.length&&r[0]!==document){i=r.css("position");if(i==="absolute"||i==="relative"||i==="fixed"){s=parseInt(r.css("zIndex"),10);if(!isNaN(s)&&s!==0)return s}r=r.parent()}}return 0},uniqueId:function(){return this.each(function(){this.id||(this.id="ui-id-"+ ++n)})},removeUniqueId:function(){return this.each(function(){r.test(this.id)&&e(this).removeAttr("id")})}}),e.extend(e.expr[":"],{data:e.expr.createPseudo?e.expr.createPseudo(function(t){return function(n){return!!e.data(n,t)}}):function(t,n,r){return!!e.data(t,r[3])},focusable:function(t){return i(t,!isNaN(e.attr(t,"tabindex")))},tabbable:function(t){var n=e.attr(t,"tabindex"),r=isNaN(n);return(r||n>=0)&&i(t,!r)}}),e(function(){var t=document.body,n=t.appendChild(n=document.createElement("div"));n.offsetHeight,e.extend(n.style,{minHeight:"100px",height:"auto",padding:0,borderWidth:0}),e.support.minHeight=n.offsetHeight===100,e.support.selectstart="onselectstart"in n,t.removeChild(n).style.display="none"}),e("<a>").outerWidth(1).jquery||e.each(["Width","Height"],function(n,r){function u(t,n,r,s){return e.each(i,function(){n-=parseFloat(e.css(t,"padding"+this))||0,r&&(n-=parseFloat(e.css(t,"border"+this+"Width"))||0),s&&(n-=parseFloat(e.css(t,"margin"+this))||0)}),n}var i=r==="Width"?["Left","Right"]:["Top","Bottom"],s=r.toLowerCase(),o={innerWidth:e.fn.innerWidth,innerHeight:e.fn.innerHeight,outerWidth:e.fn.outerWidth,outerHeight:e.fn.outerHeight};e.fn["inner"+r]=function(n){return n===t?o["inner"+r].call(this):this.each(function(){e(this).css(s,u(this,n)+"px")})},e.fn["outer"+r]=function(t,n){return typeof t!="number"?o["outer"+r].call(this,t):this.each(function(){e(this).css(s,u(this,t,!0,n)+"px")})}}),e("<a>").data("a-b","a").removeData("a-b").data("a-b")&&(e.fn.removeData=function(t){return function(n){return arguments.length?t.call(this,e.camelCase(n)):t.call(this)}}(e.fn.removeData)),function(){var t=/msie ([\w.]+)/.exec(navigator.userAgent.toLowerCase())||[];e.ui.ie=t.length?!0:!1,e.ui.ie6=parseFloat(t[1],10)===6}(),e.fn.extend({disableSelection:function(){return this.bind((e.support.selectstart?"selectstart":"mousedown")+".ui-disableSelection",function(e){e.preventDefault()})},enableSelection:function(){return this.unbind(".ui-disableSelection")}}),e.extend(e.ui,{plugin:{add:function(t,n,r){var i,s=e.ui[t].prototype;for(i in r)s.plugins[i]=s.plugins[i]||[],s.plugins[i].push([n,r[i]])},call:function(e,t,n){var r,i=e.plugins[t];if(!i||!e.element[0].parentNode||e.element[0].parentNode.nodeType===11)return;for(r=0;r<i.length;r++)e.options[i[r][0]]&&i[r][1].apply(e.element,n)}},contains:e.contains,hasScroll:function(t,n){if(e(t).css("overflow")==="hidden")return!1;var r=n&&n==="left"?"scrollLeft":"scrollTop",i=!1;return t[r]>0?!0:(t[r]=1,i=t[r]>0,t[r]=0,i)},isOverAxis:function(e,t,n){return e>t&&e<t+n},isOver:function(t,n,r,i,s,o){return e.ui.isOverAxis(t,r,s)&&e.ui.isOverAxis(n,i,o)}})})(jQuery);(function(e,t){var n=0,r=Array.prototype.slice,i=e.cleanData;e.cleanData=function(t){for(var n=0,r;(r=t[n])!=null;n++)try{e(r).triggerHandler("remove")}catch(s){}i(t)},e.widget=function(t,n,r){var i,s,o,u,a=t.split(".")[0];t=t.split(".")[1],i=a+"-"+t,r||(r=n,n=e.Widget),e.expr[":"][i.toLowerCase()]=function(t){return!!e.data(t,i)},e[a]=e[a]||{},s=e[a][t],o=e[a][t]=function(e,t){if(!this._createWidget)return new o(e,t);arguments.length&&this._createWidget(e,t)},e.extend(o,s,{version:r.version,_proto:e.extend({},r),_childConstructors:[]}),u=new n,u.options=e.widget.extend({},u.options),e.each(r,function(t,i){e.isFunction(i)&&(r[t]=function(){var e=function(){return n.prototype[t].apply(this,arguments)},r=function(e){return n.prototype[t].apply(this,e)};return function(){var t=this._super,n=this._superApply,s;return this._super=e,this._superApply=r,s=i.apply(this,arguments),this._super=t,this._superApply=n,s}}())}),o.prototype=e.widget.extend(u,{widgetEventPrefix:s?u.widgetEventPrefix:t},r,{constructor:o,namespace:a,widgetName:t,widgetBaseClass:i,widgetFullName:i}),s?(e.each(s._childConstructors,function(t,n){var r=n.prototype;e.widget(r.namespace+"."+r.widgetName,o,n._proto)}),delete s._childConstructors):n._childConstructors.push(o),e.widget.bridge(t,o)},e.widget.extend=function(n){var i=r.call(arguments,1),s=0,o=i.length,u,a;for(;s<o;s++)for(u in i[s])a=i[s][u],i[s].hasOwnProperty(u)&&a!==t&&(e.isPlainObject(a)?n[u]=e.isPlainObject(n[u])?e.widget.extend({},n[u],a):e.widget.extend({},a):n[u]=a);return n},e.widget.bridge=function(n,i){var s=i.prototype.widgetFullName||n;e.fn[n]=function(o){var u=typeof o=="string",a=r.call(arguments,1),f=this;return o=!u&&a.length?e.widget.extend.apply(null,[o].concat(a)):o,u?this.each(function(){var r,i=e.data(this,s);if(!i)return e.error("cannot call methods on "+n+" prior to initialization; "+"attempted to call method '"+o+"'");if(!e.isFunction(i[o])||o.charAt(0)==="_")return e.error("no such method '"+o+"' for "+n+" widget instance");r=i[o].apply(i,a);if(r!==i&&r!==t)return f=r&&r.jquery?f.pushStack(r.get()):r,!1}):this.each(function(){var t=e.data(this,s);t?t.option(o||{})._init():e.data(this,s,new i(o,this))}),f}},e.Widget=function(){},e.Widget._childConstructors=[],e.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",defaultElement:"<div>",options:{disabled:!1,create:null},_createWidget:function(t,r){r=e(r||this.defaultElement||this)[0],this.element=e(r),this.uuid=n++,this.eventNamespace="."+this.widgetName+this.uuid,this.options=e.widget.extend({},this.options,this._getCreateOptions(),t),this.bindings=e(),this.hoverable=e(),this.focusable=e(),r!==this&&(e.data(r,this.widgetName,this),e.data(r,this.widgetFullName,this),this._on(!0,this.element,{remove:function(e){e.target===r&&this.destroy()}}),this.document=e(r.style?r.ownerDocument:r.document||r),this.window=e(this.document[0].defaultView||this.document[0].parentWindow)),this._create(),this._trigger("create",null,this._getCreateEventData()),this._init()},_getCreateOptions:e.noop,_getCreateEventData:e.noop,_create:e.noop,_init:e.noop,destroy:function(){this._destroy(),this.element.unbind(this.eventNamespace).removeData(this.widgetName).removeData(this.widgetFullName).removeData(e.camelCase(this.widgetFullName)),this.widget().unbind(this.eventNamespace).removeAttr("aria-disabled").removeClass(this.widgetFullName+"-disabled "+"ui-state-disabled"),this.bindings.unbind(this.eventNamespace),this.hoverable.removeClass("ui-state-hover"),this.focusable.removeClass("ui-state-focus")},_destroy:e.noop,widget:function(){return this.element},option:function(n,r){var i=n,s,o,u;if(arguments.length===0)return e.widget.extend({},this.options);if(typeof n=="string"){i={},s=n.split("."),n=s.shift();if(s.length){o=i[n]=e.widget.extend({},this.options[n]);for(u=0;u<s.length-1;u++)o[s[u]]=o[s[u]]||{},o=o[s[u]];n=s.pop();if(r===t)return o[n]===t?null:o[n];o[n]=r}else{if(r===t)return this.options[n]===t?null:this.options[n];i[n]=r}}return this._setOptions(i),this},_setOptions:function(e){var t;for(t in e)this._setOption(t,e[t]);return this},_setOption:function(e,t){return this.options[e]=t,e==="disabled"&&(this.widget().toggleClass(this.widgetFullName+"-disabled ui-state-disabled",!!t).attr("aria-disabled",t),this.hoverable.removeClass("ui-state-hover"),this.focusable.removeClass("ui-state-focus")),this},enable:function(){return this._setOption("disabled",!1)},disable:function(){return this._setOption("disabled",!0)},_on:function(t,n,r){var i,s=this;typeof t!="boolean"&&(r=n,n=t,t=!1),r?(n=i=e(n),this.bindings=this.bindings.add(n)):(r=n,n=this.element,i=this.widget()),e.each(r,function(r,o){function u(){if(!t&&(s.options.disabled===!0||e(this).hasClass("ui-state-disabled")))return;return(typeof o=="string"?s[o]:o).apply(s,arguments)}typeof o!="string"&&(u.guid=o.guid=o.guid||u.guid||e.guid++);var a=r.match(/^(\w+)\s*(.*)$/),f=a[1]+s.eventNamespace,l=a[2];l?i.delegate(l,f,u):n.bind(f,u)})},_off:function(e,t){t=(t||"").split(" ").join(this.eventNamespace+" ")+this.eventNamespace,e.unbind(t).undelegate(t)},_delay:function(e,t){function n(){return(typeof e=="string"?r[e]:e).apply(r,arguments)}var r=this;return setTimeout(n,t||0)},_hoverable:function(t){this.hoverable=this.hoverable.add(t),this._on(t,{mouseenter:function(t){e(t.currentTarget).addClass("ui-state-hover")},mouseleave:function(t){e(t.currentTarget).removeClass("ui-state-hover")}})},_focusable:function(t){this.focusable=this.focusable.add(t),this._on(t,{focusin:function(t){e(t.currentTarget).addClass("ui-state-focus")},focusout:function(t){e(t.currentTarget).removeClass("ui-state-focus")}})},_trigger:function(t,n,r){var i,s,o=this.options[t];r=r||{},n=e.Event(n),n.type=(t===this.widgetEventPrefix?t:this.widgetEventPrefix+t).toLowerCase(),n.target=this.element[0],s=n.originalEvent;if(s)for(i in s)i in n||(n[i]=s[i]);return this.element.trigger(n,r),!(e.isFunction(o)&&o.apply(this.element[0],[n].concat(r))===!1||n.isDefaultPrevented())}},e.each({show:"fadeIn",hide:"fadeOut"},function(t,n){e.Widget.prototype["_"+t]=function(r,i,s){typeof i=="string"&&(i={effect:i});var o,u=i?i===!0||typeof i=="number"?n:i.effect||n:t;i=i||{},typeof i=="number"&&(i={duration:i}),o=!e.isEmptyObject(i),i.complete=s,i.delay&&r.delay(i.delay),o&&e.effects&&(e.effects.effect[u]||e.uiBackCompat!==!1&&e.effects[u])?r[t](i):u!==t&&r[u]?r[u](i.duration,i.easing,s):r.queue(function(n){e(this)[t](),s&&s.call(r[0]),n()})}}),e.uiBackCompat!==!1&&(e.Widget.prototype._getCreateOptions=function(){return e.metadata&&e.metadata.get(this.element[0])[this.widgetName]})})(jQuery);(function(e,t){var n=!1;e(document).mouseup(function(e){n=!1}),e.widget("ui.mouse",{version:"1.9.2",options:{cancel:"input,textarea,button,select,option",distance:1,delay:0},_mouseInit:function(){var t=this;this.element.bind("mousedown."+this.widgetName,function(e){return t._mouseDown(e)}).bind("click."+this.widgetName,function(n){if(!0===e.data(n.target,t.widgetName+".preventClickEvent"))return e.removeData(n.target,t.widgetName+".preventClickEvent"),n.stopImmediatePropagation(),!1}),this.started=!1},_mouseDestroy:function(){this.element.unbind("."+this.widgetName),this._mouseMoveDelegate&&e(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate)},_mouseDown:function(t){if(n)return;this._mouseStarted&&this._mouseUp(t),this._mouseDownEvent=t;var r=this,i=t.which===1,s=typeof this.options.cancel=="string"&&t.target.nodeName?e(t.target).closest(this.options.cancel).length:!1;if(!i||s||!this._mouseCapture(t))return!0;this.mouseDelayMet=!this.options.delay,this.mouseDelayMet||(this._mouseDelayTimer=setTimeout(function(){r.mouseDelayMet=!0},this.options.delay));if(this._mouseDistanceMet(t)&&this._mouseDelayMet(t)){this._mouseStarted=this._mouseStart(t)!==!1;if(!this._mouseStarted)return t.preventDefault(),!0}return!0===e.data(t.target,this.widgetName+".preventClickEvent")&&e.removeData(t.target,this.widgetName+".preventClickEvent"),this._mouseMoveDelegate=function(e){return r._mouseMove(e)},this._mouseUpDelegate=function(e){return r._mouseUp(e)},e(document).bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate),t.preventDefault(),n=!0,!0},_mouseMove:function(t){return!e.ui.ie||document.documentMode>=9||!!t.button?this._mouseStarted?(this._mouseDrag(t),t.preventDefault()):(this._mouseDistanceMet(t)&&this._mouseDelayMet(t)&&(this._mouseStarted=this._mouseStart(this._mouseDownEvent,t)!==!1,this._mouseStarted?this._mouseDrag(t):this._mouseUp(t)),!this._mouseStarted):this._mouseUp(t)},_mouseUp:function(t){return e(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate),this._mouseStarted&&(this._mouseStarted=!1,t.target===this._mouseDownEvent.target&&e.data(t.target,this.widgetName+".preventClickEvent",!0),this._mouseStop(t)),!1},_mouseDistanceMet:function(e){return Math.max(Math.abs(this._mouseDownEvent.pageX-e.pageX),Math.abs(this._mouseDownEvent.pageY-e.pageY))>=this.options.distance},_mouseDelayMet:function(e){return this.mouseDelayMet},_mouseStart:function(e){},_mouseDrag:function(e){},_mouseStop:function(e){},_mouseCapture:function(e){return!0}})})(jQuery);(function(e,t){function h(e,t,n){return[parseInt(e[0],10)*(l.test(e[0])?t/100:1),parseInt(e[1],10)*(l.test(e[1])?n/100:1)]}function p(t,n){return parseInt(e.css(t,n),10)||0}e.ui=e.ui||{};var n,r=Math.max,i=Math.abs,s=Math.round,o=/left|center|right/,u=/top|center|bottom/,a=/[\+\-]\d+%?/,f=/^\w+/,l=/%$/,c=e.fn.position;e.position={scrollbarWidth:function(){if(n!==t)return n;var r,i,s=e("<div style='display:block;width:50px;height:50px;overflow:hidden;'><div style='height:100px;width:auto;'></div></div>"),o=s.children()[0];return e("body").append(s),r=o.offsetWidth,s.css("overflow","scroll"),i=o.offsetWidth,r===i&&(i=s[0].clientWidth),s.remove(),n=r-i},getScrollInfo:function(t){var n=t.isWindow?"":t.element.css("overflow-x"),r=t.isWindow?"":t.element.css("overflow-y"),i=n==="scroll"||n==="auto"&&t.width<t.element[0].scrollWidth,s=r==="scroll"||r==="auto"&&t.height<t.element[0].scrollHeight;return{width:i?e.position.scrollbarWidth():0,height:s?e.position.scrollbarWidth():0}},getWithinInfo:function(t){var n=e(t||window),r=e.isWindow(n[0]);return{element:n,isWindow:r,offset:n.offset()||{left:0,top:0},scrollLeft:n.scrollLeft(),scrollTop:n.scrollTop(),width:r?n.width():n.outerWidth(),height:r?n.height():n.outerHeight()}}},e.fn.position=function(t){if(!t||!t.of)return c.apply(this,arguments);t=e.extend({},t);var n,l,d,v,m,g=e(t.of),y=e.position.getWithinInfo(t.within),b=e.position.getScrollInfo(y),w=g[0],E=(t.collision||"flip").split(" "),S={};return w.nodeType===9?(l=g.width(),d=g.height(),v={top:0,left:0}):e.isWindow(w)?(l=g.width(),d=g.height(),v={top:g.scrollTop(),left:g.scrollLeft()}):w.preventDefault?(t.at="left top",l=d=0,v={top:w.pageY,left:w.pageX}):(l=g.outerWidth(),d=g.outerHeight(),v=g.offset()),m=e.extend({},v),e.each(["my","at"],function(){var e=(t[this]||"").split(" "),n,r;e.length===1&&(e=o.test(e[0])?e.concat(["center"]):u.test(e[0])?["center"].concat(e):["center","center"]),e[0]=o.test(e[0])?e[0]:"center",e[1]=u.test(e[1])?e[1]:"center",n=a.exec(e[0]),r=a.exec(e[1]),S[this]=[n?n[0]:0,r?r[0]:0],t[this]=[f.exec(e[0])[0],f.exec(e[1])[0]]}),E.length===1&&(E[1]=E[0]),t.at[0]==="right"?m.left+=l:t.at[0]==="center"&&(m.left+=l/2),t.at[1]==="bottom"?m.top+=d:t.at[1]==="center"&&(m.top+=d/2),n=h(S.at,l,d),m.left+=n[0],m.top+=n[1],this.each(function(){var o,u,a=e(this),f=a.outerWidth(),c=a.outerHeight(),w=p(this,"marginLeft"),x=p(this,"marginTop"),T=f+w+p(this,"marginRight")+b.width,N=c+x+p(this,"marginBottom")+b.height,C=e.extend({},m),k=h(S.my,a.outerWidth(),a.outerHeight());t.my[0]==="right"?C.left-=f:t.my[0]==="center"&&(C.left-=f/2),t.my[1]==="bottom"?C.top-=c:t.my[1]==="center"&&(C.top-=c/2),C.left+=k[0],C.top+=k[1],e.support.offsetFractions||(C.left=s(C.left),C.top=s(C.top)),o={marginLeft:w,marginTop:x},e.each(["left","top"],function(r,i){e.ui.position[E[r]]&&e.ui.position[E[r]][i](C,{targetWidth:l,targetHeight:d,elemWidth:f,elemHeight:c,collisionPosition:o,collisionWidth:T,collisionHeight:N,offset:[n[0]+k[0],n[1]+k[1]],my:t.my,at:t.at,within:y,elem:a})}),e.fn.bgiframe&&a.bgiframe(),t.using&&(u=function(e){var n=v.left-C.left,s=n+l-f,o=v.top-C.top,u=o+d-c,h={target:{element:g,left:v.left,top:v.top,width:l,height:d},element:{element:a,left:C.left,top:C.top,width:f,height:c},horizontal:s<0?"left":n>0?"right":"center",vertical:u<0?"top":o>0?"bottom":"middle"};l<f&&i(n+s)<l&&(h.horizontal="center"),d<c&&i(o+u)<d&&(h.vertical="middle"),r(i(n),i(s))>r(i(o),i(u))?h.important="horizontal":h.important="vertical",t.using.call(this,e,h)}),a.offset(e.extend(C,{using:u}))})},e.ui.position={fit:{left:function(e,t){var n=t.within,i=n.isWindow?n.scrollLeft:n.offset.left,s=n.width,o=e.left-t.collisionPosition.marginLeft,u=i-o,a=o+t.collisionWidth-s-i,f;t.collisionWidth>s?u>0&&a<=0?(f=e.left+u+t.collisionWidth-s-i,e.left+=u-f):a>0&&u<=0?e.left=i:u>a?e.left=i+s-t.collisionWidth:e.left=i:u>0?e.left+=u:a>0?e.left-=a:e.left=r(e.left-o,e.left)},top:function(e,t){var n=t.within,i=n.isWindow?n.scrollTop:n.offset.top,s=t.within.height,o=e.top-t.collisionPosition.marginTop,u=i-o,a=o+t.collisionHeight-s-i,f;t.collisionHeight>s?u>0&&a<=0?(f=e.top+u+t.collisionHeight-s-i,e.top+=u-f):a>0&&u<=0?e.top=i:u>a?e.top=i+s-t.collisionHeight:e.top=i:u>0?e.top+=u:a>0?e.top-=a:e.top=r(e.top-o,e.top)}},flip:{left:function(e,t){var n=t.within,r=n.offset.left+n.scrollLeft,s=n.width,o=n.isWindow?n.scrollLeft:n.offset.left,u=e.left-t.collisionPosition.marginLeft,a=u-o,f=u+t.collisionWidth-s-o,l=t.my[0]==="left"?-t.elemWidth:t.my[0]==="right"?t.elemWidth:0,c=t.at[0]==="left"?t.targetWidth:t.at[0]==="right"?-t.targetWidth:0,h=-2*t.offset[0],p,d;if(a<0){p=e.left+l+c+h+t.collisionWidth-s-r;if(p<0||p<i(a))e.left+=l+c+h}else if(f>0){d=e.left-t.collisionPosition.marginLeft+l+c+h-o;if(d>0||i(d)<f)e.left+=l+c+h}},top:function(e,t){var n=t.within,r=n.offset.top+n.scrollTop,s=n.height,o=n.isWindow?n.scrollTop:n.offset.top,u=e.top-t.collisionPosition.marginTop,a=u-o,f=u+t.collisionHeight-s-o,l=t.my[1]==="top",c=l?-t.elemHeight:t.my[1]==="bottom"?t.elemHeight:0,h=t.at[1]==="top"?t.targetHeight:t.at[1]==="bottom"?-t.targetHeight:0,p=-2*t.offset[1],d,v;a<0?(v=e.top+c+h+p+t.collisionHeight-s-r,e.top+c+h+p>a&&(v<0||v<i(a))&&(e.top+=c+h+p)):f>0&&(d=e.top-t.collisionPosition.marginTop+c+h+p-o,e.top+c+h+p>f&&(d>0||i(d)<f)&&(e.top+=c+h+p))}},flipfit:{left:function(){e.ui.position.flip.left.apply(this,arguments),e.ui.position.fit.left.apply(this,arguments)},top:function(){e.ui.position.flip.top.apply(this,arguments),e.ui.position.fit.top.apply(this,arguments)}}},function(){var t,n,r,i,s,o=document.getElementsByTagName("body")[0],u=document.createElement("div");t=document.createElement(o?"div":"body"),r={visibility:"hidden",width:0,height:0,border:0,margin:0,background:"none"},o&&e.extend(r,{position:"absolute",left:"-1000px",top:"-1000px"});for(s in r)t.style[s]=r[s];t.appendChild(u),n=o||document.documentElement,n.insertBefore(t,n.firstChild),u.style.cssText="position: absolute; left: 10.7432222px;",i=e(u).offset().left,e.support.offsetFractions=i>10&&i<11,t.innerHTML="",n.removeChild(t)}(),e.uiBackCompat!==!1&&function(e){var n=e.fn.position;e.fn.position=function(r){if(!r||!r.offset)return n.call(this,r);var i=r.offset.split(" "),s=r.at.split(" ");return i.length===1&&(i[1]=i[0]),/^\d/.test(i[0])&&(i[0]="+"+i[0]),/^\d/.test(i[1])&&(i[1]="+"+i[1]),s.length===1&&(/left|center|right/.test(s[0])?s[1]="center":(s[1]=s[0],s[0]="center")),n.call(this,e.extend(r,{at:s[0]+i[0]+" "+s[1]+i[1],offset:t}))}}(jQuery)})(jQuery);(function(e,t){e.widget("ui.draggable",e.ui.mouse,{version:"1.9.2",widgetEventPrefix:"drag",options:{addClasses:!0,appendTo:"parent",axis:!1,connectToSortable:!1,containment:!1,cursor:"auto",cursorAt:!1,grid:!1,handle:!1,helper:"original",iframeFix:!1,opacity:!1,refreshPositions:!1,revert:!1,revertDuration:500,scope:"default",scroll:!0,scrollSensitivity:20,scrollSpeed:20,snap:!1,snapMode:"both",snapTolerance:20,stack:!1,zIndex:!1},_create:function(){this.options.helper=="original"&&!/^(?:r|a|f)/.test(this.element.css("position"))&&(this.element[0].style.position="relative"),this.options.addClasses&&this.element.addClass("ui-draggable"),this.options.disabled&&this.element.addClass("ui-draggable-disabled"),this._mouseInit()},_destroy:function(){this.element.removeClass("ui-draggable ui-draggable-dragging ui-draggable-disabled"),this._mouseDestroy()},_mouseCapture:function(t){var n=this.options;return this.helper||n.disabled||e(t.target).is(".ui-resizable-handle")?!1:(this.handle=this._getHandle(t),this.handle?(e(n.iframeFix===!0?"iframe":n.iframeFix).each(function(){e('<div class="ui-draggable-iframeFix" style="background: #fff;"></div>').css({width:this.offsetWidth+"px",height:this.offsetHeight+"px",position:"absolute",opacity:"0.001",zIndex:1e3}).css(e(this).offset()).appendTo("body")}),!0):!1)},_mouseStart:function(t){var n=this.options;return this.helper=this._createHelper(t),this.helper.addClass("ui-draggable-dragging"),this._cacheHelperProportions(),e.ui.ddmanager&&(e.ui.ddmanager.current=this),this._cacheMargins(),this.cssPosition=this.helper.css("position"),this.scrollParent=this.helper.scrollParent(),this.offset=this.positionAbs=this.element.offset(),this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left},e.extend(this.offset,{click:{left:t.pageX-this.offset.left,top:t.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()}),this.originalPosition=this.position=this._generatePosition(t),this.originalPageX=t.pageX,this.originalPageY=t.pageY,n.cursorAt&&this._adjustOffsetFromHelper(n.cursorAt),n.containment&&this._setContainment(),this._trigger("start",t)===!1?(this._clear(),!1):(this._cacheHelperProportions(),e.ui.ddmanager&&!n.dropBehaviour&&e.ui.ddmanager.prepareOffsets(this,t),this._mouseDrag(t,!0),e.ui.ddmanager&&e.ui.ddmanager.dragStart(this,t),!0)},_mouseDrag:function(t,n){this.position=this._generatePosition(t),this.positionAbs=this._convertPositionTo("absolute");if(!n){var r=this._uiHash();if(this._trigger("drag",t,r)===!1)return this._mouseUp({}),!1;this.position=r.position}if(!this.options.axis||this.options.axis!="y")this.helper[0].style.left=this.position.left+"px";if(!this.options.axis||this.options.axis!="x")this.helper[0].style.top=this.position.top+"px";return e.ui.ddmanager&&e.ui.ddmanager.drag(this,t),!1},_mouseStop:function(t){var n=!1;e.ui.ddmanager&&!this.options.dropBehaviour&&(n=e.ui.ddmanager.drop(this,t)),this.dropped&&(n=this.dropped,this.dropped=!1);var r=this.element[0],i=!1;while(r&&(r=r.parentNode))r==document&&(i=!0);if(!i&&this.options.helper==="original")return!1;if(this.options.revert=="invalid"&&!n||this.options.revert=="valid"&&n||this.options.revert===!0||e.isFunction(this.options.revert)&&this.options.revert.call(this.element,n)){var s=this;e(this.helper).animate(this.originalPosition,parseInt(this.options.revertDuration,10),function(){s._trigger("stop",t)!==!1&&s._clear()})}else this._trigger("stop",t)!==!1&&this._clear();return!1},_mouseUp:function(t){return e("div.ui-draggable-iframeFix").each(function(){this.parentNode.removeChild(this)}),e.ui.ddmanager&&e.ui.ddmanager.dragStop(this,t),e.ui.mouse.prototype._mouseUp.call(this,t)},cancel:function(){return this.helper.is(".ui-draggable-dragging")?this._mouseUp({}):this._clear(),this},_getHandle:function(t){var n=!this.options.handle||!e(this.options.handle,this.element).length?!0:!1;return e(this.options.handle,this.element).find("*").andSelf().each(function(){this==t.target&&(n=!0)}),n},_createHelper:function(t){var n=this.options,r=e.isFunction(n.helper)?e(n.helper.apply(this.element[0],[t])):n.helper=="clone"?this.element.clone().removeAttr("id"):this.element;return r.parents("body").length||r.appendTo(n.appendTo=="parent"?this.element[0].parentNode:n.appendTo),r[0]!=this.element[0]&&!/(fixed|absolute)/.test(r.css("position"))&&r.css("position","absolute"),r},_adjustOffsetFromHelper:function(t){typeof t=="string"&&(t=t.split(" ")),e.isArray(t)&&(t={left:+t[0],top:+t[1]||0}),"left"in t&&(this.offset.click.left=t.left+this.margins.left),"right"in t&&(this.offset.click.left=this.helperProportions.width-t.right+this.margins.left),"top"in t&&(this.offset.click.top=t.top+this.margins.top),"bottom"in t&&(this.offset.click.top=this.helperProportions.height-t.bottom+this.margins.top)},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var t=this.offsetParent.offset();this.cssPosition=="absolute"&&this.scrollParent[0]!=document&&e.contains(this.scrollParent[0],this.offsetParent[0])&&(t.left+=this.scrollParent.scrollLeft(),t.top+=this.scrollParent.scrollTop());if(this.offsetParent[0]==document.body||this.offsetParent[0].tagName&&this.offsetParent[0].tagName.toLowerCase()=="html"&&e.ui.ie)t={top:0,left:0};return{top:t.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:t.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if(this.cssPosition=="relative"){var e=this.element.position();return{top:e.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:e.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.element.css("marginLeft"),10)||0,top:parseInt(this.element.css("marginTop"),10)||0,right:parseInt(this.element.css("marginRight"),10)||0,bottom:parseInt(this.element.css("marginBottom"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var t=this.options;t.containment=="parent"&&(t.containment=this.helper[0].parentNode);if(t.containment=="document"||t.containment=="window")this.containment=[t.containment=="document"?0:e(window).scrollLeft()-this.offset.relative.left-this.offset.parent.left,t.containment=="document"?0:e(window).scrollTop()-this.offset.relative.top-this.offset.parent.top,(t.containment=="document"?0:e(window).scrollLeft())+e(t.containment=="document"?document:window).width()-this.helperProportions.width-this.margins.left,(t.containment=="document"?0:e(window).scrollTop())+(e(t.containment=="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top];if(!/^(document|window|parent)$/.test(t.containment)&&t.containment.constructor!=Array){var n=e(t.containment),r=n[0];if(!r)return;var i=n.offset(),s=e(r).css("overflow")!="hidden";this.containment=[(parseInt(e(r).css("borderLeftWidth"),10)||0)+(parseInt(e(r).css("paddingLeft"),10)||0),(parseInt(e(r).css("borderTopWidth"),10)||0)+(parseInt(e(r).css("paddingTop"),10)||0),(s?Math.max(r.scrollWidth,r.offsetWidth):r.offsetWidth)-(parseInt(e(r).css("borderLeftWidth"),10)||0)-(parseInt(e(r).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left-this.margins.right,(s?Math.max(r.scrollHeight,r.offsetHeight):r.offsetHeight)-(parseInt(e(r).css("borderTopWidth"),10)||0)-(parseInt(e(r).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top-this.margins.bottom],this.relative_container=n}else t.containment.constructor==Array&&(this.containment=t.containment)},_convertPositionTo:function(t,n){n||(n=this.position);var r=t=="absolute"?1:-1,i=this.options,s=this.cssPosition!="absolute"||this.scrollParent[0]!=document&&!!e.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,o=/(html|body)/i.test(s[0].tagName);return{top:n.top+this.offset.relative.top*r+this.offset.parent.top*r-(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():o?0:s.scrollTop())*r,left:n.left+this.offset.relative.left*r+this.offset.parent.left*r-(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():o?0:s.scrollLeft())*r}},_generatePosition:function(t){var n=this.options,r=this.cssPosition!="absolute"||this.scrollParent[0]!=document&&!!e.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,i=/(html|body)/i.test(r[0].tagName),s=t.pageX,o=t.pageY;if(this.originalPosition){var u;if(this.containment){if(this.relative_container){var a=this.relative_container.offset();u=[this.containment[0]+a.left,this.containment[1]+a.top,this.containment[2]+a.left,this.containment[3]+a.top]}else u=this.containment;t.pageX-this.offset.click.left<u[0]&&(s=u[0]+this.offset.click.left),t.pageY-this.offset.click.top<u[1]&&(o=u[1]+this.offset.click.top),t.pageX-this.offset.click.left>u[2]&&(s=u[2]+this.offset.click.left),t.pageY-this.offset.click.top>u[3]&&(o=u[3]+this.offset.click.top)}if(n.grid){var f=n.grid[1]?this.originalPageY+Math.round((o-this.originalPageY)/n.grid[1])*n.grid[1]:this.originalPageY;o=u?f-this.offset.click.top<u[1]||f-this.offset.click.top>u[3]?f-this.offset.click.top<u[1]?f+n.grid[1]:f-n.grid[1]:f:f;var l=n.grid[0]?this.originalPageX+Math.round((s-this.originalPageX)/n.grid[0])*n.grid[0]:this.originalPageX;s=u?l-this.offset.click.left<u[0]||l-this.offset.click.left>u[2]?l-this.offset.click.left<u[0]?l+n.grid[0]:l-n.grid[0]:l:l}}return{top:o-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():i?0:r.scrollTop()),left:s-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():i?0:r.scrollLeft())}},_clear:function(){this.helper.removeClass("ui-draggable-dragging"),this.helper[0]!=this.element[0]&&!this.cancelHelperRemoval&&this.helper.remove(),this.helper=null,this.cancelHelperRemoval=!1},_trigger:function(t,n,r){return r=r||this._uiHash(),e.ui.plugin.call(this,t,[n,r]),t=="drag"&&(this.positionAbs=this._convertPositionTo("absolute")),e.Widget.prototype._trigger.call(this,t,n,r)},plugins:{},_uiHash:function(e){return{helper:this.helper,position:this.position,originalPosition:this.originalPosition,offset:this.positionAbs}}}),e.ui.plugin.add("draggable","connectToSortable",{start:function(t,n){var r=e(this).data("draggable"),i=r.options,s=e.extend({},n,{item:r.element});r.sortables=[],e(i.connectToSortable).each(function(){var n=e.data(this,"sortable");n&&!n.options.disabled&&(r.sortables.push({instance:n,shouldRevert:n.options.revert}),n.refreshPositions(),n._trigger("activate",t,s))})},stop:function(t,n){var r=e(this).data("draggable"),i=e.extend({},n,{item:r.element});e.each(r.sortables,function(){this.instance.isOver?(this.instance.isOver=0,r.cancelHelperRemoval=!0,this.instance.cancelHelperRemoval=!1,this.shouldRevert&&(this.instance.options.revert=!0),this.instance._mouseStop(t),this.instance.options.helper=this.instance.options._helper,r.options.helper=="original"&&this.instance.currentItem.css({top:"auto",left:"auto"})):(this.instance.cancelHelperRemoval=!1,this.instance._trigger("deactivate",t,i))})},drag:function(t,n){var r=e(this).data("draggable"),i=this,s=function(t){var n=this.offset.click.top,r=this.offset.click.left,i=this.positionAbs.top,s=this.positionAbs.left,o=t.height,u=t.width,a=t.top,f=t.left;return e.ui.isOver(i+n,s+r,a,f,o,u)};e.each(r.sortables,function(s){var o=!1,u=this;this.instance.positionAbs=r.positionAbs,this.instance.helperProportions=r.helperProportions,this.instance.offset.click=r.offset.click,this.instance._intersectsWith(this.instance.containerCache)&&(o=!0,e.each(r.sortables,function(){return this.instance.positionAbs=r.positionAbs,this.instance.helperProportions=r.helperProportions,this.instance.offset.click=r.offset.click,this!=u&&this.instance._intersectsWith(this.instance.containerCache)&&e.ui.contains(u.instance.element[0],this.instance.element[0])&&(o=!1),o})),o?(this.instance.isOver||(this.instance.isOver=1,this.instance.currentItem=e(i).clone().removeAttr("id").appendTo(this.instance.element).data("sortable-item",!0),this.instance.options._helper=this.instance.options.helper,this.instance.options.helper=function(){return n.helper[0]},t.target=this.instance.currentItem[0],this.instance._mouseCapture(t,!0),this.instance._mouseStart(t,!0,!0),this.instance.offset.click.top=r.offset.click.top,this.instance.offset.click.left=r.offset.click.left,this.instance.offset.parent.left-=r.offset.parent.left-this.instance.offset.parent.left,this.instance.offset.parent.top-=r.offset.parent.top-this.instance.offset.parent.top,r._trigger("toSortable",t),r.dropped=this.instance.element,r.currentItem=r.element,this.instance.fromOutside=r),this.instance.currentItem&&this.instance._mouseDrag(t)):this.instance.isOver&&(this.instance.isOver=0,this.instance.cancelHelperRemoval=!0,this.instance.options.revert=!1,this.instance._trigger("out",t,this.instance._uiHash(this.instance)),this.instance._mouseStop(t,!0),this.instance.options.helper=this.instance.options._helper,this.instance.currentItem.remove(),this.instance.placeholder&&this.instance.placeholder.remove(),r._trigger("fromSortable",t),r.dropped=!1)})}}),e.ui.plugin.add("draggable","cursor",{start:function(t,n){var r=e("body"),i=e(this).data("draggable").options;r.css("cursor")&&(i._cursor=r.css("cursor")),r.css("cursor",i.cursor)},stop:function(t,n){var r=e(this).data("draggable").options;r._cursor&&e("body").css("cursor",r._cursor)}}),e.ui.plugin.add("draggable","opacity",{start:function(t,n){var r=e(n.helper),i=e(this).data("draggable").options;r.css("opacity")&&(i._opacity=r.css("opacity")),r.css("opacity",i.opacity)},stop:function(t,n){var r=e(this).data("draggable").options;r._opacity&&e(n.helper).css("opacity",r._opacity)}}),e.ui.plugin.add("draggable","scroll",{start:function(t,n){var r=e(this).data("draggable");r.scrollParent[0]!=document&&r.scrollParent[0].tagName!="HTML"&&(r.overflowOffset=r.scrollParent.offset())},drag:function(t,n){var r=e(this).data("draggable"),i=r.options,s=!1;if(r.scrollParent[0]!=document&&r.scrollParent[0].tagName!="HTML"){if(!i.axis||i.axis!="x")r.overflowOffset.top+r.scrollParent[0].offsetHeight-t.pageY<i.scrollSensitivity?r.scrollParent[0].scrollTop=s=r.scrollParent[0].scrollTop+i.scrollSpeed:t.pageY-r.overflowOffset.top<i.scrollSensitivity&&(r.scrollParent[0].scrollTop=s=r.scrollParent[0].scrollTop-i.scrollSpeed);if(!i.axis||i.axis!="y")r.overflowOffset.left+r.scrollParent[0].offsetWidth-t.pageX<i.scrollSensitivity?r.scrollParent[0].scrollLeft=s=r.scrollParent[0].scrollLeft+i.scrollSpeed:t.pageX-r.overflowOffset.left<i.scrollSensitivity&&(r.scrollParent[0].scrollLeft=s=r.scrollParent[0].scrollLeft-i.scrollSpeed)}else{if(!i.axis||i.axis!="x")t.pageY-e(document).scrollTop()<i.scrollSensitivity?s=e(document).scrollTop(e(document).scrollTop()-i.scrollSpeed):e(window).height()-(t.pageY-e(document).scrollTop())<i.scrollSensitivity&&(s=e(document).scrollTop(e(document).scrollTop()+i.scrollSpeed));if(!i.axis||i.axis!="y")t.pageX-e(document).scrollLeft()<i.scrollSensitivity?s=e(document).scrollLeft(e(document).scrollLeft()-i.scrollSpeed):e(window).width()-(t.pageX-e(document).scrollLeft())<i.scrollSensitivity&&(s=e(document).scrollLeft(e(document).scrollLeft()+i.scrollSpeed))}s!==!1&&e.ui.ddmanager&&!i.dropBehaviour&&e.ui.ddmanager.prepareOffsets(r,t)}}),e.ui.plugin.add("draggable","snap",{start:function(t,n){var r=e(this).data("draggable"),i=r.options;r.snapElements=[],e(i.snap.constructor!=String?i.snap.items||":data(draggable)":i.snap).each(function(){var t=e(this),n=t.offset();this!=r.element[0]&&r.snapElements.push({item:this,width:t.outerWidth(),height:t.outerHeight(),top:n.top,left:n.left})})},drag:function(t,n){var r=e(this).data("draggable"),i=r.options,s=i.snapTolerance,o=n.offset.left,u=o+r.helperProportions.width,a=n.offset.top,f=a+r.helperProportions.height;for(var l=r.snapElements.length-1;l>=0;l--){var c=r.snapElements[l].left,h=c+r.snapElements[l].width,p=r.snapElements[l].top,d=p+r.snapElements[l].height;if(!(c-s<o&&o<h+s&&p-s<a&&a<d+s||c-s<o&&o<h+s&&p-s<f&&f<d+s||c-s<u&&u<h+s&&p-s<a&&a<d+s||c-s<u&&u<h+s&&p-s<f&&f<d+s)){r.snapElements[l].snapping&&r.options.snap.release&&r.options.snap.release.call(r.element,t,e.extend(r._uiHash(),{snapItem:r.snapElements[l].item})),r.snapElements[l].snapping=!1;continue}if(i.snapMode!="inner"){var v=Math.abs(p-f)<=s,m=Math.abs(d-a)<=s,g=Math.abs(c-u)<=s,y=Math.abs(h-o)<=s;v&&(n.position.top=r._convertPositionTo("relative",{top:p-r.helperProportions.height,left:0}).top-r.margins.top),m&&(n.position.top=r._convertPositionTo("relative",{top:d,left:0}).top-r.margins.top),g&&(n.position.left=r._convertPositionTo("relative",{top:0,left:c-r.helperProportions.width}).left-r.margins.left),y&&(n.position.left=r._convertPositionTo("relative",{top:0,left:h}).left-r.margins.left)}var b=v||m||g||y;if(i.snapMode!="outer"){var v=Math.abs(p-a)<=s,m=Math.abs(d-f)<=s,g=Math.abs(c-o)<=s,y=Math.abs(h-u)<=s;v&&(n.position.top=r._convertPositionTo("relative",{top:p,left:0}).top-r.margins.top),m&&(n.position.top=r._convertPositionTo("relative",{top:d-r.helperProportions.height,left:0}).top-r.margins.top),g&&(n.position.left=r._convertPositionTo("relative",{top:0,left:c}).left-r.margins.left),y&&(n.position.left=r._convertPositionTo("relative",{top:0,left:h-r.helperProportions.width}).left-r.margins.left)}!r.snapElements[l].snapping&&(v||m||g||y||b)&&r.options.snap.snap&&r.options.snap.snap.call(r.element,t,e.extend(r._uiHash(),{snapItem:r.snapElements[l].item})),r.snapElements[l].snapping=v||m||g||y||b}}}),e.ui.plugin.add("draggable","stack",{start:function(t,n){var r=e(this).data("draggable").options,i=e.makeArray(e(r.stack)).sort(function(t,n){return(parseInt(e(t).css("zIndex"),10)||0)-(parseInt(e(n).css("zIndex"),10)||0)});if(!i.length)return;var s=parseInt(i[0].style.zIndex)||0;e(i).each(function(e){this.style.zIndex=s+e}),this[0].style.zIndex=s+i.length}}),e.ui.plugin.add("draggable","zIndex",{start:function(t,n){var r=e(n.helper),i=e(this).data("draggable").options;r.css("zIndex")&&(i._zIndex=r.css("zIndex")),r.css("zIndex",i.zIndex)},stop:function(t,n){var r=e(this).data("draggable").options;r._zIndex&&e(n.helper).css("zIndex",r._zIndex)}})})(jQuery);(function(e,t){e.widget("ui.droppable",{version:"1.9.2",widgetEventPrefix:"drop",options:{accept:"*",activeClass:!1,addClasses:!0,greedy:!1,hoverClass:!1,scope:"default",tolerance:"intersect"},_create:function(){var t=this.options,n=t.accept;this.isover=0,this.isout=1,this.accept=e.isFunction(n)?n:function(e){return e.is(n)},this.proportions={width:this.element[0].offsetWidth,height:this.element[0].offsetHeight},e.ui.ddmanager.droppables[t.scope]=e.ui.ddmanager.droppables[t.scope]||[],e.ui.ddmanager.droppables[t.scope].push(this),t.addClasses&&this.element.addClass("ui-droppable")},_destroy:function(){var t=e.ui.ddmanager.droppables[this.options.scope];for(var n=0;n<t.length;n++)t[n]==this&&t.splice(n,1);this.element.removeClass("ui-droppable ui-droppable-disabled")},_setOption:function(t,n){t=="accept"&&(this.accept=e.isFunction(n)?n:function(e){return e.is(n)}),e.Widget.prototype._setOption.apply(this,arguments)},_activate:function(t){var n=e.ui.ddmanager.current;this.options.activeClass&&this.element.addClass(this.options.activeClass),n&&this._trigger("activate",t,this.ui(n))},_deactivate:function(t){var n=e.ui.ddmanager.current;this.options.activeClass&&this.element.removeClass(this.options.activeClass),n&&this._trigger("deactivate",t,this.ui(n))},_over:function(t){var n=e.ui.ddmanager.current;if(!n||(n.currentItem||n.element)[0]==this.element[0])return;this.accept.call(this.element[0],n.currentItem||n.element)&&(this.options.hoverClass&&this.element.addClass(this.options.hoverClass),this._trigger("over",t,this.ui(n)))},_out:function(t){var n=e.ui.ddmanager.current;if(!n||(n.currentItem||n.element)[0]==this.element[0])return;this.accept.call(this.element[0],n.currentItem||n.element)&&(this.options.hoverClass&&this.element.removeClass(this.options.hoverClass),this._trigger("out",t,this.ui(n)))},_drop:function(t,n){var r=n||e.ui.ddmanager.current;if(!r||(r.currentItem||r.element)[0]==this.element[0])return!1;var i=!1;return this.element.find(":data(droppable)").not(".ui-draggable-dragging").each(function(){var t=e.data(this,"droppable");if(t.options.greedy&&!t.options.disabled&&t.options.scope==r.options.scope&&t.accept.call(t.element[0],r.currentItem||r.element)&&e.ui.intersect(r,e.extend(t,{offset:t.element.offset()}),t.options.tolerance))return i=!0,!1}),i?!1:this.accept.call(this.element[0],r.currentItem||r.element)?(this.options.activeClass&&this.element.removeClass(this.options.activeClass),this.options.hoverClass&&this.element.removeClass(this.options.hoverClass),this._trigger("drop",t,this.ui(r)),this.element):!1},ui:function(e){return{draggable:e.currentItem||e.element,helper:e.helper,position:e.position,offset:e.positionAbs}}}),e.ui.intersect=function(t,n,r){if(!n.offset)return!1;var i=(t.positionAbs||t.position.absolute).left,s=i+t.helperProportions.width,o=(t.positionAbs||t.position.absolute).top,u=o+t.helperProportions.height,a=n.offset.left,f=a+n.proportions.width,l=n.offset.top,c=l+n.proportions.height;switch(r){case"fit":return a<=i&&s<=f&&l<=o&&u<=c;case"intersect":return a<i+t.helperProportions.width/2&&s-t.helperProportions.width/2<f&&l<o+t.helperProportions.height/2&&u-t.helperProportions.height/2<c;case"pointer":var h=(t.positionAbs||t.position.absolute).left+(t.clickOffset||t.offset.click).left,p=(t.positionAbs||t.position.absolute).top+(t.clickOffset||t.offset.click).top,d=e.ui.isOver(p,h,l,a,n.proportions.height,n.proportions.width);return d;case"touch":return(o>=l&&o<=c||u>=l&&u<=c||o<l&&u>c)&&(i>=a&&i<=f||s>=a&&s<=f||i<a&&s>f);default:return!1}},e.ui.ddmanager={current:null,droppables:{"default":[]},prepareOffsets:function(t,n){var r=e.ui.ddmanager.droppables[t.options.scope]||[],i=n?n.type:null,s=(t.currentItem||t.element).find(":data(droppable)").andSelf();e:for(var o=0;o<r.length;o++){if(r[o].options.disabled||t&&!r[o].accept.call(r[o].element[0],t.currentItem||t.element))continue;for(var u=0;u<s.length;u++)if(s[u]==r[o].element[0]){r[o].proportions.height=0;continue e}r[o].visible=r[o].element.css("display")!="none";if(!r[o].visible)continue;i=="mousedown"&&r[o]._activate.call(r[o],n),r[o].offset=r[o].element.offset(),r[o].proportions={width:r[o].element[0].offsetWidth,height:r[o].element[0].offsetHeight}}},drop:function(t,n){var r=!1;return e.each(e.ui.ddmanager.droppables[t.options.scope]||[],function(){if(!this.options)return;!this.options.disabled&&this.visible&&e.ui.intersect(t,this,this.options.tolerance)&&(r=this._drop.call(this,n)||r),!this.options.disabled&&this.visible&&this.accept.call(this.element[0],t.currentItem||t.element)&&(this.isout=1,this.isover=0,this._deactivate.call(this,n))}),r},dragStart:function(t,n){t.element.parentsUntil("body").bind("scroll.droppable",function(){t.options.refreshPositions||e.ui.ddmanager.prepareOffsets(t,n)})},drag:function(t,n){t.options.refreshPositions&&e.ui.ddmanager.prepareOffsets(t,n),e.each(e.ui.ddmanager.droppables[t.options.scope]||[],function(){if(this.options.disabled||this.greedyChild||!this.visible)return;var r=e.ui.intersect(t,this,this.options.tolerance),i=!r&&this.isover==1?"isout":r&&this.isover==0?"isover":null;if(!i)return;var s;if(this.options.greedy){var o=this.options.scope,u=this.element.parents(":data(droppable)").filter(function(){return e.data(this,"droppable").options.scope===o});u.length&&(s=e.data(u[0],"droppable"),s.greedyChild=i=="isover"?1:0)}s&&i=="isover"&&(s.isover=0,s.isout=1,s._out.call(s,n)),this[i]=1,this[i=="isout"?"isover":"isout"]=0,this[i=="isover"?"_over":"_out"].call(this,n),s&&i=="isout"&&(s.isout=0,s.isover=1,s._over.call(s,n))})},dragStop:function(t,n){t.element.parentsUntil("body").unbind("scroll.droppable"),t.options.refreshPositions||e.ui.ddmanager.prepareOffsets(t,n)}}})(jQuery);(function(e,t){e.widget("ui.resizable",e.ui.mouse,{version:"1.9.2",widgetEventPrefix:"resize",options:{alsoResize:!1,animate:!1,animateDuration:"slow",animateEasing:"swing",aspectRatio:!1,autoHide:!1,containment:!1,ghost:!1,grid:!1,handles:"e,s,se",helper:!1,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:1e3},_create:function(){var t=this,n=this.options;this.element.addClass("ui-resizable"),e.extend(this,{_aspectRatio:!!n.aspectRatio,aspectRatio:n.aspectRatio,originalElement:this.element,_proportionallyResizeElements:[],_helper:n.helper||n.ghost||n.animate?n.helper||"ui-resizable-helper":null}),this.element[0].nodeName.match(/canvas|textarea|input|select|button|img/i)&&(this.element.wrap(e('<div class="ui-wrapper" style="overflow: hidden;"></div>').css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),top:this.element.css("top"),left:this.element.css("left")})),this.element=this.element.parent().data("resizable",this.element.data("resizable")),this.elementIsWrapper=!0,this.element.css({marginLeft:this.originalElement.css("marginLeft"),marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom")}),this.originalElement.css({marginLeft:0,marginTop:0,marginRight:0,marginBottom:0}),this.originalResizeStyle=this.originalElement.css("resize"),this.originalElement.css("resize","none"),this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"})),this.originalElement.css({margin:this.originalElement.css("margin")}),this._proportionallyResize()),this.handles=n.handles||(e(".ui-resizable-handle",this.element).length?{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",nw:".ui-resizable-nw"}:"e,s,se");if(this.handles.constructor==String){this.handles=="all"&&(this.handles="n,e,s,w,se,sw,ne,nw");var r=this.handles.split(",");this.handles={};for(var i=0;i<r.length;i++){var s=e.trim(r[i]),o="ui-resizable-"+s,u=e('<div class="ui-resizable-handle '+o+'"></div>');u.css({zIndex:n.zIndex}),"se"==s&&u.addClass("ui-icon ui-icon-gripsmall-diagonal-se"),this.handles[s]=".ui-resizable-"+s,this.element.append(u)}}this._renderAxis=function(t){t=t||this.element;for(var n in this.handles){this.handles[n].constructor==String&&(this.handles[n]=e(this.handles[n],this.element).show());if(this.elementIsWrapper&&this.originalElement[0].nodeName.match(/textarea|input|select|button/i)){var r=e(this.handles[n],this.element),i=0;i=/sw|ne|nw|se|n|s/.test(n)?r.outerHeight():r.outerWidth();var s=["padding",/ne|nw|n/.test(n)?"Top":/se|sw|s/.test(n)?"Bottom":/^e$/.test(n)?"Right":"Left"].join("");t.css(s,i),this._proportionallyResize()}if(!e(this.handles[n]).length)continue}},this._renderAxis(this.element),this._handles=e(".ui-resizable-handle",this.element).disableSelection(),this._handles.mouseover(function(){if(!t.resizing){if(this.className)var e=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i);t.axis=e&&e[1]?e[1]:"se"}}),n.autoHide&&(this._handles.hide(),e(this.element).addClass("ui-resizable-autohide").mouseenter(function(){if(n.disabled)return;e(this).removeClass("ui-resizable-autohide"),t._handles.show()}).mouseleave(function(){if(n.disabled)return;t.resizing||(e(this).addClass("ui-resizable-autohide"),t._handles.hide())})),this._mouseInit()},_destroy:function(){this._mouseDestroy();var t=function(t){e(t).removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing").removeData("resizable").removeData("ui-resizable").unbind(".resizable").find(".ui-resizable-handle").remove()};if(this.elementIsWrapper){t(this.element);var n=this.element;this.originalElement.css({position:n.css("position"),width:n.outerWidth(),height:n.outerHeight(),top:n.css("top"),left:n.css("left")}).insertAfter(n),n.remove()}return this.originalElement.css("resize",this.originalResizeStyle),t(this.originalElement),this},_mouseCapture:function(t){var n=!1;for(var r in this.handles)e(this.handles[r])[0]==t.target&&(n=!0);return!this.options.disabled&&n},_mouseStart:function(t){var r=this.options,i=this.element.position(),s=this.element;this.resizing=!0,this.documentScroll={top:e(document).scrollTop(),left:e(document).scrollLeft()},(s.is(".ui-draggable")||/absolute/.test(s.css("position")))&&s.css({position:"absolute",top:i.top,left:i.left}),this._renderProxy();var o=n(this.helper.css("left")),u=n(this.helper.css("top"));r.containment&&(o+=e(r.containment).scrollLeft()||0,u+=e(r.containment).scrollTop()||0),this.offset=this.helper.offset(),this.position={left:o,top:u},this.size=this._helper?{width:s.outerWidth(),height:s.outerHeight()}:{width:s.width(),height:s.height()},this.originalSize=this._helper?{width:s.outerWidth(),height:s.outerHeight()}:{width:s.width(),height:s.height()},this.originalPosition={left:o,top:u},this.sizeDiff={width:s.outerWidth()-s.width(),height:s.outerHeight()-s.height()},this.originalMousePosition={left:t.pageX,top:t.pageY},this.aspectRatio=typeof r.aspectRatio=="number"?r.aspectRatio:this.originalSize.width/this.originalSize.height||1;var a=e(".ui-resizable-"+this.axis).css("cursor");return e("body").css("cursor",a=="auto"?this.axis+"-resize":a),s.addClass("ui-resizable-resizing"),this._propagate("start",t),!0},_mouseDrag:function(e){var t=this.helper,n=this.options,r={},i=this,s=this.originalMousePosition,o=this.axis,u=e.pageX-s.left||0,a=e.pageY-s.top||0,f=this._change[o];if(!f)return!1;var l=f.apply(this,[e,u,a]);this._updateVirtualBoundaries(e.shiftKey);if(this._aspectRatio||e.shiftKey)l=this._updateRatio(l,e);return l=this._respectSize(l,e),this._propagate("resize",e),t.css({top:this.position.top+"px",left:this.position.left+"px",width:this.size.width+"px",height:this.size.height+"px"}),!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize(),this._updateCache(l),this._trigger("resize",e,this.ui()),!1},_mouseStop:function(t){this.resizing=!1;var n=this.options,r=this;if(this._helper){var i=this._proportionallyResizeElements,s=i.length&&/textarea/i.test(i[0].nodeName),o=s&&e.ui.hasScroll(i[0],"left")?0:r.sizeDiff.height,u=s?0:r.sizeDiff.width,a={width:r.helper.width()-u,height:r.helper.height()-o},f=parseInt(r.element.css("left"),10)+(r.position.left-r.originalPosition.left)||null,l=parseInt(r.element.css("top"),10)+(r.position.top-r.originalPosition.top)||null;n.animate||this.element.css(e.extend(a,{top:l,left:f})),r.helper.height(r.size.height),r.helper.width(r.size.width),this._helper&&!n.animate&&this._proportionallyResize()}return e("body").css("cursor","auto"),this.element.removeClass("ui-resizable-resizing"),this._propagate("stop",t),this._helper&&this.helper.remove(),!1},_updateVirtualBoundaries:function(e){var t=this.options,n,i,s,o,u;u={minWidth:r(t.minWidth)?t.minWidth:0,maxWidth:r(t.maxWidth)?t.maxWidth:Infinity,minHeight:r(t.minHeight)?t.minHeight:0,maxHeight:r(t.maxHeight)?t.maxHeight:Infinity};if(this._aspectRatio||e)n=u.minHeight*this.aspectRatio,s=u.minWidth/this.aspectRatio,i=u.maxHeight*this.aspectRatio,o=u.maxWidth/this.aspectRatio,n>u.minWidth&&(u.minWidth=n),s>u.minHeight&&(u.minHeight=s),i<u.maxWidth&&(u.maxWidth=i),o<u.maxHeight&&(u.maxHeight=o);this._vBoundaries=u},_updateCache:function(e){var t=this.options;this.offset=this.helper.offset(),r(e.left)&&(this.position.left=e.left),r(e.top)&&(this.position.top=e.top),r(e.height)&&(this.size.height=e.height),r(e.width)&&(this.size.width=e.width)},_updateRatio:function(e,t){var n=this.options,i=this.position,s=this.size,o=this.axis;return r(e.height)?e.width=e.height*this.aspectRatio:r(e.width)&&(e.height=e.width/this.aspectRatio),o=="sw"&&(e.left=i.left+(s.width-e.width),e.top=null),o=="nw"&&(e.top=i.top+(s.height-e.height),e.left=i.left+(s.width-e.width)),e},_respectSize:function(e,t){var n=this.helper,i=this._vBoundaries,s=this._aspectRatio||t.shiftKey,o=this.axis,u=r(e.width)&&i.maxWidth&&i.maxWidth<e.width,a=r(e.height)&&i.maxHeight&&i.maxHeight<e.height,f=r(e.width)&&i.minWidth&&i.minWidth>e.width,l=r(e.height)&&i.minHeight&&i.minHeight>e.height;f&&(e.width=i.minWidth),l&&(e.height=i.minHeight),u&&(e.width=i.maxWidth),a&&(e.height=i.maxHeight);var c=this.originalPosition.left+this.originalSize.width,h=this.position.top+this.size.height,p=/sw|nw|w/.test(o),d=/nw|ne|n/.test(o);f&&p&&(e.left=c-i.minWidth),u&&p&&(e.left=c-i.maxWidth),l&&d&&(e.top=h-i.minHeight),a&&d&&(e.top=h-i.maxHeight);var v=!e.width&&!e.height;return v&&!e.left&&e.top?e.top=null:v&&!e.top&&e.left&&(e.left=null),e},_proportionallyResize:function(){var t=this.options;if(!this._proportionallyResizeElements.length)return;var n=this.helper||this.element;for(var r=0;r<this._proportionallyResizeElements.length;r++){var i=this._proportionallyResizeElements[r];if(!this.borderDif){var s=[i.css("borderTopWidth"),i.css("borderRightWidth"),i.css("borderBottomWidth"),i.css("borderLeftWidth")],o=[i.css("paddingTop"),i.css("paddingRight"),i.css("paddingBottom"),i.css("paddingLeft")];this.borderDif=e.map(s,function(e,t){var n=parseInt(e,10)||0,r=parseInt(o[t],10)||0;return n+r})}i.css({height:n.height()-this.borderDif[0]-this.borderDif[2]||0,width:n.width()-this.borderDif[1]-this.borderDif[3]||0})}},_renderProxy:function(){var t=this.element,n=this.options;this.elementOffset=t.offset();if(this._helper){this.helper=this.helper||e('<div style="overflow:hidden;"></div>');var r=e.ui.ie6?1:0,i=e.ui.ie6?2:-1;this.helper.addClass(this._helper).css({width:this.element.outerWidth()+i,height:this.element.outerHeight()+i,position:"absolute",left:this.elementOffset.left-r+"px",top:this.elementOffset.top-r+"px",zIndex:++n.zIndex}),this.helper.appendTo("body").disableSelection()}else this.helper=this.element},_change:{e:function(e,t,n){return{width:this.originalSize.width+t}},w:function(e,t,n){var r=this.options,i=this.originalSize,s=this.originalPosition;return{left:s.left+t,width:i.width-t}},n:function(e,t,n){var r=this.options,i=this.originalSize,s=this.originalPosition;return{top:s.top+n,height:i.height-n}},s:function(e,t,n){return{height:this.originalSize.height+n}},se:function(t,n,r){return e.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[t,n,r]))},sw:function(t,n,r){return e.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[t,n,r]))},ne:function(t,n,r){return e.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[t,n,r]))},nw:function(t,n,r){return e.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[t,n,r]))}},_propagate:function(t,n){e.ui.plugin.call(this,t,[n,this.ui()]),t!="resize"&&this._trigger(t,n,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}}),e.ui.plugin.add("resizable","alsoResize",{start:function(t,n){var r=e(this).data("resizable"),i=r.options,s=function(t){e(t).each(function(){var t=e(this);t.data("resizable-alsoresize",{width:parseInt(t.width(),10),height:parseInt(t.height(),10),left:parseInt(t.css("left"),10),top:parseInt(t.css("top"),10)})})};typeof i.alsoResize=="object"&&!i.alsoResize.parentNode?i.alsoResize.length?(i.alsoResize=i.alsoResize[0],s(i.alsoResize)):e.each(i.alsoResize,function(e){s(e)}):s(i.alsoResize)},resize:function(t,n){var r=e(this).data("resizable"),i=r.options,s=r.originalSize,o=r.originalPosition,u={height:r.size.height-s.height||0,width:r.size.width-s.width||0,top:r.position.top-o.top||0,left:r.position.left-o.left||0},a=function(t,r){e(t).each(function(){var t=e(this),i=e(this).data("resizable-alsoresize"),s={},o=r&&r.length?r:t.parents(n.originalElement[0]).length?["width","height"]:["width","height","top","left"];e.each(o,function(e,t){var n=(i[t]||0)+(u[t]||0);n&&n>=0&&(s[t]=n||null)}),t.css(s)})};typeof i.alsoResize=="object"&&!i.alsoResize.nodeType?e.each(i.alsoResize,function(e,t){a(e,t)}):a(i.alsoResize)},stop:function(t,n){e(this).removeData("resizable-alsoresize")}}),e.ui.plugin.add("resizable","animate",{stop:function(t,n){var r=e(this).data("resizable"),i=r.options,s=r._proportionallyResizeElements,o=s.length&&/textarea/i.test(s[0].nodeName),u=o&&e.ui.hasScroll(s[0],"left")?0:r.sizeDiff.height,a=o?0:r.sizeDiff.width,f={width:r.size.width-a,height:r.size.height-u},l=parseInt(r.element.css("left"),10)+(r.position.left-r.originalPosition.left)||null,c=parseInt(r.element.css("top"),10)+(r.position.top-r.originalPosition.top)||null;r.element.animate(e.extend(f,c&&l?{top:c,left:l}:{}),{duration:i.animateDuration,easing:i.animateEasing,step:function(){var n={width:parseInt(r.element.css("width"),10),height:parseInt(r.element.css("height"),10),top:parseInt(r.element.css("top"),10),left:parseInt(r.element.css("left"),10)};s&&s.length&&e(s[0]).css({width:n.width,height:n.height}),r._updateCache(n),r._propagate("resize",t)}})}}),e.ui.plugin.add("resizable","containment",{start:function(t,r){var i=e(this).data("resizable"),s=i.options,o=i.element,u=s.containment,a=u instanceof e?u.get(0):/parent/.test(u)?o.parent().get(0):u;if(!a)return;i.containerElement=e(a);if(/document/.test(u)||u==document)i.containerOffset={left:0,top:0},i.containerPosition={left:0,top:0},i.parentData={element:e(document),left:0,top:0,width:e(document).width(),height:e(document).height()||document.body.parentNode.scrollHeight};else{var f=e(a),l=[];e(["Top","Right","Left","Bottom"]).each(function(e,t){l[e]=n(f.css("padding"+t))}),i.containerOffset=f.offset(),i.containerPosition=f.position(),i.containerSize={height:f.innerHeight()-l[3],width:f.innerWidth()-l[1]};var c=i.containerOffset,h=i.containerSize.height,p=i.containerSize.width,d=e.ui.hasScroll(a,"left")?a.scrollWidth:p,v=e.ui.hasScroll(a)?a.scrollHeight:h;i.parentData={element:a,left:c.left,top:c.top,width:d,height:v}}},resize:function(t,n){var r=e(this).data("resizable"),i=r.options,s=r.containerSize,o=r.containerOffset,u=r.size,a=r.position,f=r._aspectRatio||t.shiftKey,l={top:0,left:0},c=r.containerElement;c[0]!=document&&/static/.test(c.css("position"))&&(l=o),a.left<(r._helper?o.left:0)&&(r.size.width=r.size.width+(r._helper?r.position.left-o.left:r.position.left-l.left),f&&(r.size.height=r.size.width/r.aspectRatio),r.position.left=i.helper?o.left:0),a.top<(r._helper?o.top:0)&&(r.size.height=r.size.height+(r._helper?r.position.top-o.top:r.position.top),f&&(r.size.width=r.size.height*r.aspectRatio),r.position.top=r._helper?o.top:0),r.offset.left=r.parentData.left+r.position.left,r.offset.top=r.parentData.top+r.position.top;var h=Math.abs((r._helper?r.offset.left-l.left:r.offset.left-l.left)+r.sizeDiff.width),p=Math.abs((r._helper?r.offset.top-l.top:r.offset.top-o.top)+r.sizeDiff.height),d=r.containerElement.get(0)==r.element.parent().get(0),v=/relative|absolute/.test(r.containerElement.css("position"));d&&v&&(h-=r.parentData.left),h+r.size.width>=r.parentData.width&&(r.size.width=r.parentData.width-h,f&&(r.size.height=r.size.width/r.aspectRatio)),p+r.size.height>=r.parentData.height&&(r.size.height=r.parentData.height-p,f&&(r.size.width=r.size.height*r.aspectRatio))},stop:function(t,n){var r=e(this).data("resizable"),i=r.options,s=r.position,o=r.containerOffset,u=r.containerPosition,a=r.containerElement,f=e(r.helper),l=f.offset(),c=f.outerWidth()-r.sizeDiff.width,h=f.outerHeight()-r.sizeDiff.height;r._helper&&!i.animate&&/relative/.test(a.css("position"))&&e(this).css({left:l.left-u.left-o.left,width:c,height:h}),r._helper&&!i.animate&&/static/.test(a.css("position"))&&e(this).css({left:l.left-u.left-o.left,width:c,height:h})}}),e.ui.plugin.add("resizable","ghost",{start:function(t,n){var r=e(this).data("resizable"),i=r.options,s=r.size;r.ghost=r.originalElement.clone(),r.ghost.css({opacity:.25,display:"block",position:"relative",height:s.height,width:s.width,margin:0,left:0,top:0}).addClass("ui-resizable-ghost").addClass(typeof i.ghost=="string"?i.ghost:""),r.ghost.appendTo(r.helper)},resize:function(t,n){var r=e(this).data("resizable"),i=r.options;r.ghost&&r.ghost.css({position:"relative",height:r.size.height,width:r.size.width})},stop:function(t,n){var r=e(this).data("resizable"),i=r.options;r.ghost&&r.helper&&r.helper.get(0).removeChild(r.ghost.get(0))}}),e.ui.plugin.add("resizable","grid",{resize:function(t,n){var r=e(this).data("resizable"),i=r.options,s=r.size,o=r.originalSize,u=r.originalPosition,a=r.axis,f=i._aspectRatio||t.shiftKey;i.grid=typeof i.grid=="number"?[i.grid,i.grid]:i.grid;var l=Math.round((s.width-o.width)/(i.grid[0]||1))*(i.grid[0]||1),c=Math.round((s.height-o.height)/(i.grid[1]||1))*(i.grid[1]||1);/^(se|s|e)$/.test(a)?(r.size.width=o.width+l,r.size.height=o.height+c):/^(ne)$/.test(a)?(r.size.width=o.width+l,r.size.height=o.height+c,r.position.top=u.top-c):/^(sw)$/.test(a)?(r.size.width=o.width+l,r.size.height=o.height+c,r.position.left=u.left-l):(r.size.width=o.width+l,r.size.height=o.height+c,r.position.top=u.top-c,r.position.left=u.left-l)}});var n=function(e){return parseInt(e,10)||0},r=function(e){return!isNaN(parseInt(e,10))}})(jQuery);(function(e,t){e.widget("ui.selectable",e.ui.mouse,{version:"1.9.2",options:{appendTo:"body",autoRefresh:!0,distance:0,filter:"*",tolerance:"touch"},_create:function(){var t=this;this.element.addClass("ui-selectable"),this.dragged=!1;var n;this.refresh=function(){n=e(t.options.filter,t.element[0]),n.addClass("ui-selectee"),n.each(function(){var t=e(this),n=t.offset();e.data(this,"selectable-item",{element:this,$element:t,left:n.left,top:n.top,right:n.left+t.outerWidth(),bottom:n.top+t.outerHeight(),startselected:!1,selected:t.hasClass("ui-selected"),selecting:t.hasClass("ui-selecting"),unselecting:t.hasClass("ui-unselecting")})})},this.refresh(),this.selectees=n.addClass("ui-selectee"),this._mouseInit(),this.helper=e("<div class='ui-selectable-helper'></div>")},_destroy:function(){this.selectees.removeClass("ui-selectee").removeData("selectable-item"),this.element.removeClass("ui-selectable ui-selectable-disabled"),this._mouseDestroy()},_mouseStart:function(t){var n=this;this.opos=[t.pageX,t.pageY];if(this.options.disabled)return;var r=this.options;this.selectees=e(r.filter,this.element[0]),this._trigger("start",t),e(r.appendTo).append(this.helper),this.helper.css({left:t.clientX,top:t.clientY,width:0,height:0}),r.autoRefresh&&this.refresh(),this.selectees.filter(".ui-selected").each(function(){var r=e.data(this,"selectable-item");r.startselected=!0,!t.metaKey&&!t.ctrlKey&&(r.$element.removeClass("ui-selected"),r.selected=!1,r.$element.addClass("ui-unselecting"),r.unselecting=!0,n._trigger("unselecting",t,{unselecting:r.element}))}),e(t.target).parents().andSelf().each(function(){var r=e.data(this,"selectable-item");if(r){var i=!t.metaKey&&!t.ctrlKey||!r.$element.hasClass("ui-selected");return r.$element.removeClass(i?"ui-unselecting":"ui-selected").addClass(i?"ui-selecting":"ui-unselecting"),r.unselecting=!i,r.selecting=i,r.selected=i,i?n._trigger("selecting",t,{selecting:r.element}):n._trigger("unselecting",t,{unselecting:r.element}),!1}})},_mouseDrag:function(t){var n=this;this.dragged=!0;if(this.options.disabled)return;var r=this.options,i=this.opos[0],s=this.opos[1],o=t.pageX,u=t.pageY;if(i>o){var a=o;o=i,i=a}if(s>u){var a=u;u=s,s=a}return this.helper.css({left:i,top:s,width:o-i,height:u-s}),this.selectees.each(function(){var a=e.data(this,"selectable-item");if(!a||a.element==n.element[0])return;var f=!1;r.tolerance=="touch"?f=!(a.left>o||a.right<i||a.top>u||a.bottom<s):r.tolerance=="fit"&&(f=a.left>i&&a.right<o&&a.top>s&&a.bottom<u),f?(a.selected&&(a.$element.removeClass("ui-selected"),a.selected=!1),a.unselecting&&(a.$element.removeClass("ui-unselecting"),a.unselecting=!1),a.selecting||(a.$element.addClass("ui-selecting"),a.selecting=!0,n._trigger("selecting",t,{selecting:a.element}))):(a.selecting&&((t.metaKey||t.ctrlKey)&&a.startselected?(a.$element.removeClass("ui-selecting"),a.selecting=!1,a.$element.addClass("ui-selected"),a.selected=!0):(a.$element.removeClass("ui-selecting"),a.selecting=!1,a.startselected&&(a.$element.addClass("ui-unselecting"),a.unselecting=!0),n._trigger("unselecting",t,{unselecting:a.element}))),a.selected&&!t.metaKey&&!t.ctrlKey&&!a.startselected&&(a.$element.removeClass("ui-selected"),a.selected=!1,a.$element.addClass("ui-unselecting"),a.unselecting=!0,n._trigger("unselecting",t,{unselecting:a.element})))}),!1},_mouseStop:function(t){var n=this;this.dragged=!1;var r=this.options;return e(".ui-unselecting",this.element[0]).each(function(){var r=e.data(this,"selectable-item");r.$element.removeClass("ui-unselecting"),r.unselecting=!1,r.startselected=!1,n._trigger("unselected",t,{unselected:r.element})}),e(".ui-selecting",this.element[0]).each(function(){var r=e.data(this,"selectable-item");r.$element.removeClass("ui-selecting").addClass("ui-selected"),r.selecting=!1,r.selected=!0,r.startselected=!0,n._trigger("selected",t,{selected:r.element})}),this._trigger("stop",t),this.helper.remove(),!1}})})(jQuery);(function(e,t){e.widget("ui.sortable",e.ui.mouse,{version:"1.9.2",widgetEventPrefix:"sort",ready:!1,options:{appendTo:"parent",axis:!1,connectWith:!1,containment:!1,cursor:"auto",cursorAt:!1,dropOnEmpty:!0,forcePlaceholderSize:!1,forceHelperSize:!1,grid:!1,handle:!1,helper:"original",items:"> *",opacity:!1,placeholder:!1,revert:!1,scroll:!0,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1e3},_create:function(){var e=this.options;this.containerCache={},this.element.addClass("ui-sortable"),this.refresh(),this.floating=this.items.length?e.axis==="x"||/left|right/.test(this.items[0].item.css("float"))||/inline|table-cell/.test(this.items[0].item.css("display")):!1,this.offset=this.element.offset(),this._mouseInit(),this.ready=!0},_destroy:function(){this.element.removeClass("ui-sortable ui-sortable-disabled"),this._mouseDestroy();for(var e=this.items.length-1;e>=0;e--)this.items[e].item.removeData(this.widgetName+"-item");return this},_setOption:function(t,n){t==="disabled"?(this.options[t]=n,this.widget().toggleClass("ui-sortable-disabled",!!n)):e.Widget.prototype._setOption.apply(this,arguments)},_mouseCapture:function(t,n){var r=this;if(this.reverting)return!1;if(this.options.disabled||this.options.type=="static")return!1;this._refreshItems(t);var i=null,s=e(t.target).parents().each(function(){if(e.data(this,r.widgetName+"-item")==r)return i=e(this),!1});e.data(t.target,r.widgetName+"-item")==r&&(i=e(t.target));if(!i)return!1;if(this.options.handle&&!n){var o=!1;e(this.options.handle,i).find("*").andSelf().each(function(){this==t.target&&(o=!0)});if(!o)return!1}return this.currentItem=i,this._removeCurrentsFromItems(),!0},_mouseStart:function(t,n,r){var i=this.options;this.currentContainer=this,this.refreshPositions(),this.helper=this._createHelper(t),this._cacheHelperProportions(),this._cacheMargins(),this.scrollParent=this.helper.scrollParent(),this.offset=this.currentItem.offset(),this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left},e.extend(this.offset,{click:{left:t.pageX-this.offset.left,top:t.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()}),this.helper.css("position","absolute"),this.cssPosition=this.helper.css("position"),this.originalPosition=this._generatePosition(t),this.originalPageX=t.pageX,this.originalPageY=t.pageY,i.cursorAt&&this._adjustOffsetFromHelper(i.cursorAt),this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]},this.helper[0]!=this.currentItem[0]&&this.currentItem.hide(),this._createPlaceholder(),i.containment&&this._setContainment(),i.cursor&&(e("body").css("cursor")&&(this._storedCursor=e("body").css("cursor")),e("body").css("cursor",i.cursor)),i.opacity&&(this.helper.css("opacity")&&(this._storedOpacity=this.helper.css("opacity")),this.helper.css("opacity",i.opacity)),i.zIndex&&(this.helper.css("zIndex")&&(this._storedZIndex=this.helper.css("zIndex")),this.helper.css("zIndex",i.zIndex)),this.scrollParent[0]!=document&&this.scrollParent[0].tagName!="HTML"&&(this.overflowOffset=this.scrollParent.offset()),this._trigger("start",t,this._uiHash()),this._preserveHelperProportions||this._cacheHelperProportions();if(!r)for(var s=this.containers.length-1;s>=0;s--)this.containers[s]._trigger("activate",t,this._uiHash(this));return e.ui.ddmanager&&(e.ui.ddmanager.current=this),e.ui.ddmanager&&!i.dropBehaviour&&e.ui.ddmanager.prepareOffsets(this,t),this.dragging=!0,this.helper.addClass("ui-sortable-helper"),this._mouseDrag(t),!0},_mouseDrag:function(t){this.position=this._generatePosition(t),this.positionAbs=this._convertPositionTo("absolute"),this.lastPositionAbs||(this.lastPositionAbs=this.positionAbs);if(this.options.scroll){var n=this.options,r=!1;this.scrollParent[0]!=document&&this.scrollParent[0].tagName!="HTML"?(this.overflowOffset.top+this.scrollParent[0].offsetHeight-t.pageY<n.scrollSensitivity?this.scrollParent[0].scrollTop=r=this.scrollParent[0].scrollTop+n.scrollSpeed:t.pageY-this.overflowOffset.top<n.scrollSensitivity&&(this.scrollParent[0].scrollTop=r=this.scrollParent[0].scrollTop-n.scrollSpeed),this.overflowOffset.left+this.scrollParent[0].offsetWidth-t.pageX<n.scrollSensitivity?this.scrollParent[0].scrollLeft=r=this.scrollParent[0].scrollLeft+n.scrollSpeed:t.pageX-this.overflowOffset.left<n.scrollSensitivity&&(this.scrollParent[0].scrollLeft=r=this.scrollParent[0].scrollLeft-n.scrollSpeed)):(t.pageY-e(document).scrollTop()<n.scrollSensitivity?r=e(document).scrollTop(e(document).scrollTop()-n.scrollSpeed):e(window).height()-(t.pageY-e(document).scrollTop())<n.scrollSensitivity&&(r=e(document).scrollTop(e(document).scrollTop()+n.scrollSpeed)),t.pageX-e(document).scrollLeft()<n.scrollSensitivity?r=e(document).scrollLeft(e(document).scrollLeft()-n.scrollSpeed):e(window).width()-(t.pageX-e(document).scrollLeft())<n.scrollSensitivity&&(r=e(document).scrollLeft(e(document).scrollLeft()+n.scrollSpeed))),r!==!1&&e.ui.ddmanager&&!n.dropBehaviour&&e.ui.ddmanager.prepareOffsets(this,t)}this.positionAbs=this._convertPositionTo("absolute");if(!this.options.axis||this.options.axis!="y")this.helper[0].style.left=this.position.left+"px";if(!this.options.axis||this.options.axis!="x")this.helper[0].style.top=this.position.top+"px";for(var i=this.items.length-1;i>=0;i--){var s=this.items[i],o=s.item[0],u=this._intersectsWithPointer(s);if(!u)continue;if(s.instance!==this.currentContainer)continue;if(o!=this.currentItem[0]&&this.placeholder[u==1?"next":"prev"]()[0]!=o&&!e.contains(this.placeholder[0],o)&&(this.options.type=="semi-dynamic"?!e.contains(this.element[0],o):!0)){this.direction=u==1?"down":"up";if(this.options.tolerance!="pointer"&&!this._intersectsWithSides(s))break;this._rearrange(t,s),this._trigger("change",t,this._uiHash());break}}return this._contactContainers(t),e.ui.ddmanager&&e.ui.ddmanager.drag(this,t),this._trigger("sort",t,this._uiHash()),this.lastPositionAbs=this.positionAbs,!1},_mouseStop:function(t,n){if(!t)return;e.ui.ddmanager&&!this.options.dropBehaviour&&e.ui.ddmanager.drop(this,t);if(this.options.revert){var r=this,i=this.placeholder.offset();this.reverting=!0,e(this.helper).animate({left:i.left-this.offset.parent.left-this.margins.left+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollLeft),top:i.top-this.offset.parent.top-this.margins.top+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollTop)},parseInt(this.options.revert,10)||500,function(){r._clear(t)})}else this._clear(t,n);return!1},cancel:function(){if(this.dragging){this._mouseUp({target:null}),this.options.helper=="original"?this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper"):this.currentItem.show();for(var t=this.containers.length-1;t>=0;t--)this.containers[t]._trigger("deactivate",null,this._uiHash(this)),this.containers[t].containerCache.over&&(this.containers[t]._trigger("out",null,this._uiHash(this)),this.containers[t].containerCache.over=0)}return this.placeholder&&(this.placeholder[0].parentNode&&this.placeholder[0].parentNode.removeChild(this.placeholder[0]),this.options.helper!="original"&&this.helper&&this.helper[0].parentNode&&this.helper.remove(),e.extend(this,{helper:null,dragging:!1,reverting:!1,_noFinalSort:null}),this.domPosition.prev?e(this.domPosition.prev).after(this.currentItem):e(this.domPosition.parent).prepend(this.currentItem)),this},serialize:function(t){var n=this._getItemsAsjQuery(t&&t.connected),r=[];return t=t||{},e(n).each(function(){var n=(e(t.item||this).attr(t.attribute||"id")||"").match(t.expression||/(.+)[-=_](.+)/);n&&r.push((t.key||n[1]+"[]")+"="+(t.key&&t.expression?n[1]:n[2]))}),!r.length&&t.key&&r.push(t.key+"="),r.join("&")},toArray:function(t){var n=this._getItemsAsjQuery(t&&t.connected),r=[];return t=t||{},n.each(function(){r.push(e(t.item||this).attr(t.attribute||"id")||"")}),r},_intersectsWith:function(e){var t=this.positionAbs.left,n=t+this.helperProportions.width,r=this.positionAbs.top,i=r+this.helperProportions.height,s=e.left,o=s+e.width,u=e.top,a=u+e.height,f=this.offset.click.top,l=this.offset.click.left,c=r+f>u&&r+f<a&&t+l>s&&t+l<o;return this.options.tolerance=="pointer"||this.options.forcePointerForContainers||this.options.tolerance!="pointer"&&this.helperProportions[this.floating?"width":"height"]>e[this.floating?"width":"height"]?c:s<t+this.helperProportions.width/2&&n-this.helperProportions.width/2<o&&u<r+this.helperProportions.height/2&&i-this.helperProportions.height/2<a},_intersectsWithPointer:function(t){var n=this.options.axis==="x"||e.ui.isOverAxis(this.positionAbs.top+this.offset.click.top,t.top,t.height),r=this.options.axis==="y"||e.ui.isOverAxis(this.positionAbs.left+this.offset.click.left,t.left,t.width),i=n&&r,s=this._getDragVerticalDirection(),o=this._getDragHorizontalDirection();return i?this.floating?o&&o=="right"||s=="down"?2:1:s&&(s=="down"?2:1):!1},_intersectsWithSides:function(t){var n=e.ui.isOverAxis(this.positionAbs.top+this.offset.click.top,t.top+t.height/2,t.height),r=e.ui.isOverAxis(this.positionAbs.left+this.offset.click.left,t.left+t.width/2,t.width),i=this._getDragVerticalDirection(),s=this._getDragHorizontalDirection();return this.floating&&s?s=="right"&&r||s=="left"&&!r:i&&(i=="down"&&n||i=="up"&&!n)},_getDragVerticalDirection:function(){var e=this.positionAbs.top-this.lastPositionAbs.top;return e!=0&&(e>0?"down":"up")},_getDragHorizontalDirection:function(){var e=this.positionAbs.left-this.lastPositionAbs.left;return e!=0&&(e>0?"right":"left")},refresh:function(e){return this._refreshItems(e),this.refreshPositions(),this},_connectWith:function(){var e=this.options;return e.connectWith.constructor==String?[e.connectWith]:e.connectWith},_getItemsAsjQuery:function(t){var n=[],r=[],i=this._connectWith();if(i&&t)for(var s=i.length-1;s>=0;s--){var o=e(i[s]);for(var u=o.length-1;u>=0;u--){var a=e.data(o[u],this.widgetName);a&&a!=this&&!a.options.disabled&&r.push([e.isFunction(a.options.items)?a.options.items.call(a.element):e(a.options.items,a.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),a])}}r.push([e.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):e(this.options.items,this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),this]);for(var s=r.length-1;s>=0;s--)r[s][0].each(function(){n.push(this)});return e(n)},_removeCurrentsFromItems:function(){var t=this.currentItem.find(":data("+this.widgetName+"-item)");this.items=e.grep(this.items,function(e){for(var n=0;n<t.length;n++)if(t[n]==e.item[0])return!1;return!0})},_refreshItems:function(t){this.items=[],this.containers=[this];var n=this.items,r=[[e.isFunction(this.options.items)?this.options.items.call(this.element[0],t,{item:this.currentItem}):e(this.options.items,this.element),this]],i=this._connectWith();if(i&&this.ready)for(var s=i.length-1;s>=0;s--){var o=e(i[s]);for(var u=o.length-1;u>=0;u--){var a=e.data(o[u],this.widgetName);a&&a!=this&&!a.options.disabled&&(r.push([e.isFunction(a.options.items)?a.options.items.call(a.element[0],t,{item:this.currentItem}):e(a.options.items,a.element),a]),this.containers.push(a))}}for(var s=r.length-1;s>=0;s--){var f=r[s][1],l=r[s][0];for(var u=0,c=l.length;u<c;u++){var h=e(l[u]);h.data(this.widgetName+"-item",f),n.push({item:h,instance:f,width:0,height:0,left:0,top:0})}}},refreshPositions:function(t){this.offsetParent&&this.helper&&(this.offset.parent=this._getParentOffset());for(var n=this.items.length-1;n>=0;n--){var r=this.items[n];if(r.instance!=this.currentContainer&&this.currentContainer&&r.item[0]!=this.currentItem[0])continue;var i=this.options.toleranceElement?e(this.options.toleranceElement,r.item):r.item;t||(r.width=i.outerWidth(),r.height=i.outerHeight());var s=i.offset();r.left=s.left,r.top=s.top}if(this.options.custom&&this.options.custom.refreshContainers)this.options.custom.refreshContainers.call(this);else for(var n=this.containers.length-1;n>=0;n--){var s=this.containers[n].element.offset();this.containers[n].containerCache.left=s.left,this.containers[n].containerCache.top=s.top,this.containers[n].containerCache.width=this.containers[n].element.outerWidth(),this.containers[n].containerCache.height=this.containers[n].element.outerHeight()}return this},_createPlaceholder:function(t){t=t||this;var n=t.options;if(!n.placeholder||n.placeholder.constructor==String){var r=n.placeholder;n.placeholder={element:function(){var n=e(document.createElement(t.currentItem[0].nodeName)).addClass(r||t.currentItem[0].className+" ui-sortable-placeholder").removeClass("ui-sortable-helper")[0];return r||(n.style.visibility="hidden"),n},update:function(e,i){if(r&&!n.forcePlaceholderSize)return;i.height()||i.height(t.currentItem.innerHeight()-parseInt(t.currentItem.css("paddingTop")||0,10)-parseInt(t.currentItem.css("paddingBottom")||0,10)),i.width()||i.width(t.currentItem.innerWidth()-parseInt(t.currentItem.css("paddingLeft")||0,10)-parseInt(t.currentItem.css("paddingRight")||0,10))}}}t.placeholder=e(n.placeholder.element.call(t.element,t.currentItem)),t.currentItem.after(t.placeholder),n.placeholder.update(t,t.placeholder)},_contactContainers:function(t){var n=null,r=null;for(var i=this.containers.length-1;i>=0;i--){if(e.contains(this.currentItem[0],this.containers[i].element[0]))continue;if(this._intersectsWith(this.containers[i].containerCache)){if(n&&e.contains(this.containers[i].element[0],n.element[0]))continue;n=this.containers[i],r=i}else this.containers[i].containerCache.over&&(this.containers[i]._trigger("out",t,this._uiHash(this)),this.containers[i].containerCache.over=0)}if(!n)return;if(this.containers.length===1)this.containers[r]._trigger("over",t,this._uiHash(this)),this.containers[r].containerCache.over=1;else{var s=1e4,o=null,u=this.containers[r].floating?"left":"top",a=this.containers[r].floating?"width":"height",f=this.positionAbs[u]+this.offset.click[u];for(var l=this.items.length-1;l>=0;l--){if(!e.contains(this.containers[r].element[0],this.items[l].item[0]))continue;if(this.items[l].item[0]==this.currentItem[0])continue;var c=this.items[l].item.offset()[u],h=!1;Math.abs(c-f)>Math.abs(c+this.items[l][a]-f)&&(h=!0,c+=this.items[l][a]),Math.abs(c-f)<s&&(s=Math.abs(c-f),o=this.items[l],this.direction=h?"up":"down")}if(!o&&!this.options.dropOnEmpty)return;this.currentContainer=this.containers[r],o?this._rearrange(t,o,null,!0):this._rearrange(t,null,this.containers[r].element,!0),this._trigger("change",t,this._uiHash()),this.containers[r]._trigger("change",t,this._uiHash(this)),this.options.placeholder.update(this.currentContainer,this.placeholder),this.containers[r]._trigger("over",t,this._uiHash(this)),this.containers[r].containerCache.over=1}},_createHelper:function(t){var n=this.options,r=e.isFunction(n.helper)?e(n.helper.apply(this.element[0],[t,this.currentItem])):n.helper=="clone"?this.currentItem.clone():this.currentItem;return r.parents("body").length||e(n.appendTo!="parent"?n.appendTo:this.currentItem[0].parentNode)[0].appendChild(r[0]),r[0]==this.currentItem[0]&&(this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")}),(r[0].style.width==""||n.forceHelperSize)&&r.width(this.currentItem.width()),(r[0].style.height==""||n.forceHelperSize)&&r.height(this.currentItem.height()),r},_adjustOffsetFromHelper:function(t){typeof t=="string"&&(t=t.split(" ")),e.isArray(t)&&(t={left:+t[0],top:+t[1]||0}),"left"in t&&(this.offset.click.left=t.left+this.margins.left),"right"in t&&(this.offset.click.left=this.helperProportions.width-t.right+this.margins.left),"top"in t&&(this.offset.click.top=t.top+this.margins.top),"bottom"in t&&(this.offset.click.top=this.helperProportions.height-t.bottom+this.margins.top)},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var t=this.offsetParent.offset();this.cssPosition=="absolute"&&this.scrollParent[0]!=document&&e.contains(this.scrollParent[0],this.offsetParent[0])&&(t.left+=this.scrollParent.scrollLeft(),t.top+=this.scrollParent.scrollTop());if(this.offsetParent[0]==document.body||this.offsetParent[0].tagName&&this.offsetParent[0].tagName.toLowerCase()=="html"&&e.ui.ie)t={top:0,left:0};return{top:t.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:t.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if(this.cssPosition=="relative"){var e=this.currentItem.position();return{top:e.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:e.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.currentItem.css("marginLeft"),10)||0,top:parseInt(this.currentItem.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var t=this.options;t.containment=="parent"&&(t.containment=this.helper[0].parentNode);if(t.containment=="document"||t.containment=="window")this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,e(t.containment=="document"?document:window).width()-this.helperProportions.width-this.margins.left,(e(t.containment=="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top];if(!/^(document|window|parent)$/.test(t.containment)){var n=e(t.containment)[0],r=e(t.containment).offset(),i=e(n).css("overflow")!="hidden";this.containment=[r.left+(parseInt(e(n).css("borderLeftWidth"),10)||0)+(parseInt(e(n).css("paddingLeft"),10)||0)-this.margins.left,r.top+(parseInt(e(n).css("borderTopWidth"),10)||0)+(parseInt(e(n).css("paddingTop"),10)||0)-this.margins.top,r.left+(i?Math.max(n.scrollWidth,n.offsetWidth):n.offsetWidth)-(parseInt(e(n).css("borderLeftWidth"),10)||0)-(parseInt(e(n).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,r.top+(i?Math.max(n.scrollHeight,n.offsetHeight):n.offsetHeight)-(parseInt(e(n).css("borderTopWidth"),10)||0)-(parseInt(e(n).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top]}},_convertPositionTo:function(t,n){n||(n=this.position);var r=t=="absolute"?1:-1,i=this.options,s=this.cssPosition!="absolute"||this.scrollParent[0]!=document&&!!e.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,o=/(html|body)/i.test(s[0].tagName);return{top:n.top+this.offset.relative.top*r+this.offset.parent.top*r-(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():o?0:s.scrollTop())*r,left:n.left+this.offset.relative.left*r+this.offset.parent.left*r-(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():o?0:s.scrollLeft())*r}},_generatePosition:function(t){var n=this.options,r=this.cssPosition!="absolute"||this.scrollParent[0]!=document&&!!e.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,i=/(html|body)/i.test(r[0].tagName);this.cssPosition=="relative"&&(this.scrollParent[0]==document||this.scrollParent[0]==this.offsetParent[0])&&(this.offset.relative=this._getRelativeOffset());var s=t.pageX,o=t.pageY;if(this.originalPosition){this.containment&&(t.pageX-this.offset.click.left<this.containment[0]&&(s=this.containment[0]+this.offset.click.left),t.pageY-this.offset.click.top<this.containment[1]&&(o=this.containment[1]+this.offset.click.top),t.pageX-this.offset.click.left>this.containment[2]&&(s=this.containment[2]+this.offset.click.left),t.pageY-this.offset.click.top>this.containment[3]&&(o=this.containment[3]+this.offset.click.top));if(n.grid){var u=this.originalPageY+Math.round((o-this.originalPageY)/n.grid[1])*n.grid[1];o=this.containment?u-this.offset.click.top<this.containment[1]||u-this.offset.click.top>this.containment[3]?u-this.offset.click.top<this.containment[1]?u+n.grid[1]:u-n.grid[1]:u:u;var a=this.originalPageX+Math.round((s-this.originalPageX)/n.grid[0])*n.grid[0];s=this.containment?a-this.offset.click.left<this.containment[0]||a-this.offset.click.left>this.containment[2]?a-this.offset.click.left<this.containment[0]?a+n.grid[0]:a-n.grid[0]:a:a}}return{top:o-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():i?0:r.scrollTop()),left:s-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():i?0:r.scrollLeft())}},_rearrange:function(e,t,n,r){n?n[0].appendChild(this.placeholder[0]):t.item[0].parentNode.insertBefore(this.placeholder[0],this.direction=="down"?t.item[0]:t.item[0].nextSibling),this.counter=this.counter?++this.counter:1;var i=this.counter;this._delay(function(){i==this.counter&&this.refreshPositions(!r)})},_clear:function(t,n){this.reverting=!1;var r=[];!this._noFinalSort&&this.currentItem.parent().length&&this.placeholder.before(this.currentItem),this._noFinalSort=null;if(this.helper[0]==this.currentItem[0]){for(var i in this._storedCSS)if(this._storedCSS[i]=="auto"||this._storedCSS[i]=="static")this._storedCSS[i]="";this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper")}else this.currentItem.show();this.fromOutside&&!n&&r.push(function(e){this._trigger("receive",e,this._uiHash(this.fromOutside))}),(this.fromOutside||this.domPosition.prev!=this.currentItem.prev().not(".ui-sortable-helper")[0]||this.domPosition.parent!=this.currentItem.parent()[0])&&!n&&r.push(function(e){this._trigger("update",e,this._uiHash())}),this!==this.currentContainer&&(n||(r.push(function(e){this._trigger("remove",e,this._uiHash())}),r.push(function(e){return function(t){e._trigger("receive",t,this._uiHash(this))}}.call(this,this.currentContainer)),r.push(function(e){return function(t){e._trigger("update",t,this._uiHash(this))}}.call(this,this.currentContainer))));for(var i=this.containers.length-1;i>=0;i--)n||r.push(function(e){return function(t){e._trigger("deactivate",t,this._uiHash(this))}}.call(this,this.containers[i])),this.containers[i].containerCache.over&&(r.push(function(e){return function(t){e._trigger("out",t,this._uiHash(this))}}.call(this,this.containers[i])),this.containers[i].containerCache.over=0);this._storedCursor&&e("body").css("cursor",this._storedCursor),this._storedOpacity&&this.helper.css("opacity",this._storedOpacity),this._storedZIndex&&this.helper.css("zIndex",this._storedZIndex=="auto"?"":this._storedZIndex),this.dragging=!1;if(this.cancelHelperRemoval){if(!n){this._trigger("beforeStop",t,this._uiHash());for(var i=0;i<r.length;i++)r[i].call(this,t);this._trigger("stop",t,this._uiHash())}return this.fromOutside=!1,!1}n||this._trigger("beforeStop",t,this._uiHash()),this.placeholder[0].parentNode.removeChild(this.placeholder[0]),this.helper[0]!=this.currentItem[0]&&this.helper.remove(),this.helper=null;if(!n){for(var i=0;i<r.length;i++)r[i].call(this,t);this._trigger("stop",t,this._uiHash())}return this.fromOutside=!1,!0},_trigger:function(){e.Widget.prototype._trigger.apply(this,arguments)===!1&&this.cancel()},_uiHash:function(t){var n=t||this;return{helper:n.helper,placeholder:n.placeholder||e([]),position:n.position,originalPosition:n.originalPosition,offset:n.positionAbs,item:n.currentItem,sender:t?t.element:null}}})})(jQuery);(function(e,t){var n=0,r={},i={};r.height=r.paddingTop=r.paddingBottom=r.borderTopWidth=r.borderBottomWidth="hide",i.height=i.paddingTop=i.paddingBottom=i.borderTopWidth=i.borderBottomWidth="show",e.widget("ui.accordion",{version:"1.9.2",options:{active:0,animate:{},collapsible:!1,event:"click",header:"> li > :first-child,> :not(li):even",heightStyle:"auto",icons:{activeHeader:"ui-icon-triangle-1-s",header:"ui-icon-triangle-1-e"},activate:null,beforeActivate:null},_create:function(){var t=this.accordionId="ui-accordion-"+(this.element.attr("id")||++n),r=this.options;this.prevShow=this.prevHide=e(),this.element.addClass("ui-accordion ui-widget ui-helper-reset"),this.headers=this.element.find(r.header).addClass("ui-accordion-header ui-helper-reset ui-state-default ui-corner-all"),this._hoverable(this.headers),this._focusable(this.headers),this.headers.next().addClass("ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom").hide(),!r.collapsible&&(r.active===!1||r.active==null)&&(r.active=0),r.active<0&&(r.active+=this.headers.length),this.active=this._findActive(r.active).addClass("ui-accordion-header-active ui-state-active").toggleClass("ui-corner-all ui-corner-top"),this.active.next().addClass("ui-accordion-content-active").show(),this._createIcons(),this.refresh(),this.element.attr("role","tablist"),this.headers.attr("role","tab").each(function(n){var r=e(this),i=r.attr("id"),s=r.next(),o=s.attr("id");i||(i=t+"-header-"+n,r.attr("id",i)),o||(o=t+"-panel-"+n,s.attr("id",o)),r.attr("aria-controls",o),s.attr("aria-labelledby",i)}).next().attr("role","tabpanel"),this.headers.not(this.active).attr({"aria-selected":"false",tabIndex:-1}).next().attr({"aria-expanded":"false","aria-hidden":"true"}).hide(),this.active.length?this.active.attr({"aria-selected":"true",tabIndex:0}).next().attr({"aria-expanded":"true","aria-hidden":"false"}):this.headers.eq(0).attr("tabIndex",0),this._on(this.headers,{keydown:"_keydown"}),this._on(this.headers.next(),{keydown:"_panelKeyDown"}),this._setupEvents(r.event)},_getCreateEventData:function(){return{header:this.active,content:this.active.length?this.active.next():e()}},_createIcons:function(){var t=this.options.icons;t&&(e("<span>").addClass("ui-accordion-header-icon ui-icon "+t.header).prependTo(this.headers),this.active.children(".ui-accordion-header-icon").removeClass(t.header).addClass(t.activeHeader),this.headers.addClass("ui-accordion-icons"))},_destroyIcons:function(){this.headers.removeClass("ui-accordion-icons").children(".ui-accordion-header-icon").remove()},_destroy:function(){var e;this.element.removeClass("ui-accordion ui-widget ui-helper-reset").removeAttr("role"),this.headers.removeClass("ui-accordion-header ui-accordion-header-active ui-helper-reset ui-state-default ui-corner-all ui-state-active ui-state-disabled ui-corner-top").removeAttr("role").removeAttr("aria-selected").removeAttr("aria-controls").removeAttr("tabIndex").each(function(){/^ui-accordion/.test(this.id)&&this.removeAttribute("id")}),this._destroyIcons(),e=this.headers.next().css("display","").removeAttr("role").removeAttr("aria-expanded").removeAttr("aria-hidden").removeAttr("aria-labelledby").removeClass("ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content ui-accordion-content-active ui-state-disabled").each(function(){/^ui-accordion/.test(this.id)&&this.removeAttribute("id")}),this.options.heightStyle!=="content"&&e.css("height","")},_setOption:function(e,t){if(e==="active"){this._activate(t);return}e==="event"&&(this.options.event&&this._off(this.headers,this.options.event),this._setupEvents(t)),this._super(e,t),e==="collapsible"&&!t&&this.options.active===!1&&this._activate(0),e==="icons"&&(this._destroyIcons(),t&&this._createIcons()),e==="disabled"&&this.headers.add(this.headers.next()).toggleClass("ui-state-disabled",!!t)},_keydown:function(t){if(t.altKey||t.ctrlKey)return;var n=e.ui.keyCode,r=this.headers.length,i=this.headers.index(t.target),s=!1;switch(t.keyCode){case n.RIGHT:case n.DOWN:s=this.headers[(i+1)%r];break;case n.LEFT:case n.UP:s=this.headers[(i-1+r)%r];break;case n.SPACE:case n.ENTER:this._eventHandler(t);break;case n.HOME:s=this.headers[0];break;case n.END:s=this.headers[r-1]}s&&(e(t.target).attr("tabIndex",-1),e(s).attr("tabIndex",0),s.focus(),t.preventDefault())},_panelKeyDown:function(t){t.keyCode===e.ui.keyCode.UP&&t.ctrlKey&&e(t.currentTarget).prev().focus()},refresh:function(){var t,n,r=this.options.heightStyle,i=this.element.parent();r==="fill"?(e.support.minHeight||(n=i.css("overflow"),i.css("overflow","hidden")),t=i.height(),this.element.siblings(":visible").each(function(){var n=e(this),r=n.css("position");if(r==="absolute"||r==="fixed")return;t-=n.outerHeight(!0)}),n&&i.css("overflow",n),this.headers.each(function(){t-=e(this).outerHeight(!0)}),this.headers.next().each(function(){e(this).height(Math.max(0,t-e(this).innerHeight()+e(this).height()))}).css("overflow","auto")):r==="auto"&&(t=0,this.headers.next().each(function(){t=Math.max(t,e(this).css("height","").height())}).height(t))},_activate:function(t){var n=this._findActive(t)[0];if(n===this.active[0])return;n=n||this.active[0],this._eventHandler({target:n,currentTarget:n,preventDefault:e.noop})},_findActive:function(t){return typeof t=="number"?this.headers.eq(t):e()},_setupEvents:function(t){var n={};if(!t)return;e.each(t.split(" "),function(e,t){n[t]="_eventHandler"}),this._on(this.headers,n)},_eventHandler:function(t){var n=this.options,r=this.active,i=e(t.currentTarget),s=i[0]===r[0],o=s&&n.collapsible,u=o?e():i.next(),a=r.next(),f={oldHeader:r,oldPanel:a,newHeader:o?e():i,newPanel:u};t.preventDefault();if(s&&!n.collapsible||this._trigger("beforeActivate",t,f)===!1)return;n.active=o?!1:this.headers.index(i),this.active=s?e():i,this._toggle(f),r.removeClass("ui-accordion-header-active ui-state-active"),n.icons&&r.children(".ui-accordion-header-icon").removeClass(n.icons.activeHeader).addClass(n.icons.header),s||(i.removeClass("ui-corner-all").addClass("ui-accordion-header-active ui-state-active ui-corner-top"),n.icons&&i.children(".ui-accordion-header-icon").removeClass(n.icons.header).addClass(n.icons.activeHeader),i.next().addClass("ui-accordion-content-active"))},_toggle:function(t){var n=t.newPanel,r=this.prevShow.length?this.prevShow:t.oldPanel;this.prevShow.add(this.prevHide).stop(!0,!0),this.prevShow=n,this.prevHide=r,this.options.animate?this._animate(n,r,t):(r.hide(),n.show(),this._toggleComplete(t)),r.attr({"aria-expanded":"false","aria-hidden":"true"}),r.prev().attr("aria-selected","false"),n.length&&r.length?r.prev().attr("tabIndex",-1):n.length&&this.headers.filter(function(){return e(this).attr("tabIndex")===0}).attr("tabIndex",-1),n.attr({"aria-expanded":"true","aria-hidden":"false"}).prev().attr({"aria-selected":"true",tabIndex:0})},_animate:function(e,t,n){var s,o,u,a=this,f=0,l=e.length&&(!t.length||e.index()<t.index()),c=this.options.animate||{},h=l&&c.down||c,p=function(){a._toggleComplete(n)};typeof h=="number"&&(u=h),typeof h=="string"&&(o=h),o=o||h.easing||c.easing,u=u||h.duration||c.duration;if(!t.length)return e.animate(i,u,o,p);if(!e.length)return t.animate(r,u,o,p);s=e.show().outerHeight(),t.animate(r,{duration:u,easing:o,step:function(e,t){t.now=Math.round(e)}}),e.hide().animate(i,{duration:u,easing:o,complete:p,step:function(e,n){n.now=Math.round(e),n.prop!=="height"?f+=n.now:a.options.heightStyle!=="content"&&(n.now=Math.round(s-t.outerHeight()-f),f=0)}})},_toggleComplete:function(e){var t=e.oldPanel;t.removeClass("ui-accordion-content-active").prev().removeClass("ui-corner-top").addClass("ui-corner-all"),t.length&&(t.parent()[0].className=t.parent()[0].className),this._trigger("activate",null,e)}}),e.uiBackCompat!==!1&&(function(e,t){e.extend(t.options,{navigation:!1,navigationFilter:function(){return this.href.toLowerCase()===location.href.toLowerCase()}});var n=t._create;t._create=function(){if(this.options.navigation){var t=this,r=this.element.find(this.options.header),i=r.next(),s=r.add(i).find("a").filter(this.options.navigationFilter)[0];s&&r.add(i).each(function(n){if(e.contains(this,s))return t.options.active=Math.floor(n/2),!1})}n.call(this)}}(jQuery,jQuery.ui.accordion.prototype),function(e,t){e.extend(t.options,{heightStyle:null,autoHeight:!0,clearStyle:!1,fillSpace:!1});var n=t._create,r=t._setOption;e.extend(t,{_create:function(){this.options.heightStyle=this.options.heightStyle||this._mergeHeightStyle(),n.call(this)},_setOption:function(e){if(e==="autoHeight"||e==="clearStyle"||e==="fillSpace")this.options.heightStyle=this._mergeHeightStyle();r.apply(this,arguments)},_mergeHeightStyle:function(){var e=this.options;if(e.fillSpace)return"fill";if(e.clearStyle)return"content";if(e.autoHeight)return"auto"}})}(jQuery,jQuery.ui.accordion.prototype),function(e,t){e.extend(t.options.icons,{activeHeader:null,headerSelected:"ui-icon-triangle-1-s"});var n=t._createIcons;t._createIcons=function(){this.options.icons&&(this.options.icons.activeHeader=this.options.icons.activeHeader||this.options.icons.headerSelected),n.call(this)}}(jQuery,jQuery.ui.accordion.prototype),function(e,t){t.activate=t._activate;var n=t._findActive;t._findActive=function(e){return e===-1&&(e=!1),e&&typeof e!="number"&&(e=this.headers.index(this.headers.filter(e)),e===-1&&(e=!1)),n.call(this,e)}}(jQuery,jQuery.ui.accordion.prototype),jQuery.ui.accordion.prototype.resize=jQuery.ui.accordion.prototype.refresh,function(e,t){e.extend(t.options,{change:null,changestart:null});var n=t._trigger;t._trigger=function(e,t,r){var i=n.apply(this,arguments);return i?(e==="beforeActivate"?i=n.call(this,"changestart",t,{oldHeader:r.oldHeader,oldContent:r.oldPanel,newHeader:r.newHeader,newContent:r.newPanel}):e==="activate"&&(i=n.call(this,"change",t,{oldHeader:r.oldHeader,oldContent:r.oldPanel,newHeader:r.newHeader,newContent:r.newPanel})),i):!1}}(jQuery,jQuery.ui.accordion.prototype),function(e,t){e.extend(t.options,{animate:null,animated:"slide"});var n=t._create;t._create=function(){var e=this.options;e.animate===null&&(e.animated?e.animated==="slide"?e.animate=300:e.animated==="bounceslide"?e.animate={duration:200,down:{easing:"easeOutBounce",duration:1e3}}:e.animate=e.animated:e.animate=!1),n.call(this)}}(jQuery,jQuery.ui.accordion.prototype))})(jQuery);(function(e,t){var n=0;e.widget("ui.autocomplete",{version:"1.9.2",defaultElement:"<input>",options:{appendTo:"body",autoFocus:!1,delay:300,minLength:1,position:{my:"left top",at:"left bottom",collision:"none"},source:null,change:null,close:null,focus:null,open:null,response:null,search:null,select:null},pending:0,_create:function(){var t,n,r;this.isMultiLine=this._isMultiLine(),this.valueMethod=this.element[this.element.is("input,textarea")?"val":"text"],this.isNewMenu=!0,this.element.addClass("ui-autocomplete-input").attr("autocomplete","off"),this._on(this.element,{keydown:function(i){if(this.element.prop("readOnly")){t=!0,r=!0,n=!0;return}t=!1,r=!1,n=!1;var s=e.ui.keyCode;switch(i.keyCode){case s.PAGE_UP:t=!0,this._move("previousPage",i);break;case s.PAGE_DOWN:t=!0,this._move("nextPage",i);break;case s.UP:t=!0,this._keyEvent("previous",i);break;case s.DOWN:t=!0,this._keyEvent("next",i);break;case s.ENTER:case s.NUMPAD_ENTER:this.menu.active&&(t=!0,i.preventDefault(),this.menu.select(i));break;case s.TAB:this.menu.active&&this.menu.select(i);break;case s.ESCAPE:this.menu.element.is(":visible")&&(this._value(this.term),this.close(i),i.preventDefault());break;default:n=!0,this._searchTimeout(i)}},keypress:function(r){if(t){t=!1,r.preventDefault();return}if(n)return;var i=e.ui.keyCode;switch(r.keyCode){case i.PAGE_UP:this._move("previousPage",r);break;case i.PAGE_DOWN:this._move("nextPage",r);break;case i.UP:this._keyEvent("previous",r);break;case i.DOWN:this._keyEvent("next",r)}},input:function(e){if(r){r=!1,e.preventDefault();return}this._searchTimeout(e)},focus:function(){this.selectedItem=null,this.previous=this._value()},blur:function(e){if(this.cancelBlur){delete this.cancelBlur;return}clearTimeout(this.searching),this.close(e),this._change(e)}}),this._initSource(),this.menu=e("<ul>").addClass("ui-autocomplete").appendTo(this.document.find(this.options.appendTo||"body")[0]).menu({input:e(),role:null}).zIndex(this.element.zIndex()+1).hide().data("menu"),this._on(this.menu.element,{mousedown:function(t){t.preventDefault(),this.cancelBlur=!0,this._delay(function(){delete this.cancelBlur});var n=this.menu.element[0];e(t.target).closest(".ui-menu-item").length||this._delay(function(){var t=this;this.document.one("mousedown",function(r){r.target!==t.element[0]&&r.target!==n&&!e.contains(n,r.target)&&t.close()})})},menufocus:function(t,n){if(this.isNewMenu){this.isNewMenu=!1;if(t.originalEvent&&/^mouse/.test(t.originalEvent.type)){this.menu.blur(),this.document.one("mousemove",function(){e(t.target).trigger(t.originalEvent)});return}}var r=n.item.data("ui-autocomplete-item")||n.item.data("item.autocomplete");!1!==this._trigger("focus",t,{item:r})?t.originalEvent&&/^key/.test(t.originalEvent.type)&&this._value(r.value):this.liveRegion.text(r.value)},menuselect:function(e,t){var n=t.item.data("ui-autocomplete-item")||t.item.data("item.autocomplete"),r=this.previous;this.element[0]!==this.document[0].activeElement&&(this.element.focus(),this.previous=r,this._delay(function(){this.previous=r,this.selectedItem=n})),!1!==this._trigger("select",e,{item:n})&&this._value(n.value),this.term=this._value(),this.close(e),this.selectedItem=n}}),this.liveRegion=e("<span>",{role:"status","aria-live":"polite"}).addClass("ui-helper-hidden-accessible").insertAfter(this.element),e.fn.bgiframe&&this.menu.element.bgiframe(),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_destroy:function(){clearTimeout(this.searching),this.element.removeClass("ui-autocomplete-input").removeAttr("autocomplete"),this.menu.element.remove(),this.liveRegion.remove()},_setOption:function(e,t){this._super(e,t),e==="source"&&this._initSource(),e==="appendTo"&&this.menu.element.appendTo(this.document.find(t||"body")[0]),e==="disabled"&&t&&this.xhr&&this.xhr.abort()},_isMultiLine:function(){return this.element.is("textarea")?!0:this.element.is("input")?!1:this.element.prop("isContentEditable")},_initSource:function(){var t,n,r=this;e.isArray(this.options.source)?(t=this.options.source,this.source=function(n,r){r(e.ui.autocomplete.filter(t,n.term))}):typeof this.options.source=="string"?(n=this.options.source,this.source=function(t,i){r.xhr&&r.xhr.abort(),r.xhr=e.ajax({url:n,data:t,dataType:"json",success:function(e){i(e)},error:function(){i([])}})}):this.source=this.options.source},_searchTimeout:function(e){clearTimeout(this.searching),this.searching=this._delay(function(){this.term!==this._value()&&(this.selectedItem=null,this.search(null,e))},this.options.delay)},search:function(e,t){e=e!=null?e:this._value(),this.term=this._value();if(e.length<this.options.minLength)return this.close(t);if(this._trigger("search",t)===!1)return;return this._search(e)},_search:function(e){this.pending++,this.element.addClass("ui-autocomplete-loading"),this.cancelSearch=!1,this.source({term:e},this._response())},_response:function(){var e=this,t=++n;return function(r){t===n&&e.__response(r),e.pending--,e.pending||e.element.removeClass("ui-autocomplete-loading")}},__response:function(e){e&&(e=this._normalize(e)),this._trigger("response",null,{content:e}),!this.options.disabled&&e&&e.length&&!this.cancelSearch?(this._suggest(e),this._trigger("open")):this._close()},close:function(e){this.cancelSearch=!0,this._close(e)},_close:function(e){this.menu.element.is(":visible")&&(this.menu.element.hide(),this.menu.blur(),this.isNewMenu=!0,this._trigger("close",e))},_change:function(e){this.previous!==this._value()&&this._trigger("change",e,{item:this.selectedItem})},_normalize:function(t){return t.length&&t[0].label&&t[0].value?t:e.map(t,function(t){return typeof t=="string"?{label:t,value:t}:e.extend({label:t.label||t.value,value:t.value||t.label},t)})},_suggest:function(t){var n=this.menu.element.empty().zIndex(this.element.zIndex()+1);this._renderMenu(n,t),this.menu.refresh(),n.show(),this._resizeMenu(),n.position(e.extend({of:this.element},this.options.position)),this.options.autoFocus&&this.menu.next()},_resizeMenu:function(){var e=this.menu.element;e.outerWidth(Math.max(e.width("").outerWidth()+1,this.element.outerWidth()))},_renderMenu:function(t,n){var r=this;e.each(n,function(e,n){r._renderItemData(t,n)})},_renderItemData:function(e,t){return this._renderItem(e,t).data("ui-autocomplete-item",t)},_renderItem:function(t,n){return e("<li>").append(e("<a>").text(n.label)).appendTo(t)},_move:function(e,t){if(!this.menu.element.is(":visible")){this.search(null,t);return}if(this.menu.isFirstItem()&&/^previous/.test(e)||this.menu.isLastItem()&&/^next/.test(e)){this._value(this.term),this.menu.blur();return}this.menu[e](t)},widget:function(){return this.menu.element},_value:function(){return this.valueMethod.apply(this.element,arguments)},_keyEvent:function(e,t){if(!this.isMultiLine||this.menu.element.is(":visible"))this._move(e,t),t.preventDefault()}}),e.extend(e.ui.autocomplete,{escapeRegex:function(e){return e.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")},filter:function(t,n){var r=new RegExp(e.ui.autocomplete.escapeRegex(n),"i");return e.grep(t,function(e){return r.test(e.label||e.value||e)})}}),e.widget("ui.autocomplete",e.ui.autocomplete,{options:{messages:{noResults:"No search results.",results:function(e){return e+(e>1?" results are":" result is")+" available, use up and down arrow keys to navigate."}}},__response:function(e){var t;this._superApply(arguments);if(this.options.disabled||this.cancelSearch)return;e&&e.length?t=this.options.messages.results(e.length):t=this.options.messages.noResults,this.liveRegion.text(t)}})})(jQuery);(function(e,t){var n,r,i,s,o="ui-button ui-widget ui-state-default ui-corner-all",u="ui-state-hover ui-state-active ",a="ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only",f=function(){var t=e(this).find(":ui-button");setTimeout(function(){t.button("refresh")},1)},l=function(t){var n=t.name,r=t.form,i=e([]);return n&&(r?i=e(r).find("[name='"+n+"']"):i=e("[name='"+n+"']",t.ownerDocument).filter(function(){return!this.form})),i};e.widget("ui.button",{version:"1.9.2",defaultElement:"<button>",options:{disabled:null,text:!0,label:null,icons:{primary:null,secondary:null}},_create:function(){this.element.closest("form").unbind("reset"+this.eventNamespace).bind("reset"+this.eventNamespace,f),typeof this.options.disabled!="boolean"?this.options.disabled=!!this.element.prop("disabled"):this.element.prop("disabled",this.options.disabled),this._determineButtonType(),this.hasTitle=!!this.buttonElement.attr("title");var t=this,u=this.options,a=this.type==="checkbox"||this.type==="radio",c=a?"":"ui-state-active",h="ui-state-focus";u.label===null&&(u.label=this.type==="input"?this.buttonElement.val():this.buttonElement.html()),this._hoverable(this.buttonElement),this.buttonElement.addClass(o).attr("role","button").bind("mouseenter"+this.eventNamespace,function(){if(u.disabled)return;this===n&&e(this).addClass("ui-state-active")}).bind("mouseleave"+this.eventNamespace,function(){if(u.disabled)return;e(this).removeClass(c)}).bind("click"+this.eventNamespace,function(e){u.disabled&&(e.preventDefault(),e.stopImmediatePropagation())}),this.element.bind("focus"+this.eventNamespace,function(){t.buttonElement.addClass(h)}).bind("blur"+this.eventNamespace,function(){t.buttonElement.removeClass(h)}),a&&(this.element.bind("change"+this.eventNamespace,function(){if(s)return;t.refresh()}),this.buttonElement.bind("mousedown"+this.eventNamespace,function(e){if(u.disabled)return;s=!1,r=e.pageX,i=e.pageY}).bind("mouseup"+this.eventNamespace,function(e){if(u.disabled)return;if(r!==e.pageX||i!==e.pageY)s=!0})),this.type==="checkbox"?this.buttonElement.bind("click"+this.eventNamespace,function(){if(u.disabled||s)return!1;e(this).toggleClass("ui-state-active"),t.buttonElement.attr("aria-pressed",t.element[0].checked)}):this.type==="radio"?this.buttonElement.bind("click"+this.eventNamespace,function(){if(u.disabled||s)return!1;e(this).addClass("ui-state-active"),t.buttonElement.attr("aria-pressed","true");var n=t.element[0];l(n).not(n).map(function(){return e(this).button("widget")[0]}).removeClass("ui-state-active").attr("aria-pressed","false")}):(this.buttonElement.bind("mousedown"+this.eventNamespace,function(){if(u.disabled)return!1;e(this).addClass("ui-state-active"),n=this,t.document.one("mouseup",function(){n=null})}).bind("mouseup"+this.eventNamespace,function(){if(u.disabled)return!1;e(this).removeClass("ui-state-active")}).bind("keydown"+this.eventNamespace,function(t){if(u.disabled)return!1;(t.keyCode===e.ui.keyCode.SPACE||t.keyCode===e.ui.keyCode.ENTER)&&e(this).addClass("ui-state-active")}).bind("keyup"+this.eventNamespace,function(){e(this).removeClass("ui-state-active")}),this.buttonElement.is("a")&&this.buttonElement.keyup(function(t){t.keyCode===e.ui.keyCode.SPACE&&e(this).click()})),this._setOption("disabled",u.disabled),this._resetButton()},_determineButtonType:function(){var e,t,n;this.element.is("[type=checkbox]")?this.type="checkbox":this.element.is("[type=radio]")?this.type="radio":this.element.is("input")?this.type="input":this.type="button",this.type==="checkbox"||this.type==="radio"?(e=this.element.parents().last(),t="label[for='"+this.element.attr("id")+"']",this.buttonElement=e.find(t),this.buttonElement.length||(e=e.length?e.siblings():this.element.siblings(),this.buttonElement=e.filter(t),this.buttonElement.length||(this.buttonElement=e.find(t))),this.element.addClass("ui-helper-hidden-accessible"),n=this.element.is(":checked"),n&&this.buttonElement.addClass("ui-state-active"),this.buttonElement.prop("aria-pressed",n)):this.buttonElement=this.element},widget:function(){return this.buttonElement},_destroy:function(){this.element.removeClass("ui-helper-hidden-accessible"),this.buttonElement.removeClass(o+" "+u+" "+a).removeAttr("role").removeAttr("aria-pressed").html(this.buttonElement.find(".ui-button-text").html()),this.hasTitle||this.buttonElement.removeAttr("title")},_setOption:function(e,t){this._super(e,t);if(e==="disabled"){t?this.element.prop("disabled",!0):this.element.prop("disabled",!1);return}this._resetButton()},refresh:function(){var t=this.element.is("input, button")?this.element.is(":disabled"):this.element.hasClass("ui-button-disabled");t!==this.options.disabled&&this._setOption("disabled",t),this.type==="radio"?l(this.element[0]).each(function(){e(this).is(":checked")?e(this).button("widget").addClass("ui-state-active").attr("aria-pressed","true"):e(this).button("widget").removeClass("ui-state-active").attr("aria-pressed","false")}):this.type==="checkbox"&&(this.element.is(":checked")?this.buttonElement.addClass("ui-state-active").attr("aria-pressed","true"):this.buttonElement.removeClass("ui-state-active").attr("aria-pressed","false"))},_resetButton:function(){if(this.type==="input"){this.options.label&&this.element.val(this.options.label);return}var t=this.buttonElement.removeClass(a),n=e("<span></span>",this.document[0]).addClass("ui-button-text").html(this.options.label).appendTo(t.empty()).text(),r=this.options.icons,i=r.primary&&r.secondary,s=[];r.primary||r.secondary?(this.options.text&&s.push("ui-button-text-icon"+(i?"s":r.primary?"-primary":"-secondary")),r.primary&&t.prepend("<span class='ui-button-icon-primary ui-icon "+r.primary+"'></span>"),r.secondary&&t.append("<span class='ui-button-icon-secondary ui-icon "+r.secondary+"'></span>"),this.options.text||(s.push(i?"ui-button-icons-only":"ui-button-icon-only"),this.hasTitle||t.attr("title",e.trim(n)))):s.push("ui-button-text-only"),t.addClass(s.join(" "))}}),e.widget("ui.buttonset",{version:"1.9.2",options:{items:"button, input[type=button], input[type=submit], input[type=reset], input[type=checkbox], input[type=radio], a, :data(button)"},_create:function(){this.element.addClass("ui-buttonset")},_init:function(){this.refresh()},_setOption:function(e,t){e==="disabled"&&this.buttons.button("option",e,t),this._super(e,t)},refresh:function(){var t=this.element.css("direction")==="rtl";this.buttons=this.element.find(this.options.items).filter(":ui-button").button("refresh").end().not(":ui-button").button().end().map(function(){return e(this).button("widget")[0]}).removeClass("ui-corner-all ui-corner-left ui-corner-right").filter(":first").addClass(t?"ui-corner-right":"ui-corner-left").end().filter(":last").addClass(t?"ui-corner-left":"ui-corner-right").end().end()},_destroy:function(){this.element.removeClass("ui-buttonset"),this.buttons.map(function(){return e(this).button("widget")[0]}).removeClass("ui-corner-left ui-corner-right").end().button("destroy")}})})(jQuery);(function($,undefined){function Datepicker(){this.debug=!1,this._curInst=null,this._keyEvent=!1,this._disabledInputs=[],this._datepickerShowing=!1,this._inDialog=!1,this._mainDivId="ui-datepicker-div",this._inlineClass="ui-datepicker-inline",this._appendClass="ui-datepicker-append",this._triggerClass="ui-datepicker-trigger",this._dialogClass="ui-datepicker-dialog",this._disableClass="ui-datepicker-disabled",this._unselectableClass="ui-datepicker-unselectable",this._currentClass="ui-datepicker-current-day",this._dayOverClass="ui-datepicker-days-cell-over",this.regional=[],this.regional[""]={closeText:"Done",prevText:"Prev",nextText:"Next",currentText:"Today",monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayNamesMin:["Su","Mo","Tu","We","Th","Fr","Sa"],weekHeader:"Wk",dateFormat:"mm/dd/yy",firstDay:0,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""},this._defaults={showOn:"focus",showAnim:"fadeIn",showOptions:{},defaultDate:null,appendText:"",buttonText:"...",buttonImage:"",buttonImageOnly:!1,hideIfNoPrevNext:!1,navigationAsDateFormat:!1,gotoCurrent:!1,changeMonth:!1,changeYear:!1,yearRange:"c-10:c+10",showOtherMonths:!1,selectOtherMonths:!1,showWeek:!1,calculateWeek:this.iso8601Week,shortYearCutoff:"+10",minDate:null,maxDate:null,duration:"fast",beforeShowDay:null,beforeShow:null,onSelect:null,onChangeMonthYear:null,onClose:null,numberOfMonths:1,showCurrentAtPos:0,stepMonths:1,stepBigMonths:12,altField:"",altFormat:"",constrainInput:!0,showButtonPanel:!1,autoSize:!1,disabled:!1},$.extend(this._defaults,this.regional[""]),this.dpDiv=bindHover($('<div id="'+this._mainDivId+'" class="ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"></div>'))}function bindHover(e){var t="button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a";return e.delegate(t,"mouseout",function(){$(this).removeClass("ui-state-hover"),this.className.indexOf("ui-datepicker-prev")!=-1&&$(this).removeClass("ui-datepicker-prev-hover"),this.className.indexOf("ui-datepicker-next")!=-1&&$(this).removeClass("ui-datepicker-next-hover")}).delegate(t,"mouseover",function(){$.datepicker._isDisabledDatepicker(instActive.inline?e.parent()[0]:instActive.input[0])||($(this).parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover"),$(this).addClass("ui-state-hover"),this.className.indexOf("ui-datepicker-prev")!=-1&&$(this).addClass("ui-datepicker-prev-hover"),this.className.indexOf("ui-datepicker-next")!=-1&&$(this).addClass("ui-datepicker-next-hover"))})}function extendRemove(e,t){$.extend(e,t);for(var n in t)if(t[n]==null||t[n]==undefined)e[n]=t[n];return e}$.extend($.ui,{datepicker:{version:"1.9.2"}});var PROP_NAME="datepicker",dpuuid=(new Date).getTime(),instActive;$.extend(Datepicker.prototype,{markerClassName:"hasDatepicker",maxRows:4,log:function(){this.debug&&console.log.apply("",arguments)},_widgetDatepicker:function(){return this.dpDiv},setDefaults:function(e){return extendRemove(this._defaults,e||{}),this},_attachDatepicker:function(target,settings){var inlineSettings=null;for(var attrName in this._defaults){var attrValue=target.getAttribute("date:"+attrName);if(attrValue){inlineSettings=inlineSettings||{};try{inlineSettings[attrName]=eval(attrValue)}catch(err){inlineSettings[attrName]=attrValue}}}var nodeName=target.nodeName.toLowerCase(),inline=nodeName=="div"||nodeName=="span";target.id||(this.uuid+=1,target.id="dp"+this.uuid);var inst=this._newInst($(target),inline);inst.settings=$.extend({},settings||{},inlineSettings||{}),nodeName=="input"?this._connectDatepicker(target,inst):inline&&this._inlineDatepicker(target,inst)},_newInst:function(e,t){var n=e[0].id.replace(/([^A-Za-z0-9_-])/g,"\\\\$1");return{id:n,input:e,selectedDay:0,selectedMonth:0,selectedYear:0,drawMonth:0,drawYear:0,inline:t,dpDiv:t?bindHover($('<div class="'+this._inlineClass+' ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"></div>')):this.dpDiv}},_connectDatepicker:function(e,t){var n=$(e);t.append=$([]),t.trigger=$([]);if(n.hasClass(this.markerClassName))return;this._attachments(n,t),n.addClass(this.markerClassName).keydown(this._doKeyDown).keypress(this._doKeyPress).keyup(this._doKeyUp).bind("setData.datepicker",function(e,n,r){t.settings[n]=r}).bind("getData.datepicker",function(e,n){return this._get(t,n)}),this._autoSize(t),$.data(e,PROP_NAME,t),t.settings.disabled&&this._disableDatepicker(e)},_attachments:function(e,t){var n=this._get(t,"appendText"),r=this._get(t,"isRTL");t.append&&t.append.remove(),n&&(t.append=$('<span class="'+this._appendClass+'">'+n+"</span>"),e[r?"before":"after"](t.append)),e.unbind("focus",this._showDatepicker),t.trigger&&t.trigger.remove();var i=this._get(t,"showOn");(i=="focus"||i=="both")&&e.focus(this._showDatepicker);if(i=="button"||i=="both"){var s=this._get(t,"buttonText"),o=this._get(t,"buttonImage");t.trigger=$(this._get(t,"buttonImageOnly")?$("<img/>").addClass(this._triggerClass).attr({src:o,alt:s,title:s}):$('<button type="button"></button>').addClass(this._triggerClass).html(o==""?s:$("<img/>").attr({src:o,alt:s,title:s}))),e[r?"before":"after"](t.trigger),t.trigger.click(function(){return $.datepicker._datepickerShowing&&$.datepicker._lastInput==e[0]?$.datepicker._hideDatepicker():$.datepicker._datepickerShowing&&$.datepicker._lastInput!=e[0]?($.datepicker._hideDatepicker(),$.datepicker._showDatepicker(e[0])):$.datepicker._showDatepicker(e[0]),!1})}},_autoSize:function(e){if(this._get(e,"autoSize")&&!e.inline){var t=new Date(2009,11,20),n=this._get(e,"dateFormat");if(n.match(/[DM]/)){var r=function(e){var t=0,n=0;for(var r=0;r<e.length;r++)e[r].length>t&&(t=e[r].length,n=r);return n};t.setMonth(r(this._get(e,n.match(/MM/)?"monthNames":"monthNamesShort"))),t.setDate(r(this._get(e,n.match(/DD/)?"dayNames":"dayNamesShort"))+20-t.getDay())}e.input.attr("size",this._formatDate(e,t).length)}},_inlineDatepicker:function(e,t){var n=$(e);if(n.hasClass(this.markerClassName))return;n.addClass(this.markerClassName).append(t.dpDiv).bind("setData.datepicker",function(e,n,r){t.settings[n]=r}).bind("getData.datepicker",function(e,n){return this._get(t,n)}),$.data(e,PROP_NAME,t),this._setDate(t,this._getDefaultDate(t),!0),this._updateDatepicker(t),this._updateAlternate(t),t.settings.disabled&&this._disableDatepicker(e),t.dpDiv.css("display","block")},_dialogDatepicker:function(e,t,n,r,i){var s=this._dialogInst;if(!s){this.uuid+=1;var o="dp"+this.uuid;this._dialogInput=$('<input type="text" id="'+o+'" style="position: absolute; top: -100px; width: 0px;"/>'),this._dialogInput.keydown(this._doKeyDown),$("body").append(this._dialogInput),s=this._dialogInst=this._newInst(this._dialogInput,!1),s.settings={},$.data(this._dialogInput[0],PROP_NAME,s)}extendRemove(s.settings,r||{}),t=t&&t.constructor==Date?this._formatDate(s,t):t,this._dialogInput.val(t),this._pos=i?i.length?i:[i.pageX,i.pageY]:null;if(!this._pos){var u=document.documentElement.clientWidth,a=document.documentElement.clientHeight,f=document.documentElement.scrollLeft||document.body.scrollLeft,l=document.documentElement.scrollTop||document.body.scrollTop;this._pos=[u/2-100+f,a/2-150+l]}return this._dialogInput.css("left",this._pos[0]+20+"px").css("top",this._pos[1]+"px"),s.settings.onSelect=n,this._inDialog=!0,this.dpDiv.addClass(this._dialogClass),this._showDatepicker(this._dialogInput[0]),$.blockUI&&$.blockUI(this.dpDiv),$.data(this._dialogInput[0],PROP_NAME,s),this},_destroyDatepicker:function(e){var t=$(e),n=$.data(e,PROP_NAME);if(!t.hasClass(this.markerClassName))return;var r=e.nodeName.toLowerCase();$.removeData(e,PROP_NAME),r=="input"?(n.append.remove(),n.trigger.remove(),t.removeClass(this.markerClassName).unbind("focus",this._showDatepicker).unbind("keydown",this._doKeyDown).unbind("keypress",this._doKeyPress).unbind("keyup",this._doKeyUp)):(r=="div"||r=="span")&&t.removeClass(this.markerClassName).empty()},_enableDatepicker:function(e){var t=$(e),n=$.data(e,PROP_NAME);if(!t.hasClass(this.markerClassName))return;var r=e.nodeName.toLowerCase();if(r=="input")e.disabled=!1,n.trigger.filter("button").each(function(){this.disabled=!1}).end().filter("img").css({opacity:"1.0",cursor:""});else if(r=="div"||r=="span"){var i=t.children("."+this._inlineClass);i.children().removeClass("ui-state-disabled"),i.find("select.ui-datepicker-month, select.ui-datepicker-year").prop("disabled",!1)}this._disabledInputs=$.map(this._disabledInputs,function(t){return t==e?null:t})},_disableDatepicker:function(e){var t=$(e),n=$.data(e,PROP_NAME);if(!t.hasClass(this.markerClassName))return;var r=e.nodeName.toLowerCase();if(r=="input")e.disabled=!0,n.trigger.filter("button").each(function(){this.disabled=!0}).end().filter("img").css({opacity:"0.5",cursor:"default"});else if(r=="div"||r=="span"){var i=t.children("."+this._inlineClass);i.children().addClass("ui-state-disabled"),i.find("select.ui-datepicker-month, select.ui-datepicker-year").prop("disabled",!0)}this._disabledInputs=$.map(this._disabledInputs,function(t){return t==e?null:t}),this._disabledInputs[this._disabledInputs.length]=e},_isDisabledDatepicker:function(e){if(!e)return!1;for(var t=0;t<this._disabledInputs.length;t++)if(this._disabledInputs[t]==e)return!0;return!1},_getInst:function(e){try{return $.data(e,PROP_NAME)}catch(t){throw"Missing instance data for this datepicker"}},_optionDatepicker:function(e,t,n){var r=this._getInst(e);if(arguments.length==2&&typeof t=="string")return t=="defaults"?$.extend({},$.datepicker._defaults):r?t=="all"?$.extend({},r.settings):this._get(r,t):null;var i=t||{};typeof t=="string"&&(i={},i[t]=n);if(r){this._curInst==r&&this._hideDatepicker();var s=this._getDateDatepicker(e,!0),o=this._getMinMaxDate(r,"min"),u=this._getMinMaxDate(r,"max");extendRemove(r.settings,i),o!==null&&i.dateFormat!==undefined&&i.minDate===undefined&&(r.settings.minDate=this._formatDate(r,o)),u!==null&&i.dateFormat!==undefined&&i.maxDate===undefined&&(r.settings.maxDate=this._formatDate(r,u)),this._attachments($(e),r),this._autoSize(r),this._setDate(r,s),this._updateAlternate(r),this._updateDatepicker(r)}},_changeDatepicker:function(e,t,n){this._optionDatepicker(e,t,n)},_refreshDatepicker:function(e){var t=this._getInst(e);t&&this._updateDatepicker(t)},_setDateDatepicker:function(e,t){var n=this._getInst(e);n&&(this._setDate(n,t),this._updateDatepicker(n),this._updateAlternate(n))},_getDateDatepicker:function(e,t){var n=this._getInst(e);return n&&!n.inline&&this._setDateFromField(n,t),n?this._getDate(n):null},_doKeyDown:function(e){var t=$.datepicker._getInst(e.target),n=!0,r=t.dpDiv.is(".ui-datepicker-rtl");t._keyEvent=!0;if($.datepicker._datepickerShowing)switch(e.keyCode){case 9:$.datepicker._hideDatepicker(),n=!1;break;case 13:var i=$("td."+$.datepicker._dayOverClass+":not(."+$.datepicker._currentClass+")",t.dpDiv);i[0]&&$.datepicker._selectDay(e.target,t.selectedMonth,t.selectedYear,i[0]);var s=$.datepicker._get(t,"onSelect");if(s){var o=$.datepicker._formatDate(t);s.apply(t.input?t.input[0]:null,[o,t])}else $.datepicker._hideDatepicker();return!1;case 27:$.datepicker._hideDatepicker();break;case 33:$.datepicker._adjustDate(e.target,e.ctrlKey?-$.datepicker._get(t,"stepBigMonths"):-$.datepicker._get(t,"stepMonths"),"M");break;case 34:$.datepicker._adjustDate(e.target,e.ctrlKey?+$.datepicker._get(t,"stepBigMonths"):+$.datepicker._get(t,"stepMonths"),"M");break;case 35:(e.ctrlKey||e.metaKey)&&$.datepicker._clearDate(e.target),n=e.ctrlKey||e.metaKey;break;case 36:(e.ctrlKey||e.metaKey)&&$.datepicker._gotoToday(e.target),n=e.ctrlKey||e.metaKey;break;case 37:(e.ctrlKey||e.metaKey)&&$.datepicker._adjustDate(e.target,r?1:-1,"D"),n=e.ctrlKey||e.metaKey,e.originalEvent.altKey&&$.datepicker._adjustDate(e.target,e.ctrlKey?-$.datepicker._get(t,"stepBigMonths"):-$.datepicker._get(t,"stepMonths"),"M");break;case 38:(e.ctrlKey||e.metaKey)&&$.datepicker._adjustDate(e.target,-7,"D"),n=e.ctrlKey||e.metaKey;break;case 39:(e.ctrlKey||e.metaKey)&&$.datepicker._adjustDate(e.target,r?-1:1,"D"),n=e.ctrlKey||e.metaKey,e.originalEvent.altKey&&$.datepicker._adjustDate(e.target,e.ctrlKey?+$.datepicker._get(t,"stepBigMonths"):+$.datepicker._get(t,"stepMonths"),"M");break;case 40:(e.ctrlKey||e.metaKey)&&$.datepicker._adjustDate(e.target,7,"D"),n=e.ctrlKey||e.metaKey;break;default:n=!1}else e.keyCode==36&&e.ctrlKey?$.datepicker._showDatepicker(this):n=!1;n&&(e.preventDefault(),e.stopPropagation())},_doKeyPress:function(e){var t=$.datepicker._getInst(e.target);if($.datepicker._get(t,"constrainInput")){var n=$.datepicker._possibleChars($.datepicker._get(t,"dateFormat")),r=String.fromCharCode(e.charCode==undefined?e.keyCode:e.charCode);return e.ctrlKey||e.metaKey||r<" "||!n||n.indexOf(r)>-1}},_doKeyUp:function(e){var t=$.datepicker._getInst(e.target);if(t.input.val()!=t.lastVal)try{var n=$.datepicker.parseDate($.datepicker._get(t,"dateFormat"),t.input?t.input.val():null,$.datepicker._getFormatConfig(t));n&&($.datepicker._setDateFromField(t),$.datepicker._updateAlternate(t),$.datepicker._updateDatepicker(t))}catch(r){$.datepicker.log(r)}return!0},_showDatepicker:function(e){e=e.target||e,e.nodeName.toLowerCase()!="input"&&(e=$("input",e.parentNode)[0]);if($.datepicker._isDisabledDatepicker(e)||$.datepicker._lastInput==e)return;var t=$.datepicker._getInst(e);$.datepicker._curInst&&$.datepicker._curInst!=t&&($.datepicker._curInst.dpDiv.stop(!0,!0),t&&$.datepicker._datepickerShowing&&$.datepicker._hideDatepicker($.datepicker._curInst.input[0]));var n=$.datepicker._get(t,"beforeShow"),r=n?n.apply(e,[e,t]):{};if(r===!1)return;extendRemove(t.settings,r),t.lastVal=null,$.datepicker._lastInput=e,$.datepicker._setDateFromField(t),$.datepicker._inDialog&&(e.value=""),$.datepicker._pos||($.datepicker._pos=$.datepicker._findPos(e),$.datepicker._pos[1]+=e.offsetHeight);var i=!1;$(e).parents().each(function(){return i|=$(this).css("position")=="fixed",!i});var s={left:$.datepicker._pos[0],top:$.datepicker._pos[1]};$.datepicker._pos=null,t.dpDiv.empty(),t.dpDiv.css({position:"absolute",display:"block",top:"-1000px"}),$.datepicker._updateDatepicker(t),s=$.datepicker._checkOffset(t,s,i),t.dpDiv.css({position:$.datepicker._inDialog&&$.blockUI?"static":i?"fixed":"absolute",display:"none",left:s.left+"px",top:s.top+"px"});if(!t.inline){var o=$.datepicker._get(t,"showAnim"),u=$.datepicker._get(t,"duration"),a=function(){var e=t.dpDiv.find("iframe.ui-datepicker-cover");if(!!e.length){var n=$.datepicker._getBorders(t.dpDiv);e.css({left:-n[0],top:-n[1],width:t.dpDiv.outerWidth(),height:t.dpDiv.outerHeight()})}};t.dpDiv.zIndex($(e).zIndex()+1),$.datepicker._datepickerShowing=!0,$.effects&&($.effects.effect[o]||$.effects[o])?t.dpDiv.show(o,$.datepicker._get(t,"showOptions"),u,a):t.dpDiv[o||"show"](o?u:null,a),(!o||!u)&&a(),t.input.is(":visible")&&!t.input.is(":disabled")&&t.input.focus(),$.datepicker._curInst=t}},_updateDatepicker:function(e){this.maxRows=4;var t=$.datepicker._getBorders(e.dpDiv);instActive=e,e.dpDiv.empty().append(this._generateHTML(e)),this._attachHandlers(e);var n=e.dpDiv.find("iframe.ui-datepicker-cover");!n.length||n.css({left:-t[0],top:-t[1],width:e.dpDiv.outerWidth(),height:e.dpDiv.outerHeight()}),e.dpDiv.find("."+this._dayOverClass+" a").mouseover();var r=this._getNumberOfMonths(e),i=r[1],s=17;e.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width(""),i>1&&e.dpDiv.addClass("ui-datepicker-multi-"+i).css("width",s*i+"em"),e.dpDiv[(r[0]!=1||r[1]!=1?"add":"remove")+"Class"]("ui-datepicker-multi"),e.dpDiv[(this._get(e,"isRTL")?"add":"remove")+"Class"]("ui-datepicker-rtl"),e==$.datepicker._curInst&&$.datepicker._datepickerShowing&&e.input&&e.input.is(":visible")&&!e.input.is(":disabled")&&e.input[0]!=document.activeElement&&e.input.focus();if(e.yearshtml){var o=e.yearshtml;setTimeout(function(){o===e.yearshtml&&e.yearshtml&&e.dpDiv.find("select.ui-datepicker-year:first").replaceWith(e.yearshtml),o=e.yearshtml=null},0)}},_getBorders:function(e){var t=function(e){return{thin:1,medium:2,thick:3}[e]||e};return[parseFloat(t(e.css("border-left-width"))),parseFloat(t(e.css("border-top-width")))]},_checkOffset:function(e,t,n){var r=e.dpDiv.outerWidth(),i=e.dpDiv.outerHeight(),s=e.input?e.input.outerWidth():0,o=e.input?e.input.outerHeight():0,u=document.documentElement.clientWidth+(n?0:$(document).scrollLeft()),a=document.documentElement.clientHeight+(n?0:$(document).scrollTop());return t.left-=this._get(e,"isRTL")?r-s:0,t.left-=n&&t.left==e.input.offset().left?$(document).scrollLeft():0,t.top-=n&&t.top==e.input.offset().top+o?$(document).scrollTop():0,t.left-=Math.min(t.left,t.left+r>u&&u>r?Math.abs(t.left+r-u):0),t.top-=Math.min(t.top,t.top+i>a&&a>i?Math.abs(i+o):0),t},_findPos:function(e){var t=this._getInst(e),n=this._get(t,"isRTL");while(e&&(e.type=="hidden"||e.nodeType!=1||$.expr.filters.hidden(e)))e=e[n?"previousSibling":"nextSibling"];var r=$(e).offset();return[r.left,r.top]},_hideDatepicker:function(e){var t=this._curInst;if(!t||e&&t!=$.data(e,PROP_NAME))return;if(this._datepickerShowing){var n=this._get(t,"showAnim"),r=this._get(t,"duration"),i=function(){$.datepicker._tidyDialog(t)};$.effects&&($.effects.effect[n]||$.effects[n])?t.dpDiv.hide(n,$.datepicker._get(t,"showOptions"),r,i):t.dpDiv[n=="slideDown"?"slideUp":n=="fadeIn"?"fadeOut":"hide"](n?r:null,i),n||i(),this._datepickerShowing=!1;var s=this._get(t,"onClose");s&&s.apply(t.input?t.input[0]:null,[t.input?t.input.val():"",t]),this._lastInput=null,this._inDialog&&(this._dialogInput.css({position:"absolute",left:"0",top:"-100px"}),$.blockUI&&($.unblockUI(),$("body").append(this.dpDiv))),this._inDialog=!1}},_tidyDialog:function(e){e.dpDiv.removeClass(this._dialogClass).unbind(".ui-datepicker-calendar")},_checkExternalClick:function(e){if(!$.datepicker._curInst)return;var t=$(e.target),n=$.datepicker._getInst(t[0]);(t[0].id!=$.datepicker._mainDivId&&t.parents("#"+$.datepicker._mainDivId).length==0&&!t.hasClass($.datepicker.markerClassName)&&!t.closest("."+$.datepicker._triggerClass).length&&$.datepicker._datepickerShowing&&(!$.datepicker._inDialog||!$.blockUI)||t.hasClass($.datepicker.markerClassName)&&$.datepicker._curInst!=n)&&$.datepicker._hideDatepicker()},_adjustDate:function(e,t,n){var r=$(e),i=this._getInst(r[0]);if(this._isDisabledDatepicker(r[0]))return;this._adjustInstDate(i,t+(n=="M"?this._get(i,"showCurrentAtPos"):0),n),this._updateDatepicker(i)},_gotoToday:function(e){var t=$(e),n=this._getInst(t[0]);if(this._get(n,"gotoCurrent")&&n.currentDay)n.selectedDay=n.currentDay,n.drawMonth=n.selectedMonth=n.currentMonth,n.drawYear=n.selectedYear=n.currentYear;else{var r=new Date;n.selectedDay=r.getDate(),n.drawMonth=n.selectedMonth=r.getMonth(),n.drawYear=n.selectedYear=r.getFullYear()}this._notifyChange(n),this._adjustDate(t)},_selectMonthYear:function(e,t,n){var r=$(e),i=this._getInst(r[0]);i["selected"+(n=="M"?"Month":"Year")]=i["draw"+(n=="M"?"Month":"Year")]=parseInt(t.options[t.selectedIndex].value,10),this._notifyChange(i),this._adjustDate(r)},_selectDay:function(e,t,n,r){var i=$(e);if($(r).hasClass(this._unselectableClass)||this._isDisabledDatepicker(i[0]))return;var s=this._getInst(i[0]);s.selectedDay=s.currentDay=$("a",r).html(),s.selectedMonth=s.currentMonth=t,s.selectedYear=s.currentYear=n,this._selectDate(e,this._formatDate(s,s.currentDay,s.currentMonth,s.currentYear))},_clearDate:function(e){var t=$(e),n=this._getInst(t[0]);this._selectDate(t,"")},_selectDate:function(e,t){var n=$(e),r=this._getInst(n[0]);t=t!=null?t:this._formatDate(r),r.input&&r.input.val(t),this._updateAlternate(r);var i=this._get(r,"onSelect");i?i.apply(r.input?r.input[0]:null,[t,r]):r.input&&r.input.trigger("change"),r.inline?this._updateDatepicker(r):(this._hideDatepicker(),this._lastInput=r.input[0],typeof r.input[0]!="object"&&r.input.focus(),this._lastInput=null)},_updateAlternate:function(e){var t=this._get(e,"altField");if(t){var n=this._get(e,"altFormat")||this._get(e,"dateFormat"),r=this._getDate(e),i=this.formatDate(n,r,this._getFormatConfig(e));$(t).each(function(){$(this).val(i)})}},noWeekends:function(e){var t=e.getDay();return[t>0&&t<6,""]},iso8601Week:function(e){var t=new Date(e.getTime());t.setDate(t.getDate()+4-(t.getDay()||7));var n=t.getTime();return t.setMonth(0),t.setDate(1),Math.floor(Math.round((n-t)/864e5)/7)+1},parseDate:function(e,t,n){if(e==null||t==null)throw"Invalid arguments";t=typeof t=="object"?t.toString():t+"";if(t=="")return null;var r=(n?n.shortYearCutoff:null)||this._defaults.shortYearCutoff;r=typeof r!="string"?r:(new Date).getFullYear()%100+parseInt(r,10);var i=(n?n.dayNamesShort:null)||this._defaults.dayNamesShort,s=(n?n.dayNames:null)||this._defaults.dayNames,o=(n?n.monthNamesShort:null)||this._defaults.monthNamesShort,u=(n?n.monthNames:null)||this._defaults.monthNames,a=-1,f=-1,l=-1,c=-1,h=!1,p=function(t){var n=y+1<e.length&&e.charAt(y+1)==t;return n&&y++,n},d=function(e){var n=p(e),r=e=="@"?14:e=="!"?20:e=="y"&&n?4:e=="o"?3:2,i=new RegExp("^\\d{1,"+r+"}"),s=t.substring(g).match(i);if(!s)throw"Missing number at position "+g;return g+=s[0].length,parseInt(s[0],10)},v=function(e,n,r){var i=$.map(p(e)?r:n,function(e,t){return[[t,e]]}).sort(function(e,t){return-(e[1].length-t[1].length)}),s=-1;$.each(i,function(e,n){var r=n[1];if(t.substr(g,r.length).toLowerCase()==r.toLowerCase())return s=n[0],g+=r.length,!1});if(s!=-1)return s+1;throw"Unknown name at position "+g},m=function(){if(t.charAt(g)!=e.charAt(y))throw"Unexpected literal at position "+g;g++},g=0;for(var y=0;y<e.length;y++)if(h)e.charAt(y)=="'"&&!p("'")?h=!1:m();else switch(e.charAt(y)){case"d":l=d("d");break;case"D":v("D",i,s);break;case"o":c=d("o");break;case"m":f=d("m");break;case"M":f=v("M",o,u);break;case"y":a=d("y");break;case"@":var b=new Date(d("@"));a=b.getFullYear(),f=b.getMonth()+1,l=b.getDate();break;case"!":var b=new Date((d("!")-this._ticksTo1970)/1e4);a=b.getFullYear(),f=b.getMonth()+1,l=b.getDate();break;case"'":p("'")?m():h=!0;break;default:m()}if(g<t.length){var w=t.substr(g);if(!/^\s+/.test(w))throw"Extra/unparsed characters found in date: "+w}a==-1?a=(new Date).getFullYear():a<100&&(a+=(new Date).getFullYear()-(new Date).getFullYear()%100+(a<=r?0:-100));if(c>-1){f=1,l=c;do{var E=this._getDaysInMonth(a,f-1);if(l<=E)break;f++,l-=E}while(!0)}var b=this._daylightSavingAdjust(new Date(a,f-1,l));if(b.getFullYear()!=a||b.getMonth()+1!=f||b.getDate()!=l)throw"Invalid date";return b},ATOM:"yy-mm-dd",COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd",RFC_822:"D, d M y",RFC_850:"DD, dd-M-y",RFC_1036:"D, d M y",RFC_1123:"D, d M yy",RFC_2822:"D, d M yy",RSS:"D, d M y",TICKS:"!",TIMESTAMP:"@",W3C:"yy-mm-dd",_ticksTo1970:(718685+Math.floor(492.5)-Math.floor(19.7)+Math.floor(4.925))*24*60*60*1e7,formatDate:function(e,t,n){if(!t)return"";var r=(n?n.dayNamesShort:null)||this._defaults.dayNamesShort,i=(n?n.dayNames:null)||this._defaults.dayNames,s=(n?n.monthNamesShort:null)||this._defaults.monthNamesShort,o=(n?n.monthNames:null)||this._defaults.monthNames,u=function(t){var n=h+1<e.length&&e.charAt(h+1)==t;return n&&h++,n},a=function(e,t,n){var r=""+t;if(u(e))while(r.length<n)r="0"+r;return r},f=function(e,t,n,r){return u(e)?r[t]:n[t]},l="",c=!1;if(t)for(var h=0;h<e.length;h++)if(c)e.charAt(h)=="'"&&!u("'")?c=!1:l+=e.charAt(h);else switch(e.charAt(h)){case"d":l+=a("d",t.getDate(),2);break;case"D":l+=f("D",t.getDay(),r,i);break;case"o":l+=a("o",Math.round(((new Date(t.getFullYear(),t.getMonth(),t.getDate())).getTime()-(new Date(t.getFullYear(),0,0)).getTime())/864e5),3);break;case"m":l+=a("m",t.getMonth()+1,2);break;case"M":l+=f("M",t.getMonth(),s,o);break;case"y":l+=u("y")?t.getFullYear():(t.getYear()%100<10?"0":"")+t.getYear()%100;break;case"@":l+=t.getTime();break;case"!":l+=t.getTime()*1e4+this._ticksTo1970;break;case"'":u("'")?l+="'":c=!0;break;default:l+=e.charAt(h)}return l},_possibleChars:function(e){var t="",n=!1,r=function(t){var n=i+1<e.length&&e.charAt(i+1)==t;return n&&i++,n};for(var i=0;i<e.length;i++)if(n)e.charAt(i)=="'"&&!r("'")?n=!1:t+=e.charAt(i);else switch(e.charAt(i)){case"d":case"m":case"y":case"@":t+="0123456789";break;case"D":case"M":return null;case"'":r("'")?t+="'":n=!0;break;default:t+=e.charAt(i)}return t},_get:function(e,t){return e.settings[t]!==undefined?e.settings[t]:this._defaults[t]},_setDateFromField:function(e,t){if(e.input.val()==e.lastVal)return;var n=this._get(e,"dateFormat"),r=e.lastVal=e.input?e.input.val():null,i,s;i=s=this._getDefaultDate(e);var o=this._getFormatConfig(e);try{i=this.parseDate(n,r,o)||s}catch(u){this.log(u),r=t?"":r}e.selectedDay=i.getDate(),e.drawMonth=e.selectedMonth=i.getMonth(),e.drawYear=e.selectedYear=i.getFullYear(),e.currentDay=r?i.getDate():0,e.currentMonth=r?i.getMonth():0,e.currentYear=r?i.getFullYear():0,this._adjustInstDate(e)},_getDefaultDate:function(e){return this._restrictMinMax(e,this._determineDate(e,this._get(e,"defaultDate"),new Date))},_determineDate:function(e,t,n){var r=function(e){var t=new Date;return t.setDate(t.getDate()+e),t},i=function(t){try{return $.datepicker.parseDate($.datepicker._get(e,"dateFormat"),t,$.datepicker._getFormatConfig(e))}catch(n){}var r=(t.toLowerCase().match(/^c/)?$.datepicker._getDate(e):null)||new Date,i=r.getFullYear(),s=r.getMonth(),o=r.getDate(),u=/([+-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g,a=u.exec(t);while(a){switch(a[2]||"d"){case"d":case"D":o+=parseInt(a[1],10);break;case"w":case"W":o+=parseInt(a[1],10)*7;break;case"m":case"M":s+=parseInt(a[1],10),o=Math.min(o,$.datepicker._getDaysInMonth(i,s));break;case"y":case"Y":i+=parseInt(a[1],10),o=Math.min(o,$.datepicker._getDaysInMonth(i,s))}a=u.exec(t)}return new Date(i,s,o)},s=t==null||t===""?n:typeof t=="string"?i(t):typeof t=="number"?isNaN(t)?n:r(t):new Date(t.getTime());return s=s&&s.toString()=="Invalid Date"?n:s,s&&(s.setHours(0),s.setMinutes(0),s.setSeconds(0),s.setMilliseconds(0)),this._daylightSavingAdjust(s)},_daylightSavingAdjust:function(e){return e?(e.setHours(e.getHours()>12?e.getHours()+2:0),e):null},_setDate:function(e,t,n){var r=!t,i=e.selectedMonth,s=e.selectedYear,o=this._restrictMinMax(e,this._determineDate(e,t,new Date));e.selectedDay=e.currentDay=o.getDate(),e.drawMonth=e.selectedMonth=e.currentMonth=o.getMonth(),e.drawYear=e.selectedYear=e.currentYear=o.getFullYear(),(i!=e.selectedMonth||s!=e.selectedYear)&&!n&&this._notifyChange(e),this._adjustInstDate(e),e.input&&e.input.val(r?"":this._formatDate(e))},_getDate:function(e){var t=!e.currentYear||e.input&&e.input.val()==""?null:this._daylightSavingAdjust(new Date(e.currentYear,e.currentMonth,e.currentDay));return t},_attachHandlers:function(e){var t=this._get(e,"stepMonths"),n="#"+e.id.replace(/\\\\/g,"\\");e.dpDiv.find("[data-handler]").map(function(){var e={prev:function(){window["DP_jQuery_"+dpuuid].datepicker._adjustDate(n,-t,"M")},next:function(){window["DP_jQuery_"+dpuuid].datepicker._adjustDate(n,+t,"M")},hide:function(){window["DP_jQuery_"+dpuuid].datepicker._hideDatepicker()},today:function(){window["DP_jQuery_"+dpuuid].datepicker._gotoToday(n)},selectDay:function(){return window["DP_jQuery_"+dpuuid].datepicker._selectDay(n,+this.getAttribute("data-month"),+this.getAttribute("data-year"),this),!1},selectMonth:function(){return window["DP_jQuery_"+dpuuid].datepicker._selectMonthYear(n,this,"M"),!1},selectYear:function(){return window["DP_jQuery_"+dpuuid].datepicker._selectMonthYear(n,this,"Y"),!1}};$(this).bind(this.getAttribute("data-event"),e[this.getAttribute("data-handler")])})},_generateHTML:function(e){var t=new Date;t=this._daylightSavingAdjust(new Date(t.getFullYear(),t.getMonth(),t.getDate()));var n=this._get(e,"isRTL"),r=this._get(e,"showButtonPanel"),i=this._get(e,"hideIfNoPrevNext"),s=this._get(e,"navigationAsDateFormat"),o=this._getNumberOfMonths(e),u=this._get(e,"showCurrentAtPos"),a=this._get(e,"stepMonths"),f=o[0]!=1||o[1]!=1,l=this._daylightSavingAdjust(e.currentDay?new Date(e.currentYear,e.currentMonth,e.currentDay):new Date(9999,9,9)),c=this._getMinMaxDate(e,"min"),h=this._getMinMaxDate(e,"max"),p=e.drawMonth-u,d=e.drawYear;p<0&&(p+=12,d--);if(h){var v=this._daylightSavingAdjust(new Date(h.getFullYear(),h.getMonth()-o[0]*o[1]+1,h.getDate()));v=c&&v<c?c:v;while(this._daylightSavingAdjust(new Date(d,p,1))>v)p--,p<0&&(p=11,d--)}e.drawMonth=p,e.drawYear=d;var m=this._get(e,"prevText");m=s?this.formatDate(m,this._daylightSavingAdjust(new Date(d,p-a,1)),this._getFormatConfig(e)):m;var g=this._canAdjustMonth(e,-1,d,p)?'<a class="ui-datepicker-prev ui-corner-all" data-handler="prev" data-event="click" title="'+m+'"><span class="ui-icon ui-icon-circle-triangle-'+(n?"e":"w")+'">'+m+"</span></a>":i?"":'<a class="ui-datepicker-prev ui-corner-all ui-state-disabled" title="'+m+'"><span class="ui-icon ui-icon-circle-triangle-'+(n?"e":"w")+'">'+m+"</span></a>",y=this._get(e,"nextText");y=s?this.formatDate(y,this._daylightSavingAdjust(new Date(d,p+a,1)),this._getFormatConfig(e)):y;var b=this._canAdjustMonth(e,1,d,p)?'<a class="ui-datepicker-next ui-corner-all" data-handler="next" data-event="click" title="'+y+'"><span class="ui-icon ui-icon-circle-triangle-'+(n?"w":"e")+'">'+y+"</span></a>":i?"":'<a class="ui-datepicker-next ui-corner-all ui-state-disabled" title="'+y+'"><span class="ui-icon ui-icon-circle-triangle-'+(n?"w":"e")+'">'+y+"</span></a>",w=this._get(e,"currentText"),E=this._get(e,"gotoCurrent")&&e.currentDay?l:t;w=s?this.formatDate(w,E,this._getFormatConfig(e)):w;var S=e.inline?"":'<button type="button" class="ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all" data-handler="hide" data-event="click">'+this._get(e,"closeText")+"</button>",x=r?'<div class="ui-datepicker-buttonpane ui-widget-content">'+(n?S:"")+(this._isInRange(e,E)?'<button type="button" class="ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all" data-handler="today" data-event="click">'+w+"</button>":"")+(n?"":S)+"</div>":"",T=parseInt(this._get(e,"firstDay"),10);T=isNaN(T)?0:T;var N=this._get(e,"showWeek"),C=this._get(e,"dayNames"),k=this._get(e,"dayNamesShort"),L=this._get(e,"dayNamesMin"),A=this._get(e,"monthNames"),O=this._get(e,"monthNamesShort"),M=this._get(e,"beforeShowDay"),_=this._get(e,"showOtherMonths"),D=this._get(e,"selectOtherMonths"),P=this._get(e,"calculateWeek")||this.iso8601Week,H=this._getDefaultDate(e),B="";for(var j=0;j<o[0];j++){var F="";this.maxRows=4;for(var I=0;I<o[1];I++){var q=this._daylightSavingAdjust(new Date(d,p,e.selectedDay)),R=" ui-corner-all",U="";if(f){U+='<div class="ui-datepicker-group';if(o[1]>1)switch(I){case 0:U+=" ui-datepicker-group-first",R=" ui-corner-"+(n?"right":"left");break;case o[1]-1:U+=" ui-datepicker-group-last",R=" ui-corner-"+(n?"left":"right");break;default:U+=" ui-datepicker-group-middle",R=""}U+='">'}U+='<div class="ui-datepicker-header ui-widget-header ui-helper-clearfix'+R+'">'+(/all|left/.test(R)&&j==0?n?b:g:"")+(/all|right/.test(R)&&j==0?n?g:b:"")+this._generateMonthYearHeader(e,p,d,c,h,j>0||I>0,A,O)+'</div><table class="ui-datepicker-calendar"><thead>'+"<tr>";var z=N?'<th class="ui-datepicker-week-col">'+this._get(e,"weekHeader")+"</th>":"";for(var W=0;W<7;W++){var X=(W+T)%7;z+="<th"+((W+T+6)%7>=5?' class="ui-datepicker-week-end"':"")+">"+'<span title="'+C[X]+'">'+L[X]+"</span></th>"}U+=z+"</tr></thead><tbody>";var V=this._getDaysInMonth(d,p);d==e.selectedYear&&p==e.selectedMonth&&(e.selectedDay=Math.min(e.selectedDay,V));var J=(this._getFirstDayOfMonth(d,p)-T+7)%7,K=Math.ceil((J+V)/7),Q=f?this.maxRows>K?this.maxRows:K:K;this.maxRows=Q;var G=this._daylightSavingAdjust(new Date(d,p,1-J));for(var Y=0;Y<Q;Y++){U+="<tr>";var Z=N?'<td class="ui-datepicker-week-col">'+this._get(e,"calculateWeek")(G)+"</td>":"";for(var W=0;W<7;W++){var et=M?M.apply(e.input?e.input[0]:null,[G]):[!0,""],tt=G.getMonth()!=p,nt=tt&&!D||!et[0]||c&&G<c||h&&G>h;Z+='<td class="'+((W+T+6)%7>=5?" ui-datepicker-week-end":"")+(tt?" ui-datepicker-other-month":"")+(G.getTime()==q.getTime()&&p==e.selectedMonth&&e._keyEvent||H.getTime()==G.getTime()&&H.getTime()==q.getTime()?" "+this._dayOverClass:"")+(nt?" "+this._unselectableClass+" ui-state-disabled":"")+(tt&&!_?"":" "+et[1]+(G.getTime()==l.getTime()?" "+this._currentClass:"")+(G.getTime()==t.getTime()?" ui-datepicker-today":""))+'"'+((!tt||_)&&et[2]?' title="'+et[2]+'"':"")+(nt?"":' data-handler="selectDay" data-event="click" data-month="'+G.getMonth()+'" data-year="'+G.getFullYear()+'"')+">"+(tt&&!_?"&#xa0;":nt?'<span class="ui-state-default">'+G.getDate()+"</span>":'<a class="ui-state-default'+(G.getTime()==t.getTime()?" ui-state-highlight":"")+(G.getTime()==l.getTime()?" ui-state-active":"")+(tt?" ui-priority-secondary":"")+'" href="#">'+G.getDate()+"</a>")+"</td>",G.setDate(G.getDate()+1),G=this._daylightSavingAdjust(G)}U+=Z+"</tr>"}p++,p>11&&(p=0,d++),U+="</tbody></table>"+(f?"</div>"+(o[0]>0&&I==o[1]-1?'<div class="ui-datepicker-row-break"></div>':""):""),F+=U}B+=F}return B+=x+($.ui.ie6&&!e.inline?'<iframe src="javascript:false;" class="ui-datepicker-cover" frameborder="0"></iframe>':""),e._keyEvent=!1,B},_generateMonthYearHeader:function(e,t,n,r,i,s,o,u){var a=this._get(e,"changeMonth"),f=this._get(e,"changeYear"),l=this._get(e,"showMonthAfterYear"),c='<div class="ui-datepicker-title">',h="";if(s||!a)h+='<span class="ui-datepicker-month">'+o[t]+"</span>";else{var p=r&&r.getFullYear()==n,d=i&&i.getFullYear()==n;h+='<select class="ui-datepicker-month" data-handler="selectMonth" data-event="change">';for(var v=0;v<12;v++)(!p||v>=r.getMonth())&&(!d||v<=i.getMonth())&&(h+='<option value="'+v+'"'+(v==t?' selected="selected"':"")+">"+u[v]+"</option>");h+="</select>"}l||(c+=h+(s||!a||!f?"&#xa0;":""));if(!e.yearshtml){e.yearshtml="";if(s||!f)c+='<span class="ui-datepicker-year">'+n+"</span>";else{var m=this._get(e,"yearRange").split(":"),g=(new Date).getFullYear(),y=function(e){var t=e.match(/c[+-].*/)?n+parseInt(e.substring(1),10):e.match(/[+-].*/)?g+parseInt(e,10):parseInt(e,10);return isNaN(t)?g:t},b=y(m[0]),w=Math.max(b,y(m[1]||""));b=r?Math.max(b,r.getFullYear()):b,w=i?Math.min(w,i.getFullYear()):w,e.yearshtml+='<select class="ui-datepicker-year" data-handler="selectYear" data-event="change">';for(;b<=w;b++)e.yearshtml+='<option value="'+b+'"'+(b==n?' selected="selected"':"")+">"+b+"</option>";e.yearshtml+="</select>",c+=e.yearshtml,e.yearshtml=null}}return c+=this._get(e,"yearSuffix"),l&&(c+=(s||!a||!f?"&#xa0;":"")+h),c+="</div>",c},_adjustInstDate:function(e,t,n){var r=e.drawYear+(n=="Y"?t:0),i=e.drawMonth+(n=="M"?t:0),s=Math.min(e.selectedDay,this._getDaysInMonth(r,i))+(n=="D"?t:0),o=this._restrictMinMax(e,this._daylightSavingAdjust(new Date(r,i,s)));e.selectedDay=o.getDate(),e.drawMonth=e.selectedMonth=o.getMonth(),e.drawYear=e.selectedYear=o.getFullYear(),(n=="M"||n=="Y")&&this._notifyChange(e)},_restrictMinMax:function(e,t){var n=this._getMinMaxDate(e,"min"),r=this._getMinMaxDate(e,"max"),i=n&&t<n?n:t;return i=r&&i>r?r:i,i},_notifyChange:function(e){var t=this._get(e,"onChangeMonthYear");t&&t.apply(e.input?e.input[0]:null,[e.selectedYear,e.selectedMonth+1,e])},_getNumberOfMonths:function(e){var t=this._get(e,"numberOfMonths");return t==null?[1,1]:typeof t=="number"?[1,t]:t},_getMinMaxDate:function(e,t){return this._determineDate(e,this._get(e,t+"Date"),null)},_getDaysInMonth:function(e,t){return 32-this._daylightSavingAdjust(new Date(e,t,32)).getDate()},_getFirstDayOfMonth:function(e,t){return(new Date(e,t,1)).getDay()},_canAdjustMonth:function(e,t,n,r){var i=this._getNumberOfMonths(e),s=this._daylightSavingAdjust(new Date(n,r+(t<0?t:i[0]*i[1]),1));return t<0&&s.setDate(this._getDaysInMonth(s.getFullYear(),s.getMonth())),this._isInRange(e,s)},_isInRange:function(e,t){var n=this._getMinMaxDate(e,"min"),r=this._getMinMaxDate(e,"max");return(!n||t.getTime()>=n.getTime())&&(!r||t.getTime()<=r.getTime())},_getFormatConfig:function(e){var t=this._get(e,"shortYearCutoff");return t=typeof t!="string"?t:(new Date).getFullYear()%100+parseInt(t,10),{shortYearCutoff:t,dayNamesShort:this._get(e,"dayNamesShort"),dayNames:this._get(e,"dayNames"),monthNamesShort:this._get(e,"monthNamesShort"),monthNames:this._get(e,"monthNames")}},_formatDate:function(e,t,n,r){t||(e.currentDay=e.selectedDay,e.currentMonth=e.selectedMonth,e.currentYear=e.selectedYear);var i=t?typeof t=="object"?t:this._daylightSavingAdjust(new Date(r,n,t)):this._daylightSavingAdjust(new Date(e.currentYear,e.currentMonth,e.currentDay));return this.formatDate(this._get(e,"dateFormat"),i,this._getFormatConfig(e))}}),$.fn.datepicker=function(e){if(!this.length)return this;$.datepicker.initialized||($(document).mousedown($.datepicker._checkExternalClick).find(document.body).append($.datepicker.dpDiv),$.datepicker.initialized=!0);var t=Array.prototype.slice.call(arguments,1);return typeof e!="string"||e!="isDisabled"&&e!="getDate"&&e!="widget"?e=="option"&&arguments.length==2&&typeof arguments[1]=="string"?$.datepicker["_"+e+"Datepicker"].apply($.datepicker,[this[0]].concat(t)):this.each(function(){typeof e=="string"?$.datepicker["_"+e+"Datepicker"].apply($.datepicker,[this].concat(t)):$.datepicker._attachDatepicker(this,e)}):$.datepicker["_"+e+"Datepicker"].apply($.datepicker,[this[0]].concat(t))},$.datepicker=new Datepicker,$.datepicker.initialized=!1,$.datepicker.uuid=(new Date).getTime(),$.datepicker.version="1.9.2",window["DP_jQuery_"+dpuuid]=$})(jQuery);(function(e,t){var n="ui-dialog ui-widget ui-widget-content ui-corner-all ",r={buttons:!0,height:!0,maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0,width:!0},i={maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0};e.widget("ui.dialog",{version:"1.9.2",options:{autoOpen:!0,buttons:{},closeOnEscape:!0,closeText:"close",dialogClass:"",draggable:!0,hide:null,height:"auto",maxHeight:!1,maxWidth:!1,minHeight:150,minWidth:150,modal:!1,position:{my:"center",at:"center",of:window,collision:"fit",using:function(t){var n=e(this).css(t).offset().top;n<0&&e(this).css("top",t.top-n)}},resizable:!0,show:null,stack:!0,title:"",width:300,zIndex:1e3},_create:function(){this.originalTitle=this.element.attr("title"),typeof this.originalTitle!="string"&&(this.originalTitle=""),this.oldPosition={parent:this.element.parent(),index:this.element.parent().children().index(this.element)},this.options.title=this.options.title||this.originalTitle;var t=this,r=this.options,i=r.title||"&#160;",s,o,u,a,f;s=(this.uiDialog=e("<div>")).addClass(n+r.dialogClass).css({display:"none",outline:0,zIndex:r.zIndex}).attr("tabIndex",-1).keydown(function(n){r.closeOnEscape&&!n.isDefaultPrevented()&&n.keyCode&&n.keyCode===e.ui.keyCode.ESCAPE&&(t.close(n),n.preventDefault())}).mousedown(function(e){t.moveToTop(!1,e)}).appendTo("body"),this.element.show().removeAttr("title").addClass("ui-dialog-content ui-widget-content").appendTo(s),o=(this.uiDialogTitlebar=e("<div>")).addClass("ui-dialog-titlebar  ui-widget-header  ui-corner-all  ui-helper-clearfix").bind("mousedown",function(){s.focus()}).prependTo(s),u=e("<a href='#'></a>").addClass("ui-dialog-titlebar-close  ui-corner-all").attr("role","button").click(function(e){e.preventDefault(),t.close(e)}).appendTo(o),(this.uiDialogTitlebarCloseText=e("<span>")).addClass("ui-icon ui-icon-closethick").text(r.closeText).appendTo(u),a=e("<span>").uniqueId().addClass("ui-dialog-title").html(i).prependTo(o),f=(this.uiDialogButtonPane=e("<div>")).addClass("ui-dialog-buttonpane ui-widget-content ui-helper-clearfix"),(this.uiButtonSet=e("<div>")).addClass("ui-dialog-buttonset").appendTo(f),s.attr({role:"dialog","aria-labelledby":a.attr("id")}),o.find("*").add(o).disableSelection(),this._hoverable(u),this._focusable(u),r.draggable&&e.fn.draggable&&this._makeDraggable(),r.resizable&&e.fn.resizable&&this._makeResizable(),this._createButtons(r.buttons),this._isOpen=!1,e.fn.bgiframe&&s.bgiframe(),this._on(s,{keydown:function(t){if(!r.modal||t.keyCode!==e.ui.keyCode.TAB)return;var n=e(":tabbable",s),i=n.filter(":first"),o=n.filter(":last");if(t.target===o[0]&&!t.shiftKey)return i.focus(1),!1;if(t.target===i[0]&&t.shiftKey)return o.focus(1),!1}})},_init:function(){this.options.autoOpen&&this.open()},_destroy:function(){var e,t=this.oldPosition;this.overlay&&this.overlay.destroy(),this.uiDialog.hide(),this.element.removeClass("ui-dialog-content ui-widget-content").hide().appendTo("body"),this.uiDialog.remove(),this.originalTitle&&this.element.attr("title",this.originalTitle),e=t.parent.children().eq(t.index),e.length&&e[0]!==this.element[0]?e.before(this.element):t.parent.append(this.element)},widget:function(){return this.uiDialog},close:function(t){var n=this,r,i;if(!this._isOpen)return;if(!1===this._trigger("beforeClose",t))return;return this._isOpen=!1,this.overlay&&this.overlay.destroy(),this.options.hide?this._hide(this.uiDialog,this.options.hide,function(){n._trigger("close",t)}):(this.uiDialog.hide(),this._trigger("close",t)),e.ui.dialog.overlay.resize(),this.options.modal&&(r=0,e(".ui-dialog").each(function(){this!==n.uiDialog[0]&&(i=e(this).css("z-index"),isNaN(i)||(r=Math.max(r,i)))}),e.ui.dialog.maxZ=r),this},isOpen:function(){return this._isOpen},moveToTop:function(t,n){var r=this.options,i;return r.modal&&!t||!r.stack&&!r.modal?this._trigger("focus",n):(r.zIndex>e.ui.dialog.maxZ&&(e.ui.dialog.maxZ=r.zIndex),this.overlay&&(e.ui.dialog.maxZ+=1,e.ui.dialog.overlay.maxZ=e.ui.dialog.maxZ,this.overlay.$el.css("z-index",e.ui.dialog.overlay.maxZ)),i={scrollTop:this.element.scrollTop(),scrollLeft:this.element.scrollLeft()},e.ui.dialog.maxZ+=1,this.uiDialog.css("z-index",e.ui.dialog.maxZ),this.element.attr(i),this._trigger("focus",n),this)},open:function(){if(this._isOpen)return;var t,n=this.options,r=this.uiDialog;return this._size(),this._position(n.position),r.show(n.show),this.overlay=n.modal?new e.ui.dialog.overlay(this):null,this.moveToTop(!0),t=this.element.find(":tabbable"),t.length||(t=this.uiDialogButtonPane.find(":tabbable"),t.length||(t=r)),t.eq(0).focus(),this._isOpen=!0,this._trigger("open"),this},_createButtons:function(t){var n=this,r=!1;this.uiDialogButtonPane.remove(),this.uiButtonSet.empty(),typeof t=="object"&&t!==null&&e.each(t,function(){return!(r=!0)}),r?(e.each(t,function(t,r){var i,s;r=e.isFunction(r)?{click:r,text:t}:r,r=e.extend({type:"button"},r),s=r.click,r.click=function(){s.apply(n.element[0],arguments)},i=e("<button></button>",r).appendTo(n.uiButtonSet),e.fn.button&&i.button()}),this.uiDialog.addClass("ui-dialog-buttons"),this.uiDialogButtonPane.appendTo(this.uiDialog)):this.uiDialog.removeClass("ui-dialog-buttons")},_makeDraggable:function(){function r(e){return{position:e.position,offset:e.offset}}var t=this,n=this.options;this.uiDialog.draggable({cancel:".ui-dialog-content, .ui-dialog-titlebar-close",handle:".ui-dialog-titlebar",containment:"document",start:function(n,i){e(this).addClass("ui-dialog-dragging"),t._trigger("dragStart",n,r(i))},drag:function(e,n){t._trigger("drag",e,r(n))},stop:function(i,s){n.position=[s.position.left-t.document.scrollLeft(),s.position.top-t.document.scrollTop()],e(this).removeClass("ui-dialog-dragging"),t._trigger("dragStop",i,r(s)),e.ui.dialog.overlay.resize()}})},_makeResizable:function(n){function u(e){return{originalPosition:e.originalPosition,originalSize:e.originalSize,position:e.position,size:e.size}}n=n===t?this.options.resizable:n;var r=this,i=this.options,s=this.uiDialog.css("position"),o=typeof n=="string"?n:"n,e,s,w,se,sw,ne,nw";this.uiDialog.resizable({cancel:".ui-dialog-content",containment:"document",alsoResize:this.element,maxWidth:i.maxWidth,maxHeight:i.maxHeight,minWidth:i.minWidth,minHeight:this._minHeight(),handles:o,start:function(t,n){e(this).addClass("ui-dialog-resizing"),r._trigger("resizeStart",t,u(n))},resize:function(e,t){r._trigger("resize",e,u(t))},stop:function(t,n){e(this).removeClass("ui-dialog-resizing"),i.height=e(this).height(),i.width=e(this).width(),r._trigger("resizeStop",t,u(n)),e.ui.dialog.overlay.resize()}}).css("position",s).find(".ui-resizable-se").addClass("ui-icon ui-icon-grip-diagonal-se")},_minHeight:function(){var e=this.options;return e.height==="auto"?e.minHeight:Math.min(e.minHeight,e.height)},_position:function(t){var n=[],r=[0,0],i;if(t){if(typeof t=="string"||typeof t=="object"&&"0"in t)n=t.split?t.split(" "):[t[0],t[1]],n.length===1&&(n[1]=n[0]),e.each(["left","top"],function(e,t){+n[e]===n[e]&&(r[e]=n[e],n[e]=t)}),t={my:n[0]+(r[0]<0?r[0]:"+"+r[0])+" "+n[1]+(r[1]<0?r[1]:"+"+r[1]),at:n.join(" ")};t=e.extend({},e.ui.dialog.prototype.options.position,t)}else t=e.ui.dialog.prototype.options.position;i=this.uiDialog.is(":visible"),i||this.uiDialog.show(),this.uiDialog.position(t),i||this.uiDialog.hide()},_setOptions:function(t){var n=this,s={},o=!1;e.each(t,function(e,t){n._setOption(e,t),e in r&&(o=!0),e in i&&(s[e]=t)}),o&&this._size(),this.uiDialog.is(":data(resizable)")&&this.uiDialog.resizable("option",s)},_setOption:function(t,r){var i,s,o=this.uiDialog;switch(t){case"buttons":this._createButtons(r);break;case"closeText":this.uiDialogTitlebarCloseText.text(""+r);break;case"dialogClass":o.removeClass(this.options.dialogClass).addClass(n+r);break;case"disabled":r?o.addClass("ui-dialog-disabled"):o.removeClass("ui-dialog-disabled");break;case"draggable":i=o.is(":data(draggable)"),i&&!r&&o.draggable("destroy"),!i&&r&&this._makeDraggable();break;case"position":this._position(r);break;case"resizable":s=o.is(":data(resizable)"),s&&!r&&o.resizable("destroy"),s&&typeof r=="string"&&o.resizable("option","handles",r),!s&&r!==!1&&this._makeResizable(r);break;case"title":e(".ui-dialog-title",this.uiDialogTitlebar).html(""+(r||"&#160;"))}this._super(t,r)},_size:function(){var t,n,r,i=this.options,s=this.uiDialog.is(":visible");this.element.show().css({width:"auto",minHeight:0,height:0}),i.minWidth>i.width&&(i.width=i.minWidth),t=this.uiDialog.css({height:"auto",width:i.width}).outerHeight(),n=Math.max(0,i.minHeight-t),i.height==="auto"?e.support.minHeight?this.element.css({minHeight:n,height:"auto"}):(this.uiDialog.show(),r=this.element.css("height","auto").height(),s||this.uiDialog.hide(),this.element.height(Math.max(r,n))):this.element.height(Math.max(i.height-t,0)),this.uiDialog.is(":data(resizable)")&&this.uiDialog.resizable("option","minHeight",this._minHeight())}}),e.extend(e.ui.dialog,{uuid:0,maxZ:0,getTitleId:function(e){var t=e.attr("id");return t||(this.uuid+=1,t=this.uuid),"ui-dialog-title-"+t},overlay:function(t){this.$el=e.ui.dialog.overlay.create(t)}}),e.extend(e.ui.dialog.overlay,{instances:[],oldInstances:[],maxZ:0,events:e.map("focus,mousedown,mouseup,keydown,keypress,click".split(","),function(e){return e+".dialog-overlay"}).join(" "),create:function(t){this.instances.length===0&&(setTimeout(function(){e.ui.dialog.overlay.instances.length&&e(document).bind(e.ui.dialog.overlay.events,function(t){if(e(t.target).zIndex()<e.ui.dialog.overlay.maxZ)return!1})},1),e(window).bind("resize.dialog-overlay",e.ui.dialog.overlay.resize));var n=this.oldInstances.pop()||e("<div>").addClass("ui-widget-overlay");return e(document).bind("keydown.dialog-overlay",function(r){var i=e.ui.dialog.overlay.instances;i.length!==0&&i[i.length-1]===n&&t.options.closeOnEscape&&!r.isDefaultPrevented()&&r.keyCode&&r.keyCode===e.ui.keyCode.ESCAPE&&(t.close(r),r.preventDefault())}),n.appendTo(document.body).css({width:this.width(),height:this.height()}),e.fn.bgiframe&&n.bgiframe(),this.instances.push(n),n},destroy:function(t){var n=e.inArray(t,this.instances),r=0;n!==-1&&this.oldInstances.push(this.instances.splice(n,1)[0]),this.instances.length===0&&e([document,window]).unbind(".dialog-overlay"),t.height(0).width(0).remove(),e.each(this.instances,function(){r=Math.max(r,this.css("z-index"))}),this.maxZ=r},height:function(){var t,n;return e.ui.ie?(t=Math.max(document.documentElement.scrollHeight,document.body.scrollHeight),n=Math.max(document.documentElement.offsetHeight,document.body.offsetHeight),t<n?e(window).height()+"px":t+"px"):e(document).height()+"px"},width:function(){var t,n;return e.ui.ie?(t=Math.max(document.documentElement.scrollWidth,document.body.scrollWidth),n=Math.max(document.documentElement.offsetWidth,document.body.offsetWidth),t<n?e(window).width()+"px":t+"px"):e(document).width()+"px"},resize:function(){var t=e([]);e.each(e.ui.dialog.overlay.instances,function(){t=t.add(this)}),t.css({width:0,height:0}).css({width:e.ui.dialog.overlay.width(),height:e.ui.dialog.overlay.height()})}}),e.extend(e.ui.dialog.overlay.prototype,{destroy:function(){e.ui.dialog.overlay.destroy(this.$el)}})})(jQuery);(function(e,t){var n=!1;e.widget("ui.menu",{version:"1.9.2",defaultElement:"<ul>",delay:300,options:{icons:{submenu:"ui-icon-carat-1-e"},menus:"ul",position:{my:"left top",at:"right top"},role:"menu",blur:null,focus:null,select:null},_create:function(){this.activeMenu=this.element,this.element.uniqueId().addClass("ui-menu ui-widget ui-widget-content ui-corner-all").toggleClass("ui-menu-icons",!!this.element.find(".ui-icon").length).attr({role:this.options.role,tabIndex:0}).bind("click"+this.eventNamespace,e.proxy(function(e){this.options.disabled&&e.preventDefault()},this)),this.options.disabled&&this.element.addClass("ui-state-disabled").attr("aria-disabled","true"),this._on({"mousedown .ui-menu-item > a":function(e){e.preventDefault()},"click .ui-state-disabled > a":function(e){e.preventDefault()},"click .ui-menu-item:has(a)":function(t){var r=e(t.target).closest(".ui-menu-item");!n&&r.not(".ui-state-disabled").length&&(n=!0,this.select(t),r.has(".ui-menu").length?this.expand(t):this.element.is(":focus")||(this.element.trigger("focus",[!0]),this.active&&this.active.parents(".ui-menu").length===1&&clearTimeout(this.timer)))},"mouseenter .ui-menu-item":function(t){var n=e(t.currentTarget);n.siblings().children(".ui-state-active").removeClass("ui-state-active"),this.focus(t,n)},mouseleave:"collapseAll","mouseleave .ui-menu":"collapseAll",focus:function(e,t){var n=this.active||this.element.children(".ui-menu-item").eq(0);t||this.focus(e,n)},blur:function(t){this._delay(function(){e.contains(this.element[0],this.document[0].activeElement)||this.collapseAll(t)})},keydown:"_keydown"}),this.refresh(),this._on(this.document,{click:function(t){e(t.target).closest(".ui-menu").length||this.collapseAll(t),n=!1}})},_destroy:function(){this.element.removeAttr("aria-activedescendant").find(".ui-menu").andSelf().removeClass("ui-menu ui-widget ui-widget-content ui-corner-all ui-menu-icons").removeAttr("role").removeAttr("tabIndex").removeAttr("aria-labelledby").removeAttr("aria-expanded").removeAttr("aria-hidden").removeAttr("aria-disabled").removeUniqueId().show(),this.element.find(".ui-menu-item").removeClass("ui-menu-item").removeAttr("role").removeAttr("aria-disabled").children("a").removeUniqueId().removeClass("ui-corner-all ui-state-hover").removeAttr("tabIndex").removeAttr("role").removeAttr("aria-haspopup").children().each(function(){var t=e(this);t.data("ui-menu-submenu-carat")&&t.remove()}),this.element.find(".ui-menu-divider").removeClass("ui-menu-divider ui-widget-content")},_keydown:function(t){function a(e){return e.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")}var n,r,i,s,o,u=!0;switch(t.keyCode){case e.ui.keyCode.PAGE_UP:this.previousPage(t);break;case e.ui.keyCode.PAGE_DOWN:this.nextPage(t);break;case e.ui.keyCode.HOME:this._move("first","first",t);break;case e.ui.keyCode.END:this._move("last","last",t);break;case e.ui.keyCode.UP:this.previous(t);break;case e.ui.keyCode.DOWN:this.next(t);break;case e.ui.keyCode.LEFT:this.collapse(t);break;case e.ui.keyCode.RIGHT:this.active&&!this.active.is(".ui-state-disabled")&&this.expand(t);break;case e.ui.keyCode.ENTER:case e.ui.keyCode.SPACE:this._activate(t);break;case e.ui.keyCode.ESCAPE:this.collapse(t);break;default:u=!1,r=this.previousFilter||"",i=String.fromCharCode(t.keyCode),s=!1,clearTimeout(this.filterTimer),i===r?s=!0:i=r+i,o=new RegExp("^"+a(i),"i"),n=this.activeMenu.children(".ui-menu-item").filter(function(){return o.test(e(this).children("a").text())}),n=s&&n.index(this.active.next())!==-1?this.active.nextAll(".ui-menu-item"):n,n.length||(i=String.fromCharCode(t.keyCode),o=new RegExp("^"+a(i),"i"),n=this.activeMenu.children(".ui-menu-item").filter(function(){return o.test(e(this).children("a").text())})),n.length?(this.focus(t,n),n.length>1?(this.previousFilter=i,this.filterTimer=this._delay(function(){delete this.previousFilter},1e3)):delete this.previousFilter):delete this.previousFilter}u&&t.preventDefault()},_activate:function(e){this.active.is(".ui-state-disabled")||(this.active.children("a[aria-haspopup='true']").length?this.expand(e):this.select(e))},refresh:function(){var t,n=this.options.icons.submenu,r=this.element.find(this.options.menus);r.filter(":not(.ui-menu)").addClass("ui-menu ui-widget ui-widget-content ui-corner-all").hide().attr({role:this.options.role,"aria-hidden":"true","aria-expanded":"false"}).each(function(){var t=e(this),r=t.prev("a"),i=e("<span>").addClass("ui-menu-icon ui-icon "+n).data("ui-menu-submenu-carat",!0);r.attr("aria-haspopup","true").prepend(i),t.attr("aria-labelledby",r.attr("id"))}),t=r.add(this.element),t.children(":not(.ui-menu-item):has(a)").addClass("ui-menu-item").attr("role","presentation").children("a").uniqueId().addClass("ui-corner-all").attr({tabIndex:-1,role:this._itemRole()}),t.children(":not(.ui-menu-item)").each(function(){var t=e(this);/[^\-—–\s]/.test(t.text())||t.addClass("ui-widget-content ui-menu-divider")}),t.children(".ui-state-disabled").attr("aria-disabled","true"),this.active&&!e.contains(this.element[0],this.active[0])&&this.blur()},_itemRole:function(){return{menu:"menuitem",listbox:"option"}[this.options.role]},focus:function(e,t){var n,r;this.blur(e,e&&e.type==="focus"),this._scrollIntoView(t),this.active=t.first(),r=this.active.children("a").addClass("ui-state-focus"),this.options.role&&this.element.attr("aria-activedescendant",r.attr("id")),this.active.parent().closest(".ui-menu-item").children("a:first").addClass("ui-state-active"),e&&e.type==="keydown"?this._close():this.timer=this._delay(function(){this._close()},this.delay),n=t.children(".ui-menu"),n.length&&/^mouse/.test(e.type)&&this._startOpening(n),this.activeMenu=t.parent(),this._trigger("focus",e,{item:t})},_scrollIntoView:function(t){var n,r,i,s,o,u;this._hasScroll()&&(n=parseFloat(e.css(this.activeMenu[0],"borderTopWidth"))||0,r=parseFloat(e.css(this.activeMenu[0],"paddingTop"))||0,i=t.offset().top-this.activeMenu.offset().top-n-r,s=this.activeMenu.scrollTop(),o=this.activeMenu.height(),u=t.height(),i<0?this.activeMenu.scrollTop(s+i):i+u>o&&this.activeMenu.scrollTop(s+i-o+u))},blur:function(e,t){t||clearTimeout(this.timer);if(!this.active)return;this.active.children("a").removeClass("ui-state-focus"),this.active=null,this._trigger("blur",e,{item:this.active})},_startOpening:function(e){clearTimeout(this.timer);if(e.attr("aria-hidden")!=="true")return;this.timer=this._delay(function(){this._close(),this._open(e)},this.delay)},_open:function(t){var n=e.extend({of:this.active},this.options.position);clearTimeout(this.timer),this.element.find(".ui-menu").not(t.parents(".ui-menu")).hide().attr("aria-hidden","true"),t.show().removeAttr("aria-hidden").attr("aria-expanded","true").position(n)},collapseAll:function(t,n){clearTimeout(this.timer),this.timer=this._delay(function(){var r=n?this.element:e(t&&t.target).closest(this.element.find(".ui-menu"));r.length||(r=this.element),this._close(r),this.blur(t),this.activeMenu=r},this.delay)},_close:function(e){e||(e=this.active?this.active.parent():this.element),e.find(".ui-menu").hide().attr("aria-hidden","true").attr("aria-expanded","false").end().find("a.ui-state-active").removeClass("ui-state-active")},collapse:function(e){var t=this.active&&this.active.parent().closest(".ui-menu-item",this.element);t&&t.length&&(this._close(),this.focus(e,t))},expand:function(e){var t=this.active&&this.active.children(".ui-menu ").children(".ui-menu-item").first();t&&t.length&&(this._open(t.parent()),this._delay(function(){this.focus(e,t)}))},next:function(e){this._move("next","first",e)},previous:function(e){this._move("prev","last",e)},isFirstItem:function(){return this.active&&!this.active.prevAll(".ui-menu-item").length},isLastItem:function(){return this.active&&!this.active.nextAll(".ui-menu-item").length},_move:function(e,t,n){var r;this.active&&(e==="first"||e==="last"?r=this.active[e==="first"?"prevAll":"nextAll"](".ui-menu-item").eq(-1):r=this.active[e+"All"](".ui-menu-item").eq(0));if(!r||!r.length||!this.active)r=this.activeMenu.children(".ui-menu-item")[t]();this.focus(n,r)},nextPage:function(t){var n,r,i;if(!this.active){this.next(t);return}if(this.isLastItem())return;this._hasScroll()?(r=this.active.offset().top,i=this.element.height(),this.active.nextAll(".ui-menu-item").each(function(){return n=e(this),n.offset().top-r-i<0}),this.focus(t,n)):this.focus(t,this.activeMenu.children(".ui-menu-item")[this.active?"last":"first"]())},previousPage:function(t){var n,r,i;if(!this.active){this.next(t);return}if(this.isFirstItem())return;this._hasScroll()?(r=this.active.offset().top,i=this.element.height(),this.active.prevAll(".ui-menu-item").each(function(){return n=e(this),n.offset().top-r+i>0}),this.focus(t,n)):this.focus(t,this.activeMenu.children(".ui-menu-item").first())},_hasScroll:function(){return this.element.outerHeight()<this.element.prop("scrollHeight")},select:function(t){this.active=this.active||e(t.target).closest(".ui-menu-item");var n={item:this.active};this.active.has(".ui-menu").length||this.collapseAll(t,!0),this._trigger("select",t,n)}})})(jQuery);(function(e,t){e.widget("ui.progressbar",{version:"1.9.2",options:{value:0,max:100},min:0,_create:function(){this.element.addClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").attr({role:"progressbar","aria-valuemin":this.min,"aria-valuemax":this.options.max,"aria-valuenow":this._value()}),this.valueDiv=e("<div class='ui-progressbar-value ui-widget-header ui-corner-left'></div>").appendTo(this.element),this.oldValue=this._value(),this._refreshValue()},_destroy:function(){this.element.removeClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").removeAttr("role").removeAttr("aria-valuemin").removeAttr("aria-valuemax").removeAttr("aria-valuenow"),this.valueDiv.remove()},value:function(e){return e===t?this._value():(this._setOption("value",e),this)},_setOption:function(e,t){e==="value"&&(this.options.value=t,this._refreshValue(),this._value()===this.options.max&&this._trigger("complete")),this._super(e,t)},_value:function(){var e=this.options.value;return typeof e!="number"&&(e=0),Math.min(this.options.max,Math.max(this.min,e))},_percentage:function(){return 100*this._value()/this.options.max},_refreshValue:function(){var e=this.value(),t=this._percentage();this.oldValue!==e&&(this.oldValue=e,this._trigger("change")),this.valueDiv.toggle(e>this.min).toggleClass("ui-corner-right",e===this.options.max).width(t.toFixed(0)+"%"),this.element.attr("aria-valuenow",e)}})})(jQuery);(function(e,t){var n=5;e.widget("ui.slider",e.ui.mouse,{version:"1.9.2",widgetEventPrefix:"slide",options:{animate:!1,distance:0,max:100,min:0,orientation:"horizontal",range:!1,step:1,value:0,values:null},_create:function(){var t,r,i=this.options,s=this.element.find(".ui-slider-handle").addClass("ui-state-default ui-corner-all"),o="<a class='ui-slider-handle ui-state-default ui-corner-all' href='#'></a>",u=[];this._keySliding=!1,this._mouseSliding=!1,this._animateOff=!0,this._handleIndex=null,this._detectOrientation(),this._mouseInit(),this.element.addClass("ui-slider ui-slider-"+this.orientation+" ui-widget"+" ui-widget-content"+" ui-corner-all"+(i.disabled?" ui-slider-disabled ui-disabled":"")),this.range=e([]),i.range&&(i.range===!0&&(i.values||(i.values=[this._valueMin(),this._valueMin()]),i.values.length&&i.values.length!==2&&(i.values=[i.values[0],i.values[0]])),this.range=e("<div></div>").appendTo(this.element).addClass("ui-slider-range ui-widget-header"+(i.range==="min"||i.range==="max"?" ui-slider-range-"+i.range:""))),r=i.values&&i.values.length||1;for(t=s.length;t<r;t++)u.push(o);this.handles=s.add(e(u.join("")).appendTo(this.element)),this.handle=this.handles.eq(0),this.handles.add(this.range).filter("a").click(function(e){e.preventDefault()}).mouseenter(function(){i.disabled||e(this).addClass("ui-state-hover")}).mouseleave(function(){e(this).removeClass("ui-state-hover")}).focus(function(){i.disabled?e(this).blur():(e(".ui-slider .ui-state-focus").removeClass("ui-state-focus"),e(this).addClass("ui-state-focus"))}).blur(function(){e(this).removeClass("ui-state-focus")}),this.handles.each(function(t){e(this).data("ui-slider-handle-index",t)}),this._on(this.handles,{keydown:function(t){var r,i,s,o,u=e(t.target).data("ui-slider-handle-index");switch(t.keyCode){case e.ui.keyCode.HOME:case e.ui.keyCode.END:case e.ui.keyCode.PAGE_UP:case e.ui.keyCode.PAGE_DOWN:case e.ui.keyCode.UP:case e.ui.keyCode.RIGHT:case e.ui.keyCode.DOWN:case e.ui.keyCode.LEFT:t.preventDefault();if(!this._keySliding){this._keySliding=!0,e(t.target).addClass("ui-state-active"),r=this._start(t,u);if(r===!1)return}}o=this.options.step,this.options.values&&this.options.values.length?i=s=this.values(u):i=s=this.value();switch(t.keyCode){case e.ui.keyCode.HOME:s=this._valueMin();break;case e.ui.keyCode.END:s=this._valueMax();break;case e.ui.keyCode.PAGE_UP:s=this._trimAlignValue(i+(this._valueMax()-this._valueMin())/n);break;case e.ui.keyCode.PAGE_DOWN:s=this._trimAlignValue(i-(this._valueMax()-this._valueMin())/n);break;case e.ui.keyCode.UP:case e.ui.keyCode.RIGHT:if(i===this._valueMax())return;s=this._trimAlignValue(i+o);break;case e.ui.keyCode.DOWN:case e.ui.keyCode.LEFT:if(i===this._valueMin())return;s=this._trimAlignValue(i-o)}this._slide(t,u,s)},keyup:function(t){var n=e(t.target).data("ui-slider-handle-index");this._keySliding&&(this._keySliding=!1,this._stop(t,n),this._change(t,n),e(t.target).removeClass("ui-state-active"))}}),this._refreshValue(),this._animateOff=!1},_destroy:function(){this.handles.remove(),this.range.remove(),this.element.removeClass("ui-slider ui-slider-horizontal ui-slider-vertical ui-slider-disabled ui-widget ui-widget-content ui-corner-all"),this._mouseDestroy()},_mouseCapture:function(t){var n,r,i,s,o,u,a,f,l=this,c=this.options;return c.disabled?!1:(this.elementSize={width:this.element.outerWidth(),height:this.element.outerHeight()},this.elementOffset=this.element.offset(),n={x:t.pageX,y:t.pageY},r=this._normValueFromMouse(n),i=this._valueMax()-this._valueMin()+1,this.handles.each(function(t){var n=Math.abs(r-l.values(t));i>n&&(i=n,s=e(this),o=t)}),c.range===!0&&this.values(1)===c.min&&(o+=1,s=e(this.handles[o])),u=this._start(t,o),u===!1?!1:(this._mouseSliding=!0,this._handleIndex=o,s.addClass("ui-state-active").focus(),a=s.offset(),f=!e(t.target).parents().andSelf().is(".ui-slider-handle"),this._clickOffset=f?{left:0,top:0}:{left:t.pageX-a.left-s.width()/2,top:t.pageY-a.top-s.height()/2-(parseInt(s.css("borderTopWidth"),10)||0)-(parseInt(s.css("borderBottomWidth"),10)||0)+(parseInt(s.css("marginTop"),10)||0)},this.handles.hasClass("ui-state-hover")||this._slide(t,o,r),this._animateOff=!0,!0))},_mouseStart:function(){return!0},_mouseDrag:function(e){var t={x:e.pageX,y:e.pageY},n=this._normValueFromMouse(t);return this._slide(e,this._handleIndex,n),!1},_mouseStop:function(e){return this.handles.removeClass("ui-state-active"),this._mouseSliding=!1,this._stop(e,this._handleIndex),this._change(e,this._handleIndex),this._handleIndex=null,this._clickOffset=null,this._animateOff=!1,!1},_detectOrientation:function(){this.orientation=this.options.orientation==="vertical"?"vertical":"horizontal"},_normValueFromMouse:function(e){var t,n,r,i,s;return this.orientation==="horizontal"?(t=this.elementSize.width,n=e.x-this.elementOffset.left-(this._clickOffset?this._clickOffset.left:0)):(t=this.elementSize.height,n=e.y-this.elementOffset.top-(this._clickOffset?this._clickOffset.top:0)),r=n/t,r>1&&(r=1),r<0&&(r=0),this.orientation==="vertical"&&(r=1-r),i=this._valueMax()-this._valueMin(),s=this._valueMin()+r*i,this._trimAlignValue(s)},_start:function(e,t){var n={handle:this.handles[t],value:this.value()};return this.options.values&&this.options.values.length&&(n.value=this.values(t),n.values=this.values()),this._trigger("start",e,n)},_slide:function(e,t,n){var r,i,s;this.options.values&&this.options.values.length?(r=this.values(t?0:1),this.options.values.length===2&&this.options.range===!0&&(t===0&&n>r||t===1&&n<r)&&(n=r),n!==this.values(t)&&(i=this.values(),i[t]=n,s=this._trigger("slide",e,{handle:this.handles[t],value:n,values:i}),r=this.values(t?0:1),s!==!1&&this.values(t,n,!0))):n!==this.value()&&(s=this._trigger("slide",e,{handle:this.handles[t],value:n}),s!==!1&&this.value(n))},_stop:function(e,t){var n={handle:this.handles[t],value:this.value()};this.options.values&&this.options.values.length&&(n.value=this.values(t),n.values=this.values()),this._trigger("stop",e,n)},_change:function(e,t){if(!this._keySliding&&!this._mouseSliding){var n={handle:this.handles[t],value:this.value()};this.options.values&&this.options.values.length&&(n.value=this.values(t),n.values=this.values()),this._trigger("change",e,n)}},value:function(e){if(arguments.length){this.options.value=this._trimAlignValue(e),this._refreshValue(),this._change(null,0);return}return this._value()},values:function(t,n){var r,i,s;if(arguments.length>1){this.options.values[t]=this._trimAlignValue(n),this._refreshValue(),this._change(null,t);return}if(!arguments.length)return this._values();if(!e.isArray(arguments[0]))return this.options.values&&this.options.values.length?this._values(t):this.value();r=this.options.values,i=arguments[0];for(s=0;s<r.length;s+=1)r[s]=this._trimAlignValue(i[s]),this._change(null,s);this._refreshValue()},_setOption:function(t,n){var r,i=0;e.isArray(this.options.values)&&(i=this.options.values.length),e.Widget.prototype._setOption.apply(this,arguments);switch(t){case"disabled":n?(this.handles.filter(".ui-state-focus").blur(),this.handles.removeClass("ui-state-hover"),this.handles.prop("disabled",!0),this.element.addClass("ui-disabled")):(this.handles.prop("disabled",!1),this.element.removeClass("ui-disabled"));break;case"orientation":this._detectOrientation(),this.element.removeClass("ui-slider-horizontal ui-slider-vertical").addClass("ui-slider-"+this.orientation),this._refreshValue();break;case"value":this._animateOff=!0,this._refreshValue(),this._change(null,0),this._animateOff=!1;break;case"values":this._animateOff=!0,this._refreshValue();for(r=0;r<i;r+=1)this._change(null,r);this._animateOff=!1;break;case"min":case"max":this._animateOff=!0,this._refreshValue(),this._animateOff=!1}},_value:function(){var e=this.options.value;return e=this._trimAlignValue(e),e},_values:function(e){var t,n,r;if(arguments.length)return t=this.options.values[e],t=this._trimAlignValue(t),t;n=this.options.values.slice();for(r=0;r<n.length;r+=1)n[r]=this._trimAlignValue(n[r]);return n},_trimAlignValue:function(e){if(e<=this._valueMin())return this._valueMin();if(e>=this._valueMax())return this._valueMax();var t=this.options.step>0?this.options.step:1,n=(e-this._valueMin())%t,r=e-n;return Math.abs(n)*2>=t&&(r+=n>0?t:-t),parseFloat(r.toFixed(5))},_valueMin:function(){return this.options.min},_valueMax:function(){return this.options.max},_refreshValue:function(){var t,n,r,i,s,o=this.options.range,u=this.options,a=this,f=this._animateOff?!1:u.animate,l={};this.options.values&&this.options.values.length?this.handles.each(function(r){n=(a.values(r)-a._valueMin())/(a._valueMax()-a._valueMin())*100,l[a.orientation==="horizontal"?"left":"bottom"]=n+"%",e(this).stop(1,1)[f?"animate":"css"](l,u.animate),a.options.range===!0&&(a.orientation==="horizontal"?(r===0&&a.range.stop(1,1)[f?"animate":"css"]({left:n+"%"},u.animate),r===1&&a.range[f?"animate":"css"]({width:n-t+"%"},{queue:!1,duration:u.animate})):(r===0&&a.range.stop(1,1)[f?"animate":"css"]({bottom:n+"%"},u.animate),r===1&&a.range[f?"animate":"css"]({height:n-t+"%"},{queue:!1,duration:u.animate}))),t=n}):(r=this.value(),i=this._valueMin(),s=this._valueMax(),n=s!==i?(r-i)/(s-i)*100:0,l[this.orientation==="horizontal"?"left":"bottom"]=n+"%",this.handle.stop(1,1)[f?"animate":"css"](l,u.animate),o==="min"&&this.orientation==="horizontal"&&this.range.stop(1,1)[f?"animate":"css"]({width:n+"%"},u.animate),o==="max"&&this.orientation==="horizontal"&&this.range[f?"animate":"css"]({width:100-n+"%"},{queue:!1,duration:u.animate}),o==="min"&&this.orientation==="vertical"&&this.range.stop(1,1)[f?"animate":"css"]({height:n+"%"},u.animate),o==="max"&&this.orientation==="vertical"&&this.range[f?"animate":"css"]({height:100-n+"%"},{queue:!1,duration:u.animate}))}})})(jQuery);(function(e){function t(e){return function(){var t=this.element.val();e.apply(this,arguments),this._refresh(),t!==this.element.val()&&this._trigger("change")}}e.widget("ui.spinner",{version:"1.9.2",defaultElement:"<input>",widgetEventPrefix:"spin",options:{culture:null,icons:{down:"ui-icon-triangle-1-s",up:"ui-icon-triangle-1-n"},incremental:!0,max:null,min:null,numberFormat:null,page:10,step:1,change:null,spin:null,start:null,stop:null},_create:function(){this._setOption("max",this.options.max),this._setOption("min",this.options.min),this._setOption("step",this.options.step),this._value(this.element.val(),!0),this._draw(),this._on(this._events),this._refresh(),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_getCreateOptions:function(){var t={},n=this.element;return e.each(["min","max","step"],function(e,r){var i=n.attr(r);i!==undefined&&i.length&&(t[r]=i)}),t},_events:{keydown:function(e){this._start(e)&&this._keydown(e)&&e.preventDefault()},keyup:"_stop",focus:function(){this.previous=this.element.val()},blur:function(e){if(this.cancelBlur){delete this.cancelBlur;return}this._refresh(),this.previous!==this.element.val()&&this._trigger("change",e)},mousewheel:function(e,t){if(!t)return;if(!this.spinning&&!this._start(e))return!1;this._spin((t>0?1:-1)*this.options.step,e),clearTimeout(this.mousewheelTimer),this.mousewheelTimer=this._delay(function(){this.spinning&&this._stop(e)},100),e.preventDefault()},"mousedown .ui-spinner-button":function(t){function r(){var e=this.element[0]===this.document[0].activeElement;e||(this.element.focus(),this.previous=n,this._delay(function(){this.previous=n}))}var n;n=this.element[0]===this.document[0].activeElement?this.previous:this.element.val(),t.preventDefault(),r.call(this),this.cancelBlur=!0,this._delay(function(){delete this.cancelBlur,r.call(this)});if(this._start(t)===!1)return;this._repeat(null,e(t.currentTarget).hasClass("ui-spinner-up")?1:-1,t)},"mouseup .ui-spinner-button":"_stop","mouseenter .ui-spinner-button":function(t){if(!e(t.currentTarget).hasClass("ui-state-active"))return;if(this._start(t)===!1)return!1;this._repeat(null,e(t.currentTarget).hasClass("ui-spinner-up")?1:-1,t)},"mouseleave .ui-spinner-button":"_stop"},_draw:function(){var e=this.uiSpinner=this.element.addClass("ui-spinner-input").attr("autocomplete","off").wrap(this._uiSpinnerHtml()).parent().append(this._buttonHtml());this.element.attr("role","spinbutton"),this.buttons=e.find(".ui-spinner-button").attr("tabIndex",-1).button().removeClass("ui-corner-all"),this.buttons.height()>Math.ceil(e.height()*.5)&&e.height()>0&&e.height(e.height()),this.options.disabled&&this.disable()},_keydown:function(t){var n=this.options,r=e.ui.keyCode;switch(t.keyCode){case r.UP:return this._repeat(null,1,t),!0;case r.DOWN:return this._repeat(null,-1,t),!0;case r.PAGE_UP:return this._repeat(null,n.page,t),!0;case r.PAGE_DOWN:return this._repeat(null,-n.page,t),!0}return!1},_uiSpinnerHtml:function(){return"<span class='ui-spinner ui-widget ui-widget-content ui-corner-all'></span>"},_buttonHtml:function(){return"<a class='ui-spinner-button ui-spinner-up ui-corner-tr'><span class='ui-icon "+this.options.icons.up+"'>&#9650;</span>"+"</a>"+"<a class='ui-spinner-button ui-spinner-down ui-corner-br'>"+"<span class='ui-icon "+this.options.icons.down+"'>&#9660;</span>"+"</a>"},_start:function(e){return!this.spinning&&this._trigger("start",e)===!1?!1:(this.counter||(this.counter=1),this.spinning=!0,!0)},_repeat:function(e,t,n){e=e||500,clearTimeout(this.timer),this.timer=this._delay(function(){this._repeat(40,t,n)},e),this._spin(t*this.options.step,n)},_spin:function(e,t){var n=this.value()||0;this.counter||(this.counter=1),n=this._adjustValue(n+e*this._increment(this.counter));if(!this.spinning||this._trigger("spin",t,{value:n})!==!1)this._value(n),this.counter++},_increment:function(t){var n=this.options.incremental;return n?e.isFunction(n)?n(t):Math.floor(t*t*t/5e4-t*t/500+17*t/200+1):1},_precision:function(){var e=this._precisionOf(this.options.step);return this.options.min!==null&&(e=Math.max(e,this._precisionOf(this.options.min))),e},_precisionOf:function(e){var t=e.toString(),n=t.indexOf(".");return n===-1?0:t.length-n-1},_adjustValue:function(e){var t,n,r=this.options;return t=r.min!==null?r.min:0,n=e-t,n=Math.round(n/r.step)*r.step,e=t+n,e=parseFloat(e.toFixed(this._precision())),r.max!==null&&e>r.max?r.max:r.min!==null&&e<r.min?r.min:e},_stop:function(e){if(!this.spinning)return;clearTimeout(this.timer),clearTimeout(this.mousewheelTimer),this.counter=0,this.spinning=!1,this._trigger("stop",e)},_setOption:function(e,t){if(e==="culture"||e==="numberFormat"){var n=this._parse(this.element.val());this.options[e]=t,this.element.val(this._format(n));return}(e==="max"||e==="min"||e==="step")&&typeof t=="string"&&(t=this._parse(t)),this._super(e,t),e==="disabled"&&(t?(this.element.prop("disabled",!0),this.buttons.button("disable")):(this.element.prop("disabled",!1),this.buttons.button("enable")))},_setOptions:t(function(e){this._super(e),this._value(this.element.val())}),_parse:function(e){return typeof e=="string"&&e!==""&&(e=window.Globalize&&this.options.numberFormat?Globalize.parseFloat(e,10,this.options.culture):+e),e===""||isNaN(e)?null:e},_format:function(e){return e===""?"":window.Globalize&&this.options.numberFormat?Globalize.format(e,this.options.numberFormat,this.options.culture):e},_refresh:function(){this.element.attr({"aria-valuemin":this.options.min,"aria-valuemax":this.options.max,"aria-valuenow":this._parse(this.element.val())})},_value:function(e,t){var n;e!==""&&(n=this._parse(e),n!==null&&(t||(n=this._adjustValue(n)),e=this._format(n))),this.element.val(e),this._refresh()},_destroy:function(){this.element.removeClass("ui-spinner-input").prop("disabled",!1).removeAttr("autocomplete").removeAttr("role").removeAttr("aria-valuemin").removeAttr("aria-valuemax").removeAttr("aria-valuenow"),this.uiSpinner.replaceWith(this.element)},stepUp:t(function(e){this._stepUp(e)}),_stepUp:function(e){this._spin((e||1)*this.options.step)},stepDown:t(function(e){this._stepDown(e)}),_stepDown:function(e){this._spin((e||1)*-this.options.step)},pageUp:t(function(e){this._stepUp((e||1)*this.options.page)}),pageDown:t(function(e){this._stepDown((e||1)*this.options.page)}),value:function(e){if(!arguments.length)return this._parse(this.element.val());t(this._value).call(this,e)},widget:function(){return this.uiSpinner}})})(jQuery);(function(e,t){function i(){return++n}function s(e){return e.hash.length>1&&e.href.replace(r,"")===location.href.replace(r,"").replace(/\s/g,"%20")}var n=0,r=/#.*$/;e.widget("ui.tabs",{version:"1.9.2",delay:300,options:{active:null,collapsible:!1,event:"click",heightStyle:"content",hide:null,show:null,activate:null,beforeActivate:null,beforeLoad:null,load:null},_create:function(){var t=this,n=this.options,r=n.active,i=location.hash.substring(1);this.running=!1,this.element.addClass("ui-tabs ui-widget ui-widget-content ui-corner-all").toggleClass("ui-tabs-collapsible",n.collapsible).delegate(".ui-tabs-nav > li","mousedown"+this.eventNamespace,function(t){e(this).is(".ui-state-disabled")&&t.preventDefault()}).delegate(".ui-tabs-anchor","focus"+this.eventNamespace,function(){e(this).closest("li").is(".ui-state-disabled")&&this.blur()}),this._processTabs();if(r===null){i&&this.tabs.each(function(t,n){if(e(n).attr("aria-controls")===i)return r=t,!1}),r===null&&(r=this.tabs.index(this.tabs.filter(".ui-tabs-active")));if(r===null||r===-1)r=this.tabs.length?0:!1}r!==!1&&(r=this.tabs.index(this.tabs.eq(r)),r===-1&&(r=n.collapsible?!1:0)),n.active=r,!n.collapsible&&n.active===!1&&this.anchors.length&&(n.active=0),e.isArray(n.disabled)&&(n.disabled=e.unique(n.disabled.concat(e.map(this.tabs.filter(".ui-state-disabled"),function(e){return t.tabs.index(e)}))).sort()),this.options.active!==!1&&this.anchors.length?this.active=this._findActive(this.options.active):this.active=e(),this._refresh(),this.active.length&&this.load(n.active)},_getCreateEventData:function(){return{tab:this.active,panel:this.active.length?this._getPanelForTab(this.active):e()}},_tabKeydown:function(t){var n=e(this.document[0].activeElement).closest("li"),r=this.tabs.index(n),i=!0;if(this._handlePageNav(t))return;switch(t.keyCode){case e.ui.keyCode.RIGHT:case e.ui.keyCode.DOWN:r++;break;case e.ui.keyCode.UP:case e.ui.keyCode.LEFT:i=!1,r--;break;case e.ui.keyCode.END:r=this.anchors.length-1;break;case e.ui.keyCode.HOME:r=0;break;case e.ui.keyCode.SPACE:t.preventDefault(),clearTimeout(this.activating),this._activate(r);return;case e.ui.keyCode.ENTER:t.preventDefault(),clearTimeout(this.activating),this._activate(r===this.options.active?!1:r);return;default:return}t.preventDefault(),clearTimeout(this.activating),r=this._focusNextTab(r,i),t.ctrlKey||(n.attr("aria-selected","false"),this.tabs.eq(r).attr("aria-selected","true"),this.activating=this._delay(function(){this.option("active",r)},this.delay))},_panelKeydown:function(t){if(this._handlePageNav(t))return;t.ctrlKey&&t.keyCode===e.ui.keyCode.UP&&(t.preventDefault(),this.active.focus())},_handlePageNav:function(t){if(t.altKey&&t.keyCode===e.ui.keyCode.PAGE_UP)return this._activate(this._focusNextTab(this.options.active-1,!1)),!0;if(t.altKey&&t.keyCode===e.ui.keyCode.PAGE_DOWN)return this._activate(this._focusNextTab(this.options.active+1,!0)),!0},_findNextTab:function(t,n){function i(){return t>r&&(t=0),t<0&&(t=r),t}var r=this.tabs.length-1;while(e.inArray(i(),this.options.disabled)!==-1)t=n?t+1:t-1;return t},_focusNextTab:function(e,t){return e=this._findNextTab(e,t),this.tabs.eq(e).focus(),e},_setOption:function(e,t){if(e==="active"){this._activate(t);return}if(e==="disabled"){this._setupDisabled(t);return}this._super(e,t),e==="collapsible"&&(this.element.toggleClass("ui-tabs-collapsible",t),!t&&this.options.active===!1&&this._activate(0)),e==="event"&&this._setupEvents(t),e==="heightStyle"&&this._setupHeightStyle(t)},_tabId:function(e){return e.attr("aria-controls")||"ui-tabs-"+i()},_sanitizeSelector:function(e){return e?e.replace(/[!"$%&'()*+,.\/:;<=>?@\[\]\^`{|}~]/g,"\\$&"):""},refresh:function(){var t=this.options,n=this.tablist.children(":has(a[href])");t.disabled=e.map(n.filter(".ui-state-disabled"),function(e){return n.index(e)}),this._processTabs(),t.active===!1||!this.anchors.length?(t.active=!1,this.active=e()):this.active.length&&!e.contains(this.tablist[0],this.active[0])?this.tabs.length===t.disabled.length?(t.active=!1,this.active=e()):this._activate(this._findNextTab(Math.max(0,t.active-1),!1)):t.active=this.tabs.index(this.active),this._refresh()},_refresh:function(){this._setupDisabled(this.options.disabled),this._setupEvents(this.options.event),this._setupHeightStyle(this.options.heightStyle),this.tabs.not(this.active).attr({"aria-selected":"false",tabIndex:-1}),this.panels.not(this._getPanelForTab(this.active)).hide().attr({"aria-expanded":"false","aria-hidden":"true"}),this.active.length?(this.active.addClass("ui-tabs-active ui-state-active").attr({"aria-selected":"true",tabIndex:0}),this._getPanelForTab(this.active).show().attr({"aria-expanded":"true","aria-hidden":"false"})):this.tabs.eq(0).attr("tabIndex",0)},_processTabs:function(){var t=this;this.tablist=this._getList().addClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all").attr("role","tablist"),this.tabs=this.tablist.find("> li:has(a[href])").addClass("ui-state-default ui-corner-top").attr({role:"tab",tabIndex:-1}),this.anchors=this.tabs.map(function(){return e("a",this)[0]}).addClass("ui-tabs-anchor").attr({role:"presentation",tabIndex:-1}),this.panels=e(),this.anchors.each(function(n,r){var i,o,u,a=e(r).uniqueId().attr("id"),f=e(r).closest("li"),l=f.attr("aria-controls");s(r)?(i=r.hash,o=t.element.find(t._sanitizeSelector(i))):(u=t._tabId(f),i="#"+u,o=t.element.find(i),o.length||(o=t._createPanel(u),o.insertAfter(t.panels[n-1]||t.tablist)),o.attr("aria-live","polite")),o.length&&(t.panels=t.panels.add(o)),l&&f.data("ui-tabs-aria-controls",l),f.attr({"aria-controls":i.substring(1),"aria-labelledby":a}),o.attr("aria-labelledby",a)}),this.panels.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").attr("role","tabpanel")},_getList:function(){return this.element.find("ol,ul").eq(0)},_createPanel:function(t){return e("<div>").attr("id",t).addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").data("ui-tabs-destroy",!0)},_setupDisabled:function(t){e.isArray(t)&&(t.length?t.length===this.anchors.length&&(t=!0):t=!1);for(var n=0,r;r=this.tabs[n];n++)t===!0||e.inArray(n,t)!==-1?e(r).addClass("ui-state-disabled").attr("aria-disabled","true"):e(r).removeClass("ui-state-disabled").removeAttr("aria-disabled");this.options.disabled=t},_setupEvents:function(t){var n={click:function(e){e.preventDefault()}};t&&e.each(t.split(" "),function(e,t){n[t]="_eventHandler"}),this._off(this.anchors.add(this.tabs).add(this.panels)),this._on(this.anchors,n),this._on(this.tabs,{keydown:"_tabKeydown"}),this._on(this.panels,{keydown:"_panelKeydown"}),this._focusable(this.tabs),this._hoverable(this.tabs)},_setupHeightStyle:function(t){var n,r,i=this.element.parent();t==="fill"?(e.support.minHeight||(r=i.css("overflow"),i.css("overflow","hidden")),n=i.height(),this.element.siblings(":visible").each(function(){var t=e(this),r=t.css("position");if(r==="absolute"||r==="fixed")return;n-=t.outerHeight(!0)}),r&&i.css("overflow",r),this.element.children().not(this.panels).each(function(){n-=e(this).outerHeight(!0)}),this.panels.each(function(){e(this).height(Math.max(0,n-e(this).innerHeight()+e(this).height()))}).css("overflow","auto")):t==="auto"&&(n=0,this.panels.each(function(){n=Math.max(n,e(this).height("").height())}).height(n))},_eventHandler:function(t){var n=this.options,r=this.active,i=e(t.currentTarget),s=i.closest("li"),o=s[0]===r[0],u=o&&n.collapsible,a=u?e():this._getPanelForTab(s),f=r.length?this._getPanelForTab(r):e(),l={oldTab:r,oldPanel:f,newTab:u?e():s,newPanel:a};t.preventDefault();if(s.hasClass("ui-state-disabled")||s.hasClass("ui-tabs-loading")||this.running||o&&!n.collapsible||this._trigger("beforeActivate",t,l)===!1)return;n.active=u?!1:this.tabs.index(s),this.active=o?e():s,this.xhr&&this.xhr.abort(),!f.length&&!a.length&&e.error("jQuery UI Tabs: Mismatching fragment identifier."),a.length&&this.load(this.tabs.index(s),t),this._toggle(t,l)},_toggle:function(t,n){function o(){r.running=!1,r._trigger("activate",t,n)}function u(){n.newTab.closest("li").addClass("ui-tabs-active ui-state-active"),i.length&&r.options.show?r._show(i,r.options.show,o):(i.show(),o())}var r=this,i=n.newPanel,s=n.oldPanel;this.running=!0,s.length&&this.options.hide?this._hide(s,this.options.hide,function(){n.oldTab.closest("li").removeClass("ui-tabs-active ui-state-active"),u()}):(n.oldTab.closest("li").removeClass("ui-tabs-active ui-state-active"),s.hide(),u()),s.attr({"aria-expanded":"false","aria-hidden":"true"}),n.oldTab.attr("aria-selected","false"),i.length&&s.length?n.oldTab.attr("tabIndex",-1):i.length&&this.tabs.filter(function(){return e(this).attr("tabIndex")===0}).attr("tabIndex",-1),i.attr({"aria-expanded":"true","aria-hidden":"false"}),n.newTab.attr({"aria-selected":"true",tabIndex:0})},_activate:function(t){var n,r=this._findActive(t);if(r[0]===this.active[0])return;r.length||(r=this.active),n=r.find(".ui-tabs-anchor")[0],this._eventHandler({target:n,currentTarget:n,preventDefault:e.noop})},_findActive:function(t){return t===!1?e():this.tabs.eq(t)},_getIndex:function(e){return typeof e=="string"&&(e=this.anchors.index(this.anchors.filter("[href$='"+e+"']"))),e},_destroy:function(){this.xhr&&this.xhr.abort(),this.element.removeClass("ui-tabs ui-widget ui-widget-content ui-corner-all ui-tabs-collapsible"),this.tablist.removeClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all").removeAttr("role"),this.anchors.removeClass("ui-tabs-anchor").removeAttr("role").removeAttr("tabIndex").removeData("href.tabs").removeData("load.tabs").removeUniqueId(),this.tabs.add(this.panels).each(function(){e.data(this,"ui-tabs-destroy")?e(this).remove():e(this).removeClass("ui-state-default ui-state-active ui-state-disabled ui-corner-top ui-corner-bottom ui-widget-content ui-tabs-active ui-tabs-panel").removeAttr("tabIndex").removeAttr("aria-live").removeAttr("aria-busy").removeAttr("aria-selected").removeAttr("aria-labelledby").removeAttr("aria-hidden").removeAttr("aria-expanded").removeAttr("role")}),this.tabs.each(function(){var t=e(this),n=t.data("ui-tabs-aria-controls");n?t.attr("aria-controls",n):t.removeAttr("aria-controls")}),this.panels.show(),this.options.heightStyle!=="content"&&this.panels.css("height","")},enable:function(n){var r=this.options.disabled;if(r===!1)return;n===t?r=!1:(n=this._getIndex(n),e.isArray(r)?r=e.map(r,function(e){return e!==n?e:null}):r=e.map(this.tabs,function(e,t){return t!==n?t:null})),this._setupDisabled(r)},disable:function(n){var r=this.options.disabled;if(r===!0)return;if(n===t)r=!0;else{n=this._getIndex(n);if(e.inArray(n,r)!==-1)return;e.isArray(r)?r=e.merge([n],r).sort():r=[n]}this._setupDisabled(r)},load:function(t,n){t=this._getIndex(t);var r=this,i=this.tabs.eq(t),o=i.find(".ui-tabs-anchor"),u=this._getPanelForTab(i),a={tab:i,panel:u};if(s(o[0]))return;this.xhr=e.ajax(this._ajaxSettings(o,n,a)),this.xhr&&this.xhr.statusText!=="canceled"&&(i.addClass("ui-tabs-loading"),u.attr("aria-busy","true"),this.xhr.success(function(e){setTimeout(function(){u.html(e),r._trigger("load",n,a)},1)}).complete(function(e,t){setTimeout(function(){t==="abort"&&r.panels.stop(!1,!0),i.removeClass("ui-tabs-loading"),u.removeAttr("aria-busy"),e===r.xhr&&delete r.xhr},1)}))},_ajaxSettings:function(t,n,r){var i=this;return{url:t.attr("href"),beforeSend:function(t,s){return i._trigger("beforeLoad",n,e.extend({jqXHR:t,ajaxSettings:s},r))}}},_getPanelForTab:function(t){var n=e(t).attr("aria-controls");return this.element.find(this._sanitizeSelector("#"+n))}}),e.uiBackCompat!==!1&&(e.ui.tabs.prototype._ui=function(e,t){return{tab:e,panel:t,index:this.anchors.index(e)}},e.widget("ui.tabs",e.ui.tabs,{url:function(e,t){this.anchors.eq(e).attr("href",t)}}),e.widget("ui.tabs",e.ui.tabs,{options:{ajaxOptions:null,cache:!1},_create:function(){this._super();var t=this;this._on({tabsbeforeload:function(n,r){if(e.data(r.tab[0],"cache.tabs")){n.preventDefault();return}r.jqXHR.success(function(){t.options.cache&&e.data(r.tab[0],"cache.tabs",!0)})}})},_ajaxSettings:function(t,n,r){var i=this.options.ajaxOptions;return e.extend({},i,{error:function(e,t){try{i.error(e,t,r.tab.closest("li").index(),r.tab[0])}catch(n){}}},this._superApply(arguments))},_setOption:function(e,t){e==="cache"&&t===!1&&this.anchors.removeData("cache.tabs"),this._super(e,t)},_destroy:function(){this.anchors.removeData("cache.tabs"),this._super()},url:function(e){this.anchors.eq(e).removeData("cache.tabs"),this._superApply(arguments)}}),e.widget("ui.tabs",e.ui.tabs,{abort:function(){this.xhr&&this.xhr.abort()}}),e.widget("ui.tabs",e.ui.tabs,{options:{spinner:"<em>Loading&#8230;</em>"},_create:function(){this._super(),this._on({tabsbeforeload:function(e,t){if(e.target!==this.element[0]||!this.options.spinner)return;var n=t.tab.find("span"),r=n.html();n.html(this.options.spinner),t.jqXHR.complete(function(){n.html(r)})}})}}),e.widget("ui.tabs",e.ui.tabs,{options:{enable:null,disable:null},enable:function(t){var n=this.options,r;if(t&&n.disabled===!0||e.isArray(n.disabled)&&e.inArray(t,n.disabled)!==-1)r=!0;this._superApply(arguments),r&&this._trigger("enable",null,this._ui(this.anchors[t],this.panels[t]))},disable:function(t){var n=this.options,r;if(t&&n.disabled===!1||e.isArray(n.disabled)&&e.inArray(t,n.disabled)===-1)r=!0;this._superApply(arguments),r&&this._trigger("disable",null,this._ui(this.anchors[t],this.panels[t]))}}),e.widget("ui.tabs",e.ui.tabs,{options:{add:null,remove:null,tabTemplate:"<li><a href='#{href}'><span>#{label}</span></a></li>"},add:function(n,r,i){i===t&&(i=this.anchors.length);var s,o,u=this.options,a=e(u.tabTemplate.replace(/#\{href\}/g,n).replace(/#\{label\}/g,r)),f=n.indexOf("#")?this._tabId(a):n.replace("#","");return a.addClass("ui-state-default ui-corner-top").data("ui-tabs-destroy",!0),a.attr("aria-controls",f),s=i>=this.tabs.length,o=this.element.find("#"+f),o.length||(o=this._createPanel(f),s?i>0?o.insertAfter(this.panels.eq(-1)):o.appendTo(this.element):o.insertBefore(this.panels[i])),o.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").hide(),s?a.appendTo(this.tablist):a.insertBefore(this.tabs[i]),u.disabled=e.map(u.disabled,function(e){return e>=i?++e:e}),this.refresh(),this.tabs.length===1&&u.active===!1&&this.option("active",0),this._trigger("add",null,this._ui(this.anchors[i],this.panels[i])),this},remove:function(t){t=this._getIndex(t);var n=this.options,r=this.tabs.eq(t).remove(),i=this._getPanelForTab(r).remove();return r.hasClass("ui-tabs-active")&&this.anchors.length>2&&this._activate(t+(t+1<this.anchors.length?1:-1)),n.disabled=e.map(e.grep(n.disabled,function(e){return e!==t}),function(e){return e>=t?--e:e}),this.refresh(),this._trigger("remove",null,this._ui(r.find("a")[0],i[0])),this}}),e.widget("ui.tabs",e.ui.tabs,{length:function(){return this.anchors.length}}),e.widget("ui.tabs",e.ui.tabs,{options:{idPrefix:"ui-tabs-"},_tabId:function(t){var n=t.is("li")?t.find("a[href]"):t;return n=n[0],e(n).closest("li").attr("aria-controls")||n.title&&n.title.replace(/\s/g,"_").replace(/[^\w\u00c0-\uFFFF\-]/g,"")||this.options.idPrefix+i()}}),e.widget("ui.tabs",e.ui.tabs,{options:{panelTemplate:"<div></div>"},_createPanel:function(t){return e(this.options.panelTemplate).attr("id",t).addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").data("ui-tabs-destroy",!0)}}),e.widget("ui.tabs",e.ui.tabs,{_create:function(){var e=this.options;e.active===null&&e.selected!==t&&(e.active=e.selected===-1?!1:e.selected),this._super(),e.selected=e.active,e.selected===!1&&(e.selected=-1)},_setOption:function(e,t){if(e!=="selected")return this._super(e,t);var n=this.options;this._super("active",t===-1?!1:t),n.selected=n.active,n.selected===!1&&(n.selected=-1)},_eventHandler:function(){this._superApply(arguments),this.options.selected=this.options.active,this.options.selected===!1&&(this.options.selected=-1)}}),e.widget("ui.tabs",e.ui.tabs,{options:{show:null,select:null},_create:function(){this._super(),this.options.active!==!1&&this._trigger("show",null,this._ui(this.active.find(".ui-tabs-anchor")[0],this._getPanelForTab(this.active)[0]))},_trigger:function(e,t,n){var r,i,s=this._superApply(arguments);return s?(e==="beforeActivate"?(r=n.newTab.length?n.newTab:n.oldTab,i=n.newPanel.length?n.newPanel:n.oldPanel,s=this._super("select",t,{tab:r.find(".ui-tabs-anchor")[0],panel:i[0],index:r.closest("li").index()})):e==="activate"&&n.newTab.length&&(s=this._super("show",t,{tab:n.newTab.find(".ui-tabs-anchor")[0],panel:n.newPanel[0],index:n.newTab.closest("li").index()})),s):!1}}),e.widget("ui.tabs",e.ui.tabs,{select:function(e){e=this._getIndex(e);if(e===-1){if(!this.options.collapsible||this.options.selected===-1)return;e=this.options.selected}this.anchors.eq(e).trigger(this.options.event+this.eventNamespace)}}),function(){var t=0;e.widget("ui.tabs",e.ui.tabs,{options:{cookie:null},_create:function(){var e=this.options,t;e.active==null&&e.cookie&&(t=parseInt(this._cookie(),10),t===-1&&(t=!1),e.active=t),this._super()},_cookie:function(n){var r=[this.cookie||(this.cookie=this.options.cookie.name||"ui-tabs-"+ ++t)];return arguments.length&&(r.push(n===!1?-1:n),r.push(this.options.cookie)),e.cookie.apply(null,r)},_refresh:function(){this._super(),this.options.cookie&&this._cookie(this.options.active,this.options.cookie)},_eventHandler:function(){this._superApply(arguments),this.options.cookie&&this._cookie(this.options.active,this.options.cookie)},_destroy:function(){this._super(),this.options.cookie&&this._cookie(null,this.options.cookie)}})}(),e.widget("ui.tabs",e.ui.tabs,{_trigger:function(t,n,r){var i=e.extend({},r);return t==="load"&&(i.panel=i.panel[0],i.tab=i.tab.find(".ui-tabs-anchor")[0]),this._super(t,n,i)}}),e.widget("ui.tabs",e.ui.tabs,{options:{fx:null},_getFx:function(){var t,n,r=this.options.fx;return r&&(e.isArray(r)?(t=r[0],n=r[1]):t=n=r),r?{show:n,hide:t}:null},_toggle:function(e,t){function o(){n.running=!1,n._trigger("activate",e,t)}function u(){t.newTab.closest("li").addClass("ui-tabs-active ui-state-active"),r.length&&s.show?r.animate(s.show,s.show.duration,function(){o()}):(r.show(),o())}var n=this,r=t.newPanel,i=t.oldPanel,s=this._getFx();if(!s)return this._super(e,t);n.running=!0,i.length&&s.hide?i.animate(s.hide,s.hide.duration,function(){t.oldTab.closest("li").removeClass("ui-tabs-active ui-state-active"),u()}):(t.oldTab.closest("li").removeClass("ui-tabs-active ui-state-active"),i.hide(),u())}}))})(jQuery);(function(e){function n(t,n){var r=(t.attr("aria-describedby")||"").split(/\s+/);r.push(n),t.data("ui-tooltip-id",n).attr("aria-describedby",e.trim(r.join(" ")))}function r(t){var n=t.data("ui-tooltip-id"),r=(t.attr("aria-describedby")||"").split(/\s+/),i=e.inArray(n,r);i!==-1&&r.splice(i,1),t.removeData("ui-tooltip-id"),r=e.trim(r.join(" ")),r?t.attr("aria-describedby",r):t.removeAttr("aria-describedby")}var t=0;e.widget("ui.tooltip",{version:"1.9.2",options:{content:function(){return e(this).attr("title")},hide:!0,items:"[title]:not([disabled])",position:{my:"left top+15",at:"left bottom",collision:"flipfit flip"},show:!0,tooltipClass:null,track:!1,close:null,open:null},_create:function(){this._on({mouseover:"open",focusin:"open"}),this.tooltips={},this.parents={},this.options.disabled&&this._disable()},_setOption:function(t,n){var r=this;if(t==="disabled"){this[n?"_disable":"_enable"](),this.options[t]=n;return}this._super(t,n),t==="content"&&e.each(this.tooltips,function(e,t){r._updateContent(t)})},_disable:function(){var t=this;e.each(this.tooltips,function(n,r){var i=e.Event("blur");i.target=i.currentTarget=r[0],t.close(i,!0)}),this.element.find(this.options.items).andSelf().each(function(){var t=e(this);t.is("[title]")&&t.data("ui-tooltip-title",t.attr("title")).attr("title","")})},_enable:function(){this.element.find(this.options.items).andSelf().each(function(){var t=e(this);t.data("ui-tooltip-title")&&t.attr("title",t.data("ui-tooltip-title"))})},open:function(t){var n=this,r=e(t?t.target:this.element).closest(this.options.items);if(!r.length||r.data("ui-tooltip-id"))return;r.attr("title")&&r.data("ui-tooltip-title",r.attr("title")),r.data("ui-tooltip-open",!0),t&&t.type==="mouseover"&&r.parents().each(function(){var t=e(this),r;t.data("ui-tooltip-open")&&(r=e.Event("blur"),r.target=r.currentTarget=this,n.close(r,!0)),t.attr("title")&&(t.uniqueId(),n.parents[this.id]={element:this,title:t.attr("title")},t.attr("title",""))}),this._updateContent(r,t)},_updateContent:function(e,t){var n,r=this.options.content,i=this,s=t?t.type:null;if(typeof r=="string")return this._open(t,e,r);n=r.call(e[0],function(n){if(!e.data("ui-tooltip-open"))return;i._delay(function(){t&&(t.type=s),this._open(t,e,n)})}),n&&this._open(t,e,n)},_open:function(t,r,i){function f(e){a.of=e;if(s.is(":hidden"))return;s.position(a)}var s,o,u,a=e.extend({},this.options.position);if(!i)return;s=this._find(r);if(s.length){s.find(".ui-tooltip-content").html(i);return}r.is("[title]")&&(t&&t.type==="mouseover"?r.attr("title",""):r.removeAttr("title")),s=this._tooltip(r),n(r,s.attr("id")),s.find(".ui-tooltip-content").html(i),this.options.track&&t&&/^mouse/.test(t.type)?(this._on(this.document,{mousemove:f}),f(t)):s.position(e.extend({of:r},this.options.position)),s.hide(),this._show(s,this.options.show),this.options.show&&this.options.show.delay&&(u=setInterval(function(){s.is(":visible")&&(f(a.of),clearInterval(u))},e.fx.interval)),this._trigger("open",t,{tooltip:s}),o={keyup:function(t){if(t.keyCode===e.ui.keyCode.ESCAPE){var n=e.Event(t);n.currentTarget=r[0],this.close(n,!0)}},remove:function(){this._removeTooltip(s)}};if(!t||t.type==="mouseover")o.mouseleave="close";if(!t||t.type==="focusin")o.focusout="close";this._on(!0,r,o)},close:function(t){var n=this,i=e(t?t.currentTarget:this.element),s=this._find(i);if(this.closing)return;i.data("ui-tooltip-title")&&i.attr("title",i.data("ui-tooltip-title")),r(i),s.stop(!0),this._hide(s,this.options.hide,function(){n._removeTooltip(e(this))}),i.removeData("ui-tooltip-open"),this._off(i,"mouseleave focusout keyup"),i[0]!==this.element[0]&&this._off(i,"remove"),this._off(this.document,"mousemove"),t&&t.type==="mouseleave"&&e.each(this.parents,function(t,r){e(r.element).attr("title",r.title),delete n.parents[t]}),this.closing=!0,this._trigger("close",t,{tooltip:s}),this.closing=!1},_tooltip:function(n){var r="ui-tooltip-"+t++,i=e("<div>").attr({id:r,role:"tooltip"}).addClass("ui-tooltip ui-widget ui-corner-all ui-widget-content "+(this.options.tooltipClass||""));return e("<div>").addClass("ui-tooltip-content").appendTo(i),i.appendTo(this.document[0].body),e.fn.bgiframe&&i.bgiframe(),this.tooltips[r]=n,i},_find:function(t){var n=t.data("ui-tooltip-id");return n?e("#"+n):e()},_removeTooltip:function(e){e.remove(),delete this.tooltips[e.attr("id")]},_destroy:function(){var t=this;e.each(this.tooltips,function(n,r){var i=e.Event("blur");i.target=i.currentTarget=r[0],t.close(i,!0),e("#"+n).remove(),r.data("ui-tooltip-title")&&(r.attr("title",r.data("ui-tooltip-title")),r.removeData("ui-tooltip-title"))})}})})(jQuery);jQuery.effects||function(e,t){var n=e.uiBackCompat!==!1,r="ui-effects-";e.effects={effect:{}},function(t,n){function p(e,t,n){var r=a[t.type]||{};return e==null?n||!t.def?null:t.def:(e=r.floor?~~e:parseFloat(e),isNaN(e)?t.def:r.mod?(e+r.mod)%r.mod:0>e?0:r.max<e?r.max:e)}function d(e){var n=o(),r=n._rgba=[];return e=e.toLowerCase(),h(s,function(t,i){var s,o=i.re.exec(e),a=o&&i.parse(o),f=i.space||"rgba";if(a)return s=n[f](a),n[u[f].cache]=s[u[f].cache],r=n._rgba=s._rgba,!1}),r.length?(r.join()==="0,0,0,0"&&t.extend(r,c.transparent),n):c[e]}function v(e,t,n){return n=(n+1)%1,n*6<1?e+(t-e)*n*6:n*2<1?t:n*3<2?e+(t-e)*(2/3-n)*6:e}var r="backgroundColor borderBottomColor borderLeftColor borderRightColor borderTopColor color columnRuleColor outlineColor textDecorationColor textEmphasisColor".split(" "),i=/^([\-+])=\s*(\d+\.?\d*)/,s=[{re:/rgba?\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*(?:,\s*(\d+(?:\.\d+)?)\s*)?\)/,parse:function(e){return[e[1],e[2],e[3],e[4]]}},{re:/rgba?\(\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d+(?:\.\d+)?)\s*)?\)/,parse:function(e){return[e[1]*2.55,e[2]*2.55,e[3]*2.55,e[4]]}},{re:/#([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})/,parse:function(e){return[parseInt(e[1],16),parseInt(e[2],16),parseInt(e[3],16)]}},{re:/#([a-f0-9])([a-f0-9])([a-f0-9])/,parse:function(e){return[parseInt(e[1]+e[1],16),parseInt(e[2]+e[2],16),parseInt(e[3]+e[3],16)]}},{re:/hsla?\(\s*(\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d+(?:\.\d+)?)\s*)?\)/,space:"hsla",parse:function(e){return[e[1],e[2]/100,e[3]/100,e[4]]}}],o=t.Color=function(e,n,r,i){return new t.Color.fn.parse(e,n,r,i)},u={rgba:{props:{red:{idx:0,type:"byte"},green:{idx:1,type:"byte"},blue:{idx:2,type:"byte"}}},hsla:{props:{hue:{idx:0,type:"degrees"},saturation:{idx:1,type:"percent"},lightness:{idx:2,type:"percent"}}}},a={"byte":{floor:!0,max:255},percent:{max:1},degrees:{mod:360,floor:!0}},f=o.support={},l=t("<p>")[0],c,h=t.each;l.style.cssText="background-color:rgba(1,1,1,.5)",f.rgba=l.style.backgroundColor.indexOf("rgba")>-1,h(u,function(e,t){t.cache="_"+e,t.props.alpha={idx:3,type:"percent",def:1}}),o.fn=t.extend(o.prototype,{parse:function(r,i,s,a){if(r===n)return this._rgba=[null,null,null,null],this;if(r.jquery||r.nodeType)r=t(r).css(i),i=n;var f=this,l=t.type(r),v=this._rgba=[];i!==n&&(r=[r,i,s,a],l="array");if(l==="string")return this.parse(d(r)||c._default);if(l==="array")return h(u.rgba.props,function(e,t){v[t.idx]=p(r[t.idx],t)}),this;if(l==="object")return r instanceof o?h(u,function(e,t){r[t.cache]&&(f[t.cache]=r[t.cache].slice())}):h(u,function(t,n){var i=n.cache;h(n.props,function(e,t){if(!f[i]&&n.to){if(e==="alpha"||r[e]==null)return;f[i]=n.to(f._rgba)}f[i][t.idx]=p(r[e],t,!0)}),f[i]&&e.inArray(null,f[i].slice(0,3))<0&&(f[i][3]=1,n.from&&(f._rgba=n.from(f[i])))}),this},is:function(e){var t=o(e),n=!0,r=this;return h(u,function(e,i){var s,o=t[i.cache];return o&&(s=r[i.cache]||i.to&&i.to(r._rgba)||[],h(i.props,function(e,t){if(o[t.idx]!=null)return n=o[t.idx]===s[t.idx],n})),n}),n},_space:function(){var e=[],t=this;return h(u,function(n,r){t[r.cache]&&e.push(n)}),e.pop()},transition:function(e,t){var n=o(e),r=n._space(),i=u[r],s=this.alpha()===0?o("transparent"):this,f=s[i.cache]||i.to(s._rgba),l=f.slice();return n=n[i.cache],h(i.props,function(e,r){var i=r.idx,s=f[i],o=n[i],u=a[r.type]||{};if(o===null)return;s===null?l[i]=o:(u.mod&&(o-s>u.mod/2?s+=u.mod:s-o>u.mod/2&&(s-=u.mod)),l[i]=p((o-s)*t+s,r))}),this[r](l)},blend:function(e){if(this._rgba[3]===1)return this;var n=this._rgba.slice(),r=n.pop(),i=o(e)._rgba;return o(t.map(n,function(e,t){return(1-r)*i[t]+r*e}))},toRgbaString:function(){var e="rgba(",n=t.map(this._rgba,function(e,t){return e==null?t>2?1:0:e});return n[3]===1&&(n.pop(),e="rgb("),e+n.join()+")"},toHslaString:function(){var e="hsla(",n=t.map(this.hsla(),function(e,t){return e==null&&(e=t>2?1:0),t&&t<3&&(e=Math.round(e*100)+"%"),e});return n[3]===1&&(n.pop(),e="hsl("),e+n.join()+")"},toHexString:function(e){var n=this._rgba.slice(),r=n.pop();return e&&n.push(~~(r*255)),"#"+t.map(n,function(e){return e=(e||0).toString(16),e.length===1?"0"+e:e}).join("")},toString:function(){return this._rgba[3]===0?"transparent":this.toRgbaString()}}),o.fn.parse.prototype=o.fn,u.hsla.to=function(e){if(e[0]==null||e[1]==null||e[2]==null)return[null,null,null,e[3]];var t=e[0]/255,n=e[1]/255,r=e[2]/255,i=e[3],s=Math.max(t,n,r),o=Math.min(t,n,r),u=s-o,a=s+o,f=a*.5,l,c;return o===s?l=0:t===s?l=60*(n-r)/u+360:n===s?l=60*(r-t)/u+120:l=60*(t-n)/u+240,f===0||f===1?c=f:f<=.5?c=u/a:c=u/(2-a),[Math.round(l)%360,c,f,i==null?1:i]},u.hsla.from=function(e){if(e[0]==null||e[1]==null||e[2]==null)return[null,null,null,e[3]];var t=e[0]/360,n=e[1],r=e[2],i=e[3],s=r<=.5?r*(1+n):r+n-r*n,o=2*r-s;return[Math.round(v(o,s,t+1/3)*255),Math.round(v(o,s,t)*255),Math.round(v(o,s,t-1/3)*255),i]},h(u,function(e,r){var s=r.props,u=r.cache,a=r.to,f=r.from;o.fn[e]=function(e){a&&!this[u]&&(this[u]=a(this._rgba));if(e===n)return this[u].slice();var r,i=t.type(e),l=i==="array"||i==="object"?e:arguments,c=this[u].slice();return h(s,function(e,t){var n=l[i==="object"?e:t.idx];n==null&&(n=c[t.idx]),c[t.idx]=p(n,t)}),f?(r=o(f(c)),r[u]=c,r):o(c)},h(s,function(n,r){if(o.fn[n])return;o.fn[n]=function(s){var o=t.type(s),u=n==="alpha"?this._hsla?"hsla":"rgba":e,a=this[u](),f=a[r.idx],l;return o==="undefined"?f:(o==="function"&&(s=s.call(this,f),o=t.type(s)),s==null&&r.empty?this:(o==="string"&&(l=i.exec(s),l&&(s=f+parseFloat(l[2])*(l[1]==="+"?1:-1))),a[r.idx]=s,this[u](a)))}})}),h(r,function(e,n){t.cssHooks[n]={set:function(e,r){var i,s,u="";if(t.type(r)!=="string"||(i=d(r))){r=o(i||r);if(!f.rgba&&r._rgba[3]!==1){s=n==="backgroundColor"?e.parentNode:e;while((u===""||u==="transparent")&&s&&s.style)try{u=t.css(s,"backgroundColor"),s=s.parentNode}catch(a){}r=r.blend(u&&u!=="transparent"?u:"_default")}r=r.toRgbaString()}try{e.style[n]=r}catch(l){}}},t.fx.step[n]=function(e){e.colorInit||(e.start=o(e.elem,n),e.end=o(e.end),e.colorInit=!0),t.cssHooks[n].set(e.elem,e.start.transition(e.end,e.pos))}}),t.cssHooks.borderColor={expand:function(e){var t={};return h(["Top","Right","Bottom","Left"],function(n,r){t["border"+r+"Color"]=e}),t}},c=t.Color.names={aqua:"#00ffff",black:"#000000",blue:"#0000ff",fuchsia:"#ff00ff",gray:"#808080",green:"#008000",lime:"#00ff00",maroon:"#800000",navy:"#000080",olive:"#808000",purple:"#800080",red:"#ff0000",silver:"#c0c0c0",teal:"#008080",white:"#ffffff",yellow:"#ffff00",transparent:[null,null,null,0],_default:"#ffffff"}}(jQuery),function(){function i(){var t=this.ownerDocument.defaultView?this.ownerDocument.defaultView.getComputedStyle(this,null):this.currentStyle,n={},r,i;if(t&&t.length&&t[0]&&t[t[0]]){i=t.length;while(i--)r=t[i],typeof t[r]=="string"&&(n[e.camelCase(r)]=t[r])}else for(r in t)typeof t[r]=="string"&&(n[r]=t[r]);return n}function s(t,n){var i={},s,o;for(s in n)o=n[s],t[s]!==o&&!r[s]&&(e.fx.step[s]||!isNaN(parseFloat(o)))&&(i[s]=o);return i}var n=["add","remove","toggle"],r={border:1,borderBottom:1,borderColor:1,borderLeft:1,borderRight:1,borderTop:1,borderWidth:1,margin:1,padding:1};e.each(["borderLeftStyle","borderRightStyle","borderBottomStyle","borderTopStyle"],function(t,n){e.fx.step[n]=function(e){if(e.end!=="none"&&!e.setAttr||e.pos===1&&!e.setAttr)jQuery.style(e.elem,n,e.end),e.setAttr=!0}}),e.effects.animateClass=function(t,r,o,u){var a=e.speed(r,o,u);return this.queue(function(){var r=e(this),o=r.attr("class")||"",u,f=a.children?r.find("*").andSelf():r;f=f.map(function(){var t=e(this);return{el:t,start:i.call(this)}}),u=function(){e.each(n,function(e,n){t[n]&&r[n+"Class"](t[n])})},u(),f=f.map(function(){return this.end=i.call(this.el[0]),this.diff=s(this.start,this.end),this}),r.attr("class",o),f=f.map(function(){var t=this,n=e.Deferred(),r=jQuery.extend({},a,{queue:!1,complete:function(){n.resolve(t)}});return this.el.animate(this.diff,r),n.promise()}),e.when.apply(e,f.get()).done(function(){u(),e.each(arguments,function(){var t=this.el;e.each(this.diff,function(e){t.css(e,"")})}),a.complete.call(r[0])})})},e.fn.extend({_addClass:e.fn.addClass,addClass:function(t,n,r,i){return n?e.effects.animateClass.call(this,{add:t},n,r,i):this._addClass(t)},_removeClass:e.fn.removeClass,removeClass:function(t,n,r,i){return n?e.effects.animateClass.call(this,{remove:t},n,r,i):this._removeClass(t)},_toggleClass:e.fn.toggleClass,toggleClass:function(n,r,i,s,o){return typeof r=="boolean"||r===t?i?e.effects.animateClass.call(this,r?{add:n}:{remove:n},i,s,o):this._toggleClass(n,r):e.effects.animateClass.call(this,{toggle:n},r,i,s)},switchClass:function(t,n,r,i,s){return e.effects.animateClass.call(this,{add:n,remove:t},r,i,s)}})}(),function(){function i(t,n,r,i){e.isPlainObject(t)&&(n=t,t=t.effect),t={effect:t},n==null&&(n={}),e.isFunction(n)&&(i=n,r=null,n={});if(typeof n=="number"||e.fx.speeds[n])i=r,r=n,n={};return e.isFunction(r)&&(i=r,r=null),n&&e.extend(t,n),r=r||n.duration,t.duration=e.fx.off?0:typeof r=="number"?r:r in e.fx.speeds?e.fx.speeds[r]:e.fx.speeds._default,t.complete=i||n.complete,t}function s(t){return!t||typeof t=="number"||e.fx.speeds[t]?!0:typeof t=="string"&&!e.effects.effect[t]?n&&e.effects[t]?!1:!0:!1}e.extend(e.effects,{version:"1.9.2",save:function(e,t){for(var n=0;n<t.length;n++)t[n]!==null&&e.data(r+t[n],e[0].style[t[n]])},restore:function(e,n){var i,s;for(s=0;s<n.length;s++)n[s]!==null&&(i=e.data(r+n[s]),i===t&&(i=""),e.css(n[s],i))},setMode:function(e,t){return t==="toggle"&&(t=e.is(":hidden")?"show":"hide"),t},getBaseline:function(e,t){var n,r;switch(e[0]){case"top":n=0;break;case"middle":n=.5;break;case"bottom":n=1;break;default:n=e[0]/t.height}switch(e[1]){case"left":r=0;break;case"center":r=.5;break;case"right":r=1;break;default:r=e[1]/t.width}return{x:r,y:n}},createWrapper:function(t){if(t.parent().is(".ui-effects-wrapper"))return t.parent();var n={width:t.outerWidth(!0),height:t.outerHeight(!0),"float":t.css("float")},r=e("<div></div>").addClass("ui-effects-wrapper").css({fontSize:"100%",background:"transparent",border:"none",margin:0,padding:0}),i={width:t.width(),height:t.height()},s=document.activeElement;try{s.id}catch(o){s=document.body}return t.wrap(r),(t[0]===s||e.contains(t[0],s))&&e(s).focus(),r=t.parent(),t.css("position")==="static"?(r.css({position:"relative"}),t.css({position:"relative"})):(e.extend(n,{position:t.css("position"),zIndex:t.css("z-index")}),e.each(["top","left","bottom","right"],function(e,r){n[r]=t.css(r),isNaN(parseInt(n[r],10))&&(n[r]="auto")}),t.css({position:"relative",top:0,left:0,right:"auto",bottom:"auto"})),t.css(i),r.css(n).show()},removeWrapper:function(t){var n=document.activeElement;return t.parent().is(".ui-effects-wrapper")&&(t.parent().replaceWith(t),(t[0]===n||e.contains(t[0],n))&&e(n).focus()),t},setTransition:function(t,n,r,i){return i=i||{},e.each(n,function(e,n){var s=t.cssUnit(n);s[0]>0&&(i[n]=s[0]*r+s[1])}),i}}),e.fn.extend({effect:function(){function a(n){function u(){e.isFunction(i)&&i.call(r[0]),e.isFunction(n)&&n()}var r=e(this),i=t.complete,s=t.mode;(r.is(":hidden")?s==="hide":s==="show")?u():o.call(r[0],t,u)}var t=i.apply(this,arguments),r=t.mode,s=t.queue,o=e.effects.effect[t.effect],u=!o&&n&&e.effects[t.effect];return e.fx.off||!o&&!u?r?this[r](t.duration,t.complete):this.each(function(){t.complete&&t.complete.call(this)}):o?s===!1?this.each(a):this.queue(s||"fx",a):u.call(this,{options:t,duration:t.duration,callback:t.complete,mode:t.mode})},_show:e.fn.show,show:function(e){if(s(e))return this._show.apply(this,arguments);var t=i.apply(this,arguments);return t.mode="show",this.effect.call(this,t)},_hide:e.fn.hide,hide:function(e){if(s(e))return this._hide.apply(this,arguments);var t=i.apply(this,arguments);return t.mode="hide",this.effect.call(this,t)},__toggle:e.fn.toggle,toggle:function(t){if(s(t)||typeof t=="boolean"||e.isFunction(t))return this.__toggle.apply(this,arguments);var n=i.apply(this,arguments);return n.mode="toggle",this.effect.call(this,n)},cssUnit:function(t){var n=this.css(t),r=[];return e.each(["em","px","%","pt"],function(e,t){n.indexOf(t)>0&&(r=[parseFloat(n),t])}),r}})}(),function(){var t={};e.each(["Quad","Cubic","Quart","Quint","Expo"],function(e,n){t[n]=function(t){return Math.pow(t,e+2)}}),e.extend(t,{Sine:function(e){return 1-Math.cos(e*Math.PI/2)},Circ:function(e){return 1-Math.sqrt(1-e*e)},Elastic:function(e){return e===0||e===1?e:-Math.pow(2,8*(e-1))*Math.sin(((e-1)*80-7.5)*Math.PI/15)},Back:function(e){return e*e*(3*e-2)},Bounce:function(e){var t,n=4;while(e<((t=Math.pow(2,--n))-1)/11);return 1/Math.pow(4,3-n)-7.5625*Math.pow((t*3-2)/22-e,2)}}),e.each(t,function(t,n){e.easing["easeIn"+t]=n,e.easing["easeOut"+t]=function(e){return 1-n(1-e)},e.easing["easeInOut"+t]=function(e){return e<.5?n(e*2)/2:1-n(e*-2+2)/2}})}()}(jQuery);(function(e,t){var n=/up|down|vertical/,r=/up|left|vertical|horizontal/;e.effects.effect.blind=function(t,i){var s=e(this),o=["position","top","bottom","left","right","height","width"],u=e.effects.setMode(s,t.mode||"hide"),a=t.direction||"up",f=n.test(a),l=f?"height":"width",c=f?"top":"left",h=r.test(a),p={},d=u==="show",v,m,g;s.parent().is(".ui-effects-wrapper")?e.effects.save(s.parent(),o):e.effects.save(s,o),s.show(),v=e.effects.createWrapper(s).css({overflow:"hidden"}),m=v[l](),g=parseFloat(v.css(c))||0,p[l]=d?m:0,h||(s.css(f?"bottom":"right",0).css(f?"top":"left","auto").css({position:"absolute"}),p[c]=d?g:m+g),d&&(v.css(l,0),h||v.css(c,g+m)),v.animate(p,{duration:t.duration,easing:t.easing,queue:!1,complete:function(){u==="hide"&&s.hide(),e.effects.restore(s,o),e.effects.removeWrapper(s),i()}})}})(jQuery);(function(e,t){e.effects.effect.bounce=function(t,n){var r=e(this),i=["position","top","bottom","left","right","height","width"],s=e.effects.setMode(r,t.mode||"effect"),o=s==="hide",u=s==="show",a=t.direction||"up",f=t.distance,l=t.times||5,c=l*2+(u||o?1:0),h=t.duration/c,p=t.easing,d=a==="up"||a==="down"?"top":"left",v=a==="up"||a==="left",m,g,y,b=r.queue(),w=b.length;(u||o)&&i.push("opacity"),e.effects.save(r,i),r.show(),e.effects.createWrapper(r),f||(f=r[d==="top"?"outerHeight":"outerWidth"]()/3),u&&(y={opacity:1},y[d]=0,r.css("opacity",0).css(d,v?-f*2:f*2).animate(y,h,p)),o&&(f/=Math.pow(2,l-1)),y={},y[d]=0;for(m=0;m<l;m++)g={},g[d]=(v?"-=":"+=")+f,r.animate(g,h,p).animate(y,h,p),f=o?f*2:f/2;o&&(g={opacity:0},g[d]=(v?"-=":"+=")+f,r.animate(g,h,p)),r.queue(function(){o&&r.hide(),e.effects.restore(r,i),e.effects.removeWrapper(r),n()}),w>1&&b.splice.apply(b,[1,0].concat(b.splice(w,c+1))),r.dequeue()}})(jQuery);(function(e,t){e.effects.effect.clip=function(t,n){var r=e(this),i=["position","top","bottom","left","right","height","width"],s=e.effects.setMode(r,t.mode||"hide"),o=s==="show",u=t.direction||"vertical",a=u==="vertical",f=a?"height":"width",l=a?"top":"left",c={},h,p,d;e.effects.save(r,i),r.show(),h=e.effects.createWrapper(r).css({overflow:"hidden"}),p=r[0].tagName==="IMG"?h:r,d=p[f](),o&&(p.css(f,0),p.css(l,d/2)),c[f]=o?d:0,c[l]=o?0:d/2,p.animate(c,{queue:!1,duration:t.duration,easing:t.easing,complete:function(){o||r.hide(),e.effects.restore(r,i),e.effects.removeWrapper(r),n()}})}})(jQuery);(function(e,t){e.effects.effect.drop=function(t,n){var r=e(this),i=["position","top","bottom","left","right","opacity","height","width"],s=e.effects.setMode(r,t.mode||"hide"),o=s==="show",u=t.direction||"left",a=u==="up"||u==="down"?"top":"left",f=u==="up"||u==="left"?"pos":"neg",l={opacity:o?1:0},c;e.effects.save(r,i),r.show(),e.effects.createWrapper(r),c=t.distance||r[a==="top"?"outerHeight":"outerWidth"](!0)/2,o&&r.css("opacity",0).css(a,f==="pos"?-c:c),l[a]=(o?f==="pos"?"+=":"-=":f==="pos"?"-=":"+=")+c,r.animate(l,{queue:!1,duration:t.duration,easing:t.easing,complete:function(){s==="hide"&&r.hide(),e.effects.restore(r,i),e.effects.removeWrapper(r),n()}})}})(jQuery);(function(e,t){e.effects.effect.explode=function(t,n){function y(){c.push(this),c.length===r*i&&b()}function b(){s.css({visibility:"visible"}),e(c).remove(),u||s.hide(),n()}var r=t.pieces?Math.round(Math.sqrt(t.pieces)):3,i=r,s=e(this),o=e.effects.setMode(s,t.mode||"hide"),u=o==="show",a=s.show().css("visibility","hidden").offset(),f=Math.ceil(s.outerWidth()/i),l=Math.ceil(s.outerHeight()/r),c=[],h,p,d,v,m,g;for(h=0;h<r;h++){v=a.top+h*l,g=h-(r-1)/2;for(p=0;p<i;p++)d=a.left+p*f,m=p-(i-1)/2,s.clone().appendTo("body").wrap("<div></div>").css({position:"absolute",visibility:"visible",left:-p*f,top:-h*l}).parent().addClass("ui-effects-explode").css({position:"absolute",overflow:"hidden",width:f,height:l,left:d+(u?m*f:0),top:v+(u?g*l:0),opacity:u?0:1}).animate({left:d+(u?0:m*f),top:v+(u?0:g*l),opacity:u?1:0},t.duration||500,t.easing,y)}}})(jQuery);(function(e,t){e.effects.effect.fade=function(t,n){var r=e(this),i=e.effects.setMode(r,t.mode||"toggle");r.animate({opacity:i},{queue:!1,duration:t.duration,easing:t.easing,complete:n})}})(jQuery);(function(e,t){e.effects.effect.fold=function(t,n){var r=e(this),i=["position","top","bottom","left","right","height","width"],s=e.effects.setMode(r,t.mode||"hide"),o=s==="show",u=s==="hide",a=t.size||15,f=/([0-9]+)%/.exec(a),l=!!t.horizFirst,c=o!==l,h=c?["width","height"]:["height","width"],p=t.duration/2,d,v,m={},g={};e.effects.save(r,i),r.show(),d=e.effects.createWrapper(r).css({overflow:"hidden"}),v=c?[d.width(),d.height()]:[d.height(),d.width()],f&&(a=parseInt(f[1],10)/100*v[u?0:1]),o&&d.css(l?{height:0,width:a}:{height:a,width:0}),m[h[0]]=o?v[0]:a,g[h[1]]=o?v[1]:0,d.animate(m,p,t.easing).animate(g,p,t.easing,function(){u&&r.hide(),e.effects.restore(r,i),e.effects.removeWrapper(r),n()})}})(jQuery);(function(e,t){e.effects.effect.highlight=function(t,n){var r=e(this),i=["backgroundImage","backgroundColor","opacity"],s=e.effects.setMode(r,t.mode||"show"),o={backgroundColor:r.css("backgroundColor")};s==="hide"&&(o.opacity=0),e.effects.save(r,i),r.show().css({backgroundImage:"none",backgroundColor:t.color||"#ffff99"}).animate(o,{queue:!1,duration:t.duration,easing:t.easing,complete:function(){s==="hide"&&r.hide(),e.effects.restore(r,i),n()}})}})(jQuery);(function(e,t){e.effects.effect.pulsate=function(t,n){var r=e(this),i=e.effects.setMode(r,t.mode||"show"),s=i==="show",o=i==="hide",u=s||i==="hide",a=(t.times||5)*2+(u?1:0),f=t.duration/a,l=0,c=r.queue(),h=c.length,p;if(s||!r.is(":visible"))r.css("opacity",0).show(),l=1;for(p=1;p<a;p++)r.animate({opacity:l},f,t.easing),l=1-l;r.animate({opacity:l},f,t.easing),r.queue(function(){o&&r.hide(),n()}),h>1&&c.splice.apply(c,[1,0].concat(c.splice(h,a+1))),r.dequeue()}})(jQuery);(function(e,t){e.effects.effect.puff=function(t,n){var r=e(this),i=e.effects.setMode(r,t.mode||"hide"),s=i==="hide",o=parseInt(t.percent,10)||150,u=o/100,a={height:r.height(),width:r.width(),outerHeight:r.outerHeight(),outerWidth:r.outerWidth()};e.extend(t,{effect:"scale",queue:!1,fade:!0,mode:i,complete:n,percent:s?o:100,from:s?a:{height:a.height*u,width:a.width*u,outerHeight:a.outerHeight*u,outerWidth:a.outerWidth*u}}),r.effect(t)},e.effects.effect.scale=function(t,n){var r=e(this),i=e.extend(!0,{},t),s=e.effects.setMode(r,t.mode||"effect"),o=parseInt(t.percent,10)||(parseInt(t.percent,10)===0?0:s==="hide"?0:100),u=t.direction||"both",a=t.origin,f={height:r.height(),width:r.width(),outerHeight:r.outerHeight(),outerWidth:r.outerWidth()},l={y:u!=="horizontal"?o/100:1,x:u!=="vertical"?o/100:1};i.effect="size",i.queue=!1,i.complete=n,s!=="effect"&&(i.origin=a||["middle","center"],i.restore=!0),i.from=t.from||(s==="show"?{height:0,width:0,outerHeight:0,outerWidth:0}:f),i.to={height:f.height*l.y,width:f.width*l.x,outerHeight:f.outerHeight*l.y,outerWidth:f.outerWidth*l.x},i.fade&&(s==="show"&&(i.from.opacity=0,i.to.opacity=1),s==="hide"&&(i.from.opacity=1,i.to.opacity=0)),r.effect(i)},e.effects.effect.size=function(t,n){var r,i,s,o=e(this),u=["position","top","bottom","left","right","width","height","overflow","opacity"],a=["position","top","bottom","left","right","overflow","opacity"],f=["width","height","overflow"],l=["fontSize"],c=["borderTopWidth","borderBottomWidth","paddingTop","paddingBottom"],h=["borderLeftWidth","borderRightWidth","paddingLeft","paddingRight"],p=e.effects.setMode(o,t.mode||"effect"),d=t.restore||p!=="effect",v=t.scale||"both",m=t.origin||["middle","center"],g=o.css("position"),y=d?u:a,b={height:0,width:0,outerHeight:0,outerWidth:0};p==="show"&&o.show(),r={height:o.height(),width:o.width(),outerHeight:o.outerHeight(),outerWidth:o.outerWidth()},t.mode==="toggle"&&p==="show"?(o.from=t.to||b,o.to=t.from||r):(o.from=t.from||(p==="show"?b:r),o.to=t.to||(p==="hide"?b:r)),s={from:{y:o.from.height/r.height,x:o.from.width/r.width},to:{y:o.to.height/r.height,x:o.to.width/r.width}};if(v==="box"||v==="both")s.from.y!==s.to.y&&(y=y.concat(c),o.from=e.effects.setTransition(o,c,s.from.y,o.from),o.to=e.effects.setTransition(o,c,s.to.y,o.to)),s.from.x!==s.to.x&&(y=y.concat(h),o.from=e.effects.setTransition(o,h,s.from.x,o.from),o.to=e.effects.setTransition(o,h,s.to.x,o.to));(v==="content"||v==="both")&&s.from.y!==s.to.y&&(y=y.concat(l).concat(f),o.from=e.effects.setTransition(o,l,s.from.y,o.from),o.to=e.effects.setTransition(o,l,s.to.y,o.to)),e.effects.save(o,y),o.show(),e.effects.createWrapper(o),o.css("overflow","hidden").css(o.from),m&&(i=e.effects.getBaseline(m,r),o.from.top=(r.outerHeight-o.outerHeight())*i.y,o.from.left=(r.outerWidth-o.outerWidth())*i.x,o.to.top=(r.outerHeight-o.to.outerHeight)*i.y,o.to.left=(r.outerWidth-o.to.outerWidth)*i.x),o.css(o.from);if(v==="content"||v==="both")c=c.concat(["marginTop","marginBottom"]).concat(l),h=h.concat(["marginLeft","marginRight"]),f=u.concat(c).concat(h),o.find("*[width]").each(function(){var n=e(this),r={height:n.height(),width:n.width(),outerHeight:n.outerHeight(),outerWidth:n.outerWidth()};d&&e.effects.save(n,f),n.from={height:r.height*s.from.y,width:r.width*s.from.x,outerHeight:r.outerHeight*s.from.y,outerWidth:r.outerWidth*s.from.x},n.to={height:r.height*s.to.y,width:r.width*s.to.x,outerHeight:r.height*s.to.y,outerWidth:r.width*s.to.x},s.from.y!==s.to.y&&(n.from=e.effects.setTransition(n,c,s.from.y,n.from),n.to=e.effects.setTransition(n,c,s.to.y,n.to)),s.from.x!==s.to.x&&(n.from=e.effects.setTransition(n,h,s.from.x,n.from),n.to=e.effects.setTransition(n,h,s.to.x,n.to)),n.css(n.from),n.animate(n.to,t.duration,t.easing,function(){d&&e.effects.restore(n,f)})});o.animate(o.to,{queue:!1,duration:t.duration,easing:t.easing,complete:function(){o.to.opacity===0&&o.css("opacity",o.from.opacity),p==="hide"&&o.hide(),e.effects.restore(o,y),d||(g==="static"?o.css({position:"relative",top:o.to.top,left:o.to.left}):e.each(["top","left"],function(e,t){o.css(t,function(t,n){var r=parseInt(n,10),i=e?o.to.left:o.to.top;return n==="auto"?i+"px":r+i+"px"})})),e.effects.removeWrapper(o),n()}})}})(jQuery);(function(e,t){e.effects.effect.shake=function(t,n){var r=e(this),i=["position","top","bottom","left","right","height","width"],s=e.effects.setMode(r,t.mode||"effect"),o=t.direction||"left",u=t.distance||20,a=t.times||3,f=a*2+1,l=Math.round(t.duration/f),c=o==="up"||o==="down"?"top":"left",h=o==="up"||o==="left",p={},d={},v={},m,g=r.queue(),y=g.length;e.effects.save(r,i),r.show(),e.effects.createWrapper(r),p[c]=(h?"-=":"+=")+u,d[c]=(h?"+=":"-=")+u*2,v[c]=(h?"-=":"+=")+u*2,r.animate(p,l,t.easing);for(m=1;m<a;m++)r.animate(d,l,t.easing).animate(v,l,t.easing);r.animate(d,l,t.easing).animate(p,l/2,t.easing).queue(function(){s==="hide"&&r.hide(),e.effects.restore(r,i),e.effects.removeWrapper(r),n()}),y>1&&g.splice.apply(g,[1,0].concat(g.splice(y,f+1))),r.dequeue()}})(jQuery);(function(e,t){e.effects.effect.slide=function(t,n){var r=e(this),i=["position","top","bottom","left","right","width","height"],s=e.effects.setMode(r,t.mode||"show"),o=s==="show",u=t.direction||"left",a=u==="up"||u==="down"?"top":"left",f=u==="up"||u==="left",l,c={};e.effects.save(r,i),r.show(),l=t.distance||r[a==="top"?"outerHeight":"outerWidth"](!0),e.effects.createWrapper(r).css({overflow:"hidden"}),o&&r.css(a,f?isNaN(l)?"-"+l:-l:l),c[a]=(o?f?"+=":"-=":f?"-=":"+=")+l,r.animate(c,{queue:!1,duration:t.duration,easing:t.easing,complete:function(){s==="hide"&&r.hide(),e.effects.restore(r,i),e.effects.removeWrapper(r),n()}})}})(jQuery);(function(e,t){e.effects.effect.transfer=function(t,n){var r=e(this),i=e(t.to),s=i.css("position")==="fixed",o=e("body"),u=s?o.scrollTop():0,a=s?o.scrollLeft():0,f=i.offset(),l={top:f.top-u,left:f.left-a,height:i.innerHeight(),width:i.innerWidth()},c=r.offset(),h=e('<div class="ui-effects-transfer"></div>').appendTo(document.body).addClass(t.className).css({top:c.top-u,left:c.left-a,height:r.innerHeight(),width:r.innerWidth(),position:s?"fixed":"absolute"}).animate(l,t.duration,t.easing,function(){h.remove(),n()})}})(jQuery);
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/old_index.html b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/old_index.html
new file mode 100644
index 0000000..a630c2a
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/old_index.html
@@ -0,0 +1,734 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>jQuery UI Bootstrap</title>
+    <meta name="description" content="A preview of the jQuery UI Bootstrap theme">
+    <meta name="author" content="Addy Osmani">
+
+    <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
+    <!--[if lt IE 9]>
+      <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+    <![endif]-->
+
+    <!-- Styles --> 
+    <link type="text/css" href="css/custom-theme/jquery-ui-1.9.2.custom.css" rel="stylesheet" />
+    
+    <link type="text/css" href="assets/css/bootstrap.min.css" rel="stylesheet">
+    <link type="text/css" href="css/demo.css" rel="stylesheet">
+
+  </head>
+
+  <body>
+
+  <!--[if lt IE 9]>
+  <link rel="stylesheet" type="text/css" href="css/custom-theme/jquery.ui.1.9.2.ie.css"/>
+  <![endif]-->
+
+    <div class="navbar navbar-inverse navbar-fixed-top">
+      <div class="navbar-inner">
+        <div class="container">
+          <a class="brand" href="http://github.com/addyosmani/jquery-ui-bootstrap">jQuery UI Bootstrap</a>
+          <div class="nav-collapse collapse">
+              <ul class="nav">
+                <li class="active"><a href="#">Home</a></li>
+                <li><a href="http://github.com/addyosmani/jquery-ui-bootstrap/issues">Feedback/Issues</a></li>
+                <li><a href="http://twitter.com/addyosmani">Contact</a></li>
+              </ul>
+              <form action="" class="pull-right">
+              </form>
+          </div>
+        </div>
+      </div>
+    </div>
+
+
+    <div class="container">
+
+      <div class="content">
+        <div class="page-header">
+          <h1>jQuery UI Bootstrap <small>A Bootstrap-themed kickstart for jQuery UI widgets (v0.25)</small></h1>
+        </div>
+        <div class="row">
+
+          <!--left col-->
+          <div class="span10">
+
+
+          <!--welcome-->
+          <div class="alert-message block-message warning">      
+            <p>
+              <p><strong>Welcome!</strong> This is a live preview of new the jQuery UI Bootstrap theme -  a project I started to bring the beauty of Twitter's <a href="http://twitter.github.com/bootstrap/">Bootstrap</a> to jQuery UI widgets.
+              </p>
+              <p>
+              With this theme, not only do you get the ability to use Bootstrap-themed widgets, but you can now also use (most) of Twitter Bootstrap side-by-wide with it without components breaking visually. </p>
+              <p>
+              It's still a work-in-progress, but I hope you find it useful. Issues and pull requests are always welcome - <a href="http://twitter.com/addyosmani">@addyosmani</a>
+              </p>
+            </p>
+          </div>
+          <!--end welcome-->
+
+
+        <!-- Accordion -->
+            <h2 class="demoHeaders">Accordion</h2>
+            <div id="accordion">
+              <div>
+                <h3><a href="#">First</a></h3>
+                <div>Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet.</div>
+              </div>
+              <div>
+                <h3><a href="#">Second</a></h3>
+                <div>Phasellus mattis tincidunt nibh.</div>
+              </div>
+              <div>
+                <h3><a href="#">Third</a></h3>
+                <div>Nam dui erat, auctor a, dignissim quis.</div>
+              </div>
+            </div>
+            <!--end accordion-->
+
+           <!-- Dialog NOTE: Dialog is not generated by UI in this demo so it can be visually styled in themeroller-->
+            <h2 class="demoHeaders">Dialog</h2>
+            <p><a href="#" id="dialog_link" class="ui-state-default ui-corner-all"><span class="ui-icon ui-icon-newwin"></span>Open Dialog</a>
+            &nbsp;
+            <a href="#" id="modal_link" class="ui-state-default ui-corner-all"><span class="ui-icon ui-icon-newwin"></span>Open Modal Dialog</a>
+            </p>
+
+
+            <h2 class="demoHeaders">Overlay and Shadow Classes</h2>
+            <div style="position: relative; width: 96%; height: 200px; padding:1% 4%; overflow:hidden;" class="fakewindowcontain">
+              <p>Lorem ipsum dolor sit amet,  Nulla nec tortor. Donec id elit quis purus consectetur consequat. </p><p>Nam congue semper tellus. Sed erat dolor, dapibus sit amet, venenatis ornare, ultrices ut, nisi. Aliquam ante. Suspendisse scelerisque dui nec velit. Duis augue augue, gravida euismod, vulputate ac, facilisis id, sem. Morbi in orci. </p><p>Nulla purus lacus, pulvinar vel, malesuada ac, mattis nec, quam. Nam molestie scelerisque quam. Nullam feugiat cursus lacus.orem ipsum dolor sit amet, consectetur adipiscing elit. Donec libero risus, commodo vitae, pharetra mollis, posuere eu, pede. Nulla nec tortor. Donec id elit quis purus consectetur consequat. </p><p>Nam congue semper tellus. Sed erat dolor, dapibus sit amet, venenatis ornare, ultrices ut, nisi. Aliquam ante. Suspendisse scelerisque dui nec velit. Duis augue augue, gravida euismod, vulputate ac, facilisis id, sem. Morbi in orci. Nulla purus lacus, pulvinar vel, malesuada ac, mattis nec, quam. Nam molestie scelerisque quam. </p><p>Nullam feugiat cursus lacus.orem ipsum dolor sit amet, consectetur adipiscing elit. Donec libero risus, commodo vitae, pharetra mollis, posuere eu, pede. Nulla nec tortor. Donec id elit quis purus consectetur consequat. Nam congue semper tellus. Sed erat dolor, dapibus sit amet, venenatis ornare, ultrices ut, nisi. Aliquam ante. </p><p>Suspendisse scelerisque dui nec velit. Duis augue augue, gravida euismod, vulputate ac, facilisis id, sem. Morbi in orci. Nulla purus lacus, pulvinar vel, malesuada ac, mattis nec, quam. Nam molestie scelerisque quam. Nullam feugiat cursus lacus.orem ipsum dolor sit amet, consectetur adipiscing elit. Donec libero risus, commodo vitae, pharetra mollis, posuere eu, pede. Nulla nec tortor. Donec id elit quis purus consectetur consequat. Nam congue semper tellus. Sed erat dolor, dapibus sit amet, venenatis ornare, ultrices ut, nisi. </p>
+
+              <!-- ui-dialog -->
+              <div class="ui-overlay"><div class="ui-widget-overlay"></div><div class="ui-widget-shadow ui-corner-all" style="width: 302px; height: 152px; position: absolute; left: 50px; top: 30px;"></div></div>
+              <div style="position: absolute; width: 280px; height: 130px;left: 50px; top: 30px; padding: 10px;" class="ui-widget ui-widget-content ui-corner-all">
+                <div class="ui-dialog-content ui-widget-content" style="background: none; border: 0;">
+                  <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p>
+                </div>
+              </div>
+
+            </div>
+
+
+            <!-- ui-dialog -->
+            <div id="dialog" title="Dialog Title">
+              <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p>
+            </div>
+
+
+
+            <h2 class="demoHeaders">Framework Icons (content color preview)</h2>
+            <ul id="icons" class="ui-widget ui-helper-clearfix">
+
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-carat-1-n"><span class="ui-icon ui-icon-carat-1-n"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-carat-1-ne"><span class="ui-icon ui-icon-carat-1-ne"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-carat-1-e"><span class="ui-icon ui-icon-carat-1-e"></span></li>
+
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-carat-1-se"><span class="ui-icon ui-icon-carat-1-se"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-carat-1-s"><span class="ui-icon ui-icon-carat-1-s"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-carat-1-sw"><span class="ui-icon ui-icon-carat-1-sw"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-carat-1-w"><span class="ui-icon ui-icon-carat-1-w"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-carat-1-nw"><span class="ui-icon ui-icon-carat-1-nw"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-carat-2-n-s"><span class="ui-icon ui-icon-carat-2-n-s"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-carat-2-e-w"><span class="ui-icon ui-icon-carat-2-e-w"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-triangle-1-n"><span class="ui-icon ui-icon-triangle-1-n"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-triangle-1-ne"><span class="ui-icon ui-icon-triangle-1-ne"></span></li>
+
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-triangle-1-e"><span class="ui-icon ui-icon-triangle-1-e"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-triangle-1-se"><span class="ui-icon ui-icon-triangle-1-se"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-triangle-1-s"><span class="ui-icon ui-icon-triangle-1-s"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-triangle-1-sw"><span class="ui-icon ui-icon-triangle-1-sw"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-triangle-1-w"><span class="ui-icon ui-icon-triangle-1-w"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-triangle-1-nw"><span class="ui-icon ui-icon-triangle-1-nw"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-triangle-2-n-s"><span class="ui-icon ui-icon-triangle-2-n-s"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-triangle-2-e-w"><span class="ui-icon ui-icon-triangle-2-e-w"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-1-n"><span class="ui-icon ui-icon-arrow-1-n"></span></li>
+
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-1-ne"><span class="ui-icon ui-icon-arrow-1-ne"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-1-e"><span class="ui-icon ui-icon-arrow-1-e"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-1-se"><span class="ui-icon ui-icon-arrow-1-se"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-1-s"><span class="ui-icon ui-icon-arrow-1-s"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-1-sw"><span class="ui-icon ui-icon-arrow-1-sw"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-1-w"><span class="ui-icon ui-icon-arrow-1-w"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-1-nw"><span class="ui-icon ui-icon-arrow-1-nw"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-2-n-s"><span class="ui-icon ui-icon-arrow-2-n-s"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-2-ne-sw"><span class="ui-icon ui-icon-arrow-2-ne-sw"></span></li>
+
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-2-e-w"><span class="ui-icon ui-icon-arrow-2-e-w"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-2-se-nw"><span class="ui-icon ui-icon-arrow-2-se-nw"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-arrowstop-1-n"><span class="ui-icon ui-icon-arrowstop-1-n"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-arrowstop-1-e"><span class="ui-icon ui-icon-arrowstop-1-e"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-arrowstop-1-s"><span class="ui-icon ui-icon-arrowstop-1-s"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-arrowstop-1-w"><span class="ui-icon ui-icon-arrowstop-1-w"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-1-n"><span class="ui-icon ui-icon-arrowthick-1-n"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-1-ne"><span class="ui-icon ui-icon-arrowthick-1-ne"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-1-e"><span class="ui-icon ui-icon-arrowthick-1-e"></span></li>
+
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-1-se"><span class="ui-icon ui-icon-arrowthick-1-se"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-1-s"><span class="ui-icon ui-icon-arrowthick-1-s"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-1-sw"><span class="ui-icon ui-icon-arrowthick-1-sw"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-1-w"><span class="ui-icon ui-icon-arrowthick-1-w"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-1-nw"><span class="ui-icon ui-icon-arrowthick-1-nw"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-2-n-s"><span class="ui-icon ui-icon-arrowthick-2-n-s"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-2-ne-sw"><span class="ui-icon ui-icon-arrowthick-2-ne-sw"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-2-e-w"><span class="ui-icon ui-icon-arrowthick-2-e-w"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthick-2-se-nw"><span class="ui-icon ui-icon-arrowthick-2-se-nw"></span></li>
+
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthickstop-1-n"><span class="ui-icon ui-icon-arrowthickstop-1-n"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthickstop-1-e"><span class="ui-icon ui-icon-arrowthickstop-1-e"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthickstop-1-s"><span class="ui-icon ui-icon-arrowthickstop-1-s"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-arrowthickstop-1-w"><span class="ui-icon ui-icon-arrowthickstop-1-w"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-arrowreturnthick-1-w"><span class="ui-icon ui-icon-arrowreturnthick-1-w"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-arrowreturnthick-1-n"><span class="ui-icon ui-icon-arrowreturnthick-1-n"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-arrowreturnthick-1-e"><span class="ui-icon ui-icon-arrowreturnthick-1-e"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-arrowreturnthick-1-s"><span class="ui-icon ui-icon-arrowreturnthick-1-s"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-arrowreturn-1-w"><span class="ui-icon ui-icon-arrowreturn-1-w"></span></li>
+
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-arrowreturn-1-n"><span class="ui-icon ui-icon-arrowreturn-1-n"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-arrowreturn-1-e"><span class="ui-icon ui-icon-arrowreturn-1-e"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-arrowreturn-1-s"><span class="ui-icon ui-icon-arrowreturn-1-s"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-arrowrefresh-1-w"><span class="ui-icon ui-icon-arrowrefresh-1-w"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-arrowrefresh-1-n"><span class="ui-icon ui-icon-arrowrefresh-1-n"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-arrowrefresh-1-e"><span class="ui-icon ui-icon-arrowrefresh-1-e"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-arrowrefresh-1-s"><span class="ui-icon ui-icon-arrowrefresh-1-s"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-4"><span class="ui-icon ui-icon-arrow-4"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-arrow-4-diag"><span class="ui-icon ui-icon-arrow-4-diag"></span></li>
+
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-extlink"><span class="ui-icon ui-icon-extlink"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-newwin"><span class="ui-icon ui-icon-newwin"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-refresh"><span class="ui-icon ui-icon-refresh"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-shuffle"><span class="ui-icon ui-icon-shuffle"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-transfer-e-w"><span class="ui-icon ui-icon-transfer-e-w"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-transferthick-e-w"><span class="ui-icon ui-icon-transferthick-e-w"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-folder-collapsed"><span class="ui-icon ui-icon-folder-collapsed"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-folder-open"><span class="ui-icon ui-icon-folder-open"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-document"><span class="ui-icon ui-icon-document"></span></li>
+
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-document-b"><span class="ui-icon ui-icon-document-b"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-note"><span class="ui-icon ui-icon-note"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-mail-closed"><span class="ui-icon ui-icon-mail-closed"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-mail-open"><span class="ui-icon ui-icon-mail-open"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-suitcase"><span class="ui-icon ui-icon-suitcase"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-comment"><span class="ui-icon ui-icon-comment"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-person"><span class="ui-icon ui-icon-person"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-print"><span class="ui-icon ui-icon-print"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-trash"><span class="ui-icon ui-icon-trash"></span></li>
+
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-locked"><span class="ui-icon ui-icon-locked"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-unlocked"><span class="ui-icon ui-icon-unlocked"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-bookmark"><span class="ui-icon ui-icon-bookmark"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-tag"><span class="ui-icon ui-icon-tag"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-home"><span class="ui-icon ui-icon-home"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-flag"><span class="ui-icon ui-icon-flag"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-calculator"><span class="ui-icon ui-icon-calculator"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-cart"><span class="ui-icon ui-icon-cart"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-pencil"><span class="ui-icon ui-icon-pencil"></span></li>
+
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-clock"><span class="ui-icon ui-icon-clock"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-disk"><span class="ui-icon ui-icon-disk"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-calendar"><span class="ui-icon ui-icon-calendar"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-zoomin"><span class="ui-icon ui-icon-zoomin"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-zoomout"><span class="ui-icon ui-icon-zoomout"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-search"><span class="ui-icon ui-icon-search"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-wrench"><span class="ui-icon ui-icon-wrench"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-gear"><span class="ui-icon ui-icon-gear"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-heart"><span class="ui-icon ui-icon-heart"></span></li>
+
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-star"><span class="ui-icon ui-icon-star"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-link"><span class="ui-icon ui-icon-link"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-cancel"><span class="ui-icon ui-icon-cancel"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-plus"><span class="ui-icon ui-icon-plus"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-plusthick"><span class="ui-icon ui-icon-plusthick"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-minus"><span class="ui-icon ui-icon-minus"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-minusthick"><span class="ui-icon ui-icon-minusthick"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-close"><span class="ui-icon ui-icon-close"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-closethick"><span class="ui-icon ui-icon-closethick"></span></li>
+
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-key"><span class="ui-icon ui-icon-key"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-lightbulb"><span class="ui-icon ui-icon-lightbulb"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-scissors"><span class="ui-icon ui-icon-scissors"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-clipboard"><span class="ui-icon ui-icon-clipboard"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-copy"><span class="ui-icon ui-icon-copy"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-contact"><span class="ui-icon ui-icon-contact"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-image"><span class="ui-icon ui-icon-image"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-video"><span class="ui-icon ui-icon-video"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-script"><span class="ui-icon ui-icon-script"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-alert"><span class="ui-icon ui-icon-alert"></span></li>
+
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-info"><span class="ui-icon ui-icon-info"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-notice"><span class="ui-icon ui-icon-notice"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-help"><span class="ui-icon ui-icon-help"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-check"><span class="ui-icon ui-icon-check"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-bullet"><span class="ui-icon ui-icon-bullet"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-radio-off"><span class="ui-icon ui-icon-radio-off"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-radio-on"><span class="ui-icon ui-icon-radio-on"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-pin-w"><span class="ui-icon ui-icon-pin-w"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-pin-s"><span class="ui-icon ui-icon-pin-s"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-play"><span class="ui-icon ui-icon-play"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-pause"><span class="ui-icon ui-icon-pause"></span></li>
+
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-seek-next"><span class="ui-icon ui-icon-seek-next"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-seek-prev"><span class="ui-icon ui-icon-seek-prev"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-seek-end"><span class="ui-icon ui-icon-seek-end"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-seek-first"><span class="ui-icon ui-icon-seek-first"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-stop"><span class="ui-icon ui-icon-stop"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-eject"><span class="ui-icon ui-icon-eject"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-volume-off"><span class="ui-icon ui-icon-volume-off"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-volume-on"><span class="ui-icon ui-icon-volume-on"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-power"><span class="ui-icon ui-icon-power"></span></li>
+
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-signal-diag"><span class="ui-icon ui-icon-signal-diag"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-signal"><span class="ui-icon ui-icon-signal"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-battery-0"><span class="ui-icon ui-icon-battery-0"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-battery-1"><span class="ui-icon ui-icon-battery-1"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-battery-2"><span class="ui-icon ui-icon-battery-2"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-battery-3"><span class="ui-icon ui-icon-battery-3"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-circle-plus"><span class="ui-icon ui-icon-circle-plus"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-circle-minus"><span class="ui-icon ui-icon-circle-minus"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-circle-close"><span class="ui-icon ui-icon-circle-close"></span></li>
+
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-circle-triangle-e"><span class="ui-icon ui-icon-circle-triangle-e"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-circle-triangle-s"><span class="ui-icon ui-icon-circle-triangle-s"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-circle-triangle-w"><span class="ui-icon ui-icon-circle-triangle-w"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-circle-triangle-n"><span class="ui-icon ui-icon-circle-triangle-n"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-circle-arrow-e"><span class="ui-icon ui-icon-circle-arrow-e"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-circle-arrow-s"><span class="ui-icon ui-icon-circle-arrow-s"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-circle-arrow-w"><span class="ui-icon ui-icon-circle-arrow-w"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-circle-arrow-n"><span class="ui-icon ui-icon-circle-arrow-n"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-circle-zoomin"><span class="ui-icon ui-icon-circle-zoomin"></span></li>
+
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-circle-zoomout"><span class="ui-icon ui-icon-circle-zoomout"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-circle-check"><span class="ui-icon ui-icon-circle-check"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-circlesmall-plus"><span class="ui-icon ui-icon-circlesmall-plus"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-circlesmall-minus"><span class="ui-icon ui-icon-circlesmall-minus"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-circlesmall-close"><span class="ui-icon ui-icon-circlesmall-close"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-squaresmall-plus"><span class="ui-icon ui-icon-squaresmall-plus"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-squaresmall-minus"><span class="ui-icon ui-icon-squaresmall-minus"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-squaresmall-close"><span class="ui-icon ui-icon-squaresmall-close"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-grip-dotted-vertical"><span class="ui-icon ui-icon-grip-dotted-vertical"></span></li>
+
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-grip-dotted-horizontal"><span class="ui-icon ui-icon-grip-dotted-horizontal"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-grip-solid-vertical"><span class="ui-icon ui-icon-grip-solid-vertical"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-grip-solid-horizontal"><span class="ui-icon ui-icon-grip-solid-horizontal"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-gripsmall-diagonal-se"><span class="ui-icon ui-icon-gripsmall-diagonal-se"></span></li>
+            <li class="ui-state-default ui-corner-all" title=".ui-icon-grip-diagonal-se"><span class="ui-icon ui-icon-grip-diagonal-se"></span></li>
+            </ul>
+
+            <!-- Tabs -->
+            <h2 class="demoHeaders">Tabs</h2>
+            <div id="tabs">
+              <ul>
+                <li><a href="#tabs-1">First</a></li>
+                <li><a href="#tabs-2">Second</a></li>
+                <li><a href="#tabs-3">Third</a></li>
+              </ul>
+              <div id="tabs-1">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</div>
+              <div id="tabs-2">Phasellus mattis tincidunt nibh. Cras orci urna, blandit id, pretium vel, aliquet ornare, felis. Maecenas scelerisque sem non nisl. Fusce sed lorem in enim dictum bibendum.</div>
+              <div id="tabs-3">Nam dui erat, auctor a, dignissim quis, sollicitudin eu, felis. Pellentesque nisi urna, interdum eget, sagittis et, consequat vestibulum, lacus. Mauris porttitor ullamcorper augue.</div>
+            </div>
+            <!--end tabs-->
+
+            <!--Dynamic tabs-->
+            <style>
+              #dialog2 label, #dialog2 input { display:block; }
+              #dialog2 label { margin-top: 0.5em; }
+              #dialog2 input, #dialog2 textarea { width: 95%; }
+              #tabs2 { margin-top: 1em; }
+              #tabs2 li .ui-icon-close { float: left; margin: 0.4em 0.2em 0 0; cursor: pointer; }
+              #add_tab { cursor: pointer; }          
+            </style>
+
+
+            <p>&nbsp;</p>
+            <div class="demo">
+
+              <h2 class="demoHeaders">Dynamic Tabs</h2>
+              <div id="dialog2" title="Tab data">
+                <form>
+                  <fieldset class="ui-helper-reset">
+                    <label for="tab_title">Title</label>
+                    <input type="text" name="tab_title" id="tab_title" value="" class="ui-widget-content ui-corner-all" />
+                    <label for="tab_content">Content</label>
+                    <textarea name="tab_content" id="tab_content" class="ui-widget-content ui-corner-all"></textarea>
+                  </fieldset>
+                </form>
+              </div>
+
+              <button id="add_tab" class="ui-button-primary">Add Tab</button>
+
+              <div id="tabs2">
+                <ul>
+                  <li><a href="#tabs-1">Nunc tincidunt</a></li>
+                </ul>
+                <div id="tabs-1">
+                  <p>Proin elit arcu, rutrum commodo, vehicula tempus, commodo a, risus. Curabitur nec arcu. Donec sollicitudin mi sit amet mauris. Nam elementum quam ullamcorper ante. Etiam aliquet massa et lorem. Mauris dapibus lacus auctor risus. Aenean tempor ullamcorper leo. Vivamus sed magna quis ligula eleifend adipiscing. Duis orci. Aliquam sodales tortor vitae ipsum. Aliquam nulla. Duis aliquam molestie erat. Ut et mauris vel pede varius sollicitudin. Sed ut dolor nec orci tincidunt interdum. Phasellus ipsum. Nunc tristique tempus lectus.</p>
+                </div>
+              </div>
+
+            </div><!-- End demo -->
+
+            <div class="demo-description">
+            <p>Simple tabs adding and removing.</p>
+            </div><!-- End demo-description -->
+
+
+          <!--start combinations-->
+          <h2 class="demoHeaders">Combination examples</h2>
+            <div class="columnbox" style="height: 200px;">
+              <div id="tabs3">
+                <ul>
+                  <li><a href="#tabs3-1">First</a></li>
+                  <li><a href="#tabs3-2">Second</a></li>
+                  <li><a href="#tabs3-3">Third</a></li>
+                </ul>
+                <div id="tabs3-1">
+                  <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse eget diam nec urna hendrerit tempus. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum aliquam ligula non nulla cursus volutpat. Aliquam malesuada felis nec turpis auctor interdum. Cras et lobortis dolor. Nam sodales, dolor eu cursus faucibus, justo leo vestibulum turpis, id malesuada erat ipsum et leo. Integer id aliquam augue. Proin quis risus magna.</p>
+                  <a href="#" id="sampleButton">Change</a>
+                </div>
+                <div id="tabs3-2">Tab 2</div>
+                <div id="tabs3-3">Tab 3</div>
+              </div>
+            </div>
+          <!--end combinations-->
+            <br />
+
+
+
+
+          <!--start filamentgroup datepicker-->
+            <link href="third-party/jQuery-UI-Date-Range-Picker/css/ui.daterangepicker.css" media="screen" rel="Stylesheet" type="text/css" />
+
+            <p>&nbsp;</p>
+            <h2>FilamentGroup Date Range Picker</h2>
+            <p>&nbsp;</p>
+            <p>
+              The date range picker plugin code is open source and available in a git repository, <a href="https://github.com/filamentgroup/jQuery-UI-Date-Range-Picker">jQuery-UI-Date-Range-Picker</a>. For demonstration sakes it is included in this theme pack with style updates.
+            </p>
+            <p>
+            <h3>Default Rangepicker</h3>  
+            <div>
+              <input type="text" value="4/23/99" id="rangeA" />     
+            </div>
+
+            <h3>2 inputs Rangepicker</h3> 
+            <div>
+              <input type="text" value="4/23/99" id="rangeBa" />  
+              <input type="text" value="4/23/99" id="rangeBb" />      
+            </div>
+
+            </p>
+            <!--end filament group datepicker-->
+              <!-- Tooltip -->
+              <h2 class="demoHeaders">Tooltip</h2>
+              <div id="tooltip">
+                  <p><a href="#" title="That's what this widget is">Tooltips</a> can be attached to any element. When you hover
+                      the element with your mouse, the title attribute is displayed in a little box next to the element, just like a native tooltip.</p>
+                  <p>But as it's not a native tooltip, it can be styled. Any themes built with
+                      <a href="http://themeroller.com" title="ThemeRoller: jQuery UI's theme builder application">ThemeRoller</a>
+                      will also style tooltips accordingly.</p>
+                  <p>Tooltips are also useful for form elements, to show some additional information in the context of each field.</p>
+                  <p><label for="age">Your age:</label><input id="age" title="We ask for your age only for statistical purposes." /></p>
+                  <p>Hover the field to see the tooltip.</p>
+              </div>
+            <!--End Tooltip -->
+          </div>
+          <!--end col-->
+
+          <!--right col-->
+          <div class="span4">
+
+            <!-- Buttons -->
+            <h2 class="demoHeaders">Buttons</h2>
+            <div id="buttons">
+
+              <button>Default</button>
+              <button class="ui-button-primary">Primary</button>
+              <button class="ui-button-success">Success</button>
+              </br>
+              </br>
+              <button class="ui-button-error">Danger</button>
+
+              <a class="button">Anchor</a>
+
+              <input type="submit" class="button" value="Submit"/>
+
+            </div>
+
+            </br>
+          
+          <!-- Button set-->
+            <h2 class="demoHeaders">Button set</h2>
+              <form style="margin-top: 1em;">
+                <div id="radioset">
+                  <input type="radio" id="radio1" name="radio" /><label for="radio1">Choice 1</label>
+                  <input type="radio" id="radio2" name="radio" checked="checked" /><label for="radio2">Choice 2</label>
+                  <input type="radio" id="radio3" name="radio" /><label for="radio3">Choice 3</label>
+                </div>
+                </br>
+                <div id="format">
+                <input type="checkbox" id="check1" /><label for="check1">B</label>
+                <input type="checkbox" id="check2" /><label for="check2">I</label>
+                <input type="checkbox" id="check3" /><label for="check3">U</label>
+                </div>
+                </br>
+              </form>
+          <!--end button set-->
+
+
+          <!-- File Input-->
+          <link href="third-party/jQuery-UI-FileInput/css/enhanced.css" rel="Stylesheet">
+          <h2 class="demoheaders">File Input</h2>
+          <form style="margin-top: 1em;"> 
+            <input type="file" class="span3" name="file" id="file">
+          </form>
+          <!-- end file input -->
+
+
+            <!-- Slider -->
+            <h2 class="demoHeaders">Horizontal Slider</h2>
+            <div id="slider"></div>
+            <!--end slider-->
+
+          <!-- Progressbar -->
+            <h2 class="demoHeaders">Progressbar</h2>
+            <div id="progressbar"></div>
+          <!--end progressbar-->
+
+
+            <!-- Highlight / Error -->
+            <h2 class="demoHeaders">Highlight / Error</h2>
+            <div class="ui-widget">
+              <div class="ui-state-highlight ui-corner-all">
+                <p><span class="ui-icon ui-icon-info" style="float: left; margin-right: .3em;"></span>
+                <strong>Hey!</strong> Sample ui-state-highlight style.</p>
+              </div>
+            </div>
+
+            <div class="ui-widget">
+              <div class="ui-state-error ui-corner-all">
+                <p><span class="ui-icon ui-icon-alert" style="float: left; margin-right: .3em;"></span>
+                <strong>Alert:</strong> Sample ui-state-error style.</p>
+              </div>
+            </div>
+
+
+            <div class="ui-widget">
+              <div class="ui-state-default ui-corner-all">
+                <p><span class="ui-icon ui-icon-mail-closed" style="float: left; margin-right: .3em;"></span>
+                <strong>Hello:</strong> Sample ui-state-default style.</p>
+              </div>
+            </div>
+            <!--end highlights-->
+
+
+
+            <!--Autocomplete-->
+            <h2 class="demoHeaders">Autocomplete</h2>
+            <!--autocomplete-->
+            <div class="ui-widget">
+              <label for="tags">Tags: </label>
+              <input id="tags" />
+            </div>
+            <!--end autocomplete-->
+
+
+            <!-- Datepicker -->
+            <h2 class="demoHeaders">Datepicker</h2>
+            <div id="datepicker"></div>
+            <!--end datepicker-->
+
+
+
+            <!--start toolbar-->
+
+            <div class="demo">
+              <p>&nbsp;</p>
+              <h2 class="demoHeaders">Simple toolbar</h2>
+              <p></p>
+              <div id="toolbar" class="ui-toolbar ui-widget-header ui-corner-all">
+
+                <input type="checkbox" id="shuffle" /><label for="shuffle">Shuffle</label>
+                
+                <span id="repeat">
+                  <input type="radio" id="repeat0" name="repeat" checked="checked" /><label for="repeat0">No Repeat</label>
+                  <input type="radio" id="repeat1" name="repeat" /><label for="repeat1">Once</label>
+                  <input type="radio" id="repeatall" name="repeat" /><label for="repeatall">All</label>
+                </span>
+
+              </div>
+            </div><!-- End demo -->
+            <!--end toolbar-->
+
+
+            <!-- Vertical Slider -->
+            <h2 class="demoHeaders">Vertical Slider</h2>
+            <p class="ui-state-default ui-corner-all ui-helper-clearfix" style="padding:4px;">
+            <span class="ui-icon ui-icon-volume-on" style="float:left; margin:-2px 5px 0 0;"></span>
+            Master volume
+            </p>
+            <p>
+              <label for="amount">Volume:</label>
+              <input type="text" id="amount" style="border:0; color:#f6931f; font-weight:bold;" />
+            </p>
+
+            <div id="slider-vertical" style="height:200px;"></div>
+
+              <!-- Menu -->
+              <h2 class="demoHeaders">Menu</h2>
+                <p></p>
+                <ul id="menu">
+                  <li><a href="#">Aberdeen</a></li>
+                  <li><a href="#">Ada</a></li>
+                  <li><a href="#">Adamsville</a></li>
+                  <li><a href="#">Addyston</a></li>
+                  <li>
+                      <a href="#">Delphi</a>
+                      <ul>
+                          <li><a href="#">Ada</a></li>
+                          <li><a href="#">Saarland</a></li>
+                          <li><a href="#">Salzburg</a></li>
+                      </ul>
+                  </li>
+                  <li><a href="#">Saarland</a></li>
+                  <li>
+                      <a href="#">Salzburg</a>
+                      <ul>
+                          <li>
+                              <a href="#">Delphi</a>
+                              <ul>
+                                  <li><a href="#">Ada</a></li>
+                                  <li><a href="#">Saarland</a></li>
+                                  <li><a href="#">Salzburg</a></li>
+                              </ul>
+                          </li>
+                          <li>
+                              <a href="?Delphi">Delphi</a>
+                              <ul>
+                                  <li><a href="#">Ada</a></li>
+                                  <li><a href="#">Saarland</a></li>
+                                  <li><a href="#">Salzburg</a></li>
+                              </ul>
+                          </li>
+                          <li><a href="#">Perch</a></li>
+                      </ul>
+                  </li>
+              </ul>
+              <!-- End demo -->
+              <p></p>
+              <!-- Spinner -->
+              <h2 class="demoHeaders">Spinner</h2>
+              <p>
+                  <label for="spinner">Select a value:</label>
+                  <input id="spinner" name="value" />
+              </p>
+
+              <p>
+                  <button id="disable">Toggle disable/enable</button>
+                  <button id="destroy">Toggle widget</button>
+              </p>
+
+              <p>
+                  <button id="getvalue">Get value</button>
+                  <button id="setvalue">Set value to 5</button>
+              </p>
+              <!-- End demo -->
+            <p></p>
+          </div>
+          <!--end col-->
+
+        </div>
+
+        <div>
+            <!--begin wijmo menu-->
+            <link href="third-party/wijmo/jquery.wijmo-open.1.5.0.css" rel="stylesheet" type="text/css" />
+            <style>
+                .wijmo-container
+                {
+                    display: block;
+                    clear: both;
+                    width: 600px;
+                }
+            </style>
+            <div class="wijmo-container">
+                <p>
+                    &nbsp;</p>
+                <h2 class="demoHeaders">
+                    Wijmo Menu</h2>
+                <p>
+                    This is an example of how to retheme one of the Wijmo jQuery UI components to match the Twitter Bootstrap theme. Whilst a menu component will be arriving to jQueryUI soon, you can find the menu in <a href="http://wijmo.com/widgets/wijmo-open/">Wijmo Open</a>.</p>
+                <ul id="menu1">
+                    <li>
+                        <h3>
+                            <a href="">Project Name</a></h3>
+                    </li>
+                    <li><a href="#">Home</a></li>
+                    <li><a href="#">Link</a></li>
+                    <li><a href="#">Link</a></li>
+                    <li><a href="#">Dropdown</a>
+                        <ul>
+                            <li><a href="#">Secondary link</a> </li>
+                            <li><a href="#">Something else here</a> </li>
+                            <li></li>
+                            <li><a href="#">Another link</a> </li>
+                        </ul>
+                    </li>
+                    <li>
+                        <input type="text" placeholder="Search">
+                    </li>
+                </ul>
+                <!-- End demo markup -->
+            </div>
+            <!--end wijmo menu-->
+        </div>
+        <p></p>
+        <!--notice-->
+        <div class="well">
+            <p>This theme's support for more third-party widgets may improve over-time, based on requests and the popularity of the widgets.</p>
+        </div>
+      </div>
+
+      <footer>
+        <p>jQuery UI Bootstrap &copy; Addy Osmani 2012. Twitter Bootstrap &copy; Twitter 2012</p>
+      </footer>
+
+    </div> <!-- /container -->
+
+
+        <!--static dialog-->
+          <div id="dialog-message" title="Modal Dialog">
+            <p>
+              <span class="ui-icon ui-icon-circle-check" style="float:left; margin:0 7px 50px 0;"></span>
+              Your files have downloaded successfully into the My Downloads folder.
+            </p>
+            <p>
+              Currently using <b>36% of your storage space</b>.
+            </p>
+          </div>
+        <!--end static dialog-->
+
+        <!--scripts-->
+
+        <script type="text/javascript" src="js/jquery-1.8.3.min.js"></script>
+        <script type="text/javascript" src="js/jquery-ui-1.9.2.custom.min.js"></script>
+        <!--daterangepicker-->
+        <script type="text/javascript" src="third-party/jQuery-UI-Date-Range-Picker/js/date.js"></script>
+        <script type="text/javascript" src="third-party/jQuery-UI-Date-Range-Picker/js/daterangepicker.jQuery.js"></script>
+
+        <!--wijmo-->
+        <script src="third-party/wijmo/jquery.mousewheel.min.js" type="text/javascript"></script>
+        <script src="third-party/wijmo/jquery.bgiframe-2.1.3-pre.js" type="text/javascript"></script>
+        <script src="third-party/wijmo/jquery.wijmo-open.1.5.0.min.js" type="text/javascript"></script>
+
+
+        <!-- FileInput -->
+        <script src="third-party/jQuery-UI-FileInput/js/enhance.min.js" type="text/javascript"></script>
+        <script src="third-party/jQuery-UI-FileInput/js/fileinput.jquery.js" type="text/javascript"></script>
+
+        <!--init for this page-->
+        <script type="text/javascript" src="js/demo.js"></script>
+
+
+
+  </body>
+</html>
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/third-party/jQuery-UI-Date-Range-Picker/css/ui.daterangepicker.css b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/third-party/jQuery-UI-Date-Range-Picker/css/ui.daterangepicker.css
new file mode 100644
index 0000000..9851f24
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/third-party/jQuery-UI-Date-Range-Picker/css/ui.daterangepicker.css
@@ -0,0 +1,160 @@
+/*styles for jquery ui daterangepicker plugin */
+
+.ui-daterangepickercontain {
+	position: absolute;
+	z-index: 999;
+}
+.ui-daterangepickercontain .ui-daterangepicker {
+	float: left;
+	padding: 5px !important;
+	width: auto;
+	display: inline;
+	background-image: none !important;
+	clear: left;
+}
+.ui-daterangepicker ul, .ui-daterangepicker .ranges, .ui-daterangepicker .range-start, .ui-daterangepicker .range-end {
+	float: left;
+	padding: 0;
+	margin: 0;
+}
+.ui-daterangepicker .ranges {
+	width: auto;
+	position: relative;
+	padding: 5px 5px 40px 0;
+	margin-left: 10px;
+}
+.ui-daterangepicker .range-start, .ui-daterangepicker .range-end {
+	margin-left: 5px;
+}
+.ui-daterangepicker button.btnDone {
+
+  clear:both;
+  cursor:pointer;
+  position:absolute;
+  bottom:0;
+  right:0;
+  cursor: pointer;
+  display: inline-block;
+  background-color: #e6e6e6;
+  background-repeat: no-repeat;
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));
+  background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+  background-image: -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);
+  background-image: -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+  background-image: -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+  background-image: linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);
+  padding: 5px 14px 6px;
+  margin: 5px;
+  text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
+  color: #333;
+  font-size: 13px;
+  line-height: normal;
+  border: 1px solid #ccc;
+  border-bottom-color: #bbb;
+  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+  -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+  box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+  -webkit-transition: 0.1s linear background-image;
+  -moz-transition: 0.1s linear background-image;
+  -ms-transition: 0.1s linear background-image;
+  -o-transition: 0.1s linear background-image;
+  transition: 0.1s linear background-image;
+   overflow: visible;
+
+}
+.ui-daterangepicker ul {
+	width: 17.6em;
+	background: none;
+	border: 0;
+}
+.ui-daterangepicker li {
+	list-style: none;
+	padding: 1px;
+	cursor: pointer;
+	margin: 1px 0;
+}
+.ui-daterangepicker .ui-widget-header{
+	border:1px solid #ccc;
+}
+
+.ui-daterangepicker .ui-state-hover{
+	padding: 1px;
+    color: #ffffff;
+    background: #0064cd;
+    background-color: #0064cd;
+    background-repeat: repeat-x;
+    background-image: -khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));
+    background-image: -moz-linear-gradient(top, #049cdb, #0064cd);
+    background-image: -ms-linear-gradient(top, #049cdb, #0064cd);
+    background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));
+    background-image: -webkit-linear-gradient(top, #049cdb, #0064cd);
+    background-image: -o-linear-gradient(top, #049cdb, #0064cd);
+    background-image: linear-gradient(top, #049cdb, #0064cd);
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0);
+    text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+    border-color: #0064cd #0064cd #003f81;
+    border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+}
+
+.ui-daterangepicker .ui-state-hover a{
+	color:#fff;
+}
+
+.ui-daterangepicker .ui-widget{
+	padding-right:4px;
+}
+.ui-daterangepicker li.preset_0 {
+	margin-top: 1.5em !important;
+}
+.ui-daterangepicker .ui-widget-content a {
+	text-decoration: none !important;
+	font-weight:normal;
+}
+.ui-daterangepicker li a {
+	font-weight: normal;
+	margin: .3em .5em;
+	display: block;
+}
+.ui-daterangepicker li span {
+	float: right;
+	margin: .3em .2em;
+}
+
+.ui-daterangepicker .title-start, .ui-daterangepicker .title-end {
+	display: block;
+	margin: 0 0 .2em;
+	font-size: 1em;
+	padding: 0 4px 2px;
+}
+.ui-daterangepicker .ui-datepicker-inline {
+	font-size: 1em;
+}
+.ui-daterangepicker-arrows {
+	padding: 2px;
+	width: 204px;
+	position: relative;
+}
+.ui-daterangepicker-arrows input.ui-rangepicker-input {
+	width: 158px;
+	margin: 0 2px 0 20px;
+	padding: 2px;
+	height: 1.1em;
+}
+.ui-daterangepicker-arrows .ui-daterangepicker-prev, .ui-daterangepicker-arrows .ui-daterangepicker-next {
+	position: absolute;
+	top: 2px; 
+	padding: 1px;
+}
+.ui-daterangepicker-arrows .ui-daterangepicker-prev {
+	left: 2px;
+}
+.ui-daterangepicker-arrows .ui-daterangepicker-next {
+	right: 2px;
+}
+.ui-daterangepicker-arrows .ui-daterangepicker-prev:hover, 
+.ui-daterangepicker-arrows .ui-daterangepicker-next:hover,
+.ui-daterangepicker-arrows .ui-daterangepicker-prev:focus, 
+.ui-daterangepicker-arrows .ui-daterangepicker-next:focus {
+	padding: 0;
+}
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/third-party/jQuery-UI-Date-Range-Picker/index.html b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/third-party/jQuery-UI-Date-Range-Picker/index.html
new file mode 100644
index 0000000..1aa877e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/third-party/jQuery-UI-Date-Range-Picker/index.html
@@ -0,0 +1,66 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+		<title>Themeroller-Ready jQuery UI Range Picker</title>
+		<link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.7/themes/redmond/jquery-ui.css" type="text/css" />
+		<link rel="stylesheet" href="css/ui.daterangepicker.css" type="text/css" />
+		
+		<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js"></script>
+		<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.7/jquery-ui.min.js"></script>
+		<script type="text/javascript" src="js/date.js"></script>
+		<script type="text/javascript" src="js/daterangepicker.jQuery.js"></script>
+		<script type="text/javascript">	
+			$(function(){
+				  $('#rangeA').daterangepicker(); 
+				  $('#rangeBa, #rangeBb').daterangepicker(); 
+				  $('#rangeC').daterangepicker({arrows: true}); 
+				  $('#rangeD').daterangepicker(); 
+				  $('#rangeE').daterangepicker({constrainDates: true}); 
+			 });
+		</script>
+		
+		<!-- from here down, demo-related styles and scripts -->
+		<!-- from here down, demo-related styles and scripts -->
+		<link rel="shortcut icon" href="/images/favicon2.ico" type="image/x-icon" />
+		<link href="/style/demoPages" media="screen" rel="Stylesheet" type="text/css" />
+
+		<style type="text/css">
+			body { font-size: 62.5%; }
+			input {width: 196px; height: 1.1em; display:block;}
+			h2 { clear: both; padding: 2em 0 0; }
+			#rangeBa,#rangeBb { float: left; margin-right: 10px; }
+		</style>
+	</head>
+	<body>
+
+<h2>Default Rangepicker</h2>	
+<div>
+		<input type="text" value="4/23/99" id="rangeA" />			
+</div>
+
+<h2>2 inputs Rangepicker</h2>	
+<div>
+		<input type="text" value="4/23/99" id="rangeBa" />	
+		<input type="text" value="4/23/99" id="rangeBb" />			
+</div>
+	
+<h2>Rangepicker with arrows</h2>	
+<div>
+		<input type="text" value="4/23/99" id="rangeC" />			
+</div>
+
+<h2>Rangepicker opening to the right</h2>
+<div style="float: right;">
+		<input type="text" value="4/23/99" id="rangeD" />			
+</div>
+
+<h2>Rangepicker with contraints</h2>
+<div>
+		<input type="text" value="4/23/99" id="rangeE" />			
+</div>
+
+
+</html>
+
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/third-party/jQuery-UI-Date-Range-Picker/js/date.js b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/third-party/jQuery-UI-Date-Range-Picker/js/date.js
new file mode 100644
index 0000000..6a26418
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/third-party/jQuery-UI-Date-Range-Picker/js/date.js
@@ -0,0 +1,375 @@
+/**
+ * Version: 1.0 Alpha-1 
+ * Build Date: 13-Nov-2007
+ * Copyright (c) 2006-2007, Coolite Inc. (http://www.coolite.com/). All rights reserved.
+ * License: Licensed under The MIT License. See license.txt and http://www.datejs.com/license/. 
+ * Website: http://www.datejs.com/ or http://www.coolite.com/datejs/
+ */
+Date.CultureInfo={name:"en-US",englishName:"English (United States)",nativeName:"English (United States)",dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],abbreviatedDayNames:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],shortestDayNames:["Su","Mo","Tu","We","Th","Fr","Sa"],firstLetterDayNames:["S","M","T","W","T","F","S"],monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],abbreviatedMonthNames:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],amDesignator:"AM",pmDesignator:"PM",firstDayOfWeek:0,twoDigitYearMax:2029,dateElementOrder:"mdy",formatPatterns:{shortDate:"M/d/yyyy",longDate:"dddd, MMMM dd, yyyy",shortTime:"h:mm tt",longTime:"h:mm:ss tt",fullDateTime:"dddd, MMMM dd, yyyy h:mm:ss tt",sortableDateTime:"yyyy-MM-ddTHH:mm:ss",universalSortableDateTime:"yyyy-MM-dd HH:mm:ssZ",rfc1123:"ddd, dd MMM yyyy HH:mm:ss GMT",monthDay:"MMMM dd",yearMonth:"MMMM, yyyy"},regexPatterns:{jan:/^jan(uary)?/i,feb:/^feb(ruary)?/i,mar:/^mar(ch)?/i,apr:/^apr(il)?/i,may:/^may/i,jun:/^jun(e)?/i,jul:/^jul(y)?/i,aug:/^aug(ust)?/i,sep:/^sep(t(ember)?)?/i,oct:/^oct(ober)?/i,nov:/^nov(ember)?/i,dec:/^dec(ember)?/i,sun:/^su(n(day)?)?/i,mon:/^mo(n(day)?)?/i,tue:/^tu(e(s(day)?)?)?/i,wed:/^we(d(nesday)?)?/i,thu:/^th(u(r(s(day)?)?)?)?/i,fri:/^fr(i(day)?)?/i,sat:/^sa(t(urday)?)?/i,future:/^next/i,past:/^last|past|prev(ious)?/i,add:/^(\+|after|from)/i,subtract:/^(\-|before|ago)/i,yesterday:/^yesterday/i,today:/^t(oday)?/i,tomorrow:/^tomorrow/i,now:/^n(ow)?/i,millisecond:/^ms|milli(second)?s?/i,second:/^sec(ond)?s?/i,minute:/^min(ute)?s?/i,hour:/^h(ou)?rs?/i,week:/^w(ee)?k/i,month:/^m(o(nth)?s?)?/i,day:/^d(ays?)?/i,year:/^y((ea)?rs?)?/i,shortMeridian:/^(a|p)/i,longMeridian:/^(a\.?m?\.?|p\.?m?\.?)/i,timezone:/^((e(s|d)t|c(s|d)t|m(s|d)t|p(s|d)t)|((gmt)?\s*(\+|\-)\s*\d\d\d\d?)|gmt)/i,ordinalSuffix:/^\s*(st|nd|rd|th)/i,timeContext:/^\s*(\:|a|p)/i},abbreviatedTimeZoneStandard:{GMT:"-000",EST:"-0400",CST:"-0500",MST:"-0600",PST:"-0700"},abbreviatedTimeZoneDST:{GMT:"-000",EDT:"-0500",CDT:"-0600",MDT:"-0700",PDT:"-0800"}};
+Date.getMonthNumberFromName=function(name){var n=Date.CultureInfo.monthNames,m=Date.CultureInfo.abbreviatedMonthNames,s=name.toLowerCase();for(var i=0;i<n.length;i++){if(n[i].toLowerCase()==s||m[i].toLowerCase()==s){return i;}}
+return-1;};Date.getDayNumberFromName=function(name){var n=Date.CultureInfo.dayNames,m=Date.CultureInfo.abbreviatedDayNames,o=Date.CultureInfo.shortestDayNames,s=name.toLowerCase();for(var i=0;i<n.length;i++){if(n[i].toLowerCase()==s||m[i].toLowerCase()==s){return i;}}
+return-1;};Date.isLeapYear=function(year){return(((year%4===0)&&(year%100!==0))||(year%400===0));};Date.getDaysInMonth=function(year,month){return[31,(Date.isLeapYear(year)?29:28),31,30,31,30,31,31,30,31,30,31][month];};Date.getTimezoneOffset=function(s,dst){return(dst||false)?Date.CultureInfo.abbreviatedTimeZoneDST[s.toUpperCase()]:Date.CultureInfo.abbreviatedTimeZoneStandard[s.toUpperCase()];};Date.getTimezoneAbbreviation=function(offset,dst){var n=(dst||false)?Date.CultureInfo.abbreviatedTimeZoneDST:Date.CultureInfo.abbreviatedTimeZoneStandard,p;for(p in n){if(n[p]===offset){return p;}}
+return null;};Date.prototype.clone=function(){return new Date(this.getTime());};Date.prototype.compareTo=function(date){if(isNaN(this)){throw new Error(this);}
+if(date instanceof Date&&!isNaN(date)){return(this>date)?1:(this<date)?-1:0;}else{throw new TypeError(date);}};Date.prototype.equals=function(date){return(this.compareTo(date)===0);};Date.prototype.between=function(start,end){var t=this.getTime();return t>=start.getTime()&&t<=end.getTime();};Date.prototype.addMilliseconds=function(value){this.setMilliseconds(this.getMilliseconds()+value);return this;};Date.prototype.addSeconds=function(value){return this.addMilliseconds(value*1000);};Date.prototype.addMinutes=function(value){return this.addMilliseconds(value*60000);};Date.prototype.addHours=function(value){return this.addMilliseconds(value*3600000);};Date.prototype.addDays=function(value){return this.addMilliseconds(value*86400000);};Date.prototype.addWeeks=function(value){return this.addMilliseconds(value*604800000);};Date.prototype.addMonths=function(value){var n=this.getDate();this.setDate(1);this.setMonth(this.getMonth()+value);this.setDate(Math.min(n,this.getDaysInMonth()));return this;};Date.prototype.addYears=function(value){return this.addMonths(value*12);};Date.prototype.add=function(config){if(typeof config=="number"){this._orient=config;return this;}
+var x=config;if(x.millisecond||x.milliseconds){this.addMilliseconds(x.millisecond||x.milliseconds);}
+if(x.second||x.seconds){this.addSeconds(x.second||x.seconds);}
+if(x.minute||x.minutes){this.addMinutes(x.minute||x.minutes);}
+if(x.hour||x.hours){this.addHours(x.hour||x.hours);}
+if(x.month||x.months){this.addMonths(x.month||x.months);}
+if(x.year||x.years){this.addYears(x.year||x.years);}
+if(x.day||x.days){this.addDays(x.day||x.days);}
+return this;};Date._validate=function(value,min,max,name){if(typeof value!="number"){throw new TypeError(value+" is not a Number.");}else if(value<min||value>max){throw new RangeError(value+" is not a valid value for "+name+".");}
+return true;};Date.validateMillisecond=function(n){return Date._validate(n,0,999,"milliseconds");};Date.validateSecond=function(n){return Date._validate(n,0,59,"seconds");};Date.validateMinute=function(n){return Date._validate(n,0,59,"minutes");};Date.validateHour=function(n){return Date._validate(n,0,23,"hours");};Date.validateDay=function(n,year,month){return Date._validate(n,1,Date.getDaysInMonth(year,month),"days");};Date.validateMonth=function(n){return Date._validate(n,0,11,"months");};Date.validateYear=function(n){return Date._validate(n,1,9999,"seconds");};Date.prototype.set=function(config){var x=config;if(!x.millisecond&&x.millisecond!==0){x.millisecond=-1;}
+if(!x.second&&x.second!==0){x.second=-1;}
+if(!x.minute&&x.minute!==0){x.minute=-1;}
+if(!x.hour&&x.hour!==0){x.hour=-1;}
+if(!x.day&&x.day!==0){x.day=-1;}
+if(!x.month&&x.month!==0){x.month=-1;}
+if(!x.year&&x.year!==0){x.year=-1;}
+if(x.millisecond!=-1&&Date.validateMillisecond(x.millisecond)){this.addMilliseconds(x.millisecond-this.getMilliseconds());}
+if(x.second!=-1&&Date.validateSecond(x.second)){this.addSeconds(x.second-this.getSeconds());}
+if(x.minute!=-1&&Date.validateMinute(x.minute)){this.addMinutes(x.minute-this.getMinutes());}
+if(x.hour!=-1&&Date.validateHour(x.hour)){this.addHours(x.hour-this.getHours());}
+if(x.month!==-1&&Date.validateMonth(x.month)){this.addMonths(x.month-this.getMonth());}
+if(x.year!=-1&&Date.validateYear(x.year)){this.addYears(x.year-this.getFullYear());}
+if(x.day!=-1&&Date.validateDay(x.day,this.getFullYear(),this.getMonth())){this.addDays(x.day-this.getDate());}
+if(x.timezone){this.setTimezone(x.timezone);}
+if(x.timezoneOffset){this.setTimezoneOffset(x.timezoneOffset);}
+return this;};Date.prototype.clearTime=function(){this.setHours(0);this.setMinutes(0);this.setSeconds(0);this.setMilliseconds(0);return this;};Date.prototype.isLeapYear=function(){var y=this.getFullYear();return(((y%4===0)&&(y%100!==0))||(y%400===0));};Date.prototype.isWeekday=function(){return!(this.is().sat()||this.is().sun());};Date.prototype.getDaysInMonth=function(){return Date.getDaysInMonth(this.getFullYear(),this.getMonth());};Date.prototype.moveToFirstDayOfMonth=function(){return this.set({day:1});};Date.prototype.moveToLastDayOfMonth=function(){return this.set({day:this.getDaysInMonth()});};Date.prototype.moveToDayOfWeek=function(day,orient){var diff=(day-this.getDay()+7*(orient||+1))%7;return this.addDays((diff===0)?diff+=7*(orient||+1):diff);};Date.prototype.moveToMonth=function(month,orient){var diff=(month-this.getMonth()+12*(orient||+1))%12;return this.addMonths((diff===0)?diff+=12*(orient||+1):diff);};Date.prototype.getDayOfYear=function(){return Math.floor((this-new Date(this.getFullYear(),0,1))/86400000);};Date.prototype.getWeekOfYear=function(firstDayOfWeek){var y=this.getFullYear(),m=this.getMonth(),d=this.getDate();var dow=firstDayOfWeek||Date.CultureInfo.firstDayOfWeek;var offset=7+1-new Date(y,0,1).getDay();if(offset==8){offset=1;}
+var daynum=((Date.UTC(y,m,d,0,0,0)-Date.UTC(y,0,1,0,0,0))/86400000)+1;var w=Math.floor((daynum-offset+7)/7);if(w===dow){y--;var prevOffset=7+1-new Date(y,0,1).getDay();if(prevOffset==2||prevOffset==8){w=53;}else{w=52;}}
+return w;};Date.prototype.isDST=function(){return this.toString().match(/(E|C|M|P)(S|D)T/)[2]=="D";};Date.prototype.getTimezone=function(){return Date.getTimezoneAbbreviation(this.getUTCOffset,this.isDST());};Date.prototype.setTimezoneOffset=function(s){var here=this.getTimezoneOffset(),there=Number(s)*-6/10;this.addMinutes(there-here);return this;};Date.prototype.setTimezone=function(s){return this.setTimezoneOffset(Date.getTimezoneOffset(s));};Date.prototype.getUTCOffset=function(){var n=this.getTimezoneOffset()*-10/6,r;if(n<0){r=(n-10000).toString();return r[0]+r.substr(2);}else{r=(n+10000).toString();return"+"+r.substr(1);}};Date.prototype.getDayName=function(abbrev){return abbrev?Date.CultureInfo.abbreviatedDayNames[this.getDay()]:Date.CultureInfo.dayNames[this.getDay()];};Date.prototype.getMonthName=function(abbrev){return abbrev?Date.CultureInfo.abbreviatedMonthNames[this.getMonth()]:Date.CultureInfo.monthNames[this.getMonth()];};Date.prototype._toString=Date.prototype.toString;Date.prototype.toString=function(format){var self=this;var p=function p(s){return(s.toString().length==1)?"0"+s:s;};return format?format.replace(/dd?d?d?|MM?M?M?|yy?y?y?|hh?|HH?|mm?|ss?|tt?|zz?z?/g,function(format){switch(format){case"hh":return p(self.getHours()<13?self.getHours():(self.getHours()-12));case"h":return self.getHours()<13?self.getHours():(self.getHours()-12);case"HH":return p(self.getHours());case"H":return self.getHours();case"mm":return p(self.getMinutes());case"m":return self.getMinutes();case"ss":return p(self.getSeconds());case"s":return self.getSeconds();case"yyyy":return self.getFullYear();case"yy":return self.getFullYear().toString().substring(2,4);case"dddd":return self.getDayName();case"ddd":return self.getDayName(true);case"dd":return p(self.getDate());case"d":return self.getDate().toString();case"MMMM":return self.getMonthName();case"MMM":return self.getMonthName(true);case"MM":return p((self.getMonth()+1));case"M":return self.getMonth()+1;case"t":return self.getHours()<12?Date.CultureInfo.amDesignator.substring(0,1):Date.CultureInfo.pmDesignator.substring(0,1);case"tt":return self.getHours()<12?Date.CultureInfo.amDesignator:Date.CultureInfo.pmDesignator;case"zzz":case"zz":case"z":return"";}}):this._toString();};
+Date.now=function(){return new Date();};Date.today=function(){return Date.now().clearTime();};Date.prototype._orient=+1;Date.prototype.next=function(){this._orient=+1;return this;};Date.prototype.last=Date.prototype.prev=Date.prototype.previous=function(){this._orient=-1;return this;};Date.prototype._is=false;Date.prototype.is=function(){this._is=true;return this;};Number.prototype._dateElement="day";Number.prototype.fromNow=function(){var c={};c[this._dateElement]=this;return Date.now().add(c);};Number.prototype.ago=function(){var c={};c[this._dateElement]=this*-1;return Date.now().add(c);};(function(){var $D=Date.prototype,$N=Number.prototype;var dx=("sunday monday tuesday wednesday thursday friday saturday").split(/\s/),mx=("january february march april may june july august september october november december").split(/\s/),px=("Millisecond Second Minute Hour Day Week Month Year").split(/\s/),de;var df=function(n){return function(){if(this._is){this._is=false;return this.getDay()==n;}
+return this.moveToDayOfWeek(n,this._orient);};};for(var i=0;i<dx.length;i++){$D[dx[i]]=$D[dx[i].substring(0,3)]=df(i);}
+var mf=function(n){return function(){if(this._is){this._is=false;return this.getMonth()===n;}
+return this.moveToMonth(n,this._orient);};};for(var j=0;j<mx.length;j++){$D[mx[j]]=$D[mx[j].substring(0,3)]=mf(j);}
+var ef=function(j){return function(){if(j.substring(j.length-1)!="s"){j+="s";}
+return this["add"+j](this._orient);};};var nf=function(n){return function(){this._dateElement=n;return this;};};for(var k=0;k<px.length;k++){de=px[k].toLowerCase();$D[de]=$D[de+"s"]=ef(px[k]);$N[de]=$N[de+"s"]=nf(de);}}());Date.prototype.toJSONString=function(){return this.toString("yyyy-MM-ddThh:mm:ssZ");};Date.prototype.toShortDateString=function(){return this.toString(Date.CultureInfo.formatPatterns.shortDatePattern);};Date.prototype.toLongDateString=function(){return this.toString(Date.CultureInfo.formatPatterns.longDatePattern);};Date.prototype.toShortTimeString=function(){return this.toString(Date.CultureInfo.formatPatterns.shortTimePattern);};Date.prototype.toLongTimeString=function(){return this.toString(Date.CultureInfo.formatPatterns.longTimePattern);};Date.prototype.getOrdinal=function(){switch(this.getDate()){case 1:case 21:case 31:return"st";case 2:case 22:return"nd";case 3:case 23:return"rd";default:return"th";}};
+(function(){Date.Parsing={Exception:function(s){this.message="Parse error at '"+s.substring(0,10)+" ...'";}};var $P=Date.Parsing;var _=$P.Operators={rtoken:function(r){return function(s){var mx=s.match(r);if(mx){return([mx[0],s.substring(mx[0].length)]);}else{throw new $P.Exception(s);}};},token:function(s){return function(s){return _.rtoken(new RegExp("^\s*"+s+"\s*"))(s);};},stoken:function(s){return _.rtoken(new RegExp("^"+s));},until:function(p){return function(s){var qx=[],rx=null;while(s.length){try{rx=p.call(this,s);}catch(e){qx.push(rx[0]);s=rx[1];continue;}
+break;}
+return[qx,s];};},many:function(p){return function(s){var rx=[],r=null;while(s.length){try{r=p.call(this,s);}catch(e){return[rx,s];}
+rx.push(r[0]);s=r[1];}
+return[rx,s];};},optional:function(p){return function(s){var r=null;try{r=p.call(this,s);}catch(e){return[null,s];}
+return[r[0],r[1]];};},not:function(p){return function(s){try{p.call(this,s);}catch(e){return[null,s];}
+throw new $P.Exception(s);};},ignore:function(p){return p?function(s){var r=null;r=p.call(this,s);return[null,r[1]];}:null;},product:function(){var px=arguments[0],qx=Array.prototype.slice.call(arguments,1),rx=[];for(var i=0;i<px.length;i++){rx.push(_.each(px[i],qx));}
+return rx;},cache:function(rule){var cache={},r=null;return function(s){try{r=cache[s]=(cache[s]||rule.call(this,s));}catch(e){r=cache[s]=e;}
+if(r instanceof $P.Exception){throw r;}else{return r;}};},any:function(){var px=arguments;return function(s){var r=null;for(var i=0;i<px.length;i++){if(px[i]==null){continue;}
+try{r=(px[i].call(this,s));}catch(e){r=null;}
+if(r){return r;}}
+throw new $P.Exception(s);};},each:function(){var px=arguments;return function(s){var rx=[],r=null;for(var i=0;i<px.length;i++){if(px[i]==null){continue;}
+try{r=(px[i].call(this,s));}catch(e){throw new $P.Exception(s);}
+rx.push(r[0]);s=r[1];}
+return[rx,s];};},all:function(){var px=arguments,_=_;return _.each(_.optional(px));},sequence:function(px,d,c){d=d||_.rtoken(/^\s*/);c=c||null;if(px.length==1){return px[0];}
+return function(s){var r=null,q=null;var rx=[];for(var i=0;i<px.length;i++){try{r=px[i].call(this,s);}catch(e){break;}
+rx.push(r[0]);try{q=d.call(this,r[1]);}catch(ex){q=null;break;}
+s=q[1];}
+if(!r){throw new $P.Exception(s);}
+if(q){throw new $P.Exception(q[1]);}
+if(c){try{r=c.call(this,r[1]);}catch(ey){throw new $P.Exception(r[1]);}}
+return[rx,(r?r[1]:s)];};},between:function(d1,p,d2){d2=d2||d1;var _fn=_.each(_.ignore(d1),p,_.ignore(d2));return function(s){var rx=_fn.call(this,s);return[[rx[0][0],r[0][2]],rx[1]];};},list:function(p,d,c){d=d||_.rtoken(/^\s*/);c=c||null;return(p instanceof Array?_.each(_.product(p.slice(0,-1),_.ignore(d)),p.slice(-1),_.ignore(c)):_.each(_.many(_.each(p,_.ignore(d))),px,_.ignore(c)));},set:function(px,d,c){d=d||_.rtoken(/^\s*/);c=c||null;return function(s){var r=null,p=null,q=null,rx=null,best=[[],s],last=false;for(var i=0;i<px.length;i++){q=null;p=null;r=null;last=(px.length==1);try{r=px[i].call(this,s);}catch(e){continue;}
+rx=[[r[0]],r[1]];if(r[1].length>0&&!last){try{q=d.call(this,r[1]);}catch(ex){last=true;}}else{last=true;}
+if(!last&&q[1].length===0){last=true;}
+if(!last){var qx=[];for(var j=0;j<px.length;j++){if(i!=j){qx.push(px[j]);}}
+p=_.set(qx,d).call(this,q[1]);if(p[0].length>0){rx[0]=rx[0].concat(p[0]);rx[1]=p[1];}}
+if(rx[1].length<best[1].length){best=rx;}
+if(best[1].length===0){break;}}
+if(best[0].length===0){return best;}
+if(c){try{q=c.call(this,best[1]);}catch(ey){throw new $P.Exception(best[1]);}
+best[1]=q[1];}
+return best;};},forward:function(gr,fname){return function(s){return gr[fname].call(this,s);};},replace:function(rule,repl){return function(s){var r=rule.call(this,s);return[repl,r[1]];};},process:function(rule,fn){return function(s){var r=rule.call(this,s);return[fn.call(this,r[0]),r[1]];};},min:function(min,rule){return function(s){var rx=rule.call(this,s);if(rx[0].length<min){throw new $P.Exception(s);}
+return rx;};}};var _generator=function(op){return function(){var args=null,rx=[];if(arguments.length>1){args=Array.prototype.slice.call(arguments);}else if(arguments[0]instanceof Array){args=arguments[0];}
+if(args){for(var i=0,px=args.shift();i<px.length;i++){args.unshift(px[i]);rx.push(op.apply(null,args));args.shift();return rx;}}else{return op.apply(null,arguments);}};};var gx="optional not ignore cache".split(/\s/);for(var i=0;i<gx.length;i++){_[gx[i]]=_generator(_[gx[i]]);}
+var _vector=function(op){return function(){if(arguments[0]instanceof Array){return op.apply(null,arguments[0]);}else{return op.apply(null,arguments);}};};var vx="each any all".split(/\s/);for(var j=0;j<vx.length;j++){_[vx[j]]=_vector(_[vx[j]]);}}());(function(){var flattenAndCompact=function(ax){var rx=[];for(var i=0;i<ax.length;i++){if(ax[i]instanceof Array){rx=rx.concat(flattenAndCompact(ax[i]));}else{if(ax[i]){rx.push(ax[i]);}}}
+return rx;};Date.Grammar={};Date.Translator={hour:function(s){return function(){this.hour=Number(s);};},minute:function(s){return function(){this.minute=Number(s);};},second:function(s){return function(){this.second=Number(s);};},meridian:function(s){return function(){this.meridian=s.slice(0,1).toLowerCase();};},timezone:function(s){return function(){var n=s.replace(/[^\d\+\-]/g,"");if(n.length){this.timezoneOffset=Number(n);}else{this.timezone=s.toLowerCase();}};},day:function(x){var s=x[0];return function(){this.day=Number(s.match(/\d+/)[0]);};},month:function(s){return function(){this.month=((s.length==3)?Date.getMonthNumberFromName(s):(Number(s)-1));};},year:function(s){return function(){var n=Number(s);this.year=((s.length>2)?n:(n+(((n+2000)<Date.CultureInfo.twoDigitYearMax)?2000:1900)));};},rday:function(s){return function(){switch(s){case"yesterday":this.days=-1;break;case"tomorrow":this.days=1;break;case"today":this.days=0;break;case"now":this.days=0;this.now=true;break;}};},finishExact:function(x){x=(x instanceof Array)?x:[x];var now=new Date();this.year=now.getFullYear();this.month=now.getMonth();this.day=1;this.hour=0;this.minute=0;this.second=0;for(var i=0;i<x.length;i++){if(x[i]){x[i].call(this);}}
+this.hour=(this.meridian=="p"&&this.hour<13)?this.hour+12:this.hour;if(this.day>Date.getDaysInMonth(this.year,this.month)){throw new RangeError(this.day+" is not a valid value for days.");}
+var r=new Date(this.year,this.month,this.day,this.hour,this.minute,this.second);if(this.timezone){r.set({timezone:this.timezone});}else if(this.timezoneOffset){r.set({timezoneOffset:this.timezoneOffset});}
+return r;},finish:function(x){x=(x instanceof Array)?flattenAndCompact(x):[x];if(x.length===0){return null;}
+for(var i=0;i<x.length;i++){if(typeof x[i]=="function"){x[i].call(this);}}
+if(this.now){return new Date();}
+var today=Date.today();var method=null;var expression=!!(this.days!=null||this.orient||this.operator);if(expression){var gap,mod,orient;orient=((this.orient=="past"||this.operator=="subtract")?-1:1);if(this.weekday){this.unit="day";gap=(Date.getDayNumberFromName(this.weekday)-today.getDay());mod=7;this.days=gap?((gap+(orient*mod))%mod):(orient*mod);}
+if(this.month){this.unit="month";gap=(this.month-today.getMonth());mod=12;this.months=gap?((gap+(orient*mod))%mod):(orient*mod);this.month=null;}
+if(!this.unit){this.unit="day";}
+if(this[this.unit+"s"]==null||this.operator!=null){if(!this.value){this.value=1;}
+if(this.unit=="week"){this.unit="day";this.value=this.value*7;}
+this[this.unit+"s"]=this.value*orient;}
+return today.add(this);}else{if(this.meridian&&this.hour){this.hour=(this.hour<13&&this.meridian=="p")?this.hour+12:this.hour;}
+if(this.weekday&&!this.day){this.day=(today.addDays((Date.getDayNumberFromName(this.weekday)-today.getDay()))).getDate();}
+if(this.month&&!this.day){this.day=1;}
+return today.set(this);}}};var _=Date.Parsing.Operators,g=Date.Grammar,t=Date.Translator,_fn;g.datePartDelimiter=_.rtoken(/^([\s\-\.\,\/\x27]+)/);g.timePartDelimiter=_.stoken(":");g.whiteSpace=_.rtoken(/^\s*/);g.generalDelimiter=_.rtoken(/^(([\s\,]|at|on)+)/);var _C={};g.ctoken=function(keys){var fn=_C[keys];if(!fn){var c=Date.CultureInfo.regexPatterns;var kx=keys.split(/\s+/),px=[];for(var i=0;i<kx.length;i++){px.push(_.replace(_.rtoken(c[kx[i]]),kx[i]));}
+fn=_C[keys]=_.any.apply(null,px);}
+return fn;};g.ctoken2=function(key){return _.rtoken(Date.CultureInfo.regexPatterns[key]);};g.h=_.cache(_.process(_.rtoken(/^(0[0-9]|1[0-2]|[1-9])/),t.hour));g.hh=_.cache(_.process(_.rtoken(/^(0[0-9]|1[0-2])/),t.hour));g.H=_.cache(_.process(_.rtoken(/^([0-1][0-9]|2[0-3]|[0-9])/),t.hour));g.HH=_.cache(_.process(_.rtoken(/^([0-1][0-9]|2[0-3])/),t.hour));g.m=_.cache(_.process(_.rtoken(/^([0-5][0-9]|[0-9])/),t.minute));g.mm=_.cache(_.process(_.rtoken(/^[0-5][0-9]/),t.minute));g.s=_.cache(_.process(_.rtoken(/^([0-5][0-9]|[0-9])/),t.second));g.ss=_.cache(_.process(_.rtoken(/^[0-5][0-9]/),t.second));g.hms=_.cache(_.sequence([g.H,g.mm,g.ss],g.timePartDelimiter));g.t=_.cache(_.process(g.ctoken2("shortMeridian"),t.meridian));g.tt=_.cache(_.process(g.ctoken2("longMeridian"),t.meridian));g.z=_.cache(_.process(_.rtoken(/^(\+|\-)?\s*\d\d\d\d?/),t.timezone));g.zz=_.cache(_.process(_.rtoken(/^(\+|\-)\s*\d\d\d\d/),t.timezone));g.zzz=_.cache(_.process(g.ctoken2("timezone"),t.timezone));g.timeSuffix=_.each(_.ignore(g.whiteSpace),_.set([g.tt,g.zzz]));g.time=_.each(_.optional(_.ignore(_.stoken("T"))),g.hms,g.timeSuffix);g.d=_.cache(_.process(_.each(_.rtoken(/^([0-2]\d|3[0-1]|\d)/),_.optional(g.ctoken2("ordinalSuffix"))),t.day));g.dd=_.cache(_.process(_.each(_.rtoken(/^([0-2]\d|3[0-1])/),_.optional(g.ctoken2("ordinalSuffix"))),t.day));g.ddd=g.dddd=_.cache(_.process(g.ctoken("sun mon tue wed thu fri sat"),function(s){return function(){this.weekday=s;};}));g.M=_.cache(_.process(_.rtoken(/^(1[0-2]|0\d|\d)/),t.month));g.MM=_.cache(_.process(_.rtoken(/^(1[0-2]|0\d)/),t.month));g.MMM=g.MMMM=_.cache(_.process(g.ctoken("jan feb mar apr may jun jul aug sep oct nov dec"),t.month));g.y=_.cache(_.process(_.rtoken(/^(\d\d?)/),t.year));g.yy=_.cache(_.process(_.rtoken(/^(\d\d)/),t.year));g.yyy=_.cache(_.process(_.rtoken(/^(\d\d?\d?\d?)/),t.year));g.yyyy=_.cache(_.process(_.rtoken(/^(\d\d\d\d)/),t.year));_fn=function(){return _.each(_.any.apply(null,arguments),_.not(g.ctoken2("timeContext")));};g.day=_fn(g.d,g.dd);g.month=_fn(g.M,g.MMM);g.year=_fn(g.yyyy,g.yy);g.orientation=_.process(g.ctoken("past future"),function(s){return function(){this.orient=s;};});g.operator=_.process(g.ctoken("add subtract"),function(s){return function(){this.operator=s;};});g.rday=_.process(g.ctoken("yesterday tomorrow today now"),t.rday);g.unit=_.process(g.ctoken("minute hour day week month year"),function(s){return function(){this.unit=s;};});g.value=_.process(_.rtoken(/^\d\d?(st|nd|rd|th)?/),function(s){return function(){this.value=s.replace(/\D/g,"");};});g.expression=_.set([g.rday,g.operator,g.value,g.unit,g.orientation,g.ddd,g.MMM]);_fn=function(){return _.set(arguments,g.datePartDelimiter);};g.mdy=_fn(g.ddd,g.month,g.day,g.year);g.ymd=_fn(g.ddd,g.year,g.month,g.day);g.dmy=_fn(g.ddd,g.day,g.month,g.year);g.date=function(s){return((g[Date.CultureInfo.dateElementOrder]||g.mdy).call(this,s));};g.format=_.process(_.many(_.any(_.process(_.rtoken(/^(dd?d?d?|MM?M?M?|yy?y?y?|hh?|HH?|mm?|ss?|tt?|zz?z?)/),function(fmt){if(g[fmt]){return g[fmt];}else{throw Date.Parsing.Exception(fmt);}}),_.process(_.rtoken(/^[^dMyhHmstz]+/),function(s){return _.ignore(_.stoken(s));}))),function(rules){return _.process(_.each.apply(null,rules),t.finishExact);});var _F={};var _get=function(f){return _F[f]=(_F[f]||g.format(f)[0]);};g.formats=function(fx){if(fx instanceof Array){var rx=[];for(var i=0;i<fx.length;i++){rx.push(_get(fx[i]));}
+return _.any.apply(null,rx);}else{return _get(fx);}};g._formats=g.formats(["yyyy-MM-ddTHH:mm:ss","ddd, MMM dd, yyyy H:mm:ss tt","ddd MMM d yyyy HH:mm:ss zzz","d"]);g._start=_.process(_.set([g.date,g.time,g.expression],g.generalDelimiter,g.whiteSpace),t.finish);g.start=function(s){try{var r=g._formats.call({},s);if(r[1].length===0){return r;}}catch(e){}
+return g._start.call({},s);};}());Date._parse=Date.parse;Date.parse=function(s){var r=null;if(!s){return null;}
+try{r=Date.Grammar.start.call({},s);}catch(e){return null;}
+return((r[1].length===0)?r[0]:null);};Date.getParseFunction=function(fx){var fn=Date.Grammar.formats(fx);return function(s){var r=null;try{r=fn.call({},s);}catch(e){return null;}
+return((r[1].length===0)?r[0]:null);};};Date.parseExact=function(s,fx){return Date.getParseFunction(fx)(s);};
+
+
+/**
+ * @version: 1.0 Alpha-1
+ * @author: Coolite Inc. http://www.coolite.com/
+ * : 2008-04-13
+ * @copyright: Copyright (c) 2006-2008, Coolite Inc. (http://www.coolite.com/). All rights reserved.
+ * @license: Licensed under The MIT License. See license.txt and http://www.datejs.com/license/. 
+ * @website: http://www.datejs.com/
+ */
+ 
+/* 
+ * TimeSpan(milliseconds);
+ * TimeSpan(days, hours, minutes, seconds);
+ * TimeSpan(days, hours, minutes, seconds, milliseconds);
+ */
+var TimeSpan = function (days, hours, minutes, seconds, milliseconds) {
+	var attrs = "days hours minutes seconds milliseconds".split(/\s+/);
+	
+	var gFn = function (attr) { 
+		return function () { 
+			return this[attr]; 
+		}; 
+	};
+	
+	var sFn = function (attr) { 
+		return function (val) { 
+			this[attr] = val; 
+			return this; 
+		}; 
+	};
+	
+	for (var i = 0; i < attrs.length ; i++) {
+		var $a = attrs[i], $b = $a.slice(0, 1).toUpperCase() + $a.slice(1);
+		TimeSpan.prototype[$a] = 0;
+		TimeSpan.prototype["get" + $b] = gFn($a);
+		TimeSpan.prototype["set" + $b] = sFn($a);
+	}
+
+	if (arguments.length == 4) { 
+		this.setDays(days); 
+		this.setHours(hours); 
+		this.setMinutes(minutes); 
+		this.setSeconds(seconds); 
+	} else if (arguments.length == 5) { 
+		this.setDays(days); 
+		this.setHours(hours); 
+		this.setMinutes(minutes); 
+		this.setSeconds(seconds); 
+		this.setMilliseconds(milliseconds); 
+	} else if (arguments.length == 1 && typeof days == "number") {
+		var orient = (days < 0) ? -1 : +1;
+		this.setMilliseconds(Math.abs(days));
+		
+		this.setDays(Math.floor(this.getMilliseconds() / 86400000) * orient);
+		this.setMilliseconds(this.getMilliseconds() % 86400000);
+
+		this.setHours(Math.floor(this.getMilliseconds() / 3600000) * orient);
+		this.setMilliseconds(this.getMilliseconds() % 3600000);
+
+		this.setMinutes(Math.floor(this.getMilliseconds() / 60000) * orient);
+		this.setMilliseconds(this.getMilliseconds() % 60000);
+
+		this.setSeconds(Math.floor(this.getMilliseconds() / 1000) * orient);
+		this.setMilliseconds(this.getMilliseconds() % 1000);
+
+		this.setMilliseconds(this.getMilliseconds() * orient);
+	}
+
+	this.getTotalMilliseconds = function () {
+		return (this.getDays() * 86400000) + (this.getHours() * 3600000) + (this.getMinutes() * 60000) + (this.getSeconds() * 1000); 
+	};
+	
+	this.compareTo = function (time) {
+		var t1 = new Date(1970, 1, 1, this.getHours(), this.getMinutes(), this.getSeconds()), t2;
+		if (time === null) { 
+			t2 = new Date(1970, 1, 1, 0, 0, 0); 
+		}
+		else {
+			t2 = new Date(1970, 1, 1, time.getHours(), time.getMinutes(), time.getSeconds());
+		}
+		return (t1 < t2) ? -1 : (t1 > t2) ? 1 : 0;
+	};
+
+	this.equals = function (time) {
+		return (this.compareTo(time) === 0);
+	};    
+
+	this.add = function (time) { 
+		return (time === null) ? this : this.addSeconds(time.getTotalMilliseconds() / 1000); 
+	};
+
+	this.subtract = function (time) { 
+		return (time === null) ? this : this.addSeconds(-time.getTotalMilliseconds() / 1000); 
+	};
+
+	this.addDays = function (n) { 
+		return new TimeSpan(this.getTotalMilliseconds() + (n * 86400000)); 
+	};
+
+	this.addHours = function (n) { 
+		return new TimeSpan(this.getTotalMilliseconds() + (n * 3600000)); 
+	};
+
+	this.addMinutes = function (n) { 
+		return new TimeSpan(this.getTotalMilliseconds() + (n * 60000)); 
+	};
+
+	this.addSeconds = function (n) {
+		return new TimeSpan(this.getTotalMilliseconds() + (n * 1000)); 
+	};
+
+	this.addMilliseconds = function (n) {
+		return new TimeSpan(this.getTotalMilliseconds() + n); 
+	};
+
+	this.get12HourHour = function () {
+		return (this.getHours() > 12) ? this.getHours() - 12 : (this.getHours() === 0) ? 12 : this.getHours();
+	};
+
+	this.getDesignator = function () { 
+		return (this.getHours() < 12) ? Date.CultureInfo.amDesignator : Date.CultureInfo.pmDesignator;
+	};
+
+	this.toString = function (format) {
+		this._toString = function () {
+			if (this.getDays() !== null && this.getDays() > 0) {
+				return this.getDays() + "." + this.getHours() + ":" + this.p(this.getMinutes()) + ":" + this.p(this.getSeconds());
+			}
+			else { 
+				return this.getHours() + ":" + this.p(this.getMinutes()) + ":" + this.p(this.getSeconds());
+			}
+		};
+		
+		this.p = function (s) {
+			return (s.toString().length < 2) ? "0" + s : s;
+		};
+		
+		var me = this;
+		
+		return format ? format.replace(/dd?|HH?|hh?|mm?|ss?|tt?/g, 
+		function (format) {
+			switch (format) {
+			case "d":	
+				return me.getDays();
+			case "dd":	
+				return me.p(me.getDays());
+			case "H":	
+				return me.getHours();
+			case "HH":	
+				return me.p(me.getHours());
+			case "h":	
+				return me.get12HourHour();
+			case "hh":	
+				return me.p(me.get12HourHour());
+			case "m":	
+				return me.getMinutes();
+			case "mm":	
+				return me.p(me.getMinutes());
+			case "s":	
+				return me.getSeconds();
+			case "ss":	
+				return me.p(me.getSeconds());
+			case "t":	
+				return ((me.getHours() < 12) ? Date.CultureInfo.amDesignator : Date.CultureInfo.pmDesignator).substring(0, 1);
+			case "tt":	
+				return (me.getHours() < 12) ? Date.CultureInfo.amDesignator : Date.CultureInfo.pmDesignator;
+			}
+		}
+		) : this._toString();
+	};
+	return this;
+};    
+
+/**
+ * Gets the time of day for this date instances. 
+ * @return {TimeSpan} TimeSpan
+ */
+Date.prototype.getTimeOfDay = function () {
+	return new TimeSpan(0, this.getHours(), this.getMinutes(), this.getSeconds(), this.getMilliseconds());
+};
+
+/* 
+ * TimePeriod(startDate, endDate);
+ * TimePeriod(years, months, days, hours, minutes, seconds, milliseconds);
+ */
+var TimePeriod = function (years, months, days, hours, minutes, seconds, milliseconds) {
+	var attrs = "years months days hours minutes seconds milliseconds".split(/\s+/);
+	
+	var gFn = function (attr) { 
+		return function () { 
+			return this[attr]; 
+		}; 
+	};
+	
+	var sFn = function (attr) { 
+		return function (val) { 
+			this[attr] = val; 
+			return this; 
+		}; 
+	};
+	
+	for (var i = 0; i < attrs.length ; i++) {
+		var $a = attrs[i], $b = $a.slice(0, 1).toUpperCase() + $a.slice(1);
+		TimePeriod.prototype[$a] = 0;
+		TimePeriod.prototype["get" + $b] = gFn($a);
+		TimePeriod.prototype["set" + $b] = sFn($a);
+	}
+	
+	if (arguments.length == 7) { 
+		this.years = years;
+		this.months = months;
+		this.setDays(days);
+		this.setHours(hours); 
+		this.setMinutes(minutes); 
+		this.setSeconds(seconds); 
+		this.setMilliseconds(milliseconds);
+	} else if (arguments.length == 2 && arguments[0] instanceof Date && arguments[1] instanceof Date) {
+		// startDate and endDate as arguments
+	
+		var d1 = years.clone();
+		var d2 = months.clone();
+	
+		var temp = d1.clone();
+		var orient = (d1 > d2) ? -1 : +1;
+		
+		this.years = d2.getFullYear() - d1.getFullYear();
+		temp.addYears(this.years);
+		
+		if (orient == +1) {
+			if (temp > d2) {
+				if (this.years !== 0) {
+					this.years--;
+				}
+			}
+		} else {
+			if (temp < d2) {
+				if (this.years !== 0) {
+					this.years++;
+				}
+			}
+		}
+		
+		d1.addYears(this.years);
+
+		if (orient == +1) {
+			while (d1 < d2 && d1.clone().addDays(Date.getDaysInMonth(d1.getYear(), d1.getMonth()) ) < d2) {
+				d1.addMonths(1);
+				this.months++;
+			}
+		}
+		else {
+			while (d1 > d2 && d1.clone().addDays(-d1.getDaysInMonth()) > d2) {
+				d1.addMonths(-1);
+				this.months--;
+			}
+		}
+		
+		var diff = d2 - d1;
+
+		if (diff !== 0) {
+			var ts = new TimeSpan(diff);
+			this.setDays(ts.getDays());
+			this.setHours(ts.getHours());
+			this.setMinutes(ts.getMinutes());
+			this.setSeconds(ts.getSeconds());
+			this.setMilliseconds(ts.getMilliseconds());
+		}
+	}
+	return this;
+};
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/third-party/jQuery-UI-Date-Range-Picker/js/daterangepicker.jQuery.compressed.js b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/third-party/jQuery-UI-Date-Range-Picker/js/daterangepicker.jQuery.compressed.js
new file mode 100644
index 0000000..caa48ea
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/third-party/jQuery-UI-Date-Range-Picker/js/daterangepicker.jQuery.compressed.js
@@ -0,0 +1 @@
+(function(a){a.fn.daterangepicker=function(s){var d=a(this);var e=a.extend({presetRanges:[{text:"Today",dateStart:"today",dateEnd:"today"},{text:"Last 7 days",dateStart:"today-7days",dateEnd:"today"},{text:"Month to date",dateStart:function(){return Date.parse("today").moveToFirstDayOfMonth()},dateEnd:"today"},{text:"Year to date",dateStart:function(){var w=Date.parse("today");w.setMonth(0);w.setDate(1);return w},dateEnd:"today"},{text:"The previous Month",dateStart:function(){return Date.parse("1 month ago").moveToFirstDayOfMonth()},dateEnd:function(){return Date.parse("1 month ago").moveToLastDayOfMonth()}}],presets:{specificDate:"Specific Date",allDatesBefore:"All Dates Before",allDatesAfter:"All Dates After",dateRange:"Date Range"},rangeStartTitle:"Start date",rangeEndTitle:"End date",nextLinkText:"Next",prevLinkText:"Prev",target:d,doneButtonText:"Done",earliestDate:Date.parse("-15years"),latestDate:Date.parse("+15years"),constrainDates:false,rangeSplitter:"-",dateFormat:"m/d/yy",closeOnSelect:true,arrows:false,appendTo:"body",onClose:function(){},onOpen:function(){},onChange:function(){},datepickerOptions:null},s);var g={onSelect:function(A,z){var y=j.find(".range-start");var B=j.find(".range-end");if(j.find(".ui-daterangepicker-specificDate").is(".ui-state-active")){B.datepicker("setDate",y.datepicker("getDate"))}a(this).trigger("constrainOtherPicker");var x=b(y.datepicker("getDate"));var w=b(B.datepicker("getDate"));if(d.length==2){d.eq(0).val(x);d.eq(1).val(w)}else{d.val((x!=w)?x+" "+e.rangeSplitter+" "+w:x)}if(e.closeOnSelect){if(!j.find("li.ui-state-active").is(".ui-daterangepicker-dateRange")&&!j.is(":animated")){k()}a(this).trigger("constrainOtherPicker");e.onChange()}},defaultDate:+0};d.bind("change",e.onChange);e.datepickerOptions=(s)?a.extend(g,s.datepickerOptions):g;var m,l=Date.parse("today");var o,i;if(d.size()==2){o=Date.parse(d.eq(0).val());i=Date.parse(d.eq(1).val());if(o==null){o=i}if(i==null){i=o}}else{o=Date.parse(d.val().split(e.rangeSplitter)[0]);i=Date.parse(d.val().split(e.rangeSplitter)[1]);if(i==null){i=o}}if(o!=null){m=o}if(i!=null){l=i}var j=a('<div class="ui-daterangepicker ui-widget ui-helper-clearfix ui-widget-content ui-corner-all"></div>');var u=(function(){var y=a('<ul class="ui-widget-content"></ul>').appendTo(j);a.each(e.presetRanges,function(){a('<li class="ui-daterangepicker-'+this.text.replace(/ /g,"")+' ui-corner-all"><a href="#">'+this.text+"</a></li>").data("dateStart",this.dateStart).data("dateEnd",this.dateEnd).appendTo(y)});var w=0;a.each(e.presets,function(x,z){a('<li class="ui-daterangepicker-'+x+" preset_"+w+' ui-helper-clearfix ui-corner-all"><span class="ui-icon ui-icon-triangle-1-e"></span><a href="#">'+z+"</a></li>").appendTo(y);w++});y.find("li").hover(function(){a(this).addClass("ui-state-hover")},function(){a(this).removeClass("ui-state-hover")}).click(function(){j.find(".ui-state-active").removeClass("ui-state-active");a(this).addClass("ui-state-active");q(a(this),j,n,f);return false});return y})();function b(y){if(!y.getDate()){return""}var x=y.getDate();var A=y.getMonth();var z=y.getFullYear();A++;var w=e.dateFormat;return a.datepicker.formatDate(w,y)}a.fn.restoreDateFromData=function(){if(a(this).data("saveDate")){a(this).datepicker("setDate",a(this).data("saveDate")).removeData("saveDate")}return this};a.fn.saveDateToData=function(){if(!a(this).data("saveDate")){a(this).data("saveDate",a(this).datepicker("getDate"))}return this};function t(){if(j.data("state")=="closed"){v();j.fadeIn(300).data("state","open");e.onOpen()}}function k(){if(j.data("state")=="open"){j.fadeOut(300).data("state","closed");e.onClose()}}function c(){if(j.data("state")=="open"){k()}else{t()}}function v(){var w=p||d;var A=w.offset(),y="left",z=A.left,x=a(window).width()-z-w.outerWidth();if(z>x){y="right",z=x}j.parent().css(y,z).css("top",A.top+w.outerHeight())}function q(z,y,A,w){if(z.is(".ui-daterangepicker-specificDate")){w.hide();A.show();y.find(".title-start").text(e.presets.specificDate);y.find(".range-start").restoreDateFromData().css("opacity",1).show(400);y.find(".range-end").restoreDateFromData().css("opacity",0).hide(400);setTimeout(function(){w.fadeIn()},400)}else{if(z.is(".ui-daterangepicker-allDatesBefore")){w.hide();A.show();y.find(".title-end").text(e.presets.allDatesBefore);y.find(".range-start").saveDateToData().datepicker("setDate",e.earliestDate).css("opacity",0).hide(400);y.find(".range-end").restoreDateFromData().css("opacity",1).show(400);setTimeout(function(){w.fadeIn()},400)}else{if(z.is(".ui-daterangepicker-allDatesAfter")){w.hide();A.show();y.find(".title-start").text(e.presets.allDatesAfter);y.find(".range-start").restoreDateFromData().css("opacity",1).show(400);y.find(".range-end").saveDateToData().datepicker("setDate",e.latestDate).css("opacity",0).hide(400);setTimeout(function(){w.fadeIn()},400)}else{if(z.is(".ui-daterangepicker-dateRange")){w.hide();A.show();y.find(".title-start").text(e.rangeStartTitle);y.find(".title-end").text(e.rangeEndTitle);y.find(".range-start").restoreDateFromData().css("opacity",1).show(400);y.find(".range-end").restoreDateFromData().css("opacity",1).show(400);setTimeout(function(){w.fadeIn()},400)}else{w.hide();y.find(".range-start, .range-end").css("opacity",0).hide(400,function(){A.hide()});var B=(typeof z.data("dateStart")=="string")?Date.parse(z.data("dateStart")):z.data("dateStart")();var x=(typeof z.data("dateEnd")=="string")?Date.parse(z.data("dateEnd")):z.data("dateEnd")();y.find(".range-start").datepicker("setDate",B).find(".ui-datepicker-current-day").trigger("click");y.find(".range-end").datepicker("setDate",x).find(".ui-datepicker-current-day").trigger("click")}}}}return false}var n=a('<div class="ranges ui-widget-header ui-corner-all ui-helper-clearfix"><div class="range-start"><span class="title-start">Start Date</span></div><div class="range-end"><span class="title-end">End Date</span></div></div>').appendTo(j);n.find(".range-start, .range-end").datepicker(e.datepickerOptions);n.find(".range-start").datepicker("setDate",m);n.find(".range-end").datepicker("setDate",l);n.find(".range-start, .range-end").bind("constrainOtherPicker",function(){if(e.constrainDates){if(a(this).is(".range-start")){j.find(".range-end").datepicker("option","minDate",a(this).datepicker("getDate"))}else{j.find(".range-start").datepicker("option","maxDate",a(this).datepicker("getDate"))}}}).trigger("constrainOtherPicker");var f=a('<button class="btnDone ui-state-default ui-corner-all">'+e.doneButtonText+"</button>").click(function(){j.find(".ui-datepicker-current-day").trigger("click");k()}).hover(function(){a(this).addClass("ui-state-hover")},function(){a(this).removeClass("ui-state-hover")}).appendTo(n);a(this).click(function(){c();return false});n.hide().find(".range-start, .range-end, .btnDone").hide();j.data("state","closed");n.find(".ui-datepicker").css("display","block");a(e.appendTo).append(j);j.wrap('<div class="ui-daterangepickercontain"></div>');if(e.arrows&&d.size()==1){var h=a('<a href="#" class="ui-daterangepicker-prev ui-corner-all" title="'+e.prevLinkText+'"><span class="ui-icon ui-icon-circle-triangle-w">'+e.prevLinkText+"</span></a>");var r=a('<a href="#" class="ui-daterangepicker-next ui-corner-all" title="'+e.nextLinkText+'"><span class="ui-icon ui-icon-circle-triangle-e">'+e.nextLinkText+"</span></a>");a(this).addClass("ui-rangepicker-input ui-widget-content").wrap('<div class="ui-daterangepicker-arrows ui-widget ui-widget-header ui-helper-clearfix ui-corner-all"></div>').before(h).before(r).parent().find("a").click(function(){var x=n.find(".range-start").datepicker("getDate");var w=n.find(".range-end").datepicker("getDate");var y=Math.abs(new TimeSpan(x-w).getTotalMilliseconds())+86400000;if(a(this).is(".ui-daterangepicker-prev")){y=-y}n.find(".range-start, .range-end ").each(function(){var z=a(this).datepicker("getDate");if(z==null){return false}a(this).datepicker("setDate",z.add({milliseconds:y})).find(".ui-datepicker-current-day").trigger("click")});return false}).hover(function(){a(this).addClass("ui-state-hover")},function(){a(this).removeClass("ui-state-hover")});var p=d.parent()}a(document).click(function(){if(j.is(":visible")){k()}});j.click(function(){return false}).hide();return this}})(jQuery);
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/third-party/jQuery-UI-Date-Range-Picker/js/daterangepicker.jQuery.js b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/third-party/jQuery-UI-Date-Range-Picker/js/daterangepicker.jQuery.js
new file mode 100644
index 0000000..be07671
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/third-party/jQuery-UI-Date-Range-Picker/js/daterangepicker.jQuery.js
@@ -0,0 +1,380 @@
+(function ($) {
+
+	/**
+	 * --------------------------------------------------------------------
+	 * jQuery-Plugin "daterangepicker.jQuery.js"
+	 * by Scott Jehl, scott@filamentgroup.com
+	 * reference article: http://www.filamentgroup.com/lab/update_date_range_picker_with_jquery_ui/
+	 * demo page: http://www.filamentgroup.com/examples/daterangepicker/
+	 *
+	 * Copyright (c) 2010 Filament Group, Inc
+	 * Dual licensed under the MIT (filamentgroup.com/examples/mit-license.txt) and GPL (filamentgroup.com/examples/gpl-license.txt) licenses.
+	 *
+	 * Dependencies: jquery, jquery UI datepicker, date.js, jQuery UI CSS Framework
+
+	 *  12.15.2010 Made some fixes to resolve breaking changes introduced by jQuery UI 1.8.7
+	 * --------------------------------------------------------------------
+	 */
+	$.fn.daterangepicker = function(settings){
+		var rangeInput = $(this);
+
+		//defaults
+		var options = $.extend({
+			presetRanges: [
+				{text: 'Today', dateStart: 'today', dateEnd: 'today' },
+				{text: 'Last 7 days', dateStart: 'today-7days', dateEnd: 'today' },
+				{text: 'Month to date', dateStart: function(){ return Date.parse('today').moveToFirstDayOfMonth();  }, dateEnd: 'today' },
+				{text: 'Year to date', dateStart: function(){ var x= Date.parse('today'); x.setMonth(0); x.setDate(1); return x; }, dateEnd: 'today' },
+				//extras:
+				{text: 'The previous Month', dateStart: function(){ return Date.parse('1 month ago').moveToFirstDayOfMonth();  }, dateEnd: function(){ return Date.parse('1 month ago').moveToLastDayOfMonth();  } }
+				//{text: 'Tomorrow', dateStart: 'Tomorrow', dateEnd: 'Tomorrow' },
+				//{text: 'Ad Campaign', dateStart: '03/07/08', dateEnd: 'Today' },
+				//{text: 'Last 30 Days', dateStart: 'Today-30', dateEnd: 'Today' },
+				//{text: 'Next 30 Days', dateStart: 'Today', dateEnd: 'Today+30' },
+				//{text: 'Our Ad Campaign', dateStart: '03/07/08', dateEnd: '07/08/08' }
+			],
+			//presetRanges: array of objects for each menu preset.
+			//Each obj must have text, dateStart, dateEnd. dateStart, dateEnd accept date.js string or a function which returns a date object
+			presets: {
+				specificDate: 'Specific Date',
+				allDatesBefore: 'All Dates Before',
+				allDatesAfter: 'All Dates After',
+				dateRange: 'Date Range'
+		},
+		rangeStartTitle: 'Start date',
+		rangeEndTitle: 'End date',
+		nextLinkText: 'Next',
+		prevLinkText: 'Prev',
+		target: rangeInput,
+		doneButtonText: 'Done',
+		earliestDate: Date.parse('-15years'), //earliest date allowed 
+		latestDate: Date.parse('+15years'), //latest date allowed 
+		constrainDates: false,
+		rangeSplitter: '-', //string to use between dates in single input
+		dateFormat: 'm/d/yy', // date formatting. Available formats: http://docs.jquery.com/UI/Datepicker/%24.datepicker.formatDate
+		closeOnSelect: true, //if a complete selection is made, close the menu
+		arrows: false,
+		appendTo: 'body',
+		onClose: function(){},
+		onOpen: function(){},
+		onChange: function(){},
+		datepickerOptions: null //object containing native UI datepicker API options
+	}, settings);
+	
+	
+
+	//custom datepicker options, extended by options
+	var datepickerOptions = {
+		onSelect: function(dateText, inst) {
+			var range_start = rp.find('.range-start');
+			var range_end = rp.find('.range-end');
+				
+			if(rp.find('.ui-daterangepicker-specificDate').is('.ui-state-active')){
+				range_end.datepicker('setDate', range_start.datepicker('getDate') ); 
+			}
+			
+			$(this).trigger('constrainOtherPicker');
+			
+			var rangeA = fDate( range_start.datepicker('getDate') );
+			var rangeB = fDate( range_end.datepicker('getDate') );
+			
+			//send back to input or inputs
+			if(rangeInput.length == 2){
+				rangeInput.eq(0).val(rangeA);
+				rangeInput.eq(1).val(rangeB);
+			}
+			else{
+				rangeInput.val((rangeA != rangeB) ? rangeA+' '+ options.rangeSplitter +' '+rangeB : rangeA);
+			}
+			//if closeOnSelect is true
+			if(options.closeOnSelect){
+				if(!rp.find('li.ui-state-active').is('.ui-daterangepicker-dateRange') && !rp.is(':animated') ){
+					hideRP();
+				}
+
+				$(this).trigger('constrainOtherPicker');
+
+				options.onChange();
+			}
+		},
+		defaultDate: +0
+	};
+
+		//change event fires both when a calendar is updated or a change event on the input is triggered
+		rangeInput.bind('change', options.onChange);
+
+		//datepicker options from options
+		options.datepickerOptions = (settings) ? $.extend(datepickerOptions, settings.datepickerOptions) : datepickerOptions;
+
+		//Capture Dates from input(s)
+		var inputDateA, inputDateB = Date.parse('today');
+		var inputDateAtemp, inputDateBtemp;
+		if(rangeInput.size() == 2){
+			inputDateAtemp = Date.parse( rangeInput.eq(0).val() );
+			inputDateBtemp = Date.parse( rangeInput.eq(1).val() );
+			if(inputDateAtemp == null){inputDateAtemp = inputDateBtemp;}
+			if(inputDateBtemp == null){inputDateBtemp = inputDateAtemp;}
+		}
+		else {
+			inputDateAtemp = Date.parse( rangeInput.val().split(options.rangeSplitter)[0] );
+			inputDateBtemp = Date.parse( rangeInput.val().split(options.rangeSplitter)[1] );
+			if(inputDateBtemp == null){inputDateBtemp = inputDateAtemp;} //if one date, set both
+		}
+		if(inputDateAtemp != null){inputDateA = inputDateAtemp;}
+		if(inputDateBtemp != null){inputDateB = inputDateBtemp;}
+
+
+		//build picker and
+		var rp = $('<div class="ui-daterangepicker ui-widget ui-helper-clearfix ui-widget-content ui-corner-all"></div>');
+		var rpPresets = (function(){
+			var ul = $('<ul class="ui-widget-content"></ul>').appendTo(rp);
+			$.each(options.presetRanges,function(){
+				$('<li class="ui-daterangepicker-'+ this.text.replace(/ /g, '') +' ui-corner-all"><a href="#">'+ this.text +'</a></li>')
+				.data('dateStart', this.dateStart)
+				.data('dateEnd', this.dateEnd)
+				.appendTo(ul);
+			});
+			var x=0;
+			$.each(options.presets, function(key, value) {
+				$('<li class="ui-daterangepicker-'+ key +' preset_'+ x +' ui-helper-clearfix ui-corner-all"><span class="ui-icon ui-icon-triangle-1-e"></span><a href="#">'+ value +'</a></li>')
+				.appendTo(ul);
+				x++;
+			});
+
+			ul.find('li').hover(
+					function(){
+						$(this).addClass('ui-state-hover');
+					},
+					function(){
+						$(this).removeClass('ui-state-hover');
+					})
+				.click(function(){
+					rp.find('.ui-state-active').removeClass('ui-state-active');
+					$(this).addClass('ui-state-active');
+					clickActions($(this),rp, rpPickers, doneBtn);
+					return false;
+				});
+			return ul;
+		})();
+
+		//function to format a date string
+		function fDate(date){
+			 if(!date.getDate()){return '';}
+			 var day = date.getDate();
+			 var month = date.getMonth();
+			 var year = date.getFullYear();
+			 month++; // adjust javascript month
+			 var dateFormat = options.dateFormat;
+			 return $.datepicker.formatDate( dateFormat, date );
+		}
+
+
+		$.fn.restoreDateFromData = function(){
+			if($(this).data('saveDate')){
+				$(this).datepicker('setDate', $(this).data('saveDate')).removeData('saveDate');
+			}
+			return this;
+		};
+		$.fn.saveDateToData = function(){
+			if(!$(this).data('saveDate')){
+				$(this).data('saveDate', $(this).datepicker('getDate') );
+			}
+			return this;
+		};
+
+		//show, hide, or toggle rangepicker
+		function showRP(){
+			if(rp.data('state') == 'closed'){
+				positionRP();
+				rp.fadeIn(300).data('state', 'open');
+				options.onOpen();
+			}
+		}
+		function hideRP(){
+			if(rp.data('state') == 'open'){
+				rp.fadeOut(300).data('state', 'closed');
+				options.onClose();
+			}
+		}
+		function toggleRP(){
+			if( rp.data('state') == 'open' ){ hideRP(); }
+			else { showRP(); }
+		}
+		function positionRP(){
+			var relEl = riContain || rangeInput; //if arrows, use parent for offsets
+			var riOffset = relEl.offset(),
+				side = 'left',
+				val = riOffset.left,
+				offRight = $(window).width() - val - relEl.outerWidth();
+
+			if(val > offRight){
+				side = 'right', val =  offRight;
+			}
+
+			rp.parent().css(side, val).css('top', riOffset.top + relEl.outerHeight());
+		}
+
+
+
+		//preset menu click events
+		function clickActions(el, rp, rpPickers, doneBtn){
+
+			if(el.is('.ui-daterangepicker-specificDate')){
+				//Specific Date (show the "start" calendar)
+				doneBtn.hide();
+				rpPickers.show();
+				rp.find('.title-start').text( options.presets.specificDate );
+				rp.find('.range-start').restoreDateFromData().css('opacity',1).show(400);
+				rp.find('.range-end').restoreDateFromData().css('opacity',0).hide(400);
+				setTimeout(function(){doneBtn.fadeIn();}, 400);
+			}
+			else if(el.is('.ui-daterangepicker-allDatesBefore')){
+				//All dates before specific date (show the "end" calendar and set the "start" calendar to the earliest date)
+				doneBtn.hide();
+				rpPickers.show();
+				rp.find('.title-end').text( options.presets.allDatesBefore );
+				rp.find('.range-start').saveDateToData().datepicker('setDate', options.earliestDate).css('opacity',0).hide(400);
+				rp.find('.range-end').restoreDateFromData().css('opacity',1).show(400);
+				setTimeout(function(){doneBtn.fadeIn();}, 400);
+			}
+			else if(el.is('.ui-daterangepicker-allDatesAfter')){
+				//All dates after specific date (show the "start" calendar and set the "end" calendar to the latest date)
+				doneBtn.hide();
+				rpPickers.show();
+				rp.find('.title-start').text( options.presets.allDatesAfter );
+				rp.find('.range-start').restoreDateFromData().css('opacity',1).show(400);
+				rp.find('.range-end').saveDateToData().datepicker('setDate', options.latestDate).css('opacity',0).hide(400);
+				setTimeout(function(){doneBtn.fadeIn();}, 400);
+			}
+			else if(el.is('.ui-daterangepicker-dateRange')){
+				//Specific Date range (show both calendars)
+				doneBtn.hide();
+				rpPickers.show();
+				rp.find('.title-start').text(options.rangeStartTitle);
+				rp.find('.title-end').text(options.rangeEndTitle);
+				rp.find('.range-start').restoreDateFromData().css('opacity',1).show(400);
+				rp.find('.range-end').restoreDateFromData().css('opacity',1).show(400);
+				setTimeout(function(){doneBtn.fadeIn();}, 400);
+			}
+			else {
+				//custom date range specified in the options (no calendars shown)
+				doneBtn.hide();
+				rp.find('.range-start, .range-end').css('opacity',0).hide(400, function(){
+					rpPickers.hide();
+				});
+				var dateStart = (typeof el.data('dateStart') == 'string') ? Date.parse(el.data('dateStart')) : el.data('dateStart')();
+				var dateEnd = (typeof el.data('dateEnd') == 'string') ? Date.parse(el.data('dateEnd')) : el.data('dateEnd')();
+				rp.find('.range-start').datepicker('setDate', dateStart).find('.ui-datepicker-current-day').trigger('click');
+				rp.find('.range-end').datepicker('setDate', dateEnd).find('.ui-datepicker-current-day').trigger('click');
+			}
+
+			return false;
+		}
+
+
+		//picker divs
+		var rpPickers = $('<div class="ranges ui-widget-header ui-corner-all ui-helper-clearfix"><div class="range-start"><span class="title-start">Start Date</span></div><div class="range-end"><span class="title-end">End Date</span></div></div>').appendTo(rp);
+		rpPickers.find('.range-start, .range-end')
+			.datepicker(options.datepickerOptions);
+
+
+		rpPickers.find('.range-start').datepicker('setDate', inputDateA);
+		rpPickers.find('.range-end').datepicker('setDate', inputDateB);
+
+		rpPickers.find('.range-start, .range-end')
+			.bind('constrainOtherPicker', function(){
+				if(options.constrainDates){
+					//constrain dates
+					if($(this).is('.range-start')){
+						rp.find('.range-end').datepicker( "option", "minDate", $(this).datepicker('getDate'));
+					}
+					else{
+						rp.find('.range-start').datepicker( "option", "maxDate", $(this).datepicker('getDate'));
+					}
+				}
+			})
+			.trigger('constrainOtherPicker');
+
+		var doneBtn = $('<button class="btnDone ui-state-default ui-corner-all">'+ options.doneButtonText +'</button>')
+		.click(function(){
+			rp.find('.ui-datepicker-current-day').trigger('click');
+			hideRP();
+		})
+		.hover(
+				function(){
+					$(this).addClass('ui-state-hover');
+				},
+				function(){
+					$(this).removeClass('ui-state-hover');
+				}
+		)
+		.appendTo(rpPickers);
+
+
+
+
+		//inputs toggle rangepicker visibility
+		$(this).click(function(){
+			toggleRP();
+			return false;
+		});
+		//hide em all
+		rpPickers.hide().find('.range-start, .range-end, .btnDone').hide();
+
+		rp.data('state', 'closed');
+
+		//Fixed for jQuery UI 1.8.7 - Calendars are hidden otherwise!
+		rpPickers.find('.ui-datepicker').css("display","block");
+
+		//inject rp
+		$(options.appendTo).append(rp);
+
+		//wrap and position
+		rp.wrap('<div class="ui-daterangepickercontain"></div>');
+
+		//add arrows (only available on one input)
+		if(options.arrows && rangeInput.size()==1){
+			var prevLink = $('<a href="#" class="ui-daterangepicker-prev ui-corner-all" title="'+ options.prevLinkText +'"><span class="ui-icon ui-icon-circle-triangle-w">'+ options.prevLinkText +'</span></a>');
+			var nextLink = $('<a href="#" class="ui-daterangepicker-next ui-corner-all" title="'+ options.nextLinkText +'"><span class="ui-icon ui-icon-circle-triangle-e">'+ options.nextLinkText +'</span></a>');
+
+			$(this)
+			.addClass('ui-rangepicker-input ui-widget-content')
+			.wrap('<div class="ui-daterangepicker-arrows ui-widget ui-widget-header ui-helper-clearfix ui-corner-all"></div>')
+			.before( prevLink )
+			.before( nextLink )
+			.parent().find('a').click(function(){
+				var dateA = rpPickers.find('.range-start').datepicker('getDate');
+				var dateB = rpPickers.find('.range-end').datepicker('getDate');
+				var diff = Math.abs( new TimeSpan(dateA - dateB).getTotalMilliseconds() ) + 86400000; //difference plus one day
+				if($(this).is('.ui-daterangepicker-prev')){ diff = -diff; }
+
+				rpPickers.find('.range-start, .range-end ').each(function(){
+						var thisDate = $(this).datepicker( "getDate");
+						if(thisDate == null){return false;}
+						$(this).datepicker( "setDate", thisDate.add({milliseconds: diff}) ).find('.ui-datepicker-current-day').trigger('click');
+				});
+				return false;
+			})
+			.hover(
+				function(){
+					$(this).addClass('ui-state-hover');
+				},
+				function(){
+					$(this).removeClass('ui-state-hover');
+				});
+
+			var riContain = rangeInput.parent();
+		}
+
+
+		$(document).click(function(){
+			if (rp.is(':visible')) {
+				hideRP();
+			}
+		});
+
+		rp.click(function(){return false;}).hide();
+		return this;
+	}
+
+})(jQuery);
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/third-party/jQuery-UI-FileInput/css/enhanced.css b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/third-party/jQuery-UI-FileInput/css/enhanced.css
new file mode 100644
index 0000000..c2d5089
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/third-party/jQuery-UI-FileInput/css/enhanced.css
@@ -0,0 +1,47 @@
+/*custom upload elements*/
+.customfile-input { position: absolute; left: -999em; background: transparent; border: 0; opacity: 0; -moz-opacity: 0; filter:progid:DXImageTransform.Microsoft.Alpha(opacity=0);}
+
+.customfile { cursor: pointer; width: auto; display: inline-block; position: relative; }
+.customfile.input-append .customfile-feedback { border-radius: 3px 0 0 3px;  }
+.customfile.input-prepend .customfile-feedback { border-radius: 0 3px 3px 0; }
+.customfile.input-prepend .add-on, .customfile.input-append .add-on{
+  color:#333;
+  cursor: pointer;
+  display: inline-block;
+  background-color: #e6e6e6;
+  background-repeat: no-repeat;
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));
+  background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+  background-image: -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);
+  background-image: -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+  background-image: -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+  background-image: linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);
+}
+.customfile-disabled { opacity: .5; filter:progid:DXImageTransform.Microsoft.Alpha(opacity=0); cursor: default;  }
+.customfile-feedback { border: 1px solid #CCCCCC; color: #808080; display: inline-block; font-size: 13px; line-height: 18px; padding: 4px; 
+  -webkit-transition: border linear 0.2s, box-shadow linear 0.2s;
+  -moz-transition: border linear 0.2s, box-shadow linear 0.2s;
+  -ms-transition: border linear 0.2s, box-shadow linear 0.2s;
+  -o-transition: border linear 0.2s, box-shadow linear 0.2s;
+  transition: border linear 0.2s, box-shadow linear 0.2s;
+  -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1);
+  -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1);
+  box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1);
+
+}
+/* IE7 hack */
+*+html .customfile-feedback { margin-top: 1px;}
+/* EO Hack */
+.customfile-feedback-populated { padding-left: 25px; background: url(../images/icon-generic.gif) 5px center no-repeat; white-space: nowrap; text-overflow: ellipsis; -o-text-overflow: ellipsis; overflow: hidden; }
+
+.customfile-button { /* IE7 and bellow hack*/ *margin-top: -1px; /* EO Hack */}
+.customfile:hover .customfile-button, .customfile-focus .customfile-button  { background-position: 0 -15px; color: #333; text-decoration: none;}
+.customfile-focus .customfile-button {}
+
+
+/*file type icons*/
+.customfile-ext-jpg, .customfile-ext-gif, .customfile-ext-png, .customfile-ext-jpeg, .customfile-ext-bmp { background-image: url(../images/icon-image.gif);}
+.customfile-ext-mp3, .customfile-ext-mp4, .customfile-ext-mov, .customfile-ext-swf, .customfile-ext-wav, .customfile-ext-m4v { background-image: url(../images/icon-media.gif);}
+.customfile-ext-zip, .customfile-ext-tar, .customfile-ext-sit { background-image: url(../images/icon-zip.gif);}
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/third-party/jQuery-UI-FileInput/images/icon-generic.gif b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/third-party/jQuery-UI-FileInput/images/icon-generic.gif
new file mode 100644
index 0000000..b6397cd
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/third-party/jQuery-UI-FileInput/images/icon-generic.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/third-party/jQuery-UI-FileInput/images/icon-image.gif b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/third-party/jQuery-UI-FileInput/images/icon-image.gif
new file mode 100644
index 0000000..9492f5b
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/third-party/jQuery-UI-FileInput/images/icon-image.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/third-party/jQuery-UI-FileInput/images/icon-media.gif b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/third-party/jQuery-UI-FileInput/images/icon-media.gif
new file mode 100644
index 0000000..8596c0c
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/third-party/jQuery-UI-FileInput/images/icon-media.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/third-party/jQuery-UI-FileInput/images/icon-zip.gif b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/third-party/jQuery-UI-FileInput/images/icon-zip.gif
new file mode 100644
index 0000000..93e46e0
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/third-party/jQuery-UI-FileInput/images/icon-zip.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/third-party/jQuery-UI-FileInput/js/enhance.min.js b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/third-party/jQuery-UI-FileInput/js/enhance.min.js
new file mode 100644
index 0000000..2c87a35
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/third-party/jQuery-UI-FileInput/js/enhance.min.js
@@ -0,0 +1,6 @@
+/*
+ * EnhanceJS version 1.1 - Test-Driven Progressive Enhancement
+ * http://enhancejs.googlecode.com/
+ * Copyright (c) 2010 Filament Group, Inc, authors.txt
+ * Licensed under MIT (license.txt)
+*/(function(a,b,c){function o(){return!!b.cookie}function p(){J(d.testName,"fail");a.location.reload()}function q(){J(d.testName,"pass");a.location.reload()}function r(){L(d.testName);a.location.reload()}function s(){f=b.createElement("body");i.insertBefore(f,i.firstChild);e=f}function t(){i.removeChild(f);e=b.body}function u(){var a=K(d.testName);if(a){if(a==="pass"){y();d.onPass()}else{d.onFail();x()}d.appendToggleLink&&v(function(){w(a)})}else{var b=!0;s();for(var c in d.tests){b=d.tests[c]();if(!b){d.alertOnFailure&&alert(c+" failed");break}}t();a=b?"pass":"fail";J(d.testName,a);if(b){y();d.onPass()}else{d.onFail();x()}d.appendToggleLink&&v(function(){w(a)})}}function v(b){if(g)b();else{var c=a.onload;a.onload=function(){c&&c();b()}}}function w(a){if(!d.appendToggleLink||!enhance.cookiesSupported)return;if(a){var c=b.createElement("a");c.href="#";c.className=d.testName+"_toggleResult";c.innerHTML=a==="pass"?d.forceFailText:d.forcePassText;c.onclick=a==="pass"?enhance.forceFail:enhance.forcePass;b.getElementsByTagName("body")[0].appendChild(c)}}function x(){i.className=i.className.replace(d.testName,"")}function y(){j=!0;d.loadStyles.length&&D();d.loadScripts.length?F():d.onScriptsLoaded()}function z(b,c){if(K(k)&&K(l)){L(k);L(l)}else{J(k,b);J(l,c)}a.location.reload()}function A(a){m.length==2&&(a==m[0]?a=m[1]:a==m[1]&&(a=m[0]));return a}function B(){var a=d.testName+"-incomplete";i.className.indexOf(a)===-1&&(i.className+=" "+a)}function C(a){if(a.constructor===Array){var b=!0;for(var c in a)b&&(b=!!a[c]);return b}return!!a}function D(){var a=-1,e;while(e=d.loadStyles[++a]){var f=b.createElement("link");f.type="text/css";f.rel="stylesheet";f.onerror=d.onLoadError;if(typeof e=="string"){f.href=e;h.appendChild(f)}else{if(e.media){e.media=A(e.media);d.media&&d.media[e.media]!==c&&(e.media=d.media[e.media])}e.excludemedia&&(e.excludemedia=A(e.excludemedia));var g=!0;e.media&&e.media!=="print"&&e.media!=="projection"&&e.media!=="speech"&&e.media!=="aural"&&e.media!=="braille"&&(g=n(e.media));g&&e.excludemedia&&(g=!n(e.excludemedia));g&&e.iecondition&&(g=E(e.iecondition));if(g&&e.ifsupported!==c){g=C(e.ifsupported);if(!g&&e.fallback!==c){e.href=e.fallback;g=!0}}if(g){for(var i in e)i!=="iecondition"&&i!=="excludemedia"&&i!=="ifsupported"&&i!=="fallback"&&f.setAttribute(i,e[i]);h.appendChild(f)}}}}function F(){d.queueLoading?G():H()}function G(){function b(){if(a.length===0)return!1;var c=a.shift(),e=I(c),f=!1;if(!e)return b();e.onload=e.onreadystatechange=function(){if(!f&&(!this.readyState||this.readyState=="loaded"||this.readyState=="complete")){f=!0;b()===!1&&d.onScriptsLoaded();this.onload=this.onreadystatechange=null}};h.insertBefore(e,h.firstChild)}var a=[].concat(d.loadScripts);b()}function H(){var a=-1,b;while(b=d.loadScripts[++a]){var c=I(b);c&&h.insertBefore(c,h.firstChild)}d.onScriptsLoaded()}function I(a){var e=b.createElement("script");e.type="text/javascript";e.onerror=d.onLoadError;if(typeof a=="string"){e.src=a;return e}if(a.media){a.media=A(a.media);d.media&&d.media[a.media]&&(a.media=d.media[a.media])}a.excludemedia&&(a.excludemedia=A(a.excludemedia));var f=!0;a.media&&(f=n(a.media));f&&a.excludemedia&&(f=!n(a.excludemedia));f&&a.iecondition&&(f=E(a.iecondition));if(f&&a.ifsupported!==c){f=C(a.ifsupported);if(!f&&a.fallback!==c){a.src=a.fallback;f=!0}}if(f){for(var g in a)g!=="iecondition"&&g!=="media"&&g!=="excludemedia"&&g!=="ifsupported"&&g!=="fallback"&&e.setAttribute(g,a[g]);return e}return!1}function J(a,c,d){d=d||90;var e=new Date;e.setTime(e.getTime()+d*24*60*60*1e3);var f="; expires="+e.toGMTString();b.cookie=a+"="+c+f+"; path=/"}function K(a){var c=a+"=",d=b.cookie.split(";");for(var e=0;e<d.length;e++){var f=d[e];while(f.charAt(0)==" ")f=f.substring(1,f.length);if(f.indexOf(c)==0)return f.substring(c.length,f.length)}return null}function L(a){J(a,"",-1)}function M(){if(b.readyState==null&&b.addEventListener){b.addEventListener("DOMContentLoaded",function a(){b.removeEventListener("DOMContentLoaded",a,!1);b.readyState="complete"},!1);b.readyState="loading"}}var d,e,f,g,h,i=b.documentElement,j=!1,k,l,m=[];b.getElementsByTagName?h=b.getElementsByTagName("head")[0]||i:h=i;var n=function(){var a={},d=b.createElement("div");d.setAttribute("id","ejs-qtest");return function(f){if(a[f]===c){s();var g=b.createElement("style");g.type="text/css";h.appendChild(g);var i="@media "+f+" { #ejs-qtest { position: absolute; width: 10px; } }";g.styleSheet?g.styleSheet.cssText=i:g.appendChild(b.createTextNode(i));e.appendChild(d);var j=d.offsetWidth;e.removeChild(d);h.removeChild(g);t();a[f]=j==10}return a[f]}}();a.enhance=function(a){a=a||{};d={};for(var b in enhance.defaultSettings){var e=a[b];d[b]=e!==c?e:enhance.defaultSettings[b]}for(var f in a.addTests)d.tests[f]=a.addTests[f];i.className.indexOf(d.testName)===-1&&(i.className+=" "+d.testName);k=d.testName+"-toggledmediaA";l=d.testName+"-toggledmediaB";m=[K(k),K(l)];setTimeout(function(){j||x()},3e3);u();M();v(function(){g=!0})};enhance.query=n;enhance.defaultTests={getById:function(){return!!b.getElementById},getByTagName:function(){return!!b.getElementsByTagName},createEl:function(){return!!b.createElement},boxmodel:function(){var a=b.createElement("div");a.style.cssText="width: 1px; padding: 1px;";e.appendChild(a);var c=a.offsetWidth;e.removeChild(a);return c===3},position:function(){var a=b.createElement("div");a.style.cssText="position: absolute; left: 10px;";e.appendChild(a);var c=a.offsetLeft;e.removeChild(a);return c===10},floatClear:function(){var a=!1,c=b.createElement("div"),d='style="width: 5px; height: 5px; float: left;"';c.innerHTML="<div "+d+"></div><div "+d+"></div>";e.appendChild(c);var f=c.childNodes,g=f[0].offsetTop,h=f[1],i=h.offsetTop;if(g===i){h.style.clear="left";i=h.offsetTop;g!==i&&(a=!0)}e.removeChild(c);return a},heightOverflow:function(){var a=b.createElement("div");a.innerHTML='<div style="height: 10px;"></div>';a.style.cssText="overflow: hidden; height: 0;";e.appendChild(a);var c=a.offsetHeight;e.removeChild(a);return c===0},ajax:function(){var a=!1,b=-1,c,d=[function(){return new XMLHttpRequest},function(){return new ActiveXObject("Msxml2.XMLHTTP")},function(){return new ActiveXObject("Msxml3.XMLHTTP")},function(){return new ActiveXObject("Microsoft.XMLHTTP")}];while(c=d[++b]){try{a=c()}catch(e){continue}break}return!!a},resize:function(){return a.onresize!=0},print:function(){return!!a.print}};enhance.defaultSettings={testName:"enhanced",loadScripts:[],loadStyles:[],queueLoading:!0,appendToggleLink:!0,forcePassText:"View high-bandwidth version",forceFailText:"View low-bandwidth version",tests:enhance.defaultTests,media:{"-ejs-desktop":enhance.query("screen and (max-device-width: 1024px)")?"not screen and (max-device-width: 1024px)":"screen","-ejs-handheld":"screen and (max-device-width: 1024px)"},addTests:{},alertOnFailure:!1,onPass:function(){},onFail:function(){},onLoadError:B,onScriptsLoaded:function(){}};enhance.cookiesSupported=o();enhance.cookiesSupported&&(enhance.forceFail=p);enhance.cookiesSupported&&(enhance.forcePass=q);enhance.cookiesSupported&&(enhance.reTest=r);enhance.toggleMedia=z;var E=function(){var a={},d;return function(e){return!1}}()})(window,document);
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/third-party/jQuery-UI-FileInput/js/fileinput.jquery.js b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/third-party/jQuery-UI-FileInput/js/fileinput.jquery.js
new file mode 100644
index 0000000..960520b
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/third-party/jQuery-UI-FileInput/js/fileinput.jquery.js
@@ -0,0 +1,139 @@
+/**
+ * --------------------------------------------------------------------
+ * jQuery customfileinput plugin
+ * Author: Scott Jehl, scott@filamentgroup.com
+ * Copyright (c) 2009 Filament Group. Updated 2012.
+ * licensed under MIT (filamentgroup.com/examples/mit-license.txt)
+ * --------------------------------------------------------------------
+ */
+
+/**
+ * All credits go to the Author of this file, some additional customization was
+ * done for theme compat. purposes.
+ *
+ * Additional bugfixes/changes by smurfy
+ */
+!function ($) {
+
+    "use strict"; // jshint ;_;
+
+    /* FILEINPUT CLASS DEFINITION
+     * ====================== */
+
+    var CustomFileInput = function (content, options) {
+        var self = this;
+        this.$element = $(content);
+
+        this.options = $.extend({
+            classes	: (this.$element.attr('class') ? this.$element.attr('class') : ''),
+        }, options);
+
+        //create custom control container
+        this.$upload = $('<div class="input-' + (('right' === this.options.button_position)?'append':'prepend') + ' customfile">');
+        //create custom control feedback
+        this.$uploadFeedback = $('<input type="text" readonly="readonly" class="customfile-feedback ' + this.options.classes + '" aria-hidden="true" value="' + this.options.feedback_text + '"/>').appendTo(this.$upload);
+        //create custom control button
+        this.$uploadButton = $('<span class="add-on customfile-button" aria-hidden="true">' + this.options.button_text + '</span>').css({ float : this.options.button_position });
+
+        this.$element
+            .addClass('customfile-input') //add class for CSS
+            .on('focus', $.proxy(this.onFocus, this))
+            .on('blur', $.proxy(this.onBlur, this))
+            .on('disable', $.proxy(this.onDisable, this))
+            .on('enable', $.proxy(this.onEnable, this))
+            .on('checkChange', $.proxy(this.onCheckChange, this))
+            .on('change', $.proxy(this.onChange, this))
+            .on('click', $.proxy(this.onClick, this));
+
+        if ('right' === this.options.button_position) {
+            this.$uploadButton.insertAfter(this.$uploadFeedback);
+        } else {
+            this.$uploadButton.insertBefore(this.$uploadFeedback);
+        }
+
+        //match disabled state
+        if (this.$element.is('[disabled]')) {
+            this.$element.trigger('disable');
+        } else {
+            this.$upload.on('click', function () { self.$element.trigger('click'); });
+        }
+
+        //insert original input file in dom, css if hide it outside of screen
+        this.$upload.insertAfter(this.$element);
+        this.$element.insertAfter(this.$upload);
+    };
+
+    CustomFileInput.prototype = {
+        constructor: CustomFileInput,
+
+        onClick : function() {
+            var self = this;
+            this.$element.data('val', this.$element.val());
+            setTimeout(function(){
+                self.$element.trigger('checkChange');
+            } ,100);
+        },
+
+        onCheckChange: function() {
+            if(this.$element.val() && this.$element.val() != this.$element.data('val')){
+                this.$element.trigger('change');
+            }
+        },
+
+        onEnable: function() {
+            this.$element.removeAttr('disabled');
+            this.$upload.removeClass('customfile-disabled');
+        },
+
+        onDisable: function() {
+            this.$element.attr('disabled',true);
+            this.$upload.addClass('customfile-disabled');
+        },
+
+        onFocus: function() {
+            this.$upload.addClass('customfile-focus');
+            this.$element.data('val', this.$element.val());
+        },
+
+        onBlur: function() {
+            this.$upload.removeClass('customfile-focus');
+            this.$element.trigger('checkChange');
+        },
+
+        onChange : function() {
+            //get file name
+            var fileName = this.$element.val().split(/\\/).pop();
+            if (!fileName) {
+                this.$uploadFeedback
+                    .val(this.options.feedback_text) //set feedback text to filename
+                    .removeClass('customfile-feedback-populated'); //add class to show populated state
+                this.$uploadButton.text(this.options.button_text);
+            } else {
+                this.$uploadFeedback
+                    .val(fileName) //set feedback text to filename
+                    .addClass('customfile-feedback-populated'); //add class to show populated state
+                this.$uploadButton.text(this.options.button_change_text);
+            }
+        }
+    };
+
+    $.fn.customFileInput = function(option){
+        return this.each(function () {
+            var $this = $(this);
+            var data = $this.data('customFileInput')
+            var options = $.extend({}, $.fn.customFileInput.defaults, $this.data(), typeof option == 'object' && option);
+            if (!data) {
+                $this.data('customFileInput', (data = new CustomFileInput(this, options)));
+            }
+        })
+    };
+
+    $.fn.customFileInput.defaults = {
+        button_position 	: 'right',
+        feedback_text		: 'No file selected...',
+        button_text			: 'Browse',
+        button_change_text	: 'Change'
+    }
+
+}(window.jQuery);
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/third-party/wijmo/jquery.bgiframe-2.1.3-pre.js b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/third-party/wijmo/jquery.bgiframe-2.1.3-pre.js
new file mode 100644
index 0000000..165aef4
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/third-party/wijmo/jquery.bgiframe-2.1.3-pre.js
@@ -0,0 +1,39 @@
+/*! Copyright (c) 2010 Brandon Aaron (http://brandonaaron.net)
+ * Licensed under the MIT License (LICENSE.txt).
+ *
+ * Version 2.1.3-pre
+ */
+
+(function($){
+
+$.fn.bgiframe = ($.browser.msie && /msie 6\.0/i.test(navigator.userAgent) ? function(s) {
+    s = $.extend({
+        top     : 'auto', // auto == .currentStyle.borderTopWidth
+        left    : 'auto', // auto == .currentStyle.borderLeftWidth
+        width   : 'auto', // auto == offsetWidth
+        height  : 'auto', // auto == offsetHeight
+        opacity : true,
+        src     : 'javascript:false;'
+    }, s);
+    var html = '<iframe class="bgiframe"frameborder="0"tabindex="-1"src="'+s.src+'"'+
+                   'style="display:block;position:absolute;z-index:-1;'+
+                       (s.opacity !== false?'filter:Alpha(Opacity=\'0\');':'')+
+                       'top:'+(s.top=='auto'?'expression(((parseInt(this.parentNode.currentStyle.borderTopWidth)||0)*-1)+\'px\')':prop(s.top))+';'+
+                       'left:'+(s.left=='auto'?'expression(((parseInt(this.parentNode.currentStyle.borderLeftWidth)||0)*-1)+\'px\')':prop(s.left))+';'+
+                       'width:'+(s.width=='auto'?'expression(this.parentNode.offsetWidth+\'px\')':prop(s.width))+';'+
+                       'height:'+(s.height=='auto'?'expression(this.parentNode.offsetHeight+\'px\')':prop(s.height))+';'+
+                '"/>';
+    return this.each(function() {
+        if ( $(this).children('iframe.bgiframe').length === 0 )
+            this.insertBefore( document.createElement(html), this.firstChild );
+    });
+} : function() { return this; });
+
+// old alias
+$.fn.bgIframe = $.fn.bgiframe;
+
+function prop(n) {
+    return n && n.constructor === Number ? n + 'px' : n;
+}
+
+})(jQuery);
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/third-party/wijmo/jquery.mousewheel.min.js b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/third-party/wijmo/jquery.mousewheel.min.js
new file mode 100644
index 0000000..a17391e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/third-party/wijmo/jquery.mousewheel.min.js
@@ -0,0 +1,12 @@
+/* Copyright (c) 2010 Brandon Aaron (http://brandonaaron.net)
+ * Licensed under the MIT License (LICENSE.txt).
+ *
+ * Thanks to: http://adomas.org/javascript-mouse-wheel/ for some pointers.
+ * Thanks to: Mathias Bank(http://www.mathias-bank.de) for a scope bug fix.
+ * Thanks to: Seamus Leahy for adding deltaX and deltaY
+ *
+ * Version: 3.0.4
+ *
+ * Requires: 1.2.2+
+ */
+(function(c){var a=["DOMMouseScroll","mousewheel"];c.event.special.mousewheel={setup:function(){if(this.addEventListener){for(var d=a.length;d;){this.addEventListener(a[--d],b,false)}}else{this.onmousewheel=b}},teardown:function(){if(this.removeEventListener){for(var d=a.length;d;){this.removeEventListener(a[--d],b,false)}}else{this.onmousewheel=null}}};c.fn.extend({mousewheel:function(d){return d?this.bind("mousewheel",d):this.trigger("mousewheel")},unmousewheel:function(d){return this.unbind("mousewheel",d)}});function b(i){var g=i||window.event,f=[].slice.call(arguments,1),j=0,h=true,e=0,d=0;i=c.event.fix(g);i.type="mousewheel";if(i.wheelDelta){j=i.wheelDelta/120}if(i.detail){j=-i.detail/3}d=j;if(g.axis!==undefined&&g.axis===g.HORIZONTAL_AXIS){d=0;e=-1*j}if(g.wheelDeltaY!==undefined){d=g.wheelDeltaY/120}if(g.wheelDeltaX!==undefined){e=-1*g.wheelDeltaX/120}f.unshift(i,j,e,d);return c.event.handle.apply(this,f)}})(jQuery);
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/third-party/wijmo/jquery.wijmo-open.1.5.0.css b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/third-party/wijmo/jquery.wijmo-open.1.5.0.css
new file mode 100644
index 0000000..9dd8641
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/third-party/wijmo/jquery.wijmo-open.1.5.0.css
@@ -0,0 +1,1833 @@
+.ui-helper-horizontal > DIV,
+.ui-helper-horizontal > LI,
+.ui-helper-horizontal > SPAN,
+.ui-helper-horizontal > LABEL,
+.ui-helper-horizontal > H1,
+.ui-helper-horizontal > H2,
+.ui-helper-horizontal > H3,
+.ui-helper-horizontal > H4
+{
+    float: left;
+    clear: none;
+    display: block;
+}  /* WijSlider  horizontal
+----------------------------------*/
+.wijmo-wijslider-horizontal
+{
+	position: relative;
+}     
+        
+.wijmo-wijslider-horizontal .wijmo-wijslider-track
+{
+    
+}
+        
+.wijmo-wijslider-horizontal .wijmo-wijslider-decbutton
+{
+    position: absolute;
+    left: 0px;
+    right: auto;
+    cursor:pointer;
+}
+
+.wijmo-wijslider-horizontal .wijmo-wijslider-incbutton
+{
+    position: absolute;
+    left: auto;
+    right: 0px;
+    cursor:pointer;
+}
+
+  /* WijSlider  vertical
+----------------------------------*/
+.wijmo-wijslider-vertical
+{
+	position: relative;
+}     
+        
+.wijmo-wijslider-vertical .wijmo-wijslider-track
+{
+    
+}
+        
+.wijmo-wijslider-vertical .wijmo-wijslider-decbutton
+{
+    position: absolute;
+    top: 0px;
+    bottom: auto;
+    cursor:pointer;
+}
+
+.wijmo-wijslider-vertical .wijmo-wijslider-incbutton
+{
+    position: absolute;
+    top: auto;
+    bottom: 0px;
+    cursor:pointer;
+}/* WijSplitter
+----------------------------------*/
+
+.wijmo-wijsplitter-vertical
+{
+    overflow: hidden; /* fixed bug for IE6.7 */
+    position: relative;
+}
+.wijmo-wijsplitter-v-panel1
+{
+    float: left;
+    position: relative;
+}
+.wijmo-wijsplitter-v-panel1-content
+{
+    position: relative;
+}
+.wijmo-wijsplitter-v-bar
+{
+    float: left;
+    position: relative;
+    font-size: 1px;
+    width: 2px;
+    z-index: 99;
+}
+
+.wijmo-wijsplitter-vertical .ui-resizable-e
+{
+    right: -7px;
+    width: 10px;
+    z-index: 999;
+    display: block;
+    background-color: white;
+    filter: alpha(opacity=0);
+    -moz-opacity: 0;
+    opacity: 0;
+}
+
+*html .wijmo-wijsplitter-vertical .ui-resizable-e
+{
+    right: -4px;
+}
+
+* + html .wijmo-wijsplitter-vertical .ui-resizable-e
+{
+    right: -4px;
+}
+
+.wijmo-wijsplitter-v-expander
+{
+    position: absolute;
+    z-index: 999;
+}
+
+.wijmo-wijsplitter-vertical .wijmo-wijsplitter-v-expanded
+{
+    border-right: medium none;
+    overflow: hidden;
+    padding: 12px 0;
+    left: -8px;
+    width: 6px;
+    z-index: 999;
+}
+
+.wijmo-wijsplitter-vertical .wijmo-wijsplitter-v-expanded .ui-icon
+{
+    margin-left: -6px;
+}
+
+.wijmo-wijsplitter-vertical .wijmo-wijsplitter-v-collapsed
+{
+    border-left: medium none;
+    overflow: hidden;
+    padding: 12px 0;
+    right: -8px;
+    width: 6px;
+    z-index: 999;
+}
+
+.wijmo-wijsplitter-vertical .wijmo-wijsplitter-v-collapsed .ui-icon
+{
+    margin-left: -6px;
+}
+
+.wijmo-wijsplitter-v-panel2
+{
+    float: left;
+}
+.wijmo-wijsplitter-v-panel2-content
+{
+    position: relative;
+}
+.wijmo-wijsplitter-v-resize-helper
+{
+    border-right: dotted 1px black;
+    overflow: hidden;
+    border-bottom: dotted 0 black;
+}
+
+.wijmo-wijsplitter-horizontal
+{
+    overflow: hidden; /* fixed bug for IE6.7 */
+    position: relative;
+}
+.wijmo-wijsplitter-h-panel1
+{
+    position: relative;
+}
+.wijmo-wijsplitter-h-panel1-content
+{
+    overflow: auto;
+    position: relative;
+}
+.wijmo-wijsplitter-h-bar
+{
+    position: relative;
+    font-size: 1px;
+    height: 2px;
+    z-index: 999;
+}
+
+.wijmo-wijsplitter-horizontal .ui-resizable-s
+{
+    bottom: -7px;
+    height: 10px;
+    z-index: 999;
+    display: block;
+    background-color: white;
+    filter: alpha(opacity=0);
+    -moz-opacity: 0;
+    opacity: 0;
+}
+
+*html .wijmo-wijsplitter-horizontal .ui-resizable-s
+{
+    bottom: -4px;
+}
+
+* + html .wijmo-wijsplitter-horizontal .ui-resizable-s
+{
+    bottom: -4px;
+}
+
+.wijmo-wijsplitter-h-expander
+{
+    position: absolute;
+    z-index: 999;
+}
+
+
+.wijmo-wijsplitter-horizontal .wijmo-wijsplitter-h-expanded
+{
+    border-bottom: none;
+    height: 8px;
+    overflow: hidden;
+    padding: 0 10px;
+    top: -10px;
+    z-index: 999;
+}
+
+.wijmo-wijsplitter-horizontal .wijmo-wijsplitter-h-expanded .ui-icon
+{
+    margin-top: -4px;
+}
+
+.wijmo-wijsplitter-horizontal .wijmo-wijsplitter-h-collapsed
+{
+    border-top: none;
+    height: 8px;
+    overflow: hidden;
+    padding: 0 10px;
+    bottom: -10px;
+    z-index: 999;
+}
+
+.wijmo-wijsplitter-horizontal .wijmo-wijsplitter-h-collapsed .ui-icon
+{
+    margin-top: -4px;
+}
+
+.wijmo-wijsplitter-h-panel2
+{
+}
+
+.wijmo-wijsplitter-h-panel2-content
+{
+    overflow: auto;
+    position: relative;
+}
+
+.wijmo-wijsplitter-h-resize-helper
+{
+    border-bottom: dotted 1px black;
+    overflow: hidden;
+    border-right: dotted 0 black;
+}
+
+
+
+.wijmo-wijprogressbar
+{
+    moz-user-select: none;
+    text-align: left;
+    float: left;
+    position: relative;
+    overflow: hidden;
+}
+
+.wijmo-wijprogressbar .ui-progressbar-value
+{
+    position: absolute;
+    border-width: 0;
+    margin: 0;
+}
+
+div.wijmo-wijprogressbar-east
+{
+    width: 200px;
+    height: 1.1em;
+}
+div.wijmo-wijprogressbar-west
+{
+    width: 200px;
+    height: 1.1em;
+}
+div.wijmo-wijprogressbar-south
+{
+    height: 200px;
+    width: 1.1em;
+    line-height: 100%;
+}
+
+div.wijmo-wijprogressbar-north
+{
+    height: 200px;
+    width: 1.1em;
+    line-height: 100%;
+}
+
+.wijmo-wijprogressbar-east .ui-progressbar-value
+{
+    left: 0;
+    height: 100%;
+}
+.wijmo-wijprogressbar-west .ui-progressbar-value
+{
+    right: 0;
+    height: 100%;
+}
+.wijmo-wijprogressbar-south .ui-progressbar-value
+{
+    top: 0;
+    width: 100%;
+}
+
+.wijmo-wijprogressbar-north .ui-progressbar-value
+{
+    bottom: 0;
+    width: 100%;
+}
+
+.wijmo-wijprogressbar .ui-progressbar-label
+{
+    display: block;
+    position:absolute;
+    text-align: center;
+    width: 100%;
+    height:100%;
+}
+
+.wijmo-wijprogressbar .wijmo-wijprogressbar-lb-west
+{
+    left:0;
+    width:auto;
+}
+
+.wijmo-wijprogressbar .wijmo-wijprogressbar-lb-east
+{
+    right:0;
+    width:auto;
+}
+
+.wijmo-wijprogressbar .wijmo-wijprogressbar-lb-south
+{
+    bottom: 0;
+    height:auto;
+}
+
+.wijmo-wijprogressbar .wijmo-wijprogressbar-lb-north
+{
+    top: 0;
+    height:auto;
+}
+
+.wijmo-wijprogressbar-east .wijmo-wijprogressbar-lb-running,
+.wijmo-wijprogressbar-west .wijmo-wijprogressbar-lb-running
+{
+    display:inline;
+    width:auto;
+}
+
+.wijmo-wijprogressbar-north .wijmo-wijprogressbar-lb-running,
+.wijmo-wijprogressbar-south .wijmo-wijprogressbar-lb-running
+{
+    height:auto;
+}
+
+.wijmo-wijprogressbar-north .ui-progressbar-label,
+.wijmo-wijprogressbar-south .ui-progressbar-label
+{
+    -webkit-transform: rotate(-90deg);
+    -moz-transform: rotate(-90deg);
+}.wijmo-wijdialog-captionbutton
+{
+    height: 18px;
+    padding: 1px;
+    width: 19px;
+    display: inline-block; /*margin-right:.2em;*/
+    outline: none;
+    text-align: left;
+}
+.wijmo-wijdialog-captionbutton:hover, .wijmo-wijdialog-captionbutton .ui-state-focus
+{
+    padding: 0;
+}
+.wijmo-wijdialog-captionbutton .ui-icon
+{
+    margin: 1px;
+}
+.wijmo-wijdialog .wijmo-wijdialog-hasframe
+{
+    padding: 0;
+}
+.wijmo-wijdialog-defaultdockingzone
+{
+    position: fixed;
+    bottom: 0px;
+    left: 0px;
+}
+
+.ui-dialog-titlebar
+{
+    /* extend jquery.ui.dialog.css*/
+    text-align: right;
+}
+
+/* for ie 6 minimize*/
+* html .wijmo-wijdialog-defaultdockingzone .ui-dialog-titlebar
+{
+    float: left;
+}
+/*.wijmo-wijaccordion.ui-helper-horizontal > .ui-widget-content
+{
+    width: 200px;
+    height: 200px;  
+    padding-top:0;
+    padding-bottom:0;  
+    margin-top:0;
+    margin-bottom:0;    
+}
+
+.wijmo-wijaccordion.ui-helper-horizontal > .ui-accordion-header
+{
+    height: 200px;	
+    padding-top:0;
+    padding-bottom:0;
+    margin-top:0;
+    margin-bottom:0;    
+}*/
+
+
+.ui-accordion a
+{
+    outline: none;
+}
+
+/* RIGHT */
+
+.ui-accordion-right .ui-accordion-header
+{
+    margin-top: 0;
+    margin-left: 1px;
+    width: 2em;
+    height: 12em;
+    overflow: hidden;
+}
+
+.ui-accordion-right .ui-accordion-content
+{
+    margin: 0;
+    height: 200px;
+    width: 36em;
+    height: 12em;
+    padding: 0 2.2em;
+}
+.ui-accordion-right .ui-accordion-content
+{
+    top: 0;
+    margin-left: -2px;
+    padding: 1px;
+    border: none;
+}
+
+
+.ui-accordion-right .ui-state-active
+{
+    border-right: none;
+}
+
+.ui-accordion-right .ui-accordion-header a
+{
+    padding: 2.2em 0 0 0;
+    text-align: center;
+}
+
+
+.ui-accordion-right .ui-accordion-header .ui-icon
+{
+    top: 10%;
+}
+
+
+/* LEFT */
+
+.ui-accordion-left .ui-accordion-header
+{
+    margin-top: 0;
+    margin-right: 1px;
+    width: 2em;
+    height: 12em;
+    overflow: hidden;
+}
+
+.ui-accordion-left .ui-accordion-content
+{
+    margin: 0;
+    height: 200px;
+    width: 36em;
+    height: 12em;
+    padding: 0 2.2em;
+}
+.ui-accordion-left .ui-accordion-content
+{
+    border: none;
+    padding: 1px;
+    top: 0;
+    margin-right: -2px;
+}
+
+
+.ui-accordion-left .ui-state-active
+{
+    border-left: none;
+}
+
+.ui-accordion-left .ui-accordion-header a
+{
+    padding: 2.2em 0 0 0;
+    text-align: center;
+}
+
+
+.ui-accordion-left .ui-accordion-header .ui-icon
+{
+    top: 10%;
+}
+/* SuperPanel
+----------------------------------*/
+.wijmo-wijsuperpanel
+{
+    overflow: hidden;
+    outline: none;
+    background-image: none;
+}
+.wijmo-wijsuperpanel-statecontainer
+{
+    overflow: hidden;
+    position: relative;
+    zoom:1;
+}
+.wijmo-wijsuperpanel-contentwrapper
+{
+    position: absolute;
+    overflow: hidden;
+
+}
+.wijmo-wijsuperpanel-hbarcontainer, .wijmo-wijsuperpanel-vbarcontainer
+{
+    font-size: 0px;
+    border:0;
+}
+.wijmo-wijsuperpanel-templateouterwrapper
+{
+    position: relative; 
+/*    overflow:auto; */
+    zoom: 1;
+}
+
+.wijmo-wijsuperpanel-vbarcontainer .ui-state-default, .wijmo-wijsuperpanel-hbarcontainer .ui-state-default
+{
+    width: 16px;
+    height: 16px;
+    position: absolute;
+}
+.wijmo-wijsuperpanel .wijmo-wijsuperpanel-vbarcontainer
+{
+    position: absolute;
+    width: 18px;
+    padding-top: 18px;
+    padding-bottom: 18px;
+    border: none;
+}
+.wijmo-wijsuperpanel .wijmo-wijsuperpanel-hbarcontainer
+{
+    position: absolute;
+    height: 18px;
+    padding-left: 18px;
+    padding-right: 18px;
+    border: none;
+}
+.wijmo-wijsuperpanel-handle
+{
+    position: absolute;
+    font-size:0px;
+    overflow:hidden;
+}
+.wijmo-wijsuperpanel-handle *
+{
+    font-size:0px;
+}
+.wijmo-wijsuperpanel-helper
+{
+    border-style: dotted;
+    background: transparent;
+}
+
+.wijmo-wijsuperpanel-button
+{
+    position: absolute;
+    padding: 4px;
+}
+.wijmo-wijsuperpanel .ui-icon-gripsmall-diagonal-se
+{
+    background: none;
+    width: 7px;
+    height: 7px;
+}
+.wijmo-wijsuperpanel-hbar-buttonleft
+{
+    left: 0;
+}
+.wijmo-wijsuperpanel-hbar-buttonright
+{
+    right: 0;
+}
+.wijmo-wijsuperpanel-vbar-buttontop
+{
+    top: 0;
+}
+.wijmo-wijsuperpanel-vbar-buttonbottom
+{
+    bottom: 0;
+}
+.wijmo-wijtextbox
+{
+	outline:none;
+	margin: 0;
+	padding:5px;
+}
+
+.wijmo-wijdropdown
+{
+    display: inline-block;
+    position: relative;
+    width: auto;
+    zoom: 1;
+    *display: inline;
+    width:200px;
+    /*z-index: 101;*/
+}
+
+
+
+
+.wijmo-wijdropdown div.wijmo-dropdown-trigger
+{
+    border-right: none;
+    border-top: none;
+    border-bottom: none;
+    cursor: pointer;
+    width: 16px;
+    height: 100%;
+    position: absolute;
+    right: 0;
+    top: 0;
+    padding: 0 3px;
+}
+
+.wijmo-wijdropdown .wijmo-dropdown-trigger .ui-icon
+{
+    margin-top: 3px;
+}
+
+.wijmo-wijdropdown label.wijmo-dropdown-label
+{
+    display: block;
+    padding: 3px 26px 3px 5px;
+    width: auto;
+    border: none;
+}
+
+.wijmo-wijdropdown .wijmo-dropdown
+{
+    position: absolute; height:250px;
+}
+
+.wijmo-wijdropdown .wijmo-dropdown .wijmo-dropdown-list
+{
+    padding: 0.4em;
+    border: 0 none;
+}
+
+.wijmo-wijdropdown .wijmo-dropdown .wijmo-dropdown-item
+{
+border:1px solid transparent;
+cursor:pointer;
+font-weight:normal;
+margin:1px 0;
+padding:3px 5px;
+text-align:left;
+*border-color: white;
+*filter: chroma(color=white);
+
+}
+
+/*
+.wijmo-wijdropdown .wijmo-dropdown .wijmo-dropdown-optgroup .wijmo-dropdown-items
+{
+    margin-left: 15%;
+}*/
+
+.wijmo-wijdropdown .wijmo-dropdown .wijmo-dropdown-optgroup .wijmo-dropdown-items li
+{
+    padding-left: 10px;
+}
+
+.wijmo-wijdropdown .wijmo-dropdown .wijmo-optgroup-header
+{
+    font-style: italic;
+}
+.wijmo-checkbox
+{
+    position: relative; /*float: left;*/
+    margin: 3px 0;
+    line-height: 16px;
+    width: 16px;
+}
+.wijmo-checkbox .wijmo-checkbox-inputwrapper
+{
+    width: 0;
+    height: 0;
+    overflow: hidden;
+}
+.wijmo-checkbox label
+{
+    display: block;
+    position: relative;
+    margin: 0;
+    cursor: pointer;
+    z-index: 1;
+    padding: 0 0 0 1.4em;
+    outline: none;
+    margin: 0 3px;
+    width: 8em;
+}
+.wijmo-checkbox .wijmo-checkbox-box
+{
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    width: 16px;
+    height: 16px;
+    -moz-border-radius: 2px;
+    -webkit-border-radius: 2px;
+    border-radius: 2px;
+    margin-right: 3px;
+}
+
+.wijmo-checkbox .wijmo-checkbox-relative
+{
+    position: relative;
+    float: left;
+    margin-right: 3px;    
+}
+.wijmo-wijradio
+{
+    position: relative; /*float: left;*/
+    margin: 3px 0;
+    width: 16px;
+    line-height: 16px;
+}
+.wijmo-wijradio .wijmo-wijradio-inputwrapper
+{
+    width: 0;
+    height: 0;
+    overflow: hidden;
+}
+.wijmo-wijradio label
+{
+    display: block;
+    position: relative;
+    margin: 0;
+    cursor: pointer;
+    z-index: 1;
+    padding: 0 0 0 1.4em;
+    outline: none;
+    margin: 0 3px;
+    width: 8em;
+}
+.wijmo-wijradio .wijmo-wijradio-box
+{
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    width: 16px;
+    height: 16px;
+    line-height: 16px;
+    -moz-border-radius: 10px;
+    -webkit-border-radius: 10px;
+    border-radius: 10px;
+}
+.wijmo-wijradio .wijmo-wijradio-relative
+{
+    position: relative;
+    float: left;
+    margin-right: 3px;   
+}
+
+.wijmo-wijlist-list
+{
+    cursor: default;
+    overflow: hidden;
+}
+.wijmo-wijlist-ul
+{
+    list-style: none;
+    padding: 2px;
+    margin: 0;
+    display: block;
+    border: 0px;
+    overflow: hidden;
+}
+.wijmo-wijlist-ul .wijmo-wijlist-item
+{
+    margin: 1px 0;
+    padding: 3px 5px;
+    /*white-space: nowrap;*/
+    cursor: pointer;
+    text-align: left;
+    font-weight: normal;
+    border: solid 1px transparent;
+}
+.wijmo-wijlist-ul .wijmo-wijlist-item.ui-state-hover
+{
+    font-weight: normal;
+}
+
+.wijmo-wijlist .ui-resizable-se
+{
+    width: 7px;
+    height: 7px;
+    background: none;
+}
+.wijmo-wijcalendar
+{
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    display:block;
+}
+
+.wijmo-wijcalendar-header
+{
+    position: relative;
+}
+
+.wijmo-wijcalendar-header-inner
+{
+    margin: 0 1.8em;
+    line-height: 1.8em;
+}
+
+.wijmo-wijcalendar .ui-datepicker-header
+{
+    padding: 1px;
+}
+
+.wijmo-wijcalendar .ui-datepicker-header .ui-state-default
+{
+    border-color: transparent;
+    background: none;
+    color: inherit;
+}
+
+.wijmo-wijcalendar .wijmo-wijcalendar-table
+{
+    table-layout: fixed;
+}
+
+.wijmo-wijcalendar-prevpreview-button, .wijmo-wijcalendar-nextpreview-button
+{
+    width: 16px;
+    margin-top: 35%;
+    float: left;
+}
+
+.wijmo-wijcalendar-nextpreview-button
+{
+    float: right;
+}
+
+.wijmo-wijcalendar-preview-wrapper .wijmo-wijcalendar
+{
+    float: left;
+    width: 18em;
+}
+
+.wijmo-wijcalendar-preview-wrapper .wijmo-wijcalendar .ui-datepicker-calendar
+{
+    width: 80%;
+    float: left;
+}
+
+.wijmo-wijcalendar-title, .wijmo-wijcalendar-selectable
+{
+    cursor: pointer;
+}
+
+.ui-datepicker-other-month
+{
+    text-align: right;
+}
+
+.wijmo-wijcalendar-mygrid td span, .wijmo-wijcalendar-mygrid td a
+{
+    display: block;
+    text-align: center;
+    text-decoration: none;
+    padding: 0;
+}
+
+.wijmo-wijcalendar-mygrid .ui-state-default a, .wijmo-wijcalendar-mygrid .ui-state-default a:hover, .wijmo-wijcalendar-mygrid .ui-state-hover a, .wijmo-wijcalendar-mygrid .ui-state-hover a:hover
+{
+    color: inherit;
+}
+
+.ui-header-custom img, .ui-footer-custom img
+{
+    width: 100%;
+}
+
+.wijmo-wijcalendar table.wijmo-wijcalendar-mygrid
+{
+    margin-top: 2px;
+    border-collapse: separate;
+    table-layout: fixed;
+}
+
+.wijmo-wijcalendar table.wijmo-wijcalendar-mygrid .ui-datepicker-week-day
+{
+    cursor: pointer;
+}
+
+.wijmo-wijcalendar-aniwrapper
+{
+    position: relative;
+    left: 0;
+    top: 0;
+}
+
+.wijmo-wijcalendar-multi-aniwrapper
+{
+    position: absolute;
+    overflow: hidden;
+}
+
+.ui-datepicker-rtl .ui-datepicker-prev .ui-icon, .ui-datepicker-rtl .ui-datepicker-next .ui-icon
+{
+    direction: rtl;
+}
+.wijmo-wijexpander
+{
+    margin: 1px;
+    padding: 0;
+    display: block;
+}
+
+.wijmo-wijexpander a
+{
+    outline: none;
+}
+
+.wijmo-wijexpander .ui-expander-header
+{
+    cursor: pointer;
+    margin-top: 1px;
+    position: relative;
+}
+/*.wijmo-wijexpander.ui-helper-horizontal > .ui-expander-header
+{
+    cursor: pointer;
+    width: 20px;
+    height: 200px;
+}
+.wijmo-wijexpander.ui-state-disabled > .ui-expander-header
+{
+    cursor: default;
+}
+.wijmo-wijexpander > .ui-widget-content
+{
+    height: 100px;
+    overflow: auto;
+}
+.wijmo-wijexpander.ui-state-disabled > .ui-widget-content
+{
+}*/
+
+
+.ui-expander .ui-expander-content
+{
+    border-top: 0 none;
+    display: none;
+    margin-bottom: 2px;
+    margin-top: -2px;
+    overflow: auto;
+    padding: 1em 2.2em;
+    position: relative;
+    top: 1px;
+}
+
+
+.wijmo-wijexpander .ui-expander-header a
+{
+    display: block;
+    font-size: 1em;
+    padding: 0.5em 0.5em 0.5em 0.7em;
+}
+
+.wijmo-wijexpander .ui-expander-header .ui-icon
+{
+    left: 0.5em;
+    margin-top: -8px;
+    position: absolute;
+    top: 50%;
+}
+
+.wijmo-wijexpander .ui-expander-content-active
+{
+    display: block;
+    border-top: 0 none;
+    padding: 1em 2.2em;
+}
+
+
+.wijmo-wijexpander .ui-expander-header > a
+{
+    padding-left: 2.2em;
+}
+
+.ui-helper-horizontal.wijmo-wijexpander .ui-expander-header .ui-icon
+{
+    left: inherit;
+    margin-top: inherit;
+    margin-left: -8px;
+    position: absolute;
+    top: 0.5em;
+    left: 50%;
+}
+
+.ui-helper-horizontal.wijmo-wijexpander .ui-expander-header > a
+{
+    padding-left: inherit;
+    padding-top: 2.2em;
+    display: inline-block;
+}
+
+
+/* RIGHT */
+
+.ui-expander-right .ui-expander-header
+{
+    margin: 0 1px;
+    width: 2em;
+    height: 12em;
+    overflow: hidden;
+}
+
+.ui-expander-right .ui-expander-content
+{
+    margin: 0;
+    height: 200px;
+    width: 12em;
+    height: 12em;
+    padding: 0 2.2em;
+}
+.ui-expander-right .ui-expander-content
+{
+    top: 0;
+    margin-left: -2px;
+    padding: 1px;
+    border: none;
+    margin-right: 1px;
+}
+
+
+.ui-expander-right .ui-state-active
+{
+    border-right: none;
+}
+
+.ui-expander-right .ui-expander-header a
+{
+    padding: 2.2em 0 0 0;
+}
+
+
+.ui-expander-right .ui-expander-header .ui-icon
+{
+    top: 10%;
+}
+
+
+/* LEFT */
+
+.ui-expander-left .ui-expander-header
+{
+    margin: 0 1px;
+    width: 2em;
+    height: 12em;
+    overflow: hidden;
+}
+
+.ui-expander-left .ui-expander-content
+{
+    margin: 0;
+    height: 200px;
+    width: 12em;
+    height: 12em;
+    padding: 0 2.2em;
+}
+.ui-expander-left .ui-expander-content
+{
+    border: none;
+    padding: 1px;
+    top: 0;
+    margin-right: -2px;
+    margin-left: 1px;
+}
+
+
+.ui-expander-left .ui-state-active
+{
+    border-left: none;
+}
+
+.ui-expander-left .ui-expander-header a
+{
+    padding: 2.2em 0 0 0;
+}
+
+
+.ui-expander-left .ui-expander-header .ui-icon
+{
+    top: 10%;
+}
+
+.ui-tabs .ui-tabs-nav li
+{
+    top: 1px;
+}
+
+/* BOTTOM */
+
+.ui-tabs-bottom .ui-tabs-nav li
+{
+    top: -3px;
+    padding: 0;
+    margin: 1px .2em 0 0;
+}
+
+.ui-tabs-bottom .ui-tabs-nav li.ui-tabs-selected
+{
+    margin-top: -1px;
+    padding-bottom: 2px;
+}
+
+.ui-tabs .ui-tabs-nav li
+{
+    border: none;
+}
+
+/* LEFT */
+.ui-tabs-left .ui-tabs-nav
+{
+    float: left;
+    overflow: hidden;
+}
+
+.ui-tabs-left .ui-tabs-nav li
+{
+    white-space: normal;
+    float: right;
+    display: block;
+    width: 98%;
+}
+
+.ui-tabs-left .ui-tabs-nav li a, .ui-tabs-right .ui-tabs-nav li a
+{
+    float: none;
+    display: block;
+}
+
+.ui-tabs-left .ui-tabs-nav li
+{
+    top: -1px;
+    left: 3px;
+    margin-bottom: 2px;
+}
+
+.ui-tabs-left .ui-tabs-panel
+{
+    padding: 1.6em;
+}
+
+.ui-tabs-left .ui-tabs-nav li.ui-tabs-selected
+{
+    border-right: medium none;
+    margin-bottom: 2px;
+}
+.ui-tabs-left .ui-tabs-nav
+{
+    padding: 0.2em 0 0 0;
+}
+
+.ui-tabs-left .wijmo-wijtabs-content
+{
+    float: right;
+    width: 75%;
+    overflow: hidden;
+}
+
+.ui-tabs-left .ui-tabs-nav
+{
+    min-height: 300px;
+    width: 23%;
+    height: 100%;
+}
+
+/* RIGHT */
+
+.ui-tabs-right .ui-tabs-nav
+{
+    float: right;
+    overflow: hidden;
+}
+
+.ui-tabs-right .ui-tabs-nav li
+{
+    white-space: normal;
+    float: left;
+    display: block;
+    width: 98%;
+}
+
+.ui-tabs-right .ui-tabs-nav li
+{
+    top: -1px;
+    left: 0;
+    margin-bottom: 2px;
+}
+
+.ui-tabs-right .ui-tabs-panel
+{
+    padding: 1.6em;
+}
+
+.ui-tabs-right .ui-tabs-nav li.ui-tabs-selected
+{
+    border-left: medium none;
+    margin-bottom: 2px;
+}
+.ui-tabs-right .ui-tabs-nav
+{
+    padding: 0.2em 0 0 0;
+}
+
+.ui-tabs-right .wijmo-wijtabs-content
+{
+    float: left;
+    width: 75%;
+    overflow: hidden;
+}
+
+.ui-tabs-right .ui-tabs-nav
+{
+    min-height: 300px;
+    width: 23%;
+}
+
+
+.ui-tabs-left .ui-tabs-nav li.ui-tabs-selected
+{
+    margin-right: 2px;
+    padding-right: 1px;
+}
+
+.ui-tabs-right .ui-tabs-nav li.ui-tabs-selected
+{
+    margin-left: -1px;
+    padding-left: 1px;
+}
+.wijmo-wijtooltip {
+    position: absolute;
+    z-index: 9999;
+    margin:0;
+}
+
+
+.wijmo-wijtooltip .wijmo-wijtooltip-close
+{
+    background:none repeat scroll 0 0 transparent;
+border:medium none;
+display:block;
+height:16px;
+position:absolute;
+right:3px;
+top:3px;
+width:16px;
+    }
+
+.wijmo-wijtooltip .wijmo-wijtooltip-title
+{
+    background:none repeat scroll 0 0 transparent;
+border:medium none;
+color:inherit;
+padding:0.4em;
+}
+.wijmo-wijtooltip .wijmo-wijtooltip-container
+{
+    padding: 1em;
+    overflow: hidden;
+}
+
+.wijmo-wijtooltip {
+    border-width: 2px;
+}
+
+.wijmo-wijtooltip .wijmo-wijtooltip-pointer, .wijmo-wijtooltip .wijmo-wijtooltip-pointer-inner {
+    background: none;
+    height: 0;
+    position: absolute;
+    width: 0;
+}
+
+.wijmo-wijtooltip-arrow-tr .wijmo-wijtooltip-pointer, .wijmo-wijtooltip-arrow-tc .wijmo-wijtooltip-pointer, .wijmo-wijtooltip-arrow-tl .wijmo-wijtooltip-pointer {
+    border-bottom-width: 14px;
+    border-top: 0 none;
+    top: -14px;
+	
+}
+
+.wijmo-wijtooltip-arrow-tr .wijmo-wijtooltip-pointer {
+    border-left: 18px dashed transparent;
+    border-right: 0 none;
+    right: 10px;
+}
+
+.wijmo-wijtooltip-arrow-tc .wijmo-wijtooltip-pointer {
+    border-left: 10px dashed transparent;
+    border-right: 10px dashed transparent;
+    left: 50%;
+    margin-left: -10px;
+}
+
+.wijmo-wijtooltip-arrow-tl .wijmo-wijtooltip-pointer {
+    border-left: 0 none;
+    border-right: 18px dashed transparent;
+    left: 10px;
+}
+
+.wijmo-wijtooltip-arrow-tr .wijmo-wijtooltip-pointer-inner, .wijmo-wijtooltip-arrow-tc .wijmo-wijtooltip-pointer-inner, .wijmo-wijtooltip-arrow-tl .wijmo-wijtooltip-pointer-inner {
+    border-bottom-color: inherit;
+    border-bottom-style: solid;
+    border-bottom-width: 10px;    
+    bottom: -14px;
+	*font-size:0;line-height:0;
+}
+
+.wijmo-wijtooltip-arrow-tr .wijmo-wijtooltip-pointer-inner {
+    border-left: 12px dashed transparent;
+    border-right: 0 none;
+    +border-style:dashed;
+    _border-style:dashed;
+    right: 2px;
+}
+
+.wijmo-wijtooltip-arrow-tc .wijmo-wijtooltip-pointer-inner {
+    border-left: 8px dashed transparent;
+    border-right: 8px dashed transparent;
+    +border-style:dashed;
+    _border-style:dashed;
+    left: -8px;
+}
+
+.wijmo-wijtooltip-arrow-tl .wijmo-wijtooltip-pointer-inner {
+    border-left: 0 none;
+    border-right-style: dashed;
+    border-right-color: inherit;
+    border-right-width: 12px;
+    +border-style:dashed;
+    _border-style:dashed;
+    left: 2px;
+}
+
+.wijmo-wijtooltip-arrow-rb .wijmo-wijtooltip-pointer, .wijmo-wijtooltip-arrow-rc .wijmo-wijtooltip-pointer, .wijmo-wijtooltip-arrow-rt .wijmo-wijtooltip-pointer {
+    border-left-width: 14px;
+    border-right: 0 none;
+    right: -14px;
+}
+
+.wijmo-wijtooltip-arrow-rb .wijmo-wijtooltip-pointer {
+    border-bottom: 0 none;
+    border-top: 18px dashed transparent;
+    bottom: 10px;
+}
+
+.wijmo-wijtooltip-arrow-rc .wijmo-wijtooltip-pointer {
+    border-bottom: 10px dashed transparent;
+    border-top: 10px dashed transparent;
+    bottom: 50%;
+    margin-bottom: -10px;
+}
+
+.wijmo-wijtooltip-arrow-rt .wijmo-wijtooltip-pointer {
+    border-bottom: 18px dashed transparent;
+    border-top: 0 none;
+    top: 10px;
+}
+
+.wijmo-wijtooltip-arrow-rb .wijmo-wijtooltip-pointer-inner, .wijmo-wijtooltip-arrow-rc .wijmo-wijtooltip-pointer-inner, .wijmo-wijtooltip-arrow-rt .wijmo-wijtooltip-pointer-inner {
+    border-left-color: inherit;
+    border-left-style: solid;
+    border-left-width: 10px;
+    left: -14px;
+	*font-size:0;line-height:0;
+}
+
+
+.wijmo-wijtooltip-arrow-rb .wijmo-wijtooltip-pointer-inner {
+    border-bottom: 0 none;
+    border-top-style: dashed;
+    border-top-color: inherit;
+    border-top-width: 12px;
+    +border-style:dashed;
+    _border-style:dashed;
+    bottom: 2px;
+}
+
+.wijmo-wijtooltip-arrow-rc .wijmo-wijtooltip-pointer-inner {
+    border-bottom: 8px dashed transparent;
+    border-top: 8px dashed transparent;
+    +border-style:dashed;
+    _border-style:dashed;
+    bottom: -8px;
+}
+
+.wijmo-wijtooltip-arrow-rt .wijmo-wijtooltip-pointer-inner {
+    border-bottom-style: dashed;
+    border-bottom-color: inherit;
+    border-bottom-width: 12px;
+    +border-style:dashed;
+    _border-style:dashed;
+    border-top: 0 none;
+    top: 2px;
+}
+
+.wijmo-wijtooltip-arrow-br .wijmo-wijtooltip-pointer, .wijmo-wijtooltip-arrow-bc .wijmo-wijtooltip-pointer, .wijmo-wijtooltip-arrow-bl .wijmo-wijtooltip-pointer {
+    border-bottom: 0 none;
+    border-top-width: 14px;
+    bottom: -14px;
+	
+}
+
+.wijmo-wijtooltip-arrow-br .wijmo-wijtooltip-pointer {
+    border-left: 18px dashed transparent;
+    border-right: 0 none;
+    right: 10px;
+}
+
+.wijmo-wijtooltip-arrow-bc .wijmo-wijtooltip-pointer {
+    border-left: 10px dashed transparent;
+    border-right: 10px dashed transparent;
+    left: 50%;
+    margin-left: -10px;
+}
+
+.wijmo-wijtooltip-arrow-bl .wijmo-wijtooltip-pointer {
+    border-left: 0 none;
+    border-right: 18px dashed transparent;
+    left: 10px;
+}
+
+.wijmo-wijtooltip-arrow-br .wijmo-wijtooltip-pointer-inner, .wijmo-wijtooltip-arrow-bc .wijmo-wijtooltip-pointer-inner, .wijmo-wijtooltip-arrow-bl .wijmo-wijtooltip-pointer-inner {
+    border-top-color: inherit;
+    border-top-style: solid;
+    border-top-width: 10px;
+    top: -14px;
+	*font-size:0;line-height:0;
+}
+
+.wijmo-wijtooltip-arrow-br .wijmo-wijtooltip-pointer-inner {
+    border-left: 12px dashed transparent;
+    +border-style:dashed;
+    _border-style:dashed;
+    border-right: 0 none;
+    right: 2px;
+}
+
+.wijmo-wijtooltip-arrow-bc .wijmo-wijtooltip-pointer-inner {
+    border-left: 8px dashed transparent;
+    border-right: 8px dashed transparent;
+    +border-style:dashed;
+    _border-style:dashed;
+    left: -8px;
+}
+
+.wijmo-wijtooltip-arrow-bl .wijmo-wijtooltip-pointer-inner {
+    border-left: 0 none;
+    border-right: 12px dashed transparent;
+    +border-style:dashed;
+    _border-style:dashed;
+    left: 2px;
+}
+
+.wijmo-wijtooltip-arrow-lb .wijmo-wijtooltip-pointer, .wijmo-wijtooltip-arrow-lc .wijmo-wijtooltip-pointer, .wijmo-wijtooltip-arrow-lt .wijmo-wijtooltip-pointer {
+    border-left: 0 none;
+    border-right-width: 14px;
+    left: -14px;
+}
+
+.wijmo-wijtooltip-arrow-lb .wijmo-wijtooltip-pointer {
+    border-bottom: 0 none;
+    border-top: 18px dashed transparent;
+    bottom: 10px;
+}
+
+.wijmo-wijtooltip-arrow-lc .wijmo-wijtooltip-pointer {
+    border-bottom: 10px dashed transparent;
+    border-top: 10px dashed transparent;
+    bottom: 50%;
+    margin-bottom: -10px;
+}
+
+.wijmo-wijtooltip-arrow-lt .wijmo-wijtooltip-pointer {
+    border-bottom: 18px dashed transparent;
+    border-top: 0 none;
+    top: 10px;
+}
+
+.wijmo-wijtooltip-arrow-lb .wijmo-wijtooltip-pointer-inner, .wijmo-wijtooltip-arrow-lc .wijmo-wijtooltip-pointer-inner, .wijmo-wijtooltip-arrow-lt .wijmo-wijtooltip-pointer-inner {
+    border-right-color: inherit;
+    border-right-style: solid;
+    border-right-width: 10px;
+    right: -14px;
+	*font-size:0;line-height:0;
+}
+
+.wijmo-wijtooltip-arrow-lb .wijmo-wijtooltip-pointer-inner {
+    border-bottom: 0 none;
+    border-top: 12px dashed transparent;
+    +border-style:dashed;
+    _border-style:dashed;
+    bottom: 2px;
+}
+
+.wijmo-wijtooltip-arrow-lc .wijmo-wijtooltip-pointer-inner {
+    border-bottom: 8px dashed transparent;
+    border-top: 8px dashed transparent;
+    +border-style:dashed;
+    _border-style:dashed;
+    bottom: -8px;
+}
+
+.wijmo-wijtooltip-arrow-lt .wijmo-wijtooltip-pointer-inner {
+    border-bottom-style: dashed;
+    border-bottom-color: inherit;
+    border-bottom-width: 12px;
+    +border-style:dashed;
+    _border-style:dashed;
+    border-top: 0 none;
+    top: 2px;
+}
+.wijmo-wijmenu {
+width:150px;
+padding:0.3em;
+position:relative;
+}
+
+.wijmo-wijmenu .wijmo-wijsuperpanel {
+border:none;
+background: inherit;
+padding:0;
+}
+
+.wijmo-wijmenu-list {
+position:static;
+}
+
+.wijmo-wijmenu .wijmo-wijmenu-parent .wijmo-wijmenu-child {
+display:none;
+width:150px;
+padding:0.3em;
+}
+
+.wijmo-wijmenu .wijmo-wijmenu-parent {
+position:relative;
+}
+
+.wijmo-wijmenu .wijmo-wijmenu-child {
+position:relative;
+left:150px;
+top:0;
+}
+
+.wijmo-wijmenu .wijmo-wijmenu-item {
+width:100%;
+float:left;
+clear:both;
+margin:1px 0;
+padding:0;
+}
+
+.wijmo-wijmenu .wijmo-wijmenu-list .wijmo-wijmenu-item {
+background:none;
+border:none;
+}
+
+.wijmo-wijmenu .wijmo-wijmenu-link {
+display:block;
+width:92%;
+outline:none;
+text-decoration:none;
+font-weight:400;
+border:solid 1px transparent;
+float:left;
+line-height:16px;
+padding:0.3em;
+}
+
+.wijmo-wijmenu-horizontal {
+width:auto;
+}
+
+.wijmo-wijmenu-horizontal .wijmo-wijmenu-item {
+width:auto;
+clear:none;
+margin-right:3px;
+}
+
+.wijmo-wijmenu-horizontal .wijmo-wijmenu-child .wijmo-wijmenu-item {
+width:100%;
+}
+
+.wijmo-wijmenu-horizontal .wijmo-wijmenu-child {
+top:25px;
+left:0;
+}
+
+.wijmo-wijmenu-horizontal .wijmo-wijmenu-link {
+width:auto;
+padding:0.4em 0.3em;
+}
+
+.wijmo-wijmenu-horizontal .wijmo-wijmenu-child .wijmo-wijmenu-link {
+width:92%;
+}
+
+.wijmo-wijmenu .wijmo-wijmenu-list .ui-widget-header {
+clear:both;
+float:left;
+width:98%;
+margin:1px 0;
+}
+
+.wijmo-wijmenu-horizontal .wijmo-wijmenu-list .ui-widget-header
+{
+    width: auto;
+    clear: none;
+    margin: -1px 2px -2px 1px;
+}
+.wijmo-wijmenu-horizontal .wijmo-wijmenu-child .ui-widget-header
+{
+    width: 98%;
+    margin: 1px 0;
+}
+
+
+.wijmo-wijmenu-horizontal .ui-widget-header {
+clear:none;
+width:auto;
+margin:0 3px 0 0;
+}
+
+.wijmo-wijmenu .ui-widget-header h1,.wijmo-wijmenu .ui-widget-header h2,.wijmo-wijmenu .ui-widget-header h3,.wijmo-wijmenu .ui-widget-header h4,.wijmo-wijmenu .ui-widget-header h5,.wijmo-wijmenu .ui-widget-header h6 {
+float:left;
+display:block;
+font-size:1em;
+margin:0 auto;
+padding:0.3em 3%;
+}
+
+.wijmo-wijmenu-horizontal .ui-widget-header h1,.wijmo-wijmenu-horizontal .ui-widget-header h2,.wijmo-wijmenu-horizontal .ui-widget-header h3,.wijmo-wijmenu-horizontal .ui-widget-header h4,.wijmo-wijmenu-horizontal .ui-widget-header h5,.wijmo-wijmenu-horizontal .ui-widget-header h6 {
+padding:0.4em 0.3em;
+}
+
+.wijmo-wijmenu a.ui-state-default:link,.wijmo-wijmenu a.ui-state-default:visited,.wijmo-wijmenu a.ui-state-default:hover,.wijmo-wijmenu a.ui-state-default:active,.wijmo-wijmenu a.ui-state-hover:link,.wijmo-wijmenu a.ui-state-hover:visited,.wijmo-wijmenu a.ui-state-hover:hover,.wijmo-wijmenu a.ui-state-hover:active,.wijmo-wijmenu a.ui-state-active:link,.wijmo-wijmenu a.ui-state-active:visited,.wijmo-wijmenu a.ui-state-active:hover,.wijmo-wijmenu a.ui-state-active:active {
+font-weight:400;
+border-style:solid;
+}
+
+.wijmo-wijmenu .wijmo-wijmenu-child .ui-state-hover {
+font-weight:400;
+}
+
+.wijmo-wijmenu .wijmo-wijmenu-separator {
+clear:both;
+float:left;
+height:1px;
+text-indent:-9999px;
+width:98%;
+margin:1px 0;
+font-size:0;
+}
+
+.wijmo-wijmenu-horizontal .wijmo-wijmenu-separator {
+height:auto;
+clear:none;
+width:1px;
+text-indent:-9999px;
+margin:0 3px 0 0;
+padding:0.4em 0;
+}
+
+.wijmo-wijmenu-horizontal .wijmo-wijmenu-child .wijmo-wijmenu-separator {
+clear:both;
+float:left;
+height:1px;
+text-indent:-9999px;
+width:98%;
+margin:1px 0;
+padding:0;
+}
+
+.wijmo-wijmenu .wijmo-wijmenu-group {
+clear:both;
+float:left;
+width:98%;
+margin:3px 0;
+padding:0 0.4em;
+}
+
+.wijmo-wijmenu-ipod {
+width:180px;
+}
+
+.wijmo-wijmenu-container {
+overflow:hidden;
+}
+
+.wijmo-wijmenu-ipod .wijmo-wijmenu-list {
+background:inherit;
+position:absolute;
+border-width:0;
+-moz-box-shadow: none;
+-webkit-box-shadow:none;
+}
+
+.wijmo-wijmenu-breadcrumb {
+margin:0;
+padding:0;
+}
+
+.wijmo-wijmenu-footer {
+margin-top:3px;
+line-height: 22px;
+}
+
+.wijmo-wijmenu-footer .ui-icon {
+margin:3px 0;
+}
+
+.wijmo-wijmenu-header {
+margin-bottom:3px;
+}
+
+.wijmo-wijmenu-breadcrumb li {
+float:left;
+list-style:none;
+font-size:.9em;
+margin:0;
+padding:0 .2em;
+}
+
+.wijmo-wijmenu-breadcrumb li.wijmo-wijmenu-prev-list,.wijmo-wijmenu-breadcrumb li.wijmo-wijmenu-current-crumb {
+clear:left;
+float:none;
+opacity:1;
+}
+
+.wijmo-wijmenu-breadcrumb li.wijmo-wijmenu-current-crumb {
+padding-top:.2em;
+}
+
+.wijmo-wijmenu-footer a:link,.wijmo-wijmenu-footer a:visited {
+float:left;
+width:100%;
+text-decoration:none;
+}
+
+.wijmo-wijmenu-footer a span {
+float:left;
+cursor:pointer;
+}
+
+.wijmo-wijmenu-breadcrumb .wijmo-wijmenu-prev-list a:link,.wijmo-wijmenu-breadcrumb .wijmo-wijmenu-prev-list a:visited,.wijmo-wijmenu-breadcrumb .wijmo-wijmenu-prev-list a:hover,.wijmo-wijmenu-breadcrumb .wijmo-wijmenu-prev-list a:active {
+background-image:none;
+text-decoration:none;
+}
+
+.wijmo-wijmenu-breadcrumb .wijmo-wijmenu-prev-list a {
+float:left;
+padding-right:.4em;
+}
+
+.wijmo-wijmenu-breadcrumb .wijmo-wijmenu-current-crumb a:link,.wijmo-wijmenu-breadcrumb .wijmo-wijmenu-current-crumb a:visited,.wijmo-wijmenu-breadcrumb .wijmo-wijmenu-current-crumb a:hover,.wijmo-wijmenu-breadcrumb .wijmo-wijmenu-current-crumb a:active {
+display:block;
+background-image:none;
+font-size:1.3em;
+text-decoration:none;
+}
+
+.wijmo-wijmenu .wijmo-wijmenu-parent .ui-icon,.wijmo-wijmenu-horizontal .wijmo-wijmenu-child .ui-icon,.wijmo-wijmenu-ipod .ui-icon-triangle-1-e {
+float:right;
+}
+
+.wijmo-wijmenu .wijmo-wijmenu-item .wijmo-wijmenu-text,.wijmo-wijmenu-horizontal .wijmo-wijmenu-parent .ui-icon,.wijmo-wijmenu-breadcrumb a,.wijmo-wijmenu-breadcrumb span,.wijmo-wijmenu-breadcrumb .wijmo-wijmenu-prev-list a .ui-icon {
+float:left;
+}
+
+.wijmo-wijmenu .wijmo-wijmenu-link .wijmo-wijmenu-icon-left {
+display:inline-block;
+float:left;
+}
+
+.wijmo-wijmenu .wijmo-wijmenu-link .wijmo-wijmenu-icon-right {
+display:inline-block;
+float:right;
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/third-party/wijmo/jquery.wijmo-open.1.5.0.min.js b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/third-party/wijmo/jquery.wijmo-open.1.5.0.min.js
new file mode 100644
index 0000000..47b06e1
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-bs/third-party/wijmo/jquery.wijmo-open.1.5.0.min.js
@@ -0,0 +1,30 @@
+/*
+ *
+ * Wijmo Library 1.5.0
+ * http://wijmo.com/
+ *
+ * Copyright(c) ComponentOne, LLC.  All rights reserved.
+ * 
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * licensing@wijmo.com
+ * http://www.wijmo.com/license
+ *
+ **/
+(function(a){a.fn.extend({wijContent:function(a){return this.each(function(){this.innerHTML='<iframe frameborder="0" style="width: 100%; height: 100%;" src="'+a+'">"'})}});var b=function(a){return isNaN(a)?0:a};a.fn.leftBorderWidth=function(){var d=parseFloat(a(this).css("borderLeftWidth")),e=parseFloat(a(this).css("padding-left")),c=0;if(a(this).css("margin-left")!="auto")c=parseFloat(a(this).css("margin-left"));return b(d)+b(e)+b(c)};a.fn.rightBorderWidth=function(){var d=parseFloat(a(this).css("borderRightWidth")),e=parseFloat(a(this).css("padding-right")),c=0;if(a(this).css("margin-right")!="auto")c=parseFloat(a(this).css("margin-right"));return b(d)+b(e)+b(c)};a.fn.topBorderWidth=function(){var d=parseFloat(a(this).css("borderTopWidth")),e=parseFloat(a(this).css("padding-top")),c=0;if(a(this).css("margin-top")!="auto")c=parseFloat(a(this).css("margin-top"));return b(d)+b(e)+b(c)};a.fn.bottomBorderWidth=function(){var d=parseFloat(a(this).css("borderBottomWidth")),e=parseFloat(a(this).css("padding-bottom")),c=0;if(a(this).css("margin-bottom")!="auto")c=parseFloat(a(this).css("margin-bottom"));return b(d)+b(e)+b(c)};a.fn.borderSize=function(){var c=a(this).leftBorderWidth()+a(this).rightBorderWidth(),b=a(this).topBorderWidth()+a(this).bottomBorderWidth(),d={width:c,height:b};return d};a.fn.setOutWidth=function(b){var c=a(this).leftBorderWidth()+a(this).rightBorderWidth();a(this).width(b-c);return this};a.fn.setOutHeight=function(b){var c=a(this).topBorderWidth()+a(this).bottomBorderWidth();a(this).height(b-c);return this};a.fn.getWidget=function(){var a=this.data("widgetName");return a&&a!=""?this.data(a):null};a.fn.wijshow=function(b,e,g,f,d){var c=b.animated||false,h=b.duration||400,i=b.easing,j=b.option||{};f&&a.isFunction(f)&&f.call(this);if(c){if(a.effects&&a.effects[c]){this.show(c,a.extend(j,{easing:i}),h,d);return}if(e&&e[c]){e[c](b,a.extend(g,{complete:d}));return}}this.show();d&&a.isFunction(d)&&d.call(this)};a.fn.wijhide=function(d,e,g,f,c){var b=d.animated||false,h=d.duration||400,i=d.easing,j=d.option||{};f&&a.isFunction(f)&&f.call(this);if(b){if(a.effects&&a.effects[b]){this.hide(b,a.extend(j,{easing:i}),h,c);return}if(e&&e[b]){e[b](newAnimations,a.extend(g,{complete:c}));return}}this.hide();c&&a.isFunction(c)&&c.call(this)};var c=function(){};a.extend(c.prototype,{_UTFPunctuationsString:" ! \" # % & ' ( ) * , - . / : ; ? @ [ \\ ] { } \u00a1 \u00ab \u00ad \u00b7 \u00bb \u00bf \u037e \u0387 \u055a \u055b \u055c \u055d \u055e \u055f \u0589 \u058a \u05be \u05c0 \u05c3 \u05f3 \u05f4 \u060c \u061b \u061f \u066a \u066b \u066c \u066d \u06d4 \u0700 \u0701 \u0702 \u0703 \u0704 \u0705 \u0706 \u0707 \u0708 \u0709 \u070a \u070b \u070c \u070d \u0964 \u0965 \u0970 \u0df4 \u0e4f \u0e5a \u0e5b \u0f04 \u0f05 \u0f06 \u0f07 \u0f08 \u0f09 \u0f0a \u0f0b \u0f0c \u0f0d \u0f0e \u0f0f \u0f10 \u0f11 \u0f12 \u0f3a \u0f3b \u0f3c \u0f3d \u0f85 \u104a \u104b \u104c \u104d \u104e \u104f \u10fb \u1361 \u1362 \u1363 \u1364 \u1365 \u1366 \u1367 \u1368 \u166d \u166e \u169b \u169c \u16eb \u16ec \u16ed \u17d4 \u17d5 \u17d6 \u17d7 \u17d8 \u17d9 \u17da \u17dc \u1800 \u1801 \u1802 \u1803 \u1804 \u1805 \u1806 \u1807 \u1808 \u1809 \u180a \u2010 \u2011 \u2012 \u2013 \u2014 \u2015 \u2016 \u2017 \u2018 \u2019 \u201a \u201b \u201c \u201d \u201e \u201f \u2020 \u2021 \u2022 \u2023 \u2024 \u2025 \u2026 \u2027 \u2030 \u2031 \u2032 \u2033 \u2034 \u2035 \u2036 \u2037 \u2038 \u2039 \u203a \u203b \u203c \u203d \u203e \u2041 \u2042 \u2043 \u2045 \u2046 \u2048 \u2049 \u204a \u204b \u204c \u204d \u207d \u207e \u208d \u208e \u2329 \u232a \u3001 \u3002 \u3003 \u3008 \u3009 \u300a \u300b \u300c \u300d \u300e \u300f \u3010 \u3011 \u3014 \u3015 \u3016 \u3017 \u3018 \u3019 \u301a \u301b \u301c \u301d \u301e \u301f \u3030 \ufd3e \ufd3f \ufe30 \ufe31 \ufe32 \ufe35 \ufe36 \ufe37 \ufe38 \ufe39 \ufe3a \ufe3b \ufe3c \ufe3d \ufe3e \ufe3f \ufe40 \ufe41 \ufe42 \ufe43 \ufe44 \ufe49 \ufe4a \ufe4b \ufe4c \ufe50 \ufe51 \ufe52 \ufe54 \ufe55 \ufe56 \ufe57 \ufe58 \ufe59 \ufe5a \ufe5b \ufe5c \ufe5d \ufe5e \ufe5f \ufe60 \ufe61 \ufe63 \ufe68 \ufe6a \ufe6b \uff01 \uff02 \uff03 \uff05 \uff06 \uff07 \uff08 \uff09 \uff0a \uff0c \uff0d \uff0e \uff0f \uff1a \uff1b \uff1f \uff20 \uff3b \uff3c \uff3d \uff5b \uff5d \uff61 \uff62 \uff63 \uff64';this.UTFWhitespacesString_='\t \13 \f \37   \u00a0 \u1680 \u2000 \u2001 \u2002 \u2003 \u2004 \u2005 \u2006 \u2007 \u2008 \u2009 \u200a \u200b \u2028 \u202f \u3000",isDigit:function(a){return a>="0"&&a<="9"},isLetter:function(a){return!!(a+"").match(new RegExp("[A-Za-z\u00aa\u00b5\u00ba\u00c0-\u00d6\u00d8-\u00f6\u00f8-\u021f\u0222-\u0233\u0250-\u02ad\u02b0-\u02b8\u02bb-\u02c1\u02d0\u02d1\u02e0-\u02e4\u02ee\u037a\u0386\u0388-\u038a\u038c\u038e-\u03a1\u03a3-\u03ce\u03d0-\u03d7\u03da-\u03f3\u0400-\u0481\u048c-\u04c4\u04c7\u04c8\u04cb\u04cc\u04d0-\u04f5\u04f8\u04f9\u0531-\u0556\u0559\u0561-\u0587\u05d0-\u05ea\u05f0-\u05f2\u0621-\u063a\u0640-\u064a\u0671-\u06d3\u06d5\u06e5\u06e6\u06fa-\u06fc\u0710\u0712-\u072c\u0780-\u07a5\u0905-\u0939\u093d\u0950\u0958-\u0961\u0985-\u098c\u098f\u0990\u0993-\u09a8\u09aa-\u09b0\u09b2\u09b6-\u09b9\u09dc\u09dd\u09df-\u09e1\u09f0\u09f1\u0a05-\u0a0a\u0a0f\u0a10\u0a13-\u0a28\u0a2a-\u0a30\u0a32\u0a33\u0a35\u0a36\u0a38\u0a39\u0a59-\u0a5c\u0a5e\u0a72-\u0a74\u0a85-\u0a8b\u0a8d\u0a8f-\u0a91\u0a93-\u0aa8\u0aaa-\u0ab0\u0ab2\u0ab3\u0ab5-\u0ab9\u0abd\u0ad0\u0ae0\u0b05-\u0b0c\u0b0f\u0b10\u0b13-\u0b28\u0b2a-\u0b30\u0b32\u0b33\u0b36-\u0b39\u0b3d\u0b5c\u0b5d\u0b5f-\u0b61\u0b85-\u0b8a\u0b8e-\u0b90\u0b92-\u0b95\u0b99\u0b9a\u0b9c\u0b9e\u0b9f\u0ba3\u0ba4\u0ba8-\u0baa\u0bae-\u0bb5\u0bb7-\u0bb9\u0c05-\u0c0c\u0c0e-\u0c10\u0c12-\u0c28\u0c2a-\u0c33\u0c35-\u0c39\u0c60\u0c61\u0c85-\u0c8c\u0c8e-\u0c90\u0c92-\u0ca8\u0caa-\u0cb3\u0cb5-\u0cb9\u0cde\u0ce0\u0ce1\u0d05-\u0d0c\u0d0e-\u0d10\u0d12-\u0d28\u0d2a-\u0d39\u0d60\u0d61\u0d85-\u0d96\u0d9a-\u0db1\u0db3-\u0dbb\u0dbd\u0dc0-\u0dc6\u0e01-\u0e30\u0e32\u0e33\u0e40-\u0e46\u0e81\u0e82\u0e84\u0e87\u0e88\u0e8a\u0e8d\u0e94-\u0e97\u0e99-\u0e9f\u0ea1-\u0ea3\u0ea5\u0ea7\u0eaa\u0eab\u0ead-\u0eb0\u0eb2\u0eb3\u0ebd\u0ec0-\u0ec4\u0ec6\u0edc\u0edd\u0f00\u0f40-\u0f47\u0f49-\u0f6a\u0f88-\u0f8b\u1000-\u1021\u1023-\u1027\u1029\u102a\u1050-\u1055\u10a0-\u10c5\u10d0-\u10f6\u1100-\u1159\u115f-\u11a2\u11a8-\u11f9\u1200-\u1206\u1208-\u1246\u1248\u124a-\u124d\u1250-\u1256\u1258\u125a-\u125d\u1260-\u1286\u1288\u128a-\u128d\u1290-\u12ae\u12b0\u12b2-\u12b5\u12b8-\u12be\u12c0\u12c2-\u12c5\u12c8-\u12ce\u12d0-\u12d6\u12d8-\u12ee\u12f0-\u130e\u1310\u1312-\u1315\u1318-\u131e\u1320-\u1346\u1348-\u135a\u13a0-\u13f4\u1401-\u166c\u166f-\u1676\u1681-\u169a\u16a0-\u16ea\u1780-\u17b3\u1820-\u1877\u1880-\u18a8\u1e00-\u1e9b\u1ea0-\u1ef9\u1f00-\u1f15\u1f18-\u1f1d\u1f20-\u1f45\u1f48-\u1f4d\u1f50-\u1f57\u1f59\u1f5b\u1f5d\u1f5f-\u1f7d\u1f80-\u1fb4\u1fb6-\u1fbc\u1fbe\u1fc2-\u1fc4\u1fc6-\u1fcc\u1fd0-\u1fd3\u1fd6-\u1fdb\u1fe0-\u1fec\u1ff2-\u1ff4\u1ff6-\u1ffc\u207f\u2102\u2107\u210a-\u2113\u2115\u2119-\u211d\u2124\u2126\u2128\u212a-\u212d\u212f-\u2131\u2133-\u2139\u3005\u3006\u3031-\u3035\u3041-\u3094\u309d\u309e\u30a1-\u30fa\u30fc-\u30fe\u3105-\u312c\u3131-\u318e\u31a0-\u31b7\u3400-\u4db5\u4e00-\u9fa5\ua000-\ua48c\uac00-\ud7a3\uf900-\ufa2d\ufb00-\ufb06\ufb13-\ufb17\ufb1d\ufb1f-\ufb28\ufb2a-\ufb36\ufb38-\ufb3c\ufb3e\ufb40\ufb41\ufb43\ufb44\ufb46-\ufbb1\ufbd3-\ufd3d\ufd50-\ufd8f\ufd92-\ufdc7\ufdf0-\ufdfb\ufe70-\ufe72\ufe74\ufe76-\ufefc\uff21-\uff3a\uff41-\uff5a\uff66-\uffbe\uffc2-\uffc7\uffca-\uffcf\uffd2-\uffd7\uffda-\uffdc]"))},isLetterOrDigit:function(a){return this.isLetter(a)||this.isDigit(a)},isSymbol:function(b){var a=new RegExp("[$+<->^`|~\u00a2-\u00a9\u00ac\u00ae-\u00b1\u00b4\u00b6\u00b8\u00d7\u00f7\u02b9\u02ba\u02c2-\u02cf\u02d2-\u02df\u02e5-\u02ed\u0374\u0375\u0384\u0385\u0482\u06e9\u06fd\u06fe\u09f2\u09f3\u09fa\u0b70\u0e3f\u0f01-\u0f03\u0f13-\u0f17\u0f1a-\u0f1f\u0f34\u0f36\u0f38\u0fbe-\u0fc5\u0fc7-\u0fcc\u0fcf\u17db\u1fbd\u1fbf-\u1fc1\u1fcd-\u1fcf\u1fdd-\u1fdf\u1fed-\u1fef\u1ffd\u1ffe\u2044\u207a-\u207c\u208a-\u208c\u20a0-\u20af\u2100\u2101\u2103-\u2106\u2108\u2109\u2114\u2116-\u2118\u211e-\u2123\u2125\u2127\u2129\u212e\u2132\u213a\u2190-\u21f3\u2200-\u22f1\u2300-\u2328\u232b-\u237b\u237d-\u239a\u2400-\u2426\u2440-\u244a\u249c-\u24e9\u2500-\u2595\u25a0-\u25f7\u2600-\u2613\u2619-\u2671\u2701-\u2704\u2706-\u2709\u270c-\u2727\u2729-\u274b\u274d\u274f-\u2752\u2756\u2758-\u275e\u2761-\u2767\u2794\u2798-\u27af\u27b1-\u27be\u2800-\u28ff\u2e80-\u2e99\u2e9b-\u2ef3\u2f00-\u2fd5\u2ff0-\u2ffb\u3004\u3012\u3013\u3020\u3036\u3037\u303e\u303f\u309b\u309c\u3190\u3191\u3196-\u319f\u3200-\u321c\u322a-\u3243\u3260-\u327b\u327f\u328a-\u32b0\u32c0-\u32cb\u32d0-\u32fe\u3300-\u3376\u337b-\u33dd\u33e0-\u33fe\ua490-\ua4a1\ua4a4-\ua4b3\ua4b5-\ua4c0\ua4c2-\ua4c4\ua4c6\ufb29\ufe62\ufe64-\ufe66\ufe69\uff04\uff0b\uff1c-\uff1e\uff3e\uff40\uff5c\uff5e\uffe0-\uffe6\uffe8-\uffee\ufffc\ufffd]");return a.test(b+"")},isPunctuation:function(a){return this._UTFPunctuationsString.indexOf(a)>=0},isPrintableChar:function(a){return!this.isLetterOrDigit(a)&&!this.isPunctuation(a)&&!this.isSymbol(a)?a===" ":true},isAscii:function(a){return a>="!"&&a<="~"},isAsciiLetter:function(a){return a>="A"&&a<="Z"||a>="a"&&a<="z"},isUpper:function(a){return a.toUpperCase()===a},isLower:function(a){return a.toLowerCase()===a},isAlphanumeric:function(a){return!this.isLetter(a)?this.isDigit(a):true},isAciiAlphanumeric:function(a){return(a<"0"||a>"9")&&(a<"A"||a>"Z")?a>="a"?a<="z":false:true},setChar:function(a,c,b){return b>=a.length||b<0?a:""||a.substr(0,b)+c+a.substr(b+1)}});var d=["\n","\r",'"',"@","+","'","<",">","%","{","}"],e=["!ESC!NN!","!ESC!RR!","!ESC!01!","!ESC!02!","!ESC!03!","!ESC!04!","!ESC!05!","!ESC!06!","!ESC!07!","!ESC!08!","!ESC!09!"],f=["(\n)","(\r)",'(")',"(@)","(\\+)","(')","(\\<)","(\\>)","(%)","(\\{)","(\\})"];!a.wij&&a.extend({wij:{charValidator:new c,encodeString:function(b){for(var a=0;a<d.lemgth;a++){var c=/c__escapeArr3[i]/g;b=b.replace(c,e[a])}return b},decodeString:function(a){if(a==="")return;for(var b=0;b<e.length;b++){var c=/c__escapeArr2[i]/g;a=a.replace(c,d[b])}return a}}})})(jQuery);__wijReadOptionEvents=function(c,b){for(var a=0;a<c.length;a++)b.options[c[a]]!=null&&b.element.bind(c[a],b.options[c[a]]);for(a in b.options)if(a.indexOf(" ")!=-1)for(var e=a.split(" "),d=0;d<e.length;d++)e[d].length>0&&b.element.bind(e[d],b.options[a])};
+(function(a){"use strict";var g="@wijtp@",b="wijmo-wijtooltip",e=b+"-arrow-",c=parseFloat,i=window,d=document,j=Math,h=j.max,f={};a.widget("wijmo.wijtooltip",{options:{content:"",title:"",closeBehavior:"auto",mouseTrailing:false,triggers:"hover",position:{my:"left bottom",at:"right top",offset:null},showCallout:true,animation:{animated:"fade",duration:500,easing:null},showAnimation:{},hideAnimation:{},showDelay:150,hideDelay:150,calloutAnimation:{duration:1e3,disabled:false,easing:null},calloutFilled:true,modal:false,group:null,ajaxCallback:null,showing:null,shown:null,hiding:null,hidden:null},_setOption:function(c,f){var b=this,e="_set_"+c,d=b.options[c];a.Widget.prototype._setOption.apply(b,arguments);if(a.isPlainObject(f))b.options[c]=a.extend({},d,f);b[e]&&b[e](d)},_set_content:function(){var a=this;if(a._isAjaxCallback){a._callbacked=true;a.show();a._callbacked=false}else a._setText()},_create:function(){var c=this,i=c.options,e=c.element,h=e&&e.attr("id"),d="",f=i.group||g,b=a.wijmo.wijtooltip._getTooltip(f);if(b)b.count++;else{b=c._createTooltip();b.count=0;a.wijmo.wijtooltip._tooltips[f]=b}i.position.of=c.element;c._bindLiveEvents();c._tooltip=b;if(h!==""){d=b.attr("aria-describedby");d=d===undefined?"":d+" ";b.attr("aria-describedby",d+h)}},destroy:function(){var b=this,c=b.element,d=b.options.group||g;c.unbind(".tooltip");c.attr("title",b._content);a.wijmo.wijtooltip._removeTooltip(d);a.Widget.prototype.destroy.apply(b)},widget:function(){return this._tooltip},show:function(){var b=this,c=b._tooltip,d=b.options;if(!c)return;if(c._hideAnimationTimer){clearTimeout(c._hideAnimationTimer);c._hideAnimationTimer=null}c.stop(true,true);if(d.ajaxCallback&&a.isFunction(d.ajaxCallback)&&!b._callbacked){b._isAjaxCallback=true;d.ajaxCallback.call(b.element);return}c._showAnimationTimer=setTimeout(function(){b._setText();f=c.offset();if(d.mouseTrailing){b._setCalloutCss();return}b._setPosition();b._showTooltip()},b.options.showDelay)},showAt:function(a){var e=this,b=e._tooltip,n=b&&b._callout,m={},k=0,l=0,o={},g,h,c,d,j,i;if(!b||!n)return;b.stop(true,true);b._showAnimataionTimer=setTimeout(function(){e._setText();f=b.offset();b.offset({left:0,top:0}).show();m=n.position();k=m.left;l=m.top;h=e._getBorder(n);c=h.left||h.right;d=h.top||h.bottom;j=b.width();i=b.height();g=e._getCalloutShape();o=({rt:{left:a.x-j-c,top:a.y-l},rc:{left:a.x-j-c,top:a.y-i/2},rb:{left:a.x-j-c,top:a.y-l-d},lt:{left:a.x+c,top:a.y-l},lc:{left:a.x+c,top:a.y-i/2},lb:{left:a.x+c,top:a.y-l-d},tl:{left:a.x-k,top:a.y+d},tc:{left:a.x-j/2,top:a.y+d},tr:{left:a.x-k-c,top:a.y+d},bl:{left:a.x-k,top:a.y-i-d},bc:{left:a.x-j/2,top:a.y-i-d},br:{left:a.x-k-c,top:a.y-i-d}})[g];g=e._flipTooltip(o,g,h);e._setUnfilledCallout(g);b.offset(o).hide();e._calloutShape=g;e._showTooltip()},e.options.showDelay)},hide:function(){var b=this,c=b._tooltip;if(!c)return;clearTimeout(c._showAnimationTimer);c._hideAnimationTimer=setTimeout(a.proxy(b._hideTooltip,b),b.options.hideDelay)},_createTooltip:function(){var j=this,d="ui-corner-all",f="ui-widget-content",k="ui-state-default",l="ui-widget-header",c=a("<div class = '"+b+" ui-widget "+f+" "+d+"'></div>"),g=a("<div class='"+b+"-container'></div>"),h=a("<div class='"+f+" "+b+"-pointer '><div class='"+b+"-pointer-inner'></div></div>"),i=a("<div class = '"+b+"-title "+l+" "+d+"'></title>"),e=a("<a href='#' class = '"+b+"-close "+k+" "+d+"'></a>");e.append(a("<span class = 'ui-icon ui-icon-close'></span>")).bind("click",a.proxy(j._onClickCloseBtn,j));c.append(i).append(e).append(g).append(h).css("position","absolute").attr("role","tooltip").appendTo("body").hide();c._container=g;c._callout=h;c._closeBtn=e;c._title=i;return c},_bindLiveEvents:function(){var b=this,d=b.options,c=b.element;if(b._content===undefined){b._content=c.attr("title");c.attr("title","")}c.unbind(".tooltip");d.mouseTrailing&&c.bind("mousemove.tooltip",function(a){var e=d.position.offset||"",c=e.split(" ");if(c.length===2)b.showAt({x:a.pageX+parseInt(c[0]),y:a.pageY+parseInt(c[1])});else b.showAt({x:a.pageX,y:a.pageY})});switch(d.triggers){case"hover":c.bind("mouseover.tooltip",a.proxy(b.show,b)).bind("mouseout.tooltip",a.proxy(b._hideIfNeeded,b));break;case"click":c.bind("click.tooltip",a.proxy(b.show,b));break;case"focus":c.bind("focus.tooltip",a.proxy(b.show,b)).bind("blur.tooltip",a.proxy(b._hideIfNeeded,b));break;case"rightClick":c.bind("contextmenu.tooltip",function(a){b.show();a.preventDefault()})}},_hideIfNeeded:function(){var b=this,c=b.options,a=c.closeBehavior;if(a==="sticky"||c.modal||a==="none")return;b.hide()},_flipTooltip:function(d,i,e){var h=this,c=h._tooltip,j={width:c.width(),height:c.height()},b=h._flipCallout(d,j,i),a=b&&b.flip,g,f;if(!c||!b||!a.h&&!a.v)return b.calloutShape;g=c.width();f=c.height();if(a.h==="l")d.left-=g+e.right*2+1;else if(a.h==="r")d.left+=g+e.left*2+1;else if(a.v==="t")d.top-=f+e.bottom*2+1;else if(a.v==="b")d.top+=f+e.top*2+1;return b.calloutShape},_flipCallout:function(g,k,b){var h=this,l=h.options,j=h._tooltip,c={h:false,v:false},f=a(i),d=(l.position.collision||"flip").split(" ");if(d.length===1)d[1]=d[0];if(!j||d[0]!=="flip"&&d[1]!=="flip")return{flip:c};if(d[0]==="flip")if(g.left<0||g.left+k.width>f.width()+f.scrollLeft())c.h=true;if(d[0]==="flip")if(g.top<0||g.top+k.height>f.height()+f.scrollTop())c.v=true;if(c.h)if(b.indexOf("l")>-1){b=b.replace(/l/,"r");c.h="l"}else if(b.indexOf("r")>-1){b=b.replace(/r/,"l");c.h="r"}if(c.v)if(b.indexOf("t")>-1){b=b.replace(/t/,"b");c.v="t"}else if(b.indexOf("b")>-1){b=b.replace(/b/,"t");c.v="b"}if(c.h||c.v){h._removeCalloutCss();j.addClass(e+b)}return{flip:c,calloutShape:b}},_set_position:function(b){var a=this,d=a.options,c=d.position;if(d.showCallout){(b.my!==c.my||b.at!==c.at)&&a._setPosition();a._setCalloutOffset(true)}},_set_showCallOut:function(d){var c=this,b=c._tooltip,a=b&&b._callout;if(!b||!a)return;if(d){c._setCalloutCss();a.show()}else a.hide()},_set_closeBehavior:function(){var c=this,b=c._tooltip,a=b&&b._closeBtn;a&&a[c.options.closeBehavior==="sticky"?"show":"hide"]()},_set_triggers:function(){this._bindLiveEvents()},_set_mouseTrailing:function(){this._bindLiveEvents()},_getCalloutShape:function(){var g=this,e=g.options.position,f=function(b){return a.map(b,function(a){return a.substr(0,1)})},c=f(e.my.split(" ")),d=f(e.at.split(" ")),b=[];if(c.length===2)b=c;if(c[0]===d[0])(c[1]==="t"&&d[1]==="b"||c[1]==="b"&&d[1]==="t")&&b.reverse();else d[0]==="c"&&b.reverse();b[0]==="c"&&b.reverse();return b.join("")},_setCalloutCss:function(){var a=this,f=a.options,d=a._tooltip,c="",b="";if(!f.showCallout)return;a._removeCalloutCss();b=a._getCalloutShape();c=e+b;d&&d.addClass(c);return b},_removeCalloutCss:function(){var b=this._tooltip;b&&a.each(["tl","tc","tr","bl","bc","br","rt","rc","rb","lt","lc","lb"],function(d,c){var a=e+c;if(b.hasClass(a)){b.removeClass(a);return false}})},_getBorder:function(d){var b={};a.each(["top","right","left","bottom"],function(e,a){b[a]=c(d.css("border-"+a+"-width"))});return b},_setPosition:function(){var e=this,m=e.options,d=m.position,a=e._tooltip,p=a.is(":hidden"),f=e._setCalloutCss(),n=f?f.split(""):null,b=[0,0],h="",g=a._callout,i,l,r,q,j,s={width:a.width(),height:a.height()},o,k;p&&a.show();a.css({left:0,top:0});if(m.showCallout){i=e._getBorder(g);r=c(g.css("left"));l=c(g.css("top"));q=c(g.css("right"));j=c(g.css("bottom"));switch(n[0]){case"l":b[0]=i.right;break;case"r":b[0]=-i.left;break;case"b":b[1]=j;break;case"t":b[1]=-l}switch(n[1]){case"t":b[1]=-l;break;case"b":b[1]=j;break;case"r":b[0]=q;break;case"l":b[0]=-r}h=b.join(" ")}a.position({my:d.my,at:d.at,of:d.of,offset:h,collision:"none none"});o=e._flipCallout(a.offset(),s,f);k=o.flip;if(k.h||k.v){a.css({left:0,top:0});a.position({my:d.my,at:d.at,of:d.of,offset:h,collision:d.collision})}m.showCallout&&e._setUnfilledCallout(f);e._calloutShape=f;p&&a.hide()},_setCalloutOffset:function(h){var g=this,k=g.options,j=g._tooltip,e=j&&j._callout,l=g._calloutShape,d=false,f=k.position.offset,c="",b=[],i=k.calloutAnimation;if(!e)return;if(!f||f.length===0)return;e.stop(true,true);a.each(["tr","tc","tl","bl","bc","br"],function(b,a){if(l===a){d=true;return false}});if(f){b=f.split(" ");if(b.length===2)c=d?b[0]:b[1];else if(b.length===1)c=b[0]}if(c!=="")if(h&&!h.disabled)e.animate(d?{left:c}:{top:c},i.duration,i.easing);else e.css(d?"left":"top",c)},_setUnfilledCallout:function(g){var e=this,c=e._tooltip,d=c&&c._callout,a=d&&d.children(),f=g.split(""),b=c&&c.css("background-color");if(!a)return;a.css({"border-left-color":"","border-top-color":"","border-bottom-color":"","border-right-color":""});if(e.options.calloutFilled)switch(f[0]){case"l":a.css("border-right-color",b);break;case"t":a.css("border-bottom-color",b);break;case"r":a.css("border-left-color",b);break;case"b":a.css("border-top-color",b)}},_showTooltip:function(){var c=this,d=c.options,b=c._tooltip,e,g,j,h=b&&b._closeBtn,i=b&&b._callout;if(!b)return;if(c._trigger("showing",null,c)===false)return;h&&h[d.closeBehavior==="sticky"?"show":"hide"]();i&&i[d.showCallout?"show":"hide"]();c._showModalLayer();b.css("z-index",99999);if(!d.mouseTrailing&&a.fn.wijshow){g={show:true,context:b};e=a.extend({},d.animation,d.showAnimation);if(b.is(":visible")){j=b.offset();b.offset(f);a.extend(g,{pos:j});e.animated="tooltipSlide"}b.wijshow(e,a.wijmo.wijtooltip.animations,g,null,function(){c._trigger("shown")})}else{b.show();c._trigger("shown")}c._setCalloutOffset(false)},_hideTooltip:function(){var b=this,d=b.options,c=b._tooltip,f=a.extend({},d.animation,d.hideAnimation),e;if(!c)return;if(b._trigger("hiding",null,b)===false)return;b._hideModalLayer();if(!d.mouseTrailing&&a.fn.wijhide){e={show:true,context:c};c.wijhide(f,a.wijmo.wijtooltip.animations,e,null,function(){b._trigger("hidden");c.css("z-index","")})}else{c.hide();b._trigger("hidden");c.css("z-index","")}},_getContent:function(b){var c={data:""},d;if(a.isFunction(b)){d=b.call(this.element,c);return c.data!==""?c.data:d}return b},_setText:function(){var b=this,f=b.options,c=b._tooltip,a="",d="",e=c&&c._title;if(!c)return;a=b._getContent(f.content);a=a===""?b._content:a;c._container.html(a);d=b._getContent(f.title);if(d!=="")e.html(d).show();else e.hide()},_showModalLayer:function(){var b=this,c=null;if(b.options.modal){c=a("<div>").addClass("ui-widget-overlay").css("z-index",99e3).width(b._getDocSize("Width")).height(b._getDocSize("Height")).appendTo("body");b._tooltip._modalLayer=c}},_hideModalLayer:function(){var b=this,a=b._tooltip._modalLayer;a&&a.css("z-index","").remove()},_getDocSize:function(b){var c,e,g="documentElement",f="body";if(a.browser.msie&&a.browser.version<9){c=h(d[g]["scroll"+b],d[f]["scroll"+b]);e=h(d[g]["offset"+b],d[f]["offset"+b]);return c<e?a(i)[b.toLowerCase()]()+"px":c+"px"}else return a(d)[b.toLowerCase()]()+"px"},_onClickCloseBtn:function(a){this.hide();a.preventDefault()}});a.extend(a.wijmo.wijtooltip,{animations:{fade:function(b,c){b=a.extend({duration:300,easing:"swing"},b,c);b.context.stop(true,true).animate(b.show?{opacity:"show"}:{opacity:"hide"},b)},tooltipSlide:function(b,c){b=a.extend({duration:300,easing:"swing"},b,c);b.context.stop(true,true).animate({left:b.pos.left,top:b.pos.top},b)}},_tooltips:{},_getTooltip:function(b){return a.wijmo.wijtooltip._tooltips[b]},_removeTooltip:function(c){var b=a.wijmo.wijtooltip._tooltips[c];if(b){b.count--;b.count<=0&&b.remove();a.wijmo.wijtooltip._tooltips[c]=null}}})})(jQuery);
+(function(a){"use strict";a.widget("wijmo.wijslider",a.ui.slider,{options:{buttonMouseOver:null,buttonMouseOut:null,buttonMouseDown:null,buttonMouseUp:null,buttonClick:null,dragFill:true,minRange:0},_setOption:function(d,c){var b=this;a.Widget.prototype._setOption.apply(b,arguments);this.options[d]=c;d==="disabled"&&b._handleDisabledOption(c,b.element.parent());return this},_create:function(){var c=this,b=c.element,d=c.options,s,u,i,k,n,f,e,j,g,h,m,l,p,o,t,r,q,x,y,v,w;if(b.is(":input")){if(d.orientation==="horizontal")s=a("<div></div>").width(b.width()).appendTo(document.body);else s=a("<div></div>").height(b.height()).appendTo(document.body);u=b.val();if(u!=="")try{i=u.split(";");n=i.length;if(n>0){for(k=0;k<n;k++)i[k]=parseInt(i[k],10);if(n===1)d.value=i[0];else d.values=i}}catch(z){}b.data(c.widgetName,s.wijslider(d)).after(a(document.body).children("div:last")).hide();d.disabled&&c.disable();return}a.ui.slider.prototype._create.apply(c,arguments);b.data("originalStyle",b.attr("style"));b.data("originalContent",b.html());f=b.width();e=b.height();j=a("<div></div>");if(d.orientation==="horizontal")j.addClass("wijmo-wijslider-horizontal");else j.addClass("wijmo-wijslider-vertical");j.width(f).height(e);g=a('<a class="wijmo-wijslider-decbutton"><span></span></a>');h=a('<a class="wijmo-wijslider-incbutton"><span></span></a>');b.wrap(j).before(g).after(h);c._attachClass();m=g.outerWidth();l=g.outerHeight();p=h.outerWidth();o=h.outerHeight();t=b.find(".ui-slider-handle");r=t.outerWidth();q=t.outerHeight();if(d.orientation==="horizontal"){x=e/2-l/2;g.css("top",x).css("left",0);y=e/2-o/2;h.css("top",y).css("right",0);b.css("left",m+r/2-1).css("top",e/2-b.outerHeight()/2).width(f-m-p-r-2)}else{v=f/2-m/2;g.css("left",v).css("top",0);w=f/2-p/2;h.css("left",w).css("bottom",0);b.css("left",f/2-b.outerWidth()/2).css("top",l+q/2+1).height(e-l-o-q-2)}d.disabled&&c.disable();c._bindEvents()},_handleDisabledOption:function(b,c){var a=this;if(b){if(!a.disabledDiv)a.disabledDiv=a._createDisabledDiv(c);a.disabledDiv.appendTo("body")}else if(a.disabledDiv){a.disabledDiv.remove();a.disabledDiv=null}},_createDisabledDiv:function(d){var g=this,b=d?d:g.element,c=b.offset(),f=b.outerWidth(),e=b.outerHeight();return a("<div></div>").addClass("ui-disabled").css({"z-index":"99999",position:"absolute",width:f,height:e,left:c.left,top:c.top})},destroy:function(){var b=this,c,d;c=this._getDecreBtn();d=this._getIncreBtn();c.unbind("."+b.widgetName);d.unbind("."+b.widgetName);a.ui.slider.prototype.destroy.apply(this,arguments);this.element.parent().removeAttr("class");this.element.parent().html("");if(b.disabledDiv){b.disabledDiv.remove();b.disabledDiv=null}},_slide:function(i,f,e){var g=this,h=g.options,c=h.minRange,d=e,b;if(h.range){b=g.values();if(f===0&&b[1]-c<e)d=b[1]-c;else if(f===1&&b[0]+c>e)d=b[0]+c}a.ui.slider.prototype._slide.call(g,i,f,d)},_getDecreBtn:function(){return this.element.parent().find(".wijmo-wijslider-decbutton")},_getIncreBtn:function(){return this.element.parent().find(".wijmo-wijslider-incbutton")},_attachClass:function(){this._getDecreBtn().addClass("ui-corner-all ui-state-default").attr("role","button");this._getIncreBtn().addClass("ui-corner-all ui-state-default").attr("role","button");this.element.parent().attr("role","slider").attr("aria-valuemin",this.options.min).attr("aria-valuenow","0").attr("aria-valuemax",this.options.max);if(this.options.orientation==="horizontal"){this.element.parent().addClass("wijmo-wijslider-horizontal");this._getDecreBtn().find("> span").addClass("ui-icon ui-icon-triangle-1-w");this._getIncreBtn().find("> span").addClass("ui-icon ui-icon-triangle-1-e")}else{this.element.parent().addClass("wijmo-wijslider-vertical");this._getDecreBtn().find("> span").addClass("ui-icon ui-icon-triangle-1-n");this._getIncreBtn().find("> span").addClass("ui-icon ui-icon-triangle-1-s")}},_bindEvents:function(){var a=this,b,c;b=this._getDecreBtn();c=this._getIncreBtn();b.bind("click."+a.widgetName,a,a._decreBtnClick);c.bind("click."+a.widgetName,a,a._increBtnClick);b.bind("mouseover."+a.widgetName,a,a._decreBtnMouseOver);b.bind("mouseout."+a.widgetName,a,a._decreBtnMouseOut);b.bind("mousedown."+a.widgetName,a,a._decreBtnMouseDown);b.bind("mouseup."+a.widgetName,a,a._decreBtnMouseUp);c.bind("mouseover."+a.widgetName,a,a._increBtnMouseOver);c.bind("mouseout."+a.widgetName,a,a._increBtnMouseOut);c.bind("mousedown."+a.widgetName,a,a._increBtnMouseDown);c.bind("mouseup."+a.widgetName,a,a._increBtnMouseUp)},_decreBtnMouseOver:function(d){var c=d.data,b,a;b={buttonType:"decreButton"};c._trigger("buttonMouseOver",d,b);a=c._getDecreBtn();a.addClass("ui-state-hover")},_increBtnMouseOver:function(d){var c=d.data,b,a;b={buttonType:"increButton"};c._trigger("buttonMouseOver",d,b);a=c._getIncreBtn();a.addClass("ui-state-hover")},_decreBtnMouseOut:function(d){var c=d.data,b,a;b={buttonType:"decreButton"};c._trigger("buttonMouseOut",d,b);a=c._getDecreBtn();a.removeClass("ui-state-hover ui-state-active")},_increBtnMouseOut:function(d){var c=d.data,b,a;b={buttonType:"increButton"};c._trigger("buttonMouseOut",d,b);a=c._getIncreBtn();a.removeClass("ui-state-hover ui-state-active")},_decreBtnMouseDown:function(e){var b=e.data,d,c;d={buttonType:"decreButton"};b._trigger("buttonMouseDown",e,d);c=b._getDecreBtn();c.addClass("ui-state-active");a(document).bind("mouseup."+b.widgetName,{self:b,ele:c},b._documentMouseUp);if(b._intervalID!==null){window.clearInterval(b._intervalID);b._intervalID=null}b._intervalID=window.setInterval(function(){b._decreBtnHandle(b)},200)},_documentMouseUp:function(c){var b=c.data.self,d=c.data.ele;d.removeClass("ui-state-active");if(b._intervalID!==null){window.clearInterval(b._intervalID);b._intervalID=null}a(document).unbind("mouseup."+b.widgetName,b._documentMouseUp)},_intervalID:null,_increBtnMouseDown:function(e){var b=e.data,d,c;d={buttonType:"increButton"};b._trigger("buttonMouseDown",e,d);c=b._getIncreBtn();c.addClass("ui-state-active");a(document).bind("mouseup."+b.widgetName,{self:b,ele:c},b._documentMouseUp);if(b._intervalID!==null){window.clearInterval(b._intervalID);b._intervalID=null}b._intervalID=window.setInterval(function(){b._increBtnHandle(b)},200)},_decreBtnMouseUp:function(d){var a=d.data,c,b;c={buttonType:"decreButton"};a._trigger("buttonMouseUp",d,c);b=a._getDecreBtn();b.removeClass("ui-state-active");window.clearInterval(a._intervalID)},_increBtnMouseUp:function(d){var a=d.data,c,b;c={buttonType:"increButton"};a._trigger("buttonMouseUp",d,c);b=a._getIncreBtn();b.removeClass("ui-state-active");window.clearInterval(a._intervalID)},_decreBtnHandle:function(a){if(a.options.orientation==="horizontal")a._decre();else a._incre()},_decreBtnClick:function(c){var a=c.data,b;a._decreBtnHandle(a);b={buttonType:"decreButton",value:a.value()};a._trigger("buttonClick",c,b)},_increBtnHandle:function(a){if(a.options.orientation==="horizontal")a._incre();else a._decre()},_increBtnClick:function(c){var a=c.data,b;a._increBtnHandle(a);b={buttonType:"increButton",value:a.value()};a._trigger("buttonClick",c,b)},_decre:function(){var a=this.value();if(!this.options.range&&!this.options.values){a=this.value();if(a<=this.options.min)this.value(this.options.min);else this.value(a-this.options.step)}else{a=this.values(0);if(a<=this.options.min)this.values(0,this.options.min);else this.values(0,a-this.options.step)}this.element.parent().attr("aria-valuenow",this.value())},_incre:function(){var a=this.value();if(!this.options.range&&!this.options.values){a=this.value();if(a>=this.options.max)this.value(this.options.max);else this.value(a+this.options.step)}else{a=this.values(1);if(a>=this.options.max)this.values(1,this.options.max);else this.values(1,a+this.options.step)}this.element.parent().attr("aria-valuenow",this.value())},_mouseInit:function(){var b=this;if(this.options.dragFill){this._preventClickEvent=false;this.element.bind("click",function(){if(b._dragFillStart>0)b._dragFillStart=0;else a.ui.slider.prototype._mouseCapture.apply(b,arguments)})}a.ui.mouse.prototype._mouseInit.apply(this,arguments)},_mouseCapture:function(b){this.element.parent().attr("aria-valuenow",this.value());if(this.options.dragFill)if(b.target.className==="ui-slider-range ui-widget-header"){this.elementSize={width:this.element.outerWidth(),height:this.element.outerHeight()};this.elementOffset=this.element.offset();return true}else return a.ui.slider.prototype._mouseCapture.apply(this,arguments);else return a.ui.slider.prototype._mouseCapture.apply(this,arguments)},_dragFillTarget:false,_dragFillStart:0,_rangeValue:0,_oldValue1:0,_oldValue2:0,_oldX:0,_oldY:0,_mouseStart:function(a){if(this.options.dragFill){if(a.target)if(a.target.className==="ui-slider-range ui-widget-header"){this._dragFillTarget=true;this._rangeValue=this.values(1)-this.values(0);this._oldValue1=this.values(0);this._oldValue2=this.values(1);this._oldX=a.pageX;this._oldY=a.pageY;return true}this._dragFillTarget=false}return true},_mouseDrag:function(f){var d,c,e,b,g,h;if(this.options.dragFill){d=f.pageX-this._oldX;c=this.element.outerWidth();if(this.options.orientation==="vertical"){c=this.element.outerHeight();d=-(f.pageY-this._oldY)}e=(this.options.max-this.options.min)/c*d;if(this._dragFillTarget){if(this.options.orientation==="vertical")a(document.documentElement).css("cursor","s-resize");else a(document.documentElement).css("cursor","w-resize");if(this._dragFillStart>0){b=this._rangeValue;this.values(0,this._oldValue1+e);this.values(1,this._oldValue1+e+b);g=this.values(0);h=this.values(1);g+b>this.options.max&&this.values(0,this.options.max-b);h-b<this.options.min&&this.values(1,this.options.min+b)}this._dragFillStart++;return false}else return a.ui.slider.prototype._mouseDrag.apply(this,arguments)}else return a.ui.slider.prototype._mouseDrag.apply(this,arguments)},_mouseStop:function(){var b=a.ui.slider.prototype._mouseStop.apply(this,arguments);if(this.options.dragFill){a(document.documentElement).css("cursor","default");window.setTimeout(function(){this._dragFillTarget=false;this._dragFillStart=0},500)}return b}})})(jQuery);
+(function(a){"use strict";var f="wijmo-wijsplitter-",w=f+"wrapper",q=f+"horizontal",r=f+"vertical",b=f+"h-",c=f+"v-",o="-content",l="panel1",m="panel2",h=l+o,u=m+o,y="bar",v="expander",t="ui-widget-header",i="ui-widget-content",s="ui-state-default",e="ui-state-hover",n="ui-state-active",d="ui-corner-",x="ui-icon",g="ui-icon-triangle-1-",j="collapsed",k="expanded",p="resize-helper";a.widget("wijmo.wijsplitter",{options:{sizing:null,sized:null,expand:null,collapse:null,expanded:null,collapsed:null,barZIndex:-1,showExpander:true,splitterDistance:100,orientation:"vertical",fullSplit:false,resizeSettings:{animationOptions:{duration:100,easing:"swing",disabled:false},ghost:false},panel1:{minSize:1,collapsed:false,scrollBars:"auto"},panel2:{minSize:1,collapsed:false,scrollBars:"auto"}},_setOption:function(c,d){var b=this,e=b.options,f=a.extend({},e[c]);if(c==="fullSplit")b._setFullSplit(d);else if(a.isPlainObject(e[c])){if(c==="panel1"&&d.collapsed!==undefined)b._setPanel1Collapsed(d.collapsed);else c==="panel2"&&d.collapsed!==undefined&&b._setPanel2Collapsed(d.collapsed);e[c]=a.extend(true,e[c],d);return}a.Widget.prototype._setOption.apply(b,arguments);if(f!==d)if(c==="orientation")b.refresh();else if(c==="fullSplit")b.refresh(true,false);else if(c==="splitterDistance"){b.refresh(false,false);b._trigger("sized")}c==="disabled"&&b._handleDisabledOption(d,b.element)},_create:function(){var a=this,b=a.element,c=a.options;a._fields={width:b.width(),height:b.height()};b.data("fields",a._fields);c.fullSplit&&a._setFullSplit(true);a._splitterify();a._updateElementsCss();a._updateElements();a._bindEvents();a._initResizer();c.disabled&&a.disable();a._trigger("load",null,a)},_handleDisabledOption:function(b,c){var a=this;if(b){if(!a.disabledDiv)a.disabledDiv=a._createDisabledDiv(c);a.disabledDiv.appendTo("body")}else if(a.disabledDiv){a.disabledDiv.remove();a.disabledDiv=null}},_createDisabledDiv:function(d){var g=this,b=d?d:g.element,c=b.offset(),f=b.outerWidth(),e=b.outerHeight();return a("<div></div>").addClass("ui-disabled").css({"z-index":"99999",position:"absolute",width:f,height:e,left:c.left,top:c.top})},destroy:function(){var b=this,e=b.element,c=b._fields,i=c.expander,j=c.bar,f=c.panel1,h=c.originalContent,g=c.originalStyle,d=b.widgetName;f&&f.is(":ui-resizable")&&f.resizable("destroy");f.unbind("."+d);i.unbind("."+d);j.unbind("."+d);a(window).unbind("."+d);e.html(h);e.removeAttr("class");if(g===undefined)e.removeAttr("style");else e.attr("style",g);if(b.disabledDiv){b.disabledDiv.remove();b.disabledDiv=null}},refresh:function(e,d){var a=this,c=a._fields,b=c.panel1;if(c._isResizing)return;(d||d===undefined)&&a._updateElementsCss();a._updateElements();if(e||e===undefined){b&&b.is(":ui-resizable")&&b.resizable("destroy");a._initResizer()}},_splitterify:function(){var k=this,e=k.element,m=k.options,b=k._fields,f,i,j,c,d,g,h,l;c=e.find(">div:eq(0)");d=e.find(">div:eq(1)");b.originalStyle=e.attr("style");b.originalContent=e.html();f=a("<div></div>").appendTo(e);i=a("<div></div>").appendTo(f);if(c.length===0)c=a("<div></div>");c.appendTo(i);g=a("<div></div>").appendTo(f);m.barZIndex!==-1&&g.css("z-index",m.barZIndex);h=a("<div></div>").appendTo(g).attr("role","button");l=a("<span></span>").appendTo(h);j=a("<div></div>").appendTo(f);if(d.length===0)d=a("<div></div>");d.appendTo(j);b.wrapper=f;b.panel1=i;b.pnl1Content=c;b.panel2=j;b.pnl2Content=d;b.bar=g;b.expander=h;b.icon=l},_updateElementsCss:function(){var f=this,o=f.element,D=f.options,a=D.orientation==="vertical",e=f._fields,p=e.wrapper,A=e.panel1,B=e.panel2,j=e.pnl1Content,k=e.pnl2Content,C=e.bar,n=e.expander,z=e.icon;o.removeClass(r+" "+q).addClass(a?r:q);p.attr("class",w);A.removeClass(c+l+" "+b+l).addClass((a?c:b)+l);j.removeClass(c+h+" "+b+h+" "+i).addClass((a?c:b)+h+" "+i);C.attr("class",(a?c:b)+y+" "+t).css("width","").css("height","");n.attr("class",d+(a?"bl "+c:"tr "+b)+v+" "+s).css("left","").css("top","");z.attr("class",x+" "+g+(a?"w":"n"));B.removeClass(c+m+" "+b+m).addClass((a?c:b)+m);k.removeClass(c+h+" "+b+h+" "+i).addClass((a?c:b)+u+" "+i);f._updateExpanderCss()},_updateExpanderCss:function(){var i=this,s=i.options,t=i.element,r=i._fields,f=r.expander,h=r.icon,a=s.orientation==="vertical",e=a?c:b,l=a?"tr":"bl",m="br",p=a?"e":"s",n=a?"bl":"tr",o="tl",q=a?"w":"n";f.removeClass(e+k+" "+e+j+" "+d+l+" "+d+m+" "+d+n+" "+d+o);h.removeClass(g+p+" "+g+q);if(s.panel1.collapsed){f.addClass(d+l+" "+d+m+" "+e+j);h.addClass(g+p)}else{f.addClass(d+n+" "+d+o+" "+e+k);h.addClass(g+q)}},_updateElements:function(){var n=this,r=n.element,f=n.options,a=f.splitterDistance,h=n._fields,s=h.wrapper,l=h.panel1,p=h.pnl1Content,t=h.panel2,q=h.pnl2Content,o=h.bar,e=h.expander,g=r.width(),d=r.height(),m,i;s.height(d);n._setPanelsScrollMode();if(f.orientation==="vertical"){m=o.outerWidth(true);if(a>g-m)a=g-m;s.width(g*2);if(f.panel2.collapsed&&!f.panel1.collapsed)a=g-m;if(f.panel1.collapsed){e.addClass(c+j);l.css("display","none");a=0}else{e.addClass(c+k);l.css("display","")}l.height(d).width(a);p.outerHeight(d,true);o.outerHeight(d,true);t.height(d).width(g-a-m);q.outerHeight(d,true);e.css("cursor","pointer").css("top",d/2-e.outerHeight(true)/2)}else{i=o.outerHeight(true);if(a>d-i)a=d-i;if(f.panel2.collapsed&&!f.panel1.collapsed)a=d-i;p.outerHeight(a,true);if(f.panel1.collapsed){e.addClass(b+j);l.css("display","none");a=0}else{e.addClass(b+k);l.css("display","")}q.outerHeight(d-a-i,true);l.width(g).height(a);t.width(g).height(d-a-i);e.css("cursor","pointer").css("left",g/2-e.outerWidth(true)/2)}e.css("display",f.showExpander?"":"none")},_setFullSplit:function(b){var c=this,a=c._fields,e=b?"100%":a.width,d=b?"100%":a.height;c.element.css("width",e).css("height",d)},_setPanel1Collapsed:function(c,f){var b=this,d=b.options,e=d.panel1.collapsed;if(e===c)return;if(!b._trigger(e?"expand":"collapse",f,null))return;d.panel1.collapsed=c;if(c)d.panel2.collapsed=false;else a(".ui-resizable-handle",b.element).show();b._updateElements();b._updateExpanderCss();b._trigger(c?"collapsed":"expanded",f,null)},_setPanel2Collapsed:function(b){var c=this,d=c.options,f=d.panel2.collapsed,e=a(".ui-resizable-handle",c.element);if(f===b)return;d.panel2.collapsed=b;if(b){d.panel1.collapsed=false;e.hide()}else e.show();c._updateElements()},_bindEvents:function(){var c=this,b=c.options,h=c._fields,g=h.bar,f=h.expander,i=h.panel1,d=c.widgetName;f.bind("mouseover."+d,function(){if(b.disabled)return;f.addClass(e)}).bind("mouseout."+d,function(){if(b.disabled)return;f.removeClass(e).removeClass(n)}).bind("mousedown."+d,function(){if(b.disabled)return;f.addClass(n)}).bind("mouseup."+d,function(a){if(b.disabled)return;f.removeClass(n);if(b.panel2.collapsed){c._setPanel2Collapsed(!b.panel2.collapsed);return}c._setPanel1Collapsed(!b.panel1.collapsed,a)});g.bind("mouseover."+d,function(){if(b.disabled)return;g.addClass(e)}).bind("mouseout."+d,function(){if(b.disabled)return;g.removeClass(e)});i.bind("animating."+d,function(a){if(b.disabled)return;c._adjustLayout(c);c._trigger("sizing",a,null)}).bind("animated."+d,function(a){if(b.disabled)return;c._adjustLayout(c);c._trigger("sized",a,null)});a(".ui-resizable-handle",c.element).live("mouseover."+d,function(){if(b.disabled)return;g.addClass(e)}).live("mouseout."+d,function(){if(b.disabled)return;g.removeClass(e)});a(window).bind("resize."+d,function(){if(b.disabled)return;if(b.fullSplit){c._updateElements();c._initResizer()}})},_initResizer:function(){var l=this,h=l.element,d=l.options,e=l._fields,t=e.bar,n=e.panel1,k=d.resizeSettings,g=k.animationOptions,m=g.disabled?0:g.duration,v=h.width(),u=h.height(),q,s,j,o,r,i,f;if(d.orientation==="vertical"){q=t.outerWidth(true);s=v-q-d.panel2.minSize;j=d.panel1.minSize;if(j<2)j=2;n.resizable({wijanimate:true,minWidth:j,maxWidth:s,handles:"e",helper:c+p,animateDuration:m,animateEasing:g.easing,ghost:k.ghost,start:function(){e._isResizing=true},stop:function(){e._isResizing=false}})}else{o=t.outerHeight(true);r=u-o-d.panel2.minSize;i=d.panel1.minSize;if(i<2)i=2;n.resizable({wijanimate:true,minHeight:i,maxHeight:r,handles:"s",helper:b+p,animateDuration:m,animateEasing:g.easing,ghost:k.ghost,start:function(){e._isResizing=true},stop:function(){e._isResizing=false}})}f=a(".ui-resizable-handle",h);if(d.panel2.collapsed)f.hide();else f.show();if(a.browser.msie&&a.browser.version<7)d.orientation==="vertical"&&f.height(h.height())},_adjustLayout:function(a){var b=a.options,e=a._fields,d=e.panel1,c=b.orientation==="vertical"?d.width():d.height();if(b.splitterDistance===c)return;b.splitterDistance=c;a._updateElements()},_setPanelsScrollMode:function(){var d=this,c=d._fields,e=d.options,b=[e.panel1.scrollBars,e.panel2.scrollBars];a.each([c.pnl1Content,c.pnl2Content],function(c,a){if(b[c]==="auto")a.css("overflow","auto");else if(b[c]==="both")a.css("overflow","scroll");else if(b[c]==="none")a.css("overflow","hidden");else if(b[c]==="horizontal")a.css("overflow-x","scroll").css("overflow-y","hidden");else b[c]==="vertical"&&a.css("overflow-x","hidden").css("overflow-y","scroll")})}})})(jQuery);(function(a){"use strict";a.ui.plugin.add("resizable","wijanimate",{stop:function(l){var b=a(this).data("resizable"),i=b.options,c=b.element,d=b._proportionallyResizeElements,h=d.length&&/textarea/i.test(d[0].nodeName),j=h&&a.ui.hasScroll(d[0],"left")?0:b.sizeDiff.height,k=h?0:b.sizeDiff.width,g,e,f;c.css("width",b.originalSize.width).css("height",b.originalSize.height);g={width:b.size.width-k,height:b.size.height-j};e=parseInt(c.css("left"),10)+(b.position.left-b.originalPosition.left)||null;f=parseInt(c.css("top"),10)+(b.position.top-b.originalPosition.top)||null;c.animate(a.extend(g,f&&e?{top:f,left:e}:{}),{duration:i.animateDuration,easing:i.animateEasing,step:function(){var e={width:parseInt(c.css("width"),10),height:parseInt(c.css("height"),10),top:parseInt(c.css("top"),10),left:parseInt(c.css("left"),10)};d&&d.length&&a(d[0]).css({width:e.width,height:e.height});b._updateCache(e);b._propagate("resize",l);c.trigger("animating")},complete:function(){c.trigger("animated")}})}})})(jQuery);
+(function(a){"use strict";var b="wijmo-wijprogressbar",j="ui-progressbar",i=j+"-label",c=b+"-lb-",d="ui-corner-",g=d+"left",f=d+"right",h=d+"top",e=d+"bottom";a.widget("wijmo.wijprogressbar",a.ui.progressbar,{options:{labelAlign:"center",maxValue:100,minValue:0,fillDirection:"east",labelFormatString:"{1}%",toolTipFormatString:"{1}%",indicatorIncrement:1,indicatorImage:"",animationDelay:0,animationOptions:{disabled:false,easing:null,duration:500},progressChanging:null,beforeProgressChanging:null,progressChanged:null},_setOption:function(c,d){var b=this,e=b.options,f;switch(c){case"value":e[c]=parseInt(d,10);b._refreshValue();return;case"maxValue":e.max=d;case"minValue":f=parseInt(d,10);e[c]=f;b[c==="maxValue"?"max":"min"]=f;b._refreshValue(true);return;case"labelFormatString":case"toolTipFormatString":e[c]=d;b._refreshValue(true);return;case"fillDirection":case"labelAlign":case"indicatorImage":e[c]=d;b._updateElementsCss();return}a.Widget.prototype._setOption.apply(b,arguments);c==="disabled"&&b._handleDisabledOption(d,b.element)},_create:function(){var c=this,d=c.options,e=c.element;c.directions={east:"left",west:"right",north:"bottom",south:"top"};c.min=d.minValue;c.max=d.maxValue;e.addClass(b);a.ui.progressbar.prototype._create.apply(c,arguments);c.label=a("<span>").addClass(i).appendTo(e);c._updateElementsCss();c._isInit=true;d.disabled&&c.disable();c._refreshValue()},_handleDisabledOption:function(b,c){var a=this;if(b){if(!a.disabledDiv)a.disabledDiv=a._createDisabledDiv(c);a.disabledDiv.appendTo("body")}else if(a.disabledDiv){a.disabledDiv.remove();a.disabledDiv=null}},_createDisabledDiv:function(d){var g=this,b=d?d:g.element,c=b.offset(),f=b.outerWidth(),e=b.outerHeight();return a("<div></div>").addClass("ui-disabled").css({"z-index":"99999",position:"absolute",width:f,height:e,left:c.left,top:c.top})},_triggerEvent:function(a,c,b){return this._trigger(a,null,{oldValue:c,newValue:b})===false},_refreshValue:function(i){var b=this,g=b.options,f=g.animationOptions,h=b.element,c,e,d;if(!b._isInit)return;d=h.attr("aria-valuenow");c=b.value();e=(c-b.min)/(b.max-b.min)*100;if(b._triggerEvent("beforeProgressChanging",d,c))return;if(!f.disabled&&f.duration>0)setTimeout(function(){a.wijmo.wijprogressbar.animations.progress({content:b.valueDiv,complete:function(){b._triggerEvent("progressChanged",d,c);b._lastStep=e},step:function(a){b._performAnimating(a,i)},progressValue:c*100},f)},g.animationDelay);else{b._refreshProgress(Math.round(e));b._lastStep=e;b._triggerEvent("progressChanged",d,c)}},_refreshProgress:function(d,c){var b=this,i=b.options,j=i.fillDirection,k=b.element;if(c===undefined)c=a.wijmo.wijprogressbar.mul(d,b.max-b.min)/100+b.min;if(b._triggerEvent("progressChanging",k.attr("aria-valuenow"),c))return;if(b._isHorizontal())b.valueDiv.toggleClass(j==="east"?f:g,c===b.max).width(d+"%");else b.valueDiv.toggleClass(j==="south"?e:h,c===b.max).height(d+"%");b.label.html(b._getFormatString(i.labelFormatString,d,c));k.attr("aria-valuenow",c).attr("title",b._getFormatString(i.toolTipFormatString,d,c))},_isHorizontal:function(){var a=this.options.fillDirection;return a==="west"||a==="east"},_getRotateTextOffset:function(a){var c,b;a.css("width","auto");c=a.outerWidth();b=a.outerHeight();a.css("width","");return Math.max(c-b-4,0)},_updateElementsCss:function(){var a=this,e=a.options,d=a.element,c=e.fillDirection;d.removeClass(b+"-west "+b+"-east "+b+"-north "+b+"-south").addClass(b+"-"+c);a._updateProgressCss();a._updateLabelCss()},_updateLabelCss:function(){var d=this,i=d.options,g=d.element,b=i.labelAlign,e=d.label,f=d._lastStep,h=g.height();e.removeClass(c+"west "+c+"east "+c+"south "+c+"north "+c+"center "+c+"running").addClass(c+b).css({left:"",right:"",top:"",bottom:"",width:"","text-align":"","line-height":""});b!=="north"&&b!=="south"&&!(b==="running"&&!d._isHorizontal())&&e.css("line-height",h+"px");if(b==="running")d._updateRunningLabelCss(f);else if(!d._isHorizontal()&&!a.browser.msie)if(b==="north")e.css("width","100%").css("text-align","right");else b==="south"&&e.css("width","100%").css("text-align","left")},_updateRunningLabelCss:function(l){var b=this,m=b.options,i=m.fillDirection,k=b.element,f=b.label,j=b.valueDiv,e=b._isHorizontal(),c,d,g,h;c=k[e?"width":"height"]();d=f[e?"outerWidth":"outerHeight"]();g=j[e?"outerWidth":"outerHeight"]();if(!e&&!a.browser.msie)d+=b._getRotateTextOffset(f);h=c===g?c-d:l*c/100-d+d*(c-g)/c;f.css(b.directions[i],h)},_updateProgressCss:function(){var b=this,j=b.options,k=j.fillDirection,i=j.indicatorImage,a=b.valueDiv,c=b._lastStep;i!==""&&a.css("background","transparent url("+i+") repeat fixed");a.removeClass(g+" "+f+" "+h+" "+e).addClass(d+b.directions[k]);if(c)if(b._isHorizontal())a.css("width",c+"%").css("height","");else a.css("height",c+"%").css("width","");else a.css({width:"",height:""})},_performAnimating:function(l,k){var c=this,j=c.options,d=j.indicatorIncrement,i=l/100,b=a.wijmo.wijprogressbar.div(i-c.min,c.max-c.min)*100,f=0,g,h,e=2;if(d){g=b.toString().split(".");if(g.length===2){f=g[1].length;e=f}h=Math.pow(10,f);if(d!==1)b=Math.floor(b*h/d)*d/h;else{b=Math.round(b);e=0}c.pointNumber=f;if(c._lastStep===b&&!k)return}c._refreshProgress(Number(b.toFixed(e)),Number(i.toFixed(e)));j.labelAlign==="running"&&c._updateRunningLabelCss(b)},_getFormatString:function(a,d,e){var c=this,g=c.max-e,f=100-d,b=/\{0\}/g;a=a.replace(b,e.toString());b=/\{ProgressValue\}/g;a=a.replace(b,e.toString());b=/\{1\}/g;a=a.replace(b,d.toString());b=/\{PercentProgress\}/g;a=a.replace(b,d.toString());b=/\{2\}/g;a=a.replace(b,g.toString());b=/\{RemainingProgress\}/g;a=a.replace(b,g.toString());b=/\{3\}/g;a=a.replace(b,f.toString());b=/\{PercentageRemaining\}/g;a=a.replace(b,f.toString());b=/\{4\}/g;a=a.replace(b,c.min);b=/\{Min\}/g;a=a.replace(b,c.min);b=/\{5\}/g;a=a.replace(b,c.max);b=/\{Max\}/g;a=a.replace(b,c.max);return a},destroy:function(){var c=this,d=c.element;d.empty().attr("aria-valuemax","").attr("aria-valuemin","").attr("aria-valuenow","").attr("title","").attr("role","").removeClass(b+" "+b+"-east "+b+"-west "+b+"-north "+b+"-south");if(c.disabledDiv){c.disabledDiv.remove();c.disabledDiv=null}a.Widget.prototype.destroy.apply(this,arguments)}});a.extend(a.wijmo.wijprogressbar,{animations:{progress:function(b,c){b=a.extend({easing:"swing",duration:1e3},b,c);b.content.stop(true,true).animate({pgvalue:b.progressValue},b)}},add:function(b,c){var d=0,e=0,a;try{d=b.toString().split(".")[1].length}catch(g){}try{e=c.toString().split(".")[1].length}catch(f){}a=Math.pow(10,Math.max(d,e));return(b*a+c*a)/a},mul:function(d,e){var a=0,b=d.toString(),c=e.toString();try{a+=b.split(".")[1].length}catch(g){}try{a+=c.split(".")[1].length}catch(f){}return Number(b.replace(".",""))*Number(c.replace(".",""))/Math.pow(10,a)},div:function(a,b){var e=0,f=0,c,d;try{e=a.toString().split(".")[1].length}catch(h){}try{f=b.toString().split(".")[1].length}catch(g){}c=Number(a.toString().replace(".",""));d=Number(b.toString().replace(".",""));return c/d*Math.pow(10,f-e)}})})(jQuery);
+(function(a){"use strict";var b="ui-state-hover",c="wijmo-wijdialog-defaultdockingzone";a.widget("wijmo.wijdialog",a.ui.dialog,{options:{captionButtons:{},collapsingAnimation:null,expandingAnimation:null,contentUrl:"",minimizeZoneElementId:"",buttonCreating:null,stateChanged:null,blur:null},_create:function(){var b=this,c=b.options;a.ui.dialog.prototype._create.apply(b,arguments);b.uiDialog.addClass("wijmo-wijdialog");b._initWijWindow();b._bindWindowResize();b._attachDraggableResizableEvent();b.originalPosition=b.options.position;b.isPin=false},_init:function(){var b=this,c=b.options;a.ui.dialog.prototype._init.apply(b,arguments);c.disabled&&b.disable()},_handleDisabledOption:function(b){var a=this;if(b){if(!a.disabledDiv)a.disabledDiv=a._createDisabledDiv();a.disabledDiv.appendTo("body")}else if(a.disabledDiv){a.disabledDiv.remove();a.disabledDiv=null}},_createDisabledDiv:function(){var f=this,b=f.uiDialog,c=b.offset(),e=b.outerWidth(),d=b.outerHeight();return a("<div></div>").addClass("ui-disabled").css({"z-index":"99999",position:"absolute",width:e,height:d,left:c.left,top:c.top})},destroy:function(){var b=this;if(b.disabledDiv){b.disabledDiv.remove();b.disabledDiv=null}a.Widget.prototype.destroy.apply(b,arguments)},_attachDraggableResizableEvent:function(){var a=this,b=a.uiDialog,c=a.options;c.draggable&&b.draggable&&b.bind("dragstop",function(){a._saveNormalState();a._destoryIframeMask()}).bind("dragstart",function(){a._createIframeMask()});c.resizable&&b.resizable&&b.bind("resizestop",function(){a._saveNormalState();a._destoryIframeMask()}).bind("resizestart",function(){a._createIframeMask()})},_createIframeMask:function(){var b=this;if(b.innerFrame)b.mask=a("<div style='width:100%;height:100%;position:absolute;top:0px;left:0px;z-index:"+(a.ui.dialog.maxZ+1)+"'></div>").appendTo(b.uiDialog)},_destoryIframeMask:function(){var a=this;if(a.innerFrame&&a.mask){a.mask.remove();a.mask=undefined}},_initWijWindow:function(){var b=this,c=true;b._createCaptionButtons();b._checkUrl();b.uiDialogButtonPane=a(".ui-dialog-buttonpane",b.uiDialog);b.uiDialog.bind("mousedown",function(c){var d=c.target;!a.contains(b.element[0],d)&&b.uiDialog.focus()}).bind("mouseenter",function(){c=true}).bind("mouseleave",function(){c=false}).bind("focusout",function(d){var f=d.target,e=a(this);!c&&b._trigger("blur",d,{el:b.element})})},_checkUrl:function(){var b=this,e=b.options,d=e.contentUrl,c=a('<iframe style="width:100%;height:99%;" frameborder="0"></iframe>');if(typeof d==="string"&&d.length>0){b.element.addClass("wijmo-wijdialog-hasframe");c.attr("src",d);b.element.append(c);b.innerFrame=c}b.contentWrapper=b.element},_setOption:function(c,d){var b=this;a.ui.dialog.prototype._setOption.apply(b,arguments);if(c!=="captionButtons")if(c==="disabled")b._handleDisabledOption(d,b.element);else if(c==="contentUrl")if(b.innerFrame)b.innerFrame.attr("src",d);else b._checkUrl()},_createCaptionButtons:function(){var c=[],b=this,h=b.options,d,g={pin:{visible:true,click:b.pin,iconClassOn:"ui-icon-pin-w",iconClassOff:"ui-icon-pin-s"},refresh:{visible:true,click:b.refresh,iconClassOn:"ui-icon-refresh"},toggle:{visible:true,click:b.toggle,iconClassOn:"ui-icon-carat-1-n",iconClassOff:"ui-icon-carat-1-s"},minimize:{visible:true,click:b.minimize,iconClassOn:"ui-icon-minus"},maximize:{visible:true,click:b.maximize,iconClassOn:"ui-icon-extlink"},close:{visible:true,click:b.close,iconClassOn:"ui-icon-close"}},e=h.captionButtons,f=b.uiDialogTitlebar;f.children(".ui-dialog-titlebar-close, .wijmo-wijdialog-captionbutton").remove();a.each(g,function(b,d){e&&e[b]&&a.extend(d,e[b]);c.push({button:b,info:d})});b._trigger("buttonCreating",null,c);for(d=0;d<c.length;d++)b._createCaptionButton(c[d],f)},_createCaptionButton:function(f,g,k){var j=this,d,h="wijmo-wijdialog-titlebar-"+f.button,i=g.children("."+h),c=f.info,e=a("<span></span>");if(c.visible){if(i.size()===0){e.addClass("ui-icon "+c.iconClassOn).text(f.button);d=a('<a href="#"></a>').append(e).addClass(h+" ui-corner-all wijmo-wijdialog-captionbutton").attr("role","button").hover(function(){d.addClass(b)},function(){d.removeClass(b)}).click(function(){if(e.hasClass(c.iconClassOff))e.removeClass(c.iconClassOff);else e.addClass(c.iconClassOff);a.isFunction(c.click)&&c.click.apply(j,arguments);return false});if(k)return d;else d.appendTo(g)}j[f.button+"Button"]=d}else i.remove()},pin:function(){var b=this.uiDialog,a=this.isPin;this._enableDisableDragger(!a);this.isPin=!a},refresh:function(){var a=this.innerFrame;a!==undefined&&a.attr("src",a.attr("src"))},toggle:function(){var a=this,b=a.toggleButton.children("span");if(!a.minimized)if(a.collapsed===undefined||!a.collapsed){a.collapsed=true;!b.hasClass("ui-icon-carat-1-s")&&b.addClass("ui-icon-carat-1-s");a._collapseDialogContent(true)}else{a.collapsed=false;b.hasClass("ui-icon-carat-1-s")&&b.removeClass("ui-icon-carat-1-s");a._expandDialogContent(true)}},_expandDialogContent:function(d){var b=this,e=b.options,c=e.expandingAnimation;b.uiDialog.height("auto");if(d&&c!==null)b.contentWrapper.show(c.animated,c.options,c.duration,function(d){b.uiDialog.css("height",b._toggleHeight);a.isFunction(c.callback)&&c.callback(d);b._enableDisableResizer(false)});else{b.contentWrapper.show();b._enableDisableResizer(false);b.uiDialog.css("height",b.toggleHeight)}},_collapseDialogContent:function(c){var a=this,d=a.options,b=d.collapsingAnimation;a._enableDisableResizer(true);a._toggleHeight=a.uiDialog[0].style.height;a.uiDialog.height("auto");if(c&&b!==null)a.contentWrapper.hide(b.animated,b.options,b.duration);else a.contentWrapper.hide();a._enableDisableDragger(a.isPin)},_enableDisableResizer:function(a){var b=this.uiDialog;b.resizable({disabled:a});a&&b.removeClass("ui-state-disabled")},_enableDisableDragger:function(a){var b=this.uiDialog;b.draggable({disabled:a});a&&b.removeClass("ui-state-disabled")},minimize:function(){var b=this,k=b.uiDialog,q=b.options,f=null,h=a("<div></div>"),j=a("<div></div>"),e,n,p,l,g={},o,i={},d="uiDialog",m;if(!b.minimized){l=b.uiDialog.position();g.width=b.uiDialog.width();g.height=b.uiDialog.height();m=b.getState();if(b.maximized){b.maximized=false;b.restoreButton.remove();a(window).unbind(".onWinResize")}else{b.collapsed&&b._expandDialogContent(false);b._saveNormalState()}b._enableDisableResizer(true);b.collapsed&&b._collapseDialogContent(false);h.appendTo(document.body).css({top:b.uiDialog.offset().top,left:b.uiDialog.offset().left,height:b.uiDialog.innerHeight(),width:b.uiDialog.innerWidth(),position:"absolute"});b.contentWrapper.hide();b.uiDialogButtonPane.length&&b.uiDialogButtonPane.hide();k.height("auto");k.width("auto");b._doButtonAction(b.minimizeButton,"hide");b._restoreButton(true,b.minimizeButton,"After");b._doButtonAction(b.pinButton,"hide");b._doButtonAction(b.refreshButton,"hide");b._doButtonAction(b.toggleButton,"hide");b._doButtonAction(b.maximizeButton,"show");a.browser.webkit&&a(".wijmo-wijdialog-captionbutton",b.uiDialog).css("float","left");if(b.innerFrame){d="copy";b[d]=b.uiDialog.clone();b[d].empty();b.uiDialogTitlebar.appendTo(b[d])}if(q.minimizeZoneElementId.length>0)f=a("#"+q.minimizeZoneElementId);if(f!==null&&f.size()>0)f.append(b[d]);else{e=a("."+c);if(e.size()===0){e=a('<div class="'+c+'"></div>');a(document.body).append(e)}e.append(b[d]).css("z-index",k.css("z-index"))}b[d].css("position","static");b[d].css("float","left");if(a.browser.msie&&a.browser.version==="6.0"){n=a(document).scrollTop();p=document.documentElement.clientHeight-e.height()+n;e.css({position:"absolute",left:"0px",top:p})}j.appendTo(document.body).css({top:b[d].offset().top,left:b[d].offset().left,height:b[d].innerHeight(),width:b[d].innerWidth(),position:"absolute"});b.uiDialog.hide();b.innerFrame&&b[d].hide();h.effect("transfer",{to:j,className:"ui-widget-content"},100,function(){h.remove();j.remove();b[d].show();b.minimized=true;o=b.uiDialog.position();i.width=b.uiDialog.width();i.height=b.uiDialog.height();b._enableDisableDragger(true);b._trigger("resize",null,{originalPosition:l,originalSize:g,position:o,size:i});b._trigger("stateChanged",null,{originalState:m,state:"minimized"})})}},_doButtonAction:function(a,c){if(a!==undefined){a.removeClass(b);a[c]()}},maximize:function(){var b=this,h=a(window),e,c={},f,d={},g;if(!b.maximized){b._enableDisableDragger(false);e=b.uiDialog.position();c.width=b.uiDialog.width();c.height=b.uiDialog.height();if(b.minimized)b.restore();else{b.collapsed&&b._expandDialogContent(false);b._saveNormalState();g="normal"}b.maximized=true;if(b.maximizeButton!==undefined){b.maximizeButton.hide();b._restoreButton(true,b.maximizeButton,"Before")}a.browser.webkit&&a(".wijmo-wijdialog-captionbutton").css("float","");b._onWinResize(b,h);b.collapsed&&b._collapseDialogContent(false);!b.collapsed&&b._enableDisableDragger(true);b.uiDialog.resizable({disabled:true});b.uiDialog.removeClass("ui-state-disabled");f=b.uiDialog.position();d.width=b.uiDialog.width();d.height=b.uiDialog.height();b._trigger("resize",null,{originalPosition:e,originalSize:c,position:f,size:d});g=="normal"&&b._trigger("stateChanged",null,{originalState:"normal",state:"maximized"})}},_bindWindowResize:function(){var b=this,d=a(window),f,e,c;d.resize(function(){b.maximized&&b._onWinResize(b,d)});a.browser.msie&&a.browser.version==="6.0"&&d.bind("scroll.wijdialog resize.wijdialog",function(){if(b.minimized){e=a(document).scrollTop();c=b.uiDialog.parent();f=document.documentElement.clientHeight-c.height()+e;c.css({top:f})}})},_saveNormalState:function(){var a=this,b=a.uiDialog,c=a.element;if(!a.maximized){a.normalWidth=b.css("width");a.normalLeft=b.css("left");a.normalTop=b.css("top");a.normalHeight=b.css("height");a.normalInnerHeight=c.css("height");a.normalInnerWidth=c.css("width");a.normalInnerMinWidth=c.css("min-width");a.normalInnerMinHeight=c.css("min-height")}},_onWinResize:function(a,b){a.uiDialog.css("top",b.scrollTop());a.uiDialog.css("left",b.scrollLeft());a.uiDialog.setOutWidth(b.width());a.uiDialog.setOutHeight(b.height());a._resizeDialog(a)},_restoreButton:function(c,f,e){var a=this,d={button:"restore",info:{visible:c,click:a.restore,iconClassOn:"ui-icon-newwin"}},b=a._createCaptionButton(d,a.uiDialogTitlebar,true);if(c){b["insert"+e](f);a.restoreButton=b}},restore:function(){var b=this,f=b.uiDialog,g,d={},h,e={},j=a("<div></div>"),k=a("<div></div>"),c="uiDialog",i;if(b.minimized){b.minimized=false;b._enableDisableDragger(false);if(b.innerFrame){c="copy";if(!b[c])c="uiDialog"}g=b[c].position();d.width=b[c].width();d.height=b[c].height();j.appendTo(document.body).css({top:b[c].offset().top,left:b[c].offset().left,height:b[c].innerHeight(),width:b[c].innerWidth(),position:"absolute"});f.css("position","absolute");f.css("float","");if(!b.innerFrame)f.appendTo(document.body);else{b.uiDialogTitlebar.prependTo(f);f.show()}b._enableDisableResizer(false);!b.isPin&&b._enableDisableDragger(false);b._restoreToNormal();b.contentWrapper.show();b.uiDialogButtonPane.length&&b.uiDialogButtonPane.show();k.appendTo(document.body).css({top:b.uiDialog.offset().top,left:b.uiDialog.offset().left,height:b.uiDialog.innerHeight(),width:b.uiDialog.innerWidth(),position:"absolute"});b.uiDialog.hide();j.effect("transfer",{to:k,className:"ui-widget-content"},150,function(){b.uiDialog.show();h=b.uiDialog.position();e.width=b.uiDialog.width();e.height=b.uiDialog.height();j.remove();k.remove();b.copy&&b.copy.remove();b._trigger("resize",null,{originalPosition:g,originalSize:d,position:h,size:e});i=b.getState();b._trigger("stateChanged",null,{originalState:"minimized",state:i})});b.collapsed&&b._collapseDialogContent();b._doButtonAction(b.minimizeButton,"show");b._doButtonAction(b.restoreButton,"remove");b._doButtonAction(b.pinButton,"show");b._doButtonAction(b.refreshButton,"show");b._doButtonAction(b.toggleButton,"show");a.browser.webkit&&a(".wijmo-wijdialog-captionbutton").css("float","")}else if(b.maximized){b.maximized=false;g=b.uiDialog.position();d.width=b.uiDialog.width();d.height=b.uiDialog.height();a(window).unbind(".onWinResize");b.collapsed&&b._expandDialogContent();b._enableDisableResizer(false);!b.isPin&&b._enableDisableDragger(false);b._restoreToNormal();b.contentWrapper.show();b.collapsed&&b._collapseDialogContent();if(b.maximizeButton!==undefined){b.maximizeButton.show();b._restoreButton(false,b.maximizeButton,"before")}h=b.uiDialog.position();e.width=b.uiDialog.width();e.height=b.uiDialog.height();b._trigger("resize",null,{originalPosition:g,originalSize:d,position:h,size:e});i=b.getState();b._trigger("stateChanged",null,{originalState:"maximized",state:i})}},getState:function(){var a=this;return a.minimized?"minimized":a.maximized?"maximized":"normal"},reset:function(){var a=this;a.normalWidth=a.normalLeft=a.normalTop=a.normalHeight=a.normalInnerHeight=a.normalInnerWidth=a.normalInnerMinWidth=a.normalInnerMinHeight=undefined;a._setOption("position",a.originalPosition)},open:function(){var b=this,c=b.options;if(!b.innerFrame)if(!b.minimized)a.ui.dialog.prototype.open.apply(b,arguments);else b.uiDialog.show();else{b.innerFrame.attr("src",c.contentUrl);if(!b.minimized)a.ui.dialog.prototype.open.apply(b,arguments);else b.uiDialogTitlebar.show()}b.collapsed&&b._collapseDialogContent();b.disabledDiv&&c.disabled&&b.disabledDiv.show()},close:function(){var b=this,c=b.options;if(a.ui.dialog.prototype.close.apply(b,arguments)){if(b.innerFrame){b.innerFrame.attr("src","");b.minimized&&b.uiDialogTitlebar.hide()}b.disabledDiv&&c.disabled&&b.disabledDiv.hide()}},_resizeDialog:function(a){a.options.width=a.uiDialog.width();a.options.height=a.uiDialog.height();a._size()},_restoreToNormal:function(){var a=this,b=a.uiDialog,c=a.element;b.css("width",a.normalWidth);b.css("left",a.normalLeft);b.css("top",a.normalTop);b.css("height",a.normalHeight);c.css("height",a.normalInnerHeight);c.css("width",a.normalInnerWidth);c.css("min-width",a.normalInnerMinWidth);c.css("min-height",a.normalInnerMinHeight);a.options.width=a.uiDialog.width();a.options.height=a.uiDialog.height()}});a.extend(a.ui.dialog.overlay,{height:function(){var b,c;if(a.browser.msie){b=Math.max(document.documentElement.scrollHeight,document.body.scrollHeight);c=Math.max(document.documentElement.offsetHeight,document.body.offsetHeight);return b<c?a(window).height()+"px":b+"px"}else return a(document).height()+"px"},width:function(){var b,c;if(a.browser.msie){b=Math.max(document.documentElement.scrollWidth,document.body.scrollWidth);c=Math.max(document.documentElement.offsetWidth,document.body.offsetWidth);return b<c?a(window).width()+"px":b+"px"}else return a(document).width()+"px"}})})(jQuery);
+(function(a){"use strict";a.widget("wijmo.wijaccordion",{options:{animated:"slide",duration:null,event:"click",disabled:false,expandDirection:"bottom",header:"> li > :first-child,> :not(li):even",requireOpenedPane:true,selectedIndex:0},_setOption:function(d,b){var c=this.options;if(c[d]!==b)switch(d){case"selectedIndex":this.activate(b);break;case"disabled":if(b)this.element.addClass("ui-state-disabled");else this.element.removeClass("ui-state-disabled");break;case"event":this._unbindLiveEvents();this.options.event=b;this._bindLiveEvents();break;case"header":this._handleHeaderChange(b,c.header);break;case"expandDirection":this._onDirectionChange(b,true,c.expandDirection)}a.Widget.prototype._setOption.apply(this,arguments)},_handleHeaderChange:function(b,a){var c=this.element.find(a);c.removeClass("ui-accordion-header ui-helper-reset ui-state-active "+this._triangleIconOpened).siblings(".ui-accordion-content").removeClass("ui-accordion-content ui-helper-reset ui-widget-content ui-accordion-content-active");this._initHeaders(b)},_initHeaders:function(a){var b=this.options;a=a?a:b.header;this.headers=this.element.find(a);this.headers.each(jQuery.proxy(this._initHeader,this))},_initHeader:function(e,f){var g=this.options,d=this.element.data("rightToLeft"),b=a(f),c=a(b.next()[0]);if(d){b.remove();b.insertAfter(c)}b.addClass("ui-accordion-header ui-helper-reset").attr("role","tab");c.attr("role","tabpanel");b.find("> a").length===0&&b.wrapInner('<a href="#"></a>');b.find("> .ui-icon").length===0&&a('<span class="ui-icon"></span>').insertBefore(a("> a",b)[0]);if(e===g.selectedIndex){b.addClass("ui-state-active").addClass(this._headerCornerOpened).attr({"aria-expanded":"true",tabIndex:0}).find("> .ui-icon").addClass(this._triangleIconOpened);c.addClass("ui-accordion-content-active").addClass(this._contentCornerOpened)}else{b.addClass("ui-state-default ui-corner-all").attr({"aria-expanded":"false",tabIndex:-1}).find("> .ui-icon").addClass(this._triangleIconClosed);c.hide()}c.addClass("ui-accordion-content ui-helper-reset ui-widget-content")},_create:function(){this.element.addClass("wijmo-wijaccordion ui-accordion ui-widget ui-accordion-icons ui-helper-reset ui-helper-clearfix");var a=this.options;a.disabled&&this.element.addClass("ui-state-disabled");this._onDirectionChange(a.expandDirection,false);this._initHeaders();this.element.attr("role","tablist")},_init:function(){this._bindLiveEvents()},destroy:function(){this._unbindLiveEvents();this.element.removeClass("wijmo-wijaccordion ui-accordion ui-widget ui-helper-reset ui-accordion-icons").removeAttr("role");a.Widget.prototype.destroy.apply(this,arguments)},activate:function(e){var b,c=this.options,n=this.element.children(".ui-accordion-header"),f=this.element.find(".ui-accordion-header.ui-state-active"),p=this.element.data("rightToLeft"),i,k,g,h,r,l,o,m,j,q,d;if(typeof e==="number")b=a(n[e]);else if(typeof e==="string"){e=parseInt(e,0);b=a(n[e])}else{b=a(e);e=n.index(e)}if(b.hasClass("ui-state-active")){if(c.requireOpenedPane)return false;f=b;b=a(null)}else if(!c.requireOpenedPane)f=a(null);i=a(".ui-accordion-header",this.element).index(b);k=a(".ui-accordion-header",this.element).index(f);g=p?b.prev(".ui-accordion-content"):b.next(".ui-accordion-content");h=p?f.prev(".ui-accordion-content"):f.next(".ui-accordion-content");if(f.length===0&&b.length===0)return false;if(!this._trigger("beforeSelectedIndexChanged",null,{newIndex:i,prevIndex:k}))return false;f.removeClass("ui-state-active").removeClass(this._headerCornerOpened).addClass("ui-state-default ui-corner-all").attr({"aria-expanded":"false",tabIndex:-1}).find("> .ui-icon").removeClass(this._triangleIconOpened).addClass(this._triangleIconClosed);b.removeClass("ui-state-default ui-corner-all").addClass("ui-state-active").addClass(this._headerCornerOpened).attr({"aria-expanded":"true",tabIndex:0}).find("> .ui-icon").removeClass(this._triangleIconClosed).addClass(this._triangleIconOpened);if(c.animated){l={toShow:g,toHide:h,complete:jQuery.proxy(function(){h.removeClass("ui-accordion-content-active");g.addClass("ui-accordion-content-active");h.css("display","");g.css("display","");if(a.fn.wijlinechart){h.find(".wijmo-wijlinechart").wijlinechart("redraw");g.find(".wijmo-wijlinechart").wijlinechart("redraw")}this._trigger("selectedIndexChanged",null,{newIndex:i,prevIndex:k})},this),horizontal:this.element.hasClass("ui-helper-horizontal"),rightToLeft:this.element.data("rightToLeft"),down:i>k,autoHeight:c.autoHeight||c.fillSpace};o=c.animated;m=c.duration;if(a.isFunction(o))c.animated=o(l);if(a.isFunction(m))c.duration=m(l);j=a.wijmo.wijaccordion.animations;q=c.duration;d=c.animated;if(d&&!j[d]&&!a.easing[d])d="slide";if(!j[d])j[d]=function(a){this.slide(a,{easing:d,duration:q||700})};j[d](l)}else{f.length>0&&h.hide().removeClass("ui-accordion-content-active");b.length>0&&g.show().addClass("ui-accordion-content-active").addClass(this._contentCornerOpened);if(a.fn.wijlinechart){h.find(".wijmo-wijlinechart").wijlinechart("redraw");g.find(".wijmo-wijlinechart").wijlinechart("redraw")}this._trigger("selectedIndexChanged",null,{newIndex:i,prevIndex:k})}this.options.selectedIndex=i},_bindLiveEvents:function(){this.element.find(".ui-accordion-header").live(this.options.event+".wijaccordion",jQuery.proxy(this._onHeaderClick,this)).live("keydown.wijaccordion",jQuery.proxy(this._onHeaderKeyDown,this)).live("mouseenter.wijaccordion",function(){a(this).addClass("ui-state-hover")}).live("mouseleave.wijaccordion",function(){a(this).removeClass("ui-state-hover")}).live("focus.wijaccordion",function(){a(this).addClass("ui-state-focus")}).live("blur.wijaccordion",function(){a(this).removeClass("ui-state-focus")})},_unbindLiveEvents:function(){this.element.find(".ui-accordion-header").die("wijaccordion")},_onHeaderClick:function(a){!this.options.disabled&&this.activate(a.currentTarget);return false},_onHeaderKeyDown:function(d){if(this.options.disabled||d.altKey||d.ctrlKey)return;var b=a.ui.keyCode,g=this.options,f=this.element.find(".ui-accordion-header.ui-state-focus"),c,e=this.element.find(".ui-accordion-header");if(f.length>0){c=a(".ui-accordion-header",this.element).index(f);switch(d.keyCode){case b.RIGHT:case b.DOWN:if(e[c+1]){e[c+1].focus();return false}break;case b.LEFT:case b.UP:if(e[c-1]){e[c-1].focus();return false}break;case b.SPACE:case b.ENTER:this.activate(d.currentTarget);d.preventDefault()}}return true},_onDirectionChange:function(j,e,i){var b,g,f,d,c,h;if(e){g=this.element.find(".ui-accordion-header."+this._headerCornerOpened);g.removeClass(this._headerCornerOpened);f=this.element.find(".ui-accordion-content."+this._contentCornerOpened);f.removeClass(this._contentCornerOpened);d=this.element.find("."+this._triangleIconOpened);c=this.element.find("."+this._triangleIconClosed);d.removeClass(this._triangleIconOpened);c.removeClass(this._triangleIconClosed)}i!==null&&this.element.removeClass("ui-accordion-"+i);switch(j){case"top":this._headerCornerOpened="ui-corner-bottom";this._contentCornerOpened="ui-corner-top";this._triangleIconOpened="ui-icon-triangle-1-n";this._triangleIconClosed="ui-icon-triangle-1-e";b=true;this.element.removeClass("ui-helper-horizontal");this.element.addClass("ui-accordion-top");break;case"right":this._headerCornerOpened="ui-corner-left";this._contentCornerOpened="ui-corner-right";this._triangleIconOpened="ui-icon-triangle-1-e";this._triangleIconClosed="ui-icon-triangle-1-s";b=false;this.element.addClass("ui-helper-horizontal");this.element.addClass("ui-accordion-right");break;case"left":this._headerCornerOpened="ui-corner-right";this._contentCornerOpened="ui-corner-left";this._triangleIconOpened="ui-icon-triangle-1-w";this._triangleIconClosed="ui-icon-triangle-1-s";b=true;this.element.addClass("ui-helper-horizontal");this.element.addClass("ui-accordion-left");break;default:this._headerCornerOpened="ui-corner-top";this._contentCornerOpened="ui-corner-bottom";this._triangleIconOpened="ui-icon-triangle-1-s";this._triangleIconClosed="ui-icon-triangle-1-e";b=false;this.element.removeClass("ui-helper-horizontal");this.element.addClass("ui-accordion-bottom")}h=this.element.data("rightToLeft");this.element.data("rightToLeft",b);if(e){d.addClass(this._triangleIconOpened);c.addClass(this._triangleIconClosed);g.addClass(this._headerCornerOpened);f.addClass(this._contentCornerOpened)}e&&b!==h&&this.element.children(".ui-accordion-header").each(function(){var c=a(this),d;if(b){d=c.next(".ui-accordion-content");c.remove();c.insertAfter(d)}else{d=c.prev(".ui-accordion-content");c.remove();c.insertBefore(d)}})}});a.extend(a.wijmo.wijaccordion,{animations:{slide:function(b,h){b=a.extend({easing:"swing",duration:300},b,h);if(!b.toHide.size()){b.toShow.stop(true,true).animate(b.horizontal?{width:"show"}:{height:"show"},b);return}if(!b.toShow.size()){b.toHide.stop(true,true).animate(b.horizontal?{width:"hide"}:{height:"hide"},b);return}var i=b.toShow.css("overflow"),f=0,e={},g={},j=b.horizontal?["width","paddingLeft","paddingRight"]:["height","paddingTop","paddingBottom"],d,c=b.toShow;if(b.horizontal){d=c[0].style.height;c.height(parseInt(c.parent().height(),10)-parseInt(c.css("paddingTop"),10)-parseInt(c.css("paddingBottom"),10)-(parseInt(c.css("borderTopWidth"),10)||0)-(parseInt(c.css("borderBottomWidth"),10)||0))}else{d=c[0].style.width;c.width(parseInt(c.parent().width(),10)-parseInt(c.css("paddingLeft"),10)-parseInt(c.css("paddingRight"),10)-(parseInt(c.css("borderLeftWidth"),10)||0)-(parseInt(c.css("borderRightWidth"),10)||0))}a.each(j,function(f,d){g[d]="hide";var c=(""+a.css(b.toShow[0],d)).match(/^([\d+-.]+)(.*)$/);e[d]={value:c?c[1]:0,unit:c?c[2]||"px":"px"}});b.toShow.css(b.horizontal?{width:0,overflow:"hidden"}:{height:0,overflow:"hidden"}).stop(true,true).show();b.toHide.filter(":hidden").each(b.complete).end().filter(":visible").stop(true,true).animate(g,{step:function(c,a){if(a.prop===b.horizontal?"width":"height")f=a.end-a.start===0?0:(a.now-a.start)/(a.end-a.start);b.toShow[0].style[a.prop]=f*e[a.prop].value+e[a.prop].unit},duration:b.duration,easing:b.easing,complete:function(){!b.autoHeight&&b.toShow.css(b.horizontal?"width":"height","");b.toShow.css(b.horizontal?"height":"width",d);b.toShow.css({overflow:i});b.complete()}})},bounceslide:function(a){this.slide(a,{easing:a.down?"easeOutBounce":"swing",duration:a.down?1e3:200})}}})})(jQuery);
+(function(a){"use strict";a.fn.extend({getBounds:function(){return a.extend({},a(this).offset(),{width:a(this).outerWidth(true),height:a(this).outerHeight(true)})},setBounds:function(b){a(this).css({left:b.left,top:b.top}).width(b.width).height(b.height);return this},getMaxZIndex:function(){var b=(a(this).css("z-index")=="auto"?0:a(this).css("z-index"))*1;a(this).siblings().each(function(d,c){b=Math.max(b,(a(c).css("z-index")=="auto"?0:a(c).css("z-index"))*1)});return b}});a.widget("wijmo.wijpopup",{options:{ensureOutermost:false,showEffect:"show",showOptions:{},showDuration:300,hideEffect:"hide",hideOptions:{},hideDuration:100,autoHide:false,position:{at:"left bottom",my:"left top"},showing:null,shown:null,hiding:null,hidden:null,posChanged:null},_create:function(){},_init:function(){if(!!this.options.ensureOutermost){var b=a("form");if(b.length===0)b=a(document.body);this.element.appendTo(b)}this.element.data("visible.wijpopup",false);this.element.css("position","absolute");this.element.position({of:a(document.body)});this.element.hide()},_setOption:function(c){a.Widget.prototype._setOption.apply(this,arguments);if(c==="autoHide"){var b=this.isVisible();this.hide();b&&this.show()}},destroy:function(){a.Widget.prototype.destroy.apply(this,arguments);this.isVisible()&&this.hide();if(a.browser.msie&&a.browser.version<7){jFrame=this.element.data("backframe.wijpopup");!jFrame&&jFrame.remove()}var b=this;this.element.unbind(".wijpopup");a.each(["visible","backframe","animating","width"],function(c,a){b.element.removeData(a+".wijpopup")})},isVisible:function(){return!!this.element.data("visible.wijpopup")&&this.element.is(":visible")},isAnimating:function(){return!!this.element.data("animating.wijpopup")},show:function(d){this._setPosition(d);if(this.isVisible())return;if(this._trigger("showing")===false)return;this.options.autoHide&&a(document.body).bind("mouseup.wijpopup",a.proxy(this._onDocMouseUp,this));var b=this.options.showEffect||"show",c=this.options.showDuration||300,e=this.options.showOptions||{};this.element.data("animating.wijpopup",true);if(a.effects&&a.effects[b])this.element.show(b,e,c,a.proxy(this._showCompleted,this));else this.element[b](b==="show"?null:c,a.proxy(this._showCompleted,this));(!b||!c||b==="show"||c<=0)&&this._showCompleted()},_showCompleted:function(){this.element.removeData("animating.wijpopup");this.element.data("visible.wijpopup",true);this._trigger("shown")},showAt:function(a,b){this.show({my:"left top",at:"left top",of:document.body,offset:""+a+" "+b})},hide:function(){if(!this.isVisible())return;if(this._trigger("hiding")===false)return;a(document.body).unbind("mouseup.wijpopup");var b=this.options.hideEffect||"hide",c=this.options.hideDuration||300,d=this.options.hideOptions||{};this.element.data("animating.wijpopup",true);if(a.effects&&a.effects[b])this.element.hide(b,d,c,a.proxy(this._hideCompleted,this));else this.element[b](b==="hide"?null:c,a.proxy(this._hideCompleted,this));(!b||!c||b==="hide"||c<=0)&&this._hideCompleted()},_hideCompleted:function(){if(this.element.data("width.wijpopup")!==undefined){this.element.width(this.element.data("width.wijpopup"));this.element.removeData("width.wijpopup")}this.element.unbind("move.wijpopup");this.element.removeData("animating.wijpopup");if(a.browser.msie&&a.browser.version<7){var b=this.element.data("backframe.wijpopup");b&&b.hide()}this._trigger("hidden")},_onDocMouseUp:function(b){var c=b.target?b.target:b.srcElement;if(this.isVisible()&&!!this.options.autoHide)c!=this.element.get(0)&&a(c).parents().index(this.element)<0&&this.hide()},_onMove:function(){var a=this.element.data("backframe.wijpopup");if(a){this.element.before(a);a.css({top:this.element.css("top"),left:this.element.css("left")})}},_addBackgroundIFrame:function(){if(a.browser.msie&&a.browser.version<7){var b=this.element.data("backframe.wijpopup");if(!b){b=jQuery("<iframe/>").css({position:"absolute",display:"none",filter:"progid:DXImageTransform.Microsoft.Alpha(style=0,opacity=0)"}).attr({src:"javascript:'<html></html>';",scrolling:"no",frameborder:"0","tabIndex ":-1});this.element.before(b);this.element.data("backframe.wijpopup",b);this.element.bind("move.wijpopup",a.proxy(this._onMove,this))}b.setBounds(this.element.getBounds());b.css({display:"block",left:this.element.css("left"),top:this.element.css("top"),"z-index":this.element.css("z-index")-1})}},_setZIndex:function(b){this.element.css("z-index",b);var a=this.element.data("backframe.wijpopup");a&&a.css("z-index",this.element.css("z-index")-1)},_setPosition:function(c){var d=this.element.is(":visible");this.element.show();this.element.position(a.extend({},this.options.position,c?c:{}));!d&&this.element.hide();this._addBackgroundIFrame();var b=1e3;if(this.options.position.of)b=Math.max(b,a(this.options.position.of).getMaxZIndex());this._setZIndex(b+10);this._trigger("posChanged")}})})(jQuery);
+(function(a){"use strict";var i="wijmo-wijsuperpanel ui-widget ui-widget-content",h="ui-corner-all",b="ui-state-disabled",f="ui-state-hover",g="ui-state-active",e="ui-state-default",c="wijmo-wijsuperpanel-handle",d="wijmo-wijsuperpanel-hbarcontainer",j="wijmo-wijsuperpanel-vbarcontainer",l="<div class='wijmo-wijsuperpanel-statecontainer'><div class='wijmo-wijsuperpanel-contentwrapper'><div class='wijmo-wijsuperpanel-templateouterwrapper'></div></div></div>",k="<div class='wijmo-wijsuperpanel-hbarcontainer ui-widget-header'><div class='wijmo-wijsuperpanel-handle ui-state-default ui-corner-all'><span class='ui-icon ui-icon-grip-solid-vertical'></span></div><div class='wijmo-wijsuperpanel-hbar-buttonleft ui-state-default ui-corner-bl'><span class='ui-icon ui-icon-triangle-1-w'></span></div><div class='wijmo-wijsuperpanel-hbar-buttonright ui-state-default ui-corner-br'><span class='ui-icon ui-icon-triangle-1-e'></span></div></div>",n="<div class='wijmo-wijsuperpanel-vbarcontainer ui-widget-header'><div class='wijmo-wijsuperpanel-handle ui-state-default ui-corner-all'><span class='ui-icon ui-icon-grip-solid-horizontal'></span></div><div class='wijmo-wijsuperpanel-vbar-buttontop ui-state-default ui-corner-tr'><span class='ui-icon ui-icon-triangle-1-n'></span></div><div class='wijmo-wijsuperpanel-vbar-buttonbottom ui-state-default ui-corner-br'><span class='ui-icon ui-icon-triangle-1-s'></span></div></div>",m="<div class='ui-state-default wijmo-wijsuperpanel-button wijmo-wijsuperpanel-buttonleft'><span class='ui-icon ui-icon-carat-1-w'></span></div><div class='ui-state-default wijmo-wijsuperpanel-button wijmo-wijsuperpanel-buttonright'><span class='ui-icon ui-icon-carat-1-e'></span></div>",o="<div class='ui-state-default wijmo-wijsuperpanel-button wijmo-wijsuperpanel-buttontop'><span class='ui-icon ui-icon-carat-1-n'></span></div><div class='ui-state-default wijmo-wijsuperpanel-button wijmo-wijsuperpanel-buttonbottom'><span class='ui-icon ui-icon-carat-1-s'></span></div>";a.widget("wijmo.wijsuperpanel",{options:{allowResize:false,autoRefresh:false,animationOptions:{queue:false,disabled:false,duration:250,easing:undefined},hScrollerActivating:null,hScroller:{scrollBarPosition:"bottom",scrollBarVisibility:"auto",scrollMode:"scrollBar",scrollValue:null,scrollMax:100,scrollMin:0,scrollLargeChange:null,scrollSmallChange:null,scrollMinDragLength:6,increaseButtonPosition:null,decreaseButtonPosition:null,hoverEdgeSpan:20,firstStepChangeFix:0},keyboardSupport:false,keyDownInterval:100,mouseWheelSupport:true,bubbleScrollingEvent:true,resizableOptions:{handles:"all",helper:"ui-widget-content wijmo-wijsuperpanel-helper"},resized:null,dragStop:null,painted:null,scrolling:null,scrolled:null,showRounder:true,vScrollerActivating:null,vScroller:{scrollBarPosition:"right",scrollBarVisibility:"auto",scrollMode:"scrollBar",scrollValue:null,scrollMax:100,scrollMin:0,scrollLargeChange:null,scrollSmallChange:null,scrollMinDragLength:6,increaseButtonPosition:null,decreaseButtonPosition:null,hoverEdgeSpan:20,firstStepChangeFix:0}},_setOption:function(d,b){var c=this,h=c.options,g=c._fields(),e=g.hbarDrag,f=g.vbarDrag,i=g.resizer;if(d==="animationOptions")b=a.extend(h.animationOptions,b);else if(d==="hScroller"){if(b.scrollLargeChange!==undefined&&b.scrollLargeChange!==null)c._autoHLarge=false;b=a.extend(h.hScroller,b)}else if(d==="vScroller"){if(b.scrollLargeChange!==undefined&&b.scrollLargeChange!==null)c._autoVLarge=false;b=a.extend(h.vScroller,b)}else if(d==="resizableOptions")b=a.extend(c.resizableOptions,b);a.Widget.prototype._setOption.apply(c,arguments);if(a.isPlainObject(b))c.options[d]=b;switch(d){case"allowResize":c._initResizer();break;case"disabled":if(b){e!==undefined&&e.draggable("disable");f!==undefined&&f.draggable("disable");i!==undefined&&i.resizable("disable")}else{e!==undefined&&e.draggable("enable");f!==undefined&&f.draggable("enable");i!==undefined&&i.resizable("enable")}break;case"mouseWheelSupport":case"keyboardSupport":c._bindElementEvents(c,g,c.element,h)}return c},_create:function(){var a=this,b=a.options;b.vScroller.dir="v";b.hScroller.dir="h";a.paintPanel();a._initResizer();a.options.disabled&&a.disable();a._detectAutoRefresh()},_detectAutoRefresh:function(){var c=this,b=a.wijmo.wijsuperpanel.panels;if(b===undefined){b=[];a.wijmo.wijsuperpanel.panels=b}b.push(c);if(c.options.autoRefresh)if(!a.wijmo.wijsuperpanel.setAutoRefreshInterval){a.wijmo.wijsuperpanel.setAutoRefreshInterval=c._setAutoRefreshInterval;a.wijmo.wijsuperpanel.setAutoRefreshInterval()}},_setAutoRefreshInterval:function(){var b=a.wijmo.wijsuperpanel.autoRereshInterval,c=a.wijmo.wijsuperpanel.panels,d=window.setInterval(function(){window.clearInterval(d);for(var k=c.length,j=false,b,g,i,f,e,h=0;h<k;h++){b=c[h];g=b.element[0];i=b.options.autoRefresh;if(i)j=true;f=b.getContentElement();e=b._paintedMark;b.options.autoRefresh&&f.is(":visible")&&(e===undefined||e.width!==f[0].offsetWidth||e.height!==f[0].offsetHeight||e.mainWidth!==g.offsetWidth||e.mainHeight!==g.offsetHeight)&&b.paintPanel()}j&&window.setTimeout(a.wijmo.wijsuperpanel.setAutoRefreshInterval,0)},b===undefined?500:b)},destroy:function(){var c=this,b=c._fields(),d=c.element,f,e;a.wijmo.wijsuperpanel.panels=a.grep(a.wijmo.wijsuperpanel.panels,function(a){return a!==c});if(!b.initialized)return;c._radiusKey&&c.element.css(c._radiusKey,"");if(b.intervalID!==undefined){window.clearInterval(b.intervalID);b.intervalID=undefined}b.resizer!==undefined&&b.resizer.resizable("destroy");if(b.hbarContainer!==undefined){b.hbarDrag.remove();b.hbarContainer.unbind("."+c.widgetName)}if(b.vbarContainer!==undefined){b.vbarDrag.remove();b.vbarContainer.unbind("."+c.widgetName)}d.unbind("."+c.widgetName);b.contentWrapper.unbind("."+c.widgetName);f=b.stateContainer.find(">.wijmo-wijsuperpanel-button");f.unbind("."+c.widgetName);e=b.templateWrapper;e.contents().each(function(b,a){d.append(a)});b.stateContainer.remove();b.tabindex&&d.removeAttr("tabindex");d.removeClass(i+" "+h);a.Widget.prototype.destroy.apply(c,arguments)},_fields:function(){var b=this,c=b.element,d=b.widgetName+"-fields",a=b._fieldsStore;if(a===undefined){a={};c.data(d,a);b._fieldsStore=a}return a},_hasMode:function(c,d){var b=c.scrollMode.split(",");b=a.map(b,function(b){return a.trim(b).toLowerCase()});return a.inArray(d.toLowerCase(),b)>-1},_bindElementEvents:function(a,g,b,d){var e=a._hasMode(d.hScroller,"edge"),f=a._hasMode(d.vScroller,"edge"),c=a.widgetName;if(e||f){if(a._mousemoveBind===undefined){a._mousemoveBind=true;b.bind("mousemove."+c,a,a._contentMouseMove);b.bind("mouseleave."+c,null,function(){a._clearInterval()})}}else{b.unbind("mousemove",a._contentMouseMove);a._mousemoveBind=undefined}if(d.mouseWheelSupport){if(a._mouseWheelBind===undefined){a._mouseWheelBind=true;b.bind("mousewheel."+c,a,a._panelMouseWheel)}}else{a.element.unbind("mousewheel",a._panelMouseWheel);a._mouseWheelBind=undefined}if(d.keyboardSupport){if(a._keyboardBind===undefined){a._keyboardBind=true;b.bind("keydown."+c,a,a._panelKeyDown)}}else{b.unbind("keydown",a._panelKeyDown);a._keyboardBind=undefined}},_dragStop:function(d,b,c){var a={dragHandle:c};b._trigger("dragStop",d,a)},_contentMouseMove:function(g){var b=g.data,n=b.options,i,j,f,s,q,r,h,m,d,e,k,l,o,p,c;if(n.disabled)return;i=n.hScroller;j=n.vScroller;f=a(g.currentTarget);s=b._fields();q=b._hasMode(i,"edge");r=b._hasMode(j,"edge");b._clearInterval();h={X:g.pageX,Y:g.pageY};m=f.offset();d=m.left;e=m.top;d=h.X-d;e=h.Y-e;k=i.hoverEdgeSpan;l=j.hoverEdgeSpan;o=f.innerHeight();p=f.innerWidth();c="";if(q){if(d<k)c="left";if(d>p-k)c="right"}if(r){if(e<l)c="top";if(e>o-l)c="bottom"}b._setScrollingInterval(s,c,b,false)},_setScrollingInterval:function(d,b,a,c){var e=a.options;if(b.length>0)d.internalFuncID=window.setInterval(function(){a._doScrolling(b,a,c)},e.keyDownInterval)},_scrollButtonMouseOver:function(e){var c=e.data,d;if(c.options.disabled)return;d=a(e.currentTarget);if(!d.hasClass(b)){d.bind("mouseout."+c.widgetName,c,c._buttonMouseOut).bind("mousedown."+c.widgetName,c,c._buttonMouseDown).bind("mouseup."+c.widgetName,c,c._buttonMouseUp).addClass(f);c._buttonScroll(d,c,"buttonshover")}},_buttonScroll:function(c,a,f){var b="",g=a.options,h=a._fields(),d=a._hasMode(g.hScroller,f),e=a._hasMode(g.vScroller,f);if(c.hasClass("wijmo-wijsuperpanel-buttonleft")&&d)b="left";else if(c.hasClass("wijmo-wijsuperpanel-buttonright")&&d)b="right";else if(c.hasClass("wijmo-wijsuperpanel-buttontop")&&e)b="top";else if(c.hasClass("wijmo-wijsuperpanel-buttonbottom")&&e)b="bottom";if(b.length>0){a._clearInterval();a._doScrolling(b,a,true);a._setScrollingInterval(h,b,a,true)}},_buttonMouseDown:function(e){var d=e.data,c;if(d.options.disabled)return;c=a(e.currentTarget);if(!c.hasClass(b)){c.addClass(g);d._buttonScroll(c,d,"buttons")}},_buttonMouseUp:function(b){var d=b.data,c=a(b.currentTarget);c.removeClass("ui-state-active");d._clearInterval()},_buttonMouseOut:function(c){var b=c.data,d=a(c.currentTarget);d.unbind("mouseout",b._buttonMouseOut).unbind("mousedown",b._buttonMouseDown).unbind("mouseup",b._buttonMouseUp).removeClass(f).removeClass(g);b._clearInterval()},_panelKeyDown:function(e){var b=e.data,f=b.options,d,c;if(!f.keyboardSupport||f.disabled)return;d=e.shiftKey;c=e.keyCode;if(c===a.ui.keyCode.LEFT)b._doScrolling("left",b,d);else if(c===a.ui.keyCode.RIGHT)b._doScrolling("right",b,d);else if(c===a.ui.keyCode.UP)b._doScrolling("top",b,d);else c===a.ui.keyCode.DOWN&&b._doScrolling("bottom",b,d);e.stopPropagation();e.preventDefault()},_draggingInternal:function(f,c,a,i){var d=a.dir,h=d==="h",g=h?"left":"top",l=f.position[g]-c._getScrollContainerPadding(g),k=c._getTrackLen(d)-i[h?"outerWidth":"outerHeight"](true),j=l/k,e=a.scrollMax-a.scrollLargeChange+1,b=j*e,f;if(b<a.scrollMin)b=a.scrollMin;if(b>e)b=e;f={oldValue:a.scrollValue,newValue:b,dir:d};if(!c._scrolling(true,c,f))return;a.scrollValue=b;c._setDragAndContentPosition(true,false,d,"dragging")},_dragging:function(g,e,b){var f=b.options,c=a(g.target),h=c.parent();if(h.hasClass(d))b._draggingInternal(e,b,f.hScroller,c);else b._draggingInternal(e,b,f.vScroller,c)},_panelMouseWheel:function(h,l){var c=h.data,i=c.options,k,b,j,f,g,e;if(!i.mouseWheelSupport||i.disabled)return;k=a(h.srcElement||h.originalEvent.target);b="";j=k.closest("."+d,c.element).size()>0;f=i.hScroller;g=i.vScroller;if(l>0)b=j?"left":"top";else b=j?"right":"bottom";b.length>0&&c._doScrolling(b,c);e=false;if(b==="left")e=!c.hNeedScrollBar||Math.abs(f.scrollValue-f.scrollMin)<.001;if(b==="right")e=!c.hNeedScrollBar||Math.abs(f.scrollValue-(f.scrollMax-c._getHScrollBarLargeChange()+1))<.001;if(b==="top")e=!c.vNeedScrollBar||Math.abs(g.scrollValue-g.scrollMin)<.001;if(b==="bottom")e=!c.vNeedScrollBar||Math.abs(g.scrollValue-(g.scrollMax-c._getVScrollBarLargeChange()+1))<.001;if(!e||!i.bubbleScrollingEvent||b==="left"||b==="right"){h.stopPropagation();h.preventDefault()}},_documentMouseUp:function(c){var b=c.data.self,d=c.data.ele;d.removeClass(g);b._clearInterval();a(document).unbind("mouseup",b._documentMouseUp)},_scrollerMouseOver:function(i){var b=i.data,g,c,h;if(b.options.disabled)return;g=a(i.srcElement||i.originalEvent.target);c=null;h=false;if(g.hasClass(e)){c=g;h=true}else if(g.parent().hasClass(e)){c=g.parent();h=true}else if(g.hasClass(j)||g.hasClass(d))c=g;if(c!==undefined){h&&c.addClass(f);c.bind("mouseout."+b.widgetName,b,b._elementMouseOut);c.bind("mousedown."+b.widgetName,b,b._elementMouseDown);c.bind("mouseup."+b.widgetName,b,b._elementMouseUp)}},_elementMouseUp:function(c){var b=a(c.currentTarget);b.removeClass("ui-state-active")},_elementMouseDown:function(i){var b=a(i.currentTarget),f=i.data,e,h,g,k,n,l,m,o;if(f.options.disabled||i.which!==1)return;e="";h=false;g=false;if(b.hasClass("wijmo-wijsuperpanel-vbar-buttontop")){e="top";g=true}else if(b.hasClass("wijmo-wijsuperpanel-vbar-buttonbottom")){e="bottom";g=true}else if(b.hasClass("wijmo-wijsuperpanel-hbar-buttonleft")){e="left";g=true}else if(b.hasClass("wijmo-wijsuperpanel-hbar-buttonright")){e="right";g=true}else if(b.hasClass(c)){b.addClass("ui-state-active");return}else if(b.hasClass(d)){k=b.find("."+c);n=k.offset();if(i.pageX<n.left)e="left";else e="right";h=true}else if(b.hasClass(j)){l=b.find("."+c);m=l.offset();if(i.pageY<m.top)e="top";else e="bottom";h=true}f._clearInterval();f._doScrolling(e,f,h);o=f._fields();f._setScrollingInterval(o,e,f,h);g&&b.addClass("ui-state-active");a(document).bind("mouseup."+f.widgetName,{self:f,ele:b},f._documentMouseUp)},doScrolling:function(b,a){this._doScrolling(b,this,a)},_setScrollerValue:function(n,b,l,h,m,i,e){var f=b.scrollMin,j=i?h:l,c=b.scrollValue,a,d,g,k;if(!c)c=f;a=0;if(m){d=b.scrollMax-h+1;if(Math.abs(c-d)<.001){e._clearInterval();return false}g=b.firstStepChangeFix;a=c+j;if(!i&&Math.abs(c-f)<.0001&&!isNaN(g))a+=g;if(a>d)a=d}else{if(Math.abs(c-f)<.001){e._clearInterval();return false}a=c-j;if(a<0)a=f}k={oldValue:b.scrollValue,newValue:a,direction:n,dir:b.dir};if(!e._scrolling(true,e,k))return false;b.scrollValue=a;return true},_doScrolling:function(a,b,c){var d=b.options,f=d.vScroller,e=d.hScroller,j=b._getVScrollBarSmallChange(),i=b._getVScrollBarLargeChange(),g=b._getHScrollBarLargeChange(),h=b._getHScrollBarSmallChange();if(a==="top"||a==="bottom"){if(!b._setScrollerValue(a,f,j,i,a==="bottom",c,b))return;a="v"}else if(a==="left"||a==="right"){if(!b._setScrollerValue(a,e,h,g,a==="right",c,b))return;a="h"}b._setDragAndContentPosition(true,true,a)},_disableButtonIfNeeded:function(h){var a=h._fields(),c,f,j,g,i,m,o,d,k,n,p,e,l;a.intervalID>0&&window.clearInterval(a.intervalID);c=h.options;f=a.buttonLeft;j=a.buttonRight;g=a.buttonTop;i=a.buttonBottom;if(f!==undefined){m=h._getHScrollBarLargeChange();o=c.hScroller.scrollMax-m+1;d=c.hScroller.scrollValue;k=c.hScroller.scrollMin;if(d===undefined)d=k;if(Math.abs(d-k)<.001||!a.hScrolling)f.addClass(b);else f.removeClass(b);if(Math.abs(d-o)<.001||!a.hScrolling)j.addClass(b);else j.removeClass(b)}if(g!==undefined){n=h._getVScrollBarLargeChange();p=c.vScroller.scrollMax-n+1;e=c.vScroller.scrollValue;l=c.vScroller.scrollMin;if(e===undefined)e=l;if(Math.abs(e-l)<.001||!a.vScrolling)g.addClass(b);else g.removeClass(b);if(Math.abs(e-p)<.001||!a.vScrolling)i.addClass(b);else i.removeClass(b)}},_clearInterval:function(){var b=this._fields(),a=b.internalFuncID;if(a>0){window.clearInterval(a);b.internalFuncID=-1}},_elementMouseOut:function(d){var b=a(d.currentTarget),c=d.data;b.unbind("mouseout",c._elementMouseOut);b.unbind("mousedown",c._elementMouseDown);b.unbind("mouseup",c._elementMouseUp);b.removeClass(f)},scrollChildIntoView:function(k){var f=a(k),i,d,j,g,h,b,e,c;if(f.size()===0)return;i=this._fields();d=i.contentWrapper;j=i.templateWrapper;b=f.offset();e=j.offset();b.leftWidth=b.left+f.outerWidth();b.topHeight=b.top+f.outerHeight();c=d.offset();c.leftWidth=c.left+d.outerWidth();c.topHeight=c.top+d.outerHeight();if(b.left<c.left)g=b.left-e.left;else if(b.leftWidth>c.leftWidth)g=b.leftWidth-e.left-d.innerWidth();if(b.top<c.top)h=b.top-e.top;else if(b.topHeight>c.topHeight)h=b.topHeight-e.top-d.innerHeight();g!==undefined&&this.hScrollTo(g);h!==undefined&&this.vScrollTo(h)},hScrollTo:function(b){var a=this.options;a.hScroller.scrollValue=this.scrollPxToValue(b,"h");this._setDragAndContentPosition(true,true,"h","nonestop")},vScrollTo:function(b){var a=this.options;a.vScroller.scrollValue=this.scrollPxToValue(b,"v");this._setDragAndContentPosition(true,true,"v","nonestop")},scrollPxToValue:function(o,b){var g=this.options,p=b==="h"?"outerWidth":"outerHeight",n=b==="h"?"contentWidth":"contentHeight",e=b==="h"?"hScroller":"vScroller",f=this._fields(),j=f.contentWrapper,l=f[n],h=j[p](),d=g[e].scrollMin,m=g[e].scrollMax,k=m-d,i=b==="h"?this._getHScrollBarLargeChange():this._getVScrollBarLargeChange(),c=k-i+1,a=c*(o/(l-h));if(a<d)a=d;if(a>c)a=c;return a},scrollTo:function(a,b){this.hScrollTo(a);this.vScrollTo(b)},paintPanel:function(h){var b=this,e=b.element,g,f,c,d;if(e.is(":visible")){g=document.activeElement;f=b.options;c=b._fields();!c.initialized&&b._initialize(c,e,b);b._resetLargeChange(b,c,f);b._bindElementEvents(b,c,e,f);d=c.templateWrapper;d.css({"float":"left",left:"0px",top:"0px",width:"auto",height:"auto"});d.hide();d.show();c.contentWidth=d.width();c.contentHeight=d.height();d.css("float","");b._setRounder(b,e);b._setInnerElementsSize(c,e);if(b._testScroll(b,c,f)===false)return false;b._initScrollBars(b,c,f);b._initScrollButtons(b,c,f);b._trigger("painted");b._paintedMark={date:new Date,mainWidth:e[0].offsetWidth,mainHeight:e[0].offsetHeight,width:c.contentWidth,height:c.contentWidth};g!==undefined&&!h&&a(g).focus();return true}return false},_resetLargeChange:function(d,a,e){var b;if(d._autoVLarge)e.vScroller.scrollLargeChange=null;if(d._autoHLarge)e.hScroller.scrollLargeChange=null;a.vTrackLen=undefined;a.hTrackLen=undefined;if(a.vbarContainer){b=a.vbarContainer.children("."+c+":eq(0)");b.detach();a.vbarContainer.remove();a.vbarContainer=undefined}if(a.hbarContainer){b=a.hbarContainer.children("."+c+":eq(0)");b.detach();a.hbarContainer.remove();a.hbarContainer=undefined}},_initialize:function(b,a,c){b.initialized=true;a.addClass(i);b.oldHeight=a.css("height");var d=a.css("overflow");a.css("overflow","");a.height(a.height());a.css("overflow",d);c._createAdditionalDom(c,b,a)},getContentElement:function(){return this._fields().templateWrapper},_setButtonPosition:function(f,s,g,r,n,d,k){var b=r==="h",q="mouseover."+f.widgetName,i=b?"buttonLeft":"buttonTop",j=b?"buttonRight":"buttonBottom",e=d[i],h=d[j],p,l,c;if(f._hasMode(g,"buttons")||f._hasMode(g,"buttonshover")){p=b?m:o;if(e===undefined){l=a(p).appendTo(k);l.bind(q,f,f._scrollButtonMouseOver);d[i]=e=k.children(b?".wijmo-wijsuperpanel-buttonleft":".wijmo-wijsuperpanel-buttontop");d[j]=h=k.children(b?".wijmo-wijsuperpanel-buttonright":".wijmo-wijsuperpanel-buttonbottom")}c={my:b?"left":"top",of:n,at:b?"left":"top",collision:"none"};a.extend(c,g.decreaseButtonPosition);e.position(c);c={my:b?"right":"bottom",of:n,at:b?"right":"bottom",collision:"none"};a.extend(c,g.increaseButtonPosition);h.position(c)}else if(e!==undefined){e.remove();h.remove();d[i]=d[j]=undefined}},_initScrollButtons:function(a,b,c){var e=b.contentWrapper,d=b.stateContainer;a._setButtonPosition(a,c,c.hScroller,"h",e,b,d);a._setButtonPosition(a,c,c.vScroller,"v",e,b,d)},_getVScrollBarSmallChange:function(){var a=this.options,b;if(!a.vScroller.scrollSmallChange){b=this._getVScrollBarLargeChange();a.vScroller.scrollSmallChange=b/2}return a.vScroller.scrollSmallChange},_getVScrollBarLargeChange:function(){return this._getLargeChange("v")},_getLargeChange:function(q){var f=this,m=f.options,l=f._fields(),c=q==="v",a=c?m.vScroller:m.hScroller,n=c?"innerHeight":"innerWidth",o=c?"contentHeight":"contentWidth",p=c?"_autoVLarge":"_autoHLarge",j,k,i,h,d,g,e,b;if(a.scrollLargeChange)return a.scrollLargeChange;j=a.scrollMax;k=a.scrollMin;i=j-k;h=l.contentWrapper;d=h[n]();g=l[o];e=d/(g-d);b=(i+1)*e/(1+e);if(isNaN(b))b=0;a.scrollLargeChange=b;f[p]=true;return a.scrollLargeChange},_getHScrollBarSmallChange:function(){var a=this.options,b;if(!a.hScroller.scrollSmallChange){b=this._getHScrollBarLargeChange();a.hScroller.scrollSmallChange=b/2}return a.hScroller.scrollSmallChange},_getHScrollBarLargeChange:function(){return this._getLargeChange("h")},_initScrollBars:function(c,q,d){var o=d.hScroller,t=o.scrollMax,u=o.scrollMin,r=t-u,p=d.vScroller,v=p.scrollMax,w=p.scrollMin,s=v-w,a=q.hbarDrag,b=q.vbarDrag,k,i,f,n,j,l,g,e,m,h;if(c.hNeedScrollBar&&a.is(":visible")){k=c._getHScrollBarLargeChange();i=c._getTrackLen("h");f=c._getDragLength(r,k,i,d.hScroller.scrollMinDragLength);a.width(f);n=a.outerWidth(true)-a.width();a.width(f-n);j=a.children("span");j.css("margin-left",(a.width()-j[0].offsetWidth)/2);if(i<=a.outerWidth(true))a.hide();else a.show()}if(c.vNeedScrollBar&&b.is(":visible")){l=c._getVScrollBarLargeChange();g=c._getTrackLen("v");e=c._getDragLength(s,l,g,d.vScroller.scrollMinDragLength);b.height(e);m=b.outerHeight(true)-b.height();b.height(e-m);h=b.children("span");h.css("margin-top",(b.height()-h[0].offsetHeight)/2);if(g<=b.outerHeight(true))b.hide();else b.show()}c._setDragAndContentPosition(false,false,"both")},_getTrackLen:function(f){var e=this,a=e._fields(),d=f+"TrackLen",g,h,c,b;if(a[d]!==undefined)return a[d];g=a.hbarContainer;h=a.vbarContainer;c=0;b=0;if(f==="h"){b=e._getScrollContainerPadding("h");c=g.innerWidth()}if(f==="v"){b=e._getScrollContainerPadding("v");c=h.innerHeight()}a[d]=c-b;return a[d]},_getScrollContainerPadding:function(b){var c=this,d=c._fields(),a=0,f,e;if(b==="h")a=c._getScrollContainerPadding("left")+c._getScrollContainerPadding("right");else if(b==="v")a=c._getScrollContainerPadding("top")+c._getScrollContainerPadding("bottom");else{if(b==="left"||b==="right")f=d.hbarContainer;else f=d.vbarContainer;e=b+"Padding";if(d[e]!==undefined){a=d[e];return a}a=parseFloat(f.css("padding-"+b).replace("px",""));d[e]=a}return a},_contentDragAnimate:function(h,p,C,g,A,t,w){var b=this,f=b.options,d=h==="v",j=d?f.vScroller:f.hScroller,H=d?"outerHeight":"outerWidth",I=d?"innerHeight":"innerWidth",E=d?"contentHeight":"contentWidth",F=d?"top":"left",q=j.scrollMin,K=j.scrollMax,J=K-q,k=j.scrollValue===undefined?q:j.scrollValue-q,D=b._getLargeChange(h),l=J-D+1,s=b._fields(),G=s.contentWrapper,i=s.templateWrapper,c,e,y,z,B,x,n,v,m,o,u,r;if(k>l)k=l;c=(s[E]-G[I]())*(k/l);if(Math.abs(c)<.001)c=0;c=Math.round(c);e=-1;if(C!==undefined){p&&g.is(":animated")&&A!=="nonestop"&&g.stop(true,false);y=b._getTrackLen(h);z=g[H](true);B=y-z;x=b._getScrollContainerPadding(F);e=k/l*B+x}if(p&&f.animationOptions&&!f.animationOptions.disabled){if(e>=0&&w!=="dragging"){n=a.extend({},f.animationOptions);n.complete=undefined;v=d?{top:e}:{left:e};g.animate(v,n)}m=a.extend({},f.animationOptions);o=f.animationOptions.complete;m.complete=function(){b._scrollEnd(t,b,h);a.isFunction(o)&&o(arguments)};p&&i.is(":animated")&&A!=="nonestop"&&i.stop(true,false);u=d?{top:-c}:{left:-c};i.animate(u,m)}else{r=d?"top":"left";if(e>=0&&w!=="dragging")g[0].style[r]=e+"px";i[0].style[r]=-c+"px";b._scrollEnd(t,b,h)}},_setDragAndContentPosition:function(d,e,c,g,f){var b=this,a=b._fields(),h=a.hbarContainer,j=a.hbarDrag,i=a.vbarContainer,k=a.vbarDrag;(c==="both"||c==="h")&&a.hScrolling&&b._contentDragAnimate("h",e,h,j,g,d,f);(c==="both"||c==="v")&&a.vScrolling&&b._contentDragAnimate("v",e,i,k,g,d,f);a.intervalID>0&&window.clearInterval(a.intervalID);a.intervalID=window.setInterval(function(){b._disableButtonIfNeeded(b)},500)},_scrolling:function(d,a,b){var c=true;if(d){b.beforePosition=a.getContentElement().position();a._beforePosition=b.beforePosition;c=a._trigger("scrolling",null,b)}return c},_scrollEnd:function(b,a,c){b&&window.setTimeout(function(){var e=a.getContentElement(),b,d;if(!e.is(":visible"))return;b=a.getContentElement().position();d={dir:c,beforePosition:a._beforePosition,afterPosition:b};a._trigger("scrolled",null,d)},0)},_getDragLength:function(f,d,b,g){var e=f/d,a=b/e,c=g;if(a<c)a=c;else if(a+1>=b)a=b-1;return Math.round(a)},_needScrollbar:function(b,e){var d=this._hasMode(b,"scrollbar"),a=b.scrollBarVisibility,c=d&&(a==="visible"||a==="auto"&&e);return c},_bindBarEvent:function(d,e,c){var b=this;d.bind("mouseover."+b.widgetName,b,b._scrollerMouseOver);e.draggable({axis:c==="h"?"x":"y",drag:function(c,a){b._dragging(c,a,b)},containment:"parent",stop:function(d){b._dragStop(d,b,c);a(d.target).removeClass("ui-state-active")}})},_createBarIfNeeded:function(o,m,f,q,i){if(o){var e=this,r=e.options,j,l=e._fields(),n=f+"barContainer",p=f+"barDrag",b=f==="h",d=i[b?"innerHeight":"innerWidth"](),g=l[n]=a(q),h,k;m.append(g);h=g[0][b?"offsetHeight":"offsetWidth"];d=d-h;j={direction:b?"horizontal":"vertical",targetBarLen:h,contentLength:d};if(e._trigger(b?"hScrollerActivating":"vScrollerActivating",null,j)===false)return false;k=l[p]=g.find("."+c);e._bindBarEvent(g,k,f);i[b?"height":"width"](d)}},_setScrollbarPosition:function(u,p,f,a,s,r,h,q,c,g,t){var b=g==="h",e,m,i,n,j,o,k,l,d;if(r){e=a[0][b?"offsetHeight":"offsetWidth"];m=p._getScrollContainerPadding(g);i=b?"top":"left";n=b?{top:"0px",bottom:"auto",left:"auto",right:"auto"}:{left:"0px",right:"auto",top:"auto",bottom:"auto"};j=b?{top:e+"px"}:{left:e+"px"};o=b?{top:"auto",right:"auto",left:"auto",bottom:"0px"}:{left:"auto",right:"0px",top:"auto",bottom:"auto"};k=b?{top:""}:{left:""};l=f[b?"innerWidth":"innerHeight"]();if(q===i){a.css(n);f.css(j);if(b){a.children(".wijmo-wijsuperpanel-hbar-buttonleft").removeClass("ui-corner-bl").addClass("ui-corner-tl");a.children(".wijmo-wijsuperpanel-hbar-buttonright").removeClass("ui-corner-br").addClass("ui-corner-tr");a.removeClass("ui-corner-bottom").addClass("ui-corner-top")}else{a.children(".wijmo-wijsuperpanel-vbar-buttontop").removeClass("ui-corner-tr").addClass("ui-corner-tl");a.children(".wijmo-wijsuperpanel-vbar-buttonbottom").removeClass("ui-corner-br").addClass("ui-corner-bl");a.removeClass("ui-corner-right").addClass("ui-corner-left")}}else{a.css(o);f.css(k);if(b){a.children(".wijmo-wijsuperpanel-hbar-buttonleft").removeClass("ui-corner-tl").addClass("ui-corner-bl");a.children(".wijmo-wijsuperpanel-hbar-buttonright").removeClass("ui-corner-bl").addClass("ui-corner-br");a.removeClass("ui-corner-top").addClass("ui-corner-bottom")}else{a.children(".wijmo-wijsuperpanel-vbar-buttontop").removeClass("ui-corner-tl").addClass("ui-corner-tr");a.children(".wijmo-wijsuperpanel-vbar-buttonbottom").removeClass("ui-corner-bl").addClass("ui-corner-br");a.removeClass("ui-corner-left").addClass("ui-corner-right")}}d=0;if(h){d=s[0][b?"offsetWidth":"offsetHeight"];if(c==="left")a.css("right","0px");else if(c==="right")a.css("left","0px");else if(c==="top")a.css("bottom","0px");else c==="bottom"&&a.css("top","0px")}if(!b&&h)d=0;a[b?"width":"height"](l-m);p._enableDisableScrollBar(g,a,!t)}else u.css(b?"left":"top","")},_testScroll:function(b,a,g){var d=a.templateWrapper,e=a.contentWrapper,h=a.stateContainer,p=e.innerWidth(),o=e.innerHeight(),r=a.contentWidth,q=a.contentHeight,c,f,i,j,l,m;a.hScrolling=r>p;a.vScrolling=q>o;c=b.hNeedScrollBar=b._needScrollbar(g.hScroller,a.hScrolling);if(b._createBarIfNeeded(c,h,"h",k,e)===false)return false;if(c&&!a.vScrolling){d.css("float","left");a.contentHeight=d.height();a.vScrolling=a.contentHeight>o-a.hbarContainer[0].offsetHeight;d.css("float","")}f=b.vNeedScrollBar=b._needScrollbar(g.vScroller,a.vScrolling);if(b._createBarIfNeeded(f,h,"v",n,e)===false)return false;if(f&&!a.hScrolling){d.css("float","left");a.contentWidth=d.width();a.hScrolling=a.contentWidth>p-a.vbarContainer[0].offsetWidth;d.css("float","");if(a.hScrolling&&!c){c=b.hNeedScrollBar=b._needScrollbar(g.hScroller,a.hScrolling);if(b._createBarIfNeeded(c,h,"h",k,e)===false)return false}}i=a.hbarContainer;j=a.vbarContainer;l=g.hScroller.scrollBarPosition;m=g.vScroller.scrollBarPosition;b._setScrollbarPosition(d,b,e,i,j,c,f,l,m,"h",a.hScrolling);b._setScrollbarPosition(d,b,e,j,i,f,c,m,l,"v",a.vScrolling)},_enableDisableScrollBar:function(f,a,d){if(f==="v"){a[d?"addClass":"removeClass"]("wijmo-wijsuperpanel-vbarcontainer-disabled");a.find("."+e)[d?"addClass":"removeClass"](b)}else if(f==="h"){a[d?"addClass":"removeClass"]("wijmo-wijsuperpanel-hbarcontainer-disabled");a.find("."+e)[d?"addClass":"removeClass"](b)}a.children("."+c)[d?"hide":"show"]()},_initResizer:function(){var b=this,g=b.options,d=b._fields(),f=d.resizer,c,e;if(!f&&g.allowResize){c=g.resizableOptions;e=c.stop;c.stop=function(c){b._resizeStop(c,b);a.isFunction(e)&&e(c)};d.resizer=f=b.element.resizable(c)}if(!g.allowResize&&d.resizer){f.resizable("destroy");d.resizer=null}},_resizeStop:function(b,a){!this.options.autoRefresh&&a.paintPanel(true);a._trigger("resized")},_createAdditionalDom:function(f,b,c){if(!c.attr("tabindex")){c.attr("tabindex","-1");b.tabindex=true}var d=b.stateContainer=a(l),e;b.contentWrapper=d.children();e=b.templateWrapper=b.contentWrapper.children();c.contents().each(function(f,d){var c=a(d);if(c.hasClass("wijmo-wijsuperpanel-header")){b.header=c;return}if(c.hasClass("wijmo-wijsuperpanel-footer")){b.footer=c;return}e[0].appendChild(d)});b.header!==undefined&&c.prepend(b.header);c[0].appendChild(d[0]);b.footer!==undefined&&b.footer.insertAfter(d)},_setRounder:function(e,d){if(this.options.showRounder){d.addClass(h);if(e._rounderAdded)return;if(a.browser.msie)return;var b,c,g,f;b=c="";if(a.browser.webkit){c="WebkitBorderTopLeftRadius";b="WebkitBorderRadius"}else if(a.browser.mozilla){c="MozBorderRadiusBottomleft";b="MozBorderRadius"}else{c="border-top-left-radius";b="border-radius"}g=d.css(c);f=parseInt(g,10);d.css(b,f+1);e._rounderAdded=true;e._radiusKey=b}else d.removeClass(h)},_setInnerElementsSize:function(a,g){var i=a.stateContainer,h=a.contentWrapper,e=0,b,c,d,f;if(a.header!==undefined)e+=a.header.outerHeight();if(a.footer!==undefined)e+=a.footer.outerHeight();b=i[0].style;c=g.innerHeight()-e;d=g.innerWidth();b.display="none";b.height=c+"px";b.width=d+"px";f=h[0].style;f.height=c+"px";f.width=d+"px";b.display=""}})})(jQuery);
+(function(a){"use strict";a.widget("wijmo.wijtextbox",{options:{},_create:function(){var a=this,b=a.element,d=a.element[0].tagName.toLowerCase(),c=a.element.attr("type");c=c==null?"":c.toLowerCase();if(!(d==="input"||d==="textarea"))return;if(!(c==="text"||c==="password"))if(d==="input")return;b.addClass("wijmo-wijtextbox ui-widget ui-state-default ui-corner-all");a.element.bind("mouseover."+a.widgetName,function(){b.addClass("ui-state-hover")}).bind("mouseout."+a.widgetName,function(){b.removeClass("ui-state-hover")}).bind("mousedown."+a.widgetName,function(){b.addClass("ui-state-active")}).bind("mouseup."+a.widgetName,function(){b.removeClass("ui-state-active")}).bind("focus."+a.widgetName,function(){b.addClass("ui-state-focus")}).bind("blur."+a.widgetName,function(){b.removeClass("ui-state-focus")})},destroy:function(){var b=this;b.element.removeClass("ui-widget ui-state-default ui-corner-all ui-state-hover ui-state-active wijmo-wijtextbox").unbind("."+b.widgetName);a.Widget.prototype.destroy.apply(b)}})})(jQuery);
+(function(a){"use strict";a.widget("wijmo.wijdropdown",{options:{zIndex:1e3,showingAnimation:{effect:"blind"},hidingAnimation:{effect:"blind"}},hoverClass:"ui-state-hover",activeClass:"ui-state-active",focusClass:"ui-state-focus",_setOption:function(c,b){a.Widget.prototype._setOption.apply(this,arguments);if(c==="disabled"){this._labelWrap.toggleClass("ui-state-disabled",b);this.element.attr("disabled",b?"disabled":"")}},_create:function(){var a=this,b=a.element;if(b.get(0).tagName.toLowerCase()!=="select")return;a._activeItem=null;a._createSelect();a._bindEvents()},_createSelect:function(){var b=this,c=b.element,k=c.width(),e=k,m=c.is(":visible"),j=c.wrap("<div></div>").parent().addClass("ui-helper-hidden"),g=j.wrap("<div></div>").parent().attr("role","select").addClass("wijmo-wijdropdown ui-widget ui-widwijmo-wijdropdownt-content ui-state-default ui-corner-all ui-helper-clearfix"),h=a('<label class="wijmo-dropdown-label ui-corner-all"></label>').attr("id",c.get(0).id+"_select").attr("name",c.attr("name")||""),i=a("<div></div>").addClass("wijmo-dropdown-trigger ui-state-default ui-corner-right"),d=a('<a href="#"></a>'),f=a("<div>").addClass("wijmo-dropdown"),l=a("<ul></ul>").addClass("wijmo-dropdown-list ui-widget-content ui-widget ui-corner-all ui-helper-reset").appendTo(f);a("<span></span>").addClass("ui-icon ui-icon-triangle-1-s").appendTo(i);k=Math.max(k,g.width());c.get(0).tabIndex!==""&&d.attr("tabindex",c.attr("tabindex"));if(c.get(0).disabled!==false){b.options.disabled=true;d.addClass("ui-state-disabled")}d.append(h);g.append(j).append(d).append(i).append(f);e+=parseInt(h.css("padding-left").replace(/px/,""));e+=parseInt(h.css("padding-right").replace(/px/,""));e-=16;g.width(e);b._buildList(l,f,e);b._rightTrigger=i;b._label=h;b._listContainer=f;b._list=l;b._value=c.val();b._selectWrap=j;b._labelWrap=d;!m&&g.hide()},_buildList:function(c,b,f){var d=this,g=d.element,e;b.show();g.children().each(function(i,h){var b=a(h),f,g,e;if(b.is("option"))c.append(d._buildItem(b));else{f=a('<li class="wijmo-dropdown-optgroup"></li>');g=a("<span>"+b.attr("label")+"</span>").addClass("wijmo-optgroup-header ui-priority-primary");e=a("<ul></ul>").addClass("ui-helper-reset wijmo-dropdown-items");b.children("option").each(function(){e.append(d._buildItem(a(this)))});f.append(g).append(e);c.append(f)}});e=b.height();e=c.outerHeight()<e?c.outerHeight():e;b.css({height:e,width:f});if(b.data("wijsuperpanel")){b.wijsuperpanel("paintPanel");d.superpanel=b.data("wijsuperpanel")}else d.superpanel=b.wijsuperpanel().data("wijsuperpanel");a.fn.bgiframe&&d.superpanel.element.bgiframe();c.setOutWidth(c.parent().parent().innerWidth());b.hide()},_handelEvents:function(d){var a=this,b="."+a.widgetName,c=a.element;d.bind("click"+b,function(b){if(a.options.disabled)return;if(a._listContainer.is(":hidden"))a._show();else a._hide();c.click();if(d.get(0)===a._label.get(0))b.preventDefault();else a._labelWrap.focus()}).bind("mouseover"+b,function(){if(a.options.disabled)return;a._label.addClass(a.hoverClass);a._rightTrigger.addClass(a.hoverClass);c.trigger("mouseover")}).bind("mouseout"+b,function(){if(a.options.disabled)return;a._label.removeClass(a.hoverClass);a._rightTrigger.removeClass(a.hoverClass);c.trigger("mouseout")}).bind("mousedown"+b,function(){if(a.options.disabled)return;a._label.addClass(a.activeClass);a._rightTrigger.addClass(a.activeClass);c.trigger("mousedown")}).bind("mouseup"+b,function(){if(a.options.disabled)return;a._label.removeClass(a.activeClass);a._rightTrigger.removeClass(a.activeClass);c.trigger("mouseup")})},_bindEvents:function(){var b=this,d="."+b.widgetName,h=b._label,g=b._rightTrigger,i=b._labelWrap,e=b._listContainer,c=b.element,f;b._handelEvents(b._label);b._handelEvents(b._rightTrigger);a(document.body).bind("click"+d,function(a){if(e.is(":hidden"))return;f=e.offset();if(a.target===h.get(0)||a.target===g.get(0)||a.target===g.children().get(0))return;(a.pageX<f.left||a.pageX>f.left+e.width()||a.pageY<f.top||a.pageY>f.top+e.height())&&b._hide()});e.bind("click"+d,function(f){var d=a(f.target);if(d.closest("li.wijmo-dropdown-item",a(this)).length>0){b._setValue();e.hide();b.oldVal=c.val();c.val(b._value);b.oldVal!==b._value&&c.trigger("change")}c.click()});i.bind("keydown"+d,function(e){if(b.options.disabled)return;var d=a.ui.keyCode;switch(e.which){case d.UP:case d.LEFT:b.previous();b._setValue();break;case d.DOWN:case d.RIGHT:b.next();b._setValue();break;case d.PAGE_DOWN:b.nextPage();b._setValue();break;case d.PAGE_UP:b.previousPage();b._setValue();break;case d.ENTER:case d.NUMPAD_ENTER:b._setValue();b._listContainer.hide();b.oldVal=c.val();c.val(b._value);b.oldVal!==b._value&&c.trigger("change")}e.which!==d.TAB&&e.preventDefault();c.trigger("keydown")}).bind("focus"+d,function(){if(b.options.disabled)return;h.addClass(b.focusClass);g.addClass(b.focusClass);c.focus()}).bind("blur"+d,function(){if(b.options.disabled)return;h.removeClass(b.focusClass);g.removeClass(b.focusClass);c.trigger("blur")}).bind("keypress"+d,function(){if(b.options.disabled)return;c.trigger("keypress")}).bind("keyup"+d,function(){if(b.options.disabled)return;c.trigger("keyup")})},_init:function(){var a=this;a._initActiveItem();a._activeItem&&a._label.text(a._activeItem.text())},_buildItem:function(d){var f=d.val(),b=d.text(),e=this,c;if(b==="")b="&nbsp;";c=a('<li class="wijmo-dropdown-item ui-corner-all"><span>'+b+"</span></li>").mousemove(function(b){var c=a(b.target).closest(".wijmo-dropdown-item");c!==this.last&&e._activate(a(this));this.last=a(b.target).closest(".wijmo-dropdown-item")}).attr("role","option");c.data("value",f);return c},_show:function(){var d=this,c=d._listContainer,b=d.options.showingAnimation;c.css("z-index","100000");a.browser.msie&&/^[6,7]\.[0-9]+/.test(a.browser.version)&&c.parent().css("z-index","99999");if(b)c.stop().show(b.effect,b.options,b.speed,function(){d._initActiveItem()});else c.show()},_hide:function(){var d=this,b=d._listContainer,c=d.options.hidingAnimation;if(b.is(":hidden"))return;if(c)b.stop(false,true).hide(c.effect,c.options,c.speed,function(){a.isFunction(c.callback)&&c.callback.apply(d,arguments);a.browser.msie&&/^[6,7]\.[0-9]+/.test(a.browser.version)&&b.parent().css("z-index","");b.css("z-index","")});else{a.browser.msie&&a.browser.version==="6.0"&&b.parent().css("z-index","");b.css("z-index","");b.hide()}},_setValue:function(){var a=this,b=a._listContainer,c,d;if(a._activeItem){a._label.text(a._activeItem.text());a._value=a._activeItem.data("value");if(a.superpanel.vNeedScrollBar){c=a._activeItem.offset().top;d=a._activeItem.outerHeight();if(b.offset().top>c)b.wijsuperpanel("scrollTo",0,c-a._list.offset().top);else b.offset().top<c+d-b.innerHeight()&&b.wijsuperpanel("scrollTo",0,c+d-b.height()-a._list.offset().top)}}},_initActiveItem:function(){var b=this;b._value!==undefined&&b._list.find("li.wijmo-dropdown-item").each(function(){a(this).data("value")===b._value&&b._activate(a(this))})},_activate:function(b){var a=this;a._deactivate();a._activeItem=b;a._activeItem.addClass(a.hoverClass).attr("aria-selected",true)},_deactivate:function(){var a=this;a._activeItem&&a._activeItem.removeClass(a.hoverClass).attr("aria-selected",false)},next:function(){this._move("next","first")},previous:function(){this._move("prev","last")},nextPage:function(){this._movePage("first")},previousPage:function(){this._movePage("last")},refresh:function(){var a=this,b;if(!a._list)return;a._listContainer.show();b=a._listContainer.width();a._list.empty();a._buildList(a._list,a._listContainer,b);a._value=a.element.val();a._initActiveItem();a._activeItem&&a._label.text(a._activeItem.text())},_move:function(c,d){var a=this,e,b;if(!a._activeItem){a._activate(a._list.find(".wijmo-dropdown-item:"+d));return}e=a._activeItem[c]().eq(0);if(e.length)b=a._getNextItem(e,c,d);else if(a._activeItem.closest(".wijmo-dropdown-optgroup").length)b=a._getNextItem(a._activeItem.closest(".wijmo-dropdown-optgroup")[c](),c,d);if(b&&b.length)a._activate(b);else a._activate(a._list.find(".wijmo-dropdown-item:"+d))},_movePage:function(d){var b=this,g,e,c,f=d==="first"?"last":"first";if(b.superpanel.vNeedScrollBar){g=b._activeItem.offset().top;e=b.options.height;c=b._list.find(".wijmo-dropdown-item").filter(function(){var c=a(this).offset().top-g+(d==="first"?-e:e)+a(this).height(),b=a(this).height();return c<b&&c>-b});if(!c.length)c=b._list.find(".wijmo-dropdown-item:"+f);b._activate(c)}else b._activate(b._list.find(".wijmo-dropdown-item:"+(!b._activeItem?d:f)))},_getNextItem:function(a,b,c){if(a.length)if(a.is(".wijmo-dropdown-optgroup"))if(!!a.find(">ul>li.wijmo-dropdown-item").length)return a.find(">ul>li.wijmo-dropdown-item:"+c).eq(0);else this._getNextItem(a[b]().eq(0));else return a},destroy:function(){this.element.closest(".wijmo-wijdropdown").find(">div.wijmo-dropdown-trigger,>div.wijmo-dropdown,>a").remove();this.element.unwrap().unwrap().removeData("maxZIndex");a.Widget.prototype.destroy.apply(this)}})})(jQuery);
+(function(a){"use strict";var b=0;a.widget("wijmo.wijcheckbox",{_csspre:"wijmo-checkbox",_init:function(){var d=this,c=d.element,g=d.options,f,i,h,e,j;if(c.is(":checkbox")){if(!c.attr("id")){c.attr("id",d._csspre+b);b+=1}if(c.parent().is("label")){f=c.parent().wrap("<div class='"+d._csspre+"-inputwrapper'></div>").parent().wrap("<div></div>").parent().addClass(d._csspre+" ui-widget");i=c.parent();i.attr("for",c.attr("id"));f.find("."+d._csspre+"-inputwrapper").append(c);f.append(i)}else f=c.wrap("<div class='"+d._csspre+"-inputwrapper'></div>").parent().wrap("<div></div>").parent().addClass(d._csspre+" ui-widget");h=a("label[for='"+c.attr("id")+"']");if(h.length>0){f.append(h);h.attr("labelsign","C1")}c.is(":disabled")&&d._setOption("disabled",true);e=a("<div class='"+d._csspre+"-box ui-widget ui-state-"+(g.disabled?"disabled":"default")+" ui-corner-all'><span class='"+d._csspre+"-icon'></span></div>");j=e.children("."+d._csspre+"-icon");f.append(e);c.data("iconElement",j);c.data("boxElement",e);e.removeClass(d._csspre+"-relative").attr("role","checkbox").bind("mouseover",function(){c.mouseover()}).bind("mouseout",function(){c.mouseout()});(h.length===0||h.html()==="")&&e.addClass(d._csspre+"-relative");c.bind("click.checkbox",function(){d.refresh()}).bind("focus.checkbox",function(){if(g.disabled)return;e.removeClass("ui-state-default").addClass("ui-state-focus")}).bind("blur.checkbox",function(){if(g.disabled)return;e.removeClass("ui-state-focus").not(".ui-state-hover").addClass("ui-state-default")}).bind("keydown.checkbox",function(a){if(a.keyCode===32){if(g.disabled)return;c.attr("checked",!c.get(0).checked);d.refresh()}});f.click(function(){if(g.disabled)return;c.get(0).checked=!c.get(0).checked;d.refresh()});d.refresh();f.bind("mouseover.checkbox",function(){if(g.disabled)return;e.removeClass("ui-state-default").addClass("ui-state-hover")}).bind("mouseout.checkbox",function(){if(g.disabled)return;e.removeClass("ui-state-hover").not(".ui-state-focus").addClass("ui-state-default")})}},refresh:function(){var a=this;a.element.data("iconElement").toggleClass("ui-icon ui-icon-check",a.element.get(0).checked);a.element.data("boxElement").toggleClass("ui-state-active",a.element.get(0).checked).attr("aria-checked",a.element.get(0).checked)},destroy:function(){var b=this,c=b.element.parent().parent();c.children("div."+b._csspre+"-box").remove();b.element.unwrap();b.element.unwrap();a.Widget.prototype.destroy.apply(b)}})})(jQuery);
+(function(a){"use strict";var b=0;a.widget("wijmo.wijradio",{_radiobuttonPre:"wijmo-wijradio",_create:function(){var c=this,d=c.element,f,i,g,e,h;if(d.is(":radio")){if(!d.attr("id")){d.attr("id","wijmo-radio-"+b);b+=1}if(d.parent().is("label")){f=d.parent().wrap("<div class='"+c._radiobuttonPre+"-inputwrapper'></div>").parent().wrap("<div></div>").parent().addClass(c._radiobuttonPre+" ui-widget");i=d.parent();i.attr("for",d.attr("id"));f.find("."+c._radiobuttonPre+"-inputwrapper").append(d);f.append(i)}else f=d.wrap("<div class='"+c._radiobuttonPre+"-inputwrapper'></div>").parent().wrap("<div></div>").parent().addClass(c._radiobuttonPre+" ui-widget");g=a("label[for='"+d.attr("id")+"']");if(g.length>0){f.append(g);g.attr("labelsign","wij")}e=a("<div class='"+c._radiobuttonPre+"-box ui-widget ui-state-default ui-corner-all'><span class='"+c._radiobuttonPre+"-icon'></span></div>");h=e.children("."+c._radiobuttonPre+"-icon");f.append(e);h.addClass("ui-icon ui-icon-radio-on");d.data("iconElement",h);d.data("boxElement",e);d.is(":disabled")&&c._setOption("disabled",true);e.removeClass(c._radiobuttonPre+"-relative").attr("role","radio").bind("mouseover",function(){d.mouseover()}).bind("mouseout",function(){d.mouseout()});(g.length===0||g.html()==="")&&e.addClass(c._radiobuttonPre+"-relative");c._setDefaul();d.bind("click.checkbox",function(){d.focus();c._refresh()}).bind("focus.checkbox",function(){if(c.options.disabled)return;e.removeClass("ui-state-default").addClass("ui-state-focus")}).bind("blur.checkbox",function(){if(c.options.disabled)return;e.removeClass("ui-state-focus").not(".ui-state-hover").addClass("ui-state-default")});f.click(function(){if(g.length===0||g.html()===""){d.attr("checked",true).focus();c._refresh();d.change()}});f.bind("mouseover.checkbox",function(){if(c.options.disabled)return;e.removeClass("ui-state-default").addClass("ui-state-hover")}).bind("mouseout.checkbox",function(){if(c.options.disabled)return;e.removeClass("ui-state-hover").not(".ui-state-focus").addClass("ui-state-default")})}},_setDefaul:function(){if(this.element.attr("checked")){this.element.parents(".wijmo-wijradio").find("."+this._radiobuttonPre+"-box").children().removeClass("ui-icon-radio-on ui-icon-radio-off").addClass("ui-icon-radio-off");this.element.data("boxElement").removeClass("ui-state-default").addClass("ui-state-active").attr("aria-checked",true)}},_refresh:function(){var c=this.element.attr("name")||"",b=this;if(c==="")return;a("[name='"+c+"']").each(function(d,c){a(c).parents(".wijmo-wijradio").find("."+b._radiobuttonPre+"-box").children().removeClass("ui-icon-radio-on ui-icon-radio-off").addClass("ui-icon-radio-on");a(c).parents(".wijmo-wijradio").find("."+b._radiobuttonPre+"-box").removeClass("ui-state-active").addClass("ui-state-default").attr("aria-checked",false)});if(b.element.is(":checked")){b.element.data("iconElement").removeClass("ui-icon-radio-on").addClass("ui-icon-radio-off");b.element.data("boxElement").removeClass("ui-state-default").addClass("ui-state-active").attr("aria-checked",true)}},refresh:function(){this._refresh()},destroy:function(){var b=this,c=b.element.parent().parent();c.children("div."+b._radiobuttonPre+"-box").remove();b.element.unwrap();b.element.unwrap();a.Widget.prototype.destroy.apply(b)}})})(jQuery);
+(function(a){"use strict";var g="ui-widget ui-widget-content ui-corner-all wijmo-wijlist",c="wijmo-wijlist-item",h=c+"-alternate",i=c+"-selected",j=c+"-first",k=c+"-last",f="ui-state-hover",l="ui-state-active",e="wijmo-wijlistitem-active",b=i+" "+l,d="item.wijlist";a.widget("wijmo.wijlist",{options:{listItems:[],selected:null,selectionMode:"single",autoSize:false,maxItemsCount:5,addHoverItemClass:true,superPanelOptions:null,disabled:false,focusing:null,focus:null,blur:null,itemRendering:null,itemRendered:null,listRendered:null,keepHightlightOnMouseLeave:false},removeAll:function(){var a=this;a.items=[];a._refresh()},addItem:function(c,b){var a=this;a._checkData();if(b===null)a.items.push(c);else a.items.splice(b,0,c);a._refresh()},removeItem:function(c){var b=this,a;b._checkData();a=b.indexOf(c);a>=0&&b.removeItemAt(a)},indexOf:function(e){var c=this,d=-1,a=0,b;c._checkData();for(a=0;a<c.items.length;a++){b=c.items[a];if(b.label===e.label&&b.value===e.value){d=a;break}}return d},removeItemAt:function(b){var a=this;a._checkData();a.items.splice(b,1);a._refresh()},_checkData:function(){var a=this;if(a.items===null)a.items=[]},_refresh:function(){var a=this;a.renderList();a.refreshSuperPanel()},_setOption:function(d,c){var b=this;a.Widget.prototype._setOption.apply(b,arguments);d==="disabled"&&b._handleDisabledOption(c,b.element)},_create:function(){var b=this,c=this.element,d=this.options;c.addClass(g).attr({role:"listbox","aria-activedescendant":e,"aria-multiselectable":d.selectionMode==="multiple"}).bind("click."+b.widgetName,b,b._onListClick);if(c.is("div")&&c.children().is("ul")){b._isInnerData=true;b._templates=[];a.each(a("ul > li",c),function(c,a){b._templates.push({templateHtml:a.innerHTML})});b._oriChildren=c.children().hide()}b.ul=a("<ul class='wijmo-wijlist-ul'></ul>").appendTo(c);if(d.listItems!==null)if(d.listItems.length>0){b.setItems(d.listItems);b.renderList();b.refreshSuperPanel()}d.disabled&&b.disable()},_handleDisabledOption:function(b,c){var a=this;if(b){if(!a.disabledDiv)a.disabledDiv=a._createDisabledDiv(c);a.disabledDiv.appendTo("body")}else if(a.disabledDiv){a.disabledDiv.remove();a.disabledDiv=null}},_createDisabledDiv:function(f){var g=this,b=f||g.element,c=b.offset(),e=b.outerWidth(),d=b.outerHeight();return a("<div></div>").addClass("ui-disabled").css({"z-index":"99999",position:"absolute",width:e,height:d,left:c.left,top:c.top})},setTemplateItems:function(a){this._setItemsByExtend(a,true)},setItems:function(a){this._setItemsByExtend(a,false)},_setItemsByExtend:function(c,e){var b=this,d;if(e){if(b._templates&&c&&c.length!==b._templates.length)return;b.items=c;if(!b.items)b.items=[];a.each(b._templates,function(a){if(b.items[a])b.items[a].templateHtml=b._templates[a].templateHtml;else b.items.push({templateHtml:b._templates[a].templateHtml})})}else b.items=c;if(!c)return null;d=a.grep(c,function(a){return a.selected});if(b.options.selectionMode==="single"){b.selectedItems=[];b.selectedItem=d.length>0?d[0]:undefined}else b.selectedItems=d},popItem:function(){var a=this;a._checkData();a.items.pop();a._refresh()},getList:function(){return this.ul},_onListClick:function(b){if(!a(b.target).closest(".wijmo-wijlist-item").length)return;var c=b.data;c.select(b)},destroy:function(){var b=this,c=this.element;b.superPanel!==undefined&&b.superPanel.destroy();c.removeClass(g).removeAttr("role").removeAttr("aria-activedescendant").unbind("."+b.widgetName);b.ul.remove();if(b.disabledDiv){b.disabledDiv.remove();b.disabledDiv=null}b._isInnerData&&b._oriChildren.show();a.Widget.prototype.destroy.apply(b,arguments)},activate:function(d,b,g){var a=this,h,c;a.deactivate();if(b===null||b===undefined)return;if(a._trigger("focusing",d,b)===false)return;h=a.active=b;c=b.element;a.options.addHoverItemClass&&c.addClass(f);c.attr("id",e);g&&a.superPanel!==undefined&&a.superPanel.scrollChildIntoView(c);a._trigger("focus",d,b)},deactivate:function(){var a=this,c=a.active,b;if(!c)return;b=c.element;a._trigger("blur",null,c);b&&b.removeClass(f).removeAttr("id");a.active=undefined},next:function(a){this.move("next","."+c+":first",a)},nextPage:function(){this.superPanel.doScrolling("bottom",true)},previous:function(a){this.move("prev","."+c+":last",a)},previousPage:function(){this.superPanel.doScrolling("top",true)},first:function(){return this.active&&!this.active.element.prev().length},last:function(){return this.active&&!this.active.element.next().length},move:function(h,f,b){var a=this,g,e;if(!a.active){g=a.ul.children(f).data(d);a.activate(b,g,true);return}e=a.active.element[h+"All"]("."+c).eq(0);if(e.length)a.activate(b,e.data(d),true);else a.activate(b,a.element.children(f).data(d),true)},select:function(j,k){var e=this,g=e.active.element,h,c,i,f;if(g===undefined)return;c=g.data(d);i=e.options.selectionMode==="single";if(i){f=e.selectedItem;g.addClass(b).attr("aria-selected","true");c.selected=true;if(f!==undefined&&c!==f){f.selected=false;f.element.removeClass(b).removeAttr("aria-selected")}e.selectedItem=c;h=a.inArray(c,e.items);e._trigger("selected",j,{item:c,previousItem:f,selectedIndex:h,data:k})}else{c.selected=!c.selected;if(c.selected)g.addClass(b).attr("aria-selected","true");else g.removeClass(b).removeAttr("aria-selected","true");e.selectedItems=a.grep(e.items,function(a){return a.selected});e._trigger("selected",j,{item:c,selectedItems:e.selectedItems})}},_findItemsByValues:function(c){var b,d=[];d=a.grep(this.items,function(d){b=false;for(var a=0;a<c.length;a++)if(d.value===c[a])b=true;return b});return d},_findItemsByIndices:function(c){var d=this,e=this.items.length,b=[];a.each(c,function(c,a){a>=0&&a<e&&b.push(d.items[a])});return b},getItems:function(b){var g=this,f,c,d,e;c=a.isArray(b);f=!c&&!isNaN(b)||c&&!isNaN(b[0]);d=c?b:[b];e=f?g._findItemsByIndices(d):g._findItemsByValues(d);return e},selectItems:function(i,g){var c=this,h=this.options.selectionMode==="single",e,d,f;f=c.getItems(i);if(h){if(f.length>0){e=f[0];e.selected=true;e.element.addClass(b)}d=c.selectedItem;if(d){d.selected=false;d.element.removeClass(b)}c.selectedItem=e;g&&c._trigger("selected",null,{item:e,previousItem:d})}else{a.each(f,function(c,a){a.selected=true;a.element.addClass(b)});c.selectedItems=a.grep(c.items,function(a){return a.selected});g&&c._trigger("selected",null,{selectedItems:c.selectedItems})}},unselectItems:function(f){var c=this,g=this.options.selectionMode,d,e;if(g==="single"){d=c.selectedItem;if(d){d.selected=false;d.element.removeClass(b);c.selectedItem=undefined}}else{e=c.getItems(f);a.each(e,function(c,a){a.selected=false;a.element.removeClass(b)});c.selectedItems=a.grep(c.items,function(a){return a.selected})}},renderList:function(){var d=this,g=this.ul,h=this.options,a,b,e,c,f;g.empty();a=d.items;if(a===undefined)return;b=a.length;if(a===undefined||a===null&&b===0)return;e=h.selectionMode==="single";for(c=0;c<b;c++){f=a[c];d._renderItem(g,f,c,e)}if(b>0){a[0].element.addClass(j);a[b-1].element.addClass(k)}d._trigger("listRendered",null,d)},_renderItem:function(k,c,j){var e=this,f=a("<li role='option' class='wijmo-wijlist-item ui-corner-all'></li>"),g,i;c.element=f;c.list=e;if(e._trigger("itemRendering",null,c)===false)return;g=c.label;if(c.templateHtml)g=c.templateHtml;else if(c.text!==undefined)g=c.text;f.bind("mouseover",function(a){e.activate(a,c,false)}).bind("mouseout",function(){!e.options.keepHightlightOnMouseLeave&&e.deactivate()}).data(d,c).append(g).appendTo(k);if(!e._isInnerData){i=c.imageUrl;i!==undefined&&i.length>0&&f.prepend("<img src='"+c.imageUrl+"'>")}if(c.selected){e.activate(null,c,false);f.addClass(b)}j%2===1&&f.addClass(h);e._trigger("itemRendered",null,c)},refreshSuperPanel:function(){var d=this,f=this.element,m=this.options,b=this.ul,n=b.children(".wijmo-wijlist-item:first"),h=null,g,j,k,c,e,i,l;if(!f.is(":visible"))return false;if(m.autoSize)h=n.outerHeight(true)*m.maxItemsCount;h!==null&&f.height(Math.min(h,b.outerHeight()));g=f.innerHeight();j=g/(b.outerHeight()-g);e=101*j/(1+j);k=n.outerHeight()/(b.outerHeight()-g)*(101-e);if(d.superPanel===undefined){i={allowResize:false,keyboardSupport:false,bubbleScrollingEvent:true,hScroller:{scrollBarVisibility:"hidden"},vScroller:{scrollSmallChange:k,scrollLargeChange:e}};a.extend(i,m.superPanelOptions);d.superPanel=f.wijsuperpanel(i).data("wijsuperpanel")}else{c=d.superPanel.options.vScroller;c.scrollLargeChange=e;c.scrollSmallChange=k;d.superPanel.paintPanel()}l=b.css("padding-top");if(l.length>0){c=d.superPanel.options.vScroller;c.firstStepChangeFix=d.superPanel.scrollPxToValue(parseFloat(l),"v")}else c.firstStepChangeFix=0;b.setOutWidth(b.parent().parent().innerWidth())}})})(jQuery);
+(function(a){"use strict";var c={general:0,weekEnd:1,otherMonth:2,outOfRange:4,today:8,custom:16,disabled:32,selected:64,gap:128};a.widget("wijmo.wijcalendar",{options:{culture:"",monthCols:1,monthRows:1,titleFormat:"MMMM yyyy",showTitle:true,displayDate:undefined,dayRows:6,dayCols:7,weekDayFormat:"short",showWeekDays:true,showWeekNumbers:false,calendarWeekRule:"firstDay",minDate:new Date(1900,0,1),maxDate:new Date(2099,11,31),showOtherMonthDays:true,showDayPadding:false,selectionMode:{day:true,days:true},allowPreview:false,allowQuickPick:true,toolTipFormat:"dddd, MMMM dd, yyyy",prevTooltip:"Previous",nextTooltip:"Next",quickPrevTooltip:"Quick Previous",quickNextTooltip:"Quick Next",prevPreviewTooltip:"",nextPreviewTooltip:"",navButtons:"default",quickNavStep:12,direction:"horizontal",duration:250,easing:"easeInQuad",popupMode:false,autoHide:true,customizeDate:null,title:null,beforeSlide:null,afterSlide:null,beforeSelect:null,afterSelect:null,selectedDatesChanged:null},_create:function(){this.element.addClass("wijmo-wijcalendar ui-datepicker-inline ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all").attr("role","grid");this._previewWrapper(this.options.allowPreview);this.element.data("preview.wijcalendar",false)},_init:function(){if(this.options.popupMode){var a={autoHide:!!this.options.autoHide};if(this.options.beforePopup)a.showing=this.options.beforePopup;if(this.options.afterPopup)a.shown=this.options.afterPopup;if(this.options.beforeClose)a.hiding=this.options.beforeClose;var b=this;a.hidden=function(a){b.element.removeData("lastdate.wijcalendar");b.options.afterClose&&b.options.afterClose.call(a)};this.element.wijpopup(a)}this._getSelectedDates();this._getDisabledDates();this._resetWidth();this.refresh();this.element.width(this.element.width()+2)},destroy:function(){a.Widget.prototype.destroy.apply(this,arguments);this.close();this.element.html("");this.element.removeClass("wijmo-wijcalendar ui-datepicker-inline ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all ui-datepicker-multi").removeAttr("role");var b=this;a.each(["preview","disableddates","selecteddates","dragging","lastdate","animating"],function(c,a){b.element.removeData(a+".wijcalendar")});this._previewWrapper(false)},_setOption:function(c,b){a.Widget.prototype._setOption.apply(this,arguments);var d=this;switch(c){case"showWeekDays":case"showWeekNumbers":case"showTitle":case"showOtherMonthDays":case"selectionMode":this.unSelectAll();this._resetWidth();this.refresh();break;case"culture":this.refresh();break;case"allowPreview":this._previewWrapper(b);this.refresh();break;case"monthCols":this._resetWidth();this.refresh();break;case"autoHide":this.element.wijpopup({autoHide:this.options.autoHide});break;case"selectedDates":this._getSelectedDates().setDates(b);this.refresh();break;case"disabledDates":this._getDisabledDates().setDates(b);this.refresh()}},_previewWrapper:function(a){if(a)!this.element.parent().hasClass("wijmo-wijcalendar-preview-wrapper")&&this.element.wrap("<div class='wijmo-wijcalendar-preview-wrapper ui-helper-clearfix'></div>");else this.element.parent().hasClass("wijmo-wijcalendar-preview-wrapper")&&this.element.unwrap()},_isRTL:function(){return!!this._getCulture().isRTL},refresh:function(){this.element.empty().append(this._createCalendar());this.element[(this._isRTL()?"add":"remove")+"Class"]("ui-datepicker-rtl");this._bindEvents()},refreshDate:function(b){if(!this._monthViews)return;if(b<this._groupStartDate||b>this._groupEndDate)return;a.each(this._monthViews,function(){this._refreshDate(b)})},getDisplayDate:function(){var a=this.options.displayDate?this.options.displayDate:new Date;if(b.isSameDate(a,new Date(1900,0,1)))a=new Date;return a},getSelectedDate:function(){var a=this.options.selectedDates;return!a||a.length===0?null:a[0]},selectDate:function(a){a=new Date(a);if(this._getDisabledDates().contains(a))return false;if(a<this.options.minDate||a>this.options.maxDate)return false;this._getSelectedDates().add(a);this.refreshDate(a);return true},unSelectDate:function(a){a=new Date(a);if(this._getDisabledDates().contains(a))return false;if(a<this.options.minDate||a>this.options.maxDate)return false;this._getSelectedDates().remove(a);this.refreshDate(a);return true},unSelectAll:function(){var a=this.options.selectedDates,b;if(a&&a.length>0){this._getSelectedDates().clear();for(b=0;b<a.length;b++)this.refreshDate(a[b])}},_slideToDate:function(a){if(b.isSameMonth(this.getDisplayDate(),a))return;var c=this.element.is(":visible");if(!c)this.options.displayDate=a;else{if(this._trigger("beforeSlide")===false)return;if(this._isSingleMonth())this._playSlideAnimation(a);else this._playMmSlideAnimation(a)}},isPopupShowing:function(){return!!this.options.popupMode?this.element.wijpopup("isVisible"):false},popup:function(a){this._myGrid=undefined;this.refresh();this.element.wijpopup("show",a)},popupAt:function(a,b){this._myGrid=undefined;this.refresh();this.element.wijpopup("showAt",a,b)},close:function(){this.isPopupShowing()&&this.element.wijpopup("hide")},_getCulture:function(a){return Globalize.findClosestCulture(a||this.options.culture)},_getDates:function(b){var c=b.toLowerCase()+".wijcalendar",a=this.element.data(c);if(a===undefined){a=new f(this,b);this.element.data(c,a)}return a},_getDisabledDates:function(){return this._getDates("disabledDates")},_getSelectedDates:function(){return this._getDates("selectedDates")},onDayDragStart:function(a){a.preventDefault();a.stopPropagation();return false},onDayMouseDown:function(b){b.preventDefault();b.stopPropagation();var d=this.options,g=this;if(b.which!==1)return false;var c=this._getCellDate(b.currentTarget);if(c===undefined)return false;if(!d.selectionMode.day)return false;var f={date:c};if(this._trigger("beforeSelect",null,f)===false)return false;(!d.selectionMode.days||!b.metaKey&&!b.shiftKey)&&this.unSelectAll();var e=true;if(!!d.selectionMode.days&&b.shiftKey&&this.element.data("lastdate.wijcalendar"))this._selectRange(this.element.data("lastdate.wijcalendar"),c);else{this.element.data("lastdate.wijcalendar",c);e=this.selectDate(c);this._trigger("selectedDatesChanged",null,{dates:[c]})}if(e){this._trigger("afterSelect",null,f);if(!!d.selectionMode.days){this.element.data("dragging.wijcalendar",true);a(document.body).bind("mouseup."+this.widgetName,function(){a(document.body).unbind("mouseup."+g.widgetName);g.element.data("dragging.wijcalendar",false)})}}return false},onDayClicked:function(c){var b=this._getCellDate(c.currentTarget);if(b===undefined)return false;if(!this.options.selectionMode.day)return false;if(this.isPopupShowing())this.close();else a(c.currentTarget).hasClass("ui-datepicker-other-month")&&this._slideToDate(b);return false},onDayMouseEnter:function(b){a(b.currentTarget).attr("state","hover");this._refreshDayCell(b.currentTarget);if(!!this.element.data("dragging.wijcalendar")){var c=this._getCellDate(b.currentTarget);if(c===undefined)return;this.unSelectAll();this._selectRange(this.element.data("lastdate.wijcalendar"),c,true)}},onDayMouseLeave:function(b){a(b.currentTarget).attr("state","normal");this._refreshDayCell(b.currentTarget)},_selectRange:function(a,e,g){if(a!==undefined&&a!==new Date(1900,1,1)){var c=a,f=e;if(a>e){f=a;c=e}for(var d=[];;){if(c>f)break;this.selectDate(c);d[d.length]=c;c=b.addDays(c,1)}!g&&this.element.removeData("lastdate.wijcalendar");this._trigger("selectedDatesChanged",null,{dates:d})}else{this.selectDate(a);this._trigger("selectedDatesChanged",null,{dates:[a]})}return true},_getCellDate:function(c){var b=a(c).attr("date");return b===undefined?b:new Date(b)},_getParentTable:function(c){var b=a(c).parents("table");return b.length===0?undefined:b.get(0)},_initMonthSelector:function(e){if(a(e).data("cells")!==undefined)return;var d=e.id.split("_");if(d[d.length-1]!=="ms")throw Error.create("not a monthview");var k=d.slice(0,d.length-1).join("_"),c=this._getParentTable(e),h=[],f,g,b,i;if(c){if(c.id!==k)throw Error.create("not a monthview");for(f=0;f<c.rows.length;f++){var j=c.rows[f];for(g=0;g<j.cells.length;g++){b=j.cells[g];if(b){i=a(b).attr("daytype");if(i!==undefined)if(a(b).find("a").hasClass("ui-priority-secondary")===false)if(this._isSelectable(parseInt(i,10)))h[h.length]=b}}}}a(e).data("cells",h)},onMonthSelectorClicked:function(g){this._initMonthSelector(g.currentTarget);var d=a(g.currentTarget).data("cells"),b;this.element.removeData("lastdate.wijcalendar");this.unSelectAll();var c=[];for(b=0;b<d.length;b++){var h=d[b],f=a(h).attr("date");if(f!==undefined){var e=new Date(f);this.selectDate(e);c[c.length]=e}}this._trigger("selectedDatesChanged",null,{dates:c});this.isPopupShowing()&&this.close();return false},onMonthSelectorMouseEnter:function(b){this._initMonthSelector(b.currentTarget);for(var d=a(b.currentTarget).data("cells"),c=0;c<d.length;c++){b.currentTarget=d[c];this.onDayMouseEnter(b)}},onMonthSelectorMouseLeave:function(b){this._initMonthSelector(b.currentTarget);for(var d=a(b.currentTarget).data("cells"),c=0;c<d.length;c++){b.currentTarget=d[c];this.onDayMouseLeave(b)}},_initWeekDaySelector:function(f){if(a(f).data("cells")!==undefined)return;var b=f.id.split("_");if(b[b.length-2]!=="cs")throw Error.create("not a column");var h=parseInt(b[b.length-1],10),k=b.slice(0,b.length-2).join("_"),d=this._getParentTable(f),g=[];if(d){if(d.id!==k)throw Error.create("not a column");var c=0;if(!this._isSingleMonth())c++;if(this.options.showWeekDays)c++;for(;c<d.rows.length;c++){var j=d.rows[c];if(h<j.cells.length){var e=j.cells[h];if(e){var i=a(e).attr("daytype");if(i!==undefined)if(a(e).find("a").hasClass("ui-priority-secondary")===false)if(this._isSelectable(parseInt(i,10)))g[g.length]=e}}}}a(f).data("cells",g)},onWeekDayClicked:function(g){this._initWeekDaySelector(g.currentTarget);var d=a(g.currentTarget).data("cells"),b;this.unSelectAll();var c=[];for(b=0;b<d.length;b++){var h=a(d[b]),f=h.attr("date");if(f!==undefined){var e=new Date(f);this.selectDate(e);c[c.length]=e}}this._trigger("selectedDatesChanged",null,{dates:c});this.isPopupShowing()&&this.close();return false},onWeekDayMouseEnter:function(b){this._initWeekDaySelector(b.currentTarget);for(var d=a(b.currentTarget).data("cells"),c=0;c<d.length;c++){b.currentTarget=d[c];this.onDayMouseEnter(b)}},onWeekDayMouseLeave:function(b){this._initWeekDaySelector(b.currentTarget);for(var d=a(b.currentTarget).data("cells"),c=0;c<d.length;c++){b.currentTarget=d[c];this.onDayMouseLeave(b)}},_initWeekNumberSelector:function(d){if(a(d).data("cells")!==undefined)return;var b=d.id.split("_");if(b[b.length-2]!=="rs")throw Error.create("not a row");var j=parseInt(b[b.length-1],10),k=b.slice(0,b.length-2).join("_"),f=this._getParentTable(d),g=[];if(f){if(f.id!==k)throw Error.create("not a row");var h=f.rows[j];if(h){var e=0;if(this.options.showWeekNumbers)e++;for(;e<h.cells.length;e++){var c=h.cells[e];if(c){var i=a(c).attr("daytype");if(i!==undefined)if(a(c).find("a").hasClass("ui-priority-secondary")===false)if(this._isSelectable(parseInt(i,10)))g[g.length]=c}}}}a(d).data("cells",g)},onWeekNumberClicked:function(g){this._initWeekNumberSelector(g.currentTarget);var d=a(g.currentTarget).data("cells");this.unSelectAll();for(var b=[],c=0;c<d.length;c++){var h=a(d[c]),f=h.attr("date");if(f!==undefined){var e=new Date(f);this.selectDate(e);b[b.length]=e}}this._trigger("selectedDatesChanged",null,{dates:b});this.isPopupShowing()&&this.close();return false},onWeekNumberMouseEnter:function(b){this._initWeekNumberSelector(b.currentTarget);for(var d=a(b.currentTarget).data("cells"),c=0;c<d.length;c++){b.currentTarget=d[c];this.onDayMouseEnter(b)}},onWeekNumberMouseLeave:function(b){this._initWeekNumberSelector(b.currentTarget);for(var d=a(b.currentTarget).data("cells"),c=0;c<d.length;c++){b.currentTarget=d[c];this.onDayMouseLeave(b)}},_isAnimating:function(){return!!this.element.data("animating.wijcalendar")},onPreviewMouseEnter:function(h){if(!!this.element.data("previewContainer"))return;if(this._isAnimating())return;var g=a(h.currentTarget),d=g.attr("id");if(d===undefined)return;var f=this.getDisplayDate(),e=this.options.monthCols*this.options.monthRows;if(d==="prevPreview")e=-e;this.options.displayDate=b.addMonths(f,e);this.element.data("preview.wijcalendar",true);var c=a("<div/>");c.appendTo(document.body);c.hide();c.addClass("wijmo-wijcalendar ui-datepicker-inline ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all");c.append(this._createCalendar());this.options.displayDate=f;this.element.data("preview.wijcalendar",false);this._createMonthViews();c.wijpopup({showEffect:"slide",showOptions:{direction:d==="prevPreview"?"right":"left"},hideEffect:"slide",hideOptions:{direction:d==="prevPreview"?"right":"left"}});c.wijpopup("show",{my:d==="prevPreview"?"right top":"left top",at:d==="prevPreview"?"left top":"right top",of:g});this.element.data("previewContainer",c)},onPreviewMouseLeave:function(c){var f=a(c.currentTarget),d=f.attr("id");if(d===undefined)return;var b=this.element.data("previewContainer");if(b)if(b.wijpopup("isAnimating")){var e=this;window.setTimeout(function(){e.onPreviewMouseLeave(c)},200)}else{b.wijpopup("hide");this.element.removeData("previewContainer")}},_resetWidth:function(){if(!this._myGrid){this.element.css("height","");if(this.options.monthCols>1){this.element.css("width",17*this.options.monthCols+"em");this.element.addClass("ui-datepicker-multi")}else{this.element.css("width","");this.element.removeClass("ui-datepicker-multi")}}},_playMmSlideAnimation:function(f){var i=this.element.width(),g=this.element.height();this.element.height(g);var h=this.getDisplayDate();this.element.wrapInner("<div class='wijmo-wijcalendar-multi-aniwrapper'></div>");var d=this.element.find(">:first-child").width(i).height(g),a=d.clone(false);a.hide();this.options.displayDate=f;this._createMonthViews();a.empty().append(this._createMonthGroup());a.appendTo(this.element);var e=this.options.direction||"horizontal",c=f>h,b=this;this.element.data("animating.wijcalendar",true);d.effect("slide",{mode:"hide",direction:e==="horizontal"?c?"left":"right":c?"up":"down",easing:this.options.easing||"easeOutBack",duration:this.options.duration},function(){d.remove()});a.effect("slide",{direction:e==="horizontal"?c?"right":"left":c?"down":"up",easing:this.options.easing||"easeOutBack",duration:this.options.duration},function(){while(a.parent().is(".wijmo-wijcalendar-multi-aniwrapper"))a.parent().replaceWith(a);a.replaceWith(a.contents());b.element.height("");b._bindEvents();b.element.data("animating.wijcalendar",false);b._trigger("afterSlide")})},_playSlideAnimation:function(m){if(!this._isSingleMonth())return;var f=this,n=this.getDisplayDate(),c=this.element.find(".ui-datepicker-calendar"),b,k;if(c.parent().is(".wijmo-wijcalendar-aniwrapper"))b=c.parent();else{b=a.effects.createWrapper(c).css({overflow:"hidden"});b.removeClass("ui-effects-wrapper");b.addClass("wijmo-wijcalendar-aniwrapper")}if(b.parent().is(".wijmo-wijcalendar-aniwrapper"))k=b.parent();else{k=a.effects.createWrapper(b).css({overflow:"hidden"});k.removeClass("ui-effects-wrapper");k.addClass("wijmo-wijcalendar-aniwrapper")}var l=1;if(this._myGrid)switch(this._myGrid.gridType){case"month":l=1;break;case"year":l=10;break;case"decade":l=100}var i=this.options.direction||"horizontal",g=m>n,d=[];d[d.length]=m;var h=c.outerWidth(),j=c.outerHeight();if(i==="horizontal"){c.width(h).css("float",g?"left":"right");b.width((d.length+1)*h);b.css("left",g?0:-d.length*h).css("position","absolute")}else{b.width(h);b.css("top",g?0:-d.length*j).css("position","absolute");b.height((d.length+1)*j)}a.each(d,function(l,c){if(f._myGrid===undefined){var k=new e(f,c),d=f._customize(k.getHtml(true));if(i==="horizontal")d.width(h).css("float",g?"left":"right").appendTo(b);else d.appendTo(b)}else if(i==="horizontal")a(f._myGrid.getHtml(c,true)).width(h).height(j).css("float",g?"left":"right").appendTo(b);else a(f._myGrid.getHtml(c,true)).height(j).appendTo(b)});this.options.displayDate=m;this._myGrid===undefined&&this._createMonthViews();this._refreshTitle();this.element.data("animating.wijcalendar",true);b.effect("slide",{mode:"hide",direction:i==="horizontal"?g?"left":"right":g?"up":"down",easing:this.options.easing||"easeOutBack",distance:(i==="horizontal"?h:j)*d.length,duration:this.options.duration},function(){c=b.children(":last");while(c.parent().is(".wijmo-wijcalendar-aniwrapper"))c.parent().replaceWith(c);c.css({"float":"",width:""});f._bindEvents();f.element.data("animating.wijcalendar",false);f._trigger("afterSlide")})},onTitleClicked:function(){if(!this.options.allowQuickPick||!this._isSingleMonth())return;if(this._isAnimating())return;if(this._myGrid===undefined)this._myGrid=new g(this);else switch(this._myGrid.gridType){case"month":this._myGrid.gridType="year";break;case"year":this._myGrid.gridType="decade";break;case"decade":return}this._refreshTitle();this.element.width(this.element.width()).height(this.element.height());var c=this.element.find(".ui-datepicker-calendar"),b,e,m=c.outerWidth(),f=c.outerHeight();if(c.parent().is(".wijmo-wijcalendar-aniwrapper"))b=c.parent();else b=a.effects.createWrapper(c).css({overflow:"hidden"}).removeClass("ui-effects-wrapper").addClass("wijmo-wijcalendar-aniwrapper");if(b.parent().is(".wijmo-wijcalendar-aniwrapper"))e=b.parent();else e=a.effects.createWrapper(b).css({overflow:"hidden"}).removeClass("ui-effects-wrapper").addClass("wijmo-wijcalendar-aniwrapper").width(m).height(f);var d=a(this._myGrid.getHtml(true)).css({position:"absolute",top:0,left:0,opacity:0}).appendTo(e).height(f),i=this._myGrid.getSelectedIndex(),l=Math.floor(i/4),o=i-l*4,k=m/4,j=f/3,n={left:k*o,top:j*l,width:k,height:j};c.width("100%").height("100%");b.css({border:"solid 1px #cccccc"});this.element.data("animating.wijcalendar",true);var h=this;b.effect("size",{to:n,duration:this.options.duration||500},function(){b.remove()});d.animate({opacity:1},this.options.duration||500,function(){d.css({position:"",top:"",left:"",filter:""});while(d.parent().is(".wijmo-wijcalendar-aniwrapper"))d.parent().replaceWith(d);h._bindEvents();h.element.data("animating.wijcalendar",false)})},onMyGridClicked:function(o){if(this._myGrid===undefined)return false;if(this._isAnimating())return false;var c=a(o.currentTarget),h=parseInt(c.attr("index"),10);if(this._myGrid.gridType!=="month")if(!h||h===11)return false;!c.hasClass("ui-state-active")&&this._myGrid.select(h);if(this._myGrid.gridType==="decade")this._myGrid.gridType="year";else if(this._myGrid.gridType==="year")this._myGrid.gridType="month";else this._myGrid=undefined;this._refreshTitle();var b=this.element.find(".ui-datepicker-calendar"),j,f,k=b.outerWidth(),i=b.outerHeight();if(b.parent().is(".wijmo-wijcalendar-aniwrapper"))f=b.parent();else f=a.effects.createWrapper(b).css({overflow:"hidden"}).removeClass("ui-effects-wrapper").addClass("wijmo-wijcalendar-aniwrapper").width(k).height(i);var l=a.extend({},c.position(),{width:c.width(),height:c.height()}),g;if(this._myGrid===undefined){this._createMonthViews();var m=this.getDisplayDate(),n=this._getMonthView(m);g=this._customize(n.getHtml(true))}else g=a(this._myGrid.getHtml(true));var d=g.height(i).appendTo(f);j=a.effects.createWrapper(d).css({overflow:"hidden"}).removeClass("ui-effects-wrapper").addClass("wijmo-wijcalendar-aniwrapper").css(a.extend(l,{border:"solid 1px #cccccc",position:"absolute"}));var e=this;this.element.data("animating.wijcalendar",true);j.animate({left:0,top:0,width:k,height:i},this.options.duration||500,function(){});b.animate({opacity:0},this.options.duration||500,function(){b.remove();while(d.parent().is(".wijmo-wijcalendar-aniwrapper"))d.parent().replaceWith(d);e._myGrid===undefined&&e.element.width("").height("");e._bindEvents();e.element.data("animating.wijcalendar",false)});return false},onMyGridMouseEnter:function(d){if(this._myGrid===undefined)return;var c=a(d.currentTarget),b=parseInt(c.attr("index"),10);if(this._myGrid.gridType!=="month"&&(b<0||b>11))return;c.addClass("ui-state-hover")},onMyGridMouseLeave:function(d){if(this._myGrid===undefined)return;var c=a(d.currentTarget),b=parseInt(c.attr("index"),10);if(this._myGrid.gridType!=="month"&&(b<0||b>11))return;c.removeClass("ui-state-hover")},_bindEvents:function(){if(!this.element.data("preview.wijcalendar")&&!this.options.disabled){this.element.find("div .wijmo-wijcalendar-navbutton").unbind().bind("mouseout.wijcalendar",function(){var b=a(this);b.removeClass("ui-state-hover");if(b.hasClass("ui-datepicker-next-hover"))b.removeClass("ui-datepicker-next-hover");else b.hasClass("ui-datepicker-prev-hover")&&b.removeClass("ui-datepicker-prev-hover")}).bind("mouseover.wijcalendar",function(){var b=a(this);b.addClass("ui-state-hover");if(b.hasClass("ui-datepicker-next"))b.addClass("ui-datepicker-next-hover");else b.hasClass("ui-datepicker-prev")&&b.addClass("ui-datepicker-prev-hover")}).bind("click.wijcalendar",a.proxy(this.onNavButtonClicked,this));this.element.find(".ui-datepicker-title").unbind().bind("mouseout.wijcalendar",function(){a(this).removeClass("ui-state-hover")}).bind("mouseover.wijcalendar",function(){a(this).addClass("ui-state-hover")}).bind("click.wijcalendar",a.proxy(this.onTitleClicked,this));this.element.find(".wijmo-wijcalendar-prevpreview-button, .wijmo-wijcalendar-nextpreview-button").unbind("mouseenter.wijcalendar").unbind("mouseleave.wijcalendar").bind({"mouseenter.wijcalendar":a.proxy(this.onPreviewMouseEnter,this),"mouseleave.wijcalendar":a.proxy(this.onPreviewMouseLeave,this)});if(this._myGrid===undefined){this.element.find(".wijmo-wijcalendar-day-selectable").unbind().bind({"click.wijcalendar":a.proxy(this.onDayClicked,this),"mouseenter.wijcalendar":a.proxy(this.onDayMouseEnter,this),"mouseleave.wijcalendar":a.proxy(this.onDayMouseLeave,this),"mousedown.wijcalendar":a.proxy(this.onDayMouseDown,this),"dragstart.wijcalendar":a.proxy(this.onDayDragStart,this)});!!this.options.selectionMode.month&&this.element.find(".wijmo-wijcalendar-monthselector").unbind().bind({"click.wijcalendar":a.proxy(this.onMonthSelectorClicked,this),"mouseenter.wijcalendar":a.proxy(this.onMonthSelectorMouseEnter,this),"mouseleave.wijcalendar":a.proxy(this.onMonthSelectorMouseLeave,this)});!!this.options.selectionMode.weekDay&&this.element.find(".ui-datepicker-week-day").unbind().bind({"click.wijcalendar":a.proxy(this.onWeekDayClicked,this),"mouseenter.wijcalendar":a.proxy(this.onWeekDayMouseEnter,this),"mouseleave.wijcalendar":a.proxy(this.onWeekDayMouseLeave,this)});!!this.options.selectionMode.weekNumber&&this.element.find(".wijmo-wijcalendar-week-num").unbind().bind({"click.wijcalendar":a.proxy(this.onWeekNumberClicked,this),"mouseenter.wijcalendar":a.proxy(this.onWeekNumberMouseEnter,this),"mouseleave.wijcalendar":a.proxy(this.onWeekNumberMouseLeave,this)})}else this.element.find(".wijmo-wijcalendar-day-selectable").unbind().bind({"click.wijcalendar":a.proxy(this.onMyGridClicked,this),"mouseenter.wijcalendar":a.proxy(this.onMyGridMouseEnter,this),"mouseleave.wijcalendar":a.proxy(this.onMyGridMouseLeave,this)})}},_isSelectable:function(a){var b=this.options;return b.showOtherMonthDays&&a&c.otherMonth||!(a&(c.outOfRange|c.disabled|c.otherMonth))},_getCellClassName:function(b,h,e){var f=this.options,a="",d="ui-state-default",g=!!f.selectionMode.day||!!f.selectionMode.days;e=e||false;if(!e&&!f.disabled&&g&&this._isSelectable(b))a+=" wijmo-wijcalendar-day-selectable";if(b&c.weekEnd)a+=" ui-datepicker-week-end";if(b&c.otherMonth){a+=" ui-datepicker-other-month";d+=" ui-priority-secondary"}if(b&c.outOfRange){a+=" wijmo-wijcalendar-outofrangeday";d+=" ui-priority-secondary"}if(b&c.gap)a+=" wijmo-wijcalendar-gap";else{if(b&c.disabled){a+=" ui-datepicker-unselectable";d+=" ui-state-disabled"}if(b&c.today){a+=" ui-datepicker-days-cell-over ui-datepicker-today";d+=" ui-state-highlight"}if(b&c.selected&&(b&(c.outOfRange|c.disabled))===0){a+=" ui-datepicker-current-day";d+=" ui-state-active"}if(b&c.gap)a+=" wijmo-wijcalendar-gap";if(b&c.custom)a+=" wijmo-wijcalendar-customday"}return{cssCell:a,cssText:d}},onNavButtonClicked:function(g){if(this._isAnimating())return false;var c=1,f=a(g.currentTarget).attr("id"),e=this.getDisplayDate(),d=e;if(this._myGrid===undefined){c=f.indexOf("quick")>=0?this.options.quickNavStep:1;c=f.indexOf("next")>=0?c:-c;c=c*this.options.monthRows*this.options.monthCols;d=b.addMonths(e,c)}else{c=f.indexOf("next")>=0?1:-1;switch(this._myGrid.gridType){case"month":d=b.addYears(e,c);break;case"year":d=b.addYears(e,c*10);break;case"decade":d=b.addYears(e,c*100)}}this._slideToDate(d);return false},_getMonthGroupHtml:function(){var f=this.getDisplayDate(),c;if(this._isSingleMonth()){c=this._getMonthView(f);c.showPreview=this.options.allowPreview&&!this.element.data("preview.wijcalendar")&&!this.options.disabled;return c.getHtml()}for(var h=100/this.options.monthCols+"%",a=new d,e,g=0;g<this.options.monthRows;g++){for(e=0;e<this.options.monthCols;e++){a.writeBeginTag("div");a.writeAttribute("class","ui-datepicker-group"+(e===0?" ui-datepicker-group-first":"")+(e===this.options.monthCols-1?" ui-datepicker-group-last":""));a.writeAttribute("style","width:"+h);a.writeTagRightChar();c=this._getMonthView(f);c.showPreview=false;a.write(c.getHtml());a.writeEndTag("div");f=b.addMonths(f,1)}a.writeBeginTag("div");a.writeAttribute("class","ui-datepicker-row-break");a.writeTagRightChar();a.writeEndTag("div")}return a.toString()},_getCalendarHtml:function(){this._createMonthViews();var a=new d;a.write(this._getMonthGroupHtml());return a.toString()},_customizeDayCell:function(a){a.attr("state")===undefined&&a.attr("state","normal");if(a.attr("daytype")===undefined)return;if(a.attr("date")===undefined)return;var b=parseInt(a.attr("daytype"),10),d=new Date(a.attr("date")),c=a.attr("state")==="hover";this.options.customizeDate(a,d,b,c)},_customize:function(c){var e=this.options,d=this,b=a(c);if(!a.isFunction(e.customizeDate))return b;a.each(b.find(".wijmo-wijcalendar-day-selectable"),function(c,b){d._customizeDayCell(a(b))});return b},_createCalendar:function(){return this._customize(a(this._getCalendarHtml()))},_createMonthGroup:function(){return this._customize(a(this._getMonthGroupHtml()))},_getMonthID:function(a){return a.getFullYear()+"_"+(a.getMonth()+1)},_createMonthViews:function(){this._monthViews={};for(var c="",a=this.getDisplayDate(),d,g=0;g<this.options.monthRows;g++)for(d=0;d<this.options.monthCols;d++){c=this._getMonthID(a);this._monthViews[c]=new e(this,a);if(g===0){if(d===0)this._monthViews[c].isFirst=true;if(d===this.options.monthCols-1)this._monthViews[c].isLast=true}a=b.addMonths(a,1)}a=this.getDisplayDate();c=this._getMonthID(a);var f=this._monthViews[c];if(f)this._groupStartDate=f.getStartDate();var h=this.options.monthRows*this.options.monthCols;if(h>1){a=b.addMonths(a,h-1);c=this._getMonthID(a);f=this._monthViews[c]}if(f)this._groupEndDate=f.getEndDate()},_getMonthView:function(b){var a=this._getMonthID(b);return this._monthViews[a]},_getId:function(){return this.element.attr("id")},_getChildElement:function(b){var a=this.element.find("[id*='"+b+"']");return a.length===0?undefined:a},_refreshDayCell:function(f){var b=a(f),i=this.options;b.attr("state")===undefined&&b.attr("state","normal");if(b.attr("daytype")===undefined)return;if(b.attr("date")===undefined)return;var d=parseInt(b.attr("daytype"),10),h=new Date(b.attr("date")),g=b.attr("state")==="hover";b.attr("class",this._getCellClassName(d,h).cssCell);b.removeAttr("aria-selected");d&c.selected&&b.attr("aria-selected",true);if(a.isFunction(i.customizeDate))if(this._customizeDayCell(b))return;var e=b.find("a");if(e.length>0){e.toggleClass("ui-state-hover",g);e.toggleClass("ui-state-active",(d&c.selected)!==0)}},_isSingleMonth:function(){return this.options.monthCols*this.options.monthRows===1},_splitString:function(f,e,b){if(b===undefined)return f.split(e);for(var c=[],d=f.split(e),a=0;a<d.length;a++)if(a>=b)c[b-1]=c[b-1]+e+d[a];else c.push(d[a]);return c},_getNavButtonHtml:function(f,e,c,b){var a=new d;a.writeBeginTag("a");a.writeAttribute("id",f);a.writeAttribute("class",e);a.writeAttribute("role","button");a.writeAttribute("href","#");if(b){a.writeAttribute("title",b);a.writeAttribute("aria-label",b)}a.writeTagRightChar();a.writeBeginTag("span");a.writeAttribute("class",c);a.writeTagRightChar();b&&a.write(b);a.writeEndTag("span");a.writeEndTag("a");return a.toString()},_getTitleText:function(d){if(this._myGrid!==undefined)return this._myGrid.getTitle();else{var b=d||this.getDisplayDate(),c=this.options.titleFormat||"MMMM yyyy";return a.isFunction(this.options.title)?this.options.title(b,c)||this._formatDate(c,b):this._formatDate(c,b)}},_refreshTitle:function(){this.element.find(".ui-datepicker-title").html(this._getTitleText())},_fillTitle:function(a,b){a.writeBeginTag("div");a.writeAttribute("class","ui-datepicker-title wijmo-wijcalendar-title ui-state-default ui-corner-all");a.writeTagRightChar();a.write(this._getTitleText(b));a.writeEndTag("div")},_getHeaderHtml:function(g,e,c){var h=!!this.element.data("preview.wijcalendar"),f=h?"none":this._isSingleMonth()?this.options.navButtons:"default",b=this.element.is(".ui-datepicker-rtl"),a=new d;if(f==="quick"){a.writeBeginTag("div");a.writeAttribute("class","ui-widget-header wijmo-wijcalendar-header ui-helper-clearfix ui-corner-all");a.writeAttribute("role","heading");a.writeTagRightChar();!!e&&a.write(this._getNavButtonHtml("quickprev","wijmo-wijcalendar-navbutton ui-datepicker-prev ui-corner-all","ui-icon ui-icon-seek-"+(b?"next":"prev"),this.options.quickPrevTooltip.replace("#",this.options.quickNavStep)));a.writeBeginTag("div");a.writeAttribute("class","ui-datepicker-header wijmo-wijcalendar-header-inner");a.writeTagRightChar();!!e&&a.write(this._getNavButtonHtml("prev","wijmo-wijcalendar-navbutton ui-datepicker-prev ui-corner-all","ui-icon ui-icon-circle-triangle-"+(b?"e":"w"),this.options.prevTooltip));this._fillTitle(a,g);!!c&&a.write(this._getNavButtonHtml("next","wijmo-wijcalendar-navbutton ui-datepicker-next ui-corner-all","ui-icon ui-icon-circle-triangle-"+(b?"w":"e"),this.options.nextTooltip));a.writeEndTag("div");!!c&&a.write(this._getNavButtonHtml("quicknext","wijmo-wijcalendar-navbutton ui-datepicker-next ui-corner-all","ui-icon ui-icon-seek-"+(b?"prev":"next"),this.options.quickNextTooltip.replace("#",this.options.quickNavStep)));a.writeEndTag("div")}else{a.writeBeginTag("div");a.writeAttribute("class","ui-datepicker-header ui-widget-header ui-datepicker-header ui-helper-clearfix ui-corner-all");a.writeAttribute("role","heading");a.writeTagRightChar();f!=="none"&&!!e&&a.write(this._getNavButtonHtml("prev","wijmo-wijcalendar-navbutton ui-datepicker-prev ui-corner-all","ui-icon ui-icon-circle-triangle-"+(b?"e":"w"),this.options.prevTooltip));this._fillTitle(a,g);f!=="none"&&!!c&&a.write(this._getNavButtonHtml("next","wijmo-wijcalendar-navbutton ui-datepicker-next ui-corner-all","ui-icon ui-icon-circle-triangle-"+(b?"w":"e"),this.options.nextTooltip));a.writeEndTag("div")}return a.toString()},_formatDate:function(c,a){return!b.getTicks(a)?"&nbsp;":Globalize.format(a,c,this._getCulture())}});var d=function(){this._html=[]};d.prototype={_html:null,writeTagLeftChar:function(){this._html[this._html.length]="<"},writeTagRightChar:function(){this._html[this._html.length]=">"},write:function(a){this._html[this._html.length]=" "+a+" "},writeBeginTag:function(a){this._html[this._html.length]="<"+a},writeEndTag:function(a){this._html[this._html.length]="</"+a+">"},writeFullBeginTag:function(a){this._html[this._html.length]="<"+a+">"},writeSelfClosingTagEnd:function(){this._html[this._html.length]="/>"},writeAttribute:function(b,a){if(a===undefined||a===null)return;this._html[this._html.length]=" "+b+'="';this._html[this._html.length]=a;this._html[this._html.length]='"'},clean:function(){this._html=[]},toString:function(){return this._html.join("")}};var b={addDays:function(a,c){var b=new Date(a.getFullYear(),a.getMonth(),a.getDate()+c);if(c)if(b.getDate()===a.getDate()){b=new Date(a.getFullYear(),a.getMonth(),a.getDate());b.setTime(b.getTime()+c*864e5)}return b},addMonths:function(a,b){return new Date(a.getFullYear(),a.getMonth()+b,1)},addYears:function(b,a){return this.addMonths(b,a*12)},getDate:function(a){return new Date(a.getFullYear(),a.getMonth(),a.getDate())},getTicks:function(a){return a.valueOf()},isSameDate:function(a,b){return a.getFullYear()===b.getFullYear()&&a.getMonth()===b.getMonth()&&a.getDate()===b.getDate()},isSameMonth:function(a,b){return a.getFullYear()===b.getFullYear()&&a.getMonth()===b.getMonth()},getDaysInMonth:function(a){return new Date(a.getFullYear(),a.getMonth()+1,0).getDate()},getWeekStartDate:function(a,b){return new Date(a.getFullYear(),a.getMonth(),a.getDate()-(a.getDay()-b+7)%7)},getDayOfYear:function(a){var c=new Date(a.getFullYear(),0,1),b=this.getTicks(a)-this.getTicks(c),d=b/864e5;return Math.floor(d)+1},getFirstDayWeekOfYear:function(b,d){var c=this.getDayOfYear(b)-1,a=b.getDay()-c%7;a=(a-d+14)%7;var e=(c+a)/7;return Math.floor(e)+1},getDayOfWeek:function(b,a){return(b.getDay()-a+7)%7},getWeekOfYearFullDays:function(d,f,b,e){var c=this.getDayOfYear(d)-1,a=this.getDayOfWeek(d,b)-c%7;a=(b-a+14)%7;if(a&&a>=e)a-=7;a=c-a;return a>=0?Math.floor(a/7)+1:this.getWeekOfYearFullDays(this.addDays(d,-(c+1)),f,b,e)},getWeekOfYear:function(b,c,a){switch(c){case"firstDay":return this.getFirstDayWeekOfYear(b,a);case"firstFullWeek":return this.getWeekOfYearFullDays(b,c,a,7);case"firstFourDayWeek":return this.getWeekOfYearFullDays(b,c,a,4)}return this.getFirstDayWeekOfYear(b,a)},getDateToken:function(a){return a.getFullYear()+"_"+a.getMonth()+"_"+a.getDate()}},e=function(c,a){this.calendar=c;if(a===undefined||b.isSameDate(a,new Date(1900,0,1)))a=new Date;this.displayDate=a;this.id=this.calendar._getId()+"_"+this.calendar._getMonthID(a);this.isFirst=false;this.isLast=false;this.showPreview=false;this.culture=this.calendar._getCulture();this._calcDates(this.displayDate)};e.prototype={_calcDates:function(a){var c=b.getDaysInMonth(a);this._startDateInMonth=new Date(a.getFullYear(),a.getMonth(),1);this._endDateInMonth=b.addDays(this._startDateInMonth,c-1);this._startDate=b.getWeekStartDate(this._startDateInMonth,this.culture.calendar.firstDay);this._endDate=b.addDays(this._startDate,this.calendar.options.dayRows*this.calendar.options.dayCols-1)},_isFirstMonth:function(){var a=this.calendar.getDisplayDate();return b.isSameMonth(this._startDateInMonth,a)},_isLastMonth:function(){var a=this.calendar.getDisplayDate();a=new Date(a.getFullYear(),a.getMonth(),1);a=b.addMonths(a,this.calendar.options.monthCols*this.calendar.options.monthRows-1);return b.isSameMonth(this._startDateInMonth,a)},getStartDate:function(){return this._startDate},getEndDate:function(){return this._endDate},_getMonthDate:function(){this._startDateInMonth===undefined&&this._calcDates(this.getDisplayDate());return this._startDateInMonth},_setMonthDate:function(a){this._calcDates(a)},_getWeekDayText:function(c,d){d=d||"short";var b=this.culture.calendar.days,a="";switch(d){case"full":a=b.names[c];break;case"firstLetter":a=b.names[c].substring(0,1);break;case"abbreviated":a=b.namesAbbr[c];break;default:a=b.namesShort[c]}return a},_getRowCount:function(){var a=this.calendar.options;return a.showWeekDays?a.dayRows+1:a.dayRows},_getColCount:function(){var a=this.calendar.options;return a.showWeekNumbers?a.dayCols+1:a.dayCols},_getDayType:function(d){var e=this.calendar.options,a=c.general,h=d.getDay(),m=h===6||h===0,g=d<e.minDate||d>e.maxDate,f=d<this._startDateInMonth||d>this._endDateInMonth,i=g||this.calendar._getDisabledDates().contains(d),j=this.calendar._getSelectedDates().contains(d),n=new Date,l=b.isSameDate(d,n),k=false;if(m)a|=c.weekEnd;if(l)a|=c.today;if(i)a|=c.disabled;if(f)a|=c.otherMonth;if(g)a|=c.outOfRange;if(j)a|=c.selected;if(k)a|=c.custom;if(f&&!e.showOtherMonthDays)a|=c.gap;return a},_refreshDate:function(b){if(b<this._startDate||b>this._endDate)return;var h=this.calendar.options,g=Math.round(Math.abs(b-this._startDate)/864e5),d=Math.floor(g/this.calendar.options.dayCols),c=Math.floor(g%this.calendar.options.dayCols);if(h.showWeekNumbers)c++;if(h.showWeekDays)d++;var e=a("#"+this.id,this.calendar.element).get(0);if(e)if(d<e.rows.length){var i=e.rows[d];if(c<i.cells.length){var f=i.cells[c],j=this._getDayType(b);a(f).attr("daytype",j.toString());this.calendar._refreshDayCell(f)}}},_fillDayCell:function(a,b,k){var j=this.calendar.options,f=null,d=b.getDate().toString(),h=this.calendar._formatDate(j.toolTipFormat||"dddd, MMMM dd, yyyy",b),e=this._getDayType(b),g=this.calendar._isSelectable(e),i=this.calendar._getCellClassName(e,b,k);d=j.showDayPadding&&d.length===1?"0"+d:d;a.writeBeginTag("td");a.writeAttribute("daytype",e.toString());if(g){a.writeAttribute("title",h);a.writeAttribute("aria-label",h)}a.writeAttribute("date",b.toDateString());a.writeAttribute("class",i.cssCell);a.writeAttribute("role","gridcell");!g&&a.writeAttribute("aria-disabled","true");a.writeTagRightChar();if(e&c.gap)a.write("&#160;");else if(f&&f.content)a.write(f.content);else{a.writeBeginTag("a");a.writeAttribute("class",i.cssText);a.writeAttribute("href","#");a.writeAttribute("onclick","return false;");a.writeTagRightChar();a.write(d);a.writeEndTag("a")}a.writeEndTag("td")},getHtml:function(g){g=!!g;var c=this.calendar.options,h=!!this.calendar.element.data("preview.wijcalendar"),a=new d,e,k;!g&&c.showTitle&&a.write(this.calendar._getHeaderHtml(this._startDateInMonth,this.isFirst,this.isLast));if(!g&&!h&&this.showPreview){a.writeBeginTag("div");a.writeAttribute("class","wijmo-wijcalendar-prevpreview-button");a.writeAttribute("role","button");a.writeAttribute("aria-haspopup","true");a.writeAttribute("id","prevPreview");a.writeTagRightChar();a.writeBeginTag("a");a.writeAttribute("class","ui-icon ui-icon-grip-dotted-vertical");a.writeAttribute("href","#");a.writeAttribute("title",c.prevPreviewTooltip);a.writeAttribute("aria-label",c.prevPreviewTooltip);a.writeAttribute("onclick","return false;");a.writeTagRightChar();a.write("&#160;");a.writeEndTag("a");a.writeEndTag("div")}a.writeBeginTag("table");a.writeAttribute("id",this.id);a.writeAttribute("class","ui-datepicker-calendar wijmo-wijcalendar-table");a.writeAttribute("role","grid");a.writeAttribute("summary",this.calendar._getTitleText(this._startDateInMonth));a.writeAttribute("onselectstart","return false;");a.writeTagRightChar();if(c.showWeekDays){a.writeFullBeginTag("thead");a.writeBeginTag("tr");a.writeTagRightChar();if(c.showWeekNumbers){a.writeBeginTag("th");a.writeAttribute("id",this.id+"_ms");a.writeAttribute("class","ui-datepicker-week-col wijmo-wijcalendar-monthselector"+(!!c.selectionMode.month?" wijmo-wijcalendar-selectable":""));a.writeAttribute("role","columnheader");a.writeTagRightChar();if(!!c.selectionMode.month&&!h&&!c.disabled){a.writeBeginTag("a");a.writeAttribute("class","ui-icon ui-icon-triangle-1-se");a.writeSelfClosingTagEnd()}else a.write("Wk");a.writeEndTag("th")}var f=this._startDate.getDay(),l=this._startDate;for(e=0;e<c.dayCols;e++){var q=f===6||f===0,o=e+(c.showWeekNumbers?1:0),r=this._getWeekDayText(f,c.weekDayFormat),m=this._getWeekDayText(f,"full");a.writeBeginTag("th");a.writeAttribute("id",this.id+"_cs_"+o);a.writeAttribute("class","ui-datepicker-week-day"+(q?" ui-datepicker-week-end":"")+(!!c.selectionMode.weekDay?" wijmo-wijcalendar-selectable":""));a.writeAttribute("role","columnheader");a.writeTagRightChar();a.writeBeginTag("span");a.writeAttribute("title",m);a.writeAttribute("aria-label",m);a.writeTagRightChar();a.write(r);a.writeEndTag("span");a.writeEndTag("th");f=(f+1)%7;l=b.addDays(l,1)}a.writeEndTag("tr");a.writeEndTag("thead")}a.writeFullBeginTag("tbody");var j=this._startDate,i=this._startDateInMonth;for(e=0;e<c.dayRows;e++){a.writeBeginTag("tr");a.writeTagRightChar();if(c.showWeekNumbers){var p=e+(c.showWeekDays?1:0);a.writeBeginTag("td");a.writeAttribute("id",this.id+"_rs_"+p);a.writeAttribute("class","ui-datepicker-week-col wijmo-wijcalendar-week-num"+(!!c.selectionMode.weekNumber?" wijmo-wijcalendar-selectable":""));a.writeAttribute("role","rowheader");a.writeTagRightChar();var n=b.getWeekOfYear(i,c.calendarWeekRule,this.culture.calendar.firstDay);a.write(n);a.writeEndTag("td");i=b.addDays(i,c.dayCols)}for(k=0;k<c.dayCols;k++){this._fillDayCell(a,j,h);j=b.addDays(j,1)}a.writeEndTag("tr")}a.writeEndTag("tbody");a.writeEndTag("table");if(!g&&!h&&this.showPreview){a.writeBeginTag("div");a.writeAttribute("class","wijmo-wijcalendar-nextpreview-button");a.writeAttribute("role","button");a.writeAttribute("aria-haspopup","true");a.writeAttribute("id","nextPreview");a.writeTagRightChar();a.writeBeginTag("a");a.writeAttribute("class","ui-icon ui-icon-grip-dotted-vertical");a.writeAttribute("href","#");a.writeAttribute("title",c.nextPreviewTooltip);a.writeAttribute("aria-label",c.nextPreviewTooltip);a.writeAttribute("onclick","return false;");a.writeTagRightChar();a.write("&#160;");a.writeEndTag("a");a.writeEndTag("div")}return a.toString()}};var f=function(b,a){this._calendar=b;this._optionName=a;this._normalize()};f.prototype={_calendar:null,_optionName:"selectedDates",getDates:function(){if(this._calendar.options[this._optionName]===undefined)this._calendar.options[this._optionName]=[];return this._calendar.options[this._optionName]},setDates:function(a){this._calendar.options[this._optionName]=a;this._normalize()},getCount:function(){return this.getDates().length},clear:function(){this.setDates([])},add:function(a){this.addRange(a,a)},remove:function(a){this.removeRange(a,a)},indexOf:function(a){return!this.getCount()?-1:this._findRangeBound(a,true,false)},contains:function(a){return this.indexOf(a)!==-1},removeRange:function(g,d){if(!this.getCount())return;var b=this._findRangeBound(g,false,true),a=this._findRangeBound(d,false,false);if(b<0||a<0)return;if(b>a)return;var c=this.getDates();if(c[a]>d)return;var e=!b?[]:c.slice(0,b),f=a>=c.length-1?[]:c.slice(a+1);this.setDates(e.concat(f))},addRange:function(c,d){this.removeRange(c,d);var g=this.getDates(),e=this._findRangeBound(c,false,true),h=!e?[]:g.slice(0,e),i=g.slice(e),f=[],a;c=b.getDate(c);d=b.getDate(d);for(a=c;a<=d;a=b.addDays(a,1))f[f.length]=a;this.setDates(h.concat(f.concat(i)))},_findRangeBound:function(f,h,g){var e=this.getDates(),c=0,d=e.length,a;while(c<d){a=c+d>>1;if(b.isSameDate(f,e[a]))return a;if(f<e[a])d=a;else c=a+1}return h?-1:g?c:d},_parseDate:function(a){var b;if(!a)a=new Date;else if(typeof a==="string")b=a;if(b){b=b.replace(/-/g,"/");try{a=new Date(b);if(isNaN(a))a=new Date}catch(c){a=new Date}}return a},_normalize:function(){var b=this._calendar.options[this._optionName],d=this;if(a.isArray(b)){var c=a.map(b,function(a){return d._parseDate(a)});this._calendar.options[this._optionName]=c.sort(function(a,b){return a.getTime()-b.getTime()})}}};var g=function(a){this.gridType="month";this.calendar=a;this.culture=a._getCulture()};g.prototype={gridType:"month",selectedIndex:0,calendar:null,culture:undefined,select:function(c){var a=this.calendar.getDisplayDate(),d=a.getFullYear(),b=c-this.selectedIndex;switch(this.gridType){case"month":a.setMonth(c);break;case"year":a.setFullYear(d+b);break;case"decade":a.setFullYear(d+b*10)}this.calendar.options.displayDate=a},getSelectedIndex:function(){var b=this.calendar.getDisplayDate(),a=b.getFullYear(),d=Math.floor(a/10)*10-1,c=Math.floor(a/100)*100-10;switch(this.gridType){case"month":return b.getMonth();case"year":return a-d;case"decade":return Math.floor((a-c)/10)}return 0},getTitle:function(){var d=this.calendar.getDisplayDate(),a=d.getFullYear(),c=Math.floor(a/10)*10-1,b=Math.floor(a/100)*100-10;switch(this.gridType){case"month":return a.toString();case"year":return c+1+" - "+(c+10);case"decade":return b+10+" - "+(b+109)}return""},getHtml:function(e,k){if(e===undefined)e=this.calendar.getDisplayDate();else if(typeof e==="boolean"){k=e;e=this.calendar.getDisplayDate()}k=!!k;var g=this.calendar.options,a=new d;g.showTitle&&!k&&a.write(this.calendar._getHeaderHtml(null,true,true));var p=3,s=4,o=100/p+"%";o="30%";a.writeBeginTag("table");a.writeAttribute("class","ui-datepicker-calendar wijmo-wijcalendar-mygrid");a.writeAttribute("role","grid");a.writeAttribute("onselectstart","return false;");a.writeTagRightChar();for(var i=e.getFullYear(),r=Math.floor(i/10)*10-1,q=Math.floor(i/100)*100-10,t=this.culture.calendar.months,m,n=0;n<p;n++){a.writeBeginTag("tr");a.writeAttribute("height",o);a.writeTagRightChar();for(m=0;m<s;m++){var c=n*4+m,h=false,f=false,l="",b;switch(this.gridType){case"month":if(e.getMonth()===c)h=true;l=t.namesAbbr[c];f=e<g.minDate||e>g.maxDate;break;case"year":if(c===0||c===11)f=true;b=r+c;if(b<g.minDate.getFullYear()||b>g.maxDate.getFullYear())f=true;else h=i===b;l=b.toString();break;case"decade":if(c===0||c===11)f=true;b=q+c*10;if(b<g.minDate.getFullYear()||b>g.maxDate.getFullYear())f=true;else h=i>=b&&i<b+10;l=b.toString()+"-<br/>"+(b+9).toString()}if(h)this.selectedIndex=c;var j="ui-datepicker-week-day";if(f)j=j+" ui-datepicker-other-month  ui-priority-secondary ui-datepicker-unselectable";else if(!g.disabled)j+=" wijmo-wijcalendar-day-selectable";j+=" ui-state-default"+(f?" ui-state-disabled":"")+(h?" ui-state-active ui-state-highlight":"");a.writeBeginTag("td");a.writeAttribute("class",j);a.writeAttribute("role","gridcell");a.writeAttribute("index",c.toString());a.writeAttribute("other",f.toString());a.writeTagRightChar();a.writeBeginTag("a");a.writeAttribute("href","#");a.writeTagRightChar();a.write(l);a.writeEndTag("a");a.writeEndTag("td")}a.writeEndTag("tr")}a.writeEndTag("table");return a.toString()}}})(jQuery);
+(function(a){"use strict";a.widget("wijmo.wijexpander",{options:{allowExpand:true,animated:"slide",contentUrl:"",expanded:true,expandDirection:"bottom"},_setOption:function(c,b){switch(c){case"contentUrl":if(b)this.element.find("> .ui-widget-content").wijContent(b);else this.element.find("> .ui-widget-content").html("");break;case"disabled":if(b)this.element.addClass("ui-state-disabled");else this.element.removeClass("ui-state-disabled");break;case"expandDirection":this._onDirectionChange(b,true,this.options.expandDirection);break;case"expanded":if(b)this.expand();else this.collapse();return}a.Widget.prototype._setOption.apply(this,arguments)},_create:function(){var d=this.element.children(),b,c;this.element.addClass("wijmo-wijexpander ui-expander ui-widget ui-helper-reset ui-expander-icons");b=a(d[0]);c=a(d[1]);if(this.options.expandDirection==="left"||this.options.expandDirection==="top"){b.remove();b.insertAfter(c)}b.addClass("ui-expander-header ui-helper-reset");b.attr("role","tab");c.attr("role","tabpanel");b.find("> a").length===0&&b.wrapInner('<a href="#"></a>');b.find("> .ui-icon").length===0&&a('<span class="ui-icon"></span>').insertBefore(a("> a",b)[0]);c.addClass("ui-expander-content ui-helper-reset ui-widget-content")},_init:function(){var b=this.options;this._onDirectionChange(b.expandDirection,false);b.contentUrl&&a(".ui-widget-content",this.element).wijContent(this.options.contentUrl);if(!b.expanded){this.element.find("> .ui-widget-content").hide();this.element.find("> .ui-expander-header").addClass("ui-state-default ui-corner-all").attr({"aria-expanded":"false",tabIndex:-1}).find("> .ui-icon").addClass(this._triangleIconClosed)}else{this.element.find("> .ui-expander-header").addClass("ui-state-active").attr({"aria-expanded":"true",tabIndex:0}).addClass(this._headerCornerOpened).find("> .ui-icon").addClass(this._triangleIconOpened);this.element.find("> .ui-widget-content").addClass("ui-expander-content-active").addClass(this._contentCornerOpened)}b.disabled&&this.element.addClass("ui-state-disabled");this._bindLiveEvents()},destroy:function(){this._unbindLiveEvents();this.element.removeClass("wijmo-wijexpander ui-expander ui-widget ui-helper-reset ui-expander-icons");a.Widget.prototype.destroy.apply(this,arguments)},_bindLiveEvents:function(){a(".ui-expander-header",this.element[0]).live("click.wijexpander",jQuery.proxy(this._onHeaderClick,this)).live("mouseenter.wijexpander",function(){a(this).addClass("ui-state-hover")}).live("mouseleave.wijexpander",function(){a(this).removeClass("ui-state-hover")}).live("focus.wijexpander",function(){a(this).addClass("ui-state-focus")}).live("blur.wijexpander",function(){a(this).removeClass("ui-state-focus")})},_unbindLiveEvents:function(){a(".ui-expander-header",this.element[0]).die(".wijexpander")},_onDirectionChange:function(l,g,j){var b,i,h,f,e,k,d,c;j&&j!==l&&this.element.removeClass("ui-expander-"+j);if(g){i=this.element.find(".ui-expander-header."+this._headerCornerOpened);i.removeClass(this._headerCornerOpened);h=this.element.find(".ui-widget-content."+this._contentCornerOpened);h.removeClass(this._contentCornerOpened);f=this.element.find("."+this._triangleIconOpened);e=this.element.find("."+this._triangleIconClosed);f.removeClass(this._triangleIconOpened);e.removeClass(this._triangleIconClosed)}switch(l){case"top":this._headerCornerOpened="ui-corner-bottom";this._contentCornerOpened="ui-corner-top";this._triangleIconOpened="ui-icon-triangle-1-n";this._triangleIconClosed="ui-icon-triangle-1-e";b=true;this.element.removeClass("ui-helper-horizontal");this.element.addClass("ui-expander-top");break;case"right":this._headerCornerOpened="ui-corner-left";this._contentCornerOpened="ui-corner-right";this._triangleIconOpened="ui-icon-triangle-1-e";this._triangleIconClosed="ui-icon-triangle-1-s";b=false;this.element.addClass("ui-helper-horizontal");this.element.addClass("ui-expander-right");break;case"left":this._headerCornerOpened="ui-corner-right";this._contentCornerOpened="ui-corner-left";this._triangleIconOpened="ui-icon-triangle-1-w";this._triangleIconClosed="ui-icon-triangle-1-s";b=true;this.element.addClass("ui-helper-horizontal");this.element.addClass("ui-expander-left");break;default:this._headerCornerOpened="ui-corner-top";this._contentCornerOpened="ui-corner-bottom";this._triangleIconOpened="ui-icon-triangle-1-s";this._triangleIconClosed="ui-icon-triangle-1-e";b=false;this.element.removeClass("ui-helper-horizontal");this.element.addClass("ui-expander-bottom")}k=this.element.data("rightToLeft");this.element.data("rightToLeft",b);if(g){f.addClass(this._triangleIconOpened);e.addClass(this._triangleIconClosed);i.addClass(this._headerCornerOpened);h.addClass(this._contentCornerOpened)}g&&b!==k&&this.element.children(".ui-expander-header").each(function(){c=a(this);if(b){d=c.next(".ui-expander-content");c.remove();c.insertAfter(d)}else{d=c.prev(".ui-expander-content");c.remove();c.insertBefore(d)}})},collapse:function(){var d=this.options,e,c,f,b;if(!d.allowExpand)return;if(this.element.hasClass("ui-state-disabled"))return false;if(!this._trigger("beforeCollapse"))return false;if(d.animated){e={expand:false,content:this.element.find("> .ui-widget-content"),complete:jQuery.proxy(function(){this.element.find("> .ui-widget-content").removeClass("ui-expander-content-active");this._trigger("afterCollapse");this.element.find("> .ui-widget-content").css("display","")},this),horizontal:this.element.hasClass("ui-helper-horizontal")};c=a.wijmo.wijexpander.animations;f=d.duration;b=d.animated;if(b&&!c[b]&&!a.easing[b])b="slide";if(!c[b])c[b]=function(a){this.slide(a,{easing:b,duration:f||700})};c[b](e)}else{this.element.find("> .ui-widget-content").hide();this._trigger("afterCollapse")}this.element.find("> .ui-expander-header").removeClass("ui-state-active").removeClass(this._headerCornerOpened).attr({"aria-expanded":"false",tabIndex:-1}).addClass("ui-state-default ui-corner-all").find("> .ui-icon").removeClass(this._triangleIconOpened).addClass(this._triangleIconClosed);this.options.expanded=false;return true},expand:function(){var d=this.options,e,c,f,b;if(!d.allowExpand)return;if(this.element.hasClass("ui-state-disabled"))return false;if(!this._trigger("beforeExpand"))return false;if(d.animated){e={expand:true,content:this.element.find("> .ui-widget-content"),complete:jQuery.proxy(function(){this.element.find("> .ui-widget-content").addClass("ui-expander-content-active").addClass(this._contentCornerOpened);this._trigger("afterExpand");this.element.find("> .ui-widget-content").css("display","")},this),horizontal:this.element.hasClass("ui-helper-horizontal")};c=a.wijmo.wijexpander.animations;f=d.duration;b=d.animated;if(b&&!c[b]&&!a.easing[b])b="slide";if(!c[b])c[b]=function(a){this.slide(a,{easing:b,duration:f||700})};c[b](e)}else{this.element.find("> .ui-widget-content").show();this._trigger("afterExpand")}this.element.find("> .ui-expander-header").removeClass("ui-state-default ui-corner-all").addClass("ui-state-active").addClass(this._headerCornerOpened).attr({"aria-expanded":"true",tabIndex:0}).find("> .ui-icon").removeClass(this._triangleIconClosed).addClass(this._triangleIconOpened);this.options.expanded=true;return true},_onHeaderClick:function(){this.option("expanded",!this.options.expanded);return false}});a.extend(a.wijmo.wijexpander,{animations:{slide:function(b,c){b=a.extend({easing:"swing",duration:300},b,c);if(b.expand)b.content.stop(true,true).animate(b.horizontal?{width:"show",opacity:"show"}:{height:"show",opacity:"show"},b);else b.content.stop(true,true).animate(b.horizontal?{width:"hide",opacity:"hide"}:{height:"hide",opacity:"hide"},b)}}})})(jQuery);
+(function(a){"use strict";var b="wijmo-wijmenu-item";a.widget("wijmo.wijmenu",{options:{trigger:"",triggerEvent:"click",position:{},animation:{animated:"slide",duration:400,easing:null},showAnimation:{},hideAnimation:{animated:"fade",duration:400,easing:null},showDelay:400,hideDelay:400,slidingAnimation:{duration:400,easing:null},mode:"flyout",superPanelOptions:null,checkable:false,orientation:"horizontal",maxHeight:200,backLink:true,backLinkText:"Back",topLinkText:"All",crumbDefaultText:"Choose an option",select:null,focus:null,blur:null,showing:null},_preventEvent:function(a){a.preventDefault();a.stopImmediatePropagation()},_create:function(){var b=this,g=b.options,h=g.orientation,d=g.mode,k,f,j=b.element,c,i,e=a.ui.keyCode;j.hide();b.cssPre="wijmo-wijmenu";b.nowIndex=9999;b.activeItem=null;b.refresh();j.attr("tabIndex",0);g.disabled&&b.disable();j.bind("keydown.wijmenu",function(l){if(g.disabled)return;var m=b.activeItem,n,o;if(m)n=b._isRoot(m.parent());else n=true;switch(l.keyCode){case e.PAGE_UP:b.previousPage(l);b._preventEvent(l);break;case e.PAGE_DOWN:b.nextPage(l);b._preventEvent(l);break;case e.UP:if(h==="vertical"||d==="sliding"||!n){b.previous(l);b._preventEvent(l)}break;case e.DOWN:if(h==="vertical"||d==="sliding"||!n){b.next(l);b._preventEvent(l)}else if(m)if(d==="flyout"&&m.has("ul").length>0){c=m.find("ul:first");if(c.is(":hidden")){b._showFlyoutSubmenu(l,m,c);b.activate(l,c.children(".wijmo-wijmenu-item:first"))}}break;case e.RIGHT:if(h==="horizontal"&&n&&d==="flyout"){b.next(l);b._preventEvent(l)}else if(m)if(d==="flyout"&&m.has("ul").length>0){c=m.find("ul:first");if(c.is(":hidden")){b._showFlyoutSubmenu(l,m,c);b.activate(l,c.children(".wijmo-wijmenu-item:first"))}}else if(d==="sliding"){c=m.find("ul:first");if(c.length>0){m.children(":first").trigger("click");b.activate(l,c.children(".wijmo-wijmenu-item:first"))}}break;case e.LEFT:if(h==="horizontal"&&n&&d==="flyout"){b.previous(l);b._preventEvent(l)}else{k=m.parent();f=k.parent();if(d==="flyout"){if(f.is("li")){b._hideCurrentSubmenu(f);b.activate(l,f)}}else{if(g.backLink&&b._backLink&&b._backLink.is(":visible")){b._backLink.trigger("click");b.activate(l,f)}i=a(".wijmo-wijmenu-breadcrumb",b.domObject.menucontainer).find("li a");if(i.length>0){i.eq(i.length-2).trigger("click");b.activate(l,f);j.focus()}}}break;case e.ENTER:if(!m)return;if(d==="flyout"){o=m.children(":first");o.focus();o.trigger("click")}else{b.select();b._preventEvent(l)}}})},_handleDisabledOption:function(b,c){var a=this;if(b){if(!a.disabledDiv)a.disabledDiv=a._createDisabledDiv(c);a.disabledDiv.appendTo("body")}else if(a.disabledDiv){a.disabledDiv.remove();a.disabledDiv=null}},_createDisabledDiv:function(d){var g=this,b=d?d:g.element,c=b.offset(),f=b.outerWidth(),e=b.outerHeight();return a("<div></div>").addClass("ui-disabled").css({"z-index":"99999",position:"absolute",width:f,height:e,left:c.left,top:c.top})},_isRoot:function(a){return this.rootMenu.get(0)===a.get(0)},_destroy:function(){var a=this,b=a.options;a[b.mode==="flyout"?"_killFlyout":"_killDrilldown"]();a._killmenuItems();a._killtrigger();if(a.element.is("ul"))a.element.unwrap().unwrap();else a.element.unwrap();a.element.removeData("domObject").removeData("topmenu").removeData("firstLeftValue")},destroy:function(){var b=this;this._destroy();if(b.disabledDiv){b.disabledDiv.remove();b.disabledDiv=null}a.Widget.prototype.destroy.apply(this)},activate:function(d,c){var a=this,e=a.domObject.scrollcontainer,b=c.eq(0);if(a.activeItem&&a.activeItem.get(0)===b.get(0))return;a.deactivate(d);a._trigger("focus",d,{item:c});a.options.mode==="sliding"&&e.wijsuperpanel("scrollChildIntoView",c);b.children(":first").addClass("ui-state-focus").end();a.element.removeAttr("aria-activedescendant");a.element.attr("aria-activedescendant",b.attr("id"));a.activeItem=b},deactivate:function(){var a=this,b=a.activeItem;if(!b)return;b.children(":first").removeClass("ui-state-focus").removeAttr("id");a._trigger("blur");a.activeItem=null},next:function(a){this._move("next","."+b+":first",a)},previous:function(a){this._move("prev","."+b+":last",a)},first:function(){var a=this.activeItem;return a&&!a.prevAll("."+b).length},last:function(){var a=this.activeItem;return a&&!a.nextAll("."+b).length},nextPage:function(f){var b=this,c=b.activeItem,d=c.parent(),h,g,e;if(b.options.mode==="sliding"&&b._hasScroll()){if(!c||b.last()){b.activate(f,d.children(":first"));return}h=c.offset().top;g=b.options.maxHeight;e=d.children("li").filter(function(){var b=a(this),d=g-(b.offset().top-h+b.height()),c=b.height();return d<c&&d>-c});if(!e.length)e=d.children(":last");b.activate(f,e.last())}else b.activate(f,d.children(!c||b.last()?":first":":last"))},previousPage:function(f){var b=this,c=b.activeItem,d=c.parent(),h,g,e;if(b.options.mode==="sliding"&&b._hasScroll()){if(!c||b.first()){b.activate(f,d.children(":last"));return}h=c.offset().top;g=b.options.maxHeight;e=d.children("li").filter(function(){var b=a(this),d=b.offset().top-h+g-b.height(),c=b.height();return d<c&&d>-c});if(!e.length)e=d.children(":first");b.activate(f,e.first())}else b.activate(f,d.children(!c||b.first()?":last":":first"))},select:function(b){var a=this;a._trigger("select",b,{item:a.activeItem});a._setCheckable()},setItemDisabled:function(d,b){var c=a(d,this.element);c.is("item>a").attr("disabled",b);c.find(">a").toggleClass(b)},_setCheckable:function(){this.options.checkable&&this.activeItem.children(":first").toggleClass("ui-state-active")},_setOption:function(a,b){var c=this;this["_set_"+a]&&this["_set_"+a](b);this.options[a]=b;a==="disabled"&&c._handleDisabledOption(b,c.domObject.menucontainer)},_set_mode:function(a){this._destroy();this.options.mode=a;this.refresh()},_set_orientation:function(d){var b=this,c=b.domObject.menucontainer;c.removeClass(b.cssPre+"-vertical "+b.cssPre+"-horizontal");if(b.options.mode==="flyout"){c.addClass(b.cssPre+"-"+d);a(">li:has(ul)",b.rootMenu).each(function(){var b="ui-icon-triangle-1-",e=d==="horizontal"?"e":"s",c=d==="horizontal"?"s":"e";a(">.wijmo-wijmenu-link",this).find("."+b+e).removeClass(b+e+" "+b+c).addClass(b+c)})}else c.addClass(b.cssPre+"-vertical")},_getTriggerEle:function(){return a(this.options.trigger).filter(function(){return a(this).closest(".wijmo-wijmenu").length===0})},_set_triggerEvent:function(d){var a=this,c=a.options,b=a._getTriggerEle();a._killtrigger();c.triggerEvent=d;b.length>0&&a._initTrigger(b);if(c.mode==="flyout"){a._killFlyout();a._flyout()}},_set_trigger:function(d){var a=this,c=a.options,b=a._getTriggerEle();a._killtrigger();c.trigger=d;b.length>0&&a._initTrigger(b);if(c.mode==="flyout"){a._killFlyout();a._flyout()}},_initTrigger:function(b){var g=this.options,f=g.triggerEvent,d=this,c=d.domObject.menucontainer,e=".wijmenu";if(b.is("iframe"))b=a(b.get(0).contentWindow.document);switch(f){case"click":b.bind(f+e,function(a){g.mode!=="popup"&&d._displaySubmenu(a,b,c)});break;case"mouseenter":b.bind(f+e,function(a){d._displaySubmenu(a,b,c)});break;case"dblclick":b.bind(f+e,function(a){d._displaySubmenu(a,b,c)});break;case"rtclick":b.bind("contextmenu"+e,function(a){c.hide();d._displaySubmenu(a,b,c);a.preventDefault()})}},_killtrigger:function(){var c=this.options,b;if(c.trigger!==""){b=a(c.trigger);b&&b.length>0&&b.unbind(".wijmenu")}},_move:function(h,g,d){var c=this.activeItem,e,f;if(!c){this.activate(d,this.rootMenu.children(g));return}e=a(c)[h+"All"]("."+b).eq(0);f=c.parent();if(e.length)this.activate(d,e);else this.activate(d,f.children(g))},refresh:function(){var c=this,g=c.element,e="wijmo-wijmenu",d=c.options,h,f,m,i,l,n=e+"-separator ui-state-default ui-corner-all",o="ui-widget-header ui-corner-all",j="ui-widget "+b+" ui-state-default ui-corner-all",k=e+"-link ui-corner-all";c.domObject&&c._destroy();if(g.is("ul")){c.rootMenu=g;h=g.wrap("<div></div>").parent();f=h.wrap("<div></div>").parent()}else if(g.is("div")){c.rootMenu=a("ul:first",g);h=g;f=g.wrap("<div></div>").parent()}h.addClass("scrollcontainer checkablesupport");f.addClass("ui-widget ui-widget-header "+e+" ui-corner-all ui-helper-clearfix").attr("aria-activedescendant","ui-active-menuitem");d.orientation==="horizontal"&&d.mode==="flyout"&&f.addClass(e+"-"+d.orientation);m={scrollcontainer:h,menucontainer:f};c.domObject=m;c.rootMenu.data("topmenu",true);!c.rootMenu.hasClass(e+"-list ui-helper-reset")&&c.rootMenu.addClass(e+"-list ui-helper-reset");a("li",c.rootMenu).each(function(m,l){var i=a(">ul:first",l).length>0,f=a(l),g,c=a(">:first",f),h;if(c.length===0)f.addClass(n);else{f.attr("role","menuitem");h=c.hasClass("ui-state-disabled");if(c.is("a")){c.bind("mouseenter.wijmenuitem",function(){if(d.disabled||h)return;a(this).addClass("ui-state-hover")}).bind("mouseleave.wijmenuitem",function(){if(d.disabled||h)return;a(this).removeClass("ui-state-hover");a(this).data("subMenuOpened")&&a(this).addClass("ui-state-active")});if(!f.hasClass(b)){f.addClass(j);c.addClass(k);c.wrapInner("<span>").children("span").addClass(e+"-text");if(i){g=a("<span>").addClass("ui-icon ui-icon-triangle-1-e");c.append(g)}}}else if(c.is("h1,h2,h3,h4,h5"))f.addClass(o);else{f.addClass(j);c.addClass(k);if(i)if(!c.is(":input")){g=a("<span>").addClass("ui-icon ui-icon-triangle-1-e");c.append(g)}}}});g.show();a("ul",c.rootMenu).each(function(){a(this).addClass(e+"-list ui-widget-content ui-corner-all ui-helper-clearfix "+e+"-child ui-helper-reset");a(this).hide()});this[d.mode==="flyout"?"_flyout":"_drilldown"]();if(d.trigger!==""){i=c._getTriggerEle();if(i.length>0){f.hide();c._initTrigger(i)}}a(document).bind("click.wijmenudoc",function(b){if(a(b.target).parent().is(".wijmo-wijmenu-all-lists"))return;var e=a(b.target).closest(".wijmo-wijmenu");if(e.length===0){if(d.mode==="sliding"){l=a(".wijmo-wijmenu-breadcrumb",f);if(d.trigger==="")return;c._resetDrilldownMenu(l)}else if(d.mode==="flyout"&&d.triggerEvent!=="mouseenter"){c._hideAllMenus();return}i&&i.length>0&&c._hideSubmenu(f)}})},_showFlyoutSubmenu:function(f,d,e){var c=this,b=c.currentMenuList,a;if(b!==undefined)for(a=b.length;a>0;a--)if(b[a-1].get(0)===d.parent().get(0))break;else c._hideSubmenu(b[a-1]);c._displaySubmenu(f,d.find(".wijmo-wijmenu-link:eq(0)"),e)},_getItemTriggerEvent:function(d){var e=this,b=e.options,c="default",f;if(b.trigger!=="")if(d.is(b.trigger)||e.element.is(b.trigger))c=b.triggerEvent;else{d.parents(".wijmo-wijmenu-parent").each(function(e,d){if(a(d).is(b.trigger)){c=b.triggerEvent;return false}});if(c==="default"){f=e._getTriggerEle();if(f.length>0)c=b.triggerEvent}}d.data("triggerEvent",c);return c},_flyout:function(){var b=this,g=b.domObject.menucontainer,c=b.options,d="wijmo-wijmenu-link",h="ui-icon-triangle-1-e",i="ui-icon-triangle-1-s",e="wijmo-wijmenu-parent",f;g.attr("role","menu");if(c.orientation==="horizontal"){g.attr("role","menubar");b.rootMenu.children("li:has(ul)").each(function(){a(this).children("."+d).find("."+h).removeClass(h).addClass(i)})}g.find("li:has(ul)").each(function(){var h=".wijmenu",g=a(this).attr("aria-haspopup",true),k,j,l=b._getItemTriggerEvent(g),f,i;g.children("ul").bind("mouseleave."+h,function(){if(c.disabled)return;var d=a(this).parent();j=setTimeout(function(){b._hideCurrentSubmenu(d)},c.hideDelay)});if(l!=="default"&&c.triggerEvent!=="mouseenter"){g.removeClass(e).addClass(e);f=a(this).find("."+d+":eq(0)");i=f.next();switch(c.triggerEvent){case"click":f.bind("click"+h,function(d){if(c.disabled||a(this).hasClass("ui-state-disabled"))return;b._showFlyoutSubmenu(d,g,i)});break;case"dblclick":f.bind("dblclick"+h,function(d){if(c.disabled||a(this).hasClass("ui-state-disabled"))return;b._showFlyoutSubmenu(d,g,i)});break;case"rtclick":f.bind("contextmenu"+h,function(d){if(c.disabled||a(this).hasClass("ui-state-disabled"))return;b._showFlyoutSubmenu(d,g,i);d.preventDefault()})}i.data("notClose",true)}else{g.removeClass(e).addClass(e);f=a(this).find("."+d+":eq(0)");f.bind("mouseenter.wijmenu",function(f){if(c.disabled||a(this).hasClass("ui-state-disabled"))return;clearTimeout(j);var d=a(this).next(),e=a(this);k=setTimeout(function(){b._displaySubmenu(f,e,d)},c.showDelay)}).bind("mouseleave"+h,function(){if(c.disabled||a(this).hasClass("ui-state-disabled"))return;clearTimeout(k);var d=a(this).next();if(!d.is("ul"))d=d.children("ul:first");j=setTimeout(function(){b._hideSubmenu(d)},c.hideDelay)});a(this).find("ul ."+d+",ul >.ui-widget-header,ul >.wijmo-wijmenu-separator").bind("mouseenter"+h,function(){if(c.disabled)return;clearTimeout(j)})}});g.find("."+d).bind("click.wijmenu",function(h){f=a(this).hasClass("ui-state-disabled");if(c.disabled||f)return;if(a(this).is("a")){if(a(this).parent().find("ul").length===0)b._hideAllMenus();else if(!(c.trigger!==""&&a(this).parent().data("triggerEvent")!=="default"&&c.triggerEvent!=="mouseenter"))b._hideAllMenus();else{var e=b.currentMenuList,g,d;if(e!==undefined){g=a(this).parent();if(g.has("ul").length===0)for(d=e.length;d>0;d--)if(e[d-1].get(0)===g.parent().get(0))break;else b._hideSubmenu(e[d-1])}}b.activate(h,a(this).parent())}b.select(h);a(this).attr("href")==="#"&&h.preventDefault()}).bind("focusin",function(d){f=a(this).hasClass("ui-state-disabled");if(c.disabled||f)return;a(this).is("a")&&b.activate(d,a(this).parent())})},_hideAllMenus:function(){var b=this,f,e,c,d,g=b.rootMenu;d=g.find("ul");for(c=d.length-1;c>=0;c--)b._hideSubmenu(a(d[c]));if(b.options.trigger!==""){f=b.domObject.menucontainer;if(f.is(":animated"))return;e=b._getTriggerEle();if(e.length===0)return;b._hideSubmenu(b.domObject.menucontainer)}},hideAllMenus:function(){this._hideAllMenus()},_killFlyout:function(){var b=this.domObject.menucontainer.attr("role","");b.find("li").each(function(){a(this).removeClass("wijmo-wijmenu-parent").unbind(".wijmenu").children(":first").unbind(".wijmenu").attr("aria-haspopup","")})},_killmenuItems:function(){var c=this.rootMenu;c.removeClass("wijmo-wijmenu-list ui-helper-reset wijmo-wijmenu-content ui-helper-clearfix");c.find("li").each(function(){var c=a(this),d;c.removeClass("ui-widget "+b+" ui-state-default ui-corner-all wijmo-wijmenu-parent ui-widget-header wijmo-wijmenu-separator");d=c.children(".wijmo-wijmenu-link");d.removeClass("wijmo-wijmenu-link ui-corner-all ui-state-focus ui-state-hover ui-state-active").html(d.children(".wijmo-wijmenu-text").html()).unbind(".wijmenu .wijmenuitem");c.children("ul").removeClass("wijmo-wijmenu-list ui-widget-content ui-corner-all ui-helper-clearfix wijmo-wijmenu-child ui-helper-reset").attr("role","").attr("aria-activedescendant","").show().css({left:"",top:"",position:""}).attr("hidden","")});this.domObject.menucontainer.removeClass("");a(document).unbind("click.wijmenudoc")},_sroll:function(){var a=this.domObject.scrollcontainer,b=this.options.superPanelOptions||{};a.height(this.options.maxHeight);a.wijsuperpanel(b)},_hasScroll:function(){var a=this.domObject.scrollcontainer;return a.data("wijsuperpanel").vNeedScrollBar},_resetDrillChildMenu:function(a){a.removeClass("wijmo-wijmenu-scroll wijmo-wijmenu-current").height("auto")},_checkDrillMenuHeight:function(b,d,a){var e=this,c=5;d.height(b.height());a.wijsuperpanel("option","hScroller",{scrollValue:0});a.wijsuperpanel("option","vScroller",{scrollValue:0});a.wijsuperpanel("paintPanel");if(e._hasScroll()){if(b.prev().length>0)c=b.prev().css("padding-left").replace(/px/g,"");b.width(a.find(".wijmo-wijsuperpanel-contentwrapper:first").width()-c)}},_resetDrilldownMenu:function(h){var b=this,e=b.options,c=b.rootMenu,d=b.domObject.menucontainer,f=a('<li class="wijmo-wijmenu-breadcrumb-text">'+e.crumbDefaultText+"</li>"),g=c.parent();a(".wijmo-wijmenu-current",d).removeClass("wijmo-wijmenu-current");c.animate({left:0},e.showDuration,function(){a(this).find("ul").each(function(){a(this).hide();b._resetDrillChildMenu(a(this))});c.addClass("wijmo-wijmenu-current")});a(".wijmo-wijmenu-all-lists",d).find("span").remove();h.empty().append(f);a(".wijmo-wijmenu-footer",d).empty().hide();b._checkDrillMenuHeight(c,g,b.domObject.scrollcontainer)},_drilldown:function(){var b=this,d=b.rootMenu,i=d.wrap("<div>").parent().css("position","relative"),e=b.domObject.menucontainer.attr("role","menu"),h=b.domObject.scrollcontainer,c=b.options,j,g,f=a('<ul class="wijmo-wijmenu-breadcrumb ui-state-default ui-corner-all ui-helper-clearfix"></ul>'),m=a('<li class="wijmo-wijmenu-breadcrumb-text">'+c.crumbDefaultText+"</li>"),p=c.backLink?c.backLinkText:c.topLinkText,n=c.backLink?"wijmo-wijmenu-prev-list":"wijmo-wijmenu-all-lists",l=c.backLink?"ui-state-default ui-corner-all":"",o=c.backLink?'<span class="ui-icon ui-icon-triangle-1-w"></span>':"",k=a('<li class="'+n+'"><a href="#" class="'+l+'">'+o+p+"</a></li>");e.addClass("wijmo-wijmenu-ipod wijmo-wijmenu-container");if(c.backLink)f.addClass("wijmo-wijmenu-footer").appendTo(e).hide();else f.addClass("wijmo-wijmenu-header").prependTo(e);!c.backLink&&f.append(m);d.addClass("wijmo-wijmenu-content wijmo-wijmenu-current ui-widget-content ui-helper-clearfix").css({width:e.width()}).find("ul").css({width:e.width(),left:e.width()}).addClass("ui-widget-content");i.height(b.rootMenu.height());b._sroll();if(b._hasScroll()){j=5;if(d.children(":first").children(":first").length>0)j=d.children(":first").children(":first").css("padding-left").replace(/px/g,"");d.width(h.find(".wijmo-wijsuperpanel-contentwrapper:first").width()-j)}b.element.data("firstLeftValue",parseFloat(d.css("left")));a("li>.wijmo-wijmenu-link",d).each(function(){if(a(this).next().is("ul")){g=a(this).parent().attr("disabled");a(this).click(function(s){if(c.disabled||g)return;var p=a(this).next(),q=a(this).parents("ul:eq(0)"),n=q.data("topmenu")?0:parseFloat(d.css("left")),o,l,r=Math.round(n-parseFloat(e.width())),j=a(".wijmo-wijmenu-footer",e),m=function(f){var g=f,d=a(".wijmo-wijmenu-current",e),c;if(d.get(0)===b.rootMenu.get(0))return;c=d.parents("ul:eq(0)");d.hide().attr("aria-expanded","false");b._resetDrillChildMenu(d);b._checkDrillMenuHeight(c,i,h);c.addClass("wijmo-wijmenu-current").attr("aria-expanded","true");if(c.hasClass("wijmo-wijmenu-content")){g.remove();j.hide()}};b._resetDrillChildMenu(q);b._checkDrillMenuHeight(p,i,h);b._slidingAnimation(d,r,null);p.show().addClass("wijmo-wijmenu-current").attr("aria-expanded","true");if(c.backLink){if(j.find("a").size()===0){j.show();b._backLink=a('<a href="#"><span class="ui-icon ui-icon-triangle-1-w"></span> <span>'+c.backLinkText+"</span></a>").appendTo(j).click(function(h){if(c.disabled)return;var g=a(this),f;d.stop(true,true);f=parseInt(d.css("left"),10)+parseInt(e.width(),10);if(f>n)return;b._slidingAnimation(d,f,function(){m(g)});h.preventDefault()})}}else{if(f.find("li").size()===1){f.empty().append(k);k.find("a").click(function(a){b._resetDrilldownMenu(f);a.preventDefault()})}a(".wijmo-wijmenu-current-crumb",e).removeClass("wijmo-wijmenu-current-crumb");o=a(this).find("span:eq(0)").text();l=a('<li class="wijmo-wijmenu-current-crumb"><a href="#" class="wijmo-wijmenu-crumb">'+o+"</a></li>");l.appendTo(f).find("a").click(function(f){if(c.disabled)return;if(!a(this).parent().is(".wijmo-wijmenu-current-crumb")){var e=-(a(".wijmo-wijmenu-current").parents("ul").size()-1)*180;b._slidingAnimation(d,e,function(){m()});a(this).parent().addClass("wijmo-wijmenu-current-crumb").find("span").remove();a(this).parent().nextAll().remove();f.preventDefault()}});l.prev().append(' <span class="ui-icon ui-icon-carat-1-e"></span>')}a(this).attr("href")==="#"&&s.preventDefault()})}else a(this).click(function(d){g=a(this).parent().attr("disabled");if(c.disabled||g)return;b.activate(d,a(this).parent());b.select(d);if(c.trigger){var h=b._getTriggerEle();if(h.length){b._hideSubmenu(e);b._resetDrilldownMenu(f)}}a(this).attr("href")==="#"&&d.preventDefault()})})},_slidingAnimation:function(d,c,b){var a=this.options.slidingAnimation;if(a&&!a.disabled)d.stop(true,true).animate({left:c},a.duration,a.easing,b);else{d.css("left",c);b.call(this)}},_killDrilldown:function(){var c=this.rootMenu,b=this.domObject,d={width:"",height:""};c.css(d).removeClass("ui-widget-content");b.scrollcontainer.css(d);b.scrollcontainer.wijsuperpanel("destroy");b.scrollcontainer.removeClass("wijmo-wijsuperpanel").append(c);c.prevAll().remove();b.menucontainer.removeClass("wijmo-wijmenu-ipod wijmo-wijmenu-container");a(".wijmo-wijmenu-current",b.menucontainer).removeClass("wijmo-wijmenu-current");a(".wijmo-wijmenu-breadcrumb",b.menucontainer).remove();c.find("li").each(function(){var b=a(this).children(":first");b.unbind("click")});a("ul",c).css({left:"",width:""});c.css("left","");b.scrollcontainer=b.menucontainer.children(":first")},_getItemByValue:function(c){var b=this.rootMenu.find("a.wijmo-wijmenu-link").filter(function(){return a(this).text()===c});return b.length>0?b.eq(0).parent():null},_displaySubmenu:function(j,f,b){var c=this,d=c.options,g,e,h,i=a.wijmo.wijmenu.animations;f.is("a.wijmo-wijmenu-link")&&f.data("subMenuOpened",true);if(b.is(":visible"))return;b.show();c._setPosition(f,b);c.nowIndex++;c._setZindex(b,c.nowIndex);b.hide();c._trigger("showing",j,b);if(a.fn.wijshow){g={context:b,show:true};e="left";if(d.orientation==="horizontal")if(b.parent().closest("ul").get(0)===this.rootMenu.get(0))e="up";h=a.extend({},{option:{direction:e}},d.animation,d.showAnimation);b.wijshow(h,i,g,null,function(){var c=a.browser;if(c.msie&&c.version==="9.0"){b.wrap("<div></div>");b.unwrap()}else c.msie&&c.version==="6.0"&&b.css("overflow","");b.attr("aria-hidden",false)})}else b.show().attr("aria-hidden",false);c._isClickToOpen=d.triggerEvent==="click";if(!b.is(".wijmo-wijmenu")){if(c.currentMenuList===undefined)c.currentMenuList=[];c.currentMenuList.push(b)}},_hideCurrentSubmenu:function(b){var c=this;b.find("ul").each(function(){!a(this).data("notClose")&&c._hideSubmenu(a(this))})},_hideSubmenu:function(b){var d=this,g=d.options,h=a.wijmo.wijmenu.animations,e,c,f;if(b.prev().is(".wijmo-wijmenu-link")){b.prev().data("subMenuOpened",false);b.prev().removeClass("ui-state-active")}if(a.fn.wijhide){e={context:b,show:false};f=a.extend({},g.animation,g.hideAnimation);b.wijhide(f,h,e,null,function(){d._setZindex(b);b.attr("aria-hidden",true)})}else{b.hide().attr("aria-hidden",true);d._setZindex(b)}this.element.data("shown",false);c=this.currentMenuList;if(c){c=a.map(c,function(a){return a&&a.get(0)===b.get(0)?null:a});this.currentMenuList=a.makeArray(c)}},_setZindex:function(c,e){var f=this.rootMenu,d=this.domObject,b;if(!d)return;b=d.menucontainer;if(c.get(0)===b.get(0))return;if(e){c.parent().css("z-index",10);c.css("z-index",e);b.css("z-index")===0&&b.css("z-index",9950)}else{c.css("z-index","");c.parent().css("z-index","");a.browser.msie&&a.browser.version<8&&a("ul:visible",f).length===0&&b.css("z-index","")}},_setPosition:function(c,b){b.css({left:"0",top:"0",position:"absolute"});var d=this._getPosition(c),e={of:c};b.position(a.extend(e,d))},_getPosition:function(c){var d=this.options,b={my:"left top",at:"right top"};if(d.orientation==="horizontal")if(c.closest("ul").get(0)===this.rootMenu.get(0))b={my:"left top",at:"left bottom"};if(!c.is(".wijmo-wijmenu-link"))b={my:"left top",at:"left bottom"};b=a.extend(b,d.position);return b}});a.extend(a.wijmo.wijmenu,{animations:{slide:function(b,c){b=a.extend({duration:400,easing:"swing"},b,c);if(b.show)b.context.stop(true,true).animate({height:"show"},b).attr("aria-hidden",false);else b.context.stop(true,true).animate({height:"hide"},b).attr("aria-hidden",true)}}})})(jQuery);
+(function(a){"use strict";var e=0,d=0;function c(){return++e}function b(){return++d}a.widget("wijmo.wijtabs",{options:{alignment:"top",sortable:false,scrollable:false,ajaxOptions:null,cache:false,cookie:null,collapsible:false,hideOption:null,showOption:null,disabledIndexes:[],event:"click",idPrefix:"ui-tabs-",panelTemplate:"",spinner:"",tabTemplate:"",add:null,remove:null,select:null,beforeShow:null,show:null,load:null,disable:null,enable:null},_defaults:{panelTemplate:"<div></div>",spinner:"<em>Loading&#8230;</em>",tabTemplate:'<li><a href="#{href}"><span>#{label}</span></a></li>'},_create:function(){this._tabify(true)},_setOption:function(c,b){a.Widget.prototype._setOption.apply(this,arguments);switch(c){case"selected":if(this.options.collapsible&&b==this.options.selected)return;this.select(b);break;case"alignment":this.destroy();this._tabify(true);break;default:this._tabify()}},_initScroller:function(){var c=a.inArray(this._getAlignment(),["top","bottom"])!=-1;if(!c)return;var b=0;this.lis.each(function(){b+=a(this).outerWidth(true)});if(!!this.options.scrollable&&this.element.innerWidth()<b){if(this.scrollWrap===undefined){this.list.wrap("<div class='scrollWrap'></div>");this.scrollWrap=this.list.parent();a.effects.save(this.list,["width","height","overflow"])}this.list.width(b+2);this.scrollWrap.height(this.list.outerHeight(true));this.scrollWrap.wijsuperpanel({allowResize:false,hScroller:{scrollMode:"edge"},vScroller:{scrollBarVisibility:"hidden"}})}else this._removeScroller()},_removeScroller:function(){if(this.scrollWrap){this.scrollWrap.wijsuperpanel("destroy").replaceWith(this.scrollWrap.contents());this.scrollWrap=undefined;a.effects.restore(this.list,["width","height","overflow"])}},_tabId:function(a){return a.title&&a.title.replace(/\s/g,"_").replace(/[^A-Za-z0-9\-_:\.]/g,"")||this.options.idPrefix+c()},_sanitizeSelector:function(a){return a.replace(/:/g,"\\:")},_cookie:function(){var c=this.cookie||(this.cookie=this.options.cookie.name||"ui-tabs-"+b());return a.cookie.apply(null,[c].concat(a.makeArray(arguments)))},_ui:function(a,b){return{tab:a,panel:b,index:this.anchors.index(a)}},_cleanup:function(){this.lis.filter(".ui-state-processing").removeClass("ui-state-processing").find("span:data(label.tabs)").each(function(){var b=a(this);b.html(b.data("label.tabs")).removeData("label.tabs")})},_getAlignment:function(b){b=b===undefined?true:b;var a=this.options.alignment||"top";if(b)return a;switch(a){case"top":a="bottom";break;case"bottom":a="top";break;case"left":a="right";break;case"right":a="left"}return a},_saveLayout:function(){var b=["width","height","overflow"];a.effects.save(this.element,b);a.effects.save(this.list,b);a.effects.save(this.element.find(".wijmo-wijtabs-content"),b);this.list.width(this.list.width());var c=this.panels.filter(":not(.ui-tabs-hide)");this.element.data("panel.width",c.width());this.element.data("panel.outerWidth",c.outerWidth(true))},_restoreLayout:function(){var b=["width","height","overflow"];a.effects.restore(this.element,b);a.effects.restore(this.list,b);a.effects.restore(this.element.find(".wijmo-wijtabs-content"),b)},_hideContent:function(){var a=this.element.find(".wijmo-wijtabs-content");if(a.length){this._saveLayout();a.addClass("ui-tabs-hide").attr("aria-hidden",true);this.element.width(this.list.outerWidth(true))}},_showContent:function(){var a=this.element.find(".wijmo-wijtabs-content");if(a.length){this._restoreLayout();a.removeClass("ui-tabs-hide").attr("aria-hidden",false)}},_blindPanel:function(b,c){var i=this.options,h=b.parent(".wijmo-wijtabs-content");if(!h.length)return;this.list.width(this.list.width());var j=["position","top","left","width"];a.effects.save(b,j);b.show();if(c=="show"){b.removeClass("ui-tabs-hide").attr("aria-hidden",false);b.width(this.element.data("panel.width"))}else b.width(b.width());var e=c=="show"?i.showOption:i.hideOption,f=a.effects.createWrapper(b).css({overflow:"hidden"});c=="show"&&f.css(a.extend({width:0},e.fade?{opacity:0}:{}));var k=a.extend({width:c=="show"?this.element.data("panel.outerWidth"):0},e.fade?{opacity:c=="show"?1:0}:{}),d=this,g=this.list.outerWidth(true);f.animate(k,{duration:e.duration,step:function(){var a=f.outerWidth(true);d.element.width(g+a);h.width(Math.max(0,d.element.innerWidth()-g-6))},complete:function(){if(c=="hide"){d.lis.removeClass("ui-tabs-selected ui-state-active").attr("aria-selected",false);b.addClass("ui-tabs-hide").attr("aria-hidden",true)}else b.css("width","");a.effects.removeWrapper(b);c=="show"&&d._restoreLayout();d._resetStyle(b);b.dequeue();d.element.dequeue("tabs")}})},_resetStyle:function(b){b.css({display:""});!a.support.opacity&&b[0].style.removeAttribute("filter")},_normalizeBlindOption:function(a){if(a.blind===undefined)a.blind=false;if(a.fade===undefined)a.fade=false;if(a.duration===undefined)a.duration=200;if(typeof a.duration=="string")try{a.duration=parseInt(a.duration,10)}catch(b){a.duration=200}},_tabify:function(n){this.list=this.element.find("ol,ul").eq(0);this.lis=a("li:has(a)",this.list);this.anchors=this.lis.map(function(){return a("a",this)[0]});this.panels=a([]);var c=this,b=this.options,m=/^#.+/;this.anchors.each(function(j,e){var d=a(e).attr("href")||"",g=d.split("#")[0],i;if(g&&(g===location.toString().split("#")[0]||(i=a("base")[0])&&g===i.href)){d=e.hash;e.href=d}if(m.test(d))c.panels=c.panels.add(c._sanitizeSelector(d));else if(d!="#"){a.data(e,"href.tabs",d);a.data(e,"load.tabs",d.replace(/#.*$/,""));var h=c._tabId(e);e.href="#"+h;var f=a("#"+h);if(!f.length){f=a(b.panelTemplate||c._defaults.panelTemplate).attr("id",h).addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").insertAfter(c.panels[j-1]||c.list);f.data("destroy.tabs",true)}c.panels=c.panels.add(f)}else b.disabledIndexes.push(j)});var d=this._getAlignment(),l=this._getAlignment(false);if(n){this.list.attr("role","tablist");this.lis.attr("role","tab");this.panels.attr("role","tabpanel");this.element.addClass("ui-tabs wijmo-wijtabs ui-tabs-"+d+" ui-widget ui-widget-content ui-corner-all ui-helper-clearfix");this.list.addClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all");this.lis.addClass("ui-state-default ui-corner-"+d);this.panels.addClass("ui-tabs-panel ui-widget-content ui-corner-"+l);var f;switch(d){case"bottom":this.list.appendTo(this.element);break;case"left":f=a("<div/>").addClass("wijmo-wijtabs-content").appendTo(this.element);this.panels.appendTo(f);break;case"right":f=a("<div/>").addClass("wijmo-wijtabs-content").insertBefore(this.list);this.panels.appendTo(f);break;case"top":this.list.prependTo(this.element)}b.sortable&&this.list.sortable({axis:d=="top"||d=="bottom"?"x":"y"});if(b.selected===undefined){location.hash&&this.anchors.each(function(c,a){if(a.hash==location.hash){b.selected=c;return false}});if(typeof b.selected!="number"&&b.cookie)b.selected=parseInt(c._cookie(),10);if(typeof b.selected!="number"&&this.lis.filter(".ui-tabs-selected").length)b.selected=this.lis.index(this.lis.filter(".ui-tabs-selected"));b.selected=b.selected||(this.lis.length?0:-1)}else if(b.selected===null)b.selected=-1;b.selected=b.selected>=0&&this.anchors[b.selected]||b.selected<0?b.selected:0;b.disabledIndexes=a.unique(b.disabledIndexes.concat(a.map(this.lis.filter(".ui-state-disabled"),function(a){return c.lis.index(a)}))).sort();a.inArray(b.selected,b.disabledIndexes)!=-1&&b.disabledIndexes.splice(a.inArray(b.selected,b.disabledIndexes),1);this.panels.addClass("ui-tabs-hide").attr("aria-hidden",true);this.lis.removeClass("ui-tabs-selected ui-state-active").attr("aria-selected",false);if(b.selected>=0&&this.anchors.length){this.panels.eq(b.selected).removeClass("ui-tabs-hide").attr("aria-hidden",false);this.lis.eq(b.selected).addClass("ui-tabs-selected ui-state-active").attr("aria-selected",true);c.element.queue("tabs",function(){c._trigger("show",null,c._ui(c.anchors[b.selected],c.panels[b.selected]))});this.load(b.selected)}a(window).bind("unload",function(){c.lis&&c.lis.add(c.anchors).unbind(".tabs");c.lis=c.anchors=c.panels=null})}else b.selected=this.lis.index(this.lis.filter(".ui-tabs-selected"));this.element[b.collapsible?"addClass":"removeClass"]("ui-tabs-collapsible");b.cookie&&this._cookie(b.selected,b.cookie);for(var g=0,e;e=this.lis[g];g++){a(e)[a.inArray(g,b.disabledIndexes)!=-1&&!a(e).hasClass("ui-tabs-selected")?"addClass":"removeClass"]("ui-state-disabled");a(e).hasClass("ui-state-disabled")&&a(e).attr("aria-disabled",true)}b.cache===false&&this.anchors.removeData("cache.tabs");this.lis.add(this.anchors).unbind(".tabs");if(!b.disabled&&b.event!="mouseover"){var i=function(b,a){a.is(":not(.ui-state-disabled)")&&a.addClass("ui-state-"+b)},h=function(a,b){b.removeClass("ui-state-"+a)};this.lis.bind("mouseover.tabs",function(){i("hover",a(this))});this.lis.bind("mouseout.tabs",function(){h("hover",a(this))});this.anchors.bind("focus.tabs",function(){i("focus",a(this).closest("li"))});this.anchors.bind("blur.tabs",function(){h("focus",a(this).closest("li"))})}if(b.showOption===undefined||b.showOption===null)b.showOption={};this._normalizeBlindOption(b.showOption);if(b.hideOption===undefined||b.hideOption===null)b.hideOption={};this._normalizeBlindOption(b.hideOption);var k=(b.showOption.blind||b.showOption.fade)&&b.showOption.duration>0?function(g,e){a(g).closest("li").addClass("ui-tabs-selected ui-state-active").attr("aria-selected",true);c._showContent();e.removeClass("ui-tabs-hide").attr("aria-hidden",false);if(d=="top"||d=="bottom"){var f={duration:b.showOption.duration};if(b.showOption.blind)f.height="toggle";if(b.showOption.fade)f.opacity="toggle";e.hide().removeClass("ui-tabs-hide").attr("aria-hidden",false).animate(f,b.showOption.duration||"normal",function(){c._resetStyle(e);c._trigger("show",null,c._ui(g,e[0]))})}else{c._showContent();c._blindPanel(e,"show")}}:function(b,d){a(b).closest("li").addClass("ui-tabs-selected ui-state-active").attr("aria-selected",true);c._showContent();d.removeClass("ui-tabs-hide").attr("aria-hidden",false);c._trigger("show",null,c._ui(b,d[0]))},j=(b.hideOption.blind||b.hideOption.fade)&&b.hideOption.duration>0?function(f,a){if(d=="top"||d=="bottom"){var e={duration:b.hideOption.duration};if(b.hideOption.blind)e.height="toggle";if(b.hideOption.fade)e.opacity="toggle";a.animate(e,b.hideOption.duration||"normal",function(){c.lis.removeClass("ui-tabs-selected ui-state-active").attr("aria-selected",false);a.addClass("ui-tabs-hide").attr("aria-hidden",true);c._resetStyle(a);c.element.dequeue("tabs")})}else{c._saveLayout();c._blindPanel(a,"hide")}}:function(b,a){c.lis.removeClass("ui-tabs-selected ui-state-active").attr("aria-selected",false);c._hideContent();a.addClass("ui-tabs-hide").attr("aria-hidden",true);c.element.dequeue("tabs")};!b.disabled&&this.anchors.bind(b.event+".tabs",function(){var g=this,f=a(this).closest("li"),d=c.panels.filter(":not(.ui-tabs-hide)"),e=a(c._sanitizeSelector(this.hash));if(f.hasClass("ui-tabs-selected")&&!b.collapsible||f.hasClass("ui-state-disabled")||f.hasClass("ui-state-processing")||c._trigger("select",null,c._ui(this,e[0]))===false){this.blur();return false}b.selected=c.anchors.index(this);c.abort();if(b.collapsible)if(f.hasClass("ui-tabs-selected")){b.selected=-1;b.cookie&&c._cookie(b.selected,b.cookie);c.element.queue("tabs",function(){j(g,d)}).dequeue("tabs");this.blur();return false}else if(!d.length){b.cookie&&c._cookie(b.selected,b.cookie);c.element.queue("tabs",function(){k(g,e)});c.load(c.anchors.index(this));this.blur();return false}b.cookie&&c._cookie(b.selected,b.cookie);if(e.length){d.length&&c.element.queue("tabs",function(){j(g,d)});c.element.queue("tabs",function(){k(g,e)});c.load(c.anchors.index(this))}else throw"jQuery UI Tabs: Mismatching fragment identifier.";a.browser.msie&&this.blur()});this._initScroller();this.anchors.bind("click.tabs",function(){return false})},destroy:function(){var c=this.options;this.abort();this._removeScroller();this.element.unbind(".tabs").removeClass(["wijmo-wijtabs","ui-tabs-top","ui-tabs-bottom","ui-tabs-left","ui-tabs-right","ui-tabs","ui-widget","ui-widget-content","ui-corner-all","ui-tabs-collapsible","ui-helper-clearfix"].join(" ")).removeData("tabs").removeAttr("role");this.list.removeClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all").removeAttr("role");this.anchors.each(function(){var b=a.data(this,"href.tabs");if(b)this.href=b;var c=a(this).unbind(".tabs");a.each(["href","load","cache"],function(b,a){c.removeData(a+".tabs")})});this.lis.unbind(".tabs").add(this.panels).each(function(){if(a.data(this,"destroy.tabs"))a(this).remove();else a(this).removeClass(["ui-state-default","ui-corner-top","ui-corner-bottom","ui-corner-left","ui-corner-right","ui-tabs-selected","ui-state-active","ui-state-hover","ui-state-focus","ui-state-disabled","ui-tabs-panel","ui-widget-content","ui-tabs-hide"].join(" ")).css({position:"",left:"",top:""}).removeAttr("role").removeAttr("aria-hidden").removeAttr("aria-selected").removeAttr("aria-disabled")});var b=a(".wijmo-wijtabs-content");b.length&&b.replaceWith(b.contents());c.cookie&&this._cookie(null,c.cookie);return this},add:function(h,l,b){if(b===undefined)b=this.anchors.length;var d=this,f=this.options,e=a((f.tabTemplate||d._defaults.tabTemplate).replace(/#\{href\}/g,h).replace(/#\{label\}/g,l)),i=!h.indexOf("#")?h.replace("#",""):this._tabId(a("a",e)[0]),k=this._getAlignment(),j=this._getAlignment(false);e.addClass("ui-state-default ui-corner-"+k).data("destroy.tabs",true).attr("role","tab").attr("aria-selected",false);var c=a("#"+i);if(!c.length)c=a(f.panelTemplate||d._defaults.panelTemplate).attr("id",i).data("destroy.tabs",true).attr("role","tabpanel");c.addClass("ui-tabs-panel ui-widget-content ui-corner-"+j+" ui-tabs-hide").attr("aria-hidden",true);if(b>=this.lis.length){e.appendTo(this.list);if(this.panels.length>0)c.insertAfter(this.panels[this.panels.length-1]);else{var g=this.element.find(".wijmo-wijtabs-content");if(g.length===0)g=this.element;c.appendTo(g)}}else{e.insertBefore(this.lis[b]);c.insertBefore(this.panels[b])}f.disabledIndexes=a.map(f.disabledIndexes,function(a){return a>=b?++a:a});this._tabify();if(this.anchors.length==1){f.selected=0;e.addClass("ui-tabs-selected ui-state-active").attr("aria-selected",true);c.removeClass("ui-tabs-hide").attr("aria-hidden",false);this.element.queue("tabs",function(){d._trigger("show",null,d._ui(d.anchors[0],d.panels[0]))});this.load(0)}this._trigger("add",null,this._ui(this.anchors[b],this.panels[b]));return this},remove:function(b){var d=this.options,c=this.lis.eq(b).remove(),e=this.panels.eq(b).remove();c.hasClass("ui-tabs-selected")&&this.anchors.length>1&&this.select(b+(b+1<this.anchors.length?1:-1));d.disabledIndexes=a.map(a.grep(d.disabledIndexes,function(a){return a!=b}),function(a){return a>=b?--a:a});this._tabify();this._trigger("remove",null,this._ui(c.find("a")[0],e[0]));return this},enableTab:function(b){var c=this.options;if(a.inArray(b,c.disabledIndexes)==-1)return;this.lis.eq(b).removeClass("ui-state-disabled").removeAttr("aria-disabled");c.disabledIndexes=a.grep(c.disabledIndexes,function(a){return a!=b});this._trigger("enable",null,this._ui(this.anchors[b],this.panels[b]));return this},disableTab:function(a){var c=this,b=this.options;if(a!=b.selected){this.lis.eq(a).addClass("ui-state-disabled").attr("aria-disabled",true);b.disabledIndexes.push(a);b.disabledIndexes.sort();this._trigger("disable",null,this._ui(this.anchors[a],this.panels[a]))}return this},select:function(a){if(typeof a=="string")a=this.anchors.index(this.anchors.filter("[href$="+a+"]"));else if(a===null)a=-1;if(a==-1&&this.options.collapsible)a=this.options.selected;this.anchors.eq(a).trigger(this.options.event+".tabs");return this},load:function(c){var b=this,e=this.options,d=this.anchors.eq(c)[0],g=a.data(d,"load.tabs");this.abort();if(!g||this.element.queue("tabs").length!==0&&a.data(d,"cache.tabs")){this.element.dequeue("tabs");return}this.lis.eq(c).addClass("ui-state-processing");if(e.spinner||b._defaults.spinner){var f=a("span",d);f.data("label.tabs",f.html()).html(e.spinner||b._defaults.spinner)}this.xhr=a.ajax(a.extend({},e.ajaxOptions,{url:g,success:function(f,g){a(b._sanitizeSelector(d.hash)).html(f);b._cleanup();e.cache&&a.data(d,"cache.tabs",true);b._trigger("load",null,b._ui(b.anchors[c],b.panels[c]));try{e.ajaxOptions.success(f,g)}catch(h){}},error:function(a,f){b._cleanup();b._trigger("load",null,b._ui(b.anchors[c],b.panels[c]));try{e.ajaxOptions.error(a,f,c,d)}catch(g){}}}));b.element.dequeue("tabs");return this},abort:function(){this.element.queue([]);this.panels.stop(false,true);this.element.queue("tabs",this.element.queue("tabs").splice(-2,2));if(this.xhr){this.xhr.abort();delete this.xhr}this._cleanup();return this},url:function(a,b){this.anchors.eq(a).removeData("cache.tabs").data("load.tabs",b);return this},length:function(){return this.anchors.length}})})(jQuery);
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-multiselect/jquery.multiselect.css b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-multiselect/jquery.multiselect.css
new file mode 100644
index 0000000..8a08e22
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-multiselect/jquery.multiselect.css
@@ -0,0 +1,23 @@
+.ui-multiselect { padding:2px 0 2px 4px; text-align:left }
+.ui-multiselect span.ui-icon { float:right }
+.ui-multiselect-single .ui-multiselect-checkboxes input { position:absolute !important; top: auto !important; left:-9999px; }
+.ui-multiselect-single .ui-multiselect-checkboxes label { padding:5px !important }
+
+.ui-multiselect-header { margin-bottom:3px; padding:3px 0 3px 4px }
+.ui-multiselect-header ul { font-size:0.9em }
+.ui-multiselect-header ul li { float:left; padding:0 10px 0 0 }
+.ui-multiselect-header a { text-decoration:none }
+.ui-multiselect-header a:hover { text-decoration:underline }
+.ui-multiselect-header span.ui-icon { float:left }
+.ui-multiselect-header li.ui-multiselect-close { float:right; text-align:right; padding-right:0 }
+
+.ui-multiselect-menu { display:none; padding:3px; position:absolute; z-index:10000; text-align: left }
+.ui-multiselect-checkboxes { position:relative /* fixes bug in IE6/7 */; overflow-y:auto }
+.ui-multiselect-checkboxes label { cursor:default; display:block; border:1px solid transparent; padding:3px 1px }
+.ui-multiselect-checkboxes label input { position:relative; top:1px }
+.ui-multiselect-checkboxes li { clear:both; font-size:0.9em; padding-right:3px }
+.ui-multiselect-checkboxes li.ui-multiselect-optgroup-label { text-align:center; font-weight:bold; border-bottom:1px solid }
+.ui-multiselect-checkboxes li.ui-multiselect-optgroup-label a { display:block; padding:3px; margin:1px 0; text-decoration:none }
+
+/* remove label borders in IE6 because IE6 does not support transparency */
+* html .ui-multiselect-checkboxes label { border:none }
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-multiselect/jquery.multiselect.js b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-multiselect/jquery.multiselect.js
new file mode 100644
index 0000000..a1cd9e4
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-multiselect/jquery.multiselect.js
@@ -0,0 +1,735 @@
+/* jshint forin:true, noarg:true, noempty:true, eqeqeq:true, boss:true, undef:true, curly:true, browser:true, jquery:true */
+/*
+ * jQuery MultiSelect UI Widget 1.14pre
+ * Copyright (c) 2012 Eric Hynds
+ *
+ * http://www.erichynds.com/jquery/jquery-ui-multiselect-widget/
+ *
+ * Depends:
+ *   - jQuery 1.4.2+
+ *   - jQuery UI 1.8 widget factory
+ *
+ * Optional:
+ *   - jQuery UI effects
+ *   - jQuery UI position utility
+ *
+ * Dual licensed under the MIT and GPL licenses:
+ *   http://www.opensource.org/licenses/mit-license.php
+ *   http://www.gnu.org/licenses/gpl.html
+ *
+ */
+(function($, undefined) {
+
+  var multiselectID = 0;
+  var $doc = $(document);
+
+  $.widget("ech.multiselect", {
+
+    // default options
+    options: {
+      header: true,
+      height: 175,
+      minWidth: 225,
+      classes: '',
+      checkAllText: 'Check all',
+      uncheckAllText: 'Uncheck all',
+      noneSelectedText: 'Select options',
+      selectedText: '# selected',
+      selectedList: 0,
+      show: null,
+      hide: null,
+      autoOpen: false,
+      multiple: true,
+      position: {},
+      appendTo: "body"
+    },
+
+    _create: function() {
+      var el = this.element.hide();
+      var o = this.options;
+
+      this.speed = $.fx.speeds._default; // default speed for effects
+      this._isOpen = false; // assume no
+
+      // create a unique namespace for events that the widget
+      // factory cannot unbind automatically. Use eventNamespace if on
+      // jQuery UI 1.9+, and otherwise fallback to a custom string.
+      this._namespaceID = this.eventNamespace || ('multiselect' + multiselectID);
+
+      var button = (this.button = $('<button type="button"><span class="ui-icon ui-icon-triangle-1-s"></span></button>'))
+        .addClass('ui-multiselect ui-widget ui-state-default ui-corner-all')
+        .addClass(o.classes)
+        .attr({ 'title':el.attr('title'), 'aria-haspopup':true, 'tabIndex':el.attr('tabIndex') })
+        .insertAfter(el),
+
+        buttonlabel = (this.buttonlabel = $('<span />'))
+          .html(o.noneSelectedText)
+          .appendTo(button),
+
+        menu = (this.menu = $('<div />'))
+          .addClass('ui-multiselect-menu ui-widget ui-widget-content ui-corner-all')
+          .addClass(o.classes)
+          .appendTo($(o.appendTo)),
+
+        header = (this.header = $('<div />'))
+          .addClass('ui-widget-header ui-corner-all ui-multiselect-header ui-helper-clearfix')
+          .appendTo(menu),
+
+        headerLinkContainer = (this.headerLinkContainer = $('<ul />'))
+          .addClass('ui-helper-reset')
+          .html(function() {
+            if(o.header === true) {
+              return '<li><a class="ui-multiselect-all" href="#"><span class="ui-icon ui-icon-check"></span><span>' + o.checkAllText + '</span></a></li><li><a class="ui-multiselect-none" href="#"><span class="ui-icon ui-icon-closethick"></span><span>' + o.uncheckAllText + '</span></a></li>';
+            } else if(typeof o.header === "string") {
+              return '<li>' + o.header + '</li>';
+            } else {
+              return '';
+            }
+          })
+          .append('<li class="ui-multiselect-close"><a href="#" class="ui-multiselect-close"><span class="ui-icon ui-icon-circle-close"></span></a></li>')
+          .appendTo(header),
+
+        checkboxContainer = (this.checkboxContainer = $('<ul />'))
+          .addClass('ui-multiselect-checkboxes ui-helper-reset')
+          .appendTo(menu);
+
+        // perform event bindings
+        this._bindEvents();
+
+        // build menu
+        this.refresh(true);
+
+        // some addl. logic for single selects
+        if(!o.multiple) {
+          menu.addClass('ui-multiselect-single');
+        }
+
+        // bump unique ID
+        multiselectID++;
+    },
+
+    _init: function() {
+      if(this.options.header === false) {
+        this.header.hide();
+      }
+      if(!this.options.multiple) {
+        this.headerLinkContainer.find('.ui-multiselect-all, .ui-multiselect-none').hide();
+      }
+      if(this.options.autoOpen) {
+        this.open();
+      }
+      if(this.element.is(':disabled')) {
+        this.disable();
+      }
+    },
+
+    refresh: function(init) {
+      var el = this.element;
+      var o = this.options;
+      var menu = this.menu;
+      var checkboxContainer = this.checkboxContainer;
+      var optgroups = [];
+      var html = "";
+      var id = el.attr('id') || multiselectID++; // unique ID for the label & option tags
+
+      // build items
+      el.find('option').each(function(i) {
+        var $this = $(this);
+        var parent = this.parentNode;
+        var description = this.innerHTML;
+        var title = this.title;
+        var value = this.value;
+        var inputID = 'ui-multiselect-' + (this.id || id + '-option-' + i);
+        var isDisabled = this.disabled;
+        var isSelected = this.selected;
+        var labelClasses = [ 'ui-corner-all' ];
+        var liClasses = (isDisabled ? 'ui-multiselect-disabled ' : ' ') + this.className;
+        var optLabel;
+
+        // is this an optgroup?
+        if(parent.tagName === 'OPTGROUP') {
+          optLabel = parent.getAttribute('label');
+
+          // has this optgroup been added already?
+          if($.inArray(optLabel, optgroups) === -1) {
+            html += '<li class="ui-multiselect-optgroup-label ' + parent.className + '"><a href="#">' + optLabel + '</a></li>';
+            optgroups.push(optLabel);
+          }
+        }
+
+        if(isDisabled) {
+          labelClasses.push('ui-state-disabled');
+        }
+
+        // browsers automatically select the first option
+        // by default with single selects
+        if(isSelected && !o.multiple) {
+          labelClasses.push('ui-state-active');
+        }
+
+        html += '<li class="' + liClasses + '">';
+
+        // create the label
+        html += '<label for="' + inputID + '" title="' + title + '" class="' + labelClasses.join(' ') + '">';
+        html += '<input id="' + inputID + '" name="multiselect_' + id + '" type="' + (o.multiple ? "checkbox" : "radio") + '" value="' + value + '" title="' + title + '"';
+
+        // pre-selected?
+        if(isSelected) {
+          html += ' checked="checked"';
+          html += ' aria-selected="true"';
+        }
+
+        // disabled?
+        if(isDisabled) {
+          html += ' disabled="disabled"';
+          html += ' aria-disabled="true"';
+        }
+
+        // add the title and close everything off
+        html += ' /><span>' + description + '</span></label></li>';
+      });
+
+      // insert into the DOM
+      checkboxContainer.html(html);
+
+      // cache some moar useful elements
+      this.labels = menu.find('label');
+      this.inputs = this.labels.children('input');
+
+      // set widths
+      this._setButtonWidth();
+      this._setMenuWidth();
+
+      // remember default value
+      this.button[0].defaultValue = this.update();
+
+      // broadcast refresh event; useful for widgets
+      if(!init) {
+        this._trigger('refresh');
+      }
+    },
+
+    // updates the button text. call refresh() to rebuild
+    update: function() {
+      var o = this.options;
+      var $inputs = this.inputs;
+      var $checked = $inputs.filter(':checked');
+      var numChecked = $checked.length;
+      var value;
+
+      if(numChecked === 0) {
+        value = o.noneSelectedText;
+      } else {
+        if($.isFunction(o.selectedText)) {
+          value = o.selectedText.call(this, numChecked, $inputs.length, $checked.get());
+        } else if(/\d/.test(o.selectedList) && o.selectedList > 0 && numChecked <= o.selectedList) {
+          value = $checked.map(function() { return $(this).next().html(); }).get().join(', ');
+        } else {
+          value = o.selectedText.replace('#', numChecked).replace('#', $inputs.length);
+        }
+      }
+
+      this._setButtonValue(value);
+
+      return value;
+    },
+
+    // this exists as a separate method so that the developer 
+    // can easily override it.
+    _setButtonValue: function(value) {
+      this.buttonlabel.text(value);
+    },
+
+    // binds events
+    _bindEvents: function() {
+      var self = this;
+      var button = this.button;
+
+      function clickHandler() {
+        self[ self._isOpen ? 'close' : 'open' ]();
+        return false;
+      }
+
+      // webkit doesn't like it when you click on the span :(
+      button
+        .find('span')
+        .bind('click.multiselect', clickHandler);
+
+      // button events
+      button.bind({
+        click: clickHandler,
+        keypress: function(e) {
+          switch(e.which) {
+            case 27: // esc
+              case 38: // up
+              case 37: // left
+              self.close();
+            break;
+            case 39: // right
+              case 40: // down
+              self.open();
+            break;
+          }
+        },
+        mouseenter: function() {
+          if(!button.hasClass('ui-state-disabled')) {
+            $(this).addClass('ui-state-hover');
+          }
+        },
+        mouseleave: function() {
+          $(this).removeClass('ui-state-hover');
+        },
+        focus: function() {
+          if(!button.hasClass('ui-state-disabled')) {
+            $(this).addClass('ui-state-focus');
+          }
+        },
+        blur: function() {
+          $(this).removeClass('ui-state-focus');
+        }
+      });
+
+      // header links
+      this.header.delegate('a', 'click.multiselect', function(e) {
+        // close link
+        if($(this).hasClass('ui-multiselect-close')) {
+          self.close();
+
+          // check all / uncheck all
+        } else {
+          self[$(this).hasClass('ui-multiselect-all') ? 'checkAll' : 'uncheckAll']();
+        }
+
+        e.preventDefault();
+      });
+
+      // optgroup label toggle support
+      this.menu.delegate('li.ui-multiselect-optgroup-label a', 'click.multiselect', function(e) {
+        e.preventDefault();
+
+        var $this = $(this);
+        var $inputs = $this.parent().nextUntil('li.ui-multiselect-optgroup-label').find('input:visible:not(:disabled)');
+        var nodes = $inputs.get();
+        var label = $this.parent().text();
+
+        // trigger event and bail if the return is false
+        if(self._trigger('beforeoptgrouptoggle', e, { inputs:nodes, label:label }) === false) {
+          return;
+        }
+
+        // toggle inputs
+        self._toggleChecked(
+          $inputs.filter(':checked').length !== $inputs.length,
+          $inputs
+        );
+
+        self._trigger('optgrouptoggle', e, {
+          inputs: nodes,
+          label: label,
+          checked: nodes[0].checked
+        });
+      })
+      .delegate('label', 'mouseenter.multiselect', function() {
+        if(!$(this).hasClass('ui-state-disabled')) {
+          self.labels.removeClass('ui-state-hover');
+          $(this).addClass('ui-state-hover').find('input').focus();
+        }
+      })
+      .delegate('label', 'keydown.multiselect', function(e) {
+        e.preventDefault();
+
+        switch(e.which) {
+          case 9: // tab
+            case 27: // esc
+            self.close();
+          break;
+          case 38: // up
+            case 40: // down
+            case 37: // left
+            case 39: // right
+            self._traverse(e.which, this);
+          break;
+          case 13: // enter
+            $(this).find('input')[0].click();
+          break;
+        }
+      })
+      .delegate('input[type="checkbox"], input[type="radio"]', 'click.multiselect', function(e) {
+        var $this = $(this);
+        var val = this.value;
+        var checked = this.checked;
+        var tags = self.element.find('option');
+
+        // bail if this input is disabled or the event is cancelled
+        if(this.disabled || self._trigger('click', e, { value: val, text: this.title, checked: checked }) === false) {
+          e.preventDefault();
+          return;
+        }
+
+        // make sure the input has focus. otherwise, the esc key
+        // won't close the menu after clicking an item.
+        $this.focus();
+
+        // toggle aria state
+        $this.attr('aria-selected', checked);
+
+        // change state on the original option tags
+        tags.each(function() {
+          if(this.value === val) {
+            this.selected = checked;
+          } else if(!self.options.multiple) {
+            this.selected = false;
+          }
+        });
+
+        // some additional single select-specific logic
+        if(!self.options.multiple) {
+          self.labels.removeClass('ui-state-active');
+          $this.closest('label').toggleClass('ui-state-active', checked);
+
+          // close menu
+          self.close();
+        }
+
+        // fire change on the select box
+        self.element.trigger("change");
+
+        // setTimeout is to fix multiselect issue #14 and #47. caused by jQuery issue #3827
+        // http://bugs.jquery.com/ticket/3827
+        setTimeout($.proxy(self.update, self), 10);
+      });
+
+      // close each widget when clicking on any other element/anywhere else on the page
+      $doc.bind('mousedown.' + this._namespaceID, function(event) {
+        var target = event.target;
+
+        if(self._isOpen
+            && target !== self.button[0]
+            && target !== self.menu[0]
+            && !$.contains(self.menu[0], target)
+            && !$.contains(self.button[0], target)
+          ) {
+          self.close();
+        }
+      });
+
+      // deal with form resets.  the problem here is that buttons aren't
+      // restored to their defaultValue prop on form reset, and the reset
+      // handler fires before the form is actually reset.  delaying it a bit
+      // gives the form inputs time to clear.
+      $(this.element[0].form).bind('reset.multiselect', function() {
+        setTimeout($.proxy(self.refresh, self), 10);
+      });
+    },
+
+    // set button width
+    _setButtonWidth: function() {
+      var width = this.element.outerWidth();
+      var o = this.options;
+
+      if(/\d/.test(o.minWidth) && width < o.minWidth) {
+        width = o.minWidth;
+      }
+
+      // set widths
+      this.button.outerWidth(width);
+    },
+
+    // set menu width
+    _setMenuWidth: function() {
+      var m = this.menu;
+      m.outerWidth(this.button.outerWidth());
+    },
+
+    // move up or down within the menu
+    _traverse: function(which, start) {
+      var $start = $(start);
+      var moveToLast = which === 38 || which === 37;
+
+      // select the first li that isn't an optgroup label / disabled
+      var $next = $start.parent()[moveToLast ? 'prevAll' : 'nextAll']('li:not(.ui-multiselect-disabled, .ui-multiselect-optgroup-label)').first();
+
+      // if at the first/last element
+      if(!$next.length) {
+        var $container = this.menu.find('ul').last();
+
+        // move to the first/last
+        this.menu.find('label')[ moveToLast ? 'last' : 'first' ]().trigger('mouseover');
+
+        // set scroll position
+        $container.scrollTop(moveToLast ? $container.height() : 0);
+
+      } else {
+        $next.find('label').trigger('mouseover');
+      }
+    },
+
+    // This is an internal function to toggle the checked property and
+    // other related attributes of a checkbox.
+    //
+    // The context of this function should be a checkbox; do not proxy it.
+    _toggleState: function(prop, flag) {
+      return function() {
+        if(!this.disabled) {
+          this[ prop ] = flag;
+        }
+
+        if(flag) {
+          this.setAttribute('aria-selected', true);
+        } else {
+          this.removeAttribute('aria-selected');
+        }
+      };
+    },
+
+    _toggleChecked: function(flag, group) {
+      var $inputs = (group && group.length) ?  group : this.inputs;
+      var self = this;
+
+      // toggle state on inputs
+      $inputs.each(this._toggleState('checked', flag));
+
+      // give the first input focus
+      $inputs.eq(0).focus();
+
+      // update button text
+      this.update();
+
+      // gather an array of the values that actually changed
+      var values = $inputs.map(function() {
+        return this.value;
+      }).get();
+
+      // toggle state on original option tags
+      this.element
+        .find('option')
+        .each(function() {
+          if(!this.disabled && $.inArray(this.value, values) > -1) {
+            self._toggleState('selected', flag).call(this);
+          }
+        });
+
+      // trigger the change event on the select
+      if($inputs.length) {
+        this.element.trigger("change");
+      }
+    },
+
+    _toggleDisabled: function(flag) {
+      this.button.attr({ 'disabled':flag, 'aria-disabled':flag })[ flag ? 'addClass' : 'removeClass' ]('ui-state-disabled');
+
+      var inputs = this.menu.find('input');
+      var key = "ech-multiselect-disabled";
+
+      if(flag) {
+        // remember which elements this widget disabled (not pre-disabled)
+        // elements, so that they can be restored if the widget is re-enabled.
+        inputs = inputs.filter(':enabled').data(key, true)
+      } else {
+        inputs = inputs.filter(function() {
+          return $.data(this, key) === true;
+        }).removeData(key);
+      }
+
+      inputs
+        .attr({ 'disabled':flag, 'arial-disabled':flag })
+        .parent()[ flag ? 'addClass' : 'removeClass' ]('ui-state-disabled');
+
+      this.element.attr({
+        'disabled':flag,
+        'aria-disabled':flag
+      });
+    },
+
+    // open the menu
+    open: function(e) {
+      var self = this;
+      var button = this.button;
+      var menu = this.menu;
+      var speed = this.speed;
+      var o = this.options;
+      var args = [];
+
+      // bail if the multiselectopen event returns false, this widget is disabled, or is already open
+      if(this._trigger('beforeopen') === false || button.hasClass('ui-state-disabled') || this._isOpen) {
+        return;
+      }
+
+      var $container = menu.find('ul').last();
+      var effect = o.show;
+
+      // figure out opening effects/speeds
+      if($.isArray(o.show)) {
+        effect = o.show[0];
+        speed = o.show[1] || self.speed;
+      }
+
+      // if there's an effect, assume jQuery UI is in use
+      // build the arguments to pass to show()
+      if(effect) {
+        args = [ effect, speed ];
+      }
+
+      // set the scroll of the checkbox container
+      $container.scrollTop(0).height(o.height);
+
+      // positon
+      this.position();
+
+      // show the menu, maybe with a speed/effect combo
+      $.fn.show.apply(menu, args);
+
+      // select the first not disabled option
+      // triggering both mouseover and mouseover because 1.4.2+ has a bug where triggering mouseover
+      // will actually trigger mouseenter.  the mouseenter trigger is there for when it's eventually fixed
+      this.labels.filter(':not(.ui-state-disabled)').eq(0).trigger('mouseover').trigger('mouseenter').find('input').trigger('focus');
+
+      button.addClass('ui-state-active');
+      this._isOpen = true;
+      this._trigger('open');
+    },
+
+    // close the menu
+    close: function() {
+      if(this._trigger('beforeclose') === false) {
+        return;
+      }
+
+      var o = this.options;
+      var effect = o.hide;
+      var speed = this.speed;
+      var args = [];
+
+      // figure out opening effects/speeds
+      if($.isArray(o.hide)) {
+        effect = o.hide[0];
+        speed = o.hide[1] || this.speed;
+      }
+
+      if(effect) {
+        args = [ effect, speed ];
+      }
+
+      $.fn.hide.apply(this.menu, args);
+      this.button.removeClass('ui-state-active').trigger('blur').trigger('mouseleave');
+      this._isOpen = false;
+      this._trigger('close');
+    },
+
+    enable: function() {
+      this._toggleDisabled(false);
+    },
+
+    disable: function() {
+      this._toggleDisabled(true);
+    },
+
+    checkAll: function(e) {
+      this._toggleChecked(true);
+      this._trigger('checkAll');
+    },
+
+    uncheckAll: function() {
+      this._toggleChecked(false);
+      this._trigger('uncheckAll');
+    },
+
+    getChecked: function() {
+      return this.menu.find('input').filter(':checked');
+    },
+
+    destroy: function() {
+      // remove classes + data
+      $.Widget.prototype.destroy.call(this);
+
+      // unbind events
+      $doc.unbind(this._namespaceID);
+
+      this.button.remove();
+      this.menu.remove();
+      this.element.show();
+
+      return this;
+    },
+
+    isOpen: function() {
+      return this._isOpen;
+    },
+
+    widget: function() {
+      return this.menu;
+    },
+
+    getButton: function() {
+      return this.button;
+    },
+
+    position: function() {
+      var o = this.options;
+
+      // use the position utility if it exists and options are specifified
+      if($.ui.position && !$.isEmptyObject(o.position)) {
+        o.position.of = o.position.of || this.button;
+
+        this.menu
+          .show()
+          .position(o.position)
+          .hide();
+
+        // otherwise fallback to custom positioning
+      } else {
+        var pos = this.button.offset();
+
+        this.menu.css({
+          top: pos.top + this.button.outerHeight(),
+          left: pos.left
+        });
+      }
+    },
+
+    // react to option changes after initialization
+    _setOption: function(key, value) {
+      var menu = this.menu;
+
+      switch(key) {
+        case 'header':
+          menu.find('div.ui-multiselect-header')[value ? 'show' : 'hide']();
+          break;
+        case 'checkAllText':
+          menu.find('a.ui-multiselect-all span').eq(-1).text(value);
+          break;
+        case 'uncheckAllText':
+          menu.find('a.ui-multiselect-none span').eq(-1).text(value);
+          break;
+        case 'height':
+          menu.find('ul').last().height(parseInt(value, 10));
+          break;
+        case 'minWidth':
+          this.options[key] = parseInt(value, 10);
+          this._setButtonWidth();
+          this._setMenuWidth();
+          break;
+        case 'selectedText':
+        case 'selectedList':
+        case 'noneSelectedText':
+          this.options[key] = value; // these all needs to update immediately for the update() call
+          this.update();
+          break;
+        case 'classes':
+          menu.add(this.button).removeClass(this.options.classes).addClass(value);
+          break;
+        case 'multiple':
+          menu.toggleClass('ui-multiselect-single', !value);
+          this.options.multiple = value;
+          this.element[0].multiple = value;
+          this.refresh();
+          break;
+        case 'position':
+          this.position();
+      }
+
+      $.Widget.prototype._setOption.apply(this, arguments);
+    }
+  });
+
+})(jQuery);
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-multiselect/jquery.multiselect.min.js b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-multiselect/jquery.multiselect.min.js
new file mode 100644
index 0000000..e924350
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-ui-multiselect/jquery.multiselect.min.js
@@ -0,0 +1,20 @@
+/*
+ * jQuery MultiSelect UI Widget 1.13
+ * Copyright (c) 2012 Eric Hynds
+ *
+ * http://www.erichynds.com/jquery/jquery-ui-multiselect-widget/
+ *
+ * Depends:
+ *   - jQuery 1.4.2+
+ *   - jQuery UI 1.8 widget factory
+ *
+ * Optional:
+ *   - jQuery UI effects
+ *   - jQuery UI position utility
+ *
+ * Dual licensed under the MIT and GPL licenses:
+ *   http://www.opensource.org/licenses/mit-license.php
+ *   http://www.gnu.org/licenses/gpl.html
+ *
+ */
+(function(d){var k=0;d.widget("ech.multiselect",{options:{header:!0,height:175,minWidth:225,classes:"",checkAllText:"Check all",uncheckAllText:"Uncheck all",noneSelectedText:"Select options",selectedText:"# selected",selectedList:0,show:null,hide:null,autoOpen:!1,multiple:!0,position:{}},_create:function(){var a=this.element.hide(),b=this.options;this.speed=d.fx.speeds._default;this._isOpen=!1;a=(this.button=d('<button type="button"><span class="ui-icon ui-icon-triangle-2-n-s"></span></button>')).addClass("ui-multiselect ui-widget ui-state-default ui-corner-all").addClass(b.classes).attr({title:a.attr("title"),"aria-haspopup":!0,tabIndex:a.attr("tabIndex")}).insertAfter(a);(this.buttonlabel=d("<span />")).html(b.noneSelectedText).appendTo(a);var a=(this.menu=d("<div />")).addClass("ui-multiselect-menu ui-widget ui-widget-content ui-corner-all").addClass(b.classes).appendTo(document.body),c=(this.header=d("<div />")).addClass("ui-widget-header ui-corner-all ui-multiselect-header ui-helper-clearfix").appendTo(a);(this.headerLinkContainer=d("<ul />")).addClass("ui-helper-reset").html(function(){return!0===b.header?'<li><a class="ui-multiselect-all" href="#"><span class="ui-icon ui-icon-check"></span><span>'+b.checkAllText+'</span></a></li><li><a class="ui-multiselect-none" href="#"><span class="ui-icon ui-icon-closethick"></span><span>'+b.uncheckAllText+"</span></a></li>":"string"===typeof b.header?"<li>"+b.header+"</li>":""}).append('<li class="ui-multiselect-close"><a href="#" class="ui-multiselect-close"><span class="ui-icon ui-icon-circle-close"></span></a></li>').appendTo(c);(this.checkboxContainer=d("<ul />")).addClass("ui-multiselect-checkboxes ui-helper-reset").appendTo(a);this._bindEvents();this.refresh(!0);b.multiple||a.addClass("ui-multiselect-single")},_init:function(){!1===this.options.header&&this.header.hide();this.options.multiple||this.headerLinkContainer.find(".ui-multiselect-all, .ui-multiselect-none").hide();this.options.autoOpen&&this.open();this.element.is(":disabled")&&this.disable()},refresh:function(a){var b=this.element,c=this.options,f=this.menu,h=this.checkboxContainer,g=[],e="",i=b.attr("id")||k++;b.find("option").each(function(b){d(this);var a=this.parentNode,f=this.innerHTML,h=this.title,k=this.value,b="ui-multiselect-"+(this.id||i+"-option-"+b),l=this.disabled,n=this.selected,m=["ui-corner-all"],o=(l?"ui-multiselect-disabled ":" ")+this.className,j;"OPTGROUP"===a.tagName&&(j=a.getAttribute("label"),-1===d.inArray(j,g)&&(e+='<li class="ui-multiselect-optgroup-label '+a.className+'"><a href="#">'+j+"</a></li>",g.push(j)));l&&m.push("ui-state-disabled");n&&!c.multiple&&m.push("ui-state-active");e+='<li class="'+o+'">';e+='<label for="'+b+'" title="'+h+'" class="'+m.join(" ")+'">';e+='<input id="'+b+'" name="multiselect_'+i+'" type="'+(c.multiple?"checkbox":"radio")+'" value="'+k+'" title="'+f+'"';n&&(e+=' checked="checked"',e+=' aria-selected="true"');l&&(e+=' disabled="disabled"',e+=' aria-disabled="true"');e+=" /><span>"+f+"</span></label></li>"});h.html(e);this.labels=f.find("label");this.inputs=this.labels.children("input");this._setButtonWidth();this._setMenuWidth();this.button[0].defaultValue=this.update();a||this._trigger("refresh")},update:function(){var a=this.options,b=this.inputs,c=b.filter(":checked"),f=c.length,a=0===f?a.noneSelectedText:d.isFunction(a.selectedText)?a.selectedText.call(this,f,b.length,c.get()):/\d/.test(a.selectedList)&&0<a.selectedList&&f<=a.selectedList?c.map(function(){return d(this).next().html()}).get().join(", "):a.selectedText.replace("#",f).replace("#",b.length);this.buttonlabel.html(a);return a},_bindEvents:function(){function a(){b[b._isOpen? "close":"open"]();return!1}var b=this,c=this.button;c.find("span").bind("click.multiselect",a);c.bind({click:a,keypress:function(a){switch(a.which){case 27:case 38:case 37:b.close();break;case 39:case 40:b.open()}},mouseenter:function(){c.hasClass("ui-state-disabled")||d(this).addClass("ui-state-hover")},mouseleave:function(){d(this).removeClass("ui-state-hover")},focus:function(){c.hasClass("ui-state-disabled")||d(this).addClass("ui-state-focus")},blur:function(){d(this).removeClass("ui-state-focus")}});this.header.delegate("a","click.multiselect",function(a){if(d(this).hasClass("ui-multiselect-close"))b.close();else b[d(this).hasClass("ui-multiselect-all")?"checkAll":"uncheckAll"]();a.preventDefault()});this.menu.delegate("li.ui-multiselect-optgroup-label a","click.multiselect",function(a){a.preventDefault();var c=d(this),g=c.parent().nextUntil("li.ui-multiselect-optgroup-label").find("input:visible:not(:disabled)"),e=g.get(),c=c.parent().text();!1!==b._trigger("beforeoptgrouptoggle",a,{inputs:e,label:c})&&(b._toggleChecked(g.filter(":checked").length!==g.length,g),b._trigger("optgrouptoggle",a,{inputs:e,label:c,checked:e[0].checked}))}).delegate("label","mouseenter.multiselect",function(){d(this).hasClass("ui-state-disabled")||(b.labels.removeClass("ui-state-hover"),d(this).addClass("ui-state-hover").find("input").focus())}).delegate("label","keydown.multiselect",function(a){a.preventDefault();switch(a.which){case 9:case 27:b.close();break;case 38:case 40:case 37:case 39:b._traverse(a.which,this);break;case 13:d(this).find("input")[0].click()}}).delegate('input[type="checkbox"], input[type="radio"]',"click.multiselect",function(a){var c=d(this),g=this.value,e=this.checked,i=b.element.find("option");this.disabled||!1===b._trigger("click",a,{value:g,text:this.title,checked:e})?a.preventDefault():(c.focus(),c.attr("aria-selected",e),i.each(function(){this.value===g?this.selected=e:b.options.multiple||(this.selected=!1)}),b.options.multiple||(b.labels.removeClass("ui-state-active"),c.closest("label").toggleClass("ui-state-active",e),b.close()),b.element.trigger("change"),setTimeout(d.proxy(b.update,b),10))});d(document).bind("mousedown.multiselect",function(a){b._isOpen&&(!d.contains(b.menu[0],a.target)&&!d.contains(b.button[0],a.target)&&a.target!==b.button[0])&&b.close()});d(this.element[0].form).bind("reset.multiselect",function(){setTimeout(d.proxy(b.refresh,b),10)})},_setButtonWidth:function(){var a=this.element.outerWidth(),b=this.options;/\d/.test(b.minWidth)&&a<b.minWidth&&(a=b.minWidth);this.button.width(a)},_setMenuWidth:function(){var a=this.menu,b=this.button.outerWidth()-parseInt(a.css("padding-left"),10)-parseInt(a.css("padding-right"),10)-parseInt(a.css("border-right-width"),10)-parseInt(a.css("border-left-width"),10);a.width(b||this.button.outerWidth())},_traverse:function(a,b){var c=d(b),f=38===a||37===a,c=c.parent()[f?"prevAll":"nextAll"]("li:not(.ui-multiselect-disabled, .ui-multiselect-optgroup-label)")[f?"last":"first"]();c.length?c.find("label").trigger("mouseover"):(c=this.menu.find("ul").last(),this.menu.find("label")[f? "last":"first"]().trigger("mouseover"),c.scrollTop(f?c.height():0))},_toggleState:function(a,b){return function(){this.disabled||(this[a]=b);b?this.setAttribute("aria-selected",!0):this.removeAttribute("aria-selected")}},_toggleChecked:function(a,b){var c=b&&b.length?b:this.inputs,f=this;c.each(this._toggleState("checked",a));c.eq(0).focus();this.update();var h=c.map(function(){return this.value}).get();this.element.find("option").each(function(){!this.disabled&&-1<d.inArray(this.value,h)&&f._toggleState("selected",a).call(this)});c.length&&this.element.trigger("change")},_toggleDisabled:function(a){this.button.attr({disabled:a,"aria-disabled":a})[a?"addClass":"removeClass"]("ui-state-disabled");var b=this.menu.find("input"),b=a?b.filter(":enabled").data("ech-multiselect-disabled",!0):b.filter(function(){return!0===d.data(this,"ech-multiselect-disabled")}).removeData("ech-multiselect-disabled");b.attr({disabled:a,"arial-disabled":a}).parent()[a?"addClass":"removeClass"]("ui-state-disabled");this.element.attr({disabled:a,"aria-disabled":a})},open:function(){var a=this.button,b=this.menu,c=this.speed,f=this.options,h=[];if(!(!1===this._trigger("beforeopen")||a.hasClass("ui-state-disabled")||this._isOpen)){var g=b.find("ul").last(),e=f.show,i=a.offset();d.isArray(f.show)&&(e=f.show[0],c=f.show[1]||this.speed);e&&(h=[e,c]);g.scrollTop(0).height(f.height);d.ui.position&&!d.isEmptyObject(f.position)?(f.position.of=f.position.of||a,b.show().position(f.position).hide()):b.css({top:i.top+a.outerHeight(),left:i.left});d.fn.show.apply(b,h);this.labels.eq(0).trigger("mouseover").trigger("mouseenter").find("input").trigger("focus");a.addClass("ui-state-active");this._isOpen=!0;this._trigger("open")}},close:function(){if(!1!==this._trigger("beforeclose")){var a=this.options,b=a.hide,c=this.speed,f=[];d.isArray(a.hide)&&(b=a.hide[0],c=a.hide[1]||this.speed);b&&(f=[b,c]);d.fn.hide.apply(this.menu,f);this.button.removeClass("ui-state-active").trigger("blur").trigger("mouseleave");this._isOpen=!1;this._trigger("close")}},enable:function(){this._toggleDisabled(!1)},disable:function(){this._toggleDisabled(!0)},checkAll:function(){this._toggleChecked(!0);this._trigger("checkAll")},uncheckAll:function(){this._toggleChecked(!1);this._trigger("uncheckAll")},getChecked:function(){return this.menu.find("input").filter(":checked")},destroy:function(){d.Widget.prototype.destroy.call(this);this.button.remove();this.menu.remove();this.element.show();return this},isOpen:function(){return this._isOpen},widget:function(){return this.menu},getButton:function(){return this.button},_setOption:function(a,b){var c=this.menu;switch(a){case "header":c.find("div.ui-multiselect-header")[b?"show":"hide"]();break;case "checkAllText":c.find("a.ui-multiselect-all span").eq(-1).text(b);break;case "uncheckAllText":c.find("a.ui-multiselect-none span").eq(-1).text(b);break;case "height":c.find("ul").last().height(parseInt(b,10));break;case "minWidth":this.options[a]=parseInt(b,10);this._setButtonWidth();this._setMenuWidth();break;case "selectedText":case "selectedList":case "noneSelectedText":this.options[a]=b;this.update();break;case "classes":c.add(this.button).removeClass(this.options.classes).addClass(b);break;case "multiple":c.toggleClass("ui-multiselect-single",!b),this.options.multiple=b,this.element[0].multiple=b,this.refresh()}d.Widget.prototype._setOption.apply(this,arguments)}})})(jQuery);
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-validation/1.10.0/images/unchecked.gif b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-validation/1.10.0/images/unchecked.gif
new file mode 100644
index 0000000..06ecaba
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-validation/1.10.0/images/unchecked.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-validation/1.10.0/jquery.validate.min.js b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-validation/1.10.0/jquery.validate.min.js
new file mode 100644
index 0000000..85afad5
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-validation/1.10.0/jquery.validate.min.js
@@ -0,0 +1,4 @@
+/*! jQuery Validation Plugin - v1.10.0 - 9/7/2012
+* https://github.com/jzaefferer/jquery-validation
+* Copyright (c) 2012 Jörn Zaefferer; Licensed MIT, GPL */
+(function(a){a.extend(a.fn,{validate:function(b){if(!this.length){b&&b.debug&&window.console&&console.warn("nothing selected, can't validate, returning nothing");return}var c=a.data(this[0],"validator");return c?c:(this.attr("novalidate","novalidate"),c=new a.validator(b,this[0]),a.data(this[0],"validator",c),c.settings.onsubmit&&(this.validateDelegate(":submit","click",function(b){c.settings.submitHandler&&(c.submitButton=b.target),a(b.target).hasClass("cancel")&&(c.cancelSubmit=!0)}),this.submit(function(b){function d(){var d;return c.settings.submitHandler?(c.submitButton&&(d=a("<input type='hidden'/>").attr("name",c.submitButton.name).val(c.submitButton.value).appendTo(c.currentForm)),c.settings.submitHandler.call(c,c.currentForm,b),c.submitButton&&d.remove(),!1):!0}return c.settings.debug&&b.preventDefault(),c.cancelSubmit?(c.cancelSubmit=!1,d()):c.form()?c.pendingRequest?(c.formSubmitted=!0,!1):d():(c.focusInvalid(),!1)})),c)},valid:function(){if(a(this[0]).is("form"))return this.validate().form();var b=!0,c=a(this[0].form).validate();return this.each(function(){b&=c.element(this)}),b},removeAttrs:function(b){var c={},d=this;return a.each(b.split(/\s/),function(a,b){c[b]=d.attr(b),d.removeAttr(b)}),c},rules:function(b,c){var d=this[0];if(b){var e=a.data(d.form,"validator").settings,f=e.rules,g=a.validator.staticRules(d);switch(b){case"add":a.extend(g,a.validator.normalizeRule(c)),f[d.name]=g,c.messages&&(e.messages[d.name]=a.extend(e.messages[d.name],c.messages));break;case"remove":if(!c)return delete f[d.name],g;var h={};return a.each(c.split(/\s/),function(a,b){h[b]=g[b],delete g[b]}),h}}var i=a.validator.normalizeRules(a.extend({},a.validator.metadataRules(d),a.validator.classRules(d),a.validator.attributeRules(d),a.validator.staticRules(d)),d);if(i.required){var j=i.required;delete i.required,i=a.extend({required:j},i)}return i}}),a.extend(a.expr[":"],{blank:function(b){return!a.trim(""+b.value)},filled:function(b){return!!a.trim(""+b.value)},unchecked:function(a){return!a.checked}}),a.validator=function(b,c){this.settings=a.extend(!0,{},a.validator.defaults,b),this.currentForm=c,this.init()},a.validator.format=function(b,c){return arguments.length===1?function(){var c=a.makeArray(arguments);return c.unshift(b),a.validator.format.apply(this,c)}:(arguments.length>2&&c.constructor!==Array&&(c=a.makeArray(arguments).slice(1)),c.constructor!==Array&&(c=[c]),a.each(c,function(a,c){b=b.replace(new RegExp("\\{"+a+"\\}","g"),c)}),b)},a.extend(a.validator,{defaults:{messages:{},groups:{},rules:{},errorClass:"error",validClass:"valid",errorElement:"label",focusInvalid:!0,errorContainer:a([]),errorLabelContainer:a([]),onsubmit:!0,ignore:":hidden",ignoreTitle:!1,onfocusin:function(a,b){this.lastActive=a,this.settings.focusCleanup&&!this.blockFocusCleanup&&(this.settings.unhighlight&&this.settings.unhighlight.call(this,a,this.settings.errorClass,this.settings.validClass),this.addWrapper(this.errorsFor(a)).hide())},onfocusout:function(a,b){!this.checkable(a)&&(a.name in this.submitted||!this.optional(a))&&this.element(a)},onkeyup:function(a,b){if(b.which===9&&this.elementValue(a)==="")return;(a.name in this.submitted||a===this.lastActive)&&this.element(a)},onclick:function(a,b){a.name in this.submitted?this.element(a):a.parentNode.name in this.submitted&&this.element(a.parentNode)},highlight:function(b,c,d){b.type==="radio"?this.findByName(b.name).addClass(c).removeClass(d):a(b).addClass(c).removeClass(d)},unhighlight:function(b,c,d){b.type==="radio"?this.findByName(b.name).removeClass(c).addClass(d):a(b).removeClass(c).addClass(d)}},setDefaults:function(b){a.extend(a.validator.defaults,b)},messages:{required:"This field is required.",remote:"Please fix this field.",email:"Please enter a valid email address.",url:"Please enter a valid URL.",date:"Please enter a valid date.",dateISO:"Please enter a valid date (ISO).",number:"Please enter a valid number.",digits:"Please enter only digits.",creditcard:"Please enter a valid credit card number.",equalTo:"Please enter the same value again.",maxlength:a.validator.format("Please enter no more than {0} characters."),minlength:a.validator.format("Please enter at least {0} characters."),rangelength:a.validator.format("Please enter a value between {0} and {1} characters long."),range:a.validator.format("Please enter a value between {0} and {1}."),max:a.validator.format("Please enter a value less than or equal to {0}."),min:a.validator.format("Please enter a value greater than or equal to {0}.")},autoCreateRanges:!1,prototype:{init:function(){function d(b){var c=a.data(this[0].form,"validator"),d="on"+b.type.replace(/^validate/,"");c.settings[d]&&c.settings[d].call(c,this[0],b)}this.labelContainer=a(this.settings.errorLabelContainer),this.errorContext=this.labelContainer.length&&this.labelContainer||a(this.currentForm),this.containers=a(this.settings.errorContainer).add(this.settings.errorLabelContainer),this.submitted={},this.valueCache={},this.pendingRequest=0,this.pending={},this.invalid={},this.reset();var b=this.groups={};a.each(this.settings.groups,function(c,d){a.each(d.split(/\s/),function(a,d){b[d]=c})});var c=this.settings.rules;a.each(c,function(b,d){c[b]=a.validator.normalizeRule(d)}),a(this.currentForm).validateDelegate(":text, [type='password'], [type='file'], select, textarea, [type='number'], [type='search'] ,[type='tel'], [type='url'], [type='email'], [type='datetime'], [type='date'], [type='month'], [type='week'], [type='time'], [type='datetime-local'], [type='range'], [type='color'] ","focusin focusout keyup",d).validateDelegate("[type='radio'], [type='checkbox'], select, option","click",d),this.settings.invalidHandler&&a(this.currentForm).bind("invalid-form.validate",this.settings.invalidHandler)},form:function(){return this.checkForm(),a.extend(this.submitted,this.errorMap),this.invalid=a.extend({},this.errorMap),this.valid()||a(this.currentForm).triggerHandler("invalid-form",[this]),this.showErrors(),this.valid()},checkForm:function(){this.prepareForm();for(var a=0,b=this.currentElements=this.elements();b[a];a++)this.check(b[a]);return this.valid()},element:function(b){b=this.validationTargetFor(this.clean(b)),this.lastElement=b,this.prepareElement(b),this.currentElements=a(b);var c=this.check(b)!==!1;return c?delete this.invalid[b.name]:this.invalid[b.name]=!0,this.numberOfInvalids()||(this.toHide=this.toHide.add(this.containers)),this.showErrors(),c},showErrors:function(b){if(b){a.extend(this.errorMap,b),this.errorList=[];for(var c in b)this.errorList.push({message:b[c],element:this.findByName(c)[0]});this.successList=a.grep(this.successList,function(a){return!(a.name in b)})}this.settings.showErrors?this.settings.showErrors.call(this,this.errorMap,this.errorList):this.defaultShowErrors()},resetForm:function(){a.fn.resetForm&&a(this.currentForm).resetForm(),this.submitted={},this.lastElement=null,this.prepareForm(),this.hideErrors(),this.elements().removeClass(this.settings.errorClass).removeData("previousValue")},numberOfInvalids:function(){return this.objectLength(this.invalid)},objectLength:function(a){var b=0;for(var c in a)b++;return b},hideErrors:function(){this.addWrapper(this.toHide).hide()},valid:function(){return this.size()===0},size:function(){return this.errorList.length},focusInvalid:function(){if(this.settings.focusInvalid)try{a(this.findLastActive()||this.errorList.length&&this.errorList[0].element||[]).filter(":visible").focus().trigger("focusin")}catch(b){}},findLastActive:function(){var b=this.lastActive;return b&&a.grep(this.errorList,function(a){return a.element.name===b.name}).length===1&&b},elements:function(){var b=this,c={};return a(this.currentForm).find("input, select, textarea").not(":submit, :reset, :image, [disabled]").not(this.settings.ignore).filter(function(){return!this.name&&b.settings.debug&&window.console&&console.error("%o has no name assigned",this),this.name in c||!b.objectLength(a(this).rules())?!1:(c[this.name]=!0,!0)})},clean:function(b){return a(b)[0]},errors:function(){var b=this.settings.errorClass.replace(" ",".");return a(this.settings.errorElement+"."+b,this.errorContext)},reset:function(){this.successList=[],this.errorList=[],this.errorMap={},this.toShow=a([]),this.toHide=a([]),this.currentElements=a([])},prepareForm:function(){this.reset(),this.toHide=this.errors().add(this.containers)},prepareElement:function(a){this.reset(),this.toHide=this.errorsFor(a)},elementValue:function(b){var c=a(b).attr("type"),d=a(b).val();return c==="radio"||c==="checkbox"?a('input[name="'+a(b).attr("name")+'"]:checked').val():typeof d=="string"?d.replace(/\r/g,""):d},check:function(b){b=this.validationTargetFor(this.clean(b));var c=a(b).rules(),d=!1,e=this.elementValue(b),f;for(var g in c){var h={method:g,parameters:c[g]};try{f=a.validator.methods[g].call(this,e,b,h.parameters);if(f==="dependency-mismatch"){d=!0;continue}d=!1;if(f==="pending"){this.toHide=this.toHide.not(this.errorsFor(b));return}if(!f)return this.formatAndAdd(b,h),!1}catch(i){throw this.settings.debug&&window.console&&console.log("exception occured when checking element "+b.id+", check the '"+h.method+"' method",i),i}}if(d)return;return this.objectLength(c)&&this.successList.push(b),!0},customMetaMessage:function(b,c){if(!a.metadata)return;var d=this.settings.meta?a(b).metadata()[this.settings.meta]:a(b).metadata();return d&&d.messages&&d.messages[c]},customDataMessage:function(b,c){return a(b).data("msg-"+c.toLowerCase())||b.attributes&&a(b).attr("data-msg-"+c.toLowerCase())},customMessage:function(a,b){var c=this.settings.messages[a];return c&&(c.constructor===String?c:c[b])},findDefined:function(){for(var a=0;a<arguments.length;a++)if(arguments[a]!==undefined)return arguments[a];return undefined},defaultMessage:function(b,c){return this.findDefined(this.customMessage(b.name,c),this.customDataMessage(b,c),this.customMetaMessage(b,c),!this.settings.ignoreTitle&&b.title||undefined,a.validator.messages[c],"<strong>Warning: No message defined for "+b.name+"</strong>")},formatAndAdd:function(b,c){var d=this.defaultMessage(b,c.method),e=/\$?\{(\d+)\}/g;typeof d=="function"?d=d.call(this,c.parameters,b):e.test(d)&&(d=a.validator.format(d.replace(e,"{$1}"),c.parameters)),this.errorList.push({message:d,element:b}),this.errorMap[b.name]=d,this.submitted[b.name]=d},addWrapper:function(a){return this.settings.wrapper&&(a=a.add(a.parent(this.settings.wrapper))),a},defaultShowErrors:function(){var a,b;for(a=0;this.errorList[a];a++){var c=this.errorList[a];this.settings.highlight&&this.settings.highlight.call(this,c.element,this.settings.errorClass,this.settings.validClass),this.showLabel(c.element,c.message)}this.errorList.length&&(this.toShow=this.toShow.add(this.containers));if(this.settings.success)for(a=0;this.successList[a];a++)this.showLabel(this.successList[a]);if(this.settings.unhighlight)for(a=0,b=this.validElements();b[a];a++)this.settings.unhighlight.call(this,b[a],this.settings.errorClass,this.settings.validClass);this.toHide=this.toHide.not(this.toShow),this.hideErrors(),this.addWrapper(this.toShow).show()},validElements:function(){return this.currentElements.not(this.invalidElements())},invalidElements:function(){return a(this.errorList).map(function(){return this.element})},showLabel:function(b,c){var d=this.errorsFor(b);d.length?(d.removeClass(this.settings.validClass).addClass(this.settings.errorClass),d.attr("generated")&&d.html(c)):(d=a("<"+this.settings.errorElement+"/>").attr({"for":this.idOrName(b),generated:!0}).addClass(this.settings.errorClass).html(c||""),this.settings.wrapper&&(d=d.hide().show().wrap("<"+this.settings.wrapper+"/>").parent()),this.labelContainer.append(d).length||(this.settings.errorPlacement?this.settings.errorPlacement(d,a(b)):d.insertAfter(b))),!c&&this.settings.success&&(d.text(""),typeof this.settings.success=="string"?d.addClass(this.settings.success):this.settings.success(d,b)),this.toShow=this.toShow.add(d)},errorsFor:function(b){var c=this.idOrName(b);return this.errors().filter(function(){return a(this).attr("for")===c})},idOrName:function(a){return this.groups[a.name]||(this.checkable(a)?a.name:a.id||a.name)},validationTargetFor:function(a){return this.checkable(a)&&(a=this.findByName(a.name).not(this.settings.ignore)[0]),a},checkable:function(a){return/radio|checkbox/i.test(a.type)},findByName:function(b){return a(this.currentForm).find('[name="'+b+'"]')},getLength:function(b,c){switch(c.nodeName.toLowerCase()){case"select":return a("option:selected",c).length;case"input":if(this.checkable(c))return this.findByName(c.name).filter(":checked").length}return b.length},depend:function(a,b){return this.dependTypes[typeof a]?this.dependTypes[typeof a](a,b):!0},dependTypes:{"boolean":function(a,b){return a},string:function(b,c){return!!a(b,c.form).length},"function":function(a,b){return a(b)}},optional:function(b){var c=this.elementValue(b);return!a.validator.methods.required.call(this,c,b)&&"dependency-mismatch"},startRequest:function(a){this.pending[a.name]||(this.pendingRequest++,this.pending[a.name]=!0)},stopRequest:function(b,c){this.pendingRequest--,this.pendingRequest<0&&(this.pendingRequest=0),delete this.pending[b.name],c&&this.pendingRequest===0&&this.formSubmitted&&this.form()?(a(this.currentForm).submit(),this.formSubmitted=!1):!c&&this.pendingRequest===0&&this.formSubmitted&&(a(this.currentForm).triggerHandler("invalid-form",[this]),this.formSubmitted=!1)},previousValue:function(b){return a.data(b,"previousValue")||a.data(b,"previousValue",{old:null,valid:!0,message:this.defaultMessage(b,"remote")})}},classRuleSettings:{required:{required:!0},email:{email:!0},url:{url:!0},date:{date:!0},dateISO:{dateISO:!0},number:{number:!0},digits:{digits:!0},creditcard:{creditcard:!0}},addClassRules:function(b,c){b.constructor===String?this.classRuleSettings[b]=c:a.extend(this.classRuleSettings,b)},classRules:function(b){var c={},d=a(b).attr("class");return d&&a.each(d.split(" "),function(){this in a.validator.classRuleSettings&&a.extend(c,a.validator.classRuleSettings[this])}),c},attributeRules:function(b){var c={},d=a(b);for(var e in a.validator.methods){var f;e==="required"?(f=d.get(0).getAttribute(e),f===""&&(f=!0),f=!!f):f=d.attr(e),f?c[e]=f:d[0].getAttribute("type")===e&&(c[e]=!0)}return c.maxlength&&/-1|2147483647|524288/.test(c.maxlength)&&delete c.maxlength,c},metadataRules:function(b){if(!a.metadata)return{};var c=a.data(b.form,"validator").settings.meta;return c?a(b).metadata()[c]:a(b).metadata()},staticRules:function(b){var c={},d=a.data(b.form,"validator");return d.settings.rules&&(c=a.validator.normalizeRule(d.settings.rules[b.name])||{}),c},normalizeRules:function(b,c){return a.each(b,function(d,e){if(e===!1){delete b[d];return}if(e.param||e.depends){var f=!0;switch(typeof e.depends){case"string":f=!!a(e.depends,c.form).length;break;case"function":f=e.depends.call(c,c)}f?b[d]=e.param!==undefined?e.param:!0:delete b[d]}}),a.each(b,function(d,e){b[d]=a.isFunction(e)?e(c):e}),a.each(["minlength","maxlength","min","max"],function(){b[this]&&(b[this]=Number(b[this]))}),a.each(["rangelength","range"],function(){b[this]&&(b[this]=[Number(b[this][0]),Number(b[this][1])])}),a.validator.autoCreateRanges&&(b.min&&b.max&&(b.range=[b.min,b.max],delete b.min,delete b.max),b.minlength&&b.maxlength&&(b.rangelength=[b.minlength,b.maxlength],delete b.minlength,delete b.maxlength)),b.messages&&delete b.messages,b},normalizeRule:function(b){if(typeof b=="string"){var c={};a.each(b.split(/\s/),function(){c[this]=!0}),b=c}return b},addMethod:function(b,c,d){a.validator.methods[b]=c,a.validator.messages[b]=d!==undefined?d:a.validator.messages[b],c.length<3&&a.validator.addClassRules(b,a.validator.normalizeRule(b))},methods:{required:function(b,c,d){if(!this.depend(d,c))return"dependency-mismatch";if(c.nodeName.toLowerCase()==="select"){var e=a(c).val();return e&&e.length>0}return this.checkable(c)?this.getLength(b,c)>0:a.trim(b).length>0},remote:function(b,c,d){if(this.optional(c))return"dependency-mismatch";var e=this.previousValue(c);this.settings.messages[c.name]||(this.settings.messages[c.name]={}),e.originalMessage=this.settings.messages[c.name].remote,this.settings.messages[c.name].remote=e.message,d=typeof d=="string"&&{url:d}||d;if(this.pending[c.name])return"pending";if(e.old===b)return e.valid;e.old=b;var f=this;this.startRequest(c);var g={};return g[c.name]=b,a.ajax(a.extend(!0,{url:d,mode:"abort",port:"validate"+c.name,dataType:"json",data:g,success:function(d){f.settings.messages[c.name].remote=e.originalMessage;var g=d===!0||d==="true";if(g){var h=f.formSubmitted;f.prepareElement(c),f.formSubmitted=h,f.successList.push(c),delete f.invalid[c.name],f.showErrors()}else{var i={},j=d||f.defaultMessage(c,"remote");i[c.name]=e.message=a.isFunction(j)?j(b):j,f.invalid[c.name]=!0,f.showErrors(i)}e.valid=g,f.stopRequest(c,g)}},d)),"pending"},minlength:function(b,c,d){var e=a.isArray(b)?b.length:this.getLength(a.trim(b),c);return this.optional(c)||e>=d},maxlength:function(b,c,d){var e=a.isArray(b)?b.length:this.getLength(a.trim(b),c);return this.optional(c)||e<=d},rangelength:function(b,c,d){var e=a.isArray(b)?b.length:this.getLength(a.trim(b),c);return this.optional(c)||e>=d[0]&&e<=d[1]},min:function(a,b,c){return this.optional(b)||a>=c},max:function(a,b,c){return this.optional(b)||a<=c},range:function(a,b,c){return this.optional(b)||a>=c[0]&&a<=c[1]},email:function(a,b){return this.optional(b)||/^((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))$/i.test(a)},url:function(a,b){return this.optional(b)||/^(https?|ftp):\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)(:\d*)?)(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)?(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(\#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$/i.test(a)},date:function(a,b){return this.optional(b)||!/Invalid|NaN/.test(new Date(a))},dateISO:function(a,b){return this.optional(b)||/^\d{4}[\/\-]\d{1,2}[\/\-]\d{1,2}$/.test(a)},number:function(a,b){return this.optional(b)||/^-?(?:\d+|\d{1,3}(?:,\d{3})+)?(?:\.\d+)?$/.test(a)},digits:function(a,b){return this.optional(b)||/^\d+$/.test(a)},creditcard:function(a,b){if(this.optional(b))return"dependency-mismatch";if(/[^0-9 \-]+/.test(a))return!1;var c=0,d=0,e=!1;a=a.replace(/\D/g,"");for(var f=a.length-1;f>=0;f--){var g=a.charAt(f);d=parseInt(g,10),e&&(d*=2)>9&&(d-=9),c+=d,e=!e}return c%10===0},equalTo:function(b,c,d){var e=a(d);return this.settings.onfocusout&&e.unbind(".validate-equalTo").bind("blur.validate-equalTo",function(){a(c).valid()}),b===e.val()}}}),a.format=a.validator.format})(jQuery),function(a){var b={};if(a.ajaxPrefilter)a.ajaxPrefilter(function(a,c,d){var e=a.port;a.mode==="abort"&&(b[e]&&b[e].abort(),b[e]=d)});else{var c=a.ajax;a.ajax=function(d){var e=("mode"in d?d:a.ajaxSettings).mode,f=("port"in d?d:a.ajaxSettings).port;return e==="abort"?(b[f]&&b[f].abort(),b[f]=c.apply(this,arguments)):c.apply(this,arguments)}}}(jQuery),function(a){!jQuery.event.special.focusin&&!jQuery.event.special.focusout&&document.addEventListener&&a.each({focus:"focusin",blur:"focusout"},function(b,c){function d(b){return b=a.event.fix(b),b.type=c,a.event.handle.call(this,b)}a.event.special[c]={setup:function(){this.addEventListener(b,d,!0)},teardown:function(){this.removeEventListener(b,d,!0)},handler:function(b){var d=arguments;return d[0]=a.event.fix(b),d[0].type=c,a.event.handle.apply(this,d)}}}),a.extend(a.fn,{validateDelegate:function(b,c,d){return this.bind(c,function(c){var e=a(c.target);if(e.is(b))return d.apply(e,arguments)})}})}(jQuery)
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-validation/1.10.0/messages_bs_zh.js b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-validation/1.10.0/messages_bs_zh.js
new file mode 100644
index 0000000..c1448ba
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-validation/1.10.0/messages_bs_zh.js
@@ -0,0 +1,27 @@
+/*
+ * Translated default messages for the jQuery validation plugin.
+ * Locale: ZH (Chinese, 中文 (Zhōngwén), 汉语, 漢語)
+ */
+jQuery.extend(jQuery.validator.messages, {
+        required: "必选字段",
+		remote: "请修正该字段",
+		email: "请输入正确格式的电子邮件",
+		url: "请输入合法的网址",
+		date: "请输入合法的日期",
+		dateISO: "请输入合法的日期 (ISO).",
+		number: "请输入合法的数字",
+		digits: "只能输入整数",
+		creditcard: "请输入合法的信用卡号",
+		equalTo: "请再次输入相同的值",
+		accept: "请输入拥有合法后缀名的字符串",
+		maxlength: jQuery.validator.format("请输入一个长度最多是 {0} 的字符串"),
+		minlength: jQuery.validator.format("请输入一个长度最少是 {0} 的字符串"),
+		rangelength: jQuery.validator.format("请输入一个长度介于 {0} 和 {1} 之间的字符串"),
+		range: jQuery.validator.format("请输入一个介于 {0} 和 {1} 之间的值"),
+		max: jQuery.validator.format("请输入一个最大为 {0} 的值"),
+		min: jQuery.validator.format("请输入一个最小为 {0} 的值")
+});
+
+jQuery.extend(jQuery.validator.defaults, {
+    errorElement: "span"
+});
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/jquery-validation/1.10.0/validate.css b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-validation/1.10.0/validate.css
new file mode 100644
index 0000000..3153a96
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/jquery-validation/1.10.0/validate.css
@@ -0,0 +1,8 @@
+span.error {
+  background:url("images/unchecked.gif") no-repeat 0px 0px;
+  padding-left: 16px;
+  margin-left: 1em;
+  padding-bottom: 2px;
+  font-weight: bold;
+  color: #EA5200;
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/bootstrap.min.js b/pluss-manage-page/src/main/resources/static/resources/auth/js/bootstrap.min.js
new file mode 100644
index 0000000..f936727
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/bootstrap.min.js
@@ -0,0 +1,221 @@
+/*!
+ * Bootstrap v3.3.7 (http://getbootstrap.com)
+ * Copyright 2011-2016 Twitter, Inc.
+ * Licensed under the MIT license
+ */
+if("undefined"==typeof jQuery)throw Error("Bootstrap's JavaScript requires jQuery");+function(t){"use strict"
+var e=t.fn.jquery.split(" ")[0].split(".")
+if(e[0]<2&&e[1]<9||1==e[0]&&9==e[1]&&e[2]<1||e[0]>3)throw Error("Bootstrap's JavaScript requires jQuery version 1.9.1 or higher, but lower than version 4")}(jQuery),+function(t){"use strict"
+function e(){var t=document.createElement("bootstrap"),e={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"}
+for(var i in e)if(void 0!==t.style[i])return{end:e[i]}
+return!1}t.fn.emulateTransitionEnd=function(e){var i=!1,o=this
+t(this).one("bsTransitionEnd",function(){i=!0})
+var n=function(){i||t(o).trigger(t.support.transition.end)}
+return setTimeout(n,e),this},t(function(){t.support.transition=e(),t.support.transition&&(t.event.special.bsTransitionEnd={bindType:t.support.transition.end,delegateType:t.support.transition.end,handle:function(e){return t(e.target).is(this)?e.handleObj.handler.apply(this,arguments):void 0}})})}(jQuery),+function(t){"use strict"
+function e(e){return this.each(function(){var i=t(this),n=i.data("bs.alert")
+n||i.data("bs.alert",n=new o(this)),"string"==typeof e&&n[e].call(i)})}var i='[data-dismiss="alert"]',o=function(e){t(e).on("click",i,this.close)}
+o.VERSION="3.3.7",o.TRANSITION_DURATION=150,o.prototype.close=function(e){function i(){a.detach().trigger("closed.bs.alert").remove()}var n=t(this),s=n.attr("data-target")
+s||(s=n.attr("href"),s=s&&s.replace(/.*(?=#[^\s]*$)/,""))
+var a=t("#"===s?[]:s)
+e&&e.preventDefault(),a.length||(a=n.closest(".alert")),a.trigger(e=t.Event("close.bs.alert")),e.isDefaultPrevented()||(a.removeClass("in"),t.support.transition&&a.hasClass("fade")?a.one("bsTransitionEnd",i).emulateTransitionEnd(o.TRANSITION_DURATION):i())}
+var n=t.fn.alert
+t.fn.alert=e,t.fn.alert.Constructor=o,t.fn.alert.noConflict=function(){return t.fn.alert=n,this},t(document).on("click.bs.alert.data-api",i,o.prototype.close)}(jQuery),+function(t){"use strict"
+function e(e){return this.each(function(){var o=t(this),n=o.data("bs.button"),s="object"==typeof e&&e
+n||o.data("bs.button",n=new i(this,s)),"toggle"==e?n.toggle():e&&n.setState(e)})}var i=function(e,o){this.$element=t(e),this.options=t.extend({},i.DEFAULTS,o),this.isLoading=!1}
+i.VERSION="3.3.7",i.DEFAULTS={loadingText:null},i.prototype.setState=function(e){var i="disabled",o=this.$element,n=o.is("input")?"val":"html",s=o.data()
+e+="Text",null==s.resetText&&o.data("resetText",o[n]()),setTimeout(t.proxy(function(){this.options[e]&&o[n](null==s[e]?this.options[e]:s[e]),"loadingText"==e?(this.isLoading=!0,o.addClass(i).attr(i,i).prop(i,!0)):this.isLoading&&(this.isLoading=!1,o.removeClass(i).removeAttr(i).prop(i,!1))},this),0)},i.prototype.toggle=function(){var t=!0,e=this.$element.closest('[data-toggle="buttons"]')
+if(e.length){var i=this.$element.find("input")
+"radio"==i.prop("type")?(i.prop("checked")&&(t=!1),e.find(".active").removeClass("active"),this.$element.addClass("active")):"checkbox"==i.prop("type")&&(i.prop("checked")!==this.$element.hasClass("active")&&(t=!1),this.$element.toggleClass("active")),i.prop("checked",this.$element.hasClass("active")),t&&i.trigger("change")}else this.$element.attr("aria-pressed",!this.$element.hasClass("active")),this.$element.toggleClass("active")}
+var o=t.fn.button
+t.fn.button=e,t.fn.button.Constructor=i,t.fn.button.noConflict=function(){return t.fn.button=o,this},t(document).on("click.bs.button.data-api",'[data-toggle^="button"]',function(i){var o=t(i.target).closest(".btn")
+e.call(o,"toggle"),t(i.target).is('input[type="radio"], input[type="checkbox"]')||(i.preventDefault(),o.is("input,button")?o.trigger("focus"):o.find("input:visible,button:visible").first().trigger("focus"))}).on("focus.bs.button.data-api blur.bs.button.data-api",'[data-toggle^="button"]',function(e){t(e.target).closest(".btn").toggleClass("focus",/^focus(in)?$/.test(e.type))})}(jQuery),+function(t){"use strict"
+function e(e){return this.each(function(){var o=t(this),n=o.data("bs.carousel"),s=t.extend({},i.DEFAULTS,o.data(),"object"==typeof e&&e),a="string"==typeof e?e:s.slide
+n||o.data("bs.carousel",n=new i(this,s)),"number"==typeof e?n.to(e):a?n[a]():s.interval&&n.pause().cycle()})}var i=function(e,i){this.$element=t(e),this.$indicators=this.$element.find(".carousel-indicators"),this.options=i,this.paused=null,this.sliding=null,this.interval=null,this.$active=null,this.$items=null,this.options.keyboard&&this.$element.on("keydown.bs.carousel",t.proxy(this.keydown,this)),"hover"==this.options.pause&&!("ontouchstart"in document.documentElement)&&this.$element.on("mouseenter.bs.carousel",t.proxy(this.pause,this)).on("mouseleave.bs.carousel",t.proxy(this.cycle,this))}
+i.VERSION="3.3.7",i.TRANSITION_DURATION=600,i.DEFAULTS={interval:5e3,pause:"hover",wrap:!0,keyboard:!0},i.prototype.keydown=function(t){if(!/input|textarea/i.test(t.target.tagName)){switch(t.which){case 37:this.prev()
+break
+case 39:this.next()
+break
+default:return}t.preventDefault()}},i.prototype.cycle=function(e){return e||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(t.proxy(this.next,this),this.options.interval)),this},i.prototype.getItemIndex=function(t){return this.$items=t.parent().children(".item"),this.$items.index(t||this.$active)},i.prototype.getItemForDirection=function(t,e){var i=this.getItemIndex(e),o="prev"==t&&0===i||"next"==t&&i==this.$items.length-1
+if(o&&!this.options.wrap)return e
+var n="prev"==t?-1:1,s=(i+n)%this.$items.length
+return this.$items.eq(s)},i.prototype.to=function(t){var e=this,i=this.getItemIndex(this.$active=this.$element.find(".item.active"))
+return t>this.$items.length-1||0>t?void 0:this.sliding?this.$element.one("slid.bs.carousel",function(){e.to(t)}):i==t?this.pause().cycle():this.slide(t>i?"next":"prev",this.$items.eq(t))},i.prototype.pause=function(e){return e||(this.paused=!0),this.$element.find(".next, .prev").length&&t.support.transition&&(this.$element.trigger(t.support.transition.end),this.cycle(!0)),this.interval=clearInterval(this.interval),this},i.prototype.next=function(){return this.sliding?void 0:this.slide("next")},i.prototype.prev=function(){return this.sliding?void 0:this.slide("prev")},i.prototype.slide=function(e,o){var n=this.$element.find(".item.active"),s=o||this.getItemForDirection(e,n),a=this.interval,r="next"==e?"left":"right",l=this
+if(s.hasClass("active"))return this.sliding=!1
+var h=s[0],d=t.Event("slide.bs.carousel",{relatedTarget:h,direction:r})
+if(this.$element.trigger(d),!d.isDefaultPrevented()){if(this.sliding=!0,a&&this.pause(),this.$indicators.length){this.$indicators.find(".active").removeClass("active")
+var p=t(this.$indicators.children()[this.getItemIndex(s)])
+p&&p.addClass("active")}var c=t.Event("slid.bs.carousel",{relatedTarget:h,direction:r})
+return t.support.transition&&this.$element.hasClass("slide")?(s.addClass(e),s[0].offsetWidth,n.addClass(r),s.addClass(r),n.one("bsTransitionEnd",function(){s.removeClass([e,r].join(" ")).addClass("active"),n.removeClass(["active",r].join(" ")),l.sliding=!1,setTimeout(function(){l.$element.trigger(c)},0)}).emulateTransitionEnd(i.TRANSITION_DURATION)):(n.removeClass("active"),s.addClass("active"),this.sliding=!1,this.$element.trigger(c)),a&&this.cycle(),this}}
+var o=t.fn.carousel
+t.fn.carousel=e,t.fn.carousel.Constructor=i,t.fn.carousel.noConflict=function(){return t.fn.carousel=o,this}
+var n=function(i){var o,n=t(this),s=t(n.attr("data-target")||(o=n.attr("href"))&&o.replace(/.*(?=#[^\s]+$)/,""))
+if(s.hasClass("carousel")){var a=t.extend({},s.data(),n.data()),r=n.attr("data-slide-to")
+r&&(a.interval=!1),e.call(s,a),r&&s.data("bs.carousel").to(r),i.preventDefault()}}
+t(document).on("click.bs.carousel.data-api","[data-slide]",n).on("click.bs.carousel.data-api","[data-slide-to]",n),t(window).on("load",function(){t('[data-ride="carousel"]').each(function(){var i=t(this)
+e.call(i,i.data())})})}(jQuery),+function(t){"use strict"
+function e(e){var i,o=e.attr("data-target")||(i=e.attr("href"))&&i.replace(/.*(?=#[^\s]+$)/,"")
+return t(o)}function i(e){return this.each(function(){var i=t(this),n=i.data("bs.collapse"),s=t.extend({},o.DEFAULTS,i.data(),"object"==typeof e&&e)
+!n&&s.toggle&&/show|hide/.test(e)&&(s.toggle=!1),n||i.data("bs.collapse",n=new o(this,s)),"string"==typeof e&&n[e]()})}var o=function(e,i){this.$element=t(e),this.options=t.extend({},o.DEFAULTS,i),this.$trigger=t('[data-toggle="collapse"][href="#'+e.id+'"],[data-toggle="collapse"][data-target="#'+e.id+'"]'),this.transitioning=null,this.options.parent?this.$parent=this.getParent():this.addAriaAndCollapsedClass(this.$element,this.$trigger),this.options.toggle&&this.toggle()}
+o.VERSION="3.3.7",o.TRANSITION_DURATION=350,o.DEFAULTS={toggle:!0},o.prototype.dimension=function(){var t=this.$element.hasClass("width")
+return t?"width":"height"},o.prototype.show=function(){if(!this.transitioning&&!this.$element.hasClass("in")){var e,n=this.$parent&&this.$parent.children(".panel").children(".in, .collapsing")
+if(!(n&&n.length&&(e=n.data("bs.collapse"),e&&e.transitioning))){var s=t.Event("show.bs.collapse")
+if(this.$element.trigger(s),!s.isDefaultPrevented()){n&&n.length&&(i.call(n,"hide"),e||n.data("bs.collapse",null))
+var a=this.dimension()
+this.$element.removeClass("collapse").addClass("collapsing")[a](0).attr("aria-expanded",!0),this.$trigger.removeClass("collapsed").attr("aria-expanded",!0),this.transitioning=1
+var r=function(){this.$element.removeClass("collapsing").addClass("collapse in")[a](""),this.transitioning=0,this.$element.trigger("shown.bs.collapse")}
+if(!t.support.transition)return r.call(this)
+var l=t.camelCase(["scroll",a].join("-"))
+this.$element.one("bsTransitionEnd",t.proxy(r,this)).emulateTransitionEnd(o.TRANSITION_DURATION)[a](this.$element[0][l])}}}},o.prototype.hide=function(){if(!this.transitioning&&this.$element.hasClass("in")){var e=t.Event("hide.bs.collapse")
+if(this.$element.trigger(e),!e.isDefaultPrevented()){var i=this.dimension()
+this.$element[i](this.$element[i]())[0].offsetHeight,this.$element.addClass("collapsing").removeClass("collapse in").attr("aria-expanded",!1),this.$trigger.addClass("collapsed").attr("aria-expanded",!1),this.transitioning=1
+var n=function(){this.transitioning=0,this.$element.removeClass("collapsing").addClass("collapse").trigger("hidden.bs.collapse")}
+return t.support.transition?void this.$element[i](0).one("bsTransitionEnd",t.proxy(n,this)).emulateTransitionEnd(o.TRANSITION_DURATION):n.call(this)}}},o.prototype.toggle=function(){this[this.$element.hasClass("in")?"hide":"show"]()},o.prototype.getParent=function(){return t(this.options.parent).find('[data-toggle="collapse"][data-parent="'+this.options.parent+'"]').each(t.proxy(function(i,o){var n=t(o)
+this.addAriaAndCollapsedClass(e(n),n)},this)).end()},o.prototype.addAriaAndCollapsedClass=function(t,e){var i=t.hasClass("in")
+t.attr("aria-expanded",i),e.toggleClass("collapsed",!i).attr("aria-expanded",i)}
+var n=t.fn.collapse
+t.fn.collapse=i,t.fn.collapse.Constructor=o,t.fn.collapse.noConflict=function(){return t.fn.collapse=n,this},t(document).on("click.bs.collapse.data-api",'[data-toggle="collapse"]',function(o){var n=t(this)
+n.attr("data-target")||o.preventDefault()
+var s=e(n),a=s.data("bs.collapse"),r=a?"toggle":n.data()
+i.call(s,r)})}(jQuery),+function(t){"use strict"
+function e(e){var i=e.attr("data-target")
+i||(i=e.attr("href"),i=i&&/#[A-Za-z]/.test(i)&&i.replace(/.*(?=#[^\s]*$)/,""))
+var o=i&&t(i)
+return o&&o.length?o:e.parent()}function i(i){i&&3===i.which||(t(n).remove(),t(s).each(function(){var o=t(this),n=e(o),s={relatedTarget:this}
+n.hasClass("open")&&(i&&"click"==i.type&&/input|textarea/i.test(i.target.tagName)&&t.contains(n[0],i.target)||(n.trigger(i=t.Event("hide.bs.dropdown",s)),i.isDefaultPrevented()||(o.attr("aria-expanded","false"),n.removeClass("open").trigger(t.Event("hidden.bs.dropdown",s)))))}))}function o(e){return this.each(function(){var i=t(this),o=i.data("bs.dropdown")
+o||i.data("bs.dropdown",o=new a(this)),"string"==typeof e&&o[e].call(i)})}var n=".dropdown-backdrop",s='[data-toggle="dropdown"]',a=function(e){t(e).on("click.bs.dropdown",this.toggle)}
+a.VERSION="3.3.7",a.prototype.toggle=function(o){var n=t(this)
+if(!n.is(".disabled, :disabled")){var s=e(n),a=s.hasClass("open")
+if(i(),!a){"ontouchstart"in document.documentElement&&!s.closest(".navbar-nav").length&&t(document.createElement("div")).addClass("dropdown-backdrop").insertAfter(t(this)).on("click",i)
+var r={relatedTarget:this}
+if(s.trigger(o=t.Event("show.bs.dropdown",r)),o.isDefaultPrevented())return
+n.trigger("focus").attr("aria-expanded","true"),s.toggleClass("open").trigger(t.Event("shown.bs.dropdown",r))}return!1}},a.prototype.keydown=function(i){if(/(38|40|27|32)/.test(i.which)&&!/input|textarea/i.test(i.target.tagName)){var o=t(this)
+if(i.preventDefault(),i.stopPropagation(),!o.is(".disabled, :disabled")){var n=e(o),a=n.hasClass("open")
+if(!a&&27!=i.which||a&&27==i.which)return 27==i.which&&n.find(s).trigger("focus"),o.trigger("click")
+var r=" li:not(.disabled):visible a",l=n.find(".dropdown-menu"+r)
+if(l.length){var h=l.index(i.target)
+38==i.which&&h>0&&h--,40==i.which&&h<l.length-1&&h++,~h||(h=0),l.eq(h).trigger("focus")}}}}
+var r=t.fn.dropdown
+t.fn.dropdown=o,t.fn.dropdown.Constructor=a,t.fn.dropdown.noConflict=function(){return t.fn.dropdown=r,this},t(document).on("click.bs.dropdown.data-api",i).on("click.bs.dropdown.data-api",".dropdown form",function(t){t.stopPropagation()}).on("click.bs.dropdown.data-api",s,a.prototype.toggle).on("keydown.bs.dropdown.data-api",s,a.prototype.keydown).on("keydown.bs.dropdown.data-api",".dropdown-menu",a.prototype.keydown)}(jQuery),+function(t){"use strict"
+function e(e,o){return this.each(function(){var n=t(this),s=n.data("bs.modal"),a=t.extend({},i.DEFAULTS,n.data(),"object"==typeof e&&e)
+s||n.data("bs.modal",s=new i(this,a)),"string"==typeof e?s[e](o):a.show&&s.show(o)})}var i=function(e,i){this.options=i,this.$body=t(document.body),this.$element=t(e),this.$dialog=this.$element.find(".modal-dialog"),this.$backdrop=null,this.isShown=null,this.originalBodyPad=null,this.scrollbarWidth=0,this.ignoreBackdropClick=!1,this.options.remote&&this.$element.find(".modal-content").load(this.options.remote,t.proxy(function(){this.$element.trigger("loaded.bs.modal")},this))}
+i.VERSION="3.3.7",i.TRANSITION_DURATION=300,i.BACKDROP_TRANSITION_DURATION=150,i.DEFAULTS={backdrop:!0,keyboard:!0,show:!0},i.prototype.toggle=function(t){return this.isShown?this.hide():this.show(t)},i.prototype.show=function(e){var o=this,n=t.Event("show.bs.modal",{relatedTarget:e})
+this.$element.trigger(n),this.isShown||n.isDefaultPrevented()||(this.isShown=!0,this.checkScrollbar(),this.setScrollbar(),this.$body.addClass("modal-open"),this.escape(),this.resize(),this.$element.on("click.dismiss.bs.modal",'[data-dismiss="modal"]',t.proxy(this.hide,this)),this.$dialog.on("mousedown.dismiss.bs.modal",function(){o.$element.one("mouseup.dismiss.bs.modal",function(e){t(e.target).is(o.$element)&&(o.ignoreBackdropClick=!0)})}),this.backdrop(function(){var n=t.support.transition&&o.$element.hasClass("fade")
+o.$element.parent().length||o.$element.appendTo(o.$body),o.$element.show().scrollTop(0),o.adjustDialog(),n&&o.$element[0].offsetWidth,o.$element.addClass("in"),o.enforceFocus()
+var s=t.Event("shown.bs.modal",{relatedTarget:e})
+n?o.$dialog.one("bsTransitionEnd",function(){o.$element.trigger("focus").trigger(s)}).emulateTransitionEnd(i.TRANSITION_DURATION):o.$element.trigger("focus").trigger(s)}))},i.prototype.hide=function(e){e&&e.preventDefault(),e=t.Event("hide.bs.modal"),this.$element.trigger(e),this.isShown&&!e.isDefaultPrevented()&&(this.isShown=!1,this.escape(),this.resize(),t(document).off("focusin.bs.modal"),this.$element.removeClass("in").off("click.dismiss.bs.modal").off("mouseup.dismiss.bs.modal"),this.$dialog.off("mousedown.dismiss.bs.modal"),t.support.transition&&this.$element.hasClass("fade")?this.$element.one("bsTransitionEnd",t.proxy(this.hideModal,this)).emulateTransitionEnd(i.TRANSITION_DURATION):this.hideModal())},i.prototype.enforceFocus=function(){t(document).off("focusin.bs.modal").on("focusin.bs.modal",t.proxy(function(t){document===t.target||this.$element[0]===t.target||this.$element.has(t.target).length||this.$element.trigger("focus")},this))},i.prototype.escape=function(){this.isShown&&this.options.keyboard?this.$element.on("keydown.dismiss.bs.modal",t.proxy(function(t){27==t.which&&this.hide()},this)):this.isShown||this.$element.off("keydown.dismiss.bs.modal")},i.prototype.resize=function(){this.isShown?t(window).on("resize.bs.modal",t.proxy(this.handleUpdate,this)):t(window).off("resize.bs.modal")},i.prototype.hideModal=function(){var t=this
+this.$element.hide(),this.backdrop(function(){t.$body.removeClass("modal-open"),t.resetAdjustments(),t.resetScrollbar(),t.$element.trigger("hidden.bs.modal")})},i.prototype.removeBackdrop=function(){this.$backdrop&&this.$backdrop.remove(),this.$backdrop=null},i.prototype.backdrop=function(e){var o=this,n=this.$element.hasClass("fade")?"fade":""
+if(this.isShown&&this.options.backdrop){var s=t.support.transition&&n
+if(this.$backdrop=t(document.createElement("div")).addClass("modal-backdrop "+n).appendTo(this.$body),this.$element.on("click.dismiss.bs.modal",t.proxy(function(t){return this.ignoreBackdropClick?void(this.ignoreBackdropClick=!1):void(t.target===t.currentTarget&&("static"==this.options.backdrop?this.$element[0].focus():this.hide()))},this)),s&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),!e)return
+s?this.$backdrop.one("bsTransitionEnd",e).emulateTransitionEnd(i.BACKDROP_TRANSITION_DURATION):e()}else if(!this.isShown&&this.$backdrop){this.$backdrop.removeClass("in")
+var a=function(){o.removeBackdrop(),e&&e()}
+t.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one("bsTransitionEnd",a).emulateTransitionEnd(i.BACKDROP_TRANSITION_DURATION):a()}else e&&e()},i.prototype.handleUpdate=function(){this.adjustDialog()},i.prototype.adjustDialog=function(){var t=this.$element[0].scrollHeight>document.documentElement.clientHeight
+this.$element.css({paddingLeft:!this.bodyIsOverflowing&&t?this.scrollbarWidth:"",paddingRight:this.bodyIsOverflowing&&!t?this.scrollbarWidth:""})},i.prototype.resetAdjustments=function(){this.$element.css({paddingLeft:"",paddingRight:""})},i.prototype.checkScrollbar=function(){var t=window.innerWidth
+if(!t){var e=document.documentElement.getBoundingClientRect()
+t=e.right-Math.abs(e.left)}this.bodyIsOverflowing=document.body.clientWidth<t,this.scrollbarWidth=this.measureScrollbar()},i.prototype.setScrollbar=function(){var t=parseInt(this.$body.css("padding-right")||0,10)
+this.originalBodyPad=document.body.style.paddingRight||"",this.bodyIsOverflowing&&this.$body.css("padding-right",t+this.scrollbarWidth)},i.prototype.resetScrollbar=function(){this.$body.css("padding-right",this.originalBodyPad)},i.prototype.measureScrollbar=function(){var t=document.createElement("div")
+t.className="modal-scrollbar-measure",this.$body.append(t)
+var e=t.offsetWidth-t.clientWidth
+return this.$body[0].removeChild(t),e}
+var o=t.fn.modal
+t.fn.modal=e,t.fn.modal.Constructor=i,t.fn.modal.noConflict=function(){return t.fn.modal=o,this},t(document).on("click.bs.modal.data-api",'[data-toggle="modal"]',function(i){var o=t(this),n=o.attr("href"),s=t(o.attr("data-target")||n&&n.replace(/.*(?=#[^\s]+$)/,"")),a=s.data("bs.modal")?"toggle":t.extend({remote:!/#/.test(n)&&n},s.data(),o.data())
+o.is("a")&&i.preventDefault(),s.one("show.bs.modal",function(t){t.isDefaultPrevented()||s.one("hidden.bs.modal",function(){o.is(":visible")&&o.trigger("focus")})}),e.call(s,a,this)})}(jQuery),+function(t){"use strict"
+function e(e){return this.each(function(){var o=t(this),n=o.data("bs.tooltip"),s="object"==typeof e&&e;(n||!/destroy|hide/.test(e))&&(n||o.data("bs.tooltip",n=new i(this,s)),"string"==typeof e&&n[e]())})}var i=function(t,e){this.type=null,this.options=null,this.enabled=null,this.timeout=null,this.hoverState=null,this.$element=null,this.inState=null,this.init("tooltip",t,e)}
+i.VERSION="3.3.7",i.TRANSITION_DURATION=150,i.DEFAULTS={animation:!0,placement:"top",selector:!1,template:'<div class="tooltip" role="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',trigger:"hover focus",title:"",delay:0,html:!1,container:!1,viewport:{selector:"body",padding:0}},i.prototype.init=function(e,i,o){if(this.enabled=!0,this.type=e,this.$element=t(i),this.options=this.getOptions(o),this.$viewport=this.options.viewport&&t(t.isFunction(this.options.viewport)?this.options.viewport.call(this,this.$element):this.options.viewport.selector||this.options.viewport),this.inState={click:!1,hover:!1,focus:!1},this.$element[0]instanceof document.constructor&&!this.options.selector)throw Error("`selector` option must be specified when initializing "+this.type+" on the window.document object!")
+for(var n=this.options.trigger.split(" "),s=n.length;s--;){var a=n[s]
+if("click"==a)this.$element.on("click."+this.type,this.options.selector,t.proxy(this.toggle,this))
+else if("manual"!=a){var r="hover"==a?"mouseenter":"focusin",l="hover"==a?"mouseleave":"focusout"
+this.$element.on(r+"."+this.type,this.options.selector,t.proxy(this.enter,this)),this.$element.on(l+"."+this.type,this.options.selector,t.proxy(this.leave,this))}}this.options.selector?this._options=t.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},i.prototype.getDefaults=function(){return i.DEFAULTS},i.prototype.getOptions=function(e){return e=t.extend({},this.getDefaults(),this.$element.data(),e),e.delay&&"number"==typeof e.delay&&(e.delay={show:e.delay,hide:e.delay}),e},i.prototype.getDelegateOptions=function(){var e={},i=this.getDefaults()
+return this._options&&t.each(this._options,function(t,o){i[t]!=o&&(e[t]=o)}),e},i.prototype.enter=function(e){var i=e instanceof this.constructor?e:t(e.currentTarget).data("bs."+this.type)
+return i||(i=new this.constructor(e.currentTarget,this.getDelegateOptions()),t(e.currentTarget).data("bs."+this.type,i)),e instanceof t.Event&&(i.inState["focusin"==e.type?"focus":"hover"]=!0),i.tip().hasClass("in")||"in"==i.hoverState?void(i.hoverState="in"):(clearTimeout(i.timeout),i.hoverState="in",i.options.delay&&i.options.delay.show?void(i.timeout=setTimeout(function(){"in"==i.hoverState&&i.show()},i.options.delay.show)):i.show())},i.prototype.isInStateTrue=function(){for(var t in this.inState)if(this.inState[t])return!0
+return!1},i.prototype.leave=function(e){var i=e instanceof this.constructor?e:t(e.currentTarget).data("bs."+this.type)
+return i||(i=new this.constructor(e.currentTarget,this.getDelegateOptions()),t(e.currentTarget).data("bs."+this.type,i)),e instanceof t.Event&&(i.inState["focusout"==e.type?"focus":"hover"]=!1),i.isInStateTrue()?void 0:(clearTimeout(i.timeout),i.hoverState="out",i.options.delay&&i.options.delay.hide?void(i.timeout=setTimeout(function(){"out"==i.hoverState&&i.hide()},i.options.delay.hide)):i.hide())},i.prototype.show=function(){var e=t.Event("show.bs."+this.type)
+if(this.hasContent()&&this.enabled){this.$element.trigger(e)
+var o=t.contains(this.$element[0].ownerDocument.documentElement,this.$element[0])
+if(e.isDefaultPrevented()||!o)return
+var n=this,s=this.tip(),a=this.getUID(this.type)
+this.setContent(),s.attr("id",a),this.$element.attr("aria-describedby",a),this.options.animation&&s.addClass("fade")
+var r="function"==typeof this.options.placement?this.options.placement.call(this,s[0],this.$element[0]):this.options.placement,l=/\s?auto?\s?/i,h=l.test(r)
+h&&(r=r.replace(l,"")||"top"),s.detach().css({top:0,left:0,display:"block"}).addClass(r).data("bs."+this.type,this),this.options.container?s.appendTo(this.options.container):s.insertAfter(this.$element),this.$element.trigger("inserted.bs."+this.type)
+var d=this.getPosition(),p=s[0].offsetWidth,c=s[0].offsetHeight
+if(h){var f=r,u=this.getPosition(this.$viewport)
+r="bottom"==r&&d.bottom+c>u.bottom?"top":"top"==r&&d.top-c<u.top?"bottom":"right"==r&&d.right+p>u.width?"left":"left"==r&&d.left-p<u.left?"right":r,s.removeClass(f).addClass(r)}var g=this.getCalculatedOffset(r,d,p,c)
+this.applyPlacement(g,r)
+var m=function(){var t=n.hoverState
+n.$element.trigger("shown.bs."+n.type),n.hoverState=null,"out"==t&&n.leave(n)}
+t.support.transition&&this.$tip.hasClass("fade")?s.one("bsTransitionEnd",m).emulateTransitionEnd(i.TRANSITION_DURATION):m()}},i.prototype.applyPlacement=function(e,i){var o=this.tip(),n=o[0].offsetWidth,s=o[0].offsetHeight,a=parseInt(o.css("margin-top"),10),r=parseInt(o.css("margin-left"),10)
+isNaN(a)&&(a=0),isNaN(r)&&(r=0),e.top+=a,e.left+=r,t.offset.setOffset(o[0],t.extend({using:function(t){o.css({top:Math.round(t.top),left:Math.round(t.left)})}},e),0),o.addClass("in")
+var l=o[0].offsetWidth,h=o[0].offsetHeight
+"top"==i&&h!=s&&(e.top=e.top+s-h)
+var d=this.getViewportAdjustedDelta(i,e,l,h)
+d.left?e.left+=d.left:e.top+=d.top
+var p=/top|bottom/.test(i),c=p?2*d.left-n+l:2*d.top-s+h,f=p?"offsetWidth":"offsetHeight"
+o.offset(e),this.replaceArrow(c,o[0][f],p)},i.prototype.replaceArrow=function(t,e,i){this.arrow().css(i?"left":"top",50*(1-t/e)+"%").css(i?"top":"left","")},i.prototype.setContent=function(){var t=this.tip(),e=this.getTitle()
+t.find(".tooltip-inner")[this.options.html?"html":"text"](e),t.removeClass("fade in top bottom left right")},i.prototype.hide=function(e){function o(){"in"!=n.hoverState&&s.detach(),n.$element&&n.$element.removeAttr("aria-describedby").trigger("hidden.bs."+n.type),e&&e()}var n=this,s=t(this.$tip),a=t.Event("hide.bs."+this.type)
+return this.$element.trigger(a),a.isDefaultPrevented()?void 0:(s.removeClass("in"),t.support.transition&&s.hasClass("fade")?s.one("bsTransitionEnd",o).emulateTransitionEnd(i.TRANSITION_DURATION):o(),this.hoverState=null,this)},i.prototype.fixTitle=function(){var t=this.$element;(t.attr("title")||"string"!=typeof t.attr("data-original-title"))&&t.attr("data-original-title",t.attr("title")||"").attr("title","")},i.prototype.hasContent=function(){return this.getTitle()},i.prototype.getPosition=function(e){e=e||this.$element
+var i=e[0],o="BODY"==i.tagName,n=i.getBoundingClientRect()
+null==n.width&&(n=t.extend({},n,{width:n.right-n.left,height:n.bottom-n.top}))
+var s=window.SVGElement&&i instanceof window.SVGElement,a=o?{top:0,left:0}:s?null:e.offset(),r={scroll:o?document.documentElement.scrollTop||document.body.scrollTop:e.scrollTop()},l=o?{width:t(window).width(),height:t(window).height()}:null
+return t.extend({},n,r,l,a)},i.prototype.getCalculatedOffset=function(t,e,i,o){return"bottom"==t?{top:e.top+e.height,left:e.left+e.width/2-i/2}:"top"==t?{top:e.top-o,left:e.left+e.width/2-i/2}:"left"==t?{top:e.top+e.height/2-o/2,left:e.left-i}:{top:e.top+e.height/2-o/2,left:e.left+e.width}},i.prototype.getViewportAdjustedDelta=function(t,e,i,o){var n={top:0,left:0}
+if(!this.$viewport)return n
+var s=this.options.viewport&&this.options.viewport.padding||0,a=this.getPosition(this.$viewport)
+if(/right|left/.test(t)){var r=e.top-s-a.scroll,l=e.top+s-a.scroll+o
+r<a.top?n.top=a.top-r:l>a.top+a.height&&(n.top=a.top+a.height-l)}else{var h=e.left-s,d=e.left+s+i
+h<a.left?n.left=a.left-h:d>a.right&&(n.left=a.left+a.width-d)}return n},i.prototype.getTitle=function(){var t,e=this.$element,i=this.options
+return t=e.attr("data-original-title")||("function"==typeof i.title?i.title.call(e[0]):i.title)},i.prototype.getUID=function(t){do t+=~~(1e6*Math.random())
+while(document.getElementById(t))
+return t},i.prototype.tip=function(){if(!this.$tip&&(this.$tip=t(this.options.template),1!=this.$tip.length))throw Error(this.type+" `template` option must consist of exactly 1 top-level element!")
+return this.$tip},i.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".tooltip-arrow")},i.prototype.enable=function(){this.enabled=!0},i.prototype.disable=function(){this.enabled=!1},i.prototype.toggleEnabled=function(){this.enabled=!this.enabled},i.prototype.toggle=function(e){var i=this
+e&&(i=t(e.currentTarget).data("bs."+this.type),i||(i=new this.constructor(e.currentTarget,this.getDelegateOptions()),t(e.currentTarget).data("bs."+this.type,i))),e?(i.inState.click=!i.inState.click,i.isInStateTrue()?i.enter(i):i.leave(i)):i.tip().hasClass("in")?i.leave(i):i.enter(i)},i.prototype.destroy=function(){var t=this
+clearTimeout(this.timeout),this.hide(function(){t.$element.off("."+t.type).removeData("bs."+t.type),t.$tip&&t.$tip.detach(),t.$tip=null,t.$arrow=null,t.$viewport=null,t.$element=null})}
+var o=t.fn.tooltip
+t.fn.tooltip=e,t.fn.tooltip.Constructor=i,t.fn.tooltip.noConflict=function(){return t.fn.tooltip=o,this}}(jQuery),+function(t){"use strict"
+function e(e){return this.each(function(){var o=t(this),n=o.data("bs.popover"),s="object"==typeof e&&e;(n||!/destroy|hide/.test(e))&&(n||o.data("bs.popover",n=new i(this,s)),"string"==typeof e&&n[e]())})}var i=function(t,e){this.init("popover",t,e)}
+if(!t.fn.tooltip)throw Error("Popover requires tooltip.js")
+i.VERSION="3.3.7",i.DEFAULTS=t.extend({},t.fn.tooltip.Constructor.DEFAULTS,{placement:"right",trigger:"click",content:"",template:'<div class="popover" role="tooltip"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'}),i.prototype=t.extend({},t.fn.tooltip.Constructor.prototype),i.prototype.constructor=i,i.prototype.getDefaults=function(){return i.DEFAULTS},i.prototype.setContent=function(){var t=this.tip(),e=this.getTitle(),i=this.getContent()
+t.find(".popover-title")[this.options.html?"html":"text"](e),t.find(".popover-content").children().detach().end()[this.options.html?"string"==typeof i?"html":"append":"text"](i),t.removeClass("fade top bottom left right in"),t.find(".popover-title").html()||t.find(".popover-title").hide()},i.prototype.hasContent=function(){return this.getTitle()||this.getContent()},i.prototype.getContent=function(){var t=this.$element,e=this.options
+return t.attr("data-content")||("function"==typeof e.content?e.content.call(t[0]):e.content)},i.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".arrow")}
+var o=t.fn.popover
+t.fn.popover=e,t.fn.popover.Constructor=i,t.fn.popover.noConflict=function(){return t.fn.popover=o,this}}(jQuery),+function(t){"use strict"
+function e(i,o){this.$body=t(document.body),this.$scrollElement=t(t(i).is(document.body)?window:i),this.options=t.extend({},e.DEFAULTS,o),this.selector=(this.options.target||"")+" .nav li > a",this.offsets=[],this.targets=[],this.activeTarget=null,this.scrollHeight=0,this.$scrollElement.on("scroll.bs.scrollspy",t.proxy(this.process,this)),this.refresh(),this.process()}function i(i){return this.each(function(){var o=t(this),n=o.data("bs.scrollspy"),s="object"==typeof i&&i
+n||o.data("bs.scrollspy",n=new e(this,s)),"string"==typeof i&&n[i]()})}e.VERSION="3.3.7",e.DEFAULTS={offset:10},e.prototype.getScrollHeight=function(){return this.$scrollElement[0].scrollHeight||Math.max(this.$body[0].scrollHeight,document.documentElement.scrollHeight)},e.prototype.refresh=function(){var e=this,i="offset",o=0
+this.offsets=[],this.targets=[],this.scrollHeight=this.getScrollHeight(),t.isWindow(this.$scrollElement[0])||(i="position",o=this.$scrollElement.scrollTop()),this.$body.find(this.selector).map(function(){var e=t(this),n=e.data("target")||e.attr("href"),s=/^#./.test(n)&&t(n)
+return s&&s.length&&s.is(":visible")&&[[s[i]().top+o,n]]||null}).sort(function(t,e){return t[0]-e[0]}).each(function(){e.offsets.push(this[0]),e.targets.push(this[1])})},e.prototype.process=function(){var t,e=this.$scrollElement.scrollTop()+this.options.offset,i=this.getScrollHeight(),o=this.options.offset+i-this.$scrollElement.height(),n=this.offsets,s=this.targets,a=this.activeTarget
+if(this.scrollHeight!=i&&this.refresh(),e>=o)return a!=(t=s[s.length-1])&&this.activate(t)
+if(a&&e<n[0])return this.activeTarget=null,this.clear()
+for(t=n.length;t--;)a!=s[t]&&e>=n[t]&&(void 0===n[t+1]||e<n[t+1])&&this.activate(s[t])},e.prototype.activate=function(e){this.activeTarget=e,this.clear()
+var i=this.selector+'[data-target="'+e+'"],'+this.selector+'[href="'+e+'"]',o=t(i).parents("li").addClass("active")
+o.parent(".dropdown-menu").length&&(o=o.closest("li.dropdown").addClass("active")),o.trigger("activate.bs.scrollspy")},e.prototype.clear=function(){t(this.selector).parentsUntil(this.options.target,".active").removeClass("active")}
+var o=t.fn.scrollspy
+t.fn.scrollspy=i,t.fn.scrollspy.Constructor=e,t.fn.scrollspy.noConflict=function(){return t.fn.scrollspy=o,this},t(window).on("load.bs.scrollspy.data-api",function(){t('[data-spy="scroll"]').each(function(){var e=t(this)
+i.call(e,e.data())})})}(jQuery),+function(t){"use strict"
+function e(e){return this.each(function(){var o=t(this),n=o.data("bs.tab")
+n||o.data("bs.tab",n=new i(this)),"string"==typeof e&&n[e]()})}var i=function(e){this.element=t(e)}
+i.VERSION="3.3.7",i.TRANSITION_DURATION=150,i.prototype.show=function(){var e=this.element,i=e.closest("ul:not(.dropdown-menu)"),o=e.data("target")
+if(o||(o=e.attr("href"),o=o&&o.replace(/.*(?=#[^\s]*$)/,"")),!e.parent("li").hasClass("active")){var n=i.find(".active:last a"),s=t.Event("hide.bs.tab",{relatedTarget:e[0]}),a=t.Event("show.bs.tab",{relatedTarget:n[0]})
+if(n.trigger(s),e.trigger(a),!a.isDefaultPrevented()&&!s.isDefaultPrevented()){var r=t(o)
+this.activate(e.closest("li"),i),this.activate(r,r.parent(),function(){n.trigger({type:"hidden.bs.tab",relatedTarget:e[0]}),e.trigger({type:"shown.bs.tab",relatedTarget:n[0]})})}}},i.prototype.activate=function(e,o,n){function s(){a.removeClass("active").find("> .dropdown-menu > .active").removeClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!1),e.addClass("active").find('[data-toggle="tab"]').attr("aria-expanded",!0),r?(e[0].offsetWidth,e.addClass("in")):e.removeClass("fade"),e.parent(".dropdown-menu").length&&e.closest("li.dropdown").addClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!0),n&&n()}var a=o.find("> .active"),r=n&&t.support.transition&&(a.length&&a.hasClass("fade")||!!o.find("> .fade").length)
+a.length&&r?a.one("bsTransitionEnd",s).emulateTransitionEnd(i.TRANSITION_DURATION):s(),a.removeClass("in")}
+var o=t.fn.tab
+t.fn.tab=e,t.fn.tab.Constructor=i,t.fn.tab.noConflict=function(){return t.fn.tab=o,this}
+var n=function(i){i.preventDefault(),e.call(t(this),"show")}
+t(document).on("click.bs.tab.data-api",'[data-toggle="tab"]',n).on("click.bs.tab.data-api",'[data-toggle="pill"]',n)}(jQuery),+function(t){"use strict"
+function e(e){return this.each(function(){var o=t(this),n=o.data("bs.affix"),s="object"==typeof e&&e
+n||o.data("bs.affix",n=new i(this,s)),"string"==typeof e&&n[e]()})}var i=function(e,o){this.options=t.extend({},i.DEFAULTS,o),this.$target=t(this.options.target).on("scroll.bs.affix.data-api",t.proxy(this.checkPosition,this)).on("click.bs.affix.data-api",t.proxy(this.checkPositionWithEventLoop,this)),this.$element=t(e),this.affixed=null,this.unpin=null,this.pinnedOffset=null,this.checkPosition()}
+i.VERSION="3.3.7",i.RESET="affix affix-top affix-bottom",i.DEFAULTS={offset:0,target:window},i.prototype.getState=function(t,e,i,o){var n=this.$target.scrollTop(),s=this.$element.offset(),a=this.$target.height()
+if(null!=i&&"top"==this.affixed)return i>n?"top":!1
+if("bottom"==this.affixed)return null!=i?n+this.unpin<=s.top?!1:"bottom":t-o>=n+a?!1:"bottom"
+var r=null==this.affixed,l=r?n:s.top,h=r?a:e
+return null!=i&&i>=n?"top":null!=o&&l+h>=t-o?"bottom":!1},i.prototype.getPinnedOffset=function(){if(this.pinnedOffset)return this.pinnedOffset
+this.$element.removeClass(i.RESET).addClass("affix")
+var t=this.$target.scrollTop(),e=this.$element.offset()
+return this.pinnedOffset=e.top-t},i.prototype.checkPositionWithEventLoop=function(){setTimeout(t.proxy(this.checkPosition,this),1)},i.prototype.checkPosition=function(){if(this.$element.is(":visible")){var e=this.$element.height(),o=this.options.offset,n=o.top,s=o.bottom,a=Math.max(t(document).height(),t(document.body).height())
+"object"!=typeof o&&(s=n=o),"function"==typeof n&&(n=o.top(this.$element)),"function"==typeof s&&(s=o.bottom(this.$element))
+var r=this.getState(a,e,n,s)
+if(this.affixed!=r){null!=this.unpin&&this.$element.css("top","")
+var l="affix"+(r?"-"+r:""),h=t.Event(l+".bs.affix")
+if(this.$element.trigger(h),h.isDefaultPrevented())return
+this.affixed=r,this.unpin="bottom"==r?this.getPinnedOffset():null,this.$element.removeClass(i.RESET).addClass(l).trigger(l.replace("affix","affixed")+".bs.affix")}"bottom"==r&&this.$element.offset({top:a-e-s})}}
+var o=t.fn.affix
+t.fn.affix=e,t.fn.affix.Constructor=i,t.fn.affix.noConflict=function(){return t.fn.affix=o,this},t(window).on("load",function(){t('[data-spy="affix"]').each(function(){var i=t(this),o=i.data()
+o.offset=o.offset||{},null!=o.offsetBottom&&(o.offset.bottom=o.offsetBottom),null!=o.offsetTop&&(o.offset.top=o.offsetTop),e.call(i,o)})})}(jQuery)
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/carousel/jcarousellite.js b/pluss-manage-page/src/main/resources/static/resources/auth/js/carousel/jcarousellite.js
new file mode 100644
index 0000000..7d61adb
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/carousel/jcarousellite.js
@@ -0,0 +1,157 @@
+/*  已添加鼠标浮动停止滚动 */
+(function($) { 
+  $.fn.jCarouselLite = function(o) {
+  o = $.extend({
+  btnPrev: null,	//上一个按钮的class名, 比如  btnPrev: ".prev"
+  btnNext: null,	//下一个按钮的class名, 比如  btnPrev: ".prev"
+  btnGo: null,
+  btnDisabled: 'btn-inactive', //禁用的时候的样式类名
+  mouseWheel: false,	//鼠标滑轮是否可以控制滚动,可选： true,false
+  auto: null,	//指定多少秒内容定期自动滚动。默认为空(null),是不滚动,如果设定的,单位为毫秒,如1秒为1000
+   
+  speed: 2800,	//滑动的速度,可以尝试800 1000 1500,设置成0将删除效果
+  easing: null,	//缓冲效果名称,如：easing: "bounceout",需要jquery中的easing pluin（缓冲插件实现）,只适用于jq1.2
+   
+  vertical: false,	//是否垂直滚动,可选：false,true
+  circular: true,	//是否循环滚动,默认为true,如果为false,滚动到最后一个将停止滚动
+  visible: 3,	//可见数量,可以为小数，如2.5为2.5个li
+  start: 0,	//开始的地方,默认是0
+  scroll: 1,	//每次滚动的li数量
+   
+  beforeStart: null,
+  afterEnd: null
+  }, o || {});
+   
+  return this.each(function() { // Returns the element collection. Chainable.
+   
+  var running = false, animCss=o.vertical?"top":"left", sizeCss=o.vertical?"height":"width";
+  var div = $(this), ul = $("ul", div), tLi = $("li", ul), tl = tLi.size(), v = o.visible;
+   
+  if(tl == 0) {
+  return false;
+  }
+  if(o.circular) {
+  ul.prepend(tLi.slice(tl-v-1+1).clone())
+  .append(tLi.slice(0,v).clone());
+  o.start += v;
+  }
+   
+  var li = $("li", ul), itemLength = li.size(), curr = o.start;
+  div.css("visibility", "visible");
+   
+  li.css({overflow: "hidden", 'float': o.vertical ? "none" : "left"});
+  ul.css({margin: "0", padding: "0", position: "relative", "list-style-type": "none", "z-index": "1"});
+  div.css({overflow: "hidden", position: "relative", "z-index": "2", left: "0px"});
+   
+  var liSize = o.vertical ? height(li) : width(li); // Full li size(incl margin)-Used for animation
+  var ulSize = liSize * itemLength; // size of full ul(total length, not just for the visible items)
+  var divSize = liSize * v; // size of entire div(total length for just the visible items)
+   
+  li.css({width: li.width(), height: li.height()});
+  ul.css(sizeCss, ulSize+"px").css(animCss, -(curr*liSize));
+   
+  //div.css(sizeCss, divSize+"px"); // Width of the DIV. length of visible images
+   
+  if(o.btnPrev)
+  $(o.btnPrev).click(function() {
+  return go(curr-o.scroll);
+  });
+   
+  if(o.btnNext)
+  $(o.btnNext).click(function() {
+  return go(curr+o.scroll);
+  });
+   
+  if(o.btnGo)
+  $.each(o.btnGo, function(i, val) {
+  $(val).click(function() {
+  return go(o.circular ? o.visible+i : i);
+  });
+  });
+   
+  if(o.mouseWheel && div.mousewheel)
+  div.mousewheel(function(e, d) {
+  return d>0 ? go(curr-o.scroll) : go(curr+o.scroll);
+  });
+  var jcarouselliteAutoId;
+  if(o.auto) {
+  jcarouselliteAutoId = setInterval(function() {
+  go(curr+o.scroll);
+  }, o.auto+o.speed);
+  /*  添加鼠标浮动停止滚动 */
+  ul.hover(function(){
+  clearInterval(jcarouselliteAutoId);
+  },function(){
+  jcarouselliteAutoId = setInterval(function() {
+  go(curr+o.scroll);
+  }, o.auto+o.speed);
+  });
+  };
+   
+  function vis() {
+  return li.slice(curr).slice(0,v);
+  };
+   
+  function go(to) {
+  if(tl <= 3) {
+  return false;
+  }
+   
+  if(!running) {
+   
+  if(o.beforeStart)
+  o.beforeStart.call(this, vis());
+   
+  if(o.circular) { // If circular we are in first or last, then goto the other end
+  if(to<=o.start-v-1) { // If first, then goto last
+  ul.css(animCss, -((itemLength-(v*2))*liSize)+"px");
+  // If "scroll" > 1, then the "to" might not be equal to the condition; it can be lesser depending on the number of elements.
+  curr = to==o.start-v-1 ? itemLength-(v*2)-1 : itemLength-(v*2)-o.scroll;
+  } else if(to>=itemLength-v+1) { // If last, then goto first
+  ul.css(animCss, -( (v) * liSize ) + "px" );
+  // If "scroll" > 1, then the "to" might not be equal to the condition; it can be greater depending on the number of elements.
+  curr = to==itemLength-v+1 ? v+1 : v+o.scroll;
+  } else curr = to;
+  } else { // If non-circular and to points to first or last, we just return.
+  if(to<0 || to>itemLength-v) return;
+  else curr = to;
+  } // If neither overrides it, the curr will still be "to" and we can proceed.
+   
+  running = true;
+   
+  ul.animate(
+  animCss == "left" ? { left: -(curr*liSize) } : { top: -(curr*liSize) } , o.speed, o.easing,
+  function() {
+  if(o.afterEnd)
+  o.afterEnd.call(this, vis());
+  running = false;
+  }
+  );
+  // Disable buttons when the carousel reaches the last/first, and enable when not
+  if(!o.circular) {
+  $(o.btnPrev + "," + o.btnNext).removeClass(o.btnDisabled);
+  $( (curr-o.scroll<0 && o.btnPrev)
+  ||
+  (curr+o.scroll > itemLength-v && o.btnNext)
+  ||
+  []
+  ).addClass(o.btnDisabled);
+  }
+   
+  }
+  return false;
+  };
+  });
+  };
+   
+  function css(el, prop) {
+  return parseInt($.css(el[0], prop)) || 0;
+  };
+  function width(el) {
+  return el[0].offsetWidth + css(el, 'marginLeft') + css(el, 'marginRight');
+  };
+  function height(el) {
+  return el[0].offsetHeight + css(el, 'marginTop') + css(el, 'marginBottom');
+  };
+   
+  })(jQuery);
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/carousel/jquery.kinMaxShow-1.1.src.js b/pluss-manage-page/src/main/resources/static/resources/auth/js/carousel/jquery.kinMaxShow-1.1.src.js
new file mode 100644
index 0000000..9f539b5
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/carousel/jquery.kinMaxShow-1.1.src.js
@@ -0,0 +1,292 @@
+/**
+ +-------------------------------------------------------------------------------------------------------------
+ * [全屏焦点图]插件 jquery.kinMaxShow
+ +-------------------------------------------------------------------------------------------------------------
+ * @author   Mr.kin
+ * @version  1.1
+ * @file  	 jquery.kinMaxShow-1.1.src.js
+ * @info  	 报告BUG、建议、索取最新版本 请Mail：Mr.kin@foxmail.com(注：邮件标题请包含kinMaxShow 以便于邮箱自动归档)
+ * 
+ +-------------------------------------------------------------------------------------------------------------
+ */
+ 
+(function($){
+	$.fn.kinMaxShow = function(user_options){
+			//默认设置
+			var default_options = {
+						//幻灯片高度 默认500
+						height:232,	
+						//幻灯片切换间隔时间 单位:秒
+						intervalTime:3,
+						//幻灯片切换时间 单位：毫秒 ,若设置为0 则无切换效果 直接跳到下一张
+						switchTime:1000,
+						//悬停暂停切换 鼠标停留在kinMaxShow内 是否暂停切换 默认true 悬停暂停，设置为false 悬停不暂停
+						hoverPause:true,
+						//擦除效果(切换) jQuery自带有 "linear" 和 "swing" ,如需要其他擦除效果请使用 jquery.easing.js  插件
+						easing:'linear',
+						//图片对齐方式
+						imageAlign:'center center',
+						//按钮
+						button:{
+								//按钮鼠标切换事件 可选事件 click、mouseover
+								switchEvent:'click',
+								//按钮上是否显示索引数字，从1开始，默认不显示
+								showIndex:false,
+								//按钮样式
+								//正常 按钮样式  支持常规CSS样式，方法同jQuery css({key:val,……})
+								normal:{width:'14px',height:'14px',lineHeight:'14px',right:'10px',bottom:'10px',fontSize:'10px',background:"#cccaca",border:"1px solid #ffffff",color:"#666666",textAlign:'center',marginRight:'8px',fontFamily:"Verdana",float:'left'},
+								//当前 按钮样式
+								focus:{background:"#CC0000",border:"1px solid #FF0000",color:"#000000"}
+							},
+						//切换回调 index 当前图片索引，action 动作 的切入 还是 切出 值:fadeIn或fadeOut ，函数内 this指向 当前图片容器对象 可用来操作里面元素的动作 详情见demo。
+						callback:function(index,action){
+							$("#t"+index).attr("style","display:block").siblings().attr("style","display:none");
+						}
+					
+			};
+			options = jQuery.extend(true,{},default_options,user_options);
+			
+			var k = {};
+			
+			//当前选择符
+			k.selector = $(this).selector;
+			
+			//判断是否有多个对象 如选取了多个对象抛出错误，同一页面可以使用多个 但需要分别调用并且建议选择符用id。
+			if($(this).length>1){
+				$.error('kinMaxShow error[More than one selected object]');
+				return false;	
+			}
+			
+			//当前操作对象
+			k.self = this;
+			//当前图片索引
+			k.index = 0;
+			//前一个图片索引
+			k.lindex = 0;
+			//图片数量
+			k.size = $(k.self).children('div').size();
+			//CSS class命名空间前缀
+			k.prename = 'KMSPrefix_' + k.selector.replace(/\W/ig,'') + '_';
+			//数据存储
+			k.data = {};
+			//支持函数集合
+			k.fn = {};
+			
+			//加载 解析幻灯片宽和高
+			k.onload = function(){
+				//设置容器尺寸 并且暂时隐藏内容部分
+				$(k.self).css({width:'100%',height:options.height,overflow:'hidden',position:'relative'}).children('div').addClass(k.prename+'image_item').hide();
+				//初始化
+				k.init();
+					
+			};			
+			
+			
+			//初始化
+			k.init = function(){
+				
+				k.setLayout();
+				k.setAnimate();
+				
+			};
+		
+			//布局
+			k.setLayout = function(){
+				
+				//image 容器
+				$(k.self).children('div').wrapAll('<div class="'+k.prename+'image_box"></div>');
+				$('.'+k.prename+'image_item',k.self).each(function() {
+                    var a = $(this).children('a');
+					if(a.length){
+						var image = a.children('img').attr('src');
+						a.children('img').remove();
+						a.addClass(k.prename+'coverlink');
+					}else{
+						var image = $(this).children('img').attr('src');
+						$(this).children('img').remove();		
+					}
+					//
+					$(this).css({background:'url('+image+') no-repeat '+options.imageAlign,'z-index':1});
+					
+                });
+				
+				$('.'+k.prename+'image_item',k.self).eq(0).css('z-index','2');
+				
+				//button 容器
+				if(options.button.normal.display!='none'){
+					var button_list = '';
+					for(i=1;i<=k.size;i++){
+						if(options.button.showIndex){
+							button_list+='<li>'+i+'</li>';
+						}else{
+							button_list+='<li> </li>';	
+						}
+					}				
+					$(k.self).append('<ul class="'+k.prename+'button">'+button_list+'</ul>');
+					$('.'+k.prename+'button li',k.self).eq(0).addClass(k.prename+'focus');
+				}
+				
+				//设置 css
+				k.setCSS();	
+				
+				//显示内容
+				$('.'+k.prename+'image_item:gt(0)',k.self).css('z-index',1).css({opacity:0});
+				$('.'+k.prename+'image_item',k.self).show();
+				$(k.self).css({overflow:'visible',visibility:'visible',display:'block'});
+
+				
+			};
+			
+			//CSS
+			k.setCSS = function(){
+				
+			var cssCode = '<style type="text/css">';
+				cssCode+= k.selector+' *{ margin:0;padding:0;} ';
+				cssCode+= k.selector+' .'+k.prename+'image_box{width:100%;height:'+parseInt(options.height)+'px;position:relative;z-index:1;} ';
+				cssCode+= k.selector+' .'+k.prename+'image_box .'+k.prename+'image_item{width:100%;height:'+parseInt(options.height)+'px;position:absolute;overflow:hidden;} ';
+				cssCode+= k.selector+' .'+k.prename+'image_box .'+k.prename+'image_item a.'+k.prename+'coverlink{width:100%;height:'+parseInt(options.height)+'px;display:block;text-decoration:none;padding:0;margin:0;background:transparent;text-indent:0;outline:none;hide-focus:expression(this.hideFocus=true);} ';
+				if(options.button.normal.display!='none'){
+					cssCode+= k.selector+' .'+k.prename+'button{'+k.fn.objToCss(options.button.normal,['top','right','bottom','left'],true)+';position:absolute;list-style:none;z-index:2;overflow:hidden;_zoom:1;}';				
+					cssCode+= k.selector+' .'+k.prename+'button li{'+k.fn.objToCss(options.button.normal,['top','right','bottom','left'])+';cursor:pointer;-webkit-text-size-adjust:none;}';				
+					cssCode+= k.selector+' .'+k.prename+'button li.'+k.prename+'focus{'+k.fn.objToCss(options.button.focus,['top','right','bottom','left'])+';cursor:default;}';				
+				}
+				cssCode+= '</style>';
+				$(k.self).prepend(cssCode);
+					
+			}
+			
+			//动画管理
+			k.setAnimate = function(){
+				
+				options.callback.call($('.'+k.prename+'image_item:eq('+k.index+')',k.self),k.index,'fadeIn');
+				
+				var overDelayTimer;//当switchEvent是mouseover时  执行延迟计时器
+				$('.'+k.prename+'button',k.self).delegate('li',options.button.switchEvent,function(){
+					_this = this;
+					function setChange(){
+						k.index = $(_this).index();
+						k.setOpacity();
+					}
+					if(options.button.switchEvent=='mouseover'){
+						overDelayTimer = setTimeout(setChange,200);
+					}else{
+						setChange();
+					}
+				})
+				//mouseover 延时
+				if(options.button.switchEvent=='mouseover'){
+					$('.'+k.prename+'button',k.self).delegate('li','mouseout',function(){
+						clearTimeout(overDelayTimer);
+					})						
+				}				
+				
+				//设置索引
+				k.index  = 1;
+				k.lindex = 0;
+				//自动切换定时器
+				k.data.moveTimer = setInterval(k.setOpacity,options.intervalTime*1000+options.switchTime);
+				
+				//悬停暂停
+				if(options.hoverPause){	
+					$(k.self).hover(function(){
+						clearInterval(k.data.moveTimer);
+					},function(){
+						k.data.moveTimer = setInterval(k.setOpacity,options.intervalTime*1000+options.switchTime);
+					})
+				}
+
+			};
+			
+			//擦除(切换)
+			k.setOpacity = function(){
+				
+				//回调 fadeOut callback
+				options.callback.call($('.'+k.prename+'image_item:eq('+(k.lindex)+')',k.self),k.lindex,'fadeOut');
+				//按钮切换
+				if(options.button.normal.display!='none'){
+					$('ul.'+k.prename+'button li',k.self).removeClass(k.prename+'focus');
+					$('ul.'+k.prename+'button li',k.self).eq(k.index).addClass(k.prename+'focus');
+				}
+				
+				//停止执行中的动画
+				$('.'+k.prename+'image_item:animated',k.self).stop(true,false);
+				//设置上一个显示的z-index为0
+				$('.'+k.prename+'image_item',k.self).css('z-index',1);
+				//设置当前显示的z-index为1
+				$('.'+k.prename+'image_item',k.self).eq(k.index).css({opacity:0,'z-index':2});
+	  			//alert(k.index)
+				$('.'+k.prename+'image_item',k.self).eq(k.index).animate({opacity:1},options.switchTime,options.easing,function(){
+						$('.'+k.prename+'image_box .'+k.prename+'image_item:not(:eq('+k.index+'))',k.self).css({opacity:0});
+						//回调 fadeIn callback
+						options.callback.call($('.'+k.prename+'image_item:eq('+k.index+')',k.self),k.index,'fadeIn');
+						k.lindex = k.index;
+						if(k.index==k.size-1){
+							k.index=0;
+						}else{
+							k.index++;
+						}
+					}
+				);
+				
+			};
+			
+			//运行			
+			k.run = function(){
+				k.onload();
+			};
+			
+			/* obj 对象样式，带有"-"的需要转为驼峰式写法 如：font-size:12px; fontSize:12px;  excArr:不需要转换的列表排除在外的 类型 数组 ['test1','opacity'] 若excFlag为ture则只转换excArr数组中的CSS*/
+			k.fn.objToCss = function(obj,excArr,excFlag){
+				excFlag = excFlag?true:false;
+				var isIE = navigator.userAgent.indexOf("MSIE")!=-1;
+				var style = '';
+				if(excFlag){
+					for (var key in obj){
+						if($.inArray(key,excArr)!=-1){
+							pKey = key.replace(/([A-Z])/,KtoLowerCase);
+							if(pKey=='opacity' && isIE){
+								style +="filter:alpha(opacity="+(obj[key]*100)+");";
+							}else{
+								style +=pKey+":"+obj[key]+";";	
+							}
+						}
+					};					
+				}else{
+					for (var key in obj){
+						if($.isArray(excArr)){
+							if($.inArray(key,excArr)==-1){
+								pKey = key.replace(/([A-Z])/,KtoLowerCase);
+								if(pKey=='opacity' && isIE){
+									style +="filter:alpha(opacity="+(obj[key]*100)+");";
+								}else{
+									style +=pKey+":"+obj[key]+";";	
+								}
+							}
+						}else{
+							pKey = key.replace(/([A-Z])/,KtoLowerCase);
+							if(pKey=='opacity' && isIE){
+								style +="filter:alpha(opacity="+(obj[key]*100)+");";
+							}else{
+								style +=pKey+":"+obj[key]+";";	
+							}					 
+						}
+					};	
+				}
+				
+				
+				function KtoLowerCase(word){
+					var str='';
+					str = '-'+word.toLowerCase();
+					return str; 
+				};
+				return style;
+			};
+			
+			/* 运行 */
+			k.run();
+
+		
+		
+	}	
+	
+})(jQuery)
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/carousel/jquery.litenav.js b/pluss-manage-page/src/main/resources/static/resources/auth/js/carousel/jquery.litenav.js
new file mode 100644
index 0000000..3818390
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/carousel/jquery.litenav.js
@@ -0,0 +1,26 @@
+; (function ($) {
+    $.fn.extend({
+        "liteNav": function (t) {
+            var $this = $(this), i = 0, $pics = $('#NewsPic'), autoChange = function () {
+                var $currentPic = $pics.find('a:eq(' + (i + 1 === 7 ? 0 : i + 1) + ')');
+                $currentPic.css({
+                    visibility: 'visible',
+                    display: 'block'
+                }).siblings('a').css({
+                    visibility: 'hidden',
+                    display: 'none'
+                });
+                $pics.find('.Nav>span:contains(' + (i + 2 > 7 ? 7 - i : i + 2) + ')').attr('class', 'Cur').siblings('span').attr('class', 'Normal');
+                $('#NewsPicTxt').html('<a target="_blank" href="' + $currentPic[0].href + '">' + $currentPic.find('img').attr('title') + '</a>');
+                i = i + 1 === 7 ? 0 : i + 1;
+            }, st = setInterval(autoChange, t || 2000);
+            $this.hover(function () {
+                clearInterval(st);
+            }, function () { st = setInterval(autoChange, t || 2000) });
+            $pics.find('.Nav>span').click(function () {
+                i = parseInt($(this).text(), 10) - 2;
+                autoChange();
+            });
+        }
+    });
+}(jQuery));
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/common.js b/pluss-manage-page/src/main/resources/static/resources/auth/js/common.js
new file mode 100644
index 0000000..36b48ee
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/common.js
@@ -0,0 +1,271 @@
+// 给Date类型增加格式化原型方法
+Date.prototype.format = function(format) {
+	var o = {
+		"M+" : this.getMonth() + 1, // month
+		"d+" : this.getDate(), // day
+		"H+" : this.getHours(), // hour
+		"h+" : this.getHours(),
+		//"h+" : this.getHours()%12, //12 hour
+		"m+" : this.getMinutes(), // minute
+		"s+" : this.getSeconds(), // second
+		"q+" : Math.floor((this.getMonth() + 3) / 3), // quarter
+		"S" : this.getMilliseconds()
+	// millisecond
+	}
+	if (/(y+)/.test(format))
+		format = format.replace(RegExp.$1, (this.getFullYear() + "")
+				.substr(4 - RegExp.$1.length));
+	for ( var k in o)
+		if (new RegExp("(" + k + ")").test(format))
+			format = format.replace(RegExp.$1, RegExp.$1.length == 1 ? o[k]
+					: ("00" + o[k]).substr(("" + o[k]).length));
+	return format;
+}
+
+String.prototype.replaceAll = function(reallyDo, replaceWith, ignoreCase) {  
+    if (!RegExp.prototype.isPrototypeOf(reallyDo)) {  
+        return this.replace(new RegExp(reallyDo, (ignoreCase ? "gi": "g")), replaceWith);  
+    } else {  
+        return this.replace(reallyDo, replaceWith);  
+    }  
+}  
+
+String.prototype.format = function() {
+	var args = arguments;
+	return this.replace(/\{(\d+)\}/g, function(m, i) {
+		return args[i];
+	});
+}
+
+String.prototype.replaceAll = function stringReplaceAll(AFindText, ARepText) {
+	raRegExp = new RegExp(AFindText, "g");
+	return this.replace(raRegExp, ARepText);
+};
+
+function myAlert(title, content) {
+	if (!title) {
+		title = "系统提示";
+	}
+	if (!content) {
+		content = "";
+	}
+	var $div = $("#_my_alert");
+	if($div.size()==0) {
+		$div = $("<div id='_my_alert'><i class='ui-icon ui-icon-alert' style='float:left;margin-right:10px;'></i> <p></p></div>");
+		$div.appendTo($("body"));
+		$div.dialog({
+			autoOpen : false,
+			modal : true,
+			buttons : {
+				确定 : function() {
+					$(this).dialog("close");
+				}
+			}
+		});
+	}
+	$div.find("p").empty().html(content);
+	$div.dialog("option","title",title);
+	$div.dialog("open");
+}
+
+var myalert = myAlert;
+
+function myConfirm(title,content,callback) {
+	var divId = "_my_confirm";
+	if (!title) {
+		title = "系统提示";
+	}
+	if (!content) {
+		content = "";
+	}
+	var $div = $("<div id='{0}' title='{1}' class='row-fluid'></div>".format(
+			divId, title));
+	$div.append("<p><i class='icon-question-sign'></i> {0}<p>".format(content));
+	$div.appendTo($("body"));
+	$("#" + divId).dialog({
+		autoOpen : true,
+		modal : true,
+		buttons : {
+			确定 : function() {
+				$(this).dialog("close");
+				callback();
+			},
+			取消 : function() {
+				$(this).dialog("close");
+			}
+		},
+		close : function(evt,ui) {
+			$(this).remove();
+		}
+	});
+}
+
+$(function() {
+	$(document).ajaxError(function(evt, req, opts, ex) {
+		if (req.status === 0 || req.readyState === 0) {
+			return;
+		}
+		if (req.status === 404) {
+			myAlert('','没有找到');
+			return;
+		}
+		try{
+			var result = $.parseJSON(req.responseText);
+			myAlert('',result.msg);
+		}catch(e){
+			myAlert('', '系统繁忙');
+		}
+	}).ajaxSend(function(evt, request, settings) {
+		var target = settings.maskTarget;
+		if (settings.maskTarget) {
+			$(settings.maskTarget).unmask();
+			$(settings.maskTarget).mask("加载中...", 500);
+		}
+	}).ajaxComplete(function(event, request, settings) {
+		var target = settings.maskTarget;
+		if (settings.maskTarget) {
+			$(settings.maskTarget).unmask();
+		}
+	});
+});
+
+(function($) {
+	$.fn.ellipsis = function() {
+
+		this.css({
+			'overflow' : 'hidden',
+			'text-overflow' : 'ellipsis',
+			'white-space' : 'nowrap'
+		});
+
+		this.bind('mouseenter', function() {
+			var $this = $(this);
+			if (this.offsetWidth < this.scrollWidth) {
+				$this.attr('title', $this.text());
+			}
+		});
+	};
+})(jQuery);
+
+/**
+ * 扩展dataTables -> myDataTables 1.提供默认配置：布局、分页、汉化、服务端数据设置、表格长字符串截短
+ * 2.扩展配置参数paramSelector 用于获取查询参数 3.使用示例(需要先引入jquery.dataTables.js):
+ * 
+ * var table = $("#_rule_table").myDataTable({ "sAjaxSource" : './rules',
+ * //服务端数据请求url "paramSelector" : '#_business,#_policy,#_status', //查询参数
+ * "aoColumns" : [...] //列配置不变 });
+ */
+(function($) {
+
+	var methods = {
+		"init" : function(cfg) {
+			var default_settings = {
+				"bInfo" : true,
+				"bServerSide" : true,
+				"bPaginate" : true,
+				"bFilter" : false,
+				"aaSorting" : [ ],
+				"bProcessing" : false,
+				"bLengthChange" : true,
+				"aLengthMenu" : [ [ 10, 20, 30 ], [ 10, 20, 30 ] ],
+				"sPaginationType" : "full_numbers",
+				"bStateSave" : true,
+				"bAutoWidth" : false,
+				"sDom" : '<"top"f>r<"datatable-scroll"t><"datatable-bottom"lip>',
+				"oLanguage" : {
+					"sLengthMenu" : "<div style='float:left;margin-left:0px;'>_MENU_</div>",
+					"sZeroRecords" : "抱歉， 没有找到",
+					"sInfo" : "共_TOTAL_条 / _PAGENUM_页",
+					"sInfoEmpty" : "共 0 条数据/共 0 页！",
+					"sInfoFiltered" : "(filtered from _MAX_ total records)",
+					"sProcessing" : "加载中...",
+
+					oPaginate : {
+						sPrevious : "上一页",
+						sNext : "下一页",
+						sFirst : "首页",
+						sLast : "尾页"
+					}
+				},
+				"fnDrawCallback" : function(oSettings) {
+					var table = this;
+					$(this.context).find('tr td,tr th').each(function() {
+						$(this).ellipsis();
+					});
+					$(this.context).find('.sorting,.sorting_desc,.sorting_asc').dblclick(function(e){
+				    table.fnSort([]);
+				    return false;
+					});
+				}
+			};
+			var settings = $.extend(default_settings, cfg);
+			if (settings['bServerSide'] && !settings.fnServerData
+					&& settings.paramSelector) {
+				settings.fnServerData = function(sSource, aoData, fnCallback) {
+					$(settings.paramSelector).each(function() {
+						var name = $(this).attr("name");
+						var value = $(this).val();
+						name = name ? name : '';
+						if($(this).attr("type")=="radio"){
+							value = $("[name='"+name+"']:checked").val();
+						}else if($(this).attr("type")=="checkbox"){
+							//value = $("[name='"+name+"']:checked").val();
+							value = $(this).prop("checked");
+						}else{
+							value = value ? value : '';
+						}
+						aoData.push({
+							name : name,
+							value : value
+						});
+					});
+					$
+							.ajax({
+								"type" : "post",
+								"url" : sSource,
+								"data" : aoData,
+								maskTarget : $(this).parents('.dataTables_wrapper')[0],
+								"success" : function(json) {
+									fnCallback(json);
+								},
+								"dataType" : "json",
+								"cache" : false,
+								"error" : function(xhr, error, thrown) {
+									if (error == "parsererror") {
+										alert("DataTables warning: JSON data from server could not be parsed. "
+												+ "This is caused by a JSON formatting error.");
+									}
+								}
+							});
+				};
+			}
+			if (!settings['bServerSide']) {
+				settings.fnServerData = function(sSource, aoData, fnCallback) {
+				};
+			}
+			if (settings['aaData']) {
+				$.each(settings['aaData'], function(i, row) {
+					if (row) {
+						$.each(row, function(j, data) {
+							if (data == undefined || data == null) {
+								settings['aaData'][i][j] = '';
+							}
+						});
+					}
+				});
+			}
+			return this.dataTable(settings);
+		}
+	};
+
+	$.fn.myDataTable = function(method) {
+		if (methods[method]) {
+			return methods[method].apply(this, Array.prototype.slice.call(arguments,
+					1));
+		} else if (typeof method === 'object' || !method) {
+			return methods.init.apply(this, arguments);
+		} else {
+			$.error('Method ' + method + ' does not exist on jQuery.myDataTable');
+		}
+	};
+})(jQuery);
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/highcharts.js b/pluss-manage-page/src/main/resources/static/resources/auth/js/highcharts.js
new file mode 100644
index 0000000..c2df84b
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/highcharts.js
@@ -0,0 +1,7647 @@
+/*
+ Highcharts JS v4.0.3 (2014-07-03)
+
+ (c) 2009-2014 Torstein Honsi
+
+ License: www.highcharts.com/license
+*/
+(function() {
+    function r(a, b) {
+        var c;
+        a || (a = {});
+        for (c in b) a[c] = b[c];
+        return a
+    }
+    function w() {
+        var a, b = arguments,
+        c, d = {},
+        e = function(a, b) {
+            var c, d;
+            typeof a !== "object" && (a = {});
+            for (d in b) b.hasOwnProperty(d) && (c = b[d], a[d] = c && typeof c === "object" && Object.prototype.toString.call(c) !== "[object Array]" && d !== "renderTo" && typeof c.nodeType !== "number" ? e(a[d] || {},
+            c) : b[d]);
+            return a
+        };
+        b[0] === !0 && (d = b[1], b = Array.prototype.slice.call(b, 2));
+        c = b.length;
+        for (a = 0; a < c; a++) d = e(d, b[a]);
+        return d
+    }
+    function z(a, b) {
+        return parseInt(a, b || 10)
+    }
+    function Fa(a) {
+        return typeof a === "string"
+    }
+    function da(a) {
+        return a && typeof a === "object"
+    }
+    function La(a) {
+        return Object.prototype.toString.call(a) === "[object Array]"
+    }
+    function ia(a) {
+        return typeof a === "number"
+    }
+    function za(a) {
+        return V.log(a) / V.LN10
+    }
+    function ja(a) {
+        return V.pow(10, a)
+    }
+    function ka(a, b) {
+        for (var c = a.length; c--;) if (a[c] === b) {
+            a.splice(c, 1);
+            break
+        }
+    }
+    function s(a) {
+        return a !== t && a !== null
+    }
+    function F(a, b, c) {
+        var d, e;
+        if (Fa(b)) s(c) ? a.setAttribute(b, c) : a && a.getAttribute && (e = a.getAttribute(b));
+        else if (s(b) && da(b)) for (d in b) a.setAttribute(d, b[d]);
+        return e
+    }
+    function ra(a) {
+        return La(a) ? a: [a]
+    }
+    function p() {
+        var a = arguments,
+        b, c, d = a.length;
+        for (b = 0; b < d; b++) if (c = a[b], c !== t && c !== null) return c
+    }
+    function A(a, b) {
+        if (Aa && !ba && b && b.opacity !== t) b.filter = "alpha(opacity=" + b.opacity * 100 + ")";
+        r(a.style, b)
+    }
+    function $(a, b, c, d, e) {
+        a = x.createElement(a);
+        b && r(a, b);
+        e && A(a, {
+            padding: 0,
+            border: P,
+            margin: 0
+        });
+        c && A(a, c);
+        d && d.appendChild(a);
+        return a
+    }
+    function la(a, b) {
+        var c = function() {
+            return t
+        };
+        c.prototype = new a;
+        r(c.prototype, b);
+        return c
+    }
+    function Ga(a, b, c, d) {
+        var e = L.lang,
+        a = +a || 0,
+        f = b === -1 ? (a.toString().split(".")[1] || "").length: isNaN(b = Q(b)) ? 2 : b,
+        b = c === void 0 ? e.decimalPoint: c,
+        d = d === void 0 ? e.thousandsSep: d,
+        e = a < 0 ? "-": "",
+        c = String(z(a = Q(a).toFixed(f))),
+        g = c.length > 3 ? c.length % 3 : 0;
+        return e + (g ? c.substr(0, g) + d: "") + c.substr(g).replace(/(\d{3})(?=\d)/g, "$1" + d) + (f ? b + Q(a - c).toFixed(f).slice(2) : "")
+    }
+    function Ha(a, b) {
+        return Array((b || 2) + 1 - String(a).length).join(0) + a
+    }
+    function Ma(a, b, c) {
+        var d = a[b];
+        a[b] = function() {
+            var a = Array.prototype.slice.call(arguments);
+            a.unshift(d);
+            return c.apply(this, a)
+        }
+    }
+    function Ia(a, b) {
+        for (var c = "{",
+        d = !1,
+        e, f, g, h, i, j = []; (c = a.indexOf(c)) !== -1;) {
+            e = a.slice(0, c);
+            if (d) {
+                f = e.split(":");
+                g = f.shift().split(".");
+                i = g.length;
+                e = b;
+                for (h = 0; h < i; h++) e = e[g[h]];
+                if (f.length) f = f.join(":"),
+                g = /\.([0-9])/,
+                h = L.lang,
+                i = void 0,
+                /f$/.test(f) ? (i = (i = f.match(g)) ? i[1] : -1, e !== null && (e = Ga(e, i, h.decimalPoint, f.indexOf(",") > -1 ? h.thousandsSep: ""))) : e = bb(f, e)
+            }
+            j.push(e);
+            a = a.slice(c + 1);
+            c = (d = !d) ? "}": "{"
+        }
+        j.push(a);
+        return j.join("")
+    }
+    function lb(a) {
+        return V.pow(10, U(V.log(a) / V.LN10))
+    }
+    function mb(a, b, c, d) {
+        var e, c = p(c, 1);
+        e = a / c;
+        b || (b = [1, 2, 2.5, 5, 10], d && d.allowDecimals === !1 && (c === 1 ? b = [1, 2, 5, 10] : c <= 0.1 && (b = [1 / c])));
+        for (d = 0; d < b.length; d++) if (a = b[d], e <= (b[d] + (b[d + 1] || b[d])) / 2) break;
+        a *= c;
+        return a
+    }
+    function nb(a, b) {
+        var c = a.length,
+        d, e;
+        for (e = 0; e < c; e++) a[e].ss_i = e;
+        a.sort(function(a, c) {
+            d = b(a, c);
+            return d === 0 ? a.ss_i - c.ss_i: d
+        });
+        for (e = 0; e < c; e++) delete a[e].ss_i
+    }
+    function Na(a) {
+        for (var b = a.length,
+        c = a[0]; b--;) a[b] < c && (c = a[b]);
+        return c
+    }
+    function Ba(a) {
+        for (var b = a.length,
+        c = a[0]; b--;) a[b] > c && (c = a[b]);
+        return c
+    }
+    function Oa(a, b) {
+        for (var c in a) a[c] && a[c] !== b && a[c].destroy && a[c].destroy(),
+        delete a[c]
+    }
+    function Pa(a) {
+        cb || (cb = $(Ja));
+        a && cb.appendChild(a);
+        cb.innerHTML = ""
+    }
+    function ea(a) {
+        return parseFloat(a.toPrecision(14))
+    }
+    function Qa(a, b) {
+        va = p(a, b.animation)
+    }
+    function Ab() {
+        var a = L.global.useUTC,
+        b = a ? "getUTC": "get",
+        c = a ? "setUTC": "set";
+        Ra = (a && L.global.timezoneOffset || 0) * 6E4;
+        db = a ? Date.UTC: function(a, b, c, g, h, i) {
+            return (new Date(a, b, p(c, 1), p(g, 0), p(h, 0), p(i, 0))).getTime()
+        };
+        ob = b + "Minutes";
+        pb = b + "Hours";
+        qb = b + "Day";
+        Wa = b + "Date";
+        eb = b + "Month";
+        fb = b + "FullYear";
+        Bb = c + "Minutes";
+        Cb = c + "Hours";
+        rb = c + "Date";
+        Db = c + "Month";
+        Eb = c + "FullYear"
+    }
+    function G() {}
+    function Sa(a, b, c, d) {
+        this.axis = a;
+        this.pos = b;
+        this.type = c || "";
+        this.isNew = !0; ! c && !d && this.addLabel()
+    }
+    function ma() {
+        this.init.apply(this, arguments)
+    }
+    function Xa() {
+        this.init.apply(this, arguments)
+    }
+    function Fb(a, b, c, d, e) {
+        var f = a.chart.inverted;
+        this.axis = a;
+        this.isNegative = c;
+        this.options = b;
+        this.x = d;
+        this.total = null;
+        this.points = {};
+        this.stack = e;
+        this.alignOptions = {
+            align: b.align || (f ? c ? "left": "right": "center"),
+            verticalAlign: b.verticalAlign || (f ? "middle": c ? "bottom": "top"),
+            y: p(b.y, f ? 4 : c ? 14 : -6),
+            x: p(b.x, f ? c ? -6 : 6 : 0)
+        };
+        this.textAlign = b.textAlign || (f ? c ? "right": "left": "center")
+    }
+    var t, x = document,
+    H = window,
+    V = Math,
+    v = V.round,
+    U = V.floor,
+    Ka = V.ceil,
+    u = V.max,
+    C = V.min,
+    Q = V.abs,
+    aa = V.cos,
+    fa = V.sin,
+    na = V.PI,
+    Ca = na * 2 / 360,
+    wa = navigator.userAgent,
+    Gb = H.opera,
+    Aa = /msie/i.test(wa) && !Gb,
+    gb = x.documentMode === 8,
+    sb = /AppleWebKit/.test(wa),
+    Ta = /Firefox/.test(wa),
+    Hb = /(Mobile|Android|Windows Phone)/.test(wa),
+    xa = "http://www.w3.org/2000/svg",
+    ba = !!x.createElementNS && !!x.createElementNS(xa, "svg").createSVGRect,
+    Nb = Ta && parseInt(wa.split("Firefox/")[1], 10) < 4,
+    ga = !ba && !Aa && !!x.createElement("canvas").getContext,
+    Ya,
+    Za,
+    Ib = {},
+    tb = 0,
+    cb,
+    L,
+    bb,
+    va,
+    ub,
+    B,
+    oa,
+    sa = function() {
+        return t
+    },
+    W = [],
+    $a = 0,
+    Ja = "div",
+    P = "none",
+    Ob = /^[0-9]+$/,
+    Pb = "stroke-width",
+    db,
+    Ra,
+    ob,
+    pb,
+    qb,
+    Wa,
+    eb,
+    fb,
+    Bb,
+    Cb,
+    rb,
+    Db,
+    Eb,
+    J = {},
+    S;
+    H.Highcharts ? oa(16, !0) : S = H.Highcharts = {};
+    bb = function(a, b, c) {
+        if (!s(b) || isNaN(b)) return "Invalid date";
+        var a = p(a, "%Y-%m-%d %H:%M:%S"),
+        d = new Date(b - Ra),
+        e,
+        f = d[pb](),
+        g = d[qb](),
+        h = d[Wa](),
+        i = d[eb](),
+        j = d[fb](),
+        k = L.lang,
+        l = k.weekdays,
+        d = r({
+            a: l[g].substr(0, 3),
+            A: l[g],
+            d: Ha(h),
+            e: h,
+            b: k.shortMonths[i],
+            B: k.months[i],
+            m: Ha(i + 1),
+            y: j.toString().substr(2, 2),
+            Y: j,
+            H: Ha(f),
+            I: Ha(f % 12 || 12),
+            l: f % 12 || 12,
+            M: Ha(d[ob]()),
+            p: f < 12 ? "AM": "PM",
+            P: f < 12 ? "am": "pm",
+            S: Ha(d.getSeconds()),
+            L: Ha(v(b % 1E3), 3)
+        },
+        S.dateFormats);
+        for (e in d) for (; a.indexOf("%" + e) !== -1;) a = a.replace("%" + e, typeof d[e] === "function" ? d[e](b) : d[e]);
+        return c ? a.substr(0, 1).toUpperCase() + a.substr(1) : a
+    };
+    oa = function(a, b) {
+        var c = "Highcharts error #" + a + ": www.highcharts.com/errors/" + a;
+        if (b) throw c;
+        H.console && console.log(c)
+    };
+    B = {
+        millisecond: 1,
+        second: 1E3,
+        minute: 6E4,
+        hour: 36E5,
+        day: 864E5,
+        week: 6048E5,
+        month: 26784E5,
+        year: 31556952E3
+    };
+    ub = {
+        init: function(a, b, c) {
+            var b = b || "",
+            d = a.shift,
+            e = b.indexOf("C") > -1,
+            f = e ? 7 : 3,
+            g,
+            b = b.split(" "),
+            c = [].concat(c),
+            h,
+            i,
+            j = function(a) {
+                for (g = a.length; g--;) a[g] === "M" && a.splice(g + 1, 0, a[g + 1], a[g + 2], a[g + 1], a[g + 2])
+            };
+            e && (j(b), j(c));
+            a.isArea && (h = b.splice(b.length - 6, 6), i = c.splice(c.length - 6, 6));
+            if (d <= c.length / f && b.length === c.length) for (; d--;) c = [].concat(c).splice(0, f).concat(c);
+            a.shift = 0;
+            if (b.length) for (a = c.length; b.length < a;) d = [].concat(b).splice(b.length - f, f),
+            e && (d[f - 6] = d[f - 2], d[f - 5] = d[f - 1]),
+            b = b.concat(d);
+            h && (b = b.concat(h), c = c.concat(i));
+            return [b, c]
+        },
+        step: function(a, b, c, d) {
+            var e = [],
+            f = a.length;
+            if (c === 1) e = d;
+            else if (f === b.length && c < 1) for (; f--;) d = parseFloat(a[f]),
+            e[f] = isNaN(d) ? a[f] : c * parseFloat(b[f] - d) + d;
+            else e = b;
+            return e
+        }
+    }; (function(a) {
+        H.HighchartsAdapter = H.HighchartsAdapter || a && {
+            init: function(b) {
+                var c = a.fx,
+                d = c.step,
+                e, f = a.Tween,
+                g = f && f.propHooks;
+                e = a.cssHooks.opacity;
+                a.extend(a.easing, {
+                    easeOutQuad: function(a, b, c, d, e) {
+                        return - d * (b /= e) * (b - 2) + c
+                    }
+                });
+                a.each(["cur", "_default", "width", "height", "opacity"],
+                function(a, b) {
+                    var e = d,
+                    k;
+                    b === "cur" ? e = c.prototype: b === "_default" && f && (e = g[b], b = "set"); (k = e[b]) && (e[b] = function(c) {
+                        var d, c = a ? c: this;
+                        if (c.prop !== "align") return d = c.elem,
+                        d.attr ? d.attr(c.prop, b === "cur" ? t: c.now) : k.apply(this, arguments)
+                    })
+                });
+                Ma(e, "get",
+                function(a, b, c) {
+                    return b.attr ? b.opacity || 0 : a.call(this, b, c)
+                });
+                e = function(a) {
+                    var c = a.elem,
+                    d;
+                    if (!a.started) d = b.init(c, c.d, c.toD),
+                    a.start = d[0],
+                    a.end = d[1],
+                    a.started = !0;
+                    c.attr("d", b.step(a.start, a.end, a.pos, c.toD))
+                };
+                f ? g.d = {
+                    set: e
+                }: d.d = e;
+                this.each = Array.prototype.forEach ?
+                function(a, b) {
+                    return Array.prototype.forEach.call(a, b)
+                }: function(a, b) {
+                    var c, d = a.length;
+                    for (c = 0; c < d; c++) if (b.call(a[c], a[c], c, a) === !1) return c
+                };
+                a.fn.highcharts = function() {
+                    var a = "Chart",
+                    b = arguments,
+                    c, d;
+                    if (this[0]) {
+                        Fa(b[0]) && (a = b[0], b = Array.prototype.slice.call(b, 1));
+                        c = b[0];
+                        if (c !== t) c.chart = c.chart || {},
+                        c.chart.renderTo = this[0],
+                        new S[a](c, b[1]),
+                        d = this;
+                        c === t && (d = W[F(this[0], "data-highcharts-chart")])
+                    }
+                    return d
+                }
+            },
+            getScript: a.getScript,
+            inArray: a.inArray,
+            adapterRun: function(b, c) {
+                return a(b)[c]()
+            },
+            grep: a.grep,
+            map: function(a, c) {
+                for (var d = [], e = 0, f = a.length; e < f; e++) d[e] = c.call(a[e], a[e], e, a);
+                return d
+            },
+            offset: function(b) {
+                return a(b).offset()
+            },
+            addEvent: function(b, c, d) {
+                a(b).bind(c, d)
+            },
+            removeEvent: function(b, c, d) {
+                var e = x.removeEventListener ? "removeEventListener": "detachEvent";
+                x[e] && b && !b[e] && (b[e] = function() {});
+                a(b).unbind(c, d)
+            },
+            fireEvent: function(b, c, d, e) {
+                var f = a.Event(c),
+                g = "detached" + c,
+                h; ! Aa && d && (delete d.layerX, delete d.layerY, delete d.returnValue);
+                r(f, d);
+                b[c] && (b[g] = b[c], b[c] = null);
+                a.each(["preventDefault", "stopPropagation"],
+                function(a, b) {
+                    var c = f[b];
+                    f[b] = function() {
+                        try {
+                            c.call(f)
+                        } catch(a) {
+                            b === "preventDefault" && (h = !0)
+                        }
+                    }
+                });
+                a(b).trigger(f);
+                b[g] && (b[c] = b[g], b[g] = null);
+                e && !f.isDefaultPrevented() && !h && e(f)
+            },
+            washMouseEvent: function(a) {
+                var c = a.originalEvent || a;
+                if (c.pageX === t) c.pageX = a.pageX,
+                c.pageY = a.pageY;
+                return c
+            },
+            animate: function(b, c, d) {
+                var e = a(b);
+                if (!b.style) b.style = {};
+                if (c.d) b.toD = c.d,
+                c.d = 1;
+                e.stop();
+                c.opacity !== t && b.attr && (c.opacity += "px");
+                e.animate(c, d)
+            },
+            stop: function(b) {
+                a(b).stop()
+            }
+        }
+    })(H.jQuery);
+    var T = H.HighchartsAdapter,
+    M = T || {};
+    T && T.init.call(T, ub);
+    var hb = M.adapterRun,
+    Qb = M.getScript,
+    Da = M.inArray,
+    q = M.each,
+    vb = M.grep,
+    Rb = M.offset,
+    Ua = M.map,
+    N = M.addEvent,
+    X = M.removeEvent,
+    K = M.fireEvent,
+    Sb = M.washMouseEvent,
+    ib = M.animate,
+    ab = M.stop,
+    M = {
+        enabled: !0,
+        x: 0,
+        y: 15,
+        style: {
+            color: "#606060",
+            cursor: "default",
+            fontSize: "11px"
+        }
+    };
+    L = {
+        colors: "#7cb5ec,#434348,#90ed7d,#f7a35c,#8085e9,#f15c80,#e4d354,#8085e8,#8d4653,#91e8e1".split(","),
+        symbols: ["circle", "diamond", "square", "triangle", "triangle-down"],
+        lang: {
+            loading: "Loading...",
+            months: "January,February,March,April,May,June,July,August,September,October,November,December".split(","),
+            shortMonths: "Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec".split(","),
+            weekdays: "Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday".split(","),
+            decimalPoint: ".",
+            numericSymbols: "k,M,G,T,P,E".split(","),
+            resetZoom: "Reset zoom",
+            resetZoomTitle: "Reset zoom level 1:1",
+            thousandsSep: ","
+        },
+        global: {
+            useUTC: !0,
+            canvasToolsURL: "http://code.highcharts.com/4.0.3/modules/canvas-tools.js",
+            VMLRadialGradientURL: "http://code.highcharts.com/4.0.3/gfx/vml-radial-gradient.png"
+        },
+        chart: {
+            borderColor: "#4572A7",
+            borderRadius: 0,
+            defaultSeriesType: "line",
+            ignoreHiddenSeries: !0,
+            spacing: [10, 10, 15, 10],
+            backgroundColor: "#FFFFFF",
+            plotBorderColor: "#C0C0C0",
+            resetZoomButton: {
+                theme: {
+                    zIndex: 20
+                },
+                position: {
+                    align: "right",
+                    x: -10,
+                    y: 10
+                }
+            }
+        },
+        title: {
+            text: "Chart title",
+            align: "center",
+            margin: 15,
+            style: {
+                color: "#333333",
+                fontSize: "18px"
+            }
+        },
+        subtitle: {
+            text: "",
+            align: "center",
+            style: {
+                color: "#555555"
+            }
+        },
+        plotOptions: {
+            line: {
+                allowPointSelect: !1,
+                showCheckbox: !1,
+                animation: {
+                    duration: 1E3
+                },
+                events: {},
+                lineWidth: 2,
+                marker: {
+                    lineWidth: 0,
+                    radius: 4,
+                    lineColor: "#FFFFFF",
+                    states: {
+                        hover: {
+                            enabled: !0,
+                            lineWidthPlus: 1,
+                            radiusPlus: 2
+                        },
+                        select: {
+                            fillColor: "#FFFFFF",
+                            lineColor: "#000000",
+                            lineWidth: 2
+                        }
+                    }
+                },
+                point: {
+                    events: {}
+                },
+                dataLabels: w(M, {
+                    align: "center",
+                    enabled: !1,
+                    formatter: function() {
+                        return this.y === null ? "": Ga(this.y, -1)
+                    },
+                    verticalAlign: "bottom",
+                    y: 0
+                }),
+                cropThreshold: 300,
+                pointRange: 0,
+                states: {
+                    hover: {
+                        lineWidthPlus: 1,
+                        marker: {},
+                        halo: {
+                            size: 10,
+                            opacity: 0.25
+                        }
+                    },
+                    select: {
+                        marker: {}
+                    }
+                },
+                stickyTracking: !0,
+                turboThreshold: 1E3
+            }
+        },
+        labels: {
+            style: {
+                position: "absolute",
+                color: "#3E576F"
+            }
+        },
+        legend: {
+            enabled: !0,
+            align: "center",
+            layout: "horizontal",
+            labelFormatter: function() {
+                return this.name
+            },
+            borderColor: "#909090",
+            borderRadius: 0,
+            navigation: {
+                activeColor: "#274b6d",
+                inactiveColor: "#CCC"
+            },
+            shadow: !1,
+            itemStyle: {
+                color: "#333333",
+                fontSize: "12px",
+                fontWeight: "bold"
+            },
+            itemHoverStyle: {
+                color: "#000"
+            },
+            itemHiddenStyle: {
+                color: "#CCC"
+            },
+            itemCheckboxStyle: {
+                position: "absolute",
+                width: "13px",
+                height: "13px"
+            },
+            symbolPadding: 5,
+            verticalAlign: "bottom",
+            x: 0,
+            y: 0,
+            title: {
+                style: {
+                    fontWeight: "bold"
+                }
+            }
+        },
+        loading: {
+            labelStyle: {
+                fontWeight: "bold",
+                position: "relative",
+                top: "45%"
+            },
+            style: {
+                position: "absolute",
+                backgroundColor: "white",
+                opacity: 0.5,
+                textAlign: "center"
+            }
+        },
+        tooltip: {
+            enabled: !0,
+            animation: ba,
+            backgroundColor: "rgba(249, 249, 249, .85)",
+            borderWidth: 1,
+            borderRadius: 3,
+            dateTimeLabelFormats: {
+                millisecond: "%A, %b %e, %H:%M:%S.%L",
+                second: "%A, %b %e, %H:%M:%S",
+                minute: "%A, %b %e, %H:%M",
+                hour: "%A, %b %e, %H:%M",
+                day: "%A, %b %e, %Y",
+                week: "Week from %A, %b %e, %Y",
+                month: "%B %Y",
+                year: "%Y"
+            },
+            headerFormat: '<span style="font-size: 10px">{point.key}</span><br/>',
+            pointFormat: '<span style="color:{series.color}">●</span> {series.name}: <b>{point.y}</b><br/>',
+            shadow: !0,
+            snap: Hb ? 25 : 10,
+            style: {
+                color: "#333333",
+                cursor: "default",
+                fontSize: "12px",
+                padding: "8px",
+                whiteSpace: "nowrap"
+            }
+        },
+        credits: {
+            enabled: !0,
+            text: "",
+            href: "",
+            position: {
+                align: "right",
+                x: -10,
+                verticalAlign: "bottom",
+                y: -5
+            },
+            style: {
+                cursor: "pointer",
+                color: "#909090",
+                fontSize: "9px"
+            }
+        }
+    };
+    var ca = L.plotOptions,
+    T = ca.line;
+    Ab();
+    var Tb = /rgba\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]?(?:\.[0-9]+)?)\s*\)/,
+    Ub = /#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/,
+    Vb = /rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/,
+    ya = function(a) {
+        var b = [],
+        c,
+        d; (function(a) {
+            a && a.stops ? d = Ua(a.stops,
+            function(a) {
+                return ya(a[1])
+            }) : (c = Tb.exec(a)) ? b = [z(c[1]), z(c[2]), z(c[3]), parseFloat(c[4], 10)] : (c = Ub.exec(a)) ? b = [z(c[1], 16), z(c[2], 16), z(c[3], 16), 1] : (c = Vb.exec(a)) && (b = [z(c[1]), z(c[2]), z(c[3]), 1])
+        })(a);
+        return {
+            get: function(c) {
+                var f;
+                d ? (f = w(a), f.stops = [].concat(f.stops), q(d,
+                function(a, b) {
+                    f.stops[b] = [f.stops[b][0], a.get(c)]
+                })) : f = b && !isNaN(b[0]) ? c === "rgb" ? "rgb(" + b[0] + "," + b[1] + "," + b[2] + ")": c === "a" ? b[3] : "rgba(" + b.join(",") + ")": a;
+                return f
+            },
+            brighten: function(a) {
+                if (d) q(d,
+                function(b) {
+                    b.brighten(a)
+                });
+                else if (ia(a) && a !== 0) {
+                    var c;
+                    for (c = 0; c < 3; c++) b[c] += z(a * 255),
+                    b[c] < 0 && (b[c] = 0),
+                    b[c] > 255 && (b[c] = 255)
+                }
+                return this
+            },
+            rgba: b,
+            setOpacity: function(a) {
+                b[3] = a;
+                return this
+            }
+        }
+    };
+    G.prototype = {
+        opacity: 1,
+        textProps: "fontSize,fontWeight,fontFamily,color,lineHeight,width,textDecoration,textShadow,HcTextStroke".split(","),
+        init: function(a, b) {
+            this.element = b === "span" ? $(b) : x.createElementNS(xa, b);
+            this.renderer = a
+        },
+        animate: function(a, b, c) {
+            b = p(b, va, !0);
+            ab(this);
+            if (b) {
+                b = w(b, {});
+                if (c) b.complete = c;
+                ib(this, a, b)
+            } else this.attr(a),
+            c && c();
+            return this
+        },
+        colorGradient: function(a, b, c) {
+            var d = this.renderer,
+            e, f, g, h, i, j, k, l, m, n, o = [];
+            a.linearGradient ? f = "linearGradient": a.radialGradient && (f = "radialGradient");
+            if (f) {
+                g = a[f];
+                h = d.gradients;
+                j = a.stops;
+                m = c.radialReference;
+                La(g) && (a[f] = g = {
+                    x1: g[0],
+                    y1: g[1],
+                    x2: g[2],
+                    y2: g[3],
+                    gradientUnits: "userSpaceOnUse"
+                });
+                f === "radialGradient" && m && !s(g.gradientUnits) && (g = w(g, {
+                    cx: m[0] - m[2] / 2 + g.cx * m[2],
+                    cy: m[1] - m[2] / 2 + g.cy * m[2],
+                    r: g.r * m[2],
+                    gradientUnits: "userSpaceOnUse"
+                }));
+                for (n in g) n !== "id" && o.push(n, g[n]);
+                for (n in j) o.push(j[n]);
+                o = o.join(",");
+                h[o] ? a = h[o].attr("id") : (g.id = a = "highcharts-" + tb++, h[o] = i = d.createElement(f).attr(g).add(d.defs), i.stops = [], q(j,
+                function(a) {
+                    a[1].indexOf("rgba") === 0 ? (e = ya(a[1]), k = e.get("rgb"), l = e.get("a")) : (k = a[1], l = 1);
+                    a = d.createElement("stop").attr({
+                        offset: a[0],
+                        "stop-color": k,
+                        "stop-opacity": l
+                    }).add(i);
+                    i.stops.push(a)
+                }));
+                c.setAttribute(b, "url(" + d.url + "#" + a + ")")
+            }
+        },
+        attr: function(a, b) {
+            var c, d, e = this.element,
+            f, g = this,
+            h;
+            typeof a === "string" && b !== t && (c = a, a = {},
+            a[c] = b);
+            if (typeof a === "string") g = (this[a + "Getter"] || this._defaultGetter).call(this, a, e);
+            else {
+                for (c in a) {
+                    d = a[c];
+                    h = !1;
+                    this.symbolName && /^(x|y|width|height|r|start|end|innerR|anchorX|anchorY)/.test(c) && (f || (this.symbolAttr(a), f = !0), h = !0);
+                    if (this.rotation && (c === "x" || c === "y")) this.doTransform = !0;
+                    h || (this[c + "Setter"] || this._defaultSetter).call(this, d, c, e);
+                    this.shadows && /^(width|height|visibility|x|y|d|transform|cx|cy|r)$/.test(c) && this.updateShadows(c, d)
+                }
+                if (this.doTransform) this.updateTransform(),
+                this.doTransform = !1
+            }
+            return g
+        },
+        updateShadows: function(a, b) {
+            for (var c = this.shadows,
+            d = c.length; d--;) c[d].setAttribute(a, a === "height" ? u(b - (c[d].cutHeight || 0), 0) : a === "d" ? this.d: b)
+        },
+        addClass: function(a) {
+            var b = this.element,
+            c = F(b, "class") || "";
+            c.indexOf(a) === -1 && F(b, "class", c + " " + a);
+            return this
+        },
+        symbolAttr: function(a) {
+            var b = this;
+            q("x,y,r,start,end,width,height,innerR,anchorX,anchorY".split(","),
+            function(c) {
+                b[c] = p(a[c], b[c])
+            });
+            b.attr({
+                d: b.renderer.symbols[b.symbolName](b.x, b.y, b.width, b.height, b)
+            })
+        },
+        clip: function(a) {
+            return this.attr("clip-path", a ? "url(" + this.renderer.url + "#" + a.id + ")": P)
+        },
+        crisp: function(a) {
+            var b, c = {},
+            d, e = a.strokeWidth || this.strokeWidth || 0;
+            d = v(e) % 2 / 2;
+            a.x = U(a.x || this.x || 0) + d;
+            a.y = U(a.y || this.y || 0) + d;
+            a.width = U((a.width || this.width || 0) - 2 * d);
+            a.height = U((a.height || this.height || 0) - 2 * d);
+            a.strokeWidth = e;
+            for (b in a) this[b] !== a[b] && (this[b] = c[b] = a[b]);
+            return c
+        },
+        css: function(a) {
+            var b = this.styles,
+            c = {},
+            d = this.element,
+            e, f, g = "";
+            e = !b;
+            if (a && a.color) a.fill = a.color;
+            if (b) for (f in a) a[f] !== b[f] && (c[f] = a[f], e = !0);
+            if (e) {
+                e = this.textWidth = a && a.width && d.nodeName.toLowerCase() === "text" && z(a.width);
+                b && (a = r(b, c));
+                this.styles = a;
+                e && (ga || !ba && this.renderer.forExport) && delete a.width;
+                if (Aa && !ba) A(this.element, a);
+                else {
+                    b = function(a, b) {
+                        return "-" + b.toLowerCase()
+                    };
+                    for (f in a) g += f.replace(/([A-Z])/g, b) + ":" + a[f] + ";";
+                    F(d, "style", g)
+                }
+                e && this.added && this.renderer.buildText(this)
+            }
+            return this
+        },
+        on: function(a, b) {
+            var c = this,
+            d = c.element;
+            Za && a === "click" ? (d.ontouchstart = function(a) {
+                c.touchEventFired = Date.now();
+                a.preventDefault();
+                b.call(d, a)
+            },
+            d.onclick = function(a) { (wa.indexOf("Android") === -1 || Date.now() - (c.touchEventFired || 0) > 1100) && b.call(d, a)
+            }) : d["on" + a] = b;
+            return this
+        },
+        setRadialReference: function(a) {
+            this.element.radialReference = a;
+            return this
+        },
+        translate: function(a, b) {
+            return this.attr({
+                translateX: a,
+                translateY: b
+            })
+        },
+        invert: function() {
+            this.inverted = !0;
+            this.updateTransform();
+            return this
+        },
+        updateTransform: function() {
+            var a = this.translateX || 0,
+            b = this.translateY || 0,
+            c = this.scaleX,
+            d = this.scaleY,
+            e = this.inverted,
+            f = this.rotation,
+            g = this.element;
+            e && (a += this.attr("width"), b += this.attr("height"));
+            a = ["translate(" + a + "," + b + ")"];
+            e ? a.push("rotate(90) scale(-1,1)") : f && a.push("rotate(" + f + " " + (g.getAttribute("x") || 0) + " " + (g.getAttribute("y") || 0) + ")"); (s(c) || s(d)) && a.push("scale(" + p(c, 1) + " " + p(d, 1) + ")");
+            a.length && g.setAttribute("transform", a.join(" "))
+        },
+        toFront: function() {
+            var a = this.element;
+            a.parentNode.appendChild(a);
+            return this
+        },
+        align: function(a, b, c) {
+            var d, e, f, g, h = {};
+            e = this.renderer;
+            f = e.alignedObjects;
+            if (a) {
+                if (this.alignOptions = a, this.alignByTranslate = b, !c || Fa(c)) this.alignTo = d = c || "renderer",
+                ka(f, this),
+                f.push(this),
+                c = null
+            } else a = this.alignOptions,
+            b = this.alignByTranslate,
+            d = this.alignTo;
+            c = p(c, e[d], e);
+            d = a.align;
+            e = a.verticalAlign;
+            f = (c.x || 0) + (a.x || 0);
+            g = (c.y || 0) + (a.y || 0);
+            if (d === "right" || d === "center") f += (c.width - (a.width || 0)) / {
+                right: 1,
+                center: 2
+            } [d];
+            h[b ? "translateX": "x"] = v(f);
+            if (e === "bottom" || e === "middle") g += (c.height - (a.height || 0)) / ({
+                bottom: 1,
+                middle: 2
+            } [e] || 1);
+            h[b ? "translateY": "y"] = v(g);
+            this[this.placed ? "animate": "attr"](h);
+            this.placed = !0;
+            this.alignAttr = h;
+            return this
+        },
+        getBBox: function() {
+            var a = this.bBox,
+            b = this.renderer,
+            c, d, e = this.rotation;
+            c = this.element;
+            var f = this.styles,
+            g = e * Ca;
+            d = this.textStr;
+            var h;
+            if (d === "" || Ob.test(d)) h = "num." + d.toString().length + (f ? "|" + f.fontSize + "|" + f.fontFamily: "");
+            h && (a = b.cache[h]);
+            if (!a) {
+                if (c.namespaceURI === xa || b.forExport) {
+                    try {
+                        a = c.getBBox ? r({},
+                        c.getBBox()) : {
+                            width: c.offsetWidth,
+                            height: c.offsetHeight
+                        }
+                    } catch(i) {}
+                    if (!a || a.width < 0) a = {
+                        width: 0,
+                        height: 0
+                    }
+                } else a = this.htmlGetBBox();
+                if (b.isSVG) {
+                    c = a.width;
+                    d = a.height;
+                    if (Aa && f && f.fontSize === "11px" && d.toPrecision(3) === "16.9") a.height = d = 14;
+                    if (e) a.width = Q(d * fa(g)) + Q(c * aa(g)),
+                    a.height = Q(d * aa(g)) + Q(c * fa(g))
+                }
+                this.bBox = a;
+                h && (b.cache[h] = a)
+            }
+            return a
+        },
+        show: function(a) {
+            return a && this.element.namespaceURI === xa ? (this.element.removeAttribute("visibility"), this) : this.attr({
+                visibility: a ? "inherit": "visible"
+            })
+        },
+        hide: function() {
+            return this.attr({
+                visibility: "hidden"
+            })
+        },
+        fadeOut: function(a) {
+            var b = this;
+            b.animate({
+                opacity: 0
+            },
+            {
+                duration: a || 150,
+                complete: function() {
+                    b.hide()
+                }
+            })
+        },
+        add: function(a) {
+            var b = this.renderer,
+            c = a || b,
+            d = c.element || b.box,
+            e = this.element,
+            f = this.zIndex,
+            g, h;
+            if (a) this.parentGroup = a;
+            this.parentInverted = a && a.inverted;
+            this.textStr !== void 0 && b.buildText(this);
+            if (f) c.handleZ = !0,
+            f = z(f);
+            if (c.handleZ) {
+                a = d.childNodes;
+                for (g = 0; g < a.length; g++) if (b = a[g], c = F(b, "zIndex"), b !== e && (z(c) > f || !s(f) && s(c))) {
+                    d.insertBefore(e, b);
+                    h = !0;
+                    break
+                }
+            }
+            h || d.appendChild(e);
+            this.added = !0;
+            if (this.onAdd) this.onAdd();
+            return this
+        },
+        safeRemoveChild: function(a) {
+            var b = a.parentNode;
+            b && b.removeChild(a)
+        },
+        destroy: function() {
+            var a = this,
+            b = a.element || {},
+            c = a.shadows,
+            d = a.renderer.isSVG && b.nodeName === "SPAN" && a.parentGroup,
+            e, f;
+            b.onclick = b.onmouseout = b.onmouseover = b.onmousemove = b.point = null;
+            ab(a);
+            if (a.clipPath) a.clipPath = a.clipPath.destroy();
+            if (a.stops) {
+                for (f = 0; f < a.stops.length; f++) a.stops[f] = a.stops[f].destroy();
+                a.stops = null
+            }
+            a.safeRemoveChild(b);
+            for (c && q(c,
+            function(b) {
+                a.safeRemoveChild(b)
+            }); d && d.div && d.div.childNodes.length === 0;) b = d.parentGroup,
+            a.safeRemoveChild(d.div),
+            delete d.div,
+            d = b;
+            a.alignTo && ka(a.renderer.alignedObjects, a);
+            for (e in a) delete a[e];
+            return null
+        },
+        shadow: function(a, b, c) {
+            var d = [],
+            e,
+            f,
+            g = this.element,
+            h,
+            i,
+            j,
+            k;
+            if (a) {
+                i = p(a.width, 3);
+                j = (a.opacity || 0.15) / i;
+                k = this.parentInverted ? "(-1,-1)": "(" + p(a.offsetX, 1) + ", " + p(a.offsetY, 1) + ")";
+                for (e = 1; e <= i; e++) {
+                    f = g.cloneNode(0);
+                    h = i * 2 + 1 - 2 * e;
+                    F(f, {
+                        isShadow: "true",
+                        stroke: a.color || "black",
+                        "stroke-opacity": j * e,
+                        "stroke-width": h,
+                        transform: "translate" + k,
+                        fill: P
+                    });
+                    if (c) F(f, "height", u(F(f, "height") - h, 0)),
+                    f.cutHeight = h;
+                    b ? b.element.appendChild(f) : g.parentNode.insertBefore(f, g);
+                    d.push(f)
+                }
+                this.shadows = d
+            }
+            return this
+        },
+        xGetter: function(a) {
+            this.element.nodeName === "circle" && (a = {
+                x: "cx",
+                y: "cy"
+            } [a] || a);
+            return this._defaultGetter(a)
+        },
+        _defaultGetter: function(a) {
+            a = p(this[a], this.element ? this.element.getAttribute(a) : null, 0);
+            /^[\-0-9\.]+$/.test(a) && (a = parseFloat(a));
+            return a
+        },
+        dSetter: function(a, b, c) {
+            a && a.join && (a = a.join(" "));
+            /(NaN| {2}|^$)/.test(a) && (a = "M 0 0");
+            c.setAttribute(b, a);
+            this[b] = a
+        },
+        dashstyleSetter: function(a) {
+            var b;
+            if (a = a && a.toLowerCase()) {
+                a = a.replace("shortdashdotdot", "3,1,1,1,1,1,").replace("shortdashdot", "3,1,1,1").replace("shortdot", "1,1,").replace("shortdash", "3,1,").replace("longdash", "8,3,").replace(/dot/g, "1,3,").replace("dash", "4,3,").replace(/,$/, "").replace("solid", 1).split(",");
+                for (b = a.length; b--;) a[b] = z(a[b]) * this["stroke-width"];
+                a = a.join(",");
+                this.element.setAttribute("stroke-dasharray", a)
+            }
+        },
+        alignSetter: function(a) {
+            this.element.setAttribute("text-anchor", {
+                left: "start",
+                center: "middle",
+                right: "end"
+            } [a])
+        },
+        opacitySetter: function(a, b, c) {
+            this[b] = a;
+            c.setAttribute(b, a)
+        },
+        titleSetter: function(a) {
+            var b = this.element.getElementsByTagName("title")[0];
+            b || (b = x.createElementNS(xa, "title"), this.element.appendChild(b));
+            b.textContent = a
+        },
+        textSetter: function(a) {
+            if (a !== this.textStr) delete this.bBox,
+            this.textStr = a,
+            this.added && this.renderer.buildText(this)
+        },
+        fillSetter: function(a, b, c) {
+            typeof a === "string" ? c.setAttribute(b, a) : a && this.colorGradient(a, b, c)
+        },
+        zIndexSetter: function(a, b, c) {
+            c.setAttribute(b, a);
+            this[b] = a
+        },
+        _defaultSetter: function(a, b, c) {
+            c.setAttribute(b, a)
+        }
+    };
+    G.prototype.yGetter = G.prototype.xGetter;
+    G.prototype.translateXSetter = G.prototype.translateYSetter = G.prototype.rotationSetter = G.prototype.verticalAlignSetter = G.prototype.scaleXSetter = G.prototype.scaleYSetter = function(a, b) {
+        this[b] = a;
+        this.doTransform = !0
+    };
+    G.prototype["stroke-widthSetter"] = G.prototype.strokeSetter = function(a, b, c) {
+        this[b] = a;
+        if (this.stroke && this["stroke-width"]) this.strokeWidth = this["stroke-width"],
+        G.prototype.fillSetter.call(this, this.stroke, "stroke", c),
+        c.setAttribute("stroke-width", this["stroke-width"]),
+        this.hasStroke = !0;
+        else if (b === "stroke-width" && a === 0 && this.hasStroke) c.removeAttribute("stroke"),
+        this.hasStroke = !1
+    };
+    var ta = function() {
+        this.init.apply(this, arguments)
+    };
+    ta.prototype = {
+        Element: G,
+        init: function(a, b, c, d, e) {
+            var f = location,
+            g, d = this.createElement("svg").attr({
+                version: "1.1"
+            }).css(this.getStyle(d));
+            g = d.element;
+            a.appendChild(g);
+            a.innerHTML.indexOf("xmlns") === -1 && F(g, "xmlns", xa);
+            this.isSVG = !0;
+            this.box = g;
+            this.boxWrapper = d;
+            this.alignedObjects = [];
+            this.url = (Ta || sb) && x.getElementsByTagName("base").length ? f.href.replace(/#.*?$/, "").replace(/([\('\)])/g, "\\$1").replace(/ /g, "%20") : "";
+            this.createElement("desc").add().element.appendChild(x.createTextNode("Created with Highcharts 4.0.3"));
+            this.defs = this.createElement("defs").add();
+            this.forExport = e;
+            this.gradients = {};
+            this.cache = {};
+            this.setSize(b, c, !1);
+            var h;
+            if (Ta && a.getBoundingClientRect) this.subPixelFix = b = function() {
+                A(a, {
+                    left: 0,
+                    top: 0
+                });
+                h = a.getBoundingClientRect();
+                A(a, {
+                    left: Ka(h.left) - h.left + "px",
+                    top: Ka(h.top) - h.top + "px"
+                })
+            },
+            b(),
+            N(H, "resize", b)
+        },
+        getStyle: function(a) {
+            return this.style = r({
+                fontFamily: '"Lucida Grande", "Lucida Sans Unicode", Arial, Helvetica, sans-serif',
+                fontSize: "12px"
+            },
+            a)
+        },
+        isHidden: function() {
+            return ! this.boxWrapper.getBBox().width
+        },
+        destroy: function() {
+            var a = this.defs;
+            this.box = null;
+            this.boxWrapper = this.boxWrapper.destroy();
+            Oa(this.gradients || {});
+            this.gradients = null;
+            if (a) this.defs = a.destroy();
+            this.subPixelFix && X(H, "resize", this.subPixelFix);
+            return this.alignedObjects = null
+        },
+        createElement: function(a) {
+            var b = new this.Element;
+            b.init(this, a);
+            return b
+        },
+        draw: function() {},
+        buildText: function(a) {
+            for (var b = a.element,
+            c = this,
+            d = c.forExport,
+            e = p(a.textStr, "").toString(), f = e.indexOf("<") !== -1, g = b.childNodes, h, i, j = F(b, "x"), k = a.styles, l = a.textWidth, m = k && k.lineHeight, n = k && k.HcTextStroke, o = g.length, Y = function(a) {
+                return m ? z(m) : c.fontMetrics(/(px|em)$/.test(a && a.style.fontSize) ? a.style.fontSize: k && k.fontSize || c.style.fontSize || 12, a).h
+            }; o--;) b.removeChild(g[o]); ! f && !n && e.indexOf(" ") === -1 ? b.appendChild(x.createTextNode(e)) : (h = /<.*style="([^"]+)".*>/, i = /<.*href="(http[^"]+)".*>/, l && !a.added && this.box.appendChild(b), e = f ? e.replace(/<(b|strong)>/g, '<span style="font-weight:bold">').replace(/<(i|em)>/g, '<span style="font-style:italic">').replace(/<a/g, "<span").replace(/<\/(b|strong|i|em|a)>/g, "</span>").split(/<br.*?>/g) : [e], e[e.length - 1] === "" && e.pop(), q(e,
+            function(e, f) {
+                var g, m = 0,
+                e = e.replace(/<span/g, "|||<span").replace(/<\/span>/g, "</span>|||");
+                g = e.split("|||");
+                q(g,
+                function(e) {
+                    if (e !== "" || g.length === 1) {
+                        var n = {},
+                        o = x.createElementNS(xa, "tspan"),
+                        p;
+                        h.test(e) && (p = e.match(h)[1].replace(/(;| |^)color([ :])/, "$1fill$2"), F(o, "style", p));
+                        i.test(e) && !d && (F(o, "onclick", 'location.href="' + e.match(i)[1] + '"'), A(o, {
+                            cursor: "pointer"
+                        }));
+                        e = (e.replace(/<(.|\n)*?>/g, "") || " ").replace(/&lt;/g, "<").replace(/&gt;/g, ">");
+                        if (e !== " ") {
+                            o.appendChild(x.createTextNode(e));
+                            if (m) n.dx = 0;
+                            else if (f && j !== null) n.x = j;
+                            F(o, n);
+                            b.appendChild(o); ! m && f && (!ba && d && A(o, {
+                                display: "block"
+                            }), F(o, "dy", Y(o)));
+                            if (l) for (var e = e.replace(/([^\^])-/g, "$1- ").split(" "), n = g.length > 1 || e.length > 1 && k.whiteSpace !== "nowrap", q, E, s = k.HcHeight, u = [], t = Y(o), Kb = 1; n && (e.length || u.length);) delete a.bBox,
+                            q = a.getBBox(),
+                            E = q.width,
+                            !ba && c.forExport && (E = c.measureSpanWidth(o.firstChild.data, a.styles)),
+                            q = E > l,
+                            !q || e.length === 1 ? (e = u, u = [], e.length && (Kb++, s && Kb * t > s ? (e = ["..."], a.attr("title", a.textStr)) : (o = x.createElementNS(xa, "tspan"), F(o, {
+                                dy: t,
+                                x: j
+                            }), p && F(o, "style", p), b.appendChild(o))), E > l && (l = E)) : (o.removeChild(o.firstChild), u.unshift(e.pop())),
+                            e.length && o.appendChild(x.createTextNode(e.join(" ").replace(/- /g, "-")));
+                            m++
+                        }
+                    }
+                })
+            }))
+        },
+        button: function(a, b, c, d, e, f, g, h, i) {
+            var j = this.label(a, b, c, i, null, null, null, null, "button"),
+            k = 0,
+            l,
+            m,
+            n,
+            o,
+            p,
+            q,
+            a = {
+                x1: 0,
+                y1: 0,
+                x2: 0,
+                y2: 1
+            },
+            e = w({
+                "stroke-width": 1,
+                stroke: "#CCCCCC",
+                fill: {
+                    linearGradient: a,
+                    stops: [[0, "#FEFEFE"], [1, "#F6F6F6"]]
+                },
+                r: 2,
+                padding: 5,
+                style: {
+                    color: "black"
+                }
+            },
+            e);
+            n = e.style;
+            delete e.style;
+            f = w(e, {
+                stroke: "#68A",
+                fill: {
+                    linearGradient: a,
+                    stops: [[0, "#FFF"], [1, "#ACF"]]
+                }
+            },
+            f);
+            o = f.style;
+            delete f.style;
+            g = w(e, {
+                stroke: "#68A",
+                fill: {
+                    linearGradient: a,
+                    stops: [[0, "#9BD"], [1, "#CDF"]]
+                }
+            },
+            g);
+            p = g.style;
+            delete g.style;
+            h = w(e, {
+                style: {
+                    color: "#CCC"
+                }
+            },
+            h);
+            q = h.style;
+            delete h.style;
+            N(j.element, Aa ? "mouseover": "mouseenter",
+            function() {
+                k !== 3 && j.attr(f).css(o)
+            });
+            N(j.element, Aa ? "mouseout": "mouseleave",
+            function() {
+                k !== 3 && (l = [e, f, g][k], m = [n, o, p][k], j.attr(l).css(m))
+            });
+            j.setState = function(a) { (j.state = k = a) ? a === 2 ? j.attr(g).css(p) : a === 3 && j.attr(h).css(q) : j.attr(e).css(n)
+            };
+            return j.on("click",
+            function() {
+                k !== 3 && d.call(j)
+            }).attr(e).css(r({
+                cursor: "default"
+            },
+            n))
+        },
+        crispLine: function(a, b) {
+            a[1] === a[4] && (a[1] = a[4] = v(a[1]) - b % 2 / 2);
+            a[2] === a[5] && (a[2] = a[5] = v(a[2]) + b % 2 / 2);
+            return a
+        },
+        path: function(a) {
+            var b = {
+                fill: P
+            };
+            La(a) ? b.d = a: da(a) && r(b, a);
+            return this.createElement("path").attr(b)
+        },
+        circle: function(a, b, c) {
+            a = da(a) ? a: {
+                x: a,
+                y: b,
+                r: c
+            };
+            b = this.createElement("circle");
+            b.xSetter = function(a) {
+                this.element.setAttribute("cx", a)
+            };
+            b.ySetter = function(a) {
+                this.element.setAttribute("cy", a)
+            };
+            return b.attr(a)
+        },
+        arc: function(a, b, c, d, e, f) {
+            if (da(a)) b = a.y,
+            c = a.r,
+            d = a.innerR,
+            e = a.start,
+            f = a.end,
+            a = a.x;
+            a = this.symbol("arc", a || 0, b || 0, c || 0, c || 0, {
+                innerR: d || 0,
+                start: e || 0,
+                end: f || 0
+            });
+            a.r = c;
+            return a
+        },
+        rect: function(a, b, c, d, e, f) {
+            var e = da(a) ? a.r: e,
+            g = this.createElement("rect"),
+            a = da(a) ? a: a === t ? {}: {
+                x: a,
+                y: b,
+                width: u(c, 0),
+                height: u(d, 0)
+            };
+            if (f !== t) a.strokeWidth = f,
+            a = g.crisp(a);
+            if (e) a.r = e;
+            g.rSetter = function(a) {
+                F(this.element, {
+                    rx: a,
+                    ry: a
+                })
+            };
+            return g.attr(a)
+        },
+        setSize: function(a, b, c) {
+            var d = this.alignedObjects,
+            e = d.length;
+            this.width = a;
+            this.height = b;
+            for (this.boxWrapper[p(c, !0) ? "animate": "attr"]({
+                width: a,
+                height: b
+            }); e--;) d[e].align()
+        },
+        g: function(a) {
+            var b = this.createElement("g");
+            return s(a) ? b.attr({
+                "class": "highcharts-" + a
+            }) : b
+        },
+        image: function(a, b, c, d, e) {
+            var f = {
+                preserveAspectRatio: P
+            };
+            arguments.length > 1 && r(f, {
+                x: b,
+                y: c,
+                width: d,
+                height: e
+            });
+            f = this.createElement("image").attr(f);
+            f.element.setAttributeNS ? f.element.setAttributeNS("http://www.w3.org/1999/xlink", "href", a) : f.element.setAttribute("hc-svg-href", a);
+            return f
+        },
+        symbol: function(a, b, c, d, e, f) {
+            var g, h = this.symbols[a],
+            h = h && h(v(b), v(c), d, e, f),
+            i = /^url\((.*?)\)$/,
+            j,
+            k;
+            if (h) g = this.path(h),
+            r(g, {
+                symbolName: a,
+                x: b,
+                y: c,
+                width: d,
+                height: e
+            }),
+            f && r(g, f);
+            else if (i.test(a)) k = function(a, b) {
+                a.element && (a.attr({
+                    width: b[0],
+                    height: b[1]
+                }), a.alignByTranslate || a.translate(v((d - b[0]) / 2), v((e - b[1]) / 2)))
+            },
+            j = a.match(i)[1],
+            a = Ib[j],
+            g = this.image(j).attr({
+                x: b,
+                y: c
+            }),
+            g.isImg = !0,
+            a ? k(g, a) : (g.attr({
+                width: 0,
+                height: 0
+            }), $("img", {
+                onload: function() {
+                    k(g, Ib[j] = [this.width, this.height])
+                },
+                src: j
+            }));
+            return g
+        },
+        symbols: {
+            circle: function(a, b, c, d) {
+                var e = 0.166 * c;
+                return ["M", a + c / 2, b, "C", a + c + e, b, a + c + e, b + d, a + c / 2, b + d, "C", a - e, b + d, a - e, b, a + c / 2, b, "Z"]
+            },
+            square: function(a, b, c, d) {
+                return ["M", a, b, "L", a + c, b, a + c, b + d, a, b + d, "Z"]
+            },
+            triangle: function(a, b, c, d) {
+                return ["M", a + c / 2, b, "L", a + c, b + d, a, b + d, "Z"]
+            },
+            "triangle-down": function(a, b, c, d) {
+                return ["M", a, b, "L", a + c, b, a + c / 2, b + d, "Z"]
+            },
+            diamond: function(a, b, c, d) {
+                return ["M", a + c / 2, b, "L", a + c, b + d / 2, a + c / 2, b + d, a, b + d / 2, "Z"]
+            },
+            arc: function(a, b, c, d, e) {
+                var f = e.start,
+                c = e.r || c || d,
+                g = e.end - 0.001,
+                d = e.innerR,
+                h = e.open,
+                i = aa(f),
+                j = fa(f),
+                k = aa(g),
+                g = fa(g),
+                e = e.end - f < na ? 0 : 1;
+                return ["M", a + c * i, b + c * j, "A", c, c, 0, e, 1, a + c * k, b + c * g, h ? "M": "L", a + d * k, b + d * g, "A", d, d, 0, e, 0, a + d * i, b + d * j, h ? "": "Z"]
+            },
+            callout: function(a, b, c, d, e) {
+                var f = C(e && e.r || 0, c, d),
+                g = f + 6,
+                h = e && e.anchorX,
+                i = e && e.anchorY,
+                e = v(e.strokeWidth || 0) % 2 / 2;
+                a += e;
+                b += e;
+                e = ["M", a + f, b, "L", a + c - f, b, "C", a + c, b, a + c, b, a + c, b + f, "L", a + c, b + d - f, "C", a + c, b + d, a + c, b + d, a + c - f, b + d, "L", a + f, b + d, "C", a, b + d, a, b + d, a, b + d - f, "L", a, b + f, "C", a, b, a, b, a + f, b];
+                h && h > c && i > b + g && i < b + d - g ? e.splice(13, 3, "L", a + c, i - 6, a + c + 6, i, a + c, i + 6, a + c, b + d - f) : h && h < 0 && i > b + g && i < b + d - g ? e.splice(33, 3, "L", a, i + 6, a - 6, i, a, i - 6, a, b + f) : i && i > d && h > a + g && h < a + c - g ? e.splice(23, 3, "L", h + 6, b + d, h, b + d + 6, h - 6, b + d, a + f, b + d) : i && i < 0 && h > a + g && h < a + c - g && e.splice(3, 3, "L", h - 6, b, h, b - 6, h + 6, b, c - f, b);
+                return e
+            }
+        },
+        clipRect: function(a, b, c, d) {
+            var e = "highcharts-" + tb++,
+            f = this.createElement("clipPath").attr({
+                id: e
+            }).add(this.defs),
+            a = this.rect(a, b, c, d, 0).add(f);
+            a.id = e;
+            a.clipPath = f;
+            return a
+        },
+        text: function(a, b, c, d) {
+            var e = ga || !ba && this.forExport,
+            f = {};
+            if (d && !this.forExport) return this.html(a, b, c);
+            f.x = Math.round(b || 0);
+            if (c) f.y = Math.round(c);
+            if (a || a === 0) f.text = a;
+            a = this.createElement("text").attr(f);
+            e && a.css({
+                position: "absolute"
+            });
+            if (!d) a.xSetter = function(a, b, c) {
+                var d = c.getElementsByTagName("tspan"),
+                e,
+                f = c.getAttribute(b),
+                m;
+                for (m = 0; m < d.length; m++) e = d[m],
+                e.getAttribute(b) === f && e.setAttribute(b, a);
+                c.setAttribute(b, a)
+            };
+            return a
+        },
+        fontMetrics: function(a, b) {
+            a = a || this.style.fontSize;
+            if (b && H.getComputedStyle) b = b.element || b,
+            a = H.getComputedStyle(b, "").fontSize;
+            var a = /px/.test(a) ? z(a) : /em/.test(a) ? parseFloat(a) * 12 : 12,
+            c = a < 24 ? a + 4 : v(a * 1.2),
+            d = v(c * 0.8);
+            return {
+                h: c,
+                b: d,
+                f: a
+            }
+        },
+        label: function(a, b, c, d, e, f, g, h, i) {
+            function j() {
+                var a, b;
+                a = o.element.style;
+                E = (u === void 0 || wb === void 0 || n.styles.textAlign) && o.textStr && o.getBBox();
+                n.width = (u || E.width || 0) + 2 * D + jb;
+                n.height = (wb || E.height || 0) + 2 * D;
+                R = D + m.fontMetrics(a && a.fontSize, o).b;
+                if (z) {
+                    if (!p) a = v( - I * D),
+                    b = h ? -R: 0,
+                    n.box = p = d ? m.symbol(d, a, b, n.width, n.height, y) : m.rect(a, b, n.width, n.height, 0, y[Pb]),
+                    p.attr("fill", P).add(n);
+                    p.isImg || p.attr(r({
+                        width: v(n.width),
+                        height: v(n.height)
+                    },
+                    y));
+                    y = null
+                }
+            }
+            function k() {
+                var a = n.styles,
+                a = a && a.textAlign,
+                b = jb + D * (1 - I),
+                c;
+                c = h ? 0 : R;
+                if (s(u) && E && (a === "center" || a === "right")) b += {
+                    center: 0.5,
+                    right: 1
+                } [a] * (u - E.width);
+                if (b !== o.x || c !== o.y) o.attr("x", b),
+                c !== t && o.attr("y", c);
+                o.x = b;
+                o.y = c
+            }
+            function l(a, b) {
+                p ? p.attr(a, b) : y[a] = b
+            }
+            var m = this,
+            n = m.g(i),
+            o = m.text("", 0, 0, g).attr({
+                zIndex: 1
+            }),
+            p,
+            E,
+            I = 0,
+            D = 3,
+            jb = 0,
+            u,
+            wb,
+            xb,
+            x,
+            Jb = 0,
+            y = {},
+            R,
+            z;
+            n.onAdd = function() {
+                o.add(n);
+                n.attr({
+                    text: a || "",
+                    x: b,
+                    y: c
+                });
+                p && s(e) && n.attr({
+                    anchorX: e,
+                    anchorY: f
+                })
+            };
+            n.widthSetter = function(a) {
+                u = a
+            };
+            n.heightSetter = function(a) {
+                wb = a
+            };
+            n.paddingSetter = function(a) {
+                s(a) && a !== D && (D = a, k())
+            };
+            n.paddingLeftSetter = function(a) {
+                s(a) && a !== jb && (jb = a, k())
+            };
+            n.alignSetter = function(a) {
+                I = {
+                    left: 0,
+                    center: 0.5,
+                    right: 1
+                } [a]
+            };
+            n.textSetter = function(a) {
+                a !== t && o.textSetter(a);
+                j();
+                k()
+            };
+            n["stroke-widthSetter"] = function(a, b) {
+                a && (z = !0);
+                Jb = a % 2 / 2;
+                l(b, a)
+            };
+            n.strokeSetter = n.fillSetter = n.rSetter = function(a, b) {
+                b === "fill" && a && (z = !0);
+                l(b, a)
+            };
+            n.anchorXSetter = function(a, b) {
+                e = a;
+                l(b, a + Jb - xb)
+            };
+            n.anchorYSetter = function(a, b) {
+                f = a;
+                l(b, a - x)
+            };
+            n.xSetter = function(a) {
+                n.x = a;
+                I && (a -= I * ((u || E.width) + D));
+                xb = v(a);
+                n.attr("translateX", xb)
+            };
+            n.ySetter = function(a) {
+                x = n.y = v(a);
+                n.attr("translateY", x)
+            };
+            var C = n.css;
+            return r(n, {
+                css: function(a) {
+                    if (a) {
+                        var b = {},
+                        a = w(a);
+                        q(n.textProps,
+                        function(c) {
+                            a[c] !== t && (b[c] = a[c], delete a[c])
+                        });
+                        o.css(b)
+                    }
+                    return C.call(n, a)
+                },
+                getBBox: function() {
+                    return {
+                        width: E.width + 2 * D,
+                        height: E.height + 2 * D,
+                        x: E.x - D,
+                        y: E.y - D
+                    }
+                },
+                shadow: function(a) {
+                    p && p.shadow(a);
+                    return n
+                },
+                destroy: function() {
+                    X(n.element, "mouseenter");
+                    X(n.element, "mouseleave");
+                    o && (o = o.destroy());
+                    p && (p = p.destroy());
+                    G.prototype.destroy.call(n);
+                    n = m = j = k = l = null
+                }
+            })
+        }
+    };
+    Ya = ta;
+    r(G.prototype, {
+        htmlCss: function(a) {
+            var b = this.element;
+            if (b = a && b.tagName === "SPAN" && a.width) delete a.width,
+            this.textWidth = b,
+            this.updateTransform();
+            this.styles = r(this.styles, a);
+            A(this.element, a);
+            return this
+        },
+        htmlGetBBox: function() {
+            var a = this.element,
+            b = this.bBox;
+            if (!b) {
+                if (a.nodeName === "text") a.style.position = "absolute";
+                b = this.bBox = {
+                    x: a.offsetLeft,
+                    y: a.offsetTop,
+                    width: a.offsetWidth,
+                    height: a.offsetHeight
+                }
+            }
+            return b
+        },
+        htmlUpdateTransform: function() {
+            if (this.added) {
+                var a = this.renderer,
+                b = this.element,
+                c = this.translateX || 0,
+                d = this.translateY || 0,
+                e = this.x || 0,
+                f = this.y || 0,
+                g = this.textAlign || "left",
+                h = {
+                    left: 0,
+                    center: 0.5,
+                    right: 1
+                } [g],
+                i = this.shadows;
+                A(b, {
+                    marginLeft: c,
+                    marginTop: d
+                });
+                i && q(i,
+                function(a) {
+                    A(a, {
+                        marginLeft: c + 1,
+                        marginTop: d + 1
+                    })
+                });
+                this.inverted && q(b.childNodes,
+                function(c) {
+                    a.invertChild(c, b)
+                });
+                if (b.tagName === "SPAN") {
+                    var j = this.rotation,
+                    k, l = z(this.textWidth),
+                    m = [j, g, b.innerHTML, this.textWidth].join(",");
+                    if (m !== this.cTT) {
+                        k = a.fontMetrics(b.style.fontSize).b;
+                        s(j) && this.setSpanRotation(j, h, k);
+                        i = p(this.elemWidth, b.offsetWidth);
+                        if (i > l && /[ \-]/.test(b.textContent || b.innerText)) A(b, {
+                            width: l + "px",
+                            display: "block",
+                            whiteSpace: "normal"
+                        }),
+                        i = l;
+                        this.getSpanCorrection(i, k, h, j, g)
+                    }
+                    A(b, {
+                        left: e + (this.xCorr || 0) + "px",
+                        top: f + (this.yCorr || 0) + "px"
+                    });
+                    if (sb) k = b.offsetHeight;
+                    this.cTT = m
+                }
+            } else this.alignOnAdd = !0
+        },
+        setSpanRotation: function(a, b, c) {
+            var d = {},
+            e = Aa ? "-ms-transform": sb ? "-webkit-transform": Ta ? "MozTransform": Gb ? "-o-transform": "";
+            d[e] = d.transform = "rotate(" + a + "deg)";
+            d[e + (Ta ? "Origin": "-origin")] = d.transformOrigin = b * 100 + "% " + c + "px";
+            A(this.element, d)
+        },
+        getSpanCorrection: function(a, b, c) {
+            this.xCorr = -a * c;
+            this.yCorr = -b
+        }
+    });
+    r(ta.prototype, {
+        html: function(a, b, c) {
+            var d = this.createElement("span"),
+            e = d.element,
+            f = d.renderer;
+            d.textSetter = function(a) {
+                a !== e.innerHTML && delete this.bBox;
+                e.innerHTML = this.textStr = a
+            };
+            d.xSetter = d.ySetter = d.alignSetter = d.rotationSetter = function(a, b) {
+                b === "align" && (b = "textAlign");
+                d[b] = a;
+                d.htmlUpdateTransform()
+            };
+            d.attr({
+                text: a,
+                x: v(b),
+                y: v(c)
+            }).css({
+                position: "absolute",
+                whiteSpace: "nowrap",
+                fontFamily: this.style.fontFamily,
+                fontSize: this.style.fontSize
+            });
+            d.css = d.htmlCss;
+            if (f.isSVG) d.add = function(a) {
+                var b, c = f.box.parentNode,
+                j = [];
+                if (this.parentGroup = a) {
+                    if (b = a.div, !b) {
+                        for (; a;) j.push(a),
+                        a = a.parentGroup;
+                        q(j.reverse(),
+                        function(a) {
+                            var d;
+                            b = a.div = a.div || $(Ja, {
+                                className: F(a.element, "class")
+                            },
+                            {
+                                position: "absolute",
+                                left: (a.translateX || 0) + "px",
+                                top: (a.translateY || 0) + "px"
+                            },
+                            b || c);
+                            d = b.style;
+                            r(a, {
+                                translateXSetter: function(b, c) {
+                                    d.left = b + "px";
+                                    a[c] = b;
+                                    a.doTransform = !0
+                                },
+                                translateYSetter: function(b, c) {
+                                    d.top = b + "px";
+                                    a[c] = b;
+                                    a.doTransform = !0
+                                },
+                                visibilitySetter: function(a, b) {
+                                    d[b] = a
+                                }
+                            })
+                        })
+                    }
+                } else b = c;
+                b.appendChild(e);
+                d.added = !0;
+                d.alignOnAdd && d.htmlUpdateTransform();
+                return d
+            };
+            return d
+        }
+    });
+    var Z;
+    if (!ba && !ga) {
+        Z = {
+            init: function(a, b) {
+                var c = ["<", b, ' filled="f" stroked="f"'],
+                d = ["position: ", "absolute", ";"],
+                e = b === Ja; (b === "shape" || e) && d.push("left:0;top:0;width:1px;height:1px;");
+                d.push("visibility: ", e ? "hidden": "visible");
+                c.push(' style="', d.join(""), '"/>');
+                if (b) c = e || b === "span" || b === "img" ? c.join("") : a.prepVML(c),
+                this.element = $(c);
+                this.renderer = a
+            },
+            add: function(a) {
+                var b = this.renderer,
+                c = this.element,
+                d = b.box,
+                d = a ? a.element || a: d;
+                a && a.inverted && b.invertChild(c, d);
+                d.appendChild(c);
+                this.added = !0;
+                this.alignOnAdd && !this.deferUpdateTransform && this.updateTransform();
+                if (this.onAdd) this.onAdd();
+                return this
+            },
+            updateTransform: G.prototype.htmlUpdateTransform,
+            setSpanRotation: function() {
+                var a = this.rotation,
+                b = aa(a * Ca),
+                c = fa(a * Ca);
+                A(this.element, {
+                    filter: a ? ["progid:DXImageTransform.Microsoft.Matrix(M11=", b, ", M12=", -c, ", M21=", c, ", M22=", b, ", sizingMethod='auto expand')"].join("") : P
+                })
+            },
+            getSpanCorrection: function(a, b, c, d, e) {
+                var f = d ? aa(d * Ca) : 1,
+                g = d ? fa(d * Ca) : 0,
+                h = p(this.elemHeight, this.element.offsetHeight),
+                i;
+                this.xCorr = f < 0 && -a;
+                this.yCorr = g < 0 && -h;
+                i = f * g < 0;
+                this.xCorr += g * b * (i ? 1 - c: c);
+                this.yCorr -= f * b * (d ? i ? c: 1 - c: 1);
+                e && e !== "left" && (this.xCorr -= a * c * (f < 0 ? -1 : 1), d && (this.yCorr -= h * c * (g < 0 ? -1 : 1)), A(this.element, {
+                    textAlign: e
+                }))
+            },
+            pathToVML: function(a) {
+                for (var b = a.length,
+                c = []; b--;) if (ia(a[b])) c[b] = v(a[b] * 10) - 5;
+                else if (a[b] === "Z") c[b] = "x";
+                else if (c[b] = a[b], a.isArc && (a[b] === "wa" || a[b] === "at")) c[b + 5] === c[b + 7] && (c[b + 7] += a[b + 7] > a[b + 5] ? 1 : -1),
+                c[b + 6] === c[b + 8] && (c[b + 8] += a[b + 8] > a[b + 6] ? 1 : -1);
+                return c.join(" ") || "x"
+            },
+            clip: function(a) {
+                var b = this,
+                c;
+                a ? (c = a.members, ka(c, b), c.push(b), b.destroyClip = function() {
+                    ka(c, b)
+                },
+                a = a.getCSS(b)) : (b.destroyClip && b.destroyClip(), a = {
+                    clip: gb ? "inherit": "rect(auto)"
+                });
+                return b.css(a)
+            },
+            css: G.prototype.htmlCss,
+            safeRemoveChild: function(a) {
+                a.parentNode && Pa(a)
+            },
+            destroy: function() {
+                this.destroyClip && this.destroyClip();
+                return G.prototype.destroy.apply(this)
+            },
+            on: function(a, b) {
+                this.element["on" + a] = function() {
+                    var a = H.event;
+                    a.target = a.srcElement;
+                    b(a)
+                };
+                return this
+            },
+            cutOffPath: function(a, b) {
+                var c, a = a.split(/[ ,]/);
+                c = a.length;
+                if (c === 9 || c === 11) a[c - 4] = a[c - 2] = z(a[c - 2]) - 10 * b;
+                return a.join(" ")
+            },
+            shadow: function(a, b, c) {
+                var d = [],
+                e,
+                f = this.element,
+                g = this.renderer,
+                h,
+                i = f.style,
+                j,
+                k = f.path,
+                l,
+                m,
+                n,
+                o;
+                k && typeof k.value !== "string" && (k = "x");
+                m = k;
+                if (a) {
+                    n = p(a.width, 3);
+                    o = (a.opacity || 0.15) / n;
+                    for (e = 1; e <= 3; e++) {
+                        l = n * 2 + 1 - 2 * e;
+                        c && (m = this.cutOffPath(k.value, l + 0.5));
+                        j = ['<shape isShadow="true" strokeweight="', l, '" filled="false" path="', m, '" coordsize="10 10" style="', f.style.cssText, '" />'];
+                        h = $(g.prepVML(j), null, {
+                            left: z(i.left) + p(a.offsetX, 1),
+                            top: z(i.top) + p(a.offsetY, 1)
+                        });
+                        if (c) h.cutOff = l + 1;
+                        j = ['<stroke color="', a.color || "black", '" opacity="', o * e, '"/>'];
+                        $(g.prepVML(j), null, null, h);
+                        b ? b.element.appendChild(h) : f.parentNode.insertBefore(h, f);
+                        d.push(h)
+                    }
+                    this.shadows = d
+                }
+                return this
+            },
+            updateShadows: sa,
+            setAttr: function(a, b) {
+                gb ? this.element[a] = b: this.element.setAttribute(a, b)
+            },
+            classSetter: function(a) {
+                this.element.className = a
+            },
+            dashstyleSetter: function(a, b, c) { (c.getElementsByTagName("stroke")[0] || $(this.renderer.prepVML(["<stroke/>"]), null, null, c))[b] = a || "solid";
+                this[b] = a
+            },
+            dSetter: function(a, b, c) {
+                var d = this.shadows,
+                a = a || [];
+                this.d = a.join && a.join(" ");
+                c.path = a = this.pathToVML(a);
+                if (d) for (c = d.length; c--;) d[c].path = d[c].cutOff ? this.cutOffPath(a, d[c].cutOff) : a;
+                this.setAttr(b, a)
+            },
+            fillSetter: function(a, b, c) {
+                var d = c.nodeName;
+                if (d === "SPAN") c.style.color = a;
+                else if (d !== "IMG") c.filled = a !== P,
+                this.setAttr("fillcolor", this.renderer.color(a, c, b, this))
+            },
+            opacitySetter: sa,
+            rotationSetter: function(a, b, c) {
+                c = c.style;
+                this[b] = c[b] = a;
+                c.left = -v(fa(a * Ca) + 1) + "px";
+                c.top = v(aa(a * Ca)) + "px"
+            },
+            strokeSetter: function(a, b, c) {
+                this.setAttr("strokecolor", this.renderer.color(a, c, b))
+            },
+            "stroke-widthSetter": function(a, b, c) {
+                c.stroked = !!a;
+                this[b] = a;
+                ia(a) && (a += "px");
+                this.setAttr("strokeweight", a)
+            },
+            titleSetter: function(a, b) {
+                this.setAttr(b, a)
+            },
+            visibilitySetter: function(a, b, c) {
+                a === "inherit" && (a = "visible");
+                this.shadows && q(this.shadows,
+                function(c) {
+                    c.style[b] = a
+                });
+                c.nodeName === "DIV" && (a = a === "hidden" ? "-999em": 0, gb || (c.style[b] = a ? "visible": "hidden"), b = "top");
+                c.style[b] = a
+            },
+            xSetter: function(a, b, c) {
+                this[b] = a;
+                b === "x" ? b = "left": b === "y" && (b = "top");
+                this.updateClipping ? (this[b] = a, this.updateClipping()) : c.style[b] = a
+            },
+            zIndexSetter: function(a, b, c) {
+                c.style[b] = a
+            }
+        };
+        S.VMLElement = Z = la(G, Z);
+        Z.prototype.ySetter = Z.prototype.widthSetter = Z.prototype.heightSetter = Z.prototype.xSetter;
+        var ha = {
+            Element: Z,
+            isIE8: wa.indexOf("MSIE 8.0") > -1,
+            init: function(a, b, c, d) {
+                var e;
+                this.alignedObjects = [];
+                d = this.createElement(Ja).css(r(this.getStyle(d), {
+                    position: "relative"
+                }));
+                e = d.element;
+                a.appendChild(d.element);
+                this.isVML = !0;
+                this.box = e;
+                this.boxWrapper = d;
+                this.cache = {};
+                this.setSize(b, c, !1);
+                if (!x.namespaces.hcv) {
+                    x.namespaces.add("hcv", "urn:schemas-microsoft-com:vml");
+                    try {
+                        x.createStyleSheet().cssText = "hcv\\:fill, hcv\\:path, hcv\\:shape, hcv\\:stroke{ behavior:url(#default#VML); display: inline-block; } "
+                    } catch(f) {
+                        x.styleSheets[0].cssText += "hcv\\:fill, hcv\\:path, hcv\\:shape, hcv\\:stroke{ behavior:url(#default#VML); display: inline-block; } "
+                    }
+                }
+            },
+            isHidden: function() {
+                return ! this.box.offsetWidth
+            },
+            clipRect: function(a, b, c, d) {
+                var e = this.createElement(),
+                f = da(a);
+                return r(e, {
+                    members: [],
+                    left: (f ? a.x: a) + 1,
+                    top: (f ? a.y: b) + 1,
+                    width: (f ? a.width: c) - 1,
+                    height: (f ? a.height: d) - 1,
+                    getCSS: function(a) {
+                        var b = a.element,
+                        c = b.nodeName,
+                        a = a.inverted,
+                        d = this.top - (c === "shape" ? b.offsetTop: 0),
+                        e = this.left,
+                        b = e + this.width,
+                        f = d + this.height,
+                        d = {
+                            clip: "rect(" + v(a ? e: d) + "px," + v(a ? f: b) + "px," + v(a ? b: f) + "px," + v(a ? d: e) + "px)"
+                        }; ! a && gb && c === "DIV" && r(d, {
+                            width: b + "px",
+                            height: f + "px"
+                        });
+                        return d
+                    },
+                    updateClipping: function() {
+                        q(e.members,
+                        function(a) {
+                            a.element && a.css(e.getCSS(a))
+                        })
+                    }
+                })
+            },
+            color: function(a, b, c, d) {
+                var e = this,
+                f, g = /^rgba/,
+                h, i, j = P;
+                a && a.linearGradient ? i = "gradient": a && a.radialGradient && (i = "pattern");
+                if (i) {
+                    var k, l, m = a.linearGradient || a.radialGradient,
+                    n, o, p, E, I, D = "",
+                    a = a.stops,
+                    u, s = [],
+                    t = function() {
+                        h = ['<fill colors="' + s.join(",") + '" opacity="', p, '" o:opacity2="', o, '" type="', i, '" ', D, 'focus="100%" method="any" />'];
+                        $(e.prepVML(h), null, null, b)
+                    };
+                    n = a[0];
+                    u = a[a.length - 1];
+                    n[0] > 0 && a.unshift([0, n[1]]);
+                    u[0] < 1 && a.push([1, u[1]]);
+                    q(a,
+                    function(a, b) {
+                        g.test(a[1]) ? (f = ya(a[1]), k = f.get("rgb"), l = f.get("a")) : (k = a[1], l = 1);
+                        s.push(a[0] * 100 + "% " + k);
+                        b ? (p = l, E = k) : (o = l, I = k)
+                    });
+                    if (c === "fill") if (i === "gradient") c = m.x1 || m[0] || 0,
+                    a = m.y1 || m[1] || 0,
+                    n = m.x2 || m[2] || 0,
+                    m = m.y2 || m[3] || 0,
+                    D = 'angle="' + (90 - V.atan((m - a) / (n - c)) * 180 / na) + '"',
+                    t();
+                    else {
+                        var j = m.r,
+                        r = j * 2,
+                        v = j * 2,
+                        x = m.cx,
+                        y = m.cy,
+                        R = b.radialReference,
+                        w, j = function() {
+                            R && (w = d.getBBox(), x += (R[0] - w.x) / w.width - 0.5, y += (R[1] - w.y) / w.height - 0.5, r *= R[2] / w.width, v *= R[2] / w.height);
+                            D = 'src="' + L.global.VMLRadialGradientURL + '" size="' + r + "," + v + '" origin="0.5,0.5" position="' + x + "," + y + '" color2="' + I + '" ';
+                            t()
+                        };
+                        d.added ? j() : d.onAdd = j;
+                        j = E
+                    } else j = k
+                } else if (g.test(a) && b.tagName !== "IMG") f = ya(a),
+                h = ["<", c, ' opacity="', f.get("a"), '"/>'],
+                $(this.prepVML(h), null, null, b),
+                j = f.get("rgb");
+                else {
+                    j = b.getElementsByTagName(c);
+                    if (j.length) j[0].opacity = 1,
+                    j[0].type = "solid";
+                    j = a
+                }
+                return j
+            },
+            prepVML: function(a) {
+                var b = this.isIE8,
+                a = a.join("");
+                b ? (a = a.replace("/>", ' xmlns="urn:schemas-microsoft-com:vml" />'), a = a.indexOf('style="') === -1 ? a.replace("/>", ' style="display:inline-block;behavior:url(#default#VML);" />') : a.replace('style="', 'style="display:inline-block;behavior:url(#default#VML);')) : a = a.replace("<", "<hcv:");
+                return a
+            },
+            text: ta.prototype.html,
+            path: function(a) {
+                var b = {
+                    coordsize: "10 10"
+                };
+                La(a) ? b.d = a: da(a) && r(b, a);
+                return this.createElement("shape").attr(b)
+            },
+            circle: function(a, b, c) {
+                var d = this.symbol("circle");
+                if (da(a)) c = a.r,
+                b = a.y,
+                a = a.x;
+                d.isCircle = !0;
+                d.r = c;
+                return d.attr({
+                    x: a,
+                    y: b
+                })
+            },
+            g: function(a) {
+                var b;
+                a && (b = {
+                    className: "highcharts-" + a,
+                    "class": "highcharts-" + a
+                });
+                return this.createElement(Ja).attr(b)
+            },
+            image: function(a, b, c, d, e) {
+                var f = this.createElement("img").attr({
+                    src: a
+                });
+                arguments.length > 1 && f.attr({
+                    x: b,
+                    y: c,
+                    width: d,
+                    height: e
+                });
+                return f
+            },
+            createElement: function(a) {
+                return a === "rect" ? this.symbol(a) : ta.prototype.createElement.call(this, a)
+            },
+            invertChild: function(a, b) {
+                var c = this,
+                d = b.style,
+                e = a.tagName === "IMG" && a.style;
+                A(a, {
+                    flip: "x",
+                    left: z(d.width) - (e ? z(e.top) : 1),
+                    top: z(d.height) - (e ? z(e.left) : 1),
+                    rotation: -90
+                });
+                q(a.childNodes,
+                function(b) {
+                    c.invertChild(b, a)
+                })
+            },
+            symbols: {
+                arc: function(a, b, c, d, e) {
+                    var f = e.start,
+                    g = e.end,
+                    h = e.r || c || d,
+                    c = e.innerR,
+                    d = aa(f),
+                    i = fa(f),
+                    j = aa(g),
+                    k = fa(g);
+                    if (g - f === 0) return ["x"];
+                    f = ["wa", a - h, b - h, a + h, b + h, a + h * d, b + h * i, a + h * j, b + h * k];
+                    e.open && !c && f.push("e", "M", a, b);
+                    f.push("at", a - c, b - c, a + c, b + c, a + c * j, b + c * k, a + c * d, b + c * i, "x", "e");
+                    f.isArc = !0;
+                    return f
+                },
+                circle: function(a, b, c, d, e) {
+                    e && (c = d = 2 * e.r);
+                    e && e.isCircle && (a -= c / 2, b -= d / 2);
+                    return ["wa", a, b, a + c, b + d, a + c, b + d / 2, a + c, b + d / 2, "e"]
+                },
+                rect: function(a, b, c, d, e) {
+                    return ta.prototype.symbols[!s(e) || !e.r ? "square": "callout"].call(0, a, b, c, d, e)
+                }
+            }
+        };
+        S.VMLRenderer = Z = function() {
+            this.init.apply(this, arguments)
+        };
+        Z.prototype = w(ta.prototype, ha);
+        Ya = Z
+    }
+    ta.prototype.measureSpanWidth = function(a, b) {
+        var c = x.createElement("span"),
+        d;
+        d = x.createTextNode(a);
+        c.appendChild(d);
+        A(c, b);
+        this.box.appendChild(c);
+        d = c.offsetWidth;
+        Pa(c);
+        return d
+    };
+    var Lb;
+    if (ga) S.CanVGRenderer = Z = function() {
+        xa = "http://www.w3.org/1999/xhtml"
+    },
+    Z.prototype.symbols = {},
+    Lb = function() {
+        function a() {
+            var a = b.length,
+            d;
+            for (d = 0; d < a; d++) b[d]();
+            b = []
+        }
+        var b = [];
+        return {
+            push: function(c, d) {
+                b.length === 0 && Qb(d, a);
+                b.push(c)
+            }
+        }
+    } (),
+    Ya = Z;
+    Sa.prototype = {
+        addLabel: function() {
+            var a = this.axis,
+            b = a.options,
+            c = a.chart,
+            d = a.horiz,
+            e = a.categories,
+            f = a.names,
+            g = this.pos,
+            h = b.labels,
+            i = h.rotation,
+            j = a.tickPositions,
+            d = d && e && !h.step && !h.staggerLines && !h.rotation && c.plotWidth / j.length || !d && (c.margin[3] || c.chartWidth * 0.33),
+            k = g === j[0],
+            l = g === j[j.length - 1],
+            m,
+            f = e ? p(e[g], f[g], g) : g,
+            e = this.label,
+            n = j.info;
+            a.isDatetimeAxis && n && (m = b.dateTimeLabelFormats[n.higherRanks[g] || n.unitName]);
+            this.isFirst = k;
+            this.isLast = l;
+            b = a.labelFormatter.call({
+                axis: a,
+                chart: c,
+                isFirst: k,
+                isLast: l,
+                dateTimeLabelFormat: m,
+                value: a.isLog ? ea(ja(f)) : f
+            });
+            g = d && {
+                width: u(1, v(d - 2 * (h.padding || 10))) + "px"
+            };
+            g = r(g, h.style);
+            if (s(e)) e && e.attr({
+                text: b
+            }).css(g);
+            else {
+                m = {
+                    align: a.labelAlign
+                };
+                if (ia(i)) m.rotation = i;
+                if (d && h.ellipsis) g.HcHeight = a.len / j.length;
+                this.label = e = s(b) && h.enabled ? c.renderer.text(b, 0, 0, h.useHTML).attr(m).css(g).add(a.labelGroup) : null;
+                a.tickBaseline = c.renderer.fontMetrics(h.style.fontSize, e).b;
+                i && a.side === 2 && (a.tickBaseline *= aa(i * Ca))
+            }
+            this.yOffset = e ? p(h.y, a.tickBaseline + (a.side === 2 ? 8 : -(e.getBBox().height / 2))) : 0
+        },
+        getLabelSize: function() {
+            var a = this.label,
+            b = this.axis;
+            return a ? a.getBBox()[b.horiz ? "height": "width"] : 0
+        },
+        getLabelSides: function() {
+            var a = this.label.getBBox(),
+            b = this.axis,
+            c = b.horiz,
+            d = b.options.labels,
+            a = c ? a.width: a.height,
+            b = c ? d.x - a * {
+                left: 0,
+                center: 0.5,
+                right: 1
+            } [b.labelAlign] : 0;
+            return [b, c ? a + b: a]
+        },
+        handleOverflow: function(a, b) {
+            var c = !0,
+            d = this.axis,
+            e = this.isFirst,
+            f = this.isLast,
+            g = d.horiz ? b.x: b.y,
+            h = d.reversed,
+            i = d.tickPositions,
+            j = this.getLabelSides(),
+            k = j[0],
+            j = j[1],
+            l,
+            m,
+            n,
+            o = this.label.line || 0;
+            l = d.labelEdge;
+            m = d.justifyLabels && (e || f);
+            l[o] === t || g + k > l[o] ? l[o] = g + j: m || (c = !1);
+            if (m) {
+                l = (m = d.justifyToPlot) ? d.pos: 0;
+                m = m ? l + d.len: d.chart.chartWidth;
+                do a += e ? 1 : -1,
+                n = d.ticks[i[a]];
+                while (i[a] && (!n || !n.label || n.label.line !== o));
+                d = n && n.label.xy && n.label.xy.x + n.getLabelSides()[e ? 0 : 1];
+                e && !h || f && h ? g + k < l && (g = l - k, n && g + j > d && (c = !1)) : g + j > m && (g = m - j, n && g + k < d && (c = !1));
+                b.x = g
+            }
+            return c
+        },
+        getPosition: function(a, b, c, d) {
+            var e = this.axis,
+            f = e.chart,
+            g = d && f.oldChartHeight || f.chartHeight;
+            return {
+                x: a ? e.translate(b + c, null, null, d) + e.transB: e.left + e.offset + (e.opposite ? (d && f.oldChartWidth || f.chartWidth) - e.right - e.left: 0),
+                y: a ? g - e.bottom + e.offset - (e.opposite ? e.height: 0) : g - e.translate(b + c, null, null, d) - e.transB
+            }
+        },
+        getLabelPosition: function(a, b, c, d, e, f, g, h) {
+            var i = this.axis,
+            j = i.transA,
+            k = i.reversed,
+            l = i.staggerLines,
+            a = a + e.x - (f && d ? f * j * (k ? -1 : 1) : 0),
+            b = b + this.yOffset - (f && !d ? f * j * (k ? 1 : -1) : 0);
+            if (l) c.line = g / (h || 1) % l,
+            b += c.line * (i.labelOffset / l);
+            return {
+                x: a,
+                y: b
+            }
+        },
+        getMarkPath: function(a, b, c, d, e, f) {
+            return f.crispLine(["M", a, b, "L", a + (e ? 0 : -c), b + (e ? c: 0)], d)
+        },
+        render: function(a, b, c) {
+            var d = this.axis,
+            e = d.options,
+            f = d.chart.renderer,
+            g = d.horiz,
+            h = this.type,
+            i = this.label,
+            j = this.pos,
+            k = e.labels,
+            l = this.gridLine,
+            m = h ? h + "Grid": "grid",
+            n = h ? h + "Tick": "tick",
+            o = e[m + "LineWidth"],
+            q = e[m + "LineColor"],
+            E = e[m + "LineDashStyle"],
+            I = e[n + "Length"],
+            m = e[n + "Width"] || 0,
+            D = e[n + "Color"],
+            u = e[n + "Position"],
+            n = this.mark,
+            s = k.step,
+            r = !0,
+            v = d.tickmarkOffset,
+            w = this.getPosition(g, j, v, b),
+            x = w.x,
+            w = w.y,
+            y = g && x === d.pos + d.len || !g && w === d.pos ? -1 : 1,
+            c = p(c, 1);
+            this.isActive = !0;
+            if (o) {
+                j = d.getPlotLinePath(j + v, o * y, b, !0);
+                if (l === t) {
+                    l = {
+                        stroke: q,
+                        "stroke-width": o
+                    };
+                    if (E) l.dashstyle = E;
+                    if (!h) l.zIndex = 1;
+                    if (b) l.opacity = 0;
+                    this.gridLine = l = o ? f.path(j).attr(l).add(d.gridGroup) : null
+                }
+                if (!b && l && j) l[this.isNew ? "attr": "animate"]({
+                    d: j,
+                    opacity: c
+                })
+            }
+            if (m && I) u === "inside" && (I = -I),
+            d.opposite && (I = -I),
+            h = this.getMarkPath(x, w, I, m * y, g, f),
+            n ? n.animate({
+                d: h,
+                opacity: c
+            }) : this.mark = f.path(h).attr({
+                stroke: D,
+                "stroke-width": m,
+                opacity: c
+            }).add(d.axisGroup);
+            if (i && !isNaN(x)) i.xy = w = this.getLabelPosition(x, w, i, g, k, v, a, s),
+            this.isFirst && !this.isLast && !p(e.showFirstLabel, 1) || this.isLast && !this.isFirst && !p(e.showLastLabel, 1) ? r = !1 : !d.isRadial && !k.step && !k.rotation && !b && c !== 0 && (r = this.handleOverflow(a, w)),
+            s && a % s && (r = !1),
+            r && !isNaN(w.y) ? (w.opacity = c, i[this.isNew ? "attr": "animate"](w), this.isNew = !1) : i.attr("y", -9999)
+        },
+        destroy: function() {
+            Oa(this, this.axis)
+        }
+    };
+    S.PlotLineOrBand = function(a, b) {
+        this.axis = a;
+        if (b) this.options = b,
+        this.id = b.id
+    };
+    S.PlotLineOrBand.prototype = {
+        render: function() {
+            var a = this,
+            b = a.axis,
+            c = b.horiz,
+            d = (b.pointRange || 0) / 2,
+            e = a.options,
+            f = e.label,
+            g = a.label,
+            h = e.width,
+            i = e.to,
+            j = e.from,
+            k = s(j) && s(i),
+            l = e.value,
+            m = e.dashStyle,
+            n = a.svgElem,
+            o = [],
+            p,
+            q = e.color,
+            I = e.zIndex,
+            D = e.events,
+            r = {},
+            t = b.chart.renderer;
+            b.isLog && (j = za(j), i = za(i), l = za(l));
+            if (h) {
+                if (o = b.getPlotLinePath(l, h), r = {
+                    stroke: q,
+                    "stroke-width": h
+                },
+                m) r.dashstyle = m
+            } else if (k) {
+                j = u(j, b.min - d);
+                i = C(i, b.max + d);
+                o = b.getPlotBandPath(j, i, e);
+                if (q) r.fill = q;
+                if (e.borderWidth) r.stroke = e.borderColor,
+                r["stroke-width"] = e.borderWidth
+            } else return;
+            if (s(I)) r.zIndex = I;
+            if (n) if (o) n.animate({
+                d: o
+            },
+            null, n.onGetPath);
+            else {
+                if (n.hide(), n.onGetPath = function() {
+                    n.show()
+                },
+                g) a.label = g = g.destroy()
+            } else if (o && o.length && (a.svgElem = n = t.path(o).attr(r).add(), D)) for (p in d = function(b) {
+                n.on(b,
+                function(c) {
+                    D[b].apply(a, [c])
+                })
+            },
+            D) d(p);
+            if (f && s(f.text) && o && o.length && b.width > 0 && b.height > 0) {
+                f = w({
+                    align: c && k && "center",
+                    x: c ? !k && 4 : 10,
+                    verticalAlign: !c && k && "middle",
+                    y: c ? k ? 16 : 10 : k ? 6 : -4,
+                    rotation: c && !k && 90
+                },
+                f);
+                if (!g) {
+                    r = {
+                        align: f.textAlign || f.align,
+                        rotation: f.rotation
+                    };
+                    if (s(I)) r.zIndex = I;
+                    a.label = g = t.text(f.text, 0, 0, f.useHTML).attr(r).css(f.style).add()
+                }
+                b = [o[1], o[4], k ? o[6] : o[1]];
+                k = [o[2], o[5], k ? o[7] : o[2]];
+                o = Na(b);
+                c = Na(k);
+                g.align(f, !1, {
+                    x: o,
+                    y: c,
+                    width: Ba(b) - o,
+                    height: Ba(k) - c
+                });
+                g.show()
+            } else g && g.hide();
+            return a
+        },
+        destroy: function() {
+            ka(this.axis.plotLinesAndBands, this);
+            delete this.axis;
+            Oa(this)
+        }
+    };
+    ma.prototype = {
+        defaultOptions: {
+            dateTimeLabelFormats: {
+                millisecond: "%H:%M:%S.%L",
+                second: "%H:%M:%S",
+                minute: "%H:%M",
+                hour: "%H:%M",
+                day: "%e. %b",
+                week: "%e. %b",
+                month: "%b '%y",
+                year: "%Y"
+            },
+            endOnTick: !1,
+            gridLineColor: "#C0C0C0",
+            labels: M,
+            lineColor: "#C0D0E0",
+            lineWidth: 1,
+            minPadding: 0.01,
+            maxPadding: 0.01,
+            minorGridLineColor: "#E0E0E0",
+            minorGridLineWidth: 1,
+            minorTickColor: "#A0A0A0",
+            minorTickLength: 2,
+            minorTickPosition: "outside",
+            startOfWeek: 1,
+            startOnTick: !1,
+            tickColor: "#C0D0E0",
+            tickLength: 10,
+            tickmarkPlacement: "between",
+            tickPixelInterval: 100,
+            tickPosition: "outside",
+            tickWidth: 1,
+            title: {
+                align: "middle",
+                style: {
+                    color: "#707070"
+                }
+            },
+            type: "linear"
+        },
+        defaultYAxisOptions: {
+            endOnTick: !0,
+            gridLineWidth: 1,
+            tickPixelInterval: 72,
+            showLastLabel: !0,
+            labels: {
+                x: -8,
+                y: 3
+            },
+            lineWidth: 0,
+            maxPadding: 0.05,
+            minPadding: 0.05,
+            startOnTick: !0,
+            tickWidth: 0,
+            title: {
+                rotation: 270,
+                text: ""//纵向轴单位
+            },
+            stackLabels: {
+                enabled: !1,
+                formatter: function() {
+                    return Ga(this.total, -1)
+                },
+                style: M.style
+            }
+        },
+        defaultLeftAxisOptions: {
+            labels: {
+                x: -15,
+                y: null
+            },
+            title: {
+                rotation: 270
+            }
+        },
+        defaultRightAxisOptions: {
+            labels: {
+                x: 15,
+                y: null
+            },
+            title: {
+                rotation: 90
+            }
+        },
+        defaultBottomAxisOptions: {
+            labels: {
+                x: 0,
+                y: null
+            },
+            title: {
+                rotation: 0
+            }
+        },
+        defaultTopAxisOptions: {
+            labels: {
+                x: 0,
+                y: -15
+            },
+            title: {
+                rotation: 0
+            }
+        },
+        init: function(a, b) {
+            var c = b.isX;
+            this.horiz = a.inverted ? !c: c;
+            this.coll = (this.isXAxis = c) ? "xAxis": "yAxis";
+            this.opposite = b.opposite;
+            this.side = b.side || (this.horiz ? this.opposite ? 0 : 2 : this.opposite ? 1 : 3);
+            this.setOptions(b);
+            var d = this.options,
+            e = d.type;
+            this.labelFormatter = d.labels.formatter || this.defaultLabelFormatter;
+            this.userOptions = b;
+            this.minPixelPadding = 0;
+            this.chart = a;
+            this.reversed = d.reversed;
+            this.zoomEnabled = d.zoomEnabled !== !1;
+            this.categories = d.categories || e === "category";
+            this.names = [];
+            this.isLog = e === "logarithmic";
+            this.isDatetimeAxis = e === "datetime";
+            this.isLinked = s(d.linkedTo);
+            this.tickmarkOffset = this.categories && d.tickmarkPlacement === "between" ? 0.5 : 0;
+            this.ticks = {};
+            this.labelEdge = [];
+            this.minorTicks = {};
+            this.plotLinesAndBands = [];
+            this.alternateBands = {};
+            this.len = 0;
+            this.minRange = this.userMinRange = d.minRange || d.maxZoom;
+            this.range = d.range;
+            this.offset = d.offset || 0;
+            this.stacks = {};
+            this.oldStacks = {};
+            this.min = this.max = null;
+            this.crosshair = p(d.crosshair, ra(a.options.tooltip.crosshairs)[c ? 0 : 1], !1);
+            var f, d = this.options.events;
+            Da(this, a.axes) === -1 && (c && !this.isColorAxis ? a.axes.splice(a.xAxis.length, 0, this) : a.axes.push(this), a[this.coll].push(this));
+            this.series = this.series || [];
+            if (a.inverted && c && this.reversed === t) this.reversed = !0;
+            this.removePlotLine = this.removePlotBand = this.removePlotBandOrLine;
+            for (f in d) N(this, f, d[f]);
+            if (this.isLog) this.val2lin = za,
+            this.lin2val = ja
+        },
+        setOptions: function(a) {
+            this.options = w(this.defaultOptions, this.isXAxis ? {}: this.defaultYAxisOptions, [this.defaultTopAxisOptions, this.defaultRightAxisOptions, this.defaultBottomAxisOptions, this.defaultLeftAxisOptions][this.side], w(L[this.coll], a))
+        },
+        defaultLabelFormatter: function() {
+            var a = this.axis,
+            b = this.value,
+            c = a.categories,
+            d = this.dateTimeLabelFormat,
+            e = L.lang.numericSymbols,
+            f = e && e.length,
+            g, h = a.options.labels.format,
+            a = a.isLog ? b: a.tickInterval;
+            if (h) g = Ia(h, this);
+            else if (c) g = b;
+            else if (d) g = bb(d, b);
+            else if (f && a >= 1E3) for (; f--&&g === t;) c = Math.pow(1E3, f + 1),
+            a >= c && e[f] !== null && (g = Ga(b / c, -1) + e[f]);
+            g === t && (g = Q(b) >= 1E4 ? Ga(b, 0) : Ga(b, -1, t, ""));
+            return g
+        },
+        getSeriesExtremes: function() {
+            var a = this,
+            b = a.chart;
+            a.hasVisibleSeries = !1;
+            a.dataMin = a.dataMax = null;
+            a.buildStacks && a.buildStacks();
+            q(a.series,
+            function(c) {
+                if (c.visible || !b.options.chart.ignoreHiddenSeries) {
+                    var d;
+                    d = c.options.threshold;
+                    var e;
+                    a.hasVisibleSeries = !0;
+                    a.isLog && d <= 0 && (d = null);
+                    if (a.isXAxis) {
+                        if (d = c.xData, d.length) a.dataMin = C(p(a.dataMin, d[0]), Na(d)),
+                        a.dataMax = u(p(a.dataMax, d[0]), Ba(d))
+                    } else {
+                        c.getExtremes();
+                        e = c.dataMax;
+                        c = c.dataMin;
+                        if (s(c) && s(e)) a.dataMin = C(p(a.dataMin, c), c),
+                        a.dataMax = u(p(a.dataMax, e), e);
+                        if (s(d)) if (a.dataMin >= d) a.dataMin = d,
+                        a.ignoreMinPadding = !0;
+                        else if (a.dataMax < d) a.dataMax = d,
+                        a.ignoreMaxPadding = !0
+                    }
+                }
+            })
+        },
+        translate: function(a, b, c, d, e, f) {
+            var g = 1,
+            h = 0,
+            i = d ? this.oldTransA: this.transA,
+            d = d ? this.oldMin: this.min,
+            j = this.minPixelPadding,
+            e = (this.options.ordinal || this.isLog && e) && this.lin2val;
+            if (!i) i = this.transA;
+            if (c) g *= -1,
+            h = this.len;
+            this.reversed && (g *= -1, h -= g * (this.sector || this.len));
+            b ? (a = a * g + h, a -= j, a = a / i + d, e && (a = this.lin2val(a))) : (e && (a = this.val2lin(a)), f === "between" && (f = 0.5), a = g * (a - d) * i + h + g * j + (ia(f) ? i * f * this.pointRange: 0));
+            return a
+        },
+        toPixels: function(a, b) {
+            return this.translate(a, !1, !this.horiz, null, !0) + (b ? 0 : this.pos)
+        },
+        toValue: function(a, b) {
+            return this.translate(a - (b ? 0 : this.pos), !0, !this.horiz, null, !0)
+        },
+        getPlotLinePath: function(a, b, c, d, e) {
+            var f = this.chart,
+            g = this.left,
+            h = this.top,
+            i, j, k = c && f.oldChartHeight || f.chartHeight,
+            l = c && f.oldChartWidth || f.chartWidth,
+            m;
+            i = this.transB;
+            e = p(e, this.translate(a, null, null, c));
+            a = c = v(e + i);
+            i = j = v(k - e - i);
+            if (isNaN(e)) m = !0;
+            else if (this.horiz) {
+                if (i = h, j = k - this.bottom, a < g || a > g + this.width) m = !0
+            } else if (a = g, c = l - this.right, i < h || i > h + this.height) m = !0;
+            return m && !d ? null: f.renderer.crispLine(["M", a, i, "L", c, j], b || 1)
+        },
+        getLinearTickPositions: function(a, b, c) {
+            var d, e = ea(U(b / a) * a),
+            f = ea(Ka(c / a) * a),
+            g = [];
+            if (b === c && ia(b)) return [b];
+            for (b = e; b <= f;) {
+                g.push(b);
+                b = ea(b + a);
+                if (b === d) break;
+                d = b
+            }
+            return g
+        },
+        getMinorTickPositions: function() {
+            var a = this.options,
+            b = this.tickPositions,
+            c = this.minorTickInterval,
+            d = [],
+            e;
+            if (this.isLog) {
+                e = b.length;
+                for (a = 1; a < e; a++) d = d.concat(this.getLogTickPositions(c, b[a - 1], b[a], !0))
+            } else if (this.isDatetimeAxis && a.minorTickInterval === "auto") d = d.concat(this.getTimeTicks(this.normalizeTimeTickInterval(c), this.min, this.max, a.startOfWeek)),
+            d[0] < this.min && d.shift();
+            else for (b = this.min + (b[0] - this.min) % c; b <= this.max; b += c) d.push(b);
+            return d
+        },
+        adjustForMinRange: function() {
+            var a = this.options,
+            b = this.min,
+            c = this.max,
+            d, e = this.dataMax - this.dataMin >= this.minRange,
+            f, g, h, i, j;
+            if (this.isXAxis && this.minRange === t && !this.isLog) s(a.min) || s(a.max) ? this.minRange = null: (q(this.series,
+            function(a) {
+                i = a.xData;
+                for (g = j = a.xIncrement ? 1 : i.length - 1; g > 0; g--) if (h = i[g] - i[g - 1], f === t || h < f) f = h
+            }), this.minRange = C(f * 5, this.dataMax - this.dataMin));
+            if (c - b < this.minRange) {
+                var k = this.minRange;
+                d = (k - c + b) / 2;
+                d = [b - d, p(a.min, b - d)];
+                if (e) d[2] = this.dataMin;
+                b = Ba(d);
+                c = [b + k, p(a.max, b + k)];
+                if (e) c[2] = this.dataMax;
+                c = Na(c);
+                c - b < k && (d[0] = c - k, d[1] = p(a.min, c - k), b = Ba(d))
+            }
+            this.min = b;
+            this.max = c
+        },
+        setAxisTranslation: function(a) {
+            var b = this,
+            c = b.max - b.min,
+            d = b.axisPointRange || 0,
+            e, f = 0,
+            g = 0,
+            h = b.linkedParent,
+            i = !!b.categories,
+            j = b.transA;
+            if (b.isXAxis || i || d) h ? (f = h.minPointOffset, g = h.pointRangePadding) : q(b.series,
+            function(a) {
+                var h = i ? 1 : b.isXAxis ? a.pointRange: b.axisPointRange || 0,
+                j = a.options.pointPlacement,
+                n = a.closestPointRange;
+                h > c && (h = 0);
+                d = u(d, h);
+                f = u(f, Fa(j) ? 0 : h / 2);
+                g = u(g, j === "on" ? 0 : h); ! a.noSharedTooltip && s(n) && (e = s(e) ? C(e, n) : n)
+            }),
+            h = b.ordinalSlope && e ? b.ordinalSlope / e: 1,
+            b.minPointOffset = f *= h,
+            b.pointRangePadding = g *= h,
+            b.pointRange = C(d, c),
+            b.closestPointRange = e;
+            if (a) b.oldTransA = j;
+            b.translationSlope = b.transA = j = b.len / (c + g || 1);
+            b.transB = b.horiz ? b.left: b.bottom;
+            b.minPixelPadding = j * f
+        },
+        setTickPositions: function(a) {
+            var b = this,
+            c = b.chart,
+            d = b.options,
+            e = d.startOnTick,
+            f = d.endOnTick,
+            g = b.isLog,
+            h = b.isDatetimeAxis,
+            i = b.isXAxis,
+            j = b.isLinked,
+            k = b.options.tickPositioner,
+            l = d.maxPadding,
+            m = d.minPadding,
+            n = d.tickInterval,
+            o = d.minTickInterval,
+            Y = d.tickPixelInterval,
+            E, I = b.categories;
+            j ? (b.linkedParent = c[b.coll][d.linkedTo], c = b.linkedParent.getExtremes(), b.min = p(c.min, c.dataMin), b.max = p(c.max, c.dataMax), d.type !== b.linkedParent.options.type && oa(11, 1)) : (b.min = p(b.userMin, d.min, b.dataMin), b.max = p(b.userMax, d.max, b.dataMax));
+            if (g) ! a && C(b.min, p(b.dataMin, b.min)) <= 0 && oa(10, 1),
+            b.min = ea(za(b.min)),
+            b.max = ea(za(b.max));
+            if (b.range && s(b.max)) b.userMin = b.min = u(b.min, b.max - b.range),
+            b.userMax = b.max,
+            b.range = null;
+            b.beforePadding && b.beforePadding();
+            b.adjustForMinRange();
+            if (!I && !b.axisPointRange && !b.usePercentage && !j && s(b.min) && s(b.max) && (c = b.max - b.min)) {
+                if (!s(d.min) && !s(b.userMin) && m && (b.dataMin < 0 || !b.ignoreMinPadding)) b.min -= c * m;
+                if (!s(d.max) && !s(b.userMax) && l && (b.dataMax > 0 || !b.ignoreMaxPadding)) b.max += c * l
+            }
+            if (ia(d.floor)) b.min = u(b.min, d.floor);
+            if (ia(d.ceiling)) b.max = C(b.max, d.ceiling);
+            b.min === b.max || b.min === void 0 || b.max === void 0 ? b.tickInterval = 1 : j && !n && Y === b.linkedParent.options.tickPixelInterval ? b.tickInterval = b.linkedParent.tickInterval: (b.tickInterval = p(n, I ? 1 : (b.max - b.min) * Y / u(b.len, Y)), !s(n) && b.len < Y && !this.isRadial && !this.isLog && !I && e && f && (E = !0, b.tickInterval /= 4));
+            i && !a && q(b.series,
+            function(a) {
+                a.processData(b.min !== b.oldMin || b.max !== b.oldMax)
+            });
+            b.setAxisTranslation(!0);
+            b.beforeSetTickPositions && b.beforeSetTickPositions();
+            if (b.postProcessTickInterval) b.tickInterval = b.postProcessTickInterval(b.tickInterval);
+            if (b.pointRange) b.tickInterval = u(b.pointRange, b.tickInterval);
+            if (!n && b.tickInterval < o) b.tickInterval = o;
+            if (!h && !g && !n) b.tickInterval = mb(b.tickInterval, null, lb(b.tickInterval), d);
+            b.minorTickInterval = d.minorTickInterval === "auto" && b.tickInterval ? b.tickInterval / 5 : d.minorTickInterval;
+            b.tickPositions = a = d.tickPositions ? [].concat(d.tickPositions) : k && k.apply(b, [b.min, b.max]);
+            if (!a) ! b.ordinalPositions && (b.max - b.min) / b.tickInterval > u(2 * b.len, 200) && oa(19, !0),
+            a = h ? b.getTimeTicks(b.normalizeTimeTickInterval(b.tickInterval, d.units), b.min, b.max, d.startOfWeek, b.ordinalPositions, b.closestPointRange, !0) : g ? b.getLogTickPositions(b.tickInterval, b.min, b.max) : b.getLinearTickPositions(b.tickInterval, b.min, b.max),
+            E && a.splice(1, a.length - 2),
+            b.tickPositions = a;
+            if (!j) d = a[0],
+            g = a[a.length - 1],
+            h = b.minPointOffset || 0,
+            !e && !f && !I && a.length === 2 && a.splice(1, 0, (g + d) / 2),
+            e ? b.min = d: b.min - h > d && a.shift(),
+            f ? b.max = g: b.max + h < g && a.pop(),
+            a.length === 1 && (e = Q(b.max) > 1E13 ? 1 : 0.001, b.min -= e, b.max += e)
+        },
+        setMaxTicks: function() {
+            var a = this.chart,
+            b = a.maxTicks || {},
+            c = this.tickPositions,
+            d = this._maxTicksKey = [this.coll, this.pos, this.len].join("-");
+            if (!this.isLinked && !this.isDatetimeAxis && c && c.length > (b[d] || 0) && this.options.alignTicks !== !1) b[d] = c.length;
+            a.maxTicks = b
+        },
+        adjustTickAmount: function() {
+            var a = this._maxTicksKey,
+            b = this.tickPositions,
+            c = this.chart.maxTicks;
+            if (c && c[a] && !this.isDatetimeAxis && !this.categories && !this.isLinked && this.options.alignTicks !== !1 && this.min !== t) {
+                var d = this.tickAmount,
+                e = b.length;
+                this.tickAmount = a = c[a];
+                if (e < a) {
+                    for (; b.length < a;) b.push(ea(b[b.length - 1] + this.tickInterval));
+                    this.transA *= (e - 1) / (a - 1);
+                    this.max = b[b.length - 1]
+                }
+                if (s(d) && a !== d) this.isDirty = !0
+            }
+        },
+        setScale: function() {
+            var a = this.stacks,
+            b, c, d, e;
+            this.oldMin = this.min;
+            this.oldMax = this.max;
+            this.oldAxisLength = this.len;
+            this.setAxisSize();
+            e = this.len !== this.oldAxisLength;
+            q(this.series,
+            function(a) {
+                if (a.isDirtyData || a.isDirty || a.xAxis.isDirty) d = !0
+            });
+            if (e || d || this.isLinked || this.forceRedraw || this.userMin !== this.oldUserMin || this.userMax !== this.oldUserMax) {
+                if (!this.isXAxis) for (b in a) for (c in a[b]) a[b][c].total = null,
+                a[b][c].cum = 0;
+                this.forceRedraw = !1;
+                this.getSeriesExtremes();
+                this.setTickPositions();
+                this.oldUserMin = this.userMin;
+                this.oldUserMax = this.userMax;
+                if (!this.isDirty) this.isDirty = e || this.min !== this.oldMin || this.max !== this.oldMax
+            } else if (!this.isXAxis) {
+                if (this.oldStacks) a = this.stacks = this.oldStacks;
+                for (b in a) for (c in a[b]) a[b][c].cum = a[b][c].total
+            }
+            this.setMaxTicks()
+        },
+        setExtremes: function(a, b, c, d, e) {
+            var f = this,
+            g = f.chart,
+            c = p(c, !0),
+            e = r(e, {
+                min: a,
+                max: b
+            });
+            K(f, "setExtremes", e,
+            function() {
+                f.userMin = a;
+                f.userMax = b;
+                f.eventArgs = e;
+                f.isDirtyExtremes = !0;
+                c && g.redraw(d)
+            })
+        },
+        zoom: function(a, b) {
+            var c = this.dataMin,
+            d = this.dataMax,
+            e = this.options;
+            this.allowZoomOutside || (s(c) && a <= C(c, p(e.min, c)) && (a = t), s(d) && b >= u(d, p(e.max, d)) && (b = t));
+            this.displayBtn = a !== t || b !== t;
+            this.setExtremes(a, b, !1, t, {
+                trigger: "zoom"
+            });
+            return ! 0
+        },
+        setAxisSize: function() {
+            var a = this.chart,
+            b = this.options,
+            c = b.offsetLeft || 0,
+            d = this.horiz,
+            e = p(b.width, a.plotWidth - c + (b.offsetRight || 0)),
+            f = p(b.height, a.plotHeight),
+            g = p(b.top, a.plotTop),
+            b = p(b.left, a.plotLeft + c),
+            c = /%$/;
+            c.test(f) && (f = parseInt(f, 10) / 100 * a.plotHeight);
+            c.test(g) && (g = parseInt(g, 10) / 100 * a.plotHeight + a.plotTop);
+            this.left = b;
+            this.top = g;
+            this.width = e;
+            this.height = f;
+            this.bottom = a.chartHeight - f - g;
+            this.right = a.chartWidth - e - b;
+            this.len = u(d ? e: f, 0);
+            this.pos = d ? b: g
+        },
+        getExtremes: function() {
+            var a = this.isLog;
+            return {
+                min: a ? ea(ja(this.min)) : this.min,
+                max: a ? ea(ja(this.max)) : this.max,
+                dataMin: this.dataMin,
+                dataMax: this.dataMax,
+                userMin: this.userMin,
+                userMax: this.userMax
+            }
+        },
+        getThreshold: function(a) {
+            var b = this.isLog,
+            c = b ? ja(this.min) : this.min,
+            b = b ? ja(this.max) : this.max;
+            c > a || a === null ? a = c: b < a && (a = b);
+            return this.translate(a, 0, 1, 0, 1)
+        },
+        autoLabelAlign: function(a) {
+            a = (p(a, 0) - this.side * 90 + 720) % 360;
+            return a > 15 && a < 165 ? "right": a > 195 && a < 345 ? "left": "center"
+        },
+        getOffset: function() {
+            var a = this,
+            b = a.chart,
+            c = b.renderer,
+            d = a.options,
+            e = a.tickPositions,
+            f = a.ticks,
+            g = a.horiz,
+            h = a.side,
+            i = b.inverted ? [1, 0, 3, 2][h] : h,
+            j,
+            k,
+            l = 0,
+            m,
+            n = 0,
+            o = d.title,
+            Y = d.labels,
+            E = 0,
+            I = b.axisOffset,
+            b = b.clipOffset,
+            D = [ - 1, 1, 1, -1][h],
+            r,
+            v = 1,
+            w = p(Y.maxStaggerLines, 5),
+            x,
+            z,
+            C,
+            y,
+            R;
+            a.hasData = j = a.hasVisibleSeries || s(a.min) && s(a.max) && !!e;
+            a.showAxis = k = j || p(d.showEmpty, !0);
+            a.staggerLines = a.horiz && Y.staggerLines;
+            if (!a.axisGroup) a.gridGroup = c.g("grid").attr({
+                zIndex: d.gridZIndex || 1
+            }).add(),
+            a.axisGroup = c.g("axis").attr({
+                zIndex: d.zIndex || 2
+            }).add(),
+            a.labelGroup = c.g("axis-labels").attr({
+                zIndex: Y.zIndex || 7
+            }).addClass("highcharts-" + a.coll.toLowerCase() + "-labels").add();
+            if (j || a.isLinked) {
+                a.labelAlign = p(Y.align || a.autoLabelAlign(Y.rotation));
+                q(e,
+                function(b) {
+                    f[b] ? f[b].addLabel() : f[b] = new Sa(a, b)
+                });
+                if (a.horiz && !a.staggerLines && w && !Y.rotation) {
+                    for (j = a.reversed ? [].concat(e).reverse() : e; v < w;) {
+                        x = [];
+                        z = !1;
+                        for (r = 0; r < j.length; r++) C = j[r],
+                        y = (y = f[C].label && f[C].label.getBBox()) ? y.width: 0,
+                        R = r % v,
+                        y && (C = a.translate(C), x[R] !== t && C < x[R] && (z = !0), x[R] = C + y);
+                        if (z) v++;
+                        else break
+                    }
+                    if (v > 1) a.staggerLines = v
+                }
+                q(e,
+                function(b) {
+                    if (h === 0 || h === 2 || {
+                        1 : "left",
+                        3 : "right"
+                    } [h] === a.labelAlign) E = u(f[b].getLabelSize(), E)
+                });
+                if (a.staggerLines) E *= a.staggerLines,
+                a.labelOffset = E
+            } else for (r in f) f[r].destroy(),
+            delete f[r];
+            if (o && o.text && o.enabled !== !1) {
+                if (!a.axisTitle) a.axisTitle = c.text(o.text, 0, 0, o.useHTML).attr({
+                    zIndex: 7,
+                    rotation: o.rotation || 0,
+                    align: o.textAlign || {
+                        low: "left",
+                        middle: "center",
+                        high: "right"
+                    } [o.align]
+                }).addClass("highcharts-" + this.coll.toLowerCase() + "-title").css(o.style).add(a.axisGroup),
+                a.axisTitle.isNew = !0;
+                if (k) l = a.axisTitle.getBBox()[g ? "height": "width"],
+                m = o.offset,
+                n = s(m) ? 0 : p(o.margin, g ? 5 : 10);
+                a.axisTitle[k ? "show": "hide"]()
+            }
+            a.offset = D * p(d.offset, I[h]);
+            c = h === 2 ? a.tickBaseline: 0;
+            g = E + n + (E && D * (g ? p(Y.y, a.tickBaseline + 8) : Y.x) - c);
+            a.axisTitleMargin = p(m, g);
+            I[h] = u(I[h], a.axisTitleMargin + l + D * a.offset, g);
+            b[i] = u(b[i], U(d.lineWidth / 2) * 2)
+        },
+        getLinePath: function(a) {
+            var b = this.chart,
+            c = this.opposite,
+            d = this.offset,
+            e = this.horiz,
+            f = this.left + (c ? this.width: 0) + d,
+            d = b.chartHeight - this.bottom - (c ? this.height: 0) + d;
+            c && (a *= -1);
+            return b.renderer.crispLine(["M", e ? this.left: f, e ? d: this.top, "L", e ? b.chartWidth - this.right: f, e ? d: b.chartHeight - this.bottom], a)
+        },
+        getTitlePosition: function() {
+            var a = this.horiz,
+            b = this.left,
+            c = this.top,
+            d = this.len,
+            e = this.options.title,
+            f = a ? b: c,
+            g = this.opposite,
+            h = this.offset,
+            i = z(e.style.fontSize || 12),
+            d = {
+                low: f + (a ? 0 : d),
+                middle: f + d / 2,
+                high: f + (a ? d: 0)
+            } [e.align],
+            b = (a ? c + this.height: b) + (a ? 1 : -1) * (g ? -1 : 1) * this.axisTitleMargin + (this.side === 2 ? i: 0);
+            return {
+                x: a ? d: b + (g ? this.width: 0) + h + (e.x || 0),
+                y: a ? b - (g ? this.height: 0) + h: d + (e.y || 0)
+            }
+        },
+        render: function() {
+            var a = this,
+            b = a.horiz,
+            c = a.reversed,
+            d = a.chart,
+            e = d.renderer,
+            f = a.options,
+            g = a.isLog,
+            h = a.isLinked,
+            i = a.tickPositions,
+            j, k = a.axisTitle,
+            l = a.ticks,
+            m = a.minorTicks,
+            n = a.alternateBands,
+            o = f.stackLabels,
+            p = f.alternateGridColor,
+            E = a.tickmarkOffset,
+            I = f.lineWidth,
+            D = d.hasRendered && s(a.oldMin) && !isNaN(a.oldMin),
+            r = a.hasData,
+            u = a.showAxis,
+            v,
+            w = f.labels.overflow,
+            x = a.justifyLabels = b && w !== !1,
+            z;
+            a.labelEdge.length = 0;
+            a.justifyToPlot = w === "justify";
+            q([l, m, n],
+            function(a) {
+                for (var b in a) a[b].isActive = !1
+            });
+            if (r || h) if (a.minorTickInterval && !a.categories && q(a.getMinorTickPositions(),
+            function(b) {
+                m[b] || (m[b] = new Sa(a, b, "minor"));
+                D && m[b].isNew && m[b].render(null, !0);
+                m[b].render(null, !1, 1)
+            }), i.length && (j = i.slice(), (b && c || !b && !c) && j.reverse(), x && (j = j.slice(1).concat([j[0]])), q(j,
+            function(b, c) {
+                x && (c = c === j.length - 1 ? 0 : c + 1);
+                if (!h || b >= a.min && b <= a.max) l[b] || (l[b] = new Sa(a, b)),
+                D && l[b].isNew && l[b].render(c, !0, 0.1),
+                l[b].render(c)
+            }), E && a.min === 0 && (l[ - 1] || (l[ - 1] = new Sa(a, -1, null, !0)), l[ - 1].render( - 1))), p && q(i,
+            function(b, c) {
+                if (c % 2 === 0 && b < a.max) n[b] || (n[b] = new S.PlotLineOrBand(a)),
+                v = b + E,
+                z = i[c + 1] !== t ? i[c + 1] + E: a.max,
+                n[b].options = {
+                    from: g ? ja(v) : v,
+                    to: g ? ja(z) : z,
+                    color: p
+                },
+                n[b].render(),
+                n[b].isActive = !0
+            }), !a._addedPlotLB) q((f.plotLines || []).concat(f.plotBands || []),
+            function(b) {
+                a.addPlotBandOrLine(b)
+            }),
+            a._addedPlotLB = !0;
+            q([l, m, n],
+            function(a) {
+                var b, c, e = [],
+                f = va ? va.duration || 500 : 0,
+                g = function() {
+                    for (c = e.length; c--;) a[e[c]] && !a[e[c]].isActive && (a[e[c]].destroy(), delete a[e[c]])
+                };
+                for (b in a) if (!a[b].isActive) a[b].render(b, !1, 0),
+                a[b].isActive = !1,
+                e.push(b);
+                a === n || !d.hasRendered || !f ? g() : f && setTimeout(g, f)
+            });
+            if (I) b = a.getLinePath(I),
+            a.axisLine ? a.axisLine.animate({
+                d: b
+            }) : a.axisLine = e.path(b).attr({
+                stroke: f.lineColor,
+                "stroke-width": I,
+                zIndex: 7
+            }).add(a.axisGroup),
+            a.axisLine[u ? "show": "hide"]();
+            if (k && u) k[k.isNew ? "attr": "animate"](a.getTitlePosition()),
+            k.isNew = !1;
+            o && o.enabled && a.renderStackTotals();
+            a.isDirty = !1
+        },
+        redraw: function() {
+            this.render();
+            q(this.plotLinesAndBands,
+            function(a) {
+                a.render()
+            });
+            q(this.series,
+            function(a) {
+                a.isDirty = !0
+            })
+        },
+        destroy: function(a) {
+            var b = this,
+            c = b.stacks,
+            d, e = b.plotLinesAndBands;
+            a || X(b);
+            for (d in c) Oa(c[d]),
+            c[d] = null;
+            q([b.ticks, b.minorTicks, b.alternateBands],
+            function(a) {
+                Oa(a)
+            });
+            for (a = e.length; a--;) e[a].destroy();
+            q("stackTotalGroup,axisLine,axisTitle,axisGroup,cross,gridGroup,labelGroup".split(","),
+            function(a) {
+                b[a] && (b[a] = b[a].destroy())
+            });
+            this.cross && this.cross.destroy()
+        },
+        drawCrosshair: function(a, b) {
+            if (this.crosshair) if ((s(b) || !p(this.crosshair.snap, !0)) === !1) this.hideCrosshair();
+            else {
+                var c, d = this.crosshair,
+                e = d.animation;
+                p(d.snap, !0) ? s(b) && (c = this.chart.inverted != this.horiz ? b.plotX: this.len - b.plotY) : c = this.horiz ? a.chartX - this.pos: this.len - a.chartY + this.pos;
+                c = this.isRadial ? this.getPlotLinePath(this.isXAxis ? b.x: p(b.stackY, b.y)) : this.getPlotLinePath(null, null, null, null, c);
+                if (c === null) this.hideCrosshair();
+                else if (this.cross) this.cross.attr({
+                    visibility: "visible"
+                })[e ? "animate": "attr"]({
+                    d: c
+                },
+                e);
+                else {
+                    e = {
+                        "stroke-width": d.width || 1,
+                        stroke: d.color || "#C0C0C0",
+                        zIndex: d.zIndex || 2
+                    };
+                    if (d.dashStyle) e.dashstyle = d.dashStyle;
+                    this.cross = this.chart.renderer.path(c).attr(e).add()
+                }
+            }
+        },
+        hideCrosshair: function() {
+            this.cross && this.cross.hide()
+        }
+    };
+    r(ma.prototype, {
+        getPlotBandPath: function(a, b) {
+            var c = this.getPlotLinePath(b),
+            d = this.getPlotLinePath(a);
+            d && c ? d.push(c[4], c[5], c[1], c[2]) : d = null;
+            return d
+        },
+        addPlotBand: function(a) {
+            return this.addPlotBandOrLine(a, "plotBands")
+        },
+        addPlotLine: function(a) {
+            return this.addPlotBandOrLine(a, "plotLines")
+        },
+        addPlotBandOrLine: function(a, b) {
+            var c = (new S.PlotLineOrBand(this, a)).render(),
+            d = this.userOptions;
+            c && (b && (d[b] = d[b] || [], d[b].push(a)), this.plotLinesAndBands.push(c));
+            return c
+        },
+        removePlotBandOrLine: function(a) {
+            for (var b = this.plotLinesAndBands,
+            c = this.options,
+            d = this.userOptions,
+            e = b.length; e--;) b[e].id === a && b[e].destroy();
+            q([c.plotLines || [], d.plotLines || [], c.plotBands || [], d.plotBands || []],
+            function(b) {
+                for (e = b.length; e--;) b[e].id === a && ka(b, b[e])
+            })
+        }
+    });
+    ma.prototype.getTimeTicks = function(a, b, c, d) {
+        var e = [],
+        f = {},
+        g = L.global.useUTC,
+        h,
+        i = new Date(b - Ra),
+        j = a.unitRange,
+        k = a.count;
+        if (s(b)) {
+            j >= B.second && (i.setMilliseconds(0), i.setSeconds(j >= B.minute ? 0 : k * U(i.getSeconds() / k)));
+            if (j >= B.minute) i[Bb](j >= B.hour ? 0 : k * U(i[ob]() / k));
+            if (j >= B.hour) i[Cb](j >= B.day ? 0 : k * U(i[pb]() / k));
+            if (j >= B.day) i[rb](j >= B.month ? 1 : k * U(i[Wa]() / k));
+            j >= B.month && (i[Db](j >= B.year ? 0 : k * U(i[eb]() / k)), h = i[fb]());
+            j >= B.year && (h -= h % k, i[Eb](h));
+            if (j === B.week) i[rb](i[Wa]() - i[qb]() + p(d, 1));
+            b = 1;
+            Ra && (i = new Date(i.getTime() + Ra));
+            h = i[fb]();
+            for (var d = i.getTime(), l = i[eb](), m = i[Wa](), n = g ? Ra: (864E5 + i.getTimezoneOffset() * 6E4) % 864E5; d < c;) e.push(d),
+            j === B.year ? d = db(h + b * k, 0) : j === B.month ? d = db(h, l + b * k) : !g && (j === B.day || j === B.week) ? d = db(h, l, m + b * k * (j === B.day ? 1 : 7)) : d += j * k,
+            b++;
+            e.push(d);
+            q(vb(e,
+            function(a) {
+                return j <= B.hour && a % B.day === n
+            }),
+            function(a) {
+                f[a] = "day"
+            })
+        }
+        e.info = r(a, {
+            higherRanks: f,
+            totalRange: j * k
+        });
+        return e
+    };
+    ma.prototype.normalizeTimeTickInterval = function(a, b) {
+        var c = b || [["millisecond", [1, 2, 5, 10, 20, 25, 50, 100, 200, 500]], ["second", [1, 2, 5, 10, 15, 30]], ["minute", [1, 2, 5, 10, 15, 30]], ["hour", [1, 2, 3, 4, 6, 8, 12]], ["day", [1, 2]], ["week", [1, 2]], ["month", [1, 2, 3, 4, 6]], ["year", null]],
+        d = c[c.length - 1],
+        e = B[d[0]],
+        f = d[1],
+        g;
+        for (g = 0; g < c.length; g++) if (d = c[g], e = B[d[0]], f = d[1], c[g + 1] && a <= (e * f[f.length - 1] + B[c[g + 1][0]]) / 2) break;
+        e === B.year && a < 5 * e && (f = [1, 2, 5]);
+        c = mb(a / e, f, d[0] === "year" ? u(lb(a / e), 1) : 1);
+        return {
+            unitRange: e,
+            count: c,
+            unitName: d[0]
+        }
+    };
+    ma.prototype.getLogTickPositions = function(a, b, c, d) {
+        var e = this.options,
+        f = this.len,
+        g = [];
+        if (!d) this._minorAutoInterval = null;
+        if (a >= 0.5) a = v(a),
+        g = this.getLinearTickPositions(a, b, c);
+        else if (a >= 0.08) for (var f = U(b), h, i, j, k, l, e = a > 0.3 ? [1, 2, 4] : a > 0.15 ? [1, 2, 4, 6, 8] : [1, 2, 3, 4, 5, 6, 7, 8, 9]; f < c + 1 && !l; f++) {
+            i = e.length;
+            for (h = 0; h < i && !l; h++) j = za(ja(f) * e[h]),
+            j > b && (!d || k <= c) && k !== t && g.push(k),
+            k > c && (l = !0),
+            k = j
+        } else if (b = ja(b), c = ja(c), a = e[d ? "minorTickInterval": "tickInterval"], a = p(a === "auto" ? null: a, this._minorAutoInterval, (c - b) * (e.tickPixelInterval / (d ? 5 : 1)) / ((d ? f / this.tickPositions.length: f) || 1)), a = mb(a, null, lb(a)), g = Ua(this.getLinearTickPositions(a, b, c), za), !d) this._minorAutoInterval = a / 5;
+        if (!d) this.tickInterval = a;
+        return g
+    };
+    var Mb = S.Tooltip = function() {
+        this.init.apply(this, arguments)
+    };
+    Mb.prototype = {
+        init: function(a, b) {
+            var c = b.borderWidth,
+            d = b.style,
+            e = z(d.padding);
+            this.chart = a;
+            this.options = b;
+            this.crosshairs = [];
+            this.now = {
+                x: 0,
+                y: 0
+            };
+            this.isHidden = !0;
+            this.label = a.renderer.label("", 0, 0, b.shape || "callout", null, null, b.useHTML, null, "tooltip").attr({
+                padding: e,
+                fill: b.backgroundColor,
+                "stroke-width": c,
+                r: b.borderRadius,
+                zIndex: 8
+            }).css(d).css({
+                padding: 0
+            }).add().attr({
+                y: -9999
+            });
+            ga || this.label.shadow(b.shadow);
+            this.shared = b.shared
+        },
+        destroy: function() {
+            if (this.label) this.label = this.label.destroy();
+            clearTimeout(this.hideTimer);
+            clearTimeout(this.tooltipTimeout)
+        },
+        move: function(a, b, c, d) {
+            var e = this,
+            f = e.now,
+            g = e.options.animation !== !1 && !e.isHidden && (Q(a - f.x) > 1 || Q(b - f.y) > 1),
+            h = e.followPointer || e.len > 1;
+            r(f, {
+                x: g ? (2 * f.x + a) / 3 : a,
+                y: g ? (f.y + b) / 2 : b,
+                anchorX: h ? t: g ? (2 * f.anchorX + c) / 3 : c,
+                anchorY: h ? t: g ? (f.anchorY + d) / 2 : d
+            });
+            e.label.attr(f);
+            if (g) clearTimeout(this.tooltipTimeout),
+            this.tooltipTimeout = setTimeout(function() {
+                e && e.move(a, b, c, d)
+            },
+            32)
+        },
+        hide: function() {
+            var a = this,
+            b;
+            clearTimeout(this.hideTimer);
+            if (!this.isHidden) b = this.chart.hoverPoints,
+            this.hideTimer = setTimeout(function() {
+                a.label.fadeOut();
+                a.isHidden = !0
+            },
+            p(this.options.hideDelay, 500)),
+            b && q(b,
+            function(a) {
+                a.setState()
+            }),
+            this.chart.hoverPoints = null
+        },
+        getAnchor: function(a, b) {
+            var c, d = this.chart,
+            e = d.inverted,
+            f = d.plotTop,
+            g = 0,
+            h = 0,
+            i, a = ra(a);
+            c = a[0].tooltipPos;
+            this.followPointer && b && (b.chartX === t && (b = d.pointer.normalize(b)), c = [b.chartX - d.plotLeft, b.chartY - f]);
+            c || (q(a,
+            function(a) {
+                i = a.series.yAxis;
+                g += a.plotX;
+                h += (a.plotLow ? (a.plotLow + a.plotHigh) / 2 : a.plotY) + (!e && i ? i.top - f: 0)
+            }), g /= a.length, h /= a.length, c = [e ? d.plotWidth - h: g, this.shared && !e && a.length > 1 && b ? b.chartY - f: e ? d.plotHeight - g: h]);
+            return Ua(c, v)
+        },
+        getPosition: function(a, b, c) {
+            var d = this.chart,
+            e = this.distance,
+            f = {},
+            g, h = ["y", d.chartHeight, b, c.plotY + d.plotTop],
+            i = ["x", d.chartWidth, a, c.plotX + d.plotLeft],
+            j = c.ttBelow || d.inverted && !c.negative || !d.inverted && c.negative,
+            k = function(a, b, c, d) {
+                var g = c < d - e,
+                b = d + e + c < b,
+                c = d - e - c;
+                d += e;
+                if (j && b) f[a] = d;
+                else if (!j && g) f[a] = c;
+                else if (g) f[a] = c;
+                else if (b) f[a] = d;
+                else return ! 1
+            },
+            l = function(a, b, c, d) {
+                if (d < e || d > b - e) return ! 1;
+                else f[a] = d < c / 2 ? 1 : d > b - c / 2 ? b - c - 2 : d - c / 2
+            },
+            m = function(a) {
+                var b = h;
+                h = i;
+                i = b;
+                g = a
+            },
+            n = function() {
+                k.apply(0, h) !== !1 ? l.apply(0, i) === !1 && !g && (m(!0), n()) : g ? f.x = f.y = 0 : (m(!0), n())
+            }; (d.inverted || this.len > 1) && m();
+            n();
+            return f
+        },
+        defaultFormatter: function(a) {
+            var b = this.points || ra(this),
+            c = b[0].series,
+            d;
+            d = [a.tooltipHeaderFormatter(b[0])];
+            q(b,
+            function(a) {
+                c = a.series;
+                d.push(c.tooltipFormatter && c.tooltipFormatter(a) || a.point.tooltipFormatter(c.tooltipOptions.pointFormat))
+            });
+            d.push(a.options.footerFormat || "");
+            return d.join("")
+        },
+        refresh: function(a, b) {
+            var c = this.chart,
+            d = this.label,
+            e = this.options,
+            f, g, h = {},
+            i, j = [];
+            i = e.formatter || this.defaultFormatter;
+            var h = c.hoverPoints,
+            k, l = this.shared;
+            clearTimeout(this.hideTimer);
+            this.followPointer = ra(a)[0].series.tooltipOptions.followPointer;
+            g = this.getAnchor(a, b);
+            f = g[0];
+            g = g[1];
+            l && (!a.series || !a.series.noSharedTooltip) ? (c.hoverPoints = a, h && q(h,
+            function(a) {
+                a.setState()
+            }), q(a,
+            function(a) {
+                a.setState("hover");
+                j.push(a.getLabelConfig())
+            }), h = {
+                x: a[0].category,
+                y: a[0].y
+            },
+            h.points = j, this.len = j.length, a = a[0]) : h = a.getLabelConfig();
+            i = i.call(h, this);
+            h = a.series;
+            this.distance = p(h.tooltipOptions.distance, 16);
+            i === !1 ? this.hide() : (this.isHidden && (ab(d), d.attr("opacity", 1).show()), d.attr({
+                text: i
+            }), k = e.borderColor || a.color || h.color || "#606060", d.attr({
+                stroke: k
+            }), this.updatePosition({
+                plotX: f,
+                plotY: g,
+                negative: a.negative,
+                ttBelow: a.ttBelow
+            }), this.isHidden = !1);
+            K(c, "tooltipRefresh", {
+                text: i,
+                x: f + c.plotLeft,
+                y: g + c.plotTop,
+                borderColor: k
+            })
+        },
+        updatePosition: function(a) {
+            var b = this.chart,
+            c = this.label,
+            c = (this.options.positioner || this.getPosition).call(this, c.width, c.height, a);
+            this.move(v(c.x), v(c.y), a.plotX + b.plotLeft, a.plotY + b.plotTop)
+        },
+        tooltipHeaderFormatter: function(a) {
+            var b = a.series,
+            c = b.tooltipOptions,
+            d = c.dateTimeLabelFormats,
+            e = c.xDateFormat,
+            f = b.xAxis,
+            g = f && f.options.type === "datetime" && ia(a.key),
+            c = c.headerFormat,
+            f = f && f.closestPointRange,
+            h;
+            if (g && !e) {
+                if (f) for (h in B) {
+                    if (B[h] >= f || B[h] <= B.day && a.key % B[h] > 0) {
+                        e = d[h];
+                        break
+                    }
+                } else e = d.day;
+                e = e || d.year
+            }
+            g && e && (c = c.replace("{point.key}", "{point.key:" + e + "}"));
+            return Ia(c, {
+                point: a,
+                series: b
+            })
+        }
+    };
+    var pa;
+    Za = x.documentElement.ontouchstart !== t;
+    var Va = S.Pointer = function(a, b) {
+        this.init(a, b)
+    };
+    Va.prototype = {
+        init: function(a, b) {
+            var c = b.chart,
+            d = c.events,
+            e = ga ? "": c.zoomType,
+            c = a.inverted,
+            f;
+            this.options = b;
+            this.chart = a;
+            this.zoomX = f = /x/.test(e);
+            this.zoomY = e = /y/.test(e);
+            this.zoomHor = f && !c || e && c;
+            this.zoomVert = e && !c || f && c;
+            this.hasZoom = f || e;
+            this.runChartClick = d && !!d.click;
+            this.pinchDown = [];
+            this.lastValidTouch = {};
+            if (S.Tooltip && b.tooltip.enabled) a.tooltip = new Mb(a, b.tooltip),
+            this.followTouchMove = b.tooltip.followTouchMove;
+            this.setDOMEvents()
+        },
+        normalize: function(a, b) {
+            var c, d, a = a || window.event,
+            a = Sb(a);
+            if (!a.target) a.target = a.srcElement;
+            d = a.touches ? a.touches.length ? a.touches.item(0) : a.changedTouches[0] : a;
+            if (!b) this.chartPosition = b = Rb(this.chart.container);
+            d.pageX === t ? (c = u(a.x, a.clientX - b.left), d = a.y) : (c = d.pageX - b.left, d = d.pageY - b.top);
+            return r(a, {
+                chartX: v(c),
+                chartY: v(d)
+            })
+        },
+        getCoordinates: function(a) {
+            var b = {
+                xAxis: [],
+                yAxis: []
+            };
+            q(this.chart.axes,
+            function(c) {
+                b[c.isXAxis ? "xAxis": "yAxis"].push({
+                    axis: c,
+                    value: c.toValue(a[c.horiz ? "chartX": "chartY"])
+                })
+            });
+            return b
+        },
+        getIndex: function(a) {
+            var b = this.chart;
+            return b.inverted ? b.plotHeight + b.plotTop - a.chartY: a.chartX - b.plotLeft
+        },
+        runPointActions: function(a) {
+            var b = this.chart,
+            c = b.series,
+            d = b.tooltip,
+            e, f, g = b.hoverPoint,
+            h = b.hoverSeries,
+            i, j, k = b.chartWidth,
+            l = this.getIndex(a);
+            if (d && this.options.tooltip.shared && (!h || !h.noSharedTooltip)) {
+                f = [];
+                i = c.length;
+                for (j = 0; j < i; j++) if (c[j].visible && c[j].options.enableMouseTracking !== !1 && !c[j].noSharedTooltip && c[j].singularTooltips !== !0 && c[j].tooltipPoints.length && (e = c[j].tooltipPoints[l]) && e.series) e._dist = Q(l - e.clientX),
+                k = C(k, e._dist),
+                f.push(e);
+                for (i = f.length; i--;) f[i]._dist > k && f.splice(i, 1);
+                if (f.length && f[0].clientX !== this.hoverX) d.refresh(f, a),
+                this.hoverX = f[0].clientX
+            }
+            c = h && h.tooltipOptions.followPointer;
+            if (h && h.tracker && !c) {
+                if ((e = h.tooltipPoints[l]) && e !== g) e.onMouseOver(a)
+            } else d && c && !d.isHidden && (h = d.getAnchor([{}], a), d.updatePosition({
+                plotX: h[0],
+                plotY: h[1]
+            }));
+            if (d && !this._onDocumentMouseMove) this._onDocumentMouseMove = function(a) {
+                if (W[pa]) W[pa].pointer.onDocumentMouseMove(a)
+            },
+            N(x, "mousemove", this._onDocumentMouseMove);
+            q(b.axes,
+            function(b) {
+                b.drawCrosshair(a, p(e, g))
+            })
+        },
+        reset: function(a) {
+            var b = this.chart,
+            c = b.hoverSeries,
+            d = b.hoverPoint,
+            e = b.tooltip,
+            f = e && e.shared ? b.hoverPoints: d; (a = a && e && f) && ra(f)[0].plotX === t && (a = !1);
+            if (a) e.refresh(f),
+            d && d.setState(d.state, !0);
+            else {
+                if (d) d.onMouseOut();
+                if (c) c.onMouseOut();
+                e && e.hide();
+                if (this._onDocumentMouseMove) X(x, "mousemove", this._onDocumentMouseMove),
+                this._onDocumentMouseMove = null;
+                q(b.axes,
+                function(a) {
+                    a.hideCrosshair()
+                });
+                this.hoverX = null
+            }
+        },
+        scaleGroups: function(a, b) {
+            var c = this.chart,
+            d;
+            q(c.series,
+            function(e) {
+                d = a || e.getPlotBox();
+                e.xAxis && e.xAxis.zoomEnabled && (e.group.attr(d), e.markerGroup && (e.markerGroup.attr(d), e.markerGroup.clip(b ? c.clipRect: null)), e.dataLabelsGroup && e.dataLabelsGroup.attr(d))
+            });
+            c.clipRect.attr(b || c.clipBox)
+        },
+        dragStart: function(a) {
+            var b = this.chart;
+            b.mouseIsDown = a.type;
+            b.cancelClick = !1;
+            b.mouseDownX = this.mouseDownX = a.chartX;
+            b.mouseDownY = this.mouseDownY = a.chartY
+        },
+        drag: function(a) {
+            var b = this.chart,
+            c = b.options.chart,
+            d = a.chartX,
+            e = a.chartY,
+            f = this.zoomHor,
+            g = this.zoomVert,
+            h = b.plotLeft,
+            i = b.plotTop,
+            j = b.plotWidth,
+            k = b.plotHeight,
+            l, m = this.mouseDownX,
+            n = this.mouseDownY,
+            o = c.panKey && a[c.panKey + "Key"];
+            d < h ? d = h: d > h + j && (d = h + j);
+            e < i ? e = i: e > i + k && (e = i + k);
+            this.hasDragged = Math.sqrt(Math.pow(m - d, 2) + Math.pow(n - e, 2));
+            if (this.hasDragged > 10) {
+                l = b.isInsidePlot(m - h, n - i);
+                if (b.hasCartesianSeries && (this.zoomX || this.zoomY) && l && !o && !this.selectionMarker) this.selectionMarker = b.renderer.rect(h, i, f ? 1 : j, g ? 1 : k, 0).attr({
+                    fill: c.selectionMarkerFill || "rgba(69,114,167,0.25)",
+                    zIndex: 7
+                }).add();
+                this.selectionMarker && f && (d -= m, this.selectionMarker.attr({
+                    width: Q(d),
+                    x: (d > 0 ? 0 : d) + m
+                }));
+                this.selectionMarker && g && (d = e - n, this.selectionMarker.attr({
+                    height: Q(d),
+                    y: (d > 0 ? 0 : d) + n
+                }));
+                l && !this.selectionMarker && c.panning && b.pan(a, c.panning)
+            }
+        },
+        drop: function(a) {
+            var b = this.chart,
+            c = this.hasPinched;
+            if (this.selectionMarker) {
+                var d = {
+                    xAxis: [],
+                    yAxis: [],
+                    originalEvent: a.originalEvent || a
+                },
+                e = this.selectionMarker,
+                f = e.attr ? e.attr("x") : e.x,
+                g = e.attr ? e.attr("y") : e.y,
+                h = e.attr ? e.attr("width") : e.width,
+                i = e.attr ? e.attr("height") : e.height,
+                j;
+                if (this.hasDragged || c) q(b.axes,
+                function(b) {
+                    if (b.zoomEnabled) {
+                        var c = b.horiz,
+                        e = a.type === "touchend" ? b.minPixelPadding: 0,
+                        n = b.toValue((c ? f: g) + e),
+                        c = b.toValue((c ? f + h: g + i) - e); ! isNaN(n) && !isNaN(c) && (d[b.coll].push({
+                            axis: b,
+                            min: C(n, c),
+                            max: u(n, c)
+                        }), j = !0)
+                    }
+                }),
+                j && K(b, "selection", d,
+                function(a) {
+                    b.zoom(r(a, c ? {
+                        animation: !1
+                    }: null))
+                });
+                this.selectionMarker = this.selectionMarker.destroy();
+                c && this.scaleGroups()
+            }
+            if (b) A(b.container, {
+                cursor: b._cursor
+            }),
+            b.cancelClick = this.hasDragged > 10,
+            b.mouseIsDown = this.hasDragged = this.hasPinched = !1,
+            this.pinchDown = []
+        },
+        onContainerMouseDown: function(a) {
+            a = this.normalize(a);
+            a.preventDefault && a.preventDefault();
+            this.dragStart(a)
+        },
+        onDocumentMouseUp: function(a) {
+            W[pa] && W[pa].pointer.drop(a)
+        },
+        onDocumentMouseMove: function(a) {
+            var b = this.chart,
+            c = this.chartPosition,
+            d = b.hoverSeries,
+            a = this.normalize(a, c);
+            c && d && !this.inClass(a.target, "highcharts-tracker") && !b.isInsidePlot(a.chartX - b.plotLeft, a.chartY - b.plotTop) && this.reset()
+        },
+        onContainerMouseLeave: function() {
+            var a = W[pa];
+            if (a) a.pointer.reset(),
+            a.pointer.chartPosition = null
+        },
+        onContainerMouseMove: function(a) {
+            var b = this.chart;
+            pa = b.index;
+            a = this.normalize(a);
+            a.returnValue = !1;
+            b.mouseIsDown === "mousedown" && this.drag(a); (this.inClass(a.target, "highcharts-tracker") || b.isInsidePlot(a.chartX - b.plotLeft, a.chartY - b.plotTop)) && !b.openMenu && this.runPointActions(a)
+        },
+        inClass: function(a, b) {
+            for (var c; a;) {
+                if (c = F(a, "class")) if (c.indexOf(b) !== -1) return ! 0;
+                else if (c.indexOf("highcharts-container") !== -1) return ! 1;
+                a = a.parentNode
+            }
+        },
+        onTrackerMouseOut: function(a) {
+            var b = this.chart.hoverSeries,
+            c = (a = a.relatedTarget || a.toElement) && a.point && a.point.series;
+            if (b && !b.options.stickyTracking && !this.inClass(a, "highcharts-tooltip") && c !== b) b.onMouseOut()
+        },
+        onContainerClick: function(a) {
+            var b = this.chart,
+            c = b.hoverPoint,
+            d = b.plotLeft,
+            e = b.plotTop,
+            a = this.normalize(a);
+            a.cancelBubble = !0;
+            b.cancelClick || (c && this.inClass(a.target, "highcharts-tracker") ? (K(c.series, "click", r(a, {
+                point: c
+            })), b.hoverPoint && c.firePointEvent("click", a)) : (r(a, this.getCoordinates(a)), b.isInsidePlot(a.chartX - d, a.chartY - e) && K(b, "click", a)))
+        },
+        setDOMEvents: function() {
+            var a = this,
+            b = a.chart.container;
+            b.onmousedown = function(b) {
+                a.onContainerMouseDown(b)
+            };
+            b.onmousemove = function(b) {
+                a.onContainerMouseMove(b)
+            };
+            b.onclick = function(b) {
+                a.onContainerClick(b)
+            };
+            N(b, "mouseleave", a.onContainerMouseLeave);
+            $a === 1 && N(x, "mouseup", a.onDocumentMouseUp);
+            if (Za) b.ontouchstart = function(b) {
+                a.onContainerTouchStart(b)
+            },
+            b.ontouchmove = function(b) {
+                a.onContainerTouchMove(b)
+            },
+            $a === 1 && N(x, "touchend", a.onDocumentTouchEnd)
+        },
+        destroy: function() {
+            var a;
+            X(this.chart.container, "mouseleave", this.onContainerMouseLeave);
+            $a || (X(x, "mouseup", this.onDocumentMouseUp), X(x, "touchend", this.onDocumentTouchEnd));
+            clearInterval(this.tooltipTimeout);
+            for (a in this) this[a] = null
+        }
+    };
+    r(S.Pointer.prototype, {
+        pinchTranslate: function(a, b, c, d, e, f) { (this.zoomHor || this.pinchHor) && this.pinchTranslateDirection(!0, a, b, c, d, e, f); (this.zoomVert || this.pinchVert) && this.pinchTranslateDirection(!1, a, b, c, d, e, f)
+        },
+        pinchTranslateDirection: function(a, b, c, d, e, f, g, h) {
+            var i = this.chart,
+            j = a ? "x": "y",
+            k = a ? "X": "Y",
+            l = "chart" + k,
+            m = a ? "width": "height",
+            n = i["plot" + (a ? "Left": "Top")],
+            o,
+            p,
+            q = h || 1,
+            r = i.inverted,
+            D = i.bounds[a ? "h": "v"],
+            u = b.length === 1,
+            s = b[0][l],
+            v = c[0][l],
+            t = !u && b[1][l],
+            w = !u && c[1][l],
+            x,
+            c = function() { ! u && Q(s - t) > 20 && (q = h || Q(v - w) / Q(s - t));
+                p = (n - v) / q + s;
+                o = i["plot" + (a ? "Width": "Height")] / q
+            };
+            c();
+            b = p;
+            b < D.min ? (b = D.min, x = !0) : b + o > D.max && (b = D.max - o, x = !0);
+            x ? (v -= 0.8 * (v - g[j][0]), u || (w -= 0.8 * (w - g[j][1])), c()) : g[j] = [v, w];
+            r || (f[j] = p - n, f[m] = o);
+            f = r ? 1 / q: q;
+            e[m] = o;
+            e[j] = b;
+            d[r ? a ? "scaleY": "scaleX": "scale" + k] = q;
+            d["translate" + k] = f * n + (v - f * s)
+        },
+        pinch: function(a) {
+            var b = this,
+            c = b.chart,
+            d = b.pinchDown,
+            e = b.followTouchMove,
+            f = a.touches,
+            g = f.length,
+            h = b.lastValidTouch,
+            i = b.hasZoom,
+            j = b.selectionMarker,
+            k = {},
+            l = g === 1 && (b.inClass(a.target, "highcharts-tracker") && c.runTrackerClick || c.runChartClick),
+            m = {}; (i || e) && !l && a.preventDefault();
+            Ua(f,
+            function(a) {
+                return b.normalize(a)
+            });
+            if (a.type === "touchstart") q(f,
+            function(a, b) {
+                d[b] = {
+                    chartX: a.chartX,
+                    chartY: a.chartY
+                }
+            }),
+            h.x = [d[0].chartX, d[1] && d[1].chartX],
+            h.y = [d[0].chartY, d[1] && d[1].chartY],
+            q(c.axes,
+            function(a) {
+                if (a.zoomEnabled) {
+                    var b = c.bounds[a.horiz ? "h": "v"],
+                    d = a.minPixelPadding,
+                    e = a.toPixels(p(a.options.min, a.dataMin)),
+                    f = a.toPixels(p(a.options.max, a.dataMax)),
+                    g = C(e, f),
+                    e = u(e, f);
+                    b.min = C(a.pos, g - d);
+                    b.max = u(a.pos + a.len, e + d)
+                }
+            });
+            else if (d.length) {
+                if (!j) b.selectionMarker = j = r({
+                    destroy: sa
+                },
+                c.plotBox);
+                b.pinchTranslate(d, f, k, j, m, h);
+                b.hasPinched = i;
+                b.scaleGroups(k, m); ! i && e && g === 1 && this.runPointActions(b.normalize(a))
+            }
+        },
+        onContainerTouchStart: function(a) {
+            var b = this.chart;
+            pa = b.index;
+            a.touches.length === 1 ? (a = this.normalize(a), b.isInsidePlot(a.chartX - b.plotLeft, a.chartY - b.plotTop) ? (this.runPointActions(a), this.pinch(a)) : this.reset()) : a.touches.length === 2 && this.pinch(a)
+        },
+        onContainerTouchMove: function(a) { (a.touches.length === 1 || a.touches.length === 2) && this.pinch(a)
+        },
+        onDocumentTouchEnd: function(a) {
+            W[pa] && W[pa].pointer.drop(a)
+        }
+    });
+    if (H.PointerEvent || H.MSPointerEvent) {
+        var ua = {},
+        yb = !!H.PointerEvent,
+        Wb = function() {
+            var a, b = [];
+            b.item = function(a) {
+                return this[a]
+            };
+            for (a in ua) ua.hasOwnProperty(a) && b.push({
+                pageX: ua[a].pageX,
+                pageY: ua[a].pageY,
+                target: ua[a].target
+            });
+            return b
+        },
+        zb = function(a, b, c, d) {
+            a = a.originalEvent || a;
+            if ((a.pointerType === "touch" || a.pointerType === a.MSPOINTER_TYPE_TOUCH) && W[pa]) d(a),
+            d = W[pa].pointer,
+            d[b]({
+                type: c,
+                target: a.currentTarget,
+                preventDefault: sa,
+                touches: Wb()
+            })
+        };
+        r(Va.prototype, {
+            onContainerPointerDown: function(a) {
+                zb(a, "onContainerTouchStart", "touchstart",
+                function(a) {
+                    ua[a.pointerId] = {
+                        pageX: a.pageX,
+                        pageY: a.pageY,
+                        target: a.currentTarget
+                    }
+                })
+            },
+            onContainerPointerMove: function(a) {
+                zb(a, "onContainerTouchMove", "touchmove",
+                function(a) {
+                    ua[a.pointerId] = {
+                        pageX: a.pageX,
+                        pageY: a.pageY
+                    };
+                    if (!ua[a.pointerId].target) ua[a.pointerId].target = a.currentTarget
+                })
+            },
+            onDocumentPointerUp: function(a) {
+                zb(a, "onContainerTouchEnd", "touchend",
+                function(a) {
+                    delete ua[a.pointerId]
+                })
+            },
+            batchMSEvents: function(a) {
+                a(this.chart.container, yb ? "pointerdown": "MSPointerDown", this.onContainerPointerDown);
+                a(this.chart.container, yb ? "pointermove": "MSPointerMove", this.onContainerPointerMove);
+                a(x, yb ? "pointerup": "MSPointerUp", this.onDocumentPointerUp)
+            }
+        });
+        Ma(Va.prototype, "init",
+        function(a, b, c) {
+            a.call(this, b, c); (this.hasZoom || this.followTouchMove) && A(b.container, {
+                "-ms-touch-action": P,
+                "touch-action": P
+            })
+        });
+        Ma(Va.prototype, "setDOMEvents",
+        function(a) {
+            a.apply(this); (this.hasZoom || this.followTouchMove) && this.batchMSEvents(N)
+        });
+        Ma(Va.prototype, "destroy",
+        function(a) {
+            this.batchMSEvents(X);
+            a.call(this)
+        })
+    }
+    var kb = S.Legend = function(a, b) {
+        this.init(a, b)
+    };
+    kb.prototype = {
+        init: function(a, b) {
+            var c = this,
+            d = b.itemStyle,
+            e = p(b.padding, 8),
+            f = b.itemMarginTop || 0;
+            this.options = b;
+            if (b.enabled) c.itemStyle = d,
+            c.itemHiddenStyle = w(d, b.itemHiddenStyle),
+            c.itemMarginTop = f,
+            c.padding = e,
+            c.initialItemX = e,
+            c.initialItemY = e - 5,
+            c.maxItemWidth = 0,
+            c.chart = a,
+            c.itemHeight = 0,
+            c.lastLineHeight = 0,
+            c.symbolWidth = p(b.symbolWidth, 16),
+            c.pages = [],
+            c.render(),
+            N(c.chart, "endResize",
+            function() {
+                c.positionCheckboxes()
+            })
+        },
+        colorizeItem: function(a, b) {
+            var c = this.options,
+            d = a.legendItem,
+            e = a.legendLine,
+            f = a.legendSymbol,
+            g = this.itemHiddenStyle.color,
+            c = b ? c.itemStyle.color: g,
+            h = b ? a.legendColor || a.color || "#CCC": g,
+            g = a.options && a.options.marker,
+            i = {
+                fill: h
+            },
+            j;
+            d && d.css({
+                fill: c,
+                color: c
+            });
+            e && e.attr({
+                stroke: h
+            });
+            if (f) {
+                if (g && f.isMarker) for (j in i.stroke = h, g = a.convertAttribs(g), g) d = g[j],
+                d !== t && (i[j] = d);
+                f.attr(i)
+            }
+        },
+        positionItem: function(a) {
+            var b = this.options,
+            c = b.symbolPadding,
+            b = !b.rtl,
+            d = a._legendItemPos,
+            e = d[0],
+            d = d[1],
+            f = a.checkbox;
+            a.legendGroup && a.legendGroup.translate(b ? e: this.legendWidth - e - 2 * c - 4, d);
+            if (f) f.x = e,
+            f.y = d
+        },
+        destroyItem: function(a) {
+            var b = a.checkbox;
+            q(["legendItem", "legendLine", "legendSymbol", "legendGroup"],
+            function(b) {
+                a[b] && (a[b] = a[b].destroy())
+            });
+            b && Pa(a.checkbox)
+        },
+        destroy: function() {
+            var a = this.group,
+            b = this.box;
+            if (b) this.box = b.destroy();
+            if (a) this.group = a.destroy()
+        },
+        positionCheckboxes: function(a) {
+            var b = this.group.alignAttr,
+            c, d = this.clipHeight || this.legendHeight;
+            if (b) c = b.translateY,
+            q(this.allItems,
+            function(e) {
+                var f = e.checkbox,
+                g;
+                f && (g = c + f.y + (a || 0) + 3, A(f, {
+                    left: b.translateX + e.checkboxOffset + f.x - 20 + "px",
+                    top: g + "px",
+                    display: g > c - 6 && g < c + d - 6 ? "": P
+                }))
+            })
+        },
+        renderTitle: function() {
+            var a = this.padding,
+            b = this.options.title,
+            c = 0;
+            if (b.text) {
+                if (!this.title) this.title = this.chart.renderer.label(b.text, a - 3, a - 4, null, null, null, null, null, "legend-title").attr({
+                    zIndex: 1
+                }).css(b.style).add(this.group);
+                a = this.title.getBBox();
+                c = a.height;
+                this.offsetWidth = a.width;
+                this.contentGroup.attr({
+                    translateY: c
+                })
+            }
+            this.titleHeight = c
+        },
+        renderItem: function(a) {
+            var b = this.chart,
+            c = b.renderer,
+            d = this.options,
+            e = d.layout === "horizontal",
+            f = this.symbolWidth,
+            g = d.symbolPadding,
+            h = this.itemStyle,
+            i = this.itemHiddenStyle,
+            j = this.padding,
+            k = e ? p(d.itemDistance, 20) : 0,
+            l = !d.rtl,
+            m = d.width,
+            n = d.itemMarginBottom || 0,
+            o = this.itemMarginTop,
+            q = this.initialItemX,
+            r = a.legendItem,
+            s = a.series && a.series.drawLegendSymbol ? a.series: a,
+            D = s.options,
+            D = this.createCheckboxForItem && D && D.showCheckbox,
+            t = d.useHTML;
+            if (!r) {
+                a.legendGroup = c.g("legend-item").attr({
+                    zIndex: 1
+                }).add(this.scrollGroup);
+                a.legendItem = r = c.text(d.labelFormat ? Ia(d.labelFormat, a) : d.labelFormatter.call(a), l ? f + g: -g, this.baseline || 0, t).css(w(a.visible ? h: i)).attr({
+                    align: l ? "left": "right",
+                    zIndex: 2
+                }).add(a.legendGroup);
+                if (!this.baseline) this.baseline = c.fontMetrics(h.fontSize, r).f + 3 + o,
+                r.attr("y", this.baseline);
+                s.drawLegendSymbol(this, a);
+                this.setItemEvents && this.setItemEvents(a, r, t, h, i);
+                this.colorizeItem(a, a.visible);
+                D && this.createCheckboxForItem(a)
+            }
+            c = r.getBBox();
+            f = a.checkboxOffset = d.itemWidth || a.legendItemWidth || f + g + c.width + k + (D ? 20 : 0);
+            this.itemHeight = g = v(a.legendItemHeight || c.height);
+            if (e && this.itemX - q + f > (m || b.chartWidth - 2 * j - q - d.x)) this.itemX = q,
+            this.itemY += o + this.lastLineHeight + n,
+            this.lastLineHeight = 0;
+            this.maxItemWidth = u(this.maxItemWidth, f);
+            this.lastItemY = o + this.itemY + n;
+            this.lastLineHeight = u(g, this.lastLineHeight);
+            a._legendItemPos = [this.itemX, this.itemY];
+            e ? this.itemX += f: (this.itemY += o + g + n, this.lastLineHeight = g);
+            this.offsetWidth = m || u((e ? this.itemX - q - k: f) + j, this.offsetWidth)
+        },
+        getAllItems: function() {
+            var a = [];
+            q(this.chart.series,
+            function(b) {
+                var c = b.options;
+                if (p(c.showInLegend, !s(c.linkedTo) ? t: !1, !0)) a = a.concat(b.legendItems || (c.legendType === "point" ? b.data: b))
+            });
+            return a
+        },
+        render: function() {
+            var a = this,
+            b = a.chart,
+            c = b.renderer,
+            d = a.group,
+            e, f, g, h, i = a.box,
+            j = a.options,
+            k = a.padding,
+            l = j.borderWidth,
+            m = j.backgroundColor;
+            a.itemX = a.initialItemX;
+            a.itemY = a.initialItemY;
+            a.offsetWidth = 0;
+            a.lastItemY = 0;
+            if (!d) a.group = d = c.g("legend").attr({
+                zIndex: 7
+            }).add(),
+            a.contentGroup = c.g().attr({
+                zIndex: 1
+            }).add(d),
+            a.scrollGroup = c.g().add(a.contentGroup);
+            a.renderTitle();
+            e = a.getAllItems();
+            nb(e,
+            function(a, b) {
+                return (a.options && a.options.legendIndex || 0) - (b.options && b.options.legendIndex || 0)
+            });
+            j.reversed && e.reverse();
+            a.allItems = e;
+            a.display = f = !!e.length;
+            q(e,
+            function(b) {
+                a.renderItem(b)
+            });
+            g = j.width || a.offsetWidth;
+            h = a.lastItemY + a.lastLineHeight + a.titleHeight;
+            h = a.handleOverflow(h);
+            if (l || m) {
+                g += k;
+                h += k;
+                if (i) {
+                    if (g > 0 && h > 0) i[i.isNew ? "attr": "animate"](i.crisp({
+                        width: g,
+                        height: h
+                    })),
+                    i.isNew = !1
+                } else a.box = i = c.rect(0, 0, g, h, j.borderRadius, l || 0).attr({
+                    stroke: j.borderColor,
+                    "stroke-width": l || 0,
+                    fill: m || P
+                }).add(d).shadow(j.shadow),
+                i.isNew = !0;
+                i[f ? "show": "hide"]()
+            }
+            a.legendWidth = g;
+            a.legendHeight = h;
+            q(e,
+            function(b) {
+                a.positionItem(b)
+            });
+            f && d.align(r({
+                width: g,
+                height: h
+            },
+            j), !0, "spacingBox");
+            b.isResizing || this.positionCheckboxes()
+        },
+        handleOverflow: function(a) {
+            var b = this,
+            c = this.chart,
+            d = c.renderer,
+            e = this.options,
+            f = e.y,
+            f = c.spacingBox.height + (e.verticalAlign === "top" ? -f: f) - this.padding,
+            g = e.maxHeight,
+            h,
+            i = this.clipRect,
+            j = e.navigation,
+            k = p(j.animation, !0),
+            l = j.arrowSize || 12,
+            m = this.nav,
+            n = this.pages,
+            o,
+            r = this.allItems;
+            e.layout === "horizontal" && (f /= 2);
+            g && (f = C(f, g));
+            n.length = 0;
+            if (a > f && !e.useHTML) {
+                this.clipHeight = h = u(f - 20 - this.titleHeight - this.padding, 0);
+                this.currentPage = p(this.currentPage, 1);
+                this.fullHeight = a;
+                q(r,
+                function(a, b) {
+                    var c = a._legendItemPos[1],
+                    d = v(a.legendItem.getBBox().height),
+                    e = n.length;
+                    if (!e || c - n[e - 1] > h && (o || c) !== n[e - 1]) n.push(o || c),
+                    e++;
+                    b === r.length - 1 && c + d - n[e - 1] > h && n.push(c);
+                    c !== o && (o = c)
+                });
+                if (!i) i = b.clipRect = d.clipRect(0, this.padding, 9999, 0),
+                b.contentGroup.clip(i);
+                i.attr({
+                    height: h
+                });
+                if (!m) this.nav = m = d.g().attr({
+                    zIndex: 1
+                }).add(this.group),
+                this.up = d.symbol("triangle", 0, 0, l, l).on("click",
+                function() {
+                    b.scroll( - 1, k)
+                }).add(m),
+                this.pager = d.text("", 15, 10).css(j.style).add(m),
+                this.down = d.symbol("triangle-down", 0, 0, l, l).on("click",
+                function() {
+                    b.scroll(1, k)
+                }).add(m);
+                b.scroll(0);
+                a = f
+            } else if (m) i.attr({
+                height: c.chartHeight
+            }),
+            m.hide(),
+            this.scrollGroup.attr({
+                translateY: 1
+            }),
+            this.clipHeight = 0;
+            return a
+        },
+        scroll: function(a, b) {
+            var c = this.pages,
+            d = c.length,
+            e = this.currentPage + a,
+            f = this.clipHeight,
+            g = this.options.navigation,
+            h = g.activeColor,
+            g = g.inactiveColor,
+            i = this.pager,
+            j = this.padding;
+            e > d && (e = d);
+            if (e > 0) b !== t && Qa(b, this.chart),
+            this.nav.attr({
+                translateX: j,
+                translateY: f + this.padding + 7 + this.titleHeight,
+                visibility: "visible"
+            }),
+            this.up.attr({
+                fill: e === 1 ? g: h
+            }).css({
+                cursor: e === 1 ? "default": "pointer"
+            }),
+            i.attr({
+                text: e + "/" + d
+            }),
+            this.down.attr({
+                x: 18 + this.pager.getBBox().width,
+                fill: e === d ? g: h
+            }).css({
+                cursor: e === d ? "default": "pointer"
+            }),
+            c = -c[e - 1] + this.initialItemY,
+            this.scrollGroup.animate({
+                translateY: c
+            }),
+            this.currentPage = e,
+            this.positionCheckboxes(c)
+        }
+    };
+    M = S.LegendSymbolMixin = {
+        drawRectangle: function(a, b) {
+            var c = a.options.symbolHeight || 12;
+            b.legendSymbol = this.chart.renderer.rect(0, a.baseline - 5 - c / 2, a.symbolWidth, c, a.options.symbolRadius || 0).attr({
+                zIndex: 3
+            }).add(b.legendGroup)
+        },
+        drawLineMarker: function(a) {
+            var b = this.options,
+            c = b.marker,
+            d;
+            d = a.symbolWidth;
+            var e = this.chart.renderer,
+            f = this.legendGroup,
+            a = a.baseline - v(e.fontMetrics(a.options.itemStyle.fontSize, this.legendItem).b * 0.3),
+            g;
+            if (b.lineWidth) {
+                g = {
+                    "stroke-width": b.lineWidth
+                };
+                if (b.dashStyle) g.dashstyle = b.dashStyle;
+                this.legendLine = e.path(["M", 0, a, "L", d, a]).attr(g).add(f)
+            }
+            if (c && c.enabled !== !1) b = c.radius,
+            this.legendSymbol = d = e.symbol(this.symbol, d / 2 - b, a - b, 2 * b, 2 * b).add(f),
+            d.isMarker = !0
+        }
+    }; (/Trident\/7\.0/.test(wa) || Ta) && Ma(kb.prototype, "positionItem",
+    function(a, b) {
+        var c = this,
+        d = function() {
+            b._legendItemPos && a.call(c, b)
+        };
+        d();
+        setTimeout(d)
+    });
+    Xa.prototype = {
+        init: function(a, b) {
+            var c, d = a.series;
+            a.series = null;
+            c = w(L, a);
+            c.series = a.series = d;
+            this.userOptions = a;
+            d = c.chart;
+            this.margin = this.splashArray("margin", d);
+            this.spacing = this.splashArray("spacing", d);
+            var e = d.events;
+            this.bounds = {
+                h: {},
+                v: {}
+            };
+            this.callback = b;
+            this.isResizing = 0;
+            this.options = c;
+            this.axes = [];
+            this.series = [];
+            this.hasCartesianSeries = d.showAxes;
+            var f = this,
+            g;
+            f.index = W.length;
+            W.push(f);
+            $a++;
+            d.reflow !== !1 && N(f, "load",
+            function() {
+                f.initReflow()
+            });
+            if (e) for (g in e) N(f, g, e[g]);
+            f.xAxis = [];
+            f.yAxis = [];
+            f.animation = ga ? !1 : p(d.animation, !0);
+            f.pointCount = f.colorCounter = f.symbolCounter = 0;
+            f.firstRender()
+        },
+        initSeries: function(a) {
+            var b = this.options.chart; (b = J[a.type || b.type || b.defaultSeriesType]) || oa(17, !0);
+            b = new b;
+            b.init(this, a);
+            return b
+        },
+        isInsidePlot: function(a, b, c) {
+            var d = c ? b: a,
+            a = c ? a: b;
+            return d >= 0 && d <= this.plotWidth && a >= 0 && a <= this.plotHeight
+        },
+        adjustTickAmounts: function() {
+            this.options.chart.alignTicks !== !1 && q(this.axes,
+            function(a) {
+                a.adjustTickAmount()
+            });
+            this.maxTicks = null
+        },
+        redraw: function(a) {
+            var b = this.axes,
+            c = this.series,
+            d = this.pointer,
+            e = this.legend,
+            f = this.isDirtyLegend,
+            g, h, i = this.hasCartesianSeries,
+            j = this.isDirtyBox,
+            k = c.length,
+            l = k,
+            m = this.renderer,
+            n = m.isHidden(),
+            o = [];
+            Qa(a, this);
+            n && this.cloneRenderTo();
+            for (this.layOutTitles(); l--;) if (a = c[l], a.options.stacking && (g = !0, a.isDirty)) {
+                h = !0;
+                break
+            }
+            if (h) for (l = k; l--;) if (a = c[l], a.options.stacking) a.isDirty = !0;
+            q(c,
+            function(a) {
+                a.isDirty && a.options.legendType === "point" && (f = !0)
+            });
+            if (f && e.options.enabled) e.render(),
+            this.isDirtyLegend = !1;
+            g && this.getStacks();
+            if (i) {
+                if (!this.isResizing) this.maxTicks = null,
+                q(b,
+                function(a) {
+                    a.setScale()
+                });
+                this.adjustTickAmounts()
+            }
+            this.getMargins();
+            i && (q(b,
+            function(a) {
+                a.isDirty && (j = !0)
+            }), q(b,
+            function(a) {
+                if (a.isDirtyExtremes) a.isDirtyExtremes = !1,
+                o.push(function() {
+                    K(a, "afterSetExtremes", r(a.eventArgs, a.getExtremes()));
+                    delete a.eventArgs
+                }); (j || g) && a.redraw()
+            }));
+            j && this.drawChartBox();
+            q(c,
+            function(a) {
+                a.isDirty && a.visible && (!a.isCartesian || a.xAxis) && a.redraw()
+            });
+            d && d.reset(!0);
+            m.draw();
+            K(this, "redraw");
+            n && this.cloneRenderTo(!0);
+            q(o,
+            function(a) {
+                a.call()
+            })
+        },
+        get: function(a) {
+            var b = this.axes,
+            c = this.series,
+            d, e;
+            for (d = 0; d < b.length; d++) if (b[d].options.id === a) return b[d];
+            for (d = 0; d < c.length; d++) if (c[d].options.id === a) return c[d];
+            for (d = 0; d < c.length; d++) {
+                e = c[d].points || [];
+                for (b = 0; b < e.length; b++) if (e[b].id === a) return e[b]
+            }
+            return null
+        },
+        getAxes: function() {
+            var a = this,
+            b = this.options,
+            c = b.xAxis = ra(b.xAxis || {}),
+            b = b.yAxis = ra(b.yAxis || {});
+            q(c,
+            function(a, b) {
+                a.index = b;
+                a.isX = !0
+            });
+            q(b,
+            function(a, b) {
+                a.index = b
+            });
+            c = c.concat(b);
+            q(c,
+            function(b) {
+                new ma(a, b)
+            });
+            a.adjustTickAmounts()
+        },
+        getSelectedPoints: function() {
+            var a = [];
+            q(this.series,
+            function(b) {
+                a = a.concat(vb(b.points || [],
+                function(a) {
+                    return a.selected
+                }))
+            });
+            return a
+        },
+        getSelectedSeries: function() {
+            return vb(this.series,
+            function(a) {
+                return a.selected
+            })
+        },
+        getStacks: function() {
+            var a = this;
+            q(a.yAxis,
+            function(a) {
+                if (a.stacks && a.hasVisibleSeries) a.oldStacks = a.stacks
+            });
+            q(a.series,
+            function(b) {
+                if (b.options.stacking && (b.visible === !0 || a.options.chart.ignoreHiddenSeries === !1)) b.stackKey = b.type + p(b.options.stack, "")
+            })
+        },
+        setTitle: function(a, b, c) {
+            var g;
+            var d = this,
+            e = d.options,
+            f;
+            f = e.title = w(e.title, a);
+            g = e.subtitle = w(e.subtitle, b),
+            e = g;
+            q([["title", a, f], ["subtitle", b, e]],
+            function(a) {
+                var b = a[0],
+                c = d[b],
+                e = a[1],
+                a = a[2];
+                c && e && (d[b] = c = c.destroy());
+                a && a.text && !c && (d[b] = d.renderer.text(a.text, 0, 0, a.useHTML).attr({
+                    align: a.align,
+                    "class": "highcharts-" + b,
+                    zIndex: a.zIndex || 4
+                }).css(a.style).add())
+            });
+            d.layOutTitles(c)
+        },
+        layOutTitles: function(a) {
+            var b = 0,
+            c = this.title,
+            d = this.subtitle,
+            e = this.options,
+            f = e.title,
+            e = e.subtitle,
+            g = this.renderer,
+            h = this.spacingBox.width - 44;
+            if (c && (c.css({
+                width: (f.width || h) + "px"
+            }).align(r({
+                y: g.fontMetrics(f.style.fontSize, c).b - 3
+            },
+            f), !1, "spacingBox"), !f.floating && !f.verticalAlign)) b = c.getBBox().height;
+            d && (d.css({
+                width: (e.width || h) + "px"
+            }).align(r({
+                y: b + (f.margin - 13) + g.fontMetrics(f.style.fontSize, d).b
+            },
+            e), !1, "spacingBox"), !e.floating && !e.verticalAlign && (b = Ka(b + d.getBBox().height)));
+            c = this.titleOffset !== b;
+            this.titleOffset = b;
+            if (!this.isDirtyBox && c) this.isDirtyBox = c,
+            this.hasRendered && p(a, !0) && this.isDirtyBox && this.redraw()
+        },
+        getChartSize: function() {
+            var a = this.options.chart,
+            b = a.width,
+            a = a.height,
+            c = this.renderToClone || this.renderTo;
+            if (!s(b)) this.containerWidth = hb(c, "width");
+            if (!s(a)) this.containerHeight = hb(c, "height");
+            this.chartWidth = u(0, b || this.containerWidth || 600);
+            this.chartHeight = u(0, p(a, this.containerHeight > 19 ? this.containerHeight: 400))
+        },
+        cloneRenderTo: function(a) {
+            var b = this.renderToClone,
+            c = this.container;
+            a ? b && (this.renderTo.appendChild(c), Pa(b), delete this.renderToClone) : (c && c.parentNode === this.renderTo && this.renderTo.removeChild(c), this.renderToClone = b = this.renderTo.cloneNode(0), A(b, {
+                position: "absolute",
+                top: "-9999px",
+                display: "block"
+            }), b.style.setProperty && b.style.setProperty("display", "block", "important"), x.body.appendChild(b), c && b.appendChild(c))
+        },
+        getContainer: function() {
+            var a, b = this.options.chart,
+            c, d, e;
+            this.renderTo = a = b.renderTo;
+            e = "highcharts-" + tb++;
+            if (Fa(a)) this.renderTo = a = x.getElementById(a);
+            a || oa(13, !0);
+            c = z(F(a, "data-highcharts-chart")); ! isNaN(c) && W[c] && W[c].hasRendered && W[c].destroy();
+            F(a, "data-highcharts-chart", this.index);
+            a.innerHTML = ""; ! b.skipClone && !a.offsetWidth && this.cloneRenderTo();
+            this.getChartSize();
+            c = this.chartWidth;
+            d = this.chartHeight;
+            this.container = a = $(Ja, {
+                className: "highcharts-container" + (b.className ? " " + b.className: ""),
+                id: e
+            },
+            r({
+                position: "relative",
+                overflow: "hidden",
+                width: c + "px",
+                height: d + "px",
+                textAlign: "left",
+                lineHeight: "normal",
+                zIndex: 0,
+                "-webkit-tap-highlight-color": "rgba(0,0,0,0)"
+            },
+            b.style), this.renderToClone || a);
+            this._cursor = a.style.cursor;
+            this.renderer = b.forExport ? new ta(a, c, d, b.style, !0) : new Ya(a, c, d, b.style);
+            ga && this.renderer.create(this, a, c, d)
+        },
+        getMargins: function() {
+            var a = this.spacing,
+            b, c = this.legend,
+            d = this.margin,
+            e = this.options.legend,
+            f = p(e.margin, 20),
+            g = e.x,
+            h = e.y,
+            i = e.align,
+            j = e.verticalAlign,
+            k = this.titleOffset;
+            this.resetMargins();
+            b = this.axisOffset;
+            if (k && !s(d[0])) this.plotTop = u(this.plotTop, k + this.options.title.margin + a[0]);
+            if (c.display && !e.floating) if (i === "right") {
+                if (!s(d[1])) this.marginRight = u(this.marginRight, c.legendWidth - g + f + a[1])
+            } else if (i === "left") {
+                if (!s(d[3])) this.plotLeft = u(this.plotLeft, c.legendWidth + g + f + a[3])
+            } else if (j === "top") {
+                if (!s(d[0])) this.plotTop = u(this.plotTop, c.legendHeight + h + f + a[0])
+            } else if (j === "bottom" && !s(d[2])) this.marginBottom = u(this.marginBottom, c.legendHeight - h + f + a[2]);
+            this.extraBottomMargin && (this.marginBottom += this.extraBottomMargin);
+            this.extraTopMargin && (this.plotTop += this.extraTopMargin);
+            this.hasCartesianSeries && q(this.axes,
+            function(a) {
+                a.getOffset()
+            });
+            s(d[3]) || (this.plotLeft += b[3]);
+            s(d[0]) || (this.plotTop += b[0]);
+            s(d[2]) || (this.marginBottom += b[2]);
+            s(d[1]) || (this.marginRight += b[1]);
+            this.setChartSize()
+        },
+        reflow: function(a) {
+            var b = this,
+            c = b.options.chart,
+            d = b.renderTo,
+            e = c.width || hb(d, "width"),
+            f = c.height || hb(d, "height"),
+            c = a ? a.target: H,
+            d = function() {
+                if (b.container) b.setSize(e, f, !1),
+                b.hasUserSize = null
+            };
+            if (!b.hasUserSize && e && f && (c === H || c === x)) {
+                if (e !== b.containerWidth || f !== b.containerHeight) clearTimeout(b.reflowTimeout),
+                a ? b.reflowTimeout = setTimeout(d, 100) : d();
+                b.containerWidth = e;
+                b.containerHeight = f
+            }
+        },
+        initReflow: function() {
+            var a = this,
+            b = function(b) {
+                a.reflow(b)
+            };
+            N(H, "resize", b);
+            N(a, "destroy",
+            function() {
+                X(H, "resize", b)
+            })
+        },
+        setSize: function(a, b, c) {
+            var d = this,
+            e, f, g;
+            d.isResizing += 1;
+            g = function() {
+                d && K(d, "endResize", null,
+                function() {
+                    d.isResizing -= 1
+                })
+            };
+            Qa(c, d);
+            d.oldChartHeight = d.chartHeight;
+            d.oldChartWidth = d.chartWidth;
+            if (s(a)) d.chartWidth = e = u(0, v(a)),
+            d.hasUserSize = !!e;
+            if (s(b)) d.chartHeight = f = u(0, v(b)); (va ? ib: A)(d.container, {
+                width: e + "px",
+                height: f + "px"
+            },
+            va);
+            d.setChartSize(!0);
+            d.renderer.setSize(e, f, c);
+            d.maxTicks = null;
+            q(d.axes,
+            function(a) {
+                a.isDirty = !0;
+                a.setScale()
+            });
+            q(d.series,
+            function(a) {
+                a.isDirty = !0
+            });
+            d.isDirtyLegend = !0;
+            d.isDirtyBox = !0;
+            d.layOutTitles();
+            d.getMargins();
+            d.redraw(c);
+            d.oldChartHeight = null;
+            K(d, "resize");
+            va === !1 ? g() : setTimeout(g, va && va.duration || 500)
+        },
+        setChartSize: function(a) {
+            var b = this.inverted,
+            c = this.renderer,
+            d = this.chartWidth,
+            e = this.chartHeight,
+            f = this.options.chart,
+            g = this.spacing,
+            h = this.clipOffset,
+            i, j, k, l;
+            this.plotLeft = i = v(this.plotLeft);
+            this.plotTop = j = v(this.plotTop);
+            this.plotWidth = k = u(0, v(d - i - this.marginRight));
+            this.plotHeight = l = u(0, v(e - j - this.marginBottom));
+            this.plotSizeX = b ? l: k;
+            this.plotSizeY = b ? k: l;
+            this.plotBorderWidth = f.plotBorderWidth || 0;
+            this.spacingBox = c.spacingBox = {
+                x: g[3],
+                y: g[0],
+                width: d - g[3] - g[1],
+                height: e - g[0] - g[2]
+            };
+            this.plotBox = c.plotBox = {
+                x: i,
+                y: j,
+                width: k,
+                height: l
+            };
+            d = 2 * U(this.plotBorderWidth / 2);
+            b = Ka(u(d, h[3]) / 2);
+            c = Ka(u(d, h[0]) / 2);
+            this.clipBox = {
+                x: b,
+                y: c,
+                width: U(this.plotSizeX - u(d, h[1]) / 2 - b),
+                height: u(0, U(this.plotSizeY - u(d, h[2]) / 2 - c))
+            };
+            a || q(this.axes,
+            function(a) {
+                a.setAxisSize();
+                a.setAxisTranslation()
+            })
+        },
+        resetMargins: function() {
+            var a = this.spacing,
+            b = this.margin;
+            this.plotTop = p(b[0], a[0]);
+            this.marginRight = p(b[1], a[1]);
+            this.marginBottom = p(b[2], a[2]);
+            this.plotLeft = p(b[3], a[3]);
+            this.axisOffset = [0, 0, 0, 0];
+            this.clipOffset = [0, 0, 0, 0]
+        },
+        drawChartBox: function() {
+            var a = this.options.chart,
+            b = this.renderer,
+            c = this.chartWidth,
+            d = this.chartHeight,
+            e = this.chartBackground,
+            f = this.plotBackground,
+            g = this.plotBorder,
+            h = this.plotBGImage,
+            i = a.borderWidth || 0,
+            j = a.backgroundColor,
+            k = a.plotBackgroundColor,
+            l = a.plotBackgroundImage,
+            m = a.plotBorderWidth || 0,
+            n, o = this.plotLeft,
+            p = this.plotTop,
+            q = this.plotWidth,
+            r = this.plotHeight,
+            u = this.plotBox,
+            s = this.clipRect,
+            v = this.clipBox;
+            n = i + (a.shadow ? 8 : 0);
+            if (i || j) if (e) e.animate(e.crisp({
+                width: c - n,
+                height: d - n
+            }));
+            else {
+                e = {
+                    fill: j || P
+                };
+                if (i) e.stroke = a.borderColor,
+                e["stroke-width"] = i;
+                this.chartBackground = b.rect(n / 2, n / 2, c - n, d - n, a.borderRadius, i).attr(e).addClass("highcharts-background").add().shadow(a.shadow)
+            }
+            if (k) f ? f.animate(u) : this.plotBackground = b.rect(o, p, q, r, 0).attr({
+                fill: k
+            }).add().shadow(a.plotShadow);
+            if (l) h ? h.animate(u) : this.plotBGImage = b.image(l, o, p, q, r).add();
+            s ? s.animate({
+                width: v.width,
+                height: v.height
+            }) : this.clipRect = b.clipRect(v);
+            if (m) g ? g.animate(g.crisp({
+                x: o,
+                y: p,
+                width: q,
+                height: r
+            })) : this.plotBorder = b.rect(o, p, q, r, 0, -m).attr({
+                stroke: a.plotBorderColor,
+                "stroke-width": m,
+                fill: P,
+                zIndex: 1
+            }).add();
+            this.isDirtyBox = !1
+        },
+        propFromSeries: function() {
+            var a = this,
+            b = a.options.chart,
+            c, d = a.options.series,
+            e, f;
+            q(["inverted", "angular", "polar"],
+            function(g) {
+                c = J[b.type || b.defaultSeriesType];
+                f = a[g] || b[g] || c && c.prototype[g];
+                for (e = d && d.length; ! f && e--;)(c = J[d[e].type]) && c.prototype[g] && (f = !0);
+                a[g] = f
+            })
+        },
+        linkSeries: function() {
+            var a = this,
+            b = a.series;
+            q(b,
+            function(a) {
+                a.linkedSeries.length = 0
+            });
+            q(b,
+            function(b) {
+                var d = b.options.linkedTo;
+                if (Fa(d) && (d = d === ":previous" ? a.series[b.index - 1] : a.get(d))) d.linkedSeries.push(b),
+                b.linkedParent = d
+            })
+        },
+        renderSeries: function() {
+            q(this.series,
+            function(a) {
+                a.translate();
+                a.setTooltipPoints && a.setTooltipPoints();
+                a.render()
+            })
+        },
+        renderLabels: function() {
+            var a = this,
+            b = a.options.labels;
+            b.items && q(b.items,
+            function(c) {
+                var d = r(b.style, c.style),
+                e = z(d.left) + a.plotLeft,
+                f = z(d.top) + a.plotTop + 12;
+                delete d.left;
+                delete d.top;
+                a.renderer.text(c.html, e, f).attr({
+                    zIndex: 2
+                }).css(d).add()
+            })
+        },
+        render: function() {
+            var a = this.axes,
+            b = this.renderer,
+            c = this.options;
+            this.setTitle();
+            this.legend = new kb(this, c.legend);
+            this.getStacks();
+            q(a,
+            function(a) {
+                a.setScale()
+            });
+            this.getMargins();
+            this.maxTicks = null;
+            q(a,
+            function(a) {
+                a.setTickPositions(!0);
+                a.setMaxTicks()
+            });
+            this.adjustTickAmounts();
+            this.getMargins();
+            this.drawChartBox();
+            this.hasCartesianSeries && q(a,
+            function(a) {
+                a.render()
+            });
+            if (!this.seriesGroup) this.seriesGroup = b.g("series-group").attr({
+                zIndex: 3
+            }).add();
+            this.renderSeries();
+            this.renderLabels();
+            this.showCredits(c.credits);
+            this.hasRendered = !0
+        },
+        showCredits: function(a) {
+            if (a.enabled && !this.credits) this.credits = this.renderer.text(a.text, 0, 0).on("click",
+            function() {
+                if (a.href) location.href = a.href
+            }).attr({
+                align: a.position.align,
+                zIndex: 8
+            }).css(a.style).add().align(a.position)
+        },
+        destroy: function() {
+            var a = this,
+            b = a.axes,
+            c = a.series,
+            d = a.container,
+            e, f = d && d.parentNode;
+            K(a, "destroy");
+            W[a.index] = t;
+            $a--;
+            a.renderTo.removeAttribute("data-highcharts-chart");
+            X(a);
+            for (e = b.length; e--;) b[e] = b[e].destroy();
+            for (e = c.length; e--;) c[e] = c[e].destroy();
+            q("title,subtitle,chartBackground,plotBackground,plotBGImage,plotBorder,seriesGroup,clipRect,credits,pointer,scroller,rangeSelector,legend,resetZoomButton,tooltip,renderer".split(","),
+            function(b) {
+                var c = a[b];
+                c && c.destroy && (a[b] = c.destroy())
+            });
+            if (d) d.innerHTML = "",
+            X(d),
+            f && Pa(d);
+            for (e in a) delete a[e]
+        },
+        isReadyToRender: function() {
+            var a = this;
+            return ! ba && H == H.top && x.readyState !== "complete" || ga && !H.canvg ? (ga ? Lb.push(function() {
+                a.firstRender()
+            },
+            a.options.global.canvasToolsURL) : x.attachEvent("onreadystatechange",
+            function() {
+                x.detachEvent("onreadystatechange", a.firstRender);
+                x.readyState === "complete" && a.firstRender()
+            }), !1) : !0
+        },
+        firstRender: function() {
+            var a = this,
+            b = a.options,
+            c = a.callback;
+            if (a.isReadyToRender()) {
+                a.getContainer();
+                K(a, "init");
+                a.resetMargins();
+                a.setChartSize();
+                a.propFromSeries();
+                a.getAxes();
+                q(b.series || [],
+                function(b) {
+                    a.initSeries(b)
+                });
+                a.linkSeries();
+                K(a, "beforeRender");
+                if (S.Pointer) a.pointer = new Va(a, b);
+                a.render();
+                a.renderer.draw();
+                c && c.apply(a, [a]);
+                q(a.callbacks,
+                function(b) {
+                    b.apply(a, [a])
+                });
+                a.cloneRenderTo(!0);
+                K(a, "load")
+            }
+        },
+        splashArray: function(a, b) {
+            var c = b[a],
+            c = da(c) ? c: [c, c, c, c];
+            return [p(b[a + "Top"], c[0]), p(b[a + "Right"], c[1]), p(b[a + "Bottom"], c[2]), p(b[a + "Left"], c[3])]
+        }
+    };
+    Xa.prototype.callbacks = [];
+    Z = S.CenteredSeriesMixin = {
+        getCenter: function() {
+            var a = this.options,
+            b = this.chart,
+            c = 2 * (a.slicedOffset || 0),
+            d,
+            e = b.plotWidth - 2 * c,
+            f = b.plotHeight - 2 * c,
+            b = a.center,
+            a = [p(b[0], "50%"), p(b[1], "50%"), a.size || "100%", a.innerSize || 0],
+            g = C(e, f),
+            h;
+            return Ua(a,
+            function(a, b) {
+                h = /%$/.test(a);
+                d = b < 2 || b === 2 && h;
+                return (h ? [e, f, g, g][b] * z(a) / 100 : a) + (d ? c: 0)
+            })
+        }
+    };
+    var Ea = function() {};
+    Ea.prototype = {
+        init: function(a, b, c) {
+            this.series = a;
+            this.applyOptions(b, c);
+            this.pointAttr = {};
+            if (a.options.colorByPoint && (b = a.options.colors || a.chart.options.colors, this.color = this.color || b[a.colorCounter++], a.colorCounter === b.length)) a.colorCounter = 0;
+            a.chart.pointCount++;
+            return this
+        },
+        applyOptions: function(a, b) {
+            var c = this.series,
+            d = c.options.pointValKey || c.pointValKey,
+            a = Ea.prototype.optionsToObject.call(this, a);
+            r(this, a);
+            this.options = this.options ? r(this.options, a) : a;
+            if (d) this.y = this[d];
+            if (this.x === t && c) this.x = b === t ? c.autoIncrement() : b;
+            return this
+        },
+        optionsToObject: function(a) {
+            var b = {},
+            c = this.series,
+            d = c.pointArrayMap || ["y"],
+            e = d.length,
+            f = 0,
+            g = 0;
+            if (typeof a === "number" || a === null) b[d[0]] = a;
+            else if (La(a)) {
+                if (a.length > e) {
+                    c = typeof a[0];
+                    if (c === "string") b.name = a[0];
+                    else if (c === "number") b.x = a[0];
+                    f++
+                }
+                for (; g < e;) b[d[g++]] = a[f++]
+            } else if (typeof a === "object") {
+                b = a;
+                if (a.dataLabels) c._hasPointLabels = !0;
+                if (a.marker) c._hasPointMarkers = !0
+            }
+            return b
+        },
+        destroy: function() {
+            var a = this.series.chart,
+            b = a.hoverPoints,
+            c;
+            a.pointCount--;
+            if (b && (this.setState(), ka(b, this), !b.length)) a.hoverPoints = null;
+            if (this === a.hoverPoint) this.onMouseOut();
+            if (this.graphic || this.dataLabel) X(this),
+            this.destroyElements();
+            this.legendItem && a.legend.destroyItem(this);
+            for (c in this) this[c] = null
+        },
+        destroyElements: function() {
+            for (var a = "graphic,dataLabel,dataLabelUpper,group,connector,shadowGroup".split(","), b, c = 6; c--;) b = a[c],
+            this[b] && (this[b] = this[b].destroy())
+        },
+        getLabelConfig: function() {
+            return {
+                x: this.category,
+                y: this.y,
+                key: this.name || this.category,
+                series: this.series,
+                point: this,
+                percentage: this.percentage,
+                total: this.total || this.stackTotal
+            }
+        },
+        tooltipFormatter: function(a) {
+            var b = this.series,
+            c = b.tooltipOptions,
+            d = p(c.valueDecimals, ""),
+            e = c.valuePrefix || "",
+            f = c.valueSuffix || "";
+            q(b.pointArrayMap || ["y"],
+            function(b) {
+                b = "{point." + b;
+                if (e || f) a = a.replace(b + "}", e + b + "}" + f);
+                a = a.replace(b + "}", b + ":,." + d + "f}")
+            });
+            return Ia(a, {
+                point: this,
+                series: this.series
+            })
+        },
+        firePointEvent: function(a, b, c) {
+            var d = this,
+            e = this.series.options; (e.point.events[a] || d.options && d.options.events && d.options.events[a]) && this.importEvents();
+            a === "click" && e.allowPointSelect && (c = function(a) {
+                d.select(null, a.ctrlKey || a.metaKey || a.shiftKey)
+            });
+            K(this, a, b, c)
+        }
+    };
+    var O = function() {};
+    O.prototype = {
+        isCartesian: !0,
+        type: "line",
+        pointClass: Ea,
+        sorted: !0,
+        requireSorting: !0,
+        pointAttrToOptions: {
+            stroke: "lineColor",
+            "stroke-width": "lineWidth",
+            fill: "fillColor",
+            r: "radius"
+        },
+        axisTypes: ["xAxis", "yAxis"],
+        colorCounter: 0,
+        parallelArrays: ["x", "y"],
+        init: function(a, b) {
+            var c = this,
+            d, e, f = a.series,
+            g = function(a, b) {
+                return p(a.options.index, a._i) - p(b.options.index, b._i)
+            };
+            c.chart = a;
+            c.options = b = c.setOptions(b);
+            c.linkedSeries = [];
+            c.bindAxes();
+            r(c, {
+                name: b.name,
+                state: "",
+                pointAttr: {},
+                visible: b.visible !== !1,
+                selected: b.selected === !0
+            });
+            if (ga) b.animation = !1;
+            e = b.events;
+            for (d in e) N(c, d, e[d]);
+            if (e && e.click || b.point && b.point.events && b.point.events.click || b.allowPointSelect) a.runTrackerClick = !0;
+            c.getColor();
+            c.getSymbol();
+            q(c.parallelArrays,
+            function(a) {
+                c[a + "Data"] = []
+            });
+            c.setData(b.data, !1);
+            if (c.isCartesian) a.hasCartesianSeries = !0;
+            f.push(c);
+            c._i = f.length - 1;
+            nb(f, g);
+            this.yAxis && nb(this.yAxis.series, g);
+            q(f,
+            function(a, b) {
+                a.index = b;
+                a.name = a.name || "Series " + (b + 1)
+            })
+        },
+        bindAxes: function() {
+            var a = this,
+            b = a.options,
+            c = a.chart,
+            d;
+            q(a.axisTypes || [],
+            function(e) {
+                q(c[e],
+                function(c) {
+                    d = c.options;
+                    if (b[e] === d.index || b[e] !== t && b[e] === d.id || b[e] === t && d.index === 0) c.series.push(a),
+                    a[e] = c,
+                    c.isDirty = !0
+                }); ! a[e] && a.optionalAxis !== e && oa(18, !0)
+            })
+        },
+        updateParallelArrays: function(a, b) {
+            var c = a.series,
+            d = arguments;
+            q(c.parallelArrays, typeof b === "number" ?
+            function(d) {
+                var f = d === "y" && c.toYData ? c.toYData(a) : a[d];
+                c[d + "Data"][b] = f
+            }: function(a) {
+                Array.prototype[b].apply(c[a + "Data"], Array.prototype.slice.call(d, 2))
+            })
+        },
+        autoIncrement: function() {
+            var a = this.options,
+            b = this.xIncrement,
+            b = p(b, a.pointStart, 0);
+            this.pointInterval = p(this.pointInterval, a.pointInterval, 1);
+            this.xIncrement = b + this.pointInterval;
+            return b
+        },
+        getSegments: function() {
+            var a = -1,
+            b = [],
+            c,
+            d = this.points,
+            e = d.length;
+            if (e) if (this.options.connectNulls) {
+                for (c = e; c--;) d[c].y === null && d.splice(c, 1);
+                d.length && (b = [d])
+            } else q(d,
+            function(c, g) {
+                c.y === null ? (g > a + 1 && b.push(d.slice(a + 1, g)), a = g) : g === e - 1 && b.push(d.slice(a + 1, g + 1))
+            });
+            this.segments = b
+        },
+        setOptions: function(a) {
+            var b = this.chart,
+            c = b.options.plotOptions,
+            b = b.userOptions || {},
+            d = b.plotOptions || {},
+            e = c[this.type];
+            this.userOptions = a;
+            c = w(e, c.series, a);
+            this.tooltipOptions = w(L.tooltip, L.plotOptions[this.type].tooltip, b.tooltip, d.series && d.series.tooltip, d[this.type] && d[this.type].tooltip, a.tooltip);
+            e.marker === null && delete c.marker;
+            return c
+        },
+        getCyclic: function(a, b, c) {
+            var d = this.userOptions,
+            e = "_" + a + "Index",
+            f = a + "Counter";
+            b || (s(d[e]) ? b = d[e] : (d[e] = b = this.chart[f] % c.length, this.chart[f] += 1), b = c[b]);
+            this[a] = b
+        },
+        getColor: function() {
+            this.options.colorByPoint || this.getCyclic("color", this.options.color || ca[this.type].color, this.chart.options.colors)
+        },
+        getSymbol: function() {
+            var a = this.options.marker;
+            this.getCyclic("symbol", a.symbol, this.chart.options.symbols);
+            if (/^url/.test(this.symbol)) a.radius = 0
+        },
+        drawLegendSymbol: M.drawLineMarker,
+        setData: function(a, b, c, d) {
+            var e = this,
+            f = e.points,
+            g = f && f.length || 0,
+            h, i = e.options,
+            j = e.chart,
+            k = null,
+            l = e.xAxis,
+            m = l && !!l.categories,
+            n = e.tooltipPoints,
+            o = i.turboThreshold,
+            r = this.xData,
+            u = this.yData,
+            s = (h = e.pointArrayMap) && h.length,
+            a = a || [];
+            h = a.length;
+            b = p(b, !0);
+            if (d !== !1 && h && g === h && !e.cropped && !e.hasGroupedData) q(a,
+            function(a, b) {
+                f[b].update(a, !1)
+            });
+            else {
+                e.xIncrement = null;
+                e.pointRange = m ? 1 : i.pointRange;
+                e.colorCounter = 0;
+                q(this.parallelArrays,
+                function(a) {
+                    e[a + "Data"].length = 0
+                });
+                if (o && h > o) {
+                    for (c = 0; k === null && c < h;) k = a[c],
+                    c++;
+                    if (ia(k)) {
+                        m = p(i.pointStart, 0);
+                        i = p(i.pointInterval, 1);
+                        for (c = 0; c < h; c++) r[c] = m,
+                        u[c] = a[c],
+                        m += i;
+                        e.xIncrement = m
+                    } else if (La(k)) if (s) for (c = 0; c < h; c++) i = a[c],
+                    r[c] = i[0],
+                    u[c] = i.slice(1, s + 1);
+                    else for (c = 0; c < h; c++) i = a[c],
+                    r[c] = i[0],
+                    u[c] = i[1];
+                    else oa(12)
+                } else for (c = 0; c < h; c++) if (a[c] !== t && (i = {
+                    series: e
+                },
+                e.pointClass.prototype.applyOptions.apply(i, [a[c]]), e.updateParallelArrays(i, c), m && i.name)) l.names[i.x] = i.name;
+                Fa(u[0]) && oa(14, !0);
+                e.data = [];
+                e.options.data = a;
+                for (c = g; c--;) f[c] && f[c].destroy && f[c].destroy();
+                if (n) n.length = 0;
+                if (l) l.minRange = l.userMinRange;
+                e.isDirty = e.isDirtyData = j.isDirtyBox = !0;
+                c = !1
+            }
+            b && j.redraw(c)
+        },
+        processData: function(a) {
+            var b = this.xData,
+            c = this.yData,
+            d = b.length,
+            e;
+            e = 0;
+            var f, g, h = this.xAxis,
+            i = this.options,
+            j = i.cropThreshold,
+            k = 0,
+            l = this.isCartesian,
+            m, n;
+            if (l && !this.isDirty && !h.isDirty && !this.yAxis.isDirty && !a) return ! 1;
+            if (l && this.sorted && (!j || d > j || this.forceCrop)) if (m = h.getExtremes(), n = m.min, m = m.max, b[d - 1] < n || b[0] > m) b = [],
+            c = [];
+            else if (b[0] < n || b[d - 1] > m) e = this.cropData(this.xData, this.yData, n, m),
+            b = e.xData,
+            c = e.yData,
+            e = e.start,
+            f = !0,
+            k = b.length;
+            for (a = b.length - 1; a >= 0; a--) d = b[a] - b[a - 1],
+            !f && b[a] > n && b[a] < m && k++,
+            d > 0 && (g === t || d < g) ? g = d: d < 0 && this.requireSorting && oa(15);
+            this.cropped = f;
+            this.cropStart = e;
+            this.processedXData = b;
+            this.processedYData = c;
+            this.activePointCount = k;
+            if (i.pointRange === null) this.pointRange = g || 1;
+            this.closestPointRange = g
+        },
+        cropData: function(a, b, c, d) {
+            var e = a.length,
+            f = 0,
+            g = e,
+            h = p(this.cropShoulder, 1),
+            i;
+            for (i = 0; i < e; i++) if (a[i] >= c) {
+                f = u(0, i - h);
+                break
+            }
+            for (; i < e; i++) if (a[i] > d) {
+                g = i + h;
+                break
+            }
+            return {
+                xData: a.slice(f, g),
+                yData: b.slice(f, g),
+                start: f,
+                end: g
+            }
+        },
+        generatePoints: function() {
+            var a = this.options.data,
+            b = this.data,
+            c, d = this.processedXData,
+            e = this.processedYData,
+            f = this.pointClass,
+            g = d.length,
+            h = this.cropStart || 0,
+            i, j = this.hasGroupedData,
+            k, l = [],
+            m;
+            if (!b && !j) b = [],
+            b.length = a.length,
+            b = this.data = b;
+            for (m = 0; m < g; m++) i = h + m,
+            j ? l[m] = (new f).init(this, [d[m]].concat(ra(e[m]))) : (b[i] ? k = b[i] : a[i] !== t && (b[i] = k = (new f).init(this, a[i], d[m])), l[m] = k);
+            if (b && (g !== (c = b.length) || j)) for (m = 0; m < c; m++) if (m === h && !j && (m += g), b[m]) b[m].destroyElements(),
+            b[m].plotX = t;
+            this.data = b;
+            this.points = l
+        },
+        getExtremes: function(a) {
+            var b = this.yAxis,
+            c = this.processedXData,
+            d, e = [],
+            f = 0;
+            d = this.xAxis.getExtremes();
+            var g = d.min,
+            h = d.max,
+            i, j, k, l, a = a || this.stackedYData || this.processedYData;
+            d = a.length;
+            for (l = 0; l < d; l++) if (j = c[l], k = a[l], i = k !== null && k !== t && (!b.isLog || k.length || k > 0), j = this.getExtremesFromAll || this.cropped || (c[l + 1] || j) >= g && (c[l - 1] || j) <= h, i && j) if (i = k.length) for (; i--;) k[i] !== null && (e[f++] = k[i]);
+            else e[f++] = k;
+            this.dataMin = p(void 0, Na(e));
+            this.dataMax = p(void 0, Ba(e))
+        },
+        translate: function() {
+            this.processedXData || this.processData();
+            this.generatePoints();
+            for (var a = this.options,
+            b = a.stacking,
+            c = this.xAxis,
+            d = c.categories,
+            e = this.yAxis,
+            f = this.points,
+            g = f.length,
+            h = !!this.modifyValue,
+            i = a.pointPlacement,
+            j = i === "between" || ia(i), k = a.threshold, a = 0; a < g; a++) {
+                var l = f[a],
+                m = l.x,
+                n = l.y,
+                o = l.low,
+                q = b && e.stacks[(this.negStacks && n < k ? "-": "") + this.stackKey];
+                if (e.isLog && n <= 0) l.y = n = null;
+                l.plotX = c.translate(m, 0, 0, 0, 1, i, this.type === "flags");
+                if (b && this.visible && q && q[m]) q = q[m],
+                n = q.points[this.index + "," + a],
+                o = n[0],
+                n = n[1],
+                o === 0 && (o = p(k, e.min)),
+                e.isLog && o <= 0 && (o = null),
+                l.total = l.stackTotal = q.total,
+                l.percentage = q.total && l.y / q.total * 100,
+                l.stackY = n,
+                q.setOffset(this.pointXOffset || 0, this.barW || 0);
+                l.yBottom = s(o) ? e.translate(o, 0, 1, 0, 1) : null;
+                h && (n = this.modifyValue(n, l));
+                l.plotY = typeof n === "number" && n !== Infinity ? e.translate(n, 0, 1, 0, 1) : t;
+                l.clientX = j ? c.translate(m, 0, 0, 0, 1) : l.plotX;
+                l.negative = l.y < (k || 0);
+                l.category = d && d[l.x] !== t ? d[l.x] : l.x
+            }
+            this.getSegments()
+        },
+        animate: function(a) {
+            var b = this.chart,
+            c = b.renderer,
+            d;
+            d = this.options.animation;
+            var e = this.clipBox || b.clipBox,
+            f = b.inverted,
+            g;
+            if (d && !da(d)) d = ca[this.type].animation;
+            g = ["_sharedClip", d.duration, d.easing, e.height].join(",");
+            a ? (a = b[g], d = b[g + "m"], a || (b[g] = a = c.clipRect(r(e, {
+                width: 0
+            })), b[g + "m"] = d = c.clipRect( - 99, f ? -b.plotLeft: -b.plotTop, 99, f ? b.chartWidth: b.chartHeight)), this.group.clip(a), this.markerGroup.clip(d), this.sharedClipKey = g) : ((a = b[g]) && a.animate({
+                width: b.plotSizeX
+            },
+            d), b[g + "m"] && b[g + "m"].animate({
+                width: b.plotSizeX + 99
+            },
+            d), this.animate = null)
+        },
+        afterAnimate: function() {
+            var a = this.chart,
+            b = this.sharedClipKey,
+            c = this.group,
+            d = this.clipBox;
+            if (c && this.options.clip !== !1) {
+                if (!b || !d) c.clip(d ? a.renderer.clipRect(d) : a.clipRect);
+                this.markerGroup.clip()
+            }
+            K(this, "afterAnimate");
+            setTimeout(function() {
+                b && a[b] && (d || (a[b] = a[b].destroy()), a[b + "m"] && (a[b + "m"] = a[b + "m"].destroy()))
+            },
+            100)
+        },
+        drawPoints: function() {
+            var a, b = this.points,
+            c = this.chart,
+            d, e, f, g, h, i, j, k;
+            d = this.options.marker;
+            var l = this.pointAttr[""],
+            m,
+            n = this.markerGroup,
+            o = p(d.enabled, this.activePointCount < 0.5 * this.xAxis.len / d.radius);
+            if (d.enabled !== !1 || this._hasPointMarkers) for (f = b.length; f--;) if (g = b[f], d = U(g.plotX), e = g.plotY, k = g.graphic, i = g.marker || {},
+            a = o && i.enabled === t || i.enabled, m = c.isInsidePlot(v(d), e, c.inverted), a && e !== t && !isNaN(e) && g.y !== null) if (a = g.pointAttr[g.selected ? "select": ""] || l, h = a.r, i = p(i.symbol, this.symbol), j = i.indexOf("url") === 0, k) k[m ? "show": "hide"](!0).animate(r({
+                x: d - h,
+                y: e - h
+            },
+            k.symbolName ? {
+                width: 2 * h,
+                height: 2 * h
+            }: {}));
+            else {
+                if (m && (h > 0 || j)) g.graphic = c.renderer.symbol(i, d - h, e - h, 2 * h, 2 * h).attr(a).add(n)
+            } else if (k) g.graphic = k.destroy()
+        },
+        convertAttribs: function(a, b, c, d) {
+            var e = this.pointAttrToOptions,
+            f, g, h = {},
+            a = a || {},
+            b = b || {},
+            c = c || {},
+            d = d || {};
+            for (f in e) g = e[f],
+            h[f] = p(a[g], b[f], c[f], d[f]);
+            return h
+        },
+        getAttribs: function() {
+            var a = this,
+            b = a.options,
+            c = ca[a.type].marker ? b.marker: b,
+            d = c.states,
+            e = d.hover,
+            f,
+            g = a.color;
+            f = {
+                stroke: g,
+                fill: g
+            };
+            var h = a.points || [],
+            i,
+            j = [],
+            k,
+            l = a.pointAttrToOptions;
+            k = a.hasPointSpecificOptions;
+            var m = b.negativeColor,
+            n = c.lineColor,
+            o = c.fillColor;
+            i = b.turboThreshold;
+            var p;
+            b.marker ? (e.radius = e.radius || c.radius + e.radiusPlus, e.lineWidth = e.lineWidth || c.lineWidth + e.lineWidthPlus) : e.color = e.color || ya(e.color || g).brighten(e.brightness).get();
+            j[""] = a.convertAttribs(c, f);
+            q(["hover", "select"],
+            function(b) {
+                j[b] = a.convertAttribs(d[b], j[""])
+            });
+            a.pointAttr = j;
+            g = h.length;
+            if (!i || g < i || k) for (; g--;) {
+                i = h[g];
+                if ((c = i.options && i.options.marker || i.options) && c.enabled === !1) c.radius = 0;
+                if (i.negative && m) i.color = i.fillColor = m;
+                k = b.colorByPoint || i.color;
+                if (i.options) for (p in l) s(c[l[p]]) && (k = !0);
+                if (k) {
+                    c = c || {};
+                    k = [];
+                    d = c.states || {};
+                    f = d.hover = d.hover || {};
+                    if (!b.marker) f.color = f.color || !i.options.color && e.color || ya(i.color).brighten(f.brightness || e.brightness).get();
+                    f = {
+                        color: i.color
+                    };
+                    if (!o) f.fillColor = i.color;
+                    if (!n) f.lineColor = i.color;
+                    k[""] = a.convertAttribs(r(f, c), j[""]);
+                    k.hover = a.convertAttribs(d.hover, j.hover, k[""]);
+                    k.select = a.convertAttribs(d.select, j.select, k[""])
+                } else k = j;
+                i.pointAttr = k
+            }
+        },
+        destroy: function() {
+            var a = this,
+            b = a.chart,
+            c = /AppleWebKit\/533/.test(wa),
+            d,
+            e,
+            f = a.data || [],
+            g,
+            h,
+            i;
+            K(a, "destroy");
+            X(a);
+            q(a.axisTypes || [],
+            function(b) {
+                if (i = a[b]) ka(i.series, a),
+                i.isDirty = i.forceRedraw = !0
+            });
+            a.legendItem && a.chart.legend.destroyItem(a);
+            for (e = f.length; e--;)(g = f[e]) && g.destroy && g.destroy();
+            a.points = null;
+            clearTimeout(a.animationTimeout);
+            q("area,graph,dataLabelsGroup,group,markerGroup,tracker,graphNeg,areaNeg,posClip,negClip".split(","),
+            function(b) {
+                a[b] && (d = c && b === "group" ? "hide": "destroy", a[b][d]())
+            });
+            if (b.hoverSeries === a) b.hoverSeries = null;
+            ka(b.series, a);
+            for (h in a) delete a[h]
+        },
+        getSegmentPath: function(a) {
+            var b = this,
+            c = [],
+            d = b.options.step;
+            q(a,
+            function(e, f) {
+                var g = e.plotX,
+                h = e.plotY,
+                i;
+                b.getPointSpline ? c.push.apply(c, b.getPointSpline(a, e, f)) : (c.push(f ? "L": "M"), d && f && (i = a[f - 1], d === "right" ? c.push(i.plotX, h) : d === "center" ? c.push((i.plotX + g) / 2, i.plotY, (i.plotX + g) / 2, h) : c.push(g, i.plotY)), c.push(e.plotX, e.plotY))
+            });
+            return c
+        },
+        getGraphPath: function() {
+            var a = this,
+            b = [],
+            c,
+            d = [];
+            q(a.segments,
+            function(e) {
+                c = a.getSegmentPath(e);
+                e.length > 1 ? b = b.concat(c) : d.push(e[0])
+            });
+            a.singlePoints = d;
+            return a.graphPath = b
+        },
+        drawGraph: function() {
+            var a = this,
+            b = this.options,
+            c = [["graph", b.lineColor || this.color]],
+            d = b.lineWidth,
+            e = b.dashStyle,
+            f = b.linecap !== "square",
+            g = this.getGraphPath(),
+            h = b.negativeColor;
+            h && c.push(["graphNeg", h]);
+            q(c,
+            function(c, h) {
+                var k = c[0],
+                l = a[k];
+                if (l) ab(l),
+                l.animate({
+                    d: g
+                });
+                else if (d && g.length) l = {
+                    stroke: c[1],
+                    "stroke-width": d,
+                    fill: P,
+                    zIndex: 1
+                },
+                e ? l.dashstyle = e: f && (l["stroke-linecap"] = l["stroke-linejoin"] = "round"),
+                a[k] = a.chart.renderer.path(g).attr(l).add(a.group).shadow(!h && b.shadow)
+            })
+        },
+        clipNeg: function() {
+            var a = this.options,
+            b = this.chart,
+            c = b.renderer,
+            d = a.negativeColor || a.negativeFillColor,
+            e, f = this.graph,
+            g = this.area,
+            h = this.posClip,
+            i = this.negClip;
+            e = b.chartWidth;
+            var j = b.chartHeight,
+            k = u(e, j),
+            l = this.yAxis;
+            if (d && (f || g)) {
+                d = v(l.toPixels(a.threshold || 0, !0));
+                d < 0 && (k -= d);
+                a = {
+                    x: 0,
+                    y: 0,
+                    width: k,
+                    height: d
+                };
+                k = {
+                    x: 0,
+                    y: d,
+                    width: k,
+                    height: k
+                };
+                if (b.inverted) a.height = k.y = b.plotWidth - d,
+                c.isVML && (a = {
+                    x: b.plotWidth - d - b.plotLeft,
+                    y: 0,
+                    width: e,
+                    height: j
+                },
+                k = {
+                    x: d + b.plotLeft - e,
+                    y: 0,
+                    width: b.plotLeft + d,
+                    height: e
+                });
+                l.reversed ? (b = k, e = a) : (b = a, e = k);
+                h ? (h.animate(b), i.animate(e)) : (this.posClip = h = c.clipRect(b), this.negClip = i = c.clipRect(e), f && this.graphNeg && (f.clip(h), this.graphNeg.clip(i)), g && (g.clip(h), this.areaNeg.clip(i)))
+            }
+        },
+        invertGroups: function() {
+            function a() {
+                var a = {
+                    width: b.yAxis.len,
+                    height: b.xAxis.len
+                };
+                q(["group", "markerGroup"],
+                function(c) {
+                    b[c] && b[c].attr(a).invert()
+                })
+            }
+            var b = this,
+            c = b.chart;
+            if (b.xAxis) N(c, "resize", a),
+            N(b, "destroy",
+            function() {
+                X(c, "resize", a)
+            }),
+            a(),
+            b.invertGroups = a
+        },
+        plotGroup: function(a, b, c, d, e) {
+            var f = this[a],
+            g = !f;
+            g && (this[a] = f = this.chart.renderer.g(b).attr({
+                visibility: c,
+                zIndex: d || 0.1
+            }).add(e));
+            f[g ? "attr": "animate"](this.getPlotBox());
+            return f
+        },
+        getPlotBox: function() {
+            var a = this.chart,
+            b = this.xAxis,
+            c = this.yAxis;
+            if (a.inverted) b = c,
+            c = this.xAxis;
+            return {
+                translateX: b ? b.left: a.plotLeft,
+                translateY: c ? c.top: a.plotTop,
+                scaleX: 1,
+                scaleY: 1
+            }
+        },
+        render: function() {
+            var a = this,
+            b = a.chart,
+            c, d = a.options,
+            e = (c = d.animation) && !!a.animate && b.renderer.isSVG && p(c.duration, 500) || 0,
+            f = a.visible ? "visible": "hidden",
+            g = d.zIndex,
+            h = a.hasRendered,
+            i = b.seriesGroup;
+            c = a.plotGroup("group", "series", f, g, i);
+            a.markerGroup = a.plotGroup("markerGroup", "markers", f, g, i);
+            e && a.animate(!0);
+            a.getAttribs();
+            c.inverted = a.isCartesian ? b.inverted: !1;
+            a.drawGraph && (a.drawGraph(), a.clipNeg());
+            a.drawDataLabels && a.drawDataLabels();
+            a.visible && a.drawPoints();
+            a.drawTracker && a.options.enableMouseTracking !== !1 && a.drawTracker();
+            b.inverted && a.invertGroups();
+            d.clip !== !1 && !a.sharedClipKey && !h && c.clip(b.clipRect);
+            e && a.animate();
+            if (!h) e ? a.animationTimeout = setTimeout(function() {
+                a.afterAnimate()
+            },
+            e) : a.afterAnimate();
+            a.isDirty = a.isDirtyData = !1;
+            a.hasRendered = !0
+        },
+        redraw: function() {
+            var a = this.chart,
+            b = this.isDirtyData,
+            c = this.group,
+            d = this.xAxis,
+            e = this.yAxis;
+            c && (a.inverted && c.attr({
+                width: a.plotWidth,
+                height: a.plotHeight
+            }), c.animate({
+                translateX: p(d && d.left, a.plotLeft),
+                translateY: p(e && e.top, a.plotTop)
+            }));
+            this.translate();
+            this.setTooltipPoints && this.setTooltipPoints(!0);
+            this.render();
+            b && K(this, "updatedData")
+        }
+    };
+    Fb.prototype = {
+        destroy: function() {
+            Oa(this, this.axis)
+        },
+        render: function(a) {
+            var b = this.options,
+            c = b.format,
+            c = c ? Ia(c, this) : b.formatter.call(this);
+            this.label ? this.label.attr({
+                text: c,
+                visibility: "hidden"
+            }) : this.label = this.axis.chart.renderer.text(c, null, null, b.useHTML).css(b.style).attr({
+                align: this.textAlign,
+                rotation: b.rotation,
+                visibility: "hidden"
+            }).add(a)
+        },
+        setOffset: function(a, b) {
+            var c = this.axis,
+            d = c.chart,
+            e = d.inverted,
+            f = this.isNegative,
+            g = c.translate(c.usePercentage ? 100 : this.total, 0, 0, 0, 1),
+            c = c.translate(0),
+            c = Q(g - c),
+            h = d.xAxis[0].translate(this.x) + a,
+            i = d.plotHeight,
+            f = {
+                x: e ? f ? g: g - c: h,
+                y: e ? i - h - b: f ? i - g - c: i - g,
+                width: e ? c: b,
+                height: e ? b: c
+            };
+            if (e = this.label) e.align(this.alignOptions, null, f),
+            f = e.alignAttr,
+            e[this.options.crop === !1 || d.isInsidePlot(f.x, f.y) ? "show": "hide"](!0)
+        }
+    };
+    ma.prototype.buildStacks = function() {
+        var a = this.series,
+        b = p(this.options.reversedStacks, !0),
+        c = a.length;
+        if (!this.isXAxis) {
+            for (this.usePercentage = !1; c--;) a[b ? c: a.length - c - 1].setStackedPoints();
+            if (this.usePercentage) for (c = 0; c < a.length; c++) a[c].setPercentStacks()
+        }
+    };
+    ma.prototype.renderStackTotals = function() {
+        var a = this.chart,
+        b = a.renderer,
+        c = this.stacks,
+        d, e, f = this.stackTotalGroup;
+        if (!f) this.stackTotalGroup = f = b.g("stack-labels").attr({
+            visibility: "visible",
+            zIndex: 6
+        }).add();
+        f.translate(a.plotLeft, a.plotTop);
+        for (d in c) for (e in a = c[d], a) a[e].render(f)
+    };
+    O.prototype.setStackedPoints = function() {
+        if (this.options.stacking && !(this.visible !== !0 && this.chart.options.chart.ignoreHiddenSeries !== !1)) {
+            var a = this.processedXData,
+            b = this.processedYData,
+            c = [],
+            d = b.length,
+            e = this.options,
+            f = e.threshold,
+            g = e.stack,
+            e = e.stacking,
+            h = this.stackKey,
+            i = "-" + h,
+            j = this.negStacks,
+            k = this.yAxis,
+            l = k.stacks,
+            m = k.oldStacks,
+            n,
+            o,
+            p,
+            q,
+            r,
+            s;
+            for (q = 0; q < d; q++) {
+                r = a[q];
+                s = b[q];
+                p = this.index + "," + q;
+                o = (n = j && s < f) ? i: h;
+                l[o] || (l[o] = {});
+                if (!l[o][r]) m[o] && m[o][r] ? (l[o][r] = m[o][r], l[o][r].total = null) : l[o][r] = new Fb(k, k.options.stackLabels, n, r, g);
+                o = l[o][r];
+                o.points[p] = [o.cum || 0];
+                e === "percent" ? (n = n ? h: i, j && l[n] && l[n][r] ? (n = l[n][r], o.total = n.total = u(n.total, o.total) + Q(s) || 0) : o.total = ea(o.total + (Q(s) || 0))) : o.total = ea(o.total + (s || 0));
+                o.cum = (o.cum || 0) + (s || 0);
+                o.points[p].push(o.cum);
+                c[q] = o.cum
+            }
+            if (e === "percent") k.usePercentage = !0;
+            this.stackedYData = c;
+            k.oldStacks = {}
+        }
+    };
+    O.prototype.setPercentStacks = function() {
+        var a = this,
+        b = a.stackKey,
+        c = a.yAxis.stacks,
+        d = a.processedXData;
+        q([b, "-" + b],
+        function(b) {
+            var e;
+            for (var f = d.length,
+            g, h; f--;) if (g = d[f], e = (h = c[b] && c[b][g]) && h.points[a.index + "," + f], g = e) h = h.total ? 100 / h.total: 0,
+            g[0] = ea(g[0] * h),
+            g[1] = ea(g[1] * h),
+            a.stackedYData[f] = g[1]
+        })
+    };
+    r(Xa.prototype, {
+        addSeries: function(a, b, c) {
+            var d, e = this;
+            a && (b = p(b, !0), K(e, "addSeries", {
+                options: a
+            },
+            function() {
+                d = e.initSeries(a);
+                e.isDirtyLegend = !0;
+                e.linkSeries();
+                b && e.redraw(c)
+            }));
+            return d
+        },
+        addAxis: function(a, b, c, d) {
+            var e = b ? "xAxis": "yAxis",
+            f = this.options;
+            new ma(this, w(a, {
+                index: this[e].length,
+                isX: b
+            }));
+            f[e] = ra(f[e] || {});
+            f[e].push(a);
+            p(c, !0) && this.redraw(d)
+        },
+        showLoading: function(a) {
+            var b = this,
+            c = b.options,
+            d = b.loadingDiv,
+            e = c.loading,
+            f = function() {
+                d && A(d, {
+                    left: b.plotLeft + "px",
+                    top: b.plotTop + "px",
+                    width: b.plotWidth + "px",
+                    height: b.plotHeight + "px"
+                })
+            };
+            if (!d) b.loadingDiv = d = $(Ja, {
+                className: "highcharts-loading"
+            },
+            r(e.style, {
+                zIndex: 10,
+                display: P
+            }), b.container),
+            b.loadingSpan = $("span", null, e.labelStyle, d),
+            N(b, "redraw", f);
+            b.loadingSpan.innerHTML = a || c.lang.loading;
+            if (!b.loadingShown) A(d, {
+                opacity: 0,
+                display: ""
+            }),
+            ib(d, {
+                opacity: e.style.opacity
+            },
+            {
+                duration: e.showDuration || 0
+            }),
+            b.loadingShown = !0;
+            f()
+        },
+        hideLoading: function() {
+            var a = this.options,
+            b = this.loadingDiv;
+            b && ib(b, {
+                opacity: 0
+            },
+            {
+                duration: a.loading.hideDuration || 100,
+                complete: function() {
+                    A(b, {
+                        display: P
+                    })
+                }
+            });
+            this.loadingShown = !1
+        }
+    });
+    r(Ea.prototype, {
+        update: function(a, b, c) {
+            var d = this,
+            e = d.series,
+            f = d.graphic,
+            g, h = e.data,
+            i = e.chart,
+            j = e.options,
+            b = p(b, !0);
+            d.firePointEvent("update", {
+                options: a
+            },
+            function() {
+                d.applyOptions(a);
+                if (da(a)) {
+                    e.getAttribs();
+                    if (f) a && a.marker && a.marker.symbol ? d.graphic = f.destroy() : f.attr(d.pointAttr[d.state || ""]);
+                    if (a && a.dataLabels && d.dataLabel) d.dataLabel = d.dataLabel.destroy()
+                }
+                g = Da(d, h);
+                e.updateParallelArrays(d, g);
+                j.data[g] = d.options;
+                e.isDirty = e.isDirtyData = !0;
+                if (!e.fixedBox && e.hasCartesianSeries) i.isDirtyBox = !0;
+                j.legendType === "point" && i.legend.destroyItem(d);
+                b && i.redraw(c)
+            })
+        },
+        remove: function(a, b) {
+            var c = this,
+            d = c.series,
+            e = d.points,
+            f = d.chart,
+            g, h = d.data;
+            Qa(b, f);
+            a = p(a, !0);
+            c.firePointEvent("remove", null,
+            function() {
+                g = Da(c, h);
+                h.length === e.length && e.splice(g, 1);
+                h.splice(g, 1);
+                d.options.data.splice(g, 1);
+                d.updateParallelArrays(c, "splice", g, 1);
+                c.destroy();
+                d.isDirty = !0;
+                d.isDirtyData = !0;
+                a && f.redraw()
+            })
+        }
+    });
+    r(O.prototype, {
+        addPoint: function(a, b, c, d) {
+            var e = this.options,
+            f = this.data,
+            g = this.graph,
+            h = this.area,
+            i = this.chart,
+            j = this.xAxis && this.xAxis.names,
+            k = g && g.shift || 0,
+            l = e.data,
+            m, n = this.xData;
+            Qa(d, i);
+            c && q([g, h, this.graphNeg, this.areaNeg],
+            function(a) {
+                if (a) a.shift = k + 1
+            });
+            if (h) h.isArea = !0;
+            b = p(b, !0);
+            d = {
+                series: this
+            };
+            this.pointClass.prototype.applyOptions.apply(d, [a]);
+            g = d.x;
+            h = n.length;
+            if (this.requireSorting && g < n[h - 1]) for (m = !0; h && n[h - 1] > g;) h--;
+            this.updateParallelArrays(d, "splice", h, 0, 0);
+            this.updateParallelArrays(d, h);
+            if (j) j[g] = d.name;
+            l.splice(h, 0, a);
+            m && (this.data.splice(h, 0, null), this.processData());
+            e.legendType === "point" && this.generatePoints();
+            c && (f[0] && f[0].remove ? f[0].remove(!1) : (f.shift(), this.updateParallelArrays(d, "shift"), l.shift()));
+            this.isDirtyData = this.isDirty = !0;
+            b && (this.getAttribs(), i.redraw())
+        },
+        remove: function(a, b) {
+            var c = this,
+            d = c.chart,
+            a = p(a, !0);
+            if (!c.isRemoving) c.isRemoving = !0,
+            K(c, "remove", null,
+            function() {
+                c.destroy();
+                d.isDirtyLegend = d.isDirtyBox = !0;
+                d.linkSeries();
+                a && d.redraw(b)
+            });
+            c.isRemoving = !1
+        },
+        update: function(a, b) {
+            var c = this,
+            d = this.chart,
+            e = this.userOptions,
+            f = this.type,
+            g = J[f].prototype,
+            h = ["group", "markerGroup", "dataLabelsGroup"],
+            i;
+            q(h,
+            function(a) {
+                h[a] = c[a];
+                delete c[a]
+            });
+            a = w(e, {
+                animation: !1,
+                index: this.index,
+                pointStart: this.xData[0]
+            },
+            {
+                data: this.options.data
+            },
+            a);
+            this.remove(!1);
+            for (i in g) g.hasOwnProperty(i) && (this[i] = t);
+            r(this, J[a.type || f].prototype);
+            q(h,
+            function(a) {
+                c[a] = h[a]
+            });
+            this.init(d, a);
+            d.linkSeries();
+            p(b, !0) && d.redraw(!1)
+        }
+    });
+    r(ma.prototype, {
+        update: function(a, b) {
+            var c = this.chart,
+            a = c.options[this.coll][this.options.index] = w(this.userOptions, a);
+            this.destroy(!0);
+            this._addedPlotLB = t;
+            this.init(c, r(a, {
+                events: t
+            }));
+            c.isDirtyBox = !0;
+            p(b, !0) && c.redraw()
+        },
+        remove: function(a) {
+            for (var b = this.chart,
+            c = this.coll,
+            d = this.series,
+            e = d.length; e--;) d[e] && d[e].remove(!1);
+            ka(b.axes, this);
+            ka(b[c], this);
+            b.options[c].splice(this.options.index, 1);
+            q(b[c],
+            function(a, b) {
+                a.options.index = b
+            });
+            this.destroy();
+            b.isDirtyBox = !0;
+            p(a, !0) && b.redraw()
+        },
+        setTitle: function(a, b) {
+            this.update({
+                title: a
+            },
+            b)
+        },
+        setCategories: function(a, b) {
+            this.update({
+                categories: a
+            },
+            b)
+        }
+    });
+    ha = la(O);
+    J.line = ha;
+    ca.area = w(T, {
+        threshold: 0
+    });
+    var qa = la(O, {
+        type: "area",
+        getSegments: function() {
+            var a = this,
+            b = [],
+            c = [],
+            d = [],
+            e = this.xAxis,
+            f = this.yAxis,
+            g = f.stacks[this.stackKey],
+            h = {},
+            i,
+            j,
+            k = this.points,
+            l = this.options.connectNulls,
+            m,
+            n;
+            if (this.options.stacking && !this.cropped) {
+                for (m = 0; m < k.length; m++) h[k[m].x] = k[m];
+                for (n in g) g[n].total !== null && d.push( + n);
+                d.sort(function(a, b) {
+                    return a - b
+                });
+                q(d,
+                function(b) {
+                    var d = 0,
+                    k;
+                    if (!l || h[b] && h[b].y !== null) if (h[b]) c.push(h[b]);
+                    else {
+                        for (m = a.index; m <= f.series.length; m++) if (k = g[b].points[m + "," + b]) {
+                            d = k[1];
+                            break
+                        }
+                        i = e.translate(b);
+                        j = f.toPixels(d, !0);
+                        c.push({
+                            y: null,
+                            plotX: i,
+                            clientX: i,
+                            plotY: j,
+                            yBottom: j,
+                            onMouseOver: sa
+                        })
+                    }
+                });
+                c.length && b.push(c)
+            } else O.prototype.getSegments.call(this),
+            b = this.segments;
+            this.segments = b
+        },
+        getSegmentPath: function(a) {
+            var b = O.prototype.getSegmentPath.call(this, a),
+            c = [].concat(b),
+            d,
+            e = this.options;
+            d = b.length;
+            var f = this.yAxis.getThreshold(e.threshold),
+            g;
+            d === 3 && c.push("L", b[1], b[2]);
+            if (e.stacking && !this.closedStacks) for (d = a.length - 1; d >= 0; d--) g = p(a[d].yBottom, f),
+            d < a.length - 1 && e.step && c.push(a[d + 1].plotX, g),
+            c.push(a[d].plotX, g);
+            else this.closeSegment(c, a, f);
+            this.areaPath = this.areaPath.concat(c);
+            return b
+        },
+        closeSegment: function(a, b, c) {
+            a.push("L", b[b.length - 1].plotX, c, "L", b[0].plotX, c)
+        },
+        drawGraph: function() {
+            this.areaPath = [];
+            O.prototype.drawGraph.apply(this);
+            var a = this,
+            b = this.areaPath,
+            c = this.options,
+            d = c.negativeColor,
+            e = c.negativeFillColor,
+            f = [["area", this.color, c.fillColor]]; (d || e) && f.push(["areaNeg", d, e]);
+            q(f,
+            function(d) {
+                var e = d[0],
+                f = a[e];
+                f ? f.animate({
+                    d: b
+                }) : a[e] = a.chart.renderer.path(b).attr({
+                    fill: p(d[2], ya(d[1]).setOpacity(p(c.fillOpacity, 0.75)).get()),
+                    zIndex: 0
+                }).add(a.group)
+            })
+        },
+        drawLegendSymbol: M.drawRectangle
+    });
+    J.area = qa;
+    ca.spline = w(T);
+    ha = la(O, {
+        type: "spline",
+        getPointSpline: function(a, b, c) {
+            var d = b.plotX,
+            e = b.plotY,
+            f = a[c - 1],
+            g = a[c + 1],
+            h,
+            i,
+            j,
+            k;
+            if (f && g) {
+                a = f.plotY;
+                j = g.plotX;
+                var g = g.plotY,
+                l;
+                h = (1.5 * d + f.plotX) / 2.5;
+                i = (1.5 * e + a) / 2.5;
+                j = (1.5 * d + j) / 2.5;
+                k = (1.5 * e + g) / 2.5;
+                l = (k - i) * (j - d) / (j - h) + e - k;
+                i += l;
+                k += l;
+                i > a && i > e ? (i = u(a, e), k = 2 * e - i) : i < a && i < e && (i = C(a, e), k = 2 * e - i);
+                k > g && k > e ? (k = u(g, e), i = 2 * e - k) : k < g && k < e && (k = C(g, e), i = 2 * e - k);
+                b.rightContX = j;
+                b.rightContY = k
+            }
+            c ? (b = ["C", f.rightContX || f.plotX, f.rightContY || f.plotY, h || d, i || e, d, e], f.rightContX = f.rightContY = null) : b = ["M", d, e];
+            return b
+        }
+    });
+    J.spline = ha;
+    ca.areaspline = w(ca.area);
+    qa = qa.prototype;
+    ha = la(ha, {
+        type: "areaspline",
+        closedStacks: !0,
+        getSegmentPath: qa.getSegmentPath,
+        closeSegment: qa.closeSegment,
+        drawGraph: qa.drawGraph,
+        drawLegendSymbol: M.drawRectangle
+    });
+    J.areaspline = ha;
+    ca.column = w(T, {
+        borderColor: "#FFFFFF",
+        borderRadius: 0,
+        groupPadding: 0.2,
+        marker: null,
+        pointPadding: 0.1,
+        minPointLength: 0,
+        cropThreshold: 50,
+        pointRange: null,
+        states: {
+            hover: {
+                brightness: 0.1,
+                shadow: !1,
+                halo: !1
+            },
+            select: {
+                color: "#C0C0C0",
+                borderColor: "#000000",
+                shadow: !1
+            }
+        },
+        dataLabels: {
+            align: null,
+            verticalAlign: null,
+            y: null
+        },
+        stickyTracking: !1,
+        tooltip: {
+            distance: 6
+        },
+        threshold: 0
+    });
+    ha = la(O, {
+        type: "column",
+        pointAttrToOptions: {
+            stroke: "borderColor",
+            fill: "color",
+            r: "borderRadius"
+        },
+        cropShoulder: 0,
+        trackerGroups: ["group", "dataLabelsGroup"],
+        negStacks: !0,
+        init: function() {
+            O.prototype.init.apply(this, arguments);
+            var a = this,
+            b = a.chart;
+            b.hasRendered && q(b.series,
+            function(b) {
+                if (b.type === a.type) b.isDirty = !0
+            })
+        },
+        getColumnMetrics: function() {
+            var a = this,
+            b = a.options,
+            c = a.xAxis,
+            d = a.yAxis,
+            e = c.reversed,
+            f, g = {},
+            h, i = 0;
+            b.grouping === !1 ? i = 1 : q(a.chart.series,
+            function(b) {
+                var c = b.options,
+                e = b.yAxis;
+                if (b.type === a.type && b.visible && d.len === e.len && d.pos === e.pos) c.stacking ? (f = b.stackKey, g[f] === t && (g[f] = i++), h = g[f]) : c.grouping !== !1 && (h = i++),
+                b.columnIndex = h
+            });
+            var c = C(Q(c.transA) * (c.ordinalSlope || b.pointRange || c.closestPointRange || c.tickInterval || 1), c.len),
+            j = c * b.groupPadding,
+            k = (c - 2 * j) / i,
+            l = b.pointWidth,
+            b = s(l) ? (k - l) / 2 : k * b.pointPadding,
+            l = p(l, k - 2 * b);
+            return a.columnMetrics = {
+                width: l,
+                offset: b + (j + ((e ? i - (a.columnIndex || 0) : a.columnIndex) || 0) * k - c / 2) * (e ? -1 : 1)
+            }
+        },
+        translate: function() {
+            var a = this,
+            b = a.chart,
+            c = a.options,
+            d = a.borderWidth = p(c.borderWidth, a.activePointCount > 0.5 * a.xAxis.len ? 0 : 1),
+            e = a.yAxis,
+            f = a.translatedThreshold = e.getThreshold(c.threshold),
+            g = p(c.minPointLength, 5),
+            h = a.getColumnMetrics(),
+            i = h.width,
+            j = a.barW = u(i, 1 + 2 * d),
+            k = a.pointXOffset = h.offset,
+            l = -(d % 2 ? 0.5 : 0),
+            m = d % 2 ? 0.5 : 1;
+            b.renderer.isVML && b.inverted && (m += 1);
+            c.pointPadding && (j = Ka(j));
+            O.prototype.translate.apply(a);
+            q(a.points,
+            function(c) {
+                var d = p(c.yBottom, f),
+                h = C(u( - 999 - d, c.plotY), e.len + 999 + d),
+                q = c.plotX + k,
+                r = j,
+                s = C(h, d),
+                t;
+                t = u(h, d) - s;
+                Q(t) < g && g && (t = g, s = v(Q(s - f) > g ? d - g: f - (e.translate(c.y, 0, 1, 0, 1) <= f ? g: 0)));
+                c.barX = q;
+                c.pointWidth = i;
+                c.tooltipPos = b.inverted ? [e.len - h, a.xAxis.len - q - r / 2] : [q + r / 2, h];
+                r = v(q + r) + l;
+                q = v(q) + l;
+                r -= q;
+                d = Q(s) < 0.5;
+                t = v(s + t) + m;
+                s = v(s) + m;
+                t -= s;
+                d && (s -= 1, t += 1);
+                c.shapeType = "rect";
+                c.shapeArgs = {
+                    x: q,
+                    y: s,
+                    width: r,
+                    height: t
+                }
+            })
+        },
+        getSymbol: sa,
+        drawLegendSymbol: M.drawRectangle,
+        drawGraph: sa,
+        drawPoints: function() {
+            var a = this,
+            b = this.chart,
+            c = a.options,
+            d = b.renderer,
+            e = c.animationLimit || 250,
+            f, g;
+            q(a.points,
+            function(h) {
+                var i = h.plotY,
+                j = h.graphic;
+                if (i !== t && !isNaN(i) && h.y !== null) f = h.shapeArgs,
+                i = s(a.borderWidth) ? {
+                    "stroke-width": a.borderWidth
+                }: {},
+                g = h.pointAttr[h.selected ? "select": ""] || a.pointAttr[""],
+                j ? (ab(j), j.attr(i)[b.pointCount < e ? "animate": "attr"](w(f))) : h.graphic = d[h.shapeType](f).attr(g).attr(i).add(a.group).shadow(c.shadow, null, c.stacking && !c.borderRadius);
+                else if (j) h.graphic = j.destroy()
+            })
+        },
+        animate: function(a) {
+            var b = this.yAxis,
+            c = this.options,
+            d = this.chart.inverted,
+            e = {};
+            if (ba) a ? (e.scaleY = 0.001, a = C(b.pos + b.len, u(b.pos, b.toPixels(c.threshold))), d ? e.translateX = a - b.len: e.translateY = a, this.group.attr(e)) : (e.scaleY = 1, e[d ? "translateX": "translateY"] = b.pos, this.group.animate(e, this.options.animation), this.animate = null)
+        },
+        remove: function() {
+            var a = this,
+            b = a.chart;
+            b.hasRendered && q(b.series,
+            function(b) {
+                if (b.type === a.type) b.isDirty = !0
+            });
+            O.prototype.remove.apply(a, arguments)
+        }
+    });
+    J.column = ha;
+    ca.bar = w(ca.column);
+    qa = la(ha, {
+        type: "bar",
+        inverted: !0
+    });
+    J.bar = qa;
+    ca.scatter = w(T, {
+        lineWidth: 0,
+        tooltip: {
+            headerFormat: '<span style="color:{series.color}">●</span> <span style="font-size: 10px;"> {series.name}</span><br/>',
+            pointFormat: "x: <b>{point.x}</b><br/>y: <b>{point.y}</b><br/>"
+        },
+        stickyTracking: !1
+    });
+    qa = la(O, {
+        type: "scatter",
+        sorted: !1,
+        requireSorting: !1,
+        noSharedTooltip: !0,
+        trackerGroups: ["markerGroup", "dataLabelsGroup"],
+        takeOrdinalPosition: !1,
+        singularTooltips: !0,
+        drawGraph: function() {
+            this.options.lineWidth && O.prototype.drawGraph.call(this)
+        }
+    });
+    J.scatter = qa;
+    ca.pie = w(T, {
+        borderColor: "#FFFFFF",
+        borderWidth: 1,
+        center: [null, null],
+        clip: !1,
+        colorByPoint: !0,
+        dataLabels: {
+            distance: 30,
+            enabled: !0,
+            formatter: function() {
+                return this.point.name
+            }
+        },
+        ignoreHiddenPoint: !0,
+        legendType: "point",
+        marker: null,
+        size: null,
+        showInLegend: !1,
+        slicedOffset: 10,
+        states: {
+            hover: {
+                brightness: 0.1,
+                shadow: !1
+            }
+        },
+        stickyTracking: !1,
+        tooltip: {
+            followPointer: !0
+        }
+    });
+    T = {
+        type: "pie",
+        isCartesian: !1,
+        pointClass: la(Ea, {
+            init: function() {
+                Ea.prototype.init.apply(this, arguments);
+                var a = this,
+                b;
+                if (a.y < 0) a.y = null;
+                r(a, {
+                    visible: a.visible !== !1,
+                    name: p(a.name, "Slice")
+                });
+                b = function(b) {
+                    a.slice(b.type === "select")
+                };
+                N(a, "select", b);
+                N(a, "unselect", b);
+                return a
+            },
+            setVisible: function(a) {
+                var b = this,
+                c = b.series,
+                d = c.chart;
+                b.visible = b.options.visible = a = a === t ? !b.visible: a;
+                c.options.data[Da(b, c.data)] = b.options;
+                q(["graphic", "dataLabel", "connector", "shadowGroup"],
+                function(c) {
+                    if (b[c]) b[c][a ? "show": "hide"](!0)
+                });
+                b.legendItem && d.legend.colorizeItem(b, a);
+                if (!c.isDirty && c.options.ignoreHiddenPoint) c.isDirty = !0,
+                d.redraw()
+            },
+            slice: function(a, b, c) {
+                var d = this.series;
+                Qa(c, d.chart);
+                p(b, !0);
+                this.sliced = this.options.sliced = a = s(a) ? a: !this.sliced;
+                d.options.data[Da(this, d.data)] = this.options;
+                a = a ? this.slicedTranslation: {
+                    translateX: 0,
+                    translateY: 0
+                };
+                this.graphic.animate(a);
+                this.shadowGroup && this.shadowGroup.animate(a)
+            },
+            haloPath: function(a) {
+                var b = this.shapeArgs,
+                c = this.series.chart;
+                return this.sliced || !this.visible ? [] : this.series.chart.renderer.symbols.arc(c.plotLeft + b.x, c.plotTop + b.y, b.r + a, b.r + a, {
+                    innerR: this.shapeArgs.r,
+                    start: b.start,
+                    end: b.end
+                })
+            }
+        }),
+        requireSorting: !1,
+        noSharedTooltip: !0,
+        trackerGroups: ["group", "dataLabelsGroup"],
+        axisTypes: [],
+        pointAttrToOptions: {
+            stroke: "borderColor",
+            "stroke-width": "borderWidth",
+            fill: "color"
+        },
+        singularTooltips: !0,
+        getColor: sa,
+        animate: function(a) {
+            var b = this,
+            c = b.points,
+            d = b.startAngleRad;
+            if (!a) q(c,
+            function(a) {
+                var c = a.graphic,
+                a = a.shapeArgs;
+                c && (c.attr({
+                    r: b.center[3] / 2,
+                    start: d,
+                    end: d
+                }), c.animate({
+                    r: a.r,
+                    start: a.start,
+                    end: a.end
+                },
+                b.options.animation))
+            }),
+            b.animate = null
+        },
+        setData: function(a, b, c, d) {
+            O.prototype.setData.call(this, a, !1, c, d);
+            this.processData();
+            this.generatePoints();
+            p(b, !0) && this.chart.redraw(c)
+        },
+        generatePoints: function() {
+            var a, b = 0,
+            c, d, e, f = this.options.ignoreHiddenPoint;
+            O.prototype.generatePoints.call(this);
+            c = this.points;
+            d = c.length;
+            for (a = 0; a < d; a++) e = c[a],
+            b += f && !e.visible ? 0 : e.y;
+            this.total = b;
+            for (a = 0; a < d; a++) e = c[a],
+            e.percentage = b > 0 ? e.y / b * 100 : 0,
+            e.total = b
+        },
+        translate: function(a) {
+            this.generatePoints();
+            var b = 0,
+            c = this.options,
+            d = c.slicedOffset,
+            e = d + c.borderWidth,
+            f, g, h, i = c.startAngle || 0,
+            j = this.startAngleRad = na / 180 * (i - 90),
+            i = (this.endAngleRad = na / 180 * (p(c.endAngle, i + 360) - 90)) - j,
+            k = this.points,
+            l = c.dataLabels.distance,
+            c = c.ignoreHiddenPoint,
+            m,
+            n = k.length,
+            o;
+            if (!a) this.center = a = this.getCenter();
+            this.getX = function(b, c) {
+                h = V.asin(C((b - a[1]) / (a[2] / 2 + l), 1));
+                return a[0] + (c ? -1 : 1) * aa(h) * (a[2] / 2 + l)
+            };
+            for (m = 0; m < n; m++) {
+                o = k[m];
+                f = j + b * i;
+                if (!c || o.visible) b += o.percentage / 100;
+                g = j + b * i;
+                o.shapeType = "arc";
+                o.shapeArgs = {
+                    x: a[0],
+                    y: a[1],
+                    r: a[2] / 2,
+                    innerR: a[3] / 2,
+                    start: v(f * 1E3) / 1E3,
+                    end: v(g * 1E3) / 1E3
+                };
+                h = (g + f) / 2;
+                h > 1.5 * na ? h -= 2 * na: h < -na / 2 && (h += 2 * na);
+                o.slicedTranslation = {
+                    translateX: v(aa(h) * d),
+                    translateY: v(fa(h) * d)
+                };
+                f = aa(h) * a[2] / 2;
+                g = fa(h) * a[2] / 2;
+                o.tooltipPos = [a[0] + f * 0.7, a[1] + g * 0.7];
+                o.half = h < -na / 2 || h > na / 2 ? 1 : 0;
+                o.angle = h;
+                e = C(e, l / 2);
+                o.labelPos = [a[0] + f + aa(h) * l, a[1] + g + fa(h) * l, a[0] + f + aa(h) * e, a[1] + g + fa(h) * e, a[0] + f, a[1] + g, l < 0 ? "center": o.half ? "right": "left", h]
+            }
+        },
+        drawGraph: null,
+        drawPoints: function() {
+            var a = this,
+            b = a.chart.renderer,
+            c, d, e = a.options.shadow,
+            f, g;
+            if (e && !a.shadowGroup) a.shadowGroup = b.g("shadow").add(a.group);
+            q(a.points,
+            function(h) {
+                d = h.graphic;
+                g = h.shapeArgs;
+                f = h.shadowGroup;
+                if (e && !f) f = h.shadowGroup = b.g("shadow").add(a.shadowGroup);
+                c = h.sliced ? h.slicedTranslation: {
+                    translateX: 0,
+                    translateY: 0
+                };
+                f && f.attr(c);
+                d ? d.animate(r(g, c)) : h.graphic = d = b[h.shapeType](g).setRadialReference(a.center).attr(h.pointAttr[h.selected ? "select": ""]).attr({
+                    "stroke-linejoin": "round"
+                }).attr(c).add(a.group).shadow(e, f);
+                h.visible !== void 0 && h.setVisible(h.visible)
+            })
+        },
+        sortByAngle: function(a, b) {
+            a.sort(function(a, d) {
+                return a.angle !== void 0 && (d.angle - a.angle) * b
+            })
+        },
+        drawLegendSymbol: M.drawRectangle,
+        getCenter: Z.getCenter,
+        getSymbol: sa
+    };
+    T = la(O, T);
+    J.pie = T;
+    O.prototype.drawDataLabels = function() {
+        var a = this,
+        b = a.options,
+        c = b.cursor,
+        d = b.dataLabels,
+        e = a.points,
+        f, g, h, i;
+        if (d.enabled || a._hasPointLabels) a.dlProcessOptions && a.dlProcessOptions(d),
+        i = a.plotGroup("dataLabelsGroup", "data-labels", d.defer ? "hidden": "visible", d.zIndex || 6),
+        !a.hasRendered && p(d.defer, !0) && (i.attr({
+            opacity: 0
+        }), N(a, "afterAnimate",
+        function() {
+            a.visible && i.show();
+            i[b.animation ? "animate": "attr"]({
+                opacity: 1
+            },
+            {
+                duration: 200
+            })
+        })),
+        g = d,
+        q(e,
+        function(b) {
+            var e, l = b.dataLabel,
+            m, n, o = b.connector,
+            q = !0;
+            f = b.options && b.options.dataLabels;
+            e = p(f && f.enabled, g.enabled);
+            if (l && !e) b.dataLabel = l.destroy();
+            else if (e) {
+                d = w(g, f);
+                e = d.rotation;
+                m = b.getLabelConfig();
+                h = d.format ? Ia(d.format, m) : d.formatter.call(m, d);
+                d.style.color = p(d.color, d.style.color, a.color, "black");
+                if (l) if (s(h)) l.attr({
+                    text: h
+                }),
+                q = !1;
+                else {
+                    if (b.dataLabel = l = l.destroy(), o) b.connector = o.destroy()
+                } else if (s(h)) {
+                    l = {
+                        fill: d.backgroundColor,
+                        stroke: d.borderColor,
+                        "stroke-width": d.borderWidth,
+                        r: d.borderRadius || 0,
+                        rotation: e,
+                        padding: d.padding,
+                        zIndex: 1
+                    };
+                    for (n in l) l[n] === t && delete l[n];
+                    l = b.dataLabel = a.chart.renderer[e ? "text": "label"](h, 0, -999, null, null, null, d.useHTML).attr(l).css(r(d.style, c && {
+                        cursor: c
+                    })).add(i).shadow(d.shadow)
+                }
+                l && a.alignDataLabel(b, l, d, null, q)
+            }
+        })
+    };
+    O.prototype.alignDataLabel = function(a, b, c, d, e) {
+        var f = this.chart,
+        g = f.inverted,
+        h = p(a.plotX, -999),
+        i = p(a.plotY, -999),
+        j = b.getBBox();
+        if (a = this.visible && (a.series.forceDL || f.isInsidePlot(h, v(i), g) || d && f.isInsidePlot(h, g ? d.x + 1 : d.y + d.height - 1, g))) d = r({
+            x: g ? f.plotWidth - i: h,
+            y: v(g ? f.plotHeight - h: i),
+            width: 0,
+            height: 0
+        },
+        d),
+        r(c, {
+            width: j.width,
+            height: j.height
+        }),
+        c.rotation ? b[e ? "attr": "animate"]({
+            x: d.x + c.x + d.width / 2,
+            y: d.y + c.y + d.height / 2
+        }).attr({
+            align: c.align
+        }) : (b.align(c, null, d), g = b.alignAttr, p(c.overflow, "justify") === "justify" ? this.justifyDataLabel(b, c, g, j, d, e) : p(c.crop, !0) && (a = f.isInsidePlot(g.x, g.y) && f.isInsidePlot(g.x + j.width, g.y + j.height)));
+        if (!a) b.attr({
+            y: -999
+        }),
+        b.placed = !1
+    };
+    O.prototype.justifyDataLabel = function(a, b, c, d, e, f) {
+        var g = this.chart,
+        h = b.align,
+        i = b.verticalAlign,
+        j, k;
+        j = c.x;
+        if (j < 0) h === "right" ? b.align = "left": b.x = -j,
+        k = !0;
+        j = c.x + d.width;
+        if (j > g.plotWidth) h === "left" ? b.align = "right": b.x = g.plotWidth - j,
+        k = !0;
+        j = c.y;
+        if (j < 0) i === "bottom" ? b.verticalAlign = "top": b.y = -j,
+        k = !0;
+        j = c.y + d.height;
+        if (j > g.plotHeight) i === "top" ? b.verticalAlign = "bottom": b.y = g.plotHeight - j,
+        k = !0;
+        if (k) a.placed = !f,
+        a.align(b, null, e)
+    };
+    if (J.pie) J.pie.prototype.drawDataLabels = function() {
+        var a = this,
+        b = a.data,
+        c, d = a.chart,
+        e = a.options.dataLabels,
+        f = p(e.connectorPadding, 10),
+        g = p(e.connectorWidth, 1),
+        h = d.plotWidth,
+        i = d.plotHeight,
+        j,
+        k,
+        l = p(e.softConnector, !0),
+        m = e.distance,
+        n = a.center,
+        o = n[2] / 2,
+        r = n[1],
+        s = m > 0,
+        t,
+        w,
+        x,
+        z = [[], []],
+        B,
+        A,
+        K,
+        J,
+        y,
+        R = [0, 0, 0, 0],
+        N = function(a, b) {
+            return b.y - a.y
+        };
+        if (a.visible && (e.enabled || a._hasPointLabels)) {
+            O.prototype.drawDataLabels.apply(a);
+            q(b,
+            function(a) {
+                a.dataLabel && a.visible && z[a.half].push(a)
+            });
+            for (J = 2; J--;) {
+                var H = [],
+                M = [],
+                F = z[J],
+                L = F.length,
+                G;
+                if (L) {
+                    a.sortByAngle(F, J - 0.5);
+                    for (y = b = 0; ! b && F[y];) b = F[y] && F[y].dataLabel && (F[y].dataLabel.getBBox().height || 21),
+                    y++;
+                    if (m > 0) {
+                        w = C(r + o + m, d.plotHeight);
+                        for (y = u(0, r - o - m); y <= w; y += b) H.push(y);
+                        w = H.length;
+                        if (L > w) {
+                            c = [].concat(F);
+                            c.sort(N);
+                            for (y = L; y--;) c[y].rank = y;
+                            for (y = L; y--;) F[y].rank >= w && F.splice(y, 1);
+                            L = F.length
+                        }
+                        for (y = 0; y < L; y++) {
+                            c = F[y];
+                            x = c.labelPos;
+                            c = 9999;
+                            var S, P;
+                            for (P = 0; P < w; P++) S = Q(H[P] - x[1]),
+                            S < c && (c = S, G = P);
+                            if (G < y && H[y] !== null) G = y;
+                            else for (w < L - y + G && H[y] !== null && (G = w - L + y); H[G] === null;) G++;
+                            M.push({
+                                i: G,
+                                y: H[G]
+                            });
+                            H[G] = null
+                        }
+                        M.sort(N)
+                    }
+                    for (y = 0; y < L; y++) {
+                        c = F[y];
+                        x = c.labelPos;
+                        t = c.dataLabel;
+                        K = c.visible === !1 ? "hidden": "visible";
+                        c = x[1];
+                        if (m > 0) {
+                            if (w = M.pop(), G = w.i, A = w.y, c > A && H[G + 1] !== null || c < A && H[G - 1] !== null) A = C(u(0, c), d.plotHeight)
+                        } else A = c;
+                        B = e.justify ? n[0] + (J ? -1 : 1) * (o + m) : a.getX(A === r - o - m || A === r + o + m ? c: A, J);
+                        t._attr = {
+                            visibility: K,
+                            align: x[6]
+                        };
+                        t._pos = {
+                            x: B + e.x + ({
+                                left: f,
+                                right: -f
+                            } [x[6]] || 0),
+                            y: A + e.y - 10
+                        };
+                        t.connX = B;
+                        t.connY = A;
+                        if (this.options.size === null) w = t.width,
+                        B - w < f ? R[3] = u(v(w - B + f), R[3]) : B + w > h - f && (R[1] = u(v(B + w - h + f), R[1])),
+                        A - b / 2 < 0 ? R[0] = u(v( - A + b / 2), R[0]) : A + b / 2 > i && (R[2] = u(v(A + b / 2 - i), R[2]))
+                    }
+                }
+            }
+            if (Ba(R) === 0 || this.verifyDataLabelOverflow(R)) this.placeDataLabels(),
+            s && g && q(this.points,
+            function(b) {
+                j = b.connector;
+                x = b.labelPos;
+                if ((t = b.dataLabel) && t._pos) K = t._attr.visibility,
+                B = t.connX,
+                A = t.connY,
+                k = l ? ["M", B + (x[6] === "left" ? 5 : -5), A, "C", B, A, 2 * x[2] - x[4], 2 * x[3] - x[5], x[2], x[3], "L", x[4], x[5]] : ["M", B + (x[6] === "left" ? 5 : -5), A, "L", x[2], x[3], "L", x[4], x[5]],
+                j ? (j.animate({
+                    d: k
+                }), j.attr("visibility", K)) : b.connector = j = a.chart.renderer.path(k).attr({
+                    "stroke-width": g,
+                    stroke: e.connectorColor || b.color || "#606060",
+                    visibility: K
+                }).add(a.dataLabelsGroup);
+                else if (j) b.connector = j.destroy()
+            })
+        }
+    },
+    J.pie.prototype.placeDataLabels = function() {
+        q(this.points,
+        function(a) {
+            var a = a.dataLabel,
+            b;
+            if (a)(b = a._pos) ? (a.attr(a._attr), a[a.moved ? "animate": "attr"](b), a.moved = !0) : a && a.attr({
+                y: -999
+            })
+        })
+    },
+    J.pie.prototype.alignDataLabel = sa,
+    J.pie.prototype.verifyDataLabelOverflow = function(a) {
+        var b = this.center,
+        c = this.options,
+        d = c.center,
+        e = c = c.minSize || 80,
+        f;
+        d[0] !== null ? e = u(b[2] - u(a[1], a[3]), c) : (e = u(b[2] - a[1] - a[3], c), b[0] += (a[3] - a[1]) / 2);
+        d[1] !== null ? e = u(C(e, b[2] - u(a[0], a[2])), c) : (e = u(C(e, b[2] - a[0] - a[2]), c), b[1] += (a[0] - a[2]) / 2);
+        e < b[2] ? (b[2] = e, this.translate(b), q(this.points,
+        function(a) {
+            if (a.dataLabel) a.dataLabel._pos = null
+        }), this.drawDataLabels && this.drawDataLabels()) : f = !0;
+        return f
+    };
+    if (J.column) J.column.prototype.alignDataLabel = function(a, b, c, d, e) {
+        var f = this.chart,
+        g = f.inverted,
+        h = a.dlBox || a.shapeArgs,
+        i = a.below || a.plotY > p(this.translatedThreshold, f.plotSizeY),
+        j = p(c.inside, !!this.options.stacking);
+        if (h && (d = w(h), g && (d = {
+            x: f.plotWidth - d.y - d.height,
+            y: f.plotHeight - d.x - d.width,
+            width: d.height,
+            height: d.width
+        }), !j)) g ? (d.x += i ? 0 : d.width, d.width = 0) : (d.y += i ? d.height: 0, d.height = 0);
+        c.align = p(c.align, !g || j ? "center": i ? "right": "left");
+        c.verticalAlign = p(c.verticalAlign, g || j ? "middle": i ? "top": "bottom");
+        O.prototype.alignDataLabel.call(this, a, b, c, d, e)
+    };
+    T = S.TrackerMixin = {
+        drawTrackerPoint: function() {
+            var a = this,
+            b = a.chart,
+            c = b.pointer,
+            d = a.options.cursor,
+            e = d && {
+                cursor: d
+            },
+            f = function(c) {
+                var d = c.target,
+                e;
+                if (b.hoverSeries !== a) a.onMouseOver();
+                for (; d && !e;) e = d.point,
+                d = d.parentNode;
+                if (e !== t && e !== b.hoverPoint) e.onMouseOver(c)
+            };
+            q(a.points,
+            function(a) {
+                if (a.graphic) a.graphic.element.point = a;
+                if (a.dataLabel) a.dataLabel.element.point = a
+            });
+            if (!a._hasTracking) q(a.trackerGroups,
+            function(b) {
+                if (a[b] && (a[b].addClass("highcharts-tracker").on("mouseover", f).on("mouseout",
+                function(a) {
+                    c.onTrackerMouseOut(a)
+                }).css(e), Za)) a[b].on("touchstart", f)
+            }),
+            a._hasTracking = !0
+        },
+        drawTrackerGraph: function() {
+            var a = this,
+            b = a.options,
+            c = b.trackByArea,
+            d = [].concat(c ? a.areaPath: a.graphPath),
+            e = d.length,
+            f = a.chart,
+            g = f.pointer,
+            h = f.renderer,
+            i = f.options.tooltip.snap,
+            j = a.tracker,
+            k = b.cursor,
+            l = k && {
+                cursor: k
+            },
+            k = a.singlePoints,
+            m,
+            n = function() {
+                if (f.hoverSeries !== a) a.onMouseOver()
+            },
+            o = "rgba(192,192,192," + (ba ? 1.0E-4: 0.002) + ")";
+            if (e && !c) for (m = e + 1; m--;) d[m] === "M" && d.splice(m + 1, 0, d[m + 1] - i, d[m + 2], "L"),
+            (m && d[m] === "M" || m === e) && d.splice(m, 0, "L", d[m - 2] + i, d[m - 1]);
+            for (m = 0; m < k.length; m++) e = k[m],
+            d.push("M", e.plotX - i, e.plotY, "L", e.plotX + i, e.plotY);
+            j ? j.attr({
+                d: d
+            }) : (a.tracker = h.path(d).attr({
+                "stroke-linejoin": "round",
+                visibility: a.visible ? "visible": "hidden",
+                stroke: o,
+                fill: c ? o: P,
+                "stroke-width": b.lineWidth + (c ? 0 : 2 * i),
+                zIndex: 2
+            }).add(a.group), q([a.tracker, a.markerGroup],
+            function(a) {
+                a.addClass("highcharts-tracker").on("mouseover", n).on("mouseout",
+                function(a) {
+                    g.onTrackerMouseOut(a)
+                }).css(l);
+                if (Za) a.on("touchstart", n)
+            }))
+        }
+    };
+    if (J.column) ha.prototype.drawTracker = T.drawTrackerPoint;
+    if (J.pie) J.pie.prototype.drawTracker = T.drawTrackerPoint;
+    if (J.scatter) qa.prototype.drawTracker = T.drawTrackerPoint;
+    r(kb.prototype, {
+        setItemEvents: function(a, b, c, d, e) {
+            var f = this; (c ? b: a.legendGroup).on("mouseover",
+            function() {
+                a.setState("hover");
+                b.css(f.options.itemHoverStyle)
+            }).on("mouseout",
+            function() {
+                b.css(a.visible ? d: e);
+                a.setState()
+            }).on("click",
+            function(b) {
+                var c = function() {
+                    a.setVisible()
+                },
+                b = {
+                    browserEvent: b
+                };
+                a.firePointEvent ? a.firePointEvent("legendItemClick", b, c) : K(a, "legendItemClick", b, c)
+            })
+        },
+        createCheckboxForItem: function(a) {
+            a.checkbox = $("input", {
+                type: "checkbox",
+                checked: a.selected,
+                defaultChecked: a.selected
+            },
+            this.options.itemCheckboxStyle, this.chart.container);
+            N(a.checkbox, "click",
+            function(b) {
+                K(a, "checkboxClick", {
+                    checked: b.target.checked
+                },
+                function() {
+                    a.select()
+                })
+            })
+        }
+    });
+    L.legend.itemStyle.cursor = "pointer";
+    r(Xa.prototype, {
+        showResetZoom: function() {
+            var a = this,
+            b = L.lang,
+            c = a.options.chart.resetZoomButton,
+            d = c.theme,
+            e = d.states,
+            f = c.relativeTo === "chart" ? null: "plotBox";
+            this.resetZoomButton = a.renderer.button(b.resetZoom, null, null,
+            function() {
+                a.zoomOut()
+            },
+            d, e && e.hover).attr({
+                align: c.position.align,
+                title: b.resetZoomTitle
+            }).add().align(c.position, !1, f)
+        },
+        zoomOut: function() {
+            var a = this;
+            K(a, "selection", {
+                resetSelection: !0
+            },
+            function() {
+                a.zoom()
+            })
+        },
+        zoom: function(a) {
+            var b, c = this.pointer,
+            d = !1,
+            e; ! a || a.resetSelection ? q(this.axes,
+            function(a) {
+                b = a.zoom()
+            }) : q(a.xAxis.concat(a.yAxis),
+            function(a) {
+                var e = a.axis,
+                h = e.isXAxis;
+                if (c[h ? "zoomX": "zoomY"] || c[h ? "pinchX": "pinchY"]) b = e.zoom(a.min, a.max),
+                e.displayBtn && (d = !0)
+            });
+            e = this.resetZoomButton;
+            if (d && !e) this.showResetZoom();
+            else if (!d && da(e)) this.resetZoomButton = e.destroy();
+            b && this.redraw(p(this.options.chart.animation, a && a.animation, this.pointCount < 100))
+        },
+        pan: function(a, b) {
+            var c = this,
+            d = c.hoverPoints,
+            e;
+            d && q(d,
+            function(a) {
+                a.setState()
+            });
+            q(b === "xy" ? [1, 0] : [1],
+            function(b) {
+                var d = a[b ? "chartX": "chartY"],
+                h = c[b ? "xAxis": "yAxis"][0],
+                i = c[b ? "mouseDownX": "mouseDownY"],
+                j = (h.pointRange || 0) / 2,
+                k = h.getExtremes(),
+                l = h.toValue(i - d, !0) + j,
+                i = h.toValue(i + c[b ? "plotWidth": "plotHeight"] - d, !0) - j;
+                h.series.length && l > C(k.dataMin, k.min) && i < u(k.dataMax, k.max) && (h.setExtremes(l, i, !1, !1, {
+                    trigger: "pan"
+                }), e = !0);
+                c[b ? "mouseDownX": "mouseDownY"] = d
+            });
+            e && c.redraw(!1);
+            A(c.container, {
+                cursor: "move"
+            })
+        }
+    });
+    r(Ea.prototype, {
+        select: function(a, b) {
+            var c = this,
+            d = c.series,
+            e = d.chart,
+            a = p(a, !c.selected);
+            c.firePointEvent(a ? "select": "unselect", {
+                accumulate: b
+            },
+            function() {
+                c.selected = c.options.selected = a;
+                d.options.data[Da(c, d.data)] = c.options;
+                c.setState(a && "select");
+                b || q(e.getSelectedPoints(),
+                function(a) {
+                    if (a.selected && a !== c) a.selected = a.options.selected = !1,
+                    d.options.data[Da(a, d.data)] = a.options,
+                    a.setState(""),
+                    a.firePointEvent("unselect")
+                })
+            })
+        },
+        onMouseOver: function(a) {
+            var b = this.series,
+            c = b.chart,
+            d = c.tooltip,
+            e = c.hoverPoint;
+            if (e && e !== this) e.onMouseOut();
+            this.firePointEvent("mouseOver");
+            d && (!d.shared || b.noSharedTooltip) && d.refresh(this, a);
+            this.setState("hover");
+            c.hoverPoint = this
+        },
+        onMouseOut: function() {
+            var a = this.series.chart,
+            b = a.hoverPoints;
+            this.firePointEvent("mouseOut");
+            if (!b || Da(this, b) === -1) this.setState(),
+            a.hoverPoint = null
+        },
+        importEvents: function() {
+            if (!this.hasImportedEvents) {
+                var a = w(this.series.options.point, this.options).events,
+                b;
+                this.events = a;
+                for (b in a) N(this, b, a[b]);
+                this.hasImportedEvents = !0
+            }
+        },
+        setState: function(a, b) {
+            var c = this.plotX,
+            d = this.plotY,
+            e = this.series,
+            f = e.options.states,
+            g = ca[e.type].marker && e.options.marker,
+            h = g && !g.enabled,
+            i = g && g.states[a],
+            j = i && i.enabled === !1,
+            k = e.stateMarkerGraphic,
+            l = this.marker || {},
+            m = e.chart,
+            n = e.halo,
+            o,
+            a = a || "";
+            o = this.pointAttr[a] || e.pointAttr[a];
+            if (! (a === this.state && !b || this.selected && a !== "select" || f[a] && f[a].enabled === !1 || a && (j || h && i.enabled === !1) || a && l.states && l.states[a] && l.states[a].enabled === !1)) {
+                if (this.graphic) g = g && this.graphic.symbolName && o.r,
+                this.graphic.attr(w(o, g ? {
+                    x: c - g,
+                    y: d - g,
+                    width: 2 * g,
+                    height: 2 * g
+                }: {})),
+                k && k.hide();
+                else {
+                    if (a && i) if (g = i.radius, l = l.symbol || e.symbol, k && k.currentSymbol !== l && (k = k.destroy()), k) k[b ? "animate": "attr"]({
+                        x: c - g,
+                        y: d - g
+                    });
+                    else if (l) e.stateMarkerGraphic = k = m.renderer.symbol(l, c - g, d - g, 2 * g, 2 * g).attr(o).add(e.markerGroup),
+                    k.currentSymbol = l;
+                    if (k) k[a && m.isInsidePlot(c, d, m.inverted) ? "show": "hide"]()
+                }
+                if ((c = f[a] && f[a].halo) && c.size) {
+                    if (!n) e.halo = n = m.renderer.path().add(e.seriesGroup);
+                    n.attr(r({
+                        fill: ya(this.color || e.color).setOpacity(c.opacity).get()
+                    },
+
+                    c.attributes))[b ? "animate": "attr"]({
+                        d: this.haloPath(c.size)
+                    })
+                } else n && n.attr({
+                    d: []
+                });
+                this.state = a
+            }
+        },
+        haloPath: function(a) {
+            var b = this.series,
+            c = b.chart,
+            d = b.getPlotBox(),
+            e = c.inverted;
+            return c.renderer.symbols.circle(d.translateX + (e ? b.yAxis.len - this.plotY: this.plotX) - a, d.translateY + (e ? b.xAxis.len - this.plotX: this.plotY) - a, a * 2, a * 2)
+        }
+    });
+    r(O.prototype, {
+        onMouseOver: function() {
+            var a = this.chart,
+            b = a.hoverSeries;
+            if (b && b !== this) b.onMouseOut();
+            this.options.events.mouseOver && K(this, "mouseOver");
+            this.setState("hover");
+            a.hoverSeries = this
+        },
+        onMouseOut: function() {
+            var a = this.options,
+            b = this.chart,
+            c = b.tooltip,
+            d = b.hoverPoint;
+            if (d) d.onMouseOut();
+            this && a.events.mouseOut && K(this, "mouseOut");
+            c && !a.stickyTracking && (!c.shared || this.noSharedTooltip) && c.hide();
+            this.setState();
+            b.hoverSeries = null
+        },
+        setState: function(a) {
+            var b = this.options,
+            c = this.graph,
+            d = this.graphNeg,
+            e = b.states,
+            b = b.lineWidth,
+            a = a || "";
+            if (this.state !== a) this.state = a,
+            e[a] && e[a].enabled === !1 || (a && (b = e[a].lineWidth || b + (e[a].lineWidthPlus || 0)), c && !c.dashstyle && (a = {
+                "stroke-width": b
+            },
+            c.attr(a), d && d.attr(a)))
+        },
+        setVisible: function(a, b) {
+            var c = this,
+            d = c.chart,
+            e = c.legendItem,
+            f, g = d.options.chart.ignoreHiddenSeries,
+            h = c.visible;
+            f = (c.visible = a = c.userOptions.visible = a === t ? !h: a) ? "show": "hide";
+            q(["group", "dataLabelsGroup", "markerGroup", "tracker"],
+            function(a) {
+                if (c[a]) c[a][f]()
+            });
+            if (d.hoverSeries === c) c.onMouseOut();
+            e && d.legend.colorizeItem(c, a);
+            c.isDirty = !0;
+            c.options.stacking && q(d.series,
+            function(a) {
+                if (a.options.stacking && a.visible) a.isDirty = !0
+            });
+            q(c.linkedSeries,
+            function(b) {
+                b.setVisible(a, !1)
+            });
+            if (g) d.isDirtyBox = !0;
+            b !== !1 && d.redraw();
+            K(c, f)
+        },
+        setTooltipPoints: function(a) {
+            var b = [],
+            c,
+            d,
+            e = this.xAxis,
+            f = e && e.getExtremes(),
+            g = e ? e.tooltipLen || e.len: this.chart.plotSizeX,
+            h,
+            i,
+            j = [];
+            if (! (this.options.enableMouseTracking === !1 || this.singularTooltips)) {
+                if (a) this.tooltipPoints = null;
+                q(this.segments || this.points,
+                function(a) {
+                    b = b.concat(a)
+                });
+                e && e.reversed && (b = b.reverse());
+                this.orderTooltipPoints && this.orderTooltipPoints(b);
+                a = b.length;
+                for (i = 0; i < a; i++) if (e = b[i], c = e.x, c >= f.min && c <= f.max) {
+                    h = b[i + 1];
+                    c = d === t ? 0 : d + 1;
+                    for (d = b[i + 1] ? C(u(0, U((e.clientX + (h ? h.wrappedClientX || h.clientX: g)) / 2)), g) : g; c >= 0 && c <= d;) j[c++] = e
+                }
+                this.tooltipPoints = j
+            }
+        },
+        show: function() {
+            this.setVisible(!0)
+        },
+        hide: function() {
+            this.setVisible(!1)
+        },
+        select: function(a) {
+            this.selected = a = a === t ? !this.selected: a;
+            if (this.checkbox) this.checkbox.checked = a;
+            K(this, a ? "select": "unselect")
+        },
+        drawTracker: T.drawTrackerGraph
+    });
+    r(S, {
+        Axis: ma,
+        Chart: Xa,
+        Color: ya,
+        Point: Ea,
+        Tick: Sa,
+        Renderer: Ya,
+        Series: O,
+        SVGElement: G,
+        SVGRenderer: ta,
+        arrayMin: Na,
+        arrayMax: Ba,
+        charts: W,
+        dateFormat: bb,
+        format: Ia,
+        pathAnim: ub,
+        getOptions: function() {
+            return L
+        },
+        hasBidiBug: Nb,
+        isTouchDevice: Hb,
+        numberFormat: Ga,
+        seriesTypes: J,
+        setOptions: function(a) {
+            L = w(!0, L, a);
+            Ab();
+            return L
+        },
+        addEvent: N,
+        removeEvent: X,
+        createElement: $,
+        discardElement: Pa,
+        css: A,
+        each: q,
+        extend: r,
+        map: Ua,
+        merge: w,
+        pick: p,
+        splat: ra,
+        extendClass: la,
+        pInt: z,
+        wrap: Ma,
+        svg: ba,
+        canvas: ga,
+        vml: !ba && !ga,
+        product: "Highcharts",
+        version: "4.0.3"
+    })
+})();
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/jquery-1.11.0.min.js b/pluss-manage-page/src/main/resources/static/resources/auth/js/jquery-1.11.0.min.js
new file mode 100644
index 0000000..fc516fb
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/jquery-1.11.0.min.js
@@ -0,0 +1,5 @@
+// JavaScript Document
+/*! jQuery v1.11.0 | (c) 2005, 2014 jQuery Foundation, Inc. | jquery.org/license */
+!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k="".trim,l={},m="1.11.0",n=function(a,b){return new n.fn.init(a,b)},o=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,p=/^-ms-/,q=/-([\da-z])/gi,r=function(a,b){return b.toUpperCase()};n.fn=n.prototype={jquery:m,constructor:n,selector:"",length:0,toArray:function(){return d.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var b=n.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return n.each(this,a,b)},map:function(a){return this.pushStack(n.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:c.sort,splice:c.splice},n.extend=n.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||n.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(e=arguments[h]))for(d in e)a=g[d],c=e[d],g!==c&&(j&&c&&(n.isPlainObject(c)||(b=n.isArray(c)))?(b?(b=!1,f=a&&n.isArray(a)?a:[]):f=a&&n.isPlainObject(a)?a:{},g[d]=n.extend(j,f,c)):void 0!==c&&(g[d]=c));return g},n.extend({expando:"jQuery"+(m+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===n.type(a)},isArray:Array.isArray||function(a){return"array"===n.type(a)},isWindow:function(a){return null!=a&&a==a.window},isNumeric:function(a){return a-parseFloat(a)>=0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},isPlainObject:function(a){var b;if(!a||"object"!==n.type(a)||a.nodeType||n.isWindow(a))return!1;try{if(a.constructor&&!j.call(a,"constructor")&&!j.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}if(l.ownLast)for(b in a)return j.call(a,b);for(b in a);return void 0===b||j.call(a,b)},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?h[i.call(a)]||"object":typeof a},globalEval:function(b){b&&n.trim(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(p,"ms-").replace(q,r)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var d,e=0,f=a.length,g=s(a);if(c){if(g){for(;f>e;e++)if(d=b.apply(a[e],c),d===!1)break}else for(e in a)if(d=b.apply(a[e],c),d===!1)break}else if(g){for(;f>e;e++)if(d=b.call(a[e],e,a[e]),d===!1)break}else for(e in a)if(d=b.call(a[e],e,a[e]),d===!1)break;return a},trim:k&&!k.call("\ufeff\xa0")?function(a){return null==a?"":k.call(a)}:function(a){return null==a?"":(a+"").replace(o,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(s(Object(a))?n.merge(c,"string"==typeof a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){var d;if(b){if(g)return g.call(b,a,c);for(d=b.length,c=c?0>c?Math.max(0,d+c):c:0;d>c;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,b){var c=+b.length,d=0,e=a.length;while(c>d)a[e++]=b[d++];if(c!==c)while(void 0!==b[d])a[e++]=b[d++];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,f=0,g=a.length,h=s(a),i=[];if(h)for(;g>f;f++)d=b(a[f],f,c),null!=d&&i.push(d);else for(f in a)d=b(a[f],f,c),null!=d&&i.push(d);return e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;return"string"==typeof b&&(f=a[b],b=a,a=f),n.isFunction(a)?(c=d.call(arguments,2),e=function(){return a.apply(b||this,c.concat(d.call(arguments)))},e.guid=a.guid=a.guid||n.guid++,e):void 0},now:function(){return+new Date},support:l}),n.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){h["[object "+b+"]"]=b.toLowerCase()});function s(a){var b=a.length,c=n.type(a);return"function"===c||n.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var t=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s="sizzle"+-new Date,t=a.document,u=0,v=0,w=eb(),x=eb(),y=eb(),z=function(a,b){return a===b&&(j=!0),0},A="undefined",B=1<<31,C={}.hasOwnProperty,D=[],E=D.pop,F=D.push,G=D.push,H=D.slice,I=D.indexOf||function(a){for(var b=0,c=this.length;c>b;b++)if(this[b]===a)return b;return-1},J="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",K="[\\x20\\t\\r\\n\\f]",L="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",M=L.replace("w","w#"),N="\\["+K+"*("+L+")"+K+"*(?:([*^$|!~]?=)"+K+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+M+")|)|)"+K+"*\\]",O=":("+L+")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+N.replace(3,8)+")*)|.*)\\)|)",P=new RegExp("^"+K+"+|((?:^|[^\\\\])(?:\\\\.)*)"+K+"+$","g"),Q=new RegExp("^"+K+"*,"+K+"*"),R=new RegExp("^"+K+"*([>+~]|"+K+")"+K+"*"),S=new RegExp("="+K+"*([^\\]'\"]*?)"+K+"*\\]","g"),T=new RegExp(O),U=new RegExp("^"+M+"$"),V={ID:new RegExp("^#("+L+")"),CLASS:new RegExp("^\\.("+L+")"),TAG:new RegExp("^("+L.replace("w","w*")+")"),ATTR:new RegExp("^"+N),PSEUDO:new RegExp("^"+O),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+K+"*(even|odd|(([+-]|)(\\d*)n|)"+K+"*(?:([+-]|)"+K+"*(\\d+)|))"+K+"*\\)|)","i"),bool:new RegExp("^(?:"+J+")$","i"),needsContext:new RegExp("^"+K+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+K+"*((?:-\\d)?\\d*)"+K+"*\\)|)(?=[^-]|$)","i")},W=/^(?:input|select|textarea|button)$/i,X=/^h\d$/i,Y=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,$=/[+~]/,_=/'|\\/g,ab=new RegExp("\\\\([\\da-f]{1,6}"+K+"?|("+K+")|.)","ig"),bb=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)};try{G.apply(D=H.call(t.childNodes),t.childNodes),D[t.childNodes.length].nodeType}catch(cb){G={apply:D.length?function(a,b){F.apply(a,H.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function db(a,b,d,e){var f,g,h,i,j,m,p,q,u,v;if((b?b.ownerDocument||b:t)!==l&&k(b),b=b||l,d=d||[],!a||"string"!=typeof a)return d;if(1!==(i=b.nodeType)&&9!==i)return[];if(n&&!e){if(f=Z.exec(a))if(h=f[1]){if(9===i){if(g=b.getElementById(h),!g||!g.parentNode)return d;if(g.id===h)return d.push(g),d}else if(b.ownerDocument&&(g=b.ownerDocument.getElementById(h))&&r(b,g)&&g.id===h)return d.push(g),d}else{if(f[2])return G.apply(d,b.getElementsByTagName(a)),d;if((h=f[3])&&c.getElementsByClassName&&b.getElementsByClassName)return G.apply(d,b.getElementsByClassName(h)),d}if(c.qsa&&(!o||!o.test(a))){if(q=p=s,u=b,v=9===i&&a,1===i&&"object"!==b.nodeName.toLowerCase()){m=ob(a),(p=b.getAttribute("id"))?q=p.replace(_,"\\$&"):b.setAttribute("id",q),q="[id='"+q+"'] ",j=m.length;while(j--)m[j]=q+pb(m[j]);u=$.test(a)&&mb(b.parentNode)||b,v=m.join(",")}if(v)try{return G.apply(d,u.querySelectorAll(v)),d}catch(w){}finally{p||b.removeAttribute("id")}}}return xb(a.replace(P,"$1"),b,d,e)}function eb(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function fb(a){return a[s]=!0,a}function gb(a){var b=l.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function hb(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function ib(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||B)-(~a.sourceIndex||B);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function jb(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function kb(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function lb(a){return fb(function(b){return b=+b,fb(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function mb(a){return a&&typeof a.getElementsByTagName!==A&&a}c=db.support={},f=db.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},k=db.setDocument=function(a){var b,e=a?a.ownerDocument||a:t,g=e.defaultView;return e!==l&&9===e.nodeType&&e.documentElement?(l=e,m=e.documentElement,n=!f(e),g&&g!==g.top&&(g.addEventListener?g.addEventListener("unload",function(){k()},!1):g.attachEvent&&g.attachEvent("onunload",function(){k()})),c.attributes=gb(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=gb(function(a){return a.appendChild(e.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=Y.test(e.getElementsByClassName)&&gb(function(a){return a.innerHTML="<div class='a'></div><div class='a i'></div>",a.firstChild.className="i",2===a.getElementsByClassName("i").length}),c.getById=gb(function(a){return m.appendChild(a).id=s,!e.getElementsByName||!e.getElementsByName(s).length}),c.getById?(d.find.ID=function(a,b){if(typeof b.getElementById!==A&&n){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(ab,bb);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(ab,bb);return function(a){var c=typeof a.getAttributeNode!==A&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return typeof b.getElementsByTagName!==A?b.getElementsByTagName(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return typeof b.getElementsByClassName!==A&&n?b.getElementsByClassName(a):void 0},p=[],o=[],(c.qsa=Y.test(e.querySelectorAll))&&(gb(function(a){a.innerHTML="<select t=''><option selected=''></option></select>",a.querySelectorAll("[t^='']").length&&o.push("[*^$]="+K+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||o.push("\\["+K+"*(?:value|"+J+")"),a.querySelectorAll(":checked").length||o.push(":checked")}),gb(function(a){var b=e.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&o.push("name"+K+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||o.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),o.push(",.*:")})),(c.matchesSelector=Y.test(q=m.webkitMatchesSelector||m.mozMatchesSelector||m.oMatchesSelector||m.msMatchesSelector))&&gb(function(a){c.disconnectedMatch=q.call(a,"div"),q.call(a,"[s!='']:x"),p.push("!=",O)}),o=o.length&&new RegExp(o.join("|")),p=p.length&&new RegExp(p.join("|")),b=Y.test(m.compareDocumentPosition),r=b||Y.test(m.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},z=b?function(a,b){if(a===b)return j=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===e||a.ownerDocument===t&&r(t,a)?-1:b===e||b.ownerDocument===t&&r(t,b)?1:i?I.call(i,a)-I.call(i,b):0:4&d?-1:1)}:function(a,b){if(a===b)return j=!0,0;var c,d=0,f=a.parentNode,g=b.parentNode,h=[a],k=[b];if(!f||!g)return a===e?-1:b===e?1:f?-1:g?1:i?I.call(i,a)-I.call(i,b):0;if(f===g)return ib(a,b);c=a;while(c=c.parentNode)h.unshift(c);c=b;while(c=c.parentNode)k.unshift(c);while(h[d]===k[d])d++;return d?ib(h[d],k[d]):h[d]===t?-1:k[d]===t?1:0},e):l},db.matches=function(a,b){return db(a,null,null,b)},db.matchesSelector=function(a,b){if((a.ownerDocument||a)!==l&&k(a),b=b.replace(S,"='$1']"),!(!c.matchesSelector||!n||p&&p.test(b)||o&&o.test(b)))try{var d=q.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return db(b,l,null,[a]).length>0},db.contains=function(a,b){return(a.ownerDocument||a)!==l&&k(a),r(a,b)},db.attr=function(a,b){(a.ownerDocument||a)!==l&&k(a);var e=d.attrHandle[b.toLowerCase()],f=e&&C.call(d.attrHandle,b.toLowerCase())?e(a,b,!n):void 0;return void 0!==f?f:c.attributes||!n?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},db.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},db.uniqueSort=function(a){var b,d=[],e=0,f=0;if(j=!c.detectDuplicates,i=!c.sortStable&&a.slice(0),a.sort(z),j){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return i=null,a},e=db.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=db.selectors={cacheLength:50,createPseudo:fb,match:V,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(ab,bb),a[3]=(a[4]||a[5]||"").replace(ab,bb),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||db.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&db.error(a[0]),a},PSEUDO:function(a){var b,c=!a[5]&&a[2];return V.CHILD.test(a[0])?null:(a[3]&&void 0!==a[4]?a[2]=a[4]:c&&T.test(c)&&(b=ob(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(ab,bb).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=w[a+" "];return b||(b=new RegExp("(^|"+K+")"+a+"("+K+"|$)"))&&w(a,function(a){return b.test("string"==typeof a.className&&a.className||typeof a.getAttribute!==A&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=db.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),t=!i&&!h;if(q){if(f){while(p){l=b;while(l=l[p])if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&t){k=q[s]||(q[s]={}),j=k[a]||[],n=j[0]===u&&j[1],m=j[0]===u&&j[2],l=n&&q.childNodes[n];while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if(1===l.nodeType&&++m&&l===b){k[a]=[u,n,m];break}}else if(t&&(j=(b[s]||(b[s]={}))[a])&&j[0]===u)m=j[1];else while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if((h?l.nodeName.toLowerCase()===r:1===l.nodeType)&&++m&&(t&&((l[s]||(l[s]={}))[a]=[u,m]),l===b))break;return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||db.error("unsupported pseudo: "+a);return e[s]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?fb(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=I.call(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:fb(function(a){var b=[],c=[],d=g(a.replace(P,"$1"));return d[s]?fb(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),!c.pop()}}),has:fb(function(a){return function(b){return db(a,b).length>0}}),contains:fb(function(a){return function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:fb(function(a){return U.test(a||"")||db.error("unsupported lang: "+a),a=a.replace(ab,bb).toLowerCase(),function(b){var c;do if(c=n?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===m},focus:function(a){return a===l.activeElement&&(!l.hasFocus||l.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return X.test(a.nodeName)},input:function(a){return W.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:lb(function(){return[0]}),last:lb(function(a,b){return[b-1]}),eq:lb(function(a,b,c){return[0>c?c+b:c]}),even:lb(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:lb(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:lb(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:lb(function(a,b,c){for(var d=0>c?c+b:c;++d<b;)a.push(d);return a})}},d.pseudos.nth=d.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})d.pseudos[b]=jb(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=kb(b);function nb(){}nb.prototype=d.filters=d.pseudos,d.setFilters=new nb;function ob(a,b){var c,e,f,g,h,i,j,k=x[a+" "];if(k)return b?0:k.slice(0);h=a,i=[],j=d.preFilter;while(h){(!c||(e=Q.exec(h)))&&(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=R.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(P," ")}),h=h.slice(c.length));for(g in d.filter)!(e=V[g].exec(h))||j[g]&&!(e=j[g](e))||(c=e.shift(),f.push({value:c,type:g,matches:e}),h=h.slice(c.length));if(!c)break}return b?h.length:h?db.error(a):x(a,i).slice(0)}function pb(a){for(var b=0,c=a.length,d="";c>b;b++)d+=a[b].value;return d}function qb(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=v++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j=[u,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(i=b[s]||(b[s]={}),(h=i[d])&&h[0]===u&&h[1]===f)return j[2]=h[2];if(i[d]=j,j[2]=a(b,c,g))return!0}}}function rb(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function sb(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function tb(a,b,c,d,e,f){return d&&!d[s]&&(d=tb(d)),e&&!e[s]&&(e=tb(e,f)),fb(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||wb(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:sb(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=sb(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?I.call(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=sb(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):G.apply(g,r)})}function ub(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],i=g||d.relative[" "],j=g?1:0,k=qb(function(a){return a===b},i,!0),l=qb(function(a){return I.call(b,a)>-1},i,!0),m=[function(a,c,d){return!g&&(d||c!==h)||((b=c).nodeType?k(a,c,d):l(a,c,d))}];f>j;j++)if(c=d.relative[a[j].type])m=[qb(rb(m),c)];else{if(c=d.filter[a[j].type].apply(null,a[j].matches),c[s]){for(e=++j;f>e;e++)if(d.relative[a[e].type])break;return tb(j>1&&rb(m),j>1&&pb(a.slice(0,j-1).concat({value:" "===a[j-2].type?"*":""})).replace(P,"$1"),c,e>j&&ub(a.slice(j,e)),f>e&&ub(a=a.slice(e)),f>e&&pb(a))}m.push(c)}return rb(m)}function vb(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,i,j,k){var m,n,o,p=0,q="0",r=f&&[],s=[],t=h,v=f||e&&d.find.TAG("*",k),w=u+=null==t?1:Math.random()||.1,x=v.length;for(k&&(h=g!==l&&g);q!==x&&null!=(m=v[q]);q++){if(e&&m){n=0;while(o=a[n++])if(o(m,g,i)){j.push(m);break}k&&(u=w)}c&&((m=!o&&m)&&p--,f&&r.push(m))}if(p+=q,c&&q!==p){n=0;while(o=b[n++])o(r,s,g,i);if(f){if(p>0)while(q--)r[q]||s[q]||(s[q]=E.call(j));s=sb(s)}G.apply(j,s),k&&!f&&s.length>0&&p+b.length>1&&db.uniqueSort(j)}return k&&(u=w,h=t),r};return c?fb(f):f}g=db.compile=function(a,b){var c,d=[],e=[],f=y[a+" "];if(!f){b||(b=ob(a)),c=b.length;while(c--)f=ub(b[c]),f[s]?d.push(f):e.push(f);f=y(a,vb(e,d))}return f};function wb(a,b,c){for(var d=0,e=b.length;e>d;d++)db(a,b[d],c);return c}function xb(a,b,e,f){var h,i,j,k,l,m=ob(a);if(!f&&1===m.length){if(i=m[0]=m[0].slice(0),i.length>2&&"ID"===(j=i[0]).type&&c.getById&&9===b.nodeType&&n&&d.relative[i[1].type]){if(b=(d.find.ID(j.matches[0].replace(ab,bb),b)||[])[0],!b)return e;a=a.slice(i.shift().value.length)}h=V.needsContext.test(a)?0:i.length;while(h--){if(j=i[h],d.relative[k=j.type])break;if((l=d.find[k])&&(f=l(j.matches[0].replace(ab,bb),$.test(i[0].type)&&mb(b.parentNode)||b))){if(i.splice(h,1),a=f.length&&pb(i),!a)return G.apply(e,f),e;break}}}return g(a,m)(f,b,!n,e,$.test(a)&&mb(b.parentNode)||b),e}return c.sortStable=s.split("").sort(z).join("")===s,c.detectDuplicates=!!j,k(),c.sortDetached=gb(function(a){return 1&a.compareDocumentPosition(l.createElement("div"))}),gb(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||hb("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&gb(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||hb("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),gb(function(a){return null==a.getAttribute("disabled")})||hb(J,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),db}(a);n.find=t,n.expr=t.selectors,n.expr[":"]=n.expr.pseudos,n.unique=t.uniqueSort,n.text=t.getText,n.isXMLDoc=t.isXML,n.contains=t.contains;var u=n.expr.match.needsContext,v=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,w=/^.[^:#\[\.,]*$/;function x(a,b,c){if(n.isFunction(b))return n.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return n.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(w.test(b))return n.filter(b,a,c);b=n.filter(b,a)}return n.grep(a,function(a){return n.inArray(a,b)>=0!==c})}n.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?n.find.matchesSelector(d,a)?[d]:[]:n.find.matches(a,n.grep(b,function(a){return 1===a.nodeType}))},n.fn.extend({find:function(a){var b,c=[],d=this,e=d.length;if("string"!=typeof a)return this.pushStack(n(a).filter(function(){for(b=0;e>b;b++)if(n.contains(d[b],this))return!0}));for(b=0;e>b;b++)n.find(a,d[b],c);return c=this.pushStack(e>1?n.unique(c):c),c.selector=this.selector?this.selector+" "+a:a,c},filter:function(a){return this.pushStack(x(this,a||[],!1))},not:function(a){return this.pushStack(x(this,a||[],!0))},is:function(a){return!!x(this,"string"==typeof a&&u.test(a)?n(a):a||[],!1).length}});var y,z=a.document,A=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,B=n.fn.init=function(a,b){var c,d;if(!a)return this;if("string"==typeof a){if(c="<"===a.charAt(0)&&">"===a.charAt(a.length-1)&&a.length>=3?[null,a,null]:A.exec(a),!c||!c[1]&&b)return!b||b.jquery?(b||y).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof n?b[0]:b,n.merge(this,n.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:z,!0)),v.test(c[1])&&n.isPlainObject(b))for(c in b)n.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}if(d=z.getElementById(c[2]),d&&d.parentNode){if(d.id!==c[2])return y.find(a);this.length=1,this[0]=d}return this.context=z,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):n.isFunction(a)?"undefined"!=typeof y.ready?y.ready(a):a(n):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),n.makeArray(a,this))};B.prototype=n.fn,y=n(z);var C=/^(?:parents|prev(?:Until|All))/,D={children:!0,contents:!0,next:!0,prev:!0};n.extend({dir:function(a,b,c){var d=[],e=a[b];while(e&&9!==e.nodeType&&(void 0===c||1!==e.nodeType||!n(e).is(c)))1===e.nodeType&&d.push(e),e=e[b];return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),n.fn.extend({has:function(a){var b,c=n(a,this),d=c.length;return this.filter(function(){for(b=0;d>b;b++)if(n.contains(this,c[b]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=u.test(a)||"string"!=typeof a?n(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&n.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?n.unique(f):f)},index:function(a){return a?"string"==typeof a?n.inArray(this[0],n(a)):n.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(n.unique(n.merge(this.get(),n(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function E(a,b){do a=a[b];while(a&&1!==a.nodeType);return a}n.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return n.dir(a,"parentNode")},parentsUntil:function(a,b,c){return n.dir(a,"parentNode",c)},next:function(a){return E(a,"nextSibling")},prev:function(a){return E(a,"previousSibling")},nextAll:function(a){return n.dir(a,"nextSibling")},prevAll:function(a){return n.dir(a,"previousSibling")},nextUntil:function(a,b,c){return n.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return n.dir(a,"previousSibling",c)},siblings:function(a){return n.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return n.sibling(a.firstChild)},contents:function(a){return n.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:n.merge([],a.childNodes)}},function(a,b){n.fn[a]=function(c,d){var e=n.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=n.filter(d,e)),this.length>1&&(D[a]||(e=n.unique(e)),C.test(a)&&(e=e.reverse())),this.pushStack(e)}});var F=/\S+/g,G={};function H(a){var b=G[a]={};return n.each(a.match(F)||[],function(a,c){b[c]=!0}),b}n.Callbacks=function(a){a="string"==typeof a?G[a]||H(a):n.extend({},a);var b,c,d,e,f,g,h=[],i=!a.once&&[],j=function(l){for(c=a.memory&&l,d=!0,f=g||0,g=0,e=h.length,b=!0;h&&e>f;f++)if(h[f].apply(l[0],l[1])===!1&&a.stopOnFalse){c=!1;break}b=!1,h&&(i?i.length&&j(i.shift()):c?h=[]:k.disable())},k={add:function(){if(h){var d=h.length;!function f(b){n.each(b,function(b,c){var d=n.type(c);"function"===d?a.unique&&k.has(c)||h.push(c):c&&c.length&&"string"!==d&&f(c)})}(arguments),b?e=h.length:c&&(g=d,j(c))}return this},remove:function(){return h&&n.each(arguments,function(a,c){var d;while((d=n.inArray(c,h,d))>-1)h.splice(d,1),b&&(e>=d&&e--,f>=d&&f--)}),this},has:function(a){return a?n.inArray(a,h)>-1:!(!h||!h.length)},empty:function(){return h=[],e=0,this},disable:function(){return h=i=c=void 0,this},disabled:function(){return!h},lock:function(){return i=void 0,c||k.disable(),this},locked:function(){return!i},fireWith:function(a,c){return!h||d&&!i||(c=c||[],c=[a,c.slice?c.slice():c],b?i.push(c):j(c)),this},fire:function(){return k.fireWith(this,arguments),this},fired:function(){return!!d}};return k},n.extend({Deferred:function(a){var b=[["resolve","done",n.Callbacks("once memory"),"resolved"],["reject","fail",n.Callbacks("once memory"),"rejected"],["notify","progress",n.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return n.Deferred(function(c){n.each(b,function(b,f){var g=n.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&n.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?n.extend(a,d):d}},e={};return d.pipe=d.then,n.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=d.call(arguments),e=c.length,f=1!==e||a&&n.isFunction(a.promise)?e:0,g=1===f?a:n.Deferred(),h=function(a,b,c){return function(e){b[a]=this,c[a]=arguments.length>1?d.call(arguments):e,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(e>1)for(i=new Array(e),j=new Array(e),k=new Array(e);e>b;b++)c[b]&&n.isFunction(c[b].promise)?c[b].promise().done(h(b,k,c)).fail(g.reject).progress(h(b,j,i)):--f;return f||g.resolveWith(k,c),g.promise()}});var I;n.fn.ready=function(a){return n.ready.promise().done(a),this},n.extend({isReady:!1,readyWait:1,holdReady:function(a){a?n.readyWait++:n.ready(!0)},ready:function(a){if(a===!0?!--n.readyWait:!n.isReady){if(!z.body)return setTimeout(n.ready);n.isReady=!0,a!==!0&&--n.readyWait>0||(I.resolveWith(z,[n]),n.fn.trigger&&n(z).trigger("ready").off("ready"))}}});function J(){z.addEventListener?(z.removeEventListener("DOMContentLoaded",K,!1),a.removeEventListener("load",K,!1)):(z.detachEvent("onreadystatechange",K),a.detachEvent("onload",K))}function K(){(z.addEventListener||"load"===event.type||"complete"===z.readyState)&&(J(),n.ready())}n.ready.promise=function(b){if(!I)if(I=n.Deferred(),"complete"===z.readyState)setTimeout(n.ready);else if(z.addEventListener)z.addEventListener("DOMContentLoaded",K,!1),a.addEventListener("load",K,!1);else{z.attachEvent("onreadystatechange",K),a.attachEvent("onload",K);var c=!1;try{c=null==a.frameElement&&z.documentElement}catch(d){}c&&c.doScroll&&!function e(){if(!n.isReady){try{c.doScroll("left")}catch(a){return setTimeout(e,50)}J(),n.ready()}}()}return I.promise(b)};var L="undefined",M;for(M in n(l))break;l.ownLast="0"!==M,l.inlineBlockNeedsLayout=!1,n(function(){var a,b,c=z.getElementsByTagName("body")[0];c&&(a=z.createElement("div"),a.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px",b=z.createElement("div"),c.appendChild(a).appendChild(b),typeof b.style.zoom!==L&&(b.style.cssText="border:0;margin:0;width:1px;padding:1px;display:inline;zoom:1",(l.inlineBlockNeedsLayout=3===b.offsetWidth)&&(c.style.zoom=1)),c.removeChild(a),a=b=null)}),function(){var a=z.createElement("div");if(null==l.deleteExpando){l.deleteExpando=!0;try{delete a.test}catch(b){l.deleteExpando=!1}}a=null}(),n.acceptData=function(a){var b=n.noData[(a.nodeName+" ").toLowerCase()],c=+a.nodeType||1;return 1!==c&&9!==c?!1:!b||b!==!0&&a.getAttribute("classid")===b};var N=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,O=/([A-Z])/g;function P(a,b,c){if(void 0===c&&1===a.nodeType){var d="data-"+b.replace(O,"-$1").toLowerCase();if(c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:N.test(c)?n.parseJSON(c):c}catch(e){}n.data(a,b,c)}else c=void 0}return c}function Q(a){var b;for(b in a)if(("data"!==b||!n.isEmptyObject(a[b]))&&"toJSON"!==b)return!1;return!0}function R(a,b,d,e){if(n.acceptData(a)){var f,g,h=n.expando,i=a.nodeType,j=i?n.cache:a,k=i?a[h]:a[h]&&h;if(k&&j[k]&&(e||j[k].data)||void 0!==d||"string"!=typeof b)return k||(k=i?a[h]=c.pop()||n.guid++:h),j[k]||(j[k]=i?{}:{toJSON:n.noop}),("object"==typeof b||"function"==typeof b)&&(e?j[k]=n.extend(j[k],b):j[k].data=n.extend(j[k].data,b)),g=j[k],e||(g.data||(g.data={}),g=g.data),void 0!==d&&(g[n.camelCase(b)]=d),"string"==typeof b?(f=g[b],null==f&&(f=g[n.camelCase(b)])):f=g,f
+}}function S(a,b,c){if(n.acceptData(a)){var d,e,f=a.nodeType,g=f?n.cache:a,h=f?a[n.expando]:n.expando;if(g[h]){if(b&&(d=c?g[h]:g[h].data)){n.isArray(b)?b=b.concat(n.map(b,n.camelCase)):b in d?b=[b]:(b=n.camelCase(b),b=b in d?[b]:b.split(" ")),e=b.length;while(e--)delete d[b[e]];if(c?!Q(d):!n.isEmptyObject(d))return}(c||(delete g[h].data,Q(g[h])))&&(f?n.cleanData([a],!0):l.deleteExpando||g!=g.window?delete g[h]:g[h]=null)}}}n.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(a){return a=a.nodeType?n.cache[a[n.expando]]:a[n.expando],!!a&&!Q(a)},data:function(a,b,c){return R(a,b,c)},removeData:function(a,b){return S(a,b)},_data:function(a,b,c){return R(a,b,c,!0)},_removeData:function(a,b){return S(a,b,!0)}}),n.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=n.data(f),1===f.nodeType&&!n._data(f,"parsedAttrs"))){c=g.length;while(c--)d=g[c].name,0===d.indexOf("data-")&&(d=n.camelCase(d.slice(5)),P(f,d,e[d]));n._data(f,"parsedAttrs",!0)}return e}return"object"==typeof a?this.each(function(){n.data(this,a)}):arguments.length>1?this.each(function(){n.data(this,a,b)}):f?P(f,a,n.data(f,a)):void 0},removeData:function(a){return this.each(function(){n.removeData(this,a)})}}),n.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=n._data(a,b),c&&(!d||n.isArray(c)?d=n._data(a,b,n.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=n.queue(a,b),d=c.length,e=c.shift(),f=n._queueHooks(a,b),g=function(){n.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return n._data(a,c)||n._data(a,c,{empty:n.Callbacks("once memory").add(function(){n._removeData(a,b+"queue"),n._removeData(a,c)})})}}),n.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length<c?n.queue(this[0],a):void 0===b?this:this.each(function(){var c=n.queue(this,a,b);n._queueHooks(this,a),"fx"===a&&"inprogress"!==c[0]&&n.dequeue(this,a)})},dequeue:function(a){return this.each(function(){n.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,b){var c,d=1,e=n.Deferred(),f=this,g=this.length,h=function(){--d||e.resolveWith(f,[f])};"string"!=typeof a&&(b=a,a=void 0),a=a||"fx";while(g--)c=n._data(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}});var T=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,U=["Top","Right","Bottom","Left"],V=function(a,b){return a=b||a,"none"===n.css(a,"display")||!n.contains(a.ownerDocument,a)},W=n.access=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===n.type(c)){e=!0;for(h in c)n.access(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,n.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(n(a),c)})),b))for(;i>h;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},X=/^(?:checkbox|radio)$/i;!function(){var a=z.createDocumentFragment(),b=z.createElement("div"),c=z.createElement("input");if(b.setAttribute("className","t"),b.innerHTML="  <link/><table></table><a href='/a'>a</a>",l.leadingWhitespace=3===b.firstChild.nodeType,l.tbody=!b.getElementsByTagName("tbody").length,l.htmlSerialize=!!b.getElementsByTagName("link").length,l.html5Clone="<:nav></:nav>"!==z.createElement("nav").cloneNode(!0).outerHTML,c.type="checkbox",c.checked=!0,a.appendChild(c),l.appendChecked=c.checked,b.innerHTML="<textarea>x</textarea>",l.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue,a.appendChild(b),b.innerHTML="<input type='radio' checked='checked' name='t'/>",l.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,l.noCloneEvent=!0,b.attachEvent&&(b.attachEvent("onclick",function(){l.noCloneEvent=!1}),b.cloneNode(!0).click()),null==l.deleteExpando){l.deleteExpando=!0;try{delete b.test}catch(d){l.deleteExpando=!1}}a=b=c=null}(),function(){var b,c,d=z.createElement("div");for(b in{submit:!0,change:!0,focusin:!0})c="on"+b,(l[b+"Bubbles"]=c in a)||(d.setAttribute(c,"t"),l[b+"Bubbles"]=d.attributes[c].expando===!1);d=null}();var Y=/^(?:input|select|textarea)$/i,Z=/^key/,$=/^(?:mouse|contextmenu)|click/,_=/^(?:focusinfocus|focusoutblur)$/,ab=/^([^.]*)(?:\.(.+)|)$/;function bb(){return!0}function cb(){return!1}function db(){try{return z.activeElement}catch(a){}}n.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=n._data(a);if(r){c.handler&&(i=c,c=i.handler,e=i.selector),c.guid||(c.guid=n.guid++),(g=r.events)||(g=r.events={}),(k=r.handle)||(k=r.handle=function(a){return typeof n===L||a&&n.event.triggered===a.type?void 0:n.event.dispatch.apply(k.elem,arguments)},k.elem=a),b=(b||"").match(F)||[""],h=b.length;while(h--)f=ab.exec(b[h])||[],o=q=f[1],p=(f[2]||"").split(".").sort(),o&&(j=n.event.special[o]||{},o=(e?j.delegateType:j.bindType)||o,j=n.event.special[o]||{},l=n.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&n.expr.match.needsContext.test(e),namespace:p.join(".")},i),(m=g[o])||(m=g[o]=[],m.delegateCount=0,j.setup&&j.setup.call(a,d,p,k)!==!1||(a.addEventListener?a.addEventListener(o,k,!1):a.attachEvent&&a.attachEvent("on"+o,k))),j.add&&(j.add.call(a,l),l.handler.guid||(l.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,l):m.push(l),n.event.global[o]=!0);a=null}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=n.hasData(a)&&n._data(a);if(r&&(k=r.events)){b=(b||"").match(F)||[""],j=b.length;while(j--)if(h=ab.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=n.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,m=k[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),i=f=m.length;while(f--)g=m[f],!e&&q!==g.origType||c&&c.guid!==g.guid||h&&!h.test(g.namespace)||d&&d!==g.selector&&("**"!==d||!g.selector)||(m.splice(f,1),g.selector&&m.delegateCount--,l.remove&&l.remove.call(a,g));i&&!m.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||n.removeEvent(a,o,r.handle),delete k[o])}else for(o in k)n.event.remove(a,o+b[j],c,d,!0);n.isEmptyObject(k)&&(delete r.handle,n._removeData(a,"events"))}},trigger:function(b,c,d,e){var f,g,h,i,k,l,m,o=[d||z],p=j.call(b,"type")?b.type:b,q=j.call(b,"namespace")?b.namespace.split("."):[];if(h=l=d=d||z,3!==d.nodeType&&8!==d.nodeType&&!_.test(p+n.event.triggered)&&(p.indexOf(".")>=0&&(q=p.split("."),p=q.shift(),q.sort()),g=p.indexOf(":")<0&&"on"+p,b=b[n.expando]?b:new n.Event(p,"object"==typeof b&&b),b.isTrigger=e?2:3,b.namespace=q.join("."),b.namespace_re=b.namespace?new RegExp("(^|\\.)"+q.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=d),c=null==c?[b]:n.makeArray(c,[b]),k=n.event.special[p]||{},e||!k.trigger||k.trigger.apply(d,c)!==!1)){if(!e&&!k.noBubble&&!n.isWindow(d)){for(i=k.delegateType||p,_.test(i+p)||(h=h.parentNode);h;h=h.parentNode)o.push(h),l=h;l===(d.ownerDocument||z)&&o.push(l.defaultView||l.parentWindow||a)}m=0;while((h=o[m++])&&!b.isPropagationStopped())b.type=m>1?i:k.bindType||p,f=(n._data(h,"events")||{})[b.type]&&n._data(h,"handle"),f&&f.apply(h,c),f=g&&h[g],f&&f.apply&&n.acceptData(h)&&(b.result=f.apply(h,c),b.result===!1&&b.preventDefault());if(b.type=p,!e&&!b.isDefaultPrevented()&&(!k._default||k._default.apply(o.pop(),c)===!1)&&n.acceptData(d)&&g&&d[p]&&!n.isWindow(d)){l=d[g],l&&(d[g]=null),n.event.triggered=p;try{d[p]()}catch(r){}n.event.triggered=void 0,l&&(d[g]=l)}return b.result}},dispatch:function(a){a=n.event.fix(a);var b,c,e,f,g,h=[],i=d.call(arguments),j=(n._data(this,"events")||{})[a.type]||[],k=n.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=n.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,g=0;while((e=f.handlers[g++])&&!a.isImmediatePropagationStopped())(!a.namespace_re||a.namespace_re.test(e.namespace))&&(a.handleObj=e,a.data=e.data,c=((n.event.special[e.origType]||{}).handle||e.handler).apply(f.elem,i),void 0!==c&&(a.result=c)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&(!a.button||"click"!==a.type))for(;i!=this;i=i.parentNode||this)if(1===i.nodeType&&(i.disabled!==!0||"click"!==a.type)){for(e=[],f=0;h>f;f++)d=b[f],c=d.selector+" ",void 0===e[c]&&(e[c]=d.needsContext?n(c,this).index(i)>=0:n.find(c,this,null,[i]).length),e[c]&&e.push(d);e.length&&g.push({elem:i,handlers:e})}return h<b.length&&g.push({elem:this,handlers:b.slice(h)}),g},fix:function(a){if(a[n.expando])return a;var b,c,d,e=a.type,f=a,g=this.fixHooks[e];g||(this.fixHooks[e]=g=$.test(e)?this.mouseHooks:Z.test(e)?this.keyHooks:{}),d=g.props?this.props.concat(g.props):this.props,a=new n.Event(f),b=d.length;while(b--)c=d[b],a[c]=f[c];return a.target||(a.target=f.srcElement||z),3===a.target.nodeType&&(a.target=a.target.parentNode),a.metaKey=!!a.metaKey,g.filter?g.filter(a,f):a},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){return null==a.which&&(a.which=null!=b.charCode?b.charCode:b.keyCode),a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,b){var c,d,e,f=b.button,g=b.fromElement;return null==a.pageX&&null!=b.clientX&&(d=a.target.ownerDocument||z,e=d.documentElement,c=d.body,a.pageX=b.clientX+(e&&e.scrollLeft||c&&c.scrollLeft||0)-(e&&e.clientLeft||c&&c.clientLeft||0),a.pageY=b.clientY+(e&&e.scrollTop||c&&c.scrollTop||0)-(e&&e.clientTop||c&&c.clientTop||0)),!a.relatedTarget&&g&&(a.relatedTarget=g===a.target?b.toElement:g),a.which||void 0===f||(a.which=1&f?1:2&f?3:4&f?2:0),a}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==db()&&this.focus)try{return this.focus(),!1}catch(a){}},delegateType:"focusin"},blur:{trigger:function(){return this===db()&&this.blur?(this.blur(),!1):void 0},delegateType:"focusout"},click:{trigger:function(){return n.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):void 0},_default:function(a){return n.nodeName(a.target,"a")}},beforeunload:{postDispatch:function(a){void 0!==a.result&&(a.originalEvent.returnValue=a.result)}}},simulate:function(a,b,c,d){var e=n.extend(new n.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?n.event.trigger(e,null,b):n.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},n.removeEvent=z.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){var d="on"+b;a.detachEvent&&(typeof a[d]===L&&(a[d]=null),a.detachEvent(d,c))},n.Event=function(a,b){return this instanceof n.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||void 0===a.defaultPrevented&&(a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault())?bb:cb):this.type=a,b&&n.extend(this,b),this.timeStamp=a&&a.timeStamp||n.now(),void(this[n.expando]=!0)):new n.Event(a,b)},n.Event.prototype={isDefaultPrevented:cb,isPropagationStopped:cb,isImmediatePropagationStopped:cb,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=bb,a&&(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=bb,a&&(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=bb,this.stopPropagation()}},n.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){n.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj;return(!e||e!==d&&!n.contains(d,e))&&(a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b),c}}}),l.submitBubbles||(n.event.special.submit={setup:function(){return n.nodeName(this,"form")?!1:void n.event.add(this,"click._submit keypress._submit",function(a){var b=a.target,c=n.nodeName(b,"input")||n.nodeName(b,"button")?b.form:void 0;c&&!n._data(c,"submitBubbles")&&(n.event.add(c,"submit._submit",function(a){a._submit_bubble=!0}),n._data(c,"submitBubbles",!0))})},postDispatch:function(a){a._submit_bubble&&(delete a._submit_bubble,this.parentNode&&!a.isTrigger&&n.event.simulate("submit",this.parentNode,a,!0))},teardown:function(){return n.nodeName(this,"form")?!1:void n.event.remove(this,"._submit")}}),l.changeBubbles||(n.event.special.change={setup:function(){return Y.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(n.event.add(this,"propertychange._change",function(a){"checked"===a.originalEvent.propertyName&&(this._just_changed=!0)}),n.event.add(this,"click._change",function(a){this._just_changed&&!a.isTrigger&&(this._just_changed=!1),n.event.simulate("change",this,a,!0)})),!1):void n.event.add(this,"beforeactivate._change",function(a){var b=a.target;Y.test(b.nodeName)&&!n._data(b,"changeBubbles")&&(n.event.add(b,"change._change",function(a){!this.parentNode||a.isSimulated||a.isTrigger||n.event.simulate("change",this.parentNode,a,!0)}),n._data(b,"changeBubbles",!0))})},handle:function(a){var b=a.target;return this!==b||a.isSimulated||a.isTrigger||"radio"!==b.type&&"checkbox"!==b.type?a.handleObj.handler.apply(this,arguments):void 0},teardown:function(){return n.event.remove(this,"._change"),!Y.test(this.nodeName)}}),l.focusinBubbles||n.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){n.event.simulate(b,a.target,n.event.fix(a),!0)};n.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=n._data(d,b);e||d.addEventListener(a,c,!0),n._data(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=n._data(d,b)-1;e?n._data(d,b,e):(d.removeEventListener(a,c,!0),n._removeData(d,b))}}}),n.fn.extend({on:function(a,b,c,d,e){var f,g;if("object"==typeof a){"string"!=typeof b&&(c=c||b,b=void 0);for(f in a)this.on(f,b,c,a[f],e);return this}if(null==c&&null==d?(d=b,c=b=void 0):null==d&&("string"==typeof b?(d=c,c=void 0):(d=c,c=b,b=void 0)),d===!1)d=cb;else if(!d)return this;return 1===e&&(g=d,d=function(a){return n().off(a),g.apply(this,arguments)},d.guid=g.guid||(g.guid=n.guid++)),this.each(function(){n.event.add(this,a,d,c,b)})},one:function(a,b,c,d){return this.on(a,b,c,d,1)},off:function(a,b,c){var d,e;if(a&&a.preventDefault&&a.handleObj)return d=a.handleObj,n(a.delegateTarget).off(d.namespace?d.origType+"."+d.namespace:d.origType,d.selector,d.handler),this;if("object"==typeof a){for(e in a)this.off(e,b,a[e]);return this}return(b===!1||"function"==typeof b)&&(c=b,b=void 0),c===!1&&(c=cb),this.each(function(){n.event.remove(this,a,c,b)})},trigger:function(a,b){return this.each(function(){n.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];return c?n.event.trigger(a,b,c,!0):void 0}});function eb(a){var b=fb.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}var fb="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",gb=/ jQuery\d+="(?:null|\d+)"/g,hb=new RegExp("<(?:"+fb+")[\\s/>]","i"),ib=/^\s+/,jb=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,kb=/<([\w:]+)/,lb=/<tbody/i,mb=/<|&#?\w+;/,nb=/<(?:script|style|link)/i,ob=/checked\s*(?:[^=]|=\s*.checked.)/i,pb=/^$|\/(?:java|ecma)script/i,qb=/^true\/(.*)/,rb=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,sb={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:l.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]},tb=eb(z),ub=tb.appendChild(z.createElement("div"));sb.optgroup=sb.option,sb.tbody=sb.tfoot=sb.colgroup=sb.caption=sb.thead,sb.th=sb.td;function vb(a,b){var c,d,e=0,f=typeof a.getElementsByTagName!==L?a.getElementsByTagName(b||"*"):typeof a.querySelectorAll!==L?a.querySelectorAll(b||"*"):void 0;if(!f)for(f=[],c=a.childNodes||a;null!=(d=c[e]);e++)!b||n.nodeName(d,b)?f.push(d):n.merge(f,vb(d,b));return void 0===b||b&&n.nodeName(a,b)?n.merge([a],f):f}function wb(a){X.test(a.type)&&(a.defaultChecked=a.checked)}function xb(a,b){return n.nodeName(a,"table")&&n.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function yb(a){return a.type=(null!==n.find.attr(a,"type"))+"/"+a.type,a}function zb(a){var b=qb.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function Ab(a,b){for(var c,d=0;null!=(c=a[d]);d++)n._data(c,"globalEval",!b||n._data(b[d],"globalEval"))}function Bb(a,b){if(1===b.nodeType&&n.hasData(a)){var c,d,e,f=n._data(a),g=n._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;e>d;d++)n.event.add(b,c,h[c][d])}g.data&&(g.data=n.extend({},g.data))}}function Cb(a,b){var c,d,e;if(1===b.nodeType){if(c=b.nodeName.toLowerCase(),!l.noCloneEvent&&b[n.expando]){e=n._data(b);for(d in e.events)n.removeEvent(b,d,e.handle);b.removeAttribute(n.expando)}"script"===c&&b.text!==a.text?(yb(b).text=a.text,zb(b)):"object"===c?(b.parentNode&&(b.outerHTML=a.outerHTML),l.html5Clone&&a.innerHTML&&!n.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):"input"===c&&X.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):"option"===c?b.defaultSelected=b.selected=a.defaultSelected:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}}n.extend({clone:function(a,b,c){var d,e,f,g,h,i=n.contains(a.ownerDocument,a);if(l.html5Clone||n.isXMLDoc(a)||!hb.test("<"+a.nodeName+">")?f=a.cloneNode(!0):(ub.innerHTML=a.outerHTML,ub.removeChild(f=ub.firstChild)),!(l.noCloneEvent&&l.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||n.isXMLDoc(a)))for(d=vb(f),h=vb(a),g=0;null!=(e=h[g]);++g)d[g]&&Cb(e,d[g]);if(b)if(c)for(h=h||vb(a),d=d||vb(f),g=0;null!=(e=h[g]);g++)Bb(e,d[g]);else Bb(a,f);return d=vb(f,"script"),d.length>0&&Ab(d,!i&&vb(a,"script")),d=h=e=null,f},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,k,m=a.length,o=eb(b),p=[],q=0;m>q;q++)if(f=a[q],f||0===f)if("object"===n.type(f))n.merge(p,f.nodeType?[f]:f);else if(mb.test(f)){h=h||o.appendChild(b.createElement("div")),i=(kb.exec(f)||["",""])[1].toLowerCase(),k=sb[i]||sb._default,h.innerHTML=k[1]+f.replace(jb,"<$1></$2>")+k[2],e=k[0];while(e--)h=h.lastChild;if(!l.leadingWhitespace&&ib.test(f)&&p.push(b.createTextNode(ib.exec(f)[0])),!l.tbody){f="table"!==i||lb.test(f)?"<table>"!==k[1]||lb.test(f)?0:h:h.firstChild,e=f&&f.childNodes.length;while(e--)n.nodeName(j=f.childNodes[e],"tbody")&&!j.childNodes.length&&f.removeChild(j)}n.merge(p,h.childNodes),h.textContent="";while(h.firstChild)h.removeChild(h.firstChild);h=o.lastChild}else p.push(b.createTextNode(f));h&&o.removeChild(h),l.appendChecked||n.grep(vb(p,"input"),wb),q=0;while(f=p[q++])if((!d||-1===n.inArray(f,d))&&(g=n.contains(f.ownerDocument,f),h=vb(o.appendChild(f),"script"),g&&Ab(h),c)){e=0;while(f=h[e++])pb.test(f.type||"")&&c.push(f)}return h=null,o},cleanData:function(a,b){for(var d,e,f,g,h=0,i=n.expando,j=n.cache,k=l.deleteExpando,m=n.event.special;null!=(d=a[h]);h++)if((b||n.acceptData(d))&&(f=d[i],g=f&&j[f])){if(g.events)for(e in g.events)m[e]?n.event.remove(d,e):n.removeEvent(d,e,g.handle);j[f]&&(delete j[f],k?delete d[i]:typeof d.removeAttribute!==L?d.removeAttribute(i):d[i]=null,c.push(f))}}}),n.fn.extend({text:function(a){return W(this,function(a){return void 0===a?n.text(this):this.empty().append((this[0]&&this[0].ownerDocument||z).createTextNode(a))},null,a,arguments.length)},append:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=xb(this,a);b.appendChild(a)}})},prepend:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=xb(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},remove:function(a,b){for(var c,d=a?n.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||n.cleanData(vb(c)),c.parentNode&&(b&&n.contains(c.ownerDocument,c)&&Ab(vb(c,"script")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++){1===a.nodeType&&n.cleanData(vb(a,!1));while(a.firstChild)a.removeChild(a.firstChild);a.options&&n.nodeName(a,"select")&&(a.options.length=0)}return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return n.clone(this,a,b)})},html:function(a){return W(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a)return 1===b.nodeType?b.innerHTML.replace(gb,""):void 0;if(!("string"!=typeof a||nb.test(a)||!l.htmlSerialize&&hb.test(a)||!l.leadingWhitespace&&ib.test(a)||sb[(kb.exec(a)||["",""])[1].toLowerCase()])){a=a.replace(jb,"<$1></$2>");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(n.cleanData(vb(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=arguments[0];return this.domManip(arguments,function(b){a=this.parentNode,n.cleanData(vb(this)),a&&a.replaceChild(b,this)}),a&&(a.length||a.nodeType)?this:this.remove()},detach:function(a){return this.remove(a,!0)},domManip:function(a,b){a=e.apply([],a);var c,d,f,g,h,i,j=0,k=this.length,m=this,o=k-1,p=a[0],q=n.isFunction(p);if(q||k>1&&"string"==typeof p&&!l.checkClone&&ob.test(p))return this.each(function(c){var d=m.eq(c);q&&(a[0]=p.call(this,c,d.html())),d.domManip(a,b)});if(k&&(i=n.buildFragment(a,this[0].ownerDocument,!1,this),c=i.firstChild,1===i.childNodes.length&&(i=c),c)){for(g=n.map(vb(i,"script"),yb),f=g.length;k>j;j++)d=i,j!==o&&(d=n.clone(d,!0,!0),f&&n.merge(g,vb(d,"script"))),b.call(this[j],d,j);if(f)for(h=g[g.length-1].ownerDocument,n.map(g,zb),j=0;f>j;j++)d=g[j],pb.test(d.type||"")&&!n._data(d,"globalEval")&&n.contains(h,d)&&(d.src?n._evalUrl&&n._evalUrl(d.src):n.globalEval((d.text||d.textContent||d.innerHTML||"").replace(rb,"")));i=c=null}return this}}),n.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){n.fn[a]=function(a){for(var c,d=0,e=[],g=n(a),h=g.length-1;h>=d;d++)c=d===h?this:this.clone(!0),n(g[d])[b](c),f.apply(e,c.get());return this.pushStack(e)}});var Db,Eb={};function Fb(b,c){var d=n(c.createElement(b)).appendTo(c.body),e=a.getDefaultComputedStyle?a.getDefaultComputedStyle(d[0]).display:n.css(d[0],"display");return d.detach(),e}function Gb(a){var b=z,c=Eb[a];return c||(c=Fb(a,b),"none"!==c&&c||(Db=(Db||n("<iframe frameborder='0' width='0' height='0'/>")).appendTo(b.documentElement),b=(Db[0].contentWindow||Db[0].contentDocument).document,b.write(),b.close(),c=Fb(a,b),Db.detach()),Eb[a]=c),c}!function(){var a,b,c=z.createElement("div"),d="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;padding:0;margin:0;border:0";c.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",a=c.getElementsByTagName("a")[0],a.style.cssText="float:left;opacity:.5",l.opacity=/^0.5/.test(a.style.opacity),l.cssFloat=!!a.style.cssFloat,c.style.backgroundClip="content-box",c.cloneNode(!0).style.backgroundClip="",l.clearCloneStyle="content-box"===c.style.backgroundClip,a=c=null,l.shrinkWrapBlocks=function(){var a,c,e,f;if(null==b){if(a=z.getElementsByTagName("body")[0],!a)return;f="border:0;width:0;height:0;position:absolute;top:0;left:-9999px",c=z.createElement("div"),e=z.createElement("div"),a.appendChild(c).appendChild(e),b=!1,typeof e.style.zoom!==L&&(e.style.cssText=d+";width:1px;padding:1px;zoom:1",e.innerHTML="<div></div>",e.firstChild.style.width="5px",b=3!==e.offsetWidth),a.removeChild(c),a=c=e=null}return b}}();var Hb=/^margin/,Ib=new RegExp("^("+T+")(?!px)[a-z%]+$","i"),Jb,Kb,Lb=/^(top|right|bottom|left)$/;a.getComputedStyle?(Jb=function(a){return a.ownerDocument.defaultView.getComputedStyle(a,null)},Kb=function(a,b,c){var d,e,f,g,h=a.style;return c=c||Jb(a),g=c?c.getPropertyValue(b)||c[b]:void 0,c&&(""!==g||n.contains(a.ownerDocument,a)||(g=n.style(a,b)),Ib.test(g)&&Hb.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=g,g=c.width,h.width=d,h.minWidth=e,h.maxWidth=f)),void 0===g?g:g+""}):z.documentElement.currentStyle&&(Jb=function(a){return a.currentStyle},Kb=function(a,b,c){var d,e,f,g,h=a.style;return c=c||Jb(a),g=c?c[b]:void 0,null==g&&h&&h[b]&&(g=h[b]),Ib.test(g)&&!Lb.test(b)&&(d=h.left,e=a.runtimeStyle,f=e&&e.left,f&&(e.left=a.currentStyle.left),h.left="fontSize"===b?"1em":g,g=h.pixelLeft+"px",h.left=d,f&&(e.left=f)),void 0===g?g:g+""||"auto"});function Mb(a,b){return{get:function(){var c=a();if(null!=c)return c?void delete this.get:(this.get=b).apply(this,arguments)}}}!function(){var b,c,d,e,f,g,h=z.createElement("div"),i="border:0;width:0;height:0;position:absolute;top:0;left:-9999px",j="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;padding:0;margin:0;border:0";h.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",b=h.getElementsByTagName("a")[0],b.style.cssText="float:left;opacity:.5",l.opacity=/^0.5/.test(b.style.opacity),l.cssFloat=!!b.style.cssFloat,h.style.backgroundClip="content-box",h.cloneNode(!0).style.backgroundClip="",l.clearCloneStyle="content-box"===h.style.backgroundClip,b=h=null,n.extend(l,{reliableHiddenOffsets:function(){if(null!=c)return c;var a,b,d,e=z.createElement("div"),f=z.getElementsByTagName("body")[0];if(f)return e.setAttribute("className","t"),e.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",a=z.createElement("div"),a.style.cssText=i,f.appendChild(a).appendChild(e),e.innerHTML="<table><tr><td></td><td>t</td></tr></table>",b=e.getElementsByTagName("td"),b[0].style.cssText="padding:0;margin:0;border:0;display:none",d=0===b[0].offsetHeight,b[0].style.display="",b[1].style.display="none",c=d&&0===b[0].offsetHeight,f.removeChild(a),e=f=null,c},boxSizing:function(){return null==d&&k(),d},boxSizingReliable:function(){return null==e&&k(),e},pixelPosition:function(){return null==f&&k(),f},reliableMarginRight:function(){var b,c,d,e;if(null==g&&a.getComputedStyle){if(b=z.getElementsByTagName("body")[0],!b)return;c=z.createElement("div"),d=z.createElement("div"),c.style.cssText=i,b.appendChild(c).appendChild(d),e=d.appendChild(z.createElement("div")),e.style.cssText=d.style.cssText=j,e.style.marginRight=e.style.width="0",d.style.width="1px",g=!parseFloat((a.getComputedStyle(e,null)||{}).marginRight),b.removeChild(c)}return g}});function k(){var b,c,h=z.getElementsByTagName("body")[0];h&&(b=z.createElement("div"),c=z.createElement("div"),b.style.cssText=i,h.appendChild(b).appendChild(c),c.style.cssText="-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;position:absolute;display:block;padding:1px;border:1px;width:4px;margin-top:1%;top:1%",n.swap(h,null!=h.style.zoom?{zoom:1}:{},function(){d=4===c.offsetWidth}),e=!0,f=!1,g=!0,a.getComputedStyle&&(f="1%"!==(a.getComputedStyle(c,null)||{}).top,e="4px"===(a.getComputedStyle(c,null)||{width:"4px"}).width),h.removeChild(b),c=h=null)}}(),n.swap=function(a,b,c,d){var e,f,g={};for(f in b)g[f]=a.style[f],a.style[f]=b[f];e=c.apply(a,d||[]);for(f in b)a.style[f]=g[f];return e};var Nb=/alpha\([^)]*\)/i,Ob=/opacity\s*=\s*([^)]*)/,Pb=/^(none|table(?!-c[ea]).+)/,Qb=new RegExp("^("+T+")(.*)$","i"),Rb=new RegExp("^([+-])=("+T+")","i"),Sb={position:"absolute",visibility:"hidden",display:"block"},Tb={letterSpacing:0,fontWeight:400},Ub=["Webkit","O","Moz","ms"];function Vb(a,b){if(b in a)return b;var c=b.charAt(0).toUpperCase()+b.slice(1),d=b,e=Ub.length;while(e--)if(b=Ub[e]+c,b in a)return b;return d}function Wb(a,b){for(var c,d,e,f=[],g=0,h=a.length;h>g;g++)d=a[g],d.style&&(f[g]=n._data(d,"olddisplay"),c=d.style.display,b?(f[g]||"none"!==c||(d.style.display=""),""===d.style.display&&V(d)&&(f[g]=n._data(d,"olddisplay",Gb(d.nodeName)))):f[g]||(e=V(d),(c&&"none"!==c||!e)&&n._data(d,"olddisplay",e?c:n.css(d,"display"))));for(g=0;h>g;g++)d=a[g],d.style&&(b&&"none"!==d.style.display&&""!==d.style.display||(d.style.display=b?f[g]||"":"none"));return a}function Xb(a,b,c){var d=Qb.exec(b);return d?Math.max(0,d[1]-(c||0))+(d[2]||"px"):b}function Yb(a,b,c,d,e){for(var f=c===(d?"border":"content")?4:"width"===b?1:0,g=0;4>f;f+=2)"margin"===c&&(g+=n.css(a,c+U[f],!0,e)),d?("content"===c&&(g-=n.css(a,"padding"+U[f],!0,e)),"margin"!==c&&(g-=n.css(a,"border"+U[f]+"Width",!0,e))):(g+=n.css(a,"padding"+U[f],!0,e),"padding"!==c&&(g+=n.css(a,"border"+U[f]+"Width",!0,e)));return g}function Zb(a,b,c){var d=!0,e="width"===b?a.offsetWidth:a.offsetHeight,f=Jb(a),g=l.boxSizing()&&"border-box"===n.css(a,"boxSizing",!1,f);if(0>=e||null==e){if(e=Kb(a,b,f),(0>e||null==e)&&(e=a.style[b]),Ib.test(e))return e;d=g&&(l.boxSizingReliable()||e===a.style[b]),e=parseFloat(e)||0}return e+Yb(a,b,c||(g?"border":"content"),d,f)+"px"}n.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=Kb(a,"opacity");return""===c?"1":c}}}},cssNumber:{columnCount:!0,fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":l.cssFloat?"cssFloat":"styleFloat"},style:function(a,b,c,d){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var e,f,g,h=n.camelCase(b),i=a.style;if(b=n.cssProps[h]||(n.cssProps[h]=Vb(i,h)),g=n.cssHooks[b]||n.cssHooks[h],void 0===c)return g&&"get"in g&&void 0!==(e=g.get(a,!1,d))?e:i[b];if(f=typeof c,"string"===f&&(e=Rb.exec(c))&&(c=(e[1]+1)*e[2]+parseFloat(n.css(a,b)),f="number"),null!=c&&c===c&&("number"!==f||n.cssNumber[h]||(c+="px"),l.clearCloneStyle||""!==c||0!==b.indexOf("background")||(i[b]="inherit"),!(g&&"set"in g&&void 0===(c=g.set(a,c,d)))))try{i[b]="",i[b]=c}catch(j){}}},css:function(a,b,c,d){var e,f,g,h=n.camelCase(b);return b=n.cssProps[h]||(n.cssProps[h]=Vb(a.style,h)),g=n.cssHooks[b]||n.cssHooks[h],g&&"get"in g&&(f=g.get(a,!0,c)),void 0===f&&(f=Kb(a,b,d)),"normal"===f&&b in Tb&&(f=Tb[b]),""===c||c?(e=parseFloat(f),c===!0||n.isNumeric(e)?e||0:f):f}}),n.each(["height","width"],function(a,b){n.cssHooks[b]={get:function(a,c,d){return c?0===a.offsetWidth&&Pb.test(n.css(a,"display"))?n.swap(a,Sb,function(){return Zb(a,b,d)}):Zb(a,b,d):void 0},set:function(a,c,d){var e=d&&Jb(a);return Xb(a,c,d?Yb(a,b,d,l.boxSizing()&&"border-box"===n.css(a,"boxSizing",!1,e),e):0)}}}),l.opacity||(n.cssHooks.opacity={get:function(a,b){return Ob.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=n.isNumeric(b)?"alpha(opacity="+100*b+")":"",f=d&&d.filter||c.filter||"";c.zoom=1,(b>=1||""===b)&&""===n.trim(f.replace(Nb,""))&&c.removeAttribute&&(c.removeAttribute("filter"),""===b||d&&!d.filter)||(c.filter=Nb.test(f)?f.replace(Nb,e):f+" "+e)}}),n.cssHooks.marginRight=Mb(l.reliableMarginRight,function(a,b){return b?n.swap(a,{display:"inline-block"},Kb,[a,"marginRight"]):void 0}),n.each({margin:"",padding:"",border:"Width"},function(a,b){n.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];4>d;d++)e[a+U[d]+b]=f[d]||f[d-2]||f[0];return e}},Hb.test(a)||(n.cssHooks[a+b].set=Xb)}),n.fn.extend({css:function(a,b){return W(this,function(a,b,c){var d,e,f={},g=0;if(n.isArray(b)){for(d=Jb(a),e=b.length;e>g;g++)f[b[g]]=n.css(a,b[g],!1,d);return f}return void 0!==c?n.style(a,b,c):n.css(a,b)
+},a,b,arguments.length>1)},show:function(){return Wb(this,!0)},hide:function(){return Wb(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){V(this)?n(this).show():n(this).hide()})}});function $b(a,b,c,d,e){return new $b.prototype.init(a,b,c,d,e)}n.Tween=$b,$b.prototype={constructor:$b,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||"swing",this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(n.cssNumber[c]?"":"px")},cur:function(){var a=$b.propHooks[this.prop];return a&&a.get?a.get(this):$b.propHooks._default.get(this)},run:function(a){var b,c=$b.propHooks[this.prop];return this.pos=b=this.options.duration?n.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):$b.propHooks._default.set(this),this}},$b.prototype.init.prototype=$b.prototype,$b.propHooks={_default:{get:function(a){var b;return null==a.elem[a.prop]||a.elem.style&&null!=a.elem.style[a.prop]?(b=n.css(a.elem,a.prop,""),b&&"auto"!==b?b:0):a.elem[a.prop]},set:function(a){n.fx.step[a.prop]?n.fx.step[a.prop](a):a.elem.style&&(null!=a.elem.style[n.cssProps[a.prop]]||n.cssHooks[a.prop])?n.style(a.elem,a.prop,a.now+a.unit):a.elem[a.prop]=a.now}}},$b.propHooks.scrollTop=$b.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},n.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2}},n.fx=$b.prototype.init,n.fx.step={};var _b,ac,bc=/^(?:toggle|show|hide)$/,cc=new RegExp("^(?:([+-])=|)("+T+")([a-z%]*)$","i"),dc=/queueHooks$/,ec=[jc],fc={"*":[function(a,b){var c=this.createTween(a,b),d=c.cur(),e=cc.exec(b),f=e&&e[3]||(n.cssNumber[a]?"":"px"),g=(n.cssNumber[a]||"px"!==f&&+d)&&cc.exec(n.css(c.elem,a)),h=1,i=20;if(g&&g[3]!==f){f=f||g[3],e=e||[],g=+d||1;do h=h||".5",g/=h,n.style(c.elem,a,g+f);while(h!==(h=c.cur()/d)&&1!==h&&--i)}return e&&(g=c.start=+g||+d||0,c.unit=f,c.end=e[1]?g+(e[1]+1)*e[2]:+e[2]),c}]};function gc(){return setTimeout(function(){_b=void 0}),_b=n.now()}function hc(a,b){var c,d={height:a},e=0;for(b=b?1:0;4>e;e+=2-b)c=U[e],d["margin"+c]=d["padding"+c]=a;return b&&(d.opacity=d.width=a),d}function ic(a,b,c){for(var d,e=(fc[b]||[]).concat(fc["*"]),f=0,g=e.length;g>f;f++)if(d=e[f].call(c,b,a))return d}function jc(a,b,c){var d,e,f,g,h,i,j,k,m=this,o={},p=a.style,q=a.nodeType&&V(a),r=n._data(a,"fxshow");c.queue||(h=n._queueHooks(a,"fx"),null==h.unqueued&&(h.unqueued=0,i=h.empty.fire,h.empty.fire=function(){h.unqueued||i()}),h.unqueued++,m.always(function(){m.always(function(){h.unqueued--,n.queue(a,"fx").length||h.empty.fire()})})),1===a.nodeType&&("height"in b||"width"in b)&&(c.overflow=[p.overflow,p.overflowX,p.overflowY],j=n.css(a,"display"),k=Gb(a.nodeName),"none"===j&&(j=k),"inline"===j&&"none"===n.css(a,"float")&&(l.inlineBlockNeedsLayout&&"inline"!==k?p.zoom=1:p.display="inline-block")),c.overflow&&(p.overflow="hidden",l.shrinkWrapBlocks()||m.always(function(){p.overflow=c.overflow[0],p.overflowX=c.overflow[1],p.overflowY=c.overflow[2]}));for(d in b)if(e=b[d],bc.exec(e)){if(delete b[d],f=f||"toggle"===e,e===(q?"hide":"show")){if("show"!==e||!r||void 0===r[d])continue;q=!0}o[d]=r&&r[d]||n.style(a,d)}if(!n.isEmptyObject(o)){r?"hidden"in r&&(q=r.hidden):r=n._data(a,"fxshow",{}),f&&(r.hidden=!q),q?n(a).show():m.done(function(){n(a).hide()}),m.done(function(){var b;n._removeData(a,"fxshow");for(b in o)n.style(a,b,o[b])});for(d in o)g=ic(q?r[d]:0,d,m),d in r||(r[d]=g.start,q&&(g.end=g.start,g.start="width"===d||"height"===d?1:0))}}function kc(a,b){var c,d,e,f,g;for(c in a)if(d=n.camelCase(c),e=b[d],f=a[c],n.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=n.cssHooks[d],g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}function lc(a,b,c){var d,e,f=0,g=ec.length,h=n.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=_b||gc(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;i>g;g++)j.tweens[g].run(f);return h.notifyWith(a,[j,f,c]),1>f&&i?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:n.extend({},b),opts:n.extend(!0,{specialEasing:{}},c),originalProperties:b,originalOptions:c,startTime:_b||gc(),duration:c.duration,tweens:[],createTween:function(b,c){var d=n.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(d),d},stop:function(b){var c=0,d=b?j.tweens.length:0;if(e)return this;for(e=!0;d>c;c++)j.tweens[c].run(1);return b?h.resolveWith(a,[j,b]):h.rejectWith(a,[j,b]),this}}),k=j.props;for(kc(k,j.opts.specialEasing);g>f;f++)if(d=ec[f].call(j,a,k,j.opts))return d;return n.map(k,ic,j),n.isFunction(j.opts.start)&&j.opts.start.call(a,j),n.fx.timer(n.extend(i,{elem:a,anim:j,queue:j.opts.queue})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}n.Animation=n.extend(lc,{tweener:function(a,b){n.isFunction(a)?(b=a,a=["*"]):a=a.split(" ");for(var c,d=0,e=a.length;e>d;d++)c=a[d],fc[c]=fc[c]||[],fc[c].unshift(b)},prefilter:function(a,b){b?ec.unshift(a):ec.push(a)}}),n.speed=function(a,b,c){var d=a&&"object"==typeof a?n.extend({},a):{complete:c||!c&&b||n.isFunction(a)&&a,duration:a,easing:c&&b||b&&!n.isFunction(b)&&b};return d.duration=n.fx.off?0:"number"==typeof d.duration?d.duration:d.duration in n.fx.speeds?n.fx.speeds[d.duration]:n.fx.speeds._default,(null==d.queue||d.queue===!0)&&(d.queue="fx"),d.old=d.complete,d.complete=function(){n.isFunction(d.old)&&d.old.call(this),d.queue&&n.dequeue(this,d.queue)},d},n.fn.extend({fadeTo:function(a,b,c,d){return this.filter(V).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=n.isEmptyObject(a),f=n.speed(b,c,d),g=function(){var b=lc(this,n.extend({},a),f);(e||n._data(this,"finish"))&&b.stop(!0)};return g.finish=g,e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,b,c){var d=function(a){var b=a.stop;delete a.stop,b(c)};return"string"!=typeof a&&(c=b,b=a,a=void 0),b&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,e=null!=a&&a+"queueHooks",f=n.timers,g=n._data(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&dc.test(e)&&d(g[e]);for(e=f.length;e--;)f[e].elem!==this||null!=a&&f[e].queue!==a||(f[e].anim.stop(c),b=!1,f.splice(e,1));(b||!c)&&n.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=n._data(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=n.timers,g=d?d.length:0;for(c.finish=!0,n.queue(this,a,[]),e&&e.stop&&e.stop.call(this,!0),b=f.length;b--;)f[b].elem===this&&f[b].queue===a&&(f[b].anim.stop(!0),f.splice(b,1));for(b=0;g>b;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),n.each(["toggle","show","hide"],function(a,b){var c=n.fn[b];n.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(hc(b,!0),a,d,e)}}),n.each({slideDown:hc("show"),slideUp:hc("hide"),slideToggle:hc("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){n.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),n.timers=[],n.fx.tick=function(){var a,b=n.timers,c=0;for(_b=n.now();c<b.length;c++)a=b[c],a()||b[c]!==a||b.splice(c--,1);b.length||n.fx.stop(),_b=void 0},n.fx.timer=function(a){n.timers.push(a),a()?n.fx.start():n.timers.pop()},n.fx.interval=13,n.fx.start=function(){ac||(ac=setInterval(n.fx.tick,n.fx.interval))},n.fx.stop=function(){clearInterval(ac),ac=null},n.fx.speeds={slow:600,fast:200,_default:400},n.fn.delay=function(a,b){return a=n.fx?n.fx.speeds[a]||a:a,b=b||"fx",this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},function(){var a,b,c,d,e=z.createElement("div");e.setAttribute("className","t"),e.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",a=e.getElementsByTagName("a")[0],c=z.createElement("select"),d=c.appendChild(z.createElement("option")),b=e.getElementsByTagName("input")[0],a.style.cssText="top:1px",l.getSetAttribute="t"!==e.className,l.style=/top/.test(a.getAttribute("style")),l.hrefNormalized="/a"===a.getAttribute("href"),l.checkOn=!!b.value,l.optSelected=d.selected,l.enctype=!!z.createElement("form").enctype,c.disabled=!0,l.optDisabled=!d.disabled,b=z.createElement("input"),b.setAttribute("value",""),l.input=""===b.getAttribute("value"),b.value="t",b.setAttribute("type","radio"),l.radioValue="t"===b.value,a=b=c=d=e=null}();var mc=/\r/g;n.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=n.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,n(this).val()):a,null==e?e="":"number"==typeof e?e+="":n.isArray(e)&&(e=n.map(e,function(a){return null==a?"":a+""})),b=n.valHooks[this.type]||n.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=n.valHooks[e.type]||n.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(mc,""):null==c?"":c)}}}),n.extend({valHooks:{option:{get:function(a){var b=n.find.attr(a,"value");return null!=b?b:n.text(a)}},select:{get:function(a){for(var b,c,d=a.options,e=a.selectedIndex,f="select-one"===a.type||0>e,g=f?null:[],h=f?e+1:d.length,i=0>e?h:f?e:0;h>i;i++)if(c=d[i],!(!c.selected&&i!==e||(l.optDisabled?c.disabled:null!==c.getAttribute("disabled"))||c.parentNode.disabled&&n.nodeName(c.parentNode,"optgroup"))){if(b=n(c).val(),f)return b;g.push(b)}return g},set:function(a,b){var c,d,e=a.options,f=n.makeArray(b),g=e.length;while(g--)if(d=e[g],n.inArray(n.valHooks.option.get(d),f)>=0)try{d.selected=c=!0}catch(h){d.scrollHeight}else d.selected=!1;return c||(a.selectedIndex=-1),e}}}}),n.each(["radio","checkbox"],function(){n.valHooks[this]={set:function(a,b){return n.isArray(b)?a.checked=n.inArray(n(a).val(),b)>=0:void 0}},l.checkOn||(n.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})});var nc,oc,pc=n.expr.attrHandle,qc=/^(?:checked|selected)$/i,rc=l.getSetAttribute,sc=l.input;n.fn.extend({attr:function(a,b){return W(this,n.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){n.removeAttr(this,a)})}}),n.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(a&&3!==f&&8!==f&&2!==f)return typeof a.getAttribute===L?n.prop(a,b,c):(1===f&&n.isXMLDoc(a)||(b=b.toLowerCase(),d=n.attrHooks[b]||(n.expr.match.bool.test(b)?oc:nc)),void 0===c?d&&"get"in d&&null!==(e=d.get(a,b))?e:(e=n.find.attr(a,b),null==e?void 0:e):null!==c?d&&"set"in d&&void 0!==(e=d.set(a,c,b))?e:(a.setAttribute(b,c+""),c):void n.removeAttr(a,b))},removeAttr:function(a,b){var c,d,e=0,f=b&&b.match(F);if(f&&1===a.nodeType)while(c=f[e++])d=n.propFix[c]||c,n.expr.match.bool.test(c)?sc&&rc||!qc.test(c)?a[d]=!1:a[n.camelCase("default-"+c)]=a[d]=!1:n.attr(a,c,""),a.removeAttribute(rc?c:d)},attrHooks:{type:{set:function(a,b){if(!l.radioValue&&"radio"===b&&n.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}}}),oc={set:function(a,b,c){return b===!1?n.removeAttr(a,c):sc&&rc||!qc.test(c)?a.setAttribute(!rc&&n.propFix[c]||c,c):a[n.camelCase("default-"+c)]=a[c]=!0,c}},n.each(n.expr.match.bool.source.match(/\w+/g),function(a,b){var c=pc[b]||n.find.attr;pc[b]=sc&&rc||!qc.test(b)?function(a,b,d){var e,f;return d||(f=pc[b],pc[b]=e,e=null!=c(a,b,d)?b.toLowerCase():null,pc[b]=f),e}:function(a,b,c){return c?void 0:a[n.camelCase("default-"+b)]?b.toLowerCase():null}}),sc&&rc||(n.attrHooks.value={set:function(a,b,c){return n.nodeName(a,"input")?void(a.defaultValue=b):nc&&nc.set(a,b,c)}}),rc||(nc={set:function(a,b,c){var d=a.getAttributeNode(c);return d||a.setAttributeNode(d=a.ownerDocument.createAttribute(c)),d.value=b+="","value"===c||b===a.getAttribute(c)?b:void 0}},pc.id=pc.name=pc.coords=function(a,b,c){var d;return c?void 0:(d=a.getAttributeNode(b))&&""!==d.value?d.value:null},n.valHooks.button={get:function(a,b){var c=a.getAttributeNode(b);return c&&c.specified?c.value:void 0},set:nc.set},n.attrHooks.contenteditable={set:function(a,b,c){nc.set(a,""===b?!1:b,c)}},n.each(["width","height"],function(a,b){n.attrHooks[b]={set:function(a,c){return""===c?(a.setAttribute(b,"auto"),c):void 0}}})),l.style||(n.attrHooks.style={get:function(a){return a.style.cssText||void 0},set:function(a,b){return a.style.cssText=b+""}});var tc=/^(?:input|select|textarea|button|object)$/i,uc=/^(?:a|area)$/i;n.fn.extend({prop:function(a,b){return W(this,n.prop,a,b,arguments.length>1)},removeProp:function(a){return a=n.propFix[a]||a,this.each(function(){try{this[a]=void 0,delete this[a]}catch(b){}})}}),n.extend({propFix:{"for":"htmlFor","class":"className"},prop:function(a,b,c){var d,e,f,g=a.nodeType;if(a&&3!==g&&8!==g&&2!==g)return f=1!==g||!n.isXMLDoc(a),f&&(b=n.propFix[b]||b,e=n.propHooks[b]),void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){var b=n.find.attr(a,"tabindex");return b?parseInt(b,10):tc.test(a.nodeName)||uc.test(a.nodeName)&&a.href?0:-1}}}}),l.hrefNormalized||n.each(["href","src"],function(a,b){n.propHooks[b]={get:function(a){return a.getAttribute(b,4)}}}),l.optSelected||(n.propHooks.selected={get:function(a){var b=a.parentNode;return b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex),null}}),n.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){n.propFix[this.toLowerCase()]=this}),l.enctype||(n.propFix.enctype="encoding");var vc=/[\t\r\n\f]/g;n.fn.extend({addClass:function(a){var b,c,d,e,f,g,h=0,i=this.length,j="string"==typeof a&&a;if(n.isFunction(a))return this.each(function(b){n(this).addClass(a.call(this,b,this.className))});if(j)for(b=(a||"").match(F)||[];i>h;h++)if(c=this[h],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(vc," "):" ")){f=0;while(e=b[f++])d.indexOf(" "+e+" ")<0&&(d+=e+" ");g=n.trim(d),c.className!==g&&(c.className=g)}return this},removeClass:function(a){var b,c,d,e,f,g,h=0,i=this.length,j=0===arguments.length||"string"==typeof a&&a;if(n.isFunction(a))return this.each(function(b){n(this).removeClass(a.call(this,b,this.className))});if(j)for(b=(a||"").match(F)||[];i>h;h++)if(c=this[h],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(vc," "):"")){f=0;while(e=b[f++])while(d.indexOf(" "+e+" ")>=0)d=d.replace(" "+e+" "," ");g=a?n.trim(d):"",c.className!==g&&(c.className=g)}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):this.each(n.isFunction(a)?function(c){n(this).toggleClass(a.call(this,c,this.className,b),b)}:function(){if("string"===c){var b,d=0,e=n(this),f=a.match(F)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else(c===L||"boolean"===c)&&(this.className&&n._data(this,"__className__",this.className),this.className=this.className||a===!1?"":n._data(this,"__className__")||"")})},hasClass:function(a){for(var b=" "+a+" ",c=0,d=this.length;d>c;c++)if(1===this[c].nodeType&&(" "+this[c].className+" ").replace(vc," ").indexOf(b)>=0)return!0;return!1}}),n.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){n.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),n.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)}});var wc=n.now(),xc=/\?/,yc=/(,)|(\[|{)|(}|])|"(?:[^"\\\r\n]|\\["\\\/bfnrt]|\\u[\da-fA-F]{4})*"\s*:?|true|false|null|-?(?!0\d)\d+(?:\.\d+|)(?:[eE][+-]?\d+|)/g;n.parseJSON=function(b){if(a.JSON&&a.JSON.parse)return a.JSON.parse(b+"");var c,d=null,e=n.trim(b+"");return e&&!n.trim(e.replace(yc,function(a,b,e,f){return c&&b&&(d=0),0===d?a:(c=e||b,d+=!f-!e,"")}))?Function("return "+e)():n.error("Invalid JSON: "+b)},n.parseXML=function(b){var c,d;if(!b||"string"!=typeof b)return null;try{a.DOMParser?(d=new DOMParser,c=d.parseFromString(b,"text/xml")):(c=new ActiveXObject("Microsoft.XMLDOM"),c.async="false",c.loadXML(b))}catch(e){c=void 0}return c&&c.documentElement&&!c.getElementsByTagName("parsererror").length||n.error("Invalid XML: "+b),c};var zc,Ac,Bc=/#.*$/,Cc=/([?&])_=[^&]*/,Dc=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Ec=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Fc=/^(?:GET|HEAD)$/,Gc=/^\/\//,Hc=/^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,Ic={},Jc={},Kc="*/".concat("*");try{Ac=location.href}catch(Lc){Ac=z.createElement("a"),Ac.href="",Ac=Ac.href}zc=Hc.exec(Ac.toLowerCase())||[];function Mc(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(F)||[];if(n.isFunction(c))while(d=f[e++])"+"===d.charAt(0)?(d=d.slice(1)||"*",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function Nc(a,b,c,d){var e={},f=a===Jc;function g(h){var i;return e[h]=!0,n.each(a[h]||[],function(a,h){var j=h(b,c,d);return"string"!=typeof j||f||e[j]?f?!(i=j):void 0:(b.dataTypes.unshift(j),g(j),!1)}),i}return g(b.dataTypes[0])||!e["*"]&&g("*")}function Oc(a,b){var c,d,e=n.ajaxSettings.flatOptions||{};for(d in b)void 0!==b[d]&&((e[d]?a:c||(c={}))[d]=b[d]);return c&&n.extend(!0,a,c),a}function Pc(a,b,c){var d,e,f,g,h=a.contents,i=a.dataTypes;while("*"===i[0])i.shift(),void 0===e&&(e=a.mimeType||b.getResponseHeader("Content-Type"));if(e)for(g in h)if(h[g]&&h[g].test(e)){i.unshift(g);break}if(i[0]in c)f=i[0];else{for(g in c){if(!i[0]||a.converters[g+" "+i[0]]){f=g;break}d||(d=g)}f=f||d}return f?(f!==i[0]&&i.unshift(f),c[f]):void 0}function Qc(a,b,c,d){var e,f,g,h,i,j={},k=a.dataTypes.slice();if(k[1])for(g in a.converters)j[g.toLowerCase()]=a.converters[g];f=k.shift();while(f)if(a.responseFields[f]&&(c[a.responseFields[f]]=b),!i&&d&&a.dataFilter&&(b=a.dataFilter(b,a.dataType)),i=f,f=k.shift())if("*"===f)f=i;else if("*"!==i&&i!==f){if(g=j[i+" "+f]||j["* "+f],!g)for(e in j)if(h=e.split(" "),h[1]===f&&(g=j[i+" "+h[0]]||j["* "+h[0]])){g===!0?g=j[e]:j[e]!==!0&&(f=h[0],k.unshift(h[1]));break}if(g!==!0)if(g&&a["throws"])b=g(b);else try{b=g(b)}catch(l){return{state:"parsererror",error:g?l:"No conversion from "+i+" to "+f}}}return{state:"success",data:b}}n.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Ac,type:"GET",isLocal:Ec.test(zc[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Kc,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":n.parseJSON,"text xml":n.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?Oc(Oc(a,n.ajaxSettings),b):Oc(n.ajaxSettings,a)},ajaxPrefilter:Mc(Ic),ajaxTransport:Mc(Jc),ajax:function(a,b){"object"==typeof a&&(b=a,a=void 0),b=b||{};var c,d,e,f,g,h,i,j,k=n.ajaxSetup({},b),l=k.context||k,m=k.context&&(l.nodeType||l.jquery)?n(l):n.event,o=n.Deferred(),p=n.Callbacks("once memory"),q=k.statusCode||{},r={},s={},t=0,u="canceled",v={readyState:0,getResponseHeader:function(a){var b;if(2===t){if(!j){j={};while(b=Dc.exec(f))j[b[1].toLowerCase()]=b[2]}b=j[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return 2===t?f:null},setRequestHeader:function(a,b){var c=a.toLowerCase();return t||(a=s[c]=s[c]||a,r[a]=b),this},overrideMimeType:function(a){return t||(k.mimeType=a),this},statusCode:function(a){var b;if(a)if(2>t)for(b in a)q[b]=[q[b],a[b]];else v.always(a[v.status]);return this},abort:function(a){var b=a||u;return i&&i.abort(b),x(0,b),this}};if(o.promise(v).complete=p.add,v.success=v.done,v.error=v.fail,k.url=((a||k.url||Ac)+"").replace(Bc,"").replace(Gc,zc[1]+"//"),k.type=b.method||b.type||k.method||k.type,k.dataTypes=n.trim(k.dataType||"*").toLowerCase().match(F)||[""],null==k.crossDomain&&(c=Hc.exec(k.url.toLowerCase()),k.crossDomain=!(!c||c[1]===zc[1]&&c[2]===zc[2]&&(c[3]||("http:"===c[1]?"80":"443"))===(zc[3]||("http:"===zc[1]?"80":"443")))),k.data&&k.processData&&"string"!=typeof k.data&&(k.data=n.param(k.data,k.traditional)),Nc(Ic,k,b,v),2===t)return v;h=k.global,h&&0===n.active++&&n.event.trigger("ajaxStart"),k.type=k.type.toUpperCase(),k.hasContent=!Fc.test(k.type),e=k.url,k.hasContent||(k.data&&(e=k.url+=(xc.test(e)?"&":"?")+k.data,delete k.data),k.cache===!1&&(k.url=Cc.test(e)?e.replace(Cc,"$1_="+wc++):e+(xc.test(e)?"&":"?")+"_="+wc++)),k.ifModified&&(n.lastModified[e]&&v.setRequestHeader("If-Modified-Since",n.lastModified[e]),n.etag[e]&&v.setRequestHeader("If-None-Match",n.etag[e])),(k.data&&k.hasContent&&k.contentType!==!1||b.contentType)&&v.setRequestHeader("Content-Type",k.contentType),v.setRequestHeader("Accept",k.dataTypes[0]&&k.accepts[k.dataTypes[0]]?k.accepts[k.dataTypes[0]]+("*"!==k.dataTypes[0]?", "+Kc+"; q=0.01":""):k.accepts["*"]);for(d in k.headers)v.setRequestHeader(d,k.headers[d]);if(k.beforeSend&&(k.beforeSend.call(l,v,k)===!1||2===t))return v.abort();u="abort";for(d in{success:1,error:1,complete:1})v[d](k[d]);if(i=Nc(Jc,k,b,v)){v.readyState=1,h&&m.trigger("ajaxSend",[v,k]),k.async&&k.timeout>0&&(g=setTimeout(function(){v.abort("timeout")},k.timeout));try{t=1,i.send(r,x)}catch(w){if(!(2>t))throw w;x(-1,w)}}else x(-1,"No Transport");function x(a,b,c,d){var j,r,s,u,w,x=b;2!==t&&(t=2,g&&clearTimeout(g),i=void 0,f=d||"",v.readyState=a>0?4:0,j=a>=200&&300>a||304===a,c&&(u=Pc(k,v,c)),u=Qc(k,u,v,j),j?(k.ifModified&&(w=v.getResponseHeader("Last-Modified"),w&&(n.lastModified[e]=w),w=v.getResponseHeader("etag"),w&&(n.etag[e]=w)),204===a||"HEAD"===k.type?x="nocontent":304===a?x="notmodified":(x=u.state,r=u.data,s=u.error,j=!s)):(s=x,(a||!x)&&(x="error",0>a&&(a=0))),v.status=a,v.statusText=(b||x)+"",j?o.resolveWith(l,[r,x,v]):o.rejectWith(l,[v,x,s]),v.statusCode(q),q=void 0,h&&m.trigger(j?"ajaxSuccess":"ajaxError",[v,k,j?r:s]),p.fireWith(l,[v,x]),h&&(m.trigger("ajaxComplete",[v,k]),--n.active||n.event.trigger("ajaxStop")))}return v},getJSON:function(a,b,c){return n.get(a,b,c,"json")},getScript:function(a,b){return n.get(a,void 0,b,"script")}}),n.each(["get","post"],function(a,b){n[b]=function(a,c,d,e){return n.isFunction(c)&&(e=e||d,d=c,c=void 0),n.ajax({url:a,type:b,dataType:e,data:c,success:d})}}),n.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){n.fn[b]=function(a){return this.on(b,a)}}),n._evalUrl=function(a){return n.ajax({url:a,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})},n.fn.extend({wrapAll:function(a){if(n.isFunction(a))return this.each(function(b){n(this).wrapAll(a.call(this,b))});if(this[0]){var b=n(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&1===a.firstChild.nodeType)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){return this.each(n.isFunction(a)?function(b){n(this).wrapInner(a.call(this,b))}:function(){var b=n(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=n.isFunction(a);return this.each(function(c){n(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){n.nodeName(this,"body")||n(this).replaceWith(this.childNodes)}).end()}}),n.expr.filters.hidden=function(a){return a.offsetWidth<=0&&a.offsetHeight<=0||!l.reliableHiddenOffsets()&&"none"===(a.style&&a.style.display||n.css(a,"display"))},n.expr.filters.visible=function(a){return!n.expr.filters.hidden(a)};var Rc=/%20/g,Sc=/\[\]$/,Tc=/\r?\n/g,Uc=/^(?:submit|button|image|reset|file)$/i,Vc=/^(?:input|select|textarea|keygen)/i;function Wc(a,b,c,d){var e;if(n.isArray(b))n.each(b,function(b,e){c||Sc.test(a)?d(a,e):Wc(a+"["+("object"==typeof e?b:"")+"]",e,c,d)});else if(c||"object"!==n.type(b))d(a,b);else for(e in b)Wc(a+"["+e+"]",b[e],c,d)}n.param=function(a,b){var c,d=[],e=function(a,b){b=n.isFunction(b)?b():null==b?"":b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};if(void 0===b&&(b=n.ajaxSettings&&n.ajaxSettings.traditional),n.isArray(a)||a.jquery&&!n.isPlainObject(a))n.each(a,function(){e(this.name,this.value)});else for(c in a)Wc(c,a[c],b,e);return d.join("&").replace(Rc,"+")},n.fn.extend({serialize:function(){return n.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=n.prop(this,"elements");return a?n.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!n(this).is(":disabled")&&Vc.test(this.nodeName)&&!Uc.test(a)&&(this.checked||!X.test(a))}).map(function(a,b){var c=n(this).val();return null==c?null:n.isArray(c)?n.map(c,function(a){return{name:b.name,value:a.replace(Tc,"\r\n")}}):{name:b.name,value:c.replace(Tc,"\r\n")}}).get()}}),n.ajaxSettings.xhr=void 0!==a.ActiveXObject?function(){return!this.isLocal&&/^(get|post|head|put|delete|options)$/i.test(this.type)&&$c()||_c()}:$c;var Xc=0,Yc={},Zc=n.ajaxSettings.xhr();a.ActiveXObject&&n(a).on("unload",function(){for(var a in Yc)Yc[a](void 0,!0)}),l.cors=!!Zc&&"withCredentials"in Zc,Zc=l.ajax=!!Zc,Zc&&n.ajaxTransport(function(a){if(!a.crossDomain||l.cors){var b;return{send:function(c,d){var e,f=a.xhr(),g=++Xc;if(f.open(a.type,a.url,a.async,a.username,a.password),a.xhrFields)for(e in a.xhrFields)f[e]=a.xhrFields[e];a.mimeType&&f.overrideMimeType&&f.overrideMimeType(a.mimeType),a.crossDomain||c["X-Requested-With"]||(c["X-Requested-With"]="XMLHttpRequest");for(e in c)void 0!==c[e]&&f.setRequestHeader(e,c[e]+"");f.send(a.hasContent&&a.data||null),b=function(c,e){var h,i,j;if(b&&(e||4===f.readyState))if(delete Yc[g],b=void 0,f.onreadystatechange=n.noop,e)4!==f.readyState&&f.abort();else{j={},h=f.status,"string"==typeof f.responseText&&(j.text=f.responseText);try{i=f.statusText}catch(k){i=""}h||!a.isLocal||a.crossDomain?1223===h&&(h=204):h=j.text?200:404}j&&d(h,i,j,f.getAllResponseHeaders())},a.async?4===f.readyState?setTimeout(b):f.onreadystatechange=Yc[g]=b:b()},abort:function(){b&&b(void 0,!0)}}}});function $c(){try{return new a.XMLHttpRequest}catch(b){}}function _c(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}n.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(a){return n.globalEval(a),a}}}),n.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),n.ajaxTransport("script",function(a){if(a.crossDomain){var b,c=z.head||n("head")[0]||z.documentElement;return{send:function(d,e){b=z.createElement("script"),b.async=!0,a.scriptCharset&&(b.charset=a.scriptCharset),b.src=a.url,b.onload=b.onreadystatechange=function(a,c){(c||!b.readyState||/loaded|complete/.test(b.readyState))&&(b.onload=b.onreadystatechange=null,b.parentNode&&b.parentNode.removeChild(b),b=null,c||e(200,"success"))},c.insertBefore(b,c.firstChild)},abort:function(){b&&b.onload(void 0,!0)}}}});var ad=[],bd=/(=)\?(?=&|$)|\?\?/;n.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=ad.pop()||n.expando+"_"+wc++;return this[a]=!0,a}}),n.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(bd.test(b.url)?"url":"string"==typeof b.data&&!(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&bd.test(b.data)&&"data");return h||"jsonp"===b.dataTypes[0]?(e=b.jsonpCallback=n.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,h?b[h]=b[h].replace(bd,"$1"+e):b.jsonp!==!1&&(b.url+=(xc.test(b.url)?"&":"?")+b.jsonp+"="+e),b.converters["script json"]=function(){return g||n.error(e+" was not called"),g[0]},b.dataTypes[0]="json",f=a[e],a[e]=function(){g=arguments},d.always(function(){a[e]=f,b[e]&&(b.jsonpCallback=c.jsonpCallback,ad.push(e)),g&&n.isFunction(f)&&f(g[0]),g=f=void 0}),"script"):void 0}),n.parseHTML=function(a,b,c){if(!a||"string"!=typeof a)return null;"boolean"==typeof b&&(c=b,b=!1),b=b||z;var d=v.exec(a),e=!c&&[];return d?[b.createElement(d[1])]:(d=n.buildFragment([a],b,e),e&&e.length&&n(e).remove(),n.merge([],d.childNodes))};var cd=n.fn.load;n.fn.load=function(a,b,c){if("string"!=typeof a&&cd)return cd.apply(this,arguments);var d,e,f,g=this,h=a.indexOf(" ");return h>=0&&(d=a.slice(h,a.length),a=a.slice(0,h)),n.isFunction(b)?(c=b,b=void 0):b&&"object"==typeof b&&(f="POST"),g.length>0&&n.ajax({url:a,type:f,dataType:"html",data:b}).done(function(a){e=arguments,g.html(d?n("<div>").append(n.parseHTML(a)).find(d):a)}).complete(c&&function(a,b){g.each(c,e||[a.responseText,b,a])}),this},n.expr.filters.animated=function(a){return n.grep(n.timers,function(b){return a===b.elem}).length};var dd=a.document.documentElement;function ed(a){return n.isWindow(a)?a:9===a.nodeType?a.defaultView||a.parentWindow:!1}n.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=n.css(a,"position"),l=n(a),m={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=n.css(a,"top"),i=n.css(a,"left"),j=("absolute"===k||"fixed"===k)&&n.inArray("auto",[f,i])>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),n.isFunction(b)&&(b=b.call(a,c,h)),null!=b.top&&(m.top=b.top-h.top+g),null!=b.left&&(m.left=b.left-h.left+e),"using"in b?b.using.call(a,m):l.css(m)}},n.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){n.offset.setOffset(this,a,b)});var b,c,d={top:0,left:0},e=this[0],f=e&&e.ownerDocument;if(f)return b=f.documentElement,n.contains(b,e)?(typeof e.getBoundingClientRect!==L&&(d=e.getBoundingClientRect()),c=ed(f),{top:d.top+(c.pageYOffset||b.scrollTop)-(b.clientTop||0),left:d.left+(c.pageXOffset||b.scrollLeft)-(b.clientLeft||0)}):d},position:function(){if(this[0]){var a,b,c={top:0,left:0},d=this[0];return"fixed"===n.css(d,"position")?b=d.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),n.nodeName(a[0],"html")||(c=a.offset()),c.top+=n.css(a[0],"borderTopWidth",!0),c.left+=n.css(a[0],"borderLeftWidth",!0)),{top:b.top-c.top-n.css(d,"marginTop",!0),left:b.left-c.left-n.css(d,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||dd;while(a&&!n.nodeName(a,"html")&&"static"===n.css(a,"position"))a=a.offsetParent;return a||dd})}}),n.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,b){var c=/Y/.test(b);n.fn[a]=function(d){return W(this,function(a,d,e){var f=ed(a);return void 0===e?f?b in f?f[b]:f.document.documentElement[d]:a[d]:void(f?f.scrollTo(c?n(f).scrollLeft():e,c?e:n(f).scrollTop()):a[d]=e)},a,d,arguments.length,null)}}),n.each(["top","left"],function(a,b){n.cssHooks[b]=Mb(l.pixelPosition,function(a,c){return c?(c=Kb(a,b),Ib.test(c)?n(a).position()[b]+"px":c):void 0})}),n.each({Height:"height",Width:"width"},function(a,b){n.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){n.fn[d]=function(d,e){var f=arguments.length&&(c||"boolean"!=typeof d),g=c||(d===!0||e===!0?"margin":"border");return W(this,function(b,c,d){var e;return n.isWindow(b)?b.document.documentElement["client"+a]:9===b.nodeType?(e=b.documentElement,Math.max(b.body["scroll"+a],e["scroll"+a],b.body["offset"+a],e["offset"+a],e["client"+a])):void 0===d?n.css(b,c,g):n.style(b,c,d,g)},b,f?d:void 0,f,null)}})}),n.fn.size=function(){return this.length},n.fn.andSelf=n.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return n});var fd=a.jQuery,gd=a.$;return n.noConflict=function(b){return a.$===n&&(a.$=gd),b&&a.jQuery===n&&(a.jQuery=fd),n},typeof b===L&&(a.jQuery=a.$=n),n});
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/jquery-jtemplates.js b/pluss-manage-page/src/main/resources/static/resources/auth/js/jquery-jtemplates.js
new file mode 100644
index 0000000..8a90d6f
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/jquery-jtemplates.js
@@ -0,0 +1,2 @@
+/* jTemplates 0.8.4 (http://jtemplates.tpython.com) Copyright (c) 2007-2013 Tomasz Gloc */
+eval(function(p,a,c,k,e,r){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}('6(3w.b&&!3w.b.3x){(7(b){9 j=7(s,H,m){5.1g=[];5.1D={};5.2M=u;5.1W={};5.1h={};5.m=b.1i({1X:1c,3y:1x,2N:1c,2O:1c,3z:1x,3A:1x},m);5.1E=(5.m.1E!==D)?(5.m.1E):(R.2g);5.13=(5.m.13!==D)?(5.m.13):(R.3B);5.2h=(5.m.2h!==D)?(5.m.2h):((5.m.1X)?(b.2P):(R.2P));6(s==u){c}5.3C(s,H);6(s){5.1F(5.1h[\'2i\'],H,5.m)}5.1h=u};j.4k=\'0.8.4\';j.J=1c;j.3D=4l;j.1y=0;j.z.3C=7(s,H){9 2Q=/\\{#1d *(\\w+) *(.*?) *\\}/g,2j,1G,U,1H=u,2R=[],i;2k((2j=2Q.4m(s))!==u){1H=2Q.1H;1G=2j[1];U=s.1Y(\'{#/1d \'+1G+\'}\',1H);6(U===-1){E p V(\'14: j "\'+1G+\'" 2S 2l 4n.\');}5.1h[1G]=s.1Z(1H,U);2R[1G]=R.2T(2j[2])}6(1H===u){5.1h[\'2i\']=s;c}K(i 2m 5.1h){6(i!==\'2i\'){5.1W[i]=p j()}}K(i 2m 5.1h){6(i!==\'2i\'){5.1W[i].1F(5.1h[i],b.1i({},H||{},5.1W||{}),b.1i({},5.m,2R[i]));5.1h[i]=u}}};j.z.1F=7(s,H,m){6(s==D){5.1g.x(p 1p(\'\',1,5));c}s=s.15(/[\\n\\r]/g,\'\');s=s.15(/\\{\\*.*?\\*\\}/g,\'\');5.2M=b.1i({},5.1W||{},H||{});5.m=p 2n(m);9 A=5.1g,20=s.1j(/\\{#.*?\\}/g),16=0,U=0,e,1q=0,i,l;K(i=0,l=(20)?(20.X):(0);i<l;++i){9 10=20[i];6(1q){U=s.1Y(\'{#/1I}\',16);6(U===-1){E p V("14: 4o 21 3E 1I.");}6(U>16){A.x(p 1p(s.1Z(16,U),1,5))}16=U+11;1q=0;2k(i<l&&20[i]!==\'{#/1I}\'){i++}22}U=s.1Y(10,16);6(U>16){A.x(p 1p(s.1Z(16,U),1q,5))}10.1j(/\\{#([\\w\\/]+).*?\\}/);9 2o=L.$1;2U(2o){B\'4p\':A.2V(10);F;B\'6\':e=p 1z(A,5);e.2V(10);A.x(e);A=e;F;B\'W\':A.2W();F;B\'/6\':B\'/K\':B\'/2X\':A=A.2Y();F;B\'2X\':e=p 1A(10,A,5);A.x(e);A=e;F;B\'K\':e=3F(10,A,5);A.x(e);A=e;F;B\'22\':B\'F\':A.x(p 17(2o));F;B\'2Z\':A.x(p 30(10,5.2M,5));F;B\'h\':A.x(p 31(10,5));F;B\'9\':A.x(p 32(10,5));F;B\'33\':A.x(p 34(10));F;B\'4q\':A.x(p 1p(\'{\',1,5));F;B\'4r\':A.x(p 1p(\'}\',1,5));F;B\'1I\':1q=1;F;B\'/1I\':6(j.J){E p V("14: 4s 35 3E 1I.");}F;3G:6(j.J){E p V(\'14: 4t 4u: \'+2o+\'.\');}}16=U+10.X}6(s.X>16){A.x(p 1p(s.3H(16),1q,5))}};j.z.M=7(d,h,q,I){++I;6(I==1&&q!=D){b.36(q,"2p")}9 $T=d,$P,18=\'\';6(5.m.3z){$T=5.1E(d,{2q:(5.m.3y&&I==1),23:5.m.1X},5.13)}6(!5.m.3A){$P=b.1i({},5.1D,h)}W{$P=b.1i({},5.1E(5.1D,{2q:(5.m.2N),23:1c},5.13),5.1E(h,{2q:(5.m.2N&&I==1),23:1c},5.13))}K(9 i=0,l=5.1g.X;i<l;++i){18+=5.1g[i].M($T,$P,q,I)}5.2r=u;--I;c 18};j.z.12=7(){6(5.2r==u){5.2r=p 2s(5)}c 5.2r};j.z.37=7(24,1B){5.1D[24]=1B};R=7(){};R.3B=7(3I){c 3I.15(/&/g,\'&4v;\').15(/>/g,\'&3J;\').15(/</g,\'&3K;\').15(/"/g,\'&4w;\').15(/\'/g,\'&#39;\')};R.2g=7(d,1J,13){6(d==u){c d}2U(d.38){B 2n:9 o={};K(9 i 2m d){o[i]=R.2g(d[i],1J,13)}6(!1J.23){6(d.4x("3a")){o.3a=d.3a}}c o;B 4y:9 a=[];K(9 i=0,l=d.X;i<l;++i){a[i]=R.2g(d[i],1J,13)}c a;B 3b:c(1J.2q)?(13(d)):(d);B 3L:6(1J.23){6(j.J){E p V("14: 4z 4A 2l 4B.");}W{c D}}}c d};R.2T=7(2t){6(2t===u||2t===D){c{}}9 o=2t.4C(/[= ]/);6(o[0]===\'\'){o.4D()}9 25={};K(9 i=0,l=o.X;i<l;i+=2){25[o[i]]=o[i+1]}c 25};R.2P=7(G){6(1K G!=="4E"||!G){c u}1k{c(p 3L("c "+b.3M(G)))()}1l(e){6(j.J){E p V("14: 4F 4G");}c{}}};R.3N=7(26,1y,3c){2k(26!=u){9 d=b.G(26,\'2p\');6(d!=D&&d.1y==1y&&d.d[3c]!=D){c d.d[3c]}26=26.4H}c u};9 1p=7(3d,1q,1d){5.27=3d;5.3O=1q;5.O=1d};1p.z.M=7(d,h,q,I){6(5.3O){c 5.27}9 s=5.27;9 19="";9 i=-1;9 28=0;9 29=-1;9 1L=0;2k(1x){9 1M=s.1Y("{",i+1);9 1N=s.1Y("}",i+1);6(1M<0&&1N<0){F}6((1M!=-1&&1M<1N)||(1N==-1)){i=1M;6(++28==1){29=1M;19+=s.1Z(1L,i);1L=-1}}W{i=1N;6(--28===0){6(29>=0){19+=5.O.12().3P(d,h,q,s.1Z(29,1N+1));29=-1;1L=i+1}}W 6(28<0){28=0}}}6(1L>-1){19+=s.3H(1L)}c 19};2s=7(t){5.3e=t};2s.z.3P=7($T,$P,$Q,2u){1k{9 19=3f(2u);6(b.4I(19)){6(5.3e.m.1X||!5.3e.m.2O){c\'\'}19=19($T,$P,$Q)}c(19===D)?(""):(3b(19))}1l(e){6(j.J){6(e 1C 17){e.1m="4J"}E e;}c""}};2s.z.1a=7($T,$P,$Q,2u){c 3f(2u)};9 1z=7(1O,1r){5.2v=1O;5.1P=1r;5.2a=[];5.1g=[];5.1Q=u};1z.z.x=7(e){5.1Q.x(e)};1z.z.2Y=7(){c 5.2v};1z.z.2V=7(N){N.1j(/\\{#(?:W)*6 (.*?)\\}/);5.2a.x(L.$1);5.1Q=[];5.1g.x(5.1Q)};1z.z.2W=7(){5.2a.x(1x);5.1Q=[];5.1g.x(5.1Q)};1z.z.M=7(d,h,q,I){9 18=\'\';1k{K(9 2b=0,3Q=5.2a.X;2b<3Q;++2b){6(5.1P.12().1a(d,h,q,5.2a[2b])){9 t=5.1g[2b];K(9 i=0,l=t.X;i<l;++i){18+=t[i].M(d,h,q,I)}c 18}}}1l(e){6(j.J||(e 1C 17)){E e;}}c 18};3F=7(N,1O,1d){6(N.1j(/\\{#K (\\w+?) *= *(\\S+?) +4K +(\\S+?) *(?:1b=(\\S+?))*\\}/)){9 f=p 1A(u,1O,1d);f.C=L.$1;f.Y={\'35\':(L.$2||0),\'21\':(L.$3||-1),\'1b\':(L.$4||1),\'y\':\'$T\'};f.3g=(7(i){c i});c f}W{E p V(\'14: 4L 4M "3R": \'+N);}};9 1A=7(N,1O,1d){5.2v=1O;5.O=1d;6(N!=u){N.1j(/\\{#2X +(.+?) +3S +(\\w+?)( .+)*\\}/);5.3T=L.$1;5.C=L.$2;5.Y=L.$3||u;5.Y=R.2T(5.Y)}5.2w=[];5.2x=[];5.3h=5.2w};1A.z.x=7(e){5.3h.x(e)};1A.z.2Y=7(){c 5.2v};1A.z.2W=7(){5.3h=5.2x};1A.z.M=7(d,h,q,I){1k{9 1s=(5.3g===D)?(5.O.12().1a(d,h,q,5.3T)):(5.3g);6(1s===$){E p V("2c: 4N \'$\' 4O 4P 4Q 3S 3U-7");}9 2d=[];9 1R=1K 1s;6(1R==\'3V\'){9 3i=[];b.1t(1s,7(k,v){2d.x(k);3i.x(v)});1s=3i}9 y=(5.Y.y!==D)?(5.O.12().1a(d,h,q,5.Y.y)):((d!=u)?(d):({}));6(y==u){y={}}9 s=2e(5.O.12().1a(d,h,q,5.Y.35)||0),e;9 1b=2e(5.O.12().1a(d,h,q,5.Y.1b)||1);6(1R!=\'7\'){e=1s.X}W{6(5.Y.21===D||5.Y.21===u){e=2e.4R}W{e=2e(5.O.12().1a(d,h,q,5.Y.21))+((1b>0)?(1):(-1))}}9 18=\'\';9 i,l;6(5.Y.2f){9 3j=s+2e(5.O.12().1a(d,h,q,5.Y.2f));e=(3j>e)?(e):(3j)}6((e>s&&1b>0)||(e<s&&1b<0)){9 1S=0;9 3W=(1R!=\'7\')?(4S.4T((e-s)/1b)):D;9 1u,1n;9 3k=0;K(;((1b>0)?(s<e):(s>e));s+=1b,++1S,++3k){6(j.J&&3k>j.3D){E p V("2c: 4U 3U 4V 4W 4X");}1u=2d[s];6(1R!=\'7\'){1n=1s[s]}W{1n=1s(s);6(1n===D||1n===u){F}}6((1K 1n==\'7\')&&(5.O.m.1X||!5.O.m.2O)){22}6((1R==\'3V\')&&(1u 2m 2n)&&(1n===2n[1u])){22}9 3X=y[5.C];y[5.C]=1n;y[5.C+\'$3Y\']=s;y[5.C+\'$1S\']=1S;y[5.C+\'$3Z\']=(1S===0);y[5.C+\'$40\']=(s+1b>=e);y[5.C+\'$41\']=3W;y[5.C+\'$2d\']=(1u!==D&&1u.38==3b)?(5.O.13(1u)):(1u);y[5.C+\'$1K\']=1K 1n;K(i=0,l=5.2w.X;i<l;++i){1k{18+=5.2w[i].M(y,h,q,I)}1l(1T){6(1T 1C 17){2U(1T.1m){B\'22\':i=l;F;B\'F\':i=l;s=e;F;3G:E 1T;}}W{E 1T;}}}1v y[5.C+\'$3Y\'];1v y[5.C+\'$1S\'];1v y[5.C+\'$3Z\'];1v y[5.C+\'$40\'];1v y[5.C+\'$41\'];1v y[5.C+\'$2d\'];1v y[5.C+\'$1K\'];1v y[5.C];y[5.C]=3X}}W{K(i=0,l=5.2x.X;i<l;++i){18+=5.2x[i].M(d,h,q,I)}}c 18}1l(e){6(j.J||(e 1C 17)){E e;}c""}};9 17=7(1m){5.1m=1m};17.z=V;17.z.M=7(d){E 5;};9 30=7(N,H,1r){N.1j(/\\{#2Z (.*?)(?: 4Y=(.*?))?\\}/);5.O=H[L.$1];6(5.O==D){6(j.J){E p V(\'14: 4Z 3R 2Z: \'+L.$1);}}5.42=L.$2;5.43=1r};30.z.M=7(d,h,q,I){1k{c 5.O.M(5.43.12().1a(d,h,q,5.42),h,q,I)}1l(e){6(j.J||(e 1C 17)){E e;}}c\'\'};9 31=7(N,1r){N.1j(/\\{#h 24=(\\w*?) 1B=(.*?)\\}/);5.C=L.$1;5.27=L.$2;5.1P=1r};31.z.M=7(d,h,q,I){1k{h[5.C]=5.1P.12().1a(d,h,q,5.27)}1l(e){6(j.J||(e 1C 17)){E e;}h[5.C]=D}c\'\'};9 32=7(N,1r){N.1j(/\\{#9 (.*?)\\}/);5.44=L.$1;5.1P=1r};32.z.M=7(d,h,q,I){1k{6(q==D){c""}9 25=5.1P.12().1a(d,h,q,5.44);9 1U=b.G(q,"2p");6(1U==D){1U={1y:(++j.1y),d:[]}}9 i=1U.d.x(25);b.G(q,"2p",1U);c"(R.3N(5,"+1U.1y+","+(i-1)+"))"}1l(e){6(j.J||(e 1C 17)){E e;}c\'\'}};9 34=7(N){N.1j(/\\{#33 50=(.*?)\\}/);5.3l=3f(L.$1);5.3m=5.3l.X;6(5.3m<=0){E p V(\'14: 51 52 K 33\');}5.3n=0;5.3o=-1};34.z.M=7(d,h,q,I){9 3p=b.G(q,\'2y\');6(3p!=5.3o){5.3o=3p;5.3n=0}9 i=5.3n++%5.3m;c 5.3l[i]};b.1e.1F=7(s,H,m){c b(5).1t(7(){9 t=(s&&s.38==j)?s:p j(s,H,m);b.G(5,\'2c\',t);b.G(5,\'2y\',0)})};b.1e.53=7(1V,H,m){9 s=b.2z({1w:1V,2A:\'2B\',2C:1c,1m:\'45\'}).46;c b(5).1F(s,H,m)};b.1e.54=7(3q,H,m){9 s=b(\'#\'+3q).3d();6(s==u){s=b(\'#\'+3q).47();s=s.15(/&3K;/g,"<").15(/&3J;/g,">")}s=b.3M(s);s=s.15(/^<\\!\\[55\\[([\\s\\S]*)\\]\\]>$/48,\'$1\');s=s.15(/^<\\!--([\\s\\S]*)-->$/48,\'$1\');c b(5).1F(s,H,m)};b.1e.56=7(){9 2f=0;b(5).1t(7(){6(b.2D(5)){++2f}});c 2f};b.1e.57=7(){b(5).49();c b(5).1t(7(){b.36(5,\'2c\')})};b.1e.37=7(24,1B){c b(5).1t(7(){9 t=b.2D(5);6(t!=u){t.37(24,1B)}W 6(j.J){E p V(\'14: j 2S 2l 4a.\');}})};b.1e.3r=7(d,h,1o){c b(5).1t(7(){9 t=b.2D(5);6(t!=u){6(1o!=D&&1o.3s){d=t.2h(d)}b.G(5,\'2y\',b.G(5,\'2y\')+1);b(5).47(t.M(d,h,5,0))}W 6(j.J){E p V(\'14: j 2S 2l 4a.\');}})};b.1e.58=7(1V,h,1o){9 Z=5;9 o=b.1i({2E:1c},b.59);o=b.1i(o,1o);b.2z({1w:1V,1m:o.1m,G:o.G,4b:o.4b,2C:o.2C,2F:o.2F,2E:o.2E,4c:o.4c,2A:\'2B\',4d:7(d){9 r=b(Z).3r(d,h,{3s:1x});6(o.2G){o.2G(r)}},5a:o.5b,5c:o.5d});c 5};9 3t=7(1w,h,2H,2I,1f,1o){5.4e=1w;5.1D=h;5.4f=2H;5.4g=2I;5.1f=1f;5.4h=u;5.2J=1o||{};9 Z=5;b(1f).1t(7(){b.G(5,\'3u\',Z)});5.3v()};3t.z.3v=7(){5.1f=b.4i(5.1f,7(2K){c(b.5e(5f.5g,2K.5h?2K[0]:2K))});6(5.1f.X===0){c}9 Z=5;b.2z({1w:5.4e,2A:\'2B\',G:5.4g,2E:1c,2F:Z.2J.2F,4d:7(d){1k{9 r=b(Z.1f).3r(d,Z.1D,{3s:1x});6(Z.2J.2G){Z.2J.2G(r)}}1l(1T){}}});5.4h=5i(7(){Z.3v()},5.4f)};b.1e.5j=7(1w,h,2H,2I,1o){c p 3t(1w,h,2H,2I,5,1o)};b.1e.49=7(){c b(5).1t(7(){9 2L=b.G(5,\'3u\');6(2L==u){c}9 Z=5;2L.1f=b.4i(2L.1f,7(o){c o!=Z});b.36(5,\'3u\')})};b.1i({3x:7(s,H,m){c p j(s,H,m)},5k:7(1V,H,m){9 s=b.2z({1w:1V,2A:\'2B\',2C:1c,1m:\'45\'}).46;c p j(s,H,m)},2D:7(q){c b.G(q,\'2c\')},5l:7(1d,G,4j){c 1d.M(G,4j,D,0)},5m:7(1B){j.J=1B}})})(b)};',62,333,'|||||this|if|function||var||jQuery|return|||||param||Template|||settings|||new|element||||null|||push|extData|prototype|node|case|_name|undefined|throw|break|data|includes|deep|DEBUG_MODE|for|RegExp|get|oper|_template|||TemplateUtils|||se|Error|else|length|_option|that|this_op||getBin|f_escapeString|jTemplates|replace|ss|JTException|ret|result|evaluate|step|false|template|fn|objs|_tree|_templates_code|extend|match|try|catch|type|cval|options|TextNode|literalMode|templ|fcount|each|ckey|delete|url|true|guid|opIF|opFOREACH|value|instanceof|_param|f_cloneData|setTemplate|tname|lastIndex|literal|filter|typeof|sExpr|lm|rm|par|_templ|_curr|mode|iteration|ex|refobj|url_|_templates|disallow_functions|indexOf|substring|op|end|continue|noFunc|name|obj|el|_value|nested|sText|_cond|ci|jTemplate|key|Number|count|cloneData|f_parseJSON|MAIN|iter|while|not|in|Object|op_|jTemplatesRef|escapeData|EvalObj|EvalClass|optionText|__value|_parent|_onTrue|_onFalse|jTemplateSID|ajax|dataType|text|async|getTemplate|cache|headers|on_success|interval|args|_options|elem|updater|_includes|filter_params|runnable_functions|parseJSON|reg|_template_settings|is|optionToObject|switch|addCond|switchToElse|foreach|getParent|include|Include|UserParam|UserVariable|cycle|Cycle|begin|removeData|setParam|constructor||toString|String|id|val|__templ|eval|_runFunc|_currentState|arr|tmp|loopCounter|_values|_length|_index|_lastSessionID|sid|elementName|processTemplate|StrToJSON|Updater|jTemplateUpdater|run|window|createTemplate|filter_data|clone_data|clone_params|escapeHTML|splitTemplates|FOREACH_LOOP_LIMIT|of|opFORFactory|default|substr|txt|gt|lt|Function|trim|ReturnRefValue|_literalMode|evaluateContent|cl|find|as|_arg|loop|object|_total|prevValue|index|first|last|total|_root|_mainTempl|_id|GET|responseText|html|im|processTemplateStop|defined|dataFilter|timeout|success|_url|_interval|_args|timer|grep|parameter|version|10000|exec|closed|No|elseif|ldelim|rdelim|Missing|unknown|tag|amp|quot|hasOwnProperty|Array|Functions|are|allowed|split|shift|string|Invalid|JSON|parentNode|isFunction|subtemplate|to|Operator|failed|Variable|cannot|be|used|MAX_VALUE|Math|ceil|Foreach|limit|was|exceed|root|Cannot|values|no|elements|setTemplateURL|setTemplateElement|CDATA|hasTemplate|removeTemplate|processTemplateURL|ajaxSettings|error|on_error|complete|on_complete|contains|document|body|jquery|setTimeout|processTemplateStart|createTemplateURL|processTemplateToText|jTemplatesDebugMode'.split('|'),0,{}));
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/jquery.mCustomScrollbar.concat.min.js b/pluss-manage-page/src/main/resources/static/resources/auth/js/jquery.mCustomScrollbar.concat.min.js
new file mode 100644
index 0000000..f23925a
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/jquery.mCustomScrollbar.concat.min.js
@@ -0,0 +1,4 @@
+/*mousewheel*/
+(function(a){function d(b){var c=b||window.event,d=[].slice.call(arguments,1),e=0,f=!0,g=0,h=0;return b=a.event.fix(c),b.type="mousewheel",c.wheelDelta&&(e=c.wheelDelta/120),c.detail&&(e=-c.detail/3),h=e,c.axis!==undefined&&c.axis===c.HORIZONTAL_AXIS&&(h=0,g=-1*e),c.wheelDeltaY!==undefined&&(h=c.wheelDeltaY/120),c.wheelDeltaX!==undefined&&(g=-1*c.wheelDeltaX/120),d.unshift(b,e,g,h),(a.event.dispatch||a.event.handle).apply(this,d)}var b=["DOMMouseScroll","mousewheel"];if(a.event.fixHooks)for(var c=b.length;c;)a.event.fixHooks[b[--c]]=a.event.mouseHooks;a.event.special.mousewheel={setup:function(){if(this.addEventListener)for(var a=b.length;a;)this.addEventListener(b[--a],d,!1);else this.onmousewheel=d},teardown:function(){if(this.removeEventListener)for(var a=b.length;a;)this.removeEventListener(b[--a],d,!1);else this.onmousewheel=null}},a.fn.extend({mousewheel:function(a){return a?this.bind("mousewheel",a):this.trigger("mousewheel")},unmousewheel:function(a){return this.unbind("mousewheel",a)}})})(jQuery);
+/*custom scrollbar*/
+(function(c){var b={init:function(e){var f={set_width:false,set_height:false,horizontalScroll:false,scrollInertia:950,mouseWheel:true,mouseWheelPixels:"auto",autoDraggerLength:true,autoHideScrollbar:false,snapAmount:null,snapOffset:0,scrollButtons:{enable:false,scrollType:"continuous",scrollSpeed:"auto",scrollAmount:40},advanced:{updateOnBrowserResize:true,updateOnContentResize:false,autoExpandHorizontalScroll:false,autoScrollOnFocus:true,normalizeMouseWheelDelta:false},contentTouchScroll:true,callbacks:{onScrollStart:function(){},onScroll:function(){},onTotalScroll:function(){},onTotalScrollBack:function(){},onTotalScrollOffset:0,onTotalScrollBackOffset:0,whileScrolling:function(){}},theme:"light"},e=c.extend(true,f,e);return this.each(function(){var m=c(this);if(e.set_width){m.css("width",e.set_width)}if(e.set_height){m.css("height",e.set_height)}if(!c(document).data("mCustomScrollbar-index")){c(document).data("mCustomScrollbar-index","1")}else{var t=parseInt(c(document).data("mCustomScrollbar-index"));c(document).data("mCustomScrollbar-index",t+1)}m.wrapInner("<div class='mCustomScrollBox mCS-"+e.theme+"' id='mCSB_"+c(document).data("mCustomScrollbar-index")+"' style='position:relative; height:100%;max-width:100%;' />").addClass("mCustomScrollbar _mCS_"+c(document).data("mCustomScrollbar-index"));var g=m.children(".mCustomScrollBox");if(e.horizontalScroll){g.addClass("mCSB_horizontal").wrapInner("<div class='mCSB_h_wrapper' style='position:relative; left:0; width:999999px;' />");var k=g.children(".mCSB_h_wrapper");k.wrapInner("<div class='mCSB_container' style='position:absolute; left:0;' />").children(".mCSB_container").css({width:k.children().outerWidth(),position:"relative"}).unwrap()}else{g.wrapInner("<div class='mCSB_container' style='position:relative; top:0;' />")}var o=g.children(".mCSB_container");if(c.support.touch){o.addClass("mCS_touch")}o.after("<div class='mCSB_scrollTools' style='position:absolute;'><div class='mCSB_draggerContainer'><div class='mCSB_dragger' style='position:absolute;' oncontextmenu='return false;'><div class='mCSB_dragger_bar' style='position:relative;'></div></div><div class='mCSB_draggerRail'></div></div></div>");var l=g.children(".mCSB_scrollTools"),h=l.children(".mCSB_draggerContainer"),q=h.children(".mCSB_dragger");if(e.horizontalScroll){q.data("minDraggerWidth",q.width())}else{q.data("minDraggerHeight",q.height())}if(e.scrollButtons.enable){if(e.horizontalScroll){l.prepend("<a class='mCSB_buttonLeft' oncontextmenu='return false;'></a>").append("<a class='mCSB_buttonRight' oncontextmenu='return false;'></a>")}else{l.prepend("<a class='mCSB_buttonUp' oncontextmenu='return false;'></a>").append("<a class='mCSB_buttonDown' oncontextmenu='return false;'></a>")}}g.bind("scroll",function(){if(!m.is(".mCS_disabled")){g.scrollTop(0).scrollLeft(0)}});m.data({mCS_Init:true,mCustomScrollbarIndex:c(document).data("mCustomScrollbar-index"),horizontalScroll:e.horizontalScroll,scrollInertia:e.scrollInertia,scrollEasing:"mcsEaseOut",mouseWheel:e.mouseWheel,mouseWheelPixels:e.mouseWheelPixels,autoDraggerLength:e.autoDraggerLength,autoHideScrollbar:e.autoHideScrollbar,snapAmount:e.snapAmount,snapOffset:e.snapOffset,scrollButtons_enable:e.scrollButtons.enable,scrollButtons_scrollType:e.scrollButtons.scrollType,scrollButtons_scrollSpeed:e.scrollButtons.scrollSpeed,scrollButtons_scrollAmount:e.scrollButtons.scrollAmount,autoExpandHorizontalScroll:e.advanced.autoExpandHorizontalScroll,autoScrollOnFocus:e.advanced.autoScrollOnFocus,normalizeMouseWheelDelta:e.advanced.normalizeMouseWheelDelta,contentTouchScroll:e.contentTouchScroll,onScrollStart_Callback:e.callbacks.onScrollStart,onScroll_Callback:e.callbacks.onScroll,onTotalScroll_Callback:e.callbacks.onTotalScroll,onTotalScrollBack_Callback:e.callbacks.onTotalScrollBack,onTotalScroll_Offset:e.callbacks.onTotalScrollOffset,onTotalScrollBack_Offset:e.callbacks.onTotalScrollBackOffset,whileScrolling_Callback:e.callbacks.whileScrolling,bindEvent_scrollbar_drag:false,bindEvent_content_touch:false,bindEvent_scrollbar_click:false,bindEvent_mousewheel:false,bindEvent_buttonsContinuous_y:false,bindEvent_buttonsContinuous_x:false,bindEvent_buttonsPixels_y:false,bindEvent_buttonsPixels_x:false,bindEvent_focusin:false,bindEvent_autoHideScrollbar:false,mCSB_buttonScrollRight:false,mCSB_buttonScrollLeft:false,mCSB_buttonScrollDown:false,mCSB_buttonScrollUp:false});if(e.horizontalScroll){if(m.css("max-width")!=="none"){if(!e.advanced.updateOnContentResize){e.advanced.updateOnContentResize=true}}}else{if(m.css("max-height")!=="none"){var s=false,r=parseInt(m.css("max-height"));if(m.css("max-height").indexOf("%")>=0){s=r,r=m.parent().height()*s/100}m.css("overflow","hidden");g.css("max-height",r)}}m.mCustomScrollbar("update");if(e.advanced.updateOnBrowserResize){var i,j=c(window).width(),u=c(window).height();c(window).bind("resize."+m.data("mCustomScrollbarIndex"),function(){if(i){clearTimeout(i)}i=setTimeout(function(){if(!m.is(".mCS_disabled")&&!m.is(".mCS_destroyed")){var w=c(window).width(),v=c(window).height();if(j!==w||u!==v){if(m.css("max-height")!=="none"&&s){g.css("max-height",m.parent().height()*s/100)}m.mCustomScrollbar("update");j=w;u=v}}},150)})}if(e.advanced.updateOnContentResize){var p;if(e.horizontalScroll){var n=o.outerWidth()}else{var n=o.outerHeight()}p=setInterval(function(){if(e.horizontalScroll){if(e.advanced.autoExpandHorizontalScroll){o.css({position:"absolute",width:"auto"}).wrap("<div class='mCSB_h_wrapper' style='position:relative; left:0; width:999999px;' />").css({width:o.outerWidth(),position:"relative"}).unwrap()}var v=o.outerWidth()}else{var v=o.outerHeight()}if(v!=n){m.mCustomScrollbar("update");n=v}},300)}})},update:function(){var n=c(this),k=n.children(".mCustomScrollBox"),q=k.children(".mCSB_container");q.removeClass("mCS_no_scrollbar");n.removeClass("mCS_disabled mCS_destroyed");k.scrollTop(0).scrollLeft(0);var y=k.children(".mCSB_scrollTools"),o=y.children(".mCSB_draggerContainer"),m=o.children(".mCSB_dragger");if(n.data("horizontalScroll")){var A=y.children(".mCSB_buttonLeft"),t=y.children(".mCSB_buttonRight"),f=k.width();if(n.data("autoExpandHorizontalScroll")){q.css({position:"absolute",width:"auto"}).wrap("<div class='mCSB_h_wrapper' style='position:relative; left:0; width:999999px;' />").css({width:q.outerWidth(),position:"relative"}).unwrap()}var z=q.outerWidth()}else{var w=y.children(".mCSB_buttonUp"),g=y.children(".mCSB_buttonDown"),r=k.height(),i=q.outerHeight()}if(i>r&&!n.data("horizontalScroll")){y.css("display","block");var s=o.height();if(n.data("autoDraggerLength")){var u=Math.round(r/i*s),l=m.data("minDraggerHeight");if(u<=l){m.css({height:l})}else{if(u>=s-10){var p=s-10;m.css({height:p})}else{m.css({height:u})}}m.children(".mCSB_dragger_bar").css({"line-height":m.height()+"px"})}var B=m.height(),x=(i-r)/(s-B);n.data("scrollAmount",x).mCustomScrollbar("scrolling",k,q,o,m,w,g,A,t);var D=Math.abs(q.position().top);n.mCustomScrollbar("scrollTo",D,{scrollInertia:0,trigger:"internal"})}else{if(z>f&&n.data("horizontalScroll")){y.css("display","block");var h=o.width();if(n.data("autoDraggerLength")){var j=Math.round(f/z*h),C=m.data("minDraggerWidth");if(j<=C){m.css({width:C})}else{if(j>=h-10){var e=h-10;m.css({width:e})}else{m.css({width:j})}}}var v=m.width(),x=(z-f)/(h-v);n.data("scrollAmount",x).mCustomScrollbar("scrolling",k,q,o,m,w,g,A,t);var D=Math.abs(q.position().left);n.mCustomScrollbar("scrollTo",D,{scrollInertia:0,trigger:"internal"})}else{k.unbind("mousewheel focusin");if(n.data("horizontalScroll")){m.add(q).css("left",0)}else{m.add(q).css("top",0)}y.css("display","none");q.addClass("mCS_no_scrollbar");n.data({bindEvent_mousewheel:false,bindEvent_focusin:false})}}},scrolling:function(h,p,m,j,w,e,A,v){var k=c(this);if(!k.data("bindEvent_scrollbar_drag")){var n,o;if(c.support.msPointer){j.bind("MSPointerDown",function(H){H.preventDefault();k.data({on_drag:true});j.addClass("mCSB_dragger_onDrag");var G=c(this),J=G.offset(),F=H.originalEvent.pageX-J.left,I=H.originalEvent.pageY-J.top;if(F<G.width()&&F>0&&I<G.height()&&I>0){n=I;o=F}});c(document).bind("MSPointerMove."+k.data("mCustomScrollbarIndex"),function(H){H.preventDefault();if(k.data("on_drag")){var G=j,J=G.offset(),F=H.originalEvent.pageX-J.left,I=H.originalEvent.pageY-J.top;D(n,o,I,F)}}).bind("MSPointerUp."+k.data("mCustomScrollbarIndex"),function(x){k.data({on_drag:false});j.removeClass("mCSB_dragger_onDrag")})}else{j.bind("mousedown touchstart",function(H){H.preventDefault();H.stopImmediatePropagation();var G=c(this),K=G.offset(),F,J;if(H.type==="touchstart"){var I=H.originalEvent.touches[0]||H.originalEvent.changedTouches[0];F=I.pageX-K.left;J=I.pageY-K.top}else{k.data({on_drag:true});j.addClass("mCSB_dragger_onDrag");F=H.pageX-K.left;J=H.pageY-K.top}if(F<G.width()&&F>0&&J<G.height()&&J>0){n=J;o=F}}).bind("touchmove",function(H){H.preventDefault();H.stopImmediatePropagation();var K=H.originalEvent.touches[0]||H.originalEvent.changedTouches[0],G=c(this),J=G.offset(),F=K.pageX-J.left,I=K.pageY-J.top;D(n,o,I,F)});c(document).bind("mousemove."+k.data("mCustomScrollbarIndex"),function(H){if(k.data("on_drag")){var G=j,J=G.offset(),F=H.pageX-J.left,I=H.pageY-J.top;D(n,o,I,F)}}).bind("mouseup."+k.data("mCustomScrollbarIndex"),function(x){k.data({on_drag:false});j.removeClass("mCSB_dragger_onDrag")})}k.data({bindEvent_scrollbar_drag:true})}function D(G,H,I,F){if(k.data("horizontalScroll")){k.mCustomScrollbar("scrollTo",(j.position().left-(H))+F,{moveDragger:true,trigger:"internal"})}else{k.mCustomScrollbar("scrollTo",(j.position().top-(G))+I,{moveDragger:true,trigger:"internal"})}}if(c.support.touch&&k.data("contentTouchScroll")){if(!k.data("bindEvent_content_touch")){var l,B,r,s,u,C,E;p.bind("touchstart",function(x){x.stopImmediatePropagation();l=x.originalEvent.touches[0]||x.originalEvent.changedTouches[0];B=c(this);r=B.offset();u=l.pageX-r.left;s=l.pageY-r.top;C=s;E=u});p.bind("touchmove",function(x){x.preventDefault();x.stopImmediatePropagation();l=x.originalEvent.touches[0]||x.originalEvent.changedTouches[0];B=c(this).parent();r=B.offset();u=l.pageX-r.left;s=l.pageY-r.top;if(k.data("horizontalScroll")){k.mCustomScrollbar("scrollTo",E-u,{trigger:"internal"})}else{k.mCustomScrollbar("scrollTo",C-s,{trigger:"internal"})}})}}if(!k.data("bindEvent_scrollbar_click")){m.bind("click",function(F){var x=(F.pageY-m.offset().top)*k.data("scrollAmount"),y=c(F.target);if(k.data("horizontalScroll")){x=(F.pageX-m.offset().left)*k.data("scrollAmount")}if(y.hasClass("mCSB_draggerContainer")||y.hasClass("mCSB_draggerRail")){k.mCustomScrollbar("scrollTo",x,{trigger:"internal",scrollEasing:"draggerRailEase"})}});k.data({bindEvent_scrollbar_click:true})}if(k.data("mouseWheel")){if(!k.data("bindEvent_mousewheel")){h.bind("mousewheel",function(H,J){var G,F=k.data("mouseWheelPixels"),x=Math.abs(p.position().top),I=j.position().top,y=m.height()-j.height();if(k.data("normalizeMouseWheelDelta")){if(J<0){J=-1}else{J=1}}if(F==="auto"){F=100+Math.round(k.data("scrollAmount")/2)}if(k.data("horizontalScroll")){I=j.position().left;y=m.width()-j.width();x=Math.abs(p.position().left)}if((J>0&&I!==0)||(J<0&&I!==y)){H.preventDefault();H.stopImmediatePropagation()}G=x-(J*F);k.mCustomScrollbar("scrollTo",G,{trigger:"internal"})});k.data({bindEvent_mousewheel:true})}}if(k.data("scrollButtons_enable")){if(k.data("scrollButtons_scrollType")==="pixels"){if(k.data("horizontalScroll")){v.add(A).unbind("mousedown touchstart MSPointerDown mouseup MSPointerUp mouseout MSPointerOut touchend",i,g);k.data({bindEvent_buttonsContinuous_x:false});if(!k.data("bindEvent_buttonsPixels_x")){v.bind("click",function(x){x.preventDefault();q(Math.abs(p.position().left)+k.data("scrollButtons_scrollAmount"))});A.bind("click",function(x){x.preventDefault();q(Math.abs(p.position().left)-k.data("scrollButtons_scrollAmount"))});k.data({bindEvent_buttonsPixels_x:true})}}else{e.add(w).unbind("mousedown touchstart MSPointerDown mouseup MSPointerUp mouseout MSPointerOut touchend",i,g);k.data({bindEvent_buttonsContinuous_y:false});if(!k.data("bindEvent_buttonsPixels_y")){e.bind("click",function(x){x.preventDefault();q(Math.abs(p.position().top)+k.data("scrollButtons_scrollAmount"))});w.bind("click",function(x){x.preventDefault();q(Math.abs(p.position().top)-k.data("scrollButtons_scrollAmount"))});k.data({bindEvent_buttonsPixels_y:true})}}function q(x){if(!j.data("preventAction")){j.data("preventAction",true);k.mCustomScrollbar("scrollTo",x,{trigger:"internal"})}}}else{if(k.data("horizontalScroll")){v.add(A).unbind("click");k.data({bindEvent_buttonsPixels_x:false});if(!k.data("bindEvent_buttonsContinuous_x")){v.bind("mousedown touchstart MSPointerDown",function(y){y.preventDefault();var x=z();k.data({mCSB_buttonScrollRight:setInterval(function(){k.mCustomScrollbar("scrollTo",Math.abs(p.position().left)+x,{trigger:"internal",scrollEasing:"easeOutCirc"})},17)})});var i=function(x){x.preventDefault();clearInterval(k.data("mCSB_buttonScrollRight"))};v.bind("mouseup touchend MSPointerUp mouseout MSPointerOut",i);A.bind("mousedown touchstart MSPointerDown",function(y){y.preventDefault();var x=z();k.data({mCSB_buttonScrollLeft:setInterval(function(){k.mCustomScrollbar("scrollTo",Math.abs(p.position().left)-x,{trigger:"internal",scrollEasing:"easeOutCirc"})},17)})});var g=function(x){x.preventDefault();clearInterval(k.data("mCSB_buttonScrollLeft"))};A.bind("mouseup touchend MSPointerUp mouseout MSPointerOut",g);k.data({bindEvent_buttonsContinuous_x:true})}}else{e.add(w).unbind("click");k.data({bindEvent_buttonsPixels_y:false});if(!k.data("bindEvent_buttonsContinuous_y")){e.bind("mousedown touchstart MSPointerDown",function(y){y.preventDefault();var x=z();k.data({mCSB_buttonScrollDown:setInterval(function(){k.mCustomScrollbar("scrollTo",Math.abs(p.position().top)+x,{trigger:"internal",scrollEasing:"easeOutCirc"})},17)})});var t=function(x){x.preventDefault();clearInterval(k.data("mCSB_buttonScrollDown"))};e.bind("mouseup touchend MSPointerUp mouseout MSPointerOut",t);w.bind("mousedown touchstart MSPointerDown",function(y){y.preventDefault();var x=z();k.data({mCSB_buttonScrollUp:setInterval(function(){k.mCustomScrollbar("scrollTo",Math.abs(p.position().top)-x,{trigger:"internal",scrollEasing:"easeOutCirc"})},17)})});var f=function(x){x.preventDefault();clearInterval(k.data("mCSB_buttonScrollUp"))};w.bind("mouseup touchend MSPointerUp mouseout MSPointerOut",f);k.data({bindEvent_buttonsContinuous_y:true})}}function z(){var x=k.data("scrollButtons_scrollSpeed");if(k.data("scrollButtons_scrollSpeed")==="auto"){x=Math.round((k.data("scrollInertia")+100)/40)}return x}}}if(k.data("autoScrollOnFocus")){if(!k.data("bindEvent_focusin")){h.bind("focusin",function(){h.scrollTop(0).scrollLeft(0);var x=c(document.activeElement);if(x.is("input,textarea,select,button,a[tabindex],area,object")){var G=p.position().top,y=x.position().top,F=h.height()-x.outerHeight();if(k.data("horizontalScroll")){G=p.position().left;y=x.position().left;F=h.width()-x.outerWidth()}if(G+y<0||G+y>F){k.mCustomScrollbar("scrollTo",y,{trigger:"internal"})}}});k.data({bindEvent_focusin:true})}}if(k.data("autoHideScrollbar")){if(!k.data("bindEvent_autoHideScrollbar")){h.bind("mouseenter",function(x){h.addClass("mCS-mouse-over");d.showScrollbar.call(h.children(".mCSB_scrollTools"))}).bind("mouseleave touchend",function(x){h.removeClass("mCS-mouse-over");if(x.type==="mouseleave"){d.hideScrollbar.call(h.children(".mCSB_scrollTools"))}});k.data({bindEvent_autoHideScrollbar:true})}}},scrollTo:function(e,f){var i=c(this),o={moveDragger:false,trigger:"external",callbacks:true,scrollInertia:i.data("scrollInertia"),scrollEasing:i.data("scrollEasing")},f=c.extend(o,f),p,g=i.children(".mCustomScrollBox"),k=g.children(".mCSB_container"),r=g.children(".mCSB_scrollTools"),j=r.children(".mCSB_draggerContainer"),h=j.children(".mCSB_dragger"),t=draggerSpeed=f.scrollInertia,q,s,m,l;if(!k.hasClass("mCS_no_scrollbar")){i.data({mCS_trigger:f.trigger});if(i.data("mCS_Init")){f.callbacks=false}if(e||e===0){if(typeof(e)==="number"){if(f.moveDragger){p=e;if(i.data("horizontalScroll")){e=h.position().left*i.data("scrollAmount")}else{e=h.position().top*i.data("scrollAmount")}draggerSpeed=0}else{p=e/i.data("scrollAmount")}}else{if(typeof(e)==="string"){var v;if(e==="top"){v=0}else{if(e==="bottom"&&!i.data("horizontalScroll")){v=k.outerHeight()-g.height()}else{if(e==="left"){v=0}else{if(e==="right"&&i.data("horizontalScroll")){v=k.outerWidth()-g.width()}else{if(e==="first"){v=i.find(".mCSB_container").find(":first")}else{if(e==="last"){v=i.find(".mCSB_container").find(":last")}else{v=i.find(e)}}}}}}if(v.length===1){if(i.data("horizontalScroll")){e=v.position().left}else{e=v.position().top}p=e/i.data("scrollAmount")}else{p=e=v}}}if(i.data("horizontalScroll")){if(i.data("onTotalScrollBack_Offset")){s=-i.data("onTotalScrollBack_Offset")}if(i.data("onTotalScroll_Offset")){l=g.width()-k.outerWidth()+i.data("onTotalScroll_Offset")}if(p<0){p=e=0;clearInterval(i.data("mCSB_buttonScrollLeft"));if(!s){q=true}}else{if(p>=j.width()-h.width()){p=j.width()-h.width();e=g.width()-k.outerWidth();clearInterval(i.data("mCSB_buttonScrollRight"));if(!l){m=true}}else{e=-e}}var n=i.data("snapAmount");if(n){e=Math.round(e/n)*n-i.data("snapOffset")}d.mTweenAxis.call(this,h[0],"left",Math.round(p),draggerSpeed,f.scrollEasing);d.mTweenAxis.call(this,k[0],"left",Math.round(e),t,f.scrollEasing,{onStart:function(){if(f.callbacks&&!i.data("mCS_tweenRunning")){u("onScrollStart")}if(i.data("autoHideScrollbar")){d.showScrollbar.call(r)}},onUpdate:function(){if(f.callbacks){u("whileScrolling")}},onComplete:function(){if(f.callbacks){u("onScroll");if(q||(s&&k.position().left>=s)){u("onTotalScrollBack")}if(m||(l&&k.position().left<=l)){u("onTotalScroll")}}h.data("preventAction",false);i.data("mCS_tweenRunning",false);if(i.data("autoHideScrollbar")){if(!g.hasClass("mCS-mouse-over")){d.hideScrollbar.call(r)}}}})}else{if(i.data("onTotalScrollBack_Offset")){s=-i.data("onTotalScrollBack_Offset")}if(i.data("onTotalScroll_Offset")){l=g.height()-k.outerHeight()+i.data("onTotalScroll_Offset")}if(p<0){p=e=0;clearInterval(i.data("mCSB_buttonScrollUp"));if(!s){q=true}}else{if(p>=j.height()-h.height()){p=j.height()-h.height();e=g.height()-k.outerHeight();clearInterval(i.data("mCSB_buttonScrollDown"));if(!l){m=true}}else{e=-e}}var n=i.data("snapAmount");if(n){e=Math.round(e/n)*n-i.data("snapOffset")}d.mTweenAxis.call(this,h[0],"top",Math.round(p),draggerSpeed,f.scrollEasing);d.mTweenAxis.call(this,k[0],"top",Math.round(e),t,f.scrollEasing,{onStart:function(){if(f.callbacks&&!i.data("mCS_tweenRunning")){u("onScrollStart")}if(i.data("autoHideScrollbar")){d.showScrollbar.call(r)}},onUpdate:function(){if(f.callbacks){u("whileScrolling")}},onComplete:function(){if(f.callbacks){u("onScroll");if(q||(s&&k.position().top>=s)){u("onTotalScrollBack")}if(m||(l&&k.position().top<=l)){u("onTotalScroll")}}h.data("preventAction",false);i.data("mCS_tweenRunning",false);if(i.data("autoHideScrollbar")){if(!g.hasClass("mCS-mouse-over")){d.hideScrollbar.call(r)}}}})}if(i.data("mCS_Init")){i.data({mCS_Init:false})}}}function u(w){this.mcs={top:k.position().top,left:k.position().left,draggerTop:h.position().top,draggerLeft:h.position().left,topPct:Math.round((100*Math.abs(k.position().top))/Math.abs(k.outerHeight()-g.height())),leftPct:Math.round((100*Math.abs(k.position().left))/Math.abs(k.outerWidth()-g.width()))};switch(w){case"onScrollStart":i.data("mCS_tweenRunning",true).data("onScrollStart_Callback").call(i,this.mcs);break;case"whileScrolling":i.data("whileScrolling_Callback").call(i,this.mcs);break;case"onScroll":i.data("onScroll_Callback").call(i,this.mcs);break;case"onTotalScrollBack":i.data("onTotalScrollBack_Callback").call(i,this.mcs);break;case"onTotalScroll":i.data("onTotalScroll_Callback").call(i,this.mcs);break}}},stop:function(){var g=c(this),e=g.children().children(".mCSB_container"),f=g.children().children().children().children(".mCSB_dragger");d.mTweenAxisStop.call(this,e[0]);d.mTweenAxisStop.call(this,f[0])},disable:function(e){var j=c(this),f=j.children(".mCustomScrollBox"),h=f.children(".mCSB_container"),g=f.children(".mCSB_scrollTools"),i=g.children().children(".mCSB_dragger");f.unbind("mousewheel focusin mouseenter mouseleave touchend");h.unbind("touchstart touchmove");if(e){if(j.data("horizontalScroll")){i.add(h).css("left",0)}else{i.add(h).css("top",0)}}g.css("display","none");h.addClass("mCS_no_scrollbar");j.data({bindEvent_mousewheel:false,bindEvent_focusin:false,bindEvent_content_touch:false,bindEvent_autoHideScrollbar:false}).addClass("mCS_disabled")},destroy:function(){var e=c(this);e.removeClass("mCustomScrollbar _mCS_"+e.data("mCustomScrollbarIndex")).addClass("mCS_destroyed").children().children(".mCSB_container").unwrap().children().unwrap().siblings(".mCSB_scrollTools").remove();c(document).unbind("mousemove."+e.data("mCustomScrollbarIndex")+" mouseup."+e.data("mCustomScrollbarIndex")+" MSPointerMove."+e.data("mCustomScrollbarIndex")+" MSPointerUp."+e.data("mCustomScrollbarIndex"));c(window).unbind("resize."+e.data("mCustomScrollbarIndex"))}},d={showScrollbar:function(){this.stop().animate({opacity:1},"fast")},hideScrollbar:function(){this.stop().animate({opacity:0},"fast")},mTweenAxis:function(g,i,h,f,o,y){var y=y||{},v=y.onStart||function(){},p=y.onUpdate||function(){},w=y.onComplete||function(){};var n=t(),l,j=0,r=g.offsetTop,s=g.style;if(i==="left"){r=g.offsetLeft}var m=h-r;q();e();function t(){if(window.performance&&window.performance.now){return window.performance.now()}else{if(window.performance&&window.performance.webkitNow){return window.performance.webkitNow()}else{if(Date.now){return Date.now()}else{return new Date().getTime()}}}}function x(){if(!j){v.call()}j=t()-n;u();if(j>=g._time){g._time=(j>g._time)?j+l-(j-g._time):j+l-1;if(g._time<j+1){g._time=j+1}}if(g._time<f){g._id=_request(x)}else{w.call()}}function u(){if(f>0){g.currVal=k(g._time,r,m,f,o);s[i]=Math.round(g.currVal)+"px"}else{s[i]=h+"px"}p.call()}function e(){l=1000/60;g._time=j+l;_request=(!window.requestAnimationFrame)?function(z){u();return setTimeout(z,0.01)}:window.requestAnimationFrame;g._id=_request(x)}function q(){if(g._id==null){return}if(!window.requestAnimationFrame){clearTimeout(g._id)}else{window.cancelAnimationFrame(g._id)}g._id=null}function k(B,A,F,E,C){switch(C){case"linear":return F*B/E+A;break;case"easeOutQuad":B/=E;return -F*B*(B-2)+A;break;case"easeInOutQuad":B/=E/2;if(B<1){return F/2*B*B+A}B--;return -F/2*(B*(B-2)-1)+A;break;case"easeOutCubic":B/=E;B--;return F*(B*B*B+1)+A;break;case"easeOutQuart":B/=E;B--;return -F*(B*B*B*B-1)+A;break;case"easeOutQuint":B/=E;B--;return F*(B*B*B*B*B+1)+A;break;case"easeOutCirc":B/=E;B--;return F*Math.sqrt(1-B*B)+A;break;case"easeOutSine":return F*Math.sin(B/E*(Math.PI/2))+A;break;case"easeOutExpo":return F*(-Math.pow(2,-10*B/E)+1)+A;break;case"mcsEaseOut":var D=(B/=E)*B,z=D*B;return A+F*(0.499999999999997*z*D+-2.5*D*D+5.5*z+-6.5*D+4*B);break;case"draggerRailEase":B/=E/2;if(B<1){return F/2*B*B*B+A}B-=2;return F/2*(B*B*B+2)+A;break}}},mTweenAxisStop:function(e){if(e._id==null){return}if(!window.requestAnimationFrame){clearTimeout(e._id)}else{window.cancelAnimationFrame(e._id)}e._id=null},rafPolyfill:function(){var f=["ms","moz","webkit","o"],e=f.length;while(--e>-1&&!window.requestAnimationFrame){window.requestAnimationFrame=window[f[e]+"RequestAnimationFrame"];window.cancelAnimationFrame=window[f[e]+"CancelAnimationFrame"]||window[f[e]+"CancelRequestAnimationFrame"]}}};d.rafPolyfill.call();c.support.touch=!!("ontouchstart" in window);c.support.msPointer=window.navigator.msPointerEnabled;var a=("https:"==document.location.protocol)?"https:":"http:";c.event.special.mousewheel||document.write('<script src="'+a+'//cdnjs.cloudflare.com/ajax/libs/jquery-mousewheel/3.0.6/jquery.mousewheel.min.js"><\/script>');c.fn.mCustomScrollbar=function(e){if(b[e]){return b[e].apply(this,Array.prototype.slice.call(arguments,1))}else{if(typeof e==="object"||!e){return b.init.apply(this,arguments)}else{c.error("Method "+e+" does not exist")}}}})(jQuery);
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/jquery.nicescroll.min.js b/pluss-manage-page/src/main/resources/static/resources/auth/js/jquery.nicescroll.min.js
new file mode 100644
index 0000000..1174962
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/jquery.nicescroll.min.js
@@ -0,0 +1,120 @@
+/* jquery.nicescroll 3.6.8 InuYaksa*2015 MIT http://nicescroll.areaaperta.com */(function(f){"function"===typeof define&&define.amd?define(["jquery"],f):"object"===typeof exports?module.exports=f(require("jquery")):f(jQuery)})(function(f){var B=!1,F=!1,O=0,P=2E3,A=0,J=["webkit","ms","moz","o"],v=window.requestAnimationFrame||!1,w=window.cancelAnimationFrame||!1;if(!v)for(var Q in J){var G=J[Q];if(v=window[G+"RequestAnimationFrame"]){w=window[G+"CancelAnimationFrame"]||window[G+"CancelRequestAnimationFrame"];break}}var x=window.MutationObserver||window.WebKitMutationObserver||
+!1,K={zindex:"auto",cursoropacitymin:1,cursoropacitymax:1,cursorcolor:"#424242",cursorwidth:"6px",cursorborder:"1px solid #fff",cursorborderradius:"5px",scrollspeed:60,mousescrollstep:24,touchbehavior:!1,hwacceleration:!0,usetransition:!0,boxzoom:!1,dblclickzoom:!0,gesturezoom:!0,grabcursorenabled:!0,autohidemode:!0,background:"",iframeautoresize:!0,cursorminheight:32,preservenativescrolling:!0,railoffset:!1,railhoffset:!1,bouncescroll:!0,spacebarenabled:!0,railpadding:{top:0,right:0,left:0,bottom:0},
+disableoutline:!0,horizrailenabled:!0,railalign:"right",railvalign:"bottom",enabletranslate3d:!0,enablemousewheel:!0,enablekeyboard:!0,smoothscroll:!0,sensitiverail:!0,enablemouselockapi:!0,cursorfixedheight:!1,directionlockdeadzone:6,hidecursordelay:400,nativeparentscrolling:!0,enablescrollonselection:!0,overflowx:!0,overflowy:!0,cursordragspeed:.3,rtlmode:"auto",cursordragontouch:!1,oneaxismousemode:"auto",scriptpath:function(){var f=document.getElementsByTagName("script"),f=f.length?f[f.length-
+1].src.split("?")[0]:"";return 0<f.split("/").length?f.split("/").slice(0,-1).join("/")+"/":""}(),preventmultitouchscrolling:!0,disablemutationobserver:!1},H=!1,R=function(){if(H)return H;var f=document.createElement("DIV"),c=f.style,k=navigator.userAgent,l=navigator.platform,d={haspointerlock:"pointerLockElement"in document||"webkitPointerLockElement"in document||"mozPointerLockElement"in document};d.isopera="opera"in window;d.isopera12=d.isopera&&"getUserMedia"in navigator;d.isoperamini="[object OperaMini]"===
+Object.prototype.toString.call(window.operamini);d.isie="all"in document&&"attachEvent"in f&&!d.isopera;d.isieold=d.isie&&!("msInterpolationMode"in c);d.isie7=d.isie&&!d.isieold&&(!("documentMode"in document)||7==document.documentMode);d.isie8=d.isie&&"documentMode"in document&&8==document.documentMode;d.isie9=d.isie&&"performance"in window&&9==document.documentMode;d.isie10=d.isie&&"performance"in window&&10==document.documentMode;d.isie11="msRequestFullscreen"in f&&11<=document.documentMode;d.isieedge12=
+navigator.userAgent.match(/Edge\/12\./);d.isieedge="msOverflowStyle"in f;d.ismodernie=d.isie11||d.isieedge;d.isie9mobile=/iemobile.9/i.test(k);d.isie9mobile&&(d.isie9=!1);d.isie7mobile=!d.isie9mobile&&d.isie7&&/iemobile/i.test(k);d.ismozilla="MozAppearance"in c;d.iswebkit="WebkitAppearance"in c;d.ischrome="chrome"in window;d.ischrome38=d.ischrome&&"touchAction"in c;d.ischrome22=!d.ischrome38&&d.ischrome&&d.haspointerlock;d.ischrome26=!d.ischrome38&&d.ischrome&&"transition"in c;d.cantouch="ontouchstart"in
+document.documentElement||"ontouchstart"in window;d.hasw3ctouch=(window.PointerEvent||!1)&&(0<navigator.MaxTouchPoints||0<navigator.msMaxTouchPoints);d.hasmstouch=!d.hasw3ctouch&&(window.MSPointerEvent||!1);d.ismac=/^mac$/i.test(l);d.isios=d.cantouch&&/iphone|ipad|ipod/i.test(l);d.isios4=d.isios&&!("seal"in Object);d.isios7=d.isios&&"webkitHidden"in document;d.isios8=d.isios&&"hidden"in document;d.isandroid=/android/i.test(k);d.haseventlistener="addEventListener"in f;d.trstyle=!1;d.hastransform=!1;
+d.hastranslate3d=!1;d.transitionstyle=!1;d.hastransition=!1;d.transitionend=!1;l=["transform","msTransform","webkitTransform","MozTransform","OTransform"];for(k=0;k<l.length;k++)if(void 0!==c[l[k]]){d.trstyle=l[k];break}d.hastransform=!!d.trstyle;d.hastransform&&(c[d.trstyle]="translate3d(1px,2px,3px)",d.hastranslate3d=/translate3d/.test(c[d.trstyle]));d.transitionstyle=!1;d.prefixstyle="";d.transitionend=!1;for(var l="transition webkitTransition msTransition MozTransition OTransition OTransition KhtmlTransition".split(" "),
+q=" -webkit- -ms- -moz- -o- -o -khtml-".split(" "),t="transitionend webkitTransitionEnd msTransitionEnd transitionend otransitionend oTransitionEnd KhtmlTransitionEnd".split(" "),k=0;k<l.length;k++)if(l[k]in c){d.transitionstyle=l[k];d.prefixstyle=q[k];d.transitionend=t[k];break}d.ischrome26&&(d.prefixstyle=q[1]);d.hastransition=d.transitionstyle;a:{k=["grab","-webkit-grab","-moz-grab"];if(d.ischrome&&!d.ischrome38||d.isie)k=[];for(l=0;l<k.length;l++)if(q=k[l],c.cursor=q,c.cursor==q){c=q;break a}c=
+"url(//patriciaportfolio.googlecode.com/files/openhand.cur),n-resize"}d.cursorgrabvalue=c;d.hasmousecapture="setCapture"in f;d.hasMutationObserver=!1!==x;return H=d},S=function(h,c){function k(){var b=a.doc.css(e.trstyle);return b&&"matrix"==b.substr(0,6)?b.replace(/^.*\((.*)\)$/g,"$1").replace(/px/g,"").split(/, +/):!1}function l(){var b=a.win;if("zIndex"in b)return b.zIndex();for(;0<b.length&&9!=b[0].nodeType;){var g=b.css("zIndex");if(!isNaN(g)&&0!=g)return parseInt(g);b=b.parent()}return!1}function d(b,
+g,u){g=b.css(g);b=parseFloat(g);return isNaN(b)?(b=z[g]||0,u=3==b?u?a.win.outerHeight()-a.win.innerHeight():a.win.outerWidth()-a.win.innerWidth():1,a.isie8&&b&&(b+=1),u?b:0):b}function q(b,g,u,c){a._bind(b,g,function(a){a=a?a:window.event;var c={original:a,target:a.target||a.srcElement,type:"wheel",deltaMode:"MozMousePixelScroll"==a.type?0:1,deltaX:0,deltaZ:0,preventDefault:function(){a.preventDefault?a.preventDefault():a.returnValue=!1;return!1},stopImmediatePropagation:function(){a.stopImmediatePropagation?
+a.stopImmediatePropagation():a.cancelBubble=!0}};"mousewheel"==g?(a.wheelDeltaX&&(c.deltaX=-.025*a.wheelDeltaX),a.wheelDeltaY&&(c.deltaY=-.025*a.wheelDeltaY),c.deltaY||c.deltaX||(c.deltaY=-.025*a.wheelDelta)):c.deltaY=a.detail;return u.call(b,c)},c)}function t(b,g,c){var d,e;0==b.deltaMode?(d=-Math.floor(a.opt.mousescrollstep/54*b.deltaX),e=-Math.floor(a.opt.mousescrollstep/54*b.deltaY)):1==b.deltaMode&&(d=-Math.floor(b.deltaX*a.opt.mousescrollstep),e=-Math.floor(b.deltaY*a.opt.mousescrollstep));
+g&&a.opt.oneaxismousemode&&0==d&&e&&(d=e,e=0,c&&(0>d?a.getScrollLeft()>=a.page.maxw:0>=a.getScrollLeft())&&(e=d,d=0));a.isrtlmode&&(d=-d);d&&(a.scrollmom&&a.scrollmom.stop(),a.lastdeltax+=d,a.debounced("mousewheelx",function(){var b=a.lastdeltax;a.lastdeltax=0;a.rail.drag||a.doScrollLeftBy(b)},15));if(e){if(a.opt.nativeparentscrolling&&c&&!a.ispage&&!a.zoomactive)if(0>e){if(a.getScrollTop()>=a.page.maxh)return!0}else if(0>=a.getScrollTop())return!0;a.scrollmom&&a.scrollmom.stop();a.lastdeltay+=e;
+a.synched("mousewheely",function(){var b=a.lastdeltay;a.lastdeltay=0;a.rail.drag||a.doScrollBy(b)},15)}b.stopImmediatePropagation();return b.preventDefault()}var a=this;this.version="3.6.8";this.name="nicescroll";this.me=c;this.opt={doc:f("body"),win:!1};f.extend(this.opt,K);this.opt.snapbackspeed=80;if(h)for(var r in a.opt)void 0!==h[r]&&(a.opt[r]=h[r]);a.opt.disablemutationobserver&&(x=!1);this.iddoc=(this.doc=a.opt.doc)&&this.doc[0]?this.doc[0].id||"":"";this.ispage=/^BODY|HTML/.test(a.opt.win?
+a.opt.win[0].nodeName:this.doc[0].nodeName);this.haswrapper=!1!==a.opt.win;this.win=a.opt.win||(this.ispage?f(window):this.doc);this.docscroll=this.ispage&&!this.haswrapper?f(window):this.win;this.body=f("body");this.iframe=this.isfixed=this.viewport=!1;this.isiframe="IFRAME"==this.doc[0].nodeName&&"IFRAME"==this.win[0].nodeName;this.istextarea="TEXTAREA"==this.win[0].nodeName;this.forcescreen=!1;this.canshowonmouseevent="scroll"!=a.opt.autohidemode;this.page=this.view=this.onzoomout=this.onzoomin=
+this.onscrollcancel=this.onscrollend=this.onscrollstart=this.onclick=this.ongesturezoom=this.onkeypress=this.onmousewheel=this.onmousemove=this.onmouseup=this.onmousedown=!1;this.scroll={x:0,y:0};this.scrollratio={x:0,y:0};this.cursorheight=20;this.scrollvaluemax=0;if("auto"==this.opt.rtlmode){r=this.win[0]==window?this.body:this.win;var p=r.css("writing-mode")||r.css("-webkit-writing-mode")||r.css("-ms-writing-mode")||r.css("-moz-writing-mode");"horizontal-tb"==p||"lr-tb"==p||""==p?(this.isrtlmode=
+"rtl"==r.css("direction"),this.isvertical=!1):(this.isrtlmode="vertical-rl"==p||"tb"==p||"tb-rl"==p||"rl-tb"==p,this.isvertical="vertical-rl"==p||"tb"==p||"tb-rl"==p)}else this.isrtlmode=!0===this.opt.rtlmode,this.isvertical=!1;this.observerbody=this.observerremover=this.observer=this.scrollmom=this.scrollrunning=!1;do this.id="ascrail"+P++;while(document.getElementById(this.id));this.hasmousefocus=this.hasfocus=this.zoomactive=this.zoom=this.selectiondrag=this.cursorfreezed=this.cursor=this.rail=
+!1;this.visibility=!0;this.hidden=this.locked=this.railslocked=!1;this.cursoractive=!0;this.wheelprevented=!1;this.overflowx=a.opt.overflowx;this.overflowy=a.opt.overflowy;this.nativescrollingarea=!1;this.checkarea=0;this.events=[];this.saved={};this.delaylist={};this.synclist={};this.lastdeltay=this.lastdeltax=0;this.detected=R();var e=f.extend({},this.detected);this.ishwscroll=(this.canhwscroll=e.hastransform&&a.opt.hwacceleration)&&a.haswrapper;this.hasreversehr=this.isrtlmode?this.isvertical?
+!(e.iswebkit||e.isie||e.isie11):!(e.iswebkit||e.isie&&!e.isie10&&!e.isie11):!1;this.istouchcapable=!1;e.cantouch||!e.hasw3ctouch&&!e.hasmstouch?!e.cantouch||e.isios||e.isandroid||!e.iswebkit&&!e.ismozilla||(this.istouchcapable=!0):this.istouchcapable=!0;a.opt.enablemouselockapi||(e.hasmousecapture=!1,e.haspointerlock=!1);this.debounced=function(b,g,c){a&&(a.delaylist[b]||(g.call(a),a.delaylist[b]={h:v(function(){a.delaylist[b].fn.call(a);a.delaylist[b]=!1},c)}),a.delaylist[b].fn=g)};var I=!1;this.synched=
+function(b,g){a.synclist[b]=g;(function(){I||(v(function(){if(a){I=!1;for(var b in a.synclist){var g=a.synclist[b];g&&g.call(a);a.synclist[b]=!1}}}),I=!0)})();return b};this.unsynched=function(b){a.synclist[b]&&(a.synclist[b]=!1)};this.css=function(b,g){for(var c in g)a.saved.css.push([b,c,b.css(c)]),b.css(c,g[c])};this.scrollTop=function(b){return void 0===b?a.getScrollTop():a.setScrollTop(b)};this.scrollLeft=function(b){return void 0===b?a.getScrollLeft():a.setScrollLeft(b)};var D=function(a,g,
+c,d,e,f,k){this.st=a;this.ed=g;this.spd=c;this.p1=d||0;this.p2=e||1;this.p3=f||0;this.p4=k||1;this.ts=(new Date).getTime();this.df=this.ed-this.st};D.prototype={B2:function(a){return 3*a*a*(1-a)},B3:function(a){return 3*a*(1-a)*(1-a)},B4:function(a){return(1-a)*(1-a)*(1-a)},getNow:function(){var a=1-((new Date).getTime()-this.ts)/this.spd,g=this.B2(a)+this.B3(a)+this.B4(a);return 0>a?this.ed:this.st+Math.round(this.df*g)},update:function(a,g){this.st=this.getNow();this.ed=a;this.spd=g;this.ts=(new Date).getTime();
+this.df=this.ed-this.st;return this}};if(this.ishwscroll){this.doc.translate={x:0,y:0,tx:"0px",ty:"0px"};e.hastranslate3d&&e.isios&&this.doc.css("-webkit-backface-visibility","hidden");this.getScrollTop=function(b){if(!b){if(b=k())return 16==b.length?-b[13]:-b[5];if(a.timerscroll&&a.timerscroll.bz)return a.timerscroll.bz.getNow()}return a.doc.translate.y};this.getScrollLeft=function(b){if(!b){if(b=k())return 16==b.length?-b[12]:-b[4];if(a.timerscroll&&a.timerscroll.bh)return a.timerscroll.bh.getNow()}return a.doc.translate.x};
+this.notifyScrollEvent=function(a){var g=document.createEvent("UIEvents");g.initUIEvent("scroll",!1,!0,window,1);g.niceevent=!0;a.dispatchEvent(g)};var y=this.isrtlmode?1:-1;e.hastranslate3d&&a.opt.enabletranslate3d?(this.setScrollTop=function(b,g){a.doc.translate.y=b;a.doc.translate.ty=-1*b+"px";a.doc.css(e.trstyle,"translate3d("+a.doc.translate.tx+","+a.doc.translate.ty+",0px)");g||a.notifyScrollEvent(a.win[0])},this.setScrollLeft=function(b,g){a.doc.translate.x=b;a.doc.translate.tx=b*y+"px";a.doc.css(e.trstyle,
+"translate3d("+a.doc.translate.tx+","+a.doc.translate.ty+",0px)");g||a.notifyScrollEvent(a.win[0])}):(this.setScrollTop=function(b,g){a.doc.translate.y=b;a.doc.translate.ty=-1*b+"px";a.doc.css(e.trstyle,"translate("+a.doc.translate.tx+","+a.doc.translate.ty+")");g||a.notifyScrollEvent(a.win[0])},this.setScrollLeft=function(b,g){a.doc.translate.x=b;a.doc.translate.tx=b*y+"px";a.doc.css(e.trstyle,"translate("+a.doc.translate.tx+","+a.doc.translate.ty+")");g||a.notifyScrollEvent(a.win[0])})}else this.getScrollTop=
+function(){return a.docscroll.scrollTop()},this.setScrollTop=function(b){return setTimeout(function(){a&&a.docscroll.scrollTop(b)},1)},this.getScrollLeft=function(){return a.hasreversehr?a.detected.ismozilla?a.page.maxw-Math.abs(a.docscroll.scrollLeft()):a.page.maxw-a.docscroll.scrollLeft():a.docscroll.scrollLeft()},this.setScrollLeft=function(b){return setTimeout(function(){if(a)return a.hasreversehr&&(b=a.detected.ismozilla?-(a.page.maxw-b):a.page.maxw-b),a.docscroll.scrollLeft(b)},1)};this.getTarget=
+function(a){return a?a.target?a.target:a.srcElement?a.srcElement:!1:!1};this.hasParent=function(a,g){if(!a)return!1;for(var c=a.target||a.srcElement||a||!1;c&&c.id!=g;)c=c.parentNode||!1;return!1!==c};var z={thin:1,medium:3,thick:5};this.getDocumentScrollOffset=function(){return{top:window.pageYOffset||document.documentElement.scrollTop,left:window.pageXOffset||document.documentElement.scrollLeft}};this.getOffset=function(){if(a.isfixed){var b=a.win.offset(),g=a.getDocumentScrollOffset();b.top-=g.top;
+b.left-=g.left;return b}b=a.win.offset();if(!a.viewport)return b;g=a.viewport.offset();return{top:b.top-g.top,left:b.left-g.left}};this.updateScrollBar=function(b){var g,c,e;if(a.ishwscroll)a.rail.css({height:a.win.innerHeight()-(a.opt.railpadding.top+a.opt.railpadding.bottom)}),a.railh&&a.railh.css({width:a.win.innerWidth()-(a.opt.railpadding.left+a.opt.railpadding.right)});else{var f=a.getOffset();g=f.top;c=f.left-(a.opt.railpadding.left+a.opt.railpadding.right);g+=d(a.win,"border-top-width",!0);
+c+=a.rail.align?a.win.outerWidth()-d(a.win,"border-right-width")-a.rail.width:d(a.win,"border-left-width");if(e=a.opt.railoffset)e.top&&(g+=e.top),e.left&&(c+=e.left);a.railslocked||a.rail.css({top:g,left:c,height:(b?b.h:a.win.innerHeight())-(a.opt.railpadding.top+a.opt.railpadding.bottom)});a.zoom&&a.zoom.css({top:g+1,left:1==a.rail.align?c-20:c+a.rail.width+4});if(a.railh&&!a.railslocked){g=f.top;c=f.left;if(e=a.opt.railhoffset)e.top&&(g+=e.top),e.left&&(c+=e.left);b=a.railh.align?g+d(a.win,"border-top-width",
+!0)+a.win.innerHeight()-a.railh.height:g+d(a.win,"border-top-width",!0);c+=d(a.win,"border-left-width");a.railh.css({top:b-(a.opt.railpadding.top+a.opt.railpadding.bottom),left:c,width:a.railh.width})}}};this.doRailClick=function(b,g,c){var d;a.railslocked||(a.cancelEvent(b),g?(g=c?a.doScrollLeft:a.doScrollTop,d=c?(b.pageX-a.railh.offset().left-a.cursorwidth/2)*a.scrollratio.x:(b.pageY-a.rail.offset().top-a.cursorheight/2)*a.scrollratio.y,g(d)):(g=c?a.doScrollLeftBy:a.doScrollBy,d=c?a.scroll.x:a.scroll.y,
+b=c?b.pageX-a.railh.offset().left:b.pageY-a.rail.offset().top,c=c?a.view.w:a.view.h,g(d>=b?c:-c)))};a.hasanimationframe=v;a.hascancelanimationframe=w;a.hasanimationframe?a.hascancelanimationframe||(w=function(){a.cancelAnimationFrame=!0}):(v=function(a){return setTimeout(a,15-Math.floor(+new Date/1E3)%16)},w=clearTimeout);this.init=function(){a.saved.css=[];if(e.isie7mobile||e.isoperamini)return!0;e.hasmstouch&&a.css(a.ispage?f("html"):a.win,{_touchaction:"none"});var b=e.ismodernie||e.isie10?{"-ms-overflow-style":"none"}:
+{"overflow-y":"hidden"};a.zindex="auto";a.zindex=a.ispage||"auto"!=a.opt.zindex?a.opt.zindex:l()||"auto";!a.ispage&&"auto"!=a.zindex&&a.zindex>A&&(A=a.zindex);a.isie&&0==a.zindex&&"auto"==a.opt.zindex&&(a.zindex="auto");if(!a.ispage||!e.cantouch&&!e.isieold&&!e.isie9mobile){var c=a.docscroll;a.ispage&&(c=a.haswrapper?a.win:a.doc);e.isie9mobile||a.css(c,b);a.ispage&&e.isie7&&("BODY"==a.doc[0].nodeName?a.css(f("html"),{"overflow-y":"hidden"}):"HTML"==a.doc[0].nodeName&&a.css(f("body"),b));!e.isios||
+a.ispage||a.haswrapper||a.css(f("body"),{"-webkit-overflow-scrolling":"touch"});var d=f(document.createElement("div"));d.css({position:"relative",top:0,"float":"right",width:a.opt.cursorwidth,height:0,"background-color":a.opt.cursorcolor,border:a.opt.cursorborder,"background-clip":"padding-box","-webkit-border-radius":a.opt.cursorborderradius,"-moz-border-radius":a.opt.cursorborderradius,"border-radius":a.opt.cursorborderradius});d.hborder=parseFloat(d.outerHeight()-d.innerHeight());d.addClass("nicescroll-cursors");
+a.cursor=d;var m=f(document.createElement("div"));m.attr("id",a.id);m.addClass("nicescroll-rails nicescroll-rails-vr");var k,h,p=["left","right","top","bottom"],L;for(L in p)h=p[L],(k=a.opt.railpadding[h])?m.css("padding-"+h,k+"px"):a.opt.railpadding[h]=0;m.append(d);m.width=Math.max(parseFloat(a.opt.cursorwidth),d.outerWidth());m.css({width:m.width+"px",zIndex:a.zindex,background:a.opt.background,cursor:"default"});m.visibility=!0;m.scrollable=!0;m.align="left"==a.opt.railalign?0:1;a.rail=m;d=a.rail.drag=
+!1;!a.opt.boxzoom||a.ispage||e.isieold||(d=document.createElement("div"),a.bind(d,"click",a.doZoom),a.bind(d,"mouseenter",function(){a.zoom.css("opacity",a.opt.cursoropacitymax)}),a.bind(d,"mouseleave",function(){a.zoom.css("opacity",a.opt.cursoropacitymin)}),a.zoom=f(d),a.zoom.css({cursor:"pointer",zIndex:a.zindex,backgroundImage:"url("+a.opt.scriptpath+"zoomico.png)",height:18,width:18,backgroundPosition:"0px 0px"}),a.opt.dblclickzoom&&a.bind(a.win,"dblclick",a.doZoom),e.cantouch&&a.opt.gesturezoom&&
+(a.ongesturezoom=function(b){1.5<b.scale&&a.doZoomIn(b);.8>b.scale&&a.doZoomOut(b);return a.cancelEvent(b)},a.bind(a.win,"gestureend",a.ongesturezoom)));a.railh=!1;var n;a.opt.horizrailenabled&&(a.css(c,{overflowX:"hidden"}),d=f(document.createElement("div")),d.css({position:"absolute",top:0,height:a.opt.cursorwidth,width:0,backgroundColor:a.opt.cursorcolor,border:a.opt.cursorborder,backgroundClip:"padding-box","-webkit-border-radius":a.opt.cursorborderradius,"-moz-border-radius":a.opt.cursorborderradius,
+"border-radius":a.opt.cursorborderradius}),e.isieold&&d.css("overflow","hidden"),d.wborder=parseFloat(d.outerWidth()-d.innerWidth()),d.addClass("nicescroll-cursors"),a.cursorh=d,n=f(document.createElement("div")),n.attr("id",a.id+"-hr"),n.addClass("nicescroll-rails nicescroll-rails-hr"),n.height=Math.max(parseFloat(a.opt.cursorwidth),d.outerHeight()),n.css({height:n.height+"px",zIndex:a.zindex,background:a.opt.background}),n.append(d),n.visibility=!0,n.scrollable=!0,n.align="top"==a.opt.railvalign?
+0:1,a.railh=n,a.railh.drag=!1);a.ispage?(m.css({position:"fixed",top:0,height:"100%"}),m.align?m.css({right:0}):m.css({left:0}),a.body.append(m),a.railh&&(n.css({position:"fixed",left:0,width:"100%"}),n.align?n.css({bottom:0}):n.css({top:0}),a.body.append(n))):(a.ishwscroll?("static"==a.win.css("position")&&a.css(a.win,{position:"relative"}),c="HTML"==a.win[0].nodeName?a.body:a.win,f(c).scrollTop(0).scrollLeft(0),a.zoom&&(a.zoom.css({position:"absolute",top:1,right:0,"margin-right":m.width+4}),c.append(a.zoom)),
+m.css({position:"absolute",top:0}),m.align?m.css({right:0}):m.css({left:0}),c.append(m),n&&(n.css({position:"absolute",left:0,bottom:0}),n.align?n.css({bottom:0}):n.css({top:0}),c.append(n))):(a.isfixed="fixed"==a.win.css("position"),c=a.isfixed?"fixed":"absolute",a.isfixed||(a.viewport=a.getViewport(a.win[0])),a.viewport&&(a.body=a.viewport,0==/fixed|absolute/.test(a.viewport.css("position"))&&a.css(a.viewport,{position:"relative"})),m.css({position:c}),a.zoom&&a.zoom.css({position:c}),a.updateScrollBar(),
+a.body.append(m),a.zoom&&a.body.append(a.zoom),a.railh&&(n.css({position:c}),a.body.append(n))),e.isios&&a.css(a.win,{"-webkit-tap-highlight-color":"rgba(0,0,0,0)","-webkit-touch-callout":"none"}),e.isie&&a.opt.disableoutline&&a.win.attr("hideFocus","true"),e.iswebkit&&a.opt.disableoutline&&a.win.css("outline","none"));!1===a.opt.autohidemode?(a.autohidedom=!1,a.rail.css({opacity:a.opt.cursoropacitymax}),a.railh&&a.railh.css({opacity:a.opt.cursoropacitymax})):!0===a.opt.autohidemode||"leave"===a.opt.autohidemode?
+(a.autohidedom=f().add(a.rail),e.isie8&&(a.autohidedom=a.autohidedom.add(a.cursor)),a.railh&&(a.autohidedom=a.autohidedom.add(a.railh)),a.railh&&e.isie8&&(a.autohidedom=a.autohidedom.add(a.cursorh))):"scroll"==a.opt.autohidemode?(a.autohidedom=f().add(a.rail),a.railh&&(a.autohidedom=a.autohidedom.add(a.railh))):"cursor"==a.opt.autohidemode?(a.autohidedom=f().add(a.cursor),a.railh&&(a.autohidedom=a.autohidedom.add(a.cursorh))):"hidden"==a.opt.autohidemode&&(a.autohidedom=!1,a.hide(),a.railslocked=
+!1);if(e.isie9mobile)a.scrollmom=new M(a),a.onmangotouch=function(){var b=a.getScrollTop(),c=a.getScrollLeft();if(b==a.scrollmom.lastscrolly&&c==a.scrollmom.lastscrollx)return!0;var g=b-a.mangotouch.sy,d=c-a.mangotouch.sx;if(0!=Math.round(Math.sqrt(Math.pow(d,2)+Math.pow(g,2)))){var e=0>g?-1:1,f=0>d?-1:1,u=+new Date;a.mangotouch.lazy&&clearTimeout(a.mangotouch.lazy);80<u-a.mangotouch.tm||a.mangotouch.dry!=e||a.mangotouch.drx!=f?(a.scrollmom.stop(),a.scrollmom.reset(c,b),a.mangotouch.sy=b,a.mangotouch.ly=
+b,a.mangotouch.sx=c,a.mangotouch.lx=c,a.mangotouch.dry=e,a.mangotouch.drx=f,a.mangotouch.tm=u):(a.scrollmom.stop(),a.scrollmom.update(a.mangotouch.sx-d,a.mangotouch.sy-g),a.mangotouch.tm=u,g=Math.max(Math.abs(a.mangotouch.ly-b),Math.abs(a.mangotouch.lx-c)),a.mangotouch.ly=b,a.mangotouch.lx=c,2<g&&(a.mangotouch.lazy=setTimeout(function(){a.mangotouch.lazy=!1;a.mangotouch.dry=0;a.mangotouch.drx=0;a.mangotouch.tm=0;a.scrollmom.doMomentum(30)},100)))}},m=a.getScrollTop(),n=a.getScrollLeft(),a.mangotouch=
+{sy:m,ly:m,dry:0,sx:n,lx:n,drx:0,lazy:!1,tm:0},a.bind(a.docscroll,"scroll",a.onmangotouch);else{if(e.cantouch||a.istouchcapable||a.opt.touchbehavior||e.hasmstouch){a.scrollmom=new M(a);a.ontouchstart=function(b){if(b.pointerType&&2!=b.pointerType&&"touch"!=b.pointerType)return!1;a.hasmoving=!1;if(!a.railslocked){var c;if(e.hasmstouch)for(c=b.target?b.target:!1;c;){var g=f(c).getNiceScroll();if(0<g.length&&g[0].me==a.me)break;if(0<g.length)return!1;if("DIV"==c.nodeName&&c.id==a.id)break;c=c.parentNode?
+c.parentNode:!1}a.cancelScroll();if((c=a.getTarget(b))&&/INPUT/i.test(c.nodeName)&&/range/i.test(c.type))return a.stopPropagation(b);!("clientX"in b)&&"changedTouches"in b&&(b.clientX=b.changedTouches[0].clientX,b.clientY=b.changedTouches[0].clientY);a.forcescreen&&(g=b,b={original:b.original?b.original:b},b.clientX=g.screenX,b.clientY=g.screenY);a.rail.drag={x:b.clientX,y:b.clientY,sx:a.scroll.x,sy:a.scroll.y,st:a.getScrollTop(),sl:a.getScrollLeft(),pt:2,dl:!1};if(a.ispage||!a.opt.directionlockdeadzone)a.rail.drag.dl=
+"f";else{var g=f(window).width(),d=f(window).height(),d=Math.max(0,Math.max(document.body.scrollHeight,document.documentElement.scrollHeight)-d),g=Math.max(0,Math.max(document.body.scrollWidth,document.documentElement.scrollWidth)-g);a.rail.drag.ck=!a.rail.scrollable&&a.railh.scrollable?0<d?"v":!1:a.rail.scrollable&&!a.railh.scrollable?0<g?"h":!1:!1;a.rail.drag.ck||(a.rail.drag.dl="f")}a.opt.touchbehavior&&a.isiframe&&e.isie&&(g=a.win.position(),a.rail.drag.x+=g.left,a.rail.drag.y+=g.top);a.hasmoving=
+!1;a.lastmouseup=!1;a.scrollmom.reset(b.clientX,b.clientY);if(!e.cantouch&&!this.istouchcapable&&!b.pointerType){if(!c||!/INPUT|SELECT|TEXTAREA/i.test(c.nodeName))return!a.ispage&&e.hasmousecapture&&c.setCapture(),a.opt.touchbehavior?(c.onclick&&!c._onclick&&(c._onclick=c.onclick,c.onclick=function(b){if(a.hasmoving)return!1;c._onclick.call(this,b)}),a.cancelEvent(b)):a.stopPropagation(b);/SUBMIT|CANCEL|BUTTON/i.test(f(c).attr("type"))&&(pc={tg:c,click:!1},a.preventclick=pc)}}};a.ontouchend=function(b){if(!a.rail.drag)return!0;
+if(2==a.rail.drag.pt){if(b.pointerType&&2!=b.pointerType&&"touch"!=b.pointerType)return!1;a.scrollmom.doMomentum();a.rail.drag=!1;if(a.hasmoving&&(a.lastmouseup=!0,a.hideCursor(),e.hasmousecapture&&document.releaseCapture(),!e.cantouch))return a.cancelEvent(b)}else if(1==a.rail.drag.pt)return a.onmouseup(b)};var q=a.opt.touchbehavior&&a.isiframe&&!e.hasmousecapture;a.ontouchmove=function(b,c){if(!a.rail.drag||b.targetTouches&&a.opt.preventmultitouchscrolling&&1<b.targetTouches.length||b.pointerType&&
+2!=b.pointerType&&"touch"!=b.pointerType)return!1;if(2==a.rail.drag.pt){if(e.cantouch&&e.isios&&void 0===b.original)return!0;a.hasmoving=!0;a.preventclick&&!a.preventclick.click&&(a.preventclick.click=a.preventclick.tg.onclick||!1,a.preventclick.tg.onclick=a.onpreventclick);b=f.extend({original:b},b);"changedTouches"in b&&(b.clientX=b.changedTouches[0].clientX,b.clientY=b.changedTouches[0].clientY);if(a.forcescreen){var g=b;b={original:b.original?b.original:b};b.clientX=g.screenX;b.clientY=g.screenY}var d,
+g=d=0;q&&!c&&(d=a.win.position(),g=-d.left,d=-d.top);var u=b.clientY+d;d=u-a.rail.drag.y;var m=b.clientX+g,k=m-a.rail.drag.x,h=a.rail.drag.st-d;a.ishwscroll&&a.opt.bouncescroll?0>h?h=Math.round(h/2):h>a.page.maxh&&(h=a.page.maxh+Math.round((h-a.page.maxh)/2)):(0>h&&(u=h=0),h>a.page.maxh&&(h=a.page.maxh,u=0));var l;a.railh&&a.railh.scrollable&&(l=a.isrtlmode?k-a.rail.drag.sl:a.rail.drag.sl-k,a.ishwscroll&&a.opt.bouncescroll?0>l?l=Math.round(l/2):l>a.page.maxw&&(l=a.page.maxw+Math.round((l-a.page.maxw)/
+2)):(0>l&&(m=l=0),l>a.page.maxw&&(l=a.page.maxw,m=0)));g=!1;if(a.rail.drag.dl)g=!0,"v"==a.rail.drag.dl?l=a.rail.drag.sl:"h"==a.rail.drag.dl&&(h=a.rail.drag.st);else{d=Math.abs(d);var k=Math.abs(k),C=a.opt.directionlockdeadzone;if("v"==a.rail.drag.ck){if(d>C&&k<=.3*d)return a.rail.drag=!1,!0;k>C&&(a.rail.drag.dl="f",f("body").scrollTop(f("body").scrollTop()))}else if("h"==a.rail.drag.ck){if(k>C&&d<=.3*k)return a.rail.drag=!1,!0;d>C&&(a.rail.drag.dl="f",f("body").scrollLeft(f("body").scrollLeft()))}}a.synched("touchmove",
+function(){a.rail.drag&&2==a.rail.drag.pt&&(a.prepareTransition&&a.prepareTransition(0),a.rail.scrollable&&a.setScrollTop(h),a.scrollmom.update(m,u),a.railh&&a.railh.scrollable?(a.setScrollLeft(l),a.showCursor(h,l)):a.showCursor(h),e.isie10&&document.selection.clear())});e.ischrome&&a.istouchcapable&&(g=!1);if(g)return a.cancelEvent(b)}else if(1==a.rail.drag.pt)return a.onmousemove(b)}}a.onmousedown=function(b,c){if(!a.rail.drag||1==a.rail.drag.pt){if(a.railslocked)return a.cancelEvent(b);a.cancelScroll();
+a.rail.drag={x:b.clientX,y:b.clientY,sx:a.scroll.x,sy:a.scroll.y,pt:1,hr:!!c};var g=a.getTarget(b);!a.ispage&&e.hasmousecapture&&g.setCapture();a.isiframe&&!e.hasmousecapture&&(a.saved.csspointerevents=a.doc.css("pointer-events"),a.css(a.doc,{"pointer-events":"none"}));a.hasmoving=!1;return a.cancelEvent(b)}};a.onmouseup=function(b){if(a.rail.drag){if(1!=a.rail.drag.pt)return!0;e.hasmousecapture&&document.releaseCapture();a.isiframe&&!e.hasmousecapture&&a.doc.css("pointer-events",a.saved.csspointerevents);
+a.rail.drag=!1;a.hasmoving&&a.triggerScrollEnd();return a.cancelEvent(b)}};a.onmousemove=function(b){if(a.rail.drag){if(1==a.rail.drag.pt){if(e.ischrome&&0==b.which)return a.onmouseup(b);a.cursorfreezed=!0;a.hasmoving=!0;if(a.rail.drag.hr){a.scroll.x=a.rail.drag.sx+(b.clientX-a.rail.drag.x);0>a.scroll.x&&(a.scroll.x=0);var c=a.scrollvaluemaxw;a.scroll.x>c&&(a.scroll.x=c)}else a.scroll.y=a.rail.drag.sy+(b.clientY-a.rail.drag.y),0>a.scroll.y&&(a.scroll.y=0),c=a.scrollvaluemax,a.scroll.y>c&&(a.scroll.y=
+c);a.synched("mousemove",function(){a.rail.drag&&1==a.rail.drag.pt&&(a.showCursor(),a.rail.drag.hr?a.hasreversehr?a.doScrollLeft(a.scrollvaluemaxw-Math.round(a.scroll.x*a.scrollratio.x),a.opt.cursordragspeed):a.doScrollLeft(Math.round(a.scroll.x*a.scrollratio.x),a.opt.cursordragspeed):a.doScrollTop(Math.round(a.scroll.y*a.scrollratio.y),a.opt.cursordragspeed))});return a.cancelEvent(b)}}else a.checkarea=0};if(e.cantouch||a.opt.touchbehavior)a.onpreventclick=function(b){if(a.preventclick)return a.preventclick.tg.onclick=
+a.preventclick.click,a.preventclick=!1,a.cancelEvent(b)},a.bind(a.win,"mousedown",a.ontouchstart),a.onclick=e.isios?!1:function(b){return a.lastmouseup?(a.lastmouseup=!1,a.cancelEvent(b)):!0},a.opt.grabcursorenabled&&e.cursorgrabvalue&&(a.css(a.ispage?a.doc:a.win,{cursor:e.cursorgrabvalue}),a.css(a.rail,{cursor:e.cursorgrabvalue}));else{var r=function(b){if(a.selectiondrag){if(b){var c=a.win.outerHeight();b=b.pageY-a.selectiondrag.top;0<b&&b<c&&(b=0);b>=c&&(b-=c);a.selectiondrag.df=b}0!=a.selectiondrag.df&&
+(a.doScrollBy(2*-Math.floor(a.selectiondrag.df/6)),a.debounced("doselectionscroll",function(){r()},50))}};a.hasTextSelected="getSelection"in document?function(){return 0<document.getSelection().rangeCount}:"selection"in document?function(){return"None"!=document.selection.type}:function(){return!1};a.onselectionstart=function(b){a.ispage||(a.selectiondrag=a.win.offset())};a.onselectionend=function(b){a.selectiondrag=!1};a.onselectiondrag=function(b){a.selectiondrag&&a.hasTextSelected()&&a.debounced("selectionscroll",
+function(){r(b)},250)}}e.hasw3ctouch?(a.css(a.rail,{"touch-action":"none"}),a.css(a.cursor,{"touch-action":"none"}),a.bind(a.win,"pointerdown",a.ontouchstart),a.bind(document,"pointerup",a.ontouchend),a.bind(document,"pointermove",a.ontouchmove)):e.hasmstouch?(a.css(a.rail,{"-ms-touch-action":"none"}),a.css(a.cursor,{"-ms-touch-action":"none"}),a.bind(a.win,"MSPointerDown",a.ontouchstart),a.bind(document,"MSPointerUp",a.ontouchend),a.bind(document,"MSPointerMove",a.ontouchmove),a.bind(a.cursor,"MSGestureHold",
+function(a){a.preventDefault()}),a.bind(a.cursor,"contextmenu",function(a){a.preventDefault()})):this.istouchcapable&&(a.bind(a.win,"touchstart",a.ontouchstart),a.bind(document,"touchend",a.ontouchend),a.bind(document,"touchcancel",a.ontouchend),a.bind(document,"touchmove",a.ontouchmove));if(a.opt.cursordragontouch||!e.cantouch&&!a.opt.touchbehavior)a.rail.css({cursor:"default"}),a.railh&&a.railh.css({cursor:"default"}),a.jqbind(a.rail,"mouseenter",function(){if(!a.ispage&&!a.win.is(":visible"))return!1;
+a.canshowonmouseevent&&a.showCursor();a.rail.active=!0}),a.jqbind(a.rail,"mouseleave",function(){a.rail.active=!1;a.rail.drag||a.hideCursor()}),a.opt.sensitiverail&&(a.bind(a.rail,"click",function(b){a.doRailClick(b,!1,!1)}),a.bind(a.rail,"dblclick",function(b){a.doRailClick(b,!0,!1)}),a.bind(a.cursor,"click",function(b){a.cancelEvent(b)}),a.bind(a.cursor,"dblclick",function(b){a.cancelEvent(b)})),a.railh&&(a.jqbind(a.railh,"mouseenter",function(){if(!a.ispage&&!a.win.is(":visible"))return!1;a.canshowonmouseevent&&
+a.showCursor();a.rail.active=!0}),a.jqbind(a.railh,"mouseleave",function(){a.rail.active=!1;a.rail.drag||a.hideCursor()}),a.opt.sensitiverail&&(a.bind(a.railh,"click",function(b){a.doRailClick(b,!1,!0)}),a.bind(a.railh,"dblclick",function(b){a.doRailClick(b,!0,!0)}),a.bind(a.cursorh,"click",function(b){a.cancelEvent(b)}),a.bind(a.cursorh,"dblclick",function(b){a.cancelEvent(b)})));e.cantouch||a.opt.touchbehavior?(a.bind(e.hasmousecapture?a.win:document,"mouseup",a.ontouchend),a.bind(document,"mousemove",
+a.ontouchmove),a.onclick&&a.bind(document,"click",a.onclick),a.opt.cursordragontouch?(a.bind(a.cursor,"mousedown",a.onmousedown),a.bind(a.cursor,"mouseup",a.onmouseup),a.cursorh&&a.bind(a.cursorh,"mousedown",function(b){a.onmousedown(b,!0)}),a.cursorh&&a.bind(a.cursorh,"mouseup",a.onmouseup)):(a.bind(a.rail,"mousedown",function(a){a.preventDefault()}),a.railh&&a.bind(a.railh,"mousedown",function(a){a.preventDefault()}))):(a.bind(e.hasmousecapture?a.win:document,"mouseup",a.onmouseup),a.bind(document,
+"mousemove",a.onmousemove),a.onclick&&a.bind(document,"click",a.onclick),a.bind(a.cursor,"mousedown",a.onmousedown),a.bind(a.cursor,"mouseup",a.onmouseup),a.railh&&(a.bind(a.cursorh,"mousedown",function(b){a.onmousedown(b,!0)}),a.bind(a.cursorh,"mouseup",a.onmouseup)),!a.ispage&&a.opt.enablescrollonselection&&(a.bind(a.win[0],"mousedown",a.onselectionstart),a.bind(document,"mouseup",a.onselectionend),a.bind(a.cursor,"mouseup",a.onselectionend),a.cursorh&&a.bind(a.cursorh,"mouseup",a.onselectionend),
+a.bind(document,"mousemove",a.onselectiondrag)),a.zoom&&(a.jqbind(a.zoom,"mouseenter",function(){a.canshowonmouseevent&&a.showCursor();a.rail.active=!0}),a.jqbind(a.zoom,"mouseleave",function(){a.rail.active=!1;a.rail.drag||a.hideCursor()})));a.opt.enablemousewheel&&(a.isiframe||a.mousewheel(e.isie&&a.ispage?document:a.win,a.onmousewheel),a.mousewheel(a.rail,a.onmousewheel),a.railh&&a.mousewheel(a.railh,a.onmousewheelhr));a.ispage||e.cantouch||/HTML|^BODY/.test(a.win[0].nodeName)||(a.win.attr("tabindex")||
+a.win.attr({tabindex:O++}),a.jqbind(a.win,"focus",function(b){B=a.getTarget(b).id||!0;a.hasfocus=!0;a.canshowonmouseevent&&a.noticeCursor()}),a.jqbind(a.win,"blur",function(b){B=!1;a.hasfocus=!1}),a.jqbind(a.win,"mouseenter",function(b){F=a.getTarget(b).id||!0;a.hasmousefocus=!0;a.canshowonmouseevent&&a.noticeCursor()}),a.jqbind(a.win,"mouseleave",function(){F=!1;a.hasmousefocus=!1;a.rail.drag||a.hideCursor()}))}a.onkeypress=function(b){if(a.railslocked&&0==a.page.maxh)return!0;b=b?b:window.e;var c=
+a.getTarget(b);if(c&&/INPUT|TEXTAREA|SELECT|OPTION/.test(c.nodeName)&&(!c.getAttribute("type")&&!c.type||!/submit|button|cancel/i.tp)||f(c).attr("contenteditable"))return!0;if(a.hasfocus||a.hasmousefocus&&!B||a.ispage&&!B&&!F){c=b.keyCode;if(a.railslocked&&27!=c)return a.cancelEvent(b);var g=b.ctrlKey||!1,d=b.shiftKey||!1,e=!1;switch(c){case 38:case 63233:a.doScrollBy(72);e=!0;break;case 40:case 63235:a.doScrollBy(-72);e=!0;break;case 37:case 63232:a.railh&&(g?a.doScrollLeft(0):a.doScrollLeftBy(72),
+e=!0);break;case 39:case 63234:a.railh&&(g?a.doScrollLeft(a.page.maxw):a.doScrollLeftBy(-72),e=!0);break;case 33:case 63276:a.doScrollBy(a.view.h);e=!0;break;case 34:case 63277:a.doScrollBy(-a.view.h);e=!0;break;case 36:case 63273:a.railh&&g?a.doScrollPos(0,0):a.doScrollTo(0);e=!0;break;case 35:case 63275:a.railh&&g?a.doScrollPos(a.page.maxw,a.page.maxh):a.doScrollTo(a.page.maxh);e=!0;break;case 32:a.opt.spacebarenabled&&(d?a.doScrollBy(a.view.h):a.doScrollBy(-a.view.h),e=!0);break;case 27:a.zoomactive&&
+(a.doZoom(),e=!0)}if(e)return a.cancelEvent(b)}};a.opt.enablekeyboard&&a.bind(document,e.isopera&&!e.isopera12?"keypress":"keydown",a.onkeypress);a.bind(document,"keydown",function(b){b.ctrlKey&&(a.wheelprevented=!0)});a.bind(document,"keyup",function(b){b.ctrlKey||(a.wheelprevented=!1)});a.bind(window,"blur",function(b){a.wheelprevented=!1});a.bind(window,"resize",a.lazyResize);a.bind(window,"orientationchange",a.lazyResize);a.bind(window,"load",a.lazyResize);if(e.ischrome&&!a.ispage&&!a.haswrapper){var t=
+a.win.attr("style"),m=parseFloat(a.win.css("width"))+1;a.win.css("width",m);a.synched("chromefix",function(){a.win.attr("style",t)})}a.onAttributeChange=function(b){a.lazyResize(a.isieold?250:30)};a.isie11||!1===x||(a.observerbody=new x(function(b){b.forEach(function(b){if("attributes"==b.type)return f("body").hasClass("modal-open")&&f("body").hasClass("modal-dialog")&&!f.contains(f(".modal-dialog")[0],a.doc[0])?a.hide():a.show()});if(document.body.scrollHeight!=a.page.maxh)return a.lazyResize(30)}),
+a.observerbody.observe(document.body,{childList:!0,subtree:!0,characterData:!1,attributes:!0,attributeFilter:["class"]}));a.ispage||a.haswrapper||(!1!==x?(a.observer=new x(function(b){b.forEach(a.onAttributeChange)}),a.observer.observe(a.win[0],{childList:!0,characterData:!1,attributes:!0,subtree:!1}),a.observerremover=new x(function(b){b.forEach(function(b){if(0<b.removedNodes.length)for(var c in b.removedNodes)if(a&&b.removedNodes[c]==a.win[0])return a.remove()})}),a.observerremover.observe(a.win[0].parentNode,
+{childList:!0,characterData:!1,attributes:!1,subtree:!1})):(a.bind(a.win,e.isie&&!e.isie9?"propertychange":"DOMAttrModified",a.onAttributeChange),e.isie9&&a.win[0].attachEvent("onpropertychange",a.onAttributeChange),a.bind(a.win,"DOMNodeRemoved",function(b){b.target==a.win[0]&&a.remove()})));!a.ispage&&a.opt.boxzoom&&a.bind(window,"resize",a.resizeZoom);a.istextarea&&(a.bind(a.win,"keydown",a.lazyResize),a.bind(a.win,"mouseup",a.lazyResize));a.lazyResize(30)}if("IFRAME"==this.doc[0].nodeName){var N=
+function(){a.iframexd=!1;var c;try{c="contentDocument"in this?this.contentDocument:this.contentWindow.document}catch(g){a.iframexd=!0,c=!1}if(a.iframexd)return"console"in window&&console.log("NiceScroll error: policy restriced iframe"),!0;a.forcescreen=!0;a.isiframe&&(a.iframe={doc:f(c),html:a.doc.contents().find("html")[0],body:a.doc.contents().find("body")[0]},a.getContentSize=function(){return{w:Math.max(a.iframe.html.scrollWidth,a.iframe.body.scrollWidth),h:Math.max(a.iframe.html.scrollHeight,
+a.iframe.body.scrollHeight)}},a.docscroll=f(a.iframe.body));if(!e.isios&&a.opt.iframeautoresize&&!a.isiframe){a.win.scrollTop(0);a.doc.height("");var d=Math.max(c.getElementsByTagName("html")[0].scrollHeight,c.body.scrollHeight);a.doc.height(d)}a.lazyResize(30);e.isie7&&a.css(f(a.iframe.html),b);a.css(f(a.iframe.body),b);e.isios&&a.haswrapper&&a.css(f(c.body),{"-webkit-transform":"translate3d(0,0,0)"});"contentWindow"in this?a.bind(this.contentWindow,"scroll",a.onscroll):a.bind(c,"scroll",a.onscroll);
+a.opt.enablemousewheel&&a.mousewheel(c,a.onmousewheel);a.opt.enablekeyboard&&a.bind(c,e.isopera?"keypress":"keydown",a.onkeypress);if(e.cantouch||a.opt.touchbehavior)a.bind(c,"mousedown",a.ontouchstart),a.bind(c,"mousemove",function(b){return a.ontouchmove(b,!0)}),a.opt.grabcursorenabled&&e.cursorgrabvalue&&a.css(f(c.body),{cursor:e.cursorgrabvalue});a.bind(c,"mouseup",a.ontouchend);a.zoom&&(a.opt.dblclickzoom&&a.bind(c,"dblclick",a.doZoom),a.ongesturezoom&&a.bind(c,"gestureend",a.ongesturezoom))};
+this.doc[0].readyState&&"complete"==this.doc[0].readyState&&setTimeout(function(){N.call(a.doc[0],!1)},500);a.bind(this.doc,"load",N)}};this.showCursor=function(b,c){a.cursortimeout&&(clearTimeout(a.cursortimeout),a.cursortimeout=0);if(a.rail){a.autohidedom&&(a.autohidedom.stop().css({opacity:a.opt.cursoropacitymax}),a.cursoractive=!0);a.rail.drag&&1==a.rail.drag.pt||(void 0!==b&&!1!==b&&(a.scroll.y=Math.round(1*b/a.scrollratio.y)),void 0!==c&&(a.scroll.x=Math.round(1*c/a.scrollratio.x)));a.cursor.css({height:a.cursorheight,
+top:a.scroll.y});if(a.cursorh){var d=a.hasreversehr?a.scrollvaluemaxw-a.scroll.x:a.scroll.x;!a.rail.align&&a.rail.visibility?a.cursorh.css({width:a.cursorwidth,left:d+a.rail.width}):a.cursorh.css({width:a.cursorwidth,left:d});a.cursoractive=!0}a.zoom&&a.zoom.stop().css({opacity:a.opt.cursoropacitymax})}};this.hideCursor=function(b){a.cursortimeout||!a.rail||!a.autohidedom||a.hasmousefocus&&"leave"==a.opt.autohidemode||(a.cursortimeout=setTimeout(function(){a.rail.active&&a.showonmouseevent||(a.autohidedom.stop().animate({opacity:a.opt.cursoropacitymin}),
+a.zoom&&a.zoom.stop().animate({opacity:a.opt.cursoropacitymin}),a.cursoractive=!1);a.cursortimeout=0},b||a.opt.hidecursordelay))};this.noticeCursor=function(b,c,d){a.showCursor(c,d);a.rail.active||a.hideCursor(b)};this.getContentSize=a.ispage?function(){return{w:Math.max(document.body.scrollWidth,document.documentElement.scrollWidth),h:Math.max(document.body.scrollHeight,document.documentElement.scrollHeight)}}:a.haswrapper?function(){return{w:a.doc.outerWidth()+parseInt(a.win.css("paddingLeft"))+
+parseInt(a.win.css("paddingRight")),h:a.doc.outerHeight()+parseInt(a.win.css("paddingTop"))+parseInt(a.win.css("paddingBottom"))}}:function(){return{w:a.docscroll[0].scrollWidth,h:a.docscroll[0].scrollHeight}};this.onResize=function(b,c){if(!a||!a.win)return!1;if(!a.haswrapper&&!a.ispage){if("none"==a.win.css("display"))return a.visibility&&a.hideRail().hideRailHr(),!1;a.hidden||a.visibility||a.showRail().showRailHr()}var d=a.page.maxh,e=a.page.maxw,f=a.view.h,k=a.view.w;a.view={w:a.ispage?a.win.width():
+parseInt(a.win[0].clientWidth),h:a.ispage?a.win.height():parseInt(a.win[0].clientHeight)};a.page=c?c:a.getContentSize();a.page.maxh=Math.max(0,a.page.h-a.view.h);a.page.maxw=Math.max(0,a.page.w-a.view.w);if(a.page.maxh==d&&a.page.maxw==e&&a.view.w==k&&a.view.h==f){if(a.ispage)return a;d=a.win.offset();if(a.lastposition&&(e=a.lastposition,e.top==d.top&&e.left==d.left))return a;a.lastposition=d}0==a.page.maxh?(a.hideRail(),a.scrollvaluemax=0,a.scroll.y=0,a.scrollratio.y=0,a.cursorheight=0,a.setScrollTop(0),
+a.rail&&(a.rail.scrollable=!1)):(a.page.maxh-=a.opt.railpadding.top+a.opt.railpadding.bottom,a.rail.scrollable=!0);0==a.page.maxw?(a.hideRailHr(),a.scrollvaluemaxw=0,a.scroll.x=0,a.scrollratio.x=0,a.cursorwidth=0,a.setScrollLeft(0),a.railh&&(a.railh.scrollable=!1)):(a.page.maxw-=a.opt.railpadding.left+a.opt.railpadding.right,a.railh&&(a.railh.scrollable=a.opt.horizrailenabled));a.railslocked=a.locked||0==a.page.maxh&&0==a.page.maxw;if(a.railslocked)return a.ispage||a.updateScrollBar(a.view),!1;a.hidden||
+a.visibility?!a.railh||a.hidden||a.railh.visibility||a.showRailHr():a.showRail().showRailHr();a.istextarea&&a.win.css("resize")&&"none"!=a.win.css("resize")&&(a.view.h-=20);a.cursorheight=Math.min(a.view.h,Math.round(a.view.h/a.page.h*a.view.h));a.cursorheight=a.opt.cursorfixedheight?a.opt.cursorfixedheight:Math.max(a.opt.cursorminheight,a.cursorheight);a.cursorwidth=Math.min(a.view.w,Math.round(a.view.w/a.page.w*a.view.w));a.cursorwidth=a.opt.cursorfixedheight?a.opt.cursorfixedheight:Math.max(a.opt.cursorminheight,
+a.cursorwidth);a.scrollvaluemax=a.view.h-a.cursorheight-a.cursor.hborder-(a.opt.railpadding.top+a.opt.railpadding.bottom);a.railh&&(a.railh.width=0<a.page.maxh?a.view.w-a.rail.width:a.view.w,a.scrollvaluemaxw=a.railh.width-a.cursorwidth-a.cursorh.wborder-(a.opt.railpadding.left+a.opt.railpadding.right));a.ispage||a.updateScrollBar(a.view);a.scrollratio={x:a.page.maxw/a.scrollvaluemaxw,y:a.page.maxh/a.scrollvaluemax};a.getScrollTop()>a.page.maxh?a.doScrollTop(a.page.maxh):(a.scroll.y=Math.round(a.getScrollTop()*
+(1/a.scrollratio.y)),a.scroll.x=Math.round(a.getScrollLeft()*(1/a.scrollratio.x)),a.cursoractive&&a.noticeCursor());a.scroll.y&&0==a.getScrollTop()&&a.doScrollTo(Math.floor(a.scroll.y*a.scrollratio.y));return a};this.resize=a.onResize;this.hlazyresize=0;this.lazyResize=function(b){a.haswrapper||a.hide();a.hlazyresize&&clearTimeout(a.hlazyresize);a.hlazyresize=setTimeout(function(){a&&a.show().resize()},240);return a};this.jqbind=function(b,c,d){a.events.push({e:b,n:c,f:d,q:!0});f(b).bind(c,d)};this.mousewheel=
+function(b,c,d){b="jquery"in b?b[0]:b;if("onwheel"in document.createElement("div"))a._bind(b,"wheel",c,d||!1);else{var e=void 0!==document.onmousewheel?"mousewheel":"DOMMouseScroll";q(b,e,c,d||!1);"DOMMouseScroll"==e&&q(b,"MozMousePixelScroll",c,d||!1)}};e.haseventlistener?(this.bind=function(b,c,d,e){a._bind("jquery"in b?b[0]:b,c,d,e||!1)},this._bind=function(b,c,d,e){a.events.push({e:b,n:c,f:d,b:e,q:!1});b.addEventListener(c,d,e||!1)},this.cancelEvent=function(a){if(!a)return!1;a=a.original?a.original:
+a;a.cancelable&&a.preventDefault();a.stopPropagation();a.preventManipulation&&a.preventManipulation();return!1},this.stopPropagation=function(a){if(!a)return!1;a=a.original?a.original:a;a.stopPropagation();return!1},this._unbind=function(a,c,d,e){a.removeEventListener(c,d,e)}):(this.bind=function(b,c,d,e){var f="jquery"in b?b[0]:b;a._bind(f,c,function(b){(b=b||window.event||!1)&&b.srcElement&&(b.target=b.srcElement);"pageY"in b||(b.pageX=b.clientX+document.documentElement.scrollLeft,b.pageY=b.clientY+
+document.documentElement.scrollTop);return!1===d.call(f,b)||!1===e?a.cancelEvent(b):!0})},this._bind=function(b,c,d,e){a.events.push({e:b,n:c,f:d,b:e,q:!1});b.attachEvent?b.attachEvent("on"+c,d):b["on"+c]=d},this.cancelEvent=function(a){a=window.event||!1;if(!a)return!1;a.cancelBubble=!0;a.cancel=!0;return a.returnValue=!1},this.stopPropagation=function(a){a=window.event||!1;if(!a)return!1;a.cancelBubble=!0;return!1},this._unbind=function(a,c,d,e){a.detachEvent?a.detachEvent("on"+c,d):a["on"+c]=!1});
+this.unbindAll=function(){for(var b=0;b<a.events.length;b++){var c=a.events[b];c.q?c.e.unbind(c.n,c.f):a._unbind(c.e,c.n,c.f,c.b)}};this.showRail=function(){0==a.page.maxh||!a.ispage&&"none"==a.win.css("display")||(a.visibility=!0,a.rail.visibility=!0,a.rail.css("display","block"));return a};this.showRailHr=function(){if(!a.railh)return a;0==a.page.maxw||!a.ispage&&"none"==a.win.css("display")||(a.railh.visibility=!0,a.railh.css("display","block"));return a};this.hideRail=function(){a.visibility=
+!1;a.rail.visibility=!1;a.rail.css("display","none");return a};this.hideRailHr=function(){if(!a.railh)return a;a.railh.visibility=!1;a.railh.css("display","none");return a};this.show=function(){a.hidden=!1;a.railslocked=!1;return a.showRail().showRailHr()};this.hide=function(){a.hidden=!0;a.railslocked=!0;return a.hideRail().hideRailHr()};this.toggle=function(){return a.hidden?a.show():a.hide()};this.remove=function(){a.stop();a.cursortimeout&&clearTimeout(a.cursortimeout);for(var b in a.delaylist)a.delaylist[b]&&
+w(a.delaylist[b].h);a.doZoomOut();a.unbindAll();e.isie9&&a.win[0].detachEvent("onpropertychange",a.onAttributeChange);!1!==a.observer&&a.observer.disconnect();!1!==a.observerremover&&a.observerremover.disconnect();!1!==a.observerbody&&a.observerbody.disconnect();a.events=null;a.cursor&&a.cursor.remove();a.cursorh&&a.cursorh.remove();a.rail&&a.rail.remove();a.railh&&a.railh.remove();a.zoom&&a.zoom.remove();for(b=0;b<a.saved.css.length;b++){var c=a.saved.css[b];c[0].css(c[1],void 0===c[2]?"":c[2])}a.saved=
+!1;a.me.data("__nicescroll","");var d=f.nicescroll;d.each(function(b){if(this&&this.id===a.id){delete d[b];for(var c=++b;c<d.length;c++,b++)d[b]=d[c];d.length--;d.length&&delete d[d.length]}});for(var k in a)a[k]=null,delete a[k];a=null};this.scrollstart=function(b){this.onscrollstart=b;return a};this.scrollend=function(b){this.onscrollend=b;return a};this.scrollcancel=function(b){this.onscrollcancel=b;return a};this.zoomin=function(b){this.onzoomin=b;return a};this.zoomout=function(b){this.onzoomout=
+b;return a};this.isScrollable=function(a){a=a.target?a.target:a;if("OPTION"==a.nodeName)return!0;for(;a&&1==a.nodeType&&!/^BODY|HTML/.test(a.nodeName);){var c=f(a),c=c.css("overflowY")||c.css("overflowX")||c.css("overflow")||"";if(/scroll|auto/.test(c))return a.clientHeight!=a.scrollHeight;a=a.parentNode?a.parentNode:!1}return!1};this.getViewport=function(a){for(a=a&&a.parentNode?a.parentNode:!1;a&&1==a.nodeType&&!/^BODY|HTML/.test(a.nodeName);){var c=f(a);if(/fixed|absolute/.test(c.css("position")))return c;
+var d=c.css("overflowY")||c.css("overflowX")||c.css("overflow")||"";if(/scroll|auto/.test(d)&&a.clientHeight!=a.scrollHeight||0<c.getNiceScroll().length)return c;a=a.parentNode?a.parentNode:!1}return!1};this.triggerScrollEnd=function(){if(a.onscrollend){var b=a.getScrollLeft(),c=a.getScrollTop();a.onscrollend.call(a,{type:"scrollend",current:{x:b,y:c},end:{x:b,y:c}})}};this.onmousewheel=function(b){if(!a.wheelprevented){if(a.railslocked)return a.debounced("checkunlock",a.resize,250),!0;if(a.rail.drag)return a.cancelEvent(b);
+"auto"==a.opt.oneaxismousemode&&0!=b.deltaX&&(a.opt.oneaxismousemode=!1);if(a.opt.oneaxismousemode&&0==b.deltaX&&!a.rail.scrollable)return a.railh&&a.railh.scrollable?a.onmousewheelhr(b):!0;var c=+new Date,d=!1;a.opt.preservenativescrolling&&a.checkarea+600<c&&(a.nativescrollingarea=a.isScrollable(b),d=!0);a.checkarea=c;if(a.nativescrollingarea)return!0;if(b=t(b,!1,d))a.checkarea=0;return b}};this.onmousewheelhr=function(b){if(!a.wheelprevented){if(a.railslocked||!a.railh.scrollable)return!0;if(a.rail.drag)return a.cancelEvent(b);
+var c=+new Date,d=!1;a.opt.preservenativescrolling&&a.checkarea+600<c&&(a.nativescrollingarea=a.isScrollable(b),d=!0);a.checkarea=c;return a.nativescrollingarea?!0:a.railslocked?a.cancelEvent(b):t(b,!0,d)}};this.stop=function(){a.cancelScroll();a.scrollmon&&a.scrollmon.stop();a.cursorfreezed=!1;a.scroll.y=Math.round(a.getScrollTop()*(1/a.scrollratio.y));a.noticeCursor();return a};this.getTransitionSpeed=function(b){b=Math.min(Math.round(10*a.opt.scrollspeed),Math.round(b/20*a.opt.scrollspeed));return 20<
+b?b:0};a.opt.smoothscroll?a.ishwscroll&&e.hastransition&&a.opt.usetransition&&a.opt.smoothscroll?(this.prepareTransition=function(b,c){var d=c?20<b?b:0:a.getTransitionSpeed(b),f=d?e.prefixstyle+"transform "+d+"ms ease-out":"";a.lasttransitionstyle&&a.lasttransitionstyle==f||(a.lasttransitionstyle=f,a.doc.css(e.transitionstyle,f));return d},this.doScrollLeft=function(b,c){var d=a.scrollrunning?a.newscrolly:a.getScrollTop();a.doScrollPos(b,d,c)},this.doScrollTop=function(b,c){var d=a.scrollrunning?
+a.newscrollx:a.getScrollLeft();a.doScrollPos(d,b,c)},this.doScrollPos=function(b,c,d){var f=a.getScrollTop(),k=a.getScrollLeft();(0>(a.newscrolly-f)*(c-f)||0>(a.newscrollx-k)*(b-k))&&a.cancelScroll();0==a.opt.bouncescroll&&(0>c?c=0:c>a.page.maxh&&(c=a.page.maxh),0>b?b=0:b>a.page.maxw&&(b=a.page.maxw));if(a.scrollrunning&&b==a.newscrollx&&c==a.newscrolly)return!1;a.newscrolly=c;a.newscrollx=b;a.newscrollspeed=d||!1;if(a.timer)return!1;a.timer=setTimeout(function(){var d=a.getScrollTop(),f=a.getScrollLeft(),
+k=Math.round(Math.sqrt(Math.pow(b-f,2)+Math.pow(c-d,2))),k=a.newscrollspeed&&1<a.newscrollspeed?a.newscrollspeed:a.getTransitionSpeed(k);a.newscrollspeed&&1>=a.newscrollspeed&&(k*=a.newscrollspeed);a.prepareTransition(k,!0);a.timerscroll&&a.timerscroll.tm&&clearInterval(a.timerscroll.tm);0<k&&(!a.scrollrunning&&a.onscrollstart&&a.onscrollstart.call(a,{type:"scrollstart",current:{x:f,y:d},request:{x:b,y:c},end:{x:a.newscrollx,y:a.newscrolly},speed:k}),e.transitionend?a.scrollendtrapped||(a.scrollendtrapped=
+!0,a.bind(a.doc,e.transitionend,a.onScrollTransitionEnd,!1)):(a.scrollendtrapped&&clearTimeout(a.scrollendtrapped),a.scrollendtrapped=setTimeout(a.onScrollTransitionEnd,k)),a.timerscroll={bz:new D(d,a.newscrolly,k,0,0,.58,1),bh:new D(f,a.newscrollx,k,0,0,.58,1)},a.cursorfreezed||(a.timerscroll.tm=setInterval(function(){a.showCursor(a.getScrollTop(),a.getScrollLeft())},60)));a.synched("doScroll-set",function(){a.timer=0;a.scrollendtrapped&&(a.scrollrunning=!0);a.setScrollTop(a.newscrolly);a.setScrollLeft(a.newscrollx);
+if(!a.scrollendtrapped)a.onScrollTransitionEnd()})},50)},this.cancelScroll=function(){if(!a.scrollendtrapped)return!0;var b=a.getScrollTop(),c=a.getScrollLeft();a.scrollrunning=!1;e.transitionend||clearTimeout(e.transitionend);a.scrollendtrapped=!1;a._unbind(a.doc[0],e.transitionend,a.onScrollTransitionEnd);a.prepareTransition(0);a.setScrollTop(b);a.railh&&a.setScrollLeft(c);a.timerscroll&&a.timerscroll.tm&&clearInterval(a.timerscroll.tm);a.timerscroll=!1;a.cursorfreezed=!1;a.showCursor(b,c);return a},
+this.onScrollTransitionEnd=function(){a.scrollendtrapped&&a._unbind(a.doc[0],e.transitionend,a.onScrollTransitionEnd);a.scrollendtrapped=!1;a.prepareTransition(0);a.timerscroll&&a.timerscroll.tm&&clearInterval(a.timerscroll.tm);a.timerscroll=!1;var b=a.getScrollTop(),c=a.getScrollLeft();a.setScrollTop(b);a.railh&&a.setScrollLeft(c);a.noticeCursor(!1,b,c);a.cursorfreezed=!1;0>b?b=0:b>a.page.maxh&&(b=a.page.maxh);0>c?c=0:c>a.page.maxw&&(c=a.page.maxw);if(b!=a.newscrolly||c!=a.newscrollx)return a.doScrollPos(c,
+b,a.opt.snapbackspeed);a.onscrollend&&a.scrollrunning&&a.triggerScrollEnd();a.scrollrunning=!1}):(this.doScrollLeft=function(b,c){var d=a.scrollrunning?a.newscrolly:a.getScrollTop();a.doScrollPos(b,d,c)},this.doScrollTop=function(b,c){var d=a.scrollrunning?a.newscrollx:a.getScrollLeft();a.doScrollPos(d,b,c)},this.doScrollPos=function(b,c,d){function e(){if(a.cancelAnimationFrame)return!0;a.scrollrunning=!0;if(p=1-p)return a.timer=v(e)||1;var b=0,c,d,f=d=a.getScrollTop();if(a.dst.ay){f=a.bzscroll?
+a.dst.py+a.bzscroll.getNow()*a.dst.ay:a.newscrolly;c=f-d;if(0>c&&f<a.newscrolly||0<c&&f>a.newscrolly)f=a.newscrolly;a.setScrollTop(f);f==a.newscrolly&&(b=1)}else b=1;d=c=a.getScrollLeft();if(a.dst.ax){d=a.bzscroll?a.dst.px+a.bzscroll.getNow()*a.dst.ax:a.newscrollx;c=d-c;if(0>c&&d<a.newscrollx||0<c&&d>a.newscrollx)d=a.newscrollx;a.setScrollLeft(d);d==a.newscrollx&&(b+=1)}else b+=1;2==b?(a.timer=0,a.cursorfreezed=!1,a.bzscroll=!1,a.scrollrunning=!1,0>f?f=0:f>a.page.maxh&&(f=Math.max(0,a.page.maxh)),
+0>d?d=0:d>a.page.maxw&&(d=a.page.maxw),d!=a.newscrollx||f!=a.newscrolly?a.doScrollPos(d,f):a.onscrollend&&a.triggerScrollEnd()):a.timer=v(e)||1}c=void 0===c||!1===c?a.getScrollTop(!0):c;if(a.timer&&a.newscrolly==c&&a.newscrollx==b)return!0;a.timer&&w(a.timer);a.timer=0;var f=a.getScrollTop(),k=a.getScrollLeft();(0>(a.newscrolly-f)*(c-f)||0>(a.newscrollx-k)*(b-k))&&a.cancelScroll();a.newscrolly=c;a.newscrollx=b;a.bouncescroll&&a.rail.visibility||(0>a.newscrolly?a.newscrolly=0:a.newscrolly>a.page.maxh&&
+(a.newscrolly=a.page.maxh));a.bouncescroll&&a.railh.visibility||(0>a.newscrollx?a.newscrollx=0:a.newscrollx>a.page.maxw&&(a.newscrollx=a.page.maxw));a.dst={};a.dst.x=b-k;a.dst.y=c-f;a.dst.px=k;a.dst.py=f;var h=Math.round(Math.sqrt(Math.pow(a.dst.x,2)+Math.pow(a.dst.y,2)));a.dst.ax=a.dst.x/h;a.dst.ay=a.dst.y/h;var l=0,n=h;0==a.dst.x?(l=f,n=c,a.dst.ay=1,a.dst.py=0):0==a.dst.y&&(l=k,n=b,a.dst.ax=1,a.dst.px=0);h=a.getTransitionSpeed(h);d&&1>=d&&(h*=d);a.bzscroll=0<h?a.bzscroll?a.bzscroll.update(n,h):
+new D(l,n,h,0,1,0,1):!1;if(!a.timer){(f==a.page.maxh&&c>=a.page.maxh||k==a.page.maxw&&b>=a.page.maxw)&&a.checkContentSize();var p=1;a.cancelAnimationFrame=!1;a.timer=1;a.onscrollstart&&!a.scrollrunning&&a.onscrollstart.call(a,{type:"scrollstart",current:{x:k,y:f},request:{x:b,y:c},end:{x:a.newscrollx,y:a.newscrolly},speed:h});e();(f==a.page.maxh&&c>=f||k==a.page.maxw&&b>=k)&&a.checkContentSize();a.noticeCursor()}},this.cancelScroll=function(){a.timer&&w(a.timer);a.timer=0;a.bzscroll=!1;a.scrollrunning=
+!1;return a}):(this.doScrollLeft=function(b,c){var d=a.getScrollTop();a.doScrollPos(b,d,c)},this.doScrollTop=function(b,c){var d=a.getScrollLeft();a.doScrollPos(d,b,c)},this.doScrollPos=function(b,c,d){var e=b>a.page.maxw?a.page.maxw:b;0>e&&(e=0);var f=c>a.page.maxh?a.page.maxh:c;0>f&&(f=0);a.synched("scroll",function(){a.setScrollTop(f);a.setScrollLeft(e)})},this.cancelScroll=function(){});this.doScrollBy=function(b,c){var d=0,d=c?Math.floor((a.scroll.y-b)*a.scrollratio.y):(a.timer?a.newscrolly:
+a.getScrollTop(!0))-b;if(a.bouncescroll){var e=Math.round(a.view.h/2);d<-e?d=-e:d>a.page.maxh+e&&(d=a.page.maxh+e)}a.cursorfreezed=!1;e=a.getScrollTop(!0);if(0>d&&0>=e)return a.noticeCursor();if(d>a.page.maxh&&e>=a.page.maxh)return a.checkContentSize(),a.noticeCursor();a.doScrollTop(d)};this.doScrollLeftBy=function(b,c){var d=0,d=c?Math.floor((a.scroll.x-b)*a.scrollratio.x):(a.timer?a.newscrollx:a.getScrollLeft(!0))-b;if(a.bouncescroll){var e=Math.round(a.view.w/2);d<-e?d=-e:d>a.page.maxw+e&&(d=a.page.maxw+
+e)}a.cursorfreezed=!1;e=a.getScrollLeft(!0);if(0>d&&0>=e||d>a.page.maxw&&e>=a.page.maxw)return a.noticeCursor();a.doScrollLeft(d)};this.doScrollTo=function(b,c){a.cursorfreezed=!1;a.doScrollTop(b)};this.checkContentSize=function(){var b=a.getContentSize();b.h==a.page.h&&b.w==a.page.w||a.resize(!1,b)};a.onscroll=function(b){a.rail.drag||a.cursorfreezed||a.synched("scroll",function(){a.scroll.y=Math.round(a.getScrollTop()*(1/a.scrollratio.y));a.railh&&(a.scroll.x=Math.round(a.getScrollLeft()*(1/a.scrollratio.x)));
+a.noticeCursor()})};a.bind(a.docscroll,"scroll",a.onscroll);this.doZoomIn=function(b){if(!a.zoomactive){a.zoomactive=!0;a.zoomrestore={style:{}};var c="position top left zIndex backgroundColor marginTop marginBottom marginLeft marginRight".split(" "),d=a.win[0].style,k;for(k in c){var h=c[k];a.zoomrestore.style[h]=void 0!==d[h]?d[h]:""}a.zoomrestore.style.width=a.win.css("width");a.zoomrestore.style.height=a.win.css("height");a.zoomrestore.padding={w:a.win.outerWidth()-a.win.width(),h:a.win.outerHeight()-
+a.win.height()};e.isios4&&(a.zoomrestore.scrollTop=f(window).scrollTop(),f(window).scrollTop(0));a.win.css({position:e.isios4?"absolute":"fixed",top:0,left:0,zIndex:A+100,margin:0});c=a.win.css("backgroundColor");(""==c||/transparent|rgba\(0, 0, 0, 0\)|rgba\(0,0,0,0\)/.test(c))&&a.win.css("backgroundColor","#fff");a.rail.css({zIndex:A+101});a.zoom.css({zIndex:A+102});a.zoom.css("backgroundPosition","0px -18px");a.resizeZoom();a.onzoomin&&a.onzoomin.call(a);return a.cancelEvent(b)}};this.doZoomOut=
+function(b){if(a.zoomactive)return a.zoomactive=!1,a.win.css("margin",""),a.win.css(a.zoomrestore.style),e.isios4&&f(window).scrollTop(a.zoomrestore.scrollTop),a.rail.css({"z-index":a.zindex}),a.zoom.css({"z-index":a.zindex}),a.zoomrestore=!1,a.zoom.css("backgroundPosition","0px 0px"),a.onResize(),a.onzoomout&&a.onzoomout.call(a),a.cancelEvent(b)};this.doZoom=function(b){return a.zoomactive?a.doZoomOut(b):a.doZoomIn(b)};this.resizeZoom=function(){if(a.zoomactive){var b=a.getScrollTop();a.win.css({width:f(window).width()-
+a.zoomrestore.padding.w+"px",height:f(window).height()-a.zoomrestore.padding.h+"px"});a.onResize();a.setScrollTop(Math.min(a.page.maxh,b))}};this.init();f.nicescroll.push(this)},M=function(f){var c=this;this.nc=f;this.steptime=this.lasttime=this.speedy=this.speedx=this.lasty=this.lastx=0;this.snapy=this.snapx=!1;this.demuly=this.demulx=0;this.lastscrolly=this.lastscrollx=-1;this.timer=this.chky=this.chkx=0;this.time=function(){return+new Date};this.reset=function(f,h){c.stop();var d=c.time();c.steptime=
+0;c.lasttime=d;c.speedx=0;c.speedy=0;c.lastx=f;c.lasty=h;c.lastscrollx=-1;c.lastscrolly=-1};this.update=function(f,h){var d=c.time();c.steptime=d-c.lasttime;c.lasttime=d;var d=h-c.lasty,q=f-c.lastx,t=c.nc.getScrollTop(),a=c.nc.getScrollLeft(),t=t+d,a=a+q;c.snapx=0>a||a>c.nc.page.maxw;c.snapy=0>t||t>c.nc.page.maxh;c.speedx=q;c.speedy=d;c.lastx=f;c.lasty=h};this.stop=function(){c.nc.unsynched("domomentum2d");c.timer&&clearTimeout(c.timer);c.timer=0;c.lastscrollx=-1;c.lastscrolly=-1};this.doSnapy=function(f,
+h){var d=!1;0>h?(h=0,d=!0):h>c.nc.page.maxh&&(h=c.nc.page.maxh,d=!0);0>f?(f=0,d=!0):f>c.nc.page.maxw&&(f=c.nc.page.maxw,d=!0);d?c.nc.doScrollPos(f,h,c.nc.opt.snapbackspeed):c.nc.triggerScrollEnd()};this.doMomentum=function(f){var h=c.time(),d=f?h+f:c.lasttime;f=c.nc.getScrollLeft();var q=c.nc.getScrollTop(),t=c.nc.page.maxh,a=c.nc.page.maxw;c.speedx=0<a?Math.min(60,c.speedx):0;c.speedy=0<t?Math.min(60,c.speedy):0;d=d&&60>=h-d;if(0>q||q>t||0>f||f>a)d=!1;f=c.speedx&&d?c.speedx:!1;if(c.speedy&&d&&c.speedy||
+f){var r=Math.max(16,c.steptime);50<r&&(f=r/50,c.speedx*=f,c.speedy*=f,r=50);c.demulxy=0;c.lastscrollx=c.nc.getScrollLeft();c.chkx=c.lastscrollx;c.lastscrolly=c.nc.getScrollTop();c.chky=c.lastscrolly;var p=c.lastscrollx,e=c.lastscrolly,v=function(){var d=600<c.time()-h?.04:.02;c.speedx&&(p=Math.floor(c.lastscrollx-c.speedx*(1-c.demulxy)),c.lastscrollx=p,0>p||p>a)&&(d=.1);c.speedy&&(e=Math.floor(c.lastscrolly-c.speedy*(1-c.demulxy)),c.lastscrolly=e,0>e||e>t)&&(d=.1);c.demulxy=Math.min(1,c.demulxy+
+d);c.nc.synched("domomentum2d",function(){c.speedx&&(c.nc.getScrollLeft(),c.chkx=p,c.nc.setScrollLeft(p));c.speedy&&(c.nc.getScrollTop(),c.chky=e,c.nc.setScrollTop(e));c.timer||(c.nc.hideCursor(),c.doSnapy(p,e))});1>c.demulxy?c.timer=setTimeout(v,r):(c.stop(),c.nc.hideCursor(),c.doSnapy(p,e))};v()}else c.doSnapy(c.nc.getScrollLeft(),c.nc.getScrollTop())}},y=f.fn.scrollTop;f.cssHooks.pageYOffset={get:function(h,c,k){return(c=f.data(h,"__nicescroll")||!1)&&c.ishwscroll?c.getScrollTop():y.call(h)},set:function(h,
+c){var k=f.data(h,"__nicescroll")||!1;k&&k.ishwscroll?k.setScrollTop(parseInt(c)):y.call(h,c);return this}};f.fn.scrollTop=function(h){if(void 0===h){var c=this[0]?f.data(this[0],"__nicescroll")||!1:!1;return c&&c.ishwscroll?c.getScrollTop():y.call(this)}return this.each(function(){var c=f.data(this,"__nicescroll")||!1;c&&c.ishwscroll?c.setScrollTop(parseInt(h)):y.call(f(this),h)})};var z=f.fn.scrollLeft;f.cssHooks.pageXOffset={get:function(h,c,k){return(c=f.data(h,"__nicescroll")||!1)&&c.ishwscroll?
+c.getScrollLeft():z.call(h)},set:function(h,c){var k=f.data(h,"__nicescroll")||!1;k&&k.ishwscroll?k.setScrollLeft(parseInt(c)):z.call(h,c);return this}};f.fn.scrollLeft=function(h){if(void 0===h){var c=this[0]?f.data(this[0],"__nicescroll")||!1:!1;return c&&c.ishwscroll?c.getScrollLeft():z.call(this)}return this.each(function(){var c=f.data(this,"__nicescroll")||!1;c&&c.ishwscroll?c.setScrollLeft(parseInt(h)):z.call(f(this),h)})};var E=function(h){var c=this;this.length=0;this.name="nicescrollarray";
+this.each=function(d){f.each(c,d);return c};this.push=function(d){c[c.length]=d;c.length++};this.eq=function(d){return c[d]};if(h)for(var k=0;k<h.length;k++){var l=f.data(h[k],"__nicescroll")||!1;l&&(this[this.length]=l,this.length++)}return this};(function(f,c,k){for(var l=0;l<c.length;l++)k(f,c[l])})(E.prototype,"show hide toggle onResize resize remove stop doScrollPos".split(" "),function(f,c){f[c]=function(){var f=arguments;return this.each(function(){this[c].apply(this,f)})}});f.fn.getNiceScroll=
+function(h){return void 0===h?new E(this):this[h]&&f.data(this[h],"__nicescroll")||!1};f.expr[":"].nicescroll=function(h){return void 0!==f.data(h,"__nicescroll")};f.fn.niceScroll=function(h,c){void 0!==c||"object"!=typeof h||"jquery"in h||(c=h,h=!1);c=f.extend({},c);var k=new E;void 0===c&&(c={});h&&(c.doc=f(h),c.win=f(this));var l=!("doc"in c);l||"win"in c||(c.win=f(this));this.each(function(){var d=f(this).data("__nicescroll")||!1;d||(c.doc=l?f(this):c.doc,d=new S(c,f(this)),f(this).data("__nicescroll",
+d));k.push(d)});return 1==k.length?k[0]:k};window.NiceScroll={getjQuery:function(){return f}};f.nicescroll||(f.nicescroll=new E,f.nicescroll.options=K)});
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/jquery.pagination.js b/pluss-manage-page/src/main/resources/static/resources/auth/js/jquery.pagination.js
new file mode 100644
index 0000000..642e933
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/jquery.pagination.js
@@ -0,0 +1,256 @@
+/**
+ * pagination.js 1.5.1
+ * A jQuery plugin to provide simple yet fully customisable pagination.
+ * @version 1.5.1
+ * @author mss
+ * @url https://github.com/Maxiaoxiang/jQuery-plugins
+ *
+ * @调用方法
+ * $(selector).pagination(option, callback);
+ * -此处callback是初始化调用，option里的callback是点击页码后调用
+ * 
+ * -- example --
+ * $(selector).pagination({
+ *     ... // 配置参数
+ *     callback: function(api) {
+ *         console.log('点击页码调用该回调'); //切换页码时执行一次回调
+ *     }
+ * }, function(){
+ *     console.log('初始化'); //插件初始化时调用该方法，比如请求第一次接口来初始化分页配置
+ * });
+ */
+;
+(function (factory) {
+    if (typeof define === "function" && (define.amd || define.cmd) && !jQuery) {
+        // AMD或CMD
+        define(["jquery"], factory);
+    } else if (typeof module === 'object' && module.exports) {
+        // Node/CommonJS
+        module.exports = function (root, jQuery) {
+            if (jQuery === undefined) {
+                if (typeof window !== 'undefined') {
+                    jQuery = require('jquery');
+                } else {
+                    jQuery = require('jquery')(root);
+                }
+            }
+            factory(jQuery);
+            return jQuery;
+        };
+    } else {
+        //Browser globals
+        factory(jQuery);
+    }
+}(function ($) {
+
+    //配置参数
+    var defaults = {
+        totalData: 0, //数据总条数
+        showData: 0, //每页显示的条数
+        pageCount: 9, //总页数,默认为9
+        current: 1, //当前第几页
+        prevCls: 'prev', //上一页class
+        nextCls: 'next', //下一页class
+        prevContent: '<', //上一页内容
+        nextContent: '>', //下一页内容
+        activeCls: 'active', //当前页选中状态
+        coping: false, //首页和尾页
+        isHide: false, //当前页数为0页或者1页时不显示分页
+        homePage: '', //首页节点内容
+        endPage: '', //尾页节点内容
+        keepShowPN: false, //是否一直显示上一页下一页
+        mode: 'unfixed', //分页模式，unfixed：不固定页码数量，fixed：固定页码数量
+        count: 4, //mode为unfixed时显示当前选中页前后页数，mode为fixed显示页码总数
+        jump: false, //跳转到指定页数
+        jumpIptCls: 'jump-ipt', //文本框内容
+        jumpBtnCls: 'jump-btn', //跳转按钮
+        jumpBtn: '跳转', //跳转按钮文本
+        callback: function () {} //回调
+    };
+
+    var Pagination = function (element, options) {
+        //全局变量
+        var opts = options, //配置
+            current, //当前页
+            $document = $(document),
+            $obj = $(element); //容器
+
+        /**
+         * 设置总页数
+         * @param {int} page 页码
+         * @return opts.pageCount 总页数配置
+         */
+        this.setPageCount = function (page) {
+            return opts.pageCount = page;
+        };
+
+        /**
+         * 获取总页数
+         * 如果配置了总条数和每页显示条数，将会自动计算总页数并略过总页数配置，反之
+         * @return {int} 总页数
+         */
+        this.getPageCount = function () {
+            return opts.totalData && opts.showData ? Math.ceil(parseInt(opts.totalData) / opts.showData) : opts.pageCount;
+        };
+
+        /**
+         * 获取当前页
+         * @return {int} 当前页码
+         */
+        this.getCurrent = function () {
+            return current;
+        };
+
+        /**
+         * 填充数据
+         * @param {int} 页码
+         */
+        this.filling = function (index) {
+            var html = '';
+            current = parseInt(index) || parseInt(opts.current); //当前页码
+            var pageCount = this.getPageCount(); //获取的总页数
+            switch (opts.mode) { //配置模式
+                case 'fixed': //固定按钮模式
+                    html += '<a href="javascript:;" class="' + opts.prevCls + '">' + opts.prevContent + '</a>';
+                    if (opts.coping) {
+                        var home = opts.coping && opts.homePage ? opts.homePage : '1';
+                        html += '<a href="javascript:;" data-page="1">' + home + '</a>';
+                    }
+                    var start = current > opts.count - 1 ? current + opts.count - 1 > pageCount ? current - (opts.count - (pageCount - current)) : current - 2 : 1;
+                    var end = current + opts.count - 1 > pageCount ? pageCount : start + opts.count;
+                    for (; start <= end; start++) {
+                        if (start != current) {
+                            html += '<a href="javascript:;" data-page="' + start + '">' + start + '</a>';
+                        } else {
+                            html += '<span class="' + opts.activeCls + '">' + start + '</span>';
+                        }
+                    }
+                    if (opts.coping) {
+                        var _end = opts.coping && opts.endPage ? opts.endPage : pageCount;
+                        html += '<a href="javascript:;" data-page="' + pageCount + '">' + _end + '</a>';
+                    }
+                    html += '<a href="javascript:;" class="' + opts.nextCls + '">' + opts.nextContent + '</a>';
+                    break;
+                case 'unfixed': //不固定按钮模式
+                    if (opts.keepShowPN || current > 1) { //上一页
+                        html += '<a href="javascript:;" class="' + opts.prevCls + '">' + opts.prevContent + '</a>';
+                    } else {
+                        if (opts.keepShowPN == false) {
+                            $obj.find('.' + opts.prevCls) && $obj.find('.' + opts.prevCls).remove();
+                        }
+                    }
+                    if (current >= opts.count + 2 && current != 1 && pageCount != opts.count) {
+                        var home = opts.coping && opts.homePage ? opts.homePage : '1';
+                        html += opts.coping ? '<a href="javascript:;" data-page="1">' + home + '</a><span>...</span>' : '';
+                    }
+                    var start = (current - opts.count) <= 1 ? 1 : (current - opts.count);
+                    var end = (current + opts.count) >= pageCount ? pageCount : (current + opts.count);
+                    for (; start <= end; start++) {
+                        if (start <= pageCount && start >= 1) {
+                            if (start != current) {
+                                html += '<a href="javascript:;" data-page="' + start + '">' + start + '</a>';
+                            } else {
+                                html += '<span class="' + opts.activeCls + '">' + start + '</span>';
+                            }
+                        }
+                    }
+                    if (current + opts.count < pageCount && current >= 1 && pageCount > opts.count) {
+                        var end = opts.coping && opts.endPage ? opts.endPage : pageCount;
+                        html += opts.coping ? '<span>...</span><a href="javascript:;" data-page="' + pageCount + '">' + end + '</a>' : '';
+                    }
+                    if (opts.keepShowPN || current < pageCount) { //下一页
+                        html += '<a href="javascript:;" class="' + opts.nextCls + '">' + opts.nextContent + '</a>';
+                    } else {
+                        if (opts.keepShowPN == false) {
+                            $obj.find('.' + opts.nextCls) && $obj.find('.' + opts.nextCls).remove();
+                        }
+                    }
+                    break;
+                case 'easy': //简单模式
+                    break;
+                default:
+            }
+            html += opts.jump ? '<span>到第</span><input type="text" class="' + opts.jumpIptCls + '"><span>页</span><a href="javascript:;" class="' + opts.jumpBtnCls + '">' + opts.jumpBtn + '</a>' : '';
+            $obj.empty().html(html);
+        };
+
+        //绑定事件
+        this.eventBind = function () {
+            var that = this;
+            var pageCount = that.getPageCount(); //总页数
+            var index = 1;
+            $obj.off().on('click', 'a', function () {
+                if ($(this).hasClass(opts.nextCls)) {
+                    if ($obj.find('.' + opts.activeCls).text() >= pageCount) {
+                        $(this).addClass('disabled');
+                        return false;
+                    } else {
+                        index = parseInt($obj.find('.' + opts.activeCls).text()) + 1;
+                    }
+                } else if ($(this).hasClass(opts.prevCls)) {
+                    if ($obj.find('.' + opts.activeCls).text() <= 1) {
+                        $(this).addClass('disabled');
+                        return false;
+                    } else {
+                        index = parseInt($obj.find('.' + opts.activeCls).text()) - 1;
+                    }
+                } else if ($(this).hasClass(opts.jumpBtnCls)) {
+                    if ($obj.find('.' + opts.jumpIptCls).val() !== '') {
+                        index = parseInt($obj.find('.' + opts.jumpIptCls).val());
+                    } else {
+                        return;
+                    }
+                } else {
+                    index = parseInt($(this).data('page'));
+                }
+                that.filling(index);
+                typeof opts.callback === 'function' && opts.callback(that);
+            });
+            //输入跳转的页码
+            $obj.on('input propertychange', '.' + opts.jumpIptCls, function () {
+                var $this = $(this);
+                var val = $this.val();
+                var reg = /[^\d]/g;
+                if (reg.test(val)) $this.val(val.replace(reg, ''));
+                (parseInt(val) > pageCount) && $this.val(pageCount);
+                if (parseInt(val) === 0) $this.val(1); //最小值为1
+            });
+            //回车跳转指定页码
+            $document.keydown(function (e) {
+                if (e.keyCode == 13 && $obj.find('.' + opts.jumpIptCls).val()) {
+                    var index = parseInt($obj.find('.' + opts.jumpIptCls).val());
+                    that.filling(index);
+                    typeof opts.callback === 'function' && opts.callback(that);
+                }
+            });
+        };
+
+        //初始化
+        this.init = function () {
+            this.filling(opts.current);
+            this.eventBind();
+            if (opts.isHide && this.getPageCount() == '1' || this.getPageCount() == '0') {
+                $obj.hide();
+            } else {
+                $obj.show();
+            }
+        };
+        this.init();
+    };
+
+    $.fn.pagination = function (parameter, callback) {
+        if (typeof parameter == 'function') { //重载
+            callback = parameter;
+            parameter = {};
+        } else {
+            parameter = parameter || {};
+            callback = callback || function () {};
+        }
+        var options = $.extend({}, defaults, parameter);
+        return this.each(function () {
+            var pagination = new Pagination(this, options);
+            callback(pagination);
+        });
+    };
+
+}));
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/jquery.slimscroll.min.js b/pluss-manage-page/src/main/resources/static/resources/auth/js/jquery.slimscroll.min.js
new file mode 100644
index 0000000..26220d6
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/jquery.slimscroll.min.js
@@ -0,0 +1,16 @@
+/*! Copyright (c) 2011 Piotr Rochala (http://rocha.la)
+ * Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php)
+ * and GPL (http://www.opensource.org/licenses/gpl-license.php) licenses.
+ *
+ * Version: 1.3.0
+ *
+ */
+(function(f){jQuery.fn.extend({slimScroll:function(h){var a=f.extend({width:"auto",height:"250px",size:"7px",color:"#000",position:"right",distance:"1px",start:"top",opacity:0.4,alwaysVisible:!1,disableFadeOut:!1,railVisible:!1,railColor:"#333",railOpacity:0.2,railDraggable:!0,railClass:"slimScrollRail",barClass:"slimScrollBar",wrapperClass:"slimScrollDiv",allowPageScroll:!1,wheelStep:20,touchScrollStep:200,borderRadius:"7px",railBorderRadius:"7px"},h);this.each(function(){function r(d){if(s){d=d||
+window.event;var c=0;d.wheelDelta&&(c=-d.wheelDelta/120);d.detail&&(c=d.detail/3);f(d.target||d.srcTarget||d.srcElement).closest("."+a.wrapperClass).is(b.parent())&&m(c,!0);d.preventDefault&&!k&&d.preventDefault();k||(d.returnValue=!1)}}function m(d,f,h){k=!1;var e=d,g=b.outerHeight()-c.outerHeight();f&&(e=parseInt(c.css("top"))+d*parseInt(a.wheelStep)/100*c.outerHeight(),e=Math.min(Math.max(e,0),g),e=0<d?Math.ceil(e):Math.floor(e),c.css({top:e+"px"}));l=parseInt(c.css("top"))/(b.outerHeight()-c.outerHeight());
+e=l*(b[0].scrollHeight-b.outerHeight());h&&(e=d,d=e/b[0].scrollHeight*b.outerHeight(),d=Math.min(Math.max(d,0),g),c.css({top:d+"px"}));b.scrollTop(e);b.trigger("slimscrolling",~~e);v();p()}function C(){window.addEventListener?(this.addEventListener("DOMMouseScroll",r,!1),this.addEventListener("mousewheel",r,!1),this.addEventListener("MozMousePixelScroll",r,!1)):document.attachEvent("onmousewheel",r)}function w(){u=Math.max(b.outerHeight()/b[0].scrollHeight*b.outerHeight(),D);c.css({height:u+"px"});
+var a=u==b.outerHeight()?"none":"block";c.css({display:a})}function v(){w();clearTimeout(A);l==~~l?(k=a.allowPageScroll,B!=l&&b.trigger("slimscroll",0==~~l?"top":"bottom")):k=!1;B=l;u>=b.outerHeight()?k=!0:(c.stop(!0,!0).fadeIn("fast"),a.railVisible&&g.stop(!0,!0).fadeIn("fast"))}function p(){a.alwaysVisible||(A=setTimeout(function(){a.disableFadeOut&&s||(x||y)||(c.fadeOut("slow"),g.fadeOut("slow"))},1E3))}var s,x,y,A,z,u,l,B,D=30,k=!1,b=f(this);if(b.parent().hasClass(a.wrapperClass)){var n=b.scrollTop(),
+c=b.parent().find("."+a.barClass),g=b.parent().find("."+a.railClass);w();if(f.isPlainObject(h)){if("height"in h&&"auto"==h.height){b.parent().css("height","auto");b.css("height","auto");var q=b.parent().parent().height();b.parent().css("height",q);b.css("height",q)}if("scrollTo"in h)n=parseInt(a.scrollTo);else if("scrollBy"in h)n+=parseInt(a.scrollBy);else if("destroy"in h){c.remove();g.remove();b.unwrap();return}m(n,!1,!0)}}else{a.height="auto"==a.height?b.parent().height():a.height;n=f("<div></div>").addClass(a.wrapperClass).css({position:"relative",
+overflow:"hidden",width:a.width,height:a.height});b.css({overflow:"hidden",width:a.width,height:a.height});var g=f("<div></div>").addClass(a.railClass).css({width:a.size,height:"100%",position:"absolute",top:0,display:a.alwaysVisible&&a.railVisible?"block":"none","border-radius":a.railBorderRadius,background:a.railColor,opacity:a.railOpacity,zIndex:90}),c=f("<div></div>").addClass(a.barClass).css({background:a.color,width:a.size,position:"absolute",top:0,opacity:a.opacity,display:a.alwaysVisible?
+"block":"none","border-radius":a.borderRadius,BorderRadius:a.borderRadius,MozBorderRadius:a.borderRadius,WebkitBorderRadius:a.borderRadius,zIndex:99}),q="right"==a.position?{right:a.distance}:{left:a.distance};g.css(q);c.css(q);b.wrap(n);b.parent().append(c);b.parent().append(g);a.railDraggable&&c.bind("mousedown",function(a){var b=f(document);y=!0;t=parseFloat(c.css("top"));pageY=a.pageY;b.bind("mousemove.slimscroll",function(a){currTop=t+a.pageY-pageY;c.css("top",currTop);m(0,c.position().top,!1)});
+b.bind("mouseup.slimscroll",function(a){y=!1;p();b.unbind(".slimscroll")});return!1}).bind("selectstart.slimscroll",function(a){a.stopPropagation();a.preventDefault();return!1});g.hover(function(){v()},function(){p()});c.hover(function(){x=!0},function(){x=!1});b.hover(function(){s=!0;v();p()},function(){s=!1;p()});b.bind("touchstart",function(a,b){a.originalEvent.touches.length&&(z=a.originalEvent.touches[0].pageY)});b.bind("touchmove",function(b){k||b.originalEvent.preventDefault();b.originalEvent.touches.length&&
+(m((z-b.originalEvent.touches[0].pageY)/a.touchScrollStep,!0),z=b.originalEvent.touches[0].pageY)});w();"bottom"===a.start?(c.css({top:b.outerHeight()-c.outerHeight()}),m(0,!0)):"top"!==a.start&&(m(f(a.start).position().top,null,!0),a.alwaysVisible||c.hide());C()}});return this}});jQuery.fn.extend({slimscroll:jQuery.fn.slimScroll})})(jQuery);
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/layui.js b/pluss-manage-page/src/main/resources/static/resources/auth/js/layui.js
new file mode 100644
index 0000000..1c6062a
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/layui.js
@@ -0,0 +1,5 @@
+/*! MIT Licensed */;!function(t){"use strict";var e=t.document,r={modules:{},status:{},timeout:10,event:{}},n=function(){this.v="2.6.7"},o=t.LAYUI_GLOBAL||{},a=function(){var t=e.currentScript?e.currentScript.src:function(){for(var t,r=e.scripts,n=r.length-1,o=n;o>0;o--)if("interactive"===r[o].readyState){t=r[o].src;break}return t||r[n].src}();return r.dir=o.dir||t.substring(0,t.lastIndexOf("/")+1)}(),i=function(e,r){r=r||"log",t.console&&console[r]&&console[r]("layui error hint: "+e)},u="undefined"!=typeof opera&&"[object Opera]"===opera.toString(),l=r.builtin={lay:"lay",layer:"layer",laydate:"laydate",laypage:"laypage",laytpl:"laytpl",layedit:"layedit",form:"form",upload:"upload",dropdown:"dropdown",transfer:"transfer",tree:"tree",table:"table",element:"element",rate:"rate",colorpicker:"colorpicker",slider:"slider",carousel:"carousel",flow:"flow",util:"util",code:"code",jquery:"jquery",all:"all","layui.all":"layui.all"};n.prototype.cache=r,n.prototype.define=function(t,e){var n=this,o="function"==typeof t,a=function(){var t=function(t,e){layui[t]=e,r.status[t]=!0};return"function"==typeof e&&e(function(n,o){t(n,o),r.callback[n]=function(){e(t)}}),this};return o&&(e=t,t=[]),n.use(t,a,null,"define"),n},n.prototype.use=function(n,o,c,s){function p(t,e){var n="PLaySTATION 3"===navigator.platform?/^complete$/:/^(complete|loaded)$/;("load"===t.type||n.test((t.currentTarget||t.srcElement).readyState))&&(r.modules[h]=e,v.removeChild(b),function o(){return++m>1e3*r.timeout/4?i(h+" is not a valid module","error"):void(r.status[h]?f():setTimeout(o,4))}())}function f(){c.push(layui[h]),n.length>1?y.use(n.slice(1),o,c,s):"function"==typeof o&&function(){return layui.jquery&&"function"==typeof layui.jquery&&"define"!==s?layui.jquery(function(){o.apply(layui,c)}):void o.apply(layui,c)}()}var y=this,d=r.dir=r.dir?r.dir:a,v=e.getElementsByTagName("head")[0];n=function(){return"string"==typeof n?[n]:"function"==typeof n?(o=n,["all"]):n}(),t.jQuery&&jQuery.fn.on&&(y.each(n,function(t,e){"jquery"===e&&n.splice(t,1)}),layui.jquery=layui.$=jQuery);var h=n[0],m=0;if(c=c||[],r.host=r.host||(d.match(/\/\/([\s\S]+?)\//)||["//"+location.host+"/"])[0],0===n.length||layui["layui.all"]&&l[h])return f(),y;var g=(l[h]?d+"modules/":/^\{\/\}/.test(y.modules[h])?"":r.base||"")+(y.modules[h]||h)+".js";if(g=g.replace(/^\{\/\}/,""),!r.modules[h]&&layui[h]&&(r.modules[h]=g),r.modules[h])!function S(){return++m>1e3*r.timeout/4?i(h+" is not a valid module","error"):void("string"==typeof r.modules[h]&&r.status[h]?f():setTimeout(S,4))}();else{var b=e.createElement("script");b.async=!0,b.charset="utf-8",b.src=g+function(){var t=r.version===!0?r.v||(new Date).getTime():r.version||"";return t?"?v="+t:""}(),v.appendChild(b),!b.attachEvent||b.attachEvent.toString&&b.attachEvent.toString().indexOf("[native code")<0||u?b.addEventListener("load",function(t){p(t,g)},!1):b.attachEvent("onreadystatechange",function(t){p(t,g)}),r.modules[h]=g}return y},n.prototype.getStyle=function(e,r){var n=e.currentStyle?e.currentStyle:t.getComputedStyle(e,null);return n[n.getPropertyValue?"getPropertyValue":"getAttribute"](r)},n.prototype.link=function(t,n,o){var a=this,u=e.getElementsByTagName("head")[0],l=e.createElement("link");"string"==typeof n&&(o=n);var c=(o||t).replace(/\.|\//g,""),s=l.id="layuicss-"+c,p="creating",f=0;return l.rel="stylesheet",l.href=t+(r.debug?"?v="+(new Date).getTime():""),l.media="all",e.getElementById(s)||u.appendChild(l),"function"!=typeof n?a:(function y(o){var u=100,l=e.getElementById(s);return++f>1e3*r.timeout/u?i(t+" timeout"):void(1989===parseInt(a.getStyle(l,"width"))?(o===p&&l.removeAttribute("lay-status"),l.getAttribute("lay-status")===p?setTimeout(y,u):n()):(l.setAttribute("lay-status",p),setTimeout(function(){y(p)},u)))}(),a)},n.prototype.addcss=function(t,e,n){return layui.link(r.dir+"css/"+t,e,n)},r.callback={},n.prototype.factory=function(t){if(layui[t])return"function"==typeof r.callback[t]?r.callback[t]:null},n.prototype.img=function(t,e,r){var n=new Image;return n.src=t,n.complete?e(n):(n.onload=function(){n.onload=null,"function"==typeof e&&e(n)},void(n.onerror=function(t){n.onerror=null,"function"==typeof r&&r(t)}))},n.prototype.config=function(t){t=t||{};for(var e in t)r[e]=t[e];return this},n.prototype.modules=function(){var t={};for(var e in l)t[e]=l[e];return t}(),n.prototype.extend=function(t){var e=this;t=t||{};for(var r in t)e[r]||e.modules[r]?i(r+" Module already exists","error"):e.modules[r]=t[r];return e},n.prototype.router=function(t){var e=this,t=t||location.hash,r={path:[],search:{},hash:(t.match(/[^#](#.*$)/)||[])[1]||""};return/^#\//.test(t)?(t=t.replace(/^#\//,""),r.href="/"+t,t=t.replace(/([^#])(#.*$)/,"$1").split("/")||[],e.each(t,function(t,e){/^\w+=/.test(e)?function(){e=e.split("="),r.search[e[0]]=e[1]}():r.path.push(e)}),r):r},n.prototype.url=function(t){var e=this,r={pathname:function(){var e=t?function(){var e=(t.match(/\.[^.]+?\/.+/)||[])[0]||"";return e.replace(/^[^\/]+/,"").replace(/\?.+/,"")}():location.pathname;return e.replace(/^\//,"").split("/")}(),search:function(){var r={},n=(t?function(){var e=(t.match(/\?.+/)||[])[0]||"";return e.replace(/\#.+/,"")}():location.search).replace(/^\?+/,"").split("&");return e.each(n,function(t,e){var n=e.indexOf("="),o=function(){return n<0?e.substr(0,e.length):0!==n&&e.substr(0,n)}();o&&(r[o]=n>0?e.substr(n+1):null)}),r}(),hash:e.router(function(){return t?(t.match(/#.+/)||[])[0]||"/":location.hash}())};return r},n.prototype.data=function(e,r,n){if(e=e||"layui",n=n||localStorage,t.JSON&&t.JSON.parse){if(null===r)return delete n[e];r="object"==typeof r?r:{key:r};try{var o=JSON.parse(n[e])}catch(a){var o={}}return"value"in r&&(o[r.key]=r.value),r.remove&&delete o[r.key],n[e]=JSON.stringify(o),r.key?o[r.key]:o}},n.prototype.sessionData=function(t,e){return this.data(t,e,sessionStorage)},n.prototype.device=function(e){var r=navigator.userAgent.toLowerCase(),n=function(t){var e=new RegExp(t+"/([^\\s\\_\\-]+)");return t=(r.match(e)||[])[1],t||!1},o={os:function(){return/windows/.test(r)?"windows":/linux/.test(r)?"linux":/iphone|ipod|ipad|ios/.test(r)?"ios":/mac/.test(r)?"mac":void 0}(),ie:function(){return!!(t.ActiveXObject||"ActiveXObject"in t)&&((r.match(/msie\s(\d+)/)||[])[1]||"11")}(),weixin:n("micromessenger")};return e&&!o[e]&&(o[e]=n(e)),o.android=/android/.test(r),o.ios="ios"===o.os,o.mobile=!(!o.android&&!o.ios),o},n.prototype.hint=function(){return{error:i}},n.prototype._typeof=function(t){return null===t?String(t):"object"==typeof t||"function"==typeof t?function(){var e=Object.prototype.toString.call(t).match(/\s(.+)\]$/)||[],r="Function|Array|Date|RegExp|Object|Error|Symbol";return e=e[1]||"Object",new RegExp("\\b("+r+")\\b").test(e)?e.toLowerCase():"object"}():typeof t},n.prototype._isArray=function(e){var r,n=this,o=n._typeof(e);return!(!e||"object"!=typeof e||e===t)&&(r="length"in e&&e.length,"array"===o||0===r||"number"==typeof r&&r>0&&r-1 in e)},n.prototype.each=function(t,e){var r,n=this,o=function(t,r){return e.call(r[t],t,r[t])};if("function"!=typeof e)return n;if(t=t||[],n._isArray(t))for(r=0;r<t.length&&!o(r,t);r++);else for(r in t)if(o(r,t))break;return n},n.prototype.sort=function(t,e,r){var n=JSON.parse(JSON.stringify(t||[]));return e?(n.sort(function(t,r){var n=/^-?\d+$/,o=t[e],a=r[e];return n.test(o)&&(o=parseFloat(o)),n.test(a)&&(a=parseFloat(a)),o-a}),r&&n.reverse(),n):n},n.prototype.stope=function(e){e=e||t.event;try{e.stopPropagation()}catch(r){e.cancelBubble=!0}};var c="LAYUI-EVENT-REMOVE";n.prototype.onevent=function(t,e,r){return"string"!=typeof t||"function"!=typeof r?this:n.event(t,e,null,r)},n.prototype.event=n.event=function(t,e,n,o){var a=this,i=null,u=(e||"").match(/\((.*)\)$/)||[],l=(t+"."+e).replace(u[0],""),s=u[1]||"",p=function(t,e){var r=e&&e.call(a,n);r===!1&&null===i&&(i=!1)};return n===c?(delete(a.cache.event[l]||{})[s],a):o?(r.event[l]=r.event[l]||{},r.event[l][s]=[o],this):(layui.each(r.event[l],function(t,e){return"{*}"===s?void layui.each(e,p):(""===t&&layui.each(e,p),void(s&&t===s&&layui.each(e,p)))}),i)},n.prototype.on=function(t,e,r){var n=this;return n.onevent.call(n,e,t,r)},n.prototype.off=function(t,e){var r=this;return r.event.call(r,e,t,c)},t.layui=new n}(window);layui.define(function(a){var i=layui.cache;layui.config({dir:i.dir.replace(/lay\/dest\/$/,"")}),a("layui.all",layui.v)});!function(t){"use strict";var e="lay",n=t.document,r=function(t){return new o(t)},o=function(t){for(var e=0,r="object"==typeof t?[t]:(this.selector=t,n.querySelectorAll(t||null));e<r.length;e++)this.push(r[e])};o.prototype=[],o.prototype.constructor=o,r.extend=function(){var t=1,e=arguments,n=function(t,e){t=t||(e.constructor===Array?[]:{});for(var r in e)t[r]=e[r]&&e[r].constructor===Object?n(t[r],e[r]):e[r];return t};for(e[0]="object"==typeof e[0]?e[0]:{};t<e.length;t++)"object"==typeof e[t]&&n(e[0],e[t]);return e[0]},r.v="1.0.7",r.ie=function(){var e=navigator.userAgent.toLowerCase();return!!(t.ActiveXObject||"ActiveXObject"in t)&&((e.match(/msie\s(\d+)/)||[])[1]||"11")}(),r.layui=layui,r.getPath=layui.cache.dir,r.stope=layui.stope,r.each=function(){return layui.each.apply(layui,arguments),this},r.digit=function(t,e,n){var r="";t=String(t),e=e||2;for(var o=t.length;o<e;o++)r+="0";return t<Math.pow(10,e)?r+(0|t):t},r.elem=function(t,e){var o=n.createElement(t);return r.each(e||{},function(t,e){o.setAttribute(t,e)}),o},r.hasScrollbar=function(){return n.body.scrollHeight>(t.innerHeight||n.documentElement.clientHeight)},r.position=function(e,o,i){if(o){i=i||{},e!==n&&e!==r("body")[0]||(i.clickType="right");var c="right"===i.clickType?function(){var e=i.e||t.event||{};return{left:e.clientX,top:e.clientY,right:e.clientX,bottom:e.clientY}}():e.getBoundingClientRect(),u=o.offsetWidth,a=o.offsetHeight,s=function(t){return t=t?"scrollLeft":"scrollTop",n.body[t]|n.documentElement[t]},f=function(t){return n.documentElement[t?"clientWidth":"clientHeight"]},l=5,h=c.left,p=c.bottom;h+u+l>f("width")&&(h=f("width")-u-l),p+a+l>f()&&(c.top>a+l?p=c.top-a-2*l:"right"===i.clickType&&(p=f()-a-2*l,p<0&&(p=0)));var y=i.position;if(y&&(o.style.position=y),o.style.left=h+("fixed"===y?0:s(1))+"px",o.style.top=p+("fixed"===y?0:s())+"px",!r.hasScrollbar()){var d=o.getBoundingClientRect();!i.SYSTEM_RELOAD&&d.bottom+l>f()&&(i.SYSTEM_RELOAD=!0,setTimeout(function(){r.position(e,o,i)},50))}}},r.options=function(t,e){var n=r(t),o=e||"lay-options";try{return new Function("return "+(n.attr(o)||"{}"))()}catch(i){return hint.error("parseerror\uff1a"+i,"error"),{}}},r.isTopElem=function(t){var e=[n,r("body")[0]],o=!1;return r.each(e,function(e,n){if(n===t)return o=!0}),o},o.addStr=function(t,e){return t=t.replace(/\s+/," "),e=e.replace(/\s+/," ").split(" "),r.each(e,function(e,n){new RegExp("\\b"+n+"\\b").test(t)||(t=t+" "+n)}),t.replace(/^\s|\s$/,"")},o.removeStr=function(t,e){return t=t.replace(/\s+/," "),e=e.replace(/\s+/," ").split(" "),r.each(e,function(e,n){var r=new RegExp("\\b"+n+"\\b");r.test(t)&&(t=t.replace(r,""))}),t.replace(/\s+/," ").replace(/^\s|\s$/,"")},o.prototype.find=function(t){var e=this,n=0,o=[],i="object"==typeof t;return this.each(function(r,c){for(var u=i?c.contains(t):c.querySelectorAll(t||null);n<u.length;n++)o.push(u[n]);e.shift()}),i||(e.selector=(e.selector?e.selector+" ":"")+t),r.each(o,function(t,n){e.push(n)}),e},o.prototype.each=function(t){return r.each.call(this,this,t)},o.prototype.addClass=function(t,e){return this.each(function(n,r){r.className=o[e?"removeStr":"addStr"](r.className,t)})},o.prototype.removeClass=function(t){return this.addClass(t,!0)},o.prototype.hasClass=function(t){var e=!1;return this.each(function(n,r){new RegExp("\\b"+t+"\\b").test(r.className)&&(e=!0)}),e},o.prototype.css=function(t,e){var n=this,o=function(t){return isNaN(t)?t:t+"px"};return"string"==typeof t&&void 0===e?function(){if(n.length>0)return n[0].style[t]}():n.each(function(n,i){"object"==typeof t?r.each(t,function(t,e){i.style[t]=o(e)}):i.style[t]=o(e)})},o.prototype.width=function(t){var e=this;return void 0===t?function(){if(e.length>0)return e[0].offsetWidth}():e.each(function(n,r){e.css("width",t)})},o.prototype.height=function(t){var e=this;return void 0===t?function(){if(e.length>0)return e[0].offsetHeight}():e.each(function(n,r){e.css("height",t)})},o.prototype.attr=function(t,e){var n=this;return void 0===e?function(){if(n.length>0)return n[0].getAttribute(t)}():n.each(function(n,r){r.setAttribute(t,e)})},o.prototype.removeAttr=function(t){return this.each(function(e,n){n.removeAttribute(t)})},o.prototype.html=function(t){var e=this;return void 0===t?function(){if(e.length>0)return e[0].innerHTML}():this.each(function(e,n){n.innerHTML=t})},o.prototype.val=function(t){var e=this;return void 0===t?function(){if(e.length>0)return e[0].value}():this.each(function(e,n){n.value=t})},o.prototype.append=function(t){return this.each(function(e,n){"object"==typeof t?n.appendChild(t):n.innerHTML=n.innerHTML+t})},o.prototype.remove=function(t){return this.each(function(e,n){t?n.removeChild(t):n.parentNode.removeChild(n)})},o.prototype.on=function(t,e){return this.each(function(n,r){r.attachEvent?r.attachEvent("on"+t,function(t){t.target=t.srcElement,e.call(r,t)}):r.addEventListener(t,e,!1)})},o.prototype.off=function(t,e){return this.each(function(n,r){r.detachEvent?r.detachEvent("on"+t,e):r.removeEventListener(t,e,!1)})},t.lay=r,t.layui&&layui.define&&layui.define(function(t){t(e,r)})}(window,window.document);layui.define(function(e){"use strict";var r={open:"{{",close:"}}"},c={exp:function(e){return new RegExp(e,"g")},query:function(e,c,t){var o=["#([\\s\\S])+?","([^{#}])*?"][e||0];return n((c||"")+r.open+o+r.close+(t||""))},escape:function(e){return String(e||"").replace(/&(?!#?[a-zA-Z0-9]+;)/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/'/g,"&#39;").replace(/"/g,"&quot;")},error:function(e,r){var c="Laytpl Error: ";return"object"==typeof console&&console.error(c+e+"\n"+(r||"")),c+e}},n=c.exp,t=function(e){this.tpl=e};t.pt=t.prototype,window.errors=0,t.pt.parse=function(e,t){var o=this,p=e,a=n("^"+r.open+"#",""),l=n(r.close+"$","");e=e.replace(/\s+|\r|\t|\n/g," ").replace(n(r.open+"#"),r.open+"# ").replace(n(r.close+"}"),"} "+r.close).replace(/\\/g,"\\\\").replace(n(r.open+"!(.+?)!"+r.close),function(e){return e=e.replace(n("^"+r.open+"!"),"").replace(n("!"+r.close),"").replace(n(r.open+"|"+r.close),function(e){return e.replace(/(.)/g,"\\$1")})}).replace(/(?="|')/g,"\\").replace(c.query(),function(e){return e=e.replace(a,"").replace(l,""),'";'+e.replace(/\\(.)/g,"$1")+';view+="'}).replace(c.query(1),function(e){var c='"+(';return e.replace(/\s/g,"")===r.open+r.close?"":(e=e.replace(n(r.open+"|"+r.close),""),/^=/.test(e)&&(e=e.replace(/^=/,""),c='"+_escape_('),c+e.replace(/\\(.)/g,"$1")+')+"')}),e='"use strict";var view = "'+e+'";return view;';try{return o.cache=e=new Function("d, _escape_",e),e(t,c.escape)}catch(u){return delete o.cache,c.error(u,p)}},t.pt.render=function(e,r){var n,t=this;return e?(n=t.cache?t.cache(e,c.escape):t.parse(t.tpl,e),r?void r(n):n):c.error("no data")};var o=function(e){return"string"!=typeof e?c.error("Template not found"):new t(e)};o.config=function(e){e=e||{};for(var c in e)r[c]=e[c]},o.v="1.2.0",e("laytpl",o)});layui.define(function(e){"use strict";var a=document,t="getElementById",n="getElementsByTagName",i="laypage",r="layui-disabled",u=function(e){var a=this;a.config=e||{},a.config.index=++s.index,a.render(!0)};u.prototype.type=function(){var e=this.config;if("object"==typeof e.elem)return void 0===e.elem.length?2:3},u.prototype.view=function(){var e=this,a=e.config,t=a.groups="groups"in a?0|a.groups:5;a.layout="object"==typeof a.layout?a.layout:["prev","page","next"],a.count=0|a.count,a.curr=0|a.curr||1,a.limits="object"==typeof a.limits?a.limits:[10,20,30,40,50],a.limit=0|a.limit||10,a.pages=Math.ceil(a.count/a.limit)||1,a.curr>a.pages&&(a.curr=a.pages),t<0?t=1:t>a.pages&&(t=a.pages),a.prev="prev"in a?a.prev:"&#x4E0A;&#x4E00;&#x9875;",a.next="next"in a?a.next:"&#x4E0B;&#x4E00;&#x9875;";var n=a.pages>t?Math.ceil((a.curr+(t>1?1:0))/(t>0?t:1)):1,i={prev:function(){return a.prev?'<a href="javascript:;" class="layui-laypage-prev'+(1==a.curr?" "+r:"")+'" data-page="'+(a.curr-1)+'">'+a.prev+"</a>":""}(),page:function(){var e=[];if(a.count<1)return"";n>1&&a.first!==!1&&0!==t&&e.push('<a href="javascript:;" class="layui-laypage-first" data-page="1"  title="&#x9996;&#x9875;">'+(a.first||1)+"</a>");var i=Math.floor((t-1)/2),r=n>1?a.curr-i:1,u=n>1?function(){var e=a.curr+(t-i-1);return e>a.pages?a.pages:e}():t;for(u-r<t-1&&(r=u-t+1),a.first!==!1&&r>2&&e.push('<span class="layui-laypage-spr">&#x2026;</span>');r<=u;r++)r===a.curr?e.push('<span class="layui-laypage-curr"><em class="layui-laypage-em" '+(/^#/.test(a.theme)?'style="background-color:'+a.theme+';"':"")+"></em><em>"+r+"</em></span>"):e.push('<a href="javascript:;" data-page="'+r+'">'+r+"</a>");return a.pages>t&&a.pages>u&&a.last!==!1&&(u+1<a.pages&&e.push('<span class="layui-laypage-spr">&#x2026;</span>'),0!==t&&e.push('<a href="javascript:;" class="layui-laypage-last" title="&#x5C3E;&#x9875;"  data-page="'+a.pages+'">'+(a.last||a.pages)+"</a>")),e.join("")}(),next:function(){return a.next?'<a href="javascript:;" class="layui-laypage-next'+(a.curr==a.pages?" "+r:"")+'" data-page="'+(a.curr+1)+'">'+a.next+"</a>":""}(),count:'<span class="layui-laypage-count">\u5171 '+a.count+" \u6761</span>",limit:function(){var e=['<span class="layui-laypage-limits"><select lay-ignore>'];return layui.each(a.limits,function(t,n){e.push('<option value="'+n+'"'+(n===a.limit?"selected":"")+">"+n+" \u6761/\u9875</option>")}),e.join("")+"</select></span>"}(),refresh:['<a href="javascript:;" data-page="'+a.curr+'" class="layui-laypage-refresh">','<i class="layui-icon layui-icon-refresh"></i>',"</a>"].join(""),skip:function(){return['<span class="layui-laypage-skip">&#x5230;&#x7B2C;','<input type="text" min="1" value="'+a.curr+'" class="layui-input">','&#x9875;<button type="button" class="layui-laypage-btn">&#x786e;&#x5b9a;</button>',"</span>"].join("")}()};return['<div class="layui-box layui-laypage layui-laypage-'+(a.theme?/^#/.test(a.theme)?"molv":a.theme:"default")+'" id="layui-laypage-'+a.index+'">',function(){var e=[];return layui.each(a.layout,function(a,t){i[t]&&e.push(i[t])}),e.join("")}(),"</div>"].join("")},u.prototype.jump=function(e,a){if(e){var t=this,i=t.config,r=e.children,u=e[n]("button")[0],l=e[n]("input")[0],p=e[n]("select")[0],c=function(){var e=0|l.value.replace(/\s|\D/g,"");e&&(i.curr=e,t.render())};if(a)return c();for(var o=0,y=r.length;o<y;o++)"a"===r[o].nodeName.toLowerCase()&&s.on(r[o],"click",function(){var e=0|this.getAttribute("data-page");e<1||e>i.pages||(i.curr=e,t.render())});p&&s.on(p,"change",function(){var e=this.value;i.curr*e>i.count&&(i.curr=Math.ceil(i.count/e)),i.limit=e,t.render()}),u&&s.on(u,"click",function(){c()})}},u.prototype.skip=function(e){if(e){var a=this,t=e[n]("input")[0];t&&s.on(t,"keyup",function(t){var n=this.value,i=t.keyCode;/^(37|38|39|40)$/.test(i)||(/\D/.test(n)&&(this.value=n.replace(/\D/,"")),13===i&&a.jump(e,!0))})}},u.prototype.render=function(e){var n=this,i=n.config,r=n.type(),u=n.view();2===r?i.elem&&(i.elem.innerHTML=u):3===r?i.elem.html(u):a[t](i.elem)&&(a[t](i.elem).innerHTML=u),i.jump&&i.jump(i,e);var s=a[t]("layui-laypage-"+i.index);n.jump(s),i.hash&&!e&&(location.hash="!"+i.hash+"="+i.curr),n.skip(s)};var s={render:function(e){var a=new u(e);return a.index},index:layui.laypage?layui.laypage.index+1e4:0,on:function(e,a,t){return e.attachEvent?e.attachEvent("on"+a,function(a){a.target=a.srcElement,t.call(e,a)}):e.addEventListener(a,t,!1),this}};e(i,s)});!function(e,t){"use strict";var a=e.layui&&layui.define,n={getPath:e.lay&&lay.getPath?lay.getPath:"",link:function(t,a,n){l.path&&e.lay&&lay.layui&&lay.layui.link(l.path+t,a,n)}},i=e.LAYUI_GLOBAL||{},l={v:"5.3.1",config:{},index:e.laydate&&e.laydate.v?1e5:0,path:i.laydate_dir||n.getPath,set:function(e){var t=this;return t.config=lay.extend({},t.config,e),t},ready:function(e){var t="laydate",i="",r=(a?"modules/laydate/":"theme/")+"default/laydate.css?v="+l.v+i;return a?layui.addcss(r,e,t):n.link(r,e,t),this}},r=function(){var e=this,t=e.config,a=t.id;return r.that[a]=e,{hint:function(t){e.hint.call(e,t)},config:e.config}},o="laydate",s=".layui-laydate",y="layui-this",d="laydate-disabled",m=[100,2e5],c="layui-laydate-static",u="layui-laydate-list",h="layui-laydate-hint",f="layui-laydate-footer",p=".laydate-btns-confirm",g="laydate-time-text",v="laydate-btns-time",T="layui-laydate-preview",D=function(e){var t=this;t.index=++l.index,t.config=lay.extend({},t.config,l.config,e),e=t.config,e.id="id"in e?e.id:t.index,l.ready(function(){t.init()})},w="yyyy|y|MM|M|dd|d|HH|H|mm|m|ss|s";r.formatArr=function(e){return(e||"").match(new RegExp(w+"|.","g"))||[]},D.isLeapYear=function(e){return e%4===0&&e%100!==0||e%400===0},D.prototype.config={type:"date",range:!1,format:"yyyy-MM-dd",value:null,isInitValue:!0,min:"1900-1-1",max:"2099-12-31",trigger:"click",show:!1,showBottom:!0,isPreview:!0,btns:["clear","now","confirm"],lang:"cn",theme:"default",position:null,calendar:!1,mark:{},zIndex:null,done:null,change:null},D.prototype.lang=function(){var e=this,t=e.config,a={cn:{weeks:["\u65e5","\u4e00","\u4e8c","\u4e09","\u56db","\u4e94","\u516d"],time:["\u65f6","\u5206","\u79d2"],timeTips:"\u9009\u62e9\u65f6\u95f4",startTime:"\u5f00\u59cb\u65f6\u95f4",endTime:"\u7ed3\u675f\u65f6\u95f4",dateTips:"\u8fd4\u56de\u65e5\u671f",month:["\u4e00","\u4e8c","\u4e09","\u56db","\u4e94","\u516d","\u4e03","\u516b","\u4e5d","\u5341","\u5341\u4e00","\u5341\u4e8c"],tools:{confirm:"\u786e\u5b9a",clear:"\u6e05\u7a7a",now:"\u73b0\u5728"},timeout:"\u7ed3\u675f\u65f6\u95f4\u4e0d\u80fd\u65e9\u4e8e\u5f00\u59cb\u65f6\u95f4<br>\u8bf7\u91cd\u65b0\u9009\u62e9",invalidDate:"\u4e0d\u5728\u6709\u6548\u65e5\u671f\u6216\u65f6\u95f4\u8303\u56f4\u5185",formatError:["\u65e5\u671f\u683c\u5f0f\u4e0d\u5408\u6cd5<br>\u5fc5\u987b\u9075\u5faa\u4e0b\u8ff0\u683c\u5f0f\uff1a<br>","<br>\u5df2\u4e3a\u4f60\u91cd\u7f6e"],preview:"\u5f53\u524d\u9009\u4e2d\u7684\u7ed3\u679c"},en:{weeks:["Su","Mo","Tu","We","Th","Fr","Sa"],time:["Hours","Minutes","Seconds"],timeTips:"Select Time",startTime:"Start Time",endTime:"End Time",dateTips:"Select Date",month:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],tools:{confirm:"Confirm",clear:"Clear",now:"Now"},timeout:"End time cannot be less than start Time<br>Please re-select",invalidDate:"Invalid date",formatError:["The date format error<br>Must be followed\uff1a<br>","<br>It has been reset"],preview:"The selected result"}};return a[t.lang]||a.cn},D.prototype.init=function(){var t=this,a=t.config,n="static"===a.position,i={year:"yyyy",month:"yyyy-MM",date:"yyyy-MM-dd",time:"HH:mm:ss",datetime:"yyyy-MM-dd HH:mm:ss"};a.elem=lay(a.elem),a.eventElem=lay(a.eventElem),a.elem[0]&&(t.rangeStr=a.range?"string"==typeof a.range?a.range:"-":"",a.range&&a.range.constructor===Array&&(t.rangeElem=[lay(a.range[0]),lay(a.range[1])]),i[a.type]||(e.console&&console.error&&console.error("laydate type error:'"+a.type+"' is not supported"),a.type="date"),a.format===i.date&&(a.format=i[a.type]||i.date),t.format=r.formatArr(a.format),t.EXP_IF="",t.EXP_SPLIT="",lay.each(t.format,function(e,a){var n=new RegExp(w).test(a)?"\\d{"+function(){return new RegExp(w).test(t.format[0===e?e+1:e-1]||"")?/^yyyy|y$/.test(a)?4:a.length:/^yyyy$/.test(a)?"1,4":/^y$/.test(a)?"1,308":"1,2"}()+"}":"\\"+a;t.EXP_IF=t.EXP_IF+n,t.EXP_SPLIT=t.EXP_SPLIT+"("+n+")"}),t.EXP_IF_ONE=new RegExp("^"+t.EXP_IF+"$"),t.EXP_IF=new RegExp("^"+(a.range?t.EXP_IF+"\\s\\"+t.rangeStr+"\\s"+t.EXP_IF:t.EXP_IF)+"$"),t.EXP_SPLIT=new RegExp("^"+t.EXP_SPLIT+"$",""),t.isInput(a.elem[0])||"focus"===a.trigger&&(a.trigger="click"),a.elem.attr("lay-key")||(a.elem.attr("lay-key",t.index),a.eventElem.attr("lay-key",t.index)),a.mark=lay.extend({},a.calendar&&"cn"===a.lang?{"0-1-1":"\u5143\u65e6","0-2-14":"\u60c5\u4eba","0-3-8":"\u5987\u5973","0-3-12":"\u690d\u6811","0-4-1":"\u611a\u4eba","0-5-1":"\u52b3\u52a8","0-5-4":"\u9752\u5e74","0-6-1":"\u513f\u7ae5","0-9-10":"\u6559\u5e08","0-9-18":"\u56fd\u803b","0-10-1":"\u56fd\u5e86","0-12-25":"\u5723\u8bde"}:{},a.mark),lay.each(["min","max"],function(e,t){var n=[],i=[];if("number"==typeof a[t]){var l=a[t],r=(new Date).getTime(),o=864e5,s=new Date(l?l<o?r+l*o:l:r);n=[s.getFullYear(),s.getMonth()+1,s.getDate()],l<o||(i=[s.getHours(),s.getMinutes(),s.getSeconds()])}else n=(a[t].match(/\d+-\d+-\d+/)||[""])[0].split("-"),i=(a[t].match(/\d+:\d+:\d+/)||[""])[0].split(":");a[t]={year:0|n[0]||(new Date).getFullYear(),month:n[1]?(0|n[1])-1:(new Date).getMonth(),date:0|n[2]||(new Date).getDate(),hours:0|i[0],minutes:0|i[1],seconds:0|i[2]}}),t.elemID="layui-laydate"+a.elem.attr("lay-key"),(a.show||n)&&t.render(),n||t.events(),a.value&&a.isInitValue&&(a.value.constructor===Date?t.setValue(t.parse(0,t.systemDate(a.value))):t.setValue(a.value)))},D.prototype.render=function(){var e=this,a=e.config,n=e.lang(),i="static"===a.position,r=e.elem=lay.elem("div",{id:e.elemID,"class":["layui-laydate",a.range?" layui-laydate-range":"",i?" "+c:"",a.theme&&"default"!==a.theme&&!/^#/.test(a.theme)?" laydate-theme-"+a.theme:""].join("")}),o=e.elemMain=[],s=e.elemHeader=[],y=e.elemCont=[],d=e.table=[],m=e.footer=lay.elem("div",{"class":f});if(a.zIndex&&(r.style.zIndex=a.zIndex),lay.each(new Array(2),function(e){if(!a.range&&e>0)return!0;var t=lay.elem("div",{"class":"layui-laydate-header"}),i=[function(){var e=lay.elem("i",{"class":"layui-icon laydate-icon laydate-prev-y"});return e.innerHTML="&#xe65a;",e}(),function(){var e=lay.elem("i",{"class":"layui-icon laydate-icon laydate-prev-m"});return e.innerHTML="&#xe603;",e}(),function(){var e=lay.elem("div",{"class":"laydate-set-ym"}),t=lay.elem("span"),a=lay.elem("span");return e.appendChild(t),e.appendChild(a),e}(),function(){var e=lay.elem("i",{"class":"layui-icon laydate-icon laydate-next-m"});return e.innerHTML="&#xe602;",e}(),function(){var e=lay.elem("i",{"class":"layui-icon laydate-icon laydate-next-y"});return e.innerHTML="&#xe65b;",e}()],l=lay.elem("div",{"class":"layui-laydate-content"}),r=lay.elem("table"),m=lay.elem("thead"),c=lay.elem("tr");lay.each(i,function(e,a){t.appendChild(a)}),m.appendChild(c),lay.each(new Array(6),function(e){var t=r.insertRow(0);lay.each(new Array(7),function(a){if(0===e){var i=lay.elem("th");i.innerHTML=n.weeks[a],c.appendChild(i)}t.insertCell(a)})}),r.insertBefore(m,r.children[0]),l.appendChild(r),o[e]=lay.elem("div",{"class":"layui-laydate-main laydate-main-list-"+e}),o[e].appendChild(t),o[e].appendChild(l),s.push(i),y.push(l),d.push(r)}),lay(m).html(function(){var e=[],t=[];return"datetime"===a.type&&e.push('<span lay-type="datetime" class="'+v+'">'+n.timeTips+"</span>"),(a.range||"datetime"!==a.type)&&e.push('<span class="'+T+'" title="'+n.preview+'"></span>'),lay.each(a.btns,function(e,l){var r=n.tools[l]||"btn";a.range&&"now"===l||(i&&"clear"===l&&(r="cn"===a.lang?"\u91cd\u7f6e":"Reset"),t.push('<span lay-type="'+l+'" class="laydate-btns-'+l+'">'+r+"</span>"))}),e.push('<div class="laydate-footer-btns">'+t.join("")+"</div>"),e.join("")}()),lay.each(o,function(e,t){r.appendChild(t)}),a.showBottom&&r.appendChild(m),/^#/.test(a.theme)){var u=lay.elem("style"),h=["#{{id}} .layui-laydate-header{background-color:{{theme}};}","#{{id}} .layui-this{background-color:{{theme}} !important;}"].join("").replace(/{{id}}/g,e.elemID).replace(/{{theme}}/g,a.theme);"styleSheet"in u?(u.setAttribute("type","text/css"),u.styleSheet.cssText=h):u.innerHTML=h,lay(r).addClass("laydate-theme-molv"),r.appendChild(u)}l.thisId=a.id,e.remove(D.thisElemDate),i?a.elem.append(r):(t.body.appendChild(r),e.position()),e.checkDate().calendar(null,0,"init"),e.changeEvent(),D.thisElemDate=e.elemID,"function"==typeof a.ready&&a.ready(lay.extend({},a.dateTime,{month:a.dateTime.month+1})),e.preview()},D.prototype.remove=function(e){var t=this,a=(t.config,lay("#"+(e||t.elemID)));return a[0]?(a.hasClass(c)||t.checkDate(function(){a.remove()}),t):t},D.prototype.position=function(){var e=this,t=e.config;return lay.position(e.bindElem||t.elem[0],e.elem,{position:t.position}),e},D.prototype.hint=function(e){var t=this,a=(t.config,lay.elem("div",{"class":h}));t.elem&&(a.innerHTML=e||"",lay(t.elem).find("."+h).remove(),t.elem.appendChild(a),clearTimeout(t.hinTimer),t.hinTimer=setTimeout(function(){lay(t.elem).find("."+h).remove()},3e3))},D.prototype.getAsYM=function(e,t,a){return a?t--:t++,t<0&&(t=11,e--),t>11&&(t=0,e++),[e,t]},D.prototype.systemDate=function(e){var t=e||new Date;return{year:t.getFullYear(),month:t.getMonth(),date:t.getDate(),hours:e?e.getHours():0,minutes:e?e.getMinutes():0,seconds:e?e.getSeconds():0}},D.prototype.checkDate=function(e){var t,a,n=this,i=(new Date,n.config),r=n.lang(),o=i.dateTime=i.dateTime||n.systemDate(),s=n.bindElem||i.elem[0],y=(n.isInput(s)?"val":"html",function(){if(n.rangeElem){var e=[n.rangeElem[0].val(),n.rangeElem[1].val()];if(e[0]&&e[1])return e.join(" "+n.rangeStr+" ")}return n.isInput(s)?s.value:"static"===i.position?"":lay(s).attr("lay-date")}()),d=function(e){e.year>m[1]&&(e.year=m[1],a=!0),e.month>11&&(e.month=11,a=!0),e.hours>23&&(e.hours=0,a=!0),e.minutes>59&&(e.minutes=0,e.hours++,a=!0),e.seconds>59&&(e.seconds=0,e.minutes++,a=!0),t=l.getEndDate(e.month+1,e.year),e.date>t&&(e.date=t,a=!0)},c=function(e,t,l){var r=["startTime","endTime"];t=(t.match(n.EXP_SPLIT)||[]).slice(1),l=l||0,i.range&&(n[r[l]]=n[r[l]]||{}),lay.each(n.format,function(o,s){var y=parseFloat(t[o]);t[o].length<s.length&&(a=!0),/yyyy|y/.test(s)?(y<m[0]&&(y=m[0],a=!0),e.year=y):/MM|M/.test(s)?(y<1&&(y=1,a=!0),e.month=y-1):/dd|d/.test(s)?(y<1&&(y=1,a=!0),e.date=y):/HH|H/.test(s)?(y<1&&(y=0,a=!0),e.hours=y,i.range&&(n[r[l]].hours=y)):/mm|m/.test(s)?(y<1&&(y=0,a=!0),e.minutes=y,i.range&&(n[r[l]].minutes=y)):/ss|s/.test(s)&&(y<1&&(y=0,a=!0),e.seconds=y,i.range&&(n[r[l]].seconds=y))}),d(e)};if("limit"===e)return d(o),n;y=y||i.value,"string"==typeof y&&(y=y.replace(/\s+/g," ").replace(/^\s|\s$/g,""));var u=function(){i.range&&(n.endDate=n.endDate||lay.extend({},i.dateTime,function(){var e={},t=i.dateTime,a=n.getAsYM(t.year,t.month);return"year"===i.type?e.year=t.year+1:"time"!==i.type&&(e.year=a[0],e.month=a[1]),"datetime"!==i.type&&"time"!==i.type||(e.hours=23,e.minutes=e.seconds=59),e}()))};u(),"string"==typeof y&&y?n.EXP_IF.test(y)?i.range?(y=y.split(" "+n.rangeStr+" "),lay.each([i.dateTime,n.endDate],function(e,t){c(t,y[e],e)})):c(o,y):(n.hint(r.formatError[0]+(i.range?i.format+" "+n.rangeStr+" "+i.format:i.format)+r.formatError[1]),a=!0):y&&y.constructor===Date?i.dateTime=n.systemDate(y):(i.dateTime=n.systemDate(),delete n.startTime,delete n.endDate,u(),delete n.endTime),function(){if(n.rangeElem){var e=[n.rangeElem[0].val(),n.rangeElem[1].val()],t=[i.dateTime,n.endDate];lay.each(e,function(e,a){n.EXP_IF_ONE.test(a)&&c(t[e],a,e)})}}(),d(o),i.range&&d(n.endDate),a&&y&&n.setValue(i.range?n.endDate?n.parse():"":n.parse());var h=function(e){return n.newDate(e).getTime()};return(h(o)>h(i.max)||h(o)<h(i.min))&&(o=i.dateTime=lay.extend({},i.min)),i.range&&(h(n.endDate)<h(i.min)||h(n.endDate)>h(i.max))&&(n.endDate=lay.extend({},i.max)),e&&e(),n},D.prototype.mark=function(e,t){var a,n=this,i=n.config;return lay.each(i.mark,function(e,n){var i=e.split("-");i[0]!=t[0]&&0!=i[0]||i[1]!=t[1]&&0!=i[1]||i[2]!=t[2]||(a=n||t[2])}),a&&e.html('<span class="laydate-day-mark">'+a+"</span>"),n},D.prototype.limit=function(e,t,a,n){var i,l=this,r=l.config,o={},s=r[a>41?"endDate":"dateTime"],y=lay.extend({},s,t||{});return lay.each({now:y,min:r.min,max:r.max},function(e,t){o[e]=l.newDate(lay.extend({year:t.year,month:t.month,date:t.date},function(){var e={};return lay.each(n,function(a,n){e[n]=t[n]}),e}())).getTime()}),i=o.now<o.min||o.now>o.max,e&&e[i?"addClass":"removeClass"](d),i},D.prototype.thisDateTime=function(e){var t=this,a=t.config;return e?t.endDate:a.dateTime},D.prototype.calendar=function(e,t,a){var n,i,r,o=this,s=o.config,t=t?1:0,d=e||o.thisDateTime(t),c=new Date,u=o.lang(),h="date"!==s.type&&"datetime"!==s.type,f=lay(o.table[t]).find("td"),g=lay(o.elemHeader[t][2]).find("span");return d.year<m[0]&&(d.year=m[0],o.hint(u.invalidDate)),d.year>m[1]&&(d.year=m[1],o.hint(u.invalidDate)),o.firstDate||(o.firstDate=lay.extend({},d)),c.setFullYear(d.year,d.month,1),n=c.getDay(),i=l.getEndDate(d.month||12,d.year),r=l.getEndDate(d.month+1,d.year),lay.each(f,function(e,t){var a=[d.year,d.month],l=0;t=lay(t),t.removeAttr("class"),e<n?(l=i-n+e,t.addClass("laydate-day-prev"),a=o.getAsYM(d.year,d.month,"sub")):e>=n&&e<r+n?(l=e-n,l+1===d.date&&t.addClass(y)):(l=e-r-n,t.addClass("laydate-day-next"),a=o.getAsYM(d.year,d.month)),a[1]++,a[2]=l+1,t.attr("lay-ymd",a.join("-")).html(a[2]),o.mark(t,a).limit(t,{year:a[0],month:a[1]-1,date:a[2]},e)}),lay(g[0]).attr("lay-ym",d.year+"-"+(d.month+1)),lay(g[1]).attr("lay-ym",d.year+"-"+(d.month+1)),"cn"===s.lang?(lay(g[0]).attr("lay-type","year").html(d.year+" \u5e74"),lay(g[1]).attr("lay-type","month").html(d.month+1+" \u6708")):(lay(g[0]).attr("lay-type","month").html(u.month[d.month]),lay(g[1]).attr("lay-type","year").html(d.year)),h&&(s.range?e&&(o.listYM=[[s.dateTime.year,s.dateTime.month+1],[o.endDate.year,o.endDate.month+1]],o.list(s.type,0).list(s.type,1),"time"===s.type?o.setBtnStatus("\u65f6\u95f4",lay.extend({},o.systemDate(),o.startTime),lay.extend({},o.systemDate(),o.endTime)):o.setBtnStatus(!0)):(o.listYM=[[d.year,d.month+1]],o.list(s.type,0))),s.range&&"init"===a&&!e&&o.calendar(o.endDate,1),s.range||o.limit(lay(o.footer).find(p),null,0,["hours","minutes","seconds"]),o.setBtnStatus(),o},D.prototype.list=function(e,t){var a=this,n=a.config,i=n.dateTime,l=a.lang(),r=n.range&&"date"!==n.type&&"datetime"!==n.type,o=lay.elem("ul",{"class":u+" "+{year:"laydate-year-list",month:"laydate-month-list",time:"laydate-time-list"}[e]}),s=a.elemHeader[t],m=lay(s[2]).find("span"),c=a.elemCont[t||0],h=lay(c).find("."+u)[0],f="cn"===n.lang,T=f?"\u5e74":"",D=a.listYM[t]||{},w=["hours","minutes","seconds"],x=["startTime","endTime"][t];if(D[0]<1&&(D[0]=1),"year"===e){var M,E=M=D[0]-7;E<1&&(E=M=1),lay.each(new Array(15),function(e){var i=lay.elem("li",{"lay-ym":M}),l={year:M};M==D[0]&&lay(i).addClass(y),i.innerHTML=M+T,o.appendChild(i),M<a.firstDate.year?(l.month=n.min.month,l.date=n.min.date):M>=a.firstDate.year&&(l.month=n.max.month,l.date=n.max.date),a.limit(lay(i),l,t),M++}),lay(m[f?0:1]).attr("lay-ym",M-8+"-"+D[1]).html(E+T+" - "+(M-1+T))}else if("month"===e)lay.each(new Array(12),function(e){var i=lay.elem("li",{"lay-ym":e}),r={year:D[0],month:e};e+1==D[1]&&lay(i).addClass(y),i.innerHTML=l.month[e]+(f?"\u6708":""),o.appendChild(i),D[0]<a.firstDate.year?r.date=n.min.date:D[0]>=a.firstDate.year&&(r.date=n.max.date),a.limit(lay(i),r,t)}),lay(m[f?0:1]).attr("lay-ym",D[0]+"-"+D[1]).html(D[0]+T);else if("time"===e){var C=function(){lay(o).find("ol").each(function(e,n){lay(n).find("li").each(function(n,i){a.limit(lay(i),[{hours:n},{hours:a[x].hours,minutes:n},{hours:a[x].hours,minutes:a[x].minutes,seconds:n}][e],t,[["hours"],["hours","minutes"],["hours","minutes","seconds"]][e])})}),n.range||a.limit(lay(a.footer).find(p),a[x],0,["hours","minutes","seconds"])};n.range?a[x]||(a[x]="startTime"===x?i:a.endDate):a[x]=i,lay.each([24,60,60],function(e,t){var n=lay.elem("li"),i=["<p>"+l.time[e]+"</p><ol>"];lay.each(new Array(t),function(t){i.push("<li"+(a[x][w[e]]===t?' class="'+y+'"':"")+">"+lay.digit(t,2)+"</li>")}),n.innerHTML=i.join("")+"</ol>",o.appendChild(n)}),C()}if(h&&c.removeChild(h),c.appendChild(o),"year"===e||"month"===e)lay(a.elemMain[t]).addClass("laydate-ym-show"),lay(o).find("li").on("click",function(){var l=0|lay(this).attr("lay-ym");if(!lay(this).hasClass(d)){0===t?(i[e]=l,a.limit(lay(a.footer).find(p),null,0)):a.endDate[e]=l;var s="year"===n.type||"month"===n.type;s?(lay(o).find("."+y).removeClass(y),lay(this).addClass(y),"month"===n.type&&"year"===e&&(a.listYM[t][0]=l,r&&((t?a.endDate:i).year=l),a.list("month",t))):(a.checkDate("limit").calendar(null,t),a.closeList()),a.setBtnStatus(),n.range||("month"===n.type&&"month"===e||"year"===n.type&&"year"===e)&&a.setValue(a.parse()).remove().done(),a.done(null,"change"),lay(a.footer).find("."+v).removeClass(d)}});else{var I=lay.elem("span",{"class":g}),k=function(){lay(o).find("ol").each(function(e){var t=this,n=lay(t).find("li");t.scrollTop=30*(a[x][w[e]]-2),t.scrollTop<=0&&n.each(function(e,a){if(!lay(this).hasClass(d))return t.scrollTop=30*(e-2),!0})})},b=lay(s[2]).find("."+g);k(),I.innerHTML=n.range?[l.startTime,l.endTime][t]:l.timeTips,lay(a.elemMain[t]).addClass("laydate-time-show"),b[0]&&b.remove(),s[2].appendChild(I),lay(o).find("ol").each(function(e){var t=this;lay(t).find("li").on("click",function(){var l=0|this.innerHTML;lay(this).hasClass(d)||(n.range?a[x][w[e]]=l:i[w[e]]=l,lay(t).find("."+y).removeClass(y),lay(this).addClass(y),C(),k(),(a.endDate||"time"===n.type)&&a.done(null,"change"),a.setBtnStatus())})})}return a},D.prototype.listYM=[],D.prototype.closeList=function(){var e=this;e.config;lay.each(e.elemCont,function(t,a){lay(this).find("."+u).remove(),lay(e.elemMain[t]).removeClass("laydate-ym-show laydate-time-show")}),lay(e.elem).find("."+g).remove()},D.prototype.setBtnStatus=function(e,t,a){var n,i=this,l=i.config,r=i.lang(),o=lay(i.footer).find(p);l.range&&"time"!==l.type&&(t=t||l.dateTime,a=a||i.endDate,n=i.newDate(t).getTime()>i.newDate(a).getTime(),i.limit(null,t)||i.limit(null,a)?o.addClass(d):o[n?"addClass":"removeClass"](d),e&&n&&i.hint("string"==typeof e?r.timeout.replace(/\u65e5\u671f/g,e):r.timeout))},D.prototype.parse=function(e,t){var a=this,n=a.config,i=t||("end"==e?lay.extend({},a.endDate,a.endTime):n.range?lay.extend({},n.dateTime,a.startTime):n.dateTime),r=l.parse(i,a.format,1);return n.range&&void 0===e?r+" "+a.rangeStr+" "+a.parse("end"):r},D.prototype.newDate=function(e){return e=e||{},new Date(e.year||1,e.month||0,e.date||1,e.hours||0,e.minutes||0,e.seconds||0)},D.prototype.setValue=function(e){var t=this,a=t.config,n=t.bindElem||a.elem[0];return"static"===a.position?t:(e=e||"",t.isInput(n)?lay(n).val(e):t.rangeElem?(t.rangeElem[0].val(e?t.parse("start"):""),t.rangeElem[1].val(e?t.parse("end"):"")):(0===lay(n).find("*").length&&lay(n).html(e),lay(n).attr("lay-date",e)),t)},D.prototype.preview=function(){var e=this,t=e.config;if(t.isPreview){var a=lay(e.elem).find("."+T),n=t.range?e.endDate?e.parse():"":e.parse();a.html(n).css({color:"#5FB878","font-size":"14px;"}),setTimeout(function(){a.css({color:"#666","font-size":"12px;"})},300)}},D.prototype.done=function(e,t){var a=this,n=a.config,i=lay.extend({},lay.extend(n.dateTime,a.startTime)),l=lay.extend({},lay.extend(a.endDate,a.endTime));return lay.each([i,l],function(e,t){"month"in t&&lay.extend(t,{month:t.month+1})}),a.preview(),e=e||[a.parse(),i,l],"function"==typeof n[t||"done"]&&n[t||"done"].apply(n,e),a},D.prototype.choose=function(e,t){var a=this,n=a.config,i=a.thisDateTime(t),l=(lay(a.elem).find("td"),e.attr("lay-ymd").split("-"));l={year:0|l[0],month:(0|l[1])-1,date:0|l[2]},e.hasClass(d)||(lay.extend(i,l),n.range?(lay.each(["startTime","endTime"],function(e,t){a[t]=a[t]||{hours:0,minutes:0,seconds:0}}),a.calendar(null,t).done(null,"change")):"static"===n.position?a.calendar().done().done(null,"change"):"date"===n.type?a.setValue(a.parse()).remove().done():"datetime"===n.type&&a.calendar().done(null,"change"))},D.prototype.tool=function(e,t){var a=this,n=a.config,i=a.lang(),l=n.dateTime,r="static"===n.position,o={datetime:function(){lay(e).hasClass(d)||(a.list("time",0),n.range&&a.list("time",1),lay(e).attr("lay-type","date").html(a.lang().dateTips))},date:function(){a.closeList(),lay(e).attr("lay-type","datetime").html(a.lang().timeTips)},clear:function(){r&&(lay.extend(l,a.firstDate),a.calendar()),n.range&&(delete n.dateTime,delete a.endDate,delete a.startTime,delete a.endTime),a.setValue("").remove(),a.done(["",{},{}])},now:function(){var e=new Date;lay.extend(l,a.systemDate(),{hours:e.getHours(),minutes:e.getMinutes(),seconds:e.getSeconds()}),a.setValue(a.parse()).remove(),r&&a.calendar(),a.done()},confirm:function(){if(n.range){if(lay(e).hasClass(d))return a.hint("time"===n.type?i.timeout.replace(/\u65e5\u671f/g,"\u65f6\u95f4"):i.timeout)}else if(lay(e).hasClass(d))return a.hint(i.invalidDate);a.done(),a.setValue(a.parse()).remove()}};o[t]&&o[t]()},D.prototype.change=function(e){var t=this,a=t.config,n=t.thisDateTime(e),i=a.range&&("year"===a.type||"month"===a.type),l=t.elemCont[e||0],r=t.listYM[e],o=function(o){var s=lay(l).find(".laydate-year-list")[0],y=lay(l).find(".laydate-month-list")[0];return s&&(r[0]=o?r[0]-15:r[0]+15,t.list("year",e)),y&&(o?r[0]--:r[0]++,t.list("month",e)),(s||y)&&(lay.extend(n,{year:r[0]}),i&&(n.year=r[0]),a.range||t.done(null,"change"),a.range||t.limit(lay(t.footer).find(p),{year:r[0]})),t.setBtnStatus(),s||y};return{prevYear:function(){o("sub")||(n.year--,t.checkDate("limit").calendar(null,e),t.done(null,"change"))},prevMonth:function(){var a=t.getAsYM(n.year,n.month,"sub");lay.extend(n,{year:a[0],month:a[1]}),t.checkDate("limit").calendar(null,e),t.done(null,"change")},nextMonth:function(){var a=t.getAsYM(n.year,n.month);lay.extend(n,{year:a[0],month:a[1]}),t.checkDate("limit").calendar(null,e),t.done(null,"change")},nextYear:function(){o()||(n.year++,t.checkDate("limit").calendar(null,e),t.done(null,"change"))}}},D.prototype.changeEvent=function(){var e=this;e.config;lay(e.elem).on("click",function(e){lay.stope(e)}).on("mousedown",function(e){lay.stope(e)}),lay.each(e.elemHeader,function(t,a){lay(a[0]).on("click",function(a){e.change(t).prevYear()}),lay(a[1]).on("click",function(a){e.change(t).prevMonth()}),lay(a[2]).find("span").on("click",function(a){var n=lay(this),i=n.attr("lay-ym"),l=n.attr("lay-type");i&&(i=i.split("-"),e.listYM[t]=[0|i[0],0|i[1]],e.list(l,t),lay(e.footer).find("."+v).addClass(d))}),lay(a[3]).on("click",function(a){e.change(t).nextMonth()}),lay(a[4]).on("click",function(a){e.change(t).nextYear()})}),lay.each(e.table,function(t,a){var n=lay(a).find("td");n.on("click",function(){e.choose(lay(this),t)})}),lay(e.footer).find("span").on("click",function(){var t=lay(this).attr("lay-type");e.tool(this,t)})},D.prototype.isInput=function(e){return/input|textarea/.test(e.tagName.toLocaleLowerCase())},D.prototype.events=function(){var e=this,t=e.config,a=function(a,n){a.on(t.trigger,function(){n&&(e.bindElem=this),e.render()})};t.elem[0]&&!t.elem[0].eventHandler&&(a(t.elem,"bind"),a(t.eventElem),t.elem[0].eventHandler=!0)},r.that={},r.getThis=function(e){var t=r.that[e];return t||hint.error(e?o+" instance with ID '"+e+"' not found":"ID argument required"),t},n.run=function(a){a(t).on("mousedown",function(e){if(l.thisId){var t=r.getThis(l.thisId);if(t){var n=t.config;e.target!==n.elem[0]&&e.target!==n.eventElem[0]&&e.target!==a(n.closeStop)[0]&&t.remove()}}}).on("keydown",function(e){if(l.thisId){var t=r.getThis(l.thisId);t&&13===e.keyCode&&a("#"+t.elemID)[0]&&t.elemID===D.thisElemDate&&(e.preventDefault(),a(t.footer).find(p)[0].click())}}),a(e).on("resize",function(){if(l.thisId){var e=r.getThis(l.thisId);if(e)return!(!e.elem||!a(s)[0])&&void e.position()}})},l.render=function(e){var t=new D(e);return r.call(t)},l.parse=function(e,t,a){return e=e||{},"string"==typeof t&&(t=r.formatArr(t)),t=(t||[]).concat(),lay.each(t,function(n,i){/yyyy|y/.test(i)?t[n]=lay.digit(e.year,i.length):/MM|M/.test(i)?t[n]=lay.digit(e.month+(a||0),i.length):/dd|d/.test(i)?t[n]=lay.digit(e.date,i.length):/HH|H/.test(i)?t[n]=lay.digit(e.hours,i.length):/mm|m/.test(i)?t[n]=lay.digit(e.minutes,i.length):/ss|s/.test(i)&&(t[n]=lay.digit(e.seconds,i.length))}),t.join("")},l.getEndDate=function(e,t){var a=new Date;return a.setFullYear(t||a.getFullYear(),e||a.getMonth()+1,1),new Date(a.getTime()-864e5).getDate()},a?(l.ready(),layui.define("lay",function(e){l.path=layui.cache.dir,n.run(lay),e(o,l)})):"function"==typeof define&&define.amd?define(function(){return n.run(lay),l}):function(){l.ready(),n.run(e.lay),e.laydate=l}()}(window,window.document);!function(e,t){"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(e,t){function n(e){var t=!!e&&"length"in e&&e.length,n=pe.type(e);return"function"!==n&&!pe.isWindow(e)&&("array"===n||0===t||"number"==typeof t&&t>0&&t-1 in e)}function r(e,t,n){if(pe.isFunction(t))return pe.grep(e,function(e,r){return!!t.call(e,r,e)!==n});if(t.nodeType)return pe.grep(e,function(e){return e===t!==n});if("string"==typeof t){if(Ce.test(t))return pe.filter(t,e,n);t=pe.filter(t,e)}return pe.grep(e,function(e){return pe.inArray(e,t)>-1!==n})}function i(e,t){do e=e[t];while(e&&1!==e.nodeType);return e}function o(e){var t={};return pe.each(e.match(De)||[],function(e,n){t[n]=!0}),t}function a(){re.addEventListener?(re.removeEventListener("DOMContentLoaded",s),e.removeEventListener("load",s)):(re.detachEvent("onreadystatechange",s),e.detachEvent("onload",s))}function s(){(re.addEventListener||"load"===e.event.type||"complete"===re.readyState)&&(a(),pe.ready())}function u(e,t,n){if(void 0===n&&1===e.nodeType){var r="data-"+t.replace(_e,"-$1").toLowerCase();if(n=e.getAttribute(r),"string"==typeof n){try{n="true"===n||"false"!==n&&("null"===n?null:+n+""===n?+n:qe.test(n)?pe.parseJSON(n):n)}catch(i){}pe.data(e,t,n)}else n=void 0}return n}function l(e){var t;for(t in e)if(("data"!==t||!pe.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}function c(e,t,n,r){if(He(e)){var i,o,a=pe.expando,s=e.nodeType,u=s?pe.cache:e,l=s?e[a]:e[a]&&a;if(l&&u[l]&&(r||u[l].data)||void 0!==n||"string"!=typeof t)return l||(l=s?e[a]=ne.pop()||pe.guid++:a),u[l]||(u[l]=s?{}:{toJSON:pe.noop}),"object"!=typeof t&&"function"!=typeof t||(r?u[l]=pe.extend(u[l],t):u[l].data=pe.extend(u[l].data,t)),o=u[l],r||(o.data||(o.data={}),o=o.data),void 0!==n&&(o[pe.camelCase(t)]=n),"string"==typeof t?(i=o[t],null==i&&(i=o[pe.camelCase(t)])):i=o,i}}function f(e,t,n){if(He(e)){var r,i,o=e.nodeType,a=o?pe.cache:e,s=o?e[pe.expando]:pe.expando;if(a[s]){if(t&&(r=n?a[s]:a[s].data)){pe.isArray(t)?t=t.concat(pe.map(t,pe.camelCase)):t in r?t=[t]:(t=pe.camelCase(t),t=t in r?[t]:t.split(" ")),i=t.length;for(;i--;)delete r[t[i]];if(n?!l(r):!pe.isEmptyObject(r))return}(n||(delete a[s].data,l(a[s])))&&(o?pe.cleanData([e],!0):fe.deleteExpando||a!=a.window?delete a[s]:a[s]=void 0)}}}function d(e,t,n,r){var i,o=1,a=20,s=r?function(){return r.cur()}:function(){return pe.css(e,t,"")},u=s(),l=n&&n[3]||(pe.cssNumber[t]?"":"px"),c=(pe.cssNumber[t]||"px"!==l&&+u)&&Me.exec(pe.css(e,t));if(c&&c[3]!==l){l=l||c[3],n=n||[],c=+u||1;do o=o||".5",c/=o,pe.style(e,t,c+l);while(o!==(o=s()/u)&&1!==o&&--a)}return n&&(c=+c||+u||0,i=n[1]?c+(n[1]+1)*n[2]:+n[2],r&&(r.unit=l,r.start=c,r.end=i)),i}function p(e){var t=ze.split("|"),n=e.createDocumentFragment();if(n.createElement)for(;t.length;)n.createElement(t.pop());return n}function h(e,t){var n,r,i=0,o="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):void 0;if(!o)for(o=[],n=e.childNodes||e;null!=(r=n[i]);i++)!t||pe.nodeName(r,t)?o.push(r):pe.merge(o,h(r,t));return void 0===t||t&&pe.nodeName(e,t)?pe.merge([e],o):o}function g(e,t){for(var n,r=0;null!=(n=e[r]);r++)pe._data(n,"globalEval",!t||pe._data(t[r],"globalEval"))}function m(e){Be.test(e.type)&&(e.defaultChecked=e.checked)}function y(e,t,n,r,i){for(var o,a,s,u,l,c,f,d=e.length,y=p(t),v=[],x=0;x<d;x++)if(a=e[x],a||0===a)if("object"===pe.type(a))pe.merge(v,a.nodeType?[a]:a);else if(Ue.test(a)){for(u=u||y.appendChild(t.createElement("div")),l=(We.exec(a)||["",""])[1].toLowerCase(),f=Xe[l]||Xe._default,u.innerHTML=f[1]+pe.htmlPrefilter(a)+f[2],o=f[0];o--;)u=u.lastChild;if(!fe.leadingWhitespace&&$e.test(a)&&v.push(t.createTextNode($e.exec(a)[0])),!fe.tbody)for(a="table"!==l||Ve.test(a)?"<table>"!==f[1]||Ve.test(a)?0:u:u.firstChild,o=a&&a.childNodes.length;o--;)pe.nodeName(c=a.childNodes[o],"tbody")&&!c.childNodes.length&&a.removeChild(c);for(pe.merge(v,u.childNodes),u.textContent="";u.firstChild;)u.removeChild(u.firstChild);u=y.lastChild}else v.push(t.createTextNode(a));for(u&&y.removeChild(u),fe.appendChecked||pe.grep(h(v,"input"),m),x=0;a=v[x++];)if(r&&pe.inArray(a,r)>-1)i&&i.push(a);else if(s=pe.contains(a.ownerDocument,a),u=h(y.appendChild(a),"script"),s&&g(u),n)for(o=0;a=u[o++];)Ie.test(a.type||"")&&n.push(a);return u=null,y}function v(){return!0}function x(){return!1}function b(){try{return re.activeElement}catch(e){}}function w(e,t,n,r,i,o){var a,s;if("object"==typeof t){"string"!=typeof n&&(r=r||n,n=void 0);for(s in t)w(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),i===!1)i=x;else if(!i)return e;return 1===o&&(a=i,i=function(e){return pe().off(e),a.apply(this,arguments)},i.guid=a.guid||(a.guid=pe.guid++)),e.each(function(){pe.event.add(this,t,i,r,n)})}function T(e,t){return pe.nodeName(e,"table")&&pe.nodeName(11!==t.nodeType?t:t.firstChild,"tr")?e.getElementsByTagName("tbody")[0]||e.appendChild(e.ownerDocument.createElement("tbody")):e}function C(e){return e.type=(null!==pe.find.attr(e,"type"))+"/"+e.type,e}function E(e){var t=it.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function N(e,t){if(1===t.nodeType&&pe.hasData(e)){var n,r,i,o=pe._data(e),a=pe._data(t,o),s=o.events;if(s){delete a.handle,a.events={};for(n in s)for(r=0,i=s[n].length;r<i;r++)pe.event.add(t,n,s[n][r])}a.data&&(a.data=pe.extend({},a.data))}}function k(e,t){var n,r,i;if(1===t.nodeType){if(n=t.nodeName.toLowerCase(),!fe.noCloneEvent&&t[pe.expando]){i=pe._data(t);for(r in i.events)pe.removeEvent(t,r,i.handle);t.removeAttribute(pe.expando)}"script"===n&&t.text!==e.text?(C(t).text=e.text,E(t)):"object"===n?(t.parentNode&&(t.outerHTML=e.outerHTML),fe.html5Clone&&e.innerHTML&&!pe.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):"input"===n&&Be.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):"option"===n?t.defaultSelected=t.selected=e.defaultSelected:"input"!==n&&"textarea"!==n||(t.defaultValue=e.defaultValue)}}function S(e,t,n,r){t=oe.apply([],t);var i,o,a,s,u,l,c=0,f=e.length,d=f-1,p=t[0],g=pe.isFunction(p);if(g||f>1&&"string"==typeof p&&!fe.checkClone&&rt.test(p))return e.each(function(i){var o=e.eq(i);g&&(t[0]=p.call(this,i,o.html())),S(o,t,n,r)});if(f&&(l=y(t,e[0].ownerDocument,!1,e,r),i=l.firstChild,1===l.childNodes.length&&(l=i),i||r)){for(s=pe.map(h(l,"script"),C),a=s.length;c<f;c++)o=l,c!==d&&(o=pe.clone(o,!0,!0),a&&pe.merge(s,h(o,"script"))),n.call(e[c],o,c);if(a)for(u=s[s.length-1].ownerDocument,pe.map(s,E),c=0;c<a;c++)o=s[c],Ie.test(o.type||"")&&!pe._data(o,"globalEval")&&pe.contains(u,o)&&(o.src?pe._evalUrl&&pe._evalUrl(o.src):pe.globalEval((o.text||o.textContent||o.innerHTML||"").replace(ot,"")));l=i=null}return e}function A(e,t,n){for(var r,i=t?pe.filter(t,e):e,o=0;null!=(r=i[o]);o++)n||1!==r.nodeType||pe.cleanData(h(r)),r.parentNode&&(n&&pe.contains(r.ownerDocument,r)&&g(h(r,"script")),r.parentNode.removeChild(r));return e}function D(e,t){var n=pe(t.createElement(e)).appendTo(t.body),r=pe.css(n[0],"display");return n.detach(),r}function j(e){var t=re,n=lt[e];return n||(n=D(e,t),"none"!==n&&n||(ut=(ut||pe("<iframe frameborder='0' width='0' height='0'/>")).appendTo(t.documentElement),t=(ut[0].contentWindow||ut[0].contentDocument).document,t.write(),t.close(),n=D(e,t),ut.detach()),lt[e]=n),n}function L(e,t){return{get:function(){return e()?void delete this.get:(this.get=t).apply(this,arguments)}}}function H(e){if(e in Et)return e;for(var t=e.charAt(0).toUpperCase()+e.slice(1),n=Ct.length;n--;)if(e=Ct[n]+t,e in Et)return e}function q(e,t){for(var n,r,i,o=[],a=0,s=e.length;a<s;a++)r=e[a],r.style&&(o[a]=pe._data(r,"olddisplay"),n=r.style.display,t?(o[a]||"none"!==n||(r.style.display=""),""===r.style.display&&Re(r)&&(o[a]=pe._data(r,"olddisplay",j(r.nodeName)))):(i=Re(r),(n&&"none"!==n||!i)&&pe._data(r,"olddisplay",i?n:pe.css(r,"display"))));for(a=0;a<s;a++)r=e[a],r.style&&(t&&"none"!==r.style.display&&""!==r.style.display||(r.style.display=t?o[a]||"":"none"));return e}function _(e,t,n){var r=bt.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function F(e,t,n,r,i){for(var o=n===(r?"border":"content")?4:"width"===t?1:0,a=0;o<4;o+=2)"margin"===n&&(a+=pe.css(e,n+Oe[o],!0,i)),r?("content"===n&&(a-=pe.css(e,"padding"+Oe[o],!0,i)),"margin"!==n&&(a-=pe.css(e,"border"+Oe[o]+"Width",!0,i))):(a+=pe.css(e,"padding"+Oe[o],!0,i),"padding"!==n&&(a+=pe.css(e,"border"+Oe[o]+"Width",!0,i)));return a}function M(e,t,n){var r=!0,i="width"===t?e.offsetWidth:e.offsetHeight,o=ht(e),a=fe.boxSizing&&"border-box"===pe.css(e,"boxSizing",!1,o);if(i<=0||null==i){if(i=gt(e,t,o),(i<0||null==i)&&(i=e.style[t]),ft.test(i))return i;r=a&&(fe.boxSizingReliable()||i===e.style[t]),i=parseFloat(i)||0}return i+F(e,t,n||(a?"border":"content"),r,o)+"px"}function O(e,t,n,r,i){return new O.prototype.init(e,t,n,r,i)}function R(){return e.setTimeout(function(){Nt=void 0}),Nt=pe.now()}function P(e,t){var n,r={height:e},i=0;for(t=t?1:0;i<4;i+=2-t)n=Oe[i],r["margin"+n]=r["padding"+n]=e;return t&&(r.opacity=r.width=e),r}function B(e,t,n){for(var r,i=($.tweeners[t]||[]).concat($.tweeners["*"]),o=0,a=i.length;o<a;o++)if(r=i[o].call(n,t,e))return r}function W(e,t,n){var r,i,o,a,s,u,l,c,f=this,d={},p=e.style,h=e.nodeType&&Re(e),g=pe._data(e,"fxshow");n.queue||(s=pe._queueHooks(e,"fx"),null==s.unqueued&&(s.unqueued=0,u=s.empty.fire,s.empty.fire=function(){s.unqueued||u()}),s.unqueued++,f.always(function(){f.always(function(){s.unqueued--,pe.queue(e,"fx").length||s.empty.fire()})})),1===e.nodeType&&("height"in t||"width"in t)&&(n.overflow=[p.overflow,p.overflowX,p.overflowY],l=pe.css(e,"display"),c="none"===l?pe._data(e,"olddisplay")||j(e.nodeName):l,"inline"===c&&"none"===pe.css(e,"float")&&(fe.inlineBlockNeedsLayout&&"inline"!==j(e.nodeName)?p.zoom=1:p.display="inline-block")),n.overflow&&(p.overflow="hidden",fe.shrinkWrapBlocks()||f.always(function(){p.overflow=n.overflow[0],p.overflowX=n.overflow[1],p.overflowY=n.overflow[2]}));for(r in t)if(i=t[r],St.exec(i)){if(delete t[r],o=o||"toggle"===i,i===(h?"hide":"show")){if("show"!==i||!g||void 0===g[r])continue;h=!0}d[r]=g&&g[r]||pe.style(e,r)}else l=void 0;if(pe.isEmptyObject(d))"inline"===("none"===l?j(e.nodeName):l)&&(p.display=l);else{g?"hidden"in g&&(h=g.hidden):g=pe._data(e,"fxshow",{}),o&&(g.hidden=!h),h?pe(e).show():f.done(function(){pe(e).hide()}),f.done(function(){var t;pe._removeData(e,"fxshow");for(t in d)pe.style(e,t,d[t])});for(r in d)a=B(h?g[r]:0,r,f),r in g||(g[r]=a.start,h&&(a.end=a.start,a.start="width"===r||"height"===r?1:0))}}function I(e,t){var n,r,i,o,a;for(n in e)if(r=pe.camelCase(n),i=t[r],o=e[n],pe.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),a=pe.cssHooks[r],a&&"expand"in a){o=a.expand(o),delete e[r];for(n in o)n in e||(e[n]=o[n],t[n]=i)}else t[r]=i}function $(e,t,n){var r,i,o=0,a=$.prefilters.length,s=pe.Deferred().always(function(){delete u.elem}),u=function(){if(i)return!1;for(var t=Nt||R(),n=Math.max(0,l.startTime+l.duration-t),r=n/l.duration||0,o=1-r,a=0,u=l.tweens.length;a<u;a++)l.tweens[a].run(o);return s.notifyWith(e,[l,o,n]),o<1&&u?n:(s.resolveWith(e,[l]),!1)},l=s.promise({elem:e,props:pe.extend({},t),opts:pe.extend(!0,{specialEasing:{},easing:pe.easing._default},n),originalProperties:t,originalOptions:n,startTime:Nt||R(),duration:n.duration,tweens:[],createTween:function(t,n){var r=pe.Tween(e,l.opts,t,n,l.opts.specialEasing[t]||l.opts.easing);return l.tweens.push(r),r},stop:function(t){var n=0,r=t?l.tweens.length:0;if(i)return this;for(i=!0;n<r;n++)l.tweens[n].run(1);return t?(s.notifyWith(e,[l,1,0]),s.resolveWith(e,[l,t])):s.rejectWith(e,[l,t]),this}}),c=l.props;for(I(c,l.opts.specialEasing);o<a;o++)if(r=$.prefilters[o].call(l,e,c,l.opts))return pe.isFunction(r.stop)&&(pe._queueHooks(l.elem,l.opts.queue).stop=pe.proxy(r.stop,r)),r;return pe.map(c,B,l),pe.isFunction(l.opts.start)&&l.opts.start.call(e,l),pe.fx.timer(pe.extend(u,{elem:e,anim:l,queue:l.opts.queue})),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always)}function z(e){return pe.attr(e,"class")||""}function X(e){return function(t,n){"string"!=typeof t&&(n=t,t="*");var r,i=0,o=t.toLowerCase().match(De)||[];if(pe.isFunction(n))for(;r=o[i++];)"+"===r.charAt(0)?(r=r.slice(1)||"*",(e[r]=e[r]||[]).unshift(n)):(e[r]=e[r]||[]).push(n)}}function U(e,t,n,r){function i(s){var u;return o[s]=!0,pe.each(e[s]||[],function(e,s){var l=s(t,n,r);return"string"!=typeof l||a||o[l]?a?!(u=l):void 0:(t.dataTypes.unshift(l),i(l),!1)}),u}var o={},a=e===Qt;return i(t.dataTypes[0])||!o["*"]&&i("*")}function V(e,t){var n,r,i=pe.ajaxSettings.flatOptions||{};for(r in t)void 0!==t[r]&&((i[r]?e:n||(n={}))[r]=t[r]);return n&&pe.extend(!0,e,n),e}function Y(e,t,n){for(var r,i,o,a,s=e.contents,u=e.dataTypes;"*"===u[0];)u.shift(),void 0===i&&(i=e.mimeType||t.getResponseHeader("Content-Type"));if(i)for(a in s)if(s[a]&&s[a].test(i)){u.unshift(a);break}if(u[0]in n)o=u[0];else{for(a in n){if(!u[0]||e.converters[a+" "+u[0]]){o=a;break}r||(r=a)}o=o||r}if(o)return o!==u[0]&&u.unshift(o),n[o]}function J(e,t,n,r){var i,o,a,s,u,l={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)l[a.toLowerCase()]=e.converters[a];for(o=c.shift();o;)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!u&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u=o,o=c.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(a=l[u+" "+o]||l["* "+o],!a)for(i in l)if(s=i.split(" "),s[1]===o&&(a=l[u+" "+s[0]]||l["* "+s[0]])){a===!0?a=l[i]:l[i]!==!0&&(o=s[0],c.unshift(s[1]));break}if(a!==!0)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(f){return{state:"parsererror",error:a?f:"No conversion from "+u+" to "+o}}}return{state:"success",data:t}}function G(e){return e.style&&e.style.display||pe.css(e,"display")}function K(e){if(!pe.contains(e.ownerDocument||re,e))return!0;for(;e&&1===e.nodeType;){if("none"===G(e)||"hidden"===e.type)return!0;e=e.parentNode}return!1}function Q(e,t,n,r){var i;if(pe.isArray(t))pe.each(t,function(t,i){n||rn.test(e)?r(e,i):Q(e+"["+("object"==typeof i&&null!=i?t:"")+"]",i,n,r)});else if(n||"object"!==pe.type(t))r(e,t);else for(i in t)Q(e+"["+i+"]",t[i],n,r)}function Z(){try{return new e.XMLHttpRequest}catch(t){}}function ee(){try{return new e.ActiveXObject("Microsoft.XMLHTTP")}catch(t){}}function te(e){return pe.isWindow(e)?e:9===e.nodeType&&(e.defaultView||e.parentWindow)}var ne=[],re=e.document,ie=ne.slice,oe=ne.concat,ae=ne.push,se=ne.indexOf,ue={},le=ue.toString,ce=ue.hasOwnProperty,fe={},de="1.12.4",pe=function(e,t){return new pe.fn.init(e,t)},he=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,ge=/^-ms-/,me=/-([\da-z])/gi,ye=function(e,t){return t.toUpperCase()};pe.fn=pe.prototype={jquery:de,constructor:pe,selector:"",length:0,toArray:function(){return ie.call(this)},get:function(e){return null!=e?e<0?this[e+this.length]:this[e]:ie.call(this)},pushStack:function(e){var t=pe.merge(this.constructor(),e);return t.prevObject=this,t.context=this.context,t},each:function(e){return pe.each(this,e)},map:function(e){return this.pushStack(pe.map(this,function(t,n){return e.call(t,n,t)}))},slice:function(){return this.pushStack(ie.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(n>=0&&n<t?[this[n]]:[])},end:function(){return this.prevObject||this.constructor()},push:ae,sort:ne.sort,splice:ne.splice},pe.extend=pe.fn.extend=function(){var e,t,n,r,i,o,a=arguments[0]||{},s=1,u=arguments.length,l=!1;for("boolean"==typeof a&&(l=a,a=arguments[s]||{},s++),"object"==typeof a||pe.isFunction(a)||(a={}),s===u&&(a=this,s--);s<u;s++)if(null!=(i=arguments[s]))for(r in i)e=a[r],n=i[r],a!==n&&(l&&n&&(pe.isPlainObject(n)||(t=pe.isArray(n)))?(t?(t=!1,o=e&&pe.isArray(e)?e:[]):o=e&&pe.isPlainObject(e)?e:{},a[r]=pe.extend(l,o,n)):void 0!==n&&(a[r]=n));return a},pe.extend({expando:"jQuery"+(de+Math.random()).replace(/\D/g,""),isReady:!0,error:function(e){throw new Error(e)},noop:function(){},isFunction:function(e){return"function"===pe.type(e)},isArray:Array.isArray||function(e){return"array"===pe.type(e)},isWindow:function(e){return null!=e&&e==e.window},isNumeric:function(e){var t=e&&e.toString();return!pe.isArray(e)&&t-parseFloat(t)+1>=0},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},isPlainObject:function(e){var t;if(!e||"object"!==pe.type(e)||e.nodeType||pe.isWindow(e))return!1;try{if(e.constructor&&!ce.call(e,"constructor")&&!ce.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(n){return!1}if(!fe.ownFirst)for(t in e)return ce.call(e,t);for(t in e);return void 0===t||ce.call(e,t)},type:function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?ue[le.call(e)]||"object":typeof e},globalEval:function(t){t&&pe.trim(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(ge,"ms-").replace(me,ye)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t){var r,i=0;if(n(e))for(r=e.length;i<r&&t.call(e[i],i,e[i])!==!1;i++);else for(i in e)if(t.call(e[i],i,e[i])===!1)break;return e},trim:function(e){return null==e?"":(e+"").replace(he,"")},makeArray:function(e,t){var r=t||[];return null!=e&&(n(Object(e))?pe.merge(r,"string"==typeof e?[e]:e):ae.call(r,e)),r},inArray:function(e,t,n){var r;if(t){if(se)return se.call(t,e,n);for(r=t.length,n=n?n<0?Math.max(0,r+n):n:0;n<r;n++)if(n in t&&t[n]===e)return n}return-1},merge:function(e,t){for(var n=+t.length,r=0,i=e.length;r<n;)e[i++]=t[r++];if(n!==n)for(;void 0!==t[r];)e[i++]=t[r++];return e.length=i,e},grep:function(e,t,n){for(var r,i=[],o=0,a=e.length,s=!n;o<a;o++)r=!t(e[o],o),r!==s&&i.push(e[o]);return i},map:function(e,t,r){var i,o,a=0,s=[];if(n(e))for(i=e.length;a<i;a++)o=t(e[a],a,r),null!=o&&s.push(o);else for(a in e)o=t(e[a],a,r),null!=o&&s.push(o);return oe.apply([],s)},guid:1,proxy:function(e,t){var n,r,i;if("string"==typeof t&&(i=e[t],t=e,e=i),pe.isFunction(e))return n=ie.call(arguments,2),r=function(){return e.apply(t||this,n.concat(ie.call(arguments)))},r.guid=e.guid=e.guid||pe.guid++,r},now:function(){return+new Date},support:fe}),"function"==typeof Symbol&&(pe.fn[Symbol.iterator]=ne[Symbol.iterator]),pe.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(e,t){ue["[object "+t+"]"]=t.toLowerCase()});var ve=function(e){function t(e,t,n,r){var i,o,a,s,u,l,f,p,h=t&&t.ownerDocument,g=t?t.nodeType:9;if(n=n||[],"string"!=typeof e||!e||1!==g&&9!==g&&11!==g)return n;if(!r&&((t?t.ownerDocument||t:B)!==H&&L(t),t=t||H,_)){if(11!==g&&(l=ye.exec(e)))if(i=l[1]){if(9===g){if(!(a=t.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(h&&(a=h.getElementById(i))&&R(t,a)&&a.id===i)return n.push(a),n}else{if(l[2])return Q.apply(n,t.getElementsByTagName(e)),n;if((i=l[3])&&w.getElementsByClassName&&t.getElementsByClassName)return Q.apply(n,t.getElementsByClassName(i)),n}if(w.qsa&&!X[e+" "]&&(!F||!F.test(e))){if(1!==g)h=t,p=e;else if("object"!==t.nodeName.toLowerCase()){for((s=t.getAttribute("id"))?s=s.replace(xe,"\\$&"):t.setAttribute("id",s=P),f=N(e),o=f.length,u=de.test(s)?"#"+s:"[id='"+s+"']";o--;)f[o]=u+" "+d(f[o]);p=f.join(","),h=ve.test(e)&&c(t.parentNode)||t}if(p)try{return Q.apply(n,h.querySelectorAll(p)),n}catch(m){}finally{s===P&&t.removeAttribute("id")}}}return S(e.replace(se,"$1"),t,n,r)}function n(){function e(n,r){return t.push(n+" ")>T.cacheLength&&delete e[t.shift()],e[n+" "]=r}var t=[];return e}function r(e){return e[P]=!0,e}function i(e){var t=H.createElement("div");try{return!!e(t)}catch(n){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function o(e,t){for(var n=e.split("|"),r=n.length;r--;)T.attrHandle[n[r]]=t}function a(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&(~t.sourceIndex||V)-(~e.sourceIndex||V);if(r)return r;if(n)for(;n=n.nextSibling;)if(n===t)return-1;return e?1:-1}function s(e){return function(t){var n=t.nodeName.toLowerCase();return"input"===n&&t.type===e}}function u(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function l(e){return r(function(t){return t=+t,r(function(n,r){for(var i,o=e([],n.length,t),a=o.length;a--;)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}function c(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}function f(){}function d(e){for(var t=0,n=e.length,r="";t<n;t++)r+=e[t].value;return r}function p(e,t,n){var r=t.dir,i=n&&"parentNode"===r,o=I++;return t.first?function(t,n,o){for(;t=t[r];)if(1===t.nodeType||i)return e(t,n,o)}:function(t,n,a){var s,u,l,c=[W,o];if(a){for(;t=t[r];)if((1===t.nodeType||i)&&e(t,n,a))return!0}else for(;t=t[r];)if(1===t.nodeType||i){if(l=t[P]||(t[P]={}),u=l[t.uniqueID]||(l[t.uniqueID]={}),(s=u[r])&&s[0]===W&&s[1]===o)return c[2]=s[2];if(u[r]=c,c[2]=e(t,n,a))return!0}}}function h(e){return e.length>1?function(t,n,r){for(var i=e.length;i--;)if(!e[i](t,n,r))return!1;return!0}:e[0]}function g(e,n,r){for(var i=0,o=n.length;i<o;i++)t(e,n[i],r);return r}function m(e,t,n,r,i){for(var o,a=[],s=0,u=e.length,l=null!=t;s<u;s++)(o=e[s])&&(n&&!n(o,r,i)||(a.push(o),l&&t.push(s)));return a}function y(e,t,n,i,o,a){return i&&!i[P]&&(i=y(i)),o&&!o[P]&&(o=y(o,a)),r(function(r,a,s,u){var l,c,f,d=[],p=[],h=a.length,y=r||g(t||"*",s.nodeType?[s]:s,[]),v=!e||!r&&t?y:m(y,d,e,s,u),x=n?o||(r?e:h||i)?[]:a:v;if(n&&n(v,x,s,u),i)for(l=m(x,p),i(l,[],s,u),c=l.length;c--;)(f=l[c])&&(x[p[c]]=!(v[p[c]]=f));if(r){if(o||e){if(o){for(l=[],c=x.length;c--;)(f=x[c])&&l.push(v[c]=f);o(null,x=[],l,u)}for(c=x.length;c--;)(f=x[c])&&(l=o?ee(r,f):d[c])>-1&&(r[l]=!(a[l]=f))}}else x=m(x===a?x.splice(h,x.length):x),o?o(null,a,x,u):Q.apply(a,x)})}function v(e){for(var t,n,r,i=e.length,o=T.relative[e[0].type],a=o||T.relative[" "],s=o?1:0,u=p(function(e){return e===t},a,!0),l=p(function(e){return ee(t,e)>-1},a,!0),c=[function(e,n,r){var i=!o&&(r||n!==A)||((t=n).nodeType?u(e,n,r):l(e,n,r));return t=null,i}];s<i;s++)if(n=T.relative[e[s].type])c=[p(h(c),n)];else{if(n=T.filter[e[s].type].apply(null,e[s].matches),n[P]){for(r=++s;r<i&&!T.relative[e[r].type];r++);return y(s>1&&h(c),s>1&&d(e.slice(0,s-1).concat({value:" "===e[s-2].type?"*":""})).replace(se,"$1"),n,s<r&&v(e.slice(s,r)),r<i&&v(e=e.slice(r)),r<i&&d(e))}c.push(n)}return h(c)}function x(e,n){var i=n.length>0,o=e.length>0,a=function(r,a,s,u,l){var c,f,d,p=0,h="0",g=r&&[],y=[],v=A,x=r||o&&T.find.TAG("*",l),b=W+=null==v?1:Math.random()||.1,w=x.length;for(l&&(A=a===H||a||l);h!==w&&null!=(c=x[h]);h++){if(o&&c){for(f=0,a||c.ownerDocument===H||(L(c),s=!_);d=e[f++];)if(d(c,a||H,s)){u.push(c);break}l&&(W=b)}i&&((c=!d&&c)&&p--,r&&g.push(c))}if(p+=h,i&&h!==p){for(f=0;d=n[f++];)d(g,y,a,s);if(r){if(p>0)for(;h--;)g[h]||y[h]||(y[h]=G.call(u));y=m(y)}Q.apply(u,y),l&&!r&&y.length>0&&p+n.length>1&&t.uniqueSort(u)}return l&&(W=b,A=v),g};return i?r(a):a}var b,w,T,C,E,N,k,S,A,D,j,L,H,q,_,F,M,O,R,P="sizzle"+1*new Date,B=e.document,W=0,I=0,$=n(),z=n(),X=n(),U=function(e,t){return e===t&&(j=!0),0},V=1<<31,Y={}.hasOwnProperty,J=[],G=J.pop,K=J.push,Q=J.push,Z=J.slice,ee=function(e,t){for(var n=0,r=e.length;n<r;n++)if(e[n]===t)return n;return-1},te="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",ne="[\\x20\\t\\r\\n\\f]",re="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",ie="\\["+ne+"*("+re+")(?:"+ne+"*([*^$|!~]?=)"+ne+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+re+"))|)"+ne+"*\\]",oe=":("+re+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+ie+")*)|.*)\\)|)",ae=new RegExp(ne+"+","g"),se=new RegExp("^"+ne+"+|((?:^|[^\\\\])(?:\\\\.)*)"+ne+"+$","g"),ue=new RegExp("^"+ne+"*,"+ne+"*"),le=new RegExp("^"+ne+"*([>+~]|"+ne+")"+ne+"*"),ce=new RegExp("="+ne+"*([^\\]'\"]*?)"+ne+"*\\]","g"),fe=new RegExp(oe),de=new RegExp("^"+re+"$"),pe={ID:new RegExp("^#("+re+")"),CLASS:new RegExp("^\\.("+re+")"),TAG:new RegExp("^("+re+"|[*])"),ATTR:new RegExp("^"+ie),PSEUDO:new RegExp("^"+oe),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+ne+"*(even|odd|(([+-]|)(\\d*)n|)"+ne+"*(?:([+-]|)"+ne+"*(\\d+)|))"+ne+"*\\)|)","i"),bool:new RegExp("^(?:"+te+")$","i"),needsContext:new RegExp("^"+ne+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+ne+"*((?:-\\d)?\\d*)"+ne+"*\\)|)(?=[^-]|$)","i")},he=/^(?:input|select|textarea|button)$/i,ge=/^h\d$/i,me=/^[^{]+\{\s*\[native \w/,ye=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ve=/[+~]/,xe=/'|\\/g,be=new RegExp("\\\\([\\da-f]{1,6}"+ne+"?|("+ne+")|.)","ig"),we=function(e,t,n){var r="0x"+t-65536;return r!==r||n?t:r<0?String.fromCharCode(r+65536):String.fromCharCode(r>>10|55296,1023&r|56320)},Te=function(){L()};try{Q.apply(J=Z.call(B.childNodes),B.childNodes),J[B.childNodes.length].nodeType}catch(Ce){Q={apply:J.length?function(e,t){K.apply(e,Z.call(t))}:function(e,t){for(var n=e.length,r=0;e[n++]=t[r++];);e.length=n-1}}}w=t.support={},E=t.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return!!t&&"HTML"!==t.nodeName},L=t.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:B;return r!==H&&9===r.nodeType&&r.documentElement?(H=r,q=H.documentElement,_=!E(H),(n=H.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",Te,!1):n.attachEvent&&n.attachEvent("onunload",Te)),w.attributes=i(function(e){return e.className="i",!e.getAttribute("className")}),w.getElementsByTagName=i(function(e){return e.appendChild(H.createComment("")),!e.getElementsByTagName("*").length}),w.getElementsByClassName=me.test(H.getElementsByClassName),w.getById=i(function(e){return q.appendChild(e).id=P,!H.getElementsByName||!H.getElementsByName(P).length}),w.getById?(T.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&_){var n=t.getElementById(e);return n?[n]:[]}},T.filter.ID=function(e){var t=e.replace(be,we);return function(e){return e.getAttribute("id")===t}}):(delete T.find.ID,T.filter.ID=function(e){var t=e.replace(be,we);return function(e){var n="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return n&&n.value===t}}),T.find.TAG=w.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):w.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){for(;n=o[i++];)1===n.nodeType&&r.push(n);return r}return o},T.find.CLASS=w.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&_)return t.getElementsByClassName(e)},M=[],F=[],(w.qsa=me.test(H.querySelectorAll))&&(i(function(e){q.appendChild(e).innerHTML="<a id='"+P+"'></a><select id='"+P+"-\r\\' msallowcapture=''><option selected=''></option></select>",e.querySelectorAll("[msallowcapture^='']").length&&F.push("[*^$]="+ne+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||F.push("\\["+ne+"*(?:value|"+te+")"),e.querySelectorAll("[id~="+P+"-]").length||F.push("~="),e.querySelectorAll(":checked").length||F.push(":checked"),e.querySelectorAll("a#"+P+"+*").length||F.push(".#.+[+~]")}),i(function(e){var t=H.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&F.push("name"+ne+"*[*^$|!~]?="),e.querySelectorAll(":enabled").length||F.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),F.push(",.*:")})),(w.matchesSelector=me.test(O=q.matches||q.webkitMatchesSelector||q.mozMatchesSelector||q.oMatchesSelector||q.msMatchesSelector))&&i(function(e){w.disconnectedMatch=O.call(e,"div"),O.call(e,"[s!='']:x"),M.push("!=",oe)}),F=F.length&&new RegExp(F.join("|")),M=M.length&&new RegExp(M.join("|")),t=me.test(q.compareDocumentPosition),R=t||me.test(q.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)for(;t=t.parentNode;)if(t===e)return!0;return!1},U=t?function(e,t){if(e===t)return j=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n?n:(n=(e.ownerDocument||e)===(t.ownerDocument||t)?e.compareDocumentPosition(t):1,1&n||!w.sortDetached&&t.compareDocumentPosition(e)===n?e===H||e.ownerDocument===B&&R(B,e)?-1:t===H||t.ownerDocument===B&&R(B,t)?1:D?ee(D,e)-ee(D,t):0:4&n?-1:1)}:function(e,t){if(e===t)return j=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,s=[e],u=[t];if(!i||!o)return e===H?-1:t===H?1:i?-1:o?1:D?ee(D,e)-ee(D,t):0;if(i===o)return a(e,t);for(n=e;n=n.parentNode;)s.unshift(n);for(n=t;n=n.parentNode;)u.unshift(n);for(;s[r]===u[r];)r++;return r?a(s[r],u[r]):s[r]===B?-1:u[r]===B?1:0},H):H},t.matches=function(e,n){return t(e,null,null,n)},t.matchesSelector=function(e,n){if((e.ownerDocument||e)!==H&&L(e),n=n.replace(ce,"='$1']"),w.matchesSelector&&_&&!X[n+" "]&&(!M||!M.test(n))&&(!F||!F.test(n)))try{var r=O.call(e,n);if(r||w.disconnectedMatch||e.document&&11!==e.document.nodeType)return r}catch(i){}return t(n,H,null,[e]).length>0},t.contains=function(e,t){return(e.ownerDocument||e)!==H&&L(e),R(e,t)},t.attr=function(e,t){(e.ownerDocument||e)!==H&&L(e);var n=T.attrHandle[t.toLowerCase()],r=n&&Y.call(T.attrHandle,t.toLowerCase())?n(e,t,!_):void 0;return void 0!==r?r:w.attributes||!_?e.getAttribute(t):(r=e.getAttributeNode(t))&&r.specified?r.value:null},t.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},t.uniqueSort=function(e){var t,n=[],r=0,i=0;if(j=!w.detectDuplicates,D=!w.sortStable&&e.slice(0),e.sort(U),j){for(;t=e[i++];)t===e[i]&&(r=n.push(i));for(;r--;)e.splice(n[r],1)}return D=null,e},C=t.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=C(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r++];)n+=C(t);return n},T=t.selectors={cacheLength:50,createPseudo:r,match:pe,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(be,we),e[3]=(e[3]||e[4]||e[5]||"").replace(be,we),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||t.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&t.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return pe.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&fe.test(n)&&(t=N(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(be,we).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=$[e+" "];return t||(t=new RegExp("(^|"+ne+")"+e+"("+ne+"|$)"))&&$(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(e,n,r){return function(i){var o=t.attr(i,e);return null==o?"!="===n:!n||(o+="","="===n?o===r:"!="===n?o!==r:"^="===n?r&&0===o.indexOf(r):"*="===n?r&&o.indexOf(r)>-1:"$="===n?r&&o.slice(-r.length)===r:"~="===n?(" "+o.replace(ae," ")+" ").indexOf(r)>-1:"|="===n&&(o===r||o.slice(0,r.length+1)===r+"-"))}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,u){var l,c,f,d,p,h,g=o!==a?"nextSibling":"previousSibling",m=t.parentNode,y=s&&t.nodeName.toLowerCase(),v=!u&&!s,x=!1;if(m){if(o){for(;g;){for(d=t;d=d[g];)if(s?d.nodeName.toLowerCase()===y:1===d.nodeType)return!1;h=g="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?m.firstChild:m.lastChild],a&&v){for(d=m,f=d[P]||(d[P]={}),c=f[d.uniqueID]||(f[d.uniqueID]={}),l=c[e]||[],p=l[0]===W&&l[1],x=p&&l[2],
+d=p&&m.childNodes[p];d=++p&&d&&d[g]||(x=p=0)||h.pop();)if(1===d.nodeType&&++x&&d===t){c[e]=[W,p,x];break}}else if(v&&(d=t,f=d[P]||(d[P]={}),c=f[d.uniqueID]||(f[d.uniqueID]={}),l=c[e]||[],p=l[0]===W&&l[1],x=p),x===!1)for(;(d=++p&&d&&d[g]||(x=p=0)||h.pop())&&((s?d.nodeName.toLowerCase()!==y:1!==d.nodeType)||!++x||(v&&(f=d[P]||(d[P]={}),c=f[d.uniqueID]||(f[d.uniqueID]={}),c[e]=[W,x]),d!==t)););return x-=i,x===r||x%r===0&&x/r>=0}}},PSEUDO:function(e,n){var i,o=T.pseudos[e]||T.setFilters[e.toLowerCase()]||t.error("unsupported pseudo: "+e);return o[P]?o(n):o.length>1?(i=[e,e,"",n],T.setFilters.hasOwnProperty(e.toLowerCase())?r(function(e,t){for(var r,i=o(e,n),a=i.length;a--;)r=ee(e,i[a]),e[r]=!(t[r]=i[a])}):function(e){return o(e,0,i)}):o}},pseudos:{not:r(function(e){var t=[],n=[],i=k(e.replace(se,"$1"));return i[P]?r(function(e,t,n,r){for(var o,a=i(e,null,r,[]),s=e.length;s--;)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,r,o){return t[0]=e,i(t,null,o,n),t[0]=null,!n.pop()}}),has:r(function(e){return function(n){return t(e,n).length>0}}),contains:r(function(e){return e=e.replace(be,we),function(t){return(t.textContent||t.innerText||C(t)).indexOf(e)>-1}}),lang:r(function(e){return de.test(e||"")||t.error("unsupported lang: "+e),e=e.replace(be,we).toLowerCase(),function(t){var n;do if(n=_?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang"))return n=n.toLowerCase(),n===e||0===n.indexOf(e+"-");while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===q},focus:function(e){return e===H.activeElement&&(!H.hasFocus||H.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!T.pseudos.empty(e)},header:function(e){return ge.test(e.nodeName)},input:function(e){return he.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:l(function(){return[0]}),last:l(function(e,t){return[t-1]}),eq:l(function(e,t,n){return[n<0?n+t:n]}),even:l(function(e,t){for(var n=0;n<t;n+=2)e.push(n);return e}),odd:l(function(e,t){for(var n=1;n<t;n+=2)e.push(n);return e}),lt:l(function(e,t,n){for(var r=n<0?n+t:n;--r>=0;)e.push(r);return e}),gt:l(function(e,t,n){for(var r=n<0?n+t:n;++r<t;)e.push(r);return e})}},T.pseudos.nth=T.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})T.pseudos[b]=s(b);for(b in{submit:!0,reset:!0})T.pseudos[b]=u(b);return f.prototype=T.filters=T.pseudos,T.setFilters=new f,N=t.tokenize=function(e,n){var r,i,o,a,s,u,l,c=z[e+" "];if(c)return n?0:c.slice(0);for(s=e,u=[],l=T.preFilter;s;){r&&!(i=ue.exec(s))||(i&&(s=s.slice(i[0].length)||s),u.push(o=[])),r=!1,(i=le.exec(s))&&(r=i.shift(),o.push({value:r,type:i[0].replace(se," ")}),s=s.slice(r.length));for(a in T.filter)!(i=pe[a].exec(s))||l[a]&&!(i=l[a](i))||(r=i.shift(),o.push({value:r,type:a,matches:i}),s=s.slice(r.length));if(!r)break}return n?s.length:s?t.error(e):z(e,u).slice(0)},k=t.compile=function(e,t){var n,r=[],i=[],o=X[e+" "];if(!o){for(t||(t=N(e)),n=t.length;n--;)o=v(t[n]),o[P]?r.push(o):i.push(o);o=X(e,x(i,r)),o.selector=e}return o},S=t.select=function(e,t,n,r){var i,o,a,s,u,l="function"==typeof e&&e,f=!r&&N(e=l.selector||e);if(n=n||[],1===f.length){if(o=f[0]=f[0].slice(0),o.length>2&&"ID"===(a=o[0]).type&&w.getById&&9===t.nodeType&&_&&T.relative[o[1].type]){if(t=(T.find.ID(a.matches[0].replace(be,we),t)||[])[0],!t)return n;l&&(t=t.parentNode),e=e.slice(o.shift().value.length)}for(i=pe.needsContext.test(e)?0:o.length;i--&&(a=o[i],!T.relative[s=a.type]);)if((u=T.find[s])&&(r=u(a.matches[0].replace(be,we),ve.test(o[0].type)&&c(t.parentNode)||t))){if(o.splice(i,1),e=r.length&&d(o),!e)return Q.apply(n,r),n;break}}return(l||k(e,f))(r,t,!_,n,!t||ve.test(e)&&c(t.parentNode)||t),n},w.sortStable=P.split("").sort(U).join("")===P,w.detectDuplicates=!!j,L(),w.sortDetached=i(function(e){return 1&e.compareDocumentPosition(H.createElement("div"))}),i(function(e){return e.innerHTML="<a href='#'></a>","#"===e.firstChild.getAttribute("href")})||o("type|href|height|width",function(e,t,n){if(!n)return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),w.attributes&&i(function(e){return e.innerHTML="<input/>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||o("value",function(e,t,n){if(!n&&"input"===e.nodeName.toLowerCase())return e.defaultValue}),i(function(e){return null==e.getAttribute("disabled")})||o(te,function(e,t,n){var r;if(!n)return e[t]===!0?t.toLowerCase():(r=e.getAttributeNode(t))&&r.specified?r.value:null}),t}(e);pe.find=ve,pe.expr=ve.selectors,pe.expr[":"]=pe.expr.pseudos,pe.uniqueSort=pe.unique=ve.uniqueSort,pe.text=ve.getText,pe.isXMLDoc=ve.isXML,pe.contains=ve.contains;var xe=function(e,t,n){for(var r=[],i=void 0!==n;(e=e[t])&&9!==e.nodeType;)if(1===e.nodeType){if(i&&pe(e).is(n))break;r.push(e)}return r},be=function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},we=pe.expr.match.needsContext,Te=/^<([\w-]+)\s*\/?>(?:<\/\1>|)$/,Ce=/^.[^:#\[\.,]*$/;pe.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?pe.find.matchesSelector(r,e)?[r]:[]:pe.find.matches(e,pe.grep(t,function(e){return 1===e.nodeType}))},pe.fn.extend({find:function(e){var t,n=[],r=this,i=r.length;if("string"!=typeof e)return this.pushStack(pe(e).filter(function(){for(t=0;t<i;t++)if(pe.contains(r[t],this))return!0}));for(t=0;t<i;t++)pe.find(e,r[t],n);return n=this.pushStack(i>1?pe.unique(n):n),n.selector=this.selector?this.selector+" "+e:e,n},filter:function(e){return this.pushStack(r(this,e||[],!1))},not:function(e){return this.pushStack(r(this,e||[],!0))},is:function(e){return!!r(this,"string"==typeof e&&we.test(e)?pe(e):e||[],!1).length}});var Ee,Ne=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,ke=pe.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||Ee,"string"==typeof e){if(r="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:Ne.exec(e),!r||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof pe?t[0]:t,pe.merge(this,pe.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:re,!0)),Te.test(r[1])&&pe.isPlainObject(t))for(r in t)pe.isFunction(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}if(i=re.getElementById(r[2]),i&&i.parentNode){if(i.id!==r[2])return Ee.find(e);this.length=1,this[0]=i}return this.context=re,this.selector=e,this}return e.nodeType?(this.context=this[0]=e,this.length=1,this):pe.isFunction(e)?"undefined"!=typeof n.ready?n.ready(e):e(pe):(void 0!==e.selector&&(this.selector=e.selector,this.context=e.context),pe.makeArray(e,this))};ke.prototype=pe.fn,Ee=pe(re);var Se=/^(?:parents|prev(?:Until|All))/,Ae={children:!0,contents:!0,next:!0,prev:!0};pe.fn.extend({has:function(e){var t,n=pe(e,this),r=n.length;return this.filter(function(){for(t=0;t<r;t++)if(pe.contains(this,n[t]))return!0})},closest:function(e,t){for(var n,r=0,i=this.length,o=[],a=we.test(e)||"string"!=typeof e?pe(e,t||this.context):0;r<i;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(n.nodeType<11&&(a?a.index(n)>-1:1===n.nodeType&&pe.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(o.length>1?pe.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?pe.inArray(this[0],pe(e)):pe.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(pe.uniqueSort(pe.merge(this.get(),pe(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),pe.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return xe(e,"parentNode")},parentsUntil:function(e,t,n){return xe(e,"parentNode",n)},next:function(e){return i(e,"nextSibling")},prev:function(e){return i(e,"previousSibling")},nextAll:function(e){return xe(e,"nextSibling")},prevAll:function(e){return xe(e,"previousSibling")},nextUntil:function(e,t,n){return xe(e,"nextSibling",n)},prevUntil:function(e,t,n){return xe(e,"previousSibling",n)},siblings:function(e){return be((e.parentNode||{}).firstChild,e)},children:function(e){return be(e.firstChild)},contents:function(e){return pe.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:pe.merge([],e.childNodes)}},function(e,t){pe.fn[e]=function(n,r){var i=pe.map(this,t,n);return"Until"!==e.slice(-5)&&(r=n),r&&"string"==typeof r&&(i=pe.filter(r,i)),this.length>1&&(Ae[e]||(i=pe.uniqueSort(i)),Se.test(e)&&(i=i.reverse())),this.pushStack(i)}});var De=/\S+/g;pe.Callbacks=function(e){e="string"==typeof e?o(e):pe.extend({},e);var t,n,r,i,a=[],s=[],u=-1,l=function(){for(i=e.once,r=t=!0;s.length;u=-1)for(n=s.shift();++u<a.length;)a[u].apply(n[0],n[1])===!1&&e.stopOnFalse&&(u=a.length,n=!1);e.memory||(n=!1),t=!1,i&&(a=n?[]:"")},c={add:function(){return a&&(n&&!t&&(u=a.length-1,s.push(n)),function r(t){pe.each(t,function(t,n){pe.isFunction(n)?e.unique&&c.has(n)||a.push(n):n&&n.length&&"string"!==pe.type(n)&&r(n)})}(arguments),n&&!t&&l()),this},remove:function(){return pe.each(arguments,function(e,t){for(var n;(n=pe.inArray(t,a,n))>-1;)a.splice(n,1),n<=u&&u--}),this},has:function(e){return e?pe.inArray(e,a)>-1:a.length>0},empty:function(){return a&&(a=[]),this},disable:function(){return i=s=[],a=n="",this},disabled:function(){return!a},lock:function(){return i=!0,n||c.disable(),this},locked:function(){return!!i},fireWith:function(e,n){return i||(n=n||[],n=[e,n.slice?n.slice():n],s.push(n),t||l()),this},fire:function(){return c.fireWith(this,arguments),this},fired:function(){return!!r}};return c},pe.extend({Deferred:function(e){var t=[["resolve","done",pe.Callbacks("once memory"),"resolved"],["reject","fail",pe.Callbacks("once memory"),"rejected"],["notify","progress",pe.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return pe.Deferred(function(n){pe.each(t,function(t,o){var a=pe.isFunction(e[t])&&e[t];i[o[1]](function(){var e=a&&a.apply(this,arguments);e&&pe.isFunction(e.promise)?e.promise().progress(n.notify).done(n.resolve).fail(n.reject):n[o[0]+"With"](this===r?n.promise():this,a?[e]:arguments)})}),e=null}).promise()},promise:function(e){return null!=e?pe.extend(e,r):r}},i={};return r.pipe=r.then,pe.each(t,function(e,o){var a=o[2],s=o[3];r[o[1]]=a.add,s&&a.add(function(){n=s},t[1^e][2].disable,t[2][2].lock),i[o[0]]=function(){return i[o[0]+"With"](this===i?r:this,arguments),this},i[o[0]+"With"]=a.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t,n,r,i=0,o=ie.call(arguments),a=o.length,s=1!==a||e&&pe.isFunction(e.promise)?a:0,u=1===s?e:pe.Deferred(),l=function(e,n,r){return function(i){n[e]=this,r[e]=arguments.length>1?ie.call(arguments):i,r===t?u.notifyWith(n,r):--s||u.resolveWith(n,r)}};if(a>1)for(t=new Array(a),n=new Array(a),r=new Array(a);i<a;i++)o[i]&&pe.isFunction(o[i].promise)?o[i].promise().progress(l(i,n,t)).done(l(i,r,o)).fail(u.reject):--s;return s||u.resolveWith(r,o),u.promise()}});var je;pe.fn.ready=function(e){return pe.ready.promise().done(e),this},pe.extend({isReady:!1,readyWait:1,holdReady:function(e){e?pe.readyWait++:pe.ready(!0)},ready:function(e){(e===!0?--pe.readyWait:pe.isReady)||(pe.isReady=!0,e!==!0&&--pe.readyWait>0||(je.resolveWith(re,[pe]),pe.fn.triggerHandler&&(pe(re).triggerHandler("ready"),pe(re).off("ready"))))}}),pe.ready.promise=function(t){if(!je)if(je=pe.Deferred(),"complete"===re.readyState||"loading"!==re.readyState&&!re.documentElement.doScroll)e.setTimeout(pe.ready);else if(re.addEventListener)re.addEventListener("DOMContentLoaded",s),e.addEventListener("load",s);else{re.attachEvent("onreadystatechange",s),e.attachEvent("onload",s);var n=!1;try{n=null==e.frameElement&&re.documentElement}catch(r){}n&&n.doScroll&&!function i(){if(!pe.isReady){try{n.doScroll("left")}catch(t){return e.setTimeout(i,50)}a(),pe.ready()}}()}return je.promise(t)},pe.ready.promise();var Le;for(Le in pe(fe))break;fe.ownFirst="0"===Le,fe.inlineBlockNeedsLayout=!1,pe(function(){var e,t,n,r;n=re.getElementsByTagName("body")[0],n&&n.style&&(t=re.createElement("div"),r=re.createElement("div"),r.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",n.appendChild(r).appendChild(t),"undefined"!=typeof t.style.zoom&&(t.style.cssText="display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1",fe.inlineBlockNeedsLayout=e=3===t.offsetWidth,e&&(n.style.zoom=1)),n.removeChild(r))}),function(){var e=re.createElement("div");fe.deleteExpando=!0;try{delete e.test}catch(t){fe.deleteExpando=!1}e=null}();var He=function(e){var t=pe.noData[(e.nodeName+" ").toLowerCase()],n=+e.nodeType||1;return(1===n||9===n)&&(!t||t!==!0&&e.getAttribute("classid")===t)},qe=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,_e=/([A-Z])/g;pe.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(e){return e=e.nodeType?pe.cache[e[pe.expando]]:e[pe.expando],!!e&&!l(e)},data:function(e,t,n){return c(e,t,n)},removeData:function(e,t){return f(e,t)},_data:function(e,t,n){return c(e,t,n,!0)},_removeData:function(e,t){return f(e,t,!0)}}),pe.fn.extend({data:function(e,t){var n,r,i,o=this[0],a=o&&o.attributes;if(void 0===e){if(this.length&&(i=pe.data(o),1===o.nodeType&&!pe._data(o,"parsedAttrs"))){for(n=a.length;n--;)a[n]&&(r=a[n].name,0===r.indexOf("data-")&&(r=pe.camelCase(r.slice(5)),u(o,r,i[r])));pe._data(o,"parsedAttrs",!0)}return i}return"object"==typeof e?this.each(function(){pe.data(this,e)}):arguments.length>1?this.each(function(){pe.data(this,e,t)}):o?u(o,e,pe.data(o,e)):void 0},removeData:function(e){return this.each(function(){pe.removeData(this,e)})}}),pe.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=pe._data(e,t),n&&(!r||pe.isArray(n)?r=pe._data(e,t,pe.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=pe.queue(e,t),r=n.length,i=n.shift(),o=pe._queueHooks(e,t),a=function(){pe.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,a,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return pe._data(e,n)||pe._data(e,n,{empty:pe.Callbacks("once memory").add(function(){pe._removeData(e,t+"queue"),pe._removeData(e,n)})})}}),pe.fn.extend({queue:function(e,t){var n=2;return"string"!=typeof e&&(t=e,e="fx",n--),arguments.length<n?pe.queue(this[0],e):void 0===t?this:this.each(function(){var n=pe.queue(this,e,t);pe._queueHooks(this,e),"fx"===e&&"inprogress"!==n[0]&&pe.dequeue(this,e)})},dequeue:function(e){return this.each(function(){pe.dequeue(this,e)})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,t){var n,r=1,i=pe.Deferred(),o=this,a=this.length,s=function(){--r||i.resolveWith(o,[o])};for("string"!=typeof e&&(t=e,e=void 0),e=e||"fx";a--;)n=pe._data(o[a],e+"queueHooks"),n&&n.empty&&(r++,n.empty.add(s));return s(),i.promise(t)}}),function(){var e;fe.shrinkWrapBlocks=function(){if(null!=e)return e;e=!1;var t,n,r;return n=re.getElementsByTagName("body")[0],n&&n.style?(t=re.createElement("div"),r=re.createElement("div"),r.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",n.appendChild(r).appendChild(t),"undefined"!=typeof t.style.zoom&&(t.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:1px;width:1px;zoom:1",t.appendChild(re.createElement("div")).style.width="5px",e=3!==t.offsetWidth),n.removeChild(r),e):void 0}}();var Fe=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,Me=new RegExp("^(?:([+-])=|)("+Fe+")([a-z%]*)$","i"),Oe=["Top","Right","Bottom","Left"],Re=function(e,t){return e=t||e,"none"===pe.css(e,"display")||!pe.contains(e.ownerDocument,e)},Pe=function(e,t,n,r,i,o,a){var s=0,u=e.length,l=null==n;if("object"===pe.type(n)){i=!0;for(s in n)Pe(e,t,s,n[s],!0,o,a)}else if(void 0!==r&&(i=!0,pe.isFunction(r)||(a=!0),l&&(a?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(pe(e),n)})),t))for(;s<u;s++)t(e[s],n,a?r:r.call(e[s],s,t(e[s],n)));return i?e:l?t.call(e):u?t(e[0],n):o},Be=/^(?:checkbox|radio)$/i,We=/<([\w:-]+)/,Ie=/^$|\/(?:java|ecma)script/i,$e=/^\s+/,ze="abbr|article|aside|audio|bdi|canvas|data|datalist|details|dialog|figcaption|figure|footer|header|hgroup|main|mark|meter|nav|output|picture|progress|section|summary|template|time|video";!function(){var e=re.createElement("div"),t=re.createDocumentFragment(),n=re.createElement("input");e.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",fe.leadingWhitespace=3===e.firstChild.nodeType,fe.tbody=!e.getElementsByTagName("tbody").length,fe.htmlSerialize=!!e.getElementsByTagName("link").length,fe.html5Clone="<:nav></:nav>"!==re.createElement("nav").cloneNode(!0).outerHTML,n.type="checkbox",n.checked=!0,t.appendChild(n),fe.appendChecked=n.checked,e.innerHTML="<textarea>x</textarea>",fe.noCloneChecked=!!e.cloneNode(!0).lastChild.defaultValue,t.appendChild(e),n=re.createElement("input"),n.setAttribute("type","radio"),n.setAttribute("checked","checked"),n.setAttribute("name","t"),e.appendChild(n),fe.checkClone=e.cloneNode(!0).cloneNode(!0).lastChild.checked,fe.noCloneEvent=!!e.addEventListener,e[pe.expando]=1,fe.attributes=!e.getAttribute(pe.expando)}();var Xe={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:fe.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]};Xe.optgroup=Xe.option,Xe.tbody=Xe.tfoot=Xe.colgroup=Xe.caption=Xe.thead,Xe.th=Xe.td;var Ue=/<|&#?\w+;/,Ve=/<tbody/i;!function(){var t,n,r=re.createElement("div");for(t in{submit:!0,change:!0,focusin:!0})n="on"+t,(fe[t]=n in e)||(r.setAttribute(n,"t"),fe[t]=r.attributes[n].expando===!1);r=null}();var Ye=/^(?:input|select|textarea)$/i,Je=/^key/,Ge=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,Ke=/^(?:focusinfocus|focusoutblur)$/,Qe=/^([^.]*)(?:\.(.+)|)/;pe.event={global:{},add:function(e,t,n,r,i){var o,a,s,u,l,c,f,d,p,h,g,m=pe._data(e);if(m){for(n.handler&&(u=n,n=u.handler,i=u.selector),n.guid||(n.guid=pe.guid++),(a=m.events)||(a=m.events={}),(c=m.handle)||(c=m.handle=function(e){return"undefined"==typeof pe||e&&pe.event.triggered===e.type?void 0:pe.event.dispatch.apply(c.elem,arguments)},c.elem=e),t=(t||"").match(De)||[""],s=t.length;s--;)o=Qe.exec(t[s])||[],p=g=o[1],h=(o[2]||"").split(".").sort(),p&&(l=pe.event.special[p]||{},p=(i?l.delegateType:l.bindType)||p,l=pe.event.special[p]||{},f=pe.extend({type:p,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&pe.expr.match.needsContext.test(i),namespace:h.join(".")},u),(d=a[p])||(d=a[p]=[],d.delegateCount=0,l.setup&&l.setup.call(e,r,h,c)!==!1||(e.addEventListener?e.addEventListener(p,c,!1):e.attachEvent&&e.attachEvent("on"+p,c))),l.add&&(l.add.call(e,f),f.handler.guid||(f.handler.guid=n.guid)),i?d.splice(d.delegateCount++,0,f):d.push(f),pe.event.global[p]=!0);e=null}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,d,p,h,g,m=pe.hasData(e)&&pe._data(e);if(m&&(c=m.events)){for(t=(t||"").match(De)||[""],l=t.length;l--;)if(s=Qe.exec(t[l])||[],p=g=s[1],h=(s[2]||"").split(".").sort(),p){for(f=pe.event.special[p]||{},p=(r?f.delegateType:f.bindType)||p,d=c[p]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),u=o=d.length;o--;)a=d[o],!i&&g!==a.origType||n&&n.guid!==a.guid||s&&!s.test(a.namespace)||r&&r!==a.selector&&("**"!==r||!a.selector)||(d.splice(o,1),a.selector&&d.delegateCount--,f.remove&&f.remove.call(e,a));u&&!d.length&&(f.teardown&&f.teardown.call(e,h,m.handle)!==!1||pe.removeEvent(e,p,m.handle),delete c[p])}else for(p in c)pe.event.remove(e,p+t[l],n,r,!0);pe.isEmptyObject(c)&&(delete m.handle,pe._removeData(e,"events"))}},trigger:function(t,n,r,i){var o,a,s,u,l,c,f,d=[r||re],p=ce.call(t,"type")?t.type:t,h=ce.call(t,"namespace")?t.namespace.split("."):[];if(s=c=r=r||re,3!==r.nodeType&&8!==r.nodeType&&!Ke.test(p+pe.event.triggered)&&(p.indexOf(".")>-1&&(h=p.split("."),p=h.shift(),h.sort()),a=p.indexOf(":")<0&&"on"+p,t=t[pe.expando]?t:new pe.Event(p,"object"==typeof t&&t),t.isTrigger=i?2:3,t.namespace=h.join("."),t.rnamespace=t.namespace?new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,t.result=void 0,t.target||(t.target=r),n=null==n?[t]:pe.makeArray(n,[t]),l=pe.event.special[p]||{},i||!l.trigger||l.trigger.apply(r,n)!==!1)){if(!i&&!l.noBubble&&!pe.isWindow(r)){for(u=l.delegateType||p,Ke.test(u+p)||(s=s.parentNode);s;s=s.parentNode)d.push(s),c=s;c===(r.ownerDocument||re)&&d.push(c.defaultView||c.parentWindow||e)}for(f=0;(s=d[f++])&&!t.isPropagationStopped();)t.type=f>1?u:l.bindType||p,o=(pe._data(s,"events")||{})[t.type]&&pe._data(s,"handle"),o&&o.apply(s,n),o=a&&s[a],o&&o.apply&&He(s)&&(t.result=o.apply(s,n),t.result===!1&&t.preventDefault());if(t.type=p,!i&&!t.isDefaultPrevented()&&(!l._default||l._default.apply(d.pop(),n)===!1)&&He(r)&&a&&r[p]&&!pe.isWindow(r)){c=r[a],c&&(r[a]=null),pe.event.triggered=p;try{r[p]()}catch(g){}pe.event.triggered=void 0,c&&(r[a]=c)}return t.result}},dispatch:function(e){e=pe.event.fix(e);var t,n,r,i,o,a=[],s=ie.call(arguments),u=(pe._data(this,"events")||{})[e.type]||[],l=pe.event.special[e.type]||{};if(s[0]=e,e.delegateTarget=this,!l.preDispatch||l.preDispatch.call(this,e)!==!1){for(a=pe.event.handlers.call(this,e,u),t=0;(i=a[t++])&&!e.isPropagationStopped();)for(e.currentTarget=i.elem,n=0;(o=i.handlers[n++])&&!e.isImmediatePropagationStopped();)e.rnamespace&&!e.rnamespace.test(o.namespace)||(e.handleObj=o,e.data=o.data,r=((pe.event.special[o.origType]||{}).handle||o.handler).apply(i.elem,s),void 0!==r&&(e.result=r)===!1&&(e.preventDefault(),e.stopPropagation()));return l.postDispatch&&l.postDispatch.call(this,e),e.result}},handlers:function(e,t){var n,r,i,o,a=[],s=t.delegateCount,u=e.target;if(s&&u.nodeType&&("click"!==e.type||isNaN(e.button)||e.button<1))for(;u!=this;u=u.parentNode||this)if(1===u.nodeType&&(u.disabled!==!0||"click"!==e.type)){for(r=[],n=0;n<s;n++)o=t[n],i=o.selector+" ",void 0===r[i]&&(r[i]=o.needsContext?pe(i,this).index(u)>-1:pe.find(i,this,null,[u]).length),r[i]&&r.push(o);r.length&&a.push({elem:u,handlers:r})}return s<t.length&&a.push({elem:this,handlers:t.slice(s)}),a},fix:function(e){if(e[pe.expando])return e;var t,n,r,i=e.type,o=e,a=this.fixHooks[i];for(a||(this.fixHooks[i]=a=Ge.test(i)?this.mouseHooks:Je.test(i)?this.keyHooks:{}),r=a.props?this.props.concat(a.props):this.props,e=new pe.Event(o),t=r.length;t--;)n=r[t],e[n]=o[n];return e.target||(e.target=o.srcElement||re),3===e.target.nodeType&&(e.target=e.target.parentNode),e.metaKey=!!e.metaKey,a.filter?a.filter(e,o):e},props:"altKey bubbles cancelable ctrlKey currentTarget detail eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return null==e.which&&(e.which=null!=t.charCode?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,t){var n,r,i,o=t.button,a=t.fromElement;return null==e.pageX&&null!=t.clientX&&(r=e.target.ownerDocument||re,i=r.documentElement,n=r.body,e.pageX=t.clientX+(i&&i.scrollLeft||n&&n.scrollLeft||0)-(i&&i.clientLeft||n&&n.clientLeft||0),e.pageY=t.clientY+(i&&i.scrollTop||n&&n.scrollTop||0)-(i&&i.clientTop||n&&n.clientTop||0)),!e.relatedTarget&&a&&(e.relatedTarget=a===e.target?t.toElement:a),e.which||void 0===o||(e.which=1&o?1:2&o?3:4&o?2:0),e}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==b()&&this.focus)try{return this.focus(),!1}catch(e){}},delegateType:"focusin"},blur:{trigger:function(){if(this===b()&&this.blur)return this.blur(),!1},delegateType:"focusout"},click:{trigger:function(){if(pe.nodeName(this,"input")&&"checkbox"===this.type&&this.click)return this.click(),!1},_default:function(e){return pe.nodeName(e.target,"a")}},beforeunload:{postDispatch:function(e){void 0!==e.result&&e.originalEvent&&(e.originalEvent.returnValue=e.result)}}},simulate:function(e,t,n){var r=pe.extend(new pe.Event,n,{type:e,isSimulated:!0});pe.event.trigger(r,null,t),r.isDefaultPrevented()&&n.preventDefault()}},pe.removeEvent=re.removeEventListener?function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n)}:function(e,t,n){var r="on"+t;e.detachEvent&&("undefined"==typeof e[r]&&(e[r]=null),e.detachEvent(r,n))},pe.Event=function(e,t){return this instanceof pe.Event?(e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||void 0===e.defaultPrevented&&e.returnValue===!1?v:x):this.type=e,t&&pe.extend(this,t),this.timeStamp=e&&e.timeStamp||pe.now(),void(this[pe.expando]=!0)):new pe.Event(e,t)},pe.Event.prototype={constructor:pe.Event,isDefaultPrevented:x,isPropagationStopped:x,isImmediatePropagationStopped:x,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=v,e&&(e.preventDefault?e.preventDefault():e.returnValue=!1)},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=v,e&&!this.isSimulated&&(e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0)},stopImmediatePropagation:function(){var e=this.originalEvent;this.isImmediatePropagationStopped=v,e&&e.stopImmediatePropagation&&e.stopImmediatePropagation(),this.stopPropagation()}},pe.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(e,t){pe.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,o=e.handleObj;return i&&(i===r||pe.contains(r,i))||(e.type=o.origType,n=o.handler.apply(this,arguments),e.type=t),n}}}),fe.submit||(pe.event.special.submit={setup:function(){return!pe.nodeName(this,"form")&&void pe.event.add(this,"click._submit keypress._submit",function(e){var t=e.target,n=pe.nodeName(t,"input")||pe.nodeName(t,"button")?pe.prop(t,"form"):void 0;n&&!pe._data(n,"submit")&&(pe.event.add(n,"submit._submit",function(e){e._submitBubble=!0}),pe._data(n,"submit",!0))})},postDispatch:function(e){e._submitBubble&&(delete e._submitBubble,this.parentNode&&!e.isTrigger&&pe.event.simulate("submit",this.parentNode,e))},teardown:function(){return!pe.nodeName(this,"form")&&void pe.event.remove(this,"._submit")}}),fe.change||(pe.event.special.change={setup:function(){return Ye.test(this.nodeName)?("checkbox"!==this.type&&"radio"!==this.type||(pe.event.add(this,"propertychange._change",function(e){"checked"===e.originalEvent.propertyName&&(this._justChanged=!0)}),pe.event.add(this,"click._change",function(e){this._justChanged&&!e.isTrigger&&(this._justChanged=!1),pe.event.simulate("change",this,e)})),!1):void pe.event.add(this,"beforeactivate._change",function(e){var t=e.target;Ye.test(t.nodeName)&&!pe._data(t,"change")&&(pe.event.add(t,"change._change",function(e){!this.parentNode||e.isSimulated||e.isTrigger||pe.event.simulate("change",this.parentNode,e)}),pe._data(t,"change",!0))})},handle:function(e){var t=e.target;if(this!==t||e.isSimulated||e.isTrigger||"radio"!==t.type&&"checkbox"!==t.type)return e.handleObj.handler.apply(this,arguments)},teardown:function(){return pe.event.remove(this,"._change"),!Ye.test(this.nodeName)}}),fe.focusin||pe.each({focus:"focusin",blur:"focusout"},function(e,t){var n=function(e){pe.event.simulate(t,e.target,pe.event.fix(e))};pe.event.special[t]={setup:function(){var r=this.ownerDocument||this,i=pe._data(r,t);i||r.addEventListener(e,n,!0),pe._data(r,t,(i||0)+1)},teardown:function(){var r=this.ownerDocument||this,i=pe._data(r,t)-1;i?pe._data(r,t,i):(r.removeEventListener(e,n,!0),pe._removeData(r,t))}}}),pe.fn.extend({on:function(e,t,n,r){return w(this,e,t,n,r)},one:function(e,t,n,r){return w(this,e,t,n,r,1)},off:function(e,t,n){var r,i;if(e&&e.preventDefault&&e.handleObj)return r=e.handleObj,pe(e.delegateTarget).off(r.namespace?r.origType+"."+r.namespace:r.origType,r.selector,r.handler),this;if("object"==typeof e){for(i in e)this.off(i,t,e[i]);return this}return t!==!1&&"function"!=typeof t||(n=t,t=void 0),n===!1&&(n=x),this.each(function(){pe.event.remove(this,e,n,t)})},trigger:function(e,t){return this.each(function(){pe.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];if(n)return pe.event.trigger(e,t,n,!0)}});var Ze=/ jQuery\d+="(?:null|\d+)"/g,et=new RegExp("<(?:"+ze+")[\\s/>]","i"),tt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi,nt=/<script|<style|<link/i,rt=/checked\s*(?:[^=]|=\s*.checked.)/i,it=/^true\/(.*)/,ot=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,at=p(re),st=at.appendChild(re.createElement("div"));pe.extend({htmlPrefilter:function(e){return e.replace(tt,"<$1></$2>")},clone:function(e,t,n){var r,i,o,a,s,u=pe.contains(e.ownerDocument,e);if(fe.html5Clone||pe.isXMLDoc(e)||!et.test("<"+e.nodeName+">")?o=e.cloneNode(!0):(st.innerHTML=e.outerHTML,st.removeChild(o=st.firstChild)),!(fe.noCloneEvent&&fe.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||pe.isXMLDoc(e)))for(r=h(o),s=h(e),a=0;null!=(i=s[a]);++a)r[a]&&k(i,r[a]);if(t)if(n)for(s=s||h(e),r=r||h(o),a=0;null!=(i=s[a]);a++)N(i,r[a]);else N(e,o);return r=h(o,"script"),r.length>0&&g(r,!u&&h(e,"script")),r=s=i=null,o},cleanData:function(e,t){for(var n,r,i,o,a=0,s=pe.expando,u=pe.cache,l=fe.attributes,c=pe.event.special;null!=(n=e[a]);a++)if((t||He(n))&&(i=n[s],o=i&&u[i])){if(o.events)for(r in o.events)c[r]?pe.event.remove(n,r):pe.removeEvent(n,r,o.handle);u[i]&&(delete u[i],l||"undefined"==typeof n.removeAttribute?n[s]=void 0:n.removeAttribute(s),ne.push(i))}}}),pe.fn.extend({domManip:S,detach:function(e){return A(this,e,!0)},remove:function(e){return A(this,e)},text:function(e){return Pe(this,function(e){return void 0===e?pe.text(this):this.empty().append((this[0]&&this[0].ownerDocument||re).createTextNode(e))},null,e,arguments.length)},append:function(){return S(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=T(this,e);t.appendChild(e)}})},prepend:function(){return S(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=T(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return S(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return S(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},empty:function(){for(var e,t=0;null!=(e=this[t]);t++){for(1===e.nodeType&&pe.cleanData(h(e,!1));e.firstChild;)e.removeChild(e.firstChild);e.options&&pe.nodeName(e,"select")&&(e.options.length=0)}return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map(function(){return pe.clone(this,e,t)})},html:function(e){return Pe(this,function(e){var t=this[0]||{},n=0,r=this.length;if(void 0===e)return 1===t.nodeType?t.innerHTML.replace(Ze,""):void 0;if("string"==typeof e&&!nt.test(e)&&(fe.htmlSerialize||!et.test(e))&&(fe.leadingWhitespace||!$e.test(e))&&!Xe[(We.exec(e)||["",""])[1].toLowerCase()]){e=pe.htmlPrefilter(e);try{for(;n<r;n++)t=this[n]||{},1===t.nodeType&&(pe.cleanData(h(t,!1)),t.innerHTML=e);t=0}catch(i){}}t&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var e=[];return S(this,arguments,function(t){var n=this.parentNode;pe.inArray(this,e)<0&&(pe.cleanData(h(this)),n&&n.replaceChild(t,this));
+},e)}}),pe.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){pe.fn[e]=function(e){for(var n,r=0,i=[],o=pe(e),a=o.length-1;r<=a;r++)n=r===a?this:this.clone(!0),pe(o[r])[t](n),ae.apply(i,n.get());return this.pushStack(i)}});var ut,lt={HTML:"block",BODY:"block"},ct=/^margin/,ft=new RegExp("^("+Fe+")(?!px)[a-z%]+$","i"),dt=function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];i=n.apply(e,r||[]);for(o in t)e.style[o]=a[o];return i},pt=re.documentElement;!function(){function t(){var t,c,f=re.documentElement;f.appendChild(u),l.style.cssText="-webkit-box-sizing:border-box;box-sizing:border-box;position:relative;display:block;margin:auto;border:1px;padding:1px;top:1%;width:50%",n=i=s=!1,r=a=!0,e.getComputedStyle&&(c=e.getComputedStyle(l),n="1%"!==(c||{}).top,s="2px"===(c||{}).marginLeft,i="4px"===(c||{width:"4px"}).width,l.style.marginRight="50%",r="4px"===(c||{marginRight:"4px"}).marginRight,t=l.appendChild(re.createElement("div")),t.style.cssText=l.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:0",t.style.marginRight=t.style.width="0",l.style.width="1px",a=!parseFloat((e.getComputedStyle(t)||{}).marginRight),l.removeChild(t)),l.style.display="none",o=0===l.getClientRects().length,o&&(l.style.display="",l.innerHTML="<table><tr><td></td><td>t</td></tr></table>",l.childNodes[0].style.borderCollapse="separate",t=l.getElementsByTagName("td"),t[0].style.cssText="margin:0;border:0;padding:0;display:none",o=0===t[0].offsetHeight,o&&(t[0].style.display="",t[1].style.display="none",o=0===t[0].offsetHeight)),f.removeChild(u)}var n,r,i,o,a,s,u=re.createElement("div"),l=re.createElement("div");l.style&&(l.style.cssText="float:left;opacity:.5",fe.opacity="0.5"===l.style.opacity,fe.cssFloat=!!l.style.cssFloat,l.style.backgroundClip="content-box",l.cloneNode(!0).style.backgroundClip="",fe.clearCloneStyle="content-box"===l.style.backgroundClip,u=re.createElement("div"),u.style.cssText="border:0;width:8px;height:0;top:0;left:-9999px;padding:0;margin-top:1px;position:absolute",l.innerHTML="",u.appendChild(l),fe.boxSizing=""===l.style.boxSizing||""===l.style.MozBoxSizing||""===l.style.WebkitBoxSizing,pe.extend(fe,{reliableHiddenOffsets:function(){return null==n&&t(),o},boxSizingReliable:function(){return null==n&&t(),i},pixelMarginRight:function(){return null==n&&t(),r},pixelPosition:function(){return null==n&&t(),n},reliableMarginRight:function(){return null==n&&t(),a},reliableMarginLeft:function(){return null==n&&t(),s}}))}();var ht,gt,mt=/^(top|right|bottom|left)$/;e.getComputedStyle?(ht=function(t){var n=t.ownerDocument.defaultView;return n&&n.opener||(n=e),n.getComputedStyle(t)},gt=function(e,t,n){var r,i,o,a,s=e.style;return n=n||ht(e),a=n?n.getPropertyValue(t)||n[t]:void 0,""!==a&&void 0!==a||pe.contains(e.ownerDocument,e)||(a=pe.style(e,t)),n&&!fe.pixelMarginRight()&&ft.test(a)&&ct.test(t)&&(r=s.width,i=s.minWidth,o=s.maxWidth,s.minWidth=s.maxWidth=s.width=a,a=n.width,s.width=r,s.minWidth=i,s.maxWidth=o),void 0===a?a:a+""}):pt.currentStyle&&(ht=function(e){return e.currentStyle},gt=function(e,t,n){var r,i,o,a,s=e.style;return n=n||ht(e),a=n?n[t]:void 0,null==a&&s&&s[t]&&(a=s[t]),ft.test(a)&&!mt.test(t)&&(r=s.left,i=e.runtimeStyle,o=i&&i.left,o&&(i.left=e.currentStyle.left),s.left="fontSize"===t?"1em":a,a=s.pixelLeft+"px",s.left=r,o&&(i.left=o)),void 0===a?a:a+""||"auto"});var yt=/alpha\([^)]*\)/i,vt=/opacity\s*=\s*([^)]*)/i,xt=/^(none|table(?!-c[ea]).+)/,bt=new RegExp("^("+Fe+")(.*)$","i"),wt={position:"absolute",visibility:"hidden",display:"block"},Tt={letterSpacing:"0",fontWeight:"400"},Ct=["Webkit","O","Moz","ms"],Et=re.createElement("div").style;pe.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=gt(e,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":fe.cssFloat?"cssFloat":"styleFloat"},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,a,s=pe.camelCase(t),u=e.style;if(t=pe.cssProps[s]||(pe.cssProps[s]=H(s)||s),a=pe.cssHooks[t]||pe.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(e,!1,r))?i:u[t];if(o=typeof n,"string"===o&&(i=Me.exec(n))&&i[1]&&(n=d(e,t,i),o="number"),null!=n&&n===n&&("number"===o&&(n+=i&&i[3]||(pe.cssNumber[s]?"":"px")),fe.clearCloneStyle||""!==n||0!==t.indexOf("background")||(u[t]="inherit"),!(a&&"set"in a&&void 0===(n=a.set(e,n,r)))))try{u[t]=n}catch(l){}}},css:function(e,t,n,r){var i,o,a,s=pe.camelCase(t);return t=pe.cssProps[s]||(pe.cssProps[s]=H(s)||s),a=pe.cssHooks[t]||pe.cssHooks[s],a&&"get"in a&&(o=a.get(e,!0,n)),void 0===o&&(o=gt(e,t,r)),"normal"===o&&t in Tt&&(o=Tt[t]),""===n||n?(i=parseFloat(o),n===!0||isFinite(i)?i||0:o):o}}),pe.each(["height","width"],function(e,t){pe.cssHooks[t]={get:function(e,n,r){if(n)return xt.test(pe.css(e,"display"))&&0===e.offsetWidth?dt(e,wt,function(){return M(e,t,r)}):M(e,t,r)},set:function(e,n,r){var i=r&&ht(e);return _(e,n,r?F(e,t,r,fe.boxSizing&&"border-box"===pe.css(e,"boxSizing",!1,i),i):0)}}}),fe.opacity||(pe.cssHooks.opacity={get:function(e,t){return vt.test((t&&e.currentStyle?e.currentStyle.filter:e.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":t?"1":""},set:function(e,t){var n=e.style,r=e.currentStyle,i=pe.isNumeric(t)?"alpha(opacity="+100*t+")":"",o=r&&r.filter||n.filter||"";n.zoom=1,(t>=1||""===t)&&""===pe.trim(o.replace(yt,""))&&n.removeAttribute&&(n.removeAttribute("filter"),""===t||r&&!r.filter)||(n.filter=yt.test(o)?o.replace(yt,i):o+" "+i)}}),pe.cssHooks.marginRight=L(fe.reliableMarginRight,function(e,t){if(t)return dt(e,{display:"inline-block"},gt,[e,"marginRight"])}),pe.cssHooks.marginLeft=L(fe.reliableMarginLeft,function(e,t){if(t)return(parseFloat(gt(e,"marginLeft"))||(pe.contains(e.ownerDocument,e)?e.getBoundingClientRect().left-dt(e,{marginLeft:0},function(){return e.getBoundingClientRect().left}):0))+"px"}),pe.each({margin:"",padding:"",border:"Width"},function(e,t){pe.cssHooks[e+t]={expand:function(n){for(var r=0,i={},o="string"==typeof n?n.split(" "):[n];r<4;r++)i[e+Oe[r]+t]=o[r]||o[r-2]||o[0];return i}},ct.test(e)||(pe.cssHooks[e+t].set=_)}),pe.fn.extend({css:function(e,t){return Pe(this,function(e,t,n){var r,i,o={},a=0;if(pe.isArray(t)){for(r=ht(e),i=t.length;a<i;a++)o[t[a]]=pe.css(e,t[a],!1,r);return o}return void 0!==n?pe.style(e,t,n):pe.css(e,t)},e,t,arguments.length>1)},show:function(){return q(this,!0)},hide:function(){return q(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){Re(this)?pe(this).show():pe(this).hide()})}}),pe.Tween=O,O.prototype={constructor:O,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||pe.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(pe.cssNumber[n]?"":"px")},cur:function(){var e=O.propHooks[this.prop];return e&&e.get?e.get(this):O.propHooks._default.get(this)},run:function(e){var t,n=O.propHooks[this.prop];return this.options.duration?this.pos=t=pe.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):O.propHooks._default.set(this),this}},O.prototype.init.prototype=O.prototype,O.propHooks={_default:{get:function(e){var t;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(t=pe.css(e.elem,e.prop,""),t&&"auto"!==t?t:0)},set:function(e){pe.fx.step[e.prop]?pe.fx.step[e.prop](e):1!==e.elem.nodeType||null==e.elem.style[pe.cssProps[e.prop]]&&!pe.cssHooks[e.prop]?e.elem[e.prop]=e.now:pe.style(e.elem,e.prop,e.now+e.unit)}}},O.propHooks.scrollTop=O.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},pe.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},pe.fx=O.prototype.init,pe.fx.step={};var Nt,kt,St=/^(?:toggle|show|hide)$/,At=/queueHooks$/;pe.Animation=pe.extend($,{tweeners:{"*":[function(e,t){var n=this.createTween(e,t);return d(n.elem,e,Me.exec(t),n),n}]},tweener:function(e,t){pe.isFunction(e)?(t=e,e=["*"]):e=e.match(De);for(var n,r=0,i=e.length;r<i;r++)n=e[r],$.tweeners[n]=$.tweeners[n]||[],$.tweeners[n].unshift(t)},prefilters:[W],prefilter:function(e,t){t?$.prefilters.unshift(e):$.prefilters.push(e)}}),pe.speed=function(e,t,n){var r=e&&"object"==typeof e?pe.extend({},e):{complete:n||!n&&t||pe.isFunction(e)&&e,duration:e,easing:n&&t||t&&!pe.isFunction(t)&&t};return r.duration=pe.fx.off?0:"number"==typeof r.duration?r.duration:r.duration in pe.fx.speeds?pe.fx.speeds[r.duration]:pe.fx.speeds._default,null!=r.queue&&r.queue!==!0||(r.queue="fx"),r.old=r.complete,r.complete=function(){pe.isFunction(r.old)&&r.old.call(this),r.queue&&pe.dequeue(this,r.queue)},r},pe.fn.extend({fadeTo:function(e,t,n,r){return this.filter(Re).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(e,t,n,r){var i=pe.isEmptyObject(e),o=pe.speed(t,n,r),a=function(){var t=$(this,pe.extend({},e),o);(i||pe._data(this,"finish"))&&t.stop(!0)};return a.finish=a,i||o.queue===!1?this.each(a):this.queue(o.queue,a)},stop:function(e,t,n){var r=function(e){var t=e.stop;delete e.stop,t(n)};return"string"!=typeof e&&(n=t,t=e,e=void 0),t&&e!==!1&&this.queue(e||"fx",[]),this.each(function(){var t=!0,i=null!=e&&e+"queueHooks",o=pe.timers,a=pe._data(this);if(i)a[i]&&a[i].stop&&r(a[i]);else for(i in a)a[i]&&a[i].stop&&At.test(i)&&r(a[i]);for(i=o.length;i--;)o[i].elem!==this||null!=e&&o[i].queue!==e||(o[i].anim.stop(n),t=!1,o.splice(i,1));!t&&n||pe.dequeue(this,e)})},finish:function(e){return e!==!1&&(e=e||"fx"),this.each(function(){var t,n=pe._data(this),r=n[e+"queue"],i=n[e+"queueHooks"],o=pe.timers,a=r?r.length:0;for(n.finish=!0,pe.queue(this,e,[]),i&&i.stop&&i.stop.call(this,!0),t=o.length;t--;)o[t].elem===this&&o[t].queue===e&&(o[t].anim.stop(!0),o.splice(t,1));for(t=0;t<a;t++)r[t]&&r[t].finish&&r[t].finish.call(this);delete n.finish})}}),pe.each(["toggle","show","hide"],function(e,t){var n=pe.fn[t];pe.fn[t]=function(e,r,i){return null==e||"boolean"==typeof e?n.apply(this,arguments):this.animate(P(t,!0),e,r,i)}}),pe.each({slideDown:P("show"),slideUp:P("hide"),slideToggle:P("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,t){pe.fn[e]=function(e,n,r){return this.animate(t,e,n,r)}}),pe.timers=[],pe.fx.tick=function(){var e,t=pe.timers,n=0;for(Nt=pe.now();n<t.length;n++)e=t[n],e()||t[n]!==e||t.splice(n--,1);t.length||pe.fx.stop(),Nt=void 0},pe.fx.timer=function(e){pe.timers.push(e),e()?pe.fx.start():pe.timers.pop()},pe.fx.interval=13,pe.fx.start=function(){kt||(kt=e.setInterval(pe.fx.tick,pe.fx.interval))},pe.fx.stop=function(){e.clearInterval(kt),kt=null},pe.fx.speeds={slow:600,fast:200,_default:400},pe.fn.delay=function(t,n){return t=pe.fx?pe.fx.speeds[t]||t:t,n=n||"fx",this.queue(n,function(n,r){var i=e.setTimeout(n,t);r.stop=function(){e.clearTimeout(i)}})},function(){var e,t=re.createElement("input"),n=re.createElement("div"),r=re.createElement("select"),i=r.appendChild(re.createElement("option"));n=re.createElement("div"),n.setAttribute("className","t"),n.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",e=n.getElementsByTagName("a")[0],t.setAttribute("type","checkbox"),n.appendChild(t),e=n.getElementsByTagName("a")[0],e.style.cssText="top:1px",fe.getSetAttribute="t"!==n.className,fe.style=/top/.test(e.getAttribute("style")),fe.hrefNormalized="/a"===e.getAttribute("href"),fe.checkOn=!!t.value,fe.optSelected=i.selected,fe.enctype=!!re.createElement("form").enctype,r.disabled=!0,fe.optDisabled=!i.disabled,t=re.createElement("input"),t.setAttribute("value",""),fe.input=""===t.getAttribute("value"),t.value="t",t.setAttribute("type","radio"),fe.radioValue="t"===t.value}();var Dt=/\r/g,jt=/[\x20\t\r\n\f]+/g;pe.fn.extend({val:function(e){var t,n,r,i=this[0];{if(arguments.length)return r=pe.isFunction(e),this.each(function(n){var i;1===this.nodeType&&(i=r?e.call(this,n,pe(this).val()):e,null==i?i="":"number"==typeof i?i+="":pe.isArray(i)&&(i=pe.map(i,function(e){return null==e?"":e+""})),t=pe.valHooks[this.type]||pe.valHooks[this.nodeName.toLowerCase()],t&&"set"in t&&void 0!==t.set(this,i,"value")||(this.value=i))});if(i)return t=pe.valHooks[i.type]||pe.valHooks[i.nodeName.toLowerCase()],t&&"get"in t&&void 0!==(n=t.get(i,"value"))?n:(n=i.value,"string"==typeof n?n.replace(Dt,""):null==n?"":n)}}}),pe.extend({valHooks:{option:{get:function(e){var t=pe.find.attr(e,"value");return null!=t?t:pe.trim(pe.text(e)).replace(jt," ")}},select:{get:function(e){for(var t,n,r=e.options,i=e.selectedIndex,o="select-one"===e.type||i<0,a=o?null:[],s=o?i+1:r.length,u=i<0?s:o?i:0;u<s;u++)if(n=r[u],(n.selected||u===i)&&(fe.optDisabled?!n.disabled:null===n.getAttribute("disabled"))&&(!n.parentNode.disabled||!pe.nodeName(n.parentNode,"optgroup"))){if(t=pe(n).val(),o)return t;a.push(t)}return a},set:function(e,t){for(var n,r,i=e.options,o=pe.makeArray(t),a=i.length;a--;)if(r=i[a],pe.inArray(pe.valHooks.option.get(r),o)>-1)try{r.selected=n=!0}catch(s){r.scrollHeight}else r.selected=!1;return n||(e.selectedIndex=-1),i}}}}),pe.each(["radio","checkbox"],function(){pe.valHooks[this]={set:function(e,t){if(pe.isArray(t))return e.checked=pe.inArray(pe(e).val(),t)>-1}},fe.checkOn||(pe.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})});var Lt,Ht,qt=pe.expr.attrHandle,_t=/^(?:checked|selected)$/i,Ft=fe.getSetAttribute,Mt=fe.input;pe.fn.extend({attr:function(e,t){return Pe(this,pe.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){pe.removeAttr(this,e)})}}),pe.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return"undefined"==typeof e.getAttribute?pe.prop(e,t,n):(1===o&&pe.isXMLDoc(e)||(t=t.toLowerCase(),i=pe.attrHooks[t]||(pe.expr.match.bool.test(t)?Ht:Lt)),void 0!==n?null===n?void pe.removeAttr(e,t):i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:(e.setAttribute(t,n+""),n):i&&"get"in i&&null!==(r=i.get(e,t))?r:(r=pe.find.attr(e,t),null==r?void 0:r))},attrHooks:{type:{set:function(e,t){if(!fe.radioValue&&"radio"===t&&pe.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,r,i=0,o=t&&t.match(De);if(o&&1===e.nodeType)for(;n=o[i++];)r=pe.propFix[n]||n,pe.expr.match.bool.test(n)?Mt&&Ft||!_t.test(n)?e[r]=!1:e[pe.camelCase("default-"+n)]=e[r]=!1:pe.attr(e,n,""),e.removeAttribute(Ft?n:r)}}),Ht={set:function(e,t,n){return t===!1?pe.removeAttr(e,n):Mt&&Ft||!_t.test(n)?e.setAttribute(!Ft&&pe.propFix[n]||n,n):e[pe.camelCase("default-"+n)]=e[n]=!0,n}},pe.each(pe.expr.match.bool.source.match(/\w+/g),function(e,t){var n=qt[t]||pe.find.attr;Mt&&Ft||!_t.test(t)?qt[t]=function(e,t,r){var i,o;return r||(o=qt[t],qt[t]=i,i=null!=n(e,t,r)?t.toLowerCase():null,qt[t]=o),i}:qt[t]=function(e,t,n){if(!n)return e[pe.camelCase("default-"+t)]?t.toLowerCase():null}}),Mt&&Ft||(pe.attrHooks.value={set:function(e,t,n){return pe.nodeName(e,"input")?void(e.defaultValue=t):Lt&&Lt.set(e,t,n)}}),Ft||(Lt={set:function(e,t,n){var r=e.getAttributeNode(n);if(r||e.setAttributeNode(r=e.ownerDocument.createAttribute(n)),r.value=t+="","value"===n||t===e.getAttribute(n))return t}},qt.id=qt.name=qt.coords=function(e,t,n){var r;if(!n)return(r=e.getAttributeNode(t))&&""!==r.value?r.value:null},pe.valHooks.button={get:function(e,t){var n=e.getAttributeNode(t);if(n&&n.specified)return n.value},set:Lt.set},pe.attrHooks.contenteditable={set:function(e,t,n){Lt.set(e,""!==t&&t,n)}},pe.each(["width","height"],function(e,t){pe.attrHooks[t]={set:function(e,n){if(""===n)return e.setAttribute(t,"auto"),n}}})),fe.style||(pe.attrHooks.style={get:function(e){return e.style.cssText||void 0},set:function(e,t){return e.style.cssText=t+""}});var Ot=/^(?:input|select|textarea|button|object)$/i,Rt=/^(?:a|area)$/i;pe.fn.extend({prop:function(e,t){return Pe(this,pe.prop,e,t,arguments.length>1)},removeProp:function(e){return e=pe.propFix[e]||e,this.each(function(){try{this[e]=void 0,delete this[e]}catch(t){}})}}),pe.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&pe.isXMLDoc(e)||(t=pe.propFix[t]||t,i=pe.propHooks[t]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=pe.find.attr(e,"tabindex");return t?parseInt(t,10):Ot.test(e.nodeName)||Rt.test(e.nodeName)&&e.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),fe.hrefNormalized||pe.each(["href","src"],function(e,t){pe.propHooks[t]={get:function(e){return e.getAttribute(t,4)}}}),fe.optSelected||(pe.propHooks.selected={get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),pe.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){pe.propFix[this.toLowerCase()]=this}),fe.enctype||(pe.propFix.enctype="encoding");var Pt=/[\t\r\n\f]/g;pe.fn.extend({addClass:function(e){var t,n,r,i,o,a,s,u=0;if(pe.isFunction(e))return this.each(function(t){pe(this).addClass(e.call(this,t,z(this)))});if("string"==typeof e&&e)for(t=e.match(De)||[];n=this[u++];)if(i=z(n),r=1===n.nodeType&&(" "+i+" ").replace(Pt," ")){for(a=0;o=t[a++];)r.indexOf(" "+o+" ")<0&&(r+=o+" ");s=pe.trim(r),i!==s&&pe.attr(n,"class",s)}return this},removeClass:function(e){var t,n,r,i,o,a,s,u=0;if(pe.isFunction(e))return this.each(function(t){pe(this).removeClass(e.call(this,t,z(this)))});if(!arguments.length)return this.attr("class","");if("string"==typeof e&&e)for(t=e.match(De)||[];n=this[u++];)if(i=z(n),r=1===n.nodeType&&(" "+i+" ").replace(Pt," ")){for(a=0;o=t[a++];)for(;r.indexOf(" "+o+" ")>-1;)r=r.replace(" "+o+" "," ");s=pe.trim(r),i!==s&&pe.attr(n,"class",s)}return this},toggleClass:function(e,t){var n=typeof e;return"boolean"==typeof t&&"string"===n?t?this.addClass(e):this.removeClass(e):pe.isFunction(e)?this.each(function(n){pe(this).toggleClass(e.call(this,n,z(this),t),t)}):this.each(function(){var t,r,i,o;if("string"===n)for(r=0,i=pe(this),o=e.match(De)||[];t=o[r++];)i.hasClass(t)?i.removeClass(t):i.addClass(t);else void 0!==e&&"boolean"!==n||(t=z(this),t&&pe._data(this,"__className__",t),pe.attr(this,"class",t||e===!1?"":pe._data(this,"__className__")||""))})},hasClass:function(e){var t,n,r=0;for(t=" "+e+" ";n=this[r++];)if(1===n.nodeType&&(" "+z(n)+" ").replace(Pt," ").indexOf(t)>-1)return!0;return!1}}),pe.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(e,t){pe.fn[t]=function(e,n){return arguments.length>0?this.on(t,null,e,n):this.trigger(t)}}),pe.fn.extend({hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}});var Bt=e.location,Wt=pe.now(),It=/\?/,$t=/(,)|(\[|{)|(}|])|"(?:[^"\\\r\n]|\\["\\\/bfnrt]|\\u[\da-fA-F]{4})*"\s*:?|true|false|null|-?(?!0\d)\d+(?:\.\d+|)(?:[eE][+-]?\d+|)/g;pe.parseJSON=function(t){if(e.JSON&&e.JSON.parse)return e.JSON.parse(t+"");var n,r=null,i=pe.trim(t+"");return i&&!pe.trim(i.replace($t,function(e,t,i,o){return n&&t&&(r=0),0===r?e:(n=i||t,r+=!o-!i,"")}))?Function("return "+i)():pe.error("Invalid JSON: "+t)},pe.parseXML=function(t){var n,r;if(!t||"string"!=typeof t)return null;try{e.DOMParser?(r=new e.DOMParser,n=r.parseFromString(t,"text/xml")):(n=new e.ActiveXObject("Microsoft.XMLDOM"),n.async="false",n.loadXML(t))}catch(i){n=void 0}return n&&n.documentElement&&!n.getElementsByTagName("parsererror").length||pe.error("Invalid XML: "+t),n};var zt=/#.*$/,Xt=/([?&])_=[^&]*/,Ut=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Vt=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Yt=/^(?:GET|HEAD)$/,Jt=/^\/\//,Gt=/^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,Kt={},Qt={},Zt="*/".concat("*"),en=Bt.href,tn=Gt.exec(en.toLowerCase())||[];pe.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:en,type:"GET",isLocal:Vt.test(tn[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Zt,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":pe.parseJSON,"text xml":pe.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?V(V(e,pe.ajaxSettings),t):V(pe.ajaxSettings,e)},ajaxPrefilter:X(Kt),ajaxTransport:X(Qt),ajax:function(t,n){function r(t,n,r,i){var o,f,v,x,w,C=n;2!==b&&(b=2,u&&e.clearTimeout(u),c=void 0,s=i||"",T.readyState=t>0?4:0,o=t>=200&&t<300||304===t,r&&(x=Y(d,T,r)),x=J(d,x,T,o),o?(d.ifModified&&(w=T.getResponseHeader("Last-Modified"),w&&(pe.lastModified[a]=w),w=T.getResponseHeader("etag"),w&&(pe.etag[a]=w)),204===t||"HEAD"===d.type?C="nocontent":304===t?C="notmodified":(C=x.state,f=x.data,v=x.error,o=!v)):(v=C,!t&&C||(C="error",t<0&&(t=0))),T.status=t,T.statusText=(n||C)+"",o?g.resolveWith(p,[f,C,T]):g.rejectWith(p,[T,C,v]),T.statusCode(y),y=void 0,l&&h.trigger(o?"ajaxSuccess":"ajaxError",[T,d,o?f:v]),m.fireWith(p,[T,C]),l&&(h.trigger("ajaxComplete",[T,d]),--pe.active||pe.event.trigger("ajaxStop")))}"object"==typeof t&&(n=t,t=void 0),n=n||{};var i,o,a,s,u,l,c,f,d=pe.ajaxSetup({},n),p=d.context||d,h=d.context&&(p.nodeType||p.jquery)?pe(p):pe.event,g=pe.Deferred(),m=pe.Callbacks("once memory"),y=d.statusCode||{},v={},x={},b=0,w="canceled",T={readyState:0,getResponseHeader:function(e){var t;if(2===b){if(!f)for(f={};t=Ut.exec(s);)f[t[1].toLowerCase()]=t[2];t=f[e.toLowerCase()]}return null==t?null:t},getAllResponseHeaders:function(){return 2===b?s:null},setRequestHeader:function(e,t){var n=e.toLowerCase();return b||(e=x[n]=x[n]||e,v[e]=t),this},overrideMimeType:function(e){return b||(d.mimeType=e),this},statusCode:function(e){var t;if(e)if(b<2)for(t in e)y[t]=[y[t],e[t]];else T.always(e[T.status]);return this},abort:function(e){var t=e||w;return c&&c.abort(t),r(0,t),this}};if(g.promise(T).complete=m.add,T.success=T.done,T.error=T.fail,d.url=((t||d.url||en)+"").replace(zt,"").replace(Jt,tn[1]+"//"),d.type=n.method||n.type||d.method||d.type,d.dataTypes=pe.trim(d.dataType||"*").toLowerCase().match(De)||[""],null==d.crossDomain&&(i=Gt.exec(d.url.toLowerCase()),d.crossDomain=!(!i||i[1]===tn[1]&&i[2]===tn[2]&&(i[3]||("http:"===i[1]?"80":"443"))===(tn[3]||("http:"===tn[1]?"80":"443")))),d.data&&d.processData&&"string"!=typeof d.data&&(d.data=pe.param(d.data,d.traditional)),U(Kt,d,n,T),2===b)return T;l=pe.event&&d.global,l&&0===pe.active++&&pe.event.trigger("ajaxStart"),d.type=d.type.toUpperCase(),d.hasContent=!Yt.test(d.type),a=d.url,d.hasContent||(d.data&&(a=d.url+=(It.test(a)?"&":"?")+d.data,delete d.data),d.cache===!1&&(d.url=Xt.test(a)?a.replace(Xt,"$1_="+Wt++):a+(It.test(a)?"&":"?")+"_="+Wt++)),d.ifModified&&(pe.lastModified[a]&&T.setRequestHeader("If-Modified-Since",pe.lastModified[a]),pe.etag[a]&&T.setRequestHeader("If-None-Match",pe.etag[a])),(d.data&&d.hasContent&&d.contentType!==!1||n.contentType)&&T.setRequestHeader("Content-Type",d.contentType),T.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+("*"!==d.dataTypes[0]?", "+Zt+"; q=0.01":""):d.accepts["*"]);for(o in d.headers)T.setRequestHeader(o,d.headers[o]);if(d.beforeSend&&(d.beforeSend.call(p,T,d)===!1||2===b))return T.abort();w="abort";for(o in{success:1,error:1,complete:1})T[o](d[o]);if(c=U(Qt,d,n,T)){if(T.readyState=1,l&&h.trigger("ajaxSend",[T,d]),2===b)return T;d.async&&d.timeout>0&&(u=e.setTimeout(function(){T.abort("timeout")},d.timeout));try{b=1,c.send(v,r)}catch(C){if(!(b<2))throw C;r(-1,C)}}else r(-1,"No Transport");return T},getJSON:function(e,t,n){return pe.get(e,t,n,"json")},getScript:function(e,t){return pe.get(e,void 0,t,"script")}}),pe.each(["get","post"],function(e,t){pe[t]=function(e,n,r,i){return pe.isFunction(n)&&(i=i||r,r=n,n=void 0),pe.ajax(pe.extend({url:e,type:t,dataType:i,data:n,success:r},pe.isPlainObject(e)&&e))}}),pe._evalUrl=function(e){return pe.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,"throws":!0})},pe.fn.extend({wrapAll:function(e){if(pe.isFunction(e))return this.each(function(t){pe(this).wrapAll(e.call(this,t))});if(this[0]){var t=pe(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){for(var e=this;e.firstChild&&1===e.firstChild.nodeType;)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return pe.isFunction(e)?this.each(function(t){pe(this).wrapInner(e.call(this,t))}):this.each(function(){var t=pe(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=pe.isFunction(e);return this.each(function(n){pe(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){pe.nodeName(this,"body")||pe(this).replaceWith(this.childNodes)}).end()}}),pe.expr.filters.hidden=function(e){return fe.reliableHiddenOffsets()?e.offsetWidth<=0&&e.offsetHeight<=0&&!e.getClientRects().length:K(e)},pe.expr.filters.visible=function(e){return!pe.expr.filters.hidden(e)};var nn=/%20/g,rn=/\[\]$/,on=/\r?\n/g,an=/^(?:submit|button|image|reset|file)$/i,sn=/^(?:input|select|textarea|keygen)/i;pe.param=function(e,t){var n,r=[],i=function(e,t){t=pe.isFunction(t)?t():null==t?"":t,r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};if(void 0===t&&(t=pe.ajaxSettings&&pe.ajaxSettings.traditional),pe.isArray(e)||e.jquery&&!pe.isPlainObject(e))pe.each(e,function(){i(this.name,this.value)});else for(n in e)Q(n,e[n],t,i);return r.join("&").replace(nn,"+")},pe.fn.extend({serialize:function(){return pe.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=pe.prop(this,"elements");return e?pe.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!pe(this).is(":disabled")&&sn.test(this.nodeName)&&!an.test(e)&&(this.checked||!Be.test(e))}).map(function(e,t){var n=pe(this).val();return null==n?null:pe.isArray(n)?pe.map(n,function(e){return{name:t.name,value:e.replace(on,"\r\n")}}):{name:t.name,value:n.replace(on,"\r\n")}}).get()}}),pe.ajaxSettings.xhr=void 0!==e.ActiveXObject?function(){return this.isLocal?ee():re.documentMode>8?Z():/^(get|post|head|put|delete|options)$/i.test(this.type)&&Z()||ee()}:Z;var un=0,ln={},cn=pe.ajaxSettings.xhr();e.attachEvent&&e.attachEvent("onunload",function(){for(var e in ln)ln[e](void 0,!0)}),fe.cors=!!cn&&"withCredentials"in cn,cn=fe.ajax=!!cn,cn&&pe.ajaxTransport(function(t){if(!t.crossDomain||fe.cors){var n;return{send:function(r,i){var o,a=t.xhr(),s=++un;if(a.open(t.type,t.url,t.async,t.username,t.password),t.xhrFields)for(o in t.xhrFields)a[o]=t.xhrFields[o];t.mimeType&&a.overrideMimeType&&a.overrideMimeType(t.mimeType),t.crossDomain||r["X-Requested-With"]||(r["X-Requested-With"]="XMLHttpRequest");for(o in r)void 0!==r[o]&&a.setRequestHeader(o,r[o]+"");a.send(t.hasContent&&t.data||null),n=function(e,r){var o,u,l;if(n&&(r||4===a.readyState))if(delete ln[s],n=void 0,a.onreadystatechange=pe.noop,r)4!==a.readyState&&a.abort();else{l={},o=a.status,"string"==typeof a.responseText&&(l.text=a.responseText);try{u=a.statusText}catch(c){u=""}o||!t.isLocal||t.crossDomain?1223===o&&(o=204):o=l.text?200:404}l&&i(o,u,l,a.getAllResponseHeaders())},t.async?4===a.readyState?e.setTimeout(n):a.onreadystatechange=ln[s]=n:n()},abort:function(){n&&n(void 0,!0)}}}}),pe.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return pe.globalEval(e),e}}}),pe.ajaxPrefilter("script",function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET",e.global=!1)}),pe.ajaxTransport("script",function(e){if(e.crossDomain){var t,n=re.head||pe("head")[0]||re.documentElement;return{send:function(r,i){t=re.createElement("script"),t.async=!0,e.scriptCharset&&(t.charset=e.scriptCharset),t.src=e.url,t.onload=t.onreadystatechange=function(e,n){(n||!t.readyState||/loaded|complete/.test(t.readyState))&&(t.onload=t.onreadystatechange=null,t.parentNode&&t.parentNode.removeChild(t),t=null,n||i(200,"success"))},n.insertBefore(t,n.firstChild)},abort:function(){t&&t.onload(void 0,!0)}}}});var fn=[],dn=/(=)\?(?=&|$)|\?\?/;pe.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=fn.pop()||pe.expando+"_"+Wt++;return this[e]=!0,e}}),pe.ajaxPrefilter("json jsonp",function(t,n,r){var i,o,a,s=t.jsonp!==!1&&(dn.test(t.url)?"url":"string"==typeof t.data&&0===(t.contentType||"").indexOf("application/x-www-form-urlencoded")&&dn.test(t.data)&&"data");if(s||"jsonp"===t.dataTypes[0])return i=t.jsonpCallback=pe.isFunction(t.jsonpCallback)?t.jsonpCallback():t.jsonpCallback,s?t[s]=t[s].replace(dn,"$1"+i):t.jsonp!==!1&&(t.url+=(It.test(t.url)?"&":"?")+t.jsonp+"="+i),t.converters["script json"]=function(){return a||pe.error(i+" was not called"),a[0]},t.dataTypes[0]="json",o=e[i],e[i]=function(){a=arguments},r.always(function(){void 0===o?pe(e).removeProp(i):e[i]=o,t[i]&&(t.jsonpCallback=n.jsonpCallback,fn.push(i)),a&&pe.isFunction(o)&&o(a[0]),a=o=void 0}),"script"}),pe.parseHTML=function(e,t,n){if(!e||"string"!=typeof e)return null;"boolean"==typeof t&&(n=t,t=!1),t=t||re;var r=Te.exec(e),i=!n&&[];return r?[t.createElement(r[1])]:(r=y([e],t,i),i&&i.length&&pe(i).remove(),pe.merge([],r.childNodes))};var pn=pe.fn.load;return pe.fn.load=function(e,t,n){if("string"!=typeof e&&pn)return pn.apply(this,arguments);var r,i,o,a=this,s=e.indexOf(" ");return s>-1&&(r=pe.trim(e.slice(s,e.length)),e=e.slice(0,s)),pe.isFunction(t)?(n=t,t=void 0):t&&"object"==typeof t&&(i="POST"),a.length>0&&pe.ajax({url:e,type:i||"GET",dataType:"html",data:t}).done(function(e){o=arguments,a.html(r?pe("<div>").append(pe.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},pe.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){pe.fn[t]=function(e){return this.on(t,e)}}),pe.expr.filters.animated=function(e){return pe.grep(pe.timers,function(t){return e===t.elem}).length},pe.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l,c=pe.css(e,"position"),f=pe(e),d={};"static"===c&&(e.style.position="relative"),s=f.offset(),o=pe.css(e,"top"),u=pe.css(e,"left"),l=("absolute"===c||"fixed"===c)&&pe.inArray("auto",[o,u])>-1,l?(r=f.position(),a=r.top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),pe.isFunction(t)&&(t=t.call(e,n,pe.extend({},s))),null!=t.top&&(d.top=t.top-s.top+a),null!=t.left&&(d.left=t.left-s.left+i),"using"in t?t.using.call(e,d):f.css(d)}},pe.fn.extend({offset:function(e){if(arguments.length)return void 0===e?this:this.each(function(t){pe.offset.setOffset(this,e,t)});var t,n,r={top:0,left:0},i=this[0],o=i&&i.ownerDocument;if(o)return t=o.documentElement,pe.contains(t,i)?("undefined"!=typeof i.getBoundingClientRect&&(r=i.getBoundingClientRect()),n=te(o),{top:r.top+(n.pageYOffset||t.scrollTop)-(t.clientTop||0),left:r.left+(n.pageXOffset||t.scrollLeft)-(t.clientLeft||0)}):r},position:function(){if(this[0]){var e,t,n={top:0,left:0},r=this[0];return"fixed"===pe.css(r,"position")?t=r.getBoundingClientRect():(e=this.offsetParent(),t=this.offset(),pe.nodeName(e[0],"html")||(n=e.offset()),n.top+=pe.css(e[0],"borderTopWidth",!0),n.left+=pe.css(e[0],"borderLeftWidth",!0)),{top:t.top-n.top-pe.css(r,"marginTop",!0),left:t.left-n.left-pe.css(r,"marginLeft",!0)}}},offsetParent:function(){
+return this.map(function(){for(var e=this.offsetParent;e&&!pe.nodeName(e,"html")&&"static"===pe.css(e,"position");)e=e.offsetParent;return e||pt})}}),pe.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,t){var n=/Y/.test(t);pe.fn[e]=function(r){return Pe(this,function(e,r,i){var o=te(e);return void 0===i?o?t in o?o[t]:o.document.documentElement[r]:e[r]:void(o?o.scrollTo(n?pe(o).scrollLeft():i,n?i:pe(o).scrollTop()):e[r]=i)},e,r,arguments.length,null)}}),pe.each(["top","left"],function(e,t){pe.cssHooks[t]=L(fe.pixelPosition,function(e,n){if(n)return n=gt(e,t),ft.test(n)?pe(e).position()[t]+"px":n})}),pe.each({Height:"height",Width:"width"},function(e,t){pe.each({padding:"inner"+e,content:t,"":"outer"+e},function(n,r){pe.fn[r]=function(r,i){var o=arguments.length&&(n||"boolean"!=typeof r),a=n||(r===!0||i===!0?"margin":"border");return Pe(this,function(t,n,r){var i;return pe.isWindow(t)?t.document.documentElement["client"+e]:9===t.nodeType?(i=t.documentElement,Math.max(t.body["scroll"+e],i["scroll"+e],t.body["offset"+e],i["offset"+e],i["client"+e])):void 0===r?pe.css(t,n,a):pe.style(t,n,r,a)},t,o?r:void 0,o,null)}})}),pe.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)}}),pe.fn.size=function(){return this.length},pe.fn.andSelf=pe.fn.addBack,layui.define(function(e){layui.$=pe,e("jquery",pe)}),pe});!function(e,t){"use strict";var i,n,a=e.layui&&layui.define,o={getPath:function(){var t=document.currentScript?document.currentScript.src:function(){for(var e,t=document.scripts,i=t.length-1,n=i;n>0;n--)if("interactive"===t[n].readyState){e=t[n].src;break}return e||t[i].src}(),i=e.LAYUI_GLOBAL||{};return i.layer_dir||t.substring(0,t.lastIndexOf("/")+1)}(),config:{},end:{},minIndex:0,minLeft:[],btn:["&#x786E;&#x5B9A;","&#x53D6;&#x6D88;"],type:["dialog","page","iframe","loading","tips"],getStyle:function(t,i){var n=t.currentStyle?t.currentStyle:e.getComputedStyle(t,null);return n[n.getPropertyValue?"getPropertyValue":"getAttribute"](i)},link:function(t,i,n){if(r.path){var a=document.getElementsByTagName("head")[0],s=document.createElement("link");"string"==typeof i&&(n=i);var l=(n||t).replace(/\.|\//g,""),f="layuicss-"+l,c="creating",u=0;s.rel="stylesheet",s.href=r.path+t,s.id=f,document.getElementById(f)||a.appendChild(s),"function"==typeof i&&!function d(t){var n=100,a=document.getElementById(f);return++u>1e4/n?e.console&&console.error(l+".css: Invalid"):void(1989===parseInt(o.getStyle(a,"width"))?(t===c&&a.removeAttribute("lay-status"),a.getAttribute("lay-status")===c?setTimeout(d,n):i()):(a.setAttribute("lay-status",c),setTimeout(function(){d(c)},n)))}()}}},r={v:"3.5.1",ie:function(){var t=navigator.userAgent.toLowerCase();return!!(e.ActiveXObject||"ActiveXObject"in e)&&((t.match(/msie\s(\d+)/)||[])[1]||"11")}(),index:e.layer&&e.layer.v?1e5:0,path:o.getPath,config:function(e,t){return e=e||{},r.cache=o.config=i.extend({},o.config,e),r.path=o.config.path||r.path,"string"==typeof e.extend&&(e.extend=[e.extend]),o.config.path&&r.ready(),e.extend?(a?layui.addcss("modules/layer/"+e.extend):o.link("theme/"+e.extend),this):this},ready:function(e){var t="layer",i="",n=(a?"modules/layer/":"theme/")+"default/layer.css?v="+r.v+i;return a?layui.addcss(n,e,t):o.link(n,e,t),this},alert:function(e,t,n){var a="function"==typeof t;return a&&(n=t),r.open(i.extend({content:e,yes:n},a?{}:t))},confirm:function(e,t,n,a){var s="function"==typeof t;return s&&(a=n,n=t),r.open(i.extend({content:e,btn:o.btn,yes:n,btn2:a},s?{}:t))},msg:function(e,n,a){var s="function"==typeof n,f=o.config.skin,c=(f?f+" "+f+"-msg":"")||"layui-layer-msg",u=l.anim.length-1;return s&&(a=n),r.open(i.extend({content:e,time:3e3,shade:!1,skin:c,title:!1,closeBtn:!1,btn:!1,resize:!1,end:a},s&&!o.config.skin?{skin:c+" layui-layer-hui",anim:u}:function(){return n=n||{},(n.icon===-1||n.icon===t&&!o.config.skin)&&(n.skin=c+" "+(n.skin||"layui-layer-hui")),n}()))},load:function(e,t){return r.open(i.extend({type:3,icon:e||0,resize:!1,shade:.01},t))},tips:function(e,t,n){return r.open(i.extend({type:4,content:[e,t],closeBtn:!1,time:3e3,shade:!1,resize:!1,fixed:!1,maxWidth:260},n))}},s=function(e){var t=this,a=function(){t.creat()};t.index=++r.index,t.config.maxWidth=i(n).width()-30,t.config=i.extend({},t.config,o.config,e),document.body?a():setTimeout(function(){a()},30)};s.pt=s.prototype;var l=["layui-layer",".layui-layer-title",".layui-layer-main",".layui-layer-dialog","layui-layer-iframe","layui-layer-content","layui-layer-btn","layui-layer-close"];l.anim=["layer-anim-00","layer-anim-01","layer-anim-02","layer-anim-03","layer-anim-04","layer-anim-05","layer-anim-06"],l.SHADE="layui-layer-shade",l.MOVE="layui-layer-move",s.pt.config={type:0,shade:.3,fixed:!0,move:l[1],title:"&#x4FE1;&#x606F;",offset:"auto",area:"auto",closeBtn:1,time:0,zIndex:19891014,maxWidth:360,anim:0,isOutAnim:!0,minStack:!0,icon:-1,moveType:1,resize:!0,scrollbar:!0,tips:2},s.pt.vessel=function(e,t){var n=this,a=n.index,r=n.config,s=r.zIndex+a,f="object"==typeof r.title,c=r.maxmin&&(1===r.type||2===r.type),u=r.title?'<div class="layui-layer-title" style="'+(f?r.title[1]:"")+'">'+(f?r.title[0]:r.title)+"</div>":"";return r.zIndex=s,t([r.shade?'<div class="'+l.SHADE+'" id="'+l.SHADE+a+'" times="'+a+'" style="'+("z-index:"+(s-1)+"; ")+'"></div>':"",'<div class="'+l[0]+(" layui-layer-"+o.type[r.type])+(0!=r.type&&2!=r.type||r.shade?"":" layui-layer-border")+" "+(r.skin||"")+'" id="'+l[0]+a+'" type="'+o.type[r.type]+'" times="'+a+'" showtime="'+r.time+'" conType="'+(e?"object":"string")+'" style="z-index: '+s+"; width:"+r.area[0]+";height:"+r.area[1]+";position:"+(r.fixed?"fixed;":"absolute;")+'">'+(e&&2!=r.type?"":u)+'<div id="'+(r.id||"")+'" class="layui-layer-content'+(0==r.type&&r.icon!==-1?" layui-layer-padding":"")+(3==r.type?" layui-layer-loading"+r.icon:"")+'">'+(0==r.type&&r.icon!==-1?'<i class="layui-layer-ico layui-layer-ico'+r.icon+'"></i>':"")+(1==r.type&&e?"":r.content||"")+'</div><span class="layui-layer-setwin">'+function(){var e=c?'<a class="layui-layer-min" href="javascript:;"><cite></cite></a><a class="layui-layer-ico layui-layer-max" href="javascript:;"></a>':"";return r.closeBtn&&(e+='<a class="layui-layer-ico '+l[7]+" "+l[7]+(r.title?r.closeBtn:4==r.type?"1":"2")+'" href="javascript:;"></a>'),e}()+"</span>"+(r.btn?function(){var e="";"string"==typeof r.btn&&(r.btn=[r.btn]);for(var t=0,i=r.btn.length;t<i;t++)e+='<a class="'+l[6]+t+'">'+r.btn[t]+"</a>";return'<div class="'+l[6]+" layui-layer-btn-"+(r.btnAlign||"")+'">'+e+"</div>"}():"")+(r.resize?'<span class="layui-layer-resize"></span>':"")+"</div>"],u,i('<div class="'+l.MOVE+'" id="'+l.MOVE+'"></div>')),n},s.pt.creat=function(){var e=this,t=e.config,a=e.index,s=t.content,f="object"==typeof s,c=i("body");if(!t.id||!i("#"+t.id)[0]){switch("string"==typeof t.area&&(t.area="auto"===t.area?["",""]:[t.area,""]),t.shift&&(t.anim=t.shift),6==r.ie&&(t.fixed=!1),t.type){case 0:t.btn="btn"in t?t.btn:o.btn[0],r.closeAll("dialog");break;case 2:var s=t.content=f?t.content:[t.content||"","auto"];t.content='<iframe scrolling="'+(t.content[1]||"auto")+'" allowtransparency="true" id="'+l[4]+a+'" name="'+l[4]+a+'" onload="this.className=\'\';" class="layui-layer-load" frameborder="0" src="'+t.content[0]+'"></iframe>';break;case 3:delete t.title,delete t.closeBtn,t.icon===-1&&0===t.icon,r.closeAll("loading");break;case 4:f||(t.content=[t.content,"body"]),t.follow=t.content[1],t.content=t.content[0]+'<i class="layui-layer-TipsG"></i>',delete t.title,t.tips="object"==typeof t.tips?t.tips:[t.tips,!0],t.tipsMore||r.closeAll("tips")}if(e.vessel(f,function(n,r,u){c.append(n[0]),f?function(){2==t.type||4==t.type?function(){i("body").append(n[1])}():function(){s.parents("."+l[0])[0]||(s.data("display",s.css("display")).show().addClass("layui-layer-wrap").wrap(n[1]),i("#"+l[0]+a).find("."+l[5]).before(r))}()}():c.append(n[1]),i("#"+l.MOVE)[0]||c.append(o.moveElem=u),e.layero=i("#"+l[0]+a),e.shadeo=i("#"+l.SHADE+a),t.scrollbar||l.html.css("overflow","hidden").attr("layer-full",a)}).auto(a),e.shadeo.css({"background-color":t.shade[1]||"#000",opacity:t.shade[0]||t.shade}),2==t.type&&6==r.ie&&e.layero.find("iframe").attr("src",s[0]),4==t.type?e.tips():function(){e.offset(),parseInt(o.getStyle(document.getElementById(l.MOVE),"z-index"))||function(){e.layero.css("visibility","hidden"),r.ready(function(){e.offset(),e.layero.css("visibility","visible")})}()}(),t.fixed&&n.on("resize",function(){e.offset(),(/^\d+%$/.test(t.area[0])||/^\d+%$/.test(t.area[1]))&&e.auto(a),4==t.type&&e.tips()}),t.time<=0||setTimeout(function(){r.close(e.index)},t.time),e.move().callback(),l.anim[t.anim]){var u="layer-anim "+l.anim[t.anim];e.layero.addClass(u).one("webkitAnimationEnd mozAnimationEnd MSAnimationEnd oanimationend animationend",function(){i(this).removeClass(u)})}t.isOutAnim&&e.layero.data("isOutAnim",!0)}},s.pt.auto=function(e){var t=this,a=t.config,o=i("#"+l[0]+e);""===a.area[0]&&a.maxWidth>0&&(r.ie&&r.ie<8&&a.btn&&o.width(o.innerWidth()),o.outerWidth()>a.maxWidth&&o.width(a.maxWidth));var s=[o.innerWidth(),o.innerHeight()],f=o.find(l[1]).outerHeight()||0,c=o.find("."+l[6]).outerHeight()||0,u=function(e){e=o.find(e),e.height(s[1]-f-c-2*(0|parseFloat(e.css("padding-top"))))};switch(a.type){case 2:u("iframe");break;default:""===a.area[1]?a.maxHeight>0&&o.outerHeight()>a.maxHeight?(s[1]=a.maxHeight,u("."+l[5])):a.fixed&&s[1]>=n.height()&&(s[1]=n.height(),u("."+l[5])):u("."+l[5])}return t},s.pt.offset=function(){var e=this,t=e.config,i=e.layero,a=[i.outerWidth(),i.outerHeight()],o="object"==typeof t.offset;e.offsetTop=(n.height()-a[1])/2,e.offsetLeft=(n.width()-a[0])/2,o?(e.offsetTop=t.offset[0],e.offsetLeft=t.offset[1]||e.offsetLeft):"auto"!==t.offset&&("t"===t.offset?e.offsetTop=0:"r"===t.offset?e.offsetLeft=n.width()-a[0]:"b"===t.offset?e.offsetTop=n.height()-a[1]:"l"===t.offset?e.offsetLeft=0:"lt"===t.offset?(e.offsetTop=0,e.offsetLeft=0):"lb"===t.offset?(e.offsetTop=n.height()-a[1],e.offsetLeft=0):"rt"===t.offset?(e.offsetTop=0,e.offsetLeft=n.width()-a[0]):"rb"===t.offset?(e.offsetTop=n.height()-a[1],e.offsetLeft=n.width()-a[0]):e.offsetTop=t.offset),t.fixed||(e.offsetTop=/%$/.test(e.offsetTop)?n.height()*parseFloat(e.offsetTop)/100:parseFloat(e.offsetTop),e.offsetLeft=/%$/.test(e.offsetLeft)?n.width()*parseFloat(e.offsetLeft)/100:parseFloat(e.offsetLeft),e.offsetTop+=n.scrollTop(),e.offsetLeft+=n.scrollLeft()),i.attr("minLeft")&&(e.offsetTop=n.height()-(i.find(l[1]).outerHeight()||0),e.offsetLeft=i.css("left")),i.css({top:e.offsetTop,left:e.offsetLeft})},s.pt.tips=function(){var e=this,t=e.config,a=e.layero,o=[a.outerWidth(),a.outerHeight()],r=i(t.follow);r[0]||(r=i("body"));var s={width:r.outerWidth(),height:r.outerHeight(),top:r.offset().top,left:r.offset().left},f=a.find(".layui-layer-TipsG"),c=t.tips[0];t.tips[1]||f.remove(),s.autoLeft=function(){s.left+o[0]-n.width()>0?(s.tipLeft=s.left+s.width-o[0],f.css({right:12,left:"auto"})):s.tipLeft=s.left},s.where=[function(){s.autoLeft(),s.tipTop=s.top-o[1]-10,f.removeClass("layui-layer-TipsB").addClass("layui-layer-TipsT").css("border-right-color",t.tips[1])},function(){s.tipLeft=s.left+s.width+10,s.tipTop=s.top,f.removeClass("layui-layer-TipsL").addClass("layui-layer-TipsR").css("border-bottom-color",t.tips[1])},function(){s.autoLeft(),s.tipTop=s.top+s.height+10,f.removeClass("layui-layer-TipsT").addClass("layui-layer-TipsB").css("border-right-color",t.tips[1])},function(){s.tipLeft=s.left-o[0]-10,s.tipTop=s.top,f.removeClass("layui-layer-TipsR").addClass("layui-layer-TipsL").css("border-bottom-color",t.tips[1])}],s.where[c-1](),1===c?s.top-(n.scrollTop()+o[1]+16)<0&&s.where[2]():2===c?n.width()-(s.left+s.width+o[0]+16)>0||s.where[3]():3===c?s.top-n.scrollTop()+s.height+o[1]+16-n.height()>0&&s.where[0]():4===c&&o[0]+16-s.left>0&&s.where[1](),a.find("."+l[5]).css({"background-color":t.tips[1],"padding-right":t.closeBtn?"30px":""}),a.css({left:s.tipLeft-(t.fixed?n.scrollLeft():0),top:s.tipTop-(t.fixed?n.scrollTop():0)})},s.pt.move=function(){var e=this,t=e.config,a=i(document),s=e.layero,l=s.find(t.move),f=s.find(".layui-layer-resize"),c={};return t.move&&l.css("cursor","move"),l.on("mousedown",function(e){e.preventDefault(),t.move&&(c.moveStart=!0,c.offset=[e.clientX-parseFloat(s.css("left")),e.clientY-parseFloat(s.css("top"))],o.moveElem.css("cursor","move").show())}),f.on("mousedown",function(e){e.preventDefault(),c.resizeStart=!0,c.offset=[e.clientX,e.clientY],c.area=[s.outerWidth(),s.outerHeight()],o.moveElem.css("cursor","se-resize").show()}),a.on("mousemove",function(i){if(c.moveStart){var a=i.clientX-c.offset[0],o=i.clientY-c.offset[1],l="fixed"===s.css("position");if(i.preventDefault(),c.stX=l?0:n.scrollLeft(),c.stY=l?0:n.scrollTop(),!t.moveOut){var f=n.width()-s.outerWidth()+c.stX,u=n.height()-s.outerHeight()+c.stY;a<c.stX&&(a=c.stX),a>f&&(a=f),o<c.stY&&(o=c.stY),o>u&&(o=u)}s.css({left:a,top:o})}if(t.resize&&c.resizeStart){var a=i.clientX-c.offset[0],o=i.clientY-c.offset[1];i.preventDefault(),r.style(e.index,{width:c.area[0]+a,height:c.area[1]+o}),c.isResize=!0,t.resizing&&t.resizing(s)}}).on("mouseup",function(e){c.moveStart&&(delete c.moveStart,o.moveElem.hide(),t.moveEnd&&t.moveEnd(s)),c.resizeStart&&(delete c.resizeStart,o.moveElem.hide())}),e},s.pt.callback=function(){function e(){var e=a.cancel&&a.cancel(t.index,n);e===!1||r.close(t.index)}var t=this,n=t.layero,a=t.config;t.openLayer(),a.success&&(2==a.type?n.find("iframe").on("load",function(){a.success(n,t.index)}):a.success(n,t.index)),6==r.ie&&t.IE6(n),n.find("."+l[6]).children("a").on("click",function(){var e=i(this).index();if(0===e)a.yes?a.yes(t.index,n):a.btn1?a.btn1(t.index,n):r.close(t.index);else{var o=a["btn"+(e+1)]&&a["btn"+(e+1)](t.index,n);o===!1||r.close(t.index)}}),n.find("."+l[7]).on("click",e),a.shadeClose&&t.shadeo.on("click",function(){r.close(t.index)}),n.find(".layui-layer-min").on("click",function(){var e=a.min&&a.min(n,t.index);e===!1||r.min(t.index,a)}),n.find(".layui-layer-max").on("click",function(){i(this).hasClass("layui-layer-maxmin")?(r.restore(t.index),a.restore&&a.restore(n,t.index)):(r.full(t.index,a),setTimeout(function(){a.full&&a.full(n,t.index)},100))}),a.end&&(o.end[t.index]=a.end)},o.reselect=function(){i.each(i("select"),function(e,t){var n=i(this);n.parents("."+l[0])[0]||1==n.attr("layer")&&i("."+l[0]).length<1&&n.removeAttr("layer").show(),n=null})},s.pt.IE6=function(e){i("select").each(function(e,t){var n=i(this);n.parents("."+l[0])[0]||"none"===n.css("display")||n.attr({layer:"1"}).hide(),n=null})},s.pt.openLayer=function(){var e=this;r.zIndex=e.config.zIndex,r.setTop=function(e){var t=function(){r.zIndex++,e.css("z-index",r.zIndex+1)};return r.zIndex=parseInt(e[0].style.zIndex),e.on("mousedown",t),r.zIndex}},o.record=function(e){var t=[e.width(),e.height(),e.position().top,e.position().left+parseFloat(e.css("margin-left"))];e.find(".layui-layer-max").addClass("layui-layer-maxmin"),e.attr({area:t})},o.rescollbar=function(e){l.html.attr("layer-full")==e&&(l.html[0].style.removeProperty?l.html[0].style.removeProperty("overflow"):l.html[0].style.removeAttribute("overflow"),l.html.removeAttr("layer-full"))},e.layer=r,r.getChildFrame=function(e,t){return t=t||i("."+l[4]).attr("times"),i("#"+l[0]+t).find("iframe").contents().find(e)},r.getFrameIndex=function(e){return i("#"+e).parents("."+l[4]).attr("times")},r.iframeAuto=function(e){if(e){var t=r.getChildFrame("html",e).outerHeight(),n=i("#"+l[0]+e),a=n.find(l[1]).outerHeight()||0,o=n.find("."+l[6]).outerHeight()||0;n.css({height:t+a+o}),n.find("iframe").css({height:t})}},r.iframeSrc=function(e,t){i("#"+l[0]+e).find("iframe").attr("src",t)},r.style=function(e,t,n){var a=i("#"+l[0]+e),r=a.find(".layui-layer-content"),s=a.attr("type"),f=a.find(l[1]).outerHeight()||0,c=a.find("."+l[6]).outerHeight()||0;a.attr("minLeft");s!==o.type[3]&&s!==o.type[4]&&(n||(parseFloat(t.width)<=260&&(t.width=260),parseFloat(t.height)-f-c<=64&&(t.height=64+f+c)),a.css(t),c=a.find("."+l[6]).outerHeight(),s===o.type[2]?a.find("iframe").css({height:parseFloat(t.height)-f-c}):r.css({height:parseFloat(t.height)-f-c-parseFloat(r.css("padding-top"))-parseFloat(r.css("padding-bottom"))}))},r.min=function(e,t){t=t||{};var a=i("#"+l[0]+e),s=i("#"+l.SHADE+e),f=a.find(l[1]).outerHeight()||0,c=a.attr("minLeft")||181*o.minIndex+"px",u=a.css("position"),d={width:180,height:f,position:"fixed",overflow:"hidden"};o.record(a),o.minLeft[0]&&(c=o.minLeft[0],o.minLeft.shift()),t.minStack&&(d.left=c,d.top=n.height()-f,a.attr("minLeft")||o.minIndex++,a.attr("minLeft",c)),a.attr("position",u),r.style(e,d,!0),a.find(".layui-layer-min").hide(),"page"===a.attr("type")&&a.find(l[4]).hide(),o.rescollbar(e),s.hide()},r.restore=function(e){var t=i("#"+l[0]+e),n=i("#"+l.SHADE+e),a=t.attr("area").split(",");t.attr("type");r.style(e,{width:parseFloat(a[0]),height:parseFloat(a[1]),top:parseFloat(a[2]),left:parseFloat(a[3]),position:t.attr("position"),overflow:"visible"},!0),t.find(".layui-layer-max").removeClass("layui-layer-maxmin"),t.find(".layui-layer-min").show(),"page"===t.attr("type")&&t.find(l[4]).show(),o.rescollbar(e),n.show()},r.full=function(e){var t,a=i("#"+l[0]+e);o.record(a),l.html.attr("layer-full")||l.html.css("overflow","hidden").attr("layer-full",e),clearTimeout(t),t=setTimeout(function(){var t="fixed"===a.css("position");r.style(e,{top:t?0:n.scrollTop(),left:t?0:n.scrollLeft(),width:n.width(),height:n.height()},!0),a.find(".layui-layer-min").hide()},100)},r.title=function(e,t){var n=i("#"+l[0]+(t||r.index)).find(l[1]);n.html(e)},r.close=function(e,t){var n=i("#"+l[0]+e),a=n.attr("type"),s="layer-anim-close";if(n[0]){var f="layui-layer-wrap",c=function(){if(a===o.type[1]&&"object"===n.attr("conType")){n.children(":not(."+l[5]+")").remove();for(var r=n.find("."+f),s=0;s<2;s++)r.unwrap();r.css("display",r.data("display")).removeClass(f)}else{if(a===o.type[2])try{var c=i("#"+l[4]+e)[0];c.contentWindow.document.write(""),c.contentWindow.close(),n.find("."+l[5])[0].removeChild(c)}catch(u){}n[0].innerHTML="",n.remove()}"function"==typeof o.end[e]&&o.end[e](),delete o.end[e],"function"==typeof t&&t()};n.data("isOutAnim")&&n.addClass("layer-anim "+s),i("#layui-layer-moves, #"+l.SHADE+e).remove(),6==r.ie&&o.reselect(),o.rescollbar(e),n.attr("minLeft")&&(o.minIndex--,o.minLeft.push(n.attr("minLeft"))),r.ie&&r.ie<10||!n.data("isOutAnim")?c():setTimeout(function(){c()},200)}},r.closeAll=function(e,t){"function"==typeof e&&(t=e,e=null);var n=i("."+l[0]);i.each(n,function(a){var o=i(this),s=e?o.attr("type")===e:1;s&&r.close(o.attr("times"),a===n.length-1?t:null),s=null}),0===n.length&&"function"==typeof t&&t()};var f=r.cache||{},c=function(e){return f.skin?" "+f.skin+" "+f.skin+"-"+e:""};r.prompt=function(e,t){var a="";if(e=e||{},"function"==typeof e&&(t=e),e.area){var o=e.area;a='style="width: '+o[0]+"; height: "+o[1]+';"',delete e.area}var s,l=2==e.formType?'<textarea class="layui-layer-input"'+a+"></textarea>":function(){return'<input type="'+(1==e.formType?"password":"text")+'" class="layui-layer-input">'}(),f=e.success;return delete e.success,r.open(i.extend({type:1,btn:["&#x786E;&#x5B9A;","&#x53D6;&#x6D88;"],content:l,skin:"layui-layer-prompt"+c("prompt"),maxWidth:n.width(),success:function(t){s=t.find(".layui-layer-input"),s.val(e.value||"").focus(),"function"==typeof f&&f(t)},resize:!1,yes:function(i){var n=s.val();""===n?s.focus():n.length>(e.maxlength||500)?r.tips("&#x6700;&#x591A;&#x8F93;&#x5165;"+(e.maxlength||500)+"&#x4E2A;&#x5B57;&#x6570;",s,{tips:1}):t&&t(n,i,s)}},e))},r.tab=function(e){e=e||{};var t=e.tab||{},n="layui-this",a=e.success;return delete e.success,r.open(i.extend({type:1,skin:"layui-layer-tab"+c("tab"),resize:!1,title:function(){var e=t.length,i=1,a="";if(e>0)for(a='<span class="'+n+'">'+t[0].title+"</span>";i<e;i++)a+="<span>"+t[i].title+"</span>";return a}(),content:'<ul class="layui-layer-tabmain">'+function(){var e=t.length,i=1,a="";if(e>0)for(a='<li class="layui-layer-tabli '+n+'">'+(t[0].content||"no content")+"</li>";i<e;i++)a+='<li class="layui-layer-tabli">'+(t[i].content||"no  content")+"</li>";return a}()+"</ul>",success:function(t){var o=t.find(".layui-layer-title").children(),r=t.find(".layui-layer-tabmain").children();o.on("mousedown",function(t){t.stopPropagation?t.stopPropagation():t.cancelBubble=!0;var a=i(this),o=a.index();a.addClass(n).siblings().removeClass(n),r.eq(o).show().siblings().hide(),"function"==typeof e.change&&e.change(o)}),"function"==typeof a&&a(t)}},e))},r.photos=function(t,n,a){function o(e,t,i){var n=new Image;return n.src=e,n.complete?t(n):(n.onload=function(){n.onload=null,t(n)},void(n.onerror=function(e){n.onerror=null,i(e)}))}var s={};if(t=t||{},t.photos){var l=!("string"==typeof t.photos||t.photos instanceof i),f=l?t.photos:{},u=f.data||[],d=f.start||0;s.imgIndex=(0|d)+1,t.img=t.img||"img";var y=t.success;if(delete t.success,l){if(0===u.length)return r.msg("&#x6CA1;&#x6709;&#x56FE;&#x7247;")}else{var p=i(t.photos),h=function(){u=[],p.find(t.img).each(function(e){var t=i(this);t.attr("layer-index",e),u.push({alt:t.attr("alt"),pid:t.attr("layer-pid"),src:t.attr("layer-src")||t.attr("src"),thumb:t.attr("src")})})};if(h(),0===u.length)return;if(n||p.on("click",t.img,function(){h();var e=i(this),n=e.attr("layer-index");r.photos(i.extend(t,{photos:{start:n,data:u,tab:t.tab},full:t.full}),!0)}),!n)return}s.imgprev=function(e){s.imgIndex--,s.imgIndex<1&&(s.imgIndex=u.length),s.tabimg(e)},s.imgnext=function(e,t){s.imgIndex++,s.imgIndex>u.length&&(s.imgIndex=1,t)||s.tabimg(e)},s.keyup=function(e){if(!s.end){var t=e.keyCode;e.preventDefault(),37===t?s.imgprev(!0):39===t?s.imgnext(!0):27===t&&r.close(s.index)}},s.tabimg=function(e){if(!(u.length<=1))return f.start=s.imgIndex-1,r.close(s.index),r.photos(t,!0,e)},s.event=function(){s.bigimg.find(".layui-layer-imgprev").on("click",function(e){e.preventDefault(),s.imgprev(!0)}),s.bigimg.find(".layui-layer-imgnext").on("click",function(e){e.preventDefault(),s.imgnext(!0)}),i(document).on("keyup",s.keyup)},s.loadi=r.load(1,{shade:!("shade"in t)&&.9,scrollbar:!1}),o(u[d].src,function(n){r.close(s.loadi),a&&(t.anim=-1),s.index=r.open(i.extend({type:1,id:"layui-layer-photos",area:function(){var a=[n.width,n.height],o=[i(e).width()-100,i(e).height()-100];if(!t.full&&(a[0]>o[0]||a[1]>o[1])){var r=[a[0]/o[0],a[1]/o[1]];r[0]>r[1]?(a[0]=a[0]/r[0],a[1]=a[1]/r[0]):r[0]<r[1]&&(a[0]=a[0]/r[1],a[1]=a[1]/r[1])}return[a[0]+"px",a[1]+"px"]}(),title:!1,shade:.9,shadeClose:!0,closeBtn:!1,move:".layui-layer-phimg img",moveType:1,scrollbar:!1,moveOut:!0,anim:5,isOutAnim:!1,skin:"layui-layer-photos"+c("photos"),content:'<div class="layui-layer-phimg"><img src="'+u[d].src+'" alt="'+(u[d].alt||"")+'" layer-pid="'+u[d].pid+'">'+function(){return u.length>1?'<div class="layui-layer-imgsee"><span class="layui-layer-imguide"><a href="javascript:;" class="layui-layer-iconext layui-layer-imgprev"></a><a href="javascript:;" class="layui-layer-iconext layui-layer-imgnext"></a></span><div class="layui-layer-imgbar" style="display:'+(a?"block":"")+'"><span class="layui-layer-imgtit"><a href="javascript:;">'+(u[d].alt||"")+"</a><em>"+s.imgIndex+" / "+u.length+"</em></span></div></div>":""}()+"</div>",success:function(e,i){s.bigimg=e.find(".layui-layer-phimg"),s.imgsee=e.find(".layui-layer-imgbar"),s.event(e),t.tab&&t.tab(u[d],e),"function"==typeof y&&y(e)},end:function(){s.end=!0,i(document).off("keyup",s.keyup)}},t))},function(){r.close(s.loadi),r.msg("&#x5F53;&#x524D;&#x56FE;&#x7247;&#x5730;&#x5740;&#x5F02;&#x5E38;<br>&#x662F;&#x5426;&#x7EE7;&#x7EED;&#x67E5;&#x770B;&#x4E0B;&#x4E00;&#x5F20;&#xFF1F;",{time:3e4,btn:["&#x4E0B;&#x4E00;&#x5F20;","&#x4E0D;&#x770B;&#x4E86;"],yes:function(){u.length>1&&s.imgnext(!0,!0)}})})}},o.run=function(t){i=t,n=i(e),l.html=i("html"),r.open=function(e){var t=new s(e);return t.index}},e.layui&&layui.define?(r.ready(),layui.define("jquery",function(t){r.path=layui.cache.dir,o.run(layui.$),e.layer=r,t("layer",r)})):"function"==typeof define&&define.amd?define(["jquery"],function(){return o.run(e.jQuery),r}):function(){r.ready(),o.run(e.jQuery)}()}(window);layui.define("jquery",function(e){"use strict";var t=layui.$,i=layui.hint(),n={fixbar:function(e){var i,n,r="layui-fixbar",a="layui-fixbar-top",o=t(document),l=t("body");e=t.extend({showHeight:200},e),e.bar1=e.bar1===!0?"&#xe606;":e.bar1,e.bar2=e.bar2===!0?"&#xe607;":e.bar2,e.bgcolor=e.bgcolor?"background-color:"+e.bgcolor:"";var c=[e.bar1,e.bar2,"&#xe604;"],g=t(['<ul class="'+r+'">',e.bar1?'<li class="layui-icon" lay-type="bar1" style="'+e.bgcolor+'">'+c[0]+"</li>":"",e.bar2?'<li class="layui-icon" lay-type="bar2" style="'+e.bgcolor+'">'+c[1]+"</li>":"",'<li class="layui-icon '+a+'" lay-type="top" style="'+e.bgcolor+'">'+c[2]+"</li>","</ul>"].join("")),u=g.find("."+a),s=function(){var t=o.scrollTop();t>=e.showHeight?i||(u.show(),i=1):i&&(u.hide(),i=0)};t("."+r)[0]||("object"==typeof e.css&&g.css(e.css),l.append(g),s(),g.find("li").on("click",function(){var i=t(this),n=i.attr("lay-type");"top"===n&&t("html,body").animate({scrollTop:0},200),e.click&&e.click.call(this,n)}),o.on("scroll",function(){clearTimeout(n),n=setTimeout(function(){s()},100)}))},countdown:function(e,t,i){var n=this,r="function"==typeof t,a=new Date(e).getTime(),o=new Date(!t||r?(new Date).getTime():t).getTime(),l=a-o,c=[Math.floor(l/864e5),Math.floor(l/36e5)%24,Math.floor(l/6e4)%60,Math.floor(l/1e3)%60];r&&(i=t);var g=setTimeout(function(){n.countdown(e,o+1e3,i)},1e3);return i&&i(l>0?c:[0,0,0,0],t,g),l<=0&&clearTimeout(g),g},timeAgo:function(e,t){var i=this,n=[[],[]],r=(new Date).getTime()-new Date(e).getTime();return r>26784e5?(r=new Date(e),n[0][0]=i.digit(r.getFullYear(),4),n[0][1]=i.digit(r.getMonth()+1),n[0][2]=i.digit(r.getDate()),t||(n[1][0]=i.digit(r.getHours()),n[1][1]=i.digit(r.getMinutes()),n[1][2]=i.digit(r.getSeconds())),n[0].join("-")+" "+n[1].join(":")):r>=864e5?(r/1e3/60/60/24|0)+"\u5929\u524d":r>=36e5?(r/1e3/60/60|0)+"\u5c0f\u65f6\u524d":r>=18e4?(r/1e3/60|0)+"\u5206\u949f\u524d":r<0?"\u672a\u6765":"\u521a\u521a"},digit:function(e,t){var i="";e=String(e),t=t||2;for(var n=e.length;n<t;n++)i+="0";return e<Math.pow(10,t)?i+(0|e):e},toDateString:function(e,t){if(null===e||""===e)return"";var n=this,r=new Date(function(){if(e)return isNaN(e)?e:"string"==typeof e?parseInt(e):e}()||new Date),a=[n.digit(r.getFullYear(),4),n.digit(r.getMonth()+1),n.digit(r.getDate())],o=[n.digit(r.getHours()),n.digit(r.getMinutes()),n.digit(r.getSeconds())];return r.getDate()?(t=t||"yyyy-MM-dd HH:mm:ss",t.replace(/yyyy/g,a[0]).replace(/MM/g,a[1]).replace(/dd/g,a[2]).replace(/HH/g,o[0]).replace(/mm/g,o[1]).replace(/ss/g,o[2])):(i.error('Invalid Msec for "util.toDateString(Msec)"'),"")},escape:function(e){return String(e||"").replace(/&(?!#?[a-zA-Z0-9]+;)/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/'/g,"&#39;").replace(/"/g,"&quot;")},unescape:function(e){return String(e||"").replace(/\&amp;/g,"&").replace(/\&lt;/g,"<").replace(/\&gt;/g,">").replace(/\&#39;/,"'").replace(/\&quot;/,'"')},toVisibleArea:function(e){if(e=t.extend({margin:160,duration:200,type:"y"},e),e.scrollElem[0]&&e.thisElem[0]){var i=e.scrollElem,n=e.thisElem,r="y"===e.type,a=r?"scrollTop":"scrollLeft",o=r?"top":"left",l=i[a](),c=i[r?"height":"width"](),g=i.offset()[o],u=n.offset()[o]-g,s={};(u>c-e.margin||u<e.margin)&&(s[a]=u-c/2+l,i.animate(s,e.duration))}},event:function(e,i,r){var a=t("body");return r=r||"click",i=n.event[e]=t.extend(!0,n.event[e],i)||{},n.event.UTIL_EVENT_CALLBACK=n.event.UTIL_EVENT_CALLBACK||{},a.off(r,"*["+e+"]",n.event.UTIL_EVENT_CALLBACK[e]),n.event.UTIL_EVENT_CALLBACK[e]=function(){var n=t(this),r=n.attr(e);"function"==typeof i[r]&&i[r].call(this,n)},a.on(r,"*["+e+"]",n.event.UTIL_EVENT_CALLBACK[e]),i}};e("util",n)});layui.define("jquery",function(t){"use strict";var i=layui.$,a=(layui.hint(),layui.device()),e="element",l="layui-this",n="layui-show",s=function(){this.config={}};s.prototype.set=function(t){var a=this;return i.extend(!0,a.config,t),a},s.prototype.on=function(t,i){return layui.onevent.call(this,e,t,i)},s.prototype.tabAdd=function(t,a){var e=".layui-tab-title",l=i(".layui-tab[lay-filter="+t+"]"),n=l.children(e),s=n.children(".layui-tab-bar"),o=l.children(".layui-tab-content"),r="<li"+function(){var t=[];return layui.each(a,function(i,a){/^(title|content)$/.test(i)||t.push("lay-"+i+'="'+a+'"')}),t.length>0&&t.unshift(""),t.join(" ")}()+">"+(a.title||"unnaming")+"</li>";return s[0]?s.before(r):n.append(r),o.append('<div class="layui-tab-item">'+(a.content||"")+"</div>"),b.hideTabMore(!0),b.tabAuto(),this},s.prototype.tabDelete=function(t,a){var e=".layui-tab-title",l=i(".layui-tab[lay-filter="+t+"]"),n=l.children(e),s=n.find('>li[lay-id="'+a+'"]');return b.tabDelete(null,s),this},s.prototype.tabChange=function(t,a){var e=".layui-tab-title",l=i(".layui-tab[lay-filter="+t+"]"),n=l.children(e),s=n.find('>li[lay-id="'+a+'"]');return b.tabClick.call(s[0],null,null,s),this},s.prototype.tab=function(t){t=t||{},m.on("click",t.headerElem,function(a){var e=i(this).index();b.tabClick.call(this,a,e,null,t)})},s.prototype.progress=function(t,a){var e="layui-progress",l=i("."+e+"[lay-filter="+t+"]"),n=l.find("."+e+"-bar"),s=n.find("."+e+"-text");return n.css("width",a).attr("lay-percent",a),s.text(a),this};var o=".layui-nav",r="layui-nav-item",c="layui-nav-bar",u="layui-nav-tree",y="layui-nav-child",d="layui-nav-child-c",f="layui-nav-more",h="layui-icon-down",p="layui-anim layui-anim-upbit",b={tabClick:function(t,a,s,o){o=o||{};var r=s||i(this),a=a||r.parent().children("li").index(r),c=o.headerElem?r.parent():r.parents(".layui-tab").eq(0),u=o.bodyElem?i(o.bodyElem):c.children(".layui-tab-content").children(".layui-tab-item"),y=r.find("a"),d="javascript:;"!==y.attr("href")&&"_blank"===y.attr("target"),f="string"==typeof r.attr("lay-unselect"),h=c.attr("lay-filter");d||f||(r.addClass(l).siblings().removeClass(l),u.eq(a).addClass(n).siblings().removeClass(n)),layui.event.call(this,e,"tab("+h+")",{elem:c,index:a})},tabDelete:function(t,a){var n=a||i(this).parent(),s=n.index(),o=n.parents(".layui-tab").eq(0),r=o.children(".layui-tab-content").children(".layui-tab-item"),c=o.attr("lay-filter");n.hasClass(l)&&(n.next()[0]?b.tabClick.call(n.next()[0],null,s+1):n.prev()[0]&&b.tabClick.call(n.prev()[0],null,s-1)),n.remove(),r.eq(s).remove(),setTimeout(function(){b.tabAuto()},50),layui.event.call(this,e,"tabDelete("+c+")",{elem:o,index:s})},tabAuto:function(){var t="layui-tab-more",e="layui-tab-bar",l="layui-tab-close",n=this;i(".layui-tab").each(function(){var s=i(this),o=s.children(".layui-tab-title"),r=(s.children(".layui-tab-content").children(".layui-tab-item"),'lay-stope="tabmore"'),c=i('<span class="layui-unselect layui-tab-bar" '+r+"><i "+r+' class="layui-icon">&#xe61a;</i></span>');if(n===window&&8!=a.ie&&b.hideTabMore(!0),s.attr("lay-allowClose")&&o.find("li").each(function(){var t=i(this);if(!t.find("."+l)[0]){var a=i('<i class="layui-icon layui-icon-close layui-unselect '+l+'"></i>');a.on("click",b.tabDelete),t.append(a)}}),"string"!=typeof s.attr("lay-unauto"))if(o.prop("scrollWidth")>o.outerWidth()+1){if(o.find("."+e)[0])return;o.append(c),s.attr("overflow",""),c.on("click",function(i){o[this.title?"removeClass":"addClass"](t),this.title=this.title?"":"\u6536\u7f29"})}else o.find("."+e).remove(),s.removeAttr("overflow")})},hideTabMore:function(t){var a=i(".layui-tab-title");t!==!0&&"tabmore"===i(t.target).attr("lay-stope")||(a.removeClass("layui-tab-more"),a.find(".layui-tab-bar").attr("title",""))},clickThis:function(){var t=i(this),a=t.parents(o),n=a.attr("lay-filter"),s=t.parent(),c=t.siblings("."+y),d="string"==typeof s.attr("lay-unselect");"javascript:;"!==t.attr("href")&&"_blank"===t.attr("target")||d||c[0]||(a.find("."+l).removeClass(l),s.addClass(l)),a.hasClass(u)&&(c.removeClass(p),c[0]&&(s["none"===c.css("display")?"addClass":"removeClass"](r+"ed"),"all"===a.attr("lay-shrink")&&s.siblings().removeClass(r+"ed"))),layui.event.call(this,e,"nav("+n+")",t)},collapse:function(){var t=i(this),a=t.find(".layui-colla-icon"),l=t.siblings(".layui-colla-content"),s=t.parents(".layui-collapse").eq(0),o=s.attr("lay-filter"),r="none"===l.css("display");if("string"==typeof s.attr("lay-accordion")){var c=s.children(".layui-colla-item").children("."+n);c.siblings(".layui-colla-title").children(".layui-colla-icon").html("&#xe602;"),c.removeClass(n)}l[r?"addClass":"removeClass"](n),a.html(r?"&#xe61a;":"&#xe602;"),layui.event.call(this,e,"collapse("+o+")",{title:t,content:l,show:r})}};s.prototype.init=function(t,e){var l=function(){return e?'[lay-filter="'+e+'"]':""}(),s={tab:function(){b.tabAuto.call({})},nav:function(){var t=200,e={},s={},v={},m="layui-nav-title",C=function(l,o,r){var c=i(this),h=c.find("."+y);if(o.hasClass(u)){if(!h[0]){var b=c.children("."+m);l.css({top:c.offset().top-o.offset().top,height:(b[0]?b:c).outerHeight(),opacity:1})}}else h.addClass(p),h.hasClass(d)&&h.css({left:-(h.outerWidth()-c.width())/2}),h[0]?l.css({left:l.position().left+l.width()/2,width:0,opacity:0}):l.css({left:c.position().left+parseFloat(c.css("marginLeft")),top:c.position().top+c.height()-l.height()}),e[r]=setTimeout(function(){l.css({width:h[0]?0:c.width(),opacity:h[0]?0:1})},a.ie&&a.ie<10?0:t),clearTimeout(v[r]),"block"===h.css("display")&&clearTimeout(s[r]),s[r]=setTimeout(function(){h.addClass(n),c.find("."+f).addClass(f+"d")},300)};i(o+l).each(function(a){var l=i(this),o=i('<span class="'+c+'"></span>'),d=l.find("."+r);l.find("."+c)[0]||(l.append(o),(l.hasClass(u)?d.find("dd,>."+m):d).on("mouseenter",function(){C.call(this,o,l,a)}).on("mouseleave",function(){l.hasClass(u)?o.css({height:0,opacity:0}):(clearTimeout(s[a]),s[a]=setTimeout(function(){l.find("."+y).removeClass(n),l.find("."+f).removeClass(f+"d")},300))}),l.on("mouseleave",function(){clearTimeout(e[a]),v[a]=setTimeout(function(){l.hasClass(u)||o.css({width:0,left:o.position().left+o.width()/2,opacity:0})},t)})),d.find("a").each(function(){var t=i(this),a=(t.parent(),t.siblings("."+y));a[0]&&!t.children("."+f)[0]&&t.append('<i class="layui-icon '+h+" "+f+'"></i>'),t.off("click",b.clickThis).on("click",b.clickThis)})})},breadcrumb:function(){var t=".layui-breadcrumb";i(t+l).each(function(){var t=i(this),a="lay-separator",e=t.attr(a)||"/",l=t.find("a");l.next("span["+a+"]")[0]||(l.each(function(t){t!==l.length-1&&i(this).after("<span "+a+">"+e+"</span>")}),t.css("visibility","visible"))})},progress:function(){var t="layui-progress";i("."+t+l).each(function(){var a=i(this),e=a.find(".layui-progress-bar"),l=e.attr("lay-percent");e.css("width",function(){return/^.+\/.+$/.test(l)?100*new Function("return "+l)()+"%":l}()),a.attr("lay-showPercent")&&setTimeout(function(){e.html('<span class="'+t+'-text">'+l+"</span>")},350)})},collapse:function(){var t="layui-collapse";i("."+t+l).each(function(){var t=i(this).find(".layui-colla-item");t.each(function(){var t=i(this),a=t.find(".layui-colla-title"),e=t.find(".layui-colla-content"),l="none"===e.css("display");a.find(".layui-colla-icon").remove(),a.append('<i class="layui-icon layui-colla-icon">'+(l?"&#xe602;":"&#xe61a;")+"</i>"),a.off("click",b.collapse).on("click",b.collapse)})})}};return s[t]?s[t]():layui.each(s,function(t,i){i()})},s.prototype.render=s.prototype.init;var v=new s,m=i(document);i(function(){v.render()});var C=".layui-tab-title li";m.on("click",C,b.tabClick),m.on("click",b.hideTabMore),i(window).on("resize",b.tabAuto),t(e,v)});layui.define("layer",function(e){"use strict";var t=layui.$,i=layui.layer,n=layui.hint(),o=layui.device(),a={config:{},set:function(e){var i=this;return i.config=t.extend({},i.config,e),i},on:function(e,t){return layui.onevent.call(this,r,e,t)}},l=function(){var e=this;return{upload:function(t){e.upload.call(e,t)},reload:function(t){e.reload.call(e,t)},config:e.config}},r="upload",u="layui-upload-file",c="layui-upload-form",f="layui-upload-iframe",s="layui-upload-choose",p=function(e){var i=this;i.config=t.extend({},i.config,a.config,e),i.render()};p.prototype.config={accept:"images",exts:"",auto:!0,bindAction:"",url:"",field:"file",acceptMime:"",method:"post",data:{},drag:!0,size:0,number:0,multiple:!1},p.prototype.render=function(e){var i=this,e=i.config;e.elem=t(e.elem),e.bindAction=t(e.bindAction),i.file(),i.events()},p.prototype.file=function(){var e=this,i=e.config,n=e.elemFile=t(['<input class="'+u+'" type="file" accept="'+i.acceptMime+'" name="'+i.field+'"',i.multiple?" multiple":"",">"].join("")),a=i.elem.next();(a.hasClass(u)||a.hasClass(c))&&a.remove(),o.ie&&o.ie<10&&i.elem.wrap('<div class="layui-upload-wrap"></div>'),e.isFile()?(e.elemFile=i.elem,i.field=i.elem[0].name):i.elem.after(n),o.ie&&o.ie<10&&e.initIE()},p.prototype.initIE=function(){var e=this,i=e.config,n=t('<iframe id="'+f+'" class="'+f+'" name="'+f+'" frameborder="0"></iframe>'),o=t(['<form target="'+f+'" class="'+c+'" method="post" key="set-mine" enctype="multipart/form-data" action="'+i.url+'">',"</form>"].join(""));t("#"+f)[0]||t("body").append(n),i.elem.next().hasClass(c)||(e.elemFile.wrap(o),i.elem.next("."+c).append(function(){var e=[];return layui.each(i.data,function(t,i){i="function"==typeof i?i():i,e.push('<input type="hidden" name="'+t+'" value="'+i+'">')}),e.join("")}()))},p.prototype.msg=function(e){return i.msg(e,{icon:2,shift:6})},p.prototype.isFile=function(){var e=this.config.elem[0];if(e)return"input"===e.tagName.toLocaleLowerCase()&&"file"===e.type},p.prototype.preview=function(e){var t=this;window.FileReader&&layui.each(t.chooseFiles,function(t,i){var n=new FileReader;n.readAsDataURL(i),n.onload=function(){e&&e(t,i,this.result)}})},p.prototype.upload=function(e,i){var n,a=this,l=a.config,r=a.elemFile[0],u=function(){var i=0,n=0,o=e||a.files||a.chooseFiles||r.files,u=function(){l.multiple&&i+n===a.fileLength&&"function"==typeof l.allDone&&l.allDone({total:a.fileLength,successful:i,aborted:n})};layui.each(o,function(e,o){var r=new FormData;r.append(l.field,o),layui.each(l.data,function(e,t){t="function"==typeof t?t():t,r.append(e,t)});var c={url:l.url,type:"post",data:r,contentType:!1,processData:!1,dataType:"json",headers:l.headers||{},success:function(t){i++,d(e,t),u()},error:function(){n++,a.msg("\u8bf7\u6c42\u4e0a\u4f20\u63a5\u53e3\u51fa\u73b0\u5f02\u5e38"),m(e),u()}};"function"==typeof l.progress&&(c.xhr=function(){var i=t.ajaxSettings.xhr();return i.upload.addEventListener("progress",function(t){if(t.lengthComputable){var i=Math.floor(t.loaded/t.total*100);l.progress(i,l.item?l.item[0]:l.elem[0],t,e)}}),i}),t.ajax(c)})},c=function(){var e=t("#"+f);a.elemFile.parent().submit(),clearInterval(p.timer),p.timer=setInterval(function(){var t,i=e.contents().find("body");try{t=i.text()}catch(n){a.msg("\u83b7\u53d6\u4e0a\u4f20\u540e\u7684\u54cd\u5e94\u4fe1\u606f\u51fa\u73b0\u5f02\u5e38"),clearInterval(p.timer),m()}t&&(clearInterval(p.timer),i.html(""),d(0,t))},30)},d=function(e,t){if(a.elemFile.next("."+s).remove(),r.value="","object"!=typeof t)try{t=JSON.parse(t)}catch(i){return t={},a.msg("\u8bf7\u5bf9\u4e0a\u4f20\u63a5\u53e3\u8fd4\u56de\u6709\u6548JSON")}"function"==typeof l.done&&l.done(t,e||0,function(e){a.upload(e)})},m=function(e){l.auto&&(r.value=""),"function"==typeof l.error&&l.error(e||0,function(e){a.upload(e)})},h=l.exts,v=function(){var t=[];return layui.each(e||a.chooseFiles,function(e,i){t.push(i.name)}),t}(),g={preview:function(e){a.preview(e)},upload:function(e,t){var i={};i[e]=t,a.upload(i)},pushFile:function(){return a.files=a.files||{},layui.each(a.chooseFiles,function(e,t){a.files[e]=t}),a.files},resetFile:function(e,t,i){var n=new File([t],i);a.files=a.files||{},a.files[e]=n}},y=function(){if(!(("choose"===i||l.auto)&&(l.choose&&l.choose(g),"choose"===i)||l.before&&l.before(g)===!1))return o.ie?o.ie>9?u():c():void u()};if(v=0===v.length?r.value.match(/[^\/\\]+\..+/g)||[]||"":v,0!==v.length){switch(l.accept){case"file":if(h&&!RegExp("\\w\\.("+h+")$","i").test(escape(v)))return a.msg("\u9009\u62e9\u7684\u6587\u4ef6\u4e2d\u5305\u542b\u4e0d\u652f\u6301\u7684\u683c\u5f0f"),r.value="";break;case"video":if(!RegExp("\\w\\.("+(h||"avi|mp4|wma|rmvb|rm|flash|3gp|flv")+")$","i").test(escape(v)))return a.msg("\u9009\u62e9\u7684\u89c6\u9891\u4e2d\u5305\u542b\u4e0d\u652f\u6301\u7684\u683c\u5f0f"),r.value="";break;case"audio":if(!RegExp("\\w\\.("+(h||"mp3|wav|mid")+")$","i").test(escape(v)))return a.msg("\u9009\u62e9\u7684\u97f3\u9891\u4e2d\u5305\u542b\u4e0d\u652f\u6301\u7684\u683c\u5f0f"),r.value="";break;default:if(layui.each(v,function(e,t){RegExp("\\w\\.("+(h||"jpg|png|gif|bmp|jpeg$")+")","i").test(escape(t))||(n=!0)}),n)return a.msg("\u9009\u62e9\u7684\u56fe\u7247\u4e2d\u5305\u542b\u4e0d\u652f\u6301\u7684\u683c\u5f0f"),r.value=""}if(a.fileLength=function(){var t=0,i=e||a.files||a.chooseFiles||r.files;return layui.each(i,function(){t++}),t}(),l.number&&a.fileLength>l.number)return a.msg("\u540c\u65f6\u6700\u591a\u53ea\u80fd\u4e0a\u4f20\u7684\u6570\u91cf\u4e3a\uff1a"+l.number);if(l.size>0&&!(o.ie&&o.ie<10)){var F;if(layui.each(a.chooseFiles,function(e,t){if(t.size>1024*l.size){var i=l.size/1024;i=i>=1?i.toFixed(2)+"MB":l.size+"KB",r.value="",F=i}}),F)return a.msg("\u6587\u4ef6\u4e0d\u80fd\u8d85\u8fc7"+F)}y()}},p.prototype.reload=function(e){e=e||{},delete e.elem,delete e.bindAction;var i=this,e=i.config=t.extend({},i.config,a.config,e),n=e.elem.next();n.attr({name:e.name,accept:e.acceptMime,multiple:e.multiple})},p.prototype.events=function(){var e=this,i=e.config,a=function(t){e.chooseFiles={},layui.each(t,function(t,i){var n=(new Date).getTime();e.chooseFiles[n+"-"+t]=i})},l=function(t,n){var o=e.elemFile,a=(i.item?i.item:i.elem,t.length>1?t.length+"\u4e2a\u6587\u4ef6":(t[0]||{}).name||o[0].value.match(/[^\/\\]+\..+/g)||[]||"");o.next().hasClass(s)&&o.next().remove(),e.upload(null,"choose"),e.isFile()||i.choose||o.after('<span class="layui-inline '+s+'">'+a+"</span>")};i.elem.off("upload.start").on("upload.start",function(){var o=t(this),a=o.attr("lay-data");if(a)try{a=new Function("return "+a)(),e.config=t.extend({},i,a)}catch(l){n.error("Upload element property lay-data configuration item has a syntax error: "+a)}e.config.item=o,e.elemFile[0].click()}),o.ie&&o.ie<10||i.elem.off("upload.over").on("upload.over",function(){var e=t(this);e.attr("lay-over","")}).off("upload.leave").on("upload.leave",function(){var e=t(this);e.removeAttr("lay-over")}).off("upload.drop").on("upload.drop",function(n,o){var r=t(this),u=o.originalEvent.dataTransfer.files||[];r.removeAttr("lay-over"),a(u),i.auto?e.upload(u):l(u)}),e.elemFile.off("upload.change").on("upload.change",function(){var t=this.files||[];a(t),i.auto?e.upload():l(t)}),i.bindAction.off("upload.action").on("upload.action",function(){e.upload()}),i.elem.data("haveEvents")||(e.elemFile.on("change",function(){t(this).trigger("upload.change")}),i.elem.on("click",function(){e.isFile()||t(this).trigger("upload.start")}),i.drag&&i.elem.on("dragover",function(e){e.preventDefault(),t(this).trigger("upload.over")}).on("dragleave",function(e){t(this).trigger("upload.leave")}).on("drop",function(e){e.preventDefault(),t(this).trigger("upload.drop",e)}),i.bindAction.on("click",function(){t(this).trigger("upload.action")}),i.elem.data("haveEvents",!0))},a.render=function(e){var t=new p(e);return l.call(t)},e(r,a)});layui.define(["jquery","laytpl","lay"],function(e){"use strict";var i=layui.$,n=layui.laytpl,t=layui.hint(),a=layui.device(),l=a.mobile?"click":"mousedown",r="dropdown",o="layui_"+r+"_index",u={config:{},index:layui[r]?layui[r].index+1e4:0,set:function(e){var n=this;return n.config=i.extend({},n.config,e),n},on:function(e,i){return layui.onevent.call(this,r,e,i)}},d=function(){var e=this,i=e.config,n=i.id;return d.that[n]=e,{config:i,reload:function(i){e.reload.call(e,i)}}},s="layui-dropdown",m="layui-menu-item-up",c="layui-menu-item-down",p="layui-menu-body-title",y="layui-menu-item-group",f="layui-menu-item-parent",v="layui-menu-item-divider",g="layui-menu-item-checked",h="layui-menu-item-checked2",w="layui-menu-body-panel",C="layui-menu-body-panel-left",V="."+y+">."+p,k=function(e){var n=this;n.index=++u.index,n.config=i.extend({},n.config,u.config,e),n.init()};k.prototype.config={trigger:"click",content:"",className:"",style:"",show:!1,isAllowSpread:!0,isSpreadItem:!0,data:[],delay:300},k.prototype.reload=function(e){var n=this;n.config=i.extend({},n.config,e),n.init(!0)},k.prototype.init=function(e){var n=this,t=n.config,a=t.elem=i(t.elem);if(a.length>1)return layui.each(a,function(){u.render(i.extend({},t,{elem:this}))}),n;if(!e&&a[0]&&a.data(o)){var l=d.getThis(a.data(o));if(!l)return;return l.reload(t)}t.id="id"in t?t.id:n.index,t.show&&n.render(e),n.events()},k.prototype.render=function(e){var t=this,a=t.config,r=i("body"),s=function(){var e=i('<ul class="layui-menu layui-dropdown-menu"></ul>');return a.data.length>0?m(e,a.data):e.html('<li class="layui-menu-item-none">no menu</li>'),e},m=function(e,t){return layui.each(t,function(t,l){var r=l.child&&l.child.length>0,o="isSpreadItem"in l?l.isSpreadItem:a.isSpreadItem,u=l.templet?n(l.templet).render(l):a.templet?n(a.templet).render(l):l.title,d=function(){return r&&(l.type=l.type||"parent"),l.type?{group:"group",parent:"parent","-":"-"}[l.type]||"parent":""}();if("-"===d||l.title||l.id||r){var s=i(["<li"+function(){var e={group:"layui-menu-item-group"+(a.isAllowSpread?o?" layui-menu-item-down":" layui-menu-item-up":""),parent:f,"-":"layui-menu-item-divider"};return r||d?' class="'+e[d]+'"':""}()+">",function(){var e="href"in l?'<a href="'+l.href+'" target="'+(l.target||"_self")+'">'+u+"</a>":u;return r?'<div class="'+p+'">'+e+function(){return"parent"===d?'<i class="layui-icon layui-icon-right"></i>':"group"===d&&a.isAllowSpread?'<i class="layui-icon layui-icon-'+(o?"up":"down")+'"></i>':""}()+"</div>":'<div class="'+p+'">'+e+"</div>"}(),"</li>"].join(""));if(s.data("item",l),r){var c=i('<div class="layui-panel layui-menu-body-panel"></div>'),y=i("<ul></ul>");"parent"===d?(c.append(m(y,l.child)),s.append(c)):s.append(m(y,l.child))}e.append(s)}}),e},c=['<div class="layui-dropdown layui-border-box layui-panel layui-anim layui-anim-downbit">',"</div>"].join("");("contextmenu"===a.trigger||lay.isTopElem(a.elem[0]))&&(e=!0),!e&&a.elem.data(o+"_opened")||(t.elemView=i(c),t.elemView.append(a.content||s()),a.className&&t.elemView.addClass(a.className),a.style&&t.elemView.attr("style",a.style),u.thisId=a.id,t.remove(),r.append(t.elemView),a.elem.data(o+"_opened",!0),t.position(),d.prevElem=t.elemView,d.prevElem.data("prevElem",a.elem),t.elemView.find(".layui-menu").on(l,function(e){layui.stope(e)}),t.elemView.find(".layui-menu li").on("click",function(e){var n=i(this),l=n.data("item")||{},r=l.child&&l.child.length>0;r||"-"===l.type||(t.remove(),"function"==typeof a.click&&a.click(l,n))}),t.elemView.find(V).on("click",function(e){var n=i(this),t=n.parent(),l=t.data("item")||{};"group"===l.type&&a.isAllowSpread&&d.spread(t)}),"mouseenter"===a.trigger&&t.elemView.on("mouseenter",function(){clearTimeout(d.timer)}).on("mouseleave",function(){t.delayRemove()}))},k.prototype.position=function(e){var i=this,n=i.config;lay.position(n.elem[0],i.elemView[0],{position:n.position,e:i.e,clickType:"contextmenu"===n.trigger?"right":null})},k.prototype.remove=function(){var e=this,i=(e.config,d.prevElem);i&&(i.data("prevElem")&&i.data("prevElem").data(o+"_opened",!1),i.remove())},k.prototype.delayRemove=function(){var e=this,i=e.config;clearTimeout(d.timer),d.timer=setTimeout(function(){e.remove()},i.delay)},k.prototype.events=function(){var e=this,i=e.config;"hover"===i.trigger&&(i.trigger="mouseenter"),e.prevElem&&e.prevElem.off(i.trigger,e.prevElemCallback),e.prevElem=i.elem,e.prevElemCallback=function(n){clearTimeout(d.timer),e.e=n,e.render(),n.preventDefault(),"function"==typeof i.ready&&i.ready(e.elemView,i.elem,e.e.target)},i.elem.on(i.trigger,e.prevElemCallback),"mouseenter"===i.trigger&&i.elem.on("mouseleave",function(){e.delayRemove()})},d.that={},d.getThis=function(e){var i=d.that[e];return i||t.error(e?r+" instance with ID '"+e+"' not found":"ID argument required"),i},d.spread=function(e){var i=e.children("."+p).find(".layui-icon");e.hasClass(m)?(e.removeClass(m).addClass(c),i.removeClass("layui-icon-down").addClass("layui-icon-up")):(e.removeClass(c).addClass(m),i.removeClass("layui-icon-up").addClass("layui-icon-down"))},!function(){var e=i(window),n=i(document);e.on("resize",function(){if(u.thisId){var e=d.getThis(u.thisId);if(e){if(!e.elemView[0]||!i("."+s)[0])return!1;var n=e.config;"contextmenu"===n.trigger?e.remove():e.position()}}}),n.on(l,function(e){if(u.thisId){var i=d.getThis(u.thisId);if(i){var n=i.config;!lay.isTopElem(n.elem[0])&&"contextmenu"!==n.trigger&&(e.target===n.elem[0]||n.elem.find(e.target)[0]||e.target===i.elemView[0]||i.elemView&&i.elemView.find(e.target)[0])||i.remove()}}});var t=".layui-menu:not(.layui-dropdown-menu) li";n.on("click",t,function(e){var n=i(this),t=n.parents(".layui-menu").eq(0),a=n.hasClass(y)||n.hasClass(f),l=t.attr("lay-filter")||t.attr("id"),o=lay.options(this);n.hasClass(v)||a||(t.find("."+g).removeClass(g),t.find("."+h).removeClass(h),n.addClass(g),n.parents("."+f).addClass(h),layui.event.call(this,r,"click("+l+")",o))}),n.on("click",t+V,function(e){var n=i(this),t=n.parents("."+y+":eq(0)"),a=lay.options(t[0]);"isAllowSpread"in a&&!a.isAllowSpread||d.spread(t)});var a=".layui-menu ."+f;n.on("mouseenter",a,function(n){var t=i(this),a=t.find("."+w);if(a[0]){var l=a[0].getBoundingClientRect();l.right>e.width()&&(a.addClass(C),l=a[0].getBoundingClientRect(),l.left<0&&a.removeClass(C)),l.bottom>e.height()&&a.eq(0).css("margin-top",-(l.bottom-e.height()))}}).on("mouseleave",a,function(e){var n=i(this),t=n.children("."+w);t.removeClass(C),t.css("margin-top",0)})}(),u.reload=function(e,i){var n=d.getThis(e);return n?(n.reload(i),d.call(n)):this},u.render=function(e){var i=new k(e);return d.call(i)},e(r,u)});layui.define("jquery",function(e){"use strict";var i=layui.jquery,t={config:{},index:layui.slider?layui.slider.index+1e4:0,set:function(e){var t=this;return t.config=i.extend({},t.config,e),t},on:function(e,i){return layui.onevent.call(this,n,e,i)}},a=function(){var e=this,i=e.config;return{setValue:function(t,a){return i.value=t,e.slide("set",t,a||0)},config:i}},n="slider",l="layui-disabled",s="layui-slider",r="layui-slider-bar",o="layui-slider-wrap",u="layui-slider-wrap-btn",d="layui-slider-tips",v="layui-slider-input",c="layui-slider-input-txt",p="layui-slider-input-btn",m="layui-slider-hover",f=function(e){var a=this;a.index=++t.index,a.config=i.extend({},a.config,t.config,e),a.render()};f.prototype.config={type:"default",min:0,max:100,value:0,step:1,showstep:!1,tips:!0,input:!1,range:!1,height:200,disabled:!1,theme:"#009688"},f.prototype.render=function(){var e=this,t=e.config;if(t.step<1&&(t.step=1),t.max<t.min&&(t.max=t.min+t.step),t.range){t.value="object"==typeof t.value?t.value:[t.min,t.value];var a=Math.min(t.value[0],t.value[1]),n=Math.max(t.value[0],t.value[1]);t.value[0]=a>t.min?a:t.min,t.value[1]=n>t.min?n:t.min,t.value[0]=t.value[0]>t.max?t.max:t.value[0],t.value[1]=t.value[1]>t.max?t.max:t.value[1];var r=Math.floor((t.value[0]-t.min)/(t.max-t.min)*100),v=Math.floor((t.value[1]-t.min)/(t.max-t.min)*100),p=v-r+"%";r+="%",v+="%"}else{"object"==typeof t.value&&(t.value=Math.min.apply(null,t.value)),t.value<t.min&&(t.value=t.min),t.value>t.max&&(t.value=t.max);var p=Math.floor((t.value-t.min)/(t.max-t.min)*100)+"%"}var m=t.disabled?"#c2c2c2":t.theme,f='<div class="layui-slider '+("vertical"===t.type?"layui-slider-vertical":"")+'">'+(t.tips?'<div class="layui-slider-tips"></div>':"")+'<div class="layui-slider-bar" style="background:'+m+"; "+("vertical"===t.type?"height":"width")+":"+p+";"+("vertical"===t.type?"bottom":"left")+":"+(r||0)+';"></div><div class="layui-slider-wrap" style="'+("vertical"===t.type?"bottom":"left")+":"+(r||p)+';"><div class="layui-slider-wrap-btn" style="border: 2px solid '+m+';"></div></div>'+(t.range?'<div class="layui-slider-wrap" style="'+("vertical"===t.type?"bottom":"left")+":"+v+';"><div class="layui-slider-wrap-btn" style="border: 2px solid '+m+';"></div></div>':"")+"</div>",h=i(t.elem),y=h.next("."+s);if(y[0]&&y.remove(),e.elemTemp=i(f),t.range?(e.elemTemp.find("."+o).eq(0).data("value",t.value[0]),e.elemTemp.find("."+o).eq(1).data("value",t.value[1])):e.elemTemp.find("."+o).data("value",t.value),h.html(e.elemTemp),"vertical"===t.type&&e.elemTemp.height(t.height+"px"),t.showstep){for(var g=(t.max-t.min)/t.step,b="",x=1;x<g+1;x++){var T=100*x/g;T<100&&(b+='<div class="layui-slider-step" style="'+("vertical"===t.type?"bottom":"left")+":"+T+'%"></div>')}e.elemTemp.append(b)}if(t.input&&!t.range){var w=i('<div class="layui-slider-input layui-input"><div class="layui-slider-input-txt"><input type="text" class="layui-input"></div><div class="layui-slider-input-btn"><i class="layui-icon layui-icon-up"></i><i class="layui-icon layui-icon-down"></i></div></div>');h.css("position","relative"),h.append(w),h.find("."+c).children("input").val(t.value),"vertical"===t.type?w.css({left:0,top:-48}):e.elemTemp.css("margin-right",w.outerWidth()+15)}t.disabled?(e.elemTemp.addClass(l),e.elemTemp.find("."+u).addClass(l)):e.slide(),e.elemTemp.find("."+u).on("mouseover",function(){var a="vertical"===t.type?t.height:e.elemTemp[0].offsetWidth,n=e.elemTemp.find("."+o),l="vertical"===t.type?a-i(this).parent()[0].offsetTop-n.height():i(this).parent()[0].offsetLeft,s=l/a*100,r=i(this).parent().data("value"),u=t.setTips?t.setTips(r):r;e.elemTemp.find("."+d).html(u),"vertical"===t.type?e.elemTemp.find("."+d).css({bottom:s+"%","margin-bottom":"20px",display:"inline-block"}):e.elemTemp.find("."+d).css({left:s+"%",display:"inline-block"})}).on("mouseout",function(){e.elemTemp.find("."+d).css("display","none")})},f.prototype.slide=function(e,t,a){var n=this,l=n.config,s=n.elemTemp,f=function(){return"vertical"===l.type?l.height:s[0].offsetWidth},h=s.find("."+o),y=s.next("."+v),g=y.children("."+c).children("input").val(),b=100/((l.max-l.min)/Math.ceil(l.step)),x=function(e,i){e=Math.ceil(e)*b>100?Math.ceil(e)*b:Math.round(e)*b,e=e>100?100:e,h.eq(i).css("vertical"===l.type?"bottom":"left",e+"%");var t=T(h[0].offsetLeft),a=l.range?T(h[1].offsetLeft):0;"vertical"===l.type?(s.find("."+d).css({bottom:e+"%","margin-bottom":"20px"}),t=T(f()-h[0].offsetTop-h.height()),a=l.range?T(f()-h[1].offsetTop-h.height()):0):s.find("."+d).css("left",e+"%"),t=t>100?100:t,a=a>100?100:a;var n=Math.min(t,a),o=Math.abs(t-a);"vertical"===l.type?s.find("."+r).css({height:o+"%",bottom:n+"%"}):s.find("."+r).css({width:o+"%",left:n+"%"});var u=l.min+Math.round((l.max-l.min)*e/100);if(g=u,y.children("."+c).children("input").val(g),h.eq(i).data("value",u),s.find("."+d).html(l.setTips?l.setTips(u):u),l.range){var v=[h.eq(0).data("value"),h.eq(1).data("value")];v[0]>v[1]&&v.reverse()}l.change&&l.change(l.range?v:u)},T=function(e){var i=e/f()*100/b,t=Math.round(i)*b;return e==f()&&(t=Math.ceil(i)*b),t},w=i(['<div class="layui-auxiliar-moving" id="LAY-slider-moving"></div'].join("")),M=function(e,t){var a=function(){t&&t(),w.remove()};i("#LAY-slider-moving")[0]||i("body").append(w),w.on("mousemove",e),w.on("mouseup",a).on("mouseleave",a)};if("set"===e)return x(t,a);s.find("."+u).each(function(e){var t=i(this);t.on("mousedown",function(i){i=i||window.event;var a=t.parent()[0].offsetLeft,n=i.clientX;"vertical"===l.type&&(a=f()-t.parent()[0].offsetTop-h.height(),n=i.clientY);var r=function(i){i=i||window.event;var r=a+("vertical"===l.type?n-i.clientY:i.clientX-n);r<0&&(r=0),r>f()&&(r=f());var o=r/f()*100/b;x(o,e),t.addClass(m),s.find("."+d).show(),i.preventDefault()},o=function(){t.removeClass(m),s.find("."+d).hide()};M(r,o)})}),s.on("click",function(e){var t=i("."+u);if(!t.is(event.target)&&0===t.has(event.target).length&&t.length){var a,n="vertical"===l.type?f()-e.clientY+i(this).offset().top:e.clientX-i(this).offset().left;n<0&&(n=0),n>f()&&(n=f());var s=n/f()*100/b;a=l.range?"vertical"===l.type?Math.abs(n-parseInt(i(h[0]).css("bottom")))>Math.abs(n-parseInt(i(h[1]).css("bottom")))?1:0:Math.abs(n-h[0].offsetLeft)>Math.abs(n-h[1].offsetLeft)?1:0:0,x(s,a),e.preventDefault()}}),y.children("."+p).children("i").each(function(e){i(this).on("click",function(){g=y.children("."+c).children("input").val(),g=1==e?g-l.step<l.min?l.min:Number(g)-l.step:Number(g)+l.step>l.max?l.max:Number(g)+l.step;var i=(g-l.min)/(l.max-l.min)*100/b;x(i,0)})});var q=function(){var e=this.value;e=isNaN(e)?0:e,e=e<l.min?l.min:e,e=e>l.max?l.max:e,this.value=e;var i=(e-l.min)/(l.max-l.min)*100/b;x(i,0)};y.children("."+c).children("input").on("keydown",function(e){13===e.keyCode&&(e.preventDefault(),q.call(this))}).on("change",q)},f.prototype.events=function(){var e=this;e.config},t.render=function(e){var i=new f(e);return a.call(i)},e(n,t)});layui.define("jquery",function(e){"use strict";var i=layui.jquery,o={config:{},index:layui.colorpicker?layui.colorpicker.index+1e4:0,set:function(e){var o=this;return o.config=i.extend({},o.config,e),o},on:function(e,i){return layui.onevent.call(this,"colorpicker",e,i)}},r=function(){var e=this,i=e.config;return{config:i}},t="colorpicker",n="layui-show",l="layui-colorpicker",c=".layui-colorpicker-main",a="layui-icon-down",s="layui-icon-close",f="layui-colorpicker-trigger-span",d="layui-colorpicker-trigger-i",u="layui-colorpicker-side",p="layui-colorpicker-side-slider",g="layui-colorpicker-basis",v="layui-colorpicker-alpha-bgcolor",h="layui-colorpicker-alpha-slider",m="layui-colorpicker-basis-cursor",b="layui-colorpicker-main-input",k=function(e){var i={h:0,s:0,b:0},o=Math.min(e.r,e.g,e.b),r=Math.max(e.r,e.g,e.b),t=r-o;return i.b=r,i.s=0!=r?255*t/r:0,0!=i.s?e.r==r?i.h=(e.g-e.b)/t:e.g==r?i.h=2+(e.b-e.r)/t:i.h=4+(e.r-e.g)/t:i.h=-1,r==o&&(i.h=0),i.h*=60,i.h<0&&(i.h+=360),i.s*=100/255,i.b*=100/255,i},y=function(e){var e=e.indexOf("#")>-1?e.substring(1):e;if(3==e.length){var i=e.split("");e=i[0]+i[0]+i[1]+i[1]+i[2]+i[2]}e=parseInt(e,16);var o={r:e>>16,g:(65280&e)>>8,b:255&e};return k(o)},x=function(e){var i={},o=e.h,r=255*e.s/100,t=255*e.b/100;if(0==r)i.r=i.g=i.b=t;else{var n=t,l=(255-r)*t/255,c=(n-l)*(o%60)/60;360==o&&(o=0),o<60?(i.r=n,i.b=l,i.g=l+c):o<120?(i.g=n,i.b=l,i.r=n-c):o<180?(i.g=n,i.r=l,i.b=l+c):o<240?(i.b=n,i.r=l,i.g=n-c):o<300?(i.b=n,i.g=l,i.r=l+c):o<360?(i.r=n,i.g=l,i.b=n-c):(i.r=0,i.g=0,i.b=0)}return{r:Math.round(i.r),g:Math.round(i.g),b:Math.round(i.b)}},C=function(e){var o=x(e),r=[o.r.toString(16),o.g.toString(16),o.b.toString(16)];return i.each(r,function(e,i){1==i.length&&(r[e]="0"+i)}),r.join("")},P=function(e){var i=/[0-9]{1,3}/g,o=e.match(i)||[];return{r:o[0],g:o[1],b:o[2]}},B=i(window),w=i(document),D=function(e){var r=this;r.index=++o.index,r.config=i.extend({},r.config,o.config,e),r.render()};D.prototype.config={color:"",size:null,alpha:!1,format:"hex",predefine:!1,colors:["#009688","#5FB878","#1E9FFF","#FF5722","#FFB800","#01AAED","#999","#c00","#ff8c00","#ffd700","#90ee90","#00ced1","#1e90ff","#c71585","rgb(0, 186, 189)","rgb(255, 120, 0)","rgb(250, 212, 0)","#393D49","rgba(0,0,0,.5)","rgba(255, 69, 0, 0.68)","rgba(144, 240, 144, 0.5)","rgba(31, 147, 255, 0.73)"]},D.prototype.render=function(){var e=this,o=e.config,r=i(['<div class="layui-unselect layui-colorpicker">',"<span "+("rgb"==o.format&&o.alpha?'class="layui-colorpicker-trigger-bgcolor"':"")+">",'<span class="layui-colorpicker-trigger-span" ','lay-type="'+("rgb"==o.format?o.alpha?"rgba":"torgb":"")+'" ','style="'+function(){var e="";return o.color?(e=o.color,(o.color.match(/[0-9]{1,3}/g)||[]).length>3&&(o.alpha&&"rgb"==o.format||(e="#"+C(k(P(o.color))))),"background: "+e):e}()+'">','<i class="layui-icon layui-colorpicker-trigger-i '+(o.color?a:s)+'"></i>',"</span>","</span>","</div>"].join("")),t=i(o.elem);o.size&&r.addClass("layui-colorpicker-"+o.size),t.addClass("layui-inline").html(e.elemColorBox=r),e.color=e.elemColorBox.find("."+f)[0].style.background,e.events()},D.prototype.renderPicker=function(){var e=this,o=e.config,r=e.elemColorBox[0],t=e.elemPicker=i(['<div id="layui-colorpicker'+e.index+'" data-index="'+e.index+'" class="layui-anim layui-anim-upbit layui-colorpicker-main">','<div class="layui-colorpicker-main-wrapper">','<div class="layui-colorpicker-basis">','<div class="layui-colorpicker-basis-white"></div>','<div class="layui-colorpicker-basis-black"></div>','<div class="layui-colorpicker-basis-cursor"></div>',"</div>",'<div class="layui-colorpicker-side">','<div class="layui-colorpicker-side-slider"></div>',"</div>","</div>",'<div class="layui-colorpicker-main-alpha '+(o.alpha?n:"")+'">','<div class="layui-colorpicker-alpha-bgcolor">','<div class="layui-colorpicker-alpha-slider"></div>',"</div>","</div>",function(){if(o.predefine){var e=['<div class="layui-colorpicker-main-pre">'];return layui.each(o.colors,function(i,o){e.push(['<div class="layui-colorpicker-pre'+((o.match(/[0-9]{1,3}/g)||[]).length>3?" layui-colorpicker-pre-isalpha":"")+'">','<div style="background:'+o+'"></div>',"</div>"].join(""))}),e.push("</div>"),e.join("")}return""}(),'<div class="layui-colorpicker-main-input">','<div class="layui-inline">','<input type="text" class="layui-input">',"</div>",'<div class="layui-btn-container">','<button class="layui-btn layui-btn-primary layui-btn-sm" colorpicker-events="clear">\u6e05\u7a7a</button>','<button class="layui-btn layui-btn-sm" colorpicker-events="confirm">\u786e\u5b9a</button>',"</div","</div>","</div>"].join(""));e.elemColorBox.find("."+f)[0];i(c)[0]&&i(c).data("index")==e.index?e.removePicker(D.thisElemInd):(e.removePicker(D.thisElemInd),i("body").append(t)),D.thisElemInd=e.index,D.thisColor=r.style.background,e.position(),e.pickerEvents()},D.prototype.removePicker=function(e){var o=this;o.config;return i("#layui-colorpicker"+(e||o.index)).remove(),o},D.prototype.position=function(){var e=this,i=e.config,o=e.bindElem||e.elemColorBox[0],r=e.elemPicker[0],t=o.getBoundingClientRect(),n=r.offsetWidth,l=r.offsetHeight,c=function(e){return e=e?"scrollLeft":"scrollTop",document.body[e]|document.documentElement[e]},a=function(e){return document.documentElement[e?"clientWidth":"clientHeight"]},s=5,f=t.left,d=t.bottom;f-=(n-o.offsetWidth)/2,d+=s,f+n+s>a("width")?f=a("width")-n-s:f<s&&(f=s),d+l+s>a()&&(d=t.top>l?t.top-l:a()-l,d-=2*s),i.position&&(r.style.position=i.position),r.style.left=f+("fixed"===i.position?0:c(1))+"px",r.style.top=d+("fixed"===i.position?0:c())+"px"},D.prototype.val=function(){var e=this,i=(e.config,e.elemColorBox.find("."+f)),o=e.elemPicker.find("."+b),r=i[0],t=r.style.backgroundColor;if(t){var n=k(P(t)),l=i.attr("lay-type");if(e.select(n.h,n.s,n.b),"torgb"===l&&o.find("input").val(t),"rgba"===l){var c=P(t);if(3==(t.match(/[0-9]{1,3}/g)||[]).length)o.find("input").val("rgba("+c.r+", "+c.g+", "+c.b+", 1)"),e.elemPicker.find("."+h).css("left",280);else{o.find("input").val(t);var a=280*t.slice(t.lastIndexOf(",")+1,t.length-1);e.elemPicker.find("."+h).css("left",a)}e.elemPicker.find("."+v)[0].style.background="linear-gradient(to right, rgba("+c.r+", "+c.g+", "+c.b+", 0), rgb("+c.r+", "+c.g+", "+c.b+"))"}}else e.select(0,100,100),o.find("input").val(""),e.elemPicker.find("."+v)[0].style.background="",e.elemPicker.find("."+h).css("left",280)},D.prototype.side=function(){var e=this,o=e.config,r=e.elemColorBox.find("."+f),t=r.attr("lay-type"),n=e.elemPicker.find("."+u),l=e.elemPicker.find("."+p),c=e.elemPicker.find("."+g),y=e.elemPicker.find("."+m),C=e.elemPicker.find("."+v),w=e.elemPicker.find("."+h),D=l[0].offsetTop/180*360,E=100-(y[0].offsetTop+3)/180*100,H=(y[0].offsetLeft+3)/260*100,W=Math.round(w[0].offsetLeft/280*100)/100,j=e.elemColorBox.find("."+d),F=e.elemPicker.find(".layui-colorpicker-pre").children("div"),L=function(i,n,l,c){e.select(i,n,l);var f=x({h:i,s:n,b:l});if(j.addClass(a).removeClass(s),r[0].style.background="rgb("+f.r+", "+f.g+", "+f.b+")","torgb"===t&&e.elemPicker.find("."+b).find("input").val("rgb("+f.r+", "+f.g+", "+f.b+")"),"rgba"===t){var d=0;d=280*c,w.css("left",d),e.elemPicker.find("."+b).find("input").val("rgba("+f.r+", "+f.g+", "+f.b+", "+c+")"),r[0].style.background="rgba("+f.r+", "+f.g+", "+f.b+", "+c+")",C[0].style.background="linear-gradient(to right, rgba("+f.r+", "+f.g+", "+f.b+", 0), rgb("+f.r+", "+f.g+", "+f.b+"))"}o.change&&o.change(e.elemPicker.find("."+b).find("input").val())},M=i(['<div class="layui-auxiliar-moving" id="LAY-colorpicker-moving"></div'].join("")),Y=function(e){i("#LAY-colorpicker-moving")[0]||i("body").append(M),M.on("mousemove",e),M.on("mouseup",function(){M.remove()}).on("mouseleave",function(){M.remove()})};l.on("mousedown",function(e){var i=this.offsetTop,o=e.clientY,r=function(e){var r=i+(e.clientY-o),t=n[0].offsetHeight;r<0&&(r=0),r>t&&(r=t);var l=r/180*360;D=l,L(l,H,E,W),e.preventDefault()};Y(r),e.preventDefault()}),n.on("click",function(e){var o=e.clientY-i(this).offset().top;o<0&&(o=0),o>this.offsetHeight&&(o=this.offsetHeight);var r=o/180*360;D=r,L(r,H,E,W),e.preventDefault()}),y.on("mousedown",function(e){var i=this.offsetTop,o=this.offsetLeft,r=e.clientY,t=e.clientX,n=function(e){var n=i+(e.clientY-r),l=o+(e.clientX-t),a=c[0].offsetHeight-3,s=c[0].offsetWidth-3;n<-3&&(n=-3),n>a&&(n=a),l<-3&&(l=-3),l>s&&(l=s);var f=(l+3)/260*100,d=100-(n+3)/180*100;E=d,H=f,L(D,f,d,W),e.preventDefault()};layui.stope(e),Y(n),e.preventDefault()}),c.on("mousedown",function(e){var o=e.clientY-i(this).offset().top-3+B.scrollTop(),r=e.clientX-i(this).offset().left-3+B.scrollLeft();o<-3&&(o=-3),o>this.offsetHeight-3&&(o=this.offsetHeight-3),r<-3&&(r=-3),r>this.offsetWidth-3&&(r=this.offsetWidth-3);var t=(r+3)/260*100,n=100-(o+3)/180*100;E=n,H=t,L(D,t,n,W),e.preventDefault(),y.trigger(e,"mousedown")}),w.on("mousedown",function(e){var i=this.offsetLeft,o=e.clientX,r=function(e){var r=i+(e.clientX-o),t=C[0].offsetWidth;r<0&&(r=0),r>t&&(r=t);var n=Math.round(r/280*100)/100;W=n,L(D,H,E,n),e.preventDefault()};Y(r),e.preventDefault()}),C.on("click",function(e){var o=e.clientX-i(this).offset().left;o<0&&(o=0),o>this.offsetWidth&&(o=this.offsetWidth);var r=Math.round(o/280*100)/100;W=r,L(D,H,E,r),e.preventDefault()}),F.each(function(){i(this).on("click",function(){i(this).parent(".layui-colorpicker-pre").addClass("selected").siblings().removeClass("selected");var e,o=this.style.backgroundColor,r=k(P(o)),t=o.slice(o.lastIndexOf(",")+1,o.length-1);D=r.h,H=r.s,E=r.b,3==(o.match(/[0-9]{1,3}/g)||[]).length&&(t=1),W=t,e=280*t,L(r.h,r.s,r.b,t)})})},D.prototype.select=function(e,i,o,r){var t=this,n=(t.config,C({h:e,s:100,b:100})),l=C({h:e,s:i,b:o}),c=e/360*180,a=180-o/100*180-3,s=i/100*260-3;t.elemPicker.find("."+p).css("top",c),t.elemPicker.find("."+g)[0].style.background="#"+n,t.elemPicker.find("."+m).css({top:a,left:s}),"change"!==r&&t.elemPicker.find("."+b).find("input").val("#"+l)},D.prototype.pickerEvents=function(){var e=this,o=e.config,r=e.elemColorBox.find("."+f),t=e.elemPicker.find("."+b+" input"),n={clear:function(i){r[0].style.background="",e.elemColorBox.find("."+d).removeClass(a).addClass(s),e.color="",o.done&&o.done(""),e.removePicker()},confirm:function(i,n){var l=t.val(),c=l,f={};if(l.indexOf(",")>-1){if(f=k(P(l)),e.select(f.h,f.s,f.b),r[0].style.background=c="#"+C(f),(l.match(/[0-9]{1,3}/g)||[]).length>3&&"rgba"===r.attr("lay-type")){var u=280*l.slice(l.lastIndexOf(",")+1,l.length-1);e.elemPicker.find("."+h).css("left",u),r[0].style.background=l,c=l}}else f=y(l),r[0].style.background=c="#"+C(f),e.elemColorBox.find("."+d).removeClass(s).addClass(a);return"change"===n?(e.select(f.h,f.s,f.b,n),void(o.change&&o.change(c))):(e.color=l,o.done&&o.done(l),void e.removePicker())}};e.elemPicker.on("click","*[colorpicker-events]",function(){var e=i(this),o=e.attr("colorpicker-events");n[o]&&n[o].call(this,e)}),t.on("keyup",function(e){var o=i(this);n.confirm.call(this,o,13===e.keyCode?null:"change")})},D.prototype.events=function(){var e=this,o=e.config,r=e.elemColorBox.find("."+f);e.elemColorBox.on("click",function(){e.renderPicker(),i(c)[0]&&(e.val(),e.side())}),o.elem[0]&&!e.elemColorBox[0].eventHandler&&(w.on("click",function(o){if(!i(o.target).hasClass(l)&&!i(o.target).parents("."+l)[0]&&!i(o.target).hasClass(c.replace(/\./g,""))&&!i(o.target).parents(c)[0]&&e.elemPicker){if(e.color){var t=k(P(e.color));e.select(t.h,t.s,t.b)}else e.elemColorBox.find("."+d).removeClass(a).addClass(s);r[0].style.background=e.color||"",e.removePicker()}}),B.on("resize",function(){return!(!e.elemPicker||!i(c)[0])&&void e.position()}),e.elemColorBox[0].eventHandler=!0)},o.render=function(e){var i=new D(e);return r.call(i)},e(t,o)});layui.define("layer",function(e){"use strict";var t=layui.$,i=layui.layer,a=layui.hint(),n=layui.device(),l="form",r=".layui-form",s="layui-this",o="layui-hide",c="layui-disabled",u=function(){this.config={verify:{required:[/[\S]+/,"\u5fc5\u586b\u9879\u4e0d\u80fd\u4e3a\u7a7a"],phone:[/^1\d{10}$/,"\u8bf7\u8f93\u5165\u6b63\u786e\u7684\u624b\u673a\u53f7"],email:[/^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/,"\u90ae\u7bb1\u683c\u5f0f\u4e0d\u6b63\u786e"],url:[/^(#|(http(s?)):\/\/|\/\/)[^\s]+\.[^\s]+$/,"\u94fe\u63a5\u683c\u5f0f\u4e0d\u6b63\u786e"],number:function(e){if(!e||isNaN(e))return"\u53ea\u80fd\u586b\u5199\u6570\u5b57"},date:[/^(\d{4})[-\/](\d{1}|0\d{1}|1[0-2])([-\/](\d{1}|0\d{1}|[1-2][0-9]|3[0-1]))*$/,"\u65e5\u671f\u683c\u5f0f\u4e0d\u6b63\u786e"],identity:[/(^\d{15}$)|(^\d{17}(x|X|\d)$)/,"\u8bf7\u8f93\u5165\u6b63\u786e\u7684\u8eab\u4efd\u8bc1\u53f7"]}}};u.prototype.set=function(e){var i=this;return t.extend(!0,i.config,e),i},u.prototype.verify=function(e){var i=this;return t.extend(!0,i.config.verify,e),i},u.prototype.on=function(e,t){return layui.onevent.call(this,l,e,t)},u.prototype.val=function(e,i){var a=this,n=t(r+'[lay-filter="'+e+'"]');return n.each(function(e,a){var n=t(this);layui.each(i,function(e,t){var i,a=n.find('[name="'+e+'"]');a[0]&&(i=a[0].type,"checkbox"===i?a[0].checked=t:"radio"===i?a.each(function(){this.value==t&&(this.checked=!0)}):a.val(t))})}),f.render(null,e),a.getValue(e)},u.prototype.getValue=function(e,i){i=i||t(r+'[lay-filter="'+e+'"]').eq(0);var a={},n={},l=i.find("input,select,textarea");return layui.each(l,function(e,i){var l;t(this);if(i.name=(i.name||"").replace(/^\s*|\s*&/,""),i.name){if(/^.*\[\]$/.test(i.name)){var r=i.name.match(/^(.*)\[\]$/g)[0];a[r]=0|a[r],l=i.name.replace(/^(.*)\[\]$/,"$1["+a[r]++ +"]")}/^checkbox|radio$/.test(i.type)&&!i.checked||(n[l||i.name]=i.value)}}),n},u.prototype.render=function(e,i){var n=this,u=t(r+function(){return i?'[lay-filter="'+i+'"]':""}()),d={select:function(){var e,i="\u8bf7\u9009\u62e9",a="layui-form-select",n="layui-select-title",r="layui-select-none",d="",f=u.find("select"),v=function(i,l){t(i.target).parent().hasClass(n)&&!l||(t("."+a).removeClass(a+"ed "+a+"up"),e&&d&&e.val(d)),e=null},y=function(i,u,f){var y,p=t(this),m=i.find("."+n),k=m.find("input"),g=i.find("dl"),x=g.children("dd"),b=this.selectedIndex;if(!u){var C=function(){var e=i.offset().top+i.outerHeight()+5-h.scrollTop(),t=g.outerHeight();b=p[0].selectedIndex,i.addClass(a+"ed"),x.removeClass(o),y=null,x.eq(b).addClass(s).siblings().removeClass(s),e+t>h.height()&&e>=t&&i.addClass(a+"up"),$()},w=function(e){i.removeClass(a+"ed "+a+"up"),k.blur(),y=null,e||T(k.val(),function(e){var i=p[0].selectedIndex;e&&(d=t(p[0].options[i]).html(),0===i&&d===k.attr("placeholder")&&(d=""),k.val(d||""))})},$=function(){var e=g.children("dd."+s);if(e[0]){var t=e.position().top,i=g.height(),a=e.height();t>i&&g.scrollTop(t+g.scrollTop()-i+a-5),t<0&&g.scrollTop(t+g.scrollTop()-5)}};m.on("click",function(e){i.hasClass(a+"ed")?w():(v(e,!0),C()),g.find("."+r).remove()}),m.find(".layui-edge").on("click",function(){k.focus()}),k.on("keyup",function(e){var t=e.keyCode;9===t&&C()}).on("keydown",function(e){var t=e.keyCode;9===t&&w();var i=function(t,a){var n,l;e.preventDefault();var r=function(){var e=g.children("dd."+s);if(g.children("dd."+o)[0]&&"next"===t){var i=g.children("dd:not(."+o+",."+c+")"),n=i.eq(0).index();if(n>=0&&n<e.index()&&!i.hasClass(s))return i.eq(0).prev()[0]?i.eq(0).prev():g.children(":last")}return a&&a[0]?a:y&&y[0]?y:e}();return l=r[t](),n=r[t]("dd:not(."+o+")"),l[0]?(y=r[t](),n[0]&&!n.hasClass(c)||!y[0]?(n.addClass(s).siblings().removeClass(s),void $()):i(t,y)):y=null};38===t&&i("prev"),40===t&&i("next"),13===t&&(e.preventDefault(),g.children("dd."+s).trigger("click"))});var T=function(e,i,a){var n=0;layui.each(x,function(){var i=t(this),l=i.text(),r=l.indexOf(e)===-1;(""===e||"blur"===a?e!==l:r)&&n++,"keyup"===a&&i[r?"addClass":"removeClass"](o)});var l=n===x.length;return i(l),l},q=function(e){var t=this.value,i=e.keyCode;return 9!==i&&13!==i&&37!==i&&38!==i&&39!==i&&40!==i&&(T(t,function(e){e?g.find("."+r)[0]||g.append('<p class="'+r+'">\u65e0\u5339\u914d\u9879</p>'):g.find("."+r).remove()},"keyup"),""===t&&g.find("."+r).remove(),void $())};f&&k.on("keyup",q).on("blur",function(i){var a=p[0].selectedIndex;e=k,d=t(p[0].options[a]).html(),0===a&&d===k.attr("placeholder")&&(d=""),setTimeout(function(){T(k.val(),function(e){d||k.val("")},"blur")},200)}),x.on("click",function(){var e=t(this),a=e.attr("lay-value"),n=p.attr("lay-filter");return!e.hasClass(c)&&(e.hasClass("layui-select-tips")?k.val(""):(k.val(e.text()),e.addClass(s)),e.siblings().removeClass(s),p.val(a).removeClass("layui-form-danger"),layui.event.call(this,l,"select("+n+")",{elem:p[0],value:a,othis:i}),w(!0),!1)}),i.find("dl>dt").on("click",function(e){return!1}),t(document).off("click",v).on("click",v)}};f.each(function(e,l){var r=t(this),o=r.next("."+a),u=this.disabled,d=l.value,f=t(l.options[l.selectedIndex]),v=l.options[0];if("string"==typeof r.attr("lay-ignore"))return r.show();var h="string"==typeof r.attr("lay-search"),p=v?v.value?i:v.innerHTML||i:i,m=t(['<div class="'+(h?"":"layui-unselect ")+a,(u?" layui-select-disabled":"")+'">','<div class="'+n+'">','<input type="text" placeholder="'+p+'" '+('value="'+(d?f.html():"")+'"')+(!u&&h?"":" readonly")+' class="layui-input'+(h?"":" layui-unselect")+(u?" "+c:"")+'">','<i class="layui-edge"></i></div>','<dl class="layui-anim layui-anim-upbit'+(r.find("optgroup")[0]?" layui-select-group":"")+'">',function(e){var t=[];return layui.each(e,function(e,a){0!==e||a.value?"optgroup"===a.tagName.toLowerCase()?t.push("<dt>"+a.label+"</dt>"):t.push('<dd lay-value="'+a.value+'" class="'+(d===a.value?s:"")+(a.disabled?" "+c:"")+'">'+a.innerHTML+"</dd>"):t.push('<dd lay-value="" class="layui-select-tips">'+(a.innerHTML||i)+"</dd>")}),0===t.length&&t.push('<dd lay-value="" class="'+c+'">\u6ca1\u6709\u9009\u9879</dd>'),t.join("")}(r.find("*"))+"</dl>","</div>"].join(""));o[0]&&o.remove(),r.after(m),y.call(this,m,u,h)})},checkbox:function(){var e={checkbox:["layui-form-checkbox","layui-form-checked","checkbox"],_switch:["layui-form-switch","layui-form-onswitch","switch"]},i=u.find("input[type=checkbox]"),a=function(e,i){var a=t(this);e.on("click",function(){var t=a.attr("lay-filter"),n=(a.attr("lay-text")||"").split("|");a[0].disabled||(a[0].checked?(a[0].checked=!1,e.removeClass(i[1]).find("em").text(n[1])):(a[0].checked=!0,e.addClass(i[1]).find("em").text(n[0])),layui.event.call(a[0],l,i[2]+"("+t+")",{elem:a[0],value:a[0].value,othis:e}))})};i.each(function(i,n){var l=t(this),r=l.attr("lay-skin"),s=(l.attr("lay-text")||"").split("|"),o=this.disabled;"switch"===r&&(r="_"+r);var u=e[r]||e.checkbox;if("string"==typeof l.attr("lay-ignore"))return l.show();var d=l.next("."+u[0]),f=t(['<div class="layui-unselect '+u[0],n.checked?" "+u[1]:"",o?" layui-checkbox-disbaled "+c:"",'"',r?' lay-skin="'+r+'"':"",">",function(){var e=n.title.replace(/\s/g,""),t={checkbox:[e?"<span>"+n.title+"</span>":"",'<i class="layui-icon layui-icon-ok"></i>'].join(""),_switch:"<em>"+((n.checked?s[0]:s[1])||"")+"</em><i></i>"};return t[r]||t.checkbox}(),"</div>"].join(""));d[0]&&d.remove(),l.after(f),a.call(this,f,u)})},radio:function(){var e="layui-form-radio",i=["&#xe643;","&#xe63f;"],a=u.find("input[type=radio]"),n=function(a){var n=t(this),s="layui-anim-scaleSpring";a.on("click",function(){var o=n[0].name,c=n.parents(r),u=n.attr("lay-filter"),d=c.find("input[name="+o.replace(/(\.|#|\[|\])/g,"\\$1")+"]");n[0].disabled||(layui.each(d,function(){var a=t(this).next("."+e);this.checked=!1,a.removeClass(e+"ed"),a.find(".layui-icon").removeClass(s).html(i[1])}),n[0].checked=!0,a.addClass(e+"ed"),a.find(".layui-icon").addClass(s).html(i[0]),layui.event.call(n[0],l,"radio("+u+")",{elem:n[0],value:n[0].value,othis:a}))})};a.each(function(a,l){var r=t(this),s=r.next("."+e),o=this.disabled;if("string"==typeof r.attr("lay-ignore"))return r.show();s[0]&&s.remove();var u=t(['<div class="layui-unselect '+e,l.checked?" "+e+"ed":"",(o?" layui-radio-disbaled "+c:"")+'">','<i class="layui-anim layui-icon">'+i[l.checked?0:1]+"</i>","<div>"+function(){var e=l.title||"";return"string"==typeof r.next().attr("lay-radio")&&(e=r.next().html()),e}()+"</div>","</div>"].join(""));r.after(u),n.call(this,u)})}};return e?d[e]?d[e]():a.error("\u4e0d\u652f\u6301\u7684"+e+"\u8868\u5355\u6e32\u67d3"):layui.each(d,function(e,t){t()}),n};var d=function(){var e=null,a=f.config.verify,s="layui-form-danger",o={},c=t(this),u=c.parents(r).eq(0),d=u.find("*[lay-verify]"),v=c.parents("form")[0],h=c.attr("lay-filter");return layui.each(d,function(l,r){var o=t(this),c=o.attr("lay-verify").split("|"),u=o.attr("lay-verType"),d=o.val();if(o.removeClass(s),layui.each(c,function(t,l){var c,f="",v="function"==typeof a[l];if(a[l]){var c=v?f=a[l](d,r):!a[l][0].test(d);if(f=f||a[l][1],"required"===l&&(f=o.attr("lay-reqText")||f),c)return"tips"===u?i.tips(f,function(){return"string"==typeof o.attr("lay-ignore")||"select"!==r.tagName.toLowerCase()&&!/^checkbox|radio$/.test(r.type)?o:o.next()}(),{tips:1}):"alert"===u?i.alert(f,{title:"\u63d0\u793a",shadeClose:!0}):/\bstring|number\b/.test(typeof f)&&i.msg(f,{icon:5,shift:6}),n.android||n.ios||setTimeout(function(){r.focus()},7),o.addClass(s),e=!0}}),e)return e}),!e&&(o=f.getValue(null,u),layui.event.call(this,l,"submit("+h+")",{elem:this,form:v,field:o}))},f=new u,v=t(document),h=t(window);t(function(){f.render()}),v.on("reset",r,function(){var e=t(this).attr("lay-filter");setTimeout(function(){f.render(null,e)},50)}),v.on("submit",r,d).on("click","*[lay-submit]",d),e(l,f)});layui.define("form",function(e){"use strict";var i=layui.$,a=layui.form,n=layui.layer,t="tree",r={config:{},index:layui[t]?layui[t].index+1e4:0,set:function(e){var a=this;return a.config=i.extend({},a.config,e),a},on:function(e,i){return layui.onevent.call(this,t,e,i)}},l=function(){var e=this,i=e.config,a=i.id||e.index;return l.that[a]=e,l.config[a]=i,{config:i,reload:function(i){e.reload.call(e,i)},getChecked:function(){return e.getChecked.call(e)},setChecked:function(i){return e.setChecked.call(e,i)}}},c="layui-hide",d="layui-disabled",s="layui-tree-set",o="layui-tree-iconClick",h="layui-icon-addition",u="layui-icon-subtraction",p="layui-tree-entry",f="layui-tree-main",y="layui-tree-txt",v="layui-tree-pack",C="layui-tree-spread",k="layui-tree-setLineShort",m="layui-tree-showLine",x="layui-tree-lineExtend",b=function(e){var a=this;a.index=++r.index,a.config=i.extend({},a.config,r.config,e),a.render()};b.prototype.config={data:[],showCheckbox:!1,showLine:!0,accordion:!1,onlyIconControl:!1,isJump:!1,edit:!1,text:{defaultNodeName:"\u672a\u547d\u540d",none:"\u65e0\u6570\u636e"}},b.prototype.reload=function(e){var a=this;layui.each(e,function(e,i){i.constructor===Array&&delete a.config[e]}),a.config=i.extend(!0,{},a.config,e),a.render()},b.prototype.render=function(){var e=this,a=e.config;e.checkids=[];var n=i('<div class="layui-tree'+(a.showCheckbox?" layui-form":"")+(a.showLine?" layui-tree-line":"")+'" lay-filter="LAY-tree-'+e.index+'"></div>');e.tree(n);var t=a.elem=i(a.elem);if(t[0]){if(e.key=a.id||e.index,e.elem=n,e.elemNone=i('<div class="layui-tree-emptyText">'+a.text.none+"</div>"),t.html(e.elem),0==e.elem.find(".layui-tree-set").length)return e.elem.append(e.elemNone);a.showCheckbox&&e.renderForm("checkbox"),e.elem.find(".layui-tree-set").each(function(){var e=i(this);e.parent(".layui-tree-pack")[0]||e.addClass("layui-tree-setHide"),!e.next()[0]&&e.parents(".layui-tree-pack").eq(1).hasClass("layui-tree-lineExtend")&&e.addClass(k),e.next()[0]||e.parents(".layui-tree-set").eq(0).next()[0]||e.addClass(k)}),e.events()}},b.prototype.renderForm=function(e){a.render(e,"LAY-tree-"+this.index)},b.prototype.tree=function(e,a){var n=this,t=n.config,r=a||t.data;layui.each(r,function(a,r){var l=r.children&&r.children.length>0,o=i('<div class="layui-tree-pack" '+(r.spread?'style="display: block;"':"")+"></div>"),h=i(['<div data-id="'+r.id+'" class="layui-tree-set'+(r.spread?" layui-tree-spread":"")+(r.checked?" layui-tree-checkedFirst":"")+'">','<div class="layui-tree-entry">','<div class="layui-tree-main">',function(){return t.showLine?l?'<span class="layui-tree-iconClick layui-tree-icon"><i class="layui-icon '+(r.spread?"layui-icon-subtraction":"layui-icon-addition")+'"></i></span>':'<span class="layui-tree-iconClick"><i class="layui-icon layui-icon-file"></i></span>':'<span class="layui-tree-iconClick"><i class="layui-tree-iconArrow '+(l?"":c)+'"></i></span>'}(),function(){return t.showCheckbox?'<input type="checkbox" name="'+(r.field||"layuiTreeCheck_"+r.id)+'" same="layuiTreeCheck" lay-skin="primary" '+(r.disabled?"disabled":"")+' value="'+r.id+'">':""}(),function(){return t.isJump&&r.href?'<a href="'+r.href+'" target="_blank" class="'+y+'">'+(r.title||r.label||t.text.defaultNodeName)+"</a>":'<span class="'+y+(r.disabled?" "+d:"")+'">'+(r.title||r.label||t.text.defaultNodeName)+"</span>"}(),"</div>",function(){if(!t.edit)return"";var e={add:'<i class="layui-icon layui-icon-add-1"  data-type="add"></i>',update:'<i class="layui-icon layui-icon-edit" data-type="update"></i>',del:'<i class="layui-icon layui-icon-delete" data-type="del"></i>'},i=['<div class="layui-btn-group layui-tree-btnGroup">'];return t.edit===!0&&(t.edit=["update","del"]),"object"==typeof t.edit?(layui.each(t.edit,function(a,n){i.push(e[n]||"")}),i.join("")+"</div>"):void 0}(),"</div></div>"].join(""));l&&(h.append(o),n.tree(o,r.children)),e.append(h),h.prev("."+s)[0]&&h.prev().children(".layui-tree-pack").addClass("layui-tree-showLine"),l||h.parent(".layui-tree-pack").addClass("layui-tree-lineExtend"),n.spread(h,r),t.showCheckbox&&(r.checked&&n.checkids.push(r.id),n.checkClick(h,r)),t.edit&&n.operate(h,r)})},b.prototype.spread=function(e,a){var n=this,t=n.config,r=e.children("."+p),l=r.children("."+f),c=r.find("."+o),k=r.find("."+y),m=t.onlyIconControl?c:l,x="";m.on("click",function(i){var a=e.children("."+v),n=m.children(".layui-icon")[0]?m.children(".layui-icon"):m.find(".layui-tree-icon").children(".layui-icon");if(a[0]){if(e.hasClass(C))e.removeClass(C),a.slideUp(200),n.removeClass(u).addClass(h);else if(e.addClass(C),a.slideDown(200),n.addClass(u).removeClass(h),t.accordion){var r=e.siblings("."+s);r.removeClass(C),r.children("."+v).slideUp(200),r.find(".layui-tree-icon").children(".layui-icon").removeClass(u).addClass(h)}}else x="normal"}),k.on("click",function(){var n=i(this);n.hasClass(d)||(x=e.hasClass(C)?t.onlyIconControl?"open":"close":t.onlyIconControl?"close":"open",t.click&&t.click({elem:e,state:x,data:a}))})},b.prototype.setCheckbox=function(e,i,a){var n=this,t=(n.config,a.prop("checked"));if(!a.prop("disabled")){if("object"==typeof i.children||e.find("."+v)[0]){var r=e.find("."+v).find('input[same="layuiTreeCheck"]');r.each(function(){this.disabled||(this.checked=t)})}var l=function(e){if(e.parents("."+s)[0]){var i,a=e.parent("."+v),n=a.parent(),r=a.prev().find('input[same="layuiTreeCheck"]');t?r.prop("checked",t):(a.find('input[same="layuiTreeCheck"]').each(function(){this.checked&&(i=!0)}),i||r.prop("checked",!1)),l(n)}};l(e),n.renderForm("checkbox")}},b.prototype.checkClick=function(e,a){var n=this,t=n.config,r=e.children("."+p),l=r.children("."+f);l.on("click",'input[same="layuiTreeCheck"]+',function(r){layui.stope(r);var l=i(this).prev(),c=l.prop("checked");l.prop("disabled")||(n.setCheckbox(e,a,l),t.oncheck&&t.oncheck({elem:e,checked:c,data:a}))})},b.prototype.operate=function(e,a){var t=this,r=t.config,l=e.children("."+p),d=l.children("."+f);l.children(".layui-tree-btnGroup").on("click",".layui-icon",function(l){layui.stope(l);var f=i(this).data("type"),b=e.children("."+v),g={data:a,type:f,elem:e};if("add"==f){b[0]||(r.showLine?(d.find("."+o).addClass("layui-tree-icon"),d.find("."+o).children(".layui-icon").addClass(h).removeClass("layui-icon-file")):d.find(".layui-tree-iconArrow").removeClass(c),e.append('<div class="layui-tree-pack"></div>'));var w=r.operate&&r.operate(g),N={};if(N.title=r.text.defaultNodeName,N.id=w,t.tree(e.children("."+v),[N]),r.showLine)if(b[0])b.hasClass(x)||b.addClass(x),e.find("."+v).each(function(){i(this).children("."+s).last().addClass(k)}),b.children("."+s).last().prev().hasClass(k)?b.children("."+s).last().prev().removeClass(k):b.children("."+s).last().removeClass(k),!e.parent("."+v)[0]&&e.next()[0]&&b.children("."+s).last().removeClass(k);else{var T=e.siblings("."+s),L=1,A=e.parent("."+v);layui.each(T,function(e,a){i(a).children("."+v)[0]||(L=0)}),1==L?(T.children("."+v).addClass(m),T.children("."+v).children("."+s).removeClass(k),e.children("."+v).addClass(m),A.removeClass(x),A.children("."+s).last().children("."+v).children("."+s).last().addClass(k)):e.children("."+v).children("."+s).addClass(k)}if(!r.showCheckbox)return;if(d.find('input[same="layuiTreeCheck"]')[0].checked){var I=e.children("."+v).children("."+s).last();I.find('input[same="layuiTreeCheck"]')[0].checked=!0}t.renderForm("checkbox")}else if("update"==f){var F=d.children("."+y).html();d.children("."+y).html(""),d.append('<input type="text" class="layui-tree-editInput">'),d.children(".layui-tree-editInput").val(F).focus();var j=function(e){var i=e.val().trim();i=i?i:r.text.defaultNodeName,e.remove(),d.children("."+y).html(i),g.data.title=i,r.operate&&r.operate(g)};d.children(".layui-tree-editInput").blur(function(){j(i(this))}),d.children(".layui-tree-editInput").on("keydown",function(e){13===e.keyCode&&(e.preventDefault(),j(i(this)))})}else n.confirm('\u786e\u8ba4\u5220\u9664\u8be5\u8282\u70b9 "<span style="color: #999;">'+(a.title||"")+'</span>" \u5417\uff1f',function(a){if(r.operate&&r.operate(g),g.status="remove",n.close(a),!e.prev("."+s)[0]&&!e.next("."+s)[0]&&!e.parent("."+v)[0])return e.remove(),void t.elem.append(t.elemNone);if(e.siblings("."+s).children("."+p)[0]){if(r.showCheckbox){var l=function(e){if(e.parents("."+s)[0]){var a=e.siblings("."+s).children("."+p),n=e.parent("."+v).prev(),r=n.find('input[same="layuiTreeCheck"]')[0],c=1,d=0;0==r.checked&&(a.each(function(e,a){var n=i(a).find('input[same="layuiTreeCheck"]')[0];0!=n.checked||n.disabled||(c=0),n.disabled||(d=1)}),1==c&&1==d&&(r.checked=!0,t.renderForm("checkbox"),l(n.parent("."+s))))}};l(e)}if(r.showLine){var d=e.siblings("."+s),h=1,f=e.parent("."+v);layui.each(d,function(e,a){i(a).children("."+v)[0]||(h=0)}),1==h?(b[0]||(f.removeClass(x),d.children("."+v).addClass(m),d.children("."+v).children("."+s).removeClass(k)),e.next()[0]?f.children("."+s).last().children("."+v).children("."+s).last().addClass(k):e.prev().children("."+v).children("."+s).last().addClass(k),e.next()[0]||e.parents("."+s)[1]||e.parents("."+s).eq(0).next()[0]||e.prev("."+s).addClass(k)):!e.next()[0]&&e.hasClass(k)&&e.prev().addClass(k)}}else{var y=e.parent("."+v).prev();if(r.showLine){y.find("."+o).removeClass("layui-tree-icon"),y.find("."+o).children(".layui-icon").removeClass(u).addClass("layui-icon-file");var w=y.parents("."+v).eq(0);w.addClass(x),w.children("."+s).each(function(){i(this).children("."+v).children("."+s).last().addClass(k)})}else y.find(".layui-tree-iconArrow").addClass(c);e.parents("."+s).eq(0).removeClass(C),e.parent("."+v).remove()}e.remove()})})},b.prototype.events=function(){var e=this,a=e.config;e.elem.find(".layui-tree-checkedFirst");e.setChecked(e.checkids),e.elem.find(".layui-tree-search").on("keyup",function(){var n=i(this),t=n.val(),r=n.nextAll(),l=[];r.find("."+y).each(function(){var e=i(this).parents("."+p);if(i(this).html().indexOf(t)!=-1){l.push(i(this).parent());var a=function(e){e.addClass("layui-tree-searchShow"),e.parent("."+v)[0]&&a(e.parent("."+v).parent("."+s))};a(e.parent("."+s))}}),r.find("."+p).each(function(){var e=i(this).parent("."+s);e.hasClass("layui-tree-searchShow")||e.addClass(c)}),0==r.find(".layui-tree-searchShow").length&&e.elem.append(e.elemNone),a.onsearch&&a.onsearch({elem:l})}),e.elem.find(".layui-tree-search").on("keydown",function(){i(this).nextAll().find("."+p).each(function(){var e=i(this).parent("."+s);e.removeClass("layui-tree-searchShow "+c)}),i(".layui-tree-emptyText")[0]&&i(".layui-tree-emptyText").remove()})},b.prototype.getChecked=function(){var e=this,a=e.config,n=[],t=[];e.elem.find(".layui-form-checked").each(function(){n.push(i(this).prev()[0].value)});var r=function(e,a){layui.each(e,function(e,t){layui.each(n,function(e,n){if(t.id==n){var l=i.extend({},t);return delete l.children,a.push(l),t.children&&(l.children=[],r(t.children,l.children)),!0}})})};return r(i.extend({},a.data),t),t},b.prototype.setChecked=function(e){var a=this;a.config;a.elem.find("."+s).each(function(a,n){var t=i(this).data("id"),r=i(n).children("."+p).find('input[same="layuiTreeCheck"]'),l=r.next();if("number"==typeof e){if(t==e)return r[0].checked||l.click(),!1}else"object"==typeof e&&layui.each(e,function(e,i){if(i==t&&!r[0].checked)return l.click(),!0})})},l.that={},l.config={},r.reload=function(e,i){var a=l.that[e];return a.reload(i),l.call(a)},r.getChecked=function(e){var i=l.that[e];return i.getChecked()},r.setChecked=function(e,i){var a=l.that[e];return a.setChecked(i)},r.render=function(e){var i=new b(e);return l.call(i)},e(t,r)});layui.define(["laytpl","form"],function(e){"use strict";var a=layui.$,t=layui.laytpl,i=layui.form,n="transfer",l={config:{},index:layui[n]?layui[n].index+1e4:0,set:function(e){var t=this;return t.config=a.extend({},t.config,e),t},on:function(e,a){return layui.onevent.call(this,n,e,a)}},r=function(){var e=this,a=e.config,t=a.id||e.index;return r.that[t]=e,r.config[t]=a,{config:a,reload:function(a){e.reload.call(e,a)},getData:function(){return e.getData.call(e)}}},c="layui-hide",o="layui-btn-disabled",d="layui-none",s="layui-transfer-box",u="layui-transfer-header",h="layui-transfer-search",f="layui-transfer-active",y="layui-transfer-data",p=function(e){return e=e||{},['<div class="layui-transfer-box" data-index="'+e.index+'">','<div class="layui-transfer-header">','<input type="checkbox" name="'+e.checkAllName+'" lay-filter="layTransferCheckbox" lay-type="all" lay-skin="primary" title="{{ d.data.title['+e.index+"] || 'list"+(e.index+1)+"' }}\">","</div>","{{# if(d.data.showSearch){ }}",'<div class="layui-transfer-search">','<i class="layui-icon layui-icon-search"></i>','<input type="input" class="layui-input" placeholder="\u5173\u952e\u8bcd\u641c\u7d22">',"</div>","{{# } }}",'<ul class="layui-transfer-data"></ul>',"</div>"].join("")},v=['<div class="layui-transfer layui-form layui-border-box" lay-filter="LAY-transfer-{{ d.index }}">',p({index:0,checkAllName:"layTransferLeftCheckAll"}),'<div class="layui-transfer-active">','<button type="button" class="layui-btn layui-btn-sm layui-btn-primary layui-btn-disabled" data-index="0">','<i class="layui-icon layui-icon-next"></i>',"</button>",'<button type="button" class="layui-btn layui-btn-sm layui-btn-primary layui-btn-disabled" data-index="1">','<i class="layui-icon layui-icon-prev"></i>',"</button>","</div>",p({index:1,checkAllName:"layTransferRightCheckAll"}),"</div>"].join(""),x=function(e){var t=this;t.index=++l.index,t.config=a.extend({},t.config,l.config,e),t.render()};x.prototype.config={title:["\u5217\u8868\u4e00","\u5217\u8868\u4e8c"],width:200,height:360,data:[],value:[],showSearch:!1,id:"",text:{none:"\u65e0\u6570\u636e",searchNone:"\u65e0\u5339\u914d\u6570\u636e"}},x.prototype.reload=function(e){var t=this;t.config=a.extend({},t.config,e),t.render()},x.prototype.render=function(){var e=this,i=e.config,n=e.elem=a(t(v).render({data:i,index:e.index})),l=i.elem=a(i.elem);l[0]&&(i.data=i.data||[],i.value=i.value||[],e.key=i.id||e.index,l.html(e.elem),e.layBox=e.elem.find("."+s),e.layHeader=e.elem.find("."+u),e.laySearch=e.elem.find("."+h),e.layData=n.find("."+y),e.layBtn=n.find("."+f+" .layui-btn"),e.layBox.css({width:i.width,height:i.height}),e.layData.css({height:function(){return i.height-e.layHeader.outerHeight()-e.laySearch.outerHeight()-2}()}),e.renderData(),e.events())},x.prototype.renderData=function(){var e=this,a=(e.config,[{checkName:"layTransferLeftCheck",views:[]},{checkName:"layTransferRightCheck",views:[]}]);e.parseData(function(e){var t=e.selected?1:0,i=["<li>",'<input type="checkbox" name="'+a[t].checkName+'" lay-skin="primary" lay-filter="layTransferCheckbox" title="'+e.title+'"'+(e.disabled?" disabled":"")+(e.checked?" checked":"")+' value="'+e.value+'">',"</li>"].join("");a[t].views.push(i),delete e.selected}),e.layData.eq(0).html(a[0].views.join("")),e.layData.eq(1).html(a[1].views.join("")),e.renderCheckBtn()},x.prototype.renderForm=function(e){i.render(e,"LAY-transfer-"+this.index)},x.prototype.renderCheckBtn=function(e){var t=this,i=t.config;e=e||{},t.layBox.each(function(n){var l=a(this),r=l.find("."+y),d=l.find("."+u).find('input[type="checkbox"]'),s=r.find('input[type="checkbox"]'),h=0,f=!1;if(s.each(function(){var e=a(this).data("hide");(this.checked||this.disabled||e)&&h++,this.checked&&!e&&(f=!0)}),d.prop("checked",f&&h===s.length),t.layBtn.eq(n)[f?"removeClass":"addClass"](o),!e.stopNone){var p=r.children("li:not(."+c+")").length;t.noneView(r,p?"":i.text.none)}}),t.renderForm("checkbox")},x.prototype.noneView=function(e,t){var i=a('<p class="layui-none">'+(t||"")+"</p>");e.find("."+d)[0]&&e.find("."+d).remove(),t.replace(/\s/g,"")&&e.append(i)},x.prototype.setValue=function(){var e=this,t=e.config,i=[];return e.layBox.eq(1).find("."+y+' input[type="checkbox"]').each(function(){var e=a(this).data("hide");e||i.push(this.value)}),t.value=i,e},x.prototype.parseData=function(e){var t=this,i=t.config,n=[];return layui.each(i.data,function(t,l){l=("function"==typeof i.parseData?i.parseData(l):l)||l,n.push(l=a.extend({},l)),layui.each(i.value,function(e,a){a==l.value&&(l.selected=!0)}),e&&e(l)}),i.data=n,t},x.prototype.getData=function(e){var a=this,t=a.config,i=[];return a.setValue(),layui.each(e||t.value,function(e,a){layui.each(t.data,function(e,t){delete t.selected,a==t.value&&i.push(t)})}),i},x.prototype.events=function(){var e=this,t=e.config;e.elem.on("click",'input[lay-filter="layTransferCheckbox"]+',function(){var t=a(this).prev(),i=t[0].checked,n=t.parents("."+s).eq(0).find("."+y);t[0].disabled||("all"===t.attr("lay-type")&&n.find('input[type="checkbox"]').each(function(){this.disabled||(this.checked=i)}),e.renderCheckBtn({stopNone:!0}))}),e.layBtn.on("click",function(){var i=a(this),n=i.data("index"),l=e.layBox.eq(n),r=[];if(!i.hasClass(o)){e.layBox.eq(n).each(function(t){var i=a(this),n=i.find("."+y);n.children("li").each(function(){var t=a(this),i=t.find('input[type="checkbox"]'),n=i.data("hide");i[0].checked&&!n&&(i[0].checked=!1,l.siblings("."+s).find("."+y).append(t.clone()),t.remove(),r.push(i[0].value)),e.setValue()})}),e.renderCheckBtn();var c=l.siblings("."+s).find("."+h+" input");""===c.val()||c.trigger("keyup"),t.onchange&&t.onchange(e.getData(r),n)}}),e.laySearch.find("input").on("keyup",function(){var i=this.value,n=a(this).parents("."+h).eq(0).siblings("."+y),l=n.children("li");l.each(function(){var e=a(this),t=e.find('input[type="checkbox"]'),n=t[0].title.indexOf(i)!==-1;e[n?"removeClass":"addClass"](c),t.data("hide",!n)}),e.renderCheckBtn();var r=l.length===n.children("li."+c).length;e.noneView(n,r?t.text.searchNone:"")})},r.that={},r.config={},l.reload=function(e,a){var t=r.that[e];return t.reload(a),r.call(t)},l.getData=function(e){var a=r.that[e];return a.getData()},l.render=function(e){var a=new x(e);return r.call(a)},e(n,l)});layui.define(["laytpl","laypage","layer","form","util"],function(e){"use strict";var t=layui.$,i=layui.laytpl,a=layui.laypage,l=layui.layer,n=layui.form,o=(layui.util,layui.hint()),r=layui.device(),c={config:{checkName:"LAY_CHECKED",indexName:"LAY_TABLE_INDEX"},cache:{},index:layui.table?layui.table.index+1e4:0,set:function(e){var i=this;return i.config=t.extend({},i.config,e),i},on:function(e,t){return layui.onevent.call(this,y,e,t)}},d=function(){var e=this,t=e.config,i=t.id||t.index;return i&&(d.that[i]=e,d.config[i]=t),{config:t,reload:function(t,i){e.reload.call(e,t,i)},setColsWidth:function(){e.setColsWidth.call(e)},resize:function(){e.resize.call(e)}}},s=function(e){var t=d.config[e];return t||o.error(e?"The table instance with ID '"+e+"' not found":"ID argument required"),t||null},u=function(e,a,l,n){var o=e.templet?function(){return"function"==typeof e.templet?e.templet(l):i(t(e.templet).html()||String(a)).render(l)}():a;return n?t("<div>"+o+"</div>").text():o},y="table",h=".layui-table",f="layui-hide",p="layui-none",v="layui-table-view",m=".layui-table-tool",g=".layui-table-box",b=".layui-table-init",x=".layui-table-header",k=".layui-table-body",C=".layui-table-main",w=".layui-table-fixed",T=".layui-table-fixed-l",N=".layui-table-fixed-r",A=".layui-table-total",L=".layui-table-page",S=".layui-table-sort",R="layui-table-edit",_="layui-table-hover",W=function(e){var t='{{#if(item2.colspan){}} colspan="{{item2.colspan}}"{{#} if(item2.rowspan){}} rowspan="{{item2.rowspan}}"{{#}}}';return e=e||{},['<table cellspacing="0" cellpadding="0" border="0" class="layui-table" ','{{# if(d.data.skin){ }}lay-skin="{{d.data.skin}}"{{# } }} {{# if(d.data.size){ }}lay-size="{{d.data.size}}"{{# } }} {{# if(d.data.even){ }}lay-even{{# } }}>',"<thead>","{{# layui.each(d.data.cols, function(i1, item1){ }}","<tr>","{{# layui.each(item1, function(i2, item2){ }}",'{{# if(item2.fixed && item2.fixed !== "right"){ left = true; } }}','{{# if(item2.fixed === "right"){ right = true; } }}',function(){return e.fixed&&"right"!==e.fixed?'{{# if(item2.fixed && item2.fixed !== "right"){ }}':"right"===e.fixed?'{{# if(item2.fixed === "right"){ }}':""}(),"{{# var isSort = !(item2.colGroup) && item2.sort; }}",'<th data-field="{{ item2.field||i2 }}" data-key="{{d.index}}-{{i1}}-{{i2}}" {{# if( item2.parentKey){ }}data-parentkey="{{ item2.parentKey }}"{{# } }} {{# if(item2.minWidth){ }}data-minwidth="{{item2.minWidth}}"{{# } }} '+t+' {{# if(item2.unresize || item2.colGroup){ }}data-unresize="true"{{# } }} class="{{# if(item2.hide){ }}layui-hide{{# } }}{{# if(isSort){ }} layui-unselect{{# } }}{{# if(!item2.field){ }} layui-table-col-special{{# } }}">','<div class="layui-table-cell laytable-cell-',"{{# if(item2.colGroup){ }}","group","{{# } else { }}","{{d.index}}-{{i1}}-{{i2}}",'{{# if(item2.type !== "normal"){ }}'," laytable-cell-{{ item2.type }}","{{# } }}","{{# } }}",'" {{#if(item2.align){}}align="{{item2.align}}"{{#}}}>','{{# if(item2.type === "checkbox"){ }}','<input type="checkbox" name="layTableCheckbox" lay-skin="primary" lay-filter="layTableAllChoose" {{# if(item2[d.data.checkName]){ }}checked{{# }; }}>',"{{# } else { }}",'<span>{{item2.title||""}}</span>',"{{# if(isSort){ }}",'<span class="layui-table-sort layui-inline"><i class="layui-edge layui-table-sort-asc" title="\u5347\u5e8f"></i><i class="layui-edge layui-table-sort-desc" title="\u964d\u5e8f"></i></span>',"{{# } }}","{{# } }}","</div>","</th>",e.fixed?"{{# }; }}":"","{{# }); }}","</tr>","{{# }); }}","</thead>","</table>"].join("")},z=['<table cellspacing="0" cellpadding="0" border="0" class="layui-table" ','{{# if(d.data.skin){ }}lay-skin="{{d.data.skin}}"{{# } }} {{# if(d.data.size){ }}lay-size="{{d.data.size}}"{{# } }} {{# if(d.data.even){ }}lay-even{{# } }}>',"<tbody></tbody>","</table>"].join(""),E=['<div class="layui-form layui-border-box {{d.VIEW_CLASS}}{{# if(d.data.className){ }} {{ d.data.className }}{{# } }}" lay-filter="LAY-table-{{d.index}}" lay-id="{{ d.data.id }}" style="{{# if(d.data.width){ }}width:{{d.data.width}}px;{{# } }} {{# if(d.data.height){ }}height:{{d.data.height}}px;{{# } }}">',"{{# if(d.data.toolbar){ }}",'<div class="layui-table-tool">','<div class="layui-table-tool-temp"></div>','<div class="layui-table-tool-self"></div>',"</div>","{{# } }}",'<div class="layui-table-box">',"{{# if(d.data.loading){ }}",'<div class="layui-table-init" style="background-color: #fff;">','<i class="layui-icon layui-icon-loading layui-anim layui-anim-rotate layui-anim-loop"></i>',"</div>","{{# } }}","{{# var left, right; }}",'<div class="layui-table-header">',W(),"</div>",'<div class="layui-table-body layui-table-main">',z,"</div>","{{# if(left){ }}",'<div class="layui-table-fixed layui-table-fixed-l">','<div class="layui-table-header">',W({fixed:!0}),"</div>",'<div class="layui-table-body">',z,"</div>","</div>","{{# }; }}","{{# if(right){ }}",'<div class="layui-table-fixed layui-table-fixed-r">','<div class="layui-table-header">',W({fixed:"right"}),'<div class="layui-table-mend"></div>',"</div>",'<div class="layui-table-body">',z,"</div>","</div>","{{# }; }}","</div>","{{# if(d.data.totalRow){ }}",'<div class="layui-table-total">','<table cellspacing="0" cellpadding="0" border="0" class="layui-table" ','{{# if(d.data.skin){ }}lay-skin="{{d.data.skin}}"{{# } }} {{# if(d.data.size){ }}lay-size="{{d.data.size}}"{{# } }} {{# if(d.data.even){ }}lay-even{{# } }}>','<tbody><tr><td><div class="layui-table-cell" style="visibility: hidden;">Total</div></td></tr></tbody>',"</table>","</div>","{{# } }}","{{# if(d.data.page){ }}",'<div class="layui-table-page">','<div id="layui-table-page{{d.index}}"></div>',"</div>","{{# } }}","<style>","{{# layui.each(d.data.cols, function(i1, item1){","layui.each(item1, function(i2, item2){ }}",".laytable-cell-{{d.index}}-{{i1}}-{{i2}}{ ","{{# if(item2.width){ }}","width: {{item2.width}}px;","{{# } }}"," }","{{# });","}); }}","</style>","</div>"].join(""),j=t(window),F=t(document),I=function(e){var i=this;i.index=++c.index,i.config=t.extend({},i.config,c.config,e),i.render()};I.prototype.config={limit:10,loading:!0,cellMinWidth:60,defaultToolbar:["filter","exports","print"],autoSort:!0,text:{none:"\u65e0\u6570\u636e"}},I.prototype.render=function(){var e=this,a=e.config;if(a.elem=t(a.elem),a.where=a.where||{},a.id=a.id||a.elem.attr("id")||e.index,a.request=t.extend({pageName:"page",limitName:"limit"},a.request),a.response=t.extend({statusName:"code",statusCode:0,msgName:"msg",dataName:"data",totalRowName:"totalRow",countName:"count"},a.response),"object"==typeof a.page&&(a.limit=a.page.limit||a.limit,a.limits=a.page.limits||a.limits,e.page=a.page.curr=a.page.curr||1,delete a.page.elem,delete a.page.jump),!a.elem[0])return e;a.height&&/^full-\d+$/.test(a.height)&&(e.fullHeightGap=a.height.split("-")[1],a.height=j.height()-e.fullHeightGap),e.setInit();var l=a.elem,n=l.next("."+v),o=e.elem=t(i(E).render({VIEW_CLASS:v,data:a,index:e.index}));if(a.index=e.index,e.key=a.id||a.index,n[0]&&n.remove(),l.after(o),e.layTool=o.find(m),e.layBox=o.find(g),e.layHeader=o.find(x),e.layMain=o.find(C),e.layBody=o.find(k),e.layFixed=o.find(w),e.layFixLeft=o.find(T),e.layFixRight=o.find(N),e.layTotal=o.find(A),e.layPage=o.find(L),e.renderToolbar(),e.fullSize(),a.cols.length>1){var r=e.layFixed.find(x).find("th");r.height(e.layHeader.height()-1-parseFloat(r.css("padding-top"))-parseFloat(r.css("padding-bottom")))}e.pullData(e.page),e.events()},I.prototype.initOpts=function(e){var t=this,i=(t.config,{checkbox:48,radio:48,space:15,numbers:40});e.checkbox&&(e.type="checkbox"),e.space&&(e.type="space"),e.type||(e.type="normal"),"normal"!==e.type&&(e.unresize=!0,e.width=e.width||i[e.type])},I.prototype.setInit=function(e){var t=this,i=t.config;return i.clientWidth=i.width||function(){var e=function(t){var a,l;t=t||i.elem.parent(),a=t.width();try{l="none"===t.css("display")}catch(n){}return!t[0]||a&&!l?a:e(t.parent())};return e()}(),"width"===e?i.clientWidth:void layui.each(i.cols,function(e,a){layui.each(a,function(l,n){if(!n)return void a.splice(l,1);if(n.key=e+"-"+l,n.hide=n.hide||!1,n.colGroup||n.colspan>1){var o=0;layui.each(i.cols[e+1],function(t,i){i.HAS_PARENT||o>1&&o==n.colspan||(i.HAS_PARENT=!0,i.parentKey=e+"-"+l,o+=parseInt(i.colspan>1?i.colspan:1))}),n.colGroup=!0}t.initOpts(n)})})},I.prototype.renderToolbar=function(){var e=this,a=e.config,l=['<div class="layui-inline" lay-event="add"><i class="layui-icon layui-icon-add-1"></i></div>','<div class="layui-inline" lay-event="update"><i class="layui-icon layui-icon-edit"></i></div>','<div class="layui-inline" lay-event="delete"><i class="layui-icon layui-icon-delete"></i></div>'].join(""),n=e.layTool.find(".layui-table-tool-temp");if("default"===a.toolbar)n.html(l);else if("string"==typeof a.toolbar){var o=t(a.toolbar).html()||"";o&&n.html(i(o).render(a))}var r={filter:{title:"\u7b5b\u9009\u5217",layEvent:"LAYTABLE_COLS",icon:"layui-icon-cols"},exports:{title:"\u5bfc\u51fa",layEvent:"LAYTABLE_EXPORT",icon:"layui-icon-export"},print:{title:"\u6253\u5370",layEvent:"LAYTABLE_PRINT",icon:"layui-icon-print"}},c=[];"object"==typeof a.defaultToolbar&&layui.each(a.defaultToolbar,function(e,t){var i="string"==typeof t?r[t]:t;i&&c.push('<div class="layui-inline" title="'+i.title+'" lay-event="'+i.layEvent+'"><i class="layui-icon '+i.icon+'"></i></div>')}),e.layTool.find(".layui-table-tool-self").html(c.join(""))},I.prototype.setParentCol=function(e,t){var i=this,a=i.config,l=i.layHeader.find('th[data-key="'+a.index+"-"+t+'"]'),n=parseInt(l.attr("colspan"))||0;if(l[0]){var o=t.split("-"),r=a.cols[o[0]][o[1]];e?n--:n++,l.attr("colspan",n),l[n<1?"addClass":"removeClass"](f),r.colspan=n,r.hide=n<1;var c=l.data("parentkey");c&&i.setParentCol(e,c)}},I.prototype.setColsPatch=function(){var e=this,t=e.config;layui.each(t.cols,function(t,i){layui.each(i,function(t,i){i.hide&&e.setParentCol(i.hide,i.parentKey)})})},I.prototype.setColsWidth=function(){var e=this,t=e.config,i=0,a=0,l=0,n=0,o=e.setInit("width");e.eachCols(function(e,t){t.hide||i++}),o=o-function(){return"line"===t.skin||"nob"===t.skin?2:i+1}()-e.getScrollWidth(e.layMain[0])-1;var r=function(e){layui.each(t.cols,function(i,r){layui.each(r,function(i,c){var d=0,s=c.minWidth||t.cellMinWidth;return c?void(c.colGroup||c.hide||(e?l&&l<s&&(a--,d=s):(d=c.width||0,/\d+%$/.test(d)?(d=Math.floor(parseFloat(d)/100*o),d<s&&(d=s)):d||(c.width=d=0,a++)),c.hide&&(d=0),n+=d)):void r.splice(i,1)})}),o>n&&a&&(l=(o-n)/a)};r(),r(!0),e.autoColNums=a,e.eachCols(function(i,a){var n=a.minWidth||t.cellMinWidth;a.colGroup||a.hide||(0===a.width?e.getCssRule(t.index+"-"+a.key,function(e){e.style.width=Math.floor(l>=n?l:n)+"px"}):/\d+%$/.test(a.width)&&e.getCssRule(t.index+"-"+a.key,function(e){e.style.width=Math.floor(parseFloat(a.width)/100*o)+"px"}))});var c=e.layMain.width()-e.getScrollWidth(e.layMain[0])-e.layMain.children("table").outerWidth();if(e.autoColNums&&c>=-i&&c<=i){var d=function(t){var i;return t=t||e.layHeader.eq(0).find("thead th:last-child"),i=t.data("field"),!i&&t.prev()[0]?d(t.prev()):t},s=d(),u=s.data("key");e.getCssRule(u,function(t){var i=t.style.width||s.outerWidth();t.style.width=parseFloat(i)+c+"px",e.layMain.height()-e.layMain.prop("clientHeight")>0&&(t.style.width=parseFloat(t.style.width)-1+"px")})}e.loading(!0)},I.prototype.resize=function(){var e=this;e.fullSize(),e.setColsWidth(),e.scrollPatch()},I.prototype.reload=function(e,i){var a=this;e=e||{},delete a.haveInit,layui.each(e,function(e,t){"array"===layui._typeof(t)&&delete a.config[e]}),a.config=t.extend(i,{},a.config,e),a.render()},I.prototype.errorView=function(e){var i=this,a=i.layMain.find("."+p),l=t('<div class="'+p+'">'+(e||"Error")+"</div>");a[0]&&(i.layNone.remove(),a.remove()),i.layFixed.addClass(f),i.layMain.find("tbody").html(""),i.layMain.append(i.layNone=l),c.cache[i.key]=[]},I.prototype.page=1,I.prototype.pullData=function(e){var i=this,a=i.config,l=a.request,n=a.response,o=function(){"object"==typeof a.initSort&&i.sort(a.initSort.field,a.initSort.type)};if(i.startTime=(new Date).getTime(),a.url){var r={};r[l.pageName]=e,r[l.limitName]=a.limit;var c=t.extend(r,a.where);a.contentType&&0==a.contentType.indexOf("application/json")&&(c=JSON.stringify(c)),i.loading(),t.ajax({type:a.method||"get",url:a.url,contentType:a.contentType,data:c,dataType:"json",headers:a.headers||{},success:function(t){"function"==typeof a.parseData&&(t=a.parseData(t)||t),t[n.statusName]!=n.statusCode?(i.renderForm(),i.errorView(t[n.msgName]||'\u8fd4\u56de\u7684\u6570\u636e\u4e0d\u7b26\u5408\u89c4\u8303\uff0c\u6b63\u786e\u7684\u6210\u529f\u72b6\u6001\u7801\u5e94\u4e3a\uff1a"'+n.statusName+'": '+n.statusCode)):(i.renderData(t,e,t[n.countName]),o(),a.time=(new Date).getTime()-i.startTime+" ms"),i.setColsWidth(),"function"==typeof a.done&&a.done(t,e,t[n.countName])},error:function(e,t){i.errorView("\u8bf7\u6c42\u5f02\u5e38\uff0c\u9519\u8bef\u63d0\u793a\uff1a"+t),i.renderForm(),i.setColsWidth(),"function"==typeof a.error&&a.error(e,t)}})}else if(a.data&&a.data.constructor===Array){var d={},s=e*a.limit-a.limit;d[n.dataName]=a.data.concat().splice(s,a.limit),d[n.countName]=a.data.length,"object"==typeof a.totalRow&&(d[n.totalRowName]=t.extend({},a.totalRow)),i.renderData(d,e,d[n.countName]),o(),i.setColsWidth(),"function"==typeof a.done&&a.done(d,e,d[n.countName])}},I.prototype.eachCols=function(e){var t=this;return c.eachCols(null,e,t.config.cols),t},I.prototype.renderData=function(e,n,o,r){var d=this,s=d.config,y=e[s.response.dataName]||[],h=e[s.response.totalRowName],v=[],m=[],g=[],b=function(){var e;return!r&&d.sortKey?d.sort(d.sortKey.field,d.sortKey.sort,!0):(layui.each(y,function(a,l){var o=[],y=[],h=[],p=a+s.limit*(n-1)+1;"array"===layui._typeof(l)&&0===l.length||(r||(l[c.config.indexName]=a),d.eachCols(function(n,r){var d=r.field||n,v=s.index+"-"+r.key,m=l[d];if(void 0!==m&&null!==m||(m=""),!r.colGroup){var g=['<td data-field="'+d+'" data-key="'+v+'" '+function(){var e=[];return r.edit&&e.push('data-edit="'+r.edit+'"'),r.align&&e.push('align="'+r.align+'"'),r.templet&&e.push('data-content="'+m+'"'),r.toolbar&&e.push('data-off="true"'),r.event&&e.push('lay-event="'+r.event+'"'),r.style&&e.push('style="'+r.style+'"'),r.minWidth&&e.push('data-minwidth="'+r.minWidth+'"'),e.join(" ")}()+' class="'+function(){var e=[];return r.hide&&e.push(f),r.field||e.push("layui-table-col-special"),e.join(" ")}()+'">','<div class="layui-table-cell laytable-cell-'+function(){return"normal"===r.type?v:v+" laytable-cell-"+r.type}()+'">'+function(){var n=t.extend(!0,{LAY_INDEX:p},l),o=c.config.checkName;switch(r.type){case"checkbox":return'<input type="checkbox" name="layTableCheckbox" lay-skin="primary" '+function(){return r[o]?(l[o]=r[o],r[o]?"checked":""):n[o]?"checked":""}()+">";case"radio":return n[o]&&(e=a),'<input type="radio" name="layTableRadio_'+s.index+'" '+(n[o]?"checked":"")+' lay-type="layTableRadio">';case"numbers":return p}return r.toolbar?i(t(r.toolbar).html()||"").render(n):u(r,m,n)}(),"</div></td>"].join("");o.push(g),r.fixed&&"right"!==r.fixed&&y.push(g),"right"===r.fixed&&h.push(g)}}),v.push('<tr data-index="'+a+'">'+o.join("")+"</tr>"),m.push('<tr data-index="'+a+'">'+y.join("")+"</tr>"),g.push('<tr data-index="'+a+'">'+h.join("")+"</tr>"))}),d.layBody.scrollTop(0),d.layMain.find("."+p).remove(),d.layMain.find("tbody").html(v.join("")),d.layFixLeft.find("tbody").html(m.join("")),d.layFixRight.find("tbody").html(g.join("")),d.renderForm(),"number"==typeof e&&d.setThisRowChecked(e),d.syncCheckAll(),d.haveInit?d.scrollPatch():setTimeout(function(){d.scrollPatch()},50),d.haveInit=!0,l.close(d.tipsIndex),s.HAS_SET_COLS_PATCH||d.setColsPatch(),void(s.HAS_SET_COLS_PATCH=!0))};return c.cache[d.key]=y,d.layPage[0==o||0===y.length&&1==n?"addClass":"removeClass"](f),0===y.length?(d.renderForm(),d.errorView(s.text.none)):(d.layFixed.removeClass(f),r?b():(b(),d.renderTotal(y,h),void(s.page&&(s.page=t.extend({elem:"layui-table-page"+s.index,count:o,limit:s.limit,limits:s.limits||[10,20,30,40,50,60,70,80,90],groups:3,layout:["prev","page","next","skip","count","limit"],prev:'<i class="layui-icon">&#xe603;</i>',next:'<i class="layui-icon">&#xe602;</i>',jump:function(e,t){t||(d.page=e.curr,s.limit=e.limit,d.pullData(e.curr))}},s.page),s.page.count=o,a.render(s.page)))))},I.prototype.renderTotal=function(e,a){var l=this,n=l.config,o={};if(n.totalRow){layui.each(e,function(e,t){0!==t.length&&l.eachCols(function(e,i){var a=i.field||e,l=t[a];i.totalRow&&(o[a]=(o[a]||0)+(parseFloat(l)||0))})}),l.dataTotal={};var r=[];l.eachCols(function(e,c){var d=c.field||e,s=function(){var e,t=c.totalRowText||"",i=parseFloat(o[d]).toFixed(2),l={};return l[d]=i,e=c.totalRow?u(c,i,l)||t:t,a?a[c.field]||e:e}(),y=['<td data-field="'+d+'" data-key="'+n.index+"-"+c.key+'" '+function(){var e=[];return c.align&&e.push('align="'+c.align+'"'),c.style&&e.push('style="'+c.style+'"'),c.minWidth&&e.push('data-minwidth="'+c.minWidth+'"'),e.join(" ")}()+' class="'+function(){var e=[];return c.hide&&e.push(f),c.field||e.push("layui-table-col-special"),e.join(" ")}()+'">','<div class="layui-table-cell laytable-cell-'+function(){var e=n.index+"-"+c.key;return"normal"===c.type?e:e+" laytable-cell-"+c.type}()+'">'+function(){var e=c.totalRow||n.totalRow;return"string"==typeof e?i(e).render(t.extend({TOTAL_NUMS:s},c)):s}(),"</div></td>"].join("");c.field&&(l.dataTotal[d]=s),r.push(y)}),l.layTotal.find("tbody").html("<tr>"+r.join("")+"</tr>")}},I.prototype.getColElem=function(e,t){var i=this,a=i.config;return e.eq(0).find(".laytable-cell-"+(a.index+"-"+t)+":eq(0)")},I.prototype.renderForm=function(e){n.render(e,"LAY-table-"+this.index)},I.prototype.setThisRowChecked=function(e){var t=this,i=(t.config,"layui-table-click"),a=t.layBody.find('tr[data-index="'+e+'"]');a.addClass(i).siblings("tr").removeClass(i)},I.prototype.sort=function(e,i,a,l){var n,r,d=this,s={},u=d.config,h=u.elem.attr("lay-filter"),f=c.cache[d.key];"string"==typeof e&&(n=e,d.layHeader.find("th").each(function(i,a){var l=t(this),o=l.data("field");if(o===e)return e=l,n=o,!1}));try{var n=n||e.data("field"),p=e.data("key");if(d.sortKey&&!a&&n===d.sortKey.field&&i===d.sortKey.sort)return;var v=d.layHeader.find("th .laytable-cell-"+p).find(S);d.layHeader.find("th").find(S).removeAttr("lay-sort"),v.attr("lay-sort",i||null),d.layFixed.find("th")}catch(m){o.error("Table modules: sort field '"+n+"' not matched")}d.sortKey={field:n,sort:i},u.autoSort&&("asc"===i?r=layui.sort(f,n):"desc"===i?r=layui.sort(f,n,!0):(r=layui.sort(f,c.config.indexName),delete d.sortKey)),s[u.response.dataName]=r||f,d.renderData(s,d.page,d.count,!0),l&&layui.event.call(e,y,"sort("+h+")",{field:n,type:i})},I.prototype.loading=function(e){var i=this,a=i.config;a.loading&&(e?(i.layInit&&i.layInit.remove(),delete i.layInit,i.layBox.find(b).remove()):(i.layInit=t(['<div class="layui-table-init">','<i class="layui-icon layui-icon-loading layui-anim layui-anim-rotate layui-anim-loop"></i>',"</div>"].join("")),i.layBox.append(i.layInit)))},I.prototype.setCheckData=function(e,t){var i=this,a=i.config,l=c.cache[i.key];l[e]&&l[e].constructor!==Array&&(l[e][a.checkName]=t)},I.prototype.syncCheckAll=function(){var e=this,t=e.config,i=e.layHeader.find('input[name="layTableCheckbox"]'),a=function(i){return e.eachCols(function(e,a){"checkbox"===a.type&&(a[t.checkName]=i)}),i};i[0]&&(c.checkStatus(e.key).isAll?(i[0].checked||(i.prop("checked",!0),e.renderForm("checkbox")),a(!0)):(i[0].checked&&(i.prop("checked",!1),e.renderForm("checkbox")),a(!1)))},I.prototype.getCssRule=function(e,t){var i=this,a=i.elem.find("style")[0],l=a.sheet||a.styleSheet||{},n=l.cssRules||l.rules;layui.each(n,function(i,a){if(a.selectorText===".laytable-cell-"+e)return t(a),!0})},I.prototype.fullSize=function(){var e,t=this,i=t.config,a=i.height;t.fullHeightGap&&(a=j.height()-t.fullHeightGap,a<135&&(a=135),t.elem.css("height",a)),a&&(e=parseFloat(a)-(t.layHeader.outerHeight()||38),i.toolbar&&(e-=t.layTool.outerHeight()||50),i.totalRow&&(e-=t.layTotal.outerHeight()||40),i.page&&(e-=t.layPage.outerHeight()||41),t.layMain.css("height",e-2))},I.prototype.getScrollWidth=function(e){var t=0;return e?t=e.offsetWidth-e.clientWidth:(e=document.createElement("div"),e.style.width="100px",e.style.height="100px",e.style.overflowY="scroll",document.body.appendChild(e),t=e.offsetWidth-e.clientWidth,document.body.removeChild(e)),t},I.prototype.scrollPatch=function(){var e=this,i=e.layMain.children("table"),a=e.layMain.width()-e.layMain.prop("clientWidth"),l=e.layMain.height()-e.layMain.prop("clientHeight"),n=(e.getScrollWidth(e.layMain[0]),i.outerWidth()-e.layMain.width()),o=function(e){if(a&&l){if(e=e.eq(0),!e.find(".layui-table-patch")[0]){var i=t('<th class="layui-table-patch"><div class="layui-table-cell"></div></th>');i.find("div").css({width:a}),e.find("tr").append(i)}}else e.find(".layui-table-patch").remove()};o(e.layHeader),o(e.layTotal);var r=e.layMain.height(),c=r-l;e.layFixed.find(k).css("height",i.height()>=c?c:"auto"),e.layFixRight[n>0?"removeClass":"addClass"](f),e.layFixRight.css("right",a-1)},I.prototype.events=function(){var e,i=this,a=i.config,o=t("body"),d={},s=i.layHeader.find("th"),h=".layui-table-cell",p=a.elem.attr("lay-filter");i.layTool.on("click","*[lay-event]",function(e){var o=t(this),d=o.attr("lay-event"),s=function(e){var l=t(e.list),n=t('<ul class="layui-table-tool-panel"></ul>');n.html(l),a.height&&n.css("max-height",a.height-(i.layTool.outerHeight()||50)),o.find(".layui-table-tool-panel")[0]||o.append(n),i.renderForm(),n.on("click",function(e){layui.stope(e)}),e.done&&e.done(n,l)};switch(layui.stope(e),F.trigger("table.tool.panel.remove"),l.close(i.tipsIndex),d){case"LAYTABLE_COLS":s({list:function(){var e=[];return i.eachCols(function(t,i){i.field&&"normal"==i.type&&e.push('<li><input type="checkbox" name="'+i.field+'" data-key="'+i.key+'" data-parentkey="'+(i.parentKey||"")+'" lay-skin="primary" '+(i.hide?"":"checked")+' title="'+(i.title||i.field)+'" lay-filter="LAY_TABLE_TOOL_COLS"></li>')}),e.join("")}(),done:function(){n.on("checkbox(LAY_TABLE_TOOL_COLS)",function(e){var l=t(e.elem),n=this.checked,o=l.data("key"),r=l.data("parentkey");layui.each(a.cols,function(e,t){layui.each(t,function(t,l){if(e+"-"+t===o){var c=l.hide;l.hide=!n,i.elem.find('*[data-key="'+a.index+"-"+o+'"]')[n?"removeClass":"addClass"](f),c!=l.hide&&i.setParentCol(!n,r),i.resize()}})})})}});break;case"LAYTABLE_EXPORT":r.ie?l.tips("\u5bfc\u51fa\u529f\u80fd\u4e0d\u652f\u6301 IE\uff0c\u8bf7\u7528 Chrome \u7b49\u9ad8\u7ea7\u6d4f\u89c8\u5668\u5bfc\u51fa",this,{tips:3}):s({list:function(){return['<li data-type="csv">\u5bfc\u51fa\u5230 Csv \u6587\u4ef6</li>','<li data-type="xls">\u5bfc\u51fa\u5230 Excel \u6587\u4ef6</li>'].join("")}(),done:function(e,l){l.on("click",function(){var e=t(this).data("type");c.exportFile.call(i,a.id,null,e)})}});break;case"LAYTABLE_PRINT":var u=window.open("\u6253\u5370\u7a97\u53e3","_blank"),h=["<style>","body{font-size: 12px; color: #666;}","table{width: 100%; border-collapse: collapse; border-spacing: 0;}","th,td{line-height: 20px; padding: 9px 15px; border: 1px solid #ccc; text-align: left; font-size: 12px; color: #666;}","a{color: #666; text-decoration:none;}","*.layui-hide{display: none}","</style>"].join(""),v=t(i.layHeader.html());v.append(i.layMain.find("table").html()),v.append(i.layTotal.find("table").html()),v.find("th.layui-table-patch").remove(),v.find(".layui-table-col-special").remove(),u.document.write(h+v.prop("outerHTML")),u.document.close(),u.print(),u.close()}layui.event.call(this,y,"toolbar("+p+")",t.extend({event:d,config:a},{}))}),s.on("mousemove",function(e){var i=t(this),a=i.offset().left,l=e.clientX-a;i.data("unresize")||d.resizeStart||(d.allowResize=i.width()-l<=10,o.css("cursor",d.allowResize?"col-resize":""))}).on("mouseleave",function(){t(this);d.resizeStart||o.css("cursor","")}).on("mousedown",function(e){var l=t(this);if(d.allowResize){var n=l.data("key");e.preventDefault(),d.resizeStart=!0,d.offset=[e.clientX,e.clientY],i.getCssRule(n,function(e){var t=e.style.width||l.outerWidth();d.rule=e,d.ruleWidth=parseFloat(t),d.minWidth=l.data("minwidth")||a.cellMinWidth})}}),F.on("mousemove",function(t){if(d.resizeStart){if(t.preventDefault(),d.rule){var a=d.ruleWidth+t.clientX-d.offset[0];a<d.minWidth&&(a=d.minWidth),d.rule.style.width=a+"px",l.close(i.tipsIndex)}e=1}}).on("mouseup",function(t){d.resizeStart&&(d={},o.css("cursor",""),i.scrollPatch()),2===e&&(e=null)}),s.on("click",function(a){var l,n=t(this),o=n.find(S),r=o.attr("lay-sort");return o[0]&&1!==e?(l="asc"===r?"desc":"desc"===r?null:"asc",void i.sort(n,l,null,!0)):e=2}).find(S+" .layui-edge ").on("click",function(e){var a=t(this),l=a.index(),n=a.parents("th").eq(0).data("field");layui.stope(e),0===l?i.sort(n,"asc",null,!0):i.sort(n,"desc",null,!0)});var v=function(e){var a=t(this),l=a.parents("tr").eq(0).data("index"),n=i.layBody.find('tr[data-index="'+l+'"]'),o=c.cache[i.key]||[];return o=o[l]||{},t.extend({tr:n,data:c.clearCacheKey(o),del:function(){c.cache[i.key][l]=[],n.remove(),i.scrollPatch()},update:function(e){e=e||{},layui.each(e,function(e,t){if(e in o){var a,l=n.children('td[data-field="'+e+'"]');o[e]=t,i.eachCols(function(t,i){i.field==e&&i.templet&&(a=i.templet)}),l.children(h).html(u({templet:a},t,o)),l.data("content",t)}})}},e)};i.elem.on("click",'input[name="layTableCheckbox"]+',function(){var e=t(this).prev(),a=i.layBody.find('input[name="layTableCheckbox"]'),l=e.parents("tr").eq(0).data("index"),n=e[0].checked,o="layTableAllChoose"===e.attr("lay-filter");o?(a.each(function(e,t){t.checked=n,i.setCheckData(e,n)}),i.syncCheckAll(),i.renderForm("checkbox")):(i.setCheckData(l,n),i.syncCheckAll()),layui.event.call(e[0],y,"checkbox("+p+")",v.call(e[0],{checked:n,type:o?"all":"one"}))}),i.elem.on("click",'input[lay-type="layTableRadio"]+',function(){var e=t(this).prev(),l=e[0].checked,n=c.cache[i.key],o=e.parents("tr").eq(0).data("index");layui.each(n,function(e,t){o===e?t[a.checkName]=!0:delete t[a.checkName]}),i.setThisRowChecked(o),layui.event.call(this,y,"radio("+p+")",v.call(this,{checked:l}))}),i.layBody.on("mouseenter","tr",function(){var e=t(this),a=e.index();e.data("off")||i.layBody.find("tr:eq("+a+")").addClass(_)}).on("mouseleave","tr",function(){var e=t(this),a=e.index();e.data("off")||i.layBody.find("tr:eq("+a+")").removeClass(_)}).on("click","tr",function(){m.call(this,"row")}).on("dblclick","tr",function(){m.call(this,"rowDouble")});var m=function(e){var i=t(this);i.data("off")||layui.event.call(this,y,e+"("+p+")",v.call(i.children("td")[0]))};i.layBody.on("change","."+R,function(){var e=t(this),a=this.value,l=e.parent().data("field"),n=e.parents("tr").eq(0).data("index"),o=c.cache[i.key][n];o[l]=a,layui.event.call(this,y,"edit("+p+")",v.call(this,{value:a,field:l}))}).on("blur","."+R,function(){var e,a=t(this),l=this,n=a.parent().data("field"),o=a.parents("tr").eq(0).data("index"),r=c.cache[i.key][o];i.eachCols(function(t,i){i.field==n&&i.templet&&(e=i.templet)}),a.siblings(h).html(function(t){return u({templet:e},t,r)}(l.value)),a.parent().data("content",l.value),a.remove()}),i.layBody.on("click","td",function(e){var i=t(this),a=(i.data("field"),i.data("edit")),l=i.children(h);if(!i.data("off")&&a){var n=t('<input class="layui-input '+R+'">');return n[0].value=i.data("content")||l.text(),i.find("."+R)[0]||i.append(n),n.focus(),void layui.stope(e)}}).on("mouseenter","td",function(){b.call(this)}).on("mouseleave","td",function(){b.call(this,"hide")});var g="layui-table-grid-down",b=function(e){var i=t(this),a=i.children(h);if(!i.data("off"))if(e)i.find(".layui-table-grid-down").remove();else if(a.prop("scrollWidth")>a.outerWidth()){if(a.find("."+g)[0])return;i.append('<div class="'+g+'"><i class="layui-icon layui-icon-down"></i></div>')}};i.layBody.on("click","."+g,function(e){var n=t(this),o=n.parent(),c=o.children(h);i.tipsIndex=l.tips(['<div class="layui-table-tips-main" style="margin-top: -'+(c.height()+16)+"px;"+function(){return"sm"===a.size?"padding: 4px 15px; font-size: 12px;":"lg"===a.size?"padding: 14px 15px;":""}()+'">',c.html(),"</div>",'<i class="layui-icon layui-table-tips-c layui-icon-close"></i>'].join(""),c[0],{tips:[3,""],time:-1,anim:-1,maxWidth:r.ios||r.android?300:i.elem.width()/2,isOutAnim:!1,skin:"layui-table-tips",success:function(e,t){e.find(".layui-table-tips-c").on("click",function(){l.close(t)})}}),layui.stope(e)}),i.layBody.on("click","*[lay-event]",function(){var e=t(this),a=e.parents("tr").eq(0).data("index");layui.event.call(this,y,"tool("+p+")",v.call(this,{event:e.attr("lay-event")})),i.setThisRowChecked(a)}),i.layMain.on("scroll",function(){var e=t(this),a=e.scrollLeft(),n=e.scrollTop();i.layHeader.scrollLeft(a),i.layTotal.scrollLeft(a),i.layFixed.find(k).scrollTop(n),l.close(i.tipsIndex)}),j.on("resize",function(){i.resize()})},function(){F.on("click",function(){F.trigger("table.remove.tool.panel")}),F.on("table.remove.tool.panel",function(){t(".layui-table-tool-panel").remove()})}(),c.init=function(e,i){i=i||{};var a=this,l=t(e?'table[lay-filter="'+e+'"]':h+"[lay-data]"),n="Table element property lay-data configuration item has a syntax error: ";return l.each(function(){var a=t(this),l=a.attr("lay-data");try{l=new Function("return "+l)()}catch(r){o.error(n+l,"error")}var d=[],s=t.extend({elem:this,cols:[],data:[],skin:a.attr("lay-skin"),size:a.attr("lay-size"),even:"string"==typeof a.attr("lay-even")},c.config,i,l);e&&a.hide(),a.find("thead>tr").each(function(e){s.cols[e]=[],t(this).children().each(function(i){var a=t(this),l=a.attr("lay-data");try{l=new Function("return "+l)()}catch(r){return o.error(n+l)}var c=t.extend({title:a.text(),colspan:a.attr("colspan")||0,rowspan:a.attr("rowspan")||0},l);c.colspan<2&&d.push(c),s.cols[e].push(c)})}),a.find("tbody>tr").each(function(e){var i=t(this),a={};i.children("td").each(function(e,i){var l=t(this),n=l.data("field");if(n)return a[n]=l.html()}),layui.each(d,function(e,t){var l=i.children("td").eq(e);a[t.field]=l.html()}),s.data[e]=a}),c.render(s)}),a},d.that={},d.config={},c.eachCols=function(e,i,a){var l=d.config[e]||{},n=[],o=0;a=t.extend(!0,[],a||l.cols),layui.each(a,function(e,t){layui.each(t,function(t,i){if(i.colGroup){var l=0;o++,i.CHILD_COLS=[],layui.each(a[e+1],function(e,t){t.PARENT_COL_INDEX||l>1&&l==i.colspan||(t.PARENT_COL_INDEX=o,i.CHILD_COLS.push(t),l+=parseInt(t.colspan>1?t.colspan:1))})}i.PARENT_COL_INDEX||n.push(i)})});var r=function(e){layui.each(e||n,function(e,t){return t.CHILD_COLS?r(t.CHILD_COLS):void("function"==typeof i&&i(e,t))})};r()},c.checkStatus=function(e){var t=0,i=0,a=[],l=c.cache[e]||[];return layui.each(l,function(e,l){return l.constructor===Array?void i++:void(l[c.config.checkName]&&(t++,a.push(c.clearCacheKey(l))))}),{data:a,isAll:!!l.length&&t===l.length-i}},c.getData=function(e){var t=[],i=c.cache[e]||[];return layui.each(i,function(e,i){i.constructor!==Array&&t.push(c.clearCacheKey(i))}),t},c.exportFile=function(e,t,i){var a=this;t=t||c.clearCacheKey(c.cache[e]),i=i||"csv";var l=d.config[e]||{},n={csv:"text/csv",xls:"application/vnd.ms-excel"}[i],s=document.createElement("a");return r.ie?o.error("IE_NOT_SUPPORT_EXPORTS"):(s.href="data:"+n+";charset=utf-8,\ufeff"+encodeURIComponent(function(){var i=[],l=[],n=[];return layui.each(t,function(t,a){var n=[];"object"==typeof e?(layui.each(e,function(e,a){0==t&&i.push(a||"")}),layui.each(c.clearCacheKey(a),function(e,t){n.push('"'+(t||"")+'"')})):c.eachCols(e,function(e,l){if(l.field&&"normal"==l.type&&!l.hide){var o=a[l.field];void 0!==o&&null!==o||(o=""),0==t&&i.push(l.title||""),n.push('"'+u(l,o,a,"text")+'"')}}),l.push(n.join(","))}),layui.each(a.dataTotal,function(e,t){n.push(t)}),i.join(",")+"\r\n"+l.join("\r\n")+"\r\n"+n.join(",")}()),s.download=(l.title||"table_"+(l.index||""))+"."+i,document.body.appendChild(s),s.click(),void document.body.removeChild(s))},c.resize=function(e){if(e){var t=s(e);if(!t)return;d.that[e].resize()}else layui.each(d.that,function(){this.resize()})},c.reload=function(e,t,i){var a=s(e);if(a){var l=d.that[e];return l.reload(t,i),d.call(l)}},c.render=function(e){
+var t=new I(e);return d.call(t)},c.clearCacheKey=function(e){return e=t.extend({},e),delete e[c.config.checkName],delete e[c.config.indexName],e},t(function(){c.init()}),e(y,c)});layui.define("jquery",function(e){"use strict";var i=layui.$,n=(layui.hint(),layui.device(),{config:{},set:function(e){var n=this;return n.config=i.extend({},n.config,e),n},on:function(e,i){return layui.onevent.call(this,t,e,i)}}),t="carousel",a="layui-this",l=">*[carousel-item]>*",o="layui-carousel-left",r="layui-carousel-right",d="layui-carousel-prev",s="layui-carousel-next",u="layui-carousel-arrow",c="layui-carousel-ind",m=function(e){var t=this;t.config=i.extend({},t.config,n.config,e),t.render()};m.prototype.config={width:"600px",height:"280px",full:!1,arrow:"hover",indicator:"inside",autoplay:!0,interval:3e3,anim:"",trigger:"click",index:0},m.prototype.render=function(){var e=this,n=e.config;n.elem=i(n.elem),n.elem[0]&&(e.elemItem=n.elem.find(l),n.index<0&&(n.index=0),n.index>=e.elemItem.length&&(n.index=e.elemItem.length-1),n.interval<800&&(n.interval=800),n.full?n.elem.css({position:"fixed",width:"100%",height:"100%",zIndex:9999}):n.elem.css({width:n.width,height:n.height}),n.elem.attr("lay-anim",n.anim),e.elemItem.eq(n.index).addClass(a),e.elemItem.length<=1||(e.indicator(),e.arrow(),e.autoplay(),e.events()))},m.prototype.reload=function(e){var n=this;clearInterval(n.timer),n.config=i.extend({},n.config,e),n.render()},m.prototype.prevIndex=function(){var e=this,i=e.config,n=i.index-1;return n<0&&(n=e.elemItem.length-1),n},m.prototype.nextIndex=function(){var e=this,i=e.config,n=i.index+1;return n>=e.elemItem.length&&(n=0),n},m.prototype.addIndex=function(e){var i=this,n=i.config;e=e||1,n.index=n.index+e,n.index>=i.elemItem.length&&(n.index=0)},m.prototype.subIndex=function(e){var i=this,n=i.config;e=e||1,n.index=n.index-e,n.index<0&&(n.index=i.elemItem.length-1)},m.prototype.autoplay=function(){var e=this,i=e.config;i.autoplay&&(clearInterval(e.timer),e.timer=setInterval(function(){e.slide()},i.interval))},m.prototype.arrow=function(){var e=this,n=e.config,t=i(['<button class="layui-icon '+u+'" lay-type="sub">'+("updown"===n.anim?"&#xe619;":"&#xe603;")+"</button>",'<button class="layui-icon '+u+'" lay-type="add">'+("updown"===n.anim?"&#xe61a;":"&#xe602;")+"</button>"].join(""));n.elem.attr("lay-arrow",n.arrow),n.elem.find("."+u)[0]&&n.elem.find("."+u).remove(),n.elem.append(t),t.on("click",function(){var n=i(this),t=n.attr("lay-type");e.slide(t)})},m.prototype.indicator=function(){var e=this,n=e.config,t=e.elemInd=i(['<div class="'+c+'"><ul>',function(){var i=[];return layui.each(e.elemItem,function(e){i.push("<li"+(n.index===e?' class="layui-this"':"")+"></li>")}),i.join("")}(),"</ul></div>"].join(""));n.elem.attr("lay-indicator",n.indicator),n.elem.find("."+c)[0]&&n.elem.find("."+c).remove(),n.elem.append(t),"updown"===n.anim&&t.css("margin-top",-(t.height()/2)),t.find("li").on("hover"===n.trigger?"mouseover":n.trigger,function(){var t=i(this),a=t.index();a>n.index?e.slide("add",a-n.index):a<n.index&&e.slide("sub",n.index-a)})},m.prototype.slide=function(e,i){var n=this,l=n.elemItem,u=n.config,c=u.index,m=u.elem.attr("lay-filter");n.haveSlide||("sub"===e?(n.subIndex(i),l.eq(u.index).addClass(d),setTimeout(function(){l.eq(c).addClass(r),l.eq(u.index).addClass(r)},50)):(n.addIndex(i),l.eq(u.index).addClass(s),setTimeout(function(){l.eq(c).addClass(o),l.eq(u.index).addClass(o)},50)),setTimeout(function(){l.removeClass(a+" "+d+" "+s+" "+o+" "+r),l.eq(u.index).addClass(a),n.haveSlide=!1},300),n.elemInd.find("li").eq(u.index).addClass(a).siblings().removeClass(a),n.haveSlide=!0,layui.event.call(this,t,"change("+m+")",{index:u.index,prevIndex:c,item:l.eq(u.index)}))},m.prototype.events=function(){var e=this,i=e.config;i.elem.data("haveEvents")||(i.elem.on("mouseenter",function(){clearInterval(e.timer)}).on("mouseleave",function(){e.autoplay()}),i.elem.data("haveEvents",!0))},n.render=function(e){var i=new m(e);return i},e(t,n)});layui.define("jquery",function(e){"use strict";var a=layui.jquery,l={config:{},index:layui.rate?layui.rate.index+1e4:0,set:function(e){var l=this;return l.config=a.extend({},l.config,e),l},on:function(e,a){return layui.onevent.call(this,n,e,a)}},i=function(){var e=this,a=e.config;return{setvalue:function(a){e.setvalue.call(e,a)},config:a}},n="rate",t="layui-rate",o="layui-icon-rate",u="layui-icon-rate-solid",s="layui-icon-rate-half",r="layui-icon-rate-solid layui-icon-rate-half",c="layui-icon-rate-solid layui-icon-rate",f="layui-icon-rate layui-icon-rate-half",v=function(e){var i=this;i.index=++l.index,i.config=a.extend({},i.config,l.config,e),i.render()};v.prototype.config={length:5,text:!1,readonly:!1,half:!1,value:0,theme:""},v.prototype.render=function(){var e=this,l=e.config,i=l.theme?'style="color: '+l.theme+';"':"";l.elem=a(l.elem),l.value>l.length&&(l.value=l.length),parseInt(l.value)!==l.value&&(l.half||(l.value=Math.ceil(l.value)-l.value<.5?Math.ceil(l.value):Math.floor(l.value)));for(var n='<ul class="layui-rate" '+(l.readonly?"readonly":"")+">",s=1;s<=l.length;s++){var r='<li class="layui-inline"><i class="layui-icon '+(s>Math.floor(l.value)?o:u)+'" '+i+"></i></li>";l.half&&parseInt(l.value)!==l.value&&s==Math.ceil(l.value)?n=n+'<li><i class="layui-icon layui-icon-rate-half" '+i+"></i></li>":n+=r}n+="</ul>"+(l.text?'<span class="layui-inline">'+l.value+"\u661f":"")+"</span>";var c=l.elem,f=c.next("."+t);f[0]&&f.remove(),e.elemTemp=a(n),l.span=e.elemTemp.next("span"),l.setText&&l.setText(l.value),c.html(e.elemTemp),c.addClass("layui-inline"),l.readonly||e.action()},v.prototype.setvalue=function(e){var a=this,l=a.config;l.value=e,a.render()},v.prototype.action=function(){var e=this,l=e.config,i=e.elemTemp,n=i.find("i").width();i.children("li").each(function(e){var t=e+1,v=a(this);v.on("click",function(e){if(l.value=t,l.half){var o=e.pageX-a(this).offset().left;o<=n/2&&(l.value=l.value-.5)}l.text&&i.next("span").text(l.value+"\u661f"),l.choose&&l.choose(l.value),l.setText&&l.setText(l.value)}),v.on("mousemove",function(e){if(i.find("i").each(function(){a(this).addClass(o).removeClass(r)}),i.find("i:lt("+t+")").each(function(){a(this).addClass(u).removeClass(f)}),l.half){var c=e.pageX-a(this).offset().left;c<=n/2&&v.children("i").addClass(s).removeClass(u)}}),v.on("mouseleave",function(){i.find("i").each(function(){a(this).addClass(o).removeClass(r)}),i.find("i:lt("+Math.floor(l.value)+")").each(function(){a(this).addClass(u).removeClass(f)}),l.half&&parseInt(l.value)!==l.value&&i.children("li:eq("+Math.floor(l.value)+")").children("i").addClass(s).removeClass(c)})})},v.prototype.events=function(){var e=this;e.config},l.render=function(e){var a=new v(e);return i.call(a)},e(n,l)});layui.define("jquery",function(e){"use strict";var l=layui.$,o=function(e){},t='<i class="layui-anim layui-anim-rotate layui-anim-loop layui-icon ">&#xe63e;</i>';o.prototype.load=function(e){var o,i,n,r,a=this,c=0;e=e||{};var m=l(e.elem);if(m[0]){var f=l(e.scrollElem||document),u=e.mb||50,s=!("isAuto"in e)||e.isAuto,y=e.end||"\u6ca1\u6709\u66f4\u591a\u4e86",v=e.scrollElem&&e.scrollElem!==document,d="<cite>\u52a0\u8f7d\u66f4\u591a</cite>",h=l('<div class="layui-flow-more"><a href="javascript:;">'+d+"</a></div>");m.find(".layui-flow-more")[0]||m.append(h);var p=function(e,t){e=l(e),h.before(e),t=0==t||null,t?h.html(y):h.find("a").html(d),i=t,o=null,n&&n()},g=function(){o=!0,h.find("a").html(t),"function"==typeof e.done&&e.done(++c,p)};if(g(),h.find("a").on("click",function(){l(this);i||o||g()}),e.isLazyimg)var n=a.lazyimg({elem:e.elem+" img",scrollElem:e.scrollElem});return s?(f.on("scroll",function(){var e=l(this),t=e.scrollTop();r&&clearTimeout(r),!i&&m.width()&&(r=setTimeout(function(){var i=v?e.height():l(window).height(),n=v?e.prop("scrollHeight"):document.documentElement.scrollHeight;n-t-i<=u&&(o||g())},100))}),a):a}},o.prototype.lazyimg=function(e){var o,t=this,i=0;e=e||{};var n=l(e.scrollElem||document),r=e.elem||"img",a=e.scrollElem&&e.scrollElem!==document,c=function(e,l){var o=n.scrollTop(),r=o+l,c=a?function(){return e.offset().top-n.offset().top+o}():e.offset().top;if(c>=o&&c<=r&&e.attr("lay-src")){var f=e.attr("lay-src");layui.img(f,function(){var l=t.lazyimg.elem.eq(i);e.attr("src",f).removeAttr("lay-src"),l[0]&&m(l),i++},function(){t.lazyimg.elem.eq(i);e.removeAttr("lay-src")})}},m=function(e,o){var m=a?(o||n).height():l(window).height(),f=n.scrollTop(),u=f+m;if(t.lazyimg.elem=l(r),e)c(e,m);else for(var s=0;s<t.lazyimg.elem.length;s++){var y=t.lazyimg.elem.eq(s),v=a?function(){return y.offset().top-n.offset().top+f}():y.offset().top;if(c(y,m),i=s,v>u)break}};if(m(),!o){var f;n.on("scroll",function(){var e=l(this);f&&clearTimeout(f),f=setTimeout(function(){m(null,e)},50)}),o=!0}return m},e("flow",new o)});layui.define(["layer","form"],function(t){"use strict";var e=layui.$,i=layui.layer,a=layui.form,l=(layui.hint(),layui.device()),n="layedit",o="layui-show",r="layui-disabled",c=function(){var t=this;t.index=0,t.config={tool:["strong","italic","underline","del","|","left","center","right","|","link","unlink","face","image"],hideTool:[],height:280}};c.prototype.set=function(t){var i=this;return e.extend(!0,i.config,t),i},c.prototype.on=function(t,e){return layui.onevent(n,t,e)},c.prototype.build=function(t,i){i=i||{};var a=this,n=a.config,r="layui-layedit",c=e("string"==typeof t?"#"+t:t),u="LAY_layedit_"+ ++a.index,d=c.next("."+r),y=e.extend({},n,i),f=function(){var t=[],e={};return layui.each(y.hideTool,function(t,i){e[i]=!0}),layui.each(y.tool,function(i,a){C[a]&&!e[a]&&t.push(C[a])}),t.join("")}(),m=e(['<div class="'+r+'">','<div class="layui-unselect layui-layedit-tool">'+f+"</div>",'<div class="layui-layedit-iframe">','<iframe id="'+u+'" name="'+u+'" textarea="'+t+'" frameborder="0"></iframe>',"</div>","</div>"].join(""));return l.ie&&l.ie<8?c.removeClass("layui-hide").addClass(o):(d[0]&&d.remove(),s.call(a,m,c[0],y),c.addClass("layui-hide").after(m),a.index)},c.prototype.getContent=function(t){var e=u(t);if(e[0])return d(e[0].document.body.innerHTML)},c.prototype.getText=function(t){var i=u(t);if(i[0])return e(i[0].document.body).text()},c.prototype.setContent=function(t,i,a){var l=u(t);l[0]&&(a?e(l[0].document.body).append(i):e(l[0].document.body).html(i),layedit.sync(t))},c.prototype.sync=function(t){var i=u(t);if(i[0]){var a=e("#"+i[1].attr("textarea"));a.val(d(i[0].document.body.innerHTML))}},c.prototype.getSelection=function(t){var e=u(t);if(e[0]){var i=m(e[0].document);return document.selection?i.text:i.toString()}};var s=function(t,i,a){var l=this,n=t.find("iframe");n.css({height:a.height}).on("load",function(){var o=n.contents(),r=n.prop("contentWindow"),c=o.find("head"),s=e(["<style>","*{margin: 0; padding: 0;}","body{padding: 10px; line-height: 20px; overflow-x: hidden; word-wrap: break-word; font: 14px Helvetica Neue,Helvetica,PingFang SC,Microsoft YaHei,Tahoma,Arial,sans-serif; -webkit-box-sizing: border-box !important; -moz-box-sizing: border-box !important; box-sizing: border-box !important;}","a{color:#01AAED; text-decoration:none;}a:hover{color:#c00}","p{margin-bottom: 10px;}","img{display: inline-block; border: none; vertical-align: middle;}","pre{margin: 10px 0; padding: 10px; line-height: 20px; border: 1px solid #ddd; border-left-width: 6px; background-color: #F2F2F2; color: #333; font-family: Courier New; font-size: 12px;}","</style>"].join("")),u=o.find("body");c.append(s),u.attr("contenteditable","true").css({"min-height":a.height}).html(i.value||""),y.apply(l,[r,n,i,a]),g.call(l,r,t,a)})},u=function(t){var i=e("#LAY_layedit_"+t),a=i.prop("contentWindow");return[a,i]},d=function(t){return 8==l.ie&&(t=t.replace(/<.+>/g,function(t){return t.toLowerCase()})),t},y=function(t,a,n,o){var r=t.document,c=e(r.body);c.on("keydown",function(t){var e=t.keyCode;if(13===e){var a=m(r),l=p(a),n=l.parentNode;if("pre"===n.tagName.toLowerCase()){if(t.shiftKey)return;return i.msg("\u8bf7\u6682\u65f6\u7528shift+enter"),!1}r.execCommand("formatBlock",!1,"<p>")}}),e(n).parents("form").on("submit",function(){var t=c.html();8==l.ie&&(t=t.replace(/<.+>/g,function(t){return t.toLowerCase()})),n.value=t}),c.on("paste",function(e){r.execCommand("formatBlock",!1,"<p>"),setTimeout(function(){f.call(t,c),n.value=c.html()},100)})},f=function(t){var i=this;i.document;t.find("*[style]").each(function(){var t=this.style.textAlign;this.removeAttribute("style"),e(this).css({"text-align":t||""})}),t.find("table").addClass("layui-table"),t.find("script,link").remove()},m=function(t){return t.selection?t.selection.createRange():t.getSelection().getRangeAt(0)},p=function(t){return t.endContainer||t.parentElement().childNodes[0]},v=function(t,i,a){var l=this.document,n=document.createElement(t);for(var o in i)n.setAttribute(o,i[o]);if(n.removeAttribute("text"),l.selection){var r=a.text||i.text;if("a"===t&&!r)return;r&&(n.innerHTML=r),a.pasteHTML(e(n).prop("outerHTML")),a.select()}else{var r=a.toString()||i.text;if("a"===t&&!r)return;r&&(n.innerHTML=r),a.deleteContents(),a.insertNode(n)}},h=function(t,i){var a=this.document,l="layedit-tool-active",n=p(m(a)),o=function(e){return t.find(".layedit-tool-"+e)};i&&i[i.hasClass(l)?"removeClass":"addClass"](l),t.find(">i").removeClass(l),o("unlink").addClass(r),e(n).parents().each(function(){var t=this.tagName.toLowerCase(),e=this.style.textAlign;"b"!==t&&"strong"!==t||o("b").addClass(l),"i"!==t&&"em"!==t||o("i").addClass(l),"u"===t&&o("u").addClass(l),"strike"===t&&o("d").addClass(l),"p"===t&&("center"===e?o("center").addClass(l):"right"===e?o("right").addClass(l):o("left").addClass(l)),"a"===t&&(o("link").addClass(l),o("unlink").removeClass(r))})},g=function(t,a,l){var n=t.document,o=e(n.body),c={link:function(i){var a=p(i),l=e(a).parent();b.call(o,{href:l.attr("href"),target:l.attr("target")},function(e){var a=l[0];"A"===a.tagName?a.href=e.url:v.call(t,"a",{target:e.target,href:e.url,text:e.url},i)})},unlink:function(t){n.execCommand("unlink")},face:function(e){x.call(this,function(i){v.call(t,"img",{src:i.src,alt:i.alt},e)})},image:function(a){var n=this;layui.use("upload",function(o){var r=l.uploadImage||{};o.render({url:r.url,method:r.type,elem:e(n).find("input")[0],done:function(e){0==e.code?(e.data=e.data||{},v.call(t,"img",{src:e.data.src,alt:e.data.title},a)):i.msg(e.msg||"\u4e0a\u4f20\u5931\u8d25")}})})},code:function(e){k.call(o,function(i){v.call(t,"pre",{text:i.code,"lay-lang":i.lang},e)})},help:function(){i.open({type:2,title:"\u5e2e\u52a9",area:["600px","380px"],shadeClose:!0,shade:.1,skin:"layui-layer-msg",content:["","no"]})}},s=a.find(".layui-layedit-tool"),u=function(){var i=e(this),a=i.attr("layedit-event"),l=i.attr("lay-command");if(!i.hasClass(r)){o.focus();var u=m(n);u.commonAncestorContainer;l?(n.execCommand(l),/justifyLeft|justifyCenter|justifyRight/.test(l)&&n.execCommand("formatBlock",!1,"<p>"),setTimeout(function(){o.focus()},10)):c[a]&&c[a].call(this,u),h.call(t,s,i)}},d=/image/;s.find(">i").on("mousedown",function(){var t=e(this),i=t.attr("layedit-event");d.test(i)||u.call(this)}).on("click",function(){var t=e(this),i=t.attr("layedit-event");d.test(i)&&u.call(this)}),o.on("click",function(){h.call(t,s),i.close(x.index)})},b=function(t,e){var l=this,n=i.open({type:1,id:"LAY_layedit_link",area:"350px",shade:.05,shadeClose:!0,moveType:1,title:"\u8d85\u94fe\u63a5",skin:"layui-layer-msg",content:['<ul class="layui-form" style="margin: 15px;">','<li class="layui-form-item">','<label class="layui-form-label" style="width: 60px;">URL</label>','<div class="layui-input-block" style="margin-left: 90px">','<input name="url" lay-verify="url" value="'+(t.href||"")+'" autofocus="true" autocomplete="off" class="layui-input">',"</div>","</li>",'<li class="layui-form-item">','<label class="layui-form-label" style="width: 60px;">\u6253\u5f00\u65b9\u5f0f</label>','<div class="layui-input-block" style="margin-left: 90px">','<input type="radio" name="target" value="_self" class="layui-input" title="\u5f53\u524d\u7a97\u53e3"'+("_self"!==t.target&&t.target?"":"checked")+">",'<input type="radio" name="target" value="_blank" class="layui-input" title="\u65b0\u7a97\u53e3" '+("_blank"===t.target?"checked":"")+">","</div>","</li>",'<li class="layui-form-item" style="text-align: center;">','<button type="button" lay-submit lay-filter="layedit-link-yes" class="layui-btn"> \u786e\u5b9a </button>','<button style="margin-left: 20px;" type="button" class="layui-btn layui-btn-primary"> \u53d6\u6d88 </button>',"</li>","</ul>"].join(""),success:function(t,n){var o="submit(layedit-link-yes)";a.render("radio"),t.find(".layui-btn-primary").on("click",function(){i.close(n),l.focus()}),a.on(o,function(t){i.close(b.index),e&&e(t.field)})}});b.index=n},x=function(t){var a=function(){var t=["[\u5fae\u7b11]","[\u563b\u563b]","[\u54c8\u54c8]","[\u53ef\u7231]","[\u53ef\u601c]","[\u6316\u9f3b]","[\u5403\u60ca]","[\u5bb3\u7f9e]","[\u6324\u773c]","[\u95ed\u5634]","[\u9119\u89c6]","[\u7231\u4f60]","[\u6cea]","[\u5077\u7b11]","[\u4eb2\u4eb2]","[\u751f\u75c5]","[\u592a\u5f00\u5fc3]","[\u767d\u773c]","[\u53f3\u54fc\u54fc]","[\u5de6\u54fc\u54fc]","[\u5618]","[\u8870]","[\u59d4\u5c48]","[\u5410]","[\u54c8\u6b20]","[\u62b1\u62b1]","[\u6012]","[\u7591\u95ee]","[\u998b\u5634]","[\u62dc\u62dc]","[\u601d\u8003]","[\u6c57]","[\u56f0]","[\u7761]","[\u94b1]","[\u5931\u671b]","[\u9177]","[\u8272]","[\u54fc]","[\u9f13\u638c]","[\u6655]","[\u60b2\u4f24]","[\u6293\u72c2]","[\u9ed1\u7ebf]","[\u9634\u9669]","[\u6012\u9a82]","[\u4e92\u7c89]","[\u5fc3]","[\u4f24\u5fc3]","[\u732a\u5934]","[\u718a\u732b]","[\u5154\u5b50]","[ok]","[\u8036]","[good]","[NO]","[\u8d5e]","[\u6765]","[\u5f31]","[\u8349\u6ce5\u9a6c]","[\u795e\u9a6c]","[\u56e7]","[\u6d6e\u4e91]","[\u7ed9\u529b]","[\u56f4\u89c2]","[\u5a01\u6b66]","[\u5965\u7279\u66fc]","[\u793c\u7269]","[\u949f]","[\u8bdd\u7b52]","[\u8721\u70db]","[\u86cb\u7cd5]"],e={};return layui.each(t,function(t,i){e[i]=layui.cache.dir+"images/face/"+t+".gif"}),e}();return x.hide=x.hide||function(t){"face"!==e(t.target).attr("layedit-event")&&i.close(x.index)},x.index=i.tips(function(){var t=[];return layui.each(a,function(e,i){t.push('<li title="'+e+'"><img src="'+i+'" alt="'+e+'"></li>')}),'<ul class="layui-clear">'+t.join("")+"</ul>"}(),this,{tips:1,time:0,skin:"layui-box layui-util-face",maxWidth:500,success:function(l,n){l.css({marginTop:-4,marginLeft:-10}).find(".layui-clear>li").on("click",function(){t&&t({src:a[this.title],alt:this.title}),i.close(n)}),e(document).off("click",x.hide).on("click",x.hide)}})},k=function(t){var e=this,l=i.open({type:1,id:"LAY_layedit_code",area:"550px",shade:.05,shadeClose:!0,moveType:1,title:"\u63d2\u5165\u4ee3\u7801",skin:"layui-layer-msg",content:['<ul class="layui-form layui-form-pane" style="margin: 15px;">','<li class="layui-form-item">','<label class="layui-form-label">\u8bf7\u9009\u62e9\u8bed\u8a00</label>','<div class="layui-input-block">','<select name="lang">','<option value="JavaScript">JavaScript</option>','<option value="HTML">HTML</option>','<option value="CSS">CSS</option>','<option value="Java">Java</option>','<option value="PHP">PHP</option>','<option value="C#">C#</option>','<option value="Python">Python</option>','<option value="Ruby">Ruby</option>','<option value="Go">Go</option>',"</select>","</div>","</li>",'<li class="layui-form-item layui-form-text">','<label class="layui-form-label">\u4ee3\u7801</label>','<div class="layui-input-block">','<textarea name="code" lay-verify="required" autofocus="true" class="layui-textarea" style="height: 200px;"></textarea>',"</div>","</li>",'<li class="layui-form-item" style="text-align: center;">','<button type="button" lay-submit lay-filter="layedit-code-yes" class="layui-btn"> \u786e\u5b9a </button>','<button style="margin-left: 20px;" type="button" class="layui-btn layui-btn-primary"> \u53d6\u6d88 </button>',"</li>","</ul>"].join(""),success:function(l,n){var o="submit(layedit-code-yes)";a.render("select"),l.find(".layui-btn-primary").on("click",function(){i.close(n),e.focus()}),a.on(o,function(e){i.close(k.index),t&&t(e.field)})}});k.index=l},C={html:'<i class="layui-icon layedit-tool-html" title="HTML\u6e90\u4ee3\u7801" lay-command="html" layedit-event="html"">&#xe64b;</i><span class="layedit-tool-mid"></span>',strong:'<i class="layui-icon layedit-tool-b" title="\u52a0\u7c97" lay-command="Bold" layedit-event="b"">&#xe62b;</i>',italic:'<i class="layui-icon layedit-tool-i" title="\u659c\u4f53" lay-command="italic" layedit-event="i"">&#xe644;</i>',underline:'<i class="layui-icon layedit-tool-u" title="\u4e0b\u5212\u7ebf" lay-command="underline" layedit-event="u"">&#xe646;</i>',del:'<i class="layui-icon layedit-tool-d" title="\u5220\u9664\u7ebf" lay-command="strikeThrough" layedit-event="d"">&#xe64f;</i>',"|":'<span class="layedit-tool-mid"></span>',left:'<i class="layui-icon layedit-tool-left" title="\u5de6\u5bf9\u9f50" lay-command="justifyLeft" layedit-event="left"">&#xe649;</i>',center:'<i class="layui-icon layedit-tool-center" title="\u5c45\u4e2d\u5bf9\u9f50" lay-command="justifyCenter" layedit-event="center"">&#xe647;</i>',right:'<i class="layui-icon layedit-tool-right" title="\u53f3\u5bf9\u9f50" lay-command="justifyRight" layedit-event="right"">&#xe648;</i>',link:'<i class="layui-icon layedit-tool-link" title="\u63d2\u5165\u94fe\u63a5" layedit-event="link"">&#xe64c;</i>',unlink:'<i class="layui-icon layedit-tool-unlink layui-disabled" title="\u6e05\u9664\u94fe\u63a5" lay-command="unlink" layedit-event="unlink"">&#xe64d;</i>',face:'<i class="layui-icon layedit-tool-face" title="\u8868\u60c5" layedit-event="face"">&#xe650;</i>',image:'<i class="layui-icon layedit-tool-image" title="\u56fe\u7247" layedit-event="image">&#xe64a;<input type="file" name="file"></i>',code:'<i class="layui-icon layedit-tool-code" title="\u63d2\u5165\u4ee3\u7801" layedit-event="code">&#xe64e;</i>',help:'<i class="layui-icon layedit-tool-help" title="\u5e2e\u52a9" layedit-event="help">&#xe607;</i>'},L=new c;t(n,L)});layui.define("jquery",function(a){"use strict";var e=layui.$;a("code",function(a){var l=[];a=a||{},a.elem=e(a.elem||".layui-code"),a.lang="lang"in a?a.lang:"code",a.elem.each(function(){l.push(this)}),layui.each(l.reverse(),function(l,i){var t=e(i),c=t.html();(t.attr("lay-encode")||a.encode)&&(c=c.replace(/&(?!#?[a-zA-Z0-9]+;)/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/'/g,"&#39;").replace(/"/g,"&quot;")),t.html('<ol class="layui-code-ol"><li>'+c.replace(/[\r\t\n]+/g,"</li><li>")+"</li></ol>"),t.find(">.layui-code-h3")[0]||t.prepend('<h3 class="layui-code-h3">'+(t.attr("lay-title")||a.title||"&lt;/&gt;")+'<a href="javascript:;">'+(t.attr("lay-lang")||a.lang||"")+"</a></h3>");var n=t.find(">.layui-code-ol");t.addClass("layui-box layui-code-view"),(t.attr("lay-skin")||a.skin)&&t.addClass("layui-code-"+(t.attr("lay-skin")||a.skin)),(n.find("li").length/100|0)>0&&n.css("margin-left",(n.find("li").length/100|0)+"px"),(t.attr("lay-height")||a.height)&&n.css("max-height",t.attr("lay-height")||a.height)})})}).addcss("modules/code.css?v=2","skincodecss");
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/log/log.js b/pluss-manage-page/src/main/resources/static/resources/auth/js/log/log.js
new file mode 100644
index 0000000..99ab163
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/log/log.js
@@ -0,0 +1,43 @@
+function initTable() {
+	table = $("#log_table").myDataTable({
+		"sAjaxSource" : ctx + '/log/pageQuery',
+		"paramSelector" : '#text,#startDate,#endDate',
+		"aoColumns" : [ {
+			//0 optName
+			"bSortable" : false,
+			sWidth : 150
+		}, {
+			//1 loginName
+			"bSortable" : false,
+			sWidth : 60
+		}, {
+			// 2 optTime
+			bSortable : true,
+			sName : 'optTime',
+			sWidth : 80,
+			fnRender : function(obj) {
+				var val = obj.aData[2];
+				try {
+					return new Date(val).format("yyyy-MM-dd hh:mm:ss");
+				} catch (e) {
+					return '';
+				}
+			}
+		} ]
+	});
+}
+
+function initQuery() {
+	$("#btn-query").click(function() {
+		table.fnDraw();
+	});
+	$("#text").keyup(function(e) {
+		if (e.keyCode == 13) {
+			table.fnDraw();
+		}
+	});
+}
+$(document).ready(function() {
+	initTable();
+	initQuery();
+});
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/login/DialogUtil.js b/pluss-manage-page/src/main/resources/static/resources/auth/js/login/DialogUtil.js
new file mode 100644
index 0000000..1a1ce6e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/login/DialogUtil.js
@@ -0,0 +1,318 @@
+/**
+ * 
+ * 为了layer的顶层dialog显示
+ * 相关API请看<a herf="http://layer.layui.com/api.html">http://layer.layui.com/api.html</a>
+ 
+ * 
+ * <pre>
+ * 邮箱:50875875@qq.com
+ * 日期:2019-02-17-21:29:34
+ * 版权：安徽航天信息有限公司
+ * </pre>
+ */
+DialogUtil = {
+	/**
+	 * 获取顶部窗口
+	 */
+	getParent : function(w) {
+		var win = w ? w : window;
+		if (win.parent != win) // 找到最顶层窗口
+			return this.getParent(win.parent);
+		return win;
+	},
+	/**
+	 * 格式化 var str=String.format("姓名:{0},性别:{1}","hugh","男"); alert(str);
+	 * 
+	 * @returns
+	 */
+	format : function() {
+		var template = arguments[0], args = arguments, str = template.replace(
+				/\{(\d+)\}/g, function(m, i) {
+					return args[parseInt(i) + 1];
+				});
+		return str;
+	},
+	layer : function() {
+		return this.getParent().laydialog;
+	},
+	open : function(options) {
+		return this.layer().open(options);
+	},
+	/**
+	 * 关闭指定的弹窗
+	 * @param index 对话框的index
+	 * @returns
+	 */
+	close : function(index) {
+		return this.layer().close(index);
+	},
+	/**
+	 * 关闭当前的弹窗
+	 * @returns
+	 */
+	closeDialog : function() {
+		if(frameElement &&frameElement.dialog){
+			return this.close(frameElement.dialog.index);
+		}else{
+		   if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") !=-1) {  
+		        window.location.href="about:blank";  
+		        window.close();  
+		    } else {  
+		        window.opener = null;  
+		        window.open("", "_self");  
+		        window.close();  
+		    }  
+		}
+	},
+	/**
+	 * 关闭所有的弹窗
+	 * @returns
+	 */
+	closeAll : function() {
+		return this.layer().closeAll();
+	},
+	/**
+	 * 获得弹出窗口的Window对象<br>
+	 * DialogUtil.getChildFrameWindow().xxx();
+	 * xxx ：是具体的方法。
+	 * @param index 这个是对话框的id
+	 * @returns
+	 */
+	getChildFrameWindow:function(index){
+		return this.layer().getChildFrameWindow(index);
+	},
+	/**
+	 * 可以通过选择器查找对象
+	 * @param selector 
+	 * @param index
+	 * @returns
+	 */
+	getChildFrame:function(selector, index){
+		return this.layer().getChildFrame(selector,index);
+	},
+	/**
+	 * 弹窗框
+	 * @param options 
+	 * params  传递的参数 
+	 * callback 回调
+	 * 
+	 * @returns
+	 */
+	dialog:function(options){
+		var opts = jQuery.extend({}, {
+		    type: 2,
+		    area: ['90%', '90%'],
+		    fix: true, //固定
+		    maxmin: true,
+		    btnAlign:'c'
+		}, options);
+		return this.layer().open(opts);
+	},
+	/**
+	 * 窗口回调
+	 * @param options
+	 */
+	callback:function(options){
+		if(frameElement.dialog){
+			if(frameElement.dialog.callback){
+				frameElement.dialog.callback(options);
+			}
+		}
+	},
+	/**
+	 * 全屏窗口
+	 * @returns
+	 */
+	openFullWindow:function(){
+		var options={},
+    		defaultOptions = {
+			    type: 2,
+			    area: ['100%', '100%'],
+			    fix: true, //固定
+			    maxmin: true
+			};
+	    if (typeof arguments[0] === 'object' ) {
+	        options = jQuery.extend(true, defaultOptions, arguments[0]);
+	    } else {
+	        options = jQuery.extend(true, defaultOptions, {
+	        	content: arguments[0],
+	        	title:typeof arguments[1] !== 'undefined' ? arguments[1] : null
+	        });
+	    }
+	    options = jQuery.extend(true, defaultOptions, options);
+		return this.layer().open(options);
+	},
+	/**
+	 * alert
+	 * 
+	 * @param content  【必填】 提示消息 //注意这个是字符串，
+	 * @param title  【选填】 如果是function类型 ,则是回调（callback），如果是String类型 则是提示标题,不传入为默认值‘提示'
+	 * @param callback 【选填】  如果是function类型 ,则是回调（callback）
+	 * @returns
+	 */
+	alert : function(content,title,callback){
+			var  o = {
+				content: content
+			 };
+			if (typeof (title) == "function") o.callback = title;
+			if(callback) o.callback = callback;
+			if (typeof (title) == "string" && title != "") o.title = title;
+		return this.layer().alert(o);
+	},
+	/**
+	 * 警告
+	 * 
+	 * @param content  【必填】 提示消息
+	 * @param title  【选填】 如果是function类型 ,则是回调（callback），如果是String类型 则是提示标题,不传入为默认值‘提示'
+	 * @param callback 【选填】  如果是function类型 ,则是回调（callback）
+	 * @returns
+	 */
+	warn:function(content,title,callback){
+		var  o = {
+				content: content,
+				icon:0
+			 };
+			if (typeof (title) == "function") o.callback = title;
+			if(callback) o.callback = callback;
+			if (typeof (title) == "string" && title != "") o.title = title;
+		return this.layer().alert(o);
+	},
+	/**
+	 * 错误提示信息
+	 * @param content 【必填】 错误信息简述
+	 * @param detail 【必填】 详细错误信息
+	 * @param title  【选填】  如果是function类型 ,则是回调（callback），如果是String类型 则是提示标题,不传入为默认值‘提示'
+	 * @param callback 【选填】  如果是function类型 ,则是回调（callback）
+	 * @returns
+	 */
+	error : function(content,detail,title,callback){ 
+		if(detail){
+			var divTemplate="<div class='div_error' >" +
+			"<div class='div_error_msg'><i class='fa fa-times-circle'></i>&nbsp;{0}</div>" +
+				"<div style='text-align:left; padding-bottom:10px; padding-left:10px;'></div>" +
+			"<div class='div_error_detail'>{1}</div>" +
+			"</div>";
+			var msg=this.format(divTemplate,content,detail);
+			if (typeof (title) == "function") {
+				callback = title;
+				title ="提示";
+			}
+			if (typeof (title) == "string" && title != "") title = title;
+		    return this.layer().alert({
+		    	content: msg,
+		    	title:title,
+		    	callback:callback
+		    });
+		}else{
+		    return this.layer().alert({
+		    	content: content,
+				icon:2
+		    });
+		}
+	
+	},
+	/**
+	 *  确认对话框
+	 *  
+	 * @param content 【必填】 提示消息
+	 * @param title 【选填】     如果是function类型 ,则是回调（callback），如果是String类型 则是提示标题,不传入为默认值‘提示’；
+	 * @param callback 【选填】  如果是function类型 ,则是回调（callback），如果是boolean类型 并且为true 则是按钮为是否  否则是默认
+	 * @param buttonsLabel 【选填】 如果是boolean类型 则是按钮为是否
+	 * @returns 
+	 */
+	confirm : function(content,title,callback,buttonsLabel) {
+		var  o = {content:content };
+		if (typeof (title) == "function") o.callback = title;
+		if (typeof (callback) == "boolean") buttonsLabel = callback;
+		if (typeof (callback) == "function") o.callback  = callback;
+		if (typeof (title) == "string" && title != "") o.title = title;
+		if(buttonsLabel){
+			o.btn = [{
+				label: '&#x662F;'//是
+	           }, {
+	        	   label: '&#x5426;'//否
+	           }];
+		}
+		return this.layer().confirm(o);
+	},
+	/**
+	 * 加载的对话框
+	 * @param icon 【选填】加载的图标 0-2可选 如果是0，无需传
+	 * @param options  【选填】 可以设置时间等参数
+	 * @returns
+	 */
+	load : function(icon, options) {
+		if(!options)
+			options = {};
+		if(typeof (icon) == "string"){
+			options = {title:icon};
+			icon = 0;
+		}
+		
+		return this.layer().load(icon, options);
+	},
+	/**
+	 * 顶部通知框
+	 * @param content  【必填】提示消息
+	 * @param options  【选填】选项
+	 * @param callback 【选填】回调
+	 * @returns
+	 */
+	toastr : function(content,options, callback) {
+		var opts ={
+				offset : 0,
+				shift :6};
+		if(typeof (options)  == "boolean") {
+			opts.shift = options?0:6;
+		}else if(typeof (options)  == "function"){
+			callback = options;
+		}
+		return this.msg(content,opts, callback);
+	},
+	/**
+	 * 提示消息 【中间】
+	 * @param content 【必填】提示消息
+	 * @param options 【必填】选项
+	 * @param callback 【选填】回调
+	 * @returns
+	 */
+	msg : function(content, options, callback) {
+		return this.layer().msg(content, options, callback);
+	},
+	/**
+	 * 气泡提示
+	 * @param content 【必填】提示消息
+	 * @param follow  位置
+	 * @param options 【必填】选项
+	 * @returns
+	 */
+	tips : function(content, follow, options) {
+		return this.layer().tips(content, follow, options);
+	},
+	// 导出专用
+	tipDialog : function(title, message, detail, type, callback) {
+		var divTemplate = "<div class='div_error' >"
+				+ "<div class='div_error_msg'>{0}</div>"
+				+ "<div style='text-align:left; padding-bottom:10px; padding-left:10px;'></div>"
+				+ "<div class='div_error_detail'>{1}</div>" + "</div>";
+		var content = this.format(divTemplate, message, detail);
+		return this.layer().alert( {
+			title:title,
+			content:content,
+			icon :  type
+		});
+	},
+	/**
+	 * tab 层
+	 * @param options
+	 */
+	tab:function(options){
+		return this.layer().tab(options);
+	},
+	/**
+	 * prompt层
+	 */
+	prompt:function(options,yes){
+		return this.layer().prompt(options,yes);
+	}
+};
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/login/lay/modules/carousel.js b/pluss-manage-page/src/main/resources/static/resources/auth/js/login/lay/modules/carousel.js
new file mode 100644
index 0000000..2be2c8c
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/login/lay/modules/carousel.js
@@ -0,0 +1,2 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ ;layui.define("jquery",function(e){"use strict";var i=layui.$,n=(layui.hint(),layui.device(),{config:{},set:function(e){var n=this;return n.config=i.extend({},n.config,e),n},on:function(e,i){return layui.onevent.call(this,t,e,i)}}),t="carousel",a="layui-this",l=">*[carousel-item]>*",o="layui-carousel-left",r="layui-carousel-right",d="layui-carousel-prev",s="layui-carousel-next",u="layui-carousel-arrow",c="layui-carousel-ind",m=function(e){var t=this;t.config=i.extend({},t.config,n.config,e),t.render()};m.prototype.config={width:"600px",height:"280px",full:!1,arrow:"hover",indicator:"inside",autoplay:!0,interval:3e3,anim:"",trigger:"click",index:0},m.prototype.render=function(){var e=this,n=e.config;n.elem=i(n.elem),n.elem[0]&&(e.elemItem=n.elem.find(l),n.index<0&&(n.index=0),n.index>=e.elemItem.length&&(n.index=e.elemItem.length-1),n.interval<800&&(n.interval=800),n.full?n.elem.css({position:"fixed",width:"100%",height:"100%",zIndex:9999}):n.elem.css({width:n.width,height:n.height}),n.elem.attr("lay-anim",n.anim),e.elemItem.eq(n.index).addClass(a),e.elemItem.length<=1||(e.indicator(),e.arrow(),e.autoplay(),e.events()))},m.prototype.reload=function(e){var n=this;clearInterval(n.timer),n.config=i.extend({},n.config,e),n.render()},m.prototype.prevIndex=function(){var e=this,i=e.config,n=i.index-1;return n<0&&(n=e.elemItem.length-1),n},m.prototype.nextIndex=function(){var e=this,i=e.config,n=i.index+1;return n>=e.elemItem.length&&(n=0),n},m.prototype.addIndex=function(e){var i=this,n=i.config;e=e||1,n.index=n.index+e,n.index>=i.elemItem.length&&(n.index=0)},m.prototype.subIndex=function(e){var i=this,n=i.config;e=e||1,n.index=n.index-e,n.index<0&&(n.index=i.elemItem.length-1)},m.prototype.autoplay=function(){var e=this,i=e.config;i.autoplay&&(e.timer=setInterval(function(){e.slide()},i.interval))},m.prototype.arrow=function(){var e=this,n=e.config,t=i(['<button class="layui-icon '+u+'" lay-type="sub">'+("updown"===n.anim?"&#xe619;":"&#xe603;")+"</button>",'<button class="layui-icon '+u+'" lay-type="add">'+("updown"===n.anim?"&#xe61a;":"&#xe602;")+"</button>"].join(""));n.elem.attr("lay-arrow",n.arrow),n.elem.find("."+u)[0]&&n.elem.find("."+u).remove(),n.elem.append(t),t.on("click",function(){var n=i(this),t=n.attr("lay-type");e.slide(t)})},m.prototype.indicator=function(){var e=this,n=e.config,t=e.elemInd=i(['<div class="'+c+'"><ul>',function(){var i=[];return layui.each(e.elemItem,function(e){i.push("<li"+(n.index===e?' class="layui-this"':"")+"></li>")}),i.join("")}(),"</ul></div>"].join(""));n.elem.attr("lay-indicator",n.indicator),n.elem.find("."+c)[0]&&n.elem.find("."+c).remove(),n.elem.append(t),"updown"===n.anim&&t.css("margin-top",-(t.height()/2)),t.find("li").on("hover"===n.trigger?"mouseover":n.trigger,function(){var t=i(this),a=t.index();a>n.index?e.slide("add",a-n.index):a<n.index&&e.slide("sub",n.index-a)})},m.prototype.slide=function(e,i){var n=this,l=n.elemItem,u=n.config,c=u.index,m=u.elem.attr("lay-filter");n.haveSlide||("sub"===e?(n.subIndex(i),l.eq(u.index).addClass(d),setTimeout(function(){l.eq(c).addClass(r),l.eq(u.index).addClass(r)},50)):(n.addIndex(i),l.eq(u.index).addClass(s),setTimeout(function(){l.eq(c).addClass(o),l.eq(u.index).addClass(o)},50)),setTimeout(function(){l.removeClass(a+" "+d+" "+s+" "+o+" "+r),l.eq(u.index).addClass(a),n.haveSlide=!1},300),n.elemInd.find("li").eq(u.index).addClass(a).siblings().removeClass(a),n.haveSlide=!0,layui.event.call(this,t,"change("+m+")",{index:u.index,prevIndex:c,item:l.eq(u.index)}))},m.prototype.events=function(){var e=this,i=e.config;i.elem.data("haveEvents")||(i.elem.on("mouseenter",function(){clearInterval(e.timer)}).on("mouseleave",function(){e.autoplay()}),i.elem.data("haveEvents",!0))},n.render=function(e){var i=new m(e);return i},e(t,n)});
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/login/lay/modules/code.js b/pluss-manage-page/src/main/resources/static/resources/auth/js/login/lay/modules/code.js
new file mode 100644
index 0000000..b33f9d6
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/login/lay/modules/code.js
@@ -0,0 +1,2 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ ;layui.define("jquery",function(e){"use strict";var a=layui.$,l="http://www.layui.com/doc/modules/code.html";e("code",function(e){var t=[];e=e||{},e.elem=a(e.elem||".layui-code"),e.about=!("about"in e)||e.about,e.elem.each(function(){t.push(this)}),layui.each(t.reverse(),function(t,i){var c=a(i),o=c.html();(c.attr("lay-encode")||e.encode)&&(o=o.replace(/&(?!#?[a-zA-Z0-9]+;)/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/'/g,"&#39;").replace(/"/g,"&quot;")),c.html('<ol class="layui-code-ol"><li>'+o.replace(/[\r\t\n]+/g,"</li><li>")+"</li></ol>"),c.find(">.layui-code-h3")[0]||c.prepend('<h3 class="layui-code-h3">'+(c.attr("lay-title")||e.title||"code")+(e.about?'<a href="'+l+'" target="_blank">layui.code</a>':"")+"</h3>");var d=c.find(">.layui-code-ol");c.addClass("layui-box layui-code-view"),(c.attr("lay-skin")||e.skin)&&c.addClass("layui-code-"+(c.attr("lay-skin")||e.skin)),(d.find("li").length/100|0)>0&&d.css("margin-left",(d.find("li").length/100|0)+"px"),(c.attr("lay-height")||e.height)&&d.css("max-height",c.attr("lay-height")||e.height)})})}).addcss("modules/code.css","skincodecss");
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/login/lay/modules/colorpicker.js b/pluss-manage-page/src/main/resources/static/resources/auth/js/login/lay/modules/colorpicker.js
new file mode 100644
index 0000000..fd99bf8
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/login/lay/modules/colorpicker.js
@@ -0,0 +1,2 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ ;layui.define("jquery",function(e){"use strict";var i=layui.jquery,o={config:{},index:layui.colorpicker?layui.colorpicker.index+1e4:0,set:function(e){var o=this;return o.config=i.extend({},o.config,e),o},on:function(e,i){return layui.onevent.call(this,"colorpicker",e,i)}},r=function(){var e=this,i=e.config;return{config:i}},t="colorpicker",n="layui-show",l="layui-colorpicker",c=".layui-colorpicker-main",a="layui-icon-down",s="layui-icon-close",f="layui-colorpicker-trigger-span",d="layui-colorpicker-trigger-i",u="layui-colorpicker-side",p="layui-colorpicker-side-slider",g="layui-colorpicker-basis",v="layui-colorpicker-alpha-bgcolor",h="layui-colorpicker-alpha-slider",m="layui-colorpicker-basis-cursor",b="layui-colorpicker-main-input",k=function(e){var i={h:0,s:0,b:0},o=Math.min(e.r,e.g,e.b),r=Math.max(e.r,e.g,e.b),t=r-o;return i.b=r,i.s=0!=r?255*t/r:0,0!=i.s?e.r==r?i.h=(e.g-e.b)/t:e.g==r?i.h=2+(e.b-e.r)/t:i.h=4+(e.r-e.g)/t:i.h=-1,r==o&&(i.h=0),i.h*=60,i.h<0&&(i.h+=360),i.s*=100/255,i.b*=100/255,i},y=function(e){var e=e.indexOf("#")>-1?e.substring(1):e;if(3==e.length){var i=e.split("");e=i[0]+i[0]+i[1]+i[1]+i[2]+i[2]}e=parseInt(e,16);var o={r:e>>16,g:(65280&e)>>8,b:255&e};return k(o)},x=function(e){var i={},o=e.h,r=255*e.s/100,t=255*e.b/100;if(0==r)i.r=i.g=i.b=t;else{var n=t,l=(255-r)*t/255,c=(n-l)*(o%60)/60;360==o&&(o=0),o<60?(i.r=n,i.b=l,i.g=l+c):o<120?(i.g=n,i.b=l,i.r=n-c):o<180?(i.g=n,i.r=l,i.b=l+c):o<240?(i.b=n,i.r=l,i.g=n-c):o<300?(i.b=n,i.g=l,i.r=l+c):o<360?(i.r=n,i.g=l,i.b=n-c):(i.r=0,i.g=0,i.b=0)}return{r:Math.round(i.r),g:Math.round(i.g),b:Math.round(i.b)}},C=function(e){var o=x(e),r=[o.r.toString(16),o.g.toString(16),o.b.toString(16)];return i.each(r,function(e,i){1==i.length&&(r[e]="0"+i)}),r.join("")},P=function(e){var i=/[0-9]{1,3}/g,o=e.match(i)||[];return{r:o[0],g:o[1],b:o[2]}},B=i(window),w=i(document),D=function(e){var r=this;r.index=++o.index,r.config=i.extend({},r.config,o.config,e),r.render()};D.prototype.config={color:"",size:null,alpha:!1,format:"hex",predefine:!1,colors:["#009688","#5FB878","#1E9FFF","#FF5722","#FFB800","#01AAED","#999","#c00","#ff8c00","#ffd700","#90ee90","#00ced1","#1e90ff","#c71585","rgb(0, 186, 189)","rgb(255, 120, 0)","rgb(250, 212, 0)","#393D49","rgba(0,0,0,.5)","rgba(255, 69, 0, 0.68)","rgba(144, 240, 144, 0.5)","rgba(31, 147, 255, 0.73)"]},D.prototype.render=function(){var e=this,o=e.config,r=i(['<div class="layui-unselect layui-colorpicker">',"<span "+("rgb"==o.format&&o.alpha?'class="layui-colorpicker-trigger-bgcolor"':"")+">",'<span class="layui-colorpicker-trigger-span" ','lay-type="'+("rgb"==o.format?o.alpha?"rgba":"torgb":"")+'" ','style="'+function(){var e="";return o.color?(e=o.color,(o.color.match(/[0-9]{1,3}/g)||[]).length>3&&(o.alpha&&"rgb"==o.format||(e="#"+C(k(P(o.color))))),"background: "+e):e}()+'">','<i class="layui-icon layui-colorpicker-trigger-i '+(o.color?a:s)+'"></i>',"</span>","</span>","</div>"].join("")),t=i(o.elem);o.size&&r.addClass("layui-colorpicker-"+o.size),t.addClass("layui-inline").html(e.elemColorBox=r),e.color=e.elemColorBox.find("."+f)[0].style.background,e.events()},D.prototype.renderPicker=function(){var e=this,o=e.config,r=e.elemColorBox[0],t=e.elemPicker=i(['<div id="layui-colorpicker'+e.index+'" data-index="'+e.index+'" class="layui-anim layui-anim-upbit layui-colorpicker-main">','<div class="layui-colorpicker-main-wrapper">','<div class="layui-colorpicker-basis">','<div class="layui-colorpicker-basis-white"></div>','<div class="layui-colorpicker-basis-black"></div>','<div class="layui-colorpicker-basis-cursor"></div>',"</div>",'<div class="layui-colorpicker-side">','<div class="layui-colorpicker-side-slider"></div>',"</div>","</div>",'<div class="layui-colorpicker-main-alpha '+(o.alpha?n:"")+'">','<div class="layui-colorpicker-alpha-bgcolor">','<div class="layui-colorpicker-alpha-slider"></div>',"</div>","</div>",function(){if(o.predefine){var e=['<div class="layui-colorpicker-main-pre">'];return layui.each(o.colors,function(i,o){e.push(['<div class="layui-colorpicker-pre'+((o.match(/[0-9]{1,3}/g)||[]).length>3?" layui-colorpicker-pre-isalpha":"")+'">','<div style="background:'+o+'"></div>',"</div>"].join(""))}),e.push("</div>"),e.join("")}return""}(),'<div class="layui-colorpicker-main-input">','<div class="layui-inline">','<input type="text" class="layui-input">',"</div>",'<div class="layui-btn-container">','<button class="layui-btn layui-btn-primary layui-btn-sm" colorpicker-events="clear">清空</button>','<button class="layui-btn layui-btn-sm" colorpicker-events="confirm">确定</button>',"</div","</div>","</div>"].join(""));e.elemColorBox.find("."+f)[0];i(c)[0]&&i(c).data("index")==e.index?e.removePicker(D.thisElemInd):(e.removePicker(D.thisElemInd),i("body").append(t)),D.thisElemInd=e.index,D.thisColor=r.style.background,e.position(),e.pickerEvents()},D.prototype.removePicker=function(e){var o=this;o.config;return i("#layui-colorpicker"+(e||o.index)).remove(),o},D.prototype.position=function(){var e=this,i=e.config,o=e.bindElem||e.elemColorBox[0],r=e.elemPicker[0],t=o.getBoundingClientRect(),n=r.offsetWidth,l=r.offsetHeight,c=function(e){return e=e?"scrollLeft":"scrollTop",document.body[e]|document.documentElement[e]},a=function(e){return document.documentElement[e?"clientWidth":"clientHeight"]},s=5,f=t.left,d=t.bottom;f-=(n-o.offsetWidth)/2,d+=s,f+n+s>a("width")?f=a("width")-n-s:f<s&&(f=s),d+l+s>a()&&(d=t.top>l?t.top-l:a()-l,d-=2*s),i.position&&(r.style.position=i.position),r.style.left=f+("fixed"===i.position?0:c(1))+"px",r.style.top=d+("fixed"===i.position?0:c())+"px"},D.prototype.val=function(){var e=this,i=(e.config,e.elemColorBox.find("."+f)),o=e.elemPicker.find("."+b),r=i[0],t=r.style.backgroundColor;if(t){var n=k(P(t)),l=i.attr("lay-type");if(e.select(n.h,n.s,n.b),"torgb"===l&&o.find("input").val(t),"rgba"===l){var c=P(t);if(3==(t.match(/[0-9]{1,3}/g)||[]).length)o.find("input").val("rgba("+c.r+", "+c.g+", "+c.b+", 1)"),e.elemPicker.find("."+h).css("left",280);else{o.find("input").val(t);var a=280*t.slice(t.lastIndexOf(",")+1,t.length-1);e.elemPicker.find("."+h).css("left",a)}e.elemPicker.find("."+v)[0].style.background="linear-gradient(to right, rgba("+c.r+", "+c.g+", "+c.b+", 0), rgb("+c.r+", "+c.g+", "+c.b+"))"}}else e.select(0,100,100),o.find("input").val(""),e.elemPicker.find("."+v)[0].style.background="",e.elemPicker.find("."+h).css("left",280)},D.prototype.side=function(){var e=this,o=e.config,r=e.elemColorBox.find("."+f),t=r.attr("lay-type"),n=e.elemPicker.find("."+u),l=e.elemPicker.find("."+p),c=e.elemPicker.find("."+g),y=e.elemPicker.find("."+m),C=e.elemPicker.find("."+v),w=e.elemPicker.find("."+h),D=l[0].offsetTop/180*360,E=100-(y[0].offsetTop+3)/180*100,H=(y[0].offsetLeft+3)/260*100,W=Math.round(w[0].offsetLeft/280*100)/100,j=e.elemColorBox.find("."+d),F=e.elemPicker.find(".layui-colorpicker-pre").children("div"),L=function(i,n,l,c){e.select(i,n,l);var f=x({h:i,s:n,b:l});if(j.addClass(a).removeClass(s),r[0].style.background="rgb("+f.r+", "+f.g+", "+f.b+")","torgb"===t&&e.elemPicker.find("."+b).find("input").val("rgb("+f.r+", "+f.g+", "+f.b+")"),"rgba"===t){var d=0;d=280*c,w.css("left",d),e.elemPicker.find("."+b).find("input").val("rgba("+f.r+", "+f.g+", "+f.b+", "+c+")"),r[0].style.background="rgba("+f.r+", "+f.g+", "+f.b+", "+c+")",C[0].style.background="linear-gradient(to right, rgba("+f.r+", "+f.g+", "+f.b+", 0), rgb("+f.r+", "+f.g+", "+f.b+"))"}o.change&&o.change(e.elemPicker.find("."+b).find("input").val())},M=i(['<div class="layui-auxiliar-moving" id="LAY-colorpicker-moving"></div'].join("")),Y=function(e){i("#LAY-colorpicker-moving")[0]||i("body").append(M),M.on("mousemove",e),M.on("mouseup",function(){M.remove()}).on("mouseleave",function(){M.remove()})};l.on("mousedown",function(e){var i=this.offsetTop,o=e.clientY,r=function(e){var r=i+(e.clientY-o),t=n[0].offsetHeight;r<0&&(r=0),r>t&&(r=t);var l=r/180*360;D=l,L(l,H,E,W),e.preventDefault()};Y(r),e.preventDefault()}),n.on("click",function(e){var o=e.clientY-i(this).offset().top;o<0&&(o=0),o>this.offsetHeight&&(o=this.offsetHeight);var r=o/180*360;D=r,L(r,H,E,W),e.preventDefault()}),y.on("mousedown",function(e){var i=this.offsetTop,o=this.offsetLeft,r=e.clientY,t=e.clientX,n=function(e){var n=i+(e.clientY-r),l=o+(e.clientX-t),a=c[0].offsetHeight-3,s=c[0].offsetWidth-3;n<-3&&(n=-3),n>a&&(n=a),l<-3&&(l=-3),l>s&&(l=s);var f=(l+3)/260*100,d=100-(n+3)/180*100;E=d,H=f,L(D,f,d,W),e.preventDefault()};layui.stope(e),Y(n),e.preventDefault()}),c.on("mousedown",function(e){var o=e.clientY-i(this).offset().top-3+B.scrollTop(),r=e.clientX-i(this).offset().left-3+B.scrollLeft();o<-3&&(o=-3),o>this.offsetHeight-3&&(o=this.offsetHeight-3),r<-3&&(r=-3),r>this.offsetWidth-3&&(r=this.offsetWidth-3);var t=(r+3)/260*100,n=100-(o+3)/180*100;E=n,H=t,L(D,t,n,W),e.preventDefault(),y.trigger(e,"mousedown")}),w.on("mousedown",function(e){var i=this.offsetLeft,o=e.clientX,r=function(e){var r=i+(e.clientX-o),t=C[0].offsetWidth;r<0&&(r=0),r>t&&(r=t);var n=Math.round(r/280*100)/100;W=n,L(D,H,E,n),e.preventDefault()};Y(r),e.preventDefault()}),C.on("click",function(e){var o=e.clientX-i(this).offset().left;o<0&&(o=0),o>this.offsetWidth&&(o=this.offsetWidth);var r=Math.round(o/280*100)/100;W=r,L(D,H,E,r),e.preventDefault()}),F.each(function(){i(this).on("click",function(){i(this).parent(".layui-colorpicker-pre").addClass("selected").siblings().removeClass("selected");var e,o=this.style.backgroundColor,r=k(P(o)),t=o.slice(o.lastIndexOf(",")+1,o.length-1);D=r.h,H=r.s,E=r.b,3==(o.match(/[0-9]{1,3}/g)||[]).length&&(t=1),W=t,e=280*t,L(r.h,r.s,r.b,t)})})},D.prototype.select=function(e,i,o,r){var t=this,n=(t.config,C({h:e,s:100,b:100})),l=C({h:e,s:i,b:o}),c=e/360*180,a=180-o/100*180-3,s=i/100*260-3;t.elemPicker.find("."+p).css("top",c),t.elemPicker.find("."+g)[0].style.background="#"+n,t.elemPicker.find("."+m).css({top:a,left:s}),"change"!==r&&t.elemPicker.find("."+b).find("input").val("#"+l)},D.prototype.pickerEvents=function(){var e=this,o=e.config,r=e.elemColorBox.find("."+f),t=e.elemPicker.find("."+b+" input"),n={clear:function(i){r[0].style.background="",e.elemColorBox.find("."+d).removeClass(a).addClass(s),e.color="",o.done&&o.done(""),e.removePicker()},confirm:function(i,n){var l=t.val(),c=l,f={};if(l.indexOf(",")>-1){if(f=k(P(l)),e.select(f.h,f.s,f.b),r[0].style.background=c="#"+C(f),(l.match(/[0-9]{1,3}/g)||[]).length>3&&"rgba"===r.attr("lay-type")){var u=280*l.slice(l.lastIndexOf(",")+1,l.length-1);e.elemPicker.find("."+h).css("left",u),r[0].style.background=l,c=l}}else f=y(l),r[0].style.background=c="#"+C(f),e.elemColorBox.find("."+d).removeClass(s).addClass(a);return"change"===n?(e.select(f.h,f.s,f.b,n),void(o.change&&o.change(c))):(e.color=l,o.done&&o.done(l),void e.removePicker())}};e.elemPicker.on("click","*[colorpicker-events]",function(){var e=i(this),o=e.attr("colorpicker-events");n[o]&&n[o].call(this,e)}),t.on("keyup",function(e){var o=i(this);n.confirm.call(this,o,13===e.keyCode?null:"change")})},D.prototype.events=function(){var e=this,o=e.config,r=e.elemColorBox.find("."+f);e.elemColorBox.on("click",function(){e.renderPicker(),i(c)[0]&&(e.val(),e.side())}),o.elem[0]&&!e.elemColorBox[0].eventHandler&&(w.on("click",function(o){if(!i(o.target).hasClass(l)&&!i(o.target).parents("."+l)[0]&&!i(o.target).hasClass(c.replace(/\./g,""))&&!i(o.target).parents(c)[0]&&e.elemPicker){if(e.color){var t=k(P(e.color));e.select(t.h,t.s,t.b)}else e.elemColorBox.find("."+d).removeClass(a).addClass(s);r[0].style.background=e.color||"",e.removePicker()}}),B.on("resize",function(){return!(!e.elemPicker||!i(c)[0])&&void e.position()}),e.elemColorBox[0].eventHandler=!0)},o.render=function(e){var i=new D(e);return r.call(i)},e(t,o)});
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/login/lay/modules/element.js b/pluss-manage-page/src/main/resources/static/resources/auth/js/login/lay/modules/element.js
new file mode 100644
index 0000000..ac628df
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/login/lay/modules/element.js
@@ -0,0 +1,2 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ ;layui.define("jquery",function(t){"use strict";var a=layui.$,i=(layui.hint(),layui.device()),e="element",l="layui-this",n="layui-show",s=function(){this.config={}};s.prototype.set=function(t){var i=this;return a.extend(!0,i.config,t),i},s.prototype.on=function(t,a){return layui.onevent.call(this,e,t,a)},s.prototype.tabAdd=function(t,i){var e=".layui-tab-title",l=a(".layui-tab[lay-filter="+t+"]"),n=l.children(e),s=n.children(".layui-tab-bar"),o=l.children(".layui-tab-content"),r='<li lay-id="'+(i.id||"")+'"'+(i.attr?' lay-attr="'+i.attr+'"':"")+">"+(i.title||"unnaming")+"</li>";return s[0]?s.before(r):n.append(r),o.append('<div class="layui-tab-item">'+(i.content||"")+"</div>"),f.hideTabMore(!0),f.tabAuto(),this},s.prototype.tabDelete=function(t,i){var e=".layui-tab-title",l=a(".layui-tab[lay-filter="+t+"]"),n=l.children(e),s=n.find('>li[lay-id="'+i+'"]');return f.tabDelete(null,s),this},s.prototype.tabChange=function(t,i){var e=".layui-tab-title",l=a(".layui-tab[lay-filter="+t+"]"),n=l.children(e),s=n.find('>li[lay-id="'+i+'"]');return f.tabClick.call(s[0],null,null,s),this},s.prototype.tab=function(t){t=t||{},b.on("click",t.headerElem,function(i){var e=a(this).index();f.tabClick.call(this,i,e,null,t)})},s.prototype.progress=function(t,i){var e="layui-progress",l=a("."+e+"[lay-filter="+t+"]"),n=l.find("."+e+"-bar"),s=n.find("."+e+"-text");return n.css("width",i),s.text(i),this};var o=".layui-nav",r="layui-nav-item",c="layui-nav-bar",u="layui-nav-tree",d="layui-nav-child",y="layui-nav-more",h="layui-anim layui-anim-upbit",f={tabClick:function(t,i,s,o){o=o||{};var r=s||a(this),i=i||r.parent().children("li").index(r),c=o.headerElem?r.parent():r.parents(".layui-tab").eq(0),u=o.bodyElem?a(o.bodyElem):c.children(".layui-tab-content").children(".layui-tab-item"),d=r.find("a"),y=c.attr("lay-filter");"javascript:;"!==d.attr("href")&&"_blank"===d.attr("target")||(r.addClass(l).siblings().removeClass(l),u.eq(i).addClass(n).siblings().removeClass(n)),layui.event.call(this,e,"tab("+y+")",{elem:c,index:i})},tabDelete:function(t,i){var n=i||a(this).parent(),s=n.index(),o=n.parents(".layui-tab").eq(0),r=o.children(".layui-tab-content").children(".layui-tab-item"),c=o.attr("lay-filter");n.hasClass(l)&&(n.next()[0]?f.tabClick.call(n.next()[0],null,s+1):n.prev()[0]&&f.tabClick.call(n.prev()[0],null,s-1)),n.remove(),r.eq(s).remove(),setTimeout(function(){f.tabAuto()},50),layui.event.call(this,e,"tabDelete("+c+")",{elem:o,index:s})},tabAuto:function(){var t="layui-tab-more",e="layui-tab-bar",l="layui-tab-close",n=this;a(".layui-tab").each(function(){var s=a(this),o=s.children(".layui-tab-title"),r=(s.children(".layui-tab-content").children(".layui-tab-item"),'lay-stope="tabmore"'),c=a('<span class="layui-unselect layui-tab-bar" '+r+"><i "+r+' class="layui-icon">&#xe61a;</i></span>');if(n===window&&8!=i.ie&&f.hideTabMore(!0),s.attr("lay-allowClose")&&o.find("li").each(function(){var t=a(this);if(!t.find("."+l)[0]){var i=a('<i class="layui-icon layui-unselect '+l+'">&#x1006;</i>');i.on("click",f.tabDelete),t.append(i)}}),"string"!=typeof s.attr("lay-unauto"))if(o.prop("scrollWidth")>o.outerWidth()+1){if(o.find("."+e)[0])return;o.append(c),s.attr("overflow",""),c.on("click",function(a){o[this.title?"removeClass":"addClass"](t),this.title=this.title?"":"收缩"})}else o.find("."+e).remove(),s.removeAttr("overflow")})},hideTabMore:function(t){var i=a(".layui-tab-title");t!==!0&&"tabmore"===a(t.target).attr("lay-stope")||(i.removeClass("layui-tab-more"),i.find(".layui-tab-bar").attr("title",""))},clickThis:function(){var t=a(this),i=t.parents(o),n=i.attr("lay-filter"),s=t.parent(),c=t.siblings("."+d),y="string"==typeof s.attr("lay-unselect");"javascript:;"!==t.attr("href")&&"_blank"===t.attr("target")||y||c[0]||(i.find("."+l).removeClass(l),s.addClass(l)),i.hasClass(u)&&(c.removeClass(h),c[0]&&(s["none"===c.css("display")?"addClass":"removeClass"](r+"ed"),"all"===i.attr("lay-shrink")&&s.siblings().removeClass(r+"ed"))),layui.event.call(this,e,"nav("+n+")",t)},collapse:function(){var t=a(this),i=t.find(".layui-colla-icon"),l=t.siblings(".layui-colla-content"),s=t.parents(".layui-collapse").eq(0),o=s.attr("lay-filter"),r="none"===l.css("display");if("string"==typeof s.attr("lay-accordion")){var c=s.children(".layui-colla-item").children("."+n);c.siblings(".layui-colla-title").children(".layui-colla-icon").html("&#xe602;"),c.removeClass(n)}l[r?"addClass":"removeClass"](n),i.html(r?"&#xe61a;":"&#xe602;"),layui.event.call(this,e,"collapse("+o+")",{title:t,content:l,show:r})}};s.prototype.init=function(t,e){var l=function(){return e?'[lay-filter="'+e+'"]':""}(),s={tab:function(){f.tabAuto.call({})},nav:function(){var t=200,e={},s={},p={},b=function(l,o,r){var c=a(this),f=c.find("."+d);o.hasClass(u)?l.css({top:c.position().top,height:c.children("a").outerHeight(),opacity:1}):(f.addClass(h),l.css({left:c.position().left+parseFloat(c.css("marginLeft")),top:c.position().top+c.height()-l.height()}),e[r]=setTimeout(function(){l.css({width:c.width(),opacity:1})},i.ie&&i.ie<10?0:t),clearTimeout(p[r]),"block"===f.css("display")&&clearTimeout(s[r]),s[r]=setTimeout(function(){f.addClass(n),c.find("."+y).addClass(y+"d")},300))};a(o+l).each(function(i){var l=a(this),o=a('<span class="'+c+'"></span>'),h=l.find("."+r);l.find("."+c)[0]||(l.append(o),h.on("mouseenter",function(){b.call(this,o,l,i)}).on("mouseleave",function(){l.hasClass(u)||(clearTimeout(s[i]),s[i]=setTimeout(function(){l.find("."+d).removeClass(n),l.find("."+y).removeClass(y+"d")},300))}),l.on("mouseleave",function(){clearTimeout(e[i]),p[i]=setTimeout(function(){l.hasClass(u)?o.css({height:0,top:o.position().top+o.height()/2,opacity:0}):o.css({width:0,left:o.position().left+o.width()/2,opacity:0})},t)})),h.find("a").each(function(){var t=a(this),i=(t.parent(),t.siblings("."+d));i[0]&&!t.children("."+y)[0]&&t.append('<span class="'+y+'"></span>'),t.off("click",f.clickThis).on("click",f.clickThis)})})},breadcrumb:function(){var t=".layui-breadcrumb";a(t+l).each(function(){var t=a(this),i="lay-separator",e=t.attr(i)||"/",l=t.find("a");l.next("span["+i+"]")[0]||(l.each(function(t){t!==l.length-1&&a(this).after("<span "+i+">"+e+"</span>")}),t.css("visibility","visible"))})},progress:function(){var t="layui-progress";a("."+t+l).each(function(){var i=a(this),e=i.find(".layui-progress-bar"),l=e.attr("lay-percent");e.css("width",function(){return/^.+\/.+$/.test(l)?100*new Function("return "+l)()+"%":l}()),i.attr("lay-showPercent")&&setTimeout(function(){e.html('<span class="'+t+'-text">'+l+"</span>")},350)})},collapse:function(){var t="layui-collapse";a("."+t+l).each(function(){var t=a(this).find(".layui-colla-item");t.each(function(){var t=a(this),i=t.find(".layui-colla-title"),e=t.find(".layui-colla-content"),l="none"===e.css("display");i.find(".layui-colla-icon").remove(),i.append('<i class="layui-icon layui-colla-icon">'+(l?"&#xe602;":"&#xe61a;")+"</i>"),i.off("click",f.collapse).on("click",f.collapse)})})}};return s[t]?s[t]():layui.each(s,function(t,a){a()})},s.prototype.render=s.prototype.init;var p=new s,b=a(document);p.render();var v=".layui-tab-title li";b.on("click",v,f.tabClick),b.on("click",f.hideTabMore),a(window).on("resize",f.tabAuto),t(e,p)});
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/login/lay/modules/flow.js b/pluss-manage-page/src/main/resources/static/resources/auth/js/login/lay/modules/flow.js
new file mode 100644
index 0000000..8a80c05
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/login/lay/modules/flow.js
@@ -0,0 +1,2 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ ;layui.define("jquery",function(e){"use strict";var l=layui.$,o=function(e){},t='<i class="layui-anim layui-anim-rotate layui-anim-loop layui-icon ">&#xe63e;</i>';o.prototype.load=function(e){var o,i,n,r,a=this,c=0;e=e||{};var f=l(e.elem);if(f[0]){var m=l(e.scrollElem||document),u=e.mb||50,s=!("isAuto"in e)||e.isAuto,v=e.end||"没有更多了",y=e.scrollElem&&e.scrollElem!==document,d="<cite>加载更多</cite>",h=l('<div class="layui-flow-more"><a href="javascript:;">'+d+"</a></div>");f.find(".layui-flow-more")[0]||f.append(h);var p=function(e,t){e=l(e),h.before(e),t=0==t||null,t?h.html(v):h.find("a").html(d),i=t,o=null,n&&n()},g=function(){o=!0,h.find("a").html(t),"function"==typeof e.done&&e.done(++c,p)};if(g(),h.find("a").on("click",function(){l(this);i||o||g()}),e.isLazyimg)var n=a.lazyimg({elem:e.elem+" img",scrollElem:e.scrollElem});return s?(m.on("scroll",function(){var e=l(this),t=e.scrollTop();r&&clearTimeout(r),i||(r=setTimeout(function(){var i=y?e.height():l(window).height(),n=y?e.prop("scrollHeight"):document.documentElement.scrollHeight;n-t-i<=u&&(o||g())},100))}),a):a}},o.prototype.lazyimg=function(e){var o,t=this,i=0;e=e||{};var n=l(e.scrollElem||document),r=e.elem||"img",a=e.scrollElem&&e.scrollElem!==document,c=function(e,l){var o=n.scrollTop(),r=o+l,c=a?function(){return e.offset().top-n.offset().top+o}():e.offset().top;if(c>=o&&c<=r&&!e.attr("src")){var m=e.attr("lay-src");layui.img(m,function(){var l=t.lazyimg.elem.eq(i);e.attr("src",m).removeAttr("lay-src"),l[0]&&f(l),i++})}},f=function(e,o){var f=a?(o||n).height():l(window).height(),m=n.scrollTop(),u=m+f;if(t.lazyimg.elem=l(r),e)c(e,f);else for(var s=0;s<t.lazyimg.elem.length;s++){var v=t.lazyimg.elem.eq(s),y=a?function(){return v.offset().top-n.offset().top+m}():v.offset().top;if(c(v,f),i=s,y>u)break}};if(f(),!o){var m;n.on("scroll",function(){var e=l(this);m&&clearTimeout(m),m=setTimeout(function(){f(null,e)},50)}),o=!0}return f},e("flow",new o)});
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/login/lay/modules/form.js b/pluss-manage-page/src/main/resources/static/resources/auth/js/login/lay/modules/form.js
new file mode 100644
index 0000000..daa8ce5
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/login/lay/modules/form.js
@@ -0,0 +1,2 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ ;layui.define("layer",function(e){"use strict";var t=layui.$,i=layui.layer,a=layui.hint(),n=layui.device(),l="form",r=".layui-form",s="layui-this",o="layui-hide",c="layui-disabled",u=function(){this.config={verify:{required:[/[\S]+/,"必填项不能为空"],phone:[/^1\d{10}$/,"请输入正确的手机号"],email:[/^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/,"邮箱格式不正确"],url:[/(^#)|(^http(s*):\/\/[^\s]+\.[^\s]+)/,"链接格式不正确"],number:function(e){if(!e||isNaN(e))return"只能填写数字"},date:[/^(\d{4})[-\/](\d{1}|0\d{1}|1[0-2])([-\/](\d{1}|0\d{1}|[1-2][0-9]|3[0-1]))*$/,"日期格式不正确"],identity:[/(^\d{15}$)|(^\d{17}(x|X|\d)$)/,"请输入正确的身份证号"]}}};u.prototype.set=function(e){var i=this;return t.extend(!0,i.config,e),i},u.prototype.verify=function(e){var i=this;return t.extend(!0,i.config.verify,e),i},u.prototype.on=function(e,t){return layui.onevent.call(this,l,e,t)},u.prototype.val=function(e,i){var a=t(r+'[lay-filter="'+e+'"]');a.each(function(e,a){var n=t(this);layui.each(i,function(e,t){var i,a=n.find('[name="'+e+'"]');a[0]&&(i=a[0].type,"checkbox"===i?a[0].checked=t:"radio"===i?a.each(function(){this.value===t&&(this.checked=!0)}):a.val(t))})}),f.render(null,e)},u.prototype.render=function(e,i){var n=this,u=t(r+function(){return i?'[lay-filter="'+i+'"]':""}()),d={select:function(){var e,i="请选择",a="layui-form-select",n="layui-select-title",r="layui-select-none",d="",f=u.find("select"),v=function(i,l){t(i.target).parent().hasClass(n)&&!l||(t("."+a).removeClass(a+"ed "+a+"up"),e&&d&&e.val(d)),e=null},y=function(i,u,f){var y,p=t(this),m=i.find("."+n),k=m.find("input"),x=i.find("dl"),g=x.children("dd"),b=this.selectedIndex;if(!u){var C=function(){var e=i.offset().top+i.outerHeight()+5-h.scrollTop(),t=x.outerHeight();b=p[0].selectedIndex,i.addClass(a+"ed"),g.removeClass(o),y=null,g.eq(b).addClass(s).siblings().removeClass(s),e+t>h.height()&&e>=t&&i.addClass(a+"up"),$()},w=function(e){i.removeClass(a+"ed "+a+"up"),k.blur(),y=null,e||T(k.val(),function(e){var i=p[0].selectedIndex;e&&(d=t(p[0].options[i]).html(),0===i&&d===k.attr("placeholder")&&(d=""),k.val(d||""))})},$=function(){var e=x.children("dd."+s);if(e[0]){var t=e.position().top,i=x.height(),a=e.height();t>i&&x.scrollTop(t+x.scrollTop()-i+a-5),t<0&&x.scrollTop(t+x.scrollTop()-5)}};m.on("click",function(e){i.hasClass(a+"ed")?w():(v(e,!0),C()),x.find("."+r).remove()}),m.find(".layui-edge").on("click",function(){k.focus()}),k.on("keyup",function(e){var t=e.keyCode;9===t&&C()}).on("keydown",function(e){var t=e.keyCode;9===t&&w();var i=function(t,a){var n,l;e.preventDefault();var r=function(){var e=x.children("dd."+s);if(x.children("dd."+o)[0]&&"next"===t){var i=x.children("dd:not(."+o+",."+c+")"),n=i.eq(0).index();if(n>=0&&n<e.index()&&!i.hasClass(s))return i.eq(0).prev()[0]?i.eq(0).prev():x.children(":last")}return a&&a[0]?a:y&&y[0]?y:e}();return l=r[t](),n=r[t]("dd:not(."+o+")"),l[0]?(y=r[t](),n[0]&&!n.hasClass(c)||!y[0]?(n.addClass(s).siblings().removeClass(s),void $()):i(t,y)):y=null};38===t&&i("prev"),40===t&&i("next"),13===t&&(e.preventDefault(),x.children("dd."+s).trigger("click"))});var T=function(e,i,a){var n=0;layui.each(g,function(){var i=t(this),l=i.text(),r=l.indexOf(e)===-1;(""===e||"blur"===a?e!==l:r)&&n++,"keyup"===a&&i[r?"addClass":"removeClass"](o)});var l=n===g.length;return i(l),l},j=function(e){var t=this.value,i=e.keyCode;return 9!==i&&13!==i&&37!==i&&38!==i&&39!==i&&40!==i&&(T(t,function(e){e?x.find("."+r)[0]||x.append('<p class="'+r+'">无匹配项</p>'):x.find("."+r).remove()},"keyup"),""===t&&x.find("."+r).remove(),void $())};f&&k.on("keyup",j).on("blur",function(i){var a=p[0].selectedIndex;e=k,d=t(p[0].options[a]).html(),0===a&&d===k.attr("placeholder")&&(d=""),setTimeout(function(){T(k.val(),function(e){d||k.val("")},"blur")},200)}),g.on("click",function(){var e=t(this),a=e.attr("lay-value"),n=p.attr("lay-filter");return!e.hasClass(c)&&(e.hasClass("layui-select-tips")?k.val(""):(k.val(e.text()),e.addClass(s)),e.siblings().removeClass(s),p.val(a).removeClass("layui-form-danger"),layui.event.call(this,l,"select("+n+")",{elem:p[0],value:a,othis:i}),w(!0),!1)}),i.find("dl>dt").on("click",function(e){return!1}),t(document).off("click",v).on("click",v)}};f.each(function(e,l){var r=t(this),o=r.next("."+a),u=this.disabled,d=l.value,f=t(l.options[l.selectedIndex]),v=l.options[0];if("string"==typeof r.attr("lay-ignore"))return r.show();var h="string"==typeof r.attr("lay-search"),p=v?v.value?i:v.innerHTML||i:i,m=t(['<div class="'+(h?"":"layui-unselect ")+a,(u?" layui-select-disabled":"")+'">','<div class="'+n+'">','<input type="text" placeholder="'+p+'" '+('value="'+(d?f.html():"")+'"')+(h?"":" readonly")+' class="layui-input'+(h?"":" layui-unselect")+(u?" "+c:"")+'">','<i class="layui-edge"></i></div>','<dl class="layui-anim layui-anim-upbit'+(r.find("optgroup")[0]?" layui-select-group":"")+'">',function(e){var t=[];return layui.each(e,function(e,a){0!==e||a.value?"optgroup"===a.tagName.toLowerCase()?t.push("<dt>"+a.label+"</dt>"):t.push('<dd lay-value="'+a.value+'" class="'+(d===a.value?s:"")+(a.disabled?" "+c:"")+'">'+a.innerHTML+"</dd>"):t.push('<dd lay-value="" class="layui-select-tips">'+(a.innerHTML||i)+"</dd>")}),0===t.length&&t.push('<dd lay-value="" class="'+c+'">没有选项</dd>'),t.join("")}(r.find("*"))+"</dl>","</div>"].join(""));o[0]&&o.remove(),r.after(m),y.call(this,m,u,h)})},checkbox:function(){var e={checkbox:["layui-form-checkbox","layui-form-checked","checkbox"],_switch:["layui-form-switch","layui-form-onswitch","switch"]},i=u.find("input[type=checkbox]"),a=function(e,i){var a=t(this);e.on("click",function(){var t=a.attr("lay-filter"),n=(a.attr("lay-text")||"").split("|");a[0].disabled||(a[0].checked?(a[0].checked=!1,e.removeClass(i[1]).find("em").text(n[1])):(a[0].checked=!0,e.addClass(i[1]).find("em").text(n[0])),layui.event.call(a[0],l,i[2]+"("+t+")",{elem:a[0],value:a[0].value,othis:e}))})};i.each(function(i,n){var l=t(this),r=l.attr("lay-skin"),s=(l.attr("lay-text")||"").split("|"),o=this.disabled;"switch"===r&&(r="_"+r);var u=e[r]||e.checkbox;if("string"==typeof l.attr("lay-ignore"))return l.show();var d=l.next("."+u[0]),f=t(['<div class="layui-unselect '+u[0],n.checked?" "+u[1]:"",o?" layui-checkbox-disbaled "+c:"",'"',r?' lay-skin="'+r+'"':"",">",function(){var e=n.title.replace(/\s/g,""),t={checkbox:[e?"<span>"+n.title+"</span>":"",'<i class="layui-icon layui-icon-ok"></i>'].join(""),_switch:"<em>"+((n.checked?s[0]:s[1])||"")+"</em><i></i>"};return t[r]||t.checkbox}(),"</div>"].join(""));d[0]&&d.remove(),l.after(f),a.call(this,f,u)})},radio:function(){var e="layui-form-radio",i=["&#xe643;","&#xe63f;"],a=u.find("input[type=radio]"),n=function(a){var n=t(this),s="layui-anim-scaleSpring";a.on("click",function(){var o=n[0].name,c=n.parents(r),u=n.attr("lay-filter"),d=c.find("input[name="+o.replace(/(\.|#|\[|\])/g,"\\$1")+"]");n[0].disabled||(layui.each(d,function(){var a=t(this).next("."+e);this.checked=!1,a.removeClass(e+"ed"),a.find(".layui-icon").removeClass(s).html(i[1])}),n[0].checked=!0,a.addClass(e+"ed"),a.find(".layui-icon").addClass(s).html(i[0]),layui.event.call(n[0],l,"radio("+u+")",{elem:n[0],value:n[0].value,othis:a}))})};a.each(function(a,l){var r=t(this),s=r.next("."+e),o=this.disabled;if("string"==typeof r.attr("lay-ignore"))return r.show();s[0]&&s.remove();var u=t(['<div class="layui-unselect '+e,l.checked?" "+e+"ed":"",(o?" layui-radio-disbaled "+c:"")+'">','<i class="layui-anim layui-icon">'+i[l.checked?0:1]+"</i>","<div>"+function(){var e=l.title||"";return"string"==typeof r.next().attr("lay-radio")&&(e=r.next().html(),r.next().remove()),e}()+"</div>","</div>"].join(""));r.after(u),n.call(this,u)})}};return e?d[e]?d[e]():a.error("不支持的"+e+"表单渲染"):layui.each(d,function(e,t){t()}),n};var d=function(){var e=t(this),a=f.config.verify,s=null,o="layui-form-danger",c={},u=e.parents(r),d=u.find("*[lay-verify]"),v=e.parents("form")[0],h=u.find("input,select,textarea"),y=e.attr("lay-filter");if(layui.each(d,function(e,l){var r=t(this),c=r.attr("lay-verify").split("|"),u=r.attr("lay-verType"),d=r.val();if(r.removeClass(o),layui.each(c,function(e,t){var c,f="",v="function"==typeof a[t];if(a[t]){var c=v?f=a[t](d,l):!a[t][0].test(d);if(f=f||a[t][1],c)return"tips"===u?i.tips(f,function(){return"string"==typeof r.attr("lay-ignore")||"select"!==l.tagName.toLowerCase()&&!/^checkbox|radio$/.test(l.type)?r:r.next()}(),{tips:1}):"alert"===u?i.alert(f,{title:"提示",shadeClose:!0}):i.msg(f,{icon:5,shift:6}),n.android||n.ios||l.focus(),r.addClass(o),s=!0}}),s)return s}),s)return!1;var p={};return layui.each(h,function(e,t){if(t.name=(t.name||"").replace(/^\s*|\s*&/,""),t.name){if(/^.*\[\]$/.test(t.name)){var i=t.name.match(/^(.*)\[\]$/g)[0];p[i]=0|p[i],t.name=t.name.replace(/^(.*)\[\]$/,"$1["+p[i]++ +"]")}/^checkbox|radio$/.test(t.type)&&!t.checked||(c[t.name]=t.value)}}),layui.event.call(this,l,"submit("+y+")",{elem:this,form:v,field:c})},f=new u,v=t(document),h=t(window);f.render(),v.on("reset",r,function(){var e=t(this).attr("lay-filter");setTimeout(function(){f.render(null,e)},50)}),v.on("submit",r,d).on("click","*[lay-submit]",d),e(l,f)});
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/login/lay/modules/jquery.js b/pluss-manage-page/src/main/resources/static/resources/auth/js/login/lay/modules/jquery.js
new file mode 100644
index 0000000..242696a
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/login/lay/modules/jquery.js
@@ -0,0 +1,5 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ ;!function(e,t){"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(e,t){function n(e){var t=!!e&&"length"in e&&e.length,n=pe.type(e);return"function"!==n&&!pe.isWindow(e)&&("array"===n||0===t||"number"==typeof t&&t>0&&t-1 in e)}function r(e,t,n){if(pe.isFunction(t))return pe.grep(e,function(e,r){return!!t.call(e,r,e)!==n});if(t.nodeType)return pe.grep(e,function(e){return e===t!==n});if("string"==typeof t){if(Ce.test(t))return pe.filter(t,e,n);t=pe.filter(t,e)}return pe.grep(e,function(e){return pe.inArray(e,t)>-1!==n})}function i(e,t){do e=e[t];while(e&&1!==e.nodeType);return e}function o(e){var t={};return pe.each(e.match(De)||[],function(e,n){t[n]=!0}),t}function a(){re.addEventListener?(re.removeEventListener("DOMContentLoaded",s),e.removeEventListener("load",s)):(re.detachEvent("onreadystatechange",s),e.detachEvent("onload",s))}function s(){(re.addEventListener||"load"===e.event.type||"complete"===re.readyState)&&(a(),pe.ready())}function u(e,t,n){if(void 0===n&&1===e.nodeType){var r="data-"+t.replace(_e,"-$1").toLowerCase();if(n=e.getAttribute(r),"string"==typeof n){try{n="true"===n||"false"!==n&&("null"===n?null:+n+""===n?+n:qe.test(n)?pe.parseJSON(n):n)}catch(i){}pe.data(e,t,n)}else n=void 0}return n}function l(e){var t;for(t in e)if(("data"!==t||!pe.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}function c(e,t,n,r){if(He(e)){var i,o,a=pe.expando,s=e.nodeType,u=s?pe.cache:e,l=s?e[a]:e[a]&&a;if(l&&u[l]&&(r||u[l].data)||void 0!==n||"string"!=typeof t)return l||(l=s?e[a]=ne.pop()||pe.guid++:a),u[l]||(u[l]=s?{}:{toJSON:pe.noop}),"object"!=typeof t&&"function"!=typeof t||(r?u[l]=pe.extend(u[l],t):u[l].data=pe.extend(u[l].data,t)),o=u[l],r||(o.data||(o.data={}),o=o.data),void 0!==n&&(o[pe.camelCase(t)]=n),"string"==typeof t?(i=o[t],null==i&&(i=o[pe.camelCase(t)])):i=o,i}}function f(e,t,n){if(He(e)){var r,i,o=e.nodeType,a=o?pe.cache:e,s=o?e[pe.expando]:pe.expando;if(a[s]){if(t&&(r=n?a[s]:a[s].data)){pe.isArray(t)?t=t.concat(pe.map(t,pe.camelCase)):t in r?t=[t]:(t=pe.camelCase(t),t=t in r?[t]:t.split(" ")),i=t.length;for(;i--;)delete r[t[i]];if(n?!l(r):!pe.isEmptyObject(r))return}(n||(delete a[s].data,l(a[s])))&&(o?pe.cleanData([e],!0):fe.deleteExpando||a!=a.window?delete a[s]:a[s]=void 0)}}}function d(e,t,n,r){var i,o=1,a=20,s=r?function(){return r.cur()}:function(){return pe.css(e,t,"")},u=s(),l=n&&n[3]||(pe.cssNumber[t]?"":"px"),c=(pe.cssNumber[t]||"px"!==l&&+u)&&Me.exec(pe.css(e,t));if(c&&c[3]!==l){l=l||c[3],n=n||[],c=+u||1;do o=o||".5",c/=o,pe.style(e,t,c+l);while(o!==(o=s()/u)&&1!==o&&--a)}return n&&(c=+c||+u||0,i=n[1]?c+(n[1]+1)*n[2]:+n[2],r&&(r.unit=l,r.start=c,r.end=i)),i}function p(e){var t=ze.split("|"),n=e.createDocumentFragment();if(n.createElement)for(;t.length;)n.createElement(t.pop());return n}function h(e,t){var n,r,i=0,o="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):void 0;if(!o)for(o=[],n=e.childNodes||e;null!=(r=n[i]);i++)!t||pe.nodeName(r,t)?o.push(r):pe.merge(o,h(r,t));return void 0===t||t&&pe.nodeName(e,t)?pe.merge([e],o):o}function g(e,t){for(var n,r=0;null!=(n=e[r]);r++)pe._data(n,"globalEval",!t||pe._data(t[r],"globalEval"))}function m(e){Be.test(e.type)&&(e.defaultChecked=e.checked)}function y(e,t,n,r,i){for(var o,a,s,u,l,c,f,d=e.length,y=p(t),v=[],x=0;x<d;x++)if(a=e[x],a||0===a)if("object"===pe.type(a))pe.merge(v,a.nodeType?[a]:a);else if(Ue.test(a)){for(u=u||y.appendChild(t.createElement("div")),l=(We.exec(a)||["",""])[1].toLowerCase(),f=Xe[l]||Xe._default,u.innerHTML=f[1]+pe.htmlPrefilter(a)+f[2],o=f[0];o--;)u=u.lastChild;if(!fe.leadingWhitespace&&$e.test(a)&&v.push(t.createTextNode($e.exec(a)[0])),!fe.tbody)for(a="table"!==l||Ve.test(a)?"<table>"!==f[1]||Ve.test(a)?0:u:u.firstChild,o=a&&a.childNodes.length;o--;)pe.nodeName(c=a.childNodes[o],"tbody")&&!c.childNodes.length&&a.removeChild(c);for(pe.merge(v,u.childNodes),u.textContent="";u.firstChild;)u.removeChild(u.firstChild);u=y.lastChild}else v.push(t.createTextNode(a));for(u&&y.removeChild(u),fe.appendChecked||pe.grep(h(v,"input"),m),x=0;a=v[x++];)if(r&&pe.inArray(a,r)>-1)i&&i.push(a);else if(s=pe.contains(a.ownerDocument,a),u=h(y.appendChild(a),"script"),s&&g(u),n)for(o=0;a=u[o++];)Ie.test(a.type||"")&&n.push(a);return u=null,y}function v(){return!0}function x(){return!1}function b(){try{return re.activeElement}catch(e){}}function w(e,t,n,r,i,o){var a,s;if("object"==typeof t){"string"!=typeof n&&(r=r||n,n=void 0);for(s in t)w(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),i===!1)i=x;else if(!i)return e;return 1===o&&(a=i,i=function(e){return pe().off(e),a.apply(this,arguments)},i.guid=a.guid||(a.guid=pe.guid++)),e.each(function(){pe.event.add(this,t,i,r,n)})}function T(e,t){return pe.nodeName(e,"table")&&pe.nodeName(11!==t.nodeType?t:t.firstChild,"tr")?e.getElementsByTagName("tbody")[0]||e.appendChild(e.ownerDocument.createElement("tbody")):e}function C(e){return e.type=(null!==pe.find.attr(e,"type"))+"/"+e.type,e}function E(e){var t=it.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function N(e,t){if(1===t.nodeType&&pe.hasData(e)){var n,r,i,o=pe._data(e),a=pe._data(t,o),s=o.events;if(s){delete a.handle,a.events={};for(n in s)for(r=0,i=s[n].length;r<i;r++)pe.event.add(t,n,s[n][r])}a.data&&(a.data=pe.extend({},a.data))}}function k(e,t){var n,r,i;if(1===t.nodeType){if(n=t.nodeName.toLowerCase(),!fe.noCloneEvent&&t[pe.expando]){i=pe._data(t);for(r in i.events)pe.removeEvent(t,r,i.handle);t.removeAttribute(pe.expando)}"script"===n&&t.text!==e.text?(C(t).text=e.text,E(t)):"object"===n?(t.parentNode&&(t.outerHTML=e.outerHTML),fe.html5Clone&&e.innerHTML&&!pe.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):"input"===n&&Be.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):"option"===n?t.defaultSelected=t.selected=e.defaultSelected:"input"!==n&&"textarea"!==n||(t.defaultValue=e.defaultValue)}}function S(e,t,n,r){t=oe.apply([],t);var i,o,a,s,u,l,c=0,f=e.length,d=f-1,p=t[0],g=pe.isFunction(p);if(g||f>1&&"string"==typeof p&&!fe.checkClone&&rt.test(p))return e.each(function(i){var o=e.eq(i);g&&(t[0]=p.call(this,i,o.html())),S(o,t,n,r)});if(f&&(l=y(t,e[0].ownerDocument,!1,e,r),i=l.firstChild,1===l.childNodes.length&&(l=i),i||r)){for(s=pe.map(h(l,"script"),C),a=s.length;c<f;c++)o=l,c!==d&&(o=pe.clone(o,!0,!0),a&&pe.merge(s,h(o,"script"))),n.call(e[c],o,c);if(a)for(u=s[s.length-1].ownerDocument,pe.map(s,E),c=0;c<a;c++)o=s[c],Ie.test(o.type||"")&&!pe._data(o,"globalEval")&&pe.contains(u,o)&&(o.src?pe._evalUrl&&pe._evalUrl(o.src):pe.globalEval((o.text||o.textContent||o.innerHTML||"").replace(ot,"")));l=i=null}return e}function A(e,t,n){for(var r,i=t?pe.filter(t,e):e,o=0;null!=(r=i[o]);o++)n||1!==r.nodeType||pe.cleanData(h(r)),r.parentNode&&(n&&pe.contains(r.ownerDocument,r)&&g(h(r,"script")),r.parentNode.removeChild(r));return e}function D(e,t){var n=pe(t.createElement(e)).appendTo(t.body),r=pe.css(n[0],"display");return n.detach(),r}function j(e){var t=re,n=lt[e];return n||(n=D(e,t),"none"!==n&&n||(ut=(ut||pe("<iframe frameborder='0' width='0' height='0'/>")).appendTo(t.documentElement),t=(ut[0].contentWindow||ut[0].contentDocument).document,t.write(),t.close(),n=D(e,t),ut.detach()),lt[e]=n),n}function L(e,t){return{get:function(){return e()?void delete this.get:(this.get=t).apply(this,arguments)}}}function H(e){if(e in Et)return e;for(var t=e.charAt(0).toUpperCase()+e.slice(1),n=Ct.length;n--;)if(e=Ct[n]+t,e in Et)return e}function q(e,t){for(var n,r,i,o=[],a=0,s=e.length;a<s;a++)r=e[a],r.style&&(o[a]=pe._data(r,"olddisplay"),n=r.style.display,t?(o[a]||"none"!==n||(r.style.display=""),""===r.style.display&&Re(r)&&(o[a]=pe._data(r,"olddisplay",j(r.nodeName)))):(i=Re(r),(n&&"none"!==n||!i)&&pe._data(r,"olddisplay",i?n:pe.css(r,"display"))));for(a=0;a<s;a++)r=e[a],r.style&&(t&&"none"!==r.style.display&&""!==r.style.display||(r.style.display=t?o[a]||"":"none"));return e}function _(e,t,n){var r=bt.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function F(e,t,n,r,i){for(var o=n===(r?"border":"content")?4:"width"===t?1:0,a=0;o<4;o+=2)"margin"===n&&(a+=pe.css(e,n+Oe[o],!0,i)),r?("content"===n&&(a-=pe.css(e,"padding"+Oe[o],!0,i)),"margin"!==n&&(a-=pe.css(e,"border"+Oe[o]+"Width",!0,i))):(a+=pe.css(e,"padding"+Oe[o],!0,i),"padding"!==n&&(a+=pe.css(e,"border"+Oe[o]+"Width",!0,i)));return a}function M(t,n,r){var i=!0,o="width"===n?t.offsetWidth:t.offsetHeight,a=ht(t),s=fe.boxSizing&&"border-box"===pe.css(t,"boxSizing",!1,a);if(re.msFullscreenElement&&e.top!==e&&t.getClientRects().length&&(o=Math.round(100*t.getBoundingClientRect()[n])),o<=0||null==o){if(o=gt(t,n,a),(o<0||null==o)&&(o=t.style[n]),ft.test(o))return o;i=s&&(fe.boxSizingReliable()||o===t.style[n]),o=parseFloat(o)||0}return o+F(t,n,r||(s?"border":"content"),i,a)+"px"}function O(e,t,n,r,i){return new O.prototype.init(e,t,n,r,i)}function R(){return e.setTimeout(function(){Nt=void 0}),Nt=pe.now()}function P(e,t){var n,r={height:e},i=0;for(t=t?1:0;i<4;i+=2-t)n=Oe[i],r["margin"+n]=r["padding"+n]=e;return t&&(r.opacity=r.width=e),r}function B(e,t,n){for(var r,i=($.tweeners[t]||[]).concat($.tweeners["*"]),o=0,a=i.length;o<a;o++)if(r=i[o].call(n,t,e))return r}function W(e,t,n){var r,i,o,a,s,u,l,c,f=this,d={},p=e.style,h=e.nodeType&&Re(e),g=pe._data(e,"fxshow");n.queue||(s=pe._queueHooks(e,"fx"),null==s.unqueued&&(s.unqueued=0,u=s.empty.fire,s.empty.fire=function(){s.unqueued||u()}),s.unqueued++,f.always(function(){f.always(function(){s.unqueued--,pe.queue(e,"fx").length||s.empty.fire()})})),1===e.nodeType&&("height"in t||"width"in t)&&(n.overflow=[p.overflow,p.overflowX,p.overflowY],l=pe.css(e,"display"),c="none"===l?pe._data(e,"olddisplay")||j(e.nodeName):l,"inline"===c&&"none"===pe.css(e,"float")&&(fe.inlineBlockNeedsLayout&&"inline"!==j(e.nodeName)?p.zoom=1:p.display="inline-block")),n.overflow&&(p.overflow="hidden",fe.shrinkWrapBlocks()||f.always(function(){p.overflow=n.overflow[0],p.overflowX=n.overflow[1],p.overflowY=n.overflow[2]}));for(r in t)if(i=t[r],St.exec(i)){if(delete t[r],o=o||"toggle"===i,i===(h?"hide":"show")){if("show"!==i||!g||void 0===g[r])continue;h=!0}d[r]=g&&g[r]||pe.style(e,r)}else l=void 0;if(pe.isEmptyObject(d))"inline"===("none"===l?j(e.nodeName):l)&&(p.display=l);else{g?"hidden"in g&&(h=g.hidden):g=pe._data(e,"fxshow",{}),o&&(g.hidden=!h),h?pe(e).show():f.done(function(){pe(e).hide()}),f.done(function(){var t;pe._removeData(e,"fxshow");for(t in d)pe.style(e,t,d[t])});for(r in d)a=B(h?g[r]:0,r,f),r in g||(g[r]=a.start,h&&(a.end=a.start,a.start="width"===r||"height"===r?1:0))}}function I(e,t){var n,r,i,o,a;for(n in e)if(r=pe.camelCase(n),i=t[r],o=e[n],pe.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),a=pe.cssHooks[r],a&&"expand"in a){o=a.expand(o),delete e[r];for(n in o)n in e||(e[n]=o[n],t[n]=i)}else t[r]=i}function $(e,t,n){var r,i,o=0,a=$.prefilters.length,s=pe.Deferred().always(function(){delete u.elem}),u=function(){if(i)return!1;for(var t=Nt||R(),n=Math.max(0,l.startTime+l.duration-t),r=n/l.duration||0,o=1-r,a=0,u=l.tweens.length;a<u;a++)l.tweens[a].run(o);return s.notifyWith(e,[l,o,n]),o<1&&u?n:(s.resolveWith(e,[l]),!1)},l=s.promise({elem:e,props:pe.extend({},t),opts:pe.extend(!0,{specialEasing:{},easing:pe.easing._default},n),originalProperties:t,originalOptions:n,startTime:Nt||R(),duration:n.duration,tweens:[],createTween:function(t,n){var r=pe.Tween(e,l.opts,t,n,l.opts.specialEasing[t]||l.opts.easing);return l.tweens.push(r),r},stop:function(t){var n=0,r=t?l.tweens.length:0;if(i)return this;for(i=!0;n<r;n++)l.tweens[n].run(1);return t?(s.notifyWith(e,[l,1,0]),s.resolveWith(e,[l,t])):s.rejectWith(e,[l,t]),this}}),c=l.props;for(I(c,l.opts.specialEasing);o<a;o++)if(r=$.prefilters[o].call(l,e,c,l.opts))return pe.isFunction(r.stop)&&(pe._queueHooks(l.elem,l.opts.queue).stop=pe.proxy(r.stop,r)),r;return pe.map(c,B,l),pe.isFunction(l.opts.start)&&l.opts.start.call(e,l),pe.fx.timer(pe.extend(u,{elem:e,anim:l,queue:l.opts.queue})),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always)}function z(e){return pe.attr(e,"class")||""}function X(e){return function(t,n){"string"!=typeof t&&(n=t,t="*");var r,i=0,o=t.toLowerCase().match(De)||[];if(pe.isFunction(n))for(;r=o[i++];)"+"===r.charAt(0)?(r=r.slice(1)||"*",(e[r]=e[r]||[]).unshift(n)):(e[r]=e[r]||[]).push(n)}}function U(e,t,n,r){function i(s){var u;return o[s]=!0,pe.each(e[s]||[],function(e,s){var l=s(t,n,r);return"string"!=typeof l||a||o[l]?a?!(u=l):void 0:(t.dataTypes.unshift(l),i(l),!1)}),u}var o={},a=e===Qt;return i(t.dataTypes[0])||!o["*"]&&i("*")}function V(e,t){var n,r,i=pe.ajaxSettings.flatOptions||{};for(r in t)void 0!==t[r]&&((i[r]?e:n||(n={}))[r]=t[r]);return n&&pe.extend(!0,e,n),e}function Y(e,t,n){for(var r,i,o,a,s=e.contents,u=e.dataTypes;"*"===u[0];)u.shift(),void 0===i&&(i=e.mimeType||t.getResponseHeader("Content-Type"));if(i)for(a in s)if(s[a]&&s[a].test(i)){u.unshift(a);break}if(u[0]in n)o=u[0];else{for(a in n){if(!u[0]||e.converters[a+" "+u[0]]){o=a;break}r||(r=a)}o=o||r}if(o)return o!==u[0]&&u.unshift(o),n[o]}function J(e,t,n,r){var i,o,a,s,u,l={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)l[a.toLowerCase()]=e.converters[a];for(o=c.shift();o;)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!u&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u=o,o=c.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(a=l[u+" "+o]||l["* "+o],!a)for(i in l)if(s=i.split(" "),s[1]===o&&(a=l[u+" "+s[0]]||l["* "+s[0]])){a===!0?a=l[i]:l[i]!==!0&&(o=s[0],c.unshift(s[1]));break}if(a!==!0)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(f){return{state:"parsererror",error:a?f:"No conversion from "+u+" to "+o}}}return{state:"success",data:t}}function G(e){return e.style&&e.style.display||pe.css(e,"display")}function K(e){for(;e&&1===e.nodeType;){if("none"===G(e)||"hidden"===e.type)return!0;e=e.parentNode}return!1}function Q(e,t,n,r){var i;if(pe.isArray(t))pe.each(t,function(t,i){n||rn.test(e)?r(e,i):Q(e+"["+("object"==typeof i&&null!=i?t:"")+"]",i,n,r)});else if(n||"object"!==pe.type(t))r(e,t);else for(i in t)Q(e+"["+i+"]",t[i],n,r)}function Z(){try{return new e.XMLHttpRequest}catch(t){}}function ee(){try{return new e.ActiveXObject("Microsoft.XMLHTTP")}catch(t){}}function te(e){return pe.isWindow(e)?e:9===e.nodeType&&(e.defaultView||e.parentWindow)}var ne=[],re=e.document,ie=ne.slice,oe=ne.concat,ae=ne.push,se=ne.indexOf,ue={},le=ue.toString,ce=ue.hasOwnProperty,fe={},de="1.12.3",pe=function(e,t){return new pe.fn.init(e,t)},he=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,ge=/^-ms-/,me=/-([\da-z])/gi,ye=function(e,t){return t.toUpperCase()};pe.fn=pe.prototype={jquery:de,constructor:pe,selector:"",length:0,toArray:function(){return ie.call(this)},get:function(e){return null!=e?e<0?this[e+this.length]:this[e]:ie.call(this)},pushStack:function(e){var t=pe.merge(this.constructor(),e);return t.prevObject=this,t.context=this.context,t},each:function(e){return pe.each(this,e)},map:function(e){return this.pushStack(pe.map(this,function(t,n){return e.call(t,n,t)}))},slice:function(){return this.pushStack(ie.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(n>=0&&n<t?[this[n]]:[])},end:function(){return this.prevObject||this.constructor()},push:ae,sort:ne.sort,splice:ne.splice},pe.extend=pe.fn.extend=function(){var e,t,n,r,i,o,a=arguments[0]||{},s=1,u=arguments.length,l=!1;for("boolean"==typeof a&&(l=a,a=arguments[s]||{},s++),"object"==typeof a||pe.isFunction(a)||(a={}),s===u&&(a=this,s--);s<u;s++)if(null!=(i=arguments[s]))for(r in i)e=a[r],n=i[r],a!==n&&(l&&n&&(pe.isPlainObject(n)||(t=pe.isArray(n)))?(t?(t=!1,o=e&&pe.isArray(e)?e:[]):o=e&&pe.isPlainObject(e)?e:{},a[r]=pe.extend(l,o,n)):void 0!==n&&(a[r]=n));return a},pe.extend({expando:"jQuery"+(de+Math.random()).replace(/\D/g,""),isReady:!0,error:function(e){throw new Error(e)},noop:function(){},isFunction:function(e){return"function"===pe.type(e)},isArray:Array.isArray||function(e){return"array"===pe.type(e)},isWindow:function(e){return null!=e&&e==e.window},isNumeric:function(e){var t=e&&e.toString();return!pe.isArray(e)&&t-parseFloat(t)+1>=0},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},isPlainObject:function(e){var t;if(!e||"object"!==pe.type(e)||e.nodeType||pe.isWindow(e))return!1;try{if(e.constructor&&!ce.call(e,"constructor")&&!ce.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(n){return!1}if(!fe.ownFirst)for(t in e)return ce.call(e,t);for(t in e);return void 0===t||ce.call(e,t)},type:function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?ue[le.call(e)]||"object":typeof e},globalEval:function(t){t&&pe.trim(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(ge,"ms-").replace(me,ye)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t){var r,i=0;if(n(e))for(r=e.length;i<r&&t.call(e[i],i,e[i])!==!1;i++);else for(i in e)if(t.call(e[i],i,e[i])===!1)break;return e},trim:function(e){return null==e?"":(e+"").replace(he,"")},makeArray:function(e,t){var r=t||[];return null!=e&&(n(Object(e))?pe.merge(r,"string"==typeof e?[e]:e):ae.call(r,e)),r},inArray:function(e,t,n){var r;if(t){if(se)return se.call(t,e,n);for(r=t.length,n=n?n<0?Math.max(0,r+n):n:0;n<r;n++)if(n in t&&t[n]===e)return n}return-1},merge:function(e,t){for(var n=+t.length,r=0,i=e.length;r<n;)e[i++]=t[r++];if(n!==n)for(;void 0!==t[r];)e[i++]=t[r++];return e.length=i,e},grep:function(e,t,n){for(var r,i=[],o=0,a=e.length,s=!n;o<a;o++)r=!t(e[o],o),r!==s&&i.push(e[o]);return i},map:function(e,t,r){var i,o,a=0,s=[];if(n(e))for(i=e.length;a<i;a++)o=t(e[a],a,r),null!=o&&s.push(o);else for(a in e)o=t(e[a],a,r),null!=o&&s.push(o);return oe.apply([],s)},guid:1,proxy:function(e,t){var n,r,i;if("string"==typeof t&&(i=e[t],t=e,e=i),pe.isFunction(e))return n=ie.call(arguments,2),r=function(){return e.apply(t||this,n.concat(ie.call(arguments)))},r.guid=e.guid=e.guid||pe.guid++,r},now:function(){return+new Date},support:fe}),"function"==typeof Symbol&&(pe.fn[Symbol.iterator]=ne[Symbol.iterator]),pe.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(e,t){ue["[object "+t+"]"]=t.toLowerCase()});var ve=function(e){function t(e,t,n,r){var i,o,a,s,u,l,f,p,h=t&&t.ownerDocument,g=t?t.nodeType:9;if(n=n||[],"string"!=typeof e||!e||1!==g&&9!==g&&11!==g)return n;if(!r&&((t?t.ownerDocument||t:B)!==H&&L(t),t=t||H,_)){if(11!==g&&(l=ye.exec(e)))if(i=l[1]){if(9===g){if(!(a=t.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(h&&(a=h.getElementById(i))&&R(t,a)&&a.id===i)return n.push(a),n}else{if(l[2])return Q.apply(n,t.getElementsByTagName(e)),n;if((i=l[3])&&w.getElementsByClassName&&t.getElementsByClassName)return Q.apply(n,t.getElementsByClassName(i)),n}if(w.qsa&&!X[e+" "]&&(!F||!F.test(e))){if(1!==g)h=t,p=e;else if("object"!==t.nodeName.toLowerCase()){for((s=t.getAttribute("id"))?s=s.replace(xe,"\\$&"):t.setAttribute("id",s=P),f=N(e),o=f.length,u=de.test(s)?"#"+s:"[id='"+s+"']";o--;)f[o]=u+" "+d(f[o]);p=f.join(","),h=ve.test(e)&&c(t.parentNode)||t}if(p)try{return Q.apply(n,h.querySelectorAll(p)),n}catch(m){}finally{s===P&&t.removeAttribute("id")}}}return S(e.replace(se,"$1"),t,n,r)}function n(){function e(n,r){return t.push(n+" ")>T.cacheLength&&delete e[t.shift()],e[n+" "]=r}var t=[];return e}function r(e){return e[P]=!0,e}function i(e){var t=H.createElement("div");try{return!!e(t)}catch(n){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function o(e,t){for(var n=e.split("|"),r=n.length;r--;)T.attrHandle[n[r]]=t}function a(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&(~t.sourceIndex||V)-(~e.sourceIndex||V);if(r)return r;if(n)for(;n=n.nextSibling;)if(n===t)return-1;return e?1:-1}function s(e){return function(t){var n=t.nodeName.toLowerCase();return"input"===n&&t.type===e}}function u(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function l(e){return r(function(t){return t=+t,r(function(n,r){for(var i,o=e([],n.length,t),a=o.length;a--;)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}function c(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}function f(){}function d(e){for(var t=0,n=e.length,r="";t<n;t++)r+=e[t].value;return r}function p(e,t,n){var r=t.dir,i=n&&"parentNode"===r,o=I++;return t.first?function(t,n,o){for(;t=t[r];)if(1===t.nodeType||i)return e(t,n,o)}:function(t,n,a){var s,u,l,c=[W,o];if(a){for(;t=t[r];)if((1===t.nodeType||i)&&e(t,n,a))return!0}else for(;t=t[r];)if(1===t.nodeType||i){if(l=t[P]||(t[P]={}),u=l[t.uniqueID]||(l[t.uniqueID]={}),(s=u[r])&&s[0]===W&&s[1]===o)return c[2]=s[2];if(u[r]=c,c[2]=e(t,n,a))return!0}}}function h(e){return e.length>1?function(t,n,r){for(var i=e.length;i--;)if(!e[i](t,n,r))return!1;return!0}:e[0]}function g(e,n,r){for(var i=0,o=n.length;i<o;i++)t(e,n[i],r);return r}function m(e,t,n,r,i){for(var o,a=[],s=0,u=e.length,l=null!=t;s<u;s++)(o=e[s])&&(n&&!n(o,r,i)||(a.push(o),l&&t.push(s)));return a}function y(e,t,n,i,o,a){return i&&!i[P]&&(i=y(i)),o&&!o[P]&&(o=y(o,a)),r(function(r,a,s,u){var l,c,f,d=[],p=[],h=a.length,y=r||g(t||"*",s.nodeType?[s]:s,[]),v=!e||!r&&t?y:m(y,d,e,s,u),x=n?o||(r?e:h||i)?[]:a:v;if(n&&n(v,x,s,u),i)for(l=m(x,p),i(l,[],s,u),c=l.length;c--;)(f=l[c])&&(x[p[c]]=!(v[p[c]]=f));if(r){if(o||e){if(o){for(l=[],c=x.length;c--;)(f=x[c])&&l.push(v[c]=f);o(null,x=[],l,u)}for(c=x.length;c--;)(f=x[c])&&(l=o?ee(r,f):d[c])>-1&&(r[l]=!(a[l]=f))}}else x=m(x===a?x.splice(h,x.length):x),o?o(null,a,x,u):Q.apply(a,x)})}function v(e){for(var t,n,r,i=e.length,o=T.relative[e[0].type],a=o||T.relative[" "],s=o?1:0,u=p(function(e){return e===t},a,!0),l=p(function(e){return ee(t,e)>-1},a,!0),c=[function(e,n,r){var i=!o&&(r||n!==A)||((t=n).nodeType?u(e,n,r):l(e,n,r));return t=null,i}];s<i;s++)if(n=T.relative[e[s].type])c=[p(h(c),n)];else{if(n=T.filter[e[s].type].apply(null,e[s].matches),n[P]){for(r=++s;r<i&&!T.relative[e[r].type];r++);return y(s>1&&h(c),s>1&&d(e.slice(0,s-1).concat({value:" "===e[s-2].type?"*":""})).replace(se,"$1"),n,s<r&&v(e.slice(s,r)),r<i&&v(e=e.slice(r)),r<i&&d(e))}c.push(n)}return h(c)}function x(e,n){var i=n.length>0,o=e.length>0,a=function(r,a,s,u,l){var c,f,d,p=0,h="0",g=r&&[],y=[],v=A,x=r||o&&T.find.TAG("*",l),b=W+=null==v?1:Math.random()||.1,w=x.length;for(l&&(A=a===H||a||l);h!==w&&null!=(c=x[h]);h++){if(o&&c){for(f=0,a||c.ownerDocument===H||(L(c),s=!_);d=e[f++];)if(d(c,a||H,s)){u.push(c);break}l&&(W=b)}i&&((c=!d&&c)&&p--,r&&g.push(c))}if(p+=h,i&&h!==p){for(f=0;d=n[f++];)d(g,y,a,s);if(r){if(p>0)for(;h--;)g[h]||y[h]||(y[h]=G.call(u));y=m(y)}Q.apply(u,y),l&&!r&&y.length>0&&p+n.length>1&&t.uniqueSort(u)}return l&&(W=b,A=v),g};return i?r(a):a}var b,w,T,C,E,N,k,S,A,D,j,L,H,q,_,F,M,O,R,P="sizzle"+1*new Date,B=e.document,W=0,I=0,$=n(),z=n(),X=n(),U=function(e,t){return e===t&&(j=!0),0},V=1<<31,Y={}.hasOwnProperty,J=[],G=J.pop,K=J.push,Q=J.push,Z=J.slice,ee=function(e,t){for(var n=0,r=e.length;n<r;n++)if(e[n]===t)return n;return-1},te="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",ne="[\\x20\\t\\r\\n\\f]",re="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",ie="\\["+ne+"*("+re+")(?:"+ne+"*([*^$|!~]?=)"+ne+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+re+"))|)"+ne+"*\\]",oe=":("+re+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+ie+")*)|.*)\\)|)",ae=new RegExp(ne+"+","g"),se=new RegExp("^"+ne+"+|((?:^|[^\\\\])(?:\\\\.)*)"+ne+"+$","g"),ue=new RegExp("^"+ne+"*,"+ne+"*"),le=new RegExp("^"+ne+"*([>+~]|"+ne+")"+ne+"*"),ce=new RegExp("="+ne+"*([^\\]'\"]*?)"+ne+"*\\]","g"),fe=new RegExp(oe),de=new RegExp("^"+re+"$"),pe={ID:new RegExp("^#("+re+")"),CLASS:new RegExp("^\\.("+re+")"),TAG:new RegExp("^("+re+"|[*])"),ATTR:new RegExp("^"+ie),PSEUDO:new RegExp("^"+oe),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+ne+"*(even|odd|(([+-]|)(\\d*)n|)"+ne+"*(?:([+-]|)"+ne+"*(\\d+)|))"+ne+"*\\)|)","i"),bool:new RegExp("^(?:"+te+")$","i"),needsContext:new RegExp("^"+ne+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+ne+"*((?:-\\d)?\\d*)"+ne+"*\\)|)(?=[^-]|$)","i")},he=/^(?:input|select|textarea|button)$/i,ge=/^h\d$/i,me=/^[^{]+\{\s*\[native \w/,ye=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ve=/[+~]/,xe=/'|\\/g,be=new RegExp("\\\\([\\da-f]{1,6}"+ne+"?|("+ne+")|.)","ig"),we=function(e,t,n){var r="0x"+t-65536;return r!==r||n?t:r<0?String.fromCharCode(r+65536):String.fromCharCode(r>>10|55296,1023&r|56320)},Te=function(){L()};try{Q.apply(J=Z.call(B.childNodes),B.childNodes),J[B.childNodes.length].nodeType}catch(Ce){Q={apply:J.length?function(e,t){K.apply(e,Z.call(t))}:function(e,t){for(var n=e.length,r=0;e[n++]=t[r++];);e.length=n-1}}}w=t.support={},E=t.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return!!t&&"HTML"!==t.nodeName},L=t.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:B;return r!==H&&9===r.nodeType&&r.documentElement?(H=r,q=H.documentElement,_=!E(H),(n=H.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",Te,!1):n.attachEvent&&n.attachEvent("onunload",Te)),w.attributes=i(function(e){return e.className="i",!e.getAttribute("className")}),w.getElementsByTagName=i(function(e){return e.appendChild(H.createComment("")),!e.getElementsByTagName("*").length}),w.getElementsByClassName=me.test(H.getElementsByClassName),w.getById=i(function(e){return q.appendChild(e).id=P,!H.getElementsByName||!H.getElementsByName(P).length}),w.getById?(T.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&_){var n=t.getElementById(e);return n?[n]:[]}},T.filter.ID=function(e){var t=e.replace(be,we);return function(e){return e.getAttribute("id")===t}}):(delete T.find.ID,T.filter.ID=function(e){var t=e.replace(be,we);return function(e){var n="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return n&&n.value===t}}),T.find.TAG=w.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):w.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){for(;n=o[i++];)1===n.nodeType&&r.push(n);return r}return o},T.find.CLASS=w.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&_)return t.getElementsByClassName(e)},M=[],F=[],(w.qsa=me.test(H.querySelectorAll))&&(i(function(e){q.appendChild(e).innerHTML="<a id='"+P+"'></a><select id='"+P+"-\r\\' msallowcapture=''><option selected=''></option></select>",e.querySelectorAll("[msallowcapture^='']").length&&F.push("[*^$]="+ne+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||F.push("\\["+ne+"*(?:value|"+te+")"),e.querySelectorAll("[id~="+P+"-]").length||F.push("~="),e.querySelectorAll(":checked").length||F.push(":checked"),e.querySelectorAll("a#"+P+"+*").length||F.push(".#.+[+~]")}),i(function(e){var t=H.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&F.push("name"+ne+"*[*^$|!~]?="),e.querySelectorAll(":enabled").length||F.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),F.push(",.*:")})),(w.matchesSelector=me.test(O=q.matches||q.webkitMatchesSelector||q.mozMatchesSelector||q.oMatchesSelector||q.msMatchesSelector))&&i(function(e){w.disconnectedMatch=O.call(e,"div"),O.call(e,"[s!='']:x"),M.push("!=",oe)}),F=F.length&&new RegExp(F.join("|")),M=M.length&&new RegExp(M.join("|")),t=me.test(q.compareDocumentPosition),R=t||me.test(q.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)for(;t=t.parentNode;)if(t===e)return!0;return!1},U=t?function(e,t){if(e===t)return j=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n?n:(n=(e.ownerDocument||e)===(t.ownerDocument||t)?e.compareDocumentPosition(t):1,1&n||!w.sortDetached&&t.compareDocumentPosition(e)===n?e===H||e.ownerDocument===B&&R(B,e)?-1:t===H||t.ownerDocument===B&&R(B,t)?1:D?ee(D,e)-ee(D,t):0:4&n?-1:1)}:function(e,t){if(e===t)return j=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,s=[e],u=[t];if(!i||!o)return e===H?-1:t===H?1:i?-1:o?1:D?ee(D,e)-ee(D,t):0;if(i===o)return a(e,t);for(n=e;n=n.parentNode;)s.unshift(n);for(n=t;n=n.parentNode;)u.unshift(n);for(;s[r]===u[r];)r++;return r?a(s[r],u[r]):s[r]===B?-1:u[r]===B?1:0},H):H},t.matches=function(e,n){return t(e,null,null,n)},t.matchesSelector=function(e,n){if((e.ownerDocument||e)!==H&&L(e),n=n.replace(ce,"='$1']"),w.matchesSelector&&_&&!X[n+" "]&&(!M||!M.test(n))&&(!F||!F.test(n)))try{var r=O.call(e,n);if(r||w.disconnectedMatch||e.document&&11!==e.document.nodeType)return r}catch(i){}return t(n,H,null,[e]).length>0},t.contains=function(e,t){return(e.ownerDocument||e)!==H&&L(e),R(e,t)},t.attr=function(e,t){(e.ownerDocument||e)!==H&&L(e);var n=T.attrHandle[t.toLowerCase()],r=n&&Y.call(T.attrHandle,t.toLowerCase())?n(e,t,!_):void 0;return void 0!==r?r:w.attributes||!_?e.getAttribute(t):(r=e.getAttributeNode(t))&&r.specified?r.value:null},t.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},t.uniqueSort=function(e){var t,n=[],r=0,i=0;if(j=!w.detectDuplicates,D=!w.sortStable&&e.slice(0),e.sort(U),j){for(;t=e[i++];)t===e[i]&&(r=n.push(i));for(;r--;)e.splice(n[r],1)}return D=null,e},C=t.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=C(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r++];)n+=C(t);return n},T=t.selectors={cacheLength:50,createPseudo:r,match:pe,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(be,we),e[3]=(e[3]||e[4]||e[5]||"").replace(be,we),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||t.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&t.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return pe.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&fe.test(n)&&(t=N(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(be,we).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=$[e+" "];return t||(t=new RegExp("(^|"+ne+")"+e+"("+ne+"|$)"))&&$(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(e,n,r){return function(i){var o=t.attr(i,e);return null==o?"!="===n:!n||(o+="","="===n?o===r:"!="===n?o!==r:"^="===n?r&&0===o.indexOf(r):"*="===n?r&&o.indexOf(r)>-1:"$="===n?r&&o.slice(-r.length)===r:"~="===n?(" "+o.replace(ae," ")+" ").indexOf(r)>-1:"|="===n&&(o===r||o.slice(0,r.length+1)===r+"-"))}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,u){var l,c,f,d,p,h,g=o!==a?"nextSibling":"previousSibling",m=t.parentNode,y=s&&t.nodeName.toLowerCase(),v=!u&&!s,x=!1;if(m){if(o){for(;g;){for(d=t;d=d[g];)if(s?d.nodeName.toLowerCase()===y:1===d.nodeType)return!1;h=g="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?m.firstChild:m.lastChild],a&&v){for(d=m,f=d[P]||(d[P]={}),c=f[d.uniqueID]||(f[d.uniqueID]={}),
+l=c[e]||[],p=l[0]===W&&l[1],x=p&&l[2],d=p&&m.childNodes[p];d=++p&&d&&d[g]||(x=p=0)||h.pop();)if(1===d.nodeType&&++x&&d===t){c[e]=[W,p,x];break}}else if(v&&(d=t,f=d[P]||(d[P]={}),c=f[d.uniqueID]||(f[d.uniqueID]={}),l=c[e]||[],p=l[0]===W&&l[1],x=p),x===!1)for(;(d=++p&&d&&d[g]||(x=p=0)||h.pop())&&((s?d.nodeName.toLowerCase()!==y:1!==d.nodeType)||!++x||(v&&(f=d[P]||(d[P]={}),c=f[d.uniqueID]||(f[d.uniqueID]={}),c[e]=[W,x]),d!==t)););return x-=i,x===r||x%r===0&&x/r>=0}}},PSEUDO:function(e,n){var i,o=T.pseudos[e]||T.setFilters[e.toLowerCase()]||t.error("unsupported pseudo: "+e);return o[P]?o(n):o.length>1?(i=[e,e,"",n],T.setFilters.hasOwnProperty(e.toLowerCase())?r(function(e,t){for(var r,i=o(e,n),a=i.length;a--;)r=ee(e,i[a]),e[r]=!(t[r]=i[a])}):function(e){return o(e,0,i)}):o}},pseudos:{not:r(function(e){var t=[],n=[],i=k(e.replace(se,"$1"));return i[P]?r(function(e,t,n,r){for(var o,a=i(e,null,r,[]),s=e.length;s--;)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,r,o){return t[0]=e,i(t,null,o,n),t[0]=null,!n.pop()}}),has:r(function(e){return function(n){return t(e,n).length>0}}),contains:r(function(e){return e=e.replace(be,we),function(t){return(t.textContent||t.innerText||C(t)).indexOf(e)>-1}}),lang:r(function(e){return de.test(e||"")||t.error("unsupported lang: "+e),e=e.replace(be,we).toLowerCase(),function(t){var n;do if(n=_?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang"))return n=n.toLowerCase(),n===e||0===n.indexOf(e+"-");while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===q},focus:function(e){return e===H.activeElement&&(!H.hasFocus||H.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!T.pseudos.empty(e)},header:function(e){return ge.test(e.nodeName)},input:function(e){return he.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:l(function(){return[0]}),last:l(function(e,t){return[t-1]}),eq:l(function(e,t,n){return[n<0?n+t:n]}),even:l(function(e,t){for(var n=0;n<t;n+=2)e.push(n);return e}),odd:l(function(e,t){for(var n=1;n<t;n+=2)e.push(n);return e}),lt:l(function(e,t,n){for(var r=n<0?n+t:n;--r>=0;)e.push(r);return e}),gt:l(function(e,t,n){for(var r=n<0?n+t:n;++r<t;)e.push(r);return e})}},T.pseudos.nth=T.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})T.pseudos[b]=s(b);for(b in{submit:!0,reset:!0})T.pseudos[b]=u(b);return f.prototype=T.filters=T.pseudos,T.setFilters=new f,N=t.tokenize=function(e,n){var r,i,o,a,s,u,l,c=z[e+" "];if(c)return n?0:c.slice(0);for(s=e,u=[],l=T.preFilter;s;){r&&!(i=ue.exec(s))||(i&&(s=s.slice(i[0].length)||s),u.push(o=[])),r=!1,(i=le.exec(s))&&(r=i.shift(),o.push({value:r,type:i[0].replace(se," ")}),s=s.slice(r.length));for(a in T.filter)!(i=pe[a].exec(s))||l[a]&&!(i=l[a](i))||(r=i.shift(),o.push({value:r,type:a,matches:i}),s=s.slice(r.length));if(!r)break}return n?s.length:s?t.error(e):z(e,u).slice(0)},k=t.compile=function(e,t){var n,r=[],i=[],o=X[e+" "];if(!o){for(t||(t=N(e)),n=t.length;n--;)o=v(t[n]),o[P]?r.push(o):i.push(o);o=X(e,x(i,r)),o.selector=e}return o},S=t.select=function(e,t,n,r){var i,o,a,s,u,l="function"==typeof e&&e,f=!r&&N(e=l.selector||e);if(n=n||[],1===f.length){if(o=f[0]=f[0].slice(0),o.length>2&&"ID"===(a=o[0]).type&&w.getById&&9===t.nodeType&&_&&T.relative[o[1].type]){if(t=(T.find.ID(a.matches[0].replace(be,we),t)||[])[0],!t)return n;l&&(t=t.parentNode),e=e.slice(o.shift().value.length)}for(i=pe.needsContext.test(e)?0:o.length;i--&&(a=o[i],!T.relative[s=a.type]);)if((u=T.find[s])&&(r=u(a.matches[0].replace(be,we),ve.test(o[0].type)&&c(t.parentNode)||t))){if(o.splice(i,1),e=r.length&&d(o),!e)return Q.apply(n,r),n;break}}return(l||k(e,f))(r,t,!_,n,!t||ve.test(e)&&c(t.parentNode)||t),n},w.sortStable=P.split("").sort(U).join("")===P,w.detectDuplicates=!!j,L(),w.sortDetached=i(function(e){return 1&e.compareDocumentPosition(H.createElement("div"))}),i(function(e){return e.innerHTML="<a href='#'></a>","#"===e.firstChild.getAttribute("href")})||o("type|href|height|width",function(e,t,n){if(!n)return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),w.attributes&&i(function(e){return e.innerHTML="<input/>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||o("value",function(e,t,n){if(!n&&"input"===e.nodeName.toLowerCase())return e.defaultValue}),i(function(e){return null==e.getAttribute("disabled")})||o(te,function(e,t,n){var r;if(!n)return e[t]===!0?t.toLowerCase():(r=e.getAttributeNode(t))&&r.specified?r.value:null}),t}(e);pe.find=ve,pe.expr=ve.selectors,pe.expr[":"]=pe.expr.pseudos,pe.uniqueSort=pe.unique=ve.uniqueSort,pe.text=ve.getText,pe.isXMLDoc=ve.isXML,pe.contains=ve.contains;var xe=function(e,t,n){for(var r=[],i=void 0!==n;(e=e[t])&&9!==e.nodeType;)if(1===e.nodeType){if(i&&pe(e).is(n))break;r.push(e)}return r},be=function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},we=pe.expr.match.needsContext,Te=/^<([\w-]+)\s*\/?>(?:<\/\1>|)$/,Ce=/^.[^:#\[\.,]*$/;pe.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?pe.find.matchesSelector(r,e)?[r]:[]:pe.find.matches(e,pe.grep(t,function(e){return 1===e.nodeType}))},pe.fn.extend({find:function(e){var t,n=[],r=this,i=r.length;if("string"!=typeof e)return this.pushStack(pe(e).filter(function(){for(t=0;t<i;t++)if(pe.contains(r[t],this))return!0}));for(t=0;t<i;t++)pe.find(e,r[t],n);return n=this.pushStack(i>1?pe.unique(n):n),n.selector=this.selector?this.selector+" "+e:e,n},filter:function(e){return this.pushStack(r(this,e||[],!1))},not:function(e){return this.pushStack(r(this,e||[],!0))},is:function(e){return!!r(this,"string"==typeof e&&we.test(e)?pe(e):e||[],!1).length}});var Ee,Ne=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,ke=pe.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||Ee,"string"==typeof e){if(r="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:Ne.exec(e),!r||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof pe?t[0]:t,pe.merge(this,pe.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:re,!0)),Te.test(r[1])&&pe.isPlainObject(t))for(r in t)pe.isFunction(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}if(i=re.getElementById(r[2]),i&&i.parentNode){if(i.id!==r[2])return Ee.find(e);this.length=1,this[0]=i}return this.context=re,this.selector=e,this}return e.nodeType?(this.context=this[0]=e,this.length=1,this):pe.isFunction(e)?"undefined"!=typeof n.ready?n.ready(e):e(pe):(void 0!==e.selector&&(this.selector=e.selector,this.context=e.context),pe.makeArray(e,this))};ke.prototype=pe.fn,Ee=pe(re);var Se=/^(?:parents|prev(?:Until|All))/,Ae={children:!0,contents:!0,next:!0,prev:!0};pe.fn.extend({has:function(e){var t,n=pe(e,this),r=n.length;return this.filter(function(){for(t=0;t<r;t++)if(pe.contains(this,n[t]))return!0})},closest:function(e,t){for(var n,r=0,i=this.length,o=[],a=we.test(e)||"string"!=typeof e?pe(e,t||this.context):0;r<i;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(n.nodeType<11&&(a?a.index(n)>-1:1===n.nodeType&&pe.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(o.length>1?pe.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?pe.inArray(this[0],pe(e)):pe.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(pe.uniqueSort(pe.merge(this.get(),pe(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),pe.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return xe(e,"parentNode")},parentsUntil:function(e,t,n){return xe(e,"parentNode",n)},next:function(e){return i(e,"nextSibling")},prev:function(e){return i(e,"previousSibling")},nextAll:function(e){return xe(e,"nextSibling")},prevAll:function(e){return xe(e,"previousSibling")},nextUntil:function(e,t,n){return xe(e,"nextSibling",n)},prevUntil:function(e,t,n){return xe(e,"previousSibling",n)},siblings:function(e){return be((e.parentNode||{}).firstChild,e)},children:function(e){return be(e.firstChild)},contents:function(e){return pe.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:pe.merge([],e.childNodes)}},function(e,t){pe.fn[e]=function(n,r){var i=pe.map(this,t,n);return"Until"!==e.slice(-5)&&(r=n),r&&"string"==typeof r&&(i=pe.filter(r,i)),this.length>1&&(Ae[e]||(i=pe.uniqueSort(i)),Se.test(e)&&(i=i.reverse())),this.pushStack(i)}});var De=/\S+/g;pe.Callbacks=function(e){e="string"==typeof e?o(e):pe.extend({},e);var t,n,r,i,a=[],s=[],u=-1,l=function(){for(i=e.once,r=t=!0;s.length;u=-1)for(n=s.shift();++u<a.length;)a[u].apply(n[0],n[1])===!1&&e.stopOnFalse&&(u=a.length,n=!1);e.memory||(n=!1),t=!1,i&&(a=n?[]:"")},c={add:function(){return a&&(n&&!t&&(u=a.length-1,s.push(n)),function r(t){pe.each(t,function(t,n){pe.isFunction(n)?e.unique&&c.has(n)||a.push(n):n&&n.length&&"string"!==pe.type(n)&&r(n)})}(arguments),n&&!t&&l()),this},remove:function(){return pe.each(arguments,function(e,t){for(var n;(n=pe.inArray(t,a,n))>-1;)a.splice(n,1),n<=u&&u--}),this},has:function(e){return e?pe.inArray(e,a)>-1:a.length>0},empty:function(){return a&&(a=[]),this},disable:function(){return i=s=[],a=n="",this},disabled:function(){return!a},lock:function(){return i=!0,n||c.disable(),this},locked:function(){return!!i},fireWith:function(e,n){return i||(n=n||[],n=[e,n.slice?n.slice():n],s.push(n),t||l()),this},fire:function(){return c.fireWith(this,arguments),this},fired:function(){return!!r}};return c},pe.extend({Deferred:function(e){var t=[["resolve","done",pe.Callbacks("once memory"),"resolved"],["reject","fail",pe.Callbacks("once memory"),"rejected"],["notify","progress",pe.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return pe.Deferred(function(n){pe.each(t,function(t,o){var a=pe.isFunction(e[t])&&e[t];i[o[1]](function(){var e=a&&a.apply(this,arguments);e&&pe.isFunction(e.promise)?e.promise().progress(n.notify).done(n.resolve).fail(n.reject):n[o[0]+"With"](this===r?n.promise():this,a?[e]:arguments)})}),e=null}).promise()},promise:function(e){return null!=e?pe.extend(e,r):r}},i={};return r.pipe=r.then,pe.each(t,function(e,o){var a=o[2],s=o[3];r[o[1]]=a.add,s&&a.add(function(){n=s},t[1^e][2].disable,t[2][2].lock),i[o[0]]=function(){return i[o[0]+"With"](this===i?r:this,arguments),this},i[o[0]+"With"]=a.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t,n,r,i=0,o=ie.call(arguments),a=o.length,s=1!==a||e&&pe.isFunction(e.promise)?a:0,u=1===s?e:pe.Deferred(),l=function(e,n,r){return function(i){n[e]=this,r[e]=arguments.length>1?ie.call(arguments):i,r===t?u.notifyWith(n,r):--s||u.resolveWith(n,r)}};if(a>1)for(t=new Array(a),n=new Array(a),r=new Array(a);i<a;i++)o[i]&&pe.isFunction(o[i].promise)?o[i].promise().progress(l(i,n,t)).done(l(i,r,o)).fail(u.reject):--s;return s||u.resolveWith(r,o),u.promise()}});var je;pe.fn.ready=function(e){return pe.ready.promise().done(e),this},pe.extend({isReady:!1,readyWait:1,holdReady:function(e){e?pe.readyWait++:pe.ready(!0)},ready:function(e){(e===!0?--pe.readyWait:pe.isReady)||(pe.isReady=!0,e!==!0&&--pe.readyWait>0||(je.resolveWith(re,[pe]),pe.fn.triggerHandler&&(pe(re).triggerHandler("ready"),pe(re).off("ready"))))}}),pe.ready.promise=function(t){if(!je)if(je=pe.Deferred(),"complete"===re.readyState||"loading"!==re.readyState&&!re.documentElement.doScroll)e.setTimeout(pe.ready);else if(re.addEventListener)re.addEventListener("DOMContentLoaded",s),e.addEventListener("load",s);else{re.attachEvent("onreadystatechange",s),e.attachEvent("onload",s);var n=!1;try{n=null==e.frameElement&&re.documentElement}catch(r){}n&&n.doScroll&&!function i(){if(!pe.isReady){try{n.doScroll("left")}catch(t){return e.setTimeout(i,50)}a(),pe.ready()}}()}return je.promise(t)},pe.ready.promise();var Le;for(Le in pe(fe))break;fe.ownFirst="0"===Le,fe.inlineBlockNeedsLayout=!1,pe(function(){var e,t,n,r;n=re.getElementsByTagName("body")[0],n&&n.style&&(t=re.createElement("div"),r=re.createElement("div"),r.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",n.appendChild(r).appendChild(t),"undefined"!=typeof t.style.zoom&&(t.style.cssText="display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1",fe.inlineBlockNeedsLayout=e=3===t.offsetWidth,e&&(n.style.zoom=1)),n.removeChild(r))}),function(){var e=re.createElement("div");fe.deleteExpando=!0;try{delete e.test}catch(t){fe.deleteExpando=!1}e=null}();var He=function(e){var t=pe.noData[(e.nodeName+" ").toLowerCase()],n=+e.nodeType||1;return(1===n||9===n)&&(!t||t!==!0&&e.getAttribute("classid")===t)},qe=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,_e=/([A-Z])/g;pe.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(e){return e=e.nodeType?pe.cache[e[pe.expando]]:e[pe.expando],!!e&&!l(e)},data:function(e,t,n){return c(e,t,n)},removeData:function(e,t){return f(e,t)},_data:function(e,t,n){return c(e,t,n,!0)},_removeData:function(e,t){return f(e,t,!0)}}),pe.fn.extend({data:function(e,t){var n,r,i,o=this[0],a=o&&o.attributes;if(void 0===e){if(this.length&&(i=pe.data(o),1===o.nodeType&&!pe._data(o,"parsedAttrs"))){for(n=a.length;n--;)a[n]&&(r=a[n].name,0===r.indexOf("data-")&&(r=pe.camelCase(r.slice(5)),u(o,r,i[r])));pe._data(o,"parsedAttrs",!0)}return i}return"object"==typeof e?this.each(function(){pe.data(this,e)}):arguments.length>1?this.each(function(){pe.data(this,e,t)}):o?u(o,e,pe.data(o,e)):void 0},removeData:function(e){return this.each(function(){pe.removeData(this,e)})}}),pe.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=pe._data(e,t),n&&(!r||pe.isArray(n)?r=pe._data(e,t,pe.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=pe.queue(e,t),r=n.length,i=n.shift(),o=pe._queueHooks(e,t),a=function(){pe.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,a,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return pe._data(e,n)||pe._data(e,n,{empty:pe.Callbacks("once memory").add(function(){pe._removeData(e,t+"queue"),pe._removeData(e,n)})})}}),pe.fn.extend({queue:function(e,t){var n=2;return"string"!=typeof e&&(t=e,e="fx",n--),arguments.length<n?pe.queue(this[0],e):void 0===t?this:this.each(function(){var n=pe.queue(this,e,t);pe._queueHooks(this,e),"fx"===e&&"inprogress"!==n[0]&&pe.dequeue(this,e)})},dequeue:function(e){return this.each(function(){pe.dequeue(this,e)})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,t){var n,r=1,i=pe.Deferred(),o=this,a=this.length,s=function(){--r||i.resolveWith(o,[o])};for("string"!=typeof e&&(t=e,e=void 0),e=e||"fx";a--;)n=pe._data(o[a],e+"queueHooks"),n&&n.empty&&(r++,n.empty.add(s));return s(),i.promise(t)}}),function(){var e;fe.shrinkWrapBlocks=function(){if(null!=e)return e;e=!1;var t,n,r;return n=re.getElementsByTagName("body")[0],n&&n.style?(t=re.createElement("div"),r=re.createElement("div"),r.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",n.appendChild(r).appendChild(t),"undefined"!=typeof t.style.zoom&&(t.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:1px;width:1px;zoom:1",t.appendChild(re.createElement("div")).style.width="5px",e=3!==t.offsetWidth),n.removeChild(r),e):void 0}}();var Fe=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,Me=new RegExp("^(?:([+-])=|)("+Fe+")([a-z%]*)$","i"),Oe=["Top","Right","Bottom","Left"],Re=function(e,t){return e=t||e,"none"===pe.css(e,"display")||!pe.contains(e.ownerDocument,e)},Pe=function(e,t,n,r,i,o,a){var s=0,u=e.length,l=null==n;if("object"===pe.type(n)){i=!0;for(s in n)Pe(e,t,s,n[s],!0,o,a)}else if(void 0!==r&&(i=!0,pe.isFunction(r)||(a=!0),l&&(a?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(pe(e),n)})),t))for(;s<u;s++)t(e[s],n,a?r:r.call(e[s],s,t(e[s],n)));return i?e:l?t.call(e):u?t(e[0],n):o},Be=/^(?:checkbox|radio)$/i,We=/<([\w:-]+)/,Ie=/^$|\/(?:java|ecma)script/i,$e=/^\s+/,ze="abbr|article|aside|audio|bdi|canvas|data|datalist|details|dialog|figcaption|figure|footer|header|hgroup|main|mark|meter|nav|output|picture|progress|section|summary|template|time|video";!function(){var e=re.createElement("div"),t=re.createDocumentFragment(),n=re.createElement("input");e.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",fe.leadingWhitespace=3===e.firstChild.nodeType,fe.tbody=!e.getElementsByTagName("tbody").length,fe.htmlSerialize=!!e.getElementsByTagName("link").length,fe.html5Clone="<:nav></:nav>"!==re.createElement("nav").cloneNode(!0).outerHTML,n.type="checkbox",n.checked=!0,t.appendChild(n),fe.appendChecked=n.checked,e.innerHTML="<textarea>x</textarea>",fe.noCloneChecked=!!e.cloneNode(!0).lastChild.defaultValue,t.appendChild(e),n=re.createElement("input"),n.setAttribute("type","radio"),n.setAttribute("checked","checked"),n.setAttribute("name","t"),e.appendChild(n),fe.checkClone=e.cloneNode(!0).cloneNode(!0).lastChild.checked,fe.noCloneEvent=!!e.addEventListener,e[pe.expando]=1,fe.attributes=!e.getAttribute(pe.expando)}();var Xe={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:fe.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]};Xe.optgroup=Xe.option,Xe.tbody=Xe.tfoot=Xe.colgroup=Xe.caption=Xe.thead,Xe.th=Xe.td;var Ue=/<|&#?\w+;/,Ve=/<tbody/i;!function(){var t,n,r=re.createElement("div");for(t in{submit:!0,change:!0,focusin:!0})n="on"+t,(fe[t]=n in e)||(r.setAttribute(n,"t"),fe[t]=r.attributes[n].expando===!1);r=null}();var Ye=/^(?:input|select|textarea)$/i,Je=/^key/,Ge=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,Ke=/^(?:focusinfocus|focusoutblur)$/,Qe=/^([^.]*)(?:\.(.+)|)/;pe.event={global:{},add:function(e,t,n,r,i){var o,a,s,u,l,c,f,d,p,h,g,m=pe._data(e);if(m){for(n.handler&&(u=n,n=u.handler,i=u.selector),n.guid||(n.guid=pe.guid++),(a=m.events)||(a=m.events={}),(c=m.handle)||(c=m.handle=function(e){return"undefined"==typeof pe||e&&pe.event.triggered===e.type?void 0:pe.event.dispatch.apply(c.elem,arguments)},c.elem=e),t=(t||"").match(De)||[""],s=t.length;s--;)o=Qe.exec(t[s])||[],p=g=o[1],h=(o[2]||"").split(".").sort(),p&&(l=pe.event.special[p]||{},p=(i?l.delegateType:l.bindType)||p,l=pe.event.special[p]||{},f=pe.extend({type:p,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&pe.expr.match.needsContext.test(i),namespace:h.join(".")},u),(d=a[p])||(d=a[p]=[],d.delegateCount=0,l.setup&&l.setup.call(e,r,h,c)!==!1||(e.addEventListener?e.addEventListener(p,c,!1):e.attachEvent&&e.attachEvent("on"+p,c))),l.add&&(l.add.call(e,f),f.handler.guid||(f.handler.guid=n.guid)),i?d.splice(d.delegateCount++,0,f):d.push(f),pe.event.global[p]=!0);e=null}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,d,p,h,g,m=pe.hasData(e)&&pe._data(e);if(m&&(c=m.events)){for(t=(t||"").match(De)||[""],l=t.length;l--;)if(s=Qe.exec(t[l])||[],p=g=s[1],h=(s[2]||"").split(".").sort(),p){for(f=pe.event.special[p]||{},p=(r?f.delegateType:f.bindType)||p,d=c[p]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),u=o=d.length;o--;)a=d[o],!i&&g!==a.origType||n&&n.guid!==a.guid||s&&!s.test(a.namespace)||r&&r!==a.selector&&("**"!==r||!a.selector)||(d.splice(o,1),a.selector&&d.delegateCount--,f.remove&&f.remove.call(e,a));u&&!d.length&&(f.teardown&&f.teardown.call(e,h,m.handle)!==!1||pe.removeEvent(e,p,m.handle),delete c[p])}else for(p in c)pe.event.remove(e,p+t[l],n,r,!0);pe.isEmptyObject(c)&&(delete m.handle,pe._removeData(e,"events"))}},trigger:function(t,n,r,i){var o,a,s,u,l,c,f,d=[r||re],p=ce.call(t,"type")?t.type:t,h=ce.call(t,"namespace")?t.namespace.split("."):[];if(s=c=r=r||re,3!==r.nodeType&&8!==r.nodeType&&!Ke.test(p+pe.event.triggered)&&(p.indexOf(".")>-1&&(h=p.split("."),p=h.shift(),h.sort()),a=p.indexOf(":")<0&&"on"+p,t=t[pe.expando]?t:new pe.Event(p,"object"==typeof t&&t),t.isTrigger=i?2:3,t.namespace=h.join("."),t.rnamespace=t.namespace?new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,t.result=void 0,t.target||(t.target=r),n=null==n?[t]:pe.makeArray(n,[t]),l=pe.event.special[p]||{},i||!l.trigger||l.trigger.apply(r,n)!==!1)){if(!i&&!l.noBubble&&!pe.isWindow(r)){for(u=l.delegateType||p,Ke.test(u+p)||(s=s.parentNode);s;s=s.parentNode)d.push(s),c=s;c===(r.ownerDocument||re)&&d.push(c.defaultView||c.parentWindow||e)}for(f=0;(s=d[f++])&&!t.isPropagationStopped();)t.type=f>1?u:l.bindType||p,o=(pe._data(s,"events")||{})[t.type]&&pe._data(s,"handle"),o&&o.apply(s,n),o=a&&s[a],o&&o.apply&&He(s)&&(t.result=o.apply(s,n),t.result===!1&&t.preventDefault());if(t.type=p,!i&&!t.isDefaultPrevented()&&(!l._default||l._default.apply(d.pop(),n)===!1)&&He(r)&&a&&r[p]&&!pe.isWindow(r)){c=r[a],c&&(r[a]=null),pe.event.triggered=p;try{r[p]()}catch(g){}pe.event.triggered=void 0,c&&(r[a]=c)}return t.result}},dispatch:function(e){e=pe.event.fix(e);var t,n,r,i,o,a=[],s=ie.call(arguments),u=(pe._data(this,"events")||{})[e.type]||[],l=pe.event.special[e.type]||{};if(s[0]=e,e.delegateTarget=this,!l.preDispatch||l.preDispatch.call(this,e)!==!1){for(a=pe.event.handlers.call(this,e,u),t=0;(i=a[t++])&&!e.isPropagationStopped();)for(e.currentTarget=i.elem,n=0;(o=i.handlers[n++])&&!e.isImmediatePropagationStopped();)e.rnamespace&&!e.rnamespace.test(o.namespace)||(e.handleObj=o,e.data=o.data,r=((pe.event.special[o.origType]||{}).handle||o.handler).apply(i.elem,s),void 0!==r&&(e.result=r)===!1&&(e.preventDefault(),e.stopPropagation()));return l.postDispatch&&l.postDispatch.call(this,e),e.result}},handlers:function(e,t){var n,r,i,o,a=[],s=t.delegateCount,u=e.target;if(s&&u.nodeType&&("click"!==e.type||isNaN(e.button)||e.button<1))for(;u!=this;u=u.parentNode||this)if(1===u.nodeType&&(u.disabled!==!0||"click"!==e.type)){for(r=[],n=0;n<s;n++)o=t[n],i=o.selector+" ",void 0===r[i]&&(r[i]=o.needsContext?pe(i,this).index(u)>-1:pe.find(i,this,null,[u]).length),r[i]&&r.push(o);r.length&&a.push({elem:u,handlers:r})}return s<t.length&&a.push({elem:this,handlers:t.slice(s)}),a},fix:function(e){if(e[pe.expando])return e;var t,n,r,i=e.type,o=e,a=this.fixHooks[i];for(a||(this.fixHooks[i]=a=Ge.test(i)?this.mouseHooks:Je.test(i)?this.keyHooks:{}),r=a.props?this.props.concat(a.props):this.props,e=new pe.Event(o),t=r.length;t--;)n=r[t],e[n]=o[n];return e.target||(e.target=o.srcElement||re),3===e.target.nodeType&&(e.target=e.target.parentNode),e.metaKey=!!e.metaKey,a.filter?a.filter(e,o):e},props:"altKey bubbles cancelable ctrlKey currentTarget detail eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return null==e.which&&(e.which=null!=t.charCode?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,t){var n,r,i,o=t.button,a=t.fromElement;return null==e.pageX&&null!=t.clientX&&(r=e.target.ownerDocument||re,i=r.documentElement,n=r.body,e.pageX=t.clientX+(i&&i.scrollLeft||n&&n.scrollLeft||0)-(i&&i.clientLeft||n&&n.clientLeft||0),e.pageY=t.clientY+(i&&i.scrollTop||n&&n.scrollTop||0)-(i&&i.clientTop||n&&n.clientTop||0)),!e.relatedTarget&&a&&(e.relatedTarget=a===e.target?t.toElement:a),e.which||void 0===o||(e.which=1&o?1:2&o?3:4&o?2:0),e}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==b()&&this.focus)try{return this.focus(),!1}catch(e){}},delegateType:"focusin"},blur:{trigger:function(){if(this===b()&&this.blur)return this.blur(),!1},delegateType:"focusout"},click:{trigger:function(){if(pe.nodeName(this,"input")&&"checkbox"===this.type&&this.click)return this.click(),!1},_default:function(e){return pe.nodeName(e.target,"a")}},beforeunload:{postDispatch:function(e){void 0!==e.result&&e.originalEvent&&(e.originalEvent.returnValue=e.result)}}},simulate:function(e,t,n){var r=pe.extend(new pe.Event,n,{type:e,isSimulated:!0});pe.event.trigger(r,null,t),r.isDefaultPrevented()&&n.preventDefault()}},pe.removeEvent=re.removeEventListener?function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n)}:function(e,t,n){var r="on"+t;e.detachEvent&&("undefined"==typeof e[r]&&(e[r]=null),e.detachEvent(r,n))},pe.Event=function(e,t){return this instanceof pe.Event?(e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||void 0===e.defaultPrevented&&e.returnValue===!1?v:x):this.type=e,t&&pe.extend(this,t),this.timeStamp=e&&e.timeStamp||pe.now(),void(this[pe.expando]=!0)):new pe.Event(e,t)},pe.Event.prototype={constructor:pe.Event,isDefaultPrevented:x,isPropagationStopped:x,isImmediatePropagationStopped:x,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=v,e&&(e.preventDefault?e.preventDefault():e.returnValue=!1)},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=v,e&&!this.isSimulated&&(e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0)},stopImmediatePropagation:function(){var e=this.originalEvent;this.isImmediatePropagationStopped=v,e&&e.stopImmediatePropagation&&e.stopImmediatePropagation(),this.stopPropagation()}},pe.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(e,t){pe.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,o=e.handleObj;return i&&(i===r||pe.contains(r,i))||(e.type=o.origType,n=o.handler.apply(this,arguments),e.type=t),n}}}),fe.submit||(pe.event.special.submit={setup:function(){return!pe.nodeName(this,"form")&&void pe.event.add(this,"click._submit keypress._submit",function(e){var t=e.target,n=pe.nodeName(t,"input")||pe.nodeName(t,"button")?pe.prop(t,"form"):void 0;n&&!pe._data(n,"submit")&&(pe.event.add(n,"submit._submit",function(e){e._submitBubble=!0}),pe._data(n,"submit",!0))})},postDispatch:function(e){e._submitBubble&&(delete e._submitBubble,this.parentNode&&!e.isTrigger&&pe.event.simulate("submit",this.parentNode,e))},teardown:function(){return!pe.nodeName(this,"form")&&void pe.event.remove(this,"._submit")}}),fe.change||(pe.event.special.change={setup:function(){return Ye.test(this.nodeName)?("checkbox"!==this.type&&"radio"!==this.type||(pe.event.add(this,"propertychange._change",function(e){"checked"===e.originalEvent.propertyName&&(this._justChanged=!0)}),pe.event.add(this,"click._change",function(e){this._justChanged&&!e.isTrigger&&(this._justChanged=!1),pe.event.simulate("change",this,e)})),!1):void pe.event.add(this,"beforeactivate._change",function(e){var t=e.target;Ye.test(t.nodeName)&&!pe._data(t,"change")&&(pe.event.add(t,"change._change",function(e){!this.parentNode||e.isSimulated||e.isTrigger||pe.event.simulate("change",this.parentNode,e)}),pe._data(t,"change",!0))})},handle:function(e){var t=e.target;if(this!==t||e.isSimulated||e.isTrigger||"radio"!==t.type&&"checkbox"!==t.type)return e.handleObj.handler.apply(this,arguments)},teardown:function(){return pe.event.remove(this,"._change"),!Ye.test(this.nodeName)}}),fe.focusin||pe.each({focus:"focusin",blur:"focusout"},function(e,t){var n=function(e){pe.event.simulate(t,e.target,pe.event.fix(e))};pe.event.special[t]={setup:function(){var r=this.ownerDocument||this,i=pe._data(r,t);i||r.addEventListener(e,n,!0),pe._data(r,t,(i||0)+1)},teardown:function(){var r=this.ownerDocument||this,i=pe._data(r,t)-1;i?pe._data(r,t,i):(r.removeEventListener(e,n,!0),pe._removeData(r,t))}}}),pe.fn.extend({on:function(e,t,n,r){return w(this,e,t,n,r)},one:function(e,t,n,r){return w(this,e,t,n,r,1)},off:function(e,t,n){var r,i;if(e&&e.preventDefault&&e.handleObj)return r=e.handleObj,pe(e.delegateTarget).off(r.namespace?r.origType+"."+r.namespace:r.origType,r.selector,r.handler),this;if("object"==typeof e){for(i in e)this.off(i,t,e[i]);return this}return t!==!1&&"function"!=typeof t||(n=t,t=void 0),n===!1&&(n=x),this.each(function(){pe.event.remove(this,e,n,t)})},trigger:function(e,t){return this.each(function(){pe.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];if(n)return pe.event.trigger(e,t,n,!0)}});var Ze=/ jQuery\d+="(?:null|\d+)"/g,et=new RegExp("<(?:"+ze+")[\\s/>]","i"),tt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi,nt=/<script|<style|<link/i,rt=/checked\s*(?:[^=]|=\s*.checked.)/i,it=/^true\/(.*)/,ot=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,at=p(re),st=at.appendChild(re.createElement("div"));pe.extend({htmlPrefilter:function(e){return e.replace(tt,"<$1></$2>")},clone:function(e,t,n){var r,i,o,a,s,u=pe.contains(e.ownerDocument,e);if(fe.html5Clone||pe.isXMLDoc(e)||!et.test("<"+e.nodeName+">")?o=e.cloneNode(!0):(st.innerHTML=e.outerHTML,st.removeChild(o=st.firstChild)),!(fe.noCloneEvent&&fe.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||pe.isXMLDoc(e)))for(r=h(o),s=h(e),a=0;null!=(i=s[a]);++a)r[a]&&k(i,r[a]);if(t)if(n)for(s=s||h(e),r=r||h(o),a=0;null!=(i=s[a]);a++)N(i,r[a]);else N(e,o);return r=h(o,"script"),r.length>0&&g(r,!u&&h(e,"script")),r=s=i=null,o},cleanData:function(e,t){for(var n,r,i,o,a=0,s=pe.expando,u=pe.cache,l=fe.attributes,c=pe.event.special;null!=(n=e[a]);a++)if((t||He(n))&&(i=n[s],o=i&&u[i])){if(o.events)for(r in o.events)c[r]?pe.event.remove(n,r):pe.removeEvent(n,r,o.handle);u[i]&&(delete u[i],l||"undefined"==typeof n.removeAttribute?n[s]=void 0:n.removeAttribute(s),ne.push(i))}}}),pe.fn.extend({domManip:S,detach:function(e){return A(this,e,!0)},remove:function(e){return A(this,e)},text:function(e){return Pe(this,function(e){return void 0===e?pe.text(this):this.empty().append((this[0]&&this[0].ownerDocument||re).createTextNode(e))},null,e,arguments.length)},append:function(){return S(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=T(this,e);t.appendChild(e)}})},prepend:function(){return S(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=T(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return S(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return S(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},empty:function(){for(var e,t=0;null!=(e=this[t]);t++){for(1===e.nodeType&&pe.cleanData(h(e,!1));e.firstChild;)e.removeChild(e.firstChild);e.options&&pe.nodeName(e,"select")&&(e.options.length=0)}return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map(function(){return pe.clone(this,e,t)})},html:function(e){return Pe(this,function(e){var t=this[0]||{},n=0,r=this.length;if(void 0===e)return 1===t.nodeType?t.innerHTML.replace(Ze,""):void 0;if("string"==typeof e&&!nt.test(e)&&(fe.htmlSerialize||!et.test(e))&&(fe.leadingWhitespace||!$e.test(e))&&!Xe[(We.exec(e)||["",""])[1].toLowerCase()]){e=pe.htmlPrefilter(e);try{for(;n<r;n++)t=this[n]||{},1===t.nodeType&&(pe.cleanData(h(t,!1)),t.innerHTML=e);t=0}catch(i){}}t&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var e=[];return S(this,arguments,function(t){var n=this.parentNode;pe.inArray(this,e)<0&&(pe.cleanData(h(this)),
+n&&n.replaceChild(t,this))},e)}}),pe.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){pe.fn[e]=function(e){for(var n,r=0,i=[],o=pe(e),a=o.length-1;r<=a;r++)n=r===a?this:this.clone(!0),pe(o[r])[t](n),ae.apply(i,n.get());return this.pushStack(i)}});var ut,lt={HTML:"block",BODY:"block"},ct=/^margin/,ft=new RegExp("^("+Fe+")(?!px)[a-z%]+$","i"),dt=function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];i=n.apply(e,r||[]);for(o in t)e.style[o]=a[o];return i},pt=re.documentElement;!function(){function t(){var t,c,f=re.documentElement;f.appendChild(u),l.style.cssText="-webkit-box-sizing:border-box;box-sizing:border-box;position:relative;display:block;margin:auto;border:1px;padding:1px;top:1%;width:50%",n=i=s=!1,r=a=!0,e.getComputedStyle&&(c=e.getComputedStyle(l),n="1%"!==(c||{}).top,s="2px"===(c||{}).marginLeft,i="4px"===(c||{width:"4px"}).width,l.style.marginRight="50%",r="4px"===(c||{marginRight:"4px"}).marginRight,t=l.appendChild(re.createElement("div")),t.style.cssText=l.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:0",t.style.marginRight=t.style.width="0",l.style.width="1px",a=!parseFloat((e.getComputedStyle(t)||{}).marginRight),l.removeChild(t)),l.style.display="none",o=0===l.getClientRects().length,o&&(l.style.display="",l.innerHTML="<table><tr><td></td><td>t</td></tr></table>",t=l.getElementsByTagName("td"),t[0].style.cssText="margin:0;border:0;padding:0;display:none",o=0===t[0].offsetHeight,o&&(t[0].style.display="",t[1].style.display="none",o=0===t[0].offsetHeight)),f.removeChild(u)}var n,r,i,o,a,s,u=re.createElement("div"),l=re.createElement("div");l.style&&(l.style.cssText="float:left;opacity:.5",fe.opacity="0.5"===l.style.opacity,fe.cssFloat=!!l.style.cssFloat,l.style.backgroundClip="content-box",l.cloneNode(!0).style.backgroundClip="",fe.clearCloneStyle="content-box"===l.style.backgroundClip,u=re.createElement("div"),u.style.cssText="border:0;width:8px;height:0;top:0;left:-9999px;padding:0;margin-top:1px;position:absolute",l.innerHTML="",u.appendChild(l),fe.boxSizing=""===l.style.boxSizing||""===l.style.MozBoxSizing||""===l.style.WebkitBoxSizing,pe.extend(fe,{reliableHiddenOffsets:function(){return null==n&&t(),o},boxSizingReliable:function(){return null==n&&t(),i},pixelMarginRight:function(){return null==n&&t(),r},pixelPosition:function(){return null==n&&t(),n},reliableMarginRight:function(){return null==n&&t(),a},reliableMarginLeft:function(){return null==n&&t(),s}}))}();var ht,gt,mt=/^(top|right|bottom|left)$/;e.getComputedStyle?(ht=function(t){var n=t.ownerDocument.defaultView;return n&&n.opener||(n=e),n.getComputedStyle(t)},gt=function(e,t,n){var r,i,o,a,s=e.style;return n=n||ht(e),a=n?n.getPropertyValue(t)||n[t]:void 0,""!==a&&void 0!==a||pe.contains(e.ownerDocument,e)||(a=pe.style(e,t)),n&&!fe.pixelMarginRight()&&ft.test(a)&&ct.test(t)&&(r=s.width,i=s.minWidth,o=s.maxWidth,s.minWidth=s.maxWidth=s.width=a,a=n.width,s.width=r,s.minWidth=i,s.maxWidth=o),void 0===a?a:a+""}):pt.currentStyle&&(ht=function(e){return e.currentStyle},gt=function(e,t,n){var r,i,o,a,s=e.style;return n=n||ht(e),a=n?n[t]:void 0,null==a&&s&&s[t]&&(a=s[t]),ft.test(a)&&!mt.test(t)&&(r=s.left,i=e.runtimeStyle,o=i&&i.left,o&&(i.left=e.currentStyle.left),s.left="fontSize"===t?"1em":a,a=s.pixelLeft+"px",s.left=r,o&&(i.left=o)),void 0===a?a:a+""||"auto"});var yt=/alpha\([^)]*\)/i,vt=/opacity\s*=\s*([^)]*)/i,xt=/^(none|table(?!-c[ea]).+)/,bt=new RegExp("^("+Fe+")(.*)$","i"),wt={position:"absolute",visibility:"hidden",display:"block"},Tt={letterSpacing:"0",fontWeight:"400"},Ct=["Webkit","O","Moz","ms"],Et=re.createElement("div").style;pe.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=gt(e,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":fe.cssFloat?"cssFloat":"styleFloat"},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,a,s=pe.camelCase(t),u=e.style;if(t=pe.cssProps[s]||(pe.cssProps[s]=H(s)||s),a=pe.cssHooks[t]||pe.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(e,!1,r))?i:u[t];if(o=typeof n,"string"===o&&(i=Me.exec(n))&&i[1]&&(n=d(e,t,i),o="number"),null!=n&&n===n&&("number"===o&&(n+=i&&i[3]||(pe.cssNumber[s]?"":"px")),fe.clearCloneStyle||""!==n||0!==t.indexOf("background")||(u[t]="inherit"),!(a&&"set"in a&&void 0===(n=a.set(e,n,r)))))try{u[t]=n}catch(l){}}},css:function(e,t,n,r){var i,o,a,s=pe.camelCase(t);return t=pe.cssProps[s]||(pe.cssProps[s]=H(s)||s),a=pe.cssHooks[t]||pe.cssHooks[s],a&&"get"in a&&(o=a.get(e,!0,n)),void 0===o&&(o=gt(e,t,r)),"normal"===o&&t in Tt&&(o=Tt[t]),""===n||n?(i=parseFloat(o),n===!0||isFinite(i)?i||0:o):o}}),pe.each(["height","width"],function(e,t){pe.cssHooks[t]={get:function(e,n,r){if(n)return xt.test(pe.css(e,"display"))&&0===e.offsetWidth?dt(e,wt,function(){return M(e,t,r)}):M(e,t,r)},set:function(e,n,r){var i=r&&ht(e);return _(e,n,r?F(e,t,r,fe.boxSizing&&"border-box"===pe.css(e,"boxSizing",!1,i),i):0)}}}),fe.opacity||(pe.cssHooks.opacity={get:function(e,t){return vt.test((t&&e.currentStyle?e.currentStyle.filter:e.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":t?"1":""},set:function(e,t){var n=e.style,r=e.currentStyle,i=pe.isNumeric(t)?"alpha(opacity="+100*t+")":"",o=r&&r.filter||n.filter||"";n.zoom=1,(t>=1||""===t)&&""===pe.trim(o.replace(yt,""))&&n.removeAttribute&&(n.removeAttribute("filter"),""===t||r&&!r.filter)||(n.filter=yt.test(o)?o.replace(yt,i):o+" "+i)}}),pe.cssHooks.marginRight=L(fe.reliableMarginRight,function(e,t){if(t)return dt(e,{display:"inline-block"},gt,[e,"marginRight"])}),pe.cssHooks.marginLeft=L(fe.reliableMarginLeft,function(e,t){if(t)return(parseFloat(gt(e,"marginLeft"))||(pe.contains(e.ownerDocument,e)?e.getBoundingClientRect().left-dt(e,{marginLeft:0},function(){return e.getBoundingClientRect().left}):0))+"px"}),pe.each({margin:"",padding:"",border:"Width"},function(e,t){pe.cssHooks[e+t]={expand:function(n){for(var r=0,i={},o="string"==typeof n?n.split(" "):[n];r<4;r++)i[e+Oe[r]+t]=o[r]||o[r-2]||o[0];return i}},ct.test(e)||(pe.cssHooks[e+t].set=_)}),pe.fn.extend({css:function(e,t){return Pe(this,function(e,t,n){var r,i,o={},a=0;if(pe.isArray(t)){for(r=ht(e),i=t.length;a<i;a++)o[t[a]]=pe.css(e,t[a],!1,r);return o}return void 0!==n?pe.style(e,t,n):pe.css(e,t)},e,t,arguments.length>1)},show:function(){return q(this,!0)},hide:function(){return q(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){Re(this)?pe(this).show():pe(this).hide()})}}),pe.Tween=O,O.prototype={constructor:O,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||pe.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(pe.cssNumber[n]?"":"px")},cur:function(){var e=O.propHooks[this.prop];return e&&e.get?e.get(this):O.propHooks._default.get(this)},run:function(e){var t,n=O.propHooks[this.prop];return this.options.duration?this.pos=t=pe.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):O.propHooks._default.set(this),this}},O.prototype.init.prototype=O.prototype,O.propHooks={_default:{get:function(e){var t;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(t=pe.css(e.elem,e.prop,""),t&&"auto"!==t?t:0)},set:function(e){pe.fx.step[e.prop]?pe.fx.step[e.prop](e):1!==e.elem.nodeType||null==e.elem.style[pe.cssProps[e.prop]]&&!pe.cssHooks[e.prop]?e.elem[e.prop]=e.now:pe.style(e.elem,e.prop,e.now+e.unit)}}},O.propHooks.scrollTop=O.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},pe.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},pe.fx=O.prototype.init,pe.fx.step={};var Nt,kt,St=/^(?:toggle|show|hide)$/,At=/queueHooks$/;pe.Animation=pe.extend($,{tweeners:{"*":[function(e,t){var n=this.createTween(e,t);return d(n.elem,e,Me.exec(t),n),n}]},tweener:function(e,t){pe.isFunction(e)?(t=e,e=["*"]):e=e.match(De);for(var n,r=0,i=e.length;r<i;r++)n=e[r],$.tweeners[n]=$.tweeners[n]||[],$.tweeners[n].unshift(t)},prefilters:[W],prefilter:function(e,t){t?$.prefilters.unshift(e):$.prefilters.push(e)}}),pe.speed=function(e,t,n){var r=e&&"object"==typeof e?pe.extend({},e):{complete:n||!n&&t||pe.isFunction(e)&&e,duration:e,easing:n&&t||t&&!pe.isFunction(t)&&t};return r.duration=pe.fx.off?0:"number"==typeof r.duration?r.duration:r.duration in pe.fx.speeds?pe.fx.speeds[r.duration]:pe.fx.speeds._default,null!=r.queue&&r.queue!==!0||(r.queue="fx"),r.old=r.complete,r.complete=function(){pe.isFunction(r.old)&&r.old.call(this),r.queue&&pe.dequeue(this,r.queue)},r},pe.fn.extend({fadeTo:function(e,t,n,r){return this.filter(Re).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(e,t,n,r){var i=pe.isEmptyObject(e),o=pe.speed(t,n,r),a=function(){var t=$(this,pe.extend({},e),o);(i||pe._data(this,"finish"))&&t.stop(!0)};return a.finish=a,i||o.queue===!1?this.each(a):this.queue(o.queue,a)},stop:function(e,t,n){var r=function(e){var t=e.stop;delete e.stop,t(n)};return"string"!=typeof e&&(n=t,t=e,e=void 0),t&&e!==!1&&this.queue(e||"fx",[]),this.each(function(){var t=!0,i=null!=e&&e+"queueHooks",o=pe.timers,a=pe._data(this);if(i)a[i]&&a[i].stop&&r(a[i]);else for(i in a)a[i]&&a[i].stop&&At.test(i)&&r(a[i]);for(i=o.length;i--;)o[i].elem!==this||null!=e&&o[i].queue!==e||(o[i].anim.stop(n),t=!1,o.splice(i,1));!t&&n||pe.dequeue(this,e)})},finish:function(e){return e!==!1&&(e=e||"fx"),this.each(function(){var t,n=pe._data(this),r=n[e+"queue"],i=n[e+"queueHooks"],o=pe.timers,a=r?r.length:0;for(n.finish=!0,pe.queue(this,e,[]),i&&i.stop&&i.stop.call(this,!0),t=o.length;t--;)o[t].elem===this&&o[t].queue===e&&(o[t].anim.stop(!0),o.splice(t,1));for(t=0;t<a;t++)r[t]&&r[t].finish&&r[t].finish.call(this);delete n.finish})}}),pe.each(["toggle","show","hide"],function(e,t){var n=pe.fn[t];pe.fn[t]=function(e,r,i){return null==e||"boolean"==typeof e?n.apply(this,arguments):this.animate(P(t,!0),e,r,i)}}),pe.each({slideDown:P("show"),slideUp:P("hide"),slideToggle:P("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,t){pe.fn[e]=function(e,n,r){return this.animate(t,e,n,r)}}),pe.timers=[],pe.fx.tick=function(){var e,t=pe.timers,n=0;for(Nt=pe.now();n<t.length;n++)e=t[n],e()||t[n]!==e||t.splice(n--,1);t.length||pe.fx.stop(),Nt=void 0},pe.fx.timer=function(e){pe.timers.push(e),e()?pe.fx.start():pe.timers.pop()},pe.fx.interval=13,pe.fx.start=function(){kt||(kt=e.setInterval(pe.fx.tick,pe.fx.interval))},pe.fx.stop=function(){e.clearInterval(kt),kt=null},pe.fx.speeds={slow:600,fast:200,_default:400},pe.fn.delay=function(t,n){return t=pe.fx?pe.fx.speeds[t]||t:t,n=n||"fx",this.queue(n,function(n,r){var i=e.setTimeout(n,t);r.stop=function(){e.clearTimeout(i)}})},function(){var e,t=re.createElement("input"),n=re.createElement("div"),r=re.createElement("select"),i=r.appendChild(re.createElement("option"));n=re.createElement("div"),n.setAttribute("className","t"),n.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",e=n.getElementsByTagName("a")[0],t.setAttribute("type","checkbox"),n.appendChild(t),e=n.getElementsByTagName("a")[0],e.style.cssText="top:1px",fe.getSetAttribute="t"!==n.className,fe.style=/top/.test(e.getAttribute("style")),fe.hrefNormalized="/a"===e.getAttribute("href"),fe.checkOn=!!t.value,fe.optSelected=i.selected,fe.enctype=!!re.createElement("form").enctype,r.disabled=!0,fe.optDisabled=!i.disabled,t=re.createElement("input"),t.setAttribute("value",""),fe.input=""===t.getAttribute("value"),t.value="t",t.setAttribute("type","radio"),fe.radioValue="t"===t.value}();var Dt=/\r/g,jt=/[\x20\t\r\n\f]+/g;pe.fn.extend({val:function(e){var t,n,r,i=this[0];{if(arguments.length)return r=pe.isFunction(e),this.each(function(n){var i;1===this.nodeType&&(i=r?e.call(this,n,pe(this).val()):e,null==i?i="":"number"==typeof i?i+="":pe.isArray(i)&&(i=pe.map(i,function(e){return null==e?"":e+""})),t=pe.valHooks[this.type]||pe.valHooks[this.nodeName.toLowerCase()],t&&"set"in t&&void 0!==t.set(this,i,"value")||(this.value=i))});if(i)return t=pe.valHooks[i.type]||pe.valHooks[i.nodeName.toLowerCase()],t&&"get"in t&&void 0!==(n=t.get(i,"value"))?n:(n=i.value,"string"==typeof n?n.replace(Dt,""):null==n?"":n)}}}),pe.extend({valHooks:{option:{get:function(e){var t=pe.find.attr(e,"value");return null!=t?t:pe.trim(pe.text(e)).replace(jt," ")}},select:{get:function(e){for(var t,n,r=e.options,i=e.selectedIndex,o="select-one"===e.type||i<0,a=o?null:[],s=o?i+1:r.length,u=i<0?s:o?i:0;u<s;u++)if(n=r[u],(n.selected||u===i)&&(fe.optDisabled?!n.disabled:null===n.getAttribute("disabled"))&&(!n.parentNode.disabled||!pe.nodeName(n.parentNode,"optgroup"))){if(t=pe(n).val(),o)return t;a.push(t)}return a},set:function(e,t){for(var n,r,i=e.options,o=pe.makeArray(t),a=i.length;a--;)if(r=i[a],pe.inArray(pe.valHooks.option.get(r),o)>-1)try{r.selected=n=!0}catch(s){r.scrollHeight}else r.selected=!1;return n||(e.selectedIndex=-1),i}}}}),pe.each(["radio","checkbox"],function(){pe.valHooks[this]={set:function(e,t){if(pe.isArray(t))return e.checked=pe.inArray(pe(e).val(),t)>-1}},fe.checkOn||(pe.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})});var Lt,Ht,qt=pe.expr.attrHandle,_t=/^(?:checked|selected)$/i,Ft=fe.getSetAttribute,Mt=fe.input;pe.fn.extend({attr:function(e,t){return Pe(this,pe.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){pe.removeAttr(this,e)})}}),pe.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return"undefined"==typeof e.getAttribute?pe.prop(e,t,n):(1===o&&pe.isXMLDoc(e)||(t=t.toLowerCase(),i=pe.attrHooks[t]||(pe.expr.match.bool.test(t)?Ht:Lt)),void 0!==n?null===n?void pe.removeAttr(e,t):i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:(e.setAttribute(t,n+""),n):i&&"get"in i&&null!==(r=i.get(e,t))?r:(r=pe.find.attr(e,t),null==r?void 0:r))},attrHooks:{type:{set:function(e,t){if(!fe.radioValue&&"radio"===t&&pe.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,r,i=0,o=t&&t.match(De);if(o&&1===e.nodeType)for(;n=o[i++];)r=pe.propFix[n]||n,pe.expr.match.bool.test(n)?Mt&&Ft||!_t.test(n)?e[r]=!1:e[pe.camelCase("default-"+n)]=e[r]=!1:pe.attr(e,n,""),e.removeAttribute(Ft?n:r)}}),Ht={set:function(e,t,n){return t===!1?pe.removeAttr(e,n):Mt&&Ft||!_t.test(n)?e.setAttribute(!Ft&&pe.propFix[n]||n,n):e[pe.camelCase("default-"+n)]=e[n]=!0,n}},pe.each(pe.expr.match.bool.source.match(/\w+/g),function(e,t){var n=qt[t]||pe.find.attr;Mt&&Ft||!_t.test(t)?qt[t]=function(e,t,r){var i,o;return r||(o=qt[t],qt[t]=i,i=null!=n(e,t,r)?t.toLowerCase():null,qt[t]=o),i}:qt[t]=function(e,t,n){if(!n)return e[pe.camelCase("default-"+t)]?t.toLowerCase():null}}),Mt&&Ft||(pe.attrHooks.value={set:function(e,t,n){return pe.nodeName(e,"input")?void(e.defaultValue=t):Lt&&Lt.set(e,t,n)}}),Ft||(Lt={set:function(e,t,n){var r=e.getAttributeNode(n);if(r||e.setAttributeNode(r=e.ownerDocument.createAttribute(n)),r.value=t+="","value"===n||t===e.getAttribute(n))return t}},qt.id=qt.name=qt.coords=function(e,t,n){var r;if(!n)return(r=e.getAttributeNode(t))&&""!==r.value?r.value:null},pe.valHooks.button={get:function(e,t){var n=e.getAttributeNode(t);if(n&&n.specified)return n.value},set:Lt.set},pe.attrHooks.contenteditable={set:function(e,t,n){Lt.set(e,""!==t&&t,n)}},pe.each(["width","height"],function(e,t){pe.attrHooks[t]={set:function(e,n){if(""===n)return e.setAttribute(t,"auto"),n}}})),fe.style||(pe.attrHooks.style={get:function(e){return e.style.cssText||void 0},set:function(e,t){return e.style.cssText=t+""}});var Ot=/^(?:input|select|textarea|button|object)$/i,Rt=/^(?:a|area)$/i;pe.fn.extend({prop:function(e,t){return Pe(this,pe.prop,e,t,arguments.length>1)},removeProp:function(e){return e=pe.propFix[e]||e,this.each(function(){try{this[e]=void 0,delete this[e]}catch(t){}})}}),pe.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&pe.isXMLDoc(e)||(t=pe.propFix[t]||t,i=pe.propHooks[t]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=pe.find.attr(e,"tabindex");return t?parseInt(t,10):Ot.test(e.nodeName)||Rt.test(e.nodeName)&&e.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),fe.hrefNormalized||pe.each(["href","src"],function(e,t){pe.propHooks[t]={get:function(e){return e.getAttribute(t,4)}}}),fe.optSelected||(pe.propHooks.selected={get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),pe.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){pe.propFix[this.toLowerCase()]=this}),fe.enctype||(pe.propFix.enctype="encoding");var Pt=/[\t\r\n\f]/g;pe.fn.extend({addClass:function(e){var t,n,r,i,o,a,s,u=0;if(pe.isFunction(e))return this.each(function(t){pe(this).addClass(e.call(this,t,z(this)))});if("string"==typeof e&&e)for(t=e.match(De)||[];n=this[u++];)if(i=z(n),r=1===n.nodeType&&(" "+i+" ").replace(Pt," ")){for(a=0;o=t[a++];)r.indexOf(" "+o+" ")<0&&(r+=o+" ");s=pe.trim(r),i!==s&&pe.attr(n,"class",s)}return this},removeClass:function(e){var t,n,r,i,o,a,s,u=0;if(pe.isFunction(e))return this.each(function(t){pe(this).removeClass(e.call(this,t,z(this)))});if(!arguments.length)return this.attr("class","");if("string"==typeof e&&e)for(t=e.match(De)||[];n=this[u++];)if(i=z(n),r=1===n.nodeType&&(" "+i+" ").replace(Pt," ")){for(a=0;o=t[a++];)for(;r.indexOf(" "+o+" ")>-1;)r=r.replace(" "+o+" "," ");s=pe.trim(r),i!==s&&pe.attr(n,"class",s)}return this},toggleClass:function(e,t){var n=typeof e;return"boolean"==typeof t&&"string"===n?t?this.addClass(e):this.removeClass(e):pe.isFunction(e)?this.each(function(n){pe(this).toggleClass(e.call(this,n,z(this),t),t)}):this.each(function(){var t,r,i,o;if("string"===n)for(r=0,i=pe(this),o=e.match(De)||[];t=o[r++];)i.hasClass(t)?i.removeClass(t):i.addClass(t);else void 0!==e&&"boolean"!==n||(t=z(this),t&&pe._data(this,"__className__",t),pe.attr(this,"class",t||e===!1?"":pe._data(this,"__className__")||""))})},hasClass:function(e){var t,n,r=0;for(t=" "+e+" ";n=this[r++];)if(1===n.nodeType&&(" "+z(n)+" ").replace(Pt," ").indexOf(t)>-1)return!0;return!1}}),pe.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(e,t){pe.fn[t]=function(e,n){return arguments.length>0?this.on(t,null,e,n):this.trigger(t)}}),pe.fn.extend({hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}});var Bt=e.location,Wt=pe.now(),It=/\?/,$t=/(,)|(\[|{)|(}|])|"(?:[^"\\\r\n]|\\["\\\/bfnrt]|\\u[\da-fA-F]{4})*"\s*:?|true|false|null|-?(?!0\d)\d+(?:\.\d+|)(?:[eE][+-]?\d+|)/g;pe.parseJSON=function(t){if(e.JSON&&e.JSON.parse)return e.JSON.parse(t+"");var n,r=null,i=pe.trim(t+"");return i&&!pe.trim(i.replace($t,function(e,t,i,o){return n&&t&&(r=0),0===r?e:(n=i||t,r+=!o-!i,"")}))?Function("return "+i)():pe.error("Invalid JSON: "+t)},pe.parseXML=function(t){var n,r;if(!t||"string"!=typeof t)return null;try{e.DOMParser?(r=new e.DOMParser,n=r.parseFromString(t,"text/xml")):(n=new e.ActiveXObject("Microsoft.XMLDOM"),n.async="false",n.loadXML(t))}catch(i){n=void 0}return n&&n.documentElement&&!n.getElementsByTagName("parsererror").length||pe.error("Invalid XML: "+t),n};var zt=/#.*$/,Xt=/([?&])_=[^&]*/,Ut=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Vt=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Yt=/^(?:GET|HEAD)$/,Jt=/^\/\//,Gt=/^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,Kt={},Qt={},Zt="*/".concat("*"),en=Bt.href,tn=Gt.exec(en.toLowerCase())||[];pe.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:en,type:"GET",isLocal:Vt.test(tn[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Zt,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":pe.parseJSON,"text xml":pe.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?V(V(e,pe.ajaxSettings),t):V(pe.ajaxSettings,e)},ajaxPrefilter:X(Kt),ajaxTransport:X(Qt),ajax:function(t,n){function r(t,n,r,i){var o,f,v,x,w,C=n;2!==b&&(b=2,u&&e.clearTimeout(u),c=void 0,s=i||"",T.readyState=t>0?4:0,o=t>=200&&t<300||304===t,r&&(x=Y(d,T,r)),x=J(d,x,T,o),o?(d.ifModified&&(w=T.getResponseHeader("Last-Modified"),w&&(pe.lastModified[a]=w),w=T.getResponseHeader("etag"),w&&(pe.etag[a]=w)),204===t||"HEAD"===d.type?C="nocontent":304===t?C="notmodified":(C=x.state,f=x.data,v=x.error,o=!v)):(v=C,!t&&C||(C="error",t<0&&(t=0))),T.status=t,T.statusText=(n||C)+"",o?g.resolveWith(p,[f,C,T]):g.rejectWith(p,[T,C,v]),T.statusCode(y),y=void 0,l&&h.trigger(o?"ajaxSuccess":"ajaxError",[T,d,o?f:v]),m.fireWith(p,[T,C]),l&&(h.trigger("ajaxComplete",[T,d]),--pe.active||pe.event.trigger("ajaxStop")))}"object"==typeof t&&(n=t,t=void 0),n=n||{};var i,o,a,s,u,l,c,f,d=pe.ajaxSetup({},n),p=d.context||d,h=d.context&&(p.nodeType||p.jquery)?pe(p):pe.event,g=pe.Deferred(),m=pe.Callbacks("once memory"),y=d.statusCode||{},v={},x={},b=0,w="canceled",T={readyState:0,getResponseHeader:function(e){var t;if(2===b){if(!f)for(f={};t=Ut.exec(s);)f[t[1].toLowerCase()]=t[2];t=f[e.toLowerCase()]}return null==t?null:t},getAllResponseHeaders:function(){return 2===b?s:null},setRequestHeader:function(e,t){var n=e.toLowerCase();return b||(e=x[n]=x[n]||e,v[e]=t),this},overrideMimeType:function(e){return b||(d.mimeType=e),this},statusCode:function(e){var t;if(e)if(b<2)for(t in e)y[t]=[y[t],e[t]];else T.always(e[T.status]);return this},abort:function(e){var t=e||w;return c&&c.abort(t),r(0,t),this}};if(g.promise(T).complete=m.add,T.success=T.done,T.error=T.fail,d.url=((t||d.url||en)+"").replace(zt,"").replace(Jt,tn[1]+"//"),d.type=n.method||n.type||d.method||d.type,d.dataTypes=pe.trim(d.dataType||"*").toLowerCase().match(De)||[""],null==d.crossDomain&&(i=Gt.exec(d.url.toLowerCase()),d.crossDomain=!(!i||i[1]===tn[1]&&i[2]===tn[2]&&(i[3]||("http:"===i[1]?"80":"443"))===(tn[3]||("http:"===tn[1]?"80":"443")))),d.data&&d.processData&&"string"!=typeof d.data&&(d.data=pe.param(d.data,d.traditional)),U(Kt,d,n,T),2===b)return T;l=pe.event&&d.global,l&&0===pe.active++&&pe.event.trigger("ajaxStart"),d.type=d.type.toUpperCase(),d.hasContent=!Yt.test(d.type),a=d.url,d.hasContent||(d.data&&(a=d.url+=(It.test(a)?"&":"?")+d.data,delete d.data),d.cache===!1&&(d.url=Xt.test(a)?a.replace(Xt,"$1_="+Wt++):a+(It.test(a)?"&":"?")+"_="+Wt++)),d.ifModified&&(pe.lastModified[a]&&T.setRequestHeader("If-Modified-Since",pe.lastModified[a]),pe.etag[a]&&T.setRequestHeader("If-None-Match",pe.etag[a])),(d.data&&d.hasContent&&d.contentType!==!1||n.contentType)&&T.setRequestHeader("Content-Type",d.contentType),T.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+("*"!==d.dataTypes[0]?", "+Zt+"; q=0.01":""):d.accepts["*"]);for(o in d.headers)T.setRequestHeader(o,d.headers[o]);if(d.beforeSend&&(d.beforeSend.call(p,T,d)===!1||2===b))return T.abort();w="abort";for(o in{success:1,error:1,complete:1})T[o](d[o]);if(c=U(Qt,d,n,T)){if(T.readyState=1,l&&h.trigger("ajaxSend",[T,d]),2===b)return T;d.async&&d.timeout>0&&(u=e.setTimeout(function(){T.abort("timeout")},d.timeout));try{b=1,c.send(v,r)}catch(C){if(!(b<2))throw C;r(-1,C)}}else r(-1,"No Transport");return T},getJSON:function(e,t,n){return pe.get(e,t,n,"json")},getScript:function(e,t){return pe.get(e,void 0,t,"script")}}),pe.each(["get","post"],function(e,t){pe[t]=function(e,n,r,i){return pe.isFunction(n)&&(i=i||r,r=n,n=void 0),pe.ajax(pe.extend({url:e,type:t,dataType:i,data:n,success:r},pe.isPlainObject(e)&&e))}}),pe._evalUrl=function(e){return pe.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,"throws":!0})},pe.fn.extend({wrapAll:function(e){if(pe.isFunction(e))return this.each(function(t){pe(this).wrapAll(e.call(this,t))});if(this[0]){var t=pe(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){for(var e=this;e.firstChild&&1===e.firstChild.nodeType;)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return pe.isFunction(e)?this.each(function(t){pe(this).wrapInner(e.call(this,t))}):this.each(function(){var t=pe(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=pe.isFunction(e);return this.each(function(n){pe(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){pe.nodeName(this,"body")||pe(this).replaceWith(this.childNodes)}).end()}}),pe.expr.filters.hidden=function(e){return fe.reliableHiddenOffsets()?e.offsetWidth<=0&&e.offsetHeight<=0&&!e.getClientRects().length:K(e)},pe.expr.filters.visible=function(e){return!pe.expr.filters.hidden(e)};var nn=/%20/g,rn=/\[\]$/,on=/\r?\n/g,an=/^(?:submit|button|image|reset|file)$/i,sn=/^(?:input|select|textarea|keygen)/i;pe.param=function(e,t){var n,r=[],i=function(e,t){t=pe.isFunction(t)?t():null==t?"":t,r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};if(void 0===t&&(t=pe.ajaxSettings&&pe.ajaxSettings.traditional),pe.isArray(e)||e.jquery&&!pe.isPlainObject(e))pe.each(e,function(){i(this.name,this.value)});else for(n in e)Q(n,e[n],t,i);return r.join("&").replace(nn,"+")},pe.fn.extend({serialize:function(){return pe.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=pe.prop(this,"elements");return e?pe.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!pe(this).is(":disabled")&&sn.test(this.nodeName)&&!an.test(e)&&(this.checked||!Be.test(e))}).map(function(e,t){var n=pe(this).val();return null==n?null:pe.isArray(n)?pe.map(n,function(e){return{name:t.name,value:e.replace(on,"\r\n")}}):{name:t.name,value:n.replace(on,"\r\n")}}).get()}}),pe.ajaxSettings.xhr=void 0!==e.ActiveXObject?function(){return this.isLocal?ee():re.documentMode>8?Z():/^(get|post|head|put|delete|options)$/i.test(this.type)&&Z()||ee()}:Z;var un=0,ln={},cn=pe.ajaxSettings.xhr();e.attachEvent&&e.attachEvent("onunload",function(){for(var e in ln)ln[e](void 0,!0)}),fe.cors=!!cn&&"withCredentials"in cn,cn=fe.ajax=!!cn,cn&&pe.ajaxTransport(function(t){if(!t.crossDomain||fe.cors){var n;return{send:function(r,i){var o,a=t.xhr(),s=++un;if(a.open(t.type,t.url,t.async,t.username,t.password),t.xhrFields)for(o in t.xhrFields)a[o]=t.xhrFields[o];t.mimeType&&a.overrideMimeType&&a.overrideMimeType(t.mimeType),t.crossDomain||r["X-Requested-With"]||(r["X-Requested-With"]="XMLHttpRequest");for(o in r)void 0!==r[o]&&a.setRequestHeader(o,r[o]+"");a.send(t.hasContent&&t.data||null),n=function(e,r){var o,u,l;if(n&&(r||4===a.readyState))if(delete ln[s],n=void 0,a.onreadystatechange=pe.noop,r)4!==a.readyState&&a.abort();else{l={},o=a.status,"string"==typeof a.responseText&&(l.text=a.responseText);try{u=a.statusText}catch(c){u=""}o||!t.isLocal||t.crossDomain?1223===o&&(o=204):o=l.text?200:404}l&&i(o,u,l,a.getAllResponseHeaders())},t.async?4===a.readyState?e.setTimeout(n):a.onreadystatechange=ln[s]=n:n()},abort:function(){n&&n(void 0,!0)}}}}),pe.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return pe.globalEval(e),e}}}),pe.ajaxPrefilter("script",function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET",e.global=!1)}),pe.ajaxTransport("script",function(e){if(e.crossDomain){var t,n=re.head||pe("head")[0]||re.documentElement;return{send:function(r,i){t=re.createElement("script"),t.async=!0,e.scriptCharset&&(t.charset=e.scriptCharset),t.src=e.url,t.onload=t.onreadystatechange=function(e,n){(n||!t.readyState||/loaded|complete/.test(t.readyState))&&(t.onload=t.onreadystatechange=null,t.parentNode&&t.parentNode.removeChild(t),t=null,n||i(200,"success"))},n.insertBefore(t,n.firstChild)},abort:function(){t&&t.onload(void 0,!0)}}}});var fn=[],dn=/(=)\?(?=&|$)|\?\?/;pe.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=fn.pop()||pe.expando+"_"+Wt++;return this[e]=!0,e}}),pe.ajaxPrefilter("json jsonp",function(t,n,r){var i,o,a,s=t.jsonp!==!1&&(dn.test(t.url)?"url":"string"==typeof t.data&&0===(t.contentType||"").indexOf("application/x-www-form-urlencoded")&&dn.test(t.data)&&"data");if(s||"jsonp"===t.dataTypes[0])return i=t.jsonpCallback=pe.isFunction(t.jsonpCallback)?t.jsonpCallback():t.jsonpCallback,s?t[s]=t[s].replace(dn,"$1"+i):t.jsonp!==!1&&(t.url+=(It.test(t.url)?"&":"?")+t.jsonp+"="+i),t.converters["script json"]=function(){return a||pe.error(i+" was not called"),a[0]},t.dataTypes[0]="json",o=e[i],e[i]=function(){a=arguments},r.always(function(){void 0===o?pe(e).removeProp(i):e[i]=o,t[i]&&(t.jsonpCallback=n.jsonpCallback,fn.push(i)),a&&pe.isFunction(o)&&o(a[0]),a=o=void 0}),"script"}),pe.parseHTML=function(e,t,n){if(!e||"string"!=typeof e)return null;"boolean"==typeof t&&(n=t,t=!1),t=t||re;var r=Te.exec(e),i=!n&&[];return r?[t.createElement(r[1])]:(r=y([e],t,i),i&&i.length&&pe(i).remove(),pe.merge([],r.childNodes))};var pn=pe.fn.load;return pe.fn.load=function(e,t,n){if("string"!=typeof e&&pn)return pn.apply(this,arguments);var r,i,o,a=this,s=e.indexOf(" ");return s>-1&&(r=pe.trim(e.slice(s,e.length)),e=e.slice(0,s)),pe.isFunction(t)?(n=t,t=void 0):t&&"object"==typeof t&&(i="POST"),a.length>0&&pe.ajax({url:e,type:i||"GET",dataType:"html",data:t}).done(function(e){o=arguments,a.html(r?pe("<div>").append(pe.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},pe.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){pe.fn[t]=function(e){return this.on(t,e)}}),pe.expr.filters.animated=function(e){return pe.grep(pe.timers,function(t){return e===t.elem}).length},pe.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l,c=pe.css(e,"position"),f=pe(e),d={};"static"===c&&(e.style.position="relative"),s=f.offset(),o=pe.css(e,"top"),u=pe.css(e,"left"),l=("absolute"===c||"fixed"===c)&&pe.inArray("auto",[o,u])>-1,l?(r=f.position(),a=r.top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),pe.isFunction(t)&&(t=t.call(e,n,pe.extend({},s))),null!=t.top&&(d.top=t.top-s.top+a),null!=t.left&&(d.left=t.left-s.left+i),"using"in t?t.using.call(e,d):f.css(d)}},pe.fn.extend({offset:function(e){if(arguments.length)return void 0===e?this:this.each(function(t){pe.offset.setOffset(this,e,t)});var t,n,r={top:0,left:0},i=this[0],o=i&&i.ownerDocument;if(o)return t=o.documentElement,pe.contains(t,i)?("undefined"!=typeof i.getBoundingClientRect&&(r=i.getBoundingClientRect()),n=te(o),{top:r.top+(n.pageYOffset||t.scrollTop)-(t.clientTop||0),left:r.left+(n.pageXOffset||t.scrollLeft)-(t.clientLeft||0)}):r},position:function(){if(this[0]){var e,t,n={top:0,left:0},r=this[0];return"fixed"===pe.css(r,"position")?t=r.getBoundingClientRect():(e=this.offsetParent(),t=this.offset(),pe.nodeName(e[0],"html")||(n=e.offset()),n.top+=pe.css(e[0],"borderTopWidth",!0),n.left+=pe.css(e[0],"borderLeftWidth",!0)),{top:t.top-n.top-pe.css(r,"marginTop",!0),left:t.left-n.left-pe.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){
+for(var e=this.offsetParent;e&&!pe.nodeName(e,"html")&&"static"===pe.css(e,"position");)e=e.offsetParent;return e||pt})}}),pe.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,t){var n=/Y/.test(t);pe.fn[e]=function(r){return Pe(this,function(e,r,i){var o=te(e);return void 0===i?o?t in o?o[t]:o.document.documentElement[r]:e[r]:void(o?o.scrollTo(n?pe(o).scrollLeft():i,n?i:pe(o).scrollTop()):e[r]=i)},e,r,arguments.length,null)}}),pe.each(["top","left"],function(e,t){pe.cssHooks[t]=L(fe.pixelPosition,function(e,n){if(n)return n=gt(e,t),ft.test(n)?pe(e).position()[t]+"px":n})}),pe.each({Height:"height",Width:"width"},function(e,t){pe.each({padding:"inner"+e,content:t,"":"outer"+e},function(n,r){pe.fn[r]=function(r,i){var o=arguments.length&&(n||"boolean"!=typeof r),a=n||(r===!0||i===!0?"margin":"border");return Pe(this,function(t,n,r){var i;return pe.isWindow(t)?t.document.documentElement["client"+e]:9===t.nodeType?(i=t.documentElement,Math.max(t.body["scroll"+e],i["scroll"+e],t.body["offset"+e],i["offset"+e],i["client"+e])):void 0===r?pe.css(t,n,a):pe.style(t,n,r,a)},t,o?r:void 0,o,null)}})}),pe.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)}}),pe.fn.size=function(){return this.length},pe.fn.andSelf=pe.fn.addBack,layui.define(function(e){layui.$=pe,e("jquery",pe)}),pe});
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/login/lay/modules/laydate.js b/pluss-manage-page/src/main/resources/static/resources/auth/js/login/lay/modules/laydate.js
new file mode 100644
index 0000000..ae0a591
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/login/lay/modules/laydate.js
@@ -0,0 +1,2 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ ;!function(){"use strict";var e=window.layui&&layui.define,t={getPath:function(){var e=document.currentScript?document.currentScript.src:function(){for(var e,t=document.scripts,n=t.length-1,a=n;a>0;a--)if("interactive"===t[a].readyState){e=t[a].src;break}return e||t[n].src}();return e.substring(0,e.lastIndexOf("/")+1)}(),getStyle:function(e,t){var n=e.currentStyle?e.currentStyle:window.getComputedStyle(e,null);return n[n.getPropertyValue?"getPropertyValue":"getAttribute"](t)},link:function(e,a,i){if(n.path){var r=document.getElementsByTagName("head")[0],o=document.createElement("link");"string"==typeof a&&(i=a);var s=(i||e).replace(/\.|\//g,""),l="layuicss-"+s,d=0;o.rel="stylesheet",o.href=n.path+e,o.id=l,document.getElementById(l)||r.appendChild(o),"function"==typeof a&&!function c(){return++d>80?window.console&&console.error("laydate.css: Invalid"):void(1989===parseInt(t.getStyle(document.getElementById(l),"width"))?a():setTimeout(c,100))}()}}},n={v:"5.0.9",config:{},index:window.laydate&&window.laydate.v?1e5:0,path:t.getPath,set:function(e){var t=this;return t.config=w.extend({},t.config,e),t},ready:function(a){var i="laydate",r="",o=(e?"modules/laydate/":"theme/")+"default/laydate.css?v="+n.v+r;return e?layui.addcss(o,a,i):t.link(o,a,i),this}},a=function(){var e=this;return{hint:function(t){e.hint.call(e,t)},config:e.config}},i="laydate",r=".layui-laydate",o="layui-this",s="laydate-disabled",l="开始日期超出了结束日期<br>建议重新选择",d=[100,2e5],c="layui-laydate-static",m="layui-laydate-list",u="laydate-selected",h="layui-laydate-hint",y="laydate-day-prev",f="laydate-day-next",p="layui-laydate-footer",g=".laydate-btns-confirm",v="laydate-time-text",D=".laydate-btns-time",T=function(e){var t=this;t.index=++n.index,t.config=w.extend({},t.config,n.config,e),n.ready(function(){t.init()})},w=function(e){return new C(e)},C=function(e){for(var t=0,n="object"==typeof e?[e]:(this.selector=e,document.querySelectorAll(e||null));t<n.length;t++)this.push(n[t])};C.prototype=[],C.prototype.constructor=C,w.extend=function(){var e=1,t=arguments,n=function(e,t){e=e||(t.constructor===Array?[]:{});for(var a in t)e[a]=t[a]&&t[a].constructor===Object?n(e[a],t[a]):t[a];return e};for(t[0]="object"==typeof t[0]?t[0]:{};e<t.length;e++)"object"==typeof t[e]&&n(t[0],t[e]);return t[0]},w.ie=function(){var e=navigator.userAgent.toLowerCase();return!!(window.ActiveXObject||"ActiveXObject"in window)&&((e.match(/msie\s(\d+)/)||[])[1]||"11")}(),w.stope=function(e){e=e||window.event,e.stopPropagation?e.stopPropagation():e.cancelBubble=!0},w.each=function(e,t){var n,a=this;if("function"!=typeof t)return a;if(e=e||[],e.constructor===Object){for(n in e)if(t.call(e[n],n,e[n]))break}else for(n=0;n<e.length&&!t.call(e[n],n,e[n]);n++);return a},w.digit=function(e,t,n){var a="";e=String(e),t=t||2;for(var i=e.length;i<t;i++)a+="0";return e<Math.pow(10,t)?a+(0|e):e},w.elem=function(e,t){var n=document.createElement(e);return w.each(t||{},function(e,t){n.setAttribute(e,t)}),n},C.addStr=function(e,t){return e=e.replace(/\s+/," "),t=t.replace(/\s+/," ").split(" "),w.each(t,function(t,n){new RegExp("\\b"+n+"\\b").test(e)||(e=e+" "+n)}),e.replace(/^\s|\s$/,"")},C.removeStr=function(e,t){return e=e.replace(/\s+/," "),t=t.replace(/\s+/," ").split(" "),w.each(t,function(t,n){var a=new RegExp("\\b"+n+"\\b");a.test(e)&&(e=e.replace(a,""))}),e.replace(/\s+/," ").replace(/^\s|\s$/,"")},C.prototype.find=function(e){var t=this,n=0,a=[],i="object"==typeof e;return this.each(function(r,o){for(var s=i?[e]:o.querySelectorAll(e||null);n<s.length;n++)a.push(s[n]);t.shift()}),i||(t.selector=(t.selector?t.selector+" ":"")+e),w.each(a,function(e,n){t.push(n)}),t},C.prototype.each=function(e){return w.each.call(this,this,e)},C.prototype.addClass=function(e,t){return this.each(function(n,a){a.className=C[t?"removeStr":"addStr"](a.className,e)})},C.prototype.removeClass=function(e){return this.addClass(e,!0)},C.prototype.hasClass=function(e){var t=!1;return this.each(function(n,a){new RegExp("\\b"+e+"\\b").test(a.className)&&(t=!0)}),t},C.prototype.attr=function(e,t){var n=this;return void 0===t?function(){if(n.length>0)return n[0].getAttribute(e)}():n.each(function(n,a){a.setAttribute(e,t)})},C.prototype.removeAttr=function(e){return this.each(function(t,n){n.removeAttribute(e)})},C.prototype.html=function(e){return this.each(function(t,n){n.innerHTML=e})},C.prototype.val=function(e){return this.each(function(t,n){n.value=e})},C.prototype.append=function(e){return this.each(function(t,n){"object"==typeof e?n.appendChild(e):n.innerHTML=n.innerHTML+e})},C.prototype.remove=function(e){return this.each(function(t,n){e?n.removeChild(e):n.parentNode.removeChild(n)})},C.prototype.on=function(e,t){return this.each(function(n,a){a.attachEvent?a.attachEvent("on"+e,function(e){e.target=e.srcElement,t.call(a,e)}):a.addEventListener(e,t,!1)})},C.prototype.off=function(e,t){return this.each(function(n,a){a.detachEvent?a.detachEvent("on"+e,t):a.removeEventListener(e,t,!1)})},T.isLeapYear=function(e){return e%4===0&&e%100!==0||e%400===0},T.prototype.config={type:"date",range:!1,format:"yyyy-MM-dd",value:null,isInitValue:!0,min:"1900-1-1",max:"2099-12-31",trigger:"focus",show:!1,showBottom:!0,btns:["clear","now","confirm"],lang:"cn",theme:"default",position:null,calendar:!1,mark:{},zIndex:null,done:null,change:null},T.prototype.lang=function(){var e=this,t=e.config,n={cn:{weeks:["日","一","二","三","四","五","六"],time:["时","分","秒"],timeTips:"选择时间",startTime:"开始时间",endTime:"结束时间",dateTips:"返回日期",month:["一","二","三","四","五","六","七","八","九","十","十一","十二"],tools:{confirm:"确定",clear:"清空",now:"现在"}},en:{weeks:["Su","Mo","Tu","We","Th","Fr","Sa"],time:["Hours","Minutes","Seconds"],timeTips:"Select Time",startTime:"Start Time",endTime:"End Time",dateTips:"Select Date",month:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],tools:{confirm:"Confirm",clear:"Clear",now:"Now"}}};return n[t.lang]||n.cn},T.prototype.init=function(){var e=this,t=e.config,n="yyyy|y|MM|M|dd|d|HH|H|mm|m|ss|s",a="static"===t.position,i={year:"yyyy",month:"yyyy-MM",date:"yyyy-MM-dd",time:"HH:mm:ss",datetime:"yyyy-MM-dd HH:mm:ss"};t.elem=w(t.elem),t.eventElem=w(t.eventElem),t.elem[0]&&(t.range===!0&&(t.range="-"),t.format===i.date&&(t.format=i[t.type]),e.format=t.format.match(new RegExp(n+"|.","g"))||[],e.EXP_IF="",e.EXP_SPLIT="",w.each(e.format,function(t,a){var i=new RegExp(n).test(a)?"\\d{"+function(){return new RegExp(n).test(e.format[0===t?t+1:t-1]||"")?/^yyyy|y$/.test(a)?4:a.length:/^yyyy$/.test(a)?"1,4":/^y$/.test(a)?"1,308":"1,2"}()+"}":"\\"+a;e.EXP_IF=e.EXP_IF+i,e.EXP_SPLIT=e.EXP_SPLIT+"("+i+")"}),e.EXP_IF=new RegExp("^"+(t.range?e.EXP_IF+"\\s\\"+t.range+"\\s"+e.EXP_IF:e.EXP_IF)+"$"),e.EXP_SPLIT=new RegExp("^"+e.EXP_SPLIT+"$",""),e.isInput(t.elem[0])||"focus"===t.trigger&&(t.trigger="click"),t.elem.attr("lay-key")||(t.elem.attr("lay-key",e.index),t.eventElem.attr("lay-key",e.index)),t.mark=w.extend({},t.calendar&&"cn"===t.lang?{"0-1-1":"元旦","0-2-14":"情人","0-3-8":"妇女","0-3-12":"植树","0-4-1":"愚人","0-5-1":"劳动","0-5-4":"青年","0-6-1":"儿童","0-9-10":"教师","0-9-18":"国耻","0-10-1":"国庆","0-12-25":"圣诞"}:{},t.mark),w.each(["min","max"],function(e,n){var a=[],i=[];if("number"==typeof t[n]){var r=t[n],o=(new Date).getTime(),s=864e5,l=new Date(r?r<s?o+r*s:r:o);a=[l.getFullYear(),l.getMonth()+1,l.getDate()],r<s||(i=[l.getHours(),l.getMinutes(),l.getSeconds()])}else a=(t[n].match(/\d+-\d+-\d+/)||[""])[0].split("-"),i=(t[n].match(/\d+:\d+:\d+/)||[""])[0].split(":");t[n]={year:0|a[0]||(new Date).getFullYear(),month:a[1]?(0|a[1])-1:(new Date).getMonth(),date:0|a[2]||(new Date).getDate(),hours:0|i[0],minutes:0|i[1],seconds:0|i[2]}}),e.elemID="layui-laydate"+t.elem.attr("lay-key"),(t.show||a)&&e.render(),a||e.events(),t.value&&t.isInitValue&&(t.value.constructor===Date?e.setValue(e.parse(0,e.systemDate(t.value))):e.setValue(t.value)))},T.prototype.render=function(){var e=this,t=e.config,n=e.lang(),a="static"===t.position,i=e.elem=w.elem("div",{id:e.elemID,"class":["layui-laydate",t.range?" layui-laydate-range":"",a?" "+c:"",t.theme&&"default"!==t.theme&&!/^#/.test(t.theme)?" laydate-theme-"+t.theme:""].join("")}),r=e.elemMain=[],o=e.elemHeader=[],s=e.elemCont=[],l=e.table=[],d=e.footer=w.elem("div",{"class":p});if(t.zIndex&&(i.style.zIndex=t.zIndex),w.each(new Array(2),function(e){if(!t.range&&e>0)return!0;var a=w.elem("div",{"class":"layui-laydate-header"}),i=[function(){var e=w.elem("i",{"class":"layui-icon laydate-icon laydate-prev-y"});return e.innerHTML="&#xe65a;",e}(),function(){var e=w.elem("i",{"class":"layui-icon laydate-icon laydate-prev-m"});return e.innerHTML="&#xe603;",e}(),function(){var e=w.elem("div",{"class":"laydate-set-ym"}),t=w.elem("span"),n=w.elem("span");return e.appendChild(t),e.appendChild(n),e}(),function(){var e=w.elem("i",{"class":"layui-icon laydate-icon laydate-next-m"});return e.innerHTML="&#xe602;",e}(),function(){var e=w.elem("i",{"class":"layui-icon laydate-icon laydate-next-y"});return e.innerHTML="&#xe65b;",e}()],d=w.elem("div",{"class":"layui-laydate-content"}),c=w.elem("table"),m=w.elem("thead"),u=w.elem("tr");w.each(i,function(e,t){a.appendChild(t)}),m.appendChild(u),w.each(new Array(6),function(e){var t=c.insertRow(0);w.each(new Array(7),function(a){if(0===e){var i=w.elem("th");i.innerHTML=n.weeks[a],u.appendChild(i)}t.insertCell(a)})}),c.insertBefore(m,c.children[0]),d.appendChild(c),r[e]=w.elem("div",{"class":"layui-laydate-main laydate-main-list-"+e}),r[e].appendChild(a),r[e].appendChild(d),o.push(i),s.push(d),l.push(c)}),w(d).html(function(){var e=[],i=[];return"datetime"===t.type&&e.push('<span lay-type="datetime" class="laydate-btns-time">'+n.timeTips+"</span>"),w.each(t.btns,function(e,r){var o=n.tools[r]||"btn";t.range&&"now"===r||(a&&"clear"===r&&(o="cn"===t.lang?"重置":"Reset"),i.push('<span lay-type="'+r+'" class="laydate-btns-'+r+'">'+o+"</span>"))}),e.push('<div class="laydate-footer-btns">'+i.join("")+"</div>"),e.join("")}()),w.each(r,function(e,t){i.appendChild(t)}),t.showBottom&&i.appendChild(d),/^#/.test(t.theme)){var m=w.elem("style"),u=["#{{id}} .layui-laydate-header{background-color:{{theme}};}","#{{id}} .layui-this{background-color:{{theme}} !important;}"].join("").replace(/{{id}}/g,e.elemID).replace(/{{theme}}/g,t.theme);"styleSheet"in m?(m.setAttribute("type","text/css"),m.styleSheet.cssText=u):m.innerHTML=u,w(i).addClass("laydate-theme-molv"),i.appendChild(m)}e.remove(T.thisElemDate),a?t.elem.append(i):(document.body.appendChild(i),e.position()),e.checkDate().calendar(),e.changeEvent(),T.thisElemDate=e.elemID,"function"==typeof t.ready&&t.ready(w.extend({},t.dateTime,{month:t.dateTime.month+1}))},T.prototype.remove=function(e){var t=this,n=(t.config,w("#"+(e||t.elemID)));return n.hasClass(c)||t.checkDate(function(){n.remove()}),t},T.prototype.position=function(){var e=this,t=e.config,n=e.bindElem||t.elem[0],a=n.getBoundingClientRect(),i=e.elem.offsetWidth,r=e.elem.offsetHeight,o=function(e){return e=e?"scrollLeft":"scrollTop",document.body[e]|document.documentElement[e]},s=function(e){return document.documentElement[e?"clientWidth":"clientHeight"]},l=5,d=a.left,c=a.bottom;d+i+l>s("width")&&(d=s("width")-i-l),c+r+l>s()&&(c=a.top>r?a.top-r:s()-r,c-=2*l),t.position&&(e.elem.style.position=t.position),e.elem.style.left=d+("fixed"===t.position?0:o(1))+"px",e.elem.style.top=c+("fixed"===t.position?0:o())+"px"},T.prototype.hint=function(e){var t=this,n=(t.config,w.elem("div",{"class":h}));t.elem&&(n.innerHTML=e||"",w(t.elem).find("."+h).remove(),t.elem.appendChild(n),clearTimeout(t.hinTimer),t.hinTimer=setTimeout(function(){w(t.elem).find("."+h).remove()},3e3))},T.prototype.getAsYM=function(e,t,n){return n?t--:t++,t<0&&(t=11,e--),t>11&&(t=0,e++),[e,t]},T.prototype.systemDate=function(e){var t=e||new Date;return{year:t.getFullYear(),month:t.getMonth(),date:t.getDate(),hours:e?e.getHours():0,minutes:e?e.getMinutes():0,seconds:e?e.getSeconds():0}},T.prototype.checkDate=function(e){var t,a,i=this,r=(new Date,i.config),o=r.dateTime=r.dateTime||i.systemDate(),s=i.bindElem||r.elem[0],l=(i.isInput(s)?"val":"html",i.isInput(s)?s.value:"static"===r.position?"":s.innerHTML),c=function(e){e.year>d[1]&&(e.year=d[1],a=!0),e.month>11&&(e.month=11,a=!0),e.hours>23&&(e.hours=0,a=!0),e.minutes>59&&(e.minutes=0,e.hours++,a=!0),e.seconds>59&&(e.seconds=0,e.minutes++,a=!0),t=n.getEndDate(e.month+1,e.year),e.date>t&&(e.date=t,a=!0)},m=function(e,t,n){var o=["startTime","endTime"];t=(t.match(i.EXP_SPLIT)||[]).slice(1),n=n||0,r.range&&(i[o[n]]=i[o[n]]||{}),w.each(i.format,function(s,l){var c=parseFloat(t[s]);t[s].length<l.length&&(a=!0),/yyyy|y/.test(l)?(c<d[0]&&(c=d[0],a=!0),e.year=c):/MM|M/.test(l)?(c<1&&(c=1,a=!0),e.month=c-1):/dd|d/.test(l)?(c<1&&(c=1,a=!0),e.date=c):/HH|H/.test(l)?(c<1&&(c=0,a=!0),e.hours=c,r.range&&(i[o[n]].hours=c)):/mm|m/.test(l)?(c<1&&(c=0,a=!0),e.minutes=c,r.range&&(i[o[n]].minutes=c)):/ss|s/.test(l)&&(c<1&&(c=0,a=!0),e.seconds=c,r.range&&(i[o[n]].seconds=c))}),c(e)};return"limit"===e?(c(o),i):(l=l||r.value,"string"==typeof l&&(l=l.replace(/\s+/g," ").replace(/^\s|\s$/g,"")),i.startState&&!i.endState&&(delete i.startState,i.endState=!0),"string"==typeof l&&l?i.EXP_IF.test(l)?r.range?(l=l.split(" "+r.range+" "),i.startDate=i.startDate||i.systemDate(),i.endDate=i.endDate||i.systemDate(),r.dateTime=w.extend({},i.startDate),w.each([i.startDate,i.endDate],function(e,t){m(t,l[e],e)})):m(o,l):(i.hint("日期格式不合法<br>必须遵循下述格式：<br>"+(r.range?r.format+" "+r.range+" "+r.format:r.format)+"<br>已为你重置"),a=!0):l&&l.constructor===Date?r.dateTime=i.systemDate(l):(r.dateTime=i.systemDate(),delete i.startState,delete i.endState,delete i.startDate,delete i.endDate,delete i.startTime,delete i.endTime),c(o),a&&l&&i.setValue(r.range?i.endDate?i.parse():"":i.parse()),e&&e(),i)},T.prototype.mark=function(e,t){var n,a=this,i=a.config;return w.each(i.mark,function(e,a){var i=e.split("-");i[0]!=t[0]&&0!=i[0]||i[1]!=t[1]&&0!=i[1]||i[2]!=t[2]||(n=a||t[2])}),n&&e.html('<span class="laydate-day-mark">'+n+"</span>"),a},T.prototype.limit=function(e,t,n,a){var i,r=this,o=r.config,l={},d=o[n>41?"endDate":"dateTime"],c=w.extend({},d,t||{});return w.each({now:c,min:o.min,max:o.max},function(e,t){l[e]=r.newDate(w.extend({year:t.year,month:t.month,date:t.date},function(){var e={};return w.each(a,function(n,a){e[a]=t[a]}),e}())).getTime()}),i=l.now<l.min||l.now>l.max,e&&e[i?"addClass":"removeClass"](s),i},T.prototype.calendar=function(e){var t,a,i,r=this,s=r.config,l=e||s.dateTime,c=new Date,m=r.lang(),u="date"!==s.type&&"datetime"!==s.type,h=e?1:0,y=w(r.table[h]).find("td"),f=w(r.elemHeader[h][2]).find("span");if(l.year<d[0]&&(l.year=d[0],r.hint("最低只能支持到公元"+d[0]+"年")),l.year>d[1]&&(l.year=d[1],r.hint("最高只能支持到公元"+d[1]+"年")),r.firstDate||(r.firstDate=w.extend({},l)),c.setFullYear(l.year,l.month,1),t=c.getDay(),a=n.getEndDate(l.month||12,l.year),i=n.getEndDate(l.month+1,l.year),w.each(y,function(e,n){var d=[l.year,l.month],c=0;n=w(n),n.removeAttr("class"),e<t?(c=a-t+e,n.addClass("laydate-day-prev"),d=r.getAsYM(l.year,l.month,"sub")):e>=t&&e<i+t?(c=e-t,s.range||c+1===l.date&&n.addClass(o)):(c=e-i-t,n.addClass("laydate-day-next"),d=r.getAsYM(l.year,l.month)),d[1]++,d[2]=c+1,n.attr("lay-ymd",d.join("-")).html(d[2]),r.mark(n,d).limit(n,{year:d[0],month:d[1]-1,date:d[2]},e)}),w(f[0]).attr("lay-ym",l.year+"-"+(l.month+1)),w(f[1]).attr("lay-ym",l.year+"-"+(l.month+1)),"cn"===s.lang?(w(f[0]).attr("lay-type","year").html(l.year+"年"),w(f[1]).attr("lay-type","month").html(l.month+1+"月")):(w(f[0]).attr("lay-type","month").html(m.month[l.month]),w(f[1]).attr("lay-type","year").html(l.year)),u&&(s.range&&(e?r.endDate=r.endDate||{year:l.year+("year"===s.type?1:0),month:l.month+("month"===s.type?0:-1)}:r.startDate=r.startDate||{year:l.year,month:l.month},e&&(r.listYM=[[r.startDate.year,r.startDate.month+1],[r.endDate.year,r.endDate.month+1]],r.list(s.type,0).list(s.type,1),"time"===s.type?r.setBtnStatus("时间",w.extend({},r.systemDate(),r.startTime),w.extend({},r.systemDate(),r.endTime)):r.setBtnStatus(!0))),s.range||(r.listYM=[[l.year,l.month+1]],r.list(s.type,0))),s.range&&!e){var p=r.getAsYM(l.year,l.month);r.calendar(w.extend({},l,{year:p[0],month:p[1]}))}return s.range||r.limit(w(r.footer).find(g),null,0,["hours","minutes","seconds"]),s.range&&e&&!u&&r.stampRange(),r},T.prototype.list=function(e,t){var n=this,a=n.config,i=a.dateTime,r=n.lang(),l=a.range&&"date"!==a.type&&"datetime"!==a.type,d=w.elem("ul",{"class":m+" "+{year:"laydate-year-list",month:"laydate-month-list",time:"laydate-time-list"}[e]}),c=n.elemHeader[t],u=w(c[2]).find("span"),h=n.elemCont[t||0],y=w(h).find("."+m)[0],f="cn"===a.lang,p=f?"年":"",T=n.listYM[t]||{},C=["hours","minutes","seconds"],x=["startTime","endTime"][t];if(T[0]<1&&(T[0]=1),"year"===e){var M,b=M=T[0]-7;b<1&&(b=M=1),w.each(new Array(15),function(e){var i=w.elem("li",{"lay-ym":M}),r={year:M};M==T[0]&&w(i).addClass(o),i.innerHTML=M+p,d.appendChild(i),M<n.firstDate.year?(r.month=a.min.month,r.date=a.min.date):M>=n.firstDate.year&&(r.month=a.max.month,r.date=a.max.date),n.limit(w(i),r,t),M++}),w(u[f?0:1]).attr("lay-ym",M-8+"-"+T[1]).html(b+p+" - "+(M-1+p))}else if("month"===e)w.each(new Array(12),function(e){var i=w.elem("li",{"lay-ym":e}),s={year:T[0],month:e};e+1==T[1]&&w(i).addClass(o),i.innerHTML=r.month[e]+(f?"月":""),d.appendChild(i),T[0]<n.firstDate.year?s.date=a.min.date:T[0]>=n.firstDate.year&&(s.date=a.max.date),n.limit(w(i),s,t)}),w(u[f?0:1]).attr("lay-ym",T[0]+"-"+T[1]).html(T[0]+p);else if("time"===e){var E=function(){w(d).find("ol").each(function(e,a){w(a).find("li").each(function(a,i){n.limit(w(i),[{hours:a},{hours:n[x].hours,minutes:a},{hours:n[x].hours,minutes:n[x].minutes,seconds:a}][e],t,[["hours"],["hours","minutes"],["hours","minutes","seconds"]][e])})}),a.range||n.limit(w(n.footer).find(g),n[x],0,["hours","minutes","seconds"])};a.range?n[x]||(n[x]={hours:0,minutes:0,seconds:0}):n[x]=i,w.each([24,60,60],function(e,t){var a=w.elem("li"),i=["<p>"+r.time[e]+"</p><ol>"];w.each(new Array(t),function(t){i.push("<li"+(n[x][C[e]]===t?' class="'+o+'"':"")+">"+w.digit(t,2)+"</li>")}),a.innerHTML=i.join("")+"</ol>",d.appendChild(a)}),E()}if(y&&h.removeChild(y),h.appendChild(d),"year"===e||"month"===e)w(n.elemMain[t]).addClass("laydate-ym-show"),w(d).find("li").on("click",function(){var r=0|w(this).attr("lay-ym");if(!w(this).hasClass(s)){if(0===t)i[e]=r,l&&(n.startDate[e]=r),n.limit(w(n.footer).find(g),null,0);else if(l)n.endDate[e]=r;else{var c="year"===e?n.getAsYM(r,T[1]-1,"sub"):n.getAsYM(T[0],r,"sub");w.extend(i,{year:c[0],month:c[1]})}"year"===a.type||"month"===a.type?(w(d).find("."+o).removeClass(o),w(this).addClass(o),"month"===a.type&&"year"===e&&(n.listYM[t][0]=r,l&&(n[["startDate","endDate"][t]].year=r),n.list("month",t))):(n.checkDate("limit").calendar(),n.closeList()),n.setBtnStatus(),a.range||n.done(null,"change"),w(n.footer).find(D).removeClass(s)}});else{var S=w.elem("span",{"class":v}),k=function(){w(d).find("ol").each(function(e){var t=this,a=w(t).find("li");t.scrollTop=30*(n[x][C[e]]-2),t.scrollTop<=0&&a.each(function(e,n){if(!w(this).hasClass(s))return t.scrollTop=30*(e-2),!0})})},H=w(c[2]).find("."+v);k(),S.innerHTML=a.range?[r.startTime,r.endTime][t]:r.timeTips,w(n.elemMain[t]).addClass("laydate-time-show"),H[0]&&H.remove(),c[2].appendChild(S),w(d).find("ol").each(function(e){var t=this;w(t).find("li").on("click",function(){var r=0|this.innerHTML;w(this).hasClass(s)||(a.range?n[x][C[e]]=r:i[C[e]]=r,w(t).find("."+o).removeClass(o),w(this).addClass(o),E(),k(),(n.endDate||"time"===a.type)&&n.done(null,"change"),n.setBtnStatus())})})}return n},T.prototype.listYM=[],T.prototype.closeList=function(){var e=this;e.config;w.each(e.elemCont,function(t,n){w(this).find("."+m).remove(),w(e.elemMain[t]).removeClass("laydate-ym-show laydate-time-show")}),w(e.elem).find("."+v).remove()},T.prototype.setBtnStatus=function(e,t,n){var a,i=this,r=i.config,o=w(i.footer).find(g),d=r.range&&"date"!==r.type&&"time"!==r.type;d&&(t=t||i.startDate,n=n||i.endDate,a=i.newDate(t).getTime()>i.newDate(n).getTime(),i.limit(null,t)||i.limit(null,n)?o.addClass(s):o[a?"addClass":"removeClass"](s),e&&a&&i.hint("string"==typeof e?l.replace(/日期/g,e):l))},T.prototype.parse=function(e,t){var n=this,a=n.config,i=t||(e?w.extend({},n.endDate,n.endTime):a.range?w.extend({},n.startDate,n.startTime):a.dateTime),r=n.format.concat();return w.each(r,function(e,t){/yyyy|y/.test(t)?r[e]=w.digit(i.year,t.length):/MM|M/.test(t)?r[e]=w.digit(i.month+1,t.length):/dd|d/.test(t)?r[e]=w.digit(i.date,t.length):/HH|H/.test(t)?r[e]=w.digit(i.hours,t.length):/mm|m/.test(t)?r[e]=w.digit(i.minutes,t.length):/ss|s/.test(t)&&(r[e]=w.digit(i.seconds,t.length))}),a.range&&!e?r.join("")+" "+a.range+" "+n.parse(1):r.join("")},T.prototype.newDate=function(e){return e=e||{},new Date(e.year||1,e.month||0,e.date||1,e.hours||0,e.minutes||0,e.seconds||0)},T.prototype.setValue=function(e){var t=this,n=t.config,a=t.bindElem||n.elem[0],i=t.isInput(a)?"val":"html";return"static"===n.position||w(a)[i](e||""),this},T.prototype.stampRange=function(){var e,t,n=this,a=n.config,i=w(n.elem).find("td");if(a.range&&!n.endDate&&w(n.footer).find(g).addClass(s),n.endDate)return e=n.newDate({year:n.startDate.year,month:n.startDate.month,date:n.startDate.date}).getTime(),t=n.newDate({year:n.endDate.year,month:n.endDate.month,date:n.endDate.date}).getTime(),e>t?n.hint(l):void w.each(i,function(a,i){var r=w(i).attr("lay-ymd").split("-"),s=n.newDate({year:r[0],month:r[1]-1,date:r[2]}).getTime();w(i).removeClass(u+" "+o),s!==e&&s!==t||w(i).addClass(w(i).hasClass(y)||w(i).hasClass(f)?u:o),s>e&&s<t&&w(i).addClass(u)})},T.prototype.done=function(e,t){var n=this,a=n.config,i=w.extend({},n.startDate?w.extend(n.startDate,n.startTime):a.dateTime),r=w.extend({},w.extend(n.endDate,n.endTime));return w.each([i,r],function(e,t){"month"in t&&w.extend(t,{month:t.month+1})}),e=e||[n.parse(),i,r],"function"==typeof a[t||"done"]&&a[t||"done"].apply(a,e),n},T.prototype.choose=function(e){var t=this,n=t.config,a=n.dateTime,i=w(t.elem).find("td"),r=e.attr("lay-ymd").split("-"),l=function(e){new Date;e&&w.extend(a,r),n.range&&(t.startDate?w.extend(t.startDate,r):t.startDate=w.extend({},r,t.startTime),t.startYMD=r)};if(r={year:0|r[0],month:(0|r[1])-1,date:0|r[2]},!e.hasClass(s))if(n.range){if(w.each(["startTime","endTime"],function(e,n){t[n]=t[n]||{hours:0,minutes:0,seconds:0}}),t.endState)l(),delete t.endState,delete t.endDate,t.startState=!0,i.removeClass(o+" "+u),e.addClass(o);else if(t.startState){if(e.addClass(o),t.endDate?w.extend(t.endDate,r):t.endDate=w.extend({},r,t.endTime),t.newDate(r).getTime()<t.newDate(t.startYMD).getTime()){var d=w.extend({},t.endDate,{hours:t.startDate.hours,minutes:t.startDate.minutes,seconds:t.startDate.seconds});w.extend(t.endDate,t.startDate,{hours:t.endDate.hours,minutes:t.endDate.minutes,seconds:t.endDate.seconds}),t.startDate=d}n.showBottom||t.done(),t.stampRange(),t.endState=!0,t.done(null,"change")}else e.addClass(o),l(),t.startState=!0;w(t.footer).find(g)[t.endDate?"removeClass":"addClass"](s)}else"static"===n.position?(l(!0),t.calendar().done().done(null,"change")):"date"===n.type?(l(!0),t.setValue(t.parse()).remove().done()):"datetime"===n.type&&(l(!0),t.calendar().done(null,"change"))},T.prototype.tool=function(e,t){var n=this,a=n.config,i=a.dateTime,r="static"===a.position,o={datetime:function(){w(e).hasClass(s)||(n.list("time",0),a.range&&n.list("time",1),w(e).attr("lay-type","date").html(n.lang().dateTips))},date:function(){n.closeList(),w(e).attr("lay-type","datetime").html(n.lang().timeTips)},clear:function(){n.setValue("").remove(),r&&(w.extend(i,n.firstDate),n.calendar()),a.range&&(delete n.startState,delete n.endState,delete n.endDate,delete n.startTime,delete n.endTime),n.done(["",{},{}])},now:function(){var e=new Date;w.extend(i,n.systemDate(),{hours:e.getHours(),minutes:e.getMinutes(),seconds:e.getSeconds()}),n.setValue(n.parse()).remove(),r&&n.calendar(),n.done()},confirm:function(){if(a.range){if(!n.endDate)return n.hint("请先选择日期范围");if(w(e).hasClass(s))return n.hint("time"===a.type?l.replace(/日期/g,"时间"):l)}else if(w(e).hasClass(s))return n.hint("不在有效日期或时间范围内");n.done(),n.setValue(n.parse()).remove()}};o[t]&&o[t]()},T.prototype.change=function(e){var t=this,n=t.config,a=n.dateTime,i=n.range&&("year"===n.type||"month"===n.type),r=t.elemCont[e||0],o=t.listYM[e],s=function(s){var l=["startDate","endDate"][e],d=w(r).find(".laydate-year-list")[0],c=w(r).find(".laydate-month-list")[0];return d&&(o[0]=s?o[0]-15:o[0]+15,t.list("year",e)),c&&(s?o[0]--:o[0]++,t.list("month",e)),(d||c)&&(w.extend(a,{year:o[0]}),i&&(t[l].year=o[0]),n.range||t.done(null,"change"),t.setBtnStatus(),n.range||t.limit(w(t.footer).find(g),{year:o[0]})),d||c};return{prevYear:function(){s("sub")||(a.year--,t.checkDate("limit").calendar(),n.range||t.done(null,"change"))},prevMonth:function(){var e=t.getAsYM(a.year,a.month,"sub");w.extend(a,{year:e[0],month:e[1]}),t.checkDate("limit").calendar(),n.range||t.done(null,"change")},nextMonth:function(){var e=t.getAsYM(a.year,a.month);w.extend(a,{year:e[0],month:e[1]}),t.checkDate("limit").calendar(),n.range||t.done(null,"change")},nextYear:function(){s()||(a.year++,t.checkDate("limit").calendar(),n.range||t.done(null,"change"))}}},T.prototype.changeEvent=function(){var e=this;e.config;w(e.elem).on("click",function(e){w.stope(e)}),w.each(e.elemHeader,function(t,n){w(n[0]).on("click",function(n){e.change(t).prevYear()}),w(n[1]).on("click",function(n){e.change(t).prevMonth()}),w(n[2]).find("span").on("click",function(n){var a=w(this),i=a.attr("lay-ym"),r=a.attr("lay-type");i&&(i=i.split("-"),e.listYM[t]=[0|i[0],0|i[1]],e.list(r,t),w(e.footer).find(D).addClass(s))}),w(n[3]).on("click",function(n){e.change(t).nextMonth()}),w(n[4]).on("click",function(n){e.change(t).nextYear()})}),w.each(e.table,function(t,n){var a=w(n).find("td");a.on("click",function(){e.choose(w(this))})}),w(e.footer).find("span").on("click",function(){var t=w(this).attr("lay-type");e.tool(this,t)})},T.prototype.isInput=function(e){return/input|textarea/.test(e.tagName.toLocaleLowerCase())},T.prototype.events=function(){var e=this,t=e.config,n=function(n,a){n.on(t.trigger,function(){a&&(e.bindElem=this),e.render()})};t.elem[0]&&!t.elem[0].eventHandler&&(n(t.elem,"bind"),n(t.eventElem),w(document).on("click",function(n){n.target!==t.elem[0]&&n.target!==t.eventElem[0]&&n.target!==w(t.closeStop)[0]&&e.remove()}).on("keydown",function(t){13===t.keyCode&&w("#"+e.elemID)[0]&&e.elemID===T.thisElem&&(t.preventDefault(),w(e.footer).find(g)[0].click())}),w(window).on("resize",function(){return!(!e.elem||!w(r)[0])&&void e.position()}),t.elem[0].eventHandler=!0)},n.render=function(e){var t=new T(e);return a.call(t)},n.getEndDate=function(e,t){var n=new Date;return n.setFullYear(t||n.getFullYear(),e||n.getMonth()+1,1),new Date(n.getTime()-864e5).getDate()},window.lay=window.lay||w,e?(n.ready(),layui.define(function(e){n.path=layui.cache.dir,e(i,n)})):"function"==typeof define&&define.amd?define(function(){return n}):function(){n.ready(),window.laydate=n}()}();
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/login/lay/modules/layedit.js b/pluss-manage-page/src/main/resources/static/resources/auth/js/login/lay/modules/layedit.js
new file mode 100644
index 0000000..96caa11
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/login/lay/modules/layedit.js
@@ -0,0 +1,2 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ ;layui.define(["layer","form"],function(t){"use strict";var e=layui.$,i=layui.layer,a=layui.form,l=(layui.hint(),layui.device()),n="layedit",o="layui-show",r="layui-disabled",c=function(){var t=this;t.index=0,t.config={tool:["strong","italic","underline","del","|","left","center","right","|","link","unlink","face","image"],hideTool:[],height:280}};c.prototype.set=function(t){var i=this;return e.extend(!0,i.config,t),i},c.prototype.on=function(t,e){return layui.onevent(n,t,e)},c.prototype.build=function(t,i){i=i||{};var a=this,n=a.config,r="layui-layedit",c=e("string"==typeof t?"#"+t:t),u="LAY_layedit_"+ ++a.index,d=c.next("."+r),y=e.extend({},n,i),f=function(){var t=[],e={};return layui.each(y.hideTool,function(t,i){e[i]=!0}),layui.each(y.tool,function(i,a){C[a]&&!e[a]&&t.push(C[a])}),t.join("")}(),m=e(['<div class="'+r+'">','<div class="layui-unselect layui-layedit-tool">'+f+"</div>",'<div class="layui-layedit-iframe">','<iframe id="'+u+'" name="'+u+'" textarea="'+t+'" frameborder="0"></iframe>',"</div>","</div>"].join(""));return l.ie&&l.ie<8?c.removeClass("layui-hide").addClass(o):(d[0]&&d.remove(),s.call(a,m,c[0],y),c.addClass("layui-hide").after(m),a.index)},c.prototype.getContent=function(t){var e=u(t);if(e[0])return d(e[0].document.body.innerHTML)},c.prototype.getText=function(t){var i=u(t);if(i[0])return e(i[0].document.body).text()},c.prototype.setContent=function(t,i,a){var l=u(t);l[0]&&(a?e(l[0].document.body).append(i):e(l[0].document.body).html(i),layedit.sync(t))},c.prototype.sync=function(t){var i=u(t);if(i[0]){var a=e("#"+i[1].attr("textarea"));a.val(d(i[0].document.body.innerHTML))}},c.prototype.getSelection=function(t){var e=u(t);if(e[0]){var i=m(e[0].document);return document.selection?i.text:i.toString()}};var s=function(t,i,a){var l=this,n=t.find("iframe");n.css({height:a.height}).on("load",function(){var o=n.contents(),r=n.prop("contentWindow"),c=o.find("head"),s=e(["<style>","*{margin: 0; padding: 0;}","body{padding: 10px; line-height: 20px; overflow-x: hidden; word-wrap: break-word; font: 14px Helvetica Neue,Helvetica,PingFang SC,Microsoft YaHei,Tahoma,Arial,sans-serif; -webkit-box-sizing: border-box !important; -moz-box-sizing: border-box !important; box-sizing: border-box !important;}","a{color:#01AAED; text-decoration:none;}a:hover{color:#c00}","p{margin-bottom: 10px;}","img{display: inline-block; border: none; vertical-align: middle;}","pre{margin: 10px 0; padding: 10px; line-height: 20px; border: 1px solid #ddd; border-left-width: 6px; background-color: #F2F2F2; color: #333; font-family: Courier New; font-size: 12px;}","</style>"].join("")),u=o.find("body");c.append(s),u.attr("contenteditable","true").css({"min-height":a.height}).html(i.value||""),y.apply(l,[r,n,i,a]),g.call(l,r,t,a)})},u=function(t){var i=e("#LAY_layedit_"+t),a=i.prop("contentWindow");return[a,i]},d=function(t){return 8==l.ie&&(t=t.replace(/<.+>/g,function(t){return t.toLowerCase()})),t},y=function(t,a,n,o){var r=t.document,c=e(r.body);c.on("keydown",function(t){var e=t.keyCode;if(13===e){var a=m(r),l=p(a),n=l.parentNode;if("pre"===n.tagName.toLowerCase()){if(t.shiftKey)return;return i.msg("请暂时用shift+enter"),!1}r.execCommand("formatBlock",!1,"<p>")}}),e(n).parents("form").on("submit",function(){var t=c.html();8==l.ie&&(t=t.replace(/<.+>/g,function(t){return t.toLowerCase()})),n.value=t}),c.on("paste",function(e){r.execCommand("formatBlock",!1,"<p>"),setTimeout(function(){f.call(t,c),n.value=c.html()},100)})},f=function(t){var i=this;i.document;t.find("*[style]").each(function(){var t=this.style.textAlign;this.removeAttribute("style"),e(this).css({"text-align":t||""})}),t.find("table").addClass("layui-table"),t.find("script,link").remove()},m=function(t){return t.selection?t.selection.createRange():t.getSelection().getRangeAt(0)},p=function(t){return t.endContainer||t.parentElement().childNodes[0]},v=function(t,i,a){var l=this.document,n=document.createElement(t);for(var o in i)n.setAttribute(o,i[o]);if(n.removeAttribute("text"),l.selection){var r=a.text||i.text;if("a"===t&&!r)return;r&&(n.innerHTML=r),a.pasteHTML(e(n).prop("outerHTML")),a.select()}else{var r=a.toString()||i.text;if("a"===t&&!r)return;r&&(n.innerHTML=r),a.deleteContents(),a.insertNode(n)}},h=function(t,i){var a=this.document,l="layedit-tool-active",n=p(m(a)),o=function(e){return t.find(".layedit-tool-"+e)};i&&i[i.hasClass(l)?"removeClass":"addClass"](l),t.find(">i").removeClass(l),o("unlink").addClass(r),e(n).parents().each(function(){var t=this.tagName.toLowerCase(),e=this.style.textAlign;"b"!==t&&"strong"!==t||o("b").addClass(l),"i"!==t&&"em"!==t||o("i").addClass(l),"u"===t&&o("u").addClass(l),"strike"===t&&o("d").addClass(l),"p"===t&&("center"===e?o("center").addClass(l):"right"===e?o("right").addClass(l):o("left").addClass(l)),"a"===t&&(o("link").addClass(l),o("unlink").removeClass(r))})},g=function(t,a,l){var n=t.document,o=e(n.body),c={link:function(i){var a=p(i),l=e(a).parent();b.call(o,{href:l.attr("href"),target:l.attr("target")},function(e){var a=l[0];"A"===a.tagName?a.href=e.url:v.call(t,"a",{target:e.target,href:e.url,text:e.url},i)})},unlink:function(t){n.execCommand("unlink")},face:function(e){x.call(this,function(i){v.call(t,"img",{src:i.src,alt:i.alt},e)})},image:function(a){var n=this;layui.use("upload",function(o){var r=l.uploadImage||{};o.render({url:r.url,method:r.type,elem:e(n).find("input")[0],done:function(e){0==e.code?(e.data=e.data||{},v.call(t,"img",{src:e.data.src,alt:e.data.title},a)):i.msg(e.msg||"上传失败")}})})},code:function(e){k.call(o,function(i){v.call(t,"pre",{text:i.code,"lay-lang":i.lang},e)})},help:function(){i.open({type:2,title:"帮助",area:["600px","380px"],shadeClose:!0,shade:.1,skin:"layui-layer-msg",content:["http://www.layui.com/about/layedit/help.html","no"]})}},s=a.find(".layui-layedit-tool"),u=function(){var i=e(this),a=i.attr("layedit-event"),l=i.attr("lay-command");if(!i.hasClass(r)){o.focus();var u=m(n);u.commonAncestorContainer;l?(n.execCommand(l),/justifyLeft|justifyCenter|justifyRight/.test(l)&&n.execCommand("formatBlock",!1,"<p>"),setTimeout(function(){o.focus()},10)):c[a]&&c[a].call(this,u),h.call(t,s,i)}},d=/image/;s.find(">i").on("mousedown",function(){var t=e(this),i=t.attr("layedit-event");d.test(i)||u.call(this)}).on("click",function(){var t=e(this),i=t.attr("layedit-event");d.test(i)&&u.call(this)}),o.on("click",function(){h.call(t,s),i.close(x.index)})},b=function(t,e){var l=this,n=i.open({type:1,id:"LAY_layedit_link",area:"350px",shade:.05,shadeClose:!0,moveType:1,title:"超链接",skin:"layui-layer-msg",content:['<ul class="layui-form" style="margin: 15px;">','<li class="layui-form-item">','<label class="layui-form-label" style="width: 60px;">URL</label>','<div class="layui-input-block" style="margin-left: 90px">','<input name="url" lay-verify="url" value="'+(t.href||"")+'" autofocus="true" autocomplete="off" class="layui-input">',"</div>","</li>",'<li class="layui-form-item">','<label class="layui-form-label" style="width: 60px;">打开方式</label>','<div class="layui-input-block" style="margin-left: 90px">','<input type="radio" name="target" value="_self" class="layui-input" title="当前窗口"'+("_self"!==t.target&&t.target?"":"checked")+">",'<input type="radio" name="target" value="_blank" class="layui-input" title="新窗口" '+("_blank"===t.target?"checked":"")+">","</div>","</li>",'<li class="layui-form-item" style="text-align: center;">','<button type="button" lay-submit lay-filter="layedit-link-yes" class="layui-btn"> 确定 </button>','<button style="margin-left: 20px;" type="button" class="layui-btn layui-btn-primary"> 取消 </button>',"</li>","</ul>"].join(""),success:function(t,n){var o="submit(layedit-link-yes)";a.render("radio"),t.find(".layui-btn-primary").on("click",function(){i.close(n),l.focus()}),a.on(o,function(t){i.close(b.index),e&&e(t.field)})}});b.index=n},x=function(t){var a=function(){var t=["[微笑]","[嘻嘻]","[哈哈]","[可爱]","[可怜]","[挖鼻]","[吃惊]","[害羞]","[挤眼]","[闭嘴]","[鄙视]","[爱你]","[泪]","[偷笑]","[亲亲]","[生病]","[太开心]","[白眼]","[右哼哼]","[左哼哼]","[嘘]","[衰]","[委屈]","[吐]","[哈欠]","[抱抱]","[怒]","[疑问]","[馋嘴]","[拜拜]","[思考]","[汗]","[困]","[睡]","[钱]","[失望]","[酷]","[色]","[哼]","[鼓掌]","[晕]","[悲伤]","[抓狂]","[黑线]","[阴险]","[怒骂]","[互粉]","[心]","[伤心]","[猪头]","[熊猫]","[兔子]","[ok]","[耶]","[good]","[NO]","[赞]","[来]","[弱]","[草泥马]","[神马]","[囧]","[浮云]","[给力]","[围观]","[威武]","[奥特曼]","[礼物]","[钟]","[话筒]","[蜡烛]","[蛋糕]"],e={};return layui.each(t,function(t,i){e[i]=layui.cache.dir+"images/face/"+t+".gif"}),e}();return x.hide=x.hide||function(t){"face"!==e(t.target).attr("layedit-event")&&i.close(x.index)},x.index=i.tips(function(){var t=[];return layui.each(a,function(e,i){t.push('<li title="'+e+'"><img src="'+i+'" alt="'+e+'"></li>')}),'<ul class="layui-clear">'+t.join("")+"</ul>"}(),this,{tips:1,time:0,skin:"layui-box layui-util-face",maxWidth:500,success:function(l,n){l.css({marginTop:-4,marginLeft:-10}).find(".layui-clear>li").on("click",function(){t&&t({src:a[this.title],alt:this.title}),i.close(n)}),e(document).off("click",x.hide).on("click",x.hide)}})},k=function(t){var e=this,l=i.open({type:1,id:"LAY_layedit_code",area:"550px",shade:.05,shadeClose:!0,moveType:1,title:"插入代码",skin:"layui-layer-msg",content:['<ul class="layui-form layui-form-pane" style="margin: 15px;">','<li class="layui-form-item">','<label class="layui-form-label">请选择语言</label>','<div class="layui-input-block">','<select name="lang">','<option value="JavaScript">JavaScript</option>','<option value="HTML">HTML</option>','<option value="CSS">CSS</option>','<option value="Java">Java</option>','<option value="PHP">PHP</option>','<option value="C#">C#</option>','<option value="Python">Python</option>','<option value="Ruby">Ruby</option>','<option value="Go">Go</option>',"</select>","</div>","</li>",'<li class="layui-form-item layui-form-text">','<label class="layui-form-label">代码</label>','<div class="layui-input-block">','<textarea name="code" lay-verify="required" autofocus="true" class="layui-textarea" style="height: 200px;"></textarea>',"</div>","</li>",'<li class="layui-form-item" style="text-align: center;">','<button type="button" lay-submit lay-filter="layedit-code-yes" class="layui-btn"> 确定 </button>','<button style="margin-left: 20px;" type="button" class="layui-btn layui-btn-primary"> 取消 </button>',"</li>","</ul>"].join(""),success:function(l,n){var o="submit(layedit-code-yes)";a.render("select"),l.find(".layui-btn-primary").on("click",function(){i.close(n),e.focus()}),a.on(o,function(e){i.close(k.index),t&&t(e.field)})}});k.index=l},C={html:'<i class="layui-icon layedit-tool-html" title="HTML源代码" lay-command="html" layedit-event="html"">&#xe64b;</i><span class="layedit-tool-mid"></span>',strong:'<i class="layui-icon layedit-tool-b" title="加粗" lay-command="Bold" layedit-event="b"">&#xe62b;</i>',italic:'<i class="layui-icon layedit-tool-i" title="斜体" lay-command="italic" layedit-event="i"">&#xe644;</i>',underline:'<i class="layui-icon layedit-tool-u" title="下划线" lay-command="underline" layedit-event="u"">&#xe646;</i>',del:'<i class="layui-icon layedit-tool-d" title="删除线" lay-command="strikeThrough" layedit-event="d"">&#xe64f;</i>',"|":'<span class="layedit-tool-mid"></span>',left:'<i class="layui-icon layedit-tool-left" title="左对齐" lay-command="justifyLeft" layedit-event="left"">&#xe649;</i>',center:'<i class="layui-icon layedit-tool-center" title="居中对齐" lay-command="justifyCenter" layedit-event="center"">&#xe647;</i>',right:'<i class="layui-icon layedit-tool-right" title="右对齐" lay-command="justifyRight" layedit-event="right"">&#xe648;</i>',link:'<i class="layui-icon layedit-tool-link" title="插入链接" layedit-event="link"">&#xe64c;</i>',unlink:'<i class="layui-icon layedit-tool-unlink layui-disabled" title="清除链接" lay-command="unlink" layedit-event="unlink"">&#xe64d;</i>',face:'<i class="layui-icon layedit-tool-face" title="表情" layedit-event="face"">&#xe650;</i>',image:'<i class="layui-icon layedit-tool-image" title="图片" layedit-event="image">&#xe64a;<input type="file" name="file"></i>',code:'<i class="layui-icon layedit-tool-code" title="插入代码" layedit-event="code">&#xe64e;</i>',help:'<i class="layui-icon layedit-tool-help" title="帮助" layedit-event="help">&#xe607;</i>'},w=new c;t(n,w)});
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/login/lay/modules/layer.js b/pluss-manage-page/src/main/resources/static/resources/auth/js/login/lay/modules/layer.js
new file mode 100644
index 0000000..c6d5378
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/login/lay/modules/layer.js
@@ -0,0 +1,2 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ ;!function(e,t){"use strict";var i,n,a=e.layui&&layui.define,o={getPath:function(){var e=document.currentScript?document.currentScript.src:function(){for(var e,t=document.scripts,i=t.length-1,n=i;n>0;n--)if("interactive"===t[n].readyState){e=t[n].src;break}return e||t[i].src}();return e.substring(0,e.lastIndexOf("/")+1)}(),config:{},end:{},minIndex:0,minLeft:[],btn:["&#x786E;&#x5B9A;","&#x53D6;&#x6D88;"],type:["dialog","page","iframe","loading","tips"],getStyle:function(t,i){var n=t.currentStyle?t.currentStyle:e.getComputedStyle(t,null);return n[n.getPropertyValue?"getPropertyValue":"getAttribute"](i)},link:function(t,i,n){if(r.path){var a=document.getElementsByTagName("head")[0],s=document.createElement("link");"string"==typeof i&&(n=i);var l=(n||t).replace(/\.|\//g,""),f="layuicss-"+l,c=0;s.rel="stylesheet",s.href=r.path+t,s.id=f,document.getElementById(f)||a.appendChild(s),"function"==typeof i&&!function u(){return++c>80?e.console&&console.error("layer.css: Invalid"):void(1989===parseInt(o.getStyle(document.getElementById(f),"width"))?i():setTimeout(u,100))}()}}},r={v:"3.1.1",ie:function(){var t=navigator.userAgent.toLowerCase();return!!(e.ActiveXObject||"ActiveXObject"in e)&&((t.match(/msie\s(\d+)/)||[])[1]||"11")}(),index:e.layer&&e.layer.v?1e5:0,path:o.getPath,config:function(e,t){return e=e||{},r.cache=o.config=i.extend({},o.config,e),r.path=o.config.path||r.path,"string"==typeof e.extend&&(e.extend=[e.extend]),o.config.path&&r.ready(),e.extend?(a?layui.addcss("modules/layer/"+e.extend):o.link("theme/"+e.extend),this):this},ready:function(e){var t="layer",i="",n=(a?"modules/layer/":"theme/")+"default/layer.css?v="+r.v+i;return a?layui.addcss(n,e,t):o.link(n,e,t),this},alert:function(e,t,n){var a="function"==typeof t;return a&&(n=t),r.open(i.extend({content:e,yes:n},a?{}:t))},confirm:function(e,t,n,a){var s="function"==typeof t;return s&&(a=n,n=t),r.open(i.extend({content:e,btn:o.btn,yes:n,btn2:a},s?{}:t))},msg:function(e,n,a){var s="function"==typeof n,f=o.config.skin,c=(f?f+" "+f+"-msg":"")||"layui-layer-msg",u=l.anim.length-1;return s&&(a=n),r.open(i.extend({content:e,time:3e3,shade:!1,skin:c,title:!1,closeBtn:!1,btn:!1,resize:!1,end:a},s&&!o.config.skin?{skin:c+" layui-layer-hui",anim:u}:function(){return n=n||{},(n.icon===-1||n.icon===t&&!o.config.skin)&&(n.skin=c+" "+(n.skin||"layui-layer-hui")),n}()))},load:function(e,t){return r.open(i.extend({type:3,icon:e||0,resize:!1,shade:.01},t))},tips:function(e,t,n){return r.open(i.extend({type:4,content:[e,t],closeBtn:!1,time:3e3,shade:!1,resize:!1,fixed:!1,maxWidth:210},n))}},s=function(e){var t=this;t.index=++r.index,t.config=i.extend({},t.config,o.config,e),document.body?t.creat():setTimeout(function(){t.creat()},30)};s.pt=s.prototype;var l=["layui-layer",".layui-layer-title",".layui-layer-main",".layui-layer-dialog","layui-layer-iframe","layui-layer-content","layui-layer-btn","layui-layer-close"];l.anim=["layer-anim-00","layer-anim-01","layer-anim-02","layer-anim-03","layer-anim-04","layer-anim-05","layer-anim-06"],s.pt.config={type:0,shade:.3,fixed:!0,move:l[1],title:"&#x4FE1;&#x606F;",offset:"auto",area:"auto",closeBtn:1,time:0,zIndex:19891014,maxWidth:360,anim:0,isOutAnim:!0,icon:-1,moveType:1,resize:!0,scrollbar:!0,tips:2},s.pt.vessel=function(e,t){var n=this,a=n.index,r=n.config,s=r.zIndex+a,f="object"==typeof r.title,c=r.maxmin&&(1===r.type||2===r.type),u=r.title?'<div class="layui-layer-title" style="'+(f?r.title[1]:"")+'">'+(f?r.title[0]:r.title)+"</div>":"";return r.zIndex=s,t([r.shade?'<div class="layui-layer-shade" id="layui-layer-shade'+a+'" times="'+a+'" style="'+("z-index:"+(s-1)+"; ")+'"></div>':"",'<div class="'+l[0]+(" layui-layer-"+o.type[r.type])+(0!=r.type&&2!=r.type||r.shade?"":" layui-layer-border")+" "+(r.skin||"")+'" id="'+l[0]+a+'" type="'+o.type[r.type]+'" times="'+a+'" showtime="'+r.time+'" conType="'+(e?"object":"string")+'" style="z-index: '+s+"; width:"+r.area[0]+";height:"+r.area[1]+(r.fixed?"":";position:absolute;")+'">'+(e&&2!=r.type?"":u)+'<div id="'+(r.id||"")+'" class="layui-layer-content'+(0==r.type&&r.icon!==-1?" layui-layer-padding":"")+(3==r.type?" layui-layer-loading"+r.icon:"")+'">'+(0==r.type&&r.icon!==-1?'<i class="layui-layer-ico layui-layer-ico'+r.icon+'"></i>':"")+(1==r.type&&e?"":r.content||"")+'</div><span class="layui-layer-setwin">'+function(){var e=c?'<a class="layui-layer-min" href="javascript:;"><cite></cite></a><a class="layui-layer-ico layui-layer-max" href="javascript:;"></a>':"";return r.closeBtn&&(e+='<a class="layui-layer-ico '+l[7]+" "+l[7]+(r.title?r.closeBtn:4==r.type?"1":"2")+'" href="javascript:;"></a>'),e}()+"</span>"+(r.btn?function(){var e="";"string"==typeof r.btn&&(r.btn=[r.btn]);for(var t=0,i=r.btn.length;t<i;t++)e+='<a class="'+l[6]+t+'">'+r.btn[t]+"</a>";return'<div class="'+l[6]+" layui-layer-btn-"+(r.btnAlign||"")+'">'+e+"</div>"}():"")+(r.resize?'<span class="layui-layer-resize"></span>':"")+"</div>"],u,i('<div class="layui-layer-move"></div>')),n},s.pt.creat=function(){var e=this,t=e.config,a=e.index,s=t.content,f="object"==typeof s,c=i("body");if(!t.id||!i("#"+t.id)[0]){switch("string"==typeof t.area&&(t.area="auto"===t.area?["",""]:[t.area,""]),t.shift&&(t.anim=t.shift),6==r.ie&&(t.fixed=!1),t.type){case 0:t.btn="btn"in t?t.btn:o.btn[0],r.closeAll("dialog");break;case 2:var s=t.content=f?t.content:[t.content||"","auto"];t.content='<iframe scrolling="'+(t.content[1]||"auto")+'" allowtransparency="true" id="'+l[4]+a+'" name="'+l[4]+a+'" onload="this.className=\'\';" class="layui-layer-load" frameborder="0" src="'+t.content[0]+'"></iframe>';break;case 3:delete t.title,delete t.closeBtn,t.icon===-1&&0===t.icon,r.closeAll("loading");break;case 4:f||(t.content=[t.content,"body"]),t.follow=t.content[1],t.content=t.content[0]+'<i class="layui-layer-TipsG"></i>',delete t.title,t.tips="object"==typeof t.tips?t.tips:[t.tips,!0],t.tipsMore||r.closeAll("tips")}if(e.vessel(f,function(n,r,u){c.append(n[0]),f?function(){2==t.type||4==t.type?function(){i("body").append(n[1])}():function(){s.parents("."+l[0])[0]||(s.data("display",s.css("display")).show().addClass("layui-layer-wrap").wrap(n[1]),i("#"+l[0]+a).find("."+l[5]).before(r))}()}():c.append(n[1]),i(".layui-layer-move")[0]||c.append(o.moveElem=u),e.layero=i("#"+l[0]+a),t.scrollbar||l.html.css("overflow","hidden").attr("layer-full",a)}).auto(a),i("#layui-layer-shade"+e.index).css({"background-color":t.shade[1]||"#000",opacity:t.shade[0]||t.shade}),2==t.type&&6==r.ie&&e.layero.find("iframe").attr("src",s[0]),4==t.type?e.tips():e.offset(),t.fixed&&n.on("resize",function(){e.offset(),(/^\d+%$/.test(t.area[0])||/^\d+%$/.test(t.area[1]))&&e.auto(a),4==t.type&&e.tips()}),t.time<=0||setTimeout(function(){r.close(e.index)},t.time),e.move().callback(),l.anim[t.anim]){var u="layer-anim "+l.anim[t.anim];e.layero.addClass(u).one("webkitAnimationEnd mozAnimationEnd MSAnimationEnd oanimationend animationend",function(){i(this).removeClass(u)})}t.isOutAnim&&e.layero.data("isOutAnim",!0)}},s.pt.auto=function(e){var t=this,a=t.config,o=i("#"+l[0]+e);""===a.area[0]&&a.maxWidth>0&&(r.ie&&r.ie<8&&a.btn&&o.width(o.innerWidth()),o.outerWidth()>a.maxWidth&&o.width(a.maxWidth));var s=[o.innerWidth(),o.innerHeight()],f=o.find(l[1]).outerHeight()||0,c=o.find("."+l[6]).outerHeight()||0,u=function(e){e=o.find(e),e.height(s[1]-f-c-2*(0|parseFloat(e.css("padding-top"))))};switch(a.type){case 2:u("iframe");break;default:""===a.area[1]?a.maxHeight>0&&o.outerHeight()>a.maxHeight?(s[1]=a.maxHeight,u("."+l[5])):a.fixed&&s[1]>=n.height()&&(s[1]=n.height(),u("."+l[5])):u("."+l[5])}return t},s.pt.offset=function(){var e=this,t=e.config,i=e.layero,a=[i.outerWidth(),i.outerHeight()],o="object"==typeof t.offset;e.offsetTop=(n.height()-a[1])/2,e.offsetLeft=(n.width()-a[0])/2,o?(e.offsetTop=t.offset[0],e.offsetLeft=t.offset[1]||e.offsetLeft):"auto"!==t.offset&&("t"===t.offset?e.offsetTop=0:"r"===t.offset?e.offsetLeft=n.width()-a[0]:"b"===t.offset?e.offsetTop=n.height()-a[1]:"l"===t.offset?e.offsetLeft=0:"lt"===t.offset?(e.offsetTop=0,e.offsetLeft=0):"lb"===t.offset?(e.offsetTop=n.height()-a[1],e.offsetLeft=0):"rt"===t.offset?(e.offsetTop=0,e.offsetLeft=n.width()-a[0]):"rb"===t.offset?(e.offsetTop=n.height()-a[1],e.offsetLeft=n.width()-a[0]):e.offsetTop=t.offset),t.fixed||(e.offsetTop=/%$/.test(e.offsetTop)?n.height()*parseFloat(e.offsetTop)/100:parseFloat(e.offsetTop),e.offsetLeft=/%$/.test(e.offsetLeft)?n.width()*parseFloat(e.offsetLeft)/100:parseFloat(e.offsetLeft),e.offsetTop+=n.scrollTop(),e.offsetLeft+=n.scrollLeft()),i.attr("minLeft")&&(e.offsetTop=n.height()-(i.find(l[1]).outerHeight()||0),e.offsetLeft=i.css("left")),i.css({top:e.offsetTop,left:e.offsetLeft})},s.pt.tips=function(){var e=this,t=e.config,a=e.layero,o=[a.outerWidth(),a.outerHeight()],r=i(t.follow);r[0]||(r=i("body"));var s={width:r.outerWidth(),height:r.outerHeight(),top:r.offset().top,left:r.offset().left},f=a.find(".layui-layer-TipsG"),c=t.tips[0];t.tips[1]||f.remove(),s.autoLeft=function(){s.left+o[0]-n.width()>0?(s.tipLeft=s.left+s.width-o[0],f.css({right:12,left:"auto"})):s.tipLeft=s.left},s.where=[function(){s.autoLeft(),s.tipTop=s.top-o[1]-10,f.removeClass("layui-layer-TipsB").addClass("layui-layer-TipsT").css("border-right-color",t.tips[1])},function(){s.tipLeft=s.left+s.width+10,s.tipTop=s.top,f.removeClass("layui-layer-TipsL").addClass("layui-layer-TipsR").css("border-bottom-color",t.tips[1])},function(){s.autoLeft(),s.tipTop=s.top+s.height+10,f.removeClass("layui-layer-TipsT").addClass("layui-layer-TipsB").css("border-right-color",t.tips[1])},function(){s.tipLeft=s.left-o[0]-10,s.tipTop=s.top,f.removeClass("layui-layer-TipsR").addClass("layui-layer-TipsL").css("border-bottom-color",t.tips[1])}],s.where[c-1](),1===c?s.top-(n.scrollTop()+o[1]+16)<0&&s.where[2]():2===c?n.width()-(s.left+s.width+o[0]+16)>0||s.where[3]():3===c?s.top-n.scrollTop()+s.height+o[1]+16-n.height()>0&&s.where[0]():4===c&&o[0]+16-s.left>0&&s.where[1](),a.find("."+l[5]).css({"background-color":t.tips[1],"padding-right":t.closeBtn?"30px":""}),a.css({left:s.tipLeft-(t.fixed?n.scrollLeft():0),top:s.tipTop-(t.fixed?n.scrollTop():0)})},s.pt.move=function(){var e=this,t=e.config,a=i(document),s=e.layero,l=s.find(t.move),f=s.find(".layui-layer-resize"),c={};return t.move&&l.css("cursor","move"),l.on("mousedown",function(e){e.preventDefault(),t.move&&(c.moveStart=!0,c.offset=[e.clientX-parseFloat(s.css("left")),e.clientY-parseFloat(s.css("top"))],o.moveElem.css("cursor","move").show())}),f.on("mousedown",function(e){e.preventDefault(),c.resizeStart=!0,c.offset=[e.clientX,e.clientY],c.area=[s.outerWidth(),s.outerHeight()],o.moveElem.css("cursor","se-resize").show()}),a.on("mousemove",function(i){if(c.moveStart){var a=i.clientX-c.offset[0],o=i.clientY-c.offset[1],l="fixed"===s.css("position");if(i.preventDefault(),c.stX=l?0:n.scrollLeft(),c.stY=l?0:n.scrollTop(),!t.moveOut){var f=n.width()-s.outerWidth()+c.stX,u=n.height()-s.outerHeight()+c.stY;a<c.stX&&(a=c.stX),a>f&&(a=f),o<c.stY&&(o=c.stY),o>u&&(o=u)}s.css({left:a,top:o})}if(t.resize&&c.resizeStart){var a=i.clientX-c.offset[0],o=i.clientY-c.offset[1];i.preventDefault(),r.style(e.index,{width:c.area[0]+a,height:c.area[1]+o}),c.isResize=!0,t.resizing&&t.resizing(s)}}).on("mouseup",function(e){c.moveStart&&(delete c.moveStart,o.moveElem.hide(),t.moveEnd&&t.moveEnd(s)),c.resizeStart&&(delete c.resizeStart,o.moveElem.hide())}),e},s.pt.callback=function(){function e(){var e=a.cancel&&a.cancel(t.index,n);e===!1||r.close(t.index)}var t=this,n=t.layero,a=t.config;t.openLayer(),a.success&&(2==a.type?n.find("iframe").on("load",function(){a.success(n,t.index)}):a.success(n,t.index)),6==r.ie&&t.IE6(n),n.find("."+l[6]).children("a").on("click",function(){var e=i(this).index();if(0===e)a.yes?a.yes(t.index,n):a.btn1?a.btn1(t.index,n):r.close(t.index);else{var o=a["btn"+(e+1)]&&a["btn"+(e+1)](t.index,n);o===!1||r.close(t.index)}}),n.find("."+l[7]).on("click",e),a.shadeClose&&i("#layui-layer-shade"+t.index).on("click",function(){r.close(t.index)}),n.find(".layui-layer-min").on("click",function(){var e=a.min&&a.min(n);e===!1||r.min(t.index,a)}),n.find(".layui-layer-max").on("click",function(){i(this).hasClass("layui-layer-maxmin")?(r.restore(t.index),a.restore&&a.restore(n)):(r.full(t.index,a),setTimeout(function(){a.full&&a.full(n)},100))}),a.end&&(o.end[t.index]=a.end)},o.reselect=function(){i.each(i("select"),function(e,t){var n=i(this);n.parents("."+l[0])[0]||1==n.attr("layer")&&i("."+l[0]).length<1&&n.removeAttr("layer").show(),n=null})},s.pt.IE6=function(e){i("select").each(function(e,t){var n=i(this);n.parents("."+l[0])[0]||"none"===n.css("display")||n.attr({layer:"1"}).hide(),n=null})},s.pt.openLayer=function(){var e=this;r.zIndex=e.config.zIndex,r.setTop=function(e){var t=function(){r.zIndex++,e.css("z-index",r.zIndex+1)};return r.zIndex=parseInt(e[0].style.zIndex),e.on("mousedown",t),r.zIndex}},o.record=function(e){var t=[e.width(),e.height(),e.position().top,e.position().left+parseFloat(e.css("margin-left"))];e.find(".layui-layer-max").addClass("layui-layer-maxmin"),e.attr({area:t})},o.rescollbar=function(e){l.html.attr("layer-full")==e&&(l.html[0].style.removeProperty?l.html[0].style.removeProperty("overflow"):l.html[0].style.removeAttribute("overflow"),l.html.removeAttr("layer-full"))},e.layer=r,r.getChildFrame=function(e,t){return t=t||i("."+l[4]).attr("times"),i("#"+l[0]+t).find("iframe").contents().find(e)},r.getFrameIndex=function(e){return i("#"+e).parents("."+l[4]).attr("times")},r.iframeAuto=function(e){if(e){var t=r.getChildFrame("html",e).outerHeight(),n=i("#"+l[0]+e),a=n.find(l[1]).outerHeight()||0,o=n.find("."+l[6]).outerHeight()||0;n.css({height:t+a+o}),n.find("iframe").css({height:t})}},r.iframeSrc=function(e,t){i("#"+l[0]+e).find("iframe").attr("src",t)},r.style=function(e,t,n){var a=i("#"+l[0]+e),r=a.find(".layui-layer-content"),s=a.attr("type"),f=a.find(l[1]).outerHeight()||0,c=a.find("."+l[6]).outerHeight()||0;a.attr("minLeft");s!==o.type[3]&&s!==o.type[4]&&(n||(parseFloat(t.width)<=260&&(t.width=260),parseFloat(t.height)-f-c<=64&&(t.height=64+f+c)),a.css(t),c=a.find("."+l[6]).outerHeight(),s===o.type[2]?a.find("iframe").css({height:parseFloat(t.height)-f-c}):r.css({height:parseFloat(t.height)-f-c-parseFloat(r.css("padding-top"))-parseFloat(r.css("padding-bottom"))}))},r.min=function(e,t){var a=i("#"+l[0]+e),s=a.find(l[1]).outerHeight()||0,f=a.attr("minLeft")||181*o.minIndex+"px",c=a.css("position");o.record(a),o.minLeft[0]&&(f=o.minLeft[0],o.minLeft.shift()),a.attr("position",c),r.style(e,{width:180,height:s,left:f,top:n.height()-s,position:"fixed",overflow:"hidden"},!0),a.find(".layui-layer-min").hide(),"page"===a.attr("type")&&a.find(l[4]).hide(),o.rescollbar(e),a.attr("minLeft")||o.minIndex++,a.attr("minLeft",f)},r.restore=function(e){var t=i("#"+l[0]+e),n=t.attr("area").split(",");t.attr("type");r.style(e,{width:parseFloat(n[0]),height:parseFloat(n[1]),top:parseFloat(n[2]),left:parseFloat(n[3]),position:t.attr("position"),overflow:"visible"},!0),t.find(".layui-layer-max").removeClass("layui-layer-maxmin"),t.find(".layui-layer-min").show(),"page"===t.attr("type")&&t.find(l[4]).show(),o.rescollbar(e)},r.full=function(e){var t,a=i("#"+l[0]+e);o.record(a),l.html.attr("layer-full")||l.html.css("overflow","hidden").attr("layer-full",e),clearTimeout(t),t=setTimeout(function(){var t="fixed"===a.css("position");r.style(e,{top:t?0:n.scrollTop(),left:t?0:n.scrollLeft(),width:n.width(),height:n.height()},!0),a.find(".layui-layer-min").hide()},100)},r.title=function(e,t){var n=i("#"+l[0]+(t||r.index)).find(l[1]);n.html(e)},r.close=function(e){var t=i("#"+l[0]+e),n=t.attr("type"),a="layer-anim-close";if(t[0]){var s="layui-layer-wrap",f=function(){if(n===o.type[1]&&"object"===t.attr("conType")){t.children(":not(."+l[5]+")").remove();for(var a=t.find("."+s),r=0;r<2;r++)a.unwrap();a.css("display",a.data("display")).removeClass(s)}else{if(n===o.type[2])try{var f=i("#"+l[4]+e)[0];f.contentWindow.document.write(""),f.contentWindow.close(),t.find("."+l[5])[0].removeChild(f)}catch(c){}t[0].innerHTML="",t.remove()}"function"==typeof o.end[e]&&o.end[e](),delete o.end[e]};t.data("isOutAnim")&&t.addClass("layer-anim "+a),i("#layui-layer-moves, #layui-layer-shade"+e).remove(),6==r.ie&&o.reselect(),o.rescollbar(e),t.attr("minLeft")&&(o.minIndex--,o.minLeft.push(t.attr("minLeft"))),r.ie&&r.ie<10||!t.data("isOutAnim")?f():setTimeout(function(){f()},200)}},r.closeAll=function(e){i.each(i("."+l[0]),function(){var t=i(this),n=e?t.attr("type")===e:1;n&&r.close(t.attr("times")),n=null})};var f=r.cache||{},c=function(e){return f.skin?" "+f.skin+" "+f.skin+"-"+e:""};r.prompt=function(e,t){var a="";if(e=e||{},"function"==typeof e&&(t=e),e.area){var o=e.area;a='style="width: '+o[0]+"; height: "+o[1]+';"',delete e.area}var s,l=2==e.formType?'<textarea class="layui-layer-input"'+a+"></textarea>":function(){return'<input type="'+(1==e.formType?"password":"text")+'" class="layui-layer-input">'}(),f=e.success;return delete e.success,r.open(i.extend({type:1,btn:["&#x786E;&#x5B9A;","&#x53D6;&#x6D88;"],content:l,skin:"layui-layer-prompt"+c("prompt"),maxWidth:n.width(),success:function(t){s=t.find(".layui-layer-input"),s.val(e.value||"").focus(),"function"==typeof f&&f(t)},resize:!1,yes:function(i){var n=s.val();""===n?s.focus():n.length>(e.maxlength||500)?r.tips("&#x6700;&#x591A;&#x8F93;&#x5165;"+(e.maxlength||500)+"&#x4E2A;&#x5B57;&#x6570;",s,{tips:1}):t&&t(n,i,s)}},e))},r.tab=function(e){e=e||{};var t=e.tab||{},n="layui-this",a=e.success;return delete e.success,r.open(i.extend({type:1,skin:"layui-layer-tab"+c("tab"),resize:!1,title:function(){var e=t.length,i=1,a="";if(e>0)for(a='<span class="'+n+'">'+t[0].title+"</span>";i<e;i++)a+="<span>"+t[i].title+"</span>";return a}(),content:'<ul class="layui-layer-tabmain">'+function(){var e=t.length,i=1,a="";if(e>0)for(a='<li class="layui-layer-tabli '+n+'">'+(t[0].content||"no content")+"</li>";i<e;i++)a+='<li class="layui-layer-tabli">'+(t[i].content||"no  content")+"</li>";return a}()+"</ul>",success:function(t){var o=t.find(".layui-layer-title").children(),r=t.find(".layui-layer-tabmain").children();o.on("mousedown",function(t){t.stopPropagation?t.stopPropagation():t.cancelBubble=!0;var a=i(this),o=a.index();a.addClass(n).siblings().removeClass(n),r.eq(o).show().siblings().hide(),"function"==typeof e.change&&e.change(o)}),"function"==typeof a&&a(t)}},e))},r.photos=function(t,n,a){function o(e,t,i){var n=new Image;return n.src=e,n.complete?t(n):(n.onload=function(){n.onload=null,t(n)},void(n.onerror=function(e){n.onerror=null,i(e)}))}var s={};if(t=t||{},t.photos){var l=t.photos.constructor===Object,f=l?t.photos:{},u=f.data||[],d=f.start||0;s.imgIndex=(0|d)+1,t.img=t.img||"img";var y=t.success;if(delete t.success,l){if(0===u.length)return r.msg("&#x6CA1;&#x6709;&#x56FE;&#x7247;")}else{var p=i(t.photos),h=function(){u=[],p.find(t.img).each(function(e){var t=i(this);t.attr("layer-index",e),u.push({alt:t.attr("alt"),pid:t.attr("layer-pid"),src:t.attr("layer-src")||t.attr("src"),thumb:t.attr("src")})})};if(h(),0===u.length)return;if(n||p.on("click",t.img,function(){var e=i(this),n=e.attr("layer-index");r.photos(i.extend(t,{photos:{start:n,data:u,tab:t.tab},full:t.full}),!0),h()}),!n)return}s.imgprev=function(e){s.imgIndex--,s.imgIndex<1&&(s.imgIndex=u.length),s.tabimg(e)},s.imgnext=function(e,t){s.imgIndex++,s.imgIndex>u.length&&(s.imgIndex=1,t)||s.tabimg(e)},s.keyup=function(e){if(!s.end){var t=e.keyCode;e.preventDefault(),37===t?s.imgprev(!0):39===t?s.imgnext(!0):27===t&&r.close(s.index)}},s.tabimg=function(e){if(!(u.length<=1))return f.start=s.imgIndex-1,r.close(s.index),r.photos(t,!0,e)},s.event=function(){s.bigimg.hover(function(){s.imgsee.show()},function(){s.imgsee.hide()}),s.bigimg.find(".layui-layer-imgprev").on("click",function(e){e.preventDefault(),s.imgprev()}),s.bigimg.find(".layui-layer-imgnext").on("click",function(e){e.preventDefault(),s.imgnext()}),i(document).on("keyup",s.keyup)},s.loadi=r.load(1,{shade:!("shade"in t)&&.9,scrollbar:!1}),o(u[d].src,function(n){r.close(s.loadi),s.index=r.open(i.extend({type:1,id:"layui-layer-photos",area:function(){var a=[n.width,n.height],o=[i(e).width()-100,i(e).height()-100];if(!t.full&&(a[0]>o[0]||a[1]>o[1])){var r=[a[0]/o[0],a[1]/o[1]];r[0]>r[1]?(a[0]=a[0]/r[0],a[1]=a[1]/r[0]):r[0]<r[1]&&(a[0]=a[0]/r[1],a[1]=a[1]/r[1])}return[a[0]+"px",a[1]+"px"]}(),title:!1,shade:.9,shadeClose:!0,closeBtn:!1,move:".layui-layer-phimg img",moveType:1,scrollbar:!1,moveOut:!0,isOutAnim:!1,skin:"layui-layer-photos"+c("photos"),content:'<div class="layui-layer-phimg"><img src="'+u[d].src+'" alt="'+(u[d].alt||"")+'" layer-pid="'+u[d].pid+'"><div class="layui-layer-imgsee">'+(u.length>1?'<span class="layui-layer-imguide"><a href="javascript:;" class="layui-layer-iconext layui-layer-imgprev"></a><a href="javascript:;" class="layui-layer-iconext layui-layer-imgnext"></a></span>':"")+'<div class="layui-layer-imgbar" style="display:'+(a?"block":"")+'"><span class="layui-layer-imgtit"><a href="javascript:;">'+(u[d].alt||"")+"</a><em>"+s.imgIndex+"/"+u.length+"</em></span></div></div></div>",success:function(e,i){s.bigimg=e.find(".layui-layer-phimg"),s.imgsee=e.find(".layui-layer-imguide,.layui-layer-imgbar"),s.event(e),t.tab&&t.tab(u[d],e),"function"==typeof y&&y(e)},end:function(){s.end=!0,i(document).off("keyup",s.keyup)}},t))},function(){r.close(s.loadi),r.msg("&#x5F53;&#x524D;&#x56FE;&#x7247;&#x5730;&#x5740;&#x5F02;&#x5E38;<br>&#x662F;&#x5426;&#x7EE7;&#x7EED;&#x67E5;&#x770B;&#x4E0B;&#x4E00;&#x5F20;&#xFF1F;",{time:3e4,btn:["&#x4E0B;&#x4E00;&#x5F20;","&#x4E0D;&#x770B;&#x4E86;"],yes:function(){u.length>1&&s.imgnext(!0,!0)}})})}},o.run=function(t){i=t,n=i(e),l.html=i("html"),r.open=function(e){var t=new s(e);return t.index}},e.layui&&layui.define?(r.ready(),layui.define("jquery",function(t){r.path=layui.cache.dir,o.run(layui.$),e.layer=r,t("layer",r)})):"function"==typeof define&&define.amd?define(["jquery"],function(){return o.run(e.jQuery),r}):function(){o.run(e.jQuery),r.ready()}()}(window);
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/login/lay/modules/laypage.js b/pluss-manage-page/src/main/resources/static/resources/auth/js/login/lay/modules/laypage.js
new file mode 100644
index 0000000..fd07fda
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/login/lay/modules/laypage.js
@@ -0,0 +1,2 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ ;layui.define(function(e){"use strict";var a=document,t="getElementById",n="getElementsByTagName",i="laypage",r="layui-disabled",u=function(e){var a=this;a.config=e||{},a.config.index=++s.index,a.render(!0)};u.prototype.type=function(){var e=this.config;if("object"==typeof e.elem)return void 0===e.elem.length?2:3},u.prototype.view=function(){var e=this,a=e.config,t=a.groups="groups"in a?0|a.groups:5;a.layout="object"==typeof a.layout?a.layout:["prev","page","next"],a.count=0|a.count,a.curr=0|a.curr||1,a.limits="object"==typeof a.limits?a.limits:[10,20,30,40,50],a.limit=0|a.limit||10,a.pages=Math.ceil(a.count/a.limit)||1,a.curr>a.pages&&(a.curr=a.pages),t<0?t=1:t>a.pages&&(t=a.pages),a.prev="prev"in a?a.prev:"&#x4E0A;&#x4E00;&#x9875;",a.next="next"in a?a.next:"&#x4E0B;&#x4E00;&#x9875;";var n=a.pages>t?Math.ceil((a.curr+(t>1?1:0))/(t>0?t:1)):1,i={prev:function(){return a.prev?'<a href="javascript:;" class="layui-laypage-prev'+(1==a.curr?" "+r:"")+'" data-page="'+(a.curr-1)+'">'+a.prev+"</a>":""}(),page:function(){var e=[];if(a.count<1)return"";n>1&&a.first!==!1&&0!==t&&e.push('<a href="javascript:;" class="layui-laypage-first" data-page="1"  title="&#x9996;&#x9875;">'+(a.first||1)+"</a>");var i=Math.floor((t-1)/2),r=n>1?a.curr-i:1,u=n>1?function(){var e=a.curr+(t-i-1);return e>a.pages?a.pages:e}():t;for(u-r<t-1&&(r=u-t+1),a.first!==!1&&r>2&&e.push('<span class="layui-laypage-spr">&#x2026;</span>');r<=u;r++)r===a.curr?e.push('<span class="layui-laypage-curr"><em class="layui-laypage-em" '+(/^#/.test(a.theme)?'style="background-color:'+a.theme+';"':"")+"></em><em>"+r+"</em></span>"):e.push('<a href="javascript:;" data-page="'+r+'">'+r+"</a>");return a.pages>t&&a.pages>u&&a.last!==!1&&(u+1<a.pages&&e.push('<span class="layui-laypage-spr">&#x2026;</span>'),0!==t&&e.push('<a href="javascript:;" class="layui-laypage-last" title="&#x5C3E;&#x9875;"  data-page="'+a.pages+'">'+(a.last||a.pages)+"</a>")),e.join("")}(),next:function(){return a.next?'<a href="javascript:;" class="layui-laypage-next'+(a.curr==a.pages?" "+r:"")+'" data-page="'+(a.curr+1)+'">'+a.next+"</a>":""}(),count:'<span class="layui-laypage-count">共 '+a.count+" 条</span>",limit:function(){var e=['<span class="layui-laypage-limits"><select lay-ignore>'];return layui.each(a.limits,function(t,n){e.push('<option value="'+n+'"'+(n===a.limit?"selected":"")+">"+n+" 条/页</option>")}),e.join("")+"</select></span>"}(),refresh:['<a href="javascript:;" data-page="'+a.curr+'" class="layui-laypage-refresh">','<i class="layui-icon layui-icon-refresh"></i>',"</a>"].join(""),skip:function(){return['<span class="layui-laypage-skip">&#x5230;&#x7B2C;','<input type="text" min="1" value="'+a.curr+'" class="layui-input">','&#x9875;<button type="button" class="layui-laypage-btn">&#x786e;&#x5b9a;</button>',"</span>"].join("")}()};return['<div class="layui-box layui-laypage layui-laypage-'+(a.theme?/^#/.test(a.theme)?"molv":a.theme:"default")+'" id="layui-laypage-'+a.index+'">',function(){var e=[];return layui.each(a.layout,function(a,t){i[t]&&e.push(i[t])}),e.join("")}(),"</div>"].join("")},u.prototype.jump=function(e,a){if(e){var t=this,i=t.config,r=e.children,u=e[n]("button")[0],l=e[n]("input")[0],p=e[n]("select")[0],c=function(){var e=0|l.value.replace(/\s|\D/g,"");e&&(i.curr=e,t.render())};if(a)return c();for(var o=0,y=r.length;o<y;o++)"a"===r[o].nodeName.toLowerCase()&&s.on(r[o],"click",function(){var e=0|this.getAttribute("data-page");e<1||e>i.pages||(i.curr=e,t.render())});p&&s.on(p,"change",function(){var e=this.value;i.curr*e>i.count&&(i.curr=Math.ceil(i.count/e)),i.limit=e,t.render()}),u&&s.on(u,"click",function(){c()})}},u.prototype.skip=function(e){if(e){var a=this,t=e[n]("input")[0];t&&s.on(t,"keyup",function(t){var n=this.value,i=t.keyCode;/^(37|38|39|40)$/.test(i)||(/\D/.test(n)&&(this.value=n.replace(/\D/,"")),13===i&&a.jump(e,!0))})}},u.prototype.render=function(e){var n=this,i=n.config,r=n.type(),u=n.view();2===r?i.elem&&(i.elem.innerHTML=u):3===r?i.elem.html(u):a[t](i.elem)&&(a[t](i.elem).innerHTML=u),i.jump&&i.jump(i,e);var s=a[t]("layui-laypage-"+i.index);n.jump(s),i.hash&&!e&&(location.hash="!"+i.hash+"="+i.curr),n.skip(s)};var s={render:function(e){var a=new u(e);return a.index},index:layui.laypage?layui.laypage.index+1e4:0,on:function(e,a,t){return e.attachEvent?e.attachEvent("on"+a,function(a){a.target=a.srcElement,t.call(e,a)}):e.addEventListener(a,t,!1),this}};e(i,s)});
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/login/lay/modules/laytpl.js b/pluss-manage-page/src/main/resources/static/resources/auth/js/login/lay/modules/laytpl.js
new file mode 100644
index 0000000..d482d4e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/login/lay/modules/laytpl.js
@@ -0,0 +1,2 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ ;layui.define(function(e){"use strict";var r={open:"{{",close:"}}"},c={exp:function(e){return new RegExp(e,"g")},query:function(e,c,t){var o=["#([\\s\\S])+?","([^{#}])*?"][e||0];return n((c||"")+r.open+o+r.close+(t||""))},escape:function(e){return String(e||"").replace(/&(?!#?[a-zA-Z0-9]+;)/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/'/g,"&#39;").replace(/"/g,"&quot;")},error:function(e,r){var c="Laytpl Error：";return"object"==typeof console&&console.error(c+e+"\n"+(r||"")),c+e}},n=c.exp,t=function(e){this.tpl=e};t.pt=t.prototype,window.errors=0,t.pt.parse=function(e,t){var o=this,p=e,a=n("^"+r.open+"#",""),l=n(r.close+"$","");e=e.replace(/\s+|\r|\t|\n/g," ").replace(n(r.open+"#"),r.open+"# ").replace(n(r.close+"}"),"} "+r.close).replace(/\\/g,"\\\\").replace(n(r.open+"!(.+?)!"+r.close),function(e){return e=e.replace(n("^"+r.open+"!"),"").replace(n("!"+r.close),"").replace(n(r.open+"|"+r.close),function(e){return e.replace(/(.)/g,"\\$1")})}).replace(/(?="|')/g,"\\").replace(c.query(),function(e){return e=e.replace(a,"").replace(l,""),'";'+e.replace(/\\/g,"")+';view+="'}).replace(c.query(1),function(e){var c='"+(';return e.replace(/\s/g,"")===r.open+r.close?"":(e=e.replace(n(r.open+"|"+r.close),""),/^=/.test(e)&&(e=e.replace(/^=/,""),c='"+_escape_('),c+e.replace(/\\/g,"")+')+"')}),e='"use strict";var view = "'+e+'";return view;';try{return o.cache=e=new Function("d, _escape_",e),e(t,c.escape)}catch(u){return delete o.cache,c.error(u,p)}},t.pt.render=function(e,r){var n,t=this;return e?(n=t.cache?t.cache(e,c.escape):t.parse(t.tpl,e),r?void r(n):n):c.error("no data")};var o=function(e){return"string"!=typeof e?c.error("Template not found"):new t(e)};o.config=function(e){e=e||{};for(var c in e)r[c]=e[c]},o.v="1.2.0",e("laytpl",o)});
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/login/lay/modules/mobile.js b/pluss-manage-page/src/main/resources/static/resources/auth/js/login/lay/modules/mobile.js
new file mode 100644
index 0000000..35cfdf0
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/login/lay/modules/mobile.js
@@ -0,0 +1,2 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ ;layui.define(function(i){i("layui.mobile",layui.v)});layui.define(function(e){"use strict";var r={open:"{{",close:"}}"},c={exp:function(e){return new RegExp(e,"g")},query:function(e,c,t){var o=["#([\\s\\S])+?","([^{#}])*?"][e||0];return n((c||"")+r.open+o+r.close+(t||""))},escape:function(e){return String(e||"").replace(/&(?!#?[a-zA-Z0-9]+;)/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/'/g,"&#39;").replace(/"/g,"&quot;")},error:function(e,r){var c="Laytpl Error：";return"object"==typeof console&&console.error(c+e+"\n"+(r||"")),c+e}},n=c.exp,t=function(e){this.tpl=e};t.pt=t.prototype,window.errors=0,t.pt.parse=function(e,t){var o=this,p=e,a=n("^"+r.open+"#",""),l=n(r.close+"$","");e=e.replace(/\s+|\r|\t|\n/g," ").replace(n(r.open+"#"),r.open+"# ").replace(n(r.close+"}"),"} "+r.close).replace(/\\/g,"\\\\").replace(n(r.open+"!(.+?)!"+r.close),function(e){return e=e.replace(n("^"+r.open+"!"),"").replace(n("!"+r.close),"").replace(n(r.open+"|"+r.close),function(e){return e.replace(/(.)/g,"\\$1")})}).replace(/(?="|')/g,"\\").replace(c.query(),function(e){return e=e.replace(a,"").replace(l,""),'";'+e.replace(/\\/g,"")+';view+="'}).replace(c.query(1),function(e){var c='"+(';return e.replace(/\s/g,"")===r.open+r.close?"":(e=e.replace(n(r.open+"|"+r.close),""),/^=/.test(e)&&(e=e.replace(/^=/,""),c='"+_escape_('),c+e.replace(/\\/g,"")+')+"')}),e='"use strict";var view = "'+e+'";return view;';try{return o.cache=e=new Function("d, _escape_",e),e(t,c.escape)}catch(u){return delete o.cache,c.error(u,p)}},t.pt.render=function(e,r){var n,t=this;return e?(n=t.cache?t.cache(e,c.escape):t.parse(t.tpl,e),r?void r(n):n):c.error("no data")};var o=function(e){return"string"!=typeof e?c.error("Template not found"):new t(e)};o.config=function(e){e=e||{};for(var c in e)r[c]=e[c]},o.v="1.2.0",e("laytpl",o)});layui.define(function(e){"use strict";var t=(window,document),i="querySelectorAll",n="getElementsByClassName",a=function(e){return t[i](e)},s={type:0,shade:!0,shadeClose:!0,fixed:!0,anim:"scale"},l={extend:function(e){var t=JSON.parse(JSON.stringify(s));for(var i in e)t[i]=e[i];return t},timer:{},end:{}};l.touch=function(e,t){e.addEventListener("click",function(e){t.call(this,e)},!1)};var o=0,r=["layui-m-layer"],d=function(e){var t=this;t.config=l.extend(e),t.view()};d.prototype.view=function(){var e=this,i=e.config,s=t.createElement("div");e.id=s.id=r[0]+o,s.setAttribute("class",r[0]+" "+r[0]+(i.type||0)),s.setAttribute("index",o);var l=function(){var e="object"==typeof i.title;return i.title?'<h3 style="'+(e?i.title[1]:"")+'">'+(e?i.title[0]:i.title)+"</h3>":""}(),d=function(){"string"==typeof i.btn&&(i.btn=[i.btn]);var e,t=(i.btn||[]).length;return 0!==t&&i.btn?(e='<span yes type="1">'+i.btn[0]+"</span>",2===t&&(e='<span no type="0">'+i.btn[1]+"</span>"+e),'<div class="layui-m-layerbtn">'+e+"</div>"):""}();if(i.fixed||(i.top=i.hasOwnProperty("top")?i.top:100,i.style=i.style||"",i.style+=" top:"+(t.body.scrollTop+i.top)+"px"),2===i.type&&(i.content='<i></i><i class="layui-m-layerload"></i><i></i><p>'+(i.content||"")+"</p>"),i.skin&&(i.anim="up"),"msg"===i.skin&&(i.shade=!1),s.innerHTML=(i.shade?"<div "+("string"==typeof i.shade?'style="'+i.shade+'"':"")+' class="layui-m-layershade"></div>':"")+'<div class="layui-m-layermain" '+(i.fixed?"":'style="position:static;"')+'><div class="layui-m-layersection"><div class="layui-m-layerchild '+(i.skin?"layui-m-layer-"+i.skin+" ":"")+(i.className?i.className:"")+" "+(i.anim?"layui-m-anim-"+i.anim:"")+'" '+(i.style?'style="'+i.style+'"':"")+">"+l+'<div class="layui-m-layercont">'+i.content+"</div>"+d+"</div></div></div>",!i.type||2===i.type){var y=t[n](r[0]+i.type),u=y.length;u>=1&&c.close(y[0].getAttribute("index"))}document.body.appendChild(s);var m=e.elem=a("#"+e.id)[0];i.success&&i.success(m),e.index=o++,e.action(i,m)},d.prototype.action=function(e,t){var i=this;e.time&&(l.timer[i.index]=setTimeout(function(){c.close(i.index)},1e3*e.time));var a=function(){var t=this.getAttribute("type");0==t?(e.no&&e.no(),c.close(i.index)):e.yes?e.yes(i.index):c.close(i.index)};if(e.btn)for(var s=t[n]("layui-m-layerbtn")[0].children,o=s.length,r=0;r<o;r++)l.touch(s[r],a);if(e.shade&&e.shadeClose){var d=t[n]("layui-m-layershade")[0];l.touch(d,function(){c.close(i.index,e.end)})}e.end&&(l.end[i.index]=e.end)};var c={v:"2.0 m",index:o,open:function(e){var t=new d(e||{});return t.index},close:function(e){var i=a("#"+r[0]+e)[0];i&&(i.innerHTML="",t.body.removeChild(i),clearTimeout(l.timer[e]),delete l.timer[e],"function"==typeof l.end[e]&&l.end[e](),delete l.end[e])},closeAll:function(){for(var e=t[n](r[0]),i=0,a=e.length;i<a;i++)c.close(0|e[0].getAttribute("index"))}};e("layer-mobile",c)});layui.define(function(t){var e=function(){function t(t){return null==t?String(t):J[W.call(t)]||"object"}function e(e){return"function"==t(e)}function n(t){return null!=t&&t==t.window}function r(t){return null!=t&&t.nodeType==t.DOCUMENT_NODE}function i(e){return"object"==t(e)}function o(t){return i(t)&&!n(t)&&Object.getPrototypeOf(t)==Object.prototype}function a(t){var e=!!t&&"length"in t&&t.length,r=T.type(t);return"function"!=r&&!n(t)&&("array"==r||0===e||"number"==typeof e&&e>0&&e-1 in t)}function s(t){return A.call(t,function(t){return null!=t})}function u(t){return t.length>0?T.fn.concat.apply([],t):t}function c(t){return t.replace(/::/g,"/").replace(/([A-Z]+)([A-Z][a-z])/g,"$1_$2").replace(/([a-z\d])([A-Z])/g,"$1_$2").replace(/_/g,"-").toLowerCase()}function l(t){return t in F?F[t]:F[t]=new RegExp("(^|\\s)"+t+"(\\s|$)")}function f(t,e){return"number"!=typeof e||k[c(t)]?e:e+"px"}function h(t){var e,n;return $[t]||(e=L.createElement(t),L.body.appendChild(e),n=getComputedStyle(e,"").getPropertyValue("display"),e.parentNode.removeChild(e),"none"==n&&(n="block"),$[t]=n),$[t]}function p(t){return"children"in t?D.call(t.children):T.map(t.childNodes,function(t){if(1==t.nodeType)return t})}function d(t,e){var n,r=t?t.length:0;for(n=0;n<r;n++)this[n]=t[n];this.length=r,this.selector=e||""}function m(t,e,n){for(j in e)n&&(o(e[j])||Q(e[j]))?(o(e[j])&&!o(t[j])&&(t[j]={}),Q(e[j])&&!Q(t[j])&&(t[j]=[]),m(t[j],e[j],n)):e[j]!==E&&(t[j]=e[j])}function v(t,e){return null==e?T(t):T(t).filter(e)}function g(t,n,r,i){return e(n)?n.call(t,r,i):n}function y(t,e,n){null==n?t.removeAttribute(e):t.setAttribute(e,n)}function x(t,e){var n=t.className||"",r=n&&n.baseVal!==E;return e===E?r?n.baseVal:n:void(r?n.baseVal=e:t.className=e)}function b(t){try{return t?"true"==t||"false"!=t&&("null"==t?null:+t+""==t?+t:/^[\[\{]/.test(t)?T.parseJSON(t):t):t}catch(e){return t}}function w(t,e){e(t);for(var n=0,r=t.childNodes.length;n<r;n++)w(t.childNodes[n],e)}var E,j,T,S,C,N,O=[],P=O.concat,A=O.filter,D=O.slice,L=window.document,$={},F={},k={"column-count":1,columns:1,"font-weight":1,"line-height":1,opacity:1,"z-index":1,zoom:1},M=/^\s*<(\w+|!)[^>]*>/,R=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,z=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,Z=/^(?:body|html)$/i,q=/([A-Z])/g,H=["val","css","html","text","data","width","height","offset"],I=["after","prepend","before","append"],V=L.createElement("table"),_=L.createElement("tr"),B={tr:L.createElement("tbody"),tbody:V,thead:V,tfoot:V,td:_,th:_,"*":L.createElement("div")},U=/complete|loaded|interactive/,X=/^[\w-]*$/,J={},W=J.toString,Y={},G=L.createElement("div"),K={tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},Q=Array.isArray||function(t){return t instanceof Array};return Y.matches=function(t,e){if(!e||!t||1!==t.nodeType)return!1;var n=t.matches||t.webkitMatchesSelector||t.mozMatchesSelector||t.oMatchesSelector||t.matchesSelector;if(n)return n.call(t,e);var r,i=t.parentNode,o=!i;return o&&(i=G).appendChild(t),r=~Y.qsa(i,e).indexOf(t),o&&G.removeChild(t),r},C=function(t){return t.replace(/-+(.)?/g,function(t,e){return e?e.toUpperCase():""})},N=function(t){return A.call(t,function(e,n){return t.indexOf(e)==n})},Y.fragment=function(t,e,n){var r,i,a;return R.test(t)&&(r=T(L.createElement(RegExp.$1))),r||(t.replace&&(t=t.replace(z,"<$1></$2>")),e===E&&(e=M.test(t)&&RegExp.$1),e in B||(e="*"),a=B[e],a.innerHTML=""+t,r=T.each(D.call(a.childNodes),function(){a.removeChild(this)})),o(n)&&(i=T(r),T.each(n,function(t,e){H.indexOf(t)>-1?i[t](e):i.attr(t,e)})),r},Y.Z=function(t,e){return new d(t,e)},Y.isZ=function(t){return t instanceof Y.Z},Y.init=function(t,n){var r;if(!t)return Y.Z();if("string"==typeof t)if(t=t.trim(),"<"==t[0]&&M.test(t))r=Y.fragment(t,RegExp.$1,n),t=null;else{if(n!==E)return T(n).find(t);r=Y.qsa(L,t)}else{if(e(t))return T(L).ready(t);if(Y.isZ(t))return t;if(Q(t))r=s(t);else if(i(t))r=[t],t=null;else if(M.test(t))r=Y.fragment(t.trim(),RegExp.$1,n),t=null;else{if(n!==E)return T(n).find(t);r=Y.qsa(L,t)}}return Y.Z(r,t)},T=function(t,e){return Y.init(t,e)},T.extend=function(t){var e,n=D.call(arguments,1);return"boolean"==typeof t&&(e=t,t=n.shift()),n.forEach(function(n){m(t,n,e)}),t},Y.qsa=function(t,e){var n,r="#"==e[0],i=!r&&"."==e[0],o=r||i?e.slice(1):e,a=X.test(o);return t.getElementById&&a&&r?(n=t.getElementById(o))?[n]:[]:1!==t.nodeType&&9!==t.nodeType&&11!==t.nodeType?[]:D.call(a&&!r&&t.getElementsByClassName?i?t.getElementsByClassName(o):t.getElementsByTagName(e):t.querySelectorAll(e))},T.contains=L.documentElement.contains?function(t,e){return t!==e&&t.contains(e)}:function(t,e){for(;e&&(e=e.parentNode);)if(e===t)return!0;return!1},T.type=t,T.isFunction=e,T.isWindow=n,T.isArray=Q,T.isPlainObject=o,T.isEmptyObject=function(t){var e;for(e in t)return!1;return!0},T.isNumeric=function(t){var e=Number(t),n=typeof t;return null!=t&&"boolean"!=n&&("string"!=n||t.length)&&!isNaN(e)&&isFinite(e)||!1},T.inArray=function(t,e,n){return O.indexOf.call(e,t,n)},T.camelCase=C,T.trim=function(t){return null==t?"":String.prototype.trim.call(t)},T.uuid=0,T.support={},T.expr={},T.noop=function(){},T.map=function(t,e){var n,r,i,o=[];if(a(t))for(r=0;r<t.length;r++)n=e(t[r],r),null!=n&&o.push(n);else for(i in t)n=e(t[i],i),null!=n&&o.push(n);return u(o)},T.each=function(t,e){var n,r;if(a(t)){for(n=0;n<t.length;n++)if(e.call(t[n],n,t[n])===!1)return t}else for(r in t)if(e.call(t[r],r,t[r])===!1)return t;return t},T.grep=function(t,e){return A.call(t,e)},window.JSON&&(T.parseJSON=JSON.parse),T.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(t,e){J["[object "+e+"]"]=e.toLowerCase()}),T.fn={constructor:Y.Z,length:0,forEach:O.forEach,reduce:O.reduce,push:O.push,sort:O.sort,splice:O.splice,indexOf:O.indexOf,concat:function(){var t,e,n=[];for(t=0;t<arguments.length;t++)e=arguments[t],n[t]=Y.isZ(e)?e.toArray():e;return P.apply(Y.isZ(this)?this.toArray():this,n)},map:function(t){return T(T.map(this,function(e,n){return t.call(e,n,e)}))},slice:function(){return T(D.apply(this,arguments))},ready:function(t){return U.test(L.readyState)&&L.body?t(T):L.addEventListener("DOMContentLoaded",function(){t(T)},!1),this},get:function(t){return t===E?D.call(this):this[t>=0?t:t+this.length]},toArray:function(){return this.get()},size:function(){return this.length},remove:function(){return this.each(function(){null!=this.parentNode&&this.parentNode.removeChild(this)})},each:function(t){return O.every.call(this,function(e,n){return t.call(e,n,e)!==!1}),this},filter:function(t){return e(t)?this.not(this.not(t)):T(A.call(this,function(e){return Y.matches(e,t)}))},add:function(t,e){return T(N(this.concat(T(t,e))))},is:function(t){return this.length>0&&Y.matches(this[0],t)},not:function(t){var n=[];if(e(t)&&t.call!==E)this.each(function(e){t.call(this,e)||n.push(this)});else{var r="string"==typeof t?this.filter(t):a(t)&&e(t.item)?D.call(t):T(t);this.forEach(function(t){r.indexOf(t)<0&&n.push(t)})}return T(n)},has:function(t){return this.filter(function(){return i(t)?T.contains(this,t):T(this).find(t).size()})},eq:function(t){return t===-1?this.slice(t):this.slice(t,+t+1)},first:function(){var t=this[0];return t&&!i(t)?t:T(t)},last:function(){var t=this[this.length-1];return t&&!i(t)?t:T(t)},find:function(t){var e,n=this;return e=t?"object"==typeof t?T(t).filter(function(){var t=this;return O.some.call(n,function(e){return T.contains(e,t)})}):1==this.length?T(Y.qsa(this[0],t)):this.map(function(){return Y.qsa(this,t)}):T()},closest:function(t,e){var n=[],i="object"==typeof t&&T(t);return this.each(function(o,a){for(;a&&!(i?i.indexOf(a)>=0:Y.matches(a,t));)a=a!==e&&!r(a)&&a.parentNode;a&&n.indexOf(a)<0&&n.push(a)}),T(n)},parents:function(t){for(var e=[],n=this;n.length>0;)n=T.map(n,function(t){if((t=t.parentNode)&&!r(t)&&e.indexOf(t)<0)return e.push(t),t});return v(e,t)},parent:function(t){return v(N(this.pluck("parentNode")),t)},children:function(t){return v(this.map(function(){return p(this)}),t)},contents:function(){return this.map(function(){return this.contentDocument||D.call(this.childNodes)})},siblings:function(t){return v(this.map(function(t,e){return A.call(p(e.parentNode),function(t){return t!==e})}),t)},empty:function(){return this.each(function(){this.innerHTML=""})},pluck:function(t){return T.map(this,function(e){return e[t]})},show:function(){return this.each(function(){"none"==this.style.display&&(this.style.display=""),"none"==getComputedStyle(this,"").getPropertyValue("display")&&(this.style.display=h(this.nodeName))})},replaceWith:function(t){return this.before(t).remove()},wrap:function(t){var n=e(t);if(this[0]&&!n)var r=T(t).get(0),i=r.parentNode||this.length>1;return this.each(function(e){T(this).wrapAll(n?t.call(this,e):i?r.cloneNode(!0):r)})},wrapAll:function(t){if(this[0]){T(this[0]).before(t=T(t));for(var e;(e=t.children()).length;)t=e.first();T(t).append(this)}return this},wrapInner:function(t){var n=e(t);return this.each(function(e){var r=T(this),i=r.contents(),o=n?t.call(this,e):t;i.length?i.wrapAll(o):r.append(o)})},unwrap:function(){return this.parent().each(function(){T(this).replaceWith(T(this).children())}),this},clone:function(){return this.map(function(){return this.cloneNode(!0)})},hide:function(){return this.css("display","none")},toggle:function(t){return this.each(function(){var e=T(this);(t===E?"none"==e.css("display"):t)?e.show():e.hide()})},prev:function(t){return T(this.pluck("previousElementSibling")).filter(t||"*")},next:function(t){return T(this.pluck("nextElementSibling")).filter(t||"*")},html:function(t){return 0 in arguments?this.each(function(e){var n=this.innerHTML;T(this).empty().append(g(this,t,e,n))}):0 in this?this[0].innerHTML:null},text:function(t){return 0 in arguments?this.each(function(e){var n=g(this,t,e,this.textContent);this.textContent=null==n?"":""+n}):0 in this?this.pluck("textContent").join(""):null},attr:function(t,e){var n;return"string"!=typeof t||1 in arguments?this.each(function(n){if(1===this.nodeType)if(i(t))for(j in t)y(this,j,t[j]);else y(this,t,g(this,e,n,this.getAttribute(t)))}):0 in this&&1==this[0].nodeType&&null!=(n=this[0].getAttribute(t))?n:E},removeAttr:function(t){return this.each(function(){1===this.nodeType&&t.split(" ").forEach(function(t){y(this,t)},this)})},prop:function(t,e){return t=K[t]||t,1 in arguments?this.each(function(n){this[t]=g(this,e,n,this[t])}):this[0]&&this[0][t]},removeProp:function(t){return t=K[t]||t,this.each(function(){delete this[t]})},data:function(t,e){var n="data-"+t.replace(q,"-$1").toLowerCase(),r=1 in arguments?this.attr(n,e):this.attr(n);return null!==r?b(r):E},val:function(t){return 0 in arguments?(null==t&&(t=""),this.each(function(e){this.value=g(this,t,e,this.value)})):this[0]&&(this[0].multiple?T(this[0]).find("option").filter(function(){return this.selected}).pluck("value"):this[0].value)},offset:function(t){if(t)return this.each(function(e){var n=T(this),r=g(this,t,e,n.offset()),i=n.offsetParent().offset(),o={top:r.top-i.top,left:r.left-i.left};"static"==n.css("position")&&(o.position="relative"),n.css(o)});if(!this.length)return null;if(L.documentElement!==this[0]&&!T.contains(L.documentElement,this[0]))return{top:0,left:0};var e=this[0].getBoundingClientRect();return{left:e.left+window.pageXOffset,top:e.top+window.pageYOffset,width:Math.round(e.width),height:Math.round(e.height)}},css:function(e,n){if(arguments.length<2){var r=this[0];if("string"==typeof e){if(!r)return;return r.style[C(e)]||getComputedStyle(r,"").getPropertyValue(e)}if(Q(e)){if(!r)return;var i={},o=getComputedStyle(r,"");return T.each(e,function(t,e){i[e]=r.style[C(e)]||o.getPropertyValue(e)}),i}}var a="";if("string"==t(e))n||0===n?a=c(e)+":"+f(e,n):this.each(function(){this.style.removeProperty(c(e))});else for(j in e)e[j]||0===e[j]?a+=c(j)+":"+f(j,e[j])+";":this.each(function(){this.style.removeProperty(c(j))});return this.each(function(){this.style.cssText+=";"+a})},index:function(t){return t?this.indexOf(T(t)[0]):this.parent().children().indexOf(this[0])},hasClass:function(t){return!!t&&O.some.call(this,function(t){return this.test(x(t))},l(t))},addClass:function(t){return t?this.each(function(e){if("className"in this){S=[];var n=x(this),r=g(this,t,e,n);r.split(/\s+/g).forEach(function(t){T(this).hasClass(t)||S.push(t)},this),S.length&&x(this,n+(n?" ":"")+S.join(" "))}}):this},removeClass:function(t){return this.each(function(e){if("className"in this){if(t===E)return x(this,"");S=x(this),g(this,t,e,S).split(/\s+/g).forEach(function(t){S=S.replace(l(t)," ")}),x(this,S.trim())}})},toggleClass:function(t,e){return t?this.each(function(n){var r=T(this),i=g(this,t,n,x(this));i.split(/\s+/g).forEach(function(t){(e===E?!r.hasClass(t):e)?r.addClass(t):r.removeClass(t)})}):this},scrollTop:function(t){if(this.length){var e="scrollTop"in this[0];return t===E?e?this[0].scrollTop:this[0].pageYOffset:this.each(e?function(){this.scrollTop=t}:function(){this.scrollTo(this.scrollX,t)})}},scrollLeft:function(t){if(this.length){var e="scrollLeft"in this[0];return t===E?e?this[0].scrollLeft:this[0].pageXOffset:this.each(e?function(){this.scrollLeft=t}:function(){this.scrollTo(t,this.scrollY)})}},position:function(){if(this.length){var t=this[0],e=this.offsetParent(),n=this.offset(),r=Z.test(e[0].nodeName)?{top:0,left:0}:e.offset();return n.top-=parseFloat(T(t).css("margin-top"))||0,n.left-=parseFloat(T(t).css("margin-left"))||0,r.top+=parseFloat(T(e[0]).css("border-top-width"))||0,r.left+=parseFloat(T(e[0]).css("border-left-width"))||0,{top:n.top-r.top,left:n.left-r.left}}},offsetParent:function(){return this.map(function(){for(var t=this.offsetParent||L.body;t&&!Z.test(t.nodeName)&&"static"==T(t).css("position");)t=t.offsetParent;return t})}},T.fn.detach=T.fn.remove,["width","height"].forEach(function(t){var e=t.replace(/./,function(t){return t[0].toUpperCase()});T.fn[t]=function(i){var o,a=this[0];return i===E?n(a)?a["inner"+e]:r(a)?a.documentElement["scroll"+e]:(o=this.offset())&&o[t]:this.each(function(e){a=T(this),a.css(t,g(this,i,e,a[t]()))})}}),I.forEach(function(e,n){var r=n%2;T.fn[e]=function(){var e,i,o=T.map(arguments,function(n){var r=[];return e=t(n),"array"==e?(n.forEach(function(t){return t.nodeType!==E?r.push(t):T.zepto.isZ(t)?r=r.concat(t.get()):void(r=r.concat(Y.fragment(t)))}),r):"object"==e||null==n?n:Y.fragment(n)}),a=this.length>1;return o.length<1?this:this.each(function(t,e){i=r?e:e.parentNode,e=0==n?e.nextSibling:1==n?e.firstChild:2==n?e:null;var s=T.contains(L.documentElement,i);o.forEach(function(t){if(a)t=t.cloneNode(!0);else if(!i)return T(t).remove();i.insertBefore(t,e),s&&w(t,function(t){if(!(null==t.nodeName||"SCRIPT"!==t.nodeName.toUpperCase()||t.type&&"text/javascript"!==t.type||t.src)){var e=t.ownerDocument?t.ownerDocument.defaultView:window;e.eval.call(e,t.innerHTML)}})})})},T.fn[r?e+"To":"insert"+(n?"Before":"After")]=function(t){return T(t)[e](this),this}}),Y.Z.prototype=d.prototype=T.fn,Y.uniq=N,Y.deserializeValue=b,T.zepto=Y,T}();!function(t){function e(t){return t._zid||(t._zid=h++)}function n(t,n,o,a){if(n=r(n),n.ns)var s=i(n.ns);return(v[e(t)]||[]).filter(function(t){return t&&(!n.e||t.e==n.e)&&(!n.ns||s.test(t.ns))&&(!o||e(t.fn)===e(o))&&(!a||t.sel==a)})}function r(t){var e=(""+t).split(".");return{e:e[0],ns:e.slice(1).sort().join(" ")}}function i(t){return new RegExp("(?:^| )"+t.replace(" "," .* ?")+"(?: |$)")}function o(t,e){return t.del&&!y&&t.e in x||!!e}function a(t){return b[t]||y&&x[t]||t}function s(n,i,s,u,l,h,p){var d=e(n),m=v[d]||(v[d]=[]);i.split(/\s/).forEach(function(e){if("ready"==e)return t(document).ready(s);var i=r(e);i.fn=s,i.sel=l,i.e in b&&(s=function(e){var n=e.relatedTarget;if(!n||n!==this&&!t.contains(this,n))return i.fn.apply(this,arguments)}),i.del=h;var d=h||s;i.proxy=function(t){if(t=c(t),!t.isImmediatePropagationStopped()){t.data=u;var e=d.apply(n,t._args==f?[t]:[t].concat(t._args));return e===!1&&(t.preventDefault(),t.stopPropagation()),e}},i.i=m.length,m.push(i),"addEventListener"in n&&n.addEventListener(a(i.e),i.proxy,o(i,p))})}function u(t,r,i,s,u){var c=e(t);(r||"").split(/\s/).forEach(function(e){n(t,e,i,s).forEach(function(e){delete v[c][e.i],"removeEventListener"in t&&t.removeEventListener(a(e.e),e.proxy,o(e,u))})})}function c(e,n){return!n&&e.isDefaultPrevented||(n||(n=e),t.each(T,function(t,r){var i=n[t];e[t]=function(){return this[r]=w,i&&i.apply(n,arguments)},e[r]=E}),e.timeStamp||(e.timeStamp=Date.now()),(n.defaultPrevented!==f?n.defaultPrevented:"returnValue"in n?n.returnValue===!1:n.getPreventDefault&&n.getPreventDefault())&&(e.isDefaultPrevented=w)),e}function l(t){var e,n={originalEvent:t};for(e in t)j.test(e)||t[e]===f||(n[e]=t[e]);return c(n,t)}var f,h=1,p=Array.prototype.slice,d=t.isFunction,m=function(t){return"string"==typeof t},v={},g={},y="onfocusin"in window,x={focus:"focusin",blur:"focusout"},b={mouseenter:"mouseover",mouseleave:"mouseout"};g.click=g.mousedown=g.mouseup=g.mousemove="MouseEvents",t.event={add:s,remove:u},t.proxy=function(n,r){var i=2 in arguments&&p.call(arguments,2);if(d(n)){var o=function(){return n.apply(r,i?i.concat(p.call(arguments)):arguments)};return o._zid=e(n),o}if(m(r))return i?(i.unshift(n[r],n),t.proxy.apply(null,i)):t.proxy(n[r],n);throw new TypeError("expected function")},t.fn.bind=function(t,e,n){return this.on(t,e,n)},t.fn.unbind=function(t,e){return this.off(t,e)},t.fn.one=function(t,e,n,r){return this.on(t,e,n,r,1)};var w=function(){return!0},E=function(){return!1},j=/^([A-Z]|returnValue$|layer[XY]$|webkitMovement[XY]$)/,T={preventDefault:"isDefaultPrevented",stopImmediatePropagation:"isImmediatePropagationStopped",stopPropagation:"isPropagationStopped"};t.fn.delegate=function(t,e,n){return this.on(e,t,n)},t.fn.undelegate=function(t,e,n){return this.off(e,t,n)},t.fn.live=function(e,n){return t(document.body).delegate(this.selector,e,n),this},t.fn.die=function(e,n){return t(document.body).undelegate(this.selector,e,n),this},t.fn.on=function(e,n,r,i,o){var a,c,h=this;return e&&!m(e)?(t.each(e,function(t,e){h.on(t,n,r,e,o)}),h):(m(n)||d(i)||i===!1||(i=r,r=n,n=f),i!==f&&r!==!1||(i=r,r=f),i===!1&&(i=E),h.each(function(f,h){o&&(a=function(t){return u(h,t.type,i),i.apply(this,arguments)}),n&&(c=function(e){var r,o=t(e.target).closest(n,h).get(0);if(o&&o!==h)return r=t.extend(l(e),{currentTarget:o,liveFired:h}),(a||i).apply(o,[r].concat(p.call(arguments,1)))}),s(h,e,i,r,n,c||a)}))},t.fn.off=function(e,n,r){var i=this;return e&&!m(e)?(t.each(e,function(t,e){i.off(t,n,e)}),i):(m(n)||d(r)||r===!1||(r=n,n=f),r===!1&&(r=E),i.each(function(){u(this,e,r,n)}))},t.fn.trigger=function(e,n){return e=m(e)||t.isPlainObject(e)?t.Event(e):c(e),e._args=n,this.each(function(){e.type in x&&"function"==typeof this[e.type]?this[e.type]():"dispatchEvent"in this?this.dispatchEvent(e):t(this).triggerHandler(e,n)})},t.fn.triggerHandler=function(e,r){var i,o;return this.each(function(a,s){i=l(m(e)?t.Event(e):e),i._args=r,i.target=s,t.each(n(s,e.type||e),function(t,e){if(o=e.proxy(i),i.isImmediatePropagationStopped())return!1})}),o},"focusin focusout focus blur load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select keydown keypress keyup error".split(" ").forEach(function(e){t.fn[e]=function(t){return 0 in arguments?this.bind(e,t):this.trigger(e)}}),t.Event=function(t,e){m(t)||(e=t,t=e.type);var n=document.createEvent(g[t]||"Events"),r=!0;if(e)for(var i in e)"bubbles"==i?r=!!e[i]:n[i]=e[i];return n.initEvent(t,r,!0),c(n)}}(e),function(t){function e(e,n,r){var i=t.Event(n);return t(e).trigger(i,r),!i.isDefaultPrevented()}function n(t,n,r,i){if(t.global)return e(n||x,r,i)}function r(e){e.global&&0===t.active++&&n(e,null,"ajaxStart")}function i(e){e.global&&!--t.active&&n(e,null,"ajaxStop")}function o(t,e){var r=e.context;return e.beforeSend.call(r,t,e)!==!1&&n(e,r,"ajaxBeforeSend",[t,e])!==!1&&void n(e,r,"ajaxSend",[t,e])}function a(t,e,r,i){var o=r.context,a="success";r.success.call(o,t,a,e),i&&i.resolveWith(o,[t,a,e]),n(r,o,"ajaxSuccess",[e,r,t]),u(a,e,r)}function s(t,e,r,i,o){var a=i.context;i.error.call(a,r,e,t),o&&o.rejectWith(a,[r,e,t]),n(i,a,"ajaxError",[r,i,t||e]),u(e,r,i)}function u(t,e,r){var o=r.context;r.complete.call(o,e,t),n(r,o,"ajaxComplete",[e,r]),i(r)}function c(t,e,n){if(n.dataFilter==l)return t;var r=n.context;return n.dataFilter.call(r,t,e)}function l(){}function f(t){return t&&(t=t.split(";",2)[0]),t&&(t==T?"html":t==j?"json":w.test(t)?"script":E.test(t)&&"xml")||"text"}function h(t,e){return""==e?t:(t+"&"+e).replace(/[&?]{1,2}/,"?")}function p(e){e.processData&&e.data&&"string"!=t.type(e.data)&&(e.data=t.param(e.data,e.traditional)),!e.data||e.type&&"GET"!=e.type.toUpperCase()&&"jsonp"!=e.dataType||(e.url=h(e.url,e.data),e.data=void 0)}function d(e,n,r,i){return t.isFunction(n)&&(i=r,r=n,n=void 0),t.isFunction(r)||(i=r,r=void 0),{url:e,data:n,success:r,dataType:i}}function m(e,n,r,i){var o,a=t.isArray(n),s=t.isPlainObject(n);t.each(n,function(n,u){o=t.type(u),i&&(n=r?i:i+"["+(s||"object"==o||"array"==o?n:"")+"]"),!i&&a?e.add(u.name,u.value):"array"==o||!r&&"object"==o?m(e,u,r,n):e.add(n,u)})}var v,g,y=+new Date,x=window.document,b=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,w=/^(?:text|application)\/javascript/i,E=/^(?:text|application)\/xml/i,j="application/json",T="text/html",S=/^\s*$/,C=x.createElement("a");C.href=window.location.href,t.active=0,t.ajaxJSONP=function(e,n){if(!("type"in e))return t.ajax(e);var r,i,u=e.jsonpCallback,c=(t.isFunction(u)?u():u)||"Zepto"+y++,l=x.createElement("script"),f=window[c],h=function(e){t(l).triggerHandler("error",e||"abort")},p={abort:h};return n&&n.promise(p),t(l).on("load error",function(o,u){clearTimeout(i),t(l).off().remove(),"error"!=o.type&&r?a(r[0],p,e,n):s(null,u||"error",p,e,n),window[c]=f,r&&t.isFunction(f)&&f(r[0]),f=r=void 0}),o(p,e)===!1?(h("abort"),p):(window[c]=function(){r=arguments},l.src=e.url.replace(/\?(.+)=\?/,"?$1="+c),x.head.appendChild(l),e.timeout>0&&(i=setTimeout(function(){h("timeout")},e.timeout)),p)},t.ajaxSettings={type:"GET",beforeSend:l,success:l,error:l,complete:l,context:null,global:!0,xhr:function(){return new window.XMLHttpRequest},accepts:{script:"text/javascript, application/javascript, application/x-javascript",json:j,xml:"application/xml, text/xml",html:T,text:"text/plain"},crossDomain:!1,timeout:0,processData:!0,cache:!0,dataFilter:l},t.ajax=function(e){var n,i,u=t.extend({},e||{}),d=t.Deferred&&t.Deferred();for(v in t.ajaxSettings)void 0===u[v]&&(u[v]=t.ajaxSettings[v]);r(u),u.crossDomain||(n=x.createElement("a"),n.href=u.url,n.href=n.href,u.crossDomain=C.protocol+"//"+C.host!=n.protocol+"//"+n.host),u.url||(u.url=window.location.toString()),(i=u.url.indexOf("#"))>-1&&(u.url=u.url.slice(0,i)),p(u);var m=u.dataType,y=/\?.+=\?/.test(u.url);if(y&&(m="jsonp"),u.cache!==!1&&(e&&e.cache===!0||"script"!=m&&"jsonp"!=m)||(u.url=h(u.url,"_="+Date.now())),"jsonp"==m)return y||(u.url=h(u.url,u.jsonp?u.jsonp+"=?":u.jsonp===!1?"":"callback=?")),t.ajaxJSONP(u,d);var b,w=u.accepts[m],E={},j=function(t,e){E[t.toLowerCase()]=[t,e]},T=/^([\w-]+:)\/\//.test(u.url)?RegExp.$1:window.location.protocol,N=u.xhr(),O=N.setRequestHeader;if(d&&d.promise(N),u.crossDomain||j("X-Requested-With","XMLHttpRequest"),j("Accept",w||"*/*"),(w=u.mimeType||w)&&(w.indexOf(",")>-1&&(w=w.split(",",2)[0]),N.overrideMimeType&&N.overrideMimeType(w)),(u.contentType||u.contentType!==!1&&u.data&&"GET"!=u.type.toUpperCase())&&j("Content-Type",u.contentType||"application/x-www-form-urlencoded"),u.headers)for(g in u.headers)j(g,u.headers[g]);if(N.setRequestHeader=j,N.onreadystatechange=function(){if(4==N.readyState){N.onreadystatechange=l,clearTimeout(b);var e,n=!1;if(N.status>=200&&N.status<300||304==N.status||0==N.status&&"file:"==T){if(m=m||f(u.mimeType||N.getResponseHeader("content-type")),"arraybuffer"==N.responseType||"blob"==N.responseType)e=N.response;else{e=N.responseText;try{e=c(e,m,u),"script"==m?(0,eval)(e):"xml"==m?e=N.responseXML:"json"==m&&(e=S.test(e)?null:t.parseJSON(e))}catch(r){n=r}if(n)return s(n,"parsererror",N,u,d)}a(e,N,u,d)}else s(N.statusText||null,N.status?"error":"abort",N,u,d)}},o(N,u)===!1)return N.abort(),s(null,"abort",N,u,d),N;var P=!("async"in u)||u.async;if(N.open(u.type,u.url,P,u.username,u.password),u.xhrFields)for(g in u.xhrFields)N[g]=u.xhrFields[g];for(g in E)O.apply(N,E[g]);return u.timeout>0&&(b=setTimeout(function(){N.onreadystatechange=l,N.abort(),s(null,"timeout",N,u,d)},u.timeout)),N.send(u.data?u.data:null),N},t.get=function(){return t.ajax(d.apply(null,arguments))},t.post=function(){var e=d.apply(null,arguments);return e.type="POST",t.ajax(e)},t.getJSON=function(){var e=d.apply(null,arguments);return e.dataType="json",t.ajax(e)},t.fn.load=function(e,n,r){if(!this.length)return this;var i,o=this,a=e.split(/\s/),s=d(e,n,r),u=s.success;return a.length>1&&(s.url=a[0],i=a[1]),s.success=function(e){o.html(i?t("<div>").html(e.replace(b,"")).find(i):e),u&&u.apply(o,arguments)},t.ajax(s),this};var N=encodeURIComponent;t.param=function(e,n){var r=[];return r.add=function(e,n){t.isFunction(n)&&(n=n()),null==n&&(n=""),this.push(N(e)+"="+N(n))},m(r,e,n),r.join("&").replace(/%20/g,"+")}}(e),function(t){t.fn.serializeArray=function(){var e,n,r=[],i=function(t){return t.forEach?t.forEach(i):void r.push({name:e,value:t})};return this[0]&&t.each(this[0].elements,function(r,o){n=o.type,e=o.name,e&&"fieldset"!=o.nodeName.toLowerCase()&&!o.disabled&&"submit"!=n&&"reset"!=n&&"button"!=n&&"file"!=n&&("radio"!=n&&"checkbox"!=n||o.checked)&&i(t(o).val())}),r},t.fn.serialize=function(){var t=[];return this.serializeArray().forEach(function(e){t.push(encodeURIComponent(e.name)+"="+encodeURIComponent(e.value))}),t.join("&")},t.fn.submit=function(e){if(0 in arguments)this.bind("submit",e);else if(this.length){var n=t.Event("submit");this.eq(0).trigger(n),n.isDefaultPrevented()||this.get(0).submit()}return this}}(e),function(){try{getComputedStyle(void 0)}catch(t){var e=getComputedStyle;window.getComputedStyle=function(t,n){try{return e(t,n)}catch(r){return null}}}}(),t("zepto",e)});layui.define(["layer-mobile","zepto"],function(e){"use strict";var t=layui.zepto,a=layui["layer-mobile"],i=(layui.device(),"layui-upload-enter"),n="layui-upload-iframe",r={icon:2,shift:6},o={file:"文件",video:"视频",audio:"音频"};a.msg=function(e){return a.open({content:e||"",skin:"msg",time:2})};var s=function(e){this.options=e};s.prototype.init=function(){var e=this,a=e.options,r=t("body"),s=t(a.elem||".layui-upload-file"),u=t('<iframe id="'+n+'" class="'+n+'" name="'+n+'"></iframe>');return t("#"+n)[0]||r.append(u),s.each(function(r,s){s=t(s);var u='<form target="'+n+'" method="'+(a.method||"post")+'" key="set-mine" enctype="multipart/form-data" action="'+(a.url||"")+'"></form>',l=s.attr("lay-type")||a.type;a.unwrap||(u='<div class="layui-box layui-upload-button">'+u+'<span class="layui-upload-icon"><i class="layui-icon">&#xe608;</i>'+(s.attr("lay-title")||a.title||"上传"+(o[l]||"图片"))+"</span></div>"),u=t(u),a.unwrap||u.on("dragover",function(e){e.preventDefault(),t(this).addClass(i)}).on("dragleave",function(){t(this).removeClass(i)}).on("drop",function(){t(this).removeClass(i)}),s.parent("form").attr("target")===n&&(a.unwrap?s.unwrap():(s.parent().next().remove(),s.unwrap().unwrap())),s.wrap(u),s.off("change").on("change",function(){e.action(this,l)})})},s.prototype.action=function(e,i){var o=this,s=o.options,u=e.value,l=t(e),p=l.attr("lay-ext")||s.ext||"";if(u){switch(i){case"file":if(p&&!RegExp("\\w\\.("+p+")$","i").test(escape(u)))return a.msg("不支持该文件格式",r),e.value="";break;case"video":if(!RegExp("\\w\\.("+(p||"avi|mp4|wma|rmvb|rm|flash|3gp|flv")+")$","i").test(escape(u)))return a.msg("不支持该视频格式",r),e.value="";break;case"audio":if(!RegExp("\\w\\.("+(p||"mp3|wav|mid")+")$","i").test(escape(u)))return a.msg("不支持该音频格式",r),e.value="";break;default:if(!RegExp("\\w\\.("+(p||"jpg|png|gif|bmp|jpeg")+")$","i").test(escape(u)))return a.msg("不支持该图片格式",r),e.value=""}s.before&&s.before(e),l.parent().submit();var c=t("#"+n),f=setInterval(function(){var t;try{t=c.contents().find("body").text()}catch(i){a.msg("上传接口存在跨域",r),clearInterval(f)}if(t){clearInterval(f),c.contents().find("body").html("");try{t=JSON.parse(t)}catch(i){return t={},a.msg("请对上传接口返回JSON字符",r)}"function"==typeof s.success&&s.success(t,e)}},30);e.value=""}},e("upload-mobile",function(e){var t=new s(e=e||{});t.init()})});layui.define(function(i){i("layim-mobile",layui.v)});layui["layui.mobile"]||layui.config({base:layui.cache.dir+"lay/modules/mobile/"}).extend({"layer-mobile":"layer-mobile",zepto:"zepto","upload-mobile":"upload-mobile","layim-mobile":"layim-mobile"}),layui.define(["layer-mobile","zepto","layim-mobile"],function(l){l("mobile",{layer:layui["layer-mobile"],layim:layui["layim-mobile"]})});
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/login/lay/modules/rate.js b/pluss-manage-page/src/main/resources/static/resources/auth/js/login/lay/modules/rate.js
new file mode 100644
index 0000000..762fb3a
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/login/lay/modules/rate.js
@@ -0,0 +1,2 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ ;layui.define("jquery",function(e){"use strict";var a=layui.jquery,i={config:{},index:layui.rate?layui.rate.index+1e4:0,set:function(e){var i=this;return i.config=a.extend({},i.config,e),i},on:function(e,a){return layui.onevent.call(this,n,e,a)}},l=function(){var e=this,a=e.config;return{setvalue:function(a){e.setvalue.call(e,a)},config:a}},n="rate",t="layui-rate",o="layui-icon-rate",s="layui-icon-rate-solid",u="layui-icon-rate-half",r="layui-icon-rate-solid layui-icon-rate-half",c="layui-icon-rate-solid layui-icon-rate",f="layui-icon-rate layui-icon-rate-half",v=function(e){var l=this;l.index=++i.index,l.config=a.extend({},l.config,i.config,e),l.render()};v.prototype.config={length:5,text:!1,readonly:!1,half:!1,value:0,theme:""},v.prototype.render=function(){var e=this,i=e.config,l=i.theme?'style="color: '+i.theme+';"':"";i.elem=a(i.elem),parseInt(i.value)!==i.value&&(i.half||(i.value=Math.ceil(i.value)-i.value<.5?Math.ceil(i.value):Math.floor(i.value)));for(var n='<ul class="layui-rate" '+(i.readonly?"readonly":"")+">",u=1;u<=i.length;u++){var r='<li class="layui-inline"><i class="layui-icon '+(u>Math.floor(i.value)?o:s)+'" '+l+"></i></li>";i.half&&parseInt(i.value)!==i.value&&u==Math.ceil(i.value)?n=n+'<li><i class="layui-icon layui-icon-rate-half" '+l+"></i></li>":n+=r}n+="</ul>"+(i.text?'<span class="layui-inline">'+i.value+"星":"")+"</span>";var c=i.elem,f=c.next("."+t);f[0]&&f.remove(),e.elemTemp=a(n),i.span=e.elemTemp.next("span"),i.setText&&i.setText(i.value),c.html(e.elemTemp),c.addClass("layui-inline"),i.readonly||e.action()},v.prototype.setvalue=function(e){var a=this,i=a.config;i.value=e,a.render()},v.prototype.action=function(){var e=this,i=e.config,l=e.elemTemp,n=l.find("i").width();l.children("li").each(function(e){var t=e+1,v=a(this);v.on("click",function(e){if(i.value=t,i.half){var o=e.pageX-a(this).offset().left;o<=n/2&&(i.value=i.value-.5)}i.text&&l.next("span").text(i.value+"星"),i.choose&&i.choose(i.value),i.setText&&i.setText(i.value)}),v.on("mousemove",function(e){if(l.find("i").each(function(){a(this).addClass(o).removeClass(r)}),l.find("i:lt("+t+")").each(function(){a(this).addClass(s).removeClass(f)}),i.half){var c=e.pageX-a(this).offset().left;c<=n/2&&v.children("i").addClass(u).removeClass(s)}}),v.on("mouseleave",function(){l.find("i").each(function(){a(this).addClass(o).removeClass(r)}),l.find("i:lt("+Math.floor(i.value)+")").each(function(){a(this).addClass(s).removeClass(f)}),i.half&&parseInt(i.value)!==i.value&&l.children("li:eq("+Math.floor(i.value)+")").children("i").addClass(u).removeClass(c)})})},v.prototype.events=function(){var e=this;e.config},i.render=function(e){var a=new v(e);return l.call(a)},e(n,i)});
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/login/lay/modules/slider.js b/pluss-manage-page/src/main/resources/static/resources/auth/js/login/lay/modules/slider.js
new file mode 100644
index 0000000..446378d
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/login/lay/modules/slider.js
@@ -0,0 +1,2 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ ;layui.define("jquery",function(e){"use strict";var i=layui.jquery,t={config:{},index:layui.slider?layui.slider.index+1e4:0,set:function(e){var t=this;return t.config=i.extend({},t.config,e),t},on:function(e,i){return layui.onevent.call(this,n,e,i)}},a=function(){var e=this,i=e.config;return{setValue:function(i,t){return e.slide("set",i,t||0)},config:i}},n="slider",l="layui-disabled",s="layui-slider",r="layui-slider-bar",o="layui-slider-wrap",u="layui-slider-wrap-btn",d="layui-slider-tips",v="layui-slider-input",c="layui-slider-input-txt",m="layui-slider-input-btn",p="layui-slider-hover",f=function(e){var a=this;a.index=++t.index,a.config=i.extend({},a.config,t.config,e),a.render()};f.prototype.config={type:"default",min:0,max:100,value:0,step:1,showstep:!1,tips:!0,input:!1,range:!1,height:200,disabled:!1,theme:"#009688"},f.prototype.render=function(){var e=this,t=e.config;if(t.step<1&&(t.step=1),t.max<t.min&&(t.max=t.min+t.step),t.range){t.value="object"==typeof t.value?t.value:[t.min,t.value];var a=Math.min(t.value[0],t.value[1]),n=Math.max(t.value[0],t.value[1]);t.value[0]=a>t.min?a:t.min,t.value[1]=n>t.min?n:t.min,t.value[0]=t.value[0]>t.max?t.max:t.value[0],t.value[1]=t.value[1]>t.max?t.max:t.value[1];var r=Math.floor((t.value[0]-t.min)/(t.max-t.min)*100),v=Math.floor((t.value[1]-t.min)/(t.max-t.min)*100),m=v-r+"%";r+="%",v+="%"}else{"object"==typeof t.value&&(t.value=Math.min.apply(null,t.value)),t.value<t.min&&(t.value=t.min),t.value>t.max&&(t.value=t.max);var m=Math.floor((t.value-t.min)/(t.max-t.min)*100)+"%"}var p=t.disabled?"#c2c2c2":t.theme,f='<div class="layui-slider '+("vertical"===t.type?"layui-slider-vertical":"")+'">'+(t.tips?'<div class="layui-slider-tips"></div>':"")+'<div class="layui-slider-bar" style="background:'+p+"; "+("vertical"===t.type?"height":"width")+":"+m+";"+("vertical"===t.type?"bottom":"left")+":"+(r||0)+';"></div><div class="layui-slider-wrap" style="'+("vertical"===t.type?"bottom":"left")+":"+(r||m)+';"><div class="layui-slider-wrap-btn" style="border: 2px solid '+p+';"></div></div>'+(t.range?'<div class="layui-slider-wrap" style="'+("vertical"===t.type?"bottom":"left")+":"+v+';"><div class="layui-slider-wrap-btn" style="border: 2px solid '+p+';"></div></div>':"")+"</div>",h=i(t.elem),y=h.next("."+s);if(y[0]&&y.remove(),e.elemTemp=i(f),t.range?(e.elemTemp.find("."+o).eq(0).data("value",t.value[0]),e.elemTemp.find("."+o).eq(1).data("value",t.value[1])):e.elemTemp.find("."+o).data("value",t.value),h.html(e.elemTemp),"vertical"===t.type&&e.elemTemp.height(t.height+"px"),t.showstep){for(var g=(t.max-t.min)/t.step,b="",x=1;x<g+1;x++){var T=100*x/g;T<100&&(b+='<div class="layui-slider-step" style="'+("vertical"===t.type?"bottom":"left")+":"+T+'%"></div>')}e.elemTemp.append(b)}if(t.input&&!t.range){var w=i('<div class="layui-slider-input layui-input"><div class="layui-slider-input-txt"><input type="text" class="layui-input"></div><div class="layui-slider-input-btn"><i class="layui-icon layui-icon-up"></i><i class="layui-icon layui-icon-down"></i></div></div>');h.css("position","relative"),h.append(w),h.find("."+c).children("input").val(t.value),"vertical"===t.type?w.css({left:0,top:-48}):e.elemTemp.css("margin-right",w.outerWidth()+15)}t.disabled?(e.elemTemp.addClass(l),e.elemTemp.find("."+u).addClass(l)):e.slide(),e.elemTemp.find("."+u).on("mouseover",function(){var a="vertical"===t.type?t.height:e.elemTemp[0].offsetWidth,n=e.elemTemp.find("."+o),l="vertical"===t.type?a-i(this).parent()[0].offsetTop-n.height():i(this).parent()[0].offsetLeft,s=l/a*100,r=i(this).parent().data("value"),u=t.setTips?t.setTips(r):r;e.elemTemp.find("."+d).html(u),"vertical"===t.type?e.elemTemp.find("."+d).css({bottom:s+"%","margin-bottom":"20px",display:"inline-block"}):e.elemTemp.find("."+d).css({left:s+"%",display:"inline-block"})}).on("mouseout",function(){e.elemTemp.find("."+d).css("display","none")})},f.prototype.slide=function(e,t,a){var n=this,l=n.config,s=n.elemTemp,f=function(){return"vertical"===l.type?l.height:s[0].offsetWidth},h=s.find("."+o),y=s.next("."+v),g=y.children("."+c).children("input").val(),b=100/((l.max-l.min)/Math.ceil(l.step)),x=function(e,i){e=Math.ceil(e)*b>100?Math.ceil(e)*b:Math.round(e)*b,e=e>100?100:e,h.eq(i).css("vertical"===l.type?"bottom":"left",e+"%");var t=T(h[0].offsetLeft),a=l.range?T(h[1].offsetLeft):0;"vertical"===l.type?(s.find("."+d).css({bottom:e+"%","margin-bottom":"20px"}),t=T(f()-h[0].offsetTop-h.height()),a=l.range?T(f()-h[1].offsetTop-h.height()):0):s.find("."+d).css("left",e+"%"),t=t>100?100:t,a=a>100?100:a;var n=Math.min(t,a),o=Math.abs(t-a);"vertical"===l.type?s.find("."+r).css({height:o+"%",bottom:n+"%"}):s.find("."+r).css({width:o+"%",left:n+"%"});var u=l.min+Math.round((l.max-l.min)*e/100);if(g=u,y.children("."+c).children("input").val(g),h.eq(i).data("value",u),u=l.setTips?l.setTips(u):u,s.find("."+d).html(u),l.range){var v=[h.eq(0).data("value"),h.eq(1).data("value")];v[0]>v[1]&&v.reverse()}l.change&&l.change(l.range?v:u)},T=function(e){var i=e/f()*100/b,t=Math.round(i)*b;return e==f()&&(t=Math.ceil(i)*b),t},w=i(['<div class="layui-auxiliar-moving" id="LAY-slider-moving"></div'].join("")),M=function(e,t){var a=function(){t&&t(),w.remove()};i("#LAY-slider-moving")[0]||i("body").append(w),w.on("mousemove",e),w.on("mouseup",a).on("mouseleave",a)};if("set"===e)return x(t,a);s.find("."+u).each(function(e){var t=i(this);t.on("mousedown",function(i){i=i||window.event;var a=t.parent()[0].offsetLeft,n=i.clientX;"vertical"===l.type&&(a=f()-t.parent()[0].offsetTop-h.height(),n=i.clientY);var r=function(i){i=i||window.event;var r=a+("vertical"===l.type?n-i.clientY:i.clientX-n);r<0&&(r=0),r>f()&&(r=f());var o=r/f()*100/b;x(o,e),t.addClass(p),s.find("."+d).show(),i.preventDefault()},o=function(){t.removeClass(p),s.find("."+d).hide()};M(r,o)})}),s.on("click",function(e){var t=i("."+u);if(!t.is(event.target)&&0===t.has(event.target).length&&t.length){var a,n="vertical"===l.type?f()-e.clientY+i(this).offset().top:e.clientX-i(this).offset().left;n<0&&(n=0),n>f()&&(n=f());var s=n/f()*100/b;a=l.range?"vertical"===l.type?Math.abs(n-parseInt(i(h[0]).css("bottom")))>Math.abs(n-parseInt(i(h[1]).css("bottom")))?1:0:Math.abs(n-h[0].offsetLeft)>Math.abs(n-h[1].offsetLeft)?1:0:0,x(s,a),e.preventDefault()}}),y.hover(function(){var e=i(this);e.children("."+m).fadeIn("fast")},function(){var e=i(this);e.children("."+m).fadeOut("fast")}),y.children("."+m).children("i").each(function(e){i(this).on("click",function(){g=1==e?g-l.step<l.min?l.min:Number(g)-l.step:Number(g)+l.step>l.max?l.max:Number(g)+l.step;var i=(g-l.min)/(l.max-l.min)*100/b;x(i,0)})});var q=function(){var e=this.value;e=isNaN(e)?0:e,e=e<l.min?l.min:e,e=e>l.max?l.max:e,this.value=e;var i=(e-l.min)/(l.max-l.min)*100/b;x(i,0)};y.children("."+c).children("input").on("keydown",function(e){13===e.keyCode&&(e.preventDefault(),q.call(this))}).on("change",q)},f.prototype.events=function(){var e=this;e.config},t.render=function(e){var i=new f(e);return a.call(i)},e(n,t)});
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/login/lay/modules/table.js b/pluss-manage-page/src/main/resources/static/resources/auth/js/login/lay/modules/table.js
new file mode 100644
index 0000000..e9217db
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/login/lay/modules/table.js
@@ -0,0 +1,2 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ ;layui.define(["laytpl","laypage","layer","form","util"],function(e){"use strict";var t=layui.$,i=layui.laytpl,a=layui.laypage,l=layui.layer,n=layui.form,o=(layui.util,layui.hint()),r=layui.device(),d={config:{checkName:"LAY_CHECKED",indexName:"LAY_TABLE_INDEX"},cache:{},index:layui.table?layui.table.index+1e4:0,set:function(e){var i=this;return i.config=t.extend({},i.config,e),i},on:function(e,t){return layui.onevent.call(this,u,e,t)}},c=function(){var e=this,t=e.config,i=t.id||t.index;return i&&(c.that[i]=e,c.config[i]=t),{reload:function(t){e.reload.call(e,t)},setColsWidth:function(){e.setColsWidth.call(e)},resize:function(){e.resize.call(e)},config:t}},s=function(e){var t=c.config[e];return t||o.error("The ID option was not found in the table instance"),t||null},u="table",h=".layui-table",y="layui-hide",f="layui-none",p="layui-table-view",v=".layui-table-tool",m=".layui-table-box",g=".layui-table-init",b=".layui-table-header",x=".layui-table-body",k=".layui-table-main",C=".layui-table-fixed",w=".layui-table-fixed-l",T=".layui-table-fixed-r",A=".layui-table-total",L=".layui-table-page",S=".layui-table-sort",N="layui-table-edit",W="layui-table-hover",_=function(e){var t='{{#if(item2.colspan){}} colspan="{{item2.colspan}}"{{#} if(item2.rowspan){}} rowspan="{{item2.rowspan}}"{{#}}}';return e=e||{},['<table cellspacing="0" cellpadding="0" border="0" class="layui-table" ','{{# if(d.data.skin){ }}lay-skin="{{d.data.skin}}"{{# } }} {{# if(d.data.size){ }}lay-size="{{d.data.size}}"{{# } }} {{# if(d.data.even){ }}lay-even{{# } }}>',"<thead>","{{# layui.each(d.data.cols, function(i1, item1){ }}","<tr>","{{# layui.each(item1, function(i2, item2){ }}",'{{# if(item2.fixed && item2.fixed !== "right"){ left = true; } }}','{{# if(item2.fixed === "right"){ right = true; } }}',function(){return e.fixed&&"right"!==e.fixed?'{{# if(item2.fixed && item2.fixed !== "right"){ }}':"right"===e.fixed?'{{# if(item2.fixed === "right"){ }}':""}(),"{{# var isSort = !(item2.colGroup) && item2.sort; }}",'<th data-field="{{ item2.field||i2 }}" data-key="{{d.index}}-{{i1}}-{{i2}}" {{# if( item2.parentKey){ }}data-parentkey="{{ item2.parentKey }}"{{# } }} {{# if(item2.minWidth){ }}data-minwidth="{{item2.minWidth}}"{{# } }} '+t+' {{# if(item2.unresize || item2.colGroup){ }}data-unresize="true"{{# } }} class="{{# if(item2.hide){ }}layui-hide{{# } }}{{# if(isSort){ }} layui-unselect{{# } }}{{# if(!item2.field){ }} layui-table-col-special{{# } }}">','<div class="layui-table-cell laytable-cell-',"{{# if(item2.colGroup){ }}","group","{{# } else { }}","{{d.index}}-{{i1}}-{{i2}}",'{{# if(item2.type !== "normal"){ }}'," laytable-cell-{{ item2.type }}","{{# } }}","{{# } }}",'" {{#if(item2.align){}}align="{{item2.align}}"{{#}}}>','{{# if(item2.type === "checkbox"){ }}','<input type="checkbox" name="layTableCheckbox" lay-skin="primary" lay-filter="layTableAllChoose" {{# if(item2[d.data.checkName]){ }}checked{{# }; }}>',"{{# } else { }}",'<span>{{item2.title||""}}</span>',"{{# if(isSort){ }}",'<span class="layui-table-sort layui-inline"><i class="layui-edge layui-table-sort-asc" title="升序"></i><i class="layui-edge layui-table-sort-desc" title="降序"></i></span>',"{{# } }}","{{# } }}","</div>","</th>",e.fixed?"{{# }; }}":"","{{# }); }}","</tr>","{{# }); }}","</thead>","</table>"].join("")},E=['<table cellspacing="0" cellpadding="0" border="0" class="layui-table" ','{{# if(d.data.skin){ }}lay-skin="{{d.data.skin}}"{{# } }} {{# if(d.data.size){ }}lay-size="{{d.data.size}}"{{# } }} {{# if(d.data.even){ }}lay-even{{# } }}>',"<tbody></tbody>","</table>"].join(""),z=['<div class="layui-form layui-border-box {{d.VIEW_CLASS}}" lay-filter="LAY-table-{{d.index}}" lay-id="{{ d.data.id }}" style="{{# if(d.data.width){ }}width:{{d.data.width}}px;{{# } }} {{# if(d.data.height){ }}height:{{d.data.height}}px;{{# } }}">',"{{# if(d.data.toolbar){ }}",'<div class="layui-table-tool">','<div class="layui-table-tool-temp"></div>','<div class="layui-table-tool-self"></div>',"</div>","{{# } }}",'<div class="layui-table-box">',"{{# if(d.data.loading){ }}",'<div class="layui-table-init" style="background-color: #fff;">','<i class="layui-icon layui-icon-loading layui-icon"></i>',"</div>","{{# } }}","{{# var left, right; }}",'<div class="layui-table-header">',_(),"</div>",'<div class="layui-table-body layui-table-main">',E,"</div>","{{# if(left){ }}",'<div class="layui-table-fixed layui-table-fixed-l">','<div class="layui-table-header">',_({fixed:!0}),"</div>",'<div class="layui-table-body">',E,"</div>","</div>","{{# }; }}","{{# if(right){ }}",'<div class="layui-table-fixed layui-table-fixed-r">','<div class="layui-table-header">',_({fixed:"right"}),'<div class="layui-table-mend"></div>',"</div>",'<div class="layui-table-body">',E,"</div>","</div>","{{# }; }}","</div>","{{# if(d.data.totalRow){ }}",'<div class="layui-table-total">','<table cellspacing="0" cellpadding="0" border="0" class="layui-table" ','{{# if(d.data.skin){ }}lay-skin="{{d.data.skin}}"{{# } }} {{# if(d.data.size){ }}lay-size="{{d.data.size}}"{{# } }} {{# if(d.data.even){ }}lay-even{{# } }}>','<tbody><tr><td><div class="layui-table-cell" style="visibility: hidden;">Total</div></td></tr></tbody>',"</table>","</div>","{{# } }}","{{# if(d.data.page){ }}",'<div class="layui-table-page">','<div id="layui-table-page{{d.index}}"></div>',"</div>","{{# } }}","<style>","{{# layui.each(d.data.cols, function(i1, item1){","layui.each(item1, function(i2, item2){ }}",".laytable-cell-{{d.index}}-{{i1}}-{{i2}}{ ","{{# if(item2.width){ }}","width: {{item2.width}}px;","{{# } }}"," }","{{# });","}); }}","</style>","</div>"].join(""),H=t(window),R=t(document),F=function(e){var i=this;i.index=++d.index,i.config=t.extend({},i.config,d.config,e),i.render()};F.prototype.config={limit:10,loading:!0,cellMinWidth:60,defaultToolbar:["filter","exports","print"],autoSort:!0,text:{none:"无数据"}},F.prototype.render=function(){var e=this,a=e.config;if(a.elem=t(a.elem),a.where=a.where||{},a.id=a.id||a.elem.attr("id")||e.index,a.request=t.extend({pageName:"page",limitName:"limit"},a.request),a.response=t.extend({statusName:"code",statusCode:0,msgName:"msg",dataName:"data",countName:"count"},a.response),"object"==typeof a.page&&(a.limit=a.page.limit||a.limit,a.limits=a.page.limits||a.limits,e.page=a.page.curr=a.page.curr||1,delete a.page.elem,delete a.page.jump),!a.elem[0])return e;a.height&&/^full-\d+$/.test(a.height)&&(e.fullHeightGap=a.height.split("-")[1],a.height=H.height()-e.fullHeightGap),e.setInit();var l=a.elem,n=l.next("."+p),o=e.elem=t(i(z).render({VIEW_CLASS:p,data:a,index:e.index}));if(a.index=e.index,n[0]&&n.remove(),l.after(o),e.layTool=o.find(v),e.layBox=o.find(m),e.layHeader=o.find(b),e.layMain=o.find(k),e.layBody=o.find(x),e.layFixed=o.find(C),e.layFixLeft=o.find(w),e.layFixRight=o.find(T),e.layTotal=o.find(A),e.layPage=o.find(L),e.renderToolbar(),e.fullSize(),a.cols.length>1){var r=e.layFixed.find(b).find("th");r.height(e.layHeader.height()-1-parseFloat(r.css("padding-top"))-parseFloat(r.css("padding-bottom")))}e.pullData(e.page),e.events()},F.prototype.initOpts=function(e){var t=this,i=(t.config,{checkbox:48,radio:48,space:15,numbers:40});e.checkbox&&(e.type="checkbox"),e.space&&(e.type="space"),e.type||(e.type="normal"),"normal"!==e.type&&(e.unresize=!0,e.width=e.width||i[e.type])},F.prototype.setInit=function(e){var t=this,i=t.config;return i.clientWidth=i.width||function(){var e=function(t){var a,l;t=t||i.elem.parent(),a=t.width();try{l="none"===t.css("display")}catch(n){}return!t[0]||a&&!l?a:e(t.parent())};return e()}(),"width"===e?i.clientWidth:void layui.each(i.cols,function(e,a){layui.each(a,function(l,n){if(!n)return void a.splice(l,1);if(n.key=e+"-"+l,n.hide=n.hide||!1,n.colGroup||n.colspan>1){var o=0;layui.each(i.cols[e+1],function(t,i){i.HAS_PARENT||o>1&&o==n.colspan||(i.HAS_PARENT=!0,i.parentKey=e+"-"+l,o+=parseInt(i.colspan>1?i.colspan:1))}),n.colGroup=!0}t.initOpts(n)})})},F.prototype.renderToolbar=function(){var e=this,a=e.config,l=['<div class="layui-inline" lay-event="add"><i class="layui-icon layui-icon-add-1"></i></div>','<div class="layui-inline" lay-event="update"><i class="layui-icon layui-icon-edit"></i></div>','<div class="layui-inline" lay-event="delete"><i class="layui-icon layui-icon-delete"></i></div>'].join(""),n=e.layTool.find(".layui-table-tool-temp");if("default"===a.toolbar)n.html(l);else if("string"==typeof a.toolbar){var o=t(a.toolbar).html()||"";o&&n.html(i(o).render(a))}var r={filter:{title:"筛选列",layEvent:"LAYTABLE_COLS",icon:"layui-icon-cols"},exports:{title:"导出",layEvent:"LAYTABLE_EXPORT",icon:"layui-icon-export"},print:{title:"打印",layEvent:"LAYTABLE_PRINT",icon:"layui-icon-print"}},d=[];"object"==typeof a.defaultToolbar&&layui.each(a.defaultToolbar,function(e,t){var i=r[t];i&&d.push('<div class="layui-inline" title="'+i.title+'" lay-event="'+i.layEvent+'"><i class="layui-icon '+i.icon+'"></i></div>')}),e.layTool.find(".layui-table-tool-self").html(d.join(""))},F.prototype.setParentCol=function(e,t){var i=this,a=i.config,l=i.layHeader.find('th[data-key="'+a.index+"-"+t+'"]'),n=parseInt(l.attr("colspan"))||0;if(l[0]){var o=t.split("-"),r=a.cols[o[0]][o[1]];e?n--:n++,l.attr("colspan",n),l[n<1?"addClass":"removeClass"](y),r.colspan=n,r.hide=n<1;var d=l.data("parentkey");d&&i.setParentCol(e,d)}},F.prototype.setColsPatch=function(){var e=this,t=e.config;layui.each(t.cols,function(t,i){layui.each(i,function(t,i){i.hide&&e.setParentCol(i.hide,i.parentKey)})})},F.prototype.setColsWidth=function(){var e=this,t=e.config,i=0,a=0,l=0,n=0,o=e.setInit("width");e.eachCols(function(e,t){t.hide||i++}),o=o-function(){return"line"===t.skin||"nob"===t.skin?2:i+1}()-e.getScrollWidth(e.layMain[0])-1;var r=function(e){layui.each(t.cols,function(i,r){layui.each(r,function(i,d){var c=0,s=d.minWidth||t.cellMinWidth;return d?void(d.colGroup||d.hide||(e?l&&l<s&&(a--,c=s):(c=d.width||0,/\d+%$/.test(c)?(c=Math.floor(parseFloat(c)/100*o),c<s&&(c=s)):c||(d.width=c=0,a++)),d.hide&&(c=0),n+=c)):void r.splice(i,1)})}),o>n&&a&&(l=(o-n)/a)};r(),r(!0),e.autoColNums=a,e.eachCols(function(i,a){var n=a.minWidth||t.cellMinWidth;a.colGroup||a.hide||(0===a.width?e.getCssRule(t.index+"-"+a.key,function(e){e.style.width=Math.floor(l>=n?l:n)+"px"}):/\d+%$/.test(a.width)&&e.getCssRule(t.index+"-"+a.key,function(e){e.style.width=Math.floor(parseFloat(a.width)/100*o)+"px"}))});var d=e.layMain.width()-e.getScrollWidth(e.layMain[0])-e.layMain.children("table").outerWidth();if(e.autoColNums&&d>=-i&&d<=i){var c=function(t){var i;return t=t||e.layHeader.eq(0).find("thead th:last-child"),i=t.data("field"),!i&&t.prev()[0]?c(t.prev()):t},s=c(),u=s.data("key");e.getCssRule(u,function(t){var i=t.style.width||s.outerWidth();t.style.width=parseFloat(i)+d+"px",e.layMain.height()-e.layMain.prop("clientHeight")>0&&(t.style.width=parseFloat(t.style.width)-1+"px")})}e.loading(!0)},F.prototype.resize=function(){var e=this;e.fullSize(),e.setColsWidth(),e.scrollPatch()},F.prototype.reload=function(e){var i=this;i.config.data&&i.config.data.constructor===Array&&delete i.config.data,i.config=t.extend({},i.config,e),i.render()},F.prototype.page=1,F.prototype.pullData=function(e){var i=this,a=i.config,l=a.request,n=a.response,o=function(){"object"==typeof a.initSort&&i.sort(a.initSort.field,a.initSort.type)};if(i.startTime=(new Date).getTime(),a.url){var r={};r[l.pageName]=e,r[l.limitName]=a.limit;var d=t.extend(r,a.where);a.contentType&&0==a.contentType.indexOf("application/json")&&(d=JSON.stringify(d)),t.ajax({type:a.method||"get",url:a.url,contentType:a.contentType,data:d,dataType:"json",headers:a.headers||{},success:function(t){"function"==typeof a.parseData&&(t=a.parseData(t)||t),t[n.statusName]!=n.statusCode?(i.renderForm(),i.layMain.html('<div class="'+f+'">'+(t[n.msgName]||"返回的数据不符合规范，正确的成功状态码 ("+n.statusName+") 应为："+n.statusCode)+"</div>")):(i.renderData(t,e,t[n.countName]),o(),a.time=(new Date).getTime()-i.startTime+" ms"),i.setColsWidth(),"function"==typeof a.done&&a.done(t,e,t[n.countName])},error:function(e,t){i.layMain.html('<div class="'+f+'">数据接口请求异常：'+t+"</div>"),i.renderForm(),i.setColsWidth()}})}else if(a.data&&a.data.constructor===Array){var c={},s=e*a.limit-a.limit;c[n.dataName]=a.data.concat().splice(s,a.limit),c[n.countName]=a.data.length,i.renderData(c,e,a.data.length),o(),i.setColsWidth(),"function"==typeof a.done&&a.done(c,e,c[n.countName])}},F.prototype.eachCols=function(e){var t=this;return d.eachCols(null,e,t.config.cols),t},F.prototype.renderData=function(e,n,o,r){var c=this,s=c.config,u=e[s.response.dataName]||[],h=[],p=[],v=[],m=function(){var e;return!r&&c.sortKey?c.sort(c.sortKey.field,c.sortKey.sort,!0):(layui.each(u,function(a,l){var o=[],u=[],f=[],m=a+s.limit*(n-1)+1;0!==l.length&&(r||(l[d.config.indexName]=a),c.eachCols(function(n,r){var c=r.field||n,h=s.index+"-"+r.key,p=l[c];if(void 0!==p&&null!==p||(p=""),!r.colGroup){var v=['<td data-field="'+c+'" data-key="'+h+'" '+function(){var e=[];return r.edit&&e.push('data-edit="'+r.edit+'"'),r.align&&e.push('align="'+r.align+'"'),r.templet&&e.push('data-content="'+p+'"'),r.toolbar&&e.push('data-off="true"'),r.event&&e.push('lay-event="'+r.event+'"'),r.style&&e.push('style="'+r.style+'"'),r.minWidth&&e.push('data-minwidth="'+r.minWidth+'"'),e.join(" ")}()+' class="'+function(){var e=[];return r.hide&&e.push(y),r.field||e.push("layui-table-col-special"),e.join(" ")}()+'">','<div class="layui-table-cell laytable-cell-'+function(){return"normal"===r.type?h:h+" laytable-cell-"+r.type}()+'">'+function(){var n=t.extend(!0,{LAY_INDEX:m},l),o=d.config.checkName;switch(r.type){case"checkbox":return'<input type="checkbox" name="layTableCheckbox" lay-skin="primary" '+function(){return r[o]?(l[o]=r[o],r[o]?"checked":""):n[o]?"checked":""}()+">";case"radio":return n[o]&&(e=a),'<input type="radio" name="layTableRadio_'+s.index+'" '+(n[o]?"checked":"")+' lay-type="layTableRadio">';case"numbers":return m}return r.toolbar?i(t(r.toolbar).html()||"").render(n):r.templet?function(){return"function"==typeof r.templet?r.templet(n):i(t(r.templet).html()||String(p)).render(n)}():p}(),"</div></td>"].join("");o.push(v),r.fixed&&"right"!==r.fixed&&u.push(v),"right"===r.fixed&&f.push(v)}}),h.push('<tr data-index="'+a+'">'+o.join("")+"</tr>"),p.push('<tr data-index="'+a+'">'+u.join("")+"</tr>"),v.push('<tr data-index="'+a+'">'+f.join("")+"</tr>"))}),c.layBody.scrollTop(0),c.layMain.find("."+f).remove(),c.layMain.find("tbody").html(h.join("")),c.layFixLeft.find("tbody").html(p.join("")),c.layFixRight.find("tbody").html(v.join("")),c.renderForm(),"number"==typeof e&&c.setThisRowChecked(e),c.syncCheckAll(),c.haveInit?c.scrollPatch():setTimeout(function(){c.scrollPatch()},50),c.haveInit=!0,l.close(c.tipsIndex),s.HAS_SET_COLS_PATCH||c.setColsPatch(),void(s.HAS_SET_COLS_PATCH=!0))};return c.key=s.id||s.index,d.cache[c.key]=u,c.layPage[0==o||0===u.length&&1==n?"addClass":"removeClass"](y),r?m():0===u.length?(c.renderForm(),c.layFixed.remove(),c.layMain.find("tbody").html(""),c.layMain.find("."+f).remove(),c.layMain.append('<div class="'+f+'">'+s.text.none+"</div>")):(m(),c.renderTotal(u),void(s.page&&(s.page=t.extend({elem:"layui-table-page"+s.index,count:o,limit:s.limit,limits:s.limits||[10,20,30,40,50,60,70,80,90],groups:3,layout:["prev","page","next","skip","count","limit"],prev:'<i class="layui-icon">&#xe603;</i>',next:'<i class="layui-icon">&#xe602;</i>',jump:function(e,t){t||(c.page=e.curr,s.limit=e.limit,c.loading(),c.pullData(e.curr))}},s.page),s.page.count=o,a.render(s.page))))},F.prototype.renderTotal=function(e){var t=this,i=t.config,a={};if(i.totalRow){layui.each(e,function(e,i){0!==i.length&&t.eachCols(function(e,t){var l=t.field||e,n=i[l];t.totalRow&&(a[l]=(a[l]||0)+(parseFloat(n)||0))})});var l=[];t.eachCols(function(e,t){var n=t.field||e,o=['<td data-field="'+n+'" data-key="'+i.index+"-"+t.key+'" '+function(){var e=[];return t.align&&e.push('align="'+t.align+'"'),t.style&&e.push('style="'+t.style+'"'),t.minWidth&&e.push('data-minwidth="'+t.minWidth+'"'),e.join(" ")}()+' class="'+function(){var e=[];return t.hide&&e.push(y),t.field||e.push("layui-table-col-special"),e.join(" ")}()+'">','<div class="layui-table-cell laytable-cell-'+function(){var e=i.index+"-"+t.key;return"normal"===t.type?e:e+" laytable-cell-"+t.type}()+'">'+function(){var e=t.totalRowText||"";return t.totalRow?parseFloat(a[n]).toFixed(2)||e:e}(),"</div></td>"].join("");l.push(o)}),t.layTotal.find("tbody").html("<tr>"+l.join("")+"</tr>")}},F.prototype.getColElem=function(e,t){var i=this,a=i.config;return e.eq(0).find(".laytable-cell-"+(a.index+"-"+t)+":eq(0)")},F.prototype.renderForm=function(e){n.render(e,"LAY-table-"+this.index)},F.prototype.setThisRowChecked=function(e){var t=this,i=(t.config,"layui-table-click"),a=t.layBody.find('tr[data-index="'+e+'"]');a.addClass(i).siblings("tr").removeClass(i)},F.prototype.sort=function(e,i,a,l){var n,r,c=this,s={},h=c.config,y=h.elem.attr("lay-filter"),f=d.cache[c.key];"string"==typeof e&&c.layHeader.find("th").each(function(i,a){var l=t(this),o=l.data("field");if(o===e)return e=l,n=o,!1});try{var n=n||e.data("field"),p=e.data("key");if(c.sortKey&&!a&&n===c.sortKey.field&&i===c.sortKey.sort)return;var v=c.layHeader.find("th .laytable-cell-"+p).find(S);c.layHeader.find("th").find(S).removeAttr("lay-sort"),v.attr("lay-sort",i||null),c.layFixed.find("th")}catch(m){return o.error("Table modules: Did not match to field")}c.sortKey={field:n,sort:i},h.autoSort&&("asc"===i?r=layui.sort(f,n):"desc"===i?r=layui.sort(f,n,!0):(r=layui.sort(f,d.config.indexName),delete c.sortKey)),s[h.response.dataName]=r||f,c.renderData(s,c.page,c.count,!0),l&&layui.event.call(e,u,"sort("+y+")",{field:n,type:i})},F.prototype.loading=function(e){var i=this,a=i.config;a.loading&&(e?(i.layInit&&i.layInit.remove(),delete i.layInit,i.layBox.find(g).remove()):(i.layInit=t(['<div class="layui-table-init">','<i class="layui-icon layui-icon-loading layui-icon"></i>',"</div>"].join("")),i.layBox.append(i.layInit)))},F.prototype.setCheckData=function(e,t){var i=this,a=i.config,l=d.cache[i.key];l[e]&&l[e].constructor!==Array&&(l[e][a.checkName]=t)},F.prototype.syncCheckAll=function(){var e=this,t=e.config,i=e.layHeader.find('input[name="layTableCheckbox"]'),a=function(i){return e.eachCols(function(e,a){"checkbox"===a.type&&(a[t.checkName]=i)}),i};i[0]&&(d.checkStatus(e.key).isAll?(i[0].checked||(i.prop("checked",!0),e.renderForm("checkbox")),a(!0)):(i[0].checked&&(i.prop("checked",!1),e.renderForm("checkbox")),a(!1)))},F.prototype.getCssRule=function(e,t){var i=this,a=i.elem.find("style")[0],l=a.sheet||a.styleSheet||{},n=l.cssRules||l.rules;layui.each(n,function(i,a){if(a.selectorText===".laytable-cell-"+e)return t(a),!0})},F.prototype.fullSize=function(){var e,t=this,i=t.config,a=i.height;t.fullHeightGap&&(a=H.height()-t.fullHeightGap,a<135&&(a=135),t.elem.css("height",a)),a&&(e=parseFloat(a)-(t.layHeader.outerHeight()||38),i.toolbar&&(e-=t.layTool.outerHeight()||50),i.totalRow&&(e-=t.layTotal.outerHeight()||40),i.page&&(e=e-(t.layPage.outerHeight()||41)-2),t.layMain.css("height",e))},F.prototype.getScrollWidth=function(e){var t=0;return e?t=e.offsetWidth-e.clientWidth:(e=document.createElement("div"),e.style.width="100px",e.style.height="100px",e.style.overflowY="scroll",document.body.appendChild(e),t=e.offsetWidth-e.clientWidth,document.body.removeChild(e)),t},F.prototype.scrollPatch=function(){var e=this,i=e.layMain.children("table"),a=e.layMain.width()-e.layMain.prop("clientWidth"),l=e.layMain.height()-e.layMain.prop("clientHeight"),n=(e.getScrollWidth(e.layMain[0]),i.outerWidth()-e.layMain.width()),o=function(e){if(a&&l){if(e=e.eq(0),!e.find(".layui-table-patch")[0]){var i=t('<th class="layui-table-patch"><div class="layui-table-cell"></div></th>');i.find("div").css({width:a}),e.find("tr").append(i)}}else e.find(".layui-table-patch").remove()};o(e.layHeader),o(e.layTotal);var r=e.layMain.height(),d=r-l;e.layFixed.find(x).css("height",i.height()>=d?d:"auto"),e.layFixRight[n>0?"removeClass":"addClass"](y),e.layFixRight.css("right",a-1)},F.prototype.events=function(){var e,a=this,o=a.config,c=t("body"),s={},h=a.layHeader.find("th"),f=".layui-table-cell",p=o.elem.attr("lay-filter");a.layTool.on("click","*[lay-event]",function(e){var i=t(this),c=i.attr("lay-event"),s=function(e){var l=t(e.list),n=t('<ul class="layui-table-tool-panel"></ul>');n.html(l),o.height&&n.css("max-height",o.height-(a.layTool.outerHeight()||50)),i.find(".layui-table-tool-panel")[0]||i.append(n),a.renderForm(),n.on("click",function(e){layui.stope(e)}),e.done&&e.done(n,l)};switch(layui.stope(e),R.trigger("table.tool.panel.remove"),l.close(a.tipsIndex),c){case"LAYTABLE_COLS":s({list:function(){var e=[];return a.eachCols(function(t,i){i.field&&"normal"==i.type&&e.push('<li><input type="checkbox" name="'+i.field+'" data-key="'+i.key+'" data-parentkey="'+(i.parentKey||"")+'" lay-skin="primary" '+(i.hide?"":"checked")+' title="'+(i.title||i.field)+'" lay-filter="LAY_TABLE_TOOL_COLS"></li>')}),e.join("")}(),done:function(){n.on("checkbox(LAY_TABLE_TOOL_COLS)",function(e){var i=t(e.elem),l=this.checked,n=i.data("key"),r=i.data("parentkey");layui.each(o.cols,function(e,t){layui.each(t,function(t,i){if(e+"-"+t===n){var d=i.hide;i.hide=!l,a.elem.find('*[data-key="'+o.index+"-"+n+'"]')[l?"removeClass":"addClass"](y),d!=i.hide&&a.setParentCol(!l,r),a.resize()}})})})}});break;case"LAYTABLE_EXPORT":r.ie?l.tips("导出功能不支持 IE，请用 Chrome 等高级浏览器导出",this,{tips:3}):s({list:function(){return['<li data-type="csv">导出到 Csv 文件</li>','<li data-type="xls">导出到 Excel 文件</li>'].join("")}(),done:function(e,i){i.on("click",function(){var e=t(this).data("type");d.exportFile(o.id,null,e)})}});break;case"LAYTABLE_PRINT":var h=window.open("打印窗口","_blank"),f=["<style>","body{font-size: 12px; color: #666;}","table{width: 100%; border-collapse: collapse; border-spacing: 0;}","th,td{line-height: 20px; padding: 9px 15px; border: 1px solid #ccc; text-align: left; font-size: 12px; color: #666;}","a{color: #666; text-decoration:none;}","*.layui-hide{display: none}","</style>"].join(""),v=t(a.layHeader.html());v.append(a.layMain.find("table").html()),v.find("th.layui-table-patch").remove(),v.find(".layui-table-col-special").remove(),h.document.write(f+v.prop("outerHTML")),h.document.close(),h.print(),h.close()}layui.event.call(this,u,"toolbar("+p+")",t.extend({event:c,config:o},{}))}),h.on("mousemove",function(e){var i=t(this),a=i.offset().left,l=e.clientX-a;i.data("unresize")||s.resizeStart||(s.allowResize=i.width()-l<=10,c.css("cursor",s.allowResize?"col-resize":""))}).on("mouseleave",function(){t(this);s.resizeStart||c.css("cursor","")}).on("mousedown",function(e){var i=t(this);if(s.allowResize){var l=i.data("key");e.preventDefault(),s.resizeStart=!0,s.offset=[e.clientX,e.clientY],a.getCssRule(l,function(e){var t=e.style.width||i.outerWidth();s.rule=e,s.ruleWidth=parseFloat(t),s.minWidth=i.data("minwidth")||o.cellMinWidth})}}),R.on("mousemove",function(t){if(s.resizeStart){if(t.preventDefault(),s.rule){var i=s.ruleWidth+t.clientX-s.offset[0];i<s.minWidth&&(i=s.minWidth),s.rule.style.width=i+"px",l.close(a.tipsIndex)}e=1}}).on("mouseup",function(t){s.resizeStart&&(s={},c.css("cursor",""),a.scrollPatch()),2===e&&(e=null)}),h.on("click",function(i){var l,n=t(this),o=n.find(S),r=o.attr("lay-sort");return o[0]&&1!==e?(l="asc"===r?"desc":"desc"===r?null:"asc",void a.sort(n,l,null,!0)):e=2}).find(S+" .layui-edge ").on("click",function(e){var i=t(this),l=i.index(),n=i.parents("th").eq(0).data("field");layui.stope(e),0===l?a.sort(n,"asc",null,!0):a.sort(n,"desc",null,!0)});var v=function(e){var l=t(this),n=l.parents("tr").eq(0).data("index"),o=a.layBody.find('tr[data-index="'+n+'"]'),r=d.cache[a.key][n];return t.extend({tr:o,data:d.clearCacheKey(r),del:function(){d.cache[a.key][n]=[],o.remove(),a.scrollPatch()},update:function(e){e=e||{},layui.each(e,function(e,l){if(e in r){var n,d=o.children('td[data-field="'+e+'"]');r[e]=l,a.eachCols(function(t,i){i.field==e&&i.templet&&(n=i.templet)}),d.children(f).html(function(){return n?function(){return"function"==typeof n?n(r):i(t(n).html()||l).render(r)}():l}()),d.data("content",l)}})}},e)};a.elem.on("click",'input[name="layTableCheckbox"]+',function(){var e=t(this).prev(),i=a.layBody.find('input[name="layTableCheckbox"]'),l=e.parents("tr").eq(0).data("index"),n=e[0].checked,o="layTableAllChoose"===e.attr("lay-filter");o?(i.each(function(e,t){t.checked=n,a.setCheckData(e,n)}),a.syncCheckAll(),a.renderForm("checkbox")):(a.setCheckData(l,n),a.syncCheckAll()),layui.event.call(e[0],u,"checkbox("+p+")",v.call(e[0],{checked:n,type:o?"all":"one"}))}),a.elem.on("click",'input[lay-type="layTableRadio"]+',function(){var e=t(this).prev(),i=e[0].checked,l=d.cache[a.key],n=e.parents("tr").eq(0).data("index");layui.each(l,function(e,t){n===e?t.LAY_CHECKED=!0:delete t.LAY_CHECKED}),a.setThisRowChecked(n),layui.event.call(this,u,"radio("+p+")",v.call(this,{checked:i}))}),a.layBody.on("mouseenter","tr",function(){var e=t(this),i=e.index();a.layBody.find("tr:eq("+i+")").addClass(W)}).on("mouseleave","tr",function(){var e=t(this),i=e.index();a.layBody.find("tr:eq("+i+")").removeClass(W)}).on("click","tr",function(){m.call(this,"row")}).on("dblclick","tr",function(){m.call(this,"rowDouble")});var m=function(e){var i=t(this);layui.event.call(this,u,e+"("+p+")",v.call(i.children("td")[0]))};a.layBody.on("change","."+N,function(){var e=t(this),i=this.value,l=e.parent().data("field"),n=e.parents("tr").eq(0).data("index"),o=d.cache[a.key][n];o[l]=i,layui.event.call(this,u,"edit("+p+")",v.call(this,{value:i,field:l}))}).on("blur","."+N,function(){var e,l=t(this),n=l.parent().data("field"),o=l.parents("tr").eq(0).data("index"),r=d.cache[a.key][o];a.eachCols(function(t,i){i.field==n&&i.templet&&(e=i.templet)}),l.siblings(f).html(function(a){return e?function(){return"function"==typeof e?e(r):i(t(e).html()||this.value).render(r)}():a}(this.value)),l.parent().data("content",this.value),l.remove()}),a.layBody.on("click","td",function(e){var i=t(this),a=(i.data("field"),i.data("edit")),l=i.children(f);if(!i.data("off")&&a){var n=t('<input class="layui-input '+N+'">');return n[0].value=i.data("content")||l.text(),i.find("."+N)[0]||i.append(n),n.focus(),void layui.stope(e)}}).on("mouseenter","td",function(){b.call(this)}).on("mouseleave","td",function(){b.call(this,"hide")});var g="layui-table-grid-down",b=function(e){var i=t(this),a=i.children(f);if(e)i.find(".layui-table-grid-down").remove();else if(a.prop("scrollWidth")>a.outerWidth()){if(a.find("."+g)[0])return;i.append('<div class="'+g+'"><i class="layui-icon layui-icon-down"></i></div>')}};a.layBody.on("click","."+g,function(e){var i=t(this),n=i.parent(),d=n.children(f);a.tipsIndex=l.tips(['<div class="layui-table-tips-main" style="margin-top: -'+(d.height()+16)+"px;"+function(){return"sm"===o.size?"padding: 4px 15px; font-size: 12px;":"lg"===o.size?"padding: 14px 15px;":""}()+'">',d.html(),"</div>",'<i class="layui-icon layui-table-tips-c layui-icon-close"></i>'].join(""),d[0],{tips:[3,""],time:-1,anim:-1,maxWidth:r.ios||r.android?300:a.elem.width()/2,isOutAnim:!1,skin:"layui-table-tips",success:function(e,t){e.find(".layui-table-tips-c").on("click",function(){l.close(t)})}}),layui.stope(e)}),a.layBody.on("click","*[lay-event]",function(){var e=t(this),i=e.parents("tr").eq(0).data("index");layui.event.call(this,u,"tool("+p+")",v.call(this,{event:e.attr("lay-event")})),a.setThisRowChecked(i)}),a.layMain.on("scroll",function(){var e=t(this),i=e.scrollLeft(),n=e.scrollTop();a.layHeader.scrollLeft(i),a.layTotal.scrollLeft(i),a.layFixed.find(x).scrollTop(n),l.close(a.tipsIndex)}),R.on("click",function(){R.trigger("table.remove.tool.panel")}),R.on("table.remove.tool.panel",function(){t(".layui-table-tool-panel").remove()}),H.on("resize",function(){a.resize()})},d.init=function(e,i){i=i||{};var a=this,l=t(e?'table[lay-filter="'+e+'"]':h+"[lay-data]"),n="Table element property lay-data configuration item has a syntax error: ";return l.each(function(){var a=t(this),l=a.attr("lay-data");try{l=new Function("return "+l)()}catch(r){o.error(n+l)}var c=[],s=t.extend({elem:this,cols:[],data:[],skin:a.attr("lay-skin"),size:a.attr("lay-size"),even:"string"==typeof a.attr("lay-even")},d.config,i,l);e&&a.hide(),a.find("thead>tr").each(function(e){s.cols[e]=[],t(this).children().each(function(i){var a=t(this),l=a.attr("lay-data");try{l=new Function("return "+l)()}catch(r){return o.error(n+l)}var d=t.extend({title:a.text(),colspan:a.attr("colspan")||0,rowspan:a.attr("rowspan")||0},l);d.colspan<2&&c.push(d),s.cols[e].push(d)})}),a.find("tbody>tr").each(function(e){var i=t(this),a={};i.children("td").each(function(e,i){var l=t(this),n=l.data("field");if(n)return a[n]=l.html()}),layui.each(c,function(e,t){var l=i.children("td").eq(e);a[t.field]=l.html()}),s.data[e]=a}),d.render(s)}),a},c.that={},c.config={},d.eachCols=function(e,i,a){var l=c.config[e]||{},n=[],o=0;a=t.extend(!0,[],a||l.cols),layui.each(a,function(e,t){layui.each(t,function(t,i){if(i.colGroup){var l=0;o++,i.CHILD_COLS=[],layui.each(a[e+1],function(e,t){t.PARENT_COL_INDEX||l>1&&l==i.colspan||(t.PARENT_COL_INDEX=o,i.CHILD_COLS.push(t),l+=parseInt(t.colspan>1?t.colspan:1))})}i.PARENT_COL_INDEX||n.push(i)})});var r=function(e){layui.each(e||n,function(e,t){return t.CHILD_COLS?r(t.CHILD_COLS):void("function"==typeof i&&i(e,t))})};r()},d.checkStatus=function(e){var t=0,i=0,a=[],l=d.cache[e]||[];return layui.each(l,function(e,l){return l.constructor===Array?void i++:void(l[d.config.checkName]&&(t++,a.push(d.clearCacheKey(l))))}),{data:a,isAll:!!l.length&&t===l.length-i}},d.exportFile=function(e,t,i){t=t||d.clearCacheKey(d.cache[e]),i=i||"csv";var a=c.config[e]||{},l={csv:"text/csv",xls:"application/vnd.ms-excel"}[i],n=document.createElement("a");return r.ie?o.error("IE_NOT_SUPPORT_EXPORTS"):(n.href="data:"+l+";charset=utf-8,\ufeff"+encodeURIComponent(function(){var i=[],a=[];return layui.each(t,function(t,l){var n=[];"object"==typeof e?(layui.each(e,function(e,a){0==t&&i.push(a||"")}),layui.each(d.clearCacheKey(l),function(e,t){n.push(t)})):d.eachCols(e,function(e,a){a.field&&"normal"==a.type&&!a.hide&&(0==t&&i.push(a.title||""),n.push(l[a.field]))}),a.push(n.join(","))}),i.join(",")+"\r\n"+a.join("\r\n")}()),n.download=(a.title||"table_"+(a.index||""))+"."+i,document.body.appendChild(n),n.click(),void document.body.removeChild(n))},d.resize=function(e){if(e){var t=s(e);if(!t)return;c.that[e].resize()}else layui.each(c.that,function(){this.resize()})},d.reload=function(e,i){i=i||{};var a=s(e);if(a)return i.data&&i.data.constructor===Array&&delete a.data,d.render(t.extend(!0,{},a,i))},d.render=function(e){var t=new F(e);return c.call(t)},d.clearCacheKey=function(e){return e=t.extend({},e),delete e[d.config.checkName],delete e[d.config.indexName],e},d.init(),e(u,d)});
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/login/lay/modules/tree.js b/pluss-manage-page/src/main/resources/static/resources/auth/js/login/lay/modules/tree.js
new file mode 100644
index 0000000..e8c053d
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/login/lay/modules/tree.js
@@ -0,0 +1,2 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ ;layui.define("jquery",function(e){"use strict";var o=layui.$,a=layui.hint(),i="layui-tree-enter",r=function(e){this.options=e},t={arrow:["&#xe623;","&#xe625;"],checkbox:["&#xe626;","&#xe627;"],radio:["&#xe62b;","&#xe62a;"],branch:["&#xe622;","&#xe624;"],leaf:"&#xe621;"};r.prototype.init=function(e){var o=this;e.addClass("layui-box layui-tree"),o.options.skin&&e.addClass("layui-tree-skin-"+o.options.skin),o.tree(e),o.on(e)},r.prototype.tree=function(e,a){var i=this,r=i.options,n=a||r.nodes;layui.each(n,function(a,n){var l=n.children&&n.children.length>0,c=o('<ul class="'+(n.spread?"layui-show":"")+'"></ul>'),s=o(["<li "+(n.spread?'data-spread="'+n.spread+'"':"")+">",function(){return l?'<i class="layui-icon layui-tree-spread">'+(n.spread?t.arrow[1]:t.arrow[0])+"</i>":""}(),function(){return r.check?'<i class="layui-icon layui-tree-check">'+("checkbox"===r.check?t.checkbox[0]:"radio"===r.check?t.radio[0]:"")+"</i>":""}(),function(){return'<a href="'+(n.href||"javascript:;")+'" '+(r.target&&n.href?'target="'+r.target+'"':"")+">"+('<i class="layui-icon layui-tree-'+(l?"branch":"leaf")+'">'+(l?n.spread?t.branch[1]:t.branch[0]:t.leaf)+"</i>")+("<cite>"+(n.name||"未命名")+"</cite></a>")}(),"</li>"].join(""));l&&(s.append(c),i.tree(c,n.children)),e.append(s),"function"==typeof r.click&&i.click(s,n),i.spread(s,n),r.drag&&i.drag(s,n)})},r.prototype.click=function(e,o){var a=this,i=a.options;e.children("a").on("click",function(e){layui.stope(e),i.click(o)})},r.prototype.spread=function(e,o){var a=this,i=(a.options,e.children(".layui-tree-spread")),r=e.children("ul"),n=e.children("a"),l=function(){e.data("spread")?(e.data("spread",null),r.removeClass("layui-show"),i.html(t.arrow[0]),n.find(".layui-icon").html(t.branch[0])):(e.data("spread",!0),r.addClass("layui-show"),i.html(t.arrow[1]),n.find(".layui-icon").html(t.branch[1]))};r[0]&&(i.on("click",l),n.on("dblclick",l))},r.prototype.on=function(e){var a=this,r=a.options,t="layui-tree-drag";e.find("i").on("selectstart",function(e){return!1}),r.drag&&o(document).on("mousemove",function(e){var i=a.move;if(i.from){var r=(i.to,o('<div class="layui-box '+t+'"></div>'));e.preventDefault(),o("."+t)[0]||o("body").append(r);var n=o("."+t)[0]?o("."+t):r;n.addClass("layui-show").html(i.from.elem.children("a").html()),n.css({left:e.pageX+10,top:e.pageY+10})}}).on("mouseup",function(){var e=a.move;e.from&&(e.from.elem.children("a").removeClass(i),e.to&&e.to.elem.children("a").removeClass(i),a.move={},o("."+t).remove())})},r.prototype.move={},r.prototype.drag=function(e,a){var r=this,t=(r.options,e.children("a")),n=function(){var t=o(this),n=r.move;n.from&&(n.to={item:a,elem:e},t.addClass(i))};t.on("mousedown",function(){var o=r.move;o.from={item:a,elem:e}}),t.on("mouseenter",n).on("mousemove",n).on("mouseleave",function(){var e=o(this),a=r.move;a.from&&(delete a.to,e.removeClass(i))})},e("tree",function(e){var i=new r(e=e||{}),t=o(e.elem);return t[0]?void i.init(t):a.error("layui.tree 没有找到"+e.elem+"元素")})});
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/login/lay/modules/upload.js b/pluss-manage-page/src/main/resources/static/resources/auth/js/login/lay/modules/upload.js
new file mode 100644
index 0000000..404d534
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/login/lay/modules/upload.js
@@ -0,0 +1,2 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ ;layui.define("layer",function(e){"use strict";var i=layui.$,t=layui.layer,n=layui.hint(),a=layui.device(),o={config:{},set:function(e){var t=this;return t.config=i.extend({},t.config,e),t},on:function(e,i){return layui.onevent.call(this,r,e,i)}},l=function(){var e=this;return{upload:function(i){e.upload.call(e,i)},config:e.config}},r="upload",u="layui-upload-file",c="layui-upload-form",f="layui-upload-iframe",s="layui-upload-choose",p=function(e){var t=this;t.config=i.extend({},t.config,o.config,e),t.render()};p.prototype.config={accept:"images",exts:"",auto:!0,bindAction:"",url:"",field:"file",method:"post",data:{},drag:!0,size:0,number:0,multiple:!1},p.prototype.render=function(e){var t=this,e=t.config;e.elem=i(e.elem),e.bindAction=i(e.bindAction),t.file(),t.events()},p.prototype.file=function(){var e=this,t=e.config,n=e.elemFile=i(['<input class="'+u+'" type="file" accept="'+t.acceptMime+'" name="'+t.field+'"',t.multiple?" multiple":"",">"].join("")),o=t.elem.next();(o.hasClass(u)||o.hasClass(c))&&o.remove(),a.ie&&a.ie<10&&t.elem.wrap('<div class="layui-upload-wrap"></div>'),e.isFile()?(e.elemFile=t.elem,t.field=t.elem[0].name):t.elem.after(n),a.ie&&a.ie<10&&e.initIE()},p.prototype.initIE=function(){var e=this,t=e.config,n=i('<iframe id="'+f+'" class="'+f+'" name="'+f+'" frameborder="0"></iframe>'),a=i(['<form target="'+f+'" class="'+c+'" method="post" key="set-mine" enctype="multipart/form-data" action="'+t.url+'">',"</form>"].join(""));i("#"+f)[0]||i("body").append(n),t.elem.next().hasClass(c)||(e.elemFile.wrap(a),t.elem.next("."+c).append(function(){var e=[];return layui.each(t.data,function(i,t){t="function"==typeof t?t():t,e.push('<input type="hidden" name="'+i+'" value="'+t+'">')}),e.join("")}()))},p.prototype.msg=function(e){return t.msg(e,{icon:2,shift:6})},p.prototype.isFile=function(){var e=this.config.elem[0];if(e)return"input"===e.tagName.toLocaleLowerCase()&&"file"===e.type},p.prototype.preview=function(e){var i=this;window.FileReader&&layui.each(i.chooseFiles,function(i,t){var n=new FileReader;n.readAsDataURL(t),n.onload=function(){e&&e(i,t,this.result)}})},p.prototype.upload=function(e,t){var n,o=this,l=o.config,r=o.elemFile[0],u=function(){var t=0,n=0,a=e||o.files||o.chooseFiles||r.files,u=function(){l.multiple&&t+n===o.fileLength&&"function"==typeof l.allDone&&l.allDone({total:o.fileLength,successful:t,aborted:n})};layui.each(a,function(e,a){var r=new FormData;r.append(l.field,a),layui.each(l.data,function(e,i){i="function"==typeof i?i():i,r.append(e,i)}),i.ajax({url:l.url,type:"post",data:r,contentType:!1,processData:!1,dataType:"json",headers:l.headers||{},success:function(i){t++,d(e,i),u()},error:function(){n++,o.msg("请求上传接口出现异常"),m(e),u()}})})},c=function(){var e=i("#"+f);o.elemFile.parent().submit(),clearInterval(p.timer),p.timer=setInterval(function(){var i,t=e.contents().find("body");try{i=t.text()}catch(n){o.msg("获取上传后的响应信息出现异常"),clearInterval(p.timer),m()}i&&(clearInterval(p.timer),t.html(""),d(0,i))},30)},d=function(e,i){if(o.elemFile.next("."+s).remove(),r.value="","object"!=typeof i)try{i=JSON.parse(i)}catch(t){return i={},o.msg("请对上传接口返回有效JSON")}"function"==typeof l.done&&l.done(i,e||0,function(e){o.upload(e)})},m=function(e){l.auto&&(r.value=""),"function"==typeof l.error&&l.error(e||0,function(e){o.upload(e)})},h=l.exts,v=function(){var i=[];return layui.each(e||o.chooseFiles,function(e,t){i.push(t.name)}),i}(),g={preview:function(e){o.preview(e)},upload:function(e,i){var t={};t[e]=i,o.upload(t)},pushFile:function(){return o.files=o.files||{},layui.each(o.chooseFiles,function(e,i){o.files[e]=i}),o.files},resetFile:function(e,i,t){var n=new File([i],t);o.files=o.files||{},o.files[e]=n}},y=function(){if("choose"!==t&&!l.auto||(l.choose&&l.choose(g),"choose"!==t))return l.before&&l.before(g),a.ie?a.ie>9?u():c():void u()};if(v=0===v.length?r.value.match(/[^\/\\]+\..+/g)||[]||"":v,0!==v.length){switch(l.accept){case"file":if(h&&!RegExp("\\w\\.("+h+")$","i").test(escape(v)))return o.msg("选择的文件中包含不支持的格式"),r.value="";break;case"video":if(!RegExp("\\w\\.("+(h||"avi|mp4|wma|rmvb|rm|flash|3gp|flv")+")$","i").test(escape(v)))return o.msg("选择的视频中包含不支持的格式"),r.value="";break;case"audio":if(!RegExp("\\w\\.("+(h||"mp3|wav|mid")+")$","i").test(escape(v)))return o.msg("选择的音频中包含不支持的格式"),r.value="";break;default:if(layui.each(v,function(e,i){RegExp("\\w\\.("+(h||"jpg|png|gif|bmp|jpeg$")+")","i").test(escape(i))||(n=!0)}),n)return o.msg("选择的图片中包含不支持的格式"),r.value=""}if(o.fileLength=function(){var i=0,t=e||o.files||o.chooseFiles||r.files;return layui.each(t,function(){i++}),i}(),l.number&&o.fileLength>l.number)return o.msg("同时最多只能上传的数量为："+l.number);if(l.size>0&&!(a.ie&&a.ie<10)){var F;if(layui.each(o.chooseFiles,function(e,i){if(i.size>1024*l.size){var t=l.size/1024;t=t>=1?t.toFixed(2)+"MB":l.size+"KB",r.value="",F=t}}),F)return o.msg("文件不能超过"+F)}y()}},p.prototype.events=function(){var e=this,t=e.config,o=function(i){e.chooseFiles={},layui.each(i,function(i,t){var n=(new Date).getTime();e.chooseFiles[n+"-"+i]=t})},l=function(i,n){var a=e.elemFile,o=i.length>1?i.length+"个文件":(i[0]||{}).name||a[0].value.match(/[^\/\\]+\..+/g)||[]||"";a.next().hasClass(s)&&a.next().remove(),e.upload(null,"choose"),e.isFile()||t.choose||a.after('<span class="layui-inline '+s+'">'+o+"</span>")};t.elem.off("upload.start").on("upload.start",function(){var a=i(this),o=a.attr("lay-data");if(o)try{o=new Function("return "+o)(),e.config=i.extend({},t,o)}catch(l){n.error("Upload element property lay-data configuration item has a syntax error: "+o)}e.config.item=a,e.elemFile[0].click()}),a.ie&&a.ie<10||t.elem.off("upload.over").on("upload.over",function(){var e=i(this);e.attr("lay-over","")}).off("upload.leave").on("upload.leave",function(){var e=i(this);e.removeAttr("lay-over")}).off("upload.drop").on("upload.drop",function(n,a){var r=i(this),u=a.originalEvent.dataTransfer.files||[];r.removeAttr("lay-over"),o(u),t.auto?e.upload(u):l(u)}),e.elemFile.off("upload.change").on("upload.change",function(){var i=this.files||[];o(i),t.auto?e.upload():l(i)}),t.bindAction.off("upload.action").on("upload.action",function(){e.upload()}),t.elem.data("haveEvents")||(e.elemFile.on("change",function(){i(this).trigger("upload.change")}),t.elem.on("click",function(){e.isFile()||i(this).trigger("upload.start")}),t.drag&&t.elem.on("dragover",function(e){e.preventDefault(),i(this).trigger("upload.over")}).on("dragleave",function(e){i(this).trigger("upload.leave")}).on("drop",function(e){e.preventDefault(),i(this).trigger("upload.drop",e)}),t.bindAction.on("click",function(){i(this).trigger("upload.action")}),t.elem.data("haveEvents",!0))},o.render=function(e){var i=new p(e);return l.call(i)},e(r,o)});
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/login/lay/modules/util.js b/pluss-manage-page/src/main/resources/static/resources/auth/js/login/lay/modules/util.js
new file mode 100644
index 0000000..8d38508
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/login/lay/modules/util.js
@@ -0,0 +1,2 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ ;layui.define("jquery",function(t){"use strict";var e=layui.$,i={fixbar:function(t){var i,a,n="layui-fixbar",r="layui-fixbar-top",o=e(document),l=e("body");t=e.extend({showHeight:200},t),t.bar1=t.bar1===!0?"&#xe606;":t.bar1,t.bar2=t.bar2===!0?"&#xe607;":t.bar2,t.bgcolor=t.bgcolor?"background-color:"+t.bgcolor:"";var c=[t.bar1,t.bar2,"&#xe604;"],g=e(['<ul class="'+n+'">',t.bar1?'<li class="layui-icon" lay-type="bar1" style="'+t.bgcolor+'">'+c[0]+"</li>":"",t.bar2?'<li class="layui-icon" lay-type="bar2" style="'+t.bgcolor+'">'+c[1]+"</li>":"",'<li class="layui-icon '+r+'" lay-type="top" style="'+t.bgcolor+'">'+c[2]+"</li>","</ul>"].join("")),s=g.find("."+r),u=function(){var e=o.scrollTop();e>=t.showHeight?i||(s.show(),i=1):i&&(s.hide(),i=0)};e("."+n)[0]||("object"==typeof t.css&&g.css(t.css),l.append(g),u(),g.find("li").on("click",function(){var i=e(this),a=i.attr("lay-type");"top"===a&&e("html,body").animate({scrollTop:0},200),t.click&&t.click.call(this,a)}),o.on("scroll",function(){clearTimeout(a),a=setTimeout(function(){u()},100)}))},countdown:function(t,e,i){var a=this,n="function"==typeof e,r=new Date(t).getTime(),o=new Date(!e||n?(new Date).getTime():e).getTime(),l=r-o,c=[Math.floor(l/864e5),Math.floor(l/36e5)%24,Math.floor(l/6e4)%60,Math.floor(l/1e3)%60];n&&(i=e);var g=setTimeout(function(){a.countdown(t,o+1e3,i)},1e3);return i&&i(l>0?c:[0,0,0,0],e,g),l<=0&&clearTimeout(g),g},timeAgo:function(t,e){var i=this,a=[[],[]],n=(new Date).getTime()-new Date(t).getTime();return n>6912e5?(n=new Date(t),a[0][0]=i.digit(n.getFullYear(),4),a[0][1]=i.digit(n.getMonth()+1),a[0][2]=i.digit(n.getDate()),e||(a[1][0]=i.digit(n.getHours()),a[1][1]=i.digit(n.getMinutes()),a[1][2]=i.digit(n.getSeconds())),a[0].join("-")+" "+a[1].join(":")):n>=864e5?(n/1e3/60/60/24|0)+"天前":n>=36e5?(n/1e3/60/60|0)+"小时前":n>=12e4?(n/1e3/60|0)+"分钟前":n<0?"未来":"刚刚"},digit:function(t,e){var i="";t=String(t),e=e||2;for(var a=t.length;a<e;a++)i+="0";return t<Math.pow(10,e)?i+(0|t):t},toDateString:function(t,e){var i=this,a=new Date(t||new Date),n=[i.digit(a.getFullYear(),4),i.digit(a.getMonth()+1),i.digit(a.getDate())],r=[i.digit(a.getHours()),i.digit(a.getMinutes()),i.digit(a.getSeconds())];return e=e||"yyyy-MM-dd HH:mm:ss",e.replace(/yyyy/g,n[0]).replace(/MM/g,n[1]).replace(/dd/g,n[2]).replace(/HH/g,r[0]).replace(/mm/g,r[1]).replace(/ss/g,r[2])},escape:function(t){return String(t||"").replace(/&(?!#?[a-zA-Z0-9]+;)/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/'/g,"&#39;").replace(/"/g,"&quot;")}};!function(t,e,i){"$:nomunge";function a(){n=e[l](function(){r.each(function(){var e=t(this),i=e.width(),a=e.height(),n=t.data(this,g);(i!==n.w||a!==n.h)&&e.trigger(c,[n.w=i,n.h=a])}),a()},o[s])}var n,r=t([]),o=t.resize=t.extend(t.resize,{}),l="setTimeout",c="resize",g=c+"-special-event",s="delay",u="throttleWindow";o[s]=250,o[u]=!0,t.event.special[c]={setup:function(){if(!o[u]&&this[l])return!1;var e=t(this);r=r.add(e),t.data(this,g,{w:e.width(),h:e.height()}),1===r.length&&a()},teardown:function(){if(!o[u]&&this[l])return!1;var e=t(this);r=r.not(e),e.removeData(g),r.length||clearTimeout(n)},add:function(e){function a(e,a,r){var o=t(this),l=t.data(this,g)||{};l.w=a!==i?a:o.width(),l.h=r!==i?r:o.height(),n.apply(this,arguments)}if(!o[u]&&this[l])return!1;var n;return t.isFunction(e)?(n=e,a):(n=e.handler,void(e.handler=a))}}}(e,window),t("util",i)});
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/login/laydialog.min.js b/pluss-manage-page/src/main/resources/static/resources/auth/js/login/laydialog.min.js
new file mode 100644
index 0000000..1c1835b
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/login/laydialog.min.js
@@ -0,0 +1,117 @@
+/**
+ @Name：layer v3.1.0 Web弹层组件
+ @Author：贤心
+ @Site：http://layer.layui.com
+ @License：MIT
+	 zxh  修改适合I B P S平台的控件
+     1、优化了弹窗iframe传值的。
+     2、增加按钮图标、按钮样式等处理
+     3、修改了alert，confirm等弹窗传值
+     4、增加快捷键的支持，btn.hotKey,监听问题未能很好解决
+     5、layer与原来的layui的冲突修改名字 laydialog
+     6、修正 office控件被遮挡不住的问题
+     7、紧急修复在最新版 Chrome（61.0.3163.79）下遮罩层出现的奇异花屏现象
+ 
+ */!function(t,e){"use strict"
+var i,a,n=t.layui&&layui.define,o={getPath:function(){var t=document.scripts,e=t[t.length-1],i=e.src
+if(!e.getAttribute("merge"))return i.substring(0,i.lastIndexOf("/")+1)}(),config:{},end:{},minIndex:0,minLeft:[],btn:[{label:"&#x786E;&#x5B9A;"},{label:"&#x53D6;&#x6D88;"}],type:["dialog","page","iframe","loading","tips"],getStyle:function(e,i){var a=e.currentStyle?e.currentStyle:t.getComputedStyle(e,null)
+return a[a.getPropertyValue?"getPropertyValue":"getAttribute"](i)},link:function(i,a,n){if(l.path){var s=document.getElementsByTagName("head")[0],c=document.createElement("link")
+"string"==typeof a&&(n=a)
+var r=(n||i).replace(/\.|\//g,""),d="layuicss-"+r,f=0
+c.rel="stylesheet",c.href=l.path+i,c.id=d,document.getElementById(d)||s.appendChild(c),"function"==typeof a&&!function u(){return++f>80?t.console&&console.error("laydialog.css: Invalid"):(1989===parseInt(o.getStyle(document.getElementById(d),"width"))?a():setTimeout(u,100),e)}()}}},l={v:"3.1.0",ie:function(){var e=navigator.userAgent.toLowerCase()
+return t.ActiveXObject||"ActiveXObject"in t?(e.match(/msie\s(\d+)/)||[])[1]||"11":!1}(),index:t.laydialog&&t.laydialog.v?1e5:0,path:o.getPath,config:function(t,e){return t=t||{},l.cache=o.config=i.extend({},o.config,t),l.path=o.config.path||l.path,"string"==typeof t.extend&&(t.extend=[t.extend]),o.config.path&&l.ready(),t.extend?(n?layui.addcss("modules/laydialog/"+t.extend):o.link("theme/"+t.extend),this):this},ready:function(t){var e="laydialog",i="",a=(n?"modules/laydialog/":"theme/")+"default/laydialog.css?v="+l.v+i
+return n?layui.addcss(a,t,e):o.link(a,t,e),this},alert:function(){var t=arguments,a={},n={btn:[{label:"&#x786E;&#x5B9A;",iconCls:"btn btn-primary",hotkey:13,action:function(t,e){"function"==typeof t.config.callback&&t.config.callback(!0),l.close(e)}}],closeBtn:!1,callback:null}
+return a="object"==typeof t[0]?i.extend(!0,n,t[0]):i.extend(!0,n,{content:t[0],callback:e!==t[1]?t[1]:null}),l.open(a)},confirm:function(){var t=arguments,e={},a={content:null,btn:[{label:"&#x786E;&#x5B9A;",iconCls:"btn btn-primary",hotkey:13,action:function(t,e){"function"==typeof t.config.callback&&t.config.callback(!0),l.close(e)}},{label:"&#x53D6;&#x6D88;",iconCls:"btn btn-default",hotkey:27,action:function(t,e){"function"==typeof t.config.callback&&t.config.callback(!1),l.close(e)}}],closeBtn:!1,callback:null}
+if("object"==typeof t[0]){var n=t[0]
+n.btn&&(a.btn[0].label=n.btn[0].label,a.btn[1].label=n.btn[1].label,n.btn=a.btn),e=i.extend({},a,n)}else{var o="&#x4FE1;&#x606F;",s=null,c=[{label:"&#x786E;&#x5B9A;",iconCls:"btn btn-primary",hotkey:13,action:function(t,e){"function"==typeof t.config.callback&&t.config.callback(!0),l.close(e)}},{label:"&#x53D6;&#x6D88;",iconCls:"btn btn-default",hotkey:27,action:function(t,e){"function"==typeof t.config.callback&&t.config.callback(!1),l.close(e)}}]
+2==t.length&&("function"==typeof t[1]&&(s=t[1]),"string"==typeof t[1]&&(o=t[1])),3==t.length&&("function"==typeof t[1]&&(s=t[1]),"string"==typeof t[1]&&(o=t[1]),"function"==typeof t[2]&&(s=t[2])),4==t.length&&("function"==typeof t[1]&&(s=t[1]),"string"==typeof t[1]&&(o=t[1]),"function"==typeof t[2]&&(s=t[2]),t[3]&&(c=[{label:"&#x5426;",iconCls:"btn btn-primary",hotkey:27,action:function(t,e){"function"==typeof t.config.callback&&t.config.callback(!1),l.close(e)}},{label:"&#x662F;",iconCls:"btn btn-default",hotkey:13,action:function(t,e){"function"==typeof t.config.callback&&t.config.callback(!0),l.close(e)}}])),e=i.extend(!0,a,{content:t[0],callback:s,title:o,btn:c,closeBtn:!1})}return l.open(e)},msg:function(t,a,n){var s="function"==typeof a,r=o.config.skin,d=(r?r+" "+r+"-msg":"")||"layui-laydialog-msg",f=c.anim.length-1
+return s&&(n=a),l.open(i.extend({content:t,time:3e3,shade:!1,skin:d,title:!1,closeBtn:!1,btn:!1,resize:!1,end:n},s&&!o.config.skin?{skin:d+" layui-laydialog-hui",anim:f}:function(){return a=a||{},(-1===a.icon||a.icon===e&&!o.config.skin)&&(a.skin=d+" "+(a.skin||"layui-laydialog-hui")),a}()))},load:function(t,e){return l.open(i.extend({type:3,icon:t||0,resize:!1},e))},tips:function(t,e,a){return l.open(i.extend({type:4,content:[t,e],closeBtn:!1,time:3e3,shade:!1,resize:!1,fixed:!1,maxWidth:210},a))}},s=function(t){var e=this
+e.index=++l.index,e.config=i.extend({},e.config,o.config,t),document.body?e.creat():setTimeout(function(){e.creat()},30)}
+s.pt=s.prototype
+var c=["layui-laydialog",".layui-laydialog-title",".layui-laydialog-main",".layui-laydialog-dialog","layui-laydialog-iframe","layui-laydialog-content","layui-laydialog-btn","layui-laydialog-close"]
+c.anim=["laydialog-anim-00","laydialog-anim-01","laydialog-anim-02","laydialog-anim-03","laydialog-anim-04","laydialog-anim-05","laydialog-anim-06"],s.pt.config={type:0,shade:.3,fixed:!0,move:c[1],title:"&#x4FE1;&#x606F;",offset:"auto",area:"auto",closeBtn:1,time:0,zIndex:19891014,maxWidth:360,anim:0,isOutAnim:!0,icon:-1,moveType:1,resize:!0,scrollbar:!0,tips:2,registeredButtonHotkeys:{}},s.pt.newGuid=function(){return"xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g,function(t){var e=16*Math.random()|0,i="x"===t?e:3&e|8
+return i.toString(16)})},s.pt.vessel=function(t,a){var n=this,l=n.index,s=n.config,r=s.zIndex+l,d="object"==typeof s.title,f=s.maxmin&&(1===s.type||2===s.type),u=s.title?'<div class="layui-laydialog-title" style="'+(d?s.title[1]:"")+'">'+(d?s.title[0]:s.title)+"</div>":""
+return s.zIndex=r,a([s.shade?'<div class="layui-laydialog-shade" id="layui-laydialog-shade'+l+'" times="'+l+'" style="'+("z-index:"+(r-1)+"; ")+'"></div>':"",'<div class="'+c[0]+(" layui-laydialog-"+o.type[s.type])+(0!=s.type&&2!=s.type||s.shade?"":" layui-laydialog-border")+" "+(s.skin||"")+'" id="'+c[0]+l+'" type="'+o.type[s.type]+'" times="'+l+'" showtime="'+s.time+'" conType="'+(t?"object":"string")+'" style="z-index: '+r+"; width:"+s.area[0]+";height:"+s.area[1]+(s.fixed?"":";position:absolute;")+'">'+(t&&2!=s.type?"":u)+'<div id="'+(s.id||"")+'" class="layui-laydialog-content'+(0==s.type&&-1!==s.icon?" layui-laydialog-padding":"")+(3==s.type?" layui-laydialog-loading"+s.icon:"")+'">'+(0==s.type&&-1!==s.icon?'<i class="layui-laydialog-ico layui-laydialog-ico'+s.icon+'"></i>':"")+(1==s.type&&t?"":s.content||"")+'</div><span class="layui-laydialog-setwin">'+function(){var t=f?'<a class="layui-laydialog-min" href="javascript:;"><cite></cite></a><a class="layui-laydialog-ico layui-laydialog-max" href="javascript:;"></a>':""
+return s.closeBtn&&(t+='<a class="layui-laydialog-ico '+c[7]+" "+c[7]+(s.title?s.closeBtn:4==s.type?"1":"2")+'" href="javascript:;"></a>'),t}()+"</span>"+(s.btn?function(){var t,i="",a=""
+"string"==typeof s.btn&&(s.btn=[s.btn])
+for(var o=0,l=s.btn.length;l>o;o++)a=s.btn[o].id?s.btn[o].id:n.newGuid()+"btn",t=s.btn[o].iconCls?s.btn[o].iconCls:0==o?"btn btn-primary":"btn btn-default",i+='<a id="'+a+'" class="'+c[6]+o+" "+t+(s.btn[o].hide?" hidden":"")+'">'+s.btn[o].label+"</a>",e!==s.btn[o].hotkey&&(s.registeredButtonHotkeys[s.btn[o].hotkey]=a)
+return'<div class="'+c[6]+" layui-laydialog-btn-"+(s.btnAlign||"")+'">'+i+"</div>"}():"")+(s.resize?'<span class="layui-laydialog-resize"></span>':"")+"</div>"],u,i('<div class="layui-laydialog-move"></div>')),n},s.pt.creat=function(){var t=this,e=t.config,n=t.index,s=e.content,r="object"==typeof s,d=i("body")
+if(!e.id||!i("#"+e.id)[0]){switch("string"==typeof e.area&&(e.area="auto"===e.area?["",""]:[e.area,""]),e.shift&&(e.anim=e.shift),6==l.ie&&(e.fixed=!1),e.type){case 0:e.btn="btn"in e?e.btn:o.btn[0],l.closeAll("dialog")
+break
+case 2:var s=e.content=r?e.content:[e.content||"http://www.ddjd.com","auto"]
+e.content='<iframe scrolling="'+(e.content[1]||"auto")+'" allowtransparency="true" id="'+c[4]+n+'" name="'+c[4]+n+'" onload="this.className=\'\';" class="layui-laydialog-load" frameborder="0" src="'+e.content[0]+'"></iframe>'
+break
+case 3:delete e.title,delete e.closeBtn,-1===e.icon&&0===e.icon,l.closeAll("loading")
+break
+case 4:r||(e.content=[e.content,"body"]),e.follow=e.content[1],e.content=e.content[0]+'<i class="layui-laydialog-TipsG"></i>',delete e.title,e.tips="object"==typeof e.tips?e.tips:[e.tips,!0],e.tipsMore||l.closeAll("tips")}if(t.vessel(r,function(a,l,f){d.append(a[0]),r?function(){2==e.type||4==e.type?function(){i("body").append(a[1])}():function(){s.parents("."+c[0])[0]||(s.data("display",s.css("display")).show().addClass("layui-laydialog-wrap").wrap(a[1]),i("#"+c[0]+n).find("."+c[5]).before(l))}()}():d.append(a[1]),i(".layui-laydialog-move")[0]||d.append(o.moveElem=f),t.laydialogo=i("#"+c[0]+n),e.scrollbar||c.html.css("overflow","hidden").attr("laydialog-full",n)}).auto(n),i("#layui-laydialog-shade"+t.index).css({"background-color":e.shade[1]||"#000",opacity:e.shade[0]||e.shade}),i(document).off("keydown",o.enter).on("keydown",o.enter),t.laydialogo.on("keydown",function(t){i(document).off("keydown",o.enter)}),2==e.type&&6==l.ie&&t.laydialogo.find("iframe").attr("src",s[0]),4==e.type?t.tips():t.offset(),e.fixed&&a.on("resize",function(){t.offset(),(/^\d+%$/.test(e.area[0])||/^\d+%$/.test(e.area[1]))&&t.auto(n),4==e.type&&t.tips()}),e.time<=0||setTimeout(function(){l.close(t.index)},e.time),2==e.type){var f=i("#"+c[4]+n),u=f[0]
+u.dialog=t,u.dialog.config=t.config,u.dialog.callback=t.config.callback,u.dialog.params=t.config.params,u.close=function(e){e||(e=t.index),l.close(e)}}if(t.move().back(),c.anim[e.anim]){var y="laydialog-anim "+c.anim[e.anim]
+t.laydialogo.addClass(y).one("webkitAnimationEnd mozAnimationEnd MSAnimationEnd oanimationend animationend",function(){i(this).removeClass(y)})}e.isOutAnim&&t.laydialogo.data("isOutAnim",!0)}},s.pt.auto=function(t){var e=this,n=e.config,o=i("#"+c[0]+t)
+""===n.area[0]&&n.maxWidth>0&&(l.ie&&l.ie<8&&n.btn&&o.width(o.innerWidth()),o.outerWidth()>n.maxWidth&&o.width(n.maxWidth))
+var s=[o.innerWidth(),o.innerHeight()],r=o.find(c[1]).outerHeight()||0,d=o.find("."+c[6]).outerHeight()||0,f=function(t){t=o.find(t),t.height(s[1]-r-d-2*(0|parseFloat(t.css("padding-top"))))}
+switch(n.type){case 2:f("iframe")
+break
+default:""===n.area[1]?n.maxHeight>0&&o.outerHeight()>n.maxHeight?(s[1]=n.maxHeight,f("."+c[5])):n.fixed&&s[1]>=a.height()&&(s[1]=a.height(),f("."+c[5])):f("."+c[5])}return e},s.pt.offset=function(){var t=this,e=t.config,i=t.laydialogo,n=[i.outerWidth(),i.outerHeight()],o="object"==typeof e.offset
+t.offsetTop=(a.height()-n[1])/2,t.offsetLeft=(a.width()-n[0])/2,o?(t.offsetTop=e.offset[0],t.offsetLeft=e.offset[1]||t.offsetLeft):"auto"!==e.offset&&("t"===e.offset?t.offsetTop=0:"r"===e.offset?t.offsetLeft=a.width()-n[0]:"b"===e.offset?t.offsetTop=a.height()-n[1]:"l"===e.offset?t.offsetLeft=0:"lt"===e.offset?(t.offsetTop=0,t.offsetLeft=0):"lb"===e.offset?(t.offsetTop=a.height()-n[1],t.offsetLeft=0):"rt"===e.offset?(t.offsetTop=0,t.offsetLeft=a.width()-n[0]):"rb"===e.offset?(t.offsetTop=a.height()-n[1],t.offsetLeft=a.width()-n[0]):t.offsetTop=e.offset),e.fixed||(t.offsetTop=/%$/.test(t.offsetTop)?a.height()*parseFloat(t.offsetTop)/100:parseFloat(t.offsetTop),t.offsetLeft=/%$/.test(t.offsetLeft)?a.width()*parseFloat(t.offsetLeft)/100:parseFloat(t.offsetLeft),t.offsetTop+=a.scrollTop(),t.offsetLeft+=a.scrollLeft()),i.attr("minLeft")&&(t.offsetTop=a.height()-(i.find(c[1]).outerHeight()||0),t.offsetLeft=i.css("left")),i.css({top:t.offsetTop,left:t.offsetLeft})},s.pt.tips=function(){var t=this,e=t.config,n=t.laydialogo,o=[n.outerWidth(),n.outerHeight()],l=i(e.follow)
+l[0]||(l=i("body"))
+var s={width:l.outerWidth(),height:l.outerHeight(),top:l.offset().top,left:l.offset().left},r=n.find(".layui-laydialog-TipsG"),d=e.tips[0]
+e.tips[1]||r.remove(),s.autoLeft=function(){s.left+o[0]-a.width()>0?(s.tipLeft=s.left+s.width-o[0],r.css({right:12,left:"auto"})):s.tipLeft=s.left},s.where=[function(){s.autoLeft(),s.tipTop=s.top-o[1]-10,r.removeClass("layui-laydialog-TipsB").addClass("layui-laydialog-TipsT").css("border-right-color",e.tips[1])},function(){s.tipLeft=s.left+s.width+10,s.tipTop=s.top,r.removeClass("layui-laydialog-TipsL").addClass("layui-laydialog-TipsR").css("border-bottom-color",e.tips[1])},function(){s.autoLeft(),s.tipTop=s.top+s.height+10,r.removeClass("layui-laydialog-TipsT").addClass("layui-laydialog-TipsB").css("border-right-color",e.tips[1])},function(){s.tipLeft=s.left-o[0]-10,s.tipTop=s.top,r.removeClass("layui-laydialog-TipsR").addClass("layui-laydialog-TipsL").css("border-bottom-color",e.tips[1])}],s.where[d-1](),1===d?s.top-(a.scrollTop()+o[1]+16)<0&&s.where[2]():2===d?a.width()-(s.left+s.width+o[0]+16)>0||s.where[3]():3===d?s.top-a.scrollTop()+s.height+o[1]+16-a.height()>0&&s.where[0]():4===d&&o[0]+16-s.left>0&&s.where[1](),n.find("."+c[5]).css({"background-color":e.tips[1],"padding-right":e.closeBtn?"30px":""}),n.css({left:s.tipLeft-(e.fixed?a.scrollLeft():0),top:s.tipTop-(e.fixed?a.scrollTop():0)})},s.pt.move=function(){var t=this,e=t.config,n=i(document),s=t.laydialogo,c=s.find(e.move),r=s.find(".layui-laydialog-resize"),d={}
+return e.move&&c.css("cursor","move"),c.on("mousedown",function(t){t.preventDefault(),e.move&&(d.moveStart=!0,d.offset=[t.clientX-parseFloat(s.css("left")),t.clientY-parseFloat(s.css("top"))],o.moveElem.css("cursor","move").show())}),r.on("mousedown",function(t){t.preventDefault(),d.resizeStart=!0,d.offset=[t.clientX,t.clientY],d.area=[s.outerWidth(),s.outerHeight()],o.moveElem.css("cursor","se-resize").show()}),n.on("mousemove",function(i){if(d.moveStart){var n=i.clientX-d.offset[0],o=i.clientY-d.offset[1],c="fixed"===s.css("position")
+if(i.preventDefault(),d.stX=c?0:a.scrollLeft(),d.stY=c?0:a.scrollTop(),!e.moveOut){var r=a.width()-s.outerWidth()+d.stX,f=a.height()-s.outerHeight()+d.stY
+n<d.stX&&(n=d.stX),n>r&&(n=r),o<d.stY&&(o=d.stY),o>f&&(o=f)}s.css({left:n,top:o})}if(e.resize&&d.resizeStart){var n=i.clientX-d.offset[0],o=i.clientY-d.offset[1]
+i.preventDefault(),l.style(t.index,{width:d.area[0]+n,height:d.area[1]+o}),d.isResize=!0,e.resizing&&e.resizing(s)}}).on("mouseup",function(t){d.moveStart&&(delete d.moveStart,o.moveElem.hide(),e.moveEnd&&e.moveEnd(s)),d.resizeStart&&(delete d.resizeStart,o.moveElem.hide())}),t},s.pt.back=function(){function t(){var t=s.cancel&&s.cancel(a.index,n)
+t===!1||l.close(a.index)}var a=this,n=a.laydialogo,s=a.config
+a.openlaydialog(),s.success&&(2==s.type?n.find("iframe").on("load",function(){s.success(n,a.index)}):s.success(n,a.index)),6==l.ie&&a.IE6(n),n.find("."+c[6]).children("a").on("click",function(t){var e=i(this).index(),n=s.btn[e].action
+"function"==typeof n&&n.call(this,a,a.index,s.btn[e],t)}),n.find("."+c[7]).on("click",t),s.shadeClose&&i("#layui-laydialog-shade"+a.index).on("click",function(){l.close(a.index)}),n.find(".layui-laydialog-min").on("click",function(){var t=s.min&&s.min(n)
+t===!1||l.min(a.index,s)}),n.find(".layui-laydialog-max").on("click",function(){i(this).hasClass("layui-laydialog-maxmin")?(l.restore(a.index),s.restore&&s.restore(n)):(l.full(a.index,s),setTimeout(function(){s.full&&s.full(n)},100))}),s.registeredButtonHotkeys&&i(document).on("keyup",{dialog:this},function(t){var a=t.data.dialog
+if(a){var n=a.config
+if(e!==n.registeredButtonHotkeys[t.which]){var o=i("#"+n.registeredButtonHotkeys[t.which])
+!o.prop("disabled")&&o.focus().trigger("click")}}}),s.end&&(o.end[a.index]=s.end)},o.reselect=function(){i.each(i("select"),function(t,e){var a=i(this)
+a.parents("."+c[0])[0]||1==a.attr("laydialog")&&i("."+c[0]).length<1&&a.removeAttr("laydialog").show(),a=null})},s.pt.IE6=function(t){i("select").each(function(t,e){var a=i(this)
+a.parents("."+c[0])[0]||"none"===a.css("display")||a.attr({laydialog:"1"}).hide(),a=null})},s.pt.openlaydialog=function(){var t=this
+l.zIndex=t.config.zIndex,l.setTop=function(t){var e=function(){l.zIndex++,t.css("z-index",l.zIndex+1)}
+return l.zIndex=parseInt(t[0].style.zIndex),t.on("mousedown",e),l.zIndex}},o.record=function(t){var e=[t.width(),t.height(),t.position().top,t.position().left+parseFloat(t.css("margin-left"))]
+t.find(".layui-laydialog-max").addClass("layui-laydialog-maxmin"),t.attr({area:e})},o.rescollbar=function(t){c.html.attr("laydialog-full")==t&&(c.html[0].style.removeProperty?c.html[0].style.removeProperty("overflow"):c.html[0].style.removeAttribute("overflow"),c.html.removeAttr("laydialog-full"))},t.laydialog=l,l.getChildFrameWindow=function(t){return t=t||i("."+c[4]).attr("times"),i("#"+c[0]+t).find("iframe")[0].contentWindow},l.getChildFrame=function(t,e){return e=e||i("."+c[4]).attr("times"),i("#"+c[0]+e).find("iframe").contents().find(t)},l.getFrameIndex=function(t){return i("#"+t).parents("."+c[4]).attr("times")},l.iframeAuto=function(t){if(t){var e=l.getChildFrame("html",t).outerHeight(),a=i("#"+c[0]+t),n=a.find(c[1]).outerHeight()||0,o=a.find("."+c[6]).outerHeight()||0
+a.css({height:e+n+o}),a.find("iframe").css({height:e})}},l.iframeSrc=function(t,e){i("#"+c[0]+t).find("iframe").attr("src",e)},l.style=function(t,e,a){var n=i("#"+c[0]+t),l=n.find(".layui-laydialog-content"),s=n.attr("type"),r=n.find(c[1]).outerHeight()||0,d=n.find("."+c[6]).outerHeight()||0
+n.attr("minLeft")
+s!==o.type[3]&&s!==o.type[4]&&(a||(parseFloat(e.width)<=260&&(e.width=260),parseFloat(e.height)-r-d<=64&&(e.height=64+r+d)),n.css(e),d=n.find("."+c[6]).outerHeight(),s===o.type[2]?n.find("iframe").css({height:parseFloat(e.height)-r-d}):l.css({height:parseFloat(e.height)-r-d-parseFloat(l.css("padding-top"))-parseFloat(l.css("padding-bottom"))}))},l.min=function(t,e){var n=i("#"+c[0]+t),s=n.find(c[1]).outerHeight()||50,r=n.attr("minLeft")||181*o.minIndex+"px",d=n.css("position")
+o.record(n),o.minLeft[0]&&(r=o.minLeft[0],o.minLeft.shift()),n.attr("position",d),l.style(t,{width:180,height:s,left:r,top:a.height()-s,position:"fixed",overflow:"hidden"},!0),n.find(".layui-laydialog-min").hide(),"page"===n.attr("type")&&n.find(c[4]).hide(),o.rescollbar(t),n.attr("minLeft")||o.minIndex++,n.attr("minLeft",r)},l.restore=function(t){var e=i("#"+c[0]+t),a=e.attr("area").split(",")
+e.attr("type")
+l.style(t,{width:parseFloat(a[0]),height:parseFloat(a[1]),top:parseFloat(a[2]),left:parseFloat(a[3]),position:e.attr("position"),overflow:"visible"},!0),e.find(".layui-laydialog-max").removeClass("layui-laydialog-maxmin"),e.find(".layui-laydialog-min").show(),"page"===e.attr("type")&&e.find(c[4]).show(),o.rescollbar(t)},l.full=function(t){var e,n=i("#"+c[0]+t)
+o.record(n),c.html.attr("laydialog-full")||c.html.css("overflow","hidden").attr("laydialog-full",t),clearTimeout(e),e=setTimeout(function(){var e="fixed"===n.css("position")
+l.style(t,{top:e?0:a.scrollTop(),left:e?0:a.scrollLeft(),width:a.width(),height:a.height()},!0),n.find(".layui-laydialog-min").hide()},100)},l.title=function(t,e){var a=i("#"+c[0]+(e||l.index)).find(c[1])
+a.html(t)},l.close=function(t){var e=i("#"+c[0]+t),a=e.attr("type"),n="laydialog-anim-close"
+if(e[0]){var s="layui-laydialog-wrap",r=function(){if(a===o.type[1]&&"object"===e.attr("conType")){e.children(":not(."+c[5]+")").remove()
+for(var n=e.find("."+s),l=0;2>l;l++)n.unwrap()
+n.css("display",n.data("display")).removeClass(s)}else{if(a===o.type[2])try{var r=i("#"+c[4]+t)[0]
+r.contentWindow.document.write(""),r.contentWindow.close(),e.find("."+c[5])[0].removeChild(r)}catch(d){}e[0].innerHTML="",e.remove()}"function"==typeof o.end[t]&&o.end[t](),delete o.end[t]
+try{i("#laydialog_iframe"+c[4]+t).remove()}catch(d){}}
+e.data("isOutAnim")&&e.addClass("laydialog-anim "+n),i("#layui-laydialog-moves, #layui-laydialog-shade"+t).remove(),6==l.ie&&o.reselect(),o.rescollbar(t),e.attr("minLeft")&&(o.minIndex--,o.minLeft.push(e.attr("minLeft"))),l.ie&&l.ie<10||!e.data("isOutAnim")?r():setTimeout(function(){r()},200)}},l.closeAll=function(t){i.each(i("."+c[0]),function(){var e=i(this),a=t?e.attr("type")===t:1
+a&&l.close(e.attr("times")),a=null})}
+var r=l.cache||{},d=function(t){return r.skin?" "+r.skin+" "+r.skin+"-"+t:""}
+l.prompt=function(t,e){var n=""
+if(t=t||{},"function"==typeof t&&(e=t),t.area){var o=t.area
+n='style="width: '+o[0]+"; height: "+o[1]+';"',delete t.area}var s,c=2==t.formType?'<textarea class="layui-laydialog-input"'+n+">"+(t.value||"")+"</textarea>":function(){return'<input type="'+(1==t.formType?"password":"text")+'" class="layui-laydialog-input" value="'+(t.value||"")+'">'}(),r=t.success
+return delete t.success,l.open(i.extend({type:1,btn:[{label:"&#x786E;&#x5B9A;",iconCls:"btn btn-primary",action:function(t,e){t.config.yes(e)}},{label:"&#x53D6;&#x6D88;",iconCls:"btn btn-default",action:function(t,e){"function"==typeof t.config.callback&&t.config.callback(!1),l.close(e)}}],content:c,skin:"layui-laydialog-prompt"+d("prompt"),maxWidth:a.width(),success:function(t){s=t.find(".layui-laydialog-input"),s.focus(),"function"==typeof r&&r(t)},resize:!1,yes:function(i){var a=s.val()
+""===a?s.focus():a.length>(t.maxlength||500)?l.tips("&#x6700;&#x591A;&#x8F93;&#x5165;"+(t.maxlength||500)+"&#x4E2A;&#x5B57;&#x6570;",s,{tips:1}):e&&e(a,i,s)}},t))},l.tab=function(t){t=t||{}
+var e=t.tab||{},a="layui-this",n=t.success
+return delete t.success,l.open(i.extend({type:1,skin:"layui-laydialog-tab"+d("tab"),resize:!1,title:function(){var t=e.length,i=1,n=""
+if(t>0)for(n='<span class="'+a+'">'+e[0].title+"</span>";t>i;i++)n+="<span>"+e[i].title+"</span>"
+return n}(),content:'<ul class="layui-laydialog-tabmain">'+function(){var t=e.length,i=1,n=""
+if(t>0)for(n='<li class="layui-laydialog-tabli '+a+'">'+(e[0].content||"no content")+"</li>";t>i;i++)n+='<li class="layui-laydialog-tabli">'+(e[i].content||"no  content")+"</li>"
+return n}()+"</ul>",success:function(e){var o=e.find(".layui-laydialog-title").children(),l=e.find(".layui-laydialog-tabmain").children()
+o.on("mousedown",function(e){e.stopPropagation?e.stopPropagation():e.cancelBubble=!0
+var n=i(this),o=n.index()
+n.addClass(a).siblings().removeClass(a),l.eq(o).show().siblings().hide(),"function"==typeof t.change&&t.change(o)}),"function"==typeof n&&n(e)}},t))},l.photos=function(a,n,o){function s(t,i,a){var n=new Image
+return n.src=t,n.complete?i(n):(n.onload=function(){n.onload=null,i(n)},n.onerror=function(t){n.onerror=null,a(t)},e)}var c={}
+if(a=a||{},a.photos){var r=a.photos.constructor===Object,f=r?a.photos:{},u=f.data||[],y=f.start||0
+c.imgIndex=(0|y)+1,a.img=a.img||"img"
+var g=a.success
+if(delete a.success,r){if(0===u.length)return l.msg("&#x6CA1;&#x6709;&#x56FE;&#x7247;")}else{var p=i(a.photos),h=function(){u=[],p.find(a.img).each(function(t){var e=i(this)
+e.attr("laydialog-index",t),u.push({alt:e.attr("alt"),pid:e.attr("laydialog-pid"),src:e.attr("laydialog-src")||e.attr("src"),thumb:e.attr("src")})})}
+if(h(),0===u.length)return
+if(n||p.on("click",a.img,function(){var t=i(this),e=t.attr("laydialog-index")
+l.photos(i.extend(a,{photos:{start:e,data:u,tab:a.tab},full:a.full}),!0),h()}),!n)return}c.imgprev=function(t){c.imgIndex--,c.imgIndex<1&&(c.imgIndex=u.length),c.tabimg(t)},c.imgnext=function(t,e){c.imgIndex++,c.imgIndex>u.length&&(c.imgIndex=1,e)||c.tabimg(t)},c.keyup=function(t){if(!c.end){var e=t.keyCode
+t.preventDefault(),37===e?c.imgprev(!0):39===e?c.imgnext(!0):27===e&&l.close(c.index)}},c.tabimg=function(t){return u.length<=1?e:(f.start=c.imgIndex-1,l.close(c.index),l.photos(a,!0,t))},c.event=function(){c.bigimg.hover(function(){c.imgsee.show()},function(){c.imgsee.hide()}),c.bigimg.find(".layui-laydialog-imgprev").on("click",function(t){t.preventDefault(),c.imgprev()}),c.bigimg.find(".layui-laydialog-imgnext").on("click",function(t){t.preventDefault(),c.imgnext()}),i(document).on("keyup",c.keyup)},c.loadi=l.load(1,{shade:"shade"in a?!1:.9,scrollbar:!1}),s(u[y].src,function(e){l.close(c.loadi),c.index=l.open(i.extend({type:1,id:"layui-laydialog-photos",area:function(){var n=[e.width,e.height],o=[i(t).width()-100,i(t).height()-100]
+if(!a.full&&(n[0]>o[0]||n[1]>o[1])){var l=[n[0]/o[0],n[1]/o[1]]
+l[0]>l[1]?(n[0]=n[0]/l[0],n[1]=n[1]/l[0]):l[0]<l[1]&&(n[0]=n[0]/l[1],n[1]=n[1]/l[1])}return[n[0]+"px",n[1]+"px"]}(),title:!1,shade:.9,shadeClose:!0,closeBtn:!1,move:".layui-laydialog-phimg img",moveType:1,scrollbar:!1,moveOut:!0,isOutAnim:!1,skin:"layui-laydialog-photos"+d("photos"),content:'<div class="layui-laydialog-phimg"><img src="'+u[y].src+'" alt="'+(u[y].alt||"")+'" laydialog-pid="'+u[y].pid+'"><div class="layui-laydialog-imgsee">'+(u.length>1?'<span class="layui-laydialog-imguide"><a href="javascript:;" class="layui-laydialog-iconext layui-laydialog-imgprev"></a><a href="javascript:;" class="layui-laydialog-iconext layui-laydialog-imgnext"></a></span>':"")+'<div class="layui-laydialog-imgbar" style="display:'+(o?"block":"")+'"><span class="layui-laydialog-imgtit"><a href="javascript:;">'+(u[y].alt||"")+"</a><em>"+c.imgIndex+"/"+u.length+"</em></span></div></div></div>",success:function(t,e){c.bigimg=t.find(".layui-laydialog-phimg"),c.imgsee=t.find(".layui-laydialog-imguide,.layui-laydialog-imgbar"),c.event(t),a.tab&&a.tab(u[y],t),"function"==typeof g&&g(t)},end:function(){c.end=!0,i(document).off("keyup",c.keyup)}},a))},function(){l.close(c.loadi),l.msg("&#x5F53;&#x524D;&#x56FE;&#x7247;&#x5730;&#x5740;&#x5F02;&#x5E38;<br>&#x662F;&#x5426;&#x7EE7;&#x7EED;&#x67E5;&#x770B;&#x4E0B;&#x4E00;&#x5F20;&#xFF1F;",{time:3e4,btn:["&#x4E0B;&#x4E00;&#x5F20;","&#x4E0D;&#x770B;&#x4E86;"],yes:function(){u.length>1&&c.imgnext(!0,!0)}})})}},o.run=function(e){i=e,a=i(t),c.html=i("html"),l.open=function(t){var e=new s(t)
+return e.index}},t.layui&&layui.define?(l.ready(),layui.define("jquery",function(e){l.path=layui.cache.dir,o.run(layui.$),t.laydialog=l,e("laydialog",l)})):"function"==typeof define&&define.amd?define(["jquery"],function(){return o.run(t.jQuery),l}):function(){o.run(t.jQuery),l.ready()}()}(window)
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/login/layui.js b/pluss-manage-page/src/main/resources/static/resources/auth/js/login/layui.js
new file mode 100644
index 0000000..1c6062a
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/login/layui.js
@@ -0,0 +1,5 @@
+/*! MIT Licensed */;!function(t){"use strict";var e=t.document,r={modules:{},status:{},timeout:10,event:{}},n=function(){this.v="2.6.7"},o=t.LAYUI_GLOBAL||{},a=function(){var t=e.currentScript?e.currentScript.src:function(){for(var t,r=e.scripts,n=r.length-1,o=n;o>0;o--)if("interactive"===r[o].readyState){t=r[o].src;break}return t||r[n].src}();return r.dir=o.dir||t.substring(0,t.lastIndexOf("/")+1)}(),i=function(e,r){r=r||"log",t.console&&console[r]&&console[r]("layui error hint: "+e)},u="undefined"!=typeof opera&&"[object Opera]"===opera.toString(),l=r.builtin={lay:"lay",layer:"layer",laydate:"laydate",laypage:"laypage",laytpl:"laytpl",layedit:"layedit",form:"form",upload:"upload",dropdown:"dropdown",transfer:"transfer",tree:"tree",table:"table",element:"element",rate:"rate",colorpicker:"colorpicker",slider:"slider",carousel:"carousel",flow:"flow",util:"util",code:"code",jquery:"jquery",all:"all","layui.all":"layui.all"};n.prototype.cache=r,n.prototype.define=function(t,e){var n=this,o="function"==typeof t,a=function(){var t=function(t,e){layui[t]=e,r.status[t]=!0};return"function"==typeof e&&e(function(n,o){t(n,o),r.callback[n]=function(){e(t)}}),this};return o&&(e=t,t=[]),n.use(t,a,null,"define"),n},n.prototype.use=function(n,o,c,s){function p(t,e){var n="PLaySTATION 3"===navigator.platform?/^complete$/:/^(complete|loaded)$/;("load"===t.type||n.test((t.currentTarget||t.srcElement).readyState))&&(r.modules[h]=e,v.removeChild(b),function o(){return++m>1e3*r.timeout/4?i(h+" is not a valid module","error"):void(r.status[h]?f():setTimeout(o,4))}())}function f(){c.push(layui[h]),n.length>1?y.use(n.slice(1),o,c,s):"function"==typeof o&&function(){return layui.jquery&&"function"==typeof layui.jquery&&"define"!==s?layui.jquery(function(){o.apply(layui,c)}):void o.apply(layui,c)}()}var y=this,d=r.dir=r.dir?r.dir:a,v=e.getElementsByTagName("head")[0];n=function(){return"string"==typeof n?[n]:"function"==typeof n?(o=n,["all"]):n}(),t.jQuery&&jQuery.fn.on&&(y.each(n,function(t,e){"jquery"===e&&n.splice(t,1)}),layui.jquery=layui.$=jQuery);var h=n[0],m=0;if(c=c||[],r.host=r.host||(d.match(/\/\/([\s\S]+?)\//)||["//"+location.host+"/"])[0],0===n.length||layui["layui.all"]&&l[h])return f(),y;var g=(l[h]?d+"modules/":/^\{\/\}/.test(y.modules[h])?"":r.base||"")+(y.modules[h]||h)+".js";if(g=g.replace(/^\{\/\}/,""),!r.modules[h]&&layui[h]&&(r.modules[h]=g),r.modules[h])!function S(){return++m>1e3*r.timeout/4?i(h+" is not a valid module","error"):void("string"==typeof r.modules[h]&&r.status[h]?f():setTimeout(S,4))}();else{var b=e.createElement("script");b.async=!0,b.charset="utf-8",b.src=g+function(){var t=r.version===!0?r.v||(new Date).getTime():r.version||"";return t?"?v="+t:""}(),v.appendChild(b),!b.attachEvent||b.attachEvent.toString&&b.attachEvent.toString().indexOf("[native code")<0||u?b.addEventListener("load",function(t){p(t,g)},!1):b.attachEvent("onreadystatechange",function(t){p(t,g)}),r.modules[h]=g}return y},n.prototype.getStyle=function(e,r){var n=e.currentStyle?e.currentStyle:t.getComputedStyle(e,null);return n[n.getPropertyValue?"getPropertyValue":"getAttribute"](r)},n.prototype.link=function(t,n,o){var a=this,u=e.getElementsByTagName("head")[0],l=e.createElement("link");"string"==typeof n&&(o=n);var c=(o||t).replace(/\.|\//g,""),s=l.id="layuicss-"+c,p="creating",f=0;return l.rel="stylesheet",l.href=t+(r.debug?"?v="+(new Date).getTime():""),l.media="all",e.getElementById(s)||u.appendChild(l),"function"!=typeof n?a:(function y(o){var u=100,l=e.getElementById(s);return++f>1e3*r.timeout/u?i(t+" timeout"):void(1989===parseInt(a.getStyle(l,"width"))?(o===p&&l.removeAttribute("lay-status"),l.getAttribute("lay-status")===p?setTimeout(y,u):n()):(l.setAttribute("lay-status",p),setTimeout(function(){y(p)},u)))}(),a)},n.prototype.addcss=function(t,e,n){return layui.link(r.dir+"css/"+t,e,n)},r.callback={},n.prototype.factory=function(t){if(layui[t])return"function"==typeof r.callback[t]?r.callback[t]:null},n.prototype.img=function(t,e,r){var n=new Image;return n.src=t,n.complete?e(n):(n.onload=function(){n.onload=null,"function"==typeof e&&e(n)},void(n.onerror=function(t){n.onerror=null,"function"==typeof r&&r(t)}))},n.prototype.config=function(t){t=t||{};for(var e in t)r[e]=t[e];return this},n.prototype.modules=function(){var t={};for(var e in l)t[e]=l[e];return t}(),n.prototype.extend=function(t){var e=this;t=t||{};for(var r in t)e[r]||e.modules[r]?i(r+" Module already exists","error"):e.modules[r]=t[r];return e},n.prototype.router=function(t){var e=this,t=t||location.hash,r={path:[],search:{},hash:(t.match(/[^#](#.*$)/)||[])[1]||""};return/^#\//.test(t)?(t=t.replace(/^#\//,""),r.href="/"+t,t=t.replace(/([^#])(#.*$)/,"$1").split("/")||[],e.each(t,function(t,e){/^\w+=/.test(e)?function(){e=e.split("="),r.search[e[0]]=e[1]}():r.path.push(e)}),r):r},n.prototype.url=function(t){var e=this,r={pathname:function(){var e=t?function(){var e=(t.match(/\.[^.]+?\/.+/)||[])[0]||"";return e.replace(/^[^\/]+/,"").replace(/\?.+/,"")}():location.pathname;return e.replace(/^\//,"").split("/")}(),search:function(){var r={},n=(t?function(){var e=(t.match(/\?.+/)||[])[0]||"";return e.replace(/\#.+/,"")}():location.search).replace(/^\?+/,"").split("&");return e.each(n,function(t,e){var n=e.indexOf("="),o=function(){return n<0?e.substr(0,e.length):0!==n&&e.substr(0,n)}();o&&(r[o]=n>0?e.substr(n+1):null)}),r}(),hash:e.router(function(){return t?(t.match(/#.+/)||[])[0]||"/":location.hash}())};return r},n.prototype.data=function(e,r,n){if(e=e||"layui",n=n||localStorage,t.JSON&&t.JSON.parse){if(null===r)return delete n[e];r="object"==typeof r?r:{key:r};try{var o=JSON.parse(n[e])}catch(a){var o={}}return"value"in r&&(o[r.key]=r.value),r.remove&&delete o[r.key],n[e]=JSON.stringify(o),r.key?o[r.key]:o}},n.prototype.sessionData=function(t,e){return this.data(t,e,sessionStorage)},n.prototype.device=function(e){var r=navigator.userAgent.toLowerCase(),n=function(t){var e=new RegExp(t+"/([^\\s\\_\\-]+)");return t=(r.match(e)||[])[1],t||!1},o={os:function(){return/windows/.test(r)?"windows":/linux/.test(r)?"linux":/iphone|ipod|ipad|ios/.test(r)?"ios":/mac/.test(r)?"mac":void 0}(),ie:function(){return!!(t.ActiveXObject||"ActiveXObject"in t)&&((r.match(/msie\s(\d+)/)||[])[1]||"11")}(),weixin:n("micromessenger")};return e&&!o[e]&&(o[e]=n(e)),o.android=/android/.test(r),o.ios="ios"===o.os,o.mobile=!(!o.android&&!o.ios),o},n.prototype.hint=function(){return{error:i}},n.prototype._typeof=function(t){return null===t?String(t):"object"==typeof t||"function"==typeof t?function(){var e=Object.prototype.toString.call(t).match(/\s(.+)\]$/)||[],r="Function|Array|Date|RegExp|Object|Error|Symbol";return e=e[1]||"Object",new RegExp("\\b("+r+")\\b").test(e)?e.toLowerCase():"object"}():typeof t},n.prototype._isArray=function(e){var r,n=this,o=n._typeof(e);return!(!e||"object"!=typeof e||e===t)&&(r="length"in e&&e.length,"array"===o||0===r||"number"==typeof r&&r>0&&r-1 in e)},n.prototype.each=function(t,e){var r,n=this,o=function(t,r){return e.call(r[t],t,r[t])};if("function"!=typeof e)return n;if(t=t||[],n._isArray(t))for(r=0;r<t.length&&!o(r,t);r++);else for(r in t)if(o(r,t))break;return n},n.prototype.sort=function(t,e,r){var n=JSON.parse(JSON.stringify(t||[]));return e?(n.sort(function(t,r){var n=/^-?\d+$/,o=t[e],a=r[e];return n.test(o)&&(o=parseFloat(o)),n.test(a)&&(a=parseFloat(a)),o-a}),r&&n.reverse(),n):n},n.prototype.stope=function(e){e=e||t.event;try{e.stopPropagation()}catch(r){e.cancelBubble=!0}};var c="LAYUI-EVENT-REMOVE";n.prototype.onevent=function(t,e,r){return"string"!=typeof t||"function"!=typeof r?this:n.event(t,e,null,r)},n.prototype.event=n.event=function(t,e,n,o){var a=this,i=null,u=(e||"").match(/\((.*)\)$/)||[],l=(t+"."+e).replace(u[0],""),s=u[1]||"",p=function(t,e){var r=e&&e.call(a,n);r===!1&&null===i&&(i=!1)};return n===c?(delete(a.cache.event[l]||{})[s],a):o?(r.event[l]=r.event[l]||{},r.event[l][s]=[o],this):(layui.each(r.event[l],function(t,e){return"{*}"===s?void layui.each(e,p):(""===t&&layui.each(e,p),void(s&&t===s&&layui.each(e,p)))}),i)},n.prototype.on=function(t,e,r){var n=this;return n.onevent.call(n,e,t,r)},n.prototype.off=function(t,e){var r=this;return r.event.call(r,e,t,c)},t.layui=new n}(window);layui.define(function(a){var i=layui.cache;layui.config({dir:i.dir.replace(/lay\/dest\/$/,"")}),a("layui.all",layui.v)});!function(t){"use strict";var e="lay",n=t.document,r=function(t){return new o(t)},o=function(t){for(var e=0,r="object"==typeof t?[t]:(this.selector=t,n.querySelectorAll(t||null));e<r.length;e++)this.push(r[e])};o.prototype=[],o.prototype.constructor=o,r.extend=function(){var t=1,e=arguments,n=function(t,e){t=t||(e.constructor===Array?[]:{});for(var r in e)t[r]=e[r]&&e[r].constructor===Object?n(t[r],e[r]):e[r];return t};for(e[0]="object"==typeof e[0]?e[0]:{};t<e.length;t++)"object"==typeof e[t]&&n(e[0],e[t]);return e[0]},r.v="1.0.7",r.ie=function(){var e=navigator.userAgent.toLowerCase();return!!(t.ActiveXObject||"ActiveXObject"in t)&&((e.match(/msie\s(\d+)/)||[])[1]||"11")}(),r.layui=layui,r.getPath=layui.cache.dir,r.stope=layui.stope,r.each=function(){return layui.each.apply(layui,arguments),this},r.digit=function(t,e,n){var r="";t=String(t),e=e||2;for(var o=t.length;o<e;o++)r+="0";return t<Math.pow(10,e)?r+(0|t):t},r.elem=function(t,e){var o=n.createElement(t);return r.each(e||{},function(t,e){o.setAttribute(t,e)}),o},r.hasScrollbar=function(){return n.body.scrollHeight>(t.innerHeight||n.documentElement.clientHeight)},r.position=function(e,o,i){if(o){i=i||{},e!==n&&e!==r("body")[0]||(i.clickType="right");var c="right"===i.clickType?function(){var e=i.e||t.event||{};return{left:e.clientX,top:e.clientY,right:e.clientX,bottom:e.clientY}}():e.getBoundingClientRect(),u=o.offsetWidth,a=o.offsetHeight,s=function(t){return t=t?"scrollLeft":"scrollTop",n.body[t]|n.documentElement[t]},f=function(t){return n.documentElement[t?"clientWidth":"clientHeight"]},l=5,h=c.left,p=c.bottom;h+u+l>f("width")&&(h=f("width")-u-l),p+a+l>f()&&(c.top>a+l?p=c.top-a-2*l:"right"===i.clickType&&(p=f()-a-2*l,p<0&&(p=0)));var y=i.position;if(y&&(o.style.position=y),o.style.left=h+("fixed"===y?0:s(1))+"px",o.style.top=p+("fixed"===y?0:s())+"px",!r.hasScrollbar()){var d=o.getBoundingClientRect();!i.SYSTEM_RELOAD&&d.bottom+l>f()&&(i.SYSTEM_RELOAD=!0,setTimeout(function(){r.position(e,o,i)},50))}}},r.options=function(t,e){var n=r(t),o=e||"lay-options";try{return new Function("return "+(n.attr(o)||"{}"))()}catch(i){return hint.error("parseerror\uff1a"+i,"error"),{}}},r.isTopElem=function(t){var e=[n,r("body")[0]],o=!1;return r.each(e,function(e,n){if(n===t)return o=!0}),o},o.addStr=function(t,e){return t=t.replace(/\s+/," "),e=e.replace(/\s+/," ").split(" "),r.each(e,function(e,n){new RegExp("\\b"+n+"\\b").test(t)||(t=t+" "+n)}),t.replace(/^\s|\s$/,"")},o.removeStr=function(t,e){return t=t.replace(/\s+/," "),e=e.replace(/\s+/," ").split(" "),r.each(e,function(e,n){var r=new RegExp("\\b"+n+"\\b");r.test(t)&&(t=t.replace(r,""))}),t.replace(/\s+/," ").replace(/^\s|\s$/,"")},o.prototype.find=function(t){var e=this,n=0,o=[],i="object"==typeof t;return this.each(function(r,c){for(var u=i?c.contains(t):c.querySelectorAll(t||null);n<u.length;n++)o.push(u[n]);e.shift()}),i||(e.selector=(e.selector?e.selector+" ":"")+t),r.each(o,function(t,n){e.push(n)}),e},o.prototype.each=function(t){return r.each.call(this,this,t)},o.prototype.addClass=function(t,e){return this.each(function(n,r){r.className=o[e?"removeStr":"addStr"](r.className,t)})},o.prototype.removeClass=function(t){return this.addClass(t,!0)},o.prototype.hasClass=function(t){var e=!1;return this.each(function(n,r){new RegExp("\\b"+t+"\\b").test(r.className)&&(e=!0)}),e},o.prototype.css=function(t,e){var n=this,o=function(t){return isNaN(t)?t:t+"px"};return"string"==typeof t&&void 0===e?function(){if(n.length>0)return n[0].style[t]}():n.each(function(n,i){"object"==typeof t?r.each(t,function(t,e){i.style[t]=o(e)}):i.style[t]=o(e)})},o.prototype.width=function(t){var e=this;return void 0===t?function(){if(e.length>0)return e[0].offsetWidth}():e.each(function(n,r){e.css("width",t)})},o.prototype.height=function(t){var e=this;return void 0===t?function(){if(e.length>0)return e[0].offsetHeight}():e.each(function(n,r){e.css("height",t)})},o.prototype.attr=function(t,e){var n=this;return void 0===e?function(){if(n.length>0)return n[0].getAttribute(t)}():n.each(function(n,r){r.setAttribute(t,e)})},o.prototype.removeAttr=function(t){return this.each(function(e,n){n.removeAttribute(t)})},o.prototype.html=function(t){var e=this;return void 0===t?function(){if(e.length>0)return e[0].innerHTML}():this.each(function(e,n){n.innerHTML=t})},o.prototype.val=function(t){var e=this;return void 0===t?function(){if(e.length>0)return e[0].value}():this.each(function(e,n){n.value=t})},o.prototype.append=function(t){return this.each(function(e,n){"object"==typeof t?n.appendChild(t):n.innerHTML=n.innerHTML+t})},o.prototype.remove=function(t){return this.each(function(e,n){t?n.removeChild(t):n.parentNode.removeChild(n)})},o.prototype.on=function(t,e){return this.each(function(n,r){r.attachEvent?r.attachEvent("on"+t,function(t){t.target=t.srcElement,e.call(r,t)}):r.addEventListener(t,e,!1)})},o.prototype.off=function(t,e){return this.each(function(n,r){r.detachEvent?r.detachEvent("on"+t,e):r.removeEventListener(t,e,!1)})},t.lay=r,t.layui&&layui.define&&layui.define(function(t){t(e,r)})}(window,window.document);layui.define(function(e){"use strict";var r={open:"{{",close:"}}"},c={exp:function(e){return new RegExp(e,"g")},query:function(e,c,t){var o=["#([\\s\\S])+?","([^{#}])*?"][e||0];return n((c||"")+r.open+o+r.close+(t||""))},escape:function(e){return String(e||"").replace(/&(?!#?[a-zA-Z0-9]+;)/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/'/g,"&#39;").replace(/"/g,"&quot;")},error:function(e,r){var c="Laytpl Error: ";return"object"==typeof console&&console.error(c+e+"\n"+(r||"")),c+e}},n=c.exp,t=function(e){this.tpl=e};t.pt=t.prototype,window.errors=0,t.pt.parse=function(e,t){var o=this,p=e,a=n("^"+r.open+"#",""),l=n(r.close+"$","");e=e.replace(/\s+|\r|\t|\n/g," ").replace(n(r.open+"#"),r.open+"# ").replace(n(r.close+"}"),"} "+r.close).replace(/\\/g,"\\\\").replace(n(r.open+"!(.+?)!"+r.close),function(e){return e=e.replace(n("^"+r.open+"!"),"").replace(n("!"+r.close),"").replace(n(r.open+"|"+r.close),function(e){return e.replace(/(.)/g,"\\$1")})}).replace(/(?="|')/g,"\\").replace(c.query(),function(e){return e=e.replace(a,"").replace(l,""),'";'+e.replace(/\\(.)/g,"$1")+';view+="'}).replace(c.query(1),function(e){var c='"+(';return e.replace(/\s/g,"")===r.open+r.close?"":(e=e.replace(n(r.open+"|"+r.close),""),/^=/.test(e)&&(e=e.replace(/^=/,""),c='"+_escape_('),c+e.replace(/\\(.)/g,"$1")+')+"')}),e='"use strict";var view = "'+e+'";return view;';try{return o.cache=e=new Function("d, _escape_",e),e(t,c.escape)}catch(u){return delete o.cache,c.error(u,p)}},t.pt.render=function(e,r){var n,t=this;return e?(n=t.cache?t.cache(e,c.escape):t.parse(t.tpl,e),r?void r(n):n):c.error("no data")};var o=function(e){return"string"!=typeof e?c.error("Template not found"):new t(e)};o.config=function(e){e=e||{};for(var c in e)r[c]=e[c]},o.v="1.2.0",e("laytpl",o)});layui.define(function(e){"use strict";var a=document,t="getElementById",n="getElementsByTagName",i="laypage",r="layui-disabled",u=function(e){var a=this;a.config=e||{},a.config.index=++s.index,a.render(!0)};u.prototype.type=function(){var e=this.config;if("object"==typeof e.elem)return void 0===e.elem.length?2:3},u.prototype.view=function(){var e=this,a=e.config,t=a.groups="groups"in a?0|a.groups:5;a.layout="object"==typeof a.layout?a.layout:["prev","page","next"],a.count=0|a.count,a.curr=0|a.curr||1,a.limits="object"==typeof a.limits?a.limits:[10,20,30,40,50],a.limit=0|a.limit||10,a.pages=Math.ceil(a.count/a.limit)||1,a.curr>a.pages&&(a.curr=a.pages),t<0?t=1:t>a.pages&&(t=a.pages),a.prev="prev"in a?a.prev:"&#x4E0A;&#x4E00;&#x9875;",a.next="next"in a?a.next:"&#x4E0B;&#x4E00;&#x9875;";var n=a.pages>t?Math.ceil((a.curr+(t>1?1:0))/(t>0?t:1)):1,i={prev:function(){return a.prev?'<a href="javascript:;" class="layui-laypage-prev'+(1==a.curr?" "+r:"")+'" data-page="'+(a.curr-1)+'">'+a.prev+"</a>":""}(),page:function(){var e=[];if(a.count<1)return"";n>1&&a.first!==!1&&0!==t&&e.push('<a href="javascript:;" class="layui-laypage-first" data-page="1"  title="&#x9996;&#x9875;">'+(a.first||1)+"</a>");var i=Math.floor((t-1)/2),r=n>1?a.curr-i:1,u=n>1?function(){var e=a.curr+(t-i-1);return e>a.pages?a.pages:e}():t;for(u-r<t-1&&(r=u-t+1),a.first!==!1&&r>2&&e.push('<span class="layui-laypage-spr">&#x2026;</span>');r<=u;r++)r===a.curr?e.push('<span class="layui-laypage-curr"><em class="layui-laypage-em" '+(/^#/.test(a.theme)?'style="background-color:'+a.theme+';"':"")+"></em><em>"+r+"</em></span>"):e.push('<a href="javascript:;" data-page="'+r+'">'+r+"</a>");return a.pages>t&&a.pages>u&&a.last!==!1&&(u+1<a.pages&&e.push('<span class="layui-laypage-spr">&#x2026;</span>'),0!==t&&e.push('<a href="javascript:;" class="layui-laypage-last" title="&#x5C3E;&#x9875;"  data-page="'+a.pages+'">'+(a.last||a.pages)+"</a>")),e.join("")}(),next:function(){return a.next?'<a href="javascript:;" class="layui-laypage-next'+(a.curr==a.pages?" "+r:"")+'" data-page="'+(a.curr+1)+'">'+a.next+"</a>":""}(),count:'<span class="layui-laypage-count">\u5171 '+a.count+" \u6761</span>",limit:function(){var e=['<span class="layui-laypage-limits"><select lay-ignore>'];return layui.each(a.limits,function(t,n){e.push('<option value="'+n+'"'+(n===a.limit?"selected":"")+">"+n+" \u6761/\u9875</option>")}),e.join("")+"</select></span>"}(),refresh:['<a href="javascript:;" data-page="'+a.curr+'" class="layui-laypage-refresh">','<i class="layui-icon layui-icon-refresh"></i>',"</a>"].join(""),skip:function(){return['<span class="layui-laypage-skip">&#x5230;&#x7B2C;','<input type="text" min="1" value="'+a.curr+'" class="layui-input">','&#x9875;<button type="button" class="layui-laypage-btn">&#x786e;&#x5b9a;</button>',"</span>"].join("")}()};return['<div class="layui-box layui-laypage layui-laypage-'+(a.theme?/^#/.test(a.theme)?"molv":a.theme:"default")+'" id="layui-laypage-'+a.index+'">',function(){var e=[];return layui.each(a.layout,function(a,t){i[t]&&e.push(i[t])}),e.join("")}(),"</div>"].join("")},u.prototype.jump=function(e,a){if(e){var t=this,i=t.config,r=e.children,u=e[n]("button")[0],l=e[n]("input")[0],p=e[n]("select")[0],c=function(){var e=0|l.value.replace(/\s|\D/g,"");e&&(i.curr=e,t.render())};if(a)return c();for(var o=0,y=r.length;o<y;o++)"a"===r[o].nodeName.toLowerCase()&&s.on(r[o],"click",function(){var e=0|this.getAttribute("data-page");e<1||e>i.pages||(i.curr=e,t.render())});p&&s.on(p,"change",function(){var e=this.value;i.curr*e>i.count&&(i.curr=Math.ceil(i.count/e)),i.limit=e,t.render()}),u&&s.on(u,"click",function(){c()})}},u.prototype.skip=function(e){if(e){var a=this,t=e[n]("input")[0];t&&s.on(t,"keyup",function(t){var n=this.value,i=t.keyCode;/^(37|38|39|40)$/.test(i)||(/\D/.test(n)&&(this.value=n.replace(/\D/,"")),13===i&&a.jump(e,!0))})}},u.prototype.render=function(e){var n=this,i=n.config,r=n.type(),u=n.view();2===r?i.elem&&(i.elem.innerHTML=u):3===r?i.elem.html(u):a[t](i.elem)&&(a[t](i.elem).innerHTML=u),i.jump&&i.jump(i,e);var s=a[t]("layui-laypage-"+i.index);n.jump(s),i.hash&&!e&&(location.hash="!"+i.hash+"="+i.curr),n.skip(s)};var s={render:function(e){var a=new u(e);return a.index},index:layui.laypage?layui.laypage.index+1e4:0,on:function(e,a,t){return e.attachEvent?e.attachEvent("on"+a,function(a){a.target=a.srcElement,t.call(e,a)}):e.addEventListener(a,t,!1),this}};e(i,s)});!function(e,t){"use strict";var a=e.layui&&layui.define,n={getPath:e.lay&&lay.getPath?lay.getPath:"",link:function(t,a,n){l.path&&e.lay&&lay.layui&&lay.layui.link(l.path+t,a,n)}},i=e.LAYUI_GLOBAL||{},l={v:"5.3.1",config:{},index:e.laydate&&e.laydate.v?1e5:0,path:i.laydate_dir||n.getPath,set:function(e){var t=this;return t.config=lay.extend({},t.config,e),t},ready:function(e){var t="laydate",i="",r=(a?"modules/laydate/":"theme/")+"default/laydate.css?v="+l.v+i;return a?layui.addcss(r,e,t):n.link(r,e,t),this}},r=function(){var e=this,t=e.config,a=t.id;return r.that[a]=e,{hint:function(t){e.hint.call(e,t)},config:e.config}},o="laydate",s=".layui-laydate",y="layui-this",d="laydate-disabled",m=[100,2e5],c="layui-laydate-static",u="layui-laydate-list",h="layui-laydate-hint",f="layui-laydate-footer",p=".laydate-btns-confirm",g="laydate-time-text",v="laydate-btns-time",T="layui-laydate-preview",D=function(e){var t=this;t.index=++l.index,t.config=lay.extend({},t.config,l.config,e),e=t.config,e.id="id"in e?e.id:t.index,l.ready(function(){t.init()})},w="yyyy|y|MM|M|dd|d|HH|H|mm|m|ss|s";r.formatArr=function(e){return(e||"").match(new RegExp(w+"|.","g"))||[]},D.isLeapYear=function(e){return e%4===0&&e%100!==0||e%400===0},D.prototype.config={type:"date",range:!1,format:"yyyy-MM-dd",value:null,isInitValue:!0,min:"1900-1-1",max:"2099-12-31",trigger:"click",show:!1,showBottom:!0,isPreview:!0,btns:["clear","now","confirm"],lang:"cn",theme:"default",position:null,calendar:!1,mark:{},zIndex:null,done:null,change:null},D.prototype.lang=function(){var e=this,t=e.config,a={cn:{weeks:["\u65e5","\u4e00","\u4e8c","\u4e09","\u56db","\u4e94","\u516d"],time:["\u65f6","\u5206","\u79d2"],timeTips:"\u9009\u62e9\u65f6\u95f4",startTime:"\u5f00\u59cb\u65f6\u95f4",endTime:"\u7ed3\u675f\u65f6\u95f4",dateTips:"\u8fd4\u56de\u65e5\u671f",month:["\u4e00","\u4e8c","\u4e09","\u56db","\u4e94","\u516d","\u4e03","\u516b","\u4e5d","\u5341","\u5341\u4e00","\u5341\u4e8c"],tools:{confirm:"\u786e\u5b9a",clear:"\u6e05\u7a7a",now:"\u73b0\u5728"},timeout:"\u7ed3\u675f\u65f6\u95f4\u4e0d\u80fd\u65e9\u4e8e\u5f00\u59cb\u65f6\u95f4<br>\u8bf7\u91cd\u65b0\u9009\u62e9",invalidDate:"\u4e0d\u5728\u6709\u6548\u65e5\u671f\u6216\u65f6\u95f4\u8303\u56f4\u5185",formatError:["\u65e5\u671f\u683c\u5f0f\u4e0d\u5408\u6cd5<br>\u5fc5\u987b\u9075\u5faa\u4e0b\u8ff0\u683c\u5f0f\uff1a<br>","<br>\u5df2\u4e3a\u4f60\u91cd\u7f6e"],preview:"\u5f53\u524d\u9009\u4e2d\u7684\u7ed3\u679c"},en:{weeks:["Su","Mo","Tu","We","Th","Fr","Sa"],time:["Hours","Minutes","Seconds"],timeTips:"Select Time",startTime:"Start Time",endTime:"End Time",dateTips:"Select Date",month:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],tools:{confirm:"Confirm",clear:"Clear",now:"Now"},timeout:"End time cannot be less than start Time<br>Please re-select",invalidDate:"Invalid date",formatError:["The date format error<br>Must be followed\uff1a<br>","<br>It has been reset"],preview:"The selected result"}};return a[t.lang]||a.cn},D.prototype.init=function(){var t=this,a=t.config,n="static"===a.position,i={year:"yyyy",month:"yyyy-MM",date:"yyyy-MM-dd",time:"HH:mm:ss",datetime:"yyyy-MM-dd HH:mm:ss"};a.elem=lay(a.elem),a.eventElem=lay(a.eventElem),a.elem[0]&&(t.rangeStr=a.range?"string"==typeof a.range?a.range:"-":"",a.range&&a.range.constructor===Array&&(t.rangeElem=[lay(a.range[0]),lay(a.range[1])]),i[a.type]||(e.console&&console.error&&console.error("laydate type error:'"+a.type+"' is not supported"),a.type="date"),a.format===i.date&&(a.format=i[a.type]||i.date),t.format=r.formatArr(a.format),t.EXP_IF="",t.EXP_SPLIT="",lay.each(t.format,function(e,a){var n=new RegExp(w).test(a)?"\\d{"+function(){return new RegExp(w).test(t.format[0===e?e+1:e-1]||"")?/^yyyy|y$/.test(a)?4:a.length:/^yyyy$/.test(a)?"1,4":/^y$/.test(a)?"1,308":"1,2"}()+"}":"\\"+a;t.EXP_IF=t.EXP_IF+n,t.EXP_SPLIT=t.EXP_SPLIT+"("+n+")"}),t.EXP_IF_ONE=new RegExp("^"+t.EXP_IF+"$"),t.EXP_IF=new RegExp("^"+(a.range?t.EXP_IF+"\\s\\"+t.rangeStr+"\\s"+t.EXP_IF:t.EXP_IF)+"$"),t.EXP_SPLIT=new RegExp("^"+t.EXP_SPLIT+"$",""),t.isInput(a.elem[0])||"focus"===a.trigger&&(a.trigger="click"),a.elem.attr("lay-key")||(a.elem.attr("lay-key",t.index),a.eventElem.attr("lay-key",t.index)),a.mark=lay.extend({},a.calendar&&"cn"===a.lang?{"0-1-1":"\u5143\u65e6","0-2-14":"\u60c5\u4eba","0-3-8":"\u5987\u5973","0-3-12":"\u690d\u6811","0-4-1":"\u611a\u4eba","0-5-1":"\u52b3\u52a8","0-5-4":"\u9752\u5e74","0-6-1":"\u513f\u7ae5","0-9-10":"\u6559\u5e08","0-9-18":"\u56fd\u803b","0-10-1":"\u56fd\u5e86","0-12-25":"\u5723\u8bde"}:{},a.mark),lay.each(["min","max"],function(e,t){var n=[],i=[];if("number"==typeof a[t]){var l=a[t],r=(new Date).getTime(),o=864e5,s=new Date(l?l<o?r+l*o:l:r);n=[s.getFullYear(),s.getMonth()+1,s.getDate()],l<o||(i=[s.getHours(),s.getMinutes(),s.getSeconds()])}else n=(a[t].match(/\d+-\d+-\d+/)||[""])[0].split("-"),i=(a[t].match(/\d+:\d+:\d+/)||[""])[0].split(":");a[t]={year:0|n[0]||(new Date).getFullYear(),month:n[1]?(0|n[1])-1:(new Date).getMonth(),date:0|n[2]||(new Date).getDate(),hours:0|i[0],minutes:0|i[1],seconds:0|i[2]}}),t.elemID="layui-laydate"+a.elem.attr("lay-key"),(a.show||n)&&t.render(),n||t.events(),a.value&&a.isInitValue&&(a.value.constructor===Date?t.setValue(t.parse(0,t.systemDate(a.value))):t.setValue(a.value)))},D.prototype.render=function(){var e=this,a=e.config,n=e.lang(),i="static"===a.position,r=e.elem=lay.elem("div",{id:e.elemID,"class":["layui-laydate",a.range?" layui-laydate-range":"",i?" "+c:"",a.theme&&"default"!==a.theme&&!/^#/.test(a.theme)?" laydate-theme-"+a.theme:""].join("")}),o=e.elemMain=[],s=e.elemHeader=[],y=e.elemCont=[],d=e.table=[],m=e.footer=lay.elem("div",{"class":f});if(a.zIndex&&(r.style.zIndex=a.zIndex),lay.each(new Array(2),function(e){if(!a.range&&e>0)return!0;var t=lay.elem("div",{"class":"layui-laydate-header"}),i=[function(){var e=lay.elem("i",{"class":"layui-icon laydate-icon laydate-prev-y"});return e.innerHTML="&#xe65a;",e}(),function(){var e=lay.elem("i",{"class":"layui-icon laydate-icon laydate-prev-m"});return e.innerHTML="&#xe603;",e}(),function(){var e=lay.elem("div",{"class":"laydate-set-ym"}),t=lay.elem("span"),a=lay.elem("span");return e.appendChild(t),e.appendChild(a),e}(),function(){var e=lay.elem("i",{"class":"layui-icon laydate-icon laydate-next-m"});return e.innerHTML="&#xe602;",e}(),function(){var e=lay.elem("i",{"class":"layui-icon laydate-icon laydate-next-y"});return e.innerHTML="&#xe65b;",e}()],l=lay.elem("div",{"class":"layui-laydate-content"}),r=lay.elem("table"),m=lay.elem("thead"),c=lay.elem("tr");lay.each(i,function(e,a){t.appendChild(a)}),m.appendChild(c),lay.each(new Array(6),function(e){var t=r.insertRow(0);lay.each(new Array(7),function(a){if(0===e){var i=lay.elem("th");i.innerHTML=n.weeks[a],c.appendChild(i)}t.insertCell(a)})}),r.insertBefore(m,r.children[0]),l.appendChild(r),o[e]=lay.elem("div",{"class":"layui-laydate-main laydate-main-list-"+e}),o[e].appendChild(t),o[e].appendChild(l),s.push(i),y.push(l),d.push(r)}),lay(m).html(function(){var e=[],t=[];return"datetime"===a.type&&e.push('<span lay-type="datetime" class="'+v+'">'+n.timeTips+"</span>"),(a.range||"datetime"!==a.type)&&e.push('<span class="'+T+'" title="'+n.preview+'"></span>'),lay.each(a.btns,function(e,l){var r=n.tools[l]||"btn";a.range&&"now"===l||(i&&"clear"===l&&(r="cn"===a.lang?"\u91cd\u7f6e":"Reset"),t.push('<span lay-type="'+l+'" class="laydate-btns-'+l+'">'+r+"</span>"))}),e.push('<div class="laydate-footer-btns">'+t.join("")+"</div>"),e.join("")}()),lay.each(o,function(e,t){r.appendChild(t)}),a.showBottom&&r.appendChild(m),/^#/.test(a.theme)){var u=lay.elem("style"),h=["#{{id}} .layui-laydate-header{background-color:{{theme}};}","#{{id}} .layui-this{background-color:{{theme}} !important;}"].join("").replace(/{{id}}/g,e.elemID).replace(/{{theme}}/g,a.theme);"styleSheet"in u?(u.setAttribute("type","text/css"),u.styleSheet.cssText=h):u.innerHTML=h,lay(r).addClass("laydate-theme-molv"),r.appendChild(u)}l.thisId=a.id,e.remove(D.thisElemDate),i?a.elem.append(r):(t.body.appendChild(r),e.position()),e.checkDate().calendar(null,0,"init"),e.changeEvent(),D.thisElemDate=e.elemID,"function"==typeof a.ready&&a.ready(lay.extend({},a.dateTime,{month:a.dateTime.month+1})),e.preview()},D.prototype.remove=function(e){var t=this,a=(t.config,lay("#"+(e||t.elemID)));return a[0]?(a.hasClass(c)||t.checkDate(function(){a.remove()}),t):t},D.prototype.position=function(){var e=this,t=e.config;return lay.position(e.bindElem||t.elem[0],e.elem,{position:t.position}),e},D.prototype.hint=function(e){var t=this,a=(t.config,lay.elem("div",{"class":h}));t.elem&&(a.innerHTML=e||"",lay(t.elem).find("."+h).remove(),t.elem.appendChild(a),clearTimeout(t.hinTimer),t.hinTimer=setTimeout(function(){lay(t.elem).find("."+h).remove()},3e3))},D.prototype.getAsYM=function(e,t,a){return a?t--:t++,t<0&&(t=11,e--),t>11&&(t=0,e++),[e,t]},D.prototype.systemDate=function(e){var t=e||new Date;return{year:t.getFullYear(),month:t.getMonth(),date:t.getDate(),hours:e?e.getHours():0,minutes:e?e.getMinutes():0,seconds:e?e.getSeconds():0}},D.prototype.checkDate=function(e){var t,a,n=this,i=(new Date,n.config),r=n.lang(),o=i.dateTime=i.dateTime||n.systemDate(),s=n.bindElem||i.elem[0],y=(n.isInput(s)?"val":"html",function(){if(n.rangeElem){var e=[n.rangeElem[0].val(),n.rangeElem[1].val()];if(e[0]&&e[1])return e.join(" "+n.rangeStr+" ")}return n.isInput(s)?s.value:"static"===i.position?"":lay(s).attr("lay-date")}()),d=function(e){e.year>m[1]&&(e.year=m[1],a=!0),e.month>11&&(e.month=11,a=!0),e.hours>23&&(e.hours=0,a=!0),e.minutes>59&&(e.minutes=0,e.hours++,a=!0),e.seconds>59&&(e.seconds=0,e.minutes++,a=!0),t=l.getEndDate(e.month+1,e.year),e.date>t&&(e.date=t,a=!0)},c=function(e,t,l){var r=["startTime","endTime"];t=(t.match(n.EXP_SPLIT)||[]).slice(1),l=l||0,i.range&&(n[r[l]]=n[r[l]]||{}),lay.each(n.format,function(o,s){var y=parseFloat(t[o]);t[o].length<s.length&&(a=!0),/yyyy|y/.test(s)?(y<m[0]&&(y=m[0],a=!0),e.year=y):/MM|M/.test(s)?(y<1&&(y=1,a=!0),e.month=y-1):/dd|d/.test(s)?(y<1&&(y=1,a=!0),e.date=y):/HH|H/.test(s)?(y<1&&(y=0,a=!0),e.hours=y,i.range&&(n[r[l]].hours=y)):/mm|m/.test(s)?(y<1&&(y=0,a=!0),e.minutes=y,i.range&&(n[r[l]].minutes=y)):/ss|s/.test(s)&&(y<1&&(y=0,a=!0),e.seconds=y,i.range&&(n[r[l]].seconds=y))}),d(e)};if("limit"===e)return d(o),n;y=y||i.value,"string"==typeof y&&(y=y.replace(/\s+/g," ").replace(/^\s|\s$/g,""));var u=function(){i.range&&(n.endDate=n.endDate||lay.extend({},i.dateTime,function(){var e={},t=i.dateTime,a=n.getAsYM(t.year,t.month);return"year"===i.type?e.year=t.year+1:"time"!==i.type&&(e.year=a[0],e.month=a[1]),"datetime"!==i.type&&"time"!==i.type||(e.hours=23,e.minutes=e.seconds=59),e}()))};u(),"string"==typeof y&&y?n.EXP_IF.test(y)?i.range?(y=y.split(" "+n.rangeStr+" "),lay.each([i.dateTime,n.endDate],function(e,t){c(t,y[e],e)})):c(o,y):(n.hint(r.formatError[0]+(i.range?i.format+" "+n.rangeStr+" "+i.format:i.format)+r.formatError[1]),a=!0):y&&y.constructor===Date?i.dateTime=n.systemDate(y):(i.dateTime=n.systemDate(),delete n.startTime,delete n.endDate,u(),delete n.endTime),function(){if(n.rangeElem){var e=[n.rangeElem[0].val(),n.rangeElem[1].val()],t=[i.dateTime,n.endDate];lay.each(e,function(e,a){n.EXP_IF_ONE.test(a)&&c(t[e],a,e)})}}(),d(o),i.range&&d(n.endDate),a&&y&&n.setValue(i.range?n.endDate?n.parse():"":n.parse());var h=function(e){return n.newDate(e).getTime()};return(h(o)>h(i.max)||h(o)<h(i.min))&&(o=i.dateTime=lay.extend({},i.min)),i.range&&(h(n.endDate)<h(i.min)||h(n.endDate)>h(i.max))&&(n.endDate=lay.extend({},i.max)),e&&e(),n},D.prototype.mark=function(e,t){var a,n=this,i=n.config;return lay.each(i.mark,function(e,n){var i=e.split("-");i[0]!=t[0]&&0!=i[0]||i[1]!=t[1]&&0!=i[1]||i[2]!=t[2]||(a=n||t[2])}),a&&e.html('<span class="laydate-day-mark">'+a+"</span>"),n},D.prototype.limit=function(e,t,a,n){var i,l=this,r=l.config,o={},s=r[a>41?"endDate":"dateTime"],y=lay.extend({},s,t||{});return lay.each({now:y,min:r.min,max:r.max},function(e,t){o[e]=l.newDate(lay.extend({year:t.year,month:t.month,date:t.date},function(){var e={};return lay.each(n,function(a,n){e[n]=t[n]}),e}())).getTime()}),i=o.now<o.min||o.now>o.max,e&&e[i?"addClass":"removeClass"](d),i},D.prototype.thisDateTime=function(e){var t=this,a=t.config;return e?t.endDate:a.dateTime},D.prototype.calendar=function(e,t,a){var n,i,r,o=this,s=o.config,t=t?1:0,d=e||o.thisDateTime(t),c=new Date,u=o.lang(),h="date"!==s.type&&"datetime"!==s.type,f=lay(o.table[t]).find("td"),g=lay(o.elemHeader[t][2]).find("span");return d.year<m[0]&&(d.year=m[0],o.hint(u.invalidDate)),d.year>m[1]&&(d.year=m[1],o.hint(u.invalidDate)),o.firstDate||(o.firstDate=lay.extend({},d)),c.setFullYear(d.year,d.month,1),n=c.getDay(),i=l.getEndDate(d.month||12,d.year),r=l.getEndDate(d.month+1,d.year),lay.each(f,function(e,t){var a=[d.year,d.month],l=0;t=lay(t),t.removeAttr("class"),e<n?(l=i-n+e,t.addClass("laydate-day-prev"),a=o.getAsYM(d.year,d.month,"sub")):e>=n&&e<r+n?(l=e-n,l+1===d.date&&t.addClass(y)):(l=e-r-n,t.addClass("laydate-day-next"),a=o.getAsYM(d.year,d.month)),a[1]++,a[2]=l+1,t.attr("lay-ymd",a.join("-")).html(a[2]),o.mark(t,a).limit(t,{year:a[0],month:a[1]-1,date:a[2]},e)}),lay(g[0]).attr("lay-ym",d.year+"-"+(d.month+1)),lay(g[1]).attr("lay-ym",d.year+"-"+(d.month+1)),"cn"===s.lang?(lay(g[0]).attr("lay-type","year").html(d.year+" \u5e74"),lay(g[1]).attr("lay-type","month").html(d.month+1+" \u6708")):(lay(g[0]).attr("lay-type","month").html(u.month[d.month]),lay(g[1]).attr("lay-type","year").html(d.year)),h&&(s.range?e&&(o.listYM=[[s.dateTime.year,s.dateTime.month+1],[o.endDate.year,o.endDate.month+1]],o.list(s.type,0).list(s.type,1),"time"===s.type?o.setBtnStatus("\u65f6\u95f4",lay.extend({},o.systemDate(),o.startTime),lay.extend({},o.systemDate(),o.endTime)):o.setBtnStatus(!0)):(o.listYM=[[d.year,d.month+1]],o.list(s.type,0))),s.range&&"init"===a&&!e&&o.calendar(o.endDate,1),s.range||o.limit(lay(o.footer).find(p),null,0,["hours","minutes","seconds"]),o.setBtnStatus(),o},D.prototype.list=function(e,t){var a=this,n=a.config,i=n.dateTime,l=a.lang(),r=n.range&&"date"!==n.type&&"datetime"!==n.type,o=lay.elem("ul",{"class":u+" "+{year:"laydate-year-list",month:"laydate-month-list",time:"laydate-time-list"}[e]}),s=a.elemHeader[t],m=lay(s[2]).find("span"),c=a.elemCont[t||0],h=lay(c).find("."+u)[0],f="cn"===n.lang,T=f?"\u5e74":"",D=a.listYM[t]||{},w=["hours","minutes","seconds"],x=["startTime","endTime"][t];if(D[0]<1&&(D[0]=1),"year"===e){var M,E=M=D[0]-7;E<1&&(E=M=1),lay.each(new Array(15),function(e){var i=lay.elem("li",{"lay-ym":M}),l={year:M};M==D[0]&&lay(i).addClass(y),i.innerHTML=M+T,o.appendChild(i),M<a.firstDate.year?(l.month=n.min.month,l.date=n.min.date):M>=a.firstDate.year&&(l.month=n.max.month,l.date=n.max.date),a.limit(lay(i),l,t),M++}),lay(m[f?0:1]).attr("lay-ym",M-8+"-"+D[1]).html(E+T+" - "+(M-1+T))}else if("month"===e)lay.each(new Array(12),function(e){var i=lay.elem("li",{"lay-ym":e}),r={year:D[0],month:e};e+1==D[1]&&lay(i).addClass(y),i.innerHTML=l.month[e]+(f?"\u6708":""),o.appendChild(i),D[0]<a.firstDate.year?r.date=n.min.date:D[0]>=a.firstDate.year&&(r.date=n.max.date),a.limit(lay(i),r,t)}),lay(m[f?0:1]).attr("lay-ym",D[0]+"-"+D[1]).html(D[0]+T);else if("time"===e){var C=function(){lay(o).find("ol").each(function(e,n){lay(n).find("li").each(function(n,i){a.limit(lay(i),[{hours:n},{hours:a[x].hours,minutes:n},{hours:a[x].hours,minutes:a[x].minutes,seconds:n}][e],t,[["hours"],["hours","minutes"],["hours","minutes","seconds"]][e])})}),n.range||a.limit(lay(a.footer).find(p),a[x],0,["hours","minutes","seconds"])};n.range?a[x]||(a[x]="startTime"===x?i:a.endDate):a[x]=i,lay.each([24,60,60],function(e,t){var n=lay.elem("li"),i=["<p>"+l.time[e]+"</p><ol>"];lay.each(new Array(t),function(t){i.push("<li"+(a[x][w[e]]===t?' class="'+y+'"':"")+">"+lay.digit(t,2)+"</li>")}),n.innerHTML=i.join("")+"</ol>",o.appendChild(n)}),C()}if(h&&c.removeChild(h),c.appendChild(o),"year"===e||"month"===e)lay(a.elemMain[t]).addClass("laydate-ym-show"),lay(o).find("li").on("click",function(){var l=0|lay(this).attr("lay-ym");if(!lay(this).hasClass(d)){0===t?(i[e]=l,a.limit(lay(a.footer).find(p),null,0)):a.endDate[e]=l;var s="year"===n.type||"month"===n.type;s?(lay(o).find("."+y).removeClass(y),lay(this).addClass(y),"month"===n.type&&"year"===e&&(a.listYM[t][0]=l,r&&((t?a.endDate:i).year=l),a.list("month",t))):(a.checkDate("limit").calendar(null,t),a.closeList()),a.setBtnStatus(),n.range||("month"===n.type&&"month"===e||"year"===n.type&&"year"===e)&&a.setValue(a.parse()).remove().done(),a.done(null,"change"),lay(a.footer).find("."+v).removeClass(d)}});else{var I=lay.elem("span",{"class":g}),k=function(){lay(o).find("ol").each(function(e){var t=this,n=lay(t).find("li");t.scrollTop=30*(a[x][w[e]]-2),t.scrollTop<=0&&n.each(function(e,a){if(!lay(this).hasClass(d))return t.scrollTop=30*(e-2),!0})})},b=lay(s[2]).find("."+g);k(),I.innerHTML=n.range?[l.startTime,l.endTime][t]:l.timeTips,lay(a.elemMain[t]).addClass("laydate-time-show"),b[0]&&b.remove(),s[2].appendChild(I),lay(o).find("ol").each(function(e){var t=this;lay(t).find("li").on("click",function(){var l=0|this.innerHTML;lay(this).hasClass(d)||(n.range?a[x][w[e]]=l:i[w[e]]=l,lay(t).find("."+y).removeClass(y),lay(this).addClass(y),C(),k(),(a.endDate||"time"===n.type)&&a.done(null,"change"),a.setBtnStatus())})})}return a},D.prototype.listYM=[],D.prototype.closeList=function(){var e=this;e.config;lay.each(e.elemCont,function(t,a){lay(this).find("."+u).remove(),lay(e.elemMain[t]).removeClass("laydate-ym-show laydate-time-show")}),lay(e.elem).find("."+g).remove()},D.prototype.setBtnStatus=function(e,t,a){var n,i=this,l=i.config,r=i.lang(),o=lay(i.footer).find(p);l.range&&"time"!==l.type&&(t=t||l.dateTime,a=a||i.endDate,n=i.newDate(t).getTime()>i.newDate(a).getTime(),i.limit(null,t)||i.limit(null,a)?o.addClass(d):o[n?"addClass":"removeClass"](d),e&&n&&i.hint("string"==typeof e?r.timeout.replace(/\u65e5\u671f/g,e):r.timeout))},D.prototype.parse=function(e,t){var a=this,n=a.config,i=t||("end"==e?lay.extend({},a.endDate,a.endTime):n.range?lay.extend({},n.dateTime,a.startTime):n.dateTime),r=l.parse(i,a.format,1);return n.range&&void 0===e?r+" "+a.rangeStr+" "+a.parse("end"):r},D.prototype.newDate=function(e){return e=e||{},new Date(e.year||1,e.month||0,e.date||1,e.hours||0,e.minutes||0,e.seconds||0)},D.prototype.setValue=function(e){var t=this,a=t.config,n=t.bindElem||a.elem[0];return"static"===a.position?t:(e=e||"",t.isInput(n)?lay(n).val(e):t.rangeElem?(t.rangeElem[0].val(e?t.parse("start"):""),t.rangeElem[1].val(e?t.parse("end"):"")):(0===lay(n).find("*").length&&lay(n).html(e),lay(n).attr("lay-date",e)),t)},D.prototype.preview=function(){var e=this,t=e.config;if(t.isPreview){var a=lay(e.elem).find("."+T),n=t.range?e.endDate?e.parse():"":e.parse();a.html(n).css({color:"#5FB878","font-size":"14px;"}),setTimeout(function(){a.css({color:"#666","font-size":"12px;"})},300)}},D.prototype.done=function(e,t){var a=this,n=a.config,i=lay.extend({},lay.extend(n.dateTime,a.startTime)),l=lay.extend({},lay.extend(a.endDate,a.endTime));return lay.each([i,l],function(e,t){"month"in t&&lay.extend(t,{month:t.month+1})}),a.preview(),e=e||[a.parse(),i,l],"function"==typeof n[t||"done"]&&n[t||"done"].apply(n,e),a},D.prototype.choose=function(e,t){var a=this,n=a.config,i=a.thisDateTime(t),l=(lay(a.elem).find("td"),e.attr("lay-ymd").split("-"));l={year:0|l[0],month:(0|l[1])-1,date:0|l[2]},e.hasClass(d)||(lay.extend(i,l),n.range?(lay.each(["startTime","endTime"],function(e,t){a[t]=a[t]||{hours:0,minutes:0,seconds:0}}),a.calendar(null,t).done(null,"change")):"static"===n.position?a.calendar().done().done(null,"change"):"date"===n.type?a.setValue(a.parse()).remove().done():"datetime"===n.type&&a.calendar().done(null,"change"))},D.prototype.tool=function(e,t){var a=this,n=a.config,i=a.lang(),l=n.dateTime,r="static"===n.position,o={datetime:function(){lay(e).hasClass(d)||(a.list("time",0),n.range&&a.list("time",1),lay(e).attr("lay-type","date").html(a.lang().dateTips))},date:function(){a.closeList(),lay(e).attr("lay-type","datetime").html(a.lang().timeTips)},clear:function(){r&&(lay.extend(l,a.firstDate),a.calendar()),n.range&&(delete n.dateTime,delete a.endDate,delete a.startTime,delete a.endTime),a.setValue("").remove(),a.done(["",{},{}])},now:function(){var e=new Date;lay.extend(l,a.systemDate(),{hours:e.getHours(),minutes:e.getMinutes(),seconds:e.getSeconds()}),a.setValue(a.parse()).remove(),r&&a.calendar(),a.done()},confirm:function(){if(n.range){if(lay(e).hasClass(d))return a.hint("time"===n.type?i.timeout.replace(/\u65e5\u671f/g,"\u65f6\u95f4"):i.timeout)}else if(lay(e).hasClass(d))return a.hint(i.invalidDate);a.done(),a.setValue(a.parse()).remove()}};o[t]&&o[t]()},D.prototype.change=function(e){var t=this,a=t.config,n=t.thisDateTime(e),i=a.range&&("year"===a.type||"month"===a.type),l=t.elemCont[e||0],r=t.listYM[e],o=function(o){var s=lay(l).find(".laydate-year-list")[0],y=lay(l).find(".laydate-month-list")[0];return s&&(r[0]=o?r[0]-15:r[0]+15,t.list("year",e)),y&&(o?r[0]--:r[0]++,t.list("month",e)),(s||y)&&(lay.extend(n,{year:r[0]}),i&&(n.year=r[0]),a.range||t.done(null,"change"),a.range||t.limit(lay(t.footer).find(p),{year:r[0]})),t.setBtnStatus(),s||y};return{prevYear:function(){o("sub")||(n.year--,t.checkDate("limit").calendar(null,e),t.done(null,"change"))},prevMonth:function(){var a=t.getAsYM(n.year,n.month,"sub");lay.extend(n,{year:a[0],month:a[1]}),t.checkDate("limit").calendar(null,e),t.done(null,"change")},nextMonth:function(){var a=t.getAsYM(n.year,n.month);lay.extend(n,{year:a[0],month:a[1]}),t.checkDate("limit").calendar(null,e),t.done(null,"change")},nextYear:function(){o()||(n.year++,t.checkDate("limit").calendar(null,e),t.done(null,"change"))}}},D.prototype.changeEvent=function(){var e=this;e.config;lay(e.elem).on("click",function(e){lay.stope(e)}).on("mousedown",function(e){lay.stope(e)}),lay.each(e.elemHeader,function(t,a){lay(a[0]).on("click",function(a){e.change(t).prevYear()}),lay(a[1]).on("click",function(a){e.change(t).prevMonth()}),lay(a[2]).find("span").on("click",function(a){var n=lay(this),i=n.attr("lay-ym"),l=n.attr("lay-type");i&&(i=i.split("-"),e.listYM[t]=[0|i[0],0|i[1]],e.list(l,t),lay(e.footer).find("."+v).addClass(d))}),lay(a[3]).on("click",function(a){e.change(t).nextMonth()}),lay(a[4]).on("click",function(a){e.change(t).nextYear()})}),lay.each(e.table,function(t,a){var n=lay(a).find("td");n.on("click",function(){e.choose(lay(this),t)})}),lay(e.footer).find("span").on("click",function(){var t=lay(this).attr("lay-type");e.tool(this,t)})},D.prototype.isInput=function(e){return/input|textarea/.test(e.tagName.toLocaleLowerCase())},D.prototype.events=function(){var e=this,t=e.config,a=function(a,n){a.on(t.trigger,function(){n&&(e.bindElem=this),e.render()})};t.elem[0]&&!t.elem[0].eventHandler&&(a(t.elem,"bind"),a(t.eventElem),t.elem[0].eventHandler=!0)},r.that={},r.getThis=function(e){var t=r.that[e];return t||hint.error(e?o+" instance with ID '"+e+"' not found":"ID argument required"),t},n.run=function(a){a(t).on("mousedown",function(e){if(l.thisId){var t=r.getThis(l.thisId);if(t){var n=t.config;e.target!==n.elem[0]&&e.target!==n.eventElem[0]&&e.target!==a(n.closeStop)[0]&&t.remove()}}}).on("keydown",function(e){if(l.thisId){var t=r.getThis(l.thisId);t&&13===e.keyCode&&a("#"+t.elemID)[0]&&t.elemID===D.thisElemDate&&(e.preventDefault(),a(t.footer).find(p)[0].click())}}),a(e).on("resize",function(){if(l.thisId){var e=r.getThis(l.thisId);if(e)return!(!e.elem||!a(s)[0])&&void e.position()}})},l.render=function(e){var t=new D(e);return r.call(t)},l.parse=function(e,t,a){return e=e||{},"string"==typeof t&&(t=r.formatArr(t)),t=(t||[]).concat(),lay.each(t,function(n,i){/yyyy|y/.test(i)?t[n]=lay.digit(e.year,i.length):/MM|M/.test(i)?t[n]=lay.digit(e.month+(a||0),i.length):/dd|d/.test(i)?t[n]=lay.digit(e.date,i.length):/HH|H/.test(i)?t[n]=lay.digit(e.hours,i.length):/mm|m/.test(i)?t[n]=lay.digit(e.minutes,i.length):/ss|s/.test(i)&&(t[n]=lay.digit(e.seconds,i.length))}),t.join("")},l.getEndDate=function(e,t){var a=new Date;return a.setFullYear(t||a.getFullYear(),e||a.getMonth()+1,1),new Date(a.getTime()-864e5).getDate()},a?(l.ready(),layui.define("lay",function(e){l.path=layui.cache.dir,n.run(lay),e(o,l)})):"function"==typeof define&&define.amd?define(function(){return n.run(lay),l}):function(){l.ready(),n.run(e.lay),e.laydate=l}()}(window,window.document);!function(e,t){"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(e,t){function n(e){var t=!!e&&"length"in e&&e.length,n=pe.type(e);return"function"!==n&&!pe.isWindow(e)&&("array"===n||0===t||"number"==typeof t&&t>0&&t-1 in e)}function r(e,t,n){if(pe.isFunction(t))return pe.grep(e,function(e,r){return!!t.call(e,r,e)!==n});if(t.nodeType)return pe.grep(e,function(e){return e===t!==n});if("string"==typeof t){if(Ce.test(t))return pe.filter(t,e,n);t=pe.filter(t,e)}return pe.grep(e,function(e){return pe.inArray(e,t)>-1!==n})}function i(e,t){do e=e[t];while(e&&1!==e.nodeType);return e}function o(e){var t={};return pe.each(e.match(De)||[],function(e,n){t[n]=!0}),t}function a(){re.addEventListener?(re.removeEventListener("DOMContentLoaded",s),e.removeEventListener("load",s)):(re.detachEvent("onreadystatechange",s),e.detachEvent("onload",s))}function s(){(re.addEventListener||"load"===e.event.type||"complete"===re.readyState)&&(a(),pe.ready())}function u(e,t,n){if(void 0===n&&1===e.nodeType){var r="data-"+t.replace(_e,"-$1").toLowerCase();if(n=e.getAttribute(r),"string"==typeof n){try{n="true"===n||"false"!==n&&("null"===n?null:+n+""===n?+n:qe.test(n)?pe.parseJSON(n):n)}catch(i){}pe.data(e,t,n)}else n=void 0}return n}function l(e){var t;for(t in e)if(("data"!==t||!pe.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}function c(e,t,n,r){if(He(e)){var i,o,a=pe.expando,s=e.nodeType,u=s?pe.cache:e,l=s?e[a]:e[a]&&a;if(l&&u[l]&&(r||u[l].data)||void 0!==n||"string"!=typeof t)return l||(l=s?e[a]=ne.pop()||pe.guid++:a),u[l]||(u[l]=s?{}:{toJSON:pe.noop}),"object"!=typeof t&&"function"!=typeof t||(r?u[l]=pe.extend(u[l],t):u[l].data=pe.extend(u[l].data,t)),o=u[l],r||(o.data||(o.data={}),o=o.data),void 0!==n&&(o[pe.camelCase(t)]=n),"string"==typeof t?(i=o[t],null==i&&(i=o[pe.camelCase(t)])):i=o,i}}function f(e,t,n){if(He(e)){var r,i,o=e.nodeType,a=o?pe.cache:e,s=o?e[pe.expando]:pe.expando;if(a[s]){if(t&&(r=n?a[s]:a[s].data)){pe.isArray(t)?t=t.concat(pe.map(t,pe.camelCase)):t in r?t=[t]:(t=pe.camelCase(t),t=t in r?[t]:t.split(" ")),i=t.length;for(;i--;)delete r[t[i]];if(n?!l(r):!pe.isEmptyObject(r))return}(n||(delete a[s].data,l(a[s])))&&(o?pe.cleanData([e],!0):fe.deleteExpando||a!=a.window?delete a[s]:a[s]=void 0)}}}function d(e,t,n,r){var i,o=1,a=20,s=r?function(){return r.cur()}:function(){return pe.css(e,t,"")},u=s(),l=n&&n[3]||(pe.cssNumber[t]?"":"px"),c=(pe.cssNumber[t]||"px"!==l&&+u)&&Me.exec(pe.css(e,t));if(c&&c[3]!==l){l=l||c[3],n=n||[],c=+u||1;do o=o||".5",c/=o,pe.style(e,t,c+l);while(o!==(o=s()/u)&&1!==o&&--a)}return n&&(c=+c||+u||0,i=n[1]?c+(n[1]+1)*n[2]:+n[2],r&&(r.unit=l,r.start=c,r.end=i)),i}function p(e){var t=ze.split("|"),n=e.createDocumentFragment();if(n.createElement)for(;t.length;)n.createElement(t.pop());return n}function h(e,t){var n,r,i=0,o="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):void 0;if(!o)for(o=[],n=e.childNodes||e;null!=(r=n[i]);i++)!t||pe.nodeName(r,t)?o.push(r):pe.merge(o,h(r,t));return void 0===t||t&&pe.nodeName(e,t)?pe.merge([e],o):o}function g(e,t){for(var n,r=0;null!=(n=e[r]);r++)pe._data(n,"globalEval",!t||pe._data(t[r],"globalEval"))}function m(e){Be.test(e.type)&&(e.defaultChecked=e.checked)}function y(e,t,n,r,i){for(var o,a,s,u,l,c,f,d=e.length,y=p(t),v=[],x=0;x<d;x++)if(a=e[x],a||0===a)if("object"===pe.type(a))pe.merge(v,a.nodeType?[a]:a);else if(Ue.test(a)){for(u=u||y.appendChild(t.createElement("div")),l=(We.exec(a)||["",""])[1].toLowerCase(),f=Xe[l]||Xe._default,u.innerHTML=f[1]+pe.htmlPrefilter(a)+f[2],o=f[0];o--;)u=u.lastChild;if(!fe.leadingWhitespace&&$e.test(a)&&v.push(t.createTextNode($e.exec(a)[0])),!fe.tbody)for(a="table"!==l||Ve.test(a)?"<table>"!==f[1]||Ve.test(a)?0:u:u.firstChild,o=a&&a.childNodes.length;o--;)pe.nodeName(c=a.childNodes[o],"tbody")&&!c.childNodes.length&&a.removeChild(c);for(pe.merge(v,u.childNodes),u.textContent="";u.firstChild;)u.removeChild(u.firstChild);u=y.lastChild}else v.push(t.createTextNode(a));for(u&&y.removeChild(u),fe.appendChecked||pe.grep(h(v,"input"),m),x=0;a=v[x++];)if(r&&pe.inArray(a,r)>-1)i&&i.push(a);else if(s=pe.contains(a.ownerDocument,a),u=h(y.appendChild(a),"script"),s&&g(u),n)for(o=0;a=u[o++];)Ie.test(a.type||"")&&n.push(a);return u=null,y}function v(){return!0}function x(){return!1}function b(){try{return re.activeElement}catch(e){}}function w(e,t,n,r,i,o){var a,s;if("object"==typeof t){"string"!=typeof n&&(r=r||n,n=void 0);for(s in t)w(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),i===!1)i=x;else if(!i)return e;return 1===o&&(a=i,i=function(e){return pe().off(e),a.apply(this,arguments)},i.guid=a.guid||(a.guid=pe.guid++)),e.each(function(){pe.event.add(this,t,i,r,n)})}function T(e,t){return pe.nodeName(e,"table")&&pe.nodeName(11!==t.nodeType?t:t.firstChild,"tr")?e.getElementsByTagName("tbody")[0]||e.appendChild(e.ownerDocument.createElement("tbody")):e}function C(e){return e.type=(null!==pe.find.attr(e,"type"))+"/"+e.type,e}function E(e){var t=it.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function N(e,t){if(1===t.nodeType&&pe.hasData(e)){var n,r,i,o=pe._data(e),a=pe._data(t,o),s=o.events;if(s){delete a.handle,a.events={};for(n in s)for(r=0,i=s[n].length;r<i;r++)pe.event.add(t,n,s[n][r])}a.data&&(a.data=pe.extend({},a.data))}}function k(e,t){var n,r,i;if(1===t.nodeType){if(n=t.nodeName.toLowerCase(),!fe.noCloneEvent&&t[pe.expando]){i=pe._data(t);for(r in i.events)pe.removeEvent(t,r,i.handle);t.removeAttribute(pe.expando)}"script"===n&&t.text!==e.text?(C(t).text=e.text,E(t)):"object"===n?(t.parentNode&&(t.outerHTML=e.outerHTML),fe.html5Clone&&e.innerHTML&&!pe.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):"input"===n&&Be.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):"option"===n?t.defaultSelected=t.selected=e.defaultSelected:"input"!==n&&"textarea"!==n||(t.defaultValue=e.defaultValue)}}function S(e,t,n,r){t=oe.apply([],t);var i,o,a,s,u,l,c=0,f=e.length,d=f-1,p=t[0],g=pe.isFunction(p);if(g||f>1&&"string"==typeof p&&!fe.checkClone&&rt.test(p))return e.each(function(i){var o=e.eq(i);g&&(t[0]=p.call(this,i,o.html())),S(o,t,n,r)});if(f&&(l=y(t,e[0].ownerDocument,!1,e,r),i=l.firstChild,1===l.childNodes.length&&(l=i),i||r)){for(s=pe.map(h(l,"script"),C),a=s.length;c<f;c++)o=l,c!==d&&(o=pe.clone(o,!0,!0),a&&pe.merge(s,h(o,"script"))),n.call(e[c],o,c);if(a)for(u=s[s.length-1].ownerDocument,pe.map(s,E),c=0;c<a;c++)o=s[c],Ie.test(o.type||"")&&!pe._data(o,"globalEval")&&pe.contains(u,o)&&(o.src?pe._evalUrl&&pe._evalUrl(o.src):pe.globalEval((o.text||o.textContent||o.innerHTML||"").replace(ot,"")));l=i=null}return e}function A(e,t,n){for(var r,i=t?pe.filter(t,e):e,o=0;null!=(r=i[o]);o++)n||1!==r.nodeType||pe.cleanData(h(r)),r.parentNode&&(n&&pe.contains(r.ownerDocument,r)&&g(h(r,"script")),r.parentNode.removeChild(r));return e}function D(e,t){var n=pe(t.createElement(e)).appendTo(t.body),r=pe.css(n[0],"display");return n.detach(),r}function j(e){var t=re,n=lt[e];return n||(n=D(e,t),"none"!==n&&n||(ut=(ut||pe("<iframe frameborder='0' width='0' height='0'/>")).appendTo(t.documentElement),t=(ut[0].contentWindow||ut[0].contentDocument).document,t.write(),t.close(),n=D(e,t),ut.detach()),lt[e]=n),n}function L(e,t){return{get:function(){return e()?void delete this.get:(this.get=t).apply(this,arguments)}}}function H(e){if(e in Et)return e;for(var t=e.charAt(0).toUpperCase()+e.slice(1),n=Ct.length;n--;)if(e=Ct[n]+t,e in Et)return e}function q(e,t){for(var n,r,i,o=[],a=0,s=e.length;a<s;a++)r=e[a],r.style&&(o[a]=pe._data(r,"olddisplay"),n=r.style.display,t?(o[a]||"none"!==n||(r.style.display=""),""===r.style.display&&Re(r)&&(o[a]=pe._data(r,"olddisplay",j(r.nodeName)))):(i=Re(r),(n&&"none"!==n||!i)&&pe._data(r,"olddisplay",i?n:pe.css(r,"display"))));for(a=0;a<s;a++)r=e[a],r.style&&(t&&"none"!==r.style.display&&""!==r.style.display||(r.style.display=t?o[a]||"":"none"));return e}function _(e,t,n){var r=bt.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function F(e,t,n,r,i){for(var o=n===(r?"border":"content")?4:"width"===t?1:0,a=0;o<4;o+=2)"margin"===n&&(a+=pe.css(e,n+Oe[o],!0,i)),r?("content"===n&&(a-=pe.css(e,"padding"+Oe[o],!0,i)),"margin"!==n&&(a-=pe.css(e,"border"+Oe[o]+"Width",!0,i))):(a+=pe.css(e,"padding"+Oe[o],!0,i),"padding"!==n&&(a+=pe.css(e,"border"+Oe[o]+"Width",!0,i)));return a}function M(e,t,n){var r=!0,i="width"===t?e.offsetWidth:e.offsetHeight,o=ht(e),a=fe.boxSizing&&"border-box"===pe.css(e,"boxSizing",!1,o);if(i<=0||null==i){if(i=gt(e,t,o),(i<0||null==i)&&(i=e.style[t]),ft.test(i))return i;r=a&&(fe.boxSizingReliable()||i===e.style[t]),i=parseFloat(i)||0}return i+F(e,t,n||(a?"border":"content"),r,o)+"px"}function O(e,t,n,r,i){return new O.prototype.init(e,t,n,r,i)}function R(){return e.setTimeout(function(){Nt=void 0}),Nt=pe.now()}function P(e,t){var n,r={height:e},i=0;for(t=t?1:0;i<4;i+=2-t)n=Oe[i],r["margin"+n]=r["padding"+n]=e;return t&&(r.opacity=r.width=e),r}function B(e,t,n){for(var r,i=($.tweeners[t]||[]).concat($.tweeners["*"]),o=0,a=i.length;o<a;o++)if(r=i[o].call(n,t,e))return r}function W(e,t,n){var r,i,o,a,s,u,l,c,f=this,d={},p=e.style,h=e.nodeType&&Re(e),g=pe._data(e,"fxshow");n.queue||(s=pe._queueHooks(e,"fx"),null==s.unqueued&&(s.unqueued=0,u=s.empty.fire,s.empty.fire=function(){s.unqueued||u()}),s.unqueued++,f.always(function(){f.always(function(){s.unqueued--,pe.queue(e,"fx").length||s.empty.fire()})})),1===e.nodeType&&("height"in t||"width"in t)&&(n.overflow=[p.overflow,p.overflowX,p.overflowY],l=pe.css(e,"display"),c="none"===l?pe._data(e,"olddisplay")||j(e.nodeName):l,"inline"===c&&"none"===pe.css(e,"float")&&(fe.inlineBlockNeedsLayout&&"inline"!==j(e.nodeName)?p.zoom=1:p.display="inline-block")),n.overflow&&(p.overflow="hidden",fe.shrinkWrapBlocks()||f.always(function(){p.overflow=n.overflow[0],p.overflowX=n.overflow[1],p.overflowY=n.overflow[2]}));for(r in t)if(i=t[r],St.exec(i)){if(delete t[r],o=o||"toggle"===i,i===(h?"hide":"show")){if("show"!==i||!g||void 0===g[r])continue;h=!0}d[r]=g&&g[r]||pe.style(e,r)}else l=void 0;if(pe.isEmptyObject(d))"inline"===("none"===l?j(e.nodeName):l)&&(p.display=l);else{g?"hidden"in g&&(h=g.hidden):g=pe._data(e,"fxshow",{}),o&&(g.hidden=!h),h?pe(e).show():f.done(function(){pe(e).hide()}),f.done(function(){var t;pe._removeData(e,"fxshow");for(t in d)pe.style(e,t,d[t])});for(r in d)a=B(h?g[r]:0,r,f),r in g||(g[r]=a.start,h&&(a.end=a.start,a.start="width"===r||"height"===r?1:0))}}function I(e,t){var n,r,i,o,a;for(n in e)if(r=pe.camelCase(n),i=t[r],o=e[n],pe.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),a=pe.cssHooks[r],a&&"expand"in a){o=a.expand(o),delete e[r];for(n in o)n in e||(e[n]=o[n],t[n]=i)}else t[r]=i}function $(e,t,n){var r,i,o=0,a=$.prefilters.length,s=pe.Deferred().always(function(){delete u.elem}),u=function(){if(i)return!1;for(var t=Nt||R(),n=Math.max(0,l.startTime+l.duration-t),r=n/l.duration||0,o=1-r,a=0,u=l.tweens.length;a<u;a++)l.tweens[a].run(o);return s.notifyWith(e,[l,o,n]),o<1&&u?n:(s.resolveWith(e,[l]),!1)},l=s.promise({elem:e,props:pe.extend({},t),opts:pe.extend(!0,{specialEasing:{},easing:pe.easing._default},n),originalProperties:t,originalOptions:n,startTime:Nt||R(),duration:n.duration,tweens:[],createTween:function(t,n){var r=pe.Tween(e,l.opts,t,n,l.opts.specialEasing[t]||l.opts.easing);return l.tweens.push(r),r},stop:function(t){var n=0,r=t?l.tweens.length:0;if(i)return this;for(i=!0;n<r;n++)l.tweens[n].run(1);return t?(s.notifyWith(e,[l,1,0]),s.resolveWith(e,[l,t])):s.rejectWith(e,[l,t]),this}}),c=l.props;for(I(c,l.opts.specialEasing);o<a;o++)if(r=$.prefilters[o].call(l,e,c,l.opts))return pe.isFunction(r.stop)&&(pe._queueHooks(l.elem,l.opts.queue).stop=pe.proxy(r.stop,r)),r;return pe.map(c,B,l),pe.isFunction(l.opts.start)&&l.opts.start.call(e,l),pe.fx.timer(pe.extend(u,{elem:e,anim:l,queue:l.opts.queue})),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always)}function z(e){return pe.attr(e,"class")||""}function X(e){return function(t,n){"string"!=typeof t&&(n=t,t="*");var r,i=0,o=t.toLowerCase().match(De)||[];if(pe.isFunction(n))for(;r=o[i++];)"+"===r.charAt(0)?(r=r.slice(1)||"*",(e[r]=e[r]||[]).unshift(n)):(e[r]=e[r]||[]).push(n)}}function U(e,t,n,r){function i(s){var u;return o[s]=!0,pe.each(e[s]||[],function(e,s){var l=s(t,n,r);return"string"!=typeof l||a||o[l]?a?!(u=l):void 0:(t.dataTypes.unshift(l),i(l),!1)}),u}var o={},a=e===Qt;return i(t.dataTypes[0])||!o["*"]&&i("*")}function V(e,t){var n,r,i=pe.ajaxSettings.flatOptions||{};for(r in t)void 0!==t[r]&&((i[r]?e:n||(n={}))[r]=t[r]);return n&&pe.extend(!0,e,n),e}function Y(e,t,n){for(var r,i,o,a,s=e.contents,u=e.dataTypes;"*"===u[0];)u.shift(),void 0===i&&(i=e.mimeType||t.getResponseHeader("Content-Type"));if(i)for(a in s)if(s[a]&&s[a].test(i)){u.unshift(a);break}if(u[0]in n)o=u[0];else{for(a in n){if(!u[0]||e.converters[a+" "+u[0]]){o=a;break}r||(r=a)}o=o||r}if(o)return o!==u[0]&&u.unshift(o),n[o]}function J(e,t,n,r){var i,o,a,s,u,l={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)l[a.toLowerCase()]=e.converters[a];for(o=c.shift();o;)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!u&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u=o,o=c.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(a=l[u+" "+o]||l["* "+o],!a)for(i in l)if(s=i.split(" "),s[1]===o&&(a=l[u+" "+s[0]]||l["* "+s[0]])){a===!0?a=l[i]:l[i]!==!0&&(o=s[0],c.unshift(s[1]));break}if(a!==!0)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(f){return{state:"parsererror",error:a?f:"No conversion from "+u+" to "+o}}}return{state:"success",data:t}}function G(e){return e.style&&e.style.display||pe.css(e,"display")}function K(e){if(!pe.contains(e.ownerDocument||re,e))return!0;for(;e&&1===e.nodeType;){if("none"===G(e)||"hidden"===e.type)return!0;e=e.parentNode}return!1}function Q(e,t,n,r){var i;if(pe.isArray(t))pe.each(t,function(t,i){n||rn.test(e)?r(e,i):Q(e+"["+("object"==typeof i&&null!=i?t:"")+"]",i,n,r)});else if(n||"object"!==pe.type(t))r(e,t);else for(i in t)Q(e+"["+i+"]",t[i],n,r)}function Z(){try{return new e.XMLHttpRequest}catch(t){}}function ee(){try{return new e.ActiveXObject("Microsoft.XMLHTTP")}catch(t){}}function te(e){return pe.isWindow(e)?e:9===e.nodeType&&(e.defaultView||e.parentWindow)}var ne=[],re=e.document,ie=ne.slice,oe=ne.concat,ae=ne.push,se=ne.indexOf,ue={},le=ue.toString,ce=ue.hasOwnProperty,fe={},de="1.12.4",pe=function(e,t){return new pe.fn.init(e,t)},he=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,ge=/^-ms-/,me=/-([\da-z])/gi,ye=function(e,t){return t.toUpperCase()};pe.fn=pe.prototype={jquery:de,constructor:pe,selector:"",length:0,toArray:function(){return ie.call(this)},get:function(e){return null!=e?e<0?this[e+this.length]:this[e]:ie.call(this)},pushStack:function(e){var t=pe.merge(this.constructor(),e);return t.prevObject=this,t.context=this.context,t},each:function(e){return pe.each(this,e)},map:function(e){return this.pushStack(pe.map(this,function(t,n){return e.call(t,n,t)}))},slice:function(){return this.pushStack(ie.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(n>=0&&n<t?[this[n]]:[])},end:function(){return this.prevObject||this.constructor()},push:ae,sort:ne.sort,splice:ne.splice},pe.extend=pe.fn.extend=function(){var e,t,n,r,i,o,a=arguments[0]||{},s=1,u=arguments.length,l=!1;for("boolean"==typeof a&&(l=a,a=arguments[s]||{},s++),"object"==typeof a||pe.isFunction(a)||(a={}),s===u&&(a=this,s--);s<u;s++)if(null!=(i=arguments[s]))for(r in i)e=a[r],n=i[r],a!==n&&(l&&n&&(pe.isPlainObject(n)||(t=pe.isArray(n)))?(t?(t=!1,o=e&&pe.isArray(e)?e:[]):o=e&&pe.isPlainObject(e)?e:{},a[r]=pe.extend(l,o,n)):void 0!==n&&(a[r]=n));return a},pe.extend({expando:"jQuery"+(de+Math.random()).replace(/\D/g,""),isReady:!0,error:function(e){throw new Error(e)},noop:function(){},isFunction:function(e){return"function"===pe.type(e)},isArray:Array.isArray||function(e){return"array"===pe.type(e)},isWindow:function(e){return null!=e&&e==e.window},isNumeric:function(e){var t=e&&e.toString();return!pe.isArray(e)&&t-parseFloat(t)+1>=0},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},isPlainObject:function(e){var t;if(!e||"object"!==pe.type(e)||e.nodeType||pe.isWindow(e))return!1;try{if(e.constructor&&!ce.call(e,"constructor")&&!ce.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(n){return!1}if(!fe.ownFirst)for(t in e)return ce.call(e,t);for(t in e);return void 0===t||ce.call(e,t)},type:function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?ue[le.call(e)]||"object":typeof e},globalEval:function(t){t&&pe.trim(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(ge,"ms-").replace(me,ye)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t){var r,i=0;if(n(e))for(r=e.length;i<r&&t.call(e[i],i,e[i])!==!1;i++);else for(i in e)if(t.call(e[i],i,e[i])===!1)break;return e},trim:function(e){return null==e?"":(e+"").replace(he,"")},makeArray:function(e,t){var r=t||[];return null!=e&&(n(Object(e))?pe.merge(r,"string"==typeof e?[e]:e):ae.call(r,e)),r},inArray:function(e,t,n){var r;if(t){if(se)return se.call(t,e,n);for(r=t.length,n=n?n<0?Math.max(0,r+n):n:0;n<r;n++)if(n in t&&t[n]===e)return n}return-1},merge:function(e,t){for(var n=+t.length,r=0,i=e.length;r<n;)e[i++]=t[r++];if(n!==n)for(;void 0!==t[r];)e[i++]=t[r++];return e.length=i,e},grep:function(e,t,n){for(var r,i=[],o=0,a=e.length,s=!n;o<a;o++)r=!t(e[o],o),r!==s&&i.push(e[o]);return i},map:function(e,t,r){var i,o,a=0,s=[];if(n(e))for(i=e.length;a<i;a++)o=t(e[a],a,r),null!=o&&s.push(o);else for(a in e)o=t(e[a],a,r),null!=o&&s.push(o);return oe.apply([],s)},guid:1,proxy:function(e,t){var n,r,i;if("string"==typeof t&&(i=e[t],t=e,e=i),pe.isFunction(e))return n=ie.call(arguments,2),r=function(){return e.apply(t||this,n.concat(ie.call(arguments)))},r.guid=e.guid=e.guid||pe.guid++,r},now:function(){return+new Date},support:fe}),"function"==typeof Symbol&&(pe.fn[Symbol.iterator]=ne[Symbol.iterator]),pe.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(e,t){ue["[object "+t+"]"]=t.toLowerCase()});var ve=function(e){function t(e,t,n,r){var i,o,a,s,u,l,f,p,h=t&&t.ownerDocument,g=t?t.nodeType:9;if(n=n||[],"string"!=typeof e||!e||1!==g&&9!==g&&11!==g)return n;if(!r&&((t?t.ownerDocument||t:B)!==H&&L(t),t=t||H,_)){if(11!==g&&(l=ye.exec(e)))if(i=l[1]){if(9===g){if(!(a=t.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(h&&(a=h.getElementById(i))&&R(t,a)&&a.id===i)return n.push(a),n}else{if(l[2])return Q.apply(n,t.getElementsByTagName(e)),n;if((i=l[3])&&w.getElementsByClassName&&t.getElementsByClassName)return Q.apply(n,t.getElementsByClassName(i)),n}if(w.qsa&&!X[e+" "]&&(!F||!F.test(e))){if(1!==g)h=t,p=e;else if("object"!==t.nodeName.toLowerCase()){for((s=t.getAttribute("id"))?s=s.replace(xe,"\\$&"):t.setAttribute("id",s=P),f=N(e),o=f.length,u=de.test(s)?"#"+s:"[id='"+s+"']";o--;)f[o]=u+" "+d(f[o]);p=f.join(","),h=ve.test(e)&&c(t.parentNode)||t}if(p)try{return Q.apply(n,h.querySelectorAll(p)),n}catch(m){}finally{s===P&&t.removeAttribute("id")}}}return S(e.replace(se,"$1"),t,n,r)}function n(){function e(n,r){return t.push(n+" ")>T.cacheLength&&delete e[t.shift()],e[n+" "]=r}var t=[];return e}function r(e){return e[P]=!0,e}function i(e){var t=H.createElement("div");try{return!!e(t)}catch(n){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function o(e,t){for(var n=e.split("|"),r=n.length;r--;)T.attrHandle[n[r]]=t}function a(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&(~t.sourceIndex||V)-(~e.sourceIndex||V);if(r)return r;if(n)for(;n=n.nextSibling;)if(n===t)return-1;return e?1:-1}function s(e){return function(t){var n=t.nodeName.toLowerCase();return"input"===n&&t.type===e}}function u(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function l(e){return r(function(t){return t=+t,r(function(n,r){for(var i,o=e([],n.length,t),a=o.length;a--;)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}function c(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}function f(){}function d(e){for(var t=0,n=e.length,r="";t<n;t++)r+=e[t].value;return r}function p(e,t,n){var r=t.dir,i=n&&"parentNode"===r,o=I++;return t.first?function(t,n,o){for(;t=t[r];)if(1===t.nodeType||i)return e(t,n,o)}:function(t,n,a){var s,u,l,c=[W,o];if(a){for(;t=t[r];)if((1===t.nodeType||i)&&e(t,n,a))return!0}else for(;t=t[r];)if(1===t.nodeType||i){if(l=t[P]||(t[P]={}),u=l[t.uniqueID]||(l[t.uniqueID]={}),(s=u[r])&&s[0]===W&&s[1]===o)return c[2]=s[2];if(u[r]=c,c[2]=e(t,n,a))return!0}}}function h(e){return e.length>1?function(t,n,r){for(var i=e.length;i--;)if(!e[i](t,n,r))return!1;return!0}:e[0]}function g(e,n,r){for(var i=0,o=n.length;i<o;i++)t(e,n[i],r);return r}function m(e,t,n,r,i){for(var o,a=[],s=0,u=e.length,l=null!=t;s<u;s++)(o=e[s])&&(n&&!n(o,r,i)||(a.push(o),l&&t.push(s)));return a}function y(e,t,n,i,o,a){return i&&!i[P]&&(i=y(i)),o&&!o[P]&&(o=y(o,a)),r(function(r,a,s,u){var l,c,f,d=[],p=[],h=a.length,y=r||g(t||"*",s.nodeType?[s]:s,[]),v=!e||!r&&t?y:m(y,d,e,s,u),x=n?o||(r?e:h||i)?[]:a:v;if(n&&n(v,x,s,u),i)for(l=m(x,p),i(l,[],s,u),c=l.length;c--;)(f=l[c])&&(x[p[c]]=!(v[p[c]]=f));if(r){if(o||e){if(o){for(l=[],c=x.length;c--;)(f=x[c])&&l.push(v[c]=f);o(null,x=[],l,u)}for(c=x.length;c--;)(f=x[c])&&(l=o?ee(r,f):d[c])>-1&&(r[l]=!(a[l]=f))}}else x=m(x===a?x.splice(h,x.length):x),o?o(null,a,x,u):Q.apply(a,x)})}function v(e){for(var t,n,r,i=e.length,o=T.relative[e[0].type],a=o||T.relative[" "],s=o?1:0,u=p(function(e){return e===t},a,!0),l=p(function(e){return ee(t,e)>-1},a,!0),c=[function(e,n,r){var i=!o&&(r||n!==A)||((t=n).nodeType?u(e,n,r):l(e,n,r));return t=null,i}];s<i;s++)if(n=T.relative[e[s].type])c=[p(h(c),n)];else{if(n=T.filter[e[s].type].apply(null,e[s].matches),n[P]){for(r=++s;r<i&&!T.relative[e[r].type];r++);return y(s>1&&h(c),s>1&&d(e.slice(0,s-1).concat({value:" "===e[s-2].type?"*":""})).replace(se,"$1"),n,s<r&&v(e.slice(s,r)),r<i&&v(e=e.slice(r)),r<i&&d(e))}c.push(n)}return h(c)}function x(e,n){var i=n.length>0,o=e.length>0,a=function(r,a,s,u,l){var c,f,d,p=0,h="0",g=r&&[],y=[],v=A,x=r||o&&T.find.TAG("*",l),b=W+=null==v?1:Math.random()||.1,w=x.length;for(l&&(A=a===H||a||l);h!==w&&null!=(c=x[h]);h++){if(o&&c){for(f=0,a||c.ownerDocument===H||(L(c),s=!_);d=e[f++];)if(d(c,a||H,s)){u.push(c);break}l&&(W=b)}i&&((c=!d&&c)&&p--,r&&g.push(c))}if(p+=h,i&&h!==p){for(f=0;d=n[f++];)d(g,y,a,s);if(r){if(p>0)for(;h--;)g[h]||y[h]||(y[h]=G.call(u));y=m(y)}Q.apply(u,y),l&&!r&&y.length>0&&p+n.length>1&&t.uniqueSort(u)}return l&&(W=b,A=v),g};return i?r(a):a}var b,w,T,C,E,N,k,S,A,D,j,L,H,q,_,F,M,O,R,P="sizzle"+1*new Date,B=e.document,W=0,I=0,$=n(),z=n(),X=n(),U=function(e,t){return e===t&&(j=!0),0},V=1<<31,Y={}.hasOwnProperty,J=[],G=J.pop,K=J.push,Q=J.push,Z=J.slice,ee=function(e,t){for(var n=0,r=e.length;n<r;n++)if(e[n]===t)return n;return-1},te="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",ne="[\\x20\\t\\r\\n\\f]",re="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",ie="\\["+ne+"*("+re+")(?:"+ne+"*([*^$|!~]?=)"+ne+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+re+"))|)"+ne+"*\\]",oe=":("+re+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+ie+")*)|.*)\\)|)",ae=new RegExp(ne+"+","g"),se=new RegExp("^"+ne+"+|((?:^|[^\\\\])(?:\\\\.)*)"+ne+"+$","g"),ue=new RegExp("^"+ne+"*,"+ne+"*"),le=new RegExp("^"+ne+"*([>+~]|"+ne+")"+ne+"*"),ce=new RegExp("="+ne+"*([^\\]'\"]*?)"+ne+"*\\]","g"),fe=new RegExp(oe),de=new RegExp("^"+re+"$"),pe={ID:new RegExp("^#("+re+")"),CLASS:new RegExp("^\\.("+re+")"),TAG:new RegExp("^("+re+"|[*])"),ATTR:new RegExp("^"+ie),PSEUDO:new RegExp("^"+oe),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+ne+"*(even|odd|(([+-]|)(\\d*)n|)"+ne+"*(?:([+-]|)"+ne+"*(\\d+)|))"+ne+"*\\)|)","i"),bool:new RegExp("^(?:"+te+")$","i"),needsContext:new RegExp("^"+ne+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+ne+"*((?:-\\d)?\\d*)"+ne+"*\\)|)(?=[^-]|$)","i")},he=/^(?:input|select|textarea|button)$/i,ge=/^h\d$/i,me=/^[^{]+\{\s*\[native \w/,ye=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ve=/[+~]/,xe=/'|\\/g,be=new RegExp("\\\\([\\da-f]{1,6}"+ne+"?|("+ne+")|.)","ig"),we=function(e,t,n){var r="0x"+t-65536;return r!==r||n?t:r<0?String.fromCharCode(r+65536):String.fromCharCode(r>>10|55296,1023&r|56320)},Te=function(){L()};try{Q.apply(J=Z.call(B.childNodes),B.childNodes),J[B.childNodes.length].nodeType}catch(Ce){Q={apply:J.length?function(e,t){K.apply(e,Z.call(t))}:function(e,t){for(var n=e.length,r=0;e[n++]=t[r++];);e.length=n-1}}}w=t.support={},E=t.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return!!t&&"HTML"!==t.nodeName},L=t.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:B;return r!==H&&9===r.nodeType&&r.documentElement?(H=r,q=H.documentElement,_=!E(H),(n=H.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",Te,!1):n.attachEvent&&n.attachEvent("onunload",Te)),w.attributes=i(function(e){return e.className="i",!e.getAttribute("className")}),w.getElementsByTagName=i(function(e){return e.appendChild(H.createComment("")),!e.getElementsByTagName("*").length}),w.getElementsByClassName=me.test(H.getElementsByClassName),w.getById=i(function(e){return q.appendChild(e).id=P,!H.getElementsByName||!H.getElementsByName(P).length}),w.getById?(T.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&_){var n=t.getElementById(e);return n?[n]:[]}},T.filter.ID=function(e){var t=e.replace(be,we);return function(e){return e.getAttribute("id")===t}}):(delete T.find.ID,T.filter.ID=function(e){var t=e.replace(be,we);return function(e){var n="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return n&&n.value===t}}),T.find.TAG=w.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):w.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){for(;n=o[i++];)1===n.nodeType&&r.push(n);return r}return o},T.find.CLASS=w.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&_)return t.getElementsByClassName(e)},M=[],F=[],(w.qsa=me.test(H.querySelectorAll))&&(i(function(e){q.appendChild(e).innerHTML="<a id='"+P+"'></a><select id='"+P+"-\r\\' msallowcapture=''><option selected=''></option></select>",e.querySelectorAll("[msallowcapture^='']").length&&F.push("[*^$]="+ne+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||F.push("\\["+ne+"*(?:value|"+te+")"),e.querySelectorAll("[id~="+P+"-]").length||F.push("~="),e.querySelectorAll(":checked").length||F.push(":checked"),e.querySelectorAll("a#"+P+"+*").length||F.push(".#.+[+~]")}),i(function(e){var t=H.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&F.push("name"+ne+"*[*^$|!~]?="),e.querySelectorAll(":enabled").length||F.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),F.push(",.*:")})),(w.matchesSelector=me.test(O=q.matches||q.webkitMatchesSelector||q.mozMatchesSelector||q.oMatchesSelector||q.msMatchesSelector))&&i(function(e){w.disconnectedMatch=O.call(e,"div"),O.call(e,"[s!='']:x"),M.push("!=",oe)}),F=F.length&&new RegExp(F.join("|")),M=M.length&&new RegExp(M.join("|")),t=me.test(q.compareDocumentPosition),R=t||me.test(q.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)for(;t=t.parentNode;)if(t===e)return!0;return!1},U=t?function(e,t){if(e===t)return j=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n?n:(n=(e.ownerDocument||e)===(t.ownerDocument||t)?e.compareDocumentPosition(t):1,1&n||!w.sortDetached&&t.compareDocumentPosition(e)===n?e===H||e.ownerDocument===B&&R(B,e)?-1:t===H||t.ownerDocument===B&&R(B,t)?1:D?ee(D,e)-ee(D,t):0:4&n?-1:1)}:function(e,t){if(e===t)return j=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,s=[e],u=[t];if(!i||!o)return e===H?-1:t===H?1:i?-1:o?1:D?ee(D,e)-ee(D,t):0;if(i===o)return a(e,t);for(n=e;n=n.parentNode;)s.unshift(n);for(n=t;n=n.parentNode;)u.unshift(n);for(;s[r]===u[r];)r++;return r?a(s[r],u[r]):s[r]===B?-1:u[r]===B?1:0},H):H},t.matches=function(e,n){return t(e,null,null,n)},t.matchesSelector=function(e,n){if((e.ownerDocument||e)!==H&&L(e),n=n.replace(ce,"='$1']"),w.matchesSelector&&_&&!X[n+" "]&&(!M||!M.test(n))&&(!F||!F.test(n)))try{var r=O.call(e,n);if(r||w.disconnectedMatch||e.document&&11!==e.document.nodeType)return r}catch(i){}return t(n,H,null,[e]).length>0},t.contains=function(e,t){return(e.ownerDocument||e)!==H&&L(e),R(e,t)},t.attr=function(e,t){(e.ownerDocument||e)!==H&&L(e);var n=T.attrHandle[t.toLowerCase()],r=n&&Y.call(T.attrHandle,t.toLowerCase())?n(e,t,!_):void 0;return void 0!==r?r:w.attributes||!_?e.getAttribute(t):(r=e.getAttributeNode(t))&&r.specified?r.value:null},t.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},t.uniqueSort=function(e){var t,n=[],r=0,i=0;if(j=!w.detectDuplicates,D=!w.sortStable&&e.slice(0),e.sort(U),j){for(;t=e[i++];)t===e[i]&&(r=n.push(i));for(;r--;)e.splice(n[r],1)}return D=null,e},C=t.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=C(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r++];)n+=C(t);return n},T=t.selectors={cacheLength:50,createPseudo:r,match:pe,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(be,we),e[3]=(e[3]||e[4]||e[5]||"").replace(be,we),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||t.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&t.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return pe.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&fe.test(n)&&(t=N(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(be,we).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=$[e+" "];return t||(t=new RegExp("(^|"+ne+")"+e+"("+ne+"|$)"))&&$(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(e,n,r){return function(i){var o=t.attr(i,e);return null==o?"!="===n:!n||(o+="","="===n?o===r:"!="===n?o!==r:"^="===n?r&&0===o.indexOf(r):"*="===n?r&&o.indexOf(r)>-1:"$="===n?r&&o.slice(-r.length)===r:"~="===n?(" "+o.replace(ae," ")+" ").indexOf(r)>-1:"|="===n&&(o===r||o.slice(0,r.length+1)===r+"-"))}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,u){var l,c,f,d,p,h,g=o!==a?"nextSibling":"previousSibling",m=t.parentNode,y=s&&t.nodeName.toLowerCase(),v=!u&&!s,x=!1;if(m){if(o){for(;g;){for(d=t;d=d[g];)if(s?d.nodeName.toLowerCase()===y:1===d.nodeType)return!1;h=g="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?m.firstChild:m.lastChild],a&&v){for(d=m,f=d[P]||(d[P]={}),c=f[d.uniqueID]||(f[d.uniqueID]={}),l=c[e]||[],p=l[0]===W&&l[1],x=p&&l[2],
+d=p&&m.childNodes[p];d=++p&&d&&d[g]||(x=p=0)||h.pop();)if(1===d.nodeType&&++x&&d===t){c[e]=[W,p,x];break}}else if(v&&(d=t,f=d[P]||(d[P]={}),c=f[d.uniqueID]||(f[d.uniqueID]={}),l=c[e]||[],p=l[0]===W&&l[1],x=p),x===!1)for(;(d=++p&&d&&d[g]||(x=p=0)||h.pop())&&((s?d.nodeName.toLowerCase()!==y:1!==d.nodeType)||!++x||(v&&(f=d[P]||(d[P]={}),c=f[d.uniqueID]||(f[d.uniqueID]={}),c[e]=[W,x]),d!==t)););return x-=i,x===r||x%r===0&&x/r>=0}}},PSEUDO:function(e,n){var i,o=T.pseudos[e]||T.setFilters[e.toLowerCase()]||t.error("unsupported pseudo: "+e);return o[P]?o(n):o.length>1?(i=[e,e,"",n],T.setFilters.hasOwnProperty(e.toLowerCase())?r(function(e,t){for(var r,i=o(e,n),a=i.length;a--;)r=ee(e,i[a]),e[r]=!(t[r]=i[a])}):function(e){return o(e,0,i)}):o}},pseudos:{not:r(function(e){var t=[],n=[],i=k(e.replace(se,"$1"));return i[P]?r(function(e,t,n,r){for(var o,a=i(e,null,r,[]),s=e.length;s--;)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,r,o){return t[0]=e,i(t,null,o,n),t[0]=null,!n.pop()}}),has:r(function(e){return function(n){return t(e,n).length>0}}),contains:r(function(e){return e=e.replace(be,we),function(t){return(t.textContent||t.innerText||C(t)).indexOf(e)>-1}}),lang:r(function(e){return de.test(e||"")||t.error("unsupported lang: "+e),e=e.replace(be,we).toLowerCase(),function(t){var n;do if(n=_?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang"))return n=n.toLowerCase(),n===e||0===n.indexOf(e+"-");while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===q},focus:function(e){return e===H.activeElement&&(!H.hasFocus||H.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!T.pseudos.empty(e)},header:function(e){return ge.test(e.nodeName)},input:function(e){return he.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:l(function(){return[0]}),last:l(function(e,t){return[t-1]}),eq:l(function(e,t,n){return[n<0?n+t:n]}),even:l(function(e,t){for(var n=0;n<t;n+=2)e.push(n);return e}),odd:l(function(e,t){for(var n=1;n<t;n+=2)e.push(n);return e}),lt:l(function(e,t,n){for(var r=n<0?n+t:n;--r>=0;)e.push(r);return e}),gt:l(function(e,t,n){for(var r=n<0?n+t:n;++r<t;)e.push(r);return e})}},T.pseudos.nth=T.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})T.pseudos[b]=s(b);for(b in{submit:!0,reset:!0})T.pseudos[b]=u(b);return f.prototype=T.filters=T.pseudos,T.setFilters=new f,N=t.tokenize=function(e,n){var r,i,o,a,s,u,l,c=z[e+" "];if(c)return n?0:c.slice(0);for(s=e,u=[],l=T.preFilter;s;){r&&!(i=ue.exec(s))||(i&&(s=s.slice(i[0].length)||s),u.push(o=[])),r=!1,(i=le.exec(s))&&(r=i.shift(),o.push({value:r,type:i[0].replace(se," ")}),s=s.slice(r.length));for(a in T.filter)!(i=pe[a].exec(s))||l[a]&&!(i=l[a](i))||(r=i.shift(),o.push({value:r,type:a,matches:i}),s=s.slice(r.length));if(!r)break}return n?s.length:s?t.error(e):z(e,u).slice(0)},k=t.compile=function(e,t){var n,r=[],i=[],o=X[e+" "];if(!o){for(t||(t=N(e)),n=t.length;n--;)o=v(t[n]),o[P]?r.push(o):i.push(o);o=X(e,x(i,r)),o.selector=e}return o},S=t.select=function(e,t,n,r){var i,o,a,s,u,l="function"==typeof e&&e,f=!r&&N(e=l.selector||e);if(n=n||[],1===f.length){if(o=f[0]=f[0].slice(0),o.length>2&&"ID"===(a=o[0]).type&&w.getById&&9===t.nodeType&&_&&T.relative[o[1].type]){if(t=(T.find.ID(a.matches[0].replace(be,we),t)||[])[0],!t)return n;l&&(t=t.parentNode),e=e.slice(o.shift().value.length)}for(i=pe.needsContext.test(e)?0:o.length;i--&&(a=o[i],!T.relative[s=a.type]);)if((u=T.find[s])&&(r=u(a.matches[0].replace(be,we),ve.test(o[0].type)&&c(t.parentNode)||t))){if(o.splice(i,1),e=r.length&&d(o),!e)return Q.apply(n,r),n;break}}return(l||k(e,f))(r,t,!_,n,!t||ve.test(e)&&c(t.parentNode)||t),n},w.sortStable=P.split("").sort(U).join("")===P,w.detectDuplicates=!!j,L(),w.sortDetached=i(function(e){return 1&e.compareDocumentPosition(H.createElement("div"))}),i(function(e){return e.innerHTML="<a href='#'></a>","#"===e.firstChild.getAttribute("href")})||o("type|href|height|width",function(e,t,n){if(!n)return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),w.attributes&&i(function(e){return e.innerHTML="<input/>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||o("value",function(e,t,n){if(!n&&"input"===e.nodeName.toLowerCase())return e.defaultValue}),i(function(e){return null==e.getAttribute("disabled")})||o(te,function(e,t,n){var r;if(!n)return e[t]===!0?t.toLowerCase():(r=e.getAttributeNode(t))&&r.specified?r.value:null}),t}(e);pe.find=ve,pe.expr=ve.selectors,pe.expr[":"]=pe.expr.pseudos,pe.uniqueSort=pe.unique=ve.uniqueSort,pe.text=ve.getText,pe.isXMLDoc=ve.isXML,pe.contains=ve.contains;var xe=function(e,t,n){for(var r=[],i=void 0!==n;(e=e[t])&&9!==e.nodeType;)if(1===e.nodeType){if(i&&pe(e).is(n))break;r.push(e)}return r},be=function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},we=pe.expr.match.needsContext,Te=/^<([\w-]+)\s*\/?>(?:<\/\1>|)$/,Ce=/^.[^:#\[\.,]*$/;pe.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?pe.find.matchesSelector(r,e)?[r]:[]:pe.find.matches(e,pe.grep(t,function(e){return 1===e.nodeType}))},pe.fn.extend({find:function(e){var t,n=[],r=this,i=r.length;if("string"!=typeof e)return this.pushStack(pe(e).filter(function(){for(t=0;t<i;t++)if(pe.contains(r[t],this))return!0}));for(t=0;t<i;t++)pe.find(e,r[t],n);return n=this.pushStack(i>1?pe.unique(n):n),n.selector=this.selector?this.selector+" "+e:e,n},filter:function(e){return this.pushStack(r(this,e||[],!1))},not:function(e){return this.pushStack(r(this,e||[],!0))},is:function(e){return!!r(this,"string"==typeof e&&we.test(e)?pe(e):e||[],!1).length}});var Ee,Ne=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,ke=pe.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||Ee,"string"==typeof e){if(r="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:Ne.exec(e),!r||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof pe?t[0]:t,pe.merge(this,pe.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:re,!0)),Te.test(r[1])&&pe.isPlainObject(t))for(r in t)pe.isFunction(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}if(i=re.getElementById(r[2]),i&&i.parentNode){if(i.id!==r[2])return Ee.find(e);this.length=1,this[0]=i}return this.context=re,this.selector=e,this}return e.nodeType?(this.context=this[0]=e,this.length=1,this):pe.isFunction(e)?"undefined"!=typeof n.ready?n.ready(e):e(pe):(void 0!==e.selector&&(this.selector=e.selector,this.context=e.context),pe.makeArray(e,this))};ke.prototype=pe.fn,Ee=pe(re);var Se=/^(?:parents|prev(?:Until|All))/,Ae={children:!0,contents:!0,next:!0,prev:!0};pe.fn.extend({has:function(e){var t,n=pe(e,this),r=n.length;return this.filter(function(){for(t=0;t<r;t++)if(pe.contains(this,n[t]))return!0})},closest:function(e,t){for(var n,r=0,i=this.length,o=[],a=we.test(e)||"string"!=typeof e?pe(e,t||this.context):0;r<i;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(n.nodeType<11&&(a?a.index(n)>-1:1===n.nodeType&&pe.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(o.length>1?pe.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?pe.inArray(this[0],pe(e)):pe.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(pe.uniqueSort(pe.merge(this.get(),pe(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),pe.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return xe(e,"parentNode")},parentsUntil:function(e,t,n){return xe(e,"parentNode",n)},next:function(e){return i(e,"nextSibling")},prev:function(e){return i(e,"previousSibling")},nextAll:function(e){return xe(e,"nextSibling")},prevAll:function(e){return xe(e,"previousSibling")},nextUntil:function(e,t,n){return xe(e,"nextSibling",n)},prevUntil:function(e,t,n){return xe(e,"previousSibling",n)},siblings:function(e){return be((e.parentNode||{}).firstChild,e)},children:function(e){return be(e.firstChild)},contents:function(e){return pe.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:pe.merge([],e.childNodes)}},function(e,t){pe.fn[e]=function(n,r){var i=pe.map(this,t,n);return"Until"!==e.slice(-5)&&(r=n),r&&"string"==typeof r&&(i=pe.filter(r,i)),this.length>1&&(Ae[e]||(i=pe.uniqueSort(i)),Se.test(e)&&(i=i.reverse())),this.pushStack(i)}});var De=/\S+/g;pe.Callbacks=function(e){e="string"==typeof e?o(e):pe.extend({},e);var t,n,r,i,a=[],s=[],u=-1,l=function(){for(i=e.once,r=t=!0;s.length;u=-1)for(n=s.shift();++u<a.length;)a[u].apply(n[0],n[1])===!1&&e.stopOnFalse&&(u=a.length,n=!1);e.memory||(n=!1),t=!1,i&&(a=n?[]:"")},c={add:function(){return a&&(n&&!t&&(u=a.length-1,s.push(n)),function r(t){pe.each(t,function(t,n){pe.isFunction(n)?e.unique&&c.has(n)||a.push(n):n&&n.length&&"string"!==pe.type(n)&&r(n)})}(arguments),n&&!t&&l()),this},remove:function(){return pe.each(arguments,function(e,t){for(var n;(n=pe.inArray(t,a,n))>-1;)a.splice(n,1),n<=u&&u--}),this},has:function(e){return e?pe.inArray(e,a)>-1:a.length>0},empty:function(){return a&&(a=[]),this},disable:function(){return i=s=[],a=n="",this},disabled:function(){return!a},lock:function(){return i=!0,n||c.disable(),this},locked:function(){return!!i},fireWith:function(e,n){return i||(n=n||[],n=[e,n.slice?n.slice():n],s.push(n),t||l()),this},fire:function(){return c.fireWith(this,arguments),this},fired:function(){return!!r}};return c},pe.extend({Deferred:function(e){var t=[["resolve","done",pe.Callbacks("once memory"),"resolved"],["reject","fail",pe.Callbacks("once memory"),"rejected"],["notify","progress",pe.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return pe.Deferred(function(n){pe.each(t,function(t,o){var a=pe.isFunction(e[t])&&e[t];i[o[1]](function(){var e=a&&a.apply(this,arguments);e&&pe.isFunction(e.promise)?e.promise().progress(n.notify).done(n.resolve).fail(n.reject):n[o[0]+"With"](this===r?n.promise():this,a?[e]:arguments)})}),e=null}).promise()},promise:function(e){return null!=e?pe.extend(e,r):r}},i={};return r.pipe=r.then,pe.each(t,function(e,o){var a=o[2],s=o[3];r[o[1]]=a.add,s&&a.add(function(){n=s},t[1^e][2].disable,t[2][2].lock),i[o[0]]=function(){return i[o[0]+"With"](this===i?r:this,arguments),this},i[o[0]+"With"]=a.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t,n,r,i=0,o=ie.call(arguments),a=o.length,s=1!==a||e&&pe.isFunction(e.promise)?a:0,u=1===s?e:pe.Deferred(),l=function(e,n,r){return function(i){n[e]=this,r[e]=arguments.length>1?ie.call(arguments):i,r===t?u.notifyWith(n,r):--s||u.resolveWith(n,r)}};if(a>1)for(t=new Array(a),n=new Array(a),r=new Array(a);i<a;i++)o[i]&&pe.isFunction(o[i].promise)?o[i].promise().progress(l(i,n,t)).done(l(i,r,o)).fail(u.reject):--s;return s||u.resolveWith(r,o),u.promise()}});var je;pe.fn.ready=function(e){return pe.ready.promise().done(e),this},pe.extend({isReady:!1,readyWait:1,holdReady:function(e){e?pe.readyWait++:pe.ready(!0)},ready:function(e){(e===!0?--pe.readyWait:pe.isReady)||(pe.isReady=!0,e!==!0&&--pe.readyWait>0||(je.resolveWith(re,[pe]),pe.fn.triggerHandler&&(pe(re).triggerHandler("ready"),pe(re).off("ready"))))}}),pe.ready.promise=function(t){if(!je)if(je=pe.Deferred(),"complete"===re.readyState||"loading"!==re.readyState&&!re.documentElement.doScroll)e.setTimeout(pe.ready);else if(re.addEventListener)re.addEventListener("DOMContentLoaded",s),e.addEventListener("load",s);else{re.attachEvent("onreadystatechange",s),e.attachEvent("onload",s);var n=!1;try{n=null==e.frameElement&&re.documentElement}catch(r){}n&&n.doScroll&&!function i(){if(!pe.isReady){try{n.doScroll("left")}catch(t){return e.setTimeout(i,50)}a(),pe.ready()}}()}return je.promise(t)},pe.ready.promise();var Le;for(Le in pe(fe))break;fe.ownFirst="0"===Le,fe.inlineBlockNeedsLayout=!1,pe(function(){var e,t,n,r;n=re.getElementsByTagName("body")[0],n&&n.style&&(t=re.createElement("div"),r=re.createElement("div"),r.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",n.appendChild(r).appendChild(t),"undefined"!=typeof t.style.zoom&&(t.style.cssText="display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1",fe.inlineBlockNeedsLayout=e=3===t.offsetWidth,e&&(n.style.zoom=1)),n.removeChild(r))}),function(){var e=re.createElement("div");fe.deleteExpando=!0;try{delete e.test}catch(t){fe.deleteExpando=!1}e=null}();var He=function(e){var t=pe.noData[(e.nodeName+" ").toLowerCase()],n=+e.nodeType||1;return(1===n||9===n)&&(!t||t!==!0&&e.getAttribute("classid")===t)},qe=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,_e=/([A-Z])/g;pe.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(e){return e=e.nodeType?pe.cache[e[pe.expando]]:e[pe.expando],!!e&&!l(e)},data:function(e,t,n){return c(e,t,n)},removeData:function(e,t){return f(e,t)},_data:function(e,t,n){return c(e,t,n,!0)},_removeData:function(e,t){return f(e,t,!0)}}),pe.fn.extend({data:function(e,t){var n,r,i,o=this[0],a=o&&o.attributes;if(void 0===e){if(this.length&&(i=pe.data(o),1===o.nodeType&&!pe._data(o,"parsedAttrs"))){for(n=a.length;n--;)a[n]&&(r=a[n].name,0===r.indexOf("data-")&&(r=pe.camelCase(r.slice(5)),u(o,r,i[r])));pe._data(o,"parsedAttrs",!0)}return i}return"object"==typeof e?this.each(function(){pe.data(this,e)}):arguments.length>1?this.each(function(){pe.data(this,e,t)}):o?u(o,e,pe.data(o,e)):void 0},removeData:function(e){return this.each(function(){pe.removeData(this,e)})}}),pe.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=pe._data(e,t),n&&(!r||pe.isArray(n)?r=pe._data(e,t,pe.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=pe.queue(e,t),r=n.length,i=n.shift(),o=pe._queueHooks(e,t),a=function(){pe.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,a,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return pe._data(e,n)||pe._data(e,n,{empty:pe.Callbacks("once memory").add(function(){pe._removeData(e,t+"queue"),pe._removeData(e,n)})})}}),pe.fn.extend({queue:function(e,t){var n=2;return"string"!=typeof e&&(t=e,e="fx",n--),arguments.length<n?pe.queue(this[0],e):void 0===t?this:this.each(function(){var n=pe.queue(this,e,t);pe._queueHooks(this,e),"fx"===e&&"inprogress"!==n[0]&&pe.dequeue(this,e)})},dequeue:function(e){return this.each(function(){pe.dequeue(this,e)})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,t){var n,r=1,i=pe.Deferred(),o=this,a=this.length,s=function(){--r||i.resolveWith(o,[o])};for("string"!=typeof e&&(t=e,e=void 0),e=e||"fx";a--;)n=pe._data(o[a],e+"queueHooks"),n&&n.empty&&(r++,n.empty.add(s));return s(),i.promise(t)}}),function(){var e;fe.shrinkWrapBlocks=function(){if(null!=e)return e;e=!1;var t,n,r;return n=re.getElementsByTagName("body")[0],n&&n.style?(t=re.createElement("div"),r=re.createElement("div"),r.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",n.appendChild(r).appendChild(t),"undefined"!=typeof t.style.zoom&&(t.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:1px;width:1px;zoom:1",t.appendChild(re.createElement("div")).style.width="5px",e=3!==t.offsetWidth),n.removeChild(r),e):void 0}}();var Fe=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,Me=new RegExp("^(?:([+-])=|)("+Fe+")([a-z%]*)$","i"),Oe=["Top","Right","Bottom","Left"],Re=function(e,t){return e=t||e,"none"===pe.css(e,"display")||!pe.contains(e.ownerDocument,e)},Pe=function(e,t,n,r,i,o,a){var s=0,u=e.length,l=null==n;if("object"===pe.type(n)){i=!0;for(s in n)Pe(e,t,s,n[s],!0,o,a)}else if(void 0!==r&&(i=!0,pe.isFunction(r)||(a=!0),l&&(a?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(pe(e),n)})),t))for(;s<u;s++)t(e[s],n,a?r:r.call(e[s],s,t(e[s],n)));return i?e:l?t.call(e):u?t(e[0],n):o},Be=/^(?:checkbox|radio)$/i,We=/<([\w:-]+)/,Ie=/^$|\/(?:java|ecma)script/i,$e=/^\s+/,ze="abbr|article|aside|audio|bdi|canvas|data|datalist|details|dialog|figcaption|figure|footer|header|hgroup|main|mark|meter|nav|output|picture|progress|section|summary|template|time|video";!function(){var e=re.createElement("div"),t=re.createDocumentFragment(),n=re.createElement("input");e.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",fe.leadingWhitespace=3===e.firstChild.nodeType,fe.tbody=!e.getElementsByTagName("tbody").length,fe.htmlSerialize=!!e.getElementsByTagName("link").length,fe.html5Clone="<:nav></:nav>"!==re.createElement("nav").cloneNode(!0).outerHTML,n.type="checkbox",n.checked=!0,t.appendChild(n),fe.appendChecked=n.checked,e.innerHTML="<textarea>x</textarea>",fe.noCloneChecked=!!e.cloneNode(!0).lastChild.defaultValue,t.appendChild(e),n=re.createElement("input"),n.setAttribute("type","radio"),n.setAttribute("checked","checked"),n.setAttribute("name","t"),e.appendChild(n),fe.checkClone=e.cloneNode(!0).cloneNode(!0).lastChild.checked,fe.noCloneEvent=!!e.addEventListener,e[pe.expando]=1,fe.attributes=!e.getAttribute(pe.expando)}();var Xe={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:fe.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]};Xe.optgroup=Xe.option,Xe.tbody=Xe.tfoot=Xe.colgroup=Xe.caption=Xe.thead,Xe.th=Xe.td;var Ue=/<|&#?\w+;/,Ve=/<tbody/i;!function(){var t,n,r=re.createElement("div");for(t in{submit:!0,change:!0,focusin:!0})n="on"+t,(fe[t]=n in e)||(r.setAttribute(n,"t"),fe[t]=r.attributes[n].expando===!1);r=null}();var Ye=/^(?:input|select|textarea)$/i,Je=/^key/,Ge=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,Ke=/^(?:focusinfocus|focusoutblur)$/,Qe=/^([^.]*)(?:\.(.+)|)/;pe.event={global:{},add:function(e,t,n,r,i){var o,a,s,u,l,c,f,d,p,h,g,m=pe._data(e);if(m){for(n.handler&&(u=n,n=u.handler,i=u.selector),n.guid||(n.guid=pe.guid++),(a=m.events)||(a=m.events={}),(c=m.handle)||(c=m.handle=function(e){return"undefined"==typeof pe||e&&pe.event.triggered===e.type?void 0:pe.event.dispatch.apply(c.elem,arguments)},c.elem=e),t=(t||"").match(De)||[""],s=t.length;s--;)o=Qe.exec(t[s])||[],p=g=o[1],h=(o[2]||"").split(".").sort(),p&&(l=pe.event.special[p]||{},p=(i?l.delegateType:l.bindType)||p,l=pe.event.special[p]||{},f=pe.extend({type:p,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&pe.expr.match.needsContext.test(i),namespace:h.join(".")},u),(d=a[p])||(d=a[p]=[],d.delegateCount=0,l.setup&&l.setup.call(e,r,h,c)!==!1||(e.addEventListener?e.addEventListener(p,c,!1):e.attachEvent&&e.attachEvent("on"+p,c))),l.add&&(l.add.call(e,f),f.handler.guid||(f.handler.guid=n.guid)),i?d.splice(d.delegateCount++,0,f):d.push(f),pe.event.global[p]=!0);e=null}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,d,p,h,g,m=pe.hasData(e)&&pe._data(e);if(m&&(c=m.events)){for(t=(t||"").match(De)||[""],l=t.length;l--;)if(s=Qe.exec(t[l])||[],p=g=s[1],h=(s[2]||"").split(".").sort(),p){for(f=pe.event.special[p]||{},p=(r?f.delegateType:f.bindType)||p,d=c[p]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),u=o=d.length;o--;)a=d[o],!i&&g!==a.origType||n&&n.guid!==a.guid||s&&!s.test(a.namespace)||r&&r!==a.selector&&("**"!==r||!a.selector)||(d.splice(o,1),a.selector&&d.delegateCount--,f.remove&&f.remove.call(e,a));u&&!d.length&&(f.teardown&&f.teardown.call(e,h,m.handle)!==!1||pe.removeEvent(e,p,m.handle),delete c[p])}else for(p in c)pe.event.remove(e,p+t[l],n,r,!0);pe.isEmptyObject(c)&&(delete m.handle,pe._removeData(e,"events"))}},trigger:function(t,n,r,i){var o,a,s,u,l,c,f,d=[r||re],p=ce.call(t,"type")?t.type:t,h=ce.call(t,"namespace")?t.namespace.split("."):[];if(s=c=r=r||re,3!==r.nodeType&&8!==r.nodeType&&!Ke.test(p+pe.event.triggered)&&(p.indexOf(".")>-1&&(h=p.split("."),p=h.shift(),h.sort()),a=p.indexOf(":")<0&&"on"+p,t=t[pe.expando]?t:new pe.Event(p,"object"==typeof t&&t),t.isTrigger=i?2:3,t.namespace=h.join("."),t.rnamespace=t.namespace?new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,t.result=void 0,t.target||(t.target=r),n=null==n?[t]:pe.makeArray(n,[t]),l=pe.event.special[p]||{},i||!l.trigger||l.trigger.apply(r,n)!==!1)){if(!i&&!l.noBubble&&!pe.isWindow(r)){for(u=l.delegateType||p,Ke.test(u+p)||(s=s.parentNode);s;s=s.parentNode)d.push(s),c=s;c===(r.ownerDocument||re)&&d.push(c.defaultView||c.parentWindow||e)}for(f=0;(s=d[f++])&&!t.isPropagationStopped();)t.type=f>1?u:l.bindType||p,o=(pe._data(s,"events")||{})[t.type]&&pe._data(s,"handle"),o&&o.apply(s,n),o=a&&s[a],o&&o.apply&&He(s)&&(t.result=o.apply(s,n),t.result===!1&&t.preventDefault());if(t.type=p,!i&&!t.isDefaultPrevented()&&(!l._default||l._default.apply(d.pop(),n)===!1)&&He(r)&&a&&r[p]&&!pe.isWindow(r)){c=r[a],c&&(r[a]=null),pe.event.triggered=p;try{r[p]()}catch(g){}pe.event.triggered=void 0,c&&(r[a]=c)}return t.result}},dispatch:function(e){e=pe.event.fix(e);var t,n,r,i,o,a=[],s=ie.call(arguments),u=(pe._data(this,"events")||{})[e.type]||[],l=pe.event.special[e.type]||{};if(s[0]=e,e.delegateTarget=this,!l.preDispatch||l.preDispatch.call(this,e)!==!1){for(a=pe.event.handlers.call(this,e,u),t=0;(i=a[t++])&&!e.isPropagationStopped();)for(e.currentTarget=i.elem,n=0;(o=i.handlers[n++])&&!e.isImmediatePropagationStopped();)e.rnamespace&&!e.rnamespace.test(o.namespace)||(e.handleObj=o,e.data=o.data,r=((pe.event.special[o.origType]||{}).handle||o.handler).apply(i.elem,s),void 0!==r&&(e.result=r)===!1&&(e.preventDefault(),e.stopPropagation()));return l.postDispatch&&l.postDispatch.call(this,e),e.result}},handlers:function(e,t){var n,r,i,o,a=[],s=t.delegateCount,u=e.target;if(s&&u.nodeType&&("click"!==e.type||isNaN(e.button)||e.button<1))for(;u!=this;u=u.parentNode||this)if(1===u.nodeType&&(u.disabled!==!0||"click"!==e.type)){for(r=[],n=0;n<s;n++)o=t[n],i=o.selector+" ",void 0===r[i]&&(r[i]=o.needsContext?pe(i,this).index(u)>-1:pe.find(i,this,null,[u]).length),r[i]&&r.push(o);r.length&&a.push({elem:u,handlers:r})}return s<t.length&&a.push({elem:this,handlers:t.slice(s)}),a},fix:function(e){if(e[pe.expando])return e;var t,n,r,i=e.type,o=e,a=this.fixHooks[i];for(a||(this.fixHooks[i]=a=Ge.test(i)?this.mouseHooks:Je.test(i)?this.keyHooks:{}),r=a.props?this.props.concat(a.props):this.props,e=new pe.Event(o),t=r.length;t--;)n=r[t],e[n]=o[n];return e.target||(e.target=o.srcElement||re),3===e.target.nodeType&&(e.target=e.target.parentNode),e.metaKey=!!e.metaKey,a.filter?a.filter(e,o):e},props:"altKey bubbles cancelable ctrlKey currentTarget detail eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return null==e.which&&(e.which=null!=t.charCode?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,t){var n,r,i,o=t.button,a=t.fromElement;return null==e.pageX&&null!=t.clientX&&(r=e.target.ownerDocument||re,i=r.documentElement,n=r.body,e.pageX=t.clientX+(i&&i.scrollLeft||n&&n.scrollLeft||0)-(i&&i.clientLeft||n&&n.clientLeft||0),e.pageY=t.clientY+(i&&i.scrollTop||n&&n.scrollTop||0)-(i&&i.clientTop||n&&n.clientTop||0)),!e.relatedTarget&&a&&(e.relatedTarget=a===e.target?t.toElement:a),e.which||void 0===o||(e.which=1&o?1:2&o?3:4&o?2:0),e}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==b()&&this.focus)try{return this.focus(),!1}catch(e){}},delegateType:"focusin"},blur:{trigger:function(){if(this===b()&&this.blur)return this.blur(),!1},delegateType:"focusout"},click:{trigger:function(){if(pe.nodeName(this,"input")&&"checkbox"===this.type&&this.click)return this.click(),!1},_default:function(e){return pe.nodeName(e.target,"a")}},beforeunload:{postDispatch:function(e){void 0!==e.result&&e.originalEvent&&(e.originalEvent.returnValue=e.result)}}},simulate:function(e,t,n){var r=pe.extend(new pe.Event,n,{type:e,isSimulated:!0});pe.event.trigger(r,null,t),r.isDefaultPrevented()&&n.preventDefault()}},pe.removeEvent=re.removeEventListener?function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n)}:function(e,t,n){var r="on"+t;e.detachEvent&&("undefined"==typeof e[r]&&(e[r]=null),e.detachEvent(r,n))},pe.Event=function(e,t){return this instanceof pe.Event?(e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||void 0===e.defaultPrevented&&e.returnValue===!1?v:x):this.type=e,t&&pe.extend(this,t),this.timeStamp=e&&e.timeStamp||pe.now(),void(this[pe.expando]=!0)):new pe.Event(e,t)},pe.Event.prototype={constructor:pe.Event,isDefaultPrevented:x,isPropagationStopped:x,isImmediatePropagationStopped:x,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=v,e&&(e.preventDefault?e.preventDefault():e.returnValue=!1)},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=v,e&&!this.isSimulated&&(e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0)},stopImmediatePropagation:function(){var e=this.originalEvent;this.isImmediatePropagationStopped=v,e&&e.stopImmediatePropagation&&e.stopImmediatePropagation(),this.stopPropagation()}},pe.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(e,t){pe.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,o=e.handleObj;return i&&(i===r||pe.contains(r,i))||(e.type=o.origType,n=o.handler.apply(this,arguments),e.type=t),n}}}),fe.submit||(pe.event.special.submit={setup:function(){return!pe.nodeName(this,"form")&&void pe.event.add(this,"click._submit keypress._submit",function(e){var t=e.target,n=pe.nodeName(t,"input")||pe.nodeName(t,"button")?pe.prop(t,"form"):void 0;n&&!pe._data(n,"submit")&&(pe.event.add(n,"submit._submit",function(e){e._submitBubble=!0}),pe._data(n,"submit",!0))})},postDispatch:function(e){e._submitBubble&&(delete e._submitBubble,this.parentNode&&!e.isTrigger&&pe.event.simulate("submit",this.parentNode,e))},teardown:function(){return!pe.nodeName(this,"form")&&void pe.event.remove(this,"._submit")}}),fe.change||(pe.event.special.change={setup:function(){return Ye.test(this.nodeName)?("checkbox"!==this.type&&"radio"!==this.type||(pe.event.add(this,"propertychange._change",function(e){"checked"===e.originalEvent.propertyName&&(this._justChanged=!0)}),pe.event.add(this,"click._change",function(e){this._justChanged&&!e.isTrigger&&(this._justChanged=!1),pe.event.simulate("change",this,e)})),!1):void pe.event.add(this,"beforeactivate._change",function(e){var t=e.target;Ye.test(t.nodeName)&&!pe._data(t,"change")&&(pe.event.add(t,"change._change",function(e){!this.parentNode||e.isSimulated||e.isTrigger||pe.event.simulate("change",this.parentNode,e)}),pe._data(t,"change",!0))})},handle:function(e){var t=e.target;if(this!==t||e.isSimulated||e.isTrigger||"radio"!==t.type&&"checkbox"!==t.type)return e.handleObj.handler.apply(this,arguments)},teardown:function(){return pe.event.remove(this,"._change"),!Ye.test(this.nodeName)}}),fe.focusin||pe.each({focus:"focusin",blur:"focusout"},function(e,t){var n=function(e){pe.event.simulate(t,e.target,pe.event.fix(e))};pe.event.special[t]={setup:function(){var r=this.ownerDocument||this,i=pe._data(r,t);i||r.addEventListener(e,n,!0),pe._data(r,t,(i||0)+1)},teardown:function(){var r=this.ownerDocument||this,i=pe._data(r,t)-1;i?pe._data(r,t,i):(r.removeEventListener(e,n,!0),pe._removeData(r,t))}}}),pe.fn.extend({on:function(e,t,n,r){return w(this,e,t,n,r)},one:function(e,t,n,r){return w(this,e,t,n,r,1)},off:function(e,t,n){var r,i;if(e&&e.preventDefault&&e.handleObj)return r=e.handleObj,pe(e.delegateTarget).off(r.namespace?r.origType+"."+r.namespace:r.origType,r.selector,r.handler),this;if("object"==typeof e){for(i in e)this.off(i,t,e[i]);return this}return t!==!1&&"function"!=typeof t||(n=t,t=void 0),n===!1&&(n=x),this.each(function(){pe.event.remove(this,e,n,t)})},trigger:function(e,t){return this.each(function(){pe.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];if(n)return pe.event.trigger(e,t,n,!0)}});var Ze=/ jQuery\d+="(?:null|\d+)"/g,et=new RegExp("<(?:"+ze+")[\\s/>]","i"),tt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi,nt=/<script|<style|<link/i,rt=/checked\s*(?:[^=]|=\s*.checked.)/i,it=/^true\/(.*)/,ot=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,at=p(re),st=at.appendChild(re.createElement("div"));pe.extend({htmlPrefilter:function(e){return e.replace(tt,"<$1></$2>")},clone:function(e,t,n){var r,i,o,a,s,u=pe.contains(e.ownerDocument,e);if(fe.html5Clone||pe.isXMLDoc(e)||!et.test("<"+e.nodeName+">")?o=e.cloneNode(!0):(st.innerHTML=e.outerHTML,st.removeChild(o=st.firstChild)),!(fe.noCloneEvent&&fe.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||pe.isXMLDoc(e)))for(r=h(o),s=h(e),a=0;null!=(i=s[a]);++a)r[a]&&k(i,r[a]);if(t)if(n)for(s=s||h(e),r=r||h(o),a=0;null!=(i=s[a]);a++)N(i,r[a]);else N(e,o);return r=h(o,"script"),r.length>0&&g(r,!u&&h(e,"script")),r=s=i=null,o},cleanData:function(e,t){for(var n,r,i,o,a=0,s=pe.expando,u=pe.cache,l=fe.attributes,c=pe.event.special;null!=(n=e[a]);a++)if((t||He(n))&&(i=n[s],o=i&&u[i])){if(o.events)for(r in o.events)c[r]?pe.event.remove(n,r):pe.removeEvent(n,r,o.handle);u[i]&&(delete u[i],l||"undefined"==typeof n.removeAttribute?n[s]=void 0:n.removeAttribute(s),ne.push(i))}}}),pe.fn.extend({domManip:S,detach:function(e){return A(this,e,!0)},remove:function(e){return A(this,e)},text:function(e){return Pe(this,function(e){return void 0===e?pe.text(this):this.empty().append((this[0]&&this[0].ownerDocument||re).createTextNode(e))},null,e,arguments.length)},append:function(){return S(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=T(this,e);t.appendChild(e)}})},prepend:function(){return S(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=T(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return S(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return S(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},empty:function(){for(var e,t=0;null!=(e=this[t]);t++){for(1===e.nodeType&&pe.cleanData(h(e,!1));e.firstChild;)e.removeChild(e.firstChild);e.options&&pe.nodeName(e,"select")&&(e.options.length=0)}return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map(function(){return pe.clone(this,e,t)})},html:function(e){return Pe(this,function(e){var t=this[0]||{},n=0,r=this.length;if(void 0===e)return 1===t.nodeType?t.innerHTML.replace(Ze,""):void 0;if("string"==typeof e&&!nt.test(e)&&(fe.htmlSerialize||!et.test(e))&&(fe.leadingWhitespace||!$e.test(e))&&!Xe[(We.exec(e)||["",""])[1].toLowerCase()]){e=pe.htmlPrefilter(e);try{for(;n<r;n++)t=this[n]||{},1===t.nodeType&&(pe.cleanData(h(t,!1)),t.innerHTML=e);t=0}catch(i){}}t&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var e=[];return S(this,arguments,function(t){var n=this.parentNode;pe.inArray(this,e)<0&&(pe.cleanData(h(this)),n&&n.replaceChild(t,this));
+},e)}}),pe.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){pe.fn[e]=function(e){for(var n,r=0,i=[],o=pe(e),a=o.length-1;r<=a;r++)n=r===a?this:this.clone(!0),pe(o[r])[t](n),ae.apply(i,n.get());return this.pushStack(i)}});var ut,lt={HTML:"block",BODY:"block"},ct=/^margin/,ft=new RegExp("^("+Fe+")(?!px)[a-z%]+$","i"),dt=function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];i=n.apply(e,r||[]);for(o in t)e.style[o]=a[o];return i},pt=re.documentElement;!function(){function t(){var t,c,f=re.documentElement;f.appendChild(u),l.style.cssText="-webkit-box-sizing:border-box;box-sizing:border-box;position:relative;display:block;margin:auto;border:1px;padding:1px;top:1%;width:50%",n=i=s=!1,r=a=!0,e.getComputedStyle&&(c=e.getComputedStyle(l),n="1%"!==(c||{}).top,s="2px"===(c||{}).marginLeft,i="4px"===(c||{width:"4px"}).width,l.style.marginRight="50%",r="4px"===(c||{marginRight:"4px"}).marginRight,t=l.appendChild(re.createElement("div")),t.style.cssText=l.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:0",t.style.marginRight=t.style.width="0",l.style.width="1px",a=!parseFloat((e.getComputedStyle(t)||{}).marginRight),l.removeChild(t)),l.style.display="none",o=0===l.getClientRects().length,o&&(l.style.display="",l.innerHTML="<table><tr><td></td><td>t</td></tr></table>",l.childNodes[0].style.borderCollapse="separate",t=l.getElementsByTagName("td"),t[0].style.cssText="margin:0;border:0;padding:0;display:none",o=0===t[0].offsetHeight,o&&(t[0].style.display="",t[1].style.display="none",o=0===t[0].offsetHeight)),f.removeChild(u)}var n,r,i,o,a,s,u=re.createElement("div"),l=re.createElement("div");l.style&&(l.style.cssText="float:left;opacity:.5",fe.opacity="0.5"===l.style.opacity,fe.cssFloat=!!l.style.cssFloat,l.style.backgroundClip="content-box",l.cloneNode(!0).style.backgroundClip="",fe.clearCloneStyle="content-box"===l.style.backgroundClip,u=re.createElement("div"),u.style.cssText="border:0;width:8px;height:0;top:0;left:-9999px;padding:0;margin-top:1px;position:absolute",l.innerHTML="",u.appendChild(l),fe.boxSizing=""===l.style.boxSizing||""===l.style.MozBoxSizing||""===l.style.WebkitBoxSizing,pe.extend(fe,{reliableHiddenOffsets:function(){return null==n&&t(),o},boxSizingReliable:function(){return null==n&&t(),i},pixelMarginRight:function(){return null==n&&t(),r},pixelPosition:function(){return null==n&&t(),n},reliableMarginRight:function(){return null==n&&t(),a},reliableMarginLeft:function(){return null==n&&t(),s}}))}();var ht,gt,mt=/^(top|right|bottom|left)$/;e.getComputedStyle?(ht=function(t){var n=t.ownerDocument.defaultView;return n&&n.opener||(n=e),n.getComputedStyle(t)},gt=function(e,t,n){var r,i,o,a,s=e.style;return n=n||ht(e),a=n?n.getPropertyValue(t)||n[t]:void 0,""!==a&&void 0!==a||pe.contains(e.ownerDocument,e)||(a=pe.style(e,t)),n&&!fe.pixelMarginRight()&&ft.test(a)&&ct.test(t)&&(r=s.width,i=s.minWidth,o=s.maxWidth,s.minWidth=s.maxWidth=s.width=a,a=n.width,s.width=r,s.minWidth=i,s.maxWidth=o),void 0===a?a:a+""}):pt.currentStyle&&(ht=function(e){return e.currentStyle},gt=function(e,t,n){var r,i,o,a,s=e.style;return n=n||ht(e),a=n?n[t]:void 0,null==a&&s&&s[t]&&(a=s[t]),ft.test(a)&&!mt.test(t)&&(r=s.left,i=e.runtimeStyle,o=i&&i.left,o&&(i.left=e.currentStyle.left),s.left="fontSize"===t?"1em":a,a=s.pixelLeft+"px",s.left=r,o&&(i.left=o)),void 0===a?a:a+""||"auto"});var yt=/alpha\([^)]*\)/i,vt=/opacity\s*=\s*([^)]*)/i,xt=/^(none|table(?!-c[ea]).+)/,bt=new RegExp("^("+Fe+")(.*)$","i"),wt={position:"absolute",visibility:"hidden",display:"block"},Tt={letterSpacing:"0",fontWeight:"400"},Ct=["Webkit","O","Moz","ms"],Et=re.createElement("div").style;pe.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=gt(e,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":fe.cssFloat?"cssFloat":"styleFloat"},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,a,s=pe.camelCase(t),u=e.style;if(t=pe.cssProps[s]||(pe.cssProps[s]=H(s)||s),a=pe.cssHooks[t]||pe.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(e,!1,r))?i:u[t];if(o=typeof n,"string"===o&&(i=Me.exec(n))&&i[1]&&(n=d(e,t,i),o="number"),null!=n&&n===n&&("number"===o&&(n+=i&&i[3]||(pe.cssNumber[s]?"":"px")),fe.clearCloneStyle||""!==n||0!==t.indexOf("background")||(u[t]="inherit"),!(a&&"set"in a&&void 0===(n=a.set(e,n,r)))))try{u[t]=n}catch(l){}}},css:function(e,t,n,r){var i,o,a,s=pe.camelCase(t);return t=pe.cssProps[s]||(pe.cssProps[s]=H(s)||s),a=pe.cssHooks[t]||pe.cssHooks[s],a&&"get"in a&&(o=a.get(e,!0,n)),void 0===o&&(o=gt(e,t,r)),"normal"===o&&t in Tt&&(o=Tt[t]),""===n||n?(i=parseFloat(o),n===!0||isFinite(i)?i||0:o):o}}),pe.each(["height","width"],function(e,t){pe.cssHooks[t]={get:function(e,n,r){if(n)return xt.test(pe.css(e,"display"))&&0===e.offsetWidth?dt(e,wt,function(){return M(e,t,r)}):M(e,t,r)},set:function(e,n,r){var i=r&&ht(e);return _(e,n,r?F(e,t,r,fe.boxSizing&&"border-box"===pe.css(e,"boxSizing",!1,i),i):0)}}}),fe.opacity||(pe.cssHooks.opacity={get:function(e,t){return vt.test((t&&e.currentStyle?e.currentStyle.filter:e.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":t?"1":""},set:function(e,t){var n=e.style,r=e.currentStyle,i=pe.isNumeric(t)?"alpha(opacity="+100*t+")":"",o=r&&r.filter||n.filter||"";n.zoom=1,(t>=1||""===t)&&""===pe.trim(o.replace(yt,""))&&n.removeAttribute&&(n.removeAttribute("filter"),""===t||r&&!r.filter)||(n.filter=yt.test(o)?o.replace(yt,i):o+" "+i)}}),pe.cssHooks.marginRight=L(fe.reliableMarginRight,function(e,t){if(t)return dt(e,{display:"inline-block"},gt,[e,"marginRight"])}),pe.cssHooks.marginLeft=L(fe.reliableMarginLeft,function(e,t){if(t)return(parseFloat(gt(e,"marginLeft"))||(pe.contains(e.ownerDocument,e)?e.getBoundingClientRect().left-dt(e,{marginLeft:0},function(){return e.getBoundingClientRect().left}):0))+"px"}),pe.each({margin:"",padding:"",border:"Width"},function(e,t){pe.cssHooks[e+t]={expand:function(n){for(var r=0,i={},o="string"==typeof n?n.split(" "):[n];r<4;r++)i[e+Oe[r]+t]=o[r]||o[r-2]||o[0];return i}},ct.test(e)||(pe.cssHooks[e+t].set=_)}),pe.fn.extend({css:function(e,t){return Pe(this,function(e,t,n){var r,i,o={},a=0;if(pe.isArray(t)){for(r=ht(e),i=t.length;a<i;a++)o[t[a]]=pe.css(e,t[a],!1,r);return o}return void 0!==n?pe.style(e,t,n):pe.css(e,t)},e,t,arguments.length>1)},show:function(){return q(this,!0)},hide:function(){return q(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){Re(this)?pe(this).show():pe(this).hide()})}}),pe.Tween=O,O.prototype={constructor:O,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||pe.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(pe.cssNumber[n]?"":"px")},cur:function(){var e=O.propHooks[this.prop];return e&&e.get?e.get(this):O.propHooks._default.get(this)},run:function(e){var t,n=O.propHooks[this.prop];return this.options.duration?this.pos=t=pe.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):O.propHooks._default.set(this),this}},O.prototype.init.prototype=O.prototype,O.propHooks={_default:{get:function(e){var t;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(t=pe.css(e.elem,e.prop,""),t&&"auto"!==t?t:0)},set:function(e){pe.fx.step[e.prop]?pe.fx.step[e.prop](e):1!==e.elem.nodeType||null==e.elem.style[pe.cssProps[e.prop]]&&!pe.cssHooks[e.prop]?e.elem[e.prop]=e.now:pe.style(e.elem,e.prop,e.now+e.unit)}}},O.propHooks.scrollTop=O.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},pe.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},pe.fx=O.prototype.init,pe.fx.step={};var Nt,kt,St=/^(?:toggle|show|hide)$/,At=/queueHooks$/;pe.Animation=pe.extend($,{tweeners:{"*":[function(e,t){var n=this.createTween(e,t);return d(n.elem,e,Me.exec(t),n),n}]},tweener:function(e,t){pe.isFunction(e)?(t=e,e=["*"]):e=e.match(De);for(var n,r=0,i=e.length;r<i;r++)n=e[r],$.tweeners[n]=$.tweeners[n]||[],$.tweeners[n].unshift(t)},prefilters:[W],prefilter:function(e,t){t?$.prefilters.unshift(e):$.prefilters.push(e)}}),pe.speed=function(e,t,n){var r=e&&"object"==typeof e?pe.extend({},e):{complete:n||!n&&t||pe.isFunction(e)&&e,duration:e,easing:n&&t||t&&!pe.isFunction(t)&&t};return r.duration=pe.fx.off?0:"number"==typeof r.duration?r.duration:r.duration in pe.fx.speeds?pe.fx.speeds[r.duration]:pe.fx.speeds._default,null!=r.queue&&r.queue!==!0||(r.queue="fx"),r.old=r.complete,r.complete=function(){pe.isFunction(r.old)&&r.old.call(this),r.queue&&pe.dequeue(this,r.queue)},r},pe.fn.extend({fadeTo:function(e,t,n,r){return this.filter(Re).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(e,t,n,r){var i=pe.isEmptyObject(e),o=pe.speed(t,n,r),a=function(){var t=$(this,pe.extend({},e),o);(i||pe._data(this,"finish"))&&t.stop(!0)};return a.finish=a,i||o.queue===!1?this.each(a):this.queue(o.queue,a)},stop:function(e,t,n){var r=function(e){var t=e.stop;delete e.stop,t(n)};return"string"!=typeof e&&(n=t,t=e,e=void 0),t&&e!==!1&&this.queue(e||"fx",[]),this.each(function(){var t=!0,i=null!=e&&e+"queueHooks",o=pe.timers,a=pe._data(this);if(i)a[i]&&a[i].stop&&r(a[i]);else for(i in a)a[i]&&a[i].stop&&At.test(i)&&r(a[i]);for(i=o.length;i--;)o[i].elem!==this||null!=e&&o[i].queue!==e||(o[i].anim.stop(n),t=!1,o.splice(i,1));!t&&n||pe.dequeue(this,e)})},finish:function(e){return e!==!1&&(e=e||"fx"),this.each(function(){var t,n=pe._data(this),r=n[e+"queue"],i=n[e+"queueHooks"],o=pe.timers,a=r?r.length:0;for(n.finish=!0,pe.queue(this,e,[]),i&&i.stop&&i.stop.call(this,!0),t=o.length;t--;)o[t].elem===this&&o[t].queue===e&&(o[t].anim.stop(!0),o.splice(t,1));for(t=0;t<a;t++)r[t]&&r[t].finish&&r[t].finish.call(this);delete n.finish})}}),pe.each(["toggle","show","hide"],function(e,t){var n=pe.fn[t];pe.fn[t]=function(e,r,i){return null==e||"boolean"==typeof e?n.apply(this,arguments):this.animate(P(t,!0),e,r,i)}}),pe.each({slideDown:P("show"),slideUp:P("hide"),slideToggle:P("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,t){pe.fn[e]=function(e,n,r){return this.animate(t,e,n,r)}}),pe.timers=[],pe.fx.tick=function(){var e,t=pe.timers,n=0;for(Nt=pe.now();n<t.length;n++)e=t[n],e()||t[n]!==e||t.splice(n--,1);t.length||pe.fx.stop(),Nt=void 0},pe.fx.timer=function(e){pe.timers.push(e),e()?pe.fx.start():pe.timers.pop()},pe.fx.interval=13,pe.fx.start=function(){kt||(kt=e.setInterval(pe.fx.tick,pe.fx.interval))},pe.fx.stop=function(){e.clearInterval(kt),kt=null},pe.fx.speeds={slow:600,fast:200,_default:400},pe.fn.delay=function(t,n){return t=pe.fx?pe.fx.speeds[t]||t:t,n=n||"fx",this.queue(n,function(n,r){var i=e.setTimeout(n,t);r.stop=function(){e.clearTimeout(i)}})},function(){var e,t=re.createElement("input"),n=re.createElement("div"),r=re.createElement("select"),i=r.appendChild(re.createElement("option"));n=re.createElement("div"),n.setAttribute("className","t"),n.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",e=n.getElementsByTagName("a")[0],t.setAttribute("type","checkbox"),n.appendChild(t),e=n.getElementsByTagName("a")[0],e.style.cssText="top:1px",fe.getSetAttribute="t"!==n.className,fe.style=/top/.test(e.getAttribute("style")),fe.hrefNormalized="/a"===e.getAttribute("href"),fe.checkOn=!!t.value,fe.optSelected=i.selected,fe.enctype=!!re.createElement("form").enctype,r.disabled=!0,fe.optDisabled=!i.disabled,t=re.createElement("input"),t.setAttribute("value",""),fe.input=""===t.getAttribute("value"),t.value="t",t.setAttribute("type","radio"),fe.radioValue="t"===t.value}();var Dt=/\r/g,jt=/[\x20\t\r\n\f]+/g;pe.fn.extend({val:function(e){var t,n,r,i=this[0];{if(arguments.length)return r=pe.isFunction(e),this.each(function(n){var i;1===this.nodeType&&(i=r?e.call(this,n,pe(this).val()):e,null==i?i="":"number"==typeof i?i+="":pe.isArray(i)&&(i=pe.map(i,function(e){return null==e?"":e+""})),t=pe.valHooks[this.type]||pe.valHooks[this.nodeName.toLowerCase()],t&&"set"in t&&void 0!==t.set(this,i,"value")||(this.value=i))});if(i)return t=pe.valHooks[i.type]||pe.valHooks[i.nodeName.toLowerCase()],t&&"get"in t&&void 0!==(n=t.get(i,"value"))?n:(n=i.value,"string"==typeof n?n.replace(Dt,""):null==n?"":n)}}}),pe.extend({valHooks:{option:{get:function(e){var t=pe.find.attr(e,"value");return null!=t?t:pe.trim(pe.text(e)).replace(jt," ")}},select:{get:function(e){for(var t,n,r=e.options,i=e.selectedIndex,o="select-one"===e.type||i<0,a=o?null:[],s=o?i+1:r.length,u=i<0?s:o?i:0;u<s;u++)if(n=r[u],(n.selected||u===i)&&(fe.optDisabled?!n.disabled:null===n.getAttribute("disabled"))&&(!n.parentNode.disabled||!pe.nodeName(n.parentNode,"optgroup"))){if(t=pe(n).val(),o)return t;a.push(t)}return a},set:function(e,t){for(var n,r,i=e.options,o=pe.makeArray(t),a=i.length;a--;)if(r=i[a],pe.inArray(pe.valHooks.option.get(r),o)>-1)try{r.selected=n=!0}catch(s){r.scrollHeight}else r.selected=!1;return n||(e.selectedIndex=-1),i}}}}),pe.each(["radio","checkbox"],function(){pe.valHooks[this]={set:function(e,t){if(pe.isArray(t))return e.checked=pe.inArray(pe(e).val(),t)>-1}},fe.checkOn||(pe.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})});var Lt,Ht,qt=pe.expr.attrHandle,_t=/^(?:checked|selected)$/i,Ft=fe.getSetAttribute,Mt=fe.input;pe.fn.extend({attr:function(e,t){return Pe(this,pe.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){pe.removeAttr(this,e)})}}),pe.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return"undefined"==typeof e.getAttribute?pe.prop(e,t,n):(1===o&&pe.isXMLDoc(e)||(t=t.toLowerCase(),i=pe.attrHooks[t]||(pe.expr.match.bool.test(t)?Ht:Lt)),void 0!==n?null===n?void pe.removeAttr(e,t):i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:(e.setAttribute(t,n+""),n):i&&"get"in i&&null!==(r=i.get(e,t))?r:(r=pe.find.attr(e,t),null==r?void 0:r))},attrHooks:{type:{set:function(e,t){if(!fe.radioValue&&"radio"===t&&pe.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,r,i=0,o=t&&t.match(De);if(o&&1===e.nodeType)for(;n=o[i++];)r=pe.propFix[n]||n,pe.expr.match.bool.test(n)?Mt&&Ft||!_t.test(n)?e[r]=!1:e[pe.camelCase("default-"+n)]=e[r]=!1:pe.attr(e,n,""),e.removeAttribute(Ft?n:r)}}),Ht={set:function(e,t,n){return t===!1?pe.removeAttr(e,n):Mt&&Ft||!_t.test(n)?e.setAttribute(!Ft&&pe.propFix[n]||n,n):e[pe.camelCase("default-"+n)]=e[n]=!0,n}},pe.each(pe.expr.match.bool.source.match(/\w+/g),function(e,t){var n=qt[t]||pe.find.attr;Mt&&Ft||!_t.test(t)?qt[t]=function(e,t,r){var i,o;return r||(o=qt[t],qt[t]=i,i=null!=n(e,t,r)?t.toLowerCase():null,qt[t]=o),i}:qt[t]=function(e,t,n){if(!n)return e[pe.camelCase("default-"+t)]?t.toLowerCase():null}}),Mt&&Ft||(pe.attrHooks.value={set:function(e,t,n){return pe.nodeName(e,"input")?void(e.defaultValue=t):Lt&&Lt.set(e,t,n)}}),Ft||(Lt={set:function(e,t,n){var r=e.getAttributeNode(n);if(r||e.setAttributeNode(r=e.ownerDocument.createAttribute(n)),r.value=t+="","value"===n||t===e.getAttribute(n))return t}},qt.id=qt.name=qt.coords=function(e,t,n){var r;if(!n)return(r=e.getAttributeNode(t))&&""!==r.value?r.value:null},pe.valHooks.button={get:function(e,t){var n=e.getAttributeNode(t);if(n&&n.specified)return n.value},set:Lt.set},pe.attrHooks.contenteditable={set:function(e,t,n){Lt.set(e,""!==t&&t,n)}},pe.each(["width","height"],function(e,t){pe.attrHooks[t]={set:function(e,n){if(""===n)return e.setAttribute(t,"auto"),n}}})),fe.style||(pe.attrHooks.style={get:function(e){return e.style.cssText||void 0},set:function(e,t){return e.style.cssText=t+""}});var Ot=/^(?:input|select|textarea|button|object)$/i,Rt=/^(?:a|area)$/i;pe.fn.extend({prop:function(e,t){return Pe(this,pe.prop,e,t,arguments.length>1)},removeProp:function(e){return e=pe.propFix[e]||e,this.each(function(){try{this[e]=void 0,delete this[e]}catch(t){}})}}),pe.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&pe.isXMLDoc(e)||(t=pe.propFix[t]||t,i=pe.propHooks[t]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=pe.find.attr(e,"tabindex");return t?parseInt(t,10):Ot.test(e.nodeName)||Rt.test(e.nodeName)&&e.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),fe.hrefNormalized||pe.each(["href","src"],function(e,t){pe.propHooks[t]={get:function(e){return e.getAttribute(t,4)}}}),fe.optSelected||(pe.propHooks.selected={get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),pe.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){pe.propFix[this.toLowerCase()]=this}),fe.enctype||(pe.propFix.enctype="encoding");var Pt=/[\t\r\n\f]/g;pe.fn.extend({addClass:function(e){var t,n,r,i,o,a,s,u=0;if(pe.isFunction(e))return this.each(function(t){pe(this).addClass(e.call(this,t,z(this)))});if("string"==typeof e&&e)for(t=e.match(De)||[];n=this[u++];)if(i=z(n),r=1===n.nodeType&&(" "+i+" ").replace(Pt," ")){for(a=0;o=t[a++];)r.indexOf(" "+o+" ")<0&&(r+=o+" ");s=pe.trim(r),i!==s&&pe.attr(n,"class",s)}return this},removeClass:function(e){var t,n,r,i,o,a,s,u=0;if(pe.isFunction(e))return this.each(function(t){pe(this).removeClass(e.call(this,t,z(this)))});if(!arguments.length)return this.attr("class","");if("string"==typeof e&&e)for(t=e.match(De)||[];n=this[u++];)if(i=z(n),r=1===n.nodeType&&(" "+i+" ").replace(Pt," ")){for(a=0;o=t[a++];)for(;r.indexOf(" "+o+" ")>-1;)r=r.replace(" "+o+" "," ");s=pe.trim(r),i!==s&&pe.attr(n,"class",s)}return this},toggleClass:function(e,t){var n=typeof e;return"boolean"==typeof t&&"string"===n?t?this.addClass(e):this.removeClass(e):pe.isFunction(e)?this.each(function(n){pe(this).toggleClass(e.call(this,n,z(this),t),t)}):this.each(function(){var t,r,i,o;if("string"===n)for(r=0,i=pe(this),o=e.match(De)||[];t=o[r++];)i.hasClass(t)?i.removeClass(t):i.addClass(t);else void 0!==e&&"boolean"!==n||(t=z(this),t&&pe._data(this,"__className__",t),pe.attr(this,"class",t||e===!1?"":pe._data(this,"__className__")||""))})},hasClass:function(e){var t,n,r=0;for(t=" "+e+" ";n=this[r++];)if(1===n.nodeType&&(" "+z(n)+" ").replace(Pt," ").indexOf(t)>-1)return!0;return!1}}),pe.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(e,t){pe.fn[t]=function(e,n){return arguments.length>0?this.on(t,null,e,n):this.trigger(t)}}),pe.fn.extend({hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}});var Bt=e.location,Wt=pe.now(),It=/\?/,$t=/(,)|(\[|{)|(}|])|"(?:[^"\\\r\n]|\\["\\\/bfnrt]|\\u[\da-fA-F]{4})*"\s*:?|true|false|null|-?(?!0\d)\d+(?:\.\d+|)(?:[eE][+-]?\d+|)/g;pe.parseJSON=function(t){if(e.JSON&&e.JSON.parse)return e.JSON.parse(t+"");var n,r=null,i=pe.trim(t+"");return i&&!pe.trim(i.replace($t,function(e,t,i,o){return n&&t&&(r=0),0===r?e:(n=i||t,r+=!o-!i,"")}))?Function("return "+i)():pe.error("Invalid JSON: "+t)},pe.parseXML=function(t){var n,r;if(!t||"string"!=typeof t)return null;try{e.DOMParser?(r=new e.DOMParser,n=r.parseFromString(t,"text/xml")):(n=new e.ActiveXObject("Microsoft.XMLDOM"),n.async="false",n.loadXML(t))}catch(i){n=void 0}return n&&n.documentElement&&!n.getElementsByTagName("parsererror").length||pe.error("Invalid XML: "+t),n};var zt=/#.*$/,Xt=/([?&])_=[^&]*/,Ut=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Vt=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Yt=/^(?:GET|HEAD)$/,Jt=/^\/\//,Gt=/^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,Kt={},Qt={},Zt="*/".concat("*"),en=Bt.href,tn=Gt.exec(en.toLowerCase())||[];pe.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:en,type:"GET",isLocal:Vt.test(tn[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Zt,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":pe.parseJSON,"text xml":pe.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?V(V(e,pe.ajaxSettings),t):V(pe.ajaxSettings,e)},ajaxPrefilter:X(Kt),ajaxTransport:X(Qt),ajax:function(t,n){function r(t,n,r,i){var o,f,v,x,w,C=n;2!==b&&(b=2,u&&e.clearTimeout(u),c=void 0,s=i||"",T.readyState=t>0?4:0,o=t>=200&&t<300||304===t,r&&(x=Y(d,T,r)),x=J(d,x,T,o),o?(d.ifModified&&(w=T.getResponseHeader("Last-Modified"),w&&(pe.lastModified[a]=w),w=T.getResponseHeader("etag"),w&&(pe.etag[a]=w)),204===t||"HEAD"===d.type?C="nocontent":304===t?C="notmodified":(C=x.state,f=x.data,v=x.error,o=!v)):(v=C,!t&&C||(C="error",t<0&&(t=0))),T.status=t,T.statusText=(n||C)+"",o?g.resolveWith(p,[f,C,T]):g.rejectWith(p,[T,C,v]),T.statusCode(y),y=void 0,l&&h.trigger(o?"ajaxSuccess":"ajaxError",[T,d,o?f:v]),m.fireWith(p,[T,C]),l&&(h.trigger("ajaxComplete",[T,d]),--pe.active||pe.event.trigger("ajaxStop")))}"object"==typeof t&&(n=t,t=void 0),n=n||{};var i,o,a,s,u,l,c,f,d=pe.ajaxSetup({},n),p=d.context||d,h=d.context&&(p.nodeType||p.jquery)?pe(p):pe.event,g=pe.Deferred(),m=pe.Callbacks("once memory"),y=d.statusCode||{},v={},x={},b=0,w="canceled",T={readyState:0,getResponseHeader:function(e){var t;if(2===b){if(!f)for(f={};t=Ut.exec(s);)f[t[1].toLowerCase()]=t[2];t=f[e.toLowerCase()]}return null==t?null:t},getAllResponseHeaders:function(){return 2===b?s:null},setRequestHeader:function(e,t){var n=e.toLowerCase();return b||(e=x[n]=x[n]||e,v[e]=t),this},overrideMimeType:function(e){return b||(d.mimeType=e),this},statusCode:function(e){var t;if(e)if(b<2)for(t in e)y[t]=[y[t],e[t]];else T.always(e[T.status]);return this},abort:function(e){var t=e||w;return c&&c.abort(t),r(0,t),this}};if(g.promise(T).complete=m.add,T.success=T.done,T.error=T.fail,d.url=((t||d.url||en)+"").replace(zt,"").replace(Jt,tn[1]+"//"),d.type=n.method||n.type||d.method||d.type,d.dataTypes=pe.trim(d.dataType||"*").toLowerCase().match(De)||[""],null==d.crossDomain&&(i=Gt.exec(d.url.toLowerCase()),d.crossDomain=!(!i||i[1]===tn[1]&&i[2]===tn[2]&&(i[3]||("http:"===i[1]?"80":"443"))===(tn[3]||("http:"===tn[1]?"80":"443")))),d.data&&d.processData&&"string"!=typeof d.data&&(d.data=pe.param(d.data,d.traditional)),U(Kt,d,n,T),2===b)return T;l=pe.event&&d.global,l&&0===pe.active++&&pe.event.trigger("ajaxStart"),d.type=d.type.toUpperCase(),d.hasContent=!Yt.test(d.type),a=d.url,d.hasContent||(d.data&&(a=d.url+=(It.test(a)?"&":"?")+d.data,delete d.data),d.cache===!1&&(d.url=Xt.test(a)?a.replace(Xt,"$1_="+Wt++):a+(It.test(a)?"&":"?")+"_="+Wt++)),d.ifModified&&(pe.lastModified[a]&&T.setRequestHeader("If-Modified-Since",pe.lastModified[a]),pe.etag[a]&&T.setRequestHeader("If-None-Match",pe.etag[a])),(d.data&&d.hasContent&&d.contentType!==!1||n.contentType)&&T.setRequestHeader("Content-Type",d.contentType),T.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+("*"!==d.dataTypes[0]?", "+Zt+"; q=0.01":""):d.accepts["*"]);for(o in d.headers)T.setRequestHeader(o,d.headers[o]);if(d.beforeSend&&(d.beforeSend.call(p,T,d)===!1||2===b))return T.abort();w="abort";for(o in{success:1,error:1,complete:1})T[o](d[o]);if(c=U(Qt,d,n,T)){if(T.readyState=1,l&&h.trigger("ajaxSend",[T,d]),2===b)return T;d.async&&d.timeout>0&&(u=e.setTimeout(function(){T.abort("timeout")},d.timeout));try{b=1,c.send(v,r)}catch(C){if(!(b<2))throw C;r(-1,C)}}else r(-1,"No Transport");return T},getJSON:function(e,t,n){return pe.get(e,t,n,"json")},getScript:function(e,t){return pe.get(e,void 0,t,"script")}}),pe.each(["get","post"],function(e,t){pe[t]=function(e,n,r,i){return pe.isFunction(n)&&(i=i||r,r=n,n=void 0),pe.ajax(pe.extend({url:e,type:t,dataType:i,data:n,success:r},pe.isPlainObject(e)&&e))}}),pe._evalUrl=function(e){return pe.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,"throws":!0})},pe.fn.extend({wrapAll:function(e){if(pe.isFunction(e))return this.each(function(t){pe(this).wrapAll(e.call(this,t))});if(this[0]){var t=pe(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){for(var e=this;e.firstChild&&1===e.firstChild.nodeType;)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return pe.isFunction(e)?this.each(function(t){pe(this).wrapInner(e.call(this,t))}):this.each(function(){var t=pe(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=pe.isFunction(e);return this.each(function(n){pe(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){pe.nodeName(this,"body")||pe(this).replaceWith(this.childNodes)}).end()}}),pe.expr.filters.hidden=function(e){return fe.reliableHiddenOffsets()?e.offsetWidth<=0&&e.offsetHeight<=0&&!e.getClientRects().length:K(e)},pe.expr.filters.visible=function(e){return!pe.expr.filters.hidden(e)};var nn=/%20/g,rn=/\[\]$/,on=/\r?\n/g,an=/^(?:submit|button|image|reset|file)$/i,sn=/^(?:input|select|textarea|keygen)/i;pe.param=function(e,t){var n,r=[],i=function(e,t){t=pe.isFunction(t)?t():null==t?"":t,r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};if(void 0===t&&(t=pe.ajaxSettings&&pe.ajaxSettings.traditional),pe.isArray(e)||e.jquery&&!pe.isPlainObject(e))pe.each(e,function(){i(this.name,this.value)});else for(n in e)Q(n,e[n],t,i);return r.join("&").replace(nn,"+")},pe.fn.extend({serialize:function(){return pe.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=pe.prop(this,"elements");return e?pe.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!pe(this).is(":disabled")&&sn.test(this.nodeName)&&!an.test(e)&&(this.checked||!Be.test(e))}).map(function(e,t){var n=pe(this).val();return null==n?null:pe.isArray(n)?pe.map(n,function(e){return{name:t.name,value:e.replace(on,"\r\n")}}):{name:t.name,value:n.replace(on,"\r\n")}}).get()}}),pe.ajaxSettings.xhr=void 0!==e.ActiveXObject?function(){return this.isLocal?ee():re.documentMode>8?Z():/^(get|post|head|put|delete|options)$/i.test(this.type)&&Z()||ee()}:Z;var un=0,ln={},cn=pe.ajaxSettings.xhr();e.attachEvent&&e.attachEvent("onunload",function(){for(var e in ln)ln[e](void 0,!0)}),fe.cors=!!cn&&"withCredentials"in cn,cn=fe.ajax=!!cn,cn&&pe.ajaxTransport(function(t){if(!t.crossDomain||fe.cors){var n;return{send:function(r,i){var o,a=t.xhr(),s=++un;if(a.open(t.type,t.url,t.async,t.username,t.password),t.xhrFields)for(o in t.xhrFields)a[o]=t.xhrFields[o];t.mimeType&&a.overrideMimeType&&a.overrideMimeType(t.mimeType),t.crossDomain||r["X-Requested-With"]||(r["X-Requested-With"]="XMLHttpRequest");for(o in r)void 0!==r[o]&&a.setRequestHeader(o,r[o]+"");a.send(t.hasContent&&t.data||null),n=function(e,r){var o,u,l;if(n&&(r||4===a.readyState))if(delete ln[s],n=void 0,a.onreadystatechange=pe.noop,r)4!==a.readyState&&a.abort();else{l={},o=a.status,"string"==typeof a.responseText&&(l.text=a.responseText);try{u=a.statusText}catch(c){u=""}o||!t.isLocal||t.crossDomain?1223===o&&(o=204):o=l.text?200:404}l&&i(o,u,l,a.getAllResponseHeaders())},t.async?4===a.readyState?e.setTimeout(n):a.onreadystatechange=ln[s]=n:n()},abort:function(){n&&n(void 0,!0)}}}}),pe.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return pe.globalEval(e),e}}}),pe.ajaxPrefilter("script",function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET",e.global=!1)}),pe.ajaxTransport("script",function(e){if(e.crossDomain){var t,n=re.head||pe("head")[0]||re.documentElement;return{send:function(r,i){t=re.createElement("script"),t.async=!0,e.scriptCharset&&(t.charset=e.scriptCharset),t.src=e.url,t.onload=t.onreadystatechange=function(e,n){(n||!t.readyState||/loaded|complete/.test(t.readyState))&&(t.onload=t.onreadystatechange=null,t.parentNode&&t.parentNode.removeChild(t),t=null,n||i(200,"success"))},n.insertBefore(t,n.firstChild)},abort:function(){t&&t.onload(void 0,!0)}}}});var fn=[],dn=/(=)\?(?=&|$)|\?\?/;pe.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=fn.pop()||pe.expando+"_"+Wt++;return this[e]=!0,e}}),pe.ajaxPrefilter("json jsonp",function(t,n,r){var i,o,a,s=t.jsonp!==!1&&(dn.test(t.url)?"url":"string"==typeof t.data&&0===(t.contentType||"").indexOf("application/x-www-form-urlencoded")&&dn.test(t.data)&&"data");if(s||"jsonp"===t.dataTypes[0])return i=t.jsonpCallback=pe.isFunction(t.jsonpCallback)?t.jsonpCallback():t.jsonpCallback,s?t[s]=t[s].replace(dn,"$1"+i):t.jsonp!==!1&&(t.url+=(It.test(t.url)?"&":"?")+t.jsonp+"="+i),t.converters["script json"]=function(){return a||pe.error(i+" was not called"),a[0]},t.dataTypes[0]="json",o=e[i],e[i]=function(){a=arguments},r.always(function(){void 0===o?pe(e).removeProp(i):e[i]=o,t[i]&&(t.jsonpCallback=n.jsonpCallback,fn.push(i)),a&&pe.isFunction(o)&&o(a[0]),a=o=void 0}),"script"}),pe.parseHTML=function(e,t,n){if(!e||"string"!=typeof e)return null;"boolean"==typeof t&&(n=t,t=!1),t=t||re;var r=Te.exec(e),i=!n&&[];return r?[t.createElement(r[1])]:(r=y([e],t,i),i&&i.length&&pe(i).remove(),pe.merge([],r.childNodes))};var pn=pe.fn.load;return pe.fn.load=function(e,t,n){if("string"!=typeof e&&pn)return pn.apply(this,arguments);var r,i,o,a=this,s=e.indexOf(" ");return s>-1&&(r=pe.trim(e.slice(s,e.length)),e=e.slice(0,s)),pe.isFunction(t)?(n=t,t=void 0):t&&"object"==typeof t&&(i="POST"),a.length>0&&pe.ajax({url:e,type:i||"GET",dataType:"html",data:t}).done(function(e){o=arguments,a.html(r?pe("<div>").append(pe.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},pe.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){pe.fn[t]=function(e){return this.on(t,e)}}),pe.expr.filters.animated=function(e){return pe.grep(pe.timers,function(t){return e===t.elem}).length},pe.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l,c=pe.css(e,"position"),f=pe(e),d={};"static"===c&&(e.style.position="relative"),s=f.offset(),o=pe.css(e,"top"),u=pe.css(e,"left"),l=("absolute"===c||"fixed"===c)&&pe.inArray("auto",[o,u])>-1,l?(r=f.position(),a=r.top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),pe.isFunction(t)&&(t=t.call(e,n,pe.extend({},s))),null!=t.top&&(d.top=t.top-s.top+a),null!=t.left&&(d.left=t.left-s.left+i),"using"in t?t.using.call(e,d):f.css(d)}},pe.fn.extend({offset:function(e){if(arguments.length)return void 0===e?this:this.each(function(t){pe.offset.setOffset(this,e,t)});var t,n,r={top:0,left:0},i=this[0],o=i&&i.ownerDocument;if(o)return t=o.documentElement,pe.contains(t,i)?("undefined"!=typeof i.getBoundingClientRect&&(r=i.getBoundingClientRect()),n=te(o),{top:r.top+(n.pageYOffset||t.scrollTop)-(t.clientTop||0),left:r.left+(n.pageXOffset||t.scrollLeft)-(t.clientLeft||0)}):r},position:function(){if(this[0]){var e,t,n={top:0,left:0},r=this[0];return"fixed"===pe.css(r,"position")?t=r.getBoundingClientRect():(e=this.offsetParent(),t=this.offset(),pe.nodeName(e[0],"html")||(n=e.offset()),n.top+=pe.css(e[0],"borderTopWidth",!0),n.left+=pe.css(e[0],"borderLeftWidth",!0)),{top:t.top-n.top-pe.css(r,"marginTop",!0),left:t.left-n.left-pe.css(r,"marginLeft",!0)}}},offsetParent:function(){
+return this.map(function(){for(var e=this.offsetParent;e&&!pe.nodeName(e,"html")&&"static"===pe.css(e,"position");)e=e.offsetParent;return e||pt})}}),pe.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,t){var n=/Y/.test(t);pe.fn[e]=function(r){return Pe(this,function(e,r,i){var o=te(e);return void 0===i?o?t in o?o[t]:o.document.documentElement[r]:e[r]:void(o?o.scrollTo(n?pe(o).scrollLeft():i,n?i:pe(o).scrollTop()):e[r]=i)},e,r,arguments.length,null)}}),pe.each(["top","left"],function(e,t){pe.cssHooks[t]=L(fe.pixelPosition,function(e,n){if(n)return n=gt(e,t),ft.test(n)?pe(e).position()[t]+"px":n})}),pe.each({Height:"height",Width:"width"},function(e,t){pe.each({padding:"inner"+e,content:t,"":"outer"+e},function(n,r){pe.fn[r]=function(r,i){var o=arguments.length&&(n||"boolean"!=typeof r),a=n||(r===!0||i===!0?"margin":"border");return Pe(this,function(t,n,r){var i;return pe.isWindow(t)?t.document.documentElement["client"+e]:9===t.nodeType?(i=t.documentElement,Math.max(t.body["scroll"+e],i["scroll"+e],t.body["offset"+e],i["offset"+e],i["client"+e])):void 0===r?pe.css(t,n,a):pe.style(t,n,r,a)},t,o?r:void 0,o,null)}})}),pe.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)}}),pe.fn.size=function(){return this.length},pe.fn.andSelf=pe.fn.addBack,layui.define(function(e){layui.$=pe,e("jquery",pe)}),pe});!function(e,t){"use strict";var i,n,a=e.layui&&layui.define,o={getPath:function(){var t=document.currentScript?document.currentScript.src:function(){for(var e,t=document.scripts,i=t.length-1,n=i;n>0;n--)if("interactive"===t[n].readyState){e=t[n].src;break}return e||t[i].src}(),i=e.LAYUI_GLOBAL||{};return i.layer_dir||t.substring(0,t.lastIndexOf("/")+1)}(),config:{},end:{},minIndex:0,minLeft:[],btn:["&#x786E;&#x5B9A;","&#x53D6;&#x6D88;"],type:["dialog","page","iframe","loading","tips"],getStyle:function(t,i){var n=t.currentStyle?t.currentStyle:e.getComputedStyle(t,null);return n[n.getPropertyValue?"getPropertyValue":"getAttribute"](i)},link:function(t,i,n){if(r.path){var a=document.getElementsByTagName("head")[0],s=document.createElement("link");"string"==typeof i&&(n=i);var l=(n||t).replace(/\.|\//g,""),f="layuicss-"+l,c="creating",u=0;s.rel="stylesheet",s.href=r.path+t,s.id=f,document.getElementById(f)||a.appendChild(s),"function"==typeof i&&!function d(t){var n=100,a=document.getElementById(f);return++u>1e4/n?e.console&&console.error(l+".css: Invalid"):void(1989===parseInt(o.getStyle(a,"width"))?(t===c&&a.removeAttribute("lay-status"),a.getAttribute("lay-status")===c?setTimeout(d,n):i()):(a.setAttribute("lay-status",c),setTimeout(function(){d(c)},n)))}()}}},r={v:"3.5.1",ie:function(){var t=navigator.userAgent.toLowerCase();return!!(e.ActiveXObject||"ActiveXObject"in e)&&((t.match(/msie\s(\d+)/)||[])[1]||"11")}(),index:e.layer&&e.layer.v?1e5:0,path:o.getPath,config:function(e,t){return e=e||{},r.cache=o.config=i.extend({},o.config,e),r.path=o.config.path||r.path,"string"==typeof e.extend&&(e.extend=[e.extend]),o.config.path&&r.ready(),e.extend?(a?layui.addcss("modules/layer/"+e.extend):o.link("theme/"+e.extend),this):this},ready:function(e){var t="layer",i="",n=(a?"modules/layer/":"theme/")+"default/layer.css?v="+r.v+i;return a?layui.addcss(n,e,t):o.link(n,e,t),this},alert:function(e,t,n){var a="function"==typeof t;return a&&(n=t),r.open(i.extend({content:e,yes:n},a?{}:t))},confirm:function(e,t,n,a){var s="function"==typeof t;return s&&(a=n,n=t),r.open(i.extend({content:e,btn:o.btn,yes:n,btn2:a},s?{}:t))},msg:function(e,n,a){var s="function"==typeof n,f=o.config.skin,c=(f?f+" "+f+"-msg":"")||"layui-layer-msg",u=l.anim.length-1;return s&&(a=n),r.open(i.extend({content:e,time:3e3,shade:!1,skin:c,title:!1,closeBtn:!1,btn:!1,resize:!1,end:a},s&&!o.config.skin?{skin:c+" layui-layer-hui",anim:u}:function(){return n=n||{},(n.icon===-1||n.icon===t&&!o.config.skin)&&(n.skin=c+" "+(n.skin||"layui-layer-hui")),n}()))},load:function(e,t){return r.open(i.extend({type:3,icon:e||0,resize:!1,shade:.01},t))},tips:function(e,t,n){return r.open(i.extend({type:4,content:[e,t],closeBtn:!1,time:3e3,shade:!1,resize:!1,fixed:!1,maxWidth:260},n))}},s=function(e){var t=this,a=function(){t.creat()};t.index=++r.index,t.config.maxWidth=i(n).width()-30,t.config=i.extend({},t.config,o.config,e),document.body?a():setTimeout(function(){a()},30)};s.pt=s.prototype;var l=["layui-layer",".layui-layer-title",".layui-layer-main",".layui-layer-dialog","layui-layer-iframe","layui-layer-content","layui-layer-btn","layui-layer-close"];l.anim=["layer-anim-00","layer-anim-01","layer-anim-02","layer-anim-03","layer-anim-04","layer-anim-05","layer-anim-06"],l.SHADE="layui-layer-shade",l.MOVE="layui-layer-move",s.pt.config={type:0,shade:.3,fixed:!0,move:l[1],title:"&#x4FE1;&#x606F;",offset:"auto",area:"auto",closeBtn:1,time:0,zIndex:19891014,maxWidth:360,anim:0,isOutAnim:!0,minStack:!0,icon:-1,moveType:1,resize:!0,scrollbar:!0,tips:2},s.pt.vessel=function(e,t){var n=this,a=n.index,r=n.config,s=r.zIndex+a,f="object"==typeof r.title,c=r.maxmin&&(1===r.type||2===r.type),u=r.title?'<div class="layui-layer-title" style="'+(f?r.title[1]:"")+'">'+(f?r.title[0]:r.title)+"</div>":"";return r.zIndex=s,t([r.shade?'<div class="'+l.SHADE+'" id="'+l.SHADE+a+'" times="'+a+'" style="'+("z-index:"+(s-1)+"; ")+'"></div>':"",'<div class="'+l[0]+(" layui-layer-"+o.type[r.type])+(0!=r.type&&2!=r.type||r.shade?"":" layui-layer-border")+" "+(r.skin||"")+'" id="'+l[0]+a+'" type="'+o.type[r.type]+'" times="'+a+'" showtime="'+r.time+'" conType="'+(e?"object":"string")+'" style="z-index: '+s+"; width:"+r.area[0]+";height:"+r.area[1]+";position:"+(r.fixed?"fixed;":"absolute;")+'">'+(e&&2!=r.type?"":u)+'<div id="'+(r.id||"")+'" class="layui-layer-content'+(0==r.type&&r.icon!==-1?" layui-layer-padding":"")+(3==r.type?" layui-layer-loading"+r.icon:"")+'">'+(0==r.type&&r.icon!==-1?'<i class="layui-layer-ico layui-layer-ico'+r.icon+'"></i>':"")+(1==r.type&&e?"":r.content||"")+'</div><span class="layui-layer-setwin">'+function(){var e=c?'<a class="layui-layer-min" href="javascript:;"><cite></cite></a><a class="layui-layer-ico layui-layer-max" href="javascript:;"></a>':"";return r.closeBtn&&(e+='<a class="layui-layer-ico '+l[7]+" "+l[7]+(r.title?r.closeBtn:4==r.type?"1":"2")+'" href="javascript:;"></a>'),e}()+"</span>"+(r.btn?function(){var e="";"string"==typeof r.btn&&(r.btn=[r.btn]);for(var t=0,i=r.btn.length;t<i;t++)e+='<a class="'+l[6]+t+'">'+r.btn[t]+"</a>";return'<div class="'+l[6]+" layui-layer-btn-"+(r.btnAlign||"")+'">'+e+"</div>"}():"")+(r.resize?'<span class="layui-layer-resize"></span>':"")+"</div>"],u,i('<div class="'+l.MOVE+'" id="'+l.MOVE+'"></div>')),n},s.pt.creat=function(){var e=this,t=e.config,a=e.index,s=t.content,f="object"==typeof s,c=i("body");if(!t.id||!i("#"+t.id)[0]){switch("string"==typeof t.area&&(t.area="auto"===t.area?["",""]:[t.area,""]),t.shift&&(t.anim=t.shift),6==r.ie&&(t.fixed=!1),t.type){case 0:t.btn="btn"in t?t.btn:o.btn[0],r.closeAll("dialog");break;case 2:var s=t.content=f?t.content:[t.content||"","auto"];t.content='<iframe scrolling="'+(t.content[1]||"auto")+'" allowtransparency="true" id="'+l[4]+a+'" name="'+l[4]+a+'" onload="this.className=\'\';" class="layui-layer-load" frameborder="0" src="'+t.content[0]+'"></iframe>';break;case 3:delete t.title,delete t.closeBtn,t.icon===-1&&0===t.icon,r.closeAll("loading");break;case 4:f||(t.content=[t.content,"body"]),t.follow=t.content[1],t.content=t.content[0]+'<i class="layui-layer-TipsG"></i>',delete t.title,t.tips="object"==typeof t.tips?t.tips:[t.tips,!0],t.tipsMore||r.closeAll("tips")}if(e.vessel(f,function(n,r,u){c.append(n[0]),f?function(){2==t.type||4==t.type?function(){i("body").append(n[1])}():function(){s.parents("."+l[0])[0]||(s.data("display",s.css("display")).show().addClass("layui-layer-wrap").wrap(n[1]),i("#"+l[0]+a).find("."+l[5]).before(r))}()}():c.append(n[1]),i("#"+l.MOVE)[0]||c.append(o.moveElem=u),e.layero=i("#"+l[0]+a),e.shadeo=i("#"+l.SHADE+a),t.scrollbar||l.html.css("overflow","hidden").attr("layer-full",a)}).auto(a),e.shadeo.css({"background-color":t.shade[1]||"#000",opacity:t.shade[0]||t.shade}),2==t.type&&6==r.ie&&e.layero.find("iframe").attr("src",s[0]),4==t.type?e.tips():function(){e.offset(),parseInt(o.getStyle(document.getElementById(l.MOVE),"z-index"))||function(){e.layero.css("visibility","hidden"),r.ready(function(){e.offset(),e.layero.css("visibility","visible")})}()}(),t.fixed&&n.on("resize",function(){e.offset(),(/^\d+%$/.test(t.area[0])||/^\d+%$/.test(t.area[1]))&&e.auto(a),4==t.type&&e.tips()}),t.time<=0||setTimeout(function(){r.close(e.index)},t.time),e.move().callback(),l.anim[t.anim]){var u="layer-anim "+l.anim[t.anim];e.layero.addClass(u).one("webkitAnimationEnd mozAnimationEnd MSAnimationEnd oanimationend animationend",function(){i(this).removeClass(u)})}t.isOutAnim&&e.layero.data("isOutAnim",!0)}},s.pt.auto=function(e){var t=this,a=t.config,o=i("#"+l[0]+e);""===a.area[0]&&a.maxWidth>0&&(r.ie&&r.ie<8&&a.btn&&o.width(o.innerWidth()),o.outerWidth()>a.maxWidth&&o.width(a.maxWidth));var s=[o.innerWidth(),o.innerHeight()],f=o.find(l[1]).outerHeight()||0,c=o.find("."+l[6]).outerHeight()||0,u=function(e){e=o.find(e),e.height(s[1]-f-c-2*(0|parseFloat(e.css("padding-top"))))};switch(a.type){case 2:u("iframe");break;default:""===a.area[1]?a.maxHeight>0&&o.outerHeight()>a.maxHeight?(s[1]=a.maxHeight,u("."+l[5])):a.fixed&&s[1]>=n.height()&&(s[1]=n.height(),u("."+l[5])):u("."+l[5])}return t},s.pt.offset=function(){var e=this,t=e.config,i=e.layero,a=[i.outerWidth(),i.outerHeight()],o="object"==typeof t.offset;e.offsetTop=(n.height()-a[1])/2,e.offsetLeft=(n.width()-a[0])/2,o?(e.offsetTop=t.offset[0],e.offsetLeft=t.offset[1]||e.offsetLeft):"auto"!==t.offset&&("t"===t.offset?e.offsetTop=0:"r"===t.offset?e.offsetLeft=n.width()-a[0]:"b"===t.offset?e.offsetTop=n.height()-a[1]:"l"===t.offset?e.offsetLeft=0:"lt"===t.offset?(e.offsetTop=0,e.offsetLeft=0):"lb"===t.offset?(e.offsetTop=n.height()-a[1],e.offsetLeft=0):"rt"===t.offset?(e.offsetTop=0,e.offsetLeft=n.width()-a[0]):"rb"===t.offset?(e.offsetTop=n.height()-a[1],e.offsetLeft=n.width()-a[0]):e.offsetTop=t.offset),t.fixed||(e.offsetTop=/%$/.test(e.offsetTop)?n.height()*parseFloat(e.offsetTop)/100:parseFloat(e.offsetTop),e.offsetLeft=/%$/.test(e.offsetLeft)?n.width()*parseFloat(e.offsetLeft)/100:parseFloat(e.offsetLeft),e.offsetTop+=n.scrollTop(),e.offsetLeft+=n.scrollLeft()),i.attr("minLeft")&&(e.offsetTop=n.height()-(i.find(l[1]).outerHeight()||0),e.offsetLeft=i.css("left")),i.css({top:e.offsetTop,left:e.offsetLeft})},s.pt.tips=function(){var e=this,t=e.config,a=e.layero,o=[a.outerWidth(),a.outerHeight()],r=i(t.follow);r[0]||(r=i("body"));var s={width:r.outerWidth(),height:r.outerHeight(),top:r.offset().top,left:r.offset().left},f=a.find(".layui-layer-TipsG"),c=t.tips[0];t.tips[1]||f.remove(),s.autoLeft=function(){s.left+o[0]-n.width()>0?(s.tipLeft=s.left+s.width-o[0],f.css({right:12,left:"auto"})):s.tipLeft=s.left},s.where=[function(){s.autoLeft(),s.tipTop=s.top-o[1]-10,f.removeClass("layui-layer-TipsB").addClass("layui-layer-TipsT").css("border-right-color",t.tips[1])},function(){s.tipLeft=s.left+s.width+10,s.tipTop=s.top,f.removeClass("layui-layer-TipsL").addClass("layui-layer-TipsR").css("border-bottom-color",t.tips[1])},function(){s.autoLeft(),s.tipTop=s.top+s.height+10,f.removeClass("layui-layer-TipsT").addClass("layui-layer-TipsB").css("border-right-color",t.tips[1])},function(){s.tipLeft=s.left-o[0]-10,s.tipTop=s.top,f.removeClass("layui-layer-TipsR").addClass("layui-layer-TipsL").css("border-bottom-color",t.tips[1])}],s.where[c-1](),1===c?s.top-(n.scrollTop()+o[1]+16)<0&&s.where[2]():2===c?n.width()-(s.left+s.width+o[0]+16)>0||s.where[3]():3===c?s.top-n.scrollTop()+s.height+o[1]+16-n.height()>0&&s.where[0]():4===c&&o[0]+16-s.left>0&&s.where[1](),a.find("."+l[5]).css({"background-color":t.tips[1],"padding-right":t.closeBtn?"30px":""}),a.css({left:s.tipLeft-(t.fixed?n.scrollLeft():0),top:s.tipTop-(t.fixed?n.scrollTop():0)})},s.pt.move=function(){var e=this,t=e.config,a=i(document),s=e.layero,l=s.find(t.move),f=s.find(".layui-layer-resize"),c={};return t.move&&l.css("cursor","move"),l.on("mousedown",function(e){e.preventDefault(),t.move&&(c.moveStart=!0,c.offset=[e.clientX-parseFloat(s.css("left")),e.clientY-parseFloat(s.css("top"))],o.moveElem.css("cursor","move").show())}),f.on("mousedown",function(e){e.preventDefault(),c.resizeStart=!0,c.offset=[e.clientX,e.clientY],c.area=[s.outerWidth(),s.outerHeight()],o.moveElem.css("cursor","se-resize").show()}),a.on("mousemove",function(i){if(c.moveStart){var a=i.clientX-c.offset[0],o=i.clientY-c.offset[1],l="fixed"===s.css("position");if(i.preventDefault(),c.stX=l?0:n.scrollLeft(),c.stY=l?0:n.scrollTop(),!t.moveOut){var f=n.width()-s.outerWidth()+c.stX,u=n.height()-s.outerHeight()+c.stY;a<c.stX&&(a=c.stX),a>f&&(a=f),o<c.stY&&(o=c.stY),o>u&&(o=u)}s.css({left:a,top:o})}if(t.resize&&c.resizeStart){var a=i.clientX-c.offset[0],o=i.clientY-c.offset[1];i.preventDefault(),r.style(e.index,{width:c.area[0]+a,height:c.area[1]+o}),c.isResize=!0,t.resizing&&t.resizing(s)}}).on("mouseup",function(e){c.moveStart&&(delete c.moveStart,o.moveElem.hide(),t.moveEnd&&t.moveEnd(s)),c.resizeStart&&(delete c.resizeStart,o.moveElem.hide())}),e},s.pt.callback=function(){function e(){var e=a.cancel&&a.cancel(t.index,n);e===!1||r.close(t.index)}var t=this,n=t.layero,a=t.config;t.openLayer(),a.success&&(2==a.type?n.find("iframe").on("load",function(){a.success(n,t.index)}):a.success(n,t.index)),6==r.ie&&t.IE6(n),n.find("."+l[6]).children("a").on("click",function(){var e=i(this).index();if(0===e)a.yes?a.yes(t.index,n):a.btn1?a.btn1(t.index,n):r.close(t.index);else{var o=a["btn"+(e+1)]&&a["btn"+(e+1)](t.index,n);o===!1||r.close(t.index)}}),n.find("."+l[7]).on("click",e),a.shadeClose&&t.shadeo.on("click",function(){r.close(t.index)}),n.find(".layui-layer-min").on("click",function(){var e=a.min&&a.min(n,t.index);e===!1||r.min(t.index,a)}),n.find(".layui-layer-max").on("click",function(){i(this).hasClass("layui-layer-maxmin")?(r.restore(t.index),a.restore&&a.restore(n,t.index)):(r.full(t.index,a),setTimeout(function(){a.full&&a.full(n,t.index)},100))}),a.end&&(o.end[t.index]=a.end)},o.reselect=function(){i.each(i("select"),function(e,t){var n=i(this);n.parents("."+l[0])[0]||1==n.attr("layer")&&i("."+l[0]).length<1&&n.removeAttr("layer").show(),n=null})},s.pt.IE6=function(e){i("select").each(function(e,t){var n=i(this);n.parents("."+l[0])[0]||"none"===n.css("display")||n.attr({layer:"1"}).hide(),n=null})},s.pt.openLayer=function(){var e=this;r.zIndex=e.config.zIndex,r.setTop=function(e){var t=function(){r.zIndex++,e.css("z-index",r.zIndex+1)};return r.zIndex=parseInt(e[0].style.zIndex),e.on("mousedown",t),r.zIndex}},o.record=function(e){var t=[e.width(),e.height(),e.position().top,e.position().left+parseFloat(e.css("margin-left"))];e.find(".layui-layer-max").addClass("layui-layer-maxmin"),e.attr({area:t})},o.rescollbar=function(e){l.html.attr("layer-full")==e&&(l.html[0].style.removeProperty?l.html[0].style.removeProperty("overflow"):l.html[0].style.removeAttribute("overflow"),l.html.removeAttr("layer-full"))},e.layer=r,r.getChildFrame=function(e,t){return t=t||i("."+l[4]).attr("times"),i("#"+l[0]+t).find("iframe").contents().find(e)},r.getFrameIndex=function(e){return i("#"+e).parents("."+l[4]).attr("times")},r.iframeAuto=function(e){if(e){var t=r.getChildFrame("html",e).outerHeight(),n=i("#"+l[0]+e),a=n.find(l[1]).outerHeight()||0,o=n.find("."+l[6]).outerHeight()||0;n.css({height:t+a+o}),n.find("iframe").css({height:t})}},r.iframeSrc=function(e,t){i("#"+l[0]+e).find("iframe").attr("src",t)},r.style=function(e,t,n){var a=i("#"+l[0]+e),r=a.find(".layui-layer-content"),s=a.attr("type"),f=a.find(l[1]).outerHeight()||0,c=a.find("."+l[6]).outerHeight()||0;a.attr("minLeft");s!==o.type[3]&&s!==o.type[4]&&(n||(parseFloat(t.width)<=260&&(t.width=260),parseFloat(t.height)-f-c<=64&&(t.height=64+f+c)),a.css(t),c=a.find("."+l[6]).outerHeight(),s===o.type[2]?a.find("iframe").css({height:parseFloat(t.height)-f-c}):r.css({height:parseFloat(t.height)-f-c-parseFloat(r.css("padding-top"))-parseFloat(r.css("padding-bottom"))}))},r.min=function(e,t){t=t||{};var a=i("#"+l[0]+e),s=i("#"+l.SHADE+e),f=a.find(l[1]).outerHeight()||0,c=a.attr("minLeft")||181*o.minIndex+"px",u=a.css("position"),d={width:180,height:f,position:"fixed",overflow:"hidden"};o.record(a),o.minLeft[0]&&(c=o.minLeft[0],o.minLeft.shift()),t.minStack&&(d.left=c,d.top=n.height()-f,a.attr("minLeft")||o.minIndex++,a.attr("minLeft",c)),a.attr("position",u),r.style(e,d,!0),a.find(".layui-layer-min").hide(),"page"===a.attr("type")&&a.find(l[4]).hide(),o.rescollbar(e),s.hide()},r.restore=function(e){var t=i("#"+l[0]+e),n=i("#"+l.SHADE+e),a=t.attr("area").split(",");t.attr("type");r.style(e,{width:parseFloat(a[0]),height:parseFloat(a[1]),top:parseFloat(a[2]),left:parseFloat(a[3]),position:t.attr("position"),overflow:"visible"},!0),t.find(".layui-layer-max").removeClass("layui-layer-maxmin"),t.find(".layui-layer-min").show(),"page"===t.attr("type")&&t.find(l[4]).show(),o.rescollbar(e),n.show()},r.full=function(e){var t,a=i("#"+l[0]+e);o.record(a),l.html.attr("layer-full")||l.html.css("overflow","hidden").attr("layer-full",e),clearTimeout(t),t=setTimeout(function(){var t="fixed"===a.css("position");r.style(e,{top:t?0:n.scrollTop(),left:t?0:n.scrollLeft(),width:n.width(),height:n.height()},!0),a.find(".layui-layer-min").hide()},100)},r.title=function(e,t){var n=i("#"+l[0]+(t||r.index)).find(l[1]);n.html(e)},r.close=function(e,t){var n=i("#"+l[0]+e),a=n.attr("type"),s="layer-anim-close";if(n[0]){var f="layui-layer-wrap",c=function(){if(a===o.type[1]&&"object"===n.attr("conType")){n.children(":not(."+l[5]+")").remove();for(var r=n.find("."+f),s=0;s<2;s++)r.unwrap();r.css("display",r.data("display")).removeClass(f)}else{if(a===o.type[2])try{var c=i("#"+l[4]+e)[0];c.contentWindow.document.write(""),c.contentWindow.close(),n.find("."+l[5])[0].removeChild(c)}catch(u){}n[0].innerHTML="",n.remove()}"function"==typeof o.end[e]&&o.end[e](),delete o.end[e],"function"==typeof t&&t()};n.data("isOutAnim")&&n.addClass("layer-anim "+s),i("#layui-layer-moves, #"+l.SHADE+e).remove(),6==r.ie&&o.reselect(),o.rescollbar(e),n.attr("minLeft")&&(o.minIndex--,o.minLeft.push(n.attr("minLeft"))),r.ie&&r.ie<10||!n.data("isOutAnim")?c():setTimeout(function(){c()},200)}},r.closeAll=function(e,t){"function"==typeof e&&(t=e,e=null);var n=i("."+l[0]);i.each(n,function(a){var o=i(this),s=e?o.attr("type")===e:1;s&&r.close(o.attr("times"),a===n.length-1?t:null),s=null}),0===n.length&&"function"==typeof t&&t()};var f=r.cache||{},c=function(e){return f.skin?" "+f.skin+" "+f.skin+"-"+e:""};r.prompt=function(e,t){var a="";if(e=e||{},"function"==typeof e&&(t=e),e.area){var o=e.area;a='style="width: '+o[0]+"; height: "+o[1]+';"',delete e.area}var s,l=2==e.formType?'<textarea class="layui-layer-input"'+a+"></textarea>":function(){return'<input type="'+(1==e.formType?"password":"text")+'" class="layui-layer-input">'}(),f=e.success;return delete e.success,r.open(i.extend({type:1,btn:["&#x786E;&#x5B9A;","&#x53D6;&#x6D88;"],content:l,skin:"layui-layer-prompt"+c("prompt"),maxWidth:n.width(),success:function(t){s=t.find(".layui-layer-input"),s.val(e.value||"").focus(),"function"==typeof f&&f(t)},resize:!1,yes:function(i){var n=s.val();""===n?s.focus():n.length>(e.maxlength||500)?r.tips("&#x6700;&#x591A;&#x8F93;&#x5165;"+(e.maxlength||500)+"&#x4E2A;&#x5B57;&#x6570;",s,{tips:1}):t&&t(n,i,s)}},e))},r.tab=function(e){e=e||{};var t=e.tab||{},n="layui-this",a=e.success;return delete e.success,r.open(i.extend({type:1,skin:"layui-layer-tab"+c("tab"),resize:!1,title:function(){var e=t.length,i=1,a="";if(e>0)for(a='<span class="'+n+'">'+t[0].title+"</span>";i<e;i++)a+="<span>"+t[i].title+"</span>";return a}(),content:'<ul class="layui-layer-tabmain">'+function(){var e=t.length,i=1,a="";if(e>0)for(a='<li class="layui-layer-tabli '+n+'">'+(t[0].content||"no content")+"</li>";i<e;i++)a+='<li class="layui-layer-tabli">'+(t[i].content||"no  content")+"</li>";return a}()+"</ul>",success:function(t){var o=t.find(".layui-layer-title").children(),r=t.find(".layui-layer-tabmain").children();o.on("mousedown",function(t){t.stopPropagation?t.stopPropagation():t.cancelBubble=!0;var a=i(this),o=a.index();a.addClass(n).siblings().removeClass(n),r.eq(o).show().siblings().hide(),"function"==typeof e.change&&e.change(o)}),"function"==typeof a&&a(t)}},e))},r.photos=function(t,n,a){function o(e,t,i){var n=new Image;return n.src=e,n.complete?t(n):(n.onload=function(){n.onload=null,t(n)},void(n.onerror=function(e){n.onerror=null,i(e)}))}var s={};if(t=t||{},t.photos){var l=!("string"==typeof t.photos||t.photos instanceof i),f=l?t.photos:{},u=f.data||[],d=f.start||0;s.imgIndex=(0|d)+1,t.img=t.img||"img";var y=t.success;if(delete t.success,l){if(0===u.length)return r.msg("&#x6CA1;&#x6709;&#x56FE;&#x7247;")}else{var p=i(t.photos),h=function(){u=[],p.find(t.img).each(function(e){var t=i(this);t.attr("layer-index",e),u.push({alt:t.attr("alt"),pid:t.attr("layer-pid"),src:t.attr("layer-src")||t.attr("src"),thumb:t.attr("src")})})};if(h(),0===u.length)return;if(n||p.on("click",t.img,function(){h();var e=i(this),n=e.attr("layer-index");r.photos(i.extend(t,{photos:{start:n,data:u,tab:t.tab},full:t.full}),!0)}),!n)return}s.imgprev=function(e){s.imgIndex--,s.imgIndex<1&&(s.imgIndex=u.length),s.tabimg(e)},s.imgnext=function(e,t){s.imgIndex++,s.imgIndex>u.length&&(s.imgIndex=1,t)||s.tabimg(e)},s.keyup=function(e){if(!s.end){var t=e.keyCode;e.preventDefault(),37===t?s.imgprev(!0):39===t?s.imgnext(!0):27===t&&r.close(s.index)}},s.tabimg=function(e){if(!(u.length<=1))return f.start=s.imgIndex-1,r.close(s.index),r.photos(t,!0,e)},s.event=function(){s.bigimg.find(".layui-layer-imgprev").on("click",function(e){e.preventDefault(),s.imgprev(!0)}),s.bigimg.find(".layui-layer-imgnext").on("click",function(e){e.preventDefault(),s.imgnext(!0)}),i(document).on("keyup",s.keyup)},s.loadi=r.load(1,{shade:!("shade"in t)&&.9,scrollbar:!1}),o(u[d].src,function(n){r.close(s.loadi),a&&(t.anim=-1),s.index=r.open(i.extend({type:1,id:"layui-layer-photos",area:function(){var a=[n.width,n.height],o=[i(e).width()-100,i(e).height()-100];if(!t.full&&(a[0]>o[0]||a[1]>o[1])){var r=[a[0]/o[0],a[1]/o[1]];r[0]>r[1]?(a[0]=a[0]/r[0],a[1]=a[1]/r[0]):r[0]<r[1]&&(a[0]=a[0]/r[1],a[1]=a[1]/r[1])}return[a[0]+"px",a[1]+"px"]}(),title:!1,shade:.9,shadeClose:!0,closeBtn:!1,move:".layui-layer-phimg img",moveType:1,scrollbar:!1,moveOut:!0,anim:5,isOutAnim:!1,skin:"layui-layer-photos"+c("photos"),content:'<div class="layui-layer-phimg"><img src="'+u[d].src+'" alt="'+(u[d].alt||"")+'" layer-pid="'+u[d].pid+'">'+function(){return u.length>1?'<div class="layui-layer-imgsee"><span class="layui-layer-imguide"><a href="javascript:;" class="layui-layer-iconext layui-layer-imgprev"></a><a href="javascript:;" class="layui-layer-iconext layui-layer-imgnext"></a></span><div class="layui-layer-imgbar" style="display:'+(a?"block":"")+'"><span class="layui-layer-imgtit"><a href="javascript:;">'+(u[d].alt||"")+"</a><em>"+s.imgIndex+" / "+u.length+"</em></span></div></div>":""}()+"</div>",success:function(e,i){s.bigimg=e.find(".layui-layer-phimg"),s.imgsee=e.find(".layui-layer-imgbar"),s.event(e),t.tab&&t.tab(u[d],e),"function"==typeof y&&y(e)},end:function(){s.end=!0,i(document).off("keyup",s.keyup)}},t))},function(){r.close(s.loadi),r.msg("&#x5F53;&#x524D;&#x56FE;&#x7247;&#x5730;&#x5740;&#x5F02;&#x5E38;<br>&#x662F;&#x5426;&#x7EE7;&#x7EED;&#x67E5;&#x770B;&#x4E0B;&#x4E00;&#x5F20;&#xFF1F;",{time:3e4,btn:["&#x4E0B;&#x4E00;&#x5F20;","&#x4E0D;&#x770B;&#x4E86;"],yes:function(){u.length>1&&s.imgnext(!0,!0)}})})}},o.run=function(t){i=t,n=i(e),l.html=i("html"),r.open=function(e){var t=new s(e);return t.index}},e.layui&&layui.define?(r.ready(),layui.define("jquery",function(t){r.path=layui.cache.dir,o.run(layui.$),e.layer=r,t("layer",r)})):"function"==typeof define&&define.amd?define(["jquery"],function(){return o.run(e.jQuery),r}):function(){r.ready(),o.run(e.jQuery)}()}(window);layui.define("jquery",function(e){"use strict";var t=layui.$,i=layui.hint(),n={fixbar:function(e){var i,n,r="layui-fixbar",a="layui-fixbar-top",o=t(document),l=t("body");e=t.extend({showHeight:200},e),e.bar1=e.bar1===!0?"&#xe606;":e.bar1,e.bar2=e.bar2===!0?"&#xe607;":e.bar2,e.bgcolor=e.bgcolor?"background-color:"+e.bgcolor:"";var c=[e.bar1,e.bar2,"&#xe604;"],g=t(['<ul class="'+r+'">',e.bar1?'<li class="layui-icon" lay-type="bar1" style="'+e.bgcolor+'">'+c[0]+"</li>":"",e.bar2?'<li class="layui-icon" lay-type="bar2" style="'+e.bgcolor+'">'+c[1]+"</li>":"",'<li class="layui-icon '+a+'" lay-type="top" style="'+e.bgcolor+'">'+c[2]+"</li>","</ul>"].join("")),u=g.find("."+a),s=function(){var t=o.scrollTop();t>=e.showHeight?i||(u.show(),i=1):i&&(u.hide(),i=0)};t("."+r)[0]||("object"==typeof e.css&&g.css(e.css),l.append(g),s(),g.find("li").on("click",function(){var i=t(this),n=i.attr("lay-type");"top"===n&&t("html,body").animate({scrollTop:0},200),e.click&&e.click.call(this,n)}),o.on("scroll",function(){clearTimeout(n),n=setTimeout(function(){s()},100)}))},countdown:function(e,t,i){var n=this,r="function"==typeof t,a=new Date(e).getTime(),o=new Date(!t||r?(new Date).getTime():t).getTime(),l=a-o,c=[Math.floor(l/864e5),Math.floor(l/36e5)%24,Math.floor(l/6e4)%60,Math.floor(l/1e3)%60];r&&(i=t);var g=setTimeout(function(){n.countdown(e,o+1e3,i)},1e3);return i&&i(l>0?c:[0,0,0,0],t,g),l<=0&&clearTimeout(g),g},timeAgo:function(e,t){var i=this,n=[[],[]],r=(new Date).getTime()-new Date(e).getTime();return r>26784e5?(r=new Date(e),n[0][0]=i.digit(r.getFullYear(),4),n[0][1]=i.digit(r.getMonth()+1),n[0][2]=i.digit(r.getDate()),t||(n[1][0]=i.digit(r.getHours()),n[1][1]=i.digit(r.getMinutes()),n[1][2]=i.digit(r.getSeconds())),n[0].join("-")+" "+n[1].join(":")):r>=864e5?(r/1e3/60/60/24|0)+"\u5929\u524d":r>=36e5?(r/1e3/60/60|0)+"\u5c0f\u65f6\u524d":r>=18e4?(r/1e3/60|0)+"\u5206\u949f\u524d":r<0?"\u672a\u6765":"\u521a\u521a"},digit:function(e,t){var i="";e=String(e),t=t||2;for(var n=e.length;n<t;n++)i+="0";return e<Math.pow(10,t)?i+(0|e):e},toDateString:function(e,t){if(null===e||""===e)return"";var n=this,r=new Date(function(){if(e)return isNaN(e)?e:"string"==typeof e?parseInt(e):e}()||new Date),a=[n.digit(r.getFullYear(),4),n.digit(r.getMonth()+1),n.digit(r.getDate())],o=[n.digit(r.getHours()),n.digit(r.getMinutes()),n.digit(r.getSeconds())];return r.getDate()?(t=t||"yyyy-MM-dd HH:mm:ss",t.replace(/yyyy/g,a[0]).replace(/MM/g,a[1]).replace(/dd/g,a[2]).replace(/HH/g,o[0]).replace(/mm/g,o[1]).replace(/ss/g,o[2])):(i.error('Invalid Msec for "util.toDateString(Msec)"'),"")},escape:function(e){return String(e||"").replace(/&(?!#?[a-zA-Z0-9]+;)/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/'/g,"&#39;").replace(/"/g,"&quot;")},unescape:function(e){return String(e||"").replace(/\&amp;/g,"&").replace(/\&lt;/g,"<").replace(/\&gt;/g,">").replace(/\&#39;/,"'").replace(/\&quot;/,'"')},toVisibleArea:function(e){if(e=t.extend({margin:160,duration:200,type:"y"},e),e.scrollElem[0]&&e.thisElem[0]){var i=e.scrollElem,n=e.thisElem,r="y"===e.type,a=r?"scrollTop":"scrollLeft",o=r?"top":"left",l=i[a](),c=i[r?"height":"width"](),g=i.offset()[o],u=n.offset()[o]-g,s={};(u>c-e.margin||u<e.margin)&&(s[a]=u-c/2+l,i.animate(s,e.duration))}},event:function(e,i,r){var a=t("body");return r=r||"click",i=n.event[e]=t.extend(!0,n.event[e],i)||{},n.event.UTIL_EVENT_CALLBACK=n.event.UTIL_EVENT_CALLBACK||{},a.off(r,"*["+e+"]",n.event.UTIL_EVENT_CALLBACK[e]),n.event.UTIL_EVENT_CALLBACK[e]=function(){var n=t(this),r=n.attr(e);"function"==typeof i[r]&&i[r].call(this,n)},a.on(r,"*["+e+"]",n.event.UTIL_EVENT_CALLBACK[e]),i}};e("util",n)});layui.define("jquery",function(t){"use strict";var i=layui.$,a=(layui.hint(),layui.device()),e="element",l="layui-this",n="layui-show",s=function(){this.config={}};s.prototype.set=function(t){var a=this;return i.extend(!0,a.config,t),a},s.prototype.on=function(t,i){return layui.onevent.call(this,e,t,i)},s.prototype.tabAdd=function(t,a){var e=".layui-tab-title",l=i(".layui-tab[lay-filter="+t+"]"),n=l.children(e),s=n.children(".layui-tab-bar"),o=l.children(".layui-tab-content"),r="<li"+function(){var t=[];return layui.each(a,function(i,a){/^(title|content)$/.test(i)||t.push("lay-"+i+'="'+a+'"')}),t.length>0&&t.unshift(""),t.join(" ")}()+">"+(a.title||"unnaming")+"</li>";return s[0]?s.before(r):n.append(r),o.append('<div class="layui-tab-item">'+(a.content||"")+"</div>"),b.hideTabMore(!0),b.tabAuto(),this},s.prototype.tabDelete=function(t,a){var e=".layui-tab-title",l=i(".layui-tab[lay-filter="+t+"]"),n=l.children(e),s=n.find('>li[lay-id="'+a+'"]');return b.tabDelete(null,s),this},s.prototype.tabChange=function(t,a){var e=".layui-tab-title",l=i(".layui-tab[lay-filter="+t+"]"),n=l.children(e),s=n.find('>li[lay-id="'+a+'"]');return b.tabClick.call(s[0],null,null,s),this},s.prototype.tab=function(t){t=t||{},m.on("click",t.headerElem,function(a){var e=i(this).index();b.tabClick.call(this,a,e,null,t)})},s.prototype.progress=function(t,a){var e="layui-progress",l=i("."+e+"[lay-filter="+t+"]"),n=l.find("."+e+"-bar"),s=n.find("."+e+"-text");return n.css("width",a).attr("lay-percent",a),s.text(a),this};var o=".layui-nav",r="layui-nav-item",c="layui-nav-bar",u="layui-nav-tree",y="layui-nav-child",d="layui-nav-child-c",f="layui-nav-more",h="layui-icon-down",p="layui-anim layui-anim-upbit",b={tabClick:function(t,a,s,o){o=o||{};var r=s||i(this),a=a||r.parent().children("li").index(r),c=o.headerElem?r.parent():r.parents(".layui-tab").eq(0),u=o.bodyElem?i(o.bodyElem):c.children(".layui-tab-content").children(".layui-tab-item"),y=r.find("a"),d="javascript:;"!==y.attr("href")&&"_blank"===y.attr("target"),f="string"==typeof r.attr("lay-unselect"),h=c.attr("lay-filter");d||f||(r.addClass(l).siblings().removeClass(l),u.eq(a).addClass(n).siblings().removeClass(n)),layui.event.call(this,e,"tab("+h+")",{elem:c,index:a})},tabDelete:function(t,a){var n=a||i(this).parent(),s=n.index(),o=n.parents(".layui-tab").eq(0),r=o.children(".layui-tab-content").children(".layui-tab-item"),c=o.attr("lay-filter");n.hasClass(l)&&(n.next()[0]?b.tabClick.call(n.next()[0],null,s+1):n.prev()[0]&&b.tabClick.call(n.prev()[0],null,s-1)),n.remove(),r.eq(s).remove(),setTimeout(function(){b.tabAuto()},50),layui.event.call(this,e,"tabDelete("+c+")",{elem:o,index:s})},tabAuto:function(){var t="layui-tab-more",e="layui-tab-bar",l="layui-tab-close",n=this;i(".layui-tab").each(function(){var s=i(this),o=s.children(".layui-tab-title"),r=(s.children(".layui-tab-content").children(".layui-tab-item"),'lay-stope="tabmore"'),c=i('<span class="layui-unselect layui-tab-bar" '+r+"><i "+r+' class="layui-icon">&#xe61a;</i></span>');if(n===window&&8!=a.ie&&b.hideTabMore(!0),s.attr("lay-allowClose")&&o.find("li").each(function(){var t=i(this);if(!t.find("."+l)[0]){var a=i('<i class="layui-icon layui-icon-close layui-unselect '+l+'"></i>');a.on("click",b.tabDelete),t.append(a)}}),"string"!=typeof s.attr("lay-unauto"))if(o.prop("scrollWidth")>o.outerWidth()+1){if(o.find("."+e)[0])return;o.append(c),s.attr("overflow",""),c.on("click",function(i){o[this.title?"removeClass":"addClass"](t),this.title=this.title?"":"\u6536\u7f29"})}else o.find("."+e).remove(),s.removeAttr("overflow")})},hideTabMore:function(t){var a=i(".layui-tab-title");t!==!0&&"tabmore"===i(t.target).attr("lay-stope")||(a.removeClass("layui-tab-more"),a.find(".layui-tab-bar").attr("title",""))},clickThis:function(){var t=i(this),a=t.parents(o),n=a.attr("lay-filter"),s=t.parent(),c=t.siblings("."+y),d="string"==typeof s.attr("lay-unselect");"javascript:;"!==t.attr("href")&&"_blank"===t.attr("target")||d||c[0]||(a.find("."+l).removeClass(l),s.addClass(l)),a.hasClass(u)&&(c.removeClass(p),c[0]&&(s["none"===c.css("display")?"addClass":"removeClass"](r+"ed"),"all"===a.attr("lay-shrink")&&s.siblings().removeClass(r+"ed"))),layui.event.call(this,e,"nav("+n+")",t)},collapse:function(){var t=i(this),a=t.find(".layui-colla-icon"),l=t.siblings(".layui-colla-content"),s=t.parents(".layui-collapse").eq(0),o=s.attr("lay-filter"),r="none"===l.css("display");if("string"==typeof s.attr("lay-accordion")){var c=s.children(".layui-colla-item").children("."+n);c.siblings(".layui-colla-title").children(".layui-colla-icon").html("&#xe602;"),c.removeClass(n)}l[r?"addClass":"removeClass"](n),a.html(r?"&#xe61a;":"&#xe602;"),layui.event.call(this,e,"collapse("+o+")",{title:t,content:l,show:r})}};s.prototype.init=function(t,e){var l=function(){return e?'[lay-filter="'+e+'"]':""}(),s={tab:function(){b.tabAuto.call({})},nav:function(){var t=200,e={},s={},v={},m="layui-nav-title",C=function(l,o,r){var c=i(this),h=c.find("."+y);if(o.hasClass(u)){if(!h[0]){var b=c.children("."+m);l.css({top:c.offset().top-o.offset().top,height:(b[0]?b:c).outerHeight(),opacity:1})}}else h.addClass(p),h.hasClass(d)&&h.css({left:-(h.outerWidth()-c.width())/2}),h[0]?l.css({left:l.position().left+l.width()/2,width:0,opacity:0}):l.css({left:c.position().left+parseFloat(c.css("marginLeft")),top:c.position().top+c.height()-l.height()}),e[r]=setTimeout(function(){l.css({width:h[0]?0:c.width(),opacity:h[0]?0:1})},a.ie&&a.ie<10?0:t),clearTimeout(v[r]),"block"===h.css("display")&&clearTimeout(s[r]),s[r]=setTimeout(function(){h.addClass(n),c.find("."+f).addClass(f+"d")},300)};i(o+l).each(function(a){var l=i(this),o=i('<span class="'+c+'"></span>'),d=l.find("."+r);l.find("."+c)[0]||(l.append(o),(l.hasClass(u)?d.find("dd,>."+m):d).on("mouseenter",function(){C.call(this,o,l,a)}).on("mouseleave",function(){l.hasClass(u)?o.css({height:0,opacity:0}):(clearTimeout(s[a]),s[a]=setTimeout(function(){l.find("."+y).removeClass(n),l.find("."+f).removeClass(f+"d")},300))}),l.on("mouseleave",function(){clearTimeout(e[a]),v[a]=setTimeout(function(){l.hasClass(u)||o.css({width:0,left:o.position().left+o.width()/2,opacity:0})},t)})),d.find("a").each(function(){var t=i(this),a=(t.parent(),t.siblings("."+y));a[0]&&!t.children("."+f)[0]&&t.append('<i class="layui-icon '+h+" "+f+'"></i>'),t.off("click",b.clickThis).on("click",b.clickThis)})})},breadcrumb:function(){var t=".layui-breadcrumb";i(t+l).each(function(){var t=i(this),a="lay-separator",e=t.attr(a)||"/",l=t.find("a");l.next("span["+a+"]")[0]||(l.each(function(t){t!==l.length-1&&i(this).after("<span "+a+">"+e+"</span>")}),t.css("visibility","visible"))})},progress:function(){var t="layui-progress";i("."+t+l).each(function(){var a=i(this),e=a.find(".layui-progress-bar"),l=e.attr("lay-percent");e.css("width",function(){return/^.+\/.+$/.test(l)?100*new Function("return "+l)()+"%":l}()),a.attr("lay-showPercent")&&setTimeout(function(){e.html('<span class="'+t+'-text">'+l+"</span>")},350)})},collapse:function(){var t="layui-collapse";i("."+t+l).each(function(){var t=i(this).find(".layui-colla-item");t.each(function(){var t=i(this),a=t.find(".layui-colla-title"),e=t.find(".layui-colla-content"),l="none"===e.css("display");a.find(".layui-colla-icon").remove(),a.append('<i class="layui-icon layui-colla-icon">'+(l?"&#xe602;":"&#xe61a;")+"</i>"),a.off("click",b.collapse).on("click",b.collapse)})})}};return s[t]?s[t]():layui.each(s,function(t,i){i()})},s.prototype.render=s.prototype.init;var v=new s,m=i(document);i(function(){v.render()});var C=".layui-tab-title li";m.on("click",C,b.tabClick),m.on("click",b.hideTabMore),i(window).on("resize",b.tabAuto),t(e,v)});layui.define("layer",function(e){"use strict";var t=layui.$,i=layui.layer,n=layui.hint(),o=layui.device(),a={config:{},set:function(e){var i=this;return i.config=t.extend({},i.config,e),i},on:function(e,t){return layui.onevent.call(this,r,e,t)}},l=function(){var e=this;return{upload:function(t){e.upload.call(e,t)},reload:function(t){e.reload.call(e,t)},config:e.config}},r="upload",u="layui-upload-file",c="layui-upload-form",f="layui-upload-iframe",s="layui-upload-choose",p=function(e){var i=this;i.config=t.extend({},i.config,a.config,e),i.render()};p.prototype.config={accept:"images",exts:"",auto:!0,bindAction:"",url:"",field:"file",acceptMime:"",method:"post",data:{},drag:!0,size:0,number:0,multiple:!1},p.prototype.render=function(e){var i=this,e=i.config;e.elem=t(e.elem),e.bindAction=t(e.bindAction),i.file(),i.events()},p.prototype.file=function(){var e=this,i=e.config,n=e.elemFile=t(['<input class="'+u+'" type="file" accept="'+i.acceptMime+'" name="'+i.field+'"',i.multiple?" multiple":"",">"].join("")),a=i.elem.next();(a.hasClass(u)||a.hasClass(c))&&a.remove(),o.ie&&o.ie<10&&i.elem.wrap('<div class="layui-upload-wrap"></div>'),e.isFile()?(e.elemFile=i.elem,i.field=i.elem[0].name):i.elem.after(n),o.ie&&o.ie<10&&e.initIE()},p.prototype.initIE=function(){var e=this,i=e.config,n=t('<iframe id="'+f+'" class="'+f+'" name="'+f+'" frameborder="0"></iframe>'),o=t(['<form target="'+f+'" class="'+c+'" method="post" key="set-mine" enctype="multipart/form-data" action="'+i.url+'">',"</form>"].join(""));t("#"+f)[0]||t("body").append(n),i.elem.next().hasClass(c)||(e.elemFile.wrap(o),i.elem.next("."+c).append(function(){var e=[];return layui.each(i.data,function(t,i){i="function"==typeof i?i():i,e.push('<input type="hidden" name="'+t+'" value="'+i+'">')}),e.join("")}()))},p.prototype.msg=function(e){return i.msg(e,{icon:2,shift:6})},p.prototype.isFile=function(){var e=this.config.elem[0];if(e)return"input"===e.tagName.toLocaleLowerCase()&&"file"===e.type},p.prototype.preview=function(e){var t=this;window.FileReader&&layui.each(t.chooseFiles,function(t,i){var n=new FileReader;n.readAsDataURL(i),n.onload=function(){e&&e(t,i,this.result)}})},p.prototype.upload=function(e,i){var n,a=this,l=a.config,r=a.elemFile[0],u=function(){var i=0,n=0,o=e||a.files||a.chooseFiles||r.files,u=function(){l.multiple&&i+n===a.fileLength&&"function"==typeof l.allDone&&l.allDone({total:a.fileLength,successful:i,aborted:n})};layui.each(o,function(e,o){var r=new FormData;r.append(l.field,o),layui.each(l.data,function(e,t){t="function"==typeof t?t():t,r.append(e,t)});var c={url:l.url,type:"post",data:r,contentType:!1,processData:!1,dataType:"json",headers:l.headers||{},success:function(t){i++,d(e,t),u()},error:function(){n++,a.msg("\u8bf7\u6c42\u4e0a\u4f20\u63a5\u53e3\u51fa\u73b0\u5f02\u5e38"),m(e),u()}};"function"==typeof l.progress&&(c.xhr=function(){var i=t.ajaxSettings.xhr();return i.upload.addEventListener("progress",function(t){if(t.lengthComputable){var i=Math.floor(t.loaded/t.total*100);l.progress(i,l.item?l.item[0]:l.elem[0],t,e)}}),i}),t.ajax(c)})},c=function(){var e=t("#"+f);a.elemFile.parent().submit(),clearInterval(p.timer),p.timer=setInterval(function(){var t,i=e.contents().find("body");try{t=i.text()}catch(n){a.msg("\u83b7\u53d6\u4e0a\u4f20\u540e\u7684\u54cd\u5e94\u4fe1\u606f\u51fa\u73b0\u5f02\u5e38"),clearInterval(p.timer),m()}t&&(clearInterval(p.timer),i.html(""),d(0,t))},30)},d=function(e,t){if(a.elemFile.next("."+s).remove(),r.value="","object"!=typeof t)try{t=JSON.parse(t)}catch(i){return t={},a.msg("\u8bf7\u5bf9\u4e0a\u4f20\u63a5\u53e3\u8fd4\u56de\u6709\u6548JSON")}"function"==typeof l.done&&l.done(t,e||0,function(e){a.upload(e)})},m=function(e){l.auto&&(r.value=""),"function"==typeof l.error&&l.error(e||0,function(e){a.upload(e)})},h=l.exts,v=function(){var t=[];return layui.each(e||a.chooseFiles,function(e,i){t.push(i.name)}),t}(),g={preview:function(e){a.preview(e)},upload:function(e,t){var i={};i[e]=t,a.upload(i)},pushFile:function(){return a.files=a.files||{},layui.each(a.chooseFiles,function(e,t){a.files[e]=t}),a.files},resetFile:function(e,t,i){var n=new File([t],i);a.files=a.files||{},a.files[e]=n}},y=function(){if(!(("choose"===i||l.auto)&&(l.choose&&l.choose(g),"choose"===i)||l.before&&l.before(g)===!1))return o.ie?o.ie>9?u():c():void u()};if(v=0===v.length?r.value.match(/[^\/\\]+\..+/g)||[]||"":v,0!==v.length){switch(l.accept){case"file":if(h&&!RegExp("\\w\\.("+h+")$","i").test(escape(v)))return a.msg("\u9009\u62e9\u7684\u6587\u4ef6\u4e2d\u5305\u542b\u4e0d\u652f\u6301\u7684\u683c\u5f0f"),r.value="";break;case"video":if(!RegExp("\\w\\.("+(h||"avi|mp4|wma|rmvb|rm|flash|3gp|flv")+")$","i").test(escape(v)))return a.msg("\u9009\u62e9\u7684\u89c6\u9891\u4e2d\u5305\u542b\u4e0d\u652f\u6301\u7684\u683c\u5f0f"),r.value="";break;case"audio":if(!RegExp("\\w\\.("+(h||"mp3|wav|mid")+")$","i").test(escape(v)))return a.msg("\u9009\u62e9\u7684\u97f3\u9891\u4e2d\u5305\u542b\u4e0d\u652f\u6301\u7684\u683c\u5f0f"),r.value="";break;default:if(layui.each(v,function(e,t){RegExp("\\w\\.("+(h||"jpg|png|gif|bmp|jpeg$")+")","i").test(escape(t))||(n=!0)}),n)return a.msg("\u9009\u62e9\u7684\u56fe\u7247\u4e2d\u5305\u542b\u4e0d\u652f\u6301\u7684\u683c\u5f0f"),r.value=""}if(a.fileLength=function(){var t=0,i=e||a.files||a.chooseFiles||r.files;return layui.each(i,function(){t++}),t}(),l.number&&a.fileLength>l.number)return a.msg("\u540c\u65f6\u6700\u591a\u53ea\u80fd\u4e0a\u4f20\u7684\u6570\u91cf\u4e3a\uff1a"+l.number);if(l.size>0&&!(o.ie&&o.ie<10)){var F;if(layui.each(a.chooseFiles,function(e,t){if(t.size>1024*l.size){var i=l.size/1024;i=i>=1?i.toFixed(2)+"MB":l.size+"KB",r.value="",F=i}}),F)return a.msg("\u6587\u4ef6\u4e0d\u80fd\u8d85\u8fc7"+F)}y()}},p.prototype.reload=function(e){e=e||{},delete e.elem,delete e.bindAction;var i=this,e=i.config=t.extend({},i.config,a.config,e),n=e.elem.next();n.attr({name:e.name,accept:e.acceptMime,multiple:e.multiple})},p.prototype.events=function(){var e=this,i=e.config,a=function(t){e.chooseFiles={},layui.each(t,function(t,i){var n=(new Date).getTime();e.chooseFiles[n+"-"+t]=i})},l=function(t,n){var o=e.elemFile,a=(i.item?i.item:i.elem,t.length>1?t.length+"\u4e2a\u6587\u4ef6":(t[0]||{}).name||o[0].value.match(/[^\/\\]+\..+/g)||[]||"");o.next().hasClass(s)&&o.next().remove(),e.upload(null,"choose"),e.isFile()||i.choose||o.after('<span class="layui-inline '+s+'">'+a+"</span>")};i.elem.off("upload.start").on("upload.start",function(){var o=t(this),a=o.attr("lay-data");if(a)try{a=new Function("return "+a)(),e.config=t.extend({},i,a)}catch(l){n.error("Upload element property lay-data configuration item has a syntax error: "+a)}e.config.item=o,e.elemFile[0].click()}),o.ie&&o.ie<10||i.elem.off("upload.over").on("upload.over",function(){var e=t(this);e.attr("lay-over","")}).off("upload.leave").on("upload.leave",function(){var e=t(this);e.removeAttr("lay-over")}).off("upload.drop").on("upload.drop",function(n,o){var r=t(this),u=o.originalEvent.dataTransfer.files||[];r.removeAttr("lay-over"),a(u),i.auto?e.upload(u):l(u)}),e.elemFile.off("upload.change").on("upload.change",function(){var t=this.files||[];a(t),i.auto?e.upload():l(t)}),i.bindAction.off("upload.action").on("upload.action",function(){e.upload()}),i.elem.data("haveEvents")||(e.elemFile.on("change",function(){t(this).trigger("upload.change")}),i.elem.on("click",function(){e.isFile()||t(this).trigger("upload.start")}),i.drag&&i.elem.on("dragover",function(e){e.preventDefault(),t(this).trigger("upload.over")}).on("dragleave",function(e){t(this).trigger("upload.leave")}).on("drop",function(e){e.preventDefault(),t(this).trigger("upload.drop",e)}),i.bindAction.on("click",function(){t(this).trigger("upload.action")}),i.elem.data("haveEvents",!0))},a.render=function(e){var t=new p(e);return l.call(t)},e(r,a)});layui.define(["jquery","laytpl","lay"],function(e){"use strict";var i=layui.$,n=layui.laytpl,t=layui.hint(),a=layui.device(),l=a.mobile?"click":"mousedown",r="dropdown",o="layui_"+r+"_index",u={config:{},index:layui[r]?layui[r].index+1e4:0,set:function(e){var n=this;return n.config=i.extend({},n.config,e),n},on:function(e,i){return layui.onevent.call(this,r,e,i)}},d=function(){var e=this,i=e.config,n=i.id;return d.that[n]=e,{config:i,reload:function(i){e.reload.call(e,i)}}},s="layui-dropdown",m="layui-menu-item-up",c="layui-menu-item-down",p="layui-menu-body-title",y="layui-menu-item-group",f="layui-menu-item-parent",v="layui-menu-item-divider",g="layui-menu-item-checked",h="layui-menu-item-checked2",w="layui-menu-body-panel",C="layui-menu-body-panel-left",V="."+y+">."+p,k=function(e){var n=this;n.index=++u.index,n.config=i.extend({},n.config,u.config,e),n.init()};k.prototype.config={trigger:"click",content:"",className:"",style:"",show:!1,isAllowSpread:!0,isSpreadItem:!0,data:[],delay:300},k.prototype.reload=function(e){var n=this;n.config=i.extend({},n.config,e),n.init(!0)},k.prototype.init=function(e){var n=this,t=n.config,a=t.elem=i(t.elem);if(a.length>1)return layui.each(a,function(){u.render(i.extend({},t,{elem:this}))}),n;if(!e&&a[0]&&a.data(o)){var l=d.getThis(a.data(o));if(!l)return;return l.reload(t)}t.id="id"in t?t.id:n.index,t.show&&n.render(e),n.events()},k.prototype.render=function(e){var t=this,a=t.config,r=i("body"),s=function(){var e=i('<ul class="layui-menu layui-dropdown-menu"></ul>');return a.data.length>0?m(e,a.data):e.html('<li class="layui-menu-item-none">no menu</li>'),e},m=function(e,t){return layui.each(t,function(t,l){var r=l.child&&l.child.length>0,o="isSpreadItem"in l?l.isSpreadItem:a.isSpreadItem,u=l.templet?n(l.templet).render(l):a.templet?n(a.templet).render(l):l.title,d=function(){return r&&(l.type=l.type||"parent"),l.type?{group:"group",parent:"parent","-":"-"}[l.type]||"parent":""}();if("-"===d||l.title||l.id||r){var s=i(["<li"+function(){var e={group:"layui-menu-item-group"+(a.isAllowSpread?o?" layui-menu-item-down":" layui-menu-item-up":""),parent:f,"-":"layui-menu-item-divider"};return r||d?' class="'+e[d]+'"':""}()+">",function(){var e="href"in l?'<a href="'+l.href+'" target="'+(l.target||"_self")+'">'+u+"</a>":u;return r?'<div class="'+p+'">'+e+function(){return"parent"===d?'<i class="layui-icon layui-icon-right"></i>':"group"===d&&a.isAllowSpread?'<i class="layui-icon layui-icon-'+(o?"up":"down")+'"></i>':""}()+"</div>":'<div class="'+p+'">'+e+"</div>"}(),"</li>"].join(""));if(s.data("item",l),r){var c=i('<div class="layui-panel layui-menu-body-panel"></div>'),y=i("<ul></ul>");"parent"===d?(c.append(m(y,l.child)),s.append(c)):s.append(m(y,l.child))}e.append(s)}}),e},c=['<div class="layui-dropdown layui-border-box layui-panel layui-anim layui-anim-downbit">',"</div>"].join("");("contextmenu"===a.trigger||lay.isTopElem(a.elem[0]))&&(e=!0),!e&&a.elem.data(o+"_opened")||(t.elemView=i(c),t.elemView.append(a.content||s()),a.className&&t.elemView.addClass(a.className),a.style&&t.elemView.attr("style",a.style),u.thisId=a.id,t.remove(),r.append(t.elemView),a.elem.data(o+"_opened",!0),t.position(),d.prevElem=t.elemView,d.prevElem.data("prevElem",a.elem),t.elemView.find(".layui-menu").on(l,function(e){layui.stope(e)}),t.elemView.find(".layui-menu li").on("click",function(e){var n=i(this),l=n.data("item")||{},r=l.child&&l.child.length>0;r||"-"===l.type||(t.remove(),"function"==typeof a.click&&a.click(l,n))}),t.elemView.find(V).on("click",function(e){var n=i(this),t=n.parent(),l=t.data("item")||{};"group"===l.type&&a.isAllowSpread&&d.spread(t)}),"mouseenter"===a.trigger&&t.elemView.on("mouseenter",function(){clearTimeout(d.timer)}).on("mouseleave",function(){t.delayRemove()}))},k.prototype.position=function(e){var i=this,n=i.config;lay.position(n.elem[0],i.elemView[0],{position:n.position,e:i.e,clickType:"contextmenu"===n.trigger?"right":null})},k.prototype.remove=function(){var e=this,i=(e.config,d.prevElem);i&&(i.data("prevElem")&&i.data("prevElem").data(o+"_opened",!1),i.remove())},k.prototype.delayRemove=function(){var e=this,i=e.config;clearTimeout(d.timer),d.timer=setTimeout(function(){e.remove()},i.delay)},k.prototype.events=function(){var e=this,i=e.config;"hover"===i.trigger&&(i.trigger="mouseenter"),e.prevElem&&e.prevElem.off(i.trigger,e.prevElemCallback),e.prevElem=i.elem,e.prevElemCallback=function(n){clearTimeout(d.timer),e.e=n,e.render(),n.preventDefault(),"function"==typeof i.ready&&i.ready(e.elemView,i.elem,e.e.target)},i.elem.on(i.trigger,e.prevElemCallback),"mouseenter"===i.trigger&&i.elem.on("mouseleave",function(){e.delayRemove()})},d.that={},d.getThis=function(e){var i=d.that[e];return i||t.error(e?r+" instance with ID '"+e+"' not found":"ID argument required"),i},d.spread=function(e){var i=e.children("."+p).find(".layui-icon");e.hasClass(m)?(e.removeClass(m).addClass(c),i.removeClass("layui-icon-down").addClass("layui-icon-up")):(e.removeClass(c).addClass(m),i.removeClass("layui-icon-up").addClass("layui-icon-down"))},!function(){var e=i(window),n=i(document);e.on("resize",function(){if(u.thisId){var e=d.getThis(u.thisId);if(e){if(!e.elemView[0]||!i("."+s)[0])return!1;var n=e.config;"contextmenu"===n.trigger?e.remove():e.position()}}}),n.on(l,function(e){if(u.thisId){var i=d.getThis(u.thisId);if(i){var n=i.config;!lay.isTopElem(n.elem[0])&&"contextmenu"!==n.trigger&&(e.target===n.elem[0]||n.elem.find(e.target)[0]||e.target===i.elemView[0]||i.elemView&&i.elemView.find(e.target)[0])||i.remove()}}});var t=".layui-menu:not(.layui-dropdown-menu) li";n.on("click",t,function(e){var n=i(this),t=n.parents(".layui-menu").eq(0),a=n.hasClass(y)||n.hasClass(f),l=t.attr("lay-filter")||t.attr("id"),o=lay.options(this);n.hasClass(v)||a||(t.find("."+g).removeClass(g),t.find("."+h).removeClass(h),n.addClass(g),n.parents("."+f).addClass(h),layui.event.call(this,r,"click("+l+")",o))}),n.on("click",t+V,function(e){var n=i(this),t=n.parents("."+y+":eq(0)"),a=lay.options(t[0]);"isAllowSpread"in a&&!a.isAllowSpread||d.spread(t)});var a=".layui-menu ."+f;n.on("mouseenter",a,function(n){var t=i(this),a=t.find("."+w);if(a[0]){var l=a[0].getBoundingClientRect();l.right>e.width()&&(a.addClass(C),l=a[0].getBoundingClientRect(),l.left<0&&a.removeClass(C)),l.bottom>e.height()&&a.eq(0).css("margin-top",-(l.bottom-e.height()))}}).on("mouseleave",a,function(e){var n=i(this),t=n.children("."+w);t.removeClass(C),t.css("margin-top",0)})}(),u.reload=function(e,i){var n=d.getThis(e);return n?(n.reload(i),d.call(n)):this},u.render=function(e){var i=new k(e);return d.call(i)},e(r,u)});layui.define("jquery",function(e){"use strict";var i=layui.jquery,t={config:{},index:layui.slider?layui.slider.index+1e4:0,set:function(e){var t=this;return t.config=i.extend({},t.config,e),t},on:function(e,i){return layui.onevent.call(this,n,e,i)}},a=function(){var e=this,i=e.config;return{setValue:function(t,a){return i.value=t,e.slide("set",t,a||0)},config:i}},n="slider",l="layui-disabled",s="layui-slider",r="layui-slider-bar",o="layui-slider-wrap",u="layui-slider-wrap-btn",d="layui-slider-tips",v="layui-slider-input",c="layui-slider-input-txt",p="layui-slider-input-btn",m="layui-slider-hover",f=function(e){var a=this;a.index=++t.index,a.config=i.extend({},a.config,t.config,e),a.render()};f.prototype.config={type:"default",min:0,max:100,value:0,step:1,showstep:!1,tips:!0,input:!1,range:!1,height:200,disabled:!1,theme:"#009688"},f.prototype.render=function(){var e=this,t=e.config;if(t.step<1&&(t.step=1),t.max<t.min&&(t.max=t.min+t.step),t.range){t.value="object"==typeof t.value?t.value:[t.min,t.value];var a=Math.min(t.value[0],t.value[1]),n=Math.max(t.value[0],t.value[1]);t.value[0]=a>t.min?a:t.min,t.value[1]=n>t.min?n:t.min,t.value[0]=t.value[0]>t.max?t.max:t.value[0],t.value[1]=t.value[1]>t.max?t.max:t.value[1];var r=Math.floor((t.value[0]-t.min)/(t.max-t.min)*100),v=Math.floor((t.value[1]-t.min)/(t.max-t.min)*100),p=v-r+"%";r+="%",v+="%"}else{"object"==typeof t.value&&(t.value=Math.min.apply(null,t.value)),t.value<t.min&&(t.value=t.min),t.value>t.max&&(t.value=t.max);var p=Math.floor((t.value-t.min)/(t.max-t.min)*100)+"%"}var m=t.disabled?"#c2c2c2":t.theme,f='<div class="layui-slider '+("vertical"===t.type?"layui-slider-vertical":"")+'">'+(t.tips?'<div class="layui-slider-tips"></div>':"")+'<div class="layui-slider-bar" style="background:'+m+"; "+("vertical"===t.type?"height":"width")+":"+p+";"+("vertical"===t.type?"bottom":"left")+":"+(r||0)+';"></div><div class="layui-slider-wrap" style="'+("vertical"===t.type?"bottom":"left")+":"+(r||p)+';"><div class="layui-slider-wrap-btn" style="border: 2px solid '+m+';"></div></div>'+(t.range?'<div class="layui-slider-wrap" style="'+("vertical"===t.type?"bottom":"left")+":"+v+';"><div class="layui-slider-wrap-btn" style="border: 2px solid '+m+';"></div></div>':"")+"</div>",h=i(t.elem),y=h.next("."+s);if(y[0]&&y.remove(),e.elemTemp=i(f),t.range?(e.elemTemp.find("."+o).eq(0).data("value",t.value[0]),e.elemTemp.find("."+o).eq(1).data("value",t.value[1])):e.elemTemp.find("."+o).data("value",t.value),h.html(e.elemTemp),"vertical"===t.type&&e.elemTemp.height(t.height+"px"),t.showstep){for(var g=(t.max-t.min)/t.step,b="",x=1;x<g+1;x++){var T=100*x/g;T<100&&(b+='<div class="layui-slider-step" style="'+("vertical"===t.type?"bottom":"left")+":"+T+'%"></div>')}e.elemTemp.append(b)}if(t.input&&!t.range){var w=i('<div class="layui-slider-input layui-input"><div class="layui-slider-input-txt"><input type="text" class="layui-input"></div><div class="layui-slider-input-btn"><i class="layui-icon layui-icon-up"></i><i class="layui-icon layui-icon-down"></i></div></div>');h.css("position","relative"),h.append(w),h.find("."+c).children("input").val(t.value),"vertical"===t.type?w.css({left:0,top:-48}):e.elemTemp.css("margin-right",w.outerWidth()+15)}t.disabled?(e.elemTemp.addClass(l),e.elemTemp.find("."+u).addClass(l)):e.slide(),e.elemTemp.find("."+u).on("mouseover",function(){var a="vertical"===t.type?t.height:e.elemTemp[0].offsetWidth,n=e.elemTemp.find("."+o),l="vertical"===t.type?a-i(this).parent()[0].offsetTop-n.height():i(this).parent()[0].offsetLeft,s=l/a*100,r=i(this).parent().data("value"),u=t.setTips?t.setTips(r):r;e.elemTemp.find("."+d).html(u),"vertical"===t.type?e.elemTemp.find("."+d).css({bottom:s+"%","margin-bottom":"20px",display:"inline-block"}):e.elemTemp.find("."+d).css({left:s+"%",display:"inline-block"})}).on("mouseout",function(){e.elemTemp.find("."+d).css("display","none")})},f.prototype.slide=function(e,t,a){var n=this,l=n.config,s=n.elemTemp,f=function(){return"vertical"===l.type?l.height:s[0].offsetWidth},h=s.find("."+o),y=s.next("."+v),g=y.children("."+c).children("input").val(),b=100/((l.max-l.min)/Math.ceil(l.step)),x=function(e,i){e=Math.ceil(e)*b>100?Math.ceil(e)*b:Math.round(e)*b,e=e>100?100:e,h.eq(i).css("vertical"===l.type?"bottom":"left",e+"%");var t=T(h[0].offsetLeft),a=l.range?T(h[1].offsetLeft):0;"vertical"===l.type?(s.find("."+d).css({bottom:e+"%","margin-bottom":"20px"}),t=T(f()-h[0].offsetTop-h.height()),a=l.range?T(f()-h[1].offsetTop-h.height()):0):s.find("."+d).css("left",e+"%"),t=t>100?100:t,a=a>100?100:a;var n=Math.min(t,a),o=Math.abs(t-a);"vertical"===l.type?s.find("."+r).css({height:o+"%",bottom:n+"%"}):s.find("."+r).css({width:o+"%",left:n+"%"});var u=l.min+Math.round((l.max-l.min)*e/100);if(g=u,y.children("."+c).children("input").val(g),h.eq(i).data("value",u),s.find("."+d).html(l.setTips?l.setTips(u):u),l.range){var v=[h.eq(0).data("value"),h.eq(1).data("value")];v[0]>v[1]&&v.reverse()}l.change&&l.change(l.range?v:u)},T=function(e){var i=e/f()*100/b,t=Math.round(i)*b;return e==f()&&(t=Math.ceil(i)*b),t},w=i(['<div class="layui-auxiliar-moving" id="LAY-slider-moving"></div'].join("")),M=function(e,t){var a=function(){t&&t(),w.remove()};i("#LAY-slider-moving")[0]||i("body").append(w),w.on("mousemove",e),w.on("mouseup",a).on("mouseleave",a)};if("set"===e)return x(t,a);s.find("."+u).each(function(e){var t=i(this);t.on("mousedown",function(i){i=i||window.event;var a=t.parent()[0].offsetLeft,n=i.clientX;"vertical"===l.type&&(a=f()-t.parent()[0].offsetTop-h.height(),n=i.clientY);var r=function(i){i=i||window.event;var r=a+("vertical"===l.type?n-i.clientY:i.clientX-n);r<0&&(r=0),r>f()&&(r=f());var o=r/f()*100/b;x(o,e),t.addClass(m),s.find("."+d).show(),i.preventDefault()},o=function(){t.removeClass(m),s.find("."+d).hide()};M(r,o)})}),s.on("click",function(e){var t=i("."+u);if(!t.is(event.target)&&0===t.has(event.target).length&&t.length){var a,n="vertical"===l.type?f()-e.clientY+i(this).offset().top:e.clientX-i(this).offset().left;n<0&&(n=0),n>f()&&(n=f());var s=n/f()*100/b;a=l.range?"vertical"===l.type?Math.abs(n-parseInt(i(h[0]).css("bottom")))>Math.abs(n-parseInt(i(h[1]).css("bottom")))?1:0:Math.abs(n-h[0].offsetLeft)>Math.abs(n-h[1].offsetLeft)?1:0:0,x(s,a),e.preventDefault()}}),y.children("."+p).children("i").each(function(e){i(this).on("click",function(){g=y.children("."+c).children("input").val(),g=1==e?g-l.step<l.min?l.min:Number(g)-l.step:Number(g)+l.step>l.max?l.max:Number(g)+l.step;var i=(g-l.min)/(l.max-l.min)*100/b;x(i,0)})});var q=function(){var e=this.value;e=isNaN(e)?0:e,e=e<l.min?l.min:e,e=e>l.max?l.max:e,this.value=e;var i=(e-l.min)/(l.max-l.min)*100/b;x(i,0)};y.children("."+c).children("input").on("keydown",function(e){13===e.keyCode&&(e.preventDefault(),q.call(this))}).on("change",q)},f.prototype.events=function(){var e=this;e.config},t.render=function(e){var i=new f(e);return a.call(i)},e(n,t)});layui.define("jquery",function(e){"use strict";var i=layui.jquery,o={config:{},index:layui.colorpicker?layui.colorpicker.index+1e4:0,set:function(e){var o=this;return o.config=i.extend({},o.config,e),o},on:function(e,i){return layui.onevent.call(this,"colorpicker",e,i)}},r=function(){var e=this,i=e.config;return{config:i}},t="colorpicker",n="layui-show",l="layui-colorpicker",c=".layui-colorpicker-main",a="layui-icon-down",s="layui-icon-close",f="layui-colorpicker-trigger-span",d="layui-colorpicker-trigger-i",u="layui-colorpicker-side",p="layui-colorpicker-side-slider",g="layui-colorpicker-basis",v="layui-colorpicker-alpha-bgcolor",h="layui-colorpicker-alpha-slider",m="layui-colorpicker-basis-cursor",b="layui-colorpicker-main-input",k=function(e){var i={h:0,s:0,b:0},o=Math.min(e.r,e.g,e.b),r=Math.max(e.r,e.g,e.b),t=r-o;return i.b=r,i.s=0!=r?255*t/r:0,0!=i.s?e.r==r?i.h=(e.g-e.b)/t:e.g==r?i.h=2+(e.b-e.r)/t:i.h=4+(e.r-e.g)/t:i.h=-1,r==o&&(i.h=0),i.h*=60,i.h<0&&(i.h+=360),i.s*=100/255,i.b*=100/255,i},y=function(e){var e=e.indexOf("#")>-1?e.substring(1):e;if(3==e.length){var i=e.split("");e=i[0]+i[0]+i[1]+i[1]+i[2]+i[2]}e=parseInt(e,16);var o={r:e>>16,g:(65280&e)>>8,b:255&e};return k(o)},x=function(e){var i={},o=e.h,r=255*e.s/100,t=255*e.b/100;if(0==r)i.r=i.g=i.b=t;else{var n=t,l=(255-r)*t/255,c=(n-l)*(o%60)/60;360==o&&(o=0),o<60?(i.r=n,i.b=l,i.g=l+c):o<120?(i.g=n,i.b=l,i.r=n-c):o<180?(i.g=n,i.r=l,i.b=l+c):o<240?(i.b=n,i.r=l,i.g=n-c):o<300?(i.b=n,i.g=l,i.r=l+c):o<360?(i.r=n,i.g=l,i.b=n-c):(i.r=0,i.g=0,i.b=0)}return{r:Math.round(i.r),g:Math.round(i.g),b:Math.round(i.b)}},C=function(e){var o=x(e),r=[o.r.toString(16),o.g.toString(16),o.b.toString(16)];return i.each(r,function(e,i){1==i.length&&(r[e]="0"+i)}),r.join("")},P=function(e){var i=/[0-9]{1,3}/g,o=e.match(i)||[];return{r:o[0],g:o[1],b:o[2]}},B=i(window),w=i(document),D=function(e){var r=this;r.index=++o.index,r.config=i.extend({},r.config,o.config,e),r.render()};D.prototype.config={color:"",size:null,alpha:!1,format:"hex",predefine:!1,colors:["#009688","#5FB878","#1E9FFF","#FF5722","#FFB800","#01AAED","#999","#c00","#ff8c00","#ffd700","#90ee90","#00ced1","#1e90ff","#c71585","rgb(0, 186, 189)","rgb(255, 120, 0)","rgb(250, 212, 0)","#393D49","rgba(0,0,0,.5)","rgba(255, 69, 0, 0.68)","rgba(144, 240, 144, 0.5)","rgba(31, 147, 255, 0.73)"]},D.prototype.render=function(){var e=this,o=e.config,r=i(['<div class="layui-unselect layui-colorpicker">',"<span "+("rgb"==o.format&&o.alpha?'class="layui-colorpicker-trigger-bgcolor"':"")+">",'<span class="layui-colorpicker-trigger-span" ','lay-type="'+("rgb"==o.format?o.alpha?"rgba":"torgb":"")+'" ','style="'+function(){var e="";return o.color?(e=o.color,(o.color.match(/[0-9]{1,3}/g)||[]).length>3&&(o.alpha&&"rgb"==o.format||(e="#"+C(k(P(o.color))))),"background: "+e):e}()+'">','<i class="layui-icon layui-colorpicker-trigger-i '+(o.color?a:s)+'"></i>',"</span>","</span>","</div>"].join("")),t=i(o.elem);o.size&&r.addClass("layui-colorpicker-"+o.size),t.addClass("layui-inline").html(e.elemColorBox=r),e.color=e.elemColorBox.find("."+f)[0].style.background,e.events()},D.prototype.renderPicker=function(){var e=this,o=e.config,r=e.elemColorBox[0],t=e.elemPicker=i(['<div id="layui-colorpicker'+e.index+'" data-index="'+e.index+'" class="layui-anim layui-anim-upbit layui-colorpicker-main">','<div class="layui-colorpicker-main-wrapper">','<div class="layui-colorpicker-basis">','<div class="layui-colorpicker-basis-white"></div>','<div class="layui-colorpicker-basis-black"></div>','<div class="layui-colorpicker-basis-cursor"></div>',"</div>",'<div class="layui-colorpicker-side">','<div class="layui-colorpicker-side-slider"></div>',"</div>","</div>",'<div class="layui-colorpicker-main-alpha '+(o.alpha?n:"")+'">','<div class="layui-colorpicker-alpha-bgcolor">','<div class="layui-colorpicker-alpha-slider"></div>',"</div>","</div>",function(){if(o.predefine){var e=['<div class="layui-colorpicker-main-pre">'];return layui.each(o.colors,function(i,o){e.push(['<div class="layui-colorpicker-pre'+((o.match(/[0-9]{1,3}/g)||[]).length>3?" layui-colorpicker-pre-isalpha":"")+'">','<div style="background:'+o+'"></div>',"</div>"].join(""))}),e.push("</div>"),e.join("")}return""}(),'<div class="layui-colorpicker-main-input">','<div class="layui-inline">','<input type="text" class="layui-input">',"</div>",'<div class="layui-btn-container">','<button class="layui-btn layui-btn-primary layui-btn-sm" colorpicker-events="clear">\u6e05\u7a7a</button>','<button class="layui-btn layui-btn-sm" colorpicker-events="confirm">\u786e\u5b9a</button>',"</div","</div>","</div>"].join(""));e.elemColorBox.find("."+f)[0];i(c)[0]&&i(c).data("index")==e.index?e.removePicker(D.thisElemInd):(e.removePicker(D.thisElemInd),i("body").append(t)),D.thisElemInd=e.index,D.thisColor=r.style.background,e.position(),e.pickerEvents()},D.prototype.removePicker=function(e){var o=this;o.config;return i("#layui-colorpicker"+(e||o.index)).remove(),o},D.prototype.position=function(){var e=this,i=e.config,o=e.bindElem||e.elemColorBox[0],r=e.elemPicker[0],t=o.getBoundingClientRect(),n=r.offsetWidth,l=r.offsetHeight,c=function(e){return e=e?"scrollLeft":"scrollTop",document.body[e]|document.documentElement[e]},a=function(e){return document.documentElement[e?"clientWidth":"clientHeight"]},s=5,f=t.left,d=t.bottom;f-=(n-o.offsetWidth)/2,d+=s,f+n+s>a("width")?f=a("width")-n-s:f<s&&(f=s),d+l+s>a()&&(d=t.top>l?t.top-l:a()-l,d-=2*s),i.position&&(r.style.position=i.position),r.style.left=f+("fixed"===i.position?0:c(1))+"px",r.style.top=d+("fixed"===i.position?0:c())+"px"},D.prototype.val=function(){var e=this,i=(e.config,e.elemColorBox.find("."+f)),o=e.elemPicker.find("."+b),r=i[0],t=r.style.backgroundColor;if(t){var n=k(P(t)),l=i.attr("lay-type");if(e.select(n.h,n.s,n.b),"torgb"===l&&o.find("input").val(t),"rgba"===l){var c=P(t);if(3==(t.match(/[0-9]{1,3}/g)||[]).length)o.find("input").val("rgba("+c.r+", "+c.g+", "+c.b+", 1)"),e.elemPicker.find("."+h).css("left",280);else{o.find("input").val(t);var a=280*t.slice(t.lastIndexOf(",")+1,t.length-1);e.elemPicker.find("."+h).css("left",a)}e.elemPicker.find("."+v)[0].style.background="linear-gradient(to right, rgba("+c.r+", "+c.g+", "+c.b+", 0), rgb("+c.r+", "+c.g+", "+c.b+"))"}}else e.select(0,100,100),o.find("input").val(""),e.elemPicker.find("."+v)[0].style.background="",e.elemPicker.find("."+h).css("left",280)},D.prototype.side=function(){var e=this,o=e.config,r=e.elemColorBox.find("."+f),t=r.attr("lay-type"),n=e.elemPicker.find("."+u),l=e.elemPicker.find("."+p),c=e.elemPicker.find("."+g),y=e.elemPicker.find("."+m),C=e.elemPicker.find("."+v),w=e.elemPicker.find("."+h),D=l[0].offsetTop/180*360,E=100-(y[0].offsetTop+3)/180*100,H=(y[0].offsetLeft+3)/260*100,W=Math.round(w[0].offsetLeft/280*100)/100,j=e.elemColorBox.find("."+d),F=e.elemPicker.find(".layui-colorpicker-pre").children("div"),L=function(i,n,l,c){e.select(i,n,l);var f=x({h:i,s:n,b:l});if(j.addClass(a).removeClass(s),r[0].style.background="rgb("+f.r+", "+f.g+", "+f.b+")","torgb"===t&&e.elemPicker.find("."+b).find("input").val("rgb("+f.r+", "+f.g+", "+f.b+")"),"rgba"===t){var d=0;d=280*c,w.css("left",d),e.elemPicker.find("."+b).find("input").val("rgba("+f.r+", "+f.g+", "+f.b+", "+c+")"),r[0].style.background="rgba("+f.r+", "+f.g+", "+f.b+", "+c+")",C[0].style.background="linear-gradient(to right, rgba("+f.r+", "+f.g+", "+f.b+", 0), rgb("+f.r+", "+f.g+", "+f.b+"))"}o.change&&o.change(e.elemPicker.find("."+b).find("input").val())},M=i(['<div class="layui-auxiliar-moving" id="LAY-colorpicker-moving"></div'].join("")),Y=function(e){i("#LAY-colorpicker-moving")[0]||i("body").append(M),M.on("mousemove",e),M.on("mouseup",function(){M.remove()}).on("mouseleave",function(){M.remove()})};l.on("mousedown",function(e){var i=this.offsetTop,o=e.clientY,r=function(e){var r=i+(e.clientY-o),t=n[0].offsetHeight;r<0&&(r=0),r>t&&(r=t);var l=r/180*360;D=l,L(l,H,E,W),e.preventDefault()};Y(r),e.preventDefault()}),n.on("click",function(e){var o=e.clientY-i(this).offset().top;o<0&&(o=0),o>this.offsetHeight&&(o=this.offsetHeight);var r=o/180*360;D=r,L(r,H,E,W),e.preventDefault()}),y.on("mousedown",function(e){var i=this.offsetTop,o=this.offsetLeft,r=e.clientY,t=e.clientX,n=function(e){var n=i+(e.clientY-r),l=o+(e.clientX-t),a=c[0].offsetHeight-3,s=c[0].offsetWidth-3;n<-3&&(n=-3),n>a&&(n=a),l<-3&&(l=-3),l>s&&(l=s);var f=(l+3)/260*100,d=100-(n+3)/180*100;E=d,H=f,L(D,f,d,W),e.preventDefault()};layui.stope(e),Y(n),e.preventDefault()}),c.on("mousedown",function(e){var o=e.clientY-i(this).offset().top-3+B.scrollTop(),r=e.clientX-i(this).offset().left-3+B.scrollLeft();o<-3&&(o=-3),o>this.offsetHeight-3&&(o=this.offsetHeight-3),r<-3&&(r=-3),r>this.offsetWidth-3&&(r=this.offsetWidth-3);var t=(r+3)/260*100,n=100-(o+3)/180*100;E=n,H=t,L(D,t,n,W),e.preventDefault(),y.trigger(e,"mousedown")}),w.on("mousedown",function(e){var i=this.offsetLeft,o=e.clientX,r=function(e){var r=i+(e.clientX-o),t=C[0].offsetWidth;r<0&&(r=0),r>t&&(r=t);var n=Math.round(r/280*100)/100;W=n,L(D,H,E,n),e.preventDefault()};Y(r),e.preventDefault()}),C.on("click",function(e){var o=e.clientX-i(this).offset().left;o<0&&(o=0),o>this.offsetWidth&&(o=this.offsetWidth);var r=Math.round(o/280*100)/100;W=r,L(D,H,E,r),e.preventDefault()}),F.each(function(){i(this).on("click",function(){i(this).parent(".layui-colorpicker-pre").addClass("selected").siblings().removeClass("selected");var e,o=this.style.backgroundColor,r=k(P(o)),t=o.slice(o.lastIndexOf(",")+1,o.length-1);D=r.h,H=r.s,E=r.b,3==(o.match(/[0-9]{1,3}/g)||[]).length&&(t=1),W=t,e=280*t,L(r.h,r.s,r.b,t)})})},D.prototype.select=function(e,i,o,r){var t=this,n=(t.config,C({h:e,s:100,b:100})),l=C({h:e,s:i,b:o}),c=e/360*180,a=180-o/100*180-3,s=i/100*260-3;t.elemPicker.find("."+p).css("top",c),t.elemPicker.find("."+g)[0].style.background="#"+n,t.elemPicker.find("."+m).css({top:a,left:s}),"change"!==r&&t.elemPicker.find("."+b).find("input").val("#"+l)},D.prototype.pickerEvents=function(){var e=this,o=e.config,r=e.elemColorBox.find("."+f),t=e.elemPicker.find("."+b+" input"),n={clear:function(i){r[0].style.background="",e.elemColorBox.find("."+d).removeClass(a).addClass(s),e.color="",o.done&&o.done(""),e.removePicker()},confirm:function(i,n){var l=t.val(),c=l,f={};if(l.indexOf(",")>-1){if(f=k(P(l)),e.select(f.h,f.s,f.b),r[0].style.background=c="#"+C(f),(l.match(/[0-9]{1,3}/g)||[]).length>3&&"rgba"===r.attr("lay-type")){var u=280*l.slice(l.lastIndexOf(",")+1,l.length-1);e.elemPicker.find("."+h).css("left",u),r[0].style.background=l,c=l}}else f=y(l),r[0].style.background=c="#"+C(f),e.elemColorBox.find("."+d).removeClass(s).addClass(a);return"change"===n?(e.select(f.h,f.s,f.b,n),void(o.change&&o.change(c))):(e.color=l,o.done&&o.done(l),void e.removePicker())}};e.elemPicker.on("click","*[colorpicker-events]",function(){var e=i(this),o=e.attr("colorpicker-events");n[o]&&n[o].call(this,e)}),t.on("keyup",function(e){var o=i(this);n.confirm.call(this,o,13===e.keyCode?null:"change")})},D.prototype.events=function(){var e=this,o=e.config,r=e.elemColorBox.find("."+f);e.elemColorBox.on("click",function(){e.renderPicker(),i(c)[0]&&(e.val(),e.side())}),o.elem[0]&&!e.elemColorBox[0].eventHandler&&(w.on("click",function(o){if(!i(o.target).hasClass(l)&&!i(o.target).parents("."+l)[0]&&!i(o.target).hasClass(c.replace(/\./g,""))&&!i(o.target).parents(c)[0]&&e.elemPicker){if(e.color){var t=k(P(e.color));e.select(t.h,t.s,t.b)}else e.elemColorBox.find("."+d).removeClass(a).addClass(s);r[0].style.background=e.color||"",e.removePicker()}}),B.on("resize",function(){return!(!e.elemPicker||!i(c)[0])&&void e.position()}),e.elemColorBox[0].eventHandler=!0)},o.render=function(e){var i=new D(e);return r.call(i)},e(t,o)});layui.define("layer",function(e){"use strict";var t=layui.$,i=layui.layer,a=layui.hint(),n=layui.device(),l="form",r=".layui-form",s="layui-this",o="layui-hide",c="layui-disabled",u=function(){this.config={verify:{required:[/[\S]+/,"\u5fc5\u586b\u9879\u4e0d\u80fd\u4e3a\u7a7a"],phone:[/^1\d{10}$/,"\u8bf7\u8f93\u5165\u6b63\u786e\u7684\u624b\u673a\u53f7"],email:[/^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/,"\u90ae\u7bb1\u683c\u5f0f\u4e0d\u6b63\u786e"],url:[/^(#|(http(s?)):\/\/|\/\/)[^\s]+\.[^\s]+$/,"\u94fe\u63a5\u683c\u5f0f\u4e0d\u6b63\u786e"],number:function(e){if(!e||isNaN(e))return"\u53ea\u80fd\u586b\u5199\u6570\u5b57"},date:[/^(\d{4})[-\/](\d{1}|0\d{1}|1[0-2])([-\/](\d{1}|0\d{1}|[1-2][0-9]|3[0-1]))*$/,"\u65e5\u671f\u683c\u5f0f\u4e0d\u6b63\u786e"],identity:[/(^\d{15}$)|(^\d{17}(x|X|\d)$)/,"\u8bf7\u8f93\u5165\u6b63\u786e\u7684\u8eab\u4efd\u8bc1\u53f7"]}}};u.prototype.set=function(e){var i=this;return t.extend(!0,i.config,e),i},u.prototype.verify=function(e){var i=this;return t.extend(!0,i.config.verify,e),i},u.prototype.on=function(e,t){return layui.onevent.call(this,l,e,t)},u.prototype.val=function(e,i){var a=this,n=t(r+'[lay-filter="'+e+'"]');return n.each(function(e,a){var n=t(this);layui.each(i,function(e,t){var i,a=n.find('[name="'+e+'"]');a[0]&&(i=a[0].type,"checkbox"===i?a[0].checked=t:"radio"===i?a.each(function(){this.value==t&&(this.checked=!0)}):a.val(t))})}),f.render(null,e),a.getValue(e)},u.prototype.getValue=function(e,i){i=i||t(r+'[lay-filter="'+e+'"]').eq(0);var a={},n={},l=i.find("input,select,textarea");return layui.each(l,function(e,i){var l;t(this);if(i.name=(i.name||"").replace(/^\s*|\s*&/,""),i.name){if(/^.*\[\]$/.test(i.name)){var r=i.name.match(/^(.*)\[\]$/g)[0];a[r]=0|a[r],l=i.name.replace(/^(.*)\[\]$/,"$1["+a[r]++ +"]")}/^checkbox|radio$/.test(i.type)&&!i.checked||(n[l||i.name]=i.value)}}),n},u.prototype.render=function(e,i){var n=this,u=t(r+function(){return i?'[lay-filter="'+i+'"]':""}()),d={select:function(){var e,i="\u8bf7\u9009\u62e9",a="layui-form-select",n="layui-select-title",r="layui-select-none",d="",f=u.find("select"),v=function(i,l){t(i.target).parent().hasClass(n)&&!l||(t("."+a).removeClass(a+"ed "+a+"up"),e&&d&&e.val(d)),e=null},y=function(i,u,f){var y,p=t(this),m=i.find("."+n),k=m.find("input"),g=i.find("dl"),x=g.children("dd"),b=this.selectedIndex;if(!u){var C=function(){var e=i.offset().top+i.outerHeight()+5-h.scrollTop(),t=g.outerHeight();b=p[0].selectedIndex,i.addClass(a+"ed"),x.removeClass(o),y=null,x.eq(b).addClass(s).siblings().removeClass(s),e+t>h.height()&&e>=t&&i.addClass(a+"up"),$()},w=function(e){i.removeClass(a+"ed "+a+"up"),k.blur(),y=null,e||T(k.val(),function(e){var i=p[0].selectedIndex;e&&(d=t(p[0].options[i]).html(),0===i&&d===k.attr("placeholder")&&(d=""),k.val(d||""))})},$=function(){var e=g.children("dd."+s);if(e[0]){var t=e.position().top,i=g.height(),a=e.height();t>i&&g.scrollTop(t+g.scrollTop()-i+a-5),t<0&&g.scrollTop(t+g.scrollTop()-5)}};m.on("click",function(e){i.hasClass(a+"ed")?w():(v(e,!0),C()),g.find("."+r).remove()}),m.find(".layui-edge").on("click",function(){k.focus()}),k.on("keyup",function(e){var t=e.keyCode;9===t&&C()}).on("keydown",function(e){var t=e.keyCode;9===t&&w();var i=function(t,a){var n,l;e.preventDefault();var r=function(){var e=g.children("dd."+s);if(g.children("dd."+o)[0]&&"next"===t){var i=g.children("dd:not(."+o+",."+c+")"),n=i.eq(0).index();if(n>=0&&n<e.index()&&!i.hasClass(s))return i.eq(0).prev()[0]?i.eq(0).prev():g.children(":last")}return a&&a[0]?a:y&&y[0]?y:e}();return l=r[t](),n=r[t]("dd:not(."+o+")"),l[0]?(y=r[t](),n[0]&&!n.hasClass(c)||!y[0]?(n.addClass(s).siblings().removeClass(s),void $()):i(t,y)):y=null};38===t&&i("prev"),40===t&&i("next"),13===t&&(e.preventDefault(),g.children("dd."+s).trigger("click"))});var T=function(e,i,a){var n=0;layui.each(x,function(){var i=t(this),l=i.text(),r=l.indexOf(e)===-1;(""===e||"blur"===a?e!==l:r)&&n++,"keyup"===a&&i[r?"addClass":"removeClass"](o)});var l=n===x.length;return i(l),l},q=function(e){var t=this.value,i=e.keyCode;return 9!==i&&13!==i&&37!==i&&38!==i&&39!==i&&40!==i&&(T(t,function(e){e?g.find("."+r)[0]||g.append('<p class="'+r+'">\u65e0\u5339\u914d\u9879</p>'):g.find("."+r).remove()},"keyup"),""===t&&g.find("."+r).remove(),void $())};f&&k.on("keyup",q).on("blur",function(i){var a=p[0].selectedIndex;e=k,d=t(p[0].options[a]).html(),0===a&&d===k.attr("placeholder")&&(d=""),setTimeout(function(){T(k.val(),function(e){d||k.val("")},"blur")},200)}),x.on("click",function(){var e=t(this),a=e.attr("lay-value"),n=p.attr("lay-filter");return!e.hasClass(c)&&(e.hasClass("layui-select-tips")?k.val(""):(k.val(e.text()),e.addClass(s)),e.siblings().removeClass(s),p.val(a).removeClass("layui-form-danger"),layui.event.call(this,l,"select("+n+")",{elem:p[0],value:a,othis:i}),w(!0),!1)}),i.find("dl>dt").on("click",function(e){return!1}),t(document).off("click",v).on("click",v)}};f.each(function(e,l){var r=t(this),o=r.next("."+a),u=this.disabled,d=l.value,f=t(l.options[l.selectedIndex]),v=l.options[0];if("string"==typeof r.attr("lay-ignore"))return r.show();var h="string"==typeof r.attr("lay-search"),p=v?v.value?i:v.innerHTML||i:i,m=t(['<div class="'+(h?"":"layui-unselect ")+a,(u?" layui-select-disabled":"")+'">','<div class="'+n+'">','<input type="text" placeholder="'+p+'" '+('value="'+(d?f.html():"")+'"')+(!u&&h?"":" readonly")+' class="layui-input'+(h?"":" layui-unselect")+(u?" "+c:"")+'">','<i class="layui-edge"></i></div>','<dl class="layui-anim layui-anim-upbit'+(r.find("optgroup")[0]?" layui-select-group":"")+'">',function(e){var t=[];return layui.each(e,function(e,a){0!==e||a.value?"optgroup"===a.tagName.toLowerCase()?t.push("<dt>"+a.label+"</dt>"):t.push('<dd lay-value="'+a.value+'" class="'+(d===a.value?s:"")+(a.disabled?" "+c:"")+'">'+a.innerHTML+"</dd>"):t.push('<dd lay-value="" class="layui-select-tips">'+(a.innerHTML||i)+"</dd>")}),0===t.length&&t.push('<dd lay-value="" class="'+c+'">\u6ca1\u6709\u9009\u9879</dd>'),t.join("")}(r.find("*"))+"</dl>","</div>"].join(""));o[0]&&o.remove(),r.after(m),y.call(this,m,u,h)})},checkbox:function(){var e={checkbox:["layui-form-checkbox","layui-form-checked","checkbox"],_switch:["layui-form-switch","layui-form-onswitch","switch"]},i=u.find("input[type=checkbox]"),a=function(e,i){var a=t(this);e.on("click",function(){var t=a.attr("lay-filter"),n=(a.attr("lay-text")||"").split("|");a[0].disabled||(a[0].checked?(a[0].checked=!1,e.removeClass(i[1]).find("em").text(n[1])):(a[0].checked=!0,e.addClass(i[1]).find("em").text(n[0])),layui.event.call(a[0],l,i[2]+"("+t+")",{elem:a[0],value:a[0].value,othis:e}))})};i.each(function(i,n){var l=t(this),r=l.attr("lay-skin"),s=(l.attr("lay-text")||"").split("|"),o=this.disabled;"switch"===r&&(r="_"+r);var u=e[r]||e.checkbox;if("string"==typeof l.attr("lay-ignore"))return l.show();var d=l.next("."+u[0]),f=t(['<div class="layui-unselect '+u[0],n.checked?" "+u[1]:"",o?" layui-checkbox-disbaled "+c:"",'"',r?' lay-skin="'+r+'"':"",">",function(){var e=n.title.replace(/\s/g,""),t={checkbox:[e?"<span>"+n.title+"</span>":"",'<i class="layui-icon layui-icon-ok"></i>'].join(""),_switch:"<em>"+((n.checked?s[0]:s[1])||"")+"</em><i></i>"};return t[r]||t.checkbox}(),"</div>"].join(""));d[0]&&d.remove(),l.after(f),a.call(this,f,u)})},radio:function(){var e="layui-form-radio",i=["&#xe643;","&#xe63f;"],a=u.find("input[type=radio]"),n=function(a){var n=t(this),s="layui-anim-scaleSpring";a.on("click",function(){var o=n[0].name,c=n.parents(r),u=n.attr("lay-filter"),d=c.find("input[name="+o.replace(/(\.|#|\[|\])/g,"\\$1")+"]");n[0].disabled||(layui.each(d,function(){var a=t(this).next("."+e);this.checked=!1,a.removeClass(e+"ed"),a.find(".layui-icon").removeClass(s).html(i[1])}),n[0].checked=!0,a.addClass(e+"ed"),a.find(".layui-icon").addClass(s).html(i[0]),layui.event.call(n[0],l,"radio("+u+")",{elem:n[0],value:n[0].value,othis:a}))})};a.each(function(a,l){var r=t(this),s=r.next("."+e),o=this.disabled;if("string"==typeof r.attr("lay-ignore"))return r.show();s[0]&&s.remove();var u=t(['<div class="layui-unselect '+e,l.checked?" "+e+"ed":"",(o?" layui-radio-disbaled "+c:"")+'">','<i class="layui-anim layui-icon">'+i[l.checked?0:1]+"</i>","<div>"+function(){var e=l.title||"";return"string"==typeof r.next().attr("lay-radio")&&(e=r.next().html()),e}()+"</div>","</div>"].join(""));r.after(u),n.call(this,u)})}};return e?d[e]?d[e]():a.error("\u4e0d\u652f\u6301\u7684"+e+"\u8868\u5355\u6e32\u67d3"):layui.each(d,function(e,t){t()}),n};var d=function(){var e=null,a=f.config.verify,s="layui-form-danger",o={},c=t(this),u=c.parents(r).eq(0),d=u.find("*[lay-verify]"),v=c.parents("form")[0],h=c.attr("lay-filter");return layui.each(d,function(l,r){var o=t(this),c=o.attr("lay-verify").split("|"),u=o.attr("lay-verType"),d=o.val();if(o.removeClass(s),layui.each(c,function(t,l){var c,f="",v="function"==typeof a[l];if(a[l]){var c=v?f=a[l](d,r):!a[l][0].test(d);if(f=f||a[l][1],"required"===l&&(f=o.attr("lay-reqText")||f),c)return"tips"===u?i.tips(f,function(){return"string"==typeof o.attr("lay-ignore")||"select"!==r.tagName.toLowerCase()&&!/^checkbox|radio$/.test(r.type)?o:o.next()}(),{tips:1}):"alert"===u?i.alert(f,{title:"\u63d0\u793a",shadeClose:!0}):/\bstring|number\b/.test(typeof f)&&i.msg(f,{icon:5,shift:6}),n.android||n.ios||setTimeout(function(){r.focus()},7),o.addClass(s),e=!0}}),e)return e}),!e&&(o=f.getValue(null,u),layui.event.call(this,l,"submit("+h+")",{elem:this,form:v,field:o}))},f=new u,v=t(document),h=t(window);t(function(){f.render()}),v.on("reset",r,function(){var e=t(this).attr("lay-filter");setTimeout(function(){f.render(null,e)},50)}),v.on("submit",r,d).on("click","*[lay-submit]",d),e(l,f)});layui.define("form",function(e){"use strict";var i=layui.$,a=layui.form,n=layui.layer,t="tree",r={config:{},index:layui[t]?layui[t].index+1e4:0,set:function(e){var a=this;return a.config=i.extend({},a.config,e),a},on:function(e,i){return layui.onevent.call(this,t,e,i)}},l=function(){var e=this,i=e.config,a=i.id||e.index;return l.that[a]=e,l.config[a]=i,{config:i,reload:function(i){e.reload.call(e,i)},getChecked:function(){return e.getChecked.call(e)},setChecked:function(i){return e.setChecked.call(e,i)}}},c="layui-hide",d="layui-disabled",s="layui-tree-set",o="layui-tree-iconClick",h="layui-icon-addition",u="layui-icon-subtraction",p="layui-tree-entry",f="layui-tree-main",y="layui-tree-txt",v="layui-tree-pack",C="layui-tree-spread",k="layui-tree-setLineShort",m="layui-tree-showLine",x="layui-tree-lineExtend",b=function(e){var a=this;a.index=++r.index,a.config=i.extend({},a.config,r.config,e),a.render()};b.prototype.config={data:[],showCheckbox:!1,showLine:!0,accordion:!1,onlyIconControl:!1,isJump:!1,edit:!1,text:{defaultNodeName:"\u672a\u547d\u540d",none:"\u65e0\u6570\u636e"}},b.prototype.reload=function(e){var a=this;layui.each(e,function(e,i){i.constructor===Array&&delete a.config[e]}),a.config=i.extend(!0,{},a.config,e),a.render()},b.prototype.render=function(){var e=this,a=e.config;e.checkids=[];var n=i('<div class="layui-tree'+(a.showCheckbox?" layui-form":"")+(a.showLine?" layui-tree-line":"")+'" lay-filter="LAY-tree-'+e.index+'"></div>');e.tree(n);var t=a.elem=i(a.elem);if(t[0]){if(e.key=a.id||e.index,e.elem=n,e.elemNone=i('<div class="layui-tree-emptyText">'+a.text.none+"</div>"),t.html(e.elem),0==e.elem.find(".layui-tree-set").length)return e.elem.append(e.elemNone);a.showCheckbox&&e.renderForm("checkbox"),e.elem.find(".layui-tree-set").each(function(){var e=i(this);e.parent(".layui-tree-pack")[0]||e.addClass("layui-tree-setHide"),!e.next()[0]&&e.parents(".layui-tree-pack").eq(1).hasClass("layui-tree-lineExtend")&&e.addClass(k),e.next()[0]||e.parents(".layui-tree-set").eq(0).next()[0]||e.addClass(k)}),e.events()}},b.prototype.renderForm=function(e){a.render(e,"LAY-tree-"+this.index)},b.prototype.tree=function(e,a){var n=this,t=n.config,r=a||t.data;layui.each(r,function(a,r){var l=r.children&&r.children.length>0,o=i('<div class="layui-tree-pack" '+(r.spread?'style="display: block;"':"")+"></div>"),h=i(['<div data-id="'+r.id+'" class="layui-tree-set'+(r.spread?" layui-tree-spread":"")+(r.checked?" layui-tree-checkedFirst":"")+'">','<div class="layui-tree-entry">','<div class="layui-tree-main">',function(){return t.showLine?l?'<span class="layui-tree-iconClick layui-tree-icon"><i class="layui-icon '+(r.spread?"layui-icon-subtraction":"layui-icon-addition")+'"></i></span>':'<span class="layui-tree-iconClick"><i class="layui-icon layui-icon-file"></i></span>':'<span class="layui-tree-iconClick"><i class="layui-tree-iconArrow '+(l?"":c)+'"></i></span>'}(),function(){return t.showCheckbox?'<input type="checkbox" name="'+(r.field||"layuiTreeCheck_"+r.id)+'" same="layuiTreeCheck" lay-skin="primary" '+(r.disabled?"disabled":"")+' value="'+r.id+'">':""}(),function(){return t.isJump&&r.href?'<a href="'+r.href+'" target="_blank" class="'+y+'">'+(r.title||r.label||t.text.defaultNodeName)+"</a>":'<span class="'+y+(r.disabled?" "+d:"")+'">'+(r.title||r.label||t.text.defaultNodeName)+"</span>"}(),"</div>",function(){if(!t.edit)return"";var e={add:'<i class="layui-icon layui-icon-add-1"  data-type="add"></i>',update:'<i class="layui-icon layui-icon-edit" data-type="update"></i>',del:'<i class="layui-icon layui-icon-delete" data-type="del"></i>'},i=['<div class="layui-btn-group layui-tree-btnGroup">'];return t.edit===!0&&(t.edit=["update","del"]),"object"==typeof t.edit?(layui.each(t.edit,function(a,n){i.push(e[n]||"")}),i.join("")+"</div>"):void 0}(),"</div></div>"].join(""));l&&(h.append(o),n.tree(o,r.children)),e.append(h),h.prev("."+s)[0]&&h.prev().children(".layui-tree-pack").addClass("layui-tree-showLine"),l||h.parent(".layui-tree-pack").addClass("layui-tree-lineExtend"),n.spread(h,r),t.showCheckbox&&(r.checked&&n.checkids.push(r.id),n.checkClick(h,r)),t.edit&&n.operate(h,r)})},b.prototype.spread=function(e,a){var n=this,t=n.config,r=e.children("."+p),l=r.children("."+f),c=r.find("."+o),k=r.find("."+y),m=t.onlyIconControl?c:l,x="";m.on("click",function(i){var a=e.children("."+v),n=m.children(".layui-icon")[0]?m.children(".layui-icon"):m.find(".layui-tree-icon").children(".layui-icon");if(a[0]){if(e.hasClass(C))e.removeClass(C),a.slideUp(200),n.removeClass(u).addClass(h);else if(e.addClass(C),a.slideDown(200),n.addClass(u).removeClass(h),t.accordion){var r=e.siblings("."+s);r.removeClass(C),r.children("."+v).slideUp(200),r.find(".layui-tree-icon").children(".layui-icon").removeClass(u).addClass(h)}}else x="normal"}),k.on("click",function(){var n=i(this);n.hasClass(d)||(x=e.hasClass(C)?t.onlyIconControl?"open":"close":t.onlyIconControl?"close":"open",t.click&&t.click({elem:e,state:x,data:a}))})},b.prototype.setCheckbox=function(e,i,a){var n=this,t=(n.config,a.prop("checked"));if(!a.prop("disabled")){if("object"==typeof i.children||e.find("."+v)[0]){var r=e.find("."+v).find('input[same="layuiTreeCheck"]');r.each(function(){this.disabled||(this.checked=t)})}var l=function(e){if(e.parents("."+s)[0]){var i,a=e.parent("."+v),n=a.parent(),r=a.prev().find('input[same="layuiTreeCheck"]');t?r.prop("checked",t):(a.find('input[same="layuiTreeCheck"]').each(function(){this.checked&&(i=!0)}),i||r.prop("checked",!1)),l(n)}};l(e),n.renderForm("checkbox")}},b.prototype.checkClick=function(e,a){var n=this,t=n.config,r=e.children("."+p),l=r.children("."+f);l.on("click",'input[same="layuiTreeCheck"]+',function(r){layui.stope(r);var l=i(this).prev(),c=l.prop("checked");l.prop("disabled")||(n.setCheckbox(e,a,l),t.oncheck&&t.oncheck({elem:e,checked:c,data:a}))})},b.prototype.operate=function(e,a){var t=this,r=t.config,l=e.children("."+p),d=l.children("."+f);l.children(".layui-tree-btnGroup").on("click",".layui-icon",function(l){layui.stope(l);var f=i(this).data("type"),b=e.children("."+v),g={data:a,type:f,elem:e};if("add"==f){b[0]||(r.showLine?(d.find("."+o).addClass("layui-tree-icon"),d.find("."+o).children(".layui-icon").addClass(h).removeClass("layui-icon-file")):d.find(".layui-tree-iconArrow").removeClass(c),e.append('<div class="layui-tree-pack"></div>'));var w=r.operate&&r.operate(g),N={};if(N.title=r.text.defaultNodeName,N.id=w,t.tree(e.children("."+v),[N]),r.showLine)if(b[0])b.hasClass(x)||b.addClass(x),e.find("."+v).each(function(){i(this).children("."+s).last().addClass(k)}),b.children("."+s).last().prev().hasClass(k)?b.children("."+s).last().prev().removeClass(k):b.children("."+s).last().removeClass(k),!e.parent("."+v)[0]&&e.next()[0]&&b.children("."+s).last().removeClass(k);else{var T=e.siblings("."+s),L=1,A=e.parent("."+v);layui.each(T,function(e,a){i(a).children("."+v)[0]||(L=0)}),1==L?(T.children("."+v).addClass(m),T.children("."+v).children("."+s).removeClass(k),e.children("."+v).addClass(m),A.removeClass(x),A.children("."+s).last().children("."+v).children("."+s).last().addClass(k)):e.children("."+v).children("."+s).addClass(k)}if(!r.showCheckbox)return;if(d.find('input[same="layuiTreeCheck"]')[0].checked){var I=e.children("."+v).children("."+s).last();I.find('input[same="layuiTreeCheck"]')[0].checked=!0}t.renderForm("checkbox")}else if("update"==f){var F=d.children("."+y).html();d.children("."+y).html(""),d.append('<input type="text" class="layui-tree-editInput">'),d.children(".layui-tree-editInput").val(F).focus();var j=function(e){var i=e.val().trim();i=i?i:r.text.defaultNodeName,e.remove(),d.children("."+y).html(i),g.data.title=i,r.operate&&r.operate(g)};d.children(".layui-tree-editInput").blur(function(){j(i(this))}),d.children(".layui-tree-editInput").on("keydown",function(e){13===e.keyCode&&(e.preventDefault(),j(i(this)))})}else n.confirm('\u786e\u8ba4\u5220\u9664\u8be5\u8282\u70b9 "<span style="color: #999;">'+(a.title||"")+'</span>" \u5417\uff1f',function(a){if(r.operate&&r.operate(g),g.status="remove",n.close(a),!e.prev("."+s)[0]&&!e.next("."+s)[0]&&!e.parent("."+v)[0])return e.remove(),void t.elem.append(t.elemNone);if(e.siblings("."+s).children("."+p)[0]){if(r.showCheckbox){var l=function(e){if(e.parents("."+s)[0]){var a=e.siblings("."+s).children("."+p),n=e.parent("."+v).prev(),r=n.find('input[same="layuiTreeCheck"]')[0],c=1,d=0;0==r.checked&&(a.each(function(e,a){var n=i(a).find('input[same="layuiTreeCheck"]')[0];0!=n.checked||n.disabled||(c=0),n.disabled||(d=1)}),1==c&&1==d&&(r.checked=!0,t.renderForm("checkbox"),l(n.parent("."+s))))}};l(e)}if(r.showLine){var d=e.siblings("."+s),h=1,f=e.parent("."+v);layui.each(d,function(e,a){i(a).children("."+v)[0]||(h=0)}),1==h?(b[0]||(f.removeClass(x),d.children("."+v).addClass(m),d.children("."+v).children("."+s).removeClass(k)),e.next()[0]?f.children("."+s).last().children("."+v).children("."+s).last().addClass(k):e.prev().children("."+v).children("."+s).last().addClass(k),e.next()[0]||e.parents("."+s)[1]||e.parents("."+s).eq(0).next()[0]||e.prev("."+s).addClass(k)):!e.next()[0]&&e.hasClass(k)&&e.prev().addClass(k)}}else{var y=e.parent("."+v).prev();if(r.showLine){y.find("."+o).removeClass("layui-tree-icon"),y.find("."+o).children(".layui-icon").removeClass(u).addClass("layui-icon-file");var w=y.parents("."+v).eq(0);w.addClass(x),w.children("."+s).each(function(){i(this).children("."+v).children("."+s).last().addClass(k)})}else y.find(".layui-tree-iconArrow").addClass(c);e.parents("."+s).eq(0).removeClass(C),e.parent("."+v).remove()}e.remove()})})},b.prototype.events=function(){var e=this,a=e.config;e.elem.find(".layui-tree-checkedFirst");e.setChecked(e.checkids),e.elem.find(".layui-tree-search").on("keyup",function(){var n=i(this),t=n.val(),r=n.nextAll(),l=[];r.find("."+y).each(function(){var e=i(this).parents("."+p);if(i(this).html().indexOf(t)!=-1){l.push(i(this).parent());var a=function(e){e.addClass("layui-tree-searchShow"),e.parent("."+v)[0]&&a(e.parent("."+v).parent("."+s))};a(e.parent("."+s))}}),r.find("."+p).each(function(){var e=i(this).parent("."+s);e.hasClass("layui-tree-searchShow")||e.addClass(c)}),0==r.find(".layui-tree-searchShow").length&&e.elem.append(e.elemNone),a.onsearch&&a.onsearch({elem:l})}),e.elem.find(".layui-tree-search").on("keydown",function(){i(this).nextAll().find("."+p).each(function(){var e=i(this).parent("."+s);e.removeClass("layui-tree-searchShow "+c)}),i(".layui-tree-emptyText")[0]&&i(".layui-tree-emptyText").remove()})},b.prototype.getChecked=function(){var e=this,a=e.config,n=[],t=[];e.elem.find(".layui-form-checked").each(function(){n.push(i(this).prev()[0].value)});var r=function(e,a){layui.each(e,function(e,t){layui.each(n,function(e,n){if(t.id==n){var l=i.extend({},t);return delete l.children,a.push(l),t.children&&(l.children=[],r(t.children,l.children)),!0}})})};return r(i.extend({},a.data),t),t},b.prototype.setChecked=function(e){var a=this;a.config;a.elem.find("."+s).each(function(a,n){var t=i(this).data("id"),r=i(n).children("."+p).find('input[same="layuiTreeCheck"]'),l=r.next();if("number"==typeof e){if(t==e)return r[0].checked||l.click(),!1}else"object"==typeof e&&layui.each(e,function(e,i){if(i==t&&!r[0].checked)return l.click(),!0})})},l.that={},l.config={},r.reload=function(e,i){var a=l.that[e];return a.reload(i),l.call(a)},r.getChecked=function(e){var i=l.that[e];return i.getChecked()},r.setChecked=function(e,i){var a=l.that[e];return a.setChecked(i)},r.render=function(e){var i=new b(e);return l.call(i)},e(t,r)});layui.define(["laytpl","form"],function(e){"use strict";var a=layui.$,t=layui.laytpl,i=layui.form,n="transfer",l={config:{},index:layui[n]?layui[n].index+1e4:0,set:function(e){var t=this;return t.config=a.extend({},t.config,e),t},on:function(e,a){return layui.onevent.call(this,n,e,a)}},r=function(){var e=this,a=e.config,t=a.id||e.index;return r.that[t]=e,r.config[t]=a,{config:a,reload:function(a){e.reload.call(e,a)},getData:function(){return e.getData.call(e)}}},c="layui-hide",o="layui-btn-disabled",d="layui-none",s="layui-transfer-box",u="layui-transfer-header",h="layui-transfer-search",f="layui-transfer-active",y="layui-transfer-data",p=function(e){return e=e||{},['<div class="layui-transfer-box" data-index="'+e.index+'">','<div class="layui-transfer-header">','<input type="checkbox" name="'+e.checkAllName+'" lay-filter="layTransferCheckbox" lay-type="all" lay-skin="primary" title="{{ d.data.title['+e.index+"] || 'list"+(e.index+1)+"' }}\">","</div>","{{# if(d.data.showSearch){ }}",'<div class="layui-transfer-search">','<i class="layui-icon layui-icon-search"></i>','<input type="input" class="layui-input" placeholder="\u5173\u952e\u8bcd\u641c\u7d22">',"</div>","{{# } }}",'<ul class="layui-transfer-data"></ul>',"</div>"].join("")},v=['<div class="layui-transfer layui-form layui-border-box" lay-filter="LAY-transfer-{{ d.index }}">',p({index:0,checkAllName:"layTransferLeftCheckAll"}),'<div class="layui-transfer-active">','<button type="button" class="layui-btn layui-btn-sm layui-btn-primary layui-btn-disabled" data-index="0">','<i class="layui-icon layui-icon-next"></i>',"</button>",'<button type="button" class="layui-btn layui-btn-sm layui-btn-primary layui-btn-disabled" data-index="1">','<i class="layui-icon layui-icon-prev"></i>',"</button>","</div>",p({index:1,checkAllName:"layTransferRightCheckAll"}),"</div>"].join(""),x=function(e){var t=this;t.index=++l.index,t.config=a.extend({},t.config,l.config,e),t.render()};x.prototype.config={title:["\u5217\u8868\u4e00","\u5217\u8868\u4e8c"],width:200,height:360,data:[],value:[],showSearch:!1,id:"",text:{none:"\u65e0\u6570\u636e",searchNone:"\u65e0\u5339\u914d\u6570\u636e"}},x.prototype.reload=function(e){var t=this;t.config=a.extend({},t.config,e),t.render()},x.prototype.render=function(){var e=this,i=e.config,n=e.elem=a(t(v).render({data:i,index:e.index})),l=i.elem=a(i.elem);l[0]&&(i.data=i.data||[],i.value=i.value||[],e.key=i.id||e.index,l.html(e.elem),e.layBox=e.elem.find("."+s),e.layHeader=e.elem.find("."+u),e.laySearch=e.elem.find("."+h),e.layData=n.find("."+y),e.layBtn=n.find("."+f+" .layui-btn"),e.layBox.css({width:i.width,height:i.height}),e.layData.css({height:function(){return i.height-e.layHeader.outerHeight()-e.laySearch.outerHeight()-2}()}),e.renderData(),e.events())},x.prototype.renderData=function(){var e=this,a=(e.config,[{checkName:"layTransferLeftCheck",views:[]},{checkName:"layTransferRightCheck",views:[]}]);e.parseData(function(e){var t=e.selected?1:0,i=["<li>",'<input type="checkbox" name="'+a[t].checkName+'" lay-skin="primary" lay-filter="layTransferCheckbox" title="'+e.title+'"'+(e.disabled?" disabled":"")+(e.checked?" checked":"")+' value="'+e.value+'">',"</li>"].join("");a[t].views.push(i),delete e.selected}),e.layData.eq(0).html(a[0].views.join("")),e.layData.eq(1).html(a[1].views.join("")),e.renderCheckBtn()},x.prototype.renderForm=function(e){i.render(e,"LAY-transfer-"+this.index)},x.prototype.renderCheckBtn=function(e){var t=this,i=t.config;e=e||{},t.layBox.each(function(n){var l=a(this),r=l.find("."+y),d=l.find("."+u).find('input[type="checkbox"]'),s=r.find('input[type="checkbox"]'),h=0,f=!1;if(s.each(function(){var e=a(this).data("hide");(this.checked||this.disabled||e)&&h++,this.checked&&!e&&(f=!0)}),d.prop("checked",f&&h===s.length),t.layBtn.eq(n)[f?"removeClass":"addClass"](o),!e.stopNone){var p=r.children("li:not(."+c+")").length;t.noneView(r,p?"":i.text.none)}}),t.renderForm("checkbox")},x.prototype.noneView=function(e,t){var i=a('<p class="layui-none">'+(t||"")+"</p>");e.find("."+d)[0]&&e.find("."+d).remove(),t.replace(/\s/g,"")&&e.append(i)},x.prototype.setValue=function(){var e=this,t=e.config,i=[];return e.layBox.eq(1).find("."+y+' input[type="checkbox"]').each(function(){var e=a(this).data("hide");e||i.push(this.value)}),t.value=i,e},x.prototype.parseData=function(e){var t=this,i=t.config,n=[];return layui.each(i.data,function(t,l){l=("function"==typeof i.parseData?i.parseData(l):l)||l,n.push(l=a.extend({},l)),layui.each(i.value,function(e,a){a==l.value&&(l.selected=!0)}),e&&e(l)}),i.data=n,t},x.prototype.getData=function(e){var a=this,t=a.config,i=[];return a.setValue(),layui.each(e||t.value,function(e,a){layui.each(t.data,function(e,t){delete t.selected,a==t.value&&i.push(t)})}),i},x.prototype.events=function(){var e=this,t=e.config;e.elem.on("click",'input[lay-filter="layTransferCheckbox"]+',function(){var t=a(this).prev(),i=t[0].checked,n=t.parents("."+s).eq(0).find("."+y);t[0].disabled||("all"===t.attr("lay-type")&&n.find('input[type="checkbox"]').each(function(){this.disabled||(this.checked=i)}),e.renderCheckBtn({stopNone:!0}))}),e.layBtn.on("click",function(){var i=a(this),n=i.data("index"),l=e.layBox.eq(n),r=[];if(!i.hasClass(o)){e.layBox.eq(n).each(function(t){var i=a(this),n=i.find("."+y);n.children("li").each(function(){var t=a(this),i=t.find('input[type="checkbox"]'),n=i.data("hide");i[0].checked&&!n&&(i[0].checked=!1,l.siblings("."+s).find("."+y).append(t.clone()),t.remove(),r.push(i[0].value)),e.setValue()})}),e.renderCheckBtn();var c=l.siblings("."+s).find("."+h+" input");""===c.val()||c.trigger("keyup"),t.onchange&&t.onchange(e.getData(r),n)}}),e.laySearch.find("input").on("keyup",function(){var i=this.value,n=a(this).parents("."+h).eq(0).siblings("."+y),l=n.children("li");l.each(function(){var e=a(this),t=e.find('input[type="checkbox"]'),n=t[0].title.indexOf(i)!==-1;e[n?"removeClass":"addClass"](c),t.data("hide",!n)}),e.renderCheckBtn();var r=l.length===n.children("li."+c).length;e.noneView(n,r?t.text.searchNone:"")})},r.that={},r.config={},l.reload=function(e,a){var t=r.that[e];return t.reload(a),r.call(t)},l.getData=function(e){var a=r.that[e];return a.getData()},l.render=function(e){var a=new x(e);return r.call(a)},e(n,l)});layui.define(["laytpl","laypage","layer","form","util"],function(e){"use strict";var t=layui.$,i=layui.laytpl,a=layui.laypage,l=layui.layer,n=layui.form,o=(layui.util,layui.hint()),r=layui.device(),c={config:{checkName:"LAY_CHECKED",indexName:"LAY_TABLE_INDEX"},cache:{},index:layui.table?layui.table.index+1e4:0,set:function(e){var i=this;return i.config=t.extend({},i.config,e),i},on:function(e,t){return layui.onevent.call(this,y,e,t)}},d=function(){var e=this,t=e.config,i=t.id||t.index;return i&&(d.that[i]=e,d.config[i]=t),{config:t,reload:function(t,i){e.reload.call(e,t,i)},setColsWidth:function(){e.setColsWidth.call(e)},resize:function(){e.resize.call(e)}}},s=function(e){var t=d.config[e];return t||o.error(e?"The table instance with ID '"+e+"' not found":"ID argument required"),t||null},u=function(e,a,l,n){var o=e.templet?function(){return"function"==typeof e.templet?e.templet(l):i(t(e.templet).html()||String(a)).render(l)}():a;return n?t("<div>"+o+"</div>").text():o},y="table",h=".layui-table",f="layui-hide",p="layui-none",v="layui-table-view",m=".layui-table-tool",g=".layui-table-box",b=".layui-table-init",x=".layui-table-header",k=".layui-table-body",C=".layui-table-main",w=".layui-table-fixed",T=".layui-table-fixed-l",N=".layui-table-fixed-r",A=".layui-table-total",L=".layui-table-page",S=".layui-table-sort",R="layui-table-edit",_="layui-table-hover",W=function(e){var t='{{#if(item2.colspan){}} colspan="{{item2.colspan}}"{{#} if(item2.rowspan){}} rowspan="{{item2.rowspan}}"{{#}}}';return e=e||{},['<table cellspacing="0" cellpadding="0" border="0" class="layui-table" ','{{# if(d.data.skin){ }}lay-skin="{{d.data.skin}}"{{# } }} {{# if(d.data.size){ }}lay-size="{{d.data.size}}"{{# } }} {{# if(d.data.even){ }}lay-even{{# } }}>',"<thead>","{{# layui.each(d.data.cols, function(i1, item1){ }}","<tr>","{{# layui.each(item1, function(i2, item2){ }}",'{{# if(item2.fixed && item2.fixed !== "right"){ left = true; } }}','{{# if(item2.fixed === "right"){ right = true; } }}',function(){return e.fixed&&"right"!==e.fixed?'{{# if(item2.fixed && item2.fixed !== "right"){ }}':"right"===e.fixed?'{{# if(item2.fixed === "right"){ }}':""}(),"{{# var isSort = !(item2.colGroup) && item2.sort; }}",'<th data-field="{{ item2.field||i2 }}" data-key="{{d.index}}-{{i1}}-{{i2}}" {{# if( item2.parentKey){ }}data-parentkey="{{ item2.parentKey }}"{{# } }} {{# if(item2.minWidth){ }}data-minwidth="{{item2.minWidth}}"{{# } }} '+t+' {{# if(item2.unresize || item2.colGroup){ }}data-unresize="true"{{# } }} class="{{# if(item2.hide){ }}layui-hide{{# } }}{{# if(isSort){ }} layui-unselect{{# } }}{{# if(!item2.field){ }} layui-table-col-special{{# } }}">','<div class="layui-table-cell laytable-cell-',"{{# if(item2.colGroup){ }}","group","{{# } else { }}","{{d.index}}-{{i1}}-{{i2}}",'{{# if(item2.type !== "normal"){ }}'," laytable-cell-{{ item2.type }}","{{# } }}","{{# } }}",'" {{#if(item2.align){}}align="{{item2.align}}"{{#}}}>','{{# if(item2.type === "checkbox"){ }}','<input type="checkbox" name="layTableCheckbox" lay-skin="primary" lay-filter="layTableAllChoose" {{# if(item2[d.data.checkName]){ }}checked{{# }; }}>',"{{# } else { }}",'<span>{{item2.title||""}}</span>',"{{# if(isSort){ }}",'<span class="layui-table-sort layui-inline"><i class="layui-edge layui-table-sort-asc" title="\u5347\u5e8f"></i><i class="layui-edge layui-table-sort-desc" title="\u964d\u5e8f"></i></span>',"{{# } }}","{{# } }}","</div>","</th>",e.fixed?"{{# }; }}":"","{{# }); }}","</tr>","{{# }); }}","</thead>","</table>"].join("")},z=['<table cellspacing="0" cellpadding="0" border="0" class="layui-table" ','{{# if(d.data.skin){ }}lay-skin="{{d.data.skin}}"{{# } }} {{# if(d.data.size){ }}lay-size="{{d.data.size}}"{{# } }} {{# if(d.data.even){ }}lay-even{{# } }}>',"<tbody></tbody>","</table>"].join(""),E=['<div class="layui-form layui-border-box {{d.VIEW_CLASS}}{{# if(d.data.className){ }} {{ d.data.className }}{{# } }}" lay-filter="LAY-table-{{d.index}}" lay-id="{{ d.data.id }}" style="{{# if(d.data.width){ }}width:{{d.data.width}}px;{{# } }} {{# if(d.data.height){ }}height:{{d.data.height}}px;{{# } }}">',"{{# if(d.data.toolbar){ }}",'<div class="layui-table-tool">','<div class="layui-table-tool-temp"></div>','<div class="layui-table-tool-self"></div>',"</div>","{{# } }}",'<div class="layui-table-box">',"{{# if(d.data.loading){ }}",'<div class="layui-table-init" style="background-color: #fff;">','<i class="layui-icon layui-icon-loading layui-anim layui-anim-rotate layui-anim-loop"></i>',"</div>","{{# } }}","{{# var left, right; }}",'<div class="layui-table-header">',W(),"</div>",'<div class="layui-table-body layui-table-main">',z,"</div>","{{# if(left){ }}",'<div class="layui-table-fixed layui-table-fixed-l">','<div class="layui-table-header">',W({fixed:!0}),"</div>",'<div class="layui-table-body">',z,"</div>","</div>","{{# }; }}","{{# if(right){ }}",'<div class="layui-table-fixed layui-table-fixed-r">','<div class="layui-table-header">',W({fixed:"right"}),'<div class="layui-table-mend"></div>',"</div>",'<div class="layui-table-body">',z,"</div>","</div>","{{# }; }}","</div>","{{# if(d.data.totalRow){ }}",'<div class="layui-table-total">','<table cellspacing="0" cellpadding="0" border="0" class="layui-table" ','{{# if(d.data.skin){ }}lay-skin="{{d.data.skin}}"{{# } }} {{# if(d.data.size){ }}lay-size="{{d.data.size}}"{{# } }} {{# if(d.data.even){ }}lay-even{{# } }}>','<tbody><tr><td><div class="layui-table-cell" style="visibility: hidden;">Total</div></td></tr></tbody>',"</table>","</div>","{{# } }}","{{# if(d.data.page){ }}",'<div class="layui-table-page">','<div id="layui-table-page{{d.index}}"></div>',"</div>","{{# } }}","<style>","{{# layui.each(d.data.cols, function(i1, item1){","layui.each(item1, function(i2, item2){ }}",".laytable-cell-{{d.index}}-{{i1}}-{{i2}}{ ","{{# if(item2.width){ }}","width: {{item2.width}}px;","{{# } }}"," }","{{# });","}); }}","</style>","</div>"].join(""),j=t(window),F=t(document),I=function(e){var i=this;i.index=++c.index,i.config=t.extend({},i.config,c.config,e),i.render()};I.prototype.config={limit:10,loading:!0,cellMinWidth:60,defaultToolbar:["filter","exports","print"],autoSort:!0,text:{none:"\u65e0\u6570\u636e"}},I.prototype.render=function(){var e=this,a=e.config;if(a.elem=t(a.elem),a.where=a.where||{},a.id=a.id||a.elem.attr("id")||e.index,a.request=t.extend({pageName:"page",limitName:"limit"},a.request),a.response=t.extend({statusName:"code",statusCode:0,msgName:"msg",dataName:"data",totalRowName:"totalRow",countName:"count"},a.response),"object"==typeof a.page&&(a.limit=a.page.limit||a.limit,a.limits=a.page.limits||a.limits,e.page=a.page.curr=a.page.curr||1,delete a.page.elem,delete a.page.jump),!a.elem[0])return e;a.height&&/^full-\d+$/.test(a.height)&&(e.fullHeightGap=a.height.split("-")[1],a.height=j.height()-e.fullHeightGap),e.setInit();var l=a.elem,n=l.next("."+v),o=e.elem=t(i(E).render({VIEW_CLASS:v,data:a,index:e.index}));if(a.index=e.index,e.key=a.id||a.index,n[0]&&n.remove(),l.after(o),e.layTool=o.find(m),e.layBox=o.find(g),e.layHeader=o.find(x),e.layMain=o.find(C),e.layBody=o.find(k),e.layFixed=o.find(w),e.layFixLeft=o.find(T),e.layFixRight=o.find(N),e.layTotal=o.find(A),e.layPage=o.find(L),e.renderToolbar(),e.fullSize(),a.cols.length>1){var r=e.layFixed.find(x).find("th");r.height(e.layHeader.height()-1-parseFloat(r.css("padding-top"))-parseFloat(r.css("padding-bottom")))}e.pullData(e.page),e.events()},I.prototype.initOpts=function(e){var t=this,i=(t.config,{checkbox:48,radio:48,space:15,numbers:40});e.checkbox&&(e.type="checkbox"),e.space&&(e.type="space"),e.type||(e.type="normal"),"normal"!==e.type&&(e.unresize=!0,e.width=e.width||i[e.type])},I.prototype.setInit=function(e){var t=this,i=t.config;return i.clientWidth=i.width||function(){var e=function(t){var a,l;t=t||i.elem.parent(),a=t.width();try{l="none"===t.css("display")}catch(n){}return!t[0]||a&&!l?a:e(t.parent())};return e()}(),"width"===e?i.clientWidth:void layui.each(i.cols,function(e,a){layui.each(a,function(l,n){if(!n)return void a.splice(l,1);if(n.key=e+"-"+l,n.hide=n.hide||!1,n.colGroup||n.colspan>1){var o=0;layui.each(i.cols[e+1],function(t,i){i.HAS_PARENT||o>1&&o==n.colspan||(i.HAS_PARENT=!0,i.parentKey=e+"-"+l,o+=parseInt(i.colspan>1?i.colspan:1))}),n.colGroup=!0}t.initOpts(n)})})},I.prototype.renderToolbar=function(){var e=this,a=e.config,l=['<div class="layui-inline" lay-event="add"><i class="layui-icon layui-icon-add-1"></i></div>','<div class="layui-inline" lay-event="update"><i class="layui-icon layui-icon-edit"></i></div>','<div class="layui-inline" lay-event="delete"><i class="layui-icon layui-icon-delete"></i></div>'].join(""),n=e.layTool.find(".layui-table-tool-temp");if("default"===a.toolbar)n.html(l);else if("string"==typeof a.toolbar){var o=t(a.toolbar).html()||"";o&&n.html(i(o).render(a))}var r={filter:{title:"\u7b5b\u9009\u5217",layEvent:"LAYTABLE_COLS",icon:"layui-icon-cols"},exports:{title:"\u5bfc\u51fa",layEvent:"LAYTABLE_EXPORT",icon:"layui-icon-export"},print:{title:"\u6253\u5370",layEvent:"LAYTABLE_PRINT",icon:"layui-icon-print"}},c=[];"object"==typeof a.defaultToolbar&&layui.each(a.defaultToolbar,function(e,t){var i="string"==typeof t?r[t]:t;i&&c.push('<div class="layui-inline" title="'+i.title+'" lay-event="'+i.layEvent+'"><i class="layui-icon '+i.icon+'"></i></div>')}),e.layTool.find(".layui-table-tool-self").html(c.join(""))},I.prototype.setParentCol=function(e,t){var i=this,a=i.config,l=i.layHeader.find('th[data-key="'+a.index+"-"+t+'"]'),n=parseInt(l.attr("colspan"))||0;if(l[0]){var o=t.split("-"),r=a.cols[o[0]][o[1]];e?n--:n++,l.attr("colspan",n),l[n<1?"addClass":"removeClass"](f),r.colspan=n,r.hide=n<1;var c=l.data("parentkey");c&&i.setParentCol(e,c)}},I.prototype.setColsPatch=function(){var e=this,t=e.config;layui.each(t.cols,function(t,i){layui.each(i,function(t,i){i.hide&&e.setParentCol(i.hide,i.parentKey)})})},I.prototype.setColsWidth=function(){var e=this,t=e.config,i=0,a=0,l=0,n=0,o=e.setInit("width");e.eachCols(function(e,t){t.hide||i++}),o=o-function(){return"line"===t.skin||"nob"===t.skin?2:i+1}()-e.getScrollWidth(e.layMain[0])-1;var r=function(e){layui.each(t.cols,function(i,r){layui.each(r,function(i,c){var d=0,s=c.minWidth||t.cellMinWidth;return c?void(c.colGroup||c.hide||(e?l&&l<s&&(a--,d=s):(d=c.width||0,/\d+%$/.test(d)?(d=Math.floor(parseFloat(d)/100*o),d<s&&(d=s)):d||(c.width=d=0,a++)),c.hide&&(d=0),n+=d)):void r.splice(i,1)})}),o>n&&a&&(l=(o-n)/a)};r(),r(!0),e.autoColNums=a,e.eachCols(function(i,a){var n=a.minWidth||t.cellMinWidth;a.colGroup||a.hide||(0===a.width?e.getCssRule(t.index+"-"+a.key,function(e){e.style.width=Math.floor(l>=n?l:n)+"px"}):/\d+%$/.test(a.width)&&e.getCssRule(t.index+"-"+a.key,function(e){e.style.width=Math.floor(parseFloat(a.width)/100*o)+"px"}))});var c=e.layMain.width()-e.getScrollWidth(e.layMain[0])-e.layMain.children("table").outerWidth();if(e.autoColNums&&c>=-i&&c<=i){var d=function(t){var i;return t=t||e.layHeader.eq(0).find("thead th:last-child"),i=t.data("field"),!i&&t.prev()[0]?d(t.prev()):t},s=d(),u=s.data("key");e.getCssRule(u,function(t){var i=t.style.width||s.outerWidth();t.style.width=parseFloat(i)+c+"px",e.layMain.height()-e.layMain.prop("clientHeight")>0&&(t.style.width=parseFloat(t.style.width)-1+"px")})}e.loading(!0)},I.prototype.resize=function(){var e=this;e.fullSize(),e.setColsWidth(),e.scrollPatch()},I.prototype.reload=function(e,i){var a=this;e=e||{},delete a.haveInit,layui.each(e,function(e,t){"array"===layui._typeof(t)&&delete a.config[e]}),a.config=t.extend(i,{},a.config,e),a.render()},I.prototype.errorView=function(e){var i=this,a=i.layMain.find("."+p),l=t('<div class="'+p+'">'+(e||"Error")+"</div>");a[0]&&(i.layNone.remove(),a.remove()),i.layFixed.addClass(f),i.layMain.find("tbody").html(""),i.layMain.append(i.layNone=l),c.cache[i.key]=[]},I.prototype.page=1,I.prototype.pullData=function(e){var i=this,a=i.config,l=a.request,n=a.response,o=function(){"object"==typeof a.initSort&&i.sort(a.initSort.field,a.initSort.type)};if(i.startTime=(new Date).getTime(),a.url){var r={};r[l.pageName]=e,r[l.limitName]=a.limit;var c=t.extend(r,a.where);a.contentType&&0==a.contentType.indexOf("application/json")&&(c=JSON.stringify(c)),i.loading(),t.ajax({type:a.method||"get",url:a.url,contentType:a.contentType,data:c,dataType:"json",headers:a.headers||{},success:function(t){"function"==typeof a.parseData&&(t=a.parseData(t)||t),t[n.statusName]!=n.statusCode?(i.renderForm(),i.errorView(t[n.msgName]||'\u8fd4\u56de\u7684\u6570\u636e\u4e0d\u7b26\u5408\u89c4\u8303\uff0c\u6b63\u786e\u7684\u6210\u529f\u72b6\u6001\u7801\u5e94\u4e3a\uff1a"'+n.statusName+'": '+n.statusCode)):(i.renderData(t,e,t[n.countName]),o(),a.time=(new Date).getTime()-i.startTime+" ms"),i.setColsWidth(),"function"==typeof a.done&&a.done(t,e,t[n.countName])},error:function(e,t){i.errorView("\u8bf7\u6c42\u5f02\u5e38\uff0c\u9519\u8bef\u63d0\u793a\uff1a"+t),i.renderForm(),i.setColsWidth(),"function"==typeof a.error&&a.error(e,t)}})}else if(a.data&&a.data.constructor===Array){var d={},s=e*a.limit-a.limit;d[n.dataName]=a.data.concat().splice(s,a.limit),d[n.countName]=a.data.length,"object"==typeof a.totalRow&&(d[n.totalRowName]=t.extend({},a.totalRow)),i.renderData(d,e,d[n.countName]),o(),i.setColsWidth(),"function"==typeof a.done&&a.done(d,e,d[n.countName])}},I.prototype.eachCols=function(e){var t=this;return c.eachCols(null,e,t.config.cols),t},I.prototype.renderData=function(e,n,o,r){var d=this,s=d.config,y=e[s.response.dataName]||[],h=e[s.response.totalRowName],v=[],m=[],g=[],b=function(){var e;return!r&&d.sortKey?d.sort(d.sortKey.field,d.sortKey.sort,!0):(layui.each(y,function(a,l){var o=[],y=[],h=[],p=a+s.limit*(n-1)+1;"array"===layui._typeof(l)&&0===l.length||(r||(l[c.config.indexName]=a),d.eachCols(function(n,r){var d=r.field||n,v=s.index+"-"+r.key,m=l[d];if(void 0!==m&&null!==m||(m=""),!r.colGroup){var g=['<td data-field="'+d+'" data-key="'+v+'" '+function(){var e=[];return r.edit&&e.push('data-edit="'+r.edit+'"'),r.align&&e.push('align="'+r.align+'"'),r.templet&&e.push('data-content="'+m+'"'),r.toolbar&&e.push('data-off="true"'),r.event&&e.push('lay-event="'+r.event+'"'),r.style&&e.push('style="'+r.style+'"'),r.minWidth&&e.push('data-minwidth="'+r.minWidth+'"'),e.join(" ")}()+' class="'+function(){var e=[];return r.hide&&e.push(f),r.field||e.push("layui-table-col-special"),e.join(" ")}()+'">','<div class="layui-table-cell laytable-cell-'+function(){return"normal"===r.type?v:v+" laytable-cell-"+r.type}()+'">'+function(){var n=t.extend(!0,{LAY_INDEX:p},l),o=c.config.checkName;switch(r.type){case"checkbox":return'<input type="checkbox" name="layTableCheckbox" lay-skin="primary" '+function(){return r[o]?(l[o]=r[o],r[o]?"checked":""):n[o]?"checked":""}()+">";case"radio":return n[o]&&(e=a),'<input type="radio" name="layTableRadio_'+s.index+'" '+(n[o]?"checked":"")+' lay-type="layTableRadio">';case"numbers":return p}return r.toolbar?i(t(r.toolbar).html()||"").render(n):u(r,m,n)}(),"</div></td>"].join("");o.push(g),r.fixed&&"right"!==r.fixed&&y.push(g),"right"===r.fixed&&h.push(g)}}),v.push('<tr data-index="'+a+'">'+o.join("")+"</tr>"),m.push('<tr data-index="'+a+'">'+y.join("")+"</tr>"),g.push('<tr data-index="'+a+'">'+h.join("")+"</tr>"))}),d.layBody.scrollTop(0),d.layMain.find("."+p).remove(),d.layMain.find("tbody").html(v.join("")),d.layFixLeft.find("tbody").html(m.join("")),d.layFixRight.find("tbody").html(g.join("")),d.renderForm(),"number"==typeof e&&d.setThisRowChecked(e),d.syncCheckAll(),d.haveInit?d.scrollPatch():setTimeout(function(){d.scrollPatch()},50),d.haveInit=!0,l.close(d.tipsIndex),s.HAS_SET_COLS_PATCH||d.setColsPatch(),void(s.HAS_SET_COLS_PATCH=!0))};return c.cache[d.key]=y,d.layPage[0==o||0===y.length&&1==n?"addClass":"removeClass"](f),0===y.length?(d.renderForm(),d.errorView(s.text.none)):(d.layFixed.removeClass(f),r?b():(b(),d.renderTotal(y,h),void(s.page&&(s.page=t.extend({elem:"layui-table-page"+s.index,count:o,limit:s.limit,limits:s.limits||[10,20,30,40,50,60,70,80,90],groups:3,layout:["prev","page","next","skip","count","limit"],prev:'<i class="layui-icon">&#xe603;</i>',next:'<i class="layui-icon">&#xe602;</i>',jump:function(e,t){t||(d.page=e.curr,s.limit=e.limit,d.pullData(e.curr))}},s.page),s.page.count=o,a.render(s.page)))))},I.prototype.renderTotal=function(e,a){var l=this,n=l.config,o={};if(n.totalRow){layui.each(e,function(e,t){0!==t.length&&l.eachCols(function(e,i){var a=i.field||e,l=t[a];i.totalRow&&(o[a]=(o[a]||0)+(parseFloat(l)||0))})}),l.dataTotal={};var r=[];l.eachCols(function(e,c){var d=c.field||e,s=function(){var e,t=c.totalRowText||"",i=parseFloat(o[d]).toFixed(2),l={};return l[d]=i,e=c.totalRow?u(c,i,l)||t:t,a?a[c.field]||e:e}(),y=['<td data-field="'+d+'" data-key="'+n.index+"-"+c.key+'" '+function(){var e=[];return c.align&&e.push('align="'+c.align+'"'),c.style&&e.push('style="'+c.style+'"'),c.minWidth&&e.push('data-minwidth="'+c.minWidth+'"'),e.join(" ")}()+' class="'+function(){var e=[];return c.hide&&e.push(f),c.field||e.push("layui-table-col-special"),e.join(" ")}()+'">','<div class="layui-table-cell laytable-cell-'+function(){var e=n.index+"-"+c.key;return"normal"===c.type?e:e+" laytable-cell-"+c.type}()+'">'+function(){var e=c.totalRow||n.totalRow;return"string"==typeof e?i(e).render(t.extend({TOTAL_NUMS:s},c)):s}(),"</div></td>"].join("");c.field&&(l.dataTotal[d]=s),r.push(y)}),l.layTotal.find("tbody").html("<tr>"+r.join("")+"</tr>")}},I.prototype.getColElem=function(e,t){var i=this,a=i.config;return e.eq(0).find(".laytable-cell-"+(a.index+"-"+t)+":eq(0)")},I.prototype.renderForm=function(e){n.render(e,"LAY-table-"+this.index)},I.prototype.setThisRowChecked=function(e){var t=this,i=(t.config,"layui-table-click"),a=t.layBody.find('tr[data-index="'+e+'"]');a.addClass(i).siblings("tr").removeClass(i)},I.prototype.sort=function(e,i,a,l){var n,r,d=this,s={},u=d.config,h=u.elem.attr("lay-filter"),f=c.cache[d.key];"string"==typeof e&&(n=e,d.layHeader.find("th").each(function(i,a){var l=t(this),o=l.data("field");if(o===e)return e=l,n=o,!1}));try{var n=n||e.data("field"),p=e.data("key");if(d.sortKey&&!a&&n===d.sortKey.field&&i===d.sortKey.sort)return;var v=d.layHeader.find("th .laytable-cell-"+p).find(S);d.layHeader.find("th").find(S).removeAttr("lay-sort"),v.attr("lay-sort",i||null),d.layFixed.find("th")}catch(m){o.error("Table modules: sort field '"+n+"' not matched")}d.sortKey={field:n,sort:i},u.autoSort&&("asc"===i?r=layui.sort(f,n):"desc"===i?r=layui.sort(f,n,!0):(r=layui.sort(f,c.config.indexName),delete d.sortKey)),s[u.response.dataName]=r||f,d.renderData(s,d.page,d.count,!0),l&&layui.event.call(e,y,"sort("+h+")",{field:n,type:i})},I.prototype.loading=function(e){var i=this,a=i.config;a.loading&&(e?(i.layInit&&i.layInit.remove(),delete i.layInit,i.layBox.find(b).remove()):(i.layInit=t(['<div class="layui-table-init">','<i class="layui-icon layui-icon-loading layui-anim layui-anim-rotate layui-anim-loop"></i>',"</div>"].join("")),i.layBox.append(i.layInit)))},I.prototype.setCheckData=function(e,t){var i=this,a=i.config,l=c.cache[i.key];l[e]&&l[e].constructor!==Array&&(l[e][a.checkName]=t)},I.prototype.syncCheckAll=function(){var e=this,t=e.config,i=e.layHeader.find('input[name="layTableCheckbox"]'),a=function(i){return e.eachCols(function(e,a){"checkbox"===a.type&&(a[t.checkName]=i)}),i};i[0]&&(c.checkStatus(e.key).isAll?(i[0].checked||(i.prop("checked",!0),e.renderForm("checkbox")),a(!0)):(i[0].checked&&(i.prop("checked",!1),e.renderForm("checkbox")),a(!1)))},I.prototype.getCssRule=function(e,t){var i=this,a=i.elem.find("style")[0],l=a.sheet||a.styleSheet||{},n=l.cssRules||l.rules;layui.each(n,function(i,a){if(a.selectorText===".laytable-cell-"+e)return t(a),!0})},I.prototype.fullSize=function(){var e,t=this,i=t.config,a=i.height;t.fullHeightGap&&(a=j.height()-t.fullHeightGap,a<135&&(a=135),t.elem.css("height",a)),a&&(e=parseFloat(a)-(t.layHeader.outerHeight()||38),i.toolbar&&(e-=t.layTool.outerHeight()||50),i.totalRow&&(e-=t.layTotal.outerHeight()||40),i.page&&(e-=t.layPage.outerHeight()||41),t.layMain.css("height",e-2))},I.prototype.getScrollWidth=function(e){var t=0;return e?t=e.offsetWidth-e.clientWidth:(e=document.createElement("div"),e.style.width="100px",e.style.height="100px",e.style.overflowY="scroll",document.body.appendChild(e),t=e.offsetWidth-e.clientWidth,document.body.removeChild(e)),t},I.prototype.scrollPatch=function(){var e=this,i=e.layMain.children("table"),a=e.layMain.width()-e.layMain.prop("clientWidth"),l=e.layMain.height()-e.layMain.prop("clientHeight"),n=(e.getScrollWidth(e.layMain[0]),i.outerWidth()-e.layMain.width()),o=function(e){if(a&&l){if(e=e.eq(0),!e.find(".layui-table-patch")[0]){var i=t('<th class="layui-table-patch"><div class="layui-table-cell"></div></th>');i.find("div").css({width:a}),e.find("tr").append(i)}}else e.find(".layui-table-patch").remove()};o(e.layHeader),o(e.layTotal);var r=e.layMain.height(),c=r-l;e.layFixed.find(k).css("height",i.height()>=c?c:"auto"),e.layFixRight[n>0?"removeClass":"addClass"](f),e.layFixRight.css("right",a-1)},I.prototype.events=function(){var e,i=this,a=i.config,o=t("body"),d={},s=i.layHeader.find("th"),h=".layui-table-cell",p=a.elem.attr("lay-filter");i.layTool.on("click","*[lay-event]",function(e){var o=t(this),d=o.attr("lay-event"),s=function(e){var l=t(e.list),n=t('<ul class="layui-table-tool-panel"></ul>');n.html(l),a.height&&n.css("max-height",a.height-(i.layTool.outerHeight()||50)),o.find(".layui-table-tool-panel")[0]||o.append(n),i.renderForm(),n.on("click",function(e){layui.stope(e)}),e.done&&e.done(n,l)};switch(layui.stope(e),F.trigger("table.tool.panel.remove"),l.close(i.tipsIndex),d){case"LAYTABLE_COLS":s({list:function(){var e=[];return i.eachCols(function(t,i){i.field&&"normal"==i.type&&e.push('<li><input type="checkbox" name="'+i.field+'" data-key="'+i.key+'" data-parentkey="'+(i.parentKey||"")+'" lay-skin="primary" '+(i.hide?"":"checked")+' title="'+(i.title||i.field)+'" lay-filter="LAY_TABLE_TOOL_COLS"></li>')}),e.join("")}(),done:function(){n.on("checkbox(LAY_TABLE_TOOL_COLS)",function(e){var l=t(e.elem),n=this.checked,o=l.data("key"),r=l.data("parentkey");layui.each(a.cols,function(e,t){layui.each(t,function(t,l){if(e+"-"+t===o){var c=l.hide;l.hide=!n,i.elem.find('*[data-key="'+a.index+"-"+o+'"]')[n?"removeClass":"addClass"](f),c!=l.hide&&i.setParentCol(!n,r),i.resize()}})})})}});break;case"LAYTABLE_EXPORT":r.ie?l.tips("\u5bfc\u51fa\u529f\u80fd\u4e0d\u652f\u6301 IE\uff0c\u8bf7\u7528 Chrome \u7b49\u9ad8\u7ea7\u6d4f\u89c8\u5668\u5bfc\u51fa",this,{tips:3}):s({list:function(){return['<li data-type="csv">\u5bfc\u51fa\u5230 Csv \u6587\u4ef6</li>','<li data-type="xls">\u5bfc\u51fa\u5230 Excel \u6587\u4ef6</li>'].join("")}(),done:function(e,l){l.on("click",function(){var e=t(this).data("type");c.exportFile.call(i,a.id,null,e)})}});break;case"LAYTABLE_PRINT":var u=window.open("\u6253\u5370\u7a97\u53e3","_blank"),h=["<style>","body{font-size: 12px; color: #666;}","table{width: 100%; border-collapse: collapse; border-spacing: 0;}","th,td{line-height: 20px; padding: 9px 15px; border: 1px solid #ccc; text-align: left; font-size: 12px; color: #666;}","a{color: #666; text-decoration:none;}","*.layui-hide{display: none}","</style>"].join(""),v=t(i.layHeader.html());v.append(i.layMain.find("table").html()),v.append(i.layTotal.find("table").html()),v.find("th.layui-table-patch").remove(),v.find(".layui-table-col-special").remove(),u.document.write(h+v.prop("outerHTML")),u.document.close(),u.print(),u.close()}layui.event.call(this,y,"toolbar("+p+")",t.extend({event:d,config:a},{}))}),s.on("mousemove",function(e){var i=t(this),a=i.offset().left,l=e.clientX-a;i.data("unresize")||d.resizeStart||(d.allowResize=i.width()-l<=10,o.css("cursor",d.allowResize?"col-resize":""))}).on("mouseleave",function(){t(this);d.resizeStart||o.css("cursor","")}).on("mousedown",function(e){var l=t(this);if(d.allowResize){var n=l.data("key");e.preventDefault(),d.resizeStart=!0,d.offset=[e.clientX,e.clientY],i.getCssRule(n,function(e){var t=e.style.width||l.outerWidth();d.rule=e,d.ruleWidth=parseFloat(t),d.minWidth=l.data("minwidth")||a.cellMinWidth})}}),F.on("mousemove",function(t){if(d.resizeStart){if(t.preventDefault(),d.rule){var a=d.ruleWidth+t.clientX-d.offset[0];a<d.minWidth&&(a=d.minWidth),d.rule.style.width=a+"px",l.close(i.tipsIndex)}e=1}}).on("mouseup",function(t){d.resizeStart&&(d={},o.css("cursor",""),i.scrollPatch()),2===e&&(e=null)}),s.on("click",function(a){var l,n=t(this),o=n.find(S),r=o.attr("lay-sort");return o[0]&&1!==e?(l="asc"===r?"desc":"desc"===r?null:"asc",void i.sort(n,l,null,!0)):e=2}).find(S+" .layui-edge ").on("click",function(e){var a=t(this),l=a.index(),n=a.parents("th").eq(0).data("field");layui.stope(e),0===l?i.sort(n,"asc",null,!0):i.sort(n,"desc",null,!0)});var v=function(e){var a=t(this),l=a.parents("tr").eq(0).data("index"),n=i.layBody.find('tr[data-index="'+l+'"]'),o=c.cache[i.key]||[];return o=o[l]||{},t.extend({tr:n,data:c.clearCacheKey(o),del:function(){c.cache[i.key][l]=[],n.remove(),i.scrollPatch()},update:function(e){e=e||{},layui.each(e,function(e,t){if(e in o){var a,l=n.children('td[data-field="'+e+'"]');o[e]=t,i.eachCols(function(t,i){i.field==e&&i.templet&&(a=i.templet)}),l.children(h).html(u({templet:a},t,o)),l.data("content",t)}})}},e)};i.elem.on("click",'input[name="layTableCheckbox"]+',function(){var e=t(this).prev(),a=i.layBody.find('input[name="layTableCheckbox"]'),l=e.parents("tr").eq(0).data("index"),n=e[0].checked,o="layTableAllChoose"===e.attr("lay-filter");o?(a.each(function(e,t){t.checked=n,i.setCheckData(e,n)}),i.syncCheckAll(),i.renderForm("checkbox")):(i.setCheckData(l,n),i.syncCheckAll()),layui.event.call(e[0],y,"checkbox("+p+")",v.call(e[0],{checked:n,type:o?"all":"one"}))}),i.elem.on("click",'input[lay-type="layTableRadio"]+',function(){var e=t(this).prev(),l=e[0].checked,n=c.cache[i.key],o=e.parents("tr").eq(0).data("index");layui.each(n,function(e,t){o===e?t[a.checkName]=!0:delete t[a.checkName]}),i.setThisRowChecked(o),layui.event.call(this,y,"radio("+p+")",v.call(this,{checked:l}))}),i.layBody.on("mouseenter","tr",function(){var e=t(this),a=e.index();e.data("off")||i.layBody.find("tr:eq("+a+")").addClass(_)}).on("mouseleave","tr",function(){var e=t(this),a=e.index();e.data("off")||i.layBody.find("tr:eq("+a+")").removeClass(_)}).on("click","tr",function(){m.call(this,"row")}).on("dblclick","tr",function(){m.call(this,"rowDouble")});var m=function(e){var i=t(this);i.data("off")||layui.event.call(this,y,e+"("+p+")",v.call(i.children("td")[0]))};i.layBody.on("change","."+R,function(){var e=t(this),a=this.value,l=e.parent().data("field"),n=e.parents("tr").eq(0).data("index"),o=c.cache[i.key][n];o[l]=a,layui.event.call(this,y,"edit("+p+")",v.call(this,{value:a,field:l}))}).on("blur","."+R,function(){var e,a=t(this),l=this,n=a.parent().data("field"),o=a.parents("tr").eq(0).data("index"),r=c.cache[i.key][o];i.eachCols(function(t,i){i.field==n&&i.templet&&(e=i.templet)}),a.siblings(h).html(function(t){return u({templet:e},t,r)}(l.value)),a.parent().data("content",l.value),a.remove()}),i.layBody.on("click","td",function(e){var i=t(this),a=(i.data("field"),i.data("edit")),l=i.children(h);if(!i.data("off")&&a){var n=t('<input class="layui-input '+R+'">');return n[0].value=i.data("content")||l.text(),i.find("."+R)[0]||i.append(n),n.focus(),void layui.stope(e)}}).on("mouseenter","td",function(){b.call(this)}).on("mouseleave","td",function(){b.call(this,"hide")});var g="layui-table-grid-down",b=function(e){var i=t(this),a=i.children(h);if(!i.data("off"))if(e)i.find(".layui-table-grid-down").remove();else if(a.prop("scrollWidth")>a.outerWidth()){if(a.find("."+g)[0])return;i.append('<div class="'+g+'"><i class="layui-icon layui-icon-down"></i></div>')}};i.layBody.on("click","."+g,function(e){var n=t(this),o=n.parent(),c=o.children(h);i.tipsIndex=l.tips(['<div class="layui-table-tips-main" style="margin-top: -'+(c.height()+16)+"px;"+function(){return"sm"===a.size?"padding: 4px 15px; font-size: 12px;":"lg"===a.size?"padding: 14px 15px;":""}()+'">',c.html(),"</div>",'<i class="layui-icon layui-table-tips-c layui-icon-close"></i>'].join(""),c[0],{tips:[3,""],time:-1,anim:-1,maxWidth:r.ios||r.android?300:i.elem.width()/2,isOutAnim:!1,skin:"layui-table-tips",success:function(e,t){e.find(".layui-table-tips-c").on("click",function(){l.close(t)})}}),layui.stope(e)}),i.layBody.on("click","*[lay-event]",function(){var e=t(this),a=e.parents("tr").eq(0).data("index");layui.event.call(this,y,"tool("+p+")",v.call(this,{event:e.attr("lay-event")})),i.setThisRowChecked(a)}),i.layMain.on("scroll",function(){var e=t(this),a=e.scrollLeft(),n=e.scrollTop();i.layHeader.scrollLeft(a),i.layTotal.scrollLeft(a),i.layFixed.find(k).scrollTop(n),l.close(i.tipsIndex)}),j.on("resize",function(){i.resize()})},function(){F.on("click",function(){F.trigger("table.remove.tool.panel")}),F.on("table.remove.tool.panel",function(){t(".layui-table-tool-panel").remove()})}(),c.init=function(e,i){i=i||{};var a=this,l=t(e?'table[lay-filter="'+e+'"]':h+"[lay-data]"),n="Table element property lay-data configuration item has a syntax error: ";return l.each(function(){var a=t(this),l=a.attr("lay-data");try{l=new Function("return "+l)()}catch(r){o.error(n+l,"error")}var d=[],s=t.extend({elem:this,cols:[],data:[],skin:a.attr("lay-skin"),size:a.attr("lay-size"),even:"string"==typeof a.attr("lay-even")},c.config,i,l);e&&a.hide(),a.find("thead>tr").each(function(e){s.cols[e]=[],t(this).children().each(function(i){var a=t(this),l=a.attr("lay-data");try{l=new Function("return "+l)()}catch(r){return o.error(n+l)}var c=t.extend({title:a.text(),colspan:a.attr("colspan")||0,rowspan:a.attr("rowspan")||0},l);c.colspan<2&&d.push(c),s.cols[e].push(c)})}),a.find("tbody>tr").each(function(e){var i=t(this),a={};i.children("td").each(function(e,i){var l=t(this),n=l.data("field");if(n)return a[n]=l.html()}),layui.each(d,function(e,t){var l=i.children("td").eq(e);a[t.field]=l.html()}),s.data[e]=a}),c.render(s)}),a},d.that={},d.config={},c.eachCols=function(e,i,a){var l=d.config[e]||{},n=[],o=0;a=t.extend(!0,[],a||l.cols),layui.each(a,function(e,t){layui.each(t,function(t,i){if(i.colGroup){var l=0;o++,i.CHILD_COLS=[],layui.each(a[e+1],function(e,t){t.PARENT_COL_INDEX||l>1&&l==i.colspan||(t.PARENT_COL_INDEX=o,i.CHILD_COLS.push(t),l+=parseInt(t.colspan>1?t.colspan:1))})}i.PARENT_COL_INDEX||n.push(i)})});var r=function(e){layui.each(e||n,function(e,t){return t.CHILD_COLS?r(t.CHILD_COLS):void("function"==typeof i&&i(e,t))})};r()},c.checkStatus=function(e){var t=0,i=0,a=[],l=c.cache[e]||[];return layui.each(l,function(e,l){return l.constructor===Array?void i++:void(l[c.config.checkName]&&(t++,a.push(c.clearCacheKey(l))))}),{data:a,isAll:!!l.length&&t===l.length-i}},c.getData=function(e){var t=[],i=c.cache[e]||[];return layui.each(i,function(e,i){i.constructor!==Array&&t.push(c.clearCacheKey(i))}),t},c.exportFile=function(e,t,i){var a=this;t=t||c.clearCacheKey(c.cache[e]),i=i||"csv";var l=d.config[e]||{},n={csv:"text/csv",xls:"application/vnd.ms-excel"}[i],s=document.createElement("a");return r.ie?o.error("IE_NOT_SUPPORT_EXPORTS"):(s.href="data:"+n+";charset=utf-8,\ufeff"+encodeURIComponent(function(){var i=[],l=[],n=[];return layui.each(t,function(t,a){var n=[];"object"==typeof e?(layui.each(e,function(e,a){0==t&&i.push(a||"")}),layui.each(c.clearCacheKey(a),function(e,t){n.push('"'+(t||"")+'"')})):c.eachCols(e,function(e,l){if(l.field&&"normal"==l.type&&!l.hide){var o=a[l.field];void 0!==o&&null!==o||(o=""),0==t&&i.push(l.title||""),n.push('"'+u(l,o,a,"text")+'"')}}),l.push(n.join(","))}),layui.each(a.dataTotal,function(e,t){n.push(t)}),i.join(",")+"\r\n"+l.join("\r\n")+"\r\n"+n.join(",")}()),s.download=(l.title||"table_"+(l.index||""))+"."+i,document.body.appendChild(s),s.click(),void document.body.removeChild(s))},c.resize=function(e){if(e){var t=s(e);if(!t)return;d.that[e].resize()}else layui.each(d.that,function(){this.resize()})},c.reload=function(e,t,i){var a=s(e);if(a){var l=d.that[e];return l.reload(t,i),d.call(l)}},c.render=function(e){
+var t=new I(e);return d.call(t)},c.clearCacheKey=function(e){return e=t.extend({},e),delete e[c.config.checkName],delete e[c.config.indexName],e},t(function(){c.init()}),e(y,c)});layui.define("jquery",function(e){"use strict";var i=layui.$,n=(layui.hint(),layui.device(),{config:{},set:function(e){var n=this;return n.config=i.extend({},n.config,e),n},on:function(e,i){return layui.onevent.call(this,t,e,i)}}),t="carousel",a="layui-this",l=">*[carousel-item]>*",o="layui-carousel-left",r="layui-carousel-right",d="layui-carousel-prev",s="layui-carousel-next",u="layui-carousel-arrow",c="layui-carousel-ind",m=function(e){var t=this;t.config=i.extend({},t.config,n.config,e),t.render()};m.prototype.config={width:"600px",height:"280px",full:!1,arrow:"hover",indicator:"inside",autoplay:!0,interval:3e3,anim:"",trigger:"click",index:0},m.prototype.render=function(){var e=this,n=e.config;n.elem=i(n.elem),n.elem[0]&&(e.elemItem=n.elem.find(l),n.index<0&&(n.index=0),n.index>=e.elemItem.length&&(n.index=e.elemItem.length-1),n.interval<800&&(n.interval=800),n.full?n.elem.css({position:"fixed",width:"100%",height:"100%",zIndex:9999}):n.elem.css({width:n.width,height:n.height}),n.elem.attr("lay-anim",n.anim),e.elemItem.eq(n.index).addClass(a),e.elemItem.length<=1||(e.indicator(),e.arrow(),e.autoplay(),e.events()))},m.prototype.reload=function(e){var n=this;clearInterval(n.timer),n.config=i.extend({},n.config,e),n.render()},m.prototype.prevIndex=function(){var e=this,i=e.config,n=i.index-1;return n<0&&(n=e.elemItem.length-1),n},m.prototype.nextIndex=function(){var e=this,i=e.config,n=i.index+1;return n>=e.elemItem.length&&(n=0),n},m.prototype.addIndex=function(e){var i=this,n=i.config;e=e||1,n.index=n.index+e,n.index>=i.elemItem.length&&(n.index=0)},m.prototype.subIndex=function(e){var i=this,n=i.config;e=e||1,n.index=n.index-e,n.index<0&&(n.index=i.elemItem.length-1)},m.prototype.autoplay=function(){var e=this,i=e.config;i.autoplay&&(clearInterval(e.timer),e.timer=setInterval(function(){e.slide()},i.interval))},m.prototype.arrow=function(){var e=this,n=e.config,t=i(['<button class="layui-icon '+u+'" lay-type="sub">'+("updown"===n.anim?"&#xe619;":"&#xe603;")+"</button>",'<button class="layui-icon '+u+'" lay-type="add">'+("updown"===n.anim?"&#xe61a;":"&#xe602;")+"</button>"].join(""));n.elem.attr("lay-arrow",n.arrow),n.elem.find("."+u)[0]&&n.elem.find("."+u).remove(),n.elem.append(t),t.on("click",function(){var n=i(this),t=n.attr("lay-type");e.slide(t)})},m.prototype.indicator=function(){var e=this,n=e.config,t=e.elemInd=i(['<div class="'+c+'"><ul>',function(){var i=[];return layui.each(e.elemItem,function(e){i.push("<li"+(n.index===e?' class="layui-this"':"")+"></li>")}),i.join("")}(),"</ul></div>"].join(""));n.elem.attr("lay-indicator",n.indicator),n.elem.find("."+c)[0]&&n.elem.find("."+c).remove(),n.elem.append(t),"updown"===n.anim&&t.css("margin-top",-(t.height()/2)),t.find("li").on("hover"===n.trigger?"mouseover":n.trigger,function(){var t=i(this),a=t.index();a>n.index?e.slide("add",a-n.index):a<n.index&&e.slide("sub",n.index-a)})},m.prototype.slide=function(e,i){var n=this,l=n.elemItem,u=n.config,c=u.index,m=u.elem.attr("lay-filter");n.haveSlide||("sub"===e?(n.subIndex(i),l.eq(u.index).addClass(d),setTimeout(function(){l.eq(c).addClass(r),l.eq(u.index).addClass(r)},50)):(n.addIndex(i),l.eq(u.index).addClass(s),setTimeout(function(){l.eq(c).addClass(o),l.eq(u.index).addClass(o)},50)),setTimeout(function(){l.removeClass(a+" "+d+" "+s+" "+o+" "+r),l.eq(u.index).addClass(a),n.haveSlide=!1},300),n.elemInd.find("li").eq(u.index).addClass(a).siblings().removeClass(a),n.haveSlide=!0,layui.event.call(this,t,"change("+m+")",{index:u.index,prevIndex:c,item:l.eq(u.index)}))},m.prototype.events=function(){var e=this,i=e.config;i.elem.data("haveEvents")||(i.elem.on("mouseenter",function(){clearInterval(e.timer)}).on("mouseleave",function(){e.autoplay()}),i.elem.data("haveEvents",!0))},n.render=function(e){var i=new m(e);return i},e(t,n)});layui.define("jquery",function(e){"use strict";var a=layui.jquery,l={config:{},index:layui.rate?layui.rate.index+1e4:0,set:function(e){var l=this;return l.config=a.extend({},l.config,e),l},on:function(e,a){return layui.onevent.call(this,n,e,a)}},i=function(){var e=this,a=e.config;return{setvalue:function(a){e.setvalue.call(e,a)},config:a}},n="rate",t="layui-rate",o="layui-icon-rate",u="layui-icon-rate-solid",s="layui-icon-rate-half",r="layui-icon-rate-solid layui-icon-rate-half",c="layui-icon-rate-solid layui-icon-rate",f="layui-icon-rate layui-icon-rate-half",v=function(e){var i=this;i.index=++l.index,i.config=a.extend({},i.config,l.config,e),i.render()};v.prototype.config={length:5,text:!1,readonly:!1,half:!1,value:0,theme:""},v.prototype.render=function(){var e=this,l=e.config,i=l.theme?'style="color: '+l.theme+';"':"";l.elem=a(l.elem),l.value>l.length&&(l.value=l.length),parseInt(l.value)!==l.value&&(l.half||(l.value=Math.ceil(l.value)-l.value<.5?Math.ceil(l.value):Math.floor(l.value)));for(var n='<ul class="layui-rate" '+(l.readonly?"readonly":"")+">",s=1;s<=l.length;s++){var r='<li class="layui-inline"><i class="layui-icon '+(s>Math.floor(l.value)?o:u)+'" '+i+"></i></li>";l.half&&parseInt(l.value)!==l.value&&s==Math.ceil(l.value)?n=n+'<li><i class="layui-icon layui-icon-rate-half" '+i+"></i></li>":n+=r}n+="</ul>"+(l.text?'<span class="layui-inline">'+l.value+"\u661f":"")+"</span>";var c=l.elem,f=c.next("."+t);f[0]&&f.remove(),e.elemTemp=a(n),l.span=e.elemTemp.next("span"),l.setText&&l.setText(l.value),c.html(e.elemTemp),c.addClass("layui-inline"),l.readonly||e.action()},v.prototype.setvalue=function(e){var a=this,l=a.config;l.value=e,a.render()},v.prototype.action=function(){var e=this,l=e.config,i=e.elemTemp,n=i.find("i").width();i.children("li").each(function(e){var t=e+1,v=a(this);v.on("click",function(e){if(l.value=t,l.half){var o=e.pageX-a(this).offset().left;o<=n/2&&(l.value=l.value-.5)}l.text&&i.next("span").text(l.value+"\u661f"),l.choose&&l.choose(l.value),l.setText&&l.setText(l.value)}),v.on("mousemove",function(e){if(i.find("i").each(function(){a(this).addClass(o).removeClass(r)}),i.find("i:lt("+t+")").each(function(){a(this).addClass(u).removeClass(f)}),l.half){var c=e.pageX-a(this).offset().left;c<=n/2&&v.children("i").addClass(s).removeClass(u)}}),v.on("mouseleave",function(){i.find("i").each(function(){a(this).addClass(o).removeClass(r)}),i.find("i:lt("+Math.floor(l.value)+")").each(function(){a(this).addClass(u).removeClass(f)}),l.half&&parseInt(l.value)!==l.value&&i.children("li:eq("+Math.floor(l.value)+")").children("i").addClass(s).removeClass(c)})})},v.prototype.events=function(){var e=this;e.config},l.render=function(e){var a=new v(e);return i.call(a)},e(n,l)});layui.define("jquery",function(e){"use strict";var l=layui.$,o=function(e){},t='<i class="layui-anim layui-anim-rotate layui-anim-loop layui-icon ">&#xe63e;</i>';o.prototype.load=function(e){var o,i,n,r,a=this,c=0;e=e||{};var m=l(e.elem);if(m[0]){var f=l(e.scrollElem||document),u=e.mb||50,s=!("isAuto"in e)||e.isAuto,y=e.end||"\u6ca1\u6709\u66f4\u591a\u4e86",v=e.scrollElem&&e.scrollElem!==document,d="<cite>\u52a0\u8f7d\u66f4\u591a</cite>",h=l('<div class="layui-flow-more"><a href="javascript:;">'+d+"</a></div>");m.find(".layui-flow-more")[0]||m.append(h);var p=function(e,t){e=l(e),h.before(e),t=0==t||null,t?h.html(y):h.find("a").html(d),i=t,o=null,n&&n()},g=function(){o=!0,h.find("a").html(t),"function"==typeof e.done&&e.done(++c,p)};if(g(),h.find("a").on("click",function(){l(this);i||o||g()}),e.isLazyimg)var n=a.lazyimg({elem:e.elem+" img",scrollElem:e.scrollElem});return s?(f.on("scroll",function(){var e=l(this),t=e.scrollTop();r&&clearTimeout(r),!i&&m.width()&&(r=setTimeout(function(){var i=v?e.height():l(window).height(),n=v?e.prop("scrollHeight"):document.documentElement.scrollHeight;n-t-i<=u&&(o||g())},100))}),a):a}},o.prototype.lazyimg=function(e){var o,t=this,i=0;e=e||{};var n=l(e.scrollElem||document),r=e.elem||"img",a=e.scrollElem&&e.scrollElem!==document,c=function(e,l){var o=n.scrollTop(),r=o+l,c=a?function(){return e.offset().top-n.offset().top+o}():e.offset().top;if(c>=o&&c<=r&&e.attr("lay-src")){var f=e.attr("lay-src");layui.img(f,function(){var l=t.lazyimg.elem.eq(i);e.attr("src",f).removeAttr("lay-src"),l[0]&&m(l),i++},function(){t.lazyimg.elem.eq(i);e.removeAttr("lay-src")})}},m=function(e,o){var m=a?(o||n).height():l(window).height(),f=n.scrollTop(),u=f+m;if(t.lazyimg.elem=l(r),e)c(e,m);else for(var s=0;s<t.lazyimg.elem.length;s++){var y=t.lazyimg.elem.eq(s),v=a?function(){return y.offset().top-n.offset().top+f}():y.offset().top;if(c(y,m),i=s,v>u)break}};if(m(),!o){var f;n.on("scroll",function(){var e=l(this);f&&clearTimeout(f),f=setTimeout(function(){m(null,e)},50)}),o=!0}return m},e("flow",new o)});layui.define(["layer","form"],function(t){"use strict";var e=layui.$,i=layui.layer,a=layui.form,l=(layui.hint(),layui.device()),n="layedit",o="layui-show",r="layui-disabled",c=function(){var t=this;t.index=0,t.config={tool:["strong","italic","underline","del","|","left","center","right","|","link","unlink","face","image"],hideTool:[],height:280}};c.prototype.set=function(t){var i=this;return e.extend(!0,i.config,t),i},c.prototype.on=function(t,e){return layui.onevent(n,t,e)},c.prototype.build=function(t,i){i=i||{};var a=this,n=a.config,r="layui-layedit",c=e("string"==typeof t?"#"+t:t),u="LAY_layedit_"+ ++a.index,d=c.next("."+r),y=e.extend({},n,i),f=function(){var t=[],e={};return layui.each(y.hideTool,function(t,i){e[i]=!0}),layui.each(y.tool,function(i,a){C[a]&&!e[a]&&t.push(C[a])}),t.join("")}(),m=e(['<div class="'+r+'">','<div class="layui-unselect layui-layedit-tool">'+f+"</div>",'<div class="layui-layedit-iframe">','<iframe id="'+u+'" name="'+u+'" textarea="'+t+'" frameborder="0"></iframe>',"</div>","</div>"].join(""));return l.ie&&l.ie<8?c.removeClass("layui-hide").addClass(o):(d[0]&&d.remove(),s.call(a,m,c[0],y),c.addClass("layui-hide").after(m),a.index)},c.prototype.getContent=function(t){var e=u(t);if(e[0])return d(e[0].document.body.innerHTML)},c.prototype.getText=function(t){var i=u(t);if(i[0])return e(i[0].document.body).text()},c.prototype.setContent=function(t,i,a){var l=u(t);l[0]&&(a?e(l[0].document.body).append(i):e(l[0].document.body).html(i),layedit.sync(t))},c.prototype.sync=function(t){var i=u(t);if(i[0]){var a=e("#"+i[1].attr("textarea"));a.val(d(i[0].document.body.innerHTML))}},c.prototype.getSelection=function(t){var e=u(t);if(e[0]){var i=m(e[0].document);return document.selection?i.text:i.toString()}};var s=function(t,i,a){var l=this,n=t.find("iframe");n.css({height:a.height}).on("load",function(){var o=n.contents(),r=n.prop("contentWindow"),c=o.find("head"),s=e(["<style>","*{margin: 0; padding: 0;}","body{padding: 10px; line-height: 20px; overflow-x: hidden; word-wrap: break-word; font: 14px Helvetica Neue,Helvetica,PingFang SC,Microsoft YaHei,Tahoma,Arial,sans-serif; -webkit-box-sizing: border-box !important; -moz-box-sizing: border-box !important; box-sizing: border-box !important;}","a{color:#01AAED; text-decoration:none;}a:hover{color:#c00}","p{margin-bottom: 10px;}","img{display: inline-block; border: none; vertical-align: middle;}","pre{margin: 10px 0; padding: 10px; line-height: 20px; border: 1px solid #ddd; border-left-width: 6px; background-color: #F2F2F2; color: #333; font-family: Courier New; font-size: 12px;}","</style>"].join("")),u=o.find("body");c.append(s),u.attr("contenteditable","true").css({"min-height":a.height}).html(i.value||""),y.apply(l,[r,n,i,a]),g.call(l,r,t,a)})},u=function(t){var i=e("#LAY_layedit_"+t),a=i.prop("contentWindow");return[a,i]},d=function(t){return 8==l.ie&&(t=t.replace(/<.+>/g,function(t){return t.toLowerCase()})),t},y=function(t,a,n,o){var r=t.document,c=e(r.body);c.on("keydown",function(t){var e=t.keyCode;if(13===e){var a=m(r),l=p(a),n=l.parentNode;if("pre"===n.tagName.toLowerCase()){if(t.shiftKey)return;return i.msg("\u8bf7\u6682\u65f6\u7528shift+enter"),!1}r.execCommand("formatBlock",!1,"<p>")}}),e(n).parents("form").on("submit",function(){var t=c.html();8==l.ie&&(t=t.replace(/<.+>/g,function(t){return t.toLowerCase()})),n.value=t}),c.on("paste",function(e){r.execCommand("formatBlock",!1,"<p>"),setTimeout(function(){f.call(t,c),n.value=c.html()},100)})},f=function(t){var i=this;i.document;t.find("*[style]").each(function(){var t=this.style.textAlign;this.removeAttribute("style"),e(this).css({"text-align":t||""})}),t.find("table").addClass("layui-table"),t.find("script,link").remove()},m=function(t){return t.selection?t.selection.createRange():t.getSelection().getRangeAt(0)},p=function(t){return t.endContainer||t.parentElement().childNodes[0]},v=function(t,i,a){var l=this.document,n=document.createElement(t);for(var o in i)n.setAttribute(o,i[o]);if(n.removeAttribute("text"),l.selection){var r=a.text||i.text;if("a"===t&&!r)return;r&&(n.innerHTML=r),a.pasteHTML(e(n).prop("outerHTML")),a.select()}else{var r=a.toString()||i.text;if("a"===t&&!r)return;r&&(n.innerHTML=r),a.deleteContents(),a.insertNode(n)}},h=function(t,i){var a=this.document,l="layedit-tool-active",n=p(m(a)),o=function(e){return t.find(".layedit-tool-"+e)};i&&i[i.hasClass(l)?"removeClass":"addClass"](l),t.find(">i").removeClass(l),o("unlink").addClass(r),e(n).parents().each(function(){var t=this.tagName.toLowerCase(),e=this.style.textAlign;"b"!==t&&"strong"!==t||o("b").addClass(l),"i"!==t&&"em"!==t||o("i").addClass(l),"u"===t&&o("u").addClass(l),"strike"===t&&o("d").addClass(l),"p"===t&&("center"===e?o("center").addClass(l):"right"===e?o("right").addClass(l):o("left").addClass(l)),"a"===t&&(o("link").addClass(l),o("unlink").removeClass(r))})},g=function(t,a,l){var n=t.document,o=e(n.body),c={link:function(i){var a=p(i),l=e(a).parent();b.call(o,{href:l.attr("href"),target:l.attr("target")},function(e){var a=l[0];"A"===a.tagName?a.href=e.url:v.call(t,"a",{target:e.target,href:e.url,text:e.url},i)})},unlink:function(t){n.execCommand("unlink")},face:function(e){x.call(this,function(i){v.call(t,"img",{src:i.src,alt:i.alt},e)})},image:function(a){var n=this;layui.use("upload",function(o){var r=l.uploadImage||{};o.render({url:r.url,method:r.type,elem:e(n).find("input")[0],done:function(e){0==e.code?(e.data=e.data||{},v.call(t,"img",{src:e.data.src,alt:e.data.title},a)):i.msg(e.msg||"\u4e0a\u4f20\u5931\u8d25")}})})},code:function(e){k.call(o,function(i){v.call(t,"pre",{text:i.code,"lay-lang":i.lang},e)})},help:function(){i.open({type:2,title:"\u5e2e\u52a9",area:["600px","380px"],shadeClose:!0,shade:.1,skin:"layui-layer-msg",content:["","no"]})}},s=a.find(".layui-layedit-tool"),u=function(){var i=e(this),a=i.attr("layedit-event"),l=i.attr("lay-command");if(!i.hasClass(r)){o.focus();var u=m(n);u.commonAncestorContainer;l?(n.execCommand(l),/justifyLeft|justifyCenter|justifyRight/.test(l)&&n.execCommand("formatBlock",!1,"<p>"),setTimeout(function(){o.focus()},10)):c[a]&&c[a].call(this,u),h.call(t,s,i)}},d=/image/;s.find(">i").on("mousedown",function(){var t=e(this),i=t.attr("layedit-event");d.test(i)||u.call(this)}).on("click",function(){var t=e(this),i=t.attr("layedit-event");d.test(i)&&u.call(this)}),o.on("click",function(){h.call(t,s),i.close(x.index)})},b=function(t,e){var l=this,n=i.open({type:1,id:"LAY_layedit_link",area:"350px",shade:.05,shadeClose:!0,moveType:1,title:"\u8d85\u94fe\u63a5",skin:"layui-layer-msg",content:['<ul class="layui-form" style="margin: 15px;">','<li class="layui-form-item">','<label class="layui-form-label" style="width: 60px;">URL</label>','<div class="layui-input-block" style="margin-left: 90px">','<input name="url" lay-verify="url" value="'+(t.href||"")+'" autofocus="true" autocomplete="off" class="layui-input">',"</div>","</li>",'<li class="layui-form-item">','<label class="layui-form-label" style="width: 60px;">\u6253\u5f00\u65b9\u5f0f</label>','<div class="layui-input-block" style="margin-left: 90px">','<input type="radio" name="target" value="_self" class="layui-input" title="\u5f53\u524d\u7a97\u53e3"'+("_self"!==t.target&&t.target?"":"checked")+">",'<input type="radio" name="target" value="_blank" class="layui-input" title="\u65b0\u7a97\u53e3" '+("_blank"===t.target?"checked":"")+">","</div>","</li>",'<li class="layui-form-item" style="text-align: center;">','<button type="button" lay-submit lay-filter="layedit-link-yes" class="layui-btn"> \u786e\u5b9a </button>','<button style="margin-left: 20px;" type="button" class="layui-btn layui-btn-primary"> \u53d6\u6d88 </button>',"</li>","</ul>"].join(""),success:function(t,n){var o="submit(layedit-link-yes)";a.render("radio"),t.find(".layui-btn-primary").on("click",function(){i.close(n),l.focus()}),a.on(o,function(t){i.close(b.index),e&&e(t.field)})}});b.index=n},x=function(t){var a=function(){var t=["[\u5fae\u7b11]","[\u563b\u563b]","[\u54c8\u54c8]","[\u53ef\u7231]","[\u53ef\u601c]","[\u6316\u9f3b]","[\u5403\u60ca]","[\u5bb3\u7f9e]","[\u6324\u773c]","[\u95ed\u5634]","[\u9119\u89c6]","[\u7231\u4f60]","[\u6cea]","[\u5077\u7b11]","[\u4eb2\u4eb2]","[\u751f\u75c5]","[\u592a\u5f00\u5fc3]","[\u767d\u773c]","[\u53f3\u54fc\u54fc]","[\u5de6\u54fc\u54fc]","[\u5618]","[\u8870]","[\u59d4\u5c48]","[\u5410]","[\u54c8\u6b20]","[\u62b1\u62b1]","[\u6012]","[\u7591\u95ee]","[\u998b\u5634]","[\u62dc\u62dc]","[\u601d\u8003]","[\u6c57]","[\u56f0]","[\u7761]","[\u94b1]","[\u5931\u671b]","[\u9177]","[\u8272]","[\u54fc]","[\u9f13\u638c]","[\u6655]","[\u60b2\u4f24]","[\u6293\u72c2]","[\u9ed1\u7ebf]","[\u9634\u9669]","[\u6012\u9a82]","[\u4e92\u7c89]","[\u5fc3]","[\u4f24\u5fc3]","[\u732a\u5934]","[\u718a\u732b]","[\u5154\u5b50]","[ok]","[\u8036]","[good]","[NO]","[\u8d5e]","[\u6765]","[\u5f31]","[\u8349\u6ce5\u9a6c]","[\u795e\u9a6c]","[\u56e7]","[\u6d6e\u4e91]","[\u7ed9\u529b]","[\u56f4\u89c2]","[\u5a01\u6b66]","[\u5965\u7279\u66fc]","[\u793c\u7269]","[\u949f]","[\u8bdd\u7b52]","[\u8721\u70db]","[\u86cb\u7cd5]"],e={};return layui.each(t,function(t,i){e[i]=layui.cache.dir+"images/face/"+t+".gif"}),e}();return x.hide=x.hide||function(t){"face"!==e(t.target).attr("layedit-event")&&i.close(x.index)},x.index=i.tips(function(){var t=[];return layui.each(a,function(e,i){t.push('<li title="'+e+'"><img src="'+i+'" alt="'+e+'"></li>')}),'<ul class="layui-clear">'+t.join("")+"</ul>"}(),this,{tips:1,time:0,skin:"layui-box layui-util-face",maxWidth:500,success:function(l,n){l.css({marginTop:-4,marginLeft:-10}).find(".layui-clear>li").on("click",function(){t&&t({src:a[this.title],alt:this.title}),i.close(n)}),e(document).off("click",x.hide).on("click",x.hide)}})},k=function(t){var e=this,l=i.open({type:1,id:"LAY_layedit_code",area:"550px",shade:.05,shadeClose:!0,moveType:1,title:"\u63d2\u5165\u4ee3\u7801",skin:"layui-layer-msg",content:['<ul class="layui-form layui-form-pane" style="margin: 15px;">','<li class="layui-form-item">','<label class="layui-form-label">\u8bf7\u9009\u62e9\u8bed\u8a00</label>','<div class="layui-input-block">','<select name="lang">','<option value="JavaScript">JavaScript</option>','<option value="HTML">HTML</option>','<option value="CSS">CSS</option>','<option value="Java">Java</option>','<option value="PHP">PHP</option>','<option value="C#">C#</option>','<option value="Python">Python</option>','<option value="Ruby">Ruby</option>','<option value="Go">Go</option>',"</select>","</div>","</li>",'<li class="layui-form-item layui-form-text">','<label class="layui-form-label">\u4ee3\u7801</label>','<div class="layui-input-block">','<textarea name="code" lay-verify="required" autofocus="true" class="layui-textarea" style="height: 200px;"></textarea>',"</div>","</li>",'<li class="layui-form-item" style="text-align: center;">','<button type="button" lay-submit lay-filter="layedit-code-yes" class="layui-btn"> \u786e\u5b9a </button>','<button style="margin-left: 20px;" type="button" class="layui-btn layui-btn-primary"> \u53d6\u6d88 </button>',"</li>","</ul>"].join(""),success:function(l,n){var o="submit(layedit-code-yes)";a.render("select"),l.find(".layui-btn-primary").on("click",function(){i.close(n),e.focus()}),a.on(o,function(e){i.close(k.index),t&&t(e.field)})}});k.index=l},C={html:'<i class="layui-icon layedit-tool-html" title="HTML\u6e90\u4ee3\u7801" lay-command="html" layedit-event="html"">&#xe64b;</i><span class="layedit-tool-mid"></span>',strong:'<i class="layui-icon layedit-tool-b" title="\u52a0\u7c97" lay-command="Bold" layedit-event="b"">&#xe62b;</i>',italic:'<i class="layui-icon layedit-tool-i" title="\u659c\u4f53" lay-command="italic" layedit-event="i"">&#xe644;</i>',underline:'<i class="layui-icon layedit-tool-u" title="\u4e0b\u5212\u7ebf" lay-command="underline" layedit-event="u"">&#xe646;</i>',del:'<i class="layui-icon layedit-tool-d" title="\u5220\u9664\u7ebf" lay-command="strikeThrough" layedit-event="d"">&#xe64f;</i>',"|":'<span class="layedit-tool-mid"></span>',left:'<i class="layui-icon layedit-tool-left" title="\u5de6\u5bf9\u9f50" lay-command="justifyLeft" layedit-event="left"">&#xe649;</i>',center:'<i class="layui-icon layedit-tool-center" title="\u5c45\u4e2d\u5bf9\u9f50" lay-command="justifyCenter" layedit-event="center"">&#xe647;</i>',right:'<i class="layui-icon layedit-tool-right" title="\u53f3\u5bf9\u9f50" lay-command="justifyRight" layedit-event="right"">&#xe648;</i>',link:'<i class="layui-icon layedit-tool-link" title="\u63d2\u5165\u94fe\u63a5" layedit-event="link"">&#xe64c;</i>',unlink:'<i class="layui-icon layedit-tool-unlink layui-disabled" title="\u6e05\u9664\u94fe\u63a5" lay-command="unlink" layedit-event="unlink"">&#xe64d;</i>',face:'<i class="layui-icon layedit-tool-face" title="\u8868\u60c5" layedit-event="face"">&#xe650;</i>',image:'<i class="layui-icon layedit-tool-image" title="\u56fe\u7247" layedit-event="image">&#xe64a;<input type="file" name="file"></i>',code:'<i class="layui-icon layedit-tool-code" title="\u63d2\u5165\u4ee3\u7801" layedit-event="code">&#xe64e;</i>',help:'<i class="layui-icon layedit-tool-help" title="\u5e2e\u52a9" layedit-event="help">&#xe607;</i>'},L=new c;t(n,L)});layui.define("jquery",function(a){"use strict";var e=layui.$;a("code",function(a){var l=[];a=a||{},a.elem=e(a.elem||".layui-code"),a.lang="lang"in a?a.lang:"code",a.elem.each(function(){l.push(this)}),layui.each(l.reverse(),function(l,i){var t=e(i),c=t.html();(t.attr("lay-encode")||a.encode)&&(c=c.replace(/&(?!#?[a-zA-Z0-9]+;)/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/'/g,"&#39;").replace(/"/g,"&quot;")),t.html('<ol class="layui-code-ol"><li>'+c.replace(/[\r\t\n]+/g,"</li><li>")+"</li></ol>"),t.find(">.layui-code-h3")[0]||t.prepend('<h3 class="layui-code-h3">'+(t.attr("lay-title")||a.title||"&lt;/&gt;")+'<a href="javascript:;">'+(t.attr("lay-lang")||a.lang||"")+"</a></h3>");var n=t.find(">.layui-code-ol");t.addClass("layui-box layui-code-view"),(t.attr("lay-skin")||a.skin)&&t.addClass("layui-code-"+(t.attr("lay-skin")||a.skin)),(n.find("li").length/100|0)>0&&n.css("margin-left",(n.find("li").length/100|0)+"px"),(t.attr("lay-height")||a.height)&&n.css("max-height",t.attr("lay-height")||a.height)})})}).addcss("modules/code.css?v=2","skincodecss");
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/login/login.js b/pluss-manage-page/src/main/resources/static/resources/auth/js/login/login.js
new file mode 100644
index 0000000..89dfb43
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/login/login.js
@@ -0,0 +1,180 @@
+var registerEnabled='false';
+var validCodeEnabled='false';
+var layer;
+$(function() {
+	layui.use(['layer'], function () {
+		layer = layui.layer;
+	});
+	var login = new Login();
+	login.init();
+});
+/**
+ * 功能：移除首尾空格
+ */
+String.prototype.trim = function() {
+	return this.replace(/(^[ \t\n\r]+)|([ \t\n\r]+$)/g, '');
+};
+
+var Login = function() {
+};
+
+Login.prototype = {
+	init : function() {
+		if (this.hasInit) // 是否已初始化
+			return false;
+		this.hasInit = true;
+		this.handeEvent();
+	
+		if (registerEnabled == 'true') {
+			$(".register").removeClass("hidden");
+		} else {
+			$(".register").addClass("hidden");
+		}
+		if (validCodeEnabled == 'true') {
+			$("#validCodeFormGroup").removeClass("hidden");
+		}
+
+		$("#username").focus();
+		this.handleFixInputPlaceholderForIE();
+	},
+	handeEvent : function() {
+		var me = this;
+		$('body').keydown(function(event) {// 处理回车事件
+			if (event.keyCode == 13)
+				me.login();
+		});
+		
+		$(document).on('click', '#reset', function(e) {// 重置
+			$('#loginForm')[0].reset();
+		});
+		$(document).on('click', '#login', function(e) {// 登录
+			me.login();
+		});
+	},
+	handleFixInputPlaceholderForIE : function() {
+		var isIE8 = !!navigator.userAgent.match(/MSIE 8.0/), isIE9 = !!navigator.userAgent
+				.match(/MSIE 9.0/), isIE10 = !!navigator.userAgent
+				.match(/MSIE 10.0/);
+		// fix html5 placeholder attribute for ie7 & ie8
+		if (isIE8 || isIE9) { // ie8 & ie9
+			$(
+					'input[placeholder]:not(.placeholder-no-fix), textarea[placeholder]:not(.placeholder-no-fix)')
+					.each(
+							function() {
+								var input = $(this);
+
+								if (input.val() === ''
+										&& input.attr("placeholder") !== '') {
+									input.addClass("placeholder").val(
+											input.attr('placeholder'));
+								}
+
+								input.focus(function() {
+									if (input.val() == input
+											.attr('placeholder')) {
+										input.val('');
+									}
+								});
+
+								input.blur(function() {
+									if (input.val() === ''
+											|| input.val() == input
+													.attr('placeholder')) {
+										input.val(input.attr('placeholder'));
+									}
+								});
+							});
+		}
+	},
+	/**
+	 * 登录
+	 */
+	login : function() {
+		var username = $("#username").val(), password = $("#password").val();
+
+		if (username == "") {
+			layer.msg("用户名或者密码为空");
+			$("#username").focus();
+			return;
+		}
+
+		if (registerEnabled == 'true'
+				&& !(/^((\(\d{2,3}\))|(\d{3}\-))?1\d{10}$/
+						.test(username.trim()))) {
+			layer.msg("请使用手机号码登录");
+			$("#username").focus();
+			throw new error("请使用手机号码登录");
+		}
+
+		if (password == "") {
+			layer.msg("用户名或者密码为空");
+			$("#password").focus();
+			return;
+		}
+		var _this = this;
+		var loading = layer.load(0, {
+			shade : 0.3
+		});
+		
+		var param = {
+			loginName : username,
+			password : password,
+			validCode : $("#validCode").val(),
+			'rememberme' : $('#rememberMe').is(':checked') ? 'on' : 'off'
+		};
+		
+		$.post(ctx + "/home!doLogin.do",
+				param, 
+				function(data) {
+					
+					if (data.result == 1) {
+						var __redirectUri=data.redirectUri;
+						
+						if(undefined == __redirectUri || null == __redirectUri || "" == __redirectUri||typeof(__redirectUri)=='undefined'){
+							window.location.href = ctx;
+						}else{
+							console.log("redirect to " + __redirectUri);
+							window.location.href = __redirectUri;
+						}
+						
+					} else if (data.result == 2) {
+
+						layer.close(loading);
+						param.kickout = false;
+						DialogUtil.confirm(data.message, function(rtn) {
+							if (rtn){
+
+								param.kickout = true;
+								$.post(ctx + "/login.htm",
+										param, 
+										function(data) {
+											param.kickout = false;
+											layer.close(loading);
+											if (data.result == 1) {
+												window.location.href = ctx
+														+ "/platform/console/main.htm";
+											} else {
+												layer.close(loading);
+												if (data.validCode) {
+													$("#validCodeFormGroup").removeClass("hidden");
+												}
+												layer.msg(data.message);
+											}
+								}, "json");
+
+							}
+
+						});
+						
+					}
+					else {
+						layer.close(loading);
+						layer.msg(data.message);
+					}
+					
+				}, "json");
+
+		
+	}
+
+};
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/login/swiper.min.js b/pluss-manage-page/src/main/resources/static/resources/auth/js/login/swiper.min.js
new file mode 100644
index 0000000..e1e1a63
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/login/swiper.min.js
@@ -0,0 +1,13 @@
+/**
+ * Swiper 4.4.6
+ * Most modern mobile touch slider and framework with hardware accelerated transitions
+ * http://www.idangero.us/swiper/
+ *
+ * Copyright 2014-2018 Vladimir Kharlampidi
+ *
+ * Released under the MIT License
+ *
+ * Released on: December 19, 2018
+ */
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):e.Swiper=t()}(this,function(){"use strict";var f="undefined"==typeof document?{body:{},addEventListener:function(){},removeEventListener:function(){},activeElement:{blur:function(){},nodeName:""},querySelector:function(){return null},querySelectorAll:function(){return[]},getElementById:function(){return null},createEvent:function(){return{initEvent:function(){}}},createElement:function(){return{children:[],childNodes:[],style:{},setAttribute:function(){},getElementsByTagName:function(){return[]}}},location:{hash:""}}:document,J="undefined"==typeof window?{document:f,navigator:{userAgent:""},location:{},history:{},CustomEvent:function(){return this},addEventListener:function(){},removeEventListener:function(){},getComputedStyle:function(){return{getPropertyValue:function(){return""}}},Image:function(){},Date:function(){},screen:{},setTimeout:function(){},clearTimeout:function(){}}:window,l=function(e){for(var t=0;t<e.length;t+=1)this[t]=e[t];return this.length=e.length,this};function L(e,t){var a=[],i=0;if(e&&!t&&e instanceof l)return e;if(e)if("string"==typeof e){var s,r,n=e.trim();if(0<=n.indexOf("<")&&0<=n.indexOf(">")){var o="div";for(0===n.indexOf("<li")&&(o="ul"),0===n.indexOf("<tr")&&(o="tbody"),0!==n.indexOf("<td")&&0!==n.indexOf("<th")||(o="tr"),0===n.indexOf("<tbody")&&(o="table"),0===n.indexOf("<option")&&(o="select"),(r=f.createElement(o)).innerHTML=n,i=0;i<r.childNodes.length;i+=1)a.push(r.childNodes[i])}else for(s=t||"#"!==e[0]||e.match(/[ .<>:~]/)?(t||f).querySelectorAll(e.trim()):[f.getElementById(e.trim().split("#")[1])],i=0;i<s.length;i+=1)s[i]&&a.push(s[i])}else if(e.nodeType||e===J||e===f)a.push(e);else if(0<e.length&&e[0].nodeType)for(i=0;i<e.length;i+=1)a.push(e[i]);return new l(a)}function r(e){for(var t=[],a=0;a<e.length;a+=1)-1===t.indexOf(e[a])&&t.push(e[a]);return t}L.fn=l.prototype,L.Class=l,L.Dom7=l;var t={addClass:function(e){if(void 0===e)return this;for(var t=e.split(" "),a=0;a<t.length;a+=1)for(var i=0;i<this.length;i+=1)void 0!==this[i]&&void 0!==this[i].classList&&this[i].classList.add(t[a]);return this},removeClass:function(e){for(var t=e.split(" "),a=0;a<t.length;a+=1)for(var i=0;i<this.length;i+=1)void 0!==this[i]&&void 0!==this[i].classList&&this[i].classList.remove(t[a]);return this},hasClass:function(e){return!!this[0]&&this[0].classList.contains(e)},toggleClass:function(e){for(var t=e.split(" "),a=0;a<t.length;a+=1)for(var i=0;i<this.length;i+=1)void 0!==this[i]&&void 0!==this[i].classList&&this[i].classList.toggle(t[a]);return this},attr:function(e,t){var a=arguments;if(1===arguments.length&&"string"==typeof e)return this[0]?this[0].getAttribute(e):void 0;for(var i=0;i<this.length;i+=1)if(2===a.length)this[i].setAttribute(e,t);else for(var s in e)this[i][s]=e[s],this[i].setAttribute(s,e[s]);return this},removeAttr:function(e){for(var t=0;t<this.length;t+=1)this[t].removeAttribute(e);return this},data:function(e,t){var a;if(void 0!==t){for(var i=0;i<this.length;i+=1)(a=this[i]).dom7ElementDataStorage||(a.dom7ElementDataStorage={}),a.dom7ElementDataStorage[e]=t;return this}if(a=this[0]){if(a.dom7ElementDataStorage&&e in a.dom7ElementDataStorage)return a.dom7ElementDataStorage[e];var s=a.getAttribute("data-"+e);return s||void 0}},transform:function(e){for(var t=0;t<this.length;t+=1){var a=this[t].style;a.webkitTransform=e,a.transform=e}return this},transition:function(e){"string"!=typeof e&&(e+="ms");for(var t=0;t<this.length;t+=1){var a=this[t].style;a.webkitTransitionDuration=e,a.transitionDuration=e}return this},on:function(){for(var e,t=[],a=arguments.length;a--;)t[a]=arguments[a];var i=t[0],r=t[1],n=t[2],s=t[3];function o(e){var t=e.target;if(t){var a=e.target.dom7EventData||[];if(a.indexOf(e)<0&&a.unshift(e),L(t).is(r))n.apply(t,a);else for(var i=L(t).parents(),s=0;s<i.length;s+=1)L(i[s]).is(r)&&n.apply(i[s],a)}}function l(e){var t=e&&e.target&&e.target.dom7EventData||[];t.indexOf(e)<0&&t.unshift(e),n.apply(this,t)}"function"==typeof t[1]&&(i=(e=t)[0],n=e[1],s=e[2],r=void 0),s||(s=!1);for(var d,p=i.split(" "),c=0;c<this.length;c+=1){var u=this[c];if(r)for(d=0;d<p.length;d+=1){var h=p[d];u.dom7LiveListeners||(u.dom7LiveListeners={}),u.dom7LiveListeners[h]||(u.dom7LiveListeners[h]=[]),u.dom7LiveListeners[h].push({listener:n,proxyListener:o}),u.addEventListener(h,o,s)}else for(d=0;d<p.length;d+=1){var v=p[d];u.dom7Listeners||(u.dom7Listeners={}),u.dom7Listeners[v]||(u.dom7Listeners[v]=[]),u.dom7Listeners[v].push({listener:n,proxyListener:l}),u.addEventListener(v,l,s)}}return this},off:function(){for(var e,t=[],a=arguments.length;a--;)t[a]=arguments[a];var i=t[0],s=t[1],r=t[2],n=t[3];"function"==typeof t[1]&&(i=(e=t)[0],r=e[1],n=e[2],s=void 0),n||(n=!1);for(var o=i.split(" "),l=0;l<o.length;l+=1)for(var d=o[l],p=0;p<this.length;p+=1){var c=this[p],u=void 0;if(!s&&c.dom7Listeners?u=c.dom7Listeners[d]:s&&c.dom7LiveListeners&&(u=c.dom7LiveListeners[d]),u&&u.length)for(var h=u.length-1;0<=h;h-=1){var v=u[h];r&&v.listener===r?(c.removeEventListener(d,v.proxyListener,n),u.splice(h,1)):r||(c.removeEventListener(d,v.proxyListener,n),u.splice(h,1))}}return this},trigger:function(){for(var e=[],t=arguments.length;t--;)e[t]=arguments[t];for(var a=e[0].split(" "),i=e[1],s=0;s<a.length;s+=1)for(var r=a[s],n=0;n<this.length;n+=1){var o=this[n],l=void 0;try{l=new J.CustomEvent(r,{detail:i,bubbles:!0,cancelable:!0})}catch(e){(l=f.createEvent("Event")).initEvent(r,!0,!0),l.detail=i}o.dom7EventData=e.filter(function(e,t){return 0<t}),o.dispatchEvent(l),o.dom7EventData=[],delete o.dom7EventData}return this},transitionEnd:function(t){var a,i=["webkitTransitionEnd","transitionend"],s=this;function r(e){if(e.target===this)for(t.call(this,e),a=0;a<i.length;a+=1)s.off(i[a],r)}if(t)for(a=0;a<i.length;a+=1)s.on(i[a],r);return this},outerWidth:function(e){if(0<this.length){if(e){var t=this.styles();return this[0].offsetWidth+parseFloat(t.getPropertyValue("margin-right"))+parseFloat(t.getPropertyValue("margin-left"))}return this[0].offsetWidth}return null},outerHeight:function(e){if(0<this.length){if(e){var t=this.styles();return this[0].offsetHeight+parseFloat(t.getPropertyValue("margin-top"))+parseFloat(t.getPropertyValue("margin-bottom"))}return this[0].offsetHeight}return null},offset:function(){if(0<this.length){var e=this[0],t=e.getBoundingClientRect(),a=f.body,i=e.clientTop||a.clientTop||0,s=e.clientLeft||a.clientLeft||0,r=e===J?J.scrollY:e.scrollTop,n=e===J?J.scrollX:e.scrollLeft;return{top:t.top+r-i,left:t.left+n-s}}return null},css:function(e,t){var a;if(1===arguments.length){if("string"!=typeof e){for(a=0;a<this.length;a+=1)for(var i in e)this[a].style[i]=e[i];return this}if(this[0])return J.getComputedStyle(this[0],null).getPropertyValue(e)}if(2===arguments.length&&"string"==typeof e){for(a=0;a<this.length;a+=1)this[a].style[e]=t;return this}return this},each:function(e){if(!e)return this;for(var t=0;t<this.length;t+=1)if(!1===e.call(this[t],t,this[t]))return this;return this},html:function(e){if(void 0===e)return this[0]?this[0].innerHTML:void 0;for(var t=0;t<this.length;t+=1)this[t].innerHTML=e;return this},text:function(e){if(void 0===e)return this[0]?this[0].textContent.trim():null;for(var t=0;t<this.length;t+=1)this[t].textContent=e;return this},is:function(e){var t,a,i=this[0];if(!i||void 0===e)return!1;if("string"==typeof e){if(i.matches)return i.matches(e);if(i.webkitMatchesSelector)return i.webkitMatchesSelector(e);if(i.msMatchesSelector)return i.msMatchesSelector(e);for(t=L(e),a=0;a<t.length;a+=1)if(t[a]===i)return!0;return!1}if(e===f)return i===f;if(e===J)return i===J;if(e.nodeType||e instanceof l){for(t=e.nodeType?[e]:e,a=0;a<t.length;a+=1)if(t[a]===i)return!0;return!1}return!1},index:function(){var e,t=this[0];if(t){for(e=0;null!==(t=t.previousSibling);)1===t.nodeType&&(e+=1);return e}},eq:function(e){if(void 0===e)return this;var t,a=this.length;return new l(a-1<e?[]:e<0?(t=a+e)<0?[]:[this[t]]:[this[e]])},append:function(){for(var e,t=[],a=arguments.length;a--;)t[a]=arguments[a];for(var i=0;i<t.length;i+=1){e=t[i];for(var s=0;s<this.length;s+=1)if("string"==typeof e){var r=f.createElement("div");for(r.innerHTML=e;r.firstChild;)this[s].appendChild(r.firstChild)}else if(e instanceof l)for(var n=0;n<e.length;n+=1)this[s].appendChild(e[n]);else this[s].appendChild(e)}return this},prepend:function(e){var t,a;for(t=0;t<this.length;t+=1)if("string"==typeof e){var i=f.createElement("div");for(i.innerHTML=e,a=i.childNodes.length-1;0<=a;a-=1)this[t].insertBefore(i.childNodes[a],this[t].childNodes[0])}else if(e instanceof l)for(a=0;a<e.length;a+=1)this[t].insertBefore(e[a],this[t].childNodes[0]);else this[t].insertBefore(e,this[t].childNodes[0]);return this},next:function(e){return 0<this.length?e?this[0].nextElementSibling&&L(this[0].nextElementSibling).is(e)?new l([this[0].nextElementSibling]):new l([]):this[0].nextElementSibling?new l([this[0].nextElementSibling]):new l([]):new l([])},nextAll:function(e){var t=[],a=this[0];if(!a)return new l([]);for(;a.nextElementSibling;){var i=a.nextElementSibling;e?L(i).is(e)&&t.push(i):t.push(i),a=i}return new l(t)},prev:function(e){if(0<this.length){var t=this[0];return e?t.previousElementSibling&&L(t.previousElementSibling).is(e)?new l([t.previousElementSibling]):new l([]):t.previousElementSibling?new l([t.previousElementSibling]):new l([])}return new l([])},prevAll:function(e){var t=[],a=this[0];if(!a)return new l([]);for(;a.previousElementSibling;){var i=a.previousElementSibling;e?L(i).is(e)&&t.push(i):t.push(i),a=i}return new l(t)},parent:function(e){for(var t=[],a=0;a<this.length;a+=1)null!==this[a].parentNode&&(e?L(this[a].parentNode).is(e)&&t.push(this[a].parentNode):t.push(this[a].parentNode));return L(r(t))},parents:function(e){for(var t=[],a=0;a<this.length;a+=1)for(var i=this[a].parentNode;i;)e?L(i).is(e)&&t.push(i):t.push(i),i=i.parentNode;return L(r(t))},closest:function(e){var t=this;return void 0===e?new l([]):(t.is(e)||(t=t.parents(e).eq(0)),t)},find:function(e){for(var t=[],a=0;a<this.length;a+=1)for(var i=this[a].querySelectorAll(e),s=0;s<i.length;s+=1)t.push(i[s]);return new l(t)},children:function(e){for(var t=[],a=0;a<this.length;a+=1)for(var i=this[a].childNodes,s=0;s<i.length;s+=1)e?1===i[s].nodeType&&L(i[s]).is(e)&&t.push(i[s]):1===i[s].nodeType&&t.push(i[s]);return new l(r(t))},remove:function(){for(var e=0;e<this.length;e+=1)this[e].parentNode&&this[e].parentNode.removeChild(this[e]);return this},add:function(){for(var e=[],t=arguments.length;t--;)e[t]=arguments[t];var a,i;for(a=0;a<e.length;a+=1){var s=L(e[a]);for(i=0;i<s.length;i+=1)this[this.length]=s[i],this.length+=1}return this},styles:function(){return this[0]?J.getComputedStyle(this[0],null):{}}};Object.keys(t).forEach(function(e){L.fn[e]=t[e]});var e,a,i,ee={deleteProps:function(e){var t=e;Object.keys(t).forEach(function(e){try{t[e]=null}catch(e){}try{delete t[e]}catch(e){}})},nextTick:function(e,t){return void 0===t&&(t=0),setTimeout(e,t)},now:function(){return Date.now()},getTranslate:function(e,t){var a,i,s;void 0===t&&(t="x");var r=J.getComputedStyle(e,null);return J.WebKitCSSMatrix?(6<(i=r.transform||r.webkitTransform).split(",").length&&(i=i.split(", ").map(function(e){return e.replace(",",".")}).join(", ")),s=new J.WebKitCSSMatrix("none"===i?"":i)):a=(s=r.MozTransform||r.OTransform||r.MsTransform||r.msTransform||r.transform||r.getPropertyValue("transform").replace("translate(","matrix(1, 0, 0, 1,")).toString().split(","),"x"===t&&(i=J.WebKitCSSMatrix?s.m41:16===a.length?parseFloat(a[12]):parseFloat(a[4])),"y"===t&&(i=J.WebKitCSSMatrix?s.m42:16===a.length?parseFloat(a[13]):parseFloat(a[5])),i||0},parseUrlQuery:function(e){var t,a,i,s,r={},n=e||J.location.href;if("string"==typeof n&&n.length)for(s=(a=(n=-1<n.indexOf("?")?n.replace(/\S*\?/,""):"").split("&").filter(function(e){return""!==e})).length,t=0;t<s;t+=1)i=a[t].replace(/#\S+/g,"").split("="),r[decodeURIComponent(i[0])]=void 0===i[1]?void 0:decodeURIComponent(i[1])||"";return r},isObject:function(e){return"object"==typeof e&&null!==e&&e.constructor&&e.constructor===Object},extend:function(){for(var e=[],t=arguments.length;t--;)e[t]=arguments[t];for(var a=Object(e[0]),i=1;i<e.length;i+=1){var s=e[i];if(null!=s)for(var r=Object.keys(Object(s)),n=0,o=r.length;n<o;n+=1){var l=r[n],d=Object.getOwnPropertyDescriptor(s,l);void 0!==d&&d.enumerable&&(ee.isObject(a[l])&&ee.isObject(s[l])?ee.extend(a[l],s[l]):!ee.isObject(a[l])&&ee.isObject(s[l])?(a[l]={},ee.extend(a[l],s[l])):a[l]=s[l])}}return a}},te=(i=f.createElement("div"),{touch:J.Modernizr&&!0===J.Modernizr.touch||!!(0<J.navigator.maxTouchPoints||"ontouchstart"in J||J.DocumentTouch&&f instanceof J.DocumentTouch),pointerEvents:!!(J.navigator.pointerEnabled||J.PointerEvent||"maxTouchPoints"in J.navigator),prefixedPointerEvents:!!J.navigator.msPointerEnabled,transition:(a=i.style,"transition"in a||"webkitTransition"in a||"MozTransition"in a),transforms3d:J.Modernizr&&!0===J.Modernizr.csstransforms3d||(e=i.style,"webkitPerspective"in e||"MozPerspective"in e||"OPerspective"in e||"MsPerspective"in e||"perspective"in e),flexbox:function(){for(var e=i.style,t="alignItems webkitAlignItems webkitBoxAlign msFlexAlign mozBoxAlign webkitFlexDirection msFlexDirection mozBoxDirection mozBoxOrient webkitBoxDirection webkitBoxOrient".split(" "),a=0;a<t.length;a+=1)if(t[a]in e)return!0;return!1}(),observer:"MutationObserver"in J||"WebkitMutationObserver"in J,passiveListener:function(){var e=!1;try{var t=Object.defineProperty({},"passive",{get:function(){e=!0}});J.addEventListener("testPassiveListener",null,t)}catch(e){}return e}(),gestures:"ongesturestart"in J}),s=function(e){void 0===e&&(e={});var t=this;t.params=e,t.eventsListeners={},t.params&&t.params.on&&Object.keys(t.params.on).forEach(function(e){t.on(e,t.params.on[e])})},n={components:{configurable:!0}};s.prototype.on=function(e,t,a){var i=this;if("function"!=typeof t)return i;var s=a?"unshift":"push";return e.split(" ").forEach(function(e){i.eventsListeners[e]||(i.eventsListeners[e]=[]),i.eventsListeners[e][s](t)}),i},s.prototype.once=function(i,s,e){var r=this;if("function"!=typeof s)return r;return r.on(i,function e(){for(var t=[],a=arguments.length;a--;)t[a]=arguments[a];s.apply(r,t),r.off(i,e)},e)},s.prototype.off=function(e,i){var s=this;return s.eventsListeners&&e.split(" ").forEach(function(a){void 0===i?s.eventsListeners[a]=[]:s.eventsListeners[a]&&s.eventsListeners[a].length&&s.eventsListeners[a].forEach(function(e,t){e===i&&s.eventsListeners[a].splice(t,1)})}),s},s.prototype.emit=function(){for(var e=[],t=arguments.length;t--;)e[t]=arguments[t];var a,i,s,r=this;return r.eventsListeners&&("string"==typeof e[0]||Array.isArray(e[0])?(a=e[0],i=e.slice(1,e.length),s=r):(a=e[0].events,i=e[0].data,s=e[0].context||r),(Array.isArray(a)?a:a.split(" ")).forEach(function(e){if(r.eventsListeners&&r.eventsListeners[e]){var t=[];r.eventsListeners[e].forEach(function(e){t.push(e)}),t.forEach(function(e){e.apply(s,i)})}})),r},s.prototype.useModulesParams=function(a){var i=this;i.modules&&Object.keys(i.modules).forEach(function(e){var t=i.modules[e];t.params&&ee.extend(a,t.params)})},s.prototype.useModules=function(i){void 0===i&&(i={});var s=this;s.modules&&Object.keys(s.modules).forEach(function(e){var a=s.modules[e],t=i[e]||{};a.instance&&Object.keys(a.instance).forEach(function(e){var t=a.instance[e];s[e]="function"==typeof t?t.bind(s):t}),a.on&&s.on&&Object.keys(a.on).forEach(function(e){s.on(e,a.on[e])}),a.create&&a.create.bind(s)(t)})},n.components.set=function(e){this.use&&this.use(e)},s.installModule=function(t){for(var e=[],a=arguments.length-1;0<a--;)e[a]=arguments[a+1];var i=this;i.prototype.modules||(i.prototype.modules={});var s=t.name||Object.keys(i.prototype.modules).length+"_"+ee.now();return(i.prototype.modules[s]=t).proto&&Object.keys(t.proto).forEach(function(e){i.prototype[e]=t.proto[e]}),t.static&&Object.keys(t.static).forEach(function(e){i[e]=t.static[e]}),t.install&&t.install.apply(i,e),i},s.use=function(e){for(var t=[],a=arguments.length-1;0<a--;)t[a]=arguments[a+1];var i=this;return Array.isArray(e)?(e.forEach(function(e){return i.installModule(e)}),i):i.installModule.apply(i,[e].concat(t))},Object.defineProperties(s,n);var o={updateSize:function(){var e,t,a=this,i=a.$el;e=void 0!==a.params.width?a.params.width:i[0].clientWidth,t=void 0!==a.params.height?a.params.height:i[0].clientHeight,0===e&&a.isHorizontal()||0===t&&a.isVertical()||(e=e-parseInt(i.css("padding-left"),10)-parseInt(i.css("padding-right"),10),t=t-parseInt(i.css("padding-top"),10)-parseInt(i.css("padding-bottom"),10),ee.extend(a,{width:e,height:t,size:a.isHorizontal()?e:t}))},updateSlides:function(){var e=this,t=e.params,a=e.$wrapperEl,i=e.size,s=e.rtlTranslate,r=e.wrongRTL,n=e.virtual&&t.virtual.enabled,o=n?e.virtual.slides.length:e.slides.length,l=a.children("."+e.params.slideClass),d=n?e.virtual.slides.length:l.length,p=[],c=[],u=[],h=t.slidesOffsetBefore;"function"==typeof h&&(h=t.slidesOffsetBefore.call(e));var v=t.slidesOffsetAfter;"function"==typeof v&&(v=t.slidesOffsetAfter.call(e));var f=e.snapGrid.length,m=e.snapGrid.length,g=t.spaceBetween,b=-h,w=0,y=0;if(void 0!==i){var x,T;"string"==typeof g&&0<=g.indexOf("%")&&(g=parseFloat(g.replace("%",""))/100*i),e.virtualSize=-g,s?l.css({marginLeft:"",marginTop:""}):l.css({marginRight:"",marginBottom:""}),1<t.slidesPerColumn&&(x=Math.floor(d/t.slidesPerColumn)===d/e.params.slidesPerColumn?d:Math.ceil(d/t.slidesPerColumn)*t.slidesPerColumn,"auto"!==t.slidesPerView&&"row"===t.slidesPerColumnFill&&(x=Math.max(x,t.slidesPerView*t.slidesPerColumn)));for(var E,S=t.slidesPerColumn,C=x/S,M=Math.floor(d/t.slidesPerColumn),k=0;k<d;k+=1){T=0;var P=l.eq(k);if(1<t.slidesPerColumn){var z=void 0,$=void 0,L=void 0;"column"===t.slidesPerColumnFill?(L=k-($=Math.floor(k/S))*S,(M<$||$===M&&L===S-1)&&S<=(L+=1)&&(L=0,$+=1),z=$+L*x/S,P.css({"-webkit-box-ordinal-group":z,"-moz-box-ordinal-group":z,"-ms-flex-order":z,"-webkit-order":z,order:z})):$=k-(L=Math.floor(k/C))*C,P.css("margin-"+(e.isHorizontal()?"top":"left"),0!==L&&t.spaceBetween&&t.spaceBetween+"px").attr("data-swiper-column",$).attr("data-swiper-row",L)}if("none"!==P.css("display")){if("auto"===t.slidesPerView){var I=J.getComputedStyle(P[0],null),D=P[0].style.transform,O=P[0].style.webkitTransform;if(D&&(P[0].style.transform="none"),O&&(P[0].style.webkitTransform="none"),t.roundLengths)T=e.isHorizontal()?P.outerWidth(!0):P.outerHeight(!0);else if(e.isHorizontal()){var A=parseFloat(I.getPropertyValue("width")),N=parseFloat(I.getPropertyValue("padding-left")),H=parseFloat(I.getPropertyValue("padding-right")),G=parseFloat(I.getPropertyValue("margin-left")),B=parseFloat(I.getPropertyValue("margin-right")),X=I.getPropertyValue("box-sizing");T=X&&"border-box"===X?A+G+B:A+N+H+G+B}else{var Y=parseFloat(I.getPropertyValue("height")),V=parseFloat(I.getPropertyValue("padding-top")),F=parseFloat(I.getPropertyValue("padding-bottom")),R=parseFloat(I.getPropertyValue("margin-top")),q=parseFloat(I.getPropertyValue("margin-bottom")),W=I.getPropertyValue("box-sizing");T=W&&"border-box"===W?Y+R+q:Y+V+F+R+q}D&&(P[0].style.transform=D),O&&(P[0].style.webkitTransform=O),t.roundLengths&&(T=Math.floor(T))}else T=(i-(t.slidesPerView-1)*g)/t.slidesPerView,t.roundLengths&&(T=Math.floor(T)),l[k]&&(e.isHorizontal()?l[k].style.width=T+"px":l[k].style.height=T+"px");l[k]&&(l[k].swiperSlideSize=T),u.push(T),t.centeredSlides?(b=b+T/2+w/2+g,0===w&&0!==k&&(b=b-i/2-g),0===k&&(b=b-i/2-g),Math.abs(b)<.001&&(b=0),t.roundLengths&&(b=Math.floor(b)),y%t.slidesPerGroup==0&&p.push(b),c.push(b)):(t.roundLengths&&(b=Math.floor(b)),y%t.slidesPerGroup==0&&p.push(b),c.push(b),b=b+T+g),e.virtualSize+=T+g,w=T,y+=1}}if(e.virtualSize=Math.max(e.virtualSize,i)+v,s&&r&&("slide"===t.effect||"coverflow"===t.effect)&&a.css({width:e.virtualSize+t.spaceBetween+"px"}),te.flexbox&&!t.setWrapperSize||(e.isHorizontal()?a.css({width:e.virtualSize+t.spaceBetween+"px"}):a.css({height:e.virtualSize+t.spaceBetween+"px"})),1<t.slidesPerColumn&&(e.virtualSize=(T+t.spaceBetween)*x,e.virtualSize=Math.ceil(e.virtualSize/t.slidesPerColumn)-t.spaceBetween,e.isHorizontal()?a.css({width:e.virtualSize+t.spaceBetween+"px"}):a.css({height:e.virtualSize+t.spaceBetween+"px"}),t.centeredSlides)){E=[];for(var j=0;j<p.length;j+=1){var U=p[j];t.roundLengths&&(U=Math.floor(U)),p[j]<e.virtualSize+p[0]&&E.push(U)}p=E}if(!t.centeredSlides){E=[];for(var K=0;K<p.length;K+=1){var _=p[K];t.roundLengths&&(_=Math.floor(_)),p[K]<=e.virtualSize-i&&E.push(_)}p=E,1<Math.floor(e.virtualSize-i)-Math.floor(p[p.length-1])&&p.push(e.virtualSize-i)}if(0===p.length&&(p=[0]),0!==t.spaceBetween&&(e.isHorizontal()?s?l.css({marginLeft:g+"px"}):l.css({marginRight:g+"px"}):l.css({marginBottom:g+"px"})),t.centerInsufficientSlides){var Z=0;if(u.forEach(function(e){Z+=e+(t.spaceBetween?t.spaceBetween:0)}),(Z-=t.spaceBetween)<i){var Q=(i-Z)/2;p.forEach(function(e,t){p[t]=e-Q}),c.forEach(function(e,t){c[t]=e+Q})}}ee.extend(e,{slides:l,snapGrid:p,slidesGrid:c,slidesSizesGrid:u}),d!==o&&e.emit("slidesLengthChange"),p.length!==f&&(e.params.watchOverflow&&e.checkOverflow(),e.emit("snapGridLengthChange")),c.length!==m&&e.emit("slidesGridLengthChange"),(t.watchSlidesProgress||t.watchSlidesVisibility)&&e.updateSlidesOffset()}},updateAutoHeight:function(e){var t,a=this,i=[],s=0;if("number"==typeof e?a.setTransition(e):!0===e&&a.setTransition(a.params.speed),"auto"!==a.params.slidesPerView&&1<a.params.slidesPerView)for(t=0;t<Math.ceil(a.params.slidesPerView);t+=1){var r=a.activeIndex+t;if(r>a.slides.length)break;i.push(a.slides.eq(r)[0])}else i.push(a.slides.eq(a.activeIndex)[0]);for(t=0;t<i.length;t+=1)if(void 0!==i[t]){var n=i[t].offsetHeight;s=s<n?n:s}s&&a.$wrapperEl.css("height",s+"px")},updateSlidesOffset:function(){for(var e=this.slides,t=0;t<e.length;t+=1)e[t].swiperSlideOffset=this.isHorizontal()?e[t].offsetLeft:e[t].offsetTop},updateSlidesProgress:function(e){void 0===e&&(e=this&&this.translate||0);var t=this,a=t.params,i=t.slides,s=t.rtlTranslate;if(0!==i.length){void 0===i[0].swiperSlideOffset&&t.updateSlidesOffset();var r=-e;s&&(r=e),i.removeClass(a.slideVisibleClass),t.visibleSlidesIndexes=[],t.visibleSlides=[];for(var n=0;n<i.length;n+=1){var o=i[n],l=(r+(a.centeredSlides?t.minTranslate():0)-o.swiperSlideOffset)/(o.swiperSlideSize+a.spaceBetween);if(a.watchSlidesVisibility){var d=-(r-o.swiperSlideOffset),p=d+t.slidesSizesGrid[n];(0<=d&&d<t.size||0<p&&p<=t.size||d<=0&&p>=t.size)&&(t.visibleSlides.push(o),t.visibleSlidesIndexes.push(n),i.eq(n).addClass(a.slideVisibleClass))}o.progress=s?-l:l}t.visibleSlides=L(t.visibleSlides)}},updateProgress:function(e){void 0===e&&(e=this&&this.translate||0);var t=this,a=t.params,i=t.maxTranslate()-t.minTranslate(),s=t.progress,r=t.isBeginning,n=t.isEnd,o=r,l=n;0===i?n=r=!(s=0):(r=(s=(e-t.minTranslate())/i)<=0,n=1<=s),ee.extend(t,{progress:s,isBeginning:r,isEnd:n}),(a.watchSlidesProgress||a.watchSlidesVisibility)&&t.updateSlidesProgress(e),r&&!o&&t.emit("reachBeginning toEdge"),n&&!l&&t.emit("reachEnd toEdge"),(o&&!r||l&&!n)&&t.emit("fromEdge"),t.emit("progress",s)},updateSlidesClasses:function(){var e,t=this,a=t.slides,i=t.params,s=t.$wrapperEl,r=t.activeIndex,n=t.realIndex,o=t.virtual&&i.virtual.enabled;a.removeClass(i.slideActiveClass+" "+i.slideNextClass+" "+i.slidePrevClass+" "+i.slideDuplicateActiveClass+" "+i.slideDuplicateNextClass+" "+i.slideDuplicatePrevClass),(e=o?t.$wrapperEl.find("."+i.slideClass+'[data-swiper-slide-index="'+r+'"]'):a.eq(r)).addClass(i.slideActiveClass),i.loop&&(e.hasClass(i.slideDuplicateClass)?s.children("."+i.slideClass+":not(."+i.slideDuplicateClass+')[data-swiper-slide-index="'+n+'"]').addClass(i.slideDuplicateActiveClass):s.children("."+i.slideClass+"."+i.slideDuplicateClass+'[data-swiper-slide-index="'+n+'"]').addClass(i.slideDuplicateActiveClass));var l=e.nextAll("."+i.slideClass).eq(0).addClass(i.slideNextClass);i.loop&&0===l.length&&(l=a.eq(0)).addClass(i.slideNextClass);var d=e.prevAll("."+i.slideClass).eq(0).addClass(i.slidePrevClass);i.loop&&0===d.length&&(d=a.eq(-1)).addClass(i.slidePrevClass),i.loop&&(l.hasClass(i.slideDuplicateClass)?s.children("."+i.slideClass+":not(."+i.slideDuplicateClass+')[data-swiper-slide-index="'+l.attr("data-swiper-slide-index")+'"]').addClass(i.slideDuplicateNextClass):s.children("."+i.slideClass+"."+i.slideDuplicateClass+'[data-swiper-slide-index="'+l.attr("data-swiper-slide-index")+'"]').addClass(i.slideDuplicateNextClass),d.hasClass(i.slideDuplicateClass)?s.children("."+i.slideClass+":not(."+i.slideDuplicateClass+')[data-swiper-slide-index="'+d.attr("data-swiper-slide-index")+'"]').addClass(i.slideDuplicatePrevClass):s.children("."+i.slideClass+"."+i.slideDuplicateClass+'[data-swiper-slide-index="'+d.attr("data-swiper-slide-index")+'"]').addClass(i.slideDuplicatePrevClass))},updateActiveIndex:function(e){var t,a=this,i=a.rtlTranslate?a.translate:-a.translate,s=a.slidesGrid,r=a.snapGrid,n=a.params,o=a.activeIndex,l=a.realIndex,d=a.snapIndex,p=e;if(void 0===p){for(var c=0;c<s.length;c+=1)void 0!==s[c+1]?i>=s[c]&&i<s[c+1]-(s[c+1]-s[c])/2?p=c:i>=s[c]&&i<s[c+1]&&(p=c+1):i>=s[c]&&(p=c);n.normalizeSlideIndex&&(p<0||void 0===p)&&(p=0)}if((t=0<=r.indexOf(i)?r.indexOf(i):Math.floor(p/n.slidesPerGroup))>=r.length&&(t=r.length-1),p!==o){var u=parseInt(a.slides.eq(p).attr("data-swiper-slide-index")||p,10);ee.extend(a,{snapIndex:t,realIndex:u,previousIndex:o,activeIndex:p}),a.emit("activeIndexChange"),a.emit("snapIndexChange"),l!==u&&a.emit("realIndexChange"),a.emit("slideChange")}else t!==d&&(a.snapIndex=t,a.emit("snapIndexChange"))},updateClickedSlide:function(e){var t=this,a=t.params,i=L(e.target).closest("."+a.slideClass)[0],s=!1;if(i)for(var r=0;r<t.slides.length;r+=1)t.slides[r]===i&&(s=!0);if(!i||!s)return t.clickedSlide=void 0,void(t.clickedIndex=void 0);t.clickedSlide=i,t.virtual&&t.params.virtual.enabled?t.clickedIndex=parseInt(L(i).attr("data-swiper-slide-index"),10):t.clickedIndex=L(i).index(),a.slideToClickedSlide&&void 0!==t.clickedIndex&&t.clickedIndex!==t.activeIndex&&t.slideToClickedSlide()}};var d={getTranslate:function(e){void 0===e&&(e=this.isHorizontal()?"x":"y");var t=this.params,a=this.rtlTranslate,i=this.translate,s=this.$wrapperEl;if(t.virtualTranslate)return a?-i:i;var r=ee.getTranslate(s[0],e);return a&&(r=-r),r||0},setTranslate:function(e,t){var a=this,i=a.rtlTranslate,s=a.params,r=a.$wrapperEl,n=a.progress,o=0,l=0;a.isHorizontal()?o=i?-e:e:l=e,s.roundLengths&&(o=Math.floor(o),l=Math.floor(l)),s.virtualTranslate||(te.transforms3d?r.transform("translate3d("+o+"px, "+l+"px, 0px)"):r.transform("translate("+o+"px, "+l+"px)")),a.previousTranslate=a.translate,a.translate=a.isHorizontal()?o:l;var d=a.maxTranslate()-a.minTranslate();(0===d?0:(e-a.minTranslate())/d)!==n&&a.updateProgress(e),a.emit("setTranslate",a.translate,t)},minTranslate:function(){return-this.snapGrid[0]},maxTranslate:function(){return-this.snapGrid[this.snapGrid.length-1]}};var p={setTransition:function(e,t){this.$wrapperEl.transition(e),this.emit("setTransition",e,t)},transitionStart:function(e,t){void 0===e&&(e=!0);var a=this,i=a.activeIndex,s=a.params,r=a.previousIndex;s.autoHeight&&a.updateAutoHeight();var n=t;if(n||(n=r<i?"next":i<r?"prev":"reset"),a.emit("transitionStart"),e&&i!==r){if("reset"===n)return void a.emit("slideResetTransitionStart");a.emit("slideChangeTransitionStart"),"next"===n?a.emit("slideNextTransitionStart"):a.emit("slidePrevTransitionStart")}},transitionEnd:function(e,t){void 0===e&&(e=!0);var a=this,i=a.activeIndex,s=a.previousIndex;a.animating=!1,a.setTransition(0);var r=t;if(r||(r=s<i?"next":i<s?"prev":"reset"),a.emit("transitionEnd"),e&&i!==s){if("reset"===r)return void a.emit("slideResetTransitionEnd");a.emit("slideChangeTransitionEnd"),"next"===r?a.emit("slideNextTransitionEnd"):a.emit("slidePrevTransitionEnd")}}};var c={slideTo:function(e,t,a,i){void 0===e&&(e=0),void 0===t&&(t=this.params.speed),void 0===a&&(a=!0);var s=this,r=e;r<0&&(r=0);var n=s.params,o=s.snapGrid,l=s.slidesGrid,d=s.previousIndex,p=s.activeIndex,c=s.rtlTranslate;if(s.animating&&n.preventInteractionOnTransition)return!1;var u=Math.floor(r/n.slidesPerGroup);u>=o.length&&(u=o.length-1),(p||n.initialSlide||0)===(d||0)&&a&&s.emit("beforeSlideChangeStart");var h,v=-o[u];if(s.updateProgress(v),n.normalizeSlideIndex)for(var f=0;f<l.length;f+=1)-Math.floor(100*v)>=Math.floor(100*l[f])&&(r=f);if(s.initialized&&r!==p){if(!s.allowSlideNext&&v<s.translate&&v<s.minTranslate())return!1;if(!s.allowSlidePrev&&v>s.translate&&v>s.maxTranslate()&&(p||0)!==r)return!1}return h=p<r?"next":r<p?"prev":"reset",c&&-v===s.translate||!c&&v===s.translate?(s.updateActiveIndex(r),n.autoHeight&&s.updateAutoHeight(),s.updateSlidesClasses(),"slide"!==n.effect&&s.setTranslate(v),"reset"!==h&&(s.transitionStart(a,h),s.transitionEnd(a,h)),!1):(0!==t&&te.transition?(s.setTransition(t),s.setTranslate(v),s.updateActiveIndex(r),s.updateSlidesClasses(),s.emit("beforeTransitionStart",t,i),s.transitionStart(a,h),s.animating||(s.animating=!0,s.onSlideToWrapperTransitionEnd||(s.onSlideToWrapperTransitionEnd=function(e){s&&!s.destroyed&&e.target===this&&(s.$wrapperEl[0].removeEventListener("transitionend",s.onSlideToWrapperTransitionEnd),s.$wrapperEl[0].removeEventListener("webkitTransitionEnd",s.onSlideToWrapperTransitionEnd),s.onSlideToWrapperTransitionEnd=null,delete s.onSlideToWrapperTransitionEnd,s.transitionEnd(a,h))}),s.$wrapperEl[0].addEventListener("transitionend",s.onSlideToWrapperTransitionEnd),s.$wrapperEl[0].addEventListener("webkitTransitionEnd",s.onSlideToWrapperTransitionEnd))):(s.setTransition(0),s.setTranslate(v),s.updateActiveIndex(r),s.updateSlidesClasses(),s.emit("beforeTransitionStart",t,i),s.transitionStart(a,h),s.transitionEnd(a,h)),!0)},slideToLoop:function(e,t,a,i){void 0===e&&(e=0),void 0===t&&(t=this.params.speed),void 0===a&&(a=!0);var s=e;return this.params.loop&&(s+=this.loopedSlides),this.slideTo(s,t,a,i)},slideNext:function(e,t,a){void 0===e&&(e=this.params.speed),void 0===t&&(t=!0);var i=this,s=i.params,r=i.animating;return s.loop?!r&&(i.loopFix(),i._clientLeft=i.$wrapperEl[0].clientLeft,i.slideTo(i.activeIndex+s.slidesPerGroup,e,t,a)):i.slideTo(i.activeIndex+s.slidesPerGroup,e,t,a)},slidePrev:function(e,t,a){void 0===e&&(e=this.params.speed),void 0===t&&(t=!0);var i=this,s=i.params,r=i.animating,n=i.snapGrid,o=i.slidesGrid,l=i.rtlTranslate;if(s.loop){if(r)return!1;i.loopFix(),i._clientLeft=i.$wrapperEl[0].clientLeft}function d(e){return e<0?-Math.floor(Math.abs(e)):Math.floor(e)}var p,c=d(l?i.translate:-i.translate),u=n.map(function(e){return d(e)}),h=(o.map(function(e){return d(e)}),n[u.indexOf(c)],n[u.indexOf(c)-1]);return void 0!==h&&(p=o.indexOf(h))<0&&(p=i.activeIndex-1),i.slideTo(p,e,t,a)},slideReset:function(e,t,a){return void 0===e&&(e=this.params.speed),void 0===t&&(t=!0),this.slideTo(this.activeIndex,e,t,a)},slideToClosest:function(e,t,a){void 0===e&&(e=this.params.speed),void 0===t&&(t=!0);var i=this,s=i.activeIndex,r=Math.floor(s/i.params.slidesPerGroup);if(r<i.snapGrid.length-1){var n=i.rtlTranslate?i.translate:-i.translate,o=i.snapGrid[r];(i.snapGrid[r+1]-o)/2<n-o&&(s=i.params.slidesPerGroup)}return i.slideTo(s,e,t,a)},slideToClickedSlide:function(){var e,t=this,a=t.params,i=t.$wrapperEl,s="auto"===a.slidesPerView?t.slidesPerViewDynamic():a.slidesPerView,r=t.clickedIndex;if(a.loop){if(t.animating)return;e=parseInt(L(t.clickedSlide).attr("data-swiper-slide-index"),10),a.centeredSlides?r<t.loopedSlides-s/2||r>t.slides.length-t.loopedSlides+s/2?(t.loopFix(),r=i.children("."+a.slideClass+'[data-swiper-slide-index="'+e+'"]:not(.'+a.slideDuplicateClass+")").eq(0).index(),ee.nextTick(function(){t.slideTo(r)})):t.slideTo(r):r>t.slides.length-s?(t.loopFix(),r=i.children("."+a.slideClass+'[data-swiper-slide-index="'+e+'"]:not(.'+a.slideDuplicateClass+")").eq(0).index(),ee.nextTick(function(){t.slideTo(r)})):t.slideTo(r)}else t.slideTo(r)}};var u={loopCreate:function(){var i=this,e=i.params,t=i.$wrapperEl;t.children("."+e.slideClass+"."+e.slideDuplicateClass).remove();var s=t.children("."+e.slideClass);if(e.loopFillGroupWithBlank){var a=e.slidesPerGroup-s.length%e.slidesPerGroup;if(a!==e.slidesPerGroup){for(var r=0;r<a;r+=1){var n=L(f.createElement("div")).addClass(e.slideClass+" "+e.slideBlankClass);t.append(n)}s=t.children("."+e.slideClass)}}"auto"!==e.slidesPerView||e.loopedSlides||(e.loopedSlides=s.length),i.loopedSlides=parseInt(e.loopedSlides||e.slidesPerView,10),i.loopedSlides+=e.loopAdditionalSlides,i.loopedSlides>s.length&&(i.loopedSlides=s.length);var o=[],l=[];s.each(function(e,t){var a=L(t);e<i.loopedSlides&&l.push(t),e<s.length&&e>=s.length-i.loopedSlides&&o.push(t),a.attr("data-swiper-slide-index",e)});for(var d=0;d<l.length;d+=1)t.append(L(l[d].cloneNode(!0)).addClass(e.slideDuplicateClass));for(var p=o.length-1;0<=p;p-=1)t.prepend(L(o[p].cloneNode(!0)).addClass(e.slideDuplicateClass))},loopFix:function(){var e,t=this,a=t.params,i=t.activeIndex,s=t.slides,r=t.loopedSlides,n=t.allowSlidePrev,o=t.allowSlideNext,l=t.snapGrid,d=t.rtlTranslate;t.allowSlidePrev=!0,t.allowSlideNext=!0;var p=-l[i]-t.getTranslate();i<r?(e=s.length-3*r+i,e+=r,t.slideTo(e,0,!1,!0)&&0!==p&&t.setTranslate((d?-t.translate:t.translate)-p)):("auto"===a.slidesPerView&&2*r<=i||i>=s.length-r)&&(e=-s.length+i+r,e+=r,t.slideTo(e,0,!1,!0)&&0!==p&&t.setTranslate((d?-t.translate:t.translate)-p));t.allowSlidePrev=n,t.allowSlideNext=o},loopDestroy:function(){var e=this.$wrapperEl,t=this.params,a=this.slides;e.children("."+t.slideClass+"."+t.slideDuplicateClass+",."+t.slideClass+"."+t.slideBlankClass).remove(),a.removeAttr("data-swiper-slide-index")}};var h={setGrabCursor:function(e){if(!(te.touch||!this.params.simulateTouch||this.params.watchOverflow&&this.isLocked)){var t=this.el;t.style.cursor="move",t.style.cursor=e?"-webkit-grabbing":"-webkit-grab",t.style.cursor=e?"-moz-grabbin":"-moz-grab",t.style.cursor=e?"grabbing":"grab"}},unsetGrabCursor:function(){te.touch||this.params.watchOverflow&&this.isLocked||(this.el.style.cursor="")}};var v={appendSlide:function(e){var t=this,a=t.$wrapperEl,i=t.params;if(i.loop&&t.loopDestroy(),"object"==typeof e&&"length"in e)for(var s=0;s<e.length;s+=1)e[s]&&a.append(e[s]);else a.append(e);i.loop&&t.loopCreate(),i.observer&&te.observer||t.update()},prependSlide:function(e){var t=this,a=t.params,i=t.$wrapperEl,s=t.activeIndex;a.loop&&t.loopDestroy();var r=s+1;if("object"==typeof e&&"length"in e){for(var n=0;n<e.length;n+=1)e[n]&&i.prepend(e[n]);r=s+e.length}else i.prepend(e);a.loop&&t.loopCreate(),a.observer&&te.observer||t.update(),t.slideTo(r,0,!1)},addSlide:function(e,t){var a=this,i=a.$wrapperEl,s=a.params,r=a.activeIndex;s.loop&&(r-=a.loopedSlides,a.loopDestroy(),a.slides=i.children("."+s.slideClass));var n=a.slides.length;if(e<=0)a.prependSlide(t);else if(n<=e)a.appendSlide(t);else{for(var o=e<r?r+1:r,l=[],d=n-1;e<=d;d-=1){var p=a.slides.eq(d);p.remove(),l.unshift(p)}if("object"==typeof t&&"length"in t){for(var c=0;c<t.length;c+=1)t[c]&&i.append(t[c]);o=e<r?r+t.length:r}else i.append(t);for(var u=0;u<l.length;u+=1)i.append(l[u]);s.loop&&a.loopCreate(),s.observer&&te.observer||a.update(),s.loop?a.slideTo(o+a.loopedSlides,0,!1):a.slideTo(o,0,!1)}},removeSlide:function(e){var t=this,a=t.params,i=t.$wrapperEl,s=t.activeIndex;a.loop&&(s-=t.loopedSlides,t.loopDestroy(),t.slides=i.children("."+a.slideClass));var r,n=s;if("object"==typeof e&&"length"in e){for(var o=0;o<e.length;o+=1)r=e[o],t.slides[r]&&t.slides.eq(r).remove(),r<n&&(n-=1);n=Math.max(n,0)}else r=e,t.slides[r]&&t.slides.eq(r).remove(),r<n&&(n-=1),n=Math.max(n,0);a.loop&&t.loopCreate(),a.observer&&te.observer||t.update(),a.loop?t.slideTo(n+t.loopedSlides,0,!1):t.slideTo(n,0,!1)},removeAllSlides:function(){for(var e=[],t=0;t<this.slides.length;t+=1)e.push(t);this.removeSlide(e)}},m=function(){var e=J.navigator.userAgent,t={ios:!1,android:!1,androidChrome:!1,desktop:!1,windows:!1,iphone:!1,ipod:!1,ipad:!1,cordova:J.cordova||J.phonegap,phonegap:J.cordova||J.phonegap},a=e.match(/(Windows Phone);?[\s\/]+([\d.]+)?/),i=e.match(/(Android);?[\s\/]+([\d.]+)?/),s=e.match(/(iPad).*OS\s([\d_]+)/),r=e.match(/(iPod)(.*OS\s([\d_]+))?/),n=!s&&e.match(/(iPhone\sOS|iOS)\s([\d_]+)/);if(a&&(t.os="windows",t.osVersion=a[2],t.windows=!0),i&&!a&&(t.os="android",t.osVersion=i[2],t.android=!0,t.androidChrome=0<=e.toLowerCase().indexOf("chrome")),(s||n||r)&&(t.os="ios",t.ios=!0),n&&!r&&(t.osVersion=n[2].replace(/_/g,"."),t.iphone=!0),s&&(t.osVersion=s[2].replace(/_/g,"."),t.ipad=!0),r&&(t.osVersion=r[3]?r[3].replace(/_/g,"."):null,t.iphone=!0),t.ios&&t.osVersion&&0<=e.indexOf("Version/")&&"10"===t.osVersion.split(".")[0]&&(t.osVersion=e.toLowerCase().split("version/")[1].split(" ")[0]),t.desktop=!(t.os||t.android||t.webView),t.webView=(n||s||r)&&e.match(/.*AppleWebKit(?!.*Safari)/i),t.os&&"ios"===t.os){var o=t.osVersion.split("."),l=f.querySelector('meta[name="viewport"]');t.minimalUi=!t.webView&&(r||n)&&(1*o[0]==7?1<=1*o[1]:7<1*o[0])&&l&&0<=l.getAttribute("content").indexOf("minimal-ui")}return t.pixelRatio=J.devicePixelRatio||1,t}();function g(){var e=this,t=e.params,a=e.el;if(!a||0!==a.offsetWidth){t.breakpoints&&e.setBreakpoint();var i=e.allowSlideNext,s=e.allowSlidePrev,r=e.snapGrid;if(e.allowSlideNext=!0,e.allowSlidePrev=!0,e.updateSize(),e.updateSlides(),t.freeMode){var n=Math.min(Math.max(e.translate,e.maxTranslate()),e.minTranslate());e.setTranslate(n),e.updateActiveIndex(),e.updateSlidesClasses(),t.autoHeight&&e.updateAutoHeight()}else e.updateSlidesClasses(),("auto"===t.slidesPerView||1<t.slidesPerView)&&e.isEnd&&!e.params.centeredSlides?e.slideTo(e.slides.length-1,0,!1,!0):e.slideTo(e.activeIndex,0,!1,!0);e.allowSlidePrev=s,e.allowSlideNext=i,e.params.watchOverflow&&r!==e.snapGrid&&e.checkOverflow()}}var b={attachEvents:function(){var e=this,t=e.params,a=e.touchEvents,i=e.el,s=e.wrapperEl;e.onTouchStart=function(e){var t=this,a=t.touchEventsData,i=t.params,s=t.touches;if(!t.animating||!i.preventInteractionOnTransition){var r=e;if(r.originalEvent&&(r=r.originalEvent),a.isTouchEvent="touchstart"===r.type,(a.isTouchEvent||!("which"in r)||3!==r.which)&&!(!a.isTouchEvent&&"button"in r&&0<r.button||a.isTouched&&a.isMoved))if(i.noSwiping&&L(r.target).closest(i.noSwipingSelector?i.noSwipingSelector:"."+i.noSwipingClass)[0])t.allowClick=!0;else if(!i.swipeHandler||L(r).closest(i.swipeHandler)[0]){s.currentX="touchstart"===r.type?r.targetTouches[0].pageX:r.pageX,s.currentY="touchstart"===r.type?r.targetTouches[0].pageY:r.pageY;var n=s.currentX,o=s.currentY,l=i.edgeSwipeDetection||i.iOSEdgeSwipeDetection,d=i.edgeSwipeThreshold||i.iOSEdgeSwipeThreshold;if(!l||!(n<=d||n>=J.screen.width-d)){if(ee.extend(a,{isTouched:!0,isMoved:!1,allowTouchCallbacks:!0,isScrolling:void 0,startMoving:void 0}),s.startX=n,s.startY=o,a.touchStartTime=ee.now(),t.allowClick=!0,t.updateSize(),t.swipeDirection=void 0,0<i.threshold&&(a.allowThresholdMove=!1),"touchstart"!==r.type){var p=!0;L(r.target).is(a.formElements)&&(p=!1),f.activeElement&&L(f.activeElement).is(a.formElements)&&f.activeElement!==r.target&&f.activeElement.blur();var c=p&&t.allowTouchMove&&i.touchStartPreventDefault;(i.touchStartForcePreventDefault||c)&&r.preventDefault()}t.emit("touchStart",r)}}}}.bind(e),e.onTouchMove=function(e){var t=this,a=t.touchEventsData,i=t.params,s=t.touches,r=t.rtlTranslate,n=e;if(n.originalEvent&&(n=n.originalEvent),a.isTouched){if(!a.isTouchEvent||"mousemove"!==n.type){var o="touchmove"===n.type?n.targetTouches[0].pageX:n.pageX,l="touchmove"===n.type?n.targetTouches[0].pageY:n.pageY;if(n.preventedByNestedSwiper)return s.startX=o,void(s.startY=l);if(!t.allowTouchMove)return t.allowClick=!1,void(a.isTouched&&(ee.extend(s,{startX:o,startY:l,currentX:o,currentY:l}),a.touchStartTime=ee.now()));if(a.isTouchEvent&&i.touchReleaseOnEdges&&!i.loop)if(t.isVertical()){if(l<s.startY&&t.translate<=t.maxTranslate()||l>s.startY&&t.translate>=t.minTranslate())return a.isTouched=!1,void(a.isMoved=!1)}else if(o<s.startX&&t.translate<=t.maxTranslate()||o>s.startX&&t.translate>=t.minTranslate())return;if(a.isTouchEvent&&f.activeElement&&n.target===f.activeElement&&L(n.target).is(a.formElements))return a.isMoved=!0,void(t.allowClick=!1);if(a.allowTouchCallbacks&&t.emit("touchMove",n),!(n.targetTouches&&1<n.targetTouches.length)){s.currentX=o,s.currentY=l;var d,p=s.currentX-s.startX,c=s.currentY-s.startY;if(!(t.params.threshold&&Math.sqrt(Math.pow(p,2)+Math.pow(c,2))<t.params.threshold))if(void 0===a.isScrolling&&(t.isHorizontal()&&s.currentY===s.startY||t.isVertical()&&s.currentX===s.startX?a.isScrolling=!1:25<=p*p+c*c&&(d=180*Math.atan2(Math.abs(c),Math.abs(p))/Math.PI,a.isScrolling=t.isHorizontal()?d>i.touchAngle:90-d>i.touchAngle)),a.isScrolling&&t.emit("touchMoveOpposite",n),void 0===a.startMoving&&(s.currentX===s.startX&&s.currentY===s.startY||(a.startMoving=!0)),a.isScrolling)a.isTouched=!1;else if(a.startMoving){t.allowClick=!1,n.preventDefault(),i.touchMoveStopPropagation&&!i.nested&&n.stopPropagation(),a.isMoved||(i.loop&&t.loopFix(),a.startTranslate=t.getTranslate(),t.setTransition(0),t.animating&&t.$wrapperEl.trigger("webkitTransitionEnd transitionend"),a.allowMomentumBounce=!1,!i.grabCursor||!0!==t.allowSlideNext&&!0!==t.allowSlidePrev||t.setGrabCursor(!0),t.emit("sliderFirstMove",n)),t.emit("sliderMove",n),a.isMoved=!0;var u=t.isHorizontal()?p:c;s.diff=u,u*=i.touchRatio,r&&(u=-u),t.swipeDirection=0<u?"prev":"next",a.currentTranslate=u+a.startTranslate;var h=!0,v=i.resistanceRatio;if(i.touchReleaseOnEdges&&(v=0),0<u&&a.currentTranslate>t.minTranslate()?(h=!1,i.resistance&&(a.currentTranslate=t.minTranslate()-1+Math.pow(-t.minTranslate()+a.startTranslate+u,v))):u<0&&a.currentTranslate<t.maxTranslate()&&(h=!1,i.resistance&&(a.currentTranslate=t.maxTranslate()+1-Math.pow(t.maxTranslate()-a.startTranslate-u,v))),h&&(n.preventedByNestedSwiper=!0),!t.allowSlideNext&&"next"===t.swipeDirection&&a.currentTranslate<a.startTranslate&&(a.currentTranslate=a.startTranslate),!t.allowSlidePrev&&"prev"===t.swipeDirection&&a.currentTranslate>a.startTranslate&&(a.currentTranslate=a.startTranslate),0<i.threshold){if(!(Math.abs(u)>i.threshold||a.allowThresholdMove))return void(a.currentTranslate=a.startTranslate);if(!a.allowThresholdMove)return a.allowThresholdMove=!0,s.startX=s.currentX,s.startY=s.currentY,a.currentTranslate=a.startTranslate,void(s.diff=t.isHorizontal()?s.currentX-s.startX:s.currentY-s.startY)}i.followFinger&&((i.freeMode||i.watchSlidesProgress||i.watchSlidesVisibility)&&(t.updateActiveIndex(),t.updateSlidesClasses()),i.freeMode&&(0===a.velocities.length&&a.velocities.push({position:s[t.isHorizontal()?"startX":"startY"],time:a.touchStartTime}),a.velocities.push({position:s[t.isHorizontal()?"currentX":"currentY"],time:ee.now()})),t.updateProgress(a.currentTranslate),t.setTranslate(a.currentTranslate))}}}}else a.startMoving&&a.isScrolling&&t.emit("touchMoveOpposite",n)}.bind(e),e.onTouchEnd=function(e){var t=this,a=t.touchEventsData,i=t.params,s=t.touches,r=t.rtlTranslate,n=t.$wrapperEl,o=t.slidesGrid,l=t.snapGrid,d=e;if(d.originalEvent&&(d=d.originalEvent),a.allowTouchCallbacks&&t.emit("touchEnd",d),a.allowTouchCallbacks=!1,!a.isTouched)return a.isMoved&&i.grabCursor&&t.setGrabCursor(!1),a.isMoved=!1,void(a.startMoving=!1);i.grabCursor&&a.isMoved&&a.isTouched&&(!0===t.allowSlideNext||!0===t.allowSlidePrev)&&t.setGrabCursor(!1);var p,c=ee.now(),u=c-a.touchStartTime;if(t.allowClick&&(t.updateClickedSlide(d),t.emit("tap",d),u<300&&300<c-a.lastClickTime&&(a.clickTimeout&&clearTimeout(a.clickTimeout),a.clickTimeout=ee.nextTick(function(){t&&!t.destroyed&&t.emit("click",d)},300)),u<300&&c-a.lastClickTime<300&&(a.clickTimeout&&clearTimeout(a.clickTimeout),t.emit("doubleTap",d))),a.lastClickTime=ee.now(),ee.nextTick(function(){t.destroyed||(t.allowClick=!0)}),!a.isTouched||!a.isMoved||!t.swipeDirection||0===s.diff||a.currentTranslate===a.startTranslate)return a.isTouched=!1,a.isMoved=!1,void(a.startMoving=!1);if(a.isTouched=!1,a.isMoved=!1,a.startMoving=!1,p=i.followFinger?r?t.translate:-t.translate:-a.currentTranslate,i.freeMode){if(p<-t.minTranslate())return void t.slideTo(t.activeIndex);if(p>-t.maxTranslate())return void(t.slides.length<l.length?t.slideTo(l.length-1):t.slideTo(t.slides.length-1));if(i.freeModeMomentum){if(1<a.velocities.length){var h=a.velocities.pop(),v=a.velocities.pop(),f=h.position-v.position,m=h.time-v.time;t.velocity=f/m,t.velocity/=2,Math.abs(t.velocity)<i.freeModeMinimumVelocity&&(t.velocity=0),(150<m||300<ee.now()-h.time)&&(t.velocity=0)}else t.velocity=0;t.velocity*=i.freeModeMomentumVelocityRatio,a.velocities.length=0;var g=1e3*i.freeModeMomentumRatio,b=t.velocity*g,w=t.translate+b;r&&(w=-w);var y,x,T=!1,E=20*Math.abs(t.velocity)*i.freeModeMomentumBounceRatio;if(w<t.maxTranslate())i.freeModeMomentumBounce?(w+t.maxTranslate()<-E&&(w=t.maxTranslate()-E),y=t.maxTranslate(),T=!0,a.allowMomentumBounce=!0):w=t.maxTranslate(),i.loop&&i.centeredSlides&&(x=!0);else if(w>t.minTranslate())i.freeModeMomentumBounce?(w-t.minTranslate()>E&&(w=t.minTranslate()+E),y=t.minTranslate(),T=!0,a.allowMomentumBounce=!0):w=t.minTranslate(),i.loop&&i.centeredSlides&&(x=!0);else if(i.freeModeSticky){for(var S,C=0;C<l.length;C+=1)if(l[C]>-w){S=C;break}w=-(w=Math.abs(l[S]-w)<Math.abs(l[S-1]-w)||"next"===t.swipeDirection?l[S]:l[S-1])}if(x&&t.once("transitionEnd",function(){t.loopFix()}),0!==t.velocity)g=r?Math.abs((-w-t.translate)/t.velocity):Math.abs((w-t.translate)/t.velocity);else if(i.freeModeSticky)return void t.slideToClosest();i.freeModeMomentumBounce&&T?(t.updateProgress(y),t.setTransition(g),t.setTranslate(w),t.transitionStart(!0,t.swipeDirection),t.animating=!0,n.transitionEnd(function(){t&&!t.destroyed&&a.allowMomentumBounce&&(t.emit("momentumBounce"),t.setTransition(i.speed),t.setTranslate(y),n.transitionEnd(function(){t&&!t.destroyed&&t.transitionEnd()}))})):t.velocity?(t.updateProgress(w),t.setTransition(g),t.setTranslate(w),t.transitionStart(!0,t.swipeDirection),t.animating||(t.animating=!0,n.transitionEnd(function(){t&&!t.destroyed&&t.transitionEnd()}))):t.updateProgress(w),t.updateActiveIndex(),t.updateSlidesClasses()}else if(i.freeModeSticky)return void t.slideToClosest();(!i.freeModeMomentum||u>=i.longSwipesMs)&&(t.updateProgress(),t.updateActiveIndex(),t.updateSlidesClasses())}else{for(var M=0,k=t.slidesSizesGrid[0],P=0;P<o.length;P+=i.slidesPerGroup)void 0!==o[P+i.slidesPerGroup]?p>=o[P]&&p<o[P+i.slidesPerGroup]&&(k=o[(M=P)+i.slidesPerGroup]-o[P]):p>=o[P]&&(M=P,k=o[o.length-1]-o[o.length-2]);var z=(p-o[M])/k;if(u>i.longSwipesMs){if(!i.longSwipes)return void t.slideTo(t.activeIndex);"next"===t.swipeDirection&&(z>=i.longSwipesRatio?t.slideTo(M+i.slidesPerGroup):t.slideTo(M)),"prev"===t.swipeDirection&&(z>1-i.longSwipesRatio?t.slideTo(M+i.slidesPerGroup):t.slideTo(M))}else{if(!i.shortSwipes)return void t.slideTo(t.activeIndex);"next"===t.swipeDirection&&t.slideTo(M+i.slidesPerGroup),"prev"===t.swipeDirection&&t.slideTo(M)}}}.bind(e),e.onClick=function(e){this.allowClick||(this.params.preventClicks&&e.preventDefault(),this.params.preventClicksPropagation&&this.animating&&(e.stopPropagation(),e.stopImmediatePropagation()))}.bind(e);var r="container"===t.touchEventsTarget?i:s,n=!!t.nested;if(te.touch||!te.pointerEvents&&!te.prefixedPointerEvents){if(te.touch){var o=!("touchstart"!==a.start||!te.passiveListener||!t.passiveListeners)&&{passive:!0,capture:!1};r.addEventListener(a.start,e.onTouchStart,o),r.addEventListener(a.move,e.onTouchMove,te.passiveListener?{passive:!1,capture:n}:n),r.addEventListener(a.end,e.onTouchEnd,o)}(t.simulateTouch&&!m.ios&&!m.android||t.simulateTouch&&!te.touch&&m.ios)&&(r.addEventListener("mousedown",e.onTouchStart,!1),f.addEventListener("mousemove",e.onTouchMove,n),f.addEventListener("mouseup",e.onTouchEnd,!1))}else r.addEventListener(a.start,e.onTouchStart,!1),f.addEventListener(a.move,e.onTouchMove,n),f.addEventListener(a.end,e.onTouchEnd,!1);(t.preventClicks||t.preventClicksPropagation)&&r.addEventListener("click",e.onClick,!0),e.on(m.ios||m.android?"resize orientationchange observerUpdate":"resize observerUpdate",g,!0)},detachEvents:function(){var e=this,t=e.params,a=e.touchEvents,i=e.el,s=e.wrapperEl,r="container"===t.touchEventsTarget?i:s,n=!!t.nested;if(te.touch||!te.pointerEvents&&!te.prefixedPointerEvents){if(te.touch){var o=!("onTouchStart"!==a.start||!te.passiveListener||!t.passiveListeners)&&{passive:!0,capture:!1};r.removeEventListener(a.start,e.onTouchStart,o),r.removeEventListener(a.move,e.onTouchMove,n),r.removeEventListener(a.end,e.onTouchEnd,o)}(t.simulateTouch&&!m.ios&&!m.android||t.simulateTouch&&!te.touch&&m.ios)&&(r.removeEventListener("mousedown",e.onTouchStart,!1),f.removeEventListener("mousemove",e.onTouchMove,n),f.removeEventListener("mouseup",e.onTouchEnd,!1))}else r.removeEventListener(a.start,e.onTouchStart,!1),f.removeEventListener(a.move,e.onTouchMove,n),f.removeEventListener(a.end,e.onTouchEnd,!1);(t.preventClicks||t.preventClicksPropagation)&&r.removeEventListener("click",e.onClick,!0),e.off(m.ios||m.android?"resize orientationchange observerUpdate":"resize observerUpdate",g)}};var w,y={setBreakpoint:function(){var e=this,t=e.activeIndex,a=e.initialized,i=e.loopedSlides;void 0===i&&(i=0);var s=e.params,r=s.breakpoints;if(r&&(!r||0!==Object.keys(r).length)){var n=e.getBreakpoint(r);if(n&&e.currentBreakpoint!==n){var o=n in r?r[n]:void 0;o&&["slidesPerView","spaceBetween","slidesPerGroup"].forEach(function(e){var t=o[e];void 0!==t&&(o[e]="slidesPerView"!==e||"AUTO"!==t&&"auto"!==t?"slidesPerView"===e?parseFloat(t):parseInt(t,10):"auto")});var l=o||e.originalParams,d=s.loop&&l.slidesPerView!==s.slidesPerView;ee.extend(e.params,l),ee.extend(e,{allowTouchMove:e.params.allowTouchMove,allowSlideNext:e.params.allowSlideNext,allowSlidePrev:e.params.allowSlidePrev}),e.currentBreakpoint=n,d&&a&&(e.loopDestroy(),e.loopCreate(),e.updateSlides(),e.slideTo(t-i+e.loopedSlides,0,!1)),e.emit("breakpoint",l)}}},getBreakpoint:function(e){if(e){var t=!1,a=[];Object.keys(e).forEach(function(e){a.push(e)}),a.sort(function(e,t){return parseInt(e,10)-parseInt(t,10)});for(var i=0;i<a.length;i+=1){var s=a[i];this.params.breakpointsInverse?s<=J.innerWidth&&(t=s):s>=J.innerWidth&&!t&&(t=s)}return t||"max"}}},I={isIE:!!J.navigator.userAgent.match(/Trident/g)||!!J.navigator.userAgent.match(/MSIE/g),isEdge:!!J.navigator.userAgent.match(/Edge/g),isSafari:(w=J.navigator.userAgent.toLowerCase(),0<=w.indexOf("safari")&&w.indexOf("chrome")<0&&w.indexOf("android")<0),isUiWebView:/(iPhone|iPod|iPad).*AppleWebKit(?!.*Safari)/i.test(J.navigator.userAgent)};var x={init:!0,direction:"horizontal",touchEventsTarget:"container",initialSlide:0,speed:300,preventInteractionOnTransition:!1,edgeSwipeDetection:!1,edgeSwipeThreshold:20,freeMode:!1,freeModeMomentum:!0,freeModeMomentumRatio:1,freeModeMomentumBounce:!0,freeModeMomentumBounceRatio:1,freeModeMomentumVelocityRatio:1,freeModeSticky:!1,freeModeMinimumVelocity:.02,autoHeight:!1,setWrapperSize:!1,virtualTranslate:!1,effect:"slide",breakpoints:void 0,breakpointsInverse:!1,spaceBetween:0,slidesPerView:1,slidesPerColumn:1,slidesPerColumnFill:"column",slidesPerGroup:1,centeredSlides:!1,slidesOffsetBefore:0,slidesOffsetAfter:0,normalizeSlideIndex:!0,centerInsufficientSlides:!1,watchOverflow:!1,roundLengths:!1,touchRatio:1,touchAngle:45,simulateTouch:!0,shortSwipes:!0,longSwipes:!0,longSwipesRatio:.5,longSwipesMs:300,followFinger:!0,allowTouchMove:!0,threshold:0,touchMoveStopPropagation:!0,touchStartPreventDefault:!0,touchStartForcePreventDefault:!1,touchReleaseOnEdges:!1,uniqueNavElements:!0,resistance:!0,resistanceRatio:.85,watchSlidesProgress:!1,watchSlidesVisibility:!1,grabCursor:!1,preventClicks:!0,preventClicksPropagation:!0,slideToClickedSlide:!1,preloadImages:!0,updateOnImagesReady:!0,loop:!1,loopAdditionalSlides:0,loopedSlides:null,loopFillGroupWithBlank:!1,allowSlidePrev:!0,allowSlideNext:!0,swipeHandler:null,noSwiping:!0,noSwipingClass:"swiper-no-swiping",noSwipingSelector:null,passiveListeners:!0,containerModifierClass:"swiper-container-",slideClass:"swiper-slide",slideBlankClass:"swiper-slide-invisible-blank",slideActiveClass:"swiper-slide-active",slideDuplicateActiveClass:"swiper-slide-duplicate-active",slideVisibleClass:"swiper-slide-visible",slideDuplicateClass:"swiper-slide-duplicate",slideNextClass:"swiper-slide-next",slideDuplicateNextClass:"swiper-slide-duplicate-next",slidePrevClass:"swiper-slide-prev",slideDuplicatePrevClass:"swiper-slide-duplicate-prev",wrapperClass:"swiper-wrapper",runCallbacksOnInit:!0},T={update:o,translate:d,transition:p,slide:c,loop:u,grabCursor:h,manipulation:v,events:b,breakpoints:y,checkOverflow:{checkOverflow:function(){var e=this,t=e.isLocked;e.isLocked=1===e.snapGrid.length,e.allowSlideNext=!e.isLocked,e.allowSlidePrev=!e.isLocked,t!==e.isLocked&&e.emit(e.isLocked?"lock":"unlock"),t&&t!==e.isLocked&&(e.isEnd=!1,e.navigation.update())}},classes:{addClasses:function(){var t=this.classNames,a=this.params,e=this.rtl,i=this.$el,s=[];s.push(a.direction),a.freeMode&&s.push("free-mode"),te.flexbox||s.push("no-flexbox"),a.autoHeight&&s.push("autoheight"),e&&s.push("rtl"),1<a.slidesPerColumn&&s.push("multirow"),m.android&&s.push("android"),m.ios&&s.push("ios"),(I.isIE||I.isEdge)&&(te.pointerEvents||te.prefixedPointerEvents)&&s.push("wp8-"+a.direction),s.forEach(function(e){t.push(a.containerModifierClass+e)}),i.addClass(t.join(" "))},removeClasses:function(){var e=this.$el,t=this.classNames;e.removeClass(t.join(" "))}},images:{loadImage:function(e,t,a,i,s,r){var n;function o(){r&&r()}e.complete&&s?o():t?((n=new J.Image).onload=o,n.onerror=o,i&&(n.sizes=i),a&&(n.srcset=a),t&&(n.src=t)):o()},preloadImages:function(){var e=this;function t(){null!=e&&e&&!e.destroyed&&(void 0!==e.imagesLoaded&&(e.imagesLoaded+=1),e.imagesLoaded===e.imagesToLoad.length&&(e.params.updateOnImagesReady&&e.update(),e.emit("imagesReady")))}e.imagesToLoad=e.$el.find("img");for(var a=0;a<e.imagesToLoad.length;a+=1){var i=e.imagesToLoad[a];e.loadImage(i,i.currentSrc||i.getAttribute("src"),i.srcset||i.getAttribute("srcset"),i.sizes||i.getAttribute("sizes"),!0,t)}}}},E={},S=function(u){function h(){for(var e,t,s,a=[],i=arguments.length;i--;)a[i]=arguments[i];1===a.length&&a[0].constructor&&a[0].constructor===Object?s=a[0]:(t=(e=a)[0],s=e[1]),s||(s={}),s=ee.extend({},s),t&&!s.el&&(s.el=t),u.call(this,s),Object.keys(T).forEach(function(t){Object.keys(T[t]).forEach(function(e){h.prototype[e]||(h.prototype[e]=T[t][e])})});var r=this;void 0===r.modules&&(r.modules={}),Object.keys(r.modules).forEach(function(e){var t=r.modules[e];if(t.params){var a=Object.keys(t.params)[0],i=t.params[a];if("object"!=typeof i||null===i)return;if(!(a in s&&"enabled"in i))return;!0===s[a]&&(s[a]={enabled:!0}),"object"!=typeof s[a]||"enabled"in s[a]||(s[a].enabled=!0),s[a]||(s[a]={enabled:!1})}});var n=ee.extend({},x);r.useModulesParams(n),r.params=ee.extend({},n,E,s),r.originalParams=ee.extend({},r.params),r.passedParams=ee.extend({},s);var o=(r.$=L)(r.params.el);if(t=o[0]){if(1<o.length){var l=[];return o.each(function(e,t){var a=ee.extend({},s,{el:t});l.push(new h(a))}),l}t.swiper=r,o.data("swiper",r);var d,p,c=o.children("."+r.params.wrapperClass);return ee.extend(r,{$el:o,el:t,$wrapperEl:c,wrapperEl:c[0],classNames:[],slides:L(),slidesGrid:[],snapGrid:[],slidesSizesGrid:[],isHorizontal:function(){return"horizontal"===r.params.direction},isVertical:function(){return"vertical"===r.params.direction},rtl:"rtl"===t.dir.toLowerCase()||"rtl"===o.css("direction"),rtlTranslate:"horizontal"===r.params.direction&&("rtl"===t.dir.toLowerCase()||"rtl"===o.css("direction")),wrongRTL:"-webkit-box"===c.css("display"),activeIndex:0,realIndex:0,isBeginning:!0,isEnd:!1,translate:0,previousTranslate:0,progress:0,velocity:0,animating:!1,allowSlideNext:r.params.allowSlideNext,allowSlidePrev:r.params.allowSlidePrev,touchEvents:(d=["touchstart","touchmove","touchend"],p=["mousedown","mousemove","mouseup"],te.pointerEvents?p=["pointerdown","pointermove","pointerup"]:te.prefixedPointerEvents&&(p=["MSPointerDown","MSPointerMove","MSPointerUp"]),r.touchEventsTouch={start:d[0],move:d[1],end:d[2]},r.touchEventsDesktop={start:p[0],move:p[1],end:p[2]},te.touch||!r.params.simulateTouch?r.touchEventsTouch:r.touchEventsDesktop),touchEventsData:{isTouched:void 0,isMoved:void 0,allowTouchCallbacks:void 0,touchStartTime:void 0,isScrolling:void 0,currentTranslate:void 0,startTranslate:void 0,allowThresholdMove:void 0,formElements:"input, select, option, textarea, button, video",lastClickTime:ee.now(),clickTimeout:void 0,velocities:[],allowMomentumBounce:void 0,isTouchEvent:void 0,startMoving:void 0},allowClick:!0,allowTouchMove:r.params.allowTouchMove,touches:{startX:0,startY:0,currentX:0,currentY:0,diff:0},imagesToLoad:[],imagesLoaded:0}),r.useModules(),r.params.init&&r.init(),r}}u&&(h.__proto__=u);var e={extendedDefaults:{configurable:!0},defaults:{configurable:!0},Class:{configurable:!0},$:{configurable:!0}};return((h.prototype=Object.create(u&&u.prototype)).constructor=h).prototype.slidesPerViewDynamic=function(){var e=this,t=e.params,a=e.slides,i=e.slidesGrid,s=e.size,r=e.activeIndex,n=1;if(t.centeredSlides){for(var o,l=a[r].swiperSlideSize,d=r+1;d<a.length;d+=1)a[d]&&!o&&(n+=1,s<(l+=a[d].swiperSlideSize)&&(o=!0));for(var p=r-1;0<=p;p-=1)a[p]&&!o&&(n+=1,s<(l+=a[p].swiperSlideSize)&&(o=!0))}else for(var c=r+1;c<a.length;c+=1)i[c]-i[r]<s&&(n+=1);return n},h.prototype.update=function(){var a=this;if(a&&!a.destroyed){var e=a.snapGrid,t=a.params;t.breakpoints&&a.setBreakpoint(),a.updateSize(),a.updateSlides(),a.updateProgress(),a.updateSlidesClasses(),a.params.freeMode?(i(),a.params.autoHeight&&a.updateAutoHeight()):(("auto"===a.params.slidesPerView||1<a.params.slidesPerView)&&a.isEnd&&!a.params.centeredSlides?a.slideTo(a.slides.length-1,0,!1,!0):a.slideTo(a.activeIndex,0,!1,!0))||i(),t.watchOverflow&&e!==a.snapGrid&&a.checkOverflow(),a.emit("update")}function i(){var e=a.rtlTranslate?-1*a.translate:a.translate,t=Math.min(Math.max(e,a.maxTranslate()),a.minTranslate());a.setTranslate(t),a.updateActiveIndex(),a.updateSlidesClasses()}},h.prototype.init=function(){var e=this;e.initialized||(e.emit("beforeInit"),e.params.breakpoints&&e.setBreakpoint(),e.addClasses(),e.params.loop&&e.loopCreate(),e.updateSize(),e.updateSlides(),e.params.watchOverflow&&e.checkOverflow(),e.params.grabCursor&&e.setGrabCursor(),e.params.preloadImages&&e.preloadImages(),e.params.loop?e.slideTo(e.params.initialSlide+e.loopedSlides,0,e.params.runCallbacksOnInit):e.slideTo(e.params.initialSlide,0,e.params.runCallbacksOnInit),e.attachEvents(),e.initialized=!0,e.emit("init"))},h.prototype.destroy=function(e,t){void 0===e&&(e=!0),void 0===t&&(t=!0);var a=this,i=a.params,s=a.$el,r=a.$wrapperEl,n=a.slides;return void 0===a.params||a.destroyed||(a.emit("beforeDestroy"),a.initialized=!1,a.detachEvents(),i.loop&&a.loopDestroy(),t&&(a.removeClasses(),s.removeAttr("style"),r.removeAttr("style"),n&&n.length&&n.removeClass([i.slideVisibleClass,i.slideActiveClass,i.slideNextClass,i.slidePrevClass].join(" ")).removeAttr("style").removeAttr("data-swiper-slide-index").removeAttr("data-swiper-column").removeAttr("data-swiper-row")),a.emit("destroy"),Object.keys(a.eventsListeners).forEach(function(e){a.off(e)}),!1!==e&&(a.$el[0].swiper=null,a.$el.data("swiper",null),ee.deleteProps(a)),a.destroyed=!0),null},h.extendDefaults=function(e){ee.extend(E,e)},e.extendedDefaults.get=function(){return E},e.defaults.get=function(){return x},e.Class.get=function(){return u},e.$.get=function(){return L},Object.defineProperties(h,e),h}(s),C={name:"device",proto:{device:m},static:{device:m}},M={name:"support",proto:{support:te},static:{support:te}},k={name:"browser",proto:{browser:I},static:{browser:I}},P={name:"resize",create:function(){var e=this;ee.extend(e,{resize:{resizeHandler:function(){e&&!e.destroyed&&e.initialized&&(e.emit("beforeResize"),e.emit("resize"))},orientationChangeHandler:function(){e&&!e.destroyed&&e.initialized&&e.emit("orientationchange")}}})},on:{init:function(){J.addEventListener("resize",this.resize.resizeHandler),J.addEventListener("orientationchange",this.resize.orientationChangeHandler)},destroy:function(){J.removeEventListener("resize",this.resize.resizeHandler),J.removeEventListener("orientationchange",this.resize.orientationChangeHandler)}}},z={func:J.MutationObserver||J.WebkitMutationObserver,attach:function(e,t){void 0===t&&(t={});var a=this,i=new z.func(function(e){if(1!==e.length){var t=function(){a.emit("observerUpdate",e[0])};J.requestAnimationFrame?J.requestAnimationFrame(t):J.setTimeout(t,0)}else a.emit("observerUpdate",e[0])});i.observe(e,{attributes:void 0===t.attributes||t.attributes,childList:void 0===t.childList||t.childList,characterData:void 0===t.characterData||t.characterData}),a.observer.observers.push(i)},init:function(){var e=this;if(te.observer&&e.params.observer){if(e.params.observeParents)for(var t=e.$el.parents(),a=0;a<t.length;a+=1)e.observer.attach(t[a]);e.observer.attach(e.$el[0],{childList:e.params.observeSlideChildren}),e.observer.attach(e.$wrapperEl[0],{attributes:!1})}},destroy:function(){this.observer.observers.forEach(function(e){e.disconnect()}),this.observer.observers=[]}},$={name:"observer",params:{observer:!1,observeParents:!1,observeSlideChildren:!1},create:function(){ee.extend(this,{observer:{init:z.init.bind(this),attach:z.attach.bind(this),destroy:z.destroy.bind(this),observers:[]}})},on:{init:function(){this.observer.init()},destroy:function(){this.observer.destroy()}}},D={update:function(e){var t=this,a=t.params,i=a.slidesPerView,s=a.slidesPerGroup,r=a.centeredSlides,n=t.params.virtual,o=n.addSlidesBefore,l=n.addSlidesAfter,d=t.virtual,p=d.from,c=d.to,u=d.slides,h=d.slidesGrid,v=d.renderSlide,f=d.offset;t.updateActiveIndex();var m,g,b,w=t.activeIndex||0;m=t.rtlTranslate?"right":t.isHorizontal()?"left":"top",r?(g=Math.floor(i/2)+s+o,b=Math.floor(i/2)+s+l):(g=i+(s-1)+o,b=s+l);var y=Math.max((w||0)-b,0),x=Math.min((w||0)+g,u.length-1),T=(t.slidesGrid[y]||0)-(t.slidesGrid[0]||0);function E(){t.updateSlides(),t.updateProgress(),t.updateSlidesClasses(),t.lazy&&t.params.lazy.enabled&&t.lazy.load()}if(ee.extend(t.virtual,{from:y,to:x,offset:T,slidesGrid:t.slidesGrid}),p===y&&c===x&&!e)return t.slidesGrid!==h&&T!==f&&t.slides.css(m,T+"px"),void t.updateProgress();if(t.params.virtual.renderExternal)return t.params.virtual.renderExternal.call(t,{offset:T,from:y,to:x,slides:function(){for(var e=[],t=y;t<=x;t+=1)e.push(u[t]);return e}()}),void E();var S=[],C=[];if(e)t.$wrapperEl.find("."+t.params.slideClass).remove();else for(var M=p;M<=c;M+=1)(M<y||x<M)&&t.$wrapperEl.find("."+t.params.slideClass+'[data-swiper-slide-index="'+M+'"]').remove();for(var k=0;k<u.length;k+=1)y<=k&&k<=x&&(void 0===c||e?C.push(k):(c<k&&C.push(k),k<p&&S.push(k)));C.forEach(function(e){t.$wrapperEl.append(v(u[e],e))}),S.sort(function(e,t){return t-e}).forEach(function(e){t.$wrapperEl.prepend(v(u[e],e))}),t.$wrapperEl.children(".swiper-slide").css(m,T+"px"),E()},renderSlide:function(e,t){var a=this,i=a.params.virtual;if(i.cache&&a.virtual.cache[t])return a.virtual.cache[t];var s=i.renderSlide?L(i.renderSlide.call(a,e,t)):L('<div class="'+a.params.slideClass+'" data-swiper-slide-index="'+t+'">'+e+"</div>");return s.attr("data-swiper-slide-index")||s.attr("data-swiper-slide-index",t),i.cache&&(a.virtual.cache[t]=s),s},appendSlide:function(e){this.virtual.slides.push(e),this.virtual.update(!0)},prependSlide:function(e){var t=this;if(t.virtual.slides.unshift(e),t.params.virtual.cache){var a=t.virtual.cache,i={};Object.keys(a).forEach(function(e){i[e+1]=a[e]}),t.virtual.cache=i}t.virtual.update(!0),t.slideNext(0)}},O={name:"virtual",params:{virtual:{enabled:!1,slides:[],cache:!0,renderSlide:null,renderExternal:null,addSlidesBefore:0,addSlidesAfter:0}},create:function(){var e=this;ee.extend(e,{virtual:{update:D.update.bind(e),appendSlide:D.appendSlide.bind(e),prependSlide:D.prependSlide.bind(e),renderSlide:D.renderSlide.bind(e),slides:e.params.virtual.slides,cache:{}}})},on:{beforeInit:function(){var e=this;if(e.params.virtual.enabled){e.classNames.push(e.params.containerModifierClass+"virtual");var t={watchSlidesProgress:!0};ee.extend(e.params,t),ee.extend(e.originalParams,t),e.params.initialSlide||e.virtual.update()}},setTranslate:function(){this.params.virtual.enabled&&this.virtual.update()}}},A={handle:function(e){var t=this,a=t.rtlTranslate,i=e;i.originalEvent&&(i=i.originalEvent);var s=i.keyCode||i.charCode;if(!t.allowSlideNext&&(t.isHorizontal()&&39===s||t.isVertical()&&40===s))return!1;if(!t.allowSlidePrev&&(t.isHorizontal()&&37===s||t.isVertical()&&38===s))return!1;if(!(i.shiftKey||i.altKey||i.ctrlKey||i.metaKey||f.activeElement&&f.activeElement.nodeName&&("input"===f.activeElement.nodeName.toLowerCase()||"textarea"===f.activeElement.nodeName.toLowerCase()))){if(t.params.keyboard.onlyInViewport&&(37===s||39===s||38===s||40===s)){var r=!1;if(0<t.$el.parents("."+t.params.slideClass).length&&0===t.$el.parents("."+t.params.slideActiveClass).length)return;var n=J.innerWidth,o=J.innerHeight,l=t.$el.offset();a&&(l.left-=t.$el[0].scrollLeft);for(var d=[[l.left,l.top],[l.left+t.width,l.top],[l.left,l.top+t.height],[l.left+t.width,l.top+t.height]],p=0;p<d.length;p+=1){var c=d[p];0<=c[0]&&c[0]<=n&&0<=c[1]&&c[1]<=o&&(r=!0)}if(!r)return}t.isHorizontal()?(37!==s&&39!==s||(i.preventDefault?i.preventDefault():i.returnValue=!1),(39===s&&!a||37===s&&a)&&t.slideNext(),(37===s&&!a||39===s&&a)&&t.slidePrev()):(38!==s&&40!==s||(i.preventDefault?i.preventDefault():i.returnValue=!1),40===s&&t.slideNext(),38===s&&t.slidePrev()),t.emit("keyPress",s)}},enable:function(){this.keyboard.enabled||(L(f).on("keydown",this.keyboard.handle),this.keyboard.enabled=!0)},disable:function(){this.keyboard.enabled&&(L(f).off("keydown",this.keyboard.handle),this.keyboard.enabled=!1)}},N={name:"keyboard",params:{keyboard:{enabled:!1,onlyInViewport:!0}},create:function(){ee.extend(this,{keyboard:{enabled:!1,enable:A.enable.bind(this),disable:A.disable.bind(this),handle:A.handle.bind(this)}})},on:{init:function(){this.params.keyboard.enabled&&this.keyboard.enable()},destroy:function(){this.keyboard.enabled&&this.keyboard.disable()}}};var H={lastScrollTime:ee.now(),event:-1<J.navigator.userAgent.indexOf("firefox")?"DOMMouseScroll":function(){var e="onwheel",t=e in f;if(!t){var a=f.createElement("div");a.setAttribute(e,"return;"),t="function"==typeof a[e]}return!t&&f.implementation&&f.implementation.hasFeature&&!0!==f.implementation.hasFeature("","")&&(t=f.implementation.hasFeature("Events.wheel","3.0")),t}()?"wheel":"mousewheel",normalize:function(e){var t=0,a=0,i=0,s=0;return"detail"in e&&(a=e.detail),"wheelDelta"in e&&(a=-e.wheelDelta/120),"wheelDeltaY"in e&&(a=-e.wheelDeltaY/120),"wheelDeltaX"in e&&(t=-e.wheelDeltaX/120),"axis"in e&&e.axis===e.HORIZONTAL_AXIS&&(t=a,a=0),i=10*t,s=10*a,"deltaY"in e&&(s=e.deltaY),"deltaX"in e&&(i=e.deltaX),(i||s)&&e.deltaMode&&(1===e.deltaMode?(i*=40,s*=40):(i*=800,s*=800)),i&&!t&&(t=i<1?-1:1),s&&!a&&(a=s<1?-1:1),{spinX:t,spinY:a,pixelX:i,pixelY:s}},handleMouseEnter:function(){this.mouseEntered=!0},handleMouseLeave:function(){this.mouseEntered=!1},handle:function(e){var t=e,a=this,i=a.params.mousewheel;if(!a.mouseEntered&&!i.releaseOnEdges)return!0;t.originalEvent&&(t=t.originalEvent);var s=0,r=a.rtlTranslate?-1:1,n=H.normalize(t);if(i.forceToAxis)if(a.isHorizontal()){if(!(Math.abs(n.pixelX)>Math.abs(n.pixelY)))return!0;s=n.pixelX*r}else{if(!(Math.abs(n.pixelY)>Math.abs(n.pixelX)))return!0;s=n.pixelY}else s=Math.abs(n.pixelX)>Math.abs(n.pixelY)?-n.pixelX*r:-n.pixelY;if(0===s)return!0;if(i.invert&&(s=-s),a.params.freeMode){a.params.loop&&a.loopFix();var o=a.getTranslate()+s*i.sensitivity,l=a.isBeginning,d=a.isEnd;if(o>=a.minTranslate()&&(o=a.minTranslate()),o<=a.maxTranslate()&&(o=a.maxTranslate()),a.setTransition(0),a.setTranslate(o),a.updateProgress(),a.updateActiveIndex(),a.updateSlidesClasses(),(!l&&a.isBeginning||!d&&a.isEnd)&&a.updateSlidesClasses(),a.params.freeModeSticky&&(clearTimeout(a.mousewheel.timeout),a.mousewheel.timeout=ee.nextTick(function(){a.slideToClosest()},300)),a.emit("scroll",t),a.params.autoplay&&a.params.autoplayDisableOnInteraction&&a.autoplay.stop(),o===a.minTranslate()||o===a.maxTranslate())return!0}else{if(60<ee.now()-a.mousewheel.lastScrollTime)if(s<0)if(a.isEnd&&!a.params.loop||a.animating){if(i.releaseOnEdges)return!0}else a.slideNext(),a.emit("scroll",t);else if(a.isBeginning&&!a.params.loop||a.animating){if(i.releaseOnEdges)return!0}else a.slidePrev(),a.emit("scroll",t);a.mousewheel.lastScrollTime=(new J.Date).getTime()}return t.preventDefault?t.preventDefault():t.returnValue=!1,!1},enable:function(){var e=this;if(!H.event)return!1;if(e.mousewheel.enabled)return!1;var t=e.$el;return"container"!==e.params.mousewheel.eventsTarged&&(t=L(e.params.mousewheel.eventsTarged)),t.on("mouseenter",e.mousewheel.handleMouseEnter),t.on("mouseleave",e.mousewheel.handleMouseLeave),t.on(H.event,e.mousewheel.handle),e.mousewheel.enabled=!0},disable:function(){var e=this;if(!H.event)return!1;if(!e.mousewheel.enabled)return!1;var t=e.$el;return"container"!==e.params.mousewheel.eventsTarged&&(t=L(e.params.mousewheel.eventsTarged)),t.off(H.event,e.mousewheel.handle),!(e.mousewheel.enabled=!1)}},G={update:function(){var e=this,t=e.params.navigation;if(!e.params.loop){var a=e.navigation,i=a.$nextEl,s=a.$prevEl;s&&0<s.length&&(e.isBeginning?s.addClass(t.disabledClass):s.removeClass(t.disabledClass),s[e.params.watchOverflow&&e.isLocked?"addClass":"removeClass"](t.lockClass)),i&&0<i.length&&(e.isEnd?i.addClass(t.disabledClass):i.removeClass(t.disabledClass),i[e.params.watchOverflow&&e.isLocked?"addClass":"removeClass"](t.lockClass))}},onPrevClick:function(e){e.preventDefault(),this.isBeginning&&!this.params.loop||this.slidePrev()},onNextClick:function(e){e.preventDefault(),this.isEnd&&!this.params.loop||this.slideNext()},init:function(){var e,t,a=this,i=a.params.navigation;(i.nextEl||i.prevEl)&&(i.nextEl&&(e=L(i.nextEl),a.params.uniqueNavElements&&"string"==typeof i.nextEl&&1<e.length&&1===a.$el.find(i.nextEl).length&&(e=a.$el.find(i.nextEl))),i.prevEl&&(t=L(i.prevEl),a.params.uniqueNavElements&&"string"==typeof i.prevEl&&1<t.length&&1===a.$el.find(i.prevEl).length&&(t=a.$el.find(i.prevEl))),e&&0<e.length&&e.on("click",a.navigation.onNextClick),t&&0<t.length&&t.on("click",a.navigation.onPrevClick),ee.extend(a.navigation,{$nextEl:e,nextEl:e&&e[0],$prevEl:t,prevEl:t&&t[0]}))},destroy:function(){var e=this,t=e.navigation,a=t.$nextEl,i=t.$prevEl;a&&a.length&&(a.off("click",e.navigation.onNextClick),a.removeClass(e.params.navigation.disabledClass)),i&&i.length&&(i.off("click",e.navigation.onPrevClick),i.removeClass(e.params.navigation.disabledClass))}},B={update:function(){var e=this,t=e.rtl,s=e.params.pagination;if(s.el&&e.pagination.el&&e.pagination.$el&&0!==e.pagination.$el.length){var r,a=e.virtual&&e.params.virtual.enabled?e.virtual.slides.length:e.slides.length,i=e.pagination.$el,n=e.params.loop?Math.ceil((a-2*e.loopedSlides)/e.params.slidesPerGroup):e.snapGrid.length;if(e.params.loop?((r=Math.ceil((e.activeIndex-e.loopedSlides)/e.params.slidesPerGroup))>a-1-2*e.loopedSlides&&(r-=a-2*e.loopedSlides),n-1<r&&(r-=n),r<0&&"bullets"!==e.params.paginationType&&(r=n+r)):r=void 0!==e.snapIndex?e.snapIndex:e.activeIndex||0,"bullets"===s.type&&e.pagination.bullets&&0<e.pagination.bullets.length){var o,l,d,p=e.pagination.bullets;if(s.dynamicBullets&&(e.pagination.bulletSize=p.eq(0)[e.isHorizontal()?"outerWidth":"outerHeight"](!0),i.css(e.isHorizontal()?"width":"height",e.pagination.bulletSize*(s.dynamicMainBullets+4)+"px"),1<s.dynamicMainBullets&&void 0!==e.previousIndex&&(e.pagination.dynamicBulletIndex+=r-e.previousIndex,e.pagination.dynamicBulletIndex>s.dynamicMainBullets-1?e.pagination.dynamicBulletIndex=s.dynamicMainBullets-1:e.pagination.dynamicBulletIndex<0&&(e.pagination.dynamicBulletIndex=0)),o=r-e.pagination.dynamicBulletIndex,d=((l=o+(Math.min(p.length,s.dynamicMainBullets)-1))+o)/2),p.removeClass(s.bulletActiveClass+" "+s.bulletActiveClass+"-next "+s.bulletActiveClass+"-next-next "+s.bulletActiveClass+"-prev "+s.bulletActiveClass+"-prev-prev "+s.bulletActiveClass+"-main"),1<i.length)p.each(function(e,t){var a=L(t),i=a.index();i===r&&a.addClass(s.bulletActiveClass),s.dynamicBullets&&(o<=i&&i<=l&&a.addClass(s.bulletActiveClass+"-main"),i===o&&a.prev().addClass(s.bulletActiveClass+"-prev").prev().addClass(s.bulletActiveClass+"-prev-prev"),i===l&&a.next().addClass(s.bulletActiveClass+"-next").next().addClass(s.bulletActiveClass+"-next-next"))});else if(p.eq(r).addClass(s.bulletActiveClass),s.dynamicBullets){for(var c=p.eq(o),u=p.eq(l),h=o;h<=l;h+=1)p.eq(h).addClass(s.bulletActiveClass+"-main");c.prev().addClass(s.bulletActiveClass+"-prev").prev().addClass(s.bulletActiveClass+"-prev-prev"),u.next().addClass(s.bulletActiveClass+"-next").next().addClass(s.bulletActiveClass+"-next-next")}if(s.dynamicBullets){var v=Math.min(p.length,s.dynamicMainBullets+4),f=(e.pagination.bulletSize*v-e.pagination.bulletSize)/2-d*e.pagination.bulletSize,m=t?"right":"left";p.css(e.isHorizontal()?m:"top",f+"px")}}if("fraction"===s.type&&(i.find("."+s.currentClass).text(s.formatFractionCurrent(r+1)),i.find("."+s.totalClass).text(s.formatFractionTotal(n))),"progressbar"===s.type){var g;g=s.progressbarOpposite?e.isHorizontal()?"vertical":"horizontal":e.isHorizontal()?"horizontal":"vertical";var b=(r+1)/n,w=1,y=1;"horizontal"===g?w=b:y=b,i.find("."+s.progressbarFillClass).transform("translate3d(0,0,0) scaleX("+w+") scaleY("+y+")").transition(e.params.speed)}"custom"===s.type&&s.renderCustom?(i.html(s.renderCustom(e,r+1,n)),e.emit("paginationRender",e,i[0])):e.emit("paginationUpdate",e,i[0]),i[e.params.watchOverflow&&e.isLocked?"addClass":"removeClass"](s.lockClass)}},render:function(){var e=this,t=e.params.pagination;if(t.el&&e.pagination.el&&e.pagination.$el&&0!==e.pagination.$el.length){var a=e.virtual&&e.params.virtual.enabled?e.virtual.slides.length:e.slides.length,i=e.pagination.$el,s="";if("bullets"===t.type){for(var r=e.params.loop?Math.ceil((a-2*e.loopedSlides)/e.params.slidesPerGroup):e.snapGrid.length,n=0;n<r;n+=1)t.renderBullet?s+=t.renderBullet.call(e,n,t.bulletClass):s+="<"+t.bulletElement+' class="'+t.bulletClass+'"></'+t.bulletElement+">";i.html(s),e.pagination.bullets=i.find("."+t.bulletClass)}"fraction"===t.type&&(s=t.renderFraction?t.renderFraction.call(e,t.currentClass,t.totalClass):'<span class="'+t.currentClass+'"></span> / <span class="'+t.totalClass+'"></span>',i.html(s)),"progressbar"===t.type&&(s=t.renderProgressbar?t.renderProgressbar.call(e,t.progressbarFillClass):'<span class="'+t.progressbarFillClass+'"></span>',i.html(s)),"custom"!==t.type&&e.emit("paginationRender",e.pagination.$el[0])}},init:function(){var a=this,e=a.params.pagination;if(e.el){var t=L(e.el);0!==t.length&&(a.params.uniqueNavElements&&"string"==typeof e.el&&1<t.length&&1===a.$el.find(e.el).length&&(t=a.$el.find(e.el)),"bullets"===e.type&&e.clickable&&t.addClass(e.clickableClass),t.addClass(e.modifierClass+e.type),"bullets"===e.type&&e.dynamicBullets&&(t.addClass(""+e.modifierClass+e.type+"-dynamic"),a.pagination.dynamicBulletIndex=0,e.dynamicMainBullets<1&&(e.dynamicMainBullets=1)),"progressbar"===e.type&&e.progressbarOpposite&&t.addClass(e.progressbarOppositeClass),e.clickable&&t.on("click","."+e.bulletClass,function(e){e.preventDefault();var t=L(this).index()*a.params.slidesPerGroup;a.params.loop&&(t+=a.loopedSlides),a.slideTo(t)}),ee.extend(a.pagination,{$el:t,el:t[0]}))}},destroy:function(){var e=this,t=e.params.pagination;if(t.el&&e.pagination.el&&e.pagination.$el&&0!==e.pagination.$el.length){var a=e.pagination.$el;a.removeClass(t.hiddenClass),a.removeClass(t.modifierClass+t.type),e.pagination.bullets&&e.pagination.bullets.removeClass(t.bulletActiveClass),t.clickable&&a.off("click","."+t.bulletClass)}}},X={setTranslate:function(){var e=this;if(e.params.scrollbar.el&&e.scrollbar.el){var t=e.scrollbar,a=e.rtlTranslate,i=e.progress,s=t.dragSize,r=t.trackSize,n=t.$dragEl,o=t.$el,l=e.params.scrollbar,d=s,p=(r-s)*i;a?0<(p=-p)?(d=s-p,p=0):r<-p+s&&(d=r+p):p<0?(d=s+p,p=0):r<p+s&&(d=r-p),e.isHorizontal()?(te.transforms3d?n.transform("translate3d("+p+"px, 0, 0)"):n.transform("translateX("+p+"px)"),n[0].style.width=d+"px"):(te.transforms3d?n.transform("translate3d(0px, "+p+"px, 0)"):n.transform("translateY("+p+"px)"),n[0].style.height=d+"px"),l.hide&&(clearTimeout(e.scrollbar.timeout),o[0].style.opacity=1,e.scrollbar.timeout=setTimeout(function(){o[0].style.opacity=0,o.transition(400)},1e3))}},setTransition:function(e){this.params.scrollbar.el&&this.scrollbar.el&&this.scrollbar.$dragEl.transition(e)},updateSize:function(){var e=this;if(e.params.scrollbar.el&&e.scrollbar.el){var t=e.scrollbar,a=t.$dragEl,i=t.$el;a[0].style.width="",a[0].style.height="";var s,r=e.isHorizontal()?i[0].offsetWidth:i[0].offsetHeight,n=e.size/e.virtualSize,o=n*(r/e.size);s="auto"===e.params.scrollbar.dragSize?r*n:parseInt(e.params.scrollbar.dragSize,10),e.isHorizontal()?a[0].style.width=s+"px":a[0].style.height=s+"px",i[0].style.display=1<=n?"none":"",e.params.scrollbarHide&&(i[0].style.opacity=0),ee.extend(t,{trackSize:r,divider:n,moveDivider:o,dragSize:s}),t.$el[e.params.watchOverflow&&e.isLocked?"addClass":"removeClass"](e.params.scrollbar.lockClass)}},setDragPosition:function(e){var t,a=this,i=a.scrollbar,s=a.rtlTranslate,r=i.$el,n=i.dragSize,o=i.trackSize;t=((a.isHorizontal()?"touchstart"===e.type||"touchmove"===e.type?e.targetTouches[0].pageX:e.pageX||e.clientX:"touchstart"===e.type||"touchmove"===e.type?e.targetTouches[0].pageY:e.pageY||e.clientY)-r.offset()[a.isHorizontal()?"left":"top"]-n/2)/(o-n),t=Math.max(Math.min(t,1),0),s&&(t=1-t);var l=a.minTranslate()+(a.maxTranslate()-a.minTranslate())*t;a.updateProgress(l),a.setTranslate(l),a.updateActiveIndex(),a.updateSlidesClasses()},onDragStart:function(e){var t=this,a=t.params.scrollbar,i=t.scrollbar,s=t.$wrapperEl,r=i.$el,n=i.$dragEl;t.scrollbar.isTouched=!0,e.preventDefault(),e.stopPropagation(),s.transition(100),n.transition(100),i.setDragPosition(e),clearTimeout(t.scrollbar.dragTimeout),r.transition(0),a.hide&&r.css("opacity",1),t.emit("scrollbarDragStart",e)},onDragMove:function(e){var t=this.scrollbar,a=this.$wrapperEl,i=t.$el,s=t.$dragEl;this.scrollbar.isTouched&&(e.preventDefault?e.preventDefault():e.returnValue=!1,t.setDragPosition(e),a.transition(0),i.transition(0),s.transition(0),this.emit("scrollbarDragMove",e))},onDragEnd:function(e){var t=this,a=t.params.scrollbar,i=t.scrollbar.$el;t.scrollbar.isTouched&&(t.scrollbar.isTouched=!1,a.hide&&(clearTimeout(t.scrollbar.dragTimeout),t.scrollbar.dragTimeout=ee.nextTick(function(){i.css("opacity",0),i.transition(400)},1e3)),t.emit("scrollbarDragEnd",e),a.snapOnRelease&&t.slideToClosest())},enableDraggable:function(){var e=this;if(e.params.scrollbar.el){var t=e.scrollbar,a=e.touchEventsTouch,i=e.touchEventsDesktop,s=e.params,r=t.$el[0],n=!(!te.passiveListener||!s.passiveListeners)&&{passive:!1,capture:!1},o=!(!te.passiveListener||!s.passiveListeners)&&{passive:!0,capture:!1};te.touch?(r.addEventListener(a.start,e.scrollbar.onDragStart,n),r.addEventListener(a.move,e.scrollbar.onDragMove,n),r.addEventListener(a.end,e.scrollbar.onDragEnd,o)):(r.addEventListener(i.start,e.scrollbar.onDragStart,n),f.addEventListener(i.move,e.scrollbar.onDragMove,n),f.addEventListener(i.end,e.scrollbar.onDragEnd,o))}},disableDraggable:function(){var e=this;if(e.params.scrollbar.el){var t=e.scrollbar,a=e.touchEventsTouch,i=e.touchEventsDesktop,s=e.params,r=t.$el[0],n=!(!te.passiveListener||!s.passiveListeners)&&{passive:!1,capture:!1},o=!(!te.passiveListener||!s.passiveListeners)&&{passive:!0,capture:!1};te.touch?(r.removeEventListener(a.start,e.scrollbar.onDragStart,n),r.removeEventListener(a.move,e.scrollbar.onDragMove,n),r.removeEventListener(a.end,e.scrollbar.onDragEnd,o)):(r.removeEventListener(i.start,e.scrollbar.onDragStart,n),f.removeEventListener(i.move,e.scrollbar.onDragMove,n),f.removeEventListener(i.end,e.scrollbar.onDragEnd,o))}},init:function(){var e=this;if(e.params.scrollbar.el){var t=e.scrollbar,a=e.$el,i=e.params.scrollbar,s=L(i.el);e.params.uniqueNavElements&&"string"==typeof i.el&&1<s.length&&1===a.find(i.el).length&&(s=a.find(i.el));var r=s.find("."+e.params.scrollbar.dragClass);0===r.length&&(r=L('<div class="'+e.params.scrollbar.dragClass+'"></div>'),s.append(r)),ee.extend(t,{$el:s,el:s[0],$dragEl:r,dragEl:r[0]}),i.draggable&&t.enableDraggable()}},destroy:function(){this.scrollbar.disableDraggable()}},Y={setTransform:function(e,t){var a=this.rtl,i=L(e),s=a?-1:1,r=i.attr("data-swiper-parallax")||"0",n=i.attr("data-swiper-parallax-x"),o=i.attr("data-swiper-parallax-y"),l=i.attr("data-swiper-parallax-scale"),d=i.attr("data-swiper-parallax-opacity");if(n||o?(n=n||"0",o=o||"0"):this.isHorizontal()?(n=r,o="0"):(o=r,n="0"),n=0<=n.indexOf("%")?parseInt(n,10)*t*s+"%":n*t*s+"px",o=0<=o.indexOf("%")?parseInt(o,10)*t+"%":o*t+"px",null!=d){var p=d-(d-1)*(1-Math.abs(t));i[0].style.opacity=p}if(null==l)i.transform("translate3d("+n+", "+o+", 0px)");else{var c=l-(l-1)*(1-Math.abs(t));i.transform("translate3d("+n+", "+o+", 0px) scale("+c+")")}},setTranslate:function(){var i=this,e=i.$el,t=i.slides,s=i.progress,r=i.snapGrid;e.children("[data-swiper-parallax], [data-swiper-parallax-x], [data-swiper-parallax-y]").each(function(e,t){i.parallax.setTransform(t,s)}),t.each(function(e,t){var a=t.progress;1<i.params.slidesPerGroup&&"auto"!==i.params.slidesPerView&&(a+=Math.ceil(e/2)-s*(r.length-1)),a=Math.min(Math.max(a,-1),1),L(t).find("[data-swiper-parallax], [data-swiper-parallax-x], [data-swiper-parallax-y]").each(function(e,t){i.parallax.setTransform(t,a)})})},setTransition:function(s){void 0===s&&(s=this.params.speed);this.$el.find("[data-swiper-parallax], [data-swiper-parallax-x], [data-swiper-parallax-y]").each(function(e,t){var a=L(t),i=parseInt(a.attr("data-swiper-parallax-duration"),10)||s;0===s&&(i=0),a.transition(i)})}},V={getDistanceBetweenTouches:function(e){if(e.targetTouches.length<2)return 1;var t=e.targetTouches[0].pageX,a=e.targetTouches[0].pageY,i=e.targetTouches[1].pageX,s=e.targetTouches[1].pageY;return Math.sqrt(Math.pow(i-t,2)+Math.pow(s-a,2))},onGestureStart:function(e){var t=this,a=t.params.zoom,i=t.zoom,s=i.gesture;if(i.fakeGestureTouched=!1,i.fakeGestureMoved=!1,!te.gestures){if("touchstart"!==e.type||"touchstart"===e.type&&e.targetTouches.length<2)return;i.fakeGestureTouched=!0,s.scaleStart=V.getDistanceBetweenTouches(e)}s.$slideEl&&s.$slideEl.length||(s.$slideEl=L(e.target).closest(".swiper-slide"),0===s.$slideEl.length&&(s.$slideEl=t.slides.eq(t.activeIndex)),s.$imageEl=s.$slideEl.find("img, svg, canvas"),s.$imageWrapEl=s.$imageEl.parent("."+a.containerClass),s.maxRatio=s.$imageWrapEl.attr("data-swiper-zoom")||a.maxRatio,0!==s.$imageWrapEl.length)?(s.$imageEl.transition(0),t.zoom.isScaling=!0):s.$imageEl=void 0},onGestureChange:function(e){var t=this.params.zoom,a=this.zoom,i=a.gesture;if(!te.gestures){if("touchmove"!==e.type||"touchmove"===e.type&&e.targetTouches.length<2)return;a.fakeGestureMoved=!0,i.scaleMove=V.getDistanceBetweenTouches(e)}i.$imageEl&&0!==i.$imageEl.length&&(a.scale=te.gestures?e.scale*a.currentScale:i.scaleMove/i.scaleStart*a.currentScale,a.scale>i.maxRatio&&(a.scale=i.maxRatio-1+Math.pow(a.scale-i.maxRatio+1,.5)),a.scale<t.minRatio&&(a.scale=t.minRatio+1-Math.pow(t.minRatio-a.scale+1,.5)),i.$imageEl.transform("translate3d(0,0,0) scale("+a.scale+")"))},onGestureEnd:function(e){var t=this.params.zoom,a=this.zoom,i=a.gesture;if(!te.gestures){if(!a.fakeGestureTouched||!a.fakeGestureMoved)return;if("touchend"!==e.type||"touchend"===e.type&&e.changedTouches.length<2&&!m.android)return;a.fakeGestureTouched=!1,a.fakeGestureMoved=!1}i.$imageEl&&0!==i.$imageEl.length&&(a.scale=Math.max(Math.min(a.scale,i.maxRatio),t.minRatio),i.$imageEl.transition(this.params.speed).transform("translate3d(0,0,0) scale("+a.scale+")"),a.currentScale=a.scale,a.isScaling=!1,1===a.scale&&(i.$slideEl=void 0))},onTouchStart:function(e){var t=this.zoom,a=t.gesture,i=t.image;a.$imageEl&&0!==a.$imageEl.length&&(i.isTouched||(m.android&&e.preventDefault(),i.isTouched=!0,i.touchesStart.x="touchstart"===e.type?e.targetTouches[0].pageX:e.pageX,i.touchesStart.y="touchstart"===e.type?e.targetTouches[0].pageY:e.pageY))},onTouchMove:function(e){var t=this,a=t.zoom,i=a.gesture,s=a.image,r=a.velocity;if(i.$imageEl&&0!==i.$imageEl.length&&(t.allowClick=!1,s.isTouched&&i.$slideEl)){s.isMoved||(s.width=i.$imageEl[0].offsetWidth,s.height=i.$imageEl[0].offsetHeight,s.startX=ee.getTranslate(i.$imageWrapEl[0],"x")||0,s.startY=ee.getTranslate(i.$imageWrapEl[0],"y")||0,i.slideWidth=i.$slideEl[0].offsetWidth,i.slideHeight=i.$slideEl[0].offsetHeight,i.$imageWrapEl.transition(0),t.rtl&&(s.startX=-s.startX,s.startY=-s.startY));var n=s.width*a.scale,o=s.height*a.scale;if(!(n<i.slideWidth&&o<i.slideHeight)){if(s.minX=Math.min(i.slideWidth/2-n/2,0),s.maxX=-s.minX,s.minY=Math.min(i.slideHeight/2-o/2,0),s.maxY=-s.minY,s.touchesCurrent.x="touchmove"===e.type?e.targetTouches[0].pageX:e.pageX,s.touchesCurrent.y="touchmove"===e.type?e.targetTouches[0].pageY:e.pageY,!s.isMoved&&!a.isScaling){if(t.isHorizontal()&&(Math.floor(s.minX)===Math.floor(s.startX)&&s.touchesCurrent.x<s.touchesStart.x||Math.floor(s.maxX)===Math.floor(s.startX)&&s.touchesCurrent.x>s.touchesStart.x))return void(s.isTouched=!1);if(!t.isHorizontal()&&(Math.floor(s.minY)===Math.floor(s.startY)&&s.touchesCurrent.y<s.touchesStart.y||Math.floor(s.maxY)===Math.floor(s.startY)&&s.touchesCurrent.y>s.touchesStart.y))return void(s.isTouched=!1)}e.preventDefault(),e.stopPropagation(),s.isMoved=!0,s.currentX=s.touchesCurrent.x-s.touchesStart.x+s.startX,s.currentY=s.touchesCurrent.y-s.touchesStart.y+s.startY,s.currentX<s.minX&&(s.currentX=s.minX+1-Math.pow(s.minX-s.currentX+1,.8)),s.currentX>s.maxX&&(s.currentX=s.maxX-1+Math.pow(s.currentX-s.maxX+1,.8)),s.currentY<s.minY&&(s.currentY=s.minY+1-Math.pow(s.minY-s.currentY+1,.8)),s.currentY>s.maxY&&(s.currentY=s.maxY-1+Math.pow(s.currentY-s.maxY+1,.8)),r.prevPositionX||(r.prevPositionX=s.touchesCurrent.x),r.prevPositionY||(r.prevPositionY=s.touchesCurrent.y),r.prevTime||(r.prevTime=Date.now()),r.x=(s.touchesCurrent.x-r.prevPositionX)/(Date.now()-r.prevTime)/2,r.y=(s.touchesCurrent.y-r.prevPositionY)/(Date.now()-r.prevTime)/2,Math.abs(s.touchesCurrent.x-r.prevPositionX)<2&&(r.x=0),Math.abs(s.touchesCurrent.y-r.prevPositionY)<2&&(r.y=0),r.prevPositionX=s.touchesCurrent.x,r.prevPositionY=s.touchesCurrent.y,r.prevTime=Date.now(),i.$imageWrapEl.transform("translate3d("+s.currentX+"px, "+s.currentY+"px,0)")}}},onTouchEnd:function(){var e=this.zoom,t=e.gesture,a=e.image,i=e.velocity;if(t.$imageEl&&0!==t.$imageEl.length){if(!a.isTouched||!a.isMoved)return a.isTouched=!1,void(a.isMoved=!1);a.isTouched=!1,a.isMoved=!1;var s=300,r=300,n=i.x*s,o=a.currentX+n,l=i.y*r,d=a.currentY+l;0!==i.x&&(s=Math.abs((o-a.currentX)/i.x)),0!==i.y&&(r=Math.abs((d-a.currentY)/i.y));var p=Math.max(s,r);a.currentX=o,a.currentY=d;var c=a.width*e.scale,u=a.height*e.scale;a.minX=Math.min(t.slideWidth/2-c/2,0),a.maxX=-a.minX,a.minY=Math.min(t.slideHeight/2-u/2,0),a.maxY=-a.minY,a.currentX=Math.max(Math.min(a.currentX,a.maxX),a.minX),a.currentY=Math.max(Math.min(a.currentY,a.maxY),a.minY),t.$imageWrapEl.transition(p).transform("translate3d("+a.currentX+"px, "+a.currentY+"px,0)")}},onTransitionEnd:function(){var e=this.zoom,t=e.gesture;t.$slideEl&&this.previousIndex!==this.activeIndex&&(t.$imageEl.transform("translate3d(0,0,0) scale(1)"),t.$imageWrapEl.transform("translate3d(0,0,0)"),e.scale=1,e.currentScale=1,t.$slideEl=void 0,t.$imageEl=void 0,t.$imageWrapEl=void 0)},toggle:function(e){var t=this.zoom;t.scale&&1!==t.scale?t.out():t.in(e)},in:function(e){var t,a,i,s,r,n,o,l,d,p,c,u,h,v,f,m,g=this,b=g.zoom,w=g.params.zoom,y=b.gesture,x=b.image;(y.$slideEl||(y.$slideEl=g.clickedSlide?L(g.clickedSlide):g.slides.eq(g.activeIndex),y.$imageEl=y.$slideEl.find("img, svg, canvas"),y.$imageWrapEl=y.$imageEl.parent("."+w.containerClass)),y.$imageEl&&0!==y.$imageEl.length)&&(y.$slideEl.addClass(""+w.zoomedSlideClass),void 0===x.touchesStart.x&&e?(t="touchend"===e.type?e.changedTouches[0].pageX:e.pageX,a="touchend"===e.type?e.changedTouches[0].pageY:e.pageY):(t=x.touchesStart.x,a=x.touchesStart.y),b.scale=y.$imageWrapEl.attr("data-swiper-zoom")||w.maxRatio,b.currentScale=y.$imageWrapEl.attr("data-swiper-zoom")||w.maxRatio,e?(f=y.$slideEl[0].offsetWidth,m=y.$slideEl[0].offsetHeight,i=y.$slideEl.offset().left+f/2-t,s=y.$slideEl.offset().top+m/2-a,o=y.$imageEl[0].offsetWidth,l=y.$imageEl[0].offsetHeight,d=o*b.scale,p=l*b.scale,h=-(c=Math.min(f/2-d/2,0)),v=-(u=Math.min(m/2-p/2,0)),(r=i*b.scale)<c&&(r=c),h<r&&(r=h),(n=s*b.scale)<u&&(n=u),v<n&&(n=v)):n=r=0,y.$imageWrapEl.transition(300).transform("translate3d("+r+"px, "+n+"px,0)"),y.$imageEl.transition(300).transform("translate3d(0,0,0) scale("+b.scale+")"))},out:function(){var e=this,t=e.zoom,a=e.params.zoom,i=t.gesture;i.$slideEl||(i.$slideEl=e.clickedSlide?L(e.clickedSlide):e.slides.eq(e.activeIndex),i.$imageEl=i.$slideEl.find("img, svg, canvas"),i.$imageWrapEl=i.$imageEl.parent("."+a.containerClass)),i.$imageEl&&0!==i.$imageEl.length&&(t.scale=1,t.currentScale=1,i.$imageWrapEl.transition(300).transform("translate3d(0,0,0)"),i.$imageEl.transition(300).transform("translate3d(0,0,0) scale(1)"),i.$slideEl.removeClass(""+a.zoomedSlideClass),i.$slideEl=void 0)},enable:function(){var e=this,t=e.zoom;if(!t.enabled){t.enabled=!0;var a=!("touchstart"!==e.touchEvents.start||!te.passiveListener||!e.params.passiveListeners)&&{passive:!0,capture:!1};te.gestures?(e.$wrapperEl.on("gesturestart",".swiper-slide",t.onGestureStart,a),e.$wrapperEl.on("gesturechange",".swiper-slide",t.onGestureChange,a),e.$wrapperEl.on("gestureend",".swiper-slide",t.onGestureEnd,a)):"touchstart"===e.touchEvents.start&&(e.$wrapperEl.on(e.touchEvents.start,".swiper-slide",t.onGestureStart,a),e.$wrapperEl.on(e.touchEvents.move,".swiper-slide",t.onGestureChange,a),e.$wrapperEl.on(e.touchEvents.end,".swiper-slide",t.onGestureEnd,a)),e.$wrapperEl.on(e.touchEvents.move,"."+e.params.zoom.containerClass,t.onTouchMove)}},disable:function(){var e=this,t=e.zoom;if(t.enabled){e.zoom.enabled=!1;var a=!("touchstart"!==e.touchEvents.start||!te.passiveListener||!e.params.passiveListeners)&&{passive:!0,capture:!1};te.gestures?(e.$wrapperEl.off("gesturestart",".swiper-slide",t.onGestureStart,a),e.$wrapperEl.off("gesturechange",".swiper-slide",t.onGestureChange,a),e.$wrapperEl.off("gestureend",".swiper-slide",t.onGestureEnd,a)):"touchstart"===e.touchEvents.start&&(e.$wrapperEl.off(e.touchEvents.start,".swiper-slide",t.onGestureStart,a),e.$wrapperEl.off(e.touchEvents.move,".swiper-slide",t.onGestureChange,a),e.$wrapperEl.off(e.touchEvents.end,".swiper-slide",t.onGestureEnd,a)),e.$wrapperEl.off(e.touchEvents.move,"."+e.params.zoom.containerClass,t.onTouchMove)}}},F={loadInSlide:function(e,l){void 0===l&&(l=!0);var d=this,p=d.params.lazy;if(void 0!==e&&0!==d.slides.length){var c=d.virtual&&d.params.virtual.enabled?d.$wrapperEl.children("."+d.params.slideClass+'[data-swiper-slide-index="'+e+'"]'):d.slides.eq(e),t=c.find("."+p.elementClass+":not(."+p.loadedClass+"):not(."+p.loadingClass+")");!c.hasClass(p.elementClass)||c.hasClass(p.loadedClass)||c.hasClass(p.loadingClass)||(t=t.add(c[0])),0!==t.length&&t.each(function(e,t){var i=L(t);i.addClass(p.loadingClass);var s=i.attr("data-background"),r=i.attr("data-src"),n=i.attr("data-srcset"),o=i.attr("data-sizes");d.loadImage(i[0],r||s,n,o,!1,function(){if(null!=d&&d&&(!d||d.params)&&!d.destroyed){if(s?(i.css("background-image",'url("'+s+'")'),i.removeAttr("data-background")):(n&&(i.attr("srcset",n),i.removeAttr("data-srcset")),o&&(i.attr("sizes",o),i.removeAttr("data-sizes")),r&&(i.attr("src",r),i.removeAttr("data-src"))),i.addClass(p.loadedClass).removeClass(p.loadingClass),c.find("."+p.preloaderClass).remove(),d.params.loop&&l){var e=c.attr("data-swiper-slide-index");if(c.hasClass(d.params.slideDuplicateClass)){var t=d.$wrapperEl.children('[data-swiper-slide-index="'+e+'"]:not(.'+d.params.slideDuplicateClass+")");d.lazy.loadInSlide(t.index(),!1)}else{var a=d.$wrapperEl.children("."+d.params.slideDuplicateClass+'[data-swiper-slide-index="'+e+'"]');d.lazy.loadInSlide(a.index(),!1)}}d.emit("lazyImageReady",c[0],i[0])}}),d.emit("lazyImageLoad",c[0],i[0])})}},load:function(){var i=this,t=i.$wrapperEl,a=i.params,s=i.slides,e=i.activeIndex,r=i.virtual&&a.virtual.enabled,n=a.lazy,o=a.slidesPerView;function l(e){if(r){if(t.children("."+a.slideClass+'[data-swiper-slide-index="'+e+'"]').length)return!0}else if(s[e])return!0;return!1}function d(e){return r?L(e).attr("data-swiper-slide-index"):L(e).index()}if("auto"===o&&(o=0),i.lazy.initialImageLoaded||(i.lazy.initialImageLoaded=!0),i.params.watchSlidesVisibility)t.children("."+a.slideVisibleClass).each(function(e,t){var a=r?L(t).attr("data-swiper-slide-index"):L(t).index();i.lazy.loadInSlide(a)});else if(1<o)for(var p=e;p<e+o;p+=1)l(p)&&i.lazy.loadInSlide(p);else i.lazy.loadInSlide(e);if(n.loadPrevNext)if(1<o||n.loadPrevNextAmount&&1<n.loadPrevNextAmount){for(var c=n.loadPrevNextAmount,u=o,h=Math.min(e+u+Math.max(c,u),s.length),v=Math.max(e-Math.max(u,c),0),f=e+o;f<h;f+=1)l(f)&&i.lazy.loadInSlide(f);for(var m=v;m<e;m+=1)l(m)&&i.lazy.loadInSlide(m)}else{var g=t.children("."+a.slideNextClass);0<g.length&&i.lazy.loadInSlide(d(g));var b=t.children("."+a.slidePrevClass);0<b.length&&i.lazy.loadInSlide(d(b))}}},R={LinearSpline:function(e,t){var a,i,s,r,n,o=function(e,t){for(i=-1,a=e.length;1<a-i;)e[s=a+i>>1]<=t?i=s:a=s;return a};return this.x=e,this.y=t,this.lastIndex=e.length-1,this.interpolate=function(e){return e?(n=o(this.x,e),r=n-1,(e-this.x[r])*(this.y[n]-this.y[r])/(this.x[n]-this.x[r])+this.y[r]):0},this},getInterpolateFunction:function(e){var t=this;t.controller.spline||(t.controller.spline=t.params.loop?new R.LinearSpline(t.slidesGrid,e.slidesGrid):new R.LinearSpline(t.snapGrid,e.snapGrid))},setTranslate:function(e,t){var a,i,s=this,r=s.controller.control;function n(e){var t=s.rtlTranslate?-s.translate:s.translate;"slide"===s.params.controller.by&&(s.controller.getInterpolateFunction(e),i=-s.controller.spline.interpolate(-t)),i&&"container"!==s.params.controller.by||(a=(e.maxTranslate()-e.minTranslate())/(s.maxTranslate()-s.minTranslate()),i=(t-s.minTranslate())*a+e.minTranslate()),s.params.controller.inverse&&(i=e.maxTranslate()-i),e.updateProgress(i),e.setTranslate(i,s),e.updateActiveIndex(),e.updateSlidesClasses()}if(Array.isArray(r))for(var o=0;o<r.length;o+=1)r[o]!==t&&r[o]instanceof S&&n(r[o]);else r instanceof S&&t!==r&&n(r)},setTransition:function(t,e){var a,i=this,s=i.controller.control;function r(e){e.setTransition(t,i),0!==t&&(e.transitionStart(),e.params.autoHeight&&ee.nextTick(function(){e.updateAutoHeight()}),e.$wrapperEl.transitionEnd(function(){s&&(e.params.loop&&"slide"===i.params.controller.by&&e.loopFix(),e.transitionEnd())}))}if(Array.isArray(s))for(a=0;a<s.length;a+=1)s[a]!==e&&s[a]instanceof S&&r(s[a]);else s instanceof S&&e!==s&&r(s)}},q={makeElFocusable:function(e){return e.attr("tabIndex","0"),e},addElRole:function(e,t){return e.attr("role",t),e},addElLabel:function(e,t){return e.attr("aria-label",t),e},disableEl:function(e){return e.attr("aria-disabled",!0),e},enableEl:function(e){return e.attr("aria-disabled",!1),e},onEnterKey:function(e){var t=this,a=t.params.a11y;if(13===e.keyCode){var i=L(e.target);t.navigation&&t.navigation.$nextEl&&i.is(t.navigation.$nextEl)&&(t.isEnd&&!t.params.loop||t.slideNext(),t.isEnd?t.a11y.notify(a.lastSlideMessage):t.a11y.notify(a.nextSlideMessage)),t.navigation&&t.navigation.$prevEl&&i.is(t.navigation.$prevEl)&&(t.isBeginning&&!t.params.loop||t.slidePrev(),t.isBeginning?t.a11y.notify(a.firstSlideMessage):t.a11y.notify(a.prevSlideMessage)),t.pagination&&i.is("."+t.params.pagination.bulletClass)&&i[0].click()}},notify:function(e){var t=this.a11y.liveRegion;0!==t.length&&(t.html(""),t.html(e))},updateNavigation:function(){var e=this;if(!e.params.loop){var t=e.navigation,a=t.$nextEl,i=t.$prevEl;i&&0<i.length&&(e.isBeginning?e.a11y.disableEl(i):e.a11y.enableEl(i)),a&&0<a.length&&(e.isEnd?e.a11y.disableEl(a):e.a11y.enableEl(a))}},updatePagination:function(){var i=this,s=i.params.a11y;i.pagination&&i.params.pagination.clickable&&i.pagination.bullets&&i.pagination.bullets.length&&i.pagination.bullets.each(function(e,t){var a=L(t);i.a11y.makeElFocusable(a),i.a11y.addElRole(a,"button"),i.a11y.addElLabel(a,s.paginationBulletMessage.replace(/{{index}}/,a.index()+1))})},init:function(){var e=this;e.$el.append(e.a11y.liveRegion);var t,a,i=e.params.a11y;e.navigation&&e.navigation.$nextEl&&(t=e.navigation.$nextEl),e.navigation&&e.navigation.$prevEl&&(a=e.navigation.$prevEl),t&&(e.a11y.makeElFocusable(t),e.a11y.addElRole(t,"button"),e.a11y.addElLabel(t,i.nextSlideMessage),t.on("keydown",e.a11y.onEnterKey)),a&&(e.a11y.makeElFocusable(a),e.a11y.addElRole(a,"button"),e.a11y.addElLabel(a,i.prevSlideMessage),a.on("keydown",e.a11y.onEnterKey)),e.pagination&&e.params.pagination.clickable&&e.pagination.bullets&&e.pagination.bullets.length&&e.pagination.$el.on("keydown","."+e.params.pagination.bulletClass,e.a11y.onEnterKey)},destroy:function(){var e,t,a=this;a.a11y.liveRegion&&0<a.a11y.liveRegion.length&&a.a11y.liveRegion.remove(),a.navigation&&a.navigation.$nextEl&&(e=a.navigation.$nextEl),a.navigation&&a.navigation.$prevEl&&(t=a.navigation.$prevEl),e&&e.off("keydown",a.a11y.onEnterKey),t&&t.off("keydown",a.a11y.onEnterKey),a.pagination&&a.params.pagination.clickable&&a.pagination.bullets&&a.pagination.bullets.length&&a.pagination.$el.off("keydown","."+a.params.pagination.bulletClass,a.a11y.onEnterKey)}},W={init:function(){var e=this;if(e.params.history){if(!J.history||!J.history.pushState)return e.params.history.enabled=!1,void(e.params.hashNavigation.enabled=!0);var t=e.history;t.initialized=!0,t.paths=W.getPathValues(),(t.paths.key||t.paths.value)&&(t.scrollToSlide(0,t.paths.value,e.params.runCallbacksOnInit),e.params.history.replaceState||J.addEventListener("popstate",e.history.setHistoryPopState))}},destroy:function(){this.params.history.replaceState||J.removeEventListener("popstate",this.history.setHistoryPopState)},setHistoryPopState:function(){this.history.paths=W.getPathValues(),this.history.scrollToSlide(this.params.speed,this.history.paths.value,!1)},getPathValues:function(){var e=J.location.pathname.slice(1).split("/").filter(function(e){return""!==e}),t=e.length;return{key:e[t-2],value:e[t-1]}},setHistory:function(e,t){if(this.history.initialized&&this.params.history.enabled){var a=this.slides.eq(t),i=W.slugify(a.attr("data-history"));J.location.pathname.includes(e)||(i=e+"/"+i);var s=J.history.state;s&&s.value===i||(this.params.history.replaceState?J.history.replaceState({value:i},null,i):J.history.pushState({value:i},null,i))}},slugify:function(e){return e.toString().toLowerCase().replace(/\s+/g,"-").replace(/[^\w-]+/g,"").replace(/--+/g,"-").replace(/^-+/,"").replace(/-+$/,"")},scrollToSlide:function(e,t,a){var i=this;if(t)for(var s=0,r=i.slides.length;s<r;s+=1){var n=i.slides.eq(s);if(W.slugify(n.attr("data-history"))===t&&!n.hasClass(i.params.slideDuplicateClass)){var o=n.index();i.slideTo(o,e,a)}}else i.slideTo(0,e,a)}},j={onHashCange:function(){var e=this,t=f.location.hash.replace("#","");if(t!==e.slides.eq(e.activeIndex).attr("data-hash")){var a=e.$wrapperEl.children("."+e.params.slideClass+'[data-hash="'+t+'"]').index();if(void 0===a)return;e.slideTo(a)}},setHash:function(){var e=this;if(e.hashNavigation.initialized&&e.params.hashNavigation.enabled)if(e.params.hashNavigation.replaceState&&J.history&&J.history.replaceState)J.history.replaceState(null,null,"#"+e.slides.eq(e.activeIndex).attr("data-hash")||"");else{var t=e.slides.eq(e.activeIndex),a=t.attr("data-hash")||t.attr("data-history");f.location.hash=a||""}},init:function(){var e=this;if(!(!e.params.hashNavigation.enabled||e.params.history&&e.params.history.enabled)){e.hashNavigation.initialized=!0;var t=f.location.hash.replace("#","");if(t)for(var a=0,i=e.slides.length;a<i;a+=1){var s=e.slides.eq(a);if((s.attr("data-hash")||s.attr("data-history"))===t&&!s.hasClass(e.params.slideDuplicateClass)){var r=s.index();e.slideTo(r,0,e.params.runCallbacksOnInit,!0)}}e.params.hashNavigation.watchState&&L(J).on("hashchange",e.hashNavigation.onHashCange)}},destroy:function(){this.params.hashNavigation.watchState&&L(J).off("hashchange",this.hashNavigation.onHashCange)}},U={run:function(){var e=this,t=e.slides.eq(e.activeIndex),a=e.params.autoplay.delay;t.attr("data-swiper-autoplay")&&(a=t.attr("data-swiper-autoplay")||e.params.autoplay.delay),e.autoplay.timeout=ee.nextTick(function(){e.params.autoplay.reverseDirection?e.params.loop?(e.loopFix(),e.slidePrev(e.params.speed,!0,!0),e.emit("autoplay")):e.isBeginning?e.params.autoplay.stopOnLastSlide?e.autoplay.stop():(e.slideTo(e.slides.length-1,e.params.speed,!0,!0),e.emit("autoplay")):(e.slidePrev(e.params.speed,!0,!0),e.emit("autoplay")):e.params.loop?(e.loopFix(),e.slideNext(e.params.speed,!0,!0),e.emit("autoplay")):e.isEnd?e.params.autoplay.stopOnLastSlide?e.autoplay.stop():(e.slideTo(0,e.params.speed,!0,!0),e.emit("autoplay")):(e.slideNext(e.params.speed,!0,!0),e.emit("autoplay"))},a)},start:function(){var e=this;return void 0===e.autoplay.timeout&&(!e.autoplay.running&&(e.autoplay.running=!0,e.emit("autoplayStart"),e.autoplay.run(),!0))},stop:function(){var e=this;return!!e.autoplay.running&&(void 0!==e.autoplay.timeout&&(e.autoplay.timeout&&(clearTimeout(e.autoplay.timeout),e.autoplay.timeout=void 0),e.autoplay.running=!1,e.emit("autoplayStop"),!0))},pause:function(e){var t=this;t.autoplay.running&&(t.autoplay.paused||(t.autoplay.timeout&&clearTimeout(t.autoplay.timeout),t.autoplay.paused=!0,0!==e&&t.params.autoplay.waitForTransition?(t.$wrapperEl[0].addEventListener("transitionend",t.autoplay.onTransitionEnd),t.$wrapperEl[0].addEventListener("webkitTransitionEnd",t.autoplay.onTransitionEnd)):(t.autoplay.paused=!1,t.autoplay.run())))}},K={setTranslate:function(){for(var e=this,t=e.slides,a=0;a<t.length;a+=1){var i=e.slides.eq(a),s=-i[0].swiperSlideOffset;e.params.virtualTranslate||(s-=e.translate);var r=0;e.isHorizontal()||(r=s,s=0);var n=e.params.fadeEffect.crossFade?Math.max(1-Math.abs(i[0].progress),0):1+Math.min(Math.max(i[0].progress,-1),0);i.css({opacity:n}).transform("translate3d("+s+"px, "+r+"px, 0px)")}},setTransition:function(e){var a=this,t=a.slides,i=a.$wrapperEl;if(t.transition(e),a.params.virtualTranslate&&0!==e){var s=!1;t.transitionEnd(function(){if(!s&&a&&!a.destroyed){s=!0,a.animating=!1;for(var e=["webkitTransitionEnd","transitionend"],t=0;t<e.length;t+=1)i.trigger(e[t])}})}}},_={setTranslate:function(){var e,t=this,a=t.$el,i=t.$wrapperEl,s=t.slides,r=t.width,n=t.height,o=t.rtlTranslate,l=t.size,d=t.params.cubeEffect,p=t.isHorizontal(),c=t.virtual&&t.params.virtual.enabled,u=0;d.shadow&&(p?(0===(e=i.find(".swiper-cube-shadow")).length&&(e=L('<div class="swiper-cube-shadow"></div>'),i.append(e)),e.css({height:r+"px"})):0===(e=a.find(".swiper-cube-shadow")).length&&(e=L('<div class="swiper-cube-shadow"></div>'),a.append(e)));for(var h=0;h<s.length;h+=1){var v=s.eq(h),f=h;c&&(f=parseInt(v.attr("data-swiper-slide-index"),10));var m=90*f,g=Math.floor(m/360);o&&(m=-m,g=Math.floor(-m/360));var b=Math.max(Math.min(v[0].progress,1),-1),w=0,y=0,x=0;f%4==0?(w=4*-g*l,x=0):(f-1)%4==0?(w=0,x=4*-g*l):(f-2)%4==0?(w=l+4*g*l,x=l):(f-3)%4==0&&(w=-l,x=3*l+4*l*g),o&&(w=-w),p||(y=w,w=0);var T="rotateX("+(p?0:-m)+"deg) rotateY("+(p?m:0)+"deg) translate3d("+w+"px, "+y+"px, "+x+"px)";if(b<=1&&-1<b&&(u=90*f+90*b,o&&(u=90*-f-90*b)),v.transform(T),d.slideShadows){var E=p?v.find(".swiper-slide-shadow-left"):v.find(".swiper-slide-shadow-top"),S=p?v.find(".swiper-slide-shadow-right"):v.find(".swiper-slide-shadow-bottom");0===E.length&&(E=L('<div class="swiper-slide-shadow-'+(p?"left":"top")+'"></div>'),v.append(E)),0===S.length&&(S=L('<div class="swiper-slide-shadow-'+(p?"right":"bottom")+'"></div>'),v.append(S)),E.length&&(E[0].style.opacity=Math.max(-b,0)),S.length&&(S[0].style.opacity=Math.max(b,0))}}if(i.css({"-webkit-transform-origin":"50% 50% -"+l/2+"px","-moz-transform-origin":"50% 50% -"+l/2+"px","-ms-transform-origin":"50% 50% -"+l/2+"px","transform-origin":"50% 50% -"+l/2+"px"}),d.shadow)if(p)e.transform("translate3d(0px, "+(r/2+d.shadowOffset)+"px, "+-r/2+"px) rotateX(90deg) rotateZ(0deg) scale("+d.shadowScale+")");else{var C=Math.abs(u)-90*Math.floor(Math.abs(u)/90),M=1.5-(Math.sin(2*C*Math.PI/360)/2+Math.cos(2*C*Math.PI/360)/2),k=d.shadowScale,P=d.shadowScale/M,z=d.shadowOffset;e.transform("scale3d("+k+", 1, "+P+") translate3d(0px, "+(n/2+z)+"px, "+-n/2/P+"px) rotateX(-90deg)")}var $=I.isSafari||I.isUiWebView?-l/2:0;i.transform("translate3d(0px,0,"+$+"px) rotateX("+(t.isHorizontal()?0:u)+"deg) rotateY("+(t.isHorizontal()?-u:0)+"deg)")},setTransition:function(e){var t=this.$el;this.slides.transition(e).find(".swiper-slide-shadow-top, .swiper-slide-shadow-right, .swiper-slide-shadow-bottom, .swiper-slide-shadow-left").transition(e),this.params.cubeEffect.shadow&&!this.isHorizontal()&&t.find(".swiper-cube-shadow").transition(e)}},Z={setTranslate:function(){for(var e=this,t=e.slides,a=e.rtlTranslate,i=0;i<t.length;i+=1){var s=t.eq(i),r=s[0].progress;e.params.flipEffect.limitRotation&&(r=Math.max(Math.min(s[0].progress,1),-1));var n=-180*r,o=0,l=-s[0].swiperSlideOffset,d=0;if(e.isHorizontal()?a&&(n=-n):(d=l,o=-n,n=l=0),s[0].style.zIndex=-Math.abs(Math.round(r))+t.length,e.params.flipEffect.slideShadows){var p=e.isHorizontal()?s.find(".swiper-slide-shadow-left"):s.find(".swiper-slide-shadow-top"),c=e.isHorizontal()?s.find(".swiper-slide-shadow-right"):s.find(".swiper-slide-shadow-bottom");0===p.length&&(p=L('<div class="swiper-slide-shadow-'+(e.isHorizontal()?"left":"top")+'"></div>'),s.append(p)),0===c.length&&(c=L('<div class="swiper-slide-shadow-'+(e.isHorizontal()?"right":"bottom")+'"></div>'),s.append(c)),p.length&&(p[0].style.opacity=Math.max(-r,0)),c.length&&(c[0].style.opacity=Math.max(r,0))}s.transform("translate3d("+l+"px, "+d+"px, 0px) rotateX("+o+"deg) rotateY("+n+"deg)")}},setTransition:function(e){var a=this,t=a.slides,i=a.activeIndex,s=a.$wrapperEl;if(t.transition(e).find(".swiper-slide-shadow-top, .swiper-slide-shadow-right, .swiper-slide-shadow-bottom, .swiper-slide-shadow-left").transition(e),a.params.virtualTranslate&&0!==e){var r=!1;t.eq(i).transitionEnd(function(){if(!r&&a&&!a.destroyed){r=!0,a.animating=!1;for(var e=["webkitTransitionEnd","transitionend"],t=0;t<e.length;t+=1)s.trigger(e[t])}})}}},Q={setTranslate:function(){for(var e=this,t=e.width,a=e.height,i=e.slides,s=e.$wrapperEl,r=e.slidesSizesGrid,n=e.params.coverflowEffect,o=e.isHorizontal(),l=e.translate,d=o?t/2-l:a/2-l,p=o?n.rotate:-n.rotate,c=n.depth,u=0,h=i.length;u<h;u+=1){var v=i.eq(u),f=r[u],m=(d-v[0].swiperSlideOffset-f/2)/f*n.modifier,g=o?p*m:0,b=o?0:p*m,w=-c*Math.abs(m),y=o?0:n.stretch*m,x=o?n.stretch*m:0;Math.abs(x)<.001&&(x=0),Math.abs(y)<.001&&(y=0),Math.abs(w)<.001&&(w=0),Math.abs(g)<.001&&(g=0),Math.abs(b)<.001&&(b=0);var T="translate3d("+x+"px,"+y+"px,"+w+"px)  rotateX("+b+"deg) rotateY("+g+"deg)";if(v.transform(T),v[0].style.zIndex=1-Math.abs(Math.round(m)),n.slideShadows){var E=o?v.find(".swiper-slide-shadow-left"):v.find(".swiper-slide-shadow-top"),S=o?v.find(".swiper-slide-shadow-right"):v.find(".swiper-slide-shadow-bottom");0===E.length&&(E=L('<div class="swiper-slide-shadow-'+(o?"left":"top")+'"></div>'),v.append(E)),0===S.length&&(S=L('<div class="swiper-slide-shadow-'+(o?"right":"bottom")+'"></div>'),v.append(S)),E.length&&(E[0].style.opacity=0<m?m:0),S.length&&(S[0].style.opacity=0<-m?-m:0)}}(te.pointerEvents||te.prefixedPointerEvents)&&(s[0].style.perspectiveOrigin=d+"px 50%")},setTransition:function(e){this.slides.transition(e).find(".swiper-slide-shadow-top, .swiper-slide-shadow-right, .swiper-slide-shadow-bottom, .swiper-slide-shadow-left").transition(e)}},ae={init:function(){var e=this,t=e.params.thumbs,a=e.constructor;t.swiper instanceof a?(e.thumbs.swiper=t.swiper,ee.extend(e.thumbs.swiper.originalParams,{watchSlidesProgress:!0,slideToClickedSlide:!1}),ee.extend(e.thumbs.swiper.params,{watchSlidesProgress:!0,slideToClickedSlide:!1})):ee.isObject(t.swiper)&&(e.thumbs.swiper=new a(ee.extend({},t.swiper,{watchSlidesVisibility:!0,watchSlidesProgress:!0,slideToClickedSlide:!1})),e.thumbs.swiperCreated=!0),e.thumbs.swiper.$el.addClass(e.params.thumbs.thumbsContainerClass),e.thumbs.swiper.on("tap",e.thumbs.onThumbClick)},onThumbClick:function(){var e=this,t=e.thumbs.swiper;if(t){var a=t.clickedIndex,i=t.clickedSlide;if(!(i&&L(i).hasClass(e.params.thumbs.slideThumbActiveClass)||null==a)){var s;if(s=t.params.loop?parseInt(L(t.clickedSlide).attr("data-swiper-slide-index"),10):a,e.params.loop){var r=e.activeIndex;e.slides.eq(r).hasClass(e.params.slideDuplicateClass)&&(e.loopFix(),e._clientLeft=e.$wrapperEl[0].clientLeft,r=e.activeIndex);var n=e.slides.eq(r).prevAll('[data-swiper-slide-index="'+s+'"]').eq(0).index(),o=e.slides.eq(r).nextAll('[data-swiper-slide-index="'+s+'"]').eq(0).index();s=void 0===n?o:void 0===o?n:o-r<r-n?o:n}e.slideTo(s)}}},update:function(e){var t=this,a=t.thumbs.swiper;if(a){var i="auto"===a.params.slidesPerView?a.slidesPerViewDynamic():a.params.slidesPerView;if(t.realIndex!==a.realIndex){var s,r=a.activeIndex;if(a.params.loop){a.slides.eq(r).hasClass(a.params.slideDuplicateClass)&&(a.loopFix(),a._clientLeft=a.$wrapperEl[0].clientLeft,r=a.activeIndex);var n=a.slides.eq(r).prevAll('[data-swiper-slide-index="'+t.realIndex+'"]').eq(0).index(),o=a.slides.eq(r).nextAll('[data-swiper-slide-index="'+t.realIndex+'"]').eq(0).index();s=void 0===n?o:void 0===o?n:o-r==r-n?r:o-r<r-n?o:n}else s=t.realIndex;a.visibleSlidesIndexes.indexOf(s)<0&&(a.params.centeredSlides?s=r<s?s-Math.floor(i/2)+1:s+Math.floor(i/2)-1:r<s&&(s=s-i+1),a.slideTo(s,e?0:void 0))}var l=1,d=t.params.thumbs.slideThumbActiveClass;if(1<t.params.slidesPerView&&!t.params.centeredSlides&&(l=t.params.slidesPerView),a.slides.removeClass(d),a.params.loop)for(var p=0;p<l;p+=1)a.$wrapperEl.children('[data-swiper-slide-index="'+(t.realIndex+p)+'"]').addClass(d);else for(var c=0;c<l;c+=1)a.slides.eq(t.realIndex+c).addClass(d)}}},ie=[C,M,k,P,$,O,N,{name:"mousewheel",params:{mousewheel:{enabled:!1,releaseOnEdges:!1,invert:!1,forceToAxis:!1,sensitivity:1,eventsTarged:"container"}},create:function(){var e=this;ee.extend(e,{mousewheel:{enabled:!1,enable:H.enable.bind(e),disable:H.disable.bind(e),handle:H.handle.bind(e),handleMouseEnter:H.handleMouseEnter.bind(e),handleMouseLeave:H.handleMouseLeave.bind(e),lastScrollTime:ee.now()}})},on:{init:function(){this.params.mousewheel.enabled&&this.mousewheel.enable()},destroy:function(){this.mousewheel.enabled&&this.mousewheel.disable()}}},{name:"navigation",params:{navigation:{nextEl:null,prevEl:null,hideOnClick:!1,disabledClass:"swiper-button-disabled",hiddenClass:"swiper-button-hidden",lockClass:"swiper-button-lock"}},create:function(){var e=this;ee.extend(e,{navigation:{init:G.init.bind(e),update:G.update.bind(e),destroy:G.destroy.bind(e),onNextClick:G.onNextClick.bind(e),onPrevClick:G.onPrevClick.bind(e)}})},on:{init:function(){this.navigation.init(),this.navigation.update()},toEdge:function(){this.navigation.update()},fromEdge:function(){this.navigation.update()},destroy:function(){this.navigation.destroy()},click:function(e){var t=this.navigation,a=t.$nextEl,i=t.$prevEl;!this.params.navigation.hideOnClick||L(e.target).is(i)||L(e.target).is(a)||(a&&a.toggleClass(this.params.navigation.hiddenClass),i&&i.toggleClass(this.params.navigation.hiddenClass))}}},{name:"pagination",params:{pagination:{el:null,bulletElement:"span",clickable:!1,hideOnClick:!1,renderBullet:null,renderProgressbar:null,renderFraction:null,renderCustom:null,progressbarOpposite:!1,type:"bullets",dynamicBullets:!1,dynamicMainBullets:1,formatFractionCurrent:function(e){return e},formatFractionTotal:function(e){return e},bulletClass:"swiper-pagination-bullet",bulletActiveClass:"swiper-pagination-bullet-active",modifierClass:"swiper-pagination-",currentClass:"swiper-pagination-current",totalClass:"swiper-pagination-total",hiddenClass:"swiper-pagination-hidden",progressbarFillClass:"swiper-pagination-progressbar-fill",progressbarOppositeClass:"swiper-pagination-progressbar-opposite",clickableClass:"swiper-pagination-clickable",lockClass:"swiper-pagination-lock"}},create:function(){var e=this;ee.extend(e,{pagination:{init:B.init.bind(e),render:B.render.bind(e),update:B.update.bind(e),destroy:B.destroy.bind(e),dynamicBulletIndex:0}})},on:{init:function(){this.pagination.init(),this.pagination.render(),this.pagination.update()},activeIndexChange:function(){this.params.loop?this.pagination.update():void 0===this.snapIndex&&this.pagination.update()},snapIndexChange:function(){this.params.loop||this.pagination.update()},slidesLengthChange:function(){this.params.loop&&(this.pagination.render(),this.pagination.update())},snapGridLengthChange:function(){this.params.loop||(this.pagination.render(),this.pagination.update())},destroy:function(){this.pagination.destroy()},click:function(e){var t=this;t.params.pagination.el&&t.params.pagination.hideOnClick&&0<t.pagination.$el.length&&!L(e.target).hasClass(t.params.pagination.bulletClass)&&t.pagination.$el.toggleClass(t.params.pagination.hiddenClass)}}},{name:"scrollbar",params:{scrollbar:{el:null,dragSize:"auto",hide:!1,draggable:!1,snapOnRelease:!0,lockClass:"swiper-scrollbar-lock",dragClass:"swiper-scrollbar-drag"}},create:function(){var e=this;ee.extend(e,{scrollbar:{init:X.init.bind(e),destroy:X.destroy.bind(e),updateSize:X.updateSize.bind(e),setTranslate:X.setTranslate.bind(e),setTransition:X.setTransition.bind(e),enableDraggable:X.enableDraggable.bind(e),disableDraggable:X.disableDraggable.bind(e),setDragPosition:X.setDragPosition.bind(e),onDragStart:X.onDragStart.bind(e),onDragMove:X.onDragMove.bind(e),onDragEnd:X.onDragEnd.bind(e),isTouched:!1,timeout:null,dragTimeout:null}})},on:{init:function(){this.scrollbar.init(),this.scrollbar.updateSize(),this.scrollbar.setTranslate()},update:function(){this.scrollbar.updateSize()},resize:function(){this.scrollbar.updateSize()},observerUpdate:function(){this.scrollbar.updateSize()},setTranslate:function(){this.scrollbar.setTranslate()},setTransition:function(e){this.scrollbar.setTransition(e)},destroy:function(){this.scrollbar.destroy()}}},{name:"parallax",params:{parallax:{enabled:!1}},create:function(){ee.extend(this,{parallax:{setTransform:Y.setTransform.bind(this),setTranslate:Y.setTranslate.bind(this),setTransition:Y.setTransition.bind(this)}})},on:{beforeInit:function(){this.params.parallax.enabled&&(this.params.watchSlidesProgress=!0,this.originalParams.watchSlidesProgress=!0)},init:function(){this.params.parallax&&this.parallax.setTranslate()},setTranslate:function(){this.params.parallax&&this.parallax.setTranslate()},setTransition:function(e){this.params.parallax&&this.parallax.setTransition(e)}}},{name:"zoom",params:{zoom:{enabled:!1,maxRatio:3,minRatio:1,toggle:!0,containerClass:"swiper-zoom-container",zoomedSlideClass:"swiper-slide-zoomed"}},create:function(){var i=this,t={enabled:!1,scale:1,currentScale:1,isScaling:!1,gesture:{$slideEl:void 0,slideWidth:void 0,slideHeight:void 0,$imageEl:void 0,$imageWrapEl:void 0,maxRatio:3},image:{isTouched:void 0,isMoved:void 0,currentX:void 0,currentY:void 0,minX:void 0,minY:void 0,maxX:void 0,maxY:void 0,width:void 0,height:void 0,startX:void 0,startY:void 0,touchesStart:{},touchesCurrent:{}},velocity:{x:void 0,y:void 0,prevPositionX:void 0,prevPositionY:void 0,prevTime:void 0}};"onGestureStart onGestureChange onGestureEnd onTouchStart onTouchMove onTouchEnd onTransitionEnd toggle enable disable in out".split(" ").forEach(function(e){t[e]=V[e].bind(i)}),ee.extend(i,{zoom:t});var s=1;Object.defineProperty(i.zoom,"scale",{get:function(){return s},set:function(e){if(s!==e){var t=i.zoom.gesture.$imageEl?i.zoom.gesture.$imageEl[0]:void 0,a=i.zoom.gesture.$slideEl?i.zoom.gesture.$slideEl[0]:void 0;i.emit("zoomChange",e,t,a)}s=e}})},on:{init:function(){this.params.zoom.enabled&&this.zoom.enable()},destroy:function(){this.zoom.disable()},touchStart:function(e){this.zoom.enabled&&this.zoom.onTouchStart(e)},touchEnd:function(e){this.zoom.enabled&&this.zoom.onTouchEnd(e)},doubleTap:function(e){this.params.zoom.enabled&&this.zoom.enabled&&this.params.zoom.toggle&&this.zoom.toggle(e)},transitionEnd:function(){this.zoom.enabled&&this.params.zoom.enabled&&this.zoom.onTransitionEnd()}}},{name:"lazy",params:{lazy:{enabled:!1,loadPrevNext:!1,loadPrevNextAmount:1,loadOnTransitionStart:!1,elementClass:"swiper-lazy",loadingClass:"swiper-lazy-loading",loadedClass:"swiper-lazy-loaded",preloaderClass:"swiper-lazy-preloader"}},create:function(){ee.extend(this,{lazy:{initialImageLoaded:!1,load:F.load.bind(this),loadInSlide:F.loadInSlide.bind(this)}})},on:{beforeInit:function(){this.params.lazy.enabled&&this.params.preloadImages&&(this.params.preloadImages=!1)},init:function(){this.params.lazy.enabled&&!this.params.loop&&0===this.params.initialSlide&&this.lazy.load()},scroll:function(){this.params.freeMode&&!this.params.freeModeSticky&&this.lazy.load()},resize:function(){this.params.lazy.enabled&&this.lazy.load()},scrollbarDragMove:function(){this.params.lazy.enabled&&this.lazy.load()},transitionStart:function(){var e=this;e.params.lazy.enabled&&(e.params.lazy.loadOnTransitionStart||!e.params.lazy.loadOnTransitionStart&&!e.lazy.initialImageLoaded)&&e.lazy.load()},transitionEnd:function(){this.params.lazy.enabled&&!this.params.lazy.loadOnTransitionStart&&this.lazy.load()}}},{name:"controller",params:{controller:{control:void 0,inverse:!1,by:"slide"}},create:function(){var e=this;ee.extend(e,{controller:{control:e.params.controller.control,getInterpolateFunction:R.getInterpolateFunction.bind(e),setTranslate:R.setTranslate.bind(e),setTransition:R.setTransition.bind(e)}})},on:{update:function(){this.controller.control&&this.controller.spline&&(this.controller.spline=void 0,delete this.controller.spline)},resize:function(){this.controller.control&&this.controller.spline&&(this.controller.spline=void 0,delete this.controller.spline)},observerUpdate:function(){this.controller.control&&this.controller.spline&&(this.controller.spline=void 0,delete this.controller.spline)},setTranslate:function(e,t){this.controller.control&&this.controller.setTranslate(e,t)},setTransition:function(e,t){this.controller.control&&this.controller.setTransition(e,t)}}},{name:"a11y",params:{a11y:{enabled:!0,notificationClass:"swiper-notification",prevSlideMessage:"Previous slide",nextSlideMessage:"Next slide",firstSlideMessage:"This is the first slide",lastSlideMessage:"This is the last slide",paginationBulletMessage:"Go to slide {{index}}"}},create:function(){var t=this;ee.extend(t,{a11y:{liveRegion:L('<span class="'+t.params.a11y.notificationClass+'" aria-live="assertive" aria-atomic="true"></span>')}}),Object.keys(q).forEach(function(e){t.a11y[e]=q[e].bind(t)})},on:{init:function(){this.params.a11y.enabled&&(this.a11y.init(),this.a11y.updateNavigation())},toEdge:function(){this.params.a11y.enabled&&this.a11y.updateNavigation()},fromEdge:function(){this.params.a11y.enabled&&this.a11y.updateNavigation()},paginationUpdate:function(){this.params.a11y.enabled&&this.a11y.updatePagination()},destroy:function(){this.params.a11y.enabled&&this.a11y.destroy()}}},{name:"history",params:{history:{enabled:!1,replaceState:!1,key:"slides"}},create:function(){var e=this;ee.extend(e,{history:{init:W.init.bind(e),setHistory:W.setHistory.bind(e),setHistoryPopState:W.setHistoryPopState.bind(e),scrollToSlide:W.scrollToSlide.bind(e),destroy:W.destroy.bind(e)}})},on:{init:function(){this.params.history.enabled&&this.history.init()},destroy:function(){this.params.history.enabled&&this.history.destroy()},transitionEnd:function(){this.history.initialized&&this.history.setHistory(this.params.history.key,this.activeIndex)}}},{name:"hash-navigation",params:{hashNavigation:{enabled:!1,replaceState:!1,watchState:!1}},create:function(){var e=this;ee.extend(e,{hashNavigation:{initialized:!1,init:j.init.bind(e),destroy:j.destroy.bind(e),setHash:j.setHash.bind(e),onHashCange:j.onHashCange.bind(e)}})},on:{init:function(){this.params.hashNavigation.enabled&&this.hashNavigation.init()},destroy:function(){this.params.hashNavigation.enabled&&this.hashNavigation.destroy()},transitionEnd:function(){this.hashNavigation.initialized&&this.hashNavigation.setHash()}}},{name:"autoplay",params:{autoplay:{enabled:!1,delay:3e3,waitForTransition:!0,disableOnInteraction:!0,stopOnLastSlide:!1,reverseDirection:!1}},create:function(){var t=this;ee.extend(t,{autoplay:{running:!1,paused:!1,run:U.run.bind(t),start:U.start.bind(t),stop:U.stop.bind(t),pause:U.pause.bind(t),onTransitionEnd:function(e){t&&!t.destroyed&&t.$wrapperEl&&e.target===this&&(t.$wrapperEl[0].removeEventListener("transitionend",t.autoplay.onTransitionEnd),t.$wrapperEl[0].removeEventListener("webkitTransitionEnd",t.autoplay.onTransitionEnd),t.autoplay.paused=!1,t.autoplay.running?t.autoplay.run():t.autoplay.stop())}}})},on:{init:function(){this.params.autoplay.enabled&&this.autoplay.start()},beforeTransitionStart:function(e,t){this.autoplay.running&&(t||!this.params.autoplay.disableOnInteraction?this.autoplay.pause(e):this.autoplay.stop())},sliderFirstMove:function(){this.autoplay.running&&(this.params.autoplay.disableOnInteraction?this.autoplay.stop():this.autoplay.pause())},destroy:function(){this.autoplay.running&&this.autoplay.stop()}}},{name:"effect-fade",params:{fadeEffect:{crossFade:!1}},create:function(){ee.extend(this,{fadeEffect:{setTranslate:K.setTranslate.bind(this),setTransition:K.setTransition.bind(this)}})},on:{beforeInit:function(){var e=this;if("fade"===e.params.effect){e.classNames.push(e.params.containerModifierClass+"fade");var t={slidesPerView:1,slidesPerColumn:1,slidesPerGroup:1,watchSlidesProgress:!0,spaceBetween:0,virtualTranslate:!0};ee.extend(e.params,t),ee.extend(e.originalParams,t)}},setTranslate:function(){"fade"===this.params.effect&&this.fadeEffect.setTranslate()},setTransition:function(e){"fade"===this.params.effect&&this.fadeEffect.setTransition(e)}}},{name:"effect-cube",params:{cubeEffect:{slideShadows:!0,shadow:!0,shadowOffset:20,shadowScale:.94}},create:function(){ee.extend(this,{cubeEffect:{setTranslate:_.setTranslate.bind(this),setTransition:_.setTransition.bind(this)}})},on:{beforeInit:function(){var e=this;if("cube"===e.params.effect){e.classNames.push(e.params.containerModifierClass+"cube"),e.classNames.push(e.params.containerModifierClass+"3d");var t={slidesPerView:1,slidesPerColumn:1,slidesPerGroup:1,watchSlidesProgress:!0,resistanceRatio:0,spaceBetween:0,centeredSlides:!1,virtualTranslate:!0};ee.extend(e.params,t),ee.extend(e.originalParams,t)}},setTranslate:function(){"cube"===this.params.effect&&this.cubeEffect.setTranslate()},setTransition:function(e){"cube"===this.params.effect&&this.cubeEffect.setTransition(e)}}},{name:"effect-flip",params:{flipEffect:{slideShadows:!0,limitRotation:!0}},create:function(){ee.extend(this,{flipEffect:{setTranslate:Z.setTranslate.bind(this),setTransition:Z.setTransition.bind(this)}})},on:{beforeInit:function(){var e=this;if("flip"===e.params.effect){e.classNames.push(e.params.containerModifierClass+"flip"),e.classNames.push(e.params.containerModifierClass+"3d");var t={slidesPerView:1,slidesPerColumn:1,slidesPerGroup:1,watchSlidesProgress:!0,spaceBetween:0,virtualTranslate:!0};ee.extend(e.params,t),ee.extend(e.originalParams,t)}},setTranslate:function(){"flip"===this.params.effect&&this.flipEffect.setTranslate()},setTransition:function(e){"flip"===this.params.effect&&this.flipEffect.setTransition(e)}}},{name:"effect-coverflow",params:{coverflowEffect:{rotate:50,stretch:0,depth:100,modifier:1,slideShadows:!0}},create:function(){ee.extend(this,{coverflowEffect:{setTranslate:Q.setTranslate.bind(this),setTransition:Q.setTransition.bind(this)}})},on:{beforeInit:function(){var e=this;"coverflow"===e.params.effect&&(e.classNames.push(e.params.containerModifierClass+"coverflow"),e.classNames.push(e.params.containerModifierClass+"3d"),e.params.watchSlidesProgress=!0,e.originalParams.watchSlidesProgress=!0)},setTranslate:function(){"coverflow"===this.params.effect&&this.coverflowEffect.setTranslate()},setTransition:function(e){"coverflow"===this.params.effect&&this.coverflowEffect.setTransition(e)}}},{name:"thumbs",params:{thumbs:{swiper:null,slideThumbActiveClass:"swiper-slide-thumb-active",thumbsContainerClass:"swiper-container-thumbs"}},create:function(){ee.extend(this,{thumbs:{swiper:null,init:ae.init.bind(this),update:ae.update.bind(this),onThumbClick:ae.onThumbClick.bind(this)}})},on:{beforeInit:function(){var e=this.params.thumbs;e&&e.swiper&&(this.thumbs.init(),this.thumbs.update(!0))},slideChange:function(){this.thumbs.swiper&&this.thumbs.update()},update:function(){this.thumbs.swiper&&this.thumbs.update()},resize:function(){this.thumbs.swiper&&this.thumbs.update()},observerUpdate:function(){this.thumbs.swiper&&this.thumbs.update()},setTransition:function(e){var t=this.thumbs.swiper;t&&t.setTransition(e)},beforeDestroy:function(){var e=this.thumbs.swiper;e&&this.thumbs.swiperCreated&&e&&e.destroy()}}}];return void 0===S.use&&(S.use=S.Class.use,S.installModule=S.Class.installModule),S.use(ie),S});
+//# sourceMappingURL=swiper.min.js.map
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/main/main.js b/pluss-manage-page/src/main/resources/static/resources/auth/js/main/main.js
new file mode 100644
index 0000000..38c2b0c
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/main/main.js
@@ -0,0 +1,656 @@
+/*******************************************************************************
+ * 
+ * 系统主页
+ * 
+ * <pre>
+ *  
+ * 作者：liys
+ * 邮箱:5087587@qq.com
+ * 日期:2019-2-13-16:14:52
+ * 版权：安徽航天信息有限公司
+ * </pre>
+ * 
+ ******************************************************************************/
+var mainPlugin=null;
+;(function($, window, document, undefined) {
+	
+	var pluginName = "main";
+	var me = null;
+	var context=null;
+	var ie8 = (/MSIE 8/.test(navigator.userAgent));
+	var defaults = {
+			key : 'id',
+			parentKey : 'parentId',
+			childKey : 'children',
+			levelKey : 'level',
+			nameKey : 'name',
+			iconKey : 'icon',
+			urlKey : 'defaultUrl',
+			isOpenKey : 'isOpen',
+			aliasKey : 'alias',
+			descKey : 'desc'
+		};
+	
+	function Plugin(element, options) {
+		this.settings = $.extend({}, defaults, options);
+		this._defaults = defaults;
+		this._name = pluginName;
+		this.init();
+	};
+	
+	Plugin.prototype = {
+		init:function(){
+			mainPlugin=this;
+			me=this;
+			//初始化菜单
+			me.initMenu();
+			//初始化菜单事件
+			me.initMenuEvent();
+			//选项卡点击事件
+			me.initMenuTabEvent();
+			//菜单滚动条事件
+			me.initMenuScrollEvent();
+		
+		},
+		//初始化菜单
+		initMenu:function(){
+		//左侧菜单栏
+			$.ajax({
+				url : ctx+"/auth!getPermissionMenusOnceAll.do",
+				type : 'POST',
+				dataType : 'json',
+				async : false,
+				success : function(menus) {
+					g_menus=menus;
+					//获取父节点
+					var html="";
+					$.each(g_menus,function(i,menu){
+						if(menu.name.indexOf('左边菜单')>=0){
+							//查询子菜单
+							var roots = me.findChildMenus(menu.id);
+							$('#leftMenu').empty();
+							$.each(roots, function(i, root) {
+								var iconUrl = root.iconUrl?root.iconUrl : res+'\/images\/project.png';
+								var secondHtml="";
+								//二级目录
+				                 var subRoots = me.findChildMenus(root.id);
+								 var t=0;
+								 var htm="";
+								$.each(subRoots, function(i, subroot) {
+									t++;
+									var subIconUrl = subroot.iconUrl?subroot.iconUrl : res+'\/images\/cube.png';
+										htm+='<li class="hover bdb1">';
+										htm+='<a href="javascript:void(0)" class="dblock positionr pt8 pb8 textl pl20 vm" data-url="'+subroot.link+'" data-url="'+subroot.link+'" data-title="'+subroot.name+'" data-menuId="'+subroot.id+'">';
+										htm+='<img alt="" src=\"'+subIconUrl+'\" width="20" height="20" class="dlblock vm">';
+										htm+='<span class="menu-text dlblock">'+subroot.name+'</span>';
+										htm+='</a>';
+										htm+='</li>	';
+								})      
+									
+								if(t>0){
+									//二级目录
+									secondHtml+='<ul class="submenu positionr">';
+									secondHtml+=htm;
+									//二级目录闭合
+									secondHtml+='</ul>';
+								}
+								var firstHtml='<li class="hover dblock positionr bdb1 positionr">';
+								//一级目录
+								if(root.link=="#"){
+									firstHtml+='<a href="javascript:void(0)" class="dblock pt2 pb2 overFont textc fc f13"  style="padding-left:0;padding-right:0;">';
+								}else{
+									firstHtml+='<a href="javascript:void(0)" class="dblock pt2 pb2 overFont textc fc f13" data-url="'+root.link+'" data-title="'+root.name+'"  data-menuId="'+root.id+'"  style="padding-left:0;padding-right:0;">';
+								}
+								
+								firstHtml+='<img alt="" src=\"'+iconUrl+'\" width="20" height="20">';
+								firstHtml+='<span class="menu-text dblock mt5">'+root.name+'</span>';
+								firstHtml+='</a>';
+								if(t>0){
+									firstHtml+='<b class="arrow"></b>';
+								}
+							  firstHtml+=secondHtml;
+							  //一级目录闭合
+							  firstHtml+='</li>';
+				                 html +=firstHtml;
+							})
+							$('#leftMenu').html(html);
+						}
+						
+					}) 
+				}
+			})
+		},
+		//查找子节点
+		findChildMenus:function(pid){
+			var children = [];
+			if(!pid) {
+				return "";
+			}
+			$.each(g_menus,function(i,menu){
+				if(menu.parentId && menu.parentId == pid) {
+					children.push(menu);
+				}
+			}) 
+			return children;
+		},
+		//绑定菜单事件
+		initMenuEvent:function(){
+			//左侧菜单栏
+			$('#leftMenu li a').on("click", function(e) {
+				// 为点击菜单绑定事件
+				var self = $(this);
+				var opts = self.data();
+				$(this).parent().addClass("active");
+				$(this).parent().siblings("li").removeClass("active");
+				me.addTab(opts);
+			});
+		},
+		//添加选项卡
+		addTab:function(options){
+			var title=options.title;
+			var url=options.url;
+			var menuId=options.menuid;
+		
+			var baseUrl = options.baseUrl ? options.baseUrl : ctx;
+			if (url == undefined || $.trim(url).length == 0)
+				return false;
+			//处理带http
+			if(url.indexOf("http:")==0 || url.indexOf("https:")==0){
+           	    baseUrl ="";
+			}
+			
+			//判断选项卡是否存在
+			if(!me.isTabExists(menuId)){
+				//添加选项卡
+				var str = '<a href="javascript:void(0);" class="active J_menuTab dblock fl bdrc pt7 pb6 pl15 pr15"  data-toggle="context" data-menuId="'
+					+ menuId+ '" data-url="'+ url+ '" data-title="'+ title+ '" >'
+					+ title
+					+ ' <i class="fa fa-times-circle"></i></a>';
+				$('.J_menuTab').removeClass('active');
+	
+				me.createIframe({
+					menuId : menuId,
+					url : baseUrl + url
+				});
+				// 添加选项卡
+				$('.J_menuTabs .page-tabs-content').append(str);
+				me.scrollToTab($('.J_menuTab.active'));
+			}else{
+				//选项卡存在
+				this.load($('.J_iframe[data-menuid="' + menuId + '"]'))
+			}
+			
+		},
+		//重新加载
+		load : function(target, url) {
+			if (!url)
+				url = target.attr('src');
+			// 显示loading提示
+			var loading = DialogUtil.load(0, {
+				shade : 0
+			});
+			alert($(target).parent().html());
+			target.attr('src', url).load(function() {
+				// 关闭loading提示
+				DialogUtil.close(loading);
+//				me.initContextmenu();
+			});
+			me.showActiveTab();
+		},
+	
+		 //判断选项卡是否存在,并切换到对应的id
+		isTabExists:function(menuId){
+			var flag = false;
+			//循环所有选项卡
+			$('.J_menuTab').each(function(){
+				if ($(this).data('menuid') == menuId) {
+					flag=true;
+					//显示对应界面
+					if (!$(this).hasClass('active')) {
+						$(this).addClass('active').siblings('.J_menuTab').removeClass('active');
+						me.scrollToTab(this);
+					}
+					// 显示tab对应的内容区
+					$('.J_mainContent .J_iframe').each(function() {
+						if ($(this).data('menuid') == menuId) {
+							$(this).show().siblings('.J_iframe').hide();
+						}
+					});
+					return flag;
+					
+				}
+			})
+			return flag;
+		},
+		// 计算元素集合的总宽度
+		calSumWidth : function(elements) {
+			var width = 0;
+			$(elements).each(function() {
+				width += $(this).outerWidth(true);
+			});
+			return width;
+		},
+		// 滚动到指定选项卡
+		scrollToTab : function(element) {
+			var marginLeftVal = me.calSumWidth($(element).prevAll()), marginRightVal = me
+					.calSumWidth($(element).nextAll());
+			// 可视区域非tab宽度
+			var tabOuterWidth = me.calSumWidth($(".content-tabs").children()
+					.not(".J_menuTabs"));
+			// 可视区域tab宽度
+			var visibleWidth = $(".content-tabs").outerWidth(true)
+					- tabOuterWidth;
+			// 实际滚动宽度
+			var scrollVal = 0;
+			if ($(".page-tabs-content").outerWidth() < visibleWidth) {
+				scrollVal = 0;
+			} else if (marginRightVal <= (visibleWidth
+					- $(element).outerWidth(true) - $(element).next()
+					.outerWidth(true))) {
+				if ((visibleWidth - $(element).next().outerWidth(true)) > marginRightVal) {
+					scrollVal = marginLeftVal;
+					var tabElement = element;
+					while ((scrollVal - $(tabElement).outerWidth()) > ($(
+							".page-tabs-content").outerWidth() - visibleWidth)) {
+						scrollVal -= $(tabElement).prev().outerWidth();
+						tabElement = $(tabElement).prev();
+					}
+				}
+			} else if (marginLeftVal > (visibleWidth
+					- $(element).outerWidth(true) - $(element).prev()
+					.outerWidth(true))) {
+				scrollVal = marginLeftVal - $(element).prev().outerWidth(true);
+			}
+			$('.page-tabs-content').animate({
+				marginLeft : 0 - scrollVal + 'px'
+			}, "fast");
+			//关闭选项卡右键菜单
+			me.closedTabRightEvent();
+		},
+		//创建iframe
+		createIframe:function(opts){
+			var height = ie8 ? me.flexFrameHeight() : '100%';
+			// 添加选项卡对应的iframe
+			var str1 = '<iframe class="J_iframe"   name="iframe_' + opts.menuId
+					+ '" width="100%" height="' + height + '" src="' + opts.url
+					+ '" frameborder="0" data-menuId="' + opts.menuId
+					+ '" seamless></iframe>';
+			$('.J_mainContent').find('iframe.J_iframe').hide();
+			$('.J_mainContent').append(str1);
+
+			// 显示loading提示
+			var loading = DialogUtil.load(0, {
+				shade : 0
+			});
+			$('.J_mainContent iframe:visible').load(function() {
+				// iframe加载完成后隐藏loading提示
+				DialogUtil.close(loading);
+//				me.initContextmenu();
+			});
+		},
+		load: function(target, url) {
+			if (!url)
+				url = target.attr('src');
+			// 显示loading提示
+			var loading = DialogUtil.load(0, {
+				shade : 0
+			});
+			target.attr('src', url).load(function() {
+				// 关闭loading提示
+				DialogUtil.close(loading);
+//				me.initContextmenu();
+			});
+		},
+		//鼠标事件
+		initMenuTabEvent:function(){
+			// 为点击菜单绑定事件
+			$(document).on("click",'.J_menuTab', function(e) {
+				var self = $(this);
+				var opts = self.data();
+				$(this).addClass("active").siblings("a").removeClass("active");
+				me.addTab(opts);
+			});
+			//阻止默认事件
+			$(document).on("contextmenu",'.J_menuTab', function() {
+				   return false;
+			});
+			//选项卡右击事件
+			$(document).on("mousedown",'.J_menuTab', function(e) {
+		     if (3 == e.which) {
+		    	 //记忆选中选项卡
+		    	 context=this;
+		    	 var menuId=$(this).data("menuid");
+		    		me.isTabExists(menuId);
+		    		var  left=$(this).offset().left+40;
+		    		$('#context-menu').css("left",left);
+		    		$('#context-menu').show();
+	            } 
+			});
+			//绑定左滑 右滑事件
+			// 左移按扭
+			$('.J_tabLeft').on('click', function() {
+				me.scrollTabLeft();
+			});
+
+			// 右移按扭
+			$('.J_tabRight').on('click', function() {
+				me.scrollTabRight();
+			});
+			//删除事件冒泡
+			$(document).on('click', '.J_menuTab i', function() {
+				   return false;
+			});
+			// 关闭tab
+			$('.J_menuTabs').on('click', '.J_menuTab i', me.closeTab);
+			// 关闭其他tab
+			$('.J_tabCloseOther').on('click', me.closeOtherTabs);
+			//
+			$('.J_tabShowActive').on('click', me.showActiveTab);
+			// 关闭全部
+			$('.J_tabCloseAll').on('click', me.closeAllTabs);
+			
+			//监听选项卡右键出发事件
+			$('.dropdown-menu li a').on('click', me.tabRinghtClickEvent);
+			
+		},
+		//选项卡右键触发事件
+		tabRinghtClickEvent:function(){
+			 var action =$(this).data("action");
+			 var self = $(context);
+			 switch (action) {
+				case "tab-refresh":// 刷新
+					me.refreshTab(self);
+					break;
+				case "tab-close":// 关闭
+					me.closeCurTab(self);
+					break;
+				case "tab-close-all":// 所有
+					me.closeAllTabs();
+					break;
+				case "tab-close-other":
+					me.closeOtherTabs();
+					break;
+				case "tab-close-right":
+					me.closeRightLeftTabs(self, true);
+					break;
+				case "tab-close-left":
+					me.closeRightLeftTabs(self, false);
+					break;
+				case "tab-exit":
+					break;
+				}
+			//关闭右键 
+			 me.closedTabRightEvent();
+			 
+		},
+		
+		//菜单滚动条事件
+		initMenuScrollEvent:function(){
+			$(window).load(function(){
+				$(".menuScroll").mCustomScrollbar({
+					scrollInertia:50
+				});
+			});
+			
+			//hover事件
+			$(".menuScroll").hover(function(){
+				$(this).addClass("plussScroll");
+			},function(){
+				$(this).removeClass("plussScroll");
+			})
+			
+		},
+		closeRightLeftTabs : function(self, flag) {
+			if (!$(self).hasClass('active'))
+				return;
+			var $this = $(self), currentWidth = $this.width(), tabs;
+			if (flag)// 右边
+				tabs = $this.nextAll('.J_menuTab');
+			else
+				tabs = $this.prevAll('.J_menuTab');
+			// 当前元素后面有同辈元素，使后面的所有元素删除
+			if (tabs.size() > 0) {
+				tabs.each(function() {
+					if ($(this).data('menuid') == 'home')
+						return false;
+					$(this).remove();
+				});
+				var marginLeftVal = parseInt($('.page-tabs-content').css(
+						'margin-left'));
+				if (marginLeftVal < 0) {
+					$('.page-tabs-content').animate({
+						marginLeft : (marginLeftVal + currentWidth) + 'px'
+					}, "fast");
+				}
+				// 移除tab对应的内容区
+				$('.J_mainContent .J_iframe').each(function() {
+					var $that = $(this), curId = $that.data('menuid');
+					if (curId == 'home')
+						return true;
+					tabs.each(function() {
+						if (curId == $(this).data('menuid')) {
+							$that.remove();
+							return false;
+						}
+					});
+				});
+			}
+		},
+		// 刷新iframe
+		refreshTab : function(self) {
+			
+			var tab;
+			if (self)
+				tab = $(self);
+			else {
+				tab = this.getActivemenuTab();
+			}
+			me.load($('.J_iframe[data-menuid="' + tab.data('menuid') + '"]'));
+		},
+		closeCurTab : function(self) {
+			var $this = $(self), closeTabId = $this.data('menuid'), currentWidth = $this
+					.width();
+			if (closeTabId == 'home')
+				return;
+		
+			// 当前元素处于活动状态
+			if ($this.hasClass('active')) {
+
+				// 当前元素后面有同辈元素，使后面的一个元素处于活动状态
+				if ($this.next('.J_menuTab').size()) {
+
+					var activeId = $this.next('.J_menuTab:eq(0)').data('menuid');
+					$this.next('.J_menuTab:eq(0)').addClass('active');
+
+					$('.J_mainContent .J_iframe').each(function() {
+						if ($(this).data('menuid') == activeId) {
+							$(this).show().siblings('.J_iframe').hide();
+							return false;
+						}
+					});
+
+					var marginLeftVal = parseInt($('.page-tabs-content').css(
+							'margin-left'));
+					if (marginLeftVal < 0) {
+						$('.page-tabs-content').animate({
+							marginLeft : (marginLeftVal + currentWidth) + 'px'
+						}, "fast");
+					}
+
+					// 移除当前选项卡
+					$this.remove();
+
+					// 移除tab对应的内容区
+					$('.J_mainContent .J_iframe').each(function() {
+						if ($(this).data('menuid') == closeTabId) {
+							$(this).remove();
+							return false;
+						}
+					});
+				}
+
+				// 当前元素后面没有同辈元素，使当前元素的上一个元素处于活动状态
+				if ($this.prev('.J_menuTab').size()) {
+					var activeId = $this.prev('.J_menuTab:last').data('menuid');
+					$this.prev('.J_menuTab:last').addClass('active');
+					$('.J_mainContent .J_iframe').each(function() {
+						if ($(this).data('menuid') == activeId) {
+							$(this).show().siblings('.J_iframe').hide();
+							return false;
+						}
+					});
+
+					// 移除当前选项卡
+					$this.remove();
+
+					// 移除tab对应的内容区
+					$('.J_mainContent .J_iframe').each(function() {
+						if ($(this).data('menuid') == closeTabId) {
+							$(this).remove();
+							return false;
+						}
+					});
+				}
+			}
+			// 当前元素不处于活动状态
+			else {
+				// 移除当前选项卡
+				$this.remove();
+				// 移除相应tab对应的内容区
+				$('.J_mainContent .J_iframe').each(function() {
+					if ($(this).data('menuid') == closeTabId) {
+						$(this).remove();
+						return false;
+					}
+				});
+				// 激活当前
+				me.scrollToTab($('.J_menuTab.active'));
+			}
+		},
+		// 关闭选项卡菜单
+		closeTab : function() {
+			me.closeCurTab($(this).parents('.J_menuTab'));
+		},
+		// 关闭其他选项卡
+		closeOtherTabs : function() {
+			$('.page-tabs-content').children("[data-menuid]").not(":first").not(
+					".active").each(function() {
+				$('.J_iframe[data-menuid="' + $(this).data('menuid') + '"]').remove();
+				$(this).remove();
+			});
+			$('.page-tabs-content').css("margin-left", "0");
+		},
+		// 滚动到已激活的选项卡
+		showActiveTab : function() {
+			me.scrollToTab($('.J_menuTab.active'));
+		},
+		//关闭所有选项卡
+		closeAllTabs : function() {
+			$('.page-tabs-content').children("[data-menuid]").not(":first").each(
+					function() {
+						$('.J_iframe[data-menuid="' + $(this).data('menuid') + '"]')
+								.remove();
+						$(this).remove();
+					});
+			$('.page-tabs-content').children("[data-menuid]:first").each(
+					function() {
+						$('.J_iframe[data-menuid="' + $(this).data('menuid') + '"]')
+								.show();
+						$(this).addClass("active");
+					});
+			$('.page-tabs-content').css("margin-left", "0");
+		},
+		/**
+		 * 查看右侧隐藏的选项卡
+		 */
+		scrollTabLeft : function() {
+			var marginLeftVal = Math.abs(parseInt($('.page-tabs-content').css(
+					'margin-left')));
+			// 可视区域非tab宽度
+			var tabOuterWidth = me.calSumWidth($(".content-tabs").children()
+					.not(".J_menuTabs"));
+			// 可视区域tab宽度
+			var visibleWidth = $(".content-tabs").outerWidth(true)
+					- tabOuterWidth;
+			// 实际滚动宽度
+			var scrollVal = 0;
+			if ($(".page-tabs-content").width() < visibleWidth) {
+				return false;
+			} else {
+				var tabElement = $(".J_menuTab:first");
+				var offsetVal = 0;
+				while ((offsetVal + $(tabElement).outerWidth(true)) <= marginLeftVal) {// 找到离当前tab最近的元素
+					offsetVal += $(tabElement).outerWidth(true);
+					tabElement = $(tabElement).next();
+				}
+				offsetVal = 0;
+				if (me.calSumWidth($(tabElement).prevAll()) > visibleWidth) {
+					while ((offsetVal + $(tabElement).outerWidth(true)) < (visibleWidth)
+							&& tabElement.length > 0) {
+						offsetVal += $(tabElement).outerWidth(true);
+						tabElement = $(tabElement).prev();
+					}
+					scrollVal = me.calSumWidth($(tabElement).prevAll());
+				}
+			}
+			$('.page-tabs-content').animate({
+				marginLeft : 0 - scrollVal + 'px'
+			}, "fast");
+		},
+		// 查看右侧隐藏的选项卡
+		scrollTabRight : function() {
+			var marginLeftVal = Math.abs(parseInt($('.page-tabs-content').css(
+					'margin-left')));
+			// 可视区域非tab宽度
+			var tabOuterWidth = me.calSumWidth($(".content-tabs").children()
+					.not(".J_menuTabs"));
+			// 可视区域tab宽度
+			var visibleWidth = $(".content-tabs").outerWidth(true)
+					- tabOuterWidth;
+			// 实际滚动宽度
+			var scrollVal = 0;
+			if ($(".page-tabs-content").width() < visibleWidth) {
+				return false;
+			} else {
+				var tabElement = $(".J_menuTab:first");
+				var offsetVal = 0;
+				while ((offsetVal + $(tabElement).outerWidth(true)) <= marginLeftVal) {// 找到离当前tab最近的元素
+					offsetVal += $(tabElement).outerWidth(true);
+					tabElement = $(tabElement).next();
+				}
+				offsetVal = 0;
+				while ((offsetVal + $(tabElement).outerWidth(true)) < (visibleWidth)
+						&& tabElement.length > 0) {
+					offsetVal += $(tabElement).outerWidth(true);
+					tabElement = $(tabElement).next();
+				}
+				scrollVal = me.calSumWidth($(tabElement).prevAll());
+				if (scrollVal > 0) {
+					$('.page-tabs-content').animate({
+						marginLeft : 0 - scrollVal + 'px'
+					}, "fast");
+				}
+			}
+		},
+		//关闭右键菜单
+		closedTabRightEvent:function(){
+			$('#context-menu').hide();
+		}	
+	};
+	
+	
+	$.fn[pluginName] = function(options) {
+		return this.each(function() {
+			if (!$.data(this, "plugin_" + pluginName)) {
+						$.data(this, "plugin_" + pluginName, new Plugin(this,
+								options));
+					}
+				});
+	};
+	
+})(jQuery, window, document);
+
+//程序入口
+$(function(){
+	$("body").main();
+})
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/menu/menu.js b/pluss-manage-page/src/main/resources/static/resources/auth/js/menu/menu.js
new file mode 100644
index 0000000..70a5f1f
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/menu/menu.js
@@ -0,0 +1,533 @@
+var menuTree, rMenu;
+$(function() {
+	initMenuTree();
+
+	rendEdit();
+	
+	initUpload();
+
+	initValidate();
+
+	$("#btn_save").click(function() {
+		submit();
+	})
+})
+
+function initUpload(){	$("#icon_upload").uploadify({
+		swf : res + "/auth/uploadify/uploadify.swf",
+		uploader : ctx + "/menu!uploadIcon.do",
+		width : 80,
+		height : 80,
+		multi : false,
+		fileTypeExts : '*.jpg;*.jpeg;*.bmp;*.gif;*.png',
+		fileTypeDesc : 'Image(*.jpg;*.bmp;*.gif;*.png)',
+		fileObjName : "file",
+		buttonText : '选择图片',
+		removeTimeout : 0, // 完成时清除队列显示秒数
+		onInit : function() {
+			$(".uploadify-queue").hide();
+			$("#icon_upload-button").remove();
+			$("#icon_upload").css({
+				position : 'absolute',
+				width : '100%',
+				height : '100%',
+				left : 0,
+				top : 0,
+				margin : 0,
+				cursor : 'pointer'
+			}).attr("title", "点击上传");
+		},
+		removeCompleted : true,
+		onUploadStart: function() {
+			$(".uploadify-queue").show();
+		},
+		onUploadComplete: function() {
+			$(".uploadify-queue").hide();
+		},		
+		onUploadSuccess : function(file, data, response) {
+			renderIconUrl(data);
+		},
+		onUploadError : function(file, errorCode, errorMsg, errorString) {
+			alert('文件 ' + file.name + ' 上传失败: ' + errorString);
+		}
+	});
+	
+	$(document).on("mouseover","#icon_upload_wrap",function(){
+		if($("#icon_upload_wrap img").size() > 0) {
+			$("#icon_upload_wrap .clear").show('fast');
+		}
+	})
+	$(document).on("mouseleave","#icon_upload_wrap",function(){
+		$("#icon_upload_wrap .clear").hide('fast');
+	})
+	$("#icon_upload_wrap .clear button").click(function(){
+		$("#icon_upload_wrap img").remove();
+		return false;
+	})
+	
+	
+	$("#icon_upload_wrap").click(function(){
+		$.seocooUpload(function(data){
+			if(data.result==1){
+				renderIconUrl(data.url);
+				
+			}else{
+				alert(data.message);
+			}
+			
+		})
+	})
+	
+	
+}
+
+function renderIconUrl(url) {
+	var $img = $("#icon_upload_wrap img");
+	if($img.size()==0) {
+		$img = $("<img>");
+		$("#icon_upload_wrap").append($img);
+	}
+	$img.attr("src",url);
+}
+
+function initMenuTree() {
+	menuTree = $.fn.zTree.init($("#menu_tree"), {
+		async : {
+			enable : true,
+			url : ctx + "/menuInfo/getSubMenus",
+			type : 'post',
+			dataType : 'json',
+			async:false, 
+			autoParam : [ "id=parentId" ],
+			dataFilter : function(treeId, pNode, treeNodes) {
+				for ( var i = 0; i < treeNodes.length; i++) {
+					treeNodes[i] = menu2Node(treeNodes[i]);
+				}
+				return treeNodes;
+			}
+		},
+		data : {
+			keep : {
+				leaf : true,
+				parent : true
+			}
+		},
+		edit : {
+			enable : true,
+			showRemoveBtn : false,
+			showRenameBtn : false,
+			drag : {
+				isCopy : true,
+				isMove : true
+			}
+		},
+		view : {
+			selectedMulti : false
+		},
+		callback : {
+			onRightClick : function(evt, treeId, treeNode) {
+				showMenu(treeNode, evt.pageX, evt.pageY);
+			},
+			beforeDrag : function(treeId, treeNodes) {
+				return true;
+			},
+			beforeDrop : function(treeId, treeNodes, targetNode, moveType) {
+				try {
+					var containerType = 1;
+					if (targetNode) {
+						if (moveType === 'inner') {
+							containerType = targetNode.menuType;
+						} else if (targetNode.getParentNode()) {
+							containerType = targetNode.getParentNode().menuType;
+						}
+					}
+					var treeNode = treeNodes[0];
+					switch (containerType) {
+					case 1://目录接受页面和按键
+						if (treeNode.menuType < 3) {
+							return true;
+						}
+						break;
+					case 2://页面只接受按键
+						if (treeNode.menuType === 3) {
+							return true;
+						}
+						break;
+					case 3://按键不接受
+						return false;
+						break;
+					}
+				} catch (e) {
+					console.log(e);
+				}
+				return false;
+			},
+			onDrop : function(evt, treeId, treeNodes, targetNode, moveType, isCopy) {
+				if (targetNode && moveType) {
+					var containerId = null;
+					if (moveType === 'inner') {
+						containerId = targetNode.id;
+					} else if (targetNode.getParentNode()) {
+						containerId = targetNode.getParentNode().id;
+					}
+					var container = menuTree.getNodeByParam("id",containerId);
+					
+					$.ajax({
+						url : ctx + (isCopy ? '/menu/copy' : '/menu/move'),
+						type : 'post',
+						dataType : 'json',
+						data : [ {
+							name : 'toId',
+							value : containerId
+						}, {
+							name : 'id',
+							value : treeNodes[0].id
+						}, {
+							name : 'order',
+							value : menuTree.getNodeIndex(treeNodes[0]) + 1
+						}],
+						complete : function() {
+							menuTree.reAsyncChildNodes(container, "refresh", false);
+							rendEdit();
+						}
+					})
+				} else {
+					rendEdit();
+				}
+			},
+			onRemove : function(evt, treeId, treeNode) {
+				rendEdit();
+			},
+			onClick : function(evt, treeId, treeNode, clickFlag) {
+				rendEdit();
+			}
+		// callback end
+		}
+	});
+	menuTree.expandAll(true);
+}
+
+function menu2Node(node) {
+	node.isParent = !(node.menuType === 3);
+	switch (node.menuType) {
+	case 1:
+		node.iconSkin = "folder";
+		break;
+	case 2:
+		node.iconSkin = "page";
+		break;
+	case 3:
+		node.iconSkin = "action";
+		break;
+	default:
+		break;
+	}
+	node.parentId = node.parent ? node.parent.id : null;
+	return node;
+}
+
+function showMenu(treeNode, x, y) {
+	$("#rMenu").css({
+		"top" : y + "px",
+		"left" : x + "px",
+		"visibility" : "visible"
+	});
+	var pMenuType = null;
+	if (treeNode) {
+		pMenuType = treeNode.menuType;
+	}
+	switch (pMenuType) {
+	case 1:
+		$("#m_refresh").show();
+		$("#m_add_folder").show();
+		$("#m_add_page").show();
+		$("#m_add_action").hide();
+		$("#m_del").show();
+		break;
+	case 2:
+		$("#m_refresh").show();
+		$("#m_add_folder").hide();
+		$("#m_add_page").hide();
+		$("#m_add_action").show();
+		$("#m_del").show();
+		break;
+	case 3:
+		$("#m_refresh").hide();
+		$("#m_add_folder").hide();
+		$("#m_add_page").hide();
+		$("#m_add_action").hide();
+		$("#m_del").show();
+		break;
+	default:
+		$("#m_refresh").show();
+		$("#m_add_folder").show();
+		$("#m_add_page").show();
+		$("#m_add_action").hide();
+		$("#m_del").hide();
+		break;
+	}
+
+	if (!treeNode) {
+		$("#rMenu").removeData('tId');
+	} else {
+		$("#rMenu").data("tId", treeNode.tId);
+		menuTree.selectNode(treeNode);
+		rendEdit();
+	}
+	$(document).bind("mousedown", onBodyMouseDown);
+}
+
+function hideMenu() {
+	$("#rMenu").css({
+		"visibility" : "hidden"
+	});
+	$(document).unbind("mousedown", onBodyMouseDown);
+}
+
+function onBodyMouseDown(event) {
+	if (!(event.target.id == "rMenu" || $(event.target).parents("#rMenu").length > 0)) {
+		hideMenu();
+	}
+}
+
+function rendEdit() {
+	if (menuTree && menuTree.getSelectedNodes()[0]) {
+		var node = menuTree.getSelectedNodes()[0];
+		var _id = $("#id").val();
+		$("#id").val(node.id);
+		if(node.parentId) {
+			$("#parentId").val(node.parentId);
+			$("#description").removeAttr('placeholder');
+			$(".control-group:has(#description)").hide();
+		}else {//当前菜单是子系统节点
+			$("#parentId").val('');
+			$(".control-group:has(#description)").show();
+			$("#description").attr('placeholder',"此处内容将作为子系统logo展示");
+		}
+		$("#menuOrder").val(menuTree.getNodeIndex(node) + 1);
+		$("#name").val(node.name);
+		$("#link").val(node.link);
+		$("#description").val(node.description);
+		$("#menuType").val(node.menuType);
+		$("#visible").prop({
+			checked : node.visible
+		})
+		if(node.iconUrl){
+			renderIconUrl(node.iconUrl);
+		}else {
+			$("#icon_upload_wrap img").remove();
+		}
+		
+		//当前选中的和之前选中的不是同一个节点
+		if(_id != node.id) {
+			$("#menu_info_block").hide();
+			$("#menu_info_block").show('fast',function(){
+				$("#name").focus().select();
+			});
+		}
+	}else {
+		$("#id").val('');
+		$("#menu_info_block").hide();
+	}
+}
+
+function menu_refreshTreeNode() {
+	hideMenu();
+	var tId = $("#rMenu").data("tId");
+	var node = menuTree.getNodeByTId(tId);
+	menuTree.reAsyncChildNodes(node, "refresh", false);
+	rendEdit();
+}
+
+function menu_addTreeNode(menuType) {
+	hideMenu();
+	var tId = $("#rMenu").data("tId");
+	var node = menuTree.getNodeByTId(tId);
+	if (node && !node.isParent) {
+		return;
+	}
+	var isParent = true;
+	var iconSkin = "page";
+	switch (menuType) {
+	case 1:
+		isParent = true;
+		iconSkin = "folder";
+		break;
+	case 2:
+		isParent = true;
+		iconSkin = "page";
+		break;
+	case 3:
+		isParent = false;
+		iconSkin = "action";
+		break;
+	}
+	var newNodes = menuTree.addNodes(node, [ {
+		id : '',
+		name : '新建菜单',
+		menuType : menuType,
+		isParent : isParent,
+		iconSkin : iconSkin
+	} ], false);
+	var newNode = newNodes[0];
+	var pId = node ? node.id : '';
+	var data = [ {
+		name : 'id',
+		value : ''
+	}, {
+		name : 'name',
+		value : newNode.name
+	}, {
+		name : 'menuOrder',
+		value : menuTree.getNodeIndex(newNode) + 1
+	}, {
+		name : 'menuType',
+		value : newNode.menuType
+	} ];
+	if (pId) {
+		data.push({
+			name : 'parentId',
+			value : pId
+		});
+	}
+	$.ajax({
+		url : ctx + '/menuInfo/saveMenu',
+		type : 'post',
+		dataType : 'json',
+		data : data,
+		success : function(menu) {
+			newNode.id = menu.id;
+			newNode.parentId = menu.parentId;
+			menuTree.updateNode(newNode);
+			if(newNode.getParentNode) {
+				menuTree.selectNode(newNode);
+			}
+			rendEdit();
+		},
+		   error:function(XMLHttpRequest,textStatus,errorThrown){
+	            alert(errorThrown);
+	            alert(XMLHttpRequest.status);
+	            alert(XMLHttpRequest.readyState);
+	            alert(textStatus);
+			menuTree.removeNode(newNode, false);
+		}
+	})
+}
+
+function menu_removeTreeNode() {
+	hideMenu();
+	var tId = $("#rMenu").data("tId");
+	var node = menuTree.getNodeByTId(tId);
+	myConfirm('', '确定删除?', function() {
+		$.ajax({
+			url : ctx + '/menuInfo/deleteMenuInfo',
+			type : 'post',
+			dataType : 'json',
+			data : [ {
+				name : 'id',
+				value : node.id
+			} ],
+			complete : function(data) {
+				menuTree.reAsyncChildNodes(node.getParentNode(), "refresh", false);
+				rendEdit();
+			}
+		})
+	});
+}
+
+function initValidate() {
+	$("#menu_form").validate({
+		onfocusout : false,
+		onkeyup : false,
+		onclick : false,
+		focusInvalid : true,
+		rules : {
+			name : {
+				required : true,
+				maxlength : 32
+			}
+		},
+		showErrors : function(errorMap, errorList) {
+			$(this.currentForm).find("span.error").remove();
+			if (errorList.length > 0) {
+				var err = errorList[0];
+				var el = $(err.element);
+				var target = el.parentsUntil('form', '.controls');
+				target.append("<span class='error'>{0}</span>".format(err.message));
+			}
+		}
+	});
+}
+
+function submit() {
+	if (!$("#menu_form").valid()) {
+		return;
+	}
+	$("#btn_save").attr("disabled","disabled");
+	var data = [];
+	$.each($("#menu_form").serializeArray(),function(i,a){
+		if(typeof(a.value) == 'string' && !a.value){
+			return;
+		}
+		//on转数值
+		if(a.name=='isVisible'){
+			if(a.value=='on'){
+				a.value=1;
+			}else{
+				a.value=0;
+			}
+		}
+		data.push(a);
+	});
+	var iconUrl = $("#icon_upload_wrap img").attr("src");
+	if(iconUrl) {
+		data.push({
+			name : 'iconUrl',
+			value : iconUrl
+		})
+	}
+	var visible=$("#visible").val();
+//	if(a.name=='visible'){
+//		if(a.value=='on'){
+//			a.value=1;
+//		}else{
+//			a.value=0;
+//		}
+//	}
+//	data.push(a);
+	
+	
+	$.ajax({
+		url : ctx + '/menuInfo/saveMenu',
+		type : 'post',
+		dataType : 'json',
+		data :$("#menu_form").serializeArray(),
+			
+		/*{
+			"menuInfo":$("#menu_form").serializeArray(),
+			"iconUrl":iconUrl
+		},*/
+		success : function(menu) {
+			var node = menuTree.getNodeByParam("id", menu.id);
+			$.extend(node,menu);
+			menuTree.updateNode(node);
+			$("#id").val('');
+			rendEdit();
+		},
+		complete : function(){
+			$("#btn_save").removeAttr("disabled");
+		}
+	})
+}
+
+
+//主线程休眠
+function sleep(numberMillis) { 
+	var now = new Date(); 
+	var exitTime = now.getTime() + numberMillis; 
+	while (true) { 
+	now = new Date(); 
+	if (now.getTime() > exitTime) 
+	return; 
+	} 
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/nicescroll.min.js b/pluss-manage-page/src/main/resources/static/resources/auth/js/nicescroll.min.js
new file mode 100644
index 0000000..c3f8cbb
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/nicescroll.min.js
@@ -0,0 +1,334 @@
+/* jquery.nicescroll v3.7.6 InuYaksa - MIT - https://nicescroll.areaaperta.com */
+!function(e){"function"==typeof define&&define.amd?define(["jquery"],e):"object"==typeof exports?module.exports=e(require("jquery")):e(jQuery)}(function(e){"use strict"
+function o(){var e=c.currentScript||function(){var e=c.getElementsByTagName("script")
+return e.length?e[e.length-1]:!1}(),o=e?e.src.split("?")[0]:""
+return o.split("/").length>0?o.split("/").slice(0,-1).join("/")+"/":""}function t(e,o,t){for(var r=0,i=o.length;i>r;r++)t(e,o[r])}var r=!1,i=!1,s=0,n=2e3,l=0,a=e,c=document,d=window,u=a(d),h=[],p=d.requestAnimationFrame||d.webkitRequestAnimationFrame||d.mozRequestAnimationFrame||!1,m=d.cancelAnimationFrame||d.webkitCancelAnimationFrame||d.mozCancelAnimationFrame||!1
+if(p)d.cancelAnimationFrame||(m=function(e){})
+else{var f=0
+p=function(e,o){var t=(new Date).getTime(),r=Math.max(0,16-(t-f)),i=d.setTimeout(function(){e(t+r)},r)
+return f=t+r,i},m=function(e){d.clearTimeout(e)}}var g=d.MutationObserver||d.WebKitMutationObserver||!1,v=Date.now||function(){return(new Date).getTime()},w={zindex:"auto",cursoropacitymin:0,cursoropacitymax:1,cursorcolor:"#424242",cursorwidth:"6px",cursorborder:"1px solid #fff",cursorborderradius:"5px",scrollspeed:40,mousescrollstep:27,touchbehavior:!1,emulatetouch:!1,hwacceleration:!0,usetransition:!0,boxzoom:!1,dblclickzoom:!0,gesturezoom:!0,grabcursorenabled:!0,autohidemode:!0,background:"",iframeautoresize:!0,cursorminheight:32,preservenativescrolling:!0,railoffset:!1,railhoffset:!1,bouncescroll:!0,spacebarenabled:!0,railpadding:{top:0,right:0,left:0,bottom:0},disableoutline:!0,horizrailenabled:!0,railalign:"right",railvalign:"bottom",enabletranslate3d:!0,enablemousewheel:!0,enablekeyboard:!0,smoothscroll:!0,sensitiverail:!0,enablemouselockapi:!0,cursorfixedheight:!1,directionlockdeadzone:6,hidecursordelay:400,nativeparentscrolling:!0,enablescrollonselection:!0,overflowx:!0,overflowy:!0,cursordragspeed:.3,rtlmode:"auto",cursordragontouch:!1,oneaxismousemode:"auto",scriptpath:o(),preventmultitouchscrolling:!0,disablemutationobserver:!1,enableobserver:!0,scrollbarid:!1},b=!1,y=function(){function e(){var e=["grab","-webkit-grab","-moz-grab"];(s.ischrome&&!s.ischrome38||s.isie)&&(e=[])
+for(var o=0,r=e.length;r>o;o++){var i=e[o]
+if(t.cursor=i,t.cursor==i)return i}return"url(https://cdnjs.cloudflare.com/ajax/libs/slider-pro/1.3.0/css/images/openhand.cur),n-resize"}if(b)return b
+var o=c.createElement("DIV"),t=o.style,r=navigator.userAgent,i=navigator.platform,s={}
+return s.haspointerlock="pointerLockElement"in c||"webkitPointerLockElement"in c||"mozPointerLockElement"in c,s.isopera="opera"in d,s.isopera12=s.isopera&&"getUserMedia"in navigator,s.isoperamini="[object OperaMini]"===Object.prototype.toString.call(d.operamini),s.isie="all"in c&&"attachEvent"in o&&!s.isopera,s.isieold=s.isie&&!("msInterpolationMode"in t),s.isie7=s.isie&&!s.isieold&&(!("documentMode"in c)||7===c.documentMode),s.isie8=s.isie&&"documentMode"in c&&8===c.documentMode,s.isie9=s.isie&&"performance"in d&&9===c.documentMode,s.isie10=s.isie&&"performance"in d&&10===c.documentMode,s.isie11="msRequestFullscreen"in o&&c.documentMode>=11,s.ismsedge="msCredentials"in d,s.ismozilla="MozAppearance"in t,s.iswebkit=!s.ismsedge&&"WebkitAppearance"in t,s.ischrome=s.iswebkit&&"chrome"in d,s.ischrome38=s.ischrome&&"touchAction"in t,s.ischrome22=!s.ischrome38&&s.ischrome&&s.haspointerlock,s.ischrome26=!s.ischrome38&&s.ischrome&&"transition"in t,s.cantouch="ontouchstart"in c.documentElement||"ontouchstart"in d,s.hasw3ctouch=(d.PointerEvent||!1)&&(navigator.maxTouchPoints>0||navigator.msMaxTouchPoints>0),s.hasmstouch=!s.hasw3ctouch&&(d.MSPointerEvent||!1),s.ismac=/^mac$/i.test(i),s.isios=s.cantouch&&/iphone|ipad|ipod/i.test(i),s.isios4=s.isios&&!("seal"in Object),s.isios7=s.isios&&"webkitHidden"in c,s.isios8=s.isios&&"hidden"in c,s.isios10=s.isios&&d.Proxy,s.isandroid=/android/i.test(r),s.haseventlistener="addEventListener"in o,s.trstyle=!1,s.hastransform=!1,s.hastranslate3d=!1,s.transitionstyle=!1,s.hastransition=!1,s.transitionend=!1,s.trstyle="transform",s.hastransform="transform"in t||function(){for(var e=["msTransform","webkitTransform","MozTransform","OTransform"],o=0,r=e.length;r>o;o++)if(void 0!==t[e[o]]){s.trstyle=e[o]
+break}s.hastransform=!!s.trstyle}(),s.hastransform&&(t[s.trstyle]="translate3d(1px,2px,3px)",s.hastranslate3d=/translate3d/.test(t[s.trstyle])),s.transitionstyle="transition",s.prefixstyle="",s.transitionend="transitionend",s.hastransition="transition"in t||function(){s.transitionend=!1
+for(var e=["webkitTransition","msTransition","MozTransition","OTransition","OTransition","KhtmlTransition"],o=["-webkit-","-ms-","-moz-","-o-","-o","-khtml-"],r=["webkitTransitionEnd","msTransitionEnd","transitionend","otransitionend","oTransitionEnd","KhtmlTransitionEnd"],i=0,n=e.length;n>i;i++)if(e[i]in t){s.transitionstyle=e[i],s.prefixstyle=o[i],s.transitionend=r[i]
+break}s.ischrome26&&(s.prefixstyle=o[1]),s.hastransition=s.transitionstyle}(),s.cursorgrabvalue=e(),s.hasmousecapture="setCapture"in o,s.hasMutationObserver=g!==!1,o=null,b=s,s},x=function(e,o){function t(){var e=T.doc.css(P.trstyle)
+return e&&"matrix"==e.substr(0,6)?e.replace(/^.*\((.*)\)$/g,"$1").replace(/px/g,"").split(/, +/):!1}function f(){var e=T.win
+if("zIndex"in e)return e.zIndex()
+for(;e.length>0;){if(9==e[0].nodeType)return!1
+var o=e.css("zIndex")
+if(!isNaN(o)&&0!==o)return parseInt(o)
+e=e.parent()}return!1}function b(e,o,t){var r=e.css(o),i=parseFloat(r)
+if(isNaN(i)){i=I[r]||0
+var s=3==i?t?T.win.outerHeight()-T.win.innerHeight():T.win.outerWidth()-T.win.innerWidth():1
+return T.isie8&&i&&(i+=1),s?i:0}return i}function x(e,o,t,r){T._bind(e,o,function(r){r=r||d.event
+var i={original:r,target:r.target||r.srcElement,type:"wheel",deltaMode:"MozMousePixelScroll"==r.type?0:1,deltaX:0,deltaZ:0,preventDefault:function(){return r.preventDefault?r.preventDefault():r.returnValue=!1,!1},stopImmediatePropagation:function(){r.stopImmediatePropagation?r.stopImmediatePropagation():r.cancelBubble=!0}}
+return"mousewheel"==o?(r.wheelDeltaX&&(i.deltaX=-1/40*r.wheelDeltaX),r.wheelDeltaY&&(i.deltaY=-1/40*r.wheelDeltaY),!i.deltaY&&!i.deltaX&&(i.deltaY=-1/40*r.wheelDelta)):i.deltaY=r.detail,t.call(e,i)},r)}function z(e,o,t,r){T.scrollrunning||(T.newscrolly=T.getScrollTop(),T.newscrollx=T.getScrollLeft(),A=v())
+var i=v()-A
+if(A=v(),i>350?q=1:q+=(2-q)/10,e=e*q|0,o=o*q|0,e){if(r)if(0>e){if(T.getScrollLeft()>=T.page.maxw)return!0}else if(T.getScrollLeft()<=0)return!0
+var s=e>0?1:-1
+D!==s&&(T.scrollmom&&T.scrollmom.stop(),T.newscrollx=T.getScrollLeft(),D=s),T.lastdeltax-=e}if(o){var n=function(){var e=T.getScrollTop()
+if(0>o){if(e>=T.page.maxh)return!0}else if(0>=e)return!0}()
+if(n){if(M.nativeparentscrolling&&t&&!T.ispage&&!T.zoomactive)return!0
+var l=T.view.h>>1
+T.newscrolly<-l?(T.newscrolly=-l,o=-1):T.newscrolly>T.page.maxh+l?(T.newscrolly=T.page.maxh+l,o=1):o=0}var a=o>0?1:-1
+X!==a&&(T.scrollmom&&T.scrollmom.stop(),T.newscrolly=T.getScrollTop(),X=a),T.lastdeltay-=o}(o||e)&&T.synched("relativexy",function(){var e=T.lastdeltay+T.newscrolly
+T.lastdeltay=0
+var o=T.lastdeltax+T.newscrollx
+T.lastdeltax=0,T.rail.drag||T.doScrollPos(o,e)})}function k(e,o,t){var r,i
+if(!t&&j)return!0
+if(0===e.deltaMode?(r=0|-(e.deltaX*(M.mousescrollstep/54)),i=0|-(e.deltaY*(M.mousescrollstep/54))):1===e.deltaMode&&(r=0|-(e.deltaX*M.mousescrollstep*50/80),i=0|-(e.deltaY*M.mousescrollstep*50/80)),o&&M.oneaxismousemode&&0===r&&i&&(r=i,i=0,t)){var s=0>r?T.getScrollLeft()>=T.page.maxw:T.getScrollLeft()<=0
+s&&(i=r,r=0)}T.isrtlmode&&(r=-r)
+var n=z(r,i,t,!0)
+return n?void(t&&(j=!0)):(j=!1,e.stopImmediatePropagation(),e.preventDefault())}var T=this
+this.version="3.7.6",this.name="nicescroll",this.me=o
+var E=a("body"),M=this.opt={doc:E,win:!1}
+if(a.extend(M,w),M.snapbackspeed=80,e)for(var L in M)void 0!==e[L]&&(M[L]=e[L])
+if(M.disablemutationobserver&&(g=!1),this.doc=M.doc,this.iddoc=this.doc&&this.doc[0]?this.doc[0].id||"":"",this.ispage=/^BODY|HTML/.test(M.win?M.win[0].nodeName:this.doc[0].nodeName),this.haswrapper=M.win!==!1,this.win=M.win||(this.ispage?u:this.doc),this.docscroll=this.ispage&&!this.haswrapper?u:this.win,this.body=E,this.viewport=!1,this.isfixed=!1,this.iframe=!1,this.isiframe="IFRAME"==this.doc[0].nodeName&&"IFRAME"==this.win[0].nodeName,this.istextarea="TEXTAREA"==this.win[0].nodeName,this.forcescreen=!1,this.canshowonmouseevent="scroll"!=M.autohidemode,this.onmousedown=!1,this.onmouseup=!1,this.onmousemove=!1,this.onmousewheel=!1,this.onkeypress=!1,this.ongesturezoom=!1,this.onclick=!1,this.onscrollstart=!1,this.onscrollend=!1,this.onscrollcancel=!1,this.onzoomin=!1,this.onzoomout=!1,this.view=!1,this.page=!1,this.scroll={x:0,y:0},this.scrollratio={x:0,y:0},this.cursorheight=20,this.scrollvaluemax=0,"auto"==M.rtlmode){var C=this.win[0]==d?this.body:this.win,N=C.css("writing-mode")||C.css("-webkit-writing-mode")||C.css("-ms-writing-mode")||C.css("-moz-writing-mode")
+"horizontal-tb"==N||"lr-tb"==N||""===N?(this.isrtlmode="rtl"==C.css("direction"),this.isvertical=!1):(this.isrtlmode="vertical-rl"==N||"tb"==N||"tb-rl"==N||"rl-tb"==N,this.isvertical="vertical-rl"==N||"tb"==N||"tb-rl"==N)}else this.isrtlmode=M.rtlmode===!0,this.isvertical=!1
+if(this.scrollrunning=!1,this.scrollmom=!1,this.observer=!1,this.observerremover=!1,this.observerbody=!1,M.scrollbarid!==!1)this.id=M.scrollbarid
+else do this.id="ascrail"+n++
+while(c.getElementById(this.id))
+this.rail=!1,this.cursor=!1,this.cursorfreezed=!1,this.selectiondrag=!1,this.zoom=!1,this.zoomactive=!1,this.hasfocus=!1,this.hasmousefocus=!1,this.railslocked=!1,this.locked=!1,this.hidden=!1,this.cursoractive=!0,this.wheelprevented=!1,this.overflowx=M.overflowx,this.overflowy=M.overflowy,this.nativescrollingarea=!1,this.checkarea=0,this.events=[],this.saved={},this.delaylist={},this.synclist={},this.lastdeltax=0,this.lastdeltay=0,this.detected=y()
+var P=a.extend({},this.detected)
+this.canhwscroll=P.hastransform&&M.hwacceleration,this.ishwscroll=this.canhwscroll&&T.haswrapper,this.isrtlmode?this.isvertical?this.hasreversehr=!(P.iswebkit||P.isie||P.isie11):this.hasreversehr=!(P.iswebkit||P.isie&&!P.isie10&&!P.isie11):this.hasreversehr=!1,this.istouchcapable=!1,P.cantouch||!P.hasw3ctouch&&!P.hasmstouch?!P.cantouch||P.isios||P.isandroid||!P.iswebkit&&!P.ismozilla||(this.istouchcapable=!0):this.istouchcapable=!0,M.enablemouselockapi||(P.hasmousecapture=!1,P.haspointerlock=!1),this.debounced=function(e,o,t){if(T){var r=T.delaylist[e]||!1
+r||(T.delaylist[e]={h:p(function(){T.delaylist[e].fn.call(T),T.delaylist[e]=!1},t)},o.call(T)),T.delaylist[e].fn=o}},this.synched=function(e,o){T.synclist[e]?T.synclist[e]=o:(T.synclist[e]=o,p(function(){T&&(T.synclist[e]&&T.synclist[e].call(T),T.synclist[e]=null)}))},this.unsynched=function(e){T.synclist[e]&&(T.synclist[e]=!1)},this.css=function(e,o){for(var t in o)T.saved.css.push([e,t,e.css(t)]),e.css(t,o[t])},this.scrollTop=function(e){return void 0===e?T.getScrollTop():T.setScrollTop(e)},this.scrollLeft=function(e){return void 0===e?T.getScrollLeft():T.setScrollLeft(e)}
+var R=function(e,o,t,r,i,s,n){this.st=e,this.ed=o,this.spd=t,this.p1=r||0,this.p2=i||1,this.p3=s||0,this.p4=n||1,this.ts=v(),this.df=o-e}
+if(R.prototype={B2:function(e){return 3*(1-e)*(1-e)*e},B3:function(e){return 3*(1-e)*e*e},B4:function(e){return e*e*e},getPos:function(){return(v()-this.ts)/this.spd},getNow:function(){var e=(v()-this.ts)/this.spd,o=this.B2(e)+this.B3(e)+this.B4(e)
+return e>=1?this.ed:this.st+this.df*o|0},update:function(e,o){return this.st=this.getNow(),this.ed=e,this.spd=o,this.ts=v(),this.df=this.ed-this.st,this}},this.ishwscroll){this.doc.translate={x:0,y:0,tx:"0px",ty:"0px"},P.hastranslate3d&&P.isios&&this.doc.css("-webkit-backface-visibility","hidden"),this.getScrollTop=function(e){if(!e){var o=t()
+if(o)return 16==o.length?-o[13]:-o[5]
+if(T.timerscroll&&T.timerscroll.bz)return T.timerscroll.bz.getNow()}return T.doc.translate.y},this.getScrollLeft=function(e){if(!e){var o=t()
+if(o)return 16==o.length?-o[12]:-o[4]
+if(T.timerscroll&&T.timerscroll.bh)return T.timerscroll.bh.getNow()}return T.doc.translate.x},this.notifyScrollEvent=function(e){var o=c.createEvent("UIEvents")
+o.initUIEvent("scroll",!1,!1,d,1),o.niceevent=!0,e.dispatchEvent(o)}
+var _=this.isrtlmode?1:-1
+P.hastranslate3d&&M.enabletranslate3d?(this.setScrollTop=function(e,o){T.doc.translate.y=e,T.doc.translate.ty=-1*e+"px",T.doc.css(P.trstyle,"translate3d("+T.doc.translate.tx+","+T.doc.translate.ty+",0)"),o||T.notifyScrollEvent(T.win[0])},this.setScrollLeft=function(e,o){T.doc.translate.x=e,T.doc.translate.tx=e*_+"px",T.doc.css(P.trstyle,"translate3d("+T.doc.translate.tx+","+T.doc.translate.ty+",0)"),o||T.notifyScrollEvent(T.win[0])}):(this.setScrollTop=function(e,o){T.doc.translate.y=e,T.doc.translate.ty=-1*e+"px",T.doc.css(P.trstyle,"translate("+T.doc.translate.tx+","+T.doc.translate.ty+")"),o||T.notifyScrollEvent(T.win[0])},this.setScrollLeft=function(e,o){T.doc.translate.x=e,T.doc.translate.tx=e*_+"px",T.doc.css(P.trstyle,"translate("+T.doc.translate.tx+","+T.doc.translate.ty+")"),o||T.notifyScrollEvent(T.win[0])})}else this.getScrollTop=function(){return T.docscroll.scrollTop()},this.setScrollTop=function(e){T.docscroll.scrollTop(e)},this.getScrollLeft=function(){var e
+return e=T.hasreversehr?T.detected.ismozilla?T.page.maxw-Math.abs(T.docscroll.scrollLeft()):T.page.maxw-T.docscroll.scrollLeft():T.docscroll.scrollLeft()},this.setScrollLeft=function(e){return setTimeout(function(){return T?(T.hasreversehr&&(e=T.detected.ismozilla?-(T.page.maxw-e):T.page.maxw-e),T.docscroll.scrollLeft(e)):void 0},1)}
+this.getTarget=function(e){return e?e.target?e.target:e.srcElement?e.srcElement:!1:!1},this.hasParent=function(e,o){if(!e)return!1
+for(var t=e.target||e.srcElement||e||!1;t&&t.id!=o;)t=t.parentNode||!1
+return t!==!1}
+var I={thin:1,medium:3,thick:5}
+this.getDocumentScrollOffset=function(){return{top:d.pageYOffset||c.documentElement.scrollTop,left:d.pageXOffset||c.documentElement.scrollLeft}},this.getOffset=function(){if(T.isfixed){var e=T.win.offset(),o=T.getDocumentScrollOffset()
+return e.top-=o.top,e.left-=o.left,e}var t=T.win.offset()
+if(!T.viewport)return t
+var r=T.viewport.offset()
+return{top:t.top-r.top,left:t.left-r.left}},this.updateScrollBar=function(e){var o,t
+if(T.ishwscroll)T.rail.css({height:T.win.innerHeight()-(M.railpadding.top+M.railpadding.bottom)}),T.railh&&T.railh.css({width:T.win.innerWidth()-(M.railpadding.left+M.railpadding.right)})
+else{var r=T.getOffset()
+if(o={top:r.top,left:r.left-(M.railpadding.left+M.railpadding.right)},o.top+=b(T.win,"border-top-width",!0),o.left+=T.rail.align?T.win.outerWidth()-b(T.win,"border-right-width")-T.rail.width:b(T.win,"border-left-width"),t=M.railoffset,t&&(t.top&&(o.top+=t.top),t.left&&(o.left+=t.left)),T.railslocked||T.rail.css({top:o.top,left:o.left,height:(e?e.h:T.win.innerHeight())-(M.railpadding.top+M.railpadding.bottom)}),T.zoom&&T.zoom.css({top:o.top+1,left:1==T.rail.align?o.left-20:o.left+T.rail.width+4}),T.railh&&!T.railslocked){o={top:r.top,left:r.left},t=M.railhoffset,t&&(t.top&&(o.top+=t.top),t.left&&(o.left+=t.left))
+var i=T.railh.align?o.top+b(T.win,"border-top-width",!0)+T.win.innerHeight()-T.railh.height:o.top+b(T.win,"border-top-width",!0),s=o.left+b(T.win,"border-left-width")
+T.railh.css({top:i-(M.railpadding.top+M.railpadding.bottom),left:s,width:T.railh.width})}}},this.doRailClick=function(e,o,t){var r,i,s,n
+T.railslocked||(T.cancelEvent(e),"pageY"in e||(e.pageX=e.clientX+c.documentElement.scrollLeft,e.pageY=e.clientY+c.documentElement.scrollTop),o?(r=t?T.doScrollLeft:T.doScrollTop,s=t?(e.pageX-T.railh.offset().left-T.cursorwidth/2)*T.scrollratio.x:(e.pageY-T.rail.offset().top-T.cursorheight/2)*T.scrollratio.y,T.unsynched("relativexy"),r(0|s)):(r=t?T.doScrollLeftBy:T.doScrollBy,s=t?T.scroll.x:T.scroll.y,n=t?e.pageX-T.railh.offset().left:e.pageY-T.rail.offset().top,i=t?T.view.w:T.view.h,r(s>=n?i:-i)))},T.newscrolly=T.newscrollx=0,T.hasanimationframe="requestAnimationFrame"in d,T.hascancelanimationframe="cancelAnimationFrame"in d,T.hasborderbox=!1,this.init=function(){if(T.saved.css=[],P.isoperamini)return!0
+if(P.isandroid&&!("hidden"in c))return!0
+M.emulatetouch=M.emulatetouch||M.touchbehavior,T.hasborderbox=d.getComputedStyle&&"border-box"===d.getComputedStyle(c.body)["box-sizing"]
+var e={"overflow-y":"hidden"}
+if((P.isie11||P.isie10)&&(e["-ms-overflow-style"]="none"),T.ishwscroll&&(this.doc.css(P.transitionstyle,P.prefixstyle+"transform 0ms ease-out"),P.transitionend&&T.bind(T.doc,P.transitionend,T.onScrollTransitionEnd,!1)),T.zindex="auto",T.ispage||"auto"!=M.zindex?T.zindex=M.zindex:T.zindex=f()||"auto",!T.ispage&&"auto"!=T.zindex&&T.zindex>l&&(l=T.zindex),T.isie&&0===T.zindex&&"auto"==M.zindex&&(T.zindex="auto"),!T.ispage||!P.isieold){var o=T.docscroll
+T.ispage&&(o=T.haswrapper?T.win:T.doc),T.css(o,e),T.ispage&&(P.isie11||P.isie)&&T.css(a("html"),e),!P.isios||T.ispage||T.haswrapper||T.css(E,{"-webkit-overflow-scrolling":"touch"})
+var t=a(c.createElement("div"))
+t.css({position:"relative",top:0,"float":"right",width:M.cursorwidth,height:0,"background-color":M.cursorcolor,border:M.cursorborder,"background-clip":"padding-box","-webkit-border-radius":M.cursorborderradius,"-moz-border-radius":M.cursorborderradius,"border-radius":M.cursorborderradius}),t.addClass("nicescroll-cursors"),T.cursor=t
+var n=a(c.createElement("div"))
+n.attr("id",T.id),n.addClass("nicescroll-rails nicescroll-rails-vr")
+var h,p,m=["left","right","top","bottom"]
+for(var v in m)p=m[v],h=M.railpadding[p]||0,h&&n.css("padding-"+p,h+"px")
+n.append(t),n.width=Math.max(parseFloat(M.cursorwidth),t.outerWidth()),n.css({width:n.width+"px",zIndex:T.zindex,background:M.background,cursor:"default"}),n.visibility=!0,n.scrollable=!0,n.align="left"==M.railalign?0:1,T.rail=n,T.rail.drag=!1
+var w=!1
+!M.boxzoom||T.ispage||P.isieold||(w=c.createElement("div"),T.bind(w,"click",T.doZoom),T.bind(w,"mouseenter",function(){T.zoom.css("opacity",M.cursoropacitymax)}),T.bind(w,"mouseleave",function(){T.zoom.css("opacity",M.cursoropacitymin)}),T.zoom=a(w),T.zoom.css({cursor:"pointer",zIndex:T.zindex,backgroundImage:"url("+M.scriptpath+"zoomico.png)",height:18,width:18,backgroundPosition:"0 0"}),M.dblclickzoom&&T.bind(T.win,"dblclick",T.doZoom),P.cantouch&&M.gesturezoom&&(T.ongesturezoom=function(e){return e.scale>1.5&&T.doZoomIn(e),e.scale<.8&&T.doZoomOut(e),T.cancelEvent(e)},T.bind(T.win,"gestureend",T.ongesturezoom))),T.railh=!1
+var b
+if(M.horizrailenabled&&(T.css(o,{overflowX:"hidden"}),t=a(c.createElement("div")),t.css({position:"absolute",top:0,height:M.cursorwidth,width:0,backgroundColor:M.cursorcolor,border:M.cursorborder,backgroundClip:"padding-box","-webkit-border-radius":M.cursorborderradius,"-moz-border-radius":M.cursorborderradius,"border-radius":M.cursorborderradius}),P.isieold&&t.css("overflow","hidden"),t.addClass("nicescroll-cursors"),T.cursorh=t,b=a(c.createElement("div")),b.attr("id",T.id+"-hr"),b.addClass("nicescroll-rails nicescroll-rails-hr"),b.height=Math.max(parseFloat(M.cursorwidth),t.outerHeight()),b.css({height:b.height+"px",zIndex:T.zindex,background:M.background}),b.append(t),b.visibility=!0,b.scrollable=!0,b.align="top"==M.railvalign?0:1,T.railh=b,T.railh.drag=!1),T.ispage)n.css({position:"fixed",top:0,height:"100%"}),n.css(n.align?{right:0}:{left:0}),T.body.append(n),T.railh&&(b.css({position:"fixed",left:0,width:"100%"}),b.css(b.align?{bottom:0}:{top:0}),T.body.append(b))
+else{if(T.ishwscroll){"static"==T.win.css("position")&&T.css(T.win,{position:"relative"})
+var y="HTML"==T.win[0].nodeName?T.body:T.win
+a(y).scrollTop(0).scrollLeft(0),T.zoom&&(T.zoom.css({position:"absolute",top:1,right:0,"margin-right":n.width+4}),y.append(T.zoom)),n.css({position:"absolute",top:0}),n.css(n.align?{right:0}:{left:0}),y.append(n),b&&(b.css({position:"absolute",left:0,bottom:0}),b.css(b.align?{bottom:0}:{top:0}),y.append(b))}else{T.isfixed="fixed"==T.win.css("position")
+var x=T.isfixed?"fixed":"absolute"
+T.isfixed||(T.viewport=T.getViewport(T.win[0])),T.viewport&&(T.body=T.viewport,/fixed|absolute/.test(T.viewport.css("position"))||T.css(T.viewport,{position:"relative"})),n.css({position:x}),T.zoom&&T.zoom.css({position:x}),T.updateScrollBar(),T.body.append(n),T.zoom&&T.body.append(T.zoom),T.railh&&(b.css({position:x}),T.body.append(b))}P.isios&&T.css(T.win,{"-webkit-tap-highlight-color":"rgba(0,0,0,0)","-webkit-touch-callout":"none"}),M.disableoutline&&(P.isie&&T.win.attr("hideFocus","true"),P.iswebkit&&T.win.css("outline","none"))}if(M.autohidemode===!1?(T.autohidedom=!1,T.rail.css({opacity:M.cursoropacitymax}),T.railh&&T.railh.css({opacity:M.cursoropacitymax})):M.autohidemode===!0||"leave"===M.autohidemode?(T.autohidedom=a().add(T.rail),P.isie8&&(T.autohidedom=T.autohidedom.add(T.cursor)),T.railh&&(T.autohidedom=T.autohidedom.add(T.railh)),T.railh&&P.isie8&&(T.autohidedom=T.autohidedom.add(T.cursorh))):"scroll"==M.autohidemode?(T.autohidedom=a().add(T.rail),T.railh&&(T.autohidedom=T.autohidedom.add(T.railh))):"cursor"==M.autohidemode?(T.autohidedom=a().add(T.cursor),T.railh&&(T.autohidedom=T.autohidedom.add(T.cursorh))):"hidden"==M.autohidemode&&(T.autohidedom=!1,T.hide(),T.railslocked=!1),P.cantouch||T.istouchcapable||M.emulatetouch||P.hasmstouch){T.scrollmom=new S(T)
+T.ontouchstart=function(e){if(T.locked)return!1
+if(e.pointerType&&("mouse"===e.pointerType||e.pointerType===e.MSPOINTER_TYPE_MOUSE))return!1
+if(T.hasmoving=!1,T.scrollmom.timer&&(T.triggerScrollEnd(),T.scrollmom.stop()),!T.railslocked){var o=T.getTarget(e)
+if(o){var t=/INPUT/i.test(o.nodeName)&&/range/i.test(o.type)
+if(t)return T.stopPropagation(e)}var r="mousedown"===e.type
+if(!("clientX"in e)&&"changedTouches"in e&&(e.clientX=e.changedTouches[0].clientX,e.clientY=e.changedTouches[0].clientY),T.forcescreen){var i=e
+e={original:e.original?e.original:e},e.clientX=i.screenX,e.clientY=i.screenY}if(T.rail.drag={x:e.clientX,y:e.clientY,sx:T.scroll.x,sy:T.scroll.y,st:T.getScrollTop(),sl:T.getScrollLeft(),pt:2,dl:!1,tg:o},T.ispage||!M.directionlockdeadzone)T.rail.drag.dl="f"
+else{var s={w:u.width(),h:u.height()},n=T.getContentSize(),l=n.h-s.h,c=n.w-s.w
+T.rail.scrollable&&!T.railh.scrollable?T.rail.drag.ck=l>0?"v":!1:!T.rail.scrollable&&T.railh.scrollable?T.rail.drag.ck=c>0?"h":!1:T.rail.drag.ck=!1}if(M.emulatetouch&&T.isiframe&&P.isie){var d=T.win.position()
+T.rail.drag.x+=d.left,T.rail.drag.y+=d.top}if(T.hasmoving=!1,T.lastmouseup=!1,T.scrollmom.reset(e.clientX,e.clientY),o&&r){var h=/INPUT|SELECT|BUTTON|TEXTAREA/i.test(o.nodeName)
+if(!h)return P.hasmousecapture&&o.setCapture(),M.emulatetouch?(o.onclick&&!o._onclick&&(o._onclick=o.onclick,o.onclick=function(e){return T.hasmoving?!1:void o._onclick.call(this,e)}),T.cancelEvent(e)):T.stopPropagation(e);/SUBMIT|CANCEL|BUTTON/i.test(a(o).attr("type"))&&(T.preventclick={tg:o,click:!1})}}},T.ontouchend=function(e){if(!T.rail.drag)return!0
+if(2==T.rail.drag.pt){if(e.pointerType&&("mouse"===e.pointerType||e.pointerType===e.MSPOINTER_TYPE_MOUSE))return!1
+T.rail.drag=!1
+var o="mouseup"===e.type
+if(T.hasmoving&&(T.scrollmom.doMomentum(),T.lastmouseup=!0,T.hideCursor(),P.hasmousecapture&&c.releaseCapture(),o))return T.cancelEvent(e)}else if(1==T.rail.drag.pt)return T.onmouseup(e)}
+var z=M.emulatetouch&&T.isiframe&&!P.hasmousecapture,k=.3*M.directionlockdeadzone|0
+T.ontouchmove=function(e,o){if(!T.rail.drag)return!0
+if(e.targetTouches&&M.preventmultitouchscrolling&&e.targetTouches.length>1)return!0
+if(e.pointerType&&("mouse"===e.pointerType||e.pointerType===e.MSPOINTER_TYPE_MOUSE))return!0
+if(2==T.rail.drag.pt){"changedTouches"in e&&(e.clientX=e.changedTouches[0].clientX,e.clientY=e.changedTouches[0].clientY)
+var t,r
+if(r=t=0,z&&!o){var i=T.win.position()
+r=-i.left,t=-i.top}var s=e.clientY+t,n=s-T.rail.drag.y,l=e.clientX+r,a=l-T.rail.drag.x,d=T.rail.drag.st-n
+if(T.ishwscroll&&M.bouncescroll)0>d?d=Math.round(d/2):d>T.page.maxh&&(d=T.page.maxh+Math.round((d-T.page.maxh)/2))
+else if(0>d?(d=0,s=0):d>T.page.maxh&&(d=T.page.maxh,s=0),0===s&&!T.hasmoving)return T.ispage||(T.rail.drag=!1),!0
+var u=T.getScrollLeft()
+if(T.railh&&T.railh.scrollable&&(u=T.isrtlmode?a-T.rail.drag.sl:T.rail.drag.sl-a,T.ishwscroll&&M.bouncescroll?0>u?u=Math.round(u/2):u>T.page.maxw&&(u=T.page.maxw+Math.round((u-T.page.maxw)/2)):(0>u&&(u=0,l=0),u>T.page.maxw&&(u=T.page.maxw,l=0))),!T.hasmoving){if(T.rail.drag.y===e.clientY&&T.rail.drag.x===e.clientX)return T.cancelEvent(e)
+var h=Math.abs(n),p=Math.abs(a),m=M.directionlockdeadzone
+if(T.rail.drag.ck?"v"==T.rail.drag.ck?p>m&&k>=h?T.rail.drag=!1:h>m&&(T.rail.drag.dl="v"):"h"==T.rail.drag.ck&&(h>m&&k>=p?T.rail.drag=!1:p>m&&(T.rail.drag.dl="h")):h>m&&p>m?T.rail.drag.dl="f":h>m?T.rail.drag.dl=p>k?"f":"v":p>m&&(T.rail.drag.dl=h>k?"f":"h"),!T.rail.drag.dl)return T.cancelEvent(e)
+T.triggerScrollStart(e.clientX,e.clientY,0,0,0),T.hasmoving=!0}return T.preventclick&&!T.preventclick.click&&(T.preventclick.click=T.preventclick.tg.onclick||!1,T.preventclick.tg.onclick=T.onpreventclick),T.rail.drag.dl&&("v"==T.rail.drag.dl?u=T.rail.drag.sl:"h"==T.rail.drag.dl&&(d=T.rail.drag.st)),T.synched("touchmove",function(){T.rail.drag&&2==T.rail.drag.pt&&(T.prepareTransition&&T.resetTransition(),T.rail.scrollable&&T.setScrollTop(d),T.scrollmom.update(l,s),T.railh&&T.railh.scrollable?(T.setScrollLeft(u),T.showCursor(d,u)):T.showCursor(d),P.isie10&&c.selection.clear())}),T.cancelEvent(e)}return 1==T.rail.drag.pt?T.onmousemove(e):void 0},T.ontouchstartCursor=function(e,o){if(!T.rail.drag||3==T.rail.drag.pt){if(T.locked)return T.cancelEvent(e)
+T.cancelScroll(),T.rail.drag={x:e.touches[0].clientX,y:e.touches[0].clientY,sx:T.scroll.x,sy:T.scroll.y,pt:3,hr:!!o}
+var t=T.getTarget(e)
+return!T.ispage&&P.hasmousecapture&&t.setCapture(),T.isiframe&&!P.hasmousecapture&&(T.saved.csspointerevents=T.doc.css("pointer-events"),T.css(T.doc,{"pointer-events":"none"})),T.cancelEvent(e)}},T.ontouchendCursor=function(e){if(T.rail.drag){if(P.hasmousecapture&&c.releaseCapture(),T.isiframe&&!P.hasmousecapture&&T.doc.css("pointer-events",T.saved.csspointerevents),3!=T.rail.drag.pt)return
+return T.rail.drag=!1,T.cancelEvent(e)}},T.ontouchmoveCursor=function(e){if(T.rail.drag){if(3!=T.rail.drag.pt)return
+if(T.cursorfreezed=!0,T.rail.drag.hr){T.scroll.x=T.rail.drag.sx+(e.touches[0].clientX-T.rail.drag.x),T.scroll.x<0&&(T.scroll.x=0)
+var o=T.scrollvaluemaxw
+T.scroll.x>o&&(T.scroll.x=o)}else{T.scroll.y=T.rail.drag.sy+(e.touches[0].clientY-T.rail.drag.y),T.scroll.y<0&&(T.scroll.y=0)
+var t=T.scrollvaluemax
+T.scroll.y>t&&(T.scroll.y=t)}return T.synched("touchmove",function(){T.rail.drag&&3==T.rail.drag.pt&&(T.showCursor(),T.rail.drag.hr?T.doScrollLeft(Math.round(T.scroll.x*T.scrollratio.x),M.cursordragspeed):T.doScrollTop(Math.round(T.scroll.y*T.scrollratio.y),M.cursordragspeed))}),T.cancelEvent(e)}}}if(T.onmousedown=function(e,o){if(!T.rail.drag||1==T.rail.drag.pt){if(T.railslocked)return T.cancelEvent(e)
+T.cancelScroll(),T.rail.drag={x:e.clientX,y:e.clientY,sx:T.scroll.x,sy:T.scroll.y,pt:1,hr:o||!1}
+var t=T.getTarget(e)
+return P.hasmousecapture&&t.setCapture(),T.isiframe&&!P.hasmousecapture&&(T.saved.csspointerevents=T.doc.css("pointer-events"),T.css(T.doc,{"pointer-events":"none"})),T.hasmoving=!1,T.cancelEvent(e)}},T.onmouseup=function(e){return T.rail.drag?1!=T.rail.drag.pt?!0:(P.hasmousecapture&&c.releaseCapture(),T.isiframe&&!P.hasmousecapture&&T.doc.css("pointer-events",T.saved.csspointerevents),T.rail.drag=!1,T.cursorfreezed=!1,T.hasmoving&&T.triggerScrollEnd(),T.cancelEvent(e)):void 0},T.onmousemove=function(e){if(T.rail.drag){if(1!==T.rail.drag.pt)return
+if(P.ischrome&&0===e.which)return T.onmouseup(e)
+if(T.cursorfreezed=!0,T.hasmoving||T.triggerScrollStart(e.clientX,e.clientY,0,0,0),T.hasmoving=!0,T.rail.drag.hr){T.scroll.x=T.rail.drag.sx+(e.clientX-T.rail.drag.x),T.scroll.x<0&&(T.scroll.x=0)
+var o=T.scrollvaluemaxw
+T.scroll.x>o&&(T.scroll.x=o)}else{T.scroll.y=T.rail.drag.sy+(e.clientY-T.rail.drag.y),T.scroll.y<0&&(T.scroll.y=0)
+var t=T.scrollvaluemax
+T.scroll.y>t&&(T.scroll.y=t)}return T.synched("mousemove",function(){T.cursorfreezed&&(T.showCursor(),T.rail.drag.hr?T.scrollLeft(Math.round(T.scroll.x*T.scrollratio.x)):T.scrollTop(Math.round(T.scroll.y*T.scrollratio.y)))}),T.cancelEvent(e)}T.checkarea=0},P.cantouch||M.emulatetouch)T.onpreventclick=function(e){return T.preventclick?(T.preventclick.tg.onclick=T.preventclick.click,T.preventclick=!1,T.cancelEvent(e)):void 0},T.onclick=P.isios?!1:function(e){return T.lastmouseup?(T.lastmouseup=!1,T.cancelEvent(e)):!0},M.grabcursorenabled&&P.cursorgrabvalue&&(T.css(T.ispage?T.doc:T.win,{cursor:P.cursorgrabvalue}),T.css(T.rail,{cursor:P.cursorgrabvalue}))
+else{var L=function(e){if(T.selectiondrag){if(e){var o=T.win.outerHeight(),t=e.pageY-T.selectiondrag.top
+t>0&&o>t&&(t=0),t>=o&&(t-=o),T.selectiondrag.df=t}if(0!==T.selectiondrag.df){var r=0|-(2*T.selectiondrag.df/6)
+T.doScrollBy(r),T.debounced("doselectionscroll",function(){L()},50)}}}
+"getSelection"in c?T.hasTextSelected=function(){return c.getSelection().rangeCount>0}:"selection"in c?T.hasTextSelected=function(){return"None"!=c.selection.type}:T.hasTextSelected=function(){return!1},T.onselectionstart=function(e){T.ispage||(T.selectiondrag=T.win.offset())},T.onselectionend=function(e){T.selectiondrag=!1},T.onselectiondrag=function(e){T.selectiondrag&&T.hasTextSelected()&&T.debounced("selectionscroll",function(){L(e)},250)}}if(P.hasw3ctouch?(T.css(T.ispage?a("html"):T.win,{"touch-action":"none"}),T.css(T.rail,{"touch-action":"none"}),T.css(T.cursor,{"touch-action":"none"}),T.bind(T.win,"pointerdown",T.ontouchstart),T.bind(c,"pointerup",T.ontouchend),T.delegate(c,"pointermove",T.ontouchmove)):P.hasmstouch?(T.css(T.ispage?a("html"):T.win,{"-ms-touch-action":"none"}),T.css(T.rail,{"-ms-touch-action":"none"}),T.css(T.cursor,{"-ms-touch-action":"none"}),T.bind(T.win,"MSPointerDown",T.ontouchstart),T.bind(c,"MSPointerUp",T.ontouchend),T.delegate(c,"MSPointerMove",T.ontouchmove),T.bind(T.cursor,"MSGestureHold",function(e){e.preventDefault()}),T.bind(T.cursor,"contextmenu",function(e){e.preventDefault()})):P.cantouch&&(T.bind(T.win,"touchstart",T.ontouchstart,!1,!0),T.bind(c,"touchend",T.ontouchend,!1,!0),T.bind(c,"touchcancel",T.ontouchend,!1,!0),T.delegate(c,"touchmove",T.ontouchmove,!1,!0)),M.emulatetouch&&(T.bind(T.win,"mousedown",T.ontouchstart,!1,!0),T.bind(c,"mouseup",T.ontouchend,!1,!0),T.bind(c,"mousemove",T.ontouchmove,!1,!0)),(M.cursordragontouch||!P.cantouch&&!M.emulatetouch)&&(T.rail.css({cursor:"default"}),T.railh&&T.railh.css({cursor:"default"}),T.jqbind(T.rail,"mouseenter",function(){return T.ispage||T.win.is(":visible")?(T.canshowonmouseevent&&T.showCursor(),void(T.rail.active=!0)):!1}),T.jqbind(T.rail,"mouseleave",function(){T.rail.active=!1,T.rail.drag||T.hideCursor()}),M.sensitiverail&&(T.bind(T.rail,"click",function(e){T.doRailClick(e,!1,!1)}),T.bind(T.rail,"dblclick",function(e){T.doRailClick(e,!0,!1)}),T.bind(T.cursor,"click",function(e){T.cancelEvent(e)}),T.bind(T.cursor,"dblclick",function(e){T.cancelEvent(e)})),T.railh&&(T.jqbind(T.railh,"mouseenter",function(){return T.ispage||T.win.is(":visible")?(T.canshowonmouseevent&&T.showCursor(),void(T.rail.active=!0)):!1}),T.jqbind(T.railh,"mouseleave",function(){T.rail.active=!1,T.rail.drag||T.hideCursor()}),M.sensitiverail&&(T.bind(T.railh,"click",function(e){T.doRailClick(e,!1,!0)}),T.bind(T.railh,"dblclick",function(e){T.doRailClick(e,!0,!0)}),T.bind(T.cursorh,"click",function(e){T.cancelEvent(e)}),T.bind(T.cursorh,"dblclick",function(e){T.cancelEvent(e)})))),M.cursordragontouch&&(this.istouchcapable||P.cantouch)&&(T.bind(T.cursor,"touchstart",T.ontouchstartCursor),T.bind(T.cursor,"touchmove",T.ontouchmoveCursor),T.bind(T.cursor,"touchend",T.ontouchendCursor),T.cursorh&&T.bind(T.cursorh,"touchstart",function(e){T.ontouchstartCursor(e,!0)}),T.cursorh&&T.bind(T.cursorh,"touchmove",T.ontouchmoveCursor),T.cursorh&&T.bind(T.cursorh,"touchend",T.ontouchendCursor)),M.emulatetouch||P.isandroid||P.isios?(T.bind(P.hasmousecapture?T.win:c,"mouseup",T.ontouchend),T.onclick&&T.bind(c,"click",T.onclick),M.cursordragontouch?(T.bind(T.cursor,"mousedown",T.onmousedown),T.bind(T.cursor,"mouseup",T.onmouseup),T.cursorh&&T.bind(T.cursorh,"mousedown",function(e){T.onmousedown(e,!0)}),T.cursorh&&T.bind(T.cursorh,"mouseup",T.onmouseup)):(T.bind(T.rail,"mousedown",function(e){e.preventDefault()}),T.railh&&T.bind(T.railh,"mousedown",function(e){e.preventDefault()}))):(T.bind(P.hasmousecapture?T.win:c,"mouseup",T.onmouseup),T.bind(c,"mousemove",T.onmousemove),T.onclick&&T.bind(c,"click",T.onclick),T.bind(T.cursor,"mousedown",T.onmousedown),T.bind(T.cursor,"mouseup",T.onmouseup),T.railh&&(T.bind(T.cursorh,"mousedown",function(e){T.onmousedown(e,!0)}),T.bind(T.cursorh,"mouseup",T.onmouseup)),!T.ispage&&M.enablescrollonselection&&(T.bind(T.win[0],"mousedown",T.onselectionstart),T.bind(c,"mouseup",T.onselectionend),T.bind(T.cursor,"mouseup",T.onselectionend),T.cursorh&&T.bind(T.cursorh,"mouseup",T.onselectionend),T.bind(c,"mousemove",T.onselectiondrag)),T.zoom&&(T.jqbind(T.zoom,"mouseenter",function(){T.canshowonmouseevent&&T.showCursor(),T.rail.active=!0}),T.jqbind(T.zoom,"mouseleave",function(){T.rail.active=!1,T.rail.drag||T.hideCursor()}))),M.enablemousewheel&&(T.isiframe||T.mousewheel(P.isie&&T.ispage?c:T.win,T.onmousewheel),T.mousewheel(T.rail,T.onmousewheel),T.railh&&T.mousewheel(T.railh,T.onmousewheelhr)),T.ispage||P.cantouch||/HTML|^BODY/.test(T.win[0].nodeName)||(T.win.attr("tabindex")||T.win.attr({tabindex:++s}),T.bind(T.win,"focus",function(e){r=T.getTarget(e).id||T.getTarget(e)||!1,T.hasfocus=!0,T.canshowonmouseevent&&T.noticeCursor()}),T.bind(T.win,"blur",function(e){r=!1,T.hasfocus=!1}),T.bind(T.win,"mouseenter",function(e){i=T.getTarget(e).id||T.getTarget(e)||!1,T.hasmousefocus=!0,T.canshowonmouseevent&&T.noticeCursor()}),T.bind(T.win,"mouseleave",function(e){i=!1,T.hasmousefocus=!1,T.rail.drag||T.hideCursor()})),T.onkeypress=function(e){if(T.railslocked&&0===T.page.maxh)return!0
+e=e||d.event
+var o=T.getTarget(e)
+if(o&&/INPUT|TEXTAREA|SELECT|OPTION/.test(o.nodeName)){var t=o.getAttribute("type")||o.type||!1
+if(!t||!/submit|button|cancel/i.tp)return!0}if(a(o).attr("contenteditable"))return!0
+if(T.hasfocus||T.hasmousefocus&&!r||T.ispage&&!r&&!i){var s=e.keyCode
+if(T.railslocked&&27!=s)return T.cancelEvent(e)
+var n=e.ctrlKey||!1,l=e.shiftKey||!1,c=!1
+switch(s){case 38:case 63233:T.doScrollBy(72),c=!0
+break
+case 40:case 63235:T.doScrollBy(-72),c=!0
+break
+case 37:case 63232:T.railh&&(n?T.doScrollLeft(0):T.doScrollLeftBy(72),c=!0)
+break
+case 39:case 63234:T.railh&&(n?T.doScrollLeft(T.page.maxw):T.doScrollLeftBy(-72),c=!0)
+break
+case 33:case 63276:T.doScrollBy(T.view.h),c=!0
+break
+case 34:case 63277:T.doScrollBy(-T.view.h),c=!0
+break
+case 36:case 63273:T.railh&&n?T.doScrollPos(0,0):T.doScrollTo(0),c=!0
+break
+case 35:case 63275:T.railh&&n?T.doScrollPos(T.page.maxw,T.page.maxh):T.doScrollTo(T.page.maxh),c=!0
+break
+case 32:M.spacebarenabled&&(l?T.doScrollBy(T.view.h):T.doScrollBy(-T.view.h),c=!0)
+break
+case 27:T.zoomactive&&(T.doZoom(),c=!0)}if(c)return T.cancelEvent(e)}},M.enablekeyboard&&T.bind(c,P.isopera&&!P.isopera12?"keypress":"keydown",T.onkeypress),T.bind(c,"keydown",function(e){var o=e.ctrlKey||!1
+o&&(T.wheelprevented=!0)}),T.bind(c,"keyup",function(e){var o=e.ctrlKey||!1
+o||(T.wheelprevented=!1)}),T.bind(d,"blur",function(e){T.wheelprevented=!1}),T.bind(d,"resize",T.onscreenresize),T.bind(d,"orientationchange",T.onscreenresize),T.bind(d,"load",T.lazyResize),P.ischrome&&!T.ispage&&!T.haswrapper){var C=T.win.attr("style"),N=parseFloat(T.win.css("width"))+1
+T.win.css("width",N),T.synched("chromefix",function(){T.win.attr("style",C)})}if(T.onAttributeChange=function(e){T.lazyResize(T.isieold?250:30)},M.enableobserver&&(T.isie11||g===!1||(T.observerbody=new g(function(e){return e.forEach(function(e){return"attributes"==e.type?E.hasClass("modal-open")&&E.hasClass("modal-dialog")&&!a.contains(a(".modal-dialog")[0],T.doc[0])?T.hide():T.show():void 0}),T.me.clientWidth!=T.page.width||T.me.clientHeight!=T.page.height||document.body.scrollHeight!=T.page.maxh?T.lazyResize(30):void 0}),T.observerbody.observe(c.body,{childList:!0,subtree:!0,characterData:!1,attributes:!0,attributeFilter:["class"]})),!T.ispage&&!T.haswrapper)){var R=T.win[0]
+g!==!1?(T.observer=new g(function(e){e.forEach(T.onAttributeChange)}),T.observer.observe(R,{childList:!0,characterData:!1,attributes:!0,subtree:!1}),T.observerremover=new g(function(e){e.forEach(function(e){if(e.removedNodes.length>0)for(var o in e.removedNodes)if(T&&e.removedNodes[o]===R)return T.remove()})}),T.observerremover.observe(R.parentNode,{childList:!0,characterData:!1,attributes:!1,subtree:!1})):(T.bind(R,P.isie&&!P.isie9?"propertychange":"DOMAttrModified",T.onAttributeChange),P.isie9&&R.attachEvent("onpropertychange",T.onAttributeChange),T.bind(R,"DOMNodeRemoved",function(e){e.target===R&&T.remove()}))}!T.ispage&&M.boxzoom&&T.bind(d,"resize",T.resizeZoom),T.istextarea&&(T.bind(T.win,"keydown",T.lazyResize),T.bind(T.win,"mouseup",T.lazyResize)),T.lazyResize(30)}if("IFRAME"==this.doc[0].nodeName){var _=function(){T.iframexd=!1
+var o
+try{o="contentDocument"in this?this.contentDocument:this.contentWindow._doc
+o.domain}catch(t){T.iframexd=!0,o=!1}if(T.iframexd)return"console"in d&&console.log("NiceScroll error: policy restriced iframe"),!0
+if(T.forcescreen=!0,T.isiframe&&(T.iframe={doc:a(o),html:T.doc.contents().find("html")[0],body:T.doc.contents().find("body")[0]},T.getContentSize=function(){return{w:Math.max(T.iframe.html.scrollWidth,T.iframe.body.scrollWidth),h:Math.max(T.iframe.html.scrollHeight,T.iframe.body.scrollHeight)}},T.docscroll=a(T.iframe.body)),!P.isios&&M.iframeautoresize&&!T.isiframe){T.win.scrollTop(0),T.doc.height("")
+var r=Math.max(o.getElementsByTagName("html")[0].scrollHeight,o.body.scrollHeight)
+T.doc.height(r)}T.lazyResize(30),T.css(a(T.iframe.body),e),P.isios&&T.haswrapper&&T.css(a(o.body),{"-webkit-transform":"translate3d(0,0,0)"}),"contentWindow"in this?T.bind(this.contentWindow,"scroll",T.onscroll):T.bind(o,"scroll",T.onscroll),M.enablemousewheel&&T.mousewheel(o,T.onmousewheel),M.enablekeyboard&&T.bind(o,P.isopera?"keypress":"keydown",T.onkeypress),P.cantouch?(T.bind(o,"touchstart",T.ontouchstart),T.bind(o,"touchmove",T.ontouchmove)):M.emulatetouch&&(T.bind(o,"mousedown",T.ontouchstart),T.bind(o,"mousemove",function(e){return T.ontouchmove(e,!0)}),M.grabcursorenabled&&P.cursorgrabvalue&&T.css(a(o.body),{cursor:P.cursorgrabvalue})),T.bind(o,"mouseup",T.ontouchend),T.zoom&&(M.dblclickzoom&&T.bind(o,"dblclick",T.doZoom),T.ongesturezoom&&T.bind(o,"gestureend",T.ongesturezoom))}
+this.doc[0].readyState&&"complete"===this.doc[0].readyState&&setTimeout(function(){_.call(T.doc[0],!1)},500),T.bind(this.doc,"load",_)}},this.showCursor=function(e,o){if(T.cursortimeout&&(clearTimeout(T.cursortimeout),T.cursortimeout=0),T.rail){if(T.autohidedom&&(T.autohidedom.stop().css({opacity:M.cursoropacitymax}),T.cursoractive=!0),T.rail.drag&&1==T.rail.drag.pt||(void 0!==e&&e!==!1&&(T.scroll.y=e/T.scrollratio.y|0),void 0!==o&&(T.scroll.x=o/T.scrollratio.x|0)),T.cursor.css({height:T.cursorheight,top:T.scroll.y}),T.cursorh){var t=T.hasreversehr?T.scrollvaluemaxw-T.scroll.x:T.scroll.x
+T.cursorh.css({width:T.cursorwidth,left:!T.rail.align&&T.rail.visibility?t+T.rail.width:t}),T.cursoractive=!0}T.zoom&&T.zoom.stop().css({opacity:M.cursoropacitymax})}},this.hideCursor=function(e){T.cursortimeout||T.rail&&T.autohidedom&&(T.hasmousefocus&&"leave"===M.autohidemode||(T.cursortimeout=setTimeout(function(){T.rail.active&&T.showonmouseevent||(T.autohidedom.stop().animate({opacity:M.cursoropacitymin}),T.zoom&&T.zoom.stop().animate({opacity:M.cursoropacitymin}),T.cursoractive=!1),T.cursortimeout=0},e||M.hidecursordelay)))},this.noticeCursor=function(e,o,t){T.showCursor(o,t),T.rail.active||T.hideCursor(e)},this.getContentSize=T.ispage?function(){return{w:Math.max(c.body.scrollWidth,c.documentElement.scrollWidth),h:Math.max(c.body.scrollHeight,c.documentElement.scrollHeight)}}:T.haswrapper?function(){return{w:T.doc[0].offsetWidth,h:T.doc[0].offsetHeight}}:function(){return{w:T.docscroll[0].scrollWidth,h:T.docscroll[0].scrollHeight}},this.onResize=function(e,o){if(!T||!T.win)return!1
+var t=T.page.maxh,r=T.page.maxw,i=T.view.h,s=T.view.w
+if(T.view={w:T.ispage?T.win.width():T.win[0].clientWidth,h:T.ispage?T.win.height():T.win[0].clientHeight},T.page=o?o:T.getContentSize(),T.page.maxh=Math.max(0,T.page.h-T.view.h),T.page.maxw=Math.max(0,T.page.w-T.view.w),T.page.maxh==t&&T.page.maxw==r&&T.view.w==s&&T.view.h==i){if(T.ispage)return T
+var n=T.win.offset()
+if(T.lastposition){var l=T.lastposition
+if(l.top==n.top&&l.left==n.left)return T}T.lastposition=n}if(0===T.page.maxh?(T.hideRail(),T.scrollvaluemax=0,T.scroll.y=0,T.scrollratio.y=0,T.cursorheight=0,T.setScrollTop(0),T.rail&&(T.rail.scrollable=!1)):(T.page.maxh-=M.railpadding.top+M.railpadding.bottom,T.rail.scrollable=!0),0===T.page.maxw?(T.hideRailHr(),T.scrollvaluemaxw=0,T.scroll.x=0,T.scrollratio.x=0,T.cursorwidth=0,T.setScrollLeft(0),T.railh&&(T.railh.scrollable=!1)):(T.page.maxw-=M.railpadding.left+M.railpadding.right,T.railh&&(T.railh.scrollable=M.horizrailenabled)),T.railslocked=T.locked||0===T.page.maxh&&0===T.page.maxw,T.railslocked)return T.ispage||T.updateScrollBar(T.view),!1
+T.hidden||(T.rail.visibility||T.showRail(),T.railh&&!T.railh.visibility&&T.showRailHr()),T.istextarea&&T.win.css("resize")&&"none"!=T.win.css("resize")&&(T.view.h-=20),T.cursorheight=Math.min(T.view.h,Math.round(T.view.h*(T.view.h/T.page.h))),T.cursorheight=M.cursorfixedheight?M.cursorfixedheight:Math.max(M.cursorminheight,T.cursorheight),T.cursorwidth=Math.min(T.view.w,Math.round(T.view.w*(T.view.w/T.page.w))),T.cursorwidth=M.cursorfixedheight?M.cursorfixedheight:Math.max(M.cursorminheight,T.cursorwidth),T.scrollvaluemax=T.view.h-T.cursorheight-(M.railpadding.top+M.railpadding.bottom),T.hasborderbox||(T.scrollvaluemax-=T.cursor[0].offsetHeight-T.cursor[0].clientHeight),T.railh&&(T.railh.width=T.page.maxh>0?T.view.w-T.rail.width:T.view.w,T.scrollvaluemaxw=T.railh.width-T.cursorwidth-(M.railpadding.left+M.railpadding.right)),T.ispage||T.updateScrollBar(T.view),T.scrollratio={x:T.page.maxw/T.scrollvaluemaxw,y:T.page.maxh/T.scrollvaluemax}
+var a=T.getScrollTop()
+return a>T.page.maxh?T.doScrollTop(T.page.maxh):(T.scroll.y=T.getScrollTop()/T.scrollratio.y|0,T.scroll.x=T.getScrollLeft()/T.scrollratio.x|0,T.cursoractive&&T.noticeCursor()),T.scroll.y&&0===T.getScrollTop()&&T.doScrollTo(T.scroll.y*T.scrollratio.y|0),T},this.resize=T.onResize
+var O=0
+this.onscreenresize=function(e){clearTimeout(O)
+var o=!T.ispage&&!T.haswrapper
+o&&T.hideRails(),O=setTimeout(function(){T&&(o&&T.showRails(),T.resize()),O=0},120)},this.lazyResize=function(e){return clearTimeout(O),e=isNaN(e)?240:e,O=setTimeout(function(){T&&T.resize(),O=0},e),T},this.jqbind=function(e,o,t){T.events.push({e:e,n:o,f:t,q:!0}),a(e).on(o,t)},this.mousewheel=function(e,o,t){var r="jquery"in e?e[0]:e
+if("onwheel"in c.createElement("div"))T._bind(r,"wheel",o,t||!1)
+else{var i=void 0!==c.onmousewheel?"mousewheel":"DOMMouseScroll"
+x(r,i,o,t||!1),"DOMMouseScroll"==i&&x(r,"MozMousePixelScroll",o,t||!1)}}
+var Y=!1
+if(P.haseventlistener){try{var H=Object.defineProperty({},"passive",{get:function(){Y=!0}})
+d.addEventListener("test",null,H)}catch(B){}this.stopPropagation=function(e){return e?(e=e.original?e.original:e,e.stopPropagation(),!1):!1},this.cancelEvent=function(e){return e.cancelable&&e.preventDefault(),e.stopImmediatePropagation(),e.preventManipulation&&e.preventManipulation(),!1}}else Event.prototype.preventDefault=function(){this.returnValue=!1},Event.prototype.stopPropagation=function(){this.cancelBubble=!0},d.constructor.prototype.addEventListener=c.constructor.prototype.addEventListener=Element.prototype.addEventListener=function(e,o,t){this.attachEvent("on"+e,o)},d.constructor.prototype.removeEventListener=c.constructor.prototype.removeEventListener=Element.prototype.removeEventListener=function(e,o,t){this.detachEvent("on"+e,o)},this.cancelEvent=function(e){return e=e||d.event,e&&(e.cancelBubble=!0,e.cancel=!0,e.returnValue=!1),!1},this.stopPropagation=function(e){return e=e||d.event,e&&(e.cancelBubble=!0),!1}
+this.delegate=function(e,o,t,r,i){var s=h[o]||!1
+s||(s={a:[],l:[],f:function(e){for(var o=s.l,t=o.length-1,r=!1,i=t;i>=0;i--)if(r=o[i].call(e.target,e),r===!1)return!1
+return r}},T.bind(e,o,s.f,r,i),h[o]=s),T.ispage?(s.a=[T.id].concat(s.a),s.l=[t].concat(s.l)):(s.a.push(T.id),s.l.push(t))},this.undelegate=function(e,o,t,r,i){var s=h[o]||!1
+if(s&&s.l)for(var n=0,l=s.l.length;l>n;n++)s.a[n]===T.id&&(s.a.splice(n),s.l.splice(n),0===s.a.length&&(T._unbind(e,o,s.l.f),h[o]=null))},this.bind=function(e,o,t,r,i){var s="jquery"in e?e[0]:e
+T._bind(s,o,t,r||!1,i||!1)},this._bind=function(e,o,t,r,i){T.events.push({e:e,n:o,f:t,b:r,q:!1}),Y&&i?e.addEventListener(o,t,{passive:!1,capture:r}):e.addEventListener(o,t,r||!1)},this._unbind=function(e,o,t,r){h[o]?T.undelegate(e,o,t,r):e.removeEventListener(o,t,r)},this.unbindAll=function(){for(var e=0;e<T.events.length;e++){var o=T.events[e]
+o.q?o.e.unbind(o.n,o.f):T._unbind(o.e,o.n,o.f,o.b)}},this.showRails=function(){return T.showRail().showRailHr()},this.showRail=function(){return 0===T.page.maxh||!T.ispage&&"none"==T.win.css("display")||(T.rail.visibility=!0,T.rail.css("display","block")),T},this.showRailHr=function(){return T.railh&&(0===T.page.maxw||!T.ispage&&"none"==T.win.css("display")||(T.railh.visibility=!0,T.railh.css("display","block"))),T},this.hideRails=function(){return T.hideRail().hideRailHr()},this.hideRail=function(){return T.rail.visibility=!1,T.rail.css("display","none"),T},this.hideRailHr=function(){return T.railh&&(T.railh.visibility=!1,T.railh.css("display","none")),T},this.show=function(){return T.hidden=!1,T.railslocked=!1,T.showRails()},this.hide=function(){return T.hidden=!0,T.railslocked=!0,T.hideRails()},this.toggle=function(){return T.hidden?T.show():T.hide()},this.remove=function(){T.stop(),T.cursortimeout&&clearTimeout(T.cursortimeout)
+for(var e in T.delaylist)T.delaylist[e]&&m(T.delaylist[e].h)
+T.doZoomOut(),T.unbindAll(),P.isie9&&T.win[0].detachEvent("onpropertychange",T.onAttributeChange),T.observer!==!1&&T.observer.disconnect(),T.observerremover!==!1&&T.observerremover.disconnect(),T.observerbody!==!1&&T.observerbody.disconnect(),T.events=null,T.cursor&&T.cursor.remove(),T.cursorh&&T.cursorh.remove(),T.rail&&T.rail.remove(),T.railh&&T.railh.remove(),T.zoom&&T.zoom.remove()
+for(var o=0;o<T.saved.css.length;o++){var t=T.saved.css[o]
+t[0].css(t[1],void 0===t[2]?"":t[2])}T.saved=!1,T.me.data("__nicescroll","")
+var r=a.nicescroll
+r.each(function(e){if(this&&this.id===T.id){delete r[e]
+for(var o=++e;o<r.length;o++,e++)r[e]=r[o]
+r.length--,r.length&&delete r[r.length]}})
+for(var i in T)T[i]=null,delete T[i]
+T=null},this.scrollstart=function(e){return this.onscrollstart=e,T},this.scrollend=function(e){return this.onscrollend=e,T},this.scrollcancel=function(e){return this.onscrollcancel=e,T},this.zoomin=function(e){return this.onzoomin=e,T},this.zoomout=function(e){return this.onzoomout=e,T},this.isScrollable=function(e){var o=e.target?e.target:e
+if("OPTION"==o.nodeName)return!0
+for(;o&&1==o.nodeType&&o!==this.me[0]&&!/^BODY|HTML/.test(o.nodeName);){var t=a(o),r=t.css("overflowY")||t.css("overflowX")||t.css("overflow")||""
+if(/scroll|auto/.test(r))return o.clientHeight!=o.scrollHeight
+o=o.parentNode?o.parentNode:!1}return!1},this.getViewport=function(e){for(var o=e&&e.parentNode?e.parentNode:!1;o&&1==o.nodeType&&!/^BODY|HTML/.test(o.nodeName);){var t=a(o)
+if(/fixed|absolute/.test(t.css("position")))return t
+var r=t.css("overflowY")||t.css("overflowX")||t.css("overflow")||""
+if(/scroll|auto/.test(r)&&o.clientHeight!=o.scrollHeight)return t
+if(t.getNiceScroll().length>0)return t
+o=o.parentNode?o.parentNode:!1}return!1},this.triggerScrollStart=function(e,o,t,r,i){if(T.onscrollstart){var s={type:"scrollstart",current:{x:e,y:o},request:{x:t,y:r},end:{x:T.newscrollx,y:T.newscrolly},speed:i}
+T.onscrollstart.call(T,s)}},this.triggerScrollEnd=function(){if(T.onscrollend){var e=T.getScrollLeft(),o=T.getScrollTop(),t={type:"scrollend",current:{x:e,y:o},end:{x:e,y:o}}
+T.onscrollend.call(T,t)}}
+var X=0,D=0,A=0,q=1,j=!1
+if(this.onmousewheel=function(e){if(T.wheelprevented||T.locked)return!1
+if(T.railslocked)return T.debounced("checkunlock",T.resize,250),!1
+if(T.rail.drag)return T.cancelEvent(e)
+if("auto"===M.oneaxismousemode&&0!==e.deltaX&&(M.oneaxismousemode=!1),M.oneaxismousemode&&0===e.deltaX&&!T.rail.scrollable)return T.railh&&T.railh.scrollable?T.onmousewheelhr(e):!0
+var o=v(),t=!1
+if(M.preservenativescrolling&&T.checkarea+600<o&&(T.nativescrollingarea=T.isScrollable(e),t=!0),T.checkarea=o,T.nativescrollingarea)return!0
+var r=k(e,!1,t)
+return r&&(T.checkarea=0),r},this.onmousewheelhr=function(e){if(!T.wheelprevented){if(T.railslocked||!T.railh.scrollable)return!0
+if(T.rail.drag)return T.cancelEvent(e)
+var o=v(),t=!1
+return M.preservenativescrolling&&T.checkarea+600<o&&(T.nativescrollingarea=T.isScrollable(e),t=!0),T.checkarea=o,T.nativescrollingarea?!0:T.railslocked?T.cancelEvent(e):k(e,!0,t)}},this.stop=function(){return T.cancelScroll(),T.scrollmon&&T.scrollmon.stop(),T.cursorfreezed=!1,T.scroll.y=Math.round(T.getScrollTop()*(1/T.scrollratio.y)),T.noticeCursor(),T},this.getTransitionSpeed=function(e){return 80+e/72*M.scrollspeed|0},M.smoothscroll)if(T.ishwscroll&&P.hastransition&&M.usetransition&&M.smoothscroll){var F=""
+this.resetTransition=function(){F="",T.doc.css(P.prefixstyle+"transition-duration","0ms")},this.prepareTransition=function(e,o){var t=o?e:T.getTransitionSpeed(e),r=t+"ms"
+return F!==r&&(F=r,T.doc.css(P.prefixstyle+"transition-duration",r)),t},this.doScrollLeft=function(e,o){var t=T.scrollrunning?T.newscrolly:T.getScrollTop()
+T.doScrollPos(e,t,o)},this.doScrollTop=function(e,o){var t=T.scrollrunning?T.newscrollx:T.getScrollLeft()
+T.doScrollPos(t,e,o)},this.cursorupdate={running:!1,start:function(){var e=this
+if(!e.running){e.running=!0
+var o=function(){e.running&&p(o),T.showCursor(T.getScrollTop(),T.getScrollLeft()),T.notifyScrollEvent(T.win[0])}
+p(o)}},stop:function(){this.running=!1}},this.doScrollPos=function(e,o,t){var r=T.getScrollTop(),i=T.getScrollLeft()
+if(((T.newscrolly-r)*(o-r)<0||(T.newscrollx-i)*(e-i)<0)&&T.cancelScroll(),M.bouncescroll?(0>o?o=o/2|0:o>T.page.maxh&&(o=T.page.maxh+(o-T.page.maxh)/2|0),0>e?e=e/2|0:e>T.page.maxw&&(e=T.page.maxw+(e-T.page.maxw)/2|0)):(0>o?o=0:o>T.page.maxh&&(o=T.page.maxh),0>e?e=0:e>T.page.maxw&&(e=T.page.maxw)),T.scrollrunning&&e==T.newscrollx&&o==T.newscrolly)return!1
+T.newscrolly=o,T.newscrollx=e
+var s=T.getScrollTop(),n=T.getScrollLeft(),l={}
+l.x=e-n,l.y=o-s
+var a=0|Math.sqrt(l.x*l.x+l.y*l.y),c=T.prepareTransition(a)
+T.scrollrunning||(T.scrollrunning=!0,T.triggerScrollStart(n,s,e,o,c),T.cursorupdate.start()),T.scrollendtrapped=!0,P.transitionend||(T.scrollendtrapped&&clearTimeout(T.scrollendtrapped),T.scrollendtrapped=setTimeout(T.onScrollTransitionEnd,c)),T.setScrollTop(T.newscrolly),T.setScrollLeft(T.newscrollx)},this.cancelScroll=function(){if(!T.scrollendtrapped)return!0
+var e=T.getScrollTop(),o=T.getScrollLeft()
+return T.scrollrunning=!1,P.transitionend||clearTimeout(P.transitionend),T.scrollendtrapped=!1,T.resetTransition(),T.setScrollTop(e),T.railh&&T.setScrollLeft(o),T.timerscroll&&T.timerscroll.tm&&clearInterval(T.timerscroll.tm),T.timerscroll=!1,T.cursorfreezed=!1,T.cursorupdate.stop(),T.showCursor(e,o),T},this.onScrollTransitionEnd=function(){if(T.scrollendtrapped){var e=T.getScrollTop(),o=T.getScrollLeft()
+if(0>e?e=0:e>T.page.maxh&&(e=T.page.maxh),0>o?o=0:o>T.page.maxw&&(o=T.page.maxw),e!=T.newscrolly||o!=T.newscrollx)return T.doScrollPos(o,e,M.snapbackspeed)
+T.scrollrunning&&T.triggerScrollEnd(),T.scrollrunning=!1,T.scrollendtrapped=!1,T.resetTransition(),T.timerscroll=!1,T.setScrollTop(e),T.railh&&T.setScrollLeft(o),T.cursorupdate.stop(),T.noticeCursor(!1,e,o),T.cursorfreezed=!1}}}else this.doScrollLeft=function(e,o){var t=T.scrollrunning?T.newscrolly:T.getScrollTop()
+T.doScrollPos(e,t,o)},this.doScrollTop=function(e,o){var t=T.scrollrunning?T.newscrollx:T.getScrollLeft()
+T.doScrollPos(t,e,o)},this.doScrollPos=function(e,o,t){var r=T.getScrollTop(),i=T.getScrollLeft();((T.newscrolly-r)*(o-r)<0||(T.newscrollx-i)*(e-i)<0)&&T.cancelScroll()
+var s=!1
+if(T.bouncescroll&&T.rail.visibility||(0>o?(o=0,s=!0):o>T.page.maxh&&(o=T.page.maxh,s=!0)),T.bouncescroll&&T.railh.visibility||(0>e?(e=0,s=!0):e>T.page.maxw&&(e=T.page.maxw,s=!0)),T.scrollrunning&&T.newscrolly===o&&T.newscrollx===e)return!0
+T.newscrolly=o,T.newscrollx=e,T.dst={},T.dst.x=e-i,T.dst.y=o-r,T.dst.px=i,T.dst.py=r
+var n=0|Math.sqrt(T.dst.x*T.dst.x+T.dst.y*T.dst.y),l=T.getTransitionSpeed(n)
+T.bzscroll={}
+var a=s?1:.58
+T.bzscroll.x=new R(i,T.newscrollx,l,0,0,a,1),T.bzscroll.y=new R(r,T.newscrolly,l,0,0,a,1)
+var c=(v(),function(){if(T.scrollrunning){var e=T.bzscroll.y.getPos()
+T.setScrollLeft(T.bzscroll.x.getNow()),T.setScrollTop(T.bzscroll.y.getNow()),1>=e?T.timer=p(c):(T.scrollrunning=!1,T.timer=0,T.triggerScrollEnd())}})
+T.scrollrunning||(T.triggerScrollStart(i,r,e,o,l),T.scrollrunning=!0,T.timer=p(c))},this.cancelScroll=function(){return T.timer&&m(T.timer),T.timer=0,T.bzscroll=!1,T.scrollrunning=!1,T}
+else this.doScrollLeft=function(e,o){var t=T.getScrollTop()
+T.doScrollPos(e,t,o)},this.doScrollTop=function(e,o){var t=T.getScrollLeft()
+T.doScrollPos(t,e,o)},this.doScrollPos=function(e,o,t){var r=e>T.page.maxw?T.page.maxw:e
+0>r&&(r=0)
+var i=o>T.page.maxh?T.page.maxh:o
+0>i&&(i=0),T.synched("scroll",function(){T.setScrollTop(i),T.setScrollLeft(r)})},this.cancelScroll=function(){}
+this.doScrollBy=function(e,o){z(0,e)},this.doScrollLeftBy=function(e,o){z(e,0)},this.doScrollTo=function(e,o){var t=o?Math.round(e*T.scrollratio.y):e
+0>t?t=0:t>T.page.maxh&&(t=T.page.maxh),T.cursorfreezed=!1,T.doScrollTop(e)},this.checkContentSize=function(){var e=T.getContentSize();(e.h!=T.page.h||e.w!=T.page.w)&&T.resize(!1,e)},T.onscroll=function(e){T.rail.drag||T.cursorfreezed||T.synched("scroll",function(){T.scroll.y=Math.round(T.getScrollTop()/T.scrollratio.y),T.railh&&(T.scroll.x=Math.round(T.getScrollLeft()/T.scrollratio.x)),T.noticeCursor()})},T.bind(T.docscroll,"scroll",T.onscroll),this.doZoomIn=function(e){if(!T.zoomactive){T.zoomactive=!0,T.zoomrestore={style:{}}
+var o=["position","top","left","zIndex","backgroundColor","marginTop","marginBottom","marginLeft","marginRight"],t=T.win[0].style
+for(var r in o){var i=o[r]
+T.zoomrestore.style[i]=void 0!==t[i]?t[i]:""}T.zoomrestore.style.width=T.win.css("width"),T.zoomrestore.style.height=T.win.css("height"),T.zoomrestore.padding={w:T.win.outerWidth()-T.win.width(),h:T.win.outerHeight()-T.win.height()},P.isios4&&(T.zoomrestore.scrollTop=u.scrollTop(),u.scrollTop(0)),T.win.css({position:P.isios4?"absolute":"fixed",top:0,left:0,zIndex:l+100,margin:0})
+var s=T.win.css("backgroundColor")
+return(""===s||/transparent|rgba\(0, 0, 0, 0\)|rgba\(0,0,0,0\)/.test(s))&&T.win.css("backgroundColor","#fff"),T.rail.css({zIndex:l+101}),T.zoom.css({zIndex:l+102}),T.zoom.css("backgroundPosition","0 -18px"),T.resizeZoom(),T.onzoomin&&T.onzoomin.call(T),T.cancelEvent(e)}},this.doZoomOut=function(e){return T.zoomactive?(T.zoomactive=!1,T.win.css("margin",""),T.win.css(T.zoomrestore.style),P.isios4&&u.scrollTop(T.zoomrestore.scrollTop),T.rail.css({"z-index":T.zindex}),T.zoom.css({"z-index":T.zindex}),T.zoomrestore=!1,T.zoom.css("backgroundPosition","0 0"),T.onResize(),T.onzoomout&&T.onzoomout.call(T),T.cancelEvent(e)):void 0},this.doZoom=function(e){return T.zoomactive?T.doZoomOut(e):T.doZoomIn(e)},this.resizeZoom=function(){if(T.zoomactive){var e=T.getScrollTop()
+T.win.css({width:u.width()-T.zoomrestore.padding.w+"px",height:u.height()-T.zoomrestore.padding.h+"px"}),T.onResize(),T.setScrollTop(Math.min(T.page.maxh,e))}},this.init(),a.nicescroll.push(this)},S=function(e){var o=this
+this.nc=e,this.lastx=0,this.lasty=0,this.speedx=0,this.speedy=0,this.lasttime=0,this.steptime=0,this.snapx=!1,this.snapy=!1,this.demulx=0,this.demuly=0,this.lastscrollx=-1,this.lastscrolly=-1,this.chkx=0,this.chky=0,this.timer=0,this.reset=function(e,t){o.stop(),o.steptime=0,o.lasttime=v(),o.speedx=0,o.speedy=0,o.lastx=e,o.lasty=t,o.lastscrollx=-1,o.lastscrolly=-1},this.update=function(e,t){var r=v()
+o.steptime=r-o.lasttime,o.lasttime=r
+var i=t-o.lasty,s=e-o.lastx,n=o.nc.getScrollTop(),l=o.nc.getScrollLeft(),a=n+i,c=l+s
+o.snapx=0>c||c>o.nc.page.maxw,o.snapy=0>a||a>o.nc.page.maxh,o.speedx=s,o.speedy=i,o.lastx=e,o.lasty=t},this.stop=function(){o.nc.unsynched("domomentum2d"),o.timer&&clearTimeout(o.timer),o.timer=0,o.lastscrollx=-1,o.lastscrolly=-1},this.doSnapy=function(e,t){var r=!1
+0>t?(t=0,r=!0):t>o.nc.page.maxh&&(t=o.nc.page.maxh,r=!0),0>e?(e=0,r=!0):e>o.nc.page.maxw&&(e=o.nc.page.maxw,r=!0),r?o.nc.doScrollPos(e,t,o.nc.opt.snapbackspeed):o.nc.triggerScrollEnd()},this.doMomentum=function(e){var t=v(),r=e?t+e:o.lasttime,i=o.nc.getScrollLeft(),s=o.nc.getScrollTop(),n=o.nc.page.maxh,l=o.nc.page.maxw
+o.speedx=l>0?Math.min(60,o.speedx):0,o.speedy=n>0?Math.min(60,o.speedy):0
+var a=r&&60>=t-r;(0>s||s>n||0>i||i>l)&&(a=!1)
+var c=o.speedy&&a?o.speedy:!1,d=o.speedx&&a?o.speedx:!1
+if(c||d){var u=Math.max(16,o.steptime)
+if(u>50){var h=u/50
+o.speedx*=h,o.speedy*=h,u=50}o.demulxy=0,o.lastscrollx=o.nc.getScrollLeft(),o.chkx=o.lastscrollx,o.lastscrolly=o.nc.getScrollTop(),o.chky=o.lastscrolly
+var p=o.lastscrollx,m=o.lastscrolly,f=function(){var e=v()-t>600?.04:.02
+o.speedx&&(p=Math.floor(o.lastscrollx-o.speedx*(1-o.demulxy)),o.lastscrollx=p,(0>p||p>l)&&(e=.1)),o.speedy&&(m=Math.floor(o.lastscrolly-o.speedy*(1-o.demulxy)),o.lastscrolly=m,(0>m||m>n)&&(e=.1)),o.demulxy=Math.min(1,o.demulxy+e),o.nc.synched("domomentum2d",function(){if(o.speedx){o.nc.getScrollLeft()
+o.chkx=p,o.nc.setScrollLeft(p)}if(o.speedy){o.nc.getScrollTop()
+o.chky=m,o.nc.setScrollTop(m)}o.timer||(o.nc.hideCursor(),o.doSnapy(p,m))}),o.demulxy<1?o.timer=setTimeout(f,u):(o.stop(),o.nc.hideCursor(),o.doSnapy(p,m))}
+f()}else o.doSnapy(o.nc.getScrollLeft(),o.nc.getScrollTop())}},z=e.fn.scrollTop
+e.cssHooks.pageYOffset={get:function(e,o,t){var r=a.data(e,"__nicescroll")||!1
+return r&&r.ishwscroll?r.getScrollTop():z.call(e)},set:function(e,o){var t=a.data(e,"__nicescroll")||!1
+return t&&t.ishwscroll?t.setScrollTop(parseInt(o)):z.call(e,o),this}},e.fn.scrollTop=function(e){if(void 0===e){var o=this[0]?a.data(this[0],"__nicescroll")||!1:!1
+return o&&o.ishwscroll?o.getScrollTop():z.call(this)}return this.each(function(){var o=a.data(this,"__nicescroll")||!1
+o&&o.ishwscroll?o.setScrollTop(parseInt(e)):z.call(a(this),e)})}
+var k=e.fn.scrollLeft
+a.cssHooks.pageXOffset={get:function(e,o,t){var r=a.data(e,"__nicescroll")||!1
+return r&&r.ishwscroll?r.getScrollLeft():k.call(e)},set:function(e,o){var t=a.data(e,"__nicescroll")||!1
+return t&&t.ishwscroll?t.setScrollLeft(parseInt(o)):k.call(e,o),this}},e.fn.scrollLeft=function(e){if(void 0===e){var o=this[0]?a.data(this[0],"__nicescroll")||!1:!1
+return o&&o.ishwscroll?o.getScrollLeft():k.call(this)}return this.each(function(){var o=a.data(this,"__nicescroll")||!1
+o&&o.ishwscroll?o.setScrollLeft(parseInt(e)):k.call(a(this),e)})}
+var T=function(e){var o=this
+if(this.length=0,this.name="nicescrollarray",this.each=function(e){return a.each(o,e),o},this.push=function(e){o[o.length]=e,o.length++},this.eq=function(e){return o[e]},e)for(var t=0;t<e.length;t++){var r=a.data(e[t],"__nicescroll")||!1
+r&&(this[this.length]=r,this.length++)}return this}
+t(T.prototype,["show","hide","toggle","onResize","resize","remove","stop","doScrollPos"],function(e,o){e[o]=function(){var e=arguments
+return this.each(function(){this[o].apply(this,e)})}}),e.fn.getNiceScroll=function(e){return void 0===e?new T(this):this[e]&&a.data(this[e],"__nicescroll")||!1}
+var E=e.expr.pseudos||e.expr[":"]
+E.nicescroll=function(e){return void 0!==a.data(e,"__nicescroll")},a.fn.niceScroll=function(e,o){void 0!==o||"object"!=typeof e||"jquery"in e||(o=e,e=!1)
+var t=new T
+return this.each(function(){var r=a(this),i=a.extend({},o)
+if(e){var s=a(e)
+i.doc=s.length>1?a(e,r):s,i.win=r}var n=!("doc"in i)
+n||"win"in i||(i.win=r)
+var l=r.data("__nicescroll")||!1
+l||(i.doc=i.doc||r,l=new x(i,r),r.data("__nicescroll",l)),t.push(l)}),1===t.length?t[0]:t},d.NiceScroll={getjQuery:function(){return e}},a.nicescroll||(a.nicescroll=new T,a.nicescroll.options=w)})
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/organ/editOrgan.js b/pluss-manage-page/src/main/resources/static/resources/auth/js/organ/editOrgan.js
new file mode 100644
index 0000000..e0090a7
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/organ/editOrgan.js
@@ -0,0 +1,100 @@
+$(function() {
+	loadOrgan();
+	
+	$('#provinceSelect').change(function(){
+		//alert(111)
+		var url = ctx + '/organ/changeCities';
+		$.ajax({
+			url : url,
+			type : 'post',
+			dataType : 'json',
+			data :  [ {
+				name : 'province',
+				value : $('#provinceSelect').val()
+			} ],
+			success : function(data) {
+				var list = data.cityList;
+				$('#citySelect option').remove();
+				for(var i=0;i<list.length;i++){
+					$('#citySelect').append("<option value="+list[i].aiid+">"+list[i].name+"</option>");
+				}
+			}
+		})
+	});
+})
+
+
+function saveEdit(){
+	var url = ctx + '/organ/saveEdit';
+	var serial = $("form").serialize();
+	$.ajax({
+		url: url,
+		type:'POST',
+		data: serial,
+		dataType:'json',
+		success:function(data){
+			if(data.flag){
+				window.location.href=ctx + "/organ";
+			}
+		}
+		
+	});
+}
+
+function loadOrgan(){
+	$.ajax({
+		url : ctx + '/organ/getOrgan',
+		type : 'post',
+		dataType : 'json',
+		data : [ {
+			name : 'id',
+			value : $('#idHidden').val()
+		} ],
+		success : function(data) {
+			var organInfo = data.organInfo;
+			var cityList = data.cityList;
+			var provinceList = data.provinceList;
+			
+			$('#organCode').val(organInfo.organCode);
+			$('#organName').val(organInfo.organName);
+			
+			var count3=$("#organType option").length;
+			for(var i=0;i<count3;i++){
+				if($("#organType").get(0).options[i].value == organInfo.organType)  
+		        {  
+		            $("#organType").get(0).options[i].selected = true;  
+		          
+		            break;  
+		        }  
+		    }
+			
+			for(var i=0;i<provinceList.length;i++){
+				$('#provinceSelect').append("<option value="+provinceList[i].aiid+">"+provinceList[i].name+"</option>");
+			}
+			
+			for(var i=0;i<cityList.length;i++){
+				$('#citySelect').append("<option value="+cityList[i].aiid+">"+cityList[i].name+"</option>");
+			}
+		
+			var count=$("#provinceSelect option").length;
+			for(var i=0;i<count;i++)  
+		    {if($("#provinceSelect").get(0).options[i].text == data.province)  
+		        {  
+		            $("#provinceSelect").get(0).options[i].selected = true;  
+		          
+		            break;  
+		        }  
+		    }
+			
+			var count2=$("#citySelect option").length;
+			for(var i=0;i<count2;i++)  
+		    {if($("#citySelect").get(0).options[i].text == data.city)  
+		        {  
+		            $("#citySelect").get(0).options[i].selected = true;  
+		          
+		            break;  
+		        }  
+		    }
+		}
+	});
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/organ/organ.js b/pluss-manage-page/src/main/resources/static/resources/auth/js/organ/organ.js
new file mode 100644
index 0000000..5551cb7
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/organ/organ.js
@@ -0,0 +1,110 @@
+$(function() {
+	initTable();
+
+	$("#query_btn").click(function() {
+		table.fnDraw();
+	});
+	
+	$('#provinceSelect').change(function(){
+		//alert(111)
+		var url = ctx + '/organ/changeCities';
+		$.ajax({
+			url : url,
+			type : 'post',
+			dataType : 'json',
+			data :  [ {
+				name : 'province',
+				value : $('#provinceSelect').val()
+			} ],
+			success : function(data) {
+				var list = data.cityList;
+				$('#citySelect option').remove();
+				for(var i=0;i<list.length;i++){
+					$('#citySelect').append("<option value="+list[i].aiid+">"+list[i].name+"</option>");
+				}
+			}
+		})
+	});
+})
+
+function saveAdd(){
+	var url = ctx + '/organ/saveAdd';
+	var serial = $("form").serialize();
+	$.ajax({
+		url: url,
+		type:'POST',
+		data: serial,
+		dataType:'json',
+		success:function(data){
+			if(data.flag=="empty"){
+				alert("组织编码不能为空！");
+			}else if(data.flag=="true"){
+				window.location.href=ctx + "/organ";
+			}else{
+				alert("组织编码已存在！");
+			}
+		}
+		
+	});
+}
+
+function initTable() {
+	table = $("#role_table").myDataTable(
+			{
+				"sAjaxSource" : ctx + '/organ/query',
+				"paramSelector" : '#merchantCode,#merchantName',
+				"aoColumns" : [
+						{
+							// name 0
+							"bSortable" : false,
+							sWidth : 120
+						},{
+							//1 更新人
+							"bSortable" : false,
+							sWidth : 120
+						},{
+							//2 更新时间
+							"bSortable" : false,
+							sWidth : 80
+						},{
+							//3 创建人
+							"bSortable" : false,
+							sWidth : 80
+						},{
+							"bSortable" : false,
+							sWidth : 80
+						},{
+	 	  			    	"fnRender" : function(obj) {
+	 	  				    	var id = obj.aData[5];
+	 	  			    		return "<a href='javascript:deleteHospital({0});' onclick='editOrgan("+id+");'>编辑</a>".format(id)+"&nbsp;|&nbsp"
+	 	  			    		+"<a href='javascript:deleteHospital({0});' onclick='deleteOrgan("+id+");'>删除</a>".format(id);
+	 	  		    		},
+	 	  		    		sWidth : 80
+	                      } ]
+			});
+}
+
+function deleteOrgan(id) {
+	myConfirm('', '确定删除?', function() {
+		$.ajax({
+			url : ctx + '/organ/delete',
+			type : 'post',
+			dataType : 'json',
+			data : [ {
+				name : 'id',
+				value : id
+			} ],
+			success : function(data) {
+				if(data.error) {
+					myAlert('','删除失败 : ' + data.error);
+					return;
+				}
+				table.fnDraw(false);
+			}
+		})
+	})
+}
+
+function editOrgan(id){
+	window.location.href=ctx + '/organ/showEdit?id='+id;
+}
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/role/editRole.js b/pluss-manage-page/src/main/resources/static/resources/auth/js/role/editRole.js
new file mode 100644
index 0000000..bb448b5
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/role/editRole.js
@@ -0,0 +1,204 @@
+var menuTree;
+var roleMenuIds = [];
+$(function() {
+
+	initEdit();
+
+	renderMenuTree();
+
+	initValidate();
+
+	if (readOnly) {
+		$("input").attr("readonly", "readonly");
+		$("input").attr("disabled", "disabled");
+		$("select").attr("disabled", "disabled");
+		$("#btn_save").hide();
+	}
+
+	$("#btn_save").click(function() {
+		submit();
+	})
+
+})
+
+function initValidate() {
+	$("#role_form").validate({
+		onfocusout : false,
+		onkeyup : false,
+		onclick : false,
+		focusInvalid : true,
+		rules : {
+			name : {
+				required : true,
+				maxlength : 32
+			}
+		},
+		showErrors : function(errorMap, errorList) {
+			$(this.currentForm).find("span.error").remove();
+			if (errorList.length > 0) {
+				var err = errorList[0];
+				var el = $(err.element);
+				var target = el.parentsUntil('form', '.controls');
+				target.append("<span class='error'>{0}</span>".format(err.message));
+			}
+		}
+	});
+}
+
+function submit() {
+	if (!$("#role_form").valid()) {
+		return;
+	}
+	var data = $("#role_form").serializeArray();
+	var nodes = menuTree.getCheckedNodes();
+	var menuIds = [];
+	$.each(nodes,function(i,node){
+		menuIds.push(node.id);
+	});
+	data.push({
+		name : 'menuIds',
+		value : menuIds
+	});
+	//console.log(data);
+	$("#btn_save").attr("disabled", "disabled");
+	$.ajax({
+		url : ctx + "/roleInfo/save",
+		type : "POST",
+		dataType : 'json',
+		data : data,
+		complete : function() {
+			$("#btn_save").removeAttr("disabled");
+		},
+		success : function(role) {
+			$("#id").val(role.id);
+			history.go(-1);
+		}
+	});
+}
+
+function initEdit() {
+	var id = $("#id").val();
+	if (id) {
+		$.ajax({
+			url : ctx + "/roleInfo/findById",
+			type : "POST",
+			dataType : 'json',
+			async : false,
+			data : [ {
+				name : 'id',
+				value : id
+			} ],
+			success : function(role) {
+				if (role != null) {
+					renderRole(role);
+				}
+			}
+		});
+	}
+}
+
+function renderRole(role) {
+	window.role = role;
+	$.ajax({
+		url : ctx + '/roleInfo/roleMenus',
+		type : 'post',
+		dataType : 'json',
+		async : false,
+		data : [ {
+			name : 'roleId',
+			value : role.id
+		} ],
+		success : function(menus) {
+			$.each(menus, function(i, menu) {
+				roleMenuIds.push(menu.id);
+			})
+		}
+	})
+	$("#name").val(role.name);
+	$("#createTime").val(new Date(role.createTime).format('yyyy-MM-dd HH:mm:ss'));
+}
+
+function renderMenuTree() {
+	menuTree = $.fn.zTree.init($("#menu_tree"), {
+		async : {
+			enable : true,
+			url : ctx + "/menuInfo/permitSubMenus",
+			type : 'post',
+			dataType : 'json',
+			autoParam : [ "id=parentId" ],
+			dataFilter : function(treeId, pNode, treeNodes) {
+				for ( var i = 0; i < treeNodes.length; i++) {
+					var node = treeNodes[i];
+					//alert('id='+node.id+',parentId='+node.parentId+',name='+node.name);
+					if($.inArray(node.id,roleMenuIds)>=0){
+						node.checked = true;
+					}
+					if(readOnly) {
+						node.chkDisabled = true;
+					}
+					node.isParent = !(node.menuType === 3);
+					switch (node.menuType) {
+					case 1:
+						node.iconSkin = "folder";
+						break;
+					case 2:
+						node.iconSkin = "page";
+						break;
+					case 3:
+						node.iconSkin = "action";
+						break;
+					default:
+						break;
+					}
+				}
+				return treeNodes;
+			}
+		},
+		check : {
+			enable : true
+		},
+		data : {
+			keep : {
+				leaf : true,
+				parent : true
+			}
+		},
+		view : {
+			selectedMulti : false
+		},
+		callback : {
+			onAsyncSuccess : function(evt, treeId, treeNode, msg) {
+				if(msg!=null){
+					var children = [];
+					if (treeNode) {
+						children = treeNode.children;
+					} else {
+						children = menuTree.getNodes();
+					}
+				
+					for ( var i = 0; i < children.length; i++) {
+						var child = children[i];
+						menuTree.expandNode(child, true, false, false);
+					}
+				}
+			},
+		onAsyncError : function(event, treeId, treeNode, XMLHttpRequest, textStatus, errorThrown){
+			console.log('treeNode='+treeNode+',XMLHttpRequest='+XMLHttpRequest+',textStatus='+textStatus+',errorThrown='+errorThrown);
+		}
+		// callback end
+		}
+	});
+	menuTree.expandAll(true);
+}
+
+
+//主线程休眠
+function sleep(numberMillis) { 
+	var now = new Date(); 
+	var exitTime = now.getTime() + numberMillis; 
+	while (true) { 
+	now = new Date(); 
+	if (now.getTime() > exitTime) 
+	return; 
+	} 
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/role/role.js b/pluss-manage-page/src/main/resources/static/resources/auth/js/role/role.js
new file mode 100644
index 0000000..7099366
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/role/role.js
@@ -0,0 +1,104 @@
+$(function() {
+
+	initTable();
+
+	$("#query_btn").click(function() {
+		table.fnDraw();
+	});
+})
+
+function initTable() {
+	table = $("#role_table").myDataTable(
+			{
+				"sAjaxSource" : ctx + '/role!queryUsers.do',
+				"paramSelector" : '#name',
+				"aoColumns" : [
+						{
+							// name 0
+							"bSortable" : false,
+							sWidth : 120
+						},{
+							//1 更新人
+							"bSortable" : false,
+							sWidth : 80
+						},{
+							//2 更新时间
+							"bSortable" : true,
+							sName : 'updateTime',
+							fnRender : function(obj){
+								var val = obj.aData[2];
+								if(val) {
+									return new Date(val).format('yyyy-MM-dd hh:mm:ss');
+								}
+								return '';
+							},
+							sWidth : 150
+						},{
+							//3 创建人
+							"bSortable" : false,
+							sWidth : 80
+						},{
+							//4 创建时间
+							"bSortable" : true,
+							sName : 'createTime',
+							fnRender : function(obj) {
+								var val = obj.aData[4];
+								if(val) {
+									return new Date(val).format('yyyy-MM-dd hh:mm:ss');
+								}
+								return '';
+							},
+							sWidth : 150
+						},
+						{
+							// view 5
+							"bSortable" : false,
+							fnRender : function(obj) {
+								var id = obj.aData[5];
+								return "<a href='{1}/role!edit.do?id={0}&readOnly=true'>查看</a>"
+										.format(id, ctx);
+							},
+							sWidth : 60
+						},
+						{
+							// edit 6
+							"bSortable" : false,
+							fnRender : function(obj) {
+								var id = obj.aData[6];
+								return "<a href='{1}/role!edit.do?id={0}'>修改</a>".format(id, ctx);
+							},
+							sWidth : 60
+						},
+						{
+							// del 7
+							"bSortable" : false,
+							fnRender : function(obj) {
+								var id = obj.aData[7];
+								return "<a href='javascript:deleteRole({0});'>删除</a>"
+										.format(id);
+							},
+							sWidth : 60
+						} ]
+			});
+}
+
+function deleteRole(id) {
+	myConfirm('', '确定删除?', function() {
+		$.ajax({
+			url : ctx + '/role!delete.do',
+			type : 'post',
+			dataType : 'json',
+			data : [ {
+				name : 'id',
+				value : id
+			} ],
+			success : function(data) {
+				if(data.error) {
+					myAlert('','删除失败 : ' + data.error);
+					return;
+				}
+				table.fnDraw(false);
+			}
+		})
+	})
+}
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/user/changePwd.js b/pluss-manage-page/src/main/resources/static/resources/auth/js/user/changePwd.js
new file mode 100644
index 0000000..d8b52e6
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/user/changePwd.js
@@ -0,0 +1,71 @@
+$(function() {
+	initValidate();
+	
+	$("input").keypress(function(event){
+		if(event.which == 13){
+			submit();
+		}
+	});
+
+	$("#btn_save").click(function() {
+		submit();
+	});
+});
+
+function submit(){
+	var ok = $("#pwd_form").valid();
+	if (ok) {
+		$("#btn_save").attr("disabled", "disabled");
+		$.ajax({
+			url : ctx + '/user!doChangePwd.do',
+			type : 'POST',
+			dataType : 'json',
+			data : $("#pwd_form").serializeArray(),
+			complete : function() {
+				$("#btn_save").removeAttr("disabled");
+			},
+			success : function(data) {
+				if(data.flag==1){
+					myConfirm('', '修改完成,是否重新登录?', function() {
+						top.location.href = ctx + '/home!logout.do';
+					});
+				}else{
+					
+					alert(data.msg);
+				}
+				
+			}
+		});
+	}
+}
+
+function initValidate() {
+	$("#pwd_form").validate({
+		onfocusout : false,
+		onkeyup : false,
+		onclick : false,
+		focusInvalid : true,
+		rules : {
+			oldPassword : {
+				required : true
+			},
+			newPassword : {
+				required : true,
+				maxlength : 32
+			},
+			confirmPassword : {
+				required : true,
+				equalTo : '#newPassword'
+			}
+		},
+		showErrors : function(errorMap, errorList) {
+			$(this.currentForm).find("span.error").remove();
+			if (errorList.length > 0) {
+				var err = errorList[0];
+				var el = $(err.element);
+				var target = el.parentsUntil('form', '.controls');
+				target.append("<span class='error'>{0}</span>".format(err.message));
+			}
+		}
+	});
+}
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/user/editUser.js b/pluss-manage-page/src/main/resources/static/resources/auth/js/user/editUser.js
new file mode 100644
index 0000000..22930eb
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/user/editUser.js
@@ -0,0 +1,669 @@
+$(function() {
+	initEdit();
+	initRoles();
+//	initProvince();
+//	initProducts();
+//	initPlatforms();
+//	initValidate();
+	
+	$("#btn_save").click(function() {
+		
+		submit();
+	});
+
+	if (readOnly) {
+		$("input").attr("disabled", "disabled");
+		$("select").attr("disabled", "disabled");
+		$('#organType').attr("disabled",false);
+		$("#btn_save").hide();
+	}
+	
+	//选择不同组织类型时存储勾选商户
+	var organType = null;
+	$('#organType').change(function(){
+		var str = "";
+		$('.classOrgan').each(function(){
+			if($(this).attr("checked")=="checked"){
+				str =  $(this).val()+":"+$(this).parent().text()+"/"+str;
+			}
+		})
+		if($('#organType').val()=='order_meal'){
+			$('#OrganIdWifi').val(str);
+		}else{
+			$('#OrganIdMeal').val(str);
+		}
+		var url = ctx + "/user/returnOrganList?organType="+$('#organType').val();
+		$('#modelBody').load(url,function(){
+			$('#dataAuthModal').show();
+			if($('#loginName').val()!=''){
+				$.ajax({
+					url : ctx + "/user/showModelForEdit",
+					type : "POST",
+					dataType : 'json',
+					data : [ {
+						name : 'loginName',
+						value : $('#loginName').val()
+					},{
+						name : 'organType',
+						value : $('#organType').val()
+					} ],
+					success : function(data) {
+						adornToModel(data);
+						if(readOnly){	
+							$("#modelBody :checkbox").attr("disabled","disabled");
+							
+							$("#addDevice").attr("disabled","disabled");
+						}
+					}
+				});
+			}
+		});
+		
+	});
+	
+});
+
+function initProducts(){
+	var p = $('#productIds').multiselect({
+		checkAllText : "全选",
+		uncheckAllText : "全部取消",
+		noneSelectedText : "请选择产品",
+		selectedText : "已选择#项",
+		minWidth: 170,
+		selectedList : 4
+	}).empty();
+	p.multiselect("refresh");
+	$.ajax({
+		url : ctx + "/anon/getPermitProducts",
+		type : 'POST',
+		dataType : 'json',
+		async : false,
+		data : [{
+			name : 'loginName',
+			value : curUserLoginName
+		}],
+		success : function(data) {
+			var userProductIds = $.map(userProducts,function(a){
+				return a.id;
+			})
+			$.each(data,function(i,product){
+				if($.inArray(product.id,userProductIds)<0){
+					p.append("<option value='{1}'>{0}</option>".format(product.cnName,product.id));
+				}else {
+					p.append("<option value='{1}' selected='selected'>{0}</option>".format(product.cnName,product.id));
+				}
+			});
+			p.multiselect("refresh");
+		}
+	})
+	$("#productIds").change(function(){
+		initPlatforms();
+	});
+}
+
+function initPlatforms(){
+	var p = $('#platformIds').multiselect({
+		checkAllText : "全选",
+		uncheckAllText : "全部取消",
+		noneSelectedText : "请选择平台",
+		selectedText : "已选择#项",
+		minWidth: 170,
+		selectedList : 4
+	}).empty();
+	p.multiselect("refresh");
+	var productIds = $("#productIds").val();
+	if(!productIds) return;
+	$.ajax({
+		url : ctx + "/anon/getPermitPlatforms",
+		type : 'POST',
+		dataType : 'json',
+		async : false,
+		data : [{
+			name : 'loginName',
+			value : curUserLoginName
+		},{
+			name : 'productIds',
+			value : productIds
+		}],
+		success : function(data) {
+			var userPlatformIds = $.map(userPlatforms,function(a){
+				return a.id;
+			})
+			$.each(data,function(i,platform){
+				if($.inArray(platform.id,userPlatformIds)<0){
+					p.append("<option value='{1}'>{0}</option>".format(platform.name,platform.id));
+				}else {
+					p.append("<option value='{1}' selected='selected'>{0}</option>".format(platform.name,platform.id));
+				}
+			});
+			p.multiselect("refresh");
+		}
+	})
+}
+
+function initProvince() {
+	var p = $("#province").empty();
+	$.ajax({
+		url : ctx + "/area/permitProvinces",
+		type : 'POST',
+		dataType : 'json',
+		success : function(data) {
+			if (data.length == 1) {
+				p.empty();
+			}
+			var ids = [];
+			$.each(data, function(i, a) {
+				ids.push(a.id);
+				p.append("<option value='{0}'>{1}</option>".format(a.aiid, a.name));
+			});
+			if ($.inArray(userProvinceId, ids) >= 0) {
+				p.val(userProvinceId);
+			}
+			initCity();
+		}
+	});
+	p.change(function() {
+		initCity();
+	});
+}
+
+function initCity() {
+	var c = $("#city").empty();
+	c.append("<option value=''>选择城市</option>");
+	$.ajax({
+		url : ctx + "/area/permitCitys",
+		type : 'POST',
+		dataType : 'json',
+		data : [ {
+			name : 'provinceId',
+			value : $("#province").val()
+		} ],
+		success : function(data) {
+			if (data.length == 1) {
+				c.empty();
+			}
+			var ids = [];
+			$.each(data, function(i, a) {
+				ids.push(a.id);
+				c.append("<option value='{0}'>{1}</option>".format(a.aiid, a.name));
+			});
+			if ($.inArray(userCityId, ids) >= 0) {
+				c.val(userCityId);
+			}
+		}
+	});
+}
+
+function initPasswordValidate() {
+	$("#password_form").validate({
+		onfocusout : false,
+		onkeyup : false,
+		onclick : false,
+		focusInvalid : true,
+		rules : {
+			oldPassword : {
+				required : true,
+				maxlength : 32,
+				minlength : 6
+			},
+			newPassword : {
+				required : true,
+				maxlength : 32,
+				minlength : 6
+			},
+			confirmPassword : {
+				required : true,
+				equalTo : '#newPassword'
+			}
+		},
+		showErrors : function(errorMap, errorList) {
+			$(this.currentForm).find("span.error").remove();
+			if (errorList.length > 0) {
+				var err = errorList[0];
+				var el = $(err.element);
+				var target = el.parentsUntil('form', '.controls');
+				target.append("<span class='error'>{0}</span>".format(err.message));
+			}
+		}
+	});
+}
+
+function showModel(loginName){
+	adornSelect(loginName);
+	organType = $('#organType').val();
+	var url = ctx + "/user/showModel?organType="+organType;
+	$('#modelBody').load(url,function(){
+		$('#dataAuthModal').show();
+		if(loginName!=''){
+			$.ajax({
+				url : ctx + "/user/showModelForEdit",
+				type : "POST",
+				dataType : 'json',
+				data : [ {
+					name : 'loginName',
+					value : loginName
+				},{
+					name : 'organType',
+					value : $('#organType').val()
+				} ],
+				success : function(data) {
+					adornToModel(data);
+					if(readOnly){
+						$("#modelBody :checkbox").attr("disabled","disabled");
+						$("#addDevice").attr("disabled","disabled");
+					}
+				}
+			});
+		}
+	});	
+}
+
+function adornSelect(loginName){
+	var count=$("#organType option").length;
+	if(loginName!=0){
+		$.ajax({
+			url : ctx + "/user/returnOrganType",
+			type : "POST",
+			dataType : 'json',
+			async: false,
+			data : [ {
+				name : 'loginName',
+				value : loginName
+			}],
+			success : function(data) {				
+				for(var i=0;i<count;i++){
+					var organType = $("#organType").get(0).options[i].value;
+					if(organType == data.organType){  
+			            $("#organType").get(0).options[i].selected = true;  			          
+			            break;  
+			        }  
+			    }
+			}
+		});
+	}else{
+		for(var i=0;i<count;i++){
+			if($("#organType").get(0).options[i].value == "order_meal"){  
+	            $("#organType").get(0).options[i].selected = true;  			          
+	            break;  
+	        }  
+	    }
+	}
+
+}
+
+//暂停函数  
+function Pause(obj,iMinSecond){   
+   if (window.eventList==null) window.eventList=new Array();   
+   var ind=-1;   
+   for (var i=0;i<window.eventList.length;i++){   
+       if (window.eventList[i]==null) {   
+         window.eventList[i]=obj;   
+         ind=i;   
+         break;   
+        }   
+    }   
+   if (ind==-1){   
+   ind=window.eventList.length;   
+   window.eventList[ind]=obj;   
+   }   
+  setTimeout("GoOn(" + ind + ")",iMinSecond);   
+}   
+  
+//继续函数  
+function GoOn(ind){   
+  var obj=window.eventList[ind];   
+  window.eventList[ind]=null;   
+  if (obj.NextStep) obj.NextStep();   
+  else obj();   
+}   
+
+
+function adornToModel(data){
+
+	var resList = data.resList;
+	var cityList = new Array();
+	var organList= new Array();
+	for(var i = 0;i<resList.length;i++){
+	
+		var provinceId = resList[i].provinceId;
+		$('#pro_'+provinceId).attr("checked","checked");
+		cityList.push(resList[i].latnList);
+	}
+	for(var i=0;i<cityList.length;i++){
+		var citys = cityList[i];
+		for(var j = 0;j<citys.length; j++){
+			var cityId = citys[j].latnId;
+			$('#city_'+cityId).attr("checked","checked");
+			organList.push(citys[j].organList);
+		}
+	}
+	for(var i=0;i<organList.length;i++){
+		var organs = organList[i];
+		for(var j = 0;j<organs.length;j++){
+			var OrganIdWifi = organs[j].organCode;
+			$('#organ_'+OrganIdWifi).attr("checked","checked");
+		}
+	}
+	
+}
+
+
+function checkBoxProvince(obj,provinceId){
+	if($('#'+obj.id).attr("checked")=="checked"){
+		$('.checkBoxLatn_'+provinceId).attr("checked","checked");
+		$('.checkBoxOrgan_'+provinceId).attr("checked","checked");
+	}else{
+		$('.checkBoxLatn_'+provinceId).attr("checked",false);
+		$('.checkBoxOrgan_'+provinceId).attr("checked",false);
+	}
+}
+
+function checkBoxCity(obj,pro,latnId,index){
+	if($('#'+obj.id).attr("checked")=="checked"){
+		$('.subCheck_'+latnId).attr("checked","checked");
+	}else{
+		$('.subCheck_'+latnId).attr("checked",false);
+		if($('#'+obj.id).parent().parent().siblings().find('input').attr("checked")=="checked"){
+			return;
+		}else{
+			$('#pro_'+pro).attr("checked",false);
+		}
+		
+	}
+}
+
+function addOrgan(){
+	var str = "";
+	$('.classOrgan').each(function(){
+		if($(this).attr("checked")=="checked"){
+			str =  $(this).val()+":"+$(this).parent().text()+"/"+str;
+		}
+	})
+	if($('#organType').val()=='order_meal'){
+		$('#OrganIdMeal').val(str);
+	}else{
+		$('#OrganIdWifi').val(str);
+	}
+	$('#OrganId').val($('#OrganIdMeal').val()+$('#OrganIdWifi').val());
+	$("#dataAuthModal").modal("hide");
+	//alert($('#OrganIdWifi').val());
+}
+
+function generateProvinceList(data){
+	var provinceList = data.provinceList;
+	for(var i=0;i<provinceList.length;i++){
+		$('#modelBody').append(" <li class=\"provinceLi\"><label><input class=\"provinceCheck\" id=province_"+i+" onclick=\"checkBoxClick(this,"+provinceList[i].aiid+")\" name=\"Fruit\" type=\"checkbox\" value="+provinceList[i].aiid+" />"+provinceList[i].name+"</label></li>");
+	}
+}
+
+function checkBoxClick(obj,aiid){
+	
+	if($('#'+obj.id).attr("checked")=="checked"){
+		$.ajax({
+			url : ctx + "/user/showCity",
+			type : "POST",
+			dataType : 'json',
+			data : [ {
+				name : 'province',
+				value : aiid
+			} ],
+			success : function(data) {
+				//generateProvinceList(data);
+				generateCityList(data);
+			}
+		});
+	}else{
+		$('#'+obj.id).parent().parent().children().remove();
+	}
+
+}
+
+function generateCityList(data){
+	var par = data.cityList[0].parentId;
+	$('.provinceCheck').each(function(){
+		if($(this).val()==par){
+			var cityList = data.cityList;
+			for(var i=0;i<cityList.length;i++){
+				$(this).parent().parent().append("<ul class=\"cityUl\"><label><input name=\"Fruit\" onclick=\"cityCheckOnclick(this,"+cityList[i].aiid+")\" class=\"checkBoxCity\" type=\"checkbox\" value="+cityList[i].aiid+" />"+cityList[i].name+"</label></ul>");
+			}
+		}
+	});
+}
+
+function cityCheckOnclick(obj,aiid){
+	if($('#'+obj.id).attr("checked")=="checked"){
+		$.ajax({
+			url : ctx + "/user/showOrgan",
+			type : "POST",
+			dataType : 'json',
+			data : [ {
+				name : 'latnId',
+				value : aiid
+			} ],
+			success : function(data) {
+				//generateProvinceList(data);
+				generateOrganList(data);
+			}
+		});
+	}else{
+		//$('#'+obj.id).remove();
+	}
+}
+
+function generateOrganList(data){
+	var city = data.organList[0].latnId;
+	$('.checkBoxCity').each(function(){
+		if($(this).val()==city){
+			var organList = data.organList;
+			for(var i=0;i<organList.length;i++){
+				$(this).parent().parent().append("<li class=\"shopLi\"><ul class=\"shopUl\" id=\"\"><label><input name=\"Fruit\" type=\"checkbox\" value="+organList[i].organ_code+" />"+organList[i].organ_name+"</label></ul></li>");
+			}
+		}
+	});
+	var organList = data.organList;
+	
+	for(var i=0;i<cityList.length;i++){
+		var flag = cityList[i].aiid;
+		alert(data.flag);
+	}
+}
+
+function initValidate() {
+	$("#user_form").validate({
+		onfocusout : false,
+		onkeyup : false,
+		onclick : false,
+		focusInvalid : true,
+		rules : {
+			loginName : {
+				required : true,
+				maxlength : 32,
+				remote : {
+					url : ctx + '/user/checkLoginName',
+					type : 'POST',
+					dataType : 'json',
+					async : false,
+					data : [ {
+						name : 'id',
+						value : function() {
+							return $("#id").val();
+						}
+					}, {
+						name : 'loginName',
+						value : function() {
+							return $("#loginName").val();
+						}
+					} ]
+				}
+			},
+			trueName : {
+				required : true,
+				maxlength : 32
+			},
+			email : {
+				email : true,
+				remote : {
+					url : ctx + '/user/checkEmail',
+					type : 'POST',
+					dataType : 'json',
+					async : false,
+					data : [ {
+						name : 'id',
+						value : function() {
+							return $("#id").val();
+						}
+					}, {
+						name : 'email',
+						value : function() {
+							return $("#email").val();
+						}
+					} ]
+				}
+			},
+			phone : {
+				digits : true,
+				maxlength : 11,
+				minlength : 11
+			},
+			roleIds : {
+				required : true
+			}
+		},
+		showErrors : function(errorMap, errorList) {
+			$(this.currentForm).find("span.error").remove();
+			if (errorList.length > 0) {
+				var err = errorList[0];
+				var el = $(err.element);
+				var target = el.parentsUntil('form', '.controls');
+				target.append("<span class='error'>{0}</span>".format(err.message));
+			}
+		}
+	});
+}
+
+function submit() {
+	if(!$("#user_form").valid()){
+		return;
+	}
+	$("#btn_save").attr("disabled", "disabled");
+	
+	//生成选择角色
+	var str="";
+	$("#roles").find('input').each(function(){ 
+        if($(this).attr("checked")){
+            str += $(this).val()+","
+        }
+    })
+	$('#roleIds').val(str);
+	$.ajax({
+		url : ctx + "/userInfo/save",
+		type : "POST",
+		dataType : 'json',
+		data : $("#user_form").serializeArray(),
+//		complete : function() {
+//			$("#btn_save").removeAttr("disabled");
+//		},
+		success : function(user) {
+			$("#id").val(user.id);
+			history.go(-1);
+		}
+	});
+
+}
+
+function initEdit() {
+	var id = $("#id").val();
+	if (id) {
+		$.ajax({
+			url : ctx + "/userInfo/findById",
+			type : "POST",
+			dataType : 'json',
+			async : false,
+			data : [ {
+				name : 'id',
+				value : id
+			} ],
+			success : function(user) {
+				if(user!=null) {
+					renderUser(user);
+				}
+			}
+		});
+	}
+
+}
+
+function renderUser(user) {
+	window.user = user;
+	console.log(user);
+	console.log(window.user);
+//	var level = user.area.level;
+//	if (level == 1 || level == 2) {
+//		window.userProvinceId = user.area.id;
+//	}
+//	if (level == 3) {
+//		window.userProvinceId = user.area.parentId;
+//		window.userCityId = user.area.id;
+//	}
+	$.ajax({
+		url : ctx + "/userInfo/findRolesByUser",
+		type : "POST",
+		dataType : 'json',
+		async : false,
+		data : [ {
+			name : 'userId',
+			value : user.id
+		} ],
+		success : function(roles) {
+			window.userRoles = roles;
+			$.each(roles, function(i, role) {
+				window.userRoleIds.push(role.roleId);
+			});
+		}
+	});
+	
+	$("#loginName").val(user.loginName);
+	$("#trueName").val(user.trueName);
+	$("#status").val(user.status);
+	$("input[name='sex'][value='{0}']".format(user.sex)).prop({
+		checked : true
+	});
+	$("#phone").val(user.phone);
+	$("#email").val(user.email);
+	$("#dataAuth").attr("onclick","showModel('"+user.loginName+"');")
+
+}
+
+function initRoles() {
+	var html = $("#roles").html();
+	$("#roles").empty();
+	$.ajax({
+		url : ctx + "/userInfo/permitRoles",
+		type : "POST",
+		dataType : 'json',
+		async : false,
+		maskTarget : '#permission_tab',
+		success : function(roles) {
+			console.log(roles);
+			var roleIds = $.map(roles,function(role){
+				return role.id;
+			})
+			$.each(userRoles,function(i,a){
+				if($.inArray(a.id,roleIds)<0){
+					var roleEl = $("#roles").append(html.format(a.id,a.name));
+					roleEl.find("input").prop({checked : true}).attr("disabled","disabled");
+				}
+			})
+			$.each(roles, function(i, a) {
+				console.log(a);
+				$("#roles").append(html.format(a.id,a.name));
+				if ($.inArray(a.id, userRoleIds)<0) {
+				}else {
+					$("#roles #role_{0}".format(a.id)).prop({
+						checked : true
+					});
+				}
+			});
+		}
+	});
+}
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/user/user.js b/pluss-manage-page/src/main/resources/static/resources/auth/js/user/user.js
new file mode 100644
index 0000000..065af8d
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/user/user.js
@@ -0,0 +1,200 @@
+$(function() {
+//	initProvince();
+	initTable();
+
+	$("#query_btn").click(function() {
+		table.fnDraw();
+	});
+	$("#name,#roleName").keyup(function(e){
+		if(e.keyCode == 13) {
+			table.fnDraw();
+		}
+	});
+
+});
+
+function initTable() {
+	table = $("#user_table").myDataTable({
+		"sAjaxSource" : ctx + '/user!queryUsers.do',
+		"paramSelector" : '#province,#city,#status,#trueName,#loginName,#roleName',
+		"aoColumns" : [ {
+			// loginName 0
+			"bSortable" : false,
+			sWidth : 60
+		}, {
+			// trueName 1
+			"bSortable" : false,
+			sWidth : 80
+		}, {
+			// area 2
+			"bSortable" : false,
+			sWidth : 60,
+			"fnRender" : function(obj) {
+				var ai = obj.aData[2];
+				if (ai) {
+					return ai.name;
+				}
+				return "";
+			}
+		}, {
+			// role 3
+			"bSortable" : false,
+			sWidth : 100,
+			fnRender : function(obj) {
+				var roles = obj.aData[3];
+				if (roles) {
+					var names = $.map(roles, function(a) {
+						return a.name;
+					});
+					return names.join(', ')
+				}
+				return "";
+			}
+		}, {
+			// status 4
+			"bSortable" : false,
+			sWidth : 50,
+			"fnRender" : function(obj) {
+				var val = obj.aData[4];
+				var text = "";
+				$("#status option").each(function() {
+					if (val && val == $(this).val()) {
+						text = $(this).text();
+						return false;
+					}
+				});
+				return text;
+			}
+		}, {
+			// createTime 5
+			"bSortable" : true,
+			"sName" : 'createTime',
+			"sWidth" : 120,
+			"fnRender" : function(obj) {
+				var val = obj.aData[5];
+				try{
+					return new Date(val).format("yyyy-MM-dd hh:mm:ss");
+				}catch(e){
+					return '';
+				}
+			}
+		}, {
+			// password 6
+			"bSortable" : false,
+			sWidth : 60,
+			fnRender : function(obj) {
+				var id = obj.aData[6];
+				return "<a href='javascript:resetPassword({0});'>初始化</a>".format(id);
+			}
+		}, {
+			// view 7
+			"bSortable" : false,
+			sWidth : 50,
+			fnRender : function(obj) {
+				var id = obj.aData[7];
+				return "<a href='{1}/user!edit.do?id={0}&readOnly=true'>查看</a>".format(id, ctx);
+			}
+		}, {
+			// edit 8
+			"bSortable" : false,
+			sWidth : 50,
+			fnRender : function(obj) {
+				var id = obj.aData[8];
+				return "<a href='{1}/user!edit.do?id={0}'>修改</a>".format(id, ctx);
+			}
+		}, {
+			// del 9
+			"bSortable" : false,
+			sWidth : 50,
+			fnRender : function(obj) {
+				var id = obj.aData[9];
+				var loginName= obj.aData[0];
+     			return "<a href='javascript:deleteUser({0},\"{1}\");'>删除</a>".format(id,loginName);
+				//return '<a href="javascript:deleteUser('+id+',\''+loginName+'\');">删除</a>'
+			}
+		} ]
+	});
+}
+
+function initProvince() {
+	var p = $("#province").empty();
+	p.append("<option value=''>选择省份</option>");
+	$.ajax({
+		url : ctx + "/area/permitProvinces",
+		type : 'POST',
+		dataType : 'json',
+		async : false,
+		success : function(data) {
+			if(data.length == 1) {
+				p.empty();
+			}
+			$.each(data, function(i, a) {
+				p.append("<option value='{0}'>{1}</option>".format(a.aiid, a.name));
+			});
+			initCity();
+		}
+	});
+	p.change(function() {
+		initCity();
+	});
+}
+
+function initCity() {
+	var c = $("#city").empty();
+	c.append("<option value=''>选择城市</option>");
+	$.ajax({
+		url : ctx + "/area/permitCitys",
+		type : 'POST',
+		dataType : 'json',
+		async : false,
+		data : [ {
+			name : 'provinceId',
+			value : $("#province").val()
+		} ],
+		success : function(data) {
+			if(data.length == 1) {
+				c.empty();
+			}
+			$.each(data, function(i, a) {
+				c.append("<option value='{0}'>{1}</option>".format(a.aiid, a.name));
+			});
+		}
+	});
+}
+
+function deleteUser(id,loginName) {
+	myConfirm('', '确定要删除吗?', function() {
+		$.ajax({
+			url : ctx + '/user!delete.do',
+			data : [ {
+				name : 'id',
+				value : id
+			} ,{
+				name : 'loginName',
+				value : loginName
+			}],
+			type : 'POST',
+			dataType : 'json',
+			success : function() {
+				table.fnDraw(false);
+			}
+		});
+	});
+}
+
+function resetPassword(id) {
+	myConfirm('', '确定要初始化密码吗?', function() {
+		$.ajax({
+			url : ctx + '/user!resetPassword.do',
+			data : [ {
+				name : 'id',
+				value : id
+			} ],
+			type : 'POST',
+			dataType : 'json',
+			success : function() {
+				myAlert('','密码初始化完成');
+			}
+		});
+	});
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/utils/DialogUtil.js b/pluss-manage-page/src/main/resources/static/resources/auth/js/utils/DialogUtil.js
new file mode 100644
index 0000000..1a1ce6e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/utils/DialogUtil.js
@@ -0,0 +1,318 @@
+/**
+ * 
+ * 为了layer的顶层dialog显示
+ * 相关API请看<a herf="http://layer.layui.com/api.html">http://layer.layui.com/api.html</a>
+ 
+ * 
+ * <pre>
+ * 邮箱:50875875@qq.com
+ * 日期:2019-02-17-21:29:34
+ * 版权：安徽航天信息有限公司
+ * </pre>
+ */
+DialogUtil = {
+	/**
+	 * 获取顶部窗口
+	 */
+	getParent : function(w) {
+		var win = w ? w : window;
+		if (win.parent != win) // 找到最顶层窗口
+			return this.getParent(win.parent);
+		return win;
+	},
+	/**
+	 * 格式化 var str=String.format("姓名:{0},性别:{1}","hugh","男"); alert(str);
+	 * 
+	 * @returns
+	 */
+	format : function() {
+		var template = arguments[0], args = arguments, str = template.replace(
+				/\{(\d+)\}/g, function(m, i) {
+					return args[parseInt(i) + 1];
+				});
+		return str;
+	},
+	layer : function() {
+		return this.getParent().laydialog;
+	},
+	open : function(options) {
+		return this.layer().open(options);
+	},
+	/**
+	 * 关闭指定的弹窗
+	 * @param index 对话框的index
+	 * @returns
+	 */
+	close : function(index) {
+		return this.layer().close(index);
+	},
+	/**
+	 * 关闭当前的弹窗
+	 * @returns
+	 */
+	closeDialog : function() {
+		if(frameElement &&frameElement.dialog){
+			return this.close(frameElement.dialog.index);
+		}else{
+		   if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") !=-1) {  
+		        window.location.href="about:blank";  
+		        window.close();  
+		    } else {  
+		        window.opener = null;  
+		        window.open("", "_self");  
+		        window.close();  
+		    }  
+		}
+	},
+	/**
+	 * 关闭所有的弹窗
+	 * @returns
+	 */
+	closeAll : function() {
+		return this.layer().closeAll();
+	},
+	/**
+	 * 获得弹出窗口的Window对象<br>
+	 * DialogUtil.getChildFrameWindow().xxx();
+	 * xxx ：是具体的方法。
+	 * @param index 这个是对话框的id
+	 * @returns
+	 */
+	getChildFrameWindow:function(index){
+		return this.layer().getChildFrameWindow(index);
+	},
+	/**
+	 * 可以通过选择器查找对象
+	 * @param selector 
+	 * @param index
+	 * @returns
+	 */
+	getChildFrame:function(selector, index){
+		return this.layer().getChildFrame(selector,index);
+	},
+	/**
+	 * 弹窗框
+	 * @param options 
+	 * params  传递的参数 
+	 * callback 回调
+	 * 
+	 * @returns
+	 */
+	dialog:function(options){
+		var opts = jQuery.extend({}, {
+		    type: 2,
+		    area: ['90%', '90%'],
+		    fix: true, //固定
+		    maxmin: true,
+		    btnAlign:'c'
+		}, options);
+		return this.layer().open(opts);
+	},
+	/**
+	 * 窗口回调
+	 * @param options
+	 */
+	callback:function(options){
+		if(frameElement.dialog){
+			if(frameElement.dialog.callback){
+				frameElement.dialog.callback(options);
+			}
+		}
+	},
+	/**
+	 * 全屏窗口
+	 * @returns
+	 */
+	openFullWindow:function(){
+		var options={},
+    		defaultOptions = {
+			    type: 2,
+			    area: ['100%', '100%'],
+			    fix: true, //固定
+			    maxmin: true
+			};
+	    if (typeof arguments[0] === 'object' ) {
+	        options = jQuery.extend(true, defaultOptions, arguments[0]);
+	    } else {
+	        options = jQuery.extend(true, defaultOptions, {
+	        	content: arguments[0],
+	        	title:typeof arguments[1] !== 'undefined' ? arguments[1] : null
+	        });
+	    }
+	    options = jQuery.extend(true, defaultOptions, options);
+		return this.layer().open(options);
+	},
+	/**
+	 * alert
+	 * 
+	 * @param content  【必填】 提示消息 //注意这个是字符串，
+	 * @param title  【选填】 如果是function类型 ,则是回调（callback），如果是String类型 则是提示标题,不传入为默认值‘提示'
+	 * @param callback 【选填】  如果是function类型 ,则是回调（callback）
+	 * @returns
+	 */
+	alert : function(content,title,callback){
+			var  o = {
+				content: content
+			 };
+			if (typeof (title) == "function") o.callback = title;
+			if(callback) o.callback = callback;
+			if (typeof (title) == "string" && title != "") o.title = title;
+		return this.layer().alert(o);
+	},
+	/**
+	 * 警告
+	 * 
+	 * @param content  【必填】 提示消息
+	 * @param title  【选填】 如果是function类型 ,则是回调（callback），如果是String类型 则是提示标题,不传入为默认值‘提示'
+	 * @param callback 【选填】  如果是function类型 ,则是回调（callback）
+	 * @returns
+	 */
+	warn:function(content,title,callback){
+		var  o = {
+				content: content,
+				icon:0
+			 };
+			if (typeof (title) == "function") o.callback = title;
+			if(callback) o.callback = callback;
+			if (typeof (title) == "string" && title != "") o.title = title;
+		return this.layer().alert(o);
+	},
+	/**
+	 * 错误提示信息
+	 * @param content 【必填】 错误信息简述
+	 * @param detail 【必填】 详细错误信息
+	 * @param title  【选填】  如果是function类型 ,则是回调（callback），如果是String类型 则是提示标题,不传入为默认值‘提示'
+	 * @param callback 【选填】  如果是function类型 ,则是回调（callback）
+	 * @returns
+	 */
+	error : function(content,detail,title,callback){ 
+		if(detail){
+			var divTemplate="<div class='div_error' >" +
+			"<div class='div_error_msg'><i class='fa fa-times-circle'></i>&nbsp;{0}</div>" +
+				"<div style='text-align:left; padding-bottom:10px; padding-left:10px;'></div>" +
+			"<div class='div_error_detail'>{1}</div>" +
+			"</div>";
+			var msg=this.format(divTemplate,content,detail);
+			if (typeof (title) == "function") {
+				callback = title;
+				title ="提示";
+			}
+			if (typeof (title) == "string" && title != "") title = title;
+		    return this.layer().alert({
+		    	content: msg,
+		    	title:title,
+		    	callback:callback
+		    });
+		}else{
+		    return this.layer().alert({
+		    	content: content,
+				icon:2
+		    });
+		}
+	
+	},
+	/**
+	 *  确认对话框
+	 *  
+	 * @param content 【必填】 提示消息
+	 * @param title 【选填】     如果是function类型 ,则是回调（callback），如果是String类型 则是提示标题,不传入为默认值‘提示’；
+	 * @param callback 【选填】  如果是function类型 ,则是回调（callback），如果是boolean类型 并且为true 则是按钮为是否  否则是默认
+	 * @param buttonsLabel 【选填】 如果是boolean类型 则是按钮为是否
+	 * @returns 
+	 */
+	confirm : function(content,title,callback,buttonsLabel) {
+		var  o = {content:content };
+		if (typeof (title) == "function") o.callback = title;
+		if (typeof (callback) == "boolean") buttonsLabel = callback;
+		if (typeof (callback) == "function") o.callback  = callback;
+		if (typeof (title) == "string" && title != "") o.title = title;
+		if(buttonsLabel){
+			o.btn = [{
+				label: '&#x662F;'//是
+	           }, {
+	        	   label: '&#x5426;'//否
+	           }];
+		}
+		return this.layer().confirm(o);
+	},
+	/**
+	 * 加载的对话框
+	 * @param icon 【选填】加载的图标 0-2可选 如果是0，无需传
+	 * @param options  【选填】 可以设置时间等参数
+	 * @returns
+	 */
+	load : function(icon, options) {
+		if(!options)
+			options = {};
+		if(typeof (icon) == "string"){
+			options = {title:icon};
+			icon = 0;
+		}
+		
+		return this.layer().load(icon, options);
+	},
+	/**
+	 * 顶部通知框
+	 * @param content  【必填】提示消息
+	 * @param options  【选填】选项
+	 * @param callback 【选填】回调
+	 * @returns
+	 */
+	toastr : function(content,options, callback) {
+		var opts ={
+				offset : 0,
+				shift :6};
+		if(typeof (options)  == "boolean") {
+			opts.shift = options?0:6;
+		}else if(typeof (options)  == "function"){
+			callback = options;
+		}
+		return this.msg(content,opts, callback);
+	},
+	/**
+	 * 提示消息 【中间】
+	 * @param content 【必填】提示消息
+	 * @param options 【必填】选项
+	 * @param callback 【选填】回调
+	 * @returns
+	 */
+	msg : function(content, options, callback) {
+		return this.layer().msg(content, options, callback);
+	},
+	/**
+	 * 气泡提示
+	 * @param content 【必填】提示消息
+	 * @param follow  位置
+	 * @param options 【必填】选项
+	 * @returns
+	 */
+	tips : function(content, follow, options) {
+		return this.layer().tips(content, follow, options);
+	},
+	// 导出专用
+	tipDialog : function(title, message, detail, type, callback) {
+		var divTemplate = "<div class='div_error' >"
+				+ "<div class='div_error_msg'>{0}</div>"
+				+ "<div style='text-align:left; padding-bottom:10px; padding-left:10px;'></div>"
+				+ "<div class='div_error_detail'>{1}</div>" + "</div>";
+		var content = this.format(divTemplate, message, detail);
+		return this.layer().alert( {
+			title:title,
+			content:content,
+			icon :  type
+		});
+	},
+	/**
+	 * tab 层
+	 * @param options
+	 */
+	tab:function(options){
+		return this.layer().tab(options);
+	},
+	/**
+	 * prompt层
+	 */
+	prompt:function(options,yes){
+		return this.layer().prompt(options,yes);
+	}
+};
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/utils/StringUtil.js b/pluss-manage-page/src/main/resources/static/resources/auth/js/utils/StringUtil.js
new file mode 100644
index 0000000..908ceb2
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/utils/StringUtil.js
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * 
+ * 系统主页
+ * 
+ * <pre>
+ *  
+ * 作者：liys
+ * 邮箱:5087587@qq.com
+ * 日期:2019-2-15-11:43:52
+ * 版权：安徽航天信息有限公司
+ * </pre>
+ * 
+ ******************************************************************************/
+StringUtil={
+	//获取url参数
+	getQueryString:function(name){
+	    var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i"); 
+	    var r = window.location.search.substr(1).match(reg); 
+	    if (r != null) return unescape(r[2]); 
+	    return null; 
+		
+	}	
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/API_cn.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/API_cn.html
new file mode 100644
index 0000000..60bd7d1
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/API_cn.html
@@ -0,0 +1,103 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+		<title>API 文档 [zTree --  jQuery 树插件]</title>
+		<link rel="stylesheet" href="apiCss/common.css" type="text/css">
+		<link rel='stylesheet' href='apiCss/zTreeStyleForApi.css' type='text/css'>
+		<script type="text/javascript">
+			var ie = (function(){
+				var undef,
+				v = 3,
+				div = document.createElement('div'),
+				all = div.getElementsByTagName('i');
+				while (
+				div.innerHTML = '<!--[if gt IE ' + (++v) + ']><i></i><![endif]-->',
+				all[0]
+			);
+				return v > 4 ? v : undef;
+			}()), ie6 = (ie === 6),
+			path = window.location.pathname.replace(/.*\/([^\/\.]*)\..*/g,"$1"),
+			langLib = [];
+			ie = ie<9;
+			if(ie) {
+				document.write('<link rel="stylesheet" href="apiCss/common_ie6.css" type="text/css">');
+			}
+			var lang = "cn",
+			ajaxMsg = "如果你使用的是 Chrome 浏览器，那么请把 API 文档发布到 web 服务目录下访问。\n\n（Chrome 浏览器不支持本地 ajax 访问, 即：file://）";
+
+		</script>
+	</head>
+	<body>
+		<div id="header_wrap" class="header_wrap" style="padding-top: 30px;">
+			<div id="header" class="header round">
+				<div class="light-bulb" alt=""></div>
+				<div class="ieSuggest">浏览本网站建议您使用 Chrome、FireFox、Opera、IE9 等浏览器（只要不是 IE6 7 8 就行）, 速度会更快，画面会更炫！</div>
+				<div class="google_plus"><g:plusone></g:plusone></div>
+				<div class="header-text">
+					<h1><em>zTree v3.5.15 API 文档</em></h1><p></p>
+					<p>all.js = core + excheck + exedit ( 不包括 exhide ); 发现错误请及时通知，谢谢。</p>
+				</div>
+				<ul class="shortcuts language" style="top:0;">
+					<li><a href="API_en.html" onclick="window.location.href='API_en.html'"><button class="ico en" title="英文版" type="button"></button><span class=""></span></a></li>
+				</ul>
+			</div>
+		</div>
+		<div id="content_wrap" class="content_wrap">
+			<div id="content" class="content">
+				<div class="nav_section">
+					<ul>
+						<li class="first">注释：</li>
+						<li><button class="ico16 z_core" onfocus="this.blur();"></button><span>core 核心包</span></li>
+						<li><button class="ico16 z_check" onfocus="this.blur();"></button><span>excheck 扩展</span></li>
+						<li><button class="ico16 z_edit" onfocus="this.blur();"></button><span>exedit 扩展</span></li>
+						<li><button class="ico16 z_hide" onfocus="this.blur();"></button><span>exhide 扩展</span></li>
+						<li class="noline">
+							<button class="ico16 z_search" onfocus="this.blur();" title="Enter 以及 左、右键可以快速定位查找结果"></button>
+							<input type="text" class="searchKey search empty" value=""><input type="text" class="searchResult search" value="">
+							<button class="ico16 searchPrev disabled" onfocus="this.blur();" title="Enter 以及 左、右键可以快速定位查找结果"></button><button class="ico16 searchNext disabled" onfocus="this.blur();" title="Enter 以及 左、右键可以快速定位查找结果"></button>
+						</li>
+					</ul>
+				</div>
+
+				<div id="contentBox" class="contentBox round clearfix">
+					<div id="apiContent" class="apiContent">
+						<div id="api_setting" class="api_setting left">
+							<ul class="api_content_title"><li>setting 配置详解</li></ul>
+							<ul id="settingTree" class="ztree"></ul>
+						</div>
+						<div id="api_function" class="api_function right">
+							<ul class="api_content_title"><li>zTree 方法详解</li></ul>
+							<ul id="functionTree" class="ztree"></ul>
+							<ul class="api_content_title"><li>treeNode 节点数据详解</li></ul>
+							<ul id="treenodeTree" class="ztree"></ul>
+						</div>
+					</div>
+				</div>
+				<div class="clear"></div>
+			</div>
+		</div>
+
+		<!-- overlayed -->
+		<div id="overlayDiv" class="baby_overlay">
+			<div id="overlayContent" class="content round clearfix">
+				<div class="overlaySearch">
+					<button class="ico16 z_search" onfocus="this.blur();" title="Enter 以及 左、右键可以快速定位查找结果"></button>
+					<input type="text" class="searchKey search empty" value=""><input type="text" class="searchResult search" value="">
+					<button class="ico16 searchPrev disabled" onfocus="this.blur();" title="Enter 以及 左、右键可以快速定位查找结果"></button><button class="ico16 searchNext disabled" onfocus="this.blur();" title="Enter 以及 左、右键可以快速定位查找结果"></button>
+				</div>
+				<a id="overlayDivCloseBtn" class="close"></a>
+				<div id="overlayDetailDiv" class="details"></div>
+			</div>
+			<div id="overlayDivArrow" class="baby_overlay_arrow"></div>
+		</div>
+		<script type="text/javascript" src="apiCss/jquery-1.6.2.min.js"></script>
+		<script type='text/javascript' src='apiCss/jquery.ztree.core-3.5.js'></script>
+		<script type='text/javascript' src='apiCss/api.js'></script>
+		<script type="text/javascript">
+			$(document).ready(function(){
+				apiContent._init();
+			});
+		</script>
+	</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/API_en.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/API_en.html
new file mode 100644
index 0000000..69e0580
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/API_en.html
@@ -0,0 +1,102 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+		<title>API Document [zTree -- jQuery tree plug-ins.]</title>
+		<link rel="stylesheet" href="apiCss/common.css" type="text/css">
+		<link rel='stylesheet' href='apiCss/zTreeStyleForApi.css' type='text/css'>
+		<script type="text/javascript">
+			var ie = (function(){
+				var undef,
+				v = 3,
+				div = document.createElement('div'),
+				all = div.getElementsByTagName('i');
+				while (
+				div.innerHTML = '<!--[if gt IE ' + (++v) + ']><i></i><![endif]-->',
+				all[0]
+			);
+				return v > 4 ? v : undef;
+			}()), ie6 = (ie === 6),
+			path = window.location.pathname.replace(/.*\/([^\/\.]*)\..*/g,"$1"),
+			langLib = [];
+			ie = ie<9;
+			if(ie) {
+				document.write('<link rel="stylesheet" href="apiCss/common_ie6.css" type="text/css">');
+			}
+			var lang = "en",
+			ajaxMsg = "If you use chrome browser, please copy the API files to local webserver. \n\n( because chrome browser can't allow AJAX access to 'file://' )";
+		</script>
+	</head>
+	<body>
+		<div id="header_wrap" class="header_wrap" style="padding-top: 30px;">
+			<div id="header" class="header round">
+				<div class="light-bulb" alt=""></div>
+				<div class="ieSuggest">If you use the Chrome / FireFox / Opera / IE9 browser will be even more dazzling effect!</div>
+				<div class="google_plus"><g:plusone></g:plusone></div>
+				<div class="header-text">
+					<h1><em>zTree v3.5.15 API Document</em></h1><p></p>
+					<p>all.js = core + excheck + exedit ( without exhide ); if you found some mistakes please contact me.</p>
+				</div>
+				<ul class="shortcuts language" style="top:0;">
+					<li><a href="API_cn.html" onclick="window.location.href='API_cn.html'"><button class="ico cn" title="Chinese" type="button"></button><span class=""></span></a></li>
+				</ul>
+			</div>
+		</div>
+		<div id="content_wrap" class="content_wrap">
+			<div id="content" class="content">
+				<div class="nav_section">
+					<ul>
+						<li class="first">Notes: </li>
+						<li><button class="ico16 z_core" onfocus="this.blur();"></button><span>core package</span></li>
+						<li><button class="ico16 z_check" onfocus="this.blur();"></button><span>excheck pack</span></li>
+						<li><button class="ico16 z_edit" onfocus="this.blur();"></button><span>exedit pack</span></li>
+						<li><button class="ico16 z_hide" onfocus="this.blur();"></button><span>exhide pack</span></li>
+						<li class="noline">
+							<button class="ico16 z_search" onfocus="this.blur();" title="'Enter', 'left' and 'right' key can locate the search results quickly."></button>
+							<input type="text" class="searchKey search empty" value=""><input type="text" class="searchResult search" value="">
+							<button class="ico16 searchPrev disabled" onfocus="this.blur();" title="'Enter', 'left' and 'right' key can locate the search results quickly."></button><button class="ico16 searchNext disabled" onfocus="this.blur();" title="'Enter', 'left' and 'right' key can locate the search results quickly."></button>
+						</li>
+					</ul>
+				</div>
+
+				<div id="contentBox" class="contentBox round clearfix">
+					<div id="apiContent" class="apiContent">
+						<div id="api_setting" class="api_setting left">
+							<ul class="api_content_title"><li>setting details</li></ul>
+							<ul id="settingTree" class="ztree"></ul>
+						</div>
+						<div id="api_function" class="api_function right">
+							<ul class="api_content_title"><li>zTree method details</li></ul>
+							<ul id="functionTree" class="ztree"></ul>
+							<ul class="api_content_title"><li>treeNode data details</li></ul>
+							<ul id="treenodeTree" class="ztree"></ul>
+						</div>
+					</div>
+				</div>
+				<div class="clear"></div>
+			</div>
+		</div>
+
+		<!-- overlayed -->
+		<div id="overlayDiv" class="baby_overlay">
+			<div id="overlayContent" class="content round clearfix">
+				<div class="overlaySearch">
+					<button class="ico16 z_search" onfocus="this.blur();" title="'Enter', 'left' and 'right' key can locate the search results quickly."></button>
+					<input type="text" class="searchKey search empty" value=""><input type="text" class="searchResult search" value="">
+					<button class="ico16 searchPrev disabled" onfocus="this.blur();" title="'Enter', 'left' and 'right' key can locate the search results quickly."></button><button class="ico16 searchNext disabled" onfocus="this.blur();" title="'Enter', 'left' and 'right' key can locate the search results quickly."></button>
+				</div>
+				<a id="overlayDivCloseBtn" class="close"></a>
+				<div id="overlayDetailDiv" class="details"></div>
+			</div>
+			<div id="overlayDivArrow" class="baby_overlay_arrow"></div>
+		</div>
+		<script type="text/javascript" src="apiCss/jquery-1.6.2.min.js"></script>
+		<script type='text/javascript' src='apiCss/jquery.ztree.core-3.5.js'></script>
+		<script type='text/javascript' src='apiCss/api.js'></script>
+		<script type="text/javascript">
+			$(document).ready(function(){
+				apiContent._init();
+			});
+		</script>
+	</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/apiCss/api.js b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/apiCss/api.js
new file mode 100644
index 0000000..84fb59e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/apiCss/api.js
@@ -0,0 +1,591 @@
+var apiContent = {
+	zTree_Setting: null,
+	zTree_Node: null,
+	zTree_Function: null,
+	overlayDiv : null,
+	overlayContent : null,
+	overlayDetailDiv : null,
+	overlayCloseBtn: null,
+	overlayArrow: null,
+	contentBoxDiv : null,
+	settingDiv : null,
+	functionDiv : null,
+	overlaySearch: null,
+	searchKey: null,
+	searchResultInput: null,
+	searchPrevBtn: null,
+	searchNextBtn: null,
+	apiCache: {},
+	lastValue: "",
+	searchNodes: [],
+	searchNodesCur: 0,
+
+	_init: function() {
+		this.overlayDiv = $("#overlayDiv");
+		this.overlayContent = $("#overlayContent");
+		this.overlayDetailDiv = $("#overlayDetailDiv");
+		this.overlayCloseBtn = $("#overlayDivCloseBtn");
+		this.overlayArrow = $("#overlayDivArrow");
+		this.contentBoxDiv = $("#contentBox");
+		this.settingDiv = $("#api_setting");
+		this.functionDiv = $("#api_function");
+		this.searchKey = $(".searchKey");
+		this.overlaySearch = $(".overlaySearch");
+		this.searchResultInput = $(".searchResult");
+		this.searchPrevBtn = $(".searchPrev");
+		this.searchNextBtn = $(".searchNext");
+		var setting = {
+			view: {
+				fontCss: this.getFontCss,
+				showLine: false,
+				showIcon: this.showIcon,
+				showTitle: this.getTitle,
+				selectedMulti: false,
+				dblClickExpand: false
+			},
+			data: {
+				key: {
+					title: "tt"
+				},
+				simpleData: {
+					enable:true,
+					idKey: "id",
+					pIdKey: "pId",
+					rootPId: ""
+				}
+			},
+			callback: {
+				onNodeCreated: this.onNodeCreated,
+				beforeClick: this.beforeClick
+			}
+		}
+		var setting_nodes =[
+			{id:1, pId:0, t:"setting", name:"var setting = {", open:true},
+			{id:11, pId:1, t:"treeId", name:"treeId : \"\",", iconSkin:"core", showAPI:true},
+			{id:12, pId:1, t:"treeObj", name:"treeObj : null,", iconSkin:"core", showAPI:true},
+			{id:121, pId:1, name:""},
+
+			{id:20, pId:1, t:"async", name:"async : {", open:true},
+			{id:201, pId:20, t:"autoParam", name:"autoParam : [],", iconSkin:"core", showAPI:true},
+			{id:208, pId:20, t:"contentType", name:"contentType : \"application...\",", iconSkin:"core", showAPI:true},
+			{id:202, pId:20, t:"dataFilter", name:"dataFilter : null,", iconSkin:"core", showAPI:true},
+			{id:203, pId:20, t:"dataType", name:"dataType : \"text\",", iconSkin:"core", showAPI:true},
+			{id:204, pId:20, t:"enable", name:"enable : false,", iconSkin:"core", showAPI:true},
+			{id:205, pId:20, t:"otherParam", name:"otherParam : [],", iconSkin:"core", showAPI:true},
+			{id:206, pId:20, t:"type", name:"type : \"post\",", iconSkin:"core", showAPI:true},
+			{id:207, pId:20, t:"url", name:"url : \"\"", iconSkin:"core", showAPI:true},
+			{id:21, pId:1, name:"},"},
+			{id:22, pId:1, name:""},
+
+			{id:30, pId:1, t:"callback", name:"callback : {", open:true},
+			{id:3001, pId:30, t:"beforeAsync", name:"beforeAsync : null,", iconSkin:"core", showAPI:true},
+			{id:3002, pId:30, t:"beforeCheck", name:"beforeCheck : null,", iconSkin:"check", showAPI:true},
+			{id:3003, pId:30, t:"beforeClick", name:"beforeClick : null,", iconSkin:"core", showAPI:true},
+			{id:3004, pId:30, t:"beforeCollapse", name:"beforeCollapse : null,", iconSkin:"core", showAPI:true},
+			{id:3004, pId:30, t:"beforeDblClick", name:"beforeDblClick : null,", iconSkin:"core", showAPI:true},
+			{id:3005, pId:30, t:"beforeDrag", name:"beforeDrag : null,", iconSkin:"edit", showAPI:true},
+			{id:3006, pId:30, t:"beforeDragOpen", name:"beforeDragOpen : null,", iconSkin:"edit", showAPI:true},
+			{id:3007, pId:30, t:"beforeDrop", name:"beforeDrop : null,", iconSkin:"edit", showAPI:true},
+			{id:3029, pId:30, t:"beforeEditName", name:"beforeEditName : null,", iconSkin:"edit", showAPI:true},
+			{id:3008, pId:30, t:"beforeExpand", name:"beforeExpand : null,", iconSkin:"core", showAPI:true},
+			{id:3009, pId:30, t:"beforeMouseDown", name:"beforeMouseDown : null,", iconSkin:"core", showAPI:true},
+			{id:3010, pId:30, t:"beforeMouseUp", name:"beforeMouseUp : null,", iconSkin:"core", showAPI:true},
+			{id:3011, pId:30, t:"beforeRemove", name:"beforeRemove : null,", iconSkin:"edit", showAPI:true},
+			{id:3012, pId:30, t:"beforeRename", name:"beforeRename : null,", iconSkin:"edit", showAPI:true},
+			{id:3013, pId:30, t:"beforeRightClick", name:"beforeRightClick : null,", iconSkin:"core", showAPI:true},
+			{id:3014, pId:30, name:""},
+			{id:3015, pId:30, t:"onAsyncError", name:"onAsyncError : null,", iconSkin:"core", showAPI:true},
+			{id:3016, pId:30, t:"onAsyncSuccess", name:"onAsyncSuccess : null,", iconSkin:"core", showAPI:true},
+			{id:3017, pId:30, t:"onCheck", name:"onCheck : null,", iconSkin:"check", showAPI:true},
+			{id:3018, pId:30, t:"onClick", name:"onClick : null,", iconSkin:"core", showAPI:true},
+			{id:3019, pId:30, t:"onCollapse", name:"onCollapse : null,", iconSkin:"core", showAPI:true},
+			{id:3019, pId:30, t:"onDblClick", name:"onDblClick : null,", iconSkin:"core", showAPI:true},
+			{id:3020, pId:30, t:"onDrag", name:"onDrag : null,", iconSkin:"edit", showAPI:true},
+			{id:3021, pId:30, t:"onDrop", name:"onDrop : null,", iconSkin:"edit", showAPI:true},
+			{id:3022, pId:30, t:"onExpand", name:"onExpand : null,", iconSkin:"core", showAPI:true},
+			{id:3023, pId:30, t:"onMouseDown", name:"onMouseDown : null,", iconSkin:"core", showAPI:true},
+			{id:3024, pId:30, t:"onMouseUp", name:"onMouseUp : null,", iconSkin:"core", showAPI:true},
+			{id:3025, pId:30, t:"onNodeCreated", name:"onNodeCreated : null,", iconSkin:"core", showAPI:true},
+			{id:3026, pId:30, t:"onRemove", name:"onRemove : null,", iconSkin:"edit", showAPI:true},
+			{id:3027, pId:30, t:"onRename", name:"onRename : null,", iconSkin:"edit", showAPI:true},
+			{id:3028, pId:30, t:"onRightClick", name:"onRightClick : null", iconSkin:"core", showAPI:true},
+			{id:31, pId:1, name:"},"},
+			{id:32, pId:1, name:""},
+
+			{id:40, pId:1, t:"check", name:"check : {", open:true},
+			{id:405, pId:40, t:"autoCheckTrigger", name:"autoCheckTrigger : false,", iconSkin:"check", showAPI:true},
+			{id:401, pId:40, t:"chkboxType", name:"chkboxType : {\"Y\": \"ps\", \"N\": \"ps\"},", iconSkin:"check", showAPI:true},
+			{id:402, pId:40, t:"chkStyle", name:"chkStyle : \"checkbox\",", iconSkin:"check", showAPI:true},
+			{id:403, pId:40, t:"enable", name:"enable : false,", iconSkin:"check", showAPI:true},
+			{id:406, pId:40, t:"nocheckInherit", name:"nocheckInherit : false", iconSkin:"check", showAPI:true},
+			{id:407, pId:40, t:"chkDisabledInherit", name:"chkDisabledInherit : false", iconSkin:"check", showAPI:true},
+			{id:404, pId:40, t:"radioType", name:"radioType : \"level\"", iconSkin:"check", showAPI:true},
+			{id:41, pId:1, name:"},"},
+			{id:42, pId:1, name:""},
+
+			{id:50, pId:1, t:"data", name:"data : {", open:true},
+			{id:500, pId:50, t:"keep", name:"keep : {", open:true},
+			{id:5001, pId:500, t:"leaf", name:"leaf : false,", iconSkin:"core", showAPI:true},
+			{id:5002, pId:500, t:"parent", name:"parent : false", iconSkin:"core", showAPI:true},
+			{id:501, pId:50, name:"},"},
+
+			{id:510, pId:50, t:"key", name:"key : {", open:true},
+			{id:5101, pId:510, t:"checked", name:"checked : \"checked\",", iconSkin:"check", showAPI:true},
+			{id:5102, pId:510, t:"children", name:"children : \"children\",", iconSkin:"core", showAPI:true},
+			{id:5103, pId:510, t:"name", name:"name : \"name\",", iconSkin:"core", showAPI:true},
+			{id:5104, pId:510, t:"title", name:"title : \"\"", iconSkin:"core", showAPI:true},
+			{id:5105, pId:510, t:"url", name:"url : \"url\"", iconSkin:"core", showAPI:true},
+			{id:511, pId:50, name:"},"},
+
+			{id:520, pId:50, t:"simpleData", name:"simpleData : {", open:true},
+			{id:5201, pId:520, t:"enable", name:"enable : false,", iconSkin:"core", showAPI:true},
+			{id:5202, pId:520, t:"idKey", name:"idKey : \"id\",", iconSkin:"core", showAPI:true},
+			{id:5203, pId:520, t:"pIdKey", name:"pIdKey : \"pId\",", iconSkin:"core", showAPI:true},
+			{id:5204, pId:520, t:"rootPId", name:"rootPId : null", iconSkin:"core", showAPI:true},
+			{id:521, pId:50, name:"}"},
+			{id:51, pId:1, name:"},"},
+			{id:52, pId:1, name:""},
+
+			{id:60, pId:1, t:"edit", name:"edit : {", open:true},
+			{id:601, pId:60, t:"drag", name:"drag : {", open:true},
+			{id:60111, pId:601, t:"autoExpandTrigger", name:"autoExpandTrigger : true,", iconSkin:"edit", showAPI:true},
+			{id:60101, pId:601, t:"isCopy", name:"isCopy : true,", iconSkin:"edit", showAPI:true},
+			{id:60102, pId:601, t:"isMove", name:"isMove : true,", iconSkin:"edit", showAPI:true},
+			{id:60103, pId:601, t:"prev", name:"prev : true,", iconSkin:"edit", showAPI:true},
+			{id:60104, pId:601, t:"next", name:"next : true,", iconSkin:"edit", showAPI:true},
+			{id:60105, pId:601, t:"inner", name:"inner : true,", iconSkin:"edit", showAPI:true},
+			{id:60107, pId:601, t:"borderMax", name:"borderMax : 10,", iconSkin:"edit", showAPI:true},
+			{id:60108, pId:601, t:"borderMin", name:"borderMin : -5,", iconSkin:"edit", showAPI:true},
+			{id:60106, pId:601, t:"minMoveSize", name:"minMoveSize : 5,", iconSkin:"edit", showAPI:true},
+			{id:60109, pId:601, t:"maxShowNodeNum", name:"maxShowNodeNum : 5,", iconSkin:"edit", showAPI:true},
+			{id:60110, pId:601, t:"autoOpenTime", name:"autoOpenTime : 500", iconSkin:"edit", showAPI:true},
+			{id:602, pId:60, name:"},"},
+			{id:608, pId:60, t:"editNameSelectAll", name:"editNameSelectAll : false,", iconSkin:"edit", showAPI:true},
+			{id:603, pId:60, t:"enable", name:"enable : false,", iconSkin:"edit", showAPI:true},
+			{id:604, pId:60, t:"removeTitle", name:"removeTitle : \"remove\",", iconSkin:"edit", showAPI:true},
+			{id:605, pId:60, t:"renameTitle", name:"renameTitle : \"rename\",", iconSkin:"edit", showAPI:true},
+			{id:606, pId:60, t:"showRemoveBtn", name:"showRemoveBtn : true,", iconSkin:"edit", showAPI:true},
+			{id:607, pId:60, t:"showRenameBtn", name:"showRenameBtn : true", iconSkin:"edit", showAPI:true},
+			{id:61, pId:1, name:"},"},
+			{id:62, pId:1, name:""},
+
+			{id:70, pId:1, t:"view", name:"view : {", open:true},
+			{id:7001, pId:70, t:"addDiyDom", name:"addDiyDom : null,", iconSkin:"core", showAPI:true},
+			{id:7002, pId:70, t:"addHoverDom", name:"addHoverDom : null,", iconSkin:"edit", showAPI:true},
+			{id:7003, pId:70, t:"autoCancelSelected", name:"autoCancelSelected : true,", iconSkin:"core", showAPI:true},
+			{id:7004, pId:70, t:"dblClickExpand", name:"dblClickExpand : true,", iconSkin:"core", showAPI:true},
+			{id:7005, pId:70, t:"expandSpeed", name:"expandSpeed : \"fast\",", iconSkin:"core", showAPI:true},
+			{id:7006, pId:70, t:"fontCss", name:"fontCss : {},", iconSkin:"core", showAPI:true},
+			{id:7012, pId:70, t:"nameIsHTML", name:"nameIsHTML : false,", iconSkin:"core", showAPI:true},
+			{id:7007, pId:70, t:"removeHoverDom", name:"removeHoverDom : null,", iconSkin:"edit", showAPI:true},
+			{id:7008, pId:70, t:"selectedMulti", name:"selectedMulti : true,", iconSkin:"core", showAPI:true},
+			{id:7009, pId:70, t:"showIcon", name:"showIcon : true,", iconSkin:"core", showAPI:true},
+			{id:7010, pId:70, t:"showLine", name:"showLine : true,", iconSkin:"core", showAPI:true},
+			{id:7011, pId:70, t:"showTitle", name:"showTitle : true,", iconSkin:"core", showAPI:true},
+			{id:7012, pId:70, t:"txtSelectedEnable", name:"txtSelectedEnable : false", iconSkin:"core", showAPI:true},
+			{id:71, pId:1, name:"}"},
+
+			{id:2, pId:0, name:"}"}
+		];
+
+		var treenode_nodes =[
+			{id:1, pId:0, t:"treeNode", name:"treeNode : {", open:true},
+			{id:101, pId:1, t:"checked", name:"checked", iconSkin:"check", showAPI:true},
+			{id:102, pId:1, t:"children", name:"children", iconSkin:"core", showAPI:true},
+			{id:128, pId:1, t:"chkDisabled", name:"chkDisabled", iconSkin:"check", showAPI:true},
+			{id:127, pId:1, t:"click", name:"click", iconSkin:"core", showAPI:true},
+			{id:103, pId:1, t:"getCheckStatus", name:"getCheckStatus ()", iconSkin:"check", showAPI:true},
+			{id:104, pId:1, t:"getNextNode", name:"getNextNode ()", iconSkin:"core", showAPI:true},
+			{id:105, pId:1, t:"getParentNode", name:"getParentNode ()", iconSkin:"core", showAPI:true},
+			{id:106, pId:1, t:"getPreNode", name:"getPreNode ()", iconSkin:"core", showAPI:true},
+			{id:129, pId:1, t:"halfCheck", name:"halfCheck", iconSkin:"check", showAPI:true},
+			{id:107, pId:1, t:"icon", name:"icon", iconSkin:"core", showAPI:true},
+			{id:108, pId:1, t:"iconClose", name:"iconClose", iconSkin:"core", showAPI:true},
+			{id:109, pId:1, t:"iconOpen", name:"iconOpen", iconSkin:"core", showAPI:true},
+			{id:110, pId:1, t:"iconSkin", name:"iconSkin", iconSkin:"core", showAPI:true},
+			{id:131, pId:1, t:"isHidden", name:"isHidden", iconSkin:"hide", showAPI:true},
+			{id:111, pId:1, t:"isParent", name:"isParent", iconSkin:"core", showAPI:true},
+			{id:132, pId:1, t:"name", name:"name", iconSkin:"core", showAPI:true},
+			{id:112, pId:1, t:"nocheck", name:"nocheck", iconSkin:"check", showAPI:true},
+			{id:113, pId:1, t:"open", name:"open", iconSkin:"core", showAPI:true},
+			{id:133, pId:1, t:"target", name:"target", iconSkin:"core", showAPI:true},
+			{id:134, pId:1, t:"url", name:"url", iconSkin:"core", showAPI:true},
+			{id:114, pId:1, t:"diy", name:"*DIY*", iconSkin:"core", showAPI:true},
+			{id:115, pId:1, name:""},
+			{id:116, pId:1, t:"check_Child_State", name:"[check_Child_State]", iconSkin:"check", showAPI:true},
+			{id:117, pId:1, t:"check_Focus", name:"[check_Focus]", iconSkin:"check", showAPI:true},
+			{id:118, pId:1, t:"checkedOld", name:"[checkedOld]", iconSkin:"check", showAPI:true},
+			{id:119, pId:1, t:"editNameFlag", name:"[editNameFlag]", iconSkin:"edit", showAPI:true},
+			{id:120, pId:1, t:"isAjaxing", name:"[isAjaxing]", iconSkin:"core", showAPI:true},
+			{id:121, pId:1, t:"isFirstNode", name:"[isFirstNode]", iconSkin:"core", showAPI:true},
+			{id:122, pId:1, t:"isHover", name:"[isHover]", iconSkin:"edit", showAPI:true},
+			{id:123, pId:1, t:"isLastNode", name:"[isLastNode]", iconSkin:"core", showAPI:true},
+			{id:124, pId:1, t:"level", name:"[level]", iconSkin:"core", showAPI:true},
+			{id:125, pId:1, t:"parentTId", name:"[parentTId]", iconSkin:"core", showAPI:true},
+			{id:126, pId:1, t:"tId", name:"[tId]", iconSkin:"core", showAPI:true},
+			{id:130, pId:1, t:"zAsync", name:"[zAsync]", iconSkin:"core", showAPI:true},
+			{id:2, pId:0, name:"}"}
+		];
+
+		var function_nodes =[
+			{id:1, pId:0, t:"$.fn.zTree", name:"$.fn.zTree : {", open:true},
+			{id:11, pId:1, t:"init", name:"init (obj, zSetting, zNodes)", iconSkin:"core", showAPI:true},
+			{id:12, pId:1, t:"getZTreeObj", name:"getZTreeObj (treeId)", iconSkin:"core", showAPI:true},
+			{id:14, pId:1, t:"destroy", name:"destroy (treeId)", iconSkin:"core", showAPI:true},
+			{id:13, pId:1, t:"_z", name:"_z : {tools, view, event, data}", iconSkin:"core", showAPI:true},
+			{id:2, pId:0, name:"}"},
+			{id:3, pId:0, name:""},
+			{id:4, pId:0, t:"zTreeObj", name:"zTreeObj : {", open:true},
+			{id:401, pId:4, t:"setting", name:"setting", iconSkin:"core", showAPI:true},
+			{id:402, pId:4, t:"addNodes", name:"addNodes (parentNode, newNodes, isSilent)", iconSkin:"core", showAPI:true},
+			{id:403, pId:4, t:"cancelEditName", name:"cancelEditName (newName)", iconSkin:"edit", showAPI:true},
+			{id:404, pId:4, t:"cancelSelectedNode", name:"cancelSelectedNode (node)", iconSkin:"core", showAPI:true},
+			{id:405, pId:4, t:"checkAllNodes", name:"checkAllNodes (checked)", iconSkin:"check", showAPI:true},
+			{id:406, pId:4, t:"checkNode", name:"checkNode (node, checked, checkTypeFlag, callbackFlag)", iconSkin:"check", showAPI:true},
+			{id:407, pId:4, t:"copyNode", name:"copyNode (targetNode, node, moveType, isSilent)", iconSkin:"edit", showAPI:true},
+			{id:436, pId:4, t:"destroy", name:"destroy ()", iconSkin:"core", showAPI:true},
+			{id:408, pId:4, t:"editName", name:"editName (node)", iconSkin:"edit", showAPI:true},
+			{id:409, pId:4, t:"expandAll", name:"expandAll (expandFlag)", iconSkin:"core", showAPI:true},
+			{id:410, pId:4, t:"expandNode", name:"expandNode (node, expandFlag, sonSign, focus, callbackFlag)", iconSkin:"core", showAPI:true},
+			{id:411, pId:4, t:"getChangeCheckedNodes", name:"getChangeCheckedNodes ()", iconSkin:"check", showAPI:true},
+			{id:412, pId:4, t:"getCheckedNodes", name:"getCheckedNodes (checked)", iconSkin:"check", showAPI:true},
+			{id:413, pId:4, t:"getNodeByParam", name:"getNodeByParam (key, value, parentNode)", iconSkin:"core", showAPI:true},
+			{id:414, pId:4, t:"getNodeByTId", name:"getNodeByTId (tId)", iconSkin:"core", showAPI:true},
+			{id:415, pId:4, t:"getNodeIndex", name:"getNodeIndex (node)", iconSkin:"core", showAPI:true},
+			{id:416, pId:4, t:"getNodes", name:"getNodes ()", iconSkin:"core", showAPI:true},
+			{id:431, pId:4, t:"getNodesByFilter", name:"getNodesByFilter (filter, isSingle, parentNode, invokeParam)", iconSkin:"core", showAPI:true},
+			{id:417, pId:4, t:"getNodesByParam", name:"getNodesByParam (key, value, parentNode)", iconSkin:"core", showAPI:true},
+			{id:418, pId:4, t:"getNodesByParamFuzzy", name:"getNodesByParamFuzzy (key, value, parentNode)", iconSkin:"core", showAPI:true},
+			{id:419, pId:4, t:"getSelectedNodes", name:"getSelectedNodes ()", iconSkin:"core", showAPI:true},
+			{id:432, pId:4, t:"hideNode", name:"hideNode (node)", iconSkin:"hide", showAPI:true},
+			{id:433, pId:4, t:"hideNodes", name:"hideNodes (nodes)", iconSkin:"hide", showAPI:true},
+			{id:420, pId:4, t:"moveNode", name:"moveNode (targetNode, node, moveType, isSilent)", iconSkin:"edit", showAPI:true},
+			{id:421, pId:4, t:"reAsyncChildNodes", name:"reAsyncChildNodes (parentNode, reloadType, isSilent)", iconSkin:"core", showAPI:true},
+			{id:422, pId:4, t:"refresh", name:"refresh ()", iconSkin:"core", showAPI:true},
+			{id:423, pId:4, t:"removeChildNodes", name:"removeChildNodes (parentNode)", iconSkin:"core", showAPI:true},
+			{id:424, pId:4, t:"removeNode", name:"removeNode (node, callbackFlag)", iconSkin:"core", showAPI:true},
+			{id:425, pId:4, t:"selectNode", name:"selectNode (node, addFlag)", iconSkin:"core", showAPI:true},
+			{id:430, pId:4, t:"setChkDisabled", name:"setChkDisabled (node, disabled, inheritParent, inheritChildren)", iconSkin:"check", showAPI:true},
+			{id:426, pId:4, t:"setEditable", name:"setEditable (editable)", iconSkin:"edit", showAPI:true},
+			{id:434, pId:4, t:"showNode", name:"showNode (node)", iconSkin:"hide", showAPI:true},
+			{id:435, pId:4, t:"showNodes", name:"showNodes (nodes)", iconSkin:"hide", showAPI:true},
+			{id:427, pId:4, t:"transformToArray", name:"transformToArray (nodes)", iconSkin:"core", showAPI:true},
+			{id:428, pId:4, t:"transformTozTreeNodes", name:"transformTozTreeNodes (simpleNodes)", iconSkin:"core", showAPI:true},
+			{id:429, pId:4, t:"updateNode", name:"updateNode (node, checkTypeFlag)", iconSkin:"core", showAPI:true},
+			{id:5, pId:0, name:"}"}
+		];
+
+		apiContent.zTree_Setting = $.fn.zTree.init($("#settingTree"), $.fn.zTree._z.tools.clone(setting), setting_nodes);
+		apiContent.zTree_Node = $.fn.zTree.init($("#treenodeTree"), $.fn.zTree._z.tools.clone(setting), treenode_nodes);
+		apiContent.zTree_Function = $.fn.zTree.init($("#functionTree"), $.fn.zTree._z.tools.clone(setting), function_nodes);
+		this.bindEvent();
+
+	},
+	bindEvent: function() {
+		$(document).bind("keydown", this.listenKeyDown)
+		this.overlayCloseBtn.bind("click", apiContent.overlayClose);
+		this.searchResultInput.bind("click", function(e) {
+			$(this).prev().get(0).focus();
+			this.blur();
+		}).bind("focus", function(e) {
+			this.blur();
+		});
+		this.searchKey.bind("focus", this.focusKey)
+			.bind("blur", this.blurKey)
+			.bind("propertychange", this.searchNode)
+			.bind("input", this.searchNode);
+		this.searchPrevBtn.bind("click", this.searchPrev);
+		this.searchNextBtn.bind("click", this.searchNext);
+	},
+	setSameKey: function(value) {
+		apiContent.searchKey.attr("value", value);
+	},
+	focusKey: function(e) {
+		if (apiContent.searchKey.hasClass("empty")) {
+			apiContent.searchKey.removeClass("empty");
+		}
+	},
+	blurKey: function(e) {
+		apiContent.setSameKey(e.target.value);
+		if (e.target.value === "") {
+			apiContent.searchKey.addClass("empty");
+		}
+	},
+	listenKeyDown: function(e) {
+		if (e.keyCode=="13" && apiContent.overlayDiv.is(":hidden")) {
+			apiContent.openAPI();
+		} else if (e.keyCode=="37") {
+			apiContent.searchPrev();
+		} else if (e.keyCode=="13" || e.keyCode=="39") {
+			apiContent.searchNext();
+		}
+	},
+	openAPI: function() {
+		if (apiContent.searchNodes.length > 0) {
+			var setting_zTree = $.fn.zTree.getZTreeObj("settingTree"),
+			treenode_zTree = $.fn.zTree.getZTreeObj("treenodeTree"),
+			function_zTree = $.fn.zTree.getZTreeObj("functionTree");
+			if (apiContent.searchNodesCur < 0 || apiContent.searchNodesCur > apiContent.searchNodes.length -1) {
+				apiContent.searchNodesCur = 0;
+			}
+			var node = apiContent.searchNodes[apiContent.searchNodesCur];
+
+			if (node.tId.indexOf("setting") > -1) {
+				setting_zTree.selectNode(node);
+			} else if (node.tId.indexOf("treenode") > -1) {
+				treenode_zTree.selectNode(node);
+			} else {
+				function_zTree.selectNode(node);
+			}
+			apiContent.beforeClick(node.tId.substring(0, node.tId.indexOf("_")), node, true);
+			apiContent.searchCur();
+		}
+	},
+	searchNode: function(e) {
+		var setting_zTree = $.fn.zTree.getZTreeObj("settingTree"),
+		treenode_zTree = $.fn.zTree.getZTreeObj("treenodeTree"),
+		function_zTree = $.fn.zTree.getZTreeObj("functionTree");
+		if (apiContent.curKey == e.target.value) return;
+		apiContent.curKey = e.target.value;
+		var value = $.trim(apiContent.curKey);
+		apiContent.setSameKey(apiContent.curKey);
+		if (apiContent.searchKey.hasClass("empty")) {
+			value = "";
+			apiContent.searchResultInput.removeClass("noResult").attr("value","");
+		}
+		if (apiContent.lastValue === value) return;
+
+		apiContent.updateNodes(false);
+		apiContent.lastValue = value;
+		if (value === "" || value.length < 2) {
+			apiContent.searchNodes = [];
+			apiContent.searchNodesCur = -1;
+			apiContent.searchCur(true);
+			return;
+		}
+
+		var settingNodeList = setting_zTree.getNodesByFilter(apiContent.searchFilter);
+		var functionNodeList = function_zTree.getNodesByFilter(apiContent.searchFilter);
+		var treenodeNodeList = treenode_zTree.getNodesByFilter(apiContent.searchFilter);
+		apiContent.searchNodes = settingNodeList.concat(functionNodeList).concat(treenodeNodeList);
+		apiContent.searchNodesCur = -1;
+		apiContent.searchCur();
+		apiContent.updateNodes(true);
+	},
+	searchFilter: function(node) {
+		var value = $.trim(apiContent.searchKey.get(0).value).toLowerCase();
+		return (node.showAPI && node.name.toLowerCase().indexOf(value) > -1);
+	},
+	searchPrev: function(e) {
+		if (apiContent.searchPrevBtn.hasClass("disabled")) return;
+		apiContent.searchNodesCur--;
+		if (apiContent.searchNodesCur < 0 || apiContent.searchNodesCur > apiContent.searchNodes.length -1) {
+			apiContent.searchNodesCur = apiContent.searchNodes.length -1;
+		}
+		apiContent.openAPI();
+	},
+	searchNext: function(e) {
+		if (apiContent.searchNextBtn.hasClass("disabled")) return;
+		apiContent.searchNodesCur++;
+		apiContent.openAPI();
+	},
+	searchCur: function(init) {
+		var result = apiContent.searchNodes;
+		if (init) {
+			apiContent.searchResultInput.removeClass("noResult").attr("value","");
+		} else if (result.length == 0) {
+			apiContent.searchResultInput.addClass("noResult").attr("value","  [ 0 / 0 ]  ");
+		} else {
+			apiContent.searchResultInput.removeClass("noResult").attr("value"," [ " + (apiContent.searchNodesCur > -1 ? apiContent.searchNodesCur+1 : "?")+ " / " + result.length + " ] ");
+		}
+		if (result.length > 0) {
+			apiContent.searchPrevBtn.removeClass("disabled");
+			apiContent.searchNextBtn.removeClass("disabled");
+		} else {
+			apiContent.searchPrevBtn.addClass("disabled");
+			apiContent.searchNextBtn.addClass("disabled");
+		}
+	},
+	updateNodes: function(highlight) {
+		var setting_zTree = $.fn.zTree.getZTreeObj("settingTree"),
+		treenode_zTree = $.fn.zTree.getZTreeObj("treenodeTree"),
+		function_zTree = $.fn.zTree.getZTreeObj("functionTree"),
+		node = null;
+		for( var i=0, l=apiContent.searchNodes.length; i<l; i++) {
+			node = apiContent.searchNodes[i];
+			if (node.level > 0) {
+				node.highlight = highlight;
+				if (node.tId.indexOf("setting") > -1) {
+					setting_zTree.updateNode(node);
+				} else if (node.tId.indexOf("treenode") > -1) {
+					treenode_zTree.updateNode(node);
+				} else {
+					function_zTree.updateNode(node);
+				}
+			}
+		}
+	},
+	getFontCss: function(treeId, treeNode) {
+		return (!!treeNode.highlight) ? {color:"#A60000", "font-weight":"bold"} : {color:"#333", "font-weight":"normal"};
+	},
+	getTitle: function(treeId, node) {
+		var t = [], n = node;
+		while (n && !!n.t) {
+			t.push(n.t);
+			n = n.getParentNode();
+		}
+		t = t.reverse();
+		node.tt = t.join('.');
+		return true;
+	},
+	showIcon: function(treeId, node) {
+		return (!!node.iconSkin);
+	},
+	onNodeCreated: function (e, treeId, node) {
+		var a = $("#" + node.tId + "_a");
+		if (node.showAPI) {
+			a.attr("rel", "#overlayDiv");
+		} else {
+			a.css({cursor: "default"});
+		}
+	},
+	beforeClick: function (treeId, node, noClear) {
+		if (!node.showAPI) return false;
+		var o = $("#" + node.tId + "_a");
+		if (!!apiContent.apiCache[node.tId]) {
+			apiContent.tmpDiv.html(apiContent.apiCache[node.tId]);
+			apiContent.overlayShow(o, (apiContent.lastNode === node));
+		} else {
+			apiContent.overlayAjax(treeId, node);
+		}
+		apiContent.lastNode = node;
+		if (node.tId.indexOf("settingTree")>-1) {
+			apiContent.settingDiv.removeClass("right").addClass("left");
+			apiContent.functionDiv.removeClass("left").addClass("right");
+		} else {
+			apiContent.settingDiv.removeClass("left").addClass("right");
+			apiContent.functionDiv.removeClass("right").addClass("left");
+		}
+
+		if (!noClear) {
+			apiContent.clearSelectedNode();
+		}
+		return true;
+	},
+	clearSelectedNode: function() {
+		apiContent.zTree_Setting.cancelSelectedNode();
+		apiContent.zTree_Node.cancelSelectedNode();
+		apiContent.zTree_Function.cancelSelectedNode();
+	},
+	overlayAutoClose: function(e) {
+		var eId = e.target.id, eRel = e.target.getAttribute("rel"), eClass = e.target.className;
+		if (eId === "overlayDiv" || eId === "overlayDivArrow" || eClass.indexOf("searchPrev") > -1 || eClass.indexOf("searchNext") > -1 || !!eRel) return;
+		if (!$(e.target).parents("[rel]").length && !$(e.target).parents("#overlayDiv").length) {
+			apiContent.overlayClose();
+		}
+	},
+	overlayClose: function() {
+		var o = apiContent.overlayDiv;
+		o.stop();
+		apiContent.clearSelectedNode();
+		if (ie) {
+			o.hide();
+		} else {
+			setTimeout(function() {o.fadeTo("fast", 0, function(){o.hide();})}, 200);
+		}
+		$(document).unbind("click", apiContent.overlayAutoClose);
+	},
+	overlayShow: function(target, isSameNode) {
+		var w = $(window), o = apiContent.overlayDiv, a = apiContent.overlayArrow,
+		oc = apiContent.overlayContent, c = apiContent.contentBoxDiv,
+		t = target.offset().top - 30,
+		cMaxLeft = c.offset().left + c.outerWidth({margin:true}) - o.outerWidth({margin:true}) - 10,
+		l = Math.min(cMaxLeft, target.offset().left + target.width() + 40),
+		arrowT = target.offset().top + 16,
+		wMinTop = 100, footerHeight = 50, onlyFade = false,
+		wHeight = w.height(), wScrollTop=w.scrollTop(), wMaxTop = wHeight + wScrollTop - footerHeight;
+		if (!apiContent.overlayMaxTop) {
+			apiContent.overlayMaxTop = apiContent.contentBoxDiv.offset().top + apiContent.contentBoxDiv.height();
+		}
+		o.stop();
+		if (o.css("display") !== "block") {
+			o.css({top: t, left: l});
+			a.css({top:arrowT - t});
+			$(document).bind("click", apiContent.overlayAutoClose);
+		}
+		if (ie) {
+			onlyFade = true;
+			o.show();
+		} else {
+			o.fadeTo("fast", 1);
+		}
+
+		var h = apiContent.tmpDiv.outerHeight({margin:true}) + apiContent.overlaySearch.outerHeight();
+		if ((t + h) > wMaxTop) {
+			t = wMaxTop - h;
+		}
+		if ((t + h) > apiContent.overlayMaxTop) {
+			t = apiContent.overlayMaxTop - h;
+		}
+		t = Math.max(t, wScrollTop, wMinTop);
+		if ((t + h) > ($("body").height()-footerHeight-20)) {
+			o.css("padding-bottom", footerHeight + "px");
+		} else {
+			o.css("padding-bottom", "0");
+		}
+		apiContent.overlayDetailDiv.empty();
+		apiContent.overlayDetailDiv.append(apiContent.tmpDiv.children());
+		if (!onlyFade) {
+			onlyFade = (isSameNode && t === parseInt(o.css("top").replace("px", "")));
+		}
+
+		a.removeClass("reverse");
+		if ( (arrowT - t) > (h-55) ) {
+			a.addClass("reverse");
+			arrowT -= 55;
+		}
+
+		if (onlyFade) {
+			o.css({top: t, left: l});
+			oc.css({height: h});
+			a.css({top:arrowT - t});
+		} else {
+			o.animate({top: t, left: l}, {duration: "normal",easing: "swing", complete:null});
+			oc.animate({height: h}, {duration: "fast",easing: "swing", complete:null});
+			a.animate({top:arrowT - t}, {duration: "normal",easing: "linear", complete:null});
+		}
+	},
+	overlayAjax: function(treeId, node) {
+		var o = $("#" + node.tId + "_a");
+		if (node.isAjax) return;
+		node.isAjax = true;
+		$.ajax({
+			type: "get",
+			url: "" + lang + "/" + node.tt.replace("$.", "") + ".html",
+			data: null,
+			dataType: "text",
+			success: function(msg) {
+				if (!apiContent.tmpDiv) {
+					var tmpDiv = $(document.createElement("div"));
+					tmpDiv.addClass("baby_overlay_tmp");
+					$("body").append(tmpDiv)
+					apiContent.tmpDiv = $(document.createElement("div"));
+					apiContent.tmpDiv.addClass("details");
+					tmpDiv.append(apiContent.tmpDiv);
+
+				} else {
+					apiContent.tmpDiv.empty();
+				}
+				apiContent.tmpDiv.html(msg);
+				apiContent.overlayShow(o, false);
+				apiContent.apiCache[node.tId] = msg;
+				node.isAjax = false;
+			},
+			error: function(XMLHttpRequest, textStatus, errorThrown) {
+				alert(ajaxMsg)
+				if (apiContent.tmpDiv) apiContent.tmpDiv.empty();
+				node.isAjax = false;
+			}
+		});
+	}
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/apiCss/common.css b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/apiCss/common.css
new file mode 100644
index 0000000..78f910c
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/apiCss/common.css
@@ -0,0 +1,219 @@
+/* Resets */
+html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, font, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td {
+	margin: 0;padding: 0;border: 0;outline: 0;font-weight: inherit;font-style: inherit;font-size: 100%;font-family: inherit;vertical-align: baseline;}
+:focus {outline: 0;}
+body {color: #2f332a;font: 15px/21px Arial, Helvetica, simsun, sans-serif;background: #528036 url(img/background.jpg) no-repeat fixed 0 0;}
+p {padding-bottom: 20px;}
+ol, ul {list-style: none;}
+table {border-collapse: separate;border-spacing: 0;}
+caption, th, td {text-align: left;font-weight: normal;}
+strong {font-weight: bold;}
+em {font-style: italic;}
+hr {display: none;}
+.font1 {color: white;background-color: #528036;}
+.right {float: right;}
+.left {float: left;}
+.hide {display: none;}
+.round {-moz-border-radius: 15px;-webkit-border-radius: 15px;-khtml-border-radius: 15px;border-radius: 15px;}
+.clear {clear: both;}
+.clearfix {display: block;}
+.clearfix:after {content: ".";display: block;clear: both;visibility: hidden;line-height: 0;height: 0;}
+html[xmlns] .clearfix {display: block;}
+* html .clearfix {height: 1%;}
+
+/* Link Styles */
+a {color: #528036;}
+a:link, a:visited {text-decoration: none;}
+a:hover {color: #000;text-decoration: none;}
+a:active {text-decoration: none;}
+
+/* Headings */
+h1, h2, h3, h4, h5, h6 {color: #2f332a;font-weight: bold;font-family: Helvetica, Arial, simsun, sans-serif;padding-bottom: 5px;}
+h1 {font-size: 36px;line-height: 44px;}
+h2 {font-size: 20px;line-height: 20px;}
+h3 {font-size: 14px;line-height: 14px;}
+h4 {font-size: 14px;font-weight: normal;line-height: 25px;}
+
+/* Wraps */
+.header_wrap {position: relative;min-width: 940px;padding: 100px 30px 0 30px;}
+.content_wrap {position: relative;min-width: 940px;padding: 0 30px 50px 30px;}
+.footer_wrap {bottom: 0;height: 47px;width: 100%;background-color: #1b1b1b;border-top: 1px solid #749e58;}
+
+/* Header */
+.header {position: relative;width: 940px;margin: 0 auto;height: 160px;border: 1px solid white;background: transparent url(img/header-bg.png) repeat-x 0 -50px;}
+.header-text {padding: 40px 25px 15px 120px;font-size: 18px;line-height: 24px;color: #747d67;font-family: Helvetica, sans-serif;}
+.header-text img {padding-bottom: 5px;}
+.shortcuts {white-space: nowrap;text-align: right;position: absolute;top: -45px;right: 5px;}
+.shortcuts.language {top: -85px;right:0px;}
+.shortcuts li {display: inline;font-size: 18px;line-height: 28px;font-family: Helvetica, Arial, simsun, sans-serif;padding-bottom: 5px;margin-left: 30px;cursor: pointer;}
+.shortcuts li button {cursor: pointer;}
+.shortcuts li span {border-bottom: 1px dotted white;}
+.shortcuts li span.selected {padding: 2px;background-color: #528036;}
+.shortcuts li a {color: #fff;}
+.ieSuggest {display:none;font-size: 12px;color: silver;position: absolute;left: 10px;top: 2px;}
+.google_plus {position: absolute;right: 10px; top:10px;}
+.light-bulb {position: absolute;left: -20px;bottom: -35px;width:116px;height:180px;background-image:url(img/lightbulb.png);background-repeat: no-repeat;}
+
+/* Content */
+.content {position: relative;width: 940px;margin: 0 auto;}
+.nav_section {position: relative;height: 20px;font-family: "Myriad Pro", "Trebuchet MS", sans-serif;font-size: 15px;color: #253;padding: 20px 0;}
+.nav_section ul {position: absolute;right: 10px;}
+.nav_section ul li {display: inline;line-height: 20px;margin: 0 5px 0 20px;border-bottom: 1px dotted white;}
+.nav_section ul li.noline {border-bottom: 0;}
+.nav_section ul li a {color: #fff;}
+.nav_section ul li a.selected {padding: 2px;background-color: #528036;}
+.nav_section ul li.first {border: none;}
+.content .title {margin: 50px 30px 20px 70px;}
+.content li {margin-bottom: 5px;}
+.contentBox {position: relative;overflow: hidden;border: 1px solid white;min-height: 200px;line-height: 25px;background: transparent url(img/contact-bg.png) repeat-x 0 0;}
+
+.zTreeInfo {display:none;width: 940px;position: absolute;}
+.zTreeInfo p {padding-bottom: 50px;}
+.zTreeInfo-left {float: left;width: 280px;height:300px;padding: 0 50px 60px 75px;background:url(img/zTreeIntroduction.jpg) no-repeat 30px 30px;}
+.zTreeInfo-right {position: relative;float: right;width: 475px;padding: 0 50px 60px 0;}
+.zTreeInfo-right li {font-size: 12px;list-style-type: disc;}
+
+.license {display:none;width: 940px;position: absolute;}
+
+.donateInfo {display:block;width: 940px;position: absolute;}
+
+.links {display:none;width: 940px;position: absolute;}
+.links .content {float: left;width: 160px;height:200px;padding: 0 10px 10px 2px;text-align: center;}
+.links .content.first {margin-left: 30px;}
+
+.contact {display:none;width: 940px;position: absolute;}
+.contact .myhome { position: absolute; top:10px; left:620px; width:300px; height:266px; background: transparent url(img/myhome.gif) scroll no-repeat 0 0;}
+
+.siteTag {position: absolute;left: -16px;top: 109px;z-index: 10;width: 65px;height: 46px;padding:0;margin:0 10px 0 0;
+		 vertical-align:middle;border:0 none;background: transparent url(img/siteTag.png) scroll no-repeat 0 0;}
+.siteTag.tag_zTreeInfo {background-position: 0 0}
+.siteTag.tag_license {background-position: 0 -46px}
+.siteTag.tag_donate {background-position: 0 -92px}
+.siteTag.tag_contact {background-position: 0 -138px}
+
+.apiContent {width: 940px;}
+.apiContent .right {float: right;padding-right: 100px;}
+.apiContent .left {float: left;padding-right: 20px;border-right: 1px dotted silver;}
+.api_setting {position: relative;margin:20px 0 20px 20px;}
+.api_function {position: relative;margin:20px 0 20px 30px;padding-right: 10px;}
+.api_content_title {text-align: center;font-weight: bold;}
+
+.demoContent {width: 940px;}
+.demoContent .right {float: right;padding: 20px;width: 600px;}
+.demoContent .left {float: left;padding: 20px;}
+.demoContent iframe {width:600px;min-height: 530px;}
+
+.faqContent {width: 940px;}
+.faqContent .right {float: right;padding: 20px;width: 600px;}
+.faqContent .left {float: left;padding: 20px;}
+.faqContent iframe {width:600px;min-height: 300px;}
+
+.baby_overlay_tmp {position: absolute;top:0; left:-5000px;display:block;visibility: hidden;width:640px;font-size:11px;}
+.baby_overlay_tmp .details {padding: 20px;}
+.baby_overlay {display:none;position:absolute;z-index:99;left:0; top:0;width:640px;color:#fff;font-size:11px;}
+.baby_overlay .content {width:100%; height:100px;overflow: hidden;background: transparent url(img/overlay_bg.png) scroll repeat 0 0;}
+.baby_overlay .details {padding:0 20px 20px 20px;}
+.baby_overlay .close {background-image:url(img/close.png);position:absolute; right:5px; top:5px;cursor:pointer;height:36px;width:36px;}
+.baby_overlay_arrow {background-image:url(img/overlay_arrow.png);background-position:0 0;position:absolute;height:40px;width:40px;left: -40px;}
+.baby_overlay_arrow.reverse {background-position:0 -40px;}
+
+/* Footer */
+.footer {position: relative;min-width: 1000px;font: 14px/24px arial, helvetica, sans-serif;}
+.footer ul {position:absolute;left: 0px;border:1px solid #393939;background:#262626;padding:12px 0px;line-height: 18px;display: none;list-style: none;}
+.footer ul li a {display:block;padding: 2px 15px;color: #9c9c9c;text-indent: 0;}
+.footer ul li a:hover {text-decoration:none;color: #fff;}
+.footer-logo {position:absolute;margin: 10px 0 0 30px;width:122px; height:24px;top:0; left:0;background: transparent url(img/footer-logo.png) no-repeat 0 0;}
+.footer_mii {position: absolute;right: 558px;top: 8px;z-index: 10;padding: 4px 0;}
+.footer_mii a {font-size:10px;color:#649140}
+.footer_mii a:hover {color:#B6D76F}
+.footer_siteMap {position: absolute;right: 358px;top: 8px;width: 155px;z-index: 10;padding: 4px 0;}
+.footer_siteMap .footer_siteMap_header {width:155px;text-indent: -9999px;background: transparent url(img/footer_siteMap.gif) no-repeat 0 0;}
+.footer_siteMap ul {top:-202px;width:180px;}
+.footer_siteMap:hover ul {left: 0}
+.footer_contact {position: absolute;right: 193px;top: 8px;width: 155px;z-index: 10;padding: 4px 0;}
+.footer_contact .footer_contact_header {width:155px;text-indent: -9999px;background: transparent url(img/footer_contact.gif) no-repeat 0px 0px;}
+.footer_contact ul {top:-113px;width:153px;}
+.footer_contact:hover ul {left: 0}
+.footer_download {position: absolute;right: 60px;top: 8px;width: 123px;z-index: 10;padding: 4px 0;}
+.footer_download .footer_download_header {width:123px;text-indent: -9999px;background: transparent url(img/footer_download.png) no-repeat 0px 0px;}
+.footer_download ul {top:-113px;width:140px;}
+.footer_download:hover ul {left: 0}
+
+/* button icon */
+button {vertical-align:middle;border:0 none;background: transparent no-repeat 0 0 scroll;}
+
+.shortcuts button.ico {width:24px; height:24px;padding:0; margin:0 10px 0 0;background-image:url(img/menuIcon.png)}
+.shortcuts button.home {background-position: 0 0}
+.shortcuts button.demo {background-position: 0 -24px}
+.shortcuts button.api {background-position: 0 -48px}
+.shortcuts button.faq {background-position: 0 -72px}
+.shortcuts button.donate {background-position: 0 -144px}
+.shortcuts button.download {background-position: 0 -96px}
+.shortcuts button.face {background-position: 0 -120px}
+.shortcuts button.cn {width:48px; height:24px;padding:0; margin:0 10px 0 0;background-image:url(img/chinese.png)}
+.shortcuts button.en {width:48px; height:24px;padding:0; margin:0 10px 0 0;background-image:url(img/english.png)}
+
+.content button.ico {width:24px; height:24px;padding:0; margin:0 10px 0 0;}
+
+.content button.ico16 {width:16px; height:16px;padding:0; margin:0 5px 0 0;background-image:url("img/apiMenu.png");}
+button.z_core {margin-top: -4px;background-position:0 0;}
+button.z_check {margin-top: -4px;background-position:0 -16px;}
+button.z_edit {margin-top: -4px;background-position:0 -32px;}
+button.z_hide {margin-top: -4px;background-position:0 -64px;}
+button.z_search {margin-top: -4px;background-position:0 -48px;}
+button.searchPrev {margin-top: -4px;background-position:-16px 0;cursor:pointer}
+button.searchNext {margin-top: -4px;background-position:-16px -16px;cursor:pointer}
+button.searchPrev.disabled {margin-top: -4px;background-position:-16px -32px;cursor:auto}
+button.searchNext.disabled {margin-top: -4px;background-position:-16px -48px;cursor:auto}
+input.search {margin:0;padding:2px 0; border:0;}
+input.searchKey {width:150px;}
+input.searchResult {margin-left:-3px;width:65px;text-align:right;background-color:white;color:#707070}
+input.searchResult.noResult {background-color:#ff6666;color:black}
+.baby_overlay div.overlaySearch {text-align:right;padding-right:50px;padding-top:12px;}
+
+/* api overlay*/
+.apiDetail .topLine {border-top: 1px dashed #376B29;margin-top: 5px;padding-top: 5px;}
+.apiDetail .highlight_red {color:#A60000;}
+.apiDetail .highlight_green {color:#A7F43D;}
+.apiDetail h1, .apiDetail h2, .apiDetail h3, .apiDetail h4, .apiDetail h5, .apiDetail h6 {color: white;padding: 0;}
+.apiDetail h2 {color: #A7F43D;margin: 5px auto;padding: 5px;font-size: 20px;}
+.apiDetail h2 span {font-size: 14px;float: right;font-weight: normal;margin: 2px 20px 0 0;vertical-align: bottom;}
+.apiDetail h2 span.path {float: left;margin: 2px 0 0 0;vertical-align: bottom;}
+.apiDetail h3 {margin: 5px auto;padding: 5px;font-size: 14px;font-weight: normal;}
+.apiDetail h3 span.h3_info {margin-left: 20px;font-size: 12px;}
+.apiDetail h4 {margin: 0 auto;padding: 0 5px;font-size: 12px;font-weight: normal;line-height: 16px;}
+.apiDetail .desc h4 {color: black;}
+.apiDetail h4 b{width: 150px;display:inline-block;}
+.apiDetail h4 span{width: 230px;display:inline-block;}
+
+.apiDetail pre, .apiDetail .desc {background: #E8FCD6;color: black;margin: 10px;padding: 10px;display: block;}
+.apiDetail pre {word-wrap: break-word;}
+.apiDetail p{margin-left: 5px;padding: 0;}
+.apiDetail .longdesc {margin-top: 5px;}
+.apiDetail .longdesc p{font-size: 12px;line-height:1.5;margin:3px 0;}
+.apiDetail .longdesc b{font-size: 14px;}
+.apiDetail table {border-collapse:collapse;}
+.apiDetail table td {border:1px solid silver;text-align: center;vertical-align: middle;}
+.apiDetail table thead td {font-weight: bold}
+
+.apiDetail button {width:16px; height:16px; vertical-align:middle; border:0 none; cursor: pointer;
+	background-color:transparent; background-repeat:no-repeat; background-attachment: scroll;
+	background-image:url("zTreeStyle/img/zTreeStandard.png");}
+
+.apiDetail button.chk {width:13px; height:13px; margin:0 3px 2px 0; cursor: auto}
+.apiDetail button.chk.checkbox_false_full {background-position:0 0}
+.apiDetail button.chk.checkbox_false_full_focus {background-position:0 -14px}
+.apiDetail button.chk.checkbox_false_part {background-position:0 -28px}
+.apiDetail button.chk.checkbox_false_part_focus {background-position:0 -42px}
+.apiDetail button.chk.checkbox_true_full {background-position:-14px 0}
+.apiDetail button.chk.checkbox_true_full_focus {background-position:-14px -14px}
+.apiDetail button.chk.checkbox_true_part {background-position:-14px -28px}
+.apiDetail button.chk.checkbox_true_part_focus {background-position:-14px -42px}
+.apiDetail button.chk.radio_false_full {background-position:-28px 0}
+.apiDetail button.chk.radio_false_full_focus {background-position:-28px -14px}
+.apiDetail button.chk.radio_false_part {background-position:-28px -28px}
+.apiDetail button.chk.radio_false_part_focus {background-position:-28px -42px}
+.apiDetail button.chk.radio_true_full {background-position:-42px 0}
+.apiDetail button.chk.radio_true_full_focus {background-position:-42px -14px}
+.apiDetail button.chk.radio_true_part {background-position:-42px -28px}
+.apiDetail button.chk.radio_true_part_focus {background-position:-42px -42px}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/apiCss/common_ie6.css b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/apiCss/common_ie6.css
new file mode 100644
index 0000000..aacaf59
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/apiCss/common_ie6.css
@@ -0,0 +1,23 @@
+* html{
+/*	background-image:url(about:blank);*/
+	background-attachment:fixed;
+}
+html pre {word-wrap: break-word}
+.header {background-image: none;background-color: #F0F6E4;}
+
+.ieSuggest {display:block;}
+.shortcuts button.cn {filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='apiCss/img/chinese.png');background-image: none;}
+.shortcuts button.en {filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='apiCss/img/english.png');background-image: none;}
+
+.light-bulb {filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='apiCss/img/lightbulb.png');background-image: none;}
+.contentBox {background-image: none;background-color: #F0F6E4;}
+.zTreeInfo {background-image: none;background-color: #F0F6E4;}
+
+.content button.ico16 {*background-image:url("img/apiMenu.gif")}
+.siteTag {background-image: none;}
+.apiContent .right {float: right;padding-right: 50px;}
+
+div.baby_overlay {background-color: #3C6E31;background-image:none;color:#fff;}
+div.baby_overlay .close {filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='apiCss/img/overlay_close_IE6.gif');background-image: none;}
+.baby_overlay_arrow {background-image:url(img/overlay_arrow.gif);}
+.apiDetail button {background-image:url("img/zTreeStandard.gif")}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/apiCss/img/apiMenu.gif b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/apiCss/img/apiMenu.gif
new file mode 100644
index 0000000..066fc8e
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/apiCss/img/apiMenu.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/apiCss/img/apiMenu.png b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/apiCss/img/apiMenu.png
new file mode 100644
index 0000000..9acec50
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/apiCss/img/apiMenu.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/apiCss/img/background.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/apiCss/img/background.jpg
new file mode 100644
index 0000000..003375f
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/apiCss/img/background.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/apiCss/img/chinese.png b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/apiCss/img/chinese.png
new file mode 100644
index 0000000..d3b57fc
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/apiCss/img/chinese.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/apiCss/img/close.png b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/apiCss/img/close.png
new file mode 100644
index 0000000..69e41e3
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/apiCss/img/close.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/apiCss/img/contact-bg.png b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/apiCss/img/contact-bg.png
new file mode 100644
index 0000000..a3d7a5f
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/apiCss/img/contact-bg.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/apiCss/img/english.png b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/apiCss/img/english.png
new file mode 100644
index 0000000..2ad2d7d
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/apiCss/img/english.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/apiCss/img/header-bg.png b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/apiCss/img/header-bg.png
new file mode 100644
index 0000000..a2baacf
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/apiCss/img/header-bg.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/apiCss/img/lightbulb.png b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/apiCss/img/lightbulb.png
new file mode 100644
index 0000000..c99357a
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/apiCss/img/lightbulb.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/apiCss/img/overlay_arrow.gif b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/apiCss/img/overlay_arrow.gif
new file mode 100644
index 0000000..e7c3e6d
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/apiCss/img/overlay_arrow.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/apiCss/img/overlay_arrow.png b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/apiCss/img/overlay_arrow.png
new file mode 100644
index 0000000..d790a11
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/apiCss/img/overlay_arrow.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/apiCss/img/overlay_bg.png b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/apiCss/img/overlay_bg.png
new file mode 100644
index 0000000..5f81ee6
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/apiCss/img/overlay_bg.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/apiCss/img/overlay_close_IE6.gif b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/apiCss/img/overlay_close_IE6.gif
new file mode 100644
index 0000000..42cb8d8
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/apiCss/img/overlay_close_IE6.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/apiCss/img/zTreeStandard.gif b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/apiCss/img/zTreeStandard.gif
new file mode 100644
index 0000000..3f69a5b
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/apiCss/img/zTreeStandard.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/apiCss/img/zTreeStandard.png b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/apiCss/img/zTreeStandard.png
new file mode 100644
index 0000000..33c9e84
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/apiCss/img/zTreeStandard.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/apiCss/jquery-1.6.2.min.js b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/apiCss/jquery-1.6.2.min.js
new file mode 100644
index 0000000..8cdc80e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/apiCss/jquery-1.6.2.min.js
@@ -0,0 +1,18 @@
+/*!
+ * jQuery JavaScript Library v1.6.2
+ * http://jquery.com/
+ *
+ * Copyright 2011, John Resig
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * Includes Sizzle.js
+ * http://sizzlejs.com/
+ * Copyright 2011, The Dojo Foundation
+ * Released under the MIT, BSD, and GPL Licenses.
+ *
+ * Date: Thu Jun 30 14:16:56 2011 -0400
+ */
+(function(a,b){function cv(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cs(a){if(!cg[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){ch||(ch=c.createElement("iframe"),ch.frameBorder=ch.width=ch.height=0),b.appendChild(ch);if(!ci||!ch.createElement)ci=(ch.contentWindow||ch.contentDocument).document,ci.write((c.compatMode==="CSS1Compat"?"<!doctype html>":"")+"<html><body>"),ci.close();d=ci.createElement(a),ci.body.appendChild(d),e=f.css(d,"display"),b.removeChild(ch)}cg[a]=e}return cg[a]}function cr(a,b){var c={};f.each(cm.concat.apply([],cm.slice(0,b)),function(){c[this]=a});return c}function cq(){cn=b}function cp(){setTimeout(cq,0);return cn=f.now()}function cf(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ce(){try{return new a.XMLHttpRequest}catch(b){}}function b$(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g<i;g++){if(g===1)for(h in a.converters)typeof h=="string"&&(e[h.toLowerCase()]=a.converters[h]);l=k,k=d[g];if(k==="*")k=l;else if(l!=="*"&&l!==k){m=l+" "+k,n=e[m]||e["* "+k];if(!n){p=b;for(o in e){j=o.split(" ");if(j[0]===l||j[0]==="*"){p=e[j[1]+" "+k];if(p){o=e[o],o===!0?n=p:p===!0&&(n=o);break}}}}!n&&!p&&f.error("No conversion from "+m.replace(" "," to ")),n!==!0&&(c=n?n(c):p(o(c)))}}return c}function bZ(a,c,d){var e=a.contents,f=a.dataTypes,g=a.responseFields,h,i,j,k;for(i in g)i in d&&(c[g[i]]=d[i]);while(f[0]==="*")f.shift(),h===b&&(h=a.mimeType||c.getResponseHeader("content-type"));if(h)for(i in e)if(e[i]&&e[i].test(h)){f.unshift(i);break}if(f[0]in d)j=f[0];else{for(i in d){if(!f[0]||a.converters[i+" "+f[0]]){j=i;break}k||(k=i)}j=j||k}if(j){j!==f[0]&&f.unshift(j);return d[j]}}function bY(a,b,c,d){if(f.isArray(b))f.each(b,function(b,e){c||bC.test(a)?d(a,e):bY(a+"["+(typeof e=="object"||f.isArray(e)?b:"")+"]",e,c,d)});else if(!c&&b!=null&&typeof b=="object")for(var e in b)bY(a+"["+e+"]",b[e],c,d);else d(a,b)}function bX(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h=a[f],i=0,j=h?h.length:0,k=a===bR,l;for(;i<j&&(k||!l);i++)l=h[i](c,d,e),typeof l=="string"&&(!k||g[l]?l=b:(c.dataTypes.unshift(l),l=bX(a,c,d,e,l,g)));(k||!l)&&!g["*"]&&(l=bX(a,c,d,e,"*",g));return l}function bW(a){return function(b,c){typeof b!="string"&&(c=b,b="*");if(f.isFunction(c)){var d=b.toLowerCase().split(bN),e=0,g=d.length,h,i,j;for(;e<g;e++)h=d[e],j=/^\+/.test(h),j&&(h=h.substr(1)||"*"),i=a[h]=a[h]||[],i[j?"unshift":"push"](c)}}}function bA(a,b,c){var d=b==="width"?a.offsetWidth:a.offsetHeight,e=b==="width"?bv:bw;if(d>0){c!=="border"&&f.each(e,function(){c||(d-=parseFloat(f.css(a,"padding"+this))||0),c==="margin"?d+=parseFloat(f.css(a,c+this))||0:d-=parseFloat(f.css(a,"border"+this+"Width"))||0});return d+"px"}d=bx(a,b,b);if(d<0||d==null)d=a.style[b]||0;d=parseFloat(d)||0,c&&f.each(e,function(){d+=parseFloat(f.css(a,"padding"+this))||0,c!=="padding"&&(d+=parseFloat(f.css(a,"border"+this+"Width"))||0),c==="margin"&&(d+=parseFloat(f.css(a,c+this))||0)});return d+"px"}function bm(a,b){b.src?f.ajax({url:b.src,async:!1,dataType:"script"}):f.globalEval((b.text||b.textContent||b.innerHTML||"").replace(be,"/*$0*/")),b.parentNode&&b.parentNode.removeChild(b)}function bl(a){f.nodeName(a,"input")?bk(a):"getElementsByTagName"in a&&f.grep(a.getElementsByTagName("input"),bk)}function bk(a){if(a.type==="checkbox"||a.type==="radio")a.defaultChecked=a.checked}function bj(a){return"getElementsByTagName"in a?a.getElementsByTagName("*"):"querySelectorAll"in a?a.querySelectorAll("*"):[]}function bi(a,b){var c;if(b.nodeType===1){b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase();if(c==="object")b.outerHTML=a.outerHTML;else if(c!=="input"||a.type!=="checkbox"&&a.type!=="radio"){if(c==="option")b.selected=a.defaultSelected;else if(c==="input"||c==="textarea")b.defaultValue=a.defaultValue}else a.checked&&(b.defaultChecked=b.checked=a.checked),b.value!==a.value&&(b.value=a.value);b.removeAttribute(f.expando)}}function bh(a,b){if(b.nodeType===1&&!!f.hasData(a)){var c=f.expando,d=f.data(a),e=f.data(b,d);if(d=d[c]){var g=d.events;e=e[c]=f.extend({},d);if(g){delete e.handle,e.events={};for(var h in g)for(var i=0,j=g[h].length;i<j;i++)f.event.add(b,h+(g[h][i].namespace?".":"")+g[h][i].namespace,g[h][i],g[h][i].data)}}}}function bg(a,b){return f.nodeName(a,"table")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function W(a,b,c){b=b||0;if(f.isFunction(b))return f.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return f.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var d=f.grep(a,function(a){return a.nodeType===1});if(R.test(b))return f.filter(b,d,!c);b=f.filter(b,d)}return f.grep(a,function(a,d){return f.inArray(a,b)>=0===c})}function V(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function N(a,b){return(a&&a!=="*"?a+".":"")+b.replace(z,"`").replace(A,"&")}function M(a){var b,c,d,e,g,h,i,j,k,l,m,n,o,p=[],q=[],r=f._data(this,"events");if(!(a.liveFired===this||!r||!r.live||a.target.disabled||a.button&&a.type==="click")){a.namespace&&(n=new RegExp("(^|\\.)"+a.namespace.split(".").join("\\.(?:.*\\.)?")+"(\\.|$)")),a.liveFired=this;var s=r.live.slice(0);for(i=0;i<s.length;i++)g=s[i],g.origType.replace(x,"")===a.type?q.push(g.selector):s.splice(i--,1);e=f(a.target).closest(q,a.currentTarget);for(j=0,k=e.length;j<k;j++){m=e[j];for(i=0;i<s.length;i++){g=s[i];if(m.selector===g.selector&&(!n||n.test(g.namespace))&&!m.elem.disabled){h=m.elem,d=null;if(g.preType==="mouseenter"||g.preType==="mouseleave")a.type=g.preType,d=f(a.relatedTarget).closest(g.selector)[0],d&&f.contains(h,d)&&(d=h);(!d||d!==h)&&p.push({elem:h,handleObj:g,level:m.level})}}}for(j=0,k=p.length;j<k;j++){e=p[j];if(c&&e.level>c)break;a.currentTarget=e.elem,a.data=e.handleObj.data,a.handleObj=e.handleObj,o=e.handleObj.origHandler.apply(e.elem,arguments);if(o===!1||a.isPropagationStopped()){c=e.level,o===!1&&(b=!1);if(a.isImmediatePropagationStopped())break}}return b}}function K(a,c,d){var e=f.extend({},d[0]);e.type=a,e.originalEvent={},e.liveFired=b,f.event.handle.call(c,e),e.isDefaultPrevented()&&d[0].preventDefault()}function E(){return!0}function D(){return!1}function m(a,c,d){var e=c+"defer",g=c+"queue",h=c+"mark",i=f.data(a,e,b,!0);i&&(d==="queue"||!f.data(a,g,b,!0))&&(d==="mark"||!f.data(a,h,b,!0))&&setTimeout(function(){!f.data(a,g,b,!0)&&!f.data(a,h,b,!0)&&(f.removeData(a,e,!0),i.resolve())},0)}function l(a){for(var b in a)if(b!=="toJSON")return!1;return!0}function k(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(j,"$1-$2").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNaN(d)?i.test(d)?f.parseJSON(d):d:parseFloat(d)}catch(g){}f.data(a,c,d)}else d=b}return d}var c=a.document,d=a.navigator,e=a.location,f=function(){function J(){if(!e.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(J,1);return}e.ready()}}var e=function(a,b){return new e.fn.init(a,b,h)},f=a.jQuery,g=a.$,h,i=/^(?:[^<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/\d/,n=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,o=/^[\],:{}\s]*$/,p=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,q=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,r=/(?:^|:|,)(?:\s*\[)+/g,s=/(webkit)[ \/]([\w.]+)/,t=/(opera)(?:.*version)?[ \/]([\w.]+)/,u=/(msie) ([\w.]+)/,v=/(mozilla)(?:.*? rv:([\w.]+))?/,w=/-([a-z])/ig,x=function(a,b){return b.toUpperCase()},y=d.userAgent,z,A,B,C=Object.prototype.toString,D=Object.prototype.hasOwnProperty,E=Array.prototype.push,F=Array.prototype.slice,G=String.prototype.trim,H=Array.prototype.indexOf,I={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=n.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.6.2",length:0,size:function(){return this.length},toArray:function(){return F.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?E.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),A.done(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(F.apply(this,arguments),"slice",F.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:E,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j<k;j++)if((a=arguments[j])!=null)for(c in a){d=i[c],f=a[c];if(i===f)continue;l&&f&&(e.isPlainObject(f)||(g=e.isArray(f)))?(g?(g=!1,h=d&&e.isArray(d)?d:[]):h=d&&e.isPlainObject(d)?d:{},i[c]=e.extend(l,h,f)):f!==b&&(i[c]=f)}return i},e.extend({noConflict:function(b){a.$===e&&(a.$=g),b&&a.jQuery===e&&(a.jQuery=f);return e},isReady:!1,readyWait:1,holdReady:function(a){a?e.readyWait++:e.ready(!0)},ready:function(a){if(a===!0&&!--e.readyWait||a!==!0&&!e.isReady){if(!c.body)return setTimeout(e.ready,1);e.isReady=!0;if(a!==!0&&--e.readyWait>0)return;A.resolveWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").unbind("ready")}},bindReady:function(){if(!A){A=e._Deferred();if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",B,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",B),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&J()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a&&typeof a=="object"&&"setInterval"in a},isNaN:function(a){return a==null||!m.test(a)||isNaN(a)},type:function(a){return a==null?String(a):I[C.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;if(a.constructor&&!D.call(a,"constructor")&&!D.call(a.constructor.prototype,"isPrototypeOf"))return!1;var c;for(c in a);return c===b||D.call(a,c)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw a},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(o.test(b.replace(p,"@").replace(q,"]").replace(r,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(b,c,d){a.DOMParser?(d=new DOMParser,c=d.parseFromString(b,"text/xml")):(c=new ActiveXObject("Microsoft.XMLDOM"),c.async="false",c.loadXML(b)),d=c.documentElement,(!d||!d.nodeName||d.nodeName==="parsererror")&&e.error("Invalid XML: "+b);return c},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(w,x)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g<h;)if(c.apply(a[g++],d)===!1)break}else if(i){for(f in a)if(c.call(a[f],f,a[f])===!1)break}else for(;g<h;)if(c.call(a[g],g,a[g++])===!1)break;return a},trim:G?function(a){return a==null?"":G.call(a)}:function(a){return a==null?"":(a+"").replace(k,"").replace(l,"")},makeArray:function(a,b){var c=b||[];if(a!=null){var d=e.type(a);a.length==null||d==="string"||d==="function"||d==="regexp"||e.isWindow(a)?E.call(c,a):e.merge(c,a)}return c},inArray:function(a,b){if(H)return H.call(b,a);for(var c=0,d=b.length;c<d;c++)if(b[c]===a)return c;return-1},merge:function(a,c){var d=a.length,e=0;if(typeof c.length=="number")for(var f=c.length;e<f;e++)a[d++]=c[e];else while(c[e]!==b)a[d++]=c[e++];a.length=d;return a},grep:function(a,b,c){var d=[],e;c=!!c;for(var f=0,g=a.length;f<g;f++)e=!!b(a[f],f),c!==e&&d.push(a[f]);return d},map:function(a,c,d){var f,g,h=[],i=0,j=a.length,k=a instanceof e||j!==b&&typeof j=="number"&&(j>0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i<j;i++)f=c(a[i],i,d),f!=null&&(h[h.length]=f);else for(g in a)f=c(a[g],g,d),f!=null&&(h[h.length]=f);return h.concat.apply([],h)},guid:1,proxy:function(a,c){if(typeof c=="string"){var d=a[c];c=a,a=d}if(!e.isFunction(a))return b;var f=F.call(arguments,2),g=function(){return a.apply(c,f.concat(F.call(arguments)))};g.guid=a.guid=a.guid||g.guid||e.guid++;return g},access:function(a,c,d,f,g,h){var i=a.length;if(typeof c=="object"){for(var j in c)e.access(a,j,c[j],f,g,d);return a}if(d!==b){f=!h&&f&&e.isFunction(d);for(var k=0;k<i;k++)g(a[k],c,f?d.call(a[k],k,g(a[k],c)):d,h);return a}return i?g(a[0],c):b},now:function(){return(new Date).getTime()},uaMatch:function(a){a=a.toLowerCase();var b=s.exec(a)||t.exec(a)||u.exec(a)||a.indexOf("compatible")<0&&v.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},sub:function(){function a(b,c){return new a.fn.init(b,c)}e.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function(d,f){f&&f instanceof e&&!(f instanceof a)&&(f=a(f));return e.fn.init.call(this,d,f,b)},a.fn.init.prototype=a.fn;var b=a(c);return a},browser:{}}),e.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){I["[object "+b+"]"]=b.toLowerCase()}),z=e.uaMatch(y),z.browser&&(e.browser[z.browser]=!0,e.browser.version=z.version),e.browser.webkit&&(e.browser.safari=!0),j.test(" ")&&(k=/^[\s\xA0]+/,l=/[\s\xA0]+$/),h=e(c),c.addEventListener?B=function(){c.removeEventListener("DOMContentLoaded",B,!1),e.ready()}:c.attachEvent&&(B=function(){c.readyState==="complete"&&(c.detachEvent("onreadystatechange",B),e.ready())});return e}(),g="done fail isResolved isRejected promise then always pipe".split(" "),h=[].slice;f.extend({_Deferred:function(){var a=[],b,c,d,e={done:function(){if(!d){var c=arguments,g,h,i,j,k;b&&(k=b,b=0);for(g=0,h=c.length;g<h;g++)i=c[g],j=f.type(i),j==="array"?e.done.apply(e,i):j==="function"&&a.push(i);k&&e.resolveWith(k[0],k[1])}return this},resolveWith:function(e,f){if(!d&&!b&&!c){f=f||[],c=1;try{while(a[0])a.shift().apply(e,f)}finally{b=[e,f],c=0}}return this},resolve:function(){e.resolveWith(this,arguments);return this},isResolved:function(){return!!c||!!b},cancel:function(){d=1,a=[];return this}};return e},Deferred:function(a){var b=f._Deferred(),c=f._Deferred(),d;f.extend(b,{then:function(a,c){b.done(a).fail(c);return this},always:function(){return b.done.apply(b,arguments).fail.apply(this,arguments)},fail:c.done,rejectWith:c.resolveWith,reject:c.resolve,isRejected:c.isResolved,pipe:function(a,c){return f.Deferred(function(d){f.each({done:[a,"resolve"],fail:[c,"reject"]},function(a,c){var e=c[0],g=c[1],h;f.isFunction(e)?b[a](function(){h=e.apply(this,arguments),h&&f.isFunction(h.promise)?h.promise().then(d.resolve,d.reject):d[g](h)}):b[a](d[g])})}).promise()},promise:function(a){if(a==null){if(d)return d;d=a={}}var c=g.length;while(c--)a[g[c]]=b[g[c]];return a}}),b.done(c.cancel).fail(b.cancel),delete b.cancel,a&&a.call(b,b);return b},when:function(a){function i(a){return function(c){b[a]=arguments.length>1?h.call(arguments,0):c,--e||g.resolveWith(g,h.call(b,0))}}var b=arguments,c=0,d=b.length,e=d,g=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred();if(d>1){for(;c<d;c++)b[c]&&f.isFunction(b[c].promise)?b[c].promise().then(i(c),g.reject):--e;e||g.resolveWith(g,b)}else g!==a&&g.resolveWith(g,d?[a]:[]);return g.promise()}}),f.support=function(){var a=c.createElement("div"),b=c.documentElement,d,e,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u;a.setAttribute("className","t"),a.innerHTML="   <link/><table></table><a href='/a' style='top:1px;float:left;opacity:.55;'>a</a><input type='checkbox'/>",d=a.getElementsByTagName("*"),e=a.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=a.getElementsByTagName("input")[0],k={leadingWhitespace:a.firstChild.nodeType===3,tbody:!a.getElementsByTagName("tbody").length,htmlSerialize:!!a.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55$/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:a.className!=="t",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0},i.checked=!0,k.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,k.optDisabled=!h.disabled;try{delete a.test}catch(v){k.deleteExpando=!1}!a.addEventListener&&a.attachEvent&&a.fireEvent&&(a.attachEvent("onclick",function(){k.noCloneEvent=!1}),a.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),k.radioValue=i.value==="t",i.setAttribute("checked","checked"),a.appendChild(i),l=c.createDocumentFragment(),l.appendChild(a.firstChild),k.checkClone=l.cloneNode(!0).cloneNode(!0).lastChild.checked,a.innerHTML="",a.style.width=a.style.paddingLeft="1px",m=c.getElementsByTagName("body")[0],o=c.createElement(m?"div":"body"),p={visibility:"hidden",width:0,height:0,border:0,margin:0},m&&f.extend(p,{position:"absolute",left:-1e3,top:-1e3});for(t in p)o.style[t]=p[t];o.appendChild(a),n=m||b,n.insertBefore(o,n.firstChild),k.appendChecked=i.checked,k.boxModel=a.offsetWidth===2,"zoom"in a.style&&(a.style.display="inline",a.style.zoom=1,k.inlineBlockNeedsLayout=a.offsetWidth===2,a.style.display="",a.innerHTML="<div style='width:4px;'></div>",k.shrinkWrapBlocks=a.offsetWidth!==2),a.innerHTML="<table><tr><td style='padding:0;border:0;display:none'></td><td>t</td></tr></table>",q=a.getElementsByTagName("td"),u=q[0].offsetHeight===0,q[0].style.display="",q[1].style.display="none",k.reliableHiddenOffsets=u&&q[0].offsetHeight===0,a.innerHTML="",c.defaultView&&c.defaultView.getComputedStyle&&(j=c.createElement("div"),j.style.width="0",j.style.marginRight="0",a.appendChild(j),k.reliableMarginRight=(parseInt((c.defaultView.getComputedStyle(j,null)||{marginRight:0}).marginRight,10)||0)===0),o.innerHTML="",n.removeChild(o);if(a.attachEvent)for(t in{submit:1,change:1,focusin:1})s="on"+t,u=s in a,u||(a.setAttribute(s,"return;"),u=typeof a[s]=="function"),k[t+"Bubbles"]=u;o=l=g=h=m=j=a=i=null;return k}(),f.boxModel=f.support.boxModel;var i=/^(?:\{.*\}|\[.*\])$/,j=/([a-z])([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!l(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g=f.expando,h=typeof c=="string",i,j=a.nodeType,k=j?f.cache:a,l=j?a[f.expando]:a[f.expando]&&f.expando;if((!l||e&&l&&!k[l][g])&&h&&d===b)return;l||(j?a[f.expando]=l=++f.uuid:l=f.expando),k[l]||(k[l]={},j||(k[l].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?k[l][g]=f.extend(k[l][g],c):k[l]=f.extend(k[l],c);i=k[l],e&&(i[g]||(i[g]={}),i=i[g]),d!==b&&(i[f.camelCase(c)]=d);if(c==="events"&&!i[c])return i[g]&&i[g].events;return h?i[f.camelCase(c)]||i[c]:i}},removeData:function(b,c,d){if(!!f.acceptData(b)){var e=f.expando,g=b.nodeType,h=g?f.cache:b,i=g?b[f.expando]:f.expando;if(!h[i])return;if(c){var j=d?h[i][e]:h[i];if(j){delete j[c];if(!l(j))return}}if(d){delete h[i][e];if(!l(h[i]))return}var k=h[i][e];f.support.deleteExpando||h!=a?delete h[i]:h[i]=null,k?(h[i]={},g||(h[i].toJSON=f.noop),h[i][e]=k):g&&(f.support.deleteExpando?delete b[f.expando]:b.removeAttribute?b.removeAttribute(f.expando):b[f.expando]=null)}},_data:function(a,b,c){return f.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=f.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),f.fn.extend({data:function(a,c){var d=null;if(typeof a=="undefined"){if(this.length){d=f.data(this[0]);if(this[0].nodeType===1){var e=this[0].attributes,g;for(var h=0,i=e.length;h<i;h++)g=e[h].name,g.indexOf("data-")===0&&(g=f.camelCase(g.substring(5)),k(this[0],g,d[g]))}}return d}if(typeof a=="object")return this.each(function(){f.data(this,a)});var j=a.split(".");j[1]=j[1]?"."+j[1]:"";if(c===b){d=this.triggerHandler("getData"+j[1]+"!",[j[0]]),d===b&&this.length&&(d=f.data(this[0],a),d=k(this[0],a,d));return d===b&&j[1]?this.data(j[0]):d}return this.each(function(){var b=f(this),d=[j[0],c];b.triggerHandler("setData"+j[1]+"!",d),f.data(this,a,c),b.triggerHandler("changeData"+j[1]+"!",d)})},removeData:function(a){return this.each(function(){f.removeData(this,a)})}}),f.extend({_mark:function(a,c){a&&(c=(c||"fx")+"mark",f.data(a,c,(f.data(a,c,b,!0)||0)+1,!0))},_unmark:function(a,c,d){a!==!0&&(d=c,c=a,a=!1);if(c){d=d||"fx";var e=d+"mark",g=a?0:(f.data(c,e,b,!0)||1)-1;g?f.data(c,e,g,!0):(f.removeData(c,e,!0),m(c,d,"mark"))}},queue:function(a,c,d){if(a){c=(c||"fx")+"queue";var e=f.data(a,c,b,!0);d&&(!e||f.isArray(d)?e=f.data(a,c,f.makeArray(d),!0):e.push(d));return e||[]}},dequeue:function(a,b){b=b||"fx";var c=f.queue(a,b),d=c.shift(),e;d==="inprogress"&&(d=c.shift()),d&&(b==="fx"&&c.unshift("inprogress"),d.call(a,function(){f.dequeue(a,b)})),c.length||(f.removeData(a,b+"queue",!0),m(a,b,"queue"))}}),f.fn.extend({queue:function(a,c){typeof a!="string"&&(c=a,a="fx");if(c===b)return f.queue(this[0],a);return this.each(function(){var b=f.queue(this,a,c);a==="fx"&&b[0]!=="inprogress"&&f.dequeue(this,a)})},dequeue:function(a){return this.each(function(){f.dequeue(this,a)})},delay:function(a,b){a=f.fx?f.fx.speeds[a]||a:a,b=b||"fx";return this.queue(b,function(){var c=this;setTimeout(function(){f.dequeue(c,b)},a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,c){function m(){--h||d.resolveWith(e,[e])}typeof a!="string"&&(c=a,a=b),a=a||"fx";var d=f.Deferred(),e=this,g=e.length,h=1,i=a+"defer",j=a+"queue",k=a+"mark",l;while(g--)if(l=f.data(e[g],i,b,!0)||(f.data(e[g],j,b,!0)||f.data(e[g],k,b,!0))&&f.data(e[g],i,f._Deferred(),!0))h++,l.done(m);m();return d.promise()}});var n=/[\n\t\r]/g,o=/\s+/,p=/\r/g,q=/^(?:button|input)$/i,r=/^(?:button|input|object|select|textarea)$/i,s=/^a(?:rea)?$/i,t=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,u=/\:|^on/,v,w;f.fn.extend({attr:function(a,b){return f.access(this,a,b,!0,f.attr)},removeAttr:function(a){return this.each(function(){f.removeAttr(this,a)})},prop:function(a,b){return f.access(this,a,b,!0,f.prop)},removeProp:function(a){a=f.propFix[a]||a;return this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,g,h,i;if(f.isFunction(a))return this.each(function(b){f(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(o);for(c=0,d=this.length;c<d;c++){e=this[c];if(e.nodeType===1)if(!e.className&&b.length===1)e.className=a;else{g=" "+e.className+" ";for(h=0,i=b.length;h<i;h++)~g.indexOf(" "+b[h]+" ")||(g+=b[h]+" ");e.className=f.trim(g)}}}return this},removeClass:function(a){var c,d,e,g,h,i,j;if(f.isFunction(a))return this.each(function(b){f(this).removeClass(a.call(this,b,this.className))});if(a&&typeof a=="string"||a===b){c=(a||"").split(o);for(d=0,e=this.length;d<e;d++){g=this[d];if(g.nodeType===1&&g.className)if(a){h=(" "+g.className+" ").replace(n," ");for(i=0,j=c.length;i<j;i++)h=h.replace(" "+c[i]+" "," ");g.className=f.trim(h)}else g.className=""}}return this},toggleClass:function(a,b){var c=typeof a,d=typeof b=="boolean";if(f.isFunction(a))return this.each(function(c){f(this).toggleClass(a.call(this,c,this.className,b),b)});return this.each(function(){if(c==="string"){var e,g=0,h=f(this),i=b,j=a.split(o);while(e=j[g++])i=d?i:!h.hasClass(e),h[i?"addClass":"removeClass"](e)}else if(c==="undefined"||c==="boolean")this.className&&f._data(this,"__className__",this.className),this.className=this.className||a===!1?"":f._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ";for(var c=0,d=this.length;c<d;c++)if((" "+this[c].className+" ").replace(n," ").indexOf(b)>-1)return!0;return!1},val:function(a){var c,d,e=this[0];if(!arguments.length){if(e){c=f.valHooks[e.nodeName.toLowerCase()]||f.valHooks[e.type];if(c&&"get"in c&&(d=c.get(e,"value"))!==b)return d;d=e.value;return typeof d=="string"?d.replace(p,""):d==null?"":d}return b}var g=f.isFunction(a);return this.each(function(d){var e=f(this),h;if(this.nodeType===1){g?h=a.call(this,d,e.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.nodeName.toLowerCase()]||f.valHooks[this.type];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c=a.selectedIndex,d=[],e=a.options,g=a.type==="select-one";if(c<0)return null;for(var h=g?c:0,i=g?c+1:e.length;h<i;h++){var j=e[h];if(j.selected&&(f.support.optDisabled?!j.disabled:j.getAttribute("disabled")===null)&&(!j.parentNode.disabled||!f.nodeName(j.parentNode,"optgroup"))){b=f(j).val();if(g)return b;d.push(b)}}if(g&&!d.length&&e.length)return f(e[c]).val();return d},set:function(a,b){var c=f.makeArray(b);f(a).find("option").each(function(){this.selected=f.inArray(f(this).val(),c)>=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attrFix:{tabindex:"tabIndex"},attr:function(a,c,d,e){var g=a.nodeType;if(!a||g===3||g===8||g===2)return b;if(e&&c in f.attrFn)return f(a)[c](d);if(!("getAttribute"in a))return f.prop(a,c,d);var h,i,j=g!==1||!f.isXMLDoc(a);j&&(c=f.attrFix[c]||c,i=f.attrHooks[c],i||(t.test(c)?i=w:v&&c!=="className"&&(f.nodeName(a,"form")||u.test(c))&&(i=v)));if(d!==b){if(d===null){f.removeAttr(a,c);return b}if(i&&"set"in i&&j&&(h=i.set(a,d,c))!==b)return h;a.setAttribute(c,""+d);return d}if(i&&"get"in i&&j&&(h=i.get(a,c))!==null)return h;h=a.getAttribute(c);return h===null?b:h},removeAttr:function(a,b){var c;a.nodeType===1&&(b=f.attrFix[b]||b,f.support.getSetAttribute?a.removeAttribute(b):(f.attr(a,b,""),a.removeAttributeNode(a.getAttributeNode(b))),t.test(b)&&(c=f.propFix[b]||b)in a&&(a[c]=!1))},attrHooks:{type:{set:function(a,b){if(q.test(a.nodeName)&&a.parentNode)f.error("type property can't be changed");else if(!f.support.radioValue&&b==="radio"&&f.nodeName(a,"input")){var c=a.value;a.setAttribute("type",b),c&&(a.value=c);return b}}},tabIndex:{get:function(a){var c=a.getAttributeNode("tabIndex");return c&&c.specified?parseInt(c.value,10):r.test(a.nodeName)||s.test(a.nodeName)&&a.href?0:b}},value:{get:function(a,b){if(v&&f.nodeName(a,"button"))return v.get(a,b);return b in a?a.value:null},set:function(a,b,c){if(v&&f.nodeName(a,"button"))return v.set(a,b,c);a.value=b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e=a.nodeType;if(!a||e===3||e===8||e===2)return b;var g,h,i=e!==1||!f.isXMLDoc(a);i&&(c=f.propFix[c]||c,h=f.propHooks[c]);return d!==b?h&&"set"in h&&(g=h.set(a,d,c))!==b?g:a[c]=d:h&&"get"in h&&(g=h.get(a,c))!==b?g:a[c]},propHooks:{}}),w={get:function(a,c){return f.prop(a,c)?c.toLowerCase():b},set:function(a,b,c){var d;b===!1?f.removeAttr(a,c):(d=f.propFix[c]||c,d in a&&(a[d]=!0),a.setAttribute(c,c.toLowerCase()));return c}},f.support.getSetAttribute||(f.attrFix=f.propFix,v=f.attrHooks.name=f.attrHooks.title=f.valHooks.button={get:function(a,c){var d;d=a.getAttributeNode(c);return d&&d.nodeValue!==""?d.nodeValue:b},set:function(a,b,c){var d=a.getAttributeNode(c);if(d){d.nodeValue=b;return b}}},f.each(["width","height"],function(a,b){f.attrHooks[b]=f.extend(f.attrHooks[b],{set:function(a,c){if(c===""){a.setAttribute(b,"auto");return c}}})})),f.support.hrefNormalized||f.each(["href","src","width","height"],function(a,c){f.attrHooks[c]=f.extend(f.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),f.support.style||(f.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=""+b}}),f.support.optSelected||(f.propHooks.selected=f.extend(f.propHooks.selected,{get:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex)}})),f.support.checkOn||f.each(["radio","checkbox"],function(){f.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),f.each(["radio","checkbox"],function(){f.valHooks[this]=f.extend(f.valHooks[this],{set:function(a,b){if(f.isArray(b))return a.checked=f.inArray(f(a).val(),b)>=0}})});var x=/\.(.*)$/,y=/^(?:textarea|input|select)$/i,z=/\./g,A=/ /g,B=/[^\w\s.|`]/g,C=function(a){return a.replace(B,"\\$&")};f.event={add:function(a,c,d,e){if(a.nodeType!==3&&a.nodeType!==8){if(d===!1)d=D;else if(!d)return;var g,h;d.handler&&(g=d,d=g.handler),d.guid||(d.guid=f.guid++);var i=f._data(a);if(!i)return;var j=i.events,k=i.handle;j||(i.events=j={}),k||(i.handle=k=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.handle.apply(k.elem,arguments):b}),k.elem=a,c=c.split(" ");var l,m=0,n;while(l=c[m++]){h=g?f.extend({},g):{handler:d,data:e},l.indexOf(".")>-1?(n=l.split("."),l=n.shift(),h.namespace=n.slice(0).sort().join(".")):(n=[],h.namespace=""),h.type=l,h.guid||(h.guid=d.guid);var o=j[l],p=f.event.special[l]||{};if(!o){o=j[l]=[];if(!p.setup||p.setup.call(a,e,n,k)===!1)a.addEventListener?a.addEventListener(l,k,!1):a.attachEvent&&a.attachEvent("on"+l,k)}p.add&&(p.add.call(a,h),h.handler.guid||(h.handler.guid=d.guid)),o.push(h),f.event.global[l]=!0}a=null}},global:{},remove:function(a,c,d,e){if(a.nodeType!==3&&a.nodeType!==8){d===!1&&(d=D);var g,h,i,j,k=0,l,m,n,o,p,q,r,s=f.hasData(a)&&f._data(a),t=s&&s.events;if(!s||!t)return;c&&c.type&&(d=c.handler,c=c.type);if(!c||typeof c=="string"&&c.charAt(0)==="."){c=c||"";for(h in t)f.event.remove(a,h+c);return}c=c.split(" ");while(h=c[k++]){r=h,q=null,l=h.indexOf(".")<0,m=[],l||(m=h.split("."),h=m.shift(),n=new RegExp("(^|\\.)"+f.map(m.slice(0).sort(),C).join("\\.(?:.*\\.)?")+"(\\.|$)")),p=t[h];if(!p)continue;if(!d){for(j=0;j<p.length;j++){q=p[j];if(l||n.test(q.namespace))f.event.remove(a,r,q.handler,j),p.splice(j--,1)}continue}o=f.event.special[h]||{};for(j=e||0;j<p.length;j++){q=p[j];if(d.guid===q.guid){if(l||n.test(q.namespace))e==null&&p.splice(j--,1),o.remove&&o.remove.call(a,q);if(e!=null)break}}if(p.length===0||e!=null&&p.length===1)(!o.teardown||o.teardown.call(a,m)===!1)&&f.removeEvent(a,h,s.handle),g=null,delete t[h]}if(f.isEmptyObject(t)){var u=s.handle;u&&(u.elem=null),delete s.events,delete s.handle,f.isEmptyObject(s)&&f.removeData(a,b,!0)}}},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(c,d,e,g){var h=c.type||c,i=[],j;h.indexOf("!")>=0&&(h=h.slice(0,-1),j=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.
+shift(),i.sort());if(!!e&&!f.event.customEvent[h]||!!f.event.global[h]){c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.exclusive=j,c.namespace=i.join("."),c.namespace_re=new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)");if(g||!e)c.preventDefault(),c.stopPropagation();if(!e){f.each(f.cache,function(){var a=f.expando,b=this[a];b&&b.events&&b.events[h]&&f.event.trigger(c,d,b.handle.elem)});return}if(e.nodeType===3||e.nodeType===8)return;c.result=b,c.target=e,d=d!=null?f.makeArray(d):[],d.unshift(c);var k=e,l=h.indexOf(":")<0?"on"+h:"";do{var m=f._data(k,"handle");c.currentTarget=k,m&&m.apply(k,d),l&&f.acceptData(k)&&k[l]&&k[l].apply(k,d)===!1&&(c.result=!1,c.preventDefault()),k=k.parentNode||k.ownerDocument||k===c.target.ownerDocument&&a}while(k&&!c.isPropagationStopped());if(!c.isDefaultPrevented()){var n,o=f.event.special[h]||{};if((!o._default||o._default.call(e.ownerDocument,c)===!1)&&(h!=="click"||!f.nodeName(e,"a"))&&f.acceptData(e)){try{l&&e[h]&&(n=e[l],n&&(e[l]=null),f.event.triggered=h,e[h]())}catch(p){}n&&(e[l]=n),f.event.triggered=b}}return c.result}},handle:function(c){c=f.event.fix(c||a.event);var d=((f._data(this,"events")||{})[c.type]||[]).slice(0),e=!c.exclusive&&!c.namespace,g=Array.prototype.slice.call(arguments,0);g[0]=c,c.currentTarget=this;for(var h=0,i=d.length;h<i;h++){var j=d[h];if(e||c.namespace_re.test(j.namespace)){c.handler=j.handler,c.data=j.data,c.handleObj=j;var k=j.handler.apply(this,g);k!==b&&(c.result=k,k===!1&&(c.preventDefault(),c.stopPropagation()));if(c.isImmediatePropagationStopped())break}}return c.result},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),fix:function(a){if(a[f.expando])return a;var d=a;a=f.Event(d);for(var e=this.props.length,g;e;)g=this.props[--e],a[g]=d[g];a.target||(a.target=a.srcElement||c),a.target.nodeType===3&&(a.target=a.target.parentNode),!a.relatedTarget&&a.fromElement&&(a.relatedTarget=a.fromElement===a.target?a.toElement:a.fromElement);if(a.pageX==null&&a.clientX!=null){var h=a.target.ownerDocument||c,i=h.documentElement,j=h.body;a.pageX=a.clientX+(i&&i.scrollLeft||j&&j.scrollLeft||0)-(i&&i.clientLeft||j&&j.clientLeft||0),a.pageY=a.clientY+(i&&i.scrollTop||j&&j.scrollTop||0)-(i&&i.clientTop||j&&j.clientTop||0)}a.which==null&&(a.charCode!=null||a.keyCode!=null)&&(a.which=a.charCode!=null?a.charCode:a.keyCode),!a.metaKey&&a.ctrlKey&&(a.metaKey=a.ctrlKey),!a.which&&a.button!==b&&(a.which=a.button&1?1:a.button&2?3:a.button&4?2:0);return a},guid:1e8,proxy:f.proxy,special:{ready:{setup:f.bindReady,teardown:f.noop},live:{add:function(a){f.event.add(this,N(a.origType,a.selector),f.extend({},a,{handler:M,guid:a.handler.guid}))},remove:function(a){f.event.remove(this,N(a.origType,a.selector),a)}},beforeunload:{setup:function(a,b,c){f.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}}},f.removeEvent=c.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){a.detachEvent&&a.detachEvent("on"+b,c)},f.Event=function(a,b){if(!this.preventDefault)return new f.Event(a,b);a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?E:D):this.type=a,b&&f.extend(this,b),this.timeStamp=f.now(),this[f.expando]=!0},f.Event.prototype={preventDefault:function(){this.isDefaultPrevented=E;var a=this.originalEvent;!a||(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){this.isPropagationStopped=E;var a=this.originalEvent;!a||(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=E,this.stopPropagation()},isDefaultPrevented:D,isPropagationStopped:D,isImmediatePropagationStopped:D};var F=function(a){var b=a.relatedTarget,c=!1,d=a.type;a.type=a.data,b!==this&&(b&&(c=f.contains(this,b)),c||(f.event.handle.apply(this,arguments),a.type=d))},G=function(a){a.type=a.data,f.event.handle.apply(this,arguments)};f.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){f.event.special[a]={setup:function(c){f.event.add(this,b,c&&c.selector?G:F,a)},teardown:function(a){f.event.remove(this,b,a&&a.selector?G:F)}}}),f.support.submitBubbles||(f.event.special.submit={setup:function(a,b){if(!f.nodeName(this,"form"))f.event.add(this,"click.specialSubmit",function(a){var b=a.target,c=b.type;(c==="submit"||c==="image")&&f(b).closest("form").length&&K("submit",this,arguments)}),f.event.add(this,"keypress.specialSubmit",function(a){var b=a.target,c=b.type;(c==="text"||c==="password")&&f(b).closest("form").length&&a.keyCode===13&&K("submit",this,arguments)});else return!1},teardown:function(a){f.event.remove(this,".specialSubmit")}});if(!f.support.changeBubbles){var H,I=function(a){var b=a.type,c=a.value;b==="radio"||b==="checkbox"?c=a.checked:b==="select-multiple"?c=a.selectedIndex>-1?f.map(a.options,function(a){return a.selected}).join("-"):"":f.nodeName(a,"select")&&(c=a.selectedIndex);return c},J=function(c){var d=c.target,e,g;if(!!y.test(d.nodeName)&&!d.readOnly){e=f._data(d,"_change_data"),g=I(d),(c.type!=="focusout"||d.type!=="radio")&&f._data(d,"_change_data",g);if(e===b||g===e)return;if(e!=null||g)c.type="change",c.liveFired=b,f.event.trigger(c,arguments[1],d)}};f.event.special.change={filters:{focusout:J,beforedeactivate:J,click:function(a){var b=a.target,c=f.nodeName(b,"input")?b.type:"";(c==="radio"||c==="checkbox"||f.nodeName(b,"select"))&&J.call(this,a)},keydown:function(a){var b=a.target,c=f.nodeName(b,"input")?b.type:"";(a.keyCode===13&&!f.nodeName(b,"textarea")||a.keyCode===32&&(c==="checkbox"||c==="radio")||c==="select-multiple")&&J.call(this,a)},beforeactivate:function(a){var b=a.target;f._data(b,"_change_data",I(b))}},setup:function(a,b){if(this.type==="file")return!1;for(var c in H)f.event.add(this,c+".specialChange",H[c]);return y.test(this.nodeName)},teardown:function(a){f.event.remove(this,".specialChange");return y.test(this.nodeName)}},H=f.event.special.change.filters,H.focus=H.beforeactivate}f.support.focusinBubbles||f.each({focus:"focusin",blur:"focusout"},function(a,b){function e(a){var c=f.event.fix(a);c.type=b,c.originalEvent={},f.event.trigger(c,null,c.target),c.isDefaultPrevented()&&a.preventDefault()}var d=0;f.event.special[b]={setup:function(){d++===0&&c.addEventListener(a,e,!0)},teardown:function(){--d===0&&c.removeEventListener(a,e,!0)}}}),f.each(["bind","one"],function(a,c){f.fn[c]=function(a,d,e){var g;if(typeof a=="object"){for(var h in a)this[c](h,d,a[h],e);return this}if(arguments.length===2||d===!1)e=d,d=b;c==="one"?(g=function(a){f(this).unbind(a,g);return e.apply(this,arguments)},g.guid=e.guid||f.guid++):g=e;if(a==="unload"&&c!=="one")this.one(a,d,e);else for(var i=0,j=this.length;i<j;i++)f.event.add(this[i],a,g,d);return this}}),f.fn.extend({unbind:function(a,b){if(typeof a=="object"&&!a.preventDefault)for(var c in a)this.unbind(c,a[c]);else for(var d=0,e=this.length;d<e;d++)f.event.remove(this[d],a,b);return this},delegate:function(a,b,c,d){return this.live(b,c,d,a)},undelegate:function(a,b,c){return arguments.length===0?this.unbind("live"):this.die(b,null,c,a)},trigger:function(a,b){return this.each(function(){f.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0])return f.event.trigger(a,b,this[0],!0)},toggle:function(a){var b=arguments,c=a.guid||f.guid++,d=0,e=function(c){var e=(f.data(this,"lastToggle"+a.guid)||0)%d;f.data(this,"lastToggle"+a.guid,e+1),c.preventDefault();return b[e].apply(this,arguments)||!1};e.guid=c;while(d<b.length)b[d++].guid=c;return this.click(e)},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}});var L={focus:"focusin",blur:"focusout",mouseenter:"mouseover",mouseleave:"mouseout"};f.each(["live","die"],function(a,c){f.fn[c]=function(a,d,e,g){var h,i=0,j,k,l,m=g||this.selector,n=g?this:f(this.context);if(typeof a=="object"&&!a.preventDefault){for(var o in a)n[c](o,d,a[o],m);return this}if(c==="die"&&!a&&g&&g.charAt(0)==="."){n.unbind(g);return this}if(d===!1||f.isFunction(d))e=d||D,d=b;a=(a||"").split(" ");while((h=a[i++])!=null){j=x.exec(h),k="",j&&(k=j[0],h=h.replace(x,""));if(h==="hover"){a.push("mouseenter"+k,"mouseleave"+k);continue}l=h,L[h]?(a.push(L[h]+k),h=h+k):h=(L[h]||h)+k;if(c==="live")for(var p=0,q=n.length;p<q;p++)f.event.add(n[p],"live."+N(h,m),{data:d,selector:m,handler:e,origType:h,origHandler:e,preType:l});else n.unbind("live."+N(h,m),e)}return this}}),f.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error".split(" "),function(a,b){f.fn[b]=function(a,c){c==null&&(c=a,a=null);return arguments.length>0?this.bind(b,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0)}),function(){function u(a,b,c,d,e,f){for(var g=0,h=d.length;g<h;g++){var i=d[g];if(i){var j=!1;i=i[a];while(i){if(i.sizcache===c){j=d[i.sizset];break}if(i.nodeType===1){f||(i.sizcache=c,i.sizset=g);if(typeof b!="string"){if(i===b){j=!0;break}}else if(k.filter(b,[i]).length>0){j=i;break}}i=i[a]}d[g]=j}}}function t(a,b,c,d,e,f){for(var g=0,h=d.length;g<h;g++){var i=d[g];if(i){var j=!1;i=i[a];while(i){if(i.sizcache===c){j=d[i.sizset];break}i.nodeType===1&&!f&&(i.sizcache=c,i.sizset=g);if(i.nodeName.toLowerCase()===b){j=i;break}i=i[a]}d[g]=j}}}var a=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d=0,e=Object.prototype.toString,g=!1,h=!0,i=/\\/g,j=/\W/;[0,0].sort(function(){h=!1;return 0});var k=function(b,d,f,g){f=f||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return f;var i,j,n,o,q,r,s,t,u=!0,w=k.isXML(d),x=[],y=b;do{a.exec(""),i=a.exec(y);if(i){y=i[3],x.push(i[1]);if(i[2]){o=i[3];break}}}while(i);if(x.length>1&&m.exec(b))if(x.length===2&&l.relative[x[0]])j=v(x[0]+x[1],d);else{j=l.relative[x[0]]?[d]:k(x.shift(),d);while(x.length)b=x.shift(),l.relative[b]&&(b+=x.shift()),j=v(b,j)}else{!g&&x.length>1&&d.nodeType===9&&!w&&l.match.ID.test(x[0])&&!l.match.ID.test(x[x.length-1])&&(q=k.find(x.shift(),d,w),d=q.expr?k.filter(q.expr,q.set)[0]:q.set[0]);if(d){q=g?{expr:x.pop(),set:p(g)}:k.find(x.pop(),x.length===1&&(x[0]==="~"||x[0]==="+")&&d.parentNode?d.parentNode:d,w),j=q.expr?k.filter(q.expr,q.set):q.set,x.length>0?n=p(j):u=!1;while(x.length)r=x.pop(),s=r,l.relative[r]?s=x.pop():r="",s==null&&(s=d),l.relative[r](n,s,w)}else n=x=[]}n||(n=j),n||k.error(r||b);if(e.call(n)==="[object Array]")if(!u)f.push.apply(f,n);else if(d&&d.nodeType===1)for(t=0;n[t]!=null;t++)n[t]&&(n[t]===!0||n[t].nodeType===1&&k.contains(d,n[t]))&&f.push(j[t]);else for(t=0;n[t]!=null;t++)n[t]&&n[t].nodeType===1&&f.push(j[t]);else p(n,f);o&&(k(o,h,f,g),k.uniqueSort(f));return f};k.uniqueSort=function(a){if(r){g=h,a.sort(r);if(g)for(var b=1;b<a.length;b++)a[b]===a[b-1]&&a.splice(b--,1)}return a},k.matches=function(a,b){return k(a,null,null,b)},k.matchesSelector=function(a,b){return k(b,null,null,[a]).length>0},k.find=function(a,b,c){var d;if(!a)return[];for(var e=0,f=l.order.length;e<f;e++){var g,h=l.order[e];if(g=l.leftMatch[h].exec(a)){var j=g[1];g.splice(1,1);if(j.substr(j.length-1)!=="\\"){g[1]=(g[1]||"").replace(i,""),d=l.find[h](g,b,c);if(d!=null){a=a.replace(l.match[h],"");break}}}}d||(d=typeof b.getElementsByTagName!="undefined"?b.getElementsByTagName("*"):[]);return{set:d,expr:a}},k.filter=function(a,c,d,e){var f,g,h=a,i=[],j=c,m=c&&c[0]&&k.isXML(c[0]);while(a&&c.length){for(var n in l.filter)if((f=l.leftMatch[n].exec(a))!=null&&f[2]){var o,p,q=l.filter[n],r=f[1];g=!1,f.splice(1,1);if(r.substr(r.length-1)==="\\")continue;j===i&&(i=[]);if(l.preFilter[n]){f=l.preFilter[n](f,j,d,i,e,m);if(!f)g=o=!0;else if(f===!0)continue}if(f)for(var s=0;(p=j[s])!=null;s++)if(p){o=q(p,f,s,j);var t=e^!!o;d&&o!=null?t?g=!0:j[s]=!1:t&&(i.push(p),g=!0)}if(o!==b){d||(j=i),a=a.replace(l.match[n],"");if(!g)return[];break}}if(a===h)if(g==null)k.error(a);else break;h=a}return j},k.error=function(a){throw"Syntax error, unrecognized expression: "+a};var l=k.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(a){return a.getAttribute("href")},type:function(a){return a.getAttribute("type")}},relative:{"+":function(a,b){var c=typeof b=="string",d=c&&!j.test(b),e=c&&!d;d&&(b=b.toLowerCase());for(var f=0,g=a.length,h;f<g;f++)if(h=a[f]){while((h=h.previousSibling)&&h.nodeType!==1);a[f]=e||h&&h.nodeName.toLowerCase()===b?h||!1:h===b}e&&k.filter(b,a,!0)},">":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!j.test(b)){b=b.toLowerCase();for(;e<f;e++){c=a[e];if(c){var g=c.parentNode;a[e]=g.nodeName.toLowerCase()===b?g:!1}}}else{for(;e<f;e++)c=a[e],c&&(a[e]=d?c.parentNode:c.parentNode===b);d&&k.filter(b,a,!0)}},"":function(a,b,c){var e,f=d++,g=u;typeof b=="string"&&!j.test(b)&&(b=b.toLowerCase(),e=b,g=t),g("parentNode",b,f,a,e,c)},"~":function(a,b,c){var e,f=d++,g=u;typeof b=="string"&&!j.test(b)&&(b=b.toLowerCase(),e=b,g=t),g("previousSibling",b,f,a,e,c)}},find:{ID:function(a,b,c){if(typeof b.getElementById!="undefined"&&!c){var d=b.getElementById(a[1]);return d&&d.parentNode?[d]:[]}},NAME:function(a,b){if(typeof b.getElementsByName!="undefined"){var c=[],d=b.getElementsByName(a[1]);for(var e=0,f=d.length;e<f;e++)d[e].getAttribute("name")===a[1]&&c.push(d[e]);return c.length===0?null:c}},TAG:function(a,b){if(typeof b.getElementsByTagName!="undefined")return b.getElementsByTagName(a[1])}},preFilter:{CLASS:function(a,b,c,d,e,f){a=" "+a[1].replace(i,"")+" ";if(f)return a;for(var g=0,h;(h=b[g])!=null;g++)h&&(e^(h.className&&(" "+h.className+" ").replace(/[\t\n\r]/g," ").indexOf(a)>=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(i,"")},TAG:function(a,b){return a[1].replace(i,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||k.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&k.error(a[0]);a[0]=d++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(i,"");!f&&l.attrMap[g]&&(a[1]=l.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(i,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=k(b[3],null,null,c);else{var g=k.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(l.match.POS.test(b[0])||l.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!k(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return b<c[3]-0},gt:function(a,b,c){return b>c[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=l.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||k.getText([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h<i;h++)if(g[h]===a)return!1;return!0}k.error(e)},CHILD:function(a,b){var c=b[1],d=a;switch(c){case"only":case"first":while(d=d.previousSibling)if(d.nodeType===1)return!1;if(c==="first")return!0;d=a;case"last":while(d=d.nextSibling)if(d.nodeType===1)return!1;return!0;case"nth":var e=b[2],f=b[3];if(e===1&&f===0)return!0;var g=b[0],h=a.parentNode;if(h&&(h.sizcache!==g||!a.nodeIndex)){var i=0;for(d=h.firstChild;d;d=d.nextSibling)d.nodeType===1&&(d.nodeIndex=++i);h.sizcache=g}var j=a.nodeIndex-f;return e===0?j===0:j%e===0&&j/e>=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=l.attrHandle[c]?l.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=l.setFilters[e];if(f)return f(a,c,b,d)}}},m=l.match.POS,n=function(a,b){return"\\"+(b-0+1)};for(var o in l.match)l.match[o]=new RegExp(l.match[o].source+/(?![^\[]*\])(?![^\(]*\))/.source),l.leftMatch[o]=new RegExp(/(^(?:.|\r|\n)*?)/.source+l.match[o].source.replace(/\\(\d+)/g,n));var p=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(q){p=function(a,b){var c=0,d=b||[];if(e.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var f=a.length;c<f;c++)d.push(a[c]);else for(;a[c];c++)d.push(a[c]);return d}}var r,s;c.documentElement.compareDocumentPosition?r=function(a,b){if(a===b){g=!0;return 0}if(!a.compareDocumentPosition||!b.compareDocumentPosition)return a.compareDocumentPosition?-1:1;return a.compareDocumentPosition(b)&4?-1:1}:(r=function(a,b){if(a===b){g=!0;return 0}if(a.sourceIndex&&b.sourceIndex)return a.sourceIndex-b.sourceIndex;var c,d,e=[],f=[],h=a.parentNode,i=b.parentNode,j=h;if(h===i)return s(a,b);if(!h)return-1;if(!i)return 1;while(j)e.unshift(j),j=j.parentNode;j=i;while(j)f.unshift(j),j=j.parentNode;c=e.length,d=f.length;for(var k=0;k<c&&k<d;k++)if(e[k]!==f[k])return s(e[k],f[k]);return k===c?s(a,f[k],-1):s(e[k],b,1)},s=function(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}),k.getText=function(a){var b="",c;for(var d=0;a[d];d++)c=a[d],c.nodeType===3||c.nodeType===4?b+=c.nodeValue:c.nodeType!==8&&(b+=k.getText(c.childNodes));return b},function(){var a=c.createElement("div"),d="script"+(new Date).getTime(),e=c.documentElement;a.innerHTML="<a name='"+d+"'/>",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(l.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},l.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(l.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(l.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=k,b=c.createElement("div"),d="__sizzle__";b.innerHTML="<p class='TEST'></p>";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){k=function(b,e,f,g){e=e||c;if(!g&&!k.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return p(e.getElementsByTagName(b),f);if(h[2]&&l.find.CLASS&&e.getElementsByClassName)return p(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return p([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return p([],f);if(i.id===h[3])return p([i],f)}try{return p(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var m=e,n=e.getAttribute("id"),o=n||d,q=e.parentNode,r=/^\s*[+~]/.test(b);n?o=o.replace(/'/g,"\\$&"):e.setAttribute("id",o),r&&q&&(e=e.parentNode);try{if(!r||q)return p(e.querySelectorAll("[id='"+o+"'] "+b),f)}catch(s){}finally{n||m.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)k[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}k.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!k.isXML(a))try{if(e||!l.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return k(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="<div class='test e'></div><div class='test'></div>";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;l.order.splice(1,0,"CLASS"),l.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?k.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?k.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:k.contains=function(){return!1},k.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var v=function(a,b){var c,d=[],e="",f=b.nodeType?[b]:b;while(c=l.match.PSEUDO.exec(a))e+=c[0],a=a.replace(l.match.PSEUDO,"");a=l.relative[a]?a+"*":a;for(var g=0,h=f.length;g<h;g++)k(a,f[g],d);return k.filter(e,d)};f.find=k,f.expr=k.selectors,f.expr[":"]=f.expr.filters,f.unique=k.uniqueSort,f.text=k.getText,f.isXMLDoc=k.isXML,f.contains=k.contains}();var O=/Until$/,P=/^(?:parents|prevUntil|prevAll)/,Q=/,/,R=/^.[^:#\[\.,]*$/,S=Array.prototype.slice,T=f.expr.match.POS,U={children:!0,contents:!0,next:!0,prev:!0};f.fn.extend({find:function(a){var b=this,c,d;if(typeof a!="string")return f(a).filter(function(){for(c=0,d=b.length;c<d;c++)if(f.contains(b[c],this))return!0});var e=this.pushStack("","find",a),g,h,i;for(c=0,d=this.length;c<d;c++){g=e.length,f.find(a,this[c],e);if(c>0)for(h=g;h<e.length;h++)for(i=0;i<g;i++)if(e[i]===e[h]){e.splice(h--,1);break}}return e},has:function(a){var b=f(a);return this.filter(function(){for(var a=0,c=b.length;a<c;a++)if(f.contains(this,b[a]))return!0})},not:function(a){return this.pushStack(W(this,a,!1),"not",a)},filter:function(a){return this.pushStack(W(this,a,!0),"filter",a)},is:function(a){return!!a&&(typeof a=="string"?f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h,i,j={},k=1;if(g&&a.length){for(d=0,e=a.length;d<e;d++)i=a[d],j[i]||(j[i]=T.test(i)?f(i,b||this.context):i);while(g&&g.ownerDocument&&g!==b){for(i in j)h=j[i],(h.jquery?h.index(g)>-1:f(g).is(h))&&c.push({selector:i,elem:g,level:k});g=g.parentNode,k++}}return c}var l=T.test(a)||typeof a!="string"?f(a,b||this.context):0;for(d=0,e=this.length;d<e;d++){g=this[d];while(g){if(l?l.index(g)>-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a||typeof a=="string")return f.inArray(this[0],a?f(a):this.parent().children());return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(V(c[0])||V(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling(a.parentNode.firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c),g=S.call(arguments);O.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!U[a]?f.unique(e):e,(this.length>1||Q.test(d))&&P.test(a)&&(e=e.reverse());return this.pushStack(e,a,g.join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var X=/ jQuery\d+="(?:\d+|null)"/g,Y=/^\s+/,Z=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,$=/<([\w:]+)/,_=/<tbody/i,ba=/<|&#?\w+;/,bb=/<(?:script|object|embed|option|style)/i,bc=/checked\s*(?:[^=]|=\s*.checked.)/i,bd=/\/(java|ecma)script/i,be=/^\s*<!(?:\[CDATA\[|\-\-)/,bf={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]};bf.optgroup=bf.option,bf.tbody=bf.tfoot=bf.colgroup=bf.caption=bf.thead,bf.th=bf.td,f.support.htmlSerialize||(bf._default=[1,"div<div>","</div>"]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){f(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f(arguments[0]).toArray());return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(X,""):null;if(typeof a=="string"&&!bb.test(a)&&(f.support.leadingWhitespace||!Y.test(a))&&!bf[($.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Z,"<$1></$2>");try{for(var c=0,d=this.length;c<d;c++)this[c].nodeType===1&&(f.cleanData(this[c].getElementsByTagName("*")),this[c].innerHTML=a)}catch(e){this.empty().append(a)}}else f.isFunction(a)?this.each(function(b){var c=f(this);c.html(a.call(this,b,c.html()))}):this.empty().append(a);return this},replaceWith:function(a){if(this[0]&&this[0].parentNode){if(f.isFunction(a))return this.each(function(b){var c=f(this),d=c.html();c.replaceWith(a.call(this,b,d))});typeof a!="string"&&(a=f(a).detach());return this.each(function(){var b=this.nextSibling,c=this.parentNode;f(this).remove(),b?f(b).before(a):f(c).append(a)})}return this.length?this.pushStack(f(f.isFunction(a)?a():a),"replaceWith",a):this},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,d){var e,g,h,i,j=a[0],k=[];if(!f.support.checkClone&&arguments.length===3&&typeof j=="string"&&bc.test(j))return this.each(function(){f(this).domManip(a,c,d,!0)});if(f.isFunction(j))return this.each(function(e){var g=f(this);a[0]=j.call(this,e,c?g.html():b),g.domManip(a,c,d)});if(this[0]){i=j&&j.parentNode,f.support.parentNode&&i&&i.nodeType===11&&i.childNodes.length===this.length?e={fragment:i}:e=f.buildFragment(a,this,k),h=e.fragment,h.childNodes.length===1?g=h=h.firstChild:g=h.firstChild;if(g){c=c&&f.nodeName(g,"tr");for(var l=0,m=this.length,n=m-1;l<m;l++)d.call(c?bg(this[l],g):this[l],e.cacheable||m>1&&l<n?f.clone(h,!0,!0):h)}k.length&&f.each(k,bm)}return this}}),f.buildFragment=function(a,b,d){var e,g,h,i;b&&b[0]&&(i=b[0].ownerDocument||b[0]),i.createDocumentFragment||(i=c),a.length===1&&typeof a[0]=="string"&&a[0].length<512&&i===c&&a[0].charAt(0)==="<"&&!bb.test(a[0])&&(f.support.checkClone||!bc.test(a[0]))&&(g=!0,h=f.fragments[a[0]],h&&h!==1&&(e=h)),e||(e=i.createDocumentFragment(),f.clean(a,i,e,d)),g&&(f.fragments[a[0]]=h?e:1);return{fragment:e,cacheable:g}},f.fragments={},f.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){f.fn[a]=function(c){var d=[],e=f(c),g=this.length===1&&this[0].parentNode;if(g&&g.nodeType===11&&g.childNodes.length===1&&e.length===1){e[b](this[0]);return this}for(var h=0,i=e.length;h<i;h++){var j=(h>0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j
+)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d=a.cloneNode(!0),e,g,h;if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bi(a,d),e=bj(a),g=bj(d);for(h=0;e[h];++h)bi(e[h],g[h])}if(b){bh(a,d);if(c){e=bj(a),g=bj(d);for(h=0;e[h];++h)bh(e[h],g[h])}}e=g=null;return d},clean:function(a,b,d,e){var g;b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var h=[],i;for(var j=0,k;(k=a[j])!=null;j++){typeof k=="number"&&(k+="");if(!k)continue;if(typeof k=="string")if(!ba.test(k))k=b.createTextNode(k);else{k=k.replace(Z,"<$1></$2>");var l=($.exec(k)||["",""])[1].toLowerCase(),m=bf[l]||bf._default,n=m[0],o=b.createElement("div");o.innerHTML=m[1]+k+m[2];while(n--)o=o.lastChild;if(!f.support.tbody){var p=_.test(k),q=l==="table"&&!p?o.firstChild&&o.firstChild.childNodes:m[1]==="<table>"&&!p?o.childNodes:[];for(i=q.length-1;i>=0;--i)f.nodeName(q[i],"tbody")&&!q[i].childNodes.length&&q[i].parentNode.removeChild(q[i])}!f.support.leadingWhitespace&&Y.test(k)&&o.insertBefore(b.createTextNode(Y.exec(k)[0]),o.firstChild),k=o.childNodes}var r;if(!f.support.appendChecked)if(k[0]&&typeof (r=k.length)=="number")for(i=0;i<r;i++)bl(k[i]);else bl(k);k.nodeType?h.push(k):h=f.merge(h,k)}if(d){g=function(a){return!a.type||bd.test(a.type)};for(j=0;h[j];j++)if(e&&f.nodeName(h[j],"script")&&(!h[j].type||h[j].type.toLowerCase()==="text/javascript"))e.push(h[j].parentNode?h[j].parentNode.removeChild(h[j]):h[j]);else{if(h[j].nodeType===1){var s=f.grep(h[j].getElementsByTagName("script"),g);h.splice.apply(h,[j+1,0].concat(s))}d.appendChild(h[j])}}return h},cleanData:function(a){var b,c,d=f.cache,e=f.expando,g=f.event.special,h=f.support.deleteExpando;for(var i=0,j;(j=a[i])!=null;i++){if(j.nodeName&&f.noData[j.nodeName.toLowerCase()])continue;c=j[f.expando];if(c){b=d[c]&&d[c][e];if(b&&b.events){for(var k in b.events)g[k]?f.event.remove(j,k):f.removeEvent(j,k,b.handle);b.handle&&(b.handle.elem=null)}h?delete j[f.expando]:j.removeAttribute&&j.removeAttribute(f.expando),delete d[c]}}}});var bn=/alpha\([^)]*\)/i,bo=/opacity=([^)]*)/,bp=/([A-Z]|^ms)/g,bq=/^-?\d+(?:px)?$/i,br=/^-?\d/,bs=/^[+\-]=/,bt=/[^+\-\.\de]+/g,bu={position:"absolute",visibility:"hidden",display:"block"},bv=["Left","Right"],bw=["Top","Bottom"],bx,by,bz;f.fn.css=function(a,c){if(arguments.length===2&&c===b)return this;return f.access(this,a,c,!0,function(a,c,d){return d!==b?f.style(a,c,d):f.css(a,c)})},f.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=bx(a,"opacity","opacity");return c===""?"1":c}return a.style.opacity}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":f.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!!a&&a.nodeType!==3&&a.nodeType!==8&&!!a.style){var g,h,i=f.camelCase(c),j=a.style,k=f.cssHooks[i];c=f.cssProps[i]||i;if(d===b){if(k&&"get"in k&&(g=k.get(a,!1,e))!==b)return g;return j[c]}h=typeof d;if(h==="number"&&isNaN(d)||d==null)return;h==="string"&&bs.test(d)&&(d=+d.replace(bt,"")+parseFloat(f.css(a,c)),h="number"),h==="number"&&!f.cssNumber[i]&&(d+="px");if(!k||!("set"in k)||(d=k.set(a,d))!==b)try{j[c]=d}catch(l){}}},css:function(a,c,d){var e,g;c=f.camelCase(c),g=f.cssHooks[c],c=f.cssProps[c]||c,c==="cssFloat"&&(c="float");if(g&&"get"in g&&(e=g.get(a,!0,d))!==b)return e;if(bx)return bx(a,c)},swap:function(a,b,c){var d={};for(var e in b)d[e]=a.style[e],a.style[e]=b[e];c.call(a);for(e in b)a.style[e]=d[e]}}),f.curCSS=f.css,f.each(["height","width"],function(a,b){f.cssHooks[b]={get:function(a,c,d){var e;if(c){if(a.offsetWidth!==0)return bA(a,b,d);f.swap(a,bu,function(){e=bA(a,b,d)});return e}},set:function(a,b){if(!bq.test(b))return b;b=parseFloat(b);if(b>=0)return b+"px"}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return bo.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle;c.zoom=1;var e=f.isNaN(b)?"":"alpha(opacity="+b*100+")",g=d&&d.filter||c.filter||"";c.filter=bn.test(g)?g.replace(bn,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){var c;f.swap(a,{display:"inline-block"},function(){b?c=bx(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(by=function(a,c){var d,e,g;c=c.replace(bp,"-$1").toLowerCase();if(!(e=a.ownerDocument.defaultView))return b;if(g=e.getComputedStyle(a,null))d=g.getPropertyValue(c),d===""&&!f.contains(a.ownerDocument.documentElement,a)&&(d=f.style(a,c));return d}),c.documentElement.currentStyle&&(bz=function(a,b){var c,d=a.currentStyle&&a.currentStyle[b],e=a.runtimeStyle&&a.runtimeStyle[b],f=a.style;!bq.test(d)&&br.test(d)&&(c=f.left,e&&(a.runtimeStyle.left=a.currentStyle.left),f.left=b==="fontSize"?"1em":d||0,d=f.pixelLeft+"px",f.left=c,e&&(a.runtimeStyle.left=e));return d===""?"auto":d}),bx=by||bz,f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)});var bB=/%20/g,bC=/\[\]$/,bD=/\r?\n/g,bE=/#.*$/,bF=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bG=/^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bH=/^(?:about|app|app\-storage|.+\-extension|file|widget):$/,bI=/^(?:GET|HEAD)$/,bJ=/^\/\//,bK=/\?/,bL=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,bM=/^(?:select|textarea)/i,bN=/\s+/,bO=/([?&])_=[^&]*/,bP=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bQ=f.fn.load,bR={},bS={},bT,bU;try{bT=e.href}catch(bV){bT=c.createElement("a"),bT.href="",bT=bT.href}bU=bP.exec(bT.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bQ)return bQ.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("<div>").append(c.replace(bL,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bM.test(this.nodeName)||bG.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bD,"\r\n")}}):{name:b.name,value:c.replace(bD,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.bind(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?f.extend(!0,a,f.ajaxSettings,b):(b=a,a=f.extend(!0,f.ajaxSettings,b));for(var c in{context:1,url:1})c in b?a[c]=b[c]:c in f.ajaxSettings&&(a[c]=f.ajaxSettings[c]);return a},ajaxSettings:{url:bT,isLocal:bH.test(bU[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":"*/*"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML}},ajaxPrefilter:bW(bR),ajaxTransport:bW(bS),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a?4:0;var o,r,u,w=l?bZ(d,v,l):b,x,y;if(a>=200&&a<300||a===304){if(d.ifModified){if(x=v.getResponseHeader("Last-Modified"))f.lastModified[k]=x;if(y=v.getResponseHeader("Etag"))f.etag[k]=y}if(a===304)c="notmodified",o=!0;else try{r=b$(d,w),c="success",o=!0}catch(z){c="parsererror",u=z}}else{u=c;if(!c||a)c="error",a<0&&(a=0)}v.status=a,v.statusText=c,o?h.resolveWith(e,[r,c,v]):h.rejectWith(e,[v,c,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.resolveWith(e,[v,c]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f._Deferred(),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bF.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.done,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bE,"").replace(bJ,bU[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bN),d.crossDomain==null&&(r=bP.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bU[1]&&r[2]==bU[2]&&(r[3]||(r[1]==="http:"?80:443))==(bU[3]||(bU[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),bX(bR,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bI.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bK.test(d.url)?"&":"?")+d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bO,"$1_="+x);d.url=y+(y===d.url?(bK.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", */*; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=bX(bS,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){status<2?w(-1,z):f.error(z)}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)bY(g,a[g],c,e);return d.join("&").replace(bB,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var b_=f.now(),ca=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+b_++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=b.contentType==="application/x-www-form-urlencoded"&&typeof b.data=="string";if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(ca.test(b.url)||e&&ca.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(ca,l),b.url===j&&(e&&(k=k.replace(ca,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var cb=a.ActiveXObject?function(){for(var a in cd)cd[a](0,1)}:!1,cc=0,cd;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ce()||cf()}:ce,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,cb&&delete cd[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n),m.text=h.responseText;try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cc,cb&&(cd||(cd={},f(a).unload(cb)),cd[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var cg={},ch,ci,cj=/^(?:toggle|show|hide)$/,ck=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,cl,cm=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cn,co=a.webkitRequestAnimationFrame||a.mozRequestAnimationFrame||a.oRequestAnimationFrame;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(cr("show",3),a,b,c);for(var g=0,h=this.length;g<h;g++)d=this[g],d.style&&(e=d.style.display,!f._data(d,"olddisplay")&&e==="none"&&(e=d.style.display=""),e===""&&f.css(d,"display")==="none"&&f._data(d,"olddisplay",cs(d.nodeName)));for(g=0;g<h;g++){d=this[g];if(d.style){e=d.style.display;if(e===""||e==="none")d.style.display=f._data(d,"olddisplay")||""}}return this},hide:function(a,b,c){if(a||a===0)return this.animate(cr("hide",3),a,b,c);for(var d=0,e=this.length;d<e;d++)if(this[d].style){var g=f.css(this[d],"display");g!=="none"&&!f._data(this[d],"olddisplay")&&f._data(this[d],"olddisplay",g)}for(d=0;d<e;d++)this[d].style&&(this[d].style.display="none");return this},_toggle:f.fn.toggle,toggle:function(a,b,c){var d=typeof a=="boolean";f.isFunction(a)&&f.isFunction(b)?this._toggle.apply(this,arguments):a==null||d?this.each(function(){var b=d?a:f(this).is(":hidden");f(this)[b?"show":"hide"]()}):this.animate(cr("toggle",3),a,b,c);return this},fadeTo:function(a,b,c,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=f.speed(b,c,d);if(f.isEmptyObject(a))return this.each(e.complete,[!1]);a=f.extend({},a);return this[e.queue===!1?"each":"queue"](function(){e.queue===!1&&f._mark(this);var b=f.extend({},e),c=this.nodeType===1,d=c&&f(this).is(":hidden"),g,h,i,j,k,l,m,n,o;b.animatedProperties={};for(i in a){g=f.camelCase(i),i!==g&&(a[g]=a[i],delete a[i]),h=a[g],f.isArray(h)?(b.animatedProperties[g]=h[1],h=a[g]=h[0]):b.animatedProperties[g]=b.specialEasing&&b.specialEasing[g]||b.easing||"swing";if(h==="hide"&&d||h==="show"&&!d)return b.complete.call(this);c&&(g==="height"||g==="width")&&(b.overflow=[this.style.overflow,this.style.overflowX,this.style.overflowY],f.css(this,"display")==="inline"&&f.css(this,"float")==="none"&&(f.support.inlineBlockNeedsLayout?(j=cs(this.nodeName),j==="inline"?this.style.display="inline-block":(this.style.display="inline",this.style.zoom=1)):this.style.display="inline-block"))}b.overflow!=null&&(this.style.overflow="hidden");for(i in a)k=new f.fx(this,b,i),h=a[i],cj.test(h)?k[h==="toggle"?d?"show":"hide":h]():(l=ck.exec(h),m=k.cur(),l?(n=parseFloat(l[2]),o=l[3]||(f.cssNumber[i]?"":"px"),o!=="px"&&(f.style(this,i,(n||1)+o),m=(n||1)/k.cur()*m,f.style(this,i,m+o)),l[1]&&(n=(l[1]==="-="?-1:1)*n+m),k.custom(m,n,o)):k.custom(m,h,""));return!0})},stop:function(a,b){a&&this.queue([]),this.each(function(){var a=f.timers,c=a.length;b||f._unmark(!0,this);while(c--)a[c].elem===this&&(b&&a[c](!0),a.splice(c,1))}),b||this.dequeue();return this}}),f.each({slideDown:cr("show",1),slideUp:cr("hide",1),slideToggle:cr("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){f.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),f.extend({speed:function(a,b,c){var d=a&&typeof a=="object"?f.extend({},a):{complete:c||!c&&b||f.isFunction(a)&&a,duration:a,easing:c&&b||b&&!f.isFunction(b)&&b};d.duration=f.fx.off?0:typeof d.duration=="number"?d.duration:d.duration in f.fx.speeds?f.fx.speeds[d.duration]:f.fx.speeds._default,d.old=d.complete,d.complete=function(a){f.isFunction(d.old)&&d.old.call(this),d.queue!==!1?f.dequeue(this):a!==!1&&f._unmark(this)};return d},easing:{linear:function(a,b,c,d){return c+d*a},swing:function(a,b,c,d){return(-Math.cos(a*Math.PI)/2+.5)*d+c}},timers:[],fx:function(a,b,c){this.options=b,this.elem=a,this.prop=c,b.orig=b.orig||{}}}),f.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this),(f.fx.step[this.prop]||f.fx.step._default)(this)},cur:function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];var a,b=f.css(this.elem,this.prop);return isNaN(a=parseFloat(b))?!b||b==="auto"?0:b:a},custom:function(a,b,c){function h(a){return d.step(a)}var d=this,e=f.fx,g;this.startTime=cn||cp(),this.start=a,this.end=b,this.unit=c||this.unit||(f.cssNumber[this.prop]?"":"px"),this.now=this.start,this.pos=this.state=0,h.elem=this.elem,h()&&f.timers.push(h)&&!cl&&(co?(cl=!0,g=function(){cl&&(co(g),e.tick())},co(g)):cl=setInterval(e.tick,e.interval))},show:function(){this.options.orig[this.prop]=f.style(this.elem,this.prop),this.options.show=!0,this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur()),f(this.elem).show()},hide:function(){this.options.orig[this.prop]=f.style(this.elem,this.prop),this.options.hide=!0,this.custom(this.cur(),0)},step:function(a){var b=cn||cp(),c=!0,d=this.elem,e=this.options,g,h;if(a||b>=e.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),e.animatedProperties[this.prop]=!0;for(g in e.animatedProperties)e.animatedProperties[g]!==!0&&(c=!1);if(c){e.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){d.style["overflow"+b]=e.overflow[a]}),e.hide&&f(d).hide();if(e.hide||e.show)for(var i in e.animatedProperties)f.style(d,i,e.orig[i]);e.complete.call(d)}return!1}e.duration==Infinity?this.now=b:(h=b-this.startTime,this.state=h/e.duration,this.pos=f.easing[e.animatedProperties[this.prop]](this.state,h,0,1,e.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){for(var a=f.timers,b=0;b<a.length;++b)a[b]()||a.splice(b--,1);a.length||f.fx.stop()},interval:13,stop:function(){clearInterval(cl),cl=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){f.style(a.elem,"opacity",a.now)},_default:function(a){a.elem.style&&a.elem.style[a.prop]!=null?a.elem.style[a.prop]=(a.prop==="width"||a.prop==="height"?Math.max(0,a.now):a.now)+a.unit:a.elem[a.prop]=a.now}}}),f.expr&&f.expr.filters&&(f.expr.filters.animated=function(a){return f.grep(f.timers,function(b){return a===b.elem}).length});var ct=/^t(?:able|d|h)$/i,cu=/^(?:body|html)$/i;"getBoundingClientRect"in c.documentElement?f.fn.offset=function(a){var b=this[0],c;if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);try{c=b.getBoundingClientRect()}catch(d){}var e=b.ownerDocument,g=e.documentElement;if(!c||!f.contains(g,b))return c?{top:c.top,left:c.left}:{top:0,left:0};var h=e.body,i=cv(e),j=g.clientTop||h.clientTop||0,k=g.clientLeft||h.clientLeft||0,l=i.pageYOffset||f.support.boxModel&&g.scrollTop||h.scrollTop,m=i.pageXOffset||f.support.boxModel&&g.scrollLeft||h.scrollLeft,n=c.top+l-j,o=c.left+m-k;return{top:n,left:o}}:f.fn.offset=function(a){var b=this[0];if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);f.offset.initialize();var c,d=b.offsetParent,e=b,g=b.ownerDocument,h=g.documentElement,i=g.body,j=g.defaultView,k=j?j.getComputedStyle(b,null):b.currentStyle,l=b.offsetTop,m=b.offsetLeft;while((b=b.parentNode)&&b!==i&&b!==h){if(f.offset.supportsFixedPosition&&k.position==="fixed")break;c=j?j.getComputedStyle(b,null):b.currentStyle,l-=b.scrollTop,m-=b.scrollLeft,b===d&&(l+=b.offsetTop,m+=b.offsetLeft,f.offset.doesNotAddBorder&&(!f.offset.doesAddBorderForTableAndCells||!ct.test(b.nodeName))&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),e=d,d=b.offsetParent),f.offset.subtractsBorderForOverflowNotVisible&&c.overflow!=="visible"&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),k=c}if(k.position==="relative"||k.position==="static")l+=i.offsetTop,m+=i.offsetLeft;f.offset.supportsFixedPosition&&k.position==="fixed"&&(l+=Math.max(h.scrollTop,i.scrollTop),m+=Math.max(h.scrollLeft,i.scrollLeft));return{top:l,left:m}},f.offset={initialize:function(){var a=c.body,b=c.createElement("div"),d,e,g,h,i=parseFloat(f.css(a,"marginTop"))||0,j="<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";f.extend(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"}),b.innerHTML=j,a.insertBefore(b,a.firstChild),d=b.firstChild,e=d.firstChild,h=d.nextSibling.firstChild.firstChild,this.doesNotAddBorder=e.offsetTop!==5,this.doesAddBorderForTableAndCells=h.offsetTop===5,e.style.position="fixed",e.style.top="20px",this.supportsFixedPosition=e.offsetTop===20||e.offsetTop===15,e.style.position=e.style.top="",d.style.overflow="hidden",d.style.position="relative",this.subtractsBorderForOverflowNotVisible=e.offsetTop===-5,this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==i,a.removeChild(b),f.offset.initialize=f.noop},bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;f.offset.initialize(),f.offset.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(f.css(a,"marginTop"))||0,c+=parseFloat(f.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var d=f.css(a,"position");d==="static"&&(a.style.position="relative");var e=f(a),g=e.offset(),h=f.css(a,"top"),i=f.css(a,"left"),j=(d==="absolute"||d==="fixed")&&f.inArray("auto",[h,i])>-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cu.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cu.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each(["Left","Top"],function(a,c){var d="scroll"+c;f.fn[d]=function(c){var e,g;if(c===b){e=this[0];if(!e)return null;g=cv(e);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:f.support.boxModel&&g.document.documentElement[d]||g.document.body[d]:e[d]}return this.each(function(){g=cv(this),g?g.scrollTo(a?f(g).scrollLeft():c,a?c:f(g).scrollTop()):this[d]=c})}}),f.each(["Height","Width"],function(a,c){var d=c.toLowerCase();f.fn["inner"+c]=function(){var a=this[0];return a&&a.style?parseFloat(f.css(a,d,"padding")):null},f.fn["outer"+c]=function(a){var b=this[0];return b&&b.style?parseFloat(f.css(b,d,a?"margin":"border")):null},f.fn[d]=function(a){var e=this[0];if(!e)return a==null?null:this;if(f.isFunction(a))return this.each(function(b){var c=f(this);c[d](a.call(this,b,c[d]()))});if(f.isWindow(e)){var g=e.document.documentElement["client"+c];return e.document.compatMode==="CSS1Compat"&&g||e.document.body["client"+c]||g}if(e.nodeType===9)return Math.max(e.documentElement["client"+c],e.body["scroll"+c],e.documentElement["scroll"+c],e.body["offset"+c],e.documentElement["offset"+c]);if(a===b){var h=f.css(e,d),i=parseFloat(h);return f.isNaN(i)?h:i}return this.css(d,typeof a=="string"?a:a+"px")}}),a.jQuery=a.$=f})(window);
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/apiCss/jquery.ztree.core-3.5.js b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/apiCss/jquery.ztree.core-3.5.js
new file mode 100644
index 0000000..42ab8b4
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/apiCss/jquery.ztree.core-3.5.js
@@ -0,0 +1,68 @@
+/*
+ * JQuery zTree core v3.5.15
+ * http://zTree.me/
+ *
+ * Copyright (c) 2010 Hunter.z
+ *
+ * Licensed same as jquery - MIT License
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ * email: hunter.z@263.net
+ * Date: 2013-10-15
+ */
+(function(p){var G,H,I,J,K,L,r={},u={},v={},M={treeId:"",treeObj:null,view:{addDiyDom:null,autoCancelSelected:!0,dblClickExpand:!0,expandSpeed:"fast",fontCss:{},nameIsHTML:!1,selectedMulti:!0,showIcon:!0,showLine:!0,showTitle:!0,txtSelectedEnable:!1},data:{key:{children:"children",name:"name",title:"",url:"url"},simpleData:{enable:!1,idKey:"id",pIdKey:"pId",rootPId:null},keep:{parent:!1,leaf:!1}},async:{enable:!1,contentType:"application/x-www-form-urlencoded",type:"post",dataType:"text",url:"",autoParam:[],
+otherParam:[],dataFilter:null},callback:{beforeAsync:null,beforeClick:null,beforeDblClick:null,beforeRightClick:null,beforeMouseDown:null,beforeMouseUp:null,beforeExpand:null,beforeCollapse:null,beforeRemove:null,onAsyncError:null,onAsyncSuccess:null,onNodeCreated:null,onClick:null,onDblClick:null,onRightClick:null,onMouseDown:null,onMouseUp:null,onExpand:null,onCollapse:null,onRemove:null}},w=[function(b){var a=b.treeObj,c=e.event;a.bind(c.NODECREATED,function(a,c,g){j.apply(b.callback.onNodeCreated,
+[a,c,g])});a.bind(c.CLICK,function(a,c,g,l,h){j.apply(b.callback.onClick,[c,g,l,h])});a.bind(c.EXPAND,function(a,c,g){j.apply(b.callback.onExpand,[a,c,g])});a.bind(c.COLLAPSE,function(a,c,g){j.apply(b.callback.onCollapse,[a,c,g])});a.bind(c.ASYNC_SUCCESS,function(a,c,g,l){j.apply(b.callback.onAsyncSuccess,[a,c,g,l])});a.bind(c.ASYNC_ERROR,function(a,c,g,l,h,e){j.apply(b.callback.onAsyncError,[a,c,g,l,h,e])})}],x=[function(b){var a=e.event;b.treeObj.unbind(a.NODECREATED).unbind(a.CLICK).unbind(a.EXPAND).unbind(a.COLLAPSE).unbind(a.ASYNC_SUCCESS).unbind(a.ASYNC_ERROR)}],
+y=[function(b){var a=h.getCache(b);a||(a={},h.setCache(b,a));a.nodes=[];a.doms=[]}],z=[function(b,a,c,d,f,g){if(c){var l=h.getRoot(b),e=b.data.key.children;c.level=a;c.tId=b.treeId+"_"+ ++l.zId;c.parentTId=d?d.tId:null;c.open=typeof c.open=="string"?j.eqs(c.open,"true"):!!c.open;c[e]&&c[e].length>0?(c.isParent=!0,c.zAsync=!0):(c.isParent=typeof c.isParent=="string"?j.eqs(c.isParent,"true"):!!c.isParent,c.open=c.isParent&&!b.async.enable?c.open:!1,c.zAsync=!c.isParent);c.isFirstNode=f;c.isLastNode=
+g;c.getParentNode=function(){return h.getNodeCache(b,c.parentTId)};c.getPreNode=function(){return h.getPreNode(b,c)};c.getNextNode=function(){return h.getNextNode(b,c)};c.isAjaxing=!1;h.fixPIdKeyValue(b,c)}}],s=[function(b){var a=b.target,c=h.getSetting(b.data.treeId),d="",f=null,g="",l="",i=null,n=null,k=null;if(j.eqs(b.type,"mousedown"))l="mousedown";else if(j.eqs(b.type,"mouseup"))l="mouseup";else if(j.eqs(b.type,"contextmenu"))l="contextmenu";else if(j.eqs(b.type,"click"))if(j.eqs(a.tagName,"span")&&
+a.getAttribute("treeNode"+e.id.SWITCH)!==null)d=j.getNodeMainDom(a).id,g="switchNode";else{if(k=j.getMDom(c,a,[{tagName:"a",attrName:"treeNode"+e.id.A}]))d=j.getNodeMainDom(k).id,g="clickNode"}else if(j.eqs(b.type,"dblclick")&&(l="dblclick",k=j.getMDom(c,a,[{tagName:"a",attrName:"treeNode"+e.id.A}])))d=j.getNodeMainDom(k).id,g="switchNode";if(l.length>0&&d.length==0&&(k=j.getMDom(c,a,[{tagName:"a",attrName:"treeNode"+e.id.A}])))d=j.getNodeMainDom(k).id;if(d.length>0)switch(f=h.getNodeCache(c,d),g){case "switchNode":f.isParent?
+j.eqs(b.type,"click")||j.eqs(b.type,"dblclick")&&j.apply(c.view.dblClickExpand,[c.treeId,f],c.view.dblClickExpand)?i=G:g="":g="";break;case "clickNode":i=H}switch(l){case "mousedown":n=I;break;case "mouseup":n=J;break;case "dblclick":n=K;break;case "contextmenu":n=L}return{stop:!1,node:f,nodeEventType:g,nodeEventCallback:i,treeEventType:l,treeEventCallback:n}}],A=[function(b){var a=h.getRoot(b);a||(a={},h.setRoot(b,a));a[b.data.key.children]=[];a.expandTriggerFlag=!1;a.curSelectedList=[];a.noSelection=
+!0;a.createdNodes=[];a.zId=0;a._ver=(new Date).getTime()}],B=[],C=[],D=[],E=[],F=[],h={addNodeCache:function(b,a){h.getCache(b).nodes[h.getNodeCacheId(a.tId)]=a},getNodeCacheId:function(b){return b.substring(b.lastIndexOf("_")+1)},addAfterA:function(b){C.push(b)},addBeforeA:function(b){B.push(b)},addInnerAfterA:function(b){E.push(b)},addInnerBeforeA:function(b){D.push(b)},addInitBind:function(b){w.push(b)},addInitUnBind:function(b){x.push(b)},addInitCache:function(b){y.push(b)},addInitNode:function(b){z.push(b)},
+addInitProxy:function(b,a){a?s.splice(0,0,b):s.push(b)},addInitRoot:function(b){A.push(b)},addNodesData:function(b,a,c){var d=b.data.key.children;a[d]||(a[d]=[]);if(a[d].length>0)a[d][a[d].length-1].isLastNode=!1,i.setNodeLineIcos(b,a[d][a[d].length-1]);a.isParent=!0;a[d]=a[d].concat(c)},addSelectedNode:function(b,a){var c=h.getRoot(b);h.isSelectedNode(b,a)||c.curSelectedList.push(a)},addCreatedNode:function(b,a){(b.callback.onNodeCreated||b.view.addDiyDom)&&h.getRoot(b).createdNodes.push(a)},addZTreeTools:function(b){F.push(b)},
+exSetting:function(b){p.extend(!0,M,b)},fixPIdKeyValue:function(b,a){b.data.simpleData.enable&&(a[b.data.simpleData.pIdKey]=a.parentTId?a.getParentNode()[b.data.simpleData.idKey]:b.data.simpleData.rootPId)},getAfterA:function(b,a,c){for(var d=0,f=C.length;d<f;d++)C[d].apply(this,arguments)},getBeforeA:function(b,a,c){for(var d=0,f=B.length;d<f;d++)B[d].apply(this,arguments)},getInnerAfterA:function(b,a,c){for(var d=0,f=E.length;d<f;d++)E[d].apply(this,arguments)},getInnerBeforeA:function(b,a,c){for(var d=
+0,f=D.length;d<f;d++)D[d].apply(this,arguments)},getCache:function(b){return v[b.treeId]},getNextNode:function(b,a){if(!a)return null;for(var c=b.data.key.children,d=a.parentTId?a.getParentNode():h.getRoot(b),f=0,g=d[c].length-1;f<=g;f++)if(d[c][f]===a)return f==g?null:d[c][f+1];return null},getNodeByParam:function(b,a,c,d){if(!a||!c)return null;for(var f=b.data.key.children,g=0,l=a.length;g<l;g++){if(a[g][c]==d)return a[g];var e=h.getNodeByParam(b,a[g][f],c,d);if(e)return e}return null},getNodeCache:function(b,
+a){if(!a)return null;var c=v[b.treeId].nodes[h.getNodeCacheId(a)];return c?c:null},getNodeName:function(b,a){return""+a[b.data.key.name]},getNodeTitle:function(b,a){return""+a[b.data.key.title===""?b.data.key.name:b.data.key.title]},getNodes:function(b){return h.getRoot(b)[b.data.key.children]},getNodesByParam:function(b,a,c,d){if(!a||!c)return[];for(var f=b.data.key.children,g=[],l=0,e=a.length;l<e;l++)a[l][c]==d&&g.push(a[l]),g=g.concat(h.getNodesByParam(b,a[l][f],c,d));return g},getNodesByParamFuzzy:function(b,
+a,c,d){if(!a||!c)return[];for(var f=b.data.key.children,g=[],d=d.toLowerCase(),l=0,e=a.length;l<e;l++)typeof a[l][c]=="string"&&a[l][c].toLowerCase().indexOf(d)>-1&&g.push(a[l]),g=g.concat(h.getNodesByParamFuzzy(b,a[l][f],c,d));return g},getNodesByFilter:function(b,a,c,d,f){if(!a)return d?null:[];for(var g=b.data.key.children,e=d?null:[],i=0,n=a.length;i<n;i++){if(j.apply(c,[a[i],f],!1)){if(d)return a[i];e.push(a[i])}var k=h.getNodesByFilter(b,a[i][g],c,d,f);if(d&&k)return k;e=d?k:e.concat(k)}return e},
+getPreNode:function(b,a){if(!a)return null;for(var c=b.data.key.children,d=a.parentTId?a.getParentNode():h.getRoot(b),f=0,g=d[c].length;f<g;f++)if(d[c][f]===a)return f==0?null:d[c][f-1];return null},getRoot:function(b){return b?u[b.treeId]:null},getRoots:function(){return u},getSetting:function(b){return r[b]},getSettings:function(){return r},getZTreeTools:function(b){return(b=this.getRoot(this.getSetting(b)))?b.treeTools:null},initCache:function(b){for(var a=0,c=y.length;a<c;a++)y[a].apply(this,
+arguments)},initNode:function(b,a,c,d,f,g){for(var e=0,h=z.length;e<h;e++)z[e].apply(this,arguments)},initRoot:function(b){for(var a=0,c=A.length;a<c;a++)A[a].apply(this,arguments)},isSelectedNode:function(b,a){for(var c=h.getRoot(b),d=0,f=c.curSelectedList.length;d<f;d++)if(a===c.curSelectedList[d])return!0;return!1},removeNodeCache:function(b,a){var c=b.data.key.children;if(a[c])for(var d=0,f=a[c].length;d<f;d++)arguments.callee(b,a[c][d]);h.getCache(b).nodes[h.getNodeCacheId(a.tId)]=null},removeSelectedNode:function(b,
+a){for(var c=h.getRoot(b),d=0,f=c.curSelectedList.length;d<f;d++)if(a===c.curSelectedList[d]||!h.getNodeCache(b,c.curSelectedList[d].tId))c.curSelectedList.splice(d,1),d--,f--},setCache:function(b,a){v[b.treeId]=a},setRoot:function(b,a){u[b.treeId]=a},setZTreeTools:function(b,a){for(var c=0,d=F.length;c<d;c++)F[c].apply(this,arguments)},transformToArrayFormat:function(b,a){if(!a)return[];var c=b.data.key.children,d=[];if(j.isArray(a))for(var f=0,g=a.length;f<g;f++)d.push(a[f]),a[f][c]&&(d=d.concat(h.transformToArrayFormat(b,
+a[f][c])));else d.push(a),a[c]&&(d=d.concat(h.transformToArrayFormat(b,a[c])));return d},transformTozTreeFormat:function(b,a){var c,d,f=b.data.simpleData.idKey,g=b.data.simpleData.pIdKey,e=b.data.key.children;if(!f||f==""||!a)return[];if(j.isArray(a)){var h=[],i=[];for(c=0,d=a.length;c<d;c++)i[a[c][f]]=a[c];for(c=0,d=a.length;c<d;c++)i[a[c][g]]&&a[c][f]!=a[c][g]?(i[a[c][g]][e]||(i[a[c][g]][e]=[]),i[a[c][g]][e].push(a[c])):h.push(a[c]);return h}else return[a]}},m={bindEvent:function(b){for(var a=0,
+c=w.length;a<c;a++)w[a].apply(this,arguments)},unbindEvent:function(b){for(var a=0,c=x.length;a<c;a++)x[a].apply(this,arguments)},bindTree:function(b){var a={treeId:b.treeId},c=b.treeObj;b.view.txtSelectedEnable||c.bind("selectstart",function(a){a=a.originalEvent.srcElement.nodeName.toLowerCase();return a==="input"||a==="textarea"}).css({"-moz-user-select":"-moz-none"});c.bind("click",a,m.proxy);c.bind("dblclick",a,m.proxy);c.bind("mouseover",a,m.proxy);c.bind("mouseout",a,m.proxy);c.bind("mousedown",
+a,m.proxy);c.bind("mouseup",a,m.proxy);c.bind("contextmenu",a,m.proxy)},unbindTree:function(b){b.treeObj.unbind("click",m.proxy).unbind("dblclick",m.proxy).unbind("mouseover",m.proxy).unbind("mouseout",m.proxy).unbind("mousedown",m.proxy).unbind("mouseup",m.proxy).unbind("contextmenu",m.proxy)},doProxy:function(b){for(var a=[],c=0,d=s.length;c<d;c++){var f=s[c].apply(this,arguments);a.push(f);if(f.stop)break}return a},proxy:function(b){var a=h.getSetting(b.data.treeId);if(!j.uCanDo(a,b))return!0;
+for(var a=m.doProxy(b),c=!0,d=0,f=a.length;d<f;d++){var g=a[d];g.nodeEventCallback&&(c=g.nodeEventCallback.apply(g,[b,g.node])&&c);g.treeEventCallback&&(c=g.treeEventCallback.apply(g,[b,g.node])&&c)}return c}};G=function(b,a){var c=h.getSetting(b.data.treeId);if(a.open){if(j.apply(c.callback.beforeCollapse,[c.treeId,a],!0)==!1)return!0}else if(j.apply(c.callback.beforeExpand,[c.treeId,a],!0)==!1)return!0;h.getRoot(c).expandTriggerFlag=!0;i.switchNode(c,a);return!0};H=function(b,a){var c=h.getSetting(b.data.treeId),
+d=c.view.autoCancelSelected&&b.ctrlKey&&h.isSelectedNode(c,a)?0:c.view.autoCancelSelected&&b.ctrlKey&&c.view.selectedMulti?2:1;if(j.apply(c.callback.beforeClick,[c.treeId,a,d],!0)==!1)return!0;d===0?i.cancelPreSelectedNode(c,a):i.selectNode(c,a,d===2);c.treeObj.trigger(e.event.CLICK,[b,c.treeId,a,d]);return!0};I=function(b,a){var c=h.getSetting(b.data.treeId);j.apply(c.callback.beforeMouseDown,[c.treeId,a],!0)&&j.apply(c.callback.onMouseDown,[b,c.treeId,a]);return!0};J=function(b,a){var c=h.getSetting(b.data.treeId);
+j.apply(c.callback.beforeMouseUp,[c.treeId,a],!0)&&j.apply(c.callback.onMouseUp,[b,c.treeId,a]);return!0};K=function(b,a){var c=h.getSetting(b.data.treeId);j.apply(c.callback.beforeDblClick,[c.treeId,a],!0)&&j.apply(c.callback.onDblClick,[b,c.treeId,a]);return!0};L=function(b,a){var c=h.getSetting(b.data.treeId);j.apply(c.callback.beforeRightClick,[c.treeId,a],!0)&&j.apply(c.callback.onRightClick,[b,c.treeId,a]);return typeof c.callback.onRightClick!="function"};var j={apply:function(b,a,c){return typeof b==
+"function"?b.apply(N,a?a:[]):c},canAsync:function(b,a){var c=b.data.key.children;return b.async.enable&&a&&a.isParent&&!(a.zAsync||a[c]&&a[c].length>0)},clone:function(b){if(b===null)return null;var a=j.isArray(b)?[]:{},c;for(c in b)a[c]=b[c]instanceof Date?new Date(b[c].getTime()):typeof b[c]==="object"?arguments.callee(b[c]):b[c];return a},eqs:function(b,a){return b.toLowerCase()===a.toLowerCase()},isArray:function(b){return Object.prototype.toString.apply(b)==="[object Array]"},$:function(b,a,
+c){a&&typeof a!="string"&&(c=a,a="");return typeof b=="string"?p(b,c?c.treeObj.get(0).ownerDocument:null):p("#"+b.tId+a,c?c.treeObj:null)},getMDom:function(b,a,c){if(!a)return null;for(;a&&a.id!==b.treeId;){for(var d=0,f=c.length;a.tagName&&d<f;d++)if(j.eqs(a.tagName,c[d].tagName)&&a.getAttribute(c[d].attrName)!==null)return a;a=a.parentNode}return null},getNodeMainDom:function(b){return p(b).parent("li").get(0)||p(b).parentsUntil("li").parent().get(0)},isChildOrSelf:function(b,a){return p(b).closest("#"+
+a).length>0},uCanDo:function(){return!0}},i={addNodes:function(b,a,c,d){if(!b.data.keep.leaf||!a||a.isParent)if(j.isArray(c)||(c=[c]),b.data.simpleData.enable&&(c=h.transformTozTreeFormat(b,c)),a){var f=k(a,e.id.SWITCH,b),g=k(a,e.id.ICON,b),l=k(a,e.id.UL,b);if(!a.open)i.replaceSwitchClass(a,f,e.folder.CLOSE),i.replaceIcoClass(a,g,e.folder.CLOSE),a.open=!1,l.css({display:"none"});h.addNodesData(b,a,c);i.createNodes(b,a.level+1,c,a);d||i.expandCollapseParentNode(b,a,!0)}else h.addNodesData(b,h.getRoot(b),
+c),i.createNodes(b,0,c,null)},appendNodes:function(b,a,c,d,f,g){if(!c)return[];for(var e=[],j=b.data.key.children,k=0,m=c.length;k<m;k++){var o=c[k];if(f){var t=(d?d:h.getRoot(b))[j].length==c.length&&k==0;h.initNode(b,a,o,d,t,k==c.length-1,g);h.addNodeCache(b,o)}t=[];o[j]&&o[j].length>0&&(t=i.appendNodes(b,a+1,o[j],o,f,g&&o.open));g&&(i.makeDOMNodeMainBefore(e,b,o),i.makeDOMNodeLine(e,b,o),h.getBeforeA(b,o,e),i.makeDOMNodeNameBefore(e,b,o),h.getInnerBeforeA(b,o,e),i.makeDOMNodeIcon(e,b,o),h.getInnerAfterA(b,
+o,e),i.makeDOMNodeNameAfter(e,b,o),h.getAfterA(b,o,e),o.isParent&&o.open&&i.makeUlHtml(b,o,e,t.join("")),i.makeDOMNodeMainAfter(e,b,o),h.addCreatedNode(b,o))}return e},appendParentULDom:function(b,a){var c=[],d=k(a,b);!d.get(0)&&a.parentTId&&(i.appendParentULDom(b,a.getParentNode()),d=k(a,b));var f=k(a,e.id.UL,b);f.get(0)&&f.remove();f=i.appendNodes(b,a.level+1,a[b.data.key.children],a,!1,!0);i.makeUlHtml(b,a,c,f.join(""));d.append(c.join(""))},asyncNode:function(b,a,c,d){var f,g;if(a&&!a.isParent)return j.apply(d),
+!1;else if(a&&a.isAjaxing)return!1;else if(j.apply(b.callback.beforeAsync,[b.treeId,a],!0)==!1)return j.apply(d),!1;if(a)a.isAjaxing=!0,k(a,e.id.ICON,b).attr({style:"","class":e.className.BUTTON+" "+e.className.ICO_LOADING});var l={};for(f=0,g=b.async.autoParam.length;a&&f<g;f++){var q=b.async.autoParam[f].split("="),n=q;q.length>1&&(n=q[1],q=q[0]);l[n]=a[q]}if(j.isArray(b.async.otherParam))for(f=0,g=b.async.otherParam.length;f<g;f+=2)l[b.async.otherParam[f]]=b.async.otherParam[f+1];else for(var m in b.async.otherParam)l[m]=
+b.async.otherParam[m];var o=h.getRoot(b)._ver;p.ajax({contentType:b.async.contentType,type:b.async.type,url:j.apply(b.async.url,[b.treeId,a],b.async.url),data:l,dataType:b.async.dataType,success:function(f){if(o==h.getRoot(b)._ver){var g=[];try{g=!f||f.length==0?[]:typeof f=="string"?eval("("+f+")"):f}catch(l){g=f}if(a)a.isAjaxing=null,a.zAsync=!0;i.setNodeLineIcos(b,a);g&&g!==""?(g=j.apply(b.async.dataFilter,[b.treeId,a,g],g),i.addNodes(b,a,g?j.clone(g):[],!!c)):i.addNodes(b,a,[],!!c);b.treeObj.trigger(e.event.ASYNC_SUCCESS,
+[b.treeId,a,f]);j.apply(d)}},error:function(c,d,f){if(o==h.getRoot(b)._ver){if(a)a.isAjaxing=null;i.setNodeLineIcos(b,a);b.treeObj.trigger(e.event.ASYNC_ERROR,[b.treeId,a,c,d,f])}}});return!0},cancelPreSelectedNode:function(b,a){for(var c=h.getRoot(b).curSelectedList,d=c.length-1;d>=0;d--)if(!a||a===c[d])if(k(c[d],e.id.A,b).removeClass(e.node.CURSELECTED),a){h.removeSelectedNode(b,a);break}if(!a)h.getRoot(b).curSelectedList=[]},createNodeCallback:function(b){if(b.callback.onNodeCreated||b.view.addDiyDom)for(var a=
+h.getRoot(b);a.createdNodes.length>0;){var c=a.createdNodes.shift();j.apply(b.view.addDiyDom,[b.treeId,c]);b.callback.onNodeCreated&&b.treeObj.trigger(e.event.NODECREATED,[b.treeId,c])}},createNodes:function(b,a,c,d){if(c&&c.length!=0){var f=h.getRoot(b),g=b.data.key.children,g=!d||d.open||!!k(d[g][0],b).get(0);f.createdNodes=[];a=i.appendNodes(b,a,c,d,!0,g);d?(d=k(d,e.id.UL,b),d.get(0)&&d.append(a.join(""))):b.treeObj.append(a.join(""));i.createNodeCallback(b)}},destroy:function(b){b&&(h.initCache(b),
+h.initRoot(b),m.unbindTree(b),m.unbindEvent(b),b.treeObj.empty())},expandCollapseNode:function(b,a,c,d,f){var g=h.getRoot(b),l=b.data.key.children;if(a){if(g.expandTriggerFlag){var q=f,f=function(){q&&q();a.open?b.treeObj.trigger(e.event.EXPAND,[b.treeId,a]):b.treeObj.trigger(e.event.COLLAPSE,[b.treeId,a])};g.expandTriggerFlag=!1}if(!a.open&&a.isParent&&(!k(a,e.id.UL,b).get(0)||a[l]&&a[l].length>0&&!k(a[l][0],b).get(0)))i.appendParentULDom(b,a),i.createNodeCallback(b);if(a.open==c)j.apply(f,[]);else{var c=
+k(a,e.id.UL,b),g=k(a,e.id.SWITCH,b),n=k(a,e.id.ICON,b);a.isParent?(a.open=!a.open,a.iconOpen&&a.iconClose&&n.attr("style",i.makeNodeIcoStyle(b,a)),a.open?(i.replaceSwitchClass(a,g,e.folder.OPEN),i.replaceIcoClass(a,n,e.folder.OPEN),d==!1||b.view.expandSpeed==""?(c.show(),j.apply(f,[])):a[l]&&a[l].length>0?c.slideDown(b.view.expandSpeed,f):(c.show(),j.apply(f,[]))):(i.replaceSwitchClass(a,g,e.folder.CLOSE),i.replaceIcoClass(a,n,e.folder.CLOSE),d==!1||b.view.expandSpeed==""||!(a[l]&&a[l].length>0)?
+(c.hide(),j.apply(f,[])):c.slideUp(b.view.expandSpeed,f))):j.apply(f,[])}}else j.apply(f,[])},expandCollapseParentNode:function(b,a,c,d,f){a&&(a.parentTId?(i.expandCollapseNode(b,a,c,d),a.parentTId&&i.expandCollapseParentNode(b,a.getParentNode(),c,d,f)):i.expandCollapseNode(b,a,c,d,f))},expandCollapseSonNode:function(b,a,c,d,f){var g=h.getRoot(b),e=b.data.key.children,g=a?a[e]:g[e],e=a?!1:d,j=h.getRoot(b).expandTriggerFlag;h.getRoot(b).expandTriggerFlag=!1;if(g)for(var k=0,m=g.length;k<m;k++)g[k]&&
+i.expandCollapseSonNode(b,g[k],c,e);h.getRoot(b).expandTriggerFlag=j;i.expandCollapseNode(b,a,c,d,f)},makeDOMNodeIcon:function(b,a,c){var d=h.getNodeName(a,c),d=a.view.nameIsHTML?d:d.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;");b.push("<span id='",c.tId,e.id.ICON,"' title='' treeNode",e.id.ICON," class='",i.makeNodeIcoClass(a,c),"' style='",i.makeNodeIcoStyle(a,c),"'></span><span id='",c.tId,e.id.SPAN,"'>",d,"</span>")},makeDOMNodeLine:function(b,a,c){b.push("<span id='",c.tId,
+e.id.SWITCH,"' title='' class='",i.makeNodeLineClass(a,c),"' treeNode",e.id.SWITCH,"></span>")},makeDOMNodeMainAfter:function(b){b.push("</li>")},makeDOMNodeMainBefore:function(b,a,c){b.push("<li id='",c.tId,"' class='",e.className.LEVEL,c.level,"' tabindex='0' hidefocus='true' treenode>")},makeDOMNodeNameAfter:function(b){b.push("</a>")},makeDOMNodeNameBefore:function(b,a,c){var d=h.getNodeTitle(a,c),f=i.makeNodeUrl(a,c),g=i.makeNodeFontCss(a,c),l=[],k;for(k in g)l.push(k,":",g[k],";");b.push("<a id='",
+c.tId,e.id.A,"' class='",e.className.LEVEL,c.level,"' treeNode",e.id.A,' onclick="',c.click||"",'" ',f!=null&&f.length>0?"href='"+f+"'":""," target='",i.makeNodeTarget(c),"' style='",l.join(""),"'");j.apply(a.view.showTitle,[a.treeId,c],a.view.showTitle)&&d&&b.push("title='",d.replace(/'/g,"&#39;").replace(/</g,"&lt;").replace(/>/g,"&gt;"),"'");b.push(">")},makeNodeFontCss:function(b,a){var c=j.apply(b.view.fontCss,[b.treeId,a],b.view.fontCss);return c&&typeof c!="function"?c:{}},makeNodeIcoClass:function(b,
+a){var c=["ico"];a.isAjaxing||(c[0]=(a.iconSkin?a.iconSkin+"_":"")+c[0],a.isParent?c.push(a.open?e.folder.OPEN:e.folder.CLOSE):c.push(e.folder.DOCU));return e.className.BUTTON+" "+c.join("_")},makeNodeIcoStyle:function(b,a){var c=[];if(!a.isAjaxing){var d=a.isParent&&a.iconOpen&&a.iconClose?a.open?a.iconOpen:a.iconClose:a.icon;d&&c.push("background:url(",d,") 0 0 no-repeat;");(b.view.showIcon==!1||!j.apply(b.view.showIcon,[b.treeId,a],!0))&&c.push("width:0px;height:0px;")}return c.join("")},makeNodeLineClass:function(b,
+a){var c=[];b.view.showLine?a.level==0&&a.isFirstNode&&a.isLastNode?c.push(e.line.ROOT):a.level==0&&a.isFirstNode?c.push(e.line.ROOTS):a.isLastNode?c.push(e.line.BOTTOM):c.push(e.line.CENTER):c.push(e.line.NOLINE);a.isParent?c.push(a.open?e.folder.OPEN:e.folder.CLOSE):c.push(e.folder.DOCU);return i.makeNodeLineClassEx(a)+c.join("_")},makeNodeLineClassEx:function(b){return e.className.BUTTON+" "+e.className.LEVEL+b.level+" "+e.className.SWITCH+" "},makeNodeTarget:function(b){return b.target||"_blank"},
+makeNodeUrl:function(b,a){var c=b.data.key.url;return a[c]?a[c]:null},makeUlHtml:function(b,a,c,d){c.push("<ul id='",a.tId,e.id.UL,"' class='",e.className.LEVEL,a.level," ",i.makeUlLineClass(b,a),"' style='display:",a.open?"block":"none","'>");c.push(d);c.push("</ul>")},makeUlLineClass:function(b,a){return b.view.showLine&&!a.isLastNode?e.line.LINE:""},removeChildNodes:function(b,a){if(a){var c=b.data.key.children,d=a[c];if(d){for(var f=0,g=d.length;f<g;f++)h.removeNodeCache(b,d[f]);h.removeSelectedNode(b);
+delete a[c];b.data.keep.parent?k(a,e.id.UL,b).empty():(a.isParent=!1,a.open=!1,c=k(a,e.id.SWITCH,b),d=k(a,e.id.ICON,b),i.replaceSwitchClass(a,c,e.folder.DOCU),i.replaceIcoClass(a,d,e.folder.DOCU),k(a,e.id.UL,b).remove())}}},setFirstNode:function(b,a){var c=b.data.key.children;if(a[c].length>0)a[c][0].isFirstNode=!0},setLastNode:function(b,a){var c=b.data.key.children,d=a[c].length;if(d>0)a[c][d-1].isLastNode=!0},removeNode:function(b,a){var c=h.getRoot(b),d=b.data.key.children,f=a.parentTId?a.getParentNode():
+c;a.isFirstNode=!1;a.isLastNode=!1;a.getPreNode=function(){return null};a.getNextNode=function(){return null};if(h.getNodeCache(b,a.tId)){k(a,b).remove();h.removeNodeCache(b,a);h.removeSelectedNode(b,a);for(var g=0,l=f[d].length;g<l;g++)if(f[d][g].tId==a.tId){f[d].splice(g,1);break}i.setFirstNode(b,f);i.setLastNode(b,f);var j,g=f[d].length;if(!b.data.keep.parent&&g==0)f.isParent=!1,f.open=!1,g=k(f,e.id.UL,b),l=k(f,e.id.SWITCH,b),j=k(f,e.id.ICON,b),i.replaceSwitchClass(f,l,e.folder.DOCU),i.replaceIcoClass(f,
+j,e.folder.DOCU),g.css("display","none");else if(b.view.showLine&&g>0){var n=f[d][g-1],g=k(n,e.id.UL,b),l=k(n,e.id.SWITCH,b);j=k(n,e.id.ICON,b);f==c?f[d].length==1?i.replaceSwitchClass(n,l,e.line.ROOT):(c=k(f[d][0],e.id.SWITCH,b),i.replaceSwitchClass(f[d][0],c,e.line.ROOTS),i.replaceSwitchClass(n,l,e.line.BOTTOM)):i.replaceSwitchClass(n,l,e.line.BOTTOM);g.removeClass(e.line.LINE)}}},replaceIcoClass:function(b,a,c){if(a&&!b.isAjaxing&&(b=a.attr("class"),b!=void 0)){b=b.split("_");switch(c){case e.folder.OPEN:case e.folder.CLOSE:case e.folder.DOCU:b[b.length-
+1]=c}a.attr("class",b.join("_"))}},replaceSwitchClass:function(b,a,c){if(a){var d=a.attr("class");if(d!=void 0){d=d.split("_");switch(c){case e.line.ROOT:case e.line.ROOTS:case e.line.CENTER:case e.line.BOTTOM:case e.line.NOLINE:d[0]=i.makeNodeLineClassEx(b)+c;break;case e.folder.OPEN:case e.folder.CLOSE:case e.folder.DOCU:d[1]=c}a.attr("class",d.join("_"));c!==e.folder.DOCU?a.removeAttr("disabled"):a.attr("disabled","disabled")}}},selectNode:function(b,a,c){c||i.cancelPreSelectedNode(b);k(a,e.id.A,
+b).addClass(e.node.CURSELECTED);h.addSelectedNode(b,a)},setNodeFontCss:function(b,a){var c=k(a,e.id.A,b),d=i.makeNodeFontCss(b,a);d&&c.css(d)},setNodeLineIcos:function(b,a){if(a){var c=k(a,e.id.SWITCH,b),d=k(a,e.id.UL,b),f=k(a,e.id.ICON,b),g=i.makeUlLineClass(b,a);g.length==0?d.removeClass(e.line.LINE):d.addClass(g);c.attr("class",i.makeNodeLineClass(b,a));a.isParent?c.removeAttr("disabled"):c.attr("disabled","disabled");f.removeAttr("style");f.attr("style",i.makeNodeIcoStyle(b,a));f.attr("class",
+i.makeNodeIcoClass(b,a))}},setNodeName:function(b,a){var c=h.getNodeTitle(b,a),d=k(a,e.id.SPAN,b);d.empty();b.view.nameIsHTML?d.html(h.getNodeName(b,a)):d.text(h.getNodeName(b,a));j.apply(b.view.showTitle,[b.treeId,a],b.view.showTitle)&&k(a,e.id.A,b).attr("title",!c?"":c)},setNodeTarget:function(b,a){k(a,e.id.A,b).attr("target",i.makeNodeTarget(a))},setNodeUrl:function(b,a){var c=k(a,e.id.A,b),d=i.makeNodeUrl(b,a);d==null||d.length==0?c.removeAttr("href"):c.attr("href",d)},switchNode:function(b,a){a.open||
+!j.canAsync(b,a)?i.expandCollapseNode(b,a,!a.open):b.async.enable?i.asyncNode(b,a)||i.expandCollapseNode(b,a,!a.open):a&&i.expandCollapseNode(b,a,!a.open)}};p.fn.zTree={consts:{className:{BUTTON:"button",LEVEL:"level",ICO_LOADING:"ico_loading",SWITCH:"switch"},event:{NODECREATED:"ztree_nodeCreated",CLICK:"ztree_click",EXPAND:"ztree_expand",COLLAPSE:"ztree_collapse",ASYNC_SUCCESS:"ztree_async_success",ASYNC_ERROR:"ztree_async_error"},id:{A:"_a",ICON:"_ico",SPAN:"_span",SWITCH:"_switch",UL:"_ul"},line:{ROOT:"root",
+ROOTS:"roots",CENTER:"center",BOTTOM:"bottom",NOLINE:"noline",LINE:"line"},folder:{OPEN:"open",CLOSE:"close",DOCU:"docu"},node:{CURSELECTED:"curSelectedNode"}},_z:{tools:j,view:i,event:m,data:h},getZTreeObj:function(b){return(b=h.getZTreeTools(b))?b:null},destroy:function(b){if(b&&b.length>0)i.destroy(h.getSetting(b));else for(var a in r)i.destroy(r[a])},init:function(b,a,c){var d=j.clone(M);p.extend(!0,d,a);d.treeId=b.attr("id");d.treeObj=b;d.treeObj.empty();r[d.treeId]=d;if(typeof document.body.style.maxHeight===
+"undefined")d.view.expandSpeed="";h.initRoot(d);b=h.getRoot(d);a=d.data.key.children;c=c?j.clone(j.isArray(c)?c:[c]):[];b[a]=d.data.simpleData.enable?h.transformTozTreeFormat(d,c):c;h.initCache(d);m.unbindTree(d);m.bindTree(d);m.unbindEvent(d);m.bindEvent(d);c={setting:d,addNodes:function(a,b,c){function e(){i.addNodes(d,a,h,c==!0)}if(!b)return null;a||(a=null);if(a&&!a.isParent&&d.data.keep.leaf)return null;var h=j.clone(j.isArray(b)?b:[b]);j.canAsync(d,a)?i.asyncNode(d,a,c,e):e();return h},cancelSelectedNode:function(a){i.cancelPreSelectedNode(d,
+a)},destroy:function(){i.destroy(d)},expandAll:function(a){a=!!a;i.expandCollapseSonNode(d,null,a,!0);return a},expandNode:function(a,b,c,e,n){if(!a||!a.isParent)return null;b!==!0&&b!==!1&&(b=!a.open);if((n=!!n)&&b&&j.apply(d.callback.beforeExpand,[d.treeId,a],!0)==!1)return null;else if(n&&!b&&j.apply(d.callback.beforeCollapse,[d.treeId,a],!0)==!1)return null;b&&a.parentTId&&i.expandCollapseParentNode(d,a.getParentNode(),b,!1);if(b===a.open&&!c)return null;h.getRoot(d).expandTriggerFlag=n;if(!j.canAsync(d,
+a)&&c)i.expandCollapseSonNode(d,a,b,!0,function(){if(e!==!1)try{k(a,d).focus().blur()}catch(b){}});else if(a.open=!b,i.switchNode(this.setting,a),e!==!1)try{k(a,d).focus().blur()}catch(m){}return b},getNodes:function(){return h.getNodes(d)},getNodeByParam:function(a,b,c){return!a?null:h.getNodeByParam(d,c?c[d.data.key.children]:h.getNodes(d),a,b)},getNodeByTId:function(a){return h.getNodeCache(d,a)},getNodesByParam:function(a,b,c){return!a?null:h.getNodesByParam(d,c?c[d.data.key.children]:h.getNodes(d),
+a,b)},getNodesByParamFuzzy:function(a,b,c){return!a?null:h.getNodesByParamFuzzy(d,c?c[d.data.key.children]:h.getNodes(d),a,b)},getNodesByFilter:function(a,b,c,e){b=!!b;return!a||typeof a!="function"?b?null:[]:h.getNodesByFilter(d,c?c[d.data.key.children]:h.getNodes(d),a,b,e)},getNodeIndex:function(a){if(!a)return null;for(var b=d.data.key.children,c=a.parentTId?a.getParentNode():h.getRoot(d),e=0,i=c[b].length;e<i;e++)if(c[b][e]==a)return e;return-1},getSelectedNodes:function(){for(var a=[],b=h.getRoot(d).curSelectedList,
+c=0,e=b.length;c<e;c++)a.push(b[c]);return a},isSelectedNode:function(a){return h.isSelectedNode(d,a)},reAsyncChildNodes:function(a,b,c){if(this.setting.async.enable){var j=!a;j&&(a=h.getRoot(d));if(b=="refresh"){for(var b=this.setting.data.key.children,m=0,p=a[b]?a[b].length:0;m<p;m++)h.removeNodeCache(d,a[b][m]);h.removeSelectedNode(d);a[b]=[];j?this.setting.treeObj.empty():k(a,e.id.UL,d).empty()}i.asyncNode(this.setting,j?null:a,!!c)}},refresh:function(){this.setting.treeObj.empty();var a=h.getRoot(d),
+b=a[d.data.key.children];h.initRoot(d);a[d.data.key.children]=b;h.initCache(d);i.createNodes(d,0,a[d.data.key.children])},removeChildNodes:function(a){if(!a)return null;var b=a[d.data.key.children];i.removeChildNodes(d,a);return b?b:null},removeNode:function(a,b){a&&(b=!!b,b&&j.apply(d.callback.beforeRemove,[d.treeId,a],!0)==!1||(i.removeNode(d,a),b&&this.setting.treeObj.trigger(e.event.REMOVE,[d.treeId,a])))},selectNode:function(a,b){if(a&&j.uCanDo(d)){b=d.view.selectedMulti&&b;if(a.parentTId)i.expandCollapseParentNode(d,
+a.getParentNode(),!0,!1,function(){try{k(a,d).focus().blur()}catch(b){}});else try{k(a,d).focus().blur()}catch(c){}i.selectNode(d,a,b)}},transformTozTreeNodes:function(a){return h.transformTozTreeFormat(d,a)},transformToArray:function(a){return h.transformToArrayFormat(d,a)},updateNode:function(a){a&&k(a,d).get(0)&&j.uCanDo(d)&&(i.setNodeName(d,a),i.setNodeTarget(d,a),i.setNodeUrl(d,a),i.setNodeLineIcos(d,a),i.setNodeFontCss(d,a))}};b.treeTools=c;h.setZTreeTools(d,c);b[a]&&b[a].length>0?i.createNodes(d,
+0,b[a]):d.async.enable&&d.async.url&&d.async.url!==""&&i.asyncNode(d);return c}};var N=p.fn.zTree,k=j.$,e=N.consts})(jQuery);
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/apiCss/zTreeStyleForApi.css b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/apiCss/zTreeStyleForApi.css
new file mode 100644
index 0000000..bb4717b
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/apiCss/zTreeStyleForApi.css
@@ -0,0 +1,49 @@
+/*-------------------------------------
+zTree Style
+
+version:	3.0
+author:		Hunter.z
+email:		hunter.z@263.net
+website:	http://code.google.com/p/jquerytree/
+
+-------------------------------------*/
+
+.ztree * {padding:0; margin:0; font-size:12px; font-family: Verdana, Arial, Helvetica, AppleGothic, sans-serif}
+.ztree {margin:0; padding:5px; color:#333}
+.ztree li{padding:0; margin:0; list-style:none; line-height:14px; text-align:left; white-space:nowrap}
+.ztree li ul{ margin:0; padding:0 0 0 18px}
+.ztree li ul.line{ background:url(./img/line_conn.gif) 0 0 repeat-y;}
+
+.ztree li a {padding:1px 3px 0 0; margin:0; cursor:pointer; color:#333; height:17px; text-decoration:none; vertical-align:top; display: inline-block}
+.ztree li a:hover {text-decoration:none}
+.ztree li a.curSelectedNode {padding-top:0px; background-color:#FFE6B0; color:black; height:16px; border:1px #FFB951 solid;}
+.ztree li a.curSelectedNode_Edit {padding-top:0px; background-color:#FFE6B0; color:black; height:16px; border:1px #FFB951 solid; opacity:0.8; filter:alpha(opacity=80)}
+.ztree li a.tmpTargetNode_inner {padding-top:0px; background-color:#316AC5; color:white; height:16px; border:1px #316AC5 solid; opacity:0.8; filter:alpha(opacity=80)}
+.ztree li a.tmpTargetNode_prev {}
+.ztree li a.tmpTargetNode_next {}
+.ztree li a input.rename {height:14px; width:80px; padding:0; margin:0;
+	font-size:12px; border:1px #7EC4CC solid; *border:0px}
+.ztree li span {line-height:16px; margin-right: 2px}
+.ztree li span.button {line-height:0; margin:0;width:16px; height:16px; display: inline-block; vertical-align:middle;
+	border:0 none; cursor: pointer;
+	background-color:transparent; background-repeat:no-repeat; background-attachment: scroll;
+	background-image:url("./img/zTreeStandard.png"); *background-image:url("./img/zTreeStandard.gif")}
+
+.ztree li span.button.switch {width:1px; height:18px; visibility: hidden}
+
+.zTreeDragUL {margin:0; padding:0; position:absolute; background-color:#cfcfcf; border:1px #00B83F dotted; opacity:0.8; filter:alpha(opacity=80)}
+.zTreeMask {z-index:10000; background-color:#cfcfcf; opacity:0.0; filter:alpha(opacity=0); position:absolute}
+
+/* level 等级样式*/
+/*.ztree li button.level0 {
+	display:none;
+}
+.ztree li ul.level0 {
+	padding:0;
+	background:none;
+}*/
+
+.ztree li span.button.core_ico_docu{margin-right:2px; background-position:-126px 0; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.check_ico_docu{margin-right:2px; background-position:-126px -16px; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.edit_ico_docu{margin-right:2px; background-position:-126px -32px; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.hide_ico_docu{margin-right:2px; background-position:-160px 0; vertical-align:top; *vertical-align:middle}
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/fn.zTree._z.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/fn.zTree._z.html
new file mode 100644
index 0000000..7af3e40
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/fn.zTree._z.html
@@ -0,0 +1,13 @@
+<div class="apiDetail">
+<div>
+	<h2><span>JSON</span><span class="path">$.fn.zTree.</span>_z</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>zTree v3.x 内部的全部方法都可以通过 $.fn.zTree._z 进行调用，开放出来是为了更便于大家开发制作自己的 zTree 插件。 </p>
+			<p class="highlight_red">如无特殊需求请勿使用此对象，以及修改此对象内部的各个函数。</p>
+		</div>
+	</div>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/fn.zTree.destroy.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/fn.zTree.destroy.html
new file mode 100644
index 0000000..7105807
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/fn.zTree.destroy.html
@@ -0,0 +1,28 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId)</span><span class="path">$.fn.zTree.</span>destroy</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>从 zTree v3.4 开始提供销毁 zTree 的方法。 </p>
+			<p>1、用此方法可以销毁指定 treeId 的 zTree，也可以销毁当前页面全部的 zTree。</p>
+			<p class="highlight_red">2、销毁指定 treeId 的 zTree 也可以使用 zTreeObj.destroy() 方法。</p>
+			<p class="highlight_red">3、重新使用已经被销毁的树，必须要使用 init 方法进行初始化。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree 的 DOM 容器的 id</p>
+	<p class="highlight_red">省略 treeId，表示销毁当前页面全部的 zTree</p>
+	<h4 class="topLine"><b>返回值</b><span>无</span></h4>
+	<p>目前无任何返回值</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 销毁 id 为 "treeDemo" 的 zTree</h4>
+	<pre xmlns=""><code>$.fn.zTree.destroy("treeDemo");</code></pre>
+	<h4>2. 销毁全部 的 zTree</h4>
+	<pre xmlns=""><code>$.fn.zTree.destroy();</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/fn.zTree.getZTreeObj.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/fn.zTree.getZTreeObj.html
new file mode 100644
index 0000000..b1d1db4
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/fn.zTree.getZTreeObj.html
@@ -0,0 +1,24 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId)</span><span class="path">$.fn.zTree.</span>getZTreeObj</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>zTree v3.x 专门提供的根据 treeId 获取 zTree 对象的方法。 </p>
+			<p class="highlight_red">必须在初始化 zTree 以后才可以使用此方法。</p>
+			<p>有了这个方法，用户不再需要自己设定全局变量来保存 zTree 初始化后得到的对象了，而且在所有回调函数中全都会返回 treeId 属性，用户可以随时使用此方法获取需要进行操作的 zTree 对象</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree 的 DOM 容器的 id</p>
+	<h4 class="topLine"><b>返回值</b><span>JSON</span></h4>
+	<p>zTree 对象，提供操作 zTree 的各种方法，对于通过 js 操作 zTree 来说必须通过此对象</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 获取 id 为 tree 的 zTree 对象</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/fn.zTree.init.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/fn.zTree.init.html
new file mode 100644
index 0000000..8db6d2c
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/fn.zTree.init.html
@@ -0,0 +1,74 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(obj, zSetting, zNodes)</span><span class="path">$.fn.zTree.</span>init</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>zTree 初始化方法，创建 zTree 必须使用此方法</p>
+			<p>1、页面需要进行 W3C 申明，例如：&lt;!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"&nbsp;&nbsp; &nbsp;"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"&gt;。</p>
+			<p>2、需要首先加载 jquery-1.4.2.js 或其他更高版本的 jQuery 。</p>
+			<p>3、需要加载 jquery-ztree.core-3.0.js，如果需要用到 编辑功能 或 checkbox / radio 还需要分别加载 jquery-ztree.exedit-3.0.js 和 jquery-ztree.excheck-3.0.js 。</p>
+			<p>4、需要加载 zTreeStyle.css 以及 zTreeStyle 目录下的 img 文件。</p>
+			<p>5、如果需要使用自定义图标请参考相应的Demo。</p>
+			<p>6、请注意设置 zTree 的容器样式 class="ztree"，其中 "ztree" 这个 className，可以根据需要随意修改，别忘了修改 css 中对应名字就是了，对于容器如果需要增加其他特殊样式，可根据自己的需要进行修改。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>obj</b><span>jQuery Object</span></h4>
+	<p>用于展现 zTree 的 DOM 容器</p>
+	<h4 class="topLine"><b>zSetting</b><span>JSON</span></h4>
+	<p>zTree 的配置数据，具体请参考 “setting 配置详解”中的各个属性详细说明</p>
+	<h4 class="topLine"><b>zNodes</b><span>Array(JSON) / JSON</span></h4>
+	<p>zTree 的节点数据，具体请参考 “treeNode 节点数据详解”中的各个属性详细说明</p>
+	<p class="highlight_red">1、v3.x 支持单独添加一个节点，即如果只新增一个节点，不用必须包在数组中</p>
+	<p class="highlight_red">2、如果需要异步加载根节点，可以设置为 null 或 [ ]</p>
+	<p class="highlight_red">3、使用简单数据模式，请参考 setting.data.simpleData 内的属性说明</p>
+	<h4 class="topLine"><b>返回值</b><span>JSON</span></h4>
+	<p>zTree 对象，提供操作 zTree 的各种方法，对于通过 js 操作 zTree 来说必须通过此对象</p>
+	<p class="highlight_red">如果不需要自行设定全局变量保存，可以利用 $.fn.zTree.getZTreeObj 方法随时获取</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 简单创建 zTree 演示</h4>
+	<pre xmlns=""><code>&lt;!DOCTYPE html&gt;
+&lt;HTML&gt;
+ &lt;HEAD&gt;
+  &lt;TITLE&gt; ZTREE DEMO &lt;/TITLE&gt;
+  &lt;meta http-equiv="content-type" content="text/html; charset=UTF-8"&gt;
+  &lt;link rel="stylesheet" href="zTreeStyle/zTreeStyle.css" type="text/css"&gt;
+  &lt;script type="text/javascript" src="jquery-1.4.2.js"&gt;&lt;/script&gt;
+  &lt;script type="text/javascript" src="jquery.ztree.core-3.5.js"&gt;&lt;/script&gt;
+&lt;!--
+  &lt;script type="text/javascript" src="jquery.ztree.excheck-3.5.js"&gt;&lt;/script&gt;
+  &lt;script type="text/javascript" src="jquery.ztree.exedit-3.5.js"&gt;&lt;/script&gt;
+--&gt;
+  &lt;SCRIPT type="text/javascript" &gt;
+	var zTreeObj,
+	setting = {
+		view: {
+			selectedMulti: false
+		}
+	},
+	zTreeNodes = [
+		{"name":"网站导航", open:true, children: [
+			{ "name":"google", "url":"http://g.cn", "target":"_blank"},
+			{ "name":"baidu", "url":"http://baidu.com", "target":"_blank"},
+			{ "name":"sina", "url":"http://www.sina.com.cn", "target":"_blank"}
+			]
+		}
+	];
+
+	$(document).ready(function(){
+		zTreeObj = $.fn.zTree.init($("#tree"), setting, zTreeNodes);
+
+	});
+  &lt;/SCRIPT&gt;
+ &lt;/HEAD&gt;
+
+&lt;BODY&gt;
+&lt;ul id="tree" class="ztree" style="width:230px; overflow:auto;"&gt;&lt;/ul&gt;
+ &lt;/BODY&gt;
+&lt;/HTML&gt;</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.async.autoParam.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.async.autoParam.html
new file mode 100644
index 0000000..cf0f4d2
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.async.autoParam.html
@@ -0,0 +1,39 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Array(String)</span><span class="path">setting.async.</span>autoParam</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>异步加载时需要自动提交父节点属性的参数。<span class="highlight_red">[setting.async.enable = true 时生效]</span></p>
+			<p>默认值：[ ]</p>
+		</div>
+	</div>
+	<h3>Array(String) 格式说明</h3>
+	<div class="desc">
+	<p>1、将需要作为参数提交的属性名称，制作成 Array 即可，例如：["id", "name"]</p>
+	<p>2、可以设置提交时的参数名称，例如 server 只接受 zId : ["id=zId"]</p>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 设置 id 属性为自动提交的参数</h4>
+	<pre xmlns=""><code>var setting = {
+	async: {
+		enable: true,
+		url: "http://host/getNode.php",
+		autoParam: ["id"]
+	}
+};
+假设 异步加载 父节点(node = {id:1, name:"test"}) 的子节点时，将提交参数 id=1
+......</code></pre>
+	<h4>2. 设置 id 属性作为 zId 成为自动提交的参数</h4>
+	<pre xmlns=""><code>var setting = {
+	async: {
+		enable: true,
+		url: "http://host/getNode.php",
+		autoParam: ["id=zId"]
+	}
+};
+假设 对父节点 node = {id:1, name:"test"}，进行异步加载时，将提交参数 zId=1
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.async.contentType.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.async.contentType.html
new file mode 100644
index 0000000..db0c92f
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.async.contentType.html
@@ -0,0 +1,29 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">setting.async.</span>contentType</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Ajax 提交参数的数据类型。<span class="highlight_red">[setting.async.enable = true 时生效]</span></p>
+			<p>默认值："application/x-www-form-urlencoded"</p>
+		</div>
+	</div>
+	<h3>String 格式说明</h3>
+	<div class="desc">
+	<p> contentType = "application/x-www-form-urlencoded" 可以满足绝大部分请求，按照标准的 Form 格式提交参数</p>
+	<p> contentType = "application/json" 可以满足 .Net 的编程需要，按照 JSON 格式提交参数</p>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 设置 Ajax 提交参数的数据类型为 JSON 格式</h4>
+	<pre xmlns=""><code>var setting = {
+	async: {
+		enable: true,
+		contentType: "application/json",
+		url: "http://host/getNode.php",
+		autoParam: ["id", "name"]
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.async.dataFilter.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.async.dataFilter.html
new file mode 100644
index 0000000..f174bf0
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.async.dataFilter.html
@@ -0,0 +1,45 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, parentNode, responseData)</span><span class="path">setting.async.</span>dataFilter</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于对 Ajax 返回数据进行预处理的函数。<span class="highlight_red">[setting.async.enable = true 时生效]</span></p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>parentNode</b><span>JSON</span></h4>
+	<p>进行异步加载的父节点 JSON 数据对象</p>
+	<p class="highlight_red">对根进行异步加载时，parentNode = null</p>
+	<h4 class="topLine"><b>responseData</b><span>Array(JSON) / JSON / String</span></h4>
+	<p>异步加载获取到的数据转换后的 Array(JSON) / JSON / String 数据对象</p>
+	<p class="highlight_red">v3.4开始 支持 XML 数据格式的 String</p>
+	<h4 class="topLine"><b>返回值</b><span>Array(JSON) / JSON</span></h4>
+	<p>返回值是 zTree 支持的JSON 数据结构即可。</p>
+	<p class="highlight_red">v3.x 支持单个 JSON 节点数据进行加载</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 修改异步获取到的节点name属性</h4>
+	<pre xmlns=""><code>function ajaxDataFilter(treeId, parentNode, responseData) {
+    if (responseData) {
+      for(var i =0; i < responseData.length; i++) {
+        responseData[i].name += "_filter";
+      }
+    }
+    return responseData;
+};
+var setting = {
+	async: {
+		enable: true,
+		url: "http://host/getNode.php",
+		dataFilter: ajaxDataFilter
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.async.dataType.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.async.dataType.html
new file mode 100644
index 0000000..6d639b7
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.async.dataType.html
@@ -0,0 +1,29 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">setting.async.</span>dataType</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Ajax 获取的数据类型。<span class="highlight_red">[setting.async.enable = true 时生效]</span></p>
+			<p>默认值："text"</p>
+		</div>
+	</div>
+	<h3>String 格式说明</h3>
+	<div class="desc">
+	<p> dataType = "text" 可以满足绝大部分请求</p>
+	<p class="highlight_red">其余 dataType 类型请参考 jQuery ajax 中的 dataType 参数</p>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 设置 Ajax 获取的数据类型为 纯文本</h4>
+	<pre xmlns=""><code>var setting = {
+	async: {
+		enable: true,
+		dataType: "text",
+		url: "http://host/getNode.php",
+		autoParam: ["id", "name"]
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.async.enable.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.async.enable.html
new file mode 100644
index 0000000..9079ae1
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.async.enable.html
@@ -0,0 +1,30 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.async.</span>enable</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>设置 zTree 是否开启异步加载模式</p>
+			<p>默认值：false</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p> true 表示 开启 异步加载模式</p>
+	<p> false 表示 关闭 异步加载模式</p>
+	<p class="highlight_red">如果设置为 true，请务必设置 setting.async 内的其它参数。</p>
+	<p class="highlight_red">如果需要根节点也异步加载，初始化时 treeNodes 参数设置为 null 即可。</p>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 需要开启异步加载模式</h4>
+	<pre xmlns=""><code>var setting = {
+	async: {
+		enable: true,
+		url: "http://host/getNode.php",
+		autoParam: ["id", "name"]
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.async.otherParam.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.async.otherParam.html
new file mode 100644
index 0000000..981715f
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.async.otherParam.html
@@ -0,0 +1,40 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Array(String) / JSON</span><span class="path">setting.async.</span>otherParam</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Ajax 请求提交的静态参数键值对。<span class="highlight_red">[setting.async.enable = true 时生效]</span></p>
+			<p>默认值：[ ]</p>
+		</div>
+	</div>
+	<h3>Array(String) 格式说明</h3>
+	<div class="desc">
+	<p>可以为空[ ]，如果有 key，则必须存在 value。 例如：[key, value]</p>
+	</div>
+	<h3>JSON 格式说明</h3>
+	<div class="desc">
+	<p>直接用 JSON 格式制作键值对，例如：{ key1:value1, key2:value2 }</p>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 设置 Array(String) 格式的参数</h4>
+	<pre xmlns=""><code>var setting = {
+	async: {
+		enable: true,
+		url: "http://host/getNode.php",
+		otherParam: ["id", "1", "name", "test"]
+	}
+};
+进行异步加载时，将提交参数 id=1&name=test</code></pre>
+	<h4>2. 设置 JSON 格式的参数</h4>
+	<pre xmlns=""><code>var setting = {
+	async: {
+		enable: true,
+		url: "http://host/getNode.php",
+		otherParam: { "id":"1", "name":"test"}
+	}
+};
+进行异步加载时，将提交参数 id=1&name=test</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.async.type.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.async.type.html
new file mode 100644
index 0000000..20d9a6b
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.async.type.html
@@ -0,0 +1,30 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">setting.async.</span>type</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Ajax 的 http 请求模式。<span class="highlight_red">[setting.async.enable = true 时生效]</span></p>
+			<p>默认值："post"</p>
+		</div>
+	</div>
+	<h3>String 格式说明</h3>
+	<div class="desc">
+	<p> type = "post" 表示异步加载采用 post 方法请求</p>
+	<p> type = "get" 表示异步加载采用 get 方法请求</p>
+	<p class="highlight_red">对应于 jQuery ajax 中的 type 参数</p>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 设置使用 get 方式请求数据</h4>
+	<pre xmlns=""><code>var setting = {
+	async: {
+		enable: true,
+		type: "get",
+		url: "http://host/getNode.php",
+		autoParam: ["id", "name"]
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.async.url.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.async.url.html
new file mode 100644
index 0000000..a5209af
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.async.url.html
@@ -0,0 +1,50 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String / Function(treeId, treeNode)</span><span class="path">setting.async.</span>url</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Ajax 获取数据的 URL 地址。<span class="highlight_red">[setting.async.enable = true 时生效]</span></p>
+			<p>默认值：""</p>
+		</div>
+	</div>
+	<h3>String 格式说明</h3>
+	<div class="desc">
+	<p>设置固定的异步加载 url 字符串，请注意地址的路径，确保页面能正常加载</p>
+	<p class="highlight_red">url 内也可以带参数，这些参数就只能是通过 get 方式提交了，并且请注意进行转码</p>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>需要异步加载子节点的的父节点 JSON 数据对象</p>
+	<p class="highlight_red">针对根进行异步加载时，treeNode = null</p>
+	<h4 class="topLine"><b>返回值</b><span>String</span></h4>
+	<p>返回值同 String 格式的数据</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 设置异步获取节点的 URL 为 nodes.php</h4>
+	<pre xmlns=""><code>var setting = {
+	async: {
+		enable: true,
+		url: "nodes.php",
+		autoParam: ["id", "name"]
+	}
+};
+......</code></pre>
+	<h4>2. 设置异步获取节点的 URL 为 function 动态获取</h4>
+	<pre xmlns=""><code>function getAsyncUrl(treeId, treeNode) {
+    return treeNode.isParent ? "nodes1.php" : "nodes2.php";
+};
+var setting = {
+	async: {
+		enable: true,
+		url: getAsyncUrl,
+		autoParam: ["id", "name"]
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.beforeAsync.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.beforeAsync.html
new file mode 100644
index 0000000..70ba0fc
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.beforeAsync.html
@@ -0,0 +1,35 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNode)</span><span class="path">setting.callback.</span>beforeAsync</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于捕获异步加载之前的事件回调函数，zTree 根据返回值确定是否允许进行异步加载</p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>进行异步加载的父节点 JSON 数据对象</p>
+	<p class="highlight_red">针对根进行异步加载时，treeNode = null</p>
+	<h4 class="topLine"><b>返回值</b><span>Boolean</span></h4>
+	<p>返回值是 true / false</p>
+	<p class="highlight_red">如果返回 false，zTree 将不进行异步加载，也无法触发 onAsyncSuccess / onAsyncError 事件回调函数</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 禁止 id 为 1 的父节点进行异步加载操作</h4>
+	<pre xmlns=""><code>function zTreeBeforeAsync(treeId, treeNode) {
+    return (treeNode.id !== 1);
+};
+var setting = {
+	callback: {
+		beforeAsync: zTreeBeforeAsync
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.beforeCheck.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.beforeCheck.html
new file mode 100644
index 0000000..a0e1f42
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.beforeCheck.html
@@ -0,0 +1,34 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNode)</span><span class="path">setting.callback.</span>beforeCheck</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.excheck</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于捕获 勾选 或 取消勾选 之前的事件回调函数，并且根据返回值确定是否允许 勾选 或 取消勾选 </p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>进行 勾选 或 取消勾选 的节点 JSON 数据对象</p>
+	<h4 class="topLine"><b>返回值</b><span>Boolean</span></h4>
+	<p>返回值是 true / false</p>
+	<p class="highlight_red">如果返回 false，将不会改变勾选状态，并且无法触发 onCheck 事件回调函数</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 禁止所有勾选操作，保持初始化的勾选状态</h4>
+	<pre xmlns=""><code>function zTreeBeforeCheck(treeId, treeNode) {
+    return false;
+};
+var setting = {
+	callback: {
+		beforeCheck: zTreeBeforeCheck
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.beforeClick.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.beforeClick.html
new file mode 100644
index 0000000..6d6e748
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.beforeClick.html
@@ -0,0 +1,49 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNode, clickFlag)</span><span class="path">setting.callback.</span>beforeClick</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于捕获单击节点之前的事件回调函数，并且根据返回值确定是否允许单击操作</p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>被单击的节点 JSON 数据对象</p>
+	<h4 class="topLine"><b>clickFlag</b><span>Number</span></h4>
+	<p>节点被点击后的选中操作类型，详细看下表</p>
+	<table width="100%" border="0" cellspacing="1" cellpadding="0">
+		<thead><tr><td>clickFlag</td><td title="是否允许多点选中">selectedMulti</td><td title="是否按下 Ctrl 键">autoCancelSelected<br/>&&<br/>event.ctrlKey</td><td title="节点当前选择状态">isSelected</td><td>选中操作</td></tr></thead>
+		<tbody>
+			<tr><td>1</td><td>true</td><td>false</td><td>false</td><td>普通选中</td></tr>
+			<tr><td>1</td><td>true</td><td>false</td><td>true</td><td>普通选中</td></tr>
+			<tr><td>2</td><td>true</td><td>true</td><td>false</td><td>追加选中</td></tr>
+			<tr><td>0</td><td>true</td><td>true</td><td>true</td><td>取消选中</td></tr>
+			<tr><td>1</td><td>false</td><td>false</td><td>false</td><td>普通选中</td></tr>
+			<tr><td>1</td><td>false</td><td>false</td><td>true</td><td>普通选中</td></tr>
+			<tr><td>1</td><td>false</td><td>true</td><td>false</td><td>普通选中</td></tr>
+			<tr><td>0</td><td>false</td><td>true</td><td>true</td><td>取消选中</td></tr>
+		</tbody>
+	</table>
+	<h4 class="topLine"><b>返回值</b><span>Boolean</span></h4>
+	<p>返回值是 true / false</p>
+	<p class="highlight_red">如果返回 false，zTree 将不会选中节点，也无法触发 onClick 事件回调函数</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 禁止节点被选中</h4>
+	<pre xmlns=""><code>function zTreeBeforeClick(treeId, treeNode, clickFlag) {
+    return (treeNode.id !== 1);
+};
+var setting = {
+	callback: {
+		beforeClick: zTreeBeforeClick
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.beforeCollapse.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.beforeCollapse.html
new file mode 100644
index 0000000..d778e9c
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.beforeCollapse.html
@@ -0,0 +1,34 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNode)</span><span class="path">setting.callback.</span>beforeCollapse</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于捕获父节点折叠之前的事件回调函数，并且根据返回值确定是否允许折叠操作</p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>要折叠的父节点 JSON 数据对象</p>
+	<h4 class="topLine"><b>返回值</b><span>Boolean</span></h4>
+	<p>返回值是 true / false</p>
+	<p class="highlight_red">如果返回 false，zTree 将不会折叠节点，也无法触发 onCollapse 事件回调函数</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 禁止所有已展开的父节点折叠</h4>
+	<pre xmlns=""><code>function zTreeBeforeCollapse(treeId, treeNode) {
+    return false;
+};
+var setting = {
+	callback: {
+		beforeCollapse: zTreeBeforeCollapse
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.beforeDblClick.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.beforeDblClick.html
new file mode 100644
index 0000000..ed7e4dc
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.beforeDblClick.html
@@ -0,0 +1,36 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNode)</span><span class="path">setting.callback.</span>beforeDblClick</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于捕获 zTree 上鼠标双击之前的事件回调函数，并且根据返回值确定触发 onDblClick 事件回调函数</p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>鼠标双击时所在节点的 JSON 数据对象</p>
+	<p class="highlight_red">如果不在节点上，则返回 null</p>
+	<h4 class="topLine"><b>返回值</b><span>Boolean</span></h4>
+	<p>返回值是 true / false</p>
+	<p class="highlight_red">如果返回 false，将仅仅无法触发 onDblClick 事件回调函数，对其他操作无任何影响</p>
+	<p class="highlight_red">此事件回调函数对双击节点展开功能无任何影响，如果需要设置请参考 setting.view.dblClickExpand 属性</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 禁止 onDblClick 事件</h4>
+	<pre xmlns=""><code>function zTreeBeforeDblClick(treeId, treeNode) {
+    return false;
+};
+var setting = {
+	callback: {
+		beforeDblClick: zTreeBeforeDblClick
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.beforeDrag.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.beforeDrag.html
new file mode 100644
index 0000000..1e783a3
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.beforeDrag.html
@@ -0,0 +1,39 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNodes)</span><span class="path">setting.callback.</span>beforeDrag</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于捕获节点被拖拽之前的事件回调函数，并且根据返回值确定是否允许开启拖拽操作</p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>被拖拽的节点 treeNodes 所在 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNodes</b><span>Array(JSON)</span></h4>
+	<p>要被拖拽的节点 JSON 数据集合</p>
+	<p class="highlight_red">v3.x 允许多个同级节点同时被拖拽，因此将此参数修改为 Array(JSON)</p>
+	<p class="highlight_red">如果拖拽时多个被选择的节点不是同级关系，则只能拖拽鼠标当前所在位置的节点</p>
+	<h4 class="topLine"><b>返回值</b><span>Boolean</span></h4>
+	<p>返回值是 true / false</p>
+	<p class="highlight_red">如果返回 false，zTree 将终止拖拽，也无法触发 onDrag / beforeDrop / onDrop 事件回调函数</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 禁止全部拖拽操作</h4>
+	<pre xmlns=""><code>function zTreeBeforeDrag(treeId, treeNodes) {
+    return false;
+};
+var setting = {
+	edit: {
+		enable: true
+	},
+	callback: {
+		beforeDrag: zTreeBeforeDrag
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.beforeDragOpen.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.beforeDragOpen.html
new file mode 100644
index 0000000..ceab2d3
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.beforeDragOpen.html
@@ -0,0 +1,37 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNode)</span><span class="path">setting.callback.</span>beforeDragOpen</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于捕获拖拽节点移动到折叠状态的父节点后，即将自动展开该父节点之前的事件回调函数，并且根据返回值确定是否允许自动展开操作</p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>需要被展开的父节点 treeNode 所在 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>要被自动展开的父节点 JSON 数据对象</p>
+	<h4 class="topLine"><b>返回值</b><span>Boolean</span></h4>
+	<p>返回值是 true / false</p>
+	<p class="highlight_red">如果返回 false，zTree 将无法进行自动展开操作</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 禁止全部拖拽时的自动展开操作</h4>
+	<pre xmlns=""><code>function zTreeBeforeDragOpen(treeId, treeNode) {
+    return false;
+};
+var setting = {
+	edit: {
+		enable: true
+	},
+	callback: {
+		beforeDragOpen: zTreeBeforeDragOpen
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.beforeDrop.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.beforeDrop.html
new file mode 100644
index 0000000..4123743
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.beforeDrop.html
@@ -0,0 +1,48 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNodes, targetNode, moveType, isCopy)</span><span class="path">setting.callback.</span>beforeDrop</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于捕获节点拖拽操作结束之前的事件回调函数，并且根据返回值确定是否允许此拖拽操作</p>
+			<p>默认值：null</p>
+			<p class="highlight_red">如未拖拽到有效位置，则不触发此回调函数，直接将节点恢复原位置</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>目标节点 targetNode 所在 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNodes</b><span>Array(JSON)</span></h4>
+	<p>被拖拽的节点 JSON 数据集合</p>
+	<p class="highlight_red">无论拖拽操作为 复制 还是 移动，treeNodes 都是当前被拖拽节点的数据集合。</p>
+	<h4 class="topLine"><b>targetNode</b><span>JSON</span></h4>
+	<p>treeNodes 被拖拽放开的目标节点 JSON 数据对象。</p>
+	<p class="highlight_red">如果拖拽成为根节点，则 targetNode = null</p>
+	<h4 class="topLine"><b>moveType</b><span>String</span></h4>
+	<p>指定移动到目标节点的相对位置</p>
+	<p class="highlight_red">"inner"：成为子节点，"prev"：成为同级前一个节点，"next"：成为同级后一个节点</p>
+	<h4 class="topLine"><b>isCopy</b><span>Boolean</span></h4>
+	<p>拖拽节点操作是 复制 或 移动</p>
+	<p class="highlight_red">true：复制；false：移动</p>
+	<h4 class="topLine"><b>返回值</b><span>Boolean</span></h4>
+	<p>返回值是 true / false</p>
+	<p class="highlight_red">如果返回 false，zTree 将恢复被拖拽的节点，也无法触发 onDrop 事件回调函数</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 禁止将节点拖拽成为根节点</h4>
+	<pre xmlns=""><code>function zTreeBeforeDrop(treeId, treeNodes, targetNode, moveType) {
+    return !(targetNode == null || (moveType != "inner" && !targetNode.parentTId));
+};
+var setting = {
+	edit: {
+		enable: true
+	},
+	callback: {
+		beforeDrop: zTreeBeforeDrop
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.beforeEditName.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.beforeEditName.html
new file mode 100644
index 0000000..9df3ca2
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.beforeEditName.html
@@ -0,0 +1,38 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNode)</span><span class="path">setting.callback.</span>beforeEditName</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于捕获节点编辑按钮的 click 事件，并且根据返回值确定是否允许进入名称编辑状态</p>
+			<p class="highlight_red">此事件回调函数最主要是用于捕获编辑按钮的点击事件，然后触发自定义的编辑界面操作。</p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>将要进入编辑名称状态的节点 JSON 数据对象</p>
+	<h4 class="topLine"><b>返回值</b><span>Boolean</span></h4>
+	<p>返回值是 true / false</p>
+	<p class="highlight_red">如果返回 false，节点将无法进入 zTree 默认的编辑名称状态</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 禁止修改父节点的名称</h4>
+	<pre xmlns=""><code>function zTreeBeforeEditName(treeId, treeNode) {
+	return !treeNode.isParent;
+}
+var setting = {
+	edit: {
+		enable: true
+	},
+	callback: {
+		beforeEditName: zTreeBeforeEditName
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.beforeExpand.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.beforeExpand.html
new file mode 100644
index 0000000..350972b
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.beforeExpand.html
@@ -0,0 +1,34 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNode)</span><span class="path">setting.callback.</span>beforeExpand</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于捕获父节点展开之前的事件回调函数，并且根据返回值确定是否允许展开操作</p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>要展开的父节点 JSON 数据对象</p>
+	<h4 class="topLine"><b>返回值</b><span>Boolean</span></h4>
+	<p>返回值是 true / false</p>
+	<p class="highlight_red">如果返回 false，zTree 将不会展开节点，也无法触发 onExpand 事件回调函数</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 禁止所有已折叠的父节点展开</h4>
+	<pre xmlns=""><code>function zTreeBeforeExpand(treeId, treeNode) {
+    return false;
+};
+var setting = {
+	callback: {
+		beforeExpand: zTreeBeforeExpand
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.beforeMouseDown.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.beforeMouseDown.html
new file mode 100644
index 0000000..2c3f28d
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.beforeMouseDown.html
@@ -0,0 +1,35 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNode)</span><span class="path">setting.callback.</span>beforeMouseDown</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于捕获 zTree 上鼠标按键按下之前的事件回调函数，并且根据返回值确定触发 onMouseDown 事件回调函数</p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>鼠标按键按下时所在节点的 JSON 数据对象</p>
+	<p class="highlight_red">如果不在节点上，则返回 null</p>
+	<h4 class="topLine"><b>返回值</b><span>Boolean</span></h4>
+	<p>返回值是 true / false</p>
+	<p class="highlight_red">如果返回 false，将仅仅无法触发 onMouseDown 事件回调函数，对其他操作无任何影响</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 禁止 onMouseDown 事件</h4>
+	<pre xmlns=""><code>function zTreeBeforeMouseDown(treeId, treeNode) {
+    return false;
+};
+var setting = {
+	callback: {
+		beforeMouseDown: zTreeBeforeMouseDown
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.beforeMouseUp.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.beforeMouseUp.html
new file mode 100644
index 0000000..f0b01b9
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.beforeMouseUp.html
@@ -0,0 +1,35 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNode)</span><span class="path">setting.callback.</span>beforeMouseUp</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于捕获 zTree 上鼠标按键松开之前的事件回调函数，并且根据返回值确定触发 onMouseUp 事件回调函数</p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>鼠标按键松开时所在节点的 JSON 数据对象</p>
+	<p class="highlight_red">如果不在节点上，则返回 null</p>
+	<h4 class="topLine"><b>返回值</b><span>Boolean</span></h4>
+	<p>返回值是 true / false</p>
+	<p class="highlight_red">如果返回 false，将仅仅无法触发 onMouseUp 事件回调函数，对其他操作无任何影响</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 禁止 onMouseUp 事件</h4>
+	<pre xmlns=""><code>function zTreeBeforeMouseUp(treeId, treeNode) {
+    return false;
+};
+var setting = {
+	callback: {
+		beforeMouseUp: zTreeBeforeMouseUp
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.beforeRemove.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.beforeRemove.html
new file mode 100644
index 0000000..0edb3fd
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.beforeRemove.html
@@ -0,0 +1,37 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNode)</span><span class="path">setting.callback.</span>beforeRemove</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于捕获节点被删除之前的事件回调函数，并且根据返回值确定是否允许删除操作</p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>将要删除的节点 JSON 数据对象</p>
+	<h4 class="topLine"><b>返回值</b><span>Boolean</span></h4>
+	<p>返回值是 true / false</p>
+	<p class="highlight_red">如果返回 false，zTree 将不删除节点，也无法触发 onRemove 事件回调函数</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 禁止全部删除操作</h4>
+	<pre xmlns=""><code>function zTreeBeforeRemove(treeId, treeNode) {
+	return false;
+}
+var setting = {
+	edit: {
+		enable: true
+	},
+	callback: {
+		beforeRemove: zTreeBeforeRemove
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.beforeRename.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.beforeRename.html
new file mode 100644
index 0000000..0709961
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.beforeRename.html
@@ -0,0 +1,46 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNode, newName, isCancel)</span><span class="path">setting.callback.</span>beforeRename</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于捕获节点编辑名称结束（Input 失去焦点 或 按下 Enter 键）之后，更新节点名称数据之前的事件回调函数，并且根据返回值确定是否允许更改名称的操作</p>
+			<p class="highlight_red">节点进入编辑名称状态后，按 ESC 键可以放弃当前修改，恢复原名称，取消编辑名称状态</p>
+			<p class="highlight_red">从 v3.5.13 开始，取消编辑状态也会触发此回调，根据 isCancel 参数判断</p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>将要更改名称的节点 JSON 数据对象</p>
+	<h4 class="topLine"><b>newName</b><span>String</span></h4>
+	<p>修改后的新名称</p>
+	<h4 class="topLine"><b>isCancel</b><span>Boolean</span></h4>
+	<p>是否取消操作 (v3.5.13+)</p>
+	<p class="highlight_red">isCancel = true 表示取消编辑操作（按下 ESC 或 使用 cancelEditName 方法）</p>
+	<p class="highlight_red">isCancel = false 表示确认修改操作</p>
+	<h4 class="topLine"><b>返回值</b><span>Boolean</span></h4>
+	<p>返回值是 true / false</p>
+	<p class="highlight_red">如果返回 false，zTree 将保持名称编辑状态，无法触发 onRename 事件回调函数，并且会导致屏蔽其它事件，直到修改名称使得 beforeRename 返回 true</p>
+	<p class="highlight_red">如果返回 false，不会让 input 输入框获取焦点，避免由于警告信息而导致反复触发 beforeRename。 请在关闭提示警告信息后，利用 editName 方法让 input 重新获取焦点。</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 禁止修改的名称的长度小于 5</h4>
+	<pre xmlns=""><code>function zTreeBeforeRename(treeId, treeNode, newName, isCancel) {
+	return newName.length > 5;
+}
+var setting = {
+	edit: {
+		enable: true
+	},
+	callback: {
+		beforeRename: zTreeBeforeRename
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.beforeRightClick.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.beforeRightClick.html
new file mode 100644
index 0000000..1a5bdaa
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.beforeRightClick.html
@@ -0,0 +1,35 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNode)</span><span class="path">setting.callback.</span>beforeRightClick</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于捕获 zTree 上鼠标右键点击之前的事件回调函数，并且根据返回值确定触发 onRightClick 事件回调函数</p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>鼠标右键点击时所在节点的 JSON 数据对象</p>
+	<p class="highlight_red">如果不在节点上，则返回 null</p>
+	<h4 class="topLine"><b>返回值</b><span>Boolean</span></h4>
+	<p>返回值是 true / false</p>
+	<p class="highlight_red">如果返回 false，将仅仅无法触发 onRightClick 事件回调函数，对其他操作无任何影响</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 禁止 onRightClick 事件</h4>
+	<pre xmlns=""><code>function zTreeBeforeRightClick(treeId, treeNode) {
+    return false;
+};
+var setting = {
+	callback: {
+		beforeRightClick: zTreeBeforeRightClick
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.onAsyncError.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.onAsyncError.html
new file mode 100644
index 0000000..c469e11
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.onAsyncError.html
@@ -0,0 +1,42 @@
+<div class="apiDetail">
+<div>
+	<h2><span class="path">setting.callback.</span>onAsyncError</h2>
+	<h2><span>Function(event, treeId, treeNode, XMLHttpRequest, textStatus, errorThrown)</span>&nbsp;</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于捕获异步加载出现异常错误的事件回调函数</p>
+			<p class="highlight_red">如果设置了 setting.callback.beforeAsync 方法，且返回 false，将无法触发 onAsyncSuccess / onAsyncError 事件回调函数。</p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>event</b><span>js event 对象</span></h4>
+	<p>标准的 js event 对象</p>
+	<h4 class="topLine"><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>进行异步加载的父节点 JSON 数据对象</p>
+	<p class="highlight_red">针对根进行异步加载时，treeNode = null</p>
+	<h4 class="topLine"><b>XMLHttpRequest</b><span>String</span></h4>
+	<p>标准 XMLHttpRequest 对象，请参考 JQuery API 文档。</p>
+	<h4 class="topLine"><b>textStatus</b><span>String</span></h4>
+	<p>请求状态：success，error，请参考 JQuery API 文档。</p>
+	<h4 class="topLine"><b>errorThrown</b><span>String</span></h4>
+	<p>errorThrown 只有当异常发生时才会被传递，请参考 JQuery API 文档。</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 异步加载出现异常后，弹出错误信息</h4>
+	<pre xmlns=""><code>function zTreeOnAsyncError(event, treeId, treeNode, XMLHttpRequest, textStatus, errorThrown) {
+    alert(XMLHttpRequest);
+};
+var setting = {
+	callback: {
+		onAsyncError: zTreeOnAsyncError
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.onAsyncSuccess.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.onAsyncSuccess.html
new file mode 100644
index 0000000..081e9d7
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.onAsyncSuccess.html
@@ -0,0 +1,38 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(event, treeId, treeNode, msg)</span><span class="path">setting.callback.</span>onAsyncSuccess</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于捕获异步加载正常结束的事件回调函数</p>
+			<p class="highlight_red">如果设置了 setting.callback.beforeAsync 方法，且返回 false，将无法触发 onAsyncSuccess / onAsyncError 事件回调函数。</p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>event</b><span>js event 对象</span></h4>
+	<p>标准的 js event 对象</p>
+	<h4 class="topLine"><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>进行异步加载的父节点 JSON 数据对象</p>
+	<p class="highlight_red">针对根进行异步加载时，treeNode = null</p>
+	<h4 class="topLine"><b>msg</b><span>String / Object</span></h4>
+	<p>异步获取的节点数据字符串，主要便于用户调试使用。</p>
+	<p class="highlight_red">实际数据类型会受 setting.async.dataType 的设置影响，请参考 JQuery API 文档。</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 异步加载成功后，弹出提示信息</h4>
+	<pre xmlns=""><code>function zTreeOnAsyncSuccess(event, treeId, treeNode, msg) {
+    alert(msg);
+};
+var setting = {
+	callback: {
+		onAsyncSuccess: zTreeOnAsyncSuccess
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.onCheck.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.onCheck.html
new file mode 100644
index 0000000..113eee9
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.onCheck.html
@@ -0,0 +1,34 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(event, treeId, treeNode)</span><span class="path">setting.callback.</span>onCheck</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.excheck</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于捕获 checkbox / radio 被勾选 或 取消勾选的事件回调函数</p>
+			<p class="highlight_red">如果设置了 setting.callback.beforeCheck 方法，且返回 false，将无法触发 onCheck 事件回调函数。</p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>event</b><span>js event 对象</span></h4>
+	<p>标准的 js event 对象</p>
+	<h4 class="topLine"><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>被勾选 或 取消勾选的节点 JSON 数据对象</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 每次点击 checkbox 或 radio 后， 弹出该节点的 tId、name 以及当前勾选状态的信息</h4>
+	<pre xmlns=""><code>function zTreeOnCheck(event, treeId, treeNode) {
+    alert(treeNode.tId + ", " + treeNode.name + "," + treeNode.checked);
+};
+var setting = {
+	callback: {
+		onCheck: zTreeOnCheck
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.onClick.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.onClick.html
new file mode 100644
index 0000000..19d2948
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.onClick.html
@@ -0,0 +1,49 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(event, treeId, treeNode, clickFlag)</span><span class="path">setting.callback.</span>onClick</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于捕获节点被点击的事件回调函数</p>
+			<p class="highlight_red">如果设置了 setting.callback.beforeClick 方法，且返回 false，将无法触发 onClick 事件回调函数。</p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>event</b><span>js event 对象</span></h4>
+	<p>标准的 js event 对象</p>
+	<h4 class="topLine"><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>被点击的节点 JSON 数据对象</p>
+	<h4 class="topLine"><b>clickFlag</b><span>Number</span></h4>
+	<p>节点被点击后的选中操作类型，详细看下表</p>
+	<table width="100%" border="0" cellspacing="1" cellpadding="0">
+		<thead><tr><td>clickFlag</td><td title="是否允许多点选中">selectedMulti</td><td title="是否按下 Ctrl 键">autoCancelSelected<br/>&&<br/>event.ctrlKey</td><td title="节点当前选择状态">isSelected</td><td>选中操作</td></tr></thead>
+		<tbody>
+			<tr><td>1</td><td>true</td><td>false</td><td>false</td><td>普通选中</td></tr>
+			<tr><td>1</td><td>true</td><td>false</td><td>true</td><td>普通选中</td></tr>
+			<tr><td>2</td><td>true</td><td>true</td><td>false</td><td>追加选中</td></tr>
+			<tr><td>0</td><td>true</td><td>true</td><td>true</td><td>取消选中</td></tr>
+			<tr><td>1</td><td>false</td><td>false</td><td>false</td><td>普通选中</td></tr>
+			<tr><td>1</td><td>false</td><td>false</td><td>true</td><td>普通选中</td></tr>
+			<tr><td>1</td><td>false</td><td>true</td><td>false</td><td>普通选中</td></tr>
+			<tr><td>0</td><td>false</td><td>true</td><td>true</td><td>取消选中</td></tr>
+		</tbody>
+	</table>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 每次点击节点后， 弹出该节点的 tId、name 的信息</h4>
+	<pre xmlns=""><code>function zTreeOnClick(event, treeId, treeNode) {
+    alert(treeNode.tId + ", " + treeNode.name);
+};
+var setting = {
+	callback: {
+		onClick: zTreeOnClick
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.onCollapse.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.onCollapse.html
new file mode 100644
index 0000000..1c816c2
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.onCollapse.html
@@ -0,0 +1,34 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(event, treeId, treeNode)</span><span class="path">setting.callback.</span>onCollapse</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于捕获节点被折叠的事件回调函数</p>
+			<p class="highlight_red">如果设置了 setting.callback.beforeCollapse 方法，且返回 false，将无法触发 onCollapse 事件回调函数。</p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>event</b><span>js event 对象</span></h4>
+	<p>标准的 js event 对象</p>
+	<h4 class="topLine"><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>被折叠的节点 JSON 数据对象</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 每次折叠节点后， 弹出该节点的 tId、name 的信息</h4>
+	<pre xmlns=""><code>function zTreeOnCollapse(event, treeId, treeNode) {
+    alert(treeNode.tId + ", " + treeNode.name);
+};
+var setting = {
+	callback: {
+		onCollapse: zTreeOnCollapse
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.onDblClick.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.onDblClick.html
new file mode 100644
index 0000000..deb8e62
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.onDblClick.html
@@ -0,0 +1,35 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(event, treeId, treeNode)</span><span class="path">setting.callback.</span>onDblClick</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于捕获 zTree 上鼠标双击之后的事件回调函数</p>
+			<p class="highlight_red">如果设置了 setting.callback.beforeDblClick 方法，且返回 false，将无法触发 onDblClick 事件回调函数。</p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>event</b><span>js event 对象</span></h4>
+	<p>标准的 js event 对象</p>
+	<h4 class="topLine"><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>鼠标双击时所在节点的 JSON 数据对象</p>
+	<p class="highlight_red">如果不在节点上，则返回 null</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 每次鼠标双击后， 弹出鼠标所在节点的 tId、name 的信息</h4>
+	<pre xmlns=""><code>function zTreeOnDblClick(event, treeId, treeNode) {
+    alert(treeNode ? treeNode.tId + ", " + treeNode.name : "isRoot");
+};
+var setting = {
+	callback: {
+		onDblClick: zTreeOnDblClick
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.onDrag.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.onDrag.html
new file mode 100644
index 0000000..f7e0597
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.onDrag.html
@@ -0,0 +1,34 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(event, treeId, treeNodes)</span><span class="path">setting.callback.</span>onDrag</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于捕获节点被拖拽的事件回调函数</p>
+			<p class="highlight_red">如果设置了 setting.callback.beforeDrag 方法，且返回 false，将无法触发 onDrag 事件回调函数。</p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>event</b><span>js event 对象</span></h4>
+	<p>标准的 js event 对象</p>
+	<h4 class="topLine"><b>treeId</b><span>String</span></h4>
+	<p>被拖拽的节点 treeNodes 所在 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNodes</b><span>Array(JSON)</span></h4>
+	<p>要被拖拽的节点 JSON 数据集合</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 每次开始进行拖拽节点后， 弹出被拖拽节点的个数信息</h4>
+	<pre xmlns=""><code>function zTreeOnDrag(event, treeId, treeNodes) {
+    alert(treeNodes.length);
+};
+var setting = {
+	callback: {
+		onDrag: zTreeOnDrag
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.onDrop.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.onDrop.html
new file mode 100644
index 0000000..c6773a8
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.onDrop.html
@@ -0,0 +1,46 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(event, treeId, treeNodes, targetNode, moveType, isCopy)</span><span class="path">setting.callback.</span>onDrop</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于捕获节点拖拽操作结束的事件回调函数</p>
+			<p class="highlight_red">如果设置了 setting.callback.beforeDrop 方法，且返回 false，将无法触发 onDrop 事件回调函数。</p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>event</b><span>js event 对象</span></h4>
+	<p>标准的 js event 对象</p>
+	<h4 class="topLine"><b>treeId</b><span>String</span></h4>
+	<p>目标节点 targetNode 所在 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNodes</b><span>Array(JSON)</span></h4>
+	<p>被拖拽的节点 JSON 数据集合</p>
+	<p class="highlight_red">如果拖拽操作为 移动，treeNodes 是当前被拖拽节点的数据集合。</p>
+	<p class="highlight_red">如果拖拽操作为 复制，treeNodes 是复制后 clone 得到的新节点数据。</p>
+	<h4 class="topLine"><b>targetNode</b><span>JSON</span></h4>
+	<p>成为 treeNodes 拖拽结束的目标节点 JSON 数据对象。</p>
+	<p class="highlight_red">如果拖拽成为根节点，则 targetNode = null</p>
+	<h4 class="topLine"><b>moveType</b><span>String</span></h4>
+	<p>指定移动到目标节点的相对位置</p>
+	<p class="highlight_red">"inner"：成为子节点，"prev"：成为同级前一个节点，"next"：成为同级后一个节点</p>
+	<p class="highlight_red">如果 moveType = null，表明拖拽无效</p>
+	<h4 class="topLine"><b>isCopy</b><span>Boolean</span></h4>
+	<p>拖拽节点操作是 复制 或 移动</p>
+	<p class="highlight_red">true：复制；false：移动</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 每次拖拽操作结束后， 弹出该被拖拽节点的个数以及目标节点的 tId、name 的信息</h4>
+	<pre xmlns=""><code>function zTreeOnDrop(event, treeId, treeNodes, targetNode, moveType) {
+    alert(treeNodes.length + "," + (targetNode ? (targetNode.tId + ", " + targetNode.name) : "isRoot" ));
+};
+var setting = {
+	callback: {
+		onDrop: zTreeOnDrop
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.onExpand.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.onExpand.html
new file mode 100644
index 0000000..791c5f6
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.onExpand.html
@@ -0,0 +1,34 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(event, treeId, treeNode)</span><span class="path">setting.callback.</span>onExpand</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于捕获节点被展开的事件回调函数</p>
+			<p class="highlight_red">如果设置了 setting.callback.beforeExpand 方法，且返回 false，将无法触发 onExpand 事件回调函数。</p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>event</b><span>js event 对象</span></h4>
+	<p>标准的 js event 对象</p>
+	<h4 class="topLine"><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>被展开的节点 JSON 数据对象</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 每次展开节点后， 弹出该节点的 tId、name 的信息</h4>
+	<pre xmlns=""><code>function zTreeOnExpand(event, treeId, treeNode) {
+    alert(treeNode.tId + ", " + treeNode.name);
+};
+var setting = {
+	callback: {
+		onExpand: zTreeOnExpand
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.onMouseDown.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.onMouseDown.html
new file mode 100644
index 0000000..bc9d0ea
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.onMouseDown.html
@@ -0,0 +1,35 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(event, treeId, treeNode)</span><span class="path">setting.callback.</span>onMouseDown</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于捕获 zTree 上鼠标按键按下后的事件回调函数</p>
+			<p class="highlight_red">如果设置了 setting.callback.beforeMouseDown 方法，且返回 false，将无法触发 onMouseDown 事件回调函数。</p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>event</b><span>js event 对象</span></h4>
+	<p>标准的 js event 对象</p>
+	<h4 class="topLine"><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>鼠标按键按下时所在节点的 JSON 数据对象</p>
+	<p class="highlight_red">如果不在节点上，则返回 null</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 每次鼠标按键按下后， 弹出鼠标所在节点的 tId、name 的信息</h4>
+	<pre xmlns=""><code>function zTreeOnMouseDown(event, treeId, treeNode) {
+    alert(treeNode ? treeNode.tId + ", " + treeNode.name : "isRoot");
+};
+var setting = {
+	callback: {
+		onMouseDown: zTreeOnMouseDown
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.onMouseUp.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.onMouseUp.html
new file mode 100644
index 0000000..a969fef
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.onMouseUp.html
@@ -0,0 +1,35 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(event, treeId, treeNode)</span><span class="path">setting.callback.</span>onMouseUp</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于捕获 zTree 上鼠标按键松开后的事件回调函数</p>
+			<p class="highlight_red">如果设置了 setting.callback.beforeMouseUp 方法，且返回 false，将无法触发 onMouseUp 事件回调函数。</p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>event</b><span>js event 对象</span></h4>
+	<p>标准的 js event 对象</p>
+	<h4 class="topLine"><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>鼠标按键松开时所在节点的 JSON 数据对象</p>
+	<p class="highlight_red">如果不在节点上，则返回 null</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 每次鼠标按键松开后， 弹出鼠标所在节点的 tId、name 的信息</h4>
+	<pre xmlns=""><code>function zTreeOnMouseUp(event, treeId, treeNode) {
+    alert(treeNode ? treeNode.tId + ", " + treeNode.name : "isRoot");
+};
+var setting = {
+	callback: {
+		onMouseUp: zTreeOnMouseUp
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.onNodeCreated.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.onNodeCreated.html
new file mode 100644
index 0000000..2ebaee6
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.onNodeCreated.html
@@ -0,0 +1,35 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(event, treeId, treeNode)</span><span class="path">setting.callback.</span>onNodeCreated</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于捕获节点生成 DOM 后的事件回调函数</p>
+			<p class="highlight_red">v3.x 采用了延迟加载技术，因此对于父节点未展开的子节点来说，初始化后是不会触发此回调函数，直到其父节点被展开</p>
+			<p class="highlight_red">大数据量的节点加载请注意：不设置 onNodeCreated，可以提升一部分初始化性能</p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>event</b><span>js event 对象</span></h4>
+	<p>标准的 js event 对象</p>
+	<h4 class="topLine"><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>生成 DOM 完毕的节点的 JSON 数据对象</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 创建节点 DOM 后， 弹出该节点的 tId、name 的信息</h4>
+	<pre xmlns=""><code>function zTreeOnNodeCreated(event, treeId, treeNode) {
+    alert(treeNode.tId + ", " + treeNode.name);
+};
+var setting = {
+	callback: {
+		onNodeCreated: zTreeOnNodeCreated
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.onRemove.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.onRemove.html
new file mode 100644
index 0000000..e7e625d
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.onRemove.html
@@ -0,0 +1,34 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(event, treeId, treeNode)</span><span class="path">setting.callback.</span>onRemove</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于捕获删除节点之后的事件回调函数。</p>
+			<p class="highlight_red">如果用户设置了 beforeRemove 回调函数，并返回 false，将无法触发 onRemove 事件回调函数。</p>
+			<p>默认值：null</p>			
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>event</b><span>js event 对象</span></h4>
+	<p>标准的 js event 对象</p>
+	<h4 class="topLine"><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>将要删除的节点 JSON 数据对象</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 删除节点时，弹出被删除的节点的 tId 以及 name 信息</h4>
+	<pre xmlns=""><code>function zTreeOnRemove(event, treeId, treeNode) {
+	alert(treeNode.tId + ", " + treeNode.name);
+}
+var setting = {
+	callback: {
+		onRemove: zTreeOnRemove
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.onRename.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.onRename.html
new file mode 100644
index 0000000..f225463
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.onRename.html
@@ -0,0 +1,40 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(event, treeId, treeNode, isCancel)</span><span class="path">setting.callback.</span>onRename</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于捕获节点编辑名称结束之后的事件回调函数。</p>
+			<p>1、节点进入编辑名称状态，并且修改节点名称后触发此回调函数。<span class="highlight_red">如果用户设置了 beforeRename 回调函数，并返回 false，将无法触发 onRename 事件回调函数。</span></p>
+			<p>2、<span class="highlight_red">如果通过直接修改 treeNode 的数据，并且利用 updateNode 方法更新，是不会触发此回调函数的。</span></p>
+			<p class="highlight_red">3、从 v3.5.13 开始，取消编辑状态也会触发此回调，根据 isCancel 参数判断</p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>event</b><span>js event 对象</span></h4>
+	<p>标准的 js event 对象</p>
+	<h4 class="topLine"><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>被修改名称的节点 JSON 数据对象</p>
+	<h4 class="topLine"><b>isCancel</b><span>Boolean</span></h4>
+	<p>是否取消操作 (v3.5.13+)</p>
+	<p class="highlight_red">isCancel = true 表示取消编辑操作（按下 ESC 或 使用 cancelEditName 方法）</p>
+	<p class="highlight_red">isCancel = false 表示确认修改操作</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 修改名称后，弹出被修改名称的节点的 tId 以及 name 信息</h4>
+	<pre xmlns=""><code>function zTreeOnRename(event, treeId, treeNode, isCancel) {
+	alert(treeNode.tId + ", " + treeNode.name);
+}
+var setting = {
+	callback: {
+		onRename: zTreeOnRename
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.onRightClick.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.onRightClick.html
new file mode 100644
index 0000000..d51c68d
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.callback.onRightClick.html
@@ -0,0 +1,36 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(event, treeId, treeNode)</span><span class="path">setting.callback.</span>onRightClick</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于捕获 zTree 上鼠标右键点击之后的事件回调函数</p>
+			<p class="highlight_red">1、如果设置了 setting.callback.beforeRightClick 方法，且返回 false，将无法触发 onRightClick 事件回调函数。</p>
+			<p class="highlight_red">2、只要将 function 的引用赋给 onRightClick 属性，则右键点击 zTree 时，将屏蔽浏览器的右键菜单。</p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>event</b><span>js event 对象</span></h4>
+	<p>标准的 js event 对象</p>
+	<h4 class="topLine"><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>鼠标右键点击时所在节点的 JSON 数据对象</p>
+	<p class="highlight_red">如果不在节点上，则返回 null</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 每次鼠标右键点击后， 弹出鼠标所在节点的 tId、name 的信息</h4>
+	<pre xmlns=""><code>function zTreeOnRightClick(event, treeId, treeNode) {
+    alert(treeNode ? treeNode.tId + ", " + treeNode.name : "isRoot");
+};
+var setting = {
+	callback: {
+		onRightClick: zTreeOnRightClick
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.check.autoCheckTrigger.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.check.autoCheckTrigger.html
new file mode 100644
index 0000000..d1efd77
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.check.autoCheckTrigger.html
@@ -0,0 +1,28 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.check.</span>autoCheckTrigger</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.excheck</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>设置自动关联勾选时是否触发 beforeCheck / onCheck 事件回调函数。<span class="highlight_red">[setting.check.enable = true 且 setting.check.chkStyle = "checkbox" 时生效]</span></p>
+			<p class="highlight_red">1、如果设置 setting.check.chkboxType = { "Y": "", "N": "" }，将不会有任何自动关联勾选的操作。</p>
+			<p class="highlight_red">2、如果开启触发，对于节点较多的树将会影响性能，因为所有被联动勾选的操作都会触发事件回调函数，请根据需要决定是否使用此功能。</p>
+			<p>默认值: false</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p> true / false 分别表示 触发 / 不触发 事件回调函数</p>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 需要触发自动关联勾选操作</h4>
+	<pre xmlns=""><code>var setting = {
+	check: {
+		enable: true,
+		autoCheckTrigger: true
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.check.chkDisabledInherit.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.check.chkDisabledInherit.html
new file mode 100644
index 0000000..8af1c2c
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.check.chkDisabledInherit.html
@@ -0,0 +1,28 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.check.</span>chkDisabledInherit</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.excheck</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>当父节点设置 chkDisabled = true 时，设置子节点是否自动继承 chkDisabled = true 。<span class="highlight_red">[setting.check.enable = true 时生效]</span></p>
+			<p class="highlight_red">1、只使用于初始化节点时，便于批量操作。 对于已存在的节点请利用 setChkDisabled 方法单个节点设置。</p>
+			<p>默认值: false</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p> true 表示 新加入子节点时，自动继承父节点 chkDisabled = true 的属性。</p>
+	<p> false 表示 新加入子节点时，不继承父节点 chkDisabled 的属性。</p>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 需要子节点自动继承 chkDisabled = true</h4>
+	<pre xmlns=""><code>var setting = {
+	check: {
+		enable: true,
+		chkDisabledInherit: true
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.check.chkStyle.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.check.chkStyle.html
new file mode 100644
index 0000000..9706c13
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.check.chkStyle.html
@@ -0,0 +1,48 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">setting.check.</span>chkStyle</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.excheck</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>勾选框类型(checkbox 或 radio）<span class="highlight_red">[setting.check.enable = true 时生效]</span></p>
+			<p>默认值："checkbox"</p>
+		</div>
+	</div>
+	<h3>String 格式说明</h3>
+	<div class="desc">
+	<p>chkStyle = "checkbox" 时，显示 checkbox 选择框，<span class="highlight_red">setting.check.chkboxType</span> 属性有效。
+<br/>chkStyle = "radio" 时，显示 radio 选择框， <span class="highlight_red">setting.check.radioType</span> 属性有效。</p>
+	<p class="highlight_red">请注意大小写，不要改变</p>
+	</div>
+	<h3>checkbox 状态说明</h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p><button type="button" class="chk checkbox_false_full"></button>未勾选；<span class="highlight_red">如果是父节点，则无子节点被勾选</span>。鼠标移到该节点上显示为：<button type="button" class="chk checkbox_false_full_focus"></button></p>
+			<p><button type="button" class="chk checkbox_false_part"></button>未勾选；（只有父节点存在此状态）<span class="highlight_red">存在被勾选的子节点</span>。鼠标移到该节点上显示为：<button type="button" class="chk checkbox_false_part_focus"></button></p>
+			<p><button type="button" class="chk checkbox_true_full"></button>被勾选；<span class="highlight_red">如果是父节点，则全部子节点都被勾选</span>。鼠标移到该节点上显示为：<button type="button" class="chk checkbox_true_full_focus"></button></p>
+			<p><button type="button" class="chk checkbox_true_part"></button>被勾选；（只有父节点存在此状态）<span class="highlight_red">且部分或无子节点被勾选</span>。鼠标移到该节点上显示为：<button type="button" class="chk checkbox_true_part_focus"></button></p>
+		</div>
+	</div>
+	<h3>radio 状态说明</h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p><button type="button" class="chk radio_false_full"></button>未勾选；<span class="highlight_red">如果是父节点，则没有子节点被勾选</span>。鼠标移到该节点上显示为：<button type="button" class="chk radio_false_full_focus"></button></p>
+			<p><button type="button" class="chk radio_false_part"></button>未勾选；（只有父节点存在此状态）<span class="highlight_red">且存在被勾选的子节点</span>。鼠标移到该节点上显示为：<button type="button" class="chk radio_false_part_focus"></button></p>
+			<p><button type="button" class="chk radio_true_full"></button>被勾选；<span class="highlight_red">如果是父节点，则没有子节点被勾选</span>。鼠标移到该节点上显示为：<button type="button" class="chk radio_true_full_focus"></button></p>
+			<p><button type="button" class="chk radio_true_part"></button>被勾选；（只有父节点存在此状态）<span class="highlight_red">且存在被勾选的子节点</span>。鼠标移到该节点上显示为：<button type="button" class="chk radio_true_part_focus"></button></p>
+		</div>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 设置选择框为 radio</h4>
+	<pre xmlns=""><code>var setting = {
+	check: {
+		enable: true,
+		chkStyle: "radio"
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.check.chkboxType.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.check.chkboxType.html
new file mode 100644
index 0000000..da06b6c
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.check.chkboxType.html
@@ -0,0 +1,31 @@
+<div class="apiDetail">
+<div>
+	<h2><span>JSON</span><span class="path">setting.check.</span>chkboxType</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.excheck</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>勾选 checkbox 对于父子节点的关联关系。<span class="highlight_red">[setting.check.enable = true 且 setting.check.chkStyle = "checkbox" 时生效]</span></p>
+			<p>默认值：{ "Y": "ps", "N": "ps" }</p>
+		</div>
+	</div>
+	<h3>JSON 格式说明</h3>
+	<div class="desc">
+	<p>Y 属性定义 checkbox 被勾选后的情况；
+<br/>N 属性定义 checkbox 取消勾选后的情况；
+<br/>"p" 表示操作会影响父级节点；
+<br/>"s" 表示操作会影响子级节点。</p>
+	<p class="highlight_red">请注意大小写，不要改变</p>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. checkbox 勾选操作，只影响父级节点；取消勾选操作，只影响子级节点</h4>
+	<pre xmlns=""><code>var setting = {
+	check: {
+		enable: true,
+		chkStyle: "checkbox",
+		chkboxType: { "Y": "p", "N": "s" }
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.check.enable.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.check.enable.html
new file mode 100644
index 0000000..8b1387e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.check.enable.html
@@ -0,0 +1,25 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.check.</span>enable</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.excheck</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>设置 zTree 的节点上是否显示 checkbox / radio</p>
+			<p>默认值: false</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p> true / false 分别表示 显示 / 不显示 复选框或单选框</p>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 需要显示 checkbox</h4>
+	<pre xmlns=""><code>var setting = {
+	check: {
+		enable: true
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.check.nocheckInherit.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.check.nocheckInherit.html
new file mode 100644
index 0000000..caf9902
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.check.nocheckInherit.html
@@ -0,0 +1,28 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.check.</span>nocheckInherit</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.excheck</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>当父节点设置 nocheck = true 时，设置子节点是否自动继承 nocheck = true 。<span class="highlight_red">[setting.check.enable = true 时生效]</span></p>
+			<p class="highlight_red">1、只使用于初始化节点时，便于批量操作。 对于已存在的节点请利用 updateNode 方法单个节点设置。</p>
+			<p>默认值: false</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p> true 表示 新加入子节点时，自动继承父节点 nocheck = true 的属性。</p>
+	<p> false 表示 新加入子节点时，不继承父节点 nocheck 的属性。</p>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 需要子节点自动继承 nocheck = true</h4>
+	<pre xmlns=""><code>var setting = {
+	check: {
+		enable: true,
+		nocheckInherit: true
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.check.radioType.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.check.radioType.html
new file mode 100644
index 0000000..19f84ca
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.check.radioType.html
@@ -0,0 +1,29 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">setting.check.</span>radioType</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.excheck</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>radio 的分组范围。<span class="highlight_red">[setting.check.enable = true 且 setting.check.chkStyle = "radio" 时生效]</span></p>
+			<p>默认值："level"</p>
+		</div>
+	</div>
+	<h3>String 格式说明</h3>
+	<div class="desc">
+	<p>radioType = "level" 时，在每一级节点范围内当做一个分组。
+<br/>radioType = "all" 时，在整棵树范围内当做一个分组。</p>
+	<p class="highlight_red">请注意大小写，不要改变</p>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 设置 radio 的判别规则为整棵树内</h4>
+	<pre xmlns=""><code>var setting = {
+	check: {
+		enable: true,
+		chkStyle: "radio",
+		radioType: "all"
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.data.keep.leaf.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.data.keep.leaf.html
new file mode 100644
index 0000000..af3a721
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.data.keep.leaf.html
@@ -0,0 +1,28 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.data.keep.</span>leaf</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>zTree 的节点叶子节点属性锁，是否始终保持 isParent = false</p>
+			<p>默认值：false</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p> true / false 分别表示 锁定 / 不锁定 叶子节点属性</p>
+	<p class="highlight_red">如果设置为 true，则所有 isParent = false 的节点，都无法添加子节点。</p>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 需要锁定叶子节点状态</h4>
+	<pre xmlns=""><code>var setting = {
+	data: {
+		keep: {
+			leaf: true
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.data.keep.parent.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.data.keep.parent.html
new file mode 100644
index 0000000..c4975df
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.data.keep.parent.html
@@ -0,0 +1,28 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.data.keep.</span>parent</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>zTree 的节点父节点属性锁，是否始终保持 isParent = true</p>
+			<p>默认值：false</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p> true / false 分别表示 锁定 / 不锁定 父节点属性</p>
+	<p class="highlight_red">如果设置为 true，则所有 isParent = true 的节点，即使该节点的子节点被全部删除或移走，依旧保持父节点状态。</p>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 需要锁定父节点状态</h4>
+	<pre xmlns=""><code>var setting = {
+	data: {
+		keep: {
+			parent: true
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.data.key.checked.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.data.key.checked.html
new file mode 100644
index 0000000..ac9fdc1
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.data.key.checked.html
@@ -0,0 +1,24 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">setting.data.key.</span>checked</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.excheck</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>zTree 节点数据中保存 check 状态的属性名称。</p>
+			<p>默认值："checked"</p>
+			<p class="highlight_red">请勿与 zTree 节点数据的其他参数冲突，例如：checkedOld</p>
+		</div>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 设置 zTree 显示节点时，将 treeNode 的 isChecked 属性当做节点名称</h4>
+	<pre xmlns=""><code>var setting = {
+	data: {
+		key: {
+			checked: "isChecked"
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.data.key.children.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.data.key.children.html
new file mode 100644
index 0000000..66a49a7
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.data.key.children.html
@@ -0,0 +1,23 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">setting.data.key.</span>children</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>zTree 节点数据中保存子节点数据的属性名称。</p>
+			<p>默认值："children"</p>
+		</div>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 设置 zTree 显示节点时，将 treeNode 的 nodes 属性当做节点名称</h4>
+	<pre xmlns=""><code>var setting = {
+	data: {
+		key: {
+			children: "nodes"
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.data.key.name.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.data.key.name.html
new file mode 100644
index 0000000..c25d250
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.data.key.name.html
@@ -0,0 +1,23 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">setting.data.key.</span>name</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>zTree 节点数据保存节点名称的属性名称。</p>
+			<p>默认值："name"</p>
+		</div>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 设置 zTree 显示节点时，将 treeNode 的 ename 属性当做节点名称</h4>
+	<pre xmlns=""><code>var setting = {
+	data: {
+		key: {
+			name: "ename"
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.data.key.title.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.data.key.title.html
new file mode 100644
index 0000000..43e6855
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.data.key.title.html
@@ -0,0 +1,24 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">setting.data.key.</span>title</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>zTree 节点数据保存节点提示信息的属性名称。<span class="highlight_red">[setting.view.showTitle = true 时生效]</span></p>
+			<p class="highlight_red">如果设置为 "" ，则自动与 setting.data.key.name 保持一致，避免用户反复设置</p>
+			<p>默认值：""</p>
+		</div>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 设置 zTree 显示节点时，将 treeNode 的 fullName 属性当做节点名称</h4>
+	<pre xmlns=""><code>var setting = {
+	data: {
+		key: {
+			title: "fullName"
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.data.key.url.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.data.key.url.html
new file mode 100644
index 0000000..e534d98
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.data.key.url.html
@@ -0,0 +1,24 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">setting.data.key.</span>url</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>zTree 节点数据保存节点链接的目标 URL 的属性名称。</p>
+			<p class="highlight_red">特殊用途：当后台数据只能生成 url 属性，又不想实现点击节点跳转的功能时，可以直接修改此属性为其他不存在的属性名称</p>
+			<p>默认值："url"</p>
+		</div>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 设置 zTree 显示节点时，将 treeNode 的 xUrl 属性当做节点链接的目标 URL</h4>
+	<pre xmlns=""><code>var setting = {
+	data: {
+		key: {
+			url: "xUrl"
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.data.simpleData.enable.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.data.simpleData.enable.html
new file mode 100644
index 0000000..65bd407
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.data.simpleData.enable.html
@@ -0,0 +1,38 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.data.simpleData.</span>enable</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>确定 zTree 初始化时的节点数据、异步加载时的节点数据、或 <span class="highlight_red">addNodes</span> 方法中输入的 newNodes 数据是否采用简单数据模式 (Array)</p>
+			<p>不需要用户再把数据库中取出的 List 强行转换为复杂的 JSON 嵌套格式</p>
+			<p>默认值：false</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p> true / false 分别表示 使用 / 不使用 简单数据模式</p>
+	<p class="highlight_red">如果设置为 true，请务必设置 setting.data.simpleData 内的其他参数: idKey / pIdKey / rootPId，并且让数据满足父子关系。</p>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 使用简单 Array 格式的数据</h4>
+	<pre xmlns=""><code>var setting = {
+	data: {
+		simpleData: {
+			enable: true,
+			idKey: "id",
+			pIdKey: "pId",
+			rootPId: 0,
+		}
+	}
+};
+var treeNodes = [
+    {"id":1, "pId":0, "name":"test1"},
+    {"id":11, "pId":1, "name":"test11"},
+    {"id":12, "pId":1, "name":"test12"},
+    {"id":111, "pId":11, "name":"test111"}
+];
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.data.simpleData.idKey.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.data.simpleData.idKey.html
new file mode 100644
index 0000000..81129e9
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.data.simpleData.idKey.html
@@ -0,0 +1,32 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">setting.data.simpleData.</span>idKey</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>节点数据中保存唯一标识的属性名称。<span class="highlight_red">[setting.data.simpleData.enable = true 时生效]</span></p>
+			<p>默认值："id"</p>
+		</div>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 使用简单 Array 格式的数据</h4>
+	<pre xmlns=""><code>var setting = {
+	data: {
+		simpleData: {
+			enable: true,
+			idKey: "id",
+			pIdKey: "pId",
+			rootPId: 0,
+		}
+	}
+};
+var treeNodes = [
+    {"id":1, "pId":0, "name":"test1"},
+    {"id":11, "pId":1, "name":"test11"},
+    {"id":12, "pId":1, "name":"test12"},
+    {"id":111, "pId":11, "name":"test111"}
+];
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.data.simpleData.pIdKey.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.data.simpleData.pIdKey.html
new file mode 100644
index 0000000..d434bc3
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.data.simpleData.pIdKey.html
@@ -0,0 +1,32 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">setting.data.simpleData.</span>pIdKey</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>节点数据中保存其父节点唯一标识的属性名称。<span class="highlight_red">[setting.data.simpleData.enable = true 时生效]</span></p>
+			<p>默认值："pId"</p>
+		</div>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 使用简单 Array 格式的数据</h4>
+	<pre xmlns=""><code>var setting = {
+	data: {
+		simpleData: {
+			enable: true,
+			idKey: "id",
+			pIdKey: "pId",
+			rootPId: 0
+		}
+	}
+};
+var treeNodes = [
+    {"id":1, "pId":0, "name":"test1"},
+    {"id":11, "pId":1, "name":"test11"},
+    {"id":12, "pId":1, "name":"test12"},
+    {"id":111, "pId":11, "name":"test111"}
+];
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.data.simpleData.rootPId.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.data.simpleData.rootPId.html
new file mode 100644
index 0000000..8cff82d
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.data.simpleData.rootPId.html
@@ -0,0 +1,32 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String / Number</span><span class="path">setting.data.simpleData.</span>rootPId</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于修正根节点父节点数据，即 pIdKey 指定的属性值。<span class="highlight_red">[setting.data.simpleData.enable = true 时生效]</span></p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 使用简单 Array 格式的数据</h4>
+	<pre xmlns=""><code>var setting = {
+	data: {
+		simpleData: {
+			enable: true,
+			idKey: "id",
+			pIdKey: "pId",
+			rootPId: 0
+		}
+	}
+};
+var treeNodes = [
+    {"id":1, "pId":0, "name":"test1"},
+    {"id":11, "pId":1, "name":"test11"},
+    {"id":12, "pId":1, "name":"test12"},
+    {"id":111, "pId":11, "name":"test111"}
+];
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.edit.drag.autoExpandTrigger.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.edit.drag.autoExpandTrigger.html
new file mode 100644
index 0000000..126b8a8
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.edit.drag.autoExpandTrigger.html
@@ -0,0 +1,28 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.edit.drag.</span>autoExpandTrigger</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>拖拽时父节点自动展开是否触发 onExpand 事件回调函数。<span class="highlight_red">[setting.edit.enable = true 时生效]</span></p>
+			<p>默认值：false</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p> true / false 分别表示 触发 / 不触发 onExpand 事件回调函数。</p>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 设置拖拽时父节点自动展开触发 onExpand 事件回调函数</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true,
+		drag: {
+			autoExpandTrigger: true
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.edit.drag.autoOpenTime.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.edit.drag.autoOpenTime.html
new file mode 100644
index 0000000..df78339
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.edit.drag.autoOpenTime.html
@@ -0,0 +1,25 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Number</span><span class="path">setting.edit.drag.</span>autoOpenTime</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>拖拽时父节点自动展开的延时间隔。 (单位：ms)<span class="highlight_red">[setting.edit.enable = true 时生效]</span></p>
+			<p>默认值：500</p>
+			<p class="highlight_red">请根据自己的需求适当调整此值</p>
+		</div>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 设置拖拽到父节点上立刻自动展开</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true,
+		drag: {
+			autoOpenTime: 0
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.edit.drag.borderMax.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.edit.drag.borderMax.html
new file mode 100644
index 0000000..1d4dd68
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.edit.drag.borderMax.html
@@ -0,0 +1,25 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Number</span><span class="path">setting.edit.drag.</span>borderMax</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>拖拽节点成为根节点时的 Tree 内边界范围 (单位：px)。<span class="highlight_red">[setting.edit.enable = true 时生效]</span></p>
+			<p>默认值：10</p>
+			<p class="highlight_red">请根据自己的需求适当调整此值</p>
+		</div>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 更改拖拽操作节点成为根节点时的 Tree 内边界范围为20px</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true,
+		drag: {
+			borderMax: 20
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.edit.drag.borderMin.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.edit.drag.borderMin.html
new file mode 100644
index 0000000..463eb2b
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.edit.drag.borderMin.html
@@ -0,0 +1,25 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Number</span><span class="path">setting.edit.drag.</span>borderMin</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>拖拽节点成为根节点时的 Tree 外边界范围 (单位：px)。<span class="highlight_red">[setting.edit.enable = true 时生效]</span></p>
+			<p>默认值：-5</p>
+			<p class="highlight_red">请根据自己的需求适当调整此值</p>
+		</div>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 更改拖拽操作节点成为根节点时的 Tree 外边界范围为10px</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true,
+		drag: {
+			borderMin: -10
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.edit.drag.inner.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.edit.drag.inner.html
new file mode 100644
index 0000000..06679e1
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.edit.drag.inner.html
@@ -0,0 +1,59 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean / Function(treeId, treeNodes, targetNode)</span><span class="path">setting.edit.drag.</span>inner</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>拖拽到目标节点时，设置是否允许成为目标节点的子节点。<span class="highlight_red">[setting.edit.enable = true 时生效]</span></p>
+			<p class="highlight_red">拖拽目标是 根 的时候，不触发 prev 和 next，只会触发 inner</p>
+			<p class="highlight_red">此功能主要作用是对拖拽进行适当限制（辅助箭头），需要结合 prev、next 一起使用，才能实现完整功能。</p>
+			<p>默认值：true</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p> true / false 分别表示 允许 / 不允许 成为目标节点的子节点</p>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控（多棵树拖拽时，是目标节点所在树的 treeId）</p>
+	<h4 class="topLine"><b>treeNodes</b><span>Array(JSON)</span></h4>
+	<p>被拖拽的节点 JSON 数据集合</p>
+	<h4 class="topLine"><b>targetNode</b><span>JSON</span></h4>
+	<p>拖拽时的目标节点 JSON 数据对象</p>
+	<p class="highlight_red">如果拖拽的节点要成为根节点，则 targetNode = null</p>
+	<h4 class="topLine"><b>返回值</b><span>Boolean</span></h4>
+	<p>返回值同 Boolean 格式的数据</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 禁止拖拽成为目标节点的子节点</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true,
+		drag: {
+			prev: true,
+			next: true,
+			inner: false
+		}
+	}
+};
+......</code></pre>
+	<h4>2. 禁止拖拽成为根节点的子节点</h4>
+	<pre xmlns=""><code>function canInner(treeId, nodes, targetNode) {
+	return !(targetNode && targetNode.level === 0);
+}
+var setting = {
+	edit: {
+		enable: true,
+		drag: {
+			prev: true,
+			next: true,
+			inner: canInner
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.edit.drag.isCopy.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.edit.drag.isCopy.html
new file mode 100644
index 0000000..f77ead4
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.edit.drag.isCopy.html
@@ -0,0 +1,32 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.edit.drag.</span>isCopy</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>拖拽时, 设置是否允许复制节点。<span class="highlight_red">[setting.edit.enable = true 时生效]</span></p>
+			<p>默认值：true</p>
+		</div>
+	</div>
+	<h3>规则说明</h3>
+	<div class="desc">
+	<p>1、isCopy = true; isMove = true 时，拖拽节点按下 Ctrl 键表示 copy; 否则为 move</p>
+	<p>2、isCopy = true; isMove = false 时，所有拖拽操作都是 copy</p>
+	<p>3、isCopy = false; isMove = true 时，所有拖拽操作都是 move</p>
+	<p>4、isCopy = false; isMove = false 时，禁止拖拽操作</p>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 设置所有拖拽操作都是 copy</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true,
+		drag: {
+			isCopy: true,
+			isMove: false
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.edit.drag.isMove.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.edit.drag.isMove.html
new file mode 100644
index 0000000..d860286
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.edit.drag.isMove.html
@@ -0,0 +1,32 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.edit.drag.</span>isMove</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>拖拽时, 设置是否允许移动节点。<span class="highlight_red">[setting.edit.enable = true 时生效]</span></p>
+			<p>默认值：true</p>
+		</div>
+	</div>
+	<h3>规则说明</h3>
+	<div class="desc">
+	<p>1、isCopy = true; isMove = true 时，拖拽节点按下 Ctrl 键表示 copy; 否则为 move</p>
+	<p>2、isCopy = true; isMove = false 时，所有拖拽操作都是 copy</p>
+	<p>3、isCopy = false; isMove = true 时，所有拖拽操作都是 move</p>
+	<p>4、isCopy = false; isMove = false 时，禁止拖拽操作</p>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 设置所有拖拽操作都是 move</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true,
+		drag: {
+			isCopy: false,
+			isMove: true
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.edit.drag.maxShowNodeNum.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.edit.drag.maxShowNodeNum.html
new file mode 100644
index 0000000..3e7a3d2
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.edit.drag.maxShowNodeNum.html
@@ -0,0 +1,25 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Number</span><span class="path">setting.edit.drag.</span>maxShowNodeNum</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>拖拽多个兄弟节点时，浮动图层中显示的最大节点数。 多余的节点用...代替。<span class="highlight_red">[setting.edit.enable = true 时生效]</span></p>
+			<p>默认值：5</p>
+			<p class="highlight_red">请根据自己的需求适当调整此值</p>
+		</div>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 设置拖拽时最多可显示10个节点</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true,
+		drag: {
+			maxShowNodeNum: 10
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.edit.drag.minMoveSize.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.edit.drag.minMoveSize.html
new file mode 100644
index 0000000..904be41
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.edit.drag.minMoveSize.html
@@ -0,0 +1,25 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Number</span><span class="path">setting.edit.drag.</span>minMoveSize</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>判定是否拖拽操作的最小位移值 (单位：px)。<span class="highlight_red">[setting.edit.enable = true 时生效]</span></p>
+			<p class="highlight_red">根据自己的需求可适当调整此值，如果太小容易导致点击鼠标时误操作进行拖拽</p>
+			<p>默认值：5</p>
+		</div>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 更改拖拽操作启动位移值为10px</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true,
+		drag: {
+			minMoveSize: 10
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.edit.drag.next.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.edit.drag.next.html
new file mode 100644
index 0000000..ffc874a
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.edit.drag.next.html
@@ -0,0 +1,58 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean / Function(treeId, treeNodes, targetNode)</span><span class="path">setting.edit.drag.</span>next</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>拖拽到目标节点时，设置是否允许移动到目标节点后面的操作。<span class="highlight_red">[setting.edit.enable = true 时生效]</span></p>
+			<p class="highlight_red">拖拽目标是 根 的时候，不触发 prev 和 next，只会触发 inner</p>
+			<p class="highlight_red">此功能主要作用是对拖拽进行适当限制（辅助箭头），需要结合 prev、inner 一起使用，才能实现完整功能。</p>
+			<p>默认值：true</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p> true / false 分别表示 允许 / 不允许 移动到目标节点后面</p>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控（多棵树拖拽时，是目标节点所在树的 treeId）</p>
+	<h4 class="topLine"><b>treeNodes</b><span>Array(JSON)</span></h4>
+	<p>被拖拽的节点 JSON 数据集合</p>
+	<h4 class="topLine"><b>targetNode</b><span>JSON</span></h4>
+	<p>拖拽时的目标节点 JSON 数据对象</p>
+	<h4 class="topLine"><b>返回值</b><span>Boolean</span></h4>
+	<p>返回值同 Boolean 格式的数据</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 禁止拖拽到节点后面的操作</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true,
+		drag: {
+			prev: true,
+			next: false,
+			inner: true
+		}
+	}
+};
+......</code></pre>
+	<h4>2. 禁止拖拽到父节点后面的操作</h4>
+	<pre xmlns=""><code>function canNext(treeId, nodes, targetNode) {
+	return !targetNode.isParent;
+}
+var setting = {
+	edit: {
+		enable: true,
+		drag: {
+			prev: true,
+			next: canNext,
+			inner: true
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.edit.drag.prev.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.edit.drag.prev.html
new file mode 100644
index 0000000..bd05361
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.edit.drag.prev.html
@@ -0,0 +1,58 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean / Function(treeId, treeNodes, targetNode)</span><span class="path">setting.edit.drag.</span>prev</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>拖拽到目标节点时，设置是否允许移动到目标节点前面的操作。<span class="highlight_red">[setting.edit.enable = true 时生效]</span></p>
+			<p class="highlight_red">拖拽目标是 根 的时候，不触发 prev 和 next，只会触发 inner</p>
+			<p class="highlight_red">此功能主要作用是对拖拽进行适当限制（辅助箭头），需要结合 next、inner 一起使用，才能实现完整功能。</p>
+			<p>默认值：true</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p> true / false 分别表示 允许 / 不允许 移动到目标节点前面</p>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控（多棵树拖拽时，是目标节点所在树的 treeId）</p>
+	<h4 class="topLine"><b>treeNodes</b><span>Array(JSON)</span></h4>
+	<p>被拖拽的节点 JSON 数据集合</p>
+	<h4 class="topLine"><b>targetNode</b><span>JSON</span></h4>
+	<p>拖拽时的目标节点 JSON 数据对象</p>
+	<h4 class="topLine"><b>返回值</b><span>Boolean</span></h4>
+	<p>返回值同 Boolean 格式的数据</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 禁止拖拽到节点前面的操作</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true,
+		drag: {
+			prev: false,
+			next: true,
+			inner: true
+		}
+	}
+};
+......</code></pre>
+	<h4>2. 禁止拖拽到父节点前面的操作</h4>
+	<pre xmlns=""><code>function canPrev(treeId, nodes, targetNode) {
+	return !targetNode.isParent;
+}
+var setting = {
+	edit: {
+		enable: true,
+		drag: {
+			prev: canPrev,
+			next: true,
+			inner: true
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.edit.editNameSelectAll.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.edit.editNameSelectAll.html
new file mode 100644
index 0000000..30784f3
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.edit.editNameSelectAll.html
@@ -0,0 +1,27 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.edit.</span>editNameSelectAll</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>节点编辑名称 input 初次显示时,设置 txt 内容是否为全选状态。 <span class="highlight_red">[setting.edit.enable = true 时生效]</span></p>
+			<p>默认值: false</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p> true 表示 全选状态</p>
+	<p> false 表示 不是全选状态，光标默认在最后</p>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 设置节点编辑名称 input 初次显示时，txt内容为全选状态</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true,
+		editNameSelectAll: true
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.edit.enable.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.edit.enable.html
new file mode 100644
index 0000000..de1afea
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.edit.enable.html
@@ -0,0 +1,38 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.edit.</span>enable</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>设置 zTree 是否处于编辑状态</p>
+			<p class="highlight_red">请在初始化之前设置，初始化后需要改变编辑状态请使用 zTreeObj.setEditable() 方法</p>
+			<p>默认值: false</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p> true / false 分别表示 可以 / 不可以 编辑</p>
+	</div>
+	<h3>编辑状态规则说明</h3>
+	<div class="desc">
+	<p>1、点击节点时，不会打开 <span class="highlight_red">node.url</span> 指定的 URL。
+<br/>2、全面支持 编辑 与 异步加载 状态共存。
+<br/>3、可以对节点进行拖拽，且支持多棵树之间进行拖拽。
+<br/>4、支持拖拽时 复制/移动 节点。（参考: <span class="highlight_red">setting.edit.drag.isCopy / setting.edit.drag.isMove</span>）
+<br/>5、可以通过编辑按钮修改 name 属性。
+<br/>6、可以通过删除按钮删除节点。
+<br/>
+</p>
+	<p class="highlight_red">请注意大小写，不要改变</p>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 设置 zTree 进入编辑状态</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.edit.removeTitle.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.edit.removeTitle.html
new file mode 100644
index 0000000..55257da
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.edit.removeTitle.html
@@ -0,0 +1,48 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String / Function(treeId, treeNode)</span><span class="path">setting.edit.</span>removeTitle</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>删除按钮的 Title 辅助信息。<span class="highlight_red">[setting.edit.enable = true & setting.edit.showRemoveBtn = true 时生效]</span></p>
+			<p>默认值："remove"</p>
+		</div>
+	</div>
+	<h3>String 格式说明</h3>
+	<div class="desc">
+	<p>鼠标移动到 删除按钮 上时，浏览器自动弹出的辅助信息内容，可根据用户需要自行修改</p>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>需要设置删除按钮 Title 信息的节点 JSON 数据对象</p>
+	<h4 class="topLine"><b>返回值</b><span>String</span></h4>
+	<p>返回值同 String 格式的数据</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 设置删除按钮的 Title 辅助信息为: "删除节点"</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true,
+		showRemoveBtn: true,
+		removeTitle: "删除节点"
+	}
+};
+......</code></pre>
+	<h4>2. 设置父节点删除按钮的 Title 辅助信息为: "删除父节点"</h4>
+	<pre xmlns=""><code>function setRemoveTitle(treeId, treeNode) {
+	return treeNode.isParent ? "删除父节点":"删除叶子节点";
+}
+var setting = {
+	edit: {
+		enable: true,
+		showRemoveBtn: true,
+		removeTitle: setRemoveTitle
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.edit.renameTitle.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.edit.renameTitle.html
new file mode 100644
index 0000000..2dfbcca
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.edit.renameTitle.html
@@ -0,0 +1,48 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String / Function(treeId, treeNode)</span><span class="path">setting.edit.</span>renameTitle</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>编辑名称按钮的 Title 辅助信息。<span class="highlight_red">[setting.edit.enable = true & setting.edit.showRenameBtn = true 时生效]</span></p>
+			<p>默认值："rename"</p>
+		</div>
+	</div>
+	<h3>String 格式说明</h3>
+	<div class="desc">
+	<p>设置鼠标移动到 编辑名称按钮 上时，浏览器自动弹出的辅助信息内容，可根据用户需要自行修改</p>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>需要设置编辑名称按钮 Title 信息的节点 JSON 数据对象</p>
+	<h4 class="topLine"><b>返回值</b><span>String</span></h4>
+	<p>返回值同 String 格式的数据</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 设置编辑名称按钮的 Title 辅助信息为: "编辑节点名称"</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true,
+		showRenameBtn: true,
+		renameTitle: "编辑节点名称"
+	}
+};
+......</code></pre>
+	<h4>2. 设置父节点编辑名称按钮的 Title 辅助信息为: "编辑父节点名称"</h4>
+	<pre xmlns=""><code>function setRenameTitle(treeId, treeNode) {
+	return treeNode.isParent ? "编辑父节点名称":"编辑叶子节点名称";
+}
+var setting = {
+	edit: {
+		enable: true,
+		showRenameBtn: true,
+		renameTitle: setRenameTitle
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.edit.showRemoveBtn.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.edit.showRemoveBtn.html
new file mode 100644
index 0000000..db62053
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.edit.showRemoveBtn.html
@@ -0,0 +1,49 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean / Function(treeId, treeNode)</span><span class="path">setting.edit.</span>showRemoveBtn</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>设置是否显示删除按钮。<span class="highlight_red">[setting.edit.enable = true 时生效]</span></p>
+			<p>当点击某节点的删除按钮时：</p>
+			<p>1、首先触发 <span class="highlight_red">setting.callback.beforeRemove</span> 回调函数，用户可判定是否进行删除操作。</p>
+			<p>2、如果未设置 beforeRemove 或 beforeRemove 返回 true，则删除节点并触发 <span class="highlight_red">setting.callback.onRemove</span> 回调函数。</p>
+			<p>默认值：true</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p> true / false 分别表示 显示 / 隐藏 删除按钮</p>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>需要设置是否显示删除按钮的节点 JSON 数据对象</p>
+	<h4 class="topLine"><b>返回值</b><span>Boolean</span></h4>
+	<p>返回值同 Boolean 格式的数据</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 不显示删除按钮</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true,
+		showRemoveBtn: false
+	}
+};
+......</code></pre>
+	<h4>2. 设置所有的父节点不显示删除按钮</h4>
+	<pre xmlns=""><code>function setRemoveBtn(treeId, treeNode) {
+	return !treeNode.isParent;
+}
+var setting = {
+	edit: {
+		enable: true,
+		showRemoveBtn: setRemoveBtn
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.edit.showRenameBtn.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.edit.showRenameBtn.html
new file mode 100644
index 0000000..33dd37a
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.edit.showRenameBtn.html
@@ -0,0 +1,51 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean / Function(treeId, treeNode)</span><span class="path">setting.edit.</span>showRenameBtn</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>设置是否显示编辑名称按钮。<span class="highlight_red">[setting.edit.enable = true 时生效]</span></p>
+			<p>当点击某节点的编辑名称按钮时：</p>
+			<p>1、进入节点编辑名称状态。</p>
+			<p>2、编辑名称完毕（Input 失去焦点 或 按下 Enter 键），会触发 <span class="highlight_red">setting.callback.beforeRename</span> 回调函数，用户可根据自己的规则判定是否允许修改名称。</p>
+			<p>3、如果 beforeRename 返回 false，则继续保持编辑名称状态，直到名称符合规则位置 （按下 ESC 键可取消编辑名称状态，恢复原名称）。</p>
+			<p>4、如果未设置 beforeRename 或 beforeRename 返回 true，则结束节点编辑名称状态，更新节点名称，并触发 <span class="highlight_red">setting.callback.onRename</span> 回调函数。</p>
+			<p>默认值：true</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p> true / false 分别表示 显示 / 隐藏 编辑名称按钮</p>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>需要设置是否显示编辑名称按钮的节点 JSON 数据对象</p>
+	<h4 class="topLine"><b>返回值</b><span>Boolean</span></h4>
+	<p>返回值同 Boolean 格式的数据</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 不显示编辑名称按钮</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true,
+		showRenameBtn: false
+	}
+};
+......</code></pre>
+	<h4>2. 设置所有的父节点不显示编辑名称按钮</h4>
+	<pre xmlns=""><code>function setRenameBtn(treeId, treeNode) {
+	return !treeNode.isParent;
+}
+var setting = {
+	edit: {
+		enable: true,
+		showRenameBtn: setRenameBtn
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.treeId.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.treeId.html
new file mode 100644
index 0000000..819743e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.treeId.html
@@ -0,0 +1,14 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">setting.</span>treeId</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>zTree 的唯一标识，初始化后，等于 用户定义的 zTree 容器的 id 属性值。</p>
+			<p class="highlight_red">请勿进行初始化 或 修改，属于内部参数。</p>
+		</div>
+	</div>
+
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.treeObj.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.treeObj.html
new file mode 100644
index 0000000..37684a1
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.treeObj.html
@@ -0,0 +1,14 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Object</span><span class="path">setting.</span>treeObj</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>zTree 容器的 jQuery 对象，主要功能：便于操作。</p>
+			<p class="highlight_red">请勿进行初始化 或 修改，属于内部参数。</p>
+		</div>
+	</div>
+
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.view.addDiyDom.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.view.addDiyDom.html
new file mode 100644
index 0000000..0a508ac
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.view.addDiyDom.html
@@ -0,0 +1,40 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNode)</span><span class="path">setting.view.</span>addDiyDom</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于在节点上固定显示用户自定义控件</p>
+			<p class="highlight_red">1. 大数据量的节点加载请注意：在 addDiyDom 中针对每个节点 查找 DOM 对象并且添加新 DOM 控件，肯定会影响初始化性能；如果不是必须使用，建议不使用此功能</p>
+			<p class="highlight_red">2. 属于高级应用，使用时请确保对 zTree 比较了解。</p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>需要显示自定义控件的节点 JSON 数据对象</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 设置节点后面显示一个按钮</h4>
+	<pre xmlns=""><code>var setting = {
+	view: {
+		addDiyDom: addDiyDom
+	}
+};
+function addDiyDom(treeId, treeNode) {
+	var aObj = $("#" + treeNode.tId + "_a");
+	if ($("#diyBtn_"+treeNode.id).length>0) return;
+	var editStr = "&lt;span id='diyBtn_space_" +treeNode.id+ "' &gt; &lt;/span&gt;"
+		+ "&lt;button type='button' class='diyBtn1' id='diyBtn_" + treeNode.id
+		+ "' title='"+treeNode.name+"' onfocus='this.blur();'&gt;&lt;/button&gt;";
+	aObj.append(editStr);
+	var btn = $("#diyBtn_"+treeNode.id);
+	if (btn) btn.bind("click", function(){alert("diy Button for " + treeNode.name);});
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.view.addHoverDom.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.view.addHoverDom.html
new file mode 100644
index 0000000..f073e79
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.view.addHoverDom.html
@@ -0,0 +1,45 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNode)</span><span class="path">setting.view.</span>addHoverDom</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于当鼠标移动到节点上时，显示用户自定义控件，显示隐藏状态同 zTree 内部的编辑、删除按钮</p>
+			<p class="highlight_red">请务必与 <span class="highlight_red">setting.view.removeHoverDom</span> 同时使用；属于高级应用，使用时请确保对 zTree 比较了解。</p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>需要显示自定义控件的节点 JSON 数据对象</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 设置鼠标移到节点上，在后面显示一个按钮</h4>
+	<pre xmlns=""><code>var setting = {
+	view: {
+		addHoverDom: addHoverDom,
+		removeHoverDom: removeHoverDom,
+		......
+	}
+};
+function addHoverDom(treeId, treeNode) {
+	var aObj = $("#" + treeNode.tId + "_a");
+	if ($("#diyBtn_"+treeNode.id).length>0) return;
+	var editStr = "&lt;span id='diyBtn_space_" +treeNode.id+ "' &gt;&nbsp;&lt;/span&gt;"
+		+ "&lt;button type='button' class='diyBtn1' id='diyBtn_" + treeNode.id
+		+ "' title='"+treeNode.name+"' onfocus='this.blur();'&gt;&lt;/button&gt;";
+	aObj.append(editStr);
+	var btn = $("#diyBtn_"+treeNode.id);
+	if (btn) btn.bind("click", function(){alert("diy Button for " + treeNode.name);});
+};
+function removeHoverDom(treeId, treeNode) {
+	$("#diyBtn_"+treeNode.id).unbind().remove();
+	$("#diyBtn_space_" +treeNode.id).unbind().remove();
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.view.autoCancelSelected.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.view.autoCancelSelected.html
new file mode 100644
index 0000000..aff1078
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.view.autoCancelSelected.html
@@ -0,0 +1,26 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.view.</span>autoCancelSelected</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>点击节点时，按下 Ctrl 键是否允许取消选择操作。</p>
+			<p class="highlight_red">如果不需要此功能，请设置为 false。</p>
+			<p>默认值: true</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p> true / false 分别表示 支持 / 不支持 配合 Ctrl 键进行取消节点选择的操作</p>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 禁止配合 Ctrl 键进行取消节点选择的操作</h4>
+	<pre xmlns=""><code>var setting = {
+	view: {
+		autoCancelSelected: false
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.view.dblClickExpand.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.view.dblClickExpand.html
new file mode 100644
index 0000000..5f3db96
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.view.dblClickExpand.html
@@ -0,0 +1,44 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean / Function(treeId, treeNode)</span><span class="path">setting.view.</span>dblClickExpand</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>双击节点时，是否自动展开父节点的标识</p>
+			<p>默认值: true</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p> true / false 分别表示双击节点 切换 / 不切换 展开状态</p>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>需要设置是否双击切换展开状态的节点 JSON 数据对象</p>
+	<h4 class="topLine"><b>返回值</b><span>Boolean</span></h4>
+	<p>返回值同 Boolean 格式的数据</p>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 取消默认双击展开父节点的功能</h4>
+	<pre xmlns=""><code>var setting = {
+	view: {
+		dblClickExpand: false
+	}
+};
+......</code></pre>
+	<h4>2. 设置 zTree 仅仅 level=0 的父节点取消双击展开的功能</h4>
+	<pre xmlns=""><code>function dblClickExpand(treeId, treeNode) {
+	return treeNode.level > 0;
+};
+var setting = {
+	view: {
+		dblClickExpand: dblClickExpand
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.view.expandSpeed.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.view.expandSpeed.html
new file mode 100644
index 0000000..3b799c3
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.view.expandSpeed.html
@@ -0,0 +1,31 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String / Number</span><span class="path">setting.view.</span>expandSpeed</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>zTree 节点展开、折叠时的动画速度，设置方法同 JQuery 动画效果中 speed 参数。</p>
+			<p class="highlight_red">IE6 下会自动关闭动画效果，以保证 zTree 的操作速度</p>
+			<p>默认值："fast"</p>
+		</div>
+	</div>
+	<h3>String 格式说明</h3>
+	<div class="desc">
+	<p>三种预定速度之一的字符串("slow", "normal", or "fast")</p>
+	<p class="highlight_red">设置为 "" 时，不显示动画效果</p>
+	</div>
+	<h3>Number 格式说明</h3>
+	<div class="desc">
+	<p>表示动画时长的毫秒数值 (如：1000)</p>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 设置为慢速显示动画效果</h4>
+	<pre xmlns=""><code>var setting = {
+	view: {
+		expandSpeed: "slow"
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.view.fontCss.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.view.fontCss.html
new file mode 100644
index 0000000..54efb1b
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.view.fontCss.html
@@ -0,0 +1,42 @@
+<div class="apiDetail">
+<div>
+	<h2><span>JSON / Function(treeId, treeNode)</span><span class="path">setting.view.</span>fontCss</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>个性化文字样式，只针对 zTree 在节点上显示的&lt;A&gt;对象。</p>
+			<p>默认值：{}</p>
+		</div>
+	</div>
+	<h3>JSON 格式说明</h3>
+	<div class="desc">
+	<p>JSON 格式为 JQuery css方法中的 JSON 对象格式，例如：<span class="highlight_red">{color:"#ff0011", background:"blue"}</span></p>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>需要设置自定义样式的节点 JSON 数据对象</p>
+	<h4 class="topLine"><b>返回值</b><span>JSON</span></h4>
+	<p>返回值同 JSON 格式的数据，例如：<span class="highlight_red">{color:"#ff0011", background:"blue"}</span></p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 不修改CSS，设置全部节点 name 显示为红色</h4>
+	<pre xmlns=""><code>var setting = {
+	view: {
+		fontCss : {color:"red"}
+	}
+};</code></pre>
+	<h4>2. 设置 level=0 的节点 name 显示为红色</h4>
+	<pre xmlns=""><code>function setFontCss(treeId, treeNode) {
+	return treeNode.level == 0 ? {color:"red"} : {};
+};
+var setting = {
+	view: {
+		fontCss: setFontCss
+	}
+};</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.view.nameIsHTML.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.view.nameIsHTML.html
new file mode 100644
index 0000000..a1d916c
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.view.nameIsHTML.html
@@ -0,0 +1,27 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.view.</span>nameIsHTML</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>设置 name 属性是否支持 HTML 脚本</p>
+			<p class="highlight_red">如果允许 HTML 脚本，请根据自己的需求做校验，避免出现 js 注入等安全问题。</p>
+			<p>默认值: false</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p> true / false 分别表示 支持 / 不支持 HTML 脚本</p>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 设置 name 属性支持 HTML 脚本</h4>
+	<pre xmlns=""><code>var setting = {
+	view: {
+		nameIsHTML: true
+	}
+};
+var node = {"name":"&lt;font color='red'&gt;test&lt;/font&gt;"};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.view.removeHoverDom.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.view.removeHoverDom.html
new file mode 100644
index 0000000..bb1a9aa
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.view.removeHoverDom.html
@@ -0,0 +1,45 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNode)</span><span class="path">setting.view.</span>removeHoverDom</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于当鼠标移出节点时，隐藏用户自定义控件，显示隐藏状态同 zTree 内部的编辑、删除按钮</p>
+			<p class="highlight_red">请务必与 <span class="highlight_red">addHoverDom</span> 同时使用；属于高级应用，使用时请确保对 zTree 比较了解。</p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4><b>treeNode</b><span>JSON</span></h4>
+	<p>需要隐藏自定义控件的节点 JSON 数据对象</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 设置鼠标移到节点上，在后面显示一个按钮</h4>
+	<pre xmlns=""><code>var setting = {
+	view: {
+		addHoverDom: addHoverDom,
+		removeHoverDom: removeHoverDom,
+		......
+	}
+};
+function addHoverDom(treeId, treeNode) {
+	var aObj = $("#" + treeNode.tId + "_a");
+	if ($("#diyBtn_"+treeNode.id).length>0) return;
+	var editStr = "&lt;span id='diyBtn_space_" +treeNode.id+ "' &gt;&nbsp;&lt;/span&gt;"
+		+ "&lt;button type='button' class='diyBtn1' id='diyBtn_" + treeNode.id
+		+ "' title='"+treeNode.name+"' onfocus='this.blur();'&gt;&lt;/button&gt;";
+	aObj.append(editStr);
+	var btn = $("#diyBtn_"+treeNode.id);
+	if (btn) btn.bind("click", function(){alert("diy Button for " + treeNode.name);});
+};
+function removeHoverDom(treeId, treeNode) {
+	$("#diyBtn_"+treeNode.id).unbind().remove();
+	$("#diyBtn_space_" +treeNode.id).unbind().remove();
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.view.selectedMulti.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.view.selectedMulti.html
new file mode 100644
index 0000000..d73820d
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.view.selectedMulti.html
@@ -0,0 +1,27 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.view.</span>selectedMulti</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>设置是否允许同时选中多个节点。</p>
+			<p>默认值: true</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p> true / false 分别表示 支持 / 不支持 同时选中多个节点</p>
+	<p class="highlight_red">1、设置为 true时，按下 Ctrl 键可以选中多个节点</p>
+	<p class="highlight_red">2、设置为 true / false 都不影响按下 Ctrl 键可以让已选中的节点取消选中状态（ 取消选中状态可以参考 setting.view.autoCancelSelected ）</p>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 禁止多点同时选中的功能</h4>
+	<pre xmlns=""><code>var setting = {
+	view: {
+		selectedMulti: false
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.view.showIcon.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.view.showIcon.html
new file mode 100644
index 0000000..ebe423c
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.view.showIcon.html
@@ -0,0 +1,44 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean / Function(treeId, treeNode)</span><span class="path">setting.view.</span>showIcon</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>设置 zTree 是否显示节点的图标。</p>
+			<p>默认值：true</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p> true / false 分别表示 显示 / 隐藏 图标</p>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>需要设置是否显示图标的节点 JSON 数据对象</p>
+	<h4 class="topLine"><b>返回值</b><span>Boolean</span></h4>
+	<p>返回值同 Boolean 格式的数据</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 设置 zTree 不显示图标</h4>
+	<pre xmlns=""><code>var setting = {
+	view: {
+		showIcon: false
+	}
+};
+......</code></pre>
+	<h4>2. 设置 zTree 仅仅 level=2 的节点不显示图标</h4>
+	<pre xmlns=""><code>function showIconForTree(treeId, treeNode) {
+	return treeNode.level != 2;
+};
+var setting = {
+	view: {
+		showIcon: showIconForTree
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.view.showLine.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.view.showLine.html
new file mode 100644
index 0000000..02ab5eb
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.view.showLine.html
@@ -0,0 +1,25 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.view.</span>showLine</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>设置 zTree 是否显示节点之间的连线。</p>
+			<p>默认值：true</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p> true / false 分别表示 显示 / 不显示 连线</p>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 设置 zTree 不显示节点之间的连线</h4>
+	<pre xmlns=""><code>var setting = {
+	view: {
+		showLine: false
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.view.showTitle.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.view.showTitle.html
new file mode 100644
index 0000000..5bcb860
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.view.showTitle.html
@@ -0,0 +1,46 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean / Function(treeId, treeNode)</span><span class="path">setting.view.</span>showTitle</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>设置 zTree 是否显示节点的 title 提示信息(即节点 DOM 的 title 属性)。</p>
+			<p class="highlight_red">请务必与 <span class="highlight_red">setting.data.key.title</span> 同时使用。</p>
+			<p>默认值：true</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p> true / false 分别表示 显示 / 隐藏 提示信息</p>
+	<p class="highlight_red">如果 setting.view.showTitle = true & setting.data.key.title = ''，zTree 会自动使用 setting.data.key.name 指定的节点名称当做 title</p>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>需要设置是否显示提示信息的节点 JSON 数据对象</p>
+	<h4 class="topLine"><b>返回值</b><span>Boolean</span></h4>
+	<p>返回值同 Boolean 格式的数据</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 设置 zTree 不显示提示信息</h4>
+	<pre xmlns=""><code>var setting = {
+	view: {
+		showTitle: false
+	}
+};
+......</code></pre>
+	<h4>2. 设置 zTree 仅仅 level=2 的节点不显示提示信息</h4>
+	<pre xmlns=""><code>function showTitleForTree(treeId, treeNode) {
+	return treeNode.level != 2;
+};
+var setting = {
+	view: {
+		showTitle: showTitleForTree
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.view.txtSelectedEnable.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.view.txtSelectedEnable.html
new file mode 100644
index 0000000..c22a8c0
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/setting.view.txtSelectedEnable.html
@@ -0,0 +1,25 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.view.</span>txtSelectedEnable</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>设置 zTree 是否允许可以选择 zTree DOM 内的文本。</p>
+			<p>默认值：false</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p> true / false 分别表示 允许 / 不允许 选择 zTree Dom 内的文本</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 设置 zTree 允许选择文本</h4>
+	<pre xmlns=""><code>var setting = {
+	view: {
+		txtSelectedEnable: true
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.check_Child_State.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.check_Child_State.html
new file mode 100644
index 0000000..fa37899
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.check_Child_State.html
@@ -0,0 +1,43 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Number</span><span class="path">treeNode.</span>check_Child_State</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.excheck</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于设置节点的子节点的 checkBox / radio 的半选状态。<span class="highlight_red">[setting.check.enable = true 时有效]</span></p>
+			<p class="highlight_red">v3.x 针对节点数据对象提供 treeNode.getCheckStatus() 方法获取标准的半选状态</p>
+			<p class="highlight_red">zTree 内部使用，请勿进行初始化 或 随意修改</p>
+			<p>默认值：true</p>
+		</div>
+	</div>
+	<h3>Number 格式说明</h3>
+	<div class="desc">
+	<p>规则如下：</p>
+	<table width="100%" border="0" cellspacing="1" cellpadding="0">
+		<thead>
+			<tr><td colspan="4">setting.check.checkType = "checkbox"</td></tr>
+			<tr><td>treeNode.check_Child_State</td><td>勾选状态说明</td></tr>
+		</thead>
+		<tbody>
+			<tr><td>-1</td><td>不存在子节点 或 子节点全部设置为 nocheck = true</td></tr>
+			<tr><td>0</td><td>无 子节点被勾选</td></tr>
+			<tr><td>1</td><td>部分 子节点被勾选</td></tr>
+			<tr><td>2</td><td>全部 子节点被勾选</td></tr>
+		</tbody>
+	</table>
+	<br/>
+	<table width="100%" border="0" cellspacing="1" cellpadding="0">
+		<thead>
+			<tr><td colspan="4">setting.check.checkType = "radio"</td></tr>
+			<tr><td>treeNode.check_Child_State</td><td>勾选状态说明</td></tr>
+		</thead>
+		<tbody>
+			<tr><td>-1</td><td>不存在子节点 或 子节点全部设置为 nocheck = true</td></tr>
+			<tr><td>0</td><td>无 子节点被勾选</td></tr>
+			<tr><td>2</td><td>有 子节点被勾选</td></tr>
+		</tbody>
+	</table>
+	</div>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.check_Focus.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.check_Focus.html
new file mode 100644
index 0000000..785aec9
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.check_Focus.html
@@ -0,0 +1,19 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">treeNode.</span>check_Focus</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.excheck</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于设置节点的 checkBox / radio 的 focus 状态。<span class="highlight_red">[setting.check.enable = true 时有效]</span></p>
+			<p class="highlight_red">zTree 内部使用，请勿进行初始化 或 随意修改</p>
+			<p>默认值：false</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p>true 表示当前鼠标移动到输入框内</p>
+	<p>false 表示当前鼠标移动到输入框外</p>
+	</div>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.checked.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.checked.html
new file mode 100644
index 0000000..049d6ba
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.checked.html
@@ -0,0 +1,32 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">treeNode.</span>checked</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.excheck</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>节点的 checkBox / radio 的 勾选状态。<span class="highlight_red">[setting.check.enable = true & treeNode.nocheck = false 时有效]</span></p>
+			<p class="highlight_red">1、如果不使用 checked 属性设置勾选状态，请修改 setting.data.key.checked </p>
+			<p class="highlight_red">2、建立 treeNode 数据时设置 treeNode.checked = true 可以让节点的输入框默认为勾选状态</p>
+			<p class="highlight_red">3、修改节点勾选状态，可以使用 treeObj.checkNode / checkAllNodes / updateNode 方法，具体使用哪种请根据自己的需求而定</p>
+			<p class="highlight_red">4、为了解决部分朋友生成 json 数据出现的兼容问题, 支持 "false","true" 字符串格式的数据</p>
+			<p>默认值：false</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p>true 表示节点的输入框被勾选</p>
+	<p>false 表示节点的输入框未勾选</p>
+	</div>
+	<h3>treeNode 举例</h3>
+	<h4>1. 初始化的数据设置 默认为勾选状态</h4>
+	<pre xmlns=""><code>var nodes = [
+{ "id":1, "name":"test1", checked:true },
+{ "id":2, "name":"test2", checked:true }
+]</code></pre>
+	<h4>2. 获取第一个根节点的勾选状态</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var checked = treeObj.getNodes()[0].checked;
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.checkedOld.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.checkedOld.html
new file mode 100644
index 0000000..cab717e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.checkedOld.html
@@ -0,0 +1,25 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">treeNode.</span>checkedOld</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.excheck</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>节点的 checkBox / radio 在初始化时的 勾选状态。<span class="highlight_red">[setting.check.enable = true & treeNode.nocheck = false 时有效]</span></p>
+			<p class="highlight_red">1、zTree 初始化节点数据时会对此属性进行赋值，因此请勿对此属性初始化</p>
+			<p class="highlight_red">2、如需配合 zTreeObj.getChangeCheckedNodes 方法实现特殊功能，可以根据需求在使用中自行修改 checkedOld 数据</p>
+			<p>默认值：checked的初始化值</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p>true 表示节点初始化时 输入框被勾选</p>
+	<p>false 表示节点初始化时 输入框未勾选</p>
+	</div>
+	<h3>treeNode 举例</h3>
+	<h4>1. 获取第一个根节点的初始勾选状态</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var checkedOld = treeObj.getNodes()[0].checkedOld;
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.children.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.children.html
new file mode 100644
index 0000000..4bab835
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.children.html
@@ -0,0 +1,35 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Array(JSON)</span><span class="path">treeNode.</span>children</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>节点的子节点数据集合。</p>
+			<p class="highlight_red">1、如果不使用 children 属性保存子节点数据，请修改 setting.data.key.children </p>
+			<p class="highlight_red">2、异步加载时，对于设置了 isParent = true 的节点，在展开时将进行异步加载</p>
+			<p>默认值：无</p>
+		</div>
+	</div>
+	<h3>Array(JSON) 格式说明</h3>
+	<div class="desc">
+	<p>标准的 JSON 数据对象</p>
+	</div>
+	<h3>treeNode 举例</h3>
+	<h4>1. 初始化的标准嵌套格式的 JSON 数据对象</h4>
+	<pre xmlns=""><code>var nodes = [
+{ "id":1, "name":"test1",
+	children: [
+	{ "id":3, "name":"test3"},
+	{ "id":4, "name":"test4"},
+	{ "id":5, "name":"test5"}
+	]
+},
+{ "id":2, "name":"test2"  }
+]</code></pre>
+	<h4>2. 获取第一个根节点的子节点</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getNodes()[0].children;
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.chkDisabled.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.chkDisabled.html
new file mode 100644
index 0000000..e6bb032
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.chkDisabled.html
@@ -0,0 +1,28 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">treeNode.</span>chkDisabled</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.excheck</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>1、设置节点的 checkbox / radio 是否禁用 <span class="highlight_red">[setting.check.enable = true 时有效]</span></p>
+			<p class="highlight_red">2、为了解决部分朋友生成 json 数据出现的兼容问题, 支持 "false","true" 字符串格式的数据</p>
+			<p class="highlight_red">3、请勿对已加载的节点修改此属性，禁止 或 取消禁止 请使用 setChkDisabled() 方法</p>
+			<p class="highlight_red">4、初始化时，如果需要子孙节点继承父节点的 chkDisabled 属性，请设置 setting.check.chkDisabledInherit 属性</p>
+			<p>默认值：false</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p class="highlight_red">true 表示此节点的 checkbox / radio 被禁用。</p>
+	<p class="highlight_red">false 表示此节点的 checkbox / radio 可以使用。</p>
+	</div>
+	<h3>treeNode 举例</h3>
+	<h4>1. 禁用节点 checkbox / radio </h4>
+	<pre xmlns=""><code>var nodes = [
+	{ "id":1, "name":"test1", "checked":true, "chkDisabled":true},
+	{ "id":2, "name":"test2", "chkDisabled":true},
+	{ "id":3, "name":"test3"}
+]</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.click.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.click.html
new file mode 100644
index 0000000..833c678
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.click.html
@@ -0,0 +1,24 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">treeNode.</span>click</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>最简单的 click 事件操作。相当于 onclick="..." 的内容。 如果操作较复杂，请使用 onClick 事件回调函数。</p>
+			<p class="highlight_red">由于 IE 对于 onclick 和 click事件共存时的处理与其他浏览器不同，所以请不要利用此参数控制是否允许跳转的操作（例如：treeNode.click = "return false;"）。如有类似需求，请不要使用 url 属性设置网址，同时利用 onClick 回调函数控制跳转。</p>
+			<p>默认值：无</p>
+		</div>
+	</div>
+	<h3>String 格式说明</h3>
+	<div class="desc">
+	<p>标准 javascript 语法， 例如：alert("test"); 等</p>
+	</div>
+	<h3>treeNode 举例</h3>
+	<h4>1. 设置某节点点击时，弹出信息框</h4>
+	<pre xmlns=""><code>var nodes = [
+	{ "id":1, "name":"Google CN", "url":"http://g.cn", "click":"alert('test');"},
+	......
+]</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.diy.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.diy.html
new file mode 100644
index 0000000..b2fb0d9
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.diy.html
@@ -0,0 +1,15 @@
+<div class="apiDetail">
+<div>
+	<h2><span>?</span><span class="path">treeNode.</span>* DIY *</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于保存节点的其他自定义数据信息，不要与 zTree 使用的属性相同即可，用户可随意设定。</p>
+		</div>
+	</div>
+	<h3>treeNode 举例</h3>
+	<h4>1. 设置节点的备用英文名称</h4>
+	<pre xmlns=""><code>var node = { "id":1, "name":"test1", "ename":"test eName"};</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.editNameFlag.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.editNameFlag.html
new file mode 100644
index 0000000..51162b8
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.editNameFlag.html
@@ -0,0 +1,19 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">treeNode.</span>editNameFlag</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于记录节点是否处于编辑名称状态。<span class="highlight_red">[setting.edit.enable = true 时有效]</span></p>
+			<p class="highlight_red">zTree 内部使用，请勿进行初始化 或 随意修改</p>
+			<p>默认值：false</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p>true 表示节点处于编辑名称状态</p>
+	<p>false 表示节点未处于编辑名称状态</p>
+	</div>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.getCheckStatus.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.getCheckStatus.html
new file mode 100644
index 0000000..fc20eac
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.getCheckStatus.html
@@ -0,0 +1,63 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function()</span><span class="path">treeNode.</span>getCheckStatus</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.excheck</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>获取节点 checkbox / radio 半勾选状态。<span class="highlight_red">[setting.check.enable = true 时有效]</span></p>
+			<p class="highlight_red">初始化节点数据时，由 zTree 增加此属性，请勿提前赋值</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>返回值</b><span>JSON</span></h4>
+	<pre xmlns=""><code>{
+	checked: true, //等同于 treeNode.checked
+	half: true  //规则见下表
+}</code></pre>
+	<table width="100%" border="0" cellspacing="1" cellpadding="0">
+		<thead>
+			<tr><td colspan="4">setting.check.checkType = "checkbox"</td></tr>
+			<tr><td>treeNode.checked</td><td>treeNode.check_Child_State</td><td>treeNode.halfCheck</td><td> half </td></tr>
+		</thead>
+		<tbody>
+			<tr><td>-</td><td>-</td><td>true</td><td>true</td></tr>
+			<tr><td colspan="4">&nbsp;</td></tr>
+			<tr><td>true</td><td>-1</td><td>false</td><td>false</td></tr>
+			<tr><td>true</td><td>0</td><td>false</td><td>true</td></tr>
+			<tr><td>true</td><td>1</td><td>false</td><td>true</td></tr>
+			<tr><td>true</td><td>2</td><td>false</td><td>false</td></tr>
+			<tr><td colspan="4">&nbsp;</td></tr>
+			<tr><td>false</td><td>-1</td><td>false</td><td>false</td></tr>
+			<tr><td>false</td><td>0</td><td>false</td><td>false</td></tr>
+			<tr><td>false</td><td>1</td><td>false</td><td>true</td></tr>
+			<tr><td>false</td><td>2</td><td>false</td><td>true</td></tr>
+		</tbody>
+	</table>
+	<br/>
+	<table width="100%" border="0" cellspacing="1" cellpadding="0">
+		<thead>
+			<tr><td colspan="4">setting.check.checkType = "radio"</td></tr>
+			<tr><td>treeNode.checked</td><td>treeNode.check_Child_State</td><td>treeNode.halfCheck</td><td> half </td></tr>
+		</thead>
+		<tbody>
+			<tr><td>-</td><td>-</td><td>true</td><td>true</td></tr>
+			<tr><td colspan="4">&nbsp;</td></tr>
+			<tr><td>true</td><td>-1</td><td>false</td><td>false</td></tr>
+			<tr><td>true</td><td>0</td><td>false</td><td>false</td></tr>
+			<tr><td>true</td><td>2</td><td>false</td><td>true</td></tr>
+			<tr><td colspan="4">&nbsp;</td></tr>
+			<tr><td>false</td><td>-1</td><td>false</td><td>false</td></tr>
+			<tr><td>false</td><td>0</td><td>false</td><td>false</td></tr>
+			<tr><td>false</td><td>2</td><td>false</td><td>true</td></tr>
+		</tbody>
+	</table>
+	</div>
+	<h3>treeNode 举例</h3>
+	<h4>1. 获取第一个根节点的半选状态</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var halfCheck = treeObj.getNodes()[0].getCheckStatus();
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.getNextNode.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.getNextNode.html
new file mode 100644
index 0000000..7a0fa5c
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.getNextNode.html
@@ -0,0 +1,27 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function()</span><span class="path">treeNode.</span>getNextNode</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>获取与 treeNode 节点相邻的后一个节点。</p>
+			<p class="highlight_red">初始化节点数据时，由 zTree 增加此属性，请勿提前赋值</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>返回值</b><span>JSON</span></h4>
+	<p>与 treeNode 节点相邻的后一个节点。</p>
+	<p class="highlight_red">如果 treeNode 是最后一个节点，返回 null 。</p>
+	</div>
+	<h3>treeNode 举例</h3>
+	<h4>1. 获取当前被选中的节点的下一个节点</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var sNodes = treeObj.getSelectedNodes();
+if (sNodes.length > 0) {
+	var node = sNodes[0].getNextNode();
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.getParentNode.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.getParentNode.html
new file mode 100644
index 0000000..31309a6
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.getParentNode.html
@@ -0,0 +1,27 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function()</span><span class="path">treeNode.</span>getParentNode</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>获取 treeNode 节点的父节点。</p>
+			<p class="highlight_red">初始化节点数据时，由 zTree 增加此属性，请勿提前赋值</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>返回值</b><span>JSON</span></h4>
+	<p> treeNode 节点的父节点 JSON 数据对象。</p>
+	<p class="highlight_red">如果 treeNode 是根节点，返回 null 。</p>
+	</div>
+	<h3>treeNode 举例</h3>
+	<h4>1. 获取当前被选中的节点的父节点</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var sNodes = treeObj.getSelectedNodes();
+if (sNodes.length > 0) {
+	var node = sNodes[0].getParentNode();
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.getPreNode.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.getPreNode.html
new file mode 100644
index 0000000..9d84184
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.getPreNode.html
@@ -0,0 +1,27 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function()</span><span class="path">treeNode.</span>getPreNode</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>获取与 treeNode 节点相邻的前一个节点。</p>
+			<p class="highlight_red">初始化节点数据时，由 zTree 增加此属性，请勿提前赋值</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>返回值</b><span>JSON</span></h4>
+	<p>与 treeNode 节点相邻的前一个节点。</p>
+	<p class="highlight_red">如果 treeNode 是第一个节点，返回 null 。</p>
+	</div>
+	<h3>treeNode 举例</h3>
+	<h4>1. 获取当前被选中的节点的前一个节点</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var sNodes = treeObj.getSelectedNodes();
+if (sNodes.length > 0) {
+	var node = sNodes[0].getPreNode();
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.halfCheck.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.halfCheck.html
new file mode 100644
index 0000000..23ac744
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.halfCheck.html
@@ -0,0 +1,29 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">treeNode.</span>halfCheck</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.excheck</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>强制节点的 checkBox / radio 的 半勾选状态。<span class="highlight_red">[setting.check.enable = true & treeNode.nocheck = false 时有效]</span></p>
+			<p class="highlight_red">1、强制为半勾选状态后，不再进行自动计算半勾选状态</p>
+			<p class="highlight_red">2、设置 treeNode.halfCheck = false 或 null 才能恢复自动计算半勾选状态</p>
+			<p class="highlight_red">3、为了解决部分朋友生成 json 数据出现的兼容问题, 支持 "false","true" 字符串格式的数据</p>
+			<p>默认值：false</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p>true 表示节点的输入框 强行设置为半勾选</p>
+	<p>false 表示节点的输入框 根据 zTree 的规则自动计算半勾选状态</p>
+	</div>
+	<h3>treeNode 举例</h3>
+	<h4>1. 初始化的数据设置 默认为半勾选状态</h4>
+	<pre xmlns=""><code>var nodes = [
+{ "id":1, "name":"test1", isParent:true, checked:true, halfCheck:true },
+{ "id":2, "name":"test2", isParent:true, checked:false, halfCheck:true },
+{ "id":3, "name":"test3", isParent:true, checked:true },
+{ "id":4, "name":"test4", isParent:true, checked:false }
+]</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.icon.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.icon.html
new file mode 100644
index 0000000..69c5db1
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.icon.html
@@ -0,0 +1,33 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">treeNode.</span>icon</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>节点自定义图标的 URL 路径。</p>
+			<p class="highlight_red">1、父节点如果只设置 icon ，会导致展开、折叠时都使用同一个图标</p>
+			<p class="highlight_red">2、父节点展开、折叠使用不同的个性化图标需要同时设置 treeNode.iconOpen / treeNode.iconClose 两个属性</p>
+			<p class="highlight_red">3、如果想利用 className 设置个性化图标，需要设置 treeNode.iconSkin 属性</p>
+			<p>默认值：无</p>
+		</div>
+	</div>
+	<h3>String 格式说明</h3>
+	<div class="desc">
+	<p>图标图片的 url 可以是相对路径也可以是绝对路径</p>
+	<p class="highlight_red">设置相对路径请注意页面与图片之间的关系，确保图片能够正常加载</p>
+	</div>
+	<h3>treeNode 举例</h3>
+	<h4>1. 设置节点的个性化图标</h4>
+	<pre xmlns=""><code>var nodes = [
+	//父节点展开 折叠时使用相同的图标
+	{ name:"父节点1", icon:"/img/parent.gif"},
+
+	//父节点展开 折叠时分别使用不同的图标
+	{ name:"父节点2", iconOpen:"/img/open.gif", iconClose:"/img/close.gif"}, 
+
+	//叶子节点个性化图标
+	{ name:"叶子节点", icon:"/img/leaf.gif"}
+]</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.iconClose.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.iconClose.html
new file mode 100644
index 0000000..f51da9c
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.iconClose.html
@@ -0,0 +1,33 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">treeNode.</span>iconClose</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>父节点自定义折叠时图标的 URL 路径。</p>
+			<p class="highlight_red">1、此属性只针对父节点有效</p>
+			<p class="highlight_red">2、此属性必须与 iconOpen 同时使用</p>
+			<p class="highlight_red">3、如果想利用 className 设置个性化图标，需要设置 treeNode.iconSkin 属性</p>
+			<p>默认值：无</p>
+		</div>
+	</div>
+	<h3>String 格式说明</h3>
+	<div class="desc">
+	<p>图标图片的 url 可以是相对路径也可以是绝对路径</p>
+	<p class="highlight_red">设置相对路径请注意页面与图片之间的关系，确保图片能够正常加载</p>
+	</div>
+	<h3>treeNode 举例</h3>
+	<h4>1. 设置节点的个性化图标</h4>
+	<pre xmlns=""><code>var nodes = [
+	//父节点展开 折叠时使用相同的图标
+	{ name:"父节点1", icon:"/img/parent.gif"},
+
+	//父节点展开 折叠时分别使用不同的图标
+	{ name:"父节点2", iconOpen:"/img/open.gif", iconClose:"/img/close.gif"}, 
+
+	//叶子节点个性化图标
+	{ name:"叶子节点", icon:"/img/leaf.gif"}
+]</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.iconOpen.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.iconOpen.html
new file mode 100644
index 0000000..29c9baa
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.iconOpen.html
@@ -0,0 +1,33 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">treeNode.</span>iconOpen</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>父节点自定义展开时图标的 URL 路径。</p>
+			<p class="highlight_red">1、此属性只针对父节点有效</p>
+			<p class="highlight_red">2、此属性必须与 iconClose 同时使用</p>
+			<p class="highlight_red">3、如果想利用 className 设置个性化图标，需要设置 treeNode.iconSkin 属性</p>
+			<p>默认值：无</p>
+		</div>
+	</div>
+	<h3>String 格式说明</h3>
+	<div class="desc">
+	<p>图标图片的 url 可以是相对路径也可以是绝对路径</p>
+	<p class="highlight_red">设置相对路径请注意页面与图片之间的关系，确保图片能够正常加载</p>
+	</div>
+	<h3>treeNode 举例</h3>
+	<h4>1. 设置节点的个性化图标</h4>
+	<pre xmlns=""><code>var nodes = [
+	//父节点展开 折叠时使用相同的图标
+	{ name:"父节点1", icon:"/img/parent.gif"},
+
+	//父节点展开 折叠时分别使用不同的图标
+	{ name:"父节点2", iconOpen:"/img/open.gif", iconClose:"/img/close.gif"}, 
+
+	//叶子节点个性化图标
+	{ name:"叶子节点", icon:"/img/leaf.gif"}
+]</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.iconSkin.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.iconSkin.html
new file mode 100644
index 0000000..d5d9726
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.iconSkin.html
@@ -0,0 +1,43 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">treeNode.</span>iconSkin</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>节点自定义图标的 className</p>
+			<p class="highlight_red">1、需要修改 css，增加相应 className 的设置</p>
+			<p class="highlight_red">2、css 方式简单、方便，并且同时支持父节点展开、折叠状态切换图片</p>
+			<p class="highlight_red">3、css 建议采用图片分割渲染的方式以减少反复加载图片，并且避免图片闪动</p>
+			<p class="highlight_red">4、zTree v3.x 的 iconSkin 同样支持 IE6</p>
+			<p class="highlight_red">5、如果想直接使用 图片的Url路径 设置节点的个性化图标，需要设置 treeNode.icon / treeNode.iconOpen / treeNode.iconClose 属性</p>
+			<p>默认值：无</p>
+		</div>
+	</div>
+	<h3>String 格式说明</h3>
+	<div class="desc">
+	<p>设置个性图标的 className</p>
+	</div>
+	<h3>css & treeNode 举例</h3>
+	<h4>1. 设置节点的个性化图标</h4>
+	<pre xmlns=""><code>css 内容：
+.ztree li span.button.diy01_ico_open, .ztree li span.button.diy01_ico_close{...}
+
+.ztree li span.button.diy02_ico_open{...}
+.ztree li span.button.diy02_ico_close{...}
+
+.ztree li span.button.diy03_ico_docu{...}
+
+js中节点数据：
+var nodes = [
+	//父节点展开 折叠时使用相同的图标
+	{ name:"父节点1", iconSkin:"diy01"},
+
+	//父节点展开 折叠时分别使用不同的图标
+	{ name:"父节点2", iconSkin:"diy02"},
+
+	//叶子节点个性化图标
+	{ name:"叶子节点", iconSkin:"diy03"}
+]</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.isAjaxing.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.isAjaxing.html
new file mode 100644
index 0000000..330c120
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.isAjaxing.html
@@ -0,0 +1,26 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">treeNode.</span>isAjaxing</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>记录 treeNode 节点是否正在进行异步加载。</p>
+			<p class="highlight_red">初始化节点数据时，由 zTree 增加此属性，请勿提前赋值</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p> true 表示节点正在进行异步加载</p>
+	<p> false 表示节点没有进行异步加载</p>
+	</div>
+	<h3>treeNode 举例</h3>
+	<h4>1. 查看当前被选中的节点是否节点正在进行异步加载</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var sNodes = treeObj.getSelectedNodes();
+if (sNodes.length > 0) {
+	var isAjaxing = sNodes[0].isAjaxing;
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.isFirstNode.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.isFirstNode.html
new file mode 100644
index 0000000..83b80bd
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.isFirstNode.html
@@ -0,0 +1,28 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">treeNode.</span>isFirstNode</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>记录 treeNode 节点是否为同级节点中的第一个节点。</p>
+			<p class="highlight_red">使用 exhide 扩展后，只针对显示的节点设置此属性</p>
+			<p class="highlight_red">初始化节点数据时，由 zTree 增加此属性，请勿提前赋值</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p> true 表示是同级节点中的第一个节点</p>
+	<p> false 表示不是同级节点中的第一个节点</p>
+	<p class="highlight_red">节点被隐藏后，isFirstNode = false</p>
+	</div>
+	<h3>treeNode 举例</h3>
+	<h4>1. 查看当前被选中的节点是否是同级节点中的第一个节点</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var sNodes = treeObj.getSelectedNodes();
+if (sNodes.length > 0) {
+	var isFirstNode = sNodes[0].isFirstNode;
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.isHidden.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.isHidden.html
new file mode 100644
index 0000000..5fb388e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.isHidden.html
@@ -0,0 +1,27 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">treeNode.</span>isHidden</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exhide</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>判断 treeNode 节点是否被隐藏。</p>
+			<p class="highlight_red">1、初始化 zTree 时，如果节点设置 isHidden = true，会被自动隐藏</p>
+			<p class="highlight_red">2、请勿对已加载的节点修改此属性，隐藏 / 显示 请使用 hideNode() / hideNodes() / showNode() / showNodes() 方法</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p> true 表示被隐藏</p>
+	<p> false 表示被显示</p>
+	</div>
+	<h3>treeNode 举例</h3>
+	<h4>1. 查看第一个根节点是否被隐藏</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var sNodes = treeObj.getNodes();
+if (sNodes.length > 0) {
+	var isHidden = sNodes[0].isHidden;
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.isHover.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.isHover.html
new file mode 100644
index 0000000..dcef6eb
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.isHover.html
@@ -0,0 +1,19 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">treeNode.</span>isHover</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>记录节点 的 hover 状态，主要用于 setting.view.addHoverDom / removeHoverDom 。</p>
+			<p class="highlight_red">zTree 内部使用，请勿进行初始化 或 随意修改</p>
+			<p>默认值：false</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p>true 表示节点处于 hover 状态</p>
+	<p>false 表示节点未处于 hover 状态</p>
+	</div>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.isLastNode.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.isLastNode.html
new file mode 100644
index 0000000..5d5ac82
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.isLastNode.html
@@ -0,0 +1,28 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">treeNode.</span>isLastNode</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>记录 treeNode 节点是否为同级节点中的最后一个节点。</p>
+			<p class="highlight_red">使用 exhide 扩展后，只针对显示的节点设置此属性</p>
+			<p class="highlight_red">初始化节点数据时，由 zTree 增加此属性，请勿提前赋值</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p> true 表示是同级节点中的最后一个节点</p>
+	<p> false 表示不是同级节点中的最后一个节点</p>
+	<p class="highlight_red">节点被隐藏后，isLastNode = false</p>
+	</div>
+	<h3>treeNode 举例</h3>
+	<h4>1. 查看当前被选中的节点是否是同级节点中的最后一个节点</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var sNodes = treeObj.getSelectedNodes();
+if (sNodes.length > 0) {
+	var isLastNode = sNodes[0].isLastNode;
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.isParent.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.isParent.html
new file mode 100644
index 0000000..bab887e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.isParent.html
@@ -0,0 +1,28 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">treeNode.</span>isParent</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>记录 treeNode 节点是否为父节点。</p>
+			<p class="highlight_red">1、初始化节点数据时，根据 treeNode.children 属性判断，有子节点则设置为 true，否则为 false</p>
+			<p class="highlight_red">2、初始化节点数据时，如果设定 treeNode.isParent = true，即使无子节点数据，也会设置为父节点</p>
+			<p class="highlight_red">3、为了解决部分朋友生成 json 数据出现的兼容问题, 支持 "false","true" 字符串格式的数据</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p> true 表示是父节点</p>
+	<p> false 表示不是父节点</p>
+	</div>
+	<h3>treeNode 举例</h3>
+	<h4>1. 查看当前被选中的节点是否是父节点</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var sNodes = treeObj.getSelectedNodes();
+if (sNodes.length > 0) {
+	var isParent = sNodes[0].isParent;
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.level.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.level.html
new file mode 100644
index 0000000..aff3254
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.level.html
@@ -0,0 +1,25 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Number</span><span class="path">treeNode.</span>level</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>记录节点的层级</p>
+			<p class="highlight_red">初始化节点数据时，由 zTree 增加此属性，请勿提前赋值</p>
+		</div>
+	</div>
+	<h3>Number 格式说明</h3>
+	<div class="desc">
+	<p class="highlight_red">根节点 level = 0，依次递增</p>
+	</div>
+	<h3>treeNode 举例</h3>
+	<h4>1. 查看当前被选中的节点的级数</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var sNodes = treeObj.getSelectedNodes();
+if (sNodes.length > 0) {
+	var level = sNodes[0].level;
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.name.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.name.html
new file mode 100644
index 0000000..918f2b4
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.name.html
@@ -0,0 +1,25 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">treeNode.</span>name</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>节点名称。</p>
+			<p class="highlight_red">1、如果不使用 name 属性保存节点名称，请修改 setting.data.key.name </p>
+			<p>默认值：无</p>
+		</div>
+	</div>
+	<h3>String 格式说明</h3>
+	<div class="desc">
+	<p>节点显示的名称字符串，标准 String 即可，所有特殊字符都会被自动转义</p>
+	</div>
+	<h3>treeNode 举例</h3>
+	<h4>1. 设置节点的名称为 test1、test2、test3</h4>
+	<pre xmlns=""><code>var nodes = [
+	{ "id":1, "name":"test1"},
+	{ "id":2, "name":"test2"},
+	{ "id":3, "name":"test3"}
+]</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.nocheck.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.nocheck.html
new file mode 100644
index 0000000..afaa62f
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.nocheck.html
@@ -0,0 +1,26 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">treeNode.</span>nocheck</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.excheck</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>1、设置节点是否隐藏 checkbox / radio <span class="highlight_red">[setting.check.enable = true 时有效]</span></p>
+			<p class="highlight_red">2、为了解决部分朋友生成 json 数据出现的兼容问题, 支持 "false","true" 字符串格式的数据</p>
+			<p>默认值：false</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p class="highlight_red">true 表示此节点不显示 checkbox / radio，不影响勾选的关联关系，不影响父节点的半选状态。</p>
+	<p class="highlight_red">false 表示节点具有正常的勾选功能</p>
+	</div>
+	<h3>treeNode 举例</h3>
+	<h4>1. 不显示某个节点的 checkbox / radio </h4>
+	<pre xmlns=""><code>var nodes = [
+	{ "id":1, "name":"test1", "nocheck":true},
+	{ "id":2, "name":"test2"},
+	{ "id":3, "name":"test3"}
+]</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.open.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.open.html
new file mode 100644
index 0000000..1eb9aec
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.open.html
@@ -0,0 +1,30 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">treeNode.</span>open</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>记录 treeNode 节点的 展开 / 折叠 状态。</p>
+			<p class="highlight_red">1、初始化节点数据时，如果设定 treeNode.open = true，则会直接展开此节点</p>
+			<p class="highlight_red">2、叶子节点 treeNode.open = false</p>
+			<p class="highlight_red">3、为了解决部分朋友生成 json 数据出现的兼容问题, 支持 "false","true" 字符串格式的数据</p>
+			<p class="highlight_red">4、非异步加载模式下，无子节点的父节点设置 open=true 后，可显示为展开状态，但异步加载模式下不会生效。（v3.5.15+） </p>
+			<p>默认值：false</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p> true 表示节点为 展开 状态</p>
+	<p> false 表示节点为 折叠 状态</p>
+	</div>
+	<h3>treeNode 举例</h3>
+	<h4>1. 查看当前被选中的节点的 展开 / 折叠 状态</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var sNodes = treeObj.getSelectedNodes();
+if (sNodes.length > 0) {
+	var isOpen = sNodes[0].open;
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.parentTId.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.parentTId.html
new file mode 100644
index 0000000..d228a23
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.parentTId.html
@@ -0,0 +1,27 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">treeNode.</span>parentTId</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>treeNode 节点的父节点唯一标识 tId。</p>
+			<p class="highlight_red">1、v3.x 用 parentTId 替换了原先的 parentNode 属性，同时增加了 getParentNode 方法，以避免原先 parentNode 造成的 clone 死循环</p>
+			<p class="highlight_red">2、初始化节点数据时，由 zTree 增加此属性，请勿提前赋值</p>
+		</div>
+	</div>
+	<h3>String 格式说明</h3>
+	<div class="desc">
+	<p>zTree 内部生成的节点唯一标识，请参考 treeNode.tId 的说明</p>
+	<p class="highlight_red">如果 treeNode 是根节点，则 parentTId = null</p>
+	</div>
+	<h3>treeNode 举例</h3>
+	<h4>1. 查看当前被选中的节点的父节点 tId</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var sNodes = treeObj.getSelectedNodes();
+if (sNodes.length > 0) {
+	var parentTId = sNodes[0].parentTId;
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.tId.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.tId.html
new file mode 100644
index 0000000..c32285c
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.tId.html
@@ -0,0 +1,25 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">treeNode.</span>tId</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>treeNode 节点的唯一标识 tId。</p>
+			<p class="highlight_red">初始化节点数据时，由 zTree 增加此属性，请勿提前赋值</p>
+		</div>
+	</div>
+	<h3>String 格式说明</h3>
+	<div class="desc">
+	<p>生成规则：setting.treeId + "_" + 内部计数</p>
+	</div>
+	<h3>treeNode 举例</h3>
+	<h4>1. 查看当前被选中的节点的 tId</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var sNodes = treeObj.getSelectedNodes();
+if (sNodes.length > 0) {
+	var tId = sNodes[0].tId;
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.target.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.target.html
new file mode 100644
index 0000000..f7c1b6b
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.target.html
@@ -0,0 +1,24 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">treeNode.</span>target</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>设置点击节点后在何处打开 url。<span class="highlight_red">[treeNode.url 存在时有效]</span></p>
+			<p>默认值：无</p>
+		</div>
+	</div>
+	<h3>String 格式说明</h3>
+	<div class="desc">
+	<p>同超链接 target 属性: "_blank", "_self" 或 其他指定窗口名称 </p>
+	<p>省略此属性，则默认为 "_blank"</p>
+	</div>
+	<h3>treeNode 举例</h3>
+	<h4>1. 设置点击某节点时，弹出新页面</h4>
+	<pre xmlns=""><code>var nodes = [
+	{ "id":1, "name":"test1", "url":"http://myTest.com", "target":"_blank"},
+	......
+]</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.url.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.url.html
new file mode 100644
index 0000000..0b2e007
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.url.html
@@ -0,0 +1,25 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">treeNode.</span>url</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>节点链接的目标 URL</p>
+			<p class="highlight_red">1、编辑模式 (setting.edit.enable = true) 下此属性功能失效，如果必须使用类似功能，请利用 onClick 事件回调函数自行控制。</p>
+			<p class="highlight_red">2、如果需要在 onClick 事件回调函数中进行跳转控制，那么请将 URL 地址保存在其他自定义的属性内，请勿使用 url</p>
+			<p>默认值：无</p>
+		</div>
+	</div>
+	<h3>String 格式说明</h3>
+	<div class="desc">
+	<p>同超链接 href 属性</p>
+	</div>
+	<h3>treeNode 举例</h3>
+	<h4>1. 设置某节点点击时，跳转到 g.cn</h4>
+	<pre xmlns=""><code>var nodes = [
+	{ "id":1, "name":"Google CN", "url":"http://g.cn"},
+	......
+]</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.zAsync.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.zAsync.html
new file mode 100644
index 0000000..00e48f3
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/treeNode.zAsync.html
@@ -0,0 +1,28 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">treeNode.</span>zAsync</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>记录 treeNode 节点是否已经进行过异步加载，避免父节点反复异步加载数据。</p>
+			<p class="highlight_red">初始化节点数据时，由 zTree 增加此属性，请勿提前赋值</p>
+			<p class="highlight_red">默认值：false （无子节点的父节点）； true （有子节点的父节点 & 叶子节点）</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p> true 表示父节点展开时不需要自动异步加载</p>
+	<p> false 表示父节点展开时需要自动异步加载</p>
+	<p class="highlight_red"> 此参数不会对 reAsyncChildNodes 方法造成任何影响</p>
+	</div>
+	<h3>treeNode 举例</h3>
+	<h4>1. 查看当前被选中的节点是否节点是否需要自动异步加载</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var sNodes = treeObj.getSelectedNodes();
+if (sNodes.length > 0) {
+	var zAsync = sNodes[0].zAsync;
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.addNodes.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.addNodes.html
new file mode 100644
index 0000000..eac2152
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.addNodes.html
@@ -0,0 +1,42 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(parentNode, newNodes, isSilent)</span><span class="path">zTreeObj.</span>addNodes</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>添加节点。</p>
+			<p class="highlight_red">v3.x 为了避免原先反复初始化造成的数据重复问题，在 初始化 和 添加节点 时内部进行 clone 操作。如果需要获取数据在 zTree 内的对象，请获取此方法的返回值。</p>
+			<p class="highlight_red">请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>parentNode</b><span>JSON</span></h4>
+	<p>指定的父节点，如果增加根节点，请设置 parentNode 为 null 即可。</p>
+	<p class="highlight_red">请务必保证此节点数据对象 是 zTree 内部的数据对象</p>
+	<h4 class="topLine"><b>newNodes</b><span>JSON / Array(JSON)</span></h4>
+	<p>需要增加的节点数据 JSON 对象集合，数据只需要满足 zTree 的节点数据必需的属性即可，详细请参考“treeNode 节点数据详解”</p>
+	<p class="highlight_red">1、v3.x 支持单独添加一个节点，即如果只新增一个节点，不用必须包在数组中</p>
+	<p class="highlight_red">2、使用简单数据模式，请参考 setting.data.simpleData 内的属性说明</p>
+	<h4 class="topLine"><b>isSilent</b><span>Boolean</span></h4>
+	<p>设定增加节点后是否自动展开父节点。</p>
+	<p>isSilent = true 时，不展开父节点，其他值或缺省状态都自动展开。</p>
+	<h4 class="topLine"><b>返回值</b><span>Array(JSON)</span></h4>
+	<p>返回值是 zTree 最终添加的节点数据集合</p>
+	<p class="highlight_red">如果 newNodes 是单个节点数据 JSON，返回值也是将其包在 Array 内</p>
+	<p class="highlight_red">请务必记住：返回值中的数据对象 是 newNodes 被 clone 后的，所以绝对不相等！</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 对于 id = "tree" 的 zTree 增加 1 个根节点</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var newNode = {name:"newNode1"};
+newNode = treeObj.addNodes(null, newNode);
+</code></pre>
+	<h4>2. 对于 id = "tree" 的 zTree 增加 3 个根节点</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var newNodes = [{name:"newNode1"}, {name:"newNode2"}, {name:"newNode3"}];
+newNodes = treeObj.addNodes(null, newNodes);
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.cancelEditName.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.cancelEditName.html
new file mode 100644
index 0000000..9df098f
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.cancelEditName.html
@@ -0,0 +1,30 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(newName)</span><span class="path">zTreeObj.</span>cancelEditName</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>取消节点的编辑名称状态，可以恢复原名称，也可以强行赋给新的名称。</p>
+			<p class="highlight_red">请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>newName</b><span>String</span></h4>
+	<p>重新给定的新名称。</p>
+	<p class="highlight_red">如果省略此参数，则恢复原名称。</p>
+	<h4 class="topLine"><b>返回值</b><span>无</span></h4>
+	<p>目前无任何返回值</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 取消 zTree 的编辑名称状态，恢复该节点原有名称</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+treeObj.cancelEditName();
+</code></pre>
+	<h4>2. 取消 zTree 的编辑名称状态，并且重新设定该节点名称</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+treeObj.cancelEditName("test_new_name");
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.cancelSelectedNode.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.cancelSelectedNode.html
new file mode 100644
index 0000000..26d5706
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.cancelSelectedNode.html
@@ -0,0 +1,35 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeNode)</span><span class="path">zTreeObj.</span>cancelSelectedNode</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>取消节点的选中状态。</p>
+			<p class="highlight_red">v3.x 支持多点同时选中，因此取消选中状态可以全部取消，也可以单独取消某个节点的选中状态。</p>
+			<p class="highlight_red">请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeNode</b><span>JSON</span></h4>
+	<p>需要取消选中状态的节点。</p>
+	<p class="highlight_red">请务必保证此节点数据对象 是 zTree 内部的数据对象</p>
+	<p class="highlight_red">如果省略此参数，则将取消全部被选中节点的选中状态。</p>
+	<h4 class="topLine"><b>返回值</b><span>无</span></h4>
+	<p>目前无任何返回值</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 取消当前所有被选中节点的选中状态</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+treeObj.cancelSelectedNode();
+</code></pre>
+	<h4>2. 取消当前第一个被选中节点的选中状态</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getSelectedNode();
+if (nodes.length>0) { 
+	treeObj.cancelSelectedNode(nodes[0]);
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.checkAllNodes.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.checkAllNodes.html
new file mode 100644
index 0000000..d6eaadf
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.checkAllNodes.html
@@ -0,0 +1,29 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(checked)</span><span class="path">zTreeObj.</span>checkAllNodes</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.excheck</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>勾选 或 取消勾选 全部节点。<span class="highlight_red">[setting.check.enable = true 且 setting.check.chkStyle = "checkbox" 时有效]</span></p>
+			<p class="highlight_red">此方法不会触发 beforeCheck / onCheck 事件回调函数。</p>
+			<p class="highlight_red">请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>checked</b><span>Boolean</span></h4>
+	<p>checked = true  表示勾选全部节点</p>
+	<p>checked = false 表示全部节点取消勾选</p>
+	<p class="highlight_red">不会影响 treeNode.nochecked = true 的节点。</p>
+	<p class="highlight_red">不会影响未加载的节点。</p>
+	<h4 class="topLine"><b>返回值</b><span>无</span></h4>
+	<p>目前无任何返回值</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 勾选全部节点</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+treeObj.checkAllNodes(true);
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.checkNode.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.checkNode.html
new file mode 100644
index 0000000..cb8bb7d
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.checkNode.html
@@ -0,0 +1,44 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeNode, checked, checkTypeFlag, callbackFlag)</span><span class="path">zTreeObj.</span>checkNode</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.excheck</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>勾选 或 取消勾选 单个节点。<span class="highlight_red">[setting.check.enable = true 时有效]</span></p>
+			<p class="highlight_red">v3.x 中 checkNode() 方法可以触发 beforeCheck / onCheck 事件回调函数。便于减少冗余代码</p>
+			<p class="highlight_red">请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeNode</b><span>JSON</span></h4>
+	<p>需要勾选 或 取消勾选 的节点数据</p>
+	<p class="highlight_red">请务必保证此节点数据对象 是 zTree 内部的数据对象</p>
+	<h4 class="topLine"><b>checked</b><span>Boolean</span></h4>
+	<p>checked = true  表示勾选节点</p>
+	<p>checked = false 表示节点取消勾选</p>
+	<p class="highlight_red">省略此参数，则根据对此节点的勾选状态进行 toggle 切换</p>
+	<p class="highlight_red">不影响 treeNode.nochecked = true 的节点。</p>
+	<h4 class="topLine"><b>checkTypeFlag</b><span>Boolean</span></h4>
+	<p>checkTypeFlag = true 表示按照 setting.check.chkboxType 属性进行父子节点的勾选联动操作</p>
+	<p>checkTypeFlag = false 表示只修改此节点勾选状态，无任何勾选联动操作</p>
+	<p class="highlight_red">checkTypeFlag = false 且 treeNode.checked = checked 时，不会触发回调函数，直接返回</p>
+	<p class="highlight_red">不影响父子节点中 treeNode.nochecked = true 的节点。</p>
+	<h4 class="topLine"><b>callbackFlag</b><span>Boolean</span></h4>
+	<p>callbackFlag = true 表示执行此方法时触发 beforeCheck & onCheck 事件回调函数</p>
+	<p>callbackFlag = false 表示执行此方法时不触发事件回调函数</p>
+	<p class="highlight_red">省略此参数，等同于 false</p>
+	<h4 class="topLine"><b>返回值</b><span>无</span></h4>
+	<p>目前无任何返回值</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 勾选当前选中的节点</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getSelectedNodes();
+for (var i=0, l=nodes.length; i < l; i++) {
+	treeObj.checkNode(nodes[i], true, true);
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.copyNode.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.copyNode.html
new file mode 100644
index 0000000..f1b624b
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.copyNode.html
@@ -0,0 +1,44 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(targetNode, treeNode, moveType, isSilent)</span><span class="path">zTreeObj.</span>copyNode</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>复制节点。</p>
+			<p class="highlight_red">v3.x 复制节点时进行 clone 操作。如果需要获取数据在 zTree 内的对象，请获取此方法的返回值。</p>
+			<p class="highlight_red">请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>targetNode</b><span>JSON</span></h4>
+	<p>要复制到的目标节点 JSON 数据</p>
+	<p class="highlight_red">如果复制成为根节点，请设置 targetNode 为 null 即可</p>
+	<p class="highlight_red">请务必保证此节点数据对象 是 zTree 内部的数据对象</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>需要被复制的节点数据</p>
+	<p class="highlight_red">请务必保证此节点数据对象 是 zTree 内部的数据对象</p>
+	<h4 class="topLine"><b>moveType</b><span>String</span></h4>
+	<p>复制到目标节点的相对位置</p>
+	<p class="highlight_red">"inner"：成为子节点，"prev"：成为同级前一个节点，"next"：成为同级后一个节点</p>
+	<h4 class="topLine"><b>isSilent</b><span>Boolean</span></h4>
+	<p>设定复制节点后是否自动展开父节点。</p>
+	<p>isSilent = true 时，不展开父节点，其他值或缺省状态都自动展开。</p>
+	<h4 class="topLine"><b>返回值</b><span>JSON</span></h4>
+	<p>返回值是最终加入到 zTree 内的节点数据</p>
+	<p class="highlight_red">请务必记住：返回值中的数据对象 是 treeNode 被 clone 后的，所以绝对不相等！</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 将根节点中第二个节点 复制成为 第一个节点的子节点</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getNodes();
+treeObj.copyNode(nodes[0], nodes[1], "inner");
+</code></pre>
+	<h4>2. 将根节点中第二个节点 复制成为 第一个节点的前一个节点</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getNodes();
+treeObj.copyNode(nodes[0], nodes[1], "before");
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.destroy.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.destroy.html
new file mode 100644
index 0000000..d9f6da0
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.destroy.html
@@ -0,0 +1,25 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId)</span><span class="path">zTreeObj.</span>destroy</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>从 zTree v3.4 开始提供销毁 zTree 的方法。</p>
+			<p>1、用此方法可以销毁 zTreeObj 代表的 zTree。</p>
+			<p class="highlight_red">2、销毁当前页面全部的 zTree，也可以使用 $.fn.zTree.destroy() 方法。</p>
+			<p class="highlight_red">3、重新使用已经被销毁的树，必须要使用 init 方法进行初始化。</p>
+		</div>
+	</div>
+        <h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>返回值</b><span>无</span></h4>
+	<p>目前无任何返回值</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 销毁 id 为 "treeDemo" 的 zTree</h4>
+	<pre xmlns=""><code>var zTreeObj = $.fn.zTree.getZTreeObj("treeDemo");
+zTreeObj.destroy();
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.editName.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.editName.html
new file mode 100644
index 0000000..2d4eaf7
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.editName.html
@@ -0,0 +1,29 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeNode)</span><span class="path">zTreeObj.</span>editName</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>设置某节点进入编辑名称状态。</p>
+			<p class="highlight_red">1、如果需要用 js 取消编辑名称状态，请使用 cancelEditName(newName) 方法。</p>
+			<p class="highlight_red">2、可利用此方法让当前正编辑的节点 input 输入框获取焦点。</p>
+			<p class="highlight_red">3、请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeNode</b><span>JSON</span></h4>
+	<p>指定进入编辑名称状态的节点 JSON 数据</p>
+	<p class="highlight_red">请务必保证此节点数据对象 是 zTree 内部的数据对象</p>
+	<h4 class="topLine"><b>返回值</b><span>无</span></h4>
+	<p>目前无任何返回值</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 设置根节点第一个节点进入编辑名称状态</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getNodes();
+treeObj.editName(nodes[0]);
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.expandAll.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.expandAll.html
new file mode 100644
index 0000000..aaa3e46
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.expandAll.html
@@ -0,0 +1,30 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(expandFlag)</span><span class="path">zTreeObj.</span>expandAll</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>展开 / 折叠 全部节点</p>
+			<p class="highlight_red">此方法不会触发  beforeExpand / onExpand  和 beforeCollapse / onCollapse 事件回调函数。</p>
+			<p class="highlight_red">请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>expandFlag</b><span>Boolean</span></h4>
+	<p>expandFlag = true 表示 展开 全部节点</p>
+	<p>expandFlag =  false 表示 折叠 全部节点</p>
+	<h4 class="topLine"><b>返回值</b><span>Boolean</span></h4>
+	<p>返回值表示最终实际操作情况</p>
+	<p>true 表示 展开 全部节点</p>
+	<p>false 表示 折叠 全部节点</p>
+	<p>null 表示 不存在任何父节点</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 展开全部节点</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+treeObj.expandAll(true);
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.expandNode.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.expandNode.html
new file mode 100644
index 0000000..5d96d3f
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.expandNode.html
@@ -0,0 +1,50 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeNode, expandFlag, sonSign, focus, callbackFlag)</span><span class="path">zTreeObj.</span>expandNode</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>展开 / 折叠 指定的节点</p>
+			<p class="highlight_red">v3.x 中执行此方法可以触发 beforeExpand / onExpand  或 beforeCollapse / onCollapse 事件回调函数。便于减少冗余代码</p>
+			<p class="highlight_red">请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeNode</b><span>JSON</span></h4>
+	<p>需要 展开 / 折叠 的节点数据</p>
+	<p class="highlight_red">请务必保证此节点数据对象 是 zTree 内部的数据对象</p>
+	<h4 class="topLine"><b>expandFlag</b><span>Boolean</span></h4>
+	<p>expandFlag = true 表示 展开 节点</p>
+	<p>expandFlag = false 表示 折叠 节点</p>
+	<p class="highlight_red">省略此参数，则根据对此节点的展开状态进行 toggle 切换</p>
+	<h4 class="topLine"><b>sonSign</b><span>Boolean</span></h4>
+	<p>sonSign = true 表示 全部子孙节点 进行与 expandFlag 相同的操作</p>
+	<p>sonSign = false 表示 只影响此节点，对于其 子孙节点无任何影响</p>
+	<p class="highlight_red">sonSign = false 且 treeNode.open = expandFlag 时，不会触发回调函数，直接返回</p>
+	<p class="highlight_red">省略此参数，等同于 false</p>
+	<h4 class="topLine"><b>focus</b><span>Boolean</span></h4>
+	<p>focus = true 表示 展开 / 折叠 操作后，通过设置焦点保证此焦点进入可视区域内</p>
+	<p>focus =  false 表示 展开 / 折叠 操作后，不设置任何焦点</p>
+	<p class="highlight_red">省略此参数，等同于 true</p>
+	<h4 class="topLine"><b>callbackFlag</b><span>Boolean</span></h4>
+	<p>callbackFlag = true 表示执行此方法时触发 beforeExpand / onExpand  或 beforeCollapse / onCollapse 事件回调函数</p>
+	<p>callbackFlag = false 表示执行此方法时不触发事件回调函数</p>
+	<p class="highlight_red">省略此参数，等同于 false</p>
+	<h4 class="topLine"><b>返回值</b><span>Boolean</span></h4>
+	<p>返回值表示最终实际操作情况</p>
+	<p>true 表示 展开 节点</p>
+	<p>false 表示 折叠 节点</p>
+	<p>null 表示 不是父节点</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 展开当前选择的第一个节点（包括其全部子节点）</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getSelectedNodes();
+if (nodes.length>0) {
+	treeObj.expandNode(nodes[0], true, true, true);
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.getChangeCheckedNodes.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.getChangeCheckedNodes.html
new file mode 100644
index 0000000..ba86534
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.getChangeCheckedNodes.html
@@ -0,0 +1,24 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function()</span><span class="path">zTreeObj.</span>getChangeCheckedNodes</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.excheck</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>获取输入框勾选状态被改变的节点集合（与原始数据 checkedOld 对比）。<span class="highlight_red">[setting.check.enable = true 时有效]</span></p>
+			<p class="highlight_red">请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>返回值</b><span>Array(JSON)</span></h4>
+	<p>返回全部勾选状态被改变的节点集合 Array</p>
+	<p class="highlight_red">如果需要获取每次操作后全部被改变勾选状态的节点数据，请在每次勾选操作后，遍历所有被改变勾选状态的节点数据，让其 checkedOld = checked 就可以了。</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 获取当前勾选状态被改变的节点集合</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getChangeCheckedNodes();
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.getCheckedNodes.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.getCheckedNodes.html
new file mode 100644
index 0000000..85f4ba0
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.getCheckedNodes.html
@@ -0,0 +1,28 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(checked)</span><span class="path">zTreeObj.</span>getCheckedNodes</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.excheck</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>获取输入框被勾选 或 未勾选的节点集合。<span class="highlight_red">[setting.check.enable = true 时有效]</span></p>
+			<p class="highlight_red">请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>checked</b><span>Boolean</span></h4>
+	<p>checked = true  表示获取 被勾选 的节点集合</p>
+	<p>checked = false 表示获取 未勾选 的节点集合</p>
+	<p class="highlight_red">省略此参数，等同于 true。</p>
+	<p class="highlight_red">对于 treeNode.nochecked = true 的节点不进行获取。</p>
+	<h4 class="topLine"><b>返回值</b><span>Array(JSON)</span></h4>
+	<p>返回全部符合要求的节点集合 Array</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 获取当前被勾选的节点集合</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getCheckedNodes(true);
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.getNodeByParam.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.getNodeByParam.html
new file mode 100644
index 0000000..89e72c7
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.getNodeByParam.html
@@ -0,0 +1,32 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(key, value, parentNode)</span><span class="path">zTreeObj.</span>getNodeByParam</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>根据节点数据的属性搜索，获取条件完全匹配的节点数据 JSON 对象</p>
+			<p class="highlight_red">请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>key</b><span>String</span></h4>
+	<p>需要精确匹配的属性名称</p>
+	<h4 class="topLine"><b>value</b><span>?</span></h4>
+	<p>需要精确匹配的属性值，可以是任何类型，只要保证与 key 指定的属性值保持一致即可</p>
+	<h4 class="topLine"><b>parentNode</b><span>JSON</span></h4>
+	<p>搜索范围，指定在某个父节点下的子节点中进行搜索</p>
+	<p class="highlight_red">忽略此参数，表示在全部节点中搜索</p>
+	<h4 class="topLine"><b>返回值</b><span>JSON</span></h4>
+	<p>匹配精确搜索的节点数据</p>
+	<p class="highlight_red">1、如无结果，返回 null</p>
+	<p class="highlight_red">2、如有多个节点满足查询条件，只返回第一个匹配到的节点</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 查找 id = 1 的节点数据</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var node = treeObj.getNodeByParam("id", 1, null);
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.getNodeByTId.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.getNodeByTId.html
new file mode 100644
index 0000000..76fcc48
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.getNodeByTId.html
@@ -0,0 +1,27 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(tId)</span><span class="path">zTreeObj.</span>getNodeByTId</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>根据 zTree 的唯一标识 tId 快速获取节点 JSON 数据对象</p>
+			<p class="highlight_red">通过内部的 cache 获取，不需要遍历节点。</p>
+			<p class="highlight_red">请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>tId</b><span>String</span></h4>
+	<p>节点在 zTree 内的唯一标识 tId</p>
+	<h4 class="topLine"><b>返回值</b><span>JSON</span></h4>
+	<p>tId 对应的节点 JSON 数据对象</p>
+	<p class="highlight_red">如无结果，返回 null</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 获取 tId = "tree_10" 的节点数据</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var node = treeObj.getNodeByTId("tree_10");
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.getNodeIndex.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.getNodeIndex.html
new file mode 100644
index 0000000..b2c757d
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.getNodeIndex.html
@@ -0,0 +1,30 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeNode)</span><span class="path">zTreeObj.</span>getNodeIndex</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>获取某节点在同级节点中的序号（从0开始）</p>
+			<p class="highlight_red">请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeNode</b><span>JSON</span></h4>
+	<p>需要查询顺序的节点 JSON 数据对象</p>
+	<p class="highlight_red">请务必保证此节点数据对象 是 zTree 内部的数据对象</p>
+	<h4 class="topLine"><b>返回值</b><span>Number</span></h4>
+	<p class="highlight_red">返回值从 0 开始计数</p>
+	<p class="highlight_red">如果不存在该节点数据，返回 -1</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 获取当前选中的第一个节点在同级节点中的序号</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getSelectedNodes();
+if (nodes.length>0) {
+	var index = treeObj.getNodeIndex(nodes[0]);
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.getNodes.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.getNodes.html
new file mode 100644
index 0000000..b368535
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.getNodes.html
@@ -0,0 +1,26 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function()</span><span class="path">zTreeObj.</span>getNodes</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>获取 zTree 的全部节点数据</p>
+			<p class="highlight_red">请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>返回值</b><span>Array(JSON)</span></h4>
+	<p>全部节点数据</p>
+	<p class="highlight_red">1、Array 仅仅是根节点的集合（默认情况子节点都处于 children 属性下）； </p>
+	<p class="highlight_red">2、如需遍历全部节点需要利用递归，或利用 transformToArray 方法 将数据变成简单的 Array 集合</p>
+	<p class="highlight_red">3、对于异步加载模式下，尚未加载的子节点是无法通过此方法获取的。</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 获取全部节点数据</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getNodes();
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.getNodesByFilter.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.getNodesByFilter.html
new file mode 100644
index 0000000..6917425
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.getNodesByFilter.html
@@ -0,0 +1,43 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(filter, isSingle, parentNode, invokeParam)</span><span class="path">zTreeObj.</span>getNodesByFilter</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>根据自定义规则搜索节点数据 JSON 对象集合 或 单个节点数据</p>
+			<p class="highlight_red">可自定义复杂的搜索规则</p>
+			<p class="highlight_red">请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>filter</b><span>Function</span></h4>
+	<p>自定义过滤器函数 function filter(node) {...}</p>
+	<p>filter 参数：node (节点数据 JSON)</p>
+	<p>filter 返回值：boolean (true 表示符合搜索条件；false 表示不符合搜索条件)</p>
+	<h4 class="topLine"><b>isSingle</b><span>Boolean</span></h4>
+	<p>isSingle = true 表示只查找单个节点</p>
+	<p>isSingle = false 表示查找节点集合</p>
+	<p class="highlight_red">忽略此参数，表示查找节点集合</p>
+	<h4 class="topLine"><b>parentNode</b><span>JSON</span></h4>
+	<p>可以指定在某个父节点下的子节点中搜索</p>
+	<p class="highlight_red">忽略此参数，表示在全部节点中搜索</p>
+	<h4 class="topLine"><b>invokeParam</b><span>任意类型</span></h4>
+	<p>用户自定义的数据对象，用于 filter 中进行计算</p>
+	<h4 class="topLine"><b>返回值</b><span>Array(JSON) / JSON</span></h4>
+	<p>isSingle = true 返回 第一个找到的节点数据 JSON，无结果时返回 null</p>
+	<p>isSingle = false 返回 节点数据集合 Array(JSON)，无结果时返回 [ ]</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 查找 level = 2 & name 中包含 "test" 的节点数据</h4>
+	<pre xmlns=""><code>function filter(node) {
+    return (node.level == 2 && node.name.indexOf("test")>-1);
+}
+......
+var treeObj = $.fn.zTree.getZTreeObj("tree");
+var node = treeObj.getNodesByFilter(filter, true); // 仅查找一个节点
+var nodes = treeObj.getNodesByFilter(filter); // 查找节点集合
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.getNodesByParam.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.getNodesByParam.html
new file mode 100644
index 0000000..cf45939
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.getNodesByParam.html
@@ -0,0 +1,31 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(key, value, parentNode)</span><span class="path">zTreeObj.</span>getNodesByParam</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>根据节点数据的属性搜索，获取条件完全匹配的节点数据 JSON 对象集合</p>
+			<p class="highlight_red">请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>key</b><span>String</span></h4>
+	<p>需要精确匹配的属性名称</p>
+	<h4 class="topLine"><b>value</b><span>?</span></h4>
+	<p>需要精确匹配的属性值，可以是任何类型，只要保证与 key 指定的属性值保持一致即可</p>
+	<h4 class="topLine"><b>parentNode</b><span>JSON</span></h4>
+	<p>可以指定在某个父节点下的子节点中搜索</p>
+	<p class="highlight_red">忽略此参数，表示在全部节点中搜索</p>
+	<h4 class="topLine"><b>返回值</b><span>Array(JSON)</span></h4>
+	<p>匹配精确搜索的节点数据集合</p>
+	<p class="highlight_red">如无结果，返回 [ ]</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 查找 name = "test" 的节点数据</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getNodesByParam("name", "test", null);
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.getNodesByParamFuzzy.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.getNodesByParamFuzzy.html
new file mode 100644
index 0000000..04d183f
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.getNodesByParamFuzzy.html
@@ -0,0 +1,32 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(key, value, parentNode)</span><span class="path">zTreeObj.</span>getNodesByParamFuzzy</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>根据节点数据的属性搜索，获取条件模糊匹配的节点数据 JSON 对象集合</p>
+			<p class="highlight_red">请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>key</b><span>String</span></h4>
+	<p>需要模糊匹配的属性名称</p>
+	<h4 class="topLine"><b>value</b><span>String</span></h4>
+	<p>需要模糊匹配的属性值</p>
+	<p class="highlight_red">模糊匹配只能针对 String 类型的数据</p>
+	<h4 class="topLine"><b>parentNode</b><span>JSON</span></h4>
+	<p>可以指定在某个父节点下的子节点中搜索</p>
+	<p class="highlight_red">忽略此参数，表示在全部节点中搜索</p>
+	<h4 class="topLine"><b>返回值</b><span>Array(JSON)</span></h4>
+	<p>匹配模糊搜索的节点数据集合</p>
+	<p class="highlight_red">如无结果，返回 [ ]</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 查找 name 包含 "test" 的节点数据</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getNodesByParamFuzzy("name", "test", null);
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.getSelectedNodes.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.getSelectedNodes.html
new file mode 100644
index 0000000..ab36f8e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.getSelectedNodes.html
@@ -0,0 +1,23 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function()</span><span class="path">zTreeObj.</span>getSelectedNodes</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>获取 zTree 当前被选中的节点数据集合</p>
+			<p class="highlight_red">请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>返回值</b><span>Array(JSON)</span></h4>
+	<p>当前被选中的节点数据集合</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 获取当前被选中的节点数据集合</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getSelectedNodes();
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.hideNode.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.hideNode.html
new file mode 100644
index 0000000..a1996b8
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.hideNode.html
@@ -0,0 +1,29 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeNode)</span><span class="path">zTreeObj.</span>hideNode</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exhide</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>隐藏某个节点。</p>
+			<p class="highlight_red">1、此功能不支持 exedit 扩展，因此不要在编辑状态时使用隐藏节点的方法。</p>
+			<p class="highlight_red">2、隐藏/显示节点，会影响节点的 isFirstNode 和 isLastNode 属性。</p>
+			<p class="highlight_red">3、请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeNode</b><span>JSON</span></h4>
+	<p>指定被隐藏的节点 JSON 数据</p>
+	<p class="highlight_red">请务必保证此节点数据对象 是 zTree 内部的数据对象</p>
+	<h4 class="topLine"><b>返回值</b><span>无</span></h4>
+	<p>目前无任何返回值</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 隐藏根节点第一个节点</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getNodes();
+treeObj.hideNode(nodes[0]);
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.hideNodes.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.hideNodes.html
new file mode 100644
index 0000000..cf752b5
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.hideNodes.html
@@ -0,0 +1,29 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeNodes)</span><span class="path">zTreeObj.</span>hideNodes</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exhide</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>隐藏一批节点。</p>
+			<p class="highlight_red">1、此功能不支持 exedit 扩展，因此不要在编辑状态时使用隐藏节点的方法。</p>
+			<p class="highlight_red">2、隐藏/显示节点，会影响节点的 isFirstNode 和 isLastNode 属性。</p>
+			<p class="highlight_red">3、请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeNodes</b><span>Array(JSON)</span></h4>
+	<p>指定被隐藏的节点 JSON 数据集合</p>
+	<p class="highlight_red">请务必保证这些节点数据对象 是 zTree 内部的数据对象</p>
+	<h4 class="topLine"><b>返回值</b><span>无</span></h4>
+	<p>目前无任何返回值</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 隐藏根节点第一个节点的子节点</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getNodes();
+treeObj.hideNodes(nodes[0].children);
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.moveNode.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.moveNode.html
new file mode 100644
index 0000000..27f225a
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.moveNode.html
@@ -0,0 +1,46 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(targetNode, treeNode, moveType, isSilent)</span><span class="path">zTreeObj.</span>moveNode</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>移动节点。</p>
+			<p class="highlight_red">请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>targetNode</b><span>JSON</span></h4>
+	<p>要移动到的目标节点 JSON 数据</p>
+	<p class="highlight_red">如果移动成为根节点，请设置 targetNode 为 null 即可</p>
+	<p class="highlight_red">请务必保证此节点数据对象 是 zTree 内部的数据对象</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>需要被移动的节点数据</p>
+	<p class="highlight_red">请务必保证此节点数据对象 是 zTree 内部的数据对象</p>
+	<h4 class="topLine"><b>moveType</b><span>String</span></h4>
+	<p>指定移动到目标节点的相对位置</p>
+	<p class="highlight_red">"inner"：成为子节点，"prev"：成为同级前一个节点，"next"：成为同级后一个节点</p>
+	<h4 class="topLine"><b>isSilent</b><span>Boolean</span></h4>
+	<p>设定移动节点后是否自动展开父节点。</p>
+	<p>isSilent = true 时，不展开父节点，其他值或缺省状态都自动展开。</p>
+	<h4 class="topLine"><b>返回值</b><span>JSON</span></h4>
+	<p>返回值是最终被移动的节点数据，正常情况下与 treeNode 参数完全相同</p>
+	<p class="highlight_red">如果 返回值 为 null，说明 移动失败，主要原因有：<br/>
+		&nbsp;1、targetNode 是 treeNode 父节点，且 moveType = "inner"<br/>
+		&nbsp;2、targetNode 是 treeNode 子孙节点
+	</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 将根节点中第二个节点 移动成为 第一个节点的子节点</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getNodes();
+treeObj.moveNode(nodes[0], nodes[1], "inner");
+</code></pre>
+	<h4>2. 将根节点中第二个节点 移动成为 第一个节点的前一个节点</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getNodes();
+treeObj.moveNode(nodes[0], nodes[1], "before");
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.reAsyncChildNodes.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.reAsyncChildNodes.html
new file mode 100644
index 0000000..4a354e2
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.reAsyncChildNodes.html
@@ -0,0 +1,42 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(parentNode, reloadType, isSilent)</span><span class="path">zTreeObj.</span>reAsyncChildNodes</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>强行异步加载父节点的子节点。<span class="highlight_red">[setting.async.enable = true 时有效]</span></p>
+			<p class="highlight_red">已经加载过的父节点可反复使用此方法重新加载。</p>
+			<p class="highlight_red">请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>parentNode</b><span>JSON</span></h4>
+	<p>指定需要异步加载的父节点 JSON 数据</p>
+	<p class="highlight_red">1、parentNode = null 时，相当于从根节点 Root 进行异步加载</p>
+	<p class="highlight_red">2、parentNode.isParent = false 时，不进行异步加载</p>
+	<p class="highlight_red">3、请务必保证此节点数据对象 是 zTree 内部的数据对象</p>
+	<h4 class="topLine"><b>reloadType</b><span>String</span></h4>
+	<p>reloadType = "refresh" 表示清空后重新加载。</p>
+	<p>reloadType != "refresh" 时，表示追加子节点处理。</p>
+	<h4 class="topLine"><b>isSilent</b><span>Boolean</span></h4>
+	<p>设定异步加载后是否自动展开父节点。</p>
+	<p>isSilent = true 时，不展开父节点，其他值或缺省状态都自动展开。</p>
+	<h4 class="topLine"><b>返回值</b><span>无</span></h4>
+	<p>目前无任何返回值</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 重新异步加载 zTree </h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+treeObj.reAsyncChildNodes(null, "refresh");
+</code></pre>
+	<h4>2. 重新异步加载当前选中的第一个节点</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getSelectedNodes();
+if (nodes.length>0) {
+	treeObj.reAsyncChildNodes(nodes[0], "refresh");
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.refresh.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.refresh.html
new file mode 100644
index 0000000..09a74ca
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.refresh.html
@@ -0,0 +1,24 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function()</span><span class="path">zTreeObj.</span>refresh</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>刷新 zTree 。</p>
+			<p class="highlight_red">没有特殊必要，尽量不要使用此方法。单个节点更新请使用 updateNode 方法，异步加载模式下请使用 reAsyncChildNodes 方法。</p>
+			<p class="highlight_red">请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>返回值</b><span>无</span></h4>
+	<p>目前无任何返回值</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 刷新 zTree </h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+treeObj.refresh();
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.removeChildNodes.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.removeChildNodes.html
new file mode 100644
index 0000000..588639f
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.removeChildNodes.html
@@ -0,0 +1,32 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(parentNode)</span><span class="path">zTreeObj.</span>removeChildNodes</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>清空某父节点的子节点。</p>
+			<p class="highlight_red">1、清空子节点后，父节点会自动变为叶子节点，如需要父节点保持父节点状态，请设置 setting.data.keep.parent 属性。</p>
+			<p class="highlight_red">2、请勿用此方法清空根节点，如果需要清空根节点，直接初始化 zTree，并且设置初始节点为 null 即可。</p>
+			<p class="highlight_red">3、此方法不会触发任何事件回调函数。</p>
+			<p class="highlight_red">请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>parentNode</b><span>JSON</span></h4>
+	<p>需要清空子节点的父节点数据</p>
+	<p class="highlight_red">请务必保证此节点数据对象 是 zTree 内部的数据对象</p>
+	<h4 class="topLine"><b>返回值</b><span>Array(JSON)</span></h4>
+	<p>将该父节点的子节点数据返回，如果不存在则返回 null</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 清空选中的第一个节点的子节点</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getSelectedNodes();
+if (nodes && nodes.length>0) {
+	treeObj.removeChildNodes(nodes[0]);
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.removeNode.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.removeNode.html
new file mode 100644
index 0000000..442f5c7
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.removeNode.html
@@ -0,0 +1,34 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeNode, callbackFlag)</span><span class="path">zTreeObj.</span>removeNode</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>删除节点。</p>
+			<p class="highlight_red">v3.x 中删除节点可以触发 beforeRemove / onRemove 事件回调函数。便于减少冗余代码</p>
+			<p class="highlight_red">请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeNode</b><span>JSON</span></h4>
+	<p>需要被删除的节点数据</p>
+	<p class="highlight_red">请务必保证此节点数据对象 是 zTree 内部的数据对象</p>
+	<h4 class="topLine"><b>callbackFlag</b><span>Boolean</span></h4>
+	<p>callbackFlag = true 表示执行此方法时触发 beforeRemove & onRemove 事件回调函数</p>
+	<p>callbackFlag = false 表示执行此方法时不触发事件回调函数</p>
+	<p class="highlight_red">省略此参数，等同于 false</p>
+	<h4 class="topLine"><b>返回值</b><span>无</span></h4>
+	<p>目前无任何返回值</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 删除所有选中的节点</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getSelectedNodes();
+for (var i=0, l=nodes.length; i < l; i++) {
+	treeObj.removeNode(nodes[i]);
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.selectNode.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.selectNode.html
new file mode 100644
index 0000000..6e80d81
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.selectNode.html
@@ -0,0 +1,34 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeNode, addFlag)</span><span class="path">zTreeObj.</span>selectNode</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>选中指定节点</p>
+			<p class="highlight_red">v3.x 支持同时选中多个节点。</p>
+			<p class="highlight_red">请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeNode</b><span>JSON</span></h4>
+	<p>需要被选中的节点数据</p>
+	<p class="highlight_red">请务必保证此节点数据对象 是 zTree 内部的数据对象</p>
+	<h4 class="topLine"><b>addFlag</b><span>Boolean</span></h4>
+	<p>addFlag = true 表示追加选中，会出现多点同时被选中的情况</p>
+	<p>addFlag = false 表示单独选中，原先被选中的节点会被取消选中状态</p>
+	<p class="highlight_red">setting.view.selectedMulti = false 时，此参数无效，始终进行单独选中</p>
+	<h4 class="topLine"><b>返回值</b><span>无</span></h4>
+	<p>目前无任何返回值</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 单独选中根节点中第一个节点</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getNodes();
+if (nodes.length>0) {
+	treeObj.selectNode(nodes[0]);
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.setChkDisabled.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.setChkDisabled.html
new file mode 100644
index 0000000..b042ab4
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.setChkDisabled.html
@@ -0,0 +1,44 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(node, disabled, inheritParent, inheritChildren)</span><span class="path">zTreeObj.</span>setChkDisabled</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.excheck</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>禁用 或 解禁 某个节点的 checkbox / radio <span class="highlight_red">[setting.check.enable = true 时有效]</span></p>
+			<p class="highlight_red">1、节点的 checkbox / radio 被禁用后，无法勾选或取消勾选，但能够影响父节点的半选状态</p>
+			<p class="highlight_red">2、请不要直接修改已加载节点的 treeNode.chkDisabled 属性。</p>
+			<p class="highlight_red">3、请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeNode</b><span>JSON</span></h4>
+	<p>需要禁用 或 解禁 checkbox / radio 的节点数据</p>
+	<p class="highlight_red">请务必保证此节点数据对象 是 zTree 内部的数据对象</p>
+	<h4 class="topLine"><b>disabled</b><span>Boolean</span></h4>
+	<p>disabled = true  表示禁用 checkbox / radio</p>
+	<p>disabled = false 表示解禁 checkbox / radio</p>
+	<p class="highlight_red">省略此参数，等同于 disabled = false </p>
+	<p class="highlight_red">不影响 treeNode.nochecked = true 的节点。</p>
+	<h4 class="topLine"><b>inheritParent</b><span>Boolean</span></h4>
+	<p>inheritParent = true 表示全部父节点进行同样的操作</p>
+	<p>inheritParent = false 表示不影响父节点</p>
+	<p class="highlight_red">省略此参数，等同于 inheritParent = false </p>
+	<h4 class="topLine"><b>inheritChildren</b><span>Boolean</span></h4>
+	<p>inheritChildren = true 表示全部子节点进行同样的操作</p>
+	<p>inheritChildren = false 表示不影响子节点</p>
+	<p class="highlight_red">省略此参数，等同于 inheritChildren = false </p>
+	<h4 class="topLine"><b>返回值</b><span>无</span></h4>
+	<p>目前无任何返回值</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 禁用当前选中的节点的 checkbox / radio</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getSelectedNodes();
+for (var i=0, l=nodes.length; i < l; i++) {
+	treeObj.setChkDisabled(nodes[i], true);
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.setEditable.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.setEditable.html
new file mode 100644
index 0000000..c90c8de
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.setEditable.html
@@ -0,0 +1,27 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(editable)</span><span class="path">zTreeObj.</span>setEditable</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>设置 zTree 进入 / 取消 编辑状态。</p>
+			<p class="highlight_red">对于编辑状态的各种功能需要提前设置对应 setting 中的不同属性</p>
+			<p class="highlight_red">请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>editable</b><span>Boolean</span></h4>
+	<p>true 表示进入 编辑状态</p>
+	<p>false 表示取消 编辑状态</p>
+	<h4 class="topLine"><b>返回值</b><span>无</span></h4>
+	<p>目前无任何返回值</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 设置 zTree 进入编辑状态</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+treeObj.setEditable(true);
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.setting.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.setting.html
new file mode 100644
index 0000000..61abd53
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.setting.html
@@ -0,0 +1,13 @@
+<div class="apiDetail">
+<div>
+	<h2><span>JSON</span><span class="path">zTreeObj.</span>setting</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>zTree 对象使用的 setting 配置数据，详细请参考 “setting 配置详解”中的各个属性详细说明</p>
+			<p class="highlight_red">v3.x 取消了原先操作 setting 的方法，让用户可以较自由的修改参数，但请注意，对于 zTree 初始化有影响的参数后期修改是不会起作用的，请对各个属性有较深入的了解以后再考虑进行修改。</p>
+		</div>
+	</div>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.showNode.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.showNode.html
new file mode 100644
index 0000000..ed22d51
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.showNode.html
@@ -0,0 +1,31 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeNode)</span><span class="path">zTreeObj.</span>showNode</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exhide</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>显示某个被隐藏的节点。</p>
+			<p class="highlight_red">1、此功能不支持 exedit 扩展，因此不要在编辑状态时使用隐藏节点的方法。</p>
+			<p class="highlight_red">2、隐藏/显示节点，会影响节点的 isFirstNode 和 isLastNode 属性。</p>
+			<p class="highlight_red">3、请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeNode</b><span>JSON</span></h4>
+	<p>指定被显示的节点 JSON 数据</p>
+	<p class="highlight_red">请务必保证此节点数据对象 是 zTree 内部的数据对象</p>
+	<h4 class="topLine"><b>返回值</b><span>无</span></h4>
+	<p>目前无任何返回值</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 显示某个隐藏的节点</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var node = treeObj.getNodeByParam("isHidden", true);
+if (node) {
+  treeObj.showNode(node);
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.showNodes.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.showNodes.html
new file mode 100644
index 0000000..b090657
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.showNodes.html
@@ -0,0 +1,29 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeNodes)</span><span class="path">zTreeObj.</span>showNodes</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exhide</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>显示一批已经被隐藏的节点。</p>
+			<p class="highlight_red">1、此功能不支持 exedit 扩展，因此不要在编辑状态时使用隐藏节点的方法。</p>
+			<p class="highlight_red">2、隐藏/显示节点，会影响节点的 isFirstNode 和 isLastNode 属性。</p>
+			<p class="highlight_red">3、请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeNodes</b><span>Array(JSON)</span></h4>
+	<p>指定被显示的节点 JSON 数据集合</p>
+	<p class="highlight_red">请务必保证这些节点数据对象 是 zTree 内部的数据对象</p>
+	<h4 class="topLine"><b>返回值</b><span>无</span></h4>
+	<p>目前无任何返回值</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 显示全部隐藏的节点</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getNodesByParam("isHidden", true);
+treeObj.showNodes(nodes);
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.transformToArray.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.transformToArray.html
new file mode 100644
index 0000000..a46dc61
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.transformToArray.html
@@ -0,0 +1,25 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeNodes)</span><span class="path">zTreeObj.</span>transformToArray</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>将 zTree 使用的标准 JSON 嵌套格式的数据转换为简单 Array 格式。(免去用户自行编写递归遍历全部节点的麻烦)</p>
+			<p class="highlight_red">请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeNodes</b><span>Array(JSON) / JSON</span></h4>
+	<p>需要被转换的 zTree 节点数据对象集合 或 某个单独节点的数据对象</p>
+	<h4 class="topLine"><b>返回值</b><span>Array(JSON)</span></h4>
+	<p>转换后的简单 Array 数据格式</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 将 zTree 节点数据转换为简单 Array 格式</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.transformToArray(treeObj.getNodes());
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.transformTozTreeNodes.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.transformTozTreeNodes.html
new file mode 100644
index 0000000..8a52770
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.transformTozTreeNodes.html
@@ -0,0 +1,43 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(simpleNodes)</span><span class="path">zTreeObj.</span>transformTozTreeNodes</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>将简单 Array 格式数据转换为 zTree 使用的标准 JSON 嵌套数据格式。</p>
+			<p class="highlight_red">使用此方法，请务必设置节点唯一标识属性名称 setting.data.simpleData.idKey 和 父节点唯一标识属性名称 setting.data.simpleData.pIdKey，并且让数据满足父子关系。</p>
+			<p class="highlight_red">请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>simpleNodes</b><span>Array(JSON) / JSON</span></h4>
+	<p>需要被转换的简单 Array 格式数据 或 某个单独的数据对象</p>
+	<h4 class="topLine"><b>返回值</b><span>Array(JSON)</span></h4>
+	<p>zTree 使用的标准数据，子节点都存在于父节点数据的 children 属性中</p>
+	<p class="highlight_red">如果 simpleNodes 是一个 JSON 对象，则被简单封装成长度为 1 的数组。</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 将简单 Array 格式转换为zTree使用的标准格式</h4>
+	<pre xmlns=""><code>var setting = {
+	data: {
+		simpleData: {
+			enable: true,
+			idKey: "id",
+			pIdKey: "pId",
+			rootPId: 0,
+		}
+	}
+};
+var simpleNodes = [
+    {"id":1, "pId":0, "name":"test1"},
+    {"id":11, "pId":1, "name":"test11"},
+    {"id":12, "pId":1, "name":"test12"},
+    {"id":111, "pId":11, "name":"test111"}
+];
+var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.transformTozTreeNodes(simpleNodes);
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.updateNode.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.updateNode.html
new file mode 100644
index 0000000..847fa6e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/cn/zTreeObj.updateNode.html
@@ -0,0 +1,37 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeNode, checkTypeFlag)</span><span class="path">zTreeObj.</span>updateNode</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>更新某节点数据，主要用于该节点显示属性的更新。</p>
+			<p class="highlight_red">1、可针对 name、target、 url、icon、 iconSkin、checked、nocheck 等这几个用于显示效果的参数进行更新，其他用于 zTreeNodes 的参数请不要随意更新，对于展开节点，还请调用 expandNode方法，因此请勿随意修改 open 属性。</p>
+			<p class="highlight_red">2、用此方法修改 checked 勾选状态不会触发 beforeCheck / onCheck 事件回调函数。</p>
+			<p class="highlight_red">请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeNode</b><span>JSON</span></h4>
+	<p>指定需要更新的节点 JSON 数据</p>
+	<p class="highlight_red">请务必保证此节点数据对象 是 zTree 内部的数据对象</p>
+	<h4 class="topLine"><b>checkTypeFlag</b><span>Boolean</span></h4>
+	<p>checkTypeFlag = true 表示按照 setting.check.chkboxType 属性进行父子节点的勾选联动操作</p>
+	<p>checkTypeFlag = false 表示只修改此节点勾选状态，无任何勾选联动操作</p>
+	<p class="highlight_red">当 setting.check.enable = true 且 setting.check.chkStyle = "checkbox" 时才有效</p>
+	<p class="highlight_red">不影响父子节点中 treeNode.nochecked = true 的节点。</p>
+	<h4 class="topLine"><b>返回值</b><span>无</span></h4>
+	<p>目前无任何返回值</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 更新根节点中第一个节点的名称</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getNodes();
+if (nodes.length>0) {
+	nodes[0].name = "test";
+	treeObj.updateNode(nodes[0]);
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/fn.zTree._z.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/fn.zTree._z.html
new file mode 100644
index 0000000..61da261
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/fn.zTree._z.html
@@ -0,0 +1,13 @@
+<div class="apiDetail">
+<div>
+	<h2><span>JSON</span><span class="path">$.fn.zTree.</span>_z</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>All of the methods in zTree v3.x are available through the '$. fn.zTree._z' calls, open it for you to develop your own zTree plug-ins.</p>
+			<p class="highlight_red">If you have no special requirements, please don't use this object, and don't modify the methods in this object.</p>
+		</div>
+	</div>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/fn.zTree.destroy.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/fn.zTree.destroy.html
new file mode 100644
index 0000000..3a31699
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/fn.zTree.destroy.html
@@ -0,0 +1,28 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId)</span><span class="path">$.fn.zTree.</span>destroy</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>From zTree v3.4, zTree support the method for destruction.</p>
+			<p>1. This method can destroy the zTree with specify treeId, and can destroy all of the zTrees.</p>
+			<p class="highlight_red">2. If you want to destory some one zTree, you can use the 'zTreeObj.destroy()' method.</p>
+			<p class="highlight_red">3. If you want to use the tree which has been destroyed, you must use the 'init()' method at first.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier</p>
+	<p class="highlight_red">If this parameter is omitted, then will destroy all of the zTrees.</p>
+	<h4 class="topLine"><b>Return </b><span>none</span></h4>
+	<p>no return value</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. destroy the zTree which its id is 'treeDemo'</h4>
+	<pre xmlns=""><code>$.fn.zTree.destroy("treeDemo");</code></pre>
+	<h4>2. destroy all of the zTrees</h4>
+	<pre xmlns=""><code>$.fn.zTree.destroy();</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/fn.zTree.getZTreeObj.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/fn.zTree.getZTreeObj.html
new file mode 100644
index 0000000..2bc0447
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/fn.zTree.getZTreeObj.html
@@ -0,0 +1,25 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId)</span><span class="path">$.fn.zTree.</span>getZTreeObj</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>zTree v3.x specifically provide the method which can use the tree's Id to get zTree object.</p>
+			<p class="highlight_red">Please initialize zTree first, then you can use this method.</p>
+			<p>Users don't need to set the global variable to hold the zTree object, and all of the callback will return 'treeId' parameters, the user can always use this method to get the zTree object.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier</p>
+	<h4 class="topLine"><b>Return </b><span>JSON</span></h4>
+	<p>zTree object</p>
+	<p>This object can provide the methods of operate the zTree</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. Get the zTree object which id is 'tree'</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/fn.zTree.init.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/fn.zTree.init.html
new file mode 100644
index 0000000..cf97d2b
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/fn.zTree.init.html
@@ -0,0 +1,75 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(obj, zSetting, zNodes)</span><span class="path">$.fn.zTree.</span>init</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>The method which used to create zTree.</p>
+			<p>1. The web page need to use W3C markup. For example: &lt;!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"&nbsp;&nbsp; &nbsp;"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"&gt;</p>
+			<p>2. Need to load jquery-1.4.2.js or other higher versions.</p>
+			<p>3. Need to load jquery-ztree.core-3.0.js. If you need to use the edit mode or checkbox / radio mode, you need to load jquery-ztree.exedit-3.0.js and jquery-ztree.excheck-3.0.js.</p>
+			<p>4. Need to load zTreeStyle.css and image files</p>
+			<p>5. If you need to use custom icons, please refer to the appropriate Demo.</p>
+			<p>6. Note: You need to set zTree container's class name to "ztree". If you need to change, don't forget to modify the css file. If you need other special styles, can modify the css file to their own needs.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>object</b><span>jQuery Object</span></h4>
+	<p>DOM Container for zTree</p>
+	<h4 class="topLine"><b>zSetting</b><span>JSON</span></h4>
+	<p>zTree's configuration data, please refer to "setting details" in the API Document.</p>
+	<h4 class="topLine"><b>zNodes</b><span>Array(JSON) / JSON</span></h4>
+	<p>zTree's node data, please refer to "treeNode data details" in the API Document.</p>
+	<p class="highlight_red">1. zTree v3.x support to add single node, that is, if only to add one node, you can use JSON without using Array.</p>
+	<p class="highlight_red">2. If you need asynchronous load root nodes, can be set to null or [ ]</p>
+	<p class="highlight_red">3. If you use simple data mode, please refer to "setting.data.simpleData" in the API Document.</p>
+	<h4 class="topLine"><b>Return </b><span>JSON</span></h4>
+	<p>zTree object</p>
+	<p>This object can provide the methods of operate the zTree</p>
+	<p class="highlight_red">You can use $.fn.zTree.getZTreeObj method at any time to obtain.</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. create a simple tree</h4>
+	<pre xmlns=""><code>&lt;!DOCTYPE html&gt;
+&lt;HTML&gt;
+ &lt;HEAD&gt;
+  &lt;TITLE&gt; ZTREE DEMO &lt;/TITLE&gt;
+  &lt;meta http-equiv="content-type" content="text/html; charset=UTF-8"&gt;
+  &lt;link rel="stylesheet" href="zTreeStyle/zTreeStyle.css" type="text/css"&gt;
+  &lt;script type="text/javascript" src="jquery-1.4.2.js"&gt;&lt;/script&gt;
+  &lt;script type="text/javascript" src="jquery.ztree.core-3.5.js"&gt;&lt;/script&gt;
+&lt;!--
+  &lt;script type="text/javascript" src="jquery.ztree.excheck-3.5.js"&gt;&lt;/script&gt;
+  &lt;script type="text/javascript" src="jquery.ztree.exedit-3.5.js"&gt;&lt;/script&gt;
+--&gt;
+  &lt;SCRIPT type="text/javascript" &gt;
+	var zTreeObj,
+	setting = {
+		view: {
+			selectedMulti: false
+		}
+	},
+	zTreeNodes = [
+		{"name":"Site Map", open:true, children: [
+			{ "name":"google", "url":"http://www.google.com", "target":"_blank"},
+			{ "name":"baidu", "url":"http://baidu.com", "target":"_blank"},
+			{ "name":"sina", "url":"http://www.sina.com.cn", "target":"_blank"}
+			]
+		}
+	];
+
+	$(document).ready(function(){
+		zTreeObj = $.fn.zTree.init($("#tree"), setting, zTreeNodes);
+
+	});
+  &lt;/SCRIPT&gt;
+ &lt;/HEAD&gt;
+
+&lt;BODY&gt;
+&lt;ul id="tree" class="ztree" style="width:230px; overflow:auto;"&gt;&lt;/ul&gt;
+ &lt;/BODY&gt;
+&lt;/HTML&gt;</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.async.autoParam.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.async.autoParam.html
new file mode 100644
index 0000000..85cd469
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.async.autoParam.html
@@ -0,0 +1,39 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Array(String)</span><span class="path">setting.async.</span>autoParam</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Required automatically submit the parameters about the properties of the parent node, when the asynchronous load. It is valid when <span class="highlight_red">[setting.async.enable = true]</span></p>
+			<p>Default：[ ]</p>
+		</div>
+	</div>
+	<h3>Array(String) Format</h3>
+	<div class="desc">
+	<p>1. Just save the attribute name of node to the array. For example: ["id", "name"]</p>
+	<p>2. You can change the parameter name. For example: server only accepts "zId" -- ["id=zId"]</p>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. set auto commit 'id' attribute</h4>
+	<pre xmlns=""><code>var setting = {
+	async: {
+		enable: true,
+		url: "http://host/getNode.php",
+		autoParam: ["id"]
+	}
+};
+If have the parent node: {id:1, name:"test"}, When asynchronously load this parent node's child nodes, will be submitted parameters: id=1
+......</code></pre>
+	<h4>2. set auto commit 'id' attribute, but parameter name is 'zId'</h4>
+	<pre xmlns=""><code>var setting = {
+	async: {
+		enable: true,
+		url: "http://host/getNode.php",
+		autoParam: ["id=zId"]
+	}
+};
+If have the parent node: {id:1, name:"test"}, When asynchronously load this parent node's child nodes, will be submitted parameters: zId=1
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.async.contentType.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.async.contentType.html
new file mode 100644
index 0000000..cc9bfcd
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.async.contentType.html
@@ -0,0 +1,29 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">setting.async.</span>contentType</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>When Ajax sending data to the server, use this content-type. It is valid when <span class="highlight_red">[setting.async.enable = true]</span></p>
+			<p>Default："application/x-www-form-urlencoded"</p>
+		</div>
+	</div>
+	<h3>String Format</h3>
+	<div class="desc">
+	<p> contentType = "application/x-www-form-urlencoded", means: the sending data format is "form" format.</p>
+	<p> contentType = "application/json",  means: the sending data format is "json" format. (for .Net)</p>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. set the sending data format to "json" format.</h4>
+	<pre xmlns=""><code>var setting = {
+	async: {
+		enable: true,
+		contentType: "application/json",
+		url: "http://host/getNode.php",
+		autoParam: ["id", "name"]
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.async.dataFilter.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.async.dataFilter.html
new file mode 100644
index 0000000..34733e4
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.async.dataFilter.html
@@ -0,0 +1,45 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, parentNode, responseData)</span><span class="path">setting.async.</span>dataFilter</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Function used to pre-process for the return data of Ajax. It is valid when <span class="highlight_red">[setting.async.enable = true]</span></p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>parentNode</b><span>JSON</span></h4>
+	<p>Parent node's JSON data object</p>
+	<p class="highlight_red">When asynchronously loading the root, the parentNode = null</p>
+	<h4 class="topLine"><b>responseData</b><span>Array(JSON) / JSON / String</span></h4>
+	<p>Ajax got Array (JSON) / JSON / String data objects</p>
+	<p class="highlight_red">From v3.4, support the string with XML format.</p>
+	<h4 class="topLine"><b>Return </b><span>Array(JSON) / JSON</span></h4>
+	<p>The return value should be the JSON data structure which is supported by the zTree.</p>
+	<p class="highlight_red">v3.x supports to load single node JSON data object.</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. Modify the node name attribute which is ajax got.</h4>
+	<pre xmlns=""><code>function ajaxDataFilter(treeId, parentNode, responseData) {
+    if (responseData) {
+      for(var i =0; i < responseData.length; i++) {
+        responseData[i].name += "_filter";
+      }
+    }
+    return responseData;
+};
+var setting = {
+	async: {
+		enable: true,
+		url: "http://host/getNode.php",
+		dataFilter: ajaxDataFilter
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.async.dataType.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.async.dataType.html
new file mode 100644
index 0000000..e6672e9
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.async.dataType.html
@@ -0,0 +1,29 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">setting.async.</span>dataType</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>The data type of Ajax. It is valid when <span class="highlight_red">[setting.async.enable = true]</span></p>
+			<p>Default："text"</p>
+		</div>
+	</div>
+	<h3>String Format</h3>
+	<div class="desc">
+	<p> dataType = "text", It can meet most of the needs.</p>
+	<p class="highlight_red">The 'dataType' in zTree and jQuery's ajax is same.</p>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. Set the dataType which ajax got is text.</h4>
+	<pre xmlns=""><code>var setting = {
+	async: {
+		enable: true,
+		dataType: "text",
+		url: "http://host/getNode.php",
+		autoParam: ["id", "name"]
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.async.enable.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.async.enable.html
new file mode 100644
index 0000000..806ba6c
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.async.enable.html
@@ -0,0 +1,30 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.async.</span>enable</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Set zTree asynchronous loading mode is turned on or off.</p>
+			<p>Default: false</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p> true - turn on asynchronous loading mode</p>
+	<p> false - turn off asynchronous loading mode</p>
+	<p class="highlight_red">If set it is true, you must set attributes in setting.async</p>
+	<p class="highlight_red">If you don't pass 'treeNodes' parameter when initialize zTree, the root nodes will get by ajax.</p>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. Turn on asynchronous loading mode</h4>
+	<pre xmlns=""><code>var setting = {
+	async: {
+		enable: true,
+		url: "http://host/getNode.php",
+		autoParam: ["id", "name"]
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.async.otherParam.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.async.otherParam.html
new file mode 100644
index 0000000..2e37390
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.async.otherParam.html
@@ -0,0 +1,40 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Array(String) / JSON</span><span class="path">setting.async.</span>otherParam</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>The static parameters of the Ajax request. (key - value) It is valid when <span class="highlight_red">[setting.async.enable = true]</span></p>
+			<p>Default: [ ]</p>
+		</div>
+	</div>
+	<h3>Array(String) Format</h3>
+	<div class="desc">
+	<p>Can be empty array. e.g. [ ].  If set key, you must set value, e.g. [key, value]. ([key] or [key, value, key] is wrong!!)</p>
+	</div>
+	<h3>JSON Format</h3>
+	<div class="desc">
+	<p>Use JSON data format set the key-value. e.g. { key1:value1, key2:value2 }</p>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. Use Array(String) Format</h4>
+	<pre xmlns=""><code>var setting = {
+	async: {
+		enable: true,
+		url: "http://host/getNode.php",
+		otherParam: ["id", "1", "name", "test"]
+	}
+};
+when zTree send ajax, the parameters will has: id=1&name=test</code></pre>
+	<h4>2. Use JSON data Format</h4>
+	<pre xmlns=""><code>var setting = {
+	async: {
+		enable: true,
+		url: "http://host/getNode.php",
+		otherParam: { "id":"1", "name":"test"}
+	}
+};
+when zTree send ajax, the parameters will has: id=1&name=test</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.async.type.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.async.type.html
new file mode 100644
index 0000000..ae54338
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.async.type.html
@@ -0,0 +1,30 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">setting.async.</span>type</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Http request mode in ajax. It is valid when <span class="highlight_red">[setting.async.enable = true]</span></p>
+			<p>Defalut: "post"</p>
+		</div>
+	</div>
+	<h3>String Format</h3>
+	<div class="desc">
+	<p> "post" - http request mode</p>
+	<p> "get" - http request mode</p>
+	<p class="highlight_red">The 'type' in zTree and jQuery's ajax is same.</p>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. Set http request mode is 'get'</h4>
+	<pre xmlns=""><code>var setting = {
+	async: {
+		enable: true,
+		type: "get",
+		url: "http://host/getNode.php",
+		autoParam: ["id", "name"]
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.async.url.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.async.url.html
new file mode 100644
index 0000000..5587f29
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.async.url.html
@@ -0,0 +1,50 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String / Function(treeId, treeNode)</span><span class="path">setting.async.</span>url</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>The URL to which the ajax request is sent. It is valid when <span class="highlight_red">[setting.async.enable = true]</span></p>
+			<p>Default: ""</p>
+		</div>
+	</div>
+	<h3>String Format</h3>
+	<div class="desc">
+	<p>A url string(e.g. "http://www.domain.com"). Note: please ensure that the url can be loaded</p>
+	<p class="highlight_red">Url can also take parameters, please note that transcode.</p>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>Parent node's JSON data object</p>
+	<p class="highlight_red">When asynchronously loading the root, the treeNode = null</p>
+	<h4 class="topLine"><b>Return </b><span>String</span></h4>
+	<p>Return value is same as 'String Format'</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. set ajax url is "nodes.php"</h4>
+	<pre xmlns=""><code>var setting = {
+	async: {
+		enable: true,
+		url: "nodes.php",
+		autoParam: ["id", "name"]
+	}
+};
+......</code></pre>
+	<h4>2. set ajax url is "function"</h4>
+	<pre xmlns=""><code>function getAsyncUrl(treeId, treeNode) {
+    return treeNode.isParent ? "nodes1.php" : "nodes2.php";
+};
+var setting = {
+	async: {
+		enable: true,
+		url: getAsyncUrl,
+		autoParam: ["id", "name"]
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.beforeAsync.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.beforeAsync.html
new file mode 100644
index 0000000..6563ff2
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.beforeAsync.html
@@ -0,0 +1,35 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNode)</span><span class="path">setting.callback.</span>beforeAsync</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to capture the event before zTree execute ajax, zTree based on return value to determine whether to execute ajax.</p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the parent node</p>
+	<p class="highlight_red">When asynchronously loading the root, the treeNode = null</p>
+	<h4 class="topLine"><b>Return </b><span>Boolean</span></h4>
+	<p>return true or false</p>
+	<p class="highlight_red">If return false, zTree will not execute ajax, and will not trigger the 'onAsyncSuccess / onAsyncError' callback.</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. If the parent node's attribute 'id' is 1, zTree will not execute ajax.</h4>
+	<pre xmlns=""><code>function zTreeBeforeAsync(treeId, treeNode) {
+    return (treeNode.id !== 1);
+};
+var setting = {
+	callback: {
+		beforeAsync: zTreeBeforeAsync
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.beforeCheck.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.beforeCheck.html
new file mode 100644
index 0000000..5260412
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.beforeCheck.html
@@ -0,0 +1,34 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNode)</span><span class="path">setting.callback.</span>beforeCheck</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.excheck</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to capture the event before check or uncheck node, zTree based on return value to determine whether to change check state.</p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which is checked or unchecked</p>
+	<h4 class="topLine"><b>Return </b><span>Boolean</span></h4>
+	<p>return true or false</p>
+	<p class="highlight_red">If return false, zTree will not change check state, and will not trigger the 'onCheck' callback.</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. disable to change check state of all nodes, and keep the check state initialization</h4>
+	<pre xmlns=""><code>function zTreeBeforeCheck(treeId, treeNode) {
+    return false;
+};
+var setting = {
+	callback: {
+		beforeCheck: zTreeBeforeCheck
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.beforeClick.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.beforeClick.html
new file mode 100644
index 0000000..8a65448
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.beforeClick.html
@@ -0,0 +1,49 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNode, clickFlag)</span><span class="path">setting.callback.</span>beforeClick</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to capture the event before click node, zTree based on return value to determine whether to trigger the 'onClick' callback.</p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which is clicked</p>
+	<h4 class="topLine"><b>clickFlag</b><span>Number</span></h4>
+	<p>Node is selected or deselected state, please see table below for details</p>
+	<table width="100%" border="0" cellspacing="1" cellpadding="0">
+		<thead><tr><td>clickFlag</td><td title="Whether to allow multi-select">selectedMulti</td><td title="Whether to press Ctrl-key">autoCancelSelected<br/>&&<br/>event.ctrlKey</td><td title="Node's selection state">isSelected</td><td>operate for selected</td></tr></thead>
+		<tbody>
+			<tr><td>1</td><td>true</td><td>false</td><td>false</td><td>node is selected (single)</td></tr>
+			<tr><td>1</td><td>true</td><td>false</td><td>true</td><td>node is selected (single)</td></tr>
+			<tr><td>2</td><td>true</td><td>true</td><td>false</td><td>node is selected (multi)</td></tr>
+			<tr><td>0</td><td>true</td><td>true</td><td>true</td><td>node is deselected</td></tr>
+			<tr><td>1</td><td>false</td><td>false</td><td>false</td><td>node is selected (single)</td></tr>
+			<tr><td>1</td><td>false</td><td>false</td><td>true</td><td>node is selected (single)</td></tr>
+			<tr><td>1</td><td>false</td><td>true</td><td>false</td><td>node is selected (single)</td></tr>
+			<tr><td>0</td><td>false</td><td>true</td><td>true</td><td>node is deselected</td></tr>
+		</tbody>
+	</table>
+	<h4 class="topLine"><b>Return </b><span>Boolean</span></h4>
+	<p>return true or false</p>
+	<p class="highlight_red">If return false, zTree will not change selected state, and will not trigger the 'onClick' callback.</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. disabled to click the node</h4>
+	<pre xmlns=""><code>function zTreeBeforeClick(treeId, treeNode, clickFlag) {
+    return (treeNode.id !== 1);
+};
+var setting = {
+	callback: {
+		beforeClick: zTreeBeforeClick
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.beforeCollapse.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.beforeCollapse.html
new file mode 100644
index 0000000..b2713e8
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.beforeCollapse.html
@@ -0,0 +1,34 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNode)</span><span class="path">setting.callback.</span>beforeCollapse</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to capture the event before collapse node, zTree based on return value to determine whether to collapse node.</p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which will be collapsed</p>
+	<h4 class="topLine"><b>Return </b><span>Boolean</span></h4>
+	<p>return true or false</p>
+	<p class="highlight_red">If return false, zTree will not collapse node, and will not trigger the 'onCollapse' callback.</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. disabled to collapse node which is expanded</h4>
+	<pre xmlns=""><code>function zTreeBeforeCollapse(treeId, treeNode) {
+    return false;
+};
+var setting = {
+	callback: {
+		beforeCollapse: zTreeBeforeCollapse
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.beforeDblClick.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.beforeDblClick.html
new file mode 100644
index 0000000..6f1c743
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.beforeDblClick.html
@@ -0,0 +1,36 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNode)</span><span class="path">setting.callback.</span>beforeDblClick</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to capture the dblclick event before the 'onDblClick' callback, zTree based on return value to determine whether to trigger the 'onDblClick' callback.</p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which is double clicked</p>
+	<p class="highlight_red">If the DOM which dblclicked isn't a node, it will return null.</p>
+	<h4 class="topLine"><b>Return </b><span>Boolean</span></h4>
+	<p>return true or false</p>
+	<p class="highlight_red">If return false, ztree will not trigger the 'onDblClick' callback, no effect on other operations.</p>
+	<p class="highlight_red">This callback function does not affect the dblclick the parent node to auto expand, please refer to setting.view.dblClickExpand properties.</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. disable to trigger the 'onDblClick' callback</h4>
+	<pre xmlns=""><code>function zTreeBeforeDblClick(treeId, treeNode) {
+    return false;
+};
+var setting = {
+	callback: {
+		beforeDblClick: zTreeBeforeDblClick
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.beforeDrag.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.beforeDrag.html
new file mode 100644
index 0000000..5175244
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.beforeDrag.html
@@ -0,0 +1,39 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNodes)</span><span class="path">setting.callback.</span>beforeDrag</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to capture the event before drag node, zTree based on return value to determine whether to start to drag node.</p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, the tree is what the treeNodes are belong to, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNodes</b><span>Array(JSON)</span></h4>
+	<p>A collection of the nodes which will be dragged</p>
+	<p class="highlight_red">v3.x allows drag and drop multiple sibling nodes, so this parameter is modified to Array(JSON).</p>
+	<p class="highlight_red">If the selected nodes aren't the sibling nodes, you can only drag one node which mouse over.</p>
+	<h4 class="topLine"><b>Return </b><span>Boolean</span></h4>
+	<p>return true or false</p>
+	<p class="highlight_red">If return false, zTree will stop drag, and will not trigger the 'onDrag / beforeDrop / onDrop' callback.</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. disable to drag all node</h4>
+	<pre xmlns=""><code>function zTreeBeforeDrag(treeId, treeNodes) {
+    return false;
+};
+var setting = {
+	edit: {
+		enable: true
+	},
+	callback: {
+		beforeDrag: zTreeBeforeDrag
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.beforeDragOpen.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.beforeDragOpen.html
new file mode 100644
index 0000000..ed1ae97
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.beforeDragOpen.html
@@ -0,0 +1,37 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNode)</span><span class="path">setting.callback.</span>beforeDragOpen</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to capture the event when drag node to collapsed parent node, zTree based on return value to determine whether to auto expand parent node.</p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, the tree is what the treeNode(parent node) is belong to, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the parent node which will be auto expanded</p>
+	<h4 class="topLine"><b>Return </b><span>Boolean</span></h4>
+	<p>return true or false</p>
+	<p class="highlight_red">If return false, zTree will not auto expand parent node.</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. disable to auto expand parent node.</h4>
+	<pre xmlns=""><code>function zTreeBeforeDragOpen(treeId, treeNode) {
+    return false;
+};
+var setting = {
+	edit: {
+		enable: true
+	},
+	callback: {
+		beforeDragOpen: zTreeBeforeDragOpen
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.beforeDrop.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.beforeDrop.html
new file mode 100644
index 0000000..7014321
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.beforeDrop.html
@@ -0,0 +1,50 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNodes, targetNode, moveType, isCopy)</span><span class="path">setting.callback.</span>beforeDrop</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to capture the event before drag-drop node, zTree based on return value to determine whether to allow drag-drop node.</p>
+			<p>Default: null</p>
+			<p class="highlight_red">When drop the nodes, if the dragged nodes is not in a valid location, this callback will not triggered, and will restore the original position.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, the tree is what the targetNode is belong to, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNodes</b><span>Array(JSON)</span></h4>
+	<p>A collection of the nodes which has been dragged</p>
+	<p class="highlight_red">The treeNodes are the data of the nodes which has been dragged, when copy nodes or move nodes.</p>
+	<h4 class="topLine"><b>targetNode</b><span>JSON</span></h4>
+	<p>JSON data object of the target node which treeNodes are drag-dropped.</p>
+	<p class="highlight_red">If the treeNodes will be root node, the targetNode = null</p>
+	<h4 class="topLine"><b>moveType</b><span>String</span></h4>
+	<p>the relative position of move to the target node</p>
+	<p class="highlight_red">"inner": will be child of targetNode</p>
+	<p class="highlight_red">"prev": will be sibling node, and be in front of targetNode</p>
+	<p class="highlight_red">"next":  will be sibling node, and be behind targetNode</p>
+	<h4 class="topLine"><b>isCopy</b><span>Boolean</span></h4>
+	<p>the flag used to judge copy node or move node</p>
+	<p class="highlight_red">true: copy node; false: move node</p>
+	<h4 class="topLine"><b>Return </b><span>Boolean</span></h4>
+	<p>return true or false</p>
+	<p class="highlight_red">If return false, zTree will restore the dragged nodes, and will not trigger the 'onDrop' callback.</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. disable to drag nodes to root</h4>
+	<pre xmlns=""><code>function zTreeBeforeDrop(treeId, treeNodes, targetNode, moveType) {
+    return !(targetNode == null || (moveType != "inner" && !targetNode.parentTId));
+};
+var setting = {
+	edit: {
+		enable: true
+	},
+	callback: {
+		beforeDrop: zTreeBeforeDrop
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.beforeEditName.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.beforeEditName.html
new file mode 100644
index 0000000..8772a3e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.beforeEditName.html
@@ -0,0 +1,38 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNode)</span><span class="path">setting.callback.</span>beforeEditName</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to capture the event before click edit button, zTree based on return value to determine whether to allow to edit the name.</p>
+			<p class="highlight_red">This callback is used to capture the event which edit button is clicked, then trigger the custom editing operation.</p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which will be edited name.</p>
+	<h4 class="topLine"><b>Return </b><span>Boolean</span></h4>
+	<p>return true or false</p>
+	<p class="highlight_red">If return false, the node will not be able to edit the name.</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. disable to edit the parent node's name</h4>
+	<pre xmlns=""><code>function zTreeBeforeEditName(treeId, treeNode) {
+	return !treeNode.isParent;
+}
+var setting = {
+	edit: {
+		enable: true
+	},
+	callback: {
+		beforeEditName: zTreeBeforeEditName
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.beforeExpand.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.beforeExpand.html
new file mode 100644
index 0000000..73cf55a
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.beforeExpand.html
@@ -0,0 +1,34 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNode)</span><span class="path">setting.callback.</span>beforeExpand</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to capture the event before expand node, zTree based on return value to determine whether to expand node.</p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which will be expanded</p>
+	<h4 class="topLine"><b>Return </b><span>Boolean</span></h4>
+	<p>return true or false</p>
+	<p class="highlight_red">If return false, zTree will not expand node, and will not trigger the 'onExpand' callback.</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. disabled to expand node which is collapsed</h4>
+	<pre xmlns=""><code>function zTreeBeforeExpand(treeId, treeNode) {
+    return false;
+};
+var setting = {
+	callback: {
+		beforeExpand: zTreeBeforeExpand
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.beforeMouseDown.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.beforeMouseDown.html
new file mode 100644
index 0000000..4af0818
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.beforeMouseDown.html
@@ -0,0 +1,35 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNode)</span><span class="path">setting.callback.</span>beforeMouseDown</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to capture the mousedown event before the 'onMouseDown' callback, zTree based on return value to determine whether to trigger the 'onMouseDown' callback.</p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which mouse over</p>
+	<p class="highlight_red">If the DOM which mouse over isn't a node, it will return null.</p>
+	<h4 class="topLine"><b>Return </b><span>Boolean</span></h4>
+	<p>return true or false</p>
+	<p class="highlight_red">If return false, zTree will not trigger the 'onMouseDown' callback, no effect on other operations.</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. disable to trigger the 'onMouseDown' callback</h4>
+	<pre xmlns=""><code>function zTreeBeforeMouseDown(treeId, treeNode) {
+    return false;
+};
+var setting = {
+	callback: {
+		beforeMouseDown: zTreeBeforeMouseDown
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.beforeMouseUp.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.beforeMouseUp.html
new file mode 100644
index 0000000..0c008fc
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.beforeMouseUp.html
@@ -0,0 +1,35 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNode)</span><span class="path">setting.callback.</span>beforeMouseUp</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to capture the mouseup event before the 'onMouseUp' callback, zTree based on return value to determine whether to trigger the 'onMouseUp' callback.</p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which mouse over</p>
+	<p class="highlight_red">If the DOM which mouse over isn't a node, it will return null.</p>
+	<h4 class="topLine"><b>Return </b><span>Boolean</span></h4>
+	<p>return true or false</p>
+	<p class="highlight_red">If return false, zTree will not trigger the 'onMouseUp' callback, no effect on other operations.</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. disable to trigger the 'onMouseUp' callback</h4>
+	<pre xmlns=""><code>function zTreeBeforeMouseUp(treeId, treeNode) {
+    return false;
+};
+var setting = {
+	callback: {
+		beforeMouseUp: zTreeBeforeMouseUp
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.beforeRemove.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.beforeRemove.html
new file mode 100644
index 0000000..38e14c1
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.beforeRemove.html
@@ -0,0 +1,37 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNode)</span><span class="path">setting.callback.</span>beforeRemove</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to capture the event before remove node, zTree based on return value to determine whether to allow to remove node.</p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which will be removed.</p>
+	<h4 class="topLine"><b>Return </b><span>Boolean</span></h4>
+	<p>return true or false</p>
+	<p class="highlight_red">If return false, zTree will not remove node, and will not trigger the 'onRemove' callback.</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. disable to remove node</h4>
+	<pre xmlns=""><code>function zTreeBeforeRemove(treeId, treeNode) {
+	return false;
+}
+var setting = {
+	edit: {
+		enable: true
+	},
+	callback: {
+		beforeRemove: zTreeBeforeRemove
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.beforeRename.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.beforeRename.html
new file mode 100644
index 0000000..76438a9
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.beforeRename.html
@@ -0,0 +1,46 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNode, newName, isCancel)</span><span class="path">setting.callback.</span>beforeRename</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to capture the event before rename(when input DOM blur or press Enter Key), zTree based on return value to determine whether to allow to rename node.</p>
+			<p class="highlight_red">When node is editing name, press the ESC key to restore the original name and stop edit name.</p>
+			<p class="highlight_red">From v3.5.13, zTree will trigger this callback when user cancel edit name. please see 'isCancel' parameter.</p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which will be rename.</p>
+	<h4 class="topLine"><b>newName</b><span>String</span></h4>
+	<p>the new name</p>
+	<h4 class="topLine"><b>isCancel</b><span>Boolean</span></h4>
+	<p>the status about cancel edit name (v3.5.13+)</p>
+	<p class="highlight_red">isCancel = true means: user cancel edit name. (press ESC or use cancelEditName() function)</p>
+	<p class="highlight_red">isCancel = false means: user submit edit name.</p>
+	<h4 class="topLine"><b>Return </b><span>Boolean</span></h4>
+	<p>return true or false</p>
+	<p class="highlight_red">If return false, the treeNode will keep the editing name, don't trigger the 'onRename' callback, and will ignore other enents, until the callback return true.</p>
+	<p class="highlight_red">If returns false, zTree will not set the input box to get focus to avoid the warning message which led to repeated triggering ‘beforeRename’ callback. Please use editName() method to set the input box to get focus when user close the warning message.</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. the length of the new name can't less than 5</h4>
+	<pre xmlns=""><code>function zTreeBeforeRename(treeId, treeNode, newName, isCancel) {
+	return newName.length > 5;
+}
+var setting = {
+	edit: {
+		enable: true
+	},
+	callback: {
+		beforeRename: zTreeBeforeRename
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.beforeRightClick.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.beforeRightClick.html
new file mode 100644
index 0000000..15c38cd
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.beforeRightClick.html
@@ -0,0 +1,35 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNode)</span><span class="path">setting.callback.</span>beforeRightClick</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to capture the right click event before the 'onRightClick' callback, zTree based on return value to determine whether to trigger the 'onRightClick' callback.</p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which is mouse right clicked</p>
+	<p class="highlight_red">If the DOM which mouse right clicked isn't a node, it will return null.</p>
+	<h4 class="topLine"><b>Return</b><span>Boolean</span></h4>
+	<p>return true or false</p>
+	<p class="highlight_red">If return false, ztree will not trigger the 'onRightClick' callback, no effect on other operations.</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. disable to trigger the 'onRightClick' callback</h4>
+	<pre xmlns=""><code>function zTreeBeforeRightClick(treeId, treeNode) {
+    return false;
+};
+var setting = {
+	callback: {
+		beforeRightClick: zTreeBeforeRightClick
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.onAsyncError.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.onAsyncError.html
new file mode 100644
index 0000000..785c8d8
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.onAsyncError.html
@@ -0,0 +1,42 @@
+<div class="apiDetail">
+<div>
+	<h2><span class="path">setting.callback.</span>onAsyncError</h2>
+	<h2><span>Function(event, treeId, treeNode, XMLHttpRequest, textStatus, errorThrown)</span>&nbsp;</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to capture the error event when execute ajax.</p>
+			<p class="highlight_red">If you set 'setting.callback.beforeAsync',and return false, zTree will not execute ajax, and will not trigger the 'onAsyncSuccess / onAsyncError' callback.</p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>event</b><span>js event Object</span></h4>
+	<p>event Object</p>
+	<h4 class="topLine"><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the parent node</p>
+	<p class="highlight_red">When load root nodes, treeNode = null</p>
+	<h4 class="topLine"><b>XMLHttpRequest</b><span>String</span></h4>
+	<p>XMLHttpRequest Object, please refer to JQuery API documentation.</p>
+	<h4 class="topLine"><b>textStatus</b><span>String</span></h4>
+	<p>a string categorizing the status of the request("success", "error"...), please refer to JQuery API documentation.</p>
+	<h4 class="topLine"><b>errorThrown</b><span>String</span></h4>
+	<p>eWhen an HTTP error occurs, errorThrown receives the textual portion of the HTTP status, please refer to JQuery API documentation.</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. When execute ajax make error, alert message.</h4>
+	<pre xmlns=""><code>function zTreeOnAsyncError(event, treeId, treeNode, XMLHttpRequest, textStatus, errorThrown) {
+    alert(XMLHttpRequest);
+};
+var setting = {
+	callback: {
+		onAsyncError: zTreeOnAsyncError
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.onAsyncSuccess.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.onAsyncSuccess.html
new file mode 100644
index 0000000..2722691
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.onAsyncSuccess.html
@@ -0,0 +1,38 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(event, treeId, treeNode, msg)</span><span class="path">setting.callback.</span>onAsyncSuccess</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to capture the complete success event when execute ajax.</p>
+			<p class="highlight_red">If you set 'setting.callback.beforeAsync',and return false, zTree will not execute ajax, and will not trigger the 'onAsyncSuccess / onAsyncError' callback.</p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>event</b><span>js event Object</span></h4>
+	<p>event Object</p>
+	<h4 class="topLine"><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the parent node</p>
+	<p class="highlight_red">When load root nodes, treeNode = null</p>
+	<h4 class="topLine"><b>msg</b><span>String / Object</span></h4>
+	<p>The actualnode data which got by ajax. User-friendly debugging.</p>
+	<p class="highlight_red">The actual data's type of msg is affected by 'setting.async.dataType', please refer to JQuery API documentation.</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. When execute ajax complete success, alert message.</h4>
+	<pre xmlns=""><code>function zTreeOnAsyncSuccess(event, treeId, treeNode, msg) {
+    alert(msg);
+};
+var setting = {
+	callback: {
+		onAsyncSuccess: zTreeOnAsyncSuccess
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.onCheck.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.onCheck.html
new file mode 100644
index 0000000..ed33f8d
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.onCheck.html
@@ -0,0 +1,34 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(event, treeId, treeNode)</span><span class="path">setting.callback.</span>onCheck</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.excheck</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to capture the check or uncheck event when check or uncheck the checkbox and radio.</p>
+			<p class="highlight_red">If you set 'setting.callback.beforeCheck',and return false, zTree will not change check state, and will not trigger the 'onCheck' callback.</p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>event</b><span>js event Object</span></h4>
+	<p>event Object</p>
+	<h4 class="topLine"><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which is checked or unchecked</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. When check or uncheck the checkbox and radio, alert info about 'tId' and 'name' and 'checked'.</h4>
+	<pre xmlns=""><code>function zTreeOnCheck(event, treeId, treeNode) {
+    alert(treeNode.tId + ", " + treeNode.name + "," + treeNode.checked);
+};
+var setting = {
+	callback: {
+		onCheck: zTreeOnCheck
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.onClick.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.onClick.html
new file mode 100644
index 0000000..a6ba29a
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.onClick.html
@@ -0,0 +1,49 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(event, treeId, treeNode, clickFlag)</span><span class="path">setting.callback.</span>onClick</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to capture the click event when click node.</p>
+			<p class="highlight_red">If you set 'setting.callback.beforeClick',and return false, zTree will not change selected state, and will not trigger the 'onClick' callback.</p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>event</b><span>js event Object</span></h4>
+	<p>event Object</p>
+	<h4 class="topLine"><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which is clicked</p>
+	<h4 class="topLine"><b>clickFlag</b><span>Number</span></h4>
+	<p>Node is selected or deselected state, please see table below for details</p>
+	<table width="100%" border="0" cellspacing="1" cellpadding="0">
+		<thead><tr><td>clickFlag</td><td title="Whether to allow multi-select">selectedMulti</td><td title="Whether to press Ctrl-key">autoCancelSelected<br/>&&<br/>event.ctrlKey</td><td title="Node's selection state">isSelected</td><td>operate for selected</td></tr></thead>
+		<tbody>
+			<tr><td>1</td><td>true</td><td>false</td><td>false</td><td>node is selected (single)</td></tr>
+			<tr><td>1</td><td>true</td><td>false</td><td>true</td><td>node is selected (single)</td></tr>
+			<tr><td>2</td><td>true</td><td>true</td><td>false</td><td>node is selected (multi)</td></tr>
+			<tr><td>0</td><td>true</td><td>true</td><td>true</td><td>node is deselected</td></tr>
+			<tr><td>1</td><td>false</td><td>false</td><td>false</td><td>node is selected (single)</td></tr>
+			<tr><td>1</td><td>false</td><td>false</td><td>true</td><td>node is selected (single)</td></tr>
+			<tr><td>1</td><td>false</td><td>true</td><td>false</td><td>node is selected (single)</td></tr>
+			<tr><td>0</td><td>false</td><td>true</td><td>true</td><td>node is deselected</td></tr>
+		</tbody>
+	</table>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. When click node, alert info about 'tId' and 'name'.</h4>
+	<pre xmlns=""><code>function zTreeOnClick(event, treeId, treeNode) {
+    alert(treeNode.tId + ", " + treeNode.name);
+};
+var setting = {
+	callback: {
+		onClick: zTreeOnClick
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.onCollapse.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.onCollapse.html
new file mode 100644
index 0000000..d605dc8
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.onCollapse.html
@@ -0,0 +1,34 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(event, treeId, treeNode)</span><span class="path">setting.callback.</span>onCollapse</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to capture the event when collapse node.</p>
+			<p class="highlight_red">If you set 'setting.callback.beforeCollapse',and return false, zTree will not collapse node, and will not trigger the 'onCollapse' callback.</p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>event</b><span>js event Object</span></h4>
+	<p>event Object</p>
+	<h4 class="topLine"><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which will be collapsed</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. When collapse node, alert info about 'tId' and 'name'.</h4>
+	<pre xmlns=""><code>function zTreeOnCollapse(event, treeId, treeNode) {
+    alert(treeNode.tId + ", " + treeNode.name);
+};
+var setting = {
+	callback: {
+		onCollapse: zTreeOnCollapse
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.onDblClick.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.onDblClick.html
new file mode 100644
index 0000000..fbd47e8
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.onDblClick.html
@@ -0,0 +1,35 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(event, treeId, treeNode)</span><span class="path">setting.callback.</span>onDblClick</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to capture the dblclick event when double click node.</p>
+			<p class="highlight_red">If you set 'setting.callback.beforeDblClick',and return false, zTree will not trigger the 'onDblClick' callback.</p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>event</b><span>js event Object</span></h4>
+	<p>event Object</p>
+	<h4 class="topLine"><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which is double clicked</p>
+	<p class="highlight_red">If the DOM which dblclicked isn't a node, it will return null.</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. When double click node, alert info about 'tId' and 'name'.</h4>
+	<pre xmlns=""><code>function zTreeOnDblClick(event, treeId, treeNode) {
+    alert(treeNode ? treeNode.tId + ", " + treeNode.name : "isRoot");
+};
+var setting = {
+	callback: {
+		onDblClick: zTreeOnDblClick
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.onDrag.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.onDrag.html
new file mode 100644
index 0000000..30c738d
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.onDrag.html
@@ -0,0 +1,34 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(event, treeId, treeNodes)</span><span class="path">setting.callback.</span>onDrag</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to capture the drag event when drag node.</p>
+			<p class="highlight_red">If you set 'setting.callback.beforeDrag',and return false, zTree will stop drag, and will not trigger the 'onDrag' callback.</p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>event</b><span>js event Object</span></h4>
+	<p>event Object</p>
+	<h4 class="topLine"><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, the tree is what the treeNodes are belong to, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNodes</b><span>Array(JSON)</span></h4>
+	<p>A collection of the nodes which will be dragged</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. When drag nodes, alert the number of dragged nodes.</h4>
+	<pre xmlns=""><code>function zTreeOnDrag(event, treeId, treeNodes) {
+    alert(treeNodes.length);
+};
+var setting = {
+	callback: {
+		onDrag: zTreeOnDrag
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.onDrop.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.onDrop.html
new file mode 100644
index 0000000..6362463
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.onDrop.html
@@ -0,0 +1,48 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(event, treeId, treeNodes, targetNode, moveType, isCopy)</span><span class="path">setting.callback.</span>onDrop</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to capture the drop event when drag-drop node.</p>
+			<p class="highlight_red">If you set 'setting.callback.beforeDrop',and return false, zTree will restore the dragged nodes, and will not trigger the 'onDrop' callback.</p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>event</b><span>js event Object</span></h4>
+	<p>event Object</p>
+	<h4 class="topLine"><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, the tree is what the targetNode is belong to, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNodes</b><span>Array(JSON)</span></h4>
+	<p>A collection of the nodes which has been dragged</p>
+	<p class="highlight_red">The treeNodes are the data of the nodes which be dragged, when move nodes.</p>
+	<p class="highlight_red">The treeNodes are the clone data of the nodes which be dragged, when copy nodes.</p>
+	<h4 class="topLine"><b>targetNode</b><span>JSON</span></h4>
+	<p>JSON data object of the target node which treeNodes are drag-dropped.</p>
+	<p class="highlight_red">If the treeNodes will be root node, the targetNode = null</p>
+	<h4 class="topLine"><b>moveType</b><span>String</span></h4>
+	<p>the relative position of move to the target node</p>
+	<p class="highlight_red">"inner": will be child of targetNode</p>
+	<p class="highlight_red">"prev": will be sibling node, and be in front of targetNode</p>
+	<p class="highlight_red">"next":  will be sibling node, and be behind targetNode</p>
+	<p class="highlight_red">If moveType is null, means drag & drop is cancel.</p>
+	<h4 class="topLine"><b>isCopy</b><span>Boolean</span></h4>
+	<p>the flag used to judge copy node or move node</p>
+	<p class="highlight_red">true: copy node; false: move node</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. When drag-drop nodes complete, alert the number of dragged nodes and info about targetNode.</h4>
+	<pre xmlns=""><code>function zTreeOnDrop(event, treeId, treeNodes, targetNode, moveType) {
+    alert(treeNodes.length + "," + (targetNode ? (targetNode.tId + ", " + targetNode.name) : "isRoot" ));
+};
+var setting = {
+	callback: {
+		onDrop: zTreeOnDrop
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.onExpand.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.onExpand.html
new file mode 100644
index 0000000..7b9d8d5
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.onExpand.html
@@ -0,0 +1,34 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(event, treeId, treeNode)</span><span class="path">setting.callback.</span>onExpand</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to capture the event when expand node.</p>
+			<p class="highlight_red">If you set 'setting.callback.beforeExpand',and return false, zTree will not expand node, and will not trigger the 'onExpand' callback.</p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>event</b><span>js event Object</span></h4>
+	<p>event Object</p>
+	<h4 class="topLine"><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which will be expanded</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. When expand node, alert info about 'tId' and 'name'.</h4>
+	<pre xmlns=""><code>function zTreeOnExpand(event, treeId, treeNode) {
+    alert(treeNode.tId + ", " + treeNode.name);
+};
+var setting = {
+	callback: {
+		onExpand: zTreeOnExpand
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.onMouseDown.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.onMouseDown.html
new file mode 100644
index 0000000..bfd714c
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.onMouseDown.html
@@ -0,0 +1,35 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(event, treeId, treeNode)</span><span class="path">setting.callback.</span>onMouseDown</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to capture the event when mouse down.</p>
+			<p class="highlight_red">If you set 'setting.callback.beforeMouseDown',and return false, zTree will not trigger the 'onMouseDown' callback.</p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>event</b><span>js event Object</span></h4>
+	<p>event Object</p>
+	<h4 class="topLine"><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which mouse over</p>
+	<p class="highlight_red">If the DOM which mouse over isn't a node, it will return null.</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. When mouse down, alert info about 'tId' and 'name'.</h4>
+	<pre xmlns=""><code>function zTreeOnMouseDown(event, treeId, treeNode) {
+    alert(treeNode ? treeNode.tId + ", " + treeNode.name : "isRoot");
+};
+var setting = {
+	callback: {
+		onMouseDown: zTreeOnMouseDown
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.onMouseUp.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.onMouseUp.html
new file mode 100644
index 0000000..93edf31
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.onMouseUp.html
@@ -0,0 +1,35 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(event, treeId, treeNode)</span><span class="path">setting.callback.</span>onMouseUp</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to capture the event when mouse up.</p>
+			<p class="highlight_red">If you set 'setting.callback.beforeMouseUp',and return false, zTree will not trigger the 'onMouseUp' callback.</p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>event</b><span>js event Object</span></h4>
+	<p>event Object</p>
+	<h4 class="topLine"><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which mouse over</p>
+	<p class="highlight_red">If the DOM which mouse over isn't a node, it will return null.</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. When mouse up, alert info about 'tId' and 'name'.</h4>
+	<pre xmlns=""><code>function zTreeOnMouseUp(event, treeId, treeNode) {
+    alert(treeNode ? treeNode.tId + ", " + treeNode.name : "isRoot");
+};
+var setting = {
+	callback: {
+		onMouseUp: zTreeOnMouseUp
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.onNodeCreated.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.onNodeCreated.html
new file mode 100644
index 0000000..a98b572
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.onNodeCreated.html
@@ -0,0 +1,35 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(event, treeId, treeNode)</span><span class="path">setting.callback.</span>onNodeCreated</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to capture the event when node's DOM is created.</p>
+			<p class="highlight_red">Because v3.x uses lazy loading technology, so the nodes which doesn't create DOM when initialized will not trigger this callback, until its parent node is expanded.</p>
+			<p class="highlight_red">Large amount of data to load, please note: do not set onNodeCreated, can improve performance as when initialized.</p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>event</b><span>js event Object</span></h4>
+	<p>event Object</p>
+	<h4 class="topLine"><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which DOM is created</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. When node's DOM is created, alert info about 'tId' and 'name'.</h4>
+	<pre xmlns=""><code>function zTreeOnNodeCreated(event, treeId, treeNode) {
+    alert(treeNode.tId + ", " + treeNode.name);
+};
+var setting = {
+	callback: {
+		onNodeCreated: zTreeOnNodeCreated
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.onRemove.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.onRemove.html
new file mode 100644
index 0000000..ce29413
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.onRemove.html
@@ -0,0 +1,34 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(event, treeId, treeNode)</span><span class="path">setting.callback.</span>onRemove</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to capture the event when remove node.</p>
+			<p class="highlight_red">If you set 'setting.callback.beforeRemove',and return false, zTree will not remove node, and will not trigger the 'onRemove' callback.</p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>event</b><span>js event Object</span></h4>
+	<p>event Object</p>
+	<h4 class="topLine"><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which was removed.</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. When remove node, alert info about 'tId' and 'name'.</h4>
+	<pre xmlns=""><code>function zTreeOnRemove(event, treeId, treeNode) {
+	alert(treeNode.tId + ", " + treeNode.name);
+}
+var setting = {
+	callback: {
+		onRemove: zTreeOnRemove
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.onRename.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.onRename.html
new file mode 100644
index 0000000..cd47eae
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.onRename.html
@@ -0,0 +1,40 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(event, treeId, treeNode, isCancel)</span><span class="path">setting.callback.</span>onRename</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to capture the event when remove node.</p>
+			<p class="highlight_red">1. If you set 'setting.callback.beforeRename',and return false, zTree will keep the editing name, and will not trigger the 'onRename' callback.</p>
+			<p class="highlight_red">2. If you modity treeNode data, and use 'updateNode' function, zTree will not trigger the 'onRename' callback.</p>
+			<p class="highlight_red">3. From v3.5.13, zTree will trigger this callback when user cancel edit name. please see 'isCancel' parameter.</p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>event</b><span>js event Object</span></h4>
+	<p>event Object</p>
+	<h4 class="topLine"><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which was rename.</p>
+	<h4 class="topLine"><b>isCancel</b><span>Boolean</span></h4>
+	<p>the status about cancel edit name (v3.5.13+)</p>
+	<p class="highlight_red">isCancel = true means: user cancel edit name. (press ESC or use cancelEditName() function)</p>
+	<p class="highlight_red">isCancel = false means: user submit edit name.</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. When rename node, alert info about 'tId' and 'name'.</h4>
+	<pre xmlns=""><code>function zTreeOnRename(event, treeId, treeNode, isCancel) {
+	alert(treeNode.tId + ", " + treeNode.name);
+}
+var setting = {
+	callback: {
+		onRename: zTreeOnRename
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.onRightClick.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.onRightClick.html
new file mode 100644
index 0000000..86b4b01
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.callback.onRightClick.html
@@ -0,0 +1,36 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(event, treeId, treeNode)</span><span class="path">setting.callback.</span>onRightClick</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to capture the event when mouse right click node.</p>
+			<p class="highlight_red">If you set 'setting.callback.beforeRightClick',and return false, zTree will not trigger the 'onRightClick' callback.</p>
+			<p class="highlight_red">If you set 'setting.callback.onRightClick', zTree will shield the browser context menu when mouse right click on zTree.</p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>event</b><span>js event Object</span></h4>
+	<p>event Object</p>
+	<h4 class="topLine"><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which is mouse right clicked</p>
+	<p class="highlight_red">If the DOM which mouse right clicked isn't a node, it will return null.</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. When mouse right click node, alert info about 'tId' and 'name'.</h4>
+	<pre xmlns=""><code>function zTreeOnRightClick(event, treeId, treeNode) {
+    alert(treeNode ? treeNode.tId + ", " + treeNode.name : "isRoot");
+};
+var setting = {
+	callback: {
+		onRightClick: zTreeOnRightClick
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.check.autoCheckTrigger.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.check.autoCheckTrigger.html
new file mode 100644
index 0000000..b8b04cc
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.check.autoCheckTrigger.html
@@ -0,0 +1,29 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.check.</span>autoCheckTrigger</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.excheck</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>When node is automatically checked or unchecked, this parameter used to set to trigger 'beforeCheck / onCheck' callback. It is valid when <span class="highlight_red">[setting.check.enable = true & setting.check.chkStyle = "checkbox"]</span></p>
+			<p class="highlight_red">1. If you set 'setting.check.chkboxType' to { "Y": "", "N": "" }, will not automatically checked or unchecked.</p>
+			<p class="highlight_red">2. If you turn on the trigger and there are many more nodes, will affect the performance, because the check or uncheck node can cause many nodes to be automatically checked or unchecked, it will trigger a lot of callbacks, according to the need to decide whether to use this feature.</p>
+			<p>Default: false</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p> true means: trigger callback</p>
+	<p> false means: don't trigger callback</p>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. When node is automatically checked or unchecked, zTree trigger 'beforeCheck / onCheck' callback.</h4>
+	<pre xmlns=""><code>var setting = {
+	check: {
+		enable: true,
+		autoCheckTrigger: true
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.check.chkDisabledInherit.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.check.chkDisabledInherit.html
new file mode 100644
index 0000000..98d824e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.check.chkDisabledInherit.html
@@ -0,0 +1,28 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.check.</span>chkDisabledInherit</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.excheck</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>When the parent node's 'chkDisabled' attribute is true, set the child nodes automatically inherit the 'chkDisabled' attribute. It is valid when <span class="highlight_red">[setting.check.enable = true]</span></p>
+			<p class="highlight_red">1. Only be used to initialize the nodes, easy batch operations. Please use the 'updateNode' method modify existing node.</p>
+			<p>Default: false</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p> true means: When add new child nodes, if parent node's 'chkDisabled' attribute is true, the child nodes automatically inherit the 'chkDisabled' attribute.</p>
+	<p> false means: When add new child nodes, the child nodes don't inherit the 'chkDisabled' attribute from parent node.</p>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1.  When add new child nodes, the child nodes automatically inherit the 'chkDisabled' attribute from parent node.</h4>
+	<pre xmlns=""><code>var setting = {
+	check: {
+		enable: true,
+		chkDisabledInherit: true
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.check.chkStyle.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.check.chkStyle.html
new file mode 100644
index 0000000..d42e757
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.check.chkStyle.html
@@ -0,0 +1,48 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">setting.check.</span>chkStyle</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.excheck</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Use the checkbox or radio. It is valid when <span class="highlight_red">[setting.check.enable = true]</span></p>
+			<p>Default: "checkbox"</p>
+		</div>
+	</div>
+	<h3>String Format</h3>
+	<div class="desc">
+	<p>When chkStyle = "checkbox", zTree show checkbox, and '<span class="highlight_red">setting.check.chkboxType</span>' attribute is valid.
+<br/>When chkStyle = "radio", zTree show radio, and '<span class="highlight_red">setting.check.radioType</span>' attribute is valid.</p>
+	<p class="highlight_red">Please note that letter case, do not change.</p>
+	</div>
+	<h3>checkbox States Descriptions</h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p><button type="button" class="chk checkbox_false_full"></button>not checked; <span class="highlight_red">If node is parent, so its child nodes have been not checked.</span> when mouse over: <button type="button" class="chk checkbox_false_full_focus"></button></p>
+			<p><button type="button" class="chk checkbox_false_part"></button>not checked; (only parent node) <span class="highlight_red">some of its child nodes have been checked.</span> when mouse over: <button type="button" class="chk checkbox_false_part_focus"></button></p>
+			<p><button type="button" class="chk checkbox_true_full"></button>be checked; <span class="highlight_red">If node is parent, so its all child nodes have been checked.</span> when mouse over: <button type="button" class="chk checkbox_true_full_focus"></button></p>
+			<p><button type="button" class="chk checkbox_true_part"></button>be checked; (only parent node) <span class="highlight_red">some of its child nodes or all have been not checked.</span> when mouse over: <button type="button" class="chk checkbox_true_part_focus"></button></p>
+		</div>
+	</div>
+	<h3>radio States Descriptions</h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p><button type="button" class="chk radio_false_full"></button>not checked; <span class="highlight_red">If node is parent, so its child have been not checked.</span> when mouse over: <button type="button" class="chk radio_false_full_focus"></button></p>
+			<p><button type="button" class="chk radio_false_part"></button>not checked; (only parent node) <span class="highlight_red">some of its child have been checked.</span> when mouse over: <button type="button" class="chk radio_false_part_focus"></button></p>
+			<p><button type="button" class="chk radio_true_full"></button>be checked; <span class="highlight_red">If node is parent, so its child have been not checked.</span> when mouse over: <button type="button" class="chk radio_true_full_focus"></button></p>
+			<p><button type="button" class="chk radio_true_part"></button>be checked; (only parent node) <span class="highlight_red">some of its child have been checked.</span> when mouse over: <button type="button" class="chk radio_true_part_focus"></button></p>
+		</div>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. use radio</h4>
+	<pre xmlns=""><code>var setting = {
+	check: {
+		enable: true,
+		chkStyle: "radio"
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.check.chkboxType.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.check.chkboxType.html
new file mode 100644
index 0000000..5cecc9e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.check.chkboxType.html
@@ -0,0 +1,31 @@
+<div class="apiDetail">
+<div>
+	<h2><span>JSON</span><span class="path">setting.check.</span>chkboxType</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.excheck</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>When one node is checked or unchecked, control its parent node and its child node auto checked or unchecked. It is valid when <span class="highlight_red">[setting.check.enable = true &amp; setting.check.chkStyle = "checkbox"]</span></p>
+			<p>Default: { "Y": "ps", "N": "ps" }</p>
+		</div>
+	</div>
+	<h3>JSON Format</h3>
+	<div class="desc">
+	<p>"Y" attribute use to set auto check after checkbox was checked.
+<br/>"N" attribute use to set auto uncheck after checkbox was unchecked.
+<br/>If value has "p", so parent nodes will be checked or unchecked.
+<br/>If value has "s", so child nodes will be checked or unchecked.</p>
+	<p class="highlight_red">Please note that letter case, do not change.</p>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. If check the node, so only auto check parent nodes; If uncheck the node, so only auto uncheck child nodes;</h4>
+	<pre xmlns=""><code>var setting = {
+	check: {
+		enable: true,
+		chkStyle: "checkbox",
+		chkboxType: { "Y": "p", "N": "s" }
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.check.enable.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.check.enable.html
new file mode 100644
index 0000000..0236b5f
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.check.enable.html
@@ -0,0 +1,26 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.check.</span>enable</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.excheck</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Set to use checkbox or radio in zTree</p>
+			<p>Default: false</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p> true means: use the checkbox or radio</p>
+	<p> false means: don't use the checkbox or radio</p>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. use the checkbox</h4>
+	<pre xmlns=""><code>var setting = {
+	check: {
+		enable: true
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.check.nocheckInherit.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.check.nocheckInherit.html
new file mode 100644
index 0000000..758b437
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.check.nocheckInherit.html
@@ -0,0 +1,28 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.check.</span>nocheckInherit</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.excheck</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>When the parent node's 'nocheck' attribute is true, set the child nodes automatically inherit the 'nocheck' attribute. It is valid when <span class="highlight_red">[setting.check.enable = true]</span></p>
+			<p class="highlight_red">1. Only be used to initialize the nodes, easy batch operations. Please use the 'updateNode' method modify existing node.</p>
+			<p>Default: false</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p> true means: When add new child nodes, if parent node's 'nocheck' attribute is true, the child nodes automatically inherit the 'nocheck' attribute.</p>
+	<p> false means: When add new child nodes, the child nodes don't inherit the 'nocheck' attribute from parent node.</p>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1.  When add new child nodes, the child nodes automatically inherit the 'nocheck' attribute from parent node.</h4>
+	<pre xmlns=""><code>var setting = {
+	check: {
+		enable: true,
+		nocheckInherit: true
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.check.radioType.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.check.radioType.html
new file mode 100644
index 0000000..be867d7
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.check.radioType.html
@@ -0,0 +1,29 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">setting.check.</span>radioType</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.excheck</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>The group about radio. It is valid when <span class="highlight_red">[setting.check.enable = true &amp; setting.check.chkStyle = "radio"]</span></p>
+			<p>Default: "level"</p>
+		</div>
+	</div>
+	<h3>String Format</h3>
+	<div class="desc">
+	<p>When radioType = "level", will be grouped with same level nodes which have the same parent node.
+<br/>When radioType = "all", will be grouped with all nodes.</p>
+	<p class="highlight_red">Please note that letter case, do not change.</p>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. Set the group about radio is all nodes.</h4>
+	<pre xmlns=""><code>var setting = {
+	check: {
+		enable: true,
+		chkStyle: "radio",
+		radioType: "all"
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.data.keep.leaf.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.data.keep.leaf.html
new file mode 100644
index 0000000..71c573e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.data.keep.leaf.html
@@ -0,0 +1,28 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.data.keep.</span>leaf</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>The leaf node's lock, the leaf node will lock the 'isParent' attribute to false.</p>
+			<p>Default: false</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p> true means: lock the leaf node, and <span class="highlight_red">the node which 'isParent' attribute is false can't add child nodes</span>.</p>
+	<p> false means: don't lock the leaf node, and <span class="highlight_red">the node which 'isParent' attribute is false can add child nodes</span>.</p>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. lock the leaf node</h4>
+	<pre xmlns=""><code>var setting = {
+	data: {
+		keep: {
+			leaf: true
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.data.keep.parent.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.data.keep.parent.html
new file mode 100644
index 0000000..5bab2f1
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.data.keep.parent.html
@@ -0,0 +1,28 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.data.keep.</span>parent</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>The parent node's lock, the parent node will lock 'isParent' attribute to true.</p>
+			<p>Default: false</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p> true means: lock the parent node, and <span class="highlight_red">if remove all of the parent node's child nodes, its 'isParent' attribute still keep to be true.</span>.</p>
+	<p> false means: don't lock the parent node, and <span class="highlight_red">if remove all of the parent node's child nodes, its 'isParent' attribute will change to be false.</span>.</p>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. lock the parent node</h4>
+	<pre xmlns=""><code>var setting = {
+	data: {
+		keep: {
+			parent: true
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.data.key.checked.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.data.key.checked.html
new file mode 100644
index 0000000..2678cf2
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.data.key.checked.html
@@ -0,0 +1,24 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">setting.data.key.</span>checked</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.excheck</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>The node data's attribute to save the checked state.</p>
+			<p>Default: "checked"</p>
+			<p class="highlight_red">Please don't set the other node attribute which zTree used. (e.g., checkedOld)</p>
+		</div>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. set the 'isChecked' attribute to save the checked state.</h4>
+	<pre xmlns=""><code>var setting = {
+	data: {
+		key: {
+			checked: "isChecked"
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.data.key.children.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.data.key.children.html
new file mode 100644
index 0000000..321a1a7
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.data.key.children.html
@@ -0,0 +1,23 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">setting.data.key.</span>children</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>The node data's attribute to save the child nodes.</p>
+			<p>Default: "children"</p>
+		</div>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. Set the 'nodes' attribute to save the child nodes.</h4>
+	<pre xmlns=""><code>var setting = {
+	data: {
+		key: {
+			children: "nodes"
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.data.key.name.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.data.key.name.html
new file mode 100644
index 0000000..0208c55
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.data.key.name.html
@@ -0,0 +1,23 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">setting.data.key.</span>name</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>The node data's attribute to save the node name.</p>
+			<p>Default: "name"</p>
+		</div>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. Set the 'ename' attribute to save the node name.</h4>
+	<pre xmlns=""><code>var setting = {
+	data: {
+		key: {
+			name: "ename"
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.data.key.title.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.data.key.title.html
new file mode 100644
index 0000000..96540eb
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.data.key.title.html
@@ -0,0 +1,24 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">setting.data.key.</span>title</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>The node data's attribute to save the 'title' attribute of node DOM. It is valid when <span class="highlight_red">[setting.view.showTitle = true]</span></p>
+			<p class="highlight_red">If set it to "", the title of node DOM will be same as 'setting.data.key.name' attribute.</p>
+			<p>Default: ""</p>
+		</div>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. Set the 'fullName' attribute to save the title of node DOM.</h4>
+	<pre xmlns=""><code>var setting = {
+	data: {
+		key: {
+			title: "fullName"
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.data.key.url.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.data.key.url.html
new file mode 100644
index 0000000..e9a08ce
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.data.key.url.html
@@ -0,0 +1,24 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">setting.data.key.</span>url</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>The node data's attribute to save the node link's url.</p>
+			<p class="highlight_red">Special: If the nodes's data can only use the 'url' attribute, and don't use the link to jump feature, you can modify this attribute to any nonexistent attribute.</p>
+			<p>Default: "url"</p>
+		</div>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. Set the 'xUrl' attribute to save the node link's url.</h4>
+	<pre xmlns=""><code>var setting = {
+	data: {
+		key: {
+			url: "xUrl"
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.data.simpleData.enable.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.data.simpleData.enable.html
new file mode 100644
index 0000000..7ea21db
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.data.simpleData.enable.html
@@ -0,0 +1,39 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.data.simpleData.</span>enable</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Set zTree's node to accept the simple data format, when zTree is initialized or when ajax get / or when use <span class="highlight_red">addNodes</span> method.</p>
+			<p>Don't have to generate the complex nested data.</p>
+			<p>Default: false</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p> true means: zTree's node accept the simple data format.</p>
+	<p> false means: zTree's node only accept the nested data format.</p>
+	<p class="highlight_red">If set it is true, you must set the other attributes in 'setting.data.simpleData'. (e.g., idKey, pIdKey, rootPId)  And let the data satisfy the parent-child relationship.</p>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. use the simple data format</h4>
+	<pre xmlns=""><code>var setting = {
+	data: {
+		simpleData: {
+			enable: true,
+			idKey: "id",
+			pIdKey: "pId",
+			rootPId: 0,
+		}
+	}
+};
+var treeNodes = [
+    {"id":1, "pId":0, "name":"test1"},
+    {"id":11, "pId":1, "name":"test11"},
+    {"id":12, "pId":1, "name":"test12"},
+    {"id":111, "pId":11, "name":"test111"}
+];
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.data.simpleData.idKey.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.data.simpleData.idKey.html
new file mode 100644
index 0000000..43df260
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.data.simpleData.idKey.html
@@ -0,0 +1,32 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">setting.data.simpleData.</span>idKey</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>The node data's attribute to save node data's unique identifier. It is valid when <span class="highlight_red">[setting.data.simpleData.enable = true]</span></p>
+			<p>Default: "id"</p>
+		</div>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. use the simple data format</h4>
+	<pre xmlns=""><code>var setting = {
+	data: {
+		simpleData: {
+			enable: true,
+			idKey: "id",
+			pIdKey: "pId",
+			rootPId: 0,
+		}
+	}
+};
+var treeNodes = [
+    {"id":1, "pId":0, "name":"test1"},
+    {"id":11, "pId":1, "name":"test11"},
+    {"id":12, "pId":1, "name":"test12"},
+    {"id":111, "pId":11, "name":"test111"}
+];
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.data.simpleData.pIdKey.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.data.simpleData.pIdKey.html
new file mode 100644
index 0000000..8378c6e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.data.simpleData.pIdKey.html
@@ -0,0 +1,32 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">setting.data.simpleData.</span>pIdKey</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>The node data's attribute to save its parent node data's unique identifier. It is valid when <span class="highlight_red">[setting.data.simpleData.enable = true]</span></p>
+			<p>Default: "pId"</p>
+		</div>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. use the simple data format</h4>
+	<pre xmlns=""><code>var setting = {
+	data: {
+		simpleData: {
+			enable: true,
+			idKey: "id",
+			pIdKey: "pId",
+			rootPId: 0
+		}
+	}
+};
+var treeNodes = [
+    {"id":1, "pId":0, "name":"test1"},
+    {"id":11, "pId":1, "name":"test11"},
+    {"id":12, "pId":1, "name":"test12"},
+    {"id":111, "pId":11, "name":"test111"}
+];
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.data.simpleData.rootPId.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.data.simpleData.rootPId.html
new file mode 100644
index 0000000..61c9bbd
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.data.simpleData.rootPId.html
@@ -0,0 +1,32 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String / Number</span><span class="path">setting.data.simpleData.</span>rootPId</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Set the default value of root's 'pIdKey' specified attribute values​​. It is valid when <span class="highlight_red">[setting.data.simpleData.enable = true]</span></p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. use the simple data format</h4>
+	<pre xmlns=""><code>var setting = {
+	data: {
+		simpleData: {
+			enable: true,
+			idKey: "id",
+			pIdKey: "pId",
+			rootPId: 0
+		}
+	}
+};
+var treeNodes = [
+    {"id":1, "pId":0, "name":"test1"},
+    {"id":11, "pId":1, "name":"test11"},
+    {"id":12, "pId":1, "name":"test12"},
+    {"id":111, "pId":11, "name":"test111"}
+];
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.edit.drag.autoExpandTrigger.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.edit.drag.autoExpandTrigger.html
new file mode 100644
index 0000000..804ee66
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.edit.drag.autoExpandTrigger.html
@@ -0,0 +1,29 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.edit.drag.</span>autoExpandTrigger</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>When drag node cause the parent node is automatically expanded, set whether to allow to trigger the 'onExpand' callback. It is valid when <span class="highlight_red">[setting.edit.enable = true]</span></p>
+			<p>Default: false</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p> true means: trigger the 'onExpand' callback.</p>
+	<p> false means: don't trigger the 'onExpand' callback.</p>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. Set to allow to trigger the 'onExpand' callback</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true,
+		drag: {
+			autoExpandTrigger: true
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.edit.drag.autoOpenTime.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.edit.drag.autoOpenTime.html
new file mode 100644
index 0000000..74982af
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.edit.drag.autoOpenTime.html
@@ -0,0 +1,25 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Number</span><span class="path">setting.edit.drag.</span>autoOpenTime</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Drag to the parent node, the parent node auto expand time interval. (Unit: ms) It is valid when <span class="highlight_red">[setting.edit.enable = true]</span></p>
+			<p>Default: 500</p>
+			<p class="highlight_red">Please adjust the value according to needs.</p>
+		</div>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. When drag node to other parent node, expand it at once.</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true,
+		drag: {
+			autoOpenTime: 0
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.edit.drag.borderMax.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.edit.drag.borderMax.html
new file mode 100644
index 0000000..edbb752
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.edit.drag.borderMax.html
@@ -0,0 +1,25 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Number</span><span class="path">setting.edit.drag.</span>borderMax</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>When drag a node to root, the zTree's inner border width. (Unit: px) It is valid when <span class="highlight_red">[setting.edit.enable = true]</span></p>
+			<p>Default: 10</p>
+			<p class="highlight_red">Please adjust the value according to needs.</p>
+		</div>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. adjust the inner border width is 20px</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true,
+		drag: {
+			borderMax: 20
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.edit.drag.borderMin.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.edit.drag.borderMin.html
new file mode 100644
index 0000000..e845853
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.edit.drag.borderMin.html
@@ -0,0 +1,25 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Number</span><span class="path">setting.edit.drag.</span>borderMin</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>When drag a node to root, the zTree's outer border width. (Unit: px) It is valid when <span class="highlight_red">[setting.edit.enable = true]</span></p>
+			<p>Default: -5</p>
+			<p class="highlight_red">Please adjust the value according to needs.</p>
+		</div>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. adjust the outer border width is 10px</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true,
+		drag: {
+			borderMin: -10
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.edit.drag.inner.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.edit.drag.inner.html
new file mode 100644
index 0000000..1065df3
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.edit.drag.inner.html
@@ -0,0 +1,60 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean / Function(treeId, treeNodes, targetNode)</span><span class="path">setting.edit.drag.</span>inner</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>When drag one node to the target node, set whether to allow the node to be the target node's child. It is valid when <span class="highlight_red">[setting.edit.enable = true]</span></p>
+			<p class="highlight_red">If the target node is root, so zTree will only trigger 'inner' and not trigger 'prev / next'.</p>
+			<p class="highlight_red">This function mainly for the appropriate limit drag and drop (auxiliary arrow), it requires a combination of 'prev, next' together, to achieve full functionality.</p>
+			<p>Default: true</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p> true means: allow the node to be the target node's child.</p>
+	<p> false means: don't allow the node to be the target node's child.</p>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNodes</b><span>Array(JSON)</span></h4>
+	<p>A collection of the nodes which has been dragged</p>
+	<h4 class="topLine"><b>targetNode</b><span>JSON</span></h4>
+	<p>JSON data object of the target node which treeNodes are draged over.</p>
+	<p class="highlight_red">If the treeNodes will be root node, the targetNode = null</p>
+	<h4 class="topLine"><b>Return </b><span>Boolean</span></h4>
+	<p>return true or false</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. disable to drag the node to the target node's inner.</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true,
+		drag: {
+			prev: true,
+			next: true,
+			inner: false
+		}
+	}
+};
+......</code></pre>
+	<h4>2. disable to drag the node to be root node's child.</h4>
+	<pre xmlns=""><code>function canInner(treeId, nodes, targetNode) {
+	return !(targetNode && targetNode.level === 0);
+}
+var setting = {
+	edit: {
+		enable: true,
+		drag: {
+			prev: true,
+			next: true,
+			inner: canInner
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.edit.drag.isCopy.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.edit.drag.isCopy.html
new file mode 100644
index 0000000..df39a8a
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.edit.drag.isCopy.html
@@ -0,0 +1,32 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.edit.drag.</span>isCopy</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>When drag-drop node, set whether to allow to copy node. It is valid when <span class="highlight_red">[setting.edit.enable = true]</span></p>
+			<p>Default: true</p>
+		</div>
+	</div>
+	<h3>Rules Description</h3>
+	<div class="desc">
+	<p>1. If isCopy = true and isMove = true, when drag-drop node, press Ctrl-Key can copy node, don't press Ctrl-Key can move node.</p>
+	<p>2. If isCopy = true and isMove = false, when drag-drop node, will copy node.</p>
+	<p>3. If isCopy = false and isMove = true, when drag-drop node, will move node.</p>
+	<p>4. If isCopy = false and isMove = false, so disable to drag-drop node.</p>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. all of the drag-drop operation will copy node.</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true,
+		drag: {
+			isCopy: true,
+			isMove: false
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.edit.drag.isMove.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.edit.drag.isMove.html
new file mode 100644
index 0000000..78cd8d3
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.edit.drag.isMove.html
@@ -0,0 +1,32 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.edit.drag.</span>isMove</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>When drag-drop node, set whether to allow to move node. It is valid when <span class="highlight_red">[setting.edit.enable = true]</span></p>
+			<p>Default: true</p>
+		</div>
+	</div>
+	<h3>Rules Description</h3>
+	<div class="desc">
+	<p>1. If isCopy = true and isMove = true, when drag-drop node, press Ctrl-Key can copy node, don't press Ctrl-Key can move node.</p>
+	<p>2. If isCopy = true and isMove = false, when drag-drop node, will copy node.</p>
+	<p>3. If isCopy = false and isMove = true, when drag-drop node, will move node.</p>
+	<p>4. If isCopy = false and isMove = false, so disable to drag-drop node.</p>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. all of the drag-drop operation will move node.</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true,
+		drag: {
+			isCopy: false,
+			isMove: true
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.edit.drag.maxShowNodeNum.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.edit.drag.maxShowNodeNum.html
new file mode 100644
index 0000000..dbc3ae4
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.edit.drag.maxShowNodeNum.html
@@ -0,0 +1,25 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Number</span><span class="path">setting.edit.drag.</span>maxShowNodeNum</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>When dragging more than one sibling node, the floating layer shows the maximum number of nodes. zTree using '...' instead of redundant nodes. It is valid when <span class="highlight_red">[setting.edit.enable = true]</span></p>
+			<p>Default: 5</p>
+			<p class="highlight_red">Please adjust the value according to needs.</p>
+		</div>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. Set the maximum number is 10</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true,
+		drag: {
+			maxShowNodeNum: 10
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.edit.drag.minMoveSize.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.edit.drag.minMoveSize.html
new file mode 100644
index 0000000..8270a99
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.edit.drag.minMoveSize.html
@@ -0,0 +1,25 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Number</span><span class="path">setting.edit.drag.</span>minMoveSize</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>The minimum offset which used to determine the drag operator start. (Unit: px) It is valid when <span class="highlight_red">[setting.edit.enable = true]</span></p>
+			<p class="highlight_red">Please adjust the value according to needs. Note: If it is too small, will easily lead to misoperation when you click mouse.</p>
+			<p>Default: 5</p>
+		</div>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. Set the minimum offset is 10px.</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true,
+		drag: {
+			minMoveSize: 10
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.edit.drag.next.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.edit.drag.next.html
new file mode 100644
index 0000000..82eb6fb
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.edit.drag.next.html
@@ -0,0 +1,59 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean / Function(treeId, treeNodes, targetNode)</span><span class="path">setting.edit.drag.</span>next</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>When drag one node to the target node, set whether to allow the node to be the target node's next sibling. It is valid when <span class="highlight_red">[setting.edit.enable = true]</span></p>
+			<p class="highlight_red">If the target node is root, so zTree will only trigger 'inner' and not trigger 'prev / next'.</p>
+			<p class="highlight_red">This function mainly for the appropriate limit drag and drop (auxiliary arrow), it requires a combination of 'prev, inner' together, to achieve full functionality.</p>
+			<p>Default: true</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p> true means: allow the node to be the target node's next sibling.</p>
+	<p> false means: don't allow the node to be the target node's next sibling.</p>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNodes</b><span>Array(JSON)</span></h4>
+	<p>A collection of the nodes which has been dragged</p>
+	<h4 class="topLine"><b>targetNode</b><span>JSON</span></h4>
+	<p>JSON data object of the target node which treeNodes are draged over.</p>
+	<h4 class="topLine"><b>Return </b><span>Boolean</span></h4>
+	<p>return true or false</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. disable to drag the node to the target node's next sibling.</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true,
+		drag: {
+			prev: true,
+			next: false,
+			inner: true
+		}
+	}
+};
+......</code></pre>
+	<h4>2. disable to drag the node to be all of the parent nodes's next sibling.</h4>
+	<pre xmlns=""><code>function canNext(treeId, nodes, targetNode) {
+	return !targetNode.isParent;
+}
+var setting = {
+	edit: {
+		enable: true,
+		drag: {
+			prev: true,
+			next: canNext,
+			inner: true
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.edit.drag.prev.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.edit.drag.prev.html
new file mode 100644
index 0000000..de6f0c8
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.edit.drag.prev.html
@@ -0,0 +1,59 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean / Function(treeId, treeNodes, targetNode)</span><span class="path">setting.edit.drag.</span>prev</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>When drag one node to the target node, set whether to allow the node to be the target node's previous sibling. It is valid when <span class="highlight_red">[setting.edit.enable = true]</span></p>
+			<p class="highlight_red">If the target node is root, so zTree will only trigger 'inner' and not trigger 'prev / next'.</p>
+			<p class="highlight_red">This function mainly for the appropriate limit drag and drop (auxiliary arrow), it requires a combination of 'next, inner' together, to achieve full functionality.</p>
+			<p>Default: true</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p> true means: allow the node to be the target node's previous sibling.</p>
+	<p> false means: don't allow the node to be the target node's previous sibling.</p>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNodes</b><span>Array(JSON)</span></h4>
+	<p>A collection of the nodes which has been dragged</p>
+	<h4 class="topLine"><b>targetNode</b><span>JSON</span></h4>
+	<p>JSON data object of the target node which treeNodes are draged over.</p>
+	<h4 class="topLine"><b>Return </b><span>Boolean</span></h4>
+	<p>return true or false</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. disable to drag the node to the target node's previous sibling.</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true,
+		drag: {
+			prev: false,
+			next: true,
+			inner: true
+		}
+	}
+};
+......</code></pre>
+	<h4>2. disable to drag the node to be all of the parent nodes's previous sibling.</h4>
+	<pre xmlns=""><code>function canPrev(treeId, nodes, targetNode) {
+	return !targetNode.isParent;
+}
+var setting = {
+	edit: {
+		enable: true,
+		drag: {
+			prev: canPrev,
+			next: true,
+			inner: true
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.edit.editNameSelectAll.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.edit.editNameSelectAll.html
new file mode 100644
index 0000000..a030359
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.edit.editNameSelectAll.html
@@ -0,0 +1,27 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.edit.</span>editNameSelectAll</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>When edit node's name, the text in input is selected or unselected. It is valid when <span class="highlight_red">[setting.edit.enable = true]</span></p>
+			<p>Default: false</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p> true means: when show the input, the text in input is selected</p>
+	<p> false means: when show the input, the text in input is not selected</p>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. When edit node's name, the text in input is selected.</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true,
+		editNameSelectAll: true
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.edit.enable.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.edit.enable.html
new file mode 100644
index 0000000..ec9d2b3
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.edit.enable.html
@@ -0,0 +1,39 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.edit.</span>enable</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Set zTree is in edit mode</p>
+			<p class="highlight_red">Please set this attribute before zTree initialization. If you need to change the edit mode after the initialization, please use zTreeObj.setEditable() method.</p>
+			<p>Default: false</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p> true means: zTree is in edit mode.</p>
+	<p> false means: zTree is not in edit mode.</p>
+	</div>
+	<h3>Editing Rules Description</h3>
+	<div class="desc">
+	<p>1. When click the node, it will not open '<span class="highlight_red">node.url</span>' specified URL.
+<br/>2. Support for dynamic tree editing.
+<br/>3. You can drag-drop nodes, and support drag-drop nodes between multiple trees.
+<br/>4. Support use drag-drop to copy or move the node. (Reference: <span class="highlight_red">setting.edit.drag.isCopy / setting.edit.drag.isMove</span>)
+<br/>5. You can use the Edit button to modify the name attribute.
+<br/>6. You can use the Remove button to remove the node.
+<br/>
+	</p>
+	<p class="highlight_red">Please note that letter case, do not change.</p>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. edit the tree</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.edit.removeTitle.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.edit.removeTitle.html
new file mode 100644
index 0000000..e217527
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.edit.removeTitle.html
@@ -0,0 +1,48 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String / Function(treeId, treeNode)</span><span class="path">setting.edit.</span>removeTitle</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>the title of the remove button DOM. It is valid when <span class="highlight_red">[setting.edit.enable = true & setting.edit.showRemoveBtn = true]</span></p>
+			<p>Default: "remove"</p>
+		</div>
+	</div>
+	<h3>String Format</h3>
+	<div class="desc">
+	<p>When the mouse over the remove button, the browser auto pop-up message content.</p>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which show the remove button</p>
+	<h4 class="topLine"><b>Return </b><span>String</span></h4>
+	<p>Return value is same as 'String Format'</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. Set title is 'remove the node' about all the remove button</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true,
+		showRemoveBtn: true,
+		removeTitle: "remove the node"
+	}
+};
+......</code></pre>
+	<h4>2. Set title is 'remove the parent node' about the parent node, and is 'remove the leaf node' about the leaf node</h4>
+	<pre xmlns=""><code>function setRemoveTitle(treeId, treeNode) {
+	return treeNode.isParent ? "remove the parent node":"remove the leaf node";
+}
+var setting = {
+	edit: {
+		enable: true,
+		showRemoveBtn: true,
+		removeTitle: setRemoveTitle
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.edit.renameTitle.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.edit.renameTitle.html
new file mode 100644
index 0000000..b8ce5a6
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.edit.renameTitle.html
@@ -0,0 +1,48 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String / Function(treeId, treeNode)</span><span class="path">setting.edit.</span>renameTitle</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>the title of the rename button DOM. It is valid when <span class="highlight_red">[setting.edit.enable = true & setting.edit.showRenameBtn = true]</span></p>
+			<p>Default: "rename"</p>
+		</div>
+	</div>
+	<h3>String Format</h3>
+	<div class="desc">
+	<p>When the mouse over the rename button, the browser auto pop-up message content.</p>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which show the rename button</p>
+	<h4 class="topLine"><b>Return </b><span>String</span></h4>
+	<p>return value is same as 'String Format'</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. Set title is 'rename the node' about all the rename button</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true,
+		showRenameBtn: true,
+		renameTitle: "rename the node"
+	}
+};
+......</code></pre>
+	<h4>2. Set title is 'rename the parent node' about the parent node, and is 'rename the leaf node' about the leaf node</h4>
+	<pre xmlns=""><code>function setRenameTitle(treeId, treeNode) {
+	return treeNode.isParent ? "rename the parent node":"rename the leaf node";
+}
+var setting = {
+	edit: {
+		enable: true,
+		showRenameBtn: true,
+		renameTitle: setRenameTitle
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.edit.showRemoveBtn.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.edit.showRemoveBtn.html
new file mode 100644
index 0000000..f0f1fe1
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.edit.showRemoveBtn.html
@@ -0,0 +1,50 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean / Function(treeId, treeNode)</span><span class="path">setting.edit.</span>showRemoveBtn</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Set to show or hide the remove button. It is valid when <span class="highlight_red">[setting.edit.enable = true]</span></p>
+			<p>When you click the remove button:</p>
+			<p>1. zTree will trigger the <span class="highlight_red">setting.callback.beforeRemove</span> callback, and you can decide whether to allow delete.</p>
+			<p>2. If you don't set the 'beforeRemove' or  the 'beforeRemove' callback return true, so zTree will trigger the <span class="highlight_red">setting.callback.onRemove</span> callback after remove the node.</p>
+			<p>Default: true</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p> true means: show the remove button</p>
+	<p> false means: hide the remove button</p>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which show the remove button</p>
+	<h4 class="topLine"><b>Return </b><span>Boolean</span></h4>
+	<p>Return value is same as 'Boolean Format'</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. Hide the remove button</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true,
+		showRemoveBtn: false
+	}
+};
+......</code></pre>
+	<h4>2. Hide the remove button of parent node</h4>
+	<pre xmlns=""><code>function setRemoveBtn(treeId, treeNode) {
+	return !treeNode.isParent;
+}
+var setting = {
+	edit: {
+		enable: true,
+		showRemoveBtn: setRemoveBtn
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.edit.showRenameBtn.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.edit.showRenameBtn.html
new file mode 100644
index 0000000..4fe2f58
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.edit.showRenameBtn.html
@@ -0,0 +1,52 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean / Function(treeId, treeNode)</span><span class="path">setting.edit.</span>showRenameBtn</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Set to show or hide the rename button. It is valid when <span class="highlight_red">[setting.edit.enable = true]</span></p>
+			<p>When you click the rename button:</p>
+			<p>1. Click the rename button, you can rename the node.</p>
+			<p>2. After rename operation (the input DOM blur or press the Enter Key), zTree will trigger the <span class="highlight_red">setting.callback.beforeRename</span> callback, and you can decide whether to allow rename.</p>
+			<p>3. If the 'beforeRename' callback return false, so zTree will keep the edit status. (Press the ESC key, can be restored to the original state.</p>
+			<p>4. If you don't set the 'beforeRename' or  the 'beforeRename' callback return true, so zTree will trigger the <span class="highlight_red">setting.callback.onRename</span> callback after rename the node.</p>
+			<p>Default: true</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p> true means: show the rename button</p>
+	<p> false means: hide the rename button</p>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which show the rename button</p>
+	<h4 class="topLine"><b>Return </b><span>Boolean</span></h4>
+	<p>Return value is same as 'Boolean Format'</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. Hide the rename button</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true,
+		showRenameBtn: false
+	}
+};
+......</code></pre>
+	<h4>2. Hide the rename button of parent node</h4>
+	<pre xmlns=""><code>function setRenameBtn(treeId, treeNode) {
+	return !treeNode.isParent;
+}
+var setting = {
+	edit: {
+		enable: true,
+		showRenameBtn: setRenameBtn
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.treeId.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.treeId.html
new file mode 100644
index 0000000..e4b04b3
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.treeId.html
@@ -0,0 +1,14 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">setting.</span>treeId</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>zTree unique identifier. After the initialization, it equals to the id attribute value of the user-defined zTree container.</p>
+			<p class="highlight_red">Do not initialize or modify it, it is an internal argument.</p>
+		</div>
+	</div>
+
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.treeObj.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.treeObj.html
new file mode 100644
index 0000000..30eb66c
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.treeObj.html
@@ -0,0 +1,14 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Object</span><span class="path">setting.</span>treeObj</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>zTree DOM's jQuery object, the main function: easy to internal operations.</p>
+			<p class="highlight_red">Do not initialize or modify it, it is an internal argument.</p>
+		</div>
+	</div>
+
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.view.addDiyDom.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.view.addDiyDom.html
new file mode 100644
index 0000000..fa22bef
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.view.addDiyDom.html
@@ -0,0 +1,40 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNode)</span><span class="path">setting.view.</span>addDiyDom</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>This function used to display the custom control on the node.</p>
+			<p class="highlight_red">1. If you have huge node data, please note: this function will affect the initialization performance. If not required, it is recommended not to use this function.</p>
+			<p class="highlight_red">2. This function is an advanced application, please make sure that a better understanding of zTree before you use it.</p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which display the custom control.</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. Display button in all nodes.</h4>
+	<pre xmlns=""><code>var setting = {
+	view: {
+		addDiyDom: addDiyDom
+	}
+};
+function addDiyDom(treeId, treeNode) {
+	var aObj = $("#" + treeNode.tId + "_a");
+	if ($("#diyBtn_"+treeNode.id).length>0) return;
+	var editStr = "&lt;span id='diyBtn_space_" +treeNode.id+ "' &gt; &lt;/span&gt;"
+		+ "&lt;button type='button' class='diyBtn1' id='diyBtn_" + treeNode.id
+		+ "' title='"+treeNode.name+"' onfocus='this.blur();'&gt;&lt;/button&gt;";
+	aObj.append(editStr);
+	var btn = $("#diyBtn_"+treeNode.id);
+	if (btn) btn.bind("click", function(){alert("diy Button for " + treeNode.name);});
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.view.addHoverDom.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.view.addHoverDom.html
new file mode 100644
index 0000000..1ea8b6d
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.view.addHoverDom.html
@@ -0,0 +1,45 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNode)</span><span class="path">setting.view.</span>addHoverDom</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to display custom control when mouse move over the node. (e.g. the rename and remove button)</p>
+			<p class="highlight_red">If you use this function, so must set <span class="highlight_red">setting.view.removeHoverDom</span>, please make sure that a better understanding of zTree before you use it.</p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which need to display the custom control.</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. Display a button when mouse move over the node, and hide the button when mouse move out.</h4>
+	<pre xmlns=""><code>var setting = {
+	view: {
+		addHoverDom: addHoverDom,
+		removeHoverDom: removeHoverDom,
+		......
+	}
+};
+function addHoverDom(treeId, treeNode) {
+	var aObj = $("#" + treeNode.tId + "_a");
+	if ($("#diyBtn_"+treeNode.id).length>0) return;
+	var editStr = "&lt;span id='diyBtn_space_" +treeNode.id+ "' &gt;&nbsp;&lt;/span&gt;"
+		+ "&lt;button type='button' class='diyBtn1' id='diyBtn_" + treeNode.id
+		+ "' title='"+treeNode.name+"' onfocus='this.blur();'&gt;&lt;/button&gt;";
+	aObj.append(editStr);
+	var btn = $("#diyBtn_"+treeNode.id);
+	if (btn) btn.bind("click", function(){alert("diy Button for " + treeNode.name);});
+};
+function removeHoverDom(treeId, treeNode) {
+	$("#diyBtn_"+treeNode.id).unbind().remove();
+	$("#diyBtn_space_" +treeNode.id).unbind().remove();
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.view.autoCancelSelected.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.view.autoCancelSelected.html
new file mode 100644
index 0000000..8cc2fbb
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.view.autoCancelSelected.html
@@ -0,0 +1,27 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.view.</span>autoCancelSelected</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>When click the selected node while pressing the Ctrl key, allow to cancel selected the node.</p>
+			<p class="highlight_red">If you don't need this function, please set to false.</p>
+			<p>Default: true</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p> true means: press the Ctrl key, can cancel selected node.</p>
+	<p> false means: press the Ctrl key, can't cancel selected node.</p>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. Press the Ctrl key, can't cancel selected node.</h4>
+	<pre xmlns=""><code>var setting = {
+	view: {
+		autoCancelSelected: false
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.view.dblClickExpand.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.view.dblClickExpand.html
new file mode 100644
index 0000000..2517624
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.view.dblClickExpand.html
@@ -0,0 +1,45 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean / Function(treeId, treeNode)</span><span class="path">setting.view.</span>dblClickExpand</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>When double-click the parent node, 'dblClickExpand' is used to decide whether to expand the parent node.</p>
+			<p>Default: true</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p> true means: When double-click the parent node, zTree will expand the parent node.</p>
+	<p> false means: When double-click the parent node, zTree will not expand the parent node.</p>
+	</div>
+	<h3>Function Pamameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which be double-clicked.</p>
+	<h4 class="topLine"><b>Return </b><span>Boolean</span></h4>
+	<p>Return value is same as 'Boolean Format'</p>
+	</div>
+	<h3>Example of setting</h3>
+	<h4>1. When double-click the parent node, zTree will not expand the parent node.</h4>
+	<pre xmlns=""><code>var setting = {
+	view: {
+		dblClickExpand: false
+	}
+};
+......</code></pre>
+	<h4>2. When double-click the parent node, zTree will expand the parent node which level>0.</h4>
+	<pre xmlns=""><code>function dblClickExpand(treeId, treeNode) {
+	return treeNode.level > 0;
+};
+var setting = {
+	view: {
+		dblClickExpand: dblClickExpand
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.view.expandSpeed.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.view.expandSpeed.html
new file mode 100644
index 0000000..1911e74
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.view.expandSpeed.html
@@ -0,0 +1,31 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String / Number</span><span class="path">setting.view.</span>expandSpeed</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>The animation speed of expand or collapse node. As same as 'speed' parameter in jQuery</p>
+			<p class="highlight_red">In order to ensure zTree operating speed,  if use the IE6,  zTree will not use animation.</p>
+			<p>Default: "fast"</p>
+		</div>
+	</div>
+	<h3>String Format</h3>
+	<div class="desc">
+	<p>e.g. "slow", "normal", or "fast"</p>
+	<p class="highlight_red">If set to "", zTree will not use animation.</p>
+	</div>
+	<h3>Number Format</h3>
+	<div class="desc">
+	<p>How long the animation will run. [Unit: ms] (e.g. 1000)</p>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. Set the animation speed to slow</h4>
+	<pre xmlns=""><code>var setting = {
+	view: {
+		expandSpeed: "slow"
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.view.fontCss.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.view.fontCss.html
new file mode 100644
index 0000000..1ad5f51
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.view.fontCss.html
@@ -0,0 +1,42 @@
+<div class="apiDetail">
+<div>
+	<h2><span>JSON / Function(treeId, treeNode)</span><span class="path">setting.view.</span>fontCss</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Personalized text style, only applies to &lt;A&gt; object in the node DOM</p>
+			<p>Default: {}</p>
+		</div>
+	</div>
+	<h3>JSON Format</h3>
+	<div class="desc">
+	<p>As same as .css() method in jQuery. e.g. <span class="highlight_red">{color:"#ff0011", background:"blue"}</span></p>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which use the personalized text style</p>
+	<h4 class="topLine"><b>Return </b><span>JSON</span></h4>
+	<p>Return value is same as 'JSON Format'. e.g. <span class="highlight_red">{color:"#ff0011", background:"blue"}</span></p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. Don't modify css file, and set the node name's color to red</h4>
+	<pre xmlns=""><code>var setting = {
+	view: {
+		fontCss : {color:"red"}
+	}
+};</code></pre>
+	<h4>2. Don't modify css file, and set the root node name's color to red</h4>
+	<pre xmlns=""><code>function setFontCss(treeId, treeNode) {
+	return treeNode.level == 0 ? {color:"red"} : {};
+};
+var setting = {
+	view: {
+		fontCss: setFontCss
+	}
+};</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.view.nameIsHTML.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.view.nameIsHTML.html
new file mode 100644
index 0000000..4fe19ad
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.view.nameIsHTML.html
@@ -0,0 +1,28 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.view.</span>nameIsHTML</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Set to use HTML in 'name' attribute.</p>
+			<p class="highlight_red">If allow HTML, please do check to avoid security issues, e.g. JavaScript Injection...</p>
+			<p>Default: false</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p> true means: 'name' attribute can be HTML.</p>
+	<p> false means: 'name' attribute is only TEXT.</p>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. Set to allow HTML</h4>
+	<pre xmlns=""><code>var setting = {
+	view: {
+		nameIsHTML: true
+	}
+};
+var node = {"name":"&lt;font color='red'&gt;test&lt;/font&gt;"};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.view.removeHoverDom.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.view.removeHoverDom.html
new file mode 100644
index 0000000..0c70aff
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.view.removeHoverDom.html
@@ -0,0 +1,45 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNode)</span><span class="path">setting.view.</span>removeHoverDom</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to hide custom control when mouse move out the node. (e.g. the rename and remove button)</p>
+			<p class="highlight_red">If you use this function, so must set <span class="highlight_red">setting.view.addHoverDom</span>, please make sure that a better understanding of zTree before you use it.</p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which need to hide the custom control.</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. Display a button when mouse move over the node, and hide the button when mouse move out.</h4>
+	<pre xmlns=""><code>var setting = {
+	view: {
+		addHoverDom: addHoverDom,
+		removeHoverDom: removeHoverDom,
+		......
+	}
+};
+function addHoverDom(treeId, treeNode) {
+	var aObj = $("#" + treeNode.tId + "_a");
+	if ($("#diyBtn_"+treeNode.id).length>0) return;
+	var editStr = "&lt;span id='diyBtn_space_" +treeNode.id+ "' &gt;&nbsp;&lt;/span&gt;"
+		+ "&lt;button type='button' class='diyBtn1' id='diyBtn_" + treeNode.id
+		+ "' title='"+treeNode.name+"' onfocus='this.blur();'&gt;&lt;/button&gt;";
+	aObj.append(editStr);
+	var btn = $("#diyBtn_"+treeNode.id);
+	if (btn) btn.bind("click", function(){alert("diy Button for " + treeNode.name);});
+};
+function removeHoverDom(treeId, treeNode) {
+	$("#diyBtn_"+treeNode.id).unbind().remove();
+	$("#diyBtn_space_" +treeNode.id).unbind().remove();
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.view.selectedMulti.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.view.selectedMulti.html
new file mode 100644
index 0000000..ffa129d
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.view.selectedMulti.html
@@ -0,0 +1,28 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.view.</span>selectedMulti</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Set whether to allow select multiple nodes.</p>
+			<p>Default: true</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p> true mean: you can select multiple nodes.</p>
+	<p> false mean: you can only select one node.</p>
+	<p class="highlight_red">1. Press Ctrl key, you can select multiple nodes.</p>
+	<p class="highlight_red">2、This attribute don't affect the feature of cancel select node. ( please see setting.view.autoCancelSelected )</p>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. Only select one node.</h4>
+	<pre xmlns=""><code>var setting = {
+	view: {
+		selectedMulti: false
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.view.showIcon.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.view.showIcon.html
new file mode 100644
index 0000000..9adf003
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.view.showIcon.html
@@ -0,0 +1,45 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean / Function(treeId, treeNode)</span><span class="path">setting.view.</span>showIcon</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Set to show or hide node icon.</p>
+			<p>Default: true</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p> true means: show node icon.</p>
+	<p> false means: hide node icon.</p>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which need to show icon.</p>
+	<h4 class="topLine"><b>Return </b><span>Boolean</span></h4>
+	<p>Return value is same as 'Boolean Format'</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. Hide node icon</h4>
+	<pre xmlns=""><code>var setting = {
+	view: {
+		showIcon: false
+	}
+};
+......</code></pre>
+	<h4>2. Hide node icon which level=2</h4>
+	<pre xmlns=""><code>function showIconForTree(treeId, treeNode) {
+	return treeNode.level != 2;
+};
+var setting = {
+	view: {
+		showIcon: showIconForTree
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.view.showLine.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.view.showLine.html
new file mode 100644
index 0000000..a554014
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.view.showLine.html
@@ -0,0 +1,26 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.view.</span>showLine</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Set to show or hide line.</p>
+			<p>Default: true</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p> true means: show line.</p>
+	<p> false means: hide line.</p>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. Hide line</h4>
+	<pre xmlns=""><code>var setting = {
+	view: {
+		showLine: false
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.view.showTitle.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.view.showTitle.html
new file mode 100644
index 0000000..66bb26e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.view.showTitle.html
@@ -0,0 +1,47 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean / Function(treeId, treeNode)</span><span class="path">setting.view.</span>showTitle</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Set to show or hide the 'title' attribute of node DOM.</p>
+			<p class="highlight_red">Please see the <span class="highlight_red">setting.data.key.title</span> attribute</p>
+			<p>Default: true</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p> true means: show the 'title' attribute of node DOM.</p>
+	<p> false means: hide the 'title' attribute of node DOM.</p>
+	<p class="highlight_red">When setting.view.showTitle = true & setting.data.key.title = '', zTree will set the 'setting.data.key.name' attribute to the 'setting.data.key.title'.</p>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which need to show title.</p>
+	<h4 class="topLine"><b>Return </b><span>Boolean</span></h4>
+	<p>Return value is same as 'Boolean Format'</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. Hide the 'title' attribute of node DOM.</h4>
+	<pre xmlns=""><code>var setting = {
+	view: {
+		showTitle: false
+	}
+};
+......</code></pre>
+	<h4>2. Hide the 'title' attribute of node DOM which level=2.</h4>
+	<pre xmlns=""><code>function showTitleForTree(treeId, treeNode) {
+	return treeNode.level != 2;
+};
+var setting = {
+	view: {
+		showTitle: showTitleForTree
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.view.txtSelectedEnable.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.view.txtSelectedEnable.html
new file mode 100644
index 0000000..a380930
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/setting.view.txtSelectedEnable.html
@@ -0,0 +1,26 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.view.</span>txtSelectedEnable</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Set to allow or don't allow to select the text which in zTree's DOM.</p>
+			<p>Default: false</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p> true means: Allow to select the txt which in zTree's DOM.</p>
+	<p> false means: Don't allow to select the txt which in zTree's DOM.</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. Allow to select the txt which in zTree's DOM.</h4>
+	<pre xmlns=""><code>var setting = {
+	view: {
+		txtSelectedEnable: true
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.check_Child_State.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.check_Child_State.html
new file mode 100644
index 0000000..48efb79
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.check_Child_State.html
@@ -0,0 +1,43 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Number</span><span class="path">treeNode.</span>check_Child_State</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.excheck</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to record the node's half-checked state about its all child nodes's checkbox or radio. It is valid when <span class="highlight_red">[setting.check.enable = true]</span></p>
+			<p class="highlight_red">zTree v3.x provides treeNode.getCheckStatus () method to get an accurate the half-checked status.</p>
+			<p class="highlight_red">Do not initialize or modify it, it is an internal argument.</p>
+			<p>Default: true</p>
+		</div>
+	</div>
+	<h3>Number Format</h3>
+	<div class="desc">
+	<p>Rules:</p>
+	<table width="100%" border="0" cellspacing="1" cellpadding="0">
+		<thead>
+			<tr><td colspan="4">setting.check.checkType = "checkbox"</td></tr>
+			<tr><td>treeNode.check_Child_State</td><td>Checked Status Description</td></tr>
+		</thead>
+		<tbody>
+			<tr><td>-1</td><td>Has no child nodes or all child nodes's 'nocheck' attribute is true.</td></tr>
+			<tr><td>0</td><td>All of the child nodes has not been checked.</td></tr>
+			<tr><td>1</td><td>Some of the child nodes has been checked.</td></tr>
+			<tr><td>2</td><td>All of the child nodes has been checked.</td></tr>
+		</tbody>
+	</table>
+	<br/>
+	<table width="100%" border="0" cellspacing="1" cellpadding="0">
+		<thead>
+			<tr><td colspan="4">setting.check.checkType = "radio"</td></tr>
+			<tr><td>treeNode.check_Child_State</td><td>Checked Status Description</td></tr>
+		</thead>
+		<tbody>
+			<tr><td>-1</td><td>Has no child nodes or all child nodes's 'nocheck' attribute is true.</td></tr>
+			<tr><td>0</td><td>All of the child nodes has not been checked.</td></tr>
+			<tr><td>2</td><td>Some of the child nodes has been checked.</td></tr>
+		</tbody>
+	</table>
+	</div>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.check_Focus.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.check_Focus.html
new file mode 100644
index 0000000..77b7359
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.check_Focus.html
@@ -0,0 +1,19 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">treeNode.</span>check_Focus</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.excheck</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to record the status which the checkbox or radio get focus. It is valid when <span class="highlight_red">[setting.check.enable = true]</span></p>
+			<p class="highlight_red">Do not initialize or modify it, it is an internal argument.</p>
+			<p>Default: false</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p>true means: mouse move over the checkbox</p>
+	<p>false means: mouse move out the checkbox</p>
+	</div>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.checked.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.checked.html
new file mode 100644
index 0000000..8a55f3d
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.checked.html
@@ -0,0 +1,32 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">treeNode.</span>checked</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.excheck</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>The checked status about node's checkbox or radio. It is valid when <span class="highlight_red">[setting.check.enable = true & treeNode.nocheck = false]</span></p>
+			<p class="highlight_red">1. If change the 'checked' to other attribute, please set the 'setting.data.key.checked' attribute.</p>
+			<p class="highlight_red">2. If you create node data, and set 'checked' attribute to true, zTree will check this node's checkbox or radio when zTree is initialized.</p>
+			<p class="highlight_red">3. Use the treeObj.checkNode or checkAllNodes or updateNode method, you can check or uncheck the node. Please see the API about these methods.</p>
+			<p class="highlight_red">4. zTree support identification string 'true' & 'false'.</p>
+			<p>Default: false</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p>true means: check the checkbox or radio when zTree is initialized.</p>
+	<p>false means: uncheck the checkbox or radio when zTree is initialized.</p>
+	</div>
+	<h3>Examples of treeNode</h3>
+	<h4>1. check the checkbox when zTree is initialized</h4>
+	<pre xmlns=""><code>var nodes = [
+{ "id":1, "name":"test1", checked:true },
+{ "id":2, "name":"test2", checked:true }
+]</code></pre>
+	<h4>2. Get the checked status of the first root node</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var checked = treeObj.getNodes()[0].checked;
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.checkedOld.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.checkedOld.html
new file mode 100644
index 0000000..ee51626
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.checkedOld.html
@@ -0,0 +1,25 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">treeNode.</span>checkedOld</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.excheck</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>The checked status about node's checkbox or radio when zTree was initialized. It is valid when <span class="highlight_red">[setting.check.enable = true & treeNode.nocheck = false]</span></p>
+			<p class="highlight_red">1. Do not initialize it, it will be initialized when the node is initialized.</p>
+			<p class="highlight_red">2. If you need to achieve special features, you can use the zTreeObj.getChangeCheckedNodes method and modify the value of 'checkedOld' attribute.</p>
+			<p>Default: the value of 'checked' attribute when zTree is initialized</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p>true means: the checkbox or radio is checked when zTree is initialized.</p>
+	<p>false means: the checkbox or radio is not checked when zTree is initialized.</p>
+	</div>
+	<h3>Examples of treeNode</h3>
+	<h4>1. Get the original checked status of the first root node</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var checkedOld = treeObj.getNodes()[0].checkedOld;
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.children.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.children.html
new file mode 100644
index 0000000..d765bb9
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.children.html
@@ -0,0 +1,35 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Array(JSON)</span><span class="path">treeNode.</span>children</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>The data collections of node's child nodes.</p>
+			<p class="highlight_red">1. If change the 'children' to other attribute, please set the 'setting.data.key.children' attribute.</p>
+			<p class="highlight_red">2. If you set to use dynamic tree, when a node is expanded which 'isParent' attribute is true and which has no child nodes, zTree will use ajax to get its child nodes.</p>
+			<p>Default: undefined</p>
+		</div>
+	</div>
+	<h3>Array(JSON) Format</h3>
+	<div class="desc">
+	<p>Standard JSON Data object</p>
+	</div>
+	<h3>Examples of treeNode</h3>
+	<h4>1. Use the standard JSON data object.</h4>
+	<pre xmlns=""><code>var nodes = [
+{ "id":1, "name":"test1",
+	children: [
+	{ "id":3, "name":"test3"},
+	{ "id":4, "name":"test4"},
+	{ "id":5, "name":"test5"}
+	]
+},
+{ "id":2, "name":"test2"  }
+]</code></pre>
+	<h4>2. Get the first root node's child nodes</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getNodes()[0].children;
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.chkDisabled.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.chkDisabled.html
new file mode 100644
index 0000000..7a5fcf3
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.chkDisabled.html
@@ -0,0 +1,28 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">treeNode.</span>chkDisabled</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.excheck</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>1. Set node's checkbox / radio to disabled. It is valid when <span class="highlight_red">[setting.check.enable = true]</span></p>
+			<p class="highlight_red">2. zTree support identification string 'true' & 'false'.</p>
+			<p class="highlight_red">3. Please don't change this attribute of the nodes which have been created. If you want to disable or undisable the nodes, please use 'setChkDisabled()' methods.</p>
+			<p class="highlight_red">4. When zTree initialize the nodes, if you need to the child nodes automatically inherit the 'chkDisabled' attribute, please see 'setting.check.chkDisabledInherit'.</p>
+			<p>Default: false</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p class="highlight_red">true means: this node's checkbox / radio is disabled.</p>
+	<p class="highlight_red">false means: this node's checkbox / radio is able.</p>
+	</div>
+	<h3>Examples of treeNode</h3>
+	<h4>1. disable some node's checkbox / radio </h4>
+	<pre xmlns=""><code>var nodes = [
+	{ "id":1, "name":"test1", "checked":true, "chkDisabled":true},
+	{ "id":2, "name":"test2", "chkDisabled":true},
+	{ "id":3, "name":"test3"}
+]</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.click.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.click.html
new file mode 100644
index 0000000..1f9db62
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.click.html
@@ -0,0 +1,24 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">treeNode.</span>click</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Simple click event operations. As same as : (onclick ="...") the code. If the operation is more complex, please use the onClick callback.</p>
+			<p class="highlight_red">Because IE is different to other browsers in operating the event of ‘onclick’ and ‘click’ coexistence, please do not use this parameter to control whether to allow the redirection operation (for example: treeNode.click = "return false;"). If there is similar requirements, please do not use the 'url' attribute to save the website address, but use the 'onClick' callback to control jumps.</p>
+			<p>Default: undefined</p>
+		</div>
+	</div>
+	<h3>String Format</h3>
+	<div class="desc">
+	<p>Standard javascript syntax, for example: alert ("test"); etc.</p>
+	</div>
+	<h3>Examples of treeNode</h3>
+	<h4>1. When click this node, will alert msg.</h4>
+	<pre xmlns=""><code>var nodes = [
+	{ "id":1, "name":"Google CN", "url":"http://g.cn", "click":"alert('test');"},
+	......
+]</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.diy.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.diy.html
new file mode 100644
index 0000000..68c39ba
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.diy.html
@@ -0,0 +1,15 @@
+<div class="apiDetail">
+<div>
+	<h2><span>?</span><span class="path">treeNode.</span>* DIY *</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to save other custom data of node, do not use the same attribute name with ztree used, the user can freely set.</p>
+		</div>
+	</div>
+	<h3>Examples of treeNode</h3>
+	<h4>1. Use 'ename' attribute to save more info</h4>
+	<pre xmlns=""><code>var node = { "id":1, "name":"test1", "ename":"test eName"};</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.editNameFlag.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.editNameFlag.html
new file mode 100644
index 0000000..f60ef2a
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.editNameFlag.html
@@ -0,0 +1,19 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">treeNode.</span>editNameFlag</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to save the node editing name status. It is valid when <span class="highlight_red">[setting.edit.enable = true]</span></p>
+			<p class="highlight_red">Do not initialize or modify it, it is an internal argument.</p>
+			<p>Default: false</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p>true means: node is being edited.</p>
+	<p>false means: node is not being edited.</p>
+	</div>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.getCheckStatus.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.getCheckStatus.html
new file mode 100644
index 0000000..3c9a2e6
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.getCheckStatus.html
@@ -0,0 +1,63 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function()</span><span class="path">treeNode.</span>getCheckStatus</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.excheck</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Get the node's half-checked status of checkbox or radio. It is valid when <span class="highlight_red">[setting.check.enable = true]</span></p>
+			<p class="highlight_red">Do not initialize or modify it, it is created by the zTree.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>Return</b><span>JSON</span></h4>
+	<pre xmlns=""><code>{
+	checked: true, //As same as 'treeNode.checked'
+	half: true  //Rule the table below
+}</code></pre>
+	<table width="100%" border="0" cellspacing="1" cellpadding="0">
+		<thead>
+			<tr><td colspan="4">setting.check.checkType = "checkbox"</td></tr>
+			<tr><td>treeNode.checked</td><td>treeNode.check_Child_State</td><td>treeNode.halfCheck</td><td> half </td></tr>
+		</thead>
+		<tbody>
+			<tr><td>-</td><td>-</td><td>true</td><td>true</td></tr>
+			<tr><td colspan="4">&nbsp;</td></tr>
+			<tr><td>true</td><td>-1</td><td>false</td><td>false</td></tr>
+			<tr><td>true</td><td>0</td><td>false</td><td>true</td></tr>
+			<tr><td>true</td><td>1</td><td>false</td><td>true</td></tr>
+			<tr><td>true</td><td>2</td><td>false</td><td>false</td></tr>
+			<tr><td colspan="4">&nbsp;</td></tr>
+			<tr><td>false</td><td>-1</td><td>false</td><td>false</td></tr>
+			<tr><td>false</td><td>0</td><td>false</td><td>false</td></tr>
+			<tr><td>false</td><td>1</td><td>false</td><td>true</td></tr>
+			<tr><td>false</td><td>2</td><td>false</td><td>true</td></tr>
+		</tbody>
+	</table>
+	<br/>
+	<table width="100%" border="0" cellspacing="1" cellpadding="0">
+		<thead>
+			<tr><td colspan="4">setting.check.checkType = "radio"</td></tr>
+			<tr><td>treeNode.checked</td><td>treeNode.check_Child_State</td><td>treeNode.halfCheck</td><td> half </td></tr>
+		</thead>
+		<tbody>
+			<tr><td>-</td><td>-</td><td>true</td><td>true</td></tr>
+			<tr><td colspan="4">&nbsp;</td></tr>
+			<tr><td>true</td><td>-1</td><td>false</td><td>false</td></tr>
+			<tr><td>true</td><td>0</td><td>false</td><td>false</td></tr>
+			<tr><td>true</td><td>2</td><td>false</td><td>true</td></tr>
+			<tr><td colspan="4">&nbsp;</td></tr>
+			<tr><td>false</td><td>-1</td><td>false</td><td>false</td></tr>
+			<tr><td>false</td><td>0</td><td>false</td><td>false</td></tr>
+			<tr><td>false</td><td>2</td><td>false</td><td>true</td></tr>
+		</tbody>
+	</table>
+	</div>
+	<h3>Examples of treeNode</h3>
+	<h4>1. Get the first root node's half-checked status</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var halfCheck = treeObj.getNodes()[0].getCheckStatus();
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.getNextNode.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.getNextNode.html
new file mode 100644
index 0000000..755aa6e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.getNextNode.html
@@ -0,0 +1,27 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function()</span><span class="path">treeNode.</span>getNextNode</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Get the treeNode's next sibling node.</p>
+			<p class="highlight_red">Do not initialize or modify it, it is created by the zTree.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>Return</b><span>JSON</span></h4>
+	<p>JSON data object of the treeNode's next sibling node</p>
+	<p class="highlight_red">If have not the next node, return null.</p>
+	</div>
+	<h3>Examples of treeNode</h3>
+	<h4>1. Get the first selected node's next sibling node.</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var sNodes = treeObj.getSelectedNodes();
+if (sNodes.length > 0) {
+	var node = sNodes[0].getNextNode();
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.getParentNode.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.getParentNode.html
new file mode 100644
index 0000000..16bab30
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.getParentNode.html
@@ -0,0 +1,27 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function()</span><span class="path">treeNode.</span>getParentNode</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Get the treeNode's parent node.</p>
+			<p class="highlight_red">Do not initialize or modify it, it is created by the zTree.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>Return</b><span>JSON</span></h4>
+	<p>JSON data object of treeNode's parent node.</p>
+	<p class="highlight_red">If treeNode is root, return null.</p>
+	</div>
+	<h3>Examples of treeNode</h3>
+	<h4>1. Get the first selected node's parent node.</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var sNodes = treeObj.getSelectedNodes();
+if (sNodes.length > 0) {
+	var node = sNodes[0].getParentNode();
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.getPreNode.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.getPreNode.html
new file mode 100644
index 0000000..f6745b1
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.getPreNode.html
@@ -0,0 +1,27 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function()</span><span class="path">treeNode.</span>getPreNode</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Get the treeNode's previous sibling node.</p>
+			<p class="highlight_red">Do not initialize or modify it, it is created by the zTree.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>Return</b><span>JSON</span></h4>
+	<p>JSON data object of the treeNode's previous sibling node</p>
+	<p class="highlight_red">If have not the previous node, return null.</p>
+	</div>
+	<h3>Examples of treeNode</h3>
+	<h4>1. Get the first selected node's previous sibling node.</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var sNodes = treeObj.getSelectedNodes();
+if (sNodes.length > 0) {
+	var node = sNodes[0].getPreNode();
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.halfCheck.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.halfCheck.html
new file mode 100644
index 0000000..8375326
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.halfCheck.html
@@ -0,0 +1,29 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">treeNode.</span>halfCheck</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.excheck</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Force node checkBox / radio to the half-checked status. It is valid when <span class="highlight_red">[setting.check.enable = true & treeNode.nocheck = false]</span></p>
+			<p class="highlight_red">1. If you force to the half-checked status, zTree will not automatically calculated the half-checked status about this node.</p>
+			<p class="highlight_red">2. Until you set treeNode.halfCheck to false or null, zTree will automatically calculated the half-checked status about this node.</p>
+			<p class="highlight_red">3. zTree support identification string 'true' & 'false'.</p>
+			<p>Defaul: false</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p>true means: the checkbox or radio is half-checked when zTree is initialized.</p>
+	<p>false means: the half-checked status will be automatically calculated</p>
+	</div>
+	<h3>Examples of treeNode</h3>
+	<h4>1. set the half-checked status when zTree is initialized</h4>
+	<pre xmlns=""><code>var nodes = [
+{ "id":1, "name":"test1", isParent:true, checked:true, halfCheck:true },
+{ "id":2, "name":"test2", isParent:true, checked:false, halfCheck:true },
+{ "id":3, "name":"test3", isParent:true, checked:true },
+{ "id":4, "name":"test4", isParent:true, checked:false }
+]</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.icon.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.icon.html
new file mode 100644
index 0000000..4e1c99f
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.icon.html
@@ -0,0 +1,33 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">treeNode.</span>icon</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>URL path of node's custom icon.</p>
+			<p class="highlight_red">1. If you only set the 'icon' attribute to parent node, the parent node will only show one icon when it is expanded or collapsed.</p>
+			<p class="highlight_red">2. If you need to show two icons when it is expanded or collapsed, please set the 'treeNode.iconOpen' and 'treeNode.iconClose' attribute.</p>
+			<p class="highlight_red">3. If you need to use css to set the custom icon, please set the 'treeNode.iconSkin' attribute.</p>
+			<p>Default: undefined</p>
+		</div>
+	</div>
+	<h3>String Format</h3>
+	<div class="desc">
+	<p>Icon image url can be a relative path or absolute path.</p>
+	<p class="highlight_red">If use a relative path, please note the relationship between icon image and the page, ensure the correct image path.</p>
+	</div>
+	<h3>Examples of treeNode</h3>
+	<h4>1. Set the custom icon</h4>
+	<pre xmlns=""><code>var nodes = [
+	//Only show one icon when it is expanded or collapsed.
+	{ name:"Parent Node 1", icon:"/img/parent.gif"},
+
+	//Show two icons when it is expanded or collapsed.
+	{ name:"Parent Node 2", iconOpen:"/img/open.gif", iconClose:"/img/close.gif"},
+
+	//the custom icon for leaf node
+	{ name:"Leaf Node", icon:"/img/leaf.gif"}
+]</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.iconClose.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.iconClose.html
new file mode 100644
index 0000000..2259e8f
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.iconClose.html
@@ -0,0 +1,33 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">treeNode.</span>iconClose</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>URL path of parent node's custom icon when it is collapsed.</p>
+			<p class="highlight_red">1. Only parent node support this attribute.</p>
+			<p class="highlight_red">2. This attribute must be used simultaneously with 'iconOpen' attribute.</p>
+			<p class="highlight_red">3. If you need to use css to set the custom icon, please set the 'treeNode.iconSkin' attribute.</p>
+			<p>Default: undefined</p>
+		</div>
+	</div>
+	<h3>String Format</h3>
+	<div class="desc">
+	<p>Icon image url can be a relative path or absolute path.</p>
+	<p class="highlight_red">If use a relative path, please note the relationship between icon image and the page, ensure the correct image path.</p>
+	</div>
+	<h3>Examples of treeNode</h3>
+	<h4>1. Set the custom icon</h4>
+	<pre xmlns=""><code>var nodes = [
+	//Only show one icon when it is expanded or collapsed.
+	{ name:"Parent Node 1", icon:"/img/parent.gif"},
+
+	//Show two icons when it is expanded or collapsed.
+	{ name:"Parent Node 2", iconOpen:"/img/open.gif", iconClose:"/img/close.gif"},
+
+	//the custom icon for leaf node
+	{ name:"Leaf Node", icon:"/img/leaf.gif"}
+]</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.iconOpen.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.iconOpen.html
new file mode 100644
index 0000000..3203615
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.iconOpen.html
@@ -0,0 +1,33 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">treeNode.</span>iconOpen</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>URL path of parent node's custom icon when it is expanded.</p>
+			<p class="highlight_red">1. Only parent node support this attribute.</p>
+			<p class="highlight_red">2. This attribute must be used simultaneously with 'iconClose' attribute.</p>
+			<p class="highlight_red">3. If you need to use css to set the custom icon, please set the 'treeNode.iconSkin' attribute.</p>
+			<p>Default: undefined</p>
+		</div>
+	</div>
+	<h3>String Format</h3>
+	<div class="desc">
+	<p>Icon image url can be a relative path or absolute path.</p>
+	<p class="highlight_red">If use a relative path, please note the relationship between icon image and the page, ensure the correct image path.</p>
+	</div>
+	<h3>Examples of treeNode</h3>
+	<h4>1. Set the custom icon</h4>
+	<pre xmlns=""><code>var nodes = [
+	//Only show one icon when it is expanded or collapsed.
+	{ name:"Parent Node 1", icon:"/img/parent.gif"},
+
+	//Show two icons when it is expanded or collapsed.
+	{ name:"Parent Node 2", iconOpen:"/img/open.gif", iconClose:"/img/close.gif"},
+
+	//the custom icon for leaf node
+	{ name:"Leaf Node", icon:"/img/leaf.gif"}
+]</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.iconSkin.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.iconSkin.html
new file mode 100644
index 0000000..fca7fbf
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.iconSkin.html
@@ -0,0 +1,43 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">treeNode.</span>iconSkin</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>The className of node's custom icon.</p>
+			<p class="highlight_red">1. You need to modify the css, add the definition of className.</p>
+			<p class="highlight_red">2. The css is simple, convenient, and support the parent node to switch icons when it is expanded or collapsed.</p>
+			<p class="highlight_red">3. Recommend the use of CSS Sprites, can reduce repeating load the image, to avoid image flicker.</p>
+			<p class="highlight_red">4. The 'iconSkin' support IE6 in zTree v3.x.</p>
+			<p class="highlight_red">5. If you need to use image's URL to set the custom icon, please set the 'treeNode.icon' or 'treeNode.iconOpen' or 'treeNode.iconClose' attribute.</p>
+			<p>Default: undefined</p>
+		</div>
+	</div>
+	<h3>String Format</h3>
+	<div class="desc">
+	<p>The string about custom icon's className.</p>
+	</div>
+	<h3>Examples of css & treeNode</h3>
+	<h4>1. Set the custom icon</h4>
+	<pre xmlns=""><code>css example：
+.ztree li span.button.diy01_ico_open, .ztree li span.button.diy01_ico_close{...}
+
+.ztree li span.button.diy02_ico_open{...}
+.ztree li span.button.diy02_ico_close{...}
+
+.ztree li span.button.diy03_ico_docu{...}
+
+node's data example：
+var nodes = [
+	//Only show one icon when it is expanded or collapsed.
+	{ name:"Parent Node 1", iconSkin:"diy01"},
+
+	//Show two icons when it is expanded or collapsed.
+	{ name:"Parent Node 2", iconSkin:"diy02"},
+
+	//the custom icon for leaf node
+	{ name:"Leaf Node", iconSkin:"diy03"}
+]</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.isAjaxing.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.isAjaxing.html
new file mode 100644
index 0000000..ddadf41
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.isAjaxing.html
@@ -0,0 +1,26 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">treeNode.</span>isAjaxing</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Judge whether the node's child nodes being loaded asynchronously.</p>
+			<p class="highlight_red">Do not initialize or modify it, it is created by the zTree.</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p> true means: the node's child nodes is being loaded asynchronously</p>
+	<p> false means: the node's child nodes is not being loaded asynchronously</p>
+	</div>
+	<h3>Examples of treeNode</h3>
+	<h4>1. Judge whether the first selected node's child nodes being loaded asynchronously</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var sNodes = treeObj.getSelectedNodes();
+if (sNodes.length > 0) {
+	var isAjaxing = sNodes[0].isAjaxing;
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.isFirstNode.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.isFirstNode.html
new file mode 100644
index 0000000..a8ee61c
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.isFirstNode.html
@@ -0,0 +1,28 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">treeNode.</span>isFirstNode</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Judge whether the node is the sibling nodes's first node.</p>
+			<p class="highlight_red">If you use the 'exhide' pack, so this attribute will only support the node which be shown. </p>
+			<p class="highlight_red">Do not initialize or modify it, it is created by the zTree.</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p> true means: the node is first node.</p>
+	<p> false means: the node is not first node.</p>
+	<p class="highlight_red">If the node has been hidden, isFirstNode = false</p>
+	</div>
+	<h3>Examples of treeNode</h3>
+	<h4>1. Judge whether the first selected node is the sibling nodes's first node.</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var sNodes = treeObj.getSelectedNodes();
+if (sNodes.length > 0) {
+	var isFirstNode = sNodes[0].isFirstNode;
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.isHidden.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.isHidden.html
new file mode 100644
index 0000000..3a07b94
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.isHidden.html
@@ -0,0 +1,28 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">treeNode.</span>isHidden</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exhide</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Judge whether the node has been hidden.</p>
+			<p class="highlight_red">1. When initialize zTree, the nodes which be set 'isHidden = true' will be hidden.</p>
+			<p class="highlight_red"></p>
+			<p class="highlight_red">2. Please don't change this attribute of the nodes which have been created. If you want to hide or show nodes, please use 'hideNode() / hideNodes() / showNode() / showNodes()' methods.</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p> true means: this node is hidden.</p>
+	<p> false means: this node is shown.</p>
+	</div>
+	<h3>Examples of treeNode</h3>
+	<h4>1. Judge whether the first root node has been hidden.</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var sNodes = treeObj.getNodes();
+if (sNodes.length > 0) {
+	var isHidden = sNodes[0].isHidden;
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.isHover.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.isHover.html
new file mode 100644
index 0000000..e18ed0c
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.isHover.html
@@ -0,0 +1,19 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">treeNode.</span>isHover</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to record the hover status of node's DOM. For 'setting.view.addHoverDom / removeHoverDom'.</p>
+			<p class="highlight_red">Do not initialize or modify it, it is an internal argument.</p>
+			<p>Default: false</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p>true means: the node's DOM is in hover.</p>
+	<p>false means: the node's DOM is not in hover.</p>
+	</div>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.isLastNode.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.isLastNode.html
new file mode 100644
index 0000000..cd2ca26
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.isLastNode.html
@@ -0,0 +1,28 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">treeNode.</span>isLastNode</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Judge whether the node is the sibling nodes's last node.</p>
+			<p class="highlight_red">If you use the 'exhide' pack, so this attribute will only support the node which be shown. </p>
+			<p class="highlight_red">Do not initialize or modify it, it is created by the zTree.</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p> true means: the node is last node.</p>
+	<p> false means: the node is not last node.</p>
+	<p class="highlight_red">If the node has been hidden, isLastNode = false</p>
+	</div>
+	<h3>Examples of treeNode</h3>
+	<h4>1. Judge whether the first selected node is the sibling nodes's last node.</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var sNodes = treeObj.getSelectedNodes();
+if (sNodes.length > 0) {
+	var isLastNode = sNodes[0].isLastNode;
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.isParent.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.isParent.html
new file mode 100644
index 0000000..dad4b81
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.isParent.html
@@ -0,0 +1,28 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">treeNode.</span>isParent</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Judge whether the node is the parent node.</p>
+			<p class="highlight_red">1. When zTree initialize the node data, the node which has children is set to true, otherwise false.</p>
+			<p class="highlight_red">2. When zTree initialize the node data, if set treeNode.isParent to true, the node will be set to be parent node.</p>
+			<p class="highlight_red">3. In order to solve the problem of someone make json data, supporting "false", "true" format of the data string.</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p> true means: the node is parent node.</p>
+	<p> false means: the node is not parent node.</p>
+	</div>
+	<h3>Examples of treeNode</h3>
+	<h4>1. Judge whether the first selected node is the parent node.</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var sNodes = treeObj.getSelectedNodes();
+if (sNodes.length > 0) {
+	var isParent = sNodes[0].isParent;
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.level.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.level.html
new file mode 100644
index 0000000..d151162
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.level.html
@@ -0,0 +1,25 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Number</span><span class="path">treeNode.</span>level</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>The level of node</p>
+			<p class="highlight_red">Do not initialize or modify it, it is created by the zTree.</p>
+		</div>
+	</div>
+	<h3>Number Format</h3>
+	<div class="desc">
+	<p class="highlight_red">The root node's level = 0, and next level = 1, ...</p>
+	</div>
+	<h3>Examples of treeNode</h3>
+	<h4>1. Get the first selected node's level</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var sNodes = treeObj.getSelectedNodes();
+if (sNodes.length > 0) {
+	var level = sNodes[0].level;
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.name.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.name.html
new file mode 100644
index 0000000..fa508cc
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.name.html
@@ -0,0 +1,25 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">treeNode.</span>name</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>The node's name</p>
+			<p class="highlight_red">1. If you want to change 'name' attribute, please modify the 'setting.data.key.name' attribute.</p>
+			<p>Default: undenfined</p>
+		</div>
+	</div>
+	<h3>String Format</h3>
+	<div class="desc">
+	<p>String object. The HTML special characters are escaped</p>
+	</div>
+	<h3>Examples of treeNode</h3>
+	<h4>1. Set node's name to 'test1', 'test2', 'test3'</h4>
+	<pre xmlns=""><code>var nodes = [
+	{ "id":1, "name":"test1"},
+	{ "id":2, "name":"test2"},
+	{ "id":3, "name":"test3"}
+]</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.nocheck.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.nocheck.html
new file mode 100644
index 0000000..6c4880c
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.nocheck.html
@@ -0,0 +1,26 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">treeNode.</span>nocheck</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.excheck</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>1. Set node to hide the checkbox or radio. It is valid when <span class="highlight_red">[setting.check.enable = true]</span></p>
+			<p class="highlight_red">2. zTree support identification string 'true' & 'false'.</p>
+			<p>Default: false</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p class="highlight_red">true means: the node hide the checkbox or radio, and don't affect the checked association, and don't affect its parent node's half-checked status.</p>
+	<p class="highlight_red">false means: the node show the checkbox or radio.</p>
+	</div>
+	<h3>Examples of treeNode</h3>
+	<h4>1. Hide some node's checkbox / radio </h4>
+	<pre xmlns=""><code>var nodes = [
+	{ "id":1, "name":"test1", "nocheck":true},
+	{ "id":2, "name":"test2"},
+	{ "id":3, "name":"test3"}
+]</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.open.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.open.html
new file mode 100644
index 0000000..bc910de
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.open.html
@@ -0,0 +1,30 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">treeNode.</span>open</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to record the parent node's expand status.</p>
+			<p class="highlight_red">1. When zTree initialize the node data, if you set treeNode.open = true, zTree will default expand this parent node.</p>
+			<p class="highlight_red">2. Leaf node's 'open' attribute is false.</p>
+			<p class="highlight_red">3. In order to solve the problem of someone make json data, supporting "false", "true" format of the data string.</p>
+			<p class="highlight_red">4. When setting.async.enable = false, the parent node will be expanded which have no child nodes and its attribute 'open' is true. (v3.5.15+)  </p>
+			<p>Default: false</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p> true means: the parent node is expanded.</p>
+	<p> false means: the parent node is collapsed.</p>
+	</div>
+	<h3>Examples of treeNode</h3>
+	<h4>1. Get the first selected node's expand status.</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var sNodes = treeObj.getSelectedNodes();
+if (sNodes.length > 0) {
+	var isOpen = sNodes[0].open;
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.parentTId.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.parentTId.html
new file mode 100644
index 0000000..0bc2a6d
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.parentTId.html
@@ -0,0 +1,27 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">treeNode.</span>parentTId</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>The unique identifier of node's parent node.</p>
+			<p class="highlight_red">1. zTree v3.x using 'parentTId' replaced the original 'parentNode' attribute, and increased getParentNode () method, in order to avoid the original 'parentNode' cause the clone () method infinite loop.</p>
+			<p class="highlight_red">2. Do not initialize or modify it, it is created by the zTree.</p>
+		</div>
+	</div>
+	<h3>String Format</h3>
+	<div class="desc">
+	<p>String object of node's parent node's tId. please see API about 'treeNode.tId'</p>
+	<p class="highlight_red">If treeNode is root node, parentTId is null.</p>
+	</div>
+	<h3>Examples of treeNode</h3>
+	<h4>1. Get the first selected node's parent node's tId</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var sNodes = treeObj.getSelectedNodes();
+if (sNodes.length > 0) {
+	var parentTId = sNodes[0].parentTId;
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.tId.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.tId.html
new file mode 100644
index 0000000..18c2855
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.tId.html
@@ -0,0 +1,25 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">treeNode.</span>tId</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>The unique identifier of node.</p>
+			<p class="highlight_red">Do not initialize or modify it, it is created by the zTree.</p>
+		</div>
+	</div>
+	<h3>String Format</h3>
+	<div class="desc">
+	<p>tId rules: setting.treeId + "_" + zTree counter</p>
+	</div>
+	<h3>Examples of treeNode</h3>
+	<h4>1. Get the first selected node's tId</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var sNodes = treeObj.getSelectedNodes();
+if (sNodes.length > 0) {
+	var tId = sNodes[0].tId;
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.target.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.target.html
new file mode 100644
index 0000000..176a7a3
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.target.html
@@ -0,0 +1,24 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">treeNode.</span>target</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to set the target where the node is clicked to open url. It is valid when <span class="highlight_red">[treeNode.url exists]</span></p>
+			<p>Default: undefined</p>
+		</div>
+	</div>
+	<h3>String Format</h3>
+	<div class="desc">
+	<p>As same as &lt;a&gt; tag's 'target' attribute. e.g.  '_blank', '_self' or other window name.</p>
+	<p>if this attribute is omitted, zTree default set it to '_blank'</p>
+	</div>
+	<h3>Exmaples of treeNode</h3>
+	<h4>1. Set target is '_blank'</h4>
+	<pre xmlns=""><code>var nodes = [
+	{ "id":1, "name":"test1", "url":"http://myTest.com", "target":"_blank"},
+	......
+]</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.url.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.url.html
new file mode 100644
index 0000000..5552445
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.url.html
@@ -0,0 +1,25 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">treeNode.</span>url</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>The URL of node link</p>
+			<p class="highlight_red">1. In edit mode (setting.edit.enable = true) , this feature fails. If you must use a similar feature, please use the 'onClick' callback for their own control.</p>
+			<p class="highlight_red">2. If you use  the 'onClick' callback function to control opening URL , then set the URL  in the other custom attribute, do not use the 'url' attribute.</p>
+			<p>Default: undefined</p>
+		</div>
+	</div>
+	<h3>String Format</h3>
+	<div class="desc">
+	<p>As same as &lt;a&gt; tag's 'href' attribute.</p>
+	</div>
+	<h3>Examples of treeNode</h3>
+	<h4>1. Set the URL is 'g.cn'</h4>
+	<pre xmlns=""><code>var nodes = [
+	{ "id":1, "name":"Google CN", "url":"http://g.cn"},
+	......
+]</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.zAsync.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.zAsync.html
new file mode 100644
index 0000000..b3ff414
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/treeNode.zAsync.html
@@ -0,0 +1,28 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">treeNode.</span>zAsync</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Judge whether the parent node's child nodes will be loaded asynchronously when the parent node is expanded.</p>
+			<p class="highlight_red">Do not initialize or modify it, it is created by the zTree.</p>
+			<p class="highlight_red">Default：false (the parent node which have no child nodes); true (the parent node which have child nodes or the leaf node)</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p> true means: the node's child nodes will not be loaded asynchronously when the parent node is expanded.</p>
+	<p> false means: the node's child nodes will be loaded asynchronously when the parent node is expanded.</p>
+	<p class="highlight_red"> This attribute will not effect to 'reAsyncChildNodes()' method</p>
+	</div>
+	<h3>Examples of treeNode</h3>
+	<h4>1. Judge whether the first selected node's child nodes has been loaded asynchronously</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var sNodes = treeObj.getSelectedNodes();
+if (sNodes.length > 0) {
+	var zAsync = sNodes[0].zAsync;
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.addNodes.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.addNodes.html
new file mode 100644
index 0000000..680ccc4
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.addNodes.html
@@ -0,0 +1,42 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(parentNode, newNodes, isSilent)</span><span class="path">zTreeObj.</span>addNodes</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Add nodes</p>
+			<p class="highlight_red">In order to avoid duplication data resulting from repeated initialization, zTree v3.x will automatically clone node data when zTree initialized or add nodes. If you need to get the data objects within the zTree, please get the return value of this method.</p>
+			<p class="highlight_red">Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>parentNode</b><span>JSON</span></h4>
+	<p>The additional node's parent node. If additional node is root node, please the parentNode is null.</p>
+	<p class="highlight_red">Please ensure this node data object is a data object within zTree.</p>
+	<h4 class="topLine"><b>newNodes</b><span>JSON / Array(JSON)</span></h4>
+	<p>The node data's JSON object collection which need to increase, refer to 'treeNode treeNode data details'</p>
+	<p class="highlight_red">1. zTree v3.x support to add single node, that is, if you only add a node, you can don't use the array.</p>
+	<p class="highlight_red">2. If you use simple data model, please refer to the attributes within the 'setting.data.simpleData'.</p>
+	<h4 class="topLine"><b>isSilent</b><span>Boolean</span></h4>
+	<p>Set whether to automatically expand the parent node, after add nodes.</p>
+	<p>isSilent = true means: don't auto expand the parent node. Otherwise auto expand.</p>
+	<h4 class="topLine"><b>Return </b><span>Array(JSON)</span></h4>
+	<p>return the new nodes in zTree</p>
+	<p class="highlight_red">If the newNodes is single data object, the return value is a array with length is 1.</p>
+	<p class="highlight_red">Note: the node data JSON object in the return value is not equal to the JSON object in the 'newNodes'.</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. Add one root node to zTree which id is 'tree'</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var newNode = {name:"newNode1"};
+newNode = treeObj.addNodes(null, newNode);
+</code></pre>
+	<h4>2. Add three root nodes to zTree which id is 'tree'</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var newNodes = [{name:"newNode1"}, {name:"newNode2"}, {name:"newNode3"}];
+newNodes = treeObj.addNodes(null, newNodes);
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.cancelEditName.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.cancelEditName.html
new file mode 100644
index 0000000..8afdae0
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.cancelEditName.html
@@ -0,0 +1,30 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(newName)</span><span class="path">zTreeObj.</span>cancelEditName</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Cancel the edit name status. Can restore the original name, and can also force assigned to a new name.</p>
+			<p class="highlight_red">Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>newName</b><span>String</span></h4>
+	<p>Re given a new name</p>
+	<p class="highlight_red">If this parameter is omitted, then restore the original name.</p>
+	<h4 class="topLine"><b>Return </b><span>none</span></h4>
+	<p>no return value</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. Cancel edit name, and restore the original name.</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+treeObj.cancelEditName();
+</code></pre>
+	<h4>2. Cancel edit name , and set the new name.</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+treeObj.cancelEditName("test_new_name");
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.cancelSelectedNode.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.cancelSelectedNode.html
new file mode 100644
index 0000000..581c2d2
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.cancelSelectedNode.html
@@ -0,0 +1,35 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeNode)</span><span class="path">zTreeObj.</span>cancelSelectedNode</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>To cancel the selected node.</p>
+			<p class="highlight_red">zTree v3.x support to select multiple nodes, so you can cancel a single selected node, and you can cancel all of the selected nodes too.</p>
+			<p class="highlight_red">Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which need to cancel selected.</p>
+	<p class="highlight_red">Please ensure that this data object is an internal node data object in zTree.</p>
+	<p class="highlight_red">If you omit this parameter,  zTree will cancel all of the selected nodes.</p>
+	<h4 class="topLine"><b>Return </b><span>none</span></h4>
+	<p>no return value</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. Cancel all of the selected nodes</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+treeObj.cancelSelectedNode();
+</code></pre>
+	<h4>2. Cancel the first node of the selected nodes</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getSelectedNode();
+if (nodes.length>0) { 
+	treeObj.cancelSelectedNode(nodes[0]);
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.checkAllNodes.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.checkAllNodes.html
new file mode 100644
index 0000000..276b629
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.checkAllNodes.html
@@ -0,0 +1,29 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(checked)</span><span class="path">zTreeObj.</span>checkAllNodes</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.excheck</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Check or unCheck all nodes which have been initialized. It is valid when <span class="highlight_red">[setting.check.enable = true & setting.check.chkStyle = "checkbox"]</span></p>
+			<p class="highlight_red">This method does not trigger 'beforeCheck' or 'onCheck' callback function.</p>
+			<p class="highlight_red">Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>checked</b><span>Boolean</span></h4>
+	<p>checked = true means: check all nodes.</p>
+	<p>checked = false means: uncheck all nodes.</p>
+	<p class="highlight_red">Don't affect the node which 'nochecked' attribute is true.</p>
+	<p class="highlight_red">Don't affect the node is not loaded.</p>
+	<h4 class="topLine"><b>Return </b><span>none</span></h4>
+	<p>no return value</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. check all nodes</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+treeObj.checkAllNodes(true);
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.checkNode.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.checkNode.html
new file mode 100644
index 0000000..7411ef8
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.checkNode.html
@@ -0,0 +1,44 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeNode, checked, checkTypeFlag, callbackFlag)</span><span class="path">zTreeObj.</span>checkNode</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.excheck</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Check or unCheck a single node. It is valid when <span class="highlight_red">[setting.check.enable = true]</span></p>
+			<p class="highlight_red">Use checkNode() method of zTree v3.x can trigger 'beforeCheck' or 'onCheck' callback function. for reduce redundant code.</p>
+			<p class="highlight_red">Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which need to be checked or unchecked.</p>
+	<p class="highlight_red">Please ensure that this data object is an internal node data object in zTree.</p>
+	<h4 class="topLine"><b>checked</b><span>Boolean</span></h4>
+	<p>checked = true means: check node.</p>
+	<p>checked = false means: uncheck node.</p>
+	<p class="highlight_red">If this parameter is omitted, then toggle check or uncheck depend this node's expanded state.</p>
+	<p class="highlight_red">Don't affect the node which 'nochecked' attribute is true.</p>
+	<h4 class="topLine"><b>checkTypeFlag</b><span>Boolean</span></h4>
+	<p>checkTypeFlag = true means: According to 'setting.check.chkboxType' attribute automatically check or uncheck the parent and child nodes.</p>
+	<p>checkTypeFlag = false means: only check or uncheck this node, don't affect its parent and child nodes.</p>
+	<p class="highlight_red">When checkTypeFlag = false and treeNode.checked = checked, will not trigger callback function.</p>
+	<p class="highlight_red">Don't affect the parent and child nodes which 'nochecked' attribute is true.</p>
+	<h4 class="topLine"><b>callbackFlag</b><span>Boolean</span></h4>
+	<p>callbackFlag = true means: call this method, will trigger 'beforeCheck' & 'onCheck' callback.</p>
+	<p>callbackFlag = false means: call this method, will not trigger callback.</p>
+	<p class="highlight_red">If this parameter is omitted, it is same as 'callbackFlag = false'</p>
+	<h4 class="topLine"><b>Return </b><span>none</span></h4>
+	<p>no return value</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. check the selected nodes</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getSelectedNodes();
+for (var i=0, l=nodes.length; i < l; i++) {
+	treeObj.checkNode(nodes[i], true, true);
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.copyNode.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.copyNode.html
new file mode 100644
index 0000000..a98e84d
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.copyNode.html
@@ -0,0 +1,47 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(targetNode, treeNode, moveType, isSilent)</span><span class="path">zTreeObj.</span>copyNode</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Copy the node</p>
+			<p class="highlight_red">When copy nodes, zTree v3.x will clone nodes. If you need to get the data object in zTree, please get the return value of this method.</p>
+			<p class="highlight_red">Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>targetNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which will be target.</p>
+	<p class="highlight_red">If copy the node to root node, please set the 'targetNode' to null.</p>
+	<p class="highlight_red">Please ensure that this data object is an internal node data object in zTree.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which will be copied.</p>
+	<p class="highlight_red">Please ensure that this data object is an internal node data object in zTree.</p>
+	<h4 class="topLine"><b>moveType</b><span>String</span></h4>
+	<p>Copied to the target node's relative position.</p>
+	<p class="highlight_red">"inner" means: to be taregetNode's child node.</p>
+	<p class="highlight_red">"prev" means: to be taregetNode's previous sibling node.</p>
+	<p class="highlight_red">"next" means: to be taregetNode's next sibling node.</p>
+	<h4 class="topLine"><b>isSilent</b><span>Boolean</span></h4>
+	<p>After copy the node, whether to automatically expand its parent node.</p>
+	<p>isSilent = true means: don't expand its parent node.</p>
+	<p>isSilent = false or omit this parameter means: expand its parent node.</p>
+	<h4 class="topLine"><b>Return </b><span>JSON</span></h4>
+	<p>return the new node in zTree</p>
+	<p class="highlight_red">Note: the node data JSON object in the return value is not equal to the treeNode.</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. Copy the second root node to the first root node's child node.</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getNodes();
+treeObj.copyNode(nodes[0], nodes[1], "inner");
+</code></pre>
+	<h4>2. Copy the second root node to the first root node's previous sibling node.</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getNodes();
+treeObj.copyNode(nodes[0], nodes[1], "before");
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.destroy.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.destroy.html
new file mode 100644
index 0000000..80c5281
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.destroy.html
@@ -0,0 +1,25 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId)</span><span class="path">zTreeObj.</span>destroy</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>From zTree v3.4, zTree support the method for destruction.</p>
+			<p>1. This method can destroy the zTreeObj's zTree.</p>
+			<p class="highlight_red">2. If you want to destory all of the zTrees, you can use the '$.fn.zTree.destroy()' method.</p>
+			<p class="highlight_red">3. If you want to use the tree which has been destroyed, you must use the 'init()' method at first.</p>
+		</div>
+	</div>
+        <h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>Return </b><span>none</span></h4>
+	<p>no return value</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. destroy the zTree which its id is 'treeDemo'</h4>
+	<pre xmlns=""><code>var zTreeObj = $.fn.zTree.getZTreeObj("treeDemo");
+zTreeObj.destroy();
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.editName.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.editName.html
new file mode 100644
index 0000000..92ac5c1
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.editName.html
@@ -0,0 +1,29 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeNode)</span><span class="path">zTreeObj.</span>editName</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Start editing the node's name.</p>
+			<p class="highlight_red">1. If need to cancel editing the node's name, please use cancelEditName(newName) method.</p>
+			<p class="highlight_red">2. This method can be used to set the editing node‘s input box to get focus.</p>
+			<p class="highlight_red">3. Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which will be editing name</p>
+	<p class="highlight_red">Please ensure that this data object is an internal node data object in zTree.</p>
+	<h4 class="topLine"><b>Retrun </b><span>none</span></h4>
+	<p>no return value</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. Start editing the first selected node's name.</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getNodes();
+treeObj.editName(nodes[0]);
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.expandAll.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.expandAll.html
new file mode 100644
index 0000000..ef28a31
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.expandAll.html
@@ -0,0 +1,30 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(expandFlag)</span><span class="path">zTreeObj.</span>expandAll</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Expand or collapse all nodes.</p>
+			<p class="highlight_red">This method does not trigger 'beforeExpand / onExpand' or 'beforeCollapse / onCollapse' callback function.</p>
+			<p class="highlight_red">Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>expandFlag</b><span>Boolean</span></h4>
+	<p>expandFlag = true means: expand all nodes.</p>
+	<p>expandFlag =  false means: collapse all nodes.</p>
+	<h4 class="topLine"><b>Return </b><span>Boolean</span></h4>
+	<p>return the result of expand or collapse.</p>
+	<p>true means: expand all nodes</p>
+	<p>false means: collapse all nodes</p>
+	<p>null means: have no parent node to expand or collapse.</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. Expand all nodes</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+treeObj.expandAll(true);
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.expandNode.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.expandNode.html
new file mode 100644
index 0000000..f99ff77
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.expandNode.html
@@ -0,0 +1,50 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeNode, expandFlag, sonSign, focus, callbackFlag)</span><span class="path">zTreeObj.</span>expandNode</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Expand or collapse single node.</p>
+			<p class="highlight_red">Use expandNode() method of zTree v3.x can trigger 'beforeExpand / onExpand' or 'beforeCollapse / onCollapse' callback function. for reduce redundant code.</p>
+			<p class="highlight_red">Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which will be expanded or collapsed</p>
+	<p class="highlight_red">Please ensure that this data object is an internal node data object in zTree.</p>
+	<h4 class="topLine"><b>expandFlag</b><span>Boolean</span></h4>
+	<p>expandFlag = true means: expand the node.</p>
+	<p>expandFlag = false means: collapse the node.</p>
+	<p class="highlight_red">If this parameter is omitted, then toggle expand or collapse depend this node's expanded state.</p>
+	<h4 class="topLine"><b>sonSign</b><span>Boolean</span></h4>
+	<p>sonSign = true means: expand or collapse all of the child nodes depend the 'expandFlag' parameter.</p>
+	<p>sonSign = false means: only expand or collapse this node.</p>
+	<p class="highlight_red">When sonSign = false and treeNode.open = expandFlag, will not trigger the callback.</p>
+	<p class="highlight_red">If this parameter is omitted, it is same as 'sonSign = false'.</p>
+	<h4 class="topLine"><b>focus</b><span>Boolean</span></h4>
+	<p>focus = true means: after expand or collapse, set the focus of this node for view.</p>
+	<p>focus =  false means: after expand or coolapse, don't set the focus of this node.</p>
+	<p class="highlight_red">If this parameter is omitted, it is same as 'focus = true'.</p>
+	<h4 class="topLine"><b>callbackFlag</b><span>Boolean</span></h4>
+	<p>callbackFlag = true means: call this method, will trigger 'beforeExpand / onExpand' or 'beforeCollapse / onCollapse' callback.</p>
+	<p>callbackFlag = false means: call this method, will not trigger callback.</p>
+	<p class="highlight_red">If this parameter is omitted, it is same as 'callbackFlag = false'</p>
+	<h4 class="topLine"><b>Return </b><span>Boolean</span></h4>
+	<p>return the result of expand or collapse.</p>
+	<p>true means: expand node</p>
+	<p>false means: collapse node</p>
+	<p>null means: the node is not parent node.</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. Expand the first selected node. (and expand this node's child nodes)</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getSelectedNodes();
+if (nodes.length>0) {
+	treeObj.expandNode(nodes[0], true, true, true);
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.getChangeCheckedNodes.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.getChangeCheckedNodes.html
new file mode 100644
index 0000000..d0f9cf3
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.getChangeCheckedNodes.html
@@ -0,0 +1,24 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function()</span><span class="path">zTreeObj.</span>getChangeCheckedNodes</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.excheck</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Get the collection of nodes which be changed checked status. (Compared with the original data checkedOld) It is valid when <span class="highlight_red">[setting.check.enable = true]</span></p>
+			<p class="highlight_red">Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>Return </b><span>Array(JSON)</span></h4>
+	<p>return the collection of nodes which be changed checked status (Array)</p>
+	<p class="highlight_red">If you need to get the collection of nodes which changed the checked status, when nodes be checked or unchecked, so please set treeNode.checkedOld = treeNode.checked ( for all of the be changed checked status nodes ).</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. Get the collection of nodes which be changed checked status</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getChangeCheckedNodes();
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.getCheckedNodes.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.getCheckedNodes.html
new file mode 100644
index 0000000..7a7c3b9
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.getCheckedNodes.html
@@ -0,0 +1,28 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(checked)</span><span class="path">zTreeObj.</span>getCheckedNodes</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.excheck</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Get the collection of nodes which be checked or unchecked. It is valid when <span class="highlight_red">[setting.check.enable = true]</span></p>
+			<p class="highlight_red">Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>checked</b><span>Boolean</span></h4>
+	<p>checked = true means: get the collection of nodes which be checked</p>
+	<p>checked = false means: get the collection of nodes which be unchecked</p>
+	<p class="highlight_red">If this parameter is omitted, it is same as 'checked = true'</p>
+	<p class="highlight_red">Don't get the nodes which 'nochecked' attribute is true.</p>
+	<h4 class="topLine"><b>Return </b><span>Array(JSON)</span></h4>
+	<p>return the collection of nodes which be checked or unchecked. (Array)</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. Get the collection of nodes which be checked.</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getCheckedNodes(true);
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.getNodeByParam.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.getNodeByParam.html
new file mode 100644
index 0000000..05572e7
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.getNodeByParam.html
@@ -0,0 +1,32 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(key, value, parentNode)</span><span class="path">zTreeObj.</span>getNodeByParam</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>According to the node data attribute, search the node which exactly matches, and get the JSON object of node.</p>
+			<p class="highlight_red">Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>key</b><span>String</span></h4>
+	<p>The name of attribute which need to exactly match</p>
+	<h4 class="topLine"><b>value</b><span>?</span></h4>
+	<p>The value which need to exactly match, can be any type, please ensure its type consistent with the attribute values.</p>
+	<h4 class="topLine"><b>parentNode</b><span>JSON</span></h4>
+	<p>The search range, you can search node from a parent node's child nodes.</p>
+	<p class="highlight_red">If this parameter is omitted, zTree will search node from all nodes.</p>
+	<h4 class="topLine"><b>Return </b><span>JSON</span></h4>
+	<p>JSON data object of the node which be searched.</p>
+	<p class="highlight_red">1. If search none node, return null.</p>
+	<p class="highlight_red">2. If there are many nodes can be searched, return the first node.</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. Search the node which its 'id' attribute is 1.</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var node = treeObj.getNodeByParam("id", 1, null);
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.getNodeByTId.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.getNodeByTId.html
new file mode 100644
index 0000000..8fd26ea
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.getNodeByTId.html
@@ -0,0 +1,27 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(tId)</span><span class="path">zTreeObj.</span>getNodeByTId</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>According the unique identifier tId of zTree, quick get the node's JSON data object.</p>
+			<p class="highlight_red">Get the node from the cache, don't need to search from all nodes.</p>
+			<p class="highlight_red">Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>tId</b><span>String</span></h4>
+	<p>The unique identifier of node.</p>
+	<h4 class="topLine"><b>Return </b><span>JSON</span></h4>
+	<p>JSON data object of the node which be searched.</p>
+	<p class="highlight_red">If no result, return null.</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. 1. Search the node which its 'tId' attribute is 'tree_10'</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var node = treeObj.getNodeByTId("tree_10");
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.getNodeIndex.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.getNodeIndex.html
new file mode 100644
index 0000000..ad828e7
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.getNodeIndex.html
@@ -0,0 +1,30 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeNode)</span><span class="path">zTreeObj.</span>getNodeIndex</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Get the node's index in the same level nodes. (start from 0)</p>
+			<p class="highlight_red">Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which need to get index.</p>
+	<p class="highlight_red">Please ensure that this data object is an internal node data object in zTree.</p>
+	<h4 class="topLine"><b>Return </b><span>Number</span></h4>
+	<p class="highlight_red">return the index. (start from 0)</p>
+	<p class="highlight_red">If there is no this node, return -1.</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. Get the first selected node's index in the same level nodes.</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getSelectedNodes();
+if (nodes.length>0) {
+	var index = treeObj.getNodeIndex(nodes[0]);
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.getNodes.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.getNodes.html
new file mode 100644
index 0000000..5906a43
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.getNodes.html
@@ -0,0 +1,26 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function()</span><span class="path">zTreeObj.</span>getNodes</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Get all of the nodes in zTree</p>
+			<p class="highlight_red">Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>Return </b><span>Array(JSON)</span></h4>
+	<p>return all of the nodes</p>
+	<p class="highlight_red">1. This array is a collection of the root nodes  (the default child nodes are in the 'children' attributes);</p>
+	<p class="highlight_red">2. Traverse all the nodes need to use recursion, or the use of transformToArray() method make the nodes to be a simple array.</p>
+	<p class="highlight_red">3. For the asynchronous loading mode, can't get the nodes which are yet loaded.</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. Get all of the nodes</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getNodes();
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.getNodesByFilter.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.getNodesByFilter.html
new file mode 100644
index 0000000..2cd6baa
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.getNodesByFilter.html
@@ -0,0 +1,43 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(filter, isSingle, parentNode, invokeParam)</span><span class="path">zTreeObj.</span>getNodesByFilter</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Search the single node's data or collection of nodes's data by custom rules.</p>
+			<p class="highlight_red">Can be customized complex search rules.</p>
+			<p class="highlight_red">Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>filter</b><span>Function</span></h4>
+	<p>Custom search function. e.g. function filter(node) {...}</p>
+	<p>filter's parameter: node (node's data -- JSON)</p>
+	<p>filter's return: boolean (true means: match the rules; false means: don't match the rules)</p>
+	<h4 class="topLine"><b>isSingle</b><span>Boolean</span></h4>
+	<p>isSingle = true means: search only one node</p>
+	<p>isSingle = false means: search the array of the nodes</p>
+	<p class="highlight_red">If this parameter is omitted, as same as false</p>
+	<h4 class="topLine"><b>parentNode</b><span>JSON</span></h4>
+	<p>The search range, you can search node from a parent node's child nodes.</p>
+	<p class="highlight_red">If this parameter is omitted, zTree will search node from all nodes.</p>
+	<h4 class="topLine"><b>invokeParam</b><span>anything</span></h4>
+	<p>Custom data object by user, used to calculate in the filter function.</p>
+	<h4 class="topLine"><b>Return </b><span>Array(JSON) / JSON</span></h4>
+	<p>If isSingle = true, will return the first node's data (JSON) what be matched. If no match, return null.</p>
+	<p>If isSingle = false, will return the array of all nodes's data what be matched. if no match, return [ ].</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. Search the nodes which their 'name' contains 'test' and 'level' is 2.</h4>
+	<pre xmlns=""><code>function filter(node) {
+    return (node.level == 2 && node.name.indexOf("test")>-1);
+}
+......
+var treeObj = $.fn.zTree.getZTreeObj("tree");
+var node = treeObj.getNodesByFilter(filter, true); // search only one node
+var nodes = treeObj.getNodesByFilter(filter); // search the array of the nodes
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.getNodesByParam.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.getNodesByParam.html
new file mode 100644
index 0000000..3173af4
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.getNodesByParam.html
@@ -0,0 +1,31 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(key, value, parentNode)</span><span class="path">zTreeObj.</span>getNodesByParam</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>According to the node data attribute, search the nodes which exactly matches, and get the JSON objects collection of nodes.</p>
+			<p class="highlight_red">Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>key</b><span>String</span></h4>
+	<p>The name of attribute which need to exactly match</p>
+	<h4 class="topLine"><b>value</b><span>?</span></h4>
+	<p>The value which need to exactly match, can be any type, please ensure its type consistent with the attribute values.</p>
+	<h4 class="topLine"><b>parentNode</b><span>JSON</span></h4>
+	<p>The search range, you can search node from a parent node's child nodes.</p>
+	<p class="highlight_red">If this parameter is omitted, zTree will search node from all nodes.</p>
+	<h4 class="topLine"><b>Return </b><span>Array(JSON)</span></h4>
+	<p>The JSON data objects collection of the nodes which be searched.</p>
+	<p class="highlight_red">If search none node, return [ ].</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. Search the nodes which their 'name' attribute is 'test'.</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getNodesByParam("name", "test", null);
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.getNodesByParamFuzzy.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.getNodesByParamFuzzy.html
new file mode 100644
index 0000000..14b6c29
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.getNodesByParamFuzzy.html
@@ -0,0 +1,32 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(key, value, parentNode)</span><span class="path">zTreeObj.</span>getNodesByParamFuzzy</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>According to the node data attribute, search the nodes which fuzzy matches, and get the JSON objects collection of nodes.</p>
+			<p class="highlight_red">Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>key</b><span>String</span></h4>
+	<p>The name of attribute which need to fuzzy match</p>
+	<h4 class="topLine"><b>value</b><span>String</span></h4>
+	<p>The value which need to fuzzy match.</p>
+	<p class="highlight_red">The type of value can only be String</p>
+	<h4 class="topLine"><b>parentNode</b><span>JSON</span></h4>
+	<p>The search range, you can search node from a parent node's child nodes.</p>
+	<p class="highlight_red">If this parameter is omitted, zTree will search node from all nodes.</p>
+	<h4 class="topLine"><b>Return </b><span>Array(JSON)</span></h4>
+	<p>The JSON data objects collection of the nodes which be searched.</p>
+	<p class="highlight_red">If search none node, return [ ].</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. Search the nodes which their 'name' attribute contains the string 'test'.</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getNodesByParamFuzzy("name", "test", null);
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.getSelectedNodes.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.getSelectedNodes.html
new file mode 100644
index 0000000..4a0f060
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.getSelectedNodes.html
@@ -0,0 +1,23 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function()</span><span class="path">zTreeObj.</span>getSelectedNodes</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Get the JSON data objects collection of the selected nodes in zTree.</p>
+			<p class="highlight_red">Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>Return </b><span>Array(JSON)</span></h4>
+	<p>The JSON data objects collection of the selected nodes.</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. get the selected nodes</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getSelectedNodes();
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.hideNode.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.hideNode.html
new file mode 100644
index 0000000..f02f523
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.hideNode.html
@@ -0,0 +1,29 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeNode)</span><span class="path">zTreeObj.</span>hideNode</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exhide</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>To hide any node.</p>
+			<p class="highlight_red">1. This feature can't support the 'exedit' feature, so please don't use this feature in edit mode.</p>
+			<p class="highlight_red">2. If you hide or show the nodes, it will effect the 'isFirstNode' and 'isLastNode' attribute.</p>
+			<p class="highlight_red">3. Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which will be hidden</p>
+	<p class="highlight_red">Please ensure that this data object is an internal node data object in zTree.</p>
+	<h4 class="topLine"><b>Retrun </b><span>none</span></h4>
+	<p>no return value</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. hide the first root node.</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getNodes();
+treeObj.hideNode(nodes[0]);
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.hideNodes.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.hideNodes.html
new file mode 100644
index 0000000..9bf8e6b
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.hideNodes.html
@@ -0,0 +1,29 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeNodes)</span><span class="path">zTreeObj.</span>hideNodes</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exhide</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>To hide a group of nodes.</p>
+			<p class="highlight_red">1. This feature can't support the 'exedit' feature, so please don't use this feature in edit mode.</p>
+			<p class="highlight_red">2. If you hide or show the nodes, it will effect the 'isFirstNode' and 'isLastNode' attribute.</p>
+			<p class="highlight_red">3. Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeNodes</b><span>Array(JSON)</span></h4>
+	<p>the array of the nodes which will be hidden</p>
+	<p class="highlight_red">Please ensure that this data object is an internal node data object in zTree.</p>
+	<h4 class="topLine"><b>Retrun </b><span>none</span></h4>
+	<p>no return value</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. hide the first root node's children.</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getNodes();
+treeObj.hideNodes(nodes[0].children);
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.moveNode.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.moveNode.html
new file mode 100644
index 0000000..cb1e4df
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.moveNode.html
@@ -0,0 +1,49 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(targetNode, treeNode, moveType, isSilent)</span><span class="path">zTreeObj.</span>moveNode</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Move the node</p>
+			<p class="highlight_red">Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>targetNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which will be target.</p>
+	<p class="highlight_red">If move the node to root node, please set the 'targetNode' to null.</p>
+	<p class="highlight_red">Please ensure that this data object is an internal node data object in zTree.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which will be moved.</p>
+	<p class="highlight_red">Please ensure that this data object is an internal node data object in zTree.</p>
+	<h4 class="topLine"><b>moveType</b><span>String</span></h4>
+	<p>Moved to the target node's relative position.</p>
+	<p class="highlight_red">"inner" means: to be taregetNode's child node.</p>
+	<p class="highlight_red">"prev" means: to be taregetNode's previous sibling node.</p>
+	<p class="highlight_red">"next" means: to be taregetNode's next sibling node.</p>
+	<h4 class="topLine"><b>isSilent</b><span>Boolean</span></h4>
+	<p>After move the node, whether to automatically expand its parent node.</p>
+	<p>isSilent = true means: don't expand its parent node.</p>
+	<p>isSilent = false or omit this parameter means: expand its parent node.</p>
+	<h4 class="topLine"><b>Return </b><span>JSON</span></h4>
+	<p>return the node which be moved, it is same as the 'treeNode' parameter.</p>
+	<p class="highlight_red">Return null means: move node has failed. The cause:<br/>
+		&nbsp;1. the targetNode is the treeNode's parent node, and moveType = "inner"<br/>
+		&nbsp;2. the targetNode is the treeNode's child node.
+	</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. Move the second root node to the first root node's child node.</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getNodes();
+treeObj.moveNode(nodes[0], nodes[1], "inner");
+</code></pre>
+	<h4>2. Move the second root node to the first root node's previous sibling node.</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getNodes();
+treeObj.moveNode(nodes[0], nodes[1], "before");
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.reAsyncChildNodes.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.reAsyncChildNodes.html
new file mode 100644
index 0000000..63a0896
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.reAsyncChildNodes.html
@@ -0,0 +1,42 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(parentNode, reloadType, isSilent)</span><span class="path">zTreeObj.</span>reAsyncChildNodes</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Forced asynchronous loading child nodes of parent node. It is valid when <span class="highlight_red">[setting.async.enable = true]</span></p>
+			<p class="highlight_red">You can use this method to reload child nodes.</p>
+			<p class="highlight_red">Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>parentNode</b><span>JSON</span></h4>
+	<p>The parent node which will asynchronous loading child nodes.</p>
+	<p class="highlight_red">1. If parentNode = null, it is same as reload root nodes.</p>
+	<p class="highlight_red">2. If parentNode.isParent = false, don't load nodes.</p>
+	<p class="highlight_red">3. Please ensure that this data object is an internal node data object in zTree.</p>
+	<h4 class="topLine"><b>reloadType</b><span>String</span></h4>
+	<p>reloadType = "refresh" means: reload child nodes.</p>
+	<p>reloadType != "refresh" means: append to load child nodes.</p>
+	<h4 class="topLine"><b>isSilent</b><span>Boolean</span></h4>
+	<p>Set whether to automatically expand the parent node, after load nodes.</p>
+	<p>isSilent = true means: don't auto expand the parent node. Otherwise auto expand.</p>
+	<h4 class="topLine"><b>Return </b><span>none</span></h4>
+	<p>no return value</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. reload root nodes</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+treeObj.reAsyncChildNodes(null, "refresh");
+</code></pre>
+	<h4>2. reload the first selected node's child nodes.</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getSelectedNodes();
+if (nodes.length>0) {
+	treeObj.reAsyncChildNodes(nodes[0], "refresh");
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.refresh.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.refresh.html
new file mode 100644
index 0000000..8316192
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.refresh.html
@@ -0,0 +1,24 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function()</span><span class="path">zTreeObj.</span>refresh</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Refresh zTree</p>
+			<p class="highlight_red">If you have no special need, try not to use this method. If you refresh single node, please use updateNode() method. If you refresh child nodes in dynamic mode, please use the reAsyncChildNodes() method.</p>
+			<p class="highlight_red">Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>Return </b><span>none</span></h4>
+	<p>no return value</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. refresh zTree </h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+treeObj.refresh();
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.removeChildNodes.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.removeChildNodes.html
new file mode 100644
index 0000000..c249e17
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.removeChildNodes.html
@@ -0,0 +1,32 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(parentNode)</span><span class="path">zTreeObj.</span>removeChildNodes</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Remove a parent node's child nodes</p>
+			<p class="highlight_red">1. After remove child nodes, the parent node will become a leaf node. Such as the need to maintain the parent node is still a parent node, set 'setting.data.keep.parent' attribute.</p>
+			<p class="highlight_red">2. Do not use this method to empty the root. If you need to empty the root, you can initialization zTree, and set the initial nodes is null.</p>
+			<p class="highlight_red">3. This method does not trigger any callback function.</p>
+			<p class="highlight_red">Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>parentNode</b><span>JSON</span></h4>
+	<p>The parent node which need to clear its child nodes.</p>
+	<p class="highlight_red">Please ensure that this data object is an internal node data object in zTree.</p>
+	<h4 class="topLine"><b>Return </b><span>Array(JSON)</span></h4>
+	<p>Return the parent node's child nodes which have been removed. If has no child nodes, return null.</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. Remove the first selected node's child nodes</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getSelectedNodes();
+if (nodes && nodes.length>0) {
+	treeObj.removeChildNodes(nodes[0]);
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.removeNode.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.removeNode.html
new file mode 100644
index 0000000..605322f
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.removeNode.html
@@ -0,0 +1,34 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeNode, callbackFlag)</span><span class="path">zTreeObj.</span>removeNode</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Remove a node</p>
+			<p class="highlight_red">Use removeNode() method of zTree v3.x can trigger 'beforeRemove / onRemove' callback function. for reduce redundant code.</p>
+			<p class="highlight_red">Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which will be removed.</p>
+	<p class="highlight_red">Please ensure that this data object is an internal node data object in zTree.</p>
+	<h4 class="topLine"><b>callbackFlag</b><span>Boolean</span></h4>
+	<p>callbackFlag = true means: call this method, will trigger 'beforeRemove' & 'onRemove' callback.</p>
+	<p>callbackFlag = false means: call this method, will not trigger callback.</p>
+	<p class="highlight_red">If this parameter is omitted, it is same as 'callbackFlag = false'</p>
+	<h4 class="topLine"><b>Return </b><span>none</span></h4>
+	<p>no return value</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. Remove all of the selected nodes.</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getSelectedNodes();
+for (var i=0, l=nodes.length; i < l; i++) {
+	treeObj.removeNode(nodes[i]);
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.selectNode.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.selectNode.html
new file mode 100644
index 0000000..237f199
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.selectNode.html
@@ -0,0 +1,34 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeNode, addFlag)</span><span class="path">zTreeObj.</span>selectNode</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Select a node</p>
+			<p class="highlight_red">zTree v3.x supports select multiple nodes.</p>
+			<p class="highlight_red">Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which will be selected.</p>
+	<p class="highlight_red">Please ensure that this data object is an internal node data object in zTree.</p>
+	<h4 class="topLine"><b>addFlag</b><span>Boolean</span></h4>
+	<p>addFlag = true means: append to select node, don't affect the previously selected node, can select multiple nodes.</p>
+	<p>addFlag = false means: select single node, prior the selected node is deselected.</p>
+	<p class="highlight_red">If setting.view.selectedMulti = false, this para, this parameter is not valid, always select single node</p>
+	<h4 class="topLine"><b>Return </b><span>none</span></h4>
+	<p>no return value</p>
+	</div>
+	<h3>Exampleso of function</h3>
+	<h4>1. Select single node which be first selected.</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getNodes();
+if (nodes.length>0) {
+	treeObj.selectNode(nodes[0]);
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.setChkDisabled.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.setChkDisabled.html
new file mode 100644
index 0000000..1d645e8
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.setChkDisabled.html
@@ -0,0 +1,44 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(node, disabled, inheritParent, inheritChildren)</span><span class="path">zTreeObj.</span>setChkDisabled</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.excheck</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Set the node's checkbox or radio is disabled or remove disabled. It is valid when <span class="highlight_red">[setting.check.enable = true]</span></p>
+			<p class="highlight_red">1. After the node's checkbox / radio is disabled, it can not be checked or unchecked, but it can affect the half-checked status of the parent node.</p>
+			<p class="highlight_red">2. Please do not directly modify the 'chkDisabled' attribute of the loaded node.</p>
+			<p class="highlight_red">3. Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which need to be checked or unchecked.</p>
+	<p class="highlight_red">Please ensure that this data object is an internal node data object in zTree.</p>
+	<h4 class="topLine"><b>disabled</b><span>Boolean</span></h4>
+	<p>disabled = true means: the node's checkbox / radio is disabled.</p>
+	<p>disabled = false means: the node's checkbox / radio is removed disabled.</p>
+	<p class="highlight_red">If this parameter is omitted, it is same as disabled = false </p>
+	<p class="highlight_red">Don't affect the node which 'nochecked' attribute is true.</p>
+	<h4 class="topLine"><b>inheritParent</b><span>Boolean</span></h4>
+	<p>inheritParent = true means: all parent nodes's disabled status will be same as this node.</p>
+	<p>inheritParent = false means: all parent nodes's disabled status will be not affected.</p>
+	<p class="highlight_red">If this parameter is omitted, it is same as 'inheritParent = false'</p>
+	<h4 class="topLine"><b>inheritChildren</b><span>Boolean</span></h4>
+	<p>inheritChildren = true means: all child nodes's disabled status will be same as this node.</p>
+	<p>inheritChildren = false means: all child nodes's disabled status will be not affected.</p>
+	<p class="highlight_red">If this parameter is omitted, it is same as 'inheritChildren = false'</p>
+	<h4 class="topLine"><b>Return </b><span>none</span></h4>
+	<p>no return value</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. Set the selected nodes's checkbox / radio to be disabled.</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getSelectedNodes();
+for (var i=0, l=nodes.length; i < l; i++) {
+	treeObj.setChkDisabled(nodes[i], true);
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.setEditable.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.setEditable.html
new file mode 100644
index 0000000..a44b0ff
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.setEditable.html
@@ -0,0 +1,27 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(editable)</span><span class="path">zTreeObj.</span>setEditable</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Edit mode and normal mode switch.</p>
+			<p class="highlight_red">To use edit mode, please set the attributes in 'setting.edit'</p>
+			<p class="highlight_red">Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>editable</b><span>Boolean</span></h4>
+	<p>true means: set zTree to edit mode.</p>
+	<p>false means: set zTree to normal mode.</p>
+	<h4><b>Return </b><span>none</span></h4>
+	<p>no return value</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. set zTree to edit mode</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+treeObj.setEditable(true);
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.setting.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.setting.html
new file mode 100644
index 0000000..d80c139
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.setting.html
@@ -0,0 +1,14 @@
+<div class="apiDetail">
+<div>
+	<h2><span>JSON</span><span class="path">zTreeObj.</span>setting</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>The configuration data of zTree, refer to "<span class="highlight_red">setting details</span>" </p>
+			<p class="highlight_red">zTree v3.x to cancel the original operation setting method, so users can modify.</p>
+			<p class="highlight_red">Note: Modify the parameters which affect zTree initialization will not work, please first understand the different attributes.</p>
+		</div>
+	</div>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.showNode.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.showNode.html
new file mode 100644
index 0000000..53b5cbd
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.showNode.html
@@ -0,0 +1,31 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeNode)</span><span class="path">zTreeObj.</span>showNode</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exhide</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>To hide any node which be hidden.</p>
+			<p class="highlight_red">1. This feature can't support the 'exedit' feature, so please don't use this feature in edit mode.</p>
+			<p class="highlight_red">2. If you hide or show the nodes, it will effect the 'isFirstNode' and 'isLastNode' attribute.</p>
+			<p class="highlight_red">3. Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeNodes</b><span>Array(JSON)</span></h4>
+	<p>JSON data object of the node which will be shown</p>
+	<p class="highlight_red">Please ensure that this data object is an internal node data object in zTree.</p>
+	<h4 class="topLine"><b>Retrun </b><span>none</span></h4>
+	<p>no return value</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. show someone node which be hidden.</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var node = treeObj.getNodeByParam("isHidden", true);
+if (node) {
+  treeObj.showNode(node);
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.showNodes.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.showNodes.html
new file mode 100644
index 0000000..c0c926c
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.showNodes.html
@@ -0,0 +1,29 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeNodes)</span><span class="path">zTreeObj.</span>showNodes</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exhide</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>To show a group of nodes which be hidden.</p>
+			<p class="highlight_red">1. This feature can't support the 'exedit' feature, so please don't use this feature in edit mode.</p>
+			<p class="highlight_red">2. If you hide or show the nodes, it will effect the 'isFirstNode' and 'isLastNode' attribute.</p>
+			<p class="highlight_red">3. Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeNodes</b><span>Array(JSON)</span></h4>
+	<p>the array of the nodes which will be shown</p>
+	<p class="highlight_red">Please ensure that this data object is an internal node data object in zTree.</p>
+	<h4 class="topLine"><b>Retrun </b><span>none</span></h4>
+	<p>no return value</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. show all of the nodes which be hidden.</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getNodesByParam("isHidden", true);
+treeObj.showNodes(nodes);
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.transformToArray.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.transformToArray.html
new file mode 100644
index 0000000..4b2296d
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.transformToArray.html
@@ -0,0 +1,27 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeNodes)</span><span class="path">zTreeObj.</span>transformToArray</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p></p>
+			<p>Transform the zTree nodes data into simple array.  (To avoid the user to write code to traverse all nodes)</p>
+			<p class="highlight_red">Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeNodes</b><span>Array(JSON) / JSON</span></h4>
+	<p>JSON data object of the node which need to be transformed.</p>
+	<p>or JSON data objects collection of the nodes which need to be transformed.</p>
+	<h4 class="topLine"><b>Return </b><span>Array(JSON)</span></h4>
+	<p>The JSON data objects array of the nodes which be transformed.</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. Transform the zTree nodes data into simple array.</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.transformToArray(treeObj.getNodes());
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.transformTozTreeNodes.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.transformTozTreeNodes.html
new file mode 100644
index 0000000..51d4a62
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.transformTozTreeNodes.html
@@ -0,0 +1,44 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(simpleNodes)</span><span class="path">zTreeObj.</span>transformTozTreeNodes</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Transform the simple array into zTree nodes data.</p>
+			<p class="highlight_red">If you use this method, you must set 'setting.data.simpleData.idKey' and 'setting.data.simpleData.pIdKey' attribute, and let the data are consistent with parent-child relationship.</p>
+			<p class="highlight_red">Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>simpleNodes</b><span>Array(JSON) / JSON</span></h4>
+	<p>JSON data object of the node which need to be transformed.</p>
+	<p>or JSON data objects array of the nodes which need to be transformed.</p>
+	<h4 class="topLine"><b>Return </b><span>Array(JSON)</span></h4>
+	<p>Standard data which zTree use. The child nodes are stored in the parent node's 'children' attribute.</p>
+	<p class="highlight_red">If simpleNodes is a single JSON, so the return array's length is 1.</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. Transform the simple array data into zTree nodes format.</h4>
+	<pre xmlns=""><code>var setting = {
+	data: {
+		simpleData: {
+			enable: true,
+			idKey: "id",
+			pIdKey: "pId",
+			rootPId: 0,
+		}
+	}
+};
+var simpleNodes = [
+    {"id":1, "pId":0, "name":"test1"},
+    {"id":11, "pId":1, "name":"test11"},
+    {"id":12, "pId":1, "name":"test12"},
+    {"id":111, "pId":11, "name":"test111"}
+];
+var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.transformTozTreeNodes(simpleNodes);
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.updateNode.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.updateNode.html
new file mode 100644
index 0000000..7639ff4
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/api/en/zTreeObj.updateNode.html
@@ -0,0 +1,37 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeNode, checkTypeFlag)</span><span class="path">zTreeObj.</span>updateNode</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Update node data. Primarily used to update the node's DOM.</p>
+			<p class="highlight_red">1. Can update the attributes for display (e.g. 'name', 'target', 'url', 'icon', 'iconSkin', 'checked', 'nocheck'), do not update the other attributes. For example: If you need to expand the node, please use expandNode() method, do not modify the 'open' attribute.</p>
+			<p class="highlight_red">2. Use updateNode() method of zTree can't trigger 'beforeCheck' or 'onCheck' callback function.</p>
+			<p class="highlight_red">Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which need to update.</p>
+	<p class="highlight_red">Please ensure that this data object is an internal node data object in zTree.</p>
+	<h4 class="topLine"><b>checkTypeFlag</b><span>Boolean</span></h4>
+	<p>checkTypeFlag = true means: According to 'setting.check.chkboxType' attribute automatically check or uncheck the parent and child nodes.</p>
+	<p>checkTypeFlag = false means: only check or uncheck this node, don't affect its parent and child nodes.</p>
+	<p class="highlight_red">This parameter is valid when 'setting.check.enable = true' and 'setting.check.chkStyle = "checkbox"'</p>
+	<p class="highlight_red">Don't affect the parent and child nodes which 'nochecked' attribute is true.</p>
+	<h4 class="topLine"><b>Return </b><span>none</span></h4>
+	<p>no return value</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. Modify the first selected node's name, and update it.</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getNodes();
+if (nodes.length>0) {
+	nodes[0].name = "test";
+	treeObj.updateNode(nodes[0]);
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/css/demo.css b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/css/demo.css
new file mode 100644
index 0000000..f6dba0d
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/css/demo.css
@@ -0,0 +1,33 @@
+html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, font, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td {
+	margin: 0;padding: 0;border: 0;outline: 0;font-weight: inherit;font-style: inherit;font-size: 100%;font-family: inherit;vertical-align: baseline;}
+body {color: #2f332a;font: 15px/21px Arial, Helvetica, simsun, sans-serif;background: #f0f6e4 \9;}
+h1, h2, h3, h4, h5, h6 {color: #2f332a;font-weight: bold;font-family: Helvetica, Arial, sans-serif;padding-bottom: 5px;}
+h1 {font-size: 24px;line-height: 34px;text-align: center;}
+h2 {font-size: 14px;line-height: 24px;padding-top: 5px;}
+h6 {font-weight: normal;font-size: 12px;letter-spacing: 1px;line-height: 24px;text-align: center;}
+a {color:#3C6E31;text-decoration: underline;}
+a:hover {background-color:#3C6E31;color:white;}
+input.radio {margin: 0 2px 0 8px;}
+input.radio.first {margin-left:0;}
+input.empty {color: lightgray;}
+code {color: #2f332a;}
+.highlight_red {color:#A60000;}
+.highlight_green {color:#A7F43D;}
+li {list-style: circle;font-size: 12px;}
+li.title {list-style: none;}
+ul.list {margin-left: 17px;}
+
+div.content_wrap {width: 600px;height:380px;}
+div.content_wrap div.left{float: left;width: 250px;}
+div.content_wrap div.right{float: right;width: 340px;}
+div.zTreeDemoBackground {width:250px;height:362px;text-align:left;}
+
+ul.ztree {margin-top: 10px;border: 1px solid #617775;background: #f0f6e4;width:220px;height:360px;overflow-y:scroll;overflow-x:auto;}
+ul.log {border: 1px solid #617775;background: #f0f6e4;width:300px;height:170px;overflow: hidden;}
+ul.log.small {height:45px;}
+ul.log li {color: #666666;list-style: none;padding-left: 10px;}
+ul.log li.dark {background-color: #E3E3E3;}
+
+/* ruler */
+div.ruler {height:20px; width:220px; background-color:#f0f6e4;border: 1px solid #333; margin-bottom: 5px; cursor: pointer}
+div.ruler div.cursor {height:20px; width:30px; background-color:#3C6E31; color:white; text-align: right; padding-right: 5px; cursor: pointer}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/css/zTreeStyle/img/diy/1_close.png b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/css/zTreeStyle/img/diy/1_close.png
new file mode 100644
index 0000000..68ccb3c
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/css/zTreeStyle/img/diy/1_close.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/css/zTreeStyle/img/diy/1_open.png b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/css/zTreeStyle/img/diy/1_open.png
new file mode 100644
index 0000000..d6ff36d
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/css/zTreeStyle/img/diy/1_open.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/css/zTreeStyle/img/diy/2.png b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/css/zTreeStyle/img/diy/2.png
new file mode 100644
index 0000000..9eff506
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/css/zTreeStyle/img/diy/2.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/css/zTreeStyle/img/diy/3.png b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/css/zTreeStyle/img/diy/3.png
new file mode 100644
index 0000000..d7ba6d0
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/css/zTreeStyle/img/diy/3.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/css/zTreeStyle/img/diy/4.png b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/css/zTreeStyle/img/diy/4.png
new file mode 100644
index 0000000..753e2bf
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/css/zTreeStyle/img/diy/4.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/css/zTreeStyle/img/diy/5.png b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/css/zTreeStyle/img/diy/5.png
new file mode 100644
index 0000000..0c5eccd
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/css/zTreeStyle/img/diy/5.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/css/zTreeStyle/img/diy/6.png b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/css/zTreeStyle/img/diy/6.png
new file mode 100644
index 0000000..070b835
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/css/zTreeStyle/img/diy/6.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/css/zTreeStyle/img/diy/7.png b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/css/zTreeStyle/img/diy/7.png
new file mode 100644
index 0000000..532b037
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/css/zTreeStyle/img/diy/7.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/css/zTreeStyle/img/diy/8.png b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/css/zTreeStyle/img/diy/8.png
new file mode 100644
index 0000000..a8f3a86
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/css/zTreeStyle/img/diy/8.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/css/zTreeStyle/img/diy/9.png b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/css/zTreeStyle/img/diy/9.png
new file mode 100644
index 0000000..4db73cd
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/css/zTreeStyle/img/diy/9.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/css/zTreeStyle/img/line_conn.gif b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/css/zTreeStyle/img/line_conn.gif
new file mode 100644
index 0000000..d561d36
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/css/zTreeStyle/img/line_conn.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/css/zTreeStyle/img/loading.gif b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/css/zTreeStyle/img/loading.gif
new file mode 100644
index 0000000..e8c2892
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/css/zTreeStyle/img/loading.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/css/zTreeStyle/img/zTreeStandard.gif b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/css/zTreeStyle/img/zTreeStandard.gif
new file mode 100644
index 0000000..50c94fd
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/css/zTreeStyle/img/zTreeStandard.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/css/zTreeStyle/img/zTreeStandard.png b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/css/zTreeStyle/img/zTreeStandard.png
new file mode 100644
index 0000000..ffda01e
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/css/zTreeStyle/img/zTreeStandard.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/css/zTreeStyle/zTreeStyle.css b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/css/zTreeStyle/zTreeStyle.css
new file mode 100644
index 0000000..f06554e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/css/zTreeStyle/zTreeStyle.css
@@ -0,0 +1,97 @@
+/*-------------------------------------
+zTree Style
+
+version:	3.4
+author:		Hunter.z
+email:		hunter.z@263.net
+website:	http://code.google.com/p/jquerytree/
+
+-------------------------------------*/
+
+.ztree * {padding:0; margin:0; font-size:12px; font-family: Verdana, Arial, Helvetica, AppleGothic, sans-serif}
+.ztree {margin:0; padding:5px; color:#333}
+.ztree li{padding:0; margin:0; list-style:none; line-height:14px; text-align:left; white-space:nowrap; outline:0}
+.ztree li ul{ margin:0; padding:0 0 0 18px}
+.ztree li ul.line{ background:url(./img/line_conn.gif) 0 0 repeat-y;}
+
+.ztree li a {padding:1px 3px 0 0; margin:0; cursor:pointer; height:17px; color:#333; background-color: transparent;
+	text-decoration:none; vertical-align:top; display: inline-block}
+.ztree li a:hover {text-decoration:underline}
+.ztree li a.curSelectedNode {padding-top:0px; background-color:#FFE6B0; color:black; height:16px; border:1px #FFB951 solid; opacity:0.8;}
+.ztree li a.curSelectedNode_Edit {padding-top:0px; background-color:#FFE6B0; color:black; height:16px; border:1px #FFB951 solid; opacity:0.8;}
+.ztree li a.tmpTargetNode_inner {padding-top:0px; background-color:#316AC5; color:white; height:16px; border:1px #316AC5 solid;
+	opacity:0.8; filter:alpha(opacity=80)}
+.ztree li a.tmpTargetNode_prev {}
+.ztree li a.tmpTargetNode_next {}
+.ztree li a input.rename {height:14px; width:80px; padding:0; margin:0;
+	font-size:12px; border:1px #7EC4CC solid; *border:0px}
+.ztree li span {line-height:16px; margin-right:2px}
+.ztree li span.button {line-height:0; margin:0; width:16px; height:16px; display: inline-block; vertical-align:middle;
+	border:0 none; cursor: pointer;outline:none;
+	background-color:transparent; background-repeat:no-repeat; background-attachment: scroll;
+	background-image:url("./img/zTreeStandard.png"); *background-image:url("./img/zTreeStandard.gif")}
+
+.ztree li span.button.chk {width:13px; height:13px; margin:0 3px 0 0; cursor: auto}
+.ztree li span.button.chk.checkbox_false_full {background-position:0 0}
+.ztree li span.button.chk.checkbox_false_full_focus {background-position:0 -14px}
+.ztree li span.button.chk.checkbox_false_part {background-position:0 -28px}
+.ztree li span.button.chk.checkbox_false_part_focus {background-position:0 -42px}
+.ztree li span.button.chk.checkbox_false_disable {background-position:0 -56px}
+.ztree li span.button.chk.checkbox_true_full {background-position:-14px 0}
+.ztree li span.button.chk.checkbox_true_full_focus {background-position:-14px -14px}
+.ztree li span.button.chk.checkbox_true_part {background-position:-14px -28px}
+.ztree li span.button.chk.checkbox_true_part_focus {background-position:-14px -42px}
+.ztree li span.button.chk.checkbox_true_disable {background-position:-14px -56px}
+.ztree li span.button.chk.radio_false_full {background-position:-28px 0}
+.ztree li span.button.chk.radio_false_full_focus {background-position:-28px -14px}
+.ztree li span.button.chk.radio_false_part {background-position:-28px -28px}
+.ztree li span.button.chk.radio_false_part_focus {background-position:-28px -42px}
+.ztree li span.button.chk.radio_false_disable {background-position:-28px -56px}
+.ztree li span.button.chk.radio_true_full {background-position:-42px 0}
+.ztree li span.button.chk.radio_true_full_focus {background-position:-42px -14px}
+.ztree li span.button.chk.radio_true_part {background-position:-42px -28px}
+.ztree li span.button.chk.radio_true_part_focus {background-position:-42px -42px}
+.ztree li span.button.chk.radio_true_disable {background-position:-42px -56px}
+
+.ztree li span.button.switch {width:18px; height:18px}
+.ztree li span.button.root_open{background-position:-92px -54px}
+.ztree li span.button.root_close{background-position:-74px -54px}
+.ztree li span.button.roots_open{background-position:-92px 0}
+.ztree li span.button.roots_close{background-position:-74px 0}
+.ztree li span.button.center_open{background-position:-92px -18px}
+.ztree li span.button.center_close{background-position:-74px -18px}
+.ztree li span.button.bottom_open{background-position:-92px -36px}
+.ztree li span.button.bottom_close{background-position:-74px -36px}
+.ztree li span.button.noline_open{background-position:-92px -72px}
+.ztree li span.button.noline_close{background-position:-74px -72px}
+.ztree li span.button.root_docu{ background:none;}
+.ztree li span.button.roots_docu{background-position:-56px 0}
+.ztree li span.button.center_docu{background-position:-56px -18px}
+.ztree li span.button.bottom_docu{background-position:-56px -36px}
+.ztree li span.button.noline_docu{ background:none;}
+
+.ztree li span.button.ico_open{margin-right:2px; background-position:-110px -16px; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.ico_close{margin-right:2px; background-position:-110px 0; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.ico_docu{margin-right:2px; background-position:-110px -32px; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.edit {margin-right:2px; background-position:-110px -48px; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.remove {margin-right:2px; background-position:-110px -64px; vertical-align:top; *vertical-align:middle}
+
+.ztree li span.button.ico_loading{margin-right:2px; background:url(./img/loading.gif) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+
+ul.tmpTargetzTree {background-color:#FFE6B0; opacity:0.8; filter:alpha(opacity=80)}
+
+span.tmpzTreeMove_arrow {width:16px; height:16px; display: inline-block; padding:0; margin:2px 0 0 1px; border:0 none; position:absolute;
+	background-color:transparent; background-repeat:no-repeat; background-attachment: scroll;
+	background-position:-110px -80px; background-image:url("./img/zTreeStandard.png"); *background-image:url("./img/zTreeStandard.gif")}
+
+ul.ztree.zTreeDragUL {margin:0; padding:0; position:absolute; width:auto; height:auto;overflow:hidden; background-color:#cfcfcf; border:1px #00B83F dotted; opacity:0.8; filter:alpha(opacity=80)}
+.zTreeMask {z-index:10000; background-color:#cfcfcf; opacity:0.0; filter:alpha(opacity=0); position:absolute}
+
+/* level style*/
+/*.ztree li span.button.level0 {
+	display:none;
+}
+.ztree li ul.level0 {
+	padding:0;
+	background:none;
+}*/
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/asyncData/getNodes.php b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/asyncData/getNodes.php
new file mode 100644
index 0000000..88625a2
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/asyncData/getNodes.php
@@ -0,0 +1,38 @@
+<?php ?>
+[<?php
+$pId = "0";
+$pName = "";
+$pLevel = "";
+$pCheck = "";
+if(array_key_exists( 'id',$_REQUEST)) {
+	$pId=$_REQUEST['id'];
+}
+if(array_key_exists( 'lv',$_REQUEST)) {
+	$pLevel=$_REQUEST['lv'];
+}
+if(array_key_exists('n',$_REQUEST)) {
+	$pName=$_REQUEST['n'];
+}
+if(array_key_exists('chk',$_REQUEST)) {
+	$pCheck=$_REQUEST['chk'];
+}
+if ($pId==null || $pId=="") $pId = "0";
+if ($pLevel==null || $pLevel=="") $pLevel = "0";
+if ($pName==null) $pName = "";
+else $pName = $pName.".";
+
+//for ($i=1; $i<9999; $i++) {
+//	for ($j=1; $j<999; $j++) {
+//
+//	}
+//}
+
+for ($i=1; $i<5; $i++) {
+	$nId = $pId.$i;
+	$nName = $pName."n".$i;
+	echo "{ id:'".$nId."',	name:'".$nName."',	open:true, isParent:".(( $pLevel < "2" && ($i%2)!=0)?"true":"false").($pCheck==""?"":((($pLevel < "2" && ($i%2)!=0)?", halfCheck:true":"").($i==3?", checked:true":"")))."}";
+	if ($i<4) {
+		echo ",";
+	}
+}
+?>]
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/asyncData/getNodesForBigData.php b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/asyncData/getNodesForBigData.php
new file mode 100644
index 0000000..91d002e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/asyncData/getNodesForBigData.php
@@ -0,0 +1,24 @@
+<?php ?>
+[<?php
+$pId = "-1";
+if(array_key_exists( 'id',$_REQUEST)) {
+	$pId=$_REQUEST['id'];
+}
+$pCount = "10";
+if(array_key_exists( 'count',$_REQUEST)) {
+	$pCount=$_REQUEST['count'];
+}
+if ($pId==null || $pId=="") $pId = "0";
+if ($pCount==null || $pCount=="") $pCount = "10";
+
+$max = (int)$pCount;
+for ($i=1; $i<=$max; $i++) {
+	$nId = $pId."_".$i;
+	$nName = "tree".$nId;
+	echo "{ id:'".$nId."',	name:'".$nName."'}";
+	if ($i<$max) {
+		echo ",";
+	}
+	
+}
+?>]
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/bigdata/common.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/bigdata/common.html
new file mode 100644
index 0000000..ded4358
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/bigdata/common.html
@@ -0,0 +1,190 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - big data common</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			check: {
+				enable: true
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				onNodeCreated: onNodeCreated
+			}
+		};
+
+		var dataMaker = function(count) {
+			var nodes = [], pId = -1,
+			min = 10, max = 90, level = 0, curLevel = [], prevLevel = [], levelCount,
+			i = 0,j,k,l,m;
+
+			while (i<count) {
+				if (level == 0) {
+					pId = -1;
+					levelCount = Math.round(Math.random() * max) + min;
+					for (j=0; j<levelCount && i<count; j++, i++) {
+						var n = {id:i, pId:pId, name:"Big-" +i};
+						nodes.push(n);
+						curLevel.push(n);
+					}
+				} else {
+					for (l=0, m=prevLevel.length; l<m && i<count; l++) {
+						pId = prevLevel[l].id;
+						levelCount = Math.round(Math.random() * max) + min;
+						for (j=0; j<levelCount && i<count; j++, i++) {
+							var n = {id:i, pId:pId, name:"Big-" +i};
+							nodes.push(n);
+							curLevel.push(n);
+						}
+					}
+				}
+				prevLevel = curLevel;
+				curLevel = [];
+				level++;
+			}
+			return nodes;
+		}
+
+		var ruler = {
+			doc: null,
+			ruler: null,
+			cursor: null,
+			minCount: 5000,
+			count: 5000,
+			stepCount:500,
+			minWidth: 30,
+			maxWidth: 215,
+			init: function() {
+				ruler.doc = $(document);
+				ruler.ruler = $("#ruler");
+				ruler.cursor = $("#cursor");
+				if (ruler.ruler) {
+					ruler.ruler.bind("mousedown", ruler.onMouseDown);
+					
+				}
+			},
+			onMouseDown: function(e) {
+				ruler.drawRuler(e, true);
+				ruler.doc.bind("mousemove", ruler.onMouseMove);
+				ruler.doc.bind("mouseup", ruler.onMouseUp);
+				ruler.doc.bind("selectstart", ruler.onSelect);
+				$("body").css("cursor", "pointer");
+			},
+			onMouseMove: function(e) {
+				ruler.drawRuler(e);
+				return false;
+			},
+			onMouseUp: function(e) {
+				$("body").css("cursor", "auto");
+				ruler.doc.unbind("mousemove", ruler.onMouseMove);
+				ruler.doc.unbind("mouseup", ruler.onMouseUp);
+				ruler.doc.unbind("selectstart", ruler.onSelect);
+				ruler.drawRuler(e);
+			},
+			onSelect: function (e) {
+				return false;
+			},
+			getCount: function(end) {
+				var start = ruler.ruler.offset().left+1;
+				var c = Math.max((end - start), ruler.minWidth);
+				c = Math.min(c, ruler.maxWidth);
+				return {width:c, count:(c - ruler.minWidth)*ruler.stepCount + ruler.minCount};
+			},
+			drawRuler: function(e, animate) {
+				var c = ruler.getCount(e.clientX);
+				ruler.cursor.stop();
+				if ($.browser.msie || !animate) {
+					ruler.cursor.css({width:c.width});
+				} else {
+					ruler.cursor.animate({width:c.width}, {duration: "fast",easing: "swing", complete:null});
+				}
+				ruler.count = c.count;
+				ruler.cursor.text(c.count);
+			}
+		}
+		var showNodeCount = 0;
+		function onNodeCreated(event, treeId, treeNode) {
+			showNodeCount++;
+		}
+
+		function createTree () {
+			var zNodes = dataMaker(ruler.count);
+			showNodeCount = 0;
+			$("#treeDemo").empty();
+			setting.check.enable = $("#showChk").attr("checked");
+			var time1 = new Date();
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			var time2 = new Date();
+
+			alert("节点共 " + zNodes.length + " 个, 初始化生成 DOM 的节点共 " + showNodeCount + " 个"
+				+ "\n\n 初始化 zTree 共耗时: " + (time2.getTime() - time1.getTime()) + " ms");
+		}
+
+
+		$(document).ready(function(){
+			ruler.init("ruler");
+			$("#createTree").bind("click", createTree);
+
+		});
+		//-->
+	</SCRIPT>
+ </HEAD>
+
+<BODY>
+<h1>一次性加载大数据量</h1>
+<h6>[ 文件路径: bigdata/common.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul>
+		<li><span>调整总节点数，测试加载速度：</span>
+			<div id="ruler" class="ruler" title="拖拽可调整节点数">
+				<div id="cursor" class="cursor">5000</div>
+			</div>
+			<div style="width:220px; text-align: center;">
+				<span>checkbox</span><input type="checkbox" id="showChk" title="是否显示 checkbox" class="checkbox first" />&nbsp;&nbsp;&nbsp;&nbsp;
+				[ <a id="createTree" href="#" title="初始化 zTree" onclick="return false;">初始化 zTree</a> ]
+			</div>
+		</li>
+		</ul>
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、大数据量加载说明</h2>
+				<ul class="list">
+				<li>1)、zTree v3.x 针对大数据量一次性加载进行了更深入的优化，实现了延迟加载功能，即不展开的节点不创建子节点的 DOM。</li>
+				<li class="highlight_red">2)、对于每级节点最多一百左右，但总节点数几千甚至几万，且不是全部展开的数据，一次性加载的效果最明显，速度非常快。</li>
+				<li class="highlight_red">3)、对于某一级节点数就多达几千的情况 延迟加载无效，这种情况建议考虑分页异步加载。</li>
+				<li class="highlight_red">4)、对于全部节点都展开显示的情况，延迟加载无效，这种情况建议不要全部展开。</li>
+				<li>5)、显示 checkbox / radio 会造成一定程度的性能下降。</li>
+				<li>6)、利用 addDiyDom 功能增加自定义控件会影响速度，影响程度受节点数量而定。</li>
+				<li>7)、利用 onNodeCreated 事件回调函数对节点 DOM 进行操作会影响速度，影响程度受节点数量而定。</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、setting 配置信息说明</h2>
+				<ul class="list">
+				<li>不需要进行特殊的配置</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li>对 节点数据 没有特殊要求，用户可以根据自己的需求添加自定义属性</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/bigdata/diy_async.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/bigdata/diy_async.html
new file mode 100644
index 0000000..c4a8bfb
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/bigdata/diy_async.html
@@ -0,0 +1,157 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - big data async</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			async: {
+				enable: true,
+				url: getUrl
+			},
+			check: {
+				enable: true
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			view: {
+				expandSpeed: ""
+			},
+			callback: {
+				beforeExpand: beforeExpand,
+				onAsyncSuccess: onAsyncSuccess,
+				onAsyncError: onAsyncError
+			}
+		};
+
+		var zNodes =[
+			{name:"500个节点", id:"1", count:500, times:1, isParent:true},
+			{name:"1000个节点", id:"2", count:1000, times:1, isParent:true},
+			{name:"2000个节点", id:"3", count:2000, times:1, isParent:true}
+		];
+
+		var log, className = "dark",
+		startTime = 0, endTime = 0, perCount = 100, perTime = 100;
+		function getUrl(treeId, treeNode) {
+			var curCount = (treeNode.children) ? treeNode.children.length : 0;
+			var getCount = (curCount + perCount) > treeNode.count ? (treeNode.count - curCount) : perCount;
+			var param = "id="+treeNode.id+"_"+(treeNode.times++) +"&count="+getCount;
+			return "../asyncData/getNodesForBigData.php?" + param;
+		}
+		function beforeExpand(treeId, treeNode) {
+			if (!treeNode.isAjaxing) {
+				startTime = new Date();
+				treeNode.times = 1;
+				ajaxGetNodes(treeNode, "refresh");
+				return true;
+			} else {
+				alert("zTree 正在下载数据中，请稍后展开节点。。。");
+				return false;
+			}
+		}
+		function onAsyncSuccess(event, treeId, treeNode, msg) {
+			if (!msg || msg.length == 0) {
+				return;
+			}
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			totalCount = treeNode.count;
+			if (treeNode.children.length < totalCount) {
+				setTimeout(function() {ajaxGetNodes(treeNode);}, perTime);
+			} else {
+				treeNode.icon = "";
+				zTree.updateNode(treeNode);
+				zTree.selectNode(treeNode.children[0]);
+				endTime = new Date();
+				var usedTime = (endTime.getTime() - startTime.getTime())/1000;
+				className = (className === "dark" ? "":"dark");
+				showLog("[ "+getTime()+" ]&nbsp;&nbsp;treeNode:" + treeNode.name );
+				showLog("加载完毕，共进行 "+ (treeNode.times-1) +" 次异步加载, 耗时："+ usedTime + " 秒");
+			}
+		}
+		function onAsyncError(event, treeId, treeNode, XMLHttpRequest, textStatus, errorThrown) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			alert("异步获取数据出现异常。");
+			treeNode.icon = "";
+			zTree.updateNode(treeNode);
+		}
+		function ajaxGetNodes(treeNode, reloadType) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			if (reloadType == "refresh") {
+				treeNode.icon = "../../../css/zTreeStyle/img/loading.gif";
+				zTree.updateNode(treeNode);
+			}
+			zTree.reAsyncChildNodes(treeNode, reloadType, true);
+		}
+		function showLog(str) {
+			if (!log) log = $("#log");
+			log.append("<li class='"+className+"'>"+str+"</li>");
+			if(log.children("li").length > 4) {
+				log.get(0).removeChild(log.children("li")[0]);
+			}
+		}
+		function getTime() {
+			var now= new Date(),
+			h=now.getHours(),
+			m=now.getMinutes(),
+			s=now.getSeconds(),
+			ms=now.getMilliseconds();
+			return (h+":"+m+":"+s+ " " +ms);
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+
+		});
+		//-->
+	</SCRIPT>
+ </HEAD>
+
+<BODY>
+<h1>分批异步加载大数据量</h1>
+<h6>[ 文件路径: bigdata/diy_async.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul>
+			<li class="highlight_red">&nbsp;&nbsp;&nbsp;&nbsp;此 Demo 专门用于测试分批异步加载，每次展开节点都要重新进行异步加载。</li>
+		</ul>
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、大数据量加载说明</h2>
+				<ul class="list">
+				<li>1)、对于某一级节点数多达几千个的时候，zTree 默认的延迟加载是无效的，此 Demo 演示了一种原先 zTree v2.6 时的分批加载节点的方法。</li>
+				<li class="highlight_red">2)、此方法适用于1、2千个节点必须全部显示的需求。</li>
+				<li class="highlight_red">3)、此方法并不能解决加载慢的问题，相反只会让最终结果出现的更慢，只是可以有限度的避免浏览器假死，而且显示的节点越多就越慢。</li>
+				<li>4)、对于某一级节点数至少几千个的情况，另一个解决方案是：分页异步加载。<br/>
+					async load log:<br/>
+					<ul id="log" class="log" style="height:85px"></ul></li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、setting 配置信息说明</h2>
+				<ul class="list">
+				<li>需要设置 setting.async 异步加载部分的参数</li>
+				<li>建议关闭动画效果 setting.view.expandSpeed = "";</li>
+				<li>其他不需要进行特殊的配置，根据自己的需求自行设置</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li>对 节点数据 没有特殊要求，用户可以根据自己的需求添加自定义属性</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/bigdata/page.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/bigdata/page.html
new file mode 100644
index 0000000..ef3c763
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/bigdata/page.html
@@ -0,0 +1,150 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - big data page</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			async: {
+				enable: true,
+				url: getUrl
+			},
+			check: {
+				enable: true
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			view: {
+				addDiyDom: addDiyDom
+			},
+			callback: {
+				beforeExpand: beforeExpand,
+				onAsyncSuccess: onAsyncSuccess,
+				onAsyncError: onAsyncError
+			}
+		};
+
+		var zNodes =[
+			{name:"分页测试", t:"请点击分页按钮", id:"1", count:2000, page:0, pageSize:100, isParent:true}
+		];
+		var curPage = 0;
+		function getUrl(treeId, treeNode) {
+			var param = "id="+ treeNode.id +"_"+treeNode.page +"&count="+treeNode.pageSize,
+			aObj = $("#" + treeNode.tId + "_a");
+			aObj.attr("title", "当前第 " + treeNode.page + " 页 / 共 " + treeNode.maxPage + " 页")
+			return "../asyncData/getNodesForBigData.php?" + param;
+		}
+		function goPage(treeNode, page) {
+			treeNode.page = page;
+			if (treeNode.page<1) treeNode.page = 1;
+			if (treeNode.page>treeNode.maxPage) treeNode.page = treeNode.maxPage;
+			if (curPage == treeNode.page) return;
+			curPage = treeNode.page;
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			zTree.reAsyncChildNodes(treeNode, "refresh");
+		}
+		function beforeExpand(treeId, treeNode) {
+			if (treeNode.page == 0) treeNode.page = 1;
+			return !treeNode.isAjaxing;
+		}
+		function onAsyncSuccess(event, treeId, treeNode, msg) {
+			
+		}
+		function onAsyncError(event, treeId, treeNode, XMLHttpRequest, textStatus, errorThrown) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			alert("异步获取数据出现异常。");
+			treeNode.icon = "";
+			zTree.updateNode(treeNode);
+		}
+		function addDiyDom(treeId, treeNode) {
+			if (treeNode.level>0) return;
+			var aObj = $("#" + treeNode.tId + "_a");
+			if ($("#addBtn_"+treeNode.id).length>0) return;
+			var addStr = "<span class='button lastPage' id='lastBtn_" + treeNode.id
+				+ "' title='last page' onfocus='this.blur();'></span><span class='button nextPage' id='nextBtn_" + treeNode.id
+				+ "' title='next page' onfocus='this.blur();'></span><span class='button prevPage' id='prevBtn_" + treeNode.id
+				+ "' title='prev page' onfocus='this.blur();'></span><span class='button firstPage' id='firstBtn_" + treeNode.id
+				+ "' title='first page' onfocus='this.blur();'></span>";
+			aObj.after(addStr);
+			var first = $("#firstBtn_"+treeNode.id);
+			var prev = $("#prevBtn_"+treeNode.id);
+			var next = $("#nextBtn_"+treeNode.id);
+			var last = $("#lastBtn_"+treeNode.id);
+			treeNode.maxPage = Math.round(treeNode.count/treeNode.pageSize - .5) + (treeNode.count%treeNode.pageSize == 0 ? 0:1);
+			first.bind("click", function(){
+				if (!treeNode.isAjaxing) {
+					goPage(treeNode, 1);
+				}
+			});
+			last.bind("click", function(){
+				if (!treeNode.isAjaxing) {
+					goPage(treeNode, treeNode.maxPage);
+				}
+			});
+			prev.bind("click", function(){
+				if (!treeNode.isAjaxing) {
+					goPage(treeNode, treeNode.page-1);
+				}
+			});
+			next.bind("click", function(){
+				if (!treeNode.isAjaxing) {
+					goPage(treeNode, treeNode.page+1);
+				}
+			});
+		};
+		
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+.ztree li span.button.firstPage {float:right; margin-left:2px; margin-right: 0; background-position:-144px -16px; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.prevPage {float:right; margin-left:2px; margin-right: 0; background-position:-144px -48px; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.nextPage {float:right; margin-left:2px; margin-right: 0; background-position:-144px -64px; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.lastPage {float:right; margin-left:2px; margin-right: 0; background-position:-144px -32px; vertical-align:top; *vertical-align:middle}
+	</style>
+ </HEAD>
+
+<BODY>
+<h1>分页加载大数据量</h1>
+<h6>[ 文件路径: bigdata/page.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、大数据量加载说明</h2>
+				<ul class="list">
+				<li>1)、分页方案可以有效解决某一级节点数据超大的情况。</li>
+				<li>2)、分页按钮通过自定义控件的方法实现。</li>
+				<li class="highlight_red">3)、分页方案对于 checkbox 的关联关系无能为力，只能每次翻页后进行修正。由于时间关系，Demo 中不对 checkbox 的关联进行任何修正处理。</li>
+				<li class="highlight_red">4)、分页方案中，从 zTree 得到的节点数据只有当前页的节点数据，可以在每次翻页后自行保存每页的数据，作为缓存，具体情况要根据实际需求来决定。</li>
+			</li>
+			<li class="title"><h2>2、setting 配置信息说明</h2>
+				<ul class="list">
+				<li>需要设置 setting.async 异步加载部分的参数</li>
+				<li>其他不需要进行特殊的配置，根据自己的需求自行设置</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li>对 节点数据 没有特殊要求，用户可以根据自己的需求添加自定义属性</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/core/async.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/core/async.html
new file mode 100644
index 0000000..3f2a0d9
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/core/async.html
@@ -0,0 +1,70 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - Async</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			async: {
+				enable: true,
+				url:"../asyncData/getNodes.php",
+				autoParam:["id", "name=n", "level=lv"],
+				otherParam:{"otherParam":"zTreeAsyncTest"},
+				dataFilter: filter
+			}
+		};
+
+		function filter(treeId, parentNode, childNodes) {
+			if (!childNodes) return null;
+			for (var i=0, l=childNodes.length; i<l; i++) {
+				childNodes[i].name = childNodes[i].name.replace(/\.n/g, '.');
+			}
+			return childNodes;
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>异步加载节点数据的树</h1>
+<h6>[ 文件路径: core/async.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、setting 配置信息说明</h2>
+				<ul class="list">
+				<li class="highlight_red">使用异步加载，必须设置 setting.async 中的各个属性，详细请参见 API 文档中的相关内容</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li>异步加载功能对于 treeNode 节点数据没有特别要求，如果采用简单 JSON 数据，请设置 setting.data.simple 中的属性</li>
+				<li>如果异步加载每次都只返回单层的节点数据，那么可以不设置简单 JSON 数据模式</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、其他说明</h2>
+				<ul class="list">
+				<li class="highlight_red">观察 autoParam 和 otherParam 请使用 firebug 或 浏览器的开发人员工具</li>
+				<li class="highlight_red">此 Demo 只能加载到第 4 级节点（level=3）</li>
+				<li class="highlight_red">此 Demo 利用 dataFilter 对节点的 name 进行了修改</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/core/async_fun.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/core/async_fun.html
new file mode 100644
index 0000000..3571b24
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/core/async_fun.html
@@ -0,0 +1,144 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - reAsyncChildNodes</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				selectedMulti: false
+			},
+			async: {
+				enable: true,
+				url:"../asyncData/getNodes.php",
+				autoParam:["id", "name=n", "level=lv"],
+				otherParam:{"otherParam":"zTreeAsyncTest"},
+				dataFilter: filter
+			},
+			callback: {
+				beforeClick: beforeClick,
+				beforeAsync: beforeAsync,
+				onAsyncError: onAsyncError,
+				onAsyncSuccess: onAsyncSuccess
+			}
+		};
+
+		function filter(treeId, parentNode, childNodes) {
+			if (!childNodes) return null;
+			for (var i=0, l=childNodes.length; i<l; i++) {
+				childNodes[i].name = childNodes[i].name.replace(/\.n/g, '.');
+			}
+			return childNodes;
+		}
+		function beforeClick(treeId, treeNode) {
+			if (!treeNode.isParent) {
+				alert("请选择父节点");
+				return false;
+			} else {
+				return true;
+			}
+		}
+		var log, className = "dark";
+		function beforeAsync(treeId, treeNode) {
+			className = (className === "dark" ? "":"dark");
+			showLog("[ "+getTime()+" beforeAsync ]&nbsp;&nbsp;&nbsp;&nbsp;" + ((!!treeNode && !!treeNode.name) ? treeNode.name : "root") );
+			return true;
+		}
+		function onAsyncError(event, treeId, treeNode, XMLHttpRequest, textStatus, errorThrown) {
+			showLog("[ "+getTime()+" onAsyncError ]&nbsp;&nbsp;&nbsp;&nbsp;" + ((!!treeNode && !!treeNode.name) ? treeNode.name : "root") );
+		}
+		function onAsyncSuccess(event, treeId, treeNode, msg) {
+			showLog("[ "+getTime()+" onAsyncSuccess ]&nbsp;&nbsp;&nbsp;&nbsp;" + ((!!treeNode && !!treeNode.name) ? treeNode.name : "root") );
+		}
+		
+		function showLog(str) {
+			if (!log) log = $("#log");
+			log.append("<li class='"+className+"'>"+str+"</li>");
+			if(log.children("li").length > 8) {
+				log.get(0).removeChild(log.children("li")[0]);
+			}
+		}
+		function getTime() {
+			var now= new Date(),
+			h=now.getHours(),
+			m=now.getMinutes(),
+			s=now.getSeconds(),
+			ms=now.getMilliseconds();
+			return (h+":"+m+":"+s+ " " +ms);
+		}
+
+		function refreshNode(e) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			type = e.data.type,
+			silent = e.data.silent,
+			nodes = zTree.getSelectedNodes();
+			if (nodes.length == 0) {
+				alert("请先选择一个父节点");
+			}
+			for (var i=0, l=nodes.length; i<l; i++) {
+				zTree.reAsyncChildNodes(nodes[i], type, silent);
+				if (!silent) zTree.selectNode(nodes[i]);
+			}
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting);
+			$("#refreshNode").bind("click", {type:"refresh", silent:false}, refreshNode);
+			$("#refreshNodeSilent").bind("click", {type:"refresh", silent:true}, refreshNode);
+			$("#addNode").bind("click", {type:"add", silent:false}, refreshNode);
+			$("#addNodeSilent").bind("click", {type:"add", silent:true}, refreshNode);
+		});
+		//-->
+	</SCRIPT>
+
+</HEAD>
+
+<BODY>
+<h1>用 zTree 方法异步加载节点数据</h1>
+<h6>[ 文件路径: core/async_fun.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、reAsyncChildNodes 方法操作说明</h2>
+				<ul class="list">
+				<li class="highlight_red">使用 zTreeObj.reAsyncChildNodes 方法，详细请参见 API 文档中的相关内容</li>
+				<li><p>此 Demo 只能同时选中一个父节点<br/>
+					试试看：[ <a id="refreshNode" href="#" onclick="return false;">重新加载</a> ]&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="addNode" href="#" onclick="return false;">追加</a> ]</p>
+				</li>
+				<li><p><span class="highlight_red">“悄悄地”操作只能针对 折叠状态 的父节点</span><br/>
+					试试看：[ <a id="refreshNodeSilent" href="#" onclick="return false;">悄悄地 重新加载</a> ]&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="addNodeSilent" href="#" onclick="return false;">悄悄地 追加</a> ]<br/>
+					async log:<br/>
+					<ul id="log" class="log"></ul></p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、setting 配置信息说明</h2>
+				<ul class="list">
+				<li class="highlight_red">使用 zTree 提供的 reAsyncChildNodes 方法也必须设置 setting.async 中的各个属性，详细请参见 API 文档中的相关内容</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li>同 "异步加载 节点数据" 中的说明</li>
+				</ul>
+			</li>
+			<li class="title"><h2>4、其他说明</h2>
+				<ul class="list">
+				<li>同 "异步加载 节点数据" 中的说明</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/core/click.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/core/click.html
new file mode 100644
index 0000000..50367d9
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/core/click.html
@@ -0,0 +1,107 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - beforeClick / onClick</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			data: {
+				key: {
+					title:"t"
+				},
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeClick: beforeClick,
+				onClick: onClick
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"普通的父节点", t:"我很普通，随便点我吧", open:true},
+			{ id:11, pId:1, name:"叶子节点 - 1", t:"我很普通，随便点我吧"},
+			{ id:12, pId:1, name:"叶子节点 - 2", t:"我很普通，随便点我吧"},
+			{ id:13, pId:1, name:"叶子节点 - 3", t:"我很普通，随便点我吧"},
+			{ id:2, pId:0, name:"NB的父节点", t:"点我可以，但是不能点我的子节点，有本事点一个你试试看？", open:true},
+			{ id:21, pId:2, name:"叶子节点2 - 1", t:"你哪个单位的？敢随便点我？小心点儿..", click:false},
+			{ id:22, pId:2, name:"叶子节点2 - 2", t:"我有老爸罩着呢，点击我的小心点儿..", click:false},
+			{ id:23, pId:2, name:"叶子节点2 - 3", t:"好歹我也是个领导，别普通群众就来点击我..", click:false},
+			{ id:3, pId:0, name:"郁闷的父节点", t:"别点我，我好害怕...我的子节点随便点吧...", open:true, click:false },
+			{ id:31, pId:3, name:"叶子节点3 - 1", t:"唉，随便点我吧"},
+			{ id:32, pId:3, name:"叶子节点3 - 2", t:"唉，随便点我吧"},
+			{ id:33, pId:3, name:"叶子节点3 - 3", t:"唉，随便点我吧"}
+		];
+
+		var log, className = "dark";
+		function beforeClick(treeId, treeNode, clickFlag) {
+			className = (className === "dark" ? "":"dark");
+			showLog("[ "+getTime()+" beforeClick ]&nbsp;&nbsp;" + treeNode.name );
+			return (treeNode.click != false);
+		}
+		function onClick(event, treeId, treeNode, clickFlag) {
+			showLog("[ "+getTime()+" onClick ]&nbsp;&nbsp;clickFlag = " + clickFlag + " (" + (clickFlag===1 ? "普通选中": (clickFlag===0 ? "<b>取消选中</b>" : "<b>追加选中</b>")) + ")");
+		}		
+		function showLog(str) {
+			if (!log) log = $("#log");
+			log.append("<li class='"+className+"'>"+str+"</li>");
+			if(log.children("li").length > 8) {
+				log.get(0).removeChild(log.children("li")[0]);
+			}
+		}
+		function getTime() {
+			var now= new Date(),
+			h=now.getHours(),
+			m=now.getMinutes(),
+			s=now.getSeconds();
+			return (h+":"+m+":"+s);
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>单击节点控制</h1>
+<h6>[ 文件路径: core/click.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、beforeClick / onClick 事件回调函数控制</h2>
+				<ul class="list">
+				<li>利用 click 事件回调函数 可以进行各种其他的附加操作，这里简单演示如何监控此事件</li>
+				<li><p><span class="highlight_red">请尝试按下 <b>Ctrl</b> 键进行 多节点选择 和 取消选择</span><br/>
+					click log:<br/>
+					<ul id="log" class="log"></ul></p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、setting 配置信息说明</h2>
+				<ul class="list">
+				<li class="highlight_red">需要设置 setting.callback.beforeClick 和  setting.callback.onClick 属性, 详细请参见 API 文档中的相关内容</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li>对 节点数据 没有特殊要求，用户可以根据自己的需求添加自定义属性</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/core/custom_font.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/core/custom_font.html
new file mode 100644
index 0000000..e9f901e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/core/custom_font.html
@@ -0,0 +1,67 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - Custom Font</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				fontCss: getFont,
+				nameIsHTML: true
+			}
+		};
+
+		var zNodes =[
+			{ name:"粗体字", font:{'font-weight':'bold'} },
+			{ name:"斜体字", font:{'font-style':'italic'}},
+			{ name:"有背景的字", font:{'background-color':'black', 'color':'white'}},
+			{ name:"红色字", font:{'color':'red'}},
+			{ name:"蓝色字", font:{'color':'blue'}},
+			{ name:"<span style='color:blue;margin-right:0px;'>view</span>.<span style='color:red;margin-right:0px;'>nameIsHTML</span>"},
+			{ name:"zTree 默认样式"}
+		];
+
+		function getFont(treeId, node) {
+			return node.font ? node.font : {};
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>显示自定义字体的树</h1>
+<h6>[ 文件路径: core/custom_font.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、setting 配置信息说明</h2>
+				<ul class="list">
+				<li class="highlight_red">1、节点自定义字体请设置 setting.view.fontCss 属性，详细请参见 API 文档中的相关内容</li>
+				<li class="highlight_red">2、setting.view.nameIsHTML 属性可以允许节点名称支持 HTML 内容，详细请参见 API 文档中的相关内容</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li>设置字体不需要 treeNode 设置特殊数据，但如果用于为了区别不同类型的节点，设置不同的样式，可以对相应的数据设置自定义属性</li>
+				<li>此 Demo 利用 treeNode 保存样式定义</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/core/custom_icon.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/core/custom_icon.html
new file mode 100644
index 0000000..7c8de18
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/core/custom_icon.html
@@ -0,0 +1,74 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - Custom Icon </TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			data: {
+				simpleData: {
+					enable: true
+				}
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"展开、折叠 自定义图标不同", open:true, iconOpen:"../../../css/zTreeStyle/img/diy/1_open.png", iconClose:"../../../css/zTreeStyle/img/diy/1_close.png"},
+			{ id:11, pId:1, name:"叶子节点1", icon:"../../../css/zTreeStyle/img/diy/2.png"},
+			{ id:12, pId:1, name:"叶子节点2", icon:"../../../css/zTreeStyle/img/diy/3.png"},
+			{ id:13, pId:1, name:"叶子节点3", icon:"../../../css/zTreeStyle/img/diy/5.png"},
+			{ id:2, pId:0, name:"展开、折叠 自定义图标相同", open:true, icon:"../../../css/zTreeStyle/img/diy/4.png"},
+			{ id:21, pId:2, name:"叶子节点1", icon:"../../../css/zTreeStyle/img/diy/6.png"},
+			{ id:22, pId:2, name:"叶子节点2", icon:"../../../css/zTreeStyle/img/diy/7.png"},
+			{ id:23, pId:2, name:"叶子节点3", icon:"../../../css/zTreeStyle/img/diy/8.png"},
+			{ id:3, pId:0, name:"不使用自定义图标", open:true },
+			{ id:31, pId:3, name:"叶子节点1"},
+			{ id:32, pId:3, name:"叶子节点2"},
+			{ id:33, pId:3, name:"叶子节点3"}
+
+		];
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>自定义图标 -- icon 属性</h1>
+<h6>[ 文件路径: core/custom_icon.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、setting 配置信息说明</h2>
+				<ul class="list">
+				<li>自定义图标不需要对 setting 进行特殊配置</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li>利用 节点数据的 icon / iconOpen / iconClose 属性实现自定义图标</li>
+				<li class="highlight_red">详细请参见 API 文档中的相关内容</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、其他说明</h2>
+				<ul class="list">
+				<li class="highlight_red">由于时间关系，例子直接采用 png 图片，如果需要解决 ie6 下 png 图片的透明问题，请针对 ie6 制作特殊的 gif 图片或者利用 css filter 解决</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/core/custom_iconSkin.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/core/custom_iconSkin.html
new file mode 100644
index 0000000..cde753a
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/core/custom_iconSkin.html
@@ -0,0 +1,84 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - Custom Icon Skin </TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			data: {
+				simpleData: {
+					enable: true
+				}
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"展开、折叠 自定义图标不同", open:true, iconSkin:"pIcon01"},
+			{ id:11, pId:1, name:"叶子节点1", iconSkin:"icon01"},
+			{ id:12, pId:1, name:"叶子节点2", iconSkin:"icon02"},
+			{ id:13, pId:1, name:"叶子节点3", iconSkin:"icon03"},
+			{ id:2, pId:0, name:"展开、折叠 自定义图标相同", open:true, iconSkin:"pIcon02"},
+			{ id:21, pId:2, name:"叶子节点1", iconSkin:"icon04"},
+			{ id:22, pId:2, name:"叶子节点2", iconSkin:"icon05"},
+			{ id:23, pId:2, name:"叶子节点3", iconSkin:"icon06"},
+			{ id:3, pId:0, name:"不使用自定义图标", open:true },
+			{ id:31, pId:3, name:"叶子节点1"},
+			{ id:32, pId:3, name:"叶子节点2"},
+			{ id:33, pId:3, name:"叶子节点3"}
+		];
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+.ztree li span.button.pIcon01_ico_open{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/1_open.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.pIcon01_ico_close{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/1_close.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.pIcon02_ico_open, .ztree li span.button.pIcon02_ico_close{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/2.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon01_ico_docu{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/3.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon02_ico_docu{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/4.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon03_ico_docu{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/5.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon04_ico_docu{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/6.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon05_ico_docu{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/7.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon06_ico_docu{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/8.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+	</style>
+</HEAD>
+
+<BODY>
+<h1>自定义图标 -- iconSkin 属性</h1>
+<h6>[ 文件路径: core/custom_iconSkin.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、setting 配置信息说明</h2>
+				<ul class="list">
+				<li>自定义图标不需要对 setting 进行特殊配置</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li>利用 节点数据的 iconSkin 属性 配合 css 实现自定义图标</li>
+				<li class="highlight_red">详细请参见 API 文档中的相关内容</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、其他说明</h2>
+				<ul class="list">
+				<li class="highlight_red">由于时间关系，例子直接采用 png 图片，如果需要解决 ie6 下 png 图片的透明问题，请针对 ie6 制作特殊的 gif 图片或者利用 css filter 解决</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/core/expand.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/core/expand.html
new file mode 100644
index 0000000..15b03b5
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/core/expand.html
@@ -0,0 +1,185 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - beforeExpand / onExpand && beforeCollapse / onCollapse</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				selectedMulti: false
+			},
+			data: {
+				key: {
+					title:"t"
+				},
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeClick: beforeClick,
+				beforeCollapse: beforeCollapse,
+				beforeExpand: beforeExpand,
+				onCollapse: onCollapse,
+				onExpand: onExpand
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"可折腾的父节点 1", t:"我很普通，随便 展开/折叠 我吧", open:false},
+			{ id:11, pId:1, name:"叶子节点 - 1", t:"我老爸很普通，随便折腾他吧"},
+			{ id:12, pId:1, name:"可折腾的父节点 2", t:"我和我老爸都很普通，随便折腾我和他吧", open: false},
+			{ id:121, pId:12, name:"父节点 - 121", t:"我老爸很普通，随便折腾他吧", open:true},
+			{ id:1211, pId:121, name:"父节点 - 1211", t:"我老爸很普通，随便折腾他吧", open:false},
+			{ id:1212, pId:1211, name:"叶子节点 - 1212", t:"我老爸很普通，随便折腾他吧"},
+			{ id:1213, pId:121, name:"父节点 - 1213", t:"我老爸很普通，随便折腾他吧", open:false},
+			{ id:1214, pId:1213, name:"叶子节点 - 1214", t:"我老爸很普通，随便折腾他吧"},
+			{ id:123, pId:12, name:"叶子节点 - 23", t:"我老爸很普通，随便折腾他吧"},
+			{ id:13, pId:1, name:"叶子节点 - 3", t:"我老爸很普通，随便折腾他吧"},
+			{ id:2, pId:1, name:"无法折叠的父节点", t:"休想让我折叠起来...除非你用 expandAll 方法", open:false, collapse:false},
+			{ id:21, pId:2, name:"叶子节点2 - 1", t:"哈哈哈，我老爸NB吧，不能折叠吧？"},
+			{ id:22, pId:21, name:"叶子节点2 - 2", t:"哈哈哈，我老爸NB吧，不能折叠吧？"},
+			{ id:23, pId:21, name:"叶子节点2 - 3", t:"哈哈哈，我老爸NB吧，不能折叠吧？"},
+			{ id:3, pId:2, name:"无法展开的父节点", t:"就凭你也想展开我？难呀...嘿嘿, 除非你用 expandAll 方法", open:false, expand:true},
+			{ id:31, pId:3, name:"叶子节点3 - 1", t:"居然让你看到了...莫非你用了全部节点展开？"},
+			{ id:32, pId:31, name:"叶子节点3 - 2", t:"居然让你看到了...莫非你用了全部节点展开？"},
+			{ id:33, pId:31, name:"叶子节点3 - 3", t:"居然让你看到了...莫非你用了全部节点展开？"},
+			{ id:4, pId:3, name:"空空的父节点 1", t:"一无所有...除了我自己", isParent:true, open:false}
+		];
+
+		var log, className = "dark";
+		function beforeClick(treeId, treeNode) {
+			if (treeNode.isParent) {
+				return true;
+			} else {
+				alert("这个 Demo 是用来测试 展开 / 折叠 的...\n\n去点击父节点吧... ");
+				return false;
+			}
+		}
+		function beforeCollapse(treeId, treeNode) {
+			className = (className === "dark" ? "":"dark");
+			showLog("[ "+getTime()+" beforeCollapse ]&nbsp;&nbsp;&nbsp;&nbsp;" + treeNode.name );
+			return (treeNode.collapse !== false);
+		}
+		function onCollapse(event, treeId, treeNode) {
+			showLog("[ "+getTime()+" onCollapse ]&nbsp;&nbsp;&nbsp;&nbsp;" + treeNode.name);
+		}		
+		function beforeExpand(treeId, treeNode) {
+			className = (className === "dark" ? "":"dark");
+			showLog("[ "+getTime()+" beforeExpand ]&nbsp;&nbsp;&nbsp;&nbsp;" + treeNode.name );
+			return (treeNode.expand !== false);
+		}
+		function onExpand(event, treeId, treeNode) {
+			showLog("[ "+getTime()+" onExpand ]&nbsp;&nbsp;&nbsp;&nbsp;" + treeNode.name);
+		}
+		function showLog(str) {
+			if (!log) log = $("#log");
+			log.append("<li class='"+className+"'>"+str+"</li>");
+			if(log.children("li").length > 8) {
+				log.get(0).removeChild(log.children("li")[0]);
+			}
+		}
+		function getTime() {
+			var now= new Date(),
+			h=now.getHours(),
+			m=now.getMinutes(),
+			s=now.getSeconds(),
+			ms=now.getMilliseconds();
+			return (h+":"+m+":"+s+ " " +ms);
+		}
+
+		function expandNode(e) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			type = e.data.type,
+			nodes = zTree.getSelectedNodes();
+			if (type.indexOf("All")<0 && nodes.length == 0) {
+				alert("请先选择一个父节点");
+			}
+
+			if (type == "expandAll") {
+				zTree.expandAll(true);
+			} else if (type == "collapseAll") {
+				zTree.expandAll(false);
+			} else {
+				var callbackFlag = $("#callbackTrigger").attr("checked");
+				for (var i=0, l=nodes.length; i<l; i++) {
+					zTree.setting.view.fontCss = {};
+					if (type == "expand") {
+						zTree.expandNode(nodes[i], true, null, null, callbackFlag);
+					} else if (type == "collapse") {
+						zTree.expandNode(nodes[i], false, null, null, callbackFlag);
+					} else if (type == "toggle") {
+						zTree.expandNode(nodes[i], null, null, null, callbackFlag);
+					} else if (type == "expandSon") {
+						zTree.expandNode(nodes[i], true, true, null, callbackFlag);
+					} else if (type == "collapseSon") {
+						zTree.expandNode(nodes[i], false, true, null, callbackFlag);
+					}
+				}
+			}
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			$("#expandBtn").bind("click", {type:"expand"}, expandNode);
+			$("#collapseBtn").bind("click", {type:"collapse"}, expandNode);
+			$("#toggleBtn").bind("click", {type:"toggle"}, expandNode);
+			$("#expandSonBtn").bind("click", {type:"expandSon"}, expandNode);
+			$("#collapseSonBtn").bind("click", {type:"collapseSon"}, expandNode);
+			$("#expandAllBtn").bind("click", {type:"expandAll"}, expandNode);
+			$("#collapseAllBtn").bind("click", {type:"collapseAll"}, expandNode);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>展开 / 折叠父节点控制</h1>
+<h6>[ 文件路径: core/expand.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、beforeCollapse / onCollapse<br/>&nbsp;&nbsp;beforeExpand / onExpand 事件回调函数控制</h2>
+				<ul class="list">
+				<li>利用 collapse / expand 事件回调函数 可以控制父节点是否允许 展开 / 折叠，这里简单演示如何监控此事件</li>
+				<li><p>试试看：<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" id="callbackTrigger" checked /> expandNode 方法是否触发 callback<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;单个节点--[ <a id="expandBtn" href="#" title="不想展开我就不展开你..." onclick="return false;">展开</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="collapseBtn" href="#" title="不想折叠我就不折叠你..." onclick="return false;">折叠</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="toggleBtn" href="#" title="你想怎样？..." onclick="return false;">展开 / 折叠 切换</a> ]<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;单个节点（包括子节点）--[ <a id="expandSonBtn" href="#" title="不想展开我就不展开你..." onclick="return false;">展开</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="collapseSonBtn" href="#" title="不想折叠我就不折叠你..." onclick="return false;">折叠</a> ]<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;全部节点--[ <a id="expandAllBtn" href="#" title="不管你有多NB，统统都要听我的！！" onclick="return false;">展开</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="collapseAllBtn" href="#" title="不管你有多NB，统统都要听我的！！" onclick="return false;">折叠</a> ]</p>
+				<li><p><span class="highlight_red">使用 zTreeObj.expandNode 方法，详细请参见 API 文档中的相关内容</span><br/>
+					collapse / expand log:<br/>
+					<ul id="log" class="log"></ul></p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、setting 配置信息说明</h2>
+				<ul class="list">
+				<li class="highlight_red">事件回调函数的使用，详细请参见 API 文档中 setting.callback 的相关内容</li>
+				<li class="highlight_red">如果需要调整 展开 / 折叠 的动画效果， 详细请参见 API 文档中 setting.view.expandSpeed 的相关内容</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li>对 节点数据 没有特殊要求，用户可以根据自己的需求添加自定义属性</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/core/noicon.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/core/noicon.html
new file mode 100644
index 0000000..9562163
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/core/noicon.html
@@ -0,0 +1,93 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - noIcon </TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				showIcon: showIconForTree
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"父节点1 - 展开", open:true},
+			{ id:11, pId:1, name:"父节点11 - 折叠"},
+			{ id:111, pId:11, name:"叶子节点111"},
+			{ id:112, pId:11, name:"叶子节点112"},
+			{ id:113, pId:11, name:"叶子节点113"},
+			{ id:114, pId:11, name:"叶子节点114"},
+			{ id:12, pId:1, name:"父节点12 - 折叠"},
+			{ id:121, pId:12, name:"叶子节点121"},
+			{ id:122, pId:12, name:"叶子节点122"},
+			{ id:123, pId:12, name:"叶子节点123"},
+			{ id:124, pId:12, name:"叶子节点124"},
+			{ id:13, pId:1, name:"父节点13 - 没有子节点", isParent:true},
+			{ id:2, pId:0, name:"父节点2 - 折叠"},
+			{ id:21, pId:2, name:"父节点21 - 展开", open:true},
+			{ id:211, pId:21, name:"叶子节点211"},
+			{ id:212, pId:21, name:"叶子节点212"},
+			{ id:213, pId:21, name:"叶子节点213"},
+			{ id:214, pId:21, name:"叶子节点214"},
+			{ id:22, pId:2, name:"父节点22 - 折叠"},
+			{ id:221, pId:22, name:"叶子节点221"},
+			{ id:222, pId:22, name:"叶子节点222"},
+			{ id:223, pId:22, name:"叶子节点223"},
+			{ id:224, pId:22, name:"叶子节点224"},
+			{ id:23, pId:2, name:"父节点23 - 折叠"},
+			{ id:231, pId:23, name:"叶子节点231"},
+			{ id:232, pId:23, name:"叶子节点232"},
+			{ id:233, pId:23, name:"叶子节点233"},
+			{ id:234, pId:23, name:"叶子节点234"},
+			{ id:3, pId:0, name:"父节点3 - 没有子节点", isParent:true}
+		];
+
+		function showIconForTree(treeId, treeNode) {
+			return !treeNode.isParent;
+		};
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+
+</HEAD>
+
+<BODY>
+<h1>不显示节点图标的树</h1>
+<h6>[ 文件路径: core/noicon.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、setting 配置信息说明</h2>
+				<ul class="list">
+				<li>此 Demo 利用 Function 设置了使父节点不显示图标的规则</li>
+				<li class="highlight_red">是否显示节点图标请设置 setting.view.showIcon 属性，详细请参见 API 文档中的相关内容</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li>是否显示图标，不需要 treeNode 节点数据提供特殊设置，但如果用户需要根据不同节点动态设置，可以对节点数据增加特殊属性，用于判别</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/core/noline.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/core/noline.html
new file mode 100644
index 0000000..212d97b
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/core/noline.html
@@ -0,0 +1,88 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - noLine </TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				showLine: false
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"父节点1 - 展开", open:true},
+			{ id:11, pId:1, name:"父节点11 - 折叠"},
+			{ id:111, pId:11, name:"叶子节点111"},
+			{ id:112, pId:11, name:"叶子节点112"},
+			{ id:113, pId:11, name:"叶子节点113"},
+			{ id:114, pId:11, name:"叶子节点114"},
+			{ id:12, pId:1, name:"父节点12 - 折叠"},
+			{ id:121, pId:12, name:"叶子节点121"},
+			{ id:122, pId:12, name:"叶子节点122"},
+			{ id:123, pId:12, name:"叶子节点123"},
+			{ id:124, pId:12, name:"叶子节点124"},
+			{ id:13, pId:1, name:"父节点13 - 没有子节点", isParent:true},
+			{ id:2, pId:0, name:"父节点2 - 折叠"},
+			{ id:21, pId:2, name:"父节点21 - 展开", open:true},
+			{ id:211, pId:21, name:"叶子节点211"},
+			{ id:212, pId:21, name:"叶子节点212"},
+			{ id:213, pId:21, name:"叶子节点213"},
+			{ id:214, pId:21, name:"叶子节点214"},
+			{ id:22, pId:2, name:"父节点22 - 折叠"},
+			{ id:221, pId:22, name:"叶子节点221"},
+			{ id:222, pId:22, name:"叶子节点222"},
+			{ id:223, pId:22, name:"叶子节点223"},
+			{ id:224, pId:22, name:"叶子节点224"},
+			{ id:23, pId:2, name:"父节点23 - 折叠"},
+			{ id:231, pId:23, name:"叶子节点231"},
+			{ id:232, pId:23, name:"叶子节点232"},
+			{ id:233, pId:23, name:"叶子节点233"},
+			{ id:234, pId:23, name:"叶子节点234"},
+			{ id:3, pId:0, name:"父节点3 - 没有子节点", isParent:true}
+		];
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+
+</HEAD>
+
+<BODY>
+<h1>不显示连接线的树</h1>
+<h6>[ 文件路径: core/noline.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、setting 配置信息说明</h2>
+				<ul class="list">
+				<li class="highlight_red">是否显示连接线请设置 setting.view.showLine 属性，详细请参见 API 文档中的相关内容</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li>是否显示连线，不需要 treeNode 节点数据提供特殊设置</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/core/otherMouse.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/core/otherMouse.html
new file mode 100644
index 0000000..2dff4e4
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/core/otherMouse.html
@@ -0,0 +1,132 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - Other Mouse Event</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			data: {
+				key: {
+					title:"t"
+				},
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeMouseDown: beforeMouseDown,
+				beforeMouseUp: beforeMouseUp,
+				beforeRightClick: beforeRightClick,
+				onMouseDown: onMouseDown,
+				onMouseUp: onMouseUp,
+				onRightClick: onRightClick
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"不能 右键 0", t:"试试右键，没有 onRightClick 吧？", open:true, right:false},
+			{ id:11, pId:1, name:"不能 右键 1", t:"试试右键，没有 onRightClick 吧？", right:false},
+			{ id:12, pId:1, name:"不能 右键 2", t:"试试右键，没有 onRightClick 吧？", right:false},
+			{ id:13, pId:1, name:"不能 右键 3", t:"试试右键，没有 onRightClick 吧？", right:false},
+			{ id:2, pId:0, name:"不能 Down 0", t:"试试 MouseDown ，没有 onMouseDown 吧？", open:true, down:false},
+			{ id:21, pId:2, name:"不能 Down 1", t:"试试 MouseDown ，没有 onMouseDown 吧？", down:false},
+			{ id:22, pId:2, name:"不能 Down 2", t:"试试 MouseDown ，没有 onMouseDown 吧？", down:false},
+			{ id:23, pId:2, name:"不能 Down 3", t:"试试 MouseDown ，没有 onMouseDown 吧？", down:false},
+			{ id:3, pId:0, name:"不能 Up 0", t:"试试 MouseUp ，没有 onMouseUp 吧？", open:true, up:false},
+			{ id:31, pId:3, name:"不能 Up 1", t:"试试 MouseUp ，没有 onMouseUp 吧？", up:false},
+			{ id:32, pId:3, name:"不能 Up 2", t:"试试 MouseUp ，没有 onMouseUp 吧？", up:false},
+			{ id:33, pId:3, name:"不能 Up 3", t:"试试 MouseUp ，没有 onMouseUp 吧？", up:false}
+		];
+
+		var log, className = {down:"dark", up:"dark", right:"dark"};
+		function beforeMouseDown(treeId, treeNode) {
+			className.down = (className.down === "dark" ? "":"dark");
+			showLog("[ "+getTime()+" beforeMouseDown ]&nbsp;&nbsp;" + (treeNode?treeNode.name:"root"), "down" );
+			return (!treeNode || treeNode.down != false);
+		}
+		function onMouseDown(event, treeId, treeNode) {
+			showLog("[ "+getTime()+" onMouseDown ]&nbsp;&nbsp;" + (treeNode?treeNode.name:"root"), "down" );
+		}
+		function beforeMouseUp(treeId, treeNode) {
+			className.up = (className.up === "dark" ? "":"dark");
+			showLog("[ "+getTime()+" beforeMouseUp ]&nbsp;&nbsp;" + (treeNode?treeNode.name:"root"), "up" );
+			return (!treeNode || treeNode.up != false);
+		}
+		function onMouseUp(event, treeId, treeNode) {
+			showLog("[ "+getTime()+" onMouseUp ]&nbsp;&nbsp;" + (treeNode?treeNode.name:"root"), "up" );
+		}
+		function beforeRightClick(treeId, treeNode) {
+			className.right = (className.right === "dark" ? "":"dark");
+			showLog("[ "+getTime()+" beforeRightClick ]&nbsp;&nbsp;" + (treeNode?treeNode.name:"root"), "right" );
+			return (!treeNode || treeNode.right != false);
+		}
+		function onRightClick(event, treeId, treeNode) {
+			showLog("[ "+getTime()+" onRightClick ]&nbsp;&nbsp;" + (treeNode?treeNode.name:"root"), "right" );
+		}
+		function showLog(str, logType) {
+			log = $("#log" + "_" + logType);
+			log.append("<li class='"+className[logType]+"'>"+str+"</li>");
+			if(log.children("li").length > 2) {
+				log.get(0).removeChild(log.children("li")[0]);
+			}
+		}
+		function getTime() {
+			var now= new Date(),
+			h=now.getHours(),
+			m=now.getMinutes(),
+			s=now.getSeconds(),
+			ms=now.getMilliseconds();
+			return (h+":"+m+":"+s+ " " +ms);
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>其他鼠标事件监听</h1>
+<h6>[ 文件路径: core/otherMouse.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、mousedown / mouseup / rightClick 事件回调函数控制</h2>
+				<ul class="list">
+				<li>zTree 提供 这几种鼠标事件响应，主要是为了便于用户针对一些特殊需求进行扩展开发，不会对 zTree 造成任何影响，这里简单演示如何监控此事件</li>
+				<li><p><span class="highlight_red">请尝试鼠标在 zTree 上胡乱点击（左键、右键）吧，顺便看看 log</span><br/>
+					mousedown event log:<br/>
+					<ul id="log_down" class="log small"></ul>
+					mouseup event log:<br/>
+					<ul id="log_up" class="log small"></ul>
+					rightClick event log:<br/>
+					<ul id="log_right" class="log small"></ul></p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、setting 配置信息说明</h2>
+				<ul class="list">
+				<li class="highlight_red">事件回调函数的使用，详细请参见 API 文档中 setting.callback 的相关内容</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li>对 节点数据 没有特殊要求，用户可以根据自己的需求添加自定义属性</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/core/searchNodes.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/core/searchNodes.html
new file mode 100644
index 0000000..28c2e3b
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/core/searchNodes.html
@@ -0,0 +1,173 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - getNodeByParam / getNodesByParam / getNodesByParamFuzzy</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			data: {
+				key: {
+					title: "t"
+				},
+				simpleData: {
+					enable: true
+				}				
+			},
+			view: {
+				fontCss: getFontCss
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"节点搜索演示 1", t:"id=1", open:true},
+			{ id:11, pId:1, name:"关键字可以是名字", t:"id=11"},
+			{ id:12, pId:1, name:"关键字可以是level", t:"id=12"},
+			{ id:13, pId:1, name:"关键字可以是id", t:"id=13"},
+			{ id:14, pId:1, name:"关键字可以是各种属性", t:"id=14"},
+			{ id:2, pId:0, name:"节点搜索演示 2", t:"id=2", open:true},
+			{ id:21, pId:2, name:"可以只搜索一个节点", t:"id=21"},
+			{ id:22, pId:2, name:"可以搜索节点集合", t:"id=22"},
+			{ id:23, pId:2, name:"搜我吧", t:"id=23"},
+			{ id:3, pId:0, name:"节点搜索演示 3", t:"id=3", open:true },
+			{ id:31, pId:3, name:"我的 id 是: 31", t:"id=31"},
+			{ id:32, pId:31, name:"我的 id 是: 32", t:"id=32"},
+			{ id:33, pId:32, name:"我的 id 是: 33", t:"id=33"}
+		];
+
+		function focusKey(e) {
+			if (key.hasClass("empty")) {
+				key.removeClass("empty");
+			}
+		}
+		function blurKey(e) {
+			if (key.get(0).value === "") {
+				key.addClass("empty");
+			}
+		}
+		var lastValue = "", nodeList = [], fontCss = {};
+		function clickRadio(e) {
+			lastValue = "";
+			searchNode(e);
+		}
+		function searchNode(e) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			if (!$("#getNodesByFilter").attr("checked")) {
+				var value = $.trim(key.get(0).value);
+				var keyType = "";
+				if ($("#name").attr("checked")) {
+					keyType = "name";
+				} else if ($("#level").attr("checked")) {
+					keyType = "level";
+					value = parseInt(value);
+				} else if ($("#id").attr("checked")) {
+					keyType = "id";
+					value = parseInt(value);
+				}
+				if (key.hasClass("empty")) {
+					value = "";
+				}
+				if (lastValue === value) return;
+				lastValue = value;
+				if (value === "") return;
+				updateNodes(false);
+
+				if ($("#getNodeByParam").attr("checked")) {
+					var node = zTree.getNodeByParam(keyType, value);
+					if (node === null) {
+						nodeList = [];
+					} else {
+						nodeList = [node];
+					}
+				} else if ($("#getNodesByParam").attr("checked")) {
+					nodeList = zTree.getNodesByParam(keyType, value);
+				} else if ($("#getNodesByParamFuzzy").attr("checked")) {
+					nodeList = zTree.getNodesByParamFuzzy(keyType, value);
+				}
+			} else {
+				updateNodes(false);
+				nodeList = zTree.getNodesByFilter(filter);
+			}
+			updateNodes(true);
+
+		}
+		function updateNodes(highlight) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			for( var i=0, l=nodeList.length; i<l; i++) {
+				nodeList[i].highlight = highlight;
+				zTree.updateNode(nodeList[i]);
+			}
+		}
+		function getFontCss(treeId, treeNode) {
+			return (!!treeNode.highlight) ? {color:"#A60000", "font-weight":"bold"} : {color:"#333", "font-weight":"normal"};
+		}
+		function filter(node) {
+			return !node.isParent && node.isFirstNode;
+		}
+
+		var key;
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			key = $("#key");
+			key.bind("focus", focusKey)
+			.bind("blur", blurKey)
+			.bind("propertychange", searchNode)
+			.bind("input", searchNode);
+			$("#name").bind("change", clickRadio);
+			$("#level").bind("change", clickRadio);
+			$("#id").bind("change", clickRadio);
+			$("#getNodeByParam").bind("change", clickRadio);
+			$("#getNodesByParam").bind("change", clickRadio);
+			$("#getNodesByParamFuzzy").bind("change", clickRadio);
+			$("#getNodesByFilter").bind("change", clickRadio);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>根据参数查找节点</h1>
+<h6>[ 文件路径: core/searchNodes.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、getNodeByParam / getNodesByParam / getNodesByParamFuzzy 方法操作说明</h2>
+				<ul class="list">
+				<li class="highlight_red">使用 zTreeObj.getNodeByParam / getNodesByParam / getNodesByParamFuzzy / getNodeByTId 方法，详细请参见 API 文档中的相关内容</li>
+				<li><p>搜索试试看：<br/>
+						属性值( value )：<input type="text" id="key" value="" class="empty" /><br/>
+						属性( key )：<input type="radio" id="name" name="keyType" class="radio first" checked /><span>name (string)</span><br/>
+						<input type="radio" id="level" name="keyType" class="radio" style="margin-left:68px;" /><span>level (number) ... 根节点 level = 0</span><br/>
+						<input type="radio" id="id" name="keyType" class="radio" style="margin-left:68px;" /><span>id (number)</span><br/>
+						方法：<input type="radio" id="getNodeByParam" name="funType" class="radio first" /><span>getNodeByParam</span><br/>
+						<input type="radio" id="getNodesByParam" name="funType" class="radio" style="margin-left:36px;" /><span>getNodesByParam</span><br/>
+						<input type="radio" id="getNodesByParamFuzzy" name="funType" class="radio" style="margin-left:36px;" checked /><span>getNodesByParamFuzzy (only string)</span><br/>
+						<input type="radio" id="getNodesByFilter" name="funType" class="radio" style="margin-left:36px;" /><span>getNodesByFilter (参考本页源码中 function filter)</span><br/>
+					</p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、setting 配置信息说明</h2>
+				<ul class="list">
+				<li>不需要对 setting 进行特殊设置</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li class="highlight_red">请注意各个方法使用时保证传入查找的参数类型与设定要查找的属性的类型一致</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/core/simpleData.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/core/simpleData.html
new file mode 100644
index 0000000..6d2dcb8
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/core/simpleData.html
@@ -0,0 +1,100 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - Simple Data</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			data: {
+				simpleData: {
+					enable: true
+				}
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"父节点1 - 展开", open:true},
+			{ id:11, pId:1, name:"父节点11 - 折叠"},
+			{ id:111, pId:11, name:"叶子节点111"},
+			{ id:112, pId:11, name:"叶子节点112"},
+			{ id:113, pId:11, name:"叶子节点113"},
+			{ id:114, pId:11, name:"叶子节点114"},
+			{ id:12, pId:1, name:"父节点12 - 折叠"},
+			{ id:121, pId:12, name:"叶子节点121"},
+			{ id:122, pId:12, name:"叶子节点122"},
+			{ id:123, pId:12, name:"叶子节点123"},
+			{ id:124, pId:12, name:"叶子节点124"},
+			{ id:13, pId:1, name:"父节点13 - 没有子节点", isParent:true},
+			{ id:2, pId:0, name:"父节点2 - 折叠"},
+			{ id:21, pId:2, name:"父节点21 - 展开", open:true},
+			{ id:211, pId:21, name:"叶子节点211"},
+			{ id:212, pId:21, name:"叶子节点212"},
+			{ id:213, pId:21, name:"叶子节点213"},
+			{ id:214, pId:21, name:"叶子节点214"},
+			{ id:22, pId:2, name:"父节点22 - 折叠"},
+			{ id:221, pId:22, name:"叶子节点221"},
+			{ id:222, pId:22, name:"叶子节点222"},
+			{ id:223, pId:22, name:"叶子节点223"},
+			{ id:224, pId:22, name:"叶子节点224"},
+			{ id:23, pId:2, name:"父节点23 - 折叠"},
+			{ id:231, pId:23, name:"叶子节点231"},
+			{ id:232, pId:23, name:"叶子节点232"},
+			{ id:233, pId:23, name:"叶子节点233"},
+			{ id:234, pId:23, name:"叶子节点234"},
+			{ id:3, pId:0, name:"父节点3 - 没有子节点", isParent:true, open:true}
+		];
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+ </HEAD>
+
+<BODY>
+<h1>最简单的树 -- 简单 JSON 数据</h1>
+<h6>[ 文件路径: core/simpleData.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、setting 配置信息说明</h2>
+				<ul class="list">
+				<li class="highlight_red">必须设置 setting.data.simple 内的属性，详细请参见 API 文档中的相关内容</li>
+				<li>与显示相关的内容请参考 API 文档中 setting.view 内的配置信息</li>
+				<li>name、children、title 等属性定义更改请参考 API 文档中 setting.data.key 内的配置信息</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li class="highlight_red">简单模式的 JSON 数据需要使用 id / pId 表示节点的父子包含关系，如使用其他属性设置父子关联关系请参考 setting.data.simple 内各项说明
+				<div><pre xmlns=""><code>例如：
+var nodes = [
+	{id:1, pId:0, name: "父节点1"},
+	{id:11, pId:1, name: "子节点1"},
+	{id:12, pId:1, name: "子节点2"}
+];</code></pre></div></li>
+				<li>默认展开的节点，请设置 treeNode.open 属性</li>
+				<li>无子节点的父节点，请设置 treeNode.isParent 属性</li>
+				<li>其他属性说明请参考 API 文档中 "treeNode 节点数据详解"</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、其他说明</h2>
+				<ul class="list">
+				<li>Demo 中绝大部分都采用简单 JSON 数据模式，以便于大家学习</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/core/standardData.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/core/standardData.html
new file mode 100644
index 0000000..582a6e1
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/core/standardData.html
@@ -0,0 +1,106 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - Standard Data </TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {	};
+
+		var zNodes =[
+			{ name:"父节点1 - 展开", open:true,
+				children: [
+					{ name:"父节点11 - 折叠",
+						children: [
+							{ name:"叶子节点111"},
+							{ name:"叶子节点112"},
+							{ name:"叶子节点113"},
+							{ name:"叶子节点114"}
+						]},
+					{ name:"父节点12 - 折叠",
+						children: [
+							{ name:"叶子节点121"},
+							{ name:"叶子节点122"},
+							{ name:"叶子节点123"},
+							{ name:"叶子节点124"}
+						]},
+					{ name:"父节点13 - 没有子节点", isParent:true}
+				]},
+			{ name:"父节点2 - 折叠",
+				children: [
+					{ name:"父节点21 - 展开", open:true,
+						children: [
+							{ name:"叶子节点211"},
+							{ name:"叶子节点212"},
+							{ name:"叶子节点213"},
+							{ name:"叶子节点214"}
+						]},
+					{ name:"父节点22 - 折叠",
+						children: [
+							{ name:"叶子节点221"},
+							{ name:"叶子节点222"},
+							{ name:"叶子节点223"},
+							{ name:"叶子节点224"}
+						]},
+					{ name:"父节点23 - 折叠",
+						children: [
+							{ name:"叶子节点231"},
+							{ name:"叶子节点232"},
+							{ name:"叶子节点233"},
+							{ name:"叶子节点234"}
+						]}
+				]},
+			{ name:"父节点3 - 没有子节点", isParent:true}
+
+		];
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>最简单的树 -- 标准 JSON 数据</h1>
+<h6>[ 文件路径: core/standardData.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、setting 配置信息说明</h2>
+				<ul class="list">
+				<li class="highlight_red">普通使用，无必须设置的参数</li>
+				<li>与显示相关的内容请参考 API 文档中 setting.view 内的配置信息</li>
+				<li>name、children、title 等属性定义更改请参考 API 文档中 setting.data.key 内的配置信息</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li class="highlight_red">标准的 JSON 数据需要嵌套表示节点的父子包含关系
+					<div><pre xmlns=""><code>例如：
+var nodes = [
+	{name: "父节点1", children: [
+		{name: "子节点1"},
+		{name: "子节点2"}
+	]}
+];</code></pre></div>
+				</li>
+				<li>默认展开的节点，请设置 treeNode.open 属性</li>
+				<li>无子节点的父节点，请设置 treeNode.isParent 属性</li>
+				<li>其他属性说明请参考 API 文档中 "treeNode 节点数据详解"</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/core/update_fun.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/core/update_fun.html
new file mode 100644
index 0000000..918ed82
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/core/update_fun.html
@@ -0,0 +1,143 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - updateNode</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				selectedMulti: false
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"父节点1", open:true},
+			{ id:11, pId:1, name:"叶子节点1"},
+			{ id:12, pId:1, name:"叶子节点2"},
+			{ id:13, pId:1, name:"叶子节点3"},
+			{ id:2, pId:0, name:"父节点2", open:true},
+			{ id:21, pId:2, name:"叶子节点1"},
+			{ id:22, pId:2, name:"叶子节点2"},
+			{ id:23, pId:2, name:"叶子节点3"},
+			{ id:3, pId:0, name:"父节点3", open:true },
+			{ id:31, pId:3, name:"叶子节点1"},
+			{ id:32, pId:3, name:"叶子节点2"},
+			{ id:33, pId:3, name:"叶子节点3"}
+		];
+
+		var nameCount = 0, iconCount = 1, color = [0, 0, 0];
+		function updateNode(e) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			type = e.data.type,
+			nodes = zTree.getSelectedNodes();
+			if (nodes.length == 0) {
+				alert("请先选择一个节点");
+			}
+			for (var i=0, l=nodes.length; i<l; i++) {
+				zTree.setting.view.fontCss = {};
+				if (type == "rename") {
+					nodes[i].name = nodes[i].name.replace(/_[\d]*$/g, "") + "_" + (nameCount++);
+				} else if (type == "icon") {
+					if (iconCount > 8) {
+						nodes[i].iconSkin = null;
+						iconCount = 1;
+					} else if (nodes[i].isParent) {
+						nodes[i].iconSkin = nodes[i].iconSkin ? null : "pIcon01";
+					} else {
+						nodes[i].iconSkin = "icon0" + (iconCount++);
+					}
+				} else if (type == "color") {
+					color = [0, 0, 0];
+					var r1 = Math.round(Math.random()*3 - 0.5);
+					color[r1] = 15;
+					var r2 = Math.round(Math.random()*3 - 0.5);
+					while (r2 === r1) {
+						r2 = Math.round(Math.random()*3 - 0.5);
+					}
+					color[r2] = Math.round(Math.random()*16-0.5);
+					zTree.setting.view.fontCss["color"] = "#"+color[0].toString(16)+color[1].toString(16)+color[2].toString(16);
+				} else if (type == "font") {
+					var style = $("#" + nodes[i].tId + "_a").css("font-style") ;
+					style = (style=="italic" ? "normal" : "italic");
+					zTree.setting.view.fontCss["font-style"] = style;
+				}
+				zTree.updateNode(nodes[i]);
+			}
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			$("#rename").bind("click", {type:"rename"}, updateNode);
+			$("#changeIcon").bind("click", {type:"icon"}, updateNode);
+			$("#changeColor").bind("click", {type:"color"}, updateNode);
+			$("#changeFont").bind("click", {type:"font"}, updateNode);
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+.ztree li span.button.pIcon01_ico_open{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/1_open.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.pIcon01_ico_close{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/1_close.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon01_ico_docu{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/2.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon02_ico_docu{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/3.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon03_ico_docu{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/4.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon04_ico_docu{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/5.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon05_ico_docu{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/6.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon06_ico_docu{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/7.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon07_ico_docu{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/8.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon08_ico_docu{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/9.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+	</style>
+</HEAD>
+
+<BODY>
+<h1>用 zTree 方法 更新 节点数据</h1>
+<h6>[ 文件路径: core/update_fun.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、updateNode 方法操作说明</h2>
+				<ul class="list">
+				<li class="highlight_red">使用 zTreeObj.updateNode 方法，详细请参见 API 文档中的相关内容</li>
+				<li><p>此 Demo 只能同时选中一个节点<br/>
+					试试看：[ <a id="rename" href="#" onclick="return false;">换名字</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="changeIcon" href="#" onclick="return false;">换图标</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="changeColor" href="#" onclick="return false;">换颜色</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="changeFont" href="#" onclick="return false;">斜体</a> ]</p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、setting 配置信息说明</h2>
+				<ul class="list">
+				<li>不需要对 setting 进行特殊设置</li>
+				<li class="highlight_red">配合 setting.view.fontCss 可以修改节点文字样式</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li class="highlight_red">zTreeObj.updateNode 方法的 API 文档中有详细说明</li>
+				</ul>
+			</li>
+			<li class="title"><h2>4、其他说明</h2>
+				<ul class="list">
+				<li>此 Demo 是针对 核心 js 包 core 制作的，因此不包括 checkbox 的更新操作</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/core/url.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/core/url.html
new file mode 100644
index 0000000..8550d28
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/core/url.html
@@ -0,0 +1,63 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - url</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			data: {
+				simpleData: {
+					enable: true
+				}
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"zTree Home", url:"http://www.baby666.cn", target:"_blank"},
+			{ id:2, pId:0, name:"zTree in Google", url:"http://code.google.com/p/jquerytree/", target:"_blank"},
+			{ id:3, pId:0, name:"zTree in Iteye", url:"http://ztreeapi.iteye.com/", target:"_blank"},
+			{ id:4, pId:0, name:"Nothing...", url:"", target:"_blank", click:"alert('我是不会跳转的...');"}
+		];
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+ </HEAD>
+
+<BODY>
+<h1>超链接演示</h1>
+<h6>[ 文件路径: core/url.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、setting 配置信息说明</h2>
+				<ul class="list">
+				<li>普通使用，无必须设置的参数</li>
+				<li class="highlight_red">如果需要灵活控制超链接跳转，请利用 onClick 事件回调函数进行控制，详细请参见 API 文档中的相关内容</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li class="highlight_red">1、url 属性用于设置 页面跳转的路径</li>
+				<li class="highlight_red">2、target 属性用于设置 页面跳转的窗口目标</li>
+				<li class="highlight_red">3、click 属性用于设置简单的 onClick 事件</li>
+				<li>其他属性说明请参考 API 文档中 "treeNode 节点数据详解"</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/excheck/checkbox.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/excheck/checkbox.html
new file mode 100644
index 0000000..01c5d5c
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/excheck/checkbox.html
@@ -0,0 +1,107 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - checkbox</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<!--
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			check: {
+				enable: true
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"随意勾选 1", open:true},
+			{ id:11, pId:1, name:"随意勾选 1-1", open:true},
+			{ id:111, pId:11, name:"随意勾选 1-1-1"},
+			{ id:112, pId:11, name:"随意勾选 1-1-2"},
+			{ id:12, pId:1, name:"随意勾选 1-2", open:true},
+			{ id:121, pId:12, name:"随意勾选 1-2-1"},
+			{ id:122, pId:12, name:"随意勾选 1-2-2"},
+			{ id:2, pId:0, name:"随意勾选 2", checked:true, open:true},
+			{ id:21, pId:2, name:"随意勾选 2-1"},
+			{ id:22, pId:2, name:"随意勾选 2-2", open:true},
+			{ id:221, pId:22, name:"随意勾选 2-2-1", checked:true},
+			{ id:222, pId:22, name:"随意勾选 2-2-2"},
+			{ id:23, pId:2, name:"随意勾选 2-3"}
+		];
+		
+		var code;
+		
+		function setCheck() {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			py = $("#py").attr("checked")? "p":"",
+			sy = $("#sy").attr("checked")? "s":"",
+			pn = $("#pn").attr("checked")? "p":"",
+			sn = $("#sn").attr("checked")? "s":"",
+			type = { "Y":py + sy, "N":pn + sn};
+			zTree.setting.check.chkboxType = type;
+			showCode('setting.check.chkboxType = { "Y" : "' + type.Y + '", "N" : "' + type.N + '" };');
+		}
+		function showCode(str) {
+			if (!code) code = $("#code");
+			code.empty();
+			code.append("<li>"+str+"</li>");
+		}
+		
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			setCheck();
+			$("#py").bind("change", setCheck);
+			$("#sy").bind("change", setCheck);
+			$("#pn").bind("change", setCheck);
+			$("#sn").bind("change", setCheck);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Checkbox 勾选操作</h1>
+<h6>[ 文件路径: excheck/checkbox.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、setting 配置信息说明</h2>
+				<ul class="list">
+				<li class="highlight_red">使用 checkbox，必须设置 setting.check 中的各个属性，详细请参见 API 文档中的相关内容</li>
+				<li><p>父子关联关系：<br/>
+						被勾选时：<input type="checkbox" id="py" class="checkbox first" checked /><span>关联父</span>
+						<input type="checkbox" id="sy" class="checkbox first" checked /><span>关联子</span><br/>
+						取消勾选时：<input type="checkbox" id="pn" class="checkbox first" checked /><span>关联父</span>
+						<input type="checkbox" id="sn" class="checkbox first" checked /><span>关联子</span><br/>
+						<ul id="code" class="log" style="height:20px;"></ul></p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li class="highlight_red">1)、如果需要初始化默认节点被勾选，请设置 treeNode.checked 属性，详细请参见 API 文档中的相关内容</li>
+				<li class="highlight_red">2)、如果某节点禁用 checkbox，请设置 treeNode.chkDisabled 属性，详细请参见 API 文档中的相关内容 和 'chkDisabled 演示'</li>
+				<li class="highlight_red">3)、如果某节点不显示 checkbox，请设置 treeNode.nocheck 属性，详细请参见 API 文档中的相关内容 和 'nocheck 演示'</li>
+				<li class="highlight_red">4)、如果更换 checked 属性，请参考 API 文档中 setting.data.key.checked 的详细说明</li>
+				<li>5)、其他请参考 API 文档中 treeNode.checkedOld / getCheckStatus / check_Child_State / check_Focus 的详细说明</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/excheck/checkbox_chkDisabled.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/excheck/checkbox_chkDisabled.html
new file mode 100644
index 0000000..c3ad466
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/excheck/checkbox_chkDisabled.html
@@ -0,0 +1,112 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - Checkbox chkDisabled</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<!--
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			check: {
+				enable: true,
+				chkDisabledInherit: true
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"随意勾选 1", open:true},
+			{ id:11, pId:1, name:"随意勾选 1-1", open:true},
+			{ id:111, pId:11, name:"disabled 1-1-1", chkDisabled:true},
+			{ id:112, pId:11, name:"随意勾选 1-1-2"},
+			{ id:12, pId:1, name:"disabled 1-2", chkDisabled:true, checked:true, open:true},
+			{ id:121, pId:12, name:"disabled 1-2-1", checked:true},
+			{ id:122, pId:12, name:"disabled 1-2-2"},
+			{ id:2, pId:0, name:"随意勾选 2", checked:true, open:true},
+			{ id:21, pId:2, name:"随意勾选 2-1"},
+			{ id:22, pId:2, name:"随意勾选 2-2", open:true},
+			{ id:221, pId:22, name:"随意勾选 2-2-1", checked:true},
+			{ id:222, pId:22, name:"随意勾选 2-2-2"},
+			{ id:23, pId:2, name:"随意勾选 2-3"}
+		];
+
+		function disabledNode(e) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			disabled = e.data.disabled,
+			nodes = zTree.getSelectedNodes(),
+			inheritParent = false, inheritChildren = false;
+			if (nodes.length == 0) {
+				alert("请先选择一个节点");
+			}
+			if (disabled) {
+				inheritParent = $("#py").attr("checked");
+				inheritChildren = $("#sy").attr("checked");
+			} else {
+				inheritParent = $("#pn").attr("checked");
+				inheritChildren = $("#sn").attr("checked");
+			}
+
+			for (var i=0, l=nodes.length; i<l; i++) {
+				zTree.setChkDisabled(nodes[i], disabled, inheritParent, inheritChildren);
+			}
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			$("#disabledTrue").bind("click", {disabled: true}, disabledNode);
+			$("#disabledFalse").bind("click", {disabled: false}, disabledNode);
+			
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Checkbox chkDisabled 演示</h1>
+<h6>[ 文件路径: excheck/checkbox_chkDisabled.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、setChkDisabled 方法操作说明</h2>
+				<ul class="list">
+				<li>setChkDisabled 方法可以设置节点 checkbox / radio 禁用 或 取消禁用，详细请参见 API 文档中的相关内容</li>
+				<li><p>试试看：<br/>
+					禁用时：<input type="checkbox" id="py" class="checkbox first"/><span>关联父</span>
+					<input type="checkbox" id="sy" class="checkbox first" checked /><span>关联子</span><br/>
+					取消禁用时：<input type="checkbox" id="pn" class="checkbox first" checked /><span>关联父</span>
+					<input type="checkbox" id="sn" class="checkbox first" checked /><span>关联子</span><br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="disabledTrue" href="#" title="set checkbox to be disabled." onclick="return false;">禁用</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="disabledFalse" href="#" title="set checkbox to be abled." onclick="return false;">取消禁用</a> ]
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、setting 配置信息说明</h2>
+				<ul class="list">
+				<li>这个 Demo 只简单演示 chkDisabled 的使用方法，详细配置信息请参考 ‘Checkbox 勾选操作’</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li class="highlight_red">1)、如果某节点禁用 checkbox，请设置 treeNode.chkDisabled 属性，详细请参见 API 文档中的相关内容</li>
+				<li>2)、其他请参考 ‘Checkbox 勾选操作’</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/excheck/checkbox_count.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/excheck/checkbox_count.html
new file mode 100644
index 0000000..c0d84ba
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/excheck/checkbox_count.html
@@ -0,0 +1,126 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - getChangeCheckedNodes / getCheckedNodes</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<!--
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				selectedMulti: false
+			},
+			check: {
+				enable: true
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				onCheck: onCheck
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"随意勾选 1", open:true},
+			{ id:11, pId:1, name:"随意勾选 1-1"},
+			{ id:12, pId:1, name:"随意勾选  1-2", open:true},
+			{ id:121, pId:12, name:"随意勾选 1-2-1", checked:true},
+			{ id:122, pId:12, name:"随意勾选 1-2-2"},
+			{ id:123, pId:12, name:"随意勾选 1-2-3"},
+			{ id:13, pId:1, name:"随意勾选 1-3"},
+			{ id:2, pId:0, name:"随意勾选 2", open:true},
+			{ id:21, pId:2, name:"随意勾选 2-1"},
+			{ id:22, pId:2, name:"随意勾选 2-2", open:true},
+			{ id:221, pId:22, name:"随意勾选 2-2-1", checked:true},
+			{ id:222, pId:22, name:"随意勾选 2-2-2"},
+			{ id:223, pId:22, name:"随意勾选 2-2-3"},
+			{ id:23, pId:2, name:"随意勾选 2-3", checked:true}
+		];
+
+		var clearFlag = false;
+		function onCheck(e, treeId, treeNode) {
+			count();
+			if (clearFlag) {
+				clearCheckedOldNodes();
+			}
+		}
+		function clearCheckedOldNodes() {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nodes = zTree.getChangeCheckedNodes();
+			for (var i=0, l=nodes.length; i<l; i++) {
+				nodes[i].checkedOld = nodes[i].checked;
+			}
+		}
+		function count() {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			checkCount = zTree.getCheckedNodes(true).length,
+			nocheckCount = zTree.getCheckedNodes(false).length,
+			changeCount = zTree.getChangeCheckedNodes().length;
+			$("#checkCount").text(checkCount);
+			$("#nocheckCount").text(nocheckCount);
+			$("#changeCount").text(changeCount);
+
+		}
+		function createTree() {
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			count();
+			clearFlag = $("#last").attr("checked");
+		}
+
+		$(document).ready(function(){
+			createTree();			
+			$("#init").bind("change", createTree);
+			$("#last").bind("change", createTree);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>checkbox 勾选统计</h1>
+<h6>[ 文件路径: excheck/checkbox_count.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、getChangeCheckedNodes / getCheckedNodes 方法操作说明</h2>
+				<ul class="list">
+				<li class="highlight_red">使用 zTreeObj.getChangeCheckedNodes / getCheckedNodes 方法，详细请参见 API 文档中的相关内容</li>
+				<li><p>去勾选 checkbox 比较下面的数字变化：<br/>
+					<ul id="log" class="log" style="height:110px;">
+						<li>当前被勾选的节点共 <span id="checkCount" class="highlight_red"></span> 个</li>
+						<li>当前未被勾选的节点共 <span id="nocheckCount" class="highlight_red"></span> 个</li>
+						<li>勾选状态对比规则：<input type="radio" id="init" name="stateType" class="radio first" checked /><span>与 zTree 初始化时对比</span><br/>
+							<input type="radio" id="last" name="stateType" class="radio first" style="margin-left:108px;"/><span>与上一次勾选后对比</span></li>
+						<li>当前被修改勾选状态的节点共 <span id="changeCount" class="highlight_red"></span> 个</li>
+					</ul></p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、setting 配置信息说明</h2>
+				<ul class="list">
+				<li>同 "checkbox 勾选操作" 中的说明</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li>同 "checkbox 勾选操作" 中的说明</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/excheck/checkbox_fun.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/excheck/checkbox_fun.html
new file mode 100644
index 0000000..c8a0b12
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/excheck/checkbox_fun.html
@@ -0,0 +1,172 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - beforeCheck / onCheck</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<!--
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				selectedMulti: false
+			},
+			check: {
+				enable: true
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeCheck: beforeCheck,
+				onCheck: onCheck
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"随意勾选 1", open:true},
+			{ id:11, pId:1, name:"随意勾选 1-1"},
+			{ id:12, pId:1, name:"随意勾选 1-2", open:true},
+			{ id:121, pId:12, name:"随意勾选 1-2-1"},
+			{ id:122, pId:12, name:"随意勾选 1-2-2"},
+			{ id:2, pId:0, name:"禁止勾选 2", open:true, doCheck:false},
+			{ id:21, pId:2, name:"禁止勾选 2-1", doCheck:false},
+			{ id:22, pId:2, name:"禁止勾选 2-2", checked:true, open:true, doCheck:false},
+			{ id:221, pId:22, name:"禁止勾选 2-2-1", doCheck:false},
+			{ id:222, pId:22, name:"禁止勾选 2-2-2", checked:true, doCheck:false},
+			{ id:23, pId:2, name:"禁止勾选 2-3", doCheck:false}
+		];
+		
+		var code, log, className = "dark";
+		function beforeCheck(treeId, treeNode) {
+			className = (className === "dark" ? "":"dark");
+			showLog("[ "+getTime()+" beforeCheck ]&nbsp;&nbsp;&nbsp;&nbsp;" + treeNode.name );
+			return (treeNode.doCheck !== false);
+		}
+		function onCheck(e, treeId, treeNode) {
+			showLog("[ "+getTime()+" onCheck ]&nbsp;&nbsp;&nbsp;&nbsp;" + treeNode.name );
+		}		
+		function showLog(str) {
+			if (!log) log = $("#log");
+			log.append("<li class='"+className+"'>"+str+"</li>");
+			if(log.children("li").length > 6) {
+				log.get(0).removeChild(log.children("li")[0]);
+			}
+		}
+		function getTime() {
+			var now= new Date(),
+			h=now.getHours(),
+			m=now.getMinutes(),
+			s=now.getSeconds(),
+			ms=now.getMilliseconds();
+			return (h+":"+m+":"+s+ " " +ms);
+		}
+
+		function checkNode(e) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			type = e.data.type,
+			nodes = zTree.getSelectedNodes();
+			if (type.indexOf("All")<0 && nodes.length == 0) {
+				alert("请先选择一个节点");
+			}
+
+			if (type == "checkAllTrue") {
+				zTree.checkAllNodes(true);
+			} else if (type == "checkAllFalse") {
+				zTree.checkAllNodes(false);
+			} else {
+				var callbackFlag = $("#callbackTrigger").attr("checked");
+				for (var i=0, l=nodes.length; i<l; i++) {
+					if (type == "checkTrue") {
+						zTree.checkNode(nodes[i], true, false, callbackFlag);
+					} else if (type == "checkFalse") {
+						zTree.checkNode(nodes[i], false, false, callbackFlag);
+					} else if (type == "toggle") {
+						zTree.checkNode(nodes[i], null, false, callbackFlag);
+					}else if (type == "checkTruePS") {
+						zTree.checkNode(nodes[i], true, true, callbackFlag);
+					} else if (type == "checkFalsePS") {
+						zTree.checkNode(nodes[i], false, true, callbackFlag);
+					} else if (type == "togglePS") {
+						zTree.checkNode(nodes[i], null, true, callbackFlag);
+					}
+				}
+			}
+		}
+
+		function setAutoTrigger(e) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			zTree.setting.check.autoCheckTrigger = $("#autoCallbackTrigger").attr("checked");
+			$("#autoCheckTriggerValue").html(zTree.setting.check.autoCheckTrigger ? "true" : "false");
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			$("#checkTrue").bind("click", {type:"checkTrue"}, checkNode);
+			$("#checkFalse").bind("click", {type:"checkFalse"}, checkNode);
+			$("#toggle").bind("click", {type:"toggle"}, checkNode);
+			$("#checkTruePS").bind("click", {type:"checkTruePS"}, checkNode);
+			$("#checkFalsePS").bind("click", {type:"checkFalsePS"}, checkNode);
+			$("#togglePS").bind("click", {type:"togglePS"}, checkNode);
+			$("#checkAllTrue").bind("click", {type:"checkAllTrue"}, checkNode);
+			$("#checkAllFalse").bind("click", {type:"checkAllFalse"}, checkNode);
+
+			$("#autoCallbackTrigger").bind("change", {}, setAutoTrigger);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>用 zTree 方法 勾选 checkbox</h1>
+<h6>[ 文件路径: excheck/checkbox_fun.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、beforeCheck / onCheck 事件回调函数控制</h2>
+				<ul class="list">
+				<li>利用 beforeCheck / onCheck 事件回调函数 可以控制是否允许 更改 节点勾选状态，这里简单演示如何监控此事件</li>
+				<li><p>这里还演示了 checkNode / checkAllNodes 方法触发 beforeCheck / onCheck 事件回调函数的情况，试试看：<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" id="autoCallbackTrigger" /> setting.check.autoCheckTrigger: <span id="autoCheckTriggerValue">false</span><br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" id="callbackTrigger" checked /> 执行勾选方法是否触发 callback <br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;单节点--[ <a id="checkTrue" href="#" title="不想勾选我就不勾选你..." onclick="return false;">勾选</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="checkFalse" href="#" title="不想取消勾选我就不取消你..." onclick="return false;">取消勾选</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="toggle" href="#" title="你想怎样？..." onclick="return false;">勾选 切换</a> ]<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;单节点 ( 影响父子 )--[ <a id="checkTruePS" href="#" title="不想勾选我就不勾选你..." onclick="return false;">勾选</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="checkFalsePS" href="#" title="不想取消勾选我就不取消你..." onclick="return false;">取消勾选</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="togglePS" href="#" title="你想怎样？..." onclick="return false;">勾选 切换</a> ]<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;全部节点--[ <a id="checkAllTrue" href="#" title="不管你有多NB，统统都要听我的！！" onclick="return false;">勾选</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="checkAllFalse" href="#" title="不管你有多NB，统统都要听我的！！" onclick="return false;">取消勾选</a> ]</p>
+				</li>
+				<li><p><span class="highlight_red">使用 zTreeObj.checkNode / checkAllNodes 方法，详细请参见 API 文档中的相关内容</span><br/>
+					beforeCheck / onCheck log:<br/>
+					<ul id="log" class="log" style="height:130px;"></ul></p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、setting 配置信息说明</h2>
+				<ul class="list">
+				<li>同 "checkbox 勾选操作" 中的说明</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li>同 "checkbox 勾选操作" 中的说明</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/excheck/checkbox_halfCheck.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/excheck/checkbox_halfCheck.html
new file mode 100644
index 0000000..21de1e0
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/excheck/checkbox_halfCheck.html
@@ -0,0 +1,108 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - Checkbox halfCheck</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<!--
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			async: {
+				enable: true,
+				url:"../asyncData/getNodes.php",
+				autoParam:["id", "name=n", "level=lv"],
+				otherParam:{"chk":"chk"},
+				dataFilter: dataFilter
+			},
+			check: {
+				enable: true,
+				autoCheckTrigger: true
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				onCheck: onCheck,
+				onAsyncSuccess: onAsyncSuccess
+			}
+		};
+
+		function dataFilter(treeId, parentNode, childNodes) {
+			if (parentNode.checkedEx === true) {
+				for(var i=0, l=childNodes.length; i<l; i++) {
+					childNodes[i].checked = parentNode.checked;
+					childNodes[i].halfCheck = false;
+					childNodes[i].checkedEx = true;
+				}
+			}
+			return childNodes;
+		}
+		function onCheck(event, treeId, treeNode) {
+			cancelHalf(treeNode)
+			treeNode.checkedEx = true;
+		}
+		function onAsyncSuccess(event, treeId, treeNode, msg) {
+			cancelHalf(treeNode);
+		}
+		function cancelHalf(treeNode) {
+			if (treeNode.checkedEx) return;
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			treeNode.halfCheck = false;
+			zTree.updateNode(treeNode);			
+		}
+
+		var zNodes =[
+			{ id:1, pId:0, name:"半勾选 1", halfCheck:true, isParent:true},
+			{ id:2, pId:0, name:"半勾选 2", halfCheck:true, checked:true, isParent:true},
+			{ id:3, pId:0, name:"随意勾选 3", checked:true, isParent:true}
+		];
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Checkbox halfCheck 演示</h1>
+<h6>[ 文件路径: excheck/checkbox_halfCheck.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、演示说明</h2>
+				<ul class="list">
+				<li>这个演示式实现了 异步加载模式 下简单的勾选操作</li>
+				<li class="highlight_red">1)、加载子节点后，父节点的 halfCheck 立刻失效</li>
+				<li class="highlight_red">2)、勾选父节点，可以影响之后加载的子节点的勾选状态</li>
+				<li class="highlight_red">3)、勾选父节点，可以让其子节点的 halfCheck 属性失效</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、setting 配置信息说明</h2>
+				<ul class="list">
+				<li>实现半勾选功能，不需要配置任何参数。但半勾选功能属于辅助功能，无法单独使用，因此也需要根据自己的需求配置特定参数。</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li class="highlight_red">1)、请在节点初始化之前，设置 treeNode.halfCheck 属性，详细请参见 API 文档中的相关内容</li>
+				<li>2)、其他请参考 ‘Checkbox 勾选操作’</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/excheck/checkbox_nocheck.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/excheck/checkbox_nocheck.html
new file mode 100644
index 0000000..5e99015
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/excheck/checkbox_nocheck.html
@@ -0,0 +1,96 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - no checkbox</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<!--
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			check: {
+				enable: true,
+				nocheckInherit: true
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"随意勾选 1", open:true},
+			{ id:11, pId:1, name:"随意勾选 1-1", open:true},
+			{ id:111, pId:11, name:"无 checkbox 1-1-1", nocheck:true},
+			{ id:112, pId:11, name:"随意勾选 1-1-2"},
+			{ id:12, pId:1, name:"无 checkbox 1-2", nocheck:true, open:true},
+			{ id:121, pId:12, name:"无 checkbox 1-2-1"},
+			{ id:122, pId:12, name:"无 checkbox 1-2-2"},
+			{ id:2, pId:0, name:"随意勾选 2", checked:true, open:true},
+			{ id:21, pId:2, name:"随意勾选 2-1"},
+			{ id:22, pId:2, name:"随意勾选 2-2", open:true},
+			{ id:221, pId:22, name:"随意勾选 2-2-1", checked:true},
+			{ id:222, pId:22, name:"随意勾选 2-2-2"},
+			{ id:23, pId:2, name:"随意勾选 2-3"}
+		];
+
+		function nocheckNode(e) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nocheck = e.data.nocheck,
+			nodes = zTree.getSelectedNodes();
+			if (nodes.length == 0) {
+				alert("请先选择一个节点");
+			}
+
+			for (var i=0, l=nodes.length; i<l; i++) {
+				nodes[i].nocheck = nocheck;
+				zTree.updateNode(nodes[i]);
+			}
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			$("#nocheckTrue").bind("click", {nocheck: true}, nocheckNode);
+			$("#nocheckFalse").bind("click", {nocheck: false}, nocheckNode);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Checkbox nocheck 演示</h1>
+<h6>[ 文件路径: excheck/checkbox_nocheck.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、setting 配置信息说明</h2>
+				<ul class="list">
+				<li>这个 Demo 只简单演示 nocheck 的使用方法，详细配置信息请参考 ‘Checkbox 勾选操作’</li>
+				<li class="highlight_red">setting.check.nocheckInherit 可以设置子节点自动继承父节点的 nocheck 属性，详细请参见 API 文档中的相关内容</li>
+				<li><p>试试看：<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="nocheckTrue" href="#" title="set checkbox to be hidden." onclick="return false;">隐藏</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="nocheckFalse" href="#" title="set checkbox to be show." onclick="return false;">显示</a> ]
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li class="highlight_red">1)、如果某节点不显示 checkbox，请设置 treeNode.nocheck 属性，详细请参见 API 文档中的相关内容</li>
+				<li>2)、其他请参考 ‘Checkbox 勾选操作’</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/excheck/radio.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/excheck/radio.html
new file mode 100644
index 0000000..9cd589a
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/excheck/radio.html
@@ -0,0 +1,97 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - radio</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<!--
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			check: {
+				enable: true,
+				chkStyle: "radio",
+				radioType: "level"
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"随意勾选 1", open:true},
+			{ id:11, pId:1, name:"随意勾选 1-1", open:true},
+			{ id:111, pId:11, name:"随意勾选 1-1-1"},
+			{ id:112, pId:11, name:"随意勾选 1-1-2"},
+			{ id:12, pId:1, name:"随意勾选 1-2", open:true},
+			{ id:121, pId:12, name:"随意勾选 1-2-1"},
+			{ id:122, pId:12, name:"随意勾选 1-2-2"},
+			{ id:2, pId:0, name:"随意勾选 2", open:true},
+			{ id:21, pId:2, name:"随意勾选 2-1"},
+			{ id:22, pId:2, name:"随意勾选 2-2", open:true},
+			{ id:221, pId:22, name:"随意勾选 2-2-1", checked:true},
+			{ id:222, pId:22, name:"随意勾选 2-2-2"},
+			{ id:23, pId:2, name:"随意勾选 2-3"}
+		];
+		
+		var code;		
+		function setCheck() {
+			var type = $("#level").attr("checked")? "level":"all";
+			setting.check.radioType = type;
+			showCode('setting.check.radioType = "' + type + '";');
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		}
+		function showCode(str) {
+			if (!code) code = $("#code");
+			code.empty();
+			code.append("<li>"+str+"</li>");
+		}
+		
+		$(document).ready(function(){
+			setCheck();			
+			$("#level").bind("change", setCheck);
+			$("#all").bind("change", setCheck);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Radio 勾选操作</h1>
+<h6>[ 文件路径: excheck/radio.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、setting 配置信息说明</h2>
+				<ul class="list">
+				<li class="highlight_red">使用 radio，必须设置 setting.check 中的各个属性，详细请参见 API 文档中的相关内容</li>
+				<li><p>radio 分组范围：<input type="radio" id="level" class="radio first" name="radioGroup" checked /><span>同一级内</span>
+						<input type="radio" id="all" class="radio" name="radioGroup"/><span>整棵树内</span><br/>
+						<ul id="code" class="log" style="height:20px;"></ul></p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li class="highlight_red">1)、如果需要初始化默认节点被勾选，请设置 treeNode.checked 属性，详细请参见 API 文档中的相关内容</li>
+				<li class="highlight_red">2)、如果某节点不显示 radio，请设置 treeNode.nocheck 属性，详细请参见 API 文档中的相关内容</li>
+				<li class="highlight_red">3)、如果更换 checked 属性，请参考 API 文档中 setting.data.key.checked 的详细说明</li>
+				<li>4)、其他请参考 API 文档中 treeNode.checkedOld / getCheckStatus / check_Child_State / check_Focus 的详细说明</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/excheck/radio_chkDisabled.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/excheck/radio_chkDisabled.html
new file mode 100644
index 0000000..6d330f3
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/excheck/radio_chkDisabled.html
@@ -0,0 +1,101 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - Radio chkDisabled</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<!--
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			check: {
+				enable: true,
+				chkStyle: "radio",
+				radioType: "level"
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"随意勾选 1", open:true},
+			{ id:11, pId:1, name:"随意勾选 1-1", open:true},
+			{ id:111, pId:11, name:"disabled 1-1-1", chkDisabled:true, checked:true},
+			{ id:112, pId:11, name:"随意勾选 1-1-2"},
+			{ id:12, pId:1, name:"disabled 1-2", chkDisabled:true, open:true},
+			{ id:121, pId:12, name:"disabled 1-2-1", checked:true},
+			{ id:122, pId:12, name:"disabled 1-2-2"},
+			{ id:2, pId:0, name:"随意勾选 2", checked:true, open:true},
+			{ id:21, pId:2, name:"随意勾选 2-1"},
+			{ id:22, pId:2, name:"随意勾选 2-2", open:true},
+			{ id:221, pId:22, name:"随意勾选 2-2-1", checked:true},
+			{ id:222, pId:22, name:"随意勾选 2-2-2"},
+			{ id:23, pId:2, name:"随意勾选 2-3"}
+		];
+		
+		function disabledNode(e) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			disabled = e.data.disabled,
+			nodes = zTree.getSelectedNodes();
+			if (nodes.length == 0) {
+				alert("请先选择一个节点");
+			}
+
+			for (var i=0, l=nodes.length; i<l; i++) {
+				zTree.setChkDisabled(nodes[i], disabled);
+			}
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			$("#disabledTrue").bind("click", {disabled: true}, disabledNode);
+			$("#disabledFalse").bind("click", {disabled: false}, disabledNode);
+
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Radio chkDisabled 演示</h1>
+<h6>[ 文件路径: excheck/radio_chkDisabled.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、setChkDisabled 方法操作说明</h2>
+				<ul class="list">
+				<li>setChkDisabled 方法可以设置节点 checkbox / radio 禁用 或 取消禁用，详细请参见 API 文档中的相关内容</li>
+				<li><p>试试看：<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="disabledTrue" href="#" title="set checkbox to be disabled." onclick="return false;">禁用</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="disabledFalse" href="#" title="set checkbox to be abled." onclick="return false;">取消禁用</a> ]</p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、setting 配置信息说明</h2>
+				<ul class="list">
+				<li>这个 Demo 只简单演示 chkDisabled 的使用方法，详细配置信息请参考 ‘Radio 勾选操作’</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li class="highlight_red">1)、如果某节点不显示 radio，请设置 treeNode.chkDisabled 属性，详细请参见 API 文档中的相关内容</li>
+				<li>2)、其他请参考 ‘Radio 勾选操作’</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/excheck/radio_fun.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/excheck/radio_fun.html
new file mode 100644
index 0000000..b9b5240
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/excheck/radio_fun.html
@@ -0,0 +1,151 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - beforeCheck / onCheck</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<!--
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				selectedMulti: false
+			},
+			check: {
+				enable: true,
+				chkStyle: "radio",
+				radioType: "level"
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeCheck: beforeCheck,
+				onCheck: onCheck
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"随意勾选 1", open:true},
+			{ id:11, pId:1, name:"无 radio 1-1", nocheck:true},
+			{ id:12, pId:1, name:"随意勾选 1-2", open:true},
+			{ id:121, pId:12, name:"随意勾选 1-2-1"},
+			{ id:122, pId:12, name:"随意勾选 1-2-2"},
+			{ id:123, pId:12, name:"无 radio 1-2-3", nocheck:true},
+			{ id:13, pId:1, name:"随意勾选 1-3"},
+			{ id:2, pId:0, name:"禁止勾选 2", open:true, doCheck:false},
+			{ id:21, pId:2, name:"禁止勾选 2-1", doCheck:false},
+			{ id:22, pId:2, name:"禁止勾选 2-2", checked:true, open:true, doCheck:false},
+			{ id:221, pId:22, name:"禁止勾选 2-2-1", doCheck:false},
+			{ id:222, pId:22, name:"禁止勾选 2-2-2", checked:true, doCheck:false},
+			{ id:223, pId:22, name:"禁止勾选 2-2-3", doCheck:false},
+			{ id:23, pId:2, name:"禁止勾选 2-3", doCheck:false}
+		];
+		
+		var code, log, className = "dark";
+		function beforeCheck(treeId, treeNode) {
+			className = (className === "dark" ? "":"dark");
+			showLog("[ "+getTime()+" beforeCheck ]&nbsp;&nbsp;&nbsp;&nbsp;" + treeNode.name );
+			return (treeNode.doCheck !== false);
+		}
+		function onCheck(e, treeId, treeNode) {
+			showLog("[ "+getTime()+" onCheck ]&nbsp;&nbsp;&nbsp;&nbsp;" + treeNode.name );
+		}		
+		function showLog(str) {
+			if (!log) log = $("#log");
+			log.append("<li class='"+className+"'>"+str+"</li>");
+			if(log.children("li").length > 6) {
+				log.get(0).removeChild(log.children("li")[0]);
+			}
+		}
+		function getTime() {
+			var now= new Date(),
+			h=now.getHours(),
+			m=now.getMinutes(),
+			s=now.getSeconds(),
+			ms=now.getMilliseconds();
+			return (h+":"+m+":"+s+ " " +ms);
+		}
+
+		function checkNode(e) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			type = e.data.type,
+			nodes = zTree.getSelectedNodes();
+			if (type.indexOf("All")<0 && nodes.length == 0) {
+				alert("请先选择一个节点");
+			}
+
+			if (type == "checkAllTrue") {
+				zTree.checkAllNodes(true);
+			} else if (type == "checkAllFalse") {
+				zTree.checkAllNodes(false);
+			} else {
+				var callbackFlag = $("#callbackTrigger").attr("checked");
+				for (var i=0, l=nodes.length; i<l; i++) {
+					if (type == "checkTrue") {
+						zTree.checkNode(nodes[i], true, null, callbackFlag);
+					} else if (type == "checkFalse") {
+						zTree.checkNode(nodes[i], false, null, callbackFlag);
+					}else if (type == "checkTruePS") {
+						zTree.checkNode(nodes[i], true, true, callbackFlag);
+					} else if (type == "checkFalsePS") {
+						zTree.checkNode(nodes[i], false, true, callbackFlag);
+					}
+				}
+			}
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			$("#checkTrue").bind("click", {type:"checkTrue"}, checkNode);
+			$("#checkFalse").bind("click", {type:"checkFalse"}, checkNode);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>用 zTree 方法 勾选 radio</h1>
+<h6>[ 文件路径: excheck/radio_fun.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、beforeCheck / onCheck 事件回调函数控制</h2>
+				<ul class="list">
+				<li>利用 beforeCheck / onCheck 事件回调函数 可以控制是否允许 更改 节点勾选状态，这里简单演示如何监控此事件</li>
+				<li><p>试试看：<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" id="callbackTrigger" checked /> checkNode 方法是否触发 callback<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="checkTrue" href="#" title="不想勾选我就不勾选你..." onclick="return false;">勾选</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="checkFalse" href="#" title="不想取消勾选我就不取消你..." onclick="return false;">取消勾选</a> ]</p>
+				<li><p><span class="highlight_red">使用 zTreeObj.checkNode 方法，详细请参见 API 文档中的相关内容</span><br/>
+					beforeCheck / onCheck log:<br/>
+					<ul id="log" class="log" style="height:130px;"></ul></p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、setting 配置信息说明</h2>
+				<ul class="list">
+				<li>同 "radio 勾选操作" 中的说明</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li>同 "radio 勾选操作" 中的说明</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/excheck/radio_halfCheck.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/excheck/radio_halfCheck.html
new file mode 100644
index 0000000..91f25cf
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/excheck/radio_halfCheck.html
@@ -0,0 +1,93 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - Radio halfCheck</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<!--
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			async: {
+				enable: true,
+				url:"../asyncData/getNodes.php",
+				autoParam:["id", "name=n", "level=lv"],
+				otherParam:{"chk":"chk"}
+			},
+			check: {
+				enable: true,
+				autoCheckTrigger: true,
+				chkStyle: "radio",
+				radioType: "level"
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				onAsyncSuccess: onAsyncSuccess
+			}
+		};
+
+		function onAsyncSuccess(event, treeId, treeNode, msg) {
+			cancelHalf(treeNode);
+		}
+		function cancelHalf(treeNode) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			treeNode.halfCheck = false;
+			zTree.updateNode(treeNode);			
+		}
+
+		var zNodes =[
+			{ id:1, pId:0, name:"半勾选 1", halfCheck:true, isParent:true},
+			{ id:2, pId:0, name:"半勾选 2", halfCheck:true, checked:true, isParent:true},
+			{ id:3, pId:0, name:"随意勾选 3", isParent:true}
+		];
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Radio halfCheck 演示</h1>
+<h6>[ 文件路径: excheck/radio_halfCheck.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、演示说明</h2>
+				<ul class="list">
+				<li>这个演示式实现了 异步加载模式 下简单的勾选操作</li>
+				<li class="highlight_red">1)、加载子节点后，父节点的 halfCheck 立刻失效</li>
+				<li class="highlight_red">2)、勾选父节点，不会影响子节点的勾选状态</li>
+				<li class="highlight_red">3)、勾选父节点，不会让其子节点的 halfCheck 属性失效</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、setting 配置信息说明</h2>
+				<ul class="list">
+				<li>实现半勾选功能，不需要配置任何参数。但半勾选功能属于辅助功能，无法单独使用，因此也需要根据自己的需求配置特定参数。</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li class="highlight_red">1)、请在节点初始化之前，设置 treeNode.halfCheck 属性，详细请参见 API 文档中的相关内容</li>
+				<li>2)、其他请参考 ‘Radio 勾选操作’</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/excheck/radio_nocheck.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/excheck/radio_nocheck.html
new file mode 100644
index 0000000..cc648c1
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/excheck/radio_nocheck.html
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - no radio</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<!--
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			check: {
+				enable: true,
+				chkStyle: "radio",
+				radioType: "level"
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"随意勾选 1", open:true},
+			{ id:11, pId:1, name:"随意勾选 1-1", open:true},
+			{ id:111, pId:11, name:"无 radio 1-1-1", nocheck:true},
+			{ id:112, pId:11, name:"随意勾选 1-1-2"},
+			{ id:12, pId:1, name:"无 radio 1-2", nocheck:true, open:true},
+			{ id:121, pId:12, name:"无 radio 1-2-1"},
+			{ id:122, pId:12, name:"无 radio 1-2-2"},
+			{ id:2, pId:0, name:"随意勾选 2", checked:true, open:true},
+			{ id:21, pId:2, name:"随意勾选 2-1"},
+			{ id:22, pId:2, name:"随意勾选 2-2", open:true},
+			{ id:221, pId:22, name:"随意勾选 2-2-1", checked:true},
+			{ id:222, pId:22, name:"随意勾选 2-2-2"},
+			{ id:23, pId:2, name:"随意勾选 2-3"}
+		];
+		
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Radio nocheck 演示</h1>
+<h6>[ 文件路径: excheck/radio_nocheck.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、setting 配置信息说明</h2>
+				<ul class="list">
+				<li>这个 Demo 只简单演示 nocheck 的使用方法，详细配置信息请参考 ‘Radio 勾选操作’</li>
+				<li class="highlight_red">setting.check.nocheckInherit 可以设置子节点自动继承父节点的 nocheck 属性，详细请参见 API 文档中的相关内容</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li class="highlight_red">1)、如果某节点不显示 radio，请设置 treeNode.nocheck 属性，详细请参见 API 文档中的相关内容</li>
+				<li>2)、其他请参考 ‘Radio 勾选操作’</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/exedit/async_edit.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/exedit/async_edit.html
new file mode 100644
index 0000000..eb577fb
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/exedit/async_edit.html
@@ -0,0 +1,120 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - async & edit</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			async: {
+				enable: true,
+				url:"../asyncData/getNodes.php",
+				autoParam:["id", "name=n", "level=lv"],
+				otherParam:{"otherParam":"zTreeAsyncTest"},
+				dataFilter: filter
+			},
+			view: {expandSpeed:"",
+				addHoverDom: addHoverDom,
+				removeHoverDom: removeHoverDom,
+				selectedMulti: false
+			},
+			edit: {
+				enable: true
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeRemove: beforeRemove,
+				beforeRename: beforeRename
+			}
+		};
+
+		function filter(treeId, parentNode, childNodes) {
+			if (!childNodes) return null;
+			for (var i=0, l=childNodes.length; i<l; i++) {
+				childNodes[i].name = childNodes[i].name.replace(/\.n/g, '.');
+			}
+			return childNodes;
+		}
+		function beforeRemove(treeId, treeNode) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			zTree.selectNode(treeNode);
+			return confirm("确认删除 节点 -- " + treeNode.name + " 吗？");
+		}		
+		function beforeRename(treeId, treeNode, newName) {
+			if (newName.length == 0) {
+				alert("节点名称不能为空.");
+				return false;
+			}
+			return true;
+		}
+
+		var newCount = 1;
+		function addHoverDom(treeId, treeNode) {
+			var sObj = $("#" + treeNode.tId + "_span");
+			if (treeNode.editNameFlag || $("#addBtn_"+treeNode.tId).length>0) return;
+			var addStr = "<span class='button add' id='addBtn_" + treeNode.tId
+				+ "' title='add node' onfocus='this.blur();'></span>";
+			sObj.after(addStr);
+			var btn = $("#addBtn_"+treeNode.tId);
+			if (btn) btn.bind("click", function(){
+				var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+				zTree.addNodes(treeNode, {id:(100 + newCount), pId:treeNode.id, name:"new node" + (newCount++)});
+				return false;
+			});
+		};
+		function removeHoverDom(treeId, treeNode) {
+			$("#addBtn_"+treeNode.tId).unbind().remove();
+		};
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting);
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+.ztree li span.button.add {margin-left:2px; margin-right: -1px; background-position:-144px 0; vertical-align:top; *vertical-align:middle}
+	</style>
+</HEAD>
+
+<BODY>
+<h1>异步加载 & 编辑功能 共存</h1>
+<h6>[ 文件路径: exedit/async_edit.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、异步加载 & 编辑功能 共存说明</h2>
+				<ul class="list">
+				<li>1)、此 Demo 是基于 "高级 增 / 删 / 改 节点" 修改的，并且开放了拖拽功能，可与其进行对比</li>
+				<li>2)、只需要同时开启编辑模式和异步加载模式即可实现共存</li>
+				<li class="highlight_red">3)、zTree 完善了异步加载模式下的编辑功能，对于未加载子节点的父节点，增加子节点时，会首先进行异步加载。</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、setting 配置信息说明</h2>
+				<ul class="list">
+				<li class="highlight_red">1)、使用 编辑功能，请参考 "拖拽节点基本控制" 和 "基本 增 / 删 / 改 节点" Demo 中关于 setting 的配置要求</li>
+				<li class="highlight_red">2)、使用 异步加载功能，请参考 "异步加载 节点数据" Demo 中关于 setting 的配置要求</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li>两种模式共存，对数据无特殊要求，请分别参考 "异步加载 节点数据" & "拖拽 节点 基本控制" & "基本 增 / 删 / 改 节点" 中的相关说明</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/exedit/drag.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/exedit/drag.html
new file mode 100644
index 0000000..a19da79
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/exedit/drag.html
@@ -0,0 +1,136 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - drag & drop</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			edit: {
+				enable: true,
+				showRemoveBtn: false,
+				showRenameBtn: false
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeDrag: beforeDrag,
+				beforeDrop: beforeDrop
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"随意拖拽 1", open:true},
+			{ id:11, pId:1, name:"随意拖拽 1-1"},
+			{ id:12, pId:1, name:"随意拖拽 1-2", open:true},
+			{ id:121, pId:12, name:"随意拖拽 1-2-1"},
+			{ id:122, pId:12, name:"随意拖拽 1-2-2"},
+			{ id:123, pId:12, name:"随意拖拽 1-2-3"},
+			{ id:13, pId:1, name:"禁止拖拽 1-3", open:true, drag:false},
+			{ id:131, pId:13, name:"禁止拖拽 1-3-1", drag:false},
+			{ id:132, pId:13, name:"禁止拖拽 1-3-2", drag:false},
+			{ id:133, pId:13, name:"随意拖拽 1-3-3"},
+			{ id:2, pId:0, name:"随意拖拽 2", open:true},
+			{ id:21, pId:2, name:"随意拖拽 2-1"},
+			{ id:22, pId:2, name:"禁止拖拽到我身上 2-2", open:true, drop:false},
+			{ id:221, pId:22, name:"随意拖拽 2-2-1"},
+			{ id:222, pId:22, name:"随意拖拽 2-2-2"},
+			{ id:223, pId:22, name:"随意拖拽 2-2-3"},
+			{ id:23, pId:2, name:"随意拖拽 2-3"}
+		];
+
+		function beforeDrag(treeId, treeNodes) {
+			for (var i=0,l=treeNodes.length; i<l; i++) {
+				if (treeNodes[i].drag === false) {
+					return false;
+				}
+			}
+			return true;
+		}
+		function beforeDrop(treeId, treeNodes, targetNode, moveType) {
+			return targetNode ? targetNode.drop !== false : true;
+		}
+		
+		function setCheck() {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			isCopy = $("#copy").attr("checked"),
+			isMove = $("#move").attr("checked"),
+			prev = $("#prev").attr("checked"),
+			inner = $("#inner").attr("checked"),
+			next = $("#next").attr("checked");
+			zTree.setting.edit.drag.isCopy = isCopy;
+			zTree.setting.edit.drag.isMove = isMove;
+			showCode(1, ['setting.edit.drag.isCopy = ' + isCopy, 'setting.edit.drag.isMove = ' + isMove]);
+
+			zTree.setting.edit.drag.prev = prev;
+			zTree.setting.edit.drag.inner = inner;
+			zTree.setting.edit.drag.next = next;
+			showCode(2, ['setting.edit.drag.prev = ' + prev, 'setting.edit.drag.inner = ' + inner, 'setting.edit.drag.next = ' + next]);
+		}
+		function showCode(id, str) {
+			var code = $("#code" + id);
+			code.empty();
+			for (var i=0, l=str.length; i<l; i++) {
+				code.append("<li>"+str[i]+"</li>");
+			}
+		}
+		
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			setCheck();
+			$("#copy").bind("change", setCheck);
+			$("#move").bind("change", setCheck);
+			$("#prev").bind("change", setCheck);
+			$("#inner").bind("change", setCheck);
+			$("#next").bind("change", setCheck);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>拖拽节点基本控制</h1>
+<h6>[ 文件路径: exedit/drag.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、setting 配置信息说明</h2>
+				<ul class="list">
+				<li>此 Demo 仅从功能上演示实现拖拽的基本方法和配置参数</li>
+				<li class="highlight_red">1)、使用 拖拽功能，必须设置 setting.edit 中的各个属性，详细请参见 API 文档中的相关内容</li>
+				<li class="highlight_red">2)、使用 拖拽功能的事件回调函数，必须设置 setting.callback.beforeDrag / onDrag / beforeDrop / onDrop 等属性，详细请参见 API 文档中的相关内容</li>
+				<li><p>基本拖拽设置：<br/>
+						<input type="checkbox" id="copy" class="checkbox first" checked /><span>允许复制</span>
+						<input type="checkbox" id="move" class="checkbox " checked /><span>允许移动</span><br/>
+						<ul id="code1" class="log" style="height:42px;"></ul></p>
+				</li>
+				<li><p>拖拽相对位置设置：<br/>
+						<input type="checkbox" id="prev" class="checkbox first" checked /><span>prev</span>
+						<input type="checkbox" id="inner" class="checkbox " checked /><span>inner</span>
+						<input type="checkbox" id="next" class="checkbox " checked /><span>next</span><br/>
+						<ul id="code2" class="log" style="height:65px;"></ul></p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li>对 节点数据 没有特殊要求，用户可以根据自己的需求添加自定义属性</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/exedit/drag_fun.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/exedit/drag_fun.html
new file mode 100644
index 0000000..963068d
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/exedit/drag_fun.html
@@ -0,0 +1,180 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - copyNode / moveNode</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				selectedMulti: false
+			},
+			edit: {
+				enable: true,
+				showRemoveBtn: false,
+				showRenameBtn: false
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeDrag: beforeDrag,
+				beforeClick: beforeClick
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"父节点 1", open:true},
+			{ id:11, pId:1, name:"叶子节点 1-1"},
+			{ id:12, pId:1, name:"叶子节点 1-2"},
+			{ id:13, pId:1, name:"叶子节点 1-3"},
+			{ id:2, pId:0, name:"父节点 2", open:true},
+			{ id:21, pId:2, name:"叶子节点 2-1"},
+			{ id:22, pId:2, name:"叶子节点 2-2"},
+			{ id:23, pId:2, name:"叶子节点 2-3"},
+			{ id:3, pId:0, name:"父节点 3", open:true },
+			{ id:31, pId:3, name:"叶子节点 3-1"},
+			{ id:32, pId:3, name:"叶子节点 3-2"},
+			{ id:33, pId:3, name:"叶子节点 3-3"}
+		];
+
+		function fontCss(treeNode) {
+			var aObj = $("#" + treeNode.tId + "_a");
+			aObj.removeClass("copy").removeClass("cut");
+			if (treeNode === curSrcNode) {
+				if (curType == "copy") {
+					aObj.addClass(curType);
+				} else {
+					aObj.addClass(curType);
+				}			
+			}
+		}
+
+		function beforeDrag(treeId, treeNodes) {
+			return false;
+		}
+
+		function beforeClick(treeId, treeNode) {
+			return !treeNode.isCur;
+		}
+
+		var curSrcNode, curType;
+		function setCurSrcNode(treeNode) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			if (curSrcNode) {
+				delete curSrcNode.isCur;
+				var tmpNode = curSrcNode;
+				curSrcNode = null;
+				fontCss(tmpNode);
+			}
+			curSrcNode = treeNode;
+			if (!treeNode) return;
+
+			curSrcNode.isCur = true;			
+			zTree.cancelSelectedNode();
+			fontCss(curSrcNode);
+		}
+		function copy(e) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nodes = zTree.getSelectedNodes();
+			if (nodes.length == 0) {
+				alert("请先选择一个节点");
+				return;
+			}
+			curType = "copy";
+			setCurSrcNode(nodes[0]);
+		}
+		function cut(e) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nodes = zTree.getSelectedNodes();
+			if (nodes.length == 0) {
+				alert("请先选择一个节点");
+				return;
+			}
+			curType = "cut";
+			setCurSrcNode(nodes[0]);
+		}
+		function paste(e) {
+			if (!curSrcNode) {
+				alert("请先选择一个节点进行 复制 / 剪切");
+				return;
+			}
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nodes = zTree.getSelectedNodes(),
+			targetNode = nodes.length>0? nodes[0]:null;
+			if (curSrcNode === targetNode) {
+				alert("不能移动，源节点 与 目标节点相同");
+				return;
+			} else if (curType === "cut" && ((!!targetNode && curSrcNode.parentTId === targetNode.tId) || (!targetNode && !curSrcNode.parentTId))) {
+				alert("不能移动，源节点 已经存在于 目标节点中");
+				return;
+			} else if (curType === "copy") {
+				targetNode = zTree.copyNode(targetNode, curSrcNode, "inner");
+			} else if (curType === "cut") {
+				targetNode = zTree.moveNode(targetNode, curSrcNode, "inner");
+				if (!targetNode) {
+					alert("剪切失败，源节点是目标节点的父节点");
+				}
+				targetNode = curSrcNode;
+			}
+			setCurSrcNode();
+			delete targetNode.isCur;
+			zTree.selectNode(targetNode);
+		}
+		
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			$("#copy").bind("click", copy);
+			$("#cut").bind("click", cut);
+			$("#paste").bind("click", paste);
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+.ztree li a.copy{padding-top:0; background-color:#316AC5; color:white; border:1px #316AC5 solid;}
+.ztree li a.cut{padding-top:0; background-color:silver; color:#111; border:1px #316AC5 dotted;}
+	</style>
+</HEAD>
+
+<BODY>
+<h1>用 zTree 方法 移动 / 复制节点</h1>
+<h6>[ 文件路径: exedit/drag_fun.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、copyNode / moveNode 方法操作说明</h2>
+				<ul class="list">
+				<li>利用 copyNode / moveNode 方法也可以实现 复制 / 移动 节点的目的，这里简单演示使用方法</li>
+				<li><p>对节点进行 复制 / 剪切，试试看：<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="copy" href="#" title="复制" onclick="return false;">复制</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="cut" href="#" title="剪切" onclick="return false;">剪切</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="paste" href="#" title="粘贴" onclick="return false;">粘贴</a> ]</p>
+				<li class="highlight_red">使用 zTreeObj.copyNode / moveNode 方法，详细请参见 API 文档中的相关内容</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、setting 配置信息说明</h2>
+				<ul class="list">
+				<li>同 "拖拽 节点 基本控制"</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li>同 "拖拽 节点 基本控制"</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/exedit/drag_super.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/exedit/drag_super.html
new file mode 100644
index 0000000..668746f
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/exedit/drag_super.html
@@ -0,0 +1,210 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - beforeDrag / onDrag / beforeDrop / onDrop</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			edit: {
+				drag: {
+					autoExpandTrigger: true,
+					prev: dropPrev,
+					inner: dropInner,
+					next: dropNext
+				},
+				enable: true,
+				showRemoveBtn: false,
+				showRenameBtn: false
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeDrag: beforeDrag,
+				beforeDrop: beforeDrop,
+				beforeDragOpen: beforeDragOpen,
+				onDrag: onDrag,
+				onDrop: onDrop,
+				onExpand: onExpand
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"随意拖拽 1", open:true},
+			{ id:11, pId:1, name:"随意拖拽 1-1"},
+			{ id:12, pId:1, name:"随意拖拽 1-2"},
+			{ id:121, pId:12, name:"随意拖拽 1-2-1"},
+			{ id:122, pId:12, name:"随意拖拽 1-2-2"},
+			{ id:123, pId:12, name:"随意拖拽 1-2-3"},
+			{ id:13, pId:1, name:"禁止拖拽 1-3", open:true, drag:false},
+			{ id:131, pId:13, name:"禁止拖拽 1-3-1", drag:false},
+			{ id:132, pId:13, name:"禁止拖拽 1-3-2", drag:false},
+			{ id:132, pId:13, name:"禁止拖拽 1-3-3", drag:false},
+			{ id:2, pId:0, name:"禁止子节点移走 2", open:true, childOuter:false},
+			{ id:21, pId:2, name:"我不想成为父节点 2-1", dropInner:false},
+			{ id:22, pId:2, name:"我不要成为根节点 2-2", dropRoot:false},
+			{ id:23, pId:2, name:"拖拽试试看 2-3"},
+			{ id:3, pId:0, name:"禁止子节点排序/增加 3", open:true, childOrder:false, dropInner:false},
+			{ id:31, pId:3, name:"随意拖拽 3-1"},
+			{ id:32, pId:3, name:"随意拖拽 3-2"},
+			{ id:33, pId:3, name:"随意拖拽 3-3"}
+		];
+
+		function dropPrev(treeId, nodes, targetNode) {
+			var pNode = targetNode.getParentNode();
+			if (pNode && pNode.dropInner === false) {
+				return false;
+			} else {
+				for (var i=0,l=curDragNodes.length; i<l; i++) {
+					var curPNode = curDragNodes[i].getParentNode();
+					if (curPNode && curPNode !== targetNode.getParentNode() && curPNode.childOuter === false) {
+						return false;
+					}
+				}
+			}
+			return true;
+		}
+		function dropInner(treeId, nodes, targetNode) {
+			if (targetNode && targetNode.dropInner === false) {
+				return false;
+			} else {
+				for (var i=0,l=curDragNodes.length; i<l; i++) {
+					if (!targetNode && curDragNodes[i].dropRoot === false) {
+						return false;
+					} else if (curDragNodes[i].parentTId && curDragNodes[i].getParentNode() !== targetNode && curDragNodes[i].getParentNode().childOuter === false) {
+						return false;
+					}
+				}
+			}
+			return true;
+		}
+		function dropNext(treeId, nodes, targetNode) {
+			var pNode = targetNode.getParentNode();
+			if (pNode && pNode.dropInner === false) {
+				return false;
+			} else {
+				for (var i=0,l=curDragNodes.length; i<l; i++) {
+					var curPNode = curDragNodes[i].getParentNode();
+					if (curPNode && curPNode !== targetNode.getParentNode() && curPNode.childOuter === false) {
+						return false;
+					}
+				}
+			}
+			return true;
+		}
+
+		var log, className = "dark", curDragNodes, autoExpandNode;
+		function beforeDrag(treeId, treeNodes) {
+			className = (className === "dark" ? "":"dark");
+			showLog("[ "+getTime()+" beforeDrag ]&nbsp;&nbsp;&nbsp;&nbsp; drag: " + treeNodes.length + " nodes." );
+			for (var i=0,l=treeNodes.length; i<l; i++) {
+				if (treeNodes[i].drag === false) {
+					curDragNodes = null;
+					return false;
+				} else if (treeNodes[i].parentTId && treeNodes[i].getParentNode().childDrag === false) {
+					curDragNodes = null;
+					return false;
+				}
+			}
+			curDragNodes = treeNodes;
+			return true;
+		}
+		function beforeDragOpen(treeId, treeNode) {
+			autoExpandNode = treeNode;
+			return true;
+		}
+		function beforeDrop(treeId, treeNodes, targetNode, moveType, isCopy) {
+			className = (className === "dark" ? "":"dark");
+			showLog("[ "+getTime()+" beforeDrop ]&nbsp;&nbsp;&nbsp;&nbsp; moveType:" + moveType);
+			showLog("target: " + (targetNode ? targetNode.name : "root") + "  -- is "+ (isCopy==null? "cancel" : isCopy ? "copy" : "move"));
+			return true;
+		}
+		function onDrag(event, treeId, treeNodes) {
+			className = (className === "dark" ? "":"dark");
+			showLog("[ "+getTime()+" onDrag ]&nbsp;&nbsp;&nbsp;&nbsp; drag: " + treeNodes.length + " nodes." );
+		}
+		function onDrop(event, treeId, treeNodes, targetNode, moveType, isCopy) {
+			className = (className === "dark" ? "":"dark");
+			showLog("[ "+getTime()+" onDrop ]&nbsp;&nbsp;&nbsp;&nbsp; moveType:" + moveType);
+			showLog("target: " + (targetNode ? targetNode.name : "root") + "  -- is "+ (isCopy==null? "cancel" : isCopy ? "copy" : "move"))
+		}
+		function onExpand(event, treeId, treeNode) {
+			if (treeNode === autoExpandNode) {
+				className = (className === "dark" ? "":"dark");
+				showLog("[ "+getTime()+" onExpand ]&nbsp;&nbsp;&nbsp;&nbsp;" + treeNode.name);
+			}
+		}
+
+		function showLog(str) {
+			if (!log) log = $("#log");
+			log.append("<li class='"+className+"'>"+str+"</li>");
+			if(log.children("li").length > 8) {
+				log.get(0).removeChild(log.children("li")[0]);
+			}
+		}
+		function getTime() {
+			var now= new Date(),
+			h=now.getHours(),
+			m=now.getMinutes(),
+			s=now.getSeconds(),
+			ms=now.getMilliseconds();
+			return (h+":"+m+":"+s+ " " +ms);
+		}
+
+		function setTrigger() {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			zTree.setting.edit.drag.autoExpandTrigger = $("#callbackTrigger").attr("checked");
+		}
+		
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			$("#callbackTrigger").bind("change", {}, setTrigger);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>拖拽节点高级控制</h1>
+<h6>[ 文件路径: exedit/drag_super.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、beforeDrag / onDrag<br/>&nbsp;&nbsp;beforeDrop / onDrop 事件回调函数控制</h2>
+				<ul class="list">
+				<li>此 Demo 演示合理利用配置参数实现更加灵活、更加合理的拖拽规则，操作时可以对比"基本控制"的例子</li>
+				<li>此 Demo 默认 允许复制 / 移动</li>
+				<li class="highlight_red">此 Demo 中拖拽相对位置设置为 function，可以根据节点动态设定，从而可以放弃使用 beforeDrop 回调函数，拖拽时的效果会更好</li>
+				<li><p><span class="highlight_red">在对这些灵活的配置熟悉以后，相信你能够做出更加合理的拖拽规则！</span><br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" id="callbackTrigger" checked /> 拖拽节点时自动展开父节点是否触发 callback<br/>
+					drag / drop log:<br/>
+					<ul id="log" class="log"></ul></p></li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、setting 配置信息说明</h2>
+				<ul class="list">
+				<li>同 "拖拽 节点 基本控制"</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li>同 "拖拽 节点 基本控制"</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/exedit/edit.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/exedit/edit.html
new file mode 100644
index 0000000..ed787d7
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/exedit/edit.html
@@ -0,0 +1,115 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - edit</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			edit: {
+				enable: true
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeDrag: beforeDrag
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"父节点 1", open:true},
+			{ id:11, pId:1, name:"叶子节点 1-1"},
+			{ id:12, pId:1, name:"叶子节点 1-2"},
+			{ id:13, pId:1, name:"叶子节点 1-3"},
+			{ id:2, pId:0, name:"父节点 2", open:true},
+			{ id:21, pId:2, name:"叶子节点 2-1"},
+			{ id:22, pId:2, name:"叶子节点 2-2"},
+			{ id:23, pId:2, name:"叶子节点 2-3"},
+			{ id:3, pId:0, name:"父节点 3", open:true},
+			{ id:31, pId:3, name:"叶子节点 3-1"},
+			{ id:32, pId:3, name:"叶子节点 3-2"},
+			{ id:33, pId:3, name:"叶子节点 3-3"}
+		];
+
+		function beforeDrag(treeId, treeNodes) {
+			return false;
+		}
+		
+		function setEdit() {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			remove = $("#remove").attr("checked"),
+			rename = $("#rename").attr("checked"),
+			removeTitle = $.trim($("#removeTitle").get(0).value),
+			renameTitle = $.trim($("#renameTitle").get(0).value);
+			zTree.setting.edit.showRemoveBtn = remove;
+			zTree.setting.edit.showRenameBtn = rename;
+			zTree.setting.edit.removeTitle = removeTitle;
+			zTree.setting.edit.renameTitle = renameTitle;
+			showCode(['setting.edit.showRemoveBtn = ' + remove, 'setting.edit.showRenameBtn = ' + rename,
+				'setting.edit.removeTitle = "' + removeTitle +'"', 'setting.edit.renameTitle = "' + renameTitle + '"']);
+		}
+		function showCode(str) {
+			var code = $("#code");
+			code.empty();
+			for (var i=0, l=str.length; i<l; i++) {
+				code.append("<li>"+str[i]+"</li>");
+			}
+		}
+		
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			setEdit();
+			$("#remove").bind("change", setEdit);
+			$("#rename").bind("change", setEdit);
+			$("#removeTitle").bind("propertychange", setEdit)
+			.bind("input", setEdit);
+			$("#renameTitle").bind("propertychange", setEdit)
+			.bind("input", setEdit);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>基本 增 / 删 / 改 节点</h1>
+<h6>[ 文件路径: exedit/edit.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、setting 配置信息说明</h2>
+				<ul class="list">
+				<li>此 Demo 仅从功能上演示编辑节点的基本方法和配置参数</li>
+				<li class="highlight_red">1)、使用 编辑功能，必须设置 setting.edit 中的各个属性，详细请参见 API 文档中的相关内容</li>
+				<li class="highlight_red">2)、使用 编辑功能的事件回调函数，必须设置 setting.callback.beforeRemove / onRemove / beforeRename / onRename 等属性，详细请参见 API 文档中的相关内容</li>
+				<li class="highlight_red">3)、zTree 不提供默认的增加按钮，如需实现请利用自定义控件的方法 addHoverDom / removeHoverDom ，详细请参见 API 文档中的相关内容；另外也可以参考 "高级 增 / 删 / 改 节点" 的 Demo</li>
+				<li><p>基本编辑按钮设置：<br/>
+						<input type="checkbox" id="remove" class="checkbox first" checked /><span>显示删除按钮</span>
+						<input type="checkbox" id="rename" class="checkbox " checked /><span>显示编辑按钮</span><br/>
+						remove 按钮的 title: <input type="text" id="removeTitle" value="remove" /><br/>
+						rename 按钮的 title: <input type="text" id="renameTitle" value="rename" />
+						<ul id="code" class="log" style="height:85px;"></ul></p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li>对 节点数据 没有特殊要求，用户可以根据自己的需求添加自定义属性</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/exedit/edit_fun.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/exedit/edit_fun.html
new file mode 100644
index 0000000..6201683
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/exedit/edit_fun.html
@@ -0,0 +1,194 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - addNodes / editName / removeNode / removeChildNodes</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				selectedMulti: false
+			},
+			edit: {
+				enable: true,
+				showRemoveBtn: false,
+				showRenameBtn: false
+			},
+			data: {
+				keep: {
+					parent:true,
+					leaf:true
+				},
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeDrag: beforeDrag,
+				beforeRemove: beforeRemove,
+				beforeRename: beforeRename,
+				onRemove: onRemove
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"父节点 1", open:true},
+			{ id:11, pId:1, name:"叶子节点 1-1"},
+			{ id:12, pId:1, name:"叶子节点 1-2"},
+			{ id:13, pId:1, name:"叶子节点 1-3"},
+			{ id:2, pId:0, name:"父节点 2", open:true},
+			{ id:21, pId:2, name:"叶子节点 2-1"},
+			{ id:22, pId:2, name:"叶子节点 2-2"},
+			{ id:23, pId:2, name:"叶子节点 2-3"},
+			{ id:3, pId:0, name:"父节点 3", open:true},
+			{ id:31, pId:3, name:"叶子节点 3-1"},
+			{ id:32, pId:3, name:"叶子节点 3-2"},
+			{ id:33, pId:3, name:"叶子节点 3-3"}
+		];
+		var log, className = "dark";
+		function beforeDrag(treeId, treeNodes) {
+			return false;
+		}
+		function beforeRemove(treeId, treeNode) {
+			className = (className === "dark" ? "":"dark");
+			showLog("[ "+getTime()+" beforeRemove ]&nbsp;&nbsp;&nbsp;&nbsp; " + treeNode.name);
+			return confirm("确认删除 节点 -- " + treeNode.name + " 吗？");
+		}
+		function onRemove(e, treeId, treeNode) {
+			showLog("[ "+getTime()+" onRemove ]&nbsp;&nbsp;&nbsp;&nbsp; " + treeNode.name);
+		}
+		function beforeRename(treeId, treeNode, newName) {
+			if (newName.length == 0) {
+				alert("节点名称不能为空.");
+				var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+				setTimeout(function(){zTree.editName(treeNode)}, 10);
+				return false;
+			}
+			return true;
+		}
+		function showLog(str) {
+			if (!log) log = $("#log");
+			log.append("<li class='"+className+"'>"+str+"</li>");
+			if(log.children("li").length > 8) {
+				log.get(0).removeChild(log.children("li")[0]);
+			}
+		}
+		function getTime() {
+			var now= new Date(),
+			h=now.getHours(),
+			m=now.getMinutes(),
+			s=now.getSeconds(),
+			ms=now.getMilliseconds();
+			return (h+":"+m+":"+s+ " " +ms);
+		}
+
+		var newCount = 1;
+		function add(e) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			isParent = e.data.isParent,
+			nodes = zTree.getSelectedNodes(),
+			treeNode = nodes[0];
+			if (treeNode) {
+				treeNode = zTree.addNodes(treeNode, {id:(100 + newCount), pId:treeNode.id, isParent:isParent, name:"new node" + (newCount++)});
+			} else {
+				treeNode = zTree.addNodes(null, {id:(100 + newCount), pId:0, isParent:isParent, name:"new node" + (newCount++)});
+			}
+			if (treeNode) {
+				zTree.editName(treeNode[0]);
+			} else {
+				alert("叶子节点被锁定，无法增加子节点");
+			}
+		};
+		function edit() {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nodes = zTree.getSelectedNodes(),
+			treeNode = nodes[0];
+			if (nodes.length == 0) {
+				alert("请先选择一个节点");
+				return;
+			}
+			zTree.editName(treeNode);
+		};
+		function remove(e) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nodes = zTree.getSelectedNodes(),
+			treeNode = nodes[0];
+			if (nodes.length == 0) {
+				alert("请先选择一个节点");
+				return;
+			}
+			var callbackFlag = $("#callbackTrigger").attr("checked");
+			zTree.removeNode(treeNode, callbackFlag);
+		};
+		function clearChildren(e) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nodes = zTree.getSelectedNodes(),
+			treeNode = nodes[0];
+			if (nodes.length == 0 || !nodes[0].isParent) {
+				alert("请先选择一个父节点");
+				return;
+			}
+			zTree.removeChildNodes(treeNode);
+		};
+		
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			$("#addParent").bind("click", {isParent:true}, add);
+			$("#addLeaf").bind("click", {isParent:false}, add);
+			$("#edit").bind("click", edit);
+			$("#remove").bind("click", remove);
+			$("#clearChildren").bind("click", clearChildren);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>用 zTree 方法 增 / 删 / 改 节点</h1>
+<h6>[ 文件路径: exedit/edit_fun.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、addNodes / editName / removeNode / removeChildNodes 方法操作说明</h2>
+				<ul class="list">
+				<li>利用 addNodes / editName / removeNode / removeChildNodes 方法也可以实现 增 / 删 / 改 节点的目的，这里简单演示使用方法</li>
+				<li>cancelEditName 方法仅仅是在节点进入名称编辑状态时有效，请在必要时使用，Demo 不进行此方法的演示</li>
+				<li class="highlight_red">利用 setting.data.keep.parent / leaf 属性 实现了父节点、叶子节点的状态锁定</li>
+				<li><p>对节点进行 增 / 删 / 改，试试看：<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" id="callbackTrigger" checked /> removeNode 方法是否触发 callback<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="addParent" href="#" title="增加父节点" onclick="return false;">增加父节点</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="addLeaf" href="#" title="增加叶子节点" onclick="return false;">增加叶子节点</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="edit" href="#" title="编辑名称" onclick="return false;">编辑名称</a> ]<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="remove" href="#" title="删除节点" onclick="return false;">删除节点</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="clearChildren" href="#" title="清空子节点" onclick="return false;">清空子节点</a> ]<br/>
+					remove log:<br/>
+					<ul id="log" class="log"></ul></p>
+				</li>
+				<li class="highlight_red">使用 zTreeObj.addNodes / cancelEditName / editName / removeNode / removeChildNodes 方法，详细请参见 API 文档中的相关内容</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、setting 配置信息说明</h2>
+				<ul class="list">
+				<li>同 "基本 增 / 删 / 改 节点"</li>
+				<li class="highlight_red">保持 父 / 叶子 节点状态，需要设置 setting.data.keep.parent / leaf 属性，详细请参见 API 文档中的相关内容</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li>同 "基本 增 / 删 / 改 节点"</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/exedit/edit_super.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/exedit/edit_super.html
new file mode 100644
index 0000000..fb56de2
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/exedit/edit_super.html
@@ -0,0 +1,183 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - beforeEditName / beforeRemove / onRemove / beforeRename / onRename</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				addHoverDom: addHoverDom,
+				removeHoverDom: removeHoverDom,
+				selectedMulti: false
+			},
+			edit: {
+				enable: true,
+				editNameSelectAll: true,
+				showRemoveBtn: showRemoveBtn,
+				showRenameBtn: showRenameBtn
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeDrag: beforeDrag,
+				beforeEditName: beforeEditName,
+				beforeRemove: beforeRemove,
+				beforeRename: beforeRename,
+				onRemove: onRemove,
+				onRename: onRename
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"父节点 1", open:true},
+			{ id:11, pId:1, name:"叶子节点 1-1"},
+			{ id:12, pId:1, name:"叶子节点 1-2"},
+			{ id:13, pId:1, name:"叶子节点 1-3"},
+			{ id:2, pId:0, name:"父节点 2", open:true},
+			{ id:21, pId:2, name:"叶子节点 2-1"},
+			{ id:22, pId:2, name:"叶子节点 2-2"},
+			{ id:23, pId:2, name:"叶子节点 2-3"},
+			{ id:3, pId:0, name:"父节点 3", open:true},
+			{ id:31, pId:3, name:"叶子节点 3-1"},
+			{ id:32, pId:3, name:"叶子节点 3-2"},
+			{ id:33, pId:3, name:"叶子节点 3-3"}
+		];
+		var log, className = "dark";
+		function beforeDrag(treeId, treeNodes) {
+			return false;
+		}
+		function beforeEditName(treeId, treeNode) {
+			className = (className === "dark" ? "":"dark");
+			showLog("[ "+getTime()+" beforeEditName ]&nbsp;&nbsp;&nbsp;&nbsp; " + treeNode.name);
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			zTree.selectNode(treeNode);
+			return confirm("进入节点 -- " + treeNode.name + " 的编辑状态吗？");
+		}
+		function beforeRemove(treeId, treeNode) {
+			className = (className === "dark" ? "":"dark");
+			showLog("[ "+getTime()+" beforeRemove ]&nbsp;&nbsp;&nbsp;&nbsp; " + treeNode.name);
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			zTree.selectNode(treeNode);
+			return confirm("确认删除 节点 -- " + treeNode.name + " 吗？");
+		}
+		function onRemove(e, treeId, treeNode) {
+			showLog("[ "+getTime()+" onRemove ]&nbsp;&nbsp;&nbsp;&nbsp; " + treeNode.name);
+		}
+		function beforeRename(treeId, treeNode, newName, isCancel) {
+			className = (className === "dark" ? "":"dark");
+			showLog((isCancel ? "<span style='color:red'>":"") + "[ "+getTime()+" beforeRename ]&nbsp;&nbsp;&nbsp;&nbsp; " + treeNode.name + (isCancel ? "</span>":""));
+			if (newName.length == 0) {
+				alert("节点名称不能为空.");
+				var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+				setTimeout(function(){zTree.editName(treeNode)}, 10);
+				return false;
+			}
+			return true;
+		}
+		function onRename(e, treeId, treeNode, isCancel) {
+			showLog((isCancel ? "<span style='color:red'>":"") + "[ "+getTime()+" onRename ]&nbsp;&nbsp;&nbsp;&nbsp; " + treeNode.name + (isCancel ? "</span>":""));
+		}
+		function showRemoveBtn(treeId, treeNode) {
+			return !treeNode.isFirstNode;
+		}
+		function showRenameBtn(treeId, treeNode) {
+			return !treeNode.isLastNode;
+		}
+		function showLog(str) {
+			if (!log) log = $("#log");
+			log.append("<li class='"+className+"'>"+str+"</li>");
+			if(log.children("li").length > 8) {
+				log.get(0).removeChild(log.children("li")[0]);
+			}
+		}
+		function getTime() {
+			var now= new Date(),
+			h=now.getHours(),
+			m=now.getMinutes(),
+			s=now.getSeconds(),
+			ms=now.getMilliseconds();
+			return (h+":"+m+":"+s+ " " +ms);
+		}
+
+		var newCount = 1;
+		function addHoverDom(treeId, treeNode) {
+			var sObj = $("#" + treeNode.tId + "_span");
+			if (treeNode.editNameFlag || $("#addBtn_"+treeNode.tId).length>0) return;
+			var addStr = "<span class='button add' id='addBtn_" + treeNode.tId
+				+ "' title='add node' onfocus='this.blur();'></span>";
+			sObj.after(addStr);
+			var btn = $("#addBtn_"+treeNode.tId);
+			if (btn) btn.bind("click", function(){
+				var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+				zTree.addNodes(treeNode, {id:(100 + newCount), pId:treeNode.id, name:"new node" + (newCount++)});
+				return false;
+			});
+		};
+		function removeHoverDom(treeId, treeNode) {
+			$("#addBtn_"+treeNode.tId).unbind().remove();
+		};
+		function selectAll() {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			zTree.setting.edit.editNameSelectAll =  $("#selectAll").attr("checked");
+		}
+		
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			$("#selectAll").bind("click", selectAll);
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+.ztree li span.button.add {margin-left:2px; margin-right: -1px; background-position:-144px 0; vertical-align:top; *vertical-align:middle}
+	</style>
+</HEAD>
+
+<BODY>
+<h1>高级 增 / 删 / 改 节点</h1>
+<h6>[ 文件路径: exedit/edit_super.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、beforeEditName<br/>&nbsp;&nbsp;beforeRemove / onRemove<br/>&nbsp;&nbsp;beforeRename / onRename 事件回调函数控制</h2>
+				<ul class="list">
+				<li>此 Demo 演示合理利用自定义控件、事件回调函数配合以增强用户体验，操作时可以对比"基本 增 / 删 / 改 节点"的 Demo</li>
+				<li>此 Demo 实现增加节点按钮</li>
+				<li>此 Demo 实现删除节点时进行确认</li>
+				<li>此 Demo 利用 showRenameBtn 对 isLastNode = true 的节点不显示编辑按钮 </li>
+				<li>此 Demo 利用 showRemoveBtn 对 isFirstNode = true 的节点不显示删除按钮 </li>
+				<li class="highlight_red">可以利用 beforeEditName 触发自定义的编辑操作</li>
+				<li><p><span class="highlight_red">在对这些灵活的配置熟悉以后，相信你能够做出更加合理的编辑界面！</span><br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" id="selectAll" checked /> 编辑名称时是否全选 text<br/>
+					remove / rename log:&nbsp;&nbsp;<span style="color:red">红色</span> 表示取消编辑操作 (v3.5.13+)<br/>
+					<ul id="log" class="log"></ul></p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、setting 配置信息说明</h2>
+				<ul class="list">
+				<li>同 "基本 增 / 删 / 改 节点"</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li>同 "基本 增 / 删 / 改 节点"</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/exedit/multiTree.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/exedit/multiTree.html
new file mode 100644
index 0000000..a4736a2
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/exedit/multiTree.html
@@ -0,0 +1,94 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - multiTree</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			edit: {
+				enable: true,
+				showRemoveBtn: false,
+				showRenameBtn: false
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeDrag: beforeDrag,
+				beforeDrop: beforeDrop
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"父节点 1", open:true},
+			{ id:11, pId:1, name:"叶子节点 1-1"},
+			{ id:12, pId:1, name:"叶子节点 1-2"},
+			{ id:13, pId:1, name:"叶子节点 1-3"},
+			{ id:2, pId:0, name:"父节点 2", open:true},
+			{ id:21, pId:2, name:"叶子节点 2-1"},
+			{ id:22, pId:2, name:"叶子节点 2-2"},
+			{ id:23, pId:2, name:"叶子节点 2-3"},
+			{ id:3, pId:0, name:"父节点 3", open:true},
+			{ id:31, pId:3, name:"叶子节点 3-1"},
+			{ id:32, pId:3, name:"叶子节点 3-2"},
+			{ id:33, pId:3, name:"叶子节点 3-3"}
+		];
+
+		function beforeDrag(treeId, treeNodes) {
+			for (var i=0,l=treeNodes.length; i<l; i++) {
+				if (treeNodes[i].drag === false) {
+					return false;
+				}
+			}
+			return true;
+		}
+		function beforeDrop(treeId, treeNodes, targetNode, moveType) {
+			return targetNode ? targetNode.drop !== false : true;
+		}
+		
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			$.fn.zTree.init($("#treeDemo2"), setting);
+			
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>多棵树之间 的 数据交互</h1>
+<h6>[ 文件路径: exedit/multiTree.html ]</h6>
+<div class="content_wrap">
+	<div>
+		<ul class="info">
+			<li class="title"><h2>1、setting 配置信息说明</h2>
+				<ul class="list">
+				<li>zTree 对于多棵树之间拖拽的操作非常简单，只需要创建两棵可拖拽的树即可，同时可根据 各种事件回调函数 以及 zTree 的方法配合实现较复杂的操作规则，这里只是基本演示。</li>
+				<li class="highlight_red">关于配置信息请参考拖拽、编辑等 Demo 的详细说明</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li>对 节点数据 没有特殊要求，用户可以根据自己的需求添加自定义属性</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul id="treeDemo2" class="ztree"></ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/exhide/checkbox.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/exhide/checkbox.html
new file mode 100644
index 0000000..bf73081
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/exhide/checkbox.html
@@ -0,0 +1,161 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - Hide With Checkbox Mode</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+<!--<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<script type="text/javascript" src="../../../js/jquery.ztree.exhide-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			check: {
+				enable: true
+			},
+			data: {
+				key: {
+					title: "title"
+				},
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				onCheck: onCheck
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"父节点1", title:"", checked:true, open:true},
+			{ id:11, pId:1, name:"父节点11", title:"", checked:true},
+			{ id:111, pId:11, name:"叶子节点111", title:"", checked:true, isHidden:true},
+			{ id:112, pId:11, name:"叶子节点112", title:""},
+			{ id:113, pId:11, name:"叶子节点113", title:""},
+			{ id:12, pId:1, name:"父节点12", title:"", isHidden:true},
+			{ id:121, pId:12, name:"叶子节点121", title:""},
+			{ id:122, pId:12, name:"叶子节点122", title:"", isHidden:true},
+			{ id:123, pId:12, name:"叶子节点123", title:""},
+			{ id:2, pId:0, name:"父节点2", title:""},
+			{ id:21, pId:2, name:"父节点21", title:"", isHidden:true},
+			{ id:211, pId:21, name:"叶子节点211", title:""},
+			{ id:212, pId:21, name:"叶子节点212", title:""},
+			{ id:213, pId:21, name:"叶子节点213", title:""},
+			{ id:22, pId:2, name:"父节点22", title:""},
+			{ id:221, pId:22, name:"叶子节点221", title:""},
+			{ id:222, pId:22, name:"叶子节点222", title:""},
+			{ id:223, pId:22, name:"叶子节点223", title:""}
+		];
+
+		function onCheck(e, treeId, treeNode) {
+			count();
+		}
+
+		function setTitle(node) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			var nodes = node ? [node]:zTree.transformToArray(zTree.getNodes());
+			for (var i=0, l=nodes.length; i<l; i++) {
+				var n = nodes[i];
+				n.title = "[" + n.id + "] isFirstNode = " + n.isFirstNode + ", isLastNode = " + n.isLastNode;
+				zTree.updateNode(n);
+			}
+		}
+		function count() {
+			function isForceHidden(node) {
+				if (!node.parentTId) return false;
+				var p = node.getParentNode();
+				return !!p.isHidden ? true : isForceHidden(p);
+			}
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			checkCount = zTree.getCheckedNodes(true).length,
+			nocheckCount = zTree.getCheckedNodes(false).length,
+			hiddenNodes = zTree.getNodesByParam("isHidden", true),
+			hiddenCount = hiddenNodes.length;
+
+			for (var i=0, j=hiddenNodes.length; i<j; i++) {
+				var n = hiddenNodes[i];
+				if (isForceHidden(n)) {
+					hiddenCount -= 1;
+				} else if (n.isParent) {
+					hiddenCount += zTree.transformToArray(n.children).length;
+				}
+			}
+
+			$("#isHiddenCount").text(hiddenNodes.length);
+			$("#hiddenCount").text(hiddenCount);
+			$("#checkCount").text(checkCount);
+			$("#nocheckCount").text(nocheckCount);
+		}
+		function showNodes() {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nodes = zTree.getNodesByParam("isHidden", true);
+			zTree.showNodes(nodes);
+			setTitle();
+			count();
+		}
+		function hideNodes() {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nodes = zTree.getSelectedNodes();
+			if (nodes.length == 0) {
+				alert("请至少选择一个节点");
+				return;
+			}
+			zTree.hideNodes(nodes);
+			setTitle();
+			count();
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			$("#hideNodesBtn").bind("click", {type:"rename"}, hideNodes);
+			$("#showNodesBtn").bind("click", {type:"icon"}, showNodes);
+			setTitle();
+			count();
+		});
+		//-->
+	</SCRIPT>
+ </HEAD>
+
+<BODY>
+<h1>配合 checkbox 的隐藏</h1>
+<h6>[ 文件路径: exhide/checkbox.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、setting 配置信息说明</h2>
+				<ul class="list">
+				<li>使用隐藏功能，无需设置任何参数</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li class="highlight_red">初始化时，设置 treeNode.isHidden = true; 可以让节点隐藏</li>
+				<li><p>隐藏、显示节点，看看树的变化：<br/><br/>
+					试试看：[ <a id="hideNodesBtn" href="#" onclick="return false;">隐藏选中的节点</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="showNodesBtn" href="#" onclick="return false;">显示全部被隐藏的节点</a> ]<br/><br/>
+					<ul id="log" class="log" style="height:125px;">
+						<li>isHidden = true 的节点共 <span id="isHiddenCount" class="highlight_red"></span> 个</li>
+						<li>被隐藏的节点共 <span id="hiddenCount" class="highlight_red"></span> 个</li>
+						<li>当前被勾选的节点共 <span id="checkCount" class="highlight_red"></span> 个</li>
+						<li>当前未被勾选的节点共 <span id="nocheckCount" class="highlight_red"></span> 个</li>
+						<li>隐藏节点后，可以看看仍显示节点的 isFirstNode 和 isLastNode 属性</li>
+					</ul></p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、其他说明</h2>
+				<ul class="list">
+				<li>隐藏节点操作，会影响 isFirstNode 和 isLastNode 属性，但是对于 getPreNode() 和 getNextNode() 方法无影响</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/exhide/common.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/exhide/common.html
new file mode 100644
index 0000000..600d1c0
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/exhide/common.html
@@ -0,0 +1,126 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - Hide Ordinary Node</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+<!--<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<script type="text/javascript" src="../../../js/jquery.ztree.exhide-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			data: {
+				key: {
+					title: "title"
+				},
+				simpleData: {
+					enable: true
+				}
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"父节点1", title:"", open:true},
+			{ id:11, pId:1, name:"父节点11", title:""},
+			{ id:111, pId:11, name:"叶子节点111", title:"", isHidden:true},
+			{ id:112, pId:11, name:"叶子节点112", title:""},
+			{ id:113, pId:11, name:"叶子节点113", title:""},
+			{ id:12, pId:1, name:"父节点12", title:"", isHidden:true},
+			{ id:121, pId:12, name:"叶子节点121", title:""},
+			{ id:122, pId:12, name:"叶子节点122", title:"", isHidden:true},
+			{ id:123, pId:12, name:"叶子节点123", title:""},
+			{ id:2, pId:0, name:"父节点2", title:""},
+			{ id:21, pId:2, name:"父节点21", title:"", isHidden:true},
+			{ id:211, pId:21, name:"叶子节点211", title:""},
+			{ id:212, pId:21, name:"叶子节点212", title:""},
+			{ id:213, pId:21, name:"叶子节点213", title:""},
+			{ id:22, pId:2, name:"父节点22", title:""},
+			{ id:221, pId:22, name:"叶子节点221", title:""},
+			{ id:222, pId:22, name:"叶子节点222", title:""},
+			{ id:223, pId:22, name:"叶子节点223", title:""}
+		];
+		function setTitle(node) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			var nodes = node ? [node]:zTree.transformToArray(zTree.getNodes());
+			for (var i=0, l=nodes.length; i<l; i++) {
+				var n = nodes[i];
+				n.title = "[" + n.id + "] isFirstNode = " + n.isFirstNode + ", isLastNode = " + n.isLastNode;
+				zTree.updateNode(n);
+			}
+		}
+		function count() {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			hiddenCount = zTree.getNodesByParam("isHidden", true).length;
+			$("#hiddenCount").text(hiddenCount);
+		}
+		function showNodes() {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nodes = zTree.getNodesByParam("isHidden", true);
+			zTree.showNodes(nodes);
+			setTitle();
+			count();
+		}
+		function hideNodes() {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nodes = zTree.getSelectedNodes();
+			if (nodes.length == 0) {
+				alert("请至少选择一个节点");
+				return;
+			}
+			zTree.hideNodes(nodes);
+			setTitle();
+			count();
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			$("#hideNodesBtn").bind("click", {type:"rename"}, hideNodes);
+			$("#showNodesBtn").bind("click", {type:"icon"}, showNodes);
+			setTitle();
+			count();
+		});
+		//-->
+	</SCRIPT>
+ </HEAD>
+
+<BODY>
+<h1>隐藏普通节点</h1>
+<h6>[ 文件路径: exhide/common.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、setting 配置信息说明</h2>
+				<ul class="list">
+				<li>使用此功能，无需设置任何参数</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li class="highlight_red">初始化时，设置 treeNode.isHidden = true; 可以让节点隐藏</li>
+				<li><p>隐藏、显示节点，看看树的变化：<br/><br/>
+					试试看：[ <a id="hideNodesBtn" href="#" onclick="return false;">隐藏选中的节点</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="showNodesBtn" href="#" onclick="return false;">显示全部被隐藏的节点</a> ]<br/><br/>
+					<ul id="log" class="log" style="height:65px;">
+						<li>isHidden = true 的节点共 <span id="hiddenCount" class="highlight_red"></span> 个</li>
+						<li>隐藏节点后，可以看看仍显示节点的 isFirstNode 和 isLastNode 属性</li>
+					</ul></p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、其他说明</h2>
+				<ul class="list">
+				<li>隐藏节点操作，会影响 isFirstNode 和 isLastNode 属性，但是对于 getPreNode() 和 getNextNode() 方法无影响</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/exhide/radio.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/exhide/radio.html
new file mode 100644
index 0000000..5273b73
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/exhide/radio.html
@@ -0,0 +1,162 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - Hide With Radio Mode</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+<!--<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<script type="text/javascript" src="../../../js/jquery.ztree.exhide-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			check: {
+				enable: true,
+				chkStyle: "radio"
+			},
+			data: {
+				key: {
+					title: "title"
+				},
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				onCheck: onCheck
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"父节点1", title:"", checked:true, open:true},
+			{ id:11, pId:1, name:"父节点11", title:"", checked:true},
+			{ id:111, pId:11, name:"叶子节点111", title:"", checked:true, isHidden:true},
+			{ id:112, pId:11, name:"叶子节点112", title:""},
+			{ id:113, pId:11, name:"叶子节点113", title:""},
+			{ id:12, pId:1, name:"父节点12", title:"", isHidden:true},
+			{ id:121, pId:12, name:"叶子节点121", title:""},
+			{ id:122, pId:12, name:"叶子节点122", title:"", isHidden:true},
+			{ id:123, pId:12, name:"叶子节点123", title:""},
+			{ id:2, pId:0, name:"父节点2", title:""},
+			{ id:21, pId:2, name:"父节点21", title:"", isHidden:true},
+			{ id:211, pId:21, name:"叶子节点211", title:""},
+			{ id:212, pId:21, name:"叶子节点212", title:""},
+			{ id:213, pId:21, name:"叶子节点213", title:""},
+			{ id:22, pId:2, name:"父节点22", title:""},
+			{ id:221, pId:22, name:"叶子节点221", title:""},
+			{ id:222, pId:22, name:"叶子节点222", title:""},
+			{ id:223, pId:22, name:"叶子节点223", title:""}
+		];
+
+		function onCheck(e, treeId, treeNode) {
+			count();
+		}
+
+		function setTitle(node) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			var nodes = node ? [node]:zTree.transformToArray(zTree.getNodes());
+			for (var i=0, l=nodes.length; i<l; i++) {
+				var n = nodes[i];
+				n.title = "[" + n.id + "] isFirstNode = " + n.isFirstNode + ", isLastNode = " + n.isLastNode;
+				zTree.updateNode(n);
+			}
+		}
+		function count() {
+			function isForceHidden(node) {
+				if (!node.parentTId) return false;
+				var p = node.getParentNode();
+				return !!p.isHidden ? true : isForceHidden(p);
+			}
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			checkCount = zTree.getCheckedNodes(true).length,
+			nocheckCount = zTree.getCheckedNodes(false).length,
+			hiddenNodes = zTree.getNodesByParam("isHidden", true),
+			hiddenCount = hiddenNodes.length;
+
+			for (var i=0, j=hiddenNodes.length; i<j; i++) {
+				var n = hiddenNodes[i];
+				if (isForceHidden(n)) {
+					hiddenCount -= 1;
+				} else if (n.isParent) {
+					hiddenCount += zTree.transformToArray(n.children).length;
+				}
+			}
+
+			$("#isHiddenCount").text(hiddenNodes.length);
+			$("#hiddenCount").text(hiddenCount);
+			$("#checkCount").text(checkCount);
+			$("#nocheckCount").text(nocheckCount);
+		}
+		function showNodes() {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nodes = zTree.getNodesByParam("isHidden", true);
+			zTree.showNodes(nodes);
+			setTitle();
+			count();
+		}
+		function hideNodes() {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nodes = zTree.getSelectedNodes();
+			if (nodes.length == 0) {
+				alert("请至少选择一个节点");
+				return;
+			}
+			zTree.hideNodes(nodes);
+			setTitle();
+			count();
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			$("#hideNodesBtn").bind("click", {type:"rename"}, hideNodes);
+			$("#showNodesBtn").bind("click", {type:"icon"}, showNodes);
+			setTitle();
+			count();
+		});
+		//-->
+	</SCRIPT>
+ </HEAD>
+
+<BODY>
+<h1>配合 radio 的隐藏</h1>
+<h6>[ 文件路径: exhide/radio.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、setting 配置信息说明</h2>
+				<ul class="list">
+				<li>使用隐藏功能，无需设置任何参数</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li class="highlight_red">初始化时，设置 treeNode.isHidden = true; 可以让节点隐藏</li>
+				<li><p>隐藏、显示节点，看看树的变化：<br/><br/>
+					试试看：[ <a id="hideNodesBtn" href="#" onclick="return false;">隐藏选中的节点</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="showNodesBtn" href="#" onclick="return false;">显示全部被隐藏的节点</a> ]<br/><br/>
+					<ul id="log" class="log" style="height:125px;">
+						<li>isHidden = true 的节点共 <span id="isHiddenCount" class="highlight_red"></span> 个</li>
+						<li>被隐藏的节点共 <span id="hiddenCount" class="highlight_red"></span> 个</li>
+						<li>当前被勾选的节点共 <span id="checkCount" class="highlight_red"></span> 个</li>
+						<li>当前未被勾选的节点共 <span id="nocheckCount" class="highlight_red"></span> 个</li>
+						<li>隐藏节点后，可以看看仍显示节点的 isFirstNode 和 isLastNode 属性</li>
+					</ul></p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、其他说明</h2>
+				<ul class="list">
+				<li>隐藏节点操作，会影响 isFirstNode 和 isLastNode 属性，但是对于 getPreNode() 和 getNextNode() 方法无影响</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/index.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/index.html
new file mode 100644
index 0000000..77987c0
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/index.html
@@ -0,0 +1,157 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">

+<HTML>

+ <HEAD>

+  <TITLE> ZTREE DEMO </TITLE>

+  <meta http-equiv="content-type" content="text/html; charset=UTF-8">

+  <link rel="stylesheet" href="../../css/zTreeStyle/zTreeStyle.css" type="text/css">

+  <style>

+	body {

+	background-color: white;

+	margin:0; padding:0;

+	text-align: center;

+	}

+	div, p, table, th, td {

+		list-style:none;

+		margin:0; padding:0;

+		color:#333; font-size:12px;

+		font-family:dotum, Verdana, Arial, Helvetica, AppleGothic, sans-serif;

+	}

+	#testIframe {margin-left: 10px;}

+  </style>

+<script type="text/javascript" src="../../js/jquery-1.4.4.min.js"></script>

+<script type="text/javascript" src="../../js/jquery.ztree.core-3.5.js"></script>

+  <SCRIPT type="text/javascript" >

+  <!--

+	var zTree;

+	var demoIframe;

+

+	var setting = {

+		view: {

+			dblClickExpand: false,

+			showLine: true,

+			selectedMulti: false

+		},

+		data: {

+			simpleData: {

+				enable:true,

+				idKey: "id",

+				pIdKey: "pId",

+				rootPId: ""

+			}

+		},

+		callback: {

+			beforeClick: function(treeId, treeNode) {

+				var zTree = $.fn.zTree.getZTreeObj("tree");

+				if (treeNode.isParent) {

+					zTree.expandNode(treeNode);

+					return false;

+				} else {

+					demoIframe.attr("src",treeNode.file + ".html");

+					return true;

+				}

+			}

+		}

+	};

+

+	var zNodes =[

+		{id:1, pId:0, name:"[core] 基本功能 演示", open:true},

+		{id:101, pId:1, name:"最简单的树 --  标准 JSON 数据", file:"core/standardData"},

+		{id:102, pId:1, name:"最简单的树 --  简单 JSON 数据", file:"core/simpleData"},

+		{id:103, pId:1, name:"不显示 连接线", file:"core/noline"},

+		{id:104, pId:1, name:"不显示 节点 图标", file:"core/noicon"},

+		{id:105, pId:1, name:"自定义图标 --  icon 属性", file:"core/custom_icon"},

+		{id:106, pId:1, name:"自定义图标 --  iconSkin 属性", file:"core/custom_iconSkin"},

+		{id:107, pId:1, name:"自定义字体", file:"core/custom_font"},

+		{id:115, pId:1, name:"超链接演示", file:"core/url"},

+		{id:108, pId:1, name:"异步加载 节点数据", file:"core/async"},

+		{id:109, pId:1, name:"用 zTree 方法 异步加载 节点数据", file:"core/async_fun"},

+		{id:110, pId:1, name:"用 zTree 方法 更新 节点数据", file:"core/update_fun"},

+		{id:111, pId:1, name:"单击 节点 控制", file:"core/click"},

+		{id:112, pId:1, name:"展开 / 折叠 父节点 控制", file:"core/expand"},

+		{id:113, pId:1, name:"根据 参数 查找 节点", file:"core/searchNodes"},

+		{id:114, pId:1, name:"其他 鼠标 事件监听", file:"core/otherMouse"},

+

+		{id:2, pId:0, name:"[excheck] 复/单选框功能 演示", open:false},

+		{id:201, pId:2, name:"Checkbox 勾选操作", file:"excheck/checkbox"},

+		{id:206, pId:2, name:"Checkbox nocheck 演示", file:"excheck/checkbox_nocheck"},

+		{id:207, pId:2, name:"Checkbox chkDisabled 演示", file:"excheck/checkbox_chkDisabled"},

+		{id:208, pId:2, name:"Checkbox halfCheck 演示", file:"excheck/checkbox_halfCheck"},

+		{id:202, pId:2, name:"Checkbox 勾选统计", file:"excheck/checkbox_count"},

+		{id:203, pId:2, name:"用 zTree 方法 勾选 Checkbox", file:"excheck/checkbox_fun"},

+		{id:204, pId:2, name:"Radio 勾选操作", file:"excheck/radio"},

+		{id:209, pId:2, name:"Radio nocheck 演示", file:"excheck/radio_nocheck"},

+		{id:210, pId:2, name:"Radio chkDisabled 演示", file:"excheck/radio_chkDisabled"},

+		{id:211, pId:2, name:"Radio halfCheck 演示", file:"excheck/radio_halfCheck"},

+		{id:205, pId:2, name:"用 zTree 方法 勾选 Radio", file:"excheck/radio_fun"},

+

+		{id:3, pId:0, name:"[exedit] 编辑功能 演示", open:false},

+		{id:301, pId:3, name:"拖拽 节点 基本控制", file:"exedit/drag"},

+		{id:302, pId:3, name:"拖拽 节点 高级控制", file:"exedit/drag_super"},

+		{id:303, pId:3, name:"用 zTree 方法 移动 / 复制 节点", file:"exedit/drag_fun"},

+		{id:304, pId:3, name:"基本 增 / 删 / 改 节点", file:"exedit/edit"},

+		{id:305, pId:3, name:"高级 增 / 删 / 改 节点", file:"exedit/edit_super"},

+		{id:306, pId:3, name:"用 zTree 方法 增 / 删 / 改 节点", file:"exedit/edit_fun"},

+		{id:307, pId:3, name:"异步加载 & 编辑功能 共存", file:"exedit/async_edit"},

+		{id:308, pId:3, name:"多棵树之间 的 数据交互", file:"exedit/multiTree"},

+

+		{id:4, pId:0, name:"大数据量 演示", open:false},

+		{id:401, pId:4, name:"一次性加载大数据量", file:"bigdata/common"},

+		{id:402, pId:4, name:"分批异步加载大数据量", file:"bigdata/diy_async"},

+		{id:403, pId:4, name:"分批异步加载大数据量", file:"bigdata/page"},

+

+		{id:5, pId:0, name:"组合功能 演示", open:false},

+		{id:501, pId:5, name:"冻结根节点", file:"super/oneroot"},

+		{id:502, pId:5, name:"单击展开/折叠节点", file:"super/oneclick"},

+		{id:503, pId:5, name:"保持展开单一路径", file:"super/singlepath"},

+		{id:504, pId:5, name:"添加 自定义控件", file:"super/diydom"},

+		{id:505, pId:5, name:"checkbox / radio 共存", file:"super/checkbox_radio"},

+		{id:506, pId:5, name:"左侧菜单", file:"super/left_menu"},

+		{id:513, pId:5, name:"OutLook 样式的左侧菜单", file:"super/left_menuForOutLook"},

+		{id:507, pId:5, name:"下拉菜单", file:"super/select_menu"},

+		{id:509, pId:5, name:"带 checkbox 的多选下拉菜单", file:"super/select_menu_checkbox"},

+		{id:510, pId:5, name:"带 radio 的单选下拉菜单", file:"super/select_menu_radio"},

+		{id:508, pId:5, name:"右键菜单 的 实现", file:"super/rightClickMenu"},

+		{id:511, pId:5, name:"与其他 DOM 拖拽互动", file:"super/dragWithOther"},

+		{id:512, pId:5, name:"异步加载模式下全部展开", file:"super/asyncForAll"},

+

+		{id:6, pId:0, name:"其他扩展功能 演示", open:false},

+		{id:601, pId:6, name:"隐藏普通节点", file:"exhide/common"},

+		{id:602, pId:6, name:"配合 checkbox 的隐藏", file:"exhide/checkbox"},

+		{id:603, pId:6, name:"配合 radio 的隐藏", file:"exhide/radio"}

+	];

+

+	$(document).ready(function(){

+		var t = $("#tree");

+		t = $.fn.zTree.init(t, setting, zNodes);

+		demoIframe = $("#testIframe");

+		demoIframe.bind("load", loadReady);

+		var zTree = $.fn.zTree.getZTreeObj("tree");

+		zTree.selectNode(zTree.getNodeByParam("id", 101));

+

+	});

+

+	function loadReady() {

+		var bodyH = demoIframe.contents().find("body").get(0).scrollHeight,

+		htmlH = demoIframe.contents().find("html").get(0).scrollHeight,

+		maxH = Math.max(bodyH, htmlH), minH = Math.min(bodyH, htmlH),

+		h = demoIframe.height() >= maxH ? minH:maxH ;

+		if (h < 530) h = 530;

+		demoIframe.height(h);

+	}

+

+  //-->

+  </SCRIPT>

+ </HEAD>

+

+<BODY>

+<TABLE border=0 height=600px align=left>

+	<TR>

+		<TD width=260px align=left valign=top style="BORDER-RIGHT: #999999 1px dashed">

+			<ul id="tree" class="ztree" style="width:260px; overflow:auto;"></ul>

+		</TD>

+		<TD width=770px align=left valign=top><IFRAME ID="testIframe" Name="testIframe" FRAMEBORDER=0 SCROLLING=AUTO width=100%  height=600px SRC="core/standardData.html"></IFRAME></TD>

+	</TR>

+</TABLE>

+

+</BODY>

+</HTML>

diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/super/asyncForAll.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/super/asyncForAll.html
new file mode 100644
index 0000000..8a38d98
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/super/asyncForAll.html
@@ -0,0 +1,191 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - async for All</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var demoMsg = {
+			async:"正在进行异步加载，请等一会儿再点击...",
+			expandAllOver: "全部展开完毕",
+			asyncAllOver: "后台异步加载完毕",
+			asyncAll: "已经异步加载完毕，不再重新加载",
+			expandAll: "已经异步加载完毕，使用 expandAll 方法"
+		}
+		var setting = {
+			async: {
+				enable: true,
+				url:"../asyncData/getNodes.php",
+				autoParam:["id", "name=n", "level=lv"],
+				otherParam:{"otherParam":"zTreeAsyncTest"},
+				dataFilter: filter,
+				type: "get"
+			},
+			callback: {
+				beforeAsync: beforeAsync,
+				onAsyncSuccess: onAsyncSuccess,
+				onAsyncError: onAsyncError
+			}
+		};
+
+		function filter(treeId, parentNode, childNodes) {
+			if (!childNodes) return null;
+			for (var i=0, l=childNodes.length; i<l; i++) {
+				childNodes[i].name = childNodes[i].name.replace(/\.n/g, '.');
+			}
+			return childNodes;
+		}
+
+		function beforeAsync() {
+			curAsyncCount++;
+		}
+		
+		function onAsyncSuccess(event, treeId, treeNode, msg) {
+			curAsyncCount--;
+			if (curStatus == "expand") {
+				expandNodes(treeNode.children);
+			} else if (curStatus == "async") {
+				asyncNodes(treeNode.children);
+			}
+
+			if (curAsyncCount <= 0) {
+				if (curStatus != "init" && curStatus != "") {
+					$("#demoMsg").text((curStatus == "expand") ? demoMsg.expandAllOver : demoMsg.asyncAllOver);
+					asyncForAll = true;
+				}
+				curStatus = "";
+			}
+		}
+
+		function onAsyncError(event, treeId, treeNode, XMLHttpRequest, textStatus, errorThrown) {
+			curAsyncCount--;
+
+			if (curAsyncCount <= 0) {
+				curStatus = "";
+				if (treeNode!=null) asyncForAll = true;
+			}
+		}
+
+		var curStatus = "init", curAsyncCount = 0, asyncForAll = false,
+		goAsync = false;
+		function expandAll() {
+			if (!check()) {
+				return;
+			}
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			if (asyncForAll) {
+				$("#demoMsg").text(demoMsg.expandAll);
+				zTree.expandAll(true);
+			} else {
+				expandNodes(zTree.getNodes());
+				if (!goAsync) {
+					$("#demoMsg").text(demoMsg.expandAll);
+					curStatus = "";
+				}
+			}
+		}
+		function expandNodes(nodes) {
+			if (!nodes) return;
+			curStatus = "expand";
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			for (var i=0, l=nodes.length; i<l; i++) {
+				zTree.expandNode(nodes[i], true, false, false);
+				if (nodes[i].isParent && nodes[i].zAsync) {
+					expandNodes(nodes[i].children);
+				} else {
+					goAsync = true;
+				}
+			}
+		}
+
+		function asyncAll() {
+			if (!check()) {
+				return;
+			}
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			if (asyncForAll) {
+				$("#demoMsg").text(demoMsg.asyncAll);
+			} else {
+				asyncNodes(zTree.getNodes());
+				if (!goAsync) {
+					$("#demoMsg").text(demoMsg.asyncAll);
+					curStatus = "";
+				}
+			}
+		}
+		function asyncNodes(nodes) {
+			if (!nodes) return;
+			curStatus = "async";
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			for (var i=0, l=nodes.length; i<l; i++) {
+				if (nodes[i].isParent && nodes[i].zAsync) {
+					asyncNodes(nodes[i].children);
+				} else {
+					goAsync = true;
+					zTree.reAsyncChildNodes(nodes[i], "refresh", true);
+				}
+			}
+		}
+
+		function reset() {
+			if (!check()) {
+				return;
+			}
+			asyncForAll = false;
+			goAsync = false;
+			$("#demoMsg").text("");
+			$.fn.zTree.init($("#treeDemo"), setting);
+		}
+
+		function check() {
+			if (curAsyncCount > 0) {
+				$("#demoMsg").text(demoMsg.async);
+				return false;
+			}
+			return true;
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting);
+			$("#expandAllBtn").bind("click", expandAll);
+			$("#asyncAllBtn").bind("click", asyncAll);
+			$("#resetBtn").bind("click", reset);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>异步加载模式下全部展开</h1>
+<h6>[ 文件路径: super/asyncForAll.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>实现方法说明</h2>
+				<ul class="list">
+				<li>利用 onAsyncSuccess / onAsyncError 回调函数 和 reAsyncChildNodes 或 expandNode 方法可以实现全部功能。</li>
+				<li class="highlight_red">如果父节点数量很大，请注意利用延时进行控制，避免异步进程过多。</li>
+				<li class="highlight_red">建议：演示时请利用调试工具查看 network 的 ajax 加载过程。</li>
+				<li>演示操作
+					<br/><br/>
+				[ <a id="expandAllBtn" href="#" onclick="return false;">全部展开</a> ] &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+				[ <a id="asyncAllBtn" href="#" onclick="return false;">后台自动全部加载</a> ]<br/><br/>
+				[ <a id="resetBtn" href="#" onclick="return false;">Reset zTree</a> ]<br/><br/>
+				<p class="highlight_red" id="demoMsg"></p>
+				</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/super/checkbox_radio.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/super/checkbox_radio.html
new file mode 100644
index 0000000..66a3b03
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/super/checkbox_radio.html
@@ -0,0 +1,116 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - checkbox & radio</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var IDMark_A = "_a";
+		var setting = {
+			view: {
+				addDiyDom: addDiyDom
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"父节点 1", open:true},
+			{ id:11, pId:1, name:"叶子节点 1-1"},
+			{ id:12, pId:1, name:"叶子节点 1-2"},
+			{ id:13, pId:1, name:"叶子节点 1-3"},
+			{ id:2, pId:0, name:"父节点 2", open:true},
+			{ id:21, pId:2, name:"叶子节点 2-1"},
+			{ id:22, pId:2, name:"叶子节点 2-2"},
+			{ id:23, pId:2, name:"叶子节点 2-3"},
+			{ id:3, pId:0, name:"父节点 3", open:true},
+			{ id:31, pId:3, name:"叶子节点 3-1"},
+			{ id:32, pId:3, name:"叶子节点 3-2"},
+			{ id:33, pId:3, name:"叶子节点 3-3"}
+		];
+
+		function addDiyDom(treeId, treeNode) {
+			var aObj = $("#" + treeNode.tId + IDMark_A);
+			if (treeNode.level == 0) {
+				var editStr = "<input type='checkbox' class='checkboxBtn' id='checkbox_" +treeNode.id+ "' onfocus='this.blur();'></input>";
+				aObj.before(editStr);
+				var btn = $("#checkbox_"+treeNode.id);
+			if (btn) btn.bind("change", function() {checkAccessories(treeNode, btn);});
+			} else if (treeNode.level == 1) {
+				var editStr = "<input type='radio' class='radioBtn' id='radio_" +treeNode.id+ "' name='radio_"+treeNode.getParentNode().id+"' onfocus='this.blur();'></input>";
+				aObj.before(editStr);
+				var btn = $("#radio_"+treeNode.id);
+				if (btn) btn.bind("click", function() {checkBrand(treeNode, btn);});
+			}
+		}
+
+		function checkAccessories(treeNode, btn) {
+			var checkedRadio = getCheckedRadio("radio_"+treeNode.id);
+			if (btn.attr("checked")) {
+				if (!checkedRadio) {
+					$("#radio_" + treeNode.children[0].id).attr("checked", true);
+				}
+			} else {
+				checkedRadio.attr("checked", false);
+			}
+		}
+
+		function checkBrand(treeNode, btn) {
+			if (btn.attr("checked")) {
+				var pObj = $("#checkbox_" + treeNode.getParentNode().id);
+				if (!pObj.attr("checked")) {
+					pObj.attr("checked", true);
+				}
+			}
+		}
+
+		function getCheckedRadio(radioName) {
+			var r = document.getElementsByName(radioName);
+			for(var i=0; i<r.length; i++)    {
+				if(r[i].checked)    {
+					return $(r[i]);
+				}
+			}
+			return null;
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+	  .radioBtn {height: 16px;vertical-align: middle;}
+	  .checkboxBtn {vertical-align: middle;margin-right: 2px;}
+	  </style>
+ </HEAD>
+
+<BODY>
+<h1>checkbox / radio 共存</h1>
+<h6>[ 文件路径: super/checkbox_radio.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>实现方法说明</h2>
+				<ul class="list">
+				<li>zTree 默认的 checkbox 和 radio 是无法共存的，但可以利用 自定义控件 的功能实现此需求，具体需求可以参考 "添加 自定义控件" 的详细说明</li>
+				<li class="highlight_red">对于 checkbox / radio 的联动规则，请根据需求制定自己的规则</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/super/diydom.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/super/diydom.html
new file mode 100644
index 0000000..1980ff9
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/super/diydom.html
@@ -0,0 +1,177 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - addHoverDom / removeHoverDom / addDiyDom</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+
+		var IDMark_Switch = "_switch",
+		IDMark_Icon = "_ico",
+		IDMark_Span = "_span",
+		IDMark_Input = "_input",
+		IDMark_Check = "_check",
+		IDMark_Edit = "_edit",
+		IDMark_Remove = "_remove",
+		IDMark_Ul = "_ul",
+		IDMark_A = "_a";
+		
+		var setting = {
+			view: {
+				addHoverDom: addHoverDom,
+				removeHoverDom: removeHoverDom,
+				addDiyDom: addDiyDom
+			}
+		};
+
+		var zNodes =[
+			{id:1, name:"hover事件显示控件", open:true,
+				children:[
+					   {id:11, name:"按钮1"},
+					   {id:12, name:"按钮2"},
+					   {id:13, name:"下拉框"},
+					   {id:141, name:"文本1"},
+					   {id:142, name:"文本2"},
+					   {id:15, name:"超链接"}
+
+				]},
+			{id:2, name:"始终显示控件", open:true,
+				children:[
+					   {id:21, name:"按钮1"},
+					   {id:22, name:"按钮2"},
+					   {id:23, name:"下拉框"},
+					   {id:24, name:"文本"},
+					   {id:25, name:"超链接"}
+				]}
+	 	];
+
+		function addHoverDom(treeId, treeNode) {
+			if (treeNode.parentNode && treeNode.parentNode.id!=1) return;
+			var aObj = $("#" + treeNode.tId + IDMark_A);
+			if (treeNode.id == 11) {
+				if ($("#diyBtn_"+treeNode.id).length>0) return;
+				var editStr = "<span id='diyBtn_space_" +treeNode.id+ "' >&nbsp;</span><span class='button icon03' id='diyBtn_" +treeNode.id+ "' title='"+treeNode.name+"' onfocus='this.blur();'></span>";
+				aObj.append(editStr);
+				var btn = $("#diyBtn_"+treeNode.id);
+				if (btn) btn.bind("click", function(){alert("diy Button for " + treeNode.name);});
+			} else if (treeNode.id == 12) {
+				if ($("#diyBtn_"+treeNode.id).length>0) return;
+				var editStr = "<span class='button icon04' id='diyBtn_" +treeNode.id+ "' title='"+treeNode.name+"' onfocus='this.blur();'></span>";
+				aObj.after(editStr);
+				var btn = $("#diyBtn_"+treeNode.id);
+				if (btn) btn.bind("click", function(){alert("diy Button for " + treeNode.name);});
+			} else if (treeNode.id == 13) {
+				if ($("#diyBtn_"+treeNode.id).length>0) return;
+				var editStr = "<span id='diyBtn_space_" +treeNode.id+ "' >&nbsp;</span><select class='selDemo ' id='diyBtn_" +treeNode.id+ "'><option value=1>1</option><option value=2>2</option><option value=3>3</option></select>";
+				aObj.after(editStr);
+				var btn = $("#diyBtn_"+treeNode.id);
+				if (btn) btn.bind("change", function(){alert("diy Select value="+btn.attr("value")+" for " + treeNode.name);});
+			} else if (treeNode.id == 141) {
+				if ($("#diyBtn_"+treeNode.id).length>0) return;
+				var editStr = "<span class='test' id='diyBtn_" +treeNode.id+ "'>Text Demo...</span>";
+				aObj.append(editStr);
+			} else if (treeNode.id == 142) {
+				if ($("#diyBtn_"+treeNode.id).length>0) return;
+				var editStr = "<span id='diyBtn_" +treeNode.id+ "'>Text Demo...</span>";
+				aObj.after(editStr);
+			} else if (treeNode.id == 15) {
+				if ($("#diyBtn1_"+treeNode.id).length>0) return;
+				if ($("#diyBtn2_"+treeNode.id).length>0) return;
+				var editStr = "<a id='diyBtn1_" +treeNode.id+ "' onclick='alert(1);return false;' style='margin:0 0 0 5px;'>链接1</a>" +
+					"<a id='diyBtn2_" +treeNode.id+ "' onclick='alert(2);return false;' style='margin:0 0 0 5px;'>链接2</a>";
+				aObj.append(editStr);
+			}
+		}
+
+		function removeHoverDom(treeId, treeNode) {
+			if (treeNode.parentTId && treeNode.getParentNode().id!=1) return;
+			if (treeNode.id == 15) {
+				$("#diyBtn1_"+treeNode.id).unbind().remove();
+				$("#diyBtn2_"+treeNode.id).unbind().remove();
+			} else {
+				$("#diyBtn_"+treeNode.id).unbind().remove();
+				$("#diyBtn_space_" +treeNode.id).unbind().remove();
+			}
+		}
+
+		function addDiyDom(treeId, treeNode) {
+			if (treeNode.parentNode && treeNode.parentNode.id!=2) return;
+			var aObj = $("#" + treeNode.tId + IDMark_A);
+			if (treeNode.id == 21) {
+				var editStr = "<span class='demoIcon' id='diyBtn_" +treeNode.id+ "' title='"+treeNode.name+"' onfocus='this.blur();'><span class='button icon01'></span></span>";
+				aObj.append(editStr);
+				var btn = $("#diyBtn_"+treeNode.id);
+				if (btn) btn.bind("click", function(){alert("diy Button for " + treeNode.name);});
+			} else if (treeNode.id == 22) {
+				var editStr = "<span class='demoIcon' id='diyBtn_" +treeNode.id+ "' title='"+treeNode.name+"' onfocus='this.blur();'><span class='button icon02'></span></span>";
+				aObj.after(editStr);
+				var btn = $("#diyBtn_"+treeNode.id);
+				if (btn) btn.bind("click", function(){alert("diy Button for " + treeNode.name);});
+			} else if (treeNode.id == 23) {
+				var editStr = "<select class='selDemo' id='diyBtn_" +treeNode.id+ "'><option value=1>1</option><option value=2>2</option><option value=3>3</option></select>";
+				aObj.after(editStr);
+				var btn = $("#diyBtn_"+treeNode.id);
+				if (btn) btn.bind("change", function(){alert("diy Select value="+btn.attr("value")+" for " + treeNode.name);});
+			} else if (treeNode.id == 24) {
+				var editStr = "<span id='diyBtn_" +treeNode.id+ "'>Text Demo...</span>";
+				aObj.after(editStr);
+			} else if (treeNode.id == 25) {
+				var editStr = "<a id='diyBtn1_" +treeNode.id+ "' onclick='alert(1);return false;'>链接1</a>" +
+					"<a id='diyBtn2_" +treeNode.id+ "' onclick='alert(2);return false;'>链接2</a>";
+				aObj.after(editStr);
+			}
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+.ztree li span.demoIcon{padding:0 2px 0 10px;}
+.ztree li span.button.icon01{margin:0; background: url(../../../css/zTreeStyle/img/diy/3.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon02{margin:0; background: url(../../../css/zTreeStyle/img/diy/4.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon03{margin:0; background: url(../../../css/zTreeStyle/img/diy/5.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon04{margin:0; background: url(../../../css/zTreeStyle/img/diy/6.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon05{margin:0; background: url(../../../css/zTreeStyle/img/diy/7.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon06{margin:0; background: url(../../../css/zTreeStyle/img/diy/8.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+	</style>
+ </HEAD>
+
+<BODY>
+<h1>添加自定义控件</h1>
+<h6>[ 文件路径: super/diydom.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、实现方法说明</h2>
+				<ul class="list">
+				<li>利用 setting.view.addHoverDom / removeHoverDom / addDiyDom 这几个参数的配置可以很容易的实现自定义控件的功能</li>
+				<li class="highlight_red">添加自定义控件，请务必掌握 zTree 节点对象的命名规则，以保证正常添加 DOM 控件</li>
+				<li class="highlight_red">如果添加标准的 select / checkbox / radio 等，请注意适当调整 zTree 的布局 css，保证 zTree 能正常显示</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、setting 配置信息说明</h2>
+				<ul class="list">
+				<li>使用 setting.view.addHoverDom / removeHoverDom / addDiyDom 属性，详细请参见 API 文档中的相关内容</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li>对 节点数据 没有特殊要求，用户可以根据自己的需求添加自定义属性</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/super/dragWithOther.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/super/dragWithOther.html
new file mode 100644
index 0000000..04a5b7c
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/super/dragWithOther.html
@@ -0,0 +1,235 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - drag with other DOM</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>-->
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var MoveTest = {
+			errorMsg: "放错了...请选择正确的类别！",
+			curTarget: null,
+			curTmpTarget: null,
+			noSel: function() {
+				try {
+					window.getSelection ? window.getSelection().removeAllRanges() : document.selection.empty();
+				} catch(e){}
+			},
+			dragTree2Dom: function(treeId, treeNodes) {
+				return !treeNodes[0].isParent;
+			},
+			prevTree: function(treeId, treeNodes, targetNode) {
+				return !targetNode.isParent && targetNode.parentTId == treeNodes[0].parentTId;
+			},
+			nextTree: function(treeId, treeNodes, targetNode) {
+				return !targetNode.isParent && targetNode.parentTId == treeNodes[0].parentTId;
+			},
+			innerTree: function(treeId, treeNodes, targetNode) {
+				return targetNode!=null && targetNode.isParent && targetNode.tId == treeNodes[0].parentTId;
+			},
+			dropTree2Dom: function(e, treeId, treeNodes, targetNode, moveType) {
+				var domId = "dom_" + treeNodes[0].getParentNode().id;
+				if (moveType == null && (domId == e.target.id || $(e.target).parents("#" + domId).length > 0)) {
+					var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+					zTree.removeNode(treeNodes[0]);
+
+					var newDom = $("span[domId=" + treeNodes[0].id + "]");
+					if (newDom.length > 0) {
+						newDom.removeClass("domBtn_Disabled");
+						newDom.addClass("domBtn");
+					} else {
+						$("#" + domId).append("<span class='domBtn' domId='" + treeNodes[0].id + "'>" + treeNodes[0].name + "</span>");
+					}
+					MoveTest.updateType();
+				} else if ( $(e.target).parents(".domBtnDiv").length > 0) {
+					alert(MoveTest.errorMsg);
+				}
+			},
+			dom2Tree: function(e, treeId, treeNode) {
+				var target = MoveTest.curTarget, tmpTarget = MoveTest.curTmpTarget;
+				if (!target) return;
+				var zTree = $.fn.zTree.getZTreeObj("treeDemo"), parentNode;
+				if (treeNode != null && treeNode.isParent && "dom_" + treeNode.id == target.parent().attr("id")) {
+					parentNode = treeNode;
+				} else if (treeNode != null && !treeNode.isParent && "dom_" + treeNode.getParentNode().id == target.parent().attr("id")) {
+					parentNode = treeNode.getParentNode();
+				}
+
+				if (tmpTarget) tmpTarget.remove();
+				if (!!parentNode) {
+					var nodes = zTree.addNodes(parentNode, {id:target.attr("domId"), name: target.text()});
+					zTree.selectNode(nodes[0]);
+				} else {
+					target.removeClass("domBtn_Disabled");
+					target.addClass("domBtn");
+					alert(MoveTest.errorMsg);
+				}
+				MoveTest.updateType();
+				MoveTest.curTarget = null;
+				MoveTest.curTmpTarget = null;
+			},
+			updateType: function() {
+				var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+				nodes = zTree.getNodes();
+				for (var i=0, l=nodes.length; i<l; i++) {
+					var num = nodes[i].children ? nodes[i].children.length : 0;
+					nodes[i].name = nodes[i].name.replace(/ \(.*\)/gi, "") + " (" + num + ")";
+					zTree.updateNode(nodes[i]);
+				}
+			},
+			bindDom: function() {
+				$(".domBtnDiv").bind("mousedown", MoveTest.bindMouseDown);
+			},
+			bindMouseDown: function(e) {
+				var target = e.target;
+				if (target!=null && target.className=="domBtn") {
+					var doc = $(document), target = $(target),
+					docScrollTop = doc.scrollTop(),
+					docScrollLeft = doc.scrollLeft();
+					target.addClass("domBtn_Disabled");
+					target.removeClass("domBtn");
+					curDom = $("<span class='dom_tmp domBtn'>" + target.text() + "</span>");
+					curDom.appendTo("body");
+
+					curDom.css({
+						"top": (e.clientY + docScrollTop + 3) + "px",
+						"left": (e.clientX + docScrollLeft + 3) + "px"
+					});
+					MoveTest.curTarget = target;
+					MoveTest.curTmpTarget = curDom;
+
+					doc.bind("mousemove", MoveTest.bindMouseMove);
+					doc.bind("mouseup", MoveTest.bindMouseUp);
+					doc.bind("selectstart", MoveTest.docSelect);
+				}
+				if(e.preventDefault) {
+					e.preventDefault();
+				}
+			},
+			bindMouseMove: function(e) {
+				MoveTest.noSel();
+				var doc = $(document), 
+				docScrollTop = doc.scrollTop(),
+				docScrollLeft = doc.scrollLeft(),
+				tmpTarget = MoveTest.curTmpTarget;
+				if (tmpTarget) {
+					tmpTarget.css({
+						"top": (e.clientY + docScrollTop + 3) + "px",
+						"left": (e.clientX + docScrollLeft + 3) + "px"
+					});
+				}
+				return false;
+			},
+			bindMouseUp: function(e) {
+				var doc = $(document);
+				doc.unbind("mousemove", MoveTest.bindMouseMove);
+				doc.unbind("mouseup", MoveTest.bindMouseUp);
+				doc.unbind("selectstart", MoveTest.docSelect);
+
+				var target = MoveTest.curTarget, tmpTarget = MoveTest.curTmpTarget;
+				if (tmpTarget) tmpTarget.remove();
+
+				if ($(e.target).parents("#treeDemo").length == 0) {
+					if (target) {
+						target.removeClass("domBtn_Disabled");
+						target.addClass("domBtn");
+					}
+					MoveTest.curTarget = null;
+					MoveTest.curTmpTarget = null;
+				}
+			},
+			bindSelect: function() {
+				return false;
+			}
+		};
+
+		var setting = {
+			edit: {
+				enable: true,
+				showRemoveBtn: false,
+				showRenameBtn: false,
+				drag: {
+					prev: MoveTest.prevTree,
+					next: MoveTest.nextTree,
+					inner: MoveTest.innerTree
+				}
+			},
+			data: {
+				keep: {
+					parent: true,
+					leaf: true
+				},
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeDrag: MoveTest.dragTree2Dom,
+				onDrop: MoveTest.dropTree2Dom,
+				onMouseUp: MoveTest.dom2Tree
+			},
+			view: {
+				selectedMulti: false
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"植物", isParent: true, open:true},
+			{ id:2, pId:0, name:"动物", isParent: true, open:true},
+			{ id:20, pId:2, name:"大象"},
+			{ id:29, pId:2, name:"鲨鱼"},
+			{ id:10, pId:1, name:"大白菜"},
+			{ id:19, pId:1, name:"西红柿"}
+		];
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			MoveTest.updateType();
+			MoveTest.bindDom();
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+.dom_line {margin:2px;border-bottom:1px gray dotted;height:1px}
+.domBtnDiv {display:block;padding:2px;border:1px gray dotted;background-color:powderblue}
+.categoryDiv {display:inline-block; width:335px}
+.domBtn {display:inline-block;cursor:pointer;padding:2px;margin:2px 10px;border:1px gray solid;background-color:#FFE6B0}
+.domBtn_Disabled {display:inline-block;cursor:default;padding:2px;margin:2px 10px;border:1px gray solid;background-color:#DFDFDF;color:#999999}
+.dom_tmp {position:absolute;font-size:12px;}
+	</style>
+</HEAD>
+
+<BODY>
+<h1>与其他 DOM 拖拽互动</h1>
+<h6>[ 文件路径: super/dragWithOther.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>实现方法说明</h2>
+				<ul class="list">
+				<li>zTree v3.2 版本修正了 onDrag/onDrop 中的 event 对象，因此可以较容易的控制将节点拖拽到其他 DOM </li>
+				<li class="highlight_red">将其他 DOM 拖拽到 zTree 需要自己制作相关的拖拽代码</li>
+				<li class="highlight_red">这仅仅是一个最简单的演示，如果需要更炫的效果，需要制作更复杂的代码</li>
+				</ul>
+			</li>
+			<li class="title"><h2>请拖拽下面内容到 树节点上</h2>
+				<div class="domBtnDiv">
+					<div id="dom_1" class="categoryDiv"><span class="domBtn" domId="11">大树</span><span class="domBtn" domId="12">小草</span><span class="domBtn" domId="13">花朵</span></div>
+					<div class="dom_line"></div>
+					<div id="dom_2" class="categoryDiv"><span class="domBtn" domId="21">老虎</span><span class="domBtn" domId="22">狗熊</span><span class="domBtn" domId="23">狮子</span></div>
+				</div>
+				<span class="highlight_red">也可以把二级节点拖拽到以上图层 </span>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/super/left_menu.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/super/left_menu.html
new file mode 100644
index 0000000..4b9941a
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/super/left_menu.html
@@ -0,0 +1,152 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - left_menu</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var curMenu = null, zTree_Menu = null;
+		var setting = {
+			view: {
+				showLine: true,
+				selectedMulti: false,
+				dblClickExpand: false
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				onNodeCreated: this.onNodeCreated,
+				beforeClick: this.beforeClick,
+				onClick: this.onClick
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"主菜单 1", open:true},
+			{ id:11, pId:1, name:"子菜单 1-1"},
+			{ id:111, pId:11, name:"叶子节点 1-1-1"},
+			{ id:112, pId:11, name:"叶子节点 1-1-2"},
+			{ id:113, pId:11, name:"叶子节点 1-1-3"},
+			{ id:114, pId:11, name:"叶子节点 1-1-4"},
+			{ id:12, pId:1, name:"子菜单 1-2"},
+			{ id:121, pId:12, name:"叶子节点 1-2-1"},
+			{ id:122, pId:12, name:"叶子节点 1-2-2"},
+			{ id:123, pId:12, name:"叶子节点 1-2-3"},
+			{ id:124, pId:12, name:"叶子节点 1-2-4"},
+			{ id:2, pId:0, name:"主菜单 2"},
+			{ id:21, pId:2, name:"子菜单 2-1"},
+			{ id:211, pId:21, name:"叶子节点 2-1-1"},
+			{ id:212, pId:21, name:"叶子节点 2-1-2"},
+			{ id:213, pId:21, name:"叶子节点 2-1-3"},
+			{ id:214, pId:21, name:"叶子节点 2-1-4"},
+			{ id:22, pId:2, name:"子菜单 2-2"},
+			{ id:221, pId:22, name:"叶子节点 2-2-1"},
+			{ id:222, pId:22, name:"叶子节点 2-2-2"},
+			{ id:223, pId:22, name:"叶子节点 2-2-3"},
+			{ id:224, pId:22, name:"叶子节点 2-2-4"},
+			{ id:3, pId:0, name:"主菜单 3"},
+			{ id:31, pId:3, name:"子菜单 3-1"},
+			{ id:311, pId:31, name:"叶子节点 3-1-1"},
+			{ id:312, pId:31, name:"叶子节点 3-1-2"},
+			{ id:313, pId:31, name:"叶子节点 3-1-3"},
+			{ id:314, pId:31, name:"叶子节点 3-1-4"},
+			{ id:32, pId:3, name:"子菜单 3-2"},
+			{ id:321, pId:32, name:"叶子节点 3-2-1"},
+			{ id:322, pId:32, name:"叶子节点 3-2-2"},
+			{ id:323, pId:32, name:"叶子节点 3-2-3"},
+			{ id:324, pId:32, name:"叶子节点 3-2-4"}			
+		];
+
+		function beforeClick(treeId, node) {
+			if (node.isParent) {
+				if (node.level === 0) {
+					var pNode = curMenu;
+					while (pNode && pNode.level !==0) {
+						pNode = pNode.getParentNode();
+					}
+					if (pNode !== node) {
+						var a = $("#" + pNode.tId + "_a");
+						a.removeClass("cur");
+						zTree_Menu.expandNode(pNode, false);
+					}
+					a = $("#" + node.tId + "_a");
+					a.addClass("cur");
+
+					var isOpen = false;
+					for (var i=0,l=node.children.length; i<l; i++) {
+						if(node.children[i].open) {
+							isOpen = true;
+							break;
+						}
+					}
+					if (isOpen) {
+						zTree_Menu.expandNode(node, true);
+						curMenu = node;
+					} else {
+						zTree_Menu.expandNode(node.children[0].isParent?node.children[0]:node, true);
+						curMenu = node.children[0];
+					}
+				} else {
+					zTree_Menu.expandNode(node);
+				}
+			}
+			return !node.isParent;
+		}
+		function onClick(e, treeId, node) {
+			alert("Do what you want to do!");
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			zTree_Menu = $.fn.zTree.getZTreeObj("treeDemo");
+			curMenu = zTree_Menu.getNodes()[0].children[0].children[0];
+			zTree_Menu.selectNode(curMenu);
+			var a = $("#" + zTree_Menu.getNodes()[0].tId + "_a");
+			a.addClass("cur");
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+.ztree li a.level0 {width:200px;height: 20px; text-align: center; display:block; background-color: #0B61A4; border:1px silver solid;}
+.ztree li a.level0.cur {background-color: #66A3D2; }
+.ztree li a.level0 span {display: block; color: white; padding-top:3px; font-size:12px; font-weight: bold;word-spacing: 2px;}
+.ztree li a.level0 span.button {	float:right; margin-left: 10px; visibility: visible;display:none;}
+.ztree li span.button.switch.level0 {display:none;}
+	</style>
+ </HEAD>
+
+<BODY>
+<h1>左侧菜单</h1>
+<h6>[ 文件路径: super/left_menu.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>实现方法说明</h2>
+				<ul class="list">
+				<li>在 “Demo 演示”中的左侧菜单就是用 zTree 实现的，主要是靠 css 样式负责排版，利用 setting 中的配置进行功能制作，本 Demo 对实现 左侧菜单进行简单的介绍，你也可以通过查看 “Demo 演示”页面的源码深入了解。</li>
+				<li class="highlight_red">1、关于 css 完全可以根据自己的需要进行个性化调整，例如：此 Demo 的菜单样式 就 与 “Demo 演示”页面的不一样，仅供对比参考</li>
+				<li class="highlight_red">2、主要用到的配置有：<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;setting.view.showIcon / showLine / selectedMulti / dblClickExpand<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;setting.callback.onNodeCreated / beforeClick / onClick
+				</li>
+				<li>3、是否需要限制单一路径展开，完全由你的需求而定，实现代码可参考 "保持展开单一路径"</li>
+				<li>4、其他辅助规则，请根据实际情况自行编写</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/super/left_menuForOutLook.gif b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/super/left_menuForOutLook.gif
new file mode 100644
index 0000000..c252f0f
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/super/left_menuForOutLook.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/super/left_menuForOutLook.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/super/left_menuForOutLook.html
new file mode 100644
index 0000000..bf6eb30
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/super/left_menuForOutLook.html
@@ -0,0 +1,136 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - left_menu for Outlook</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var curMenu = null, zTree_Menu = null;
+		var setting = {
+			view: {
+				showLine: false,
+				showIcon: false,
+				selectedMulti: false,
+				dblClickExpand: false,
+				addDiyDom: addDiyDom
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeClick: beforeClick
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"文件夹", open:true},
+			{ id:11, pId:1, name:"收件箱"},
+			{ id:111, pId:11, name:"收件箱1"},
+			{ id:112, pId:111, name:"收件箱2"},
+			{ id:113, pId:112, name:"收件箱3"},
+			{ id:114, pId:113, name:"收件箱4"},
+			{ id:12, pId:1, name:"垃圾邮件"},
+			{ id:13, pId:1, name:"草稿"},
+			{ id:14, pId:1, name:"已发送邮件"},
+			{ id:15, pId:1, name:"已删除邮件"},
+			{ id:3, pId:0, name:"快速视图"},
+			{ id:31, pId:3, name:"文档"},
+			{ id:32, pId:3, name:"照片"}
+		];
+
+		function addDiyDom(treeId, treeNode) {
+			var spaceWidth = 5;
+			var switchObj = $("#" + treeNode.tId + "_switch"),
+			icoObj = $("#" + treeNode.tId + "_ico");
+			switchObj.remove();
+			icoObj.before(switchObj);
+
+			if (treeNode.level > 1) {
+				var spaceStr = "<span style='display: inline-block;width:" + (spaceWidth * treeNode.level)+ "px'></span>";
+				switchObj.before(spaceStr);
+			}
+		}
+
+		function beforeClick(treeId, treeNode) {
+			if (treeNode.level == 0 ) {
+				var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+				zTree.expandNode(treeNode);
+				return false;
+			}
+			return true;
+		}
+
+		$(document).ready(function(){
+			var treeObj = $("#treeDemo");
+			$.fn.zTree.init(treeObj, setting, zNodes);
+			zTree_Menu = $.fn.zTree.getZTreeObj("treeDemo");
+			curMenu = zTree_Menu.getNodes()[0].children[0].children[0];
+			zTree_Menu.selectNode(curMenu);
+
+			treeObj.hover(function () {
+				if (!treeObj.hasClass("showIcon")) {
+					treeObj.addClass("showIcon");
+				}
+			}, function() {
+				treeObj.removeClass("showIcon");
+			});
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+.ztree * {font-size: 10pt;font-family:"Microsoft Yahei",Verdana,Simsun,"Segoe UI Web Light","Segoe UI Light","Segoe UI Web Regular","Segoe UI","Segoe UI Symbol","Helvetica Neue",Arial}
+.ztree li ul{ margin:0; padding:0}
+.ztree li {line-height:30px;}
+.ztree li a {width:200px;height:30px;padding-top: 0px;}
+.ztree li a:hover {text-decoration:none; background-color: #E7E7E7;}
+.ztree li a span.button.switch {visibility:hidden}
+.ztree.showIcon li a span.button.switch {visibility:visible}
+.ztree li a.curSelectedNode {background-color:#D4D4D4;border:0;height:30px;}
+.ztree li span {line-height:30px;}
+.ztree li span.button {margin-top: -7px;}
+.ztree li span.button.switch {width: 16px;height: 16px;}
+
+.ztree li a.level0 span {font-size: 150%;font-weight: bold;}
+.ztree li span.button {background-image:url("./left_menuForOutLook.png"); *background-image:url("./left_menuForOutLook.gif")}
+.ztree li span.button.switch.level0 {width: 20px; height:20px}
+.ztree li span.button.switch.level1 {width: 20px; height:20px}
+.ztree li span.button.noline_open {background-position: 0 0;}
+.ztree li span.button.noline_close {background-position: -18px 0;}
+.ztree li span.button.noline_open.level0 {background-position: 0 -18px;}
+.ztree li span.button.noline_close.level0 {background-position: -18px -18px;}
+	</style>
+ </HEAD>
+
+<BODY>
+<h1>OutLook 样式的左侧菜单</h1>
+<h6>[ 文件路径: super/left_menuForOutLook.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>实现方法说明</h2>
+				<ul class="list">
+				<li>帮朋友用 zTree 实现了一个貌似 Outlook.com 的菜单，特拿出来分享给大家</li>
+				<li class="highlight_red">1、请注意本页面源码中的 css 部分</li>
+				<li class="highlight_red">2、请查看源码中 js 的使用，特别是利用 addDiyDom 回调将 展开按钮 转移到 &lt;a&gt; 标签内</li>
+				<li class="highlight_red">3、利用添加 zTree 的 class 实现展开按钮的隐藏、显示</li>
+				<li>4、其他辅助规则，请根据实际情况自行编写</li>
+				<li>5、当前规则说明:<br/>
+				&nbsp;&nbsp;单击根节点可以展开、折叠;<br/>
+				&nbsp;&nbsp;非根节点只有点击 箭头 图标才可以展开、折叠;<br/>
+				</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/super/left_menuForOutLook.png b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/super/left_menuForOutLook.png
new file mode 100644
index 0000000..36e8acf
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/super/left_menuForOutLook.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/super/oneclick.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/super/oneclick.html
new file mode 100644
index 0000000..93e32a4
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/super/oneclick.html
@@ -0,0 +1,87 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - one click</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				dblClickExpand: false,
+				showLine: false
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				onClick: onClick
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"根 Root", open:true},
+			{ id:11, pId:1, name:"父节点 1-1", open:true},
+			{ id:111, pId:11, name:"叶子节点 1-1-1"},
+			{ id:112, pId:11, name:"叶子节点 1-1-2"},
+			{ id:113, pId:11, name:"叶子节点 1-1-3"},
+			{ id:114, pId:11, name:"叶子节点 1-1-4"},
+			{ id:12, pId:1, name:"父节点 1-2", open:true},
+			{ id:121, pId:12, name:"叶子节点 1-2-1"},
+			{ id:122, pId:12, name:"叶子节点 1-2-2"},
+			{ id:123, pId:12, name:"叶子节点 1-2-3"},
+			{ id:124, pId:12, name:"叶子节点 1-2-4"},
+			{ id:13, pId:1, name:"父节点 1-3", open:true},
+			{ id:131, pId:13, name:"叶子节点 1-3-1"},
+			{ id:132, pId:13, name:"叶子节点 1-3-2"},
+			{ id:133, pId:13, name:"叶子节点 1-3-3"},
+			{ id:134, pId:13, name:"叶子节点 1-3-4"}
+		];
+
+		function onClick(e,treeId, treeNode) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			zTree.expandNode(treeNode);
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+.ztree li button.switch {visibility:hidden; width:1px;}
+.ztree li button.switch.roots_docu {visibility:visible; width:16px;}
+.ztree li button.switch.center_docu {visibility:visible; width:16px;}
+.ztree li button.switch.bottom_docu {visibility:visible; width:16px;}
+	</style>
+ </HEAD>
+
+<BODY>
+<h1>单击展开/折叠节点</h1>
+<h6>[ 文件路径: super/oneclick.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>实现方法说明</h2>
+				<ul class="list">
+				<li>zTree 默认不提供单击展开节点的功能，但可以利用 onClick 事件回调函数轻松实现此功能</li>
+				<li class="highlight_red">为了避免与双击功能冲突，建议关闭双击展开节点的功能，请设置 setting.view.dblClickExpand = false </li>
+				<li class="highlight_red">可以将所有的 +/- 开关隐藏，请查看本页面源码，查看 css 设置 </li>
+				<li class="highlight_red">由于 +/- 开关与 节点连接线是配套的，所以如果不显示 +/- 开关的话，那么请设置 setting.view.showLine = false 隐藏连接线 </li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/super/oneroot.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/super/oneroot.html
new file mode 100644
index 0000000..6624e7b
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/super/oneroot.html
@@ -0,0 +1,79 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - one root</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				dblClickExpand: dblClickExpand
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"根 Root", open:true},
+			{ id:11, pId:1, name:"父节点 1-1", open:true},
+			{ id:111, pId:11, name:"叶子节点 1-1-1"},
+			{ id:112, pId:11, name:"叶子节点 1-1-2"},
+			{ id:113, pId:11, name:"叶子节点 1-1-3"},
+			{ id:114, pId:11, name:"叶子节点 1-1-4"},
+			{ id:12, pId:1, name:"父节点 1-2", open:true},
+			{ id:121, pId:12, name:"叶子节点 1-2-1"},
+			{ id:122, pId:12, name:"叶子节点 1-2-2"},
+			{ id:123, pId:12, name:"叶子节点 1-2-3"},
+			{ id:124, pId:12, name:"叶子节点 1-2-4"},
+			{ id:13, pId:1, name:"父节点 1-3", open:true},
+			{ id:131, pId:13, name:"叶子节点 1-3-1"},
+			{ id:132, pId:13, name:"叶子节点 1-3-2"},
+			{ id:133, pId:13, name:"叶子节点 1-3-3"},
+			{ id:134, pId:13, name:"叶子节点 1-3-4"}
+		];
+
+		function dblClickExpand(treeId, treeNode) {
+			return treeNode.level > 0;
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+.ztree li span.button.switch.level0 {visibility:hidden; width:1px;}
+.ztree li ul.level0 {padding:0; background:none;}
+	</style>
+ </HEAD>
+
+<BODY>
+<h1>冻结根节点</h1>
+<h6>[ 文件路径: super/oneroot.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>实现方法说明</h2>
+				<ul class="list">
+				<li>对于这种只有一个根节点，且不显示 +/- 开关的需求，需要利用 css、setting 配合使用</li>
+				<li class="highlight_red">zTree v3.x 可以针对指定的 level，进行样式设定，请查看本页面源码，查看 css 设置</li>
+				<li class="highlight_red">设置 setting.view.dblClickExpand 指向 Function，可以只针对根节点关闭双击展开的操作</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/super/rightClickMenu.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/super/rightClickMenu.html
new file mode 100644
index 0000000..9e5b404
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/super/rightClickMenu.html
@@ -0,0 +1,168 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - select menu</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				dblClickExpand: false
+			},
+			check: {
+				enable: true
+			},
+			callback: {
+				onRightClick: OnRightClick
+			}
+		};
+
+		var zNodes =[
+			{id:1, name:"无右键菜单 1", open:true, noR:true,
+				children:[
+					   {id:11, name:"节点 1-1", noR:true},
+					   {id:12, name:"节点 1-2", noR:true}
+
+				]},
+			{id:2, name:"右键操作 2", open:true,
+				children:[
+					   {id:21, name:"节点 2-1"},
+					   {id:22, name:"节点 2-2"},
+					   {id:23, name:"节点 2-3"},
+					   {id:24, name:"节点 2-4"}
+				]},
+			{id:3, name:"右键操作 3", open:true,
+				children:[
+					   {id:31, name:"节点 3-1"},
+					   {id:32, name:"节点 3-2"},
+					   {id:33, name:"节点 3-3"},
+					   {id:34, name:"节点 3-4"}
+				]}
+  	 	];
+
+		function OnRightClick(event, treeId, treeNode) {
+			if (!treeNode && event.target.tagName.toLowerCase() != "button" && $(event.target).parents("a").length == 0) {
+				zTree.cancelSelectedNode();
+				showRMenu("root", event.clientX, event.clientY);
+			} else if (treeNode && !treeNode.noR) {
+				zTree.selectNode(treeNode);
+				showRMenu("node", event.clientX, event.clientY);
+			}
+		}
+
+		function showRMenu(type, x, y) {
+			$("#rMenu ul").show();
+			if (type=="root") {
+				$("#m_del").hide();
+				$("#m_check").hide();
+				$("#m_unCheck").hide();
+			} else {
+				$("#m_del").show();
+				$("#m_check").show();
+				$("#m_unCheck").show();
+			}
+			rMenu.css({"top":y+"px", "left":x+"px", "visibility":"visible"});
+
+			$("body").bind("mousedown", onBodyMouseDown);
+		}
+		function hideRMenu() {
+			if (rMenu) rMenu.css({"visibility": "hidden"});
+			$("body").unbind("mousedown", onBodyMouseDown);
+		}
+		function onBodyMouseDown(event){
+			if (!(event.target.id == "rMenu" || $(event.target).parents("#rMenu").length>0)) {
+				rMenu.css({"visibility" : "hidden"});
+			}
+		}
+		var addCount = 1;
+		function addTreeNode() {
+			hideRMenu();
+			var newNode = { name:"增加" + (addCount++)};
+			if (zTree.getSelectedNodes()[0]) {
+				newNode.checked = zTree.getSelectedNodes()[0].checked;
+				zTree.addNodes(zTree.getSelectedNodes()[0], newNode);
+			} else {
+				zTree.addNodes(null, newNode);
+			}
+		}
+		function removeTreeNode() {
+			hideRMenu();
+			var nodes = zTree.getSelectedNodes();
+			if (nodes && nodes.length>0) {
+				if (nodes[0].children && nodes[0].children.length > 0) {
+					var msg = "要删除的节点是父节点，如果删除将连同子节点一起删掉。\n\n请确认！";
+					if (confirm(msg)==true){
+						zTree.removeNode(nodes[0]);
+					}
+				} else {
+					zTree.removeNode(nodes[0]);
+				}
+			}
+		}
+		function checkTreeNode(checked) {
+			var nodes = zTree.getSelectedNodes();
+			if (nodes && nodes.length>0) {
+				zTree.checkNode(nodes[0], checked, true);
+			}
+			hideRMenu();
+		}
+		function resetTree() {
+			hideRMenu();
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		}
+
+		var zTree, rMenu;
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			rMenu = $("#rMenu");
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+div#rMenu {position:absolute; visibility:hidden; top:0; background-color: #555;text-align: left;padding: 2px;}
+div#rMenu ul li{
+	margin: 1px 0;
+	padding: 0 5px;
+	cursor: pointer;
+	list-style: none outside none;
+	background-color: #DFDFDF;
+}
+	</style>
+ </HEAD>
+
+<BODY>
+<h1>右键菜单的实现</h1>
+<h6>[ 文件路径: super/rightClickMenu.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>实现方法说明</h2>
+				<ul class="list">
+				<li>利用 beforeRightClick / onRightClick 事件回调函数简单实现的右键菜单</li>
+				<li class="highlight_red">Demo 中的菜单比较简陋，你完全可以配合其他自定义样式的菜单图层混合使用</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+<div id="rMenu">
+	<ul>
+		<li id="m_add" onclick="addTreeNode();">增加节点</li>
+		<li id="m_del" onclick="removeTreeNode();">删除节点</li>
+		<li id="m_check" onclick="checkTreeNode(true);">Check节点</li>
+		<li id="m_unCheck" onclick="checkTreeNode(false);">unCheck节点</li>
+		<li id="m_reset" onclick="resetTree();">恢复zTree</li>
+	</ul>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/super/select_menu.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/super/select_menu.html
new file mode 100644
index 0000000..67787c6
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/super/select_menu.html
@@ -0,0 +1,124 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - select menu</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				dblClickExpand: false
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeClick: beforeClick,
+				onClick: onClick
+			}
+		};
+
+		var zNodes =[
+			{id:1, pId:0, name:"北京"},
+			{id:2, pId:0, name:"天津"},
+			{id:3, pId:0, name:"上海"},
+			{id:6, pId:0, name:"重庆"},
+			{id:4, pId:0, name:"河北省", open:true},
+			{id:41, pId:4, name:"石家庄"},
+			{id:42, pId:4, name:"保定"},
+			{id:43, pId:4, name:"邯郸"},
+			{id:44, pId:4, name:"承德"},
+			{id:5, pId:0, name:"广东省", open:true},
+			{id:51, pId:5, name:"广州"},
+			{id:52, pId:5, name:"深圳"},
+			{id:53, pId:5, name:"东莞"},
+			{id:54, pId:5, name:"佛山"},
+			{id:6, pId:0, name:"福建省", open:true},
+			{id:61, pId:6, name:"福州"},
+			{id:62, pId:6, name:"厦门"},
+			{id:63, pId:6, name:"泉州"},
+			{id:64, pId:6, name:"三明"}
+		 ];
+
+		function beforeClick(treeId, treeNode) {
+			var check = (treeNode && !treeNode.isParent);
+			if (!check) alert("只能选择城市...");
+			return check;
+		}
+		
+		function onClick(e, treeId, treeNode) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nodes = zTree.getSelectedNodes(),
+			v = "";
+			nodes.sort(function compare(a,b){return a.id-b.id;});
+			for (var i=0, l=nodes.length; i<l; i++) {
+				v += nodes[i].name + ",";
+			}
+			if (v.length > 0 ) v = v.substring(0, v.length-1);
+			var cityObj = $("#citySel");
+			cityObj.attr("value", v);
+		}
+
+		function showMenu() {
+			var cityObj = $("#citySel");
+			var cityOffset = $("#citySel").offset();
+			$("#menuContent").css({left:cityOffset.left + "px", top:cityOffset.top + cityObj.outerHeight() + "px"}).slideDown("fast");
+
+			$("body").bind("mousedown", onBodyDown);
+		}
+		function hideMenu() {
+			$("#menuContent").fadeOut("fast");
+			$("body").unbind("mousedown", onBodyDown);
+		}
+		function onBodyDown(event) {
+			if (!(event.target.id == "menuBtn" || event.target.id == "menuContent" || $(event.target).parents("#menuContent").length>0)) {
+				hideMenu();
+			}
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+	</style>
+ </HEAD>
+
+<BODY>
+<h1>下拉菜单</h1>
+<h6>[ 文件路径: super/select_menu.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul class="list">
+			<li class="title">&nbsp;&nbsp;<span class="highlight_red">选择城市时，按下 Ctrl 键可以进行多选</span></li>
+			<li class="title">&nbsp;&nbsp;城市：<input id="citySel" type="text" readonly value="" style="width:120px;"/>
+		&nbsp;<a id="menuBtn" href="#" onclick="showMenu(); return false;">选择</a></li>
+		</ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>实现方法说明</h2>
+				<ul class="list">
+				<li>用 zTree 实现这种下拉菜单，应该说是比较容易的，你只需要控制 zTree 所在容器的隐藏/显示，以及位置即可。</li>
+				<li class="highlight_red">zTree v3.x 实现了多点选中功能，因此对于需要多选的下拉菜单也易如反掌。</li>
+				<li class="highlight_red">利用 setting 的各项配置参数，完全可以满足大部分的功能需求。</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+
+<div id="menuContent" class="menuContent" style="display:none; position: absolute;">
+	<ul id="treeDemo" class="ztree" style="margin-top:0; width:160px;"></ul>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/super/select_menu_checkbox.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/super/select_menu_checkbox.html
new file mode 100644
index 0000000..529b01d
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/super/select_menu_checkbox.html
@@ -0,0 +1,126 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - checkbox select menu</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+<!--	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			check: {
+				enable: true,
+				chkboxType: {"Y":"", "N":""}
+			},
+			view: {
+				dblClickExpand: false
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeClick: beforeClick,
+				onCheck: onCheck
+			}
+		};
+
+		var zNodes =[
+			{id:1, pId:0, name:"北京"},
+			{id:2, pId:0, name:"天津"},
+			{id:3, pId:0, name:"上海"},
+			{id:6, pId:0, name:"重庆"},
+			{id:4, pId:0, name:"河北省", open:true, nocheck:true},
+			{id:41, pId:4, name:"石家庄"},
+			{id:42, pId:4, name:"保定"},
+			{id:43, pId:4, name:"邯郸"},
+			{id:44, pId:4, name:"承德"},
+			{id:5, pId:0, name:"广东省", open:true, nocheck:true},
+			{id:51, pId:5, name:"广州"},
+			{id:52, pId:5, name:"深圳"},
+			{id:53, pId:5, name:"东莞"},
+			{id:54, pId:5, name:"佛山"},
+			{id:6, pId:0, name:"福建省", open:true, nocheck:true},
+			{id:61, pId:6, name:"福州"},
+			{id:62, pId:6, name:"厦门"},
+			{id:63, pId:6, name:"泉州"},
+			{id:64, pId:6, name:"三明"}
+		 ];
+
+		function beforeClick(treeId, treeNode) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			zTree.checkNode(treeNode, !treeNode.checked, null, true);
+			return false;
+		}
+		
+		function onCheck(e, treeId, treeNode) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nodes = zTree.getCheckedNodes(true),
+			v = "";
+			for (var i=0, l=nodes.length; i<l; i++) {
+				v += nodes[i].name + ",";
+			}
+			if (v.length > 0 ) v = v.substring(0, v.length-1);
+			var cityObj = $("#citySel");
+			cityObj.attr("value", v);
+		}
+
+		function showMenu() {
+			var cityObj = $("#citySel");
+			var cityOffset = $("#citySel").offset();
+			$("#menuContent").css({left:cityOffset.left + "px", top:cityOffset.top + cityObj.outerHeight() + "px"}).slideDown("fast");
+
+			$("body").bind("mousedown", onBodyDown);
+		}
+		function hideMenu() {
+			$("#menuContent").fadeOut("fast");
+			$("body").unbind("mousedown", onBodyDown);
+		}
+		function onBodyDown(event) {
+			if (!(event.target.id == "menuBtn" || event.target.id == "citySel" || event.target.id == "menuContent" || $(event.target).parents("#menuContent").length>0)) {
+				hideMenu();
+			}
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+	</style>
+ </HEAD>
+
+<BODY>
+<h1>带 checkbox 的多选下拉菜单  -- zTree</h1>
+<h6>[ 文件路径: super/select_menu_checkbox.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul class="list">
+			<li class="title">&nbsp;&nbsp;<span class="highlight_red">勾选 checkbox 或者 点击节点 进行选择</span></li>
+			<li class="title">&nbsp;&nbsp;Test: <input id="citySel" type="text" readonly value="" style="width:120px;" onclick="showMenu();" />
+		&nbsp;<a id="menuBtn" href="#" onclick="showMenu(); return false;">select</a></li>
+		</ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>实现方法说明</h2>
+				<ul class="list">
+				<li>用 checkbox 也可以轻松实现多选的下拉菜单</li>
+				<li>此 Demo 主要用于 和 其他下拉菜单进行对比</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+
+<div id="menuContent" class="menuContent" style="display:none; position: absolute;">
+	<ul id="treeDemo" class="ztree" style="margin-top:0; width:180px; height: 300px;"></ul>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/super/select_menu_radio.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/super/select_menu_radio.html
new file mode 100644
index 0000000..cc1d439
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/super/select_menu_radio.html
@@ -0,0 +1,127 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - radio select menu</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+<!--	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			check: {
+				enable: true,
+				chkStyle: "radio",
+				radioType: "all"
+			},
+			view: {
+				dblClickExpand: false
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				onClick: onClick,
+				onCheck: onCheck
+			}
+		};
+
+		var zNodes =[
+			{id:1, pId:0, name:"北京"},
+			{id:2, pId:0, name:"天津"},
+			{id:3, pId:0, name:"上海"},
+			{id:6, pId:0, name:"重庆"},
+			{id:4, pId:0, name:"河北省", open:true, nocheck:true},
+			{id:41, pId:4, name:"石家庄"},
+			{id:42, pId:4, name:"保定"},
+			{id:43, pId:4, name:"邯郸"},
+			{id:44, pId:4, name:"承德"},
+			{id:5, pId:0, name:"广东省", open:true, nocheck:true},
+			{id:51, pId:5, name:"广州"},
+			{id:52, pId:5, name:"深圳"},
+			{id:53, pId:5, name:"东莞"},
+			{id:54, pId:5, name:"佛山"},
+			{id:6, pId:0, name:"福建省", open:true, nocheck:true},
+			{id:61, pId:6, name:"福州"},
+			{id:62, pId:6, name:"厦门"},
+			{id:63, pId:6, name:"泉州"},
+			{id:64, pId:6, name:"三明"}
+		 ];
+
+		function onClick(e, treeId, treeNode) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			zTree.checkNode(treeNode, !treeNode.checked, null, true);
+			return false;
+		}
+
+		function onCheck(e, treeId, treeNode) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nodes = zTree.getCheckedNodes(true),
+			v = "";
+			for (var i=0, l=nodes.length; i<l; i++) {
+				v += nodes[i].name + ",";
+			}
+			if (v.length > 0 ) v = v.substring(0, v.length-1);
+			var cityObj = $("#citySel");
+			cityObj.attr("value", v);
+		}
+
+		function showMenu() {
+			var cityObj = $("#citySel");
+			var cityOffset = $("#citySel").offset();
+			$("#menuContent").css({left:cityOffset.left + "px", top:cityOffset.top + cityObj.outerHeight() + "px"}).slideDown("fast");
+
+			$("body").bind("mousedown", onBodyDown);
+		}
+		function hideMenu() {
+			$("#menuContent").fadeOut("fast");
+			$("body").unbind("mousedown", onBodyDown);
+		}
+		function onBodyDown(event) {
+			if (!(event.target.id == "menuBtn" || event.target.id == "citySel" || event.target.id == "menuContent" || $(event.target).parents("#menuContent").length>0)) {
+				hideMenu();
+			}
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+	</style>
+ </HEAD>
+
+<BODY>
+<h1>带 radio 的单选下拉菜单  -- zTree</h1>
+<h6>[ 文件路径: super/select_menu_radio.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul class="list">
+			<li class="title">&nbsp;&nbsp;<span class="highlight_red">勾选 radio 或者 点击节点 进行选择</span></li>
+			<li class="title">&nbsp;&nbsp;Test: <input id="citySel" type="text" readonly value="" style="width:120px;" onclick="showMenu();" />
+		&nbsp;<a id="menuBtn" href="#" onclick="showMenu(); return false;">select</a></li>
+		</ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>实现方法说明</h2>
+				<ul class="list">
+				<li>用 radio 也可以轻松实现单选的下拉菜单</li>
+				<li>单选其实没有必要使用 radio, 此 Demo 主要用于 和 其他下拉菜单进行对比</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+
+<div id="menuContent" class="menuContent" style="display:none; position: absolute;">
+	<ul id="treeDemo" class="ztree" style="margin-top:0; width:180px; height: 300px;"></ul>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/super/singlepath.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/super/singlepath.html
new file mode 100644
index 0000000..90efb64
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/cn/super/singlepath.html
@@ -0,0 +1,150 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - single path</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				dblClickExpand: false,
+				showLine: false
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeExpand: beforeExpand,
+				onExpand: onExpand,
+				onClick: onClick
+			}
+		};
+		
+		function createNodes(maxNodesNumInLevel, maxLevel, curLevel, curPId) {
+			if (maxNodesNumInLevel<5) {
+				maxNodesNumInLevel = 5;
+			}
+			var nodes = [], num = 0;
+			while(num<3) {
+				num = parseInt(Math.random()*1024)%maxNodesNumInLevel+1;
+			}
+			for (var i=0; i<num; i++) {
+				var id = curPId ? curPId + "-" + i : "" + i, isParent = (parseInt(Math.random()*9999)%3!=0),
+				node = {id: id, pId : curPId, name : "N" + id};
+				nodes.push(node);
+				if (isParent && curLevel<maxLevel) {
+					nodes = nodes.concat(createNodes(maxNodesNumInLevel, maxLevel, curLevel+1, id));
+				}
+			}
+			return nodes;
+		}
+		var zNodes =createNodes(5, 5, 0);
+
+		var curExpandNode = null;
+		function beforeExpand(treeId, treeNode) {
+			var pNode = curExpandNode ? curExpandNode.getParentNode():null;
+			var treeNodeP = treeNode.parentTId ? treeNode.getParentNode():null;
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			for(var i=0, l=!treeNodeP ? 0:treeNodeP.children.length; i<l; i++ ) {
+				if (treeNode !== treeNodeP.children[i]) {
+					zTree.expandNode(treeNodeP.children[i], false);
+				}
+			}
+			while (pNode) {
+				if (pNode === treeNode) {
+					break;
+				}
+				pNode = pNode.getParentNode();
+			}
+			if (!pNode) {
+				singlePath(treeNode);
+			}
+
+		}
+		function singlePath(newNode) {
+			if (newNode === curExpandNode) return;
+			if (curExpandNode && curExpandNode.open==true) {
+				var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+				if (newNode.parentTId === curExpandNode.parentTId) {
+					zTree.expandNode(curExpandNode, false);
+				} else {
+					var newParents = [];
+					while (newNode) {
+						newNode = newNode.getParentNode();
+						if (newNode === curExpandNode) {
+							newParents = null;
+							break;
+						} else if (newNode) {
+							newParents.push(newNode);
+						}
+					}
+					if (newParents!=null) {
+						var oldNode = curExpandNode;
+						var oldParents = [];
+						while (oldNode) {
+							oldNode = oldNode.getParentNode();
+							if (oldNode) {
+								oldParents.push(oldNode);
+							}
+						}
+						if (newParents.length>0) {
+							zTree.expandNode(oldParents[Math.abs(oldParents.length-newParents.length)-1], false);
+						} else {
+							zTree.expandNode(oldParents[oldParents.length-1], false);
+						}
+					}
+				}
+			}
+			curExpandNode = newNode;
+		}
+
+		function onExpand(event, treeId, treeNode) {
+			curExpandNode = treeNode;
+		}
+
+		function onClick(e,treeId, treeNode) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			zTree.expandNode(treeNode, null, null, null, true);
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+.ztree li button.switch {visibility:hidden; width:1px;}
+.ztree li button.switch.roots_docu {visibility:visible; width:16px;}
+.ztree li button.switch.center_docu {visibility:visible; width:16px;}
+.ztree li button.switch.bottom_docu {visibility:visible; width:16px;}
+	</style>
+ </HEAD>
+
+<BODY>
+<h1>保持展开单一路径</h1>
+<h6>[ 文件路径: super/singlepath.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>实现方法说明</h2>
+				<ul class="list">
+				<li>此 Demo 是在 "单击展开/折叠节点" 基础上改造而来，树节点保持始终只展开一条路径。</li>
+				<li class="highlight_red">利用 setting.callback.beforeExpand / onExpand 事件回调函数实现展开规则</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/asyncData/getNodes.php b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/asyncData/getNodes.php
new file mode 100644
index 0000000..3294d9a
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/asyncData/getNodes.php
@@ -0,0 +1,38 @@
+<?php ?>
+[<?php
+$pId = "0";
+$pName = "";
+$pLevel = "";
+$pCheck = "";
+if(array_key_exists( 'id',$_REQUEST)) {
+	$pId=$_REQUEST['id'];
+}
+if(array_key_exists( 'lv',$_REQUEST)) {
+	$pLevel=$_REQUEST['lv'];
+}
+if(array_key_exists('n',$_REQUEST)) {
+	$pName=$_REQUEST['n'];
+}
+if(array_key_exists('chk',$_REQUEST)) {
+	$pCheck=$_REQUEST['chk'];
+}
+if ($pId==null || $pId=="") $pId = "0";
+if ($pLevel==null || $pLevel=="") $pLevel = "0";
+if ($pName==null) $pName = "";
+else $pName = $pName.".";
+
+//for ($i=1; $i<9999; $i++) {
+//	for ($j=1; $j<999; $j++) {
+//
+//	}
+//}
+
+for ($i=1; $i<5; $i++) {
+	$nId = $pId.$i;
+	$nName = $pName."n".$i;
+	echo "{ id:'".$nId."',	name:'".$nName."',	isParent:".(( $pLevel < "2" && ($i%2)!=0)?"true":"false").($pCheck==""?"":((($pLevel < "2" && ($i%2)!=0)?", halfCheck:true":"").($i==3?", checked:true":"")))."}";
+	if ($i<4) {
+		echo ",";
+	}
+}
+?>]
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/asyncData/getNodesForBigData.php b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/asyncData/getNodesForBigData.php
new file mode 100644
index 0000000..91d002e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/asyncData/getNodesForBigData.php
@@ -0,0 +1,24 @@
+<?php ?>
+[<?php
+$pId = "-1";
+if(array_key_exists( 'id',$_REQUEST)) {
+	$pId=$_REQUEST['id'];
+}
+$pCount = "10";
+if(array_key_exists( 'count',$_REQUEST)) {
+	$pCount=$_REQUEST['count'];
+}
+if ($pId==null || $pId=="") $pId = "0";
+if ($pCount==null || $pCount=="") $pCount = "10";
+
+$max = (int)$pCount;
+for ($i=1; $i<=$max; $i++) {
+	$nId = $pId."_".$i;
+	$nName = "tree".$nId;
+	echo "{ id:'".$nId."',	name:'".$nName."'}";
+	if ($i<$max) {
+		echo ",";
+	}
+	
+}
+?>]
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/bigdata/common.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/bigdata/common.html
new file mode 100644
index 0000000..6e1728d
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/bigdata/common.html
@@ -0,0 +1,190 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - big data common</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			check: {
+				enable: true
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				onNodeCreated: onNodeCreated
+			}
+		};
+
+		var dataMaker = function(count) {
+			var nodes = [], pId = -1,
+			min = 10, max = 90, level = 0, curLevel = [], prevLevel = [], levelCount,
+			i = 0,j,k,l,m;
+
+			while (i<count) {
+				if (level == 0) {
+					pId = -1;
+					levelCount = Math.round(Math.random() * max) + min;
+					for (j=0; j<levelCount && i<count; j++, i++) {
+						var n = {id:i, pId:pId, name:"Big-" +i};
+						nodes.push(n);
+						curLevel.push(n);
+					}
+				} else {
+					for (l=0, m=prevLevel.length; l<m && i<count; l++) {
+						pId = prevLevel[l].id;
+						levelCount = Math.round(Math.random() * max) + min;
+						for (j=0; j<levelCount && i<count; j++, i++) {
+							var n = {id:i, pId:pId, name:"Big-" +i};
+							nodes.push(n);
+							curLevel.push(n);
+						}
+					}
+				}
+				prevLevel = curLevel;
+				curLevel = [];
+				level++;
+			}
+			return nodes;
+		}
+
+		var ruler = {
+			doc: null,
+			ruler: null,
+			cursor: null,
+			minCount: 5000,
+			count: 5000,
+			stepCount:500,
+			minWidth: 30,
+			maxWidth: 215,
+			init: function() {
+				ruler.doc = $(document);
+				ruler.ruler = $("#ruler");
+				ruler.cursor = $("#cursor");
+				if (ruler.ruler) {
+					ruler.ruler.bind("mousedown", ruler.onMouseDown);
+					
+				}
+			},
+			onMouseDown: function(e) {
+				ruler.drawRuler(e, true);
+				ruler.doc.bind("mousemove", ruler.onMouseMove);
+				ruler.doc.bind("mouseup", ruler.onMouseUp);
+				ruler.doc.bind("selectstart", ruler.onSelect);
+				$("body").css("cursor", "pointer");
+			},
+			onMouseMove: function(e) {
+				ruler.drawRuler(e);
+				return false;
+			},
+			onMouseUp: function(e) {
+				$("body").css("cursor", "auto");
+				ruler.doc.unbind("mousemove", ruler.onMouseMove);
+				ruler.doc.unbind("mouseup", ruler.onMouseUp);
+				ruler.doc.unbind("selectstart", ruler.onSelect);
+				ruler.drawRuler(e);
+			},
+			onSelect: function (e) {
+				return false;
+			},
+			getCount: function(end) {
+				var start = ruler.ruler.offset().left+1;
+				var c = Math.max((end - start), ruler.minWidth);
+				c = Math.min(c, ruler.maxWidth);
+				return {width:c, count:(c - ruler.minWidth)*ruler.stepCount + ruler.minCount};
+			},
+			drawRuler: function(e, animate) {
+				var c = ruler.getCount(e.clientX);
+				ruler.cursor.stop();
+				if ($.browser.msie || !animate) {
+					ruler.cursor.css({width:c.width});
+				} else {
+					ruler.cursor.animate({width:c.width}, {duration: "fast",easing: "swing", complete:null});
+				}
+				ruler.count = c.count;
+				ruler.cursor.text(c.count);
+			}
+		}
+		var showNodeCount = 0;
+		function onNodeCreated(event, treeId, treeNode) {
+			showNodeCount++;
+		}
+
+		function createTree () {
+			var zNodes = dataMaker(ruler.count);
+			showNodeCount = 0;
+			$("#treeDemo").empty();
+			setting.check.enable = $("#showChk").attr("checked");
+			var time1 = new Date();
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			var time2 = new Date();
+
+			alert(" " + zNodes.length + " nodes are initialized, " + showNodeCount + " nodes generate the DOM object."
+				+ "\n\n Initialization zTree total time: " + (time2.getTime() - time1.getTime()) + " ms");
+		}
+
+
+		$(document).ready(function(){
+			ruler.init("ruler");
+			$("#createTree").bind("click", createTree);
+
+		});
+		//-->
+	</SCRIPT>
+ </HEAD>
+
+<BODY>
+<h1>One-time Large Data Loading</h1>
+<h6>[ File Path: bigdata/common.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul>
+		<li><span>Adjust the total number of nodes to the test load speed: </span>
+			<div id="ruler" class="ruler" title="can drag to adjust the number of nodes">
+				<div id="cursor" class="cursor">5000</div>
+			</div>
+			<div style="width:220px; text-align: center;">
+				<span>checkbox</span><input type="checkbox" id="showChk" title="whether to display checkbox" class="checkbox first" />&nbsp;&nbsp;&nbsp;&nbsp;
+				[ <a id="createTree" href="#" title="Initialize zTree" onclick="return false;">Initialize zTree</a> ]
+			</div>
+		</li>
+		</ul>
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of large data load</h2>
+				<ul class="list">
+				<li>1) zTree v3.x optimized for one-time large data loading capacity, using a lazy loading technique, which does not expand the node does not create child nodes of the DOM.</li>
+				<li class="highlight_red">2) If a maximum of 100 nodes each, but a total number of several thousand or even tens of thousands of nodes, and the parent node is collapsed by default to optimize the most obvious effect, very fast.</li>
+				<li class="highlight_red">3) For the next level there are thousands of sub-node case, the optimization of lazy loading is invalid, proposal to consider asynchronous page loading.</li>
+				<li class="highlight_red">4) if you set the data to all the parent nodes are expanded, the optimization  of lazy loading is invalid, proposal to not expand all parent node when you initialize zTree.</li>
+				<li>5) set the display checkbox / radio will affect some of the performance.</li>
+				<li>6) DOM generated using addDiyDom function will affect the speed, the number of nodes determines the number of impact situations.</li>
+				<li>7) Using 'onNodeCreated' callback function to manipulate nodes object will affect the speed, the degree of influence determined by the number of nodes.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of setting</h2>
+				<ul class="list">
+				<li>No special configuration.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3, Explanation of treeNode</h2>
+				<ul class="list">
+				<li>No special requirements on the node data, the user can add custom attributes.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/bigdata/diy_async.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/bigdata/diy_async.html
new file mode 100644
index 0000000..13e43aa
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/bigdata/diy_async.html
@@ -0,0 +1,157 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - big data async</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			async: {
+				enable: true,
+				url: getUrl
+			},
+			check: {
+				enable: true
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			view: {
+				expandSpeed: ""
+			},
+			callback: {
+				beforeExpand: beforeExpand,
+				onAsyncSuccess: onAsyncSuccess,
+				onAsyncError: onAsyncError
+			}
+		};
+
+		var zNodes =[
+			{name:"500 nodes", id:"1", count:500, times:1, isParent:true},
+			{name:"1000 nodes", id:"2", count:1000, times:1, isParent:true},
+			{name:"2000 nodes", id:"3", count:2000, times:1, isParent:true}
+		];
+
+		var log, className = "dark",
+		startTime = 0, endTime = 0, perCount = 100, perTime = 100;
+		function getUrl(treeId, treeNode) {
+			var curCount = (treeNode.children) ? treeNode.children.length : 0;
+			var getCount = (curCount + perCount) > treeNode.count ? (treeNode.count - curCount) : perCount;
+			var param = "id="+treeNode.id+"_"+(treeNode.times++) +"&count="+getCount;
+			return "../asyncData/getNodesForBigData.php?" + param;
+		}
+		function beforeExpand(treeId, treeNode) {
+			if (!treeNode.isAjaxing) {
+				startTime = new Date();
+				treeNode.times = 1;
+				ajaxGetNodes(treeNode, "refresh");
+				return true;
+			} else {
+				alert("Downloading data, Please wait to expand node...");
+				return false;
+			}
+		}
+		function onAsyncSuccess(event, treeId, treeNode, msg) {
+			if (!msg || msg.length == 0) {
+				return;
+			}
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			totalCount = treeNode.count;
+			if (treeNode.children.length < totalCount) {
+				setTimeout(function() {ajaxGetNodes(treeNode);}, perTime);
+			} else {
+				treeNode.icon = "";
+				zTree.updateNode(treeNode);
+				zTree.selectNode(treeNode.children[0]);
+				endTime = new Date();
+				var usedTime = (endTime.getTime() - startTime.getTime())/1000;
+				className = (className === "dark" ? "":"dark");
+				showLog("[ "+getTime()+" ]&nbsp;&nbsp;treeNode:" + treeNode.name );
+				showLog("Child node has finished loading, a total of "+ (treeNode.times-1) +" times the asynchronous load, elapsed time: "+ usedTime + " seconds ");
+			}
+		}
+		function onAsyncError(event, treeId, treeNode, XMLHttpRequest, textStatus, errorThrown) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			alert("ajax error...");
+			treeNode.icon = "";
+			zTree.updateNode(treeNode);
+		}
+		function ajaxGetNodes(treeNode, reloadType) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			if (reloadType == "refresh") {
+				treeNode.icon = "../../../css/zTreeStyle/img/loading.gif";
+				zTree.updateNode(treeNode);
+			}
+			zTree.reAsyncChildNodes(treeNode, reloadType, true);
+		}
+		function showLog(str) {
+			if (!log) log = $("#log");
+			log.append("<li class='"+className+"'>"+str+"</li>");
+			if(log.children("li").length > 4) {
+				log.get(0).removeChild(log.children("li")[0]);
+			}
+		}
+		function getTime() {
+			var now= new Date(),
+			h=now.getHours(),
+			m=now.getMinutes(),
+			s=now.getSeconds(),
+			ms=now.getMilliseconds();
+			return (h+":"+m+":"+s+ " " +ms);
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+
+		});
+		//-->
+	</SCRIPT>
+ </HEAD>
+
+<BODY>
+<h1>Loading Data in Batches</h1>
+<h6>[ File Path: bigdata/diy_async.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul>
+			<li class="highlight_red">&nbsp;&nbsp;&nbsp;&nbsp;Demo for testing load data in batches, each node needs to re-start to load.</li>
+		</ul>
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of large data load</h2>
+				<ul class="list">
+				<li>1) If has nodes for as many as thousands in one level, lazy loading is invalid, this demo shows how to load data in batches.</li>
+				<li class="highlight_red">2) This method applies to thousands of nodes must all display needs.</li>
+				<li class="highlight_red">3) This method doesn't solve the problem of slow loading, it will only make the final result appear more slowly, but can be limited to avoid browser suspended animation, and more nodes displayed slower.</li>
+				<li>4) For at least several thousand nodes in one level case, another solution is to: pagination loading.<br/>
+					async load log:<br/>
+					<ul id="log" class="log" style="height:85px"></ul></li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of setting</h2>
+				<ul class="list">
+				<li>Need to set the parameters in setting.async</li>
+				<li>Advised to turn off animation effects: setting.view.expandSpeed = "";</li>
+				<li>No other special configuration, the user can set their own requirements.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3, Explanation of treeNode</h2>
+				<ul class="list">
+				<li>No special requirements on the node data, the user can add custom attributes.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/bigdata/page.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/bigdata/page.html
new file mode 100644
index 0000000..f8a4963
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/bigdata/page.html
@@ -0,0 +1,150 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - big data page</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			async: {
+				enable: true,
+				url: getUrl
+			},
+			check: {
+				enable: true
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			view: {
+				addDiyDom: addDiyDom
+			},
+			callback: {
+				beforeExpand: beforeExpand,
+				onAsyncSuccess: onAsyncSuccess,
+				onAsyncError: onAsyncError
+			}
+		};
+
+		var zNodes =[
+			{name:"page test", t:"Please click the paging buttons.", id:"1", count:2000, page:0, pageSize:100, isParent:true}
+		];
+		var curPage = 0;
+		function getUrl(treeId, treeNode) {
+			var param = "id="+ treeNode.id +"_"+treeNode.page +"&count="+treeNode.pageSize,
+			aObj = $("#" + treeNode.tId + "_a");
+			aObj.attr("title", "Page " + treeNode.page + " / " + treeNode.maxPage + "")
+			return "../asyncData/getNodesForBigData.php?" + param;
+		}
+		function goPage(treeNode, page) {
+			treeNode.page = page;
+			if (treeNode.page<1) treeNode.page = 1;
+			if (treeNode.page>treeNode.maxPage) treeNode.page = treeNode.maxPage;
+			if (curPage == treeNode.page) return;
+			curPage = treeNode.page;
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			zTree.reAsyncChildNodes(treeNode, "refresh");
+		}
+		function beforeExpand(treeId, treeNode) {
+			if (treeNode.page == 0) treeNode.page = 1;
+			return !treeNode.isAjaxing;
+		}
+		function onAsyncSuccess(event, treeId, treeNode, msg) {
+			
+		}
+		function onAsyncError(event, treeId, treeNode, XMLHttpRequest, textStatus, errorThrown) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			alert("ajax error...");
+			treeNode.icon = "";
+			zTree.updateNode(treeNode);
+		}
+		function addDiyDom(treeId, treeNode) {
+			if (treeNode.level>0) return;
+			var aObj = $("#" + treeNode.tId + "_a");
+			if ($("#addBtn_"+treeNode.id).length>0) return;
+			var addStr = "<span class='button lastPage' id='lastBtn_" + treeNode.id
+				+ "' title='last page' onfocus='this.blur();'></span><span class='button nextPage' id='nextBtn_" + treeNode.id
+				+ "' title='next page' onfocus='this.blur();'></span><span class='button prevPage' id='prevBtn_" + treeNode.id
+				+ "' title='prev page' onfocus='this.blur();'></span><span class='button firstPage' id='firstBtn_" + treeNode.id
+				+ "' title='first page' onfocus='this.blur();'></span>";
+			aObj.after(addStr);
+			var first = $("#firstBtn_"+treeNode.id);
+			var prev = $("#prevBtn_"+treeNode.id);
+			var next = $("#nextBtn_"+treeNode.id);
+			var last = $("#lastBtn_"+treeNode.id);
+			treeNode.maxPage = Math.round(treeNode.count/treeNode.pageSize - .5) + (treeNode.count%treeNode.pageSize == 0 ? 0:1);
+			first.bind("click", function(){
+				if (!treeNode.isAjaxing) {
+					goPage(treeNode, 1);
+				}
+			});
+			last.bind("click", function(){
+				if (!treeNode.isAjaxing) {
+					goPage(treeNode, treeNode.maxPage);
+				}
+			});
+			prev.bind("click", function(){
+				if (!treeNode.isAjaxing) {
+					goPage(treeNode, treeNode.page-1);
+				}
+			});
+			next.bind("click", function(){
+				if (!treeNode.isAjaxing) {
+					goPage(treeNode, treeNode.page+1);
+				}
+			});
+		};
+		
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+.ztree li span.button.firstPage {float:right; margin-left:2px; margin-right: 0; background-position:-144px -16px; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.prevPage {float:right; margin-left:2px; margin-right: 0; background-position:-144px -48px; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.nextPage {float:right; margin-left:2px; margin-right: 0; background-position:-144px -64px; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.lastPage {float:right; margin-left:2px; margin-right: 0; background-position:-144px -32px; vertical-align:top; *vertical-align:middle}
+	</style>
+ </HEAD>
+
+<BODY>
+<h1>Loading Data By Pagination</h1>
+<h6>[ File Path: bigdata/page.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of large data load</h2>
+				<ul class="list">
+				<li>1) Pagination can be an effective solution to the large number of child nodes of the situation.</li>
+				<li>2) Using custom method to display the pagination button.</li>
+				<li class="highlight_red">3) Pagination lead to the association  of checkbox can not be achieved, only correction after show each page . Because of the time limitation, Demo does not deal with association of checkbox.</li>
+				<li class="highlight_red">4) The use of pagination, you can only get the current page node data from zTree. You can save the data after each page loading as the cache, according to the demand to determine the specific methods.</li>
+			</li>
+			<li class="title"><h2>2, Explanation of setting</h2>
+				<ul class="list">
+				<li>Need to set the parameters in setting.async</li>
+				<li>No other special configuration, the user can set their own requirements.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3, Explanation of treeNode</h2>
+				<ul class="list">
+				<li>No special requirements on the node data, the user can add custom attributes.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/core/async.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/core/async.html
new file mode 100644
index 0000000..9668fe6
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/core/async.html
@@ -0,0 +1,70 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - Async</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			async: {
+				enable: true,
+				url:"../asyncData/getNodes.php",
+				autoParam:["id", "name=n", "level=lv"],
+				otherParam:{"otherParam":"zTreeAsyncTest"},
+				dataFilter: filter
+			}
+		};
+
+		function filter(treeId, parentNode, childNodes) {
+			if (!childNodes) return null;
+			for (var i=0, l=childNodes.length; i<l; i++) {
+				childNodes[i].name = childNodes[i].name.replace(/\.n/g, '.');
+			}
+			return childNodes;
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Dynamic Tree with Ajax</h1>
+<h6>[ File Path: core/async.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of setting</h2>
+				<ul class="list">
+				<li class="highlight_red">For create dynamic tree with ajax,  you need to set attributes in setting.async, see the API documentation for more related contents.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of treeNode</h2>
+				<ul class="list">
+				<li>Dynamic tree with ajax doesn't need to make special treeNode node data, if use simple JSON data model, please set the attributes in setting.data.simple.</li>
+				<li>If ajax only to return node data in single level, you don't need to use simple JSON data model.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、Other explanation</h2>
+				<ul class="list">
+				<li class="highlight_red">Monitoring autoParam and otherParam use firebug or the developer tools in browser.</li>
+				<li class="highlight_red">This Demo only loading 4 level nodes (level = 3).</li>
+				<li class="highlight_red">This Demo use 'dataFilter' to modify the name of the node.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/core/async_fun.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/core/async_fun.html
new file mode 100644
index 0000000..37aea06
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/core/async_fun.html
@@ -0,0 +1,144 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - reAsyncChildNodes</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				selectedMulti: false
+			},
+			async: {
+				enable: true,
+				url:"../asyncData/getNodes.php",
+				autoParam:["id", "name=n", "level=lv"],
+				otherParam:{"otherParam":"zTreeAsyncTest"},
+				dataFilter: filter
+			},
+			callback: {
+				beforeClick: beforeClick,
+				beforeAsync: beforeAsync,
+				onAsyncError: onAsyncError,
+				onAsyncSuccess: onAsyncSuccess
+			}
+		};
+
+		function filter(treeId, parentNode, childNodes) {
+			if (!childNodes) return null;
+			for (var i=0, l=childNodes.length; i<l; i++) {
+				childNodes[i].name = childNodes[i].name.replace(/\.n/g, '.');
+			}
+			return childNodes;
+		}
+		function beforeClick(treeId, treeNode) {
+			if (!treeNode.isParent) {
+				alert("Please select one parent node...");
+				return false;
+			} else {
+				return true;
+			}
+		}
+		var log, className = "dark";
+		function beforeAsync(treeId, treeNode) {
+			className = (className === "dark" ? "":"dark");
+			showLog("[ "+getTime()+" beforeAsync ]&nbsp;&nbsp;&nbsp;&nbsp;" + ((!!treeNode && !!treeNode.name) ? treeNode.name : "root") );
+			return true;
+		}
+		function onAsyncError(event, treeId, treeNode, XMLHttpRequest, textStatus, errorThrown) {
+			showLog("[ "+getTime()+" onAsyncError ]&nbsp;&nbsp;&nbsp;&nbsp;" + ((!!treeNode && !!treeNode.name) ? treeNode.name : "root") );
+		}
+		function onAsyncSuccess(event, treeId, treeNode, msg) {
+			showLog("[ "+getTime()+" onAsyncSuccess ]&nbsp;&nbsp;&nbsp;&nbsp;" + ((!!treeNode && !!treeNode.name) ? treeNode.name : "root") );
+		}
+
+		function showLog(str) {
+			if (!log) log = $("#log");
+			log.append("<li class='"+className+"'>"+str+"</li>");
+			if(log.children("li").length > 8) {
+				log.get(0).removeChild(log.children("li")[0]);
+			}
+		}
+		function getTime() {
+			var now= new Date(),
+			h=now.getHours(),
+			m=now.getMinutes(),
+			s=now.getSeconds(),
+			ms=now.getMilliseconds();
+			return (h+":"+m+":"+s+ " " +ms);
+		}
+		
+		function refreshNode(e) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			type = e.data.type,
+			silent = e.data.silent,
+			nodes = zTree.getSelectedNodes();
+			if (nodes.length == 0) {
+				alert("Please select one parent node at first...");
+			}
+			for (var i=0, l=nodes.length; i<l; i++) {
+				zTree.reAsyncChildNodes(nodes[i], type, silent);
+				if (!silent) zTree.selectNode(nodes[i]);
+			}
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting);
+			$("#refreshNode").bind("click", {type:"refresh", silent:false}, refreshNode);
+			$("#refreshNodeSilent").bind("click", {type:"refresh", silent:true}, refreshNode);
+			$("#addNode").bind("click", {type:"add", silent:false}, refreshNode);
+			$("#addNodeSilent").bind("click", {type:"add", silent:true}, refreshNode);
+		});
+		//-->
+	</SCRIPT>
+
+</HEAD>
+
+<BODY>
+<h1>Dynamic Tree - zTree methods</h1>
+<h6>[ File Path: core/async_fun.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of reAsyncChildNodes</h2>
+				<ul class="list">
+				<li class="highlight_red">How to use zTreeObj.reAsyncChildNodes method,  please see the API documentation.</li>
+				<li><p>This Demo can only select one parent node<br/>
+					Try: [ <a id="refreshNode" href="#" onclick="return false;">reload</a> ]&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="addNode" href="#" onclick="return false;">append</a> ]</p>
+				</li>
+				<li><p><span class="highlight_red">'isSilent' parameter is only for the collapsed state of the parent node.</span><br/>
+					Try: [ <a id="refreshNodeSilent" href="#" onclick="return false;">Quietly reloaded</a> ]&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="addNodeSilent" href="#" onclick="return false;">Quietly append</a> ]<br/>
+					async log:<br/>
+					<ul id="log" class="log"></ul></p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of setting</h2>
+				<ul class="list">
+				<li class="highlight_red">For useing reAsyncChildNodes method,  you need to set attributes in setting.async, see the API documentation for more related contents.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3, Explanation of treeNode</h2>
+				<ul class="list">
+				<li>Same as 'Dynamic Tree with Ajax'</li>
+				</ul>
+			</li>
+			<li class="title"><h2>4、Other explanation</h2>
+				<ul class="list">
+				<li>Same as 'Dynamic Tree with Ajax'</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/core/click.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/core/click.html
new file mode 100644
index 0000000..4f0fa80
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/core/click.html
@@ -0,0 +1,107 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - beforeClick / onClick</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			data: {
+				key: {
+					title:"t"
+				},
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeClick: beforeClick,
+				onClick: onClick
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"ordinary parent", t:"I am ordinary, just click on me", open:true},
+			{ id:11, pId:1, name:"leaf node 1-1", t:"I am ordinary, just click on me"},
+			{ id:12, pId:1, name:"leaf node 1-2", t:"I am ordinary, just click on me"},
+			{ id:13, pId:1, name:"leaf node 1-3", t:"I am ordinary, just click on me"},
+			{ id:2, pId:0, name:"strong parent", t:"You can click on me, but you can not click on the sub-node!", open:true},
+			{ id:21, pId:2, name:"leaf node 2-1", t:"You can't click on me..", click:false},
+			{ id:22, pId:2, name:"leaf node 2-2", t:"You can't click on me..", click:false},
+			{ id:23, pId:2, name:"leaf node 2-3", t:"You can't click on me..", click:false},
+			{ id:3, pId:0, name:"weak parent", t:"You can't click on me, but you can click on the sub-node!", open:true, click:false },
+			{ id:31, pId:3, name:"leaf node 3-1", t:"please click on me.."},
+			{ id:32, pId:3, name:"leaf node 3-2", t:"please click on me.."},
+			{ id:33, pId:3, name:"leaf node 3-3", t:"please click on me.."}
+		];
+
+		var log, className = "dark";
+		function beforeClick(treeId, treeNode, clickFlag) {
+			className = (className === "dark" ? "":"dark");
+			showLog("[ "+getTime()+" beforeClick ]&nbsp;&nbsp;" + treeNode.name );
+			return (treeNode.click != false);
+		}
+		function onClick(event, treeId, treeNode, clickFlag) {
+			showLog("[ "+getTime()+" onClick ]&nbsp;&nbsp;clickFlag = " + clickFlag + " (" + (clickFlag===1 ? "single selected": (clickFlag===0 ? "<b>cancel selected</b>" : "<b>multi selected</b>")) + ")");
+		}		
+		function showLog(str) {
+			if (!log) log = $("#log");
+			log.append("<li class='"+className+"'>"+str+"</li>");
+			if(log.children("li").length > 8) {
+				log.get(0).removeChild(log.children("li")[0]);
+			}
+		}
+		function getTime() {
+			var now= new Date(),
+			h=now.getHours(),
+			m=now.getMinutes(),
+			s=now.getSeconds();
+			return (h+":"+m+":"+s);
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Control of Click Node</h1>
+<h6>[ File Path: core/click.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, 'beforeClick / onClick' callback function</h2>
+				<ul class="list">
+				<li>Use 'beforeClick / onClick' callback function can be achieved with the click on the various functions. This simple demo shows how to monitor the click event.</li>
+				<li><p><span class="highlight_red">Try pressing the <b>Ctrl</b> key for multi-node selection and deselection.</span><br/>
+					click log:<br/>
+					<ul id="log" class="log"></ul></p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of setting</h2>
+				<ul class="list">
+				<li class="highlight_red">You need to set attributes about setting.callback.beforeClick and setting.callback.onClick, see the API documentation for more related contents.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3, Explanation of treeNode</h2>
+				<ul class="list">
+				<li>No special requirements on the node data, the user can add custom attributes.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/core/custom_font.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/core/custom_font.html
new file mode 100644
index 0000000..e00253b
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/core/custom_font.html
@@ -0,0 +1,67 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - Custom Font</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				fontCss: getFont,
+				nameIsHTML: true
+			}
+		};
+
+		var zNodes =[
+			{ name:"Bold", font:{'font-weight':'bold'} },
+			{ name:"Italic", font:{'font-style':'italic'}},
+			{ name:"Background-color", font:{'background-color':'black', 'color':'white'}},
+			{ name:"Red Font", font:{'color':'red'}},
+			{ name:"Blue Font", font:{'color':'blue'}},
+			{ name:"<span style='color:blue;margin-right:0px;'>view</span>.<span style='color:red;margin-right:0px;'>nameIsHTML</span>"},
+			{ name:"zTree Default"}
+		];
+
+		function getFont(treeId, node) {
+			return node.font ? node.font : {};
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Custom Fonts</h1>
+<h6>[ File Path: core/custom_font.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of setting</h2>
+				<ul class="list">
+				<li class="highlight_red">1. For display custom fonts,  you need to set setting.view.fontCss attribute, see the API documentation for more related contents.</li>
+				<li class="highlight_red">2. If you need the node name support the HTML, please set the 'setting.view.nameIsHTML' attribute, see the API documentation for more related contents.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of treeNode</h2>
+				<ul class="list">
+				<li>Set the font does not require to special node data , but if used to differentiate between different types of nodes, the corresponding data can set custom attributes.</li>
+				<li>The css style of data stored in the nodes within this demo</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/core/custom_icon.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/core/custom_icon.html
new file mode 100644
index 0000000..17084e5
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/core/custom_icon.html
@@ -0,0 +1,74 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - Custom Icon </TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			data: {
+				simpleData: {
+					enable: true
+				}
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"Custom Icon 01", open:true, iconOpen:"../../../css/zTreeStyle/img/diy/1_open.png", iconClose:"../../../css/zTreeStyle/img/diy/1_close.png"},
+			{ id:11, pId:1, name:"leaf node 01", icon:"../../../css/zTreeStyle/img/diy/2.png"},
+			{ id:12, pId:1, name:"leaf node 02", icon:"../../../css/zTreeStyle/img/diy/3.png"},
+			{ id:13, pId:1, name:"leaf node 03", icon:"../../../css/zTreeStyle/img/diy/5.png"},
+			{ id:2, pId:0, name:"Custom Icon 02", open:true, icon:"../../../css/zTreeStyle/img/diy/4.png"},
+			{ id:21, pId:2, name:"leaf node 01", icon:"../../../css/zTreeStyle/img/diy/6.png"},
+			{ id:22, pId:2, name:"leaf node 02", icon:"../../../css/zTreeStyle/img/diy/7.png"},
+			{ id:23, pId:2, name:"leaf node 03", icon:"../../../css/zTreeStyle/img/diy/8.png"},
+			{ id:3, pId:0, name:"no Custom Icon", open:true },
+			{ id:31, pId:3, name:"leaf node 01"},
+			{ id:32, pId:3, name:"leaf node 02"},
+			{ id:33, pId:3, name:"leaf node 03"}
+
+		];
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Custom Icon - icon</h1>
+<h6>[ File Path: core/custom_icon.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of setting</h2>
+				<ul class="list">
+				<li>Custom icon does not require special configuration setting.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of treeNode</h2>
+				<ul class="list">
+				<li>Use node data’s icon / iconOpen / iconClose attribute show custom icon.</li>
+				<li class="highlight_red">See the API documentation for more related contents.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、Other explanation</h2>
+				<ul class="list">
+				<li class="highlight_red">Because of the time limitation, demo uses png images, if you need transparent images in IE6 browser, make a gif image, or use a special 'css filter' on ie6 browser.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/core/custom_iconSkin.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/core/custom_iconSkin.html
new file mode 100644
index 0000000..3e09930
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/core/custom_iconSkin.html
@@ -0,0 +1,85 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - Custom Icon Skin </TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			data: {
+				simpleData: {
+					enable: true
+				}
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"Custom Icon 01", open:true, iconSkin:"pIcon01"},
+			{ id:11, pId:1, name:"leaf node 01", iconSkin:"icon01"},
+			{ id:12, pId:1, name:"leaf node 02", iconSkin:"icon02"},
+			{ id:13, pId:1, name:"leaf node 03", iconSkin:"icon03"},
+			{ id:2, pId:0, name:"Custom Icon 02", open:true, iconSkin:"pIcon02"},
+			{ id:21, pId:2, name:"leaf node 01", iconSkin:"icon04"},
+			{ id:22, pId:2, name:"leaf node 02", iconSkin:"icon05"},
+			{ id:23, pId:2, name:"leaf node 03", iconSkin:"icon06"},
+			{ id:3, pId:0, name:"no Custom Icon", open:true },
+			{ id:31, pId:3, name:"leaf node 01"},
+			{ id:32, pId:3, name:"leaf node 02"},
+			{ id:33, pId:3, name:"leaf node 03"}
+
+		];
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+.ztree li span.button.pIcon01_ico_open{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/1_open.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.pIcon01_ico_close{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/1_close.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.pIcon02_ico_open, .ztree li span.button.pIcon02_ico_close{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/2.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon01_ico_docu{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/3.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon02_ico_docu{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/4.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon03_ico_docu{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/5.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon04_ico_docu{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/6.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon05_ico_docu{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/7.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon06_ico_docu{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/8.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+	</style>
+</HEAD>
+
+<BODY>
+<h1>Custom Icon - iconSkin</h1>
+<h6>[ File Path: core/custom_iconSkin.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of setting</h2>
+				<ul class="list">
+				<li>Custom icon does not require special configuration setting.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of treeNode</h2>
+				<ul class="list">
+				<li>Use the node data iconSkin attributes and  css show custom icon.</li>
+				<li class="highlight_red">See the API documentation for more related contents.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、Other explanation</h2>
+				<ul class="list">
+				<li class="highlight_red">Because of the time limitation, demo uses png images, if you need transparent images in IE6 browser, make a gif image, or use a special 'css filter' on ie6 browser.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/core/expand.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/core/expand.html
new file mode 100644
index 0000000..ca60474
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/core/expand.html
@@ -0,0 +1,186 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - beforeExpand / onExpand && beforeCollapse / onCollapse</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				selectedMulti: false
+			},
+			data: {
+				key: {
+					title:"t"
+				},
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeClick: beforeClick,
+				beforeCollapse: beforeCollapse,
+				beforeExpand: beforeExpand,
+				onCollapse: onCollapse,
+				onExpand: onExpand
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"ordinary parent 1", t:"I am ordinary, just expand or collapse on me", open:false},
+			{ id:11, pId:1, name:"leaf node 1-1", t:"..."},
+			{ id:12, pId:1, name:"ordinary parent 2", t:"I am ordinary, just expand or collapse on me", open:false},
+			{ id:121, pId:12, name:"parent node - 121", t:"...", open:true},
+			{ id:1211, pId:121, name:"parent node - 1211", t:"...", open:false},
+			{ id:1212, pId:1211, name:"leaf node - 1212", t:"..."},
+			{ id:1213, pId:121, name:"parent node - 1213", t:"...", open:false},
+			{ id:1214, pId:1213, name:"leaf node - 1214", t:"..."},
+			{ id:123, pId:12, name:"leaf node 2-3", t:"..."},
+			{ id:13, pId:1, name:"leaf node  1-3", t:"..."},
+			{ id:2, pId:0, name:"can't collapse me", t:"can't collapse me...Unless you use expandAll method.", open:true, collapse:false},
+			{ id:21, pId:2, name:"leaf node 2-1", t:"You can't collapse my parent"},
+			{ id:22, pId:2, name:"leaf node 2-2", t:"You can't collapse my parent"},
+			{ id:23, pId:2, name:"leaf node 2-3", t:"You can't collapse my parent"},
+			{ id:3, pId:0, name:"can't expand me", t:"can't expand me...Unless you use expandAll method.", open:false, expand:false},
+			{ id:31, pId:3, name:"leaf node 3-1", t:"OMG, you can see me!! Do you use the expandAll method?"},
+			{ id:32, pId:3, name:"leaf node 3-2", t:"OMG, you can see me!! Do you use the expandAll method?"},
+			{ id:33, pId:3, name:"leaf node 3-3", t:"OMG, you can see me!! Do you use the expandAll method?"},
+			{ id:4, pId:0, name:"empty parent 1", t:"I have nothing...", isParent:true, open:false}
+		];
+
+		var log, className = "dark";
+		function beforeClick(treeId, treeNode) {
+			if (treeNode.isParent) {
+				return true;
+			} else {
+				alert("This Demo is used to test the parent node expand / collapse...\n\nGo to click parent node... ");
+				return false;
+			}
+		}
+		function beforeCollapse(treeId, treeNode) {
+			className = (className === "dark" ? "":"dark");
+			showLog("[ "+getTime()+" beforeCollapse ]&nbsp;&nbsp;&nbsp;&nbsp;" + treeNode.name );
+			return (treeNode.collapse !== false);
+		}
+		function onCollapse(event, treeId, treeNode) {
+			showLog("[ "+getTime()+" onCollapse ]&nbsp;&nbsp;&nbsp;&nbsp;" + treeNode.name);
+		}		
+		function beforeExpand(treeId, treeNode) {
+			className = (className === "dark" ? "":"dark");
+			showLog("[ "+getTime()+" beforeExpand ]&nbsp;&nbsp;&nbsp;&nbsp;" + treeNode.name );
+			return (treeNode.expand !== false);
+		}
+		function onExpand(event, treeId, treeNode) {
+			showLog("[ "+getTime()+" onExpand ]&nbsp;&nbsp;&nbsp;&nbsp;" + treeNode.name);
+		}
+		function showLog(str) {
+			if (!log) log = $("#log");
+			log.append("<li class='"+className+"'>"+str+"</li>");
+			if(log.children("li").length > 8) {
+				log.get(0).removeChild(log.children("li")[0]);
+			}
+		}
+		function getTime() {
+			var now= new Date(),
+			h=now.getHours(),
+			m=now.getMinutes(),
+			s=now.getSeconds(),
+			ms=now.getMilliseconds();
+			return (h+":"+m+":"+s+ " " +ms);
+		}
+
+		function expandNode(e) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			type = e.data.type,
+			nodes = zTree.getSelectedNodes();
+			if (type.indexOf("All")<0 && nodes.length == 0) {
+				alert("Please select one parent node at first...");
+			}
+
+			if (type == "expandAll") {
+				zTree.expandAll(true);
+			} else if (type == "collapseAll") {
+				zTree.expandAll(false);
+			} else {
+				var callbackFlag = $("#callbackTrigger").attr("checked");
+				for (var i=0, l=nodes.length; i<l; i++) {
+					zTree.setting.view.fontCss = {};
+					if (type == "expand") {
+						zTree.expandNode(nodes[i], true, null, null, callbackFlag);
+					} else if (type == "collapse") {
+						zTree.expandNode(nodes[i], false, null, null, callbackFlag);
+					} else if (type == "toggle") {
+						zTree.expandNode(nodes[i], null, null, null, callbackFlag);
+					} else if (type == "expandSon") {
+						zTree.expandNode(nodes[i], true, true, null, callbackFlag);
+					} else if (type == "collapseSon") {
+						zTree.expandNode(nodes[i], false, true, null, callbackFlag);
+					}
+				}
+			}
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			$("#expandBtn").bind("click", {type:"expand"}, expandNode);
+			$("#collapseBtn").bind("click", {type:"collapse"}, expandNode);
+			$("#toggleBtn").bind("click", {type:"toggle"}, expandNode);
+			$("#expandSonBtn").bind("click", {type:"expandSon"}, expandNode);
+			$("#collapseSonBtn").bind("click", {type:"collapseSon"}, expandNode);
+			$("#expandAllBtn").bind("click", {type:"expandAll"}, expandNode);
+			$("#collapseAllBtn").bind("click", {type:"collapseAll"}, expandNode);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Control of Expand Node</h1>
+<h6>[ File Path: core/expand.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, 'beforeCollapse / onCollapse'<br/>&nbsp;&nbsp;'beforeExpand / onExpand' callback function</h2>
+				<ul class="list">
+				<li>Use 'beforeCollapse / onCollapse' and 'beforeExpand / onExpand' callback function can control whether to allow expand or collapse the parent node
+					. This simple demo shows how to monitor the collapse and expand event.</li>
+				<li><p>Try: <br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" id="callbackTrigger" checked /> Whether trigger the callback when execution expandNode() method.<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;Single Node --[ <a id="expandBtn" href="#" title="expand..." onclick="return false;">expand</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="collapseBtn" href="#" title="collapse..." onclick="return false;">collapse</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="toggleBtn" href="#" title="what do you want?..." onclick="return false;">toggle</a> ]<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;Single Node (including child) --[ <a id="expandSonBtn" href="#" title="expand (including child)..." onclick="return false;">expand</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="collapseSonBtn" href="#" title="collapse (including child)..." onclick="return false;">collapse</a> ]<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;All Nodes --[ <a id="expandAllBtn" href="#" title="expand All!!" onclick="return false;">expand All</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="collapseAllBtn" href="#" title="collapse All!!" onclick="return false;">collapse All</a> ]</p>
+				<li><p><span class="highlight_red">How to use zTreeObj.updateNode method,  please see the API documentation.</span><br/>
+					collapse / expand log:<br/>
+					<ul id="log" class="log"></ul></p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of setting</h2>
+				<ul class="list">
+				<li class="highlight_red">Set attributes about 'setting.callback.beforeCollapse / onCollapse / beforeExpand / onExpand', please see the API documentation for more related contents.</li>
+				<li class="highlight_red">If you need to adjust the expand / collapse animation effects, please see the API documentation about setting.view.expandSpeed.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3, Explanation of treeNode</h2>
+				<ul class="list">
+				<li>No special requirements on the node data, the user can add custom attributes.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/core/noicon.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/core/noicon.html
new file mode 100644
index 0000000..19a6664
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/core/noicon.html
@@ -0,0 +1,93 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - noIcon </TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				showIcon: showIconForTree
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"pNode 1", open:true},
+			{ id:11, pId:1, name:"pNode 11"},
+			{ id:111, pId:11, name:"leaf node 111"},
+			{ id:112, pId:11, name:"leaf node 112"},
+			{ id:113, pId:11, name:"leaf node 113"},
+			{ id:114, pId:11, name:"leaf node 114"},
+			{ id:12, pId:1, name:"pNode 12"},
+			{ id:121, pId:12, name:"leaf node 121"},
+			{ id:122, pId:12, name:"leaf node 122"},
+			{ id:123, pId:12, name:"leaf node 123"},
+			{ id:124, pId:12, name:"leaf node 124"},
+			{ id:13, pId:1, name:"pNode 13 - no child", isParent:true},
+			{ id:2, pId:0, name:"pNode 2"},
+			{ id:21, pId:2, name:"pNode 21", open:true},
+			{ id:211, pId:21, name:"leaf node 211"},
+			{ id:212, pId:21, name:"leaf node 212"},
+			{ id:213, pId:21, name:"leaf node 213"},
+			{ id:214, pId:21, name:"leaf node 214"},
+			{ id:22, pId:2, name:"pNode 22"},
+			{ id:221, pId:22, name:"leaf node 221"},
+			{ id:222, pId:22, name:"leaf node 222"},
+			{ id:223, pId:22, name:"leaf node 223"},
+			{ id:224, pId:22, name:"leaf node 224"},
+			{ id:23, pId:2, name:"pNode 23"},
+			{ id:231, pId:23, name:"leaf node 231"},
+			{ id:232, pId:23, name:"leaf node 232"},
+			{ id:233, pId:23, name:"leaf node 233"},
+			{ id:234, pId:23, name:"leaf node 234"},
+			{ id:3, pId:0, name:"pNode 3 - no child", isParent:true}
+		];
+
+		function showIconForTree(treeId, treeNode) {
+			return !treeNode.isParent;
+		};
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+
+</HEAD>
+
+<BODY>
+<h1>Don't Show Icon</h1>
+<h6>[ File Path: core/noicon.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of setting</h2>
+				<ul class="list">
+				<li>This Demo using Function set to the parent node does not display the icon.</li>
+				<li class="highlight_red">Whether to display the icon, you need to set setting.view.showIcon attribute, see the API documentation for more related contents.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of treeNode</h2>
+				<ul class="list">
+				<li>TreeNode data does not require special settings. If you need some node display icon, and some nodes are not displayed, you can add special attributes to the node data for identification.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/core/noline.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/core/noline.html
new file mode 100644
index 0000000..d61792f
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/core/noline.html
@@ -0,0 +1,88 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - noLine </TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				showLine: false
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"pNode 1", open:true},
+			{ id:11, pId:1, name:"pNode 11"},
+			{ id:111, pId:11, name:"leaf node 111"},
+			{ id:112, pId:11, name:"leaf node 112"},
+			{ id:113, pId:11, name:"leaf node 113"},
+			{ id:114, pId:11, name:"leaf node 114"},
+			{ id:12, pId:1, name:"pNode 12"},
+			{ id:121, pId:12, name:"leaf node 121"},
+			{ id:122, pId:12, name:"leaf node 122"},
+			{ id:123, pId:12, name:"leaf node 123"},
+			{ id:124, pId:12, name:"leaf node 124"},
+			{ id:13, pId:1, name:"pNode 13 - no child", isParent:true},
+			{ id:2, pId:0, name:"pNode 2"},
+			{ id:21, pId:2, name:"pNode 21", open:true},
+			{ id:211, pId:21, name:"leaf node 211"},
+			{ id:212, pId:21, name:"leaf node 212"},
+			{ id:213, pId:21, name:"leaf node 213"},
+			{ id:214, pId:21, name:"leaf node 214"},
+			{ id:22, pId:2, name:"pNode 22"},
+			{ id:221, pId:22, name:"leaf node 221"},
+			{ id:222, pId:22, name:"leaf node 222"},
+			{ id:223, pId:22, name:"leaf node 223"},
+			{ id:224, pId:22, name:"leaf node 224"},
+			{ id:23, pId:2, name:"pNode 23"},
+			{ id:231, pId:23, name:"leaf node 231"},
+			{ id:232, pId:23, name:"leaf node 232"},
+			{ id:233, pId:23, name:"leaf node 233"},
+			{ id:234, pId:23, name:"leaf node 234"},
+			{ id:3, pId:0, name:"pNode 3 - no child", isParent:true}
+		];
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+
+</HEAD>
+
+<BODY>
+<h1>Don't Show Line</h1>
+<h6>[ File Path: core/noline.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of setting</h2>
+				<ul class="list">
+				<li class="highlight_red">Whether to display the line, you need to set setting.view.showLine attribute, see the API documentation for more related contents.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of treeNode</h2>
+				<ul class="list">
+				<li>TreeNode data does not require special settings</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/core/otherMouse.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/core/otherMouse.html
new file mode 100644
index 0000000..0e18a0c
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/core/otherMouse.html
@@ -0,0 +1,132 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - Other Mouse Event</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			data: {
+				key: {
+					title:"t"
+				},
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeMouseDown: beforeMouseDown,
+				beforeMouseUp: beforeMouseUp,
+				beforeRightClick: beforeRightClick,
+				onMouseDown: onMouseDown,
+				onMouseUp: onMouseUp,
+				onRightClick: onRightClick
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"Can't rClick 0", t:"Try RightClick", open:true, right:false},
+			{ id:11, pId:1, name:"Can't rClick 1", t:"Try RightClick", right:false},
+			{ id:12, pId:1, name:"Can't rClick 2", t:"Try RightClick", right:false},
+			{ id:13, pId:1, name:"Can't rClick 3", t:"Try RightClick", right:false},
+			{ id:2, pId:0, name:"Can't msDown 0", t:"Try MouseDown", open:true, down:false},
+			{ id:21, pId:2, name:"Can't msDown 1", t:"Try MouseDown", down:false},
+			{ id:22, pId:2, name:"Can't msDown 2", t:"Try MouseDown", down:false},
+			{ id:23, pId:2, name:"Can't msDown 3", t:"Try MouseDown", down:false},
+			{ id:3, pId:0, name:"Can't msUp 0", t:"Try MouseUp", open:true, up:false},
+			{ id:31, pId:3, name:"Can't msUp 1", t:"Try MouseUp", up:false},
+			{ id:32, pId:3, name:"Can't msUp 2", t:"Try MouseUp", up:false},
+			{ id:33, pId:3, name:"Can't msUp 3", t:"Try MouseUp", up:false}
+		];
+
+		var log, className = {down:"dark", up:"dark", right:"dark"};
+		function beforeMouseDown(treeId, treeNode) {
+			className.down = (className.down === "dark" ? "":"dark");
+			showLog("[ "+getTime()+" beforeMouseDown ]&nbsp;&nbsp;" + (treeNode?treeNode.name:"root"), "down" );
+			return (!treeNode || treeNode.down != false);
+		}
+		function onMouseDown(event, treeId, treeNode) {
+			showLog("[ "+getTime()+" onMouseDown ]&nbsp;&nbsp;" + (treeNode?treeNode.name:"root"), "down" );
+		}
+		function beforeMouseUp(treeId, treeNode) {
+			className.up = (className.up === "dark" ? "":"dark");
+			showLog("[ "+getTime()+" beforeMouseUp ]&nbsp;&nbsp;" + (treeNode?treeNode.name:"root"), "up" );
+			return (!treeNode || treeNode.up != false);
+		}
+		function onMouseUp(event, treeId, treeNode) {
+			showLog("[ "+getTime()+" onMouseUp ]&nbsp;&nbsp;" + (treeNode?treeNode.name:"root"), "up" );
+		}
+		function beforeRightClick(treeId, treeNode) {
+			className.right = (className.right === "dark" ? "":"dark");
+			showLog("[ "+getTime()+" beforeRightClick ]&nbsp;&nbsp;" + (treeNode?treeNode.name:"root"), "right" );
+			return (!treeNode || treeNode.right != false);
+		}
+		function onRightClick(event, treeId, treeNode) {
+			showLog("[ "+getTime()+" onRightClick ]&nbsp;&nbsp;" + (treeNode?treeNode.name:"root"), "right" );
+		}
+		function showLog(str, logType) {
+			log = $("#log" + "_" + logType);
+			log.append("<li class='"+className[logType]+"'>"+str+"</li>");
+			if(log.children("li").length > 2) {
+				log.get(0).removeChild(log.children("li")[0]);
+			}
+		}
+		function getTime() {
+			var now= new Date(),
+			h=now.getHours(),
+			m=now.getMinutes(),
+			s=now.getSeconds(),
+			ms=now.getMilliseconds();
+			return (h+":"+m+":"+s+ " " +ms);
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Other Mouse Events for zTree</h1>
+<h6>[ File Path: core/otherMouse.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, 'beforeMousedown / onMousedown / beforeMouseup / onMouseup / beforeRightClick / onRightClick' callback function</h2>
+				<ul class="list">
+				<li>zTree provide these types of mouse event callbacks, in order to facilitate the user to extend the functionality. And doesn't affect zTree normal function, This simple demo shows how to monitor the mousedown/mouseup/rightClick event.</li>
+				<li><p><span class="highlight_red">Try clicking with the mouse on the zTree (left or right),  by the way to see log.</span><br/>
+					mousedown event log:<br/>
+					<ul id="log_down" class="log small"></ul>
+					mouseup event log:<br/>
+					<ul id="log_up" class="log small"></ul>
+					rightClick event log:<br/>
+					<ul id="log_right" class="log small"></ul></p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of setting</h2>
+				<ul class="list">
+				<li class="highlight_red">Set attributes about 'setting.callback.beforeMousedown / onMousedown / beforeMouseup / onMouseup / beforeRightClick / onRightClick', please see the API documentation for more related contents.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3, Explanation of treeNode</h2>
+				<ul class="list">
+				<li>No special requirements on the node data, the user can add custom attributes.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/core/searchNodes.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/core/searchNodes.html
new file mode 100644
index 0000000..1d0695a
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/core/searchNodes.html
@@ -0,0 +1,173 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - getNodeByParam / getNodesByParam / getNodesByParamFuzzy</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			data: {
+				key: {
+					title: "t"
+				},
+				simpleData: {
+					enable: true
+				}
+			},
+			view: {
+				fontCss: getFontCss
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"search node demo 1", t:"id=1", open:true},
+			{ id:11, pId:1, name:"can search 'name'", t:"id=11"},
+			{ id:12, pId:1, name:"can search 'level'", t:"id=12"},
+			{ id:13, pId:1, name:"can search 'id'", t:"id=13"},
+			{ id:14, pId:1, name:"can search other attr", t:"id=14"},
+			{ id:2, pId:0, name:"search node demo 2", t:"id=2", open:true},
+			{ id:21, pId:2, name:"can search single node", t:"id=21"},
+			{ id:22, pId:2, name:"can search nodes array", t:"id=22"},
+			{ id:23, pId:2, name:"search me", t:"id=23"},
+			{ id:3, pId:0, name:"search node demo 3", t:"id=3", open:true },
+			{ id:31, pId:3, name:"My id is : 31", t:"id=31"},
+			{ id:32, pId:31, name:"My id is : 32", t:"id=32"},
+			{ id:33, pId:32, name:"My id is : 33", t:"id=33"}
+		];
+
+		function focusKey(e) {
+			if (key.hasClass("empty")) {
+				key.removeClass("empty");
+			}
+		}
+		function blurKey(e) {
+			if (key.get(0).value === "") {
+				key.addClass("empty");
+			}
+		}
+		var lastValue = "", nodeList = [], fontCss = {};
+		function clickRadio(e) {
+			lastValue = "";
+			searchNode(e);
+		}
+		function searchNode(e) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			if (!$("#getNodesByFilter").attr("checked")) {
+				var value = $.trim(key.get(0).value);
+				var keyType = "";
+				if ($("#name").attr("checked")) {
+					keyType = "name";
+				} else if ($("#level").attr("checked")) {
+					keyType = "level";
+					value = parseInt(value);
+				} else if ($("#id").attr("checked")) {
+					keyType = "id";
+					value = parseInt(value);
+				}
+				if (key.hasClass("empty")) {
+					value = "";
+				}
+				if (lastValue === value) return;
+				lastValue = value;
+				if (value === "") return;
+				updateNodes(false);
+
+				if ($("#getNodeByParam").attr("checked")) {
+					var node = zTree.getNodeByParam(keyType, value);
+					if (node === null) {
+						nodeList = [];
+					} else {
+						nodeList = [node];
+					}
+				} else if ($("#getNodesByParam").attr("checked")) {
+					nodeList = zTree.getNodesByParam(keyType, value);
+				} else if ($("#getNodesByParamFuzzy").attr("checked")) {
+					nodeList = zTree.getNodesByParamFuzzy(keyType, value);
+				}
+			} else {
+				updateNodes(false);
+				nodeList = zTree.getNodesByFilter(filter);
+			}
+			updateNodes(true);
+
+		}
+		function updateNodes(highlight) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			for( var i=0, l=nodeList.length; i<l; i++) {
+				nodeList[i].highlight = highlight;
+				zTree.updateNode(nodeList[i]);
+			}
+		}
+		function getFontCss(treeId, treeNode) {
+			return (!!treeNode.highlight) ? {color:"#A60000", "font-weight":"bold"} : {color:"#333", "font-weight":"normal"};
+		}
+		function filter(node) {
+			return !node.isParent && node.isFirstNode;
+		}
+
+		var key;
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			key = $("#key");
+			key.bind("focus", focusKey)
+			.bind("blur", blurKey)
+			.bind("propertychange", searchNode)
+			.bind("input", searchNode);
+			$("#name").bind("change", clickRadio);
+			$("#level").bind("change", clickRadio);
+			$("#id").bind("change", clickRadio);
+			$("#getNodeByParam").bind("change", clickRadio);
+			$("#getNodesByParam").bind("change", clickRadio);
+			$("#getNodesByParamFuzzy").bind("change", clickRadio);
+			$("#getNodesByFilter").bind("change", clickRadio);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Search Nodes</h1>
+<h6>[ File Path: core/searchNodes.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of getNodeByParam / getNodesByParam / getNodesByParamFuzzy</h2>
+				<ul class="list">
+				<li class="highlight_red">How to use ’zTreeObj.getNodeByParam / getNodesByParam / getNodesByParamFuzzy / getNodeByTId‘ method,  please see the API documentation.</li>
+				<li><p>Try to search: <br/>
+						attribute( value ): <input type="text" id="key" value="" class="empty" /><br/>
+						attribute( key ): <input type="radio" id="name" name="keyType" class="radio first" checked /><span>name (string)</span><br/>
+						<input type="radio" id="level" name="keyType" class="radio" style="margin-left:68px;" /><span>level (number) ... root node's level is 0</span><br/>
+						<input type="radio" id="id" name="keyType" class="radio" style="margin-left:68px;" /><span>id (number)</span><br/>
+						method: <input type="radio" id="getNodeByParam" name="funType" class="radio first" /><span>getNodeByParam</span><br/>
+						<input type="radio" id="getNodesByParam" name="funType" class="radio" style="margin-left:36px;" /><span>getNodesByParam</span><br/>
+						<input type="radio" id="getNodesByParamFuzzy" name="funType" class="radio" style="margin-left:36px;" checked /><span>getNodesByParamFuzzy (only string)</span><br/>
+						<input type="radio" id="getNodesByFilter" name="funType" class="radio" style="margin-left:36px;" /><span>getNodesByFilter (see source: function filter)</span><br/>
+					</p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of setting</h2>
+				<ul class="list">
+				<li>Do not need to set the setting.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3, Explanation of treeNode</h2>
+				<ul class="list">
+				<li class="highlight_red">Note: Please ensure that the incoming value type is  the same as  type of attribute.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/core/simpleData.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/core/simpleData.html
new file mode 100644
index 0000000..bf07831
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/core/simpleData.html
@@ -0,0 +1,100 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - Simple Data</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			data: {
+				simpleData: {
+					enable: true
+				}
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"pNode 1", open:true},
+			{ id:11, pId:1, name:"pNode 11"},
+			{ id:111, pId:11, name:"leaf node 111"},
+			{ id:112, pId:11, name:"leaf node 112"},
+			{ id:113, pId:11, name:"leaf node 113"},
+			{ id:114, pId:11, name:"leaf node 114"},
+			{ id:12, pId:1, name:"pNode 12"},
+			{ id:121, pId:12, name:"leaf node 121"},
+			{ id:122, pId:12, name:"leaf node 122"},
+			{ id:123, pId:12, name:"leaf node 123"},
+			{ id:124, pId:12, name:"leaf node 124"},
+			{ id:13, pId:1, name:"pNode 13 - no child", isParent:true},
+			{ id:2, pId:0, name:"pNode 2"},
+			{ id:21, pId:2, name:"pNode 21", open:true},
+			{ id:211, pId:21, name:"leaf node 211"},
+			{ id:212, pId:21, name:"leaf node 212"},
+			{ id:213, pId:21, name:"leaf node 213"},
+			{ id:214, pId:21, name:"leaf node 214"},
+			{ id:22, pId:2, name:"pNode 22"},
+			{ id:221, pId:22, name:"leaf node 221"},
+			{ id:222, pId:22, name:"leaf node 222"},
+			{ id:223, pId:22, name:"leaf node 223"},
+			{ id:224, pId:22, name:"leaf node 224"},
+			{ id:23, pId:2, name:"pNode 23"},
+			{ id:231, pId:23, name:"leaf node 231"},
+			{ id:232, pId:23, name:"leaf node 232"},
+			{ id:233, pId:23, name:"leaf node 233"},
+			{ id:234, pId:23, name:"leaf node 234"},
+			{ id:3, pId:0, name:"pNode 3 - no child", isParent:true}
+		];
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+ </HEAD>
+
+<BODY>
+<h1>Simple JSON Data</h1>
+<h6>[ File Path: core/simpleData.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of setting</h2>
+				<ul class="list">
+				<li class="highlight_red">Must set setting.data.simple attributes,  see the API documentation for more related contents.</li>
+				<li>The setting.view in API documentation is associated with the display of the zTree.</li>
+				<li>To change the 'name', 'children', 'title' attribute, please refer to the API documentation about 'setting.data.key'.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of treeNode</h2>
+				<ul class="list">
+				<li class="highlight_red">Id / pId that include parent-child relationship between nodes is needed if you use Simple model of the JSON data, and other attributes please refer to the instructions within setting.data.simple.
+				<div><pre xmlns=""><code>For example:
+var nodes = [
+	{id:1, pId:0, name: "pNode 01"},
+	{id:11, pId:1, name: "child 01"},
+	{id:12, pId:1, name: "child 02"}
+];</code></pre></div></li>
+				<li>To set nodes expanded by default, set treeNode.open attribute.</li>
+				<li>To get parent node which has no child node, set treeNode.isParent attribute.</li>
+				<li>Please refer to the API documentation "treeNode data details" to view other attributes description.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、Other explanation</h2>
+				<ul class="list">
+				<li>The simple JSON data model has been used almost everywhere, which can be learned easily.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/core/standardData.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/core/standardData.html
new file mode 100644
index 0000000..909a63b
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/core/standardData.html
@@ -0,0 +1,106 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - Standard Data </TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {	};
+
+		var zNodes =[
+			{ name:"pNode 01", open:true,
+				children: [
+					{ name:"pNode 11",
+						children: [
+							{ name:"leaf node 111"},
+							{ name:"leaf node 112"},
+							{ name:"leaf node 113"},
+							{ name:"leaf node 114"}
+						]},
+					{ name:"pNode 12",
+						children: [
+							{ name:"leaf node 121"},
+							{ name:"leaf node 122"},
+							{ name:"leaf node 123"},
+							{ name:"leaf node 124"}
+						]},
+					{ name:"pNode 13 - no child", isParent:true}
+				]},
+			{ name:"pNode 02",
+				children: [
+					{ name:"pNode 21", open:true,
+						children: [
+							{ name:"leaf node 211"},
+							{ name:"leaf node 212"},
+							{ name:"leaf node 213"},
+							{ name:"leaf node 214"}
+						]},
+					{ name:"pNode 22",
+						children: [
+							{ name:"leaf node 221"},
+							{ name:"leaf node 222"},
+							{ name:"leaf node 223"},
+							{ name:"leaf node 224"}
+						]},
+					{ name:"pNode 23",
+						children: [
+							{ name:"leaf node 231"},
+							{ name:"leaf node 232"},
+							{ name:"leaf node 233"},
+							{ name:"leaf node 234"}
+						]}
+				]},
+			{ name:"pNode 3 - no child", isParent:true}
+
+		];
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Standard JSON Data</h1>
+<h6>[ File Path: core/standardData.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of setting</h2>
+				<ul class="list">
+				<li class="highlight_red">No extrally setting needed for basic functions.</li>
+				<li>The setting.view in API documentation is associated with the display of the zTree.</li>
+				<li>To change the 'name', 'children', 'title' attribute, please refer to the API documentation about 'setting.data.key'.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of treeNode</h2>
+				<ul class="list">
+				<li class="highlight_red">Need to use nested JSON data that include parent-child relationship between nodes
+					<div><pre xmlns=""><code>For example:
+var nodes = [
+	{name: "pNode 01", children: [
+		{name: "child 01"},
+		{name: "child 02"}
+	]}
+];</code></pre></div>
+				</li>
+				<li>To set nodes expanded by default, set treeNode.open attribute.</li>
+				<li>No child nodes of parent node, set treeNode.isParent attribute.</li>
+				<li>Please refer to the API documentation "treeNode data details" to view other attributes description.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/core/update_fun.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/core/update_fun.html
new file mode 100644
index 0000000..0909a34
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/core/update_fun.html
@@ -0,0 +1,143 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - updateNode</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				selectedMulti: false
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"pNode 01", open:true},
+			{ id:11, pId:1, name:"leaf node 01"},
+			{ id:12, pId:1, name:"leaf node 02"},
+			{ id:13, pId:1, name:"leaf node 03"},
+			{ id:2, pId:0, name:"pNode 02", open:true},
+			{ id:21, pId:2, name:"leaf node 01"},
+			{ id:22, pId:2, name:"leaf node 02"},
+			{ id:23, pId:2, name:"leaf node 03"},
+			{ id:3, pId:0, name:"pNode 03", open:true },
+			{ id:31, pId:3, name:"leaf node 01"},
+			{ id:32, pId:3, name:"leaf node 02"},
+			{ id:33, pId:3, name:"leaf node 03"}
+		];
+
+		var nameCount = 0, iconCount = 1, color = [0, 0, 0];
+		function updateNode(e) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			type = e.data.type,
+			nodes = zTree.getSelectedNodes();
+			if (nodes.length == 0) {
+				alert("Please select one node...");
+			}
+			for (var i=0, l=nodes.length; i<l; i++) {
+				zTree.setting.view.fontCss = {};
+				if (type == "rename") {
+					nodes[i].name = nodes[i].name.replace(/_[\d]*$/g, "") + "_" + (nameCount++);
+				} else if (type == "icon") {
+					if (iconCount > 8) {
+						nodes[i].iconSkin = null;
+						iconCount = 1;
+					} else if (nodes[i].isParent) {
+						nodes[i].iconSkin = nodes[i].iconSkin ? null : "pIcon01";
+					} else {
+						nodes[i].iconSkin = "icon0" + (iconCount++);
+					}
+				} else if (type == "color") {
+					color = [0, 0, 0];
+					var r1 = Math.round(Math.random()*3 - 0.5);
+					color[r1] = 15;
+					var r2 = Math.round(Math.random()*3 - 0.5);
+					while (r2 === r1) {
+						r2 = Math.round(Math.random()*3 - 0.5);
+					}
+					color[r2] = Math.round(Math.random()*16-0.5);
+					zTree.setting.view.fontCss["color"] = "#"+color[0].toString(16)+color[1].toString(16)+color[2].toString(16);
+				} else if (type == "font") {
+					var style = $("#" + nodes[i].tId + "_a").css("font-style") ;
+					style = (style=="italic" ? "normal" : "italic");
+					zTree.setting.view.fontCss["font-style"] = style;
+				}
+				zTree.updateNode(nodes[i]);
+			}
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			$("#rename").bind("click", {type:"rename"}, updateNode);
+			$("#changeIcon").bind("click", {type:"icon"}, updateNode);
+			$("#changeColor").bind("click", {type:"color"}, updateNode);
+			$("#changeFont").bind("click", {type:"font"}, updateNode);
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+.ztree li span.button.pIcon01_ico_open{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/1_open.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.pIcon01_ico_close{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/1_close.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon01_ico_docu{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/2.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon02_ico_docu{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/3.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon03_ico_docu{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/4.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon04_ico_docu{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/5.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon05_ico_docu{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/6.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon06_ico_docu{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/7.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon07_ico_docu{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/8.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon08_ico_docu{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/9.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+	</style>
+</HEAD>
+
+<BODY>
+<h1>Update Node - zTree methods</h1>
+<h6>[ File Path: core/update_fun.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of updateNode</h2>
+				<ul class="list">
+				<li class="highlight_red">How to use zTreeObj.updateNode method,  please see the API documentation.</li>
+				<li><p>This Demo can only select one parent node<br/>
+					Try: [ <a id="rename" href="#" onclick="return false;">Change Name</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="changeIcon" href="#" onclick="return false;">Change Icon</a> ]<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="changeColor" href="#" onclick="return false;">Change Color</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="changeFont" href="#" onclick="return false;">Change Italic Font</a> ]</p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of setting</h2>
+				<ul class="list">
+				<li>Do not need to set the setting.</li>
+				<li class="highlight_red">You can modify the node style with setting.view.fontCss.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3, Explanation of treeNode</h2>
+				<ul class="list">
+				<li class="highlight_red">In the API documentation has detail description about the 'zTreeObj.updateNode method'.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>4、Other explanation</h2>
+				<ul class="list">
+				<li>This demo only made ​by the core js, so does not include the checkbox update.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/core/url.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/core/url.html
new file mode 100644
index 0000000..788b03f
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/core/url.html
@@ -0,0 +1,63 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - url</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			data: {
+				simpleData: {
+					enable: true
+				}
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"zTree Home", url:"http://www.baby666.cn", target:"_blank"},
+			{ id:2, pId:0, name:"zTree in Google", url:"http://code.google.com/p/jquerytree/", target:"_blank"},
+			{ id:3, pId:0, name:"zTree in Iteye", url:"http://ztreeapi.iteye.com/", target:"_blank"},
+			{ id:4, pId:0, name:"Nothing...", url:"", target:"_blank", click:"alert('I can not jump...');"}
+		];
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+ </HEAD>
+
+<BODY>
+<h1>Hyperlinks Demo</h1>
+<h6>[ File Path: core/url.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of setting</h2>
+				<ul class="list">
+				<li>No extrally setting needed for basic functions.</li>
+				<li class="highlight_red">If you need flexible control of hyperlinks to jump, please use the 'onClick' callback. See the API documentation for more related contents.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of treeNode</h2>
+				<ul class="list">
+				<li class="highlight_red">1. the 'url' attribute is used to save the hyperlink's path.</li>
+				<li class="highlight_red">2. the 'target' attribute is used to save the hyperlink's target.</li>
+				<li class="highlight_red">3. the 'click' attribute is used to save the hyperlink's 'onclick' attribute.</li>
+				<li>Please refer to the API documentation "treeNode data details" to view other attributes description.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/excheck/checkbox.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/excheck/checkbox.html
new file mode 100644
index 0000000..f2a1408
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/excheck/checkbox.html
@@ -0,0 +1,107 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - checkbox</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<!--
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			check: {
+				enable: true
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"can check 1", open:true},
+			{ id:11, pId:1, name:"can check 1-1", open:true},
+			{ id:111, pId:11, name:"can check 1-1-1"},
+			{ id:112, pId:11, name:"can check 1-1-2"},
+			{ id:12, pId:1, name:"can check 1-2", open:true},
+			{ id:121, pId:12, name:"can check 1-2-1"},
+			{ id:122, pId:12, name:"can check 1-2-2"},
+			{ id:2, pId:0, name:"can check 2", checked:true, open:true},
+			{ id:21, pId:2, name:"can check 2-1"},
+			{ id:22, pId:2, name:"can check 2-2", open:true},
+			{ id:221, pId:22, name:"can check 2-2-1", checked:true},
+			{ id:222, pId:22, name:"can check 2-2-2"},
+			{ id:23, pId:2, name:"can check 2-3"}
+		];
+
+		var code;
+
+		function setCheck() {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			py = $("#py").attr("checked")? "p":"",
+			sy = $("#sy").attr("checked")? "s":"",
+			pn = $("#pn").attr("checked")? "p":"",
+			sn = $("#sn").attr("checked")? "s":"",
+			type = { "Y":py + sy, "N":pn + sn};
+			zTree.setting.check.chkboxType = type;
+			showCode('setting.check.chkboxType = { "Y" : "' + type.Y + '", "N" : "' + type.N + '" };');
+		}
+		function showCode(str) {
+			if (!code) code = $("#code");
+			code.empty();
+			code.append("<li>"+str+"</li>");
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			setCheck();
+			$("#py").bind("change", setCheck);
+			$("#sy").bind("change", setCheck);
+			$("#pn").bind("change", setCheck);
+			$("#sn").bind("change", setCheck);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Checkbox Operation</h1>
+<h6>[ File Path: excheck/checkbox.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of setting</h2>
+				<ul class="list">
+				<li class="highlight_red">Must set setting.check attributes, see the API documentation for more related contents.</li>
+				<li><p>Linkage relationship between parent and child nodes:<br/>
+						check: <input type="checkbox" id="py" class="checkbox first" checked /><span>affect the parent</span>
+						<input type="checkbox" id="sy" class="checkbox first" checked /><span>affect the child</span><br/>
+						uncheck: <input type="checkbox" id="pn" class="checkbox first" checked /><span>affect the parent</span>
+						<input type="checkbox" id="sn" class="checkbox first" checked /><span>affect the child</span><br/>
+						<ul id="code" class="log" style="height:20px;"></ul></p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of treeNode</h2>
+				<ul class="list">
+				<li class="highlight_red">1), If you need to initialize the node is checked, please set treeNode.checked attribute. See the API documentation for more related contents.</li>
+				<li class="highlight_red">2), If you need to initialize the node's checkbox is disabled, please set treeNode.chkDisabled attribute. See the API documentation for more related contents and 'chkDisabled Demo'.</li>
+				<li class="highlight_red">3), If you need to initialize the node don't show checkbox, please set treeNode.nocheck attribute. See the API documentation for more related contents and 'nocheck Demo'.</li>
+				<li class="highlight_red">4), If you need to change 'checked' to other attribute, please set setting.data.key.checked attribute. See the API documentation for more related contents.</li>
+				<li>5), By the way, please see the API documentation for 'treeNode.checkedOld / getCheckStatus / check_Child_State / check_Focus'.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/excheck/checkbox_chkDisabled.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/excheck/checkbox_chkDisabled.html
new file mode 100644
index 0000000..1296e13
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/excheck/checkbox_chkDisabled.html
@@ -0,0 +1,111 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - Checkbox chkDisabled</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<!--
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			check: {
+				enable: true,
+				chkDisabledInherit: true
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"can check 1", open:true},
+			{ id:11, pId:1, name:"can check 1-1", open:true},
+			{ id:111, pId:11, name:"disabled 1-1-1", chkDisabled:true},
+			{ id:112, pId:11, name:"can check 1-1-2"},
+			{ id:12, pId:1, name:"disabled 1-2", chkDisabled:true, checked:true, open:true},
+			{ id:121, pId:12, name:"disabled 1-2-1", checked:true},
+			{ id:122, pId:12, name:"disabled 1-2-2"},
+			{ id:2, pId:0, name:"can check 2", checked:true, open:true},
+			{ id:21, pId:2, name:"can check 2-1"},
+			{ id:22, pId:2, name:"can check 2-2", open:true},
+			{ id:221, pId:22, name:"can check 2-2-1", checked:true},
+			{ id:222, pId:22, name:"can check 2-2-2"},
+			{ id:23, pId:2, name:"can check 2-3"}
+		];
+
+		function disabledNode(e) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			disabled = e.data.disabled,
+			nodes = zTree.getSelectedNodes();
+			if (nodes.length == 0) {
+				alert("Please select one node at first...");
+			}
+			if (disabled) {
+				inheritParent = $("#py").attr("checked");
+				inheritChildren = $("#sy").attr("checked");
+			} else {
+				inheritParent = $("#pn").attr("checked");
+				inheritChildren = $("#sn").attr("checked");
+			}
+
+			for (var i=0, l=nodes.length; i<l; i++) {
+				zTree.setChkDisabled(nodes[i], disabled, inheritParent, inheritChildren);
+			}
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			$("#disabledTrue").bind("click", {disabled: true}, disabledNode);
+			$("#disabledFalse").bind("click", {disabled: false}, disabledNode);
+
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Checkbox chkDisabled Demo</h1>
+<h6>[ File Path: excheck/checkbox_chkDisabled.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of 'setChkDisabled' method</h2>
+				<ul class="list">
+				<li>'setChkDisabled' method can set the node's checkbox / radio to be disabled or abled. See the API documentation for more related contents.</li>
+				<li><p>Try:<br/>
+					disabled: <input type="checkbox" id="py" class="checkbox first" /><span>affect the parent</span>
+					<input type="checkbox" id="sy" class="checkbox first" checked /><span>affect the child</span><br/>
+					unDisabled: <input type="checkbox" id="pn" class="checkbox first" checked /><span>affect the parent</span>
+					<input type="checkbox" id="sn" class="checkbox first" checked /><span>affect the child</span><br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="disabledTrue" href="#" title="set checkbox to be disabled." onclick="return false;">be disabled</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="disabledFalse" href="#" title="set checkbox to be abled." onclick="return false;">be abled</a> ]</p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of setting</h2>
+				<ul class="list">
+				<li>This Demo only shows how use the ‘chkDisabled’ attribute, detailed configuration information, please refer to 'Checkbox Operation'</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3, Explanation of treeNode</h2>
+				<ul class="list">
+				<li class="highlight_red">1), If you need to initialize the node's checkbox is disabled, please set treeNode.chkDisabled attribute. See the API documentation for more related contents.</li>
+				<li>2), By the way, please see the 'Checkbox Operation' Demo.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/excheck/checkbox_count.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/excheck/checkbox_count.html
new file mode 100644
index 0000000..ae44390
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/excheck/checkbox_count.html
@@ -0,0 +1,127 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - getChangeCheckedNodes / getCheckedNodes</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<!--
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				selectedMulti: false
+			},
+			check: {
+				enable: true
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				onCheck: onCheck
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"can check 1", open:true},
+			{ id:11, pId:1, name:"can check 1-1"},
+			{ id:12, pId:1, name:"can check  1-2", open:true},
+			{ id:121, pId:12, name:"can check 1-2-1", checked:true},
+			{ id:122, pId:12, name:"can check 1-2-2"},
+			{ id:123, pId:12, name:"can check 1-2-3"},
+			{ id:13, pId:1, name:"can check 1-3"},
+			{ id:2, pId:0, name:"can check 2", open:true},
+			{ id:21, pId:2, name:"can check 2-1"},
+			{ id:22, pId:2, name:"can check 2-2", open:true},
+			{ id:221, pId:22, name:"can check 2-2-1", checked:true},
+			{ id:222, pId:22, name:"can check 2-2-2"},
+			{ id:223, pId:22, name:"can check 2-2-3"},
+			{ id:23, pId:2, name:"can check 2-3", checked:true}
+		];
+
+		var clearFlag = false;
+		function onCheck(e, treeId, treeNode) {
+			count();
+			if (clearFlag) {
+				clearCheckedOldNodes();
+			}
+		}
+		function clearCheckedOldNodes() {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nodes = zTree.getChangeCheckedNodes();
+			for (var i=0, l=nodes.length; i<l; i++) {
+				nodes[i].checkedOld = nodes[i].checked;
+			}
+		}
+		function count() {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			checkCount = zTree.getCheckedNodes(true).length,
+			nocheckCount = zTree.getCheckedNodes(false).length,
+			changeCount = zTree.getChangeCheckedNodes().length;
+			$("#checkCount").text(checkCount);
+			$("#nocheckCount").text(nocheckCount);
+			$("#changeCount").text(changeCount);
+
+		}
+		function createTree() {
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			count();
+			clearFlag = $("#last").attr("checked");
+		}
+
+		$(document).ready(function(){
+			createTree();			
+			$("#init").bind("change", createTree);
+			$("#last").bind("change", createTree);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Statistics Checkbox is Checked</h1>
+<h6>[ File Path: excheck/checkbox_count.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of getChangeCheckedNodes / getCheckedNodes</h2>
+				<ul class="list">
+				<li class="highlight_red">How to use zTreeObj.getChangeCheckedNodes / getCheckedNodes method,  please see the API documentation.</li>
+				<li><p>Check the checkbox, observe the number of changes:<br/>
+					<ul id="log" class="log" style="height:130px;">
+						<li>Total check node: <span id="checkCount" class="highlight_red"></span></li>
+						<li>Total uncheck node: <span id="nocheckCount" class="highlight_red"></span></li>
+						<li>Modify the state of checkbox: <br/>
+							<input type="radio" id="init" name="stateType" class="radio first" checked style="margin-left:68px;"/><span>Compared with zTree initialization</span><br/>
+							<input type="radio" id="last" name="stateType" class="radio first" style="margin-left:68px;"/><span>Compared with the last check</span></li>
+						<li>Total change the checkbox state of node: <span id="changeCount" class="highlight_red"></span></li>
+					</ul></p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of setting</h2>
+				<ul class="list">
+				<li>Same as 'Checkbox Operation'</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3, Explanation of treeNode</h2>
+				<ul class="list">
+				<li>Same as 'Checkbox Operation'</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/excheck/checkbox_fun.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/excheck/checkbox_fun.html
new file mode 100644
index 0000000..0562fe6
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/excheck/checkbox_fun.html
@@ -0,0 +1,172 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - beforeCheck / onCheck</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<!--
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				selectedMulti: false
+			},
+			check: {
+				enable: true
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeCheck: beforeCheck,
+				onCheck: onCheck
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"can check 1", open:true},
+			{ id:11, pId:1, name:"can check 1-1"},
+			{ id:12, pId:1, name:"can check 1-2", open:true},
+			{ id:121, pId:12, name:"can check 1-2-1"},
+			{ id:122, pId:12, name:"can check 1-2-2"},
+			{ id:2, pId:0, name:"can't check 2", open:true, doCheck:false},
+			{ id:21, pId:2, name:"can't check 2-1", doCheck:false},
+			{ id:22, pId:2, name:"can't check 2-2", checked:true, open:true, doCheck:false},
+			{ id:221, pId:22, name:"can't chk 2-2-1", doCheck:false},
+			{ id:222, pId:22, name:"can't chk 2-2-2", checked:true, doCheck:false},
+			{ id:23, pId:2, name:"can't check 2-3", doCheck:false}
+		];
+		
+		var code, log, className = "dark";
+		function beforeCheck(treeId, treeNode) {
+			className = (className === "dark" ? "":"dark");
+			showLog("[ "+getTime()+" beforeCheck ]&nbsp;&nbsp;&nbsp;&nbsp;" + treeNode.name );
+			return (treeNode.doCheck !== false);
+		}
+		function onCheck(e, treeId, treeNode) {
+			showLog("[ "+getTime()+" onCheck ]&nbsp;&nbsp;&nbsp;&nbsp;" + treeNode.name );
+		}		
+		function showLog(str) {
+			if (!log) log = $("#log");
+			log.append("<li class='"+className+"'>"+str+"</li>");
+			if(log.children("li").length > 6) {
+				log.get(0).removeChild(log.children("li")[0]);
+			}
+		}
+		function getTime() {
+			var now= new Date(),
+			h=now.getHours(),
+			m=now.getMinutes(),
+			s=now.getSeconds(),
+			ms=now.getMilliseconds();
+			return (h+":"+m+":"+s+ " " +ms);
+		}
+
+		function checkNode(e) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			type = e.data.type,
+			nodes = zTree.getSelectedNodes();
+			if (type.indexOf("All")<0 && nodes.length == 0) {
+				alert("Please select one node at first...");
+			}
+
+			if (type == "checkAllTrue") {
+				zTree.checkAllNodes(true);
+			} else if (type == "checkAllFalse") {
+				zTree.checkAllNodes(false);
+			} else {
+				var callbackFlag = $("#callbackTrigger").attr("checked");
+				for (var i=0, l=nodes.length; i<l; i++) {
+					if (type == "checkTrue") {
+						zTree.checkNode(nodes[i], true, false, callbackFlag);
+					} else if (type == "checkFalse") {
+						zTree.checkNode(nodes[i], false, false, callbackFlag);
+					} else if (type == "toggle") {
+						zTree.checkNode(nodes[i], null, false, callbackFlag);
+					}else if (type == "checkTruePS") {
+						zTree.checkNode(nodes[i], true, true, callbackFlag);
+					} else if (type == "checkFalsePS") {
+						zTree.checkNode(nodes[i], false, true, callbackFlag);
+					} else if (type == "togglePS") {
+						zTree.checkNode(nodes[i], null, true, callbackFlag);
+					}
+				}
+			}
+		}
+
+		function setAutoTrigger(e) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			zTree.setting.check.autoCheckTrigger = $("#autoCallbackTrigger").attr("checked");
+			$("#autoCheckTriggerValue").html(zTree.setting.check.autoCheckTrigger ? "true" : "false");
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			$("#checkTrue").bind("click", {type:"checkTrue"}, checkNode);
+			$("#checkFalse").bind("click", {type:"checkFalse"}, checkNode);
+			$("#toggle").bind("click", {type:"toggle"}, checkNode);
+			$("#checkTruePS").bind("click", {type:"checkTruePS"}, checkNode);
+			$("#checkFalsePS").bind("click", {type:"checkFalsePS"}, checkNode);
+			$("#togglePS").bind("click", {type:"togglePS"}, checkNode);
+			$("#checkAllTrue").bind("click", {type:"checkAllTrue"}, checkNode);
+			$("#checkAllFalse").bind("click", {type:"checkAllFalse"}, checkNode);
+
+			$("#autoCallbackTrigger").bind("change", {}, setAutoTrigger);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Checkbox - zTree methods</h1>
+<h6>[ File Path: excheck/checkbox_fun.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, 'beforeCheck / onCheck' callback function</h2>
+				<ul class="list">
+				<li>Use 'beforeCheck / onCheck' callback function can control whether to allow changes to the node check state. This simple demo shows how to monitor the check event.</li>
+				<li><p>By the way also demonstrates how to use the 'checkNode / checkAllNodes' method triggers 'beforeCheck / onCheck' callback, Try: <br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" id="autoCallbackTrigger" /> setting.check.autoCheckTrigger: <span id="autoCheckTriggerValue">false</span><br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" id="callbackTrigger" checked /> Whether trigger the callback when execution checkNode() method. <br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;Node --[ <a id="checkTrue" href="#" title="check..." onclick="return false;">check</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="checkFalse" href="#" title="uncheck..." onclick="return false;">uncheck</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="toggle" href="#" title="toggle..." onclick="return false;">toggle</a> ]<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;Node (relationships) --[ <a id="checkTruePS" href="#" title="check(relationships)..." onclick="return false;">check</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="checkFalsePS" href="#" title="uncheck(maintain relationships)..." onclick="return false;">uncheck</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="togglePS" href="#" title="toggle..." onclick="return false;">toggle</a> ]<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;All Nodes --[ <a id="checkAllTrue" href="#" title="check All!!" onclick="return false;">check</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="checkAllFalse" href="#" title="uncheck All!!" onclick="return false;">uncheck</a> ]</p>
+				</li>
+				<li><p><span class="highlight_red">How to use 'zTreeObj.checkNode / checkAllNodes' method,  please see the API documentation.</span><br/>
+					beforeCheck / onCheck log:<br/>
+					<ul id="log" class="log" style="height:130px;"></ul></p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of setting</h2>
+				<ul class="list">
+				<li>Same as 'Checkbox Operation'</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3, Explanation of treeNode</h2>
+				<ul class="list">
+				<li>Same as 'Checkbox Operation'</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/excheck/checkbox_halfCheck.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/excheck/checkbox_halfCheck.html
new file mode 100644
index 0000000..368cd5a
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/excheck/checkbox_halfCheck.html
@@ -0,0 +1,108 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - Checkbox halfCheck</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<!--
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			async: {
+				enable: true,
+				url:"../asyncData/getNodes.php",
+				autoParam:["id", "name=n", "level=lv"],
+				otherParam:{"chk":"chk"},
+				dataFilter: dataFilter
+			},
+			check: {
+				enable: true,
+				autoCheckTrigger: true
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				onCheck: onCheck,
+				onAsyncSuccess: onAsyncSuccess
+			}
+		};
+
+		function dataFilter(treeId, parentNode, childNodes) {
+			if (parentNode.checkedEx === true) {
+				for(var i=0, l=childNodes.length; i<l; i++) {
+					childNodes[i].checked = parentNode.checked;
+					childNodes[i].halfCheck = false;
+					childNodes[i].checkedEx = true;
+				}
+			}
+			return childNodes;
+		}
+		function onCheck(event, treeId, treeNode) {
+			cancelHalf(treeNode)
+			treeNode.checkedEx = true;
+		}
+		function onAsyncSuccess(event, treeId, treeNode, msg) {
+			cancelHalf(treeNode);
+		}
+		function cancelHalf(treeNode) {
+			if (treeNode.checkedEx) return;
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			treeNode.halfCheck = false;
+			zTree.updateNode(treeNode);			
+		}
+
+		var zNodes =[
+			{ id:1, pId:0, name:"half 1", halfCheck:true, isParent:true},
+			{ id:2, pId:0, name:"half 2", halfCheck:true, checked:true, isParent:true},
+			{ id:3, pId:0, name:"no half 3", checked:true, isParent:true}
+		];
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Checkbox halfCheck Demo</h1>
+<h6>[ File Path: excheck/checkbox_halfCheck.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of Demo</h2>
+				<ul class="list">
+				<li>This demo implements the check operation of the dynamic tree</li>
+				<li class="highlight_red">1). After loaded child nodes, the parent node's 'halfCheck' attribute will be invalid immediately.</li>
+				<li class="highlight_red">2). If you check the parent node, so will effect the child nodes's check status.</li>
+				<li class="highlight_red">3). If you check the parent node, it's child node's 'halfCheck' attribute will be invalid.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of setting</h2>
+				<ul class="list">
+				<li>Half-checked functional don't need to configure any parameter. But it is accessibility, can not used alone. So please configure the parameters which you need.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3, Explanation of treeNode</h2>
+				<ul class="list">
+				<li class="highlight_red">1), Please set treeNode.halfCheck attribute, before zTree initialize. See the API documentation for more related contents.</li>
+				<li>2), By the way, please see the 'Checkbox Operation' Demo.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/excheck/checkbox_nocheck.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/excheck/checkbox_nocheck.html
new file mode 100644
index 0000000..8a20b84
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/excheck/checkbox_nocheck.html
@@ -0,0 +1,95 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - no checkbox</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<!--
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			check: {
+				enable: true,
+				nocheckInherit: true
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"can check 1", open:true},
+			{ id:11, pId:1, name:"can check 1-1", open:true},
+			{ id:111, pId:11, name:"no checkbox 1-1-1", nocheck:true},
+			{ id:112, pId:11, name:"can check 1-1-2"},
+			{ id:12, pId:1, name:"no checkbox 1-2", nocheck:true, open:true},
+			{ id:121, pId:12, name:"no checkbox 1-2-1"},
+			{ id:122, pId:12, name:"no checkbox 1-2-2"},
+			{ id:2, pId:0, name:"can check 2", checked:true, open:true},
+			{ id:21, pId:2, name:"can check 2-1"},
+			{ id:22, pId:2, name:"can check 2-2", open:true},
+			{ id:221, pId:22, name:"can check 2-2-1", checked:true},
+			{ id:222, pId:22, name:"can check 2-2-2"},
+			{ id:23, pId:2, name:"can check 2-3"}
+		];
+		function nocheckNode(e) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nocheck = e.data.nocheck,
+			nodes = zTree.getSelectedNodes();
+			if (nodes.length == 0) {
+				alert("Please select one node at first...");
+			}
+
+			for (var i=0, l=nodes.length; i<l; i++) {
+				nodes[i].nocheck = nocheck;
+				zTree.updateNode(nodes[i]);
+			}
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			$("#nocheckTrue").bind("click", {nocheck: true}, nocheckNode);
+			$("#nocheckFalse").bind("click", {nocheck: false}, nocheckNode);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Checkbox nocheck Demo</h1>
+<h6>[ File Path: excheck/checkbox_nocheck.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of setting</h2>
+				<ul class="list">
+				<li>This Demo only shows how use the ‘nocheck’ attribute, detailed configuration information, please refer to 'Checkbox Operation'</li>
+				<li class="highlight_red">setting.check.nocheckInherit can set the child nodes to automatically inherit the parent node's 'nocheck' attribute. See the API documentation for more related contents.</li>
+				<li><p>Try:<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="nocheckTrue" href="#" title="set checkbox to be hidden." onclick="return false;">hide checkbox</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="nocheckFalse" href="#" title="set checkbox to be show." onclick="return false;">show checkbox</a> ]
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of treeNode</h2>
+				<ul class="list">
+				<li class="highlight_red">1), If you need to initialize the node don't show checkbox, please set treeNode.nocheck attribute. See the API documentation for more related contents.</li>
+				<li>2), By the way, please see the 'Checkbox Operation' Demo.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/excheck/radio.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/excheck/radio.html
new file mode 100644
index 0000000..f21c5bc
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/excheck/radio.html
@@ -0,0 +1,97 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - radio</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<!--
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			check: {
+				enable: true,
+				chkStyle: "radio",
+				radioType: "level"
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"can check 1", open:true},
+			{ id:11, pId:1, name:"can check 1-1", open:true},
+			{ id:111, pId:11, name:"can check 1-1-1"},
+			{ id:112, pId:11, name:"can check 1-1-2"},
+			{ id:12, pId:1, name:"can check 1-2", open:true},
+			{ id:121, pId:12, name:"can check 1-2-1"},
+			{ id:122, pId:12, name:"can check 1-2-2"},
+			{ id:2, pId:0, name:"can check 2", checked:true, open:true},
+			{ id:21, pId:2, name:"can check 2-1"},
+			{ id:22, pId:2, name:"can check 2-2", open:true},
+			{ id:221, pId:22, name:"can check 2-2-1", checked:true},
+			{ id:222, pId:22, name:"can check 2-2-2"},
+			{ id:23, pId:2, name:"can check 2-3"}
+		];
+		
+		var code;		
+		function setCheck() {
+			var type = $("#level").attr("checked")? "level":"all";
+			setting.check.radioType = type;
+			showCode('setting.check.radioType = "' + type + '";');
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		}
+		function showCode(str) {
+			if (!code) code = $("#code");
+			code.empty();
+			code.append("<li>"+str+"</li>");
+		}
+		
+		$(document).ready(function(){
+			setCheck();			
+			$("#level").bind("change", setCheck);
+			$("#all").bind("change", setCheck);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Radio Operation</h1>
+<h6>[ File Path: excheck/radio.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of setting</h2>
+				<ul class="list">
+				<li class="highlight_red">Must set setting.check attributes, see the API documentation for more related contents.</li>
+				<li><p>group range of radio: <br/><input type="radio" id="level" class="radio first" name="radioGroup" checked /><span>within the same level</span>
+						<input type="radio" id="all" class="radio" name="radioGroup"/><span>within the whole tree</span><br/>
+						<ul id="code" class="log" style="height:20px;"></ul></p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of treeNode</h2>
+				<ul class="list">
+				<li class="highlight_red">1), If you need to initialize the node is checked, please set treeNode.checked attribute. See the API documentation for more related contents.</li>
+				<li class="highlight_red">2), If you need to initialize the node don't show radio, please set treeNode.nocheck attribute. See the API documentation for more related contents.</li>
+				<li class="highlight_red">3), If you need to change 'checked' to other attribute, please set setting.data.key.checked attribute. See the API documentation for more related contents.</li>
+				<li>4), By the way, please see the API documentation for 'treeNode.checkedOld / getCheckStatus / check_Child_State / check_Focus'.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/excheck/radio_chkDisabled.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/excheck/radio_chkDisabled.html
new file mode 100644
index 0000000..08282d7
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/excheck/radio_chkDisabled.html
@@ -0,0 +1,101 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - Radio chkDisabled</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<!--
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			check: {
+				enable: true,
+				chkStyle: "radio",
+				radioType: "level"
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"can check 1", open:true},
+			{ id:11, pId:1, name:"can check 1-1", open:true},
+			{ id:111, pId:11, name:"disabled 1-1-1", chkDisabled:true, checked:true},
+			{ id:112, pId:11, name:"can check 1-1-2"},
+			{ id:12, pId:1, name:"disabled 1-2", chkDisabled:true, open:true},
+			{ id:121, pId:12, name:"disabled 1-2-1", checked:true},
+			{ id:122, pId:12, name:"disabled 1-2-2"},
+			{ id:2, pId:0, name:"can check 2", checked:true, open:true},
+			{ id:21, pId:2, name:"can check 2-1"},
+			{ id:22, pId:2, name:"can check 2-2", open:true},
+			{ id:221, pId:22, name:"can check 2-2-1", checked:true},
+			{ id:222, pId:22, name:"can check 2-2-2"},
+			{ id:23, pId:2, name:"can check 2-3"}
+		];
+		
+		function disabledNode(e) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			disabled = e.data.disabled,
+			nodes = zTree.getSelectedNodes();
+			if (nodes.length == 0) {
+				alert("Please select one node at first...");
+			}
+
+			for (var i=0, l=nodes.length; i<l; i++) {
+				zTree.setChkDisabled(nodes[i], disabled);
+			}
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			$("#disabledTrue").bind("click", {disabled: true}, disabledNode);
+			$("#disabledFalse").bind("click", {disabled: false}, disabledNode);
+
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Radio chkDisabled Demo</h1>
+<h6>[ File Path: excheck/radio_chkDisabled.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of 'setChkDisabled' method</h2>
+				<ul class="list">
+				<li>'setChkDisabled' method can set the node's checkbox / radio to be disabled or abled. See the API documentation for more related contents.</li>
+				<li><p>Try:<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="disabledTrue" href="#" title="set checkbox to be disabled." onclick="return false;">be disabled</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="disabledFalse" href="#" title="set checkbox to be abled." onclick="return false;">be abled</a> ]</p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of setting</h2>
+				<ul class="list">
+				<li>This Demo only shows how use the ‘nocheck’ attribute, detailed configuration information, please refer to 'Radio Operation'</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3, Explanation of treeNode</h2>
+				<ul class="list">
+				<li class="highlight_red">1), If you need to initialize the node don't show radio, please set treeNode.chkDisabled attribute. See the API documentation for more related contents.</li>
+				<li>2), By the way, please see the 'Radio Operation' Demo.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/excheck/radio_fun.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/excheck/radio_fun.html
new file mode 100644
index 0000000..9a32fc3
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/excheck/radio_fun.html
@@ -0,0 +1,151 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - beforeCheck / onCheck</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<!--
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				selectedMulti: false
+			},
+			check: {
+				enable: true,
+				chkStyle: "radio",
+				radioType: "level"
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeCheck: beforeCheck,
+				onCheck: onCheck
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"can check 1", open:true},
+			{ id:11, pId:1, name:"no radio 1-1", nocheck:true},
+			{ id:12, pId:1, name:"can check 1-2", open:true},
+			{ id:121, pId:12, name:"can check 1-2-1"},
+			{ id:122, pId:12, name:"can check 1-2-2"},
+			{ id:123, pId:12, name:"no radio 1-2-3", nocheck:true},
+			{ id:13, pId:1, name:"can check 1-3"},
+			{ id:2, pId:0, name:"can't check 2", open:true, doCheck:false},
+			{ id:21, pId:2, name:"can't check 2-1", doCheck:false},
+			{ id:22, pId:2, name:"can't check 2-2", checked:true, open:true, doCheck:false},
+			{ id:221, pId:22, name:"can't chk 2-2-1", doCheck:false},
+			{ id:222, pId:22, name:"can't chk 2-2-2", checked:true, doCheck:false},
+			{ id:223, pId:22, name:"can't chk 2-2-3", doCheck:false},
+			{ id:23, pId:2, name:"can't check 2-3", doCheck:false}
+		];
+		
+		var code, log, className = "dark";
+		function beforeCheck(treeId, treeNode) {
+			className = (className === "dark" ? "":"dark");
+			showLog("[ "+getTime()+" beforeCheck ]&nbsp;&nbsp;&nbsp;&nbsp;" + treeNode.name );
+			return (treeNode.doCheck !== false);
+		}
+		function onCheck(e, treeId, treeNode) {
+			showLog("[ "+getTime()+" onCheck ]&nbsp;&nbsp;&nbsp;&nbsp;" + treeNode.name );
+		}		
+		function showLog(str) {
+			if (!log) log = $("#log");
+			log.append("<li class='"+className+"'>"+str+"</li>");
+			if(log.children("li").length > 6) {
+				log.get(0).removeChild(log.children("li")[0]);
+			}
+		}
+		function getTime() {
+			var now= new Date(),
+			h=now.getHours(),
+			m=now.getMinutes(),
+			s=now.getSeconds(),
+			ms=now.getMilliseconds();
+			return (h+":"+m+":"+s+ " " +ms);
+		}
+
+		function checkNode(e) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			type = e.data.type,
+			nodes = zTree.getSelectedNodes();
+			if (type.indexOf("All")<0 && nodes.length == 0) {
+				alert("Please select one node at first...");
+			}
+
+			if (type == "checkAllTrue") {
+				zTree.checkAllNodes(true);
+			} else if (type == "checkAllFalse") {
+				zTree.checkAllNodes(false);
+			} else {
+				var callbackFlag = $("#callbackTrigger").attr("checked");
+				for (var i=0, l=nodes.length; i<l; i++) {
+					if (type == "checkTrue") {
+						zTree.checkNode(nodes[i], true, null, callbackFlag);
+					} else if (type == "checkFalse") {
+						zTree.checkNode(nodes[i], false, null, callbackFlag);
+					}else if (type == "checkTruePS") {
+						zTree.checkNode(nodes[i], true, true, callbackFlag);
+					} else if (type == "checkFalsePS") {
+						zTree.checkNode(nodes[i], false, true, callbackFlag);
+					}
+				}
+			}
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			$("#checkTrue").bind("click", {type:"checkTrue"}, checkNode);
+			$("#checkFalse").bind("click", {type:"checkFalse"}, checkNode);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Radio - zTree methods</h1>
+<h6>[ File Path: excheck/radio_fun.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, 'beforeCheck / onCheck' callback function</h2>
+				<ul class="list">
+				<li>Use 'beforeCheck / onCheck' callback function can control whether to allow changes to the node check state. This simple demo shows how to monitor the check event.</li>
+				<li><p>By the way also demonstrates how to use the 'checkNode' method triggers 'beforeCheck / onCheck' callback, Try: <br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" id="callbackTrigger" checked /> Whether trigger the callback when execution checkNode() method.<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="checkTrue" href="#" title="check..." onclick="return false;">check</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="checkFalse" href="#" title="uncheck..." onclick="return false;">uncheck</a> ]</p>
+				<li><p><span class="highlight_red">How to use 'zTreeObj.checkNode' method,  please see the API documentation.</span><br/>
+					beforeCheck / onCheck log:<br/>
+					<ul id="log" class="log" style="height:130px;"></ul></p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of setting</h2>
+				<ul class="list">
+				<li>Same as 'Radio Operation'</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3, Explanation of treeNode</h2>
+				<ul class="list">
+				<li>Same as 'Radio Operation'</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/excheck/radio_halfCheck.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/excheck/radio_halfCheck.html
new file mode 100644
index 0000000..932e837
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/excheck/radio_halfCheck.html
@@ -0,0 +1,93 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - Radio halfCheck</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<!--
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			async: {
+				enable: true,
+				url:"../asyncData/getNodes.php",
+				autoParam:["id", "name=n", "level=lv"],
+				otherParam:{"chk":"chk"}
+			},
+			check: {
+				enable: true,
+				autoCheckTrigger: true,
+				chkStyle: "radio",
+				radioType: "level"
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				onAsyncSuccess: onAsyncSuccess
+			}
+		};
+
+		function onAsyncSuccess(event, treeId, treeNode, msg) {
+			cancelHalf(treeNode);
+		}
+		function cancelHalf(treeNode) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			treeNode.halfCheck = false;
+			zTree.updateNode(treeNode);			
+		}
+
+		var zNodes =[
+			{ id:1, pId:0, name:"half 1", halfCheck:true, isParent:true},
+			{ id:2, pId:0, name:"half 2", halfCheck:true, checked:true, isParent:true},
+			{ id:3, pId:0, name:"no half 3", isParent:true}
+		];
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Radio halfCheck Demo</h1>
+<h6>[ File Path: excheck/radio_halfCheck.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of Demo</h2>
+				<ul class="list">
+				<li>This demo implements the check operation of the dynamic tree</li>
+				<li class="highlight_red">1). After loaded child nodes, the parent node's 'halfCheck' attribute will be invalid immediately.</li>
+				<li class="highlight_red">2). If you check the parent node, will not effect the child nodes's check status.</li>
+				<li class="highlight_red">3). If you check the parent node, it's child node's 'halfCheck' attribute will still be valid.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of setting</h2>
+				<ul class="list">
+				<li>Half-checked functional don't need to configure any parameter. But it is accessibility, can not used alone. So please configure the parameters which you need.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3, Explanation of treeNode</h2>
+				<ul class="list">
+				<li class="highlight_red">1), Please set treeNode.halfCheck attribute, before zTree initialize. See the API documentation for more related contents.</li>
+				<li>2), By the way, please see the 'Radio Operation' Demo.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/excheck/radio_nocheck.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/excheck/radio_nocheck.html
new file mode 100644
index 0000000..e9e3b48
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/excheck/radio_nocheck.html
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - no radio</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<!--
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			check: {
+				enable: true,
+				chkStyle: "radio",
+				radioType: "level"
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"can check 1", open:true},
+			{ id:11, pId:1, name:"can check 1-1", open:true},
+			{ id:111, pId:11, name:"no radio 1-1-1", nocheck:true},
+			{ id:112, pId:11, name:"can check 1-1-2"},
+			{ id:12, pId:1, name:"no radio 1-2", nocheck:true, open:true},
+			{ id:121, pId:12, name:"no radio 1-2-1"},
+			{ id:122, pId:12, name:"no radio 1-2-2"},
+			{ id:2, pId:0, name:"can check 2", checked:true, open:true},
+			{ id:21, pId:2, name:"can check 2-1"},
+			{ id:22, pId:2, name:"can check 2-2", open:true},
+			{ id:221, pId:22, name:"can check 2-2-1", checked:true},
+			{ id:222, pId:22, name:"can check 2-2-2"},
+			{ id:23, pId:2, name:"can check 2-3"}
+		];
+		
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Radio nocheck Demo</h1>
+<h6>[ File Path: excheck/radio_nocheck.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of setting</h2>
+				<ul class="list">
+				<li>This Demo only shows how use the ‘nocheck’ attribute, detailed configuration information, please refer to 'Radio Operation'</li>
+				<li class="highlight_red">setting.check.nocheckInherit can set the child nodes to automatically inherit the parent node's 'nocheck' attribute. See the API documentation for more related contents.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of treeNode</h2>
+				<ul class="list">
+				<li class="highlight_red">1), If you need to initialize the node don't show radio, please set treeNode.nocheck attribute. See the API documentation for more related contents.</li>
+				<li>2), By the way, please see the 'Radio Operation' Demo.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/exedit/async_edit.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/exedit/async_edit.html
new file mode 100644
index 0000000..26c6db9
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/exedit/async_edit.html
@@ -0,0 +1,120 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - async & edit</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			async: {
+				enable: true,
+				url:"../asyncData/getNodes.php",
+				autoParam:["id", "name=n", "level=lv"],
+				otherParam:{"otherParam":"zTreeAsyncTest"},
+				dataFilter: filter
+			},
+			view: {expandSpeed:"",
+				addHoverDom: addHoverDom,
+				removeHoverDom: removeHoverDom,
+				selectedMulti: false
+			},
+			edit: {
+				enable: true
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeRemove: beforeRemove,
+				beforeRename: beforeRename
+			}
+		};
+
+		function filter(treeId, parentNode, childNodes) {
+			if (!childNodes) return null;
+			for (var i=0, l=childNodes.length; i<l; i++) {
+				childNodes[i].name = childNodes[i].name.replace(/\.n/g, '.');
+			}
+			return childNodes;
+		}
+		function beforeRemove(treeId, treeNode) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			zTree.selectNode(treeNode);
+			return confirm("Confirm delete node '" + treeNode.name + "' it?");
+		}		
+		function beforeRename(treeId, treeNode, newName) {
+			if (newName.length == 0) {
+				alert("Node name can not be empty.");
+				return false;
+			}
+			return true;
+		}
+
+		var newCount = 1;
+		function addHoverDom(treeId, treeNode) {
+			var sObj = $("#" + treeNode.tId + "_span");
+			if (treeNode.editNameFlag || $("#addBtn_"+treeNode.tId).length>0) return;
+			var addStr = "<span class='button add' id='addBtn_" + treeNode.tId
+				+ "' title='add node' onfocus='this.blur();'></span>";
+			sObj.after(addStr);
+			var btn = $("#addBtn_"+treeNode.tId);
+			if (btn) btn.bind("click", function(){
+				var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+				zTree.addNodes(treeNode, {id:(100 + newCount), pId:treeNode.id, name:"new node" + (newCount++)});
+				return false;
+			});
+		};
+		function removeHoverDom(treeId, treeNode) {
+			$("#addBtn_"+treeNode.tId).unbind().remove();
+		};
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting);
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+.ztree li span.button.add {margin-left:2px; margin-right: -1px; background-position:-144px 0; vertical-align:top; *vertical-align:middle}
+	</style>
+</HEAD>
+
+<BODY>
+<h1>Editing Dynamic Tree</h1>
+<h6>[ File Path: exedit/async_edit.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of editing dynamic tree</h2>
+				<ul class="list">
+				<li>1) This Demo is based on the "Advanced Edit Nodes" to modify, and open to drag and drop functionality, can be compared with that demo.</li>
+				<li>2) At the same time set the editing mode and dynamic mode can be achieved editing dynamic tree.</li>
+				<li class="highlight_red">3) zTree improved editing capabilities in dynamic mode, if the parent node hasn‘t loaded the child nodes, it will first load the child nodes before it add child node.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of setting</h2>
+				<ul class="list">
+				<li class="highlight_red">1) Use editing features, please refer to "Normal Drag Node Operation" & "Basic Edit Nodes" demo of the instructions.</li>
+				<li class="highlight_red">2) Use dynamic loading, please refer to "Dynamic Tree with Ajax" demo of the instructions.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3, Explanation of treeNode</h2>
+				<ul class="list">
+				<li>No special requirements on the node data, please refer to "Dynamic Tree with Ajax" & "Normal Drag Node Operation" & "Basic Edit Nodes" demo of the instructions</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/exedit/drag.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/exedit/drag.html
new file mode 100644
index 0000000..30aff42
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/exedit/drag.html
@@ -0,0 +1,136 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - drag & drop</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			edit: {
+				enable: true,
+				showRemoveBtn: false,
+				showRenameBtn: false
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeDrag: beforeDrag,
+				beforeDrop: beforeDrop
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"can drag 1", open:true},
+			{ id:11, pId:1, name:"can drag 1-1"},
+			{ id:12, pId:1, name:"can drag 1-2", open:true},
+			{ id:121, pId:12, name:"can drag 1-2-1"},
+			{ id:122, pId:12, name:"can drag 1-2-2"},
+			{ id:123, pId:12, name:"can drag 1-2-3"},
+			{ id:13, pId:1, name:"can't drag 1-3", open:true, drag:false},
+			{ id:131, pId:13, name:"can't drag 1-3-1", drag:false},
+			{ id:132, pId:13, name:"can't drag 1-3-2", drag:false},
+			{ id:133, pId:13, name:"can drag 1-3-3"},
+			{ id:2, pId:0, name:"can drag 2", open:true},
+			{ id:21, pId:2, name:"can drag 2-1"},
+			{ id:22, pId:2, name:"can't drop 2-2", open:true, drop:false},
+			{ id:221, pId:22, name:"can drag 2-2-1"},
+			{ id:222, pId:22, name:"can drag 2-2-2"},
+			{ id:223, pId:22, name:"can drag 2-2-3"},
+			{ id:23, pId:2, name:"can drag 2-3"}
+		];
+
+		function beforeDrag(treeId, treeNodes) {
+			for (var i=0,l=treeNodes.length; i<l; i++) {
+				if (treeNodes[i].drag === false) {
+					return false;
+				}
+			}
+			return true;
+		}
+		function beforeDrop(treeId, treeNodes, targetNode, moveType) {
+			return targetNode ? targetNode.drop !== false : true;
+		}
+
+		function setCheck() {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			isCopy = $("#copy").attr("checked"),
+			isMove = $("#move").attr("checked"),
+			prev = $("#prev").attr("checked"),
+			inner = $("#inner").attr("checked"),
+			next = $("#next").attr("checked");
+			zTree.setting.edit.drag.isCopy = isCopy;
+			zTree.setting.edit.drag.isMove = isMove;
+			showCode(1, ['setting.edit.drag.isCopy = ' + isCopy, 'setting.edit.drag.isMove = ' + isMove]);
+
+			zTree.setting.edit.drag.prev = prev;
+			zTree.setting.edit.drag.inner = inner;
+			zTree.setting.edit.drag.next = next;
+			showCode(2, ['setting.edit.drag.prev = ' + prev, 'setting.edit.drag.inner = ' + inner, 'setting.edit.drag.next = ' + next]);
+		}
+		function showCode(id, str) {
+			var code = $("#code" + id);
+			code.empty();
+			for (var i=0, l=str.length; i<l; i++) {
+				code.append("<li>"+str[i]+"</li>");
+			}
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			setCheck();
+			$("#copy").bind("change", setCheck);
+			$("#move").bind("change", setCheck);
+			$("#prev").bind("change", setCheck);
+			$("#inner").bind("change", setCheck);
+			$("#next").bind("change", setCheck);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Normal Drag Node Operation</h1>
+<h6>[ File Path: exedit/drag.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of setting</h2>
+				<ul class="list">
+				<li>This Demo only shows how to drag & drop nodes using the basic method and configure parameters.</li>
+				<li class="highlight_red">1) Must set 'setting.edit' attributes, see the API documentation for more related contents.</li>
+				<li class="highlight_red">2) If you want to use drag & drop callback, muse to set 'setting.callback.beforeDrag / onDrag / beforeDrop / onDrop' attributes, see the API documentation for more related contents.</li>
+				<li><p>Basic settings:<br/>
+						<input type="checkbox" id="copy" class="checkbox first" checked /><span>can Copy</span>
+						<input type="checkbox" id="move" class="checkbox " checked /><span>can Move</span><br/>
+						<ul id="code1" class="log" style="height:42px;"></ul></p>
+				</li>
+				<li><p>Position settings:<br/>
+						<input type="checkbox" id="prev" class="checkbox first" checked /><span>prev</span>
+						<input type="checkbox" id="inner" class="checkbox " checked /><span>inner</span>
+						<input type="checkbox" id="next" class="checkbox " checked /><span>next</span><br/>
+						<ul id="code2" class="log" style="height:65px;"></ul></p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of treeNode</h2>
+				<ul class="list">
+				<li>No special requirements on the node data, the user can add custom attributes.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/exedit/drag_fun.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/exedit/drag_fun.html
new file mode 100644
index 0000000..1215ba2
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/exedit/drag_fun.html
@@ -0,0 +1,180 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - copyNode / moveNode</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				selectedMulti: false
+			},
+			edit: {
+				enable: true,
+				showRemoveBtn: false,
+				showRenameBtn: false
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeDrag: beforeDrag,
+				beforeClick: beforeClick
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"parent node 1", open:true},
+			{ id:11, pId:1, name:"leaf node 1-1"},
+			{ id:12, pId:1, name:"leaf node 1-2"},
+			{ id:13, pId:1, name:"leaf node 1-3"},
+			{ id:2, pId:0, name:"parent node 2", open:true},
+			{ id:21, pId:2, name:"leaf node 2-1"},
+			{ id:22, pId:2, name:"leaf node 2-2"},
+			{ id:23, pId:2, name:"leaf node 2-3"},
+			{ id:3, pId:0, name:"parent node 3", open:true },
+			{ id:31, pId:3, name:"leaf node 3-1"},
+			{ id:32, pId:3, name:"leaf node 3-2"},
+			{ id:33, pId:3, name:"leaf node 3-3"}
+		];
+
+		function fontCss(treeNode) {
+			var aObj = $("#" + treeNode.tId + "_a");
+			aObj.removeClass("copy").removeClass("cut");
+			if (treeNode === curSrcNode) {
+				if (curType == "copy") {
+					aObj.addClass(curType);
+				} else {
+					aObj.addClass(curType);
+				}			
+			}
+		}
+
+		function beforeDrag(treeId, treeNodes) {
+			return false;
+		}
+
+		function beforeClick(treeId, treeNode) {
+			return !treeNode.isCur;
+		}
+
+		var curSrcNode, curType;
+		function setCurSrcNode(treeNode) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			if (curSrcNode) {
+				delete curSrcNode.isCur;
+				var tmpNode = curSrcNode;
+				curSrcNode = null;
+				fontCss(tmpNode);
+			}
+			curSrcNode = treeNode;
+			if (!treeNode) return;
+
+			curSrcNode.isCur = true;			
+			zTree.cancelSelectedNode();
+			fontCss(curSrcNode);
+		}
+		function copy(e) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nodes = zTree.getSelectedNodes();
+			if (nodes.length == 0) {
+				alert("Please select one node at first...");
+				return;
+			}
+			curType = "copy";
+			setCurSrcNode(nodes[0]);
+		}
+		function cut(e) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nodes = zTree.getSelectedNodes();
+			if (nodes.length == 0) {
+				alert("Please select one node at first...");
+				return;
+			}
+			curType = "cut";
+			setCurSrcNode(nodes[0]);
+		}
+		function paste(e) {
+			if (!curSrcNode) {
+				alert("Please select one node to copy or cut at first...");
+				return;
+			}
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nodes = zTree.getSelectedNodes(),
+			targetNode = nodes.length>0? nodes[0]:null;
+			if (curSrcNode === targetNode) {
+				alert("Can't move, the same source node and destination node.");
+				return;
+			} else if (curType === "cut" && ((!!targetNode && curSrcNode.parentTId === targetNode.tId) || (!targetNode && !curSrcNode.parentTId))) {
+				alert("Can't move, source node is the target node's child.");
+				return;
+			} else if (curType === "copy") {
+				targetNode = zTree.copyNode(targetNode, curSrcNode, "inner");
+			} else if (curType === "cut") {
+				targetNode = zTree.moveNode(targetNode, curSrcNode, "inner");
+				if (!targetNode) {
+					alert("Cutting failure, source node is the target node's parent.");
+				}
+				targetNode = curSrcNode;
+			}
+			setCurSrcNode();
+			delete targetNode.isCur;
+			zTree.selectNode(targetNode);
+		}
+		
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			$("#copy").bind("click", copy);
+			$("#cut").bind("click", cut);
+			$("#paste").bind("click", paste);
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+.ztree li a.copy{padding-top:0; background-color:#316AC5; color:white; border:1px #316AC5 solid;}
+.ztree li a.cut{padding-top:0; background-color:silver; color:#111; border:1px #316AC5 dotted;}
+	</style>
+</HEAD>
+
+<BODY>
+<h1>Move / Copy - zTree methods</h1>
+<h6>[ File Path: exedit/drag_fun.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of 'copyNode / moveNode' method</h2>
+				<ul class="list">
+				<li>Use 'copyNode / moveNode' method can also be achieved copy / move nodes.</li>
+				<li><p>Try to copy or cut node:<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="copy" href="#" title="copy" onclick="return false;">copy</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="cut" href="#" title="cut" onclick="return false;">cut</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="paste" href="#" title="paste" onclick="return false;">paste</a> ]</p>
+				<li class="highlight_red">How to use 'zTreeObj.copyNode / moveNode' method,  please see the API documentation.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of setting</h2>
+				<ul class="list">
+				<li>Same as 'Normal Drag Node Operation'</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3, Explanation of treeNode</h2>
+				<ul class="list">
+				<li>Same as 'Normal Drag Node Operation'</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/exedit/drag_super.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/exedit/drag_super.html
new file mode 100644
index 0000000..559f1ff
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/exedit/drag_super.html
@@ -0,0 +1,210 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - beforeDrag / onDrag / beforeDrop / onDrop</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			edit: {
+				drag: {
+					autoExpandTrigger: true,
+					prev: dropPrev,
+					inner: dropInner,
+					next: dropNext
+				},
+				enable: true,
+				showRemoveBtn: false,
+				showRenameBtn: false
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeDrag: beforeDrag,
+				beforeDrop: beforeDrop,
+				beforeDragOpen: beforeDragOpen,
+				onDrag: onDrag,
+				onDrop: onDrop,
+				onExpand: onExpand
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"can drag 1", open:true},
+			{ id:11, pId:1, name:"can drag 1-1"},
+			{ id:12, pId:1, name:"can drag 1-2"},
+			{ id:121, pId:12, name:"can drag 1-2-1"},
+			{ id:122, pId:12, name:"can drag 1-2-2"},
+			{ id:123, pId:12, name:"can drag 1-2-3"},
+			{ id:13, pId:1, name:"can't drag 1-3", open:true, drag:false},
+			{ id:131, pId:13, name:"can't drag 1-3-1", drag:false},
+			{ id:132, pId:13, name:"can't drag 1-3-2", drag:false},
+			{ id:132, pId:13, name:"can't drag 1-3-3", drag:false},
+			{ id:2, pId:0, name:"can't drag my child out 2", open:true, childOuter:false},
+			{ id:21, pId:2, name:"can't be parent  2-1", dropInner:false},
+			{ id:22, pId:2, name:"can't be root 2-2", dropRoot:false},
+			{ id:23, pId:2, name:"try to drag me 2-3"},
+			{ id:3, pId:0, name:"can't add/sort my child 3", open:true, childOrder:false, dropInner:false},
+			{ id:31, pId:3, name:"can drag 3-1"},
+			{ id:32, pId:3, name:"can drag 3-2"},
+			{ id:33, pId:3, name:"can drag 3-3"}
+		];
+
+		function dropPrev(treeId, nodes, targetNode) {
+			var pNode = targetNode.getParentNode();
+			if (pNode && pNode.dropInner === false) {
+				return false;
+			} else {
+				for (var i=0,l=curDragNodes.length; i<l; i++) {
+					var curPNode = curDragNodes[i].getParentNode();
+					if (curPNode && curPNode !== targetNode.getParentNode() && curPNode.childOuter === false) {
+						return false;
+					}
+				}
+			}
+			return true;
+		}
+		function dropInner(treeId, nodes, targetNode) {
+			if (targetNode && targetNode.dropInner === false) {
+				return false;
+			} else {
+				for (var i=0,l=curDragNodes.length; i<l; i++) {
+					if (!targetNode && curDragNodes[i].dropRoot === false) {
+						return false;
+					} else if (curDragNodes[i].parentTId && curDragNodes[i].getParentNode() !== targetNode && curDragNodes[i].getParentNode().childOuter === false) {
+						return false;
+					}
+				}
+			}
+			return true;
+		}
+		function dropNext(treeId, nodes, targetNode) {
+			var pNode = targetNode.getParentNode();
+			if (pNode && pNode.dropInner === false) {
+				return false;
+			} else {
+				for (var i=0,l=curDragNodes.length; i<l; i++) {
+					var curPNode = curDragNodes[i].getParentNode();
+					if (curPNode && curPNode !== targetNode.getParentNode() && curPNode.childOuter === false) {
+						return false;
+					}
+				}
+			}
+			return true;
+		}
+
+		var log, className = "dark", curDragNodes, autoExpandNode;
+		function beforeDrag(treeId, treeNodes) {
+			className = (className === "dark" ? "":"dark");
+			showLog("[ "+getTime()+" beforeDrag ]&nbsp;&nbsp;&nbsp;&nbsp; drag: " + treeNodes.length + " nodes." );
+			for (var i=0,l=treeNodes.length; i<l; i++) {
+				if (treeNodes[i].drag === false) {
+					curDragNodes = null;
+					return false;
+				} else if (treeNodes[i].parentTId && treeNodes[i].getParentNode().childDrag === false) {
+					curDragNodes = null;
+					return false;
+				}
+			}
+			curDragNodes = treeNodes;
+			return true;
+		}
+		function beforeDragOpen(treeId, treeNode) {
+			autoExpandNode = treeNode;
+			return true;
+		}
+		function beforeDrop(treeId, treeNodes, targetNode, moveType, isCopy) {
+			className = (className === "dark" ? "":"dark");
+			showLog("[ "+getTime()+" beforeDrop ]&nbsp;&nbsp;&nbsp;&nbsp; moveType:" + moveType);
+			showLog("target: " + (targetNode ? targetNode.name : "root") + "  -- is "+ (isCopy==null? "cancel" : isCopy ? "copy" : "move"));
+			return true;
+		}
+		function onDrag(event, treeId, treeNodes) {
+			className = (className === "dark" ? "":"dark");
+			showLog("[ "+getTime()+" onDrag ]&nbsp;&nbsp;&nbsp;&nbsp; drag: " + treeNodes.length + " nodes." );
+		}
+		function onDrop(event, treeId, treeNodes, targetNode, moveType, isCopy) {
+			className = (className === "dark" ? "":"dark");
+			showLog("[ "+getTime()+" onDrop ]&nbsp;&nbsp;&nbsp;&nbsp; moveType:" + moveType);
+			showLog("target: " + (targetNode ? targetNode.name : "root") + "  -- is "+ (isCopy==null? "cancel" : isCopy ? "copy" : "move"))
+		}
+		function onExpand(event, treeId, treeNode) {
+			if (treeNode === autoExpandNode) {
+				className = (className === "dark" ? "":"dark");
+				showLog("[ "+getTime()+" onExpand ]&nbsp;&nbsp;&nbsp;&nbsp;" + treeNode.name);
+			}
+		}
+
+		function showLog(str) {
+			if (!log) log = $("#log");
+			log.append("<li class='"+className+"'>"+str+"</li>");
+			if(log.children("li").length > 8) {
+				log.get(0).removeChild(log.children("li")[0]);
+			}
+		}
+		function getTime() {
+			var now= new Date(),
+			h=now.getHours(),
+			m=now.getMinutes(),
+			s=now.getSeconds(),
+			ms=now.getMilliseconds();
+			return (h+":"+m+":"+s+ " " +ms);
+		}
+
+		function setTrigger() {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			zTree.setting.edit.drag.autoExpandTrigger = $("#callbackTrigger").attr("checked");
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			$("#callbackTrigger").bind("change", {}, setTrigger);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Advanced Drag Node Operation</h1>
+<h6>[ File Path: exedit/drag_super.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, 'beforeDrag / onDrag'<br/>&nbsp;&nbsp;'beforeDrop / onDrop' callback function</h2>
+				<ul class="list">
+				<li>This Demo shows the configuration parameters to achieve a more flexible use of drag and drop rules, the operation can be compared with "Normal Drag Node Operation" example.</li>
+				<li>This Demo default allows copy & move.</li>
+				<li class="highlight_red">This Demo set 'setting.edit.drag.prev / inner / next'  as 'function', you can dynamically set according to the node, which can not use beforeDrop callback function, the effect of drag and drop will be better.</li>
+				<li><p><span class="highlight_red">After be familiar with these configurations, I think you can design a more flexible and rational rules!</span><br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" id="callbackTrigger" checked /> 拖拽节点时自动展开父节点是否触发 callback<br/>
+					drag / drop log:<br/>
+					<ul id="log" class="log"></ul></p></li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of setting</h2>
+				<ul class="list">
+				<li>Same as 'Normal Drag Node Operation'</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3, Explanation of treeNode</h2>
+				<ul class="list">
+				<li>Same as 'Normal Drag Node Operation'</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/exedit/edit.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/exedit/edit.html
new file mode 100644
index 0000000..fd60f05
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/exedit/edit.html
@@ -0,0 +1,115 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - edit</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			edit: {
+				enable: true
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeDrag: beforeDrag
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"parent node 1", open:true},
+			{ id:11, pId:1, name:"leaf node 1-1"},
+			{ id:12, pId:1, name:"leaf node 1-2"},
+			{ id:13, pId:1, name:"leaf node 1-3"},
+			{ id:2, pId:0, name:"parent node 2", open:true},
+			{ id:21, pId:2, name:"leaf node 2-1"},
+			{ id:22, pId:2, name:"leaf node 2-2"},
+			{ id:23, pId:2, name:"leaf node 2-3"},
+			{ id:3, pId:0, name:"parent node 3", open:true },
+			{ id:31, pId:3, name:"leaf node 3-1"},
+			{ id:32, pId:3, name:"leaf node 3-2"},
+			{ id:33, pId:3, name:"leaf node 3-3"}
+		];
+
+		function beforeDrag(treeId, treeNodes) {
+			return false;
+		}
+		
+		function setEdit() {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			remove = $("#remove").attr("checked"),
+			rename = $("#rename").attr("checked"),
+			removeTitle = $.trim($("#removeTitle").get(0).value),
+			renameTitle = $.trim($("#renameTitle").get(0).value);
+			zTree.setting.edit.showRemoveBtn = remove;
+			zTree.setting.edit.showRenameBtn = rename;
+			zTree.setting.edit.removeTitle = removeTitle;
+			zTree.setting.edit.renameTitle = renameTitle;
+			showCode(['setting.edit.showRemoveBtn = ' + remove, 'setting.edit.showRenameBtn = ' + rename,
+				'setting.edit.removeTitle = "' + removeTitle +'"', 'setting.edit.renameTitle = "' + renameTitle + '"']);
+		}
+		function showCode(str) {
+			var code = $("#code");
+			code.empty();
+			for (var i=0, l=str.length; i<l; i++) {
+				code.append("<li>"+str[i]+"</li>");
+			}
+		}
+		
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			setEdit();
+			$("#remove").bind("change", setEdit);
+			$("#rename").bind("change", setEdit);
+			$("#removeTitle").bind("propertychange", setEdit)
+			.bind("input", setEdit);
+			$("#renameTitle").bind("propertychange", setEdit)
+			.bind("input", setEdit);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Basic Edit Nodes</h1>
+<h6>[ File Path: exedit/edit.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of setting</h2>
+				<ul class="list">
+				<li>This Demo only shows how to edit nodes using the basic method and configure parameters.</li>
+				<li class="highlight_red">1) Must set 'setting.edit' attributes, see the API documentation for more related contents.</li>
+				<li class="highlight_red">2) If you want to use remove / rename callback, muse to set 'setting.callback.beforeRemove / onRemove / beforeRename / onRename' attributes, see the API documentation for more related contents.</li>
+				<li class="highlight_red">3) zTree do not provide buttons for add nodes, please use the custom control methods 'addHoverDom / removeHoverDom' to achieve added functionality, see the API documentation for more related contents. Another way, you can see the demo named 'Advanced Edit Nodes'.</li>
+				<li><p>Edit button setting:<br/>
+						<input type="checkbox" id="remove" class="checkbox first" checked /><span>show remove button</span>
+						<input type="checkbox" id="rename" class="checkbox " checked /><span>show edit button</span><br/>
+						title for remove: <input type="text" id="removeTitle" value="remove" /><br/>
+						title for rename: <input type="text" id="renameTitle" value="rename" />
+						<ul id="code" class="log" style="height:85px;"></ul></p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of treeNode</h2>
+				<ul class="list">
+				<li>No special requirements on the node data, the user can add custom attributes.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/exedit/edit_fun.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/exedit/edit_fun.html
new file mode 100644
index 0000000..09c471e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/exedit/edit_fun.html
@@ -0,0 +1,194 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - addNodes / editName / removeNode / removeChildNodes</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				selectedMulti: false
+			},
+			edit: {
+				enable: true,
+				showRemoveBtn: false,
+				showRenameBtn: false
+			},
+			data: {
+				keep: {
+					parent:true,
+					leaf:true
+				},
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeDrag: beforeDrag,
+				beforeRemove: beforeRemove,
+				beforeRename: beforeRename,
+				onRemove: onRemove
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"parent node 1", open:true},
+			{ id:11, pId:1, name:"leaf node 1-1"},
+			{ id:12, pId:1, name:"leaf node 1-2"},
+			{ id:13, pId:1, name:"leaf node 1-3"},
+			{ id:2, pId:0, name:"parent node 2", open:true},
+			{ id:21, pId:2, name:"leaf node 2-1"},
+			{ id:22, pId:2, name:"leaf node 2-2"},
+			{ id:23, pId:2, name:"leaf node 2-3"},
+			{ id:3, pId:0, name:"parent node 3", open:true },
+			{ id:31, pId:3, name:"leaf node 3-1"},
+			{ id:32, pId:3, name:"leaf node 3-2"},
+			{ id:33, pId:3, name:"leaf node 3-3"}
+		];
+		var log, className = "dark";
+		function beforeDrag(treeId, treeNodes) {
+			return false;
+		}
+		function beforeRemove(treeId, treeNode) {
+			className = (className === "dark" ? "":"dark");
+			showLog("[ "+getTime()+" beforeRemove ]&nbsp;&nbsp;&nbsp;&nbsp; " + treeNode.name);
+			return confirm("Confirm delete node '" + treeNode.name + "' it?");
+		}
+		function onRemove(e, treeId, treeNode) {
+			showLog("[ "+getTime()+" onRemove ]&nbsp;&nbsp;&nbsp;&nbsp; " + treeNode.name);
+		}
+		function beforeRename(treeId, treeNode, newName) {
+			if (newName.length == 0) {
+				alert("Node name can not be empty.");
+				var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+				setTimeout(function(){zTree.editName(treeNode)}, 10);
+				return false;
+			}
+			return true;
+		}
+		function showLog(str) {
+			if (!log) log = $("#log");
+			log.append("<li class='"+className+"'>"+str+"</li>");
+			if(log.children("li").length > 8) {
+				log.get(0).removeChild(log.children("li")[0]);
+			}
+		}
+		function getTime() {
+			var now= new Date(),
+			h=now.getHours(),
+			m=now.getMinutes(),
+			s=now.getSeconds(),
+			ms=now.getMilliseconds();
+			return (h+":"+m+":"+s+ " " +ms);
+		}
+		
+		var newCount = 1;
+		function add(e) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			isParent = e.data.isParent,
+			nodes = zTree.getSelectedNodes(),
+			treeNode = nodes[0];
+			if (treeNode) {
+				treeNode = zTree.addNodes(treeNode, {id:(100 + newCount), pId:treeNode.id, isParent:isParent, name:"new node" + (newCount++)});
+			} else {
+				treeNode = zTree.addNodes(null, {id:(100 + newCount), pId:0, isParent:isParent, name:"new node" + (newCount++)});
+			}
+			if (treeNode) {
+				zTree.editName(treeNode[0]);
+			} else {
+				alert("Leaf node is locked and can not add child node.");
+			}
+		};
+		function edit() {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nodes = zTree.getSelectedNodes(),
+			treeNode = nodes[0];
+			if (nodes.length == 0) {
+				alert("Please select one node at first...");
+				return;
+			}
+			zTree.editName(treeNode);
+		};
+		function remove(e) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nodes = zTree.getSelectedNodes(),
+			treeNode = nodes[0];
+			if (nodes.length == 0) {
+				alert("Please select one node at first...");
+				return;
+			}
+			var callbackFlag = $("#callbackTrigger").attr("checked");
+			zTree.removeNode(treeNode, callbackFlag);
+		};
+		function clearChildren(e) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nodes = zTree.getSelectedNodes(),
+			treeNode = nodes[0];
+			if (nodes.length == 0 || !nodes[0].isParent) {
+				alert("Please select one parent node at first...");
+				return;
+			}
+			zTree.removeChildNodes(treeNode);
+		};
+		
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			$("#addParent").bind("click", {isParent:true}, add);
+			$("#addLeaf").bind("click", {isParent:false}, add);
+			$("#edit").bind("click", edit);
+			$("#remove").bind("click", remove);
+			$("#clearChildren").bind("click", clearChildren);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Edit Nodes - zTree methods</h1>
+<h6>[ File Path: exedit/edit_fun.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of 'addNodes / editName / removeNode / removeChildNodes' method</h2>
+				<ul class="list">
+				<li>Use 'addNodes / editName / removeNode / removeChildNodes' method can also be achieved copy / move nodes.</li>
+				<li>Method 'cancelEditName' is effective, only when edit the node name. Please use it when necessary, this demo doesn't show how to use the method.</li>
+				<li class="highlight_red">Use setting.data.keep.parent / leaf attribute, you can lock the parent node and leaf node.</li>
+				<li><p>Try to edit node:<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" id="callbackTrigger" checked /> Whether trigger the callback when execution removeNode() method.<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="addParent" href="#" title="add parent node" onclick="return false;">add parent node</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="addLeaf" href="#" title="add leaf node" onclick="return false;">add leaf node</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="edit" href="#" title="edit name" onclick="return false;">edit name</a> ]<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="remove" href="#" title="remove node" onclick="return false;">remove node</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="clearChildren" href="#" title="make child nodes to empty" onclick="return false;">make child nodes to empty</a> ]<br/>
+					remove log:<br/>
+					<ul id="log" class="log"></ul></p>
+				</li>
+				<li class="highlight_red">How to use 'zTreeObj.addNodes / cancelEditName / editName / removeNode / removeChildNodes' method,  please see the API documentation.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of setting</h2>
+				<ul class="list">
+				<li>Same as 'Basic Edit Nodes'</li>
+				<li class="highlight_red">Lock the parent / leaf node status, need to set setting.data.keep.parent / leaf attribute, see the API documentation for more related contents</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3, Explanation of treeNode</h2>
+				<ul class="list">
+				<li>Same as 'Basic Edit Nodes'</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/exedit/edit_super.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/exedit/edit_super.html
new file mode 100644
index 0000000..c00286d
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/exedit/edit_super.html
@@ -0,0 +1,183 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - beforeEditName / beforeRemove / onRemove / beforeRename / onRename</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				addHoverDom: addHoverDom,
+				removeHoverDom: removeHoverDom,
+				selectedMulti: false
+			},
+			edit: {
+				enable: true,
+				editNameSelectAll: true,
+				showRemoveBtn: showRemoveBtn,
+				showRenameBtn: showRenameBtn
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeDrag: beforeDrag,
+				beforeEditName: beforeEditName,
+				beforeRemove: beforeRemove,
+				beforeRename: beforeRename,
+				onRemove: onRemove,
+				onRename: onRename
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"parent node 1", open:true},
+			{ id:11, pId:1, name:"leaf node 1-1"},
+			{ id:12, pId:1, name:"leaf node 1-2"},
+			{ id:13, pId:1, name:"leaf node 1-3"},
+			{ id:2, pId:0, name:"parent node 2", open:true},
+			{ id:21, pId:2, name:"leaf node 2-1"},
+			{ id:22, pId:2, name:"leaf node 2-2"},
+			{ id:23, pId:2, name:"leaf node 2-3"},
+			{ id:3, pId:0, name:"parent node 3", open:true },
+			{ id:31, pId:3, name:"leaf node 3-1"},
+			{ id:32, pId:3, name:"leaf node 3-2"},
+			{ id:33, pId:3, name:"leaf node 3-3"}
+		];
+		var log, className = "dark";
+		function beforeDrag(treeId, treeNodes) {
+			return false;
+		}
+		function beforeEditName(treeId, treeNode) {
+			className = (className === "dark" ? "":"dark");
+			showLog("[ "+getTime()+" beforeEditName ]&nbsp;&nbsp;&nbsp;&nbsp; " + treeNode.name);
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			zTree.selectNode(treeNode);
+			return confirm("Start node '" + treeNode.name + "' editorial status?");
+		}
+		function beforeRemove(treeId, treeNode) {
+			className = (className === "dark" ? "":"dark");
+			showLog("[ "+getTime()+" beforeRemove ]&nbsp;&nbsp;&nbsp;&nbsp; " + treeNode.name);
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			zTree.selectNode(treeNode);
+			return confirm("Confirm delete node '" + treeNode.name + "' it?");
+		}
+		function onRemove(e, treeId, treeNode) {
+			showLog("[ "+getTime()+" onRemove ]&nbsp;&nbsp;&nbsp;&nbsp; " + treeNode.name);
+		}
+		function beforeRename(treeId, treeNode, newName, isCancel) {
+			className = (className === "dark" ? "":"dark");
+			showLog((isCancel ? "<span style='color:red'>":"") + "[ "+getTime()+" beforeRename ]&nbsp;&nbsp;&nbsp;&nbsp; " + treeNode.name + (isCancel ? "</span>":""));
+			if (newName.length == 0) {
+				alert("Node name can not be empty.");
+				var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+				setTimeout(function(){zTree.editName(treeNode)}, 10);
+				return false;
+			}
+			return true;
+		}
+		function onRename(e, treeId, treeNode, isCancel) {
+			showLog((isCancel ? "<span style='color:red'>":"") + "[ "+getTime()+" onRename ]&nbsp;&nbsp;&nbsp;&nbsp; " + treeNode.name + (isCancel ? "</span>":""));
+		}
+		function showRemoveBtn(treeId, treeNode) {
+			return !treeNode.isFirstNode;
+		}
+		function showRenameBtn(treeId, treeNode) {
+			return !treeNode.isLastNode;
+		}
+		function showLog(str) {
+			if (!log) log = $("#log");
+			log.append("<li class='"+className+"'>"+str+"</li>");
+			if(log.children("li").length > 8) {
+				log.get(0).removeChild(log.children("li")[0]);
+			}
+		}
+		function getTime() {
+			var now= new Date(),
+			h=now.getHours(),
+			m=now.getMinutes(),
+			s=now.getSeconds(),
+			ms=now.getMilliseconds();
+			return (h+":"+m+":"+s+ " " +ms);
+		}
+
+		var newCount = 1;
+		function addHoverDom(treeId, treeNode) {
+			var sObj = $("#" + treeNode.tId + "_span");
+			if (treeNode.editNameFlag || $("#addBtn_"+treeNode.tId).length>0) return;
+			var addStr = "<span class='button add' id='addBtn_" + treeNode.tId
+				+ "' title='add node' onfocus='this.blur();'></span>";
+			sObj.after(addStr);
+			var btn = $("#addBtn_"+treeNode.tId);
+			if (btn) btn.bind("click", function(){
+				var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+				zTree.addNodes(treeNode, {id:(100 + newCount), pId:treeNode.id, name:"new node" + (newCount++)});
+				return false;
+			});
+		};
+		function removeHoverDom(treeId, treeNode) {
+			$("#addBtn_"+treeNode.tId).unbind().remove();
+		};
+		function selectAll() {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			zTree.setting.edit.editNameSelectAll =  $("#selectAll").attr("checked");
+		}
+		
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			$("#selectAll").bind("click", selectAll);
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+.ztree li span.button.add {margin-left:2px; margin-right: -1px; background-position:-144px 0; vertical-align:top; *vertical-align:middle}
+	</style>
+</HEAD>
+
+<BODY>
+<h1>Advanced Edit Nodes</h1>
+<h6>[ File Path: exedit/edit_super.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, 'beforeDrag / onDrag'<br/>&nbsp;&nbsp;'beforeEditName'<br/>&nbsp;&nbsp;'beforeRemove / onRemove'<br/>&nbsp;&nbsp;'beforeRename / onRename' callback function</h2>
+				<ul class="list">
+				<li>This demo shows the use of custom controls, the callback function to enhance the user experience, the operation can be compared with "Basic Edit Nodes" example.</li>
+				<li>This demo achieve the Add nodes button.</li>
+				<li>This demo achieve the confirmation when deleting node.</li>
+				<li>This demo use the 'showRenameBtn' to hide the rename button, when the treeNode's isLastNode = true</li>
+				<li>This demo use the 'showRemoveBtn' to hide the delete button, when the treeNode's isFirstNode = true</li>
+				<li class="highlight_red">Can use 'beforeEditName' callback trigger custom editing.</li>
+				<li><p><span class="highlight_red">After be familiar with these configurations, I think you can design a more flexible and rational rules!</span><br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" id="selectAll" checked /> Whether select all text, when edit node's name.<br/>
+					remove / rename log:&nbsp;&nbsp;<span style="color:red">RED</span> is cancel edit (v3.5.13+)<br/>
+					<ul id="log" class="log"></ul></p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of setting</h2>
+				<ul class="list">
+				<li>Same as 'Basic Edit Nodes'</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3, Explanation of treeNode</h2>
+				<ul class="list">
+				<li>Same as 'Basic Edit Nodes'</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/exedit/multiTree.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/exedit/multiTree.html
new file mode 100644
index 0000000..b078f1b
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/exedit/multiTree.html
@@ -0,0 +1,94 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - multiTree</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			edit: {
+				enable: true,
+				showRemoveBtn: false,
+				showRenameBtn: false
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeDrag: beforeDrag,
+				beforeDrop: beforeDrop
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"parent node 1", open:true},
+			{ id:11, pId:1, name:"leaf node 1-1"},
+			{ id:12, pId:1, name:"leaf node 1-2"},
+			{ id:13, pId:1, name:"leaf node 1-3"},
+			{ id:2, pId:0, name:"parent node 2", open:true},
+			{ id:21, pId:2, name:"leaf node 2-1"},
+			{ id:22, pId:2, name:"leaf node 2-2"},
+			{ id:23, pId:2, name:"leaf node 2-3"},
+			{ id:3, pId:0, name:"parent node 3", open:true },
+			{ id:31, pId:3, name:"leaf node 3-1"},
+			{ id:32, pId:3, name:"leaf node 3-2"},
+			{ id:33, pId:3, name:"leaf node 3-3"}
+		];
+
+		function beforeDrag(treeId, treeNodes) {
+			for (var i=0,l=treeNodes.length; i<l; i++) {
+				if (treeNodes[i].drag === false) {
+					return false;
+				}
+			}
+			return true;
+		}
+		function beforeDrop(treeId, treeNodes, targetNode, moveType) {
+			return targetNode ? targetNode.drop !== false : true;
+		}
+		
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			$.fn.zTree.init($("#treeDemo2"), setting);
+			
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Multiple Trees</h1>
+<h6>[ File Path: exedit/multiTree.html ]</h6>
+<div class="content_wrap">
+	<div>
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of setting</h2>
+				<ul class="list">
+				<li>zTree enables drag and drop nodes between multiple trees, only need to create two draggable tree can be. And you can use the callback function and zTree method achieve a more complex operating rules, here is only the basic demo.</li>
+				<li class="highlight_red">On the 'setting' configuration information please refer to drag and drop, edit, etc. demo's instructions</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of treeNode</h2>
+				<ul class="list">
+				<li>No special requirements on the node data, the user can add custom attributes.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul id="treeDemo2" class="ztree"></ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/exhide/checkbox.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/exhide/checkbox.html
new file mode 100644
index 0000000..759701a
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/exhide/checkbox.html
@@ -0,0 +1,161 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - Hide With Checkbox Mode</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+<!--<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<script type="text/javascript" src="../../../js/jquery.ztree.exhide-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			check: {
+				enable: true
+			},
+			data: {
+				key: {
+					title: "title"
+				},
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				onCheck: onCheck
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"pNode 1", title:"", checked:true, open:true},
+			{ id:11, pId:1, name:"pNode 11", title:"", checked:true},
+			{ id:111, pId:11, name:"leaf node 111", title:"", checked:true, isHidden:true},
+			{ id:112, pId:11, name:"leaf node 112", title:""},
+			{ id:113, pId:11, name:"leaf node 113", title:""},
+			{ id:12, pId:1, name:"pNode 12", title:"", isHidden:true},
+			{ id:121, pId:12, name:"leaf node 121", title:""},
+			{ id:122, pId:12, name:"leaf node 122", title:"", isHidden:true},
+			{ id:123, pId:12, name:"leaf node 123", title:""},
+			{ id:2, pId:0, name:"pNode 2", title:""},
+			{ id:21, pId:2, name:"pNode 21", title:"", isHidden:true},
+			{ id:211, pId:21, name:"leaf node 211", title:""},
+			{ id:212, pId:21, name:"leaf node 212", title:""},
+			{ id:213, pId:21, name:"leaf node 213", title:""},
+			{ id:22, pId:2, name:"pNode 22", title:""},
+			{ id:221, pId:22, name:"leaf node 221", title:""},
+			{ id:222, pId:22, name:"leaf node 222", title:""},
+			{ id:223, pId:22, name:"leaf node 223", title:""}
+		];
+
+		function onCheck(e, treeId, treeNode) {
+			count();
+		}
+
+		function setTitle(node) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			var nodes = node ? [node]:zTree.transformToArray(zTree.getNodes());
+			for (var i=0, l=nodes.length; i<l; i++) {
+				var n = nodes[i];
+				n.title = "[" + n.id + "] isFirstNode = " + n.isFirstNode + ", isLastNode = " + n.isLastNode;
+				zTree.updateNode(n);
+			}
+		}
+		function count() {
+			function isForceHidden(node) {
+				if (!node.parentTId) return false;
+				var p = node.getParentNode();
+				return !!p.isHidden ? true : isForceHidden(p);
+			}
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			checkCount = zTree.getCheckedNodes(true).length,
+			nocheckCount = zTree.getCheckedNodes(false).length,
+			hiddenNodes = zTree.getNodesByParam("isHidden", true),
+			hiddenCount = hiddenNodes.length;
+
+			for (var i=0, j=hiddenNodes.length; i<j; i++) {
+				var n = hiddenNodes[i];
+				if (isForceHidden(n)) {
+					hiddenCount -= 1;
+				} else if (n.isParent) {
+					hiddenCount += zTree.transformToArray(n.children).length;
+				}
+			}
+
+			$("#isHiddenCount").text(hiddenNodes.length);
+			$("#hiddenCount").text(hiddenCount);
+			$("#checkCount").text(checkCount);
+			$("#nocheckCount").text(nocheckCount);
+		}
+		function showNodes() {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nodes = zTree.getNodesByParam("isHidden", true);
+			zTree.showNodes(nodes);
+			setTitle();
+			count();
+		}
+		function hideNodes() {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nodes = zTree.getSelectedNodes();
+			if (nodes.length == 0) {
+				alert("Please select one node at least.");
+				return;
+			}
+			zTree.hideNodes(nodes);
+			setTitle();
+			count();
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			$("#hideNodesBtn").bind("click", {type:"rename"}, hideNodes);
+			$("#showNodesBtn").bind("click", {type:"icon"}, showNodes);
+			setTitle();
+			count();
+		});
+		//-->
+	</SCRIPT>
+ </HEAD>
+
+<BODY>
+<h1>Hide With Checkbox Mode</h1>
+<h6>[ File Path: exhide/checkbox.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of setting</h2>
+				<ul class="list">
+				<li>Use the freature which to hide nodes, you don't need to set any attributes.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of treeNode</h2>
+				<ul class="list">
+				<li class="highlight_red">Before you init zTree, set treeNode.isHidden = true, and you can hide the node.</li>
+				<li><p>Hide or show the nodes:<br/>
+					Try: [ <a id="hideNodesBtn" href="#" onclick="return false;">Hide the nodes which be selected</a> ]<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="showNodesBtn" href="#" onclick="return false;">Show all of the nodes which be hidden</a> ]<br/>
+					<ul id="log" class="log" style="height:125px;">
+						<li>Total nodes which 'isHidden' attribute is true: <span id="isHiddenCount" class="highlight_red"></span></li>
+						<li>Total hidden nodes: <span id="hiddenCount" class="highlight_red"></span></li>
+						<li>Total check nodes: <span id="checkCount" class="highlight_red"></span>
+							&nbsp;&nbsp;Total uncheck nodes: <span id="nocheckCount" class="highlight_red"></span></li>
+						<li>After hide nodes, you can see the 'isFirstNode' and 'isLastNode' attributes on the nodes which still be shown.</li>
+					</ul></p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、Other explanation</h2>
+				<ul class="list">
+				<li>Hide nodes will effect the 'isFirstNode' and 'isLastNode' attributes, but will not effect the 'getPreNode()' and 'getNextNode()' method.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/exhide/common.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/exhide/common.html
new file mode 100644
index 0000000..9d660a9
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/exhide/common.html
@@ -0,0 +1,126 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - Hide Ordinary Node</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+<!--<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<script type="text/javascript" src="../../../js/jquery.ztree.exhide-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			data: {
+				key: {
+					title: "title"
+				},
+				simpleData: {
+					enable: true
+				}
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"pNode 1", title:"", open:true},
+			{ id:11, pId:1, name:"pNode 11", title:""},
+			{ id:111, pId:11, name:"leaf node  111", title:"", isHidden:true},
+			{ id:112, pId:11, name:"leaf node  112", title:""},
+			{ id:113, pId:11, name:"leaf node  113", title:""},
+			{ id:12, pId:1, name:"pNode 12", title:"", isHidden:true},
+			{ id:121, pId:12, name:"leaf node  121", title:""},
+			{ id:122, pId:12, name:"leaf node  122", title:"", isHidden:true},
+			{ id:123, pId:12, name:"leaf node  123", title:""},
+			{ id:2, pId:0, name:"pNode 2", title:""},
+			{ id:21, pId:2, name:"pNode 21", title:"", isHidden:true},
+			{ id:211, pId:21, name:"leaf node  211", title:""},
+			{ id:212, pId:21, name:"leaf node  212", title:""},
+			{ id:213, pId:21, name:"leaf node  213", title:""},
+			{ id:22, pId:2, name:"pNode 22", title:""},
+			{ id:221, pId:22, name:"leaf node  221", title:""},
+			{ id:222, pId:22, name:"leaf node  222", title:""},
+			{ id:223, pId:22, name:"leaf node  223", title:""}
+		];
+		function setTitle(node) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			var nodes = node ? [node]:zTree.transformToArray(zTree.getNodes());
+			for (var i=0, l=nodes.length; i<l; i++) {
+				var n = nodes[i];
+				n.title = "[" + n.id + "] isFirstNode = " + n.isFirstNode + ", isLastNode = " + n.isLastNode;
+				zTree.updateNode(n);
+			}
+		}
+		function count() {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			hiddenCount = zTree.getNodesByParam("isHidden", true).length;
+			$("#hiddenCount").text(hiddenCount);
+		}
+		function showNodes() {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nodes = zTree.getNodesByParam("isHidden", true);
+			zTree.showNodes(nodes);
+			setTitle();
+			count();
+		}
+		function hideNodes() {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nodes = zTree.getSelectedNodes();
+			if (nodes.length == 0) {
+				alert("Please select one node at least.");
+				return;
+			}
+			zTree.hideNodes(nodes);
+			setTitle();
+			count();
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			$("#hideNodesBtn").bind("click", {type:"rename"}, hideNodes);
+			$("#showNodesBtn").bind("click", {type:"icon"}, showNodes);
+			setTitle();
+			count();
+		});
+		//-->
+	</SCRIPT>
+ </HEAD>
+
+<BODY>
+<h1>Hide Ordinary Node</h1>
+<h6>[ File Path: exhide/common.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of setting</h2>
+				<ul class="list">
+				<li>Use this freature, you don't need to set any attributes.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of treeNode</h2>
+				<ul class="list">
+				<li class="highlight_red">Before you init zTree, set treeNode.isHidden = true, and you can hide the node.</li>
+				<li><p>Hide or show the nodes:<br/><br/>
+					Try: [ <a id="hideNodesBtn" href="#" onclick="return false;">Hide the nodes which be selected</a> ]<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="showNodesBtn" href="#" onclick="return false;">Show all of the nodes which be hidden</a> ]<br/><br/>
+					<ul id="log" class="log" style="height:65px;">
+						<li>Total hidden nodes ('isHidden' is true): <span id="hiddenCount" class="highlight_red"></span> 个</li>
+						<li>After hide nodes, you can see the 'isFirstNode' and 'isLastNode' attributes on the nodes which still be shown.</li>
+					</ul></p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、Other explanation</h2>
+				<ul class="list">
+				<li>Hide nodes will effect the 'isFirstNode' and 'isLastNode' attributes, but will not effect the 'getPreNode()' and 'getNextNode()' method.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/exhide/radio.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/exhide/radio.html
new file mode 100644
index 0000000..639d69c
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/exhide/radio.html
@@ -0,0 +1,162 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - Hide With Radio Mode</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+<!--<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<script type="text/javascript" src="../../../js/jquery.ztree.exhide-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			check: {
+				enable: true,
+				chkStyle: "radio"
+			},
+			data: {
+				key: {
+					title: "title"
+				},
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				onCheck: onCheck
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"pNode 1", title:"", checked:true, open:true},
+			{ id:11, pId:1, name:"pNode 11", title:"", checked:true},
+			{ id:111, pId:11, name:"leaf node 111", title:"", checked:true, isHidden:true},
+			{ id:112, pId:11, name:"leaf node 112", title:""},
+			{ id:113, pId:11, name:"leaf node 113", title:""},
+			{ id:12, pId:1, name:"pNode 12", title:"", isHidden:true},
+			{ id:121, pId:12, name:"leaf node 121", title:""},
+			{ id:122, pId:12, name:"leaf node 122", title:"", isHidden:true},
+			{ id:123, pId:12, name:"leaf node 123", title:""},
+			{ id:2, pId:0, name:"pNode 2", title:""},
+			{ id:21, pId:2, name:"pNode 21", title:"", isHidden:true},
+			{ id:211, pId:21, name:"leaf node 211", title:""},
+			{ id:212, pId:21, name:"leaf node 212", title:""},
+			{ id:213, pId:21, name:"leaf node 213", title:""},
+			{ id:22, pId:2, name:"pNode 22", title:""},
+			{ id:221, pId:22, name:"leaf node 221", title:""},
+			{ id:222, pId:22, name:"leaf node 222", title:""},
+			{ id:223, pId:22, name:"leaf node 223", title:""}
+		];
+
+		function onCheck(e, treeId, treeNode) {
+			count();
+		}
+
+		function setTitle(node) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			var nodes = node ? [node]:zTree.transformToArray(zTree.getNodes());
+			for (var i=0, l=nodes.length; i<l; i++) {
+				var n = nodes[i];
+				n.title = "[" + n.id + "] isFirstNode = " + n.isFirstNode + ", isLastNode = " + n.isLastNode;
+				zTree.updateNode(n);
+			}
+		}
+		function count() {
+			function isForceHidden(node) {
+				if (!node.parentTId) return false;
+				var p = node.getParentNode();
+				return !!p.isHidden ? true : isForceHidden(p);
+			}
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			checkCount = zTree.getCheckedNodes(true).length,
+			nocheckCount = zTree.getCheckedNodes(false).length,
+			hiddenNodes = zTree.getNodesByParam("isHidden", true),
+			hiddenCount = hiddenNodes.length;
+
+			for (var i=0, j=hiddenNodes.length; i<j; i++) {
+				var n = hiddenNodes[i];
+				if (isForceHidden(n)) {
+					hiddenCount -= 1;
+				} else if (n.isParent) {
+					hiddenCount += zTree.transformToArray(n.children).length;
+				}
+			}
+
+			$("#isHiddenCount").text(hiddenNodes.length);
+			$("#hiddenCount").text(hiddenCount);
+			$("#checkCount").text(checkCount);
+			$("#nocheckCount").text(nocheckCount);
+		}
+		function showNodes() {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nodes = zTree.getNodesByParam("isHidden", true);
+			zTree.showNodes(nodes);
+			setTitle();
+			count();
+		}
+		function hideNodes() {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nodes = zTree.getSelectedNodes();
+			if (nodes.length == 0) {
+				alert("Please select one node at least.");
+				return;
+			}
+			zTree.hideNodes(nodes);
+			setTitle();
+			count();
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			$("#hideNodesBtn").bind("click", {type:"rename"}, hideNodes);
+			$("#showNodesBtn").bind("click", {type:"icon"}, showNodes);
+			setTitle();
+			count();
+		});
+		//-->
+	</SCRIPT>
+ </HEAD>
+
+<BODY>
+<h1>Hide With Radio Mode</h1>
+<h6>[ File Path: exhide/radio.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of setting</h2>
+				<ul class="list">
+				<li>Use the freature which to hide nodes, you don't need to set any attributes.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of treeNode</h2>
+				<ul class="list">
+				<li class="highlight_red">Before you init zTree, set treeNode.isHidden = true, and you can hide the node.</li>
+				<li><p>Hide or show the nodes:<br/>
+					Try: [ <a id="hideNodesBtn" href="#" onclick="return false;">Hide the nodes which be selected</a> ]<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="showNodesBtn" href="#" onclick="return false;">Show all of the nodes which be hidden</a> ]<br/>
+					<ul id="log" class="log" style="height:125px;">
+						<li>Total nodes which 'isHidden' attribute is true: <span id="isHiddenCount" class="highlight_red"></span></li>
+						<li>Total hidden nodes: <span id="hiddenCount" class="highlight_red"></span></li>
+						<li>Total check nodes: <span id="checkCount" class="highlight_red"></span>
+							&nbsp;&nbsp;Total uncheck nodes: <span id="nocheckCount" class="highlight_red"></span></li>
+						<li>After hide nodes, you can see the 'isFirstNode' and 'isLastNode' attributes on the nodes which still be shown.</li>
+					</ul></p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、Other explanation</h2>
+				<ul class="list">
+				<li>Hide nodes will effect the 'isFirstNode' and 'isLastNode' attributes, but will not effect the 'getPreNode()' and 'getNextNode()' method.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/index.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/index.html
new file mode 100644
index 0000000..95d878e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/index.html
@@ -0,0 +1,157 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">

+<HTML>

+ <HEAD>

+  <TITLE> ZTREE DEMO </TITLE>

+  <meta http-equiv="content-type" content="text/html; charset=UTF-8">

+  <link rel="stylesheet" href="../../css/zTreeStyle/zTreeStyle.css" type="text/css">

+  <style>

+	body {

+	background-color: white;

+	margin:0; padding:0;

+	text-align: center;

+	}

+	div, p, table, th, td {

+		list-style:none; 

+		margin:0; padding:0; 

+		color:#333; font-size:12px; 

+		font-family:dotum, Verdana, Arial, Helvetica, AppleGothic, sans-serif;

+	}

+	#testIframe {margin-left: 10px;}

+  </style>

+<script type="text/javascript" src="../../js/jquery-1.4.4.min.js"></script>

+<script type="text/javascript" src="../../js/jquery.ztree.core-3.5.js"></script>

+  <SCRIPT type="text/javascript" >

+  <!--

+	var zTree;

+	var demoIframe;

+

+	var setting = {

+		view: {

+			dblClickExpand: false,

+			showLine: true,

+			selectedMulti: false

+		},

+		data: {

+			simpleData: {

+				enable:true,

+				idKey: "id",

+				pIdKey: "pId",

+				rootPId: ""

+			}

+		},

+		callback: {

+			beforeClick: function(treeId, treeNode) {

+				var zTree = $.fn.zTree.getZTreeObj("tree");

+				if (treeNode.isParent) {

+					zTree.expandNode(treeNode);

+					return false;

+				} else {

+					demoIframe.attr("src",treeNode.file + ".html");

+					return true;

+				}

+			}

+		}

+	};

+

+	var zNodes = [

+		{id:1, pId:0, name:"[core] Basic Functions", open:false},

+		{id:101, pId:1, name:"Standard JSON Data", file:"core/standardData"},

+		{id:102, pId:1, name:"Simple JSON Data", file:"core/simpleData"},

+		{id:103, pId:1, name:"Don't Show Line", file:"core/noline"},

+		{id:104, pId:1, name:"Don't Show Icon", file:"core/noicon"},

+		{id:105, pId:1, name:"Custom Icon - icon", file:"core/custom_icon"},

+		{id:106, pId:1, name:"Custom Icon - iconSkin", file:"core/custom_iconSkin"},

+		{id:107, pId:1, name:"Custom Fonts", file:"core/custom_font"},

+		{id:115, pId:1, name:"Hyperlinks Demo", file:"core/url"},

+		{id:108, pId:1, name:"Dynamic Tree with Ajax", file:"core/async"},

+		{id:109, pId:1, name:"Dynamic Tree - zTree methods", file:"core/async_fun"},

+		{id:110, pId:1, name:"Update Node - zTree methods", file:"core/update_fun"},

+		{id:111, pId:1, name:"Control of Click Node", file:"core/click"},

+		{id:112, pId:1, name:"Control of Expand Node", file:"core/expand"},

+		{id:113, pId:1, name:"Search Nodes", file:"core/searchNodes"},

+		{id:114, pId:1, name:"Other Mouse Events for zTree", file:"core/otherMouse"},

+

+		{id:2, pId:0, name:"[excheck] Checkbox & Radio", open:false},

+		{id:201, pId:2, name:"Checkbox Operation", file:"excheck/checkbox"},

+		{id:206, pId:2, name:"Checkbox nocheck Demo", file:"excheck/checkbox_nocheck"},

+		{id:207, pId:2, name:"Checkbox chkDisabled Demo", file:"excheck/checkbox_chkDisabled"},

+		{id:208, pId:2, name:"Checkbox halfCheck Demo", file:"excheck/checkbox_halfCheck"},

+		{id:202, pId:2, name:"Statistics Checkbox is Checked", file:"excheck/checkbox_count"},

+		{id:203, pId:2, name:"Checkbox - zTree methods", file:"excheck/checkbox_fun"},

+		{id:204, pId:2, name:"Radio Operation", file:"excheck/radio"},

+		{id:209, pId:2, name:"Radio nocheck Demo", file:"excheck/radio_nocheck"},

+		{id:210, pId:2, name:"Radio chkDisabled Demo", file:"excheck/radio_chkDisabled"},

+		{id:211, pId:2, name:"Radio halfCheck Demo", file:"excheck/radio_halfCheck"},

+		{id:205, pId:2, name:"Radio - zTree methods", file:"excheck/radio_fun"},

+

+		{id:3, pId:0, name:"[exedit] Editing", open:false},

+		{id:301, pId:3, name:"Normal Drag Node Operation", file:"exedit/drag"},

+		{id:302, pId:3, name:"Advanced Drag Node Operation", file:"exedit/drag_super"},

+		{id:303, pId:3, name:"Move / Copy - zTree methods", file:"exedit/drag_fun"},

+		{id:304, pId:3, name:"Basic Edit Nodes", file:"exedit/edit"},

+		{id:305, pId:3, name:"Advanced Edit Nodes", file:"exedit/edit_super"},

+		{id:306, pId:3, name:"Edit Nodes - zTree methods", file:"exedit/edit_fun"},

+		{id:307, pId:3, name:"Editing Dynamic Tree", file:"exedit/async_edit"},

+		{id:308, pId:3, name:"Multiple Trees", file:"exedit/multiTree"},

+

+		{id:4, pId:0, name:"Large Amount of Data Loading", open:false},

+		{id:401, pId:4, name:"One-time Large Data Loading", file:"bigdata/common"},

+		{id:402, pId:4, name:"Loading Data in Batches", file:"bigdata/diy_async"},

+		{id:403, pId:4, name:"Loading Data By Pagination", file:"bigdata/page"},

+

+		{id:5, pId:0, name:"Multi-functional", open:false},

+		{id:501, pId:5, name:"Freeze the Root Node", file:"super/oneroot"},

+		{id:502, pId:5, name:"Click to Expand Node", file:"super/oneclick"},

+		{id:503, pId:5, name:"Keep Single Path", file:"super/singlepath"},

+		{id:504, pId:5, name:"Adding Custom DOM", file:"super/diydom"},

+		{id:505, pId:5, name:"Checkbox / Radio Coexistence", file:"super/checkbox_radio"},

+		{id:506, pId:5, name:"Left Menu", file:"super/left_menu"},

+		{id:513, pId:5, name:"Left Menu Like OutLook Style", file:"super/left_menuForOutLook"},

+		{id:507, pId:5, name:"Drop-down Menu", file:"super/select_menu"},

+		{id:509, pId:5, name:"Drop-down Menu with checkbox", file:"super/select_menu_checkbox"},

+		{id:510, pId:5, name:"Drop-down Menu with radio", file:"super/select_menu_radio"},

+		{id:508, pId:5, name:"Right-click Menu", file:"super/rightClickMenu"},

+		{id:511, pId:5, name:"Drag With Other DOMs", file:"super/dragWithOther"},

+		{id:512, pId:5, name:"Expand All Nodes with Async", file:"super/asyncForAll"},

+

+		{id:6, pId:0, name:"Other Extension Package", open:false},

+		{id:601, pId:6, name:"hide ordinary node", file:"exhide/common"},

+		{id:602, pId:6, name:"hide with checkbox mode", file:"exhide/checkbox"},

+		{id:603, pId:6, name:"hide with radio mode", file:"exhide/radio"}

+	];

+

+	$(document).ready(function(){

+		var t = $("#tree");

+		t = $.fn.zTree.init(t, setting, zNodes);

+		demoIframe = $("#testIframe");

+		demoIframe.bind("load", loadReady);

+		var zTree = $.fn.zTree.getZTreeObj("tree");

+		zTree.selectNode(zTree.getNodeByParam("id", 101));

+	

+	});

+

+	function loadReady() {

+		var bodyH = demoIframe.contents().find("body").get(0).scrollHeight,

+		htmlH = demoIframe.contents().find("html").get(0).scrollHeight,

+		maxH = Math.max(bodyH, htmlH), minH = Math.min(bodyH, htmlH),

+		h = demoIframe.height() >= maxH ? minH:maxH ;

+		if (h < 530) h = 530;

+		demoIframe.height(h);

+	}

+

+  //-->

+  </SCRIPT>

+ </HEAD>

+

+<BODY>

+<TABLE border=0 height=600px align=left>

+	<TR>

+		<TD width=260px align=left valign=top style="BORDER-RIGHT: #999999 1px dashed">

+			<ul id="tree" class="ztree" style="width:260px; overflow:auto;"></ul>

+		</TD>

+		<TD width=770px align=left valign=top><IFRAME ID="testIframe" Name="testIframe" FRAMEBORDER=0 SCROLLING=AUTO width=100%  height=600px SRC="core/standardData.html"></IFRAME></TD>

+	</TR>

+</TABLE>

+

+ </BODY>

+</HTML>

diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/super/asyncForAll.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/super/asyncForAll.html
new file mode 100644
index 0000000..eea4a9b
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/super/asyncForAll.html
@@ -0,0 +1,192 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - async for All</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var demoMsg = {
+			async: "Loading asynchronous, please wait a moment and then click...",
+			expandAllOver: "Expansion Completed.",
+			asyncAllOver: "Asynchronously loading Completed.",
+			asyncAll: "Asynchronously loading Completed, no need to reload it again.",
+			expandAll: "Asynchronously loading completed, please use expandAll method."
+		}
+
+		var setting = {
+			async: {
+				enable: true,
+				url:"../asyncData/getNodes.php",
+				autoParam:["id", "name=n", "level=lv"],
+				otherParam:{"otherParam":"zTreeAsyncTest"},
+				dataFilter: filter,
+				type: "get"
+			},
+			callback: {
+				beforeAsync: beforeAsync,
+				onAsyncSuccess: onAsyncSuccess,
+				onAsyncError: onAsyncError
+			}
+		};
+
+		function filter(treeId, parentNode, childNodes) {
+			if (!childNodes) return null;
+			for (var i=0, l=childNodes.length; i<l; i++) {
+				childNodes[i].name = childNodes[i].name.replace(/\.n/g, '.');
+			}
+			return childNodes;
+		}
+
+		function beforeAsync() {
+			curAsyncCount++;
+		}
+		
+		function onAsyncSuccess(event, treeId, treeNode, msg) {
+			curAsyncCount--;
+			if (curStatus == "expand") {
+				expandNodes(treeNode.children);
+			} else if (curStatus == "async") {
+				asyncNodes(treeNode.children);
+			}
+
+			if (curAsyncCount <= 0) {
+				if (curStatus != "init" && curStatus != "") {
+					$("#demoMsg").text((curStatus == "expand") ? demoMsg.expandAllOver : demoMsg.asyncAllOver);
+					asyncForAll = true;
+				}
+				curStatus = "";
+			}
+		}
+
+		function onAsyncError(event, treeId, treeNode, XMLHttpRequest, textStatus, errorThrown) {
+			curAsyncCount--;
+
+			if (curAsyncCount <= 0) {
+				curStatus = "";
+				if (treeNode!=null) asyncForAll = true;
+			}
+		}
+
+		var curStatus = "init", curAsyncCount = 0, asyncForAll = false,
+		goAsync = false;
+		function expandAll() {
+			if (!check()) {
+				return;
+			}
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			if (asyncForAll) {
+				$("#demoMsg").text(demoMsg.expandAll);
+				zTree.expandAll(true);
+			} else {
+				expandNodes(zTree.getNodes());
+				if (!goAsync) {
+					$("#demoMsg").text(demoMsg.expandAll);
+					curStatus = "";
+				}
+			}
+		}
+		function expandNodes(nodes) {
+			if (!nodes) return;
+			curStatus = "expand";
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			for (var i=0, l=nodes.length; i<l; i++) {
+				zTree.expandNode(nodes[i], true, false, false);
+				if (nodes[i].isParent && nodes[i].zAsync) {
+					expandNodes(nodes[i].children);
+				} else {
+					goAsync = true;
+				}
+			}
+		}
+
+		function asyncAll() {
+			if (!check()) {
+				return;
+			}
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			if (asyncForAll) {
+				$("#demoMsg").text(demoMsg.asyncAll);
+			} else {
+				asyncNodes(zTree.getNodes());
+				if (!goAsync) {
+					$("#demoMsg").text(demoMsg.asyncAll);
+					curStatus = "";
+				}
+			}
+		}
+		function asyncNodes(nodes) {
+			if (!nodes) return;
+			curStatus = "async";
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			for (var i=0, l=nodes.length; i<l; i++) {
+				if (nodes[i].isParent && nodes[i].zAsync) {
+					asyncNodes(nodes[i].children);
+				} else {
+					goAsync = true;
+					zTree.reAsyncChildNodes(nodes[i], "refresh", true);
+				}
+			}
+		}
+
+		function reset() {
+			if (!check()) {
+				return;
+			}
+			asyncForAll = false;
+			goAsync = false;
+			$("#demoMsg").text("");
+			$.fn.zTree.init($("#treeDemo"), setting);
+		}
+
+		function check() {
+			if (curAsyncCount > 0) {
+				$("#demoMsg").text(demoMsg.async);
+				return false;
+			}
+			return true;
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting);
+			$("#expandAllBtn").bind("click", expandAll);
+			$("#asyncAllBtn").bind("click", asyncAll);
+			$("#resetBtn").bind("click", reset);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Expand All Nodes with Async</h1>
+<h6>[ File Path: super/asyncForAll.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>Explanation of implementation method</h2>
+				<ul class="list">
+				<li>Using 'onAsyncSuccess' / 'onAsyncError' callback and 'reAsyncChildNodes' or 'expandNode' method, you will achieve all functionalities.</li>
+				<li class="highlight_red">Note: If there are large amount parent nodes, please use delay to avoid excessive asynchronous process.</li>
+				<li class="highlight_red">Recommendation: please use the debugging tools to view the ajax loading process with network.</li>
+				<li>Demonstrate operation
+					<br/><br/>
+				[ <a id="expandAllBtn" href="#" onclick="return false;">Expand All Nodes</a> ] &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+				[ <a id="asyncAllBtn" href="#" onclick="return false;">Load all nodes (don't expand)</a> ]<br/><br/>
+				[ <a id="resetBtn" href="#" onclick="return false;">Reset zTree</a> ]<br/><br/>
+				<p class="highlight_red" id="demoMsg"></p>
+				</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/super/checkbox_radio.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/super/checkbox_radio.html
new file mode 100644
index 0000000..87ce15d
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/super/checkbox_radio.html
@@ -0,0 +1,116 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - checkbox & radio</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var IDMark_A = "_a";
+		var setting = {
+			view: {
+				addDiyDom: addDiyDom
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"parent node 1", open:true},
+			{ id:11, pId:1, name:"leaf node 1-1"},
+			{ id:12, pId:1, name:"leaf node 1-2"},
+			{ id:13, pId:1, name:"leaf node 1-3"},
+			{ id:2, pId:0, name:"parent node 2", open:true},
+			{ id:21, pId:2, name:"leaf node 2-1"},
+			{ id:22, pId:2, name:"leaf node 2-2"},
+			{ id:23, pId:2, name:"leaf node 2-3"},
+			{ id:3, pId:0, name:"parent node 3", open:true },
+			{ id:31, pId:3, name:"leaf node 3-1"},
+			{ id:32, pId:3, name:"leaf node 3-2"},
+			{ id:33, pId:3, name:"leaf node 3-3"}
+		];
+
+		function addDiyDom(treeId, treeNode) {
+			var aObj = $("#" + treeNode.tId + IDMark_A);
+			if (treeNode.level == 0) {
+				var editStr = "<input type='checkbox' class='checkboxBtn' id='checkbox_" +treeNode.id+ "' onfocus='this.blur();'></input>";
+				aObj.before(editStr);
+				var btn = $("#checkbox_"+treeNode.id);
+			if (btn) btn.bind("change", function() {checkAccessories(treeNode, btn);});
+			} else if (treeNode.level == 1) {
+				var editStr = "<input type='radio' class='radioBtn' id='radio_" +treeNode.id+ "' name='radio_"+treeNode.getParentNode().id+"' onfocus='this.blur();'></input>";
+				aObj.before(editStr);
+				var btn = $("#radio_"+treeNode.id);
+				if (btn) btn.bind("click", function() {checkBrand(treeNode, btn);});
+			}
+		}
+
+		function checkAccessories(treeNode, btn) {
+			var checkedRadio = getCheckedRadio("radio_"+treeNode.id);
+			if (btn.attr("checked")) {
+				if (!checkedRadio) {
+					$("#radio_" + treeNode.children[0].id).attr("checked", true);
+				}
+			} else {
+				checkedRadio.attr("checked", false);
+			}
+		}
+
+		function checkBrand(treeNode, btn) {
+			if (btn.attr("checked")) {
+				var pObj = $("#checkbox_" + treeNode.getParentNode().id);
+				if (!pObj.attr("checked")) {
+					pObj.attr("checked", true);
+				}
+			}
+		}
+
+		function getCheckedRadio(radioName) {
+			var r = document.getElementsByName(radioName);
+			for(var i=0; i<r.length; i++)    {
+				if(r[i].checked)    {
+					return $(r[i]);
+				}
+			}
+			return null;
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+	  .radioBtn {height: 16px;vertical-align: middle;}
+	  .checkboxBtn {vertical-align: middle;margin-right: 2px;}
+	  </style>
+ </HEAD>
+
+<BODY>
+<h1>Checkbox / Radio Coexistence</h1>
+<h6>[ File Path: super/checkbox_radio.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>Explanation of implementation method</h2>
+				<ul class="list">
+				<li>zTree default checkbox and radio can not coexist, but can be used the custom DOM features to achieve this requirement, refer to the "Adding Custom DOM".</li>
+				<li class="highlight_red">For checkbox / radio association rules of the parent nodes and child nodes, according to the needs to develop its own rules.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/super/diydom.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/super/diydom.html
new file mode 100644
index 0000000..07649d2
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/super/diydom.html
@@ -0,0 +1,177 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - addHoverDom / removeHoverDom / addDiyDom</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+
+		var IDMark_Switch = "_switch",
+		IDMark_Icon = "_ico",
+		IDMark_Span = "_span",
+		IDMark_Input = "_input",
+		IDMark_Check = "_check",
+		IDMark_Edit = "_edit",
+		IDMark_Remove = "_remove",
+		IDMark_Ul = "_ul",
+		IDMark_A = "_a";
+		
+		var setting = {
+			view: {
+				addHoverDom: addHoverDom,
+				removeHoverDom: removeHoverDom,
+				addDiyDom: addDiyDom
+			}
+		};
+
+		var zNodes =[
+			{id:1, name:"Hover DOM", open:true,
+				children:[
+					   {id:11, name:"button 1-1"},
+					   {id:12, name:"button 1-2"},
+					   {id:13, name:"select box 1-3"},
+					   {id:141, name:"text 1-4-1"},
+					   {id:142, name:"text 1-4-2"},
+					   {id:15, name:"hyperlinks 1-5"}
+
+				]},
+			{id:2, name:"General DOM", open:true,
+				children:[
+					   {id:21, name:"button 2-1"},
+					   {id:22, name:"button 2-2"},
+					   {id:23, name:"select box 2-3"},
+					   {id:24, name:"text 2-4"},
+					   {id:25, name:"hyperlinks 2-5"}
+				]}
+	 	];
+
+		function addHoverDom(treeId, treeNode) {
+			if (treeNode.parentNode && treeNode.parentNode.id!=1) return;
+			var aObj = $("#" + treeNode.tId + IDMark_A);
+			if (treeNode.id == 11) {
+				if ($("#diyBtn_"+treeNode.id).length>0) return;
+				var editStr = "<span id='diyBtn_space_" +treeNode.id+ "' >&nbsp;</span><span class='button icon03' id='diyBtn_" +treeNode.id+ "' title='"+treeNode.name+"' onfocus='this.blur();'></span>";
+				aObj.append(editStr);
+				var btn = $("#diyBtn_"+treeNode.id);
+				if (btn) btn.bind("click", function(){alert("diy Button for " + treeNode.name);});
+			} else if (treeNode.id == 12) {
+				if ($("#diyBtn_"+treeNode.id).length>0) return;
+				var editStr = "<span class='button icon04' id='diyBtn_" +treeNode.id+ "' title='"+treeNode.name+"' onfocus='this.blur();'></span>";
+				aObj.after(editStr);
+				var btn = $("#diyBtn_"+treeNode.id);
+				if (btn) btn.bind("click", function(){alert("diy Button for " + treeNode.name);});
+			} else if (treeNode.id == 13) {
+				if ($("#diyBtn_"+treeNode.id).length>0) return;
+				var editStr = "<span id='diyBtn_space_" +treeNode.id+ "' >&nbsp;</span><select class='selDemo ' id='diyBtn_" +treeNode.id+ "'><option value=1>1</option><option value=2>2</option><option value=3>3</option></select>";
+				aObj.after(editStr);
+				var btn = $("#diyBtn_"+treeNode.id);
+				if (btn) btn.bind("change", function(){alert("diy Select value="+btn.attr("value")+" for " + treeNode.name);});
+			} else if (treeNode.id == 141) {
+				if ($("#diyBtn_"+treeNode.id).length>0) return;
+				var editStr = "<span class='test' id='diyBtn_" +treeNode.id+ "'>Text Demo...</span>";
+				aObj.append(editStr);
+			} else if (treeNode.id == 142) {
+				if ($("#diyBtn_"+treeNode.id).length>0) return;
+				var editStr = "<span id='diyBtn_" +treeNode.id+ "'>Text Demo...</span>";
+				aObj.after(editStr);
+			} else if (treeNode.id == 15) {
+				if ($("#diyBtn1_"+treeNode.id).length>0) return;
+				if ($("#diyBtn2_"+treeNode.id).length>0) return;
+				var editStr = "<a id='diyBtn1_" +treeNode.id+ "' onclick='alert(1);return false;' style='margin:0 0 0 5px;'>link_1</a>" +
+					"<a id='diyBtn2_" +treeNode.id+ "' onclick='alert(2);return false;' style='margin:0 0 0 5px;'>link_2</a>";
+				aObj.append(editStr);
+			}
+		}
+
+		function removeHoverDom(treeId, treeNode) {
+			if (treeNode.parentTId && treeNode.getParentNode().id!=1) return;
+			if (treeNode.id == 15) {
+				$("#diyBtn1_"+treeNode.id).unbind().remove();
+				$("#diyBtn2_"+treeNode.id).unbind().remove();
+			} else {
+				$("#diyBtn_"+treeNode.id).unbind().remove();
+				$("#diyBtn_space_" +treeNode.id).unbind().remove();
+			}
+		}
+
+		function addDiyDom(treeId, treeNode) {
+			if (treeNode.parentNode && treeNode.parentNode.id!=2) return;
+			var aObj = $("#" + treeNode.tId + IDMark_A);
+			if (treeNode.id == 21) {
+				var editStr = "<span class='demoIcon' id='diyBtn_" +treeNode.id+ "' title='"+treeNode.name+"' onfocus='this.blur();'><span class='button icon01'></span></span>";
+				aObj.append(editStr);
+				var btn = $("#diyBtn_"+treeNode.id);
+				if (btn) btn.bind("click", function(){alert("diy Button for " + treeNode.name);});
+			} else if (treeNode.id == 22) {
+				var editStr = "<span class='demoIcon' id='diyBtn_" +treeNode.id+ "' title='"+treeNode.name+"' onfocus='this.blur();'><span class='button icon02'></span></span>";
+				aObj.after(editStr);
+				var btn = $("#diyBtn_"+treeNode.id);
+				if (btn) btn.bind("click", function(){alert("diy Button for " + treeNode.name);});
+			} else if (treeNode.id == 23) {
+				var editStr = "<select class='selDemo' id='diyBtn_" +treeNode.id+ "'><option value=1>1</option><option value=2>2</option><option value=3>3</option></select>";
+				aObj.after(editStr);
+				var btn = $("#diyBtn_"+treeNode.id);
+				if (btn) btn.bind("change", function(){alert("diy Select value="+btn.attr("value")+" for " + treeNode.name);});
+			} else if (treeNode.id == 24) {
+				var editStr = "<span id='diyBtn_" +treeNode.id+ "'>Text Demo...</span>";
+				aObj.after(editStr);
+			} else if (treeNode.id == 25) {
+				var editStr = "<a id='diyBtn1_" +treeNode.id+ "' onclick='alert(1);return false;'>链接1</a>" +
+					"<a id='diyBtn2_" +treeNode.id+ "' onclick='alert(2);return false;'>链接2</a>";
+				aObj.after(editStr);
+			}
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+.ztree li span.demoIcon{padding:0 2px 0 10px;}
+.ztree li span.button.icon01{margin:0; background: url(../../../css/zTreeStyle/img/diy/3.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon02{margin:0; background: url(../../../css/zTreeStyle/img/diy/4.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon03{margin:0; background: url(../../../css/zTreeStyle/img/diy/5.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon04{margin:0; background: url(../../../css/zTreeStyle/img/diy/6.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon05{margin:0; background: url(../../../css/zTreeStyle/img/diy/7.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon06{margin:0; background: url(../../../css/zTreeStyle/img/diy/8.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+	</style>
+ </HEAD>
+
+<BODY>
+<h1>Adding Custom DOM</h1>
+<h6>[ File Path: super/diydom.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of implementation method</h2>
+				<ul class="list">
+				<li>Use 'setting.view.addHoverDom / removeHoverDom / addDiyDom' attributes can easily display custom DOM.</li>
+				<li class="highlight_red">Adding custom DOM, is important to understand zTree node object naming rules to ensure the normal controls add DOM.</li>
+				<li class="highlight_red">If you add the browser's default ’select / checkbox / radio‘ DOM, please adjust the css, to ensure correctly display zTree.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of setting</h2>
+				<ul class="list">
+				<li>Set 'setting.view.addHoverDom / removeHoverDom / addDiyDom' attributes, see the API documentation for more related contents.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3, Explanation of treeNode</h2>
+				<ul class="list">
+				<li>No special requirements on the node data, the user can add custom attributes.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/super/dragWithOther.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/super/dragWithOther.html
new file mode 100644
index 0000000..31426c3
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/super/dragWithOther.html
@@ -0,0 +1,234 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - drag with other DOM</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>-->
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var MoveTest = {
+			errorMsg: "Error!...Please drag it to the correct category!",
+			curTarget: null,
+			curTmpTarget: null,
+			noSel: function() {
+				try {
+					window.getSelection ? window.getSelection().removeAllRanges() : document.selection.empty();
+				} catch(e){}
+			},
+			dragTree2Dom: function(treeId, treeNodes) {
+				return !treeNodes[0].isParent;
+			},
+			prevTree: function(treeId, treeNodes, targetNode) {
+				return !targetNode.isParent && targetNode.parentTId == treeNodes[0].parentTId;
+			},
+			nextTree: function(treeId, treeNodes, targetNode) {
+				return !targetNode.isParent && targetNode.parentTId == treeNodes[0].parentTId;
+			},
+			innerTree: function(treeId, treeNodes, targetNode) {
+				return targetNode!=null && targetNode.isParent && targetNode.tId == treeNodes[0].parentTId;
+			},
+			dropTree2Dom: function(e, treeId, treeNodes, targetNode, moveType) {
+				var domId = "dom_" + treeNodes[0].getParentNode().id;
+				if (moveType == null && (domId == e.target.id || $(e.target).parents("#" + domId).length > 0)) {
+					var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+					zTree.removeNode(treeNodes[0]);
+
+					var newDom = $("span[domId=" + treeNodes[0].id + "]");
+					if (newDom.length > 0) {
+						newDom.removeClass("domBtn_Disabled");
+						newDom.addClass("domBtn");
+					} else {
+						$("#" + domId).append("<span class='domBtn' domId='" + treeNodes[0].id + "'>" + treeNodes[0].name + "</span>");
+					}
+					MoveTest.updateType();
+				} else if ( $(e.target).parents(".domBtnDiv").length > 0) {
+					alert(MoveTest.errorMsg);
+				}
+			},
+			dom2Tree: function(e, treeId, treeNode) {
+				var target = MoveTest.curTarget, tmpTarget = MoveTest.curTmpTarget;
+				if (!target) return;
+				var zTree = $.fn.zTree.getZTreeObj("treeDemo"), parentNode;
+				if (treeNode != null && treeNode.isParent && "dom_" + treeNode.id == target.parent().attr("id")) {
+					parentNode = treeNode;
+				} else if (treeNode != null && !treeNode.isParent && "dom_" + treeNode.getParentNode().id == target.parent().attr("id")) {
+					parentNode = treeNode.getParentNode();
+				}
+
+				if (tmpTarget) tmpTarget.remove();
+				if (!!parentNode) {
+					var nodes = zTree.addNodes(parentNode, {id:target.attr("domId"), name: target.text()});
+					zTree.selectNode(nodes[0]);
+				} else {
+					target.removeClass("domBtn_Disabled");
+					target.addClass("domBtn");
+					alert(MoveTest.errorMsg);
+				}
+				MoveTest.curTarget = null;
+				MoveTest.curTmpTarget = null;
+			},
+			updateType: function() {
+				var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+				nodes = zTree.getNodes();
+				for (var i=0, l=nodes.length; i<l; i++) {
+					var num = nodes[i].children ? nodes[i].children.length : 0;
+					nodes[i].name = nodes[i].name.replace(/ \(.*\)/gi, "") + " (" + num + ")";
+					zTree.updateNode(nodes[i]);
+				}
+			},
+			bindDom: function() {
+				$(".domBtnDiv").bind("mousedown", MoveTest.bindMouseDown);
+			},
+			bindMouseDown: function(e) {
+				var target = e.target;
+				if (target!=null && target.className=="domBtn") {
+					var doc = $(document), target = $(target),
+					docScrollTop = doc.scrollTop(),
+					docScrollLeft = doc.scrollLeft();
+					target.addClass("domBtn_Disabled");
+					target.removeClass("domBtn");
+					curDom = $("<span class='dom_tmp domBtn'>" + target.text() + "</span>");
+					curDom.appendTo("body");
+
+					curDom.css({
+						"top": (e.clientY + docScrollTop + 3) + "px",
+						"left": (e.clientX + docScrollLeft + 3) + "px"
+					});
+					MoveTest.curTarget = target;
+					MoveTest.curTmpTarget = curDom;
+
+					doc.bind("mousemove", MoveTest.bindMouseMove);
+					doc.bind("mouseup", MoveTest.bindMouseUp);
+					doc.bind("selectstart", MoveTest.docSelect);
+				}
+				if(e.preventDefault) {
+					e.preventDefault();
+				}
+			},
+			bindMouseMove: function(e) {
+				MoveTest.noSel();
+				var doc = $(document), 
+				docScrollTop = doc.scrollTop(),
+				docScrollLeft = doc.scrollLeft(),
+				tmpTarget = MoveTest.curTmpTarget;
+				if (tmpTarget) {
+					tmpTarget.css({
+						"top": (e.clientY + docScrollTop + 3) + "px",
+						"left": (e.clientX + docScrollLeft + 3) + "px"
+					});
+				}
+				return false;
+			},
+			bindMouseUp: function(e) {
+				var doc = $(document);
+				doc.unbind("mousemove", MoveTest.bindMouseMove);
+				doc.unbind("mouseup", MoveTest.bindMouseUp);
+				doc.unbind("selectstart", MoveTest.docSelect);
+
+				var target = MoveTest.curTarget, tmpTarget = MoveTest.curTmpTarget;
+				if (tmpTarget) tmpTarget.remove();
+
+				if ($(e.target).parents("#treeDemo").length == 0) {
+					if (target) {
+						target.removeClass("domBtn_Disabled");
+						target.addClass("domBtn");
+					}
+					MoveTest.curTarget = null;
+					MoveTest.curTmpTarget = null;
+				}
+			},
+			bindSelect: function() {
+				return false;
+			}
+		};
+
+		var setting = {
+			edit: {
+				enable: true,
+				showRemoveBtn: false,
+				showRenameBtn: false,
+				drag: {
+					prev: MoveTest.prevTree,
+					next: MoveTest.nextTree,
+					inner: MoveTest.innerTree
+				}
+			},
+			data: {
+				keep: {
+					parent: true,
+					leaf: true
+				},
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeDrag: MoveTest.dragTree2Dom,
+				onDrop: MoveTest.dropTree2Dom,
+				onMouseUp: MoveTest.dom2Tree
+			},
+			view: {
+				selectedMulti: false
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"PLANT", isParent: true, open:true},
+			{ id:2, pId:0, name:"ANIMAL", isParent: true, open:true},
+			{ id:20, pId:2, name:"Elephant"},
+			{ id:29, pId:2, name:"Shark"},
+			{ id:10, pId:1, name:"Cabbage"},
+			{ id:19, pId:1, name:"Tomato"}
+		];
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			MoveTest.updateType();
+			MoveTest.bindDom();
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+.dom_line {margin:2px;border-bottom:1px gray dotted;height:1px}
+.domBtnDiv {display:block;padding:2px;border:1px gray dotted;background-color:powderblue}
+.categoryDiv {display:inline-block; width:335px}
+.domBtn {display:inline-block;cursor:pointer;padding:2px;margin:2px 10px;border:1px gray solid;background-color:#FFE6B0}
+.domBtn_Disabled {display:inline-block;cursor:default;padding:2px;margin:2px 10px;border:1px gray solid;background-color:#DFDFDF;color:#999999}
+.dom_tmp {position:absolute;font-size:12px;}
+	</style>
+</HEAD>
+
+<BODY>
+<h1>Drag With Other DOMs</h1>
+<h6>[ File Path: super/dragWithOther.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>Explanation of implementation method</h2>
+				<ul class="list">
+				<li>zTree v3.2 modified the event object in onDrag/onDrop, thus the nodes can be draged to other DOMs easily.</li>
+				<li class="highlight_red">To drag other DOMS to zTree, you need to build the drag codes by yourself.</li>
+				<li class="highlight_red">This is just a simple Demo. If you need more features, please build more complicated codes.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>Please drag and drop the following content to the tree node</h2>
+				<div class="domBtnDiv">
+					<div id="dom_1" class="categoryDiv"><span class="domBtn" domId="11">Tree</span><span class="domBtn" domId="12">Grass</span><span class="domBtn" domId="13">Flower</span></div>
+					<div class="dom_line"></div>
+					<div id="dom_2" class="categoryDiv"><span class="domBtn" domId="21">Tiger</span><span class="domBtn" domId="22">Bear</span><span class="domBtn" domId="23">Lion</span></div>
+				</div>
+				<span class="highlight_red">You can drag the nodes of level 2 to the above layer.</span>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/super/left_menu.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/super/left_menu.html
new file mode 100644
index 0000000..7dfe588
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/super/left_menu.html
@@ -0,0 +1,152 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - left_menu</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var curMenu = null, zTree_Menu = null;
+		var setting = {
+			view: {
+				showLine: true,
+				selectedMulti: false,
+				dblClickExpand: false
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				onNodeCreated: this.onNodeCreated,
+				beforeClick: this.beforeClick,
+				onClick: this.onClick
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"Main Menu 1", open:true},
+			{ id:11, pId:1, name:"Sub Menu 1-1"},
+			{ id:111, pId:11, name:"Leaf Node 1-1-1"},
+			{ id:112, pId:11, name:"Leaf Node 1-1-2"},
+			{ id:113, pId:11, name:"Leaf Node 1-1-3"},
+			{ id:114, pId:11, name:"Leaf Node 1-1-4"},
+			{ id:12, pId:1, name:"Sub Menu 1-2"},
+			{ id:121, pId:12, name:"Leaf Node 1-2-1"},
+			{ id:122, pId:12, name:"Leaf Node 1-2-2"},
+			{ id:123, pId:12, name:"Leaf Node 1-2-3"},
+			{ id:124, pId:12, name:"Leaf Node 1-2-4"},
+			{ id:2, pId:0, name:"Main Menu 2"},
+			{ id:21, pId:2, name:"Sub Menu 2-1"},
+			{ id:211, pId:21, name:"Leaf Node 2-1-1"},
+			{ id:212, pId:21, name:"Leaf Node 2-1-2"},
+			{ id:213, pId:21, name:"Leaf Node 2-1-3"},
+			{ id:214, pId:21, name:"Leaf Node 2-1-4"},
+			{ id:22, pId:2, name:"Sub Menu 2-2"},
+			{ id:221, pId:22, name:"Leaf Node 2-2-1"},
+			{ id:222, pId:22, name:"Leaf Node 2-2-2"},
+			{ id:223, pId:22, name:"Leaf Node 2-2-3"},
+			{ id:224, pId:22, name:"Leaf Node 2-2-4"},
+			{ id:3, pId:0, name:"Main Menu 3"},
+			{ id:31, pId:3, name:"Sub Menu 3-1"},
+			{ id:311, pId:31, name:"Leaf Node 3-1-1"},
+			{ id:312, pId:31, name:"Leaf Node 3-1-2"},
+			{ id:313, pId:31, name:"Leaf Node 3-1-3"},
+			{ id:314, pId:31, name:"Leaf Node 3-1-4"},
+			{ id:32, pId:3, name:"Sub Menu 3-2"},
+			{ id:321, pId:32, name:"Leaf Node 3-2-1"},
+			{ id:322, pId:32, name:"Leaf Node 3-2-2"},
+			{ id:323, pId:32, name:"Leaf Node 3-2-3"},
+			{ id:324, pId:32, name:"Leaf Node 3-2-4"}
+		];
+
+		function beforeClick(treeId, node) {
+			if (node.isParent) {
+				if (node.level === 0) {
+					var pNode = curMenu;
+					while (pNode && pNode.level !==0) {
+						pNode = pNode.getParentNode();
+					}
+					if (pNode !== node) {
+						var a = $("#" + pNode.tId + "_a");
+						a.removeClass("cur");
+						zTree_Menu.expandNode(pNode, false);
+					}
+					a = $("#" + node.tId + "_a");
+					a.addClass("cur");
+
+					var isOpen = false;
+					for (var i=0,l=node.children.length; i<l; i++) {
+						if(node.children[i].open) {
+							isOpen = true;
+							break;
+						}
+					}
+					if (isOpen) {
+						zTree_Menu.expandNode(node, true);
+						curMenu = node;
+					} else {
+						zTree_Menu.expandNode(node.children[0].isParent?node.children[0]:node, true);
+						curMenu = node.children[0];
+					}
+				} else {
+					zTree_Menu.expandNode(node);
+				}
+			}
+			return !node.isParent;
+		}
+		function onClick(e, treeId, node) {
+			alert("Do what you want to do!");
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			zTree_Menu = $.fn.zTree.getZTreeObj("treeDemo");
+			curMenu = zTree_Menu.getNodes()[0].children[0].children[0];
+			zTree_Menu.selectNode(curMenu);
+			var a = $("#" + zTree_Menu.getNodes()[0].tId + "_a");
+			a.addClass("cur");
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+.ztree li a.level0 {width:200px;height: 20px; text-align: center; display:block; background-color: #0B61A4; border:1px silver solid;}
+.ztree li a.level0.cur {background-color: #66A3D2; }
+.ztree li a.level0 span {display: block; color: white; padding-top:3px; font-size:12px; font-weight: bold;word-spacing: 2px;}
+.ztree li a.level0 span.button {	float:right; margin-left: 10px; visibility: visible;display:none;}
+.ztree li span.button.switch.level0 {display:none;}
+	</style>
+ </HEAD>
+
+<BODY>
+<h1>Left Menu</h1>
+<h6>[ File Path: super/left_menu.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>Explanation of implementation method</h2>
+				<ul class="list">
+				<li>The menu in the Demo's Web page is to use zTree to achieve, is to use css set interface, use the configuration 'setting' to achieve features, this demo achieve a simple example of the left menu, you can view the source code of Demo's Web Page for in-depth study.</li>
+				<li class="highlight_red">1. According to your needs to modify the css, for example: the menu style on this Demo and Demo's Web page not the same.</li>
+				<li class="highlight_red">2. Main configuration:<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;setting.view.showIcon / showLine / selectedMulti / dblClickExpand<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;setting.callback.onNodeCreated / beforeClick / onClick
+				</li>
+				<li>3. If need to keep single path, please refer to the source code of "Keep Single Path" Demo.</li>
+				<li>4. Other auxiliary rules, please write code based on your needs.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/super/left_menuForOutLook.gif b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/super/left_menuForOutLook.gif
new file mode 100644
index 0000000..c252f0f
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/super/left_menuForOutLook.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/super/left_menuForOutLook.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/super/left_menuForOutLook.html
new file mode 100644
index 0000000..8f7ddff
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/super/left_menuForOutLook.html
@@ -0,0 +1,136 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - left_menu for Outlook</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var curMenu = null, zTree_Menu = null;
+		var setting = {
+			view: {
+				showLine: false,
+				showIcon: false,
+				selectedMulti: false,
+				dblClickExpand: false,
+				addDiyDom: addDiyDom
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeClick: beforeClick
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"Folders", open:true},
+			{ id:11, pId:1, name:"Inbox"},
+			{ id:111, pId:11, name:"Inbox1"},
+			{ id:112, pId:111, name:"Inbox2"},
+			{ id:113, pId:112, name:"Inbox3"},
+			{ id:114, pId:113, name:"Inbox4"},
+			{ id:12, pId:1, name:"Junk"},
+			{ id:13, pId:1, name:"Drafts"},
+			{ id:14, pId:1, name:"Sent"},
+			{ id:15, pId:1, name:"Deleted"},
+			{ id:3, pId:0, name:"Quick views"},
+			{ id:31, pId:3, name:"Documents"},
+			{ id:32, pId:3, name:"Photos"}
+		];
+
+		function addDiyDom(treeId, treeNode) {
+			var spaceWidth = 5;
+			var switchObj = $("#" + treeNode.tId + "_switch"),
+			icoObj = $("#" + treeNode.tId + "_ico");
+			switchObj.remove();
+			icoObj.before(switchObj);
+
+			if (treeNode.level > 1) {
+				var spaceStr = "<span style='display: inline-block;width:" + (spaceWidth * treeNode.level)+ "px'></span>";
+				switchObj.before(spaceStr);
+			}
+		}
+
+		function beforeClick(treeId, treeNode) {
+			if (treeNode.level == 0 ) {
+				var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+				zTree.expandNode(treeNode);
+				return false;
+			}
+			return true;
+		}
+
+		$(document).ready(function(){
+			var treeObj = $("#treeDemo");
+			$.fn.zTree.init(treeObj, setting, zNodes);
+			zTree_Menu = $.fn.zTree.getZTreeObj("treeDemo");
+			curMenu = zTree_Menu.getNodes()[0].children[0].children[0];
+			zTree_Menu.selectNode(curMenu);
+
+			treeObj.hover(function () {
+				if (!treeObj.hasClass("showIcon")) {
+					treeObj.addClass("showIcon");
+				}
+			}, function() {
+				treeObj.removeClass("showIcon");
+			});
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+.ztree * {font-size: 10pt;font-family:"Microsoft Yahei",Verdana,Simsun,"Segoe UI Web Light","Segoe UI Light","Segoe UI Web Regular","Segoe UI","Segoe UI Symbol","Helvetica Neue",Arial}
+.ztree li ul{ margin:0; padding:0}
+.ztree li {line-height:30px;}
+.ztree li a {width:200px;height:30px;padding-top: 0px;}
+.ztree li a:hover {text-decoration:none; background-color: #E7E7E7;}
+.ztree li a span.button.switch {visibility:hidden}
+.ztree.showIcon li a span.button.switch {visibility:visible}
+.ztree li a.curSelectedNode {background-color:#D4D4D4;border:0;height:30px;}
+.ztree li span {line-height:30px;}
+.ztree li span.button {margin-top: -7px;}
+.ztree li span.button.switch {width: 16px;height: 16px;}
+
+.ztree li a.level0 span {font-size: 150%;font-weight: bold;}
+.ztree li span.button {background-image:url("./left_menuForOutLook.png"); *background-image:url("./left_menuForOutLook.gif")}
+.ztree li span.button.switch.level0 {width: 20px; height:20px}
+.ztree li span.button.switch.level1 {width: 20px; height:20px}
+.ztree li span.button.noline_open {background-position: 0 0;}
+.ztree li span.button.noline_close {background-position: -18px 0;}
+.ztree li span.button.noline_open.level0 {background-position: 0 -18px;}
+.ztree li span.button.noline_close.level0 {background-position: -18px -18px;}
+	</style>
+ </HEAD>
+
+<BODY>
+<h1>Left Menu Like OutLook Style</h1>
+<h6>[ File Path: super/left_menuForOutLook.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>Explanation of implementation method</h2>
+				<ul class="list">
+				<li>I make one left menu which resembles outlook.com, so share to everyone.</li>
+				<li class="highlight_red">1. Please note that the css code of the source of this page.</li>
+				<li class="highlight_red">2. Please note that the javascript code of the source of this page, especially the switch button is moved into the &lt;a&gt; tag  when 'addDiyDom' callback be called</li>
+				<li class="highlight_red">3. Use the method of add zTree class name to implement the switch button be hidden or showing.</li>
+				<li>4. Other auxiliary rules, please write code based on your needs.</li>
+				<li>5. The current rule description:<br/>
+				&nbsp;&nbsp;Click the root node can control the parent node be expanded or collapsed;<br/>
+				&nbsp;&nbsp;The parent nodes without root only are only clicked the arrow icon can control be expanded or  collapsed;br/>
+				</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/super/left_menuForOutLook.png b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/super/left_menuForOutLook.png
new file mode 100644
index 0000000..36e8acf
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/super/left_menuForOutLook.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/super/oneclick.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/super/oneclick.html
new file mode 100644
index 0000000..9679ec3
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/super/oneclick.html
@@ -0,0 +1,87 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - one click</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				dblClickExpand: false,
+				showLine: false
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				onClick: onClick
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"Root", open:true},
+			{ id:11, pId:1, name:"Parent Node 1-1", open:true},
+			{ id:111, pId:11, name:"Leaf Node 1-1-1"},
+			{ id:112, pId:11, name:"Leaf Node 1-1-2"},
+			{ id:113, pId:11, name:"Leaf Node 1-1-3"},
+			{ id:114, pId:11, name:"Leaf Node 1-1-4"},
+			{ id:12, pId:1, name:"Parent Node 1-2", open:true},
+			{ id:121, pId:12, name:"Leaf Node 1-2-1"},
+			{ id:122, pId:12, name:"Leaf Node 1-2-2"},
+			{ id:123, pId:12, name:"Leaf Node 1-2-3"},
+			{ id:124, pId:12, name:"Leaf Node 1-2-4"},
+			{ id:13, pId:1, name:"Parent Node 1-3", open:true},
+			{ id:131, pId:13, name:"Leaf Node 1-3-1"},
+			{ id:132, pId:13, name:"Leaf Node 1-3-2"},
+			{ id:133, pId:13, name:"Leaf Node 1-3-3"},
+			{ id:134, pId:13, name:"Leaf Node 1-3-4"}
+		];
+
+		function onClick(e,treeId, treeNode) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			zTree.expandNode(treeNode);
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+.ztree li button.switch {visibility:hidden; width:1px;}
+.ztree li button.switch.roots_docu {visibility:visible; width:16px;}
+.ztree li button.switch.center_docu {visibility:visible; width:16px;}
+.ztree li button.switch.bottom_docu {visibility:visible; width:16px;}
+	</style>
+ </HEAD>
+
+<BODY>
+<h1>Click to Expand Node</h1>
+<h6>[ File Path: super/oneclick.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>Explanation of implementation method</h2>
+				<ul class="list">
+				<li>zTree not provide a default click to expand node feature, but can use the onClick callback functions to easily implement this feature.</li>
+				<li class="highlight_red">In order to avoid conflict with the double-clicking, I recommended to turn off double-clicking expand node function, please set setting.view.dblClickExpand = false</li>
+				<li class="highlight_red">You can hide all the +/- switch, please see the page source, see the css.</li>
+				<li class="highlight_red">If you do not show + / - switch, then please set 'setting.view.showLine = false' to hide line.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/super/oneroot.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/super/oneroot.html
new file mode 100644
index 0000000..9d7eb53
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/super/oneroot.html
@@ -0,0 +1,79 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - one root</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				dblClickExpand: dblClickExpand
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"Root", open:true},
+			{ id:11, pId:1, name:"Parent Node 1-1", open:true},
+			{ id:111, pId:11, name:"Leaf Node 1-1-1"},
+			{ id:112, pId:11, name:"Leaf Node 1-1-2"},
+			{ id:113, pId:11, name:"Leaf Node 1-1-3"},
+			{ id:114, pId:11, name:"Leaf Node 1-1-4"},
+			{ id:12, pId:1, name:"Parent Node 1-2", open:true},
+			{ id:121, pId:12, name:"Leaf Node 1-2-1"},
+			{ id:122, pId:12, name:"Leaf Node 1-2-2"},
+			{ id:123, pId:12, name:"Leaf Node 1-2-3"},
+			{ id:124, pId:12, name:"Leaf Node 1-2-4"},
+			{ id:13, pId:1, name:"Parent Node 1-3", open:true},
+			{ id:131, pId:13, name:"Leaf Node 1-3-1"},
+			{ id:132, pId:13, name:"Leaf Node 1-3-2"},
+			{ id:133, pId:13, name:"Leaf Node 1-3-3"},
+			{ id:134, pId:13, name:"Leaf Node 1-3-4"}
+		];
+
+		function dblClickExpand(treeId, treeNode) {
+			return treeNode.level > 0;
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+.ztree li span.button.switch.level0 {visibility:hidden; width:1px;}
+.ztree li ul.level0 {padding:0; background:none;}
+	</style>
+ </HEAD>
+
+<BODY>
+<h1>Freeze the Root Node</h1>
+<h6>[ File Path: demo/super/oneroot.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>Explanation of implementation method</h2>
+				<ul class="list">
+				<li>For only one root, and do not show +/- switch needs need to modify the css, and set the setting.</li>
+				<li class="highlight_red">zTree v3.x can be for a given level, set the style, check out the page source, see the css.</li>
+				<li class="highlight_red">Set setting.view.dblClickExpand to Function, you can turn off double-clicking for expand the root node.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/super/rightClickMenu.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/super/rightClickMenu.html
new file mode 100644
index 0000000..06e640c
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/super/rightClickMenu.html
@@ -0,0 +1,168 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - select menu</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				dblClickExpand: false
+			},
+			check: {
+				enable: true
+			},
+			callback: {
+				onRightClick: OnRightClick
+			}
+		};
+
+		var zNodes =[
+			{id:1, name:"No right-click menu 1", open:true, noR:true,
+				children:[
+					   {id:11, name:"Leaf Node 1-1", noR:true},
+					   {id:12, name:"Leaf Node 1-2", noR:true}
+
+				]},
+			{id:2, name:"Right-click 2", open:true,
+				children:[
+					   {id:21, name:"Leaf Node 2-1"},
+					   {id:22, name:"Leaf Node 2-2"},
+					   {id:23, name:"Leaf Node 2-3"},
+					   {id:24, name:"Leaf Node 2-4"}
+				]},
+			{id:3, name:"Right-click 3", open:true,
+				children:[
+					   {id:31, name:"Leaf Node 3-1"},
+					   {id:32, name:"Leaf Node 3-2"},
+					   {id:33, name:"Leaf Node 3-3"},
+					   {id:34, name:"Leaf Node 3-4"}
+				]}
+  	 	];
+
+		function OnRightClick(event, treeId, treeNode) {
+			if (!treeNode && event.target.tagName.toLowerCase() != "button" && $(event.target).parents("a").length == 0) {
+				zTree.cancelSelectedNode();
+				showRMenu("root", event.clientX, event.clientY);
+			} else if (treeNode && !treeNode.noR) {
+				zTree.selectNode(treeNode);
+				showRMenu("node", event.clientX, event.clientY);
+			}
+		}
+
+		function showRMenu(type, x, y) {
+			$("#rMenu ul").show();
+			if (type=="root") {
+				$("#m_del").hide();
+				$("#m_check").hide();
+				$("#m_unCheck").hide();
+			} else {
+				$("#m_del").show();
+				$("#m_check").show();
+				$("#m_unCheck").show();
+			}
+			rMenu.css({"top":y+"px", "left":x+"px", "visibility":"visible"});
+
+			$("body").bind("mousedown", onBodyMouseDown);
+		}
+		function hideRMenu() {
+			if (rMenu) rMenu.css({"visibility": "hidden"});
+			$("body").unbind("mousedown", onBodyMouseDown);
+		}
+		function onBodyMouseDown(event){
+			if (!(event.target.id == "rMenu" || $(event.target).parents("#rMenu").length>0)) {
+				rMenu.css({"visibility" : "hidden"});
+			}
+		}
+		var addCount = 1;
+		function addTreeNode() {
+			hideRMenu();
+			var newNode = { name:"newNode " + (addCount++)};
+			if (zTree.getSelectedNodes()[0]) {
+				newNode.checked = zTree.getSelectedNodes()[0].checked;
+				zTree.addNodes(zTree.getSelectedNodes()[0], newNode);
+			} else {
+				zTree.addNodes(null, newNode);
+			}
+		}
+		function removeTreeNode() {
+			hideRMenu();
+			var nodes = zTree.getSelectedNodes();
+			if (nodes && nodes.length>0) {
+				if (nodes[0].children && nodes[0].children.length > 0) {
+					var msg = "If you delete this node will be deleted along with sub-nodes. \n\nPlease confirm!";
+					if (confirm(msg)==true){
+						zTree.removeNode(nodes[0]);
+					}
+				} else {
+					zTree.removeNode(nodes[0]);
+				}
+			}
+		}
+		function checkTreeNode(checked) {
+			var nodes = zTree.getSelectedNodes();
+			if (nodes && nodes.length>0) {
+				zTree.checkNode(nodes[0], checked, true);
+			}
+			hideRMenu();
+		}
+		function resetTree() {
+			hideRMenu();
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		}
+
+		var zTree, rMenu;
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			rMenu = $("#rMenu");
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+div#rMenu {position:absolute; visibility:hidden; top:0; background-color: #555;text-align: left;padding: 2px;}
+div#rMenu ul li{
+	margin: 1px 0;
+	padding: 0 5px;
+	cursor: pointer;
+	list-style: none outside none;
+	background-color: #DFDFDF;
+}
+	</style>
+ </HEAD>
+
+<BODY>
+<h1>Right-click Menu</h1>
+<h6>[ File Path: super/rightClickMenu.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>Explanation of implementation method</h2>
+				<ul class="list">
+				<li>Use 'beforeRightClick / onRightClick' callback function achieve right-click menu.</li>
+				<li class="highlight_red">Demo's menu is ugly, you can use a custom menu fine style.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+<div id="rMenu">
+	<ul>
+		<li id="m_add" onclick="addTreeNode();">Add Node</li>
+		<li id="m_del" onclick="removeTreeNode();">Delete Node</li>
+		<li id="m_check" onclick="checkTreeNode(true);">Check Node</li>
+		<li id="m_unCheck" onclick="checkTreeNode(false);">Uncheck Node</li>
+		<li id="m_reset" onclick="resetTree();">Resume zTree</li>
+	</ul>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/super/select_menu.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/super/select_menu.html
new file mode 100644
index 0000000..6423f6e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/super/select_menu.html
@@ -0,0 +1,124 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - select menu</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				dblClickExpand: false
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeClick: beforeClick,
+				onClick: onClick
+			}
+		};
+
+		var zNodes =[
+			{id:1, pId:0, name:"Beijing"},
+			{id:2, pId:0, name:"Tianjin"},
+			{id:3, pId:0, name:"Shanghai"},
+			{id:6, pId:0, name:"Chongqing"},
+			{id:4, pId:0, name:"Hebei Province", open:true},
+			{id:41, pId:4, name:"Shijiazhuang"},
+			{id:42, pId:4, name:"Baoding"},
+			{id:43, pId:4, name:"Handan"},
+			{id:44, pId:4, name:"Chengde"},
+			{id:5, pId:0, name:"Guangdong Province", open:true},
+			{id:51, pId:5, name:"Guangzhou"},
+			{id:52, pId:5, name:"Shenzhen"},
+			{id:53, pId:5, name:"Dongguan"},
+			{id:54, pId:5, name:"Fushan"},
+			{id:6, pId:0, name:"Fujian Province", open:true},
+			{id:61, pId:6, name:"Fuzhou"},
+			{id:62, pId:6, name:"Xiamen"},
+			{id:63, pId:6, name:"Quanzhou"},
+			{id:64, pId:6, name:"Sanming"}
+		 ];
+
+		function beforeClick(treeId, treeNode) {
+			var check = (treeNode && !treeNode.isParent);
+			if (!check) alert("Do not select province...");
+			return check;
+		}
+		
+		function onClick(e, treeId, treeNode) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nodes = zTree.getSelectedNodes(),
+			v = "";
+			nodes.sort(function compare(a,b){return a.id-b.id;});
+			for (var i=0, l=nodes.length; i<l; i++) {
+				v += nodes[i].name + ",";
+			}
+			if (v.length > 0 ) v = v.substring(0, v.length-1);
+			var cityObj = $("#citySel");
+			cityObj.attr("value", v);
+		}
+
+		function showMenu() {
+			var cityObj = $("#citySel");
+			var cityOffset = $("#citySel").offset();
+			$("#menuContent").css({left:cityOffset.left + "px", top:cityOffset.top + cityObj.outerHeight() + "px"}).slideDown("fast");
+
+			$("body").bind("mousedown", onBodyDown);
+		}
+		function hideMenu() {
+			$("#menuContent").fadeOut("fast");
+			$("body").unbind("mousedown", onBodyDown);
+		}
+		function onBodyDown(event) {
+			if (!(event.target.id == "menuBtn" || event.target.id == "menuContent" || $(event.target).parents("#menuContent").length>0)) {
+				hideMenu();
+			}
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+	</style>
+ </HEAD>
+
+<BODY>
+<h1>Drop-down Menu</h1>
+<h6>[ File Path: super/select_menu.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul class="list">
+			<li class="title">&nbsp;&nbsp;<span class="highlight_red">Press Ctrl key to select multiple cities</span></li>
+			<li class="title">&nbsp;&nbsp;city: <input id="citySel" type="text" readonly value="" style="width:120px;"/>
+		&nbsp;<a id="menuBtn" href="#" onclick="showMenu(); return false;">select</a></li>
+		</ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>Explanation of implementation method</h2>
+				<ul class="list">
+				<li>Achieve this drop-down menu, it is relatively easy, you only need to control zTree Hide / Show, and location.</li>
+				<li class="highlight_red">Use zTree v3.x, you can select multiple nodes, so the multi-selection is also easy.</li>
+				<li class="highlight_red">Use the configuration parameters setting, fully meet the needs of most of the functionality.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+
+<div id="menuContent" class="menuContent" style="display:none; position: absolute;">
+	<ul id="treeDemo" class="ztree" style="margin-top:0; width:160px;"></ul>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/super/select_menu_checkbox.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/super/select_menu_checkbox.html
new file mode 100644
index 0000000..06b50d2
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/super/select_menu_checkbox.html
@@ -0,0 +1,126 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - checkbox select menu</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+<!--	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			check: {
+				enable: true,
+				chkboxType: {"Y":"", "N":""}
+			},
+			view: {
+				dblClickExpand: false
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeClick: beforeClick,
+				onCheck: onCheck
+			}
+		};
+
+		var zNodes =[
+			{id:1, pId:0, name:"Beijing"},
+			{id:2, pId:0, name:"Tianjin"},
+			{id:3, pId:0, name:"Shanghai"},
+			{id:6, pId:0, name:"Chongqing"},
+			{id:4, pId:0, name:"Hebei Province", open:true},
+			{id:41, pId:4, name:"Shijiazhuang"},
+			{id:42, pId:4, name:"Baoding"},
+			{id:43, pId:4, name:"Handan"},
+			{id:44, pId:4, name:"Chengde"},
+			{id:5, pId:0, name:"Guangdong Province", open:true},
+			{id:51, pId:5, name:"Guangzhou"},
+			{id:52, pId:5, name:"Shenzhen"},
+			{id:53, pId:5, name:"Dongguan"},
+			{id:54, pId:5, name:"Fushan"},
+			{id:6, pId:0, name:"Fujian Province", open:true},
+			{id:61, pId:6, name:"Fuzhou"},
+			{id:62, pId:6, name:"Xiamen"},
+			{id:63, pId:6, name:"Quanzhou"},
+			{id:64, pId:6, name:"Sanming"}
+		 ];
+
+		function beforeClick(treeId, treeNode) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			zTree.checkNode(treeNode, !treeNode.checked, null, true);
+			return false;
+		}
+		
+		function onCheck(e, treeId, treeNode) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nodes = zTree.getCheckedNodes(true),
+			v = "";
+			for (var i=0, l=nodes.length; i<l; i++) {
+				v += nodes[i].name + ",";
+			}
+			if (v.length > 0 ) v = v.substring(0, v.length-1);
+			var cityObj = $("#citySel");
+			cityObj.attr("value", v);
+		}
+
+		function showMenu() {
+			var cityObj = $("#citySel");
+			var cityOffset = $("#citySel").offset();
+			$("#menuContent").css({left:cityOffset.left + "px", top:cityOffset.top + cityObj.outerHeight() + "px"}).slideDown("fast");
+
+			$("body").bind("mousedown", onBodyDown);
+		}
+		function hideMenu() {
+			$("#menuContent").fadeOut("fast");
+			$("body").unbind("mousedown", onBodyDown);
+		}
+		function onBodyDown(event) {
+			if (!(event.target.id == "menuBtn" || event.target.id == "citySel" || event.target.id == "menuContent" || $(event.target).parents("#menuContent").length>0)) {
+				hideMenu();
+			}
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+	</style>
+ </HEAD>
+
+<BODY>
+<h1>Drop-down Menu with checkbox</h1>
+<h6>[ File Path: super/select_menu_checkbox.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul class="list">
+			<li class="title">&nbsp;&nbsp;<span class="highlight_red">Check the checkbox to select or click the node</span></li>
+			<li class="title">&nbsp;&nbsp;Test: <input id="citySel" type="text" readonly value="" style="width:120px;" onclick="showMenu();" />
+		&nbsp;<a id="menuBtn" href="#" onclick="showMenu(); return false;">select</a></li>
+		</ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>Explanation of implementation method</h2>
+				<ul class="list">
+				<li>You can achieve multi-selected drop-down menu with checkbox.</li>
+				<li>This Demo is mainly used for compare with other drop-down menu.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+
+<div id="menuContent" class="menuContent" style="display:none; position: absolute;">
+	<ul id="treeDemo" class="ztree" style="margin-top:0; width:180px; height: 300px;"></ul>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/super/select_menu_radio.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/super/select_menu_radio.html
new file mode 100644
index 0000000..7e9e9d1
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/super/select_menu_radio.html
@@ -0,0 +1,127 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - radio select menu</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+<!--	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			check: {
+				enable: true,
+				chkStyle: "radio",
+				radioType: "all"
+			},
+			view: {
+				dblClickExpand: false
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				onClick: onClick,
+				onCheck: onCheck
+			}
+		};
+
+		var zNodes =[
+			{id:1, pId:0, name:"Beijing"},
+			{id:2, pId:0, name:"Tianjin"},
+			{id:3, pId:0, name:"Shanghai"},
+			{id:6, pId:0, name:"Chongqing"},
+			{id:4, pId:0, name:"Hebei Province", open:true},
+			{id:41, pId:4, name:"Shijiazhuang"},
+			{id:42, pId:4, name:"Baoding"},
+			{id:43, pId:4, name:"Handan"},
+			{id:44, pId:4, name:"Chengde"},
+			{id:5, pId:0, name:"Guangdong Province", open:true},
+			{id:51, pId:5, name:"Guangzhou"},
+			{id:52, pId:5, name:"Shenzhen"},
+			{id:53, pId:5, name:"Dongguan"},
+			{id:54, pId:5, name:"Fushan"},
+			{id:6, pId:0, name:"Fujian Province", open:true},
+			{id:61, pId:6, name:"Fuzhou"},
+			{id:62, pId:6, name:"Xiamen"},
+			{id:63, pId:6, name:"Quanzhou"},
+			{id:64, pId:6, name:"Sanming"}
+		 ];
+
+		function onClick(e, treeId, treeNode) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			zTree.checkNode(treeNode, !treeNode.checked, null, true);
+			return false;
+		}
+
+		function onCheck(e, treeId, treeNode) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nodes = zTree.getCheckedNodes(true),
+			v = "";
+			for (var i=0, l=nodes.length; i<l; i++) {
+				v += nodes[i].name + ",";
+			}
+			if (v.length > 0 ) v = v.substring(0, v.length-1);
+			var cityObj = $("#citySel");
+			cityObj.attr("value", v);
+		}
+
+		function showMenu() {
+			var cityObj = $("#citySel");
+			var cityOffset = $("#citySel").offset();
+			$("#menuContent").css({left:cityOffset.left + "px", top:cityOffset.top + cityObj.outerHeight() + "px"}).slideDown("fast");
+
+			$("body").bind("mousedown", onBodyDown);
+		}
+		function hideMenu() {
+			$("#menuContent").fadeOut("fast");
+			$("body").unbind("mousedown", onBodyDown);
+		}
+		function onBodyDown(event) {
+			if (!(event.target.id == "menuBtn" || event.target.id == "citySel" || event.target.id == "menuContent" || $(event.target).parents("#menuContent").length>0)) {
+				hideMenu();
+			}
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+	</style>
+ </HEAD>
+
+<BODY>
+<h1>Drop-down Menu with radio</h1>
+<h6>[ File Path: super/select_menu_radio.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul class="list">
+			<li class="title">&nbsp;&nbsp;<span class="highlight_red">Check the radio to select or click the node</span></li>
+			<li class="title">&nbsp;&nbsp;Test: <input id="citySel" type="text" readonly value="" style="width:120px;" onclick="showMenu();" />
+		&nbsp;<a id="menuBtn" href="#" onclick="showMenu(); return false;">select</a></li>
+		</ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>Explanation of implementation method</h2>
+				<ul class="list">
+				<li>You can achieve single-selected drop-down menu with radio.</li>
+				<li>This Demo is mainly used for compare with other drop-down menu.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+
+<div id="menuContent" class="menuContent" style="display:none; position: absolute;">
+	<ul id="treeDemo" class="ztree" style="margin-top:0; width:180px; height: 300px;"></ul>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/super/singlepath.html b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/super/singlepath.html
new file mode 100644
index 0000000..f48499d
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/demo/en/super/singlepath.html
@@ -0,0 +1,150 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - single path</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				dblClickExpand: false,
+				showLine: false
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeExpand: beforeExpand,
+				onExpand: onExpand,
+				onClick: onClick
+			}
+		};
+
+				function createNodes(maxNodesNumInLevel, maxLevel, curLevel, curPId) {
+			if (maxNodesNumInLevel<5) {
+				maxNodesNumInLevel = 5;
+			}
+			var nodes = [], num = 0;
+			while(num<3) {
+				num = parseInt(Math.random()*1024)%maxNodesNumInLevel+1;
+			}
+			for (var i=0; i<num; i++) {
+				var id = curPId ? curPId + "-" + i : "" + i, isParent = (parseInt(Math.random()*9999)%3!=0),
+				node = {id: id, pId : curPId, name : "N" + id};
+				nodes.push(node);
+				if (isParent && curLevel<maxLevel) {
+					nodes = nodes.concat(createNodes(maxNodesNumInLevel, maxLevel, curLevel+1, id));
+				}
+			}
+			return nodes;
+		}
+		var zNodes =createNodes(5, 5, 0);
+
+		var curExpandNode = null;
+		function beforeExpand(treeId, treeNode) {
+			var pNode = curExpandNode ? curExpandNode.getParentNode():null;
+			var treeNodeP = treeNode.parentTId ? treeNode.getParentNode():null;
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			for(var i=0, l=!treeNodeP ? 0:treeNodeP.children.length; i<l; i++ ) {
+				if (treeNode !== treeNodeP.children[i]) {
+					zTree.expandNode(treeNodeP.children[i], false);
+				}
+			}
+			while (pNode) {
+				if (pNode === treeNode) {
+					break;
+				}
+				pNode = pNode.getParentNode();
+			}
+			if (!pNode) {
+				singlePath(treeNode);
+			}
+
+		}
+		function singlePath(newNode) {
+			if (newNode === curExpandNode) return;
+			if (curExpandNode && curExpandNode.open==true) {
+				var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+				if (newNode.parentTId === curExpandNode.parentTId) {
+					zTree.expandNode(curExpandNode, false);
+				} else {
+					var newParents = [];
+					while (newNode) {
+						newNode = newNode.getParentNode();
+						if (newNode === curExpandNode) {
+							newParents = null;
+							break;
+						} else if (newNode) {
+							newParents.push(newNode);
+						}
+					}
+					if (newParents!=null) {
+						var oldNode = curExpandNode;
+						var oldParents = [];
+						while (oldNode) {
+							oldNode = oldNode.getParentNode();
+							if (oldNode) {
+								oldParents.push(oldNode);
+							}
+						}
+						if (newParents.length>0) {
+							zTree.expandNode(oldParents[Math.abs(oldParents.length-newParents.length)-1], false);
+						} else {
+							zTree.expandNode(oldParents[oldParents.length-1], false);
+						}
+					}
+				}
+			}
+			curExpandNode = newNode;
+		}
+
+		function onExpand(event, treeId, treeNode) {
+			curExpandNode = treeNode;
+		}
+
+		function onClick(e,treeId, treeNode) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			zTree.expandNode(treeNode, null, null, null, true);
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+.ztree li button.switch {visibility:hidden; width:1px;}
+.ztree li button.switch.roots_docu {visibility:visible; width:16px;}
+.ztree li button.switch.center_docu {visibility:visible; width:16px;}
+.ztree li button.switch.bottom_docu {visibility:visible; width:16px;}
+	</style>
+ </HEAD>
+
+<BODY>
+<h1>Keep Single Path</h1>
+<h6>[ File Path: super/singlepath.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>Explanation of implementation method</h2>
+				<ul class="list">
+				<li>This Demo is the transformation from "Click to Expand Node" demo​​, tree only expand single path.</li>
+				<li class="highlight_red">Use 'setting.callback.beforeExpand / onExpand' callback function to achieve rules about expand </li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/js/jquery-1.4.4.min.js b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/js/jquery-1.4.4.min.js
new file mode 100644
index 0000000..8f3ca2e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/js/jquery-1.4.4.min.js
@@ -0,0 +1,167 @@
+/*!
+ * jQuery JavaScript Library v1.4.4
+ * http://jquery.com/
+ *
+ * Copyright 2010, John Resig
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * Includes Sizzle.js
+ * http://sizzlejs.com/
+ * Copyright 2010, The Dojo Foundation
+ * Released under the MIT, BSD, and GPL Licenses.
+ *
+ * Date: Thu Nov 11 19:04:53 2010 -0500
+ */
+(function(E,B){function ka(a,b,d){if(d===B&&a.nodeType===1){d=a.getAttribute("data-"+b);if(typeof d==="string"){try{d=d==="true"?true:d==="false"?false:d==="null"?null:!c.isNaN(d)?parseFloat(d):Ja.test(d)?c.parseJSON(d):d}catch(e){}c.data(a,b,d)}else d=B}return d}function U(){return false}function ca(){return true}function la(a,b,d){d[0].type=a;return c.event.handle.apply(b,d)}function Ka(a){var b,d,e,f,h,l,k,o,x,r,A,C=[];f=[];h=c.data(this,this.nodeType?"events":"__events__");if(typeof h==="function")h=
+h.events;if(!(a.liveFired===this||!h||!h.live||a.button&&a.type==="click")){if(a.namespace)A=RegExp("(^|\\.)"+a.namespace.split(".").join("\\.(?:.*\\.)?")+"(\\.|$)");a.liveFired=this;var J=h.live.slice(0);for(k=0;k<J.length;k++){h=J[k];h.origType.replace(X,"")===a.type?f.push(h.selector):J.splice(k--,1)}f=c(a.target).closest(f,a.currentTarget);o=0;for(x=f.length;o<x;o++){r=f[o];for(k=0;k<J.length;k++){h=J[k];if(r.selector===h.selector&&(!A||A.test(h.namespace))){l=r.elem;e=null;if(h.preType==="mouseenter"||
+h.preType==="mouseleave"){a.type=h.preType;e=c(a.relatedTarget).closest(h.selector)[0]}if(!e||e!==l)C.push({elem:l,handleObj:h,level:r.level})}}}o=0;for(x=C.length;o<x;o++){f=C[o];if(d&&f.level>d)break;a.currentTarget=f.elem;a.data=f.handleObj.data;a.handleObj=f.handleObj;A=f.handleObj.origHandler.apply(f.elem,arguments);if(A===false||a.isPropagationStopped()){d=f.level;if(A===false)b=false;if(a.isImmediatePropagationStopped())break}}return b}}function Y(a,b){return(a&&a!=="*"?a+".":"")+b.replace(La,
+"`").replace(Ma,"&")}function ma(a,b,d){if(c.isFunction(b))return c.grep(a,function(f,h){return!!b.call(f,h,f)===d});else if(b.nodeType)return c.grep(a,function(f){return f===b===d});else if(typeof b==="string"){var e=c.grep(a,function(f){return f.nodeType===1});if(Na.test(b))return c.filter(b,e,!d);else b=c.filter(b,e)}return c.grep(a,function(f){return c.inArray(f,b)>=0===d})}function na(a,b){var d=0;b.each(function(){if(this.nodeName===(a[d]&&a[d].nodeName)){var e=c.data(a[d++]),f=c.data(this,
+e);if(e=e&&e.events){delete f.handle;f.events={};for(var h in e)for(var l in e[h])c.event.add(this,h,e[h][l],e[h][l].data)}}})}function Oa(a,b){b.src?c.ajax({url:b.src,async:false,dataType:"script"}):c.globalEval(b.text||b.textContent||b.innerHTML||"");b.parentNode&&b.parentNode.removeChild(b)}function oa(a,b,d){var e=b==="width"?a.offsetWidth:a.offsetHeight;if(d==="border")return e;c.each(b==="width"?Pa:Qa,function(){d||(e-=parseFloat(c.css(a,"padding"+this))||0);if(d==="margin")e+=parseFloat(c.css(a,
+"margin"+this))||0;else e-=parseFloat(c.css(a,"border"+this+"Width"))||0});return e}function da(a,b,d,e){if(c.isArray(b)&&b.length)c.each(b,function(f,h){d||Ra.test(a)?e(a,h):da(a+"["+(typeof h==="object"||c.isArray(h)?f:"")+"]",h,d,e)});else if(!d&&b!=null&&typeof b==="object")c.isEmptyObject(b)?e(a,""):c.each(b,function(f,h){da(a+"["+f+"]",h,d,e)});else e(a,b)}function S(a,b){var d={};c.each(pa.concat.apply([],pa.slice(0,b)),function(){d[this]=a});return d}function qa(a){if(!ea[a]){var b=c("<"+
+a+">").appendTo("body"),d=b.css("display");b.remove();if(d==="none"||d==="")d="block";ea[a]=d}return ea[a]}function fa(a){return c.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:false}var t=E.document,c=function(){function a(){if(!b.isReady){try{t.documentElement.doScroll("left")}catch(j){setTimeout(a,1);return}b.ready()}}var b=function(j,s){return new b.fn.init(j,s)},d=E.jQuery,e=E.$,f,h=/^(?:[^<]*(<[\w\W]+>)[^>]*$|#([\w\-]+)$)/,l=/\S/,k=/^\s+/,o=/\s+$/,x=/\W/,r=/\d/,A=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,
+C=/^[\],:{}\s]*$/,J=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,w=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,I=/(?:^|:|,)(?:\s*\[)+/g,L=/(webkit)[ \/]([\w.]+)/,g=/(opera)(?:.*version)?[ \/]([\w.]+)/,i=/(msie) ([\w.]+)/,n=/(mozilla)(?:.*? rv:([\w.]+))?/,m=navigator.userAgent,p=false,q=[],u,y=Object.prototype.toString,F=Object.prototype.hasOwnProperty,M=Array.prototype.push,N=Array.prototype.slice,O=String.prototype.trim,D=Array.prototype.indexOf,R={};b.fn=b.prototype={init:function(j,
+s){var v,z,H;if(!j)return this;if(j.nodeType){this.context=this[0]=j;this.length=1;return this}if(j==="body"&&!s&&t.body){this.context=t;this[0]=t.body;this.selector="body";this.length=1;return this}if(typeof j==="string")if((v=h.exec(j))&&(v[1]||!s))if(v[1]){H=s?s.ownerDocument||s:t;if(z=A.exec(j))if(b.isPlainObject(s)){j=[t.createElement(z[1])];b.fn.attr.call(j,s,true)}else j=[H.createElement(z[1])];else{z=b.buildFragment([v[1]],[H]);j=(z.cacheable?z.fragment.cloneNode(true):z.fragment).childNodes}return b.merge(this,
+j)}else{if((z=t.getElementById(v[2]))&&z.parentNode){if(z.id!==v[2])return f.find(j);this.length=1;this[0]=z}this.context=t;this.selector=j;return this}else if(!s&&!x.test(j)){this.selector=j;this.context=t;j=t.getElementsByTagName(j);return b.merge(this,j)}else return!s||s.jquery?(s||f).find(j):b(s).find(j);else if(b.isFunction(j))return f.ready(j);if(j.selector!==B){this.selector=j.selector;this.context=j.context}return b.makeArray(j,this)},selector:"",jquery:"1.4.4",length:0,size:function(){return this.length},
+toArray:function(){return N.call(this,0)},get:function(j){return j==null?this.toArray():j<0?this.slice(j)[0]:this[j]},pushStack:function(j,s,v){var z=b();b.isArray(j)?M.apply(z,j):b.merge(z,j);z.prevObject=this;z.context=this.context;if(s==="find")z.selector=this.selector+(this.selector?" ":"")+v;else if(s)z.selector=this.selector+"."+s+"("+v+")";return z},each:function(j,s){return b.each(this,j,s)},ready:function(j){b.bindReady();if(b.isReady)j.call(t,b);else q&&q.push(j);return this},eq:function(j){return j===
+-1?this.slice(j):this.slice(j,+j+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(N.apply(this,arguments),"slice",N.call(arguments).join(","))},map:function(j){return this.pushStack(b.map(this,function(s,v){return j.call(s,v,s)}))},end:function(){return this.prevObject||b(null)},push:M,sort:[].sort,splice:[].splice};b.fn.init.prototype=b.fn;b.extend=b.fn.extend=function(){var j,s,v,z,H,G=arguments[0]||{},K=1,Q=arguments.length,ga=false;
+if(typeof G==="boolean"){ga=G;G=arguments[1]||{};K=2}if(typeof G!=="object"&&!b.isFunction(G))G={};if(Q===K){G=this;--K}for(;K<Q;K++)if((j=arguments[K])!=null)for(s in j){v=G[s];z=j[s];if(G!==z)if(ga&&z&&(b.isPlainObject(z)||(H=b.isArray(z)))){if(H){H=false;v=v&&b.isArray(v)?v:[]}else v=v&&b.isPlainObject(v)?v:{};G[s]=b.extend(ga,v,z)}else if(z!==B)G[s]=z}return G};b.extend({noConflict:function(j){E.$=e;if(j)E.jQuery=d;return b},isReady:false,readyWait:1,ready:function(j){j===true&&b.readyWait--;
+if(!b.readyWait||j!==true&&!b.isReady){if(!t.body)return setTimeout(b.ready,1);b.isReady=true;if(!(j!==true&&--b.readyWait>0))if(q){var s=0,v=q;for(q=null;j=v[s++];)j.call(t,b);b.fn.trigger&&b(t).trigger("ready").unbind("ready")}}},bindReady:function(){if(!p){p=true;if(t.readyState==="complete")return setTimeout(b.ready,1);if(t.addEventListener){t.addEventListener("DOMContentLoaded",u,false);E.addEventListener("load",b.ready,false)}else if(t.attachEvent){t.attachEvent("onreadystatechange",u);E.attachEvent("onload",
+b.ready);var j=false;try{j=E.frameElement==null}catch(s){}t.documentElement.doScroll&&j&&a()}}},isFunction:function(j){return b.type(j)==="function"},isArray:Array.isArray||function(j){return b.type(j)==="array"},isWindow:function(j){return j&&typeof j==="object"&&"setInterval"in j},isNaN:function(j){return j==null||!r.test(j)||isNaN(j)},type:function(j){return j==null?String(j):R[y.call(j)]||"object"},isPlainObject:function(j){if(!j||b.type(j)!=="object"||j.nodeType||b.isWindow(j))return false;if(j.constructor&&
+!F.call(j,"constructor")&&!F.call(j.constructor.prototype,"isPrototypeOf"))return false;for(var s in j);return s===B||F.call(j,s)},isEmptyObject:function(j){for(var s in j)return false;return true},error:function(j){throw j;},parseJSON:function(j){if(typeof j!=="string"||!j)return null;j=b.trim(j);if(C.test(j.replace(J,"@").replace(w,"]").replace(I,"")))return E.JSON&&E.JSON.parse?E.JSON.parse(j):(new Function("return "+j))();else b.error("Invalid JSON: "+j)},noop:function(){},globalEval:function(j){if(j&&
+l.test(j)){var s=t.getElementsByTagName("head")[0]||t.documentElement,v=t.createElement("script");v.type="text/javascript";if(b.support.scriptEval)v.appendChild(t.createTextNode(j));else v.text=j;s.insertBefore(v,s.firstChild);s.removeChild(v)}},nodeName:function(j,s){return j.nodeName&&j.nodeName.toUpperCase()===s.toUpperCase()},each:function(j,s,v){var z,H=0,G=j.length,K=G===B||b.isFunction(j);if(v)if(K)for(z in j){if(s.apply(j[z],v)===false)break}else for(;H<G;){if(s.apply(j[H++],v)===false)break}else if(K)for(z in j){if(s.call(j[z],
+z,j[z])===false)break}else for(v=j[0];H<G&&s.call(v,H,v)!==false;v=j[++H]);return j},trim:O?function(j){return j==null?"":O.call(j)}:function(j){return j==null?"":j.toString().replace(k,"").replace(o,"")},makeArray:function(j,s){var v=s||[];if(j!=null){var z=b.type(j);j.length==null||z==="string"||z==="function"||z==="regexp"||b.isWindow(j)?M.call(v,j):b.merge(v,j)}return v},inArray:function(j,s){if(s.indexOf)return s.indexOf(j);for(var v=0,z=s.length;v<z;v++)if(s[v]===j)return v;return-1},merge:function(j,
+s){var v=j.length,z=0;if(typeof s.length==="number")for(var H=s.length;z<H;z++)j[v++]=s[z];else for(;s[z]!==B;)j[v++]=s[z++];j.length=v;return j},grep:function(j,s,v){var z=[],H;v=!!v;for(var G=0,K=j.length;G<K;G++){H=!!s(j[G],G);v!==H&&z.push(j[G])}return z},map:function(j,s,v){for(var z=[],H,G=0,K=j.length;G<K;G++){H=s(j[G],G,v);if(H!=null)z[z.length]=H}return z.concat.apply([],z)},guid:1,proxy:function(j,s,v){if(arguments.length===2)if(typeof s==="string"){v=j;j=v[s];s=B}else if(s&&!b.isFunction(s)){v=
+s;s=B}if(!s&&j)s=function(){return j.apply(v||this,arguments)};if(j)s.guid=j.guid=j.guid||s.guid||b.guid++;return s},access:function(j,s,v,z,H,G){var K=j.length;if(typeof s==="object"){for(var Q in s)b.access(j,Q,s[Q],z,H,v);return j}if(v!==B){z=!G&&z&&b.isFunction(v);for(Q=0;Q<K;Q++)H(j[Q],s,z?v.call(j[Q],Q,H(j[Q],s)):v,G);return j}return K?H(j[0],s):B},now:function(){return(new Date).getTime()},uaMatch:function(j){j=j.toLowerCase();j=L.exec(j)||g.exec(j)||i.exec(j)||j.indexOf("compatible")<0&&n.exec(j)||
+[];return{browser:j[1]||"",version:j[2]||"0"}},browser:{}});b.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(j,s){R["[object "+s+"]"]=s.toLowerCase()});m=b.uaMatch(m);if(m.browser){b.browser[m.browser]=true;b.browser.version=m.version}if(b.browser.webkit)b.browser.safari=true;if(D)b.inArray=function(j,s){return D.call(s,j)};if(!/\s/.test("\u00a0")){k=/^[\s\xA0]+/;o=/[\s\xA0]+$/}f=b(t);if(t.addEventListener)u=function(){t.removeEventListener("DOMContentLoaded",u,
+false);b.ready()};else if(t.attachEvent)u=function(){if(t.readyState==="complete"){t.detachEvent("onreadystatechange",u);b.ready()}};return E.jQuery=E.$=b}();(function(){c.support={};var a=t.documentElement,b=t.createElement("script"),d=t.createElement("div"),e="script"+c.now();d.style.display="none";d.innerHTML="   <link/><table></table><a href='/a' style='color:red;float:left;opacity:.55;'>a</a><input type='checkbox'/>";var f=d.getElementsByTagName("*"),h=d.getElementsByTagName("a")[0],l=t.createElement("select"),
+k=l.appendChild(t.createElement("option"));if(!(!f||!f.length||!h)){c.support={leadingWhitespace:d.firstChild.nodeType===3,tbody:!d.getElementsByTagName("tbody").length,htmlSerialize:!!d.getElementsByTagName("link").length,style:/red/.test(h.getAttribute("style")),hrefNormalized:h.getAttribute("href")==="/a",opacity:/^0.55$/.test(h.style.opacity),cssFloat:!!h.style.cssFloat,checkOn:d.getElementsByTagName("input")[0].value==="on",optSelected:k.selected,deleteExpando:true,optDisabled:false,checkClone:false,
+scriptEval:false,noCloneEvent:true,boxModel:null,inlineBlockNeedsLayout:false,shrinkWrapBlocks:false,reliableHiddenOffsets:true};l.disabled=true;c.support.optDisabled=!k.disabled;b.type="text/javascript";try{b.appendChild(t.createTextNode("window."+e+"=1;"))}catch(o){}a.insertBefore(b,a.firstChild);if(E[e]){c.support.scriptEval=true;delete E[e]}try{delete b.test}catch(x){c.support.deleteExpando=false}a.removeChild(b);if(d.attachEvent&&d.fireEvent){d.attachEvent("onclick",function r(){c.support.noCloneEvent=
+false;d.detachEvent("onclick",r)});d.cloneNode(true).fireEvent("onclick")}d=t.createElement("div");d.innerHTML="<input type='radio' name='radiotest' checked='checked'/>";a=t.createDocumentFragment();a.appendChild(d.firstChild);c.support.checkClone=a.cloneNode(true).cloneNode(true).lastChild.checked;c(function(){var r=t.createElement("div");r.style.width=r.style.paddingLeft="1px";t.body.appendChild(r);c.boxModel=c.support.boxModel=r.offsetWidth===2;if("zoom"in r.style){r.style.display="inline";r.style.zoom=
+1;c.support.inlineBlockNeedsLayout=r.offsetWidth===2;r.style.display="";r.innerHTML="<div style='width:4px;'></div>";c.support.shrinkWrapBlocks=r.offsetWidth!==2}r.innerHTML="<table><tr><td style='padding:0;display:none'></td><td>t</td></tr></table>";var A=r.getElementsByTagName("td");c.support.reliableHiddenOffsets=A[0].offsetHeight===0;A[0].style.display="";A[1].style.display="none";c.support.reliableHiddenOffsets=c.support.reliableHiddenOffsets&&A[0].offsetHeight===0;r.innerHTML="";t.body.removeChild(r).style.display=
+"none"});a=function(r){var A=t.createElement("div");r="on"+r;var C=r in A;if(!C){A.setAttribute(r,"return;");C=typeof A[r]==="function"}return C};c.support.submitBubbles=a("submit");c.support.changeBubbles=a("change");a=b=d=f=h=null}})();var ra={},Ja=/^(?:\{.*\}|\[.*\])$/;c.extend({cache:{},uuid:0,expando:"jQuery"+c.now(),noData:{embed:true,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:true},data:function(a,b,d){if(c.acceptData(a)){a=a==E?ra:a;var e=a.nodeType,f=e?a[c.expando]:null,h=
+c.cache;if(!(e&&!f&&typeof b==="string"&&d===B)){if(e)f||(a[c.expando]=f=++c.uuid);else h=a;if(typeof b==="object")if(e)h[f]=c.extend(h[f],b);else c.extend(h,b);else if(e&&!h[f])h[f]={};a=e?h[f]:h;if(d!==B)a[b]=d;return typeof b==="string"?a[b]:a}}},removeData:function(a,b){if(c.acceptData(a)){a=a==E?ra:a;var d=a.nodeType,e=d?a[c.expando]:a,f=c.cache,h=d?f[e]:e;if(b){if(h){delete h[b];d&&c.isEmptyObject(h)&&c.removeData(a)}}else if(d&&c.support.deleteExpando)delete a[c.expando];else if(a.removeAttribute)a.removeAttribute(c.expando);
+else if(d)delete f[e];else for(var l in a)delete a[l]}},acceptData:function(a){if(a.nodeName){var b=c.noData[a.nodeName.toLowerCase()];if(b)return!(b===true||a.getAttribute("classid")!==b)}return true}});c.fn.extend({data:function(a,b){var d=null;if(typeof a==="undefined"){if(this.length){var e=this[0].attributes,f;d=c.data(this[0]);for(var h=0,l=e.length;h<l;h++){f=e[h].name;if(f.indexOf("data-")===0){f=f.substr(5);ka(this[0],f,d[f])}}}return d}else if(typeof a==="object")return this.each(function(){c.data(this,
+a)});var k=a.split(".");k[1]=k[1]?"."+k[1]:"";if(b===B){d=this.triggerHandler("getData"+k[1]+"!",[k[0]]);if(d===B&&this.length){d=c.data(this[0],a);d=ka(this[0],a,d)}return d===B&&k[1]?this.data(k[0]):d}else return this.each(function(){var o=c(this),x=[k[0],b];o.triggerHandler("setData"+k[1]+"!",x);c.data(this,a,b);o.triggerHandler("changeData"+k[1]+"!",x)})},removeData:function(a){return this.each(function(){c.removeData(this,a)})}});c.extend({queue:function(a,b,d){if(a){b=(b||"fx")+"queue";var e=
+c.data(a,b);if(!d)return e||[];if(!e||c.isArray(d))e=c.data(a,b,c.makeArray(d));else e.push(d);return e}},dequeue:function(a,b){b=b||"fx";var d=c.queue(a,b),e=d.shift();if(e==="inprogress")e=d.shift();if(e){b==="fx"&&d.unshift("inprogress");e.call(a,function(){c.dequeue(a,b)})}}});c.fn.extend({queue:function(a,b){if(typeof a!=="string"){b=a;a="fx"}if(b===B)return c.queue(this[0],a);return this.each(function(){var d=c.queue(this,a,b);a==="fx"&&d[0]!=="inprogress"&&c.dequeue(this,a)})},dequeue:function(a){return this.each(function(){c.dequeue(this,
+a)})},delay:function(a,b){a=c.fx?c.fx.speeds[a]||a:a;b=b||"fx";return this.queue(b,function(){var d=this;setTimeout(function(){c.dequeue(d,b)},a)})},clearQueue:function(a){return this.queue(a||"fx",[])}});var sa=/[\n\t]/g,ha=/\s+/,Sa=/\r/g,Ta=/^(?:href|src|style)$/,Ua=/^(?:button|input)$/i,Va=/^(?:button|input|object|select|textarea)$/i,Wa=/^a(?:rea)?$/i,ta=/^(?:radio|checkbox)$/i;c.props={"for":"htmlFor","class":"className",readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing",rowspan:"rowSpan",
+colspan:"colSpan",tabindex:"tabIndex",usemap:"useMap",frameborder:"frameBorder"};c.fn.extend({attr:function(a,b){return c.access(this,a,b,true,c.attr)},removeAttr:function(a){return this.each(function(){c.attr(this,a,"");this.nodeType===1&&this.removeAttribute(a)})},addClass:function(a){if(c.isFunction(a))return this.each(function(x){var r=c(this);r.addClass(a.call(this,x,r.attr("class")))});if(a&&typeof a==="string")for(var b=(a||"").split(ha),d=0,e=this.length;d<e;d++){var f=this[d];if(f.nodeType===
+1)if(f.className){for(var h=" "+f.className+" ",l=f.className,k=0,o=b.length;k<o;k++)if(h.indexOf(" "+b[k]+" ")<0)l+=" "+b[k];f.className=c.trim(l)}else f.className=a}return this},removeClass:function(a){if(c.isFunction(a))return this.each(function(o){var x=c(this);x.removeClass(a.call(this,o,x.attr("class")))});if(a&&typeof a==="string"||a===B)for(var b=(a||"").split(ha),d=0,e=this.length;d<e;d++){var f=this[d];if(f.nodeType===1&&f.className)if(a){for(var h=(" "+f.className+" ").replace(sa," "),
+l=0,k=b.length;l<k;l++)h=h.replace(" "+b[l]+" "," ");f.className=c.trim(h)}else f.className=""}return this},toggleClass:function(a,b){var d=typeof a,e=typeof b==="boolean";if(c.isFunction(a))return this.each(function(f){var h=c(this);h.toggleClass(a.call(this,f,h.attr("class"),b),b)});return this.each(function(){if(d==="string")for(var f,h=0,l=c(this),k=b,o=a.split(ha);f=o[h++];){k=e?k:!l.hasClass(f);l[k?"addClass":"removeClass"](f)}else if(d==="undefined"||d==="boolean"){this.className&&c.data(this,
+"__className__",this.className);this.className=this.className||a===false?"":c.data(this,"__className__")||""}})},hasClass:function(a){a=" "+a+" ";for(var b=0,d=this.length;b<d;b++)if((" "+this[b].className+" ").replace(sa," ").indexOf(a)>-1)return true;return false},val:function(a){if(!arguments.length){var b=this[0];if(b){if(c.nodeName(b,"option")){var d=b.attributes.value;return!d||d.specified?b.value:b.text}if(c.nodeName(b,"select")){var e=b.selectedIndex;d=[];var f=b.options;b=b.type==="select-one";
+if(e<0)return null;var h=b?e:0;for(e=b?e+1:f.length;h<e;h++){var l=f[h];if(l.selected&&(c.support.optDisabled?!l.disabled:l.getAttribute("disabled")===null)&&(!l.parentNode.disabled||!c.nodeName(l.parentNode,"optgroup"))){a=c(l).val();if(b)return a;d.push(a)}}return d}if(ta.test(b.type)&&!c.support.checkOn)return b.getAttribute("value")===null?"on":b.value;return(b.value||"").replace(Sa,"")}return B}var k=c.isFunction(a);return this.each(function(o){var x=c(this),r=a;if(this.nodeType===1){if(k)r=
+a.call(this,o,x.val());if(r==null)r="";else if(typeof r==="number")r+="";else if(c.isArray(r))r=c.map(r,function(C){return C==null?"":C+""});if(c.isArray(r)&&ta.test(this.type))this.checked=c.inArray(x.val(),r)>=0;else if(c.nodeName(this,"select")){var A=c.makeArray(r);c("option",this).each(function(){this.selected=c.inArray(c(this).val(),A)>=0});if(!A.length)this.selectedIndex=-1}else this.value=r}})}});c.extend({attrFn:{val:true,css:true,html:true,text:true,data:true,width:true,height:true,offset:true},
+attr:function(a,b,d,e){if(!a||a.nodeType===3||a.nodeType===8)return B;if(e&&b in c.attrFn)return c(a)[b](d);e=a.nodeType!==1||!c.isXMLDoc(a);var f=d!==B;b=e&&c.props[b]||b;var h=Ta.test(b);if((b in a||a[b]!==B)&&e&&!h){if(f){b==="type"&&Ua.test(a.nodeName)&&a.parentNode&&c.error("type property can't be changed");if(d===null)a.nodeType===1&&a.removeAttribute(b);else a[b]=d}if(c.nodeName(a,"form")&&a.getAttributeNode(b))return a.getAttributeNode(b).nodeValue;if(b==="tabIndex")return(b=a.getAttributeNode("tabIndex"))&&
+b.specified?b.value:Va.test(a.nodeName)||Wa.test(a.nodeName)&&a.href?0:B;return a[b]}if(!c.support.style&&e&&b==="style"){if(f)a.style.cssText=""+d;return a.style.cssText}f&&a.setAttribute(b,""+d);if(!a.attributes[b]&&a.hasAttribute&&!a.hasAttribute(b))return B;a=!c.support.hrefNormalized&&e&&h?a.getAttribute(b,2):a.getAttribute(b);return a===null?B:a}});var X=/\.(.*)$/,ia=/^(?:textarea|input|select)$/i,La=/\./g,Ma=/ /g,Xa=/[^\w\s.|`]/g,Ya=function(a){return a.replace(Xa,"\\$&")},ua={focusin:0,focusout:0};
+c.event={add:function(a,b,d,e){if(!(a.nodeType===3||a.nodeType===8)){if(c.isWindow(a)&&a!==E&&!a.frameElement)a=E;if(d===false)d=U;else if(!d)return;var f,h;if(d.handler){f=d;d=f.handler}if(!d.guid)d.guid=c.guid++;if(h=c.data(a)){var l=a.nodeType?"events":"__events__",k=h[l],o=h.handle;if(typeof k==="function"){o=k.handle;k=k.events}else if(!k){a.nodeType||(h[l]=h=function(){});h.events=k={}}if(!o)h.handle=o=function(){return typeof c!=="undefined"&&!c.event.triggered?c.event.handle.apply(o.elem,
+arguments):B};o.elem=a;b=b.split(" ");for(var x=0,r;l=b[x++];){h=f?c.extend({},f):{handler:d,data:e};if(l.indexOf(".")>-1){r=l.split(".");l=r.shift();h.namespace=r.slice(0).sort().join(".")}else{r=[];h.namespace=""}h.type=l;if(!h.guid)h.guid=d.guid;var A=k[l],C=c.event.special[l]||{};if(!A){A=k[l]=[];if(!C.setup||C.setup.call(a,e,r,o)===false)if(a.addEventListener)a.addEventListener(l,o,false);else a.attachEvent&&a.attachEvent("on"+l,o)}if(C.add){C.add.call(a,h);if(!h.handler.guid)h.handler.guid=
+d.guid}A.push(h);c.event.global[l]=true}a=null}}},global:{},remove:function(a,b,d,e){if(!(a.nodeType===3||a.nodeType===8)){if(d===false)d=U;var f,h,l=0,k,o,x,r,A,C,J=a.nodeType?"events":"__events__",w=c.data(a),I=w&&w[J];if(w&&I){if(typeof I==="function"){w=I;I=I.events}if(b&&b.type){d=b.handler;b=b.type}if(!b||typeof b==="string"&&b.charAt(0)==="."){b=b||"";for(f in I)c.event.remove(a,f+b)}else{for(b=b.split(" ");f=b[l++];){r=f;k=f.indexOf(".")<0;o=[];if(!k){o=f.split(".");f=o.shift();x=RegExp("(^|\\.)"+
+c.map(o.slice(0).sort(),Ya).join("\\.(?:.*\\.)?")+"(\\.|$)")}if(A=I[f])if(d){r=c.event.special[f]||{};for(h=e||0;h<A.length;h++){C=A[h];if(d.guid===C.guid){if(k||x.test(C.namespace)){e==null&&A.splice(h--,1);r.remove&&r.remove.call(a,C)}if(e!=null)break}}if(A.length===0||e!=null&&A.length===1){if(!r.teardown||r.teardown.call(a,o)===false)c.removeEvent(a,f,w.handle);delete I[f]}}else for(h=0;h<A.length;h++){C=A[h];if(k||x.test(C.namespace)){c.event.remove(a,r,C.handler,h);A.splice(h--,1)}}}if(c.isEmptyObject(I)){if(b=
+w.handle)b.elem=null;delete w.events;delete w.handle;if(typeof w==="function")c.removeData(a,J);else c.isEmptyObject(w)&&c.removeData(a)}}}}},trigger:function(a,b,d,e){var f=a.type||a;if(!e){a=typeof a==="object"?a[c.expando]?a:c.extend(c.Event(f),a):c.Event(f);if(f.indexOf("!")>=0){a.type=f=f.slice(0,-1);a.exclusive=true}if(!d){a.stopPropagation();c.event.global[f]&&c.each(c.cache,function(){this.events&&this.events[f]&&c.event.trigger(a,b,this.handle.elem)})}if(!d||d.nodeType===3||d.nodeType===
+8)return B;a.result=B;a.target=d;b=c.makeArray(b);b.unshift(a)}a.currentTarget=d;(e=d.nodeType?c.data(d,"handle"):(c.data(d,"__events__")||{}).handle)&&e.apply(d,b);e=d.parentNode||d.ownerDocument;try{if(!(d&&d.nodeName&&c.noData[d.nodeName.toLowerCase()]))if(d["on"+f]&&d["on"+f].apply(d,b)===false){a.result=false;a.preventDefault()}}catch(h){}if(!a.isPropagationStopped()&&e)c.event.trigger(a,b,e,true);else if(!a.isDefaultPrevented()){var l;e=a.target;var k=f.replace(X,""),o=c.nodeName(e,"a")&&k===
+"click",x=c.event.special[k]||{};if((!x._default||x._default.call(d,a)===false)&&!o&&!(e&&e.nodeName&&c.noData[e.nodeName.toLowerCase()])){try{if(e[k]){if(l=e["on"+k])e["on"+k]=null;c.event.triggered=true;e[k]()}}catch(r){}if(l)e["on"+k]=l;c.event.triggered=false}}},handle:function(a){var b,d,e,f;d=[];var h=c.makeArray(arguments);a=h[0]=c.event.fix(a||E.event);a.currentTarget=this;b=a.type.indexOf(".")<0&&!a.exclusive;if(!b){e=a.type.split(".");a.type=e.shift();d=e.slice(0).sort();e=RegExp("(^|\\.)"+
+d.join("\\.(?:.*\\.)?")+"(\\.|$)")}a.namespace=a.namespace||d.join(".");f=c.data(this,this.nodeType?"events":"__events__");if(typeof f==="function")f=f.events;d=(f||{})[a.type];if(f&&d){d=d.slice(0);f=0;for(var l=d.length;f<l;f++){var k=d[f];if(b||e.test(k.namespace)){a.handler=k.handler;a.data=k.data;a.handleObj=k;k=k.handler.apply(this,h);if(k!==B){a.result=k;if(k===false){a.preventDefault();a.stopPropagation()}}if(a.isImmediatePropagationStopped())break}}}return a.result},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),
+fix:function(a){if(a[c.expando])return a;var b=a;a=c.Event(b);for(var d=this.props.length,e;d;){e=this.props[--d];a[e]=b[e]}if(!a.target)a.target=a.srcElement||t;if(a.target.nodeType===3)a.target=a.target.parentNode;if(!a.relatedTarget&&a.fromElement)a.relatedTarget=a.fromElement===a.target?a.toElement:a.fromElement;if(a.pageX==null&&a.clientX!=null){b=t.documentElement;d=t.body;a.pageX=a.clientX+(b&&b.scrollLeft||d&&d.scrollLeft||0)-(b&&b.clientLeft||d&&d.clientLeft||0);a.pageY=a.clientY+(b&&b.scrollTop||
+d&&d.scrollTop||0)-(b&&b.clientTop||d&&d.clientTop||0)}if(a.which==null&&(a.charCode!=null||a.keyCode!=null))a.which=a.charCode!=null?a.charCode:a.keyCode;if(!a.metaKey&&a.ctrlKey)a.metaKey=a.ctrlKey;if(!a.which&&a.button!==B)a.which=a.button&1?1:a.button&2?3:a.button&4?2:0;return a},guid:1E8,proxy:c.proxy,special:{ready:{setup:c.bindReady,teardown:c.noop},live:{add:function(a){c.event.add(this,Y(a.origType,a.selector),c.extend({},a,{handler:Ka,guid:a.handler.guid}))},remove:function(a){c.event.remove(this,
+Y(a.origType,a.selector),a)}},beforeunload:{setup:function(a,b,d){if(c.isWindow(this))this.onbeforeunload=d},teardown:function(a,b){if(this.onbeforeunload===b)this.onbeforeunload=null}}}};c.removeEvent=t.removeEventListener?function(a,b,d){a.removeEventListener&&a.removeEventListener(b,d,false)}:function(a,b,d){a.detachEvent&&a.detachEvent("on"+b,d)};c.Event=function(a){if(!this.preventDefault)return new c.Event(a);if(a&&a.type){this.originalEvent=a;this.type=a.type}else this.type=a;this.timeStamp=
+c.now();this[c.expando]=true};c.Event.prototype={preventDefault:function(){this.isDefaultPrevented=ca;var a=this.originalEvent;if(a)if(a.preventDefault)a.preventDefault();else a.returnValue=false},stopPropagation:function(){this.isPropagationStopped=ca;var a=this.originalEvent;if(a){a.stopPropagation&&a.stopPropagation();a.cancelBubble=true}},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=ca;this.stopPropagation()},isDefaultPrevented:U,isPropagationStopped:U,isImmediatePropagationStopped:U};
+var va=function(a){var b=a.relatedTarget;try{for(;b&&b!==this;)b=b.parentNode;if(b!==this){a.type=a.data;c.event.handle.apply(this,arguments)}}catch(d){}},wa=function(a){a.type=a.data;c.event.handle.apply(this,arguments)};c.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){c.event.special[a]={setup:function(d){c.event.add(this,b,d&&d.selector?wa:va,a)},teardown:function(d){c.event.remove(this,b,d&&d.selector?wa:va)}}});if(!c.support.submitBubbles)c.event.special.submit={setup:function(){if(this.nodeName.toLowerCase()!==
+"form"){c.event.add(this,"click.specialSubmit",function(a){var b=a.target,d=b.type;if((d==="submit"||d==="image")&&c(b).closest("form").length){a.liveFired=B;return la("submit",this,arguments)}});c.event.add(this,"keypress.specialSubmit",function(a){var b=a.target,d=b.type;if((d==="text"||d==="password")&&c(b).closest("form").length&&a.keyCode===13){a.liveFired=B;return la("submit",this,arguments)}})}else return false},teardown:function(){c.event.remove(this,".specialSubmit")}};if(!c.support.changeBubbles){var V,
+xa=function(a){var b=a.type,d=a.value;if(b==="radio"||b==="checkbox")d=a.checked;else if(b==="select-multiple")d=a.selectedIndex>-1?c.map(a.options,function(e){return e.selected}).join("-"):"";else if(a.nodeName.toLowerCase()==="select")d=a.selectedIndex;return d},Z=function(a,b){var d=a.target,e,f;if(!(!ia.test(d.nodeName)||d.readOnly)){e=c.data(d,"_change_data");f=xa(d);if(a.type!=="focusout"||d.type!=="radio")c.data(d,"_change_data",f);if(!(e===B||f===e))if(e!=null||f){a.type="change";a.liveFired=
+B;return c.event.trigger(a,b,d)}}};c.event.special.change={filters:{focusout:Z,beforedeactivate:Z,click:function(a){var b=a.target,d=b.type;if(d==="radio"||d==="checkbox"||b.nodeName.toLowerCase()==="select")return Z.call(this,a)},keydown:function(a){var b=a.target,d=b.type;if(a.keyCode===13&&b.nodeName.toLowerCase()!=="textarea"||a.keyCode===32&&(d==="checkbox"||d==="radio")||d==="select-multiple")return Z.call(this,a)},beforeactivate:function(a){a=a.target;c.data(a,"_change_data",xa(a))}},setup:function(){if(this.type===
+"file")return false;for(var a in V)c.event.add(this,a+".specialChange",V[a]);return ia.test(this.nodeName)},teardown:function(){c.event.remove(this,".specialChange");return ia.test(this.nodeName)}};V=c.event.special.change.filters;V.focus=V.beforeactivate}t.addEventListener&&c.each({focus:"focusin",blur:"focusout"},function(a,b){function d(e){e=c.event.fix(e);e.type=b;return c.event.trigger(e,null,e.target)}c.event.special[b]={setup:function(){ua[b]++===0&&t.addEventListener(a,d,true)},teardown:function(){--ua[b]===
+0&&t.removeEventListener(a,d,true)}}});c.each(["bind","one"],function(a,b){c.fn[b]=function(d,e,f){if(typeof d==="object"){for(var h in d)this[b](h,e,d[h],f);return this}if(c.isFunction(e)||e===false){f=e;e=B}var l=b==="one"?c.proxy(f,function(o){c(this).unbind(o,l);return f.apply(this,arguments)}):f;if(d==="unload"&&b!=="one")this.one(d,e,f);else{h=0;for(var k=this.length;h<k;h++)c.event.add(this[h],d,l,e)}return this}});c.fn.extend({unbind:function(a,b){if(typeof a==="object"&&!a.preventDefault)for(var d in a)this.unbind(d,
+a[d]);else{d=0;for(var e=this.length;d<e;d++)c.event.remove(this[d],a,b)}return this},delegate:function(a,b,d,e){return this.live(b,d,e,a)},undelegate:function(a,b,d){return arguments.length===0?this.unbind("live"):this.die(b,null,d,a)},trigger:function(a,b){return this.each(function(){c.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0]){var d=c.Event(a);d.preventDefault();d.stopPropagation();c.event.trigger(d,b,this[0]);return d.result}},toggle:function(a){for(var b=arguments,d=
+1;d<b.length;)c.proxy(a,b[d++]);return this.click(c.proxy(a,function(e){var f=(c.data(this,"lastToggle"+a.guid)||0)%d;c.data(this,"lastToggle"+a.guid,f+1);e.preventDefault();return b[f].apply(this,arguments)||false}))},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}});var ya={focus:"focusin",blur:"focusout",mouseenter:"mouseover",mouseleave:"mouseout"};c.each(["live","die"],function(a,b){c.fn[b]=function(d,e,f,h){var l,k=0,o,x,r=h||this.selector;h=h?this:c(this.context);if(typeof d===
+"object"&&!d.preventDefault){for(l in d)h[b](l,e,d[l],r);return this}if(c.isFunction(e)){f=e;e=B}for(d=(d||"").split(" ");(l=d[k++])!=null;){o=X.exec(l);x="";if(o){x=o[0];l=l.replace(X,"")}if(l==="hover")d.push("mouseenter"+x,"mouseleave"+x);else{o=l;if(l==="focus"||l==="blur"){d.push(ya[l]+x);l+=x}else l=(ya[l]||l)+x;if(b==="live"){x=0;for(var A=h.length;x<A;x++)c.event.add(h[x],"live."+Y(l,r),{data:e,selector:r,handler:f,origType:l,origHandler:f,preType:o})}else h.unbind("live."+Y(l,r),f)}}return this}});
+c.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error".split(" "),function(a,b){c.fn[b]=function(d,e){if(e==null){e=d;d=null}return arguments.length>0?this.bind(b,d,e):this.trigger(b)};if(c.attrFn)c.attrFn[b]=true});E.attachEvent&&!E.addEventListener&&c(E).bind("unload",function(){for(var a in c.cache)if(c.cache[a].handle)try{c.event.remove(c.cache[a].handle.elem)}catch(b){}});
+(function(){function a(g,i,n,m,p,q){p=0;for(var u=m.length;p<u;p++){var y=m[p];if(y){var F=false;for(y=y[g];y;){if(y.sizcache===n){F=m[y.sizset];break}if(y.nodeType===1&&!q){y.sizcache=n;y.sizset=p}if(y.nodeName.toLowerCase()===i){F=y;break}y=y[g]}m[p]=F}}}function b(g,i,n,m,p,q){p=0;for(var u=m.length;p<u;p++){var y=m[p];if(y){var F=false;for(y=y[g];y;){if(y.sizcache===n){F=m[y.sizset];break}if(y.nodeType===1){if(!q){y.sizcache=n;y.sizset=p}if(typeof i!=="string"){if(y===i){F=true;break}}else if(k.filter(i,
+[y]).length>0){F=y;break}}y=y[g]}m[p]=F}}}var d=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,e=0,f=Object.prototype.toString,h=false,l=true;[0,0].sort(function(){l=false;return 0});var k=function(g,i,n,m){n=n||[];var p=i=i||t;if(i.nodeType!==1&&i.nodeType!==9)return[];if(!g||typeof g!=="string")return n;var q,u,y,F,M,N=true,O=k.isXML(i),D=[],R=g;do{d.exec("");if(q=d.exec(R)){R=q[3];D.push(q[1]);if(q[2]){F=q[3];
+break}}}while(q);if(D.length>1&&x.exec(g))if(D.length===2&&o.relative[D[0]])u=L(D[0]+D[1],i);else for(u=o.relative[D[0]]?[i]:k(D.shift(),i);D.length;){g=D.shift();if(o.relative[g])g+=D.shift();u=L(g,u)}else{if(!m&&D.length>1&&i.nodeType===9&&!O&&o.match.ID.test(D[0])&&!o.match.ID.test(D[D.length-1])){q=k.find(D.shift(),i,O);i=q.expr?k.filter(q.expr,q.set)[0]:q.set[0]}if(i){q=m?{expr:D.pop(),set:C(m)}:k.find(D.pop(),D.length===1&&(D[0]==="~"||D[0]==="+")&&i.parentNode?i.parentNode:i,O);u=q.expr?k.filter(q.expr,
+q.set):q.set;if(D.length>0)y=C(u);else N=false;for(;D.length;){q=M=D.pop();if(o.relative[M])q=D.pop();else M="";if(q==null)q=i;o.relative[M](y,q,O)}}else y=[]}y||(y=u);y||k.error(M||g);if(f.call(y)==="[object Array]")if(N)if(i&&i.nodeType===1)for(g=0;y[g]!=null;g++){if(y[g]&&(y[g]===true||y[g].nodeType===1&&k.contains(i,y[g])))n.push(u[g])}else for(g=0;y[g]!=null;g++)y[g]&&y[g].nodeType===1&&n.push(u[g]);else n.push.apply(n,y);else C(y,n);if(F){k(F,p,n,m);k.uniqueSort(n)}return n};k.uniqueSort=function(g){if(w){h=
+l;g.sort(w);if(h)for(var i=1;i<g.length;i++)g[i]===g[i-1]&&g.splice(i--,1)}return g};k.matches=function(g,i){return k(g,null,null,i)};k.matchesSelector=function(g,i){return k(i,null,null,[g]).length>0};k.find=function(g,i,n){var m;if(!g)return[];for(var p=0,q=o.order.length;p<q;p++){var u,y=o.order[p];if(u=o.leftMatch[y].exec(g)){var F=u[1];u.splice(1,1);if(F.substr(F.length-1)!=="\\"){u[1]=(u[1]||"").replace(/\\/g,"");m=o.find[y](u,i,n);if(m!=null){g=g.replace(o.match[y],"");break}}}}m||(m=i.getElementsByTagName("*"));
+return{set:m,expr:g}};k.filter=function(g,i,n,m){for(var p,q,u=g,y=[],F=i,M=i&&i[0]&&k.isXML(i[0]);g&&i.length;){for(var N in o.filter)if((p=o.leftMatch[N].exec(g))!=null&&p[2]){var O,D,R=o.filter[N];D=p[1];q=false;p.splice(1,1);if(D.substr(D.length-1)!=="\\"){if(F===y)y=[];if(o.preFilter[N])if(p=o.preFilter[N](p,F,n,y,m,M)){if(p===true)continue}else q=O=true;if(p)for(var j=0;(D=F[j])!=null;j++)if(D){O=R(D,p,j,F);var s=m^!!O;if(n&&O!=null)if(s)q=true;else F[j]=false;else if(s){y.push(D);q=true}}if(O!==
+B){n||(F=y);g=g.replace(o.match[N],"");if(!q)return[];break}}}if(g===u)if(q==null)k.error(g);else break;u=g}return F};k.error=function(g){throw"Syntax error, unrecognized expression: "+g;};var o=k.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\((even|odd|[\dn+\-]*)\))?/,
+POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(g){return g.getAttribute("href")}},relative:{"+":function(g,i){var n=typeof i==="string",m=n&&!/\W/.test(i);n=n&&!m;if(m)i=i.toLowerCase();m=0;for(var p=g.length,q;m<p;m++)if(q=g[m]){for(;(q=q.previousSibling)&&q.nodeType!==1;);g[m]=n||q&&q.nodeName.toLowerCase()===
+i?q||false:q===i}n&&k.filter(i,g,true)},">":function(g,i){var n,m=typeof i==="string",p=0,q=g.length;if(m&&!/\W/.test(i))for(i=i.toLowerCase();p<q;p++){if(n=g[p]){n=n.parentNode;g[p]=n.nodeName.toLowerCase()===i?n:false}}else{for(;p<q;p++)if(n=g[p])g[p]=m?n.parentNode:n.parentNode===i;m&&k.filter(i,g,true)}},"":function(g,i,n){var m,p=e++,q=b;if(typeof i==="string"&&!/\W/.test(i)){m=i=i.toLowerCase();q=a}q("parentNode",i,p,g,m,n)},"~":function(g,i,n){var m,p=e++,q=b;if(typeof i==="string"&&!/\W/.test(i)){m=
+i=i.toLowerCase();q=a}q("previousSibling",i,p,g,m,n)}},find:{ID:function(g,i,n){if(typeof i.getElementById!=="undefined"&&!n)return(g=i.getElementById(g[1]))&&g.parentNode?[g]:[]},NAME:function(g,i){if(typeof i.getElementsByName!=="undefined"){for(var n=[],m=i.getElementsByName(g[1]),p=0,q=m.length;p<q;p++)m[p].getAttribute("name")===g[1]&&n.push(m[p]);return n.length===0?null:n}},TAG:function(g,i){return i.getElementsByTagName(g[1])}},preFilter:{CLASS:function(g,i,n,m,p,q){g=" "+g[1].replace(/\\/g,
+"")+" ";if(q)return g;q=0;for(var u;(u=i[q])!=null;q++)if(u)if(p^(u.className&&(" "+u.className+" ").replace(/[\t\n]/g," ").indexOf(g)>=0))n||m.push(u);else if(n)i[q]=false;return false},ID:function(g){return g[1].replace(/\\/g,"")},TAG:function(g){return g[1].toLowerCase()},CHILD:function(g){if(g[1]==="nth"){var i=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(g[2]==="even"&&"2n"||g[2]==="odd"&&"2n+1"||!/\D/.test(g[2])&&"0n+"+g[2]||g[2]);g[2]=i[1]+(i[2]||1)-0;g[3]=i[3]-0}g[0]=e++;return g},ATTR:function(g,i,n,
+m,p,q){i=g[1].replace(/\\/g,"");if(!q&&o.attrMap[i])g[1]=o.attrMap[i];if(g[2]==="~=")g[4]=" "+g[4]+" ";return g},PSEUDO:function(g,i,n,m,p){if(g[1]==="not")if((d.exec(g[3])||"").length>1||/^\w/.test(g[3]))g[3]=k(g[3],null,null,i);else{g=k.filter(g[3],i,n,true^p);n||m.push.apply(m,g);return false}else if(o.match.POS.test(g[0])||o.match.CHILD.test(g[0]))return true;return g},POS:function(g){g.unshift(true);return g}},filters:{enabled:function(g){return g.disabled===false&&g.type!=="hidden"},disabled:function(g){return g.disabled===
+true},checked:function(g){return g.checked===true},selected:function(g){return g.selected===true},parent:function(g){return!!g.firstChild},empty:function(g){return!g.firstChild},has:function(g,i,n){return!!k(n[3],g).length},header:function(g){return/h\d/i.test(g.nodeName)},text:function(g){return"text"===g.type},radio:function(g){return"radio"===g.type},checkbox:function(g){return"checkbox"===g.type},file:function(g){return"file"===g.type},password:function(g){return"password"===g.type},submit:function(g){return"submit"===
+g.type},image:function(g){return"image"===g.type},reset:function(g){return"reset"===g.type},button:function(g){return"button"===g.type||g.nodeName.toLowerCase()==="button"},input:function(g){return/input|select|textarea|button/i.test(g.nodeName)}},setFilters:{first:function(g,i){return i===0},last:function(g,i,n,m){return i===m.length-1},even:function(g,i){return i%2===0},odd:function(g,i){return i%2===1},lt:function(g,i,n){return i<n[3]-0},gt:function(g,i,n){return i>n[3]-0},nth:function(g,i,n){return n[3]-
+0===i},eq:function(g,i,n){return n[3]-0===i}},filter:{PSEUDO:function(g,i,n,m){var p=i[1],q=o.filters[p];if(q)return q(g,n,i,m);else if(p==="contains")return(g.textContent||g.innerText||k.getText([g])||"").indexOf(i[3])>=0;else if(p==="not"){i=i[3];n=0;for(m=i.length;n<m;n++)if(i[n]===g)return false;return true}else k.error("Syntax error, unrecognized expression: "+p)},CHILD:function(g,i){var n=i[1],m=g;switch(n){case "only":case "first":for(;m=m.previousSibling;)if(m.nodeType===1)return false;if(n===
+"first")return true;m=g;case "last":for(;m=m.nextSibling;)if(m.nodeType===1)return false;return true;case "nth":n=i[2];var p=i[3];if(n===1&&p===0)return true;var q=i[0],u=g.parentNode;if(u&&(u.sizcache!==q||!g.nodeIndex)){var y=0;for(m=u.firstChild;m;m=m.nextSibling)if(m.nodeType===1)m.nodeIndex=++y;u.sizcache=q}m=g.nodeIndex-p;return n===0?m===0:m%n===0&&m/n>=0}},ID:function(g,i){return g.nodeType===1&&g.getAttribute("id")===i},TAG:function(g,i){return i==="*"&&g.nodeType===1||g.nodeName.toLowerCase()===
+i},CLASS:function(g,i){return(" "+(g.className||g.getAttribute("class"))+" ").indexOf(i)>-1},ATTR:function(g,i){var n=i[1];n=o.attrHandle[n]?o.attrHandle[n](g):g[n]!=null?g[n]:g.getAttribute(n);var m=n+"",p=i[2],q=i[4];return n==null?p==="!=":p==="="?m===q:p==="*="?m.indexOf(q)>=0:p==="~="?(" "+m+" ").indexOf(q)>=0:!q?m&&n!==false:p==="!="?m!==q:p==="^="?m.indexOf(q)===0:p==="$="?m.substr(m.length-q.length)===q:p==="|="?m===q||m.substr(0,q.length+1)===q+"-":false},POS:function(g,i,n,m){var p=o.setFilters[i[2]];
+if(p)return p(g,n,i,m)}}},x=o.match.POS,r=function(g,i){return"\\"+(i-0+1)},A;for(A in o.match){o.match[A]=RegExp(o.match[A].source+/(?![^\[]*\])(?![^\(]*\))/.source);o.leftMatch[A]=RegExp(/(^(?:.|\r|\n)*?)/.source+o.match[A].source.replace(/\\(\d+)/g,r))}var C=function(g,i){g=Array.prototype.slice.call(g,0);if(i){i.push.apply(i,g);return i}return g};try{Array.prototype.slice.call(t.documentElement.childNodes,0)}catch(J){C=function(g,i){var n=0,m=i||[];if(f.call(g)==="[object Array]")Array.prototype.push.apply(m,
+g);else if(typeof g.length==="number")for(var p=g.length;n<p;n++)m.push(g[n]);else for(;g[n];n++)m.push(g[n]);return m}}var w,I;if(t.documentElement.compareDocumentPosition)w=function(g,i){if(g===i){h=true;return 0}if(!g.compareDocumentPosition||!i.compareDocumentPosition)return g.compareDocumentPosition?-1:1;return g.compareDocumentPosition(i)&4?-1:1};else{w=function(g,i){var n,m,p=[],q=[];n=g.parentNode;m=i.parentNode;var u=n;if(g===i){h=true;return 0}else if(n===m)return I(g,i);else if(n){if(!m)return 1}else return-1;
+for(;u;){p.unshift(u);u=u.parentNode}for(u=m;u;){q.unshift(u);u=u.parentNode}n=p.length;m=q.length;for(u=0;u<n&&u<m;u++)if(p[u]!==q[u])return I(p[u],q[u]);return u===n?I(g,q[u],-1):I(p[u],i,1)};I=function(g,i,n){if(g===i)return n;for(g=g.nextSibling;g;){if(g===i)return-1;g=g.nextSibling}return 1}}k.getText=function(g){for(var i="",n,m=0;g[m];m++){n=g[m];if(n.nodeType===3||n.nodeType===4)i+=n.nodeValue;else if(n.nodeType!==8)i+=k.getText(n.childNodes)}return i};(function(){var g=t.createElement("div"),
+i="script"+(new Date).getTime(),n=t.documentElement;g.innerHTML="<a name='"+i+"'/>";n.insertBefore(g,n.firstChild);if(t.getElementById(i)){o.find.ID=function(m,p,q){if(typeof p.getElementById!=="undefined"&&!q)return(p=p.getElementById(m[1]))?p.id===m[1]||typeof p.getAttributeNode!=="undefined"&&p.getAttributeNode("id").nodeValue===m[1]?[p]:B:[]};o.filter.ID=function(m,p){var q=typeof m.getAttributeNode!=="undefined"&&m.getAttributeNode("id");return m.nodeType===1&&q&&q.nodeValue===p}}n.removeChild(g);
+n=g=null})();(function(){var g=t.createElement("div");g.appendChild(t.createComment(""));if(g.getElementsByTagName("*").length>0)o.find.TAG=function(i,n){var m=n.getElementsByTagName(i[1]);if(i[1]==="*"){for(var p=[],q=0;m[q];q++)m[q].nodeType===1&&p.push(m[q]);m=p}return m};g.innerHTML="<a href='#'></a>";if(g.firstChild&&typeof g.firstChild.getAttribute!=="undefined"&&g.firstChild.getAttribute("href")!=="#")o.attrHandle.href=function(i){return i.getAttribute("href",2)};g=null})();t.querySelectorAll&&
+function(){var g=k,i=t.createElement("div");i.innerHTML="<p class='TEST'></p>";if(!(i.querySelectorAll&&i.querySelectorAll(".TEST").length===0)){k=function(m,p,q,u){p=p||t;m=m.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!u&&!k.isXML(p))if(p.nodeType===9)try{return C(p.querySelectorAll(m),q)}catch(y){}else if(p.nodeType===1&&p.nodeName.toLowerCase()!=="object"){var F=p.getAttribute("id"),M=F||"__sizzle__";F||p.setAttribute("id",M);try{return C(p.querySelectorAll("#"+M+" "+m),q)}catch(N){}finally{F||
+p.removeAttribute("id")}}return g(m,p,q,u)};for(var n in g)k[n]=g[n];i=null}}();(function(){var g=t.documentElement,i=g.matchesSelector||g.mozMatchesSelector||g.webkitMatchesSelector||g.msMatchesSelector,n=false;try{i.call(t.documentElement,"[test!='']:sizzle")}catch(m){n=true}if(i)k.matchesSelector=function(p,q){q=q.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!k.isXML(p))try{if(n||!o.match.PSEUDO.test(q)&&!/!=/.test(q))return i.call(p,q)}catch(u){}return k(q,null,null,[p]).length>0}})();(function(){var g=
+t.createElement("div");g.innerHTML="<div class='test e'></div><div class='test'></div>";if(!(!g.getElementsByClassName||g.getElementsByClassName("e").length===0)){g.lastChild.className="e";if(g.getElementsByClassName("e").length!==1){o.order.splice(1,0,"CLASS");o.find.CLASS=function(i,n,m){if(typeof n.getElementsByClassName!=="undefined"&&!m)return n.getElementsByClassName(i[1])};g=null}}})();k.contains=t.documentElement.contains?function(g,i){return g!==i&&(g.contains?g.contains(i):true)}:t.documentElement.compareDocumentPosition?
+function(g,i){return!!(g.compareDocumentPosition(i)&16)}:function(){return false};k.isXML=function(g){return(g=(g?g.ownerDocument||g:0).documentElement)?g.nodeName!=="HTML":false};var L=function(g,i){for(var n,m=[],p="",q=i.nodeType?[i]:i;n=o.match.PSEUDO.exec(g);){p+=n[0];g=g.replace(o.match.PSEUDO,"")}g=o.relative[g]?g+"*":g;n=0;for(var u=q.length;n<u;n++)k(g,q[n],m);return k.filter(p,m)};c.find=k;c.expr=k.selectors;c.expr[":"]=c.expr.filters;c.unique=k.uniqueSort;c.text=k.getText;c.isXMLDoc=k.isXML;
+c.contains=k.contains})();var Za=/Until$/,$a=/^(?:parents|prevUntil|prevAll)/,ab=/,/,Na=/^.[^:#\[\.,]*$/,bb=Array.prototype.slice,cb=c.expr.match.POS;c.fn.extend({find:function(a){for(var b=this.pushStack("","find",a),d=0,e=0,f=this.length;e<f;e++){d=b.length;c.find(a,this[e],b);if(e>0)for(var h=d;h<b.length;h++)for(var l=0;l<d;l++)if(b[l]===b[h]){b.splice(h--,1);break}}return b},has:function(a){var b=c(a);return this.filter(function(){for(var d=0,e=b.length;d<e;d++)if(c.contains(this,b[d]))return true})},
+not:function(a){return this.pushStack(ma(this,a,false),"not",a)},filter:function(a){return this.pushStack(ma(this,a,true),"filter",a)},is:function(a){return!!a&&c.filter(a,this).length>0},closest:function(a,b){var d=[],e,f,h=this[0];if(c.isArray(a)){var l,k={},o=1;if(h&&a.length){e=0;for(f=a.length;e<f;e++){l=a[e];k[l]||(k[l]=c.expr.match.POS.test(l)?c(l,b||this.context):l)}for(;h&&h.ownerDocument&&h!==b;){for(l in k){e=k[l];if(e.jquery?e.index(h)>-1:c(h).is(e))d.push({selector:l,elem:h,level:o})}h=
+h.parentNode;o++}}return d}l=cb.test(a)?c(a,b||this.context):null;e=0;for(f=this.length;e<f;e++)for(h=this[e];h;)if(l?l.index(h)>-1:c.find.matchesSelector(h,a)){d.push(h);break}else{h=h.parentNode;if(!h||!h.ownerDocument||h===b)break}d=d.length>1?c.unique(d):d;return this.pushStack(d,"closest",a)},index:function(a){if(!a||typeof a==="string")return c.inArray(this[0],a?c(a):this.parent().children());return c.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var d=typeof a==="string"?c(a,b||this.context):
+c.makeArray(a),e=c.merge(this.get(),d);return this.pushStack(!d[0]||!d[0].parentNode||d[0].parentNode.nodeType===11||!e[0]||!e[0].parentNode||e[0].parentNode.nodeType===11?e:c.unique(e))},andSelf:function(){return this.add(this.prevObject)}});c.each({parent:function(a){return(a=a.parentNode)&&a.nodeType!==11?a:null},parents:function(a){return c.dir(a,"parentNode")},parentsUntil:function(a,b,d){return c.dir(a,"parentNode",d)},next:function(a){return c.nth(a,2,"nextSibling")},prev:function(a){return c.nth(a,
+2,"previousSibling")},nextAll:function(a){return c.dir(a,"nextSibling")},prevAll:function(a){return c.dir(a,"previousSibling")},nextUntil:function(a,b,d){return c.dir(a,"nextSibling",d)},prevUntil:function(a,b,d){return c.dir(a,"previousSibling",d)},siblings:function(a){return c.sibling(a.parentNode.firstChild,a)},children:function(a){return c.sibling(a.firstChild)},contents:function(a){return c.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:c.makeArray(a.childNodes)}},function(a,
+b){c.fn[a]=function(d,e){var f=c.map(this,b,d);Za.test(a)||(e=d);if(e&&typeof e==="string")f=c.filter(e,f);f=this.length>1?c.unique(f):f;if((this.length>1||ab.test(e))&&$a.test(a))f=f.reverse();return this.pushStack(f,a,bb.call(arguments).join(","))}});c.extend({filter:function(a,b,d){if(d)a=":not("+a+")";return b.length===1?c.find.matchesSelector(b[0],a)?[b[0]]:[]:c.find.matches(a,b)},dir:function(a,b,d){var e=[];for(a=a[b];a&&a.nodeType!==9&&(d===B||a.nodeType!==1||!c(a).is(d));){a.nodeType===1&&
+e.push(a);a=a[b]}return e},nth:function(a,b,d){b=b||1;for(var e=0;a;a=a[d])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){for(var d=[];a;a=a.nextSibling)a.nodeType===1&&a!==b&&d.push(a);return d}});var za=/ jQuery\d+="(?:\d+|null)"/g,$=/^\s+/,Aa=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,Ba=/<([\w:]+)/,db=/<tbody/i,eb=/<|&#?\w+;/,Ca=/<(?:script|object|embed|option|style)/i,Da=/checked\s*(?:[^=]|=\s*.checked.)/i,fb=/\=([^="'>\s]+\/)>/g,P={option:[1,
+"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]};P.optgroup=P.option;P.tbody=P.tfoot=P.colgroup=P.caption=P.thead;P.th=P.td;if(!c.support.htmlSerialize)P._default=[1,"div<div>","</div>"];c.fn.extend({text:function(a){if(c.isFunction(a))return this.each(function(b){var d=
+c(this);d.text(a.call(this,b,d.text()))});if(typeof a!=="object"&&a!==B)return this.empty().append((this[0]&&this[0].ownerDocument||t).createTextNode(a));return c.text(this)},wrapAll:function(a){if(c.isFunction(a))return this.each(function(d){c(this).wrapAll(a.call(this,d))});if(this[0]){var b=c(a,this[0].ownerDocument).eq(0).clone(true);this[0].parentNode&&b.insertBefore(this[0]);b.map(function(){for(var d=this;d.firstChild&&d.firstChild.nodeType===1;)d=d.firstChild;return d}).append(this)}return this},
+wrapInner:function(a){if(c.isFunction(a))return this.each(function(b){c(this).wrapInner(a.call(this,b))});return this.each(function(){var b=c(this),d=b.contents();d.length?d.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){c(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){c.nodeName(this,"body")||c(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.appendChild(a)})},
+prepend:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b,this)});else if(arguments.length){var a=c(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b,
+this.nextSibling)});else if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,c(arguments[0]).toArray());return a}},remove:function(a,b){for(var d=0,e;(e=this[d])!=null;d++)if(!a||c.filter(a,[e]).length){if(!b&&e.nodeType===1){c.cleanData(e.getElementsByTagName("*"));c.cleanData([e])}e.parentNode&&e.parentNode.removeChild(e)}return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++)for(b.nodeType===1&&c.cleanData(b.getElementsByTagName("*"));b.firstChild;)b.removeChild(b.firstChild);
+return this},clone:function(a){var b=this.map(function(){if(!c.support.noCloneEvent&&!c.isXMLDoc(this)){var d=this.outerHTML,e=this.ownerDocument;if(!d){d=e.createElement("div");d.appendChild(this.cloneNode(true));d=d.innerHTML}return c.clean([d.replace(za,"").replace(fb,'="$1">').replace($,"")],e)[0]}else return this.cloneNode(true)});if(a===true){na(this,b);na(this.find("*"),b.find("*"))}return b},html:function(a){if(a===B)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(za,""):null;
+else if(typeof a==="string"&&!Ca.test(a)&&(c.support.leadingWhitespace||!$.test(a))&&!P[(Ba.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Aa,"<$1></$2>");try{for(var b=0,d=this.length;b<d;b++)if(this[b].nodeType===1){c.cleanData(this[b].getElementsByTagName("*"));this[b].innerHTML=a}}catch(e){this.empty().append(a)}}else c.isFunction(a)?this.each(function(f){var h=c(this);h.html(a.call(this,f,h.html()))}):this.empty().append(a);return this},replaceWith:function(a){if(this[0]&&this[0].parentNode){if(c.isFunction(a))return this.each(function(b){var d=
+c(this),e=d.html();d.replaceWith(a.call(this,b,e))});if(typeof a!=="string")a=c(a).detach();return this.each(function(){var b=this.nextSibling,d=this.parentNode;c(this).remove();b?c(b).before(a):c(d).append(a)})}else return this.pushStack(c(c.isFunction(a)?a():a),"replaceWith",a)},detach:function(a){return this.remove(a,true)},domManip:function(a,b,d){var e,f,h,l=a[0],k=[];if(!c.support.checkClone&&arguments.length===3&&typeof l==="string"&&Da.test(l))return this.each(function(){c(this).domManip(a,
+b,d,true)});if(c.isFunction(l))return this.each(function(x){var r=c(this);a[0]=l.call(this,x,b?r.html():B);r.domManip(a,b,d)});if(this[0]){e=l&&l.parentNode;e=c.support.parentNode&&e&&e.nodeType===11&&e.childNodes.length===this.length?{fragment:e}:c.buildFragment(a,this,k);h=e.fragment;if(f=h.childNodes.length===1?h=h.firstChild:h.firstChild){b=b&&c.nodeName(f,"tr");f=0;for(var o=this.length;f<o;f++)d.call(b?c.nodeName(this[f],"table")?this[f].getElementsByTagName("tbody")[0]||this[f].appendChild(this[f].ownerDocument.createElement("tbody")):
+this[f]:this[f],f>0||e.cacheable||this.length>1?h.cloneNode(true):h)}k.length&&c.each(k,Oa)}return this}});c.buildFragment=function(a,b,d){var e,f,h;b=b&&b[0]?b[0].ownerDocument||b[0]:t;if(a.length===1&&typeof a[0]==="string"&&a[0].length<512&&b===t&&!Ca.test(a[0])&&(c.support.checkClone||!Da.test(a[0]))){f=true;if(h=c.fragments[a[0]])if(h!==1)e=h}if(!e){e=b.createDocumentFragment();c.clean(a,b,e,d)}if(f)c.fragments[a[0]]=h?e:1;return{fragment:e,cacheable:f}};c.fragments={};c.each({appendTo:"append",
+prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){c.fn[a]=function(d){var e=[];d=c(d);var f=this.length===1&&this[0].parentNode;if(f&&f.nodeType===11&&f.childNodes.length===1&&d.length===1){d[b](this[0]);return this}else{f=0;for(var h=d.length;f<h;f++){var l=(f>0?this.clone(true):this).get();c(d[f])[b](l);e=e.concat(l)}return this.pushStack(e,a,d.selector)}}});c.extend({clean:function(a,b,d,e){b=b||t;if(typeof b.createElement==="undefined")b=b.ownerDocument||
+b[0]&&b[0].ownerDocument||t;for(var f=[],h=0,l;(l=a[h])!=null;h++){if(typeof l==="number")l+="";if(l){if(typeof l==="string"&&!eb.test(l))l=b.createTextNode(l);else if(typeof l==="string"){l=l.replace(Aa,"<$1></$2>");var k=(Ba.exec(l)||["",""])[1].toLowerCase(),o=P[k]||P._default,x=o[0],r=b.createElement("div");for(r.innerHTML=o[1]+l+o[2];x--;)r=r.lastChild;if(!c.support.tbody){x=db.test(l);k=k==="table"&&!x?r.firstChild&&r.firstChild.childNodes:o[1]==="<table>"&&!x?r.childNodes:[];for(o=k.length-
+1;o>=0;--o)c.nodeName(k[o],"tbody")&&!k[o].childNodes.length&&k[o].parentNode.removeChild(k[o])}!c.support.leadingWhitespace&&$.test(l)&&r.insertBefore(b.createTextNode($.exec(l)[0]),r.firstChild);l=r.childNodes}if(l.nodeType)f.push(l);else f=c.merge(f,l)}}if(d)for(h=0;f[h];h++)if(e&&c.nodeName(f[h],"script")&&(!f[h].type||f[h].type.toLowerCase()==="text/javascript"))e.push(f[h].parentNode?f[h].parentNode.removeChild(f[h]):f[h]);else{f[h].nodeType===1&&f.splice.apply(f,[h+1,0].concat(c.makeArray(f[h].getElementsByTagName("script"))));
+d.appendChild(f[h])}return f},cleanData:function(a){for(var b,d,e=c.cache,f=c.event.special,h=c.support.deleteExpando,l=0,k;(k=a[l])!=null;l++)if(!(k.nodeName&&c.noData[k.nodeName.toLowerCase()]))if(d=k[c.expando]){if((b=e[d])&&b.events)for(var o in b.events)f[o]?c.event.remove(k,o):c.removeEvent(k,o,b.handle);if(h)delete k[c.expando];else k.removeAttribute&&k.removeAttribute(c.expando);delete e[d]}}});var Ea=/alpha\([^)]*\)/i,gb=/opacity=([^)]*)/,hb=/-([a-z])/ig,ib=/([A-Z])/g,Fa=/^-?\d+(?:px)?$/i,
+jb=/^-?\d/,kb={position:"absolute",visibility:"hidden",display:"block"},Pa=["Left","Right"],Qa=["Top","Bottom"],W,Ga,aa,lb=function(a,b){return b.toUpperCase()};c.fn.css=function(a,b){if(arguments.length===2&&b===B)return this;return c.access(this,a,b,true,function(d,e,f){return f!==B?c.style(d,e,f):c.css(d,e)})};c.extend({cssHooks:{opacity:{get:function(a,b){if(b){var d=W(a,"opacity","opacity");return d===""?"1":d}else return a.style.opacity}}},cssNumber:{zIndex:true,fontWeight:true,opacity:true,
+zoom:true,lineHeight:true},cssProps:{"float":c.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,b,d,e){if(!(!a||a.nodeType===3||a.nodeType===8||!a.style)){var f,h=c.camelCase(b),l=a.style,k=c.cssHooks[h];b=c.cssProps[h]||h;if(d!==B){if(!(typeof d==="number"&&isNaN(d)||d==null)){if(typeof d==="number"&&!c.cssNumber[h])d+="px";if(!k||!("set"in k)||(d=k.set(a,d))!==B)try{l[b]=d}catch(o){}}}else{if(k&&"get"in k&&(f=k.get(a,false,e))!==B)return f;return l[b]}}},css:function(a,b,d){var e,f=c.camelCase(b),
+h=c.cssHooks[f];b=c.cssProps[f]||f;if(h&&"get"in h&&(e=h.get(a,true,d))!==B)return e;else if(W)return W(a,b,f)},swap:function(a,b,d){var e={},f;for(f in b){e[f]=a.style[f];a.style[f]=b[f]}d.call(a);for(f in b)a.style[f]=e[f]},camelCase:function(a){return a.replace(hb,lb)}});c.curCSS=c.css;c.each(["height","width"],function(a,b){c.cssHooks[b]={get:function(d,e,f){var h;if(e){if(d.offsetWidth!==0)h=oa(d,b,f);else c.swap(d,kb,function(){h=oa(d,b,f)});if(h<=0){h=W(d,b,b);if(h==="0px"&&aa)h=aa(d,b,b);
+if(h!=null)return h===""||h==="auto"?"0px":h}if(h<0||h==null){h=d.style[b];return h===""||h==="auto"?"0px":h}return typeof h==="string"?h:h+"px"}},set:function(d,e){if(Fa.test(e)){e=parseFloat(e);if(e>=0)return e+"px"}else return e}}});if(!c.support.opacity)c.cssHooks.opacity={get:function(a,b){return gb.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var d=a.style;d.zoom=1;var e=c.isNaN(b)?"":"alpha(opacity="+b*100+")",f=
+d.filter||"";d.filter=Ea.test(f)?f.replace(Ea,e):d.filter+" "+e}};if(t.defaultView&&t.defaultView.getComputedStyle)Ga=function(a,b,d){var e;d=d.replace(ib,"-$1").toLowerCase();if(!(b=a.ownerDocument.defaultView))return B;if(b=b.getComputedStyle(a,null)){e=b.getPropertyValue(d);if(e===""&&!c.contains(a.ownerDocument.documentElement,a))e=c.style(a,d)}return e};if(t.documentElement.currentStyle)aa=function(a,b){var d,e,f=a.currentStyle&&a.currentStyle[b],h=a.style;if(!Fa.test(f)&&jb.test(f)){d=h.left;
+e=a.runtimeStyle.left;a.runtimeStyle.left=a.currentStyle.left;h.left=b==="fontSize"?"1em":f||0;f=h.pixelLeft+"px";h.left=d;a.runtimeStyle.left=e}return f===""?"auto":f};W=Ga||aa;if(c.expr&&c.expr.filters){c.expr.filters.hidden=function(a){var b=a.offsetHeight;return a.offsetWidth===0&&b===0||!c.support.reliableHiddenOffsets&&(a.style.display||c.css(a,"display"))==="none"};c.expr.filters.visible=function(a){return!c.expr.filters.hidden(a)}}var mb=c.now(),nb=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,
+ob=/^(?:select|textarea)/i,pb=/^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,qb=/^(?:GET|HEAD)$/,Ra=/\[\]$/,T=/\=\?(&|$)/,ja=/\?/,rb=/([?&])_=[^&]*/,sb=/^(\w+:)?\/\/([^\/?#]+)/,tb=/%20/g,ub=/#.*$/,Ha=c.fn.load;c.fn.extend({load:function(a,b,d){if(typeof a!=="string"&&Ha)return Ha.apply(this,arguments);else if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var f=a.slice(e,a.length);a=a.slice(0,e)}e="GET";if(b)if(c.isFunction(b)){d=b;b=null}else if(typeof b===
+"object"){b=c.param(b,c.ajaxSettings.traditional);e="POST"}var h=this;c.ajax({url:a,type:e,dataType:"html",data:b,complete:function(l,k){if(k==="success"||k==="notmodified")h.html(f?c("<div>").append(l.responseText.replace(nb,"")).find(f):l.responseText);d&&h.each(d,[l.responseText,k,l])}});return this},serialize:function(){return c.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?c.makeArray(this.elements):this}).filter(function(){return this.name&&
+!this.disabled&&(this.checked||ob.test(this.nodeName)||pb.test(this.type))}).map(function(a,b){var d=c(this).val();return d==null?null:c.isArray(d)?c.map(d,function(e){return{name:b.name,value:e}}):{name:b.name,value:d}}).get()}});c.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){c.fn[b]=function(d){return this.bind(b,d)}});c.extend({get:function(a,b,d,e){if(c.isFunction(b)){e=e||d;d=b;b=null}return c.ajax({type:"GET",url:a,data:b,success:d,dataType:e})},
+getScript:function(a,b){return c.get(a,null,b,"script")},getJSON:function(a,b,d){return c.get(a,b,d,"json")},post:function(a,b,d,e){if(c.isFunction(b)){e=e||d;d=b;b={}}return c.ajax({type:"POST",url:a,data:b,success:d,dataType:e})},ajaxSetup:function(a){c.extend(c.ajaxSettings,a)},ajaxSettings:{url:location.href,global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:function(){return new E.XMLHttpRequest},accepts:{xml:"application/xml, text/xml",html:"text/html",
+script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},ajax:function(a){var b=c.extend(true,{},c.ajaxSettings,a),d,e,f,h=b.type.toUpperCase(),l=qb.test(h);b.url=b.url.replace(ub,"");b.context=a&&a.context!=null?a.context:b;if(b.data&&b.processData&&typeof b.data!=="string")b.data=c.param(b.data,b.traditional);if(b.dataType==="jsonp"){if(h==="GET")T.test(b.url)||(b.url+=(ja.test(b.url)?"&":"?")+(b.jsonp||"callback")+"=?");else if(!b.data||
+!T.test(b.data))b.data=(b.data?b.data+"&":"")+(b.jsonp||"callback")+"=?";b.dataType="json"}if(b.dataType==="json"&&(b.data&&T.test(b.data)||T.test(b.url))){d=b.jsonpCallback||"jsonp"+mb++;if(b.data)b.data=(b.data+"").replace(T,"="+d+"$1");b.url=b.url.replace(T,"="+d+"$1");b.dataType="script";var k=E[d];E[d]=function(m){if(c.isFunction(k))k(m);else{E[d]=B;try{delete E[d]}catch(p){}}f=m;c.handleSuccess(b,w,e,f);c.handleComplete(b,w,e,f);r&&r.removeChild(A)}}if(b.dataType==="script"&&b.cache===null)b.cache=
+false;if(b.cache===false&&l){var o=c.now(),x=b.url.replace(rb,"$1_="+o);b.url=x+(x===b.url?(ja.test(b.url)?"&":"?")+"_="+o:"")}if(b.data&&l)b.url+=(ja.test(b.url)?"&":"?")+b.data;b.global&&c.active++===0&&c.event.trigger("ajaxStart");o=(o=sb.exec(b.url))&&(o[1]&&o[1].toLowerCase()!==location.protocol||o[2].toLowerCase()!==location.host);if(b.dataType==="script"&&h==="GET"&&o){var r=t.getElementsByTagName("head")[0]||t.documentElement,A=t.createElement("script");if(b.scriptCharset)A.charset=b.scriptCharset;
+A.src=b.url;if(!d){var C=false;A.onload=A.onreadystatechange=function(){if(!C&&(!this.readyState||this.readyState==="loaded"||this.readyState==="complete")){C=true;c.handleSuccess(b,w,e,f);c.handleComplete(b,w,e,f);A.onload=A.onreadystatechange=null;r&&A.parentNode&&r.removeChild(A)}}}r.insertBefore(A,r.firstChild);return B}var J=false,w=b.xhr();if(w){b.username?w.open(h,b.url,b.async,b.username,b.password):w.open(h,b.url,b.async);try{if(b.data!=null&&!l||a&&a.contentType)w.setRequestHeader("Content-Type",
+b.contentType);if(b.ifModified){c.lastModified[b.url]&&w.setRequestHeader("If-Modified-Since",c.lastModified[b.url]);c.etag[b.url]&&w.setRequestHeader("If-None-Match",c.etag[b.url])}o||w.setRequestHeader("X-Requested-With","XMLHttpRequest");w.setRequestHeader("Accept",b.dataType&&b.accepts[b.dataType]?b.accepts[b.dataType]+", */*; q=0.01":b.accepts._default)}catch(I){}if(b.beforeSend&&b.beforeSend.call(b.context,w,b)===false){b.global&&c.active--===1&&c.event.trigger("ajaxStop");w.abort();return false}b.global&&
+c.triggerGlobal(b,"ajaxSend",[w,b]);var L=w.onreadystatechange=function(m){if(!w||w.readyState===0||m==="abort"){J||c.handleComplete(b,w,e,f);J=true;if(w)w.onreadystatechange=c.noop}else if(!J&&w&&(w.readyState===4||m==="timeout")){J=true;w.onreadystatechange=c.noop;e=m==="timeout"?"timeout":!c.httpSuccess(w)?"error":b.ifModified&&c.httpNotModified(w,b.url)?"notmodified":"success";var p;if(e==="success")try{f=c.httpData(w,b.dataType,b)}catch(q){e="parsererror";p=q}if(e==="success"||e==="notmodified")d||
+c.handleSuccess(b,w,e,f);else c.handleError(b,w,e,p);d||c.handleComplete(b,w,e,f);m==="timeout"&&w.abort();if(b.async)w=null}};try{var g=w.abort;w.abort=function(){w&&Function.prototype.call.call(g,w);L("abort")}}catch(i){}b.async&&b.timeout>0&&setTimeout(function(){w&&!J&&L("timeout")},b.timeout);try{w.send(l||b.data==null?null:b.data)}catch(n){c.handleError(b,w,null,n);c.handleComplete(b,w,e,f)}b.async||L();return w}},param:function(a,b){var d=[],e=function(h,l){l=c.isFunction(l)?l():l;d[d.length]=
+encodeURIComponent(h)+"="+encodeURIComponent(l)};if(b===B)b=c.ajaxSettings.traditional;if(c.isArray(a)||a.jquery)c.each(a,function(){e(this.name,this.value)});else for(var f in a)da(f,a[f],b,e);return d.join("&").replace(tb,"+")}});c.extend({active:0,lastModified:{},etag:{},handleError:function(a,b,d,e){a.error&&a.error.call(a.context,b,d,e);a.global&&c.triggerGlobal(a,"ajaxError",[b,a,e])},handleSuccess:function(a,b,d,e){a.success&&a.success.call(a.context,e,d,b);a.global&&c.triggerGlobal(a,"ajaxSuccess",
+[b,a])},handleComplete:function(a,b,d){a.complete&&a.complete.call(a.context,b,d);a.global&&c.triggerGlobal(a,"ajaxComplete",[b,a]);a.global&&c.active--===1&&c.event.trigger("ajaxStop")},triggerGlobal:function(a,b,d){(a.context&&a.context.url==null?c(a.context):c.event).trigger(b,d)},httpSuccess:function(a){try{return!a.status&&location.protocol==="file:"||a.status>=200&&a.status<300||a.status===304||a.status===1223}catch(b){}return false},httpNotModified:function(a,b){var d=a.getResponseHeader("Last-Modified"),
+e=a.getResponseHeader("Etag");if(d)c.lastModified[b]=d;if(e)c.etag[b]=e;return a.status===304},httpData:function(a,b,d){var e=a.getResponseHeader("content-type")||"",f=b==="xml"||!b&&e.indexOf("xml")>=0;a=f?a.responseXML:a.responseText;f&&a.documentElement.nodeName==="parsererror"&&c.error("parsererror");if(d&&d.dataFilter)a=d.dataFilter(a,b);if(typeof a==="string")if(b==="json"||!b&&e.indexOf("json")>=0)a=c.parseJSON(a);else if(b==="script"||!b&&e.indexOf("javascript")>=0)c.globalEval(a);return a}});
+if(E.ActiveXObject)c.ajaxSettings.xhr=function(){if(E.location.protocol!=="file:")try{return new E.XMLHttpRequest}catch(a){}try{return new E.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}};c.support.ajax=!!c.ajaxSettings.xhr();var ea={},vb=/^(?:toggle|show|hide)$/,wb=/^([+\-]=)?([\d+.\-]+)(.*)$/,ba,pa=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];c.fn.extend({show:function(a,b,d){if(a||a===0)return this.animate(S("show",
+3),a,b,d);else{d=0;for(var e=this.length;d<e;d++){a=this[d];b=a.style.display;if(!c.data(a,"olddisplay")&&b==="none")b=a.style.display="";b===""&&c.css(a,"display")==="none"&&c.data(a,"olddisplay",qa(a.nodeName))}for(d=0;d<e;d++){a=this[d];b=a.style.display;if(b===""||b==="none")a.style.display=c.data(a,"olddisplay")||""}return this}},hide:function(a,b,d){if(a||a===0)return this.animate(S("hide",3),a,b,d);else{a=0;for(b=this.length;a<b;a++){d=c.css(this[a],"display");d!=="none"&&c.data(this[a],"olddisplay",
+d)}for(a=0;a<b;a++)this[a].style.display="none";return this}},_toggle:c.fn.toggle,toggle:function(a,b,d){var e=typeof a==="boolean";if(c.isFunction(a)&&c.isFunction(b))this._toggle.apply(this,arguments);else a==null||e?this.each(function(){var f=e?a:c(this).is(":hidden");c(this)[f?"show":"hide"]()}):this.animate(S("toggle",3),a,b,d);return this},fadeTo:function(a,b,d,e){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,d,e)},animate:function(a,b,d,e){var f=c.speed(b,
+d,e);if(c.isEmptyObject(a))return this.each(f.complete);return this[f.queue===false?"each":"queue"](function(){var h=c.extend({},f),l,k=this.nodeType===1,o=k&&c(this).is(":hidden"),x=this;for(l in a){var r=c.camelCase(l);if(l!==r){a[r]=a[l];delete a[l];l=r}if(a[l]==="hide"&&o||a[l]==="show"&&!o)return h.complete.call(this);if(k&&(l==="height"||l==="width")){h.overflow=[this.style.overflow,this.style.overflowX,this.style.overflowY];if(c.css(this,"display")==="inline"&&c.css(this,"float")==="none")if(c.support.inlineBlockNeedsLayout)if(qa(this.nodeName)===
+"inline")this.style.display="inline-block";else{this.style.display="inline";this.style.zoom=1}else this.style.display="inline-block"}if(c.isArray(a[l])){(h.specialEasing=h.specialEasing||{})[l]=a[l][1];a[l]=a[l][0]}}if(h.overflow!=null)this.style.overflow="hidden";h.curAnim=c.extend({},a);c.each(a,function(A,C){var J=new c.fx(x,h,A);if(vb.test(C))J[C==="toggle"?o?"show":"hide":C](a);else{var w=wb.exec(C),I=J.cur()||0;if(w){var L=parseFloat(w[2]),g=w[3]||"px";if(g!=="px"){c.style(x,A,(L||1)+g);I=(L||
+1)/J.cur()*I;c.style(x,A,I+g)}if(w[1])L=(w[1]==="-="?-1:1)*L+I;J.custom(I,L,g)}else J.custom(I,C,"")}});return true})},stop:function(a,b){var d=c.timers;a&&this.queue([]);this.each(function(){for(var e=d.length-1;e>=0;e--)if(d[e].elem===this){b&&d[e](true);d.splice(e,1)}});b||this.dequeue();return this}});c.each({slideDown:S("show",1),slideUp:S("hide",1),slideToggle:S("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){c.fn[a]=function(d,e,f){return this.animate(b,
+d,e,f)}});c.extend({speed:function(a,b,d){var e=a&&typeof a==="object"?c.extend({},a):{complete:d||!d&&b||c.isFunction(a)&&a,duration:a,easing:d&&b||b&&!c.isFunction(b)&&b};e.duration=c.fx.off?0:typeof e.duration==="number"?e.duration:e.duration in c.fx.speeds?c.fx.speeds[e.duration]:c.fx.speeds._default;e.old=e.complete;e.complete=function(){e.queue!==false&&c(this).dequeue();c.isFunction(e.old)&&e.old.call(this)};return e},easing:{linear:function(a,b,d,e){return d+e*a},swing:function(a,b,d,e){return(-Math.cos(a*
+Math.PI)/2+0.5)*e+d}},timers:[],fx:function(a,b,d){this.options=b;this.elem=a;this.prop=d;if(!b.orig)b.orig={}}});c.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this);(c.fx.step[this.prop]||c.fx.step._default)(this)},cur:function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];var a=parseFloat(c.css(this.elem,this.prop));return a&&a>-1E4?a:0},custom:function(a,b,d){function e(l){return f.step(l)}
+var f=this,h=c.fx;this.startTime=c.now();this.start=a;this.end=b;this.unit=d||this.unit||"px";this.now=this.start;this.pos=this.state=0;e.elem=this.elem;if(e()&&c.timers.push(e)&&!ba)ba=setInterval(h.tick,h.interval)},show:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.show=true;this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur());c(this.elem).show()},hide:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.hide=true;
+this.custom(this.cur(),0)},step:function(a){var b=c.now(),d=true;if(a||b>=this.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;for(var e in this.options.curAnim)if(this.options.curAnim[e]!==true)d=false;if(d){if(this.options.overflow!=null&&!c.support.shrinkWrapBlocks){var f=this.elem,h=this.options;c.each(["","X","Y"],function(k,o){f.style["overflow"+o]=h.overflow[k]})}this.options.hide&&c(this.elem).hide();if(this.options.hide||
+this.options.show)for(var l in this.options.curAnim)c.style(this.elem,l,this.options.orig[l]);this.options.complete.call(this.elem)}return false}else{a=b-this.startTime;this.state=a/this.options.duration;b=this.options.easing||(c.easing.swing?"swing":"linear");this.pos=c.easing[this.options.specialEasing&&this.options.specialEasing[this.prop]||b](this.state,a,0,1,this.options.duration);this.now=this.start+(this.end-this.start)*this.pos;this.update()}return true}};c.extend(c.fx,{tick:function(){for(var a=
+c.timers,b=0;b<a.length;b++)a[b]()||a.splice(b--,1);a.length||c.fx.stop()},interval:13,stop:function(){clearInterval(ba);ba=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){c.style(a.elem,"opacity",a.now)},_default:function(a){if(a.elem.style&&a.elem.style[a.prop]!=null)a.elem.style[a.prop]=(a.prop==="width"||a.prop==="height"?Math.max(0,a.now):a.now)+a.unit;else a.elem[a.prop]=a.now}}});if(c.expr&&c.expr.filters)c.expr.filters.animated=function(a){return c.grep(c.timers,function(b){return a===
+b.elem}).length};var xb=/^t(?:able|d|h)$/i,Ia=/^(?:body|html)$/i;c.fn.offset="getBoundingClientRect"in t.documentElement?function(a){var b=this[0],d;if(a)return this.each(function(l){c.offset.setOffset(this,a,l)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return c.offset.bodyOffset(b);try{d=b.getBoundingClientRect()}catch(e){}var f=b.ownerDocument,h=f.documentElement;if(!d||!c.contains(h,b))return d||{top:0,left:0};b=f.body;f=fa(f);return{top:d.top+(f.pageYOffset||c.support.boxModel&&
+h.scrollTop||b.scrollTop)-(h.clientTop||b.clientTop||0),left:d.left+(f.pageXOffset||c.support.boxModel&&h.scrollLeft||b.scrollLeft)-(h.clientLeft||b.clientLeft||0)}}:function(a){var b=this[0];if(a)return this.each(function(x){c.offset.setOffset(this,a,x)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return c.offset.bodyOffset(b);c.offset.initialize();var d,e=b.offsetParent,f=b.ownerDocument,h=f.documentElement,l=f.body;d=(f=f.defaultView)?f.getComputedStyle(b,null):b.currentStyle;
+for(var k=b.offsetTop,o=b.offsetLeft;(b=b.parentNode)&&b!==l&&b!==h;){if(c.offset.supportsFixedPosition&&d.position==="fixed")break;d=f?f.getComputedStyle(b,null):b.currentStyle;k-=b.scrollTop;o-=b.scrollLeft;if(b===e){k+=b.offsetTop;o+=b.offsetLeft;if(c.offset.doesNotAddBorder&&!(c.offset.doesAddBorderForTableAndCells&&xb.test(b.nodeName))){k+=parseFloat(d.borderTopWidth)||0;o+=parseFloat(d.borderLeftWidth)||0}e=b.offsetParent}if(c.offset.subtractsBorderForOverflowNotVisible&&d.overflow!=="visible"){k+=
+parseFloat(d.borderTopWidth)||0;o+=parseFloat(d.borderLeftWidth)||0}d=d}if(d.position==="relative"||d.position==="static"){k+=l.offsetTop;o+=l.offsetLeft}if(c.offset.supportsFixedPosition&&d.position==="fixed"){k+=Math.max(h.scrollTop,l.scrollTop);o+=Math.max(h.scrollLeft,l.scrollLeft)}return{top:k,left:o}};c.offset={initialize:function(){var a=t.body,b=t.createElement("div"),d,e,f,h=parseFloat(c.css(a,"marginTop"))||0;c.extend(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",
+height:"1px",visibility:"hidden"});b.innerHTML="<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";a.insertBefore(b,a.firstChild);d=b.firstChild;e=d.firstChild;f=d.nextSibling.firstChild.firstChild;this.doesNotAddBorder=e.offsetTop!==5;this.doesAddBorderForTableAndCells=
+f.offsetTop===5;e.style.position="fixed";e.style.top="20px";this.supportsFixedPosition=e.offsetTop===20||e.offsetTop===15;e.style.position=e.style.top="";d.style.overflow="hidden";d.style.position="relative";this.subtractsBorderForOverflowNotVisible=e.offsetTop===-5;this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==h;a.removeChild(b);c.offset.initialize=c.noop},bodyOffset:function(a){var b=a.offsetTop,d=a.offsetLeft;c.offset.initialize();if(c.offset.doesNotIncludeMarginInBodyOffset){b+=parseFloat(c.css(a,
+"marginTop"))||0;d+=parseFloat(c.css(a,"marginLeft"))||0}return{top:b,left:d}},setOffset:function(a,b,d){var e=c.css(a,"position");if(e==="static")a.style.position="relative";var f=c(a),h=f.offset(),l=c.css(a,"top"),k=c.css(a,"left"),o=e==="absolute"&&c.inArray("auto",[l,k])>-1;e={};var x={};if(o)x=f.position();l=o?x.top:parseInt(l,10)||0;k=o?x.left:parseInt(k,10)||0;if(c.isFunction(b))b=b.call(a,d,h);if(b.top!=null)e.top=b.top-h.top+l;if(b.left!=null)e.left=b.left-h.left+k;"using"in b?b.using.call(a,
+e):f.css(e)}};c.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),d=this.offset(),e=Ia.test(b[0].nodeName)?{top:0,left:0}:b.offset();d.top-=parseFloat(c.css(a,"marginTop"))||0;d.left-=parseFloat(c.css(a,"marginLeft"))||0;e.top+=parseFloat(c.css(b[0],"borderTopWidth"))||0;e.left+=parseFloat(c.css(b[0],"borderLeftWidth"))||0;return{top:d.top-e.top,left:d.left-e.left}},offsetParent:function(){return this.map(function(){for(var a=this.offsetParent||t.body;a&&!Ia.test(a.nodeName)&&
+c.css(a,"position")==="static";)a=a.offsetParent;return a})}});c.each(["Left","Top"],function(a,b){var d="scroll"+b;c.fn[d]=function(e){var f=this[0],h;if(!f)return null;if(e!==B)return this.each(function(){if(h=fa(this))h.scrollTo(!a?e:c(h).scrollLeft(),a?e:c(h).scrollTop());else this[d]=e});else return(h=fa(f))?"pageXOffset"in h?h[a?"pageYOffset":"pageXOffset"]:c.support.boxModel&&h.document.documentElement[d]||h.document.body[d]:f[d]}});c.each(["Height","Width"],function(a,b){var d=b.toLowerCase();
+c.fn["inner"+b]=function(){return this[0]?parseFloat(c.css(this[0],d,"padding")):null};c.fn["outer"+b]=function(e){return this[0]?parseFloat(c.css(this[0],d,e?"margin":"border")):null};c.fn[d]=function(e){var f=this[0];if(!f)return e==null?null:this;if(c.isFunction(e))return this.each(function(l){var k=c(this);k[d](e.call(this,l,k[d]()))});if(c.isWindow(f))return f.document.compatMode==="CSS1Compat"&&f.document.documentElement["client"+b]||f.document.body["client"+b];else if(f.nodeType===9)return Math.max(f.documentElement["client"+
+b],f.body["scroll"+b],f.documentElement["scroll"+b],f.body["offset"+b],f.documentElement["offset"+b]);else if(e===B){f=c.css(f,d);var h=parseFloat(f);return c.isNaN(h)?f:h}else return this.css(d,typeof e==="string"?e:e+"px")}})})(window);
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/js/jquery.ztree.all-3.5.js b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/js/jquery.ztree.all-3.5.js
new file mode 100644
index 0000000..f434293
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/js/jquery.ztree.all-3.5.js
@@ -0,0 +1,3487 @@
+
+/*
+ * JQuery zTree core v3.5.15
+ * http://zTree.me/
+ *
+ * Copyright (c) 2010 Hunter.z
+ *
+ * Licensed same as jquery - MIT License
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ * email: hunter.z@263.net
+ * Date: 2013-10-15
+ */
+(function($){
+	var settings = {}, roots = {}, caches = {},
+	//default consts of core
+	_consts = {
+		className: {
+			BUTTON: "button",
+			LEVEL: "level",
+			ICO_LOADING: "ico_loading",
+			SWITCH: "switch"
+		},
+		event: {
+			NODECREATED: "ztree_nodeCreated",
+			CLICK: "ztree_click",
+			EXPAND: "ztree_expand",
+			COLLAPSE: "ztree_collapse",
+			ASYNC_SUCCESS: "ztree_async_success",
+			ASYNC_ERROR: "ztree_async_error"
+		},
+		id: {
+			A: "_a",
+			ICON: "_ico",
+			SPAN: "_span",
+			SWITCH: "_switch",
+			UL: "_ul"
+		},
+		line: {
+			ROOT: "root",
+			ROOTS: "roots",
+			CENTER: "center",
+			BOTTOM: "bottom",
+			NOLINE: "noline",
+			LINE: "line"
+		},
+		folder: {
+			OPEN: "open",
+			CLOSE: "close",
+			DOCU: "docu"
+		},
+		node: {
+			CURSELECTED: "curSelectedNode"
+		}
+	},
+	//default setting of core
+	_setting = {
+		treeId: "",
+		treeObj: null,
+		view: {
+			addDiyDom: null,
+			autoCancelSelected: true,
+			dblClickExpand: true,
+			expandSpeed: "fast",
+			fontCss: {},
+			nameIsHTML: false,
+			selectedMulti: true,
+			showIcon: true,
+			showLine: true,
+			showTitle: true,
+			txtSelectedEnable: false
+		},
+		data: {
+			key: {
+				children: "children",
+				name: "name",
+				title: "",
+				url: "url"
+			},
+			simpleData: {
+				enable: false,
+				idKey: "id",
+				pIdKey: "pId",
+				rootPId: null
+			},
+			keep: {
+				parent: false,
+				leaf: false
+			}
+		},
+		async: {
+			enable: false,
+			contentType: "application/x-www-form-urlencoded",
+			type: "post",
+			dataType: "text",
+			url: "",
+			autoParam: [],
+			otherParam: [],
+			dataFilter: null
+		},
+		callback: {
+			beforeAsync:null,
+			beforeClick:null,
+			beforeDblClick:null,
+			beforeRightClick:null,
+			beforeMouseDown:null,
+			beforeMouseUp:null,
+			beforeExpand:null,
+			beforeCollapse:null,
+			beforeRemove:null,
+
+			onAsyncError:null,
+			onAsyncSuccess:null,
+			onNodeCreated:null,
+			onClick:null,
+			onDblClick:null,
+			onRightClick:null,
+			onMouseDown:null,
+			onMouseUp:null,
+			onExpand:null,
+			onCollapse:null,
+			onRemove:null
+		}
+	},
+	//default root of core
+	//zTree use root to save full data
+	_initRoot = function (setting) {
+		var r = data.getRoot(setting);
+		if (!r) {
+			r = {};
+			data.setRoot(setting, r);
+		}
+		r[setting.data.key.children] = [];
+		r.expandTriggerFlag = false;
+		r.curSelectedList = [];
+		r.noSelection = true;
+		r.createdNodes = [];
+		r.zId = 0;
+		r._ver = (new Date()).getTime();
+	},
+	//default cache of core
+	_initCache = function(setting) {
+		var c = data.getCache(setting);
+		if (!c) {
+			c = {};
+			data.setCache(setting, c);
+		}
+		c.nodes = [];
+		c.doms = [];
+	},
+	//default bindEvent of core
+	_bindEvent = function(setting) {
+		var o = setting.treeObj,
+		c = consts.event;
+		o.bind(c.NODECREATED, function (event, treeId, node) {
+			tools.apply(setting.callback.onNodeCreated, [event, treeId, node]);
+		});
+
+		o.bind(c.CLICK, function (event, srcEvent, treeId, node, clickFlag) {
+			tools.apply(setting.callback.onClick, [srcEvent, treeId, node, clickFlag]);
+		});
+
+		o.bind(c.EXPAND, function (event, treeId, node) {
+			tools.apply(setting.callback.onExpand, [event, treeId, node]);
+		});
+
+		o.bind(c.COLLAPSE, function (event, treeId, node) {
+			tools.apply(setting.callback.onCollapse, [event, treeId, node]);
+		});
+
+		o.bind(c.ASYNC_SUCCESS, function (event, treeId, node, msg) {
+			tools.apply(setting.callback.onAsyncSuccess, [event, treeId, node, msg]);
+		});
+
+		o.bind(c.ASYNC_ERROR, function (event, treeId, node, XMLHttpRequest, textStatus, errorThrown) {
+			tools.apply(setting.callback.onAsyncError, [event, treeId, node, XMLHttpRequest, textStatus, errorThrown]);
+		});
+	},
+	_unbindEvent = function(setting) {
+		var o = setting.treeObj,
+		c = consts.event;
+		o.unbind(c.NODECREATED)
+		.unbind(c.CLICK)
+		.unbind(c.EXPAND)
+		.unbind(c.COLLAPSE)
+		.unbind(c.ASYNC_SUCCESS)
+		.unbind(c.ASYNC_ERROR);
+	},
+	//default event proxy of core
+	_eventProxy = function(event) {
+		var target = event.target,
+		setting = data.getSetting(event.data.treeId),
+		tId = "", node = null,
+		nodeEventType = "", treeEventType = "",
+		nodeEventCallback = null, treeEventCallback = null,
+		tmp = null;
+
+		if (tools.eqs(event.type, "mousedown")) {
+			treeEventType = "mousedown";
+		} else if (tools.eqs(event.type, "mouseup")) {
+			treeEventType = "mouseup";
+		} else if (tools.eqs(event.type, "contextmenu")) {
+			treeEventType = "contextmenu";
+		} else if (tools.eqs(event.type, "click")) {
+			if (tools.eqs(target.tagName, "span") && target.getAttribute("treeNode"+ consts.id.SWITCH) !== null) {
+				tId = tools.getNodeMainDom(target).id;
+				nodeEventType = "switchNode";
+			} else {
+				tmp = tools.getMDom(setting, target, [{tagName:"a", attrName:"treeNode"+consts.id.A}]);
+				if (tmp) {
+					tId = tools.getNodeMainDom(tmp).id;
+					nodeEventType = "clickNode";
+				}
+			}
+		} else if (tools.eqs(event.type, "dblclick")) {
+			treeEventType = "dblclick";
+			tmp = tools.getMDom(setting, target, [{tagName:"a", attrName:"treeNode"+consts.id.A}]);
+			if (tmp) {
+				tId = tools.getNodeMainDom(tmp).id;
+				nodeEventType = "switchNode";
+			}
+		}
+		if (treeEventType.length > 0 && tId.length == 0) {
+			tmp = tools.getMDom(setting, target, [{tagName:"a", attrName:"treeNode"+consts.id.A}]);
+			if (tmp) {tId = tools.getNodeMainDom(tmp).id;}
+		}
+		// event to node
+		if (tId.length>0) {
+			node = data.getNodeCache(setting, tId);
+			switch (nodeEventType) {
+				case "switchNode" :
+					if (!node.isParent) {
+						nodeEventType = "";
+					} else if (tools.eqs(event.type, "click")
+						|| (tools.eqs(event.type, "dblclick") && tools.apply(setting.view.dblClickExpand, [setting.treeId, node], setting.view.dblClickExpand))) {
+						nodeEventCallback = handler.onSwitchNode;
+					} else {
+						nodeEventType = "";
+					}
+					break;
+				case "clickNode" :
+					nodeEventCallback = handler.onClickNode;
+					break;
+			}
+		}
+		// event to zTree
+		switch (treeEventType) {
+			case "mousedown" :
+				treeEventCallback = handler.onZTreeMousedown;
+				break;
+			case "mouseup" :
+				treeEventCallback = handler.onZTreeMouseup;
+				break;
+			case "dblclick" :
+				treeEventCallback = handler.onZTreeDblclick;
+				break;
+			case "contextmenu" :
+				treeEventCallback = handler.onZTreeContextmenu;
+				break;
+		}
+		var proxyResult = {
+			stop: false,
+			node: node,
+			nodeEventType: nodeEventType,
+			nodeEventCallback: nodeEventCallback,
+			treeEventType: treeEventType,
+			treeEventCallback: treeEventCallback
+		};
+		return proxyResult
+	},
+	//default init node of core
+	_initNode = function(setting, level, n, parentNode, isFirstNode, isLastNode, openFlag) {
+		if (!n) return;
+		var r = data.getRoot(setting),
+		childKey = setting.data.key.children;
+		n.level = level;
+		n.tId = setting.treeId + "_" + (++r.zId);
+		n.parentTId = parentNode ? parentNode.tId : null;
+		n.open = (typeof n.open == "string") ? tools.eqs(n.open, "true") : !!n.open;
+		if (n[childKey] && n[childKey].length > 0) {
+			n.isParent = true;
+			n.zAsync = true;
+		} else {
+			n.isParent = (typeof n.isParent == "string") ? tools.eqs(n.isParent, "true") : !!n.isParent;
+			n.open = (n.isParent && !setting.async.enable) ? n.open : false;
+			n.zAsync = !n.isParent;
+		}
+		n.isFirstNode = isFirstNode;
+		n.isLastNode = isLastNode;
+		n.getParentNode = function() {return data.getNodeCache(setting, n.parentTId);};
+		n.getPreNode = function() {return data.getPreNode(setting, n);};
+		n.getNextNode = function() {return data.getNextNode(setting, n);};
+		n.isAjaxing = false;
+		data.fixPIdKeyValue(setting, n);
+	},
+	_init = {
+		bind: [_bindEvent],
+		unbind: [_unbindEvent],
+		caches: [_initCache],
+		nodes: [_initNode],
+		proxys: [_eventProxy],
+		roots: [_initRoot],
+		beforeA: [],
+		afterA: [],
+		innerBeforeA: [],
+		innerAfterA: [],
+		zTreeTools: []
+	},
+	//method of operate data
+	data = {
+		addNodeCache: function(setting, node) {
+			data.getCache(setting).nodes[data.getNodeCacheId(node.tId)] = node;
+		},
+		getNodeCacheId: function(tId) {
+			return tId.substring(tId.lastIndexOf("_")+1);
+		},
+		addAfterA: function(afterA) {
+			_init.afterA.push(afterA);
+		},
+		addBeforeA: function(beforeA) {
+			_init.beforeA.push(beforeA);
+		},
+		addInnerAfterA: function(innerAfterA) {
+			_init.innerAfterA.push(innerAfterA);
+		},
+		addInnerBeforeA: function(innerBeforeA) {
+			_init.innerBeforeA.push(innerBeforeA);
+		},
+		addInitBind: function(bindEvent) {
+			_init.bind.push(bindEvent);
+		},
+		addInitUnBind: function(unbindEvent) {
+			_init.unbind.push(unbindEvent);
+		},
+		addInitCache: function(initCache) {
+			_init.caches.push(initCache);
+		},
+		addInitNode: function(initNode) {
+			_init.nodes.push(initNode);
+		},
+		addInitProxy: function(initProxy, isFirst) {
+			if (!!isFirst) {
+				_init.proxys.splice(0,0,initProxy);
+			} else {
+				_init.proxys.push(initProxy);
+			}
+		},
+		addInitRoot: function(initRoot) {
+			_init.roots.push(initRoot);
+		},
+		addNodesData: function(setting, parentNode, nodes) {
+			var childKey = setting.data.key.children;
+			if (!parentNode[childKey]) parentNode[childKey] = [];
+			if (parentNode[childKey].length > 0) {
+				parentNode[childKey][parentNode[childKey].length - 1].isLastNode = false;
+				view.setNodeLineIcos(setting, parentNode[childKey][parentNode[childKey].length - 1]);
+			}
+			parentNode.isParent = true;
+			parentNode[childKey] = parentNode[childKey].concat(nodes);
+		},
+		addSelectedNode: function(setting, node) {
+			var root = data.getRoot(setting);
+			if (!data.isSelectedNode(setting, node)) {
+				root.curSelectedList.push(node);
+			}
+		},
+		addCreatedNode: function(setting, node) {
+			if (!!setting.callback.onNodeCreated || !!setting.view.addDiyDom) {
+				var root = data.getRoot(setting);
+				root.createdNodes.push(node);
+			}
+		},
+		addZTreeTools: function(zTreeTools) {
+			_init.zTreeTools.push(zTreeTools);
+		},
+		exSetting: function(s) {
+			$.extend(true, _setting, s);
+		},
+		fixPIdKeyValue: function(setting, node) {
+			if (setting.data.simpleData.enable) {
+				node[setting.data.simpleData.pIdKey] = node.parentTId ? node.getParentNode()[setting.data.simpleData.idKey] : setting.data.simpleData.rootPId;
+			}
+		},
+		getAfterA: function(setting, node, array) {
+			for (var i=0, j=_init.afterA.length; i<j; i++) {
+				_init.afterA[i].apply(this, arguments);
+			}
+		},
+		getBeforeA: function(setting, node, array) {
+			for (var i=0, j=_init.beforeA.length; i<j; i++) {
+				_init.beforeA[i].apply(this, arguments);
+			}
+		},
+		getInnerAfterA: function(setting, node, array) {
+			for (var i=0, j=_init.innerAfterA.length; i<j; i++) {
+				_init.innerAfterA[i].apply(this, arguments);
+			}
+		},
+		getInnerBeforeA: function(setting, node, array) {
+			for (var i=0, j=_init.innerBeforeA.length; i<j; i++) {
+				_init.innerBeforeA[i].apply(this, arguments);
+			}
+		},
+		getCache: function(setting) {
+			return caches[setting.treeId];
+		},
+		getNextNode: function(setting, node) {
+			if (!node) return null;
+			var childKey = setting.data.key.children,
+			p = node.parentTId ? node.getParentNode() : data.getRoot(setting);
+			for (var i=0, l=p[childKey].length-1; i<=l; i++) {
+				if (p[childKey][i] === node) {
+					return (i==l ? null : p[childKey][i+1]);
+				}
+			}
+			return null;
+		},
+		getNodeByParam: function(setting, nodes, key, value) {
+			if (!nodes || !key) return null;
+			var childKey = setting.data.key.children;
+			for (var i = 0, l = nodes.length; i < l; i++) {
+				if (nodes[i][key] == value) {
+					return nodes[i];
+				}
+				var tmp = data.getNodeByParam(setting, nodes[i][childKey], key, value);
+				if (tmp) return tmp;
+			}
+			return null;
+		},
+		getNodeCache: function(setting, tId) {
+			if (!tId) return null;
+			var n = caches[setting.treeId].nodes[data.getNodeCacheId(tId)];
+			return n ? n : null;
+		},
+		getNodeName: function(setting, node) {
+			var nameKey = setting.data.key.name;
+			return "" + node[nameKey];
+		},
+		getNodeTitle: function(setting, node) {
+			var t = setting.data.key.title === "" ? setting.data.key.name : setting.data.key.title;
+			return "" + node[t];
+		},
+		getNodes: function(setting) {
+			return data.getRoot(setting)[setting.data.key.children];
+		},
+		getNodesByParam: function(setting, nodes, key, value) {
+			if (!nodes || !key) return [];
+			var childKey = setting.data.key.children,
+			result = [];
+			for (var i = 0, l = nodes.length; i < l; i++) {
+				if (nodes[i][key] == value) {
+					result.push(nodes[i]);
+				}
+				result = result.concat(data.getNodesByParam(setting, nodes[i][childKey], key, value));
+			}
+			return result;
+		},
+		getNodesByParamFuzzy: function(setting, nodes, key, value) {
+			if (!nodes || !key) return [];
+			var childKey = setting.data.key.children,
+			result = [];
+			value = value.toLowerCase();
+			for (var i = 0, l = nodes.length; i < l; i++) {
+				if (typeof nodes[i][key] == "string" && nodes[i][key].toLowerCase().indexOf(value)>-1) {
+					result.push(nodes[i]);
+				}
+				result = result.concat(data.getNodesByParamFuzzy(setting, nodes[i][childKey], key, value));
+			}
+			return result;
+		},
+		getNodesByFilter: function(setting, nodes, filter, isSingle, invokeParam) {
+			if (!nodes) return (isSingle ? null : []);
+			var childKey = setting.data.key.children,
+			result = isSingle ? null : [];
+			for (var i = 0, l = nodes.length; i < l; i++) {
+				if (tools.apply(filter, [nodes[i], invokeParam], false)) {
+					if (isSingle) {return nodes[i];}
+					result.push(nodes[i]);
+				}
+				var tmpResult = data.getNodesByFilter(setting, nodes[i][childKey], filter, isSingle, invokeParam);
+				if (isSingle && !!tmpResult) {return tmpResult;}
+				result = isSingle ? tmpResult : result.concat(tmpResult);
+			}
+			return result;
+		},
+		getPreNode: function(setting, node) {
+			if (!node) return null;
+			var childKey = setting.data.key.children,
+			p = node.parentTId ? node.getParentNode() : data.getRoot(setting);
+			for (var i=0, l=p[childKey].length; i<l; i++) {
+				if (p[childKey][i] === node) {
+					return (i==0 ? null : p[childKey][i-1]);
+				}
+			}
+			return null;
+		},
+		getRoot: function(setting) {
+			return setting ? roots[setting.treeId] : null;
+		},
+		getRoots: function() {
+			return roots;
+		},
+		getSetting: function(treeId) {
+			return settings[treeId];
+		},
+		getSettings: function() {
+			return settings;
+		},
+		getZTreeTools: function(treeId) {
+			var r = this.getRoot(this.getSetting(treeId));
+			return r ? r.treeTools : null;
+		},
+		initCache: function(setting) {
+			for (var i=0, j=_init.caches.length; i<j; i++) {
+				_init.caches[i].apply(this, arguments);
+			}
+		},
+		initNode: function(setting, level, node, parentNode, preNode, nextNode) {
+			for (var i=0, j=_init.nodes.length; i<j; i++) {
+				_init.nodes[i].apply(this, arguments);
+			}
+		},
+		initRoot: function(setting) {
+			for (var i=0, j=_init.roots.length; i<j; i++) {
+				_init.roots[i].apply(this, arguments);
+			}
+		},
+		isSelectedNode: function(setting, node) {
+			var root = data.getRoot(setting);
+			for (var i=0, j=root.curSelectedList.length; i<j; i++) {
+				if(node === root.curSelectedList[i]) return true;
+			}
+			return false;
+		},
+		removeNodeCache: function(setting, node) {
+			var childKey = setting.data.key.children;
+			if (node[childKey]) {
+				for (var i=0, l=node[childKey].length; i<l; i++) {
+					arguments.callee(setting, node[childKey][i]);
+				}
+			}
+			data.getCache(setting).nodes[data.getNodeCacheId(node.tId)] = null;
+		},
+		removeSelectedNode: function(setting, node) {
+			var root = data.getRoot(setting);
+			for (var i=0, j=root.curSelectedList.length; i<j; i++) {
+				if(node === root.curSelectedList[i] || !data.getNodeCache(setting, root.curSelectedList[i].tId)) {
+					root.curSelectedList.splice(i, 1);
+					i--;j--;
+				}
+			}
+		},
+		setCache: function(setting, cache) {
+			caches[setting.treeId] = cache;
+		},
+		setRoot: function(setting, root) {
+			roots[setting.treeId] = root;
+		},
+		setZTreeTools: function(setting, zTreeTools) {
+			for (var i=0, j=_init.zTreeTools.length; i<j; i++) {
+				_init.zTreeTools[i].apply(this, arguments);
+			}
+		},
+		transformToArrayFormat: function (setting, nodes) {
+			if (!nodes) return [];
+			var childKey = setting.data.key.children,
+			r = [];
+			if (tools.isArray(nodes)) {
+				for (var i=0, l=nodes.length; i<l; i++) {
+					r.push(nodes[i]);
+					if (nodes[i][childKey])
+						r = r.concat(data.transformToArrayFormat(setting, nodes[i][childKey]));
+				}
+			} else {
+				r.push(nodes);
+				if (nodes[childKey])
+					r = r.concat(data.transformToArrayFormat(setting, nodes[childKey]));
+			}
+			return r;
+		},
+		transformTozTreeFormat: function(setting, sNodes) {
+			var i,l,
+			key = setting.data.simpleData.idKey,
+			parentKey = setting.data.simpleData.pIdKey,
+			childKey = setting.data.key.children;
+			if (!key || key=="" || !sNodes) return [];
+
+			if (tools.isArray(sNodes)) {
+				var r = [];
+				var tmpMap = [];
+				for (i=0, l=sNodes.length; i<l; i++) {
+					tmpMap[sNodes[i][key]] = sNodes[i];
+				}
+				for (i=0, l=sNodes.length; i<l; i++) {
+					if (tmpMap[sNodes[i][parentKey]] && sNodes[i][key] != sNodes[i][parentKey]) {
+						if (!tmpMap[sNodes[i][parentKey]][childKey])
+							tmpMap[sNodes[i][parentKey]][childKey] = [];
+						tmpMap[sNodes[i][parentKey]][childKey].push(sNodes[i]);
+					} else {
+						r.push(sNodes[i]);
+					}
+				}
+				return r;
+			}else {
+				return [sNodes];
+			}
+		}
+	},
+	//method of event proxy
+	event = {
+		bindEvent: function(setting) {
+			for (var i=0, j=_init.bind.length; i<j; i++) {
+				_init.bind[i].apply(this, arguments);
+			}
+		},
+		unbindEvent: function(setting) {
+			for (var i=0, j=_init.unbind.length; i<j; i++) {
+				_init.unbind[i].apply(this, arguments);
+			}
+		},
+		bindTree: function(setting) {
+			var eventParam = {
+				treeId: setting.treeId
+			},
+			o = setting.treeObj;
+			if (!setting.view.txtSelectedEnable) {
+				// for can't select text
+				o.bind('selectstart', function(e){
+					var node
+					var n = e.originalEvent.srcElement.nodeName.toLowerCase();
+					return (n === "input" || n === "textarea" );
+				}).css({
+					"-moz-user-select":"-moz-none"
+				});
+			}
+			o.bind('click', eventParam, event.proxy);
+			o.bind('dblclick', eventParam, event.proxy);
+			o.bind('mouseover', eventParam, event.proxy);
+			o.bind('mouseout', eventParam, event.proxy);
+			o.bind('mousedown', eventParam, event.proxy);
+			o.bind('mouseup', eventParam, event.proxy);
+			o.bind('contextmenu', eventParam, event.proxy);
+		},
+		unbindTree: function(setting) {
+			var o = setting.treeObj;
+			o.unbind('click', event.proxy)
+			.unbind('dblclick', event.proxy)
+			.unbind('mouseover', event.proxy)
+			.unbind('mouseout', event.proxy)
+			.unbind('mousedown', event.proxy)
+			.unbind('mouseup', event.proxy)
+			.unbind('contextmenu', event.proxy);
+		},
+		doProxy: function(e) {
+			var results = [];
+			for (var i=0, j=_init.proxys.length; i<j; i++) {
+				var proxyResult = _init.proxys[i].apply(this, arguments);
+				results.push(proxyResult);
+				if (proxyResult.stop) {
+					break;
+				}
+			}
+			return results;
+		},
+		proxy: function(e) {
+			var setting = data.getSetting(e.data.treeId);
+			if (!tools.uCanDo(setting, e)) return true;
+			var results = event.doProxy(e),
+			r = true, x = false;
+			for (var i=0, l=results.length; i<l; i++) {
+				var proxyResult = results[i];
+				if (proxyResult.nodeEventCallback) {
+					x = true;
+					r = proxyResult.nodeEventCallback.apply(proxyResult, [e, proxyResult.node]) && r;
+				}
+				if (proxyResult.treeEventCallback) {
+					x = true;
+					r = proxyResult.treeEventCallback.apply(proxyResult, [e, proxyResult.node]) && r;
+				}
+			}
+			return r;
+		}
+	},
+	//method of event handler
+	handler = {
+		onSwitchNode: function (event, node) {
+			var setting = data.getSetting(event.data.treeId);
+			if (node.open) {
+				if (tools.apply(setting.callback.beforeCollapse, [setting.treeId, node], true) == false) return true;
+				data.getRoot(setting).expandTriggerFlag = true;
+				view.switchNode(setting, node);
+			} else {
+				if (tools.apply(setting.callback.beforeExpand, [setting.treeId, node], true) == false) return true;
+				data.getRoot(setting).expandTriggerFlag = true;
+				view.switchNode(setting, node);
+			}
+			return true;
+		},
+		onClickNode: function (event, node) {
+			var setting = data.getSetting(event.data.treeId),
+			clickFlag = ( (setting.view.autoCancelSelected && event.ctrlKey) && data.isSelectedNode(setting, node)) ? 0 : (setting.view.autoCancelSelected && event.ctrlKey && setting.view.selectedMulti) ? 2 : 1;
+			if (tools.apply(setting.callback.beforeClick, [setting.treeId, node, clickFlag], true) == false) return true;
+			if (clickFlag === 0) {
+				view.cancelPreSelectedNode(setting, node);
+			} else {
+				view.selectNode(setting, node, clickFlag === 2);
+			}
+			setting.treeObj.trigger(consts.event.CLICK, [event, setting.treeId, node, clickFlag]);
+			return true;
+		},
+		onZTreeMousedown: function(event, node) {
+			var setting = data.getSetting(event.data.treeId);
+			if (tools.apply(setting.callback.beforeMouseDown, [setting.treeId, node], true)) {
+				tools.apply(setting.callback.onMouseDown, [event, setting.treeId, node]);
+			}
+			return true;
+		},
+		onZTreeMouseup: function(event, node) {
+			var setting = data.getSetting(event.data.treeId);
+			if (tools.apply(setting.callback.beforeMouseUp, [setting.treeId, node], true)) {
+				tools.apply(setting.callback.onMouseUp, [event, setting.treeId, node]);
+			}
+			return true;
+		},
+		onZTreeDblclick: function(event, node) {
+			var setting = data.getSetting(event.data.treeId);
+			if (tools.apply(setting.callback.beforeDblClick, [setting.treeId, node], true)) {
+				tools.apply(setting.callback.onDblClick, [event, setting.treeId, node]);
+			}
+			return true;
+		},
+		onZTreeContextmenu: function(event, node) {
+			var setting = data.getSetting(event.data.treeId);
+			if (tools.apply(setting.callback.beforeRightClick, [setting.treeId, node], true)) {
+				tools.apply(setting.callback.onRightClick, [event, setting.treeId, node]);
+			}
+			return (typeof setting.callback.onRightClick) != "function";
+		}
+	},
+	//method of tools for zTree
+	tools = {
+		apply: function(fun, param, defaultValue) {
+			if ((typeof fun) == "function") {
+				return fun.apply(zt, param?param:[]);
+			}
+			return defaultValue;
+		},
+		canAsync: function(setting, node) {
+			var childKey = setting.data.key.children;
+			return (setting.async.enable && node && node.isParent && !(node.zAsync || (node[childKey] && node[childKey].length > 0)));
+		},
+		clone: function (obj){
+			if (obj === null) return null;
+			var o = tools.isArray(obj) ? [] : {};
+			for(var i in obj){
+				o[i] = (obj[i] instanceof Date) ? new Date(obj[i].getTime()) : (typeof obj[i] === "object" ? arguments.callee(obj[i]) : obj[i]);
+			}
+			return o;
+		},
+		eqs: function(str1, str2) {
+			return str1.toLowerCase() === str2.toLowerCase();
+		},
+		isArray: function(arr) {
+			return Object.prototype.toString.apply(arr) === "[object Array]";
+		},
+		$: function(node, exp, setting) {
+			if (!!exp && typeof exp != "string") {
+				setting = exp;
+				exp = "";
+			}
+			if (typeof node == "string") {
+				return $(node, setting ? setting.treeObj.get(0).ownerDocument : null);
+			} else {
+				return $("#" + node.tId + exp, setting ? setting.treeObj : null);
+			}
+		},
+		getMDom: function (setting, curDom, targetExpr) {
+			if (!curDom) return null;
+			while (curDom && curDom.id !== setting.treeId) {
+				for (var i=0, l=targetExpr.length; curDom.tagName && i<l; i++) {
+					if (tools.eqs(curDom.tagName, targetExpr[i].tagName) && curDom.getAttribute(targetExpr[i].attrName) !== null) {
+						return curDom;
+					}
+				}
+				curDom = curDom.parentNode;
+			}
+			return null;
+		},
+		getNodeMainDom:function(target) {
+			return ($(target).parent("li").get(0) || $(target).parentsUntil("li").parent().get(0));
+		},
+		isChildOrSelf: function(dom, parentId) {
+			return ( $(dom).closest("#" + parentId).length> 0 );
+		},
+		uCanDo: function(setting, e) {
+			return true;
+		}
+	},
+	//method of operate ztree dom
+	view = {
+		addNodes: function(setting, parentNode, newNodes, isSilent) {
+			if (setting.data.keep.leaf && parentNode && !parentNode.isParent) {
+				return;
+			}
+			if (!tools.isArray(newNodes)) {
+				newNodes = [newNodes];
+			}
+			if (setting.data.simpleData.enable) {
+				newNodes = data.transformTozTreeFormat(setting, newNodes);
+			}
+			if (parentNode) {
+				var target_switchObj = $$(parentNode, consts.id.SWITCH, setting),
+				target_icoObj = $$(parentNode, consts.id.ICON, setting),
+				target_ulObj = $$(parentNode, consts.id.UL, setting);
+
+				if (!parentNode.open) {
+					view.replaceSwitchClass(parentNode, target_switchObj, consts.folder.CLOSE);
+					view.replaceIcoClass(parentNode, target_icoObj, consts.folder.CLOSE);
+					parentNode.open = false;
+					target_ulObj.css({
+						"display": "none"
+					});
+				}
+
+				data.addNodesData(setting, parentNode, newNodes);
+				view.createNodes(setting, parentNode.level + 1, newNodes, parentNode);
+				if (!isSilent) {
+					view.expandCollapseParentNode(setting, parentNode, true);
+				}
+			} else {
+				data.addNodesData(setting, data.getRoot(setting), newNodes);
+				view.createNodes(setting, 0, newNodes, null);
+			}
+		},
+		appendNodes: function(setting, level, nodes, parentNode, initFlag, openFlag) {
+			if (!nodes) return [];
+			var html = [],
+			childKey = setting.data.key.children;
+			for (var i = 0, l = nodes.length; i < l; i++) {
+				var node = nodes[i];
+				if (initFlag) {
+					var tmpPNode = (parentNode) ? parentNode: data.getRoot(setting),
+					tmpPChild = tmpPNode[childKey],
+					isFirstNode = ((tmpPChild.length == nodes.length) && (i == 0)),
+					isLastNode = (i == (nodes.length - 1));
+					data.initNode(setting, level, node, parentNode, isFirstNode, isLastNode, openFlag);
+					data.addNodeCache(setting, node);
+				}
+
+				var childHtml = [];
+				if (node[childKey] && node[childKey].length > 0) {
+					//make child html first, because checkType
+					childHtml = view.appendNodes(setting, level + 1, node[childKey], node, initFlag, openFlag && node.open);
+				}
+				if (openFlag) {
+
+					view.makeDOMNodeMainBefore(html, setting, node);
+					view.makeDOMNodeLine(html, setting, node);
+					data.getBeforeA(setting, node, html);
+					view.makeDOMNodeNameBefore(html, setting, node);
+					data.getInnerBeforeA(setting, node, html);
+					view.makeDOMNodeIcon(html, setting, node);
+					data.getInnerAfterA(setting, node, html);
+					view.makeDOMNodeNameAfter(html, setting, node);
+					data.getAfterA(setting, node, html);
+					if (node.isParent && node.open) {
+						view.makeUlHtml(setting, node, html, childHtml.join(''));
+					}
+					view.makeDOMNodeMainAfter(html, setting, node);
+					data.addCreatedNode(setting, node);
+				}
+			}
+			return html;
+		},
+		appendParentULDom: function(setting, node) {
+			var html = [],
+			nObj = $$(node, setting);
+			if (!nObj.get(0) && !!node.parentTId) {
+				view.appendParentULDom(setting, node.getParentNode());
+				nObj = $$(node, setting);
+			}
+			var ulObj = $$(node, consts.id.UL, setting);
+			if (ulObj.get(0)) {
+				ulObj.remove();
+			}
+			var childKey = setting.data.key.children,
+			childHtml = view.appendNodes(setting, node.level+1, node[childKey], node, false, true);
+			view.makeUlHtml(setting, node, html, childHtml.join(''));
+			nObj.append(html.join(''));
+		},
+		asyncNode: function(setting, node, isSilent, callback) {
+			var i, l;
+			if (node && !node.isParent) {
+				tools.apply(callback);
+				return false;
+			} else if (node && node.isAjaxing) {
+				return false;
+			} else if (tools.apply(setting.callback.beforeAsync, [setting.treeId, node], true) == false) {
+				tools.apply(callback);
+				return false;
+			}
+			if (node) {
+				node.isAjaxing = true;
+				var icoObj = $$(node, consts.id.ICON, setting);
+				icoObj.attr({"style":"", "class":consts.className.BUTTON + " " + consts.className.ICO_LOADING});
+			}
+
+			var tmpParam = {};
+			for (i = 0, l = setting.async.autoParam.length; node && i < l; i++) {
+				var pKey = setting.async.autoParam[i].split("="), spKey = pKey;
+				if (pKey.length>1) {
+					spKey = pKey[1];
+					pKey = pKey[0];
+				}
+				tmpParam[spKey] = node[pKey];
+			}
+			if (tools.isArray(setting.async.otherParam)) {
+				for (i = 0, l = setting.async.otherParam.length; i < l; i += 2) {
+					tmpParam[setting.async.otherParam[i]] = setting.async.otherParam[i + 1];
+				}
+			} else {
+				for (var p in setting.async.otherParam) {
+					tmpParam[p] = setting.async.otherParam[p];
+				}
+			}
+
+			var _tmpV = data.getRoot(setting)._ver;
+			$.ajax({
+				contentType: setting.async.contentType,
+				type: setting.async.type,
+				url: tools.apply(setting.async.url, [setting.treeId, node], setting.async.url),
+				data: tmpParam,
+				dataType: setting.async.dataType,
+				success: function(msg) {
+					if (_tmpV != data.getRoot(setting)._ver) {
+						return;
+					}
+					var newNodes = [];
+					try {
+						if (!msg || msg.length == 0) {
+							newNodes = [];
+						} else if (typeof msg == "string") {
+							newNodes = eval("(" + msg + ")");
+						} else {
+							newNodes = msg;
+						}
+					} catch(err) {
+						newNodes = msg;
+					}
+
+					if (node) {
+						node.isAjaxing = null;
+						node.zAsync = true;
+					}
+					view.setNodeLineIcos(setting, node);
+					if (newNodes && newNodes !== "") {
+						newNodes = tools.apply(setting.async.dataFilter, [setting.treeId, node, newNodes], newNodes);
+						view.addNodes(setting, node, !!newNodes ? tools.clone(newNodes) : [], !!isSilent);
+					} else {
+						view.addNodes(setting, node, [], !!isSilent);
+					}
+					setting.treeObj.trigger(consts.event.ASYNC_SUCCESS, [setting.treeId, node, msg]);
+					tools.apply(callback);
+				},
+				error: function(XMLHttpRequest, textStatus, errorThrown) {
+					if (_tmpV != data.getRoot(setting)._ver) {
+						return;
+					}
+					if (node) node.isAjaxing = null;
+					view.setNodeLineIcos(setting, node);
+					setting.treeObj.trigger(consts.event.ASYNC_ERROR, [setting.treeId, node, XMLHttpRequest, textStatus, errorThrown]);
+				}
+			});
+			return true;
+		},
+		cancelPreSelectedNode: function (setting, node) {
+			var list = data.getRoot(setting).curSelectedList;
+			for (var i=0, j=list.length-1; j>=i; j--) {
+				if (!node || node === list[j]) {
+					$$(list[j], consts.id.A, setting).removeClass(consts.node.CURSELECTED);
+					if (node) {
+						data.removeSelectedNode(setting, node);
+						break;
+					}
+				}
+			}
+			if (!node) data.getRoot(setting).curSelectedList = [];
+		},
+		createNodeCallback: function(setting) {
+			if (!!setting.callback.onNodeCreated || !!setting.view.addDiyDom) {
+				var root = data.getRoot(setting);
+				while (root.createdNodes.length>0) {
+					var node = root.createdNodes.shift();
+					tools.apply(setting.view.addDiyDom, [setting.treeId, node]);
+					if (!!setting.callback.onNodeCreated) {
+						setting.treeObj.trigger(consts.event.NODECREATED, [setting.treeId, node]);
+					}
+				}
+			}
+		},
+		createNodes: function(setting, level, nodes, parentNode) {
+			if (!nodes || nodes.length == 0) return;
+			var root = data.getRoot(setting),
+			childKey = setting.data.key.children,
+			openFlag = !parentNode || parentNode.open || !!$$(parentNode[childKey][0], setting).get(0);
+			root.createdNodes = [];
+			var zTreeHtml = view.appendNodes(setting, level, nodes, parentNode, true, openFlag);
+			if (!parentNode) {
+				setting.treeObj.append(zTreeHtml.join(''));
+			} else {
+				var ulObj = $$(parentNode, consts.id.UL, setting);
+				if (ulObj.get(0)) {
+					ulObj.append(zTreeHtml.join(''));
+				}
+			}
+			view.createNodeCallback(setting);
+		},
+		destroy: function(setting) {
+			if (!setting) return;
+			data.initCache(setting);
+			data.initRoot(setting);
+			event.unbindTree(setting);
+			event.unbindEvent(setting);
+			setting.treeObj.empty();
+		},
+		expandCollapseNode: function(setting, node, expandFlag, animateFlag, callback) {
+			var root = data.getRoot(setting),
+			childKey = setting.data.key.children;
+			if (!node) {
+				tools.apply(callback, []);
+				return;
+			}
+			if (root.expandTriggerFlag) {
+				var _callback = callback;
+				callback = function(){
+					if (_callback) _callback();
+					if (node.open) {
+						setting.treeObj.trigger(consts.event.EXPAND, [setting.treeId, node]);
+					} else {
+						setting.treeObj.trigger(consts.event.COLLAPSE, [setting.treeId, node]);
+					}
+				};
+				root.expandTriggerFlag = false;
+			}
+			if (!node.open && node.isParent && ((!$$(node, consts.id.UL, setting).get(0)) || (node[childKey] && node[childKey].length>0 && !$$(node[childKey][0], setting).get(0)))) {
+				view.appendParentULDom(setting, node);
+				view.createNodeCallback(setting);
+			}
+			if (node.open == expandFlag) {
+				tools.apply(callback, []);
+				return;
+			}
+			var ulObj = $$(node, consts.id.UL, setting),
+			switchObj = $$(node, consts.id.SWITCH, setting),
+			icoObj = $$(node, consts.id.ICON, setting);
+
+			if (node.isParent) {
+				node.open = !node.open;
+				if (node.iconOpen && node.iconClose) {
+					icoObj.attr("style", view.makeNodeIcoStyle(setting, node));
+				}
+
+				if (node.open) {
+					view.replaceSwitchClass(node, switchObj, consts.folder.OPEN);
+					view.replaceIcoClass(node, icoObj, consts.folder.OPEN);
+					if (animateFlag == false || setting.view.expandSpeed == "") {
+						ulObj.show();
+						tools.apply(callback, []);
+					} else {
+						if (node[childKey] && node[childKey].length > 0) {
+							ulObj.slideDown(setting.view.expandSpeed, callback);
+						} else {
+							ulObj.show();
+							tools.apply(callback, []);
+						}
+					}
+				} else {
+					view.replaceSwitchClass(node, switchObj, consts.folder.CLOSE);
+					view.replaceIcoClass(node, icoObj, consts.folder.CLOSE);
+					if (animateFlag == false || setting.view.expandSpeed == "" || !(node[childKey] && node[childKey].length > 0)) {
+						ulObj.hide();
+						tools.apply(callback, []);
+					} else {
+						ulObj.slideUp(setting.view.expandSpeed, callback);
+					}
+				}
+			} else {
+				tools.apply(callback, []);
+			}
+		},
+		expandCollapseParentNode: function(setting, node, expandFlag, animateFlag, callback) {
+			if (!node) return;
+			if (!node.parentTId) {
+				view.expandCollapseNode(setting, node, expandFlag, animateFlag, callback);
+				return;
+			} else {
+				view.expandCollapseNode(setting, node, expandFlag, animateFlag);
+			}
+			if (node.parentTId) {
+				view.expandCollapseParentNode(setting, node.getParentNode(), expandFlag, animateFlag, callback);
+			}
+		},
+		expandCollapseSonNode: function(setting, node, expandFlag, animateFlag, callback) {
+			var root = data.getRoot(setting),
+			childKey = setting.data.key.children,
+			treeNodes = (node) ? node[childKey]: root[childKey],
+			selfAnimateSign = (node) ? false : animateFlag,
+			expandTriggerFlag = data.getRoot(setting).expandTriggerFlag;
+			data.getRoot(setting).expandTriggerFlag = false;
+			if (treeNodes) {
+				for (var i = 0, l = treeNodes.length; i < l; i++) {
+					if (treeNodes[i]) view.expandCollapseSonNode(setting, treeNodes[i], expandFlag, selfAnimateSign);
+				}
+			}
+			data.getRoot(setting).expandTriggerFlag = expandTriggerFlag;
+			view.expandCollapseNode(setting, node, expandFlag, animateFlag, callback );
+		},
+		makeDOMNodeIcon: function(html, setting, node) {
+			var nameStr = data.getNodeName(setting, node),
+			name = setting.view.nameIsHTML ? nameStr : nameStr.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;');
+			html.push("<span id='", node.tId, consts.id.ICON,
+				"' title='' treeNode", consts.id.ICON," class='", view.makeNodeIcoClass(setting, node),
+				"' style='", view.makeNodeIcoStyle(setting, node), "'></span><span id='", node.tId, consts.id.SPAN,
+				"'>",name,"</span>");
+		},
+		makeDOMNodeLine: function(html, setting, node) {
+			html.push("<span id='", node.tId, consts.id.SWITCH,	"' title='' class='", view.makeNodeLineClass(setting, node), "' treeNode", consts.id.SWITCH,"></span>");
+		},
+		makeDOMNodeMainAfter: function(html, setting, node) {
+			html.push("</li>");
+		},
+		makeDOMNodeMainBefore: function(html, setting, node) {
+			html.push("<li id='", node.tId, "' class='", consts.className.LEVEL, node.level,"' tabindex='0' hidefocus='true' treenode>");
+		},
+		makeDOMNodeNameAfter: function(html, setting, node) {
+			html.push("</a>");
+		},
+		makeDOMNodeNameBefore: function(html, setting, node) {
+			var title = data.getNodeTitle(setting, node),
+			url = view.makeNodeUrl(setting, node),
+			fontcss = view.makeNodeFontCss(setting, node),
+			fontStyle = [];
+			for (var f in fontcss) {
+				fontStyle.push(f, ":", fontcss[f], ";");
+			}
+			html.push("<a id='", node.tId, consts.id.A, "' class='", consts.className.LEVEL, node.level,"' treeNode", consts.id.A," onclick=\"", (node.click || ''),
+				"\" ", ((url != null && url.length > 0) ? "href='" + url + "'" : ""), " target='",view.makeNodeTarget(node),"' style='", fontStyle.join(''),
+				"'");
+			if (tools.apply(setting.view.showTitle, [setting.treeId, node], setting.view.showTitle) && title) {html.push("title='", title.replace(/'/g,"&#39;").replace(/</g,'&lt;').replace(/>/g,'&gt;'),"'");}
+			html.push(">");
+		},
+		makeNodeFontCss: function(setting, node) {
+			var fontCss = tools.apply(setting.view.fontCss, [setting.treeId, node], setting.view.fontCss);
+			return (fontCss && ((typeof fontCss) != "function")) ? fontCss : {};
+		},
+		makeNodeIcoClass: function(setting, node) {
+			var icoCss = ["ico"];
+			if (!node.isAjaxing) {
+				icoCss[0] = (node.iconSkin ? node.iconSkin + "_" : "") + icoCss[0];
+				if (node.isParent) {
+					icoCss.push(node.open ? consts.folder.OPEN : consts.folder.CLOSE);
+				} else {
+					icoCss.push(consts.folder.DOCU);
+				}
+			}
+			return consts.className.BUTTON + " " + icoCss.join('_');
+		},
+		makeNodeIcoStyle: function(setting, node) {
+			var icoStyle = [];
+			if (!node.isAjaxing) {
+				var icon = (node.isParent && node.iconOpen && node.iconClose) ? (node.open ? node.iconOpen : node.iconClose) : node.icon;
+				if (icon) icoStyle.push("background:url(", icon, ") 0 0 no-repeat;");
+				if (setting.view.showIcon == false || !tools.apply(setting.view.showIcon, [setting.treeId, node], true)) {
+					icoStyle.push("width:0px;height:0px;");
+				}
+			}
+			return icoStyle.join('');
+		},
+		makeNodeLineClass: function(setting, node) {
+			var lineClass = [];
+			if (setting.view.showLine) {
+				if (node.level == 0 && node.isFirstNode && node.isLastNode) {
+					lineClass.push(consts.line.ROOT);
+				} else if (node.level == 0 && node.isFirstNode) {
+					lineClass.push(consts.line.ROOTS);
+				} else if (node.isLastNode) {
+					lineClass.push(consts.line.BOTTOM);
+				} else {
+					lineClass.push(consts.line.CENTER);
+				}
+			} else {
+				lineClass.push(consts.line.NOLINE);
+			}
+			if (node.isParent) {
+				lineClass.push(node.open ? consts.folder.OPEN : consts.folder.CLOSE);
+			} else {
+				lineClass.push(consts.folder.DOCU);
+			}
+			return view.makeNodeLineClassEx(node) + lineClass.join('_');
+		},
+		makeNodeLineClassEx: function(node) {
+			return consts.className.BUTTON + " " + consts.className.LEVEL + node.level + " " + consts.className.SWITCH + " ";
+		},
+		makeNodeTarget: function(node) {
+			return (node.target || "_blank");
+		},
+		makeNodeUrl: function(setting, node) {
+			var urlKey = setting.data.key.url;
+			return node[urlKey] ? node[urlKey] : null;
+		},
+		makeUlHtml: function(setting, node, html, content) {
+			html.push("<ul id='", node.tId, consts.id.UL, "' class='", consts.className.LEVEL, node.level, " ", view.makeUlLineClass(setting, node), "' style='display:", (node.open ? "block": "none"),"'>");
+			html.push(content);
+			html.push("</ul>");
+		},
+		makeUlLineClass: function(setting, node) {
+			return ((setting.view.showLine && !node.isLastNode) ? consts.line.LINE : "");
+		},
+		removeChildNodes: function(setting, node) {
+			if (!node) return;
+			var childKey = setting.data.key.children,
+			nodes = node[childKey];
+			if (!nodes) return;
+
+			for (var i = 0, l = nodes.length; i < l; i++) {
+				data.removeNodeCache(setting, nodes[i]);
+			}
+			data.removeSelectedNode(setting);
+			delete node[childKey];
+
+			if (!setting.data.keep.parent) {
+				node.isParent = false;
+				node.open = false;
+				var tmp_switchObj = $$(node, consts.id.SWITCH, setting),
+				tmp_icoObj = $$(node, consts.id.ICON, setting);
+				view.replaceSwitchClass(node, tmp_switchObj, consts.folder.DOCU);
+				view.replaceIcoClass(node, tmp_icoObj, consts.folder.DOCU);
+				$$(node, consts.id.UL, setting).remove();
+			} else {
+				$$(node, consts.id.UL, setting).empty();
+			}
+		},
+		setFirstNode: function(setting, parentNode) {
+			var childKey = setting.data.key.children, childLength = parentNode[childKey].length;
+			if ( childLength > 0) {
+				parentNode[childKey][0].isFirstNode = true;
+			}
+		},
+		setLastNode: function(setting, parentNode) {
+			var childKey = setting.data.key.children, childLength = parentNode[childKey].length;
+			if ( childLength > 0) {
+				parentNode[childKey][childLength - 1].isLastNode = true;
+			}
+		},
+		removeNode: function(setting, node) {
+			var root = data.getRoot(setting),
+			childKey = setting.data.key.children,
+			parentNode = (node.parentTId) ? node.getParentNode() : root;
+
+			node.isFirstNode = false;
+			node.isLastNode = false;
+			node.getPreNode = function() {return null;};
+			node.getNextNode = function() {return null;};
+
+			if (!data.getNodeCache(setting, node.tId)) {
+				return;
+			}
+
+			$$(node, setting).remove();
+			data.removeNodeCache(setting, node);
+			data.removeSelectedNode(setting, node);
+
+			for (var i = 0, l = parentNode[childKey].length; i < l; i++) {
+				if (parentNode[childKey][i].tId == node.tId) {
+					parentNode[childKey].splice(i, 1);
+					break;
+				}
+			}
+			view.setFirstNode(setting, parentNode);
+			view.setLastNode(setting, parentNode);
+
+			var tmp_ulObj,tmp_switchObj,tmp_icoObj,
+			childLength = parentNode[childKey].length;
+
+			//repair nodes old parent
+			if (!setting.data.keep.parent && childLength == 0) {
+				//old parentNode has no child nodes
+				parentNode.isParent = false;
+				parentNode.open = false;
+				tmp_ulObj = $$(parentNode, consts.id.UL, setting);
+				tmp_switchObj = $$(parentNode, consts.id.SWITCH, setting);
+				tmp_icoObj = $$(parentNode, consts.id.ICON, setting);
+				view.replaceSwitchClass(parentNode, tmp_switchObj, consts.folder.DOCU);
+				view.replaceIcoClass(parentNode, tmp_icoObj, consts.folder.DOCU);
+				tmp_ulObj.css("display", "none");
+
+			} else if (setting.view.showLine && childLength > 0) {
+				//old parentNode has child nodes
+				var newLast = parentNode[childKey][childLength - 1];
+				tmp_ulObj = $$(newLast, consts.id.UL, setting);
+				tmp_switchObj = $$(newLast, consts.id.SWITCH, setting);
+				tmp_icoObj = $$(newLast, consts.id.ICON, setting);
+				if (parentNode == root) {
+					if (parentNode[childKey].length == 1) {
+						//node was root, and ztree has only one root after move node
+						view.replaceSwitchClass(newLast, tmp_switchObj, consts.line.ROOT);
+					} else {
+						var tmp_first_switchObj = $$(parentNode[childKey][0], consts.id.SWITCH, setting);
+						view.replaceSwitchClass(parentNode[childKey][0], tmp_first_switchObj, consts.line.ROOTS);
+						view.replaceSwitchClass(newLast, tmp_switchObj, consts.line.BOTTOM);
+					}
+				} else {
+					view.replaceSwitchClass(newLast, tmp_switchObj, consts.line.BOTTOM);
+				}
+				tmp_ulObj.removeClass(consts.line.LINE);
+			}
+		},
+		replaceIcoClass: function(node, obj, newName) {
+			if (!obj || node.isAjaxing) return;
+			var tmpName = obj.attr("class");
+			if (tmpName == undefined) return;
+			var tmpList = tmpName.split("_");
+			switch (newName) {
+				case consts.folder.OPEN:
+				case consts.folder.CLOSE:
+				case consts.folder.DOCU:
+					tmpList[tmpList.length-1] = newName;
+					break;
+			}
+			obj.attr("class", tmpList.join("_"));
+		},
+		replaceSwitchClass: function(node, obj, newName) {
+			if (!obj) return;
+			var tmpName = obj.attr("class");
+			if (tmpName == undefined) return;
+			var tmpList = tmpName.split("_");
+			switch (newName) {
+				case consts.line.ROOT:
+				case consts.line.ROOTS:
+				case consts.line.CENTER:
+				case consts.line.BOTTOM:
+				case consts.line.NOLINE:
+					tmpList[0] = view.makeNodeLineClassEx(node) + newName;
+					break;
+				case consts.folder.OPEN:
+				case consts.folder.CLOSE:
+				case consts.folder.DOCU:
+					tmpList[1] = newName;
+					break;
+			}
+			obj.attr("class", tmpList.join("_"));
+			if (newName !== consts.folder.DOCU) {
+				obj.removeAttr("disabled");
+			} else {
+				obj.attr("disabled", "disabled");
+			}
+		},
+		selectNode: function(setting, node, addFlag) {
+			if (!addFlag) {
+				view.cancelPreSelectedNode(setting);
+			}
+			$$(node, consts.id.A, setting).addClass(consts.node.CURSELECTED);
+			data.addSelectedNode(setting, node);
+		},
+		setNodeFontCss: function(setting, treeNode) {
+			var aObj = $$(treeNode, consts.id.A, setting),
+			fontCss = view.makeNodeFontCss(setting, treeNode);
+			if (fontCss) {
+				aObj.css(fontCss);
+			}
+		},
+		setNodeLineIcos: function(setting, node) {
+			if (!node) return;
+			var switchObj = $$(node, consts.id.SWITCH, setting),
+			ulObj = $$(node, consts.id.UL, setting),
+			icoObj = $$(node, consts.id.ICON, setting),
+			ulLine = view.makeUlLineClass(setting, node);
+			if (ulLine.length==0) {
+				ulObj.removeClass(consts.line.LINE);
+			} else {
+				ulObj.addClass(ulLine);
+			}
+			switchObj.attr("class", view.makeNodeLineClass(setting, node));
+			if (node.isParent) {
+				switchObj.removeAttr("disabled");
+			} else {
+				switchObj.attr("disabled", "disabled");
+			}
+			icoObj.removeAttr("style");
+			icoObj.attr("style", view.makeNodeIcoStyle(setting, node));
+			icoObj.attr("class", view.makeNodeIcoClass(setting, node));
+		},
+		setNodeName: function(setting, node) {
+			var title = data.getNodeTitle(setting, node),
+			nObj = $$(node, consts.id.SPAN, setting);
+			nObj.empty();
+			if (setting.view.nameIsHTML) {
+				nObj.html(data.getNodeName(setting, node));
+			} else {
+				nObj.text(data.getNodeName(setting, node));
+			}
+			if (tools.apply(setting.view.showTitle, [setting.treeId, node], setting.view.showTitle)) {
+				var aObj = $$(node, consts.id.A, setting);
+				aObj.attr("title", !title ? "" : title);
+			}
+		},
+		setNodeTarget: function(setting, node) {
+			var aObj = $$(node, consts.id.A, setting);
+			aObj.attr("target", view.makeNodeTarget(node));
+		},
+		setNodeUrl: function(setting, node) {
+			var aObj = $$(node, consts.id.A, setting),
+			url = view.makeNodeUrl(setting, node);
+			if (url == null || url.length == 0) {
+				aObj.removeAttr("href");
+			} else {
+				aObj.attr("href", url);
+			}
+		},
+		switchNode: function(setting, node) {
+			if (node.open || !tools.canAsync(setting, node)) {
+				view.expandCollapseNode(setting, node, !node.open);
+			} else if (setting.async.enable) {
+				if (!view.asyncNode(setting, node)) {
+					view.expandCollapseNode(setting, node, !node.open);
+					return;
+				}
+			} else if (node) {
+				view.expandCollapseNode(setting, node, !node.open);
+			}
+		}
+	};
+	// zTree defind
+	$.fn.zTree = {
+		consts : _consts,
+		_z : {
+			tools: tools,
+			view: view,
+			event: event,
+			data: data
+		},
+		getZTreeObj: function(treeId) {
+			var o = data.getZTreeTools(treeId);
+			return o ? o : null;
+		},
+		destroy: function(treeId) {
+			if (!!treeId && treeId.length > 0) {
+				view.destroy(data.getSetting(treeId));
+			} else {
+				for(var s in settings) {
+					view.destroy(settings[s]);
+				}
+			}
+		},
+		init: function(obj, zSetting, zNodes) {
+			var setting = tools.clone(_setting);
+			$.extend(true, setting, zSetting);
+			setting.treeId = obj.attr("id");
+			setting.treeObj = obj;
+			setting.treeObj.empty();
+			settings[setting.treeId] = setting;
+			//For some older browser,(e.g., ie6)
+			if(typeof document.body.style.maxHeight === "undefined") {
+				setting.view.expandSpeed = "";
+			}
+			data.initRoot(setting);
+			var root = data.getRoot(setting),
+			childKey = setting.data.key.children;
+			zNodes = zNodes ? tools.clone(tools.isArray(zNodes)? zNodes : [zNodes]) : [];
+			if (setting.data.simpleData.enable) {
+				root[childKey] = data.transformTozTreeFormat(setting, zNodes);
+			} else {
+				root[childKey] = zNodes;
+			}
+
+			data.initCache(setting);
+			event.unbindTree(setting);
+			event.bindTree(setting);
+			event.unbindEvent(setting);
+			event.bindEvent(setting);
+
+			var zTreeTools = {
+				setting : setting,
+				addNodes : function(parentNode, newNodes, isSilent) {
+					if (!newNodes) return null;
+					if (!parentNode) parentNode = null;
+					if (parentNode && !parentNode.isParent && setting.data.keep.leaf) return null;
+					var xNewNodes = tools.clone(tools.isArray(newNodes)? newNodes: [newNodes]);
+					function addCallback() {
+						view.addNodes(setting, parentNode, xNewNodes, (isSilent==true));
+					}
+
+					if (tools.canAsync(setting, parentNode)) {
+						view.asyncNode(setting, parentNode, isSilent, addCallback);
+					} else {
+						addCallback();
+					}
+					return xNewNodes;
+				},
+				cancelSelectedNode : function(node) {
+					view.cancelPreSelectedNode(setting, node);
+				},
+				destroy : function() {
+					view.destroy(setting);
+				},
+				expandAll : function(expandFlag) {
+					expandFlag = !!expandFlag;
+					view.expandCollapseSonNode(setting, null, expandFlag, true);
+					return expandFlag;
+				},
+				expandNode : function(node, expandFlag, sonSign, focus, callbackFlag) {
+					if (!node || !node.isParent) return null;
+					if (expandFlag !== true && expandFlag !== false) {
+						expandFlag = !node.open;
+					}
+					callbackFlag = !!callbackFlag;
+
+					if (callbackFlag && expandFlag && (tools.apply(setting.callback.beforeExpand, [setting.treeId, node], true) == false)) {
+						return null;
+					} else if (callbackFlag && !expandFlag && (tools.apply(setting.callback.beforeCollapse, [setting.treeId, node], true) == false)) {
+						return null;
+					}
+					if (expandFlag && node.parentTId) {
+						view.expandCollapseParentNode(setting, node.getParentNode(), expandFlag, false);
+					}
+					if (expandFlag === node.open && !sonSign) {
+						return null;
+					}
+
+					data.getRoot(setting).expandTriggerFlag = callbackFlag;
+					if (!tools.canAsync(setting, node) && sonSign) {
+						view.expandCollapseSonNode(setting, node, expandFlag, true, function() {
+							if (focus !== false) {try{$$(node, setting).focus().blur();}catch(e){}}
+						});
+					} else {
+						node.open = !expandFlag;
+						view.switchNode(this.setting, node);
+						if (focus !== false) {try{$$(node, setting).focus().blur();}catch(e){}}
+					}
+					return expandFlag;
+				},
+				getNodes : function() {
+					return data.getNodes(setting);
+				},
+				getNodeByParam : function(key, value, parentNode) {
+					if (!key) return null;
+					return data.getNodeByParam(setting, parentNode?parentNode[setting.data.key.children]:data.getNodes(setting), key, value);
+				},
+				getNodeByTId : function(tId) {
+					return data.getNodeCache(setting, tId);
+				},
+				getNodesByParam : function(key, value, parentNode) {
+					if (!key) return null;
+					return data.getNodesByParam(setting, parentNode?parentNode[setting.data.key.children]:data.getNodes(setting), key, value);
+				},
+				getNodesByParamFuzzy : function(key, value, parentNode) {
+					if (!key) return null;
+					return data.getNodesByParamFuzzy(setting, parentNode?parentNode[setting.data.key.children]:data.getNodes(setting), key, value);
+				},
+				getNodesByFilter: function(filter, isSingle, parentNode, invokeParam) {
+					isSingle = !!isSingle;
+					if (!filter || (typeof filter != "function")) return (isSingle ? null : []);
+					return data.getNodesByFilter(setting, parentNode?parentNode[setting.data.key.children]:data.getNodes(setting), filter, isSingle, invokeParam);
+				},
+				getNodeIndex : function(node) {
+					if (!node) return null;
+					var childKey = setting.data.key.children,
+					parentNode = (node.parentTId) ? node.getParentNode() : data.getRoot(setting);
+					for (var i=0, l = parentNode[childKey].length; i < l; i++) {
+						if (parentNode[childKey][i] == node) return i;
+					}
+					return -1;
+				},
+				getSelectedNodes : function() {
+					var r = [], list = data.getRoot(setting).curSelectedList;
+					for (var i=0, l=list.length; i<l; i++) {
+						r.push(list[i]);
+					}
+					return r;
+				},
+				isSelectedNode : function(node) {
+					return data.isSelectedNode(setting, node);
+				},
+				reAsyncChildNodes : function(parentNode, reloadType, isSilent) {
+					if (!this.setting.async.enable) return;
+					var isRoot = !parentNode;
+					if (isRoot) {
+						parentNode = data.getRoot(setting);
+					}
+					if (reloadType=="refresh") {
+						var childKey = this.setting.data.key.children;
+						for (var i = 0, l = parentNode[childKey] ? parentNode[childKey].length : 0; i < l; i++) {
+							data.removeNodeCache(setting, parentNode[childKey][i]);
+						}
+						data.removeSelectedNode(setting);
+						parentNode[childKey] = [];
+						if (isRoot) {
+							this.setting.treeObj.empty();
+						} else {
+							var ulObj = $$(parentNode, consts.id.UL, setting);
+							ulObj.empty();
+						}
+					}
+					view.asyncNode(this.setting, isRoot? null:parentNode, !!isSilent);
+				},
+				refresh : function() {
+					this.setting.treeObj.empty();
+					var root = data.getRoot(setting),
+					nodes = root[setting.data.key.children]
+					data.initRoot(setting);
+					root[setting.data.key.children] = nodes
+					data.initCache(setting);
+					view.createNodes(setting, 0, root[setting.data.key.children]);
+				},
+				removeChildNodes : function(node) {
+					if (!node) return null;
+					var childKey = setting.data.key.children,
+					nodes = node[childKey];
+					view.removeChildNodes(setting, node);
+					return nodes ? nodes : null;
+				},
+				removeNode : function(node, callbackFlag) {
+					if (!node) return;
+					callbackFlag = !!callbackFlag;
+					if (callbackFlag && tools.apply(setting.callback.beforeRemove, [setting.treeId, node], true) == false) return;
+					view.removeNode(setting, node);
+					if (callbackFlag) {
+						this.setting.treeObj.trigger(consts.event.REMOVE, [setting.treeId, node]);
+					}
+				},
+				selectNode : function(node, addFlag) {
+					if (!node) return;
+					if (tools.uCanDo(setting)) {
+						addFlag = setting.view.selectedMulti && addFlag;
+						if (node.parentTId) {
+							view.expandCollapseParentNode(setting, node.getParentNode(), true, false, function() {
+								try{$$(node, setting).focus().blur();}catch(e){}
+							});
+						} else {
+							try{$$(node, setting).focus().blur();}catch(e){}
+						}
+						view.selectNode(setting, node, addFlag);
+					}
+				},
+				transformTozTreeNodes : function(simpleNodes) {
+					return data.transformTozTreeFormat(setting, simpleNodes);
+				},
+				transformToArray : function(nodes) {
+					return data.transformToArrayFormat(setting, nodes);
+				},
+				updateNode : function(node, checkTypeFlag) {
+					if (!node) return;
+					var nObj = $$(node, setting);
+					if (nObj.get(0) && tools.uCanDo(setting)) {
+						view.setNodeName(setting, node);
+						view.setNodeTarget(setting, node);
+						view.setNodeUrl(setting, node);
+						view.setNodeLineIcos(setting, node);
+						view.setNodeFontCss(setting, node);
+					}
+				}
+			}
+			root.treeTools = zTreeTools;
+			data.setZTreeTools(setting, zTreeTools);
+
+			if (root[childKey] && root[childKey].length > 0) {
+				view.createNodes(setting, 0, root[childKey]);
+			} else if (setting.async.enable && setting.async.url && setting.async.url !== '') {
+				view.asyncNode(setting);
+			}
+			return zTreeTools;
+		}
+	};
+
+	var zt = $.fn.zTree,
+	$$ = tools.$,
+	consts = zt.consts;
+})(jQuery);
+/*
+ * JQuery zTree excheck v3.5.15
+ * http://zTree.me/
+ *
+ * Copyright (c) 2010 Hunter.z
+ *
+ * Licensed same as jquery - MIT License
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ * email: hunter.z@263.net
+ * Date: 2013-10-15
+ */
+(function($){
+	//default consts of excheck
+	var _consts = {
+		event: {
+			CHECK: "ztree_check"
+		},
+		id: {
+			CHECK: "_check"
+		},
+		checkbox: {
+			STYLE: "checkbox",
+			DEFAULT: "chk",
+			DISABLED: "disable",
+			FALSE: "false",
+			TRUE: "true",
+			FULL: "full",
+			PART: "part",
+			FOCUS: "focus"
+		},
+		radio: {
+			STYLE: "radio",
+			TYPE_ALL: "all",
+			TYPE_LEVEL: "level"
+		}
+	},
+	//default setting of excheck
+	_setting = {
+		check: {
+			enable: false,
+			autoCheckTrigger: false,
+			chkStyle: _consts.checkbox.STYLE,
+			nocheckInherit: false,
+			chkDisabledInherit: false,
+			radioType: _consts.radio.TYPE_LEVEL,
+			chkboxType: {
+				"Y": "ps",
+				"N": "ps"
+			}
+		},
+		data: {
+			key: {
+				checked: "checked"
+			}
+		},
+		callback: {
+			beforeCheck:null,
+			onCheck:null
+		}
+	},
+	//default root of excheck
+	_initRoot = function (setting) {
+		var r = data.getRoot(setting);
+		r.radioCheckedList = [];
+	},
+	//default cache of excheck
+	_initCache = function(treeId) {},
+	//default bind event of excheck
+	_bindEvent = function(setting) {
+		var o = setting.treeObj,
+		c = consts.event;
+		o.bind(c.CHECK, function (event, srcEvent, treeId, node) {
+			tools.apply(setting.callback.onCheck, [!!srcEvent?srcEvent : event, treeId, node]);
+		});
+	},
+	_unbindEvent = function(setting) {
+		var o = setting.treeObj,
+		c = consts.event;
+		o.unbind(c.CHECK);
+	},
+	//default event proxy of excheck
+	_eventProxy = function(e) {
+		var target = e.target,
+		setting = data.getSetting(e.data.treeId),
+		tId = "", node = null,
+		nodeEventType = "", treeEventType = "",
+		nodeEventCallback = null, treeEventCallback = null;
+
+		if (tools.eqs(e.type, "mouseover")) {
+			if (setting.check.enable && tools.eqs(target.tagName, "span") && target.getAttribute("treeNode"+ consts.id.CHECK) !== null) {
+				tId = tools.getNodeMainDom(target).id;
+				nodeEventType = "mouseoverCheck";
+			}
+		} else if (tools.eqs(e.type, "mouseout")) {
+			if (setting.check.enable && tools.eqs(target.tagName, "span") && target.getAttribute("treeNode"+ consts.id.CHECK) !== null) {
+				tId = tools.getNodeMainDom(target).id;
+				nodeEventType = "mouseoutCheck";
+			}
+		} else if (tools.eqs(e.type, "click")) {
+			if (setting.check.enable && tools.eqs(target.tagName, "span") && target.getAttribute("treeNode"+ consts.id.CHECK) !== null) {
+				tId = tools.getNodeMainDom(target).id;
+				nodeEventType = "checkNode";
+			}
+		}
+		if (tId.length>0) {
+			node = data.getNodeCache(setting, tId);
+			switch (nodeEventType) {
+				case "checkNode" :
+					nodeEventCallback = _handler.onCheckNode;
+					break;
+				case "mouseoverCheck" :
+					nodeEventCallback = _handler.onMouseoverCheck;
+					break;
+				case "mouseoutCheck" :
+					nodeEventCallback = _handler.onMouseoutCheck;
+					break;
+			}
+		}
+		var proxyResult = {
+			stop: nodeEventType === "checkNode",
+			node: node,
+			nodeEventType: nodeEventType,
+			nodeEventCallback: nodeEventCallback,
+			treeEventType: treeEventType,
+			treeEventCallback: treeEventCallback
+		};
+		return proxyResult
+	},
+	//default init node of excheck
+	_initNode = function(setting, level, n, parentNode, isFirstNode, isLastNode, openFlag) {
+		if (!n) return;
+		var checkedKey = setting.data.key.checked;
+		if (typeof n[checkedKey] == "string") n[checkedKey] = tools.eqs(n[checkedKey], "true");
+		n[checkedKey] = !!n[checkedKey];
+		n.checkedOld = n[checkedKey];
+		if (typeof n.nocheck == "string") n.nocheck = tools.eqs(n.nocheck, "true");
+		n.nocheck = !!n.nocheck || (setting.check.nocheckInherit && parentNode && !!parentNode.nocheck);
+		if (typeof n.chkDisabled == "string") n.chkDisabled = tools.eqs(n.chkDisabled, "true");
+		n.chkDisabled = !!n.chkDisabled || (setting.check.chkDisabledInherit && parentNode && !!parentNode.chkDisabled);
+		if (typeof n.halfCheck == "string") n.halfCheck = tools.eqs(n.halfCheck, "true");
+		n.halfCheck = !!n.halfCheck;
+		n.check_Child_State = -1;
+		n.check_Focus = false;
+		n.getCheckStatus = function() {return data.getCheckStatus(setting, n);};
+
+		if (setting.check.chkStyle == consts.radio.STYLE && setting.check.radioType == consts.radio.TYPE_ALL && n[checkedKey] ) {
+			var r = data.getRoot(setting);
+			r.radioCheckedList.push(n);
+		}
+	},
+	//add dom for check
+	_beforeA = function(setting, node, html) {
+		var checkedKey = setting.data.key.checked;
+		if (setting.check.enable) {
+			data.makeChkFlag(setting, node);
+			html.push("<span ID='", node.tId, consts.id.CHECK, "' class='", view.makeChkClass(setting, node), "' treeNode", consts.id.CHECK, (node.nocheck === true?" style='display:none;'":""),"></span>");
+		}
+	},
+	//update zTreeObj, add method of check
+	_zTreeTools = function(setting, zTreeTools) {
+		zTreeTools.checkNode = function(node, checked, checkTypeFlag, callbackFlag) {
+			var checkedKey = setting.data.key.checked;
+			if (node.chkDisabled === true) return;
+			if (checked !== true && checked !== false) {
+				checked = !node[checkedKey];
+			}
+			callbackFlag = !!callbackFlag;
+
+			if (node[checkedKey] === checked && !checkTypeFlag) {
+				return;
+			} else if (callbackFlag && tools.apply(this.setting.callback.beforeCheck, [setting.treeId, node], true) == false) {
+				return;
+			}
+			if (tools.uCanDo(this.setting) && setting.check.enable && node.nocheck !== true) {
+				node[checkedKey] = checked;
+				var checkObj = $$(node, consts.id.CHECK, setting);
+				if (checkTypeFlag || setting.check.chkStyle === consts.radio.STYLE) view.checkNodeRelation(setting, node);
+				view.setChkClass(setting, checkObj, node);
+				view.repairParentChkClassWithSelf(setting, node);
+				if (callbackFlag) {
+					setting.treeObj.trigger(consts.event.CHECK, [null, setting.treeId, node]);
+				}
+			}
+		}
+
+		zTreeTools.checkAllNodes = function(checked) {
+			view.repairAllChk(setting, !!checked);
+		}
+
+		zTreeTools.getCheckedNodes = function(checked) {
+			var childKey = setting.data.key.children;
+			checked = (checked !== false);
+			return data.getTreeCheckedNodes(setting, data.getRoot(setting)[childKey], checked);
+		}
+
+		zTreeTools.getChangeCheckedNodes = function() {
+			var childKey = setting.data.key.children;
+			return data.getTreeChangeCheckedNodes(setting, data.getRoot(setting)[childKey]);
+		}
+
+		zTreeTools.setChkDisabled = function(node, disabled, inheritParent, inheritChildren) {
+			disabled = !!disabled;
+			inheritParent = !!inheritParent;
+			inheritChildren = !!inheritChildren;
+			view.repairSonChkDisabled(setting, node, disabled, inheritChildren);
+			view.repairParentChkDisabled(setting, node.getParentNode(), disabled, inheritParent);
+		}
+
+		var _updateNode = zTreeTools.updateNode;
+		zTreeTools.updateNode = function(node, checkTypeFlag) {
+			if (_updateNode) _updateNode.apply(zTreeTools, arguments);
+			if (!node || !setting.check.enable) return;
+			var nObj = $$(node, setting);
+			if (nObj.get(0) && tools.uCanDo(setting)) {
+				var checkObj = $$(node, consts.id.CHECK, setting);
+				if (checkTypeFlag == true || setting.check.chkStyle === consts.radio.STYLE) view.checkNodeRelation(setting, node);
+				view.setChkClass(setting, checkObj, node);
+				view.repairParentChkClassWithSelf(setting, node);
+			}
+		}
+	},
+	//method of operate data
+	_data = {
+		getRadioCheckedList: function(setting) {
+			var checkedList = data.getRoot(setting).radioCheckedList;
+			for (var i=0, j=checkedList.length; i<j; i++) {
+				if(!data.getNodeCache(setting, checkedList[i].tId)) {
+					checkedList.splice(i, 1);
+					i--; j--;
+				}
+			}
+			return checkedList;
+		},
+		getCheckStatus: function(setting, node) {
+			if (!setting.check.enable || node.nocheck || node.chkDisabled) return null;
+			var checkedKey = setting.data.key.checked,
+			r = {
+				checked: node[checkedKey],
+				half: node.halfCheck ? node.halfCheck : (setting.check.chkStyle == consts.radio.STYLE ? (node.check_Child_State === 2) : (node[checkedKey] ? (node.check_Child_State > -1 && node.check_Child_State < 2) : (node.check_Child_State > 0)))
+			};
+			return r;
+		},
+		getTreeCheckedNodes: function(setting, nodes, checked, results) {
+			if (!nodes) return [];
+			var childKey = setting.data.key.children,
+			checkedKey = setting.data.key.checked,
+			onlyOne = (checked && setting.check.chkStyle == consts.radio.STYLE && setting.check.radioType == consts.radio.TYPE_ALL);
+			results = !results ? [] : results;
+			for (var i = 0, l = nodes.length; i < l; i++) {
+				if (nodes[i].nocheck !== true && nodes[i].chkDisabled !== true && nodes[i][checkedKey] == checked) {
+					results.push(nodes[i]);
+					if(onlyOne) {
+						break;
+					}
+				}
+				data.getTreeCheckedNodes(setting, nodes[i][childKey], checked, results);
+				if(onlyOne && results.length > 0) {
+					break;
+				}
+			}
+			return results;
+		},
+		getTreeChangeCheckedNodes: function(setting, nodes, results) {
+			if (!nodes) return [];
+			var childKey = setting.data.key.children,
+			checkedKey = setting.data.key.checked;
+			results = !results ? [] : results;
+			for (var i = 0, l = nodes.length; i < l; i++) {
+				if (nodes[i].nocheck !== true && nodes[i].chkDisabled !== true && nodes[i][checkedKey] != nodes[i].checkedOld) {
+					results.push(nodes[i]);
+				}
+				data.getTreeChangeCheckedNodes(setting, nodes[i][childKey], results);
+			}
+			return results;
+		},
+		makeChkFlag: function(setting, node) {
+			if (!node) return;
+			var childKey = setting.data.key.children,
+			checkedKey = setting.data.key.checked,
+			chkFlag = -1;
+			if (node[childKey]) {
+				for (var i = 0, l = node[childKey].length; i < l; i++) {
+					var cNode = node[childKey][i];
+					var tmp = -1;
+					if (setting.check.chkStyle == consts.radio.STYLE) {
+						if (cNode.nocheck === true || cNode.chkDisabled === true) {
+							tmp = cNode.check_Child_State;
+						} else if (cNode.halfCheck === true) {
+							tmp = 2;
+						} else if (cNode[checkedKey]) {
+							tmp = 2;
+						} else {
+							tmp = cNode.check_Child_State > 0 ? 2:0;
+						}
+						if (tmp == 2) {
+							chkFlag = 2; break;
+						} else if (tmp == 0){
+							chkFlag = 0;
+						}
+					} else if (setting.check.chkStyle == consts.checkbox.STYLE) {
+						if (cNode.nocheck === true || cNode.chkDisabled === true) {
+							tmp = cNode.check_Child_State;
+						} else if (cNode.halfCheck === true) {
+							tmp = 1;
+						} else if (cNode[checkedKey] ) {
+							tmp = (cNode.check_Child_State === -1 || cNode.check_Child_State === 2) ? 2 : 1;
+						} else {
+							tmp = (cNode.check_Child_State > 0) ? 1 : 0;
+						}
+						if (tmp === 1) {
+							chkFlag = 1; break;
+						} else if (tmp === 2 && chkFlag > -1 && i > 0 && tmp !== chkFlag) {
+							chkFlag = 1; break;
+						} else if (chkFlag === 2 && tmp > -1 && tmp < 2) {
+							chkFlag = 1; break;
+						} else if (tmp > -1) {
+							chkFlag = tmp;
+						}
+					}
+				}
+			}
+			node.check_Child_State = chkFlag;
+		}
+	},
+	//method of event proxy
+	_event = {
+
+	},
+	//method of event handler
+	_handler = {
+		onCheckNode: function (event, node) {
+			if (node.chkDisabled === true) return false;
+			var setting = data.getSetting(event.data.treeId),
+			checkedKey = setting.data.key.checked;
+			if (tools.apply(setting.callback.beforeCheck, [setting.treeId, node], true) == false) return true;
+			node[checkedKey] = !node[checkedKey];
+			view.checkNodeRelation(setting, node);
+			var checkObj = $$(node, consts.id.CHECK, setting);
+			view.setChkClass(setting, checkObj, node);
+			view.repairParentChkClassWithSelf(setting, node);
+			setting.treeObj.trigger(consts.event.CHECK, [event, setting.treeId, node]);
+			return true;
+		},
+		onMouseoverCheck: function(event, node) {
+			if (node.chkDisabled === true) return false;
+			var setting = data.getSetting(event.data.treeId),
+			checkObj = $$(node, consts.id.CHECK, setting);
+			node.check_Focus = true;
+			view.setChkClass(setting, checkObj, node);
+			return true;
+		},
+		onMouseoutCheck: function(event, node) {
+			if (node.chkDisabled === true) return false;
+			var setting = data.getSetting(event.data.treeId),
+			checkObj = $$(node, consts.id.CHECK, setting);
+			node.check_Focus = false;
+			view.setChkClass(setting, checkObj, node);
+			return true;
+		}
+	},
+	//method of tools for zTree
+	_tools = {
+
+	},
+	//method of operate ztree dom
+	_view = {
+		checkNodeRelation: function(setting, node) {
+			var pNode, i, l,
+			childKey = setting.data.key.children,
+			checkedKey = setting.data.key.checked,
+			r = consts.radio;
+			if (setting.check.chkStyle == r.STYLE) {
+				var checkedList = data.getRadioCheckedList(setting);
+				if (node[checkedKey]) {
+					if (setting.check.radioType == r.TYPE_ALL) {
+						for (i = checkedList.length-1; i >= 0; i--) {
+							pNode = checkedList[i];
+							pNode[checkedKey] = false;
+							checkedList.splice(i, 1);
+
+							view.setChkClass(setting, $$(pNode, consts.id.CHECK, setting), pNode);
+							if (pNode.parentTId != node.parentTId) {
+								view.repairParentChkClassWithSelf(setting, pNode);
+							}
+						}
+						checkedList.push(node);
+					} else {
+						var parentNode = (node.parentTId) ? node.getParentNode() : data.getRoot(setting);
+						for (i = 0, l = parentNode[childKey].length; i < l; i++) {
+							pNode = parentNode[childKey][i];
+							if (pNode[checkedKey] && pNode != node) {
+								pNode[checkedKey] = false;
+								view.setChkClass(setting, $$(pNode, consts.id.CHECK, setting), pNode);
+							}
+						}
+					}
+				} else if (setting.check.radioType == r.TYPE_ALL) {
+					for (i = 0, l = checkedList.length; i < l; i++) {
+						if (node == checkedList[i]) {
+							checkedList.splice(i, 1);
+							break;
+						}
+					}
+				}
+
+			} else {
+				if (node[checkedKey] && (!node[childKey] || node[childKey].length==0 || setting.check.chkboxType.Y.indexOf("s") > -1)) {
+					view.setSonNodeCheckBox(setting, node, true);
+				}
+				if (!node[checkedKey] && (!node[childKey] || node[childKey].length==0 || setting.check.chkboxType.N.indexOf("s") > -1)) {
+					view.setSonNodeCheckBox(setting, node, false);
+				}
+				if (node[checkedKey] && setting.check.chkboxType.Y.indexOf("p") > -1) {
+					view.setParentNodeCheckBox(setting, node, true);
+				}
+				if (!node[checkedKey] && setting.check.chkboxType.N.indexOf("p") > -1) {
+					view.setParentNodeCheckBox(setting, node, false);
+				}
+			}
+		},
+		makeChkClass: function(setting, node) {
+			var checkedKey = setting.data.key.checked,
+			c = consts.checkbox, r = consts.radio,
+			fullStyle = "";
+			if (node.chkDisabled === true) {
+				fullStyle = c.DISABLED;
+			} else if (node.halfCheck) {
+				fullStyle = c.PART;
+			} else if (setting.check.chkStyle == r.STYLE) {
+				fullStyle = (node.check_Child_State < 1)? c.FULL:c.PART;
+			} else {
+				fullStyle = node[checkedKey] ? ((node.check_Child_State === 2 || node.check_Child_State === -1) ? c.FULL:c.PART) : ((node.check_Child_State < 1)? c.FULL:c.PART);
+			}
+			var chkName = setting.check.chkStyle + "_" + (node[checkedKey] ? c.TRUE : c.FALSE) + "_" + fullStyle;
+			chkName = (node.check_Focus && node.chkDisabled !== true) ? chkName + "_" + c.FOCUS : chkName;
+			return consts.className.BUTTON + " " + c.DEFAULT + " " + chkName;
+		},
+		repairAllChk: function(setting, checked) {
+			if (setting.check.enable && setting.check.chkStyle === consts.checkbox.STYLE) {
+				var checkedKey = setting.data.key.checked,
+				childKey = setting.data.key.children,
+				root = data.getRoot(setting);
+				for (var i = 0, l = root[childKey].length; i<l ; i++) {
+					var node = root[childKey][i];
+					if (node.nocheck !== true && node.chkDisabled !== true) {
+						node[checkedKey] = checked;
+					}
+					view.setSonNodeCheckBox(setting, node, checked);
+				}
+			}
+		},
+		repairChkClass: function(setting, node) {
+			if (!node) return;
+			data.makeChkFlag(setting, node);
+			if (node.nocheck !== true) {
+				var checkObj = $$(node, consts.id.CHECK, setting);
+				view.setChkClass(setting, checkObj, node);
+			}
+		},
+		repairParentChkClass: function(setting, node) {
+			if (!node || !node.parentTId) return;
+			var pNode = node.getParentNode();
+			view.repairChkClass(setting, pNode);
+			view.repairParentChkClass(setting, pNode);
+		},
+		repairParentChkClassWithSelf: function(setting, node) {
+			if (!node) return;
+			var childKey = setting.data.key.children;
+			if (node[childKey] && node[childKey].length > 0) {
+				view.repairParentChkClass(setting, node[childKey][0]);
+			} else {
+				view.repairParentChkClass(setting, node);
+			}
+		},
+		repairSonChkDisabled: function(setting, node, chkDisabled, inherit) {
+			if (!node) return;
+			var childKey = setting.data.key.children;
+			if (node.chkDisabled != chkDisabled) {
+				node.chkDisabled = chkDisabled;
+			}
+			view.repairChkClass(setting, node);
+			if (node[childKey] && inherit) {
+				for (var i = 0, l = node[childKey].length; i < l; i++) {
+					var sNode = node[childKey][i];
+					view.repairSonChkDisabled(setting, sNode, chkDisabled, inherit);
+				}
+			}
+		},
+		repairParentChkDisabled: function(setting, node, chkDisabled, inherit) {
+			if (!node) return;
+			if (node.chkDisabled != chkDisabled && inherit) {
+				node.chkDisabled = chkDisabled;
+			}
+			view.repairChkClass(setting, node);
+			view.repairParentChkDisabled(setting, node.getParentNode(), chkDisabled, inherit);
+		},
+		setChkClass: function(setting, obj, node) {
+			if (!obj) return;
+			if (node.nocheck === true) {
+				obj.hide();
+			} else {
+				obj.show();
+			}
+			obj.removeClass();
+			obj.addClass(view.makeChkClass(setting, node));
+		},
+		setParentNodeCheckBox: function(setting, node, value, srcNode) {
+			var childKey = setting.data.key.children,
+			checkedKey = setting.data.key.checked,
+			checkObj = $$(node, consts.id.CHECK, setting);
+			if (!srcNode) srcNode = node;
+			data.makeChkFlag(setting, node);
+			if (node.nocheck !== true && node.chkDisabled !== true) {
+				node[checkedKey] = value;
+				view.setChkClass(setting, checkObj, node);
+				if (setting.check.autoCheckTrigger && node != srcNode) {
+					setting.treeObj.trigger(consts.event.CHECK, [null, setting.treeId, node]);
+				}
+			}
+			if (node.parentTId) {
+				var pSign = true;
+				if (!value) {
+					var pNodes = node.getParentNode()[childKey];
+					for (var i = 0, l = pNodes.length; i < l; i++) {
+						if ((pNodes[i].nocheck !== true && pNodes[i].chkDisabled !== true && pNodes[i][checkedKey])
+						|| ((pNodes[i].nocheck === true || pNodes[i].chkDisabled === true) && pNodes[i].check_Child_State > 0)) {
+							pSign = false;
+							break;
+						}
+					}
+				}
+				if (pSign) {
+					view.setParentNodeCheckBox(setting, node.getParentNode(), value, srcNode);
+				}
+			}
+		},
+		setSonNodeCheckBox: function(setting, node, value, srcNode) {
+			if (!node) return;
+			var childKey = setting.data.key.children,
+			checkedKey = setting.data.key.checked,
+			checkObj = $$(node, consts.id.CHECK, setting);
+			if (!srcNode) srcNode = node;
+
+			var hasDisable = false;
+			if (node[childKey]) {
+				for (var i = 0, l = node[childKey].length; i < l && node.chkDisabled !== true; i++) {
+					var sNode = node[childKey][i];
+					view.setSonNodeCheckBox(setting, sNode, value, srcNode);
+					if (sNode.chkDisabled === true) hasDisable = true;
+				}
+			}
+
+			if (node != data.getRoot(setting) && node.chkDisabled !== true) {
+				if (hasDisable && node.nocheck !== true) {
+					data.makeChkFlag(setting, node);
+				}
+				if (node.nocheck !== true && node.chkDisabled !== true) {
+					node[checkedKey] = value;
+					if (!hasDisable) node.check_Child_State = (node[childKey] && node[childKey].length > 0) ? (value ? 2 : 0) : -1;
+				} else {
+					node.check_Child_State = -1;
+				}
+				view.setChkClass(setting, checkObj, node);
+				if (setting.check.autoCheckTrigger && node != srcNode && node.nocheck !== true && node.chkDisabled !== true) {
+					setting.treeObj.trigger(consts.event.CHECK, [null, setting.treeId, node]);
+				}
+			}
+
+		}
+	},
+
+	_z = {
+		tools: _tools,
+		view: _view,
+		event: _event,
+		data: _data
+	};
+	$.extend(true, $.fn.zTree.consts, _consts);
+	$.extend(true, $.fn.zTree._z, _z);
+
+	var zt = $.fn.zTree,
+	tools = zt._z.tools,
+	consts = zt.consts,
+	view = zt._z.view,
+	data = zt._z.data,
+	event = zt._z.event,
+	$$ = tools.$;
+
+	data.exSetting(_setting);
+	data.addInitBind(_bindEvent);
+	data.addInitUnBind(_unbindEvent);
+	data.addInitCache(_initCache);
+	data.addInitNode(_initNode);
+	data.addInitProxy(_eventProxy, true);
+	data.addInitRoot(_initRoot);
+	data.addBeforeA(_beforeA);
+	data.addZTreeTools(_zTreeTools);
+
+	var _createNodes = view.createNodes;
+	view.createNodes = function(setting, level, nodes, parentNode) {
+		if (_createNodes) _createNodes.apply(view, arguments);
+		if (!nodes) return;
+		view.repairParentChkClassWithSelf(setting, parentNode);
+	}
+	var _removeNode = view.removeNode;
+	view.removeNode = function(setting, node) {
+		var parentNode = node.getParentNode();
+		if (_removeNode) _removeNode.apply(view, arguments);
+		if (!node || !parentNode) return;
+		view.repairChkClass(setting, parentNode);
+		view.repairParentChkClass(setting, parentNode);
+	}
+
+	var _appendNodes = view.appendNodes;
+	view.appendNodes = function(setting, level, nodes, parentNode, initFlag, openFlag) {
+		var html = "";
+		if (_appendNodes) {
+			html = _appendNodes.apply(view, arguments);
+		}
+		if (parentNode) {
+			data.makeChkFlag(setting, parentNode);
+		}
+		return html;
+	}
+})(jQuery);
+/*
+ * JQuery zTree exedit v3.5.15
+ * http://zTree.me/
+ *
+ * Copyright (c) 2010 Hunter.z
+ *
+ * Licensed same as jquery - MIT License
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ * email: hunter.z@263.net
+ * Date: 2013-10-15
+ */
+(function($){
+	//default consts of exedit
+	var _consts = {
+		event: {
+			DRAG: "ztree_drag",
+			DROP: "ztree_drop",
+			REMOVE: "ztree_remove",
+			RENAME: "ztree_rename"
+		},
+		id: {
+			EDIT: "_edit",
+			INPUT: "_input",
+			REMOVE: "_remove"
+		},
+		move: {
+			TYPE_INNER: "inner",
+			TYPE_PREV: "prev",
+			TYPE_NEXT: "next"
+		},
+		node: {
+			CURSELECTED_EDIT: "curSelectedNode_Edit",
+			TMPTARGET_TREE: "tmpTargetzTree",
+			TMPTARGET_NODE: "tmpTargetNode"
+		}
+	},
+	//default setting of exedit
+	_setting = {
+		edit: {
+			enable: false,
+			editNameSelectAll: false,
+			showRemoveBtn: true,
+			showRenameBtn: true,
+			removeTitle: "remove",
+			renameTitle: "rename",
+			drag: {
+				autoExpandTrigger: false,
+				isCopy: true,
+				isMove: true,
+				prev: true,
+				next: true,
+				inner: true,
+				minMoveSize: 5,
+				borderMax: 10,
+				borderMin: -5,
+				maxShowNodeNum: 5,
+				autoOpenTime: 500
+			}
+		},
+		view: {
+			addHoverDom: null,
+			removeHoverDom: null
+		},
+		callback: {
+			beforeDrag:null,
+			beforeDragOpen:null,
+			beforeDrop:null,
+			beforeEditName:null,
+			beforeRename:null,
+			onDrag:null,
+			onDrop:null,
+			onRename:null
+		}
+	},
+	//default root of exedit
+	_initRoot = function (setting) {
+		var r = data.getRoot(setting), rs = data.getRoots();
+		r.curEditNode = null;
+		r.curEditInput = null;
+		r.curHoverNode = null;
+		r.dragFlag = 0;
+		r.dragNodeShowBefore = [];
+		r.dragMaskList = new Array();
+		rs.showHoverDom = true;
+	},
+	//default cache of exedit
+	_initCache = function(treeId) {},
+	//default bind event of exedit
+	_bindEvent = function(setting) {
+		var o = setting.treeObj;
+		var c = consts.event;
+		o.bind(c.RENAME, function (event, treeId, treeNode, isCancel) {
+			tools.apply(setting.callback.onRename, [event, treeId, treeNode, isCancel]);
+		});
+
+		o.bind(c.REMOVE, function (event, treeId, treeNode) {
+			tools.apply(setting.callback.onRemove, [event, treeId, treeNode]);
+		});
+
+		o.bind(c.DRAG, function (event, srcEvent, treeId, treeNodes) {
+			tools.apply(setting.callback.onDrag, [srcEvent, treeId, treeNodes]);
+		});
+
+		o.bind(c.DROP, function (event, srcEvent, treeId, treeNodes, targetNode, moveType, isCopy) {
+			tools.apply(setting.callback.onDrop, [srcEvent, treeId, treeNodes, targetNode, moveType, isCopy]);
+		});
+	},
+	_unbindEvent = function(setting) {
+		var o = setting.treeObj;
+		var c = consts.event;
+		o.unbind(c.RENAME);
+		o.unbind(c.REMOVE);
+		o.unbind(c.DRAG);
+		o.unbind(c.DROP);
+	},
+	//default event proxy of exedit
+	_eventProxy = function(e) {
+		var target = e.target,
+		setting = data.getSetting(e.data.treeId),
+		relatedTarget = e.relatedTarget,
+		tId = "", node = null,
+		nodeEventType = "", treeEventType = "",
+		nodeEventCallback = null, treeEventCallback = null,
+		tmp = null;
+
+		if (tools.eqs(e.type, "mouseover")) {
+			tmp = tools.getMDom(setting, target, [{tagName:"a", attrName:"treeNode"+consts.id.A}]);
+			if (tmp) {
+				tId = tools.getNodeMainDom(tmp).id;
+				nodeEventType = "hoverOverNode";
+			}
+		} else if (tools.eqs(e.type, "mouseout")) {
+			tmp = tools.getMDom(setting, relatedTarget, [{tagName:"a", attrName:"treeNode"+consts.id.A}]);
+			if (!tmp) {
+				tId = "remove";
+				nodeEventType = "hoverOutNode";
+			}
+		} else if (tools.eqs(e.type, "mousedown")) {
+			tmp = tools.getMDom(setting, target, [{tagName:"a", attrName:"treeNode"+consts.id.A}]);
+			if (tmp) {
+				tId = tools.getNodeMainDom(tmp).id;
+				nodeEventType = "mousedownNode";
+			}
+		}
+		if (tId.length>0) {
+			node = data.getNodeCache(setting, tId);
+			switch (nodeEventType) {
+				case "mousedownNode" :
+					nodeEventCallback = _handler.onMousedownNode;
+					break;
+				case "hoverOverNode" :
+					nodeEventCallback = _handler.onHoverOverNode;
+					break;
+				case "hoverOutNode" :
+					nodeEventCallback = _handler.onHoverOutNode;
+					break;
+			}
+		}
+		var proxyResult = {
+			stop: false,
+			node: node,
+			nodeEventType: nodeEventType,
+			nodeEventCallback: nodeEventCallback,
+			treeEventType: treeEventType,
+			treeEventCallback: treeEventCallback
+		};
+		return proxyResult
+	},
+	//default init node of exedit
+	_initNode = function(setting, level, n, parentNode, isFirstNode, isLastNode, openFlag) {
+		if (!n) return;
+		n.isHover = false;
+		n.editNameFlag = false;
+	},
+	//update zTreeObj, add method of edit
+	_zTreeTools = function(setting, zTreeTools) {
+		zTreeTools.cancelEditName = function(newName) {
+			var root = data.getRoot(setting);
+			if (!root.curEditNode) return;
+			view.cancelCurEditNode(setting, newName?newName:null, true);
+		}
+		zTreeTools.copyNode = function(targetNode, node, moveType, isSilent) {
+			if (!node) return null;
+			if (targetNode && !targetNode.isParent && setting.data.keep.leaf && moveType === consts.move.TYPE_INNER) return null;
+			var newNode = tools.clone(node);
+			if (!targetNode) {
+				targetNode = null;
+				moveType = consts.move.TYPE_INNER;
+			}
+			if (moveType == consts.move.TYPE_INNER) {
+				function copyCallback() {
+					view.addNodes(setting, targetNode, [newNode], isSilent);
+				}
+
+				if (tools.canAsync(setting, targetNode)) {
+					view.asyncNode(setting, targetNode, isSilent, copyCallback);
+				} else {
+					copyCallback();
+				}
+			} else {
+				view.addNodes(setting, targetNode.parentNode, [newNode], isSilent);
+				view.moveNode(setting, targetNode, newNode, moveType, false, isSilent);
+			}
+			return newNode;
+		}
+		zTreeTools.editName = function(node) {
+			if (!node || !node.tId || node !== data.getNodeCache(setting, node.tId)) return;
+			if (node.parentTId) view.expandCollapseParentNode(setting, node.getParentNode(), true);
+			view.editNode(setting, node)
+		}
+		zTreeTools.moveNode = function(targetNode, node, moveType, isSilent) {
+			if (!node) return node;
+			if (targetNode && !targetNode.isParent && setting.data.keep.leaf && moveType === consts.move.TYPE_INNER) {
+				return null;
+			} else if (targetNode && ((node.parentTId == targetNode.tId && moveType == consts.move.TYPE_INNER) || $$(node, setting).find("#" + targetNode.tId).length > 0)) {
+				return null;
+			} else if (!targetNode) {
+				targetNode = null;
+			}
+			function moveCallback() {
+				view.moveNode(setting, targetNode, node, moveType, false, isSilent);
+			}
+			if (tools.canAsync(setting, targetNode) && moveType === consts.move.TYPE_INNER) {
+				view.asyncNode(setting, targetNode, isSilent, moveCallback);
+			} else {
+				moveCallback();
+			}
+			return node;
+		}
+		zTreeTools.setEditable = function(editable) {
+			setting.edit.enable = editable;
+			return this.refresh();
+		}
+	},
+	//method of operate data
+	_data = {
+		setSonNodeLevel: function(setting, parentNode, node) {
+			if (!node) return;
+			var childKey = setting.data.key.children;
+			node.level = (parentNode)? parentNode.level + 1 : 0;
+			if (!node[childKey]) return;
+			for (var i = 0, l = node[childKey].length; i < l; i++) {
+				if (node[childKey][i]) data.setSonNodeLevel(setting, node, node[childKey][i]);
+			}
+		}
+	},
+	//method of event proxy
+	_event = {
+
+	},
+	//method of event handler
+	_handler = {
+		onHoverOverNode: function(event, node) {
+			var setting = data.getSetting(event.data.treeId),
+			root = data.getRoot(setting);
+			if (root.curHoverNode != node) {
+				_handler.onHoverOutNode(event);
+			}
+			root.curHoverNode = node;
+			view.addHoverDom(setting, node);
+		},
+		onHoverOutNode: function(event, node) {
+			var setting = data.getSetting(event.data.treeId),
+			root = data.getRoot(setting);
+			if (root.curHoverNode && !data.isSelectedNode(setting, root.curHoverNode)) {
+				view.removeTreeDom(setting, root.curHoverNode);
+				root.curHoverNode = null;
+			}
+		},
+		onMousedownNode: function(eventMouseDown, _node) {
+			var i,l,
+			setting = data.getSetting(eventMouseDown.data.treeId),
+			root = data.getRoot(setting), roots = data.getRoots();
+			//right click can't drag & drop
+			if (eventMouseDown.button == 2 || !setting.edit.enable || (!setting.edit.drag.isCopy && !setting.edit.drag.isMove)) return true;
+
+			//input of edit node name can't drag & drop
+			var target = eventMouseDown.target,
+			_nodes = data.getRoot(setting).curSelectedList,
+			nodes = [];
+			if (!data.isSelectedNode(setting, _node)) {
+				nodes = [_node];
+			} else {
+				for (i=0, l=_nodes.length; i<l; i++) {
+					if (_nodes[i].editNameFlag && tools.eqs(target.tagName, "input") && target.getAttribute("treeNode"+consts.id.INPUT) !== null) {
+						return true;
+					}
+					nodes.push(_nodes[i]);
+					if (nodes[0].parentTId !== _nodes[i].parentTId) {
+						nodes = [_node];
+						break;
+					}
+				}
+			}
+
+			view.editNodeBlur = true;
+			view.cancelCurEditNode(setting);
+
+			var doc = $(setting.treeObj.get(0).ownerDocument),
+			body = $(setting.treeObj.get(0).ownerDocument.body), curNode, tmpArrow, tmpTarget,
+			isOtherTree = false,
+			targetSetting = setting,
+			sourceSetting = setting,
+			preNode, nextNode,
+			preTmpTargetNodeId = null,
+			preTmpMoveType = null,
+			tmpTargetNodeId = null,
+			moveType = consts.move.TYPE_INNER,
+			mouseDownX = eventMouseDown.clientX,
+			mouseDownY = eventMouseDown.clientY,
+			startTime = (new Date()).getTime();
+
+			if (tools.uCanDo(setting)) {
+				doc.bind("mousemove", _docMouseMove);
+			}
+			function _docMouseMove(event) {
+				//avoid start drag after click node
+				if (root.dragFlag == 0 && Math.abs(mouseDownX - event.clientX) < setting.edit.drag.minMoveSize
+					&& Math.abs(mouseDownY - event.clientY) < setting.edit.drag.minMoveSize) {
+					return true;
+				}
+				var i, l, tmpNode, tmpDom, tmpNodes,
+				childKey = setting.data.key.children;
+				body.css("cursor", "pointer");
+
+				if (root.dragFlag == 0) {
+					if (tools.apply(setting.callback.beforeDrag, [setting.treeId, nodes], true) == false) {
+						_docMouseUp(event);
+						return true;
+					}
+
+					for (i=0, l=nodes.length; i<l; i++) {
+						if (i==0) {
+							root.dragNodeShowBefore = [];
+						}
+						tmpNode = nodes[i];
+						if (tmpNode.isParent && tmpNode.open) {
+							view.expandCollapseNode(setting, tmpNode, !tmpNode.open);
+							root.dragNodeShowBefore[tmpNode.tId] = true;
+						} else {
+							root.dragNodeShowBefore[tmpNode.tId] = false;
+						}
+					}
+
+					root.dragFlag = 1;
+					roots.showHoverDom = false;
+					tools.showIfameMask(setting, true);
+
+					//sort
+					var isOrder = true, lastIndex = -1;
+					if (nodes.length>1) {
+						var pNodes = nodes[0].parentTId ? nodes[0].getParentNode()[childKey] : data.getNodes(setting);
+						tmpNodes = [];
+						for (i=0, l=pNodes.length; i<l; i++) {
+							if (root.dragNodeShowBefore[pNodes[i].tId] !== undefined) {
+								if (isOrder && lastIndex > -1 && (lastIndex+1) !== i) {
+									isOrder = false;
+								}
+								tmpNodes.push(pNodes[i]);
+								lastIndex = i;
+							}
+							if (nodes.length === tmpNodes.length) {
+								nodes = tmpNodes;
+								break;
+							}
+						}
+					}
+					if (isOrder) {
+						preNode = nodes[0].getPreNode();
+						nextNode = nodes[nodes.length-1].getNextNode();
+					}
+
+					//set node in selected
+					curNode = $$("<ul class='zTreeDragUL'></ul>", setting);
+					for (i=0, l=nodes.length; i<l; i++) {
+						tmpNode = nodes[i];
+						tmpNode.editNameFlag = false;
+						view.selectNode(setting, tmpNode, i>0);
+						view.removeTreeDom(setting, tmpNode);
+
+						tmpDom = $$("<li id='"+ tmpNode.tId +"_tmp'></li>", setting);
+						tmpDom.append($$(tmpNode, consts.id.A, setting).clone());
+						tmpDom.css("padding", "0");
+						tmpDom.children("#" + tmpNode.tId + consts.id.A).removeClass(consts.node.CURSELECTED);
+						curNode.append(tmpDom);
+						if (i == setting.edit.drag.maxShowNodeNum-1) {
+							tmpDom = $$("<li id='"+ tmpNode.tId +"_moretmp'><a>  ...  </a></li>", setting);
+							curNode.append(tmpDom);
+							break;
+						}
+					}
+					curNode.attr("id", nodes[0].tId + consts.id.UL + "_tmp");
+					curNode.addClass(setting.treeObj.attr("class"));
+					curNode.appendTo(body);
+
+					tmpArrow = $$("<span class='tmpzTreeMove_arrow'></span>", setting);
+					tmpArrow.attr("id", "zTreeMove_arrow_tmp");
+					tmpArrow.appendTo(body);
+
+					setting.treeObj.trigger(consts.event.DRAG, [event, setting.treeId, nodes]);
+				}
+
+				if (root.dragFlag == 1) {
+					if (tmpTarget && tmpArrow.attr("id") == event.target.id && tmpTargetNodeId && (event.clientX + doc.scrollLeft()+2) > ($("#" + tmpTargetNodeId + consts.id.A, tmpTarget).offset().left)) {
+						var xT = $("#" + tmpTargetNodeId + consts.id.A, tmpTarget);
+						event.target = (xT.length > 0) ? xT.get(0) : event.target;
+					} else if (tmpTarget) {
+						tmpTarget.removeClass(consts.node.TMPTARGET_TREE);
+						if (tmpTargetNodeId) $("#" + tmpTargetNodeId + consts.id.A, tmpTarget).removeClass(consts.node.TMPTARGET_NODE + "_" + consts.move.TYPE_PREV)
+							.removeClass(consts.node.TMPTARGET_NODE + "_" + _consts.move.TYPE_NEXT).removeClass(consts.node.TMPTARGET_NODE + "_" + _consts.move.TYPE_INNER);
+					}
+					tmpTarget = null;
+					tmpTargetNodeId = null;
+
+					//judge drag & drop in multi ztree
+					isOtherTree = false;
+					targetSetting = setting;
+					var settings = data.getSettings();
+					for (var s in settings) {
+						if (settings[s].treeId && settings[s].edit.enable && settings[s].treeId != setting.treeId
+							&& (event.target.id == settings[s].treeId || $(event.target).parents("#" + settings[s].treeId).length>0)) {
+							isOtherTree = true;
+							targetSetting = settings[s];
+						}
+					}
+
+					var docScrollTop = doc.scrollTop(),
+					docScrollLeft = doc.scrollLeft(),
+					treeOffset = targetSetting.treeObj.offset(),
+					scrollHeight = targetSetting.treeObj.get(0).scrollHeight,
+					scrollWidth = targetSetting.treeObj.get(0).scrollWidth,
+					dTop = (event.clientY + docScrollTop - treeOffset.top),
+					dBottom = (targetSetting.treeObj.height() + treeOffset.top - event.clientY - docScrollTop),
+					dLeft = (event.clientX + docScrollLeft - treeOffset.left),
+					dRight = (targetSetting.treeObj.width() + treeOffset.left - event.clientX - docScrollLeft),
+					isTop = (dTop < setting.edit.drag.borderMax && dTop > setting.edit.drag.borderMin),
+					isBottom = (dBottom < setting.edit.drag.borderMax && dBottom > setting.edit.drag.borderMin),
+					isLeft = (dLeft < setting.edit.drag.borderMax && dLeft > setting.edit.drag.borderMin),
+					isRight = (dRight < setting.edit.drag.borderMax && dRight > setting.edit.drag.borderMin),
+					isTreeInner = dTop > setting.edit.drag.borderMin && dBottom > setting.edit.drag.borderMin && dLeft > setting.edit.drag.borderMin && dRight > setting.edit.drag.borderMin,
+					isTreeTop = (isTop && targetSetting.treeObj.scrollTop() <= 0),
+					isTreeBottom = (isBottom && (targetSetting.treeObj.scrollTop() + targetSetting.treeObj.height()+10) >= scrollHeight),
+					isTreeLeft = (isLeft && targetSetting.treeObj.scrollLeft() <= 0),
+					isTreeRight = (isRight && (targetSetting.treeObj.scrollLeft() + targetSetting.treeObj.width()+10) >= scrollWidth);
+
+					if (event.target && tools.isChildOrSelf(event.target, targetSetting.treeId)) {
+						//get node <li> dom
+						var targetObj = event.target;
+						while (targetObj && targetObj.tagName && !tools.eqs(targetObj.tagName, "li") && targetObj.id != targetSetting.treeId) {
+							targetObj = targetObj.parentNode;
+						}
+
+						var canMove = true;
+						//don't move to self or children of self
+						for (i=0, l=nodes.length; i<l; i++) {
+							tmpNode = nodes[i];
+							if (targetObj.id === tmpNode.tId) {
+								canMove = false;
+								break;
+							} else if ($$(tmpNode, setting).find("#" + targetObj.id).length > 0) {
+								canMove = false;
+								break;
+							}
+						}
+						if (canMove && event.target && tools.isChildOrSelf(event.target, targetObj.id + consts.id.A)) {
+							tmpTarget = $(targetObj);
+							tmpTargetNodeId = targetObj.id;
+						}
+					}
+
+					//the mouse must be in zTree
+					tmpNode = nodes[0];
+					if (isTreeInner && tools.isChildOrSelf(event.target, targetSetting.treeId)) {
+						//judge mouse move in root of ztree
+						if (!tmpTarget && (event.target.id == targetSetting.treeId || isTreeTop || isTreeBottom || isTreeLeft || isTreeRight) && (isOtherTree || (!isOtherTree && tmpNode.parentTId))) {
+							tmpTarget = targetSetting.treeObj;
+						}
+						//auto scroll top
+						if (isTop) {
+							targetSetting.treeObj.scrollTop(targetSetting.treeObj.scrollTop()-10);
+						} else if (isBottom)  {
+							targetSetting.treeObj.scrollTop(targetSetting.treeObj.scrollTop()+10);
+						}
+						if (isLeft) {
+							targetSetting.treeObj.scrollLeft(targetSetting.treeObj.scrollLeft()-10);
+						} else if (isRight) {
+							targetSetting.treeObj.scrollLeft(targetSetting.treeObj.scrollLeft()+10);
+						}
+						//auto scroll left
+						if (tmpTarget && tmpTarget != targetSetting.treeObj && tmpTarget.offset().left < targetSetting.treeObj.offset().left) {
+							targetSetting.treeObj.scrollLeft(targetSetting.treeObj.scrollLeft()+ tmpTarget.offset().left - targetSetting.treeObj.offset().left);
+						}
+					}
+
+					curNode.css({
+						"top": (event.clientY + docScrollTop + 3) + "px",
+						"left": (event.clientX + docScrollLeft + 3) + "px"
+					});
+
+					var dX = 0;
+					var dY = 0;
+					if (tmpTarget && tmpTarget.attr("id")!=targetSetting.treeId) {
+						var tmpTargetNode = tmpTargetNodeId == null ? null: data.getNodeCache(targetSetting, tmpTargetNodeId),
+						isCopy = (event.ctrlKey && setting.edit.drag.isMove && setting.edit.drag.isCopy) || (!setting.edit.drag.isMove && setting.edit.drag.isCopy),
+						isPrev = !!(preNode && tmpTargetNodeId === preNode.tId),
+						isNext = !!(nextNode && tmpTargetNodeId === nextNode.tId),
+						isInner = (tmpNode.parentTId && tmpNode.parentTId == tmpTargetNodeId),
+						canPrev = (isCopy || !isNext) && tools.apply(targetSetting.edit.drag.prev, [targetSetting.treeId, nodes, tmpTargetNode], !!targetSetting.edit.drag.prev),
+						canNext = (isCopy || !isPrev) && tools.apply(targetSetting.edit.drag.next, [targetSetting.treeId, nodes, tmpTargetNode], !!targetSetting.edit.drag.next),
+						canInner = (isCopy || !isInner) && !(targetSetting.data.keep.leaf && !tmpTargetNode.isParent) && tools.apply(targetSetting.edit.drag.inner, [targetSetting.treeId, nodes, tmpTargetNode], !!targetSetting.edit.drag.inner);
+						if (!canPrev && !canNext && !canInner) {
+							tmpTarget = null;
+							tmpTargetNodeId = "";
+							moveType = consts.move.TYPE_INNER;
+							tmpArrow.css({
+								"display":"none"
+							});
+							if (window.zTreeMoveTimer) {
+								clearTimeout(window.zTreeMoveTimer);
+								window.zTreeMoveTargetNodeTId = null
+							}
+						} else {
+							var tmpTargetA = $("#" + tmpTargetNodeId + consts.id.A, tmpTarget),
+							tmpNextA = tmpTargetNode.isLastNode ? null : $("#" + tmpTargetNode.getNextNode().tId + consts.id.A, tmpTarget.next()),
+							tmpTop = tmpTargetA.offset().top,
+							tmpLeft = tmpTargetA.offset().left,
+							prevPercent = canPrev ? (canInner ? 0.25 : (canNext ? 0.5 : 1) ) : -1,
+							nextPercent = canNext ? (canInner ? 0.75 : (canPrev ? 0.5 : 0) ) : -1,
+							dY_percent = (event.clientY + docScrollTop - tmpTop)/tmpTargetA.height();
+							if ((prevPercent==1 ||dY_percent<=prevPercent && dY_percent>=-.2) && canPrev) {
+								dX = 1 - tmpArrow.width();
+								dY = tmpTop - tmpArrow.height()/2;
+								moveType = consts.move.TYPE_PREV;
+							} else if ((nextPercent==0 || dY_percent>=nextPercent && dY_percent<=1.2) && canNext) {
+								dX = 1 - tmpArrow.width();
+								dY = (tmpNextA == null || (tmpTargetNode.isParent && tmpTargetNode.open)) ? (tmpTop + tmpTargetA.height() - tmpArrow.height()/2) : (tmpNextA.offset().top - tmpArrow.height()/2);
+								moveType = consts.move.TYPE_NEXT;
+							}else {
+								dX = 5 - tmpArrow.width();
+								dY = tmpTop;
+								moveType = consts.move.TYPE_INNER;
+							}
+							tmpArrow.css({
+								"display":"block",
+								"top": dY + "px",
+								"left": (tmpLeft + dX) + "px"
+							});
+							tmpTargetA.addClass(consts.node.TMPTARGET_NODE + "_" + moveType);
+
+							if (preTmpTargetNodeId != tmpTargetNodeId || preTmpMoveType != moveType) {
+								startTime = (new Date()).getTime();
+							}
+							if (tmpTargetNode && tmpTargetNode.isParent && moveType == consts.move.TYPE_INNER) {
+								var startTimer = true;
+								if (window.zTreeMoveTimer && window.zTreeMoveTargetNodeTId !== tmpTargetNode.tId) {
+									clearTimeout(window.zTreeMoveTimer);
+									window.zTreeMoveTargetNodeTId = null;
+								}else if (window.zTreeMoveTimer && window.zTreeMoveTargetNodeTId === tmpTargetNode.tId) {
+									startTimer = false;
+								}
+								if (startTimer) {
+									window.zTreeMoveTimer = setTimeout(function() {
+										if (moveType != consts.move.TYPE_INNER) return;
+										if (tmpTargetNode && tmpTargetNode.isParent && !tmpTargetNode.open && (new Date()).getTime() - startTime > targetSetting.edit.drag.autoOpenTime
+											&& tools.apply(targetSetting.callback.beforeDragOpen, [targetSetting.treeId, tmpTargetNode], true)) {
+											view.switchNode(targetSetting, tmpTargetNode);
+											if (targetSetting.edit.drag.autoExpandTrigger) {
+												targetSetting.treeObj.trigger(consts.event.EXPAND, [targetSetting.treeId, tmpTargetNode]);
+											}
+										}
+									}, targetSetting.edit.drag.autoOpenTime+50);
+									window.zTreeMoveTargetNodeTId = tmpTargetNode.tId;
+								}
+							}
+						}
+					} else {
+						moveType = consts.move.TYPE_INNER;
+						if (tmpTarget && tools.apply(targetSetting.edit.drag.inner, [targetSetting.treeId, nodes, null], !!targetSetting.edit.drag.inner)) {
+							tmpTarget.addClass(consts.node.TMPTARGET_TREE);
+						} else {
+							tmpTarget = null;
+						}
+						tmpArrow.css({
+							"display":"none"
+						});
+						if (window.zTreeMoveTimer) {
+							clearTimeout(window.zTreeMoveTimer);
+							window.zTreeMoveTargetNodeTId = null;
+						}
+					}
+					preTmpTargetNodeId = tmpTargetNodeId;
+					preTmpMoveType = moveType;
+				}
+				return false;
+			}
+
+			doc.bind("mouseup", _docMouseUp);
+			function _docMouseUp(event) {
+				if (window.zTreeMoveTimer) {
+					clearTimeout(window.zTreeMoveTimer);
+					window.zTreeMoveTargetNodeTId = null;
+				}
+				preTmpTargetNodeId = null;
+				preTmpMoveType = null;
+				doc.unbind("mousemove", _docMouseMove);
+				doc.unbind("mouseup", _docMouseUp);
+				doc.unbind("selectstart", _docSelect);
+				body.css("cursor", "auto");
+				if (tmpTarget) {
+					tmpTarget.removeClass(consts.node.TMPTARGET_TREE);
+					if (tmpTargetNodeId) $("#" + tmpTargetNodeId + consts.id.A, tmpTarget).removeClass(consts.node.TMPTARGET_NODE + "_" + consts.move.TYPE_PREV)
+							.removeClass(consts.node.TMPTARGET_NODE + "_" + _consts.move.TYPE_NEXT).removeClass(consts.node.TMPTARGET_NODE + "_" + _consts.move.TYPE_INNER);
+				}
+				tools.showIfameMask(setting, false);
+
+				roots.showHoverDom = true;
+				if (root.dragFlag == 0) return;
+				root.dragFlag = 0;
+
+				var i, l, tmpNode;
+				for (i=0, l=nodes.length; i<l; i++) {
+					tmpNode = nodes[i];
+					if (tmpNode.isParent && root.dragNodeShowBefore[tmpNode.tId] && !tmpNode.open) {
+						view.expandCollapseNode(setting, tmpNode, !tmpNode.open);
+						delete root.dragNodeShowBefore[tmpNode.tId];
+					}
+				}
+
+				if (curNode) curNode.remove();
+				if (tmpArrow) tmpArrow.remove();
+
+				var isCopy = (event.ctrlKey && setting.edit.drag.isMove && setting.edit.drag.isCopy) || (!setting.edit.drag.isMove && setting.edit.drag.isCopy);
+				if (!isCopy && tmpTarget && tmpTargetNodeId && nodes[0].parentTId && tmpTargetNodeId==nodes[0].parentTId && moveType == consts.move.TYPE_INNER) {
+					tmpTarget = null;
+				}
+				if (tmpTarget) {
+					var dragTargetNode = tmpTargetNodeId == null ? null: data.getNodeCache(targetSetting, tmpTargetNodeId);
+					if (tools.apply(setting.callback.beforeDrop, [targetSetting.treeId, nodes, dragTargetNode, moveType, isCopy], true) == false) {
+						view.selectNodes(sourceSetting, nodes);
+						return;
+					}
+					var newNodes = isCopy ? tools.clone(nodes) : nodes;
+
+					function dropCallback() {
+						if (isOtherTree) {
+							if (!isCopy) {
+								for(var i=0, l=nodes.length; i<l; i++) {
+									view.removeNode(setting, nodes[i]);
+								}
+							}
+							if (moveType == consts.move.TYPE_INNER) {
+								view.addNodes(targetSetting, dragTargetNode, newNodes);
+							} else {
+								view.addNodes(targetSetting, dragTargetNode.getParentNode(), newNodes);
+								if (moveType == consts.move.TYPE_PREV) {
+									for (i=0, l=newNodes.length; i<l; i++) {
+										view.moveNode(targetSetting, dragTargetNode, newNodes[i], moveType, false);
+									}
+								} else {
+									for (i=-1, l=newNodes.length-1; i<l; l--) {
+										view.moveNode(targetSetting, dragTargetNode, newNodes[l], moveType, false);
+									}
+								}
+							}
+						} else {
+							if (isCopy && moveType == consts.move.TYPE_INNER) {
+								view.addNodes(targetSetting, dragTargetNode, newNodes);
+							} else {
+								if (isCopy) {
+									view.addNodes(targetSetting, dragTargetNode.getParentNode(), newNodes);
+								}
+								if (moveType != consts.move.TYPE_NEXT) {
+									for (i=0, l=newNodes.length; i<l; i++) {
+										view.moveNode(targetSetting, dragTargetNode, newNodes[i], moveType, false);
+									}
+								} else {
+									for (i=-1, l=newNodes.length-1; i<l; l--) {
+										view.moveNode(targetSetting, dragTargetNode, newNodes[l], moveType, false);
+									}
+								}
+							}
+						}
+						view.selectNodes(targetSetting, newNodes);
+						$$(newNodes[0], setting).focus().blur();
+
+						setting.treeObj.trigger(consts.event.DROP, [event, targetSetting.treeId, newNodes, dragTargetNode, moveType, isCopy]);
+					}
+
+					if (moveType == consts.move.TYPE_INNER && tools.canAsync(targetSetting, dragTargetNode)) {
+						view.asyncNode(targetSetting, dragTargetNode, false, dropCallback);
+					} else {
+						dropCallback();
+					}
+
+				} else {
+					view.selectNodes(sourceSetting, nodes);
+					setting.treeObj.trigger(consts.event.DROP, [event, setting.treeId, nodes, null, null, null]);
+				}
+			}
+
+			doc.bind("selectstart", _docSelect);
+			function _docSelect() {
+				return false;
+			}
+
+			//Avoid FireFox's Bug
+			//If zTree Div CSS set 'overflow', so drag node outside of zTree, and event.target is error.
+			if(eventMouseDown.preventDefault) {
+				eventMouseDown.preventDefault();
+			}
+			return true;
+		}
+	},
+	//method of tools for zTree
+	_tools = {
+		getAbs: function (obj) {
+			var oRect = obj.getBoundingClientRect(),
+			scrollTop = document.body.scrollTop+document.documentElement.scrollTop,
+			scrollLeft = document.body.scrollLeft+document.documentElement.scrollLeft;
+			return [oRect.left+scrollLeft,oRect.top+scrollTop];
+		},
+		inputFocus: function(inputObj) {
+			if (inputObj.get(0)) {
+				inputObj.focus();
+				tools.setCursorPosition(inputObj.get(0), inputObj.val().length);
+			}
+		},
+		inputSelect: function(inputObj) {
+			if (inputObj.get(0)) {
+				inputObj.focus();
+				inputObj.select();
+			}
+		},
+		setCursorPosition: function(obj, pos){
+			if(obj.setSelectionRange) {
+				obj.focus();
+				obj.setSelectionRange(pos,pos);
+			} else if (obj.createTextRange) {
+				var range = obj.createTextRange();
+				range.collapse(true);
+				range.moveEnd('character', pos);
+				range.moveStart('character', pos);
+				range.select();
+			}
+		},
+		showIfameMask: function(setting, showSign) {
+			var root = data.getRoot(setting);
+			//clear full mask
+			while (root.dragMaskList.length > 0) {
+				root.dragMaskList[0].remove();
+				root.dragMaskList.shift();
+			}
+			if (showSign) {
+				//show mask
+				var iframeList = $$("iframe", setting);
+				for (var i = 0, l = iframeList.length; i < l; i++) {
+					var obj = iframeList.get(i),
+					r = tools.getAbs(obj),
+					dragMask = $$("<div id='zTreeMask_" + i + "' class='zTreeMask' style='top:" + r[1] + "px; left:" + r[0] + "px; width:" + obj.offsetWidth + "px; height:" + obj.offsetHeight + "px;'></div>", setting);
+					dragMask.appendTo($$("body", setting));
+					root.dragMaskList.push(dragMask);
+				}
+			}
+		}
+	},
+	//method of operate ztree dom
+	_view = {
+		addEditBtn: function(setting, node) {
+			if (node.editNameFlag || $$(node, consts.id.EDIT, setting).length > 0) {
+				return;
+			}
+			if (!tools.apply(setting.edit.showRenameBtn, [setting.treeId, node], setting.edit.showRenameBtn)) {
+				return;
+			}
+			var aObj = $$(node, consts.id.A, setting),
+			editStr = "<span class='" + consts.className.BUTTON + " edit' id='" + node.tId + consts.id.EDIT + "' title='"+tools.apply(setting.edit.renameTitle, [setting.treeId, node], setting.edit.renameTitle)+"' treeNode"+consts.id.EDIT+" style='display:none;'></span>";
+			aObj.append(editStr);
+
+			$$(node, consts.id.EDIT, setting).bind('click',
+				function() {
+					if (!tools.uCanDo(setting) || tools.apply(setting.callback.beforeEditName, [setting.treeId, node], true) == false) return false;
+					view.editNode(setting, node);
+					return false;
+				}
+				).show();
+		},
+		addRemoveBtn: function(setting, node) {
+			if (node.editNameFlag || $$(node, consts.id.REMOVE, setting).length > 0) {
+				return;
+			}
+			if (!tools.apply(setting.edit.showRemoveBtn, [setting.treeId, node], setting.edit.showRemoveBtn)) {
+				return;
+			}
+			var aObj = $$(node, consts.id.A, setting),
+			removeStr = "<span class='" + consts.className.BUTTON + " remove' id='" + node.tId + consts.id.REMOVE + "' title='"+tools.apply(setting.edit.removeTitle, [setting.treeId, node], setting.edit.removeTitle)+"' treeNode"+consts.id.REMOVE+" style='display:none;'></span>";
+			aObj.append(removeStr);
+
+			$$(node, consts.id.REMOVE, setting).bind('click',
+				function() {
+					if (!tools.uCanDo(setting) || tools.apply(setting.callback.beforeRemove, [setting.treeId, node], true) == false) return false;
+					view.removeNode(setting, node);
+					setting.treeObj.trigger(consts.event.REMOVE, [setting.treeId, node]);
+					return false;
+				}
+				).bind('mousedown',
+				function(eventMouseDown) {
+					return true;
+				}
+				).show();
+		},
+		addHoverDom: function(setting, node) {
+			if (data.getRoots().showHoverDom) {
+				node.isHover = true;
+				if (setting.edit.enable) {
+					view.addEditBtn(setting, node);
+					view.addRemoveBtn(setting, node);
+				}
+				tools.apply(setting.view.addHoverDom, [setting.treeId, node]);
+			}
+		},
+		cancelCurEditNode: function (setting, forceName, isCancel) {
+			var root = data.getRoot(setting),
+			nameKey = setting.data.key.name,
+			node = root.curEditNode;
+
+			if (node) {
+				var inputObj = root.curEditInput,
+				newName = forceName ? forceName:(isCancel ? node[nameKey]: inputObj.val());
+				if (tools.apply(setting.callback.beforeRename, [setting.treeId, node, newName, isCancel], true) === false) {
+					return false;
+				} else {
+					node[nameKey] = newName;
+					setting.treeObj.trigger(consts.event.RENAME, [setting.treeId, node, isCancel]);
+				}
+				var aObj = $$(node, consts.id.A, setting);
+				aObj.removeClass(consts.node.CURSELECTED_EDIT);
+				inputObj.unbind();
+				view.setNodeName(setting, node);
+				node.editNameFlag = false;
+				root.curEditNode = null;
+				root.curEditInput = null;
+				view.selectNode(setting, node, false);
+			}
+			root.noSelection = true;
+			return true;
+		},
+		editNode: function(setting, node) {
+			var root = data.getRoot(setting);
+			view.editNodeBlur = false;
+			if (data.isSelectedNode(setting, node) && root.curEditNode == node && node.editNameFlag) {
+				setTimeout(function() {tools.inputFocus(root.curEditInput);}, 0);
+				return;
+			}
+			var nameKey = setting.data.key.name;
+			node.editNameFlag = true;
+			view.removeTreeDom(setting, node);
+			view.cancelCurEditNode(setting);
+			view.selectNode(setting, node, false);
+			$$(node, consts.id.SPAN, setting).html("<input type=text class='rename' id='" + node.tId + consts.id.INPUT + "' treeNode" + consts.id.INPUT + " >");
+			var inputObj = $$(node, consts.id.INPUT, setting);
+			inputObj.attr("value", node[nameKey]);
+			if (setting.edit.editNameSelectAll) {
+				tools.inputSelect(inputObj);
+			} else {
+				tools.inputFocus(inputObj);
+			}
+
+			inputObj.bind('blur', function(event) {
+				if (!view.editNodeBlur) {
+					view.cancelCurEditNode(setting);
+				}
+			}).bind('keydown', function(event) {
+				if (event.keyCode=="13") {
+					view.editNodeBlur = true;
+					view.cancelCurEditNode(setting);
+				} else if (event.keyCode=="27") {
+					view.cancelCurEditNode(setting, null, true);
+				}
+			}).bind('click', function(event) {
+				return false;
+			}).bind('dblclick', function(event) {
+				return false;
+			});
+
+			$$(node, consts.id.A, setting).addClass(consts.node.CURSELECTED_EDIT);
+			root.curEditInput = inputObj;
+			root.noSelection = false;
+			root.curEditNode = node;
+		},
+		moveNode: function(setting, targetNode, node, moveType, animateFlag, isSilent) {
+			var root = data.getRoot(setting),
+			childKey = setting.data.key.children;
+			if (targetNode == node) return;
+			if (setting.data.keep.leaf && targetNode && !targetNode.isParent && moveType == consts.move.TYPE_INNER) return;
+			var oldParentNode = (node.parentTId ? node.getParentNode(): root),
+			targetNodeIsRoot = (targetNode === null || targetNode == root);
+			if (targetNodeIsRoot && targetNode === null) targetNode = root;
+			if (targetNodeIsRoot) moveType = consts.move.TYPE_INNER;
+			var targetParentNode = (targetNode.parentTId ? targetNode.getParentNode() : root);
+
+			if (moveType != consts.move.TYPE_PREV && moveType != consts.move.TYPE_NEXT) {
+				moveType = consts.move.TYPE_INNER;
+			}
+
+			if (moveType == consts.move.TYPE_INNER) {
+				if (targetNodeIsRoot) {
+					//parentTId of root node is null
+					node.parentTId = null;
+				} else {
+					if (!targetNode.isParent) {
+						targetNode.isParent = true;
+						targetNode.open = !!targetNode.open;
+						view.setNodeLineIcos(setting, targetNode);
+					}
+					node.parentTId = targetNode.tId;
+				}
+			}
+
+			//move node Dom
+			var targetObj, target_ulObj;
+			if (targetNodeIsRoot) {
+				targetObj = setting.treeObj;
+				target_ulObj = targetObj;
+			} else {
+				if (!isSilent && moveType == consts.move.TYPE_INNER) {
+					view.expandCollapseNode(setting, targetNode, true, false);
+				} else if (!isSilent) {
+					view.expandCollapseNode(setting, targetNode.getParentNode(), true, false);
+				}
+				targetObj = $$(targetNode, setting);
+				target_ulObj = $$(targetNode, consts.id.UL, setting);
+				if (!!targetObj.get(0) && !target_ulObj.get(0)) {
+					var ulstr = [];
+					view.makeUlHtml(setting, targetNode, ulstr, '');
+					targetObj.append(ulstr.join(''));
+				}
+				target_ulObj = $$(targetNode, consts.id.UL, setting);
+			}
+			var nodeDom = $$(node, setting);
+			if (!nodeDom.get(0)) {
+				nodeDom = view.appendNodes(setting, node.level, [node], null, false, true).join('');
+			} else if (!targetObj.get(0)) {
+				nodeDom.remove();
+			}
+			if (target_ulObj.get(0) && moveType == consts.move.TYPE_INNER) {
+				target_ulObj.append(nodeDom);
+			} else if (targetObj.get(0) && moveType == consts.move.TYPE_PREV) {
+				targetObj.before(nodeDom);
+			} else if (targetObj.get(0) && moveType == consts.move.TYPE_NEXT) {
+				targetObj.after(nodeDom);
+			}
+
+			//repair the data after move
+			var i,l,
+			tmpSrcIndex = -1,
+			tmpTargetIndex = 0,
+			oldNeighbor = null,
+			newNeighbor = null,
+			oldLevel = node.level;
+			if (node.isFirstNode) {
+				tmpSrcIndex = 0;
+				if (oldParentNode[childKey].length > 1 ) {
+					oldNeighbor = oldParentNode[childKey][1];
+					oldNeighbor.isFirstNode = true;
+				}
+			} else if (node.isLastNode) {
+				tmpSrcIndex = oldParentNode[childKey].length -1;
+				oldNeighbor = oldParentNode[childKey][tmpSrcIndex - 1];
+				oldNeighbor.isLastNode = true;
+			} else {
+				for (i = 0, l = oldParentNode[childKey].length; i < l; i++) {
+					if (oldParentNode[childKey][i].tId == node.tId) {
+						tmpSrcIndex = i;
+						break;
+					}
+				}
+			}
+			if (tmpSrcIndex >= 0) {
+				oldParentNode[childKey].splice(tmpSrcIndex, 1);
+			}
+			if (moveType != consts.move.TYPE_INNER) {
+				for (i = 0, l = targetParentNode[childKey].length; i < l; i++) {
+					if (targetParentNode[childKey][i].tId == targetNode.tId) tmpTargetIndex = i;
+				}
+			}
+			if (moveType == consts.move.TYPE_INNER) {
+				if (!targetNode[childKey]) targetNode[childKey] = new Array();
+				if (targetNode[childKey].length > 0) {
+					newNeighbor = targetNode[childKey][targetNode[childKey].length - 1];
+					newNeighbor.isLastNode = false;
+				}
+				targetNode[childKey].splice(targetNode[childKey].length, 0, node);
+				node.isLastNode = true;
+				node.isFirstNode = (targetNode[childKey].length == 1);
+			} else if (targetNode.isFirstNode && moveType == consts.move.TYPE_PREV) {
+				targetParentNode[childKey].splice(tmpTargetIndex, 0, node);
+				newNeighbor = targetNode;
+				newNeighbor.isFirstNode = false;
+				node.parentTId = targetNode.parentTId;
+				node.isFirstNode = true;
+				node.isLastNode = false;
+
+			} else if (targetNode.isLastNode && moveType == consts.move.TYPE_NEXT) {
+				targetParentNode[childKey].splice(tmpTargetIndex + 1, 0, node);
+				newNeighbor = targetNode;
+				newNeighbor.isLastNode = false;
+				node.parentTId = targetNode.parentTId;
+				node.isFirstNode = false;
+				node.isLastNode = true;
+
+			} else {
+				if (moveType == consts.move.TYPE_PREV) {
+					targetParentNode[childKey].splice(tmpTargetIndex, 0, node);
+				} else {
+					targetParentNode[childKey].splice(tmpTargetIndex + 1, 0, node);
+				}
+				node.parentTId = targetNode.parentTId;
+				node.isFirstNode = false;
+				node.isLastNode = false;
+			}
+			data.fixPIdKeyValue(setting, node);
+			data.setSonNodeLevel(setting, node.getParentNode(), node);
+
+			//repair node what been moved
+			view.setNodeLineIcos(setting, node);
+			view.repairNodeLevelClass(setting, node, oldLevel)
+
+			//repair node's old parentNode dom
+			if (!setting.data.keep.parent && oldParentNode[childKey].length < 1) {
+				//old parentNode has no child nodes
+				oldParentNode.isParent = false;
+				oldParentNode.open = false;
+				var tmp_ulObj = $$(oldParentNode, consts.id.UL, setting),
+				tmp_switchObj = $$(oldParentNode, consts.id.SWITCH, setting),
+				tmp_icoObj = $$(oldParentNode, consts.id.ICON, setting);
+				view.replaceSwitchClass(oldParentNode, tmp_switchObj, consts.folder.DOCU);
+				view.replaceIcoClass(oldParentNode, tmp_icoObj, consts.folder.DOCU);
+				tmp_ulObj.css("display", "none");
+
+			} else if (oldNeighbor) {
+				//old neigbor node
+				view.setNodeLineIcos(setting, oldNeighbor);
+			}
+
+			//new neigbor node
+			if (newNeighbor) {
+				view.setNodeLineIcos(setting, newNeighbor);
+			}
+
+			//repair checkbox / radio
+			if (!!setting.check && setting.check.enable && view.repairChkClass) {
+				view.repairChkClass(setting, oldParentNode);
+				view.repairParentChkClassWithSelf(setting, oldParentNode);
+				if (oldParentNode != node.parent)
+					view.repairParentChkClassWithSelf(setting, node);
+			}
+
+			//expand parents after move
+			if (!isSilent) {
+				view.expandCollapseParentNode(setting, node.getParentNode(), true, animateFlag);
+			}
+		},
+		removeEditBtn: function(setting, node) {
+			$$(node, consts.id.EDIT, setting).unbind().remove();
+		},
+		removeRemoveBtn: function(setting, node) {
+			$$(node, consts.id.REMOVE, setting).unbind().remove();
+		},
+		removeTreeDom: function(setting, node) {
+			node.isHover = false;
+			view.removeEditBtn(setting, node);
+			view.removeRemoveBtn(setting, node);
+			tools.apply(setting.view.removeHoverDom, [setting.treeId, node]);
+		},
+		repairNodeLevelClass: function(setting, node, oldLevel) {
+			if (oldLevel === node.level) return;
+			var liObj = $$(node, setting),
+			aObj = $$(node, consts.id.A, setting),
+			ulObj = $$(node, consts.id.UL, setting),
+			oldClass = consts.className.LEVEL + oldLevel,
+			newClass = consts.className.LEVEL + node.level;
+			liObj.removeClass(oldClass);
+			liObj.addClass(newClass);
+			aObj.removeClass(oldClass);
+			aObj.addClass(newClass);
+			ulObj.removeClass(oldClass);
+			ulObj.addClass(newClass);
+		},
+		selectNodes : function(setting, nodes) {
+			for (var i=0, l=nodes.length; i<l; i++) {
+				view.selectNode(setting, nodes[i], i>0);
+			}
+		}
+	},
+
+	_z = {
+		tools: _tools,
+		view: _view,
+		event: _event,
+		data: _data
+	};
+	$.extend(true, $.fn.zTree.consts, _consts);
+	$.extend(true, $.fn.zTree._z, _z);
+
+	var zt = $.fn.zTree,
+	tools = zt._z.tools,
+	consts = zt.consts,
+	view = zt._z.view,
+	data = zt._z.data,
+	event = zt._z.event,
+	$$ = tools.$;
+
+	data.exSetting(_setting);
+	data.addInitBind(_bindEvent);
+	data.addInitUnBind(_unbindEvent);
+	data.addInitCache(_initCache);
+	data.addInitNode(_initNode);
+	data.addInitProxy(_eventProxy);
+	data.addInitRoot(_initRoot);
+	data.addZTreeTools(_zTreeTools);
+
+	var _cancelPreSelectedNode = view.cancelPreSelectedNode;
+	view.cancelPreSelectedNode = function (setting, node) {
+		var list = data.getRoot(setting).curSelectedList;
+		for (var i=0, j=list.length; i<j; i++) {
+			if (!node || node === list[i]) {
+				view.removeTreeDom(setting, list[i]);
+				if (node) break;
+			}
+		}
+		if (_cancelPreSelectedNode) _cancelPreSelectedNode.apply(view, arguments);
+	}
+
+	var _createNodes = view.createNodes;
+	view.createNodes = function(setting, level, nodes, parentNode) {
+		if (_createNodes) {
+			_createNodes.apply(view, arguments);
+		}
+		if (!nodes) return;
+		if (view.repairParentChkClassWithSelf) {
+			view.repairParentChkClassWithSelf(setting, parentNode);
+		}
+	}
+
+	var _makeNodeUrl = view.makeNodeUrl;
+	view.makeNodeUrl = function(setting, node) {
+		return setting.edit.enable ? null : (_makeNodeUrl.apply(view, arguments));
+	}
+
+	var _removeNode = view.removeNode;
+	view.removeNode = function(setting, node) {
+		var root = data.getRoot(setting);
+		if (root.curEditNode === node) root.curEditNode = null;
+		if (_removeNode) {
+			_removeNode.apply(view, arguments);
+		}
+	}
+
+	var _selectNode = view.selectNode;
+	view.selectNode = function(setting, node, addFlag) {
+		var root = data.getRoot(setting);
+		if (data.isSelectedNode(setting, node) && root.curEditNode == node && node.editNameFlag) {
+			return false;
+		}
+		if (_selectNode) _selectNode.apply(view, arguments);
+		view.addHoverDom(setting, node);
+		return true;
+	}
+
+	var _uCanDo = tools.uCanDo;
+	tools.uCanDo = function(setting, e) {
+		var root = data.getRoot(setting);
+		if (e && (tools.eqs(e.type, "mouseover") || tools.eqs(e.type, "mouseout") || tools.eqs(e.type, "mousedown") || tools.eqs(e.type, "mouseup"))) {
+			return true;
+		}
+		if (root.curEditNode) {
+			view.editNodeBlur = false;
+			root.curEditInput.focus();
+		}
+		return (!root.curEditNode) && (_uCanDo ? _uCanDo.apply(view, arguments) : true);
+	}
+})(jQuery);
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/js/jquery.ztree.all-3.5.min.js b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/js/jquery.ztree.all-3.5.min.js
new file mode 100644
index 0000000..bfd0505
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/js/jquery.ztree.all-3.5.min.js
@@ -0,0 +1,157 @@
+
+/*
+ * JQuery zTree core v3.5.15
+ * http://zTree.me/
+ *
+ * Copyright (c) 2010 Hunter.z
+ *
+ * Licensed same as jquery - MIT License
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ * email: hunter.z@263.net
+ * Date: 2013-10-15
+ */
+(function(p){var G,H,I,J,K,L,r={},u={},v={},M={treeId:"",treeObj:null,view:{addDiyDom:null,autoCancelSelected:!0,dblClickExpand:!0,expandSpeed:"fast",fontCss:{},nameIsHTML:!1,selectedMulti:!0,showIcon:!0,showLine:!0,showTitle:!0,txtSelectedEnable:!1},data:{key:{children:"children",name:"name",title:"",url:"url"},simpleData:{enable:!1,idKey:"id",pIdKey:"pId",rootPId:null},keep:{parent:!1,leaf:!1}},async:{enable:!1,contentType:"application/x-www-form-urlencoded",type:"post",dataType:"text",url:"",autoParam:[],
+otherParam:[],dataFilter:null},callback:{beforeAsync:null,beforeClick:null,beforeDblClick:null,beforeRightClick:null,beforeMouseDown:null,beforeMouseUp:null,beforeExpand:null,beforeCollapse:null,beforeRemove:null,onAsyncError:null,onAsyncSuccess:null,onNodeCreated:null,onClick:null,onDblClick:null,onRightClick:null,onMouseDown:null,onMouseUp:null,onExpand:null,onCollapse:null,onRemove:null}},w=[function(b){var a=b.treeObj,c=e.event;a.bind(c.NODECREATED,function(a,c,g){j.apply(b.callback.onNodeCreated,
+[a,c,g])});a.bind(c.CLICK,function(a,c,g,l,h){j.apply(b.callback.onClick,[c,g,l,h])});a.bind(c.EXPAND,function(a,c,g){j.apply(b.callback.onExpand,[a,c,g])});a.bind(c.COLLAPSE,function(a,c,g){j.apply(b.callback.onCollapse,[a,c,g])});a.bind(c.ASYNC_SUCCESS,function(a,c,g,l){j.apply(b.callback.onAsyncSuccess,[a,c,g,l])});a.bind(c.ASYNC_ERROR,function(a,c,g,l,h,e){j.apply(b.callback.onAsyncError,[a,c,g,l,h,e])})}],x=[function(b){var a=e.event;b.treeObj.unbind(a.NODECREATED).unbind(a.CLICK).unbind(a.EXPAND).unbind(a.COLLAPSE).unbind(a.ASYNC_SUCCESS).unbind(a.ASYNC_ERROR)}],
+y=[function(b){var a=h.getCache(b);a||(a={},h.setCache(b,a));a.nodes=[];a.doms=[]}],z=[function(b,a,c,d,f,g){if(c){var l=h.getRoot(b),e=b.data.key.children;c.level=a;c.tId=b.treeId+"_"+ ++l.zId;c.parentTId=d?d.tId:null;c.open=typeof c.open=="string"?j.eqs(c.open,"true"):!!c.open;c[e]&&c[e].length>0?(c.isParent=!0,c.zAsync=!0):(c.isParent=typeof c.isParent=="string"?j.eqs(c.isParent,"true"):!!c.isParent,c.open=c.isParent&&!b.async.enable?c.open:!1,c.zAsync=!c.isParent);c.isFirstNode=f;c.isLastNode=
+g;c.getParentNode=function(){return h.getNodeCache(b,c.parentTId)};c.getPreNode=function(){return h.getPreNode(b,c)};c.getNextNode=function(){return h.getNextNode(b,c)};c.isAjaxing=!1;h.fixPIdKeyValue(b,c)}}],s=[function(b){var a=b.target,c=h.getSetting(b.data.treeId),d="",f=null,g="",l="",i=null,n=null,k=null;if(j.eqs(b.type,"mousedown"))l="mousedown";else if(j.eqs(b.type,"mouseup"))l="mouseup";else if(j.eqs(b.type,"contextmenu"))l="contextmenu";else if(j.eqs(b.type,"click"))if(j.eqs(a.tagName,"span")&&
+a.getAttribute("treeNode"+e.id.SWITCH)!==null)d=j.getNodeMainDom(a).id,g="switchNode";else{if(k=j.getMDom(c,a,[{tagName:"a",attrName:"treeNode"+e.id.A}]))d=j.getNodeMainDom(k).id,g="clickNode"}else if(j.eqs(b.type,"dblclick")&&(l="dblclick",k=j.getMDom(c,a,[{tagName:"a",attrName:"treeNode"+e.id.A}])))d=j.getNodeMainDom(k).id,g="switchNode";if(l.length>0&&d.length==0&&(k=j.getMDom(c,a,[{tagName:"a",attrName:"treeNode"+e.id.A}])))d=j.getNodeMainDom(k).id;if(d.length>0)switch(f=h.getNodeCache(c,d),g){case "switchNode":f.isParent?
+j.eqs(b.type,"click")||j.eqs(b.type,"dblclick")&&j.apply(c.view.dblClickExpand,[c.treeId,f],c.view.dblClickExpand)?i=G:g="":g="";break;case "clickNode":i=H}switch(l){case "mousedown":n=I;break;case "mouseup":n=J;break;case "dblclick":n=K;break;case "contextmenu":n=L}return{stop:!1,node:f,nodeEventType:g,nodeEventCallback:i,treeEventType:l,treeEventCallback:n}}],A=[function(b){var a=h.getRoot(b);a||(a={},h.setRoot(b,a));a[b.data.key.children]=[];a.expandTriggerFlag=!1;a.curSelectedList=[];a.noSelection=
+!0;a.createdNodes=[];a.zId=0;a._ver=(new Date).getTime()}],B=[],C=[],D=[],E=[],F=[],h={addNodeCache:function(b,a){h.getCache(b).nodes[h.getNodeCacheId(a.tId)]=a},getNodeCacheId:function(b){return b.substring(b.lastIndexOf("_")+1)},addAfterA:function(b){C.push(b)},addBeforeA:function(b){B.push(b)},addInnerAfterA:function(b){E.push(b)},addInnerBeforeA:function(b){D.push(b)},addInitBind:function(b){w.push(b)},addInitUnBind:function(b){x.push(b)},addInitCache:function(b){y.push(b)},addInitNode:function(b){z.push(b)},
+addInitProxy:function(b,a){a?s.splice(0,0,b):s.push(b)},addInitRoot:function(b){A.push(b)},addNodesData:function(b,a,c){var d=b.data.key.children;a[d]||(a[d]=[]);if(a[d].length>0)a[d][a[d].length-1].isLastNode=!1,i.setNodeLineIcos(b,a[d][a[d].length-1]);a.isParent=!0;a[d]=a[d].concat(c)},addSelectedNode:function(b,a){var c=h.getRoot(b);h.isSelectedNode(b,a)||c.curSelectedList.push(a)},addCreatedNode:function(b,a){(b.callback.onNodeCreated||b.view.addDiyDom)&&h.getRoot(b).createdNodes.push(a)},addZTreeTools:function(b){F.push(b)},
+exSetting:function(b){p.extend(!0,M,b)},fixPIdKeyValue:function(b,a){b.data.simpleData.enable&&(a[b.data.simpleData.pIdKey]=a.parentTId?a.getParentNode()[b.data.simpleData.idKey]:b.data.simpleData.rootPId)},getAfterA:function(b,a,c){for(var d=0,f=C.length;d<f;d++)C[d].apply(this,arguments)},getBeforeA:function(b,a,c){for(var d=0,f=B.length;d<f;d++)B[d].apply(this,arguments)},getInnerAfterA:function(b,a,c){for(var d=0,f=E.length;d<f;d++)E[d].apply(this,arguments)},getInnerBeforeA:function(b,a,c){for(var d=
+0,f=D.length;d<f;d++)D[d].apply(this,arguments)},getCache:function(b){return v[b.treeId]},getNextNode:function(b,a){if(!a)return null;for(var c=b.data.key.children,d=a.parentTId?a.getParentNode():h.getRoot(b),f=0,g=d[c].length-1;f<=g;f++)if(d[c][f]===a)return f==g?null:d[c][f+1];return null},getNodeByParam:function(b,a,c,d){if(!a||!c)return null;for(var f=b.data.key.children,g=0,l=a.length;g<l;g++){if(a[g][c]==d)return a[g];var e=h.getNodeByParam(b,a[g][f],c,d);if(e)return e}return null},getNodeCache:function(b,
+a){if(!a)return null;var c=v[b.treeId].nodes[h.getNodeCacheId(a)];return c?c:null},getNodeName:function(b,a){return""+a[b.data.key.name]},getNodeTitle:function(b,a){return""+a[b.data.key.title===""?b.data.key.name:b.data.key.title]},getNodes:function(b){return h.getRoot(b)[b.data.key.children]},getNodesByParam:function(b,a,c,d){if(!a||!c)return[];for(var f=b.data.key.children,g=[],l=0,e=a.length;l<e;l++)a[l][c]==d&&g.push(a[l]),g=g.concat(h.getNodesByParam(b,a[l][f],c,d));return g},getNodesByParamFuzzy:function(b,
+a,c,d){if(!a||!c)return[];for(var f=b.data.key.children,g=[],d=d.toLowerCase(),l=0,e=a.length;l<e;l++)typeof a[l][c]=="string"&&a[l][c].toLowerCase().indexOf(d)>-1&&g.push(a[l]),g=g.concat(h.getNodesByParamFuzzy(b,a[l][f],c,d));return g},getNodesByFilter:function(b,a,c,d,f){if(!a)return d?null:[];for(var g=b.data.key.children,e=d?null:[],i=0,n=a.length;i<n;i++){if(j.apply(c,[a[i],f],!1)){if(d)return a[i];e.push(a[i])}var k=h.getNodesByFilter(b,a[i][g],c,d,f);if(d&&k)return k;e=d?k:e.concat(k)}return e},
+getPreNode:function(b,a){if(!a)return null;for(var c=b.data.key.children,d=a.parentTId?a.getParentNode():h.getRoot(b),f=0,g=d[c].length;f<g;f++)if(d[c][f]===a)return f==0?null:d[c][f-1];return null},getRoot:function(b){return b?u[b.treeId]:null},getRoots:function(){return u},getSetting:function(b){return r[b]},getSettings:function(){return r},getZTreeTools:function(b){return(b=this.getRoot(this.getSetting(b)))?b.treeTools:null},initCache:function(b){for(var a=0,c=y.length;a<c;a++)y[a].apply(this,
+arguments)},initNode:function(b,a,c,d,f,g){for(var e=0,h=z.length;e<h;e++)z[e].apply(this,arguments)},initRoot:function(b){for(var a=0,c=A.length;a<c;a++)A[a].apply(this,arguments)},isSelectedNode:function(b,a){for(var c=h.getRoot(b),d=0,f=c.curSelectedList.length;d<f;d++)if(a===c.curSelectedList[d])return!0;return!1},removeNodeCache:function(b,a){var c=b.data.key.children;if(a[c])for(var d=0,f=a[c].length;d<f;d++)arguments.callee(b,a[c][d]);h.getCache(b).nodes[h.getNodeCacheId(a.tId)]=null},removeSelectedNode:function(b,
+a){for(var c=h.getRoot(b),d=0,f=c.curSelectedList.length;d<f;d++)if(a===c.curSelectedList[d]||!h.getNodeCache(b,c.curSelectedList[d].tId))c.curSelectedList.splice(d,1),d--,f--},setCache:function(b,a){v[b.treeId]=a},setRoot:function(b,a){u[b.treeId]=a},setZTreeTools:function(b,a){for(var c=0,d=F.length;c<d;c++)F[c].apply(this,arguments)},transformToArrayFormat:function(b,a){if(!a)return[];var c=b.data.key.children,d=[];if(j.isArray(a))for(var f=0,g=a.length;f<g;f++)d.push(a[f]),a[f][c]&&(d=d.concat(h.transformToArrayFormat(b,
+a[f][c])));else d.push(a),a[c]&&(d=d.concat(h.transformToArrayFormat(b,a[c])));return d},transformTozTreeFormat:function(b,a){var c,d,f=b.data.simpleData.idKey,g=b.data.simpleData.pIdKey,e=b.data.key.children;if(!f||f==""||!a)return[];if(j.isArray(a)){var h=[],i=[];for(c=0,d=a.length;c<d;c++)i[a[c][f]]=a[c];for(c=0,d=a.length;c<d;c++)i[a[c][g]]&&a[c][f]!=a[c][g]?(i[a[c][g]][e]||(i[a[c][g]][e]=[]),i[a[c][g]][e].push(a[c])):h.push(a[c]);return h}else return[a]}},m={bindEvent:function(b){for(var a=0,
+c=w.length;a<c;a++)w[a].apply(this,arguments)},unbindEvent:function(b){for(var a=0,c=x.length;a<c;a++)x[a].apply(this,arguments)},bindTree:function(b){var a={treeId:b.treeId},c=b.treeObj;b.view.txtSelectedEnable||c.bind("selectstart",function(a){a=a.originalEvent.srcElement.nodeName.toLowerCase();return a==="input"||a==="textarea"}).css({"-moz-user-select":"-moz-none"});c.bind("click",a,m.proxy);c.bind("dblclick",a,m.proxy);c.bind("mouseover",a,m.proxy);c.bind("mouseout",a,m.proxy);c.bind("mousedown",
+a,m.proxy);c.bind("mouseup",a,m.proxy);c.bind("contextmenu",a,m.proxy)},unbindTree:function(b){b.treeObj.unbind("click",m.proxy).unbind("dblclick",m.proxy).unbind("mouseover",m.proxy).unbind("mouseout",m.proxy).unbind("mousedown",m.proxy).unbind("mouseup",m.proxy).unbind("contextmenu",m.proxy)},doProxy:function(b){for(var a=[],c=0,d=s.length;c<d;c++){var f=s[c].apply(this,arguments);a.push(f);if(f.stop)break}return a},proxy:function(b){var a=h.getSetting(b.data.treeId);if(!j.uCanDo(a,b))return!0;
+for(var a=m.doProxy(b),c=!0,d=0,f=a.length;d<f;d++){var g=a[d];g.nodeEventCallback&&(c=g.nodeEventCallback.apply(g,[b,g.node])&&c);g.treeEventCallback&&(c=g.treeEventCallback.apply(g,[b,g.node])&&c)}return c}};G=function(b,a){var c=h.getSetting(b.data.treeId);if(a.open){if(j.apply(c.callback.beforeCollapse,[c.treeId,a],!0)==!1)return!0}else if(j.apply(c.callback.beforeExpand,[c.treeId,a],!0)==!1)return!0;h.getRoot(c).expandTriggerFlag=!0;i.switchNode(c,a);return!0};H=function(b,a){var c=h.getSetting(b.data.treeId),
+d=c.view.autoCancelSelected&&b.ctrlKey&&h.isSelectedNode(c,a)?0:c.view.autoCancelSelected&&b.ctrlKey&&c.view.selectedMulti?2:1;if(j.apply(c.callback.beforeClick,[c.treeId,a,d],!0)==!1)return!0;d===0?i.cancelPreSelectedNode(c,a):i.selectNode(c,a,d===2);c.treeObj.trigger(e.event.CLICK,[b,c.treeId,a,d]);return!0};I=function(b,a){var c=h.getSetting(b.data.treeId);j.apply(c.callback.beforeMouseDown,[c.treeId,a],!0)&&j.apply(c.callback.onMouseDown,[b,c.treeId,a]);return!0};J=function(b,a){var c=h.getSetting(b.data.treeId);
+j.apply(c.callback.beforeMouseUp,[c.treeId,a],!0)&&j.apply(c.callback.onMouseUp,[b,c.treeId,a]);return!0};K=function(b,a){var c=h.getSetting(b.data.treeId);j.apply(c.callback.beforeDblClick,[c.treeId,a],!0)&&j.apply(c.callback.onDblClick,[b,c.treeId,a]);return!0};L=function(b,a){var c=h.getSetting(b.data.treeId);j.apply(c.callback.beforeRightClick,[c.treeId,a],!0)&&j.apply(c.callback.onRightClick,[b,c.treeId,a]);return typeof c.callback.onRightClick!="function"};var j={apply:function(b,a,c){return typeof b==
+"function"?b.apply(N,a?a:[]):c},canAsync:function(b,a){var c=b.data.key.children;return b.async.enable&&a&&a.isParent&&!(a.zAsync||a[c]&&a[c].length>0)},clone:function(b){if(b===null)return null;var a=j.isArray(b)?[]:{},c;for(c in b)a[c]=b[c]instanceof Date?new Date(b[c].getTime()):typeof b[c]==="object"?arguments.callee(b[c]):b[c];return a},eqs:function(b,a){return b.toLowerCase()===a.toLowerCase()},isArray:function(b){return Object.prototype.toString.apply(b)==="[object Array]"},$:function(b,a,
+c){a&&typeof a!="string"&&(c=a,a="");return typeof b=="string"?p(b,c?c.treeObj.get(0).ownerDocument:null):p("#"+b.tId+a,c?c.treeObj:null)},getMDom:function(b,a,c){if(!a)return null;for(;a&&a.id!==b.treeId;){for(var d=0,f=c.length;a.tagName&&d<f;d++)if(j.eqs(a.tagName,c[d].tagName)&&a.getAttribute(c[d].attrName)!==null)return a;a=a.parentNode}return null},getNodeMainDom:function(b){return p(b).parent("li").get(0)||p(b).parentsUntil("li").parent().get(0)},isChildOrSelf:function(b,a){return p(b).closest("#"+
+a).length>0},uCanDo:function(){return!0}},i={addNodes:function(b,a,c,d){if(!b.data.keep.leaf||!a||a.isParent)if(j.isArray(c)||(c=[c]),b.data.simpleData.enable&&(c=h.transformTozTreeFormat(b,c)),a){var f=k(a,e.id.SWITCH,b),g=k(a,e.id.ICON,b),l=k(a,e.id.UL,b);if(!a.open)i.replaceSwitchClass(a,f,e.folder.CLOSE),i.replaceIcoClass(a,g,e.folder.CLOSE),a.open=!1,l.css({display:"none"});h.addNodesData(b,a,c);i.createNodes(b,a.level+1,c,a);d||i.expandCollapseParentNode(b,a,!0)}else h.addNodesData(b,h.getRoot(b),
+c),i.createNodes(b,0,c,null)},appendNodes:function(b,a,c,d,f,g){if(!c)return[];for(var e=[],j=b.data.key.children,k=0,m=c.length;k<m;k++){var o=c[k];if(f){var t=(d?d:h.getRoot(b))[j].length==c.length&&k==0;h.initNode(b,a,o,d,t,k==c.length-1,g);h.addNodeCache(b,o)}t=[];o[j]&&o[j].length>0&&(t=i.appendNodes(b,a+1,o[j],o,f,g&&o.open));g&&(i.makeDOMNodeMainBefore(e,b,o),i.makeDOMNodeLine(e,b,o),h.getBeforeA(b,o,e),i.makeDOMNodeNameBefore(e,b,o),h.getInnerBeforeA(b,o,e),i.makeDOMNodeIcon(e,b,o),h.getInnerAfterA(b,
+o,e),i.makeDOMNodeNameAfter(e,b,o),h.getAfterA(b,o,e),o.isParent&&o.open&&i.makeUlHtml(b,o,e,t.join("")),i.makeDOMNodeMainAfter(e,b,o),h.addCreatedNode(b,o))}return e},appendParentULDom:function(b,a){var c=[],d=k(a,b);!d.get(0)&&a.parentTId&&(i.appendParentULDom(b,a.getParentNode()),d=k(a,b));var f=k(a,e.id.UL,b);f.get(0)&&f.remove();f=i.appendNodes(b,a.level+1,a[b.data.key.children],a,!1,!0);i.makeUlHtml(b,a,c,f.join(""));d.append(c.join(""))},asyncNode:function(b,a,c,d){var f,g;if(a&&!a.isParent)return j.apply(d),
+!1;else if(a&&a.isAjaxing)return!1;else if(j.apply(b.callback.beforeAsync,[b.treeId,a],!0)==!1)return j.apply(d),!1;if(a)a.isAjaxing=!0,k(a,e.id.ICON,b).attr({style:"","class":e.className.BUTTON+" "+e.className.ICO_LOADING});var l={};for(f=0,g=b.async.autoParam.length;a&&f<g;f++){var q=b.async.autoParam[f].split("="),n=q;q.length>1&&(n=q[1],q=q[0]);l[n]=a[q]}if(j.isArray(b.async.otherParam))for(f=0,g=b.async.otherParam.length;f<g;f+=2)l[b.async.otherParam[f]]=b.async.otherParam[f+1];else for(var m in b.async.otherParam)l[m]=
+b.async.otherParam[m];var o=h.getRoot(b)._ver;p.ajax({contentType:b.async.contentType,type:b.async.type,url:j.apply(b.async.url,[b.treeId,a],b.async.url),data:l,dataType:b.async.dataType,success:function(f){if(o==h.getRoot(b)._ver){var g=[];try{g=!f||f.length==0?[]:typeof f=="string"?eval("("+f+")"):f}catch(l){g=f}if(a)a.isAjaxing=null,a.zAsync=!0;i.setNodeLineIcos(b,a);g&&g!==""?(g=j.apply(b.async.dataFilter,[b.treeId,a,g],g),i.addNodes(b,a,g?j.clone(g):[],!!c)):i.addNodes(b,a,[],!!c);b.treeObj.trigger(e.event.ASYNC_SUCCESS,
+[b.treeId,a,f]);j.apply(d)}},error:function(c,d,f){if(o==h.getRoot(b)._ver){if(a)a.isAjaxing=null;i.setNodeLineIcos(b,a);b.treeObj.trigger(e.event.ASYNC_ERROR,[b.treeId,a,c,d,f])}}});return!0},cancelPreSelectedNode:function(b,a){for(var c=h.getRoot(b).curSelectedList,d=c.length-1;d>=0;d--)if(!a||a===c[d])if(k(c[d],e.id.A,b).removeClass(e.node.CURSELECTED),a){h.removeSelectedNode(b,a);break}if(!a)h.getRoot(b).curSelectedList=[]},createNodeCallback:function(b){if(b.callback.onNodeCreated||b.view.addDiyDom)for(var a=
+h.getRoot(b);a.createdNodes.length>0;){var c=a.createdNodes.shift();j.apply(b.view.addDiyDom,[b.treeId,c]);b.callback.onNodeCreated&&b.treeObj.trigger(e.event.NODECREATED,[b.treeId,c])}},createNodes:function(b,a,c,d){if(c&&c.length!=0){var f=h.getRoot(b),g=b.data.key.children,g=!d||d.open||!!k(d[g][0],b).get(0);f.createdNodes=[];a=i.appendNodes(b,a,c,d,!0,g);d?(d=k(d,e.id.UL,b),d.get(0)&&d.append(a.join(""))):b.treeObj.append(a.join(""));i.createNodeCallback(b)}},destroy:function(b){b&&(h.initCache(b),
+h.initRoot(b),m.unbindTree(b),m.unbindEvent(b),b.treeObj.empty())},expandCollapseNode:function(b,a,c,d,f){var g=h.getRoot(b),l=b.data.key.children;if(a){if(g.expandTriggerFlag){var q=f,f=function(){q&&q();a.open?b.treeObj.trigger(e.event.EXPAND,[b.treeId,a]):b.treeObj.trigger(e.event.COLLAPSE,[b.treeId,a])};g.expandTriggerFlag=!1}if(!a.open&&a.isParent&&(!k(a,e.id.UL,b).get(0)||a[l]&&a[l].length>0&&!k(a[l][0],b).get(0)))i.appendParentULDom(b,a),i.createNodeCallback(b);if(a.open==c)j.apply(f,[]);else{var c=
+k(a,e.id.UL,b),g=k(a,e.id.SWITCH,b),n=k(a,e.id.ICON,b);a.isParent?(a.open=!a.open,a.iconOpen&&a.iconClose&&n.attr("style",i.makeNodeIcoStyle(b,a)),a.open?(i.replaceSwitchClass(a,g,e.folder.OPEN),i.replaceIcoClass(a,n,e.folder.OPEN),d==!1||b.view.expandSpeed==""?(c.show(),j.apply(f,[])):a[l]&&a[l].length>0?c.slideDown(b.view.expandSpeed,f):(c.show(),j.apply(f,[]))):(i.replaceSwitchClass(a,g,e.folder.CLOSE),i.replaceIcoClass(a,n,e.folder.CLOSE),d==!1||b.view.expandSpeed==""||!(a[l]&&a[l].length>0)?
+(c.hide(),j.apply(f,[])):c.slideUp(b.view.expandSpeed,f))):j.apply(f,[])}}else j.apply(f,[])},expandCollapseParentNode:function(b,a,c,d,f){a&&(a.parentTId?(i.expandCollapseNode(b,a,c,d),a.parentTId&&i.expandCollapseParentNode(b,a.getParentNode(),c,d,f)):i.expandCollapseNode(b,a,c,d,f))},expandCollapseSonNode:function(b,a,c,d,f){var g=h.getRoot(b),e=b.data.key.children,g=a?a[e]:g[e],e=a?!1:d,j=h.getRoot(b).expandTriggerFlag;h.getRoot(b).expandTriggerFlag=!1;if(g)for(var k=0,m=g.length;k<m;k++)g[k]&&
+i.expandCollapseSonNode(b,g[k],c,e);h.getRoot(b).expandTriggerFlag=j;i.expandCollapseNode(b,a,c,d,f)},makeDOMNodeIcon:function(b,a,c){var d=h.getNodeName(a,c),d=a.view.nameIsHTML?d:d.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;");b.push("<span id='",c.tId,e.id.ICON,"' title='' treeNode",e.id.ICON," class='",i.makeNodeIcoClass(a,c),"' style='",i.makeNodeIcoStyle(a,c),"'></span><span id='",c.tId,e.id.SPAN,"'>",d,"</span>")},makeDOMNodeLine:function(b,a,c){b.push("<span id='",c.tId,
+e.id.SWITCH,"' title='' class='",i.makeNodeLineClass(a,c),"' treeNode",e.id.SWITCH,"></span>")},makeDOMNodeMainAfter:function(b){b.push("</li>")},makeDOMNodeMainBefore:function(b,a,c){b.push("<li id='",c.tId,"' class='",e.className.LEVEL,c.level,"' tabindex='0' hidefocus='true' treenode>")},makeDOMNodeNameAfter:function(b){b.push("</a>")},makeDOMNodeNameBefore:function(b,a,c){var d=h.getNodeTitle(a,c),f=i.makeNodeUrl(a,c),g=i.makeNodeFontCss(a,c),l=[],k;for(k in g)l.push(k,":",g[k],";");b.push("<a id='",
+c.tId,e.id.A,"' class='",e.className.LEVEL,c.level,"' treeNode",e.id.A,' onclick="',c.click||"",'" ',f!=null&&f.length>0?"href='"+f+"'":""," target='",i.makeNodeTarget(c),"' style='",l.join(""),"'");j.apply(a.view.showTitle,[a.treeId,c],a.view.showTitle)&&d&&b.push("title='",d.replace(/'/g,"&#39;").replace(/</g,"&lt;").replace(/>/g,"&gt;"),"'");b.push(">")},makeNodeFontCss:function(b,a){var c=j.apply(b.view.fontCss,[b.treeId,a],b.view.fontCss);return c&&typeof c!="function"?c:{}},makeNodeIcoClass:function(b,
+a){var c=["ico"];a.isAjaxing||(c[0]=(a.iconSkin?a.iconSkin+"_":"")+c[0],a.isParent?c.push(a.open?e.folder.OPEN:e.folder.CLOSE):c.push(e.folder.DOCU));return e.className.BUTTON+" "+c.join("_")},makeNodeIcoStyle:function(b,a){var c=[];if(!a.isAjaxing){var d=a.isParent&&a.iconOpen&&a.iconClose?a.open?a.iconOpen:a.iconClose:a.icon;d&&c.push("background:url(",d,") 0 0 no-repeat;");(b.view.showIcon==!1||!j.apply(b.view.showIcon,[b.treeId,a],!0))&&c.push("width:0px;height:0px;")}return c.join("")},makeNodeLineClass:function(b,
+a){var c=[];b.view.showLine?a.level==0&&a.isFirstNode&&a.isLastNode?c.push(e.line.ROOT):a.level==0&&a.isFirstNode?c.push(e.line.ROOTS):a.isLastNode?c.push(e.line.BOTTOM):c.push(e.line.CENTER):c.push(e.line.NOLINE);a.isParent?c.push(a.open?e.folder.OPEN:e.folder.CLOSE):c.push(e.folder.DOCU);return i.makeNodeLineClassEx(a)+c.join("_")},makeNodeLineClassEx:function(b){return e.className.BUTTON+" "+e.className.LEVEL+b.level+" "+e.className.SWITCH+" "},makeNodeTarget:function(b){return b.target||"_blank"},
+makeNodeUrl:function(b,a){var c=b.data.key.url;return a[c]?a[c]:null},makeUlHtml:function(b,a,c,d){c.push("<ul id='",a.tId,e.id.UL,"' class='",e.className.LEVEL,a.level," ",i.makeUlLineClass(b,a),"' style='display:",a.open?"block":"none","'>");c.push(d);c.push("</ul>")},makeUlLineClass:function(b,a){return b.view.showLine&&!a.isLastNode?e.line.LINE:""},removeChildNodes:function(b,a){if(a){var c=b.data.key.children,d=a[c];if(d){for(var f=0,g=d.length;f<g;f++)h.removeNodeCache(b,d[f]);h.removeSelectedNode(b);
+delete a[c];b.data.keep.parent?k(a,e.id.UL,b).empty():(a.isParent=!1,a.open=!1,c=k(a,e.id.SWITCH,b),d=k(a,e.id.ICON,b),i.replaceSwitchClass(a,c,e.folder.DOCU),i.replaceIcoClass(a,d,e.folder.DOCU),k(a,e.id.UL,b).remove())}}},setFirstNode:function(b,a){var c=b.data.key.children;if(a[c].length>0)a[c][0].isFirstNode=!0},setLastNode:function(b,a){var c=b.data.key.children,d=a[c].length;if(d>0)a[c][d-1].isLastNode=!0},removeNode:function(b,a){var c=h.getRoot(b),d=b.data.key.children,f=a.parentTId?a.getParentNode():
+c;a.isFirstNode=!1;a.isLastNode=!1;a.getPreNode=function(){return null};a.getNextNode=function(){return null};if(h.getNodeCache(b,a.tId)){k(a,b).remove();h.removeNodeCache(b,a);h.removeSelectedNode(b,a);for(var g=0,l=f[d].length;g<l;g++)if(f[d][g].tId==a.tId){f[d].splice(g,1);break}i.setFirstNode(b,f);i.setLastNode(b,f);var j,g=f[d].length;if(!b.data.keep.parent&&g==0)f.isParent=!1,f.open=!1,g=k(f,e.id.UL,b),l=k(f,e.id.SWITCH,b),j=k(f,e.id.ICON,b),i.replaceSwitchClass(f,l,e.folder.DOCU),i.replaceIcoClass(f,
+j,e.folder.DOCU),g.css("display","none");else if(b.view.showLine&&g>0){var n=f[d][g-1],g=k(n,e.id.UL,b),l=k(n,e.id.SWITCH,b);j=k(n,e.id.ICON,b);f==c?f[d].length==1?i.replaceSwitchClass(n,l,e.line.ROOT):(c=k(f[d][0],e.id.SWITCH,b),i.replaceSwitchClass(f[d][0],c,e.line.ROOTS),i.replaceSwitchClass(n,l,e.line.BOTTOM)):i.replaceSwitchClass(n,l,e.line.BOTTOM);g.removeClass(e.line.LINE)}}},replaceIcoClass:function(b,a,c){if(a&&!b.isAjaxing&&(b=a.attr("class"),b!=void 0)){b=b.split("_");switch(c){case e.folder.OPEN:case e.folder.CLOSE:case e.folder.DOCU:b[b.length-
+1]=c}a.attr("class",b.join("_"))}},replaceSwitchClass:function(b,a,c){if(a){var d=a.attr("class");if(d!=void 0){d=d.split("_");switch(c){case e.line.ROOT:case e.line.ROOTS:case e.line.CENTER:case e.line.BOTTOM:case e.line.NOLINE:d[0]=i.makeNodeLineClassEx(b)+c;break;case e.folder.OPEN:case e.folder.CLOSE:case e.folder.DOCU:d[1]=c}a.attr("class",d.join("_"));c!==e.folder.DOCU?a.removeAttr("disabled"):a.attr("disabled","disabled")}}},selectNode:function(b,a,c){c||i.cancelPreSelectedNode(b);k(a,e.id.A,
+b).addClass(e.node.CURSELECTED);h.addSelectedNode(b,a)},setNodeFontCss:function(b,a){var c=k(a,e.id.A,b),d=i.makeNodeFontCss(b,a);d&&c.css(d)},setNodeLineIcos:function(b,a){if(a){var c=k(a,e.id.SWITCH,b),d=k(a,e.id.UL,b),f=k(a,e.id.ICON,b),g=i.makeUlLineClass(b,a);g.length==0?d.removeClass(e.line.LINE):d.addClass(g);c.attr("class",i.makeNodeLineClass(b,a));a.isParent?c.removeAttr("disabled"):c.attr("disabled","disabled");f.removeAttr("style");f.attr("style",i.makeNodeIcoStyle(b,a));f.attr("class",
+i.makeNodeIcoClass(b,a))}},setNodeName:function(b,a){var c=h.getNodeTitle(b,a),d=k(a,e.id.SPAN,b);d.empty();b.view.nameIsHTML?d.html(h.getNodeName(b,a)):d.text(h.getNodeName(b,a));j.apply(b.view.showTitle,[b.treeId,a],b.view.showTitle)&&k(a,e.id.A,b).attr("title",!c?"":c)},setNodeTarget:function(b,a){k(a,e.id.A,b).attr("target",i.makeNodeTarget(a))},setNodeUrl:function(b,a){var c=k(a,e.id.A,b),d=i.makeNodeUrl(b,a);d==null||d.length==0?c.removeAttr("href"):c.attr("href",d)},switchNode:function(b,a){a.open||
+!j.canAsync(b,a)?i.expandCollapseNode(b,a,!a.open):b.async.enable?i.asyncNode(b,a)||i.expandCollapseNode(b,a,!a.open):a&&i.expandCollapseNode(b,a,!a.open)}};p.fn.zTree={consts:{className:{BUTTON:"button",LEVEL:"level",ICO_LOADING:"ico_loading",SWITCH:"switch"},event:{NODECREATED:"ztree_nodeCreated",CLICK:"ztree_click",EXPAND:"ztree_expand",COLLAPSE:"ztree_collapse",ASYNC_SUCCESS:"ztree_async_success",ASYNC_ERROR:"ztree_async_error"},id:{A:"_a",ICON:"_ico",SPAN:"_span",SWITCH:"_switch",UL:"_ul"},line:{ROOT:"root",
+ROOTS:"roots",CENTER:"center",BOTTOM:"bottom",NOLINE:"noline",LINE:"line"},folder:{OPEN:"open",CLOSE:"close",DOCU:"docu"},node:{CURSELECTED:"curSelectedNode"}},_z:{tools:j,view:i,event:m,data:h},getZTreeObj:function(b){return(b=h.getZTreeTools(b))?b:null},destroy:function(b){if(b&&b.length>0)i.destroy(h.getSetting(b));else for(var a in r)i.destroy(r[a])},init:function(b,a,c){var d=j.clone(M);p.extend(!0,d,a);d.treeId=b.attr("id");d.treeObj=b;d.treeObj.empty();r[d.treeId]=d;if(typeof document.body.style.maxHeight===
+"undefined")d.view.expandSpeed="";h.initRoot(d);b=h.getRoot(d);a=d.data.key.children;c=c?j.clone(j.isArray(c)?c:[c]):[];b[a]=d.data.simpleData.enable?h.transformTozTreeFormat(d,c):c;h.initCache(d);m.unbindTree(d);m.bindTree(d);m.unbindEvent(d);m.bindEvent(d);c={setting:d,addNodes:function(a,b,c){function e(){i.addNodes(d,a,h,c==!0)}if(!b)return null;a||(a=null);if(a&&!a.isParent&&d.data.keep.leaf)return null;var h=j.clone(j.isArray(b)?b:[b]);j.canAsync(d,a)?i.asyncNode(d,a,c,e):e();return h},cancelSelectedNode:function(a){i.cancelPreSelectedNode(d,
+a)},destroy:function(){i.destroy(d)},expandAll:function(a){a=!!a;i.expandCollapseSonNode(d,null,a,!0);return a},expandNode:function(a,b,c,e,n){if(!a||!a.isParent)return null;b!==!0&&b!==!1&&(b=!a.open);if((n=!!n)&&b&&j.apply(d.callback.beforeExpand,[d.treeId,a],!0)==!1)return null;else if(n&&!b&&j.apply(d.callback.beforeCollapse,[d.treeId,a],!0)==!1)return null;b&&a.parentTId&&i.expandCollapseParentNode(d,a.getParentNode(),b,!1);if(b===a.open&&!c)return null;h.getRoot(d).expandTriggerFlag=n;if(!j.canAsync(d,
+a)&&c)i.expandCollapseSonNode(d,a,b,!0,function(){if(e!==!1)try{k(a,d).focus().blur()}catch(b){}});else if(a.open=!b,i.switchNode(this.setting,a),e!==!1)try{k(a,d).focus().blur()}catch(m){}return b},getNodes:function(){return h.getNodes(d)},getNodeByParam:function(a,b,c){return!a?null:h.getNodeByParam(d,c?c[d.data.key.children]:h.getNodes(d),a,b)},getNodeByTId:function(a){return h.getNodeCache(d,a)},getNodesByParam:function(a,b,c){return!a?null:h.getNodesByParam(d,c?c[d.data.key.children]:h.getNodes(d),
+a,b)},getNodesByParamFuzzy:function(a,b,c){return!a?null:h.getNodesByParamFuzzy(d,c?c[d.data.key.children]:h.getNodes(d),a,b)},getNodesByFilter:function(a,b,c,e){b=!!b;return!a||typeof a!="function"?b?null:[]:h.getNodesByFilter(d,c?c[d.data.key.children]:h.getNodes(d),a,b,e)},getNodeIndex:function(a){if(!a)return null;for(var b=d.data.key.children,c=a.parentTId?a.getParentNode():h.getRoot(d),e=0,i=c[b].length;e<i;e++)if(c[b][e]==a)return e;return-1},getSelectedNodes:function(){for(var a=[],b=h.getRoot(d).curSelectedList,
+c=0,e=b.length;c<e;c++)a.push(b[c]);return a},isSelectedNode:function(a){return h.isSelectedNode(d,a)},reAsyncChildNodes:function(a,b,c){if(this.setting.async.enable){var j=!a;j&&(a=h.getRoot(d));if(b=="refresh"){for(var b=this.setting.data.key.children,m=0,p=a[b]?a[b].length:0;m<p;m++)h.removeNodeCache(d,a[b][m]);h.removeSelectedNode(d);a[b]=[];j?this.setting.treeObj.empty():k(a,e.id.UL,d).empty()}i.asyncNode(this.setting,j?null:a,!!c)}},refresh:function(){this.setting.treeObj.empty();var a=h.getRoot(d),
+b=a[d.data.key.children];h.initRoot(d);a[d.data.key.children]=b;h.initCache(d);i.createNodes(d,0,a[d.data.key.children])},removeChildNodes:function(a){if(!a)return null;var b=a[d.data.key.children];i.removeChildNodes(d,a);return b?b:null},removeNode:function(a,b){a&&(b=!!b,b&&j.apply(d.callback.beforeRemove,[d.treeId,a],!0)==!1||(i.removeNode(d,a),b&&this.setting.treeObj.trigger(e.event.REMOVE,[d.treeId,a])))},selectNode:function(a,b){if(a&&j.uCanDo(d)){b=d.view.selectedMulti&&b;if(a.parentTId)i.expandCollapseParentNode(d,
+a.getParentNode(),!0,!1,function(){try{k(a,d).focus().blur()}catch(b){}});else try{k(a,d).focus().blur()}catch(c){}i.selectNode(d,a,b)}},transformTozTreeNodes:function(a){return h.transformTozTreeFormat(d,a)},transformToArray:function(a){return h.transformToArrayFormat(d,a)},updateNode:function(a){a&&k(a,d).get(0)&&j.uCanDo(d)&&(i.setNodeName(d,a),i.setNodeTarget(d,a),i.setNodeUrl(d,a),i.setNodeLineIcos(d,a),i.setNodeFontCss(d,a))}};b.treeTools=c;h.setZTreeTools(d,c);b[a]&&b[a].length>0?i.createNodes(d,
+0,b[a]):d.async.enable&&d.async.url&&d.async.url!==""&&i.asyncNode(d);return c}};var N=p.fn.zTree,k=j.$,e=N.consts})(jQuery);
+
+/*
+ * JQuery zTree excheck v3.5.15
+ * http://zTree.me/
+ *
+ * Copyright (c) 2010 Hunter.z
+ *
+ * Licensed same as jquery - MIT License
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ * email: hunter.z@263.net
+ * Date: 2013-10-15
+ */
+(function(m){var p,q,r,o={event:{CHECK:"ztree_check"},id:{CHECK:"_check"},checkbox:{STYLE:"checkbox",DEFAULT:"chk",DISABLED:"disable",FALSE:"false",TRUE:"true",FULL:"full",PART:"part",FOCUS:"focus"},radio:{STYLE:"radio",TYPE_ALL:"all",TYPE_LEVEL:"level"}},v={check:{enable:!1,autoCheckTrigger:!1,chkStyle:o.checkbox.STYLE,nocheckInherit:!1,chkDisabledInherit:!1,radioType:o.radio.TYPE_LEVEL,chkboxType:{Y:"ps",N:"ps"}},data:{key:{checked:"checked"}},callback:{beforeCheck:null,onCheck:null}};p=function(b,
+a){if(a.chkDisabled===!0)return!1;var c=f.getSetting(b.data.treeId),d=c.data.key.checked;if(k.apply(c.callback.beforeCheck,[c.treeId,a],!0)==!1)return!0;a[d]=!a[d];e.checkNodeRelation(c,a);d=n(a,j.id.CHECK,c);e.setChkClass(c,d,a);e.repairParentChkClassWithSelf(c,a);c.treeObj.trigger(j.event.CHECK,[b,c.treeId,a]);return!0};q=function(b,a){if(a.chkDisabled===!0)return!1;var c=f.getSetting(b.data.treeId),d=n(a,j.id.CHECK,c);a.check_Focus=!0;e.setChkClass(c,d,a);return!0};r=function(b,a){if(a.chkDisabled===
+!0)return!1;var c=f.getSetting(b.data.treeId),d=n(a,j.id.CHECK,c);a.check_Focus=!1;e.setChkClass(c,d,a);return!0};m.extend(!0,m.fn.zTree.consts,o);m.extend(!0,m.fn.zTree._z,{tools:{},view:{checkNodeRelation:function(b,a){var c,d,h,i=b.data.key.children,l=b.data.key.checked;c=j.radio;if(b.check.chkStyle==c.STYLE){var g=f.getRadioCheckedList(b);if(a[l])if(b.check.radioType==c.TYPE_ALL){for(d=g.length-1;d>=0;d--)c=g[d],c[l]=!1,g.splice(d,1),e.setChkClass(b,n(c,j.id.CHECK,b),c),c.parentTId!=a.parentTId&&
+e.repairParentChkClassWithSelf(b,c);g.push(a)}else{g=a.parentTId?a.getParentNode():f.getRoot(b);for(d=0,h=g[i].length;d<h;d++)c=g[i][d],c[l]&&c!=a&&(c[l]=!1,e.setChkClass(b,n(c,j.id.CHECK,b),c))}else if(b.check.radioType==c.TYPE_ALL)for(d=0,h=g.length;d<h;d++)if(a==g[d]){g.splice(d,1);break}}else a[l]&&(!a[i]||a[i].length==0||b.check.chkboxType.Y.indexOf("s")>-1)&&e.setSonNodeCheckBox(b,a,!0),!a[l]&&(!a[i]||a[i].length==0||b.check.chkboxType.N.indexOf("s")>-1)&&e.setSonNodeCheckBox(b,a,!1),a[l]&&
+b.check.chkboxType.Y.indexOf("p")>-1&&e.setParentNodeCheckBox(b,a,!0),!a[l]&&b.check.chkboxType.N.indexOf("p")>-1&&e.setParentNodeCheckBox(b,a,!1)},makeChkClass:function(b,a){var c=b.data.key.checked,d=j.checkbox,h=j.radio,i="",i=a.chkDisabled===!0?d.DISABLED:a.halfCheck?d.PART:b.check.chkStyle==h.STYLE?a.check_Child_State<1?d.FULL:d.PART:a[c]?a.check_Child_State===2||a.check_Child_State===-1?d.FULL:d.PART:a.check_Child_State<1?d.FULL:d.PART,c=b.check.chkStyle+"_"+(a[c]?d.TRUE:d.FALSE)+"_"+i,c=a.check_Focus&&
+a.chkDisabled!==!0?c+"_"+d.FOCUS:c;return j.className.BUTTON+" "+d.DEFAULT+" "+c},repairAllChk:function(b,a){if(b.check.enable&&b.check.chkStyle===j.checkbox.STYLE)for(var c=b.data.key.checked,d=b.data.key.children,h=f.getRoot(b),i=0,l=h[d].length;i<l;i++){var g=h[d][i];g.nocheck!==!0&&g.chkDisabled!==!0&&(g[c]=a);e.setSonNodeCheckBox(b,g,a)}},repairChkClass:function(b,a){if(a&&(f.makeChkFlag(b,a),a.nocheck!==!0)){var c=n(a,j.id.CHECK,b);e.setChkClass(b,c,a)}},repairParentChkClass:function(b,a){if(a&&
+a.parentTId){var c=a.getParentNode();e.repairChkClass(b,c);e.repairParentChkClass(b,c)}},repairParentChkClassWithSelf:function(b,a){if(a){var c=b.data.key.children;a[c]&&a[c].length>0?e.repairParentChkClass(b,a[c][0]):e.repairParentChkClass(b,a)}},repairSonChkDisabled:function(b,a,c,d){if(a){var h=b.data.key.children;if(a.chkDisabled!=c)a.chkDisabled=c;e.repairChkClass(b,a);if(a[h]&&d)for(var i=0,l=a[h].length;i<l;i++)e.repairSonChkDisabled(b,a[h][i],c,d)}},repairParentChkDisabled:function(b,a,c,
+d){if(a){if(a.chkDisabled!=c&&d)a.chkDisabled=c;e.repairChkClass(b,a);e.repairParentChkDisabled(b,a.getParentNode(),c,d)}},setChkClass:function(b,a,c){a&&(c.nocheck===!0?a.hide():a.show(),a.removeClass(),a.addClass(e.makeChkClass(b,c)))},setParentNodeCheckBox:function(b,a,c,d){var h=b.data.key.children,i=b.data.key.checked,l=n(a,j.id.CHECK,b);d||(d=a);f.makeChkFlag(b,a);a.nocheck!==!0&&a.chkDisabled!==!0&&(a[i]=c,e.setChkClass(b,l,a),b.check.autoCheckTrigger&&a!=d&&b.treeObj.trigger(j.event.CHECK,
+[null,b.treeId,a]));if(a.parentTId){l=!0;if(!c)for(var h=a.getParentNode()[h],g=0,k=h.length;g<k;g++)if(h[g].nocheck!==!0&&h[g].chkDisabled!==!0&&h[g][i]||(h[g].nocheck===!0||h[g].chkDisabled===!0)&&h[g].check_Child_State>0){l=!1;break}l&&e.setParentNodeCheckBox(b,a.getParentNode(),c,d)}},setSonNodeCheckBox:function(b,a,c,d){if(a){var h=b.data.key.children,i=b.data.key.checked,l=n(a,j.id.CHECK,b);d||(d=a);var g=!1;if(a[h])for(var k=0,m=a[h].length;k<m&&a.chkDisabled!==!0;k++){var o=a[h][k];e.setSonNodeCheckBox(b,
+o,c,d);o.chkDisabled===!0&&(g=!0)}if(a!=f.getRoot(b)&&a.chkDisabled!==!0){g&&a.nocheck!==!0&&f.makeChkFlag(b,a);if(a.nocheck!==!0&&a.chkDisabled!==!0){if(a[i]=c,!g)a.check_Child_State=a[h]&&a[h].length>0?c?2:0:-1}else a.check_Child_State=-1;e.setChkClass(b,l,a);b.check.autoCheckTrigger&&a!=d&&a.nocheck!==!0&&a.chkDisabled!==!0&&b.treeObj.trigger(j.event.CHECK,[null,b.treeId,a])}}}},event:{},data:{getRadioCheckedList:function(b){for(var a=f.getRoot(b).radioCheckedList,c=0,d=a.length;c<d;c++)f.getNodeCache(b,
+a[c].tId)||(a.splice(c,1),c--,d--);return a},getCheckStatus:function(b,a){if(!b.check.enable||a.nocheck||a.chkDisabled)return null;var c=b.data.key.checked;return{checked:a[c],half:a.halfCheck?a.halfCheck:b.check.chkStyle==j.radio.STYLE?a.check_Child_State===2:a[c]?a.check_Child_State>-1&&a.check_Child_State<2:a.check_Child_State>0}},getTreeCheckedNodes:function(b,a,c,d){if(!a)return[];for(var h=b.data.key.children,i=b.data.key.checked,e=c&&b.check.chkStyle==j.radio.STYLE&&b.check.radioType==j.radio.TYPE_ALL,
+d=!d?[]:d,g=0,k=a.length;g<k;g++){if(a[g].nocheck!==!0&&a[g].chkDisabled!==!0&&a[g][i]==c&&(d.push(a[g]),e))break;f.getTreeCheckedNodes(b,a[g][h],c,d);if(e&&d.length>0)break}return d},getTreeChangeCheckedNodes:function(b,a,c){if(!a)return[];for(var d=b.data.key.children,h=b.data.key.checked,c=!c?[]:c,i=0,e=a.length;i<e;i++)a[i].nocheck!==!0&&a[i].chkDisabled!==!0&&a[i][h]!=a[i].checkedOld&&c.push(a[i]),f.getTreeChangeCheckedNodes(b,a[i][d],c);return c},makeChkFlag:function(b,a){if(a){var c=b.data.key.children,
+d=b.data.key.checked,h=-1;if(a[c])for(var i=0,e=a[c].length;i<e;i++){var g=a[c][i],f=-1;if(b.check.chkStyle==j.radio.STYLE)if(f=g.nocheck===!0||g.chkDisabled===!0?g.check_Child_State:g.halfCheck===!0?2:g[d]?2:g.check_Child_State>0?2:0,f==2){h=2;break}else f==0&&(h=0);else if(b.check.chkStyle==j.checkbox.STYLE)if(f=g.nocheck===!0||g.chkDisabled===!0?g.check_Child_State:g.halfCheck===!0?1:g[d]?g.check_Child_State===-1||g.check_Child_State===2?2:1:g.check_Child_State>0?1:0,f===1){h=1;break}else if(f===
+2&&h>-1&&i>0&&f!==h){h=1;break}else if(h===2&&f>-1&&f<2){h=1;break}else f>-1&&(h=f)}a.check_Child_State=h}}}});var m=m.fn.zTree,k=m._z.tools,j=m.consts,e=m._z.view,f=m._z.data,n=k.$;f.exSetting(v);f.addInitBind(function(b){b.treeObj.bind(j.event.CHECK,function(a,c,d,h){k.apply(b.callback.onCheck,[c?c:a,d,h])})});f.addInitUnBind(function(b){b.treeObj.unbind(j.event.CHECK)});f.addInitCache(function(){});f.addInitNode(function(b,a,c,d){if(c){a=b.data.key.checked;typeof c[a]=="string"&&(c[a]=k.eqs(c[a],
+"true"));c[a]=!!c[a];c.checkedOld=c[a];if(typeof c.nocheck=="string")c.nocheck=k.eqs(c.nocheck,"true");c.nocheck=!!c.nocheck||b.check.nocheckInherit&&d&&!!d.nocheck;if(typeof c.chkDisabled=="string")c.chkDisabled=k.eqs(c.chkDisabled,"true");c.chkDisabled=!!c.chkDisabled||b.check.chkDisabledInherit&&d&&!!d.chkDisabled;if(typeof c.halfCheck=="string")c.halfCheck=k.eqs(c.halfCheck,"true");c.halfCheck=!!c.halfCheck;c.check_Child_State=-1;c.check_Focus=!1;c.getCheckStatus=function(){return f.getCheckStatus(b,
+c)};b.check.chkStyle==j.radio.STYLE&&b.check.radioType==j.radio.TYPE_ALL&&c[a]&&f.getRoot(b).radioCheckedList.push(c)}});f.addInitProxy(function(b){var a=b.target,c=f.getSetting(b.data.treeId),d="",h=null,e="",l=null;if(k.eqs(b.type,"mouseover")){if(c.check.enable&&k.eqs(a.tagName,"span")&&a.getAttribute("treeNode"+j.id.CHECK)!==null)d=k.getNodeMainDom(a).id,e="mouseoverCheck"}else if(k.eqs(b.type,"mouseout")){if(c.check.enable&&k.eqs(a.tagName,"span")&&a.getAttribute("treeNode"+j.id.CHECK)!==null)d=
+k.getNodeMainDom(a).id,e="mouseoutCheck"}else if(k.eqs(b.type,"click")&&c.check.enable&&k.eqs(a.tagName,"span")&&a.getAttribute("treeNode"+j.id.CHECK)!==null)d=k.getNodeMainDom(a).id,e="checkNode";if(d.length>0)switch(h=f.getNodeCache(c,d),e){case "checkNode":l=p;break;case "mouseoverCheck":l=q;break;case "mouseoutCheck":l=r}return{stop:e==="checkNode",node:h,nodeEventType:e,nodeEventCallback:l,treeEventType:"",treeEventCallback:null}},!0);f.addInitRoot(function(b){f.getRoot(b).radioCheckedList=[]});
+f.addBeforeA(function(b,a,c){b.check.enable&&(f.makeChkFlag(b,a),c.push("<span ID='",a.tId,j.id.CHECK,"' class='",e.makeChkClass(b,a),"' treeNode",j.id.CHECK,a.nocheck===!0?" style='display:none;'":"","></span>"))});f.addZTreeTools(function(b,a){a.checkNode=function(a,c,i,f){var g=b.data.key.checked;if(a.chkDisabled!==!0&&(c!==!0&&c!==!1&&(c=!a[g]),f=!!f,(a[g]!==c||i)&&!(f&&k.apply(this.setting.callback.beforeCheck,[b.treeId,a],!0)==!1)&&k.uCanDo(this.setting)&&b.check.enable&&a.nocheck!==!0))a[g]=
+c,c=n(a,j.id.CHECK,b),(i||b.check.chkStyle===j.radio.STYLE)&&e.checkNodeRelation(b,a),e.setChkClass(b,c,a),e.repairParentChkClassWithSelf(b,a),f&&b.treeObj.trigger(j.event.CHECK,[null,b.treeId,a])};a.checkAllNodes=function(a){e.repairAllChk(b,!!a)};a.getCheckedNodes=function(a){var c=b.data.key.children;return f.getTreeCheckedNodes(b,f.getRoot(b)[c],a!==!1)};a.getChangeCheckedNodes=function(){var a=b.data.key.children;return f.getTreeChangeCheckedNodes(b,f.getRoot(b)[a])};a.setChkDisabled=function(a,
+c,f,j){c=!!c;f=!!f;e.repairSonChkDisabled(b,a,c,!!j);e.repairParentChkDisabled(b,a.getParentNode(),c,f)};var c=a.updateNode;a.updateNode=function(d,f){c&&c.apply(a,arguments);if(d&&b.check.enable&&n(d,b).get(0)&&k.uCanDo(b)){var i=n(d,j.id.CHECK,b);(f==!0||b.check.chkStyle===j.radio.STYLE)&&e.checkNodeRelation(b,d);e.setChkClass(b,i,d);e.repairParentChkClassWithSelf(b,d)}}});var s=e.createNodes;e.createNodes=function(b,a,c,d){s&&s.apply(e,arguments);c&&e.repairParentChkClassWithSelf(b,d)};var t=e.removeNode;
+e.removeNode=function(b,a){var c=a.getParentNode();t&&t.apply(e,arguments);a&&c&&(e.repairChkClass(b,c),e.repairParentChkClass(b,c))};var u=e.appendNodes;e.appendNodes=function(b,a,c,d,h,i){var j="";u&&(j=u.apply(e,arguments));d&&f.makeChkFlag(b,d);return j}})(jQuery);
+
+/*
+ * JQuery zTree exedit v3.5.15
+ * http://zTree.me/
+ *
+ * Copyright (c) 2010 Hunter.z
+ *
+ * Licensed same as jquery - MIT License
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ * email: hunter.z@263.net
+ * Date: 2013-10-15
+ */
+(function(w){var I={event:{DRAG:"ztree_drag",DROP:"ztree_drop",REMOVE:"ztree_remove",RENAME:"ztree_rename"},id:{EDIT:"_edit",INPUT:"_input",REMOVE:"_remove"},move:{TYPE_INNER:"inner",TYPE_PREV:"prev",TYPE_NEXT:"next"},node:{CURSELECTED_EDIT:"curSelectedNode_Edit",TMPTARGET_TREE:"tmpTargetzTree",TMPTARGET_NODE:"tmpTargetNode"}},x={onHoverOverNode:function(b,a){var c=n.getSetting(b.data.treeId),d=n.getRoot(c);if(d.curHoverNode!=a)x.onHoverOutNode(b);d.curHoverNode=a;e.addHoverDom(c,a)},onHoverOutNode:function(b){var b=
+n.getSetting(b.data.treeId),a=n.getRoot(b);if(a.curHoverNode&&!n.isSelectedNode(b,a.curHoverNode))e.removeTreeDom(b,a.curHoverNode),a.curHoverNode=null},onMousedownNode:function(b,a){function c(b){if(B.dragFlag==0&&Math.abs(N-b.clientX)<f.edit.drag.minMoveSize&&Math.abs(O-b.clientY)<f.edit.drag.minMoveSize)return!0;var a,c,o,k,i;i=f.data.key.children;M.css("cursor","pointer");if(B.dragFlag==0){if(g.apply(f.callback.beforeDrag,[f.treeId,m],!0)==!1)return l(b),!0;for(a=0,c=m.length;a<c;a++){if(a==0)B.dragNodeShowBefore=
+[];o=m[a];o.isParent&&o.open?(e.expandCollapseNode(f,o,!o.open),B.dragNodeShowBefore[o.tId]=!0):B.dragNodeShowBefore[o.tId]=!1}B.dragFlag=1;t.showHoverDom=!1;g.showIfameMask(f,!0);o=!0;k=-1;if(m.length>1){var j=m[0].parentTId?m[0].getParentNode()[i]:n.getNodes(f);i=[];for(a=0,c=j.length;a<c;a++)if(B.dragNodeShowBefore[j[a].tId]!==void 0&&(o&&k>-1&&k+1!==a&&(o=!1),i.push(j[a]),k=a),m.length===i.length){m=i;break}}o&&(H=m[0].getPreNode(),R=m[m.length-1].getNextNode());C=p("<ul class='zTreeDragUL'></ul>",
+f);for(a=0,c=m.length;a<c;a++)if(o=m[a],o.editNameFlag=!1,e.selectNode(f,o,a>0),e.removeTreeDom(f,o),k=p("<li id='"+o.tId+"_tmp'></li>",f),k.append(p(o,d.id.A,f).clone()),k.css("padding","0"),k.children("#"+o.tId+d.id.A).removeClass(d.node.CURSELECTED),C.append(k),a==f.edit.drag.maxShowNodeNum-1){k=p("<li id='"+o.tId+"_moretmp'><a>  ...  </a></li>",f);C.append(k);break}C.attr("id",m[0].tId+d.id.UL+"_tmp");C.addClass(f.treeObj.attr("class"));C.appendTo(M);A=p("<span class='tmpzTreeMove_arrow'></span>",
+f);A.attr("id","zTreeMove_arrow_tmp");A.appendTo(M);f.treeObj.trigger(d.event.DRAG,[b,f.treeId,m])}if(B.dragFlag==1){s&&A.attr("id")==b.target.id&&u&&b.clientX+F.scrollLeft()+2>w("#"+u+d.id.A,s).offset().left?(o=w("#"+u+d.id.A,s),b.target=o.length>0?o.get(0):b.target):s&&(s.removeClass(d.node.TMPTARGET_TREE),u&&w("#"+u+d.id.A,s).removeClass(d.node.TMPTARGET_NODE+"_"+d.move.TYPE_PREV).removeClass(d.node.TMPTARGET_NODE+"_"+I.move.TYPE_NEXT).removeClass(d.node.TMPTARGET_NODE+"_"+I.move.TYPE_INNER));
+u=s=null;J=!1;h=f;o=n.getSettings();for(var D in o)if(o[D].treeId&&o[D].edit.enable&&o[D].treeId!=f.treeId&&(b.target.id==o[D].treeId||w(b.target).parents("#"+o[D].treeId).length>0))J=!0,h=o[D];D=F.scrollTop();k=F.scrollLeft();i=h.treeObj.offset();a=h.treeObj.get(0).scrollHeight;o=h.treeObj.get(0).scrollWidth;c=b.clientY+D-i.top;var q=h.treeObj.height()+i.top-b.clientY-D,r=b.clientX+k-i.left,x=h.treeObj.width()+i.left-b.clientX-k;i=c<f.edit.drag.borderMax&&c>f.edit.drag.borderMin;var j=q<f.edit.drag.borderMax&&
+q>f.edit.drag.borderMin,K=r<f.edit.drag.borderMax&&r>f.edit.drag.borderMin,G=x<f.edit.drag.borderMax&&x>f.edit.drag.borderMin,q=c>f.edit.drag.borderMin&&q>f.edit.drag.borderMin&&r>f.edit.drag.borderMin&&x>f.edit.drag.borderMin,r=i&&h.treeObj.scrollTop()<=0,x=j&&h.treeObj.scrollTop()+h.treeObj.height()+10>=a,P=K&&h.treeObj.scrollLeft()<=0,Q=G&&h.treeObj.scrollLeft()+h.treeObj.width()+10>=o;if(b.target&&g.isChildOrSelf(b.target,h.treeId)){for(var E=b.target;E&&E.tagName&&!g.eqs(E.tagName,"li")&&E.id!=
+h.treeId;)E=E.parentNode;var S=!0;for(a=0,c=m.length;a<c;a++)if(o=m[a],E.id===o.tId){S=!1;break}else if(p(o,f).find("#"+E.id).length>0){S=!1;break}if(S&&b.target&&g.isChildOrSelf(b.target,E.id+d.id.A))s=w(E),u=E.id}o=m[0];if(q&&g.isChildOrSelf(b.target,h.treeId)){if(!s&&(b.target.id==h.treeId||r||x||P||Q)&&(J||!J&&o.parentTId))s=h.treeObj;i?h.treeObj.scrollTop(h.treeObj.scrollTop()-10):j&&h.treeObj.scrollTop(h.treeObj.scrollTop()+10);K?h.treeObj.scrollLeft(h.treeObj.scrollLeft()-10):G&&h.treeObj.scrollLeft(h.treeObj.scrollLeft()+
+10);s&&s!=h.treeObj&&s.offset().left<h.treeObj.offset().left&&h.treeObj.scrollLeft(h.treeObj.scrollLeft()+s.offset().left-h.treeObj.offset().left)}C.css({top:b.clientY+D+3+"px",left:b.clientX+k+3+"px"});i=a=0;if(s&&s.attr("id")!=h.treeId){var y=u==null?null:n.getNodeCache(h,u);c=b.ctrlKey&&f.edit.drag.isMove&&f.edit.drag.isCopy||!f.edit.drag.isMove&&f.edit.drag.isCopy;a=!!(H&&u===H.tId);i=!!(R&&u===R.tId);k=o.parentTId&&o.parentTId==u;o=(c||!i)&&g.apply(h.edit.drag.prev,[h.treeId,m,y],!!h.edit.drag.prev);
+a=(c||!a)&&g.apply(h.edit.drag.next,[h.treeId,m,y],!!h.edit.drag.next);G=(c||!k)&&!(h.data.keep.leaf&&!y.isParent)&&g.apply(h.edit.drag.inner,[h.treeId,m,y],!!h.edit.drag.inner);if(!o&&!a&&!G){if(s=null,u="",v=d.move.TYPE_INNER,A.css({display:"none"}),window.zTreeMoveTimer)clearTimeout(window.zTreeMoveTimer),window.zTreeMoveTargetNodeTId=null}else{c=w("#"+u+d.id.A,s);i=y.isLastNode?null:w("#"+y.getNextNode().tId+d.id.A,s.next());j=c.offset().top;k=c.offset().left;K=o?G?0.25:a?0.5:1:-1;G=a?G?0.75:
+o?0.5:0:-1;b=(b.clientY+D-j)/c.height();(K==1||b<=K&&b>=-0.2)&&o?(a=1-A.width(),i=j-A.height()/2,v=d.move.TYPE_PREV):(G==0||b>=G&&b<=1.2)&&a?(a=1-A.width(),i=i==null||y.isParent&&y.open?j+c.height()-A.height()/2:i.offset().top-A.height()/2,v=d.move.TYPE_NEXT):(a=5-A.width(),i=j,v=d.move.TYPE_INNER);A.css({display:"block",top:i+"px",left:k+a+"px"});c.addClass(d.node.TMPTARGET_NODE+"_"+v);if(T!=u||U!=v)L=(new Date).getTime();if(y&&y.isParent&&v==d.move.TYPE_INNER&&(b=!0,window.zTreeMoveTimer&&window.zTreeMoveTargetNodeTId!==
+y.tId?(clearTimeout(window.zTreeMoveTimer),window.zTreeMoveTargetNodeTId=null):window.zTreeMoveTimer&&window.zTreeMoveTargetNodeTId===y.tId&&(b=!1),b))window.zTreeMoveTimer=setTimeout(function(){v==d.move.TYPE_INNER&&y&&y.isParent&&!y.open&&(new Date).getTime()-L>h.edit.drag.autoOpenTime&&g.apply(h.callback.beforeDragOpen,[h.treeId,y],!0)&&(e.switchNode(h,y),h.edit.drag.autoExpandTrigger&&h.treeObj.trigger(d.event.EXPAND,[h.treeId,y]))},h.edit.drag.autoOpenTime+50),window.zTreeMoveTargetNodeTId=y.tId}}else if(v=
+d.move.TYPE_INNER,s&&g.apply(h.edit.drag.inner,[h.treeId,m,null],!!h.edit.drag.inner)?s.addClass(d.node.TMPTARGET_TREE):s=null,A.css({display:"none"}),window.zTreeMoveTimer)clearTimeout(window.zTreeMoveTimer),window.zTreeMoveTargetNodeTId=null;T=u;U=v}return!1}function l(b){if(window.zTreeMoveTimer)clearTimeout(window.zTreeMoveTimer),window.zTreeMoveTargetNodeTId=null;U=T=null;F.unbind("mousemove",c);F.unbind("mouseup",l);F.unbind("selectstart",k);M.css("cursor","auto");s&&(s.removeClass(d.node.TMPTARGET_TREE),
+u&&w("#"+u+d.id.A,s).removeClass(d.node.TMPTARGET_NODE+"_"+d.move.TYPE_PREV).removeClass(d.node.TMPTARGET_NODE+"_"+I.move.TYPE_NEXT).removeClass(d.node.TMPTARGET_NODE+"_"+I.move.TYPE_INNER));g.showIfameMask(f,!1);t.showHoverDom=!0;if(B.dragFlag!=0){B.dragFlag=0;var a,i,j;for(a=0,i=m.length;a<i;a++)j=m[a],j.isParent&&B.dragNodeShowBefore[j.tId]&&!j.open&&(e.expandCollapseNode(f,j,!j.open),delete B.dragNodeShowBefore[j.tId]);C&&C.remove();A&&A.remove();var q=b.ctrlKey&&f.edit.drag.isMove&&f.edit.drag.isCopy||
+!f.edit.drag.isMove&&f.edit.drag.isCopy;!q&&s&&u&&m[0].parentTId&&u==m[0].parentTId&&v==d.move.TYPE_INNER&&(s=null);if(s){var r=u==null?null:n.getNodeCache(h,u);if(g.apply(f.callback.beforeDrop,[h.treeId,m,r,v,q],!0)==!1)e.selectNodes(x,m);else{var z=q?g.clone(m):m;a=function(){if(J){if(!q)for(var a=0,c=m.length;a<c;a++)e.removeNode(f,m[a]);if(v==d.move.TYPE_INNER)e.addNodes(h,r,z);else if(e.addNodes(h,r.getParentNode(),z),v==d.move.TYPE_PREV)for(a=0,c=z.length;a<c;a++)e.moveNode(h,r,z[a],v,!1);else for(a=
+-1,c=z.length-1;a<c;c--)e.moveNode(h,r,z[c],v,!1)}else if(q&&v==d.move.TYPE_INNER)e.addNodes(h,r,z);else if(q&&e.addNodes(h,r.getParentNode(),z),v!=d.move.TYPE_NEXT)for(a=0,c=z.length;a<c;a++)e.moveNode(h,r,z[a],v,!1);else for(a=-1,c=z.length-1;a<c;c--)e.moveNode(h,r,z[c],v,!1);e.selectNodes(h,z);p(z[0],f).focus().blur();f.treeObj.trigger(d.event.DROP,[b,h.treeId,z,r,v,q])};v==d.move.TYPE_INNER&&g.canAsync(h,r)?e.asyncNode(h,r,!1,a):a()}}else e.selectNodes(x,m),f.treeObj.trigger(d.event.DROP,[b,f.treeId,
+m,null,null,null])}}function k(){return!1}var i,j,f=n.getSetting(b.data.treeId),B=n.getRoot(f),t=n.getRoots();if(b.button==2||!f.edit.enable||!f.edit.drag.isCopy&&!f.edit.drag.isMove)return!0;var q=b.target,r=n.getRoot(f).curSelectedList,m=[];if(n.isSelectedNode(f,a))for(i=0,j=r.length;i<j;i++){if(r[i].editNameFlag&&g.eqs(q.tagName,"input")&&q.getAttribute("treeNode"+d.id.INPUT)!==null)return!0;m.push(r[i]);if(m[0].parentTId!==r[i].parentTId){m=[a];break}}else m=[a];e.editNodeBlur=!0;e.cancelCurEditNode(f);
+var F=w(f.treeObj.get(0).ownerDocument),M=w(f.treeObj.get(0).ownerDocument.body),C,A,s,J=!1,h=f,x=f,H,R,T=null,U=null,u=null,v=d.move.TYPE_INNER,N=b.clientX,O=b.clientY,L=(new Date).getTime();g.uCanDo(f)&&F.bind("mousemove",c);F.bind("mouseup",l);F.bind("selectstart",k);b.preventDefault&&b.preventDefault();return!0}};w.extend(!0,w.fn.zTree.consts,I);w.extend(!0,w.fn.zTree._z,{tools:{getAbs:function(b){b=b.getBoundingClientRect();return[b.left+(document.body.scrollLeft+document.documentElement.scrollLeft),
+b.top+(document.body.scrollTop+document.documentElement.scrollTop)]},inputFocus:function(b){b.get(0)&&(b.focus(),g.setCursorPosition(b.get(0),b.val().length))},inputSelect:function(b){b.get(0)&&(b.focus(),b.select())},setCursorPosition:function(b,a){if(b.setSelectionRange)b.focus(),b.setSelectionRange(a,a);else if(b.createTextRange){var c=b.createTextRange();c.collapse(!0);c.moveEnd("character",a);c.moveStart("character",a);c.select()}},showIfameMask:function(b,a){for(var c=n.getRoot(b);c.dragMaskList.length>
+0;)c.dragMaskList[0].remove(),c.dragMaskList.shift();if(a)for(var d=p("iframe",b),e=0,i=d.length;e<i;e++){var j=d.get(e),f=g.getAbs(j),j=p("<div id='zTreeMask_"+e+"' class='zTreeMask' style='top:"+f[1]+"px; left:"+f[0]+"px; width:"+j.offsetWidth+"px; height:"+j.offsetHeight+"px;'></div>",b);j.appendTo(p("body",b));c.dragMaskList.push(j)}}},view:{addEditBtn:function(b,a){if(!(a.editNameFlag||p(a,d.id.EDIT,b).length>0)&&g.apply(b.edit.showRenameBtn,[b.treeId,a],b.edit.showRenameBtn)){var c=p(a,d.id.A,
+b),l="<span class='"+d.className.BUTTON+" edit' id='"+a.tId+d.id.EDIT+"' title='"+g.apply(b.edit.renameTitle,[b.treeId,a],b.edit.renameTitle)+"' treeNode"+d.id.EDIT+" style='display:none;'></span>";c.append(l);p(a,d.id.EDIT,b).bind("click",function(){if(!g.uCanDo(b)||g.apply(b.callback.beforeEditName,[b.treeId,a],!0)==!1)return!1;e.editNode(b,a);return!1}).show()}},addRemoveBtn:function(b,a){if(!(a.editNameFlag||p(a,d.id.REMOVE,b).length>0)&&g.apply(b.edit.showRemoveBtn,[b.treeId,a],b.edit.showRemoveBtn)){var c=
+p(a,d.id.A,b),l="<span class='"+d.className.BUTTON+" remove' id='"+a.tId+d.id.REMOVE+"' title='"+g.apply(b.edit.removeTitle,[b.treeId,a],b.edit.removeTitle)+"' treeNode"+d.id.REMOVE+" style='display:none;'></span>";c.append(l);p(a,d.id.REMOVE,b).bind("click",function(){if(!g.uCanDo(b)||g.apply(b.callback.beforeRemove,[b.treeId,a],!0)==!1)return!1;e.removeNode(b,a);b.treeObj.trigger(d.event.REMOVE,[b.treeId,a]);return!1}).bind("mousedown",function(){return!0}).show()}},addHoverDom:function(b,a){if(n.getRoots().showHoverDom)a.isHover=
+!0,b.edit.enable&&(e.addEditBtn(b,a),e.addRemoveBtn(b,a)),g.apply(b.view.addHoverDom,[b.treeId,a])},cancelCurEditNode:function(b,a,c){var l=n.getRoot(b),k=b.data.key.name,i=l.curEditNode;if(i){var j=l.curEditInput,a=a?a:c?i[k]:j.val();if(g.apply(b.callback.beforeRename,[b.treeId,i,a,c],!0)===!1)return!1;else i[k]=a,b.treeObj.trigger(d.event.RENAME,[b.treeId,i,c]);p(i,d.id.A,b).removeClass(d.node.CURSELECTED_EDIT);j.unbind();e.setNodeName(b,i);i.editNameFlag=!1;l.curEditNode=null;l.curEditInput=null;
+e.selectNode(b,i,!1)}return l.noSelection=!0},editNode:function(b,a){var c=n.getRoot(b);e.editNodeBlur=!1;if(n.isSelectedNode(b,a)&&c.curEditNode==a&&a.editNameFlag)setTimeout(function(){g.inputFocus(c.curEditInput)},0);else{var l=b.data.key.name;a.editNameFlag=!0;e.removeTreeDom(b,a);e.cancelCurEditNode(b);e.selectNode(b,a,!1);p(a,d.id.SPAN,b).html("<input type=text class='rename' id='"+a.tId+d.id.INPUT+"' treeNode"+d.id.INPUT+" >");var k=p(a,d.id.INPUT,b);k.attr("value",a[l]);b.edit.editNameSelectAll?
+g.inputSelect(k):g.inputFocus(k);k.bind("blur",function(){e.editNodeBlur||e.cancelCurEditNode(b)}).bind("keydown",function(a){a.keyCode=="13"?(e.editNodeBlur=!0,e.cancelCurEditNode(b)):a.keyCode=="27"&&e.cancelCurEditNode(b,null,!0)}).bind("click",function(){return!1}).bind("dblclick",function(){return!1});p(a,d.id.A,b).addClass(d.node.CURSELECTED_EDIT);c.curEditInput=k;c.noSelection=!1;c.curEditNode=a}},moveNode:function(b,a,c,l,k,i){var j=n.getRoot(b),f=b.data.key.children;if(a!=c&&(!b.data.keep.leaf||
+!a||a.isParent||l!=d.move.TYPE_INNER)){var g=c.parentTId?c.getParentNode():j,t=a===null||a==j;t&&a===null&&(a=j);if(t)l=d.move.TYPE_INNER;j=a.parentTId?a.getParentNode():j;if(l!=d.move.TYPE_PREV&&l!=d.move.TYPE_NEXT)l=d.move.TYPE_INNER;if(l==d.move.TYPE_INNER)if(t)c.parentTId=null;else{if(!a.isParent)a.isParent=!0,a.open=!!a.open,e.setNodeLineIcos(b,a);c.parentTId=a.tId}var q;t?q=t=b.treeObj:(!i&&l==d.move.TYPE_INNER?e.expandCollapseNode(b,a,!0,!1):i||e.expandCollapseNode(b,a.getParentNode(),!0,!1),
+t=p(a,b),q=p(a,d.id.UL,b),t.get(0)&&!q.get(0)&&(q=[],e.makeUlHtml(b,a,q,""),t.append(q.join(""))),q=p(a,d.id.UL,b));var r=p(c,b);r.get(0)?t.get(0)||r.remove():r=e.appendNodes(b,c.level,[c],null,!1,!0).join("");q.get(0)&&l==d.move.TYPE_INNER?q.append(r):t.get(0)&&l==d.move.TYPE_PREV?t.before(r):t.get(0)&&l==d.move.TYPE_NEXT&&t.after(r);var m=-1,w=0,x=null,t=null,C=c.level;if(c.isFirstNode){if(m=0,g[f].length>1)x=g[f][1],x.isFirstNode=!0}else if(c.isLastNode)m=g[f].length-1,x=g[f][m-1],x.isLastNode=
+!0;else for(q=0,r=g[f].length;q<r;q++)if(g[f][q].tId==c.tId){m=q;break}m>=0&&g[f].splice(m,1);if(l!=d.move.TYPE_INNER)for(q=0,r=j[f].length;q<r;q++)j[f][q].tId==a.tId&&(w=q);if(l==d.move.TYPE_INNER){a[f]||(a[f]=[]);if(a[f].length>0)t=a[f][a[f].length-1],t.isLastNode=!1;a[f].splice(a[f].length,0,c);c.isLastNode=!0;c.isFirstNode=a[f].length==1}else a.isFirstNode&&l==d.move.TYPE_PREV?(j[f].splice(w,0,c),t=a,t.isFirstNode=!1,c.parentTId=a.parentTId,c.isFirstNode=!0,c.isLastNode=!1):a.isLastNode&&l==d.move.TYPE_NEXT?
+(j[f].splice(w+1,0,c),t=a,t.isLastNode=!1,c.parentTId=a.parentTId,c.isFirstNode=!1,c.isLastNode=!0):(l==d.move.TYPE_PREV?j[f].splice(w,0,c):j[f].splice(w+1,0,c),c.parentTId=a.parentTId,c.isFirstNode=!1,c.isLastNode=!1);n.fixPIdKeyValue(b,c);n.setSonNodeLevel(b,c.getParentNode(),c);e.setNodeLineIcos(b,c);e.repairNodeLevelClass(b,c,C);!b.data.keep.parent&&g[f].length<1?(g.isParent=!1,g.open=!1,a=p(g,d.id.UL,b),l=p(g,d.id.SWITCH,b),f=p(g,d.id.ICON,b),e.replaceSwitchClass(g,l,d.folder.DOCU),e.replaceIcoClass(g,
+f,d.folder.DOCU),a.css("display","none")):x&&e.setNodeLineIcos(b,x);t&&e.setNodeLineIcos(b,t);b.check&&b.check.enable&&e.repairChkClass&&(e.repairChkClass(b,g),e.repairParentChkClassWithSelf(b,g),g!=c.parent&&e.repairParentChkClassWithSelf(b,c));i||e.expandCollapseParentNode(b,c.getParentNode(),!0,k)}},removeEditBtn:function(b,a){p(a,d.id.EDIT,b).unbind().remove()},removeRemoveBtn:function(b,a){p(a,d.id.REMOVE,b).unbind().remove()},removeTreeDom:function(b,a){a.isHover=!1;e.removeEditBtn(b,a);e.removeRemoveBtn(b,
+a);g.apply(b.view.removeHoverDom,[b.treeId,a])},repairNodeLevelClass:function(b,a,c){if(c!==a.level){var e=p(a,b),g=p(a,d.id.A,b),b=p(a,d.id.UL,b),c=d.className.LEVEL+c,a=d.className.LEVEL+a.level;e.removeClass(c);e.addClass(a);g.removeClass(c);g.addClass(a);b.removeClass(c);b.addClass(a)}},selectNodes:function(b,a){for(var c=0,d=a.length;c<d;c++)e.selectNode(b,a[c],c>0)}},event:{},data:{setSonNodeLevel:function(b,a,c){if(c){var d=b.data.key.children;c.level=a?a.level+1:0;if(c[d])for(var a=0,e=c[d].length;a<
+e;a++)c[d][a]&&n.setSonNodeLevel(b,c,c[d][a])}}}});var H=w.fn.zTree,g=H._z.tools,d=H.consts,e=H._z.view,n=H._z.data,p=g.$;n.exSetting({edit:{enable:!1,editNameSelectAll:!1,showRemoveBtn:!0,showRenameBtn:!0,removeTitle:"remove",renameTitle:"rename",drag:{autoExpandTrigger:!1,isCopy:!0,isMove:!0,prev:!0,next:!0,inner:!0,minMoveSize:5,borderMax:10,borderMin:-5,maxShowNodeNum:5,autoOpenTime:500}},view:{addHoverDom:null,removeHoverDom:null},callback:{beforeDrag:null,beforeDragOpen:null,beforeDrop:null,
+beforeEditName:null,beforeRename:null,onDrag:null,onDrop:null,onRename:null}});n.addInitBind(function(b){var a=b.treeObj,c=d.event;a.bind(c.RENAME,function(a,c,d,e){g.apply(b.callback.onRename,[a,c,d,e])});a.bind(c.REMOVE,function(a,c,d){g.apply(b.callback.onRemove,[a,c,d])});a.bind(c.DRAG,function(a,c,d,e){g.apply(b.callback.onDrag,[c,d,e])});a.bind(c.DROP,function(a,c,d,e,f,n,p){g.apply(b.callback.onDrop,[c,d,e,f,n,p])})});n.addInitUnBind(function(b){var b=b.treeObj,a=d.event;b.unbind(a.RENAME);
+b.unbind(a.REMOVE);b.unbind(a.DRAG);b.unbind(a.DROP)});n.addInitCache(function(){});n.addInitNode(function(b,a,c){if(c)c.isHover=!1,c.editNameFlag=!1});n.addInitProxy(function(b){var a=b.target,c=n.getSetting(b.data.treeId),e=b.relatedTarget,k="",i=null,j="",f=null,p=null;if(g.eqs(b.type,"mouseover")){if(p=g.getMDom(c,a,[{tagName:"a",attrName:"treeNode"+d.id.A}]))k=g.getNodeMainDom(p).id,j="hoverOverNode"}else if(g.eqs(b.type,"mouseout"))p=g.getMDom(c,e,[{tagName:"a",attrName:"treeNode"+d.id.A}]),
+p||(k="remove",j="hoverOutNode");else if(g.eqs(b.type,"mousedown")&&(p=g.getMDom(c,a,[{tagName:"a",attrName:"treeNode"+d.id.A}])))k=g.getNodeMainDom(p).id,j="mousedownNode";if(k.length>0)switch(i=n.getNodeCache(c,k),j){case "mousedownNode":f=x.onMousedownNode;break;case "hoverOverNode":f=x.onHoverOverNode;break;case "hoverOutNode":f=x.onHoverOutNode}return{stop:!1,node:i,nodeEventType:j,nodeEventCallback:f,treeEventType:"",treeEventCallback:null}});n.addInitRoot(function(b){var b=n.getRoot(b),a=n.getRoots();
+b.curEditNode=null;b.curEditInput=null;b.curHoverNode=null;b.dragFlag=0;b.dragNodeShowBefore=[];b.dragMaskList=[];a.showHoverDom=!0});n.addZTreeTools(function(b,a){a.cancelEditName=function(a){n.getRoot(b).curEditNode&&e.cancelCurEditNode(b,a?a:null,!0)};a.copyNode=function(a,l,k,i){if(!l)return null;if(a&&!a.isParent&&b.data.keep.leaf&&k===d.move.TYPE_INNER)return null;var j=g.clone(l);if(!a)a=null,k=d.move.TYPE_INNER;k==d.move.TYPE_INNER?(l=function(){e.addNodes(b,a,[j],i)},g.canAsync(b,a)?e.asyncNode(b,
+a,i,l):l()):(e.addNodes(b,a.parentNode,[j],i),e.moveNode(b,a,j,k,!1,i));return j};a.editName=function(a){a&&a.tId&&a===n.getNodeCache(b,a.tId)&&(a.parentTId&&e.expandCollapseParentNode(b,a.getParentNode(),!0),e.editNode(b,a))};a.moveNode=function(a,l,k,i){function j(){e.moveNode(b,a,l,k,!1,i)}if(!l)return l;if(a&&!a.isParent&&b.data.keep.leaf&&k===d.move.TYPE_INNER)return null;else if(a&&(l.parentTId==a.tId&&k==d.move.TYPE_INNER||p(l,b).find("#"+a.tId).length>0))return null;else a||(a=null);g.canAsync(b,
+a)&&k===d.move.TYPE_INNER?e.asyncNode(b,a,i,j):j();return l};a.setEditable=function(a){b.edit.enable=a;return this.refresh()}});var N=e.cancelPreSelectedNode;e.cancelPreSelectedNode=function(b,a){for(var c=n.getRoot(b).curSelectedList,d=0,g=c.length;d<g;d++)if(!a||a===c[d])if(e.removeTreeDom(b,c[d]),a)break;N&&N.apply(e,arguments)};var O=e.createNodes;e.createNodes=function(b,a,c,d){O&&O.apply(e,arguments);c&&e.repairParentChkClassWithSelf&&e.repairParentChkClassWithSelf(b,d)};var V=e.makeNodeUrl;
+e.makeNodeUrl=function(b,a){return b.edit.enable?null:V.apply(e,arguments)};var L=e.removeNode;e.removeNode=function(b,a){var c=n.getRoot(b);if(c.curEditNode===a)c.curEditNode=null;L&&L.apply(e,arguments)};var P=e.selectNode;e.selectNode=function(b,a,c){var d=n.getRoot(b);if(n.isSelectedNode(b,a)&&d.curEditNode==a&&a.editNameFlag)return!1;P&&P.apply(e,arguments);e.addHoverDom(b,a);return!0};var Q=g.uCanDo;g.uCanDo=function(b,a){var c=n.getRoot(b);if(a&&(g.eqs(a.type,"mouseover")||g.eqs(a.type,"mouseout")||
+g.eqs(a.type,"mousedown")||g.eqs(a.type,"mouseup")))return!0;if(c.curEditNode)e.editNodeBlur=!1,c.curEditInput.focus();return!c.curEditNode&&(Q?Q.apply(e,arguments):!0)}})(jQuery);
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/js/jquery.ztree.core-3.5.js b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/js/jquery.ztree.core-3.5.js
new file mode 100644
index 0000000..2b274e3
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/js/jquery.ztree.core-3.5.js
@@ -0,0 +1,1677 @@
+/*
+ * JQuery zTree core v3.5.15
+ * http://zTree.me/
+ *
+ * Copyright (c) 2010 Hunter.z
+ *
+ * Licensed same as jquery - MIT License
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ * email: hunter.z@263.net
+ * Date: 2013-10-15
+ */
+(function($){
+	var settings = {}, roots = {}, caches = {},
+	//default consts of core
+	_consts = {
+		className: {
+			BUTTON: "button",
+			LEVEL: "level",
+			ICO_LOADING: "ico_loading",
+			SWITCH: "switch"
+		},
+		event: {
+			NODECREATED: "ztree_nodeCreated",
+			CLICK: "ztree_click",
+			EXPAND: "ztree_expand",
+			COLLAPSE: "ztree_collapse",
+			ASYNC_SUCCESS: "ztree_async_success",
+			ASYNC_ERROR: "ztree_async_error"
+		},
+		id: {
+			A: "_a",
+			ICON: "_ico",
+			SPAN: "_span",
+			SWITCH: "_switch",
+			UL: "_ul"
+		},
+		line: {
+			ROOT: "root",
+			ROOTS: "roots",
+			CENTER: "center",
+			BOTTOM: "bottom",
+			NOLINE: "noline",
+			LINE: "line"
+		},
+		folder: {
+			OPEN: "open",
+			CLOSE: "close",
+			DOCU: "docu"
+		},
+		node: {
+			CURSELECTED: "curSelectedNode"
+		}
+	},
+	//default setting of core
+	_setting = {
+		treeId: "",
+		treeObj: null,
+		view: {
+			addDiyDom: null,
+			autoCancelSelected: true,
+			dblClickExpand: true,
+			expandSpeed: "fast",
+			fontCss: {},
+			nameIsHTML: false,
+			selectedMulti: true,
+			showIcon: true,
+			showLine: true,
+			showTitle: true,
+			txtSelectedEnable: false
+		},
+		data: {
+			key: {
+				children: "children",
+				name: "name",
+				title: "",
+				url: "url"
+			},
+			simpleData: {
+				enable: false,
+				idKey: "id",
+				pIdKey: "pId",
+				rootPId: null
+			},
+			keep: {
+				parent: false,
+				leaf: false
+			}
+		},
+		async: {
+			enable: false,
+			contentType: "application/x-www-form-urlencoded",
+			type: "post",
+			dataType: "text",
+			url: "",
+			autoParam: [],
+			otherParam: [],
+			dataFilter: null
+		},
+		callback: {
+			beforeAsync:null,
+			beforeClick:null,
+			beforeDblClick:null,
+			beforeRightClick:null,
+			beforeMouseDown:null,
+			beforeMouseUp:null,
+			beforeExpand:null,
+			beforeCollapse:null,
+			beforeRemove:null,
+
+			onAsyncError:null,
+			onAsyncSuccess:null,
+			onNodeCreated:null,
+			onClick:null,
+			onDblClick:null,
+			onRightClick:null,
+			onMouseDown:null,
+			onMouseUp:null,
+			onExpand:null,
+			onCollapse:null,
+			onRemove:null
+		}
+	},
+	//default root of core
+	//zTree use root to save full data
+	_initRoot = function (setting) {
+		var r = data.getRoot(setting);
+		if (!r) {
+			r = {};
+			data.setRoot(setting, r);
+		}
+		r[setting.data.key.children] = [];
+		r.expandTriggerFlag = false;
+		r.curSelectedList = [];
+		r.noSelection = true;
+		r.createdNodes = [];
+		r.zId = 0;
+		r._ver = (new Date()).getTime();
+	},
+	//default cache of core
+	_initCache = function(setting) {
+		var c = data.getCache(setting);
+		if (!c) {
+			c = {};
+			data.setCache(setting, c);
+		}
+		c.nodes = [];
+		c.doms = [];
+	},
+	//default bindEvent of core
+	_bindEvent = function(setting) {
+		var o = setting.treeObj,
+		c = consts.event;
+		o.bind(c.NODECREATED, function (event, treeId, node) {
+			tools.apply(setting.callback.onNodeCreated, [event, treeId, node]);
+		});
+
+		o.bind(c.CLICK, function (event, srcEvent, treeId, node, clickFlag) {
+			tools.apply(setting.callback.onClick, [srcEvent, treeId, node, clickFlag]);
+		});
+
+		o.bind(c.EXPAND, function (event, treeId, node) {
+			tools.apply(setting.callback.onExpand, [event, treeId, node]);
+		});
+
+		o.bind(c.COLLAPSE, function (event, treeId, node) {
+			tools.apply(setting.callback.onCollapse, [event, treeId, node]);
+		});
+
+		o.bind(c.ASYNC_SUCCESS, function (event, treeId, node, msg) {
+			tools.apply(setting.callback.onAsyncSuccess, [event, treeId, node, msg]);
+		});
+
+		o.bind(c.ASYNC_ERROR, function (event, treeId, node, XMLHttpRequest, textStatus, errorThrown) {
+			tools.apply(setting.callback.onAsyncError, [event, treeId, node, XMLHttpRequest, textStatus, errorThrown]);
+		});
+	},
+	_unbindEvent = function(setting) {
+		var o = setting.treeObj,
+		c = consts.event;
+		o.unbind(c.NODECREATED)
+		.unbind(c.CLICK)
+		.unbind(c.EXPAND)
+		.unbind(c.COLLAPSE)
+		.unbind(c.ASYNC_SUCCESS)
+		.unbind(c.ASYNC_ERROR);
+	},
+	//default event proxy of core
+	_eventProxy = function(event) {
+		var target = event.target,
+		setting = data.getSetting(event.data.treeId),
+		tId = "", node = null,
+		nodeEventType = "", treeEventType = "",
+		nodeEventCallback = null, treeEventCallback = null,
+		tmp = null;
+
+		if (tools.eqs(event.type, "mousedown")) {
+			treeEventType = "mousedown";
+		} else if (tools.eqs(event.type, "mouseup")) {
+			treeEventType = "mouseup";
+		} else if (tools.eqs(event.type, "contextmenu")) {
+			treeEventType = "contextmenu";
+		} else if (tools.eqs(event.type, "click")) {
+			if (tools.eqs(target.tagName, "span") && target.getAttribute("treeNode"+ consts.id.SWITCH) !== null) {
+				tId = tools.getNodeMainDom(target).id;
+				nodeEventType = "switchNode";
+			} else {
+				tmp = tools.getMDom(setting, target, [{tagName:"a", attrName:"treeNode"+consts.id.A}]);
+				if (tmp) {
+					tId = tools.getNodeMainDom(tmp).id;
+					nodeEventType = "clickNode";
+				}
+			}
+		} else if (tools.eqs(event.type, "dblclick")) {
+			treeEventType = "dblclick";
+			tmp = tools.getMDom(setting, target, [{tagName:"a", attrName:"treeNode"+consts.id.A}]);
+			if (tmp) {
+				tId = tools.getNodeMainDom(tmp).id;
+				nodeEventType = "switchNode";
+			}
+		}
+		if (treeEventType.length > 0 && tId.length == 0) {
+			tmp = tools.getMDom(setting, target, [{tagName:"a", attrName:"treeNode"+consts.id.A}]);
+			if (tmp) {tId = tools.getNodeMainDom(tmp).id;}
+		}
+		// event to node
+		if (tId.length>0) {
+			node = data.getNodeCache(setting, tId);
+			switch (nodeEventType) {
+				case "switchNode" :
+					if (!node.isParent) {
+						nodeEventType = "";
+					} else if (tools.eqs(event.type, "click")
+						|| (tools.eqs(event.type, "dblclick") && tools.apply(setting.view.dblClickExpand, [setting.treeId, node], setting.view.dblClickExpand))) {
+						nodeEventCallback = handler.onSwitchNode;
+					} else {
+						nodeEventType = "";
+					}
+					break;
+				case "clickNode" :
+					nodeEventCallback = handler.onClickNode;
+					break;
+			}
+		}
+		// event to zTree
+		switch (treeEventType) {
+			case "mousedown" :
+				treeEventCallback = handler.onZTreeMousedown;
+				break;
+			case "mouseup" :
+				treeEventCallback = handler.onZTreeMouseup;
+				break;
+			case "dblclick" :
+				treeEventCallback = handler.onZTreeDblclick;
+				break;
+			case "contextmenu" :
+				treeEventCallback = handler.onZTreeContextmenu;
+				break;
+		}
+		var proxyResult = {
+			stop: false,
+			node: node,
+			nodeEventType: nodeEventType,
+			nodeEventCallback: nodeEventCallback,
+			treeEventType: treeEventType,
+			treeEventCallback: treeEventCallback
+		};
+		return proxyResult
+	},
+	//default init node of core
+	_initNode = function(setting, level, n, parentNode, isFirstNode, isLastNode, openFlag) {
+		if (!n) return;
+		var r = data.getRoot(setting),
+		childKey = setting.data.key.children;
+		n.level = level;
+		n.tId = setting.treeId + "_" + (++r.zId);
+		n.parentTId = parentNode ? parentNode.tId : null;
+		n.open = (typeof n.open == "string") ? tools.eqs(n.open, "true") : !!n.open;
+		if (n[childKey] && n[childKey].length > 0) {
+			n.isParent = true;
+			n.zAsync = true;
+		} else {
+			n.isParent = (typeof n.isParent == "string") ? tools.eqs(n.isParent, "true") : !!n.isParent;
+			n.open = (n.isParent && !setting.async.enable) ? n.open : false;
+			n.zAsync = !n.isParent;
+		}
+		n.isFirstNode = isFirstNode;
+		n.isLastNode = isLastNode;
+		n.getParentNode = function() {return data.getNodeCache(setting, n.parentTId);};
+		n.getPreNode = function() {return data.getPreNode(setting, n);};
+		n.getNextNode = function() {return data.getNextNode(setting, n);};
+		n.isAjaxing = false;
+		data.fixPIdKeyValue(setting, n);
+	},
+	_init = {
+		bind: [_bindEvent],
+		unbind: [_unbindEvent],
+		caches: [_initCache],
+		nodes: [_initNode],
+		proxys: [_eventProxy],
+		roots: [_initRoot],
+		beforeA: [],
+		afterA: [],
+		innerBeforeA: [],
+		innerAfterA: [],
+		zTreeTools: []
+	},
+	//method of operate data
+	data = {
+		addNodeCache: function(setting, node) {
+			data.getCache(setting).nodes[data.getNodeCacheId(node.tId)] = node;
+		},
+		getNodeCacheId: function(tId) {
+			return tId.substring(tId.lastIndexOf("_")+1);
+		},
+		addAfterA: function(afterA) {
+			_init.afterA.push(afterA);
+		},
+		addBeforeA: function(beforeA) {
+			_init.beforeA.push(beforeA);
+		},
+		addInnerAfterA: function(innerAfterA) {
+			_init.innerAfterA.push(innerAfterA);
+		},
+		addInnerBeforeA: function(innerBeforeA) {
+			_init.innerBeforeA.push(innerBeforeA);
+		},
+		addInitBind: function(bindEvent) {
+			_init.bind.push(bindEvent);
+		},
+		addInitUnBind: function(unbindEvent) {
+			_init.unbind.push(unbindEvent);
+		},
+		addInitCache: function(initCache) {
+			_init.caches.push(initCache);
+		},
+		addInitNode: function(initNode) {
+			_init.nodes.push(initNode);
+		},
+		addInitProxy: function(initProxy, isFirst) {
+			if (!!isFirst) {
+				_init.proxys.splice(0,0,initProxy);
+			} else {
+				_init.proxys.push(initProxy);
+			}
+		},
+		addInitRoot: function(initRoot) {
+			_init.roots.push(initRoot);
+		},
+		addNodesData: function(setting, parentNode, nodes) {
+			var childKey = setting.data.key.children;
+			if (!parentNode[childKey]) parentNode[childKey] = [];
+			if (parentNode[childKey].length > 0) {
+				parentNode[childKey][parentNode[childKey].length - 1].isLastNode = false;
+				view.setNodeLineIcos(setting, parentNode[childKey][parentNode[childKey].length - 1]);
+			}
+			parentNode.isParent = true;
+			parentNode[childKey] = parentNode[childKey].concat(nodes);
+		},
+		addSelectedNode: function(setting, node) {
+			var root = data.getRoot(setting);
+			if (!data.isSelectedNode(setting, node)) {
+				root.curSelectedList.push(node);
+			}
+		},
+		addCreatedNode: function(setting, node) {
+			if (!!setting.callback.onNodeCreated || !!setting.view.addDiyDom) {
+				var root = data.getRoot(setting);
+				root.createdNodes.push(node);
+			}
+		},
+		addZTreeTools: function(zTreeTools) {
+			_init.zTreeTools.push(zTreeTools);
+		},
+		exSetting: function(s) {
+			$.extend(true, _setting, s);
+		},
+		fixPIdKeyValue: function(setting, node) {
+			if (setting.data.simpleData.enable) {
+				node[setting.data.simpleData.pIdKey] = node.parentTId ? node.getParentNode()[setting.data.simpleData.idKey] : setting.data.simpleData.rootPId;
+			}
+		},
+		getAfterA: function(setting, node, array) {
+			for (var i=0, j=_init.afterA.length; i<j; i++) {
+				_init.afterA[i].apply(this, arguments);
+			}
+		},
+		getBeforeA: function(setting, node, array) {
+			for (var i=0, j=_init.beforeA.length; i<j; i++) {
+				_init.beforeA[i].apply(this, arguments);
+			}
+		},
+		getInnerAfterA: function(setting, node, array) {
+			for (var i=0, j=_init.innerAfterA.length; i<j; i++) {
+				_init.innerAfterA[i].apply(this, arguments);
+			}
+		},
+		getInnerBeforeA: function(setting, node, array) {
+			for (var i=0, j=_init.innerBeforeA.length; i<j; i++) {
+				_init.innerBeforeA[i].apply(this, arguments);
+			}
+		},
+		getCache: function(setting) {
+			return caches[setting.treeId];
+		},
+		getNextNode: function(setting, node) {
+			if (!node) return null;
+			var childKey = setting.data.key.children,
+			p = node.parentTId ? node.getParentNode() : data.getRoot(setting);
+			for (var i=0, l=p[childKey].length-1; i<=l; i++) {
+				if (p[childKey][i] === node) {
+					return (i==l ? null : p[childKey][i+1]);
+				}
+			}
+			return null;
+		},
+		getNodeByParam: function(setting, nodes, key, value) {
+			if (!nodes || !key) return null;
+			var childKey = setting.data.key.children;
+			for (var i = 0, l = nodes.length; i < l; i++) {
+				if (nodes[i][key] == value) {
+					return nodes[i];
+				}
+				var tmp = data.getNodeByParam(setting, nodes[i][childKey], key, value);
+				if (tmp) return tmp;
+			}
+			return null;
+		},
+		getNodeCache: function(setting, tId) {
+			if (!tId) return null;
+			var n = caches[setting.treeId].nodes[data.getNodeCacheId(tId)];
+			return n ? n : null;
+		},
+		getNodeName: function(setting, node) {
+			var nameKey = setting.data.key.name;
+			return "" + node[nameKey];
+		},
+		getNodeTitle: function(setting, node) {
+			var t = setting.data.key.title === "" ? setting.data.key.name : setting.data.key.title;
+			return "" + node[t];
+		},
+		getNodes: function(setting) {
+			return data.getRoot(setting)[setting.data.key.children];
+		},
+		getNodesByParam: function(setting, nodes, key, value) {
+			if (!nodes || !key) return [];
+			var childKey = setting.data.key.children,
+			result = [];
+			for (var i = 0, l = nodes.length; i < l; i++) {
+				if (nodes[i][key] == value) {
+					result.push(nodes[i]);
+				}
+				result = result.concat(data.getNodesByParam(setting, nodes[i][childKey], key, value));
+			}
+			return result;
+		},
+		getNodesByParamFuzzy: function(setting, nodes, key, value) {
+			if (!nodes || !key) return [];
+			var childKey = setting.data.key.children,
+			result = [];
+			value = value.toLowerCase();
+			for (var i = 0, l = nodes.length; i < l; i++) {
+				if (typeof nodes[i][key] == "string" && nodes[i][key].toLowerCase().indexOf(value)>-1) {
+					result.push(nodes[i]);
+				}
+				result = result.concat(data.getNodesByParamFuzzy(setting, nodes[i][childKey], key, value));
+			}
+			return result;
+		},
+		getNodesByFilter: function(setting, nodes, filter, isSingle, invokeParam) {
+			if (!nodes) return (isSingle ? null : []);
+			var childKey = setting.data.key.children,
+			result = isSingle ? null : [];
+			for (var i = 0, l = nodes.length; i < l; i++) {
+				if (tools.apply(filter, [nodes[i], invokeParam], false)) {
+					if (isSingle) {return nodes[i];}
+					result.push(nodes[i]);
+				}
+				var tmpResult = data.getNodesByFilter(setting, nodes[i][childKey], filter, isSingle, invokeParam);
+				if (isSingle && !!tmpResult) {return tmpResult;}
+				result = isSingle ? tmpResult : result.concat(tmpResult);
+			}
+			return result;
+		},
+		getPreNode: function(setting, node) {
+			if (!node) return null;
+			var childKey = setting.data.key.children,
+			p = node.parentTId ? node.getParentNode() : data.getRoot(setting);
+			for (var i=0, l=p[childKey].length; i<l; i++) {
+				if (p[childKey][i] === node) {
+					return (i==0 ? null : p[childKey][i-1]);
+				}
+			}
+			return null;
+		},
+		getRoot: function(setting) {
+			return setting ? roots[setting.treeId] : null;
+		},
+		getRoots: function() {
+			return roots;
+		},
+		getSetting: function(treeId) {
+			return settings[treeId];
+		},
+		getSettings: function() {
+			return settings;
+		},
+		getZTreeTools: function(treeId) {
+			var r = this.getRoot(this.getSetting(treeId));
+			return r ? r.treeTools : null;
+		},
+		initCache: function(setting) {
+			for (var i=0, j=_init.caches.length; i<j; i++) {
+				_init.caches[i].apply(this, arguments);
+			}
+		},
+		initNode: function(setting, level, node, parentNode, preNode, nextNode) {
+			for (var i=0, j=_init.nodes.length; i<j; i++) {
+				_init.nodes[i].apply(this, arguments);
+			}
+		},
+		initRoot: function(setting) {
+			for (var i=0, j=_init.roots.length; i<j; i++) {
+				_init.roots[i].apply(this, arguments);
+			}
+		},
+		isSelectedNode: function(setting, node) {
+			var root = data.getRoot(setting);
+			for (var i=0, j=root.curSelectedList.length; i<j; i++) {
+				if(node === root.curSelectedList[i]) return true;
+			}
+			return false;
+		},
+		removeNodeCache: function(setting, node) {
+			var childKey = setting.data.key.children;
+			if (node[childKey]) {
+				for (var i=0, l=node[childKey].length; i<l; i++) {
+					arguments.callee(setting, node[childKey][i]);
+				}
+			}
+			data.getCache(setting).nodes[data.getNodeCacheId(node.tId)] = null;
+		},
+		removeSelectedNode: function(setting, node) {
+			var root = data.getRoot(setting);
+			for (var i=0, j=root.curSelectedList.length; i<j; i++) {
+				if(node === root.curSelectedList[i] || !data.getNodeCache(setting, root.curSelectedList[i].tId)) {
+					root.curSelectedList.splice(i, 1);
+					i--;j--;
+				}
+			}
+		},
+		setCache: function(setting, cache) {
+			caches[setting.treeId] = cache;
+		},
+		setRoot: function(setting, root) {
+			roots[setting.treeId] = root;
+		},
+		setZTreeTools: function(setting, zTreeTools) {
+			for (var i=0, j=_init.zTreeTools.length; i<j; i++) {
+				_init.zTreeTools[i].apply(this, arguments);
+			}
+		},
+		transformToArrayFormat: function (setting, nodes) {
+			if (!nodes) return [];
+			var childKey = setting.data.key.children,
+			r = [];
+			if (tools.isArray(nodes)) {
+				for (var i=0, l=nodes.length; i<l; i++) {
+					r.push(nodes[i]);
+					if (nodes[i][childKey])
+						r = r.concat(data.transformToArrayFormat(setting, nodes[i][childKey]));
+				}
+			} else {
+				r.push(nodes);
+				if (nodes[childKey])
+					r = r.concat(data.transformToArrayFormat(setting, nodes[childKey]));
+			}
+			return r;
+		},
+		transformTozTreeFormat: function(setting, sNodes) {
+			var i,l,
+			key = setting.data.simpleData.idKey,
+			parentKey = setting.data.simpleData.pIdKey,
+			childKey = setting.data.key.children;
+			if (!key || key=="" || !sNodes) return [];
+
+			if (tools.isArray(sNodes)) {
+				var r = [];
+				var tmpMap = [];
+				for (i=0, l=sNodes.length; i<l; i++) {
+					tmpMap[sNodes[i][key]] = sNodes[i];
+				}
+				for (i=0, l=sNodes.length; i<l; i++) {
+					if (tmpMap[sNodes[i][parentKey]] && sNodes[i][key] != sNodes[i][parentKey]) {
+						if (!tmpMap[sNodes[i][parentKey]][childKey])
+							tmpMap[sNodes[i][parentKey]][childKey] = [];
+						tmpMap[sNodes[i][parentKey]][childKey].push(sNodes[i]);
+					} else {
+						r.push(sNodes[i]);
+					}
+				}
+				return r;
+			}else {
+				return [sNodes];
+			}
+		}
+	},
+	//method of event proxy
+	event = {
+		bindEvent: function(setting) {
+			for (var i=0, j=_init.bind.length; i<j; i++) {
+				_init.bind[i].apply(this, arguments);
+			}
+		},
+		unbindEvent: function(setting) {
+			for (var i=0, j=_init.unbind.length; i<j; i++) {
+				_init.unbind[i].apply(this, arguments);
+			}
+		},
+		bindTree: function(setting) {
+			var eventParam = {
+				treeId: setting.treeId
+			},
+			o = setting.treeObj;
+			if (!setting.view.txtSelectedEnable) {
+				// for can't select text
+				o.bind('selectstart', function(e){
+					var node
+					var n = e.originalEvent.srcElement.nodeName.toLowerCase();
+					return (n === "input" || n === "textarea" );
+				}).css({
+					"-moz-user-select":"-moz-none"
+				});
+			}
+			o.bind('click', eventParam, event.proxy);
+			o.bind('dblclick', eventParam, event.proxy);
+			o.bind('mouseover', eventParam, event.proxy);
+			o.bind('mouseout', eventParam, event.proxy);
+			o.bind('mousedown', eventParam, event.proxy);
+			o.bind('mouseup', eventParam, event.proxy);
+			o.bind('contextmenu', eventParam, event.proxy);
+		},
+		unbindTree: function(setting) {
+			var o = setting.treeObj;
+			o.unbind('click', event.proxy)
+			.unbind('dblclick', event.proxy)
+			.unbind('mouseover', event.proxy)
+			.unbind('mouseout', event.proxy)
+			.unbind('mousedown', event.proxy)
+			.unbind('mouseup', event.proxy)
+			.unbind('contextmenu', event.proxy);
+		},
+		doProxy: function(e) {
+			var results = [];
+			for (var i=0, j=_init.proxys.length; i<j; i++) {
+				var proxyResult = _init.proxys[i].apply(this, arguments);
+				results.push(proxyResult);
+				if (proxyResult.stop) {
+					break;
+				}
+			}
+			return results;
+		},
+		proxy: function(e) {
+			var setting = data.getSetting(e.data.treeId);
+			if (!tools.uCanDo(setting, e)) return true;
+			var results = event.doProxy(e),
+			r = true, x = false;
+			for (var i=0, l=results.length; i<l; i++) {
+				var proxyResult = results[i];
+				if (proxyResult.nodeEventCallback) {
+					x = true;
+					r = proxyResult.nodeEventCallback.apply(proxyResult, [e, proxyResult.node]) && r;
+				}
+				if (proxyResult.treeEventCallback) {
+					x = true;
+					r = proxyResult.treeEventCallback.apply(proxyResult, [e, proxyResult.node]) && r;
+				}
+			}
+			return r;
+		}
+	},
+	//method of event handler
+	handler = {
+		onSwitchNode: function (event, node) {
+			var setting = data.getSetting(event.data.treeId);
+			if (node.open) {
+				if (tools.apply(setting.callback.beforeCollapse, [setting.treeId, node], true) == false) return true;
+				data.getRoot(setting).expandTriggerFlag = true;
+				view.switchNode(setting, node);
+			} else {
+				if (tools.apply(setting.callback.beforeExpand, [setting.treeId, node], true) == false) return true;
+				data.getRoot(setting).expandTriggerFlag = true;
+				view.switchNode(setting, node);
+			}
+			return true;
+		},
+		onClickNode: function (event, node) {
+			var setting = data.getSetting(event.data.treeId),
+			clickFlag = ( (setting.view.autoCancelSelected && event.ctrlKey) && data.isSelectedNode(setting, node)) ? 0 : (setting.view.autoCancelSelected && event.ctrlKey && setting.view.selectedMulti) ? 2 : 1;
+			if (tools.apply(setting.callback.beforeClick, [setting.treeId, node, clickFlag], true) == false) return true;
+			if (clickFlag === 0) {
+				view.cancelPreSelectedNode(setting, node);
+			} else {
+				view.selectNode(setting, node, clickFlag === 2);
+			}
+			setting.treeObj.trigger(consts.event.CLICK, [event, setting.treeId, node, clickFlag]);
+			return true;
+		},
+		onZTreeMousedown: function(event, node) {
+			var setting = data.getSetting(event.data.treeId);
+			if (tools.apply(setting.callback.beforeMouseDown, [setting.treeId, node], true)) {
+				tools.apply(setting.callback.onMouseDown, [event, setting.treeId, node]);
+			}
+			return true;
+		},
+		onZTreeMouseup: function(event, node) {
+			var setting = data.getSetting(event.data.treeId);
+			if (tools.apply(setting.callback.beforeMouseUp, [setting.treeId, node], true)) {
+				tools.apply(setting.callback.onMouseUp, [event, setting.treeId, node]);
+			}
+			return true;
+		},
+		onZTreeDblclick: function(event, node) {
+			var setting = data.getSetting(event.data.treeId);
+			if (tools.apply(setting.callback.beforeDblClick, [setting.treeId, node], true)) {
+				tools.apply(setting.callback.onDblClick, [event, setting.treeId, node]);
+			}
+			return true;
+		},
+		onZTreeContextmenu: function(event, node) {
+			var setting = data.getSetting(event.data.treeId);
+			if (tools.apply(setting.callback.beforeRightClick, [setting.treeId, node], true)) {
+				tools.apply(setting.callback.onRightClick, [event, setting.treeId, node]);
+			}
+			return (typeof setting.callback.onRightClick) != "function";
+		}
+	},
+	//method of tools for zTree
+	tools = {
+		apply: function(fun, param, defaultValue) {
+			if ((typeof fun) == "function") {
+				return fun.apply(zt, param?param:[]);
+			}
+			return defaultValue;
+		},
+		canAsync: function(setting, node) {
+			var childKey = setting.data.key.children;
+			return (setting.async.enable && node && node.isParent && !(node.zAsync || (node[childKey] && node[childKey].length > 0)));
+		},
+		clone: function (obj){
+			if (obj === null) return null;
+			var o = tools.isArray(obj) ? [] : {};
+			for(var i in obj){
+				o[i] = (obj[i] instanceof Date) ? new Date(obj[i].getTime()) : (typeof obj[i] === "object" ? arguments.callee(obj[i]) : obj[i]);
+			}
+			return o;
+		},
+		eqs: function(str1, str2) {
+			return str1.toLowerCase() === str2.toLowerCase();
+		},
+		isArray: function(arr) {
+			return Object.prototype.toString.apply(arr) === "[object Array]";
+		},
+		$: function(node, exp, setting) {
+			if (!!exp && typeof exp != "string") {
+				setting = exp;
+				exp = "";
+			}
+			if (typeof node == "string") {
+				return $(node, setting ? setting.treeObj.get(0).ownerDocument : null);
+			} else {
+				return $("#" + node.tId + exp, setting ? setting.treeObj : null);
+			}
+		},
+		getMDom: function (setting, curDom, targetExpr) {
+			if (!curDom) return null;
+			while (curDom && curDom.id !== setting.treeId) {
+				for (var i=0, l=targetExpr.length; curDom.tagName && i<l; i++) {
+					if (tools.eqs(curDom.tagName, targetExpr[i].tagName) && curDom.getAttribute(targetExpr[i].attrName) !== null) {
+						return curDom;
+					}
+				}
+				curDom = curDom.parentNode;
+			}
+			return null;
+		},
+		getNodeMainDom:function(target) {
+			return ($(target).parent("li").get(0) || $(target).parentsUntil("li").parent().get(0));
+		},
+		isChildOrSelf: function(dom, parentId) {
+			return ( $(dom).closest("#" + parentId).length> 0 );
+		},
+		uCanDo: function(setting, e) {
+			return true;
+		}
+	},
+	//method of operate ztree dom
+	view = {
+		addNodes: function(setting, parentNode, newNodes, isSilent) {
+			if (setting.data.keep.leaf && parentNode && !parentNode.isParent) {
+				return;
+			}
+			if (!tools.isArray(newNodes)) {
+				newNodes = [newNodes];
+			}
+			if (setting.data.simpleData.enable) {
+				newNodes = data.transformTozTreeFormat(setting, newNodes);
+			}
+			if (parentNode) {
+				var target_switchObj = $$(parentNode, consts.id.SWITCH, setting),
+				target_icoObj = $$(parentNode, consts.id.ICON, setting),
+				target_ulObj = $$(parentNode, consts.id.UL, setting);
+
+				if (!parentNode.open) {
+					view.replaceSwitchClass(parentNode, target_switchObj, consts.folder.CLOSE);
+					view.replaceIcoClass(parentNode, target_icoObj, consts.folder.CLOSE);
+					parentNode.open = false;
+					target_ulObj.css({
+						"display": "none"
+					});
+				}
+
+				data.addNodesData(setting, parentNode, newNodes);
+				view.createNodes(setting, parentNode.level + 1, newNodes, parentNode);
+				if (!isSilent) {
+					view.expandCollapseParentNode(setting, parentNode, true);
+				}
+			} else {
+				data.addNodesData(setting, data.getRoot(setting), newNodes);
+				view.createNodes(setting, 0, newNodes, null);
+			}
+		},
+		appendNodes: function(setting, level, nodes, parentNode, initFlag, openFlag) {
+			if (!nodes) return [];
+			var html = [],
+			childKey = setting.data.key.children;
+			for (var i = 0, l = nodes.length; i < l; i++) {
+				var node = nodes[i];
+				if (initFlag) {
+					var tmpPNode = (parentNode) ? parentNode: data.getRoot(setting),
+					tmpPChild = tmpPNode[childKey],
+					isFirstNode = ((tmpPChild.length == nodes.length) && (i == 0)),
+					isLastNode = (i == (nodes.length - 1));
+					data.initNode(setting, level, node, parentNode, isFirstNode, isLastNode, openFlag);
+					data.addNodeCache(setting, node);
+				}
+
+				var childHtml = [];
+				if (node[childKey] && node[childKey].length > 0) {
+					//make child html first, because checkType
+					childHtml = view.appendNodes(setting, level + 1, node[childKey], node, initFlag, openFlag && node.open);
+				}
+				if (openFlag) {
+
+					view.makeDOMNodeMainBefore(html, setting, node);
+					view.makeDOMNodeLine(html, setting, node);
+					data.getBeforeA(setting, node, html);
+					view.makeDOMNodeNameBefore(html, setting, node);
+					data.getInnerBeforeA(setting, node, html);
+					view.makeDOMNodeIcon(html, setting, node);
+					data.getInnerAfterA(setting, node, html);
+					view.makeDOMNodeNameAfter(html, setting, node);
+					data.getAfterA(setting, node, html);
+					if (node.isParent && node.open) {
+						view.makeUlHtml(setting, node, html, childHtml.join(''));
+					}
+					view.makeDOMNodeMainAfter(html, setting, node);
+					data.addCreatedNode(setting, node);
+				}
+			}
+			return html;
+		},
+		appendParentULDom: function(setting, node) {
+			var html = [],
+			nObj = $$(node, setting);
+			if (!nObj.get(0) && !!node.parentTId) {
+				view.appendParentULDom(setting, node.getParentNode());
+				nObj = $$(node, setting);
+			}
+			var ulObj = $$(node, consts.id.UL, setting);
+			if (ulObj.get(0)) {
+				ulObj.remove();
+			}
+			var childKey = setting.data.key.children,
+			childHtml = view.appendNodes(setting, node.level+1, node[childKey], node, false, true);
+			view.makeUlHtml(setting, node, html, childHtml.join(''));
+			nObj.append(html.join(''));
+		},
+		asyncNode: function(setting, node, isSilent, callback) {
+			var i, l;
+			if (node && !node.isParent) {
+				tools.apply(callback);
+				return false;
+			} else if (node && node.isAjaxing) {
+				return false;
+			} else if (tools.apply(setting.callback.beforeAsync, [setting.treeId, node], true) == false) {
+				tools.apply(callback);
+				return false;
+			}
+			if (node) {
+				node.isAjaxing = true;
+				var icoObj = $$(node, consts.id.ICON, setting);
+				icoObj.attr({"style":"", "class":consts.className.BUTTON + " " + consts.className.ICO_LOADING});
+			}
+
+			var tmpParam = {};
+			for (i = 0, l = setting.async.autoParam.length; node && i < l; i++) {
+				var pKey = setting.async.autoParam[i].split("="), spKey = pKey;
+				if (pKey.length>1) {
+					spKey = pKey[1];
+					pKey = pKey[0];
+				}
+				tmpParam[spKey] = node[pKey];
+			}
+			if (tools.isArray(setting.async.otherParam)) {
+				for (i = 0, l = setting.async.otherParam.length; i < l; i += 2) {
+					tmpParam[setting.async.otherParam[i]] = setting.async.otherParam[i + 1];
+				}
+			} else {
+				for (var p in setting.async.otherParam) {
+					tmpParam[p] = setting.async.otherParam[p];
+				}
+			}
+
+			var _tmpV = data.getRoot(setting)._ver;
+			$.ajax({
+				contentType: setting.async.contentType,
+				type: setting.async.type,
+				url: tools.apply(setting.async.url, [setting.treeId, node], setting.async.url),
+				data: tmpParam,
+				dataType: setting.async.dataType,
+				success: function(msg) {
+					if (_tmpV != data.getRoot(setting)._ver) {
+						return;
+					}
+					var newNodes = [];
+					try {
+						if (!msg || msg.length == 0) {
+							newNodes = [];
+						} else if (typeof msg == "string") {
+							newNodes = eval("(" + msg + ")");
+						} else {
+							newNodes = msg;
+						}
+					} catch(err) {
+						newNodes = msg;
+					}
+
+					if (node) {
+						node.isAjaxing = null;
+						node.zAsync = true;
+					}
+					view.setNodeLineIcos(setting, node);
+					if (newNodes && newNodes !== "") {
+						newNodes = tools.apply(setting.async.dataFilter, [setting.treeId, node, newNodes], newNodes);
+						view.addNodes(setting, node, !!newNodes ? tools.clone(newNodes) : [], !!isSilent);
+					} else {
+						view.addNodes(setting, node, [], !!isSilent);
+					}
+					setting.treeObj.trigger(consts.event.ASYNC_SUCCESS, [setting.treeId, node, msg]);
+					tools.apply(callback);
+				},
+				error: function(XMLHttpRequest, textStatus, errorThrown) {
+					if (_tmpV != data.getRoot(setting)._ver) {
+						return;
+					}
+					if (node) node.isAjaxing = null;
+					view.setNodeLineIcos(setting, node);
+					setting.treeObj.trigger(consts.event.ASYNC_ERROR, [setting.treeId, node, XMLHttpRequest, textStatus, errorThrown]);
+				}
+			});
+			return true;
+		},
+		cancelPreSelectedNode: function (setting, node) {
+			var list = data.getRoot(setting).curSelectedList;
+			for (var i=0, j=list.length-1; j>=i; j--) {
+				if (!node || node === list[j]) {
+					$$(list[j], consts.id.A, setting).removeClass(consts.node.CURSELECTED);
+					if (node) {
+						data.removeSelectedNode(setting, node);
+						break;
+					}
+				}
+			}
+			if (!node) data.getRoot(setting).curSelectedList = [];
+		},
+		createNodeCallback: function(setting) {
+			if (!!setting.callback.onNodeCreated || !!setting.view.addDiyDom) {
+				var root = data.getRoot(setting);
+				while (root.createdNodes.length>0) {
+					var node = root.createdNodes.shift();
+					tools.apply(setting.view.addDiyDom, [setting.treeId, node]);
+					if (!!setting.callback.onNodeCreated) {
+						setting.treeObj.trigger(consts.event.NODECREATED, [setting.treeId, node]);
+					}
+				}
+			}
+		},
+		createNodes: function(setting, level, nodes, parentNode) {
+			if (!nodes || nodes.length == 0) return;
+			var root = data.getRoot(setting),
+			childKey = setting.data.key.children,
+			openFlag = !parentNode || parentNode.open || !!$$(parentNode[childKey][0], setting).get(0);
+			root.createdNodes = [];
+			var zTreeHtml = view.appendNodes(setting, level, nodes, parentNode, true, openFlag);
+			if (!parentNode) {
+				setting.treeObj.append(zTreeHtml.join(''));
+			} else {
+				var ulObj = $$(parentNode, consts.id.UL, setting);
+				if (ulObj.get(0)) {
+					ulObj.append(zTreeHtml.join(''));
+				}
+			}
+			view.createNodeCallback(setting);
+		},
+		destroy: function(setting) {
+			if (!setting) return;
+			data.initCache(setting);
+			data.initRoot(setting);
+			event.unbindTree(setting);
+			event.unbindEvent(setting);
+			setting.treeObj.empty();
+		},
+		expandCollapseNode: function(setting, node, expandFlag, animateFlag, callback) {
+			var root = data.getRoot(setting),
+			childKey = setting.data.key.children;
+			if (!node) {
+				tools.apply(callback, []);
+				return;
+			}
+			if (root.expandTriggerFlag) {
+				var _callback = callback;
+				callback = function(){
+					if (_callback) _callback();
+					if (node.open) {
+						setting.treeObj.trigger(consts.event.EXPAND, [setting.treeId, node]);
+					} else {
+						setting.treeObj.trigger(consts.event.COLLAPSE, [setting.treeId, node]);
+					}
+				};
+				root.expandTriggerFlag = false;
+			}
+			if (!node.open && node.isParent && ((!$$(node, consts.id.UL, setting).get(0)) || (node[childKey] && node[childKey].length>0 && !$$(node[childKey][0], setting).get(0)))) {
+				view.appendParentULDom(setting, node);
+				view.createNodeCallback(setting);
+			}
+			if (node.open == expandFlag) {
+				tools.apply(callback, []);
+				return;
+			}
+			var ulObj = $$(node, consts.id.UL, setting),
+			switchObj = $$(node, consts.id.SWITCH, setting),
+			icoObj = $$(node, consts.id.ICON, setting);
+
+			if (node.isParent) {
+				node.open = !node.open;
+				if (node.iconOpen && node.iconClose) {
+					icoObj.attr("style", view.makeNodeIcoStyle(setting, node));
+				}
+
+				if (node.open) {
+					view.replaceSwitchClass(node, switchObj, consts.folder.OPEN);
+					view.replaceIcoClass(node, icoObj, consts.folder.OPEN);
+					if (animateFlag == false || setting.view.expandSpeed == "") {
+						ulObj.show();
+						tools.apply(callback, []);
+					} else {
+						if (node[childKey] && node[childKey].length > 0) {
+							ulObj.slideDown(setting.view.expandSpeed, callback);
+						} else {
+							ulObj.show();
+							tools.apply(callback, []);
+						}
+					}
+				} else {
+					view.replaceSwitchClass(node, switchObj, consts.folder.CLOSE);
+					view.replaceIcoClass(node, icoObj, consts.folder.CLOSE);
+					if (animateFlag == false || setting.view.expandSpeed == "" || !(node[childKey] && node[childKey].length > 0)) {
+						ulObj.hide();
+						tools.apply(callback, []);
+					} else {
+						ulObj.slideUp(setting.view.expandSpeed, callback);
+					}
+				}
+			} else {
+				tools.apply(callback, []);
+			}
+		},
+		expandCollapseParentNode: function(setting, node, expandFlag, animateFlag, callback) {
+			if (!node) return;
+			if (!node.parentTId) {
+				view.expandCollapseNode(setting, node, expandFlag, animateFlag, callback);
+				return;
+			} else {
+				view.expandCollapseNode(setting, node, expandFlag, animateFlag);
+			}
+			if (node.parentTId) {
+				view.expandCollapseParentNode(setting, node.getParentNode(), expandFlag, animateFlag, callback);
+			}
+		},
+		expandCollapseSonNode: function(setting, node, expandFlag, animateFlag, callback) {
+			var root = data.getRoot(setting),
+			childKey = setting.data.key.children,
+			treeNodes = (node) ? node[childKey]: root[childKey],
+			selfAnimateSign = (node) ? false : animateFlag,
+			expandTriggerFlag = data.getRoot(setting).expandTriggerFlag;
+			data.getRoot(setting).expandTriggerFlag = false;
+			if (treeNodes) {
+				for (var i = 0, l = treeNodes.length; i < l; i++) {
+					if (treeNodes[i]) view.expandCollapseSonNode(setting, treeNodes[i], expandFlag, selfAnimateSign);
+				}
+			}
+			data.getRoot(setting).expandTriggerFlag = expandTriggerFlag;
+			view.expandCollapseNode(setting, node, expandFlag, animateFlag, callback );
+		},
+		makeDOMNodeIcon: function(html, setting, node) {
+			var nameStr = data.getNodeName(setting, node),
+			name = setting.view.nameIsHTML ? nameStr : nameStr.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;');
+			html.push("<span id='", node.tId, consts.id.ICON,
+				"' title='' treeNode", consts.id.ICON," class='", view.makeNodeIcoClass(setting, node),
+				"' style='", view.makeNodeIcoStyle(setting, node), "'></span><span id='", node.tId, consts.id.SPAN,
+				"'>",name,"</span>");
+		},
+		makeDOMNodeLine: function(html, setting, node) {
+			html.push("<span id='", node.tId, consts.id.SWITCH,	"' title='' class='", view.makeNodeLineClass(setting, node), "' treeNode", consts.id.SWITCH,"></span>");
+		},
+		makeDOMNodeMainAfter: function(html, setting, node) {
+			html.push("</li>");
+		},
+		makeDOMNodeMainBefore: function(html, setting, node) {
+			html.push("<li id='", node.tId, "' class='", consts.className.LEVEL, node.level,"' tabindex='0' hidefocus='true' treenode>");
+		},
+		makeDOMNodeNameAfter: function(html, setting, node) {
+			html.push("</a>");
+		},
+		makeDOMNodeNameBefore: function(html, setting, node) {
+			var title = data.getNodeTitle(setting, node),
+			url = view.makeNodeUrl(setting, node),
+			fontcss = view.makeNodeFontCss(setting, node),
+			fontStyle = [];
+			for (var f in fontcss) {
+				fontStyle.push(f, ":", fontcss[f], ";");
+			}
+			html.push("<a id='", node.tId, consts.id.A, "' class='", consts.className.LEVEL, node.level,"' treeNode", consts.id.A," onclick=\"", (node.click || ''),
+				"\" ", ((url != null && url.length > 0) ? "href='" + url + "'" : ""), " target='",view.makeNodeTarget(node),"' style='", fontStyle.join(''),
+				"'");
+			if (tools.apply(setting.view.showTitle, [setting.treeId, node], setting.view.showTitle) && title) {html.push("title='", title.replace(/'/g,"&#39;").replace(/</g,'&lt;').replace(/>/g,'&gt;'),"'");}
+			html.push(">");
+		},
+		makeNodeFontCss: function(setting, node) {
+			var fontCss = tools.apply(setting.view.fontCss, [setting.treeId, node], setting.view.fontCss);
+			return (fontCss && ((typeof fontCss) != "function")) ? fontCss : {};
+		},
+		makeNodeIcoClass: function(setting, node) {
+			var icoCss = ["ico"];
+			if (!node.isAjaxing) {
+				icoCss[0] = (node.iconSkin ? node.iconSkin + "_" : "") + icoCss[0];
+				if (node.isParent) {
+					icoCss.push(node.open ? consts.folder.OPEN : consts.folder.CLOSE);
+				} else {
+					icoCss.push(consts.folder.DOCU);
+				}
+			}
+			return consts.className.BUTTON + " " + icoCss.join('_');
+		},
+		makeNodeIcoStyle: function(setting, node) {
+			var icoStyle = [];
+			if (!node.isAjaxing) {
+				var icon = (node.isParent && node.iconOpen && node.iconClose) ? (node.open ? node.iconOpen : node.iconClose) : node.icon;
+				if (icon) icoStyle.push("background:url(", icon, ") 0 0 no-repeat;");
+				if (setting.view.showIcon == false || !tools.apply(setting.view.showIcon, [setting.treeId, node], true)) {
+					icoStyle.push("width:0px;height:0px;");
+				}
+			}
+			return icoStyle.join('');
+		},
+		makeNodeLineClass: function(setting, node) {
+			var lineClass = [];
+			if (setting.view.showLine) {
+				if (node.level == 0 && node.isFirstNode && node.isLastNode) {
+					lineClass.push(consts.line.ROOT);
+				} else if (node.level == 0 && node.isFirstNode) {
+					lineClass.push(consts.line.ROOTS);
+				} else if (node.isLastNode) {
+					lineClass.push(consts.line.BOTTOM);
+				} else {
+					lineClass.push(consts.line.CENTER);
+				}
+			} else {
+				lineClass.push(consts.line.NOLINE);
+			}
+			if (node.isParent) {
+				lineClass.push(node.open ? consts.folder.OPEN : consts.folder.CLOSE);
+			} else {
+				lineClass.push(consts.folder.DOCU);
+			}
+			return view.makeNodeLineClassEx(node) + lineClass.join('_');
+		},
+		makeNodeLineClassEx: function(node) {
+			return consts.className.BUTTON + " " + consts.className.LEVEL + node.level + " " + consts.className.SWITCH + " ";
+		},
+		makeNodeTarget: function(node) {
+			return (node.target || "_blank");
+		},
+		makeNodeUrl: function(setting, node) {
+			var urlKey = setting.data.key.url;
+			return node[urlKey] ? node[urlKey] : null;
+		},
+		makeUlHtml: function(setting, node, html, content) {
+			html.push("<ul id='", node.tId, consts.id.UL, "' class='", consts.className.LEVEL, node.level, " ", view.makeUlLineClass(setting, node), "' style='display:", (node.open ? "block": "none"),"'>");
+			html.push(content);
+			html.push("</ul>");
+		},
+		makeUlLineClass: function(setting, node) {
+			return ((setting.view.showLine && !node.isLastNode) ? consts.line.LINE : "");
+		},
+		removeChildNodes: function(setting, node) {
+			if (!node) return;
+			var childKey = setting.data.key.children,
+			nodes = node[childKey];
+			if (!nodes) return;
+
+			for (var i = 0, l = nodes.length; i < l; i++) {
+				data.removeNodeCache(setting, nodes[i]);
+			}
+			data.removeSelectedNode(setting);
+			delete node[childKey];
+
+			if (!setting.data.keep.parent) {
+				node.isParent = false;
+				node.open = false;
+				var tmp_switchObj = $$(node, consts.id.SWITCH, setting),
+				tmp_icoObj = $$(node, consts.id.ICON, setting);
+				view.replaceSwitchClass(node, tmp_switchObj, consts.folder.DOCU);
+				view.replaceIcoClass(node, tmp_icoObj, consts.folder.DOCU);
+				$$(node, consts.id.UL, setting).remove();
+			} else {
+				$$(node, consts.id.UL, setting).empty();
+			}
+		},
+		setFirstNode: function(setting, parentNode) {
+			var childKey = setting.data.key.children, childLength = parentNode[childKey].length;
+			if ( childLength > 0) {
+				parentNode[childKey][0].isFirstNode = true;
+			}
+		},
+		setLastNode: function(setting, parentNode) {
+			var childKey = setting.data.key.children, childLength = parentNode[childKey].length;
+			if ( childLength > 0) {
+				parentNode[childKey][childLength - 1].isLastNode = true;
+			}
+		},
+		removeNode: function(setting, node) {
+			var root = data.getRoot(setting),
+			childKey = setting.data.key.children,
+			parentNode = (node.parentTId) ? node.getParentNode() : root;
+
+			node.isFirstNode = false;
+			node.isLastNode = false;
+			node.getPreNode = function() {return null;};
+			node.getNextNode = function() {return null;};
+
+			if (!data.getNodeCache(setting, node.tId)) {
+				return;
+			}
+
+			$$(node, setting).remove();
+			data.removeNodeCache(setting, node);
+			data.removeSelectedNode(setting, node);
+
+			for (var i = 0, l = parentNode[childKey].length; i < l; i++) {
+				if (parentNode[childKey][i].tId == node.tId) {
+					parentNode[childKey].splice(i, 1);
+					break;
+				}
+			}
+			view.setFirstNode(setting, parentNode);
+			view.setLastNode(setting, parentNode);
+
+			var tmp_ulObj,tmp_switchObj,tmp_icoObj,
+			childLength = parentNode[childKey].length;
+
+			//repair nodes old parent
+			if (!setting.data.keep.parent && childLength == 0) {
+				//old parentNode has no child nodes
+				parentNode.isParent = false;
+				parentNode.open = false;
+				tmp_ulObj = $$(parentNode, consts.id.UL, setting);
+				tmp_switchObj = $$(parentNode, consts.id.SWITCH, setting);
+				tmp_icoObj = $$(parentNode, consts.id.ICON, setting);
+				view.replaceSwitchClass(parentNode, tmp_switchObj, consts.folder.DOCU);
+				view.replaceIcoClass(parentNode, tmp_icoObj, consts.folder.DOCU);
+				tmp_ulObj.css("display", "none");
+
+			} else if (setting.view.showLine && childLength > 0) {
+				//old parentNode has child nodes
+				var newLast = parentNode[childKey][childLength - 1];
+				tmp_ulObj = $$(newLast, consts.id.UL, setting);
+				tmp_switchObj = $$(newLast, consts.id.SWITCH, setting);
+				tmp_icoObj = $$(newLast, consts.id.ICON, setting);
+				if (parentNode == root) {
+					if (parentNode[childKey].length == 1) {
+						//node was root, and ztree has only one root after move node
+						view.replaceSwitchClass(newLast, tmp_switchObj, consts.line.ROOT);
+					} else {
+						var tmp_first_switchObj = $$(parentNode[childKey][0], consts.id.SWITCH, setting);
+						view.replaceSwitchClass(parentNode[childKey][0], tmp_first_switchObj, consts.line.ROOTS);
+						view.replaceSwitchClass(newLast, tmp_switchObj, consts.line.BOTTOM);
+					}
+				} else {
+					view.replaceSwitchClass(newLast, tmp_switchObj, consts.line.BOTTOM);
+				}
+				tmp_ulObj.removeClass(consts.line.LINE);
+			}
+		},
+		replaceIcoClass: function(node, obj, newName) {
+			if (!obj || node.isAjaxing) return;
+			var tmpName = obj.attr("class");
+			if (tmpName == undefined) return;
+			var tmpList = tmpName.split("_");
+			switch (newName) {
+				case consts.folder.OPEN:
+				case consts.folder.CLOSE:
+				case consts.folder.DOCU:
+					tmpList[tmpList.length-1] = newName;
+					break;
+			}
+			obj.attr("class", tmpList.join("_"));
+		},
+		replaceSwitchClass: function(node, obj, newName) {
+			if (!obj) return;
+			var tmpName = obj.attr("class");
+			if (tmpName == undefined) return;
+			var tmpList = tmpName.split("_");
+			switch (newName) {
+				case consts.line.ROOT:
+				case consts.line.ROOTS:
+				case consts.line.CENTER:
+				case consts.line.BOTTOM:
+				case consts.line.NOLINE:
+					tmpList[0] = view.makeNodeLineClassEx(node) + newName;
+					break;
+				case consts.folder.OPEN:
+				case consts.folder.CLOSE:
+				case consts.folder.DOCU:
+					tmpList[1] = newName;
+					break;
+			}
+			obj.attr("class", tmpList.join("_"));
+			if (newName !== consts.folder.DOCU) {
+				obj.removeAttr("disabled");
+			} else {
+				obj.attr("disabled", "disabled");
+			}
+		},
+		selectNode: function(setting, node, addFlag) {
+			if (!addFlag) {
+				view.cancelPreSelectedNode(setting);
+			}
+			$$(node, consts.id.A, setting).addClass(consts.node.CURSELECTED);
+			data.addSelectedNode(setting, node);
+		},
+		setNodeFontCss: function(setting, treeNode) {
+			var aObj = $$(treeNode, consts.id.A, setting),
+			fontCss = view.makeNodeFontCss(setting, treeNode);
+			if (fontCss) {
+				aObj.css(fontCss);
+			}
+		},
+		setNodeLineIcos: function(setting, node) {
+			if (!node) return;
+			var switchObj = $$(node, consts.id.SWITCH, setting),
+			ulObj = $$(node, consts.id.UL, setting),
+			icoObj = $$(node, consts.id.ICON, setting),
+			ulLine = view.makeUlLineClass(setting, node);
+			if (ulLine.length==0) {
+				ulObj.removeClass(consts.line.LINE);
+			} else {
+				ulObj.addClass(ulLine);
+			}
+			switchObj.attr("class", view.makeNodeLineClass(setting, node));
+			if (node.isParent) {
+				switchObj.removeAttr("disabled");
+			} else {
+				switchObj.attr("disabled", "disabled");
+			}
+			icoObj.removeAttr("style");
+			icoObj.attr("style", view.makeNodeIcoStyle(setting, node));
+			icoObj.attr("class", view.makeNodeIcoClass(setting, node));
+		},
+		setNodeName: function(setting, node) {
+			var title = data.getNodeTitle(setting, node),
+			nObj = $$(node, consts.id.SPAN, setting);
+			nObj.empty();
+			if (setting.view.nameIsHTML) {
+				nObj.html(data.getNodeName(setting, node));
+			} else {
+				nObj.text(data.getNodeName(setting, node));
+			}
+			if (tools.apply(setting.view.showTitle, [setting.treeId, node], setting.view.showTitle)) {
+				var aObj = $$(node, consts.id.A, setting);
+				aObj.attr("title", !title ? "" : title);
+			}
+		},
+		setNodeTarget: function(setting, node) {
+			var aObj = $$(node, consts.id.A, setting);
+			aObj.attr("target", view.makeNodeTarget(node));
+		},
+		setNodeUrl: function(setting, node) {
+			var aObj = $$(node, consts.id.A, setting),
+			url = view.makeNodeUrl(setting, node);
+			if (url == null || url.length == 0) {
+				aObj.removeAttr("href");
+			} else {
+				aObj.attr("href", url);
+			}
+		},
+		switchNode: function(setting, node) {
+			if (node.open || !tools.canAsync(setting, node)) {
+				view.expandCollapseNode(setting, node, !node.open);
+			} else if (setting.async.enable) {
+				if (!view.asyncNode(setting, node)) {
+					view.expandCollapseNode(setting, node, !node.open);
+					return;
+				}
+			} else if (node) {
+				view.expandCollapseNode(setting, node, !node.open);
+			}
+		}
+	};
+	// zTree defind
+	$.fn.zTree = {
+		consts : _consts,
+		_z : {
+			tools: tools,
+			view: view,
+			event: event,
+			data: data
+		},
+		getZTreeObj: function(treeId) {
+			var o = data.getZTreeTools(treeId);
+			return o ? o : null;
+		},
+		destroy: function(treeId) {
+			if (!!treeId && treeId.length > 0) {
+				view.destroy(data.getSetting(treeId));
+			} else {
+				for(var s in settings) {
+					view.destroy(settings[s]);
+				}
+			}
+		},
+		init: function(obj, zSetting, zNodes) {
+			var setting = tools.clone(_setting);
+			$.extend(true, setting, zSetting);
+			setting.treeId = obj.attr("id");
+			setting.treeObj = obj;
+			setting.treeObj.empty();
+			settings[setting.treeId] = setting;
+			//For some older browser,(e.g., ie6)
+			if(typeof document.body.style.maxHeight === "undefined") {
+				setting.view.expandSpeed = "";
+			}
+			data.initRoot(setting);
+			var root = data.getRoot(setting),
+			childKey = setting.data.key.children;
+			zNodes = zNodes ? tools.clone(tools.isArray(zNodes)? zNodes : [zNodes]) : [];
+			if (setting.data.simpleData.enable) {
+				root[childKey] = data.transformTozTreeFormat(setting, zNodes);
+			} else {
+				root[childKey] = zNodes;
+			}
+
+			data.initCache(setting);
+			event.unbindTree(setting);
+			event.bindTree(setting);
+			event.unbindEvent(setting);
+			event.bindEvent(setting);
+
+			var zTreeTools = {
+				setting : setting,
+				addNodes : function(parentNode, newNodes, isSilent) {
+					if (!newNodes) return null;
+					if (!parentNode) parentNode = null;
+					if (parentNode && !parentNode.isParent && setting.data.keep.leaf) return null;
+					var xNewNodes = tools.clone(tools.isArray(newNodes)? newNodes: [newNodes]);
+					function addCallback() {
+						view.addNodes(setting, parentNode, xNewNodes, (isSilent==true));
+					}
+
+					if (tools.canAsync(setting, parentNode)) {
+						view.asyncNode(setting, parentNode, isSilent, addCallback);
+					} else {
+						addCallback();
+					}
+					return xNewNodes;
+				},
+				cancelSelectedNode : function(node) {
+					view.cancelPreSelectedNode(setting, node);
+				},
+				destroy : function() {
+					view.destroy(setting);
+				},
+				expandAll : function(expandFlag) {
+					expandFlag = !!expandFlag;
+					view.expandCollapseSonNode(setting, null, expandFlag, true);
+					return expandFlag;
+				},
+				expandNode : function(node, expandFlag, sonSign, focus, callbackFlag) {
+					if (!node || !node.isParent) return null;
+					if (expandFlag !== true && expandFlag !== false) {
+						expandFlag = !node.open;
+					}
+					callbackFlag = !!callbackFlag;
+
+					if (callbackFlag && expandFlag && (tools.apply(setting.callback.beforeExpand, [setting.treeId, node], true) == false)) {
+						return null;
+					} else if (callbackFlag && !expandFlag && (tools.apply(setting.callback.beforeCollapse, [setting.treeId, node], true) == false)) {
+						return null;
+					}
+					if (expandFlag && node.parentTId) {
+						view.expandCollapseParentNode(setting, node.getParentNode(), expandFlag, false);
+					}
+					if (expandFlag === node.open && !sonSign) {
+						return null;
+					}
+
+					data.getRoot(setting).expandTriggerFlag = callbackFlag;
+					if (!tools.canAsync(setting, node) && sonSign) {
+						view.expandCollapseSonNode(setting, node, expandFlag, true, function() {
+							if (focus !== false) {try{$$(node, setting).focus().blur();}catch(e){}}
+						});
+					} else {
+						node.open = !expandFlag;
+						view.switchNode(this.setting, node);
+						if (focus !== false) {try{$$(node, setting).focus().blur();}catch(e){}}
+					}
+					return expandFlag;
+				},
+				getNodes : function() {
+					return data.getNodes(setting);
+				},
+				getNodeByParam : function(key, value, parentNode) {
+					if (!key) return null;
+					return data.getNodeByParam(setting, parentNode?parentNode[setting.data.key.children]:data.getNodes(setting), key, value);
+				},
+				getNodeByTId : function(tId) {
+					return data.getNodeCache(setting, tId);
+				},
+				getNodesByParam : function(key, value, parentNode) {
+					if (!key) return null;
+					return data.getNodesByParam(setting, parentNode?parentNode[setting.data.key.children]:data.getNodes(setting), key, value);
+				},
+				getNodesByParamFuzzy : function(key, value, parentNode) {
+					if (!key) return null;
+					return data.getNodesByParamFuzzy(setting, parentNode?parentNode[setting.data.key.children]:data.getNodes(setting), key, value);
+				},
+				getNodesByFilter: function(filter, isSingle, parentNode, invokeParam) {
+					isSingle = !!isSingle;
+					if (!filter || (typeof filter != "function")) return (isSingle ? null : []);
+					return data.getNodesByFilter(setting, parentNode?parentNode[setting.data.key.children]:data.getNodes(setting), filter, isSingle, invokeParam);
+				},
+				getNodeIndex : function(node) {
+					if (!node) return null;
+					var childKey = setting.data.key.children,
+					parentNode = (node.parentTId) ? node.getParentNode() : data.getRoot(setting);
+					for (var i=0, l = parentNode[childKey].length; i < l; i++) {
+						if (parentNode[childKey][i] == node) return i;
+					}
+					return -1;
+				},
+				getSelectedNodes : function() {
+					var r = [], list = data.getRoot(setting).curSelectedList;
+					for (var i=0, l=list.length; i<l; i++) {
+						r.push(list[i]);
+					}
+					return r;
+				},
+				isSelectedNode : function(node) {
+					return data.isSelectedNode(setting, node);
+				},
+				reAsyncChildNodes : function(parentNode, reloadType, isSilent) {
+					if (!this.setting.async.enable) return;
+					var isRoot = !parentNode;
+					if (isRoot) {
+						parentNode = data.getRoot(setting);
+					}
+					if (reloadType=="refresh") {
+						var childKey = this.setting.data.key.children;
+						for (var i = 0, l = parentNode[childKey] ? parentNode[childKey].length : 0; i < l; i++) {
+							data.removeNodeCache(setting, parentNode[childKey][i]);
+						}
+						data.removeSelectedNode(setting);
+						parentNode[childKey] = [];
+						if (isRoot) {
+							this.setting.treeObj.empty();
+						} else {
+							var ulObj = $$(parentNode, consts.id.UL, setting);
+							ulObj.empty();
+						}
+					}
+					view.asyncNode(this.setting, isRoot? null:parentNode, !!isSilent);
+				},
+				refresh : function() {
+					this.setting.treeObj.empty();
+					var root = data.getRoot(setting),
+					nodes = root[setting.data.key.children]
+					data.initRoot(setting);
+					root[setting.data.key.children] = nodes
+					data.initCache(setting);
+					view.createNodes(setting, 0, root[setting.data.key.children]);
+				},
+				removeChildNodes : function(node) {
+					if (!node) return null;
+					var childKey = setting.data.key.children,
+					nodes = node[childKey];
+					view.removeChildNodes(setting, node);
+					return nodes ? nodes : null;
+				},
+				removeNode : function(node, callbackFlag) {
+					if (!node) return;
+					callbackFlag = !!callbackFlag;
+					if (callbackFlag && tools.apply(setting.callback.beforeRemove, [setting.treeId, node], true) == false) return;
+					view.removeNode(setting, node);
+					if (callbackFlag) {
+						this.setting.treeObj.trigger(consts.event.REMOVE, [setting.treeId, node]);
+					}
+				},
+				selectNode : function(node, addFlag) {
+					if (!node) return;
+					if (tools.uCanDo(setting)) {
+						addFlag = setting.view.selectedMulti && addFlag;
+						if (node.parentTId) {
+							view.expandCollapseParentNode(setting, node.getParentNode(), true, false, function() {
+								try{$$(node, setting).focus().blur();}catch(e){}
+							});
+						} else {
+							try{$$(node, setting).focus().blur();}catch(e){}
+						}
+						view.selectNode(setting, node, addFlag);
+					}
+				},
+				transformTozTreeNodes : function(simpleNodes) {
+					return data.transformTozTreeFormat(setting, simpleNodes);
+				},
+				transformToArray : function(nodes) {
+					return data.transformToArrayFormat(setting, nodes);
+				},
+				updateNode : function(node, checkTypeFlag) {
+					if (!node) return;
+					var nObj = $$(node, setting);
+					if (nObj.get(0) && tools.uCanDo(setting)) {
+						view.setNodeName(setting, node);
+						view.setNodeTarget(setting, node);
+						view.setNodeUrl(setting, node);
+						view.setNodeLineIcos(setting, node);
+						view.setNodeFontCss(setting, node);
+					}
+				}
+			}
+			root.treeTools = zTreeTools;
+			data.setZTreeTools(setting, zTreeTools);
+
+			if (root[childKey] && root[childKey].length > 0) {
+				view.createNodes(setting, 0, root[childKey]);
+			} else if (setting.async.enable && setting.async.url && setting.async.url !== '') {
+				view.asyncNode(setting);
+			}
+			return zTreeTools;
+		}
+	};
+
+	var zt = $.fn.zTree,
+	$$ = tools.$,
+	consts = zt.consts;
+})(jQuery);
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/js/jquery.ztree.core-3.5.min.js b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/js/jquery.ztree.core-3.5.min.js
new file mode 100644
index 0000000..42ab8b4
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/js/jquery.ztree.core-3.5.min.js
@@ -0,0 +1,68 @@
+/*
+ * JQuery zTree core v3.5.15
+ * http://zTree.me/
+ *
+ * Copyright (c) 2010 Hunter.z
+ *
+ * Licensed same as jquery - MIT License
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ * email: hunter.z@263.net
+ * Date: 2013-10-15
+ */
+(function(p){var G,H,I,J,K,L,r={},u={},v={},M={treeId:"",treeObj:null,view:{addDiyDom:null,autoCancelSelected:!0,dblClickExpand:!0,expandSpeed:"fast",fontCss:{},nameIsHTML:!1,selectedMulti:!0,showIcon:!0,showLine:!0,showTitle:!0,txtSelectedEnable:!1},data:{key:{children:"children",name:"name",title:"",url:"url"},simpleData:{enable:!1,idKey:"id",pIdKey:"pId",rootPId:null},keep:{parent:!1,leaf:!1}},async:{enable:!1,contentType:"application/x-www-form-urlencoded",type:"post",dataType:"text",url:"",autoParam:[],
+otherParam:[],dataFilter:null},callback:{beforeAsync:null,beforeClick:null,beforeDblClick:null,beforeRightClick:null,beforeMouseDown:null,beforeMouseUp:null,beforeExpand:null,beforeCollapse:null,beforeRemove:null,onAsyncError:null,onAsyncSuccess:null,onNodeCreated:null,onClick:null,onDblClick:null,onRightClick:null,onMouseDown:null,onMouseUp:null,onExpand:null,onCollapse:null,onRemove:null}},w=[function(b){var a=b.treeObj,c=e.event;a.bind(c.NODECREATED,function(a,c,g){j.apply(b.callback.onNodeCreated,
+[a,c,g])});a.bind(c.CLICK,function(a,c,g,l,h){j.apply(b.callback.onClick,[c,g,l,h])});a.bind(c.EXPAND,function(a,c,g){j.apply(b.callback.onExpand,[a,c,g])});a.bind(c.COLLAPSE,function(a,c,g){j.apply(b.callback.onCollapse,[a,c,g])});a.bind(c.ASYNC_SUCCESS,function(a,c,g,l){j.apply(b.callback.onAsyncSuccess,[a,c,g,l])});a.bind(c.ASYNC_ERROR,function(a,c,g,l,h,e){j.apply(b.callback.onAsyncError,[a,c,g,l,h,e])})}],x=[function(b){var a=e.event;b.treeObj.unbind(a.NODECREATED).unbind(a.CLICK).unbind(a.EXPAND).unbind(a.COLLAPSE).unbind(a.ASYNC_SUCCESS).unbind(a.ASYNC_ERROR)}],
+y=[function(b){var a=h.getCache(b);a||(a={},h.setCache(b,a));a.nodes=[];a.doms=[]}],z=[function(b,a,c,d,f,g){if(c){var l=h.getRoot(b),e=b.data.key.children;c.level=a;c.tId=b.treeId+"_"+ ++l.zId;c.parentTId=d?d.tId:null;c.open=typeof c.open=="string"?j.eqs(c.open,"true"):!!c.open;c[e]&&c[e].length>0?(c.isParent=!0,c.zAsync=!0):(c.isParent=typeof c.isParent=="string"?j.eqs(c.isParent,"true"):!!c.isParent,c.open=c.isParent&&!b.async.enable?c.open:!1,c.zAsync=!c.isParent);c.isFirstNode=f;c.isLastNode=
+g;c.getParentNode=function(){return h.getNodeCache(b,c.parentTId)};c.getPreNode=function(){return h.getPreNode(b,c)};c.getNextNode=function(){return h.getNextNode(b,c)};c.isAjaxing=!1;h.fixPIdKeyValue(b,c)}}],s=[function(b){var a=b.target,c=h.getSetting(b.data.treeId),d="",f=null,g="",l="",i=null,n=null,k=null;if(j.eqs(b.type,"mousedown"))l="mousedown";else if(j.eqs(b.type,"mouseup"))l="mouseup";else if(j.eqs(b.type,"contextmenu"))l="contextmenu";else if(j.eqs(b.type,"click"))if(j.eqs(a.tagName,"span")&&
+a.getAttribute("treeNode"+e.id.SWITCH)!==null)d=j.getNodeMainDom(a).id,g="switchNode";else{if(k=j.getMDom(c,a,[{tagName:"a",attrName:"treeNode"+e.id.A}]))d=j.getNodeMainDom(k).id,g="clickNode"}else if(j.eqs(b.type,"dblclick")&&(l="dblclick",k=j.getMDom(c,a,[{tagName:"a",attrName:"treeNode"+e.id.A}])))d=j.getNodeMainDom(k).id,g="switchNode";if(l.length>0&&d.length==0&&(k=j.getMDom(c,a,[{tagName:"a",attrName:"treeNode"+e.id.A}])))d=j.getNodeMainDom(k).id;if(d.length>0)switch(f=h.getNodeCache(c,d),g){case "switchNode":f.isParent?
+j.eqs(b.type,"click")||j.eqs(b.type,"dblclick")&&j.apply(c.view.dblClickExpand,[c.treeId,f],c.view.dblClickExpand)?i=G:g="":g="";break;case "clickNode":i=H}switch(l){case "mousedown":n=I;break;case "mouseup":n=J;break;case "dblclick":n=K;break;case "contextmenu":n=L}return{stop:!1,node:f,nodeEventType:g,nodeEventCallback:i,treeEventType:l,treeEventCallback:n}}],A=[function(b){var a=h.getRoot(b);a||(a={},h.setRoot(b,a));a[b.data.key.children]=[];a.expandTriggerFlag=!1;a.curSelectedList=[];a.noSelection=
+!0;a.createdNodes=[];a.zId=0;a._ver=(new Date).getTime()}],B=[],C=[],D=[],E=[],F=[],h={addNodeCache:function(b,a){h.getCache(b).nodes[h.getNodeCacheId(a.tId)]=a},getNodeCacheId:function(b){return b.substring(b.lastIndexOf("_")+1)},addAfterA:function(b){C.push(b)},addBeforeA:function(b){B.push(b)},addInnerAfterA:function(b){E.push(b)},addInnerBeforeA:function(b){D.push(b)},addInitBind:function(b){w.push(b)},addInitUnBind:function(b){x.push(b)},addInitCache:function(b){y.push(b)},addInitNode:function(b){z.push(b)},
+addInitProxy:function(b,a){a?s.splice(0,0,b):s.push(b)},addInitRoot:function(b){A.push(b)},addNodesData:function(b,a,c){var d=b.data.key.children;a[d]||(a[d]=[]);if(a[d].length>0)a[d][a[d].length-1].isLastNode=!1,i.setNodeLineIcos(b,a[d][a[d].length-1]);a.isParent=!0;a[d]=a[d].concat(c)},addSelectedNode:function(b,a){var c=h.getRoot(b);h.isSelectedNode(b,a)||c.curSelectedList.push(a)},addCreatedNode:function(b,a){(b.callback.onNodeCreated||b.view.addDiyDom)&&h.getRoot(b).createdNodes.push(a)},addZTreeTools:function(b){F.push(b)},
+exSetting:function(b){p.extend(!0,M,b)},fixPIdKeyValue:function(b,a){b.data.simpleData.enable&&(a[b.data.simpleData.pIdKey]=a.parentTId?a.getParentNode()[b.data.simpleData.idKey]:b.data.simpleData.rootPId)},getAfterA:function(b,a,c){for(var d=0,f=C.length;d<f;d++)C[d].apply(this,arguments)},getBeforeA:function(b,a,c){for(var d=0,f=B.length;d<f;d++)B[d].apply(this,arguments)},getInnerAfterA:function(b,a,c){for(var d=0,f=E.length;d<f;d++)E[d].apply(this,arguments)},getInnerBeforeA:function(b,a,c){for(var d=
+0,f=D.length;d<f;d++)D[d].apply(this,arguments)},getCache:function(b){return v[b.treeId]},getNextNode:function(b,a){if(!a)return null;for(var c=b.data.key.children,d=a.parentTId?a.getParentNode():h.getRoot(b),f=0,g=d[c].length-1;f<=g;f++)if(d[c][f]===a)return f==g?null:d[c][f+1];return null},getNodeByParam:function(b,a,c,d){if(!a||!c)return null;for(var f=b.data.key.children,g=0,l=a.length;g<l;g++){if(a[g][c]==d)return a[g];var e=h.getNodeByParam(b,a[g][f],c,d);if(e)return e}return null},getNodeCache:function(b,
+a){if(!a)return null;var c=v[b.treeId].nodes[h.getNodeCacheId(a)];return c?c:null},getNodeName:function(b,a){return""+a[b.data.key.name]},getNodeTitle:function(b,a){return""+a[b.data.key.title===""?b.data.key.name:b.data.key.title]},getNodes:function(b){return h.getRoot(b)[b.data.key.children]},getNodesByParam:function(b,a,c,d){if(!a||!c)return[];for(var f=b.data.key.children,g=[],l=0,e=a.length;l<e;l++)a[l][c]==d&&g.push(a[l]),g=g.concat(h.getNodesByParam(b,a[l][f],c,d));return g},getNodesByParamFuzzy:function(b,
+a,c,d){if(!a||!c)return[];for(var f=b.data.key.children,g=[],d=d.toLowerCase(),l=0,e=a.length;l<e;l++)typeof a[l][c]=="string"&&a[l][c].toLowerCase().indexOf(d)>-1&&g.push(a[l]),g=g.concat(h.getNodesByParamFuzzy(b,a[l][f],c,d));return g},getNodesByFilter:function(b,a,c,d,f){if(!a)return d?null:[];for(var g=b.data.key.children,e=d?null:[],i=0,n=a.length;i<n;i++){if(j.apply(c,[a[i],f],!1)){if(d)return a[i];e.push(a[i])}var k=h.getNodesByFilter(b,a[i][g],c,d,f);if(d&&k)return k;e=d?k:e.concat(k)}return e},
+getPreNode:function(b,a){if(!a)return null;for(var c=b.data.key.children,d=a.parentTId?a.getParentNode():h.getRoot(b),f=0,g=d[c].length;f<g;f++)if(d[c][f]===a)return f==0?null:d[c][f-1];return null},getRoot:function(b){return b?u[b.treeId]:null},getRoots:function(){return u},getSetting:function(b){return r[b]},getSettings:function(){return r},getZTreeTools:function(b){return(b=this.getRoot(this.getSetting(b)))?b.treeTools:null},initCache:function(b){for(var a=0,c=y.length;a<c;a++)y[a].apply(this,
+arguments)},initNode:function(b,a,c,d,f,g){for(var e=0,h=z.length;e<h;e++)z[e].apply(this,arguments)},initRoot:function(b){for(var a=0,c=A.length;a<c;a++)A[a].apply(this,arguments)},isSelectedNode:function(b,a){for(var c=h.getRoot(b),d=0,f=c.curSelectedList.length;d<f;d++)if(a===c.curSelectedList[d])return!0;return!1},removeNodeCache:function(b,a){var c=b.data.key.children;if(a[c])for(var d=0,f=a[c].length;d<f;d++)arguments.callee(b,a[c][d]);h.getCache(b).nodes[h.getNodeCacheId(a.tId)]=null},removeSelectedNode:function(b,
+a){for(var c=h.getRoot(b),d=0,f=c.curSelectedList.length;d<f;d++)if(a===c.curSelectedList[d]||!h.getNodeCache(b,c.curSelectedList[d].tId))c.curSelectedList.splice(d,1),d--,f--},setCache:function(b,a){v[b.treeId]=a},setRoot:function(b,a){u[b.treeId]=a},setZTreeTools:function(b,a){for(var c=0,d=F.length;c<d;c++)F[c].apply(this,arguments)},transformToArrayFormat:function(b,a){if(!a)return[];var c=b.data.key.children,d=[];if(j.isArray(a))for(var f=0,g=a.length;f<g;f++)d.push(a[f]),a[f][c]&&(d=d.concat(h.transformToArrayFormat(b,
+a[f][c])));else d.push(a),a[c]&&(d=d.concat(h.transformToArrayFormat(b,a[c])));return d},transformTozTreeFormat:function(b,a){var c,d,f=b.data.simpleData.idKey,g=b.data.simpleData.pIdKey,e=b.data.key.children;if(!f||f==""||!a)return[];if(j.isArray(a)){var h=[],i=[];for(c=0,d=a.length;c<d;c++)i[a[c][f]]=a[c];for(c=0,d=a.length;c<d;c++)i[a[c][g]]&&a[c][f]!=a[c][g]?(i[a[c][g]][e]||(i[a[c][g]][e]=[]),i[a[c][g]][e].push(a[c])):h.push(a[c]);return h}else return[a]}},m={bindEvent:function(b){for(var a=0,
+c=w.length;a<c;a++)w[a].apply(this,arguments)},unbindEvent:function(b){for(var a=0,c=x.length;a<c;a++)x[a].apply(this,arguments)},bindTree:function(b){var a={treeId:b.treeId},c=b.treeObj;b.view.txtSelectedEnable||c.bind("selectstart",function(a){a=a.originalEvent.srcElement.nodeName.toLowerCase();return a==="input"||a==="textarea"}).css({"-moz-user-select":"-moz-none"});c.bind("click",a,m.proxy);c.bind("dblclick",a,m.proxy);c.bind("mouseover",a,m.proxy);c.bind("mouseout",a,m.proxy);c.bind("mousedown",
+a,m.proxy);c.bind("mouseup",a,m.proxy);c.bind("contextmenu",a,m.proxy)},unbindTree:function(b){b.treeObj.unbind("click",m.proxy).unbind("dblclick",m.proxy).unbind("mouseover",m.proxy).unbind("mouseout",m.proxy).unbind("mousedown",m.proxy).unbind("mouseup",m.proxy).unbind("contextmenu",m.proxy)},doProxy:function(b){for(var a=[],c=0,d=s.length;c<d;c++){var f=s[c].apply(this,arguments);a.push(f);if(f.stop)break}return a},proxy:function(b){var a=h.getSetting(b.data.treeId);if(!j.uCanDo(a,b))return!0;
+for(var a=m.doProxy(b),c=!0,d=0,f=a.length;d<f;d++){var g=a[d];g.nodeEventCallback&&(c=g.nodeEventCallback.apply(g,[b,g.node])&&c);g.treeEventCallback&&(c=g.treeEventCallback.apply(g,[b,g.node])&&c)}return c}};G=function(b,a){var c=h.getSetting(b.data.treeId);if(a.open){if(j.apply(c.callback.beforeCollapse,[c.treeId,a],!0)==!1)return!0}else if(j.apply(c.callback.beforeExpand,[c.treeId,a],!0)==!1)return!0;h.getRoot(c).expandTriggerFlag=!0;i.switchNode(c,a);return!0};H=function(b,a){var c=h.getSetting(b.data.treeId),
+d=c.view.autoCancelSelected&&b.ctrlKey&&h.isSelectedNode(c,a)?0:c.view.autoCancelSelected&&b.ctrlKey&&c.view.selectedMulti?2:1;if(j.apply(c.callback.beforeClick,[c.treeId,a,d],!0)==!1)return!0;d===0?i.cancelPreSelectedNode(c,a):i.selectNode(c,a,d===2);c.treeObj.trigger(e.event.CLICK,[b,c.treeId,a,d]);return!0};I=function(b,a){var c=h.getSetting(b.data.treeId);j.apply(c.callback.beforeMouseDown,[c.treeId,a],!0)&&j.apply(c.callback.onMouseDown,[b,c.treeId,a]);return!0};J=function(b,a){var c=h.getSetting(b.data.treeId);
+j.apply(c.callback.beforeMouseUp,[c.treeId,a],!0)&&j.apply(c.callback.onMouseUp,[b,c.treeId,a]);return!0};K=function(b,a){var c=h.getSetting(b.data.treeId);j.apply(c.callback.beforeDblClick,[c.treeId,a],!0)&&j.apply(c.callback.onDblClick,[b,c.treeId,a]);return!0};L=function(b,a){var c=h.getSetting(b.data.treeId);j.apply(c.callback.beforeRightClick,[c.treeId,a],!0)&&j.apply(c.callback.onRightClick,[b,c.treeId,a]);return typeof c.callback.onRightClick!="function"};var j={apply:function(b,a,c){return typeof b==
+"function"?b.apply(N,a?a:[]):c},canAsync:function(b,a){var c=b.data.key.children;return b.async.enable&&a&&a.isParent&&!(a.zAsync||a[c]&&a[c].length>0)},clone:function(b){if(b===null)return null;var a=j.isArray(b)?[]:{},c;for(c in b)a[c]=b[c]instanceof Date?new Date(b[c].getTime()):typeof b[c]==="object"?arguments.callee(b[c]):b[c];return a},eqs:function(b,a){return b.toLowerCase()===a.toLowerCase()},isArray:function(b){return Object.prototype.toString.apply(b)==="[object Array]"},$:function(b,a,
+c){a&&typeof a!="string"&&(c=a,a="");return typeof b=="string"?p(b,c?c.treeObj.get(0).ownerDocument:null):p("#"+b.tId+a,c?c.treeObj:null)},getMDom:function(b,a,c){if(!a)return null;for(;a&&a.id!==b.treeId;){for(var d=0,f=c.length;a.tagName&&d<f;d++)if(j.eqs(a.tagName,c[d].tagName)&&a.getAttribute(c[d].attrName)!==null)return a;a=a.parentNode}return null},getNodeMainDom:function(b){return p(b).parent("li").get(0)||p(b).parentsUntil("li").parent().get(0)},isChildOrSelf:function(b,a){return p(b).closest("#"+
+a).length>0},uCanDo:function(){return!0}},i={addNodes:function(b,a,c,d){if(!b.data.keep.leaf||!a||a.isParent)if(j.isArray(c)||(c=[c]),b.data.simpleData.enable&&(c=h.transformTozTreeFormat(b,c)),a){var f=k(a,e.id.SWITCH,b),g=k(a,e.id.ICON,b),l=k(a,e.id.UL,b);if(!a.open)i.replaceSwitchClass(a,f,e.folder.CLOSE),i.replaceIcoClass(a,g,e.folder.CLOSE),a.open=!1,l.css({display:"none"});h.addNodesData(b,a,c);i.createNodes(b,a.level+1,c,a);d||i.expandCollapseParentNode(b,a,!0)}else h.addNodesData(b,h.getRoot(b),
+c),i.createNodes(b,0,c,null)},appendNodes:function(b,a,c,d,f,g){if(!c)return[];for(var e=[],j=b.data.key.children,k=0,m=c.length;k<m;k++){var o=c[k];if(f){var t=(d?d:h.getRoot(b))[j].length==c.length&&k==0;h.initNode(b,a,o,d,t,k==c.length-1,g);h.addNodeCache(b,o)}t=[];o[j]&&o[j].length>0&&(t=i.appendNodes(b,a+1,o[j],o,f,g&&o.open));g&&(i.makeDOMNodeMainBefore(e,b,o),i.makeDOMNodeLine(e,b,o),h.getBeforeA(b,o,e),i.makeDOMNodeNameBefore(e,b,o),h.getInnerBeforeA(b,o,e),i.makeDOMNodeIcon(e,b,o),h.getInnerAfterA(b,
+o,e),i.makeDOMNodeNameAfter(e,b,o),h.getAfterA(b,o,e),o.isParent&&o.open&&i.makeUlHtml(b,o,e,t.join("")),i.makeDOMNodeMainAfter(e,b,o),h.addCreatedNode(b,o))}return e},appendParentULDom:function(b,a){var c=[],d=k(a,b);!d.get(0)&&a.parentTId&&(i.appendParentULDom(b,a.getParentNode()),d=k(a,b));var f=k(a,e.id.UL,b);f.get(0)&&f.remove();f=i.appendNodes(b,a.level+1,a[b.data.key.children],a,!1,!0);i.makeUlHtml(b,a,c,f.join(""));d.append(c.join(""))},asyncNode:function(b,a,c,d){var f,g;if(a&&!a.isParent)return j.apply(d),
+!1;else if(a&&a.isAjaxing)return!1;else if(j.apply(b.callback.beforeAsync,[b.treeId,a],!0)==!1)return j.apply(d),!1;if(a)a.isAjaxing=!0,k(a,e.id.ICON,b).attr({style:"","class":e.className.BUTTON+" "+e.className.ICO_LOADING});var l={};for(f=0,g=b.async.autoParam.length;a&&f<g;f++){var q=b.async.autoParam[f].split("="),n=q;q.length>1&&(n=q[1],q=q[0]);l[n]=a[q]}if(j.isArray(b.async.otherParam))for(f=0,g=b.async.otherParam.length;f<g;f+=2)l[b.async.otherParam[f]]=b.async.otherParam[f+1];else for(var m in b.async.otherParam)l[m]=
+b.async.otherParam[m];var o=h.getRoot(b)._ver;p.ajax({contentType:b.async.contentType,type:b.async.type,url:j.apply(b.async.url,[b.treeId,a],b.async.url),data:l,dataType:b.async.dataType,success:function(f){if(o==h.getRoot(b)._ver){var g=[];try{g=!f||f.length==0?[]:typeof f=="string"?eval("("+f+")"):f}catch(l){g=f}if(a)a.isAjaxing=null,a.zAsync=!0;i.setNodeLineIcos(b,a);g&&g!==""?(g=j.apply(b.async.dataFilter,[b.treeId,a,g],g),i.addNodes(b,a,g?j.clone(g):[],!!c)):i.addNodes(b,a,[],!!c);b.treeObj.trigger(e.event.ASYNC_SUCCESS,
+[b.treeId,a,f]);j.apply(d)}},error:function(c,d,f){if(o==h.getRoot(b)._ver){if(a)a.isAjaxing=null;i.setNodeLineIcos(b,a);b.treeObj.trigger(e.event.ASYNC_ERROR,[b.treeId,a,c,d,f])}}});return!0},cancelPreSelectedNode:function(b,a){for(var c=h.getRoot(b).curSelectedList,d=c.length-1;d>=0;d--)if(!a||a===c[d])if(k(c[d],e.id.A,b).removeClass(e.node.CURSELECTED),a){h.removeSelectedNode(b,a);break}if(!a)h.getRoot(b).curSelectedList=[]},createNodeCallback:function(b){if(b.callback.onNodeCreated||b.view.addDiyDom)for(var a=
+h.getRoot(b);a.createdNodes.length>0;){var c=a.createdNodes.shift();j.apply(b.view.addDiyDom,[b.treeId,c]);b.callback.onNodeCreated&&b.treeObj.trigger(e.event.NODECREATED,[b.treeId,c])}},createNodes:function(b,a,c,d){if(c&&c.length!=0){var f=h.getRoot(b),g=b.data.key.children,g=!d||d.open||!!k(d[g][0],b).get(0);f.createdNodes=[];a=i.appendNodes(b,a,c,d,!0,g);d?(d=k(d,e.id.UL,b),d.get(0)&&d.append(a.join(""))):b.treeObj.append(a.join(""));i.createNodeCallback(b)}},destroy:function(b){b&&(h.initCache(b),
+h.initRoot(b),m.unbindTree(b),m.unbindEvent(b),b.treeObj.empty())},expandCollapseNode:function(b,a,c,d,f){var g=h.getRoot(b),l=b.data.key.children;if(a){if(g.expandTriggerFlag){var q=f,f=function(){q&&q();a.open?b.treeObj.trigger(e.event.EXPAND,[b.treeId,a]):b.treeObj.trigger(e.event.COLLAPSE,[b.treeId,a])};g.expandTriggerFlag=!1}if(!a.open&&a.isParent&&(!k(a,e.id.UL,b).get(0)||a[l]&&a[l].length>0&&!k(a[l][0],b).get(0)))i.appendParentULDom(b,a),i.createNodeCallback(b);if(a.open==c)j.apply(f,[]);else{var c=
+k(a,e.id.UL,b),g=k(a,e.id.SWITCH,b),n=k(a,e.id.ICON,b);a.isParent?(a.open=!a.open,a.iconOpen&&a.iconClose&&n.attr("style",i.makeNodeIcoStyle(b,a)),a.open?(i.replaceSwitchClass(a,g,e.folder.OPEN),i.replaceIcoClass(a,n,e.folder.OPEN),d==!1||b.view.expandSpeed==""?(c.show(),j.apply(f,[])):a[l]&&a[l].length>0?c.slideDown(b.view.expandSpeed,f):(c.show(),j.apply(f,[]))):(i.replaceSwitchClass(a,g,e.folder.CLOSE),i.replaceIcoClass(a,n,e.folder.CLOSE),d==!1||b.view.expandSpeed==""||!(a[l]&&a[l].length>0)?
+(c.hide(),j.apply(f,[])):c.slideUp(b.view.expandSpeed,f))):j.apply(f,[])}}else j.apply(f,[])},expandCollapseParentNode:function(b,a,c,d,f){a&&(a.parentTId?(i.expandCollapseNode(b,a,c,d),a.parentTId&&i.expandCollapseParentNode(b,a.getParentNode(),c,d,f)):i.expandCollapseNode(b,a,c,d,f))},expandCollapseSonNode:function(b,a,c,d,f){var g=h.getRoot(b),e=b.data.key.children,g=a?a[e]:g[e],e=a?!1:d,j=h.getRoot(b).expandTriggerFlag;h.getRoot(b).expandTriggerFlag=!1;if(g)for(var k=0,m=g.length;k<m;k++)g[k]&&
+i.expandCollapseSonNode(b,g[k],c,e);h.getRoot(b).expandTriggerFlag=j;i.expandCollapseNode(b,a,c,d,f)},makeDOMNodeIcon:function(b,a,c){var d=h.getNodeName(a,c),d=a.view.nameIsHTML?d:d.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;");b.push("<span id='",c.tId,e.id.ICON,"' title='' treeNode",e.id.ICON," class='",i.makeNodeIcoClass(a,c),"' style='",i.makeNodeIcoStyle(a,c),"'></span><span id='",c.tId,e.id.SPAN,"'>",d,"</span>")},makeDOMNodeLine:function(b,a,c){b.push("<span id='",c.tId,
+e.id.SWITCH,"' title='' class='",i.makeNodeLineClass(a,c),"' treeNode",e.id.SWITCH,"></span>")},makeDOMNodeMainAfter:function(b){b.push("</li>")},makeDOMNodeMainBefore:function(b,a,c){b.push("<li id='",c.tId,"' class='",e.className.LEVEL,c.level,"' tabindex='0' hidefocus='true' treenode>")},makeDOMNodeNameAfter:function(b){b.push("</a>")},makeDOMNodeNameBefore:function(b,a,c){var d=h.getNodeTitle(a,c),f=i.makeNodeUrl(a,c),g=i.makeNodeFontCss(a,c),l=[],k;for(k in g)l.push(k,":",g[k],";");b.push("<a id='",
+c.tId,e.id.A,"' class='",e.className.LEVEL,c.level,"' treeNode",e.id.A,' onclick="',c.click||"",'" ',f!=null&&f.length>0?"href='"+f+"'":""," target='",i.makeNodeTarget(c),"' style='",l.join(""),"'");j.apply(a.view.showTitle,[a.treeId,c],a.view.showTitle)&&d&&b.push("title='",d.replace(/'/g,"&#39;").replace(/</g,"&lt;").replace(/>/g,"&gt;"),"'");b.push(">")},makeNodeFontCss:function(b,a){var c=j.apply(b.view.fontCss,[b.treeId,a],b.view.fontCss);return c&&typeof c!="function"?c:{}},makeNodeIcoClass:function(b,
+a){var c=["ico"];a.isAjaxing||(c[0]=(a.iconSkin?a.iconSkin+"_":"")+c[0],a.isParent?c.push(a.open?e.folder.OPEN:e.folder.CLOSE):c.push(e.folder.DOCU));return e.className.BUTTON+" "+c.join("_")},makeNodeIcoStyle:function(b,a){var c=[];if(!a.isAjaxing){var d=a.isParent&&a.iconOpen&&a.iconClose?a.open?a.iconOpen:a.iconClose:a.icon;d&&c.push("background:url(",d,") 0 0 no-repeat;");(b.view.showIcon==!1||!j.apply(b.view.showIcon,[b.treeId,a],!0))&&c.push("width:0px;height:0px;")}return c.join("")},makeNodeLineClass:function(b,
+a){var c=[];b.view.showLine?a.level==0&&a.isFirstNode&&a.isLastNode?c.push(e.line.ROOT):a.level==0&&a.isFirstNode?c.push(e.line.ROOTS):a.isLastNode?c.push(e.line.BOTTOM):c.push(e.line.CENTER):c.push(e.line.NOLINE);a.isParent?c.push(a.open?e.folder.OPEN:e.folder.CLOSE):c.push(e.folder.DOCU);return i.makeNodeLineClassEx(a)+c.join("_")},makeNodeLineClassEx:function(b){return e.className.BUTTON+" "+e.className.LEVEL+b.level+" "+e.className.SWITCH+" "},makeNodeTarget:function(b){return b.target||"_blank"},
+makeNodeUrl:function(b,a){var c=b.data.key.url;return a[c]?a[c]:null},makeUlHtml:function(b,a,c,d){c.push("<ul id='",a.tId,e.id.UL,"' class='",e.className.LEVEL,a.level," ",i.makeUlLineClass(b,a),"' style='display:",a.open?"block":"none","'>");c.push(d);c.push("</ul>")},makeUlLineClass:function(b,a){return b.view.showLine&&!a.isLastNode?e.line.LINE:""},removeChildNodes:function(b,a){if(a){var c=b.data.key.children,d=a[c];if(d){for(var f=0,g=d.length;f<g;f++)h.removeNodeCache(b,d[f]);h.removeSelectedNode(b);
+delete a[c];b.data.keep.parent?k(a,e.id.UL,b).empty():(a.isParent=!1,a.open=!1,c=k(a,e.id.SWITCH,b),d=k(a,e.id.ICON,b),i.replaceSwitchClass(a,c,e.folder.DOCU),i.replaceIcoClass(a,d,e.folder.DOCU),k(a,e.id.UL,b).remove())}}},setFirstNode:function(b,a){var c=b.data.key.children;if(a[c].length>0)a[c][0].isFirstNode=!0},setLastNode:function(b,a){var c=b.data.key.children,d=a[c].length;if(d>0)a[c][d-1].isLastNode=!0},removeNode:function(b,a){var c=h.getRoot(b),d=b.data.key.children,f=a.parentTId?a.getParentNode():
+c;a.isFirstNode=!1;a.isLastNode=!1;a.getPreNode=function(){return null};a.getNextNode=function(){return null};if(h.getNodeCache(b,a.tId)){k(a,b).remove();h.removeNodeCache(b,a);h.removeSelectedNode(b,a);for(var g=0,l=f[d].length;g<l;g++)if(f[d][g].tId==a.tId){f[d].splice(g,1);break}i.setFirstNode(b,f);i.setLastNode(b,f);var j,g=f[d].length;if(!b.data.keep.parent&&g==0)f.isParent=!1,f.open=!1,g=k(f,e.id.UL,b),l=k(f,e.id.SWITCH,b),j=k(f,e.id.ICON,b),i.replaceSwitchClass(f,l,e.folder.DOCU),i.replaceIcoClass(f,
+j,e.folder.DOCU),g.css("display","none");else if(b.view.showLine&&g>0){var n=f[d][g-1],g=k(n,e.id.UL,b),l=k(n,e.id.SWITCH,b);j=k(n,e.id.ICON,b);f==c?f[d].length==1?i.replaceSwitchClass(n,l,e.line.ROOT):(c=k(f[d][0],e.id.SWITCH,b),i.replaceSwitchClass(f[d][0],c,e.line.ROOTS),i.replaceSwitchClass(n,l,e.line.BOTTOM)):i.replaceSwitchClass(n,l,e.line.BOTTOM);g.removeClass(e.line.LINE)}}},replaceIcoClass:function(b,a,c){if(a&&!b.isAjaxing&&(b=a.attr("class"),b!=void 0)){b=b.split("_");switch(c){case e.folder.OPEN:case e.folder.CLOSE:case e.folder.DOCU:b[b.length-
+1]=c}a.attr("class",b.join("_"))}},replaceSwitchClass:function(b,a,c){if(a){var d=a.attr("class");if(d!=void 0){d=d.split("_");switch(c){case e.line.ROOT:case e.line.ROOTS:case e.line.CENTER:case e.line.BOTTOM:case e.line.NOLINE:d[0]=i.makeNodeLineClassEx(b)+c;break;case e.folder.OPEN:case e.folder.CLOSE:case e.folder.DOCU:d[1]=c}a.attr("class",d.join("_"));c!==e.folder.DOCU?a.removeAttr("disabled"):a.attr("disabled","disabled")}}},selectNode:function(b,a,c){c||i.cancelPreSelectedNode(b);k(a,e.id.A,
+b).addClass(e.node.CURSELECTED);h.addSelectedNode(b,a)},setNodeFontCss:function(b,a){var c=k(a,e.id.A,b),d=i.makeNodeFontCss(b,a);d&&c.css(d)},setNodeLineIcos:function(b,a){if(a){var c=k(a,e.id.SWITCH,b),d=k(a,e.id.UL,b),f=k(a,e.id.ICON,b),g=i.makeUlLineClass(b,a);g.length==0?d.removeClass(e.line.LINE):d.addClass(g);c.attr("class",i.makeNodeLineClass(b,a));a.isParent?c.removeAttr("disabled"):c.attr("disabled","disabled");f.removeAttr("style");f.attr("style",i.makeNodeIcoStyle(b,a));f.attr("class",
+i.makeNodeIcoClass(b,a))}},setNodeName:function(b,a){var c=h.getNodeTitle(b,a),d=k(a,e.id.SPAN,b);d.empty();b.view.nameIsHTML?d.html(h.getNodeName(b,a)):d.text(h.getNodeName(b,a));j.apply(b.view.showTitle,[b.treeId,a],b.view.showTitle)&&k(a,e.id.A,b).attr("title",!c?"":c)},setNodeTarget:function(b,a){k(a,e.id.A,b).attr("target",i.makeNodeTarget(a))},setNodeUrl:function(b,a){var c=k(a,e.id.A,b),d=i.makeNodeUrl(b,a);d==null||d.length==0?c.removeAttr("href"):c.attr("href",d)},switchNode:function(b,a){a.open||
+!j.canAsync(b,a)?i.expandCollapseNode(b,a,!a.open):b.async.enable?i.asyncNode(b,a)||i.expandCollapseNode(b,a,!a.open):a&&i.expandCollapseNode(b,a,!a.open)}};p.fn.zTree={consts:{className:{BUTTON:"button",LEVEL:"level",ICO_LOADING:"ico_loading",SWITCH:"switch"},event:{NODECREATED:"ztree_nodeCreated",CLICK:"ztree_click",EXPAND:"ztree_expand",COLLAPSE:"ztree_collapse",ASYNC_SUCCESS:"ztree_async_success",ASYNC_ERROR:"ztree_async_error"},id:{A:"_a",ICON:"_ico",SPAN:"_span",SWITCH:"_switch",UL:"_ul"},line:{ROOT:"root",
+ROOTS:"roots",CENTER:"center",BOTTOM:"bottom",NOLINE:"noline",LINE:"line"},folder:{OPEN:"open",CLOSE:"close",DOCU:"docu"},node:{CURSELECTED:"curSelectedNode"}},_z:{tools:j,view:i,event:m,data:h},getZTreeObj:function(b){return(b=h.getZTreeTools(b))?b:null},destroy:function(b){if(b&&b.length>0)i.destroy(h.getSetting(b));else for(var a in r)i.destroy(r[a])},init:function(b,a,c){var d=j.clone(M);p.extend(!0,d,a);d.treeId=b.attr("id");d.treeObj=b;d.treeObj.empty();r[d.treeId]=d;if(typeof document.body.style.maxHeight===
+"undefined")d.view.expandSpeed="";h.initRoot(d);b=h.getRoot(d);a=d.data.key.children;c=c?j.clone(j.isArray(c)?c:[c]):[];b[a]=d.data.simpleData.enable?h.transformTozTreeFormat(d,c):c;h.initCache(d);m.unbindTree(d);m.bindTree(d);m.unbindEvent(d);m.bindEvent(d);c={setting:d,addNodes:function(a,b,c){function e(){i.addNodes(d,a,h,c==!0)}if(!b)return null;a||(a=null);if(a&&!a.isParent&&d.data.keep.leaf)return null;var h=j.clone(j.isArray(b)?b:[b]);j.canAsync(d,a)?i.asyncNode(d,a,c,e):e();return h},cancelSelectedNode:function(a){i.cancelPreSelectedNode(d,
+a)},destroy:function(){i.destroy(d)},expandAll:function(a){a=!!a;i.expandCollapseSonNode(d,null,a,!0);return a},expandNode:function(a,b,c,e,n){if(!a||!a.isParent)return null;b!==!0&&b!==!1&&(b=!a.open);if((n=!!n)&&b&&j.apply(d.callback.beforeExpand,[d.treeId,a],!0)==!1)return null;else if(n&&!b&&j.apply(d.callback.beforeCollapse,[d.treeId,a],!0)==!1)return null;b&&a.parentTId&&i.expandCollapseParentNode(d,a.getParentNode(),b,!1);if(b===a.open&&!c)return null;h.getRoot(d).expandTriggerFlag=n;if(!j.canAsync(d,
+a)&&c)i.expandCollapseSonNode(d,a,b,!0,function(){if(e!==!1)try{k(a,d).focus().blur()}catch(b){}});else if(a.open=!b,i.switchNode(this.setting,a),e!==!1)try{k(a,d).focus().blur()}catch(m){}return b},getNodes:function(){return h.getNodes(d)},getNodeByParam:function(a,b,c){return!a?null:h.getNodeByParam(d,c?c[d.data.key.children]:h.getNodes(d),a,b)},getNodeByTId:function(a){return h.getNodeCache(d,a)},getNodesByParam:function(a,b,c){return!a?null:h.getNodesByParam(d,c?c[d.data.key.children]:h.getNodes(d),
+a,b)},getNodesByParamFuzzy:function(a,b,c){return!a?null:h.getNodesByParamFuzzy(d,c?c[d.data.key.children]:h.getNodes(d),a,b)},getNodesByFilter:function(a,b,c,e){b=!!b;return!a||typeof a!="function"?b?null:[]:h.getNodesByFilter(d,c?c[d.data.key.children]:h.getNodes(d),a,b,e)},getNodeIndex:function(a){if(!a)return null;for(var b=d.data.key.children,c=a.parentTId?a.getParentNode():h.getRoot(d),e=0,i=c[b].length;e<i;e++)if(c[b][e]==a)return e;return-1},getSelectedNodes:function(){for(var a=[],b=h.getRoot(d).curSelectedList,
+c=0,e=b.length;c<e;c++)a.push(b[c]);return a},isSelectedNode:function(a){return h.isSelectedNode(d,a)},reAsyncChildNodes:function(a,b,c){if(this.setting.async.enable){var j=!a;j&&(a=h.getRoot(d));if(b=="refresh"){for(var b=this.setting.data.key.children,m=0,p=a[b]?a[b].length:0;m<p;m++)h.removeNodeCache(d,a[b][m]);h.removeSelectedNode(d);a[b]=[];j?this.setting.treeObj.empty():k(a,e.id.UL,d).empty()}i.asyncNode(this.setting,j?null:a,!!c)}},refresh:function(){this.setting.treeObj.empty();var a=h.getRoot(d),
+b=a[d.data.key.children];h.initRoot(d);a[d.data.key.children]=b;h.initCache(d);i.createNodes(d,0,a[d.data.key.children])},removeChildNodes:function(a){if(!a)return null;var b=a[d.data.key.children];i.removeChildNodes(d,a);return b?b:null},removeNode:function(a,b){a&&(b=!!b,b&&j.apply(d.callback.beforeRemove,[d.treeId,a],!0)==!1||(i.removeNode(d,a),b&&this.setting.treeObj.trigger(e.event.REMOVE,[d.treeId,a])))},selectNode:function(a,b){if(a&&j.uCanDo(d)){b=d.view.selectedMulti&&b;if(a.parentTId)i.expandCollapseParentNode(d,
+a.getParentNode(),!0,!1,function(){try{k(a,d).focus().blur()}catch(b){}});else try{k(a,d).focus().blur()}catch(c){}i.selectNode(d,a,b)}},transformTozTreeNodes:function(a){return h.transformTozTreeFormat(d,a)},transformToArray:function(a){return h.transformToArrayFormat(d,a)},updateNode:function(a){a&&k(a,d).get(0)&&j.uCanDo(d)&&(i.setNodeName(d,a),i.setNodeTarget(d,a),i.setNodeUrl(d,a),i.setNodeLineIcos(d,a),i.setNodeFontCss(d,a))}};b.treeTools=c;h.setZTreeTools(d,c);b[a]&&b[a].length>0?i.createNodes(d,
+0,b[a]):d.async.enable&&d.async.url&&d.async.url!==""&&i.asyncNode(d);return c}};var N=p.fn.zTree,k=j.$,e=N.consts})(jQuery);
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/js/jquery.ztree.excheck-3.5.js b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/js/jquery.ztree.excheck-3.5.js
new file mode 100644
index 0000000..c3fbfc5
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/js/jquery.ztree.excheck-3.5.js
@@ -0,0 +1,626 @@
+/*
+ * JQuery zTree excheck v3.5.15
+ * http://zTree.me/
+ *
+ * Copyright (c) 2010 Hunter.z
+ *
+ * Licensed same as jquery - MIT License
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ * email: hunter.z@263.net
+ * Date: 2013-10-15
+ */
+(function($){
+	//default consts of excheck
+	var _consts = {
+		event: {
+			CHECK: "ztree_check"
+		},
+		id: {
+			CHECK: "_check"
+		},
+		checkbox: {
+			STYLE: "checkbox",
+			DEFAULT: "chk",
+			DISABLED: "disable",
+			FALSE: "false",
+			TRUE: "true",
+			FULL: "full",
+			PART: "part",
+			FOCUS: "focus"
+		},
+		radio: {
+			STYLE: "radio",
+			TYPE_ALL: "all",
+			TYPE_LEVEL: "level"
+		}
+	},
+	//default setting of excheck
+	_setting = {
+		check: {
+			enable: false,
+			autoCheckTrigger: false,
+			chkStyle: _consts.checkbox.STYLE,
+			nocheckInherit: false,
+			chkDisabledInherit: false,
+			radioType: _consts.radio.TYPE_LEVEL,
+			chkboxType: {
+				"Y": "ps",
+				"N": "ps"
+			}
+		},
+		data: {
+			key: {
+				checked: "checked"
+			}
+		},
+		callback: {
+			beforeCheck:null,
+			onCheck:null
+		}
+	},
+	//default root of excheck
+	_initRoot = function (setting) {
+		var r = data.getRoot(setting);
+		r.radioCheckedList = [];
+	},
+	//default cache of excheck
+	_initCache = function(treeId) {},
+	//default bind event of excheck
+	_bindEvent = function(setting) {
+		var o = setting.treeObj,
+		c = consts.event;
+		o.bind(c.CHECK, function (event, srcEvent, treeId, node) {
+			tools.apply(setting.callback.onCheck, [!!srcEvent?srcEvent : event, treeId, node]);
+		});
+	},
+	_unbindEvent = function(setting) {
+		var o = setting.treeObj,
+		c = consts.event;
+		o.unbind(c.CHECK);
+	},
+	//default event proxy of excheck
+	_eventProxy = function(e) {
+		var target = e.target,
+		setting = data.getSetting(e.data.treeId),
+		tId = "", node = null,
+		nodeEventType = "", treeEventType = "",
+		nodeEventCallback = null, treeEventCallback = null;
+
+		if (tools.eqs(e.type, "mouseover")) {
+			if (setting.check.enable && tools.eqs(target.tagName, "span") && target.getAttribute("treeNode"+ consts.id.CHECK) !== null) {
+				tId = tools.getNodeMainDom(target).id;
+				nodeEventType = "mouseoverCheck";
+			}
+		} else if (tools.eqs(e.type, "mouseout")) {
+			if (setting.check.enable && tools.eqs(target.tagName, "span") && target.getAttribute("treeNode"+ consts.id.CHECK) !== null) {
+				tId = tools.getNodeMainDom(target).id;
+				nodeEventType = "mouseoutCheck";
+			}
+		} else if (tools.eqs(e.type, "click")) {
+			if (setting.check.enable && tools.eqs(target.tagName, "span") && target.getAttribute("treeNode"+ consts.id.CHECK) !== null) {
+				tId = tools.getNodeMainDom(target).id;
+				nodeEventType = "checkNode";
+			}
+		}
+		if (tId.length>0) {
+			node = data.getNodeCache(setting, tId);
+			switch (nodeEventType) {
+				case "checkNode" :
+					nodeEventCallback = _handler.onCheckNode;
+					break;
+				case "mouseoverCheck" :
+					nodeEventCallback = _handler.onMouseoverCheck;
+					break;
+				case "mouseoutCheck" :
+					nodeEventCallback = _handler.onMouseoutCheck;
+					break;
+			}
+		}
+		var proxyResult = {
+			stop: nodeEventType === "checkNode",
+			node: node,
+			nodeEventType: nodeEventType,
+			nodeEventCallback: nodeEventCallback,
+			treeEventType: treeEventType,
+			treeEventCallback: treeEventCallback
+		};
+		return proxyResult
+	},
+	//default init node of excheck
+	_initNode = function(setting, level, n, parentNode, isFirstNode, isLastNode, openFlag) {
+		if (!n) return;
+		var checkedKey = setting.data.key.checked;
+		if (typeof n[checkedKey] == "string") n[checkedKey] = tools.eqs(n[checkedKey], "true");
+		n[checkedKey] = !!n[checkedKey];
+		n.checkedOld = n[checkedKey];
+		if (typeof n.nocheck == "string") n.nocheck = tools.eqs(n.nocheck, "true");
+		n.nocheck = !!n.nocheck || (setting.check.nocheckInherit && parentNode && !!parentNode.nocheck);
+		if (typeof n.chkDisabled == "string") n.chkDisabled = tools.eqs(n.chkDisabled, "true");
+		n.chkDisabled = !!n.chkDisabled || (setting.check.chkDisabledInherit && parentNode && !!parentNode.chkDisabled);
+		if (typeof n.halfCheck == "string") n.halfCheck = tools.eqs(n.halfCheck, "true");
+		n.halfCheck = !!n.halfCheck;
+		n.check_Child_State = -1;
+		n.check_Focus = false;
+		n.getCheckStatus = function() {return data.getCheckStatus(setting, n);};
+
+		if (setting.check.chkStyle == consts.radio.STYLE && setting.check.radioType == consts.radio.TYPE_ALL && n[checkedKey] ) {
+			var r = data.getRoot(setting);
+			r.radioCheckedList.push(n);
+		}
+	},
+	//add dom for check
+	_beforeA = function(setting, node, html) {
+		var checkedKey = setting.data.key.checked;
+		if (setting.check.enable) {
+			data.makeChkFlag(setting, node);
+			html.push("<span ID='", node.tId, consts.id.CHECK, "' class='", view.makeChkClass(setting, node), "' treeNode", consts.id.CHECK, (node.nocheck === true?" style='display:none;'":""),"></span>");
+		}
+	},
+	//update zTreeObj, add method of check
+	_zTreeTools = function(setting, zTreeTools) {
+		zTreeTools.checkNode = function(node, checked, checkTypeFlag, callbackFlag) {
+			var checkedKey = setting.data.key.checked;
+			if (node.chkDisabled === true) return;
+			if (checked !== true && checked !== false) {
+				checked = !node[checkedKey];
+			}
+			callbackFlag = !!callbackFlag;
+
+			if (node[checkedKey] === checked && !checkTypeFlag) {
+				return;
+			} else if (callbackFlag && tools.apply(this.setting.callback.beforeCheck, [setting.treeId, node], true) == false) {
+				return;
+			}
+			if (tools.uCanDo(this.setting) && setting.check.enable && node.nocheck !== true) {
+				node[checkedKey] = checked;
+				var checkObj = $$(node, consts.id.CHECK, setting);
+				if (checkTypeFlag || setting.check.chkStyle === consts.radio.STYLE) view.checkNodeRelation(setting, node);
+				view.setChkClass(setting, checkObj, node);
+				view.repairParentChkClassWithSelf(setting, node);
+				if (callbackFlag) {
+					setting.treeObj.trigger(consts.event.CHECK, [null, setting.treeId, node]);
+				}
+			}
+		}
+
+		zTreeTools.checkAllNodes = function(checked) {
+			view.repairAllChk(setting, !!checked);
+		}
+
+		zTreeTools.getCheckedNodes = function(checked) {
+			var childKey = setting.data.key.children;
+			checked = (checked !== false);
+			return data.getTreeCheckedNodes(setting, data.getRoot(setting)[childKey], checked);
+		}
+
+		zTreeTools.getChangeCheckedNodes = function() {
+			var childKey = setting.data.key.children;
+			return data.getTreeChangeCheckedNodes(setting, data.getRoot(setting)[childKey]);
+		}
+
+		zTreeTools.setChkDisabled = function(node, disabled, inheritParent, inheritChildren) {
+			disabled = !!disabled;
+			inheritParent = !!inheritParent;
+			inheritChildren = !!inheritChildren;
+			view.repairSonChkDisabled(setting, node, disabled, inheritChildren);
+			view.repairParentChkDisabled(setting, node.getParentNode(), disabled, inheritParent);
+		}
+
+		var _updateNode = zTreeTools.updateNode;
+		zTreeTools.updateNode = function(node, checkTypeFlag) {
+			if (_updateNode) _updateNode.apply(zTreeTools, arguments);
+			if (!node || !setting.check.enable) return;
+			var nObj = $$(node, setting);
+			if (nObj.get(0) && tools.uCanDo(setting)) {
+				var checkObj = $$(node, consts.id.CHECK, setting);
+				if (checkTypeFlag == true || setting.check.chkStyle === consts.radio.STYLE) view.checkNodeRelation(setting, node);
+				view.setChkClass(setting, checkObj, node);
+				view.repairParentChkClassWithSelf(setting, node);
+			}
+		}
+	},
+	//method of operate data
+	_data = {
+		getRadioCheckedList: function(setting) {
+			var checkedList = data.getRoot(setting).radioCheckedList;
+			for (var i=0, j=checkedList.length; i<j; i++) {
+				if(!data.getNodeCache(setting, checkedList[i].tId)) {
+					checkedList.splice(i, 1);
+					i--; j--;
+				}
+			}
+			return checkedList;
+		},
+		getCheckStatus: function(setting, node) {
+			if (!setting.check.enable || node.nocheck || node.chkDisabled) return null;
+			var checkedKey = setting.data.key.checked,
+			r = {
+				checked: node[checkedKey],
+				half: node.halfCheck ? node.halfCheck : (setting.check.chkStyle == consts.radio.STYLE ? (node.check_Child_State === 2) : (node[checkedKey] ? (node.check_Child_State > -1 && node.check_Child_State < 2) : (node.check_Child_State > 0)))
+			};
+			return r;
+		},
+		getTreeCheckedNodes: function(setting, nodes, checked, results) {
+			if (!nodes) return [];
+			var childKey = setting.data.key.children,
+			checkedKey = setting.data.key.checked,
+			onlyOne = (checked && setting.check.chkStyle == consts.radio.STYLE && setting.check.radioType == consts.radio.TYPE_ALL);
+			results = !results ? [] : results;
+			for (var i = 0, l = nodes.length; i < l; i++) {
+				if (nodes[i].nocheck !== true && nodes[i].chkDisabled !== true && nodes[i][checkedKey] == checked) {
+					results.push(nodes[i]);
+					if(onlyOne) {
+						break;
+					}
+				}
+				data.getTreeCheckedNodes(setting, nodes[i][childKey], checked, results);
+				if(onlyOne && results.length > 0) {
+					break;
+				}
+			}
+			return results;
+		},
+		getTreeChangeCheckedNodes: function(setting, nodes, results) {
+			if (!nodes) return [];
+			var childKey = setting.data.key.children,
+			checkedKey = setting.data.key.checked;
+			results = !results ? [] : results;
+			for (var i = 0, l = nodes.length; i < l; i++) {
+				if (nodes[i].nocheck !== true && nodes[i].chkDisabled !== true && nodes[i][checkedKey] != nodes[i].checkedOld) {
+					results.push(nodes[i]);
+				}
+				data.getTreeChangeCheckedNodes(setting, nodes[i][childKey], results);
+			}
+			return results;
+		},
+		makeChkFlag: function(setting, node) {
+			if (!node) return;
+			var childKey = setting.data.key.children,
+			checkedKey = setting.data.key.checked,
+			chkFlag = -1;
+			if (node[childKey]) {
+				for (var i = 0, l = node[childKey].length; i < l; i++) {
+					var cNode = node[childKey][i];
+					var tmp = -1;
+					if (setting.check.chkStyle == consts.radio.STYLE) {
+						if (cNode.nocheck === true || cNode.chkDisabled === true) {
+							tmp = cNode.check_Child_State;
+						} else if (cNode.halfCheck === true) {
+							tmp = 2;
+						} else if (cNode[checkedKey]) {
+							tmp = 2;
+						} else {
+							tmp = cNode.check_Child_State > 0 ? 2:0;
+						}
+						if (tmp == 2) {
+							chkFlag = 2; break;
+						} else if (tmp == 0){
+							chkFlag = 0;
+						}
+					} else if (setting.check.chkStyle == consts.checkbox.STYLE) {
+						if (cNode.nocheck === true || cNode.chkDisabled === true) {
+							tmp = cNode.check_Child_State;
+						} else if (cNode.halfCheck === true) {
+							tmp = 1;
+						} else if (cNode[checkedKey] ) {
+							tmp = (cNode.check_Child_State === -1 || cNode.check_Child_State === 2) ? 2 : 1;
+						} else {
+							tmp = (cNode.check_Child_State > 0) ? 1 : 0;
+						}
+						if (tmp === 1) {
+							chkFlag = 1; break;
+						} else if (tmp === 2 && chkFlag > -1 && i > 0 && tmp !== chkFlag) {
+							chkFlag = 1; break;
+						} else if (chkFlag === 2 && tmp > -1 && tmp < 2) {
+							chkFlag = 1; break;
+						} else if (tmp > -1) {
+							chkFlag = tmp;
+						}
+					}
+				}
+			}
+			node.check_Child_State = chkFlag;
+		}
+	},
+	//method of event proxy
+	_event = {
+
+	},
+	//method of event handler
+	_handler = {
+		onCheckNode: function (event, node) {
+			if (node.chkDisabled === true) return false;
+			var setting = data.getSetting(event.data.treeId),
+			checkedKey = setting.data.key.checked;
+			if (tools.apply(setting.callback.beforeCheck, [setting.treeId, node], true) == false) return true;
+			node[checkedKey] = !node[checkedKey];
+			view.checkNodeRelation(setting, node);
+			var checkObj = $$(node, consts.id.CHECK, setting);
+			view.setChkClass(setting, checkObj, node);
+			view.repairParentChkClassWithSelf(setting, node);
+			setting.treeObj.trigger(consts.event.CHECK, [event, setting.treeId, node]);
+			return true;
+		},
+		onMouseoverCheck: function(event, node) {
+			if (node.chkDisabled === true) return false;
+			var setting = data.getSetting(event.data.treeId),
+			checkObj = $$(node, consts.id.CHECK, setting);
+			node.check_Focus = true;
+			view.setChkClass(setting, checkObj, node);
+			return true;
+		},
+		onMouseoutCheck: function(event, node) {
+			if (node.chkDisabled === true) return false;
+			var setting = data.getSetting(event.data.treeId),
+			checkObj = $$(node, consts.id.CHECK, setting);
+			node.check_Focus = false;
+			view.setChkClass(setting, checkObj, node);
+			return true;
+		}
+	},
+	//method of tools for zTree
+	_tools = {
+
+	},
+	//method of operate ztree dom
+	_view = {
+		checkNodeRelation: function(setting, node) {
+			var pNode, i, l,
+			childKey = setting.data.key.children,
+			checkedKey = setting.data.key.checked,
+			r = consts.radio;
+			if (setting.check.chkStyle == r.STYLE) {
+				var checkedList = data.getRadioCheckedList(setting);
+				if (node[checkedKey]) {
+					if (setting.check.radioType == r.TYPE_ALL) {
+						for (i = checkedList.length-1; i >= 0; i--) {
+							pNode = checkedList[i];
+							pNode[checkedKey] = false;
+							checkedList.splice(i, 1);
+
+							view.setChkClass(setting, $$(pNode, consts.id.CHECK, setting), pNode);
+							if (pNode.parentTId != node.parentTId) {
+								view.repairParentChkClassWithSelf(setting, pNode);
+							}
+						}
+						checkedList.push(node);
+					} else {
+						var parentNode = (node.parentTId) ? node.getParentNode() : data.getRoot(setting);
+						for (i = 0, l = parentNode[childKey].length; i < l; i++) {
+							pNode = parentNode[childKey][i];
+							if (pNode[checkedKey] && pNode != node) {
+								pNode[checkedKey] = false;
+								view.setChkClass(setting, $$(pNode, consts.id.CHECK, setting), pNode);
+							}
+						}
+					}
+				} else if (setting.check.radioType == r.TYPE_ALL) {
+					for (i = 0, l = checkedList.length; i < l; i++) {
+						if (node == checkedList[i]) {
+							checkedList.splice(i, 1);
+							break;
+						}
+					}
+				}
+
+			} else {
+				if (node[checkedKey] && (!node[childKey] || node[childKey].length==0 || setting.check.chkboxType.Y.indexOf("s") > -1)) {
+					view.setSonNodeCheckBox(setting, node, true);
+				}
+				if (!node[checkedKey] && (!node[childKey] || node[childKey].length==0 || setting.check.chkboxType.N.indexOf("s") > -1)) {
+					view.setSonNodeCheckBox(setting, node, false);
+				}
+				if (node[checkedKey] && setting.check.chkboxType.Y.indexOf("p") > -1) {
+					view.setParentNodeCheckBox(setting, node, true);
+				}
+				if (!node[checkedKey] && setting.check.chkboxType.N.indexOf("p") > -1) {
+					view.setParentNodeCheckBox(setting, node, false);
+				}
+			}
+		},
+		makeChkClass: function(setting, node) {
+			var checkedKey = setting.data.key.checked,
+			c = consts.checkbox, r = consts.radio,
+			fullStyle = "";
+			if (node.chkDisabled === true) {
+				fullStyle = c.DISABLED;
+			} else if (node.halfCheck) {
+				fullStyle = c.PART;
+			} else if (setting.check.chkStyle == r.STYLE) {
+				fullStyle = (node.check_Child_State < 1)? c.FULL:c.PART;
+			} else {
+				fullStyle = node[checkedKey] ? ((node.check_Child_State === 2 || node.check_Child_State === -1) ? c.FULL:c.PART) : ((node.check_Child_State < 1)? c.FULL:c.PART);
+			}
+			var chkName = setting.check.chkStyle + "_" + (node[checkedKey] ? c.TRUE : c.FALSE) + "_" + fullStyle;
+			chkName = (node.check_Focus && node.chkDisabled !== true) ? chkName + "_" + c.FOCUS : chkName;
+			return consts.className.BUTTON + " " + c.DEFAULT + " " + chkName;
+		},
+		repairAllChk: function(setting, checked) {
+			if (setting.check.enable && setting.check.chkStyle === consts.checkbox.STYLE) {
+				var checkedKey = setting.data.key.checked,
+				childKey = setting.data.key.children,
+				root = data.getRoot(setting);
+				for (var i = 0, l = root[childKey].length; i<l ; i++) {
+					var node = root[childKey][i];
+					if (node.nocheck !== true && node.chkDisabled !== true) {
+						node[checkedKey] = checked;
+					}
+					view.setSonNodeCheckBox(setting, node, checked);
+				}
+			}
+		},
+		repairChkClass: function(setting, node) {
+			if (!node) return;
+			data.makeChkFlag(setting, node);
+			if (node.nocheck !== true) {
+				var checkObj = $$(node, consts.id.CHECK, setting);
+				view.setChkClass(setting, checkObj, node);
+			}
+		},
+		repairParentChkClass: function(setting, node) {
+			if (!node || !node.parentTId) return;
+			var pNode = node.getParentNode();
+			view.repairChkClass(setting, pNode);
+			view.repairParentChkClass(setting, pNode);
+		},
+		repairParentChkClassWithSelf: function(setting, node) {
+			if (!node) return;
+			var childKey = setting.data.key.children;
+			if (node[childKey] && node[childKey].length > 0) {
+				view.repairParentChkClass(setting, node[childKey][0]);
+			} else {
+				view.repairParentChkClass(setting, node);
+			}
+		},
+		repairSonChkDisabled: function(setting, node, chkDisabled, inherit) {
+			if (!node) return;
+			var childKey = setting.data.key.children;
+			if (node.chkDisabled != chkDisabled) {
+				node.chkDisabled = chkDisabled;
+			}
+			view.repairChkClass(setting, node);
+			if (node[childKey] && inherit) {
+				for (var i = 0, l = node[childKey].length; i < l; i++) {
+					var sNode = node[childKey][i];
+					view.repairSonChkDisabled(setting, sNode, chkDisabled, inherit);
+				}
+			}
+		},
+		repairParentChkDisabled: function(setting, node, chkDisabled, inherit) {
+			if (!node) return;
+			if (node.chkDisabled != chkDisabled && inherit) {
+				node.chkDisabled = chkDisabled;
+			}
+			view.repairChkClass(setting, node);
+			view.repairParentChkDisabled(setting, node.getParentNode(), chkDisabled, inherit);
+		},
+		setChkClass: function(setting, obj, node) {
+			if (!obj) return;
+			if (node.nocheck === true) {
+				obj.hide();
+			} else {
+				obj.show();
+			}
+			obj.removeClass();
+			obj.addClass(view.makeChkClass(setting, node));
+		},
+		setParentNodeCheckBox: function(setting, node, value, srcNode) {
+			var childKey = setting.data.key.children,
+			checkedKey = setting.data.key.checked,
+			checkObj = $$(node, consts.id.CHECK, setting);
+			if (!srcNode) srcNode = node;
+			data.makeChkFlag(setting, node);
+			if (node.nocheck !== true && node.chkDisabled !== true) {
+				node[checkedKey] = value;
+				view.setChkClass(setting, checkObj, node);
+				if (setting.check.autoCheckTrigger && node != srcNode) {
+					setting.treeObj.trigger(consts.event.CHECK, [null, setting.treeId, node]);
+				}
+			}
+			if (node.parentTId) {
+				var pSign = true;
+				if (!value) {
+					var pNodes = node.getParentNode()[childKey];
+					for (var i = 0, l = pNodes.length; i < l; i++) {
+						if ((pNodes[i].nocheck !== true && pNodes[i].chkDisabled !== true && pNodes[i][checkedKey])
+						|| ((pNodes[i].nocheck === true || pNodes[i].chkDisabled === true) && pNodes[i].check_Child_State > 0)) {
+							pSign = false;
+							break;
+						}
+					}
+				}
+				if (pSign) {
+					view.setParentNodeCheckBox(setting, node.getParentNode(), value, srcNode);
+				}
+			}
+		},
+		setSonNodeCheckBox: function(setting, node, value, srcNode) {
+			if (!node) return;
+			var childKey = setting.data.key.children,
+			checkedKey = setting.data.key.checked,
+			checkObj = $$(node, consts.id.CHECK, setting);
+			if (!srcNode) srcNode = node;
+
+			var hasDisable = false;
+			if (node[childKey]) {
+				for (var i = 0, l = node[childKey].length; i < l && node.chkDisabled !== true; i++) {
+					var sNode = node[childKey][i];
+					view.setSonNodeCheckBox(setting, sNode, value, srcNode);
+					if (sNode.chkDisabled === true) hasDisable = true;
+				}
+			}
+
+			if (node != data.getRoot(setting) && node.chkDisabled !== true) {
+				if (hasDisable && node.nocheck !== true) {
+					data.makeChkFlag(setting, node);
+				}
+				if (node.nocheck !== true && node.chkDisabled !== true) {
+					node[checkedKey] = value;
+					if (!hasDisable) node.check_Child_State = (node[childKey] && node[childKey].length > 0) ? (value ? 2 : 0) : -1;
+				} else {
+					node.check_Child_State = -1;
+				}
+				view.setChkClass(setting, checkObj, node);
+				if (setting.check.autoCheckTrigger && node != srcNode && node.nocheck !== true && node.chkDisabled !== true) {
+					setting.treeObj.trigger(consts.event.CHECK, [null, setting.treeId, node]);
+				}
+			}
+
+		}
+	},
+
+	_z = {
+		tools: _tools,
+		view: _view,
+		event: _event,
+		data: _data
+	};
+	$.extend(true, $.fn.zTree.consts, _consts);
+	$.extend(true, $.fn.zTree._z, _z);
+
+	var zt = $.fn.zTree,
+	tools = zt._z.tools,
+	consts = zt.consts,
+	view = zt._z.view,
+	data = zt._z.data,
+	event = zt._z.event,
+	$$ = tools.$;
+
+	data.exSetting(_setting);
+	data.addInitBind(_bindEvent);
+	data.addInitUnBind(_unbindEvent);
+	data.addInitCache(_initCache);
+	data.addInitNode(_initNode);
+	data.addInitProxy(_eventProxy, true);
+	data.addInitRoot(_initRoot);
+	data.addBeforeA(_beforeA);
+	data.addZTreeTools(_zTreeTools);
+
+	var _createNodes = view.createNodes;
+	view.createNodes = function(setting, level, nodes, parentNode) {
+		if (_createNodes) _createNodes.apply(view, arguments);
+		if (!nodes) return;
+		view.repairParentChkClassWithSelf(setting, parentNode);
+	}
+	var _removeNode = view.removeNode;
+	view.removeNode = function(setting, node) {
+		var parentNode = node.getParentNode();
+		if (_removeNode) _removeNode.apply(view, arguments);
+		if (!node || !parentNode) return;
+		view.repairChkClass(setting, parentNode);
+		view.repairParentChkClass(setting, parentNode);
+	}
+
+	var _appendNodes = view.appendNodes;
+	view.appendNodes = function(setting, level, nodes, parentNode, initFlag, openFlag) {
+		var html = "";
+		if (_appendNodes) {
+			html = _appendNodes.apply(view, arguments);
+		}
+		if (parentNode) {
+			data.makeChkFlag(setting, parentNode);
+		}
+		return html;
+	}
+})(jQuery);
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/js/jquery.ztree.excheck-3.5.min.js b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/js/jquery.ztree.excheck-3.5.min.js
new file mode 100644
index 0000000..3845590
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/js/jquery.ztree.excheck-3.5.min.js
@@ -0,0 +1,33 @@
+/*
+ * JQuery zTree excheck v3.5.15
+ * http://zTree.me/
+ *
+ * Copyright (c) 2010 Hunter.z
+ *
+ * Licensed same as jquery - MIT License
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ * email: hunter.z@263.net
+ * Date: 2013-10-15
+ */
+(function(m){var p,q,r,o={event:{CHECK:"ztree_check"},id:{CHECK:"_check"},checkbox:{STYLE:"checkbox",DEFAULT:"chk",DISABLED:"disable",FALSE:"false",TRUE:"true",FULL:"full",PART:"part",FOCUS:"focus"},radio:{STYLE:"radio",TYPE_ALL:"all",TYPE_LEVEL:"level"}},v={check:{enable:!1,autoCheckTrigger:!1,chkStyle:o.checkbox.STYLE,nocheckInherit:!1,chkDisabledInherit:!1,radioType:o.radio.TYPE_LEVEL,chkboxType:{Y:"ps",N:"ps"}},data:{key:{checked:"checked"}},callback:{beforeCheck:null,onCheck:null}};p=function(b,
+a){if(a.chkDisabled===!0)return!1;var c=f.getSetting(b.data.treeId),d=c.data.key.checked;if(k.apply(c.callback.beforeCheck,[c.treeId,a],!0)==!1)return!0;a[d]=!a[d];e.checkNodeRelation(c,a);d=n(a,j.id.CHECK,c);e.setChkClass(c,d,a);e.repairParentChkClassWithSelf(c,a);c.treeObj.trigger(j.event.CHECK,[b,c.treeId,a]);return!0};q=function(b,a){if(a.chkDisabled===!0)return!1;var c=f.getSetting(b.data.treeId),d=n(a,j.id.CHECK,c);a.check_Focus=!0;e.setChkClass(c,d,a);return!0};r=function(b,a){if(a.chkDisabled===
+!0)return!1;var c=f.getSetting(b.data.treeId),d=n(a,j.id.CHECK,c);a.check_Focus=!1;e.setChkClass(c,d,a);return!0};m.extend(!0,m.fn.zTree.consts,o);m.extend(!0,m.fn.zTree._z,{tools:{},view:{checkNodeRelation:function(b,a){var c,d,h,i=b.data.key.children,l=b.data.key.checked;c=j.radio;if(b.check.chkStyle==c.STYLE){var g=f.getRadioCheckedList(b);if(a[l])if(b.check.radioType==c.TYPE_ALL){for(d=g.length-1;d>=0;d--)c=g[d],c[l]=!1,g.splice(d,1),e.setChkClass(b,n(c,j.id.CHECK,b),c),c.parentTId!=a.parentTId&&
+e.repairParentChkClassWithSelf(b,c);g.push(a)}else{g=a.parentTId?a.getParentNode():f.getRoot(b);for(d=0,h=g[i].length;d<h;d++)c=g[i][d],c[l]&&c!=a&&(c[l]=!1,e.setChkClass(b,n(c,j.id.CHECK,b),c))}else if(b.check.radioType==c.TYPE_ALL)for(d=0,h=g.length;d<h;d++)if(a==g[d]){g.splice(d,1);break}}else a[l]&&(!a[i]||a[i].length==0||b.check.chkboxType.Y.indexOf("s")>-1)&&e.setSonNodeCheckBox(b,a,!0),!a[l]&&(!a[i]||a[i].length==0||b.check.chkboxType.N.indexOf("s")>-1)&&e.setSonNodeCheckBox(b,a,!1),a[l]&&
+b.check.chkboxType.Y.indexOf("p")>-1&&e.setParentNodeCheckBox(b,a,!0),!a[l]&&b.check.chkboxType.N.indexOf("p")>-1&&e.setParentNodeCheckBox(b,a,!1)},makeChkClass:function(b,a){var c=b.data.key.checked,d=j.checkbox,h=j.radio,i="",i=a.chkDisabled===!0?d.DISABLED:a.halfCheck?d.PART:b.check.chkStyle==h.STYLE?a.check_Child_State<1?d.FULL:d.PART:a[c]?a.check_Child_State===2||a.check_Child_State===-1?d.FULL:d.PART:a.check_Child_State<1?d.FULL:d.PART,c=b.check.chkStyle+"_"+(a[c]?d.TRUE:d.FALSE)+"_"+i,c=a.check_Focus&&
+a.chkDisabled!==!0?c+"_"+d.FOCUS:c;return j.className.BUTTON+" "+d.DEFAULT+" "+c},repairAllChk:function(b,a){if(b.check.enable&&b.check.chkStyle===j.checkbox.STYLE)for(var c=b.data.key.checked,d=b.data.key.children,h=f.getRoot(b),i=0,l=h[d].length;i<l;i++){var g=h[d][i];g.nocheck!==!0&&g.chkDisabled!==!0&&(g[c]=a);e.setSonNodeCheckBox(b,g,a)}},repairChkClass:function(b,a){if(a&&(f.makeChkFlag(b,a),a.nocheck!==!0)){var c=n(a,j.id.CHECK,b);e.setChkClass(b,c,a)}},repairParentChkClass:function(b,a){if(a&&
+a.parentTId){var c=a.getParentNode();e.repairChkClass(b,c);e.repairParentChkClass(b,c)}},repairParentChkClassWithSelf:function(b,a){if(a){var c=b.data.key.children;a[c]&&a[c].length>0?e.repairParentChkClass(b,a[c][0]):e.repairParentChkClass(b,a)}},repairSonChkDisabled:function(b,a,c,d){if(a){var h=b.data.key.children;if(a.chkDisabled!=c)a.chkDisabled=c;e.repairChkClass(b,a);if(a[h]&&d)for(var i=0,l=a[h].length;i<l;i++)e.repairSonChkDisabled(b,a[h][i],c,d)}},repairParentChkDisabled:function(b,a,c,
+d){if(a){if(a.chkDisabled!=c&&d)a.chkDisabled=c;e.repairChkClass(b,a);e.repairParentChkDisabled(b,a.getParentNode(),c,d)}},setChkClass:function(b,a,c){a&&(c.nocheck===!0?a.hide():a.show(),a.removeClass(),a.addClass(e.makeChkClass(b,c)))},setParentNodeCheckBox:function(b,a,c,d){var h=b.data.key.children,i=b.data.key.checked,l=n(a,j.id.CHECK,b);d||(d=a);f.makeChkFlag(b,a);a.nocheck!==!0&&a.chkDisabled!==!0&&(a[i]=c,e.setChkClass(b,l,a),b.check.autoCheckTrigger&&a!=d&&b.treeObj.trigger(j.event.CHECK,
+[null,b.treeId,a]));if(a.parentTId){l=!0;if(!c)for(var h=a.getParentNode()[h],g=0,k=h.length;g<k;g++)if(h[g].nocheck!==!0&&h[g].chkDisabled!==!0&&h[g][i]||(h[g].nocheck===!0||h[g].chkDisabled===!0)&&h[g].check_Child_State>0){l=!1;break}l&&e.setParentNodeCheckBox(b,a.getParentNode(),c,d)}},setSonNodeCheckBox:function(b,a,c,d){if(a){var h=b.data.key.children,i=b.data.key.checked,l=n(a,j.id.CHECK,b);d||(d=a);var g=!1;if(a[h])for(var k=0,m=a[h].length;k<m&&a.chkDisabled!==!0;k++){var o=a[h][k];e.setSonNodeCheckBox(b,
+o,c,d);o.chkDisabled===!0&&(g=!0)}if(a!=f.getRoot(b)&&a.chkDisabled!==!0){g&&a.nocheck!==!0&&f.makeChkFlag(b,a);if(a.nocheck!==!0&&a.chkDisabled!==!0){if(a[i]=c,!g)a.check_Child_State=a[h]&&a[h].length>0?c?2:0:-1}else a.check_Child_State=-1;e.setChkClass(b,l,a);b.check.autoCheckTrigger&&a!=d&&a.nocheck!==!0&&a.chkDisabled!==!0&&b.treeObj.trigger(j.event.CHECK,[null,b.treeId,a])}}}},event:{},data:{getRadioCheckedList:function(b){for(var a=f.getRoot(b).radioCheckedList,c=0,d=a.length;c<d;c++)f.getNodeCache(b,
+a[c].tId)||(a.splice(c,1),c--,d--);return a},getCheckStatus:function(b,a){if(!b.check.enable||a.nocheck||a.chkDisabled)return null;var c=b.data.key.checked;return{checked:a[c],half:a.halfCheck?a.halfCheck:b.check.chkStyle==j.radio.STYLE?a.check_Child_State===2:a[c]?a.check_Child_State>-1&&a.check_Child_State<2:a.check_Child_State>0}},getTreeCheckedNodes:function(b,a,c,d){if(!a)return[];for(var h=b.data.key.children,i=b.data.key.checked,e=c&&b.check.chkStyle==j.radio.STYLE&&b.check.radioType==j.radio.TYPE_ALL,
+d=!d?[]:d,g=0,k=a.length;g<k;g++){if(a[g].nocheck!==!0&&a[g].chkDisabled!==!0&&a[g][i]==c&&(d.push(a[g]),e))break;f.getTreeCheckedNodes(b,a[g][h],c,d);if(e&&d.length>0)break}return d},getTreeChangeCheckedNodes:function(b,a,c){if(!a)return[];for(var d=b.data.key.children,h=b.data.key.checked,c=!c?[]:c,i=0,e=a.length;i<e;i++)a[i].nocheck!==!0&&a[i].chkDisabled!==!0&&a[i][h]!=a[i].checkedOld&&c.push(a[i]),f.getTreeChangeCheckedNodes(b,a[i][d],c);return c},makeChkFlag:function(b,a){if(a){var c=b.data.key.children,
+d=b.data.key.checked,h=-1;if(a[c])for(var i=0,e=a[c].length;i<e;i++){var g=a[c][i],f=-1;if(b.check.chkStyle==j.radio.STYLE)if(f=g.nocheck===!0||g.chkDisabled===!0?g.check_Child_State:g.halfCheck===!0?2:g[d]?2:g.check_Child_State>0?2:0,f==2){h=2;break}else f==0&&(h=0);else if(b.check.chkStyle==j.checkbox.STYLE)if(f=g.nocheck===!0||g.chkDisabled===!0?g.check_Child_State:g.halfCheck===!0?1:g[d]?g.check_Child_State===-1||g.check_Child_State===2?2:1:g.check_Child_State>0?1:0,f===1){h=1;break}else if(f===
+2&&h>-1&&i>0&&f!==h){h=1;break}else if(h===2&&f>-1&&f<2){h=1;break}else f>-1&&(h=f)}a.check_Child_State=h}}}});var m=m.fn.zTree,k=m._z.tools,j=m.consts,e=m._z.view,f=m._z.data,n=k.$;f.exSetting(v);f.addInitBind(function(b){b.treeObj.bind(j.event.CHECK,function(a,c,d,h){k.apply(b.callback.onCheck,[c?c:a,d,h])})});f.addInitUnBind(function(b){b.treeObj.unbind(j.event.CHECK)});f.addInitCache(function(){});f.addInitNode(function(b,a,c,d){if(c){a=b.data.key.checked;typeof c[a]=="string"&&(c[a]=k.eqs(c[a],
+"true"));c[a]=!!c[a];c.checkedOld=c[a];if(typeof c.nocheck=="string")c.nocheck=k.eqs(c.nocheck,"true");c.nocheck=!!c.nocheck||b.check.nocheckInherit&&d&&!!d.nocheck;if(typeof c.chkDisabled=="string")c.chkDisabled=k.eqs(c.chkDisabled,"true");c.chkDisabled=!!c.chkDisabled||b.check.chkDisabledInherit&&d&&!!d.chkDisabled;if(typeof c.halfCheck=="string")c.halfCheck=k.eqs(c.halfCheck,"true");c.halfCheck=!!c.halfCheck;c.check_Child_State=-1;c.check_Focus=!1;c.getCheckStatus=function(){return f.getCheckStatus(b,
+c)};b.check.chkStyle==j.radio.STYLE&&b.check.radioType==j.radio.TYPE_ALL&&c[a]&&f.getRoot(b).radioCheckedList.push(c)}});f.addInitProxy(function(b){var a=b.target,c=f.getSetting(b.data.treeId),d="",h=null,e="",l=null;if(k.eqs(b.type,"mouseover")){if(c.check.enable&&k.eqs(a.tagName,"span")&&a.getAttribute("treeNode"+j.id.CHECK)!==null)d=k.getNodeMainDom(a).id,e="mouseoverCheck"}else if(k.eqs(b.type,"mouseout")){if(c.check.enable&&k.eqs(a.tagName,"span")&&a.getAttribute("treeNode"+j.id.CHECK)!==null)d=
+k.getNodeMainDom(a).id,e="mouseoutCheck"}else if(k.eqs(b.type,"click")&&c.check.enable&&k.eqs(a.tagName,"span")&&a.getAttribute("treeNode"+j.id.CHECK)!==null)d=k.getNodeMainDom(a).id,e="checkNode";if(d.length>0)switch(h=f.getNodeCache(c,d),e){case "checkNode":l=p;break;case "mouseoverCheck":l=q;break;case "mouseoutCheck":l=r}return{stop:e==="checkNode",node:h,nodeEventType:e,nodeEventCallback:l,treeEventType:"",treeEventCallback:null}},!0);f.addInitRoot(function(b){f.getRoot(b).radioCheckedList=[]});
+f.addBeforeA(function(b,a,c){b.check.enable&&(f.makeChkFlag(b,a),c.push("<span ID='",a.tId,j.id.CHECK,"' class='",e.makeChkClass(b,a),"' treeNode",j.id.CHECK,a.nocheck===!0?" style='display:none;'":"","></span>"))});f.addZTreeTools(function(b,a){a.checkNode=function(a,c,i,f){var g=b.data.key.checked;if(a.chkDisabled!==!0&&(c!==!0&&c!==!1&&(c=!a[g]),f=!!f,(a[g]!==c||i)&&!(f&&k.apply(this.setting.callback.beforeCheck,[b.treeId,a],!0)==!1)&&k.uCanDo(this.setting)&&b.check.enable&&a.nocheck!==!0))a[g]=
+c,c=n(a,j.id.CHECK,b),(i||b.check.chkStyle===j.radio.STYLE)&&e.checkNodeRelation(b,a),e.setChkClass(b,c,a),e.repairParentChkClassWithSelf(b,a),f&&b.treeObj.trigger(j.event.CHECK,[null,b.treeId,a])};a.checkAllNodes=function(a){e.repairAllChk(b,!!a)};a.getCheckedNodes=function(a){var c=b.data.key.children;return f.getTreeCheckedNodes(b,f.getRoot(b)[c],a!==!1)};a.getChangeCheckedNodes=function(){var a=b.data.key.children;return f.getTreeChangeCheckedNodes(b,f.getRoot(b)[a])};a.setChkDisabled=function(a,
+c,f,j){c=!!c;f=!!f;e.repairSonChkDisabled(b,a,c,!!j);e.repairParentChkDisabled(b,a.getParentNode(),c,f)};var c=a.updateNode;a.updateNode=function(d,f){c&&c.apply(a,arguments);if(d&&b.check.enable&&n(d,b).get(0)&&k.uCanDo(b)){var i=n(d,j.id.CHECK,b);(f==!0||b.check.chkStyle===j.radio.STYLE)&&e.checkNodeRelation(b,d);e.setChkClass(b,i,d);e.repairParentChkClassWithSelf(b,d)}}});var s=e.createNodes;e.createNodes=function(b,a,c,d){s&&s.apply(e,arguments);c&&e.repairParentChkClassWithSelf(b,d)};var t=e.removeNode;
+e.removeNode=function(b,a){var c=a.getParentNode();t&&t.apply(e,arguments);a&&c&&(e.repairChkClass(b,c),e.repairParentChkClass(b,c))};var u=e.appendNodes;e.appendNodes=function(b,a,c,d,h,i){var j="";u&&(j=u.apply(e,arguments));d&&f.makeChkFlag(b,d);return j}})(jQuery);
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/js/jquery.ztree.exedit-3.5.js b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/js/jquery.ztree.exedit-3.5.js
new file mode 100644
index 0000000..485b3a3
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/js/jquery.ztree.exedit-3.5.js
@@ -0,0 +1,1183 @@
+/*
+ * JQuery zTree exedit v3.5.15
+ * http://zTree.me/
+ *
+ * Copyright (c) 2010 Hunter.z
+ *
+ * Licensed same as jquery - MIT License
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ * email: hunter.z@263.net
+ * Date: 2013-10-15
+ */
+(function($){
+	//default consts of exedit
+	var _consts = {
+		event: {
+			DRAG: "ztree_drag",
+			DROP: "ztree_drop",
+			REMOVE: "ztree_remove",
+			RENAME: "ztree_rename"
+		},
+		id: {
+			EDIT: "_edit",
+			INPUT: "_input",
+			REMOVE: "_remove"
+		},
+		move: {
+			TYPE_INNER: "inner",
+			TYPE_PREV: "prev",
+			TYPE_NEXT: "next"
+		},
+		node: {
+			CURSELECTED_EDIT: "curSelectedNode_Edit",
+			TMPTARGET_TREE: "tmpTargetzTree",
+			TMPTARGET_NODE: "tmpTargetNode"
+		}
+	},
+	//default setting of exedit
+	_setting = {
+		edit: {
+			enable: false,
+			editNameSelectAll: false,
+			showRemoveBtn: true,
+			showRenameBtn: true,
+			removeTitle: "remove",
+			renameTitle: "rename",
+			drag: {
+				autoExpandTrigger: false,
+				isCopy: true,
+				isMove: true,
+				prev: true,
+				next: true,
+				inner: true,
+				minMoveSize: 5,
+				borderMax: 10,
+				borderMin: -5,
+				maxShowNodeNum: 5,
+				autoOpenTime: 500
+			}
+		},
+		view: {
+			addHoverDom: null,
+			removeHoverDom: null
+		},
+		callback: {
+			beforeDrag:null,
+			beforeDragOpen:null,
+			beforeDrop:null,
+			beforeEditName:null,
+			beforeRename:null,
+			onDrag:null,
+			onDrop:null,
+			onRename:null
+		}
+	},
+	//default root of exedit
+	_initRoot = function (setting) {
+		var r = data.getRoot(setting), rs = data.getRoots();
+		r.curEditNode = null;
+		r.curEditInput = null;
+		r.curHoverNode = null;
+		r.dragFlag = 0;
+		r.dragNodeShowBefore = [];
+		r.dragMaskList = new Array();
+		rs.showHoverDom = true;
+	},
+	//default cache of exedit
+	_initCache = function(treeId) {},
+	//default bind event of exedit
+	_bindEvent = function(setting) {
+		var o = setting.treeObj;
+		var c = consts.event;
+		o.bind(c.RENAME, function (event, treeId, treeNode, isCancel) {
+			tools.apply(setting.callback.onRename, [event, treeId, treeNode, isCancel]);
+		});
+
+		o.bind(c.REMOVE, function (event, treeId, treeNode) {
+			tools.apply(setting.callback.onRemove, [event, treeId, treeNode]);
+		});
+
+		o.bind(c.DRAG, function (event, srcEvent, treeId, treeNodes) {
+			tools.apply(setting.callback.onDrag, [srcEvent, treeId, treeNodes]);
+		});
+
+		o.bind(c.DROP, function (event, srcEvent, treeId, treeNodes, targetNode, moveType, isCopy) {
+			tools.apply(setting.callback.onDrop, [srcEvent, treeId, treeNodes, targetNode, moveType, isCopy]);
+		});
+	},
+	_unbindEvent = function(setting) {
+		var o = setting.treeObj;
+		var c = consts.event;
+		o.unbind(c.RENAME);
+		o.unbind(c.REMOVE);
+		o.unbind(c.DRAG);
+		o.unbind(c.DROP);
+	},
+	//default event proxy of exedit
+	_eventProxy = function(e) {
+		var target = e.target,
+		setting = data.getSetting(e.data.treeId),
+		relatedTarget = e.relatedTarget,
+		tId = "", node = null,
+		nodeEventType = "", treeEventType = "",
+		nodeEventCallback = null, treeEventCallback = null,
+		tmp = null;
+
+		if (tools.eqs(e.type, "mouseover")) {
+			tmp = tools.getMDom(setting, target, [{tagName:"a", attrName:"treeNode"+consts.id.A}]);
+			if (tmp) {
+				tId = tools.getNodeMainDom(tmp).id;
+				nodeEventType = "hoverOverNode";
+			}
+		} else if (tools.eqs(e.type, "mouseout")) {
+			tmp = tools.getMDom(setting, relatedTarget, [{tagName:"a", attrName:"treeNode"+consts.id.A}]);
+			if (!tmp) {
+				tId = "remove";
+				nodeEventType = "hoverOutNode";
+			}
+		} else if (tools.eqs(e.type, "mousedown")) {
+			tmp = tools.getMDom(setting, target, [{tagName:"a", attrName:"treeNode"+consts.id.A}]);
+			if (tmp) {
+				tId = tools.getNodeMainDom(tmp).id;
+				nodeEventType = "mousedownNode";
+			}
+		}
+		if (tId.length>0) {
+			node = data.getNodeCache(setting, tId);
+			switch (nodeEventType) {
+				case "mousedownNode" :
+					nodeEventCallback = _handler.onMousedownNode;
+					break;
+				case "hoverOverNode" :
+					nodeEventCallback = _handler.onHoverOverNode;
+					break;
+				case "hoverOutNode" :
+					nodeEventCallback = _handler.onHoverOutNode;
+					break;
+			}
+		}
+		var proxyResult = {
+			stop: false,
+			node: node,
+			nodeEventType: nodeEventType,
+			nodeEventCallback: nodeEventCallback,
+			treeEventType: treeEventType,
+			treeEventCallback: treeEventCallback
+		};
+		return proxyResult
+	},
+	//default init node of exedit
+	_initNode = function(setting, level, n, parentNode, isFirstNode, isLastNode, openFlag) {
+		if (!n) return;
+		n.isHover = false;
+		n.editNameFlag = false;
+	},
+	//update zTreeObj, add method of edit
+	_zTreeTools = function(setting, zTreeTools) {
+		zTreeTools.cancelEditName = function(newName) {
+			var root = data.getRoot(setting);
+			if (!root.curEditNode) return;
+			view.cancelCurEditNode(setting, newName?newName:null, true);
+		}
+		zTreeTools.copyNode = function(targetNode, node, moveType, isSilent) {
+			if (!node) return null;
+			if (targetNode && !targetNode.isParent && setting.data.keep.leaf && moveType === consts.move.TYPE_INNER) return null;
+			var newNode = tools.clone(node);
+			if (!targetNode) {
+				targetNode = null;
+				moveType = consts.move.TYPE_INNER;
+			}
+			if (moveType == consts.move.TYPE_INNER) {
+				function copyCallback() {
+					view.addNodes(setting, targetNode, [newNode], isSilent);
+				}
+
+				if (tools.canAsync(setting, targetNode)) {
+					view.asyncNode(setting, targetNode, isSilent, copyCallback);
+				} else {
+					copyCallback();
+				}
+			} else {
+				view.addNodes(setting, targetNode.parentNode, [newNode], isSilent);
+				view.moveNode(setting, targetNode, newNode, moveType, false, isSilent);
+			}
+			return newNode;
+		}
+		zTreeTools.editName = function(node) {
+			if (!node || !node.tId || node !== data.getNodeCache(setting, node.tId)) return;
+			if (node.parentTId) view.expandCollapseParentNode(setting, node.getParentNode(), true);
+			view.editNode(setting, node)
+		}
+		zTreeTools.moveNode = function(targetNode, node, moveType, isSilent) {
+			if (!node) return node;
+			if (targetNode && !targetNode.isParent && setting.data.keep.leaf && moveType === consts.move.TYPE_INNER) {
+				return null;
+			} else if (targetNode && ((node.parentTId == targetNode.tId && moveType == consts.move.TYPE_INNER) || $$(node, setting).find("#" + targetNode.tId).length > 0)) {
+				return null;
+			} else if (!targetNode) {
+				targetNode = null;
+			}
+			function moveCallback() {
+				view.moveNode(setting, targetNode, node, moveType, false, isSilent);
+			}
+			if (tools.canAsync(setting, targetNode) && moveType === consts.move.TYPE_INNER) {
+				view.asyncNode(setting, targetNode, isSilent, moveCallback);
+			} else {
+				moveCallback();
+			}
+			return node;
+		}
+		zTreeTools.setEditable = function(editable) {
+			setting.edit.enable = editable;
+			return this.refresh();
+		}
+	},
+	//method of operate data
+	_data = {
+		setSonNodeLevel: function(setting, parentNode, node) {
+			if (!node) return;
+			var childKey = setting.data.key.children;
+			node.level = (parentNode)? parentNode.level + 1 : 0;
+			if (!node[childKey]) return;
+			for (var i = 0, l = node[childKey].length; i < l; i++) {
+				if (node[childKey][i]) data.setSonNodeLevel(setting, node, node[childKey][i]);
+			}
+		}
+	},
+	//method of event proxy
+	_event = {
+
+	},
+	//method of event handler
+	_handler = {
+		onHoverOverNode: function(event, node) {
+			var setting = data.getSetting(event.data.treeId),
+			root = data.getRoot(setting);
+			if (root.curHoverNode != node) {
+				_handler.onHoverOutNode(event);
+			}
+			root.curHoverNode = node;
+			view.addHoverDom(setting, node);
+		},
+		onHoverOutNode: function(event, node) {
+			var setting = data.getSetting(event.data.treeId),
+			root = data.getRoot(setting);
+			if (root.curHoverNode && !data.isSelectedNode(setting, root.curHoverNode)) {
+				view.removeTreeDom(setting, root.curHoverNode);
+				root.curHoverNode = null;
+			}
+		},
+		onMousedownNode: function(eventMouseDown, _node) {
+			var i,l,
+			setting = data.getSetting(eventMouseDown.data.treeId),
+			root = data.getRoot(setting), roots = data.getRoots();
+			//right click can't drag & drop
+			if (eventMouseDown.button == 2 || !setting.edit.enable || (!setting.edit.drag.isCopy && !setting.edit.drag.isMove)) return true;
+
+			//input of edit node name can't drag & drop
+			var target = eventMouseDown.target,
+			_nodes = data.getRoot(setting).curSelectedList,
+			nodes = [];
+			if (!data.isSelectedNode(setting, _node)) {
+				nodes = [_node];
+			} else {
+				for (i=0, l=_nodes.length; i<l; i++) {
+					if (_nodes[i].editNameFlag && tools.eqs(target.tagName, "input") && target.getAttribute("treeNode"+consts.id.INPUT) !== null) {
+						return true;
+					}
+					nodes.push(_nodes[i]);
+					if (nodes[0].parentTId !== _nodes[i].parentTId) {
+						nodes = [_node];
+						break;
+					}
+				}
+			}
+
+			view.editNodeBlur = true;
+			view.cancelCurEditNode(setting);
+
+			var doc = $(setting.treeObj.get(0).ownerDocument),
+			body = $(setting.treeObj.get(0).ownerDocument.body), curNode, tmpArrow, tmpTarget,
+			isOtherTree = false,
+			targetSetting = setting,
+			sourceSetting = setting,
+			preNode, nextNode,
+			preTmpTargetNodeId = null,
+			preTmpMoveType = null,
+			tmpTargetNodeId = null,
+			moveType = consts.move.TYPE_INNER,
+			mouseDownX = eventMouseDown.clientX,
+			mouseDownY = eventMouseDown.clientY,
+			startTime = (new Date()).getTime();
+
+			if (tools.uCanDo(setting)) {
+				doc.bind("mousemove", _docMouseMove);
+			}
+			function _docMouseMove(event) {
+				//avoid start drag after click node
+				if (root.dragFlag == 0 && Math.abs(mouseDownX - event.clientX) < setting.edit.drag.minMoveSize
+					&& Math.abs(mouseDownY - event.clientY) < setting.edit.drag.minMoveSize) {
+					return true;
+				}
+				var i, l, tmpNode, tmpDom, tmpNodes,
+				childKey = setting.data.key.children;
+				body.css("cursor", "pointer");
+
+				if (root.dragFlag == 0) {
+					if (tools.apply(setting.callback.beforeDrag, [setting.treeId, nodes], true) == false) {
+						_docMouseUp(event);
+						return true;
+					}
+
+					for (i=0, l=nodes.length; i<l; i++) {
+						if (i==0) {
+							root.dragNodeShowBefore = [];
+						}
+						tmpNode = nodes[i];
+						if (tmpNode.isParent && tmpNode.open) {
+							view.expandCollapseNode(setting, tmpNode, !tmpNode.open);
+							root.dragNodeShowBefore[tmpNode.tId] = true;
+						} else {
+							root.dragNodeShowBefore[tmpNode.tId] = false;
+						}
+					}
+
+					root.dragFlag = 1;
+					roots.showHoverDom = false;
+					tools.showIfameMask(setting, true);
+
+					//sort
+					var isOrder = true, lastIndex = -1;
+					if (nodes.length>1) {
+						var pNodes = nodes[0].parentTId ? nodes[0].getParentNode()[childKey] : data.getNodes(setting);
+						tmpNodes = [];
+						for (i=0, l=pNodes.length; i<l; i++) {
+							if (root.dragNodeShowBefore[pNodes[i].tId] !== undefined) {
+								if (isOrder && lastIndex > -1 && (lastIndex+1) !== i) {
+									isOrder = false;
+								}
+								tmpNodes.push(pNodes[i]);
+								lastIndex = i;
+							}
+							if (nodes.length === tmpNodes.length) {
+								nodes = tmpNodes;
+								break;
+							}
+						}
+					}
+					if (isOrder) {
+						preNode = nodes[0].getPreNode();
+						nextNode = nodes[nodes.length-1].getNextNode();
+					}
+
+					//set node in selected
+					curNode = $$("<ul class='zTreeDragUL'></ul>", setting);
+					for (i=0, l=nodes.length; i<l; i++) {
+						tmpNode = nodes[i];
+						tmpNode.editNameFlag = false;
+						view.selectNode(setting, tmpNode, i>0);
+						view.removeTreeDom(setting, tmpNode);
+
+						tmpDom = $$("<li id='"+ tmpNode.tId +"_tmp'></li>", setting);
+						tmpDom.append($$(tmpNode, consts.id.A, setting).clone());
+						tmpDom.css("padding", "0");
+						tmpDom.children("#" + tmpNode.tId + consts.id.A).removeClass(consts.node.CURSELECTED);
+						curNode.append(tmpDom);
+						if (i == setting.edit.drag.maxShowNodeNum-1) {
+							tmpDom = $$("<li id='"+ tmpNode.tId +"_moretmp'><a>  ...  </a></li>", setting);
+							curNode.append(tmpDom);
+							break;
+						}
+					}
+					curNode.attr("id", nodes[0].tId + consts.id.UL + "_tmp");
+					curNode.addClass(setting.treeObj.attr("class"));
+					curNode.appendTo(body);
+
+					tmpArrow = $$("<span class='tmpzTreeMove_arrow'></span>", setting);
+					tmpArrow.attr("id", "zTreeMove_arrow_tmp");
+					tmpArrow.appendTo(body);
+
+					setting.treeObj.trigger(consts.event.DRAG, [event, setting.treeId, nodes]);
+				}
+
+				if (root.dragFlag == 1) {
+					if (tmpTarget && tmpArrow.attr("id") == event.target.id && tmpTargetNodeId && (event.clientX + doc.scrollLeft()+2) > ($("#" + tmpTargetNodeId + consts.id.A, tmpTarget).offset().left)) {
+						var xT = $("#" + tmpTargetNodeId + consts.id.A, tmpTarget);
+						event.target = (xT.length > 0) ? xT.get(0) : event.target;
+					} else if (tmpTarget) {
+						tmpTarget.removeClass(consts.node.TMPTARGET_TREE);
+						if (tmpTargetNodeId) $("#" + tmpTargetNodeId + consts.id.A, tmpTarget).removeClass(consts.node.TMPTARGET_NODE + "_" + consts.move.TYPE_PREV)
+							.removeClass(consts.node.TMPTARGET_NODE + "_" + _consts.move.TYPE_NEXT).removeClass(consts.node.TMPTARGET_NODE + "_" + _consts.move.TYPE_INNER);
+					}
+					tmpTarget = null;
+					tmpTargetNodeId = null;
+
+					//judge drag & drop in multi ztree
+					isOtherTree = false;
+					targetSetting = setting;
+					var settings = data.getSettings();
+					for (var s in settings) {
+						if (settings[s].treeId && settings[s].edit.enable && settings[s].treeId != setting.treeId
+							&& (event.target.id == settings[s].treeId || $(event.target).parents("#" + settings[s].treeId).length>0)) {
+							isOtherTree = true;
+							targetSetting = settings[s];
+						}
+					}
+
+					var docScrollTop = doc.scrollTop(),
+					docScrollLeft = doc.scrollLeft(),
+					treeOffset = targetSetting.treeObj.offset(),
+					scrollHeight = targetSetting.treeObj.get(0).scrollHeight,
+					scrollWidth = targetSetting.treeObj.get(0).scrollWidth,
+					dTop = (event.clientY + docScrollTop - treeOffset.top),
+					dBottom = (targetSetting.treeObj.height() + treeOffset.top - event.clientY - docScrollTop),
+					dLeft = (event.clientX + docScrollLeft - treeOffset.left),
+					dRight = (targetSetting.treeObj.width() + treeOffset.left - event.clientX - docScrollLeft),
+					isTop = (dTop < setting.edit.drag.borderMax && dTop > setting.edit.drag.borderMin),
+					isBottom = (dBottom < setting.edit.drag.borderMax && dBottom > setting.edit.drag.borderMin),
+					isLeft = (dLeft < setting.edit.drag.borderMax && dLeft > setting.edit.drag.borderMin),
+					isRight = (dRight < setting.edit.drag.borderMax && dRight > setting.edit.drag.borderMin),
+					isTreeInner = dTop > setting.edit.drag.borderMin && dBottom > setting.edit.drag.borderMin && dLeft > setting.edit.drag.borderMin && dRight > setting.edit.drag.borderMin,
+					isTreeTop = (isTop && targetSetting.treeObj.scrollTop() <= 0),
+					isTreeBottom = (isBottom && (targetSetting.treeObj.scrollTop() + targetSetting.treeObj.height()+10) >= scrollHeight),
+					isTreeLeft = (isLeft && targetSetting.treeObj.scrollLeft() <= 0),
+					isTreeRight = (isRight && (targetSetting.treeObj.scrollLeft() + targetSetting.treeObj.width()+10) >= scrollWidth);
+
+					if (event.target && tools.isChildOrSelf(event.target, targetSetting.treeId)) {
+						//get node <li> dom
+						var targetObj = event.target;
+						while (targetObj && targetObj.tagName && !tools.eqs(targetObj.tagName, "li") && targetObj.id != targetSetting.treeId) {
+							targetObj = targetObj.parentNode;
+						}
+
+						var canMove = true;
+						//don't move to self or children of self
+						for (i=0, l=nodes.length; i<l; i++) {
+							tmpNode = nodes[i];
+							if (targetObj.id === tmpNode.tId) {
+								canMove = false;
+								break;
+							} else if ($$(tmpNode, setting).find("#" + targetObj.id).length > 0) {
+								canMove = false;
+								break;
+							}
+						}
+						if (canMove && event.target && tools.isChildOrSelf(event.target, targetObj.id + consts.id.A)) {
+							tmpTarget = $(targetObj);
+							tmpTargetNodeId = targetObj.id;
+						}
+					}
+
+					//the mouse must be in zTree
+					tmpNode = nodes[0];
+					if (isTreeInner && tools.isChildOrSelf(event.target, targetSetting.treeId)) {
+						//judge mouse move in root of ztree
+						if (!tmpTarget && (event.target.id == targetSetting.treeId || isTreeTop || isTreeBottom || isTreeLeft || isTreeRight) && (isOtherTree || (!isOtherTree && tmpNode.parentTId))) {
+							tmpTarget = targetSetting.treeObj;
+						}
+						//auto scroll top
+						if (isTop) {
+							targetSetting.treeObj.scrollTop(targetSetting.treeObj.scrollTop()-10);
+						} else if (isBottom)  {
+							targetSetting.treeObj.scrollTop(targetSetting.treeObj.scrollTop()+10);
+						}
+						if (isLeft) {
+							targetSetting.treeObj.scrollLeft(targetSetting.treeObj.scrollLeft()-10);
+						} else if (isRight) {
+							targetSetting.treeObj.scrollLeft(targetSetting.treeObj.scrollLeft()+10);
+						}
+						//auto scroll left
+						if (tmpTarget && tmpTarget != targetSetting.treeObj && tmpTarget.offset().left < targetSetting.treeObj.offset().left) {
+							targetSetting.treeObj.scrollLeft(targetSetting.treeObj.scrollLeft()+ tmpTarget.offset().left - targetSetting.treeObj.offset().left);
+						}
+					}
+
+					curNode.css({
+						"top": (event.clientY + docScrollTop + 3) + "px",
+						"left": (event.clientX + docScrollLeft + 3) + "px"
+					});
+
+					var dX = 0;
+					var dY = 0;
+					if (tmpTarget && tmpTarget.attr("id")!=targetSetting.treeId) {
+						var tmpTargetNode = tmpTargetNodeId == null ? null: data.getNodeCache(targetSetting, tmpTargetNodeId),
+						isCopy = (event.ctrlKey && setting.edit.drag.isMove && setting.edit.drag.isCopy) || (!setting.edit.drag.isMove && setting.edit.drag.isCopy),
+						isPrev = !!(preNode && tmpTargetNodeId === preNode.tId),
+						isNext = !!(nextNode && tmpTargetNodeId === nextNode.tId),
+						isInner = (tmpNode.parentTId && tmpNode.parentTId == tmpTargetNodeId),
+						canPrev = (isCopy || !isNext) && tools.apply(targetSetting.edit.drag.prev, [targetSetting.treeId, nodes, tmpTargetNode], !!targetSetting.edit.drag.prev),
+						canNext = (isCopy || !isPrev) && tools.apply(targetSetting.edit.drag.next, [targetSetting.treeId, nodes, tmpTargetNode], !!targetSetting.edit.drag.next),
+						canInner = (isCopy || !isInner) && !(targetSetting.data.keep.leaf && !tmpTargetNode.isParent) && tools.apply(targetSetting.edit.drag.inner, [targetSetting.treeId, nodes, tmpTargetNode], !!targetSetting.edit.drag.inner);
+						if (!canPrev && !canNext && !canInner) {
+							tmpTarget = null;
+							tmpTargetNodeId = "";
+							moveType = consts.move.TYPE_INNER;
+							tmpArrow.css({
+								"display":"none"
+							});
+							if (window.zTreeMoveTimer) {
+								clearTimeout(window.zTreeMoveTimer);
+								window.zTreeMoveTargetNodeTId = null
+							}
+						} else {
+							var tmpTargetA = $("#" + tmpTargetNodeId + consts.id.A, tmpTarget),
+							tmpNextA = tmpTargetNode.isLastNode ? null : $("#" + tmpTargetNode.getNextNode().tId + consts.id.A, tmpTarget.next()),
+							tmpTop = tmpTargetA.offset().top,
+							tmpLeft = tmpTargetA.offset().left,
+							prevPercent = canPrev ? (canInner ? 0.25 : (canNext ? 0.5 : 1) ) : -1,
+							nextPercent = canNext ? (canInner ? 0.75 : (canPrev ? 0.5 : 0) ) : -1,
+							dY_percent = (event.clientY + docScrollTop - tmpTop)/tmpTargetA.height();
+							if ((prevPercent==1 ||dY_percent<=prevPercent && dY_percent>=-.2) && canPrev) {
+								dX = 1 - tmpArrow.width();
+								dY = tmpTop - tmpArrow.height()/2;
+								moveType = consts.move.TYPE_PREV;
+							} else if ((nextPercent==0 || dY_percent>=nextPercent && dY_percent<=1.2) && canNext) {
+								dX = 1 - tmpArrow.width();
+								dY = (tmpNextA == null || (tmpTargetNode.isParent && tmpTargetNode.open)) ? (tmpTop + tmpTargetA.height() - tmpArrow.height()/2) : (tmpNextA.offset().top - tmpArrow.height()/2);
+								moveType = consts.move.TYPE_NEXT;
+							}else {
+								dX = 5 - tmpArrow.width();
+								dY = tmpTop;
+								moveType = consts.move.TYPE_INNER;
+							}
+							tmpArrow.css({
+								"display":"block",
+								"top": dY + "px",
+								"left": (tmpLeft + dX) + "px"
+							});
+							tmpTargetA.addClass(consts.node.TMPTARGET_NODE + "_" + moveType);
+
+							if (preTmpTargetNodeId != tmpTargetNodeId || preTmpMoveType != moveType) {
+								startTime = (new Date()).getTime();
+							}
+							if (tmpTargetNode && tmpTargetNode.isParent && moveType == consts.move.TYPE_INNER) {
+								var startTimer = true;
+								if (window.zTreeMoveTimer && window.zTreeMoveTargetNodeTId !== tmpTargetNode.tId) {
+									clearTimeout(window.zTreeMoveTimer);
+									window.zTreeMoveTargetNodeTId = null;
+								}else if (window.zTreeMoveTimer && window.zTreeMoveTargetNodeTId === tmpTargetNode.tId) {
+									startTimer = false;
+								}
+								if (startTimer) {
+									window.zTreeMoveTimer = setTimeout(function() {
+										if (moveType != consts.move.TYPE_INNER) return;
+										if (tmpTargetNode && tmpTargetNode.isParent && !tmpTargetNode.open && (new Date()).getTime() - startTime > targetSetting.edit.drag.autoOpenTime
+											&& tools.apply(targetSetting.callback.beforeDragOpen, [targetSetting.treeId, tmpTargetNode], true)) {
+											view.switchNode(targetSetting, tmpTargetNode);
+											if (targetSetting.edit.drag.autoExpandTrigger) {
+												targetSetting.treeObj.trigger(consts.event.EXPAND, [targetSetting.treeId, tmpTargetNode]);
+											}
+										}
+									}, targetSetting.edit.drag.autoOpenTime+50);
+									window.zTreeMoveTargetNodeTId = tmpTargetNode.tId;
+								}
+							}
+						}
+					} else {
+						moveType = consts.move.TYPE_INNER;
+						if (tmpTarget && tools.apply(targetSetting.edit.drag.inner, [targetSetting.treeId, nodes, null], !!targetSetting.edit.drag.inner)) {
+							tmpTarget.addClass(consts.node.TMPTARGET_TREE);
+						} else {
+							tmpTarget = null;
+						}
+						tmpArrow.css({
+							"display":"none"
+						});
+						if (window.zTreeMoveTimer) {
+							clearTimeout(window.zTreeMoveTimer);
+							window.zTreeMoveTargetNodeTId = null;
+						}
+					}
+					preTmpTargetNodeId = tmpTargetNodeId;
+					preTmpMoveType = moveType;
+				}
+				return false;
+			}
+
+			doc.bind("mouseup", _docMouseUp);
+			function _docMouseUp(event) {
+				if (window.zTreeMoveTimer) {
+					clearTimeout(window.zTreeMoveTimer);
+					window.zTreeMoveTargetNodeTId = null;
+				}
+				preTmpTargetNodeId = null;
+				preTmpMoveType = null;
+				doc.unbind("mousemove", _docMouseMove);
+				doc.unbind("mouseup", _docMouseUp);
+				doc.unbind("selectstart", _docSelect);
+				body.css("cursor", "auto");
+				if (tmpTarget) {
+					tmpTarget.removeClass(consts.node.TMPTARGET_TREE);
+					if (tmpTargetNodeId) $("#" + tmpTargetNodeId + consts.id.A, tmpTarget).removeClass(consts.node.TMPTARGET_NODE + "_" + consts.move.TYPE_PREV)
+							.removeClass(consts.node.TMPTARGET_NODE + "_" + _consts.move.TYPE_NEXT).removeClass(consts.node.TMPTARGET_NODE + "_" + _consts.move.TYPE_INNER);
+				}
+				tools.showIfameMask(setting, false);
+
+				roots.showHoverDom = true;
+				if (root.dragFlag == 0) return;
+				root.dragFlag = 0;
+
+				var i, l, tmpNode;
+				for (i=0, l=nodes.length; i<l; i++) {
+					tmpNode = nodes[i];
+					if (tmpNode.isParent && root.dragNodeShowBefore[tmpNode.tId] && !tmpNode.open) {
+						view.expandCollapseNode(setting, tmpNode, !tmpNode.open);
+						delete root.dragNodeShowBefore[tmpNode.tId];
+					}
+				}
+
+				if (curNode) curNode.remove();
+				if (tmpArrow) tmpArrow.remove();
+
+				var isCopy = (event.ctrlKey && setting.edit.drag.isMove && setting.edit.drag.isCopy) || (!setting.edit.drag.isMove && setting.edit.drag.isCopy);
+				if (!isCopy && tmpTarget && tmpTargetNodeId && nodes[0].parentTId && tmpTargetNodeId==nodes[0].parentTId && moveType == consts.move.TYPE_INNER) {
+					tmpTarget = null;
+				}
+				if (tmpTarget) {
+					var dragTargetNode = tmpTargetNodeId == null ? null: data.getNodeCache(targetSetting, tmpTargetNodeId);
+					if (tools.apply(setting.callback.beforeDrop, [targetSetting.treeId, nodes, dragTargetNode, moveType, isCopy], true) == false) {
+						view.selectNodes(sourceSetting, nodes);
+						return;
+					}
+					var newNodes = isCopy ? tools.clone(nodes) : nodes;
+
+					function dropCallback() {
+						if (isOtherTree) {
+							if (!isCopy) {
+								for(var i=0, l=nodes.length; i<l; i++) {
+									view.removeNode(setting, nodes[i]);
+								}
+							}
+							if (moveType == consts.move.TYPE_INNER) {
+								view.addNodes(targetSetting, dragTargetNode, newNodes);
+							} else {
+								view.addNodes(targetSetting, dragTargetNode.getParentNode(), newNodes);
+								if (moveType == consts.move.TYPE_PREV) {
+									for (i=0, l=newNodes.length; i<l; i++) {
+										view.moveNode(targetSetting, dragTargetNode, newNodes[i], moveType, false);
+									}
+								} else {
+									for (i=-1, l=newNodes.length-1; i<l; l--) {
+										view.moveNode(targetSetting, dragTargetNode, newNodes[l], moveType, false);
+									}
+								}
+							}
+						} else {
+							if (isCopy && moveType == consts.move.TYPE_INNER) {
+								view.addNodes(targetSetting, dragTargetNode, newNodes);
+							} else {
+								if (isCopy) {
+									view.addNodes(targetSetting, dragTargetNode.getParentNode(), newNodes);
+								}
+								if (moveType != consts.move.TYPE_NEXT) {
+									for (i=0, l=newNodes.length; i<l; i++) {
+										view.moveNode(targetSetting, dragTargetNode, newNodes[i], moveType, false);
+									}
+								} else {
+									for (i=-1, l=newNodes.length-1; i<l; l--) {
+										view.moveNode(targetSetting, dragTargetNode, newNodes[l], moveType, false);
+									}
+								}
+							}
+						}
+						view.selectNodes(targetSetting, newNodes);
+						$$(newNodes[0], setting).focus().blur();
+
+						setting.treeObj.trigger(consts.event.DROP, [event, targetSetting.treeId, newNodes, dragTargetNode, moveType, isCopy]);
+					}
+
+					if (moveType == consts.move.TYPE_INNER && tools.canAsync(targetSetting, dragTargetNode)) {
+						view.asyncNode(targetSetting, dragTargetNode, false, dropCallback);
+					} else {
+						dropCallback();
+					}
+
+				} else {
+					view.selectNodes(sourceSetting, nodes);
+					setting.treeObj.trigger(consts.event.DROP, [event, setting.treeId, nodes, null, null, null]);
+				}
+			}
+
+			doc.bind("selectstart", _docSelect);
+			function _docSelect() {
+				return false;
+			}
+
+			//Avoid FireFox's Bug
+			//If zTree Div CSS set 'overflow', so drag node outside of zTree, and event.target is error.
+			if(eventMouseDown.preventDefault) {
+				eventMouseDown.preventDefault();
+			}
+			return true;
+		}
+	},
+	//method of tools for zTree
+	_tools = {
+		getAbs: function (obj) {
+			var oRect = obj.getBoundingClientRect(),
+			scrollTop = document.body.scrollTop+document.documentElement.scrollTop,
+			scrollLeft = document.body.scrollLeft+document.documentElement.scrollLeft;
+			return [oRect.left+scrollLeft,oRect.top+scrollTop];
+		},
+		inputFocus: function(inputObj) {
+			if (inputObj.get(0)) {
+				inputObj.focus();
+				tools.setCursorPosition(inputObj.get(0), inputObj.val().length);
+			}
+		},
+		inputSelect: function(inputObj) {
+			if (inputObj.get(0)) {
+				inputObj.focus();
+				inputObj.select();
+			}
+		},
+		setCursorPosition: function(obj, pos){
+			if(obj.setSelectionRange) {
+				obj.focus();
+				obj.setSelectionRange(pos,pos);
+			} else if (obj.createTextRange) {
+				var range = obj.createTextRange();
+				range.collapse(true);
+				range.moveEnd('character', pos);
+				range.moveStart('character', pos);
+				range.select();
+			}
+		},
+		showIfameMask: function(setting, showSign) {
+			var root = data.getRoot(setting);
+			//clear full mask
+			while (root.dragMaskList.length > 0) {
+				root.dragMaskList[0].remove();
+				root.dragMaskList.shift();
+			}
+			if (showSign) {
+				//show mask
+				var iframeList = $$("iframe", setting);
+				for (var i = 0, l = iframeList.length; i < l; i++) {
+					var obj = iframeList.get(i),
+					r = tools.getAbs(obj),
+					dragMask = $$("<div id='zTreeMask_" + i + "' class='zTreeMask' style='top:" + r[1] + "px; left:" + r[0] + "px; width:" + obj.offsetWidth + "px; height:" + obj.offsetHeight + "px;'></div>", setting);
+					dragMask.appendTo($$("body", setting));
+					root.dragMaskList.push(dragMask);
+				}
+			}
+		}
+	},
+	//method of operate ztree dom
+	_view = {
+		addEditBtn: function(setting, node) {
+			if (node.editNameFlag || $$(node, consts.id.EDIT, setting).length > 0) {
+				return;
+			}
+			if (!tools.apply(setting.edit.showRenameBtn, [setting.treeId, node], setting.edit.showRenameBtn)) {
+				return;
+			}
+			var aObj = $$(node, consts.id.A, setting),
+			editStr = "<span class='" + consts.className.BUTTON + " edit' id='" + node.tId + consts.id.EDIT + "' title='"+tools.apply(setting.edit.renameTitle, [setting.treeId, node], setting.edit.renameTitle)+"' treeNode"+consts.id.EDIT+" style='display:none;'></span>";
+			aObj.append(editStr);
+
+			$$(node, consts.id.EDIT, setting).bind('click',
+				function() {
+					if (!tools.uCanDo(setting) || tools.apply(setting.callback.beforeEditName, [setting.treeId, node], true) == false) return false;
+					view.editNode(setting, node);
+					return false;
+				}
+				).show();
+		},
+		addRemoveBtn: function(setting, node) {
+			if (node.editNameFlag || $$(node, consts.id.REMOVE, setting).length > 0) {
+				return;
+			}
+			if (!tools.apply(setting.edit.showRemoveBtn, [setting.treeId, node], setting.edit.showRemoveBtn)) {
+				return;
+			}
+			var aObj = $$(node, consts.id.A, setting),
+			removeStr = "<span class='" + consts.className.BUTTON + " remove' id='" + node.tId + consts.id.REMOVE + "' title='"+tools.apply(setting.edit.removeTitle, [setting.treeId, node], setting.edit.removeTitle)+"' treeNode"+consts.id.REMOVE+" style='display:none;'></span>";
+			aObj.append(removeStr);
+
+			$$(node, consts.id.REMOVE, setting).bind('click',
+				function() {
+					if (!tools.uCanDo(setting) || tools.apply(setting.callback.beforeRemove, [setting.treeId, node], true) == false) return false;
+					view.removeNode(setting, node);
+					setting.treeObj.trigger(consts.event.REMOVE, [setting.treeId, node]);
+					return false;
+				}
+				).bind('mousedown',
+				function(eventMouseDown) {
+					return true;
+				}
+				).show();
+		},
+		addHoverDom: function(setting, node) {
+			if (data.getRoots().showHoverDom) {
+				node.isHover = true;
+				if (setting.edit.enable) {
+					view.addEditBtn(setting, node);
+					view.addRemoveBtn(setting, node);
+				}
+				tools.apply(setting.view.addHoverDom, [setting.treeId, node]);
+			}
+		},
+		cancelCurEditNode: function (setting, forceName, isCancel) {
+			var root = data.getRoot(setting),
+			nameKey = setting.data.key.name,
+			node = root.curEditNode;
+
+			if (node) {
+				var inputObj = root.curEditInput,
+				newName = forceName ? forceName:(isCancel ? node[nameKey]: inputObj.val());
+				if (tools.apply(setting.callback.beforeRename, [setting.treeId, node, newName, isCancel], true) === false) {
+					return false;
+				} else {
+					node[nameKey] = newName;
+					setting.treeObj.trigger(consts.event.RENAME, [setting.treeId, node, isCancel]);
+				}
+				var aObj = $$(node, consts.id.A, setting);
+				aObj.removeClass(consts.node.CURSELECTED_EDIT);
+				inputObj.unbind();
+				view.setNodeName(setting, node);
+				node.editNameFlag = false;
+				root.curEditNode = null;
+				root.curEditInput = null;
+				view.selectNode(setting, node, false);
+			}
+			root.noSelection = true;
+			return true;
+		},
+		editNode: function(setting, node) {
+			var root = data.getRoot(setting);
+			view.editNodeBlur = false;
+			if (data.isSelectedNode(setting, node) && root.curEditNode == node && node.editNameFlag) {
+				setTimeout(function() {tools.inputFocus(root.curEditInput);}, 0);
+				return;
+			}
+			var nameKey = setting.data.key.name;
+			node.editNameFlag = true;
+			view.removeTreeDom(setting, node);
+			view.cancelCurEditNode(setting);
+			view.selectNode(setting, node, false);
+			$$(node, consts.id.SPAN, setting).html("<input type=text class='rename' id='" + node.tId + consts.id.INPUT + "' treeNode" + consts.id.INPUT + " >");
+			var inputObj = $$(node, consts.id.INPUT, setting);
+			inputObj.attr("value", node[nameKey]);
+			if (setting.edit.editNameSelectAll) {
+				tools.inputSelect(inputObj);
+			} else {
+				tools.inputFocus(inputObj);
+			}
+
+			inputObj.bind('blur', function(event) {
+				if (!view.editNodeBlur) {
+					view.cancelCurEditNode(setting);
+				}
+			}).bind('keydown', function(event) {
+				if (event.keyCode=="13") {
+					view.editNodeBlur = true;
+					view.cancelCurEditNode(setting);
+				} else if (event.keyCode=="27") {
+					view.cancelCurEditNode(setting, null, true);
+				}
+			}).bind('click', function(event) {
+				return false;
+			}).bind('dblclick', function(event) {
+				return false;
+			});
+
+			$$(node, consts.id.A, setting).addClass(consts.node.CURSELECTED_EDIT);
+			root.curEditInput = inputObj;
+			root.noSelection = false;
+			root.curEditNode = node;
+		},
+		moveNode: function(setting, targetNode, node, moveType, animateFlag, isSilent) {
+			var root = data.getRoot(setting),
+			childKey = setting.data.key.children;
+			if (targetNode == node) return;
+			if (setting.data.keep.leaf && targetNode && !targetNode.isParent && moveType == consts.move.TYPE_INNER) return;
+			var oldParentNode = (node.parentTId ? node.getParentNode(): root),
+			targetNodeIsRoot = (targetNode === null || targetNode == root);
+			if (targetNodeIsRoot && targetNode === null) targetNode = root;
+			if (targetNodeIsRoot) moveType = consts.move.TYPE_INNER;
+			var targetParentNode = (targetNode.parentTId ? targetNode.getParentNode() : root);
+
+			if (moveType != consts.move.TYPE_PREV && moveType != consts.move.TYPE_NEXT) {
+				moveType = consts.move.TYPE_INNER;
+			}
+
+			if (moveType == consts.move.TYPE_INNER) {
+				if (targetNodeIsRoot) {
+					//parentTId of root node is null
+					node.parentTId = null;
+				} else {
+					if (!targetNode.isParent) {
+						targetNode.isParent = true;
+						targetNode.open = !!targetNode.open;
+						view.setNodeLineIcos(setting, targetNode);
+					}
+					node.parentTId = targetNode.tId;
+				}
+			}
+
+			//move node Dom
+			var targetObj, target_ulObj;
+			if (targetNodeIsRoot) {
+				targetObj = setting.treeObj;
+				target_ulObj = targetObj;
+			} else {
+				if (!isSilent && moveType == consts.move.TYPE_INNER) {
+					view.expandCollapseNode(setting, targetNode, true, false);
+				} else if (!isSilent) {
+					view.expandCollapseNode(setting, targetNode.getParentNode(), true, false);
+				}
+				targetObj = $$(targetNode, setting);
+				target_ulObj = $$(targetNode, consts.id.UL, setting);
+				if (!!targetObj.get(0) && !target_ulObj.get(0)) {
+					var ulstr = [];
+					view.makeUlHtml(setting, targetNode, ulstr, '');
+					targetObj.append(ulstr.join(''));
+				}
+				target_ulObj = $$(targetNode, consts.id.UL, setting);
+			}
+			var nodeDom = $$(node, setting);
+			if (!nodeDom.get(0)) {
+				nodeDom = view.appendNodes(setting, node.level, [node], null, false, true).join('');
+			} else if (!targetObj.get(0)) {
+				nodeDom.remove();
+			}
+			if (target_ulObj.get(0) && moveType == consts.move.TYPE_INNER) {
+				target_ulObj.append(nodeDom);
+			} else if (targetObj.get(0) && moveType == consts.move.TYPE_PREV) {
+				targetObj.before(nodeDom);
+			} else if (targetObj.get(0) && moveType == consts.move.TYPE_NEXT) {
+				targetObj.after(nodeDom);
+			}
+
+			//repair the data after move
+			var i,l,
+			tmpSrcIndex = -1,
+			tmpTargetIndex = 0,
+			oldNeighbor = null,
+			newNeighbor = null,
+			oldLevel = node.level;
+			if (node.isFirstNode) {
+				tmpSrcIndex = 0;
+				if (oldParentNode[childKey].length > 1 ) {
+					oldNeighbor = oldParentNode[childKey][1];
+					oldNeighbor.isFirstNode = true;
+				}
+			} else if (node.isLastNode) {
+				tmpSrcIndex = oldParentNode[childKey].length -1;
+				oldNeighbor = oldParentNode[childKey][tmpSrcIndex - 1];
+				oldNeighbor.isLastNode = true;
+			} else {
+				for (i = 0, l = oldParentNode[childKey].length; i < l; i++) {
+					if (oldParentNode[childKey][i].tId == node.tId) {
+						tmpSrcIndex = i;
+						break;
+					}
+				}
+			}
+			if (tmpSrcIndex >= 0) {
+				oldParentNode[childKey].splice(tmpSrcIndex, 1);
+			}
+			if (moveType != consts.move.TYPE_INNER) {
+				for (i = 0, l = targetParentNode[childKey].length; i < l; i++) {
+					if (targetParentNode[childKey][i].tId == targetNode.tId) tmpTargetIndex = i;
+				}
+			}
+			if (moveType == consts.move.TYPE_INNER) {
+				if (!targetNode[childKey]) targetNode[childKey] = new Array();
+				if (targetNode[childKey].length > 0) {
+					newNeighbor = targetNode[childKey][targetNode[childKey].length - 1];
+					newNeighbor.isLastNode = false;
+				}
+				targetNode[childKey].splice(targetNode[childKey].length, 0, node);
+				node.isLastNode = true;
+				node.isFirstNode = (targetNode[childKey].length == 1);
+			} else if (targetNode.isFirstNode && moveType == consts.move.TYPE_PREV) {
+				targetParentNode[childKey].splice(tmpTargetIndex, 0, node);
+				newNeighbor = targetNode;
+				newNeighbor.isFirstNode = false;
+				node.parentTId = targetNode.parentTId;
+				node.isFirstNode = true;
+				node.isLastNode = false;
+
+			} else if (targetNode.isLastNode && moveType == consts.move.TYPE_NEXT) {
+				targetParentNode[childKey].splice(tmpTargetIndex + 1, 0, node);
+				newNeighbor = targetNode;
+				newNeighbor.isLastNode = false;
+				node.parentTId = targetNode.parentTId;
+				node.isFirstNode = false;
+				node.isLastNode = true;
+
+			} else {
+				if (moveType == consts.move.TYPE_PREV) {
+					targetParentNode[childKey].splice(tmpTargetIndex, 0, node);
+				} else {
+					targetParentNode[childKey].splice(tmpTargetIndex + 1, 0, node);
+				}
+				node.parentTId = targetNode.parentTId;
+				node.isFirstNode = false;
+				node.isLastNode = false;
+			}
+			data.fixPIdKeyValue(setting, node);
+			data.setSonNodeLevel(setting, node.getParentNode(), node);
+
+			//repair node what been moved
+			view.setNodeLineIcos(setting, node);
+			view.repairNodeLevelClass(setting, node, oldLevel)
+
+			//repair node's old parentNode dom
+			if (!setting.data.keep.parent && oldParentNode[childKey].length < 1) {
+				//old parentNode has no child nodes
+				oldParentNode.isParent = false;
+				oldParentNode.open = false;
+				var tmp_ulObj = $$(oldParentNode, consts.id.UL, setting),
+				tmp_switchObj = $$(oldParentNode, consts.id.SWITCH, setting),
+				tmp_icoObj = $$(oldParentNode, consts.id.ICON, setting);
+				view.replaceSwitchClass(oldParentNode, tmp_switchObj, consts.folder.DOCU);
+				view.replaceIcoClass(oldParentNode, tmp_icoObj, consts.folder.DOCU);
+				tmp_ulObj.css("display", "none");
+
+			} else if (oldNeighbor) {
+				//old neigbor node
+				view.setNodeLineIcos(setting, oldNeighbor);
+			}
+
+			//new neigbor node
+			if (newNeighbor) {
+				view.setNodeLineIcos(setting, newNeighbor);
+			}
+
+			//repair checkbox / radio
+			if (!!setting.check && setting.check.enable && view.repairChkClass) {
+				view.repairChkClass(setting, oldParentNode);
+				view.repairParentChkClassWithSelf(setting, oldParentNode);
+				if (oldParentNode != node.parent)
+					view.repairParentChkClassWithSelf(setting, node);
+			}
+
+			//expand parents after move
+			if (!isSilent) {
+				view.expandCollapseParentNode(setting, node.getParentNode(), true, animateFlag);
+			}
+		},
+		removeEditBtn: function(setting, node) {
+			$$(node, consts.id.EDIT, setting).unbind().remove();
+		},
+		removeRemoveBtn: function(setting, node) {
+			$$(node, consts.id.REMOVE, setting).unbind().remove();
+		},
+		removeTreeDom: function(setting, node) {
+			node.isHover = false;
+			view.removeEditBtn(setting, node);
+			view.removeRemoveBtn(setting, node);
+			tools.apply(setting.view.removeHoverDom, [setting.treeId, node]);
+		},
+		repairNodeLevelClass: function(setting, node, oldLevel) {
+			if (oldLevel === node.level) return;
+			var liObj = $$(node, setting),
+			aObj = $$(node, consts.id.A, setting),
+			ulObj = $$(node, consts.id.UL, setting),
+			oldClass = consts.className.LEVEL + oldLevel,
+			newClass = consts.className.LEVEL + node.level;
+			liObj.removeClass(oldClass);
+			liObj.addClass(newClass);
+			aObj.removeClass(oldClass);
+			aObj.addClass(newClass);
+			ulObj.removeClass(oldClass);
+			ulObj.addClass(newClass);
+		},
+		selectNodes : function(setting, nodes) {
+			for (var i=0, l=nodes.length; i<l; i++) {
+				view.selectNode(setting, nodes[i], i>0);
+			}
+		}
+	},
+
+	_z = {
+		tools: _tools,
+		view: _view,
+		event: _event,
+		data: _data
+	};
+	$.extend(true, $.fn.zTree.consts, _consts);
+	$.extend(true, $.fn.zTree._z, _z);
+
+	var zt = $.fn.zTree,
+	tools = zt._z.tools,
+	consts = zt.consts,
+	view = zt._z.view,
+	data = zt._z.data,
+	event = zt._z.event,
+	$$ = tools.$;
+
+	data.exSetting(_setting);
+	data.addInitBind(_bindEvent);
+	data.addInitUnBind(_unbindEvent);
+	data.addInitCache(_initCache);
+	data.addInitNode(_initNode);
+	data.addInitProxy(_eventProxy);
+	data.addInitRoot(_initRoot);
+	data.addZTreeTools(_zTreeTools);
+
+	var _cancelPreSelectedNode = view.cancelPreSelectedNode;
+	view.cancelPreSelectedNode = function (setting, node) {
+		var list = data.getRoot(setting).curSelectedList;
+		for (var i=0, j=list.length; i<j; i++) {
+			if (!node || node === list[i]) {
+				view.removeTreeDom(setting, list[i]);
+				if (node) break;
+			}
+		}
+		if (_cancelPreSelectedNode) _cancelPreSelectedNode.apply(view, arguments);
+	}
+
+	var _createNodes = view.createNodes;
+	view.createNodes = function(setting, level, nodes, parentNode) {
+		if (_createNodes) {
+			_createNodes.apply(view, arguments);
+		}
+		if (!nodes) return;
+		if (view.repairParentChkClassWithSelf) {
+			view.repairParentChkClassWithSelf(setting, parentNode);
+		}
+	}
+
+	var _makeNodeUrl = view.makeNodeUrl;
+	view.makeNodeUrl = function(setting, node) {
+		return setting.edit.enable ? null : (_makeNodeUrl.apply(view, arguments));
+	}
+
+	var _removeNode = view.removeNode;
+	view.removeNode = function(setting, node) {
+		var root = data.getRoot(setting);
+		if (root.curEditNode === node) root.curEditNode = null;
+		if (_removeNode) {
+			_removeNode.apply(view, arguments);
+		}
+	}
+
+	var _selectNode = view.selectNode;
+	view.selectNode = function(setting, node, addFlag) {
+		var root = data.getRoot(setting);
+		if (data.isSelectedNode(setting, node) && root.curEditNode == node && node.editNameFlag) {
+			return false;
+		}
+		if (_selectNode) _selectNode.apply(view, arguments);
+		view.addHoverDom(setting, node);
+		return true;
+	}
+
+	var _uCanDo = tools.uCanDo;
+	tools.uCanDo = function(setting, e) {
+		var root = data.getRoot(setting);
+		if (e && (tools.eqs(e.type, "mouseover") || tools.eqs(e.type, "mouseout") || tools.eqs(e.type, "mousedown") || tools.eqs(e.type, "mouseup"))) {
+			return true;
+		}
+		if (root.curEditNode) {
+			view.editNodeBlur = false;
+			root.curEditInput.focus();
+		}
+		return (!root.curEditNode) && (_uCanDo ? _uCanDo.apply(view, arguments) : true);
+	}
+})(jQuery);
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/js/jquery.ztree.exedit-3.5.min.js b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/js/jquery.ztree.exedit-3.5.min.js
new file mode 100644
index 0000000..c9eacef
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/js/jquery.ztree.exedit-3.5.min.js
@@ -0,0 +1,52 @@
+/*
+ * JQuery zTree exedit v3.5.15
+ * http://zTree.me/
+ *
+ * Copyright (c) 2010 Hunter.z
+ *
+ * Licensed same as jquery - MIT License
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ * email: hunter.z@263.net
+ * Date: 2013-10-15
+ */
+(function(w){var I={event:{DRAG:"ztree_drag",DROP:"ztree_drop",REMOVE:"ztree_remove",RENAME:"ztree_rename"},id:{EDIT:"_edit",INPUT:"_input",REMOVE:"_remove"},move:{TYPE_INNER:"inner",TYPE_PREV:"prev",TYPE_NEXT:"next"},node:{CURSELECTED_EDIT:"curSelectedNode_Edit",TMPTARGET_TREE:"tmpTargetzTree",TMPTARGET_NODE:"tmpTargetNode"}},x={onHoverOverNode:function(b,a){var c=n.getSetting(b.data.treeId),d=n.getRoot(c);if(d.curHoverNode!=a)x.onHoverOutNode(b);d.curHoverNode=a;e.addHoverDom(c,a)},onHoverOutNode:function(b){var b=
+n.getSetting(b.data.treeId),a=n.getRoot(b);if(a.curHoverNode&&!n.isSelectedNode(b,a.curHoverNode))e.removeTreeDom(b,a.curHoverNode),a.curHoverNode=null},onMousedownNode:function(b,a){function c(b){if(B.dragFlag==0&&Math.abs(N-b.clientX)<f.edit.drag.minMoveSize&&Math.abs(O-b.clientY)<f.edit.drag.minMoveSize)return!0;var a,c,o,k,i;i=f.data.key.children;M.css("cursor","pointer");if(B.dragFlag==0){if(g.apply(f.callback.beforeDrag,[f.treeId,m],!0)==!1)return l(b),!0;for(a=0,c=m.length;a<c;a++){if(a==0)B.dragNodeShowBefore=
+[];o=m[a];o.isParent&&o.open?(e.expandCollapseNode(f,o,!o.open),B.dragNodeShowBefore[o.tId]=!0):B.dragNodeShowBefore[o.tId]=!1}B.dragFlag=1;t.showHoverDom=!1;g.showIfameMask(f,!0);o=!0;k=-1;if(m.length>1){var j=m[0].parentTId?m[0].getParentNode()[i]:n.getNodes(f);i=[];for(a=0,c=j.length;a<c;a++)if(B.dragNodeShowBefore[j[a].tId]!==void 0&&(o&&k>-1&&k+1!==a&&(o=!1),i.push(j[a]),k=a),m.length===i.length){m=i;break}}o&&(H=m[0].getPreNode(),R=m[m.length-1].getNextNode());C=p("<ul class='zTreeDragUL'></ul>",
+f);for(a=0,c=m.length;a<c;a++)if(o=m[a],o.editNameFlag=!1,e.selectNode(f,o,a>0),e.removeTreeDom(f,o),k=p("<li id='"+o.tId+"_tmp'></li>",f),k.append(p(o,d.id.A,f).clone()),k.css("padding","0"),k.children("#"+o.tId+d.id.A).removeClass(d.node.CURSELECTED),C.append(k),a==f.edit.drag.maxShowNodeNum-1){k=p("<li id='"+o.tId+"_moretmp'><a>  ...  </a></li>",f);C.append(k);break}C.attr("id",m[0].tId+d.id.UL+"_tmp");C.addClass(f.treeObj.attr("class"));C.appendTo(M);A=p("<span class='tmpzTreeMove_arrow'></span>",
+f);A.attr("id","zTreeMove_arrow_tmp");A.appendTo(M);f.treeObj.trigger(d.event.DRAG,[b,f.treeId,m])}if(B.dragFlag==1){s&&A.attr("id")==b.target.id&&u&&b.clientX+F.scrollLeft()+2>w("#"+u+d.id.A,s).offset().left?(o=w("#"+u+d.id.A,s),b.target=o.length>0?o.get(0):b.target):s&&(s.removeClass(d.node.TMPTARGET_TREE),u&&w("#"+u+d.id.A,s).removeClass(d.node.TMPTARGET_NODE+"_"+d.move.TYPE_PREV).removeClass(d.node.TMPTARGET_NODE+"_"+I.move.TYPE_NEXT).removeClass(d.node.TMPTARGET_NODE+"_"+I.move.TYPE_INNER));
+u=s=null;J=!1;h=f;o=n.getSettings();for(var D in o)if(o[D].treeId&&o[D].edit.enable&&o[D].treeId!=f.treeId&&(b.target.id==o[D].treeId||w(b.target).parents("#"+o[D].treeId).length>0))J=!0,h=o[D];D=F.scrollTop();k=F.scrollLeft();i=h.treeObj.offset();a=h.treeObj.get(0).scrollHeight;o=h.treeObj.get(0).scrollWidth;c=b.clientY+D-i.top;var q=h.treeObj.height()+i.top-b.clientY-D,r=b.clientX+k-i.left,x=h.treeObj.width()+i.left-b.clientX-k;i=c<f.edit.drag.borderMax&&c>f.edit.drag.borderMin;var j=q<f.edit.drag.borderMax&&
+q>f.edit.drag.borderMin,K=r<f.edit.drag.borderMax&&r>f.edit.drag.borderMin,G=x<f.edit.drag.borderMax&&x>f.edit.drag.borderMin,q=c>f.edit.drag.borderMin&&q>f.edit.drag.borderMin&&r>f.edit.drag.borderMin&&x>f.edit.drag.borderMin,r=i&&h.treeObj.scrollTop()<=0,x=j&&h.treeObj.scrollTop()+h.treeObj.height()+10>=a,P=K&&h.treeObj.scrollLeft()<=0,Q=G&&h.treeObj.scrollLeft()+h.treeObj.width()+10>=o;if(b.target&&g.isChildOrSelf(b.target,h.treeId)){for(var E=b.target;E&&E.tagName&&!g.eqs(E.tagName,"li")&&E.id!=
+h.treeId;)E=E.parentNode;var S=!0;for(a=0,c=m.length;a<c;a++)if(o=m[a],E.id===o.tId){S=!1;break}else if(p(o,f).find("#"+E.id).length>0){S=!1;break}if(S&&b.target&&g.isChildOrSelf(b.target,E.id+d.id.A))s=w(E),u=E.id}o=m[0];if(q&&g.isChildOrSelf(b.target,h.treeId)){if(!s&&(b.target.id==h.treeId||r||x||P||Q)&&(J||!J&&o.parentTId))s=h.treeObj;i?h.treeObj.scrollTop(h.treeObj.scrollTop()-10):j&&h.treeObj.scrollTop(h.treeObj.scrollTop()+10);K?h.treeObj.scrollLeft(h.treeObj.scrollLeft()-10):G&&h.treeObj.scrollLeft(h.treeObj.scrollLeft()+
+10);s&&s!=h.treeObj&&s.offset().left<h.treeObj.offset().left&&h.treeObj.scrollLeft(h.treeObj.scrollLeft()+s.offset().left-h.treeObj.offset().left)}C.css({top:b.clientY+D+3+"px",left:b.clientX+k+3+"px"});i=a=0;if(s&&s.attr("id")!=h.treeId){var y=u==null?null:n.getNodeCache(h,u);c=b.ctrlKey&&f.edit.drag.isMove&&f.edit.drag.isCopy||!f.edit.drag.isMove&&f.edit.drag.isCopy;a=!!(H&&u===H.tId);i=!!(R&&u===R.tId);k=o.parentTId&&o.parentTId==u;o=(c||!i)&&g.apply(h.edit.drag.prev,[h.treeId,m,y],!!h.edit.drag.prev);
+a=(c||!a)&&g.apply(h.edit.drag.next,[h.treeId,m,y],!!h.edit.drag.next);G=(c||!k)&&!(h.data.keep.leaf&&!y.isParent)&&g.apply(h.edit.drag.inner,[h.treeId,m,y],!!h.edit.drag.inner);if(!o&&!a&&!G){if(s=null,u="",v=d.move.TYPE_INNER,A.css({display:"none"}),window.zTreeMoveTimer)clearTimeout(window.zTreeMoveTimer),window.zTreeMoveTargetNodeTId=null}else{c=w("#"+u+d.id.A,s);i=y.isLastNode?null:w("#"+y.getNextNode().tId+d.id.A,s.next());j=c.offset().top;k=c.offset().left;K=o?G?0.25:a?0.5:1:-1;G=a?G?0.75:
+o?0.5:0:-1;b=(b.clientY+D-j)/c.height();(K==1||b<=K&&b>=-0.2)&&o?(a=1-A.width(),i=j-A.height()/2,v=d.move.TYPE_PREV):(G==0||b>=G&&b<=1.2)&&a?(a=1-A.width(),i=i==null||y.isParent&&y.open?j+c.height()-A.height()/2:i.offset().top-A.height()/2,v=d.move.TYPE_NEXT):(a=5-A.width(),i=j,v=d.move.TYPE_INNER);A.css({display:"block",top:i+"px",left:k+a+"px"});c.addClass(d.node.TMPTARGET_NODE+"_"+v);if(T!=u||U!=v)L=(new Date).getTime();if(y&&y.isParent&&v==d.move.TYPE_INNER&&(b=!0,window.zTreeMoveTimer&&window.zTreeMoveTargetNodeTId!==
+y.tId?(clearTimeout(window.zTreeMoveTimer),window.zTreeMoveTargetNodeTId=null):window.zTreeMoveTimer&&window.zTreeMoveTargetNodeTId===y.tId&&(b=!1),b))window.zTreeMoveTimer=setTimeout(function(){v==d.move.TYPE_INNER&&y&&y.isParent&&!y.open&&(new Date).getTime()-L>h.edit.drag.autoOpenTime&&g.apply(h.callback.beforeDragOpen,[h.treeId,y],!0)&&(e.switchNode(h,y),h.edit.drag.autoExpandTrigger&&h.treeObj.trigger(d.event.EXPAND,[h.treeId,y]))},h.edit.drag.autoOpenTime+50),window.zTreeMoveTargetNodeTId=y.tId}}else if(v=
+d.move.TYPE_INNER,s&&g.apply(h.edit.drag.inner,[h.treeId,m,null],!!h.edit.drag.inner)?s.addClass(d.node.TMPTARGET_TREE):s=null,A.css({display:"none"}),window.zTreeMoveTimer)clearTimeout(window.zTreeMoveTimer),window.zTreeMoveTargetNodeTId=null;T=u;U=v}return!1}function l(b){if(window.zTreeMoveTimer)clearTimeout(window.zTreeMoveTimer),window.zTreeMoveTargetNodeTId=null;U=T=null;F.unbind("mousemove",c);F.unbind("mouseup",l);F.unbind("selectstart",k);M.css("cursor","auto");s&&(s.removeClass(d.node.TMPTARGET_TREE),
+u&&w("#"+u+d.id.A,s).removeClass(d.node.TMPTARGET_NODE+"_"+d.move.TYPE_PREV).removeClass(d.node.TMPTARGET_NODE+"_"+I.move.TYPE_NEXT).removeClass(d.node.TMPTARGET_NODE+"_"+I.move.TYPE_INNER));g.showIfameMask(f,!1);t.showHoverDom=!0;if(B.dragFlag!=0){B.dragFlag=0;var a,i,j;for(a=0,i=m.length;a<i;a++)j=m[a],j.isParent&&B.dragNodeShowBefore[j.tId]&&!j.open&&(e.expandCollapseNode(f,j,!j.open),delete B.dragNodeShowBefore[j.tId]);C&&C.remove();A&&A.remove();var q=b.ctrlKey&&f.edit.drag.isMove&&f.edit.drag.isCopy||
+!f.edit.drag.isMove&&f.edit.drag.isCopy;!q&&s&&u&&m[0].parentTId&&u==m[0].parentTId&&v==d.move.TYPE_INNER&&(s=null);if(s){var r=u==null?null:n.getNodeCache(h,u);if(g.apply(f.callback.beforeDrop,[h.treeId,m,r,v,q],!0)==!1)e.selectNodes(x,m);else{var z=q?g.clone(m):m;a=function(){if(J){if(!q)for(var a=0,c=m.length;a<c;a++)e.removeNode(f,m[a]);if(v==d.move.TYPE_INNER)e.addNodes(h,r,z);else if(e.addNodes(h,r.getParentNode(),z),v==d.move.TYPE_PREV)for(a=0,c=z.length;a<c;a++)e.moveNode(h,r,z[a],v,!1);else for(a=
+-1,c=z.length-1;a<c;c--)e.moveNode(h,r,z[c],v,!1)}else if(q&&v==d.move.TYPE_INNER)e.addNodes(h,r,z);else if(q&&e.addNodes(h,r.getParentNode(),z),v!=d.move.TYPE_NEXT)for(a=0,c=z.length;a<c;a++)e.moveNode(h,r,z[a],v,!1);else for(a=-1,c=z.length-1;a<c;c--)e.moveNode(h,r,z[c],v,!1);e.selectNodes(h,z);p(z[0],f).focus().blur();f.treeObj.trigger(d.event.DROP,[b,h.treeId,z,r,v,q])};v==d.move.TYPE_INNER&&g.canAsync(h,r)?e.asyncNode(h,r,!1,a):a()}}else e.selectNodes(x,m),f.treeObj.trigger(d.event.DROP,[b,f.treeId,
+m,null,null,null])}}function k(){return!1}var i,j,f=n.getSetting(b.data.treeId),B=n.getRoot(f),t=n.getRoots();if(b.button==2||!f.edit.enable||!f.edit.drag.isCopy&&!f.edit.drag.isMove)return!0;var q=b.target,r=n.getRoot(f).curSelectedList,m=[];if(n.isSelectedNode(f,a))for(i=0,j=r.length;i<j;i++){if(r[i].editNameFlag&&g.eqs(q.tagName,"input")&&q.getAttribute("treeNode"+d.id.INPUT)!==null)return!0;m.push(r[i]);if(m[0].parentTId!==r[i].parentTId){m=[a];break}}else m=[a];e.editNodeBlur=!0;e.cancelCurEditNode(f);
+var F=w(f.treeObj.get(0).ownerDocument),M=w(f.treeObj.get(0).ownerDocument.body),C,A,s,J=!1,h=f,x=f,H,R,T=null,U=null,u=null,v=d.move.TYPE_INNER,N=b.clientX,O=b.clientY,L=(new Date).getTime();g.uCanDo(f)&&F.bind("mousemove",c);F.bind("mouseup",l);F.bind("selectstart",k);b.preventDefault&&b.preventDefault();return!0}};w.extend(!0,w.fn.zTree.consts,I);w.extend(!0,w.fn.zTree._z,{tools:{getAbs:function(b){b=b.getBoundingClientRect();return[b.left+(document.body.scrollLeft+document.documentElement.scrollLeft),
+b.top+(document.body.scrollTop+document.documentElement.scrollTop)]},inputFocus:function(b){b.get(0)&&(b.focus(),g.setCursorPosition(b.get(0),b.val().length))},inputSelect:function(b){b.get(0)&&(b.focus(),b.select())},setCursorPosition:function(b,a){if(b.setSelectionRange)b.focus(),b.setSelectionRange(a,a);else if(b.createTextRange){var c=b.createTextRange();c.collapse(!0);c.moveEnd("character",a);c.moveStart("character",a);c.select()}},showIfameMask:function(b,a){for(var c=n.getRoot(b);c.dragMaskList.length>
+0;)c.dragMaskList[0].remove(),c.dragMaskList.shift();if(a)for(var d=p("iframe",b),e=0,i=d.length;e<i;e++){var j=d.get(e),f=g.getAbs(j),j=p("<div id='zTreeMask_"+e+"' class='zTreeMask' style='top:"+f[1]+"px; left:"+f[0]+"px; width:"+j.offsetWidth+"px; height:"+j.offsetHeight+"px;'></div>",b);j.appendTo(p("body",b));c.dragMaskList.push(j)}}},view:{addEditBtn:function(b,a){if(!(a.editNameFlag||p(a,d.id.EDIT,b).length>0)&&g.apply(b.edit.showRenameBtn,[b.treeId,a],b.edit.showRenameBtn)){var c=p(a,d.id.A,
+b),l="<span class='"+d.className.BUTTON+" edit' id='"+a.tId+d.id.EDIT+"' title='"+g.apply(b.edit.renameTitle,[b.treeId,a],b.edit.renameTitle)+"' treeNode"+d.id.EDIT+" style='display:none;'></span>";c.append(l);p(a,d.id.EDIT,b).bind("click",function(){if(!g.uCanDo(b)||g.apply(b.callback.beforeEditName,[b.treeId,a],!0)==!1)return!1;e.editNode(b,a);return!1}).show()}},addRemoveBtn:function(b,a){if(!(a.editNameFlag||p(a,d.id.REMOVE,b).length>0)&&g.apply(b.edit.showRemoveBtn,[b.treeId,a],b.edit.showRemoveBtn)){var c=
+p(a,d.id.A,b),l="<span class='"+d.className.BUTTON+" remove' id='"+a.tId+d.id.REMOVE+"' title='"+g.apply(b.edit.removeTitle,[b.treeId,a],b.edit.removeTitle)+"' treeNode"+d.id.REMOVE+" style='display:none;'></span>";c.append(l);p(a,d.id.REMOVE,b).bind("click",function(){if(!g.uCanDo(b)||g.apply(b.callback.beforeRemove,[b.treeId,a],!0)==!1)return!1;e.removeNode(b,a);b.treeObj.trigger(d.event.REMOVE,[b.treeId,a]);return!1}).bind("mousedown",function(){return!0}).show()}},addHoverDom:function(b,a){if(n.getRoots().showHoverDom)a.isHover=
+!0,b.edit.enable&&(e.addEditBtn(b,a),e.addRemoveBtn(b,a)),g.apply(b.view.addHoverDom,[b.treeId,a])},cancelCurEditNode:function(b,a,c){var l=n.getRoot(b),k=b.data.key.name,i=l.curEditNode;if(i){var j=l.curEditInput,a=a?a:c?i[k]:j.val();if(g.apply(b.callback.beforeRename,[b.treeId,i,a,c],!0)===!1)return!1;else i[k]=a,b.treeObj.trigger(d.event.RENAME,[b.treeId,i,c]);p(i,d.id.A,b).removeClass(d.node.CURSELECTED_EDIT);j.unbind();e.setNodeName(b,i);i.editNameFlag=!1;l.curEditNode=null;l.curEditInput=null;
+e.selectNode(b,i,!1)}return l.noSelection=!0},editNode:function(b,a){var c=n.getRoot(b);e.editNodeBlur=!1;if(n.isSelectedNode(b,a)&&c.curEditNode==a&&a.editNameFlag)setTimeout(function(){g.inputFocus(c.curEditInput)},0);else{var l=b.data.key.name;a.editNameFlag=!0;e.removeTreeDom(b,a);e.cancelCurEditNode(b);e.selectNode(b,a,!1);p(a,d.id.SPAN,b).html("<input type=text class='rename' id='"+a.tId+d.id.INPUT+"' treeNode"+d.id.INPUT+" >");var k=p(a,d.id.INPUT,b);k.attr("value",a[l]);b.edit.editNameSelectAll?
+g.inputSelect(k):g.inputFocus(k);k.bind("blur",function(){e.editNodeBlur||e.cancelCurEditNode(b)}).bind("keydown",function(a){a.keyCode=="13"?(e.editNodeBlur=!0,e.cancelCurEditNode(b)):a.keyCode=="27"&&e.cancelCurEditNode(b,null,!0)}).bind("click",function(){return!1}).bind("dblclick",function(){return!1});p(a,d.id.A,b).addClass(d.node.CURSELECTED_EDIT);c.curEditInput=k;c.noSelection=!1;c.curEditNode=a}},moveNode:function(b,a,c,l,k,i){var j=n.getRoot(b),f=b.data.key.children;if(a!=c&&(!b.data.keep.leaf||
+!a||a.isParent||l!=d.move.TYPE_INNER)){var g=c.parentTId?c.getParentNode():j,t=a===null||a==j;t&&a===null&&(a=j);if(t)l=d.move.TYPE_INNER;j=a.parentTId?a.getParentNode():j;if(l!=d.move.TYPE_PREV&&l!=d.move.TYPE_NEXT)l=d.move.TYPE_INNER;if(l==d.move.TYPE_INNER)if(t)c.parentTId=null;else{if(!a.isParent)a.isParent=!0,a.open=!!a.open,e.setNodeLineIcos(b,a);c.parentTId=a.tId}var q;t?q=t=b.treeObj:(!i&&l==d.move.TYPE_INNER?e.expandCollapseNode(b,a,!0,!1):i||e.expandCollapseNode(b,a.getParentNode(),!0,!1),
+t=p(a,b),q=p(a,d.id.UL,b),t.get(0)&&!q.get(0)&&(q=[],e.makeUlHtml(b,a,q,""),t.append(q.join(""))),q=p(a,d.id.UL,b));var r=p(c,b);r.get(0)?t.get(0)||r.remove():r=e.appendNodes(b,c.level,[c],null,!1,!0).join("");q.get(0)&&l==d.move.TYPE_INNER?q.append(r):t.get(0)&&l==d.move.TYPE_PREV?t.before(r):t.get(0)&&l==d.move.TYPE_NEXT&&t.after(r);var m=-1,w=0,x=null,t=null,C=c.level;if(c.isFirstNode){if(m=0,g[f].length>1)x=g[f][1],x.isFirstNode=!0}else if(c.isLastNode)m=g[f].length-1,x=g[f][m-1],x.isLastNode=
+!0;else for(q=0,r=g[f].length;q<r;q++)if(g[f][q].tId==c.tId){m=q;break}m>=0&&g[f].splice(m,1);if(l!=d.move.TYPE_INNER)for(q=0,r=j[f].length;q<r;q++)j[f][q].tId==a.tId&&(w=q);if(l==d.move.TYPE_INNER){a[f]||(a[f]=[]);if(a[f].length>0)t=a[f][a[f].length-1],t.isLastNode=!1;a[f].splice(a[f].length,0,c);c.isLastNode=!0;c.isFirstNode=a[f].length==1}else a.isFirstNode&&l==d.move.TYPE_PREV?(j[f].splice(w,0,c),t=a,t.isFirstNode=!1,c.parentTId=a.parentTId,c.isFirstNode=!0,c.isLastNode=!1):a.isLastNode&&l==d.move.TYPE_NEXT?
+(j[f].splice(w+1,0,c),t=a,t.isLastNode=!1,c.parentTId=a.parentTId,c.isFirstNode=!1,c.isLastNode=!0):(l==d.move.TYPE_PREV?j[f].splice(w,0,c):j[f].splice(w+1,0,c),c.parentTId=a.parentTId,c.isFirstNode=!1,c.isLastNode=!1);n.fixPIdKeyValue(b,c);n.setSonNodeLevel(b,c.getParentNode(),c);e.setNodeLineIcos(b,c);e.repairNodeLevelClass(b,c,C);!b.data.keep.parent&&g[f].length<1?(g.isParent=!1,g.open=!1,a=p(g,d.id.UL,b),l=p(g,d.id.SWITCH,b),f=p(g,d.id.ICON,b),e.replaceSwitchClass(g,l,d.folder.DOCU),e.replaceIcoClass(g,
+f,d.folder.DOCU),a.css("display","none")):x&&e.setNodeLineIcos(b,x);t&&e.setNodeLineIcos(b,t);b.check&&b.check.enable&&e.repairChkClass&&(e.repairChkClass(b,g),e.repairParentChkClassWithSelf(b,g),g!=c.parent&&e.repairParentChkClassWithSelf(b,c));i||e.expandCollapseParentNode(b,c.getParentNode(),!0,k)}},removeEditBtn:function(b,a){p(a,d.id.EDIT,b).unbind().remove()},removeRemoveBtn:function(b,a){p(a,d.id.REMOVE,b).unbind().remove()},removeTreeDom:function(b,a){a.isHover=!1;e.removeEditBtn(b,a);e.removeRemoveBtn(b,
+a);g.apply(b.view.removeHoverDom,[b.treeId,a])},repairNodeLevelClass:function(b,a,c){if(c!==a.level){var e=p(a,b),g=p(a,d.id.A,b),b=p(a,d.id.UL,b),c=d.className.LEVEL+c,a=d.className.LEVEL+a.level;e.removeClass(c);e.addClass(a);g.removeClass(c);g.addClass(a);b.removeClass(c);b.addClass(a)}},selectNodes:function(b,a){for(var c=0,d=a.length;c<d;c++)e.selectNode(b,a[c],c>0)}},event:{},data:{setSonNodeLevel:function(b,a,c){if(c){var d=b.data.key.children;c.level=a?a.level+1:0;if(c[d])for(var a=0,e=c[d].length;a<
+e;a++)c[d][a]&&n.setSonNodeLevel(b,c,c[d][a])}}}});var H=w.fn.zTree,g=H._z.tools,d=H.consts,e=H._z.view,n=H._z.data,p=g.$;n.exSetting({edit:{enable:!1,editNameSelectAll:!1,showRemoveBtn:!0,showRenameBtn:!0,removeTitle:"remove",renameTitle:"rename",drag:{autoExpandTrigger:!1,isCopy:!0,isMove:!0,prev:!0,next:!0,inner:!0,minMoveSize:5,borderMax:10,borderMin:-5,maxShowNodeNum:5,autoOpenTime:500}},view:{addHoverDom:null,removeHoverDom:null},callback:{beforeDrag:null,beforeDragOpen:null,beforeDrop:null,
+beforeEditName:null,beforeRename:null,onDrag:null,onDrop:null,onRename:null}});n.addInitBind(function(b){var a=b.treeObj,c=d.event;a.bind(c.RENAME,function(a,c,d,e){g.apply(b.callback.onRename,[a,c,d,e])});a.bind(c.REMOVE,function(a,c,d){g.apply(b.callback.onRemove,[a,c,d])});a.bind(c.DRAG,function(a,c,d,e){g.apply(b.callback.onDrag,[c,d,e])});a.bind(c.DROP,function(a,c,d,e,f,n,p){g.apply(b.callback.onDrop,[c,d,e,f,n,p])})});n.addInitUnBind(function(b){var b=b.treeObj,a=d.event;b.unbind(a.RENAME);
+b.unbind(a.REMOVE);b.unbind(a.DRAG);b.unbind(a.DROP)});n.addInitCache(function(){});n.addInitNode(function(b,a,c){if(c)c.isHover=!1,c.editNameFlag=!1});n.addInitProxy(function(b){var a=b.target,c=n.getSetting(b.data.treeId),e=b.relatedTarget,k="",i=null,j="",f=null,p=null;if(g.eqs(b.type,"mouseover")){if(p=g.getMDom(c,a,[{tagName:"a",attrName:"treeNode"+d.id.A}]))k=g.getNodeMainDom(p).id,j="hoverOverNode"}else if(g.eqs(b.type,"mouseout"))p=g.getMDom(c,e,[{tagName:"a",attrName:"treeNode"+d.id.A}]),
+p||(k="remove",j="hoverOutNode");else if(g.eqs(b.type,"mousedown")&&(p=g.getMDom(c,a,[{tagName:"a",attrName:"treeNode"+d.id.A}])))k=g.getNodeMainDom(p).id,j="mousedownNode";if(k.length>0)switch(i=n.getNodeCache(c,k),j){case "mousedownNode":f=x.onMousedownNode;break;case "hoverOverNode":f=x.onHoverOverNode;break;case "hoverOutNode":f=x.onHoverOutNode}return{stop:!1,node:i,nodeEventType:j,nodeEventCallback:f,treeEventType:"",treeEventCallback:null}});n.addInitRoot(function(b){var b=n.getRoot(b),a=n.getRoots();
+b.curEditNode=null;b.curEditInput=null;b.curHoverNode=null;b.dragFlag=0;b.dragNodeShowBefore=[];b.dragMaskList=[];a.showHoverDom=!0});n.addZTreeTools(function(b,a){a.cancelEditName=function(a){n.getRoot(b).curEditNode&&e.cancelCurEditNode(b,a?a:null,!0)};a.copyNode=function(a,l,k,i){if(!l)return null;if(a&&!a.isParent&&b.data.keep.leaf&&k===d.move.TYPE_INNER)return null;var j=g.clone(l);if(!a)a=null,k=d.move.TYPE_INNER;k==d.move.TYPE_INNER?(l=function(){e.addNodes(b,a,[j],i)},g.canAsync(b,a)?e.asyncNode(b,
+a,i,l):l()):(e.addNodes(b,a.parentNode,[j],i),e.moveNode(b,a,j,k,!1,i));return j};a.editName=function(a){a&&a.tId&&a===n.getNodeCache(b,a.tId)&&(a.parentTId&&e.expandCollapseParentNode(b,a.getParentNode(),!0),e.editNode(b,a))};a.moveNode=function(a,l,k,i){function j(){e.moveNode(b,a,l,k,!1,i)}if(!l)return l;if(a&&!a.isParent&&b.data.keep.leaf&&k===d.move.TYPE_INNER)return null;else if(a&&(l.parentTId==a.tId&&k==d.move.TYPE_INNER||p(l,b).find("#"+a.tId).length>0))return null;else a||(a=null);g.canAsync(b,
+a)&&k===d.move.TYPE_INNER?e.asyncNode(b,a,i,j):j();return l};a.setEditable=function(a){b.edit.enable=a;return this.refresh()}});var N=e.cancelPreSelectedNode;e.cancelPreSelectedNode=function(b,a){for(var c=n.getRoot(b).curSelectedList,d=0,g=c.length;d<g;d++)if(!a||a===c[d])if(e.removeTreeDom(b,c[d]),a)break;N&&N.apply(e,arguments)};var O=e.createNodes;e.createNodes=function(b,a,c,d){O&&O.apply(e,arguments);c&&e.repairParentChkClassWithSelf&&e.repairParentChkClassWithSelf(b,d)};var V=e.makeNodeUrl;
+e.makeNodeUrl=function(b,a){return b.edit.enable?null:V.apply(e,arguments)};var L=e.removeNode;e.removeNode=function(b,a){var c=n.getRoot(b);if(c.curEditNode===a)c.curEditNode=null;L&&L.apply(e,arguments)};var P=e.selectNode;e.selectNode=function(b,a,c){var d=n.getRoot(b);if(n.isSelectedNode(b,a)&&d.curEditNode==a&&a.editNameFlag)return!1;P&&P.apply(e,arguments);e.addHoverDom(b,a);return!0};var Q=g.uCanDo;g.uCanDo=function(b,a){var c=n.getRoot(b);if(a&&(g.eqs(a.type,"mouseover")||g.eqs(a.type,"mouseout")||
+g.eqs(a.type,"mousedown")||g.eqs(a.type,"mouseup")))return!0;if(c.curEditNode)e.editNodeBlur=!1,c.curEditInput.focus();return!c.curEditNode&&(Q?Q.apply(e,arguments):!0)}})(jQuery);
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/js/jquery.ztree.exhide-3.5.js b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/js/jquery.ztree.exhide-3.5.js
new file mode 100644
index 0000000..a35655d
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/js/jquery.ztree.exhide-3.5.js
@@ -0,0 +1,363 @@
+/*
+ * JQuery zTree exHideNodes v3.5.15
+ * http://zTree.me/
+ *
+ * Copyright (c) 2010 Hunter.z
+ *
+ * Licensed same as jquery - MIT License
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ * email: hunter.z@263.net
+ * Date: 2013-10-15
+ */
+(function($){
+	//default init node of exLib
+	var _initNode = function(setting, level, n, parentNode, isFirstNode, isLastNode, openFlag) {
+		if (typeof n.isHidden == "string") n.isHidden = tools.eqs(n.isHidden, "true");
+		n.isHidden = !!n.isHidden;
+		data.initHideForExCheck(setting, n);
+	},
+	//add dom for check
+	_beforeA = function(setting, node, html) {},
+	//update zTreeObj, add method of exLib
+	_zTreeTools = function(setting, zTreeTools) {
+		zTreeTools.showNodes = function(nodes, options) {
+			view.showNodes(setting, nodes, options);
+		}
+		zTreeTools.showNode = function(node, options) {
+			if (!node) {
+				return;
+			}
+			view.showNodes(setting, [node], options);
+		}
+		zTreeTools.hideNodes = function(nodes, options) {
+			view.hideNodes(setting, nodes, options);
+		}
+		zTreeTools.hideNode = function(node, options) {
+			if (!node) {
+				return;
+			}
+			view.hideNodes(setting, [node], options);
+		}
+
+		var _checkNode = zTreeTools.checkNode;
+		if (_checkNode) {
+			zTreeTools.checkNode = function(node, checked, checkTypeFlag, callbackFlag) {
+				if (!!node && !!node.isHidden) {
+					return;
+				}
+				_checkNode.apply(zTreeTools, arguments);
+			}
+		}
+	},
+	//method of operate data
+	_data = {
+		initHideForExCheck: function(setting, n) {
+			if (n.isHidden && setting.check && setting.check.enable) {
+				if(typeof n._nocheck == "undefined") {
+					n._nocheck = !!n.nocheck
+					n.nocheck = true;
+				}
+				n.check_Child_State = -1;
+				if (view.repairParentChkClassWithSelf) {
+					view.repairParentChkClassWithSelf(setting, n);
+				}
+			}
+		},
+		initShowForExCheck: function(setting, n) {
+			if (!n.isHidden && setting.check && setting.check.enable) {
+				if(typeof n._nocheck != "undefined") {
+					n.nocheck = n._nocheck;
+					delete n._nocheck;
+				}
+				if (view.setChkClass) {
+					var checkObj = $$(n, consts.id.CHECK, setting);
+					view.setChkClass(setting, checkObj, n);
+				}
+				if (view.repairParentChkClassWithSelf) {
+					view.repairParentChkClassWithSelf(setting, n);
+				}
+			}
+		}
+	},
+	//method of operate ztree dom
+	_view = {
+		clearOldFirstNode: function(setting, node) {
+			var n = node.getNextNode();
+			while(!!n){
+				if (n.isFirstNode) {
+					n.isFirstNode = false;
+					view.setNodeLineIcos(setting, n);
+					break;
+				}
+				if (n.isLastNode) {
+					break;
+				}
+				n = n.getNextNode();
+			}
+		},
+		clearOldLastNode: function(setting, node) {
+			var n = node.getPreNode();
+			while(!!n){
+				if (n.isLastNode) {
+					n.isLastNode = false;
+					view.setNodeLineIcos(setting, n);
+					break;
+				}
+				if (n.isFirstNode) {
+					break;
+				}
+				n = n.getPreNode();
+			}
+		},
+		makeDOMNodeMainBefore: function(html, setting, node) {
+			html.push("<li ", (node.isHidden ? "style='display:none;' " : ""), "id='", node.tId, "' class='", consts.className.LEVEL, node.level,"' tabindex='0' hidefocus='true' treenode>");
+		},
+		showNode: function(setting, node, options) {
+			node.isHidden = false;
+			data.initShowForExCheck(setting, node);
+			$$(node, setting).show();
+		},
+		showNodes: function(setting, nodes, options) {
+			if (!nodes || nodes.length == 0) {
+				return;
+			}
+			var pList = {}, i, j;
+			for (i=0, j=nodes.length; i<j; i++) {
+				var n = nodes[i];
+				if (!pList[n.parentTId]) {
+					var pn = n.getParentNode();
+					pList[n.parentTId] = (pn === null) ? data.getRoot(setting) : n.getParentNode();
+				}
+				view.showNode(setting, n, options);
+			}
+			for (var tId in pList) {
+				var children = pList[tId][setting.data.key.children];
+				view.setFirstNodeForShow(setting, children);
+				view.setLastNodeForShow(setting, children);
+			}
+		},
+		hideNode: function(setting, node, options) {
+			node.isHidden = true;
+			node.isFirstNode = false;
+			node.isLastNode = false;
+			data.initHideForExCheck(setting, node);
+			view.cancelPreSelectedNode(setting, node);
+			$$(node, setting).hide();
+		},
+		hideNodes: function(setting, nodes, options) {
+			if (!nodes || nodes.length == 0) {
+				return;
+			}
+			var pList = {}, i, j;
+			for (i=0, j=nodes.length; i<j; i++) {
+				var n = nodes[i];
+				if ((n.isFirstNode || n.isLastNode) && !pList[n.parentTId]) {
+					var pn = n.getParentNode();
+					pList[n.parentTId] = (pn === null) ? data.getRoot(setting) : n.getParentNode();
+				}
+				view.hideNode(setting, n, options);
+			}
+			for (var tId in pList) {
+				var children = pList[tId][setting.data.key.children];
+				view.setFirstNodeForHide(setting, children);
+				view.setLastNodeForHide(setting, children);
+			}
+		},
+		setFirstNode: function(setting, parentNode) {
+			var childKey = setting.data.key.children, childLength = parentNode[childKey].length;
+			if (childLength > 0 && !parentNode[childKey][0].isHidden) {
+				parentNode[childKey][0].isFirstNode = true;
+			} else if (childLength > 0) {
+				view.setFirstNodeForHide(setting, parentNode[childKey]);
+			}
+		},
+		setLastNode: function(setting, parentNode) {
+			var childKey = setting.data.key.children, childLength = parentNode[childKey].length;
+			if (childLength > 0 && !parentNode[childKey][0].isHidden) {
+				parentNode[childKey][childLength - 1].isLastNode = true;
+			} else if (childLength > 0) {
+				view.setLastNodeForHide(setting, parentNode[childKey]);
+			}
+		},
+		setFirstNodeForHide: function(setting, nodes) {
+			var n,i,j;
+			for (i=0, j=nodes.length; i<j; i++) {
+				n = nodes[i];
+				if (n.isFirstNode) {
+					break;
+				}
+				if (!n.isHidden && !n.isFirstNode) {
+					n.isFirstNode = true;
+					view.setNodeLineIcos(setting, n);
+					break;
+				} else {
+					n = null;
+				}
+			}
+			return n;
+		},
+		setFirstNodeForShow: function(setting, nodes) {
+			var n,i,j, first, old;
+			for(i=0, j=nodes.length; i<j; i++) {
+				n = nodes[i];
+				if (!first && !n.isHidden && n.isFirstNode) {
+					first = n;
+					break;
+				} else if (!first && !n.isHidden && !n.isFirstNode) {
+					n.isFirstNode = true;
+					first = n;
+					view.setNodeLineIcos(setting, n);
+				} else if (first && n.isFirstNode) {
+					n.isFirstNode = false;
+					old = n;
+					view.setNodeLineIcos(setting, n);
+					break;
+				} else {
+					n = null;
+				}
+			}
+			return {"new":first, "old":old};
+		},
+		setLastNodeForHide: function(setting, nodes) {
+			var n,i;
+			for (i=nodes.length-1; i>=0; i--) {
+				n = nodes[i];
+				if (n.isLastNode) {
+					break;
+				}
+				if (!n.isHidden && !n.isLastNode) {
+					n.isLastNode = true;
+					view.setNodeLineIcos(setting, n);
+					break;
+				} else {
+					n = null;
+				}
+			}
+			return n;
+		},
+		setLastNodeForShow: function(setting, nodes) {
+			var n,i,j, last, old;
+			for (i=nodes.length-1; i>=0; i--) {
+				n = nodes[i];
+				if (!last && !n.isHidden && n.isLastNode) {
+					last = n;
+					break;
+				} else if (!last && !n.isHidden && !n.isLastNode) {
+					n.isLastNode = true;
+					last = n;
+					view.setNodeLineIcos(setting, n);
+				} else if (last && n.isLastNode) {
+					n.isLastNode = false;
+					old = n;
+					view.setNodeLineIcos(setting, n);
+					break;
+				} else {
+					n = null;
+				}
+			}
+			return {"new":last, "old":old};
+		}
+	},
+
+	_z = {
+		view: _view,
+		data: _data
+	};
+	$.extend(true, $.fn.zTree._z, _z);
+
+	var zt = $.fn.zTree,
+	tools = zt._z.tools,
+	consts = zt.consts,
+	view = zt._z.view,
+	data = zt._z.data,
+	event = zt._z.event,
+	$$ = tools.$;
+
+	data.addInitNode(_initNode);
+	data.addBeforeA(_beforeA);
+	data.addZTreeTools(_zTreeTools);
+
+//	Override method in core
+	var _dInitNode = data.initNode;
+	data.initNode = function(setting, level, node, parentNode, isFirstNode, isLastNode, openFlag) {
+		var tmpPNode = (parentNode) ? parentNode: data.getRoot(setting),
+			children = tmpPNode[setting.data.key.children];
+		data.tmpHideFirstNode = view.setFirstNodeForHide(setting, children);
+		data.tmpHideLastNode = view.setLastNodeForHide(setting, children);
+		view.setNodeLineIcos(setting, data.tmpHideFirstNode);
+		view.setNodeLineIcos(setting, data.tmpHideLastNode);
+		isFirstNode = (data.tmpHideFirstNode === node);
+		isLastNode = (data.tmpHideLastNode === node);
+		if (_dInitNode) _dInitNode.apply(data, arguments);
+		if (isLastNode) {
+			view.clearOldLastNode(setting, node);
+		}
+	};
+
+	var _makeChkFlag = data.makeChkFlag;
+	if (!!_makeChkFlag) {
+		data.makeChkFlag = function(setting, node) {
+			if (!!node && !!node.isHidden) {
+				return;
+			}
+			_makeChkFlag.apply(data, arguments);
+		}
+	}
+
+	var _getTreeCheckedNodes = data.getTreeCheckedNodes;
+	if (!!_getTreeCheckedNodes) {
+		data.getTreeCheckedNodes = function(setting, nodes, checked, results) {
+			if (!!nodes && nodes.length > 0) {
+				var p = nodes[0].getParentNode();
+				if (!!p && !!p.isHidden) {
+					return [];
+				}
+			}
+			return _getTreeCheckedNodes.apply(data, arguments);
+		}
+	}
+
+	var _getTreeChangeCheckedNodes = data.getTreeChangeCheckedNodes;
+	if (!!_getTreeChangeCheckedNodes) {
+		data.getTreeChangeCheckedNodes = function(setting, nodes, results) {
+			if (!!nodes && nodes.length > 0) {
+				var p = nodes[0].getParentNode();
+				if (!!p && !!p.isHidden) {
+					return [];
+				}
+			}
+			return _getTreeChangeCheckedNodes.apply(data, arguments);
+		}
+	}
+
+	var _expandCollapseSonNode = view.expandCollapseSonNode;
+	if (!!_expandCollapseSonNode) {
+		view.expandCollapseSonNode = function(setting, node, expandFlag, animateFlag, callback) {
+			if (!!node && !!node.isHidden) {
+				return;
+			}
+			_expandCollapseSonNode.apply(view, arguments);
+		}
+	}
+
+	var _setSonNodeCheckBox = view.setSonNodeCheckBox;
+	if (!!_setSonNodeCheckBox) {
+		view.setSonNodeCheckBox = function(setting, node, value, srcNode) {
+			if (!!node && !!node.isHidden) {
+				return;
+			}
+			_setSonNodeCheckBox.apply(view, arguments);
+		}
+	}
+
+	var _repairParentChkClassWithSelf = view.repairParentChkClassWithSelf;
+	if (!!_repairParentChkClassWithSelf) {
+		view.repairParentChkClassWithSelf = function(setting, node) {
+			if (!!node && !!node.isHidden) {
+				return;
+			}
+			_repairParentChkClassWithSelf.apply(view, arguments);
+		}
+	}
+})(jQuery);
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/js/jquery.ztree.exhide-3.5.min.js b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/js/jquery.ztree.exhide-3.5.min.js
new file mode 100644
index 0000000..06c41b0
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/js/jquery.ztree.exhide-3.5.min.js
@@ -0,0 +1,22 @@
+/*
+ * JQuery zTree exHideNodes v3.5.15
+ * http://zTree.me/
+ *
+ * Copyright (c) 2010 Hunter.z
+ *
+ * Licensed same as jquery - MIT License
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ * email: hunter.z@263.net
+ * Date: 2013-10-15
+ */
+(function(i){i.extend(!0,i.fn.zTree._z,{view:{clearOldFirstNode:function(c,a){for(var b=a.getNextNode();b;){if(b.isFirstNode){b.isFirstNode=!1;d.setNodeLineIcos(c,b);break}if(b.isLastNode)break;b=b.getNextNode()}},clearOldLastNode:function(c,a){for(var b=a.getPreNode();b;){if(b.isLastNode){b.isLastNode=!1;d.setNodeLineIcos(c,b);break}if(b.isFirstNode)break;b=b.getPreNode()}},makeDOMNodeMainBefore:function(c,a,b){c.push("<li ",b.isHidden?"style='display:none;' ":"","id='",b.tId,"' class='",l.className.LEVEL,
+b.level,"' tabindex='0' hidefocus='true' treenode>")},showNode:function(c,a){a.isHidden=!1;f.initShowForExCheck(c,a);j(a,c).show()},showNodes:function(c,a,b){if(a&&a.length!=0){var e={},g,k;for(g=0,k=a.length;g<k;g++){var h=a[g];if(!e[h.parentTId]){var i=h.getParentNode();e[h.parentTId]=i===null?f.getRoot(c):h.getParentNode()}d.showNode(c,h,b)}for(var j in e)a=e[j][c.data.key.children],d.setFirstNodeForShow(c,a),d.setLastNodeForShow(c,a)}},hideNode:function(c,a){a.isHidden=!0;a.isFirstNode=!1;a.isLastNode=
+!1;f.initHideForExCheck(c,a);d.cancelPreSelectedNode(c,a);j(a,c).hide()},hideNodes:function(c,a,b){if(a&&a.length!=0){var e={},g,k;for(g=0,k=a.length;g<k;g++){var h=a[g];if((h.isFirstNode||h.isLastNode)&&!e[h.parentTId]){var i=h.getParentNode();e[h.parentTId]=i===null?f.getRoot(c):h.getParentNode()}d.hideNode(c,h,b)}for(var j in e)a=e[j][c.data.key.children],d.setFirstNodeForHide(c,a),d.setLastNodeForHide(c,a)}},setFirstNode:function(c,a){var b=c.data.key.children,e=a[b].length;e>0&&!a[b][0].isHidden?
+a[b][0].isFirstNode=!0:e>0&&d.setFirstNodeForHide(c,a[b])},setLastNode:function(c,a){var b=c.data.key.children,e=a[b].length;e>0&&!a[b][0].isHidden?a[b][e-1].isLastNode=!0:e>0&&d.setLastNodeForHide(c,a[b])},setFirstNodeForHide:function(c,a){var b,e,g;for(e=0,g=a.length;e<g;e++){b=a[e];if(b.isFirstNode)break;if(!b.isHidden&&!b.isFirstNode){b.isFirstNode=!0;d.setNodeLineIcos(c,b);break}else b=null}return b},setFirstNodeForShow:function(c,a){var b,e,g,f,h;for(e=0,g=a.length;e<g;e++)if(b=a[e],!f&&!b.isHidden&&
+b.isFirstNode){f=b;break}else if(!f&&!b.isHidden&&!b.isFirstNode)b.isFirstNode=!0,f=b,d.setNodeLineIcos(c,b);else if(f&&b.isFirstNode){b.isFirstNode=!1;h=b;d.setNodeLineIcos(c,b);break}return{"new":f,old:h}},setLastNodeForHide:function(c,a){var b,e;for(e=a.length-1;e>=0;e--){b=a[e];if(b.isLastNode)break;if(!b.isHidden&&!b.isLastNode){b.isLastNode=!0;d.setNodeLineIcos(c,b);break}else b=null}return b},setLastNodeForShow:function(c,a){var b,e,g,f;for(e=a.length-1;e>=0;e--)if(b=a[e],!g&&!b.isHidden&&
+b.isLastNode){g=b;break}else if(!g&&!b.isHidden&&!b.isLastNode)b.isLastNode=!0,g=b,d.setNodeLineIcos(c,b);else if(g&&b.isLastNode){b.isLastNode=!1;f=b;d.setNodeLineIcos(c,b);break}return{"new":g,old:f}}},data:{initHideForExCheck:function(c,a){if(a.isHidden&&c.check&&c.check.enable){if(typeof a._nocheck=="undefined")a._nocheck=!!a.nocheck,a.nocheck=!0;a.check_Child_State=-1;d.repairParentChkClassWithSelf&&d.repairParentChkClassWithSelf(c,a)}},initShowForExCheck:function(c,a){if(!a.isHidden&&c.check&&
+c.check.enable){if(typeof a._nocheck!="undefined")a.nocheck=a._nocheck,delete a._nocheck;if(d.setChkClass){var b=j(a,l.id.CHECK,c);d.setChkClass(c,b,a)}d.repairParentChkClassWithSelf&&d.repairParentChkClassWithSelf(c,a)}}}});var i=i.fn.zTree,m=i._z.tools,l=i.consts,d=i._z.view,f=i._z.data,j=m.$;f.addInitNode(function(c,a,b){if(typeof b.isHidden=="string")b.isHidden=m.eqs(b.isHidden,"true");b.isHidden=!!b.isHidden;f.initHideForExCheck(c,b)});f.addBeforeA(function(){});f.addZTreeTools(function(c,a){a.showNodes=
+function(a,b){d.showNodes(c,a,b)};a.showNode=function(a,b){a&&d.showNodes(c,[a],b)};a.hideNodes=function(a,b){d.hideNodes(c,a,b)};a.hideNode=function(a,b){a&&d.hideNodes(c,[a],b)};var b=a.checkNode;if(b)a.checkNode=function(c,d,f,h){(!c||!c.isHidden)&&b.apply(a,arguments)}});var n=f.initNode;f.initNode=function(c,a,b,e,g,i,h){var j=(e?e:f.getRoot(c))[c.data.key.children];f.tmpHideFirstNode=d.setFirstNodeForHide(c,j);f.tmpHideLastNode=d.setLastNodeForHide(c,j);d.setNodeLineIcos(c,f.tmpHideFirstNode);
+d.setNodeLineIcos(c,f.tmpHideLastNode);g=f.tmpHideFirstNode===b;i=f.tmpHideLastNode===b;n&&n.apply(f,arguments);i&&d.clearOldLastNode(c,b)};var o=f.makeChkFlag;if(o)f.makeChkFlag=function(c,a){(!a||!a.isHidden)&&o.apply(f,arguments)};var p=f.getTreeCheckedNodes;if(p)f.getTreeCheckedNodes=function(c,a,b,e){if(a&&a.length>0){var d=a[0].getParentNode();if(d&&d.isHidden)return[]}return p.apply(f,arguments)};var q=f.getTreeChangeCheckedNodes;if(q)f.getTreeChangeCheckedNodes=function(c,a,b){if(a&&a.length>
+0){var d=a[0].getParentNode();if(d&&d.isHidden)return[]}return q.apply(f,arguments)};var r=d.expandCollapseSonNode;if(r)d.expandCollapseSonNode=function(c,a,b,e,f){(!a||!a.isHidden)&&r.apply(d,arguments)};var s=d.setSonNodeCheckBox;if(s)d.setSonNodeCheckBox=function(c,a,b,e){(!a||!a.isHidden)&&s.apply(d,arguments)};var t=d.repairParentChkClassWithSelf;if(t)d.repairParentChkClassWithSelf=function(c,a){(!a||!a.isHidden)&&t.apply(d,arguments)}})(jQuery);
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/log v3.x.txt b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/log v3.x.txt
new file mode 100644
index 0000000..3b81e44
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/js/zTree/log v3.x.txt	
@@ -0,0 +1,199 @@
+=ZTree v3.x (JQuery Tree插件) 更新日志=

+

+<font color="red">为了更好的优化及扩展zTree, 因此决定升级为v3.x，并且对之前的v2.x不兼容，会有很多结构上的修改，对此深感无奈与抱歉，请大家谅解。</font>

+<font color="red">

+

+具体修改内容可参考：

+

+   * [http://www.ztree.me/v3/api.php zTree v3.0 API 文档]

+

+   * [http://www.ztree.me/v3/demo.php#_101 zTree v3.0 Demo 演示]

+

+   * [http://www.ztree.me/v3/faq.php#_101 zTree v3.0 常见问题]

+

+</font>

+

+<font color=#041594>

+

+*2013.10.19* v3.5.15

+   * 【增加】setting.view.txtSelectedEnable 属性，满足部分项目中客户对于可以选择节点文本信息的强烈欲望。

+

+   * 【修改】 exhide 扩展包导致操作子节点后 isLastNode 属性异常 的bug

+   * 【修改】 使用 cancelEditName 方法时，beforeRename & onRename 的 isCancel 始终为 false 的bug

+   * 【修改】 编辑状态， beforeRename 回调 return false 时，提示信息导致 input 失去焦点后， 当树再次得到焦点时，让 input 自动获取焦点

+   * 【修改】 判断拖拽到节点的 <a> 标签中自定义的无 id 组件判断错误的bug

+   * 【修改】 async_edit.html demo 中 添加按钮 显示的 bug

+   * 【修改】 当没有开启异步加载模式下，对于没有子节点的父节点，即使设置 open=true 在初始化时也不会设置为展开状态的bug （对于异步加载模式下依然会强行设置为折叠状态）

+

+*2013.06.28* v3.5.14

+   * 【修改】 拖拽节点时 iframe 遮罩异常的bug

+   * 【修改】 清空子节点后重新添加子节点无法显示的bug

+

+*2013.06.02* v3.5.13

+

+   * 【增加】beforeRename & onRename 增加 isCancel 参数，可以监控用户 ESC 取消编辑的事件

+

+   * 【修改】初始化时 radioType="all", 父节点未展开 且 子节点有被勾选，点击其他 radio 时，不会取消勾选该子节点的bug

+   * 【修改】多棵树拖拽时，拖拽无效后会导致目标书已选择的节点清空的 bug。

+   * 【修改】多棵树拖拽时，会触发 addHoverDom 的bug。

+   * 【修改】多棵树拖拽时，由于 beforeDrog 或 prev / inner / next 返回 false 后未触发原始节点的 addHoverDom 的bug

+   * 【修改】异步加载时，对于未加载子节点的父节点使用 expandNode 方法时， sonSign 设置为 true后，导致异步加载的节点无法正常显示的bug

+   * 【修改】一次性加载全部数据，如果父节点 A 未展开，但下一级的父节点 A1 设置了 open=true 的时候，使用 expandAll 方法导致 A1 的下一级父节点出现重复的 bug

+   * 【修改】增加对 iframe 的支持，可以只在主页面加载 zTree 的 js，在 iframe 内创建树 [https://github.com/zTree/zTree_v3/issues/7 Issue Info]

+   * 【修改】引入 exhide 扩展包 导致页面上同时加载多棵树时，根节点 的 连接线图标出现异常 的 bug [http://tieba.baidu.com/p/2277416574]

+   * 【修改】excheck & exedit 扩展包中事件代理获取节点 tId 的方法，保证适当修改 DOM 结构也能得到 tId

+

+*2013.03.11* v3.5.12

+   * 【修改】由于 jquery 1.9 中移除 event.srcElement 导致的 js 报错的bug。

+   * 【修改】在异步加载模式下，使用 moveNode 方法，且 moveType != "inner" 时，也会导致 targetNode 自动加载子节点的 bug

+   * 【修改】对已经显示的节点(nochecked=true)使用 showNodes 或 showNode 方法后，导致勾选框出现的bug。

+   * 【修改】对已经隐藏的节点(nochecked=false)使用 hideNodes 或 hideNode 方法后，导致勾选框消失的bug。

+   * 【修改】getNodesByParamFuzzy 支持 大小写模糊。

+   * 【修改】className 结构，提取 _consts.className.BUTTON / LEVEL / ICO_LOADING / SWITCH，便于快速修改 css 冲突。

+     例如：与 WordPress 产生冲突后，直接修改 core 中的 "button" 和 "level" 即可。  Issue: https://github.com/zTree/zTree_v3/issues/2

+

+*2013.01.28* v3.5.02

+   * 【增加】setting.check.chkDisabledInherit 属性，用于设置 chkDisabled 在初始化时子节点是否可以继承父节点的 chkDisabled 属性

+   * 【删除】内部 noSel 方法，使用 selectstart事件 和 "-moz-user-select"样式 处理禁止 节点文字被选择的功能

+   * 【修改】不兼容 jQuery 1.9 的bug

+   * 【修改】onDrop 的触发规则，保证异步加载模式下，可以在延迟加载结束后触发，避免 onDrop 中被拖拽的节点是已经更新后的数据。

+   * 【修改】setChkDisabled 方法，增加 inheritParent, inheritChildren 参数设置是否让父子节点继承 disabled

+   * 【修改】异步加载时 拼接参数的方法，由 string 修改为 json 对象

+   * 【修正】1-2-3 3级节点时，如果 2级节点 全部设置为 nocheck 或 chkDisabled后，勾选3级节点时，1级节点的半勾选状态错误的 bug

+   * 【修改】Demo: checkbox_nocheck.html & checkbox_chkDisabled.html;

+   * 【修改】Demo: edit_super.html，增加 showRenameBtn & showRemoveBtn 的演示

+   * 【修改】Demo: asyncForAll, 将 post 修改为 get；为了避免由于 IE10 的 bug 造成的客户端 以及 服务端崩溃

+      IE10 ajax Post 无法提交参数的bug (http://bugs.jquery.com/ticket/12790)

+

+*2012.12.21* v3.5.01

+   * 【优化】clone 方法

+   * 【修正】对于初始化无 children 属性的父节点进行 reAsyncChildNodes 操作时出错的 bug

+   * 【修正】beforeRename 回调中使用 cancelEditName 方法后，再 return false 导致无法重新进行编辑的 bug

+   * 【修正】exedit 扩展包让 setting.data.key.url 失效的 bug

+   * 【修正】setting.check.autoCheckTrigger 设置为 true 时，onCheck 回调缺少 event 参数的 bug

+   * 【修正】singlepath.html Demo 中的 bug

+

+*2012.11.20* v3.5

+   * 【优化】原先的 clone 方法 （特别感谢：愚人码头）

+   * 【修改】隐藏父节点后，使用 expandAll 方法导致 父节点展开的 bug

+   * 【修改】使用 jQuery v1.7 以上时，设置 zTree 容器 ul 隐藏（visibility: hidden;）后， 调用 selectNode 导致 IE 浏览器报错 Can't move focus 的 bug

+   * 【修改】正在异步加载时，执行 destory 或 init 方法后，异步加载的节点影响新树的 bug

+   * 【修改】方法 reAsyncChildNodes 在 refresh 的时候未清空内部 cache 导致内存泄露 的 bug

+   * 【修改】批量节点拖拽到其他父节点内（inner）时，导致顺序反转 的 bug

+   * 【修改】对于 使用 html格式的 节点无法触发 双击事件 的 bug

+   * 【修改】onCheck 回调中的 event ，保证与触发事件中的 event 一致

+   * 【修改】异步加载时，在 onNodeCreated 中执行 selectNode 后，导致节点折叠的 bug

+   * 【修改】API 中 dataFilter 的参数名称 childNodes ->  responseData

+   * 【修改】API 中 iconSkin 的 举例内容

+   * 【修改】API 中 chkDisabled 的说明

+   * 【修改】Demo 中 index.html 内的 loadReady 重复绑定问题

+

+*2012.09.03* v3.4

+   * 【增加】 Demo —— OutLook 样式的左侧菜单

+   * 【增加】清空 zTree 的方法 $.fn.zTree.destory(treeId) & zTree.destory()

+

+   * 【修改】core核心文件内 _eventProxy 方法中获取 tId 的方法，提高 DOM 的灵活性

+   * 【修改】初始化时 多层父节点的 checkbox 半选状态计算错误的 bug

+   * 【修改】同时选中父、子节点后，利用 getSelectedNodes 获取选中节点并利用 removeNode 删除时报错的 bug

+   * 【修改】treeNode.chkDisabled / nocheck 属性，支持字符串格式的 "false"/"true"

+   * 【修改】异步加载模式下无法利用 server 返回 xml 并且 在 dataFilter 中继续处理的 bug

+   * 【修改】title 只允许设置为 string 类型值的问题。 修正后允许设置为 number 类型的值

+   * 【修改】zId 计数规则 & Cache 保存，减少 IE9 的 bug 造成的内存泄漏

+   * 【修改】API 页面搜索功能导致 IE 崩溃的 bug

+

+*2012.07.16* v3.3

+   * 【增加】扩展库 exhide -- 节点隐藏功能

+

+   * 【修改】getNodesByFilter 方法，添加 invokeParam 自定义参数

+   * 【修改】拖拽中测试代码未删除，导致出现黄颜色的 iframe 遮罩层的 bug

+   * 【修改】延迟加载方法 对于使用 expandAll 进行全部展开时，导致 onNodeCreated 回调 和 addDiyDom 方法触发过早的 bug

+   * 【修改】使用 moveNode 移动尚未生成 DOM 的节点时，视图会出现异常的 bug

+   * 【修改】删除节点后，相关节点的 isFirstNode 属性未重置的 bug

+   * 【修改】getPreNode(),getNextNode() 方法在对于特殊情况时计算错误的 bug

+   * 【修改】设置 title 之后，如果重新将 title 内容设置为空后，会导致无法更新 title 的 bug

+   * 【修改】针对 setting.check.chkStyle=="radio" && setting.check.radioType=="all" 的情况时，getTreeCheckedNodes方法优化，找到一个结果就 break

+   * 【修改】zTreeObj.getCheckedNodes(false) 在 radioType = "all" 时计算错误的 bug

+   * 【修改】完善 API 中 beforeDrop / onDrop 的关于 treeId 的说明

+

+*2012.05.13* v3.2

+   * 【增加】setting.data.key.url 允许修改 treeNode.url 属性

+   * 【增加】getNodesByFilter(filter, isSingle) 方法

+   * 【增加】"与其他 DOM 拖拽互动" 的 Demo (http://www.ztree.me/v3/demo.php#_511)

+   * 【增加】"异步加载模式下全部展开" 的 Demo (http://www.ztree.me/v3/demo.php#_512)

+

+   * 【修改】代码结构，将 addNodes、removeNode、removeChildNodes 方法 和 beforeRemove、onRemove 回调 转移到 core 内

+   * 【修改】IE7的环境下无子节点的父节点反复展开出现多余空行的 bug

+   * 【修改】异步加载时，如果出现网络异常等，会导致 图标显示错误的 bug

+   * 【修改】dataFilter中 return null 导致异常 的 bug

+   * 【修改】removeChildNodes 方法清空子节点后，无法正常添加节点的 bug

+   * 【修改】moveNode 后节点中的自定义元素的事件丢失的 bug

+   * 【修改】moveNode 方法中设置 isSilent = true 时，如果移动到已展开的 父节点后，出现异常的 bug

+   * 【修改】onClick/onDrag/onDrop 回调中 event 不是原始 event 的 bug

+   * 【修改】onDrop 回调中 当拖拽无效时，无法获得 treeNodes 的 bug

+   * 【修改】onDrop 无法判断拖拽是 移动还是复制的问题

+   * 【修改】未开启异步加载模式时，拖拽节点到子节点为空的父节点内时 出现异常 的 bug

+   * 【修改】拖拽过程中，反复在 父节点图标上划动时，会出现停顿的 bug

+            (需要css 结构—— button -> span.button)

+

+   * 【修改】拖拽操作时箭头 与 targetNode 背景之间的细节现实问题，便于用户拖拽时更容易区分 prev、next 和 inner 操作

+   * 【修改】拖拽操作时IE6/7 下 在 节点<a> 右侧 10px 内会导致 targetNode = root 的 bug

+   * 【修改】编辑模式下 默认的编辑按钮、删除按钮点击后，如果相应的 before 回调 return false 时会触发 onClick 回调的 bug

+

+*2012.02.14* v3.1

+   * 【增加】ajax 的参数 setting.async.contentType ，让提交参数适用于 json 数据提交 （主要适用于 .Net 的开发）。

+   * 【增加】setting.edit.editNameSelectAll, 用于设定编辑节点名称时初次显示 input 后 text 内容为全选

+   * 【修改】异步加载 规则，不再仅仅依靠父节点的子节点数来判定，增加内部属性 zAsync，保证默认状态下父节点及时无子节点也只能异步加载一次，除非使用 reAsyncChildNodes 方法强行控制异步加载。

+   * 【修改】放大浏览器后导致 界面出现多余连接线的bug （需要更新：icon 图标和 css ）

+   * 【修改】在编辑状态，如果节点名超过编辑框宽度，左右键在框内不起作用的bug（IE 6 7 8 出现）

+      CSS 中 filter:alpha(opacity=80) 造成的，应该是 ie 的 bug，需要更新 css 文件

+   * 【修改】title 设置后，如果属性不存在，则默认为 title 为空，便于数据容错和用户灵活使用

+   * 【修改】editName 方法如果针对尚未展开的 父节点，会导致该父节点自动展开的 bug

+   * 【修改】title 中存在标签时导致 title 显示异常的bug（例如：蓝色字22%"'`<input/>`）

+

+*2012.01.10* v3.0

+   * 【增加】setting.check.autoCheckTrigger 默认值 false，可以设置联动选中时是否触发事件回调函数

+   * 【增加】setting.callback.beforeEditName 回调函数，以保证用户可以捕获点击编辑按钮的事件

+   * 【增加】treeNode.chkDisabled 属性，显示 checkbox 但是用户无法修改 checkbox 状态，并且该 checkbox 会影响父节点的 checkbox 的半选状态

+   * 【增加】setting.check.nocheckInherit 属性，用户设置子节点继承 nocheck 属性，用于批量初始化节点，不适用于已经显示的节点

+   * 【增加】setting.edit.drag.autoExpandTrigger 默认值 false，可以设置自动展开、折叠操作时是否触发事件回调函数

+   * 【增加】setting.view.nameIsHTML 默认值 false，允许用户对 name 设置 DOM 对象

+   * 【增加】treeNode.click 属性的说明文档

+   * 【增加】treeObj.setChkDisabled 方法用于设置 checkbox / radio disabled 状态

+   * 【增加】treeNode.halfCheck 属性，用于强制设定节点的半选状态

+

+   * 【修改】异步加载 & 编辑功能 共存时，拖拽节点 或 增加节点 导致 ie 上报错的 bug （apply 方法引起）

+   * 【修改】zTreeStyle 样式冲突

+   * 【修改】setting.data.key.title 默认值设置为 ""，初始化时自动赋值为 setting.data.key.name 这样可避免希望 title 与 name 一致的用户反复设置参数

+   * 【修改】点击叶子节点的连接线会触发 expand 事件的 bug

+   * 【修改】IE 下 点击叶子节点连线会出现虚线框的 bug

+   * 【修改】updateNode 导致 checkbox 半选状态错误的 bug

+   * 【修改】checkNode 方法实现 toggle 操作, 取消 expandAll 方法的 toggle 操作

+   * 【修改】zTree 内鼠标移动会抢页面上 input 内的焦点的 bug

+   * 【修改】beforeRename / onRename 的触发方式——即使名称内容未改变也会触发，便于用户配合 beforeEditName 捕获编辑状态的结束，赋予用户更多调整规则的权利

+   * 【修改】与 easyUI 共存时无法拖拽的bug

+   * 【修改】beforeRename 在 Firefox 下如果利用 alert，会触发两次的 bug

+   * 【修改】checkNode/expandNode/removeNode 方法，默认不触发回调函数，恢复 v2.6 的默认状态，同时增加 callbackFlag 参数，设置为 true 时，可以触发回调函数

+   * 【修改】IE9下“根据参数查找节点”的Demo 报错：行14 重新声明常量属性(Demo 自身的问题，定义了history变量)

+   * 【修改】初始化 zTree 时 onNodeCreated 事件回调函数中无法 用 getZTreeObj 获取 zTree 对象的 bug

+   * 【修改】setting.edit.drag.prev / next / inner 参数，增加被拖拽的节点集合

+   * 【修改】异步加载模式下，otherParam 使用Array数组会出错的 bug。例如： ["id", "1", "name", "test"]

+   * 【修改】FireFox 下多棵树拖拽异常的 bug

+   * 【修改】exedit 中调用 excheck库的方法时没有进行容错处理，导致如果只加入 exedit 而没有 excheck的时候，会出现 js 错误

+   * 【修改】显示 checkbox 的 zTree 在编辑模式下，移动节点不会更新父节点半选状态的 bug

+   * 【修改】treeNode.childs --> children; treeObject.removeChilds --> removeChildNodes; setting.data.key.childs --> children（英文不好惹的祸！抱歉了！）

+   * 【修改】onRemove 回调中得到的 treeNode 还可以查找 preNode、nextNode 的bug。 修正后，getPreNode 和 getNextNode 都返回 null； 为了便于查找父节点，getParentNode 仍保留

+   * 【修改】简单数据模式下，如果 id 与 pId 的值相同会导致该节点无法正常加载的 bug

+   * 【修改】移动或删除中间节点会导致最后一个节点连接线图标变小的 bug

+

+*2011.09.05* v3.0 beta

+   * 【修改】zTree 的 js 代码架构全面修改，并且拆分

+   * 【修改】zTree 的 css 样式全面修改，对浏览器可以更好地兼容，同时解决了以前1个像素差的问题

+   * 【优化】采用延迟加载技术，一次性加载大数据量的节点性能飞速提升

+   * 【增加】支持多节点同时选中、拖拽

+   * 【增加】checkNode、checkAllNodes 等多种方法

+   * 【增加】IE6 自动取消动画展开、折叠的功能

+   * 【修正】异步加载 & 编辑模式 能够更完美的共存

+   * 【修正】setting 配置更加合理，并且增加了若干项配置参数

+   * 【修正】treeNode 节点数据的属性更加合理，并且增加了一些方法

+   * 【修正】拖拽操作更加灵活方便，更容易制定自己的规则

+   * 【修正】其他若干修改，详细对比请参考 url：[http://www.ztree.me/v3/faq.php#_101 zTree v3.0 常见问题]

diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/promptumenu/hand.ico b/pluss-manage-page/src/main/resources/static/resources/auth/promptumenu/hand.ico
new file mode 100644
index 0000000..3e8e4eb
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/promptumenu/hand.ico differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/promptumenu/jquery.promptu-menu.js b/pluss-manage-page/src/main/resources/static/resources/auth/promptumenu/jquery.promptu-menu.js
new file mode 100644
index 0000000..e1460ed
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/promptumenu/jquery.promptu-menu.js
@@ -0,0 +1,514 @@
+/*
+ * promptuMenu - jQuery Plugin
+ * https://github.com/natrixnatrix89/promptu-menu
+ *
+ * Copyright (c) 2012 Janis Zarzeckis (http://natrixnatrix89.net)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ */
+(function( $ ) {
+  $.fn.promptumenu = function(options) {
+  
+    // Here goes
+	
+	var settings = $.extend({
+		'columns': 3,
+		'rows': 4,
+		'direction': 'horizontal',
+		'width': 'auto',
+		'height': 'auto',
+		'duration': 500,
+		'pages': true,
+		'inertia': 200
+	}, options);
+	
+	return this.each(function(){
+		var $this = $(this);
+		var properties;
+		var cursor = {
+			x:0,
+			y:1,
+			page:1
+		};
+		var cells = {
+			'width': 0,
+			'height': 0,
+			'pages': 1,
+			'current_page': 1
+		};
+		
+		var methods = {
+			//navigating to a specific page
+			go_to: function(index, easing, webkit){
+				if (easing === undefined){
+					easing = 'swing';
+				}
+				if(webkit === undefined){
+					webkit = false;
+				}
+				var anim, anim_css;
+				if(settings.direction == 'vertical'){
+					
+					anim = {'top': (index - 1) * properties.height * (-1)};
+					anim_css = {'-webkit-transform': 'translate3d(0px, ' + ((index - 1) * properties.height * (-1)) + 'px, 0px)'};
+					
+				} else {
+					
+					anim = {'left': (index - 1) * properties.width * (-1)};
+					anim_css = {'-webkit-transform': 'translate3d(' + ((index - 1) * properties.width * (-1)) + 'px, 0px, 0px)'};
+					
+				}
+				
+				if(webkit){
+					$this.css({
+						'-webkit-transition-property': '-webkit-transform',
+						'-webkit-transition-duration': settings.duration + 'ms',
+						'-webkit-transition-timing-function': 'ease-out'
+					});
+					$this.css(anim_css);
+					$this.data('ppos', (index - 1) * properties.width * (-1));
+				} else {
+					$this.animate(anim, settings.duration, easing);
+				}
+				$this.parent('.promptumenu_window').find('.promptumenu_nav a.active').removeClass('active');
+				$this.parent('.promptumenu_window').find('.promptumenu_nav a:nth-child(' + (index) + ')').addClass('active');
+				cells.current_page = index;
+			},
+			next_page: function(){
+				methods.go_to(cells.current_page + 1);
+			},
+			prev_page: function(){
+				methods.go_to(cells.current_page - 1);
+			}
+		};
+		
+		if($this.data('promptumenu')){
+			//This element already has promptumenu set up
+			console.error('You are calling promptumenu for an element more than twice. Please have a look.');
+		} else {
+			//this element hasn't been initialized yet, so we set it up
+			$this.data('promptumenu', true);
+			$this.data('ppos', 0);
+			
+			//take in mind the original css properties of the element, so we can preserve it's position.
+			properties = {
+				'width': (settings.width == 'auto') ? $this.width() : settings.width,
+				'height': (settings.height == 'auto') ? $this.height() : settings.height,
+				//'margin': $this.css('margin'),
+				//'position': ($this.css('position') == 'absolute') ? 'absolute' : 'relative',
+				//'top': $this.css('top'),
+				//'right': $this.css('right'),
+				//'bottom': $this.css('bottom'),
+				//'left': $this.css('left'),
+				'padding': 0,
+				'display': 'block',
+				'overflow': 'hidden'
+			};
+			cells.width = properties.width / settings.columns;
+			cells.height = properties.height / settings.rows;
+			
+			$this.wrap('<div class="promptumenu_window" />');
+			$this.parent('.promptumenu_window').css(properties);
+			$this.css({
+				'display': 'block',
+				'position': 'absolute',
+				'list-style': 'none',
+				'overflow': 'visible',
+				'height': 'auto',
+				'width': 'auto',
+				'top': 0,
+				'left': 0,
+				'margin': 0,
+				'padding': 0
+			});
+			
+			//and set up each child element
+			$this.children('li').css({
+				'display': 'block',
+				'position': 'absolute',
+				'margin': 0
+			});
+			
+			$this.children('li').each(function(){
+				var $li = $(this);
+				
+				//Moving like a typewriter
+				cursor.x += 1;
+				//if we reach the end of columns, add a new line and reset typewriter
+				if(cursor.x > settings.columns){
+					cursor.x = 1;
+					cursor.y += 1;
+				}
+				//if we reach the end of the page, turn the page
+				if(cursor.y > settings.rows){
+					cursor.x = 1;
+					cursor.y = 1;
+					cursor.page += 1;
+				}
+				
+				//attach each li information about it's position in the list
+				$li.data('layout', $.extend({},cursor));
+				
+				if(settings.direction == 'vertical'){
+				  
+					// Lay the pages in a vertical order
+					$li.css({
+						'top': Math.round((cursor.y * cells.height - cells.height/2) - ($li.height()/2) + (cursor.page - 1) * properties.height),
+						'left': Math.round((cursor.x * cells.width - cells.width/2) - ($li.width()/2))
+					});
+					
+					//this might be a silly approach.. but.. if the list contains an image.. I want to
+					//reposition the li.. because before we didn't know the dimensions of image
+					$li.find('img').bind('load', function(){
+						var cursor = $li.data('layout');
+						$li.css({
+							'top': Math.round((cursor.y * cells.height - cells.height/2) - ($li.height()/2) + (cursor.page - 1) * properties.height),
+							'left': Math.round((cursor.x * cells.width - cells.width/2) - ($li.width()/2))
+						});
+					});
+				  
+				} else {
+				  
+					//Lay the pages in a horizontal order
+					$li.css({
+						'top': Math.round((cursor.y * cells.height - cells.height/2) - ($li.height()/2)),
+						'left': Math.round((cursor.x * cells.width - cells.width/2) - ($li.width()/2) + (cursor.page - 1) * properties.width)
+					});
+					
+					//the same approach for images for the horizontal order
+					$li.find('img').bind('load', function(){
+						var cursor = $li.data('layout');
+						
+						$li.css({
+							'top': Math.round((cursor.y * cells.height - cells.height/2) - ($li.height()/2)),
+							'left': Math.round((cursor.x * cells.width - cells.width/2) - ($li.width()/2) + (cursor.page - 1) * properties.width)
+						});
+					});
+				  
+				}
+				
+			});
+			
+			
+			cells.pages = cursor.page;
+			$this.data('promptumenu_page_count', cells.pages);
+			
+			//and append the navigation buttons for each page
+			if(cells.pages > 1 && settings.pages == true){
+				var page_links = '<a class="active">Page 1</a>';
+				for(i = 2; i <= cells.pages; i++){
+					page_links = page_links + '<a>Page ' + i + '</a>';
+				}
+				
+				$this.parent('div.promptumenu_window').append('<div class="promptumenu_nav">' + page_links + '</div>');
+				
+				//bind the nav buttons to navigate to the specific page
+				$this.parent('div.promptumenu_window').find('.promptumenu_nav a').bind('click.promptumenu', function(){
+					methods.go_to($(this).index() + 1);
+				});
+			}
+			
+			//Make the list size appropriate, so that it could be dragged
+			//(or else users will be able to drag only by clicking the icons, but clicking
+			// on background will not activate dragging)
+			if(settings.direction == 'vertical'){
+				$this.css({
+					'width': properties.width,
+					'height': properties.height * cells.pages
+				});
+			} else {
+				$this.css({
+					'width': properties.width * cells.pages,
+					'height': properties.height
+				});
+			}
+			
+			//Binding all the drag movements
+			$this.bind('mousedown.promptumenu', function(mdown){
+				//mdown.preventDefault();
+				
+				$this.stop(true, false);
+				
+				var init_pos = $this.position();
+				var click = {
+					'x': mdown.pageX,
+					'y': mdown.pageY
+				};
+				var delta = {
+					'x': 0,
+					'y': 0
+				};
+				var mmove_event = new Array();
+				
+				//bind the mousemove to moving the list
+				$(document).bind('mousemove.promptumenu', function(mmove){
+					mmove.preventDefault();
+					var date = new Date();
+					var this_event = {
+						'time': date.getTime(),
+						'x': mmove.pageX,
+						'y': mmove.pageY
+					};
+					
+					//I want to get the average of the last 6 mousemove events before mouseup
+					while(mmove_event.length > 4){
+						mmove_event.shift();
+					}
+					
+					if(settings.direction == 'vertical'){
+						delta.y = mmove.pageY - click.y;
+						$this.css('top', init_pos.top + delta.y);
+					} else {
+						delta.x = mmove.pageX - click.x;
+						$this.css('left', init_pos.left + delta.x);
+						//$this.css('-webkit-transform', 'translate3d(' + (init_pos.left + delta.x) + 'px, 0, 0)');
+
+					}
+					mmove_event.push(this_event);
+				});
+				
+				//bind the mouseup to unbinding and animating to the appropriate page
+				$(document).bind('mouseup.promptumenu', function(mup){
+					mup.preventDefault();
+					$(document).unbind('.promptumenu');
+					
+					var date = new Date();
+					
+					var delta_start = mmove_event[0];
+					if(!delta_start)return true;
+					var delta_end = {
+						'time': date.getTime(),
+						'x': mup.pageX,
+						'y': mup.pageY
+					};
+					var event_delta = {
+						'time': (delta_end.time - delta_start.time),
+						'x': (delta_end.x - delta_start.x),
+						'y': (delta_end.y - delta_start.y)
+					};
+					var speed = {
+						'x': event_delta.x/event_delta.time,
+						'y': event_delta.y/event_delta.time
+					};
+					//console.log(mmove_event);
+					//console.log('The time delta is: ' + (delta_end.time - delta_start.time));
+					//console.log('The y_speed was: ' + (event_delta.y/event_delta.time));
+					
+					//And now we can animate the list with the appropriate distance and speed
+					if(settings.direction == 'vertical'){
+						
+						var pos = init_pos.top + delta.y + speed.y * settings.inertia;
+						//check if the user hasn't dragged over the end..
+						if(pos < ((-1) * properties.height * (cells.pages - 1))){
+							pos = (-1) * properties.height * (cells.pages - 1);
+						} else if(pos > 0){
+							pos = 0;
+						}
+						
+						//if the pages are being displayed, we want to snap to the specific page
+						if(settings.pages){
+							var snap_to_page = Math.round((- pos) / properties.height);
+							methods.go_to(snap_to_page + 1, 'inertia');
+						} else {
+							$this.animate({
+								'top': pos
+							}, Math.abs(speed.y * settings.inertia), 'inertia');
+						}
+						
+					} else {
+						
+						var pos = init_pos.left + delta.x + speed.x * settings.inertia;
+						//check if the user hasn't dragged over the end..
+						if(pos < ((-1) * properties.width * (cells.pages - 1))){
+							pos = (-1) * properties.width * (cells.pages - 1);
+						} else if(pos > 0){
+							pos = 0;
+						}
+						
+						//if the pages are being displayed, we want to snap to the specific page
+						if(settings.pages){
+							var snap_to_page = Math.round((- pos) / properties.width);
+							methods.go_to(snap_to_page + 1, 'inertia');
+						} else {
+							$this.animate({
+								'left': pos
+							}, Math.abs(speed.x * settings.inertia), 'inertia');
+						}
+						
+					}
+				});
+				
+			});
+			
+			
+			try {
+				//And here we do basically the same again to bind swiping on mobile devices like iPhone, iPad, android, etc
+				var tinit_pos, tclick, tdelta;
+				var tmove_event = new Array();
+				
+				var touchmove = function(tmove){
+					
+					tmove.preventDefault();
+					var date = new Date();
+					var this_event = {
+						'time': date.getTime(),
+						'x': tmove.touches[0].pageX,
+						'y': tmove.touches[0].pageY
+					};
+					
+					
+					//I want to get the average of the last 6 mousemove events before mouseup
+					while(tmove_event.length > 4){
+						tmove_event.shift();
+					}
+					
+					if(settings.direction == 'vertical'){
+						tdelta.y = tmove.touches[0].pageY - tclick.y;
+						//$this.css('top', tinit_pos.top + tdelta.y);
+						$this.css('-webkit-transform', 'translate3d(0px, ' + (tinit_pos + tdelta.y) + 'px, 0px)');
+					} else {
+						tdelta.x = tmove.touches[0].pageX - tclick.x;
+						//$this.css('left', tinit_pos.left + tdelta.x);
+						$this.css('-webkit-transform', 'translate3d(' + (tinit_pos + tdelta.x) + 'px, 0px, 0px)');
+					}
+					tmove_event.push(this_event);
+					
+				};
+				
+				var touchend = function(tend){
+					
+					//tend.preventDefault();
+					document.removeEventListener('touchmove', touchmove, false);
+					document.removeEventListener('touchend', touchend, false);
+					
+					var date = new Date();
+					
+					var delta_start = tmove_event[0];
+					//alert(tend.touches[0].pageX);
+					
+					var delta_end = tmove_event[tmove_event.length-1];
+					
+					var event_delta = {
+						'time': (delta_end.time - delta_start.time),
+						'x': (delta_end.x - delta_start.x),
+						'y': (delta_end.y - delta_start.y)
+					};
+					var speed = {
+						'x': event_delta.x/event_delta.time,
+						'y': event_delta.y/event_delta.time
+					};
+					//alert('speed_x: ' + speed.x + '\nspeed_y: ' + speed.y);
+					
+					//And now we can animate the list with the appropriate distance and speed
+					
+					if(settings.direction == 'vertical'){
+						
+						if(isNaN(speed.y)){
+							speed.y = 2;
+						}
+						$this.css({
+							'-webkit-transition-duration': Math.abs(speed.y * settings.inertia * 3) + 'ms',
+							'-webkit-transition-timing-function': 'ease-out'
+						});
+						
+						var pos = tinit_pos + tdelta.y + speed.y * settings.inertia;
+						//check if the user hasn't dragged over the end..
+						if(pos < ((-1) * properties.height * (cells.pages - 1))){
+							pos = (-1) * properties.height * (cells.pages - 1);
+						} else if(pos > 0){
+							pos = 0;
+						}
+						
+						//if the pages are being displayed, we want to snap to the specific page
+						if(settings.pages){
+							var snap_to_page = Math.round((- pos) / properties.height);
+							methods.go_to(snap_to_page + 1, 'inertia', true);
+						} else {
+							$this.css('-webkit-transform', 'translate3d(0px, ' + pos + 'px, 0px)');
+							$this.data('ppos', pos);
+						}
+					} else {
+						//alert('init pos: ' + tinit_pos + '\ndelta x: ' + tdelta.x + '\nspeed: ' + speed.x);
+						//if user swipes very fast, sometimes not enough touchmove events get caught, and speed is NaN
+						if(isNaN(speed.x)){
+							speed.x = 2;
+						}
+						
+						$this.css({
+							'-webkit-transition-duration': Math.abs(speed.y * settings.inertia * 3) + 'ms',
+							'-webkit-transition-timing-function': 'ease-out'
+						});
+						
+						var pos = tinit_pos + tdelta.x + speed.x * settings.inertia;
+						//check if the user hasn't dragged over the end..
+						if(pos < ((-1) * properties.width * (cells.pages - 1))){
+							pos = (-1) * properties.width * (cells.pages - 1);
+						} else if(pos > 0){
+							pos = 0;
+						}
+						
+						//if the pages are being displayed, we want to snap to the specific page
+						if(settings.pages){
+							var snap_to_page = Math.round((- pos) / properties.width);
+							methods.go_to(snap_to_page + 1, 'inertia', true);
+						} else {
+							
+							$this.css('-webkit-transform', 'translate3d(' + pos + 'px, 0px, 0px)');
+							$this.data('ppos', pos);
+							//alert(pos);
+						}
+						
+					}
+					
+					
+				};
+				
+				
+				//touch start event
+				$this[0].addEventListener('touchstart', function(tstart){
+					//alert('touchstart');
+					//disable the mouse events
+					$this.unbind('.promptumenu');
+					
+					//tstart.preventDefault();
+					
+					$this.stop(true, false);
+					$this.css({
+						'-webkit-transition-duration': '0ms'
+					});
+					
+					var date = new Date();
+					
+					tinit_pos = $this.data('ppos');
+					tclick = {
+						'x': tstart.touches[0].pageX,
+						'y': tstart.touches[0].pageY,
+						'time': date.getTime()
+					};
+					tdelta = {
+						'x': 0,
+						'y': 0
+					};
+					tmove_event = new Array();
+					
+					//and we can now bind the touch move event
+					document.addEventListener('touchmove', touchmove, false);
+					
+					//and the touch end event
+					document.addEventListener('touchend', touchend, false);
+					document.addEventListener('touchcancel', touchend, false);
+				}, false);
+			} catch(error) {
+				//apparently this browser wont support swiping
+				//alert(error);
+			}
+		}
+	});
+
+  };
+})( jQuery );
+//Easing for inertia when dragging
+jQuery.extend(jQuery.easing, {
+	inertia: function (x, t, b, c, d) {
+		return c*((t=t/d-1)*t*t + 1) + b;
+	}
+});
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/promptumenu/pagelink.png b/pluss-manage-page/src/main/resources/static/resources/auth/promptumenu/pagelink.png
new file mode 100644
index 0000000..cd7f80b
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/promptumenu/pagelink.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/promptumenu/promptumenu.css b/pluss-manage-page/src/main/resources/static/resources/auth/promptumenu/promptumenu.css
new file mode 100644
index 0000000..69a123b
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/promptumenu/promptumenu.css
@@ -0,0 +1,32 @@
+.promptumenu_nav{
+	z-index: 5;
+	position: absolute;
+	bottom:5px;
+	left: 50%;
+	margin-right: -50%;
+}
+.promptumenu_window{
+	cursor: url(hand.ico), move;
+	background: #EEE;
+	border: solid 5px #666;
+	border-radius: 15px;
+	-webkit-border-radius: 15px;
+	margin: 10px;
+	position: relative;
+}
+.promptumenu_nav a{
+	cursor: pointer;
+	width: 20px;
+	height: 20px;
+	text-indent: -9999px;
+	outline: none;
+	background: url(pagelink.png) 0 -20px no-repeat;
+	display: block;
+	float: left;
+	position: relative;
+	left: -50%;
+	margin: 0 2px;
+}
+.promptumenu_nav a.active{
+	background: url(pagelink.png) 0 0 no-repeat;
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/upload/jquery.form.js b/pluss-manage-page/src/main/resources/static/resources/auth/upload/jquery.form.js
new file mode 100644
index 0000000..a8075ee
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/upload/jquery.form.js
@@ -0,0 +1,911 @@
+/*!
+ * jQuery Form Plugin
+ * version: 2.83 (11-JUL-2011)
+ * @requires jQuery v1.3.2 or later
+ *
+ * Examples and documentation at: http://malsup.com/jquery/form/
+ * Dual licensed under the MIT and GPL licenses:
+ *   http://www.opensource.org/licenses/mit-license.php
+ *   http://www.gnu.org/licenses/gpl.html
+ */
+;(function($) {
+
+/*
+	Usage Note:
+	-----------
+	Do not use both ajaxSubmit and ajaxForm on the same form.  These
+	functions are intended to be exclusive.  Use ajaxSubmit if you want
+	to bind your own submit handler to the form.  For example,
+
+	$(document).ready(function() {
+		$('#myForm').bind('submit', function(e) {
+			e.preventDefault(); // <-- important
+			$(this).ajaxSubmit({
+				target: '#output'
+			});
+		});
+	});
+
+	Use ajaxForm when you want the plugin to manage all the event binding
+	for you.  For example,
+
+	$(document).ready(function() {
+		$('#myForm').ajaxForm({
+			target: '#output'
+		});
+	});
+
+	When using ajaxForm, the ajaxSubmit function will be invoked for you
+	at the appropriate time.
+*/
+
+/**
+ * ajaxSubmit() provides a mechanism for immediately submitting
+ * an HTML form using AJAX.
+ */
+$.fn.ajaxSubmit = function(options) {
+	// fast fail if nothing selected (http://dev.jquery.com/ticket/2752)
+	if (!this.length) {
+		log('ajaxSubmit: skipping submit process - no element selected');
+		return this;
+	}
+	
+	var method, action, url, $form = this;
+
+	if (typeof options == 'function') {
+		options = { success: options };
+	}
+
+	method = this.attr('method');
+	action = this.attr('action');
+	url = (typeof action === 'string') ? $.trim(action) : '';
+	url = url || window.location.href || '';
+	if (url) {
+		// clean url (don't include hash vaue)
+		url = (url.match(/^([^#]+)/)||[])[1];
+	}
+
+	options = $.extend(true, {
+		url:  url,
+		success: $.ajaxSettings.success,
+		type: method || 'GET',
+		iframeSrc: /^https/i.test(window.location.href || '') ? 'javascript:false' : 'about:blank'
+	}, options);
+
+	// hook for manipulating the form data before it is extracted;
+	// convenient for use with rich editors like tinyMCE or FCKEditor
+	var veto = {};
+	this.trigger('form-pre-serialize', [this, options, veto]);
+	if (veto.veto) {
+		log('ajaxSubmit: submit vetoed via form-pre-serialize trigger');
+		return this;
+	}
+
+	// provide opportunity to alter form data before it is serialized
+	if (options.beforeSerialize && options.beforeSerialize(this, options) === false) {
+		log('ajaxSubmit: submit aborted via beforeSerialize callback');
+		return this;
+	}
+
+	var n,v,a = this.formToArray(options.semantic);
+	if (options.data) {
+		options.extraData = options.data;
+		for (n in options.data) {
+			if(options.data[n] instanceof Array) {
+				for (var k in options.data[n]) {
+					a.push( { name: n, value: options.data[n][k] } );
+				}
+			}
+			else {
+				v = options.data[n];
+				v = $.isFunction(v) ? v() : v; // if value is fn, invoke it
+				a.push( { name: n, value: v } );
+			}
+		}
+	}
+
+	// give pre-submit callback an opportunity to abort the submit
+	if (options.beforeSubmit && options.beforeSubmit(a, this, options) === false) {
+		log('ajaxSubmit: submit aborted via beforeSubmit callback');
+		return this;
+	}
+
+	// fire vetoable 'validate' event
+	this.trigger('form-submit-validate', [a, this, options, veto]);
+	if (veto.veto) {
+		log('ajaxSubmit: submit vetoed via form-submit-validate trigger');
+		return this;
+	}
+
+	var q = $.param(a);
+
+	if (options.type.toUpperCase() == 'GET') {
+		options.url += (options.url.indexOf('?') >= 0 ? '&' : '?') + q;
+		options.data = null;  // data is null for 'get'
+	}
+	else {
+		options.data = q; // data is the query string for 'post'
+	}
+
+	var callbacks = [];
+	if (options.resetForm) {
+		callbacks.push(function() { $form.resetForm(); });
+	}
+	if (options.clearForm) {
+		callbacks.push(function() { $form.clearForm(); });
+	}
+
+	// perform a load on the target only if dataType is not provided
+	if (!options.dataType && options.target) {
+		var oldSuccess = options.success || function(){};
+		callbacks.push(function(data) {
+			var fn = options.replaceTarget ? 'replaceWith' : 'html';
+			$(options.target)[fn](data).each(oldSuccess, arguments);
+		});
+	}
+	else if (options.success) {
+		callbacks.push(options.success);
+	}
+
+	options.success = function(data, status, xhr) { // jQuery 1.4+ passes xhr as 3rd arg
+		var context = options.context || options;   // jQuery 1.4+ supports scope context 
+		for (var i=0, max=callbacks.length; i < max; i++) {
+			callbacks[i].apply(context, [data, status, xhr || $form, $form]);
+		}
+	};
+
+	// are there files to upload?
+	var fileInputs = $('input:file', this).length > 0;
+	var mp = 'multipart/form-data';
+	var multipart = ($form.attr('enctype') == mp || $form.attr('encoding') == mp);
+
+	// options.iframe allows user to force iframe mode
+	// 06-NOV-09: now defaulting to iframe mode if file input is detected
+   if (options.iframe !== false && (fileInputs || options.iframe || multipart)) {
+	   // hack to fix Safari hang (thanks to Tim Molendijk for this)
+	   // see:  http://groups.google.com/group/jquery-dev/browse_thread/thread/36395b7ab510dd5d
+	   if (options.closeKeepAlive) {
+		   $.get(options.closeKeepAlive, function() { fileUpload(a); });
+		}
+	   else {
+		   fileUpload(a);
+		}
+   }
+   else {
+		// IE7 massage (see issue 57)
+		if ($.browser.msie && method == 'get') { 
+			var ieMeth = $form[0].getAttribute('method');
+			if (typeof ieMeth === 'string')
+				options.type = ieMeth;
+		}
+		$.ajax(options);
+   }
+
+	// fire 'notify' event
+	this.trigger('form-submit-notify', [this, options]);
+	return this;
+
+
+	// private function for handling file uploads (hat tip to YAHOO!)
+	function fileUpload(a) {
+		var form = $form[0], el, i, s, g, id, $io, io, xhr, sub, n, timedOut, timeoutHandle;
+        var useProp = !!$.fn.prop;
+
+        if (a) {
+        	// ensure that every serialized input is still enabled
+          	for (i=0; i < a.length; i++) {
+                el = $(form[a[i].name]);
+                el[ useProp ? 'prop' : 'attr' ]('disabled', false);
+          	}
+        }
+
+		if ($(':input[name=submit],:input[id=submit]', form).length) {
+			// if there is an input with a name or id of 'submit' then we won't be
+			// able to invoke the submit fn on the form (at least not x-browser)
+			alert('Error: Form elements must not have name or id of "submit".');
+			return;
+		}
+		
+		s = $.extend(true, {}, $.ajaxSettings, options);
+		s.context = s.context || s;
+		id = 'jqFormIO' + (new Date().getTime());
+		if (s.iframeTarget) {
+			$io = $(s.iframeTarget);
+			n = $io.attr('name');
+			if (n == null)
+			 	$io.attr('name', id);
+			else
+				id = n;
+		}
+		else {
+			$io = $('<iframe name="' + id + '" src="'+ s.iframeSrc +'" />');
+			$io.css({ position: 'absolute', top: '-1000px', left: '-1000px' });
+		}
+		io = $io[0];
+
+
+		xhr = { // mock object
+			aborted: 0,
+			responseText: null,
+			responseXML: null,
+			status: 0,
+			statusText: 'n/a',
+			getAllResponseHeaders: function() {},
+			getResponseHeader: function() {},
+			setRequestHeader: function() {},
+			abort: function(status) {
+				var e = (status === 'timeout' ? 'timeout' : 'aborted');
+				log('aborting upload... ' + e);
+				this.aborted = 1;
+				$io.attr('src', s.iframeSrc); // abort op in progress
+				xhr.error = e;
+				s.error && s.error.call(s.context, xhr, e, status);
+				g && $.event.trigger("ajaxError", [xhr, s, e]);
+				s.complete && s.complete.call(s.context, xhr, e);
+			}
+		};
+
+		g = s.global;
+		// trigger ajax global events so that activity/block indicators work like normal
+		if (g && ! $.active++) {
+			$.event.trigger("ajaxStart");
+		}
+		if (g) {
+			$.event.trigger("ajaxSend", [xhr, s]);
+		}
+
+		if (s.beforeSend && s.beforeSend.call(s.context, xhr, s) === false) {
+			if (s.global) {
+				$.active--;
+			}
+			return;
+		}
+		if (xhr.aborted) {
+			return;
+		}
+
+		// add submitting element to data if we know it
+		sub = form.clk;
+		if (sub) {
+			n = sub.name;
+			if (n && !sub.disabled) {
+				s.extraData = s.extraData || {};
+				s.extraData[n] = sub.value;
+				if (sub.type == "image") {
+					s.extraData[n+'.x'] = form.clk_x;
+					s.extraData[n+'.y'] = form.clk_y;
+				}
+			}
+		}
+		
+		var CLIENT_TIMEOUT_ABORT = 1;
+		var SERVER_ABORT = 2;
+
+		function getDoc(frame) {
+			var doc = frame.contentWindow ? frame.contentWindow.document : frame.contentDocument ? frame.contentDocument : frame.document;
+			return doc;
+		}
+		
+		// take a breath so that pending repaints get some cpu time before the upload starts
+		function doSubmit() {
+			// make sure form attrs are set
+			var t = $form.attr('target'), a = $form.attr('action');
+
+			// update form attrs in IE friendly way
+			form.setAttribute('target',id);
+			if (!method) {
+				form.setAttribute('method', 'POST');
+			}
+			if (a != s.url) {
+				form.setAttribute('action', s.url);
+			}
+
+			// ie borks in some cases when setting encoding
+			if (! s.skipEncodingOverride && (!method || /post/i.test(method))) {
+				$form.attr({
+					encoding: 'multipart/form-data',
+					enctype:  'multipart/form-data'
+				});
+			}
+
+			// support timout
+			if (s.timeout) {
+				timeoutHandle = setTimeout(function() { timedOut = true; cb(CLIENT_TIMEOUT_ABORT); }, s.timeout);
+			}
+			
+			// look for server aborts
+			function checkState() {
+				try {
+					var state = getDoc(io).readyState;
+					log('state = ' + state);
+					if (state.toLowerCase() == 'uninitialized')
+						setTimeout(checkState,50);
+				}
+				catch(e) {
+					log('Server abort: ' , e, ' (', e.name, ')');
+					cb(SERVER_ABORT);
+					timeoutHandle && clearTimeout(timeoutHandle);
+					timeoutHandle = undefined;
+				}
+			}
+
+			// add "extra" data to form if provided in options
+			var extraInputs = [];
+			try {
+				if (s.extraData) {
+					for (var n in s.extraData) {
+						extraInputs.push(
+							$('<input type="hidden" name="'+n+'" />').attr('value',s.extraData[n])
+								.appendTo(form)[0]);
+					}
+				}
+
+				if (!s.iframeTarget) {
+					// add iframe to doc and submit the form
+					$io.appendTo('body');
+	                io.attachEvent ? io.attachEvent('onload', cb) : io.addEventListener('load', cb, false);
+				}
+				setTimeout(checkState,15);
+				form.submit();
+			}
+			finally {
+				// reset attrs and remove "extra" input elements
+				form.setAttribute('action',a);
+				if(t) {
+					form.setAttribute('target', t);
+				} else {
+					$form.removeAttr('target');
+				}
+				$(extraInputs).remove();
+			}
+		}
+
+		if (s.forceSync) {
+			doSubmit();
+		}
+		else {
+			setTimeout(doSubmit, 10); // this lets dom updates render
+		}
+
+		var data, doc, domCheckCount = 50, callbackProcessed;
+
+		function cb(e) {
+			if (xhr.aborted || callbackProcessed) {
+				return;
+			}
+			try {
+				doc = getDoc(io);
+			}
+			catch(ex) {
+				log('cannot access response document: ', ex);
+				e = SERVER_ABORT;
+			}
+			if (e === CLIENT_TIMEOUT_ABORT && xhr) {
+				xhr.abort('timeout');
+				return;
+			}
+			else if (e == SERVER_ABORT && xhr) {
+				xhr.abort('server abort');
+				return;
+			}
+
+			if (!doc || doc.location.href == s.iframeSrc) {
+				// response not received yet
+				if (!timedOut)
+					return;
+			}
+            io.detachEvent ? io.detachEvent('onload', cb) : io.removeEventListener('load', cb, false);
+
+			var status = 'success', errMsg;
+			try {
+				if (timedOut) {
+					throw 'timeout';
+				}
+
+				var isXml = s.dataType == 'xml' || doc.XMLDocument || $.isXMLDoc(doc);
+				log('isXml='+isXml);
+				if (!isXml && window.opera && (doc.body == null || doc.body.innerHTML == '')) {
+					if (--domCheckCount) {
+						// in some browsers (Opera) the iframe DOM is not always traversable when
+						// the onload callback fires, so we loop a bit to accommodate
+						log('requeing onLoad callback, DOM not available');
+						setTimeout(cb, 250);
+						return;
+					}
+					// let this fall through because server response could be an empty document
+					//log('Could not access iframe DOM after mutiple tries.');
+					//throw 'DOMException: not available';
+				}
+
+				//log('response detected');
+                var docRoot = doc.body ? doc.body : doc.documentElement;
+                xhr.responseText = docRoot ? docRoot.innerHTML : null;
+				xhr.responseXML = doc.XMLDocument ? doc.XMLDocument : doc;
+				if (isXml)
+					s.dataType = 'xml';
+				xhr.getResponseHeader = function(header){
+					var headers = {'content-type': s.dataType};
+					return headers[header];
+				};
+                // support for XHR 'status' & 'statusText' emulation :
+                if (docRoot) {
+                    xhr.status = Number( docRoot.getAttribute('status') ) || xhr.status;
+                    xhr.statusText = docRoot.getAttribute('statusText') || xhr.statusText;
+                }
+
+				var dt = s.dataType || '';
+				var scr = /(json|script|text)/.test(dt.toLowerCase());
+				if (scr || s.textarea) {
+					// see if user embedded response in textarea
+					var ta = doc.getElementsByTagName('textarea')[0];
+					if (ta) {
+						xhr.responseText = ta.value;
+                        // support for XHR 'status' & 'statusText' emulation :
+                        xhr.status = Number( ta.getAttribute('status') ) || xhr.status;
+                        xhr.statusText = ta.getAttribute('statusText') || xhr.statusText;
+					}
+					else if (scr) {
+						// account for browsers injecting pre around json response
+						var pre = doc.getElementsByTagName('pre')[0];
+						var b = doc.getElementsByTagName('body')[0];
+						if (pre) {
+							xhr.responseText = pre.textContent ? pre.textContent : pre.innerHTML;
+						}
+						else if (b) {
+							xhr.responseText = b.innerHTML;
+						}
+					}
+				}
+				else if (s.dataType == 'xml' && !xhr.responseXML && xhr.responseText != null) {
+					xhr.responseXML = toXml(xhr.responseText);
+				}
+
+                try {
+                    data = httpData(xhr, s.dataType, s);
+                }
+                catch (e) {
+                    status = 'parsererror';
+                    xhr.error = errMsg = (e || status);
+                }
+			}
+			catch (e) {
+				log('error caught: ',e);
+				status = 'error';
+                xhr.error = errMsg = (e || status);
+			}
+
+			if (xhr.aborted) {
+				log('upload aborted');
+				status = null;
+			}
+
+            if (xhr.status) { // we've set xhr.status
+                status = (xhr.status >= 200 && xhr.status < 300 || xhr.status === 304) ? 'success' : 'error';
+            }
+
+			// ordering of these callbacks/triggers is odd, but that's how $.ajax does it
+			if (status === 'success') {
+				s.success && s.success.call(s.context, data, 'success', xhr);
+				g && $.event.trigger("ajaxSuccess", [xhr, s]);
+			}
+            else if (status) {
+				if (errMsg == undefined)
+					errMsg = xhr.statusText;
+				s.error && s.error.call(s.context, xhr, status, errMsg);
+				g && $.event.trigger("ajaxError", [xhr, s, errMsg]);
+            }
+
+			g && $.event.trigger("ajaxComplete", [xhr, s]);
+
+			if (g && ! --$.active) {
+				$.event.trigger("ajaxStop");
+			}
+
+			s.complete && s.complete.call(s.context, xhr, status);
+
+			callbackProcessed = true;
+			if (s.timeout)
+				clearTimeout(timeoutHandle);
+
+			// clean up
+			setTimeout(function() {
+				if (!s.iframeTarget)
+					$io.remove();
+				xhr.responseXML = null;
+			}, 100);
+		}
+
+		var toXml = $.parseXML || function(s, doc) { // use parseXML if available (jQuery 1.5+)
+			if (window.ActiveXObject) {
+				doc = new ActiveXObject('Microsoft.XMLDOM');
+				doc.async = 'false';
+				doc.loadXML(s);
+			}
+			else {
+				doc = (new DOMParser()).parseFromString(s, 'text/xml');
+			}
+			return (doc && doc.documentElement && doc.documentElement.nodeName != 'parsererror') ? doc : null;
+		};
+		var parseJSON = $.parseJSON || function(s) {
+			return window['eval']('(' + s + ')');
+		};
+
+		var httpData = function( xhr, type, s ) { // mostly lifted from jq1.4.4
+
+			var ct = xhr.getResponseHeader('content-type') || '',
+				xml = type === 'xml' || !type && ct.indexOf('xml') >= 0,
+				data = xml ? xhr.responseXML : xhr.responseText;
+
+			if (xml && data.documentElement.nodeName === 'parsererror') {
+				$.error && $.error('parsererror');
+			}
+			if (s && s.dataFilter) {
+				data = s.dataFilter(data, type);
+			}
+			if (typeof data === 'string') {
+				if (type === 'json' || !type && ct.indexOf('json') >= 0) {
+					data = parseJSON(data);
+				} else if (type === "script" || !type && ct.indexOf("javascript") >= 0) {
+					$.globalEval(data);
+				}
+			}
+			return data;
+		};
+	}
+};
+
+/**
+ * ajaxForm() provides a mechanism for fully automating form submission.
+ *
+ * The advantages of using this method instead of ajaxSubmit() are:
+ *
+ * 1: This method will include coordinates for <input type="image" /> elements (if the element
+ *	is used to submit the form).
+ * 2. This method will include the submit element's name/value data (for the element that was
+ *	used to submit the form).
+ * 3. This method binds the submit() method to the form for you.
+ *
+ * The options argument for ajaxForm works exactly as it does for ajaxSubmit.  ajaxForm merely
+ * passes the options argument along after properly binding events for submit elements and
+ * the form itself.
+ */
+$.fn.ajaxForm = function(options) {
+	// in jQuery 1.3+ we can fix mistakes with the ready state
+	if (this.length === 0) {
+		var o = { s: this.selector, c: this.context };
+		if (!$.isReady && o.s) {
+			log('DOM not ready, queuing ajaxForm');
+			$(function() {
+				$(o.s,o.c).ajaxForm(options);
+			});
+			return this;
+		}
+		// is your DOM ready?  http://docs.jquery.com/Tutorials:Introducing_$(document).ready()
+		log('terminating; zero elements found by selector' + ($.isReady ? '' : ' (DOM not ready)'));
+		return this;
+	}
+
+	return this.ajaxFormUnbind().bind('submit.form-plugin', function(e) {
+		if (!e.isDefaultPrevented()) { // if event has been canceled, don't proceed
+			e.preventDefault();
+			$(this).ajaxSubmit(options);
+		}
+	}).bind('click.form-plugin', function(e) {
+		var target = e.target;
+		var $el = $(target);
+		if (!($el.is(":submit,input:image"))) {
+			// is this a child element of the submit el?  (ex: a span within a button)
+			var t = $el.closest(':submit');
+			if (t.length == 0) {
+				return;
+			}
+			target = t[0];
+		}
+		var form = this;
+		form.clk = target;
+		if (target.type == 'image') {
+			if (e.offsetX != undefined) {
+				form.clk_x = e.offsetX;
+				form.clk_y = e.offsetY;
+			} else if (typeof $.fn.offset == 'function') { // try to use dimensions plugin
+				var offset = $el.offset();
+				form.clk_x = e.pageX - offset.left;
+				form.clk_y = e.pageY - offset.top;
+			} else {
+				form.clk_x = e.pageX - target.offsetLeft;
+				form.clk_y = e.pageY - target.offsetTop;
+			}
+		}
+		// clear form vars
+		setTimeout(function() { form.clk = form.clk_x = form.clk_y = null; }, 100);
+	});
+};
+
+// ajaxFormUnbind unbinds the event handlers that were bound by ajaxForm
+$.fn.ajaxFormUnbind = function() {
+	return this.unbind('submit.form-plugin click.form-plugin');
+};
+
+/**
+ * formToArray() gathers form element data into an array of objects that can
+ * be passed to any of the following ajax functions: $.get, $.post, or load.
+ * Each object in the array has both a 'name' and 'value' property.  An example of
+ * an array for a simple login form might be:
+ *
+ * [ { name: 'username', value: 'jresig' }, { name: 'password', value: 'secret' } ]
+ *
+ * It is this array that is passed to pre-submit callback functions provided to the
+ * ajaxSubmit() and ajaxForm() methods.
+ */
+$.fn.formToArray = function(semantic) {
+	var a = [];
+	if (this.length === 0) {
+		return a;
+	}
+
+	var form = this[0];
+	var els = semantic ? form.getElementsByTagName('*') : form.elements;
+	if (!els) {
+		return a;
+	}
+
+	var i,j,n,v,el,max,jmax;
+	for(i=0, max=els.length; i < max; i++) {
+		el = els[i];
+		n = el.name;
+		if (!n) {
+			continue;
+		}
+
+		if (semantic && form.clk && el.type == "image") {
+			// handle image inputs on the fly when semantic == true
+			if(!el.disabled && form.clk == el) {
+				a.push({name: n, value: $(el).val()});
+				a.push({name: n+'.x', value: form.clk_x}, {name: n+'.y', value: form.clk_y});
+			}
+			continue;
+		}
+
+		v = $.fieldValue(el, true);
+		if (v && v.constructor == Array) {
+			for(j=0, jmax=v.length; j < jmax; j++) {
+				a.push({name: n, value: v[j]});
+			}
+		}
+		else if (v !== null && typeof v != 'undefined') {
+			a.push({name: n, value: v});
+		}
+	}
+
+	if (!semantic && form.clk) {
+		// input type=='image' are not found in elements array! handle it here
+		var $input = $(form.clk), input = $input[0];
+		n = input.name;
+		if (n && !input.disabled && input.type == 'image') {
+			a.push({name: n, value: $input.val()});
+			a.push({name: n+'.x', value: form.clk_x}, {name: n+'.y', value: form.clk_y});
+		}
+	}
+	return a;
+};
+
+/**
+ * Serializes form data into a 'submittable' string. This method will return a string
+ * in the format: name1=value1&amp;name2=value2
+ */
+$.fn.formSerialize = function(semantic) {
+	//hand off to jQuery.param for proper encoding
+	return $.param(this.formToArray(semantic));
+};
+
+/**
+ * Serializes all field elements in the jQuery object into a query string.
+ * This method will return a string in the format: name1=value1&amp;name2=value2
+ */
+$.fn.fieldSerialize = function(successful) {
+	var a = [];
+	this.each(function() {
+		var n = this.name;
+		if (!n) {
+			return;
+		}
+		var v = $.fieldValue(this, successful);
+		if (v && v.constructor == Array) {
+			for (var i=0,max=v.length; i < max; i++) {
+				a.push({name: n, value: v[i]});
+			}
+		}
+		else if (v !== null && typeof v != 'undefined') {
+			a.push({name: this.name, value: v});
+		}
+	});
+	//hand off to jQuery.param for proper encoding
+	return $.param(a);
+};
+
+/**
+ * Returns the value(s) of the element in the matched set.  For example, consider the following form:
+ *
+ *  <form><fieldset>
+ *	  <input name="A" type="text" />
+ *	  <input name="A" type="text" />
+ *	  <input name="B" type="checkbox" value="B1" />
+ *	  <input name="B" type="checkbox" value="B2"/>
+ *	  <input name="C" type="radio" value="C1" />
+ *	  <input name="C" type="radio" value="C2" />
+ *  </fieldset></form>
+ *
+ *  var v = $(':text').fieldValue();
+ *  // if no values are entered into the text inputs
+ *  v == ['','']
+ *  // if values entered into the text inputs are 'foo' and 'bar'
+ *  v == ['foo','bar']
+ *
+ *  var v = $(':checkbox').fieldValue();
+ *  // if neither checkbox is checked
+ *  v === undefined
+ *  // if both checkboxes are checked
+ *  v == ['B1', 'B2']
+ *
+ *  var v = $(':radio').fieldValue();
+ *  // if neither radio is checked
+ *  v === undefined
+ *  // if first radio is checked
+ *  v == ['C1']
+ *
+ * The successful argument controls whether or not the field element must be 'successful'
+ * (per http://www.w3.org/TR/html4/interact/forms.html#successful-controls).
+ * The default value of the successful argument is true.  If this value is false the value(s)
+ * for each element is returned.
+ *
+ * Note: This method *always* returns an array.  If no valid value can be determined the
+ *	   array will be empty, otherwise it will contain one or more values.
+ */
+$.fn.fieldValue = function(successful) {
+	for (var val=[], i=0, max=this.length; i < max; i++) {
+		var el = this[i];
+		var v = $.fieldValue(el, successful);
+		if (v === null || typeof v == 'undefined' || (v.constructor == Array && !v.length)) {
+			continue;
+		}
+		v.constructor == Array ? $.merge(val, v) : val.push(v);
+	}
+	return val;
+};
+
+/**
+ * Returns the value of the field element.
+ */
+$.fieldValue = function(el, successful) {
+	var n = el.name, t = el.type, tag = el.tagName.toLowerCase();
+	if (successful === undefined) {
+		successful = true;
+	}
+
+	if (successful && (!n || el.disabled || t == 'reset' || t == 'button' ||
+		(t == 'checkbox' || t == 'radio') && !el.checked ||
+		(t == 'submit' || t == 'image') && el.form && el.form.clk != el ||
+		tag == 'select' && el.selectedIndex == -1)) {
+			return null;
+	}
+
+	if (tag == 'select') {
+		var index = el.selectedIndex;
+		if (index < 0) {
+			return null;
+		}
+		var a = [], ops = el.options;
+		var one = (t == 'select-one');
+		var max = (one ? index+1 : ops.length);
+		for(var i=(one ? index : 0); i < max; i++) {
+			var op = ops[i];
+			if (op.selected) {
+				var v = op.value;
+				if (!v) { // extra pain for IE...
+					v = (op.attributes && op.attributes['value'] && !(op.attributes['value'].specified)) ? op.text : op.value;
+				}
+				if (one) {
+					return v;
+				}
+				a.push(v);
+			}
+		}
+		return a;
+	}
+	return $(el).val();
+};
+
+/**
+ * Clears the form data.  Takes the following actions on the form's input fields:
+ *  - input text fields will have their 'value' property set to the empty string
+ *  - select elements will have their 'selectedIndex' property set to -1
+ *  - checkbox and radio inputs will have their 'checked' property set to false
+ *  - inputs of type submit, button, reset, and hidden will *not* be effected
+ *  - button elements will *not* be effected
+ */
+$.fn.clearForm = function() {
+	return this.each(function() {
+		$('input,select,textarea', this).clearFields();
+	});
+};
+
+/**
+ * Clears the selected form elements.
+ */
+$.fn.clearFields = $.fn.clearInputs = function() {
+	var re = /^(?:color|date|datetime|email|month|number|password|range|search|tel|text|time|url|week)$/i; // 'hidden' is not in this list
+	return this.each(function() {
+		var t = this.type, tag = this.tagName.toLowerCase();
+		if (re.test(t) || tag == 'textarea') {
+			this.value = '';
+		}
+		else if (t == 'checkbox' || t == 'radio') {
+			this.checked = false;
+		}
+		else if (tag == 'select') {
+			this.selectedIndex = -1;
+		}
+	});
+};
+
+/**
+ * Resets the form data.  Causes all form elements to be reset to their original value.
+ */
+$.fn.resetForm = function() {
+	return this.each(function() {
+		// guard against an input with the name of 'reset'
+		// note that IE reports the reset function as an 'object'
+		if (typeof this.reset == 'function' || (typeof this.reset == 'object' && !this.reset.nodeType)) {
+			this.reset();
+		}
+	});
+};
+
+/**
+ * Enables or disables any matching elements.
+ */
+$.fn.enable = function(b) {
+	if (b === undefined) {
+		b = true;
+	}
+	return this.each(function() {
+		this.disabled = !b;
+	});
+};
+
+/**
+ * Checks/unchecks any matching checkboxes or radio buttons and
+ * selects/deselects and matching option elements.
+ */
+$.fn.selected = function(select) {
+	if (select === undefined) {
+		select = true;
+	}
+	return this.each(function() {
+		var t = this.type;
+		if (t == 'checkbox' || t == 'radio') {
+			this.checked = select;
+		}
+		else if (this.tagName.toLowerCase() == 'option') {
+			var $sel = $(this).parent('select');
+			if (select && $sel[0] && $sel[0].type == 'select-one') {
+				// deselect all other options
+				$sel.find('option').selected(false);
+			}
+			this.selected = select;
+		}
+	});
+};
+
+// helper fn for console logging
+function log() {
+	var msg = '[jquery.form] ' + Array.prototype.join.call(arguments,'');
+	if (window.console && window.console.log) {
+		window.console.log(msg);
+	}
+	else if (window.opera && window.opera.postError) {
+		window.opera.postError(msg);
+	}
+};
+
+})(jQuery);
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/upload/upload.js b/pluss-manage-page/src/main/resources/static/resources/auth/upload/upload.js
new file mode 100644
index 0000000..c623616
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/upload/upload.js
@@ -0,0 +1,133 @@
+
+var settings={"callback":function(){}};
+/**
+ * 上传组件
+ */
+jQuery.extend({          
+    seocooUpload:function(options,callback) { 
+		//创建form表单
+	 	if(typeof(options.formName)=='undefined'||options.formName==''){
+	 		//删除已有元素
+	 		$('#uploadSImage').remove();
+   	   	 	var form='<form action="" method="post" id="uploadSelfImage" name="uploadSelfImage" enctype="multipart/form-data" encoding="multipart/form-data">';
+   	   	 		form+='<input type="file"  id="imageFile" name="imageFile" style="display:none;"  onchange="uploadSelfImg();"/>';
+   	   	 		form+='<input type="hidden"  id="isPress"  name="isPress" value="0"/>';
+   	   	 		form+='</form>';
+   	   	 	$("body").append(form);
+	   	 }
+	 	var res=jQuery.isFunction(options);
+	 	if(res){
+			callback=options;
+		}
+    	var defaults={"fileName":"imageFile",
+    				  "formName":"uploadSelfImage",
+    				  "formAction":ctx+'/upload!uploadImage.do',
+    				  "callback":callback};
+   	 	 settings= $.extend(defaults,options);  
+   	 	 //设置压缩属性
+   	 	 if(typeof(options.isPress)!='undefined'&&options.isPress!=''){
+   	 		 $('#isPress').val(settings.isPress);
+   	 	 }
+   	 	
+   	 	//触发上传按钮
+   	 	$('#'+settings.fileName).click();
+     }
+}); 
+
+function showFailError(){
+	alert("上传失败");
+}
+
+//上传
+function uploadSelfImg(){
+	
+		var advertImgName =$('#'+settings.fileName).val();
+		if (advertImgName == "" || advertImgName == null) {
+			alert("请选择文件！");
+			return;
+		}
+		var file_name = advertImgName
+				.substring(advertImgName.lastIndexOf("\\") + 1);
+		var filename_atr = advertImgName.substring(
+				advertImgName.lastIndexOf(".") + 1, advertImgName.length);
+		var reg1 = "gif,jpg,jpeg,png,bmp,GIF,JPG,JPEG,PNG,BMP";
+		if ((reg1.indexOf(filename_atr) < 0)) {
+			alert("请选择gif,jpg,jpeg,png,bmp格式的图片文件！");
+			//$('#file').val('');
+			$('#'+settings.fileName).val('');
+			return;
+		}
+		//获取上传图片的大小(B)
+		var imge=document.getElementById(settings.fileName);
+		//超过1M的图片时
+		if(imge.files.item(0).size>1048576){
+			//$('#'+settings.fileName).val('');
+			alert("图片太大，请上传小于1M的图片！");
+			return;
+		}
+		var options = {
+		      dataType : "json",
+		      async: false,
+		      data :{
+		    	  'filename_atr': filename_atr
+		    	  //'isPress':$('#isPress').val()
+		      },
+		      success :settings.callback,
+		      error:showFailError,
+		      timeout: 30000      //限制请求的时间，当请求大于3秒后，跳出请求
+		  };
+		$('#'+settings.formName).attr('action',settings.formAction);
+		jQuery('#'+settings.formName).ajaxSubmit(options);
+		$('#'+settings.formName).attr('action','');
+}
+
+
+/**
+ * 上传组件
+ */
+/*jQuery.extend({          
+    seocooUpload:function(options,callback) { 
+    	var res=jQuery.isFunction(options);
+		if(res){
+			callback=options;
+		}
+    	var defaults={"fileName":"imageFile",
+    				  "formName":"uploadImage",
+    				  "formAction":ctx+'/upload!uploadImage.do'};
+   	 	var settings= $.extend(options,defaults);  
+   	 	//上传
+   		var advertImgName =$('#'+settings.fileName).val();
+   		if (advertImgName == "" || advertImgName == null) {
+   			alert("请选择文件！");
+   			return;
+   		}
+   		var file_name = advertImgName
+   				.substring(advertImgName.lastIndexOf("\\") + 1);
+   		var filename_atr = advertImgName.substring(
+   				advertImgName.lastIndexOf(".") + 1, advertImgName.length);
+   		var reg1 = "gif,jpg,jpeg,png,bmp,GIF,JPG,JPEG,PNG,BMP";
+   		if ((reg1.indexOf(filename_atr) < 0)) {
+   			alert("请选择gif,jpg,jpeg,png,bmp格式的图片文件！");
+   			$('#file').val('');
+   			return;
+   		}
+   		var options = {
+   		      dataType : "json",
+   		      async: false,
+   		      data :{
+   		    	  'filename_atr': filename_atr
+   		      },
+   		      success :callback,
+   		      error:showFailError,
+   		      timeout: 30000      //限制请求的时间，当请求大于3秒后，跳出请求
+   		  };
+   		$('#'+settings.formName).attr('action',settings.formAction);
+   		jQuery('#'+settings.formName).ajaxSubmit(options);
+   		$('#'+settings.formName).attr('action','');
+     }
+}); 
+
+function showFailError(){
+	alert("上传失败");
+}*/
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/uploadify/jquery.uploadify.js b/pluss-manage-page/src/main/resources/static/resources/auth/uploadify/jquery.uploadify.js
new file mode 100644
index 0000000..777d73b
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/uploadify/jquery.uploadify.js
@@ -0,0 +1,986 @@
+/*
+SWFObject v2.2 <http://code.google.com/p/swfobject/> 
+is released under the MIT License <http://www.opensource.org/licenses/mit-license.php> 
+*/
+;var swfobject=function(){var D="undefined",r="object",S="Shockwave Flash",W="ShockwaveFlash.ShockwaveFlash",q="application/x-shockwave-flash",R="SWFObjectExprInst",x="onreadystatechange",O=window,j=document,t=navigator,T=false,U=[h],o=[],N=[],I=[],l,Q,E,B,J=false,a=false,n,G,m=true,M=function(){var aa=typeof j.getElementById!=D&&typeof j.getElementsByTagName!=D&&typeof j.createElement!=D,ah=t.userAgent.toLowerCase(),Y=t.platform.toLowerCase(),ae=Y?/win/.test(Y):/win/.test(ah),ac=Y?/mac/.test(Y):/mac/.test(ah),af=/webkit/.test(ah)?parseFloat(ah.replace(/^.*webkit\/(\d+(\.\d+)?).*$/,"$1")):false,X=!+"\v1",ag=[0,0,0],ab=null;
+if(typeof t.plugins!=D&&typeof t.plugins[S]==r){ab=t.plugins[S].description;if(ab&&!(typeof t.mimeTypes!=D&&t.mimeTypes[q]&&!t.mimeTypes[q].enabledPlugin)){T=true;
+X=false;ab=ab.replace(/^.*\s+(\S+\s+\S+$)/,"$1");ag[0]=parseInt(ab.replace(/^(.*)\..*$/,"$1"),10);ag[1]=parseInt(ab.replace(/^.*\.(.*)\s.*$/,"$1"),10);
+ag[2]=/[a-zA-Z]/.test(ab)?parseInt(ab.replace(/^.*[a-zA-Z]+(.*)$/,"$1"),10):0;}}else{if(typeof O.ActiveXObject!=D){try{var ad=new ActiveXObject(W);if(ad){ab=ad.GetVariable("$version");
+if(ab){X=true;ab=ab.split(" ")[1].split(",");ag=[parseInt(ab[0],10),parseInt(ab[1],10),parseInt(ab[2],10)];}}}catch(Z){}}}return{w3:aa,pv:ag,wk:af,ie:X,win:ae,mac:ac};
+}(),k=function(){if(!M.w3){return;}if((typeof j.readyState!=D&&j.readyState=="complete")||(typeof j.readyState==D&&(j.getElementsByTagName("body")[0]||j.body))){f();
+}if(!J){if(typeof j.addEventListener!=D){j.addEventListener("DOMContentLoaded",f,false);}if(M.ie&&M.win){j.attachEvent(x,function(){if(j.readyState=="complete"){j.detachEvent(x,arguments.callee);
+f();}});if(O==top){(function(){if(J){return;}try{j.documentElement.doScroll("left");}catch(X){setTimeout(arguments.callee,0);return;}f();})();}}if(M.wk){(function(){if(J){return;
+}if(!/loaded|complete/.test(j.readyState)){setTimeout(arguments.callee,0);return;}f();})();}s(f);}}();function f(){if(J){return;}try{var Z=j.getElementsByTagName("body")[0].appendChild(C("span"));
+Z.parentNode.removeChild(Z);}catch(aa){return;}J=true;var X=U.length;for(var Y=0;Y<X;Y++){U[Y]();}}function K(X){if(J){X();}else{U[U.length]=X;}}function s(Y){if(typeof O.addEventListener!=D){O.addEventListener("load",Y,false);
+}else{if(typeof j.addEventListener!=D){j.addEventListener("load",Y,false);}else{if(typeof O.attachEvent!=D){i(O,"onload",Y);}else{if(typeof O.onload=="function"){var X=O.onload;
+O.onload=function(){X();Y();};}else{O.onload=Y;}}}}}function h(){if(T){V();}else{H();}}function V(){var X=j.getElementsByTagName("body")[0];var aa=C(r);
+aa.setAttribute("type",q);var Z=X.appendChild(aa);if(Z){var Y=0;(function(){if(typeof Z.GetVariable!=D){var ab=Z.GetVariable("$version");if(ab){ab=ab.split(" ")[1].split(",");
+M.pv=[parseInt(ab[0],10),parseInt(ab[1],10),parseInt(ab[2],10)];}}else{if(Y<10){Y++;setTimeout(arguments.callee,10);return;}}X.removeChild(aa);Z=null;H();
+})();}else{H();}}function H(){var ag=o.length;if(ag>0){for(var af=0;af<ag;af++){var Y=o[af].id;var ab=o[af].callbackFn;var aa={success:false,id:Y};if(M.pv[0]>0){var ae=c(Y);
+if(ae){if(F(o[af].swfVersion)&&!(M.wk&&M.wk<312)){w(Y,true);if(ab){aa.success=true;aa.ref=z(Y);ab(aa);}}else{if(o[af].expressInstall&&A()){var ai={};ai.data=o[af].expressInstall;
+ai.width=ae.getAttribute("width")||"0";ai.height=ae.getAttribute("height")||"0";if(ae.getAttribute("class")){ai.styleclass=ae.getAttribute("class");}if(ae.getAttribute("align")){ai.align=ae.getAttribute("align");
+}var ah={};var X=ae.getElementsByTagName("param");var ac=X.length;for(var ad=0;ad<ac;ad++){if(X[ad].getAttribute("name").toLowerCase()!="movie"){ah[X[ad].getAttribute("name")]=X[ad].getAttribute("value");
+}}P(ai,ah,Y,ab);}else{p(ae);if(ab){ab(aa);}}}}}else{w(Y,true);if(ab){var Z=z(Y);if(Z&&typeof Z.SetVariable!=D){aa.success=true;aa.ref=Z;}ab(aa);}}}}}function z(aa){var X=null;
+var Y=c(aa);if(Y&&Y.nodeName=="OBJECT"){if(typeof Y.SetVariable!=D){X=Y;}else{var Z=Y.getElementsByTagName(r)[0];if(Z){X=Z;}}}return X;}function A(){return !a&&F("6.0.65")&&(M.win||M.mac)&&!(M.wk&&M.wk<312);
+}function P(aa,ab,X,Z){a=true;E=Z||null;B={success:false,id:X};var ae=c(X);if(ae){if(ae.nodeName=="OBJECT"){l=g(ae);Q=null;}else{l=ae;Q=X;}aa.id=R;if(typeof aa.width==D||(!/%$/.test(aa.width)&&parseInt(aa.width,10)<310)){aa.width="310";
+}if(typeof aa.height==D||(!/%$/.test(aa.height)&&parseInt(aa.height,10)<137)){aa.height="137";}j.title=j.title.slice(0,47)+" - Flash Player Installation";
+var ad=M.ie&&M.win?"ActiveX":"PlugIn",ac="MMredirectURL="+O.location.toString().replace(/&/g,"%26")+"&MMplayerType="+ad+"&MMdoctitle="+j.title;if(typeof ab.flashvars!=D){ab.flashvars+="&"+ac;
+}else{ab.flashvars=ac;}if(M.ie&&M.win&&ae.readyState!=4){var Y=C("div");X+="SWFObjectNew";Y.setAttribute("id",X);ae.parentNode.insertBefore(Y,ae);ae.style.display="none";
+(function(){if(ae.readyState==4){ae.parentNode.removeChild(ae);}else{setTimeout(arguments.callee,10);}})();}u(aa,ab,X);}}function p(Y){if(M.ie&&M.win&&Y.readyState!=4){var X=C("div");
+Y.parentNode.insertBefore(X,Y);X.parentNode.replaceChild(g(Y),X);Y.style.display="none";(function(){if(Y.readyState==4){Y.parentNode.removeChild(Y);}else{setTimeout(arguments.callee,10);
+}})();}else{Y.parentNode.replaceChild(g(Y),Y);}}function g(ab){var aa=C("div");if(M.win&&M.ie){aa.innerHTML=ab.innerHTML;}else{var Y=ab.getElementsByTagName(r)[0];
+if(Y){var ad=Y.childNodes;if(ad){var X=ad.length;for(var Z=0;Z<X;Z++){if(!(ad[Z].nodeType==1&&ad[Z].nodeName=="PARAM")&&!(ad[Z].nodeType==8)){aa.appendChild(ad[Z].cloneNode(true));
+}}}}}return aa;}function u(ai,ag,Y){var X,aa=c(Y);if(M.wk&&M.wk<312){return X;}if(aa){if(typeof ai.id==D){ai.id=Y;}if(M.ie&&M.win){var ah="";for(var ae in ai){if(ai[ae]!=Object.prototype[ae]){if(ae.toLowerCase()=="data"){ag.movie=ai[ae];
+}else{if(ae.toLowerCase()=="styleclass"){ah+=' class="'+ai[ae]+'"';}else{if(ae.toLowerCase()!="classid"){ah+=" "+ae+'="'+ai[ae]+'"';}}}}}var af="";for(var ad in ag){if(ag[ad]!=Object.prototype[ad]){af+='<param name="'+ad+'" value="'+ag[ad]+'" />';
+}}aa.outerHTML='<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"'+ah+">"+af+"</object>";N[N.length]=ai.id;X=c(ai.id);}else{var Z=C(r);Z.setAttribute("type",q);
+for(var ac in ai){if(ai[ac]!=Object.prototype[ac]){if(ac.toLowerCase()=="styleclass"){Z.setAttribute("class",ai[ac]);}else{if(ac.toLowerCase()!="classid"){Z.setAttribute(ac,ai[ac]);
+}}}}for(var ab in ag){if(ag[ab]!=Object.prototype[ab]&&ab.toLowerCase()!="movie"){e(Z,ab,ag[ab]);}}aa.parentNode.replaceChild(Z,aa);X=Z;}}return X;}function e(Z,X,Y){var aa=C("param");
+aa.setAttribute("name",X);aa.setAttribute("value",Y);Z.appendChild(aa);}function y(Y){var X=c(Y);if(X&&X.nodeName=="OBJECT"){if(M.ie&&M.win){X.style.display="none";
+(function(){if(X.readyState==4){b(Y);}else{setTimeout(arguments.callee,10);}})();}else{X.parentNode.removeChild(X);}}}function b(Z){var Y=c(Z);if(Y){for(var X in Y){if(typeof Y[X]=="function"){Y[X]=null;
+}}Y.parentNode.removeChild(Y);}}function c(Z){var X=null;try{X=j.getElementById(Z);}catch(Y){}return X;}function C(X){return j.createElement(X);}function i(Z,X,Y){Z.attachEvent(X,Y);
+I[I.length]=[Z,X,Y];}function F(Z){var Y=M.pv,X=Z.split(".");X[0]=parseInt(X[0],10);X[1]=parseInt(X[1],10)||0;X[2]=parseInt(X[2],10)||0;return(Y[0]>X[0]||(Y[0]==X[0]&&Y[1]>X[1])||(Y[0]==X[0]&&Y[1]==X[1]&&Y[2]>=X[2]))?true:false;
+}function v(ac,Y,ad,ab){if(M.ie&&M.mac){return;}var aa=j.getElementsByTagName("head")[0];if(!aa){return;}var X=(ad&&typeof ad=="string")?ad:"screen";if(ab){n=null;
+G=null;}if(!n||G!=X){var Z=C("style");Z.setAttribute("type","text/css");Z.setAttribute("media",X);n=aa.appendChild(Z);if(M.ie&&M.win&&typeof j.styleSheets!=D&&j.styleSheets.length>0){n=j.styleSheets[j.styleSheets.length-1];
+}G=X;}if(M.ie&&M.win){if(n&&typeof n.addRule==r){n.addRule(ac,Y);}}else{if(n&&typeof j.createTextNode!=D){n.appendChild(j.createTextNode(ac+" {"+Y+"}"));
+}}}function w(Z,X){if(!m){return;}var Y=X?"visible":"hidden";if(J&&c(Z)){c(Z).style.visibility=Y;}else{v("#"+Z,"visibility:"+Y);}}function L(Y){var Z=/[\\\"<>\.;]/;
+var X=Z.exec(Y)!=null;return X&&typeof encodeURIComponent!=D?encodeURIComponent(Y):Y;}var d=function(){if(M.ie&&M.win){window.attachEvent("onunload",function(){var ac=I.length;
+for(var ab=0;ab<ac;ab++){I[ab][0].detachEvent(I[ab][1],I[ab][2]);}var Z=N.length;for(var aa=0;aa<Z;aa++){y(N[aa]);}for(var Y in M){M[Y]=null;}M=null;for(var X in swfobject){swfobject[X]=null;
+}swfobject=null;});}}();return{registerObject:function(ab,X,aa,Z){if(M.w3&&ab&&X){var Y={};Y.id=ab;Y.swfVersion=X;Y.expressInstall=aa;Y.callbackFn=Z;o[o.length]=Y;
+w(ab,false);}else{if(Z){Z({success:false,id:ab});}}},getObjectById:function(X){if(M.w3){return z(X);}},embedSWF:function(ab,ah,ae,ag,Y,aa,Z,ad,af,ac){var X={success:false,id:ah};
+if(M.w3&&!(M.wk&&M.wk<312)&&ab&&ah&&ae&&ag&&Y){w(ah,false);K(function(){ae+="";ag+="";var aj={};if(af&&typeof af===r){for(var al in af){aj[al]=af[al];}}aj.data=ab;
+aj.width=ae;aj.height=ag;var am={};if(ad&&typeof ad===r){for(var ak in ad){am[ak]=ad[ak];}}if(Z&&typeof Z===r){for(var ai in Z){if(typeof am.flashvars!=D){am.flashvars+="&"+ai+"="+Z[ai];
+}else{am.flashvars=ai+"="+Z[ai];}}}if(F(Y)){var an=u(aj,am,ah);if(aj.id==ah){w(ah,true);}X.success=true;X.ref=an;}else{if(aa&&A()){aj.data=aa;P(aj,am,ah,ac);
+return;}else{w(ah,true);}}if(ac){ac(X);}});}else{if(ac){ac(X);}}},switchOffAutoHideShow:function(){m=false;},ua:M,getFlashPlayerVersion:function(){return{major:M.pv[0],minor:M.pv[1],release:M.pv[2]};
+},hasFlashPlayerVersion:F,createSWF:function(Z,Y,X){if(M.w3){return u(Z,Y,X);}else{return undefined;}},showExpressInstall:function(Z,aa,X,Y){if(M.w3&&A()){P(Z,aa,X,Y);
+}},removeSWF:function(X){if(M.w3){y(X);}},createCSS:function(aa,Z,Y,X){if(M.w3){v(aa,Z,Y,X);}},addDomLoadEvent:K,addLoadEvent:s,getQueryParamValue:function(aa){var Z=j.location.search||j.location.hash;
+if(Z){if(/\?/.test(Z)){Z=Z.split("?")[1];}if(aa==null){return L(Z);}var Y=Z.split("&");for(var X=0;X<Y.length;X++){if(Y[X].substring(0,Y[X].indexOf("="))==aa){return L(Y[X].substring((Y[X].indexOf("=")+1)));
+}}}return"";},expressInstallCallback:function(){if(a){var X=c(R);if(X&&l){X.parentNode.replaceChild(l,X);if(Q){w(Q,true);if(M.ie&&M.win){l.style.display="block";
+}}if(E){E(B);}}a=false;}}};}();
+
+/*
+SWFUpload: http://www.swfupload.org, http://swfupload.googlecode.com
+
+mmSWFUpload 1.0: Flash upload dialog - http://profandesign.se/swfupload/,  http://www.vinterwebb.se/
+
+SWFUpload is (c) 2006-2007 Lars Huring, Olov Nilzén and Mammon Media and is released under the MIT License:
+http://www.opensource.org/licenses/mit-license.php
+ 
+SWFUpload 2 is (c) 2007-2008 Jake Roberts and is released under the MIT License:
+http://www.opensource.org/licenses/mit-license.php
+*/
+
+var SWFUpload;if(SWFUpload==undefined){SWFUpload=function(a){this.initSWFUpload(a)}}SWFUpload.prototype.initSWFUpload=function(b){try{this.customSettings={};this.settings=b;this.eventQueue=[];this.movieName="SWFUpload_"+SWFUpload.movieCount++;this.movieElement=null;SWFUpload.instances[this.movieName]=this;this.initSettings();this.loadFlash();this.displayDebugInfo()}catch(a){delete SWFUpload.instances[this.movieName];throw a}};SWFUpload.instances={};SWFUpload.movieCount=0;SWFUpload.version="2.2.0 2009-03-25";SWFUpload.QUEUE_ERROR={QUEUE_LIMIT_EXCEEDED:-100,FILE_EXCEEDS_SIZE_LIMIT:-110,ZERO_BYTE_FILE:-120,INVALID_FILETYPE:-130};SWFUpload.UPLOAD_ERROR={HTTP_ERROR:-200,MISSING_UPLOAD_URL:-210,IO_ERROR:-220,SECURITY_ERROR:-230,UPLOAD_LIMIT_EXCEEDED:-240,UPLOAD_FAILED:-250,SPECIFIED_FILE_ID_NOT_FOUND:-260,FILE_VALIDATION_FAILED:-270,FILE_CANCELLED:-280,UPLOAD_STOPPED:-290};SWFUpload.FILE_STATUS={QUEUED:-1,IN_PROGRESS:-2,ERROR:-3,COMPLETE:-4,CANCELLED:-5};SWFUpload.BUTTON_ACTION={SELECT_FILE:-100,SELECT_FILES:-110,START_UPLOAD:-120};SWFUpload.CURSOR={ARROW:-1,HAND:-2};SWFUpload.WINDOW_MODE={WINDOW:"window",TRANSPARENT:"transparent",OPAQUE:"opaque"};SWFUpload.completeURL=function(a){if(typeof(a)!=="string"||a.match(/^https?:\/\//i)||a.match(/^\//)){return a}var c=window.location.protocol+"//"+window.location.hostname+(window.location.port?":"+window.location.port:"");var b=window.location.pathname.lastIndexOf("/");if(b<=0){path="/"}else{path=window.location.pathname.substr(0,b)+"/"}return path+a};SWFUpload.prototype.initSettings=function(){this.ensureDefault=function(b,a){this.settings[b]=(this.settings[b]==undefined)?a:this.settings[b]};this.ensureDefault("upload_url","");this.ensureDefault("preserve_relative_urls",false);this.ensureDefault("file_post_name","Filedata");this.ensureDefault("post_params",{});this.ensureDefault("use_query_string",false);this.ensureDefault("requeue_on_error",false);this.ensureDefault("http_success",[]);this.ensureDefault("assume_success_timeout",0);this.ensureDefault("file_types","*.*");this.ensureDefault("file_types_description","All Files");this.ensureDefault("file_size_limit",0);this.ensureDefault("file_upload_limit",0);this.ensureDefault("file_queue_limit",0);this.ensureDefault("flash_url","swfupload.swf");this.ensureDefault("prevent_swf_caching",true);this.ensureDefault("button_image_url","");this.ensureDefault("button_width",1);this.ensureDefault("button_height",1);this.ensureDefault("button_text","");this.ensureDefault("button_text_style","color: #000000; font-size: 16pt;");this.ensureDefault("button_text_top_padding",0);this.ensureDefault("button_text_left_padding",0);this.ensureDefault("button_action",SWFUpload.BUTTON_ACTION.SELECT_FILES);this.ensureDefault("button_disabled",false);this.ensureDefault("button_placeholder_id","");this.ensureDefault("button_placeholder",null);this.ensureDefault("button_cursor",SWFUpload.CURSOR.ARROW);this.ensureDefault("button_window_mode",SWFUpload.WINDOW_MODE.WINDOW);this.ensureDefault("debug",false);this.settings.debug_enabled=this.settings.debug;this.settings.return_upload_start_handler=this.returnUploadStart;this.ensureDefault("swfupload_loaded_handler",null);this.ensureDefault("file_dialog_start_handler",null);this.ensureDefault("file_queued_handler",null);this.ensureDefault("file_queue_error_handler",null);this.ensureDefault("file_dialog_complete_handler",null);this.ensureDefault("upload_start_handler",null);this.ensureDefault("upload_progress_handler",null);this.ensureDefault("upload_error_handler",null);this.ensureDefault("upload_success_handler",null);this.ensureDefault("upload_complete_handler",null);this.ensureDefault("debug_handler",this.debugMessage);this.ensureDefault("custom_settings",{});this.customSettings=this.settings.custom_settings;if(!!this.settings.prevent_swf_caching){this.settings.flash_url=this.settings.flash_url+(this.settings.flash_url.indexOf("?")<0?"?":"&")+"preventswfcaching="+new Date().getTime()}if(!this.settings.preserve_relative_urls){this.settings.upload_url=SWFUpload.completeURL(this.settings.upload_url);this.settings.button_image_url=this.settings.button_image_url?SWFUpload.completeURL(this.settings.button_image_url):this.settings.button_image_url}delete this.ensureDefault};SWFUpload.prototype.loadFlash=function(){var a,b;if(document.getElementById(this.movieName)!==null){throw"ID "+this.movieName+" is already in use. The Flash Object could not be added"}a=document.getElementById(this.settings.button_placeholder_id)||this.settings.button_placeholder;if(a==undefined){throw"Could not find the placeholder element: "+this.settings.button_placeholder_id}b=document.createElement("div");b.innerHTML=this.getFlashHTML();a.parentNode.replaceChild(b.firstChild,a);if(window[this.movieName]==undefined){window[this.movieName]=this.getMovieElement()}};SWFUpload.prototype.getFlashHTML=function(){return['<object id="',this.movieName,'" type="application/x-shockwave-flash" data="',this.settings.flash_url,'" width="',this.settings.button_width,'" height="',this.settings.button_height,'" class="swfupload">','<param name="wmode" value="',this.settings.button_window_mode,'" />','<param name="movie" value="',this.settings.flash_url,'" />','<param name="quality" value="high" />','<param name="menu" value="false" />','<param name="allowScriptAccess" value="always" />','<param name="flashvars" value="'+this.getFlashVars()+'" />',"</object>"].join("")};SWFUpload.prototype.getFlashVars=function(){var b=this.buildParamString();var a=this.settings.http_success.join(",");return["movieName=",encodeURIComponent(this.movieName),"&amp;uploadURL=",encodeURIComponent(this.settings.upload_url),"&amp;useQueryString=",encodeURIComponent(this.settings.use_query_string),"&amp;requeueOnError=",encodeURIComponent(this.settings.requeue_on_error),"&amp;httpSuccess=",encodeURIComponent(a),"&amp;assumeSuccessTimeout=",encodeURIComponent(this.settings.assume_success_timeout),"&amp;params=",encodeURIComponent(b),"&amp;filePostName=",encodeURIComponent(this.settings.file_post_name),"&amp;fileTypes=",encodeURIComponent(this.settings.file_types),"&amp;fileTypesDescription=",encodeURIComponent(this.settings.file_types_description),"&amp;fileSizeLimit=",encodeURIComponent(this.settings.file_size_limit),"&amp;fileUploadLimit=",encodeURIComponent(this.settings.file_upload_limit),"&amp;fileQueueLimit=",encodeURIComponent(this.settings.file_queue_limit),"&amp;debugEnabled=",encodeURIComponent(this.settings.debug_enabled),"&amp;buttonImageURL=",encodeURIComponent(this.settings.button_image_url),"&amp;buttonWidth=",encodeURIComponent(this.settings.button_width),"&amp;buttonHeight=",encodeURIComponent(this.settings.button_height),"&amp;buttonText=",encodeURIComponent(this.settings.button_text),"&amp;buttonTextTopPadding=",encodeURIComponent(this.settings.button_text_top_padding),"&amp;buttonTextLeftPadding=",encodeURIComponent(this.settings.button_text_left_padding),"&amp;buttonTextStyle=",encodeURIComponent(this.settings.button_text_style),"&amp;buttonAction=",encodeURIComponent(this.settings.button_action),"&amp;buttonDisabled=",encodeURIComponent(this.settings.button_disabled),"&amp;buttonCursor=",encodeURIComponent(this.settings.button_cursor)].join("")};SWFUpload.prototype.getMovieElement=function(){if(this.movieElement==undefined){this.movieElement=document.getElementById(this.movieName)}if(this.movieElement===null){throw"Could not find Flash element"}return this.movieElement};SWFUpload.prototype.buildParamString=function(){var c=this.settings.post_params;var b=[];if(typeof(c)==="object"){for(var a in c){if(c.hasOwnProperty(a)){b.push(encodeURIComponent(a.toString())+"="+encodeURIComponent(c[a].toString()))}}}return b.join("&amp;")};SWFUpload.prototype.destroy=function(){try{this.cancelUpload(null,false);var a=null;a=this.getMovieElement();if(a&&typeof(a.CallFunction)==="unknown"){for(var c in a){try{if(typeof(a[c])==="function"){a[c]=null}}catch(e){}}try{a.parentNode.removeChild(a)}catch(b){}}window[this.movieName]=null;SWFUpload.instances[this.movieName]=null;delete SWFUpload.instances[this.movieName];this.movieElement=null;this.settings=null;this.customSettings=null;this.eventQueue=null;this.movieName=null;return true}catch(d){return false}};SWFUpload.prototype.displayDebugInfo=function(){this.debug(["---SWFUpload Instance Info---\n","Version: ",SWFUpload.version,"\n","Movie Name: ",this.movieName,"\n","Settings:\n","\t","upload_url:               ",this.settings.upload_url,"\n","\t","flash_url:                ",this.settings.flash_url,"\n","\t","use_query_string:         ",this.settings.use_query_string.toString(),"\n","\t","requeue_on_error:         ",this.settings.requeue_on_error.toString(),"\n","\t","http_success:             ",this.settings.http_success.join(", "),"\n","\t","assume_success_timeout:   ",this.settings.assume_success_timeout,"\n","\t","file_post_name:           ",this.settings.file_post_name,"\n","\t","post_params:              ",this.settings.post_params.toString(),"\n","\t","file_types:               ",this.settings.file_types,"\n","\t","file_types_description:   ",this.settings.file_types_description,"\n","\t","file_size_limit:          ",this.settings.file_size_limit,"\n","\t","file_upload_limit:        ",this.settings.file_upload_limit,"\n","\t","file_queue_limit:         ",this.settings.file_queue_limit,"\n","\t","debug:                    ",this.settings.debug.toString(),"\n","\t","prevent_swf_caching:      ",this.settings.prevent_swf_caching.toString(),"\n","\t","button_placeholder_id:    ",this.settings.button_placeholder_id.toString(),"\n","\t","button_placeholder:       ",(this.settings.button_placeholder?"Set":"Not Set"),"\n","\t","button_image_url:         ",this.settings.button_image_url.toString(),"\n","\t","button_width:             ",this.settings.button_width.toString(),"\n","\t","button_height:            ",this.settings.button_height.toString(),"\n","\t","button_text:              ",this.settings.button_text.toString(),"\n","\t","button_text_style:        ",this.settings.button_text_style.toString(),"\n","\t","button_text_top_padding:  ",this.settings.button_text_top_padding.toString(),"\n","\t","button_text_left_padding: ",this.settings.button_text_left_padding.toString(),"\n","\t","button_action:            ",this.settings.button_action.toString(),"\n","\t","button_disabled:          ",this.settings.button_disabled.toString(),"\n","\t","custom_settings:          ",this.settings.custom_settings.toString(),"\n","Event Handlers:\n","\t","swfupload_loaded_handler assigned:  ",(typeof this.settings.swfupload_loaded_handler==="function").toString(),"\n","\t","file_dialog_start_handler assigned: ",(typeof this.settings.file_dialog_start_handler==="function").toString(),"\n","\t","file_queued_handler assigned:       ",(typeof this.settings.file_queued_handler==="function").toString(),"\n","\t","file_queue_error_handler assigned:  ",(typeof this.settings.file_queue_error_handler==="function").toString(),"\n","\t","upload_start_handler assigned:      ",(typeof this.settings.upload_start_handler==="function").toString(),"\n","\t","upload_progress_handler assigned:   ",(typeof this.settings.upload_progress_handler==="function").toString(),"\n","\t","upload_error_handler assigned:      ",(typeof this.settings.upload_error_handler==="function").toString(),"\n","\t","upload_success_handler assigned:    ",(typeof this.settings.upload_success_handler==="function").toString(),"\n","\t","upload_complete_handler assigned:   ",(typeof this.settings.upload_complete_handler==="function").toString(),"\n","\t","debug_handler assigned:             ",(typeof this.settings.debug_handler==="function").toString(),"\n"].join(""))};SWFUpload.prototype.addSetting=function(b,c,a){if(c==undefined){return(this.settings[b]=a)}else{return(this.settings[b]=c)}};SWFUpload.prototype.getSetting=function(a){if(this.settings[a]!=undefined){return this.settings[a]}return""};SWFUpload.prototype.callFlash=function(functionName,argumentArray){argumentArray=argumentArray||[];var movieElement=this.getMovieElement();var returnValue,returnString;try{returnString=movieElement.CallFunction('<invoke name="'+functionName+'" returntype="javascript">'+__flash__argumentsToXML(argumentArray,0)+"</invoke>");returnValue=eval(returnString)}catch(ex){throw"Call to "+functionName+" failed"}if(returnValue!=undefined&&typeof returnValue.post==="object"){returnValue=this.unescapeFilePostParams(returnValue)}return returnValue};SWFUpload.prototype.selectFile=function(){this.callFlash("SelectFile")};SWFUpload.prototype.selectFiles=function(){this.callFlash("SelectFiles")};SWFUpload.prototype.startUpload=function(a){this.callFlash("StartUpload",[a])};SWFUpload.prototype.cancelUpload=function(a,b){if(b!==false){b=true}this.callFlash("CancelUpload",[a,b])};SWFUpload.prototype.stopUpload=function(){this.callFlash("StopUpload")};SWFUpload.prototype.getStats=function(){return this.callFlash("GetStats")};SWFUpload.prototype.setStats=function(a){this.callFlash("SetStats",[a])};SWFUpload.prototype.getFile=function(a){if(typeof(a)==="number"){return this.callFlash("GetFileByIndex",[a])}else{return this.callFlash("GetFile",[a])}};SWFUpload.prototype.addFileParam=function(a,b,c){return this.callFlash("AddFileParam",[a,b,c])};SWFUpload.prototype.removeFileParam=function(a,b){this.callFlash("RemoveFileParam",[a,b])};SWFUpload.prototype.setUploadURL=function(a){this.settings.upload_url=a.toString();this.callFlash("SetUploadURL",[a])};SWFUpload.prototype.setPostParams=function(a){this.settings.post_params=a;this.callFlash("SetPostParams",[a])};SWFUpload.prototype.addPostParam=function(a,b){this.settings.post_params[a]=b;this.callFlash("SetPostParams",[this.settings.post_params])};SWFUpload.prototype.removePostParam=function(a){delete this.settings.post_params[a];this.callFlash("SetPostParams",[this.settings.post_params])};SWFUpload.prototype.setFileTypes=function(a,b){this.settings.file_types=a;this.settings.file_types_description=b;this.callFlash("SetFileTypes",[a,b])};SWFUpload.prototype.setFileSizeLimit=function(a){this.settings.file_size_limit=a;this.callFlash("SetFileSizeLimit",[a])};SWFUpload.prototype.setFileUploadLimit=function(a){this.settings.file_upload_limit=a;this.callFlash("SetFileUploadLimit",[a])};SWFUpload.prototype.setFileQueueLimit=function(a){this.settings.file_queue_limit=a;this.callFlash("SetFileQueueLimit",[a])};SWFUpload.prototype.setFilePostName=function(a){this.settings.file_post_name=a;this.callFlash("SetFilePostName",[a])};SWFUpload.prototype.setUseQueryString=function(a){this.settings.use_query_string=a;this.callFlash("SetUseQueryString",[a])};SWFUpload.prototype.setRequeueOnError=function(a){this.settings.requeue_on_error=a;this.callFlash("SetRequeueOnError",[a])};SWFUpload.prototype.setHTTPSuccess=function(a){if(typeof a==="string"){a=a.replace(" ","").split(",")}this.settings.http_success=a;this.callFlash("SetHTTPSuccess",[a])};SWFUpload.prototype.setAssumeSuccessTimeout=function(a){this.settings.assume_success_timeout=a;this.callFlash("SetAssumeSuccessTimeout",[a])};SWFUpload.prototype.setDebugEnabled=function(a){this.settings.debug_enabled=a;this.callFlash("SetDebugEnabled",[a])};SWFUpload.prototype.setButtonImageURL=function(a){if(a==undefined){a=""}this.settings.button_image_url=a;this.callFlash("SetButtonImageURL",[a])};SWFUpload.prototype.setButtonDimensions=function(c,a){this.settings.button_width=c;this.settings.button_height=a;var b=this.getMovieElement();if(b!=undefined){b.style.width=c+"px";b.style.height=a+"px"}this.callFlash("SetButtonDimensions",[c,a])};SWFUpload.prototype.setButtonText=function(a){this.settings.button_text=a;this.callFlash("SetButtonText",[a])};SWFUpload.prototype.setButtonTextPadding=function(b,a){this.settings.button_text_top_padding=a;this.settings.button_text_left_padding=b;this.callFlash("SetButtonTextPadding",[b,a])};SWFUpload.prototype.setButtonTextStyle=function(a){this.settings.button_text_style=a;this.callFlash("SetButtonTextStyle",[a])};SWFUpload.prototype.setButtonDisabled=function(a){this.settings.button_disabled=a;this.callFlash("SetButtonDisabled",[a])};SWFUpload.prototype.setButtonAction=function(a){this.settings.button_action=a;this.callFlash("SetButtonAction",[a])};SWFUpload.prototype.setButtonCursor=function(a){this.settings.button_cursor=a;this.callFlash("SetButtonCursor",[a])};SWFUpload.prototype.queueEvent=function(b,c){if(c==undefined){c=[]}else{if(!(c instanceof Array)){c=[c]}}var a=this;if(typeof this.settings[b]==="function"){this.eventQueue.push(function(){this.settings[b].apply(this,c)});setTimeout(function(){a.executeNextEvent()},0)}else{if(this.settings[b]!==null){throw"Event handler "+b+" is unknown or is not a function"}}};SWFUpload.prototype.executeNextEvent=function(){var a=this.eventQueue?this.eventQueue.shift():null;if(typeof(a)==="function"){a.apply(this)}};SWFUpload.prototype.unescapeFilePostParams=function(c){var e=/[$]([0-9a-f]{4})/i;var f={};var d;if(c!=undefined){for(var a in c.post){if(c.post.hasOwnProperty(a)){d=a;var b;while((b=e.exec(d))!==null){d=d.replace(b[0],String.fromCharCode(parseInt("0x"+b[1],16)))}f[d]=c.post[a]}}c.post=f}return c};SWFUpload.prototype.testExternalInterface=function(){try{return this.callFlash("TestExternalInterface")}catch(a){return false}};SWFUpload.prototype.flashReady=function(){var a=this.getMovieElement();if(!a){this.debug("Flash called back ready but the flash movie can't be found.");return}this.cleanUp(a);this.queueEvent("swfupload_loaded_handler")};SWFUpload.prototype.cleanUp=function(a){try{if(this.movieElement&&typeof(a.CallFunction)==="unknown"){this.debug("Removing Flash functions hooks (this should only run in IE and should prevent memory leaks)");for(var c in a){try{if(typeof(a[c])==="function"){a[c]=null}}catch(b){}}}}catch(d){}window.__flash__removeCallback=function(e,f){try{if(e){e[f]=null}}catch(g){}}};SWFUpload.prototype.fileDialogStart=function(){this.queueEvent("file_dialog_start_handler")};SWFUpload.prototype.fileQueued=function(a){a=this.unescapeFilePostParams(a);this.queueEvent("file_queued_handler",a)};SWFUpload.prototype.fileQueueError=function(a,c,b){a=this.unescapeFilePostParams(a);this.queueEvent("file_queue_error_handler",[a,c,b])};SWFUpload.prototype.fileDialogComplete=function(b,c,a){this.queueEvent("file_dialog_complete_handler",[b,c,a])};SWFUpload.prototype.uploadStart=function(a){a=this.unescapeFilePostParams(a);this.queueEvent("return_upload_start_handler",a)};SWFUpload.prototype.returnUploadStart=function(a){var b;if(typeof this.settings.upload_start_handler==="function"){a=this.unescapeFilePostParams(a);b=this.settings.upload_start_handler.call(this,a)}else{if(this.settings.upload_start_handler!=undefined){throw"upload_start_handler must be a function"}}if(b===undefined){b=true}b=!!b;this.callFlash("ReturnUploadStart",[b])};SWFUpload.prototype.uploadProgress=function(a,c,b){a=this.unescapeFilePostParams(a);this.queueEvent("upload_progress_handler",[a,c,b])};SWFUpload.prototype.uploadError=function(a,c,b){a=this.unescapeFilePostParams(a);this.queueEvent("upload_error_handler",[a,c,b])};SWFUpload.prototype.uploadSuccess=function(b,a,c){b=this.unescapeFilePostParams(b);this.queueEvent("upload_success_handler",[b,a,c])};SWFUpload.prototype.uploadComplete=function(a){a=this.unescapeFilePostParams(a);this.queueEvent("upload_complete_handler",a)};SWFUpload.prototype.debug=function(a){this.queueEvent("debug_handler",a)};SWFUpload.prototype.debugMessage=function(c){if(this.settings.debug){var a,d=[];if(typeof c==="object"&&typeof c.name==="string"&&typeof c.message==="string"){for(var b in c){if(c.hasOwnProperty(b)){d.push(b+": "+c[b])}}a=d.join("\n")||"";d=a.split("\n");a="EXCEPTION: "+d.join("\nEXCEPTION: ");SWFUpload.Console.writeLine(a)}else{SWFUpload.Console.writeLine(c)}}};SWFUpload.Console={};SWFUpload.Console.writeLine=function(d){var b,a;try{b=document.getElementById("SWFUpload_Console");if(!b){a=document.createElement("form");document.getElementsByTagName("body")[0].appendChild(a);b=document.createElement("textarea");b.id="SWFUpload_Console";b.style.fontFamily="monospace";b.setAttribute("wrap","off");b.wrap="off";b.style.overflow="auto";b.style.width="700px";b.style.height="350px";b.style.margin="5px";a.appendChild(b)}b.value+=d+"\n";b.scrollTop=b.scrollHeight-b.clientHeight}catch(c){alert("Exception: "+c.name+" Message: "+c.message)}};
+
+/*
+Uploadify v3.2
+Copyright (c) 2012 Reactive Apps, Ronnie Garcia
+Released under the MIT License <http://www.opensource.org/licenses/mit-license.php> 
+*/
+
+(function($) {
+
+	// These methods can be called by adding them as the first argument in the uploadify plugin call
+	var methods = {
+
+		init : function(options, swfUploadOptions) {
+			
+			return this.each(function() {
+
+				// Create a reference to the jQuery DOM object
+				var $this = $(this);
+
+				// Clone the original DOM object
+				var $clone = $this.clone();
+
+				// Setup the default options
+				var settings = $.extend({
+					// Required Settings
+					id       : $this.attr('id'), // The ID of the DOM object
+					swf      : 'uploadify.swf',  // The path to the uploadify SWF file
+					uploader : 'uploadify.php',  // The path to the server-side upload script
+					
+					// Options
+					auto            : true,               // Automatically upload files when added to the queue
+					buttonClass     : '',                 // A class name to add to the browse button DOM object
+					buttonCursor    : 'hand',             // The cursor to use with the browse button
+					buttonImage     : null,               // (String or null) The path to an image to use for the Flash browse button if not using CSS to style the button
+					buttonText      : 'SELECT FILES',     // The text to use for the browse button
+					checkExisting   : false,              // The path to a server-side script that checks for existing files on the server
+					debug           : false,              // Turn on swfUpload debugging mode
+					fileObjName     : 'Filedata',         // The name of the file object to use in your server-side script
+					fileSizeLimit   : 0,                  // The maximum size of an uploadable file in KB (Accepts units B KB MB GB if string, 0 for no limit)
+					fileTypeDesc    : 'All Files',        // The description for file types in the browse dialog
+					fileTypeExts    : '*.*',              // Allowed extensions in the browse dialog (server-side validation should also be used)
+					height          : 30,                 // The height of the browse button
+					itemTemplate    : false,              // The template for the file item in the queue
+					method          : 'post',             // The method to use when sending files to the server-side upload script
+					multi           : true,               // Allow multiple file selection in the browse dialog
+					formData        : {},                 // An object with additional data to send to the server-side upload script with every file upload
+					preventCaching  : true,               // Adds a random value to the Flash URL to prevent caching of it (conflicts with existing parameters)
+					progressData    : 'percentage',       // ('percentage' or 'speed') Data to show in the queue item during a file upload
+					queueID         : false,              // The ID of the DOM object to use as a file queue (without the #)
+					queueSizeLimit  : 999,                // The maximum number of files that can be in the queue at one time
+					removeCompleted : true,               // Remove queue items from the queue when they are done uploading
+					removeTimeout   : 3,                  // The delay in seconds before removing a queue item if removeCompleted is set to true
+					requeueErrors   : false,              // Keep errored files in the queue and keep trying to upload them
+					successTimeout  : 30,                 // The number of seconds to wait for Flash to detect the server's response after the file has finished uploading
+					uploadLimit     : 0,                  // The maximum number of files you can upload
+					width           : 120,                // The width of the browse button
+					
+					// Events
+					overrideEvents  : []             // (Array) A list of default event handlers to skip
+					/*
+					onCancel         // Triggered when a file is cancelled from the queue
+					onClearQueue     // Triggered during the 'clear queue' method
+					onDestroy        // Triggered when the uploadify object is destroyed
+					onDialogClose    // Triggered when the browse dialog is closed
+					onDialogOpen     // Triggered when the browse dialog is opened
+					onDisable        // Triggered when the browse button gets disabled
+					onEnable         // Triggered when the browse button gets enabled
+					onFallback       // Triggered is Flash is not detected    
+					onInit           // Triggered when Uploadify is initialized
+					onQueueComplete  // Triggered when all files in the queue have been uploaded
+					onSelectError    // Triggered when an error occurs while selecting a file (file size, queue size limit, etc.)
+					onSelect         // Triggered for each file that is selected
+					onSWFReady       // Triggered when the SWF button is loaded
+					onUploadComplete // Triggered when a file upload completes (success or error)
+					onUploadError    // Triggered when a file upload returns an error
+					onUploadSuccess  // Triggered when a file is uploaded successfully
+					onUploadProgress // Triggered every time a file progress is updated
+					onUploadStart    // Triggered immediately before a file upload starts
+					*/
+				}, options);
+
+				// Prepare settings for SWFUpload
+				var swfUploadSettings = {
+					assume_success_timeout   : settings.successTimeout,
+					button_placeholder_id    : settings.id,
+					button_width             : settings.width,
+					button_height            : settings.height,
+					button_text              : null,
+					button_text_style        : null,
+					button_text_top_padding  : 0,
+					button_text_left_padding : 0,
+					button_action            : (settings.multi ? SWFUpload.BUTTON_ACTION.SELECT_FILES : SWFUpload.BUTTON_ACTION.SELECT_FILE),
+					button_disabled          : false,
+					button_cursor            : (settings.buttonCursor == 'arrow' ? SWFUpload.CURSOR.ARROW : SWFUpload.CURSOR.HAND),
+					button_window_mode       : SWFUpload.WINDOW_MODE.TRANSPARENT,
+					debug                    : settings.debug,						
+					requeue_on_error         : settings.requeueErrors,
+					file_post_name           : settings.fileObjName,
+					file_size_limit          : settings.fileSizeLimit,
+					file_types               : settings.fileTypeExts,
+					file_types_description   : settings.fileTypeDesc,
+					file_queue_limit         : settings.queueSizeLimit,
+					file_upload_limit        : settings.uploadLimit,
+					flash_url                : settings.swf,					
+					prevent_swf_caching      : settings.preventCaching,
+					post_params              : settings.formData,
+					upload_url               : settings.uploader,
+					use_query_string         : (settings.method == 'get'),
+					
+					// Event Handlers 
+					file_dialog_complete_handler : handlers.onDialogClose,
+					file_dialog_start_handler    : handlers.onDialogOpen,
+					file_queued_handler          : handlers.onSelect,
+					file_queue_error_handler     : handlers.onSelectError,
+					swfupload_loaded_handler     : settings.onSWFReady,
+					upload_complete_handler      : handlers.onUploadComplete,
+					upload_error_handler         : handlers.onUploadError,
+					upload_progress_handler      : handlers.onUploadProgress,
+					upload_start_handler         : handlers.onUploadStart,
+					upload_success_handler       : handlers.onUploadSuccess
+				}
+
+				// Merge the user-defined options with the defaults
+				if (swfUploadOptions) {
+					swfUploadSettings = $.extend(swfUploadSettings, swfUploadOptions);
+				}
+				// Add the user-defined settings to the swfupload object
+				swfUploadSettings = $.extend(swfUploadSettings, settings);
+				
+				// Detect if Flash is available
+				var playerVersion  = swfobject.getFlashPlayerVersion();
+				var flashInstalled = (playerVersion.major >= 9);
+
+				if (flashInstalled) {
+					// Create the swfUpload instance
+					window['uploadify_' + settings.id] = new SWFUpload(swfUploadSettings);
+					var swfuploadify = window['uploadify_' + settings.id];
+
+					// Add the SWFUpload object to the elements data object
+					$this.data('uploadify', swfuploadify);
+					
+					// Wrap the instance
+					var $wrapper = $('<div />', {
+						'id'    : settings.id,
+						'class' : 'uploadify',
+						'css'   : {
+									'height'   : settings.height + 'px',
+									'width'    : settings.width + 'px'
+								  }
+					});
+					$('#' + swfuploadify.movieName).wrap($wrapper);
+					// Recreate the reference to wrapper
+					$wrapper = $('#' + settings.id);
+					// Add the data object to the wrapper 
+					$wrapper.data('uploadify', swfuploadify);
+
+					// Create the button
+					var $button = $('<div />', {
+						'id'    : settings.id + '-button',
+						'class' : 'uploadify-button ' + settings.buttonClass
+					});
+					if (settings.buttonImage) {
+						$button.css({
+							'background-image' : "url('" + settings.buttonImage + "')",
+							'text-indent'      : '-9999px'
+						});
+					}
+					$button.html('<span class="uploadify-button-text">' + settings.buttonText + '</span>')
+					.css({
+						'height'      : settings.height + 'px',
+						'line-height' : settings.height + 'px',
+						'width'       : settings.width + 'px'
+					});
+					// Append the button to the wrapper
+					$wrapper.append($button);
+
+					// Adjust the styles of the movie
+					$('#' + swfuploadify.movieName).css({
+						'position' : 'absolute',
+						'z-index'  : 1
+					});
+					
+					// Create the file queue
+					if (!settings.queueID) {
+						var $queue = $('<div />', {
+							'id'    : settings.id + '-queue',
+							'class' : 'uploadify-queue'
+						});
+						$wrapper.after($queue);
+						swfuploadify.settings.queueID      = settings.id + '-queue';
+						swfuploadify.settings.defaultQueue = true;
+					}
+					
+					// Create some queue related objects and variables
+					swfuploadify.queueData = {
+						files              : {}, // The files in the queue
+						filesSelected      : 0, // The number of files selected in the last select operation
+						filesQueued        : 0, // The number of files added to the queue in the last select operation
+						filesReplaced      : 0, // The number of files replaced in the last select operation
+						filesCancelled     : 0, // The number of files that were cancelled instead of replaced
+						filesErrored       : 0, // The number of files that caused error in the last select operation
+						uploadsSuccessful  : 0, // The number of files that were successfully uploaded
+						uploadsErrored     : 0, // The number of files that returned errors during upload
+						averageSpeed       : 0, // The average speed of the uploads in KB
+						queueLength        : 0, // The number of files in the queue
+						queueSize          : 0, // The size in bytes of the entire queue
+						uploadSize         : 0, // The size in bytes of the upload queue
+						queueBytesUploaded : 0, // The size in bytes that have been uploaded for the current upload queue
+						uploadQueue        : [], // The files currently to be uploaded
+						errorMsg           : 'Some files were not added to the queue:'
+					};
+
+					// Save references to all the objects
+					swfuploadify.original = $clone;
+					swfuploadify.wrapper  = $wrapper;
+					swfuploadify.button   = $button;
+					swfuploadify.queue    = $queue;
+
+					// Call the user-defined init event handler
+					if (settings.onInit) settings.onInit.call($this, swfuploadify);
+
+				} else {
+
+					// Call the fallback function
+					if (settings.onFallback) settings.onFallback.call($this);
+
+				}
+			});
+
+		},
+
+		// Stop a file upload and remove it from the queue 
+		cancel : function(fileID, supressEvent) {
+
+			var args = arguments;
+
+			this.each(function() {
+				// Create a reference to the jQuery DOM object
+				var $this        = $(this),
+					swfuploadify = $this.data('uploadify'),
+					settings     = swfuploadify.settings,
+					delay        = -1;
+
+				if (args[0]) {
+					// Clear the queue
+					if (args[0] == '*') {
+						var queueItemCount = swfuploadify.queueData.queueLength;
+						$('#' + settings.queueID).find('.uploadify-queue-item').each(function() {
+							delay++;
+							if (args[1] === true) {
+								swfuploadify.cancelUpload($(this).attr('id'), false);
+							} else {
+								swfuploadify.cancelUpload($(this).attr('id'));
+							}
+							$(this).find('.data').removeClass('data').html(' - Cancelled');
+							$(this).find('.uploadify-progress-bar').remove();
+							$(this).delay(1000 + 100 * delay).fadeOut(500, function() {
+								$(this).remove();
+							});
+						});
+						swfuploadify.queueData.queueSize   = 0;
+						swfuploadify.queueData.queueLength = 0;
+						// Trigger the onClearQueue event
+						if (settings.onClearQueue) settings.onClearQueue.call($this, queueItemCount);
+					} else {
+						for (var n = 0; n < args.length; n++) {
+							swfuploadify.cancelUpload(args[n]);
+							$('#' + args[n]).find('.data').removeClass('data').html(' - Cancelled');
+							$('#' + args[n]).find('.uploadify-progress-bar').remove();
+							$('#' + args[n]).delay(1000 + 100 * n).fadeOut(500, function() {
+								$(this).remove();
+							});
+						}
+					}
+				} else {
+					var item = $('#' + settings.queueID).find('.uploadify-queue-item').get(0);
+					$item = $(item);
+					swfuploadify.cancelUpload($item.attr('id'));
+					$item.find('.data').removeClass('data').html(' - Cancelled');
+					$item.find('.uploadify-progress-bar').remove();
+					$item.delay(1000).fadeOut(500, function() {
+						$(this).remove();
+					});
+				}
+			});
+
+		},
+
+		// Revert the DOM object back to its original state
+		destroy : function() {
+
+			this.each(function() {
+				// Create a reference to the jQuery DOM object
+				var $this        = $(this),
+					swfuploadify = $this.data('uploadify'),
+					settings     = swfuploadify.settings;
+
+				// Destroy the SWF object and 
+				swfuploadify.destroy();
+				
+				// Destroy the queue
+				if (settings.defaultQueue) {
+					$('#' + settings.queueID).remove();
+				}
+				
+				// Reload the original DOM element
+				$('#' + settings.id).replaceWith(swfuploadify.original);
+
+				// Call the user-defined event handler
+				if (settings.onDestroy) settings.onDestroy.call(this);
+
+				delete swfuploadify;
+			});
+
+		},
+
+		// Disable the select button
+		disable : function(isDisabled) {
+			
+			this.each(function() {
+				// Create a reference to the jQuery DOM object
+				var $this        = $(this),
+					swfuploadify = $this.data('uploadify'),
+					settings     = swfuploadify.settings;
+
+				// Call the user-defined event handlers
+				if (isDisabled) {
+					swfuploadify.button.addClass('disabled');
+					if (settings.onDisable) settings.onDisable.call(this);
+				} else {
+					swfuploadify.button.removeClass('disabled');
+					if (settings.onEnable) settings.onEnable.call(this);
+				}
+
+				// Enable/disable the browse button
+				swfuploadify.setButtonDisabled(isDisabled);
+			});
+
+		},
+
+		// Get or set the settings data
+		settings : function(name, value, resetObjects) {
+
+			var args        = arguments;
+			var returnValue = value;
+
+			this.each(function() {
+				// Create a reference to the jQuery DOM object
+				var $this        = $(this),
+					swfuploadify = $this.data('uploadify'),
+					settings     = swfuploadify.settings;
+
+				if (typeof(args[0]) == 'object') {
+					for (var n in value) {
+						setData(n,value[n]);
+					}
+				}
+				if (args.length === 1) {
+					returnValue =  settings[name];
+				} else {
+					switch (name) {
+						case 'uploader':
+							swfuploadify.setUploadURL(value);
+							break;
+						case 'formData':
+							if (!resetObjects) {
+								value = $.extend(settings.formData, value);
+							}
+							swfuploadify.setPostParams(settings.formData);
+							break;
+						case 'method':
+							if (value == 'get') {
+								swfuploadify.setUseQueryString(true);
+							} else {
+								swfuploadify.setUseQueryString(false);
+							}
+							break;
+						case 'fileObjName':
+							swfuploadify.setFilePostName(value);
+							break;
+						case 'fileTypeExts':
+							swfuploadify.setFileTypes(value, settings.fileTypeDesc);
+							break;
+						case 'fileTypeDesc':
+							swfuploadify.setFileTypes(settings.fileTypeExts, value);
+							break;
+						case 'fileSizeLimit':
+							swfuploadify.setFileSizeLimit(value);
+							break;
+						case 'uploadLimit':
+							swfuploadify.setFileUploadLimit(value);
+							break;
+						case 'queueSizeLimit':
+							swfuploadify.setFileQueueLimit(value);
+							break;
+						case 'buttonImage':
+							swfuploadify.button.css('background-image', settingValue);
+							break;
+						case 'buttonCursor':
+							if (value == 'arrow') {
+								swfuploadify.setButtonCursor(SWFUpload.CURSOR.ARROW);
+							} else {
+								swfuploadify.setButtonCursor(SWFUpload.CURSOR.HAND);
+							}
+							break;
+						case 'buttonText':
+							$('#' + settings.id + '-button').find('.uploadify-button-text').html(value);
+							break;
+						case 'width':
+							swfuploadify.setButtonDimensions(value, settings.height);
+							break;
+						case 'height':
+							swfuploadify.setButtonDimensions(settings.width, value);
+							break;
+						case 'multi':
+							if (value) {
+								swfuploadify.setButtonAction(SWFUpload.BUTTON_ACTION.SELECT_FILES);
+							} else {
+								swfuploadify.setButtonAction(SWFUpload.BUTTON_ACTION.SELECT_FILE);
+							}
+							break;
+					}
+					settings[name] = value;
+				}
+			});
+			
+			if (args.length === 1) {
+				return returnValue;
+			}
+
+		},
+
+		// Stop the current uploads and requeue what is in progress
+		stop : function() {
+
+			this.each(function() {
+				// Create a reference to the jQuery DOM object
+				var $this        = $(this),
+					swfuploadify = $this.data('uploadify');
+
+				// Reset the queue information
+				swfuploadify.queueData.averageSpeed  = 0;
+				swfuploadify.queueData.uploadSize    = 0;
+				swfuploadify.queueData.bytesUploaded = 0;
+				swfuploadify.queueData.uploadQueue   = [];
+
+				swfuploadify.stopUpload();
+			});
+
+		},
+
+		// Start uploading files in the queue
+		upload : function() {
+
+			var args = arguments;
+
+			this.each(function() {
+				// Create a reference to the jQuery DOM object
+				var $this        = $(this),
+					swfuploadify = $this.data('uploadify');
+
+				// Reset the queue information
+				swfuploadify.queueData.averageSpeed  = 0;
+				swfuploadify.queueData.uploadSize    = 0;
+				swfuploadify.queueData.bytesUploaded = 0;
+				swfuploadify.queueData.uploadQueue   = [];
+				
+				// Upload the files
+				if (args[0]) {
+					if (args[0] == '*') {
+						swfuploadify.queueData.uploadSize = swfuploadify.queueData.queueSize;
+						swfuploadify.queueData.uploadQueue.push('*');
+						swfuploadify.startUpload();
+					} else {
+						for (var n = 0; n < args.length; n++) {
+							swfuploadify.queueData.uploadSize += swfuploadify.queueData.files[args[n]].size;
+							swfuploadify.queueData.uploadQueue.push(args[n]);
+						}
+						swfuploadify.startUpload(swfuploadify.queueData.uploadQueue.shift());
+					}
+				} else {
+					swfuploadify.startUpload();
+				}
+
+			});
+
+		}
+
+	}
+
+	// These functions handle all the events that occur with the file uploader
+	var handlers = {
+
+		// Triggered when the file dialog is opened
+		onDialogOpen : function() {
+			// Load the swfupload settings
+			var settings = this.settings;
+
+			// Reset some queue info
+			this.queueData.errorMsg       = 'Some files were not added to the queue:';
+			this.queueData.filesReplaced  = 0;
+			this.queueData.filesCancelled = 0;
+
+			// Call the user-defined event handler
+			if (settings.onDialogOpen) settings.onDialogOpen.call(this);
+		},
+
+		// Triggered when the browse dialog is closed
+		onDialogClose :  function(filesSelected, filesQueued, queueLength) {
+			// Load the swfupload settings
+			var settings = this.settings;
+
+			// Update the queue information
+			this.queueData.filesErrored  = filesSelected - filesQueued;
+			this.queueData.filesSelected = filesSelected;
+			this.queueData.filesQueued   = filesQueued - this.queueData.filesCancelled;
+			this.queueData.queueLength   = queueLength;
+
+			// Run the default event handler
+			if ($.inArray('onDialogClose', settings.overrideEvents) < 0) {
+				if (this.queueData.filesErrored > 0) {
+					alert(this.queueData.errorMsg);
+				}
+			}
+
+			// Call the user-defined event handler
+			if (settings.onDialogClose) settings.onDialogClose.call(this, this.queueData);
+
+			// Upload the files if auto is true
+			if (settings.auto) $('#' + settings.id).uploadify('upload', '*');
+		},
+
+		// Triggered once for each file added to the queue
+		onSelect : function(file) {
+			// Load the swfupload settings
+			var settings = this.settings;
+
+			// Check if a file with the same name exists in the queue
+			var queuedFile = {};
+			for (var n in this.queueData.files) {
+				queuedFile = this.queueData.files[n];
+				if (queuedFile.uploaded != true && queuedFile.name == file.name) {
+					var replaceQueueItem = confirm('The file named "' + file.name + '" is already in the queue.\nDo you want to replace the existing item in the queue?');
+					if (!replaceQueueItem) {
+						this.cancelUpload(file.id);
+						this.queueData.filesCancelled++;
+						return false;
+					} else {
+						$('#' + queuedFile.id).remove();
+						this.cancelUpload(queuedFile.id);
+						this.queueData.filesReplaced++;
+					}
+				}
+			}
+
+			// Get the size of the file
+			var fileSize = Math.round(file.size / 1024);
+			var suffix   = 'KB';
+			if (fileSize > 1000) {
+				fileSize = Math.round(fileSize / 1000);
+				suffix   = 'MB';
+			}
+			var fileSizeParts = fileSize.toString().split('.');
+			fileSize = fileSizeParts[0];
+			if (fileSizeParts.length > 1) {
+				fileSize += '.' + fileSizeParts[1].substr(0,2);
+			}
+			fileSize += suffix;
+			
+			// Truncate the filename if it's too long
+			var fileName = file.name;
+			if (fileName.length > 25) {
+				fileName = fileName.substr(0,25) + '...';
+			}
+
+			// Create the file data object
+			itemData = {
+				'fileID'     : file.id,
+				'instanceID' : settings.id,
+				'fileName'   : fileName,
+				'fileSize'   : fileSize
+			}
+
+			// Create the file item template
+			if (settings.itemTemplate == false) {
+				settings.itemTemplate = '<div id="${fileID}" class="uploadify-queue-item">\
+					<div class="cancel">\
+						<a href="javascript:$(\'#${instanceID}\').uploadify(\'cancel\', \'${fileID}\')">X</a>\
+					</div>\
+					<span class="fileName">${fileName} (${fileSize})</span><span class="data"></span>\
+					<div class="uploadify-progress">\
+						<div class="uploadify-progress-bar"><!--Progress Bar--></div>\
+					</div>\
+				</div>';
+			}
+
+			// Run the default event handler
+			if ($.inArray('onSelect', settings.overrideEvents) < 0) {
+				
+				// Replace the item data in the template
+				itemHTML = settings.itemTemplate;
+				for (var d in itemData) {
+					itemHTML = itemHTML.replace(new RegExp('\\$\\{' + d + '\\}', 'g'), itemData[d]);
+				}
+
+				// Add the file item to the queue
+				$('#' + settings.queueID).append(itemHTML);
+			}
+
+			this.queueData.queueSize += file.size;
+			this.queueData.files[file.id] = file;
+
+			// Call the user-defined event handler
+			if (settings.onSelect) settings.onSelect.apply(this, arguments);
+		},
+
+		// Triggered when a file is not added to the queue
+		onSelectError : function(file, errorCode, errorMsg) {
+			// Load the swfupload settings
+			var settings = this.settings;
+
+			// Run the default event handler
+			if ($.inArray('onSelectError', settings.overrideEvents) < 0) {
+				switch(errorCode) {
+					case SWFUpload.QUEUE_ERROR.QUEUE_LIMIT_EXCEEDED:
+						if (settings.queueSizeLimit > errorMsg) {
+							this.queueData.errorMsg += '\nThe number of files selected exceeds the remaining upload limit (' + errorMsg + ').';
+						} else {
+							this.queueData.errorMsg += '\nThe number of files selected exceeds the queue size limit (' + settings.queueSizeLimit + ').';
+						}
+						break;
+					case SWFUpload.QUEUE_ERROR.FILE_EXCEEDS_SIZE_LIMIT:
+						this.queueData.errorMsg += '\nThe file "' + file.name + '" exceeds the size limit (' + settings.fileSizeLimit + ').';
+						break;
+					case SWFUpload.QUEUE_ERROR.ZERO_BYTE_FILE:
+						this.queueData.errorMsg += '\nThe file "' + file.name + '" is empty.';
+						break;
+					case SWFUpload.QUEUE_ERROR.FILE_EXCEEDS_SIZE_LIMIT:
+						this.queueData.errorMsg += '\nThe file "' + file.name + '" is not an accepted file type (' + settings.fileTypeDesc + ').';
+						break;
+				}
+			}
+			if (errorCode != SWFUpload.QUEUE_ERROR.QUEUE_LIMIT_EXCEEDED) {
+				delete this.queueData.files[file.id];
+			}
+
+			// Call the user-defined event handler
+			if (settings.onSelectError) settings.onSelectError.apply(this, arguments);
+		},
+
+		// Triggered when all the files in the queue have been processed
+		onQueueComplete : function() {
+			if (this.settings.onQueueComplete) this.settings.onQueueComplete.call(this, this.settings.queueData);
+		},
+
+		// Triggered when a file upload successfully completes
+		onUploadComplete : function(file) {
+			// Load the swfupload settings
+			var settings     = this.settings,
+				swfuploadify = this;
+
+			// Check if all the files have completed uploading
+			var stats = this.getStats();
+			this.queueData.queueLength = stats.files_queued;
+			if (this.queueData.uploadQueue[0] == '*') {
+				if (this.queueData.queueLength > 0) {
+					this.startUpload();
+				} else {
+					this.queueData.uploadQueue = [];
+
+					// Call the user-defined event handler for queue complete
+					if (settings.onQueueComplete) settings.onQueueComplete.call(this, this.queueData);
+				}
+			} else {
+				if (this.queueData.uploadQueue.length > 0) {
+					this.startUpload(this.queueData.uploadQueue.shift());
+				} else {
+					this.queueData.uploadQueue = [];
+
+					// Call the user-defined event handler for queue complete
+					if (settings.onQueueComplete) settings.onQueueComplete.call(this, this.queueData);
+				}
+			}
+
+			// Call the default event handler
+			if ($.inArray('onUploadComplete', settings.overrideEvents) < 0) {
+				if (settings.removeCompleted) {
+					switch (file.filestatus) {
+						case SWFUpload.FILE_STATUS.COMPLETE:
+							setTimeout(function() { 
+								if ($('#' + file.id)) {
+									swfuploadify.queueData.queueSize   -= file.size;
+									swfuploadify.queueData.queueLength -= 1;
+									delete swfuploadify.queueData.files[file.id]
+									$('#' + file.id).fadeOut(500, function() {
+										$(this).remove();
+									});
+								}
+							}, settings.removeTimeout * 1000);
+							break;
+						case SWFUpload.FILE_STATUS.ERROR:
+							if (!settings.requeueErrors) {
+								setTimeout(function() {
+									if ($('#' + file.id)) {
+										swfuploadify.queueData.queueSize   -= file.size;
+										swfuploadify.queueData.queueLength -= 1;
+										delete swfuploadify.queueData.files[file.id];
+										$('#' + file.id).fadeOut(500, function() {
+											$(this).remove();
+										});
+									}
+								}, settings.removeTimeout * 1000);
+							}
+							break;
+					}
+				} else {
+					file.uploaded = true;
+				}
+			}
+
+			// Call the user-defined event handler
+			if (settings.onUploadComplete) settings.onUploadComplete.call(this, file);
+		},
+
+		// Triggered when a file upload returns an error
+		onUploadError : function(file, errorCode, errorMsg) {
+			// Load the swfupload settings
+			var settings = this.settings;
+
+			// Set the error string
+			var errorString = 'Error';
+			switch(errorCode) {
+				case SWFUpload.UPLOAD_ERROR.HTTP_ERROR:
+					errorString = 'HTTP Error (' + errorMsg + ')';
+					break;
+				case SWFUpload.UPLOAD_ERROR.MISSING_UPLOAD_URL:
+					errorString = 'Missing Upload URL';
+					break;
+				case SWFUpload.UPLOAD_ERROR.IO_ERROR:
+					errorString = 'IO Error';
+					break;
+				case SWFUpload.UPLOAD_ERROR.SECURITY_ERROR:
+					errorString = 'Security Error';
+					break;
+				case SWFUpload.UPLOAD_ERROR.UPLOAD_LIMIT_EXCEEDED:
+					alert('The upload limit has been reached (' + errorMsg + ').');
+					errorString = 'Exceeds Upload Limit';
+					break;
+				case SWFUpload.UPLOAD_ERROR.UPLOAD_FAILED:
+					errorString = 'Failed';
+					break;
+				case SWFUpload.UPLOAD_ERROR.SPECIFIED_FILE_ID_NOT_FOUND:
+					break;
+				case SWFUpload.UPLOAD_ERROR.FILE_VALIDATION_FAILED:
+					errorString = 'Validation Error';
+					break;
+				case SWFUpload.UPLOAD_ERROR.FILE_CANCELLED:
+					errorString = 'Cancelled';
+					this.queueData.queueSize   -= file.size;
+					this.queueData.queueLength -= 1;
+					if (file.status == SWFUpload.FILE_STATUS.IN_PROGRESS || $.inArray(file.id, this.queueData.uploadQueue) >= 0) {
+						this.queueData.uploadSize -= file.size;
+					}
+					// Trigger the onCancel event
+					if (settings.onCancel) settings.onCancel.call(this, file);
+					delete this.queueData.files[file.id];
+					break;
+				case SWFUpload.UPLOAD_ERROR.UPLOAD_STOPPED:
+					errorString = 'Stopped';
+					break;
+			}
+
+			// Call the default event handler
+			if ($.inArray('onUploadError', settings.overrideEvents) < 0) {
+
+				if (errorCode != SWFUpload.UPLOAD_ERROR.FILE_CANCELLED && errorCode != SWFUpload.UPLOAD_ERROR.UPLOAD_STOPPED) {
+					$('#' + file.id).addClass('uploadify-error');
+				}
+
+				// Reset the progress bar
+				$('#' + file.id).find('.uploadify-progress-bar').css('width','1px');
+
+				// Add the error message to the queue item
+				if (errorCode != SWFUpload.UPLOAD_ERROR.SPECIFIED_FILE_ID_NOT_FOUND && file.status != SWFUpload.FILE_STATUS.COMPLETE) {
+					$('#' + file.id).find('.data').html(' - ' + errorString);
+				}
+			}
+
+			var stats = this.getStats();
+			this.queueData.uploadsErrored = stats.upload_errors;
+
+			// Call the user-defined event handler
+			if (settings.onUploadError) settings.onUploadError.call(this, file, errorCode, errorMsg, errorString);
+		},
+
+		// Triggered periodically during a file upload
+		onUploadProgress : function(file, fileBytesLoaded, fileTotalBytes) {
+			// Load the swfupload settings
+			var settings = this.settings;
+
+			// Setup all the variables
+			var timer            = new Date();
+			var newTime          = timer.getTime();
+			var lapsedTime       = newTime - this.timer;
+			if (lapsedTime > 500) {
+				this.timer = newTime;
+			}
+			var lapsedBytes      = fileBytesLoaded - this.bytesLoaded;
+			this.bytesLoaded     = fileBytesLoaded;
+			var queueBytesLoaded = this.queueData.queueBytesUploaded + fileBytesLoaded;
+			var percentage       = Math.round(fileBytesLoaded / fileTotalBytes * 100);
+			
+			// Calculate the average speed
+			var suffix = 'KB/s';
+			var mbs = 0;
+			var kbs = (lapsedBytes / 1024) / (lapsedTime / 1000);
+			    kbs = Math.floor(kbs * 10) / 10;
+			if (this.queueData.averageSpeed > 0) {
+				this.queueData.averageSpeed = Math.floor((this.queueData.averageSpeed + kbs) / 2);
+			} else {
+				this.queueData.averageSpeed = Math.floor(kbs);
+			}
+			if (kbs > 1000) {
+				mbs = (kbs * .001);
+				this.queueData.averageSpeed = Math.floor(mbs);
+				suffix = 'MB/s';
+			}
+			
+			// Call the default event handler
+			if ($.inArray('onUploadProgress', settings.overrideEvents) < 0) {
+				if (settings.progressData == 'percentage') {
+					$('#' + file.id).find('.data').html(' - ' + percentage + '%');
+				} else if (settings.progressData == 'speed' && lapsedTime > 500) {
+					$('#' + file.id).find('.data').html(' - ' + this.queueData.averageSpeed + suffix);
+				}
+				$('#' + file.id).find('.uploadify-progress-bar').css('width', percentage + '%');
+			}
+
+			// Call the user-defined event handler
+			if (settings.onUploadProgress) settings.onUploadProgress.call(this, file, fileBytesLoaded, fileTotalBytes, queueBytesLoaded, this.queueData.uploadSize);
+		},
+
+		// Triggered right before a file is uploaded
+		onUploadStart : function(file) {
+			// Load the swfupload settings
+			var settings = this.settings;
+
+			var timer        = new Date();
+			this.timer       = timer.getTime();
+			this.bytesLoaded = 0;
+			if (this.queueData.uploadQueue.length == 0) {
+				this.queueData.uploadSize = file.size;
+			}
+			if (settings.checkExisting) {
+				$.ajax({
+					type    : 'POST',
+					async   : false,
+					url     : settings.checkExisting,
+					data    : {filename: file.name},
+					success : function(data) {
+						if (data == 1) {
+							var overwrite = confirm('A file with the name "' + file.name + '" already exists on the server.\nWould you like to replace the existing file?');
+							if (!overwrite) {
+								this.cancelUpload(file.id);
+								$('#' + file.id).remove();
+								if (this.queueData.uploadQueue.length > 0 && this.queueData.queueLength > 0) {
+									if (this.queueData.uploadQueue[0] == '*') {
+										this.startUpload();
+									} else {
+										this.startUpload(this.queueData.uploadQueue.shift());
+									}
+								}
+							}
+						}
+					}
+				});
+			}
+
+			// Call the user-defined event handler
+			if (settings.onUploadStart) settings.onUploadStart.call(this, file); 
+		},
+
+		// Triggered when a file upload returns a successful code
+		onUploadSuccess : function(file, data, response) {
+			// Load the swfupload settings
+			var settings = this.settings;
+			var stats    = this.getStats();
+			this.queueData.uploadsSuccessful = stats.successful_uploads;
+			this.queueData.queueBytesUploaded += file.size;
+
+			// Call the default event handler
+			if ($.inArray('onUploadSuccess', settings.overrideEvents) < 0) {
+				$('#' + file.id).find('.data').html(' - Complete');
+			}
+
+			// Call the user-defined event handler
+			if (settings.onUploadSuccess) settings.onUploadSuccess.call(this, file, data, response); 
+		}
+
+	}
+
+	$.fn.uploadify = function(method) {
+
+		if (methods[method]) {
+			return methods[method].apply(this, Array.prototype.slice.call(arguments, 1));
+		} else if (typeof method === 'object' || !method) {
+			return methods.init.apply(this, arguments);
+		} else {
+			$.error('The method ' + method + ' does not exist in $.uploadify');
+		}
+
+	}
+
+})($);
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/uploadify/jquery.uploadify.min.js b/pluss-manage-page/src/main/resources/static/resources/auth/uploadify/jquery.uploadify.min.js
new file mode 100644
index 0000000..777d73b
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/uploadify/jquery.uploadify.min.js
@@ -0,0 +1,986 @@
+/*
+SWFObject v2.2 <http://code.google.com/p/swfobject/> 
+is released under the MIT License <http://www.opensource.org/licenses/mit-license.php> 
+*/
+;var swfobject=function(){var D="undefined",r="object",S="Shockwave Flash",W="ShockwaveFlash.ShockwaveFlash",q="application/x-shockwave-flash",R="SWFObjectExprInst",x="onreadystatechange",O=window,j=document,t=navigator,T=false,U=[h],o=[],N=[],I=[],l,Q,E,B,J=false,a=false,n,G,m=true,M=function(){var aa=typeof j.getElementById!=D&&typeof j.getElementsByTagName!=D&&typeof j.createElement!=D,ah=t.userAgent.toLowerCase(),Y=t.platform.toLowerCase(),ae=Y?/win/.test(Y):/win/.test(ah),ac=Y?/mac/.test(Y):/mac/.test(ah),af=/webkit/.test(ah)?parseFloat(ah.replace(/^.*webkit\/(\d+(\.\d+)?).*$/,"$1")):false,X=!+"\v1",ag=[0,0,0],ab=null;
+if(typeof t.plugins!=D&&typeof t.plugins[S]==r){ab=t.plugins[S].description;if(ab&&!(typeof t.mimeTypes!=D&&t.mimeTypes[q]&&!t.mimeTypes[q].enabledPlugin)){T=true;
+X=false;ab=ab.replace(/^.*\s+(\S+\s+\S+$)/,"$1");ag[0]=parseInt(ab.replace(/^(.*)\..*$/,"$1"),10);ag[1]=parseInt(ab.replace(/^.*\.(.*)\s.*$/,"$1"),10);
+ag[2]=/[a-zA-Z]/.test(ab)?parseInt(ab.replace(/^.*[a-zA-Z]+(.*)$/,"$1"),10):0;}}else{if(typeof O.ActiveXObject!=D){try{var ad=new ActiveXObject(W);if(ad){ab=ad.GetVariable("$version");
+if(ab){X=true;ab=ab.split(" ")[1].split(",");ag=[parseInt(ab[0],10),parseInt(ab[1],10),parseInt(ab[2],10)];}}}catch(Z){}}}return{w3:aa,pv:ag,wk:af,ie:X,win:ae,mac:ac};
+}(),k=function(){if(!M.w3){return;}if((typeof j.readyState!=D&&j.readyState=="complete")||(typeof j.readyState==D&&(j.getElementsByTagName("body")[0]||j.body))){f();
+}if(!J){if(typeof j.addEventListener!=D){j.addEventListener("DOMContentLoaded",f,false);}if(M.ie&&M.win){j.attachEvent(x,function(){if(j.readyState=="complete"){j.detachEvent(x,arguments.callee);
+f();}});if(O==top){(function(){if(J){return;}try{j.documentElement.doScroll("left");}catch(X){setTimeout(arguments.callee,0);return;}f();})();}}if(M.wk){(function(){if(J){return;
+}if(!/loaded|complete/.test(j.readyState)){setTimeout(arguments.callee,0);return;}f();})();}s(f);}}();function f(){if(J){return;}try{var Z=j.getElementsByTagName("body")[0].appendChild(C("span"));
+Z.parentNode.removeChild(Z);}catch(aa){return;}J=true;var X=U.length;for(var Y=0;Y<X;Y++){U[Y]();}}function K(X){if(J){X();}else{U[U.length]=X;}}function s(Y){if(typeof O.addEventListener!=D){O.addEventListener("load",Y,false);
+}else{if(typeof j.addEventListener!=D){j.addEventListener("load",Y,false);}else{if(typeof O.attachEvent!=D){i(O,"onload",Y);}else{if(typeof O.onload=="function"){var X=O.onload;
+O.onload=function(){X();Y();};}else{O.onload=Y;}}}}}function h(){if(T){V();}else{H();}}function V(){var X=j.getElementsByTagName("body")[0];var aa=C(r);
+aa.setAttribute("type",q);var Z=X.appendChild(aa);if(Z){var Y=0;(function(){if(typeof Z.GetVariable!=D){var ab=Z.GetVariable("$version");if(ab){ab=ab.split(" ")[1].split(",");
+M.pv=[parseInt(ab[0],10),parseInt(ab[1],10),parseInt(ab[2],10)];}}else{if(Y<10){Y++;setTimeout(arguments.callee,10);return;}}X.removeChild(aa);Z=null;H();
+})();}else{H();}}function H(){var ag=o.length;if(ag>0){for(var af=0;af<ag;af++){var Y=o[af].id;var ab=o[af].callbackFn;var aa={success:false,id:Y};if(M.pv[0]>0){var ae=c(Y);
+if(ae){if(F(o[af].swfVersion)&&!(M.wk&&M.wk<312)){w(Y,true);if(ab){aa.success=true;aa.ref=z(Y);ab(aa);}}else{if(o[af].expressInstall&&A()){var ai={};ai.data=o[af].expressInstall;
+ai.width=ae.getAttribute("width")||"0";ai.height=ae.getAttribute("height")||"0";if(ae.getAttribute("class")){ai.styleclass=ae.getAttribute("class");}if(ae.getAttribute("align")){ai.align=ae.getAttribute("align");
+}var ah={};var X=ae.getElementsByTagName("param");var ac=X.length;for(var ad=0;ad<ac;ad++){if(X[ad].getAttribute("name").toLowerCase()!="movie"){ah[X[ad].getAttribute("name")]=X[ad].getAttribute("value");
+}}P(ai,ah,Y,ab);}else{p(ae);if(ab){ab(aa);}}}}}else{w(Y,true);if(ab){var Z=z(Y);if(Z&&typeof Z.SetVariable!=D){aa.success=true;aa.ref=Z;}ab(aa);}}}}}function z(aa){var X=null;
+var Y=c(aa);if(Y&&Y.nodeName=="OBJECT"){if(typeof Y.SetVariable!=D){X=Y;}else{var Z=Y.getElementsByTagName(r)[0];if(Z){X=Z;}}}return X;}function A(){return !a&&F("6.0.65")&&(M.win||M.mac)&&!(M.wk&&M.wk<312);
+}function P(aa,ab,X,Z){a=true;E=Z||null;B={success:false,id:X};var ae=c(X);if(ae){if(ae.nodeName=="OBJECT"){l=g(ae);Q=null;}else{l=ae;Q=X;}aa.id=R;if(typeof aa.width==D||(!/%$/.test(aa.width)&&parseInt(aa.width,10)<310)){aa.width="310";
+}if(typeof aa.height==D||(!/%$/.test(aa.height)&&parseInt(aa.height,10)<137)){aa.height="137";}j.title=j.title.slice(0,47)+" - Flash Player Installation";
+var ad=M.ie&&M.win?"ActiveX":"PlugIn",ac="MMredirectURL="+O.location.toString().replace(/&/g,"%26")+"&MMplayerType="+ad+"&MMdoctitle="+j.title;if(typeof ab.flashvars!=D){ab.flashvars+="&"+ac;
+}else{ab.flashvars=ac;}if(M.ie&&M.win&&ae.readyState!=4){var Y=C("div");X+="SWFObjectNew";Y.setAttribute("id",X);ae.parentNode.insertBefore(Y,ae);ae.style.display="none";
+(function(){if(ae.readyState==4){ae.parentNode.removeChild(ae);}else{setTimeout(arguments.callee,10);}})();}u(aa,ab,X);}}function p(Y){if(M.ie&&M.win&&Y.readyState!=4){var X=C("div");
+Y.parentNode.insertBefore(X,Y);X.parentNode.replaceChild(g(Y),X);Y.style.display="none";(function(){if(Y.readyState==4){Y.parentNode.removeChild(Y);}else{setTimeout(arguments.callee,10);
+}})();}else{Y.parentNode.replaceChild(g(Y),Y);}}function g(ab){var aa=C("div");if(M.win&&M.ie){aa.innerHTML=ab.innerHTML;}else{var Y=ab.getElementsByTagName(r)[0];
+if(Y){var ad=Y.childNodes;if(ad){var X=ad.length;for(var Z=0;Z<X;Z++){if(!(ad[Z].nodeType==1&&ad[Z].nodeName=="PARAM")&&!(ad[Z].nodeType==8)){aa.appendChild(ad[Z].cloneNode(true));
+}}}}}return aa;}function u(ai,ag,Y){var X,aa=c(Y);if(M.wk&&M.wk<312){return X;}if(aa){if(typeof ai.id==D){ai.id=Y;}if(M.ie&&M.win){var ah="";for(var ae in ai){if(ai[ae]!=Object.prototype[ae]){if(ae.toLowerCase()=="data"){ag.movie=ai[ae];
+}else{if(ae.toLowerCase()=="styleclass"){ah+=' class="'+ai[ae]+'"';}else{if(ae.toLowerCase()!="classid"){ah+=" "+ae+'="'+ai[ae]+'"';}}}}}var af="";for(var ad in ag){if(ag[ad]!=Object.prototype[ad]){af+='<param name="'+ad+'" value="'+ag[ad]+'" />';
+}}aa.outerHTML='<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"'+ah+">"+af+"</object>";N[N.length]=ai.id;X=c(ai.id);}else{var Z=C(r);Z.setAttribute("type",q);
+for(var ac in ai){if(ai[ac]!=Object.prototype[ac]){if(ac.toLowerCase()=="styleclass"){Z.setAttribute("class",ai[ac]);}else{if(ac.toLowerCase()!="classid"){Z.setAttribute(ac,ai[ac]);
+}}}}for(var ab in ag){if(ag[ab]!=Object.prototype[ab]&&ab.toLowerCase()!="movie"){e(Z,ab,ag[ab]);}}aa.parentNode.replaceChild(Z,aa);X=Z;}}return X;}function e(Z,X,Y){var aa=C("param");
+aa.setAttribute("name",X);aa.setAttribute("value",Y);Z.appendChild(aa);}function y(Y){var X=c(Y);if(X&&X.nodeName=="OBJECT"){if(M.ie&&M.win){X.style.display="none";
+(function(){if(X.readyState==4){b(Y);}else{setTimeout(arguments.callee,10);}})();}else{X.parentNode.removeChild(X);}}}function b(Z){var Y=c(Z);if(Y){for(var X in Y){if(typeof Y[X]=="function"){Y[X]=null;
+}}Y.parentNode.removeChild(Y);}}function c(Z){var X=null;try{X=j.getElementById(Z);}catch(Y){}return X;}function C(X){return j.createElement(X);}function i(Z,X,Y){Z.attachEvent(X,Y);
+I[I.length]=[Z,X,Y];}function F(Z){var Y=M.pv,X=Z.split(".");X[0]=parseInt(X[0],10);X[1]=parseInt(X[1],10)||0;X[2]=parseInt(X[2],10)||0;return(Y[0]>X[0]||(Y[0]==X[0]&&Y[1]>X[1])||(Y[0]==X[0]&&Y[1]==X[1]&&Y[2]>=X[2]))?true:false;
+}function v(ac,Y,ad,ab){if(M.ie&&M.mac){return;}var aa=j.getElementsByTagName("head")[0];if(!aa){return;}var X=(ad&&typeof ad=="string")?ad:"screen";if(ab){n=null;
+G=null;}if(!n||G!=X){var Z=C("style");Z.setAttribute("type","text/css");Z.setAttribute("media",X);n=aa.appendChild(Z);if(M.ie&&M.win&&typeof j.styleSheets!=D&&j.styleSheets.length>0){n=j.styleSheets[j.styleSheets.length-1];
+}G=X;}if(M.ie&&M.win){if(n&&typeof n.addRule==r){n.addRule(ac,Y);}}else{if(n&&typeof j.createTextNode!=D){n.appendChild(j.createTextNode(ac+" {"+Y+"}"));
+}}}function w(Z,X){if(!m){return;}var Y=X?"visible":"hidden";if(J&&c(Z)){c(Z).style.visibility=Y;}else{v("#"+Z,"visibility:"+Y);}}function L(Y){var Z=/[\\\"<>\.;]/;
+var X=Z.exec(Y)!=null;return X&&typeof encodeURIComponent!=D?encodeURIComponent(Y):Y;}var d=function(){if(M.ie&&M.win){window.attachEvent("onunload",function(){var ac=I.length;
+for(var ab=0;ab<ac;ab++){I[ab][0].detachEvent(I[ab][1],I[ab][2]);}var Z=N.length;for(var aa=0;aa<Z;aa++){y(N[aa]);}for(var Y in M){M[Y]=null;}M=null;for(var X in swfobject){swfobject[X]=null;
+}swfobject=null;});}}();return{registerObject:function(ab,X,aa,Z){if(M.w3&&ab&&X){var Y={};Y.id=ab;Y.swfVersion=X;Y.expressInstall=aa;Y.callbackFn=Z;o[o.length]=Y;
+w(ab,false);}else{if(Z){Z({success:false,id:ab});}}},getObjectById:function(X){if(M.w3){return z(X);}},embedSWF:function(ab,ah,ae,ag,Y,aa,Z,ad,af,ac){var X={success:false,id:ah};
+if(M.w3&&!(M.wk&&M.wk<312)&&ab&&ah&&ae&&ag&&Y){w(ah,false);K(function(){ae+="";ag+="";var aj={};if(af&&typeof af===r){for(var al in af){aj[al]=af[al];}}aj.data=ab;
+aj.width=ae;aj.height=ag;var am={};if(ad&&typeof ad===r){for(var ak in ad){am[ak]=ad[ak];}}if(Z&&typeof Z===r){for(var ai in Z){if(typeof am.flashvars!=D){am.flashvars+="&"+ai+"="+Z[ai];
+}else{am.flashvars=ai+"="+Z[ai];}}}if(F(Y)){var an=u(aj,am,ah);if(aj.id==ah){w(ah,true);}X.success=true;X.ref=an;}else{if(aa&&A()){aj.data=aa;P(aj,am,ah,ac);
+return;}else{w(ah,true);}}if(ac){ac(X);}});}else{if(ac){ac(X);}}},switchOffAutoHideShow:function(){m=false;},ua:M,getFlashPlayerVersion:function(){return{major:M.pv[0],minor:M.pv[1],release:M.pv[2]};
+},hasFlashPlayerVersion:F,createSWF:function(Z,Y,X){if(M.w3){return u(Z,Y,X);}else{return undefined;}},showExpressInstall:function(Z,aa,X,Y){if(M.w3&&A()){P(Z,aa,X,Y);
+}},removeSWF:function(X){if(M.w3){y(X);}},createCSS:function(aa,Z,Y,X){if(M.w3){v(aa,Z,Y,X);}},addDomLoadEvent:K,addLoadEvent:s,getQueryParamValue:function(aa){var Z=j.location.search||j.location.hash;
+if(Z){if(/\?/.test(Z)){Z=Z.split("?")[1];}if(aa==null){return L(Z);}var Y=Z.split("&");for(var X=0;X<Y.length;X++){if(Y[X].substring(0,Y[X].indexOf("="))==aa){return L(Y[X].substring((Y[X].indexOf("=")+1)));
+}}}return"";},expressInstallCallback:function(){if(a){var X=c(R);if(X&&l){X.parentNode.replaceChild(l,X);if(Q){w(Q,true);if(M.ie&&M.win){l.style.display="block";
+}}if(E){E(B);}}a=false;}}};}();
+
+/*
+SWFUpload: http://www.swfupload.org, http://swfupload.googlecode.com
+
+mmSWFUpload 1.0: Flash upload dialog - http://profandesign.se/swfupload/,  http://www.vinterwebb.se/
+
+SWFUpload is (c) 2006-2007 Lars Huring, Olov Nilzén and Mammon Media and is released under the MIT License:
+http://www.opensource.org/licenses/mit-license.php
+ 
+SWFUpload 2 is (c) 2007-2008 Jake Roberts and is released under the MIT License:
+http://www.opensource.org/licenses/mit-license.php
+*/
+
+var SWFUpload;if(SWFUpload==undefined){SWFUpload=function(a){this.initSWFUpload(a)}}SWFUpload.prototype.initSWFUpload=function(b){try{this.customSettings={};this.settings=b;this.eventQueue=[];this.movieName="SWFUpload_"+SWFUpload.movieCount++;this.movieElement=null;SWFUpload.instances[this.movieName]=this;this.initSettings();this.loadFlash();this.displayDebugInfo()}catch(a){delete SWFUpload.instances[this.movieName];throw a}};SWFUpload.instances={};SWFUpload.movieCount=0;SWFUpload.version="2.2.0 2009-03-25";SWFUpload.QUEUE_ERROR={QUEUE_LIMIT_EXCEEDED:-100,FILE_EXCEEDS_SIZE_LIMIT:-110,ZERO_BYTE_FILE:-120,INVALID_FILETYPE:-130};SWFUpload.UPLOAD_ERROR={HTTP_ERROR:-200,MISSING_UPLOAD_URL:-210,IO_ERROR:-220,SECURITY_ERROR:-230,UPLOAD_LIMIT_EXCEEDED:-240,UPLOAD_FAILED:-250,SPECIFIED_FILE_ID_NOT_FOUND:-260,FILE_VALIDATION_FAILED:-270,FILE_CANCELLED:-280,UPLOAD_STOPPED:-290};SWFUpload.FILE_STATUS={QUEUED:-1,IN_PROGRESS:-2,ERROR:-3,COMPLETE:-4,CANCELLED:-5};SWFUpload.BUTTON_ACTION={SELECT_FILE:-100,SELECT_FILES:-110,START_UPLOAD:-120};SWFUpload.CURSOR={ARROW:-1,HAND:-2};SWFUpload.WINDOW_MODE={WINDOW:"window",TRANSPARENT:"transparent",OPAQUE:"opaque"};SWFUpload.completeURL=function(a){if(typeof(a)!=="string"||a.match(/^https?:\/\//i)||a.match(/^\//)){return a}var c=window.location.protocol+"//"+window.location.hostname+(window.location.port?":"+window.location.port:"");var b=window.location.pathname.lastIndexOf("/");if(b<=0){path="/"}else{path=window.location.pathname.substr(0,b)+"/"}return path+a};SWFUpload.prototype.initSettings=function(){this.ensureDefault=function(b,a){this.settings[b]=(this.settings[b]==undefined)?a:this.settings[b]};this.ensureDefault("upload_url","");this.ensureDefault("preserve_relative_urls",false);this.ensureDefault("file_post_name","Filedata");this.ensureDefault("post_params",{});this.ensureDefault("use_query_string",false);this.ensureDefault("requeue_on_error",false);this.ensureDefault("http_success",[]);this.ensureDefault("assume_success_timeout",0);this.ensureDefault("file_types","*.*");this.ensureDefault("file_types_description","All Files");this.ensureDefault("file_size_limit",0);this.ensureDefault("file_upload_limit",0);this.ensureDefault("file_queue_limit",0);this.ensureDefault("flash_url","swfupload.swf");this.ensureDefault("prevent_swf_caching",true);this.ensureDefault("button_image_url","");this.ensureDefault("button_width",1);this.ensureDefault("button_height",1);this.ensureDefault("button_text","");this.ensureDefault("button_text_style","color: #000000; font-size: 16pt;");this.ensureDefault("button_text_top_padding",0);this.ensureDefault("button_text_left_padding",0);this.ensureDefault("button_action",SWFUpload.BUTTON_ACTION.SELECT_FILES);this.ensureDefault("button_disabled",false);this.ensureDefault("button_placeholder_id","");this.ensureDefault("button_placeholder",null);this.ensureDefault("button_cursor",SWFUpload.CURSOR.ARROW);this.ensureDefault("button_window_mode",SWFUpload.WINDOW_MODE.WINDOW);this.ensureDefault("debug",false);this.settings.debug_enabled=this.settings.debug;this.settings.return_upload_start_handler=this.returnUploadStart;this.ensureDefault("swfupload_loaded_handler",null);this.ensureDefault("file_dialog_start_handler",null);this.ensureDefault("file_queued_handler",null);this.ensureDefault("file_queue_error_handler",null);this.ensureDefault("file_dialog_complete_handler",null);this.ensureDefault("upload_start_handler",null);this.ensureDefault("upload_progress_handler",null);this.ensureDefault("upload_error_handler",null);this.ensureDefault("upload_success_handler",null);this.ensureDefault("upload_complete_handler",null);this.ensureDefault("debug_handler",this.debugMessage);this.ensureDefault("custom_settings",{});this.customSettings=this.settings.custom_settings;if(!!this.settings.prevent_swf_caching){this.settings.flash_url=this.settings.flash_url+(this.settings.flash_url.indexOf("?")<0?"?":"&")+"preventswfcaching="+new Date().getTime()}if(!this.settings.preserve_relative_urls){this.settings.upload_url=SWFUpload.completeURL(this.settings.upload_url);this.settings.button_image_url=this.settings.button_image_url?SWFUpload.completeURL(this.settings.button_image_url):this.settings.button_image_url}delete this.ensureDefault};SWFUpload.prototype.loadFlash=function(){var a,b;if(document.getElementById(this.movieName)!==null){throw"ID "+this.movieName+" is already in use. The Flash Object could not be added"}a=document.getElementById(this.settings.button_placeholder_id)||this.settings.button_placeholder;if(a==undefined){throw"Could not find the placeholder element: "+this.settings.button_placeholder_id}b=document.createElement("div");b.innerHTML=this.getFlashHTML();a.parentNode.replaceChild(b.firstChild,a);if(window[this.movieName]==undefined){window[this.movieName]=this.getMovieElement()}};SWFUpload.prototype.getFlashHTML=function(){return['<object id="',this.movieName,'" type="application/x-shockwave-flash" data="',this.settings.flash_url,'" width="',this.settings.button_width,'" height="',this.settings.button_height,'" class="swfupload">','<param name="wmode" value="',this.settings.button_window_mode,'" />','<param name="movie" value="',this.settings.flash_url,'" />','<param name="quality" value="high" />','<param name="menu" value="false" />','<param name="allowScriptAccess" value="always" />','<param name="flashvars" value="'+this.getFlashVars()+'" />',"</object>"].join("")};SWFUpload.prototype.getFlashVars=function(){var b=this.buildParamString();var a=this.settings.http_success.join(",");return["movieName=",encodeURIComponent(this.movieName),"&amp;uploadURL=",encodeURIComponent(this.settings.upload_url),"&amp;useQueryString=",encodeURIComponent(this.settings.use_query_string),"&amp;requeueOnError=",encodeURIComponent(this.settings.requeue_on_error),"&amp;httpSuccess=",encodeURIComponent(a),"&amp;assumeSuccessTimeout=",encodeURIComponent(this.settings.assume_success_timeout),"&amp;params=",encodeURIComponent(b),"&amp;filePostName=",encodeURIComponent(this.settings.file_post_name),"&amp;fileTypes=",encodeURIComponent(this.settings.file_types),"&amp;fileTypesDescription=",encodeURIComponent(this.settings.file_types_description),"&amp;fileSizeLimit=",encodeURIComponent(this.settings.file_size_limit),"&amp;fileUploadLimit=",encodeURIComponent(this.settings.file_upload_limit),"&amp;fileQueueLimit=",encodeURIComponent(this.settings.file_queue_limit),"&amp;debugEnabled=",encodeURIComponent(this.settings.debug_enabled),"&amp;buttonImageURL=",encodeURIComponent(this.settings.button_image_url),"&amp;buttonWidth=",encodeURIComponent(this.settings.button_width),"&amp;buttonHeight=",encodeURIComponent(this.settings.button_height),"&amp;buttonText=",encodeURIComponent(this.settings.button_text),"&amp;buttonTextTopPadding=",encodeURIComponent(this.settings.button_text_top_padding),"&amp;buttonTextLeftPadding=",encodeURIComponent(this.settings.button_text_left_padding),"&amp;buttonTextStyle=",encodeURIComponent(this.settings.button_text_style),"&amp;buttonAction=",encodeURIComponent(this.settings.button_action),"&amp;buttonDisabled=",encodeURIComponent(this.settings.button_disabled),"&amp;buttonCursor=",encodeURIComponent(this.settings.button_cursor)].join("")};SWFUpload.prototype.getMovieElement=function(){if(this.movieElement==undefined){this.movieElement=document.getElementById(this.movieName)}if(this.movieElement===null){throw"Could not find Flash element"}return this.movieElement};SWFUpload.prototype.buildParamString=function(){var c=this.settings.post_params;var b=[];if(typeof(c)==="object"){for(var a in c){if(c.hasOwnProperty(a)){b.push(encodeURIComponent(a.toString())+"="+encodeURIComponent(c[a].toString()))}}}return b.join("&amp;")};SWFUpload.prototype.destroy=function(){try{this.cancelUpload(null,false);var a=null;a=this.getMovieElement();if(a&&typeof(a.CallFunction)==="unknown"){for(var c in a){try{if(typeof(a[c])==="function"){a[c]=null}}catch(e){}}try{a.parentNode.removeChild(a)}catch(b){}}window[this.movieName]=null;SWFUpload.instances[this.movieName]=null;delete SWFUpload.instances[this.movieName];this.movieElement=null;this.settings=null;this.customSettings=null;this.eventQueue=null;this.movieName=null;return true}catch(d){return false}};SWFUpload.prototype.displayDebugInfo=function(){this.debug(["---SWFUpload Instance Info---\n","Version: ",SWFUpload.version,"\n","Movie Name: ",this.movieName,"\n","Settings:\n","\t","upload_url:               ",this.settings.upload_url,"\n","\t","flash_url:                ",this.settings.flash_url,"\n","\t","use_query_string:         ",this.settings.use_query_string.toString(),"\n","\t","requeue_on_error:         ",this.settings.requeue_on_error.toString(),"\n","\t","http_success:             ",this.settings.http_success.join(", "),"\n","\t","assume_success_timeout:   ",this.settings.assume_success_timeout,"\n","\t","file_post_name:           ",this.settings.file_post_name,"\n","\t","post_params:              ",this.settings.post_params.toString(),"\n","\t","file_types:               ",this.settings.file_types,"\n","\t","file_types_description:   ",this.settings.file_types_description,"\n","\t","file_size_limit:          ",this.settings.file_size_limit,"\n","\t","file_upload_limit:        ",this.settings.file_upload_limit,"\n","\t","file_queue_limit:         ",this.settings.file_queue_limit,"\n","\t","debug:                    ",this.settings.debug.toString(),"\n","\t","prevent_swf_caching:      ",this.settings.prevent_swf_caching.toString(),"\n","\t","button_placeholder_id:    ",this.settings.button_placeholder_id.toString(),"\n","\t","button_placeholder:       ",(this.settings.button_placeholder?"Set":"Not Set"),"\n","\t","button_image_url:         ",this.settings.button_image_url.toString(),"\n","\t","button_width:             ",this.settings.button_width.toString(),"\n","\t","button_height:            ",this.settings.button_height.toString(),"\n","\t","button_text:              ",this.settings.button_text.toString(),"\n","\t","button_text_style:        ",this.settings.button_text_style.toString(),"\n","\t","button_text_top_padding:  ",this.settings.button_text_top_padding.toString(),"\n","\t","button_text_left_padding: ",this.settings.button_text_left_padding.toString(),"\n","\t","button_action:            ",this.settings.button_action.toString(),"\n","\t","button_disabled:          ",this.settings.button_disabled.toString(),"\n","\t","custom_settings:          ",this.settings.custom_settings.toString(),"\n","Event Handlers:\n","\t","swfupload_loaded_handler assigned:  ",(typeof this.settings.swfupload_loaded_handler==="function").toString(),"\n","\t","file_dialog_start_handler assigned: ",(typeof this.settings.file_dialog_start_handler==="function").toString(),"\n","\t","file_queued_handler assigned:       ",(typeof this.settings.file_queued_handler==="function").toString(),"\n","\t","file_queue_error_handler assigned:  ",(typeof this.settings.file_queue_error_handler==="function").toString(),"\n","\t","upload_start_handler assigned:      ",(typeof this.settings.upload_start_handler==="function").toString(),"\n","\t","upload_progress_handler assigned:   ",(typeof this.settings.upload_progress_handler==="function").toString(),"\n","\t","upload_error_handler assigned:      ",(typeof this.settings.upload_error_handler==="function").toString(),"\n","\t","upload_success_handler assigned:    ",(typeof this.settings.upload_success_handler==="function").toString(),"\n","\t","upload_complete_handler assigned:   ",(typeof this.settings.upload_complete_handler==="function").toString(),"\n","\t","debug_handler assigned:             ",(typeof this.settings.debug_handler==="function").toString(),"\n"].join(""))};SWFUpload.prototype.addSetting=function(b,c,a){if(c==undefined){return(this.settings[b]=a)}else{return(this.settings[b]=c)}};SWFUpload.prototype.getSetting=function(a){if(this.settings[a]!=undefined){return this.settings[a]}return""};SWFUpload.prototype.callFlash=function(functionName,argumentArray){argumentArray=argumentArray||[];var movieElement=this.getMovieElement();var returnValue,returnString;try{returnString=movieElement.CallFunction('<invoke name="'+functionName+'" returntype="javascript">'+__flash__argumentsToXML(argumentArray,0)+"</invoke>");returnValue=eval(returnString)}catch(ex){throw"Call to "+functionName+" failed"}if(returnValue!=undefined&&typeof returnValue.post==="object"){returnValue=this.unescapeFilePostParams(returnValue)}return returnValue};SWFUpload.prototype.selectFile=function(){this.callFlash("SelectFile")};SWFUpload.prototype.selectFiles=function(){this.callFlash("SelectFiles")};SWFUpload.prototype.startUpload=function(a){this.callFlash("StartUpload",[a])};SWFUpload.prototype.cancelUpload=function(a,b){if(b!==false){b=true}this.callFlash("CancelUpload",[a,b])};SWFUpload.prototype.stopUpload=function(){this.callFlash("StopUpload")};SWFUpload.prototype.getStats=function(){return this.callFlash("GetStats")};SWFUpload.prototype.setStats=function(a){this.callFlash("SetStats",[a])};SWFUpload.prototype.getFile=function(a){if(typeof(a)==="number"){return this.callFlash("GetFileByIndex",[a])}else{return this.callFlash("GetFile",[a])}};SWFUpload.prototype.addFileParam=function(a,b,c){return this.callFlash("AddFileParam",[a,b,c])};SWFUpload.prototype.removeFileParam=function(a,b){this.callFlash("RemoveFileParam",[a,b])};SWFUpload.prototype.setUploadURL=function(a){this.settings.upload_url=a.toString();this.callFlash("SetUploadURL",[a])};SWFUpload.prototype.setPostParams=function(a){this.settings.post_params=a;this.callFlash("SetPostParams",[a])};SWFUpload.prototype.addPostParam=function(a,b){this.settings.post_params[a]=b;this.callFlash("SetPostParams",[this.settings.post_params])};SWFUpload.prototype.removePostParam=function(a){delete this.settings.post_params[a];this.callFlash("SetPostParams",[this.settings.post_params])};SWFUpload.prototype.setFileTypes=function(a,b){this.settings.file_types=a;this.settings.file_types_description=b;this.callFlash("SetFileTypes",[a,b])};SWFUpload.prototype.setFileSizeLimit=function(a){this.settings.file_size_limit=a;this.callFlash("SetFileSizeLimit",[a])};SWFUpload.prototype.setFileUploadLimit=function(a){this.settings.file_upload_limit=a;this.callFlash("SetFileUploadLimit",[a])};SWFUpload.prototype.setFileQueueLimit=function(a){this.settings.file_queue_limit=a;this.callFlash("SetFileQueueLimit",[a])};SWFUpload.prototype.setFilePostName=function(a){this.settings.file_post_name=a;this.callFlash("SetFilePostName",[a])};SWFUpload.prototype.setUseQueryString=function(a){this.settings.use_query_string=a;this.callFlash("SetUseQueryString",[a])};SWFUpload.prototype.setRequeueOnError=function(a){this.settings.requeue_on_error=a;this.callFlash("SetRequeueOnError",[a])};SWFUpload.prototype.setHTTPSuccess=function(a){if(typeof a==="string"){a=a.replace(" ","").split(",")}this.settings.http_success=a;this.callFlash("SetHTTPSuccess",[a])};SWFUpload.prototype.setAssumeSuccessTimeout=function(a){this.settings.assume_success_timeout=a;this.callFlash("SetAssumeSuccessTimeout",[a])};SWFUpload.prototype.setDebugEnabled=function(a){this.settings.debug_enabled=a;this.callFlash("SetDebugEnabled",[a])};SWFUpload.prototype.setButtonImageURL=function(a){if(a==undefined){a=""}this.settings.button_image_url=a;this.callFlash("SetButtonImageURL",[a])};SWFUpload.prototype.setButtonDimensions=function(c,a){this.settings.button_width=c;this.settings.button_height=a;var b=this.getMovieElement();if(b!=undefined){b.style.width=c+"px";b.style.height=a+"px"}this.callFlash("SetButtonDimensions",[c,a])};SWFUpload.prototype.setButtonText=function(a){this.settings.button_text=a;this.callFlash("SetButtonText",[a])};SWFUpload.prototype.setButtonTextPadding=function(b,a){this.settings.button_text_top_padding=a;this.settings.button_text_left_padding=b;this.callFlash("SetButtonTextPadding",[b,a])};SWFUpload.prototype.setButtonTextStyle=function(a){this.settings.button_text_style=a;this.callFlash("SetButtonTextStyle",[a])};SWFUpload.prototype.setButtonDisabled=function(a){this.settings.button_disabled=a;this.callFlash("SetButtonDisabled",[a])};SWFUpload.prototype.setButtonAction=function(a){this.settings.button_action=a;this.callFlash("SetButtonAction",[a])};SWFUpload.prototype.setButtonCursor=function(a){this.settings.button_cursor=a;this.callFlash("SetButtonCursor",[a])};SWFUpload.prototype.queueEvent=function(b,c){if(c==undefined){c=[]}else{if(!(c instanceof Array)){c=[c]}}var a=this;if(typeof this.settings[b]==="function"){this.eventQueue.push(function(){this.settings[b].apply(this,c)});setTimeout(function(){a.executeNextEvent()},0)}else{if(this.settings[b]!==null){throw"Event handler "+b+" is unknown or is not a function"}}};SWFUpload.prototype.executeNextEvent=function(){var a=this.eventQueue?this.eventQueue.shift():null;if(typeof(a)==="function"){a.apply(this)}};SWFUpload.prototype.unescapeFilePostParams=function(c){var e=/[$]([0-9a-f]{4})/i;var f={};var d;if(c!=undefined){for(var a in c.post){if(c.post.hasOwnProperty(a)){d=a;var b;while((b=e.exec(d))!==null){d=d.replace(b[0],String.fromCharCode(parseInt("0x"+b[1],16)))}f[d]=c.post[a]}}c.post=f}return c};SWFUpload.prototype.testExternalInterface=function(){try{return this.callFlash("TestExternalInterface")}catch(a){return false}};SWFUpload.prototype.flashReady=function(){var a=this.getMovieElement();if(!a){this.debug("Flash called back ready but the flash movie can't be found.");return}this.cleanUp(a);this.queueEvent("swfupload_loaded_handler")};SWFUpload.prototype.cleanUp=function(a){try{if(this.movieElement&&typeof(a.CallFunction)==="unknown"){this.debug("Removing Flash functions hooks (this should only run in IE and should prevent memory leaks)");for(var c in a){try{if(typeof(a[c])==="function"){a[c]=null}}catch(b){}}}}catch(d){}window.__flash__removeCallback=function(e,f){try{if(e){e[f]=null}}catch(g){}}};SWFUpload.prototype.fileDialogStart=function(){this.queueEvent("file_dialog_start_handler")};SWFUpload.prototype.fileQueued=function(a){a=this.unescapeFilePostParams(a);this.queueEvent("file_queued_handler",a)};SWFUpload.prototype.fileQueueError=function(a,c,b){a=this.unescapeFilePostParams(a);this.queueEvent("file_queue_error_handler",[a,c,b])};SWFUpload.prototype.fileDialogComplete=function(b,c,a){this.queueEvent("file_dialog_complete_handler",[b,c,a])};SWFUpload.prototype.uploadStart=function(a){a=this.unescapeFilePostParams(a);this.queueEvent("return_upload_start_handler",a)};SWFUpload.prototype.returnUploadStart=function(a){var b;if(typeof this.settings.upload_start_handler==="function"){a=this.unescapeFilePostParams(a);b=this.settings.upload_start_handler.call(this,a)}else{if(this.settings.upload_start_handler!=undefined){throw"upload_start_handler must be a function"}}if(b===undefined){b=true}b=!!b;this.callFlash("ReturnUploadStart",[b])};SWFUpload.prototype.uploadProgress=function(a,c,b){a=this.unescapeFilePostParams(a);this.queueEvent("upload_progress_handler",[a,c,b])};SWFUpload.prototype.uploadError=function(a,c,b){a=this.unescapeFilePostParams(a);this.queueEvent("upload_error_handler",[a,c,b])};SWFUpload.prototype.uploadSuccess=function(b,a,c){b=this.unescapeFilePostParams(b);this.queueEvent("upload_success_handler",[b,a,c])};SWFUpload.prototype.uploadComplete=function(a){a=this.unescapeFilePostParams(a);this.queueEvent("upload_complete_handler",a)};SWFUpload.prototype.debug=function(a){this.queueEvent("debug_handler",a)};SWFUpload.prototype.debugMessage=function(c){if(this.settings.debug){var a,d=[];if(typeof c==="object"&&typeof c.name==="string"&&typeof c.message==="string"){for(var b in c){if(c.hasOwnProperty(b)){d.push(b+": "+c[b])}}a=d.join("\n")||"";d=a.split("\n");a="EXCEPTION: "+d.join("\nEXCEPTION: ");SWFUpload.Console.writeLine(a)}else{SWFUpload.Console.writeLine(c)}}};SWFUpload.Console={};SWFUpload.Console.writeLine=function(d){var b,a;try{b=document.getElementById("SWFUpload_Console");if(!b){a=document.createElement("form");document.getElementsByTagName("body")[0].appendChild(a);b=document.createElement("textarea");b.id="SWFUpload_Console";b.style.fontFamily="monospace";b.setAttribute("wrap","off");b.wrap="off";b.style.overflow="auto";b.style.width="700px";b.style.height="350px";b.style.margin="5px";a.appendChild(b)}b.value+=d+"\n";b.scrollTop=b.scrollHeight-b.clientHeight}catch(c){alert("Exception: "+c.name+" Message: "+c.message)}};
+
+/*
+Uploadify v3.2
+Copyright (c) 2012 Reactive Apps, Ronnie Garcia
+Released under the MIT License <http://www.opensource.org/licenses/mit-license.php> 
+*/
+
+(function($) {
+
+	// These methods can be called by adding them as the first argument in the uploadify plugin call
+	var methods = {
+
+		init : function(options, swfUploadOptions) {
+			
+			return this.each(function() {
+
+				// Create a reference to the jQuery DOM object
+				var $this = $(this);
+
+				// Clone the original DOM object
+				var $clone = $this.clone();
+
+				// Setup the default options
+				var settings = $.extend({
+					// Required Settings
+					id       : $this.attr('id'), // The ID of the DOM object
+					swf      : 'uploadify.swf',  // The path to the uploadify SWF file
+					uploader : 'uploadify.php',  // The path to the server-side upload script
+					
+					// Options
+					auto            : true,               // Automatically upload files when added to the queue
+					buttonClass     : '',                 // A class name to add to the browse button DOM object
+					buttonCursor    : 'hand',             // The cursor to use with the browse button
+					buttonImage     : null,               // (String or null) The path to an image to use for the Flash browse button if not using CSS to style the button
+					buttonText      : 'SELECT FILES',     // The text to use for the browse button
+					checkExisting   : false,              // The path to a server-side script that checks for existing files on the server
+					debug           : false,              // Turn on swfUpload debugging mode
+					fileObjName     : 'Filedata',         // The name of the file object to use in your server-side script
+					fileSizeLimit   : 0,                  // The maximum size of an uploadable file in KB (Accepts units B KB MB GB if string, 0 for no limit)
+					fileTypeDesc    : 'All Files',        // The description for file types in the browse dialog
+					fileTypeExts    : '*.*',              // Allowed extensions in the browse dialog (server-side validation should also be used)
+					height          : 30,                 // The height of the browse button
+					itemTemplate    : false,              // The template for the file item in the queue
+					method          : 'post',             // The method to use when sending files to the server-side upload script
+					multi           : true,               // Allow multiple file selection in the browse dialog
+					formData        : {},                 // An object with additional data to send to the server-side upload script with every file upload
+					preventCaching  : true,               // Adds a random value to the Flash URL to prevent caching of it (conflicts with existing parameters)
+					progressData    : 'percentage',       // ('percentage' or 'speed') Data to show in the queue item during a file upload
+					queueID         : false,              // The ID of the DOM object to use as a file queue (without the #)
+					queueSizeLimit  : 999,                // The maximum number of files that can be in the queue at one time
+					removeCompleted : true,               // Remove queue items from the queue when they are done uploading
+					removeTimeout   : 3,                  // The delay in seconds before removing a queue item if removeCompleted is set to true
+					requeueErrors   : false,              // Keep errored files in the queue and keep trying to upload them
+					successTimeout  : 30,                 // The number of seconds to wait for Flash to detect the server's response after the file has finished uploading
+					uploadLimit     : 0,                  // The maximum number of files you can upload
+					width           : 120,                // The width of the browse button
+					
+					// Events
+					overrideEvents  : []             // (Array) A list of default event handlers to skip
+					/*
+					onCancel         // Triggered when a file is cancelled from the queue
+					onClearQueue     // Triggered during the 'clear queue' method
+					onDestroy        // Triggered when the uploadify object is destroyed
+					onDialogClose    // Triggered when the browse dialog is closed
+					onDialogOpen     // Triggered when the browse dialog is opened
+					onDisable        // Triggered when the browse button gets disabled
+					onEnable         // Triggered when the browse button gets enabled
+					onFallback       // Triggered is Flash is not detected    
+					onInit           // Triggered when Uploadify is initialized
+					onQueueComplete  // Triggered when all files in the queue have been uploaded
+					onSelectError    // Triggered when an error occurs while selecting a file (file size, queue size limit, etc.)
+					onSelect         // Triggered for each file that is selected
+					onSWFReady       // Triggered when the SWF button is loaded
+					onUploadComplete // Triggered when a file upload completes (success or error)
+					onUploadError    // Triggered when a file upload returns an error
+					onUploadSuccess  // Triggered when a file is uploaded successfully
+					onUploadProgress // Triggered every time a file progress is updated
+					onUploadStart    // Triggered immediately before a file upload starts
+					*/
+				}, options);
+
+				// Prepare settings for SWFUpload
+				var swfUploadSettings = {
+					assume_success_timeout   : settings.successTimeout,
+					button_placeholder_id    : settings.id,
+					button_width             : settings.width,
+					button_height            : settings.height,
+					button_text              : null,
+					button_text_style        : null,
+					button_text_top_padding  : 0,
+					button_text_left_padding : 0,
+					button_action            : (settings.multi ? SWFUpload.BUTTON_ACTION.SELECT_FILES : SWFUpload.BUTTON_ACTION.SELECT_FILE),
+					button_disabled          : false,
+					button_cursor            : (settings.buttonCursor == 'arrow' ? SWFUpload.CURSOR.ARROW : SWFUpload.CURSOR.HAND),
+					button_window_mode       : SWFUpload.WINDOW_MODE.TRANSPARENT,
+					debug                    : settings.debug,						
+					requeue_on_error         : settings.requeueErrors,
+					file_post_name           : settings.fileObjName,
+					file_size_limit          : settings.fileSizeLimit,
+					file_types               : settings.fileTypeExts,
+					file_types_description   : settings.fileTypeDesc,
+					file_queue_limit         : settings.queueSizeLimit,
+					file_upload_limit        : settings.uploadLimit,
+					flash_url                : settings.swf,					
+					prevent_swf_caching      : settings.preventCaching,
+					post_params              : settings.formData,
+					upload_url               : settings.uploader,
+					use_query_string         : (settings.method == 'get'),
+					
+					// Event Handlers 
+					file_dialog_complete_handler : handlers.onDialogClose,
+					file_dialog_start_handler    : handlers.onDialogOpen,
+					file_queued_handler          : handlers.onSelect,
+					file_queue_error_handler     : handlers.onSelectError,
+					swfupload_loaded_handler     : settings.onSWFReady,
+					upload_complete_handler      : handlers.onUploadComplete,
+					upload_error_handler         : handlers.onUploadError,
+					upload_progress_handler      : handlers.onUploadProgress,
+					upload_start_handler         : handlers.onUploadStart,
+					upload_success_handler       : handlers.onUploadSuccess
+				}
+
+				// Merge the user-defined options with the defaults
+				if (swfUploadOptions) {
+					swfUploadSettings = $.extend(swfUploadSettings, swfUploadOptions);
+				}
+				// Add the user-defined settings to the swfupload object
+				swfUploadSettings = $.extend(swfUploadSettings, settings);
+				
+				// Detect if Flash is available
+				var playerVersion  = swfobject.getFlashPlayerVersion();
+				var flashInstalled = (playerVersion.major >= 9);
+
+				if (flashInstalled) {
+					// Create the swfUpload instance
+					window['uploadify_' + settings.id] = new SWFUpload(swfUploadSettings);
+					var swfuploadify = window['uploadify_' + settings.id];
+
+					// Add the SWFUpload object to the elements data object
+					$this.data('uploadify', swfuploadify);
+					
+					// Wrap the instance
+					var $wrapper = $('<div />', {
+						'id'    : settings.id,
+						'class' : 'uploadify',
+						'css'   : {
+									'height'   : settings.height + 'px',
+									'width'    : settings.width + 'px'
+								  }
+					});
+					$('#' + swfuploadify.movieName).wrap($wrapper);
+					// Recreate the reference to wrapper
+					$wrapper = $('#' + settings.id);
+					// Add the data object to the wrapper 
+					$wrapper.data('uploadify', swfuploadify);
+
+					// Create the button
+					var $button = $('<div />', {
+						'id'    : settings.id + '-button',
+						'class' : 'uploadify-button ' + settings.buttonClass
+					});
+					if (settings.buttonImage) {
+						$button.css({
+							'background-image' : "url('" + settings.buttonImage + "')",
+							'text-indent'      : '-9999px'
+						});
+					}
+					$button.html('<span class="uploadify-button-text">' + settings.buttonText + '</span>')
+					.css({
+						'height'      : settings.height + 'px',
+						'line-height' : settings.height + 'px',
+						'width'       : settings.width + 'px'
+					});
+					// Append the button to the wrapper
+					$wrapper.append($button);
+
+					// Adjust the styles of the movie
+					$('#' + swfuploadify.movieName).css({
+						'position' : 'absolute',
+						'z-index'  : 1
+					});
+					
+					// Create the file queue
+					if (!settings.queueID) {
+						var $queue = $('<div />', {
+							'id'    : settings.id + '-queue',
+							'class' : 'uploadify-queue'
+						});
+						$wrapper.after($queue);
+						swfuploadify.settings.queueID      = settings.id + '-queue';
+						swfuploadify.settings.defaultQueue = true;
+					}
+					
+					// Create some queue related objects and variables
+					swfuploadify.queueData = {
+						files              : {}, // The files in the queue
+						filesSelected      : 0, // The number of files selected in the last select operation
+						filesQueued        : 0, // The number of files added to the queue in the last select operation
+						filesReplaced      : 0, // The number of files replaced in the last select operation
+						filesCancelled     : 0, // The number of files that were cancelled instead of replaced
+						filesErrored       : 0, // The number of files that caused error in the last select operation
+						uploadsSuccessful  : 0, // The number of files that were successfully uploaded
+						uploadsErrored     : 0, // The number of files that returned errors during upload
+						averageSpeed       : 0, // The average speed of the uploads in KB
+						queueLength        : 0, // The number of files in the queue
+						queueSize          : 0, // The size in bytes of the entire queue
+						uploadSize         : 0, // The size in bytes of the upload queue
+						queueBytesUploaded : 0, // The size in bytes that have been uploaded for the current upload queue
+						uploadQueue        : [], // The files currently to be uploaded
+						errorMsg           : 'Some files were not added to the queue:'
+					};
+
+					// Save references to all the objects
+					swfuploadify.original = $clone;
+					swfuploadify.wrapper  = $wrapper;
+					swfuploadify.button   = $button;
+					swfuploadify.queue    = $queue;
+
+					// Call the user-defined init event handler
+					if (settings.onInit) settings.onInit.call($this, swfuploadify);
+
+				} else {
+
+					// Call the fallback function
+					if (settings.onFallback) settings.onFallback.call($this);
+
+				}
+			});
+
+		},
+
+		// Stop a file upload and remove it from the queue 
+		cancel : function(fileID, supressEvent) {
+
+			var args = arguments;
+
+			this.each(function() {
+				// Create a reference to the jQuery DOM object
+				var $this        = $(this),
+					swfuploadify = $this.data('uploadify'),
+					settings     = swfuploadify.settings,
+					delay        = -1;
+
+				if (args[0]) {
+					// Clear the queue
+					if (args[0] == '*') {
+						var queueItemCount = swfuploadify.queueData.queueLength;
+						$('#' + settings.queueID).find('.uploadify-queue-item').each(function() {
+							delay++;
+							if (args[1] === true) {
+								swfuploadify.cancelUpload($(this).attr('id'), false);
+							} else {
+								swfuploadify.cancelUpload($(this).attr('id'));
+							}
+							$(this).find('.data').removeClass('data').html(' - Cancelled');
+							$(this).find('.uploadify-progress-bar').remove();
+							$(this).delay(1000 + 100 * delay).fadeOut(500, function() {
+								$(this).remove();
+							});
+						});
+						swfuploadify.queueData.queueSize   = 0;
+						swfuploadify.queueData.queueLength = 0;
+						// Trigger the onClearQueue event
+						if (settings.onClearQueue) settings.onClearQueue.call($this, queueItemCount);
+					} else {
+						for (var n = 0; n < args.length; n++) {
+							swfuploadify.cancelUpload(args[n]);
+							$('#' + args[n]).find('.data').removeClass('data').html(' - Cancelled');
+							$('#' + args[n]).find('.uploadify-progress-bar').remove();
+							$('#' + args[n]).delay(1000 + 100 * n).fadeOut(500, function() {
+								$(this).remove();
+							});
+						}
+					}
+				} else {
+					var item = $('#' + settings.queueID).find('.uploadify-queue-item').get(0);
+					$item = $(item);
+					swfuploadify.cancelUpload($item.attr('id'));
+					$item.find('.data').removeClass('data').html(' - Cancelled');
+					$item.find('.uploadify-progress-bar').remove();
+					$item.delay(1000).fadeOut(500, function() {
+						$(this).remove();
+					});
+				}
+			});
+
+		},
+
+		// Revert the DOM object back to its original state
+		destroy : function() {
+
+			this.each(function() {
+				// Create a reference to the jQuery DOM object
+				var $this        = $(this),
+					swfuploadify = $this.data('uploadify'),
+					settings     = swfuploadify.settings;
+
+				// Destroy the SWF object and 
+				swfuploadify.destroy();
+				
+				// Destroy the queue
+				if (settings.defaultQueue) {
+					$('#' + settings.queueID).remove();
+				}
+				
+				// Reload the original DOM element
+				$('#' + settings.id).replaceWith(swfuploadify.original);
+
+				// Call the user-defined event handler
+				if (settings.onDestroy) settings.onDestroy.call(this);
+
+				delete swfuploadify;
+			});
+
+		},
+
+		// Disable the select button
+		disable : function(isDisabled) {
+			
+			this.each(function() {
+				// Create a reference to the jQuery DOM object
+				var $this        = $(this),
+					swfuploadify = $this.data('uploadify'),
+					settings     = swfuploadify.settings;
+
+				// Call the user-defined event handlers
+				if (isDisabled) {
+					swfuploadify.button.addClass('disabled');
+					if (settings.onDisable) settings.onDisable.call(this);
+				} else {
+					swfuploadify.button.removeClass('disabled');
+					if (settings.onEnable) settings.onEnable.call(this);
+				}
+
+				// Enable/disable the browse button
+				swfuploadify.setButtonDisabled(isDisabled);
+			});
+
+		},
+
+		// Get or set the settings data
+		settings : function(name, value, resetObjects) {
+
+			var args        = arguments;
+			var returnValue = value;
+
+			this.each(function() {
+				// Create a reference to the jQuery DOM object
+				var $this        = $(this),
+					swfuploadify = $this.data('uploadify'),
+					settings     = swfuploadify.settings;
+
+				if (typeof(args[0]) == 'object') {
+					for (var n in value) {
+						setData(n,value[n]);
+					}
+				}
+				if (args.length === 1) {
+					returnValue =  settings[name];
+				} else {
+					switch (name) {
+						case 'uploader':
+							swfuploadify.setUploadURL(value);
+							break;
+						case 'formData':
+							if (!resetObjects) {
+								value = $.extend(settings.formData, value);
+							}
+							swfuploadify.setPostParams(settings.formData);
+							break;
+						case 'method':
+							if (value == 'get') {
+								swfuploadify.setUseQueryString(true);
+							} else {
+								swfuploadify.setUseQueryString(false);
+							}
+							break;
+						case 'fileObjName':
+							swfuploadify.setFilePostName(value);
+							break;
+						case 'fileTypeExts':
+							swfuploadify.setFileTypes(value, settings.fileTypeDesc);
+							break;
+						case 'fileTypeDesc':
+							swfuploadify.setFileTypes(settings.fileTypeExts, value);
+							break;
+						case 'fileSizeLimit':
+							swfuploadify.setFileSizeLimit(value);
+							break;
+						case 'uploadLimit':
+							swfuploadify.setFileUploadLimit(value);
+							break;
+						case 'queueSizeLimit':
+							swfuploadify.setFileQueueLimit(value);
+							break;
+						case 'buttonImage':
+							swfuploadify.button.css('background-image', settingValue);
+							break;
+						case 'buttonCursor':
+							if (value == 'arrow') {
+								swfuploadify.setButtonCursor(SWFUpload.CURSOR.ARROW);
+							} else {
+								swfuploadify.setButtonCursor(SWFUpload.CURSOR.HAND);
+							}
+							break;
+						case 'buttonText':
+							$('#' + settings.id + '-button').find('.uploadify-button-text').html(value);
+							break;
+						case 'width':
+							swfuploadify.setButtonDimensions(value, settings.height);
+							break;
+						case 'height':
+							swfuploadify.setButtonDimensions(settings.width, value);
+							break;
+						case 'multi':
+							if (value) {
+								swfuploadify.setButtonAction(SWFUpload.BUTTON_ACTION.SELECT_FILES);
+							} else {
+								swfuploadify.setButtonAction(SWFUpload.BUTTON_ACTION.SELECT_FILE);
+							}
+							break;
+					}
+					settings[name] = value;
+				}
+			});
+			
+			if (args.length === 1) {
+				return returnValue;
+			}
+
+		},
+
+		// Stop the current uploads and requeue what is in progress
+		stop : function() {
+
+			this.each(function() {
+				// Create a reference to the jQuery DOM object
+				var $this        = $(this),
+					swfuploadify = $this.data('uploadify');
+
+				// Reset the queue information
+				swfuploadify.queueData.averageSpeed  = 0;
+				swfuploadify.queueData.uploadSize    = 0;
+				swfuploadify.queueData.bytesUploaded = 0;
+				swfuploadify.queueData.uploadQueue   = [];
+
+				swfuploadify.stopUpload();
+			});
+
+		},
+
+		// Start uploading files in the queue
+		upload : function() {
+
+			var args = arguments;
+
+			this.each(function() {
+				// Create a reference to the jQuery DOM object
+				var $this        = $(this),
+					swfuploadify = $this.data('uploadify');
+
+				// Reset the queue information
+				swfuploadify.queueData.averageSpeed  = 0;
+				swfuploadify.queueData.uploadSize    = 0;
+				swfuploadify.queueData.bytesUploaded = 0;
+				swfuploadify.queueData.uploadQueue   = [];
+				
+				// Upload the files
+				if (args[0]) {
+					if (args[0] == '*') {
+						swfuploadify.queueData.uploadSize = swfuploadify.queueData.queueSize;
+						swfuploadify.queueData.uploadQueue.push('*');
+						swfuploadify.startUpload();
+					} else {
+						for (var n = 0; n < args.length; n++) {
+							swfuploadify.queueData.uploadSize += swfuploadify.queueData.files[args[n]].size;
+							swfuploadify.queueData.uploadQueue.push(args[n]);
+						}
+						swfuploadify.startUpload(swfuploadify.queueData.uploadQueue.shift());
+					}
+				} else {
+					swfuploadify.startUpload();
+				}
+
+			});
+
+		}
+
+	}
+
+	// These functions handle all the events that occur with the file uploader
+	var handlers = {
+
+		// Triggered when the file dialog is opened
+		onDialogOpen : function() {
+			// Load the swfupload settings
+			var settings = this.settings;
+
+			// Reset some queue info
+			this.queueData.errorMsg       = 'Some files were not added to the queue:';
+			this.queueData.filesReplaced  = 0;
+			this.queueData.filesCancelled = 0;
+
+			// Call the user-defined event handler
+			if (settings.onDialogOpen) settings.onDialogOpen.call(this);
+		},
+
+		// Triggered when the browse dialog is closed
+		onDialogClose :  function(filesSelected, filesQueued, queueLength) {
+			// Load the swfupload settings
+			var settings = this.settings;
+
+			// Update the queue information
+			this.queueData.filesErrored  = filesSelected - filesQueued;
+			this.queueData.filesSelected = filesSelected;
+			this.queueData.filesQueued   = filesQueued - this.queueData.filesCancelled;
+			this.queueData.queueLength   = queueLength;
+
+			// Run the default event handler
+			if ($.inArray('onDialogClose', settings.overrideEvents) < 0) {
+				if (this.queueData.filesErrored > 0) {
+					alert(this.queueData.errorMsg);
+				}
+			}
+
+			// Call the user-defined event handler
+			if (settings.onDialogClose) settings.onDialogClose.call(this, this.queueData);
+
+			// Upload the files if auto is true
+			if (settings.auto) $('#' + settings.id).uploadify('upload', '*');
+		},
+
+		// Triggered once for each file added to the queue
+		onSelect : function(file) {
+			// Load the swfupload settings
+			var settings = this.settings;
+
+			// Check if a file with the same name exists in the queue
+			var queuedFile = {};
+			for (var n in this.queueData.files) {
+				queuedFile = this.queueData.files[n];
+				if (queuedFile.uploaded != true && queuedFile.name == file.name) {
+					var replaceQueueItem = confirm('The file named "' + file.name + '" is already in the queue.\nDo you want to replace the existing item in the queue?');
+					if (!replaceQueueItem) {
+						this.cancelUpload(file.id);
+						this.queueData.filesCancelled++;
+						return false;
+					} else {
+						$('#' + queuedFile.id).remove();
+						this.cancelUpload(queuedFile.id);
+						this.queueData.filesReplaced++;
+					}
+				}
+			}
+
+			// Get the size of the file
+			var fileSize = Math.round(file.size / 1024);
+			var suffix   = 'KB';
+			if (fileSize > 1000) {
+				fileSize = Math.round(fileSize / 1000);
+				suffix   = 'MB';
+			}
+			var fileSizeParts = fileSize.toString().split('.');
+			fileSize = fileSizeParts[0];
+			if (fileSizeParts.length > 1) {
+				fileSize += '.' + fileSizeParts[1].substr(0,2);
+			}
+			fileSize += suffix;
+			
+			// Truncate the filename if it's too long
+			var fileName = file.name;
+			if (fileName.length > 25) {
+				fileName = fileName.substr(0,25) + '...';
+			}
+
+			// Create the file data object
+			itemData = {
+				'fileID'     : file.id,
+				'instanceID' : settings.id,
+				'fileName'   : fileName,
+				'fileSize'   : fileSize
+			}
+
+			// Create the file item template
+			if (settings.itemTemplate == false) {
+				settings.itemTemplate = '<div id="${fileID}" class="uploadify-queue-item">\
+					<div class="cancel">\
+						<a href="javascript:$(\'#${instanceID}\').uploadify(\'cancel\', \'${fileID}\')">X</a>\
+					</div>\
+					<span class="fileName">${fileName} (${fileSize})</span><span class="data"></span>\
+					<div class="uploadify-progress">\
+						<div class="uploadify-progress-bar"><!--Progress Bar--></div>\
+					</div>\
+				</div>';
+			}
+
+			// Run the default event handler
+			if ($.inArray('onSelect', settings.overrideEvents) < 0) {
+				
+				// Replace the item data in the template
+				itemHTML = settings.itemTemplate;
+				for (var d in itemData) {
+					itemHTML = itemHTML.replace(new RegExp('\\$\\{' + d + '\\}', 'g'), itemData[d]);
+				}
+
+				// Add the file item to the queue
+				$('#' + settings.queueID).append(itemHTML);
+			}
+
+			this.queueData.queueSize += file.size;
+			this.queueData.files[file.id] = file;
+
+			// Call the user-defined event handler
+			if (settings.onSelect) settings.onSelect.apply(this, arguments);
+		},
+
+		// Triggered when a file is not added to the queue
+		onSelectError : function(file, errorCode, errorMsg) {
+			// Load the swfupload settings
+			var settings = this.settings;
+
+			// Run the default event handler
+			if ($.inArray('onSelectError', settings.overrideEvents) < 0) {
+				switch(errorCode) {
+					case SWFUpload.QUEUE_ERROR.QUEUE_LIMIT_EXCEEDED:
+						if (settings.queueSizeLimit > errorMsg) {
+							this.queueData.errorMsg += '\nThe number of files selected exceeds the remaining upload limit (' + errorMsg + ').';
+						} else {
+							this.queueData.errorMsg += '\nThe number of files selected exceeds the queue size limit (' + settings.queueSizeLimit + ').';
+						}
+						break;
+					case SWFUpload.QUEUE_ERROR.FILE_EXCEEDS_SIZE_LIMIT:
+						this.queueData.errorMsg += '\nThe file "' + file.name + '" exceeds the size limit (' + settings.fileSizeLimit + ').';
+						break;
+					case SWFUpload.QUEUE_ERROR.ZERO_BYTE_FILE:
+						this.queueData.errorMsg += '\nThe file "' + file.name + '" is empty.';
+						break;
+					case SWFUpload.QUEUE_ERROR.FILE_EXCEEDS_SIZE_LIMIT:
+						this.queueData.errorMsg += '\nThe file "' + file.name + '" is not an accepted file type (' + settings.fileTypeDesc + ').';
+						break;
+				}
+			}
+			if (errorCode != SWFUpload.QUEUE_ERROR.QUEUE_LIMIT_EXCEEDED) {
+				delete this.queueData.files[file.id];
+			}
+
+			// Call the user-defined event handler
+			if (settings.onSelectError) settings.onSelectError.apply(this, arguments);
+		},
+
+		// Triggered when all the files in the queue have been processed
+		onQueueComplete : function() {
+			if (this.settings.onQueueComplete) this.settings.onQueueComplete.call(this, this.settings.queueData);
+		},
+
+		// Triggered when a file upload successfully completes
+		onUploadComplete : function(file) {
+			// Load the swfupload settings
+			var settings     = this.settings,
+				swfuploadify = this;
+
+			// Check if all the files have completed uploading
+			var stats = this.getStats();
+			this.queueData.queueLength = stats.files_queued;
+			if (this.queueData.uploadQueue[0] == '*') {
+				if (this.queueData.queueLength > 0) {
+					this.startUpload();
+				} else {
+					this.queueData.uploadQueue = [];
+
+					// Call the user-defined event handler for queue complete
+					if (settings.onQueueComplete) settings.onQueueComplete.call(this, this.queueData);
+				}
+			} else {
+				if (this.queueData.uploadQueue.length > 0) {
+					this.startUpload(this.queueData.uploadQueue.shift());
+				} else {
+					this.queueData.uploadQueue = [];
+
+					// Call the user-defined event handler for queue complete
+					if (settings.onQueueComplete) settings.onQueueComplete.call(this, this.queueData);
+				}
+			}
+
+			// Call the default event handler
+			if ($.inArray('onUploadComplete', settings.overrideEvents) < 0) {
+				if (settings.removeCompleted) {
+					switch (file.filestatus) {
+						case SWFUpload.FILE_STATUS.COMPLETE:
+							setTimeout(function() { 
+								if ($('#' + file.id)) {
+									swfuploadify.queueData.queueSize   -= file.size;
+									swfuploadify.queueData.queueLength -= 1;
+									delete swfuploadify.queueData.files[file.id]
+									$('#' + file.id).fadeOut(500, function() {
+										$(this).remove();
+									});
+								}
+							}, settings.removeTimeout * 1000);
+							break;
+						case SWFUpload.FILE_STATUS.ERROR:
+							if (!settings.requeueErrors) {
+								setTimeout(function() {
+									if ($('#' + file.id)) {
+										swfuploadify.queueData.queueSize   -= file.size;
+										swfuploadify.queueData.queueLength -= 1;
+										delete swfuploadify.queueData.files[file.id];
+										$('#' + file.id).fadeOut(500, function() {
+											$(this).remove();
+										});
+									}
+								}, settings.removeTimeout * 1000);
+							}
+							break;
+					}
+				} else {
+					file.uploaded = true;
+				}
+			}
+
+			// Call the user-defined event handler
+			if (settings.onUploadComplete) settings.onUploadComplete.call(this, file);
+		},
+
+		// Triggered when a file upload returns an error
+		onUploadError : function(file, errorCode, errorMsg) {
+			// Load the swfupload settings
+			var settings = this.settings;
+
+			// Set the error string
+			var errorString = 'Error';
+			switch(errorCode) {
+				case SWFUpload.UPLOAD_ERROR.HTTP_ERROR:
+					errorString = 'HTTP Error (' + errorMsg + ')';
+					break;
+				case SWFUpload.UPLOAD_ERROR.MISSING_UPLOAD_URL:
+					errorString = 'Missing Upload URL';
+					break;
+				case SWFUpload.UPLOAD_ERROR.IO_ERROR:
+					errorString = 'IO Error';
+					break;
+				case SWFUpload.UPLOAD_ERROR.SECURITY_ERROR:
+					errorString = 'Security Error';
+					break;
+				case SWFUpload.UPLOAD_ERROR.UPLOAD_LIMIT_EXCEEDED:
+					alert('The upload limit has been reached (' + errorMsg + ').');
+					errorString = 'Exceeds Upload Limit';
+					break;
+				case SWFUpload.UPLOAD_ERROR.UPLOAD_FAILED:
+					errorString = 'Failed';
+					break;
+				case SWFUpload.UPLOAD_ERROR.SPECIFIED_FILE_ID_NOT_FOUND:
+					break;
+				case SWFUpload.UPLOAD_ERROR.FILE_VALIDATION_FAILED:
+					errorString = 'Validation Error';
+					break;
+				case SWFUpload.UPLOAD_ERROR.FILE_CANCELLED:
+					errorString = 'Cancelled';
+					this.queueData.queueSize   -= file.size;
+					this.queueData.queueLength -= 1;
+					if (file.status == SWFUpload.FILE_STATUS.IN_PROGRESS || $.inArray(file.id, this.queueData.uploadQueue) >= 0) {
+						this.queueData.uploadSize -= file.size;
+					}
+					// Trigger the onCancel event
+					if (settings.onCancel) settings.onCancel.call(this, file);
+					delete this.queueData.files[file.id];
+					break;
+				case SWFUpload.UPLOAD_ERROR.UPLOAD_STOPPED:
+					errorString = 'Stopped';
+					break;
+			}
+
+			// Call the default event handler
+			if ($.inArray('onUploadError', settings.overrideEvents) < 0) {
+
+				if (errorCode != SWFUpload.UPLOAD_ERROR.FILE_CANCELLED && errorCode != SWFUpload.UPLOAD_ERROR.UPLOAD_STOPPED) {
+					$('#' + file.id).addClass('uploadify-error');
+				}
+
+				// Reset the progress bar
+				$('#' + file.id).find('.uploadify-progress-bar').css('width','1px');
+
+				// Add the error message to the queue item
+				if (errorCode != SWFUpload.UPLOAD_ERROR.SPECIFIED_FILE_ID_NOT_FOUND && file.status != SWFUpload.FILE_STATUS.COMPLETE) {
+					$('#' + file.id).find('.data').html(' - ' + errorString);
+				}
+			}
+
+			var stats = this.getStats();
+			this.queueData.uploadsErrored = stats.upload_errors;
+
+			// Call the user-defined event handler
+			if (settings.onUploadError) settings.onUploadError.call(this, file, errorCode, errorMsg, errorString);
+		},
+
+		// Triggered periodically during a file upload
+		onUploadProgress : function(file, fileBytesLoaded, fileTotalBytes) {
+			// Load the swfupload settings
+			var settings = this.settings;
+
+			// Setup all the variables
+			var timer            = new Date();
+			var newTime          = timer.getTime();
+			var lapsedTime       = newTime - this.timer;
+			if (lapsedTime > 500) {
+				this.timer = newTime;
+			}
+			var lapsedBytes      = fileBytesLoaded - this.bytesLoaded;
+			this.bytesLoaded     = fileBytesLoaded;
+			var queueBytesLoaded = this.queueData.queueBytesUploaded + fileBytesLoaded;
+			var percentage       = Math.round(fileBytesLoaded / fileTotalBytes * 100);
+			
+			// Calculate the average speed
+			var suffix = 'KB/s';
+			var mbs = 0;
+			var kbs = (lapsedBytes / 1024) / (lapsedTime / 1000);
+			    kbs = Math.floor(kbs * 10) / 10;
+			if (this.queueData.averageSpeed > 0) {
+				this.queueData.averageSpeed = Math.floor((this.queueData.averageSpeed + kbs) / 2);
+			} else {
+				this.queueData.averageSpeed = Math.floor(kbs);
+			}
+			if (kbs > 1000) {
+				mbs = (kbs * .001);
+				this.queueData.averageSpeed = Math.floor(mbs);
+				suffix = 'MB/s';
+			}
+			
+			// Call the default event handler
+			if ($.inArray('onUploadProgress', settings.overrideEvents) < 0) {
+				if (settings.progressData == 'percentage') {
+					$('#' + file.id).find('.data').html(' - ' + percentage + '%');
+				} else if (settings.progressData == 'speed' && lapsedTime > 500) {
+					$('#' + file.id).find('.data').html(' - ' + this.queueData.averageSpeed + suffix);
+				}
+				$('#' + file.id).find('.uploadify-progress-bar').css('width', percentage + '%');
+			}
+
+			// Call the user-defined event handler
+			if (settings.onUploadProgress) settings.onUploadProgress.call(this, file, fileBytesLoaded, fileTotalBytes, queueBytesLoaded, this.queueData.uploadSize);
+		},
+
+		// Triggered right before a file is uploaded
+		onUploadStart : function(file) {
+			// Load the swfupload settings
+			var settings = this.settings;
+
+			var timer        = new Date();
+			this.timer       = timer.getTime();
+			this.bytesLoaded = 0;
+			if (this.queueData.uploadQueue.length == 0) {
+				this.queueData.uploadSize = file.size;
+			}
+			if (settings.checkExisting) {
+				$.ajax({
+					type    : 'POST',
+					async   : false,
+					url     : settings.checkExisting,
+					data    : {filename: file.name},
+					success : function(data) {
+						if (data == 1) {
+							var overwrite = confirm('A file with the name "' + file.name + '" already exists on the server.\nWould you like to replace the existing file?');
+							if (!overwrite) {
+								this.cancelUpload(file.id);
+								$('#' + file.id).remove();
+								if (this.queueData.uploadQueue.length > 0 && this.queueData.queueLength > 0) {
+									if (this.queueData.uploadQueue[0] == '*') {
+										this.startUpload();
+									} else {
+										this.startUpload(this.queueData.uploadQueue.shift());
+									}
+								}
+							}
+						}
+					}
+				});
+			}
+
+			// Call the user-defined event handler
+			if (settings.onUploadStart) settings.onUploadStart.call(this, file); 
+		},
+
+		// Triggered when a file upload returns a successful code
+		onUploadSuccess : function(file, data, response) {
+			// Load the swfupload settings
+			var settings = this.settings;
+			var stats    = this.getStats();
+			this.queueData.uploadsSuccessful = stats.successful_uploads;
+			this.queueData.queueBytesUploaded += file.size;
+
+			// Call the default event handler
+			if ($.inArray('onUploadSuccess', settings.overrideEvents) < 0) {
+				$('#' + file.id).find('.data').html(' - Complete');
+			}
+
+			// Call the user-defined event handler
+			if (settings.onUploadSuccess) settings.onUploadSuccess.call(this, file, data, response); 
+		}
+
+	}
+
+	$.fn.uploadify = function(method) {
+
+		if (methods[method]) {
+			return methods[method].apply(this, Array.prototype.slice.call(arguments, 1));
+		} else if (typeof method === 'object' || !method) {
+			return methods.init.apply(this, arguments);
+		} else {
+			$.error('The method ' + method + ' does not exist in $.uploadify');
+		}
+
+	}
+
+})($);
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/uploadify/uploadify-cancel.png b/pluss-manage-page/src/main/resources/static/resources/auth/uploadify/uploadify-cancel.png
new file mode 100644
index 0000000..35682b0
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/uploadify/uploadify-cancel.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/uploadify/uploadify.css b/pluss-manage-page/src/main/resources/static/resources/auth/uploadify/uploadify.css
new file mode 100644
index 0000000..0d4d5e5
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/uploadify/uploadify.css
@@ -0,0 +1,92 @@
+/*
+Uploadify
+Copyright (c) 2012 Reactive Apps, Ronnie Garcia
+Released under the MIT License <http://www.opensource.org/licenses/mit-license.php> 
+*/
+
+.uploadify {
+	position: relative;
+	margin-bottom: 1em;
+}
+.uploadify-button {
+	background-color: #505050;
+	background-image: linear-gradient(bottom, #505050 0%, #707070 100%);
+	background-image: -o-linear-gradient(bottom, #505050 0%, #707070 100%);
+	background-image: -moz-linear-gradient(bottom, #505050 0%, #707070 100%);
+	background-image: -webkit-linear-gradient(bottom, #505050 0%, #707070 100%);
+	background-image: -ms-linear-gradient(bottom, #505050 0%, #707070 100%);
+	background-image: -webkit-gradient(
+		linear,
+		left bottom,
+		left top,
+		color-stop(0, #505050),
+		color-stop(1, #707070)
+	);
+	background-position: center top;
+	background-repeat: no-repeat;
+	-webkit-border-radius: 30px;
+	-moz-border-radius: 30px;
+	border-radius: 30px;
+	border: 2px solid #808080;
+	color: #FFF;
+	font: bold 12px Arial, Helvetica, sans-serif;
+	text-align: center;
+	text-shadow: 0 -1px 0 rgba(0,0,0,0.25);
+	width: 100%;
+}
+.uploadify:hover .uploadify-button {
+	background-color: #606060;
+	background-image: linear-gradient(top, #606060 0%, #808080 100%);
+	background-image: -o-linear-gradient(top, #606060 0%, #808080 100%);
+	background-image: -moz-linear-gradient(top, #606060 0%, #808080 100%);
+	background-image: -webkit-linear-gradient(top, #606060 0%, #808080 100%);
+	background-image: -ms-linear-gradient(top, #606060 0%, #808080 100%);
+	background-image: -webkit-gradient(
+		linear,
+		left bottom,
+		left top,
+		color-stop(0, #606060),
+		color-stop(1, #808080)
+	);
+	background-position: center bottom;
+}
+.uploadify-button.disabled {
+	background-color: #D0D0D0;
+	color: #808080;
+}
+.uploadify-queue {
+	margin-bottom: 1em;
+}
+.uploadify-queue-item {
+	background-color: #F5F5F5;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+	font: 11px Verdana, Geneva, sans-serif;
+	margin-top: 5px;
+	max-width: 350px;
+	padding: 10px;
+}
+.uploadify-error {
+	background-color: #FDE5DD !important;
+}
+.uploadify-queue-item .cancel a {
+	background: url('uploadify-cancel.png') 0 0 no-repeat;
+	float: right;
+	height:	16px;
+	text-indent: -9999px;
+	width: 16px;
+}
+.uploadify-queue-item.completed {
+	background-color: #E5E5E5;
+}
+.uploadify-progress {
+	background-color: #E5E5E5;
+	margin-top: 10px;
+	width: 100%;
+}
+.uploadify-progress-bar {
+	background-color: #0099FF;
+	height: 3px;
+	width: 1px;
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/uploadify/uploadify.swf b/pluss-manage-page/src/main/resources/static/resources/auth/uploadify/uploadify.swf
new file mode 100644
index 0000000..2889221
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/uploadify/uploadify.swf differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/API_cn.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/API_cn.html
new file mode 100644
index 0000000..60bd7d1
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/API_cn.html
@@ -0,0 +1,103 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+		<title>API 文档 [zTree --  jQuery 树插件]</title>
+		<link rel="stylesheet" href="apiCss/common.css" type="text/css">
+		<link rel='stylesheet' href='apiCss/zTreeStyleForApi.css' type='text/css'>
+		<script type="text/javascript">
+			var ie = (function(){
+				var undef,
+				v = 3,
+				div = document.createElement('div'),
+				all = div.getElementsByTagName('i');
+				while (
+				div.innerHTML = '<!--[if gt IE ' + (++v) + ']><i></i><![endif]-->',
+				all[0]
+			);
+				return v > 4 ? v : undef;
+			}()), ie6 = (ie === 6),
+			path = window.location.pathname.replace(/.*\/([^\/\.]*)\..*/g,"$1"),
+			langLib = [];
+			ie = ie<9;
+			if(ie) {
+				document.write('<link rel="stylesheet" href="apiCss/common_ie6.css" type="text/css">');
+			}
+			var lang = "cn",
+			ajaxMsg = "如果你使用的是 Chrome 浏览器，那么请把 API 文档发布到 web 服务目录下访问。\n\n（Chrome 浏览器不支持本地 ajax 访问, 即：file://）";
+
+		</script>
+	</head>
+	<body>
+		<div id="header_wrap" class="header_wrap" style="padding-top: 30px;">
+			<div id="header" class="header round">
+				<div class="light-bulb" alt=""></div>
+				<div class="ieSuggest">浏览本网站建议您使用 Chrome、FireFox、Opera、IE9 等浏览器（只要不是 IE6 7 8 就行）, 速度会更快，画面会更炫！</div>
+				<div class="google_plus"><g:plusone></g:plusone></div>
+				<div class="header-text">
+					<h1><em>zTree v3.5.15 API 文档</em></h1><p></p>
+					<p>all.js = core + excheck + exedit ( 不包括 exhide ); 发现错误请及时通知，谢谢。</p>
+				</div>
+				<ul class="shortcuts language" style="top:0;">
+					<li><a href="API_en.html" onclick="window.location.href='API_en.html'"><button class="ico en" title="英文版" type="button"></button><span class=""></span></a></li>
+				</ul>
+			</div>
+		</div>
+		<div id="content_wrap" class="content_wrap">
+			<div id="content" class="content">
+				<div class="nav_section">
+					<ul>
+						<li class="first">注释：</li>
+						<li><button class="ico16 z_core" onfocus="this.blur();"></button><span>core 核心包</span></li>
+						<li><button class="ico16 z_check" onfocus="this.blur();"></button><span>excheck 扩展</span></li>
+						<li><button class="ico16 z_edit" onfocus="this.blur();"></button><span>exedit 扩展</span></li>
+						<li><button class="ico16 z_hide" onfocus="this.blur();"></button><span>exhide 扩展</span></li>
+						<li class="noline">
+							<button class="ico16 z_search" onfocus="this.blur();" title="Enter 以及 左、右键可以快速定位查找结果"></button>
+							<input type="text" class="searchKey search empty" value=""><input type="text" class="searchResult search" value="">
+							<button class="ico16 searchPrev disabled" onfocus="this.blur();" title="Enter 以及 左、右键可以快速定位查找结果"></button><button class="ico16 searchNext disabled" onfocus="this.blur();" title="Enter 以及 左、右键可以快速定位查找结果"></button>
+						</li>
+					</ul>
+				</div>
+
+				<div id="contentBox" class="contentBox round clearfix">
+					<div id="apiContent" class="apiContent">
+						<div id="api_setting" class="api_setting left">
+							<ul class="api_content_title"><li>setting 配置详解</li></ul>
+							<ul id="settingTree" class="ztree"></ul>
+						</div>
+						<div id="api_function" class="api_function right">
+							<ul class="api_content_title"><li>zTree 方法详解</li></ul>
+							<ul id="functionTree" class="ztree"></ul>
+							<ul class="api_content_title"><li>treeNode 节点数据详解</li></ul>
+							<ul id="treenodeTree" class="ztree"></ul>
+						</div>
+					</div>
+				</div>
+				<div class="clear"></div>
+			</div>
+		</div>
+
+		<!-- overlayed -->
+		<div id="overlayDiv" class="baby_overlay">
+			<div id="overlayContent" class="content round clearfix">
+				<div class="overlaySearch">
+					<button class="ico16 z_search" onfocus="this.blur();" title="Enter 以及 左、右键可以快速定位查找结果"></button>
+					<input type="text" class="searchKey search empty" value=""><input type="text" class="searchResult search" value="">
+					<button class="ico16 searchPrev disabled" onfocus="this.blur();" title="Enter 以及 左、右键可以快速定位查找结果"></button><button class="ico16 searchNext disabled" onfocus="this.blur();" title="Enter 以及 左、右键可以快速定位查找结果"></button>
+				</div>
+				<a id="overlayDivCloseBtn" class="close"></a>
+				<div id="overlayDetailDiv" class="details"></div>
+			</div>
+			<div id="overlayDivArrow" class="baby_overlay_arrow"></div>
+		</div>
+		<script type="text/javascript" src="apiCss/jquery-1.6.2.min.js"></script>
+		<script type='text/javascript' src='apiCss/jquery.ztree.core-3.5.js'></script>
+		<script type='text/javascript' src='apiCss/api.js'></script>
+		<script type="text/javascript">
+			$(document).ready(function(){
+				apiContent._init();
+			});
+		</script>
+	</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/API_en.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/API_en.html
new file mode 100644
index 0000000..69e0580
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/API_en.html
@@ -0,0 +1,102 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+		<title>API Document [zTree -- jQuery tree plug-ins.]</title>
+		<link rel="stylesheet" href="apiCss/common.css" type="text/css">
+		<link rel='stylesheet' href='apiCss/zTreeStyleForApi.css' type='text/css'>
+		<script type="text/javascript">
+			var ie = (function(){
+				var undef,
+				v = 3,
+				div = document.createElement('div'),
+				all = div.getElementsByTagName('i');
+				while (
+				div.innerHTML = '<!--[if gt IE ' + (++v) + ']><i></i><![endif]-->',
+				all[0]
+			);
+				return v > 4 ? v : undef;
+			}()), ie6 = (ie === 6),
+			path = window.location.pathname.replace(/.*\/([^\/\.]*)\..*/g,"$1"),
+			langLib = [];
+			ie = ie<9;
+			if(ie) {
+				document.write('<link rel="stylesheet" href="apiCss/common_ie6.css" type="text/css">');
+			}
+			var lang = "en",
+			ajaxMsg = "If you use chrome browser, please copy the API files to local webserver. \n\n( because chrome browser can't allow AJAX access to 'file://' )";
+		</script>
+	</head>
+	<body>
+		<div id="header_wrap" class="header_wrap" style="padding-top: 30px;">
+			<div id="header" class="header round">
+				<div class="light-bulb" alt=""></div>
+				<div class="ieSuggest">If you use the Chrome / FireFox / Opera / IE9 browser will be even more dazzling effect!</div>
+				<div class="google_plus"><g:plusone></g:plusone></div>
+				<div class="header-text">
+					<h1><em>zTree v3.5.15 API Document</em></h1><p></p>
+					<p>all.js = core + excheck + exedit ( without exhide ); if you found some mistakes please contact me.</p>
+				</div>
+				<ul class="shortcuts language" style="top:0;">
+					<li><a href="API_cn.html" onclick="window.location.href='API_cn.html'"><button class="ico cn" title="Chinese" type="button"></button><span class=""></span></a></li>
+				</ul>
+			</div>
+		</div>
+		<div id="content_wrap" class="content_wrap">
+			<div id="content" class="content">
+				<div class="nav_section">
+					<ul>
+						<li class="first">Notes: </li>
+						<li><button class="ico16 z_core" onfocus="this.blur();"></button><span>core package</span></li>
+						<li><button class="ico16 z_check" onfocus="this.blur();"></button><span>excheck pack</span></li>
+						<li><button class="ico16 z_edit" onfocus="this.blur();"></button><span>exedit pack</span></li>
+						<li><button class="ico16 z_hide" onfocus="this.blur();"></button><span>exhide pack</span></li>
+						<li class="noline">
+							<button class="ico16 z_search" onfocus="this.blur();" title="'Enter', 'left' and 'right' key can locate the search results quickly."></button>
+							<input type="text" class="searchKey search empty" value=""><input type="text" class="searchResult search" value="">
+							<button class="ico16 searchPrev disabled" onfocus="this.blur();" title="'Enter', 'left' and 'right' key can locate the search results quickly."></button><button class="ico16 searchNext disabled" onfocus="this.blur();" title="'Enter', 'left' and 'right' key can locate the search results quickly."></button>
+						</li>
+					</ul>
+				</div>
+
+				<div id="contentBox" class="contentBox round clearfix">
+					<div id="apiContent" class="apiContent">
+						<div id="api_setting" class="api_setting left">
+							<ul class="api_content_title"><li>setting details</li></ul>
+							<ul id="settingTree" class="ztree"></ul>
+						</div>
+						<div id="api_function" class="api_function right">
+							<ul class="api_content_title"><li>zTree method details</li></ul>
+							<ul id="functionTree" class="ztree"></ul>
+							<ul class="api_content_title"><li>treeNode data details</li></ul>
+							<ul id="treenodeTree" class="ztree"></ul>
+						</div>
+					</div>
+				</div>
+				<div class="clear"></div>
+			</div>
+		</div>
+
+		<!-- overlayed -->
+		<div id="overlayDiv" class="baby_overlay">
+			<div id="overlayContent" class="content round clearfix">
+				<div class="overlaySearch">
+					<button class="ico16 z_search" onfocus="this.blur();" title="'Enter', 'left' and 'right' key can locate the search results quickly."></button>
+					<input type="text" class="searchKey search empty" value=""><input type="text" class="searchResult search" value="">
+					<button class="ico16 searchPrev disabled" onfocus="this.blur();" title="'Enter', 'left' and 'right' key can locate the search results quickly."></button><button class="ico16 searchNext disabled" onfocus="this.blur();" title="'Enter', 'left' and 'right' key can locate the search results quickly."></button>
+				</div>
+				<a id="overlayDivCloseBtn" class="close"></a>
+				<div id="overlayDetailDiv" class="details"></div>
+			</div>
+			<div id="overlayDivArrow" class="baby_overlay_arrow"></div>
+		</div>
+		<script type="text/javascript" src="apiCss/jquery-1.6.2.min.js"></script>
+		<script type='text/javascript' src='apiCss/jquery.ztree.core-3.5.js'></script>
+		<script type='text/javascript' src='apiCss/api.js'></script>
+		<script type="text/javascript">
+			$(document).ready(function(){
+				apiContent._init();
+			});
+		</script>
+	</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/apiCss/api.js b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/apiCss/api.js
new file mode 100644
index 0000000..84fb59e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/apiCss/api.js
@@ -0,0 +1,591 @@
+var apiContent = {
+	zTree_Setting: null,
+	zTree_Node: null,
+	zTree_Function: null,
+	overlayDiv : null,
+	overlayContent : null,
+	overlayDetailDiv : null,
+	overlayCloseBtn: null,
+	overlayArrow: null,
+	contentBoxDiv : null,
+	settingDiv : null,
+	functionDiv : null,
+	overlaySearch: null,
+	searchKey: null,
+	searchResultInput: null,
+	searchPrevBtn: null,
+	searchNextBtn: null,
+	apiCache: {},
+	lastValue: "",
+	searchNodes: [],
+	searchNodesCur: 0,
+
+	_init: function() {
+		this.overlayDiv = $("#overlayDiv");
+		this.overlayContent = $("#overlayContent");
+		this.overlayDetailDiv = $("#overlayDetailDiv");
+		this.overlayCloseBtn = $("#overlayDivCloseBtn");
+		this.overlayArrow = $("#overlayDivArrow");
+		this.contentBoxDiv = $("#contentBox");
+		this.settingDiv = $("#api_setting");
+		this.functionDiv = $("#api_function");
+		this.searchKey = $(".searchKey");
+		this.overlaySearch = $(".overlaySearch");
+		this.searchResultInput = $(".searchResult");
+		this.searchPrevBtn = $(".searchPrev");
+		this.searchNextBtn = $(".searchNext");
+		var setting = {
+			view: {
+				fontCss: this.getFontCss,
+				showLine: false,
+				showIcon: this.showIcon,
+				showTitle: this.getTitle,
+				selectedMulti: false,
+				dblClickExpand: false
+			},
+			data: {
+				key: {
+					title: "tt"
+				},
+				simpleData: {
+					enable:true,
+					idKey: "id",
+					pIdKey: "pId",
+					rootPId: ""
+				}
+			},
+			callback: {
+				onNodeCreated: this.onNodeCreated,
+				beforeClick: this.beforeClick
+			}
+		}
+		var setting_nodes =[
+			{id:1, pId:0, t:"setting", name:"var setting = {", open:true},
+			{id:11, pId:1, t:"treeId", name:"treeId : \"\",", iconSkin:"core", showAPI:true},
+			{id:12, pId:1, t:"treeObj", name:"treeObj : null,", iconSkin:"core", showAPI:true},
+			{id:121, pId:1, name:""},
+
+			{id:20, pId:1, t:"async", name:"async : {", open:true},
+			{id:201, pId:20, t:"autoParam", name:"autoParam : [],", iconSkin:"core", showAPI:true},
+			{id:208, pId:20, t:"contentType", name:"contentType : \"application...\",", iconSkin:"core", showAPI:true},
+			{id:202, pId:20, t:"dataFilter", name:"dataFilter : null,", iconSkin:"core", showAPI:true},
+			{id:203, pId:20, t:"dataType", name:"dataType : \"text\",", iconSkin:"core", showAPI:true},
+			{id:204, pId:20, t:"enable", name:"enable : false,", iconSkin:"core", showAPI:true},
+			{id:205, pId:20, t:"otherParam", name:"otherParam : [],", iconSkin:"core", showAPI:true},
+			{id:206, pId:20, t:"type", name:"type : \"post\",", iconSkin:"core", showAPI:true},
+			{id:207, pId:20, t:"url", name:"url : \"\"", iconSkin:"core", showAPI:true},
+			{id:21, pId:1, name:"},"},
+			{id:22, pId:1, name:""},
+
+			{id:30, pId:1, t:"callback", name:"callback : {", open:true},
+			{id:3001, pId:30, t:"beforeAsync", name:"beforeAsync : null,", iconSkin:"core", showAPI:true},
+			{id:3002, pId:30, t:"beforeCheck", name:"beforeCheck : null,", iconSkin:"check", showAPI:true},
+			{id:3003, pId:30, t:"beforeClick", name:"beforeClick : null,", iconSkin:"core", showAPI:true},
+			{id:3004, pId:30, t:"beforeCollapse", name:"beforeCollapse : null,", iconSkin:"core", showAPI:true},
+			{id:3004, pId:30, t:"beforeDblClick", name:"beforeDblClick : null,", iconSkin:"core", showAPI:true},
+			{id:3005, pId:30, t:"beforeDrag", name:"beforeDrag : null,", iconSkin:"edit", showAPI:true},
+			{id:3006, pId:30, t:"beforeDragOpen", name:"beforeDragOpen : null,", iconSkin:"edit", showAPI:true},
+			{id:3007, pId:30, t:"beforeDrop", name:"beforeDrop : null,", iconSkin:"edit", showAPI:true},
+			{id:3029, pId:30, t:"beforeEditName", name:"beforeEditName : null,", iconSkin:"edit", showAPI:true},
+			{id:3008, pId:30, t:"beforeExpand", name:"beforeExpand : null,", iconSkin:"core", showAPI:true},
+			{id:3009, pId:30, t:"beforeMouseDown", name:"beforeMouseDown : null,", iconSkin:"core", showAPI:true},
+			{id:3010, pId:30, t:"beforeMouseUp", name:"beforeMouseUp : null,", iconSkin:"core", showAPI:true},
+			{id:3011, pId:30, t:"beforeRemove", name:"beforeRemove : null,", iconSkin:"edit", showAPI:true},
+			{id:3012, pId:30, t:"beforeRename", name:"beforeRename : null,", iconSkin:"edit", showAPI:true},
+			{id:3013, pId:30, t:"beforeRightClick", name:"beforeRightClick : null,", iconSkin:"core", showAPI:true},
+			{id:3014, pId:30, name:""},
+			{id:3015, pId:30, t:"onAsyncError", name:"onAsyncError : null,", iconSkin:"core", showAPI:true},
+			{id:3016, pId:30, t:"onAsyncSuccess", name:"onAsyncSuccess : null,", iconSkin:"core", showAPI:true},
+			{id:3017, pId:30, t:"onCheck", name:"onCheck : null,", iconSkin:"check", showAPI:true},
+			{id:3018, pId:30, t:"onClick", name:"onClick : null,", iconSkin:"core", showAPI:true},
+			{id:3019, pId:30, t:"onCollapse", name:"onCollapse : null,", iconSkin:"core", showAPI:true},
+			{id:3019, pId:30, t:"onDblClick", name:"onDblClick : null,", iconSkin:"core", showAPI:true},
+			{id:3020, pId:30, t:"onDrag", name:"onDrag : null,", iconSkin:"edit", showAPI:true},
+			{id:3021, pId:30, t:"onDrop", name:"onDrop : null,", iconSkin:"edit", showAPI:true},
+			{id:3022, pId:30, t:"onExpand", name:"onExpand : null,", iconSkin:"core", showAPI:true},
+			{id:3023, pId:30, t:"onMouseDown", name:"onMouseDown : null,", iconSkin:"core", showAPI:true},
+			{id:3024, pId:30, t:"onMouseUp", name:"onMouseUp : null,", iconSkin:"core", showAPI:true},
+			{id:3025, pId:30, t:"onNodeCreated", name:"onNodeCreated : null,", iconSkin:"core", showAPI:true},
+			{id:3026, pId:30, t:"onRemove", name:"onRemove : null,", iconSkin:"edit", showAPI:true},
+			{id:3027, pId:30, t:"onRename", name:"onRename : null,", iconSkin:"edit", showAPI:true},
+			{id:3028, pId:30, t:"onRightClick", name:"onRightClick : null", iconSkin:"core", showAPI:true},
+			{id:31, pId:1, name:"},"},
+			{id:32, pId:1, name:""},
+
+			{id:40, pId:1, t:"check", name:"check : {", open:true},
+			{id:405, pId:40, t:"autoCheckTrigger", name:"autoCheckTrigger : false,", iconSkin:"check", showAPI:true},
+			{id:401, pId:40, t:"chkboxType", name:"chkboxType : {\"Y\": \"ps\", \"N\": \"ps\"},", iconSkin:"check", showAPI:true},
+			{id:402, pId:40, t:"chkStyle", name:"chkStyle : \"checkbox\",", iconSkin:"check", showAPI:true},
+			{id:403, pId:40, t:"enable", name:"enable : false,", iconSkin:"check", showAPI:true},
+			{id:406, pId:40, t:"nocheckInherit", name:"nocheckInherit : false", iconSkin:"check", showAPI:true},
+			{id:407, pId:40, t:"chkDisabledInherit", name:"chkDisabledInherit : false", iconSkin:"check", showAPI:true},
+			{id:404, pId:40, t:"radioType", name:"radioType : \"level\"", iconSkin:"check", showAPI:true},
+			{id:41, pId:1, name:"},"},
+			{id:42, pId:1, name:""},
+
+			{id:50, pId:1, t:"data", name:"data : {", open:true},
+			{id:500, pId:50, t:"keep", name:"keep : {", open:true},
+			{id:5001, pId:500, t:"leaf", name:"leaf : false,", iconSkin:"core", showAPI:true},
+			{id:5002, pId:500, t:"parent", name:"parent : false", iconSkin:"core", showAPI:true},
+			{id:501, pId:50, name:"},"},
+
+			{id:510, pId:50, t:"key", name:"key : {", open:true},
+			{id:5101, pId:510, t:"checked", name:"checked : \"checked\",", iconSkin:"check", showAPI:true},
+			{id:5102, pId:510, t:"children", name:"children : \"children\",", iconSkin:"core", showAPI:true},
+			{id:5103, pId:510, t:"name", name:"name : \"name\",", iconSkin:"core", showAPI:true},
+			{id:5104, pId:510, t:"title", name:"title : \"\"", iconSkin:"core", showAPI:true},
+			{id:5105, pId:510, t:"url", name:"url : \"url\"", iconSkin:"core", showAPI:true},
+			{id:511, pId:50, name:"},"},
+
+			{id:520, pId:50, t:"simpleData", name:"simpleData : {", open:true},
+			{id:5201, pId:520, t:"enable", name:"enable : false,", iconSkin:"core", showAPI:true},
+			{id:5202, pId:520, t:"idKey", name:"idKey : \"id\",", iconSkin:"core", showAPI:true},
+			{id:5203, pId:520, t:"pIdKey", name:"pIdKey : \"pId\",", iconSkin:"core", showAPI:true},
+			{id:5204, pId:520, t:"rootPId", name:"rootPId : null", iconSkin:"core", showAPI:true},
+			{id:521, pId:50, name:"}"},
+			{id:51, pId:1, name:"},"},
+			{id:52, pId:1, name:""},
+
+			{id:60, pId:1, t:"edit", name:"edit : {", open:true},
+			{id:601, pId:60, t:"drag", name:"drag : {", open:true},
+			{id:60111, pId:601, t:"autoExpandTrigger", name:"autoExpandTrigger : true,", iconSkin:"edit", showAPI:true},
+			{id:60101, pId:601, t:"isCopy", name:"isCopy : true,", iconSkin:"edit", showAPI:true},
+			{id:60102, pId:601, t:"isMove", name:"isMove : true,", iconSkin:"edit", showAPI:true},
+			{id:60103, pId:601, t:"prev", name:"prev : true,", iconSkin:"edit", showAPI:true},
+			{id:60104, pId:601, t:"next", name:"next : true,", iconSkin:"edit", showAPI:true},
+			{id:60105, pId:601, t:"inner", name:"inner : true,", iconSkin:"edit", showAPI:true},
+			{id:60107, pId:601, t:"borderMax", name:"borderMax : 10,", iconSkin:"edit", showAPI:true},
+			{id:60108, pId:601, t:"borderMin", name:"borderMin : -5,", iconSkin:"edit", showAPI:true},
+			{id:60106, pId:601, t:"minMoveSize", name:"minMoveSize : 5,", iconSkin:"edit", showAPI:true},
+			{id:60109, pId:601, t:"maxShowNodeNum", name:"maxShowNodeNum : 5,", iconSkin:"edit", showAPI:true},
+			{id:60110, pId:601, t:"autoOpenTime", name:"autoOpenTime : 500", iconSkin:"edit", showAPI:true},
+			{id:602, pId:60, name:"},"},
+			{id:608, pId:60, t:"editNameSelectAll", name:"editNameSelectAll : false,", iconSkin:"edit", showAPI:true},
+			{id:603, pId:60, t:"enable", name:"enable : false,", iconSkin:"edit", showAPI:true},
+			{id:604, pId:60, t:"removeTitle", name:"removeTitle : \"remove\",", iconSkin:"edit", showAPI:true},
+			{id:605, pId:60, t:"renameTitle", name:"renameTitle : \"rename\",", iconSkin:"edit", showAPI:true},
+			{id:606, pId:60, t:"showRemoveBtn", name:"showRemoveBtn : true,", iconSkin:"edit", showAPI:true},
+			{id:607, pId:60, t:"showRenameBtn", name:"showRenameBtn : true", iconSkin:"edit", showAPI:true},
+			{id:61, pId:1, name:"},"},
+			{id:62, pId:1, name:""},
+
+			{id:70, pId:1, t:"view", name:"view : {", open:true},
+			{id:7001, pId:70, t:"addDiyDom", name:"addDiyDom : null,", iconSkin:"core", showAPI:true},
+			{id:7002, pId:70, t:"addHoverDom", name:"addHoverDom : null,", iconSkin:"edit", showAPI:true},
+			{id:7003, pId:70, t:"autoCancelSelected", name:"autoCancelSelected : true,", iconSkin:"core", showAPI:true},
+			{id:7004, pId:70, t:"dblClickExpand", name:"dblClickExpand : true,", iconSkin:"core", showAPI:true},
+			{id:7005, pId:70, t:"expandSpeed", name:"expandSpeed : \"fast\",", iconSkin:"core", showAPI:true},
+			{id:7006, pId:70, t:"fontCss", name:"fontCss : {},", iconSkin:"core", showAPI:true},
+			{id:7012, pId:70, t:"nameIsHTML", name:"nameIsHTML : false,", iconSkin:"core", showAPI:true},
+			{id:7007, pId:70, t:"removeHoverDom", name:"removeHoverDom : null,", iconSkin:"edit", showAPI:true},
+			{id:7008, pId:70, t:"selectedMulti", name:"selectedMulti : true,", iconSkin:"core", showAPI:true},
+			{id:7009, pId:70, t:"showIcon", name:"showIcon : true,", iconSkin:"core", showAPI:true},
+			{id:7010, pId:70, t:"showLine", name:"showLine : true,", iconSkin:"core", showAPI:true},
+			{id:7011, pId:70, t:"showTitle", name:"showTitle : true,", iconSkin:"core", showAPI:true},
+			{id:7012, pId:70, t:"txtSelectedEnable", name:"txtSelectedEnable : false", iconSkin:"core", showAPI:true},
+			{id:71, pId:1, name:"}"},
+
+			{id:2, pId:0, name:"}"}
+		];
+
+		var treenode_nodes =[
+			{id:1, pId:0, t:"treeNode", name:"treeNode : {", open:true},
+			{id:101, pId:1, t:"checked", name:"checked", iconSkin:"check", showAPI:true},
+			{id:102, pId:1, t:"children", name:"children", iconSkin:"core", showAPI:true},
+			{id:128, pId:1, t:"chkDisabled", name:"chkDisabled", iconSkin:"check", showAPI:true},
+			{id:127, pId:1, t:"click", name:"click", iconSkin:"core", showAPI:true},
+			{id:103, pId:1, t:"getCheckStatus", name:"getCheckStatus ()", iconSkin:"check", showAPI:true},
+			{id:104, pId:1, t:"getNextNode", name:"getNextNode ()", iconSkin:"core", showAPI:true},
+			{id:105, pId:1, t:"getParentNode", name:"getParentNode ()", iconSkin:"core", showAPI:true},
+			{id:106, pId:1, t:"getPreNode", name:"getPreNode ()", iconSkin:"core", showAPI:true},
+			{id:129, pId:1, t:"halfCheck", name:"halfCheck", iconSkin:"check", showAPI:true},
+			{id:107, pId:1, t:"icon", name:"icon", iconSkin:"core", showAPI:true},
+			{id:108, pId:1, t:"iconClose", name:"iconClose", iconSkin:"core", showAPI:true},
+			{id:109, pId:1, t:"iconOpen", name:"iconOpen", iconSkin:"core", showAPI:true},
+			{id:110, pId:1, t:"iconSkin", name:"iconSkin", iconSkin:"core", showAPI:true},
+			{id:131, pId:1, t:"isHidden", name:"isHidden", iconSkin:"hide", showAPI:true},
+			{id:111, pId:1, t:"isParent", name:"isParent", iconSkin:"core", showAPI:true},
+			{id:132, pId:1, t:"name", name:"name", iconSkin:"core", showAPI:true},
+			{id:112, pId:1, t:"nocheck", name:"nocheck", iconSkin:"check", showAPI:true},
+			{id:113, pId:1, t:"open", name:"open", iconSkin:"core", showAPI:true},
+			{id:133, pId:1, t:"target", name:"target", iconSkin:"core", showAPI:true},
+			{id:134, pId:1, t:"url", name:"url", iconSkin:"core", showAPI:true},
+			{id:114, pId:1, t:"diy", name:"*DIY*", iconSkin:"core", showAPI:true},
+			{id:115, pId:1, name:""},
+			{id:116, pId:1, t:"check_Child_State", name:"[check_Child_State]", iconSkin:"check", showAPI:true},
+			{id:117, pId:1, t:"check_Focus", name:"[check_Focus]", iconSkin:"check", showAPI:true},
+			{id:118, pId:1, t:"checkedOld", name:"[checkedOld]", iconSkin:"check", showAPI:true},
+			{id:119, pId:1, t:"editNameFlag", name:"[editNameFlag]", iconSkin:"edit", showAPI:true},
+			{id:120, pId:1, t:"isAjaxing", name:"[isAjaxing]", iconSkin:"core", showAPI:true},
+			{id:121, pId:1, t:"isFirstNode", name:"[isFirstNode]", iconSkin:"core", showAPI:true},
+			{id:122, pId:1, t:"isHover", name:"[isHover]", iconSkin:"edit", showAPI:true},
+			{id:123, pId:1, t:"isLastNode", name:"[isLastNode]", iconSkin:"core", showAPI:true},
+			{id:124, pId:1, t:"level", name:"[level]", iconSkin:"core", showAPI:true},
+			{id:125, pId:1, t:"parentTId", name:"[parentTId]", iconSkin:"core", showAPI:true},
+			{id:126, pId:1, t:"tId", name:"[tId]", iconSkin:"core", showAPI:true},
+			{id:130, pId:1, t:"zAsync", name:"[zAsync]", iconSkin:"core", showAPI:true},
+			{id:2, pId:0, name:"}"}
+		];
+
+		var function_nodes =[
+			{id:1, pId:0, t:"$.fn.zTree", name:"$.fn.zTree : {", open:true},
+			{id:11, pId:1, t:"init", name:"init (obj, zSetting, zNodes)", iconSkin:"core", showAPI:true},
+			{id:12, pId:1, t:"getZTreeObj", name:"getZTreeObj (treeId)", iconSkin:"core", showAPI:true},
+			{id:14, pId:1, t:"destroy", name:"destroy (treeId)", iconSkin:"core", showAPI:true},
+			{id:13, pId:1, t:"_z", name:"_z : {tools, view, event, data}", iconSkin:"core", showAPI:true},
+			{id:2, pId:0, name:"}"},
+			{id:3, pId:0, name:""},
+			{id:4, pId:0, t:"zTreeObj", name:"zTreeObj : {", open:true},
+			{id:401, pId:4, t:"setting", name:"setting", iconSkin:"core", showAPI:true},
+			{id:402, pId:4, t:"addNodes", name:"addNodes (parentNode, newNodes, isSilent)", iconSkin:"core", showAPI:true},
+			{id:403, pId:4, t:"cancelEditName", name:"cancelEditName (newName)", iconSkin:"edit", showAPI:true},
+			{id:404, pId:4, t:"cancelSelectedNode", name:"cancelSelectedNode (node)", iconSkin:"core", showAPI:true},
+			{id:405, pId:4, t:"checkAllNodes", name:"checkAllNodes (checked)", iconSkin:"check", showAPI:true},
+			{id:406, pId:4, t:"checkNode", name:"checkNode (node, checked, checkTypeFlag, callbackFlag)", iconSkin:"check", showAPI:true},
+			{id:407, pId:4, t:"copyNode", name:"copyNode (targetNode, node, moveType, isSilent)", iconSkin:"edit", showAPI:true},
+			{id:436, pId:4, t:"destroy", name:"destroy ()", iconSkin:"core", showAPI:true},
+			{id:408, pId:4, t:"editName", name:"editName (node)", iconSkin:"edit", showAPI:true},
+			{id:409, pId:4, t:"expandAll", name:"expandAll (expandFlag)", iconSkin:"core", showAPI:true},
+			{id:410, pId:4, t:"expandNode", name:"expandNode (node, expandFlag, sonSign, focus, callbackFlag)", iconSkin:"core", showAPI:true},
+			{id:411, pId:4, t:"getChangeCheckedNodes", name:"getChangeCheckedNodes ()", iconSkin:"check", showAPI:true},
+			{id:412, pId:4, t:"getCheckedNodes", name:"getCheckedNodes (checked)", iconSkin:"check", showAPI:true},
+			{id:413, pId:4, t:"getNodeByParam", name:"getNodeByParam (key, value, parentNode)", iconSkin:"core", showAPI:true},
+			{id:414, pId:4, t:"getNodeByTId", name:"getNodeByTId (tId)", iconSkin:"core", showAPI:true},
+			{id:415, pId:4, t:"getNodeIndex", name:"getNodeIndex (node)", iconSkin:"core", showAPI:true},
+			{id:416, pId:4, t:"getNodes", name:"getNodes ()", iconSkin:"core", showAPI:true},
+			{id:431, pId:4, t:"getNodesByFilter", name:"getNodesByFilter (filter, isSingle, parentNode, invokeParam)", iconSkin:"core", showAPI:true},
+			{id:417, pId:4, t:"getNodesByParam", name:"getNodesByParam (key, value, parentNode)", iconSkin:"core", showAPI:true},
+			{id:418, pId:4, t:"getNodesByParamFuzzy", name:"getNodesByParamFuzzy (key, value, parentNode)", iconSkin:"core", showAPI:true},
+			{id:419, pId:4, t:"getSelectedNodes", name:"getSelectedNodes ()", iconSkin:"core", showAPI:true},
+			{id:432, pId:4, t:"hideNode", name:"hideNode (node)", iconSkin:"hide", showAPI:true},
+			{id:433, pId:4, t:"hideNodes", name:"hideNodes (nodes)", iconSkin:"hide", showAPI:true},
+			{id:420, pId:4, t:"moveNode", name:"moveNode (targetNode, node, moveType, isSilent)", iconSkin:"edit", showAPI:true},
+			{id:421, pId:4, t:"reAsyncChildNodes", name:"reAsyncChildNodes (parentNode, reloadType, isSilent)", iconSkin:"core", showAPI:true},
+			{id:422, pId:4, t:"refresh", name:"refresh ()", iconSkin:"core", showAPI:true},
+			{id:423, pId:4, t:"removeChildNodes", name:"removeChildNodes (parentNode)", iconSkin:"core", showAPI:true},
+			{id:424, pId:4, t:"removeNode", name:"removeNode (node, callbackFlag)", iconSkin:"core", showAPI:true},
+			{id:425, pId:4, t:"selectNode", name:"selectNode (node, addFlag)", iconSkin:"core", showAPI:true},
+			{id:430, pId:4, t:"setChkDisabled", name:"setChkDisabled (node, disabled, inheritParent, inheritChildren)", iconSkin:"check", showAPI:true},
+			{id:426, pId:4, t:"setEditable", name:"setEditable (editable)", iconSkin:"edit", showAPI:true},
+			{id:434, pId:4, t:"showNode", name:"showNode (node)", iconSkin:"hide", showAPI:true},
+			{id:435, pId:4, t:"showNodes", name:"showNodes (nodes)", iconSkin:"hide", showAPI:true},
+			{id:427, pId:4, t:"transformToArray", name:"transformToArray (nodes)", iconSkin:"core", showAPI:true},
+			{id:428, pId:4, t:"transformTozTreeNodes", name:"transformTozTreeNodes (simpleNodes)", iconSkin:"core", showAPI:true},
+			{id:429, pId:4, t:"updateNode", name:"updateNode (node, checkTypeFlag)", iconSkin:"core", showAPI:true},
+			{id:5, pId:0, name:"}"}
+		];
+
+		apiContent.zTree_Setting = $.fn.zTree.init($("#settingTree"), $.fn.zTree._z.tools.clone(setting), setting_nodes);
+		apiContent.zTree_Node = $.fn.zTree.init($("#treenodeTree"), $.fn.zTree._z.tools.clone(setting), treenode_nodes);
+		apiContent.zTree_Function = $.fn.zTree.init($("#functionTree"), $.fn.zTree._z.tools.clone(setting), function_nodes);
+		this.bindEvent();
+
+	},
+	bindEvent: function() {
+		$(document).bind("keydown", this.listenKeyDown)
+		this.overlayCloseBtn.bind("click", apiContent.overlayClose);
+		this.searchResultInput.bind("click", function(e) {
+			$(this).prev().get(0).focus();
+			this.blur();
+		}).bind("focus", function(e) {
+			this.blur();
+		});
+		this.searchKey.bind("focus", this.focusKey)
+			.bind("blur", this.blurKey)
+			.bind("propertychange", this.searchNode)
+			.bind("input", this.searchNode);
+		this.searchPrevBtn.bind("click", this.searchPrev);
+		this.searchNextBtn.bind("click", this.searchNext);
+	},
+	setSameKey: function(value) {
+		apiContent.searchKey.attr("value", value);
+	},
+	focusKey: function(e) {
+		if (apiContent.searchKey.hasClass("empty")) {
+			apiContent.searchKey.removeClass("empty");
+		}
+	},
+	blurKey: function(e) {
+		apiContent.setSameKey(e.target.value);
+		if (e.target.value === "") {
+			apiContent.searchKey.addClass("empty");
+		}
+	},
+	listenKeyDown: function(e) {
+		if (e.keyCode=="13" && apiContent.overlayDiv.is(":hidden")) {
+			apiContent.openAPI();
+		} else if (e.keyCode=="37") {
+			apiContent.searchPrev();
+		} else if (e.keyCode=="13" || e.keyCode=="39") {
+			apiContent.searchNext();
+		}
+	},
+	openAPI: function() {
+		if (apiContent.searchNodes.length > 0) {
+			var setting_zTree = $.fn.zTree.getZTreeObj("settingTree"),
+			treenode_zTree = $.fn.zTree.getZTreeObj("treenodeTree"),
+			function_zTree = $.fn.zTree.getZTreeObj("functionTree");
+			if (apiContent.searchNodesCur < 0 || apiContent.searchNodesCur > apiContent.searchNodes.length -1) {
+				apiContent.searchNodesCur = 0;
+			}
+			var node = apiContent.searchNodes[apiContent.searchNodesCur];
+
+			if (node.tId.indexOf("setting") > -1) {
+				setting_zTree.selectNode(node);
+			} else if (node.tId.indexOf("treenode") > -1) {
+				treenode_zTree.selectNode(node);
+			} else {
+				function_zTree.selectNode(node);
+			}
+			apiContent.beforeClick(node.tId.substring(0, node.tId.indexOf("_")), node, true);
+			apiContent.searchCur();
+		}
+	},
+	searchNode: function(e) {
+		var setting_zTree = $.fn.zTree.getZTreeObj("settingTree"),
+		treenode_zTree = $.fn.zTree.getZTreeObj("treenodeTree"),
+		function_zTree = $.fn.zTree.getZTreeObj("functionTree");
+		if (apiContent.curKey == e.target.value) return;
+		apiContent.curKey = e.target.value;
+		var value = $.trim(apiContent.curKey);
+		apiContent.setSameKey(apiContent.curKey);
+		if (apiContent.searchKey.hasClass("empty")) {
+			value = "";
+			apiContent.searchResultInput.removeClass("noResult").attr("value","");
+		}
+		if (apiContent.lastValue === value) return;
+
+		apiContent.updateNodes(false);
+		apiContent.lastValue = value;
+		if (value === "" || value.length < 2) {
+			apiContent.searchNodes = [];
+			apiContent.searchNodesCur = -1;
+			apiContent.searchCur(true);
+			return;
+		}
+
+		var settingNodeList = setting_zTree.getNodesByFilter(apiContent.searchFilter);
+		var functionNodeList = function_zTree.getNodesByFilter(apiContent.searchFilter);
+		var treenodeNodeList = treenode_zTree.getNodesByFilter(apiContent.searchFilter);
+		apiContent.searchNodes = settingNodeList.concat(functionNodeList).concat(treenodeNodeList);
+		apiContent.searchNodesCur = -1;
+		apiContent.searchCur();
+		apiContent.updateNodes(true);
+	},
+	searchFilter: function(node) {
+		var value = $.trim(apiContent.searchKey.get(0).value).toLowerCase();
+		return (node.showAPI && node.name.toLowerCase().indexOf(value) > -1);
+	},
+	searchPrev: function(e) {
+		if (apiContent.searchPrevBtn.hasClass("disabled")) return;
+		apiContent.searchNodesCur--;
+		if (apiContent.searchNodesCur < 0 || apiContent.searchNodesCur > apiContent.searchNodes.length -1) {
+			apiContent.searchNodesCur = apiContent.searchNodes.length -1;
+		}
+		apiContent.openAPI();
+	},
+	searchNext: function(e) {
+		if (apiContent.searchNextBtn.hasClass("disabled")) return;
+		apiContent.searchNodesCur++;
+		apiContent.openAPI();
+	},
+	searchCur: function(init) {
+		var result = apiContent.searchNodes;
+		if (init) {
+			apiContent.searchResultInput.removeClass("noResult").attr("value","");
+		} else if (result.length == 0) {
+			apiContent.searchResultInput.addClass("noResult").attr("value","  [ 0 / 0 ]  ");
+		} else {
+			apiContent.searchResultInput.removeClass("noResult").attr("value"," [ " + (apiContent.searchNodesCur > -1 ? apiContent.searchNodesCur+1 : "?")+ " / " + result.length + " ] ");
+		}
+		if (result.length > 0) {
+			apiContent.searchPrevBtn.removeClass("disabled");
+			apiContent.searchNextBtn.removeClass("disabled");
+		} else {
+			apiContent.searchPrevBtn.addClass("disabled");
+			apiContent.searchNextBtn.addClass("disabled");
+		}
+	},
+	updateNodes: function(highlight) {
+		var setting_zTree = $.fn.zTree.getZTreeObj("settingTree"),
+		treenode_zTree = $.fn.zTree.getZTreeObj("treenodeTree"),
+		function_zTree = $.fn.zTree.getZTreeObj("functionTree"),
+		node = null;
+		for( var i=0, l=apiContent.searchNodes.length; i<l; i++) {
+			node = apiContent.searchNodes[i];
+			if (node.level > 0) {
+				node.highlight = highlight;
+				if (node.tId.indexOf("setting") > -1) {
+					setting_zTree.updateNode(node);
+				} else if (node.tId.indexOf("treenode") > -1) {
+					treenode_zTree.updateNode(node);
+				} else {
+					function_zTree.updateNode(node);
+				}
+			}
+		}
+	},
+	getFontCss: function(treeId, treeNode) {
+		return (!!treeNode.highlight) ? {color:"#A60000", "font-weight":"bold"} : {color:"#333", "font-weight":"normal"};
+	},
+	getTitle: function(treeId, node) {
+		var t = [], n = node;
+		while (n && !!n.t) {
+			t.push(n.t);
+			n = n.getParentNode();
+		}
+		t = t.reverse();
+		node.tt = t.join('.');
+		return true;
+	},
+	showIcon: function(treeId, node) {
+		return (!!node.iconSkin);
+	},
+	onNodeCreated: function (e, treeId, node) {
+		var a = $("#" + node.tId + "_a");
+		if (node.showAPI) {
+			a.attr("rel", "#overlayDiv");
+		} else {
+			a.css({cursor: "default"});
+		}
+	},
+	beforeClick: function (treeId, node, noClear) {
+		if (!node.showAPI) return false;
+		var o = $("#" + node.tId + "_a");
+		if (!!apiContent.apiCache[node.tId]) {
+			apiContent.tmpDiv.html(apiContent.apiCache[node.tId]);
+			apiContent.overlayShow(o, (apiContent.lastNode === node));
+		} else {
+			apiContent.overlayAjax(treeId, node);
+		}
+		apiContent.lastNode = node;
+		if (node.tId.indexOf("settingTree")>-1) {
+			apiContent.settingDiv.removeClass("right").addClass("left");
+			apiContent.functionDiv.removeClass("left").addClass("right");
+		} else {
+			apiContent.settingDiv.removeClass("left").addClass("right");
+			apiContent.functionDiv.removeClass("right").addClass("left");
+		}
+
+		if (!noClear) {
+			apiContent.clearSelectedNode();
+		}
+		return true;
+	},
+	clearSelectedNode: function() {
+		apiContent.zTree_Setting.cancelSelectedNode();
+		apiContent.zTree_Node.cancelSelectedNode();
+		apiContent.zTree_Function.cancelSelectedNode();
+	},
+	overlayAutoClose: function(e) {
+		var eId = e.target.id, eRel = e.target.getAttribute("rel"), eClass = e.target.className;
+		if (eId === "overlayDiv" || eId === "overlayDivArrow" || eClass.indexOf("searchPrev") > -1 || eClass.indexOf("searchNext") > -1 || !!eRel) return;
+		if (!$(e.target).parents("[rel]").length && !$(e.target).parents("#overlayDiv").length) {
+			apiContent.overlayClose();
+		}
+	},
+	overlayClose: function() {
+		var o = apiContent.overlayDiv;
+		o.stop();
+		apiContent.clearSelectedNode();
+		if (ie) {
+			o.hide();
+		} else {
+			setTimeout(function() {o.fadeTo("fast", 0, function(){o.hide();})}, 200);
+		}
+		$(document).unbind("click", apiContent.overlayAutoClose);
+	},
+	overlayShow: function(target, isSameNode) {
+		var w = $(window), o = apiContent.overlayDiv, a = apiContent.overlayArrow,
+		oc = apiContent.overlayContent, c = apiContent.contentBoxDiv,
+		t = target.offset().top - 30,
+		cMaxLeft = c.offset().left + c.outerWidth({margin:true}) - o.outerWidth({margin:true}) - 10,
+		l = Math.min(cMaxLeft, target.offset().left + target.width() + 40),
+		arrowT = target.offset().top + 16,
+		wMinTop = 100, footerHeight = 50, onlyFade = false,
+		wHeight = w.height(), wScrollTop=w.scrollTop(), wMaxTop = wHeight + wScrollTop - footerHeight;
+		if (!apiContent.overlayMaxTop) {
+			apiContent.overlayMaxTop = apiContent.contentBoxDiv.offset().top + apiContent.contentBoxDiv.height();
+		}
+		o.stop();
+		if (o.css("display") !== "block") {
+			o.css({top: t, left: l});
+			a.css({top:arrowT - t});
+			$(document).bind("click", apiContent.overlayAutoClose);
+		}
+		if (ie) {
+			onlyFade = true;
+			o.show();
+		} else {
+			o.fadeTo("fast", 1);
+		}
+
+		var h = apiContent.tmpDiv.outerHeight({margin:true}) + apiContent.overlaySearch.outerHeight();
+		if ((t + h) > wMaxTop) {
+			t = wMaxTop - h;
+		}
+		if ((t + h) > apiContent.overlayMaxTop) {
+			t = apiContent.overlayMaxTop - h;
+		}
+		t = Math.max(t, wScrollTop, wMinTop);
+		if ((t + h) > ($("body").height()-footerHeight-20)) {
+			o.css("padding-bottom", footerHeight + "px");
+		} else {
+			o.css("padding-bottom", "0");
+		}
+		apiContent.overlayDetailDiv.empty();
+		apiContent.overlayDetailDiv.append(apiContent.tmpDiv.children());
+		if (!onlyFade) {
+			onlyFade = (isSameNode && t === parseInt(o.css("top").replace("px", "")));
+		}
+
+		a.removeClass("reverse");
+		if ( (arrowT - t) > (h-55) ) {
+			a.addClass("reverse");
+			arrowT -= 55;
+		}
+
+		if (onlyFade) {
+			o.css({top: t, left: l});
+			oc.css({height: h});
+			a.css({top:arrowT - t});
+		} else {
+			o.animate({top: t, left: l}, {duration: "normal",easing: "swing", complete:null});
+			oc.animate({height: h}, {duration: "fast",easing: "swing", complete:null});
+			a.animate({top:arrowT - t}, {duration: "normal",easing: "linear", complete:null});
+		}
+	},
+	overlayAjax: function(treeId, node) {
+		var o = $("#" + node.tId + "_a");
+		if (node.isAjax) return;
+		node.isAjax = true;
+		$.ajax({
+			type: "get",
+			url: "" + lang + "/" + node.tt.replace("$.", "") + ".html",
+			data: null,
+			dataType: "text",
+			success: function(msg) {
+				if (!apiContent.tmpDiv) {
+					var tmpDiv = $(document.createElement("div"));
+					tmpDiv.addClass("baby_overlay_tmp");
+					$("body").append(tmpDiv)
+					apiContent.tmpDiv = $(document.createElement("div"));
+					apiContent.tmpDiv.addClass("details");
+					tmpDiv.append(apiContent.tmpDiv);
+
+				} else {
+					apiContent.tmpDiv.empty();
+				}
+				apiContent.tmpDiv.html(msg);
+				apiContent.overlayShow(o, false);
+				apiContent.apiCache[node.tId] = msg;
+				node.isAjax = false;
+			},
+			error: function(XMLHttpRequest, textStatus, errorThrown) {
+				alert(ajaxMsg)
+				if (apiContent.tmpDiv) apiContent.tmpDiv.empty();
+				node.isAjax = false;
+			}
+		});
+	}
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/apiCss/common.css b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/apiCss/common.css
new file mode 100644
index 0000000..78f910c
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/apiCss/common.css
@@ -0,0 +1,219 @@
+/* Resets */
+html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, font, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td {
+	margin: 0;padding: 0;border: 0;outline: 0;font-weight: inherit;font-style: inherit;font-size: 100%;font-family: inherit;vertical-align: baseline;}
+:focus {outline: 0;}
+body {color: #2f332a;font: 15px/21px Arial, Helvetica, simsun, sans-serif;background: #528036 url(img/background.jpg) no-repeat fixed 0 0;}
+p {padding-bottom: 20px;}
+ol, ul {list-style: none;}
+table {border-collapse: separate;border-spacing: 0;}
+caption, th, td {text-align: left;font-weight: normal;}
+strong {font-weight: bold;}
+em {font-style: italic;}
+hr {display: none;}
+.font1 {color: white;background-color: #528036;}
+.right {float: right;}
+.left {float: left;}
+.hide {display: none;}
+.round {-moz-border-radius: 15px;-webkit-border-radius: 15px;-khtml-border-radius: 15px;border-radius: 15px;}
+.clear {clear: both;}
+.clearfix {display: block;}
+.clearfix:after {content: ".";display: block;clear: both;visibility: hidden;line-height: 0;height: 0;}
+html[xmlns] .clearfix {display: block;}
+* html .clearfix {height: 1%;}
+
+/* Link Styles */
+a {color: #528036;}
+a:link, a:visited {text-decoration: none;}
+a:hover {color: #000;text-decoration: none;}
+a:active {text-decoration: none;}
+
+/* Headings */
+h1, h2, h3, h4, h5, h6 {color: #2f332a;font-weight: bold;font-family: Helvetica, Arial, simsun, sans-serif;padding-bottom: 5px;}
+h1 {font-size: 36px;line-height: 44px;}
+h2 {font-size: 20px;line-height: 20px;}
+h3 {font-size: 14px;line-height: 14px;}
+h4 {font-size: 14px;font-weight: normal;line-height: 25px;}
+
+/* Wraps */
+.header_wrap {position: relative;min-width: 940px;padding: 100px 30px 0 30px;}
+.content_wrap {position: relative;min-width: 940px;padding: 0 30px 50px 30px;}
+.footer_wrap {bottom: 0;height: 47px;width: 100%;background-color: #1b1b1b;border-top: 1px solid #749e58;}
+
+/* Header */
+.header {position: relative;width: 940px;margin: 0 auto;height: 160px;border: 1px solid white;background: transparent url(img/header-bg.png) repeat-x 0 -50px;}
+.header-text {padding: 40px 25px 15px 120px;font-size: 18px;line-height: 24px;color: #747d67;font-family: Helvetica, sans-serif;}
+.header-text img {padding-bottom: 5px;}
+.shortcuts {white-space: nowrap;text-align: right;position: absolute;top: -45px;right: 5px;}
+.shortcuts.language {top: -85px;right:0px;}
+.shortcuts li {display: inline;font-size: 18px;line-height: 28px;font-family: Helvetica, Arial, simsun, sans-serif;padding-bottom: 5px;margin-left: 30px;cursor: pointer;}
+.shortcuts li button {cursor: pointer;}
+.shortcuts li span {border-bottom: 1px dotted white;}
+.shortcuts li span.selected {padding: 2px;background-color: #528036;}
+.shortcuts li a {color: #fff;}
+.ieSuggest {display:none;font-size: 12px;color: silver;position: absolute;left: 10px;top: 2px;}
+.google_plus {position: absolute;right: 10px; top:10px;}
+.light-bulb {position: absolute;left: -20px;bottom: -35px;width:116px;height:180px;background-image:url(img/lightbulb.png);background-repeat: no-repeat;}
+
+/* Content */
+.content {position: relative;width: 940px;margin: 0 auto;}
+.nav_section {position: relative;height: 20px;font-family: "Myriad Pro", "Trebuchet MS", sans-serif;font-size: 15px;color: #253;padding: 20px 0;}
+.nav_section ul {position: absolute;right: 10px;}
+.nav_section ul li {display: inline;line-height: 20px;margin: 0 5px 0 20px;border-bottom: 1px dotted white;}
+.nav_section ul li.noline {border-bottom: 0;}
+.nav_section ul li a {color: #fff;}
+.nav_section ul li a.selected {padding: 2px;background-color: #528036;}
+.nav_section ul li.first {border: none;}
+.content .title {margin: 50px 30px 20px 70px;}
+.content li {margin-bottom: 5px;}
+.contentBox {position: relative;overflow: hidden;border: 1px solid white;min-height: 200px;line-height: 25px;background: transparent url(img/contact-bg.png) repeat-x 0 0;}
+
+.zTreeInfo {display:none;width: 940px;position: absolute;}
+.zTreeInfo p {padding-bottom: 50px;}
+.zTreeInfo-left {float: left;width: 280px;height:300px;padding: 0 50px 60px 75px;background:url(img/zTreeIntroduction.jpg) no-repeat 30px 30px;}
+.zTreeInfo-right {position: relative;float: right;width: 475px;padding: 0 50px 60px 0;}
+.zTreeInfo-right li {font-size: 12px;list-style-type: disc;}
+
+.license {display:none;width: 940px;position: absolute;}
+
+.donateInfo {display:block;width: 940px;position: absolute;}
+
+.links {display:none;width: 940px;position: absolute;}
+.links .content {float: left;width: 160px;height:200px;padding: 0 10px 10px 2px;text-align: center;}
+.links .content.first {margin-left: 30px;}
+
+.contact {display:none;width: 940px;position: absolute;}
+.contact .myhome { position: absolute; top:10px; left:620px; width:300px; height:266px; background: transparent url(img/myhome.gif) scroll no-repeat 0 0;}
+
+.siteTag {position: absolute;left: -16px;top: 109px;z-index: 10;width: 65px;height: 46px;padding:0;margin:0 10px 0 0;
+		 vertical-align:middle;border:0 none;background: transparent url(img/siteTag.png) scroll no-repeat 0 0;}
+.siteTag.tag_zTreeInfo {background-position: 0 0}
+.siteTag.tag_license {background-position: 0 -46px}
+.siteTag.tag_donate {background-position: 0 -92px}
+.siteTag.tag_contact {background-position: 0 -138px}
+
+.apiContent {width: 940px;}
+.apiContent .right {float: right;padding-right: 100px;}
+.apiContent .left {float: left;padding-right: 20px;border-right: 1px dotted silver;}
+.api_setting {position: relative;margin:20px 0 20px 20px;}
+.api_function {position: relative;margin:20px 0 20px 30px;padding-right: 10px;}
+.api_content_title {text-align: center;font-weight: bold;}
+
+.demoContent {width: 940px;}
+.demoContent .right {float: right;padding: 20px;width: 600px;}
+.demoContent .left {float: left;padding: 20px;}
+.demoContent iframe {width:600px;min-height: 530px;}
+
+.faqContent {width: 940px;}
+.faqContent .right {float: right;padding: 20px;width: 600px;}
+.faqContent .left {float: left;padding: 20px;}
+.faqContent iframe {width:600px;min-height: 300px;}
+
+.baby_overlay_tmp {position: absolute;top:0; left:-5000px;display:block;visibility: hidden;width:640px;font-size:11px;}
+.baby_overlay_tmp .details {padding: 20px;}
+.baby_overlay {display:none;position:absolute;z-index:99;left:0; top:0;width:640px;color:#fff;font-size:11px;}
+.baby_overlay .content {width:100%; height:100px;overflow: hidden;background: transparent url(img/overlay_bg.png) scroll repeat 0 0;}
+.baby_overlay .details {padding:0 20px 20px 20px;}
+.baby_overlay .close {background-image:url(img/close.png);position:absolute; right:5px; top:5px;cursor:pointer;height:36px;width:36px;}
+.baby_overlay_arrow {background-image:url(img/overlay_arrow.png);background-position:0 0;position:absolute;height:40px;width:40px;left: -40px;}
+.baby_overlay_arrow.reverse {background-position:0 -40px;}
+
+/* Footer */
+.footer {position: relative;min-width: 1000px;font: 14px/24px arial, helvetica, sans-serif;}
+.footer ul {position:absolute;left: 0px;border:1px solid #393939;background:#262626;padding:12px 0px;line-height: 18px;display: none;list-style: none;}
+.footer ul li a {display:block;padding: 2px 15px;color: #9c9c9c;text-indent: 0;}
+.footer ul li a:hover {text-decoration:none;color: #fff;}
+.footer-logo {position:absolute;margin: 10px 0 0 30px;width:122px; height:24px;top:0; left:0;background: transparent url(img/footer-logo.png) no-repeat 0 0;}
+.footer_mii {position: absolute;right: 558px;top: 8px;z-index: 10;padding: 4px 0;}
+.footer_mii a {font-size:10px;color:#649140}
+.footer_mii a:hover {color:#B6D76F}
+.footer_siteMap {position: absolute;right: 358px;top: 8px;width: 155px;z-index: 10;padding: 4px 0;}
+.footer_siteMap .footer_siteMap_header {width:155px;text-indent: -9999px;background: transparent url(img/footer_siteMap.gif) no-repeat 0 0;}
+.footer_siteMap ul {top:-202px;width:180px;}
+.footer_siteMap:hover ul {left: 0}
+.footer_contact {position: absolute;right: 193px;top: 8px;width: 155px;z-index: 10;padding: 4px 0;}
+.footer_contact .footer_contact_header {width:155px;text-indent: -9999px;background: transparent url(img/footer_contact.gif) no-repeat 0px 0px;}
+.footer_contact ul {top:-113px;width:153px;}
+.footer_contact:hover ul {left: 0}
+.footer_download {position: absolute;right: 60px;top: 8px;width: 123px;z-index: 10;padding: 4px 0;}
+.footer_download .footer_download_header {width:123px;text-indent: -9999px;background: transparent url(img/footer_download.png) no-repeat 0px 0px;}
+.footer_download ul {top:-113px;width:140px;}
+.footer_download:hover ul {left: 0}
+
+/* button icon */
+button {vertical-align:middle;border:0 none;background: transparent no-repeat 0 0 scroll;}
+
+.shortcuts button.ico {width:24px; height:24px;padding:0; margin:0 10px 0 0;background-image:url(img/menuIcon.png)}
+.shortcuts button.home {background-position: 0 0}
+.shortcuts button.demo {background-position: 0 -24px}
+.shortcuts button.api {background-position: 0 -48px}
+.shortcuts button.faq {background-position: 0 -72px}
+.shortcuts button.donate {background-position: 0 -144px}
+.shortcuts button.download {background-position: 0 -96px}
+.shortcuts button.face {background-position: 0 -120px}
+.shortcuts button.cn {width:48px; height:24px;padding:0; margin:0 10px 0 0;background-image:url(img/chinese.png)}
+.shortcuts button.en {width:48px; height:24px;padding:0; margin:0 10px 0 0;background-image:url(img/english.png)}
+
+.content button.ico {width:24px; height:24px;padding:0; margin:0 10px 0 0;}
+
+.content button.ico16 {width:16px; height:16px;padding:0; margin:0 5px 0 0;background-image:url("img/apiMenu.png");}
+button.z_core {margin-top: -4px;background-position:0 0;}
+button.z_check {margin-top: -4px;background-position:0 -16px;}
+button.z_edit {margin-top: -4px;background-position:0 -32px;}
+button.z_hide {margin-top: -4px;background-position:0 -64px;}
+button.z_search {margin-top: -4px;background-position:0 -48px;}
+button.searchPrev {margin-top: -4px;background-position:-16px 0;cursor:pointer}
+button.searchNext {margin-top: -4px;background-position:-16px -16px;cursor:pointer}
+button.searchPrev.disabled {margin-top: -4px;background-position:-16px -32px;cursor:auto}
+button.searchNext.disabled {margin-top: -4px;background-position:-16px -48px;cursor:auto}
+input.search {margin:0;padding:2px 0; border:0;}
+input.searchKey {width:150px;}
+input.searchResult {margin-left:-3px;width:65px;text-align:right;background-color:white;color:#707070}
+input.searchResult.noResult {background-color:#ff6666;color:black}
+.baby_overlay div.overlaySearch {text-align:right;padding-right:50px;padding-top:12px;}
+
+/* api overlay*/
+.apiDetail .topLine {border-top: 1px dashed #376B29;margin-top: 5px;padding-top: 5px;}
+.apiDetail .highlight_red {color:#A60000;}
+.apiDetail .highlight_green {color:#A7F43D;}
+.apiDetail h1, .apiDetail h2, .apiDetail h3, .apiDetail h4, .apiDetail h5, .apiDetail h6 {color: white;padding: 0;}
+.apiDetail h2 {color: #A7F43D;margin: 5px auto;padding: 5px;font-size: 20px;}
+.apiDetail h2 span {font-size: 14px;float: right;font-weight: normal;margin: 2px 20px 0 0;vertical-align: bottom;}
+.apiDetail h2 span.path {float: left;margin: 2px 0 0 0;vertical-align: bottom;}
+.apiDetail h3 {margin: 5px auto;padding: 5px;font-size: 14px;font-weight: normal;}
+.apiDetail h3 span.h3_info {margin-left: 20px;font-size: 12px;}
+.apiDetail h4 {margin: 0 auto;padding: 0 5px;font-size: 12px;font-weight: normal;line-height: 16px;}
+.apiDetail .desc h4 {color: black;}
+.apiDetail h4 b{width: 150px;display:inline-block;}
+.apiDetail h4 span{width: 230px;display:inline-block;}
+
+.apiDetail pre, .apiDetail .desc {background: #E8FCD6;color: black;margin: 10px;padding: 10px;display: block;}
+.apiDetail pre {word-wrap: break-word;}
+.apiDetail p{margin-left: 5px;padding: 0;}
+.apiDetail .longdesc {margin-top: 5px;}
+.apiDetail .longdesc p{font-size: 12px;line-height:1.5;margin:3px 0;}
+.apiDetail .longdesc b{font-size: 14px;}
+.apiDetail table {border-collapse:collapse;}
+.apiDetail table td {border:1px solid silver;text-align: center;vertical-align: middle;}
+.apiDetail table thead td {font-weight: bold}
+
+.apiDetail button {width:16px; height:16px; vertical-align:middle; border:0 none; cursor: pointer;
+	background-color:transparent; background-repeat:no-repeat; background-attachment: scroll;
+	background-image:url("zTreeStyle/img/zTreeStandard.png");}
+
+.apiDetail button.chk {width:13px; height:13px; margin:0 3px 2px 0; cursor: auto}
+.apiDetail button.chk.checkbox_false_full {background-position:0 0}
+.apiDetail button.chk.checkbox_false_full_focus {background-position:0 -14px}
+.apiDetail button.chk.checkbox_false_part {background-position:0 -28px}
+.apiDetail button.chk.checkbox_false_part_focus {background-position:0 -42px}
+.apiDetail button.chk.checkbox_true_full {background-position:-14px 0}
+.apiDetail button.chk.checkbox_true_full_focus {background-position:-14px -14px}
+.apiDetail button.chk.checkbox_true_part {background-position:-14px -28px}
+.apiDetail button.chk.checkbox_true_part_focus {background-position:-14px -42px}
+.apiDetail button.chk.radio_false_full {background-position:-28px 0}
+.apiDetail button.chk.radio_false_full_focus {background-position:-28px -14px}
+.apiDetail button.chk.radio_false_part {background-position:-28px -28px}
+.apiDetail button.chk.radio_false_part_focus {background-position:-28px -42px}
+.apiDetail button.chk.radio_true_full {background-position:-42px 0}
+.apiDetail button.chk.radio_true_full_focus {background-position:-42px -14px}
+.apiDetail button.chk.radio_true_part {background-position:-42px -28px}
+.apiDetail button.chk.radio_true_part_focus {background-position:-42px -42px}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/apiCss/common_ie6.css b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/apiCss/common_ie6.css
new file mode 100644
index 0000000..aacaf59
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/apiCss/common_ie6.css
@@ -0,0 +1,23 @@
+* html{
+/*	background-image:url(about:blank);*/
+	background-attachment:fixed;
+}
+html pre {word-wrap: break-word}
+.header {background-image: none;background-color: #F0F6E4;}
+
+.ieSuggest {display:block;}
+.shortcuts button.cn {filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='apiCss/img/chinese.png');background-image: none;}
+.shortcuts button.en {filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='apiCss/img/english.png');background-image: none;}
+
+.light-bulb {filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='apiCss/img/lightbulb.png');background-image: none;}
+.contentBox {background-image: none;background-color: #F0F6E4;}
+.zTreeInfo {background-image: none;background-color: #F0F6E4;}
+
+.content button.ico16 {*background-image:url("img/apiMenu.gif")}
+.siteTag {background-image: none;}
+.apiContent .right {float: right;padding-right: 50px;}
+
+div.baby_overlay {background-color: #3C6E31;background-image:none;color:#fff;}
+div.baby_overlay .close {filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='apiCss/img/overlay_close_IE6.gif');background-image: none;}
+.baby_overlay_arrow {background-image:url(img/overlay_arrow.gif);}
+.apiDetail button {background-image:url("img/zTreeStandard.gif")}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/apiCss/img/apiMenu.gif b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/apiCss/img/apiMenu.gif
new file mode 100644
index 0000000..066fc8e
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/apiCss/img/apiMenu.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/apiCss/img/apiMenu.png b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/apiCss/img/apiMenu.png
new file mode 100644
index 0000000..9acec50
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/apiCss/img/apiMenu.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/apiCss/img/background.jpg b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/apiCss/img/background.jpg
new file mode 100644
index 0000000..003375f
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/apiCss/img/background.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/apiCss/img/chinese.png b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/apiCss/img/chinese.png
new file mode 100644
index 0000000..d3b57fc
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/apiCss/img/chinese.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/apiCss/img/close.png b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/apiCss/img/close.png
new file mode 100644
index 0000000..69e41e3
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/apiCss/img/close.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/apiCss/img/contact-bg.png b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/apiCss/img/contact-bg.png
new file mode 100644
index 0000000..a3d7a5f
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/apiCss/img/contact-bg.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/apiCss/img/english.png b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/apiCss/img/english.png
new file mode 100644
index 0000000..2ad2d7d
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/apiCss/img/english.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/apiCss/img/header-bg.png b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/apiCss/img/header-bg.png
new file mode 100644
index 0000000..a2baacf
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/apiCss/img/header-bg.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/apiCss/img/lightbulb.png b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/apiCss/img/lightbulb.png
new file mode 100644
index 0000000..c99357a
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/apiCss/img/lightbulb.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/apiCss/img/overlay_arrow.gif b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/apiCss/img/overlay_arrow.gif
new file mode 100644
index 0000000..e7c3e6d
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/apiCss/img/overlay_arrow.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/apiCss/img/overlay_arrow.png b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/apiCss/img/overlay_arrow.png
new file mode 100644
index 0000000..d790a11
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/apiCss/img/overlay_arrow.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/apiCss/img/overlay_bg.png b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/apiCss/img/overlay_bg.png
new file mode 100644
index 0000000..5f81ee6
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/apiCss/img/overlay_bg.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/apiCss/img/overlay_close_IE6.gif b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/apiCss/img/overlay_close_IE6.gif
new file mode 100644
index 0000000..42cb8d8
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/apiCss/img/overlay_close_IE6.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/apiCss/img/zTreeStandard.gif b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/apiCss/img/zTreeStandard.gif
new file mode 100644
index 0000000..3f69a5b
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/apiCss/img/zTreeStandard.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/apiCss/img/zTreeStandard.png b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/apiCss/img/zTreeStandard.png
new file mode 100644
index 0000000..33c9e84
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/apiCss/img/zTreeStandard.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/apiCss/jquery-1.6.2.min.js b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/apiCss/jquery-1.6.2.min.js
new file mode 100644
index 0000000..8cdc80e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/apiCss/jquery-1.6.2.min.js
@@ -0,0 +1,18 @@
+/*!
+ * jQuery JavaScript Library v1.6.2
+ * http://jquery.com/
+ *
+ * Copyright 2011, John Resig
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * Includes Sizzle.js
+ * http://sizzlejs.com/
+ * Copyright 2011, The Dojo Foundation
+ * Released under the MIT, BSD, and GPL Licenses.
+ *
+ * Date: Thu Jun 30 14:16:56 2011 -0400
+ */
+(function(a,b){function cv(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cs(a){if(!cg[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){ch||(ch=c.createElement("iframe"),ch.frameBorder=ch.width=ch.height=0),b.appendChild(ch);if(!ci||!ch.createElement)ci=(ch.contentWindow||ch.contentDocument).document,ci.write((c.compatMode==="CSS1Compat"?"<!doctype html>":"")+"<html><body>"),ci.close();d=ci.createElement(a),ci.body.appendChild(d),e=f.css(d,"display"),b.removeChild(ch)}cg[a]=e}return cg[a]}function cr(a,b){var c={};f.each(cm.concat.apply([],cm.slice(0,b)),function(){c[this]=a});return c}function cq(){cn=b}function cp(){setTimeout(cq,0);return cn=f.now()}function cf(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ce(){try{return new a.XMLHttpRequest}catch(b){}}function b$(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g<i;g++){if(g===1)for(h in a.converters)typeof h=="string"&&(e[h.toLowerCase()]=a.converters[h]);l=k,k=d[g];if(k==="*")k=l;else if(l!=="*"&&l!==k){m=l+" "+k,n=e[m]||e["* "+k];if(!n){p=b;for(o in e){j=o.split(" ");if(j[0]===l||j[0]==="*"){p=e[j[1]+" "+k];if(p){o=e[o],o===!0?n=p:p===!0&&(n=o);break}}}}!n&&!p&&f.error("No conversion from "+m.replace(" "," to ")),n!==!0&&(c=n?n(c):p(o(c)))}}return c}function bZ(a,c,d){var e=a.contents,f=a.dataTypes,g=a.responseFields,h,i,j,k;for(i in g)i in d&&(c[g[i]]=d[i]);while(f[0]==="*")f.shift(),h===b&&(h=a.mimeType||c.getResponseHeader("content-type"));if(h)for(i in e)if(e[i]&&e[i].test(h)){f.unshift(i);break}if(f[0]in d)j=f[0];else{for(i in d){if(!f[0]||a.converters[i+" "+f[0]]){j=i;break}k||(k=i)}j=j||k}if(j){j!==f[0]&&f.unshift(j);return d[j]}}function bY(a,b,c,d){if(f.isArray(b))f.each(b,function(b,e){c||bC.test(a)?d(a,e):bY(a+"["+(typeof e=="object"||f.isArray(e)?b:"")+"]",e,c,d)});else if(!c&&b!=null&&typeof b=="object")for(var e in b)bY(a+"["+e+"]",b[e],c,d);else d(a,b)}function bX(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h=a[f],i=0,j=h?h.length:0,k=a===bR,l;for(;i<j&&(k||!l);i++)l=h[i](c,d,e),typeof l=="string"&&(!k||g[l]?l=b:(c.dataTypes.unshift(l),l=bX(a,c,d,e,l,g)));(k||!l)&&!g["*"]&&(l=bX(a,c,d,e,"*",g));return l}function bW(a){return function(b,c){typeof b!="string"&&(c=b,b="*");if(f.isFunction(c)){var d=b.toLowerCase().split(bN),e=0,g=d.length,h,i,j;for(;e<g;e++)h=d[e],j=/^\+/.test(h),j&&(h=h.substr(1)||"*"),i=a[h]=a[h]||[],i[j?"unshift":"push"](c)}}}function bA(a,b,c){var d=b==="width"?a.offsetWidth:a.offsetHeight,e=b==="width"?bv:bw;if(d>0){c!=="border"&&f.each(e,function(){c||(d-=parseFloat(f.css(a,"padding"+this))||0),c==="margin"?d+=parseFloat(f.css(a,c+this))||0:d-=parseFloat(f.css(a,"border"+this+"Width"))||0});return d+"px"}d=bx(a,b,b);if(d<0||d==null)d=a.style[b]||0;d=parseFloat(d)||0,c&&f.each(e,function(){d+=parseFloat(f.css(a,"padding"+this))||0,c!=="padding"&&(d+=parseFloat(f.css(a,"border"+this+"Width"))||0),c==="margin"&&(d+=parseFloat(f.css(a,c+this))||0)});return d+"px"}function bm(a,b){b.src?f.ajax({url:b.src,async:!1,dataType:"script"}):f.globalEval((b.text||b.textContent||b.innerHTML||"").replace(be,"/*$0*/")),b.parentNode&&b.parentNode.removeChild(b)}function bl(a){f.nodeName(a,"input")?bk(a):"getElementsByTagName"in a&&f.grep(a.getElementsByTagName("input"),bk)}function bk(a){if(a.type==="checkbox"||a.type==="radio")a.defaultChecked=a.checked}function bj(a){return"getElementsByTagName"in a?a.getElementsByTagName("*"):"querySelectorAll"in a?a.querySelectorAll("*"):[]}function bi(a,b){var c;if(b.nodeType===1){b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase();if(c==="object")b.outerHTML=a.outerHTML;else if(c!=="input"||a.type!=="checkbox"&&a.type!=="radio"){if(c==="option")b.selected=a.defaultSelected;else if(c==="input"||c==="textarea")b.defaultValue=a.defaultValue}else a.checked&&(b.defaultChecked=b.checked=a.checked),b.value!==a.value&&(b.value=a.value);b.removeAttribute(f.expando)}}function bh(a,b){if(b.nodeType===1&&!!f.hasData(a)){var c=f.expando,d=f.data(a),e=f.data(b,d);if(d=d[c]){var g=d.events;e=e[c]=f.extend({},d);if(g){delete e.handle,e.events={};for(var h in g)for(var i=0,j=g[h].length;i<j;i++)f.event.add(b,h+(g[h][i].namespace?".":"")+g[h][i].namespace,g[h][i],g[h][i].data)}}}}function bg(a,b){return f.nodeName(a,"table")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function W(a,b,c){b=b||0;if(f.isFunction(b))return f.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return f.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var d=f.grep(a,function(a){return a.nodeType===1});if(R.test(b))return f.filter(b,d,!c);b=f.filter(b,d)}return f.grep(a,function(a,d){return f.inArray(a,b)>=0===c})}function V(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function N(a,b){return(a&&a!=="*"?a+".":"")+b.replace(z,"`").replace(A,"&")}function M(a){var b,c,d,e,g,h,i,j,k,l,m,n,o,p=[],q=[],r=f._data(this,"events");if(!(a.liveFired===this||!r||!r.live||a.target.disabled||a.button&&a.type==="click")){a.namespace&&(n=new RegExp("(^|\\.)"+a.namespace.split(".").join("\\.(?:.*\\.)?")+"(\\.|$)")),a.liveFired=this;var s=r.live.slice(0);for(i=0;i<s.length;i++)g=s[i],g.origType.replace(x,"")===a.type?q.push(g.selector):s.splice(i--,1);e=f(a.target).closest(q,a.currentTarget);for(j=0,k=e.length;j<k;j++){m=e[j];for(i=0;i<s.length;i++){g=s[i];if(m.selector===g.selector&&(!n||n.test(g.namespace))&&!m.elem.disabled){h=m.elem,d=null;if(g.preType==="mouseenter"||g.preType==="mouseleave")a.type=g.preType,d=f(a.relatedTarget).closest(g.selector)[0],d&&f.contains(h,d)&&(d=h);(!d||d!==h)&&p.push({elem:h,handleObj:g,level:m.level})}}}for(j=0,k=p.length;j<k;j++){e=p[j];if(c&&e.level>c)break;a.currentTarget=e.elem,a.data=e.handleObj.data,a.handleObj=e.handleObj,o=e.handleObj.origHandler.apply(e.elem,arguments);if(o===!1||a.isPropagationStopped()){c=e.level,o===!1&&(b=!1);if(a.isImmediatePropagationStopped())break}}return b}}function K(a,c,d){var e=f.extend({},d[0]);e.type=a,e.originalEvent={},e.liveFired=b,f.event.handle.call(c,e),e.isDefaultPrevented()&&d[0].preventDefault()}function E(){return!0}function D(){return!1}function m(a,c,d){var e=c+"defer",g=c+"queue",h=c+"mark",i=f.data(a,e,b,!0);i&&(d==="queue"||!f.data(a,g,b,!0))&&(d==="mark"||!f.data(a,h,b,!0))&&setTimeout(function(){!f.data(a,g,b,!0)&&!f.data(a,h,b,!0)&&(f.removeData(a,e,!0),i.resolve())},0)}function l(a){for(var b in a)if(b!=="toJSON")return!1;return!0}function k(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(j,"$1-$2").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNaN(d)?i.test(d)?f.parseJSON(d):d:parseFloat(d)}catch(g){}f.data(a,c,d)}else d=b}return d}var c=a.document,d=a.navigator,e=a.location,f=function(){function J(){if(!e.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(J,1);return}e.ready()}}var e=function(a,b){return new e.fn.init(a,b,h)},f=a.jQuery,g=a.$,h,i=/^(?:[^<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/\d/,n=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,o=/^[\],:{}\s]*$/,p=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,q=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,r=/(?:^|:|,)(?:\s*\[)+/g,s=/(webkit)[ \/]([\w.]+)/,t=/(opera)(?:.*version)?[ \/]([\w.]+)/,u=/(msie) ([\w.]+)/,v=/(mozilla)(?:.*? rv:([\w.]+))?/,w=/-([a-z])/ig,x=function(a,b){return b.toUpperCase()},y=d.userAgent,z,A,B,C=Object.prototype.toString,D=Object.prototype.hasOwnProperty,E=Array.prototype.push,F=Array.prototype.slice,G=String.prototype.trim,H=Array.prototype.indexOf,I={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=n.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.6.2",length:0,size:function(){return this.length},toArray:function(){return F.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?E.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),A.done(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(F.apply(this,arguments),"slice",F.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:E,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j<k;j++)if((a=arguments[j])!=null)for(c in a){d=i[c],f=a[c];if(i===f)continue;l&&f&&(e.isPlainObject(f)||(g=e.isArray(f)))?(g?(g=!1,h=d&&e.isArray(d)?d:[]):h=d&&e.isPlainObject(d)?d:{},i[c]=e.extend(l,h,f)):f!==b&&(i[c]=f)}return i},e.extend({noConflict:function(b){a.$===e&&(a.$=g),b&&a.jQuery===e&&(a.jQuery=f);return e},isReady:!1,readyWait:1,holdReady:function(a){a?e.readyWait++:e.ready(!0)},ready:function(a){if(a===!0&&!--e.readyWait||a!==!0&&!e.isReady){if(!c.body)return setTimeout(e.ready,1);e.isReady=!0;if(a!==!0&&--e.readyWait>0)return;A.resolveWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").unbind("ready")}},bindReady:function(){if(!A){A=e._Deferred();if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",B,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",B),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&J()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a&&typeof a=="object"&&"setInterval"in a},isNaN:function(a){return a==null||!m.test(a)||isNaN(a)},type:function(a){return a==null?String(a):I[C.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;if(a.constructor&&!D.call(a,"constructor")&&!D.call(a.constructor.prototype,"isPrototypeOf"))return!1;var c;for(c in a);return c===b||D.call(a,c)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw a},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(o.test(b.replace(p,"@").replace(q,"]").replace(r,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(b,c,d){a.DOMParser?(d=new DOMParser,c=d.parseFromString(b,"text/xml")):(c=new ActiveXObject("Microsoft.XMLDOM"),c.async="false",c.loadXML(b)),d=c.documentElement,(!d||!d.nodeName||d.nodeName==="parsererror")&&e.error("Invalid XML: "+b);return c},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(w,x)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g<h;)if(c.apply(a[g++],d)===!1)break}else if(i){for(f in a)if(c.call(a[f],f,a[f])===!1)break}else for(;g<h;)if(c.call(a[g],g,a[g++])===!1)break;return a},trim:G?function(a){return a==null?"":G.call(a)}:function(a){return a==null?"":(a+"").replace(k,"").replace(l,"")},makeArray:function(a,b){var c=b||[];if(a!=null){var d=e.type(a);a.length==null||d==="string"||d==="function"||d==="regexp"||e.isWindow(a)?E.call(c,a):e.merge(c,a)}return c},inArray:function(a,b){if(H)return H.call(b,a);for(var c=0,d=b.length;c<d;c++)if(b[c]===a)return c;return-1},merge:function(a,c){var d=a.length,e=0;if(typeof c.length=="number")for(var f=c.length;e<f;e++)a[d++]=c[e];else while(c[e]!==b)a[d++]=c[e++];a.length=d;return a},grep:function(a,b,c){var d=[],e;c=!!c;for(var f=0,g=a.length;f<g;f++)e=!!b(a[f],f),c!==e&&d.push(a[f]);return d},map:function(a,c,d){var f,g,h=[],i=0,j=a.length,k=a instanceof e||j!==b&&typeof j=="number"&&(j>0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i<j;i++)f=c(a[i],i,d),f!=null&&(h[h.length]=f);else for(g in a)f=c(a[g],g,d),f!=null&&(h[h.length]=f);return h.concat.apply([],h)},guid:1,proxy:function(a,c){if(typeof c=="string"){var d=a[c];c=a,a=d}if(!e.isFunction(a))return b;var f=F.call(arguments,2),g=function(){return a.apply(c,f.concat(F.call(arguments)))};g.guid=a.guid=a.guid||g.guid||e.guid++;return g},access:function(a,c,d,f,g,h){var i=a.length;if(typeof c=="object"){for(var j in c)e.access(a,j,c[j],f,g,d);return a}if(d!==b){f=!h&&f&&e.isFunction(d);for(var k=0;k<i;k++)g(a[k],c,f?d.call(a[k],k,g(a[k],c)):d,h);return a}return i?g(a[0],c):b},now:function(){return(new Date).getTime()},uaMatch:function(a){a=a.toLowerCase();var b=s.exec(a)||t.exec(a)||u.exec(a)||a.indexOf("compatible")<0&&v.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},sub:function(){function a(b,c){return new a.fn.init(b,c)}e.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function(d,f){f&&f instanceof e&&!(f instanceof a)&&(f=a(f));return e.fn.init.call(this,d,f,b)},a.fn.init.prototype=a.fn;var b=a(c);return a},browser:{}}),e.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){I["[object "+b+"]"]=b.toLowerCase()}),z=e.uaMatch(y),z.browser&&(e.browser[z.browser]=!0,e.browser.version=z.version),e.browser.webkit&&(e.browser.safari=!0),j.test(" ")&&(k=/^[\s\xA0]+/,l=/[\s\xA0]+$/),h=e(c),c.addEventListener?B=function(){c.removeEventListener("DOMContentLoaded",B,!1),e.ready()}:c.attachEvent&&(B=function(){c.readyState==="complete"&&(c.detachEvent("onreadystatechange",B),e.ready())});return e}(),g="done fail isResolved isRejected promise then always pipe".split(" "),h=[].slice;f.extend({_Deferred:function(){var a=[],b,c,d,e={done:function(){if(!d){var c=arguments,g,h,i,j,k;b&&(k=b,b=0);for(g=0,h=c.length;g<h;g++)i=c[g],j=f.type(i),j==="array"?e.done.apply(e,i):j==="function"&&a.push(i);k&&e.resolveWith(k[0],k[1])}return this},resolveWith:function(e,f){if(!d&&!b&&!c){f=f||[],c=1;try{while(a[0])a.shift().apply(e,f)}finally{b=[e,f],c=0}}return this},resolve:function(){e.resolveWith(this,arguments);return this},isResolved:function(){return!!c||!!b},cancel:function(){d=1,a=[];return this}};return e},Deferred:function(a){var b=f._Deferred(),c=f._Deferred(),d;f.extend(b,{then:function(a,c){b.done(a).fail(c);return this},always:function(){return b.done.apply(b,arguments).fail.apply(this,arguments)},fail:c.done,rejectWith:c.resolveWith,reject:c.resolve,isRejected:c.isResolved,pipe:function(a,c){return f.Deferred(function(d){f.each({done:[a,"resolve"],fail:[c,"reject"]},function(a,c){var e=c[0],g=c[1],h;f.isFunction(e)?b[a](function(){h=e.apply(this,arguments),h&&f.isFunction(h.promise)?h.promise().then(d.resolve,d.reject):d[g](h)}):b[a](d[g])})}).promise()},promise:function(a){if(a==null){if(d)return d;d=a={}}var c=g.length;while(c--)a[g[c]]=b[g[c]];return a}}),b.done(c.cancel).fail(b.cancel),delete b.cancel,a&&a.call(b,b);return b},when:function(a){function i(a){return function(c){b[a]=arguments.length>1?h.call(arguments,0):c,--e||g.resolveWith(g,h.call(b,0))}}var b=arguments,c=0,d=b.length,e=d,g=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred();if(d>1){for(;c<d;c++)b[c]&&f.isFunction(b[c].promise)?b[c].promise().then(i(c),g.reject):--e;e||g.resolveWith(g,b)}else g!==a&&g.resolveWith(g,d?[a]:[]);return g.promise()}}),f.support=function(){var a=c.createElement("div"),b=c.documentElement,d,e,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u;a.setAttribute("className","t"),a.innerHTML="   <link/><table></table><a href='/a' style='top:1px;float:left;opacity:.55;'>a</a><input type='checkbox'/>",d=a.getElementsByTagName("*"),e=a.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=a.getElementsByTagName("input")[0],k={leadingWhitespace:a.firstChild.nodeType===3,tbody:!a.getElementsByTagName("tbody").length,htmlSerialize:!!a.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55$/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:a.className!=="t",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0},i.checked=!0,k.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,k.optDisabled=!h.disabled;try{delete a.test}catch(v){k.deleteExpando=!1}!a.addEventListener&&a.attachEvent&&a.fireEvent&&(a.attachEvent("onclick",function(){k.noCloneEvent=!1}),a.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),k.radioValue=i.value==="t",i.setAttribute("checked","checked"),a.appendChild(i),l=c.createDocumentFragment(),l.appendChild(a.firstChild),k.checkClone=l.cloneNode(!0).cloneNode(!0).lastChild.checked,a.innerHTML="",a.style.width=a.style.paddingLeft="1px",m=c.getElementsByTagName("body")[0],o=c.createElement(m?"div":"body"),p={visibility:"hidden",width:0,height:0,border:0,margin:0},m&&f.extend(p,{position:"absolute",left:-1e3,top:-1e3});for(t in p)o.style[t]=p[t];o.appendChild(a),n=m||b,n.insertBefore(o,n.firstChild),k.appendChecked=i.checked,k.boxModel=a.offsetWidth===2,"zoom"in a.style&&(a.style.display="inline",a.style.zoom=1,k.inlineBlockNeedsLayout=a.offsetWidth===2,a.style.display="",a.innerHTML="<div style='width:4px;'></div>",k.shrinkWrapBlocks=a.offsetWidth!==2),a.innerHTML="<table><tr><td style='padding:0;border:0;display:none'></td><td>t</td></tr></table>",q=a.getElementsByTagName("td"),u=q[0].offsetHeight===0,q[0].style.display="",q[1].style.display="none",k.reliableHiddenOffsets=u&&q[0].offsetHeight===0,a.innerHTML="",c.defaultView&&c.defaultView.getComputedStyle&&(j=c.createElement("div"),j.style.width="0",j.style.marginRight="0",a.appendChild(j),k.reliableMarginRight=(parseInt((c.defaultView.getComputedStyle(j,null)||{marginRight:0}).marginRight,10)||0)===0),o.innerHTML="",n.removeChild(o);if(a.attachEvent)for(t in{submit:1,change:1,focusin:1})s="on"+t,u=s in a,u||(a.setAttribute(s,"return;"),u=typeof a[s]=="function"),k[t+"Bubbles"]=u;o=l=g=h=m=j=a=i=null;return k}(),f.boxModel=f.support.boxModel;var i=/^(?:\{.*\}|\[.*\])$/,j=/([a-z])([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!l(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g=f.expando,h=typeof c=="string",i,j=a.nodeType,k=j?f.cache:a,l=j?a[f.expando]:a[f.expando]&&f.expando;if((!l||e&&l&&!k[l][g])&&h&&d===b)return;l||(j?a[f.expando]=l=++f.uuid:l=f.expando),k[l]||(k[l]={},j||(k[l].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?k[l][g]=f.extend(k[l][g],c):k[l]=f.extend(k[l],c);i=k[l],e&&(i[g]||(i[g]={}),i=i[g]),d!==b&&(i[f.camelCase(c)]=d);if(c==="events"&&!i[c])return i[g]&&i[g].events;return h?i[f.camelCase(c)]||i[c]:i}},removeData:function(b,c,d){if(!!f.acceptData(b)){var e=f.expando,g=b.nodeType,h=g?f.cache:b,i=g?b[f.expando]:f.expando;if(!h[i])return;if(c){var j=d?h[i][e]:h[i];if(j){delete j[c];if(!l(j))return}}if(d){delete h[i][e];if(!l(h[i]))return}var k=h[i][e];f.support.deleteExpando||h!=a?delete h[i]:h[i]=null,k?(h[i]={},g||(h[i].toJSON=f.noop),h[i][e]=k):g&&(f.support.deleteExpando?delete b[f.expando]:b.removeAttribute?b.removeAttribute(f.expando):b[f.expando]=null)}},_data:function(a,b,c){return f.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=f.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),f.fn.extend({data:function(a,c){var d=null;if(typeof a=="undefined"){if(this.length){d=f.data(this[0]);if(this[0].nodeType===1){var e=this[0].attributes,g;for(var h=0,i=e.length;h<i;h++)g=e[h].name,g.indexOf("data-")===0&&(g=f.camelCase(g.substring(5)),k(this[0],g,d[g]))}}return d}if(typeof a=="object")return this.each(function(){f.data(this,a)});var j=a.split(".");j[1]=j[1]?"."+j[1]:"";if(c===b){d=this.triggerHandler("getData"+j[1]+"!",[j[0]]),d===b&&this.length&&(d=f.data(this[0],a),d=k(this[0],a,d));return d===b&&j[1]?this.data(j[0]):d}return this.each(function(){var b=f(this),d=[j[0],c];b.triggerHandler("setData"+j[1]+"!",d),f.data(this,a,c),b.triggerHandler("changeData"+j[1]+"!",d)})},removeData:function(a){return this.each(function(){f.removeData(this,a)})}}),f.extend({_mark:function(a,c){a&&(c=(c||"fx")+"mark",f.data(a,c,(f.data(a,c,b,!0)||0)+1,!0))},_unmark:function(a,c,d){a!==!0&&(d=c,c=a,a=!1);if(c){d=d||"fx";var e=d+"mark",g=a?0:(f.data(c,e,b,!0)||1)-1;g?f.data(c,e,g,!0):(f.removeData(c,e,!0),m(c,d,"mark"))}},queue:function(a,c,d){if(a){c=(c||"fx")+"queue";var e=f.data(a,c,b,!0);d&&(!e||f.isArray(d)?e=f.data(a,c,f.makeArray(d),!0):e.push(d));return e||[]}},dequeue:function(a,b){b=b||"fx";var c=f.queue(a,b),d=c.shift(),e;d==="inprogress"&&(d=c.shift()),d&&(b==="fx"&&c.unshift("inprogress"),d.call(a,function(){f.dequeue(a,b)})),c.length||(f.removeData(a,b+"queue",!0),m(a,b,"queue"))}}),f.fn.extend({queue:function(a,c){typeof a!="string"&&(c=a,a="fx");if(c===b)return f.queue(this[0],a);return this.each(function(){var b=f.queue(this,a,c);a==="fx"&&b[0]!=="inprogress"&&f.dequeue(this,a)})},dequeue:function(a){return this.each(function(){f.dequeue(this,a)})},delay:function(a,b){a=f.fx?f.fx.speeds[a]||a:a,b=b||"fx";return this.queue(b,function(){var c=this;setTimeout(function(){f.dequeue(c,b)},a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,c){function m(){--h||d.resolveWith(e,[e])}typeof a!="string"&&(c=a,a=b),a=a||"fx";var d=f.Deferred(),e=this,g=e.length,h=1,i=a+"defer",j=a+"queue",k=a+"mark",l;while(g--)if(l=f.data(e[g],i,b,!0)||(f.data(e[g],j,b,!0)||f.data(e[g],k,b,!0))&&f.data(e[g],i,f._Deferred(),!0))h++,l.done(m);m();return d.promise()}});var n=/[\n\t\r]/g,o=/\s+/,p=/\r/g,q=/^(?:button|input)$/i,r=/^(?:button|input|object|select|textarea)$/i,s=/^a(?:rea)?$/i,t=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,u=/\:|^on/,v,w;f.fn.extend({attr:function(a,b){return f.access(this,a,b,!0,f.attr)},removeAttr:function(a){return this.each(function(){f.removeAttr(this,a)})},prop:function(a,b){return f.access(this,a,b,!0,f.prop)},removeProp:function(a){a=f.propFix[a]||a;return this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,g,h,i;if(f.isFunction(a))return this.each(function(b){f(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(o);for(c=0,d=this.length;c<d;c++){e=this[c];if(e.nodeType===1)if(!e.className&&b.length===1)e.className=a;else{g=" "+e.className+" ";for(h=0,i=b.length;h<i;h++)~g.indexOf(" "+b[h]+" ")||(g+=b[h]+" ");e.className=f.trim(g)}}}return this},removeClass:function(a){var c,d,e,g,h,i,j;if(f.isFunction(a))return this.each(function(b){f(this).removeClass(a.call(this,b,this.className))});if(a&&typeof a=="string"||a===b){c=(a||"").split(o);for(d=0,e=this.length;d<e;d++){g=this[d];if(g.nodeType===1&&g.className)if(a){h=(" "+g.className+" ").replace(n," ");for(i=0,j=c.length;i<j;i++)h=h.replace(" "+c[i]+" "," ");g.className=f.trim(h)}else g.className=""}}return this},toggleClass:function(a,b){var c=typeof a,d=typeof b=="boolean";if(f.isFunction(a))return this.each(function(c){f(this).toggleClass(a.call(this,c,this.className,b),b)});return this.each(function(){if(c==="string"){var e,g=0,h=f(this),i=b,j=a.split(o);while(e=j[g++])i=d?i:!h.hasClass(e),h[i?"addClass":"removeClass"](e)}else if(c==="undefined"||c==="boolean")this.className&&f._data(this,"__className__",this.className),this.className=this.className||a===!1?"":f._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ";for(var c=0,d=this.length;c<d;c++)if((" "+this[c].className+" ").replace(n," ").indexOf(b)>-1)return!0;return!1},val:function(a){var c,d,e=this[0];if(!arguments.length){if(e){c=f.valHooks[e.nodeName.toLowerCase()]||f.valHooks[e.type];if(c&&"get"in c&&(d=c.get(e,"value"))!==b)return d;d=e.value;return typeof d=="string"?d.replace(p,""):d==null?"":d}return b}var g=f.isFunction(a);return this.each(function(d){var e=f(this),h;if(this.nodeType===1){g?h=a.call(this,d,e.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.nodeName.toLowerCase()]||f.valHooks[this.type];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c=a.selectedIndex,d=[],e=a.options,g=a.type==="select-one";if(c<0)return null;for(var h=g?c:0,i=g?c+1:e.length;h<i;h++){var j=e[h];if(j.selected&&(f.support.optDisabled?!j.disabled:j.getAttribute("disabled")===null)&&(!j.parentNode.disabled||!f.nodeName(j.parentNode,"optgroup"))){b=f(j).val();if(g)return b;d.push(b)}}if(g&&!d.length&&e.length)return f(e[c]).val();return d},set:function(a,b){var c=f.makeArray(b);f(a).find("option").each(function(){this.selected=f.inArray(f(this).val(),c)>=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attrFix:{tabindex:"tabIndex"},attr:function(a,c,d,e){var g=a.nodeType;if(!a||g===3||g===8||g===2)return b;if(e&&c in f.attrFn)return f(a)[c](d);if(!("getAttribute"in a))return f.prop(a,c,d);var h,i,j=g!==1||!f.isXMLDoc(a);j&&(c=f.attrFix[c]||c,i=f.attrHooks[c],i||(t.test(c)?i=w:v&&c!=="className"&&(f.nodeName(a,"form")||u.test(c))&&(i=v)));if(d!==b){if(d===null){f.removeAttr(a,c);return b}if(i&&"set"in i&&j&&(h=i.set(a,d,c))!==b)return h;a.setAttribute(c,""+d);return d}if(i&&"get"in i&&j&&(h=i.get(a,c))!==null)return h;h=a.getAttribute(c);return h===null?b:h},removeAttr:function(a,b){var c;a.nodeType===1&&(b=f.attrFix[b]||b,f.support.getSetAttribute?a.removeAttribute(b):(f.attr(a,b,""),a.removeAttributeNode(a.getAttributeNode(b))),t.test(b)&&(c=f.propFix[b]||b)in a&&(a[c]=!1))},attrHooks:{type:{set:function(a,b){if(q.test(a.nodeName)&&a.parentNode)f.error("type property can't be changed");else if(!f.support.radioValue&&b==="radio"&&f.nodeName(a,"input")){var c=a.value;a.setAttribute("type",b),c&&(a.value=c);return b}}},tabIndex:{get:function(a){var c=a.getAttributeNode("tabIndex");return c&&c.specified?parseInt(c.value,10):r.test(a.nodeName)||s.test(a.nodeName)&&a.href?0:b}},value:{get:function(a,b){if(v&&f.nodeName(a,"button"))return v.get(a,b);return b in a?a.value:null},set:function(a,b,c){if(v&&f.nodeName(a,"button"))return v.set(a,b,c);a.value=b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e=a.nodeType;if(!a||e===3||e===8||e===2)return b;var g,h,i=e!==1||!f.isXMLDoc(a);i&&(c=f.propFix[c]||c,h=f.propHooks[c]);return d!==b?h&&"set"in h&&(g=h.set(a,d,c))!==b?g:a[c]=d:h&&"get"in h&&(g=h.get(a,c))!==b?g:a[c]},propHooks:{}}),w={get:function(a,c){return f.prop(a,c)?c.toLowerCase():b},set:function(a,b,c){var d;b===!1?f.removeAttr(a,c):(d=f.propFix[c]||c,d in a&&(a[d]=!0),a.setAttribute(c,c.toLowerCase()));return c}},f.support.getSetAttribute||(f.attrFix=f.propFix,v=f.attrHooks.name=f.attrHooks.title=f.valHooks.button={get:function(a,c){var d;d=a.getAttributeNode(c);return d&&d.nodeValue!==""?d.nodeValue:b},set:function(a,b,c){var d=a.getAttributeNode(c);if(d){d.nodeValue=b;return b}}},f.each(["width","height"],function(a,b){f.attrHooks[b]=f.extend(f.attrHooks[b],{set:function(a,c){if(c===""){a.setAttribute(b,"auto");return c}}})})),f.support.hrefNormalized||f.each(["href","src","width","height"],function(a,c){f.attrHooks[c]=f.extend(f.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),f.support.style||(f.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=""+b}}),f.support.optSelected||(f.propHooks.selected=f.extend(f.propHooks.selected,{get:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex)}})),f.support.checkOn||f.each(["radio","checkbox"],function(){f.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),f.each(["radio","checkbox"],function(){f.valHooks[this]=f.extend(f.valHooks[this],{set:function(a,b){if(f.isArray(b))return a.checked=f.inArray(f(a).val(),b)>=0}})});var x=/\.(.*)$/,y=/^(?:textarea|input|select)$/i,z=/\./g,A=/ /g,B=/[^\w\s.|`]/g,C=function(a){return a.replace(B,"\\$&")};f.event={add:function(a,c,d,e){if(a.nodeType!==3&&a.nodeType!==8){if(d===!1)d=D;else if(!d)return;var g,h;d.handler&&(g=d,d=g.handler),d.guid||(d.guid=f.guid++);var i=f._data(a);if(!i)return;var j=i.events,k=i.handle;j||(i.events=j={}),k||(i.handle=k=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.handle.apply(k.elem,arguments):b}),k.elem=a,c=c.split(" ");var l,m=0,n;while(l=c[m++]){h=g?f.extend({},g):{handler:d,data:e},l.indexOf(".")>-1?(n=l.split("."),l=n.shift(),h.namespace=n.slice(0).sort().join(".")):(n=[],h.namespace=""),h.type=l,h.guid||(h.guid=d.guid);var o=j[l],p=f.event.special[l]||{};if(!o){o=j[l]=[];if(!p.setup||p.setup.call(a,e,n,k)===!1)a.addEventListener?a.addEventListener(l,k,!1):a.attachEvent&&a.attachEvent("on"+l,k)}p.add&&(p.add.call(a,h),h.handler.guid||(h.handler.guid=d.guid)),o.push(h),f.event.global[l]=!0}a=null}},global:{},remove:function(a,c,d,e){if(a.nodeType!==3&&a.nodeType!==8){d===!1&&(d=D);var g,h,i,j,k=0,l,m,n,o,p,q,r,s=f.hasData(a)&&f._data(a),t=s&&s.events;if(!s||!t)return;c&&c.type&&(d=c.handler,c=c.type);if(!c||typeof c=="string"&&c.charAt(0)==="."){c=c||"";for(h in t)f.event.remove(a,h+c);return}c=c.split(" ");while(h=c[k++]){r=h,q=null,l=h.indexOf(".")<0,m=[],l||(m=h.split("."),h=m.shift(),n=new RegExp("(^|\\.)"+f.map(m.slice(0).sort(),C).join("\\.(?:.*\\.)?")+"(\\.|$)")),p=t[h];if(!p)continue;if(!d){for(j=0;j<p.length;j++){q=p[j];if(l||n.test(q.namespace))f.event.remove(a,r,q.handler,j),p.splice(j--,1)}continue}o=f.event.special[h]||{};for(j=e||0;j<p.length;j++){q=p[j];if(d.guid===q.guid){if(l||n.test(q.namespace))e==null&&p.splice(j--,1),o.remove&&o.remove.call(a,q);if(e!=null)break}}if(p.length===0||e!=null&&p.length===1)(!o.teardown||o.teardown.call(a,m)===!1)&&f.removeEvent(a,h,s.handle),g=null,delete t[h]}if(f.isEmptyObject(t)){var u=s.handle;u&&(u.elem=null),delete s.events,delete s.handle,f.isEmptyObject(s)&&f.removeData(a,b,!0)}}},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(c,d,e,g){var h=c.type||c,i=[],j;h.indexOf("!")>=0&&(h=h.slice(0,-1),j=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.
+shift(),i.sort());if(!!e&&!f.event.customEvent[h]||!!f.event.global[h]){c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.exclusive=j,c.namespace=i.join("."),c.namespace_re=new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)");if(g||!e)c.preventDefault(),c.stopPropagation();if(!e){f.each(f.cache,function(){var a=f.expando,b=this[a];b&&b.events&&b.events[h]&&f.event.trigger(c,d,b.handle.elem)});return}if(e.nodeType===3||e.nodeType===8)return;c.result=b,c.target=e,d=d!=null?f.makeArray(d):[],d.unshift(c);var k=e,l=h.indexOf(":")<0?"on"+h:"";do{var m=f._data(k,"handle");c.currentTarget=k,m&&m.apply(k,d),l&&f.acceptData(k)&&k[l]&&k[l].apply(k,d)===!1&&(c.result=!1,c.preventDefault()),k=k.parentNode||k.ownerDocument||k===c.target.ownerDocument&&a}while(k&&!c.isPropagationStopped());if(!c.isDefaultPrevented()){var n,o=f.event.special[h]||{};if((!o._default||o._default.call(e.ownerDocument,c)===!1)&&(h!=="click"||!f.nodeName(e,"a"))&&f.acceptData(e)){try{l&&e[h]&&(n=e[l],n&&(e[l]=null),f.event.triggered=h,e[h]())}catch(p){}n&&(e[l]=n),f.event.triggered=b}}return c.result}},handle:function(c){c=f.event.fix(c||a.event);var d=((f._data(this,"events")||{})[c.type]||[]).slice(0),e=!c.exclusive&&!c.namespace,g=Array.prototype.slice.call(arguments,0);g[0]=c,c.currentTarget=this;for(var h=0,i=d.length;h<i;h++){var j=d[h];if(e||c.namespace_re.test(j.namespace)){c.handler=j.handler,c.data=j.data,c.handleObj=j;var k=j.handler.apply(this,g);k!==b&&(c.result=k,k===!1&&(c.preventDefault(),c.stopPropagation()));if(c.isImmediatePropagationStopped())break}}return c.result},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),fix:function(a){if(a[f.expando])return a;var d=a;a=f.Event(d);for(var e=this.props.length,g;e;)g=this.props[--e],a[g]=d[g];a.target||(a.target=a.srcElement||c),a.target.nodeType===3&&(a.target=a.target.parentNode),!a.relatedTarget&&a.fromElement&&(a.relatedTarget=a.fromElement===a.target?a.toElement:a.fromElement);if(a.pageX==null&&a.clientX!=null){var h=a.target.ownerDocument||c,i=h.documentElement,j=h.body;a.pageX=a.clientX+(i&&i.scrollLeft||j&&j.scrollLeft||0)-(i&&i.clientLeft||j&&j.clientLeft||0),a.pageY=a.clientY+(i&&i.scrollTop||j&&j.scrollTop||0)-(i&&i.clientTop||j&&j.clientTop||0)}a.which==null&&(a.charCode!=null||a.keyCode!=null)&&(a.which=a.charCode!=null?a.charCode:a.keyCode),!a.metaKey&&a.ctrlKey&&(a.metaKey=a.ctrlKey),!a.which&&a.button!==b&&(a.which=a.button&1?1:a.button&2?3:a.button&4?2:0);return a},guid:1e8,proxy:f.proxy,special:{ready:{setup:f.bindReady,teardown:f.noop},live:{add:function(a){f.event.add(this,N(a.origType,a.selector),f.extend({},a,{handler:M,guid:a.handler.guid}))},remove:function(a){f.event.remove(this,N(a.origType,a.selector),a)}},beforeunload:{setup:function(a,b,c){f.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}}},f.removeEvent=c.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){a.detachEvent&&a.detachEvent("on"+b,c)},f.Event=function(a,b){if(!this.preventDefault)return new f.Event(a,b);a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?E:D):this.type=a,b&&f.extend(this,b),this.timeStamp=f.now(),this[f.expando]=!0},f.Event.prototype={preventDefault:function(){this.isDefaultPrevented=E;var a=this.originalEvent;!a||(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){this.isPropagationStopped=E;var a=this.originalEvent;!a||(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=E,this.stopPropagation()},isDefaultPrevented:D,isPropagationStopped:D,isImmediatePropagationStopped:D};var F=function(a){var b=a.relatedTarget,c=!1,d=a.type;a.type=a.data,b!==this&&(b&&(c=f.contains(this,b)),c||(f.event.handle.apply(this,arguments),a.type=d))},G=function(a){a.type=a.data,f.event.handle.apply(this,arguments)};f.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){f.event.special[a]={setup:function(c){f.event.add(this,b,c&&c.selector?G:F,a)},teardown:function(a){f.event.remove(this,b,a&&a.selector?G:F)}}}),f.support.submitBubbles||(f.event.special.submit={setup:function(a,b){if(!f.nodeName(this,"form"))f.event.add(this,"click.specialSubmit",function(a){var b=a.target,c=b.type;(c==="submit"||c==="image")&&f(b).closest("form").length&&K("submit",this,arguments)}),f.event.add(this,"keypress.specialSubmit",function(a){var b=a.target,c=b.type;(c==="text"||c==="password")&&f(b).closest("form").length&&a.keyCode===13&&K("submit",this,arguments)});else return!1},teardown:function(a){f.event.remove(this,".specialSubmit")}});if(!f.support.changeBubbles){var H,I=function(a){var b=a.type,c=a.value;b==="radio"||b==="checkbox"?c=a.checked:b==="select-multiple"?c=a.selectedIndex>-1?f.map(a.options,function(a){return a.selected}).join("-"):"":f.nodeName(a,"select")&&(c=a.selectedIndex);return c},J=function(c){var d=c.target,e,g;if(!!y.test(d.nodeName)&&!d.readOnly){e=f._data(d,"_change_data"),g=I(d),(c.type!=="focusout"||d.type!=="radio")&&f._data(d,"_change_data",g);if(e===b||g===e)return;if(e!=null||g)c.type="change",c.liveFired=b,f.event.trigger(c,arguments[1],d)}};f.event.special.change={filters:{focusout:J,beforedeactivate:J,click:function(a){var b=a.target,c=f.nodeName(b,"input")?b.type:"";(c==="radio"||c==="checkbox"||f.nodeName(b,"select"))&&J.call(this,a)},keydown:function(a){var b=a.target,c=f.nodeName(b,"input")?b.type:"";(a.keyCode===13&&!f.nodeName(b,"textarea")||a.keyCode===32&&(c==="checkbox"||c==="radio")||c==="select-multiple")&&J.call(this,a)},beforeactivate:function(a){var b=a.target;f._data(b,"_change_data",I(b))}},setup:function(a,b){if(this.type==="file")return!1;for(var c in H)f.event.add(this,c+".specialChange",H[c]);return y.test(this.nodeName)},teardown:function(a){f.event.remove(this,".specialChange");return y.test(this.nodeName)}},H=f.event.special.change.filters,H.focus=H.beforeactivate}f.support.focusinBubbles||f.each({focus:"focusin",blur:"focusout"},function(a,b){function e(a){var c=f.event.fix(a);c.type=b,c.originalEvent={},f.event.trigger(c,null,c.target),c.isDefaultPrevented()&&a.preventDefault()}var d=0;f.event.special[b]={setup:function(){d++===0&&c.addEventListener(a,e,!0)},teardown:function(){--d===0&&c.removeEventListener(a,e,!0)}}}),f.each(["bind","one"],function(a,c){f.fn[c]=function(a,d,e){var g;if(typeof a=="object"){for(var h in a)this[c](h,d,a[h],e);return this}if(arguments.length===2||d===!1)e=d,d=b;c==="one"?(g=function(a){f(this).unbind(a,g);return e.apply(this,arguments)},g.guid=e.guid||f.guid++):g=e;if(a==="unload"&&c!=="one")this.one(a,d,e);else for(var i=0,j=this.length;i<j;i++)f.event.add(this[i],a,g,d);return this}}),f.fn.extend({unbind:function(a,b){if(typeof a=="object"&&!a.preventDefault)for(var c in a)this.unbind(c,a[c]);else for(var d=0,e=this.length;d<e;d++)f.event.remove(this[d],a,b);return this},delegate:function(a,b,c,d){return this.live(b,c,d,a)},undelegate:function(a,b,c){return arguments.length===0?this.unbind("live"):this.die(b,null,c,a)},trigger:function(a,b){return this.each(function(){f.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0])return f.event.trigger(a,b,this[0],!0)},toggle:function(a){var b=arguments,c=a.guid||f.guid++,d=0,e=function(c){var e=(f.data(this,"lastToggle"+a.guid)||0)%d;f.data(this,"lastToggle"+a.guid,e+1),c.preventDefault();return b[e].apply(this,arguments)||!1};e.guid=c;while(d<b.length)b[d++].guid=c;return this.click(e)},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}});var L={focus:"focusin",blur:"focusout",mouseenter:"mouseover",mouseleave:"mouseout"};f.each(["live","die"],function(a,c){f.fn[c]=function(a,d,e,g){var h,i=0,j,k,l,m=g||this.selector,n=g?this:f(this.context);if(typeof a=="object"&&!a.preventDefault){for(var o in a)n[c](o,d,a[o],m);return this}if(c==="die"&&!a&&g&&g.charAt(0)==="."){n.unbind(g);return this}if(d===!1||f.isFunction(d))e=d||D,d=b;a=(a||"").split(" ");while((h=a[i++])!=null){j=x.exec(h),k="",j&&(k=j[0],h=h.replace(x,""));if(h==="hover"){a.push("mouseenter"+k,"mouseleave"+k);continue}l=h,L[h]?(a.push(L[h]+k),h=h+k):h=(L[h]||h)+k;if(c==="live")for(var p=0,q=n.length;p<q;p++)f.event.add(n[p],"live."+N(h,m),{data:d,selector:m,handler:e,origType:h,origHandler:e,preType:l});else n.unbind("live."+N(h,m),e)}return this}}),f.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error".split(" "),function(a,b){f.fn[b]=function(a,c){c==null&&(c=a,a=null);return arguments.length>0?this.bind(b,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0)}),function(){function u(a,b,c,d,e,f){for(var g=0,h=d.length;g<h;g++){var i=d[g];if(i){var j=!1;i=i[a];while(i){if(i.sizcache===c){j=d[i.sizset];break}if(i.nodeType===1){f||(i.sizcache=c,i.sizset=g);if(typeof b!="string"){if(i===b){j=!0;break}}else if(k.filter(b,[i]).length>0){j=i;break}}i=i[a]}d[g]=j}}}function t(a,b,c,d,e,f){for(var g=0,h=d.length;g<h;g++){var i=d[g];if(i){var j=!1;i=i[a];while(i){if(i.sizcache===c){j=d[i.sizset];break}i.nodeType===1&&!f&&(i.sizcache=c,i.sizset=g);if(i.nodeName.toLowerCase()===b){j=i;break}i=i[a]}d[g]=j}}}var a=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d=0,e=Object.prototype.toString,g=!1,h=!0,i=/\\/g,j=/\W/;[0,0].sort(function(){h=!1;return 0});var k=function(b,d,f,g){f=f||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return f;var i,j,n,o,q,r,s,t,u=!0,w=k.isXML(d),x=[],y=b;do{a.exec(""),i=a.exec(y);if(i){y=i[3],x.push(i[1]);if(i[2]){o=i[3];break}}}while(i);if(x.length>1&&m.exec(b))if(x.length===2&&l.relative[x[0]])j=v(x[0]+x[1],d);else{j=l.relative[x[0]]?[d]:k(x.shift(),d);while(x.length)b=x.shift(),l.relative[b]&&(b+=x.shift()),j=v(b,j)}else{!g&&x.length>1&&d.nodeType===9&&!w&&l.match.ID.test(x[0])&&!l.match.ID.test(x[x.length-1])&&(q=k.find(x.shift(),d,w),d=q.expr?k.filter(q.expr,q.set)[0]:q.set[0]);if(d){q=g?{expr:x.pop(),set:p(g)}:k.find(x.pop(),x.length===1&&(x[0]==="~"||x[0]==="+")&&d.parentNode?d.parentNode:d,w),j=q.expr?k.filter(q.expr,q.set):q.set,x.length>0?n=p(j):u=!1;while(x.length)r=x.pop(),s=r,l.relative[r]?s=x.pop():r="",s==null&&(s=d),l.relative[r](n,s,w)}else n=x=[]}n||(n=j),n||k.error(r||b);if(e.call(n)==="[object Array]")if(!u)f.push.apply(f,n);else if(d&&d.nodeType===1)for(t=0;n[t]!=null;t++)n[t]&&(n[t]===!0||n[t].nodeType===1&&k.contains(d,n[t]))&&f.push(j[t]);else for(t=0;n[t]!=null;t++)n[t]&&n[t].nodeType===1&&f.push(j[t]);else p(n,f);o&&(k(o,h,f,g),k.uniqueSort(f));return f};k.uniqueSort=function(a){if(r){g=h,a.sort(r);if(g)for(var b=1;b<a.length;b++)a[b]===a[b-1]&&a.splice(b--,1)}return a},k.matches=function(a,b){return k(a,null,null,b)},k.matchesSelector=function(a,b){return k(b,null,null,[a]).length>0},k.find=function(a,b,c){var d;if(!a)return[];for(var e=0,f=l.order.length;e<f;e++){var g,h=l.order[e];if(g=l.leftMatch[h].exec(a)){var j=g[1];g.splice(1,1);if(j.substr(j.length-1)!=="\\"){g[1]=(g[1]||"").replace(i,""),d=l.find[h](g,b,c);if(d!=null){a=a.replace(l.match[h],"");break}}}}d||(d=typeof b.getElementsByTagName!="undefined"?b.getElementsByTagName("*"):[]);return{set:d,expr:a}},k.filter=function(a,c,d,e){var f,g,h=a,i=[],j=c,m=c&&c[0]&&k.isXML(c[0]);while(a&&c.length){for(var n in l.filter)if((f=l.leftMatch[n].exec(a))!=null&&f[2]){var o,p,q=l.filter[n],r=f[1];g=!1,f.splice(1,1);if(r.substr(r.length-1)==="\\")continue;j===i&&(i=[]);if(l.preFilter[n]){f=l.preFilter[n](f,j,d,i,e,m);if(!f)g=o=!0;else if(f===!0)continue}if(f)for(var s=0;(p=j[s])!=null;s++)if(p){o=q(p,f,s,j);var t=e^!!o;d&&o!=null?t?g=!0:j[s]=!1:t&&(i.push(p),g=!0)}if(o!==b){d||(j=i),a=a.replace(l.match[n],"");if(!g)return[];break}}if(a===h)if(g==null)k.error(a);else break;h=a}return j},k.error=function(a){throw"Syntax error, unrecognized expression: "+a};var l=k.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(a){return a.getAttribute("href")},type:function(a){return a.getAttribute("type")}},relative:{"+":function(a,b){var c=typeof b=="string",d=c&&!j.test(b),e=c&&!d;d&&(b=b.toLowerCase());for(var f=0,g=a.length,h;f<g;f++)if(h=a[f]){while((h=h.previousSibling)&&h.nodeType!==1);a[f]=e||h&&h.nodeName.toLowerCase()===b?h||!1:h===b}e&&k.filter(b,a,!0)},">":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!j.test(b)){b=b.toLowerCase();for(;e<f;e++){c=a[e];if(c){var g=c.parentNode;a[e]=g.nodeName.toLowerCase()===b?g:!1}}}else{for(;e<f;e++)c=a[e],c&&(a[e]=d?c.parentNode:c.parentNode===b);d&&k.filter(b,a,!0)}},"":function(a,b,c){var e,f=d++,g=u;typeof b=="string"&&!j.test(b)&&(b=b.toLowerCase(),e=b,g=t),g("parentNode",b,f,a,e,c)},"~":function(a,b,c){var e,f=d++,g=u;typeof b=="string"&&!j.test(b)&&(b=b.toLowerCase(),e=b,g=t),g("previousSibling",b,f,a,e,c)}},find:{ID:function(a,b,c){if(typeof b.getElementById!="undefined"&&!c){var d=b.getElementById(a[1]);return d&&d.parentNode?[d]:[]}},NAME:function(a,b){if(typeof b.getElementsByName!="undefined"){var c=[],d=b.getElementsByName(a[1]);for(var e=0,f=d.length;e<f;e++)d[e].getAttribute("name")===a[1]&&c.push(d[e]);return c.length===0?null:c}},TAG:function(a,b){if(typeof b.getElementsByTagName!="undefined")return b.getElementsByTagName(a[1])}},preFilter:{CLASS:function(a,b,c,d,e,f){a=" "+a[1].replace(i,"")+" ";if(f)return a;for(var g=0,h;(h=b[g])!=null;g++)h&&(e^(h.className&&(" "+h.className+" ").replace(/[\t\n\r]/g," ").indexOf(a)>=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(i,"")},TAG:function(a,b){return a[1].replace(i,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||k.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&k.error(a[0]);a[0]=d++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(i,"");!f&&l.attrMap[g]&&(a[1]=l.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(i,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=k(b[3],null,null,c);else{var g=k.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(l.match.POS.test(b[0])||l.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!k(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return b<c[3]-0},gt:function(a,b,c){return b>c[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=l.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||k.getText([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h<i;h++)if(g[h]===a)return!1;return!0}k.error(e)},CHILD:function(a,b){var c=b[1],d=a;switch(c){case"only":case"first":while(d=d.previousSibling)if(d.nodeType===1)return!1;if(c==="first")return!0;d=a;case"last":while(d=d.nextSibling)if(d.nodeType===1)return!1;return!0;case"nth":var e=b[2],f=b[3];if(e===1&&f===0)return!0;var g=b[0],h=a.parentNode;if(h&&(h.sizcache!==g||!a.nodeIndex)){var i=0;for(d=h.firstChild;d;d=d.nextSibling)d.nodeType===1&&(d.nodeIndex=++i);h.sizcache=g}var j=a.nodeIndex-f;return e===0?j===0:j%e===0&&j/e>=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=l.attrHandle[c]?l.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=l.setFilters[e];if(f)return f(a,c,b,d)}}},m=l.match.POS,n=function(a,b){return"\\"+(b-0+1)};for(var o in l.match)l.match[o]=new RegExp(l.match[o].source+/(?![^\[]*\])(?![^\(]*\))/.source),l.leftMatch[o]=new RegExp(/(^(?:.|\r|\n)*?)/.source+l.match[o].source.replace(/\\(\d+)/g,n));var p=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(q){p=function(a,b){var c=0,d=b||[];if(e.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var f=a.length;c<f;c++)d.push(a[c]);else for(;a[c];c++)d.push(a[c]);return d}}var r,s;c.documentElement.compareDocumentPosition?r=function(a,b){if(a===b){g=!0;return 0}if(!a.compareDocumentPosition||!b.compareDocumentPosition)return a.compareDocumentPosition?-1:1;return a.compareDocumentPosition(b)&4?-1:1}:(r=function(a,b){if(a===b){g=!0;return 0}if(a.sourceIndex&&b.sourceIndex)return a.sourceIndex-b.sourceIndex;var c,d,e=[],f=[],h=a.parentNode,i=b.parentNode,j=h;if(h===i)return s(a,b);if(!h)return-1;if(!i)return 1;while(j)e.unshift(j),j=j.parentNode;j=i;while(j)f.unshift(j),j=j.parentNode;c=e.length,d=f.length;for(var k=0;k<c&&k<d;k++)if(e[k]!==f[k])return s(e[k],f[k]);return k===c?s(a,f[k],-1):s(e[k],b,1)},s=function(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}),k.getText=function(a){var b="",c;for(var d=0;a[d];d++)c=a[d],c.nodeType===3||c.nodeType===4?b+=c.nodeValue:c.nodeType!==8&&(b+=k.getText(c.childNodes));return b},function(){var a=c.createElement("div"),d="script"+(new Date).getTime(),e=c.documentElement;a.innerHTML="<a name='"+d+"'/>",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(l.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},l.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(l.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(l.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=k,b=c.createElement("div"),d="__sizzle__";b.innerHTML="<p class='TEST'></p>";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){k=function(b,e,f,g){e=e||c;if(!g&&!k.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return p(e.getElementsByTagName(b),f);if(h[2]&&l.find.CLASS&&e.getElementsByClassName)return p(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return p([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return p([],f);if(i.id===h[3])return p([i],f)}try{return p(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var m=e,n=e.getAttribute("id"),o=n||d,q=e.parentNode,r=/^\s*[+~]/.test(b);n?o=o.replace(/'/g,"\\$&"):e.setAttribute("id",o),r&&q&&(e=e.parentNode);try{if(!r||q)return p(e.querySelectorAll("[id='"+o+"'] "+b),f)}catch(s){}finally{n||m.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)k[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}k.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!k.isXML(a))try{if(e||!l.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return k(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="<div class='test e'></div><div class='test'></div>";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;l.order.splice(1,0,"CLASS"),l.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?k.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?k.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:k.contains=function(){return!1},k.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var v=function(a,b){var c,d=[],e="",f=b.nodeType?[b]:b;while(c=l.match.PSEUDO.exec(a))e+=c[0],a=a.replace(l.match.PSEUDO,"");a=l.relative[a]?a+"*":a;for(var g=0,h=f.length;g<h;g++)k(a,f[g],d);return k.filter(e,d)};f.find=k,f.expr=k.selectors,f.expr[":"]=f.expr.filters,f.unique=k.uniqueSort,f.text=k.getText,f.isXMLDoc=k.isXML,f.contains=k.contains}();var O=/Until$/,P=/^(?:parents|prevUntil|prevAll)/,Q=/,/,R=/^.[^:#\[\.,]*$/,S=Array.prototype.slice,T=f.expr.match.POS,U={children:!0,contents:!0,next:!0,prev:!0};f.fn.extend({find:function(a){var b=this,c,d;if(typeof a!="string")return f(a).filter(function(){for(c=0,d=b.length;c<d;c++)if(f.contains(b[c],this))return!0});var e=this.pushStack("","find",a),g,h,i;for(c=0,d=this.length;c<d;c++){g=e.length,f.find(a,this[c],e);if(c>0)for(h=g;h<e.length;h++)for(i=0;i<g;i++)if(e[i]===e[h]){e.splice(h--,1);break}}return e},has:function(a){var b=f(a);return this.filter(function(){for(var a=0,c=b.length;a<c;a++)if(f.contains(this,b[a]))return!0})},not:function(a){return this.pushStack(W(this,a,!1),"not",a)},filter:function(a){return this.pushStack(W(this,a,!0),"filter",a)},is:function(a){return!!a&&(typeof a=="string"?f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h,i,j={},k=1;if(g&&a.length){for(d=0,e=a.length;d<e;d++)i=a[d],j[i]||(j[i]=T.test(i)?f(i,b||this.context):i);while(g&&g.ownerDocument&&g!==b){for(i in j)h=j[i],(h.jquery?h.index(g)>-1:f(g).is(h))&&c.push({selector:i,elem:g,level:k});g=g.parentNode,k++}}return c}var l=T.test(a)||typeof a!="string"?f(a,b||this.context):0;for(d=0,e=this.length;d<e;d++){g=this[d];while(g){if(l?l.index(g)>-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a||typeof a=="string")return f.inArray(this[0],a?f(a):this.parent().children());return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(V(c[0])||V(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling(a.parentNode.firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c),g=S.call(arguments);O.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!U[a]?f.unique(e):e,(this.length>1||Q.test(d))&&P.test(a)&&(e=e.reverse());return this.pushStack(e,a,g.join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var X=/ jQuery\d+="(?:\d+|null)"/g,Y=/^\s+/,Z=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,$=/<([\w:]+)/,_=/<tbody/i,ba=/<|&#?\w+;/,bb=/<(?:script|object|embed|option|style)/i,bc=/checked\s*(?:[^=]|=\s*.checked.)/i,bd=/\/(java|ecma)script/i,be=/^\s*<!(?:\[CDATA\[|\-\-)/,bf={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]};bf.optgroup=bf.option,bf.tbody=bf.tfoot=bf.colgroup=bf.caption=bf.thead,bf.th=bf.td,f.support.htmlSerialize||(bf._default=[1,"div<div>","</div>"]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){f(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f(arguments[0]).toArray());return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(X,""):null;if(typeof a=="string"&&!bb.test(a)&&(f.support.leadingWhitespace||!Y.test(a))&&!bf[($.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Z,"<$1></$2>");try{for(var c=0,d=this.length;c<d;c++)this[c].nodeType===1&&(f.cleanData(this[c].getElementsByTagName("*")),this[c].innerHTML=a)}catch(e){this.empty().append(a)}}else f.isFunction(a)?this.each(function(b){var c=f(this);c.html(a.call(this,b,c.html()))}):this.empty().append(a);return this},replaceWith:function(a){if(this[0]&&this[0].parentNode){if(f.isFunction(a))return this.each(function(b){var c=f(this),d=c.html();c.replaceWith(a.call(this,b,d))});typeof a!="string"&&(a=f(a).detach());return this.each(function(){var b=this.nextSibling,c=this.parentNode;f(this).remove(),b?f(b).before(a):f(c).append(a)})}return this.length?this.pushStack(f(f.isFunction(a)?a():a),"replaceWith",a):this},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,d){var e,g,h,i,j=a[0],k=[];if(!f.support.checkClone&&arguments.length===3&&typeof j=="string"&&bc.test(j))return this.each(function(){f(this).domManip(a,c,d,!0)});if(f.isFunction(j))return this.each(function(e){var g=f(this);a[0]=j.call(this,e,c?g.html():b),g.domManip(a,c,d)});if(this[0]){i=j&&j.parentNode,f.support.parentNode&&i&&i.nodeType===11&&i.childNodes.length===this.length?e={fragment:i}:e=f.buildFragment(a,this,k),h=e.fragment,h.childNodes.length===1?g=h=h.firstChild:g=h.firstChild;if(g){c=c&&f.nodeName(g,"tr");for(var l=0,m=this.length,n=m-1;l<m;l++)d.call(c?bg(this[l],g):this[l],e.cacheable||m>1&&l<n?f.clone(h,!0,!0):h)}k.length&&f.each(k,bm)}return this}}),f.buildFragment=function(a,b,d){var e,g,h,i;b&&b[0]&&(i=b[0].ownerDocument||b[0]),i.createDocumentFragment||(i=c),a.length===1&&typeof a[0]=="string"&&a[0].length<512&&i===c&&a[0].charAt(0)==="<"&&!bb.test(a[0])&&(f.support.checkClone||!bc.test(a[0]))&&(g=!0,h=f.fragments[a[0]],h&&h!==1&&(e=h)),e||(e=i.createDocumentFragment(),f.clean(a,i,e,d)),g&&(f.fragments[a[0]]=h?e:1);return{fragment:e,cacheable:g}},f.fragments={},f.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){f.fn[a]=function(c){var d=[],e=f(c),g=this.length===1&&this[0].parentNode;if(g&&g.nodeType===11&&g.childNodes.length===1&&e.length===1){e[b](this[0]);return this}for(var h=0,i=e.length;h<i;h++){var j=(h>0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j
+)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d=a.cloneNode(!0),e,g,h;if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bi(a,d),e=bj(a),g=bj(d);for(h=0;e[h];++h)bi(e[h],g[h])}if(b){bh(a,d);if(c){e=bj(a),g=bj(d);for(h=0;e[h];++h)bh(e[h],g[h])}}e=g=null;return d},clean:function(a,b,d,e){var g;b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var h=[],i;for(var j=0,k;(k=a[j])!=null;j++){typeof k=="number"&&(k+="");if(!k)continue;if(typeof k=="string")if(!ba.test(k))k=b.createTextNode(k);else{k=k.replace(Z,"<$1></$2>");var l=($.exec(k)||["",""])[1].toLowerCase(),m=bf[l]||bf._default,n=m[0],o=b.createElement("div");o.innerHTML=m[1]+k+m[2];while(n--)o=o.lastChild;if(!f.support.tbody){var p=_.test(k),q=l==="table"&&!p?o.firstChild&&o.firstChild.childNodes:m[1]==="<table>"&&!p?o.childNodes:[];for(i=q.length-1;i>=0;--i)f.nodeName(q[i],"tbody")&&!q[i].childNodes.length&&q[i].parentNode.removeChild(q[i])}!f.support.leadingWhitespace&&Y.test(k)&&o.insertBefore(b.createTextNode(Y.exec(k)[0]),o.firstChild),k=o.childNodes}var r;if(!f.support.appendChecked)if(k[0]&&typeof (r=k.length)=="number")for(i=0;i<r;i++)bl(k[i]);else bl(k);k.nodeType?h.push(k):h=f.merge(h,k)}if(d){g=function(a){return!a.type||bd.test(a.type)};for(j=0;h[j];j++)if(e&&f.nodeName(h[j],"script")&&(!h[j].type||h[j].type.toLowerCase()==="text/javascript"))e.push(h[j].parentNode?h[j].parentNode.removeChild(h[j]):h[j]);else{if(h[j].nodeType===1){var s=f.grep(h[j].getElementsByTagName("script"),g);h.splice.apply(h,[j+1,0].concat(s))}d.appendChild(h[j])}}return h},cleanData:function(a){var b,c,d=f.cache,e=f.expando,g=f.event.special,h=f.support.deleteExpando;for(var i=0,j;(j=a[i])!=null;i++){if(j.nodeName&&f.noData[j.nodeName.toLowerCase()])continue;c=j[f.expando];if(c){b=d[c]&&d[c][e];if(b&&b.events){for(var k in b.events)g[k]?f.event.remove(j,k):f.removeEvent(j,k,b.handle);b.handle&&(b.handle.elem=null)}h?delete j[f.expando]:j.removeAttribute&&j.removeAttribute(f.expando),delete d[c]}}}});var bn=/alpha\([^)]*\)/i,bo=/opacity=([^)]*)/,bp=/([A-Z]|^ms)/g,bq=/^-?\d+(?:px)?$/i,br=/^-?\d/,bs=/^[+\-]=/,bt=/[^+\-\.\de]+/g,bu={position:"absolute",visibility:"hidden",display:"block"},bv=["Left","Right"],bw=["Top","Bottom"],bx,by,bz;f.fn.css=function(a,c){if(arguments.length===2&&c===b)return this;return f.access(this,a,c,!0,function(a,c,d){return d!==b?f.style(a,c,d):f.css(a,c)})},f.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=bx(a,"opacity","opacity");return c===""?"1":c}return a.style.opacity}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":f.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!!a&&a.nodeType!==3&&a.nodeType!==8&&!!a.style){var g,h,i=f.camelCase(c),j=a.style,k=f.cssHooks[i];c=f.cssProps[i]||i;if(d===b){if(k&&"get"in k&&(g=k.get(a,!1,e))!==b)return g;return j[c]}h=typeof d;if(h==="number"&&isNaN(d)||d==null)return;h==="string"&&bs.test(d)&&(d=+d.replace(bt,"")+parseFloat(f.css(a,c)),h="number"),h==="number"&&!f.cssNumber[i]&&(d+="px");if(!k||!("set"in k)||(d=k.set(a,d))!==b)try{j[c]=d}catch(l){}}},css:function(a,c,d){var e,g;c=f.camelCase(c),g=f.cssHooks[c],c=f.cssProps[c]||c,c==="cssFloat"&&(c="float");if(g&&"get"in g&&(e=g.get(a,!0,d))!==b)return e;if(bx)return bx(a,c)},swap:function(a,b,c){var d={};for(var e in b)d[e]=a.style[e],a.style[e]=b[e];c.call(a);for(e in b)a.style[e]=d[e]}}),f.curCSS=f.css,f.each(["height","width"],function(a,b){f.cssHooks[b]={get:function(a,c,d){var e;if(c){if(a.offsetWidth!==0)return bA(a,b,d);f.swap(a,bu,function(){e=bA(a,b,d)});return e}},set:function(a,b){if(!bq.test(b))return b;b=parseFloat(b);if(b>=0)return b+"px"}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return bo.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle;c.zoom=1;var e=f.isNaN(b)?"":"alpha(opacity="+b*100+")",g=d&&d.filter||c.filter||"";c.filter=bn.test(g)?g.replace(bn,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){var c;f.swap(a,{display:"inline-block"},function(){b?c=bx(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(by=function(a,c){var d,e,g;c=c.replace(bp,"-$1").toLowerCase();if(!(e=a.ownerDocument.defaultView))return b;if(g=e.getComputedStyle(a,null))d=g.getPropertyValue(c),d===""&&!f.contains(a.ownerDocument.documentElement,a)&&(d=f.style(a,c));return d}),c.documentElement.currentStyle&&(bz=function(a,b){var c,d=a.currentStyle&&a.currentStyle[b],e=a.runtimeStyle&&a.runtimeStyle[b],f=a.style;!bq.test(d)&&br.test(d)&&(c=f.left,e&&(a.runtimeStyle.left=a.currentStyle.left),f.left=b==="fontSize"?"1em":d||0,d=f.pixelLeft+"px",f.left=c,e&&(a.runtimeStyle.left=e));return d===""?"auto":d}),bx=by||bz,f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)});var bB=/%20/g,bC=/\[\]$/,bD=/\r?\n/g,bE=/#.*$/,bF=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bG=/^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bH=/^(?:about|app|app\-storage|.+\-extension|file|widget):$/,bI=/^(?:GET|HEAD)$/,bJ=/^\/\//,bK=/\?/,bL=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,bM=/^(?:select|textarea)/i,bN=/\s+/,bO=/([?&])_=[^&]*/,bP=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bQ=f.fn.load,bR={},bS={},bT,bU;try{bT=e.href}catch(bV){bT=c.createElement("a"),bT.href="",bT=bT.href}bU=bP.exec(bT.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bQ)return bQ.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("<div>").append(c.replace(bL,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bM.test(this.nodeName)||bG.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bD,"\r\n")}}):{name:b.name,value:c.replace(bD,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.bind(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?f.extend(!0,a,f.ajaxSettings,b):(b=a,a=f.extend(!0,f.ajaxSettings,b));for(var c in{context:1,url:1})c in b?a[c]=b[c]:c in f.ajaxSettings&&(a[c]=f.ajaxSettings[c]);return a},ajaxSettings:{url:bT,isLocal:bH.test(bU[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":"*/*"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML}},ajaxPrefilter:bW(bR),ajaxTransport:bW(bS),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a?4:0;var o,r,u,w=l?bZ(d,v,l):b,x,y;if(a>=200&&a<300||a===304){if(d.ifModified){if(x=v.getResponseHeader("Last-Modified"))f.lastModified[k]=x;if(y=v.getResponseHeader("Etag"))f.etag[k]=y}if(a===304)c="notmodified",o=!0;else try{r=b$(d,w),c="success",o=!0}catch(z){c="parsererror",u=z}}else{u=c;if(!c||a)c="error",a<0&&(a=0)}v.status=a,v.statusText=c,o?h.resolveWith(e,[r,c,v]):h.rejectWith(e,[v,c,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.resolveWith(e,[v,c]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f._Deferred(),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bF.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.done,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bE,"").replace(bJ,bU[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bN),d.crossDomain==null&&(r=bP.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bU[1]&&r[2]==bU[2]&&(r[3]||(r[1]==="http:"?80:443))==(bU[3]||(bU[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),bX(bR,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bI.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bK.test(d.url)?"&":"?")+d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bO,"$1_="+x);d.url=y+(y===d.url?(bK.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", */*; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=bX(bS,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){status<2?w(-1,z):f.error(z)}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)bY(g,a[g],c,e);return d.join("&").replace(bB,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var b_=f.now(),ca=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+b_++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=b.contentType==="application/x-www-form-urlencoded"&&typeof b.data=="string";if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(ca.test(b.url)||e&&ca.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(ca,l),b.url===j&&(e&&(k=k.replace(ca,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var cb=a.ActiveXObject?function(){for(var a in cd)cd[a](0,1)}:!1,cc=0,cd;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ce()||cf()}:ce,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,cb&&delete cd[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n),m.text=h.responseText;try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cc,cb&&(cd||(cd={},f(a).unload(cb)),cd[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var cg={},ch,ci,cj=/^(?:toggle|show|hide)$/,ck=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,cl,cm=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cn,co=a.webkitRequestAnimationFrame||a.mozRequestAnimationFrame||a.oRequestAnimationFrame;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(cr("show",3),a,b,c);for(var g=0,h=this.length;g<h;g++)d=this[g],d.style&&(e=d.style.display,!f._data(d,"olddisplay")&&e==="none"&&(e=d.style.display=""),e===""&&f.css(d,"display")==="none"&&f._data(d,"olddisplay",cs(d.nodeName)));for(g=0;g<h;g++){d=this[g];if(d.style){e=d.style.display;if(e===""||e==="none")d.style.display=f._data(d,"olddisplay")||""}}return this},hide:function(a,b,c){if(a||a===0)return this.animate(cr("hide",3),a,b,c);for(var d=0,e=this.length;d<e;d++)if(this[d].style){var g=f.css(this[d],"display");g!=="none"&&!f._data(this[d],"olddisplay")&&f._data(this[d],"olddisplay",g)}for(d=0;d<e;d++)this[d].style&&(this[d].style.display="none");return this},_toggle:f.fn.toggle,toggle:function(a,b,c){var d=typeof a=="boolean";f.isFunction(a)&&f.isFunction(b)?this._toggle.apply(this,arguments):a==null||d?this.each(function(){var b=d?a:f(this).is(":hidden");f(this)[b?"show":"hide"]()}):this.animate(cr("toggle",3),a,b,c);return this},fadeTo:function(a,b,c,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=f.speed(b,c,d);if(f.isEmptyObject(a))return this.each(e.complete,[!1]);a=f.extend({},a);return this[e.queue===!1?"each":"queue"](function(){e.queue===!1&&f._mark(this);var b=f.extend({},e),c=this.nodeType===1,d=c&&f(this).is(":hidden"),g,h,i,j,k,l,m,n,o;b.animatedProperties={};for(i in a){g=f.camelCase(i),i!==g&&(a[g]=a[i],delete a[i]),h=a[g],f.isArray(h)?(b.animatedProperties[g]=h[1],h=a[g]=h[0]):b.animatedProperties[g]=b.specialEasing&&b.specialEasing[g]||b.easing||"swing";if(h==="hide"&&d||h==="show"&&!d)return b.complete.call(this);c&&(g==="height"||g==="width")&&(b.overflow=[this.style.overflow,this.style.overflowX,this.style.overflowY],f.css(this,"display")==="inline"&&f.css(this,"float")==="none"&&(f.support.inlineBlockNeedsLayout?(j=cs(this.nodeName),j==="inline"?this.style.display="inline-block":(this.style.display="inline",this.style.zoom=1)):this.style.display="inline-block"))}b.overflow!=null&&(this.style.overflow="hidden");for(i in a)k=new f.fx(this,b,i),h=a[i],cj.test(h)?k[h==="toggle"?d?"show":"hide":h]():(l=ck.exec(h),m=k.cur(),l?(n=parseFloat(l[2]),o=l[3]||(f.cssNumber[i]?"":"px"),o!=="px"&&(f.style(this,i,(n||1)+o),m=(n||1)/k.cur()*m,f.style(this,i,m+o)),l[1]&&(n=(l[1]==="-="?-1:1)*n+m),k.custom(m,n,o)):k.custom(m,h,""));return!0})},stop:function(a,b){a&&this.queue([]),this.each(function(){var a=f.timers,c=a.length;b||f._unmark(!0,this);while(c--)a[c].elem===this&&(b&&a[c](!0),a.splice(c,1))}),b||this.dequeue();return this}}),f.each({slideDown:cr("show",1),slideUp:cr("hide",1),slideToggle:cr("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){f.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),f.extend({speed:function(a,b,c){var d=a&&typeof a=="object"?f.extend({},a):{complete:c||!c&&b||f.isFunction(a)&&a,duration:a,easing:c&&b||b&&!f.isFunction(b)&&b};d.duration=f.fx.off?0:typeof d.duration=="number"?d.duration:d.duration in f.fx.speeds?f.fx.speeds[d.duration]:f.fx.speeds._default,d.old=d.complete,d.complete=function(a){f.isFunction(d.old)&&d.old.call(this),d.queue!==!1?f.dequeue(this):a!==!1&&f._unmark(this)};return d},easing:{linear:function(a,b,c,d){return c+d*a},swing:function(a,b,c,d){return(-Math.cos(a*Math.PI)/2+.5)*d+c}},timers:[],fx:function(a,b,c){this.options=b,this.elem=a,this.prop=c,b.orig=b.orig||{}}}),f.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this),(f.fx.step[this.prop]||f.fx.step._default)(this)},cur:function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];var a,b=f.css(this.elem,this.prop);return isNaN(a=parseFloat(b))?!b||b==="auto"?0:b:a},custom:function(a,b,c){function h(a){return d.step(a)}var d=this,e=f.fx,g;this.startTime=cn||cp(),this.start=a,this.end=b,this.unit=c||this.unit||(f.cssNumber[this.prop]?"":"px"),this.now=this.start,this.pos=this.state=0,h.elem=this.elem,h()&&f.timers.push(h)&&!cl&&(co?(cl=!0,g=function(){cl&&(co(g),e.tick())},co(g)):cl=setInterval(e.tick,e.interval))},show:function(){this.options.orig[this.prop]=f.style(this.elem,this.prop),this.options.show=!0,this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur()),f(this.elem).show()},hide:function(){this.options.orig[this.prop]=f.style(this.elem,this.prop),this.options.hide=!0,this.custom(this.cur(),0)},step:function(a){var b=cn||cp(),c=!0,d=this.elem,e=this.options,g,h;if(a||b>=e.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),e.animatedProperties[this.prop]=!0;for(g in e.animatedProperties)e.animatedProperties[g]!==!0&&(c=!1);if(c){e.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){d.style["overflow"+b]=e.overflow[a]}),e.hide&&f(d).hide();if(e.hide||e.show)for(var i in e.animatedProperties)f.style(d,i,e.orig[i]);e.complete.call(d)}return!1}e.duration==Infinity?this.now=b:(h=b-this.startTime,this.state=h/e.duration,this.pos=f.easing[e.animatedProperties[this.prop]](this.state,h,0,1,e.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){for(var a=f.timers,b=0;b<a.length;++b)a[b]()||a.splice(b--,1);a.length||f.fx.stop()},interval:13,stop:function(){clearInterval(cl),cl=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){f.style(a.elem,"opacity",a.now)},_default:function(a){a.elem.style&&a.elem.style[a.prop]!=null?a.elem.style[a.prop]=(a.prop==="width"||a.prop==="height"?Math.max(0,a.now):a.now)+a.unit:a.elem[a.prop]=a.now}}}),f.expr&&f.expr.filters&&(f.expr.filters.animated=function(a){return f.grep(f.timers,function(b){return a===b.elem}).length});var ct=/^t(?:able|d|h)$/i,cu=/^(?:body|html)$/i;"getBoundingClientRect"in c.documentElement?f.fn.offset=function(a){var b=this[0],c;if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);try{c=b.getBoundingClientRect()}catch(d){}var e=b.ownerDocument,g=e.documentElement;if(!c||!f.contains(g,b))return c?{top:c.top,left:c.left}:{top:0,left:0};var h=e.body,i=cv(e),j=g.clientTop||h.clientTop||0,k=g.clientLeft||h.clientLeft||0,l=i.pageYOffset||f.support.boxModel&&g.scrollTop||h.scrollTop,m=i.pageXOffset||f.support.boxModel&&g.scrollLeft||h.scrollLeft,n=c.top+l-j,o=c.left+m-k;return{top:n,left:o}}:f.fn.offset=function(a){var b=this[0];if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);f.offset.initialize();var c,d=b.offsetParent,e=b,g=b.ownerDocument,h=g.documentElement,i=g.body,j=g.defaultView,k=j?j.getComputedStyle(b,null):b.currentStyle,l=b.offsetTop,m=b.offsetLeft;while((b=b.parentNode)&&b!==i&&b!==h){if(f.offset.supportsFixedPosition&&k.position==="fixed")break;c=j?j.getComputedStyle(b,null):b.currentStyle,l-=b.scrollTop,m-=b.scrollLeft,b===d&&(l+=b.offsetTop,m+=b.offsetLeft,f.offset.doesNotAddBorder&&(!f.offset.doesAddBorderForTableAndCells||!ct.test(b.nodeName))&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),e=d,d=b.offsetParent),f.offset.subtractsBorderForOverflowNotVisible&&c.overflow!=="visible"&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),k=c}if(k.position==="relative"||k.position==="static")l+=i.offsetTop,m+=i.offsetLeft;f.offset.supportsFixedPosition&&k.position==="fixed"&&(l+=Math.max(h.scrollTop,i.scrollTop),m+=Math.max(h.scrollLeft,i.scrollLeft));return{top:l,left:m}},f.offset={initialize:function(){var a=c.body,b=c.createElement("div"),d,e,g,h,i=parseFloat(f.css(a,"marginTop"))||0,j="<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";f.extend(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"}),b.innerHTML=j,a.insertBefore(b,a.firstChild),d=b.firstChild,e=d.firstChild,h=d.nextSibling.firstChild.firstChild,this.doesNotAddBorder=e.offsetTop!==5,this.doesAddBorderForTableAndCells=h.offsetTop===5,e.style.position="fixed",e.style.top="20px",this.supportsFixedPosition=e.offsetTop===20||e.offsetTop===15,e.style.position=e.style.top="",d.style.overflow="hidden",d.style.position="relative",this.subtractsBorderForOverflowNotVisible=e.offsetTop===-5,this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==i,a.removeChild(b),f.offset.initialize=f.noop},bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;f.offset.initialize(),f.offset.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(f.css(a,"marginTop"))||0,c+=parseFloat(f.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var d=f.css(a,"position");d==="static"&&(a.style.position="relative");var e=f(a),g=e.offset(),h=f.css(a,"top"),i=f.css(a,"left"),j=(d==="absolute"||d==="fixed")&&f.inArray("auto",[h,i])>-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cu.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cu.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each(["Left","Top"],function(a,c){var d="scroll"+c;f.fn[d]=function(c){var e,g;if(c===b){e=this[0];if(!e)return null;g=cv(e);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:f.support.boxModel&&g.document.documentElement[d]||g.document.body[d]:e[d]}return this.each(function(){g=cv(this),g?g.scrollTo(a?f(g).scrollLeft():c,a?c:f(g).scrollTop()):this[d]=c})}}),f.each(["Height","Width"],function(a,c){var d=c.toLowerCase();f.fn["inner"+c]=function(){var a=this[0];return a&&a.style?parseFloat(f.css(a,d,"padding")):null},f.fn["outer"+c]=function(a){var b=this[0];return b&&b.style?parseFloat(f.css(b,d,a?"margin":"border")):null},f.fn[d]=function(a){var e=this[0];if(!e)return a==null?null:this;if(f.isFunction(a))return this.each(function(b){var c=f(this);c[d](a.call(this,b,c[d]()))});if(f.isWindow(e)){var g=e.document.documentElement["client"+c];return e.document.compatMode==="CSS1Compat"&&g||e.document.body["client"+c]||g}if(e.nodeType===9)return Math.max(e.documentElement["client"+c],e.body["scroll"+c],e.documentElement["scroll"+c],e.body["offset"+c],e.documentElement["offset"+c]);if(a===b){var h=f.css(e,d),i=parseFloat(h);return f.isNaN(i)?h:i}return this.css(d,typeof a=="string"?a:a+"px")}}),a.jQuery=a.$=f})(window);
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/apiCss/jquery.ztree.core-3.5.js b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/apiCss/jquery.ztree.core-3.5.js
new file mode 100644
index 0000000..42ab8b4
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/apiCss/jquery.ztree.core-3.5.js
@@ -0,0 +1,68 @@
+/*
+ * JQuery zTree core v3.5.15
+ * http://zTree.me/
+ *
+ * Copyright (c) 2010 Hunter.z
+ *
+ * Licensed same as jquery - MIT License
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ * email: hunter.z@263.net
+ * Date: 2013-10-15
+ */
+(function(p){var G,H,I,J,K,L,r={},u={},v={},M={treeId:"",treeObj:null,view:{addDiyDom:null,autoCancelSelected:!0,dblClickExpand:!0,expandSpeed:"fast",fontCss:{},nameIsHTML:!1,selectedMulti:!0,showIcon:!0,showLine:!0,showTitle:!0,txtSelectedEnable:!1},data:{key:{children:"children",name:"name",title:"",url:"url"},simpleData:{enable:!1,idKey:"id",pIdKey:"pId",rootPId:null},keep:{parent:!1,leaf:!1}},async:{enable:!1,contentType:"application/x-www-form-urlencoded",type:"post",dataType:"text",url:"",autoParam:[],
+otherParam:[],dataFilter:null},callback:{beforeAsync:null,beforeClick:null,beforeDblClick:null,beforeRightClick:null,beforeMouseDown:null,beforeMouseUp:null,beforeExpand:null,beforeCollapse:null,beforeRemove:null,onAsyncError:null,onAsyncSuccess:null,onNodeCreated:null,onClick:null,onDblClick:null,onRightClick:null,onMouseDown:null,onMouseUp:null,onExpand:null,onCollapse:null,onRemove:null}},w=[function(b){var a=b.treeObj,c=e.event;a.bind(c.NODECREATED,function(a,c,g){j.apply(b.callback.onNodeCreated,
+[a,c,g])});a.bind(c.CLICK,function(a,c,g,l,h){j.apply(b.callback.onClick,[c,g,l,h])});a.bind(c.EXPAND,function(a,c,g){j.apply(b.callback.onExpand,[a,c,g])});a.bind(c.COLLAPSE,function(a,c,g){j.apply(b.callback.onCollapse,[a,c,g])});a.bind(c.ASYNC_SUCCESS,function(a,c,g,l){j.apply(b.callback.onAsyncSuccess,[a,c,g,l])});a.bind(c.ASYNC_ERROR,function(a,c,g,l,h,e){j.apply(b.callback.onAsyncError,[a,c,g,l,h,e])})}],x=[function(b){var a=e.event;b.treeObj.unbind(a.NODECREATED).unbind(a.CLICK).unbind(a.EXPAND).unbind(a.COLLAPSE).unbind(a.ASYNC_SUCCESS).unbind(a.ASYNC_ERROR)}],
+y=[function(b){var a=h.getCache(b);a||(a={},h.setCache(b,a));a.nodes=[];a.doms=[]}],z=[function(b,a,c,d,f,g){if(c){var l=h.getRoot(b),e=b.data.key.children;c.level=a;c.tId=b.treeId+"_"+ ++l.zId;c.parentTId=d?d.tId:null;c.open=typeof c.open=="string"?j.eqs(c.open,"true"):!!c.open;c[e]&&c[e].length>0?(c.isParent=!0,c.zAsync=!0):(c.isParent=typeof c.isParent=="string"?j.eqs(c.isParent,"true"):!!c.isParent,c.open=c.isParent&&!b.async.enable?c.open:!1,c.zAsync=!c.isParent);c.isFirstNode=f;c.isLastNode=
+g;c.getParentNode=function(){return h.getNodeCache(b,c.parentTId)};c.getPreNode=function(){return h.getPreNode(b,c)};c.getNextNode=function(){return h.getNextNode(b,c)};c.isAjaxing=!1;h.fixPIdKeyValue(b,c)}}],s=[function(b){var a=b.target,c=h.getSetting(b.data.treeId),d="",f=null,g="",l="",i=null,n=null,k=null;if(j.eqs(b.type,"mousedown"))l="mousedown";else if(j.eqs(b.type,"mouseup"))l="mouseup";else if(j.eqs(b.type,"contextmenu"))l="contextmenu";else if(j.eqs(b.type,"click"))if(j.eqs(a.tagName,"span")&&
+a.getAttribute("treeNode"+e.id.SWITCH)!==null)d=j.getNodeMainDom(a).id,g="switchNode";else{if(k=j.getMDom(c,a,[{tagName:"a",attrName:"treeNode"+e.id.A}]))d=j.getNodeMainDom(k).id,g="clickNode"}else if(j.eqs(b.type,"dblclick")&&(l="dblclick",k=j.getMDom(c,a,[{tagName:"a",attrName:"treeNode"+e.id.A}])))d=j.getNodeMainDom(k).id,g="switchNode";if(l.length>0&&d.length==0&&(k=j.getMDom(c,a,[{tagName:"a",attrName:"treeNode"+e.id.A}])))d=j.getNodeMainDom(k).id;if(d.length>0)switch(f=h.getNodeCache(c,d),g){case "switchNode":f.isParent?
+j.eqs(b.type,"click")||j.eqs(b.type,"dblclick")&&j.apply(c.view.dblClickExpand,[c.treeId,f],c.view.dblClickExpand)?i=G:g="":g="";break;case "clickNode":i=H}switch(l){case "mousedown":n=I;break;case "mouseup":n=J;break;case "dblclick":n=K;break;case "contextmenu":n=L}return{stop:!1,node:f,nodeEventType:g,nodeEventCallback:i,treeEventType:l,treeEventCallback:n}}],A=[function(b){var a=h.getRoot(b);a||(a={},h.setRoot(b,a));a[b.data.key.children]=[];a.expandTriggerFlag=!1;a.curSelectedList=[];a.noSelection=
+!0;a.createdNodes=[];a.zId=0;a._ver=(new Date).getTime()}],B=[],C=[],D=[],E=[],F=[],h={addNodeCache:function(b,a){h.getCache(b).nodes[h.getNodeCacheId(a.tId)]=a},getNodeCacheId:function(b){return b.substring(b.lastIndexOf("_")+1)},addAfterA:function(b){C.push(b)},addBeforeA:function(b){B.push(b)},addInnerAfterA:function(b){E.push(b)},addInnerBeforeA:function(b){D.push(b)},addInitBind:function(b){w.push(b)},addInitUnBind:function(b){x.push(b)},addInitCache:function(b){y.push(b)},addInitNode:function(b){z.push(b)},
+addInitProxy:function(b,a){a?s.splice(0,0,b):s.push(b)},addInitRoot:function(b){A.push(b)},addNodesData:function(b,a,c){var d=b.data.key.children;a[d]||(a[d]=[]);if(a[d].length>0)a[d][a[d].length-1].isLastNode=!1,i.setNodeLineIcos(b,a[d][a[d].length-1]);a.isParent=!0;a[d]=a[d].concat(c)},addSelectedNode:function(b,a){var c=h.getRoot(b);h.isSelectedNode(b,a)||c.curSelectedList.push(a)},addCreatedNode:function(b,a){(b.callback.onNodeCreated||b.view.addDiyDom)&&h.getRoot(b).createdNodes.push(a)},addZTreeTools:function(b){F.push(b)},
+exSetting:function(b){p.extend(!0,M,b)},fixPIdKeyValue:function(b,a){b.data.simpleData.enable&&(a[b.data.simpleData.pIdKey]=a.parentTId?a.getParentNode()[b.data.simpleData.idKey]:b.data.simpleData.rootPId)},getAfterA:function(b,a,c){for(var d=0,f=C.length;d<f;d++)C[d].apply(this,arguments)},getBeforeA:function(b,a,c){for(var d=0,f=B.length;d<f;d++)B[d].apply(this,arguments)},getInnerAfterA:function(b,a,c){for(var d=0,f=E.length;d<f;d++)E[d].apply(this,arguments)},getInnerBeforeA:function(b,a,c){for(var d=
+0,f=D.length;d<f;d++)D[d].apply(this,arguments)},getCache:function(b){return v[b.treeId]},getNextNode:function(b,a){if(!a)return null;for(var c=b.data.key.children,d=a.parentTId?a.getParentNode():h.getRoot(b),f=0,g=d[c].length-1;f<=g;f++)if(d[c][f]===a)return f==g?null:d[c][f+1];return null},getNodeByParam:function(b,a,c,d){if(!a||!c)return null;for(var f=b.data.key.children,g=0,l=a.length;g<l;g++){if(a[g][c]==d)return a[g];var e=h.getNodeByParam(b,a[g][f],c,d);if(e)return e}return null},getNodeCache:function(b,
+a){if(!a)return null;var c=v[b.treeId].nodes[h.getNodeCacheId(a)];return c?c:null},getNodeName:function(b,a){return""+a[b.data.key.name]},getNodeTitle:function(b,a){return""+a[b.data.key.title===""?b.data.key.name:b.data.key.title]},getNodes:function(b){return h.getRoot(b)[b.data.key.children]},getNodesByParam:function(b,a,c,d){if(!a||!c)return[];for(var f=b.data.key.children,g=[],l=0,e=a.length;l<e;l++)a[l][c]==d&&g.push(a[l]),g=g.concat(h.getNodesByParam(b,a[l][f],c,d));return g},getNodesByParamFuzzy:function(b,
+a,c,d){if(!a||!c)return[];for(var f=b.data.key.children,g=[],d=d.toLowerCase(),l=0,e=a.length;l<e;l++)typeof a[l][c]=="string"&&a[l][c].toLowerCase().indexOf(d)>-1&&g.push(a[l]),g=g.concat(h.getNodesByParamFuzzy(b,a[l][f],c,d));return g},getNodesByFilter:function(b,a,c,d,f){if(!a)return d?null:[];for(var g=b.data.key.children,e=d?null:[],i=0,n=a.length;i<n;i++){if(j.apply(c,[a[i],f],!1)){if(d)return a[i];e.push(a[i])}var k=h.getNodesByFilter(b,a[i][g],c,d,f);if(d&&k)return k;e=d?k:e.concat(k)}return e},
+getPreNode:function(b,a){if(!a)return null;for(var c=b.data.key.children,d=a.parentTId?a.getParentNode():h.getRoot(b),f=0,g=d[c].length;f<g;f++)if(d[c][f]===a)return f==0?null:d[c][f-1];return null},getRoot:function(b){return b?u[b.treeId]:null},getRoots:function(){return u},getSetting:function(b){return r[b]},getSettings:function(){return r},getZTreeTools:function(b){return(b=this.getRoot(this.getSetting(b)))?b.treeTools:null},initCache:function(b){for(var a=0,c=y.length;a<c;a++)y[a].apply(this,
+arguments)},initNode:function(b,a,c,d,f,g){for(var e=0,h=z.length;e<h;e++)z[e].apply(this,arguments)},initRoot:function(b){for(var a=0,c=A.length;a<c;a++)A[a].apply(this,arguments)},isSelectedNode:function(b,a){for(var c=h.getRoot(b),d=0,f=c.curSelectedList.length;d<f;d++)if(a===c.curSelectedList[d])return!0;return!1},removeNodeCache:function(b,a){var c=b.data.key.children;if(a[c])for(var d=0,f=a[c].length;d<f;d++)arguments.callee(b,a[c][d]);h.getCache(b).nodes[h.getNodeCacheId(a.tId)]=null},removeSelectedNode:function(b,
+a){for(var c=h.getRoot(b),d=0,f=c.curSelectedList.length;d<f;d++)if(a===c.curSelectedList[d]||!h.getNodeCache(b,c.curSelectedList[d].tId))c.curSelectedList.splice(d,1),d--,f--},setCache:function(b,a){v[b.treeId]=a},setRoot:function(b,a){u[b.treeId]=a},setZTreeTools:function(b,a){for(var c=0,d=F.length;c<d;c++)F[c].apply(this,arguments)},transformToArrayFormat:function(b,a){if(!a)return[];var c=b.data.key.children,d=[];if(j.isArray(a))for(var f=0,g=a.length;f<g;f++)d.push(a[f]),a[f][c]&&(d=d.concat(h.transformToArrayFormat(b,
+a[f][c])));else d.push(a),a[c]&&(d=d.concat(h.transformToArrayFormat(b,a[c])));return d},transformTozTreeFormat:function(b,a){var c,d,f=b.data.simpleData.idKey,g=b.data.simpleData.pIdKey,e=b.data.key.children;if(!f||f==""||!a)return[];if(j.isArray(a)){var h=[],i=[];for(c=0,d=a.length;c<d;c++)i[a[c][f]]=a[c];for(c=0,d=a.length;c<d;c++)i[a[c][g]]&&a[c][f]!=a[c][g]?(i[a[c][g]][e]||(i[a[c][g]][e]=[]),i[a[c][g]][e].push(a[c])):h.push(a[c]);return h}else return[a]}},m={bindEvent:function(b){for(var a=0,
+c=w.length;a<c;a++)w[a].apply(this,arguments)},unbindEvent:function(b){for(var a=0,c=x.length;a<c;a++)x[a].apply(this,arguments)},bindTree:function(b){var a={treeId:b.treeId},c=b.treeObj;b.view.txtSelectedEnable||c.bind("selectstart",function(a){a=a.originalEvent.srcElement.nodeName.toLowerCase();return a==="input"||a==="textarea"}).css({"-moz-user-select":"-moz-none"});c.bind("click",a,m.proxy);c.bind("dblclick",a,m.proxy);c.bind("mouseover",a,m.proxy);c.bind("mouseout",a,m.proxy);c.bind("mousedown",
+a,m.proxy);c.bind("mouseup",a,m.proxy);c.bind("contextmenu",a,m.proxy)},unbindTree:function(b){b.treeObj.unbind("click",m.proxy).unbind("dblclick",m.proxy).unbind("mouseover",m.proxy).unbind("mouseout",m.proxy).unbind("mousedown",m.proxy).unbind("mouseup",m.proxy).unbind("contextmenu",m.proxy)},doProxy:function(b){for(var a=[],c=0,d=s.length;c<d;c++){var f=s[c].apply(this,arguments);a.push(f);if(f.stop)break}return a},proxy:function(b){var a=h.getSetting(b.data.treeId);if(!j.uCanDo(a,b))return!0;
+for(var a=m.doProxy(b),c=!0,d=0,f=a.length;d<f;d++){var g=a[d];g.nodeEventCallback&&(c=g.nodeEventCallback.apply(g,[b,g.node])&&c);g.treeEventCallback&&(c=g.treeEventCallback.apply(g,[b,g.node])&&c)}return c}};G=function(b,a){var c=h.getSetting(b.data.treeId);if(a.open){if(j.apply(c.callback.beforeCollapse,[c.treeId,a],!0)==!1)return!0}else if(j.apply(c.callback.beforeExpand,[c.treeId,a],!0)==!1)return!0;h.getRoot(c).expandTriggerFlag=!0;i.switchNode(c,a);return!0};H=function(b,a){var c=h.getSetting(b.data.treeId),
+d=c.view.autoCancelSelected&&b.ctrlKey&&h.isSelectedNode(c,a)?0:c.view.autoCancelSelected&&b.ctrlKey&&c.view.selectedMulti?2:1;if(j.apply(c.callback.beforeClick,[c.treeId,a,d],!0)==!1)return!0;d===0?i.cancelPreSelectedNode(c,a):i.selectNode(c,a,d===2);c.treeObj.trigger(e.event.CLICK,[b,c.treeId,a,d]);return!0};I=function(b,a){var c=h.getSetting(b.data.treeId);j.apply(c.callback.beforeMouseDown,[c.treeId,a],!0)&&j.apply(c.callback.onMouseDown,[b,c.treeId,a]);return!0};J=function(b,a){var c=h.getSetting(b.data.treeId);
+j.apply(c.callback.beforeMouseUp,[c.treeId,a],!0)&&j.apply(c.callback.onMouseUp,[b,c.treeId,a]);return!0};K=function(b,a){var c=h.getSetting(b.data.treeId);j.apply(c.callback.beforeDblClick,[c.treeId,a],!0)&&j.apply(c.callback.onDblClick,[b,c.treeId,a]);return!0};L=function(b,a){var c=h.getSetting(b.data.treeId);j.apply(c.callback.beforeRightClick,[c.treeId,a],!0)&&j.apply(c.callback.onRightClick,[b,c.treeId,a]);return typeof c.callback.onRightClick!="function"};var j={apply:function(b,a,c){return typeof b==
+"function"?b.apply(N,a?a:[]):c},canAsync:function(b,a){var c=b.data.key.children;return b.async.enable&&a&&a.isParent&&!(a.zAsync||a[c]&&a[c].length>0)},clone:function(b){if(b===null)return null;var a=j.isArray(b)?[]:{},c;for(c in b)a[c]=b[c]instanceof Date?new Date(b[c].getTime()):typeof b[c]==="object"?arguments.callee(b[c]):b[c];return a},eqs:function(b,a){return b.toLowerCase()===a.toLowerCase()},isArray:function(b){return Object.prototype.toString.apply(b)==="[object Array]"},$:function(b,a,
+c){a&&typeof a!="string"&&(c=a,a="");return typeof b=="string"?p(b,c?c.treeObj.get(0).ownerDocument:null):p("#"+b.tId+a,c?c.treeObj:null)},getMDom:function(b,a,c){if(!a)return null;for(;a&&a.id!==b.treeId;){for(var d=0,f=c.length;a.tagName&&d<f;d++)if(j.eqs(a.tagName,c[d].tagName)&&a.getAttribute(c[d].attrName)!==null)return a;a=a.parentNode}return null},getNodeMainDom:function(b){return p(b).parent("li").get(0)||p(b).parentsUntil("li").parent().get(0)},isChildOrSelf:function(b,a){return p(b).closest("#"+
+a).length>0},uCanDo:function(){return!0}},i={addNodes:function(b,a,c,d){if(!b.data.keep.leaf||!a||a.isParent)if(j.isArray(c)||(c=[c]),b.data.simpleData.enable&&(c=h.transformTozTreeFormat(b,c)),a){var f=k(a,e.id.SWITCH,b),g=k(a,e.id.ICON,b),l=k(a,e.id.UL,b);if(!a.open)i.replaceSwitchClass(a,f,e.folder.CLOSE),i.replaceIcoClass(a,g,e.folder.CLOSE),a.open=!1,l.css({display:"none"});h.addNodesData(b,a,c);i.createNodes(b,a.level+1,c,a);d||i.expandCollapseParentNode(b,a,!0)}else h.addNodesData(b,h.getRoot(b),
+c),i.createNodes(b,0,c,null)},appendNodes:function(b,a,c,d,f,g){if(!c)return[];for(var e=[],j=b.data.key.children,k=0,m=c.length;k<m;k++){var o=c[k];if(f){var t=(d?d:h.getRoot(b))[j].length==c.length&&k==0;h.initNode(b,a,o,d,t,k==c.length-1,g);h.addNodeCache(b,o)}t=[];o[j]&&o[j].length>0&&(t=i.appendNodes(b,a+1,o[j],o,f,g&&o.open));g&&(i.makeDOMNodeMainBefore(e,b,o),i.makeDOMNodeLine(e,b,o),h.getBeforeA(b,o,e),i.makeDOMNodeNameBefore(e,b,o),h.getInnerBeforeA(b,o,e),i.makeDOMNodeIcon(e,b,o),h.getInnerAfterA(b,
+o,e),i.makeDOMNodeNameAfter(e,b,o),h.getAfterA(b,o,e),o.isParent&&o.open&&i.makeUlHtml(b,o,e,t.join("")),i.makeDOMNodeMainAfter(e,b,o),h.addCreatedNode(b,o))}return e},appendParentULDom:function(b,a){var c=[],d=k(a,b);!d.get(0)&&a.parentTId&&(i.appendParentULDom(b,a.getParentNode()),d=k(a,b));var f=k(a,e.id.UL,b);f.get(0)&&f.remove();f=i.appendNodes(b,a.level+1,a[b.data.key.children],a,!1,!0);i.makeUlHtml(b,a,c,f.join(""));d.append(c.join(""))},asyncNode:function(b,a,c,d){var f,g;if(a&&!a.isParent)return j.apply(d),
+!1;else if(a&&a.isAjaxing)return!1;else if(j.apply(b.callback.beforeAsync,[b.treeId,a],!0)==!1)return j.apply(d),!1;if(a)a.isAjaxing=!0,k(a,e.id.ICON,b).attr({style:"","class":e.className.BUTTON+" "+e.className.ICO_LOADING});var l={};for(f=0,g=b.async.autoParam.length;a&&f<g;f++){var q=b.async.autoParam[f].split("="),n=q;q.length>1&&(n=q[1],q=q[0]);l[n]=a[q]}if(j.isArray(b.async.otherParam))for(f=0,g=b.async.otherParam.length;f<g;f+=2)l[b.async.otherParam[f]]=b.async.otherParam[f+1];else for(var m in b.async.otherParam)l[m]=
+b.async.otherParam[m];var o=h.getRoot(b)._ver;p.ajax({contentType:b.async.contentType,type:b.async.type,url:j.apply(b.async.url,[b.treeId,a],b.async.url),data:l,dataType:b.async.dataType,success:function(f){if(o==h.getRoot(b)._ver){var g=[];try{g=!f||f.length==0?[]:typeof f=="string"?eval("("+f+")"):f}catch(l){g=f}if(a)a.isAjaxing=null,a.zAsync=!0;i.setNodeLineIcos(b,a);g&&g!==""?(g=j.apply(b.async.dataFilter,[b.treeId,a,g],g),i.addNodes(b,a,g?j.clone(g):[],!!c)):i.addNodes(b,a,[],!!c);b.treeObj.trigger(e.event.ASYNC_SUCCESS,
+[b.treeId,a,f]);j.apply(d)}},error:function(c,d,f){if(o==h.getRoot(b)._ver){if(a)a.isAjaxing=null;i.setNodeLineIcos(b,a);b.treeObj.trigger(e.event.ASYNC_ERROR,[b.treeId,a,c,d,f])}}});return!0},cancelPreSelectedNode:function(b,a){for(var c=h.getRoot(b).curSelectedList,d=c.length-1;d>=0;d--)if(!a||a===c[d])if(k(c[d],e.id.A,b).removeClass(e.node.CURSELECTED),a){h.removeSelectedNode(b,a);break}if(!a)h.getRoot(b).curSelectedList=[]},createNodeCallback:function(b){if(b.callback.onNodeCreated||b.view.addDiyDom)for(var a=
+h.getRoot(b);a.createdNodes.length>0;){var c=a.createdNodes.shift();j.apply(b.view.addDiyDom,[b.treeId,c]);b.callback.onNodeCreated&&b.treeObj.trigger(e.event.NODECREATED,[b.treeId,c])}},createNodes:function(b,a,c,d){if(c&&c.length!=0){var f=h.getRoot(b),g=b.data.key.children,g=!d||d.open||!!k(d[g][0],b).get(0);f.createdNodes=[];a=i.appendNodes(b,a,c,d,!0,g);d?(d=k(d,e.id.UL,b),d.get(0)&&d.append(a.join(""))):b.treeObj.append(a.join(""));i.createNodeCallback(b)}},destroy:function(b){b&&(h.initCache(b),
+h.initRoot(b),m.unbindTree(b),m.unbindEvent(b),b.treeObj.empty())},expandCollapseNode:function(b,a,c,d,f){var g=h.getRoot(b),l=b.data.key.children;if(a){if(g.expandTriggerFlag){var q=f,f=function(){q&&q();a.open?b.treeObj.trigger(e.event.EXPAND,[b.treeId,a]):b.treeObj.trigger(e.event.COLLAPSE,[b.treeId,a])};g.expandTriggerFlag=!1}if(!a.open&&a.isParent&&(!k(a,e.id.UL,b).get(0)||a[l]&&a[l].length>0&&!k(a[l][0],b).get(0)))i.appendParentULDom(b,a),i.createNodeCallback(b);if(a.open==c)j.apply(f,[]);else{var c=
+k(a,e.id.UL,b),g=k(a,e.id.SWITCH,b),n=k(a,e.id.ICON,b);a.isParent?(a.open=!a.open,a.iconOpen&&a.iconClose&&n.attr("style",i.makeNodeIcoStyle(b,a)),a.open?(i.replaceSwitchClass(a,g,e.folder.OPEN),i.replaceIcoClass(a,n,e.folder.OPEN),d==!1||b.view.expandSpeed==""?(c.show(),j.apply(f,[])):a[l]&&a[l].length>0?c.slideDown(b.view.expandSpeed,f):(c.show(),j.apply(f,[]))):(i.replaceSwitchClass(a,g,e.folder.CLOSE),i.replaceIcoClass(a,n,e.folder.CLOSE),d==!1||b.view.expandSpeed==""||!(a[l]&&a[l].length>0)?
+(c.hide(),j.apply(f,[])):c.slideUp(b.view.expandSpeed,f))):j.apply(f,[])}}else j.apply(f,[])},expandCollapseParentNode:function(b,a,c,d,f){a&&(a.parentTId?(i.expandCollapseNode(b,a,c,d),a.parentTId&&i.expandCollapseParentNode(b,a.getParentNode(),c,d,f)):i.expandCollapseNode(b,a,c,d,f))},expandCollapseSonNode:function(b,a,c,d,f){var g=h.getRoot(b),e=b.data.key.children,g=a?a[e]:g[e],e=a?!1:d,j=h.getRoot(b).expandTriggerFlag;h.getRoot(b).expandTriggerFlag=!1;if(g)for(var k=0,m=g.length;k<m;k++)g[k]&&
+i.expandCollapseSonNode(b,g[k],c,e);h.getRoot(b).expandTriggerFlag=j;i.expandCollapseNode(b,a,c,d,f)},makeDOMNodeIcon:function(b,a,c){var d=h.getNodeName(a,c),d=a.view.nameIsHTML?d:d.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;");b.push("<span id='",c.tId,e.id.ICON,"' title='' treeNode",e.id.ICON," class='",i.makeNodeIcoClass(a,c),"' style='",i.makeNodeIcoStyle(a,c),"'></span><span id='",c.tId,e.id.SPAN,"'>",d,"</span>")},makeDOMNodeLine:function(b,a,c){b.push("<span id='",c.tId,
+e.id.SWITCH,"' title='' class='",i.makeNodeLineClass(a,c),"' treeNode",e.id.SWITCH,"></span>")},makeDOMNodeMainAfter:function(b){b.push("</li>")},makeDOMNodeMainBefore:function(b,a,c){b.push("<li id='",c.tId,"' class='",e.className.LEVEL,c.level,"' tabindex='0' hidefocus='true' treenode>")},makeDOMNodeNameAfter:function(b){b.push("</a>")},makeDOMNodeNameBefore:function(b,a,c){var d=h.getNodeTitle(a,c),f=i.makeNodeUrl(a,c),g=i.makeNodeFontCss(a,c),l=[],k;for(k in g)l.push(k,":",g[k],";");b.push("<a id='",
+c.tId,e.id.A,"' class='",e.className.LEVEL,c.level,"' treeNode",e.id.A,' onclick="',c.click||"",'" ',f!=null&&f.length>0?"href='"+f+"'":""," target='",i.makeNodeTarget(c),"' style='",l.join(""),"'");j.apply(a.view.showTitle,[a.treeId,c],a.view.showTitle)&&d&&b.push("title='",d.replace(/'/g,"&#39;").replace(/</g,"&lt;").replace(/>/g,"&gt;"),"'");b.push(">")},makeNodeFontCss:function(b,a){var c=j.apply(b.view.fontCss,[b.treeId,a],b.view.fontCss);return c&&typeof c!="function"?c:{}},makeNodeIcoClass:function(b,
+a){var c=["ico"];a.isAjaxing||(c[0]=(a.iconSkin?a.iconSkin+"_":"")+c[0],a.isParent?c.push(a.open?e.folder.OPEN:e.folder.CLOSE):c.push(e.folder.DOCU));return e.className.BUTTON+" "+c.join("_")},makeNodeIcoStyle:function(b,a){var c=[];if(!a.isAjaxing){var d=a.isParent&&a.iconOpen&&a.iconClose?a.open?a.iconOpen:a.iconClose:a.icon;d&&c.push("background:url(",d,") 0 0 no-repeat;");(b.view.showIcon==!1||!j.apply(b.view.showIcon,[b.treeId,a],!0))&&c.push("width:0px;height:0px;")}return c.join("")},makeNodeLineClass:function(b,
+a){var c=[];b.view.showLine?a.level==0&&a.isFirstNode&&a.isLastNode?c.push(e.line.ROOT):a.level==0&&a.isFirstNode?c.push(e.line.ROOTS):a.isLastNode?c.push(e.line.BOTTOM):c.push(e.line.CENTER):c.push(e.line.NOLINE);a.isParent?c.push(a.open?e.folder.OPEN:e.folder.CLOSE):c.push(e.folder.DOCU);return i.makeNodeLineClassEx(a)+c.join("_")},makeNodeLineClassEx:function(b){return e.className.BUTTON+" "+e.className.LEVEL+b.level+" "+e.className.SWITCH+" "},makeNodeTarget:function(b){return b.target||"_blank"},
+makeNodeUrl:function(b,a){var c=b.data.key.url;return a[c]?a[c]:null},makeUlHtml:function(b,a,c,d){c.push("<ul id='",a.tId,e.id.UL,"' class='",e.className.LEVEL,a.level," ",i.makeUlLineClass(b,a),"' style='display:",a.open?"block":"none","'>");c.push(d);c.push("</ul>")},makeUlLineClass:function(b,a){return b.view.showLine&&!a.isLastNode?e.line.LINE:""},removeChildNodes:function(b,a){if(a){var c=b.data.key.children,d=a[c];if(d){for(var f=0,g=d.length;f<g;f++)h.removeNodeCache(b,d[f]);h.removeSelectedNode(b);
+delete a[c];b.data.keep.parent?k(a,e.id.UL,b).empty():(a.isParent=!1,a.open=!1,c=k(a,e.id.SWITCH,b),d=k(a,e.id.ICON,b),i.replaceSwitchClass(a,c,e.folder.DOCU),i.replaceIcoClass(a,d,e.folder.DOCU),k(a,e.id.UL,b).remove())}}},setFirstNode:function(b,a){var c=b.data.key.children;if(a[c].length>0)a[c][0].isFirstNode=!0},setLastNode:function(b,a){var c=b.data.key.children,d=a[c].length;if(d>0)a[c][d-1].isLastNode=!0},removeNode:function(b,a){var c=h.getRoot(b),d=b.data.key.children,f=a.parentTId?a.getParentNode():
+c;a.isFirstNode=!1;a.isLastNode=!1;a.getPreNode=function(){return null};a.getNextNode=function(){return null};if(h.getNodeCache(b,a.tId)){k(a,b).remove();h.removeNodeCache(b,a);h.removeSelectedNode(b,a);for(var g=0,l=f[d].length;g<l;g++)if(f[d][g].tId==a.tId){f[d].splice(g,1);break}i.setFirstNode(b,f);i.setLastNode(b,f);var j,g=f[d].length;if(!b.data.keep.parent&&g==0)f.isParent=!1,f.open=!1,g=k(f,e.id.UL,b),l=k(f,e.id.SWITCH,b),j=k(f,e.id.ICON,b),i.replaceSwitchClass(f,l,e.folder.DOCU),i.replaceIcoClass(f,
+j,e.folder.DOCU),g.css("display","none");else if(b.view.showLine&&g>0){var n=f[d][g-1],g=k(n,e.id.UL,b),l=k(n,e.id.SWITCH,b);j=k(n,e.id.ICON,b);f==c?f[d].length==1?i.replaceSwitchClass(n,l,e.line.ROOT):(c=k(f[d][0],e.id.SWITCH,b),i.replaceSwitchClass(f[d][0],c,e.line.ROOTS),i.replaceSwitchClass(n,l,e.line.BOTTOM)):i.replaceSwitchClass(n,l,e.line.BOTTOM);g.removeClass(e.line.LINE)}}},replaceIcoClass:function(b,a,c){if(a&&!b.isAjaxing&&(b=a.attr("class"),b!=void 0)){b=b.split("_");switch(c){case e.folder.OPEN:case e.folder.CLOSE:case e.folder.DOCU:b[b.length-
+1]=c}a.attr("class",b.join("_"))}},replaceSwitchClass:function(b,a,c){if(a){var d=a.attr("class");if(d!=void 0){d=d.split("_");switch(c){case e.line.ROOT:case e.line.ROOTS:case e.line.CENTER:case e.line.BOTTOM:case e.line.NOLINE:d[0]=i.makeNodeLineClassEx(b)+c;break;case e.folder.OPEN:case e.folder.CLOSE:case e.folder.DOCU:d[1]=c}a.attr("class",d.join("_"));c!==e.folder.DOCU?a.removeAttr("disabled"):a.attr("disabled","disabled")}}},selectNode:function(b,a,c){c||i.cancelPreSelectedNode(b);k(a,e.id.A,
+b).addClass(e.node.CURSELECTED);h.addSelectedNode(b,a)},setNodeFontCss:function(b,a){var c=k(a,e.id.A,b),d=i.makeNodeFontCss(b,a);d&&c.css(d)},setNodeLineIcos:function(b,a){if(a){var c=k(a,e.id.SWITCH,b),d=k(a,e.id.UL,b),f=k(a,e.id.ICON,b),g=i.makeUlLineClass(b,a);g.length==0?d.removeClass(e.line.LINE):d.addClass(g);c.attr("class",i.makeNodeLineClass(b,a));a.isParent?c.removeAttr("disabled"):c.attr("disabled","disabled");f.removeAttr("style");f.attr("style",i.makeNodeIcoStyle(b,a));f.attr("class",
+i.makeNodeIcoClass(b,a))}},setNodeName:function(b,a){var c=h.getNodeTitle(b,a),d=k(a,e.id.SPAN,b);d.empty();b.view.nameIsHTML?d.html(h.getNodeName(b,a)):d.text(h.getNodeName(b,a));j.apply(b.view.showTitle,[b.treeId,a],b.view.showTitle)&&k(a,e.id.A,b).attr("title",!c?"":c)},setNodeTarget:function(b,a){k(a,e.id.A,b).attr("target",i.makeNodeTarget(a))},setNodeUrl:function(b,a){var c=k(a,e.id.A,b),d=i.makeNodeUrl(b,a);d==null||d.length==0?c.removeAttr("href"):c.attr("href",d)},switchNode:function(b,a){a.open||
+!j.canAsync(b,a)?i.expandCollapseNode(b,a,!a.open):b.async.enable?i.asyncNode(b,a)||i.expandCollapseNode(b,a,!a.open):a&&i.expandCollapseNode(b,a,!a.open)}};p.fn.zTree={consts:{className:{BUTTON:"button",LEVEL:"level",ICO_LOADING:"ico_loading",SWITCH:"switch"},event:{NODECREATED:"ztree_nodeCreated",CLICK:"ztree_click",EXPAND:"ztree_expand",COLLAPSE:"ztree_collapse",ASYNC_SUCCESS:"ztree_async_success",ASYNC_ERROR:"ztree_async_error"},id:{A:"_a",ICON:"_ico",SPAN:"_span",SWITCH:"_switch",UL:"_ul"},line:{ROOT:"root",
+ROOTS:"roots",CENTER:"center",BOTTOM:"bottom",NOLINE:"noline",LINE:"line"},folder:{OPEN:"open",CLOSE:"close",DOCU:"docu"},node:{CURSELECTED:"curSelectedNode"}},_z:{tools:j,view:i,event:m,data:h},getZTreeObj:function(b){return(b=h.getZTreeTools(b))?b:null},destroy:function(b){if(b&&b.length>0)i.destroy(h.getSetting(b));else for(var a in r)i.destroy(r[a])},init:function(b,a,c){var d=j.clone(M);p.extend(!0,d,a);d.treeId=b.attr("id");d.treeObj=b;d.treeObj.empty();r[d.treeId]=d;if(typeof document.body.style.maxHeight===
+"undefined")d.view.expandSpeed="";h.initRoot(d);b=h.getRoot(d);a=d.data.key.children;c=c?j.clone(j.isArray(c)?c:[c]):[];b[a]=d.data.simpleData.enable?h.transformTozTreeFormat(d,c):c;h.initCache(d);m.unbindTree(d);m.bindTree(d);m.unbindEvent(d);m.bindEvent(d);c={setting:d,addNodes:function(a,b,c){function e(){i.addNodes(d,a,h,c==!0)}if(!b)return null;a||(a=null);if(a&&!a.isParent&&d.data.keep.leaf)return null;var h=j.clone(j.isArray(b)?b:[b]);j.canAsync(d,a)?i.asyncNode(d,a,c,e):e();return h},cancelSelectedNode:function(a){i.cancelPreSelectedNode(d,
+a)},destroy:function(){i.destroy(d)},expandAll:function(a){a=!!a;i.expandCollapseSonNode(d,null,a,!0);return a},expandNode:function(a,b,c,e,n){if(!a||!a.isParent)return null;b!==!0&&b!==!1&&(b=!a.open);if((n=!!n)&&b&&j.apply(d.callback.beforeExpand,[d.treeId,a],!0)==!1)return null;else if(n&&!b&&j.apply(d.callback.beforeCollapse,[d.treeId,a],!0)==!1)return null;b&&a.parentTId&&i.expandCollapseParentNode(d,a.getParentNode(),b,!1);if(b===a.open&&!c)return null;h.getRoot(d).expandTriggerFlag=n;if(!j.canAsync(d,
+a)&&c)i.expandCollapseSonNode(d,a,b,!0,function(){if(e!==!1)try{k(a,d).focus().blur()}catch(b){}});else if(a.open=!b,i.switchNode(this.setting,a),e!==!1)try{k(a,d).focus().blur()}catch(m){}return b},getNodes:function(){return h.getNodes(d)},getNodeByParam:function(a,b,c){return!a?null:h.getNodeByParam(d,c?c[d.data.key.children]:h.getNodes(d),a,b)},getNodeByTId:function(a){return h.getNodeCache(d,a)},getNodesByParam:function(a,b,c){return!a?null:h.getNodesByParam(d,c?c[d.data.key.children]:h.getNodes(d),
+a,b)},getNodesByParamFuzzy:function(a,b,c){return!a?null:h.getNodesByParamFuzzy(d,c?c[d.data.key.children]:h.getNodes(d),a,b)},getNodesByFilter:function(a,b,c,e){b=!!b;return!a||typeof a!="function"?b?null:[]:h.getNodesByFilter(d,c?c[d.data.key.children]:h.getNodes(d),a,b,e)},getNodeIndex:function(a){if(!a)return null;for(var b=d.data.key.children,c=a.parentTId?a.getParentNode():h.getRoot(d),e=0,i=c[b].length;e<i;e++)if(c[b][e]==a)return e;return-1},getSelectedNodes:function(){for(var a=[],b=h.getRoot(d).curSelectedList,
+c=0,e=b.length;c<e;c++)a.push(b[c]);return a},isSelectedNode:function(a){return h.isSelectedNode(d,a)},reAsyncChildNodes:function(a,b,c){if(this.setting.async.enable){var j=!a;j&&(a=h.getRoot(d));if(b=="refresh"){for(var b=this.setting.data.key.children,m=0,p=a[b]?a[b].length:0;m<p;m++)h.removeNodeCache(d,a[b][m]);h.removeSelectedNode(d);a[b]=[];j?this.setting.treeObj.empty():k(a,e.id.UL,d).empty()}i.asyncNode(this.setting,j?null:a,!!c)}},refresh:function(){this.setting.treeObj.empty();var a=h.getRoot(d),
+b=a[d.data.key.children];h.initRoot(d);a[d.data.key.children]=b;h.initCache(d);i.createNodes(d,0,a[d.data.key.children])},removeChildNodes:function(a){if(!a)return null;var b=a[d.data.key.children];i.removeChildNodes(d,a);return b?b:null},removeNode:function(a,b){a&&(b=!!b,b&&j.apply(d.callback.beforeRemove,[d.treeId,a],!0)==!1||(i.removeNode(d,a),b&&this.setting.treeObj.trigger(e.event.REMOVE,[d.treeId,a])))},selectNode:function(a,b){if(a&&j.uCanDo(d)){b=d.view.selectedMulti&&b;if(a.parentTId)i.expandCollapseParentNode(d,
+a.getParentNode(),!0,!1,function(){try{k(a,d).focus().blur()}catch(b){}});else try{k(a,d).focus().blur()}catch(c){}i.selectNode(d,a,b)}},transformTozTreeNodes:function(a){return h.transformTozTreeFormat(d,a)},transformToArray:function(a){return h.transformToArrayFormat(d,a)},updateNode:function(a){a&&k(a,d).get(0)&&j.uCanDo(d)&&(i.setNodeName(d,a),i.setNodeTarget(d,a),i.setNodeUrl(d,a),i.setNodeLineIcos(d,a),i.setNodeFontCss(d,a))}};b.treeTools=c;h.setZTreeTools(d,c);b[a]&&b[a].length>0?i.createNodes(d,
+0,b[a]):d.async.enable&&d.async.url&&d.async.url!==""&&i.asyncNode(d);return c}};var N=p.fn.zTree,k=j.$,e=N.consts})(jQuery);
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/apiCss/zTreeStyleForApi.css b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/apiCss/zTreeStyleForApi.css
new file mode 100644
index 0000000..bb4717b
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/apiCss/zTreeStyleForApi.css
@@ -0,0 +1,49 @@
+/*-------------------------------------
+zTree Style
+
+version:	3.0
+author:		Hunter.z
+email:		hunter.z@263.net
+website:	http://code.google.com/p/jquerytree/
+
+-------------------------------------*/
+
+.ztree * {padding:0; margin:0; font-size:12px; font-family: Verdana, Arial, Helvetica, AppleGothic, sans-serif}
+.ztree {margin:0; padding:5px; color:#333}
+.ztree li{padding:0; margin:0; list-style:none; line-height:14px; text-align:left; white-space:nowrap}
+.ztree li ul{ margin:0; padding:0 0 0 18px}
+.ztree li ul.line{ background:url(./img/line_conn.gif) 0 0 repeat-y;}
+
+.ztree li a {padding:1px 3px 0 0; margin:0; cursor:pointer; color:#333; height:17px; text-decoration:none; vertical-align:top; display: inline-block}
+.ztree li a:hover {text-decoration:none}
+.ztree li a.curSelectedNode {padding-top:0px; background-color:#FFE6B0; color:black; height:16px; border:1px #FFB951 solid;}
+.ztree li a.curSelectedNode_Edit {padding-top:0px; background-color:#FFE6B0; color:black; height:16px; border:1px #FFB951 solid; opacity:0.8; filter:alpha(opacity=80)}
+.ztree li a.tmpTargetNode_inner {padding-top:0px; background-color:#316AC5; color:white; height:16px; border:1px #316AC5 solid; opacity:0.8; filter:alpha(opacity=80)}
+.ztree li a.tmpTargetNode_prev {}
+.ztree li a.tmpTargetNode_next {}
+.ztree li a input.rename {height:14px; width:80px; padding:0; margin:0;
+	font-size:12px; border:1px #7EC4CC solid; *border:0px}
+.ztree li span {line-height:16px; margin-right: 2px}
+.ztree li span.button {line-height:0; margin:0;width:16px; height:16px; display: inline-block; vertical-align:middle;
+	border:0 none; cursor: pointer;
+	background-color:transparent; background-repeat:no-repeat; background-attachment: scroll;
+	background-image:url("./img/zTreeStandard.png"); *background-image:url("./img/zTreeStandard.gif")}
+
+.ztree li span.button.switch {width:1px; height:18px; visibility: hidden}
+
+.zTreeDragUL {margin:0; padding:0; position:absolute; background-color:#cfcfcf; border:1px #00B83F dotted; opacity:0.8; filter:alpha(opacity=80)}
+.zTreeMask {z-index:10000; background-color:#cfcfcf; opacity:0.0; filter:alpha(opacity=0); position:absolute}
+
+/* level 等级样式*/
+/*.ztree li button.level0 {
+	display:none;
+}
+.ztree li ul.level0 {
+	padding:0;
+	background:none;
+}*/
+
+.ztree li span.button.core_ico_docu{margin-right:2px; background-position:-126px 0; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.check_ico_docu{margin-right:2px; background-position:-126px -16px; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.edit_ico_docu{margin-right:2px; background-position:-126px -32px; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.hide_ico_docu{margin-right:2px; background-position:-160px 0; vertical-align:top; *vertical-align:middle}
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/fn.zTree._z.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/fn.zTree._z.html
new file mode 100644
index 0000000..7af3e40
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/fn.zTree._z.html
@@ -0,0 +1,13 @@
+<div class="apiDetail">
+<div>
+	<h2><span>JSON</span><span class="path">$.fn.zTree.</span>_z</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>zTree v3.x 内部的全部方法都可以通过 $.fn.zTree._z 进行调用，开放出来是为了更便于大家开发制作自己的 zTree 插件。 </p>
+			<p class="highlight_red">如无特殊需求请勿使用此对象，以及修改此对象内部的各个函数。</p>
+		</div>
+	</div>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/fn.zTree.destroy.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/fn.zTree.destroy.html
new file mode 100644
index 0000000..7105807
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/fn.zTree.destroy.html
@@ -0,0 +1,28 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId)</span><span class="path">$.fn.zTree.</span>destroy</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>从 zTree v3.4 开始提供销毁 zTree 的方法。 </p>
+			<p>1、用此方法可以销毁指定 treeId 的 zTree，也可以销毁当前页面全部的 zTree。</p>
+			<p class="highlight_red">2、销毁指定 treeId 的 zTree 也可以使用 zTreeObj.destroy() 方法。</p>
+			<p class="highlight_red">3、重新使用已经被销毁的树，必须要使用 init 方法进行初始化。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree 的 DOM 容器的 id</p>
+	<p class="highlight_red">省略 treeId，表示销毁当前页面全部的 zTree</p>
+	<h4 class="topLine"><b>返回值</b><span>无</span></h4>
+	<p>目前无任何返回值</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 销毁 id 为 "treeDemo" 的 zTree</h4>
+	<pre xmlns=""><code>$.fn.zTree.destroy("treeDemo");</code></pre>
+	<h4>2. 销毁全部 的 zTree</h4>
+	<pre xmlns=""><code>$.fn.zTree.destroy();</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/fn.zTree.getZTreeObj.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/fn.zTree.getZTreeObj.html
new file mode 100644
index 0000000..b1d1db4
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/fn.zTree.getZTreeObj.html
@@ -0,0 +1,24 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId)</span><span class="path">$.fn.zTree.</span>getZTreeObj</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>zTree v3.x 专门提供的根据 treeId 获取 zTree 对象的方法。 </p>
+			<p class="highlight_red">必须在初始化 zTree 以后才可以使用此方法。</p>
+			<p>有了这个方法，用户不再需要自己设定全局变量来保存 zTree 初始化后得到的对象了，而且在所有回调函数中全都会返回 treeId 属性，用户可以随时使用此方法获取需要进行操作的 zTree 对象</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree 的 DOM 容器的 id</p>
+	<h4 class="topLine"><b>返回值</b><span>JSON</span></h4>
+	<p>zTree 对象，提供操作 zTree 的各种方法，对于通过 js 操作 zTree 来说必须通过此对象</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 获取 id 为 tree 的 zTree 对象</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/fn.zTree.init.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/fn.zTree.init.html
new file mode 100644
index 0000000..8db6d2c
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/fn.zTree.init.html
@@ -0,0 +1,74 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(obj, zSetting, zNodes)</span><span class="path">$.fn.zTree.</span>init</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>zTree 初始化方法，创建 zTree 必须使用此方法</p>
+			<p>1、页面需要进行 W3C 申明，例如：&lt;!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"&nbsp;&nbsp; &nbsp;"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"&gt;。</p>
+			<p>2、需要首先加载 jquery-1.4.2.js 或其他更高版本的 jQuery 。</p>
+			<p>3、需要加载 jquery-ztree.core-3.0.js，如果需要用到 编辑功能 或 checkbox / radio 还需要分别加载 jquery-ztree.exedit-3.0.js 和 jquery-ztree.excheck-3.0.js 。</p>
+			<p>4、需要加载 zTreeStyle.css 以及 zTreeStyle 目录下的 img 文件。</p>
+			<p>5、如果需要使用自定义图标请参考相应的Demo。</p>
+			<p>6、请注意设置 zTree 的容器样式 class="ztree"，其中 "ztree" 这个 className，可以根据需要随意修改，别忘了修改 css 中对应名字就是了，对于容器如果需要增加其他特殊样式，可根据自己的需要进行修改。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>obj</b><span>jQuery Object</span></h4>
+	<p>用于展现 zTree 的 DOM 容器</p>
+	<h4 class="topLine"><b>zSetting</b><span>JSON</span></h4>
+	<p>zTree 的配置数据，具体请参考 “setting 配置详解”中的各个属性详细说明</p>
+	<h4 class="topLine"><b>zNodes</b><span>Array(JSON) / JSON</span></h4>
+	<p>zTree 的节点数据，具体请参考 “treeNode 节点数据详解”中的各个属性详细说明</p>
+	<p class="highlight_red">1、v3.x 支持单独添加一个节点，即如果只新增一个节点，不用必须包在数组中</p>
+	<p class="highlight_red">2、如果需要异步加载根节点，可以设置为 null 或 [ ]</p>
+	<p class="highlight_red">3、使用简单数据模式，请参考 setting.data.simpleData 内的属性说明</p>
+	<h4 class="topLine"><b>返回值</b><span>JSON</span></h4>
+	<p>zTree 对象，提供操作 zTree 的各种方法，对于通过 js 操作 zTree 来说必须通过此对象</p>
+	<p class="highlight_red">如果不需要自行设定全局变量保存，可以利用 $.fn.zTree.getZTreeObj 方法随时获取</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 简单创建 zTree 演示</h4>
+	<pre xmlns=""><code>&lt;!DOCTYPE html&gt;
+&lt;HTML&gt;
+ &lt;HEAD&gt;
+  &lt;TITLE&gt; ZTREE DEMO &lt;/TITLE&gt;
+  &lt;meta http-equiv="content-type" content="text/html; charset=UTF-8"&gt;
+  &lt;link rel="stylesheet" href="zTreeStyle/zTreeStyle.css" type="text/css"&gt;
+  &lt;script type="text/javascript" src="jquery-1.4.2.js"&gt;&lt;/script&gt;
+  &lt;script type="text/javascript" src="jquery.ztree.core-3.5.js"&gt;&lt;/script&gt;
+&lt;!--
+  &lt;script type="text/javascript" src="jquery.ztree.excheck-3.5.js"&gt;&lt;/script&gt;
+  &lt;script type="text/javascript" src="jquery.ztree.exedit-3.5.js"&gt;&lt;/script&gt;
+--&gt;
+  &lt;SCRIPT type="text/javascript" &gt;
+	var zTreeObj,
+	setting = {
+		view: {
+			selectedMulti: false
+		}
+	},
+	zTreeNodes = [
+		{"name":"网站导航", open:true, children: [
+			{ "name":"google", "url":"http://g.cn", "target":"_blank"},
+			{ "name":"baidu", "url":"http://baidu.com", "target":"_blank"},
+			{ "name":"sina", "url":"http://www.sina.com.cn", "target":"_blank"}
+			]
+		}
+	];
+
+	$(document).ready(function(){
+		zTreeObj = $.fn.zTree.init($("#tree"), setting, zTreeNodes);
+
+	});
+  &lt;/SCRIPT&gt;
+ &lt;/HEAD&gt;
+
+&lt;BODY&gt;
+&lt;ul id="tree" class="ztree" style="width:230px; overflow:auto;"&gt;&lt;/ul&gt;
+ &lt;/BODY&gt;
+&lt;/HTML&gt;</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.async.autoParam.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.async.autoParam.html
new file mode 100644
index 0000000..cf0f4d2
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.async.autoParam.html
@@ -0,0 +1,39 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Array(String)</span><span class="path">setting.async.</span>autoParam</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>异步加载时需要自动提交父节点属性的参数。<span class="highlight_red">[setting.async.enable = true 时生效]</span></p>
+			<p>默认值：[ ]</p>
+		</div>
+	</div>
+	<h3>Array(String) 格式说明</h3>
+	<div class="desc">
+	<p>1、将需要作为参数提交的属性名称，制作成 Array 即可，例如：["id", "name"]</p>
+	<p>2、可以设置提交时的参数名称，例如 server 只接受 zId : ["id=zId"]</p>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 设置 id 属性为自动提交的参数</h4>
+	<pre xmlns=""><code>var setting = {
+	async: {
+		enable: true,
+		url: "http://host/getNode.php",
+		autoParam: ["id"]
+	}
+};
+假设 异步加载 父节点(node = {id:1, name:"test"}) 的子节点时，将提交参数 id=1
+......</code></pre>
+	<h4>2. 设置 id 属性作为 zId 成为自动提交的参数</h4>
+	<pre xmlns=""><code>var setting = {
+	async: {
+		enable: true,
+		url: "http://host/getNode.php",
+		autoParam: ["id=zId"]
+	}
+};
+假设 对父节点 node = {id:1, name:"test"}，进行异步加载时，将提交参数 zId=1
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.async.contentType.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.async.contentType.html
new file mode 100644
index 0000000..db0c92f
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.async.contentType.html
@@ -0,0 +1,29 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">setting.async.</span>contentType</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Ajax 提交参数的数据类型。<span class="highlight_red">[setting.async.enable = true 时生效]</span></p>
+			<p>默认值："application/x-www-form-urlencoded"</p>
+		</div>
+	</div>
+	<h3>String 格式说明</h3>
+	<div class="desc">
+	<p> contentType = "application/x-www-form-urlencoded" 可以满足绝大部分请求，按照标准的 Form 格式提交参数</p>
+	<p> contentType = "application/json" 可以满足 .Net 的编程需要，按照 JSON 格式提交参数</p>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 设置 Ajax 提交参数的数据类型为 JSON 格式</h4>
+	<pre xmlns=""><code>var setting = {
+	async: {
+		enable: true,
+		contentType: "application/json",
+		url: "http://host/getNode.php",
+		autoParam: ["id", "name"]
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.async.dataFilter.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.async.dataFilter.html
new file mode 100644
index 0000000..f174bf0
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.async.dataFilter.html
@@ -0,0 +1,45 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, parentNode, responseData)</span><span class="path">setting.async.</span>dataFilter</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于对 Ajax 返回数据进行预处理的函数。<span class="highlight_red">[setting.async.enable = true 时生效]</span></p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>parentNode</b><span>JSON</span></h4>
+	<p>进行异步加载的父节点 JSON 数据对象</p>
+	<p class="highlight_red">对根进行异步加载时，parentNode = null</p>
+	<h4 class="topLine"><b>responseData</b><span>Array(JSON) / JSON / String</span></h4>
+	<p>异步加载获取到的数据转换后的 Array(JSON) / JSON / String 数据对象</p>
+	<p class="highlight_red">v3.4开始 支持 XML 数据格式的 String</p>
+	<h4 class="topLine"><b>返回值</b><span>Array(JSON) / JSON</span></h4>
+	<p>返回值是 zTree 支持的JSON 数据结构即可。</p>
+	<p class="highlight_red">v3.x 支持单个 JSON 节点数据进行加载</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 修改异步获取到的节点name属性</h4>
+	<pre xmlns=""><code>function ajaxDataFilter(treeId, parentNode, responseData) {
+    if (responseData) {
+      for(var i =0; i < responseData.length; i++) {
+        responseData[i].name += "_filter";
+      }
+    }
+    return responseData;
+};
+var setting = {
+	async: {
+		enable: true,
+		url: "http://host/getNode.php",
+		dataFilter: ajaxDataFilter
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.async.dataType.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.async.dataType.html
new file mode 100644
index 0000000..6d639b7
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.async.dataType.html
@@ -0,0 +1,29 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">setting.async.</span>dataType</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Ajax 获取的数据类型。<span class="highlight_red">[setting.async.enable = true 时生效]</span></p>
+			<p>默认值："text"</p>
+		</div>
+	</div>
+	<h3>String 格式说明</h3>
+	<div class="desc">
+	<p> dataType = "text" 可以满足绝大部分请求</p>
+	<p class="highlight_red">其余 dataType 类型请参考 jQuery ajax 中的 dataType 参数</p>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 设置 Ajax 获取的数据类型为 纯文本</h4>
+	<pre xmlns=""><code>var setting = {
+	async: {
+		enable: true,
+		dataType: "text",
+		url: "http://host/getNode.php",
+		autoParam: ["id", "name"]
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.async.enable.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.async.enable.html
new file mode 100644
index 0000000..9079ae1
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.async.enable.html
@@ -0,0 +1,30 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.async.</span>enable</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>设置 zTree 是否开启异步加载模式</p>
+			<p>默认值：false</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p> true 表示 开启 异步加载模式</p>
+	<p> false 表示 关闭 异步加载模式</p>
+	<p class="highlight_red">如果设置为 true，请务必设置 setting.async 内的其它参数。</p>
+	<p class="highlight_red">如果需要根节点也异步加载，初始化时 treeNodes 参数设置为 null 即可。</p>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 需要开启异步加载模式</h4>
+	<pre xmlns=""><code>var setting = {
+	async: {
+		enable: true,
+		url: "http://host/getNode.php",
+		autoParam: ["id", "name"]
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.async.otherParam.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.async.otherParam.html
new file mode 100644
index 0000000..981715f
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.async.otherParam.html
@@ -0,0 +1,40 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Array(String) / JSON</span><span class="path">setting.async.</span>otherParam</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Ajax 请求提交的静态参数键值对。<span class="highlight_red">[setting.async.enable = true 时生效]</span></p>
+			<p>默认值：[ ]</p>
+		</div>
+	</div>
+	<h3>Array(String) 格式说明</h3>
+	<div class="desc">
+	<p>可以为空[ ]，如果有 key，则必须存在 value。 例如：[key, value]</p>
+	</div>
+	<h3>JSON 格式说明</h3>
+	<div class="desc">
+	<p>直接用 JSON 格式制作键值对，例如：{ key1:value1, key2:value2 }</p>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 设置 Array(String) 格式的参数</h4>
+	<pre xmlns=""><code>var setting = {
+	async: {
+		enable: true,
+		url: "http://host/getNode.php",
+		otherParam: ["id", "1", "name", "test"]
+	}
+};
+进行异步加载时，将提交参数 id=1&name=test</code></pre>
+	<h4>2. 设置 JSON 格式的参数</h4>
+	<pre xmlns=""><code>var setting = {
+	async: {
+		enable: true,
+		url: "http://host/getNode.php",
+		otherParam: { "id":"1", "name":"test"}
+	}
+};
+进行异步加载时，将提交参数 id=1&name=test</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.async.type.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.async.type.html
new file mode 100644
index 0000000..20d9a6b
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.async.type.html
@@ -0,0 +1,30 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">setting.async.</span>type</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Ajax 的 http 请求模式。<span class="highlight_red">[setting.async.enable = true 时生效]</span></p>
+			<p>默认值："post"</p>
+		</div>
+	</div>
+	<h3>String 格式说明</h3>
+	<div class="desc">
+	<p> type = "post" 表示异步加载采用 post 方法请求</p>
+	<p> type = "get" 表示异步加载采用 get 方法请求</p>
+	<p class="highlight_red">对应于 jQuery ajax 中的 type 参数</p>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 设置使用 get 方式请求数据</h4>
+	<pre xmlns=""><code>var setting = {
+	async: {
+		enable: true,
+		type: "get",
+		url: "http://host/getNode.php",
+		autoParam: ["id", "name"]
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.async.url.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.async.url.html
new file mode 100644
index 0000000..a5209af
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.async.url.html
@@ -0,0 +1,50 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String / Function(treeId, treeNode)</span><span class="path">setting.async.</span>url</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Ajax 获取数据的 URL 地址。<span class="highlight_red">[setting.async.enable = true 时生效]</span></p>
+			<p>默认值：""</p>
+		</div>
+	</div>
+	<h3>String 格式说明</h3>
+	<div class="desc">
+	<p>设置固定的异步加载 url 字符串，请注意地址的路径，确保页面能正常加载</p>
+	<p class="highlight_red">url 内也可以带参数，这些参数就只能是通过 get 方式提交了，并且请注意进行转码</p>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>需要异步加载子节点的的父节点 JSON 数据对象</p>
+	<p class="highlight_red">针对根进行异步加载时，treeNode = null</p>
+	<h4 class="topLine"><b>返回值</b><span>String</span></h4>
+	<p>返回值同 String 格式的数据</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 设置异步获取节点的 URL 为 nodes.php</h4>
+	<pre xmlns=""><code>var setting = {
+	async: {
+		enable: true,
+		url: "nodes.php",
+		autoParam: ["id", "name"]
+	}
+};
+......</code></pre>
+	<h4>2. 设置异步获取节点的 URL 为 function 动态获取</h4>
+	<pre xmlns=""><code>function getAsyncUrl(treeId, treeNode) {
+    return treeNode.isParent ? "nodes1.php" : "nodes2.php";
+};
+var setting = {
+	async: {
+		enable: true,
+		url: getAsyncUrl,
+		autoParam: ["id", "name"]
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.beforeAsync.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.beforeAsync.html
new file mode 100644
index 0000000..70ba0fc
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.beforeAsync.html
@@ -0,0 +1,35 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNode)</span><span class="path">setting.callback.</span>beforeAsync</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于捕获异步加载之前的事件回调函数，zTree 根据返回值确定是否允许进行异步加载</p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>进行异步加载的父节点 JSON 数据对象</p>
+	<p class="highlight_red">针对根进行异步加载时，treeNode = null</p>
+	<h4 class="topLine"><b>返回值</b><span>Boolean</span></h4>
+	<p>返回值是 true / false</p>
+	<p class="highlight_red">如果返回 false，zTree 将不进行异步加载，也无法触发 onAsyncSuccess / onAsyncError 事件回调函数</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 禁止 id 为 1 的父节点进行异步加载操作</h4>
+	<pre xmlns=""><code>function zTreeBeforeAsync(treeId, treeNode) {
+    return (treeNode.id !== 1);
+};
+var setting = {
+	callback: {
+		beforeAsync: zTreeBeforeAsync
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.beforeCheck.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.beforeCheck.html
new file mode 100644
index 0000000..a0e1f42
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.beforeCheck.html
@@ -0,0 +1,34 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNode)</span><span class="path">setting.callback.</span>beforeCheck</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.excheck</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于捕获 勾选 或 取消勾选 之前的事件回调函数，并且根据返回值确定是否允许 勾选 或 取消勾选 </p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>进行 勾选 或 取消勾选 的节点 JSON 数据对象</p>
+	<h4 class="topLine"><b>返回值</b><span>Boolean</span></h4>
+	<p>返回值是 true / false</p>
+	<p class="highlight_red">如果返回 false，将不会改变勾选状态，并且无法触发 onCheck 事件回调函数</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 禁止所有勾选操作，保持初始化的勾选状态</h4>
+	<pre xmlns=""><code>function zTreeBeforeCheck(treeId, treeNode) {
+    return false;
+};
+var setting = {
+	callback: {
+		beforeCheck: zTreeBeforeCheck
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.beforeClick.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.beforeClick.html
new file mode 100644
index 0000000..6d6e748
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.beforeClick.html
@@ -0,0 +1,49 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNode, clickFlag)</span><span class="path">setting.callback.</span>beforeClick</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于捕获单击节点之前的事件回调函数，并且根据返回值确定是否允许单击操作</p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>被单击的节点 JSON 数据对象</p>
+	<h4 class="topLine"><b>clickFlag</b><span>Number</span></h4>
+	<p>节点被点击后的选中操作类型，详细看下表</p>
+	<table width="100%" border="0" cellspacing="1" cellpadding="0">
+		<thead><tr><td>clickFlag</td><td title="是否允许多点选中">selectedMulti</td><td title="是否按下 Ctrl 键">autoCancelSelected<br/>&&<br/>event.ctrlKey</td><td title="节点当前选择状态">isSelected</td><td>选中操作</td></tr></thead>
+		<tbody>
+			<tr><td>1</td><td>true</td><td>false</td><td>false</td><td>普通选中</td></tr>
+			<tr><td>1</td><td>true</td><td>false</td><td>true</td><td>普通选中</td></tr>
+			<tr><td>2</td><td>true</td><td>true</td><td>false</td><td>追加选中</td></tr>
+			<tr><td>0</td><td>true</td><td>true</td><td>true</td><td>取消选中</td></tr>
+			<tr><td>1</td><td>false</td><td>false</td><td>false</td><td>普通选中</td></tr>
+			<tr><td>1</td><td>false</td><td>false</td><td>true</td><td>普通选中</td></tr>
+			<tr><td>1</td><td>false</td><td>true</td><td>false</td><td>普通选中</td></tr>
+			<tr><td>0</td><td>false</td><td>true</td><td>true</td><td>取消选中</td></tr>
+		</tbody>
+	</table>
+	<h4 class="topLine"><b>返回值</b><span>Boolean</span></h4>
+	<p>返回值是 true / false</p>
+	<p class="highlight_red">如果返回 false，zTree 将不会选中节点，也无法触发 onClick 事件回调函数</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 禁止节点被选中</h4>
+	<pre xmlns=""><code>function zTreeBeforeClick(treeId, treeNode, clickFlag) {
+    return (treeNode.id !== 1);
+};
+var setting = {
+	callback: {
+		beforeClick: zTreeBeforeClick
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.beforeCollapse.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.beforeCollapse.html
new file mode 100644
index 0000000..d778e9c
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.beforeCollapse.html
@@ -0,0 +1,34 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNode)</span><span class="path">setting.callback.</span>beforeCollapse</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于捕获父节点折叠之前的事件回调函数，并且根据返回值确定是否允许折叠操作</p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>要折叠的父节点 JSON 数据对象</p>
+	<h4 class="topLine"><b>返回值</b><span>Boolean</span></h4>
+	<p>返回值是 true / false</p>
+	<p class="highlight_red">如果返回 false，zTree 将不会折叠节点，也无法触发 onCollapse 事件回调函数</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 禁止所有已展开的父节点折叠</h4>
+	<pre xmlns=""><code>function zTreeBeforeCollapse(treeId, treeNode) {
+    return false;
+};
+var setting = {
+	callback: {
+		beforeCollapse: zTreeBeforeCollapse
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.beforeDblClick.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.beforeDblClick.html
new file mode 100644
index 0000000..ed7e4dc
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.beforeDblClick.html
@@ -0,0 +1,36 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNode)</span><span class="path">setting.callback.</span>beforeDblClick</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于捕获 zTree 上鼠标双击之前的事件回调函数，并且根据返回值确定触发 onDblClick 事件回调函数</p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>鼠标双击时所在节点的 JSON 数据对象</p>
+	<p class="highlight_red">如果不在节点上，则返回 null</p>
+	<h4 class="topLine"><b>返回值</b><span>Boolean</span></h4>
+	<p>返回值是 true / false</p>
+	<p class="highlight_red">如果返回 false，将仅仅无法触发 onDblClick 事件回调函数，对其他操作无任何影响</p>
+	<p class="highlight_red">此事件回调函数对双击节点展开功能无任何影响，如果需要设置请参考 setting.view.dblClickExpand 属性</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 禁止 onDblClick 事件</h4>
+	<pre xmlns=""><code>function zTreeBeforeDblClick(treeId, treeNode) {
+    return false;
+};
+var setting = {
+	callback: {
+		beforeDblClick: zTreeBeforeDblClick
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.beforeDrag.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.beforeDrag.html
new file mode 100644
index 0000000..1e783a3
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.beforeDrag.html
@@ -0,0 +1,39 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNodes)</span><span class="path">setting.callback.</span>beforeDrag</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于捕获节点被拖拽之前的事件回调函数，并且根据返回值确定是否允许开启拖拽操作</p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>被拖拽的节点 treeNodes 所在 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNodes</b><span>Array(JSON)</span></h4>
+	<p>要被拖拽的节点 JSON 数据集合</p>
+	<p class="highlight_red">v3.x 允许多个同级节点同时被拖拽，因此将此参数修改为 Array(JSON)</p>
+	<p class="highlight_red">如果拖拽时多个被选择的节点不是同级关系，则只能拖拽鼠标当前所在位置的节点</p>
+	<h4 class="topLine"><b>返回值</b><span>Boolean</span></h4>
+	<p>返回值是 true / false</p>
+	<p class="highlight_red">如果返回 false，zTree 将终止拖拽，也无法触发 onDrag / beforeDrop / onDrop 事件回调函数</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 禁止全部拖拽操作</h4>
+	<pre xmlns=""><code>function zTreeBeforeDrag(treeId, treeNodes) {
+    return false;
+};
+var setting = {
+	edit: {
+		enable: true
+	},
+	callback: {
+		beforeDrag: zTreeBeforeDrag
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.beforeDragOpen.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.beforeDragOpen.html
new file mode 100644
index 0000000..ceab2d3
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.beforeDragOpen.html
@@ -0,0 +1,37 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNode)</span><span class="path">setting.callback.</span>beforeDragOpen</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于捕获拖拽节点移动到折叠状态的父节点后，即将自动展开该父节点之前的事件回调函数，并且根据返回值确定是否允许自动展开操作</p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>需要被展开的父节点 treeNode 所在 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>要被自动展开的父节点 JSON 数据对象</p>
+	<h4 class="topLine"><b>返回值</b><span>Boolean</span></h4>
+	<p>返回值是 true / false</p>
+	<p class="highlight_red">如果返回 false，zTree 将无法进行自动展开操作</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 禁止全部拖拽时的自动展开操作</h4>
+	<pre xmlns=""><code>function zTreeBeforeDragOpen(treeId, treeNode) {
+    return false;
+};
+var setting = {
+	edit: {
+		enable: true
+	},
+	callback: {
+		beforeDragOpen: zTreeBeforeDragOpen
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.beforeDrop.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.beforeDrop.html
new file mode 100644
index 0000000..4123743
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.beforeDrop.html
@@ -0,0 +1,48 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNodes, targetNode, moveType, isCopy)</span><span class="path">setting.callback.</span>beforeDrop</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于捕获节点拖拽操作结束之前的事件回调函数，并且根据返回值确定是否允许此拖拽操作</p>
+			<p>默认值：null</p>
+			<p class="highlight_red">如未拖拽到有效位置，则不触发此回调函数，直接将节点恢复原位置</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>目标节点 targetNode 所在 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNodes</b><span>Array(JSON)</span></h4>
+	<p>被拖拽的节点 JSON 数据集合</p>
+	<p class="highlight_red">无论拖拽操作为 复制 还是 移动，treeNodes 都是当前被拖拽节点的数据集合。</p>
+	<h4 class="topLine"><b>targetNode</b><span>JSON</span></h4>
+	<p>treeNodes 被拖拽放开的目标节点 JSON 数据对象。</p>
+	<p class="highlight_red">如果拖拽成为根节点，则 targetNode = null</p>
+	<h4 class="topLine"><b>moveType</b><span>String</span></h4>
+	<p>指定移动到目标节点的相对位置</p>
+	<p class="highlight_red">"inner"：成为子节点，"prev"：成为同级前一个节点，"next"：成为同级后一个节点</p>
+	<h4 class="topLine"><b>isCopy</b><span>Boolean</span></h4>
+	<p>拖拽节点操作是 复制 或 移动</p>
+	<p class="highlight_red">true：复制；false：移动</p>
+	<h4 class="topLine"><b>返回值</b><span>Boolean</span></h4>
+	<p>返回值是 true / false</p>
+	<p class="highlight_red">如果返回 false，zTree 将恢复被拖拽的节点，也无法触发 onDrop 事件回调函数</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 禁止将节点拖拽成为根节点</h4>
+	<pre xmlns=""><code>function zTreeBeforeDrop(treeId, treeNodes, targetNode, moveType) {
+    return !(targetNode == null || (moveType != "inner" && !targetNode.parentTId));
+};
+var setting = {
+	edit: {
+		enable: true
+	},
+	callback: {
+		beforeDrop: zTreeBeforeDrop
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.beforeEditName.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.beforeEditName.html
new file mode 100644
index 0000000..9df3ca2
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.beforeEditName.html
@@ -0,0 +1,38 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNode)</span><span class="path">setting.callback.</span>beforeEditName</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于捕获节点编辑按钮的 click 事件，并且根据返回值确定是否允许进入名称编辑状态</p>
+			<p class="highlight_red">此事件回调函数最主要是用于捕获编辑按钮的点击事件，然后触发自定义的编辑界面操作。</p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>将要进入编辑名称状态的节点 JSON 数据对象</p>
+	<h4 class="topLine"><b>返回值</b><span>Boolean</span></h4>
+	<p>返回值是 true / false</p>
+	<p class="highlight_red">如果返回 false，节点将无法进入 zTree 默认的编辑名称状态</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 禁止修改父节点的名称</h4>
+	<pre xmlns=""><code>function zTreeBeforeEditName(treeId, treeNode) {
+	return !treeNode.isParent;
+}
+var setting = {
+	edit: {
+		enable: true
+	},
+	callback: {
+		beforeEditName: zTreeBeforeEditName
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.beforeExpand.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.beforeExpand.html
new file mode 100644
index 0000000..350972b
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.beforeExpand.html
@@ -0,0 +1,34 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNode)</span><span class="path">setting.callback.</span>beforeExpand</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于捕获父节点展开之前的事件回调函数，并且根据返回值确定是否允许展开操作</p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>要展开的父节点 JSON 数据对象</p>
+	<h4 class="topLine"><b>返回值</b><span>Boolean</span></h4>
+	<p>返回值是 true / false</p>
+	<p class="highlight_red">如果返回 false，zTree 将不会展开节点，也无法触发 onExpand 事件回调函数</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 禁止所有已折叠的父节点展开</h4>
+	<pre xmlns=""><code>function zTreeBeforeExpand(treeId, treeNode) {
+    return false;
+};
+var setting = {
+	callback: {
+		beforeExpand: zTreeBeforeExpand
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.beforeMouseDown.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.beforeMouseDown.html
new file mode 100644
index 0000000..2c3f28d
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.beforeMouseDown.html
@@ -0,0 +1,35 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNode)</span><span class="path">setting.callback.</span>beforeMouseDown</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于捕获 zTree 上鼠标按键按下之前的事件回调函数，并且根据返回值确定触发 onMouseDown 事件回调函数</p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>鼠标按键按下时所在节点的 JSON 数据对象</p>
+	<p class="highlight_red">如果不在节点上，则返回 null</p>
+	<h4 class="topLine"><b>返回值</b><span>Boolean</span></h4>
+	<p>返回值是 true / false</p>
+	<p class="highlight_red">如果返回 false，将仅仅无法触发 onMouseDown 事件回调函数，对其他操作无任何影响</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 禁止 onMouseDown 事件</h4>
+	<pre xmlns=""><code>function zTreeBeforeMouseDown(treeId, treeNode) {
+    return false;
+};
+var setting = {
+	callback: {
+		beforeMouseDown: zTreeBeforeMouseDown
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.beforeMouseUp.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.beforeMouseUp.html
new file mode 100644
index 0000000..f0b01b9
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.beforeMouseUp.html
@@ -0,0 +1,35 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNode)</span><span class="path">setting.callback.</span>beforeMouseUp</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于捕获 zTree 上鼠标按键松开之前的事件回调函数，并且根据返回值确定触发 onMouseUp 事件回调函数</p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>鼠标按键松开时所在节点的 JSON 数据对象</p>
+	<p class="highlight_red">如果不在节点上，则返回 null</p>
+	<h4 class="topLine"><b>返回值</b><span>Boolean</span></h4>
+	<p>返回值是 true / false</p>
+	<p class="highlight_red">如果返回 false，将仅仅无法触发 onMouseUp 事件回调函数，对其他操作无任何影响</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 禁止 onMouseUp 事件</h4>
+	<pre xmlns=""><code>function zTreeBeforeMouseUp(treeId, treeNode) {
+    return false;
+};
+var setting = {
+	callback: {
+		beforeMouseUp: zTreeBeforeMouseUp
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.beforeRemove.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.beforeRemove.html
new file mode 100644
index 0000000..0edb3fd
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.beforeRemove.html
@@ -0,0 +1,37 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNode)</span><span class="path">setting.callback.</span>beforeRemove</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于捕获节点被删除之前的事件回调函数，并且根据返回值确定是否允许删除操作</p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>将要删除的节点 JSON 数据对象</p>
+	<h4 class="topLine"><b>返回值</b><span>Boolean</span></h4>
+	<p>返回值是 true / false</p>
+	<p class="highlight_red">如果返回 false，zTree 将不删除节点，也无法触发 onRemove 事件回调函数</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 禁止全部删除操作</h4>
+	<pre xmlns=""><code>function zTreeBeforeRemove(treeId, treeNode) {
+	return false;
+}
+var setting = {
+	edit: {
+		enable: true
+	},
+	callback: {
+		beforeRemove: zTreeBeforeRemove
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.beforeRename.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.beforeRename.html
new file mode 100644
index 0000000..0709961
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.beforeRename.html
@@ -0,0 +1,46 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNode, newName, isCancel)</span><span class="path">setting.callback.</span>beforeRename</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于捕获节点编辑名称结束（Input 失去焦点 或 按下 Enter 键）之后，更新节点名称数据之前的事件回调函数，并且根据返回值确定是否允许更改名称的操作</p>
+			<p class="highlight_red">节点进入编辑名称状态后，按 ESC 键可以放弃当前修改，恢复原名称，取消编辑名称状态</p>
+			<p class="highlight_red">从 v3.5.13 开始，取消编辑状态也会触发此回调，根据 isCancel 参数判断</p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>将要更改名称的节点 JSON 数据对象</p>
+	<h4 class="topLine"><b>newName</b><span>String</span></h4>
+	<p>修改后的新名称</p>
+	<h4 class="topLine"><b>isCancel</b><span>Boolean</span></h4>
+	<p>是否取消操作 (v3.5.13+)</p>
+	<p class="highlight_red">isCancel = true 表示取消编辑操作（按下 ESC 或 使用 cancelEditName 方法）</p>
+	<p class="highlight_red">isCancel = false 表示确认修改操作</p>
+	<h4 class="topLine"><b>返回值</b><span>Boolean</span></h4>
+	<p>返回值是 true / false</p>
+	<p class="highlight_red">如果返回 false，zTree 将保持名称编辑状态，无法触发 onRename 事件回调函数，并且会导致屏蔽其它事件，直到修改名称使得 beforeRename 返回 true</p>
+	<p class="highlight_red">如果返回 false，不会让 input 输入框获取焦点，避免由于警告信息而导致反复触发 beforeRename。 请在关闭提示警告信息后，利用 editName 方法让 input 重新获取焦点。</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 禁止修改的名称的长度小于 5</h4>
+	<pre xmlns=""><code>function zTreeBeforeRename(treeId, treeNode, newName, isCancel) {
+	return newName.length > 5;
+}
+var setting = {
+	edit: {
+		enable: true
+	},
+	callback: {
+		beforeRename: zTreeBeforeRename
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.beforeRightClick.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.beforeRightClick.html
new file mode 100644
index 0000000..1a5bdaa
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.beforeRightClick.html
@@ -0,0 +1,35 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNode)</span><span class="path">setting.callback.</span>beforeRightClick</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于捕获 zTree 上鼠标右键点击之前的事件回调函数，并且根据返回值确定触发 onRightClick 事件回调函数</p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>鼠标右键点击时所在节点的 JSON 数据对象</p>
+	<p class="highlight_red">如果不在节点上，则返回 null</p>
+	<h4 class="topLine"><b>返回值</b><span>Boolean</span></h4>
+	<p>返回值是 true / false</p>
+	<p class="highlight_red">如果返回 false，将仅仅无法触发 onRightClick 事件回调函数，对其他操作无任何影响</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 禁止 onRightClick 事件</h4>
+	<pre xmlns=""><code>function zTreeBeforeRightClick(treeId, treeNode) {
+    return false;
+};
+var setting = {
+	callback: {
+		beforeRightClick: zTreeBeforeRightClick
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.onAsyncError.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.onAsyncError.html
new file mode 100644
index 0000000..c469e11
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.onAsyncError.html
@@ -0,0 +1,42 @@
+<div class="apiDetail">
+<div>
+	<h2><span class="path">setting.callback.</span>onAsyncError</h2>
+	<h2><span>Function(event, treeId, treeNode, XMLHttpRequest, textStatus, errorThrown)</span>&nbsp;</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于捕获异步加载出现异常错误的事件回调函数</p>
+			<p class="highlight_red">如果设置了 setting.callback.beforeAsync 方法，且返回 false，将无法触发 onAsyncSuccess / onAsyncError 事件回调函数。</p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>event</b><span>js event 对象</span></h4>
+	<p>标准的 js event 对象</p>
+	<h4 class="topLine"><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>进行异步加载的父节点 JSON 数据对象</p>
+	<p class="highlight_red">针对根进行异步加载时，treeNode = null</p>
+	<h4 class="topLine"><b>XMLHttpRequest</b><span>String</span></h4>
+	<p>标准 XMLHttpRequest 对象，请参考 JQuery API 文档。</p>
+	<h4 class="topLine"><b>textStatus</b><span>String</span></h4>
+	<p>请求状态：success，error，请参考 JQuery API 文档。</p>
+	<h4 class="topLine"><b>errorThrown</b><span>String</span></h4>
+	<p>errorThrown 只有当异常发生时才会被传递，请参考 JQuery API 文档。</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 异步加载出现异常后，弹出错误信息</h4>
+	<pre xmlns=""><code>function zTreeOnAsyncError(event, treeId, treeNode, XMLHttpRequest, textStatus, errorThrown) {
+    alert(XMLHttpRequest);
+};
+var setting = {
+	callback: {
+		onAsyncError: zTreeOnAsyncError
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.onAsyncSuccess.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.onAsyncSuccess.html
new file mode 100644
index 0000000..081e9d7
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.onAsyncSuccess.html
@@ -0,0 +1,38 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(event, treeId, treeNode, msg)</span><span class="path">setting.callback.</span>onAsyncSuccess</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于捕获异步加载正常结束的事件回调函数</p>
+			<p class="highlight_red">如果设置了 setting.callback.beforeAsync 方法，且返回 false，将无法触发 onAsyncSuccess / onAsyncError 事件回调函数。</p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>event</b><span>js event 对象</span></h4>
+	<p>标准的 js event 对象</p>
+	<h4 class="topLine"><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>进行异步加载的父节点 JSON 数据对象</p>
+	<p class="highlight_red">针对根进行异步加载时，treeNode = null</p>
+	<h4 class="topLine"><b>msg</b><span>String / Object</span></h4>
+	<p>异步获取的节点数据字符串，主要便于用户调试使用。</p>
+	<p class="highlight_red">实际数据类型会受 setting.async.dataType 的设置影响，请参考 JQuery API 文档。</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 异步加载成功后，弹出提示信息</h4>
+	<pre xmlns=""><code>function zTreeOnAsyncSuccess(event, treeId, treeNode, msg) {
+    alert(msg);
+};
+var setting = {
+	callback: {
+		onAsyncSuccess: zTreeOnAsyncSuccess
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.onCheck.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.onCheck.html
new file mode 100644
index 0000000..113eee9
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.onCheck.html
@@ -0,0 +1,34 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(event, treeId, treeNode)</span><span class="path">setting.callback.</span>onCheck</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.excheck</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于捕获 checkbox / radio 被勾选 或 取消勾选的事件回调函数</p>
+			<p class="highlight_red">如果设置了 setting.callback.beforeCheck 方法，且返回 false，将无法触发 onCheck 事件回调函数。</p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>event</b><span>js event 对象</span></h4>
+	<p>标准的 js event 对象</p>
+	<h4 class="topLine"><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>被勾选 或 取消勾选的节点 JSON 数据对象</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 每次点击 checkbox 或 radio 后， 弹出该节点的 tId、name 以及当前勾选状态的信息</h4>
+	<pre xmlns=""><code>function zTreeOnCheck(event, treeId, treeNode) {
+    alert(treeNode.tId + ", " + treeNode.name + "," + treeNode.checked);
+};
+var setting = {
+	callback: {
+		onCheck: zTreeOnCheck
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.onClick.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.onClick.html
new file mode 100644
index 0000000..19d2948
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.onClick.html
@@ -0,0 +1,49 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(event, treeId, treeNode, clickFlag)</span><span class="path">setting.callback.</span>onClick</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于捕获节点被点击的事件回调函数</p>
+			<p class="highlight_red">如果设置了 setting.callback.beforeClick 方法，且返回 false，将无法触发 onClick 事件回调函数。</p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>event</b><span>js event 对象</span></h4>
+	<p>标准的 js event 对象</p>
+	<h4 class="topLine"><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>被点击的节点 JSON 数据对象</p>
+	<h4 class="topLine"><b>clickFlag</b><span>Number</span></h4>
+	<p>节点被点击后的选中操作类型，详细看下表</p>
+	<table width="100%" border="0" cellspacing="1" cellpadding="0">
+		<thead><tr><td>clickFlag</td><td title="是否允许多点选中">selectedMulti</td><td title="是否按下 Ctrl 键">autoCancelSelected<br/>&&<br/>event.ctrlKey</td><td title="节点当前选择状态">isSelected</td><td>选中操作</td></tr></thead>
+		<tbody>
+			<tr><td>1</td><td>true</td><td>false</td><td>false</td><td>普通选中</td></tr>
+			<tr><td>1</td><td>true</td><td>false</td><td>true</td><td>普通选中</td></tr>
+			<tr><td>2</td><td>true</td><td>true</td><td>false</td><td>追加选中</td></tr>
+			<tr><td>0</td><td>true</td><td>true</td><td>true</td><td>取消选中</td></tr>
+			<tr><td>1</td><td>false</td><td>false</td><td>false</td><td>普通选中</td></tr>
+			<tr><td>1</td><td>false</td><td>false</td><td>true</td><td>普通选中</td></tr>
+			<tr><td>1</td><td>false</td><td>true</td><td>false</td><td>普通选中</td></tr>
+			<tr><td>0</td><td>false</td><td>true</td><td>true</td><td>取消选中</td></tr>
+		</tbody>
+	</table>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 每次点击节点后， 弹出该节点的 tId、name 的信息</h4>
+	<pre xmlns=""><code>function zTreeOnClick(event, treeId, treeNode) {
+    alert(treeNode.tId + ", " + treeNode.name);
+};
+var setting = {
+	callback: {
+		onClick: zTreeOnClick
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.onCollapse.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.onCollapse.html
new file mode 100644
index 0000000..1c816c2
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.onCollapse.html
@@ -0,0 +1,34 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(event, treeId, treeNode)</span><span class="path">setting.callback.</span>onCollapse</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于捕获节点被折叠的事件回调函数</p>
+			<p class="highlight_red">如果设置了 setting.callback.beforeCollapse 方法，且返回 false，将无法触发 onCollapse 事件回调函数。</p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>event</b><span>js event 对象</span></h4>
+	<p>标准的 js event 对象</p>
+	<h4 class="topLine"><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>被折叠的节点 JSON 数据对象</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 每次折叠节点后， 弹出该节点的 tId、name 的信息</h4>
+	<pre xmlns=""><code>function zTreeOnCollapse(event, treeId, treeNode) {
+    alert(treeNode.tId + ", " + treeNode.name);
+};
+var setting = {
+	callback: {
+		onCollapse: zTreeOnCollapse
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.onDblClick.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.onDblClick.html
new file mode 100644
index 0000000..deb8e62
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.onDblClick.html
@@ -0,0 +1,35 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(event, treeId, treeNode)</span><span class="path">setting.callback.</span>onDblClick</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于捕获 zTree 上鼠标双击之后的事件回调函数</p>
+			<p class="highlight_red">如果设置了 setting.callback.beforeDblClick 方法，且返回 false，将无法触发 onDblClick 事件回调函数。</p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>event</b><span>js event 对象</span></h4>
+	<p>标准的 js event 对象</p>
+	<h4 class="topLine"><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>鼠标双击时所在节点的 JSON 数据对象</p>
+	<p class="highlight_red">如果不在节点上，则返回 null</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 每次鼠标双击后， 弹出鼠标所在节点的 tId、name 的信息</h4>
+	<pre xmlns=""><code>function zTreeOnDblClick(event, treeId, treeNode) {
+    alert(treeNode ? treeNode.tId + ", " + treeNode.name : "isRoot");
+};
+var setting = {
+	callback: {
+		onDblClick: zTreeOnDblClick
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.onDrag.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.onDrag.html
new file mode 100644
index 0000000..f7e0597
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.onDrag.html
@@ -0,0 +1,34 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(event, treeId, treeNodes)</span><span class="path">setting.callback.</span>onDrag</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于捕获节点被拖拽的事件回调函数</p>
+			<p class="highlight_red">如果设置了 setting.callback.beforeDrag 方法，且返回 false，将无法触发 onDrag 事件回调函数。</p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>event</b><span>js event 对象</span></h4>
+	<p>标准的 js event 对象</p>
+	<h4 class="topLine"><b>treeId</b><span>String</span></h4>
+	<p>被拖拽的节点 treeNodes 所在 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNodes</b><span>Array(JSON)</span></h4>
+	<p>要被拖拽的节点 JSON 数据集合</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 每次开始进行拖拽节点后， 弹出被拖拽节点的个数信息</h4>
+	<pre xmlns=""><code>function zTreeOnDrag(event, treeId, treeNodes) {
+    alert(treeNodes.length);
+};
+var setting = {
+	callback: {
+		onDrag: zTreeOnDrag
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.onDrop.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.onDrop.html
new file mode 100644
index 0000000..c6773a8
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.onDrop.html
@@ -0,0 +1,46 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(event, treeId, treeNodes, targetNode, moveType, isCopy)</span><span class="path">setting.callback.</span>onDrop</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于捕获节点拖拽操作结束的事件回调函数</p>
+			<p class="highlight_red">如果设置了 setting.callback.beforeDrop 方法，且返回 false，将无法触发 onDrop 事件回调函数。</p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>event</b><span>js event 对象</span></h4>
+	<p>标准的 js event 对象</p>
+	<h4 class="topLine"><b>treeId</b><span>String</span></h4>
+	<p>目标节点 targetNode 所在 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNodes</b><span>Array(JSON)</span></h4>
+	<p>被拖拽的节点 JSON 数据集合</p>
+	<p class="highlight_red">如果拖拽操作为 移动，treeNodes 是当前被拖拽节点的数据集合。</p>
+	<p class="highlight_red">如果拖拽操作为 复制，treeNodes 是复制后 clone 得到的新节点数据。</p>
+	<h4 class="topLine"><b>targetNode</b><span>JSON</span></h4>
+	<p>成为 treeNodes 拖拽结束的目标节点 JSON 数据对象。</p>
+	<p class="highlight_red">如果拖拽成为根节点，则 targetNode = null</p>
+	<h4 class="topLine"><b>moveType</b><span>String</span></h4>
+	<p>指定移动到目标节点的相对位置</p>
+	<p class="highlight_red">"inner"：成为子节点，"prev"：成为同级前一个节点，"next"：成为同级后一个节点</p>
+	<p class="highlight_red">如果 moveType = null，表明拖拽无效</p>
+	<h4 class="topLine"><b>isCopy</b><span>Boolean</span></h4>
+	<p>拖拽节点操作是 复制 或 移动</p>
+	<p class="highlight_red">true：复制；false：移动</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 每次拖拽操作结束后， 弹出该被拖拽节点的个数以及目标节点的 tId、name 的信息</h4>
+	<pre xmlns=""><code>function zTreeOnDrop(event, treeId, treeNodes, targetNode, moveType) {
+    alert(treeNodes.length + "," + (targetNode ? (targetNode.tId + ", " + targetNode.name) : "isRoot" ));
+};
+var setting = {
+	callback: {
+		onDrop: zTreeOnDrop
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.onExpand.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.onExpand.html
new file mode 100644
index 0000000..791c5f6
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.onExpand.html
@@ -0,0 +1,34 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(event, treeId, treeNode)</span><span class="path">setting.callback.</span>onExpand</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于捕获节点被展开的事件回调函数</p>
+			<p class="highlight_red">如果设置了 setting.callback.beforeExpand 方法，且返回 false，将无法触发 onExpand 事件回调函数。</p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>event</b><span>js event 对象</span></h4>
+	<p>标准的 js event 对象</p>
+	<h4 class="topLine"><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>被展开的节点 JSON 数据对象</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 每次展开节点后， 弹出该节点的 tId、name 的信息</h4>
+	<pre xmlns=""><code>function zTreeOnExpand(event, treeId, treeNode) {
+    alert(treeNode.tId + ", " + treeNode.name);
+};
+var setting = {
+	callback: {
+		onExpand: zTreeOnExpand
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.onMouseDown.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.onMouseDown.html
new file mode 100644
index 0000000..bc9d0ea
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.onMouseDown.html
@@ -0,0 +1,35 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(event, treeId, treeNode)</span><span class="path">setting.callback.</span>onMouseDown</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于捕获 zTree 上鼠标按键按下后的事件回调函数</p>
+			<p class="highlight_red">如果设置了 setting.callback.beforeMouseDown 方法，且返回 false，将无法触发 onMouseDown 事件回调函数。</p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>event</b><span>js event 对象</span></h4>
+	<p>标准的 js event 对象</p>
+	<h4 class="topLine"><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>鼠标按键按下时所在节点的 JSON 数据对象</p>
+	<p class="highlight_red">如果不在节点上，则返回 null</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 每次鼠标按键按下后， 弹出鼠标所在节点的 tId、name 的信息</h4>
+	<pre xmlns=""><code>function zTreeOnMouseDown(event, treeId, treeNode) {
+    alert(treeNode ? treeNode.tId + ", " + treeNode.name : "isRoot");
+};
+var setting = {
+	callback: {
+		onMouseDown: zTreeOnMouseDown
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.onMouseUp.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.onMouseUp.html
new file mode 100644
index 0000000..a969fef
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.onMouseUp.html
@@ -0,0 +1,35 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(event, treeId, treeNode)</span><span class="path">setting.callback.</span>onMouseUp</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于捕获 zTree 上鼠标按键松开后的事件回调函数</p>
+			<p class="highlight_red">如果设置了 setting.callback.beforeMouseUp 方法，且返回 false，将无法触发 onMouseUp 事件回调函数。</p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>event</b><span>js event 对象</span></h4>
+	<p>标准的 js event 对象</p>
+	<h4 class="topLine"><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>鼠标按键松开时所在节点的 JSON 数据对象</p>
+	<p class="highlight_red">如果不在节点上，则返回 null</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 每次鼠标按键松开后， 弹出鼠标所在节点的 tId、name 的信息</h4>
+	<pre xmlns=""><code>function zTreeOnMouseUp(event, treeId, treeNode) {
+    alert(treeNode ? treeNode.tId + ", " + treeNode.name : "isRoot");
+};
+var setting = {
+	callback: {
+		onMouseUp: zTreeOnMouseUp
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.onNodeCreated.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.onNodeCreated.html
new file mode 100644
index 0000000..2ebaee6
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.onNodeCreated.html
@@ -0,0 +1,35 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(event, treeId, treeNode)</span><span class="path">setting.callback.</span>onNodeCreated</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于捕获节点生成 DOM 后的事件回调函数</p>
+			<p class="highlight_red">v3.x 采用了延迟加载技术，因此对于父节点未展开的子节点来说，初始化后是不会触发此回调函数，直到其父节点被展开</p>
+			<p class="highlight_red">大数据量的节点加载请注意：不设置 onNodeCreated，可以提升一部分初始化性能</p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>event</b><span>js event 对象</span></h4>
+	<p>标准的 js event 对象</p>
+	<h4 class="topLine"><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>生成 DOM 完毕的节点的 JSON 数据对象</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 创建节点 DOM 后， 弹出该节点的 tId、name 的信息</h4>
+	<pre xmlns=""><code>function zTreeOnNodeCreated(event, treeId, treeNode) {
+    alert(treeNode.tId + ", " + treeNode.name);
+};
+var setting = {
+	callback: {
+		onNodeCreated: zTreeOnNodeCreated
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.onRemove.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.onRemove.html
new file mode 100644
index 0000000..e7e625d
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.onRemove.html
@@ -0,0 +1,34 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(event, treeId, treeNode)</span><span class="path">setting.callback.</span>onRemove</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于捕获删除节点之后的事件回调函数。</p>
+			<p class="highlight_red">如果用户设置了 beforeRemove 回调函数，并返回 false，将无法触发 onRemove 事件回调函数。</p>
+			<p>默认值：null</p>			
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>event</b><span>js event 对象</span></h4>
+	<p>标准的 js event 对象</p>
+	<h4 class="topLine"><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>将要删除的节点 JSON 数据对象</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 删除节点时，弹出被删除的节点的 tId 以及 name 信息</h4>
+	<pre xmlns=""><code>function zTreeOnRemove(event, treeId, treeNode) {
+	alert(treeNode.tId + ", " + treeNode.name);
+}
+var setting = {
+	callback: {
+		onRemove: zTreeOnRemove
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.onRename.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.onRename.html
new file mode 100644
index 0000000..f225463
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.onRename.html
@@ -0,0 +1,40 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(event, treeId, treeNode, isCancel)</span><span class="path">setting.callback.</span>onRename</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于捕获节点编辑名称结束之后的事件回调函数。</p>
+			<p>1、节点进入编辑名称状态，并且修改节点名称后触发此回调函数。<span class="highlight_red">如果用户设置了 beforeRename 回调函数，并返回 false，将无法触发 onRename 事件回调函数。</span></p>
+			<p>2、<span class="highlight_red">如果通过直接修改 treeNode 的数据，并且利用 updateNode 方法更新，是不会触发此回调函数的。</span></p>
+			<p class="highlight_red">3、从 v3.5.13 开始，取消编辑状态也会触发此回调，根据 isCancel 参数判断</p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>event</b><span>js event 对象</span></h4>
+	<p>标准的 js event 对象</p>
+	<h4 class="topLine"><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>被修改名称的节点 JSON 数据对象</p>
+	<h4 class="topLine"><b>isCancel</b><span>Boolean</span></h4>
+	<p>是否取消操作 (v3.5.13+)</p>
+	<p class="highlight_red">isCancel = true 表示取消编辑操作（按下 ESC 或 使用 cancelEditName 方法）</p>
+	<p class="highlight_red">isCancel = false 表示确认修改操作</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 修改名称后，弹出被修改名称的节点的 tId 以及 name 信息</h4>
+	<pre xmlns=""><code>function zTreeOnRename(event, treeId, treeNode, isCancel) {
+	alert(treeNode.tId + ", " + treeNode.name);
+}
+var setting = {
+	callback: {
+		onRename: zTreeOnRename
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.onRightClick.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.onRightClick.html
new file mode 100644
index 0000000..d51c68d
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.callback.onRightClick.html
@@ -0,0 +1,36 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(event, treeId, treeNode)</span><span class="path">setting.callback.</span>onRightClick</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于捕获 zTree 上鼠标右键点击之后的事件回调函数</p>
+			<p class="highlight_red">1、如果设置了 setting.callback.beforeRightClick 方法，且返回 false，将无法触发 onRightClick 事件回调函数。</p>
+			<p class="highlight_red">2、只要将 function 的引用赋给 onRightClick 属性，则右键点击 zTree 时，将屏蔽浏览器的右键菜单。</p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>event</b><span>js event 对象</span></h4>
+	<p>标准的 js event 对象</p>
+	<h4 class="topLine"><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>鼠标右键点击时所在节点的 JSON 数据对象</p>
+	<p class="highlight_red">如果不在节点上，则返回 null</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 每次鼠标右键点击后， 弹出鼠标所在节点的 tId、name 的信息</h4>
+	<pre xmlns=""><code>function zTreeOnRightClick(event, treeId, treeNode) {
+    alert(treeNode ? treeNode.tId + ", " + treeNode.name : "isRoot");
+};
+var setting = {
+	callback: {
+		onRightClick: zTreeOnRightClick
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.check.autoCheckTrigger.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.check.autoCheckTrigger.html
new file mode 100644
index 0000000..d1efd77
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.check.autoCheckTrigger.html
@@ -0,0 +1,28 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.check.</span>autoCheckTrigger</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.excheck</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>设置自动关联勾选时是否触发 beforeCheck / onCheck 事件回调函数。<span class="highlight_red">[setting.check.enable = true 且 setting.check.chkStyle = "checkbox" 时生效]</span></p>
+			<p class="highlight_red">1、如果设置 setting.check.chkboxType = { "Y": "", "N": "" }，将不会有任何自动关联勾选的操作。</p>
+			<p class="highlight_red">2、如果开启触发，对于节点较多的树将会影响性能，因为所有被联动勾选的操作都会触发事件回调函数，请根据需要决定是否使用此功能。</p>
+			<p>默认值: false</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p> true / false 分别表示 触发 / 不触发 事件回调函数</p>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 需要触发自动关联勾选操作</h4>
+	<pre xmlns=""><code>var setting = {
+	check: {
+		enable: true,
+		autoCheckTrigger: true
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.check.chkDisabledInherit.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.check.chkDisabledInherit.html
new file mode 100644
index 0000000..8af1c2c
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.check.chkDisabledInherit.html
@@ -0,0 +1,28 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.check.</span>chkDisabledInherit</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.excheck</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>当父节点设置 chkDisabled = true 时，设置子节点是否自动继承 chkDisabled = true 。<span class="highlight_red">[setting.check.enable = true 时生效]</span></p>
+			<p class="highlight_red">1、只使用于初始化节点时，便于批量操作。 对于已存在的节点请利用 setChkDisabled 方法单个节点设置。</p>
+			<p>默认值: false</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p> true 表示 新加入子节点时，自动继承父节点 chkDisabled = true 的属性。</p>
+	<p> false 表示 新加入子节点时，不继承父节点 chkDisabled 的属性。</p>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 需要子节点自动继承 chkDisabled = true</h4>
+	<pre xmlns=""><code>var setting = {
+	check: {
+		enable: true,
+		chkDisabledInherit: true
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.check.chkStyle.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.check.chkStyle.html
new file mode 100644
index 0000000..9706c13
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.check.chkStyle.html
@@ -0,0 +1,48 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">setting.check.</span>chkStyle</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.excheck</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>勾选框类型(checkbox 或 radio）<span class="highlight_red">[setting.check.enable = true 时生效]</span></p>
+			<p>默认值："checkbox"</p>
+		</div>
+	</div>
+	<h3>String 格式说明</h3>
+	<div class="desc">
+	<p>chkStyle = "checkbox" 时，显示 checkbox 选择框，<span class="highlight_red">setting.check.chkboxType</span> 属性有效。
+<br/>chkStyle = "radio" 时，显示 radio 选择框， <span class="highlight_red">setting.check.radioType</span> 属性有效。</p>
+	<p class="highlight_red">请注意大小写，不要改变</p>
+	</div>
+	<h3>checkbox 状态说明</h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p><button type="button" class="chk checkbox_false_full"></button>未勾选；<span class="highlight_red">如果是父节点，则无子节点被勾选</span>。鼠标移到该节点上显示为：<button type="button" class="chk checkbox_false_full_focus"></button></p>
+			<p><button type="button" class="chk checkbox_false_part"></button>未勾选；（只有父节点存在此状态）<span class="highlight_red">存在被勾选的子节点</span>。鼠标移到该节点上显示为：<button type="button" class="chk checkbox_false_part_focus"></button></p>
+			<p><button type="button" class="chk checkbox_true_full"></button>被勾选；<span class="highlight_red">如果是父节点，则全部子节点都被勾选</span>。鼠标移到该节点上显示为：<button type="button" class="chk checkbox_true_full_focus"></button></p>
+			<p><button type="button" class="chk checkbox_true_part"></button>被勾选；（只有父节点存在此状态）<span class="highlight_red">且部分或无子节点被勾选</span>。鼠标移到该节点上显示为：<button type="button" class="chk checkbox_true_part_focus"></button></p>
+		</div>
+	</div>
+	<h3>radio 状态说明</h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p><button type="button" class="chk radio_false_full"></button>未勾选；<span class="highlight_red">如果是父节点，则没有子节点被勾选</span>。鼠标移到该节点上显示为：<button type="button" class="chk radio_false_full_focus"></button></p>
+			<p><button type="button" class="chk radio_false_part"></button>未勾选；（只有父节点存在此状态）<span class="highlight_red">且存在被勾选的子节点</span>。鼠标移到该节点上显示为：<button type="button" class="chk radio_false_part_focus"></button></p>
+			<p><button type="button" class="chk radio_true_full"></button>被勾选；<span class="highlight_red">如果是父节点，则没有子节点被勾选</span>。鼠标移到该节点上显示为：<button type="button" class="chk radio_true_full_focus"></button></p>
+			<p><button type="button" class="chk radio_true_part"></button>被勾选；（只有父节点存在此状态）<span class="highlight_red">且存在被勾选的子节点</span>。鼠标移到该节点上显示为：<button type="button" class="chk radio_true_part_focus"></button></p>
+		</div>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 设置选择框为 radio</h4>
+	<pre xmlns=""><code>var setting = {
+	check: {
+		enable: true,
+		chkStyle: "radio"
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.check.chkboxType.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.check.chkboxType.html
new file mode 100644
index 0000000..da06b6c
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.check.chkboxType.html
@@ -0,0 +1,31 @@
+<div class="apiDetail">
+<div>
+	<h2><span>JSON</span><span class="path">setting.check.</span>chkboxType</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.excheck</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>勾选 checkbox 对于父子节点的关联关系。<span class="highlight_red">[setting.check.enable = true 且 setting.check.chkStyle = "checkbox" 时生效]</span></p>
+			<p>默认值：{ "Y": "ps", "N": "ps" }</p>
+		</div>
+	</div>
+	<h3>JSON 格式说明</h3>
+	<div class="desc">
+	<p>Y 属性定义 checkbox 被勾选后的情况；
+<br/>N 属性定义 checkbox 取消勾选后的情况；
+<br/>"p" 表示操作会影响父级节点；
+<br/>"s" 表示操作会影响子级节点。</p>
+	<p class="highlight_red">请注意大小写，不要改变</p>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. checkbox 勾选操作，只影响父级节点；取消勾选操作，只影响子级节点</h4>
+	<pre xmlns=""><code>var setting = {
+	check: {
+		enable: true,
+		chkStyle: "checkbox",
+		chkboxType: { "Y": "p", "N": "s" }
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.check.enable.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.check.enable.html
new file mode 100644
index 0000000..8b1387e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.check.enable.html
@@ -0,0 +1,25 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.check.</span>enable</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.excheck</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>设置 zTree 的节点上是否显示 checkbox / radio</p>
+			<p>默认值: false</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p> true / false 分别表示 显示 / 不显示 复选框或单选框</p>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 需要显示 checkbox</h4>
+	<pre xmlns=""><code>var setting = {
+	check: {
+		enable: true
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.check.nocheckInherit.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.check.nocheckInherit.html
new file mode 100644
index 0000000..caf9902
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.check.nocheckInherit.html
@@ -0,0 +1,28 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.check.</span>nocheckInherit</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.excheck</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>当父节点设置 nocheck = true 时，设置子节点是否自动继承 nocheck = true 。<span class="highlight_red">[setting.check.enable = true 时生效]</span></p>
+			<p class="highlight_red">1、只使用于初始化节点时，便于批量操作。 对于已存在的节点请利用 updateNode 方法单个节点设置。</p>
+			<p>默认值: false</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p> true 表示 新加入子节点时，自动继承父节点 nocheck = true 的属性。</p>
+	<p> false 表示 新加入子节点时，不继承父节点 nocheck 的属性。</p>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 需要子节点自动继承 nocheck = true</h4>
+	<pre xmlns=""><code>var setting = {
+	check: {
+		enable: true,
+		nocheckInherit: true
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.check.radioType.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.check.radioType.html
new file mode 100644
index 0000000..19f84ca
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.check.radioType.html
@@ -0,0 +1,29 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">setting.check.</span>radioType</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.excheck</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>radio 的分组范围。<span class="highlight_red">[setting.check.enable = true 且 setting.check.chkStyle = "radio" 时生效]</span></p>
+			<p>默认值："level"</p>
+		</div>
+	</div>
+	<h3>String 格式说明</h3>
+	<div class="desc">
+	<p>radioType = "level" 时，在每一级节点范围内当做一个分组。
+<br/>radioType = "all" 时，在整棵树范围内当做一个分组。</p>
+	<p class="highlight_red">请注意大小写，不要改变</p>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 设置 radio 的判别规则为整棵树内</h4>
+	<pre xmlns=""><code>var setting = {
+	check: {
+		enable: true,
+		chkStyle: "radio",
+		radioType: "all"
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.data.keep.leaf.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.data.keep.leaf.html
new file mode 100644
index 0000000..af3a721
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.data.keep.leaf.html
@@ -0,0 +1,28 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.data.keep.</span>leaf</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>zTree 的节点叶子节点属性锁，是否始终保持 isParent = false</p>
+			<p>默认值：false</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p> true / false 分别表示 锁定 / 不锁定 叶子节点属性</p>
+	<p class="highlight_red">如果设置为 true，则所有 isParent = false 的节点，都无法添加子节点。</p>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 需要锁定叶子节点状态</h4>
+	<pre xmlns=""><code>var setting = {
+	data: {
+		keep: {
+			leaf: true
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.data.keep.parent.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.data.keep.parent.html
new file mode 100644
index 0000000..c4975df
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.data.keep.parent.html
@@ -0,0 +1,28 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.data.keep.</span>parent</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>zTree 的节点父节点属性锁，是否始终保持 isParent = true</p>
+			<p>默认值：false</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p> true / false 分别表示 锁定 / 不锁定 父节点属性</p>
+	<p class="highlight_red">如果设置为 true，则所有 isParent = true 的节点，即使该节点的子节点被全部删除或移走，依旧保持父节点状态。</p>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 需要锁定父节点状态</h4>
+	<pre xmlns=""><code>var setting = {
+	data: {
+		keep: {
+			parent: true
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.data.key.checked.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.data.key.checked.html
new file mode 100644
index 0000000..ac9fdc1
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.data.key.checked.html
@@ -0,0 +1,24 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">setting.data.key.</span>checked</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.excheck</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>zTree 节点数据中保存 check 状态的属性名称。</p>
+			<p>默认值："checked"</p>
+			<p class="highlight_red">请勿与 zTree 节点数据的其他参数冲突，例如：checkedOld</p>
+		</div>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 设置 zTree 显示节点时，将 treeNode 的 isChecked 属性当做节点名称</h4>
+	<pre xmlns=""><code>var setting = {
+	data: {
+		key: {
+			checked: "isChecked"
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.data.key.children.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.data.key.children.html
new file mode 100644
index 0000000..66a49a7
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.data.key.children.html
@@ -0,0 +1,23 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">setting.data.key.</span>children</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>zTree 节点数据中保存子节点数据的属性名称。</p>
+			<p>默认值："children"</p>
+		</div>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 设置 zTree 显示节点时，将 treeNode 的 nodes 属性当做节点名称</h4>
+	<pre xmlns=""><code>var setting = {
+	data: {
+		key: {
+			children: "nodes"
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.data.key.name.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.data.key.name.html
new file mode 100644
index 0000000..c25d250
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.data.key.name.html
@@ -0,0 +1,23 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">setting.data.key.</span>name</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>zTree 节点数据保存节点名称的属性名称。</p>
+			<p>默认值："name"</p>
+		</div>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 设置 zTree 显示节点时，将 treeNode 的 ename 属性当做节点名称</h4>
+	<pre xmlns=""><code>var setting = {
+	data: {
+		key: {
+			name: "ename"
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.data.key.title.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.data.key.title.html
new file mode 100644
index 0000000..43e6855
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.data.key.title.html
@@ -0,0 +1,24 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">setting.data.key.</span>title</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>zTree 节点数据保存节点提示信息的属性名称。<span class="highlight_red">[setting.view.showTitle = true 时生效]</span></p>
+			<p class="highlight_red">如果设置为 "" ，则自动与 setting.data.key.name 保持一致，避免用户反复设置</p>
+			<p>默认值：""</p>
+		</div>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 设置 zTree 显示节点时，将 treeNode 的 fullName 属性当做节点名称</h4>
+	<pre xmlns=""><code>var setting = {
+	data: {
+		key: {
+			title: "fullName"
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.data.key.url.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.data.key.url.html
new file mode 100644
index 0000000..e534d98
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.data.key.url.html
@@ -0,0 +1,24 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">setting.data.key.</span>url</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>zTree 节点数据保存节点链接的目标 URL 的属性名称。</p>
+			<p class="highlight_red">特殊用途：当后台数据只能生成 url 属性，又不想实现点击节点跳转的功能时，可以直接修改此属性为其他不存在的属性名称</p>
+			<p>默认值："url"</p>
+		</div>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 设置 zTree 显示节点时，将 treeNode 的 xUrl 属性当做节点链接的目标 URL</h4>
+	<pre xmlns=""><code>var setting = {
+	data: {
+		key: {
+			url: "xUrl"
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.data.simpleData.enable.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.data.simpleData.enable.html
new file mode 100644
index 0000000..65bd407
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.data.simpleData.enable.html
@@ -0,0 +1,38 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.data.simpleData.</span>enable</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>确定 zTree 初始化时的节点数据、异步加载时的节点数据、或 <span class="highlight_red">addNodes</span> 方法中输入的 newNodes 数据是否采用简单数据模式 (Array)</p>
+			<p>不需要用户再把数据库中取出的 List 强行转换为复杂的 JSON 嵌套格式</p>
+			<p>默认值：false</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p> true / false 分别表示 使用 / 不使用 简单数据模式</p>
+	<p class="highlight_red">如果设置为 true，请务必设置 setting.data.simpleData 内的其他参数: idKey / pIdKey / rootPId，并且让数据满足父子关系。</p>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 使用简单 Array 格式的数据</h4>
+	<pre xmlns=""><code>var setting = {
+	data: {
+		simpleData: {
+			enable: true,
+			idKey: "id",
+			pIdKey: "pId",
+			rootPId: 0,
+		}
+	}
+};
+var treeNodes = [
+    {"id":1, "pId":0, "name":"test1"},
+    {"id":11, "pId":1, "name":"test11"},
+    {"id":12, "pId":1, "name":"test12"},
+    {"id":111, "pId":11, "name":"test111"}
+];
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.data.simpleData.idKey.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.data.simpleData.idKey.html
new file mode 100644
index 0000000..81129e9
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.data.simpleData.idKey.html
@@ -0,0 +1,32 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">setting.data.simpleData.</span>idKey</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>节点数据中保存唯一标识的属性名称。<span class="highlight_red">[setting.data.simpleData.enable = true 时生效]</span></p>
+			<p>默认值："id"</p>
+		</div>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 使用简单 Array 格式的数据</h4>
+	<pre xmlns=""><code>var setting = {
+	data: {
+		simpleData: {
+			enable: true,
+			idKey: "id",
+			pIdKey: "pId",
+			rootPId: 0,
+		}
+	}
+};
+var treeNodes = [
+    {"id":1, "pId":0, "name":"test1"},
+    {"id":11, "pId":1, "name":"test11"},
+    {"id":12, "pId":1, "name":"test12"},
+    {"id":111, "pId":11, "name":"test111"}
+];
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.data.simpleData.pIdKey.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.data.simpleData.pIdKey.html
new file mode 100644
index 0000000..d434bc3
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.data.simpleData.pIdKey.html
@@ -0,0 +1,32 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">setting.data.simpleData.</span>pIdKey</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>节点数据中保存其父节点唯一标识的属性名称。<span class="highlight_red">[setting.data.simpleData.enable = true 时生效]</span></p>
+			<p>默认值："pId"</p>
+		</div>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 使用简单 Array 格式的数据</h4>
+	<pre xmlns=""><code>var setting = {
+	data: {
+		simpleData: {
+			enable: true,
+			idKey: "id",
+			pIdKey: "pId",
+			rootPId: 0
+		}
+	}
+};
+var treeNodes = [
+    {"id":1, "pId":0, "name":"test1"},
+    {"id":11, "pId":1, "name":"test11"},
+    {"id":12, "pId":1, "name":"test12"},
+    {"id":111, "pId":11, "name":"test111"}
+];
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.data.simpleData.rootPId.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.data.simpleData.rootPId.html
new file mode 100644
index 0000000..8cff82d
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.data.simpleData.rootPId.html
@@ -0,0 +1,32 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String / Number</span><span class="path">setting.data.simpleData.</span>rootPId</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于修正根节点父节点数据，即 pIdKey 指定的属性值。<span class="highlight_red">[setting.data.simpleData.enable = true 时生效]</span></p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 使用简单 Array 格式的数据</h4>
+	<pre xmlns=""><code>var setting = {
+	data: {
+		simpleData: {
+			enable: true,
+			idKey: "id",
+			pIdKey: "pId",
+			rootPId: 0
+		}
+	}
+};
+var treeNodes = [
+    {"id":1, "pId":0, "name":"test1"},
+    {"id":11, "pId":1, "name":"test11"},
+    {"id":12, "pId":1, "name":"test12"},
+    {"id":111, "pId":11, "name":"test111"}
+];
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.edit.drag.autoExpandTrigger.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.edit.drag.autoExpandTrigger.html
new file mode 100644
index 0000000..126b8a8
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.edit.drag.autoExpandTrigger.html
@@ -0,0 +1,28 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.edit.drag.</span>autoExpandTrigger</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>拖拽时父节点自动展开是否触发 onExpand 事件回调函数。<span class="highlight_red">[setting.edit.enable = true 时生效]</span></p>
+			<p>默认值：false</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p> true / false 分别表示 触发 / 不触发 onExpand 事件回调函数。</p>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 设置拖拽时父节点自动展开触发 onExpand 事件回调函数</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true,
+		drag: {
+			autoExpandTrigger: true
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.edit.drag.autoOpenTime.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.edit.drag.autoOpenTime.html
new file mode 100644
index 0000000..df78339
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.edit.drag.autoOpenTime.html
@@ -0,0 +1,25 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Number</span><span class="path">setting.edit.drag.</span>autoOpenTime</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>拖拽时父节点自动展开的延时间隔。 (单位：ms)<span class="highlight_red">[setting.edit.enable = true 时生效]</span></p>
+			<p>默认值：500</p>
+			<p class="highlight_red">请根据自己的需求适当调整此值</p>
+		</div>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 设置拖拽到父节点上立刻自动展开</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true,
+		drag: {
+			autoOpenTime: 0
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.edit.drag.borderMax.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.edit.drag.borderMax.html
new file mode 100644
index 0000000..1d4dd68
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.edit.drag.borderMax.html
@@ -0,0 +1,25 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Number</span><span class="path">setting.edit.drag.</span>borderMax</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>拖拽节点成为根节点时的 Tree 内边界范围 (单位：px)。<span class="highlight_red">[setting.edit.enable = true 时生效]</span></p>
+			<p>默认值：10</p>
+			<p class="highlight_red">请根据自己的需求适当调整此值</p>
+		</div>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 更改拖拽操作节点成为根节点时的 Tree 内边界范围为20px</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true,
+		drag: {
+			borderMax: 20
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.edit.drag.borderMin.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.edit.drag.borderMin.html
new file mode 100644
index 0000000..463eb2b
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.edit.drag.borderMin.html
@@ -0,0 +1,25 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Number</span><span class="path">setting.edit.drag.</span>borderMin</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>拖拽节点成为根节点时的 Tree 外边界范围 (单位：px)。<span class="highlight_red">[setting.edit.enable = true 时生效]</span></p>
+			<p>默认值：-5</p>
+			<p class="highlight_red">请根据自己的需求适当调整此值</p>
+		</div>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 更改拖拽操作节点成为根节点时的 Tree 外边界范围为10px</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true,
+		drag: {
+			borderMin: -10
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.edit.drag.inner.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.edit.drag.inner.html
new file mode 100644
index 0000000..06679e1
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.edit.drag.inner.html
@@ -0,0 +1,59 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean / Function(treeId, treeNodes, targetNode)</span><span class="path">setting.edit.drag.</span>inner</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>拖拽到目标节点时，设置是否允许成为目标节点的子节点。<span class="highlight_red">[setting.edit.enable = true 时生效]</span></p>
+			<p class="highlight_red">拖拽目标是 根 的时候，不触发 prev 和 next，只会触发 inner</p>
+			<p class="highlight_red">此功能主要作用是对拖拽进行适当限制（辅助箭头），需要结合 prev、next 一起使用，才能实现完整功能。</p>
+			<p>默认值：true</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p> true / false 分别表示 允许 / 不允许 成为目标节点的子节点</p>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控（多棵树拖拽时，是目标节点所在树的 treeId）</p>
+	<h4 class="topLine"><b>treeNodes</b><span>Array(JSON)</span></h4>
+	<p>被拖拽的节点 JSON 数据集合</p>
+	<h4 class="topLine"><b>targetNode</b><span>JSON</span></h4>
+	<p>拖拽时的目标节点 JSON 数据对象</p>
+	<p class="highlight_red">如果拖拽的节点要成为根节点，则 targetNode = null</p>
+	<h4 class="topLine"><b>返回值</b><span>Boolean</span></h4>
+	<p>返回值同 Boolean 格式的数据</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 禁止拖拽成为目标节点的子节点</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true,
+		drag: {
+			prev: true,
+			next: true,
+			inner: false
+		}
+	}
+};
+......</code></pre>
+	<h4>2. 禁止拖拽成为根节点的子节点</h4>
+	<pre xmlns=""><code>function canInner(treeId, nodes, targetNode) {
+	return !(targetNode && targetNode.level === 0);
+}
+var setting = {
+	edit: {
+		enable: true,
+		drag: {
+			prev: true,
+			next: true,
+			inner: canInner
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.edit.drag.isCopy.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.edit.drag.isCopy.html
new file mode 100644
index 0000000..f77ead4
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.edit.drag.isCopy.html
@@ -0,0 +1,32 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.edit.drag.</span>isCopy</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>拖拽时, 设置是否允许复制节点。<span class="highlight_red">[setting.edit.enable = true 时生效]</span></p>
+			<p>默认值：true</p>
+		</div>
+	</div>
+	<h3>规则说明</h3>
+	<div class="desc">
+	<p>1、isCopy = true; isMove = true 时，拖拽节点按下 Ctrl 键表示 copy; 否则为 move</p>
+	<p>2、isCopy = true; isMove = false 时，所有拖拽操作都是 copy</p>
+	<p>3、isCopy = false; isMove = true 时，所有拖拽操作都是 move</p>
+	<p>4、isCopy = false; isMove = false 时，禁止拖拽操作</p>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 设置所有拖拽操作都是 copy</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true,
+		drag: {
+			isCopy: true,
+			isMove: false
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.edit.drag.isMove.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.edit.drag.isMove.html
new file mode 100644
index 0000000..d860286
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.edit.drag.isMove.html
@@ -0,0 +1,32 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.edit.drag.</span>isMove</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>拖拽时, 设置是否允许移动节点。<span class="highlight_red">[setting.edit.enable = true 时生效]</span></p>
+			<p>默认值：true</p>
+		</div>
+	</div>
+	<h3>规则说明</h3>
+	<div class="desc">
+	<p>1、isCopy = true; isMove = true 时，拖拽节点按下 Ctrl 键表示 copy; 否则为 move</p>
+	<p>2、isCopy = true; isMove = false 时，所有拖拽操作都是 copy</p>
+	<p>3、isCopy = false; isMove = true 时，所有拖拽操作都是 move</p>
+	<p>4、isCopy = false; isMove = false 时，禁止拖拽操作</p>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 设置所有拖拽操作都是 move</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true,
+		drag: {
+			isCopy: false,
+			isMove: true
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.edit.drag.maxShowNodeNum.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.edit.drag.maxShowNodeNum.html
new file mode 100644
index 0000000..3e7a3d2
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.edit.drag.maxShowNodeNum.html
@@ -0,0 +1,25 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Number</span><span class="path">setting.edit.drag.</span>maxShowNodeNum</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>拖拽多个兄弟节点时，浮动图层中显示的最大节点数。 多余的节点用...代替。<span class="highlight_red">[setting.edit.enable = true 时生效]</span></p>
+			<p>默认值：5</p>
+			<p class="highlight_red">请根据自己的需求适当调整此值</p>
+		</div>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 设置拖拽时最多可显示10个节点</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true,
+		drag: {
+			maxShowNodeNum: 10
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.edit.drag.minMoveSize.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.edit.drag.minMoveSize.html
new file mode 100644
index 0000000..904be41
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.edit.drag.minMoveSize.html
@@ -0,0 +1,25 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Number</span><span class="path">setting.edit.drag.</span>minMoveSize</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>判定是否拖拽操作的最小位移值 (单位：px)。<span class="highlight_red">[setting.edit.enable = true 时生效]</span></p>
+			<p class="highlight_red">根据自己的需求可适当调整此值，如果太小容易导致点击鼠标时误操作进行拖拽</p>
+			<p>默认值：5</p>
+		</div>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 更改拖拽操作启动位移值为10px</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true,
+		drag: {
+			minMoveSize: 10
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.edit.drag.next.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.edit.drag.next.html
new file mode 100644
index 0000000..ffc874a
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.edit.drag.next.html
@@ -0,0 +1,58 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean / Function(treeId, treeNodes, targetNode)</span><span class="path">setting.edit.drag.</span>next</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>拖拽到目标节点时，设置是否允许移动到目标节点后面的操作。<span class="highlight_red">[setting.edit.enable = true 时生效]</span></p>
+			<p class="highlight_red">拖拽目标是 根 的时候，不触发 prev 和 next，只会触发 inner</p>
+			<p class="highlight_red">此功能主要作用是对拖拽进行适当限制（辅助箭头），需要结合 prev、inner 一起使用，才能实现完整功能。</p>
+			<p>默认值：true</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p> true / false 分别表示 允许 / 不允许 移动到目标节点后面</p>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控（多棵树拖拽时，是目标节点所在树的 treeId）</p>
+	<h4 class="topLine"><b>treeNodes</b><span>Array(JSON)</span></h4>
+	<p>被拖拽的节点 JSON 数据集合</p>
+	<h4 class="topLine"><b>targetNode</b><span>JSON</span></h4>
+	<p>拖拽时的目标节点 JSON 数据对象</p>
+	<h4 class="topLine"><b>返回值</b><span>Boolean</span></h4>
+	<p>返回值同 Boolean 格式的数据</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 禁止拖拽到节点后面的操作</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true,
+		drag: {
+			prev: true,
+			next: false,
+			inner: true
+		}
+	}
+};
+......</code></pre>
+	<h4>2. 禁止拖拽到父节点后面的操作</h4>
+	<pre xmlns=""><code>function canNext(treeId, nodes, targetNode) {
+	return !targetNode.isParent;
+}
+var setting = {
+	edit: {
+		enable: true,
+		drag: {
+			prev: true,
+			next: canNext,
+			inner: true
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.edit.drag.prev.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.edit.drag.prev.html
new file mode 100644
index 0000000..bd05361
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.edit.drag.prev.html
@@ -0,0 +1,58 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean / Function(treeId, treeNodes, targetNode)</span><span class="path">setting.edit.drag.</span>prev</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>拖拽到目标节点时，设置是否允许移动到目标节点前面的操作。<span class="highlight_red">[setting.edit.enable = true 时生效]</span></p>
+			<p class="highlight_red">拖拽目标是 根 的时候，不触发 prev 和 next，只会触发 inner</p>
+			<p class="highlight_red">此功能主要作用是对拖拽进行适当限制（辅助箭头），需要结合 next、inner 一起使用，才能实现完整功能。</p>
+			<p>默认值：true</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p> true / false 分别表示 允许 / 不允许 移动到目标节点前面</p>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控（多棵树拖拽时，是目标节点所在树的 treeId）</p>
+	<h4 class="topLine"><b>treeNodes</b><span>Array(JSON)</span></h4>
+	<p>被拖拽的节点 JSON 数据集合</p>
+	<h4 class="topLine"><b>targetNode</b><span>JSON</span></h4>
+	<p>拖拽时的目标节点 JSON 数据对象</p>
+	<h4 class="topLine"><b>返回值</b><span>Boolean</span></h4>
+	<p>返回值同 Boolean 格式的数据</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 禁止拖拽到节点前面的操作</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true,
+		drag: {
+			prev: false,
+			next: true,
+			inner: true
+		}
+	}
+};
+......</code></pre>
+	<h4>2. 禁止拖拽到父节点前面的操作</h4>
+	<pre xmlns=""><code>function canPrev(treeId, nodes, targetNode) {
+	return !targetNode.isParent;
+}
+var setting = {
+	edit: {
+		enable: true,
+		drag: {
+			prev: canPrev,
+			next: true,
+			inner: true
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.edit.editNameSelectAll.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.edit.editNameSelectAll.html
new file mode 100644
index 0000000..30784f3
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.edit.editNameSelectAll.html
@@ -0,0 +1,27 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.edit.</span>editNameSelectAll</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>节点编辑名称 input 初次显示时,设置 txt 内容是否为全选状态。 <span class="highlight_red">[setting.edit.enable = true 时生效]</span></p>
+			<p>默认值: false</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p> true 表示 全选状态</p>
+	<p> false 表示 不是全选状态，光标默认在最后</p>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 设置节点编辑名称 input 初次显示时，txt内容为全选状态</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true,
+		editNameSelectAll: true
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.edit.enable.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.edit.enable.html
new file mode 100644
index 0000000..de1afea
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.edit.enable.html
@@ -0,0 +1,38 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.edit.</span>enable</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>设置 zTree 是否处于编辑状态</p>
+			<p class="highlight_red">请在初始化之前设置，初始化后需要改变编辑状态请使用 zTreeObj.setEditable() 方法</p>
+			<p>默认值: false</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p> true / false 分别表示 可以 / 不可以 编辑</p>
+	</div>
+	<h3>编辑状态规则说明</h3>
+	<div class="desc">
+	<p>1、点击节点时，不会打开 <span class="highlight_red">node.url</span> 指定的 URL。
+<br/>2、全面支持 编辑 与 异步加载 状态共存。
+<br/>3、可以对节点进行拖拽，且支持多棵树之间进行拖拽。
+<br/>4、支持拖拽时 复制/移动 节点。（参考: <span class="highlight_red">setting.edit.drag.isCopy / setting.edit.drag.isMove</span>）
+<br/>5、可以通过编辑按钮修改 name 属性。
+<br/>6、可以通过删除按钮删除节点。
+<br/>
+</p>
+	<p class="highlight_red">请注意大小写，不要改变</p>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 设置 zTree 进入编辑状态</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.edit.removeTitle.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.edit.removeTitle.html
new file mode 100644
index 0000000..55257da
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.edit.removeTitle.html
@@ -0,0 +1,48 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String / Function(treeId, treeNode)</span><span class="path">setting.edit.</span>removeTitle</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>删除按钮的 Title 辅助信息。<span class="highlight_red">[setting.edit.enable = true & setting.edit.showRemoveBtn = true 时生效]</span></p>
+			<p>默认值："remove"</p>
+		</div>
+	</div>
+	<h3>String 格式说明</h3>
+	<div class="desc">
+	<p>鼠标移动到 删除按钮 上时，浏览器自动弹出的辅助信息内容，可根据用户需要自行修改</p>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>需要设置删除按钮 Title 信息的节点 JSON 数据对象</p>
+	<h4 class="topLine"><b>返回值</b><span>String</span></h4>
+	<p>返回值同 String 格式的数据</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 设置删除按钮的 Title 辅助信息为: "删除节点"</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true,
+		showRemoveBtn: true,
+		removeTitle: "删除节点"
+	}
+};
+......</code></pre>
+	<h4>2. 设置父节点删除按钮的 Title 辅助信息为: "删除父节点"</h4>
+	<pre xmlns=""><code>function setRemoveTitle(treeId, treeNode) {
+	return treeNode.isParent ? "删除父节点":"删除叶子节点";
+}
+var setting = {
+	edit: {
+		enable: true,
+		showRemoveBtn: true,
+		removeTitle: setRemoveTitle
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.edit.renameTitle.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.edit.renameTitle.html
new file mode 100644
index 0000000..2dfbcca
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.edit.renameTitle.html
@@ -0,0 +1,48 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String / Function(treeId, treeNode)</span><span class="path">setting.edit.</span>renameTitle</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>编辑名称按钮的 Title 辅助信息。<span class="highlight_red">[setting.edit.enable = true & setting.edit.showRenameBtn = true 时生效]</span></p>
+			<p>默认值："rename"</p>
+		</div>
+	</div>
+	<h3>String 格式说明</h3>
+	<div class="desc">
+	<p>设置鼠标移动到 编辑名称按钮 上时，浏览器自动弹出的辅助信息内容，可根据用户需要自行修改</p>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>需要设置编辑名称按钮 Title 信息的节点 JSON 数据对象</p>
+	<h4 class="topLine"><b>返回值</b><span>String</span></h4>
+	<p>返回值同 String 格式的数据</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 设置编辑名称按钮的 Title 辅助信息为: "编辑节点名称"</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true,
+		showRenameBtn: true,
+		renameTitle: "编辑节点名称"
+	}
+};
+......</code></pre>
+	<h4>2. 设置父节点编辑名称按钮的 Title 辅助信息为: "编辑父节点名称"</h4>
+	<pre xmlns=""><code>function setRenameTitle(treeId, treeNode) {
+	return treeNode.isParent ? "编辑父节点名称":"编辑叶子节点名称";
+}
+var setting = {
+	edit: {
+		enable: true,
+		showRenameBtn: true,
+		renameTitle: setRenameTitle
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.edit.showRemoveBtn.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.edit.showRemoveBtn.html
new file mode 100644
index 0000000..db62053
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.edit.showRemoveBtn.html
@@ -0,0 +1,49 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean / Function(treeId, treeNode)</span><span class="path">setting.edit.</span>showRemoveBtn</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>设置是否显示删除按钮。<span class="highlight_red">[setting.edit.enable = true 时生效]</span></p>
+			<p>当点击某节点的删除按钮时：</p>
+			<p>1、首先触发 <span class="highlight_red">setting.callback.beforeRemove</span> 回调函数，用户可判定是否进行删除操作。</p>
+			<p>2、如果未设置 beforeRemove 或 beforeRemove 返回 true，则删除节点并触发 <span class="highlight_red">setting.callback.onRemove</span> 回调函数。</p>
+			<p>默认值：true</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p> true / false 分别表示 显示 / 隐藏 删除按钮</p>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>需要设置是否显示删除按钮的节点 JSON 数据对象</p>
+	<h4 class="topLine"><b>返回值</b><span>Boolean</span></h4>
+	<p>返回值同 Boolean 格式的数据</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 不显示删除按钮</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true,
+		showRemoveBtn: false
+	}
+};
+......</code></pre>
+	<h4>2. 设置所有的父节点不显示删除按钮</h4>
+	<pre xmlns=""><code>function setRemoveBtn(treeId, treeNode) {
+	return !treeNode.isParent;
+}
+var setting = {
+	edit: {
+		enable: true,
+		showRemoveBtn: setRemoveBtn
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.edit.showRenameBtn.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.edit.showRenameBtn.html
new file mode 100644
index 0000000..33dd37a
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.edit.showRenameBtn.html
@@ -0,0 +1,51 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean / Function(treeId, treeNode)</span><span class="path">setting.edit.</span>showRenameBtn</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>设置是否显示编辑名称按钮。<span class="highlight_red">[setting.edit.enable = true 时生效]</span></p>
+			<p>当点击某节点的编辑名称按钮时：</p>
+			<p>1、进入节点编辑名称状态。</p>
+			<p>2、编辑名称完毕（Input 失去焦点 或 按下 Enter 键），会触发 <span class="highlight_red">setting.callback.beforeRename</span> 回调函数，用户可根据自己的规则判定是否允许修改名称。</p>
+			<p>3、如果 beforeRename 返回 false，则继续保持编辑名称状态，直到名称符合规则位置 （按下 ESC 键可取消编辑名称状态，恢复原名称）。</p>
+			<p>4、如果未设置 beforeRename 或 beforeRename 返回 true，则结束节点编辑名称状态，更新节点名称，并触发 <span class="highlight_red">setting.callback.onRename</span> 回调函数。</p>
+			<p>默认值：true</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p> true / false 分别表示 显示 / 隐藏 编辑名称按钮</p>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>需要设置是否显示编辑名称按钮的节点 JSON 数据对象</p>
+	<h4 class="topLine"><b>返回值</b><span>Boolean</span></h4>
+	<p>返回值同 Boolean 格式的数据</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 不显示编辑名称按钮</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true,
+		showRenameBtn: false
+	}
+};
+......</code></pre>
+	<h4>2. 设置所有的父节点不显示编辑名称按钮</h4>
+	<pre xmlns=""><code>function setRenameBtn(treeId, treeNode) {
+	return !treeNode.isParent;
+}
+var setting = {
+	edit: {
+		enable: true,
+		showRenameBtn: setRenameBtn
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.treeId.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.treeId.html
new file mode 100644
index 0000000..819743e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.treeId.html
@@ -0,0 +1,14 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">setting.</span>treeId</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>zTree 的唯一标识，初始化后，等于 用户定义的 zTree 容器的 id 属性值。</p>
+			<p class="highlight_red">请勿进行初始化 或 修改，属于内部参数。</p>
+		</div>
+	</div>
+
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.treeObj.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.treeObj.html
new file mode 100644
index 0000000..37684a1
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.treeObj.html
@@ -0,0 +1,14 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Object</span><span class="path">setting.</span>treeObj</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>zTree 容器的 jQuery 对象，主要功能：便于操作。</p>
+			<p class="highlight_red">请勿进行初始化 或 修改，属于内部参数。</p>
+		</div>
+	</div>
+
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.view.addDiyDom.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.view.addDiyDom.html
new file mode 100644
index 0000000..0a508ac
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.view.addDiyDom.html
@@ -0,0 +1,40 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNode)</span><span class="path">setting.view.</span>addDiyDom</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于在节点上固定显示用户自定义控件</p>
+			<p class="highlight_red">1. 大数据量的节点加载请注意：在 addDiyDom 中针对每个节点 查找 DOM 对象并且添加新 DOM 控件，肯定会影响初始化性能；如果不是必须使用，建议不使用此功能</p>
+			<p class="highlight_red">2. 属于高级应用，使用时请确保对 zTree 比较了解。</p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>需要显示自定义控件的节点 JSON 数据对象</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 设置节点后面显示一个按钮</h4>
+	<pre xmlns=""><code>var setting = {
+	view: {
+		addDiyDom: addDiyDom
+	}
+};
+function addDiyDom(treeId, treeNode) {
+	var aObj = $("#" + treeNode.tId + "_a");
+	if ($("#diyBtn_"+treeNode.id).length>0) return;
+	var editStr = "&lt;span id='diyBtn_space_" +treeNode.id+ "' &gt; &lt;/span&gt;"
+		+ "&lt;button type='button' class='diyBtn1' id='diyBtn_" + treeNode.id
+		+ "' title='"+treeNode.name+"' onfocus='this.blur();'&gt;&lt;/button&gt;";
+	aObj.append(editStr);
+	var btn = $("#diyBtn_"+treeNode.id);
+	if (btn) btn.bind("click", function(){alert("diy Button for " + treeNode.name);});
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.view.addHoverDom.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.view.addHoverDom.html
new file mode 100644
index 0000000..f073e79
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.view.addHoverDom.html
@@ -0,0 +1,45 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNode)</span><span class="path">setting.view.</span>addHoverDom</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于当鼠标移动到节点上时，显示用户自定义控件，显示隐藏状态同 zTree 内部的编辑、删除按钮</p>
+			<p class="highlight_red">请务必与 <span class="highlight_red">setting.view.removeHoverDom</span> 同时使用；属于高级应用，使用时请确保对 zTree 比较了解。</p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>需要显示自定义控件的节点 JSON 数据对象</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 设置鼠标移到节点上，在后面显示一个按钮</h4>
+	<pre xmlns=""><code>var setting = {
+	view: {
+		addHoverDom: addHoverDom,
+		removeHoverDom: removeHoverDom,
+		......
+	}
+};
+function addHoverDom(treeId, treeNode) {
+	var aObj = $("#" + treeNode.tId + "_a");
+	if ($("#diyBtn_"+treeNode.id).length>0) return;
+	var editStr = "&lt;span id='diyBtn_space_" +treeNode.id+ "' &gt;&nbsp;&lt;/span&gt;"
+		+ "&lt;button type='button' class='diyBtn1' id='diyBtn_" + treeNode.id
+		+ "' title='"+treeNode.name+"' onfocus='this.blur();'&gt;&lt;/button&gt;";
+	aObj.append(editStr);
+	var btn = $("#diyBtn_"+treeNode.id);
+	if (btn) btn.bind("click", function(){alert("diy Button for " + treeNode.name);});
+};
+function removeHoverDom(treeId, treeNode) {
+	$("#diyBtn_"+treeNode.id).unbind().remove();
+	$("#diyBtn_space_" +treeNode.id).unbind().remove();
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.view.autoCancelSelected.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.view.autoCancelSelected.html
new file mode 100644
index 0000000..aff1078
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.view.autoCancelSelected.html
@@ -0,0 +1,26 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.view.</span>autoCancelSelected</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>点击节点时，按下 Ctrl 键是否允许取消选择操作。</p>
+			<p class="highlight_red">如果不需要此功能，请设置为 false。</p>
+			<p>默认值: true</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p> true / false 分别表示 支持 / 不支持 配合 Ctrl 键进行取消节点选择的操作</p>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 禁止配合 Ctrl 键进行取消节点选择的操作</h4>
+	<pre xmlns=""><code>var setting = {
+	view: {
+		autoCancelSelected: false
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.view.dblClickExpand.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.view.dblClickExpand.html
new file mode 100644
index 0000000..5f3db96
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.view.dblClickExpand.html
@@ -0,0 +1,44 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean / Function(treeId, treeNode)</span><span class="path">setting.view.</span>dblClickExpand</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>双击节点时，是否自动展开父节点的标识</p>
+			<p>默认值: true</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p> true / false 分别表示双击节点 切换 / 不切换 展开状态</p>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>需要设置是否双击切换展开状态的节点 JSON 数据对象</p>
+	<h4 class="topLine"><b>返回值</b><span>Boolean</span></h4>
+	<p>返回值同 Boolean 格式的数据</p>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 取消默认双击展开父节点的功能</h4>
+	<pre xmlns=""><code>var setting = {
+	view: {
+		dblClickExpand: false
+	}
+};
+......</code></pre>
+	<h4>2. 设置 zTree 仅仅 level=0 的父节点取消双击展开的功能</h4>
+	<pre xmlns=""><code>function dblClickExpand(treeId, treeNode) {
+	return treeNode.level > 0;
+};
+var setting = {
+	view: {
+		dblClickExpand: dblClickExpand
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.view.expandSpeed.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.view.expandSpeed.html
new file mode 100644
index 0000000..3b799c3
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.view.expandSpeed.html
@@ -0,0 +1,31 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String / Number</span><span class="path">setting.view.</span>expandSpeed</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>zTree 节点展开、折叠时的动画速度，设置方法同 JQuery 动画效果中 speed 参数。</p>
+			<p class="highlight_red">IE6 下会自动关闭动画效果，以保证 zTree 的操作速度</p>
+			<p>默认值："fast"</p>
+		</div>
+	</div>
+	<h3>String 格式说明</h3>
+	<div class="desc">
+	<p>三种预定速度之一的字符串("slow", "normal", or "fast")</p>
+	<p class="highlight_red">设置为 "" 时，不显示动画效果</p>
+	</div>
+	<h3>Number 格式说明</h3>
+	<div class="desc">
+	<p>表示动画时长的毫秒数值 (如：1000)</p>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 设置为慢速显示动画效果</h4>
+	<pre xmlns=""><code>var setting = {
+	view: {
+		expandSpeed: "slow"
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.view.fontCss.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.view.fontCss.html
new file mode 100644
index 0000000..54efb1b
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.view.fontCss.html
@@ -0,0 +1,42 @@
+<div class="apiDetail">
+<div>
+	<h2><span>JSON / Function(treeId, treeNode)</span><span class="path">setting.view.</span>fontCss</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>个性化文字样式，只针对 zTree 在节点上显示的&lt;A&gt;对象。</p>
+			<p>默认值：{}</p>
+		</div>
+	</div>
+	<h3>JSON 格式说明</h3>
+	<div class="desc">
+	<p>JSON 格式为 JQuery css方法中的 JSON 对象格式，例如：<span class="highlight_red">{color:"#ff0011", background:"blue"}</span></p>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>需要设置自定义样式的节点 JSON 数据对象</p>
+	<h4 class="topLine"><b>返回值</b><span>JSON</span></h4>
+	<p>返回值同 JSON 格式的数据，例如：<span class="highlight_red">{color:"#ff0011", background:"blue"}</span></p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 不修改CSS，设置全部节点 name 显示为红色</h4>
+	<pre xmlns=""><code>var setting = {
+	view: {
+		fontCss : {color:"red"}
+	}
+};</code></pre>
+	<h4>2. 设置 level=0 的节点 name 显示为红色</h4>
+	<pre xmlns=""><code>function setFontCss(treeId, treeNode) {
+	return treeNode.level == 0 ? {color:"red"} : {};
+};
+var setting = {
+	view: {
+		fontCss: setFontCss
+	}
+};</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.view.nameIsHTML.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.view.nameIsHTML.html
new file mode 100644
index 0000000..a1d916c
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.view.nameIsHTML.html
@@ -0,0 +1,27 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.view.</span>nameIsHTML</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>设置 name 属性是否支持 HTML 脚本</p>
+			<p class="highlight_red">如果允许 HTML 脚本，请根据自己的需求做校验，避免出现 js 注入等安全问题。</p>
+			<p>默认值: false</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p> true / false 分别表示 支持 / 不支持 HTML 脚本</p>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 设置 name 属性支持 HTML 脚本</h4>
+	<pre xmlns=""><code>var setting = {
+	view: {
+		nameIsHTML: true
+	}
+};
+var node = {"name":"&lt;font color='red'&gt;test&lt;/font&gt;"};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.view.removeHoverDom.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.view.removeHoverDom.html
new file mode 100644
index 0000000..bb1a9aa
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.view.removeHoverDom.html
@@ -0,0 +1,45 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNode)</span><span class="path">setting.view.</span>removeHoverDom</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于当鼠标移出节点时，隐藏用户自定义控件，显示隐藏状态同 zTree 内部的编辑、删除按钮</p>
+			<p class="highlight_red">请务必与 <span class="highlight_red">addHoverDom</span> 同时使用；属于高级应用，使用时请确保对 zTree 比较了解。</p>
+			<p>默认值：null</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4><b>treeNode</b><span>JSON</span></h4>
+	<p>需要隐藏自定义控件的节点 JSON 数据对象</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 设置鼠标移到节点上，在后面显示一个按钮</h4>
+	<pre xmlns=""><code>var setting = {
+	view: {
+		addHoverDom: addHoverDom,
+		removeHoverDom: removeHoverDom,
+		......
+	}
+};
+function addHoverDom(treeId, treeNode) {
+	var aObj = $("#" + treeNode.tId + "_a");
+	if ($("#diyBtn_"+treeNode.id).length>0) return;
+	var editStr = "&lt;span id='diyBtn_space_" +treeNode.id+ "' &gt;&nbsp;&lt;/span&gt;"
+		+ "&lt;button type='button' class='diyBtn1' id='diyBtn_" + treeNode.id
+		+ "' title='"+treeNode.name+"' onfocus='this.blur();'&gt;&lt;/button&gt;";
+	aObj.append(editStr);
+	var btn = $("#diyBtn_"+treeNode.id);
+	if (btn) btn.bind("click", function(){alert("diy Button for " + treeNode.name);});
+};
+function removeHoverDom(treeId, treeNode) {
+	$("#diyBtn_"+treeNode.id).unbind().remove();
+	$("#diyBtn_space_" +treeNode.id).unbind().remove();
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.view.selectedMulti.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.view.selectedMulti.html
new file mode 100644
index 0000000..d73820d
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.view.selectedMulti.html
@@ -0,0 +1,27 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.view.</span>selectedMulti</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>设置是否允许同时选中多个节点。</p>
+			<p>默认值: true</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p> true / false 分别表示 支持 / 不支持 同时选中多个节点</p>
+	<p class="highlight_red">1、设置为 true时，按下 Ctrl 键可以选中多个节点</p>
+	<p class="highlight_red">2、设置为 true / false 都不影响按下 Ctrl 键可以让已选中的节点取消选中状态（ 取消选中状态可以参考 setting.view.autoCancelSelected ）</p>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 禁止多点同时选中的功能</h4>
+	<pre xmlns=""><code>var setting = {
+	view: {
+		selectedMulti: false
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.view.showIcon.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.view.showIcon.html
new file mode 100644
index 0000000..ebe423c
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.view.showIcon.html
@@ -0,0 +1,44 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean / Function(treeId, treeNode)</span><span class="path">setting.view.</span>showIcon</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>设置 zTree 是否显示节点的图标。</p>
+			<p>默认值：true</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p> true / false 分别表示 显示 / 隐藏 图标</p>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>需要设置是否显示图标的节点 JSON 数据对象</p>
+	<h4 class="topLine"><b>返回值</b><span>Boolean</span></h4>
+	<p>返回值同 Boolean 格式的数据</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 设置 zTree 不显示图标</h4>
+	<pre xmlns=""><code>var setting = {
+	view: {
+		showIcon: false
+	}
+};
+......</code></pre>
+	<h4>2. 设置 zTree 仅仅 level=2 的节点不显示图标</h4>
+	<pre xmlns=""><code>function showIconForTree(treeId, treeNode) {
+	return treeNode.level != 2;
+};
+var setting = {
+	view: {
+		showIcon: showIconForTree
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.view.showLine.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.view.showLine.html
new file mode 100644
index 0000000..02ab5eb
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.view.showLine.html
@@ -0,0 +1,25 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.view.</span>showLine</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>设置 zTree 是否显示节点之间的连线。</p>
+			<p>默认值：true</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p> true / false 分别表示 显示 / 不显示 连线</p>
+	</div>
+	<h3>setting 举例</h3>
+	<h4>1. 设置 zTree 不显示节点之间的连线</h4>
+	<pre xmlns=""><code>var setting = {
+	view: {
+		showLine: false
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.view.showTitle.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.view.showTitle.html
new file mode 100644
index 0000000..5bcb860
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.view.showTitle.html
@@ -0,0 +1,46 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean / Function(treeId, treeNode)</span><span class="path">setting.view.</span>showTitle</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>设置 zTree 是否显示节点的 title 提示信息(即节点 DOM 的 title 属性)。</p>
+			<p class="highlight_red">请务必与 <span class="highlight_red">setting.data.key.title</span> 同时使用。</p>
+			<p>默认值：true</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p> true / false 分别表示 显示 / 隐藏 提示信息</p>
+	<p class="highlight_red">如果 setting.view.showTitle = true & setting.data.key.title = ''，zTree 会自动使用 setting.data.key.name 指定的节点名称当做 title</p>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>对应 zTree 的 <b class="highlight_red">treeId</b>，便于用户操控</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>需要设置是否显示提示信息的节点 JSON 数据对象</p>
+	<h4 class="topLine"><b>返回值</b><span>Boolean</span></h4>
+	<p>返回值同 Boolean 格式的数据</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 设置 zTree 不显示提示信息</h4>
+	<pre xmlns=""><code>var setting = {
+	view: {
+		showTitle: false
+	}
+};
+......</code></pre>
+	<h4>2. 设置 zTree 仅仅 level=2 的节点不显示提示信息</h4>
+	<pre xmlns=""><code>function showTitleForTree(treeId, treeNode) {
+	return treeNode.level != 2;
+};
+var setting = {
+	view: {
+		showTitle: showTitleForTree
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.view.txtSelectedEnable.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.view.txtSelectedEnable.html
new file mode 100644
index 0000000..c22a8c0
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/setting.view.txtSelectedEnable.html
@@ -0,0 +1,25 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.view.</span>txtSelectedEnable</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>设置 zTree 是否允许可以选择 zTree DOM 内的文本。</p>
+			<p>默认值：false</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p> true / false 分别表示 允许 / 不允许 选择 zTree Dom 内的文本</p>
+	</div>
+	<h3>setting & function 举例</h3>
+	<h4>1. 设置 zTree 允许选择文本</h4>
+	<pre xmlns=""><code>var setting = {
+	view: {
+		txtSelectedEnable: true
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.check_Child_State.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.check_Child_State.html
new file mode 100644
index 0000000..fa37899
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.check_Child_State.html
@@ -0,0 +1,43 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Number</span><span class="path">treeNode.</span>check_Child_State</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.excheck</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于设置节点的子节点的 checkBox / radio 的半选状态。<span class="highlight_red">[setting.check.enable = true 时有效]</span></p>
+			<p class="highlight_red">v3.x 针对节点数据对象提供 treeNode.getCheckStatus() 方法获取标准的半选状态</p>
+			<p class="highlight_red">zTree 内部使用，请勿进行初始化 或 随意修改</p>
+			<p>默认值：true</p>
+		</div>
+	</div>
+	<h3>Number 格式说明</h3>
+	<div class="desc">
+	<p>规则如下：</p>
+	<table width="100%" border="0" cellspacing="1" cellpadding="0">
+		<thead>
+			<tr><td colspan="4">setting.check.checkType = "checkbox"</td></tr>
+			<tr><td>treeNode.check_Child_State</td><td>勾选状态说明</td></tr>
+		</thead>
+		<tbody>
+			<tr><td>-1</td><td>不存在子节点 或 子节点全部设置为 nocheck = true</td></tr>
+			<tr><td>0</td><td>无 子节点被勾选</td></tr>
+			<tr><td>1</td><td>部分 子节点被勾选</td></tr>
+			<tr><td>2</td><td>全部 子节点被勾选</td></tr>
+		</tbody>
+	</table>
+	<br/>
+	<table width="100%" border="0" cellspacing="1" cellpadding="0">
+		<thead>
+			<tr><td colspan="4">setting.check.checkType = "radio"</td></tr>
+			<tr><td>treeNode.check_Child_State</td><td>勾选状态说明</td></tr>
+		</thead>
+		<tbody>
+			<tr><td>-1</td><td>不存在子节点 或 子节点全部设置为 nocheck = true</td></tr>
+			<tr><td>0</td><td>无 子节点被勾选</td></tr>
+			<tr><td>2</td><td>有 子节点被勾选</td></tr>
+		</tbody>
+	</table>
+	</div>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.check_Focus.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.check_Focus.html
new file mode 100644
index 0000000..785aec9
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.check_Focus.html
@@ -0,0 +1,19 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">treeNode.</span>check_Focus</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.excheck</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于设置节点的 checkBox / radio 的 focus 状态。<span class="highlight_red">[setting.check.enable = true 时有效]</span></p>
+			<p class="highlight_red">zTree 内部使用，请勿进行初始化 或 随意修改</p>
+			<p>默认值：false</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p>true 表示当前鼠标移动到输入框内</p>
+	<p>false 表示当前鼠标移动到输入框外</p>
+	</div>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.checked.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.checked.html
new file mode 100644
index 0000000..049d6ba
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.checked.html
@@ -0,0 +1,32 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">treeNode.</span>checked</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.excheck</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>节点的 checkBox / radio 的 勾选状态。<span class="highlight_red">[setting.check.enable = true & treeNode.nocheck = false 时有效]</span></p>
+			<p class="highlight_red">1、如果不使用 checked 属性设置勾选状态，请修改 setting.data.key.checked </p>
+			<p class="highlight_red">2、建立 treeNode 数据时设置 treeNode.checked = true 可以让节点的输入框默认为勾选状态</p>
+			<p class="highlight_red">3、修改节点勾选状态，可以使用 treeObj.checkNode / checkAllNodes / updateNode 方法，具体使用哪种请根据自己的需求而定</p>
+			<p class="highlight_red">4、为了解决部分朋友生成 json 数据出现的兼容问题, 支持 "false","true" 字符串格式的数据</p>
+			<p>默认值：false</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p>true 表示节点的输入框被勾选</p>
+	<p>false 表示节点的输入框未勾选</p>
+	</div>
+	<h3>treeNode 举例</h3>
+	<h4>1. 初始化的数据设置 默认为勾选状态</h4>
+	<pre xmlns=""><code>var nodes = [
+{ "id":1, "name":"test1", checked:true },
+{ "id":2, "name":"test2", checked:true }
+]</code></pre>
+	<h4>2. 获取第一个根节点的勾选状态</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var checked = treeObj.getNodes()[0].checked;
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.checkedOld.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.checkedOld.html
new file mode 100644
index 0000000..cab717e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.checkedOld.html
@@ -0,0 +1,25 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">treeNode.</span>checkedOld</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.excheck</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>节点的 checkBox / radio 在初始化时的 勾选状态。<span class="highlight_red">[setting.check.enable = true & treeNode.nocheck = false 时有效]</span></p>
+			<p class="highlight_red">1、zTree 初始化节点数据时会对此属性进行赋值，因此请勿对此属性初始化</p>
+			<p class="highlight_red">2、如需配合 zTreeObj.getChangeCheckedNodes 方法实现特殊功能，可以根据需求在使用中自行修改 checkedOld 数据</p>
+			<p>默认值：checked的初始化值</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p>true 表示节点初始化时 输入框被勾选</p>
+	<p>false 表示节点初始化时 输入框未勾选</p>
+	</div>
+	<h3>treeNode 举例</h3>
+	<h4>1. 获取第一个根节点的初始勾选状态</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var checkedOld = treeObj.getNodes()[0].checkedOld;
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.children.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.children.html
new file mode 100644
index 0000000..4bab835
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.children.html
@@ -0,0 +1,35 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Array(JSON)</span><span class="path">treeNode.</span>children</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>节点的子节点数据集合。</p>
+			<p class="highlight_red">1、如果不使用 children 属性保存子节点数据，请修改 setting.data.key.children </p>
+			<p class="highlight_red">2、异步加载时，对于设置了 isParent = true 的节点，在展开时将进行异步加载</p>
+			<p>默认值：无</p>
+		</div>
+	</div>
+	<h3>Array(JSON) 格式说明</h3>
+	<div class="desc">
+	<p>标准的 JSON 数据对象</p>
+	</div>
+	<h3>treeNode 举例</h3>
+	<h4>1. 初始化的标准嵌套格式的 JSON 数据对象</h4>
+	<pre xmlns=""><code>var nodes = [
+{ "id":1, "name":"test1",
+	children: [
+	{ "id":3, "name":"test3"},
+	{ "id":4, "name":"test4"},
+	{ "id":5, "name":"test5"}
+	]
+},
+{ "id":2, "name":"test2"  }
+]</code></pre>
+	<h4>2. 获取第一个根节点的子节点</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getNodes()[0].children;
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.chkDisabled.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.chkDisabled.html
new file mode 100644
index 0000000..e6bb032
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.chkDisabled.html
@@ -0,0 +1,28 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">treeNode.</span>chkDisabled</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.excheck</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>1、设置节点的 checkbox / radio 是否禁用 <span class="highlight_red">[setting.check.enable = true 时有效]</span></p>
+			<p class="highlight_red">2、为了解决部分朋友生成 json 数据出现的兼容问题, 支持 "false","true" 字符串格式的数据</p>
+			<p class="highlight_red">3、请勿对已加载的节点修改此属性，禁止 或 取消禁止 请使用 setChkDisabled() 方法</p>
+			<p class="highlight_red">4、初始化时，如果需要子孙节点继承父节点的 chkDisabled 属性，请设置 setting.check.chkDisabledInherit 属性</p>
+			<p>默认值：false</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p class="highlight_red">true 表示此节点的 checkbox / radio 被禁用。</p>
+	<p class="highlight_red">false 表示此节点的 checkbox / radio 可以使用。</p>
+	</div>
+	<h3>treeNode 举例</h3>
+	<h4>1. 禁用节点 checkbox / radio </h4>
+	<pre xmlns=""><code>var nodes = [
+	{ "id":1, "name":"test1", "checked":true, "chkDisabled":true},
+	{ "id":2, "name":"test2", "chkDisabled":true},
+	{ "id":3, "name":"test3"}
+]</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.click.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.click.html
new file mode 100644
index 0000000..833c678
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.click.html
@@ -0,0 +1,24 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">treeNode.</span>click</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>最简单的 click 事件操作。相当于 onclick="..." 的内容。 如果操作较复杂，请使用 onClick 事件回调函数。</p>
+			<p class="highlight_red">由于 IE 对于 onclick 和 click事件共存时的处理与其他浏览器不同，所以请不要利用此参数控制是否允许跳转的操作（例如：treeNode.click = "return false;"）。如有类似需求，请不要使用 url 属性设置网址，同时利用 onClick 回调函数控制跳转。</p>
+			<p>默认值：无</p>
+		</div>
+	</div>
+	<h3>String 格式说明</h3>
+	<div class="desc">
+	<p>标准 javascript 语法， 例如：alert("test"); 等</p>
+	</div>
+	<h3>treeNode 举例</h3>
+	<h4>1. 设置某节点点击时，弹出信息框</h4>
+	<pre xmlns=""><code>var nodes = [
+	{ "id":1, "name":"Google CN", "url":"http://g.cn", "click":"alert('test');"},
+	......
+]</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.diy.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.diy.html
new file mode 100644
index 0000000..b2fb0d9
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.diy.html
@@ -0,0 +1,15 @@
+<div class="apiDetail">
+<div>
+	<h2><span>?</span><span class="path">treeNode.</span>* DIY *</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于保存节点的其他自定义数据信息，不要与 zTree 使用的属性相同即可，用户可随意设定。</p>
+		</div>
+	</div>
+	<h3>treeNode 举例</h3>
+	<h4>1. 设置节点的备用英文名称</h4>
+	<pre xmlns=""><code>var node = { "id":1, "name":"test1", "ename":"test eName"};</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.editNameFlag.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.editNameFlag.html
new file mode 100644
index 0000000..51162b8
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.editNameFlag.html
@@ -0,0 +1,19 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">treeNode.</span>editNameFlag</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>用于记录节点是否处于编辑名称状态。<span class="highlight_red">[setting.edit.enable = true 时有效]</span></p>
+			<p class="highlight_red">zTree 内部使用，请勿进行初始化 或 随意修改</p>
+			<p>默认值：false</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p>true 表示节点处于编辑名称状态</p>
+	<p>false 表示节点未处于编辑名称状态</p>
+	</div>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.getCheckStatus.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.getCheckStatus.html
new file mode 100644
index 0000000..fc20eac
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.getCheckStatus.html
@@ -0,0 +1,63 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function()</span><span class="path">treeNode.</span>getCheckStatus</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.excheck</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>获取节点 checkbox / radio 半勾选状态。<span class="highlight_red">[setting.check.enable = true 时有效]</span></p>
+			<p class="highlight_red">初始化节点数据时，由 zTree 增加此属性，请勿提前赋值</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>返回值</b><span>JSON</span></h4>
+	<pre xmlns=""><code>{
+	checked: true, //等同于 treeNode.checked
+	half: true  //规则见下表
+}</code></pre>
+	<table width="100%" border="0" cellspacing="1" cellpadding="0">
+		<thead>
+			<tr><td colspan="4">setting.check.checkType = "checkbox"</td></tr>
+			<tr><td>treeNode.checked</td><td>treeNode.check_Child_State</td><td>treeNode.halfCheck</td><td> half </td></tr>
+		</thead>
+		<tbody>
+			<tr><td>-</td><td>-</td><td>true</td><td>true</td></tr>
+			<tr><td colspan="4">&nbsp;</td></tr>
+			<tr><td>true</td><td>-1</td><td>false</td><td>false</td></tr>
+			<tr><td>true</td><td>0</td><td>false</td><td>true</td></tr>
+			<tr><td>true</td><td>1</td><td>false</td><td>true</td></tr>
+			<tr><td>true</td><td>2</td><td>false</td><td>false</td></tr>
+			<tr><td colspan="4">&nbsp;</td></tr>
+			<tr><td>false</td><td>-1</td><td>false</td><td>false</td></tr>
+			<tr><td>false</td><td>0</td><td>false</td><td>false</td></tr>
+			<tr><td>false</td><td>1</td><td>false</td><td>true</td></tr>
+			<tr><td>false</td><td>2</td><td>false</td><td>true</td></tr>
+		</tbody>
+	</table>
+	<br/>
+	<table width="100%" border="0" cellspacing="1" cellpadding="0">
+		<thead>
+			<tr><td colspan="4">setting.check.checkType = "radio"</td></tr>
+			<tr><td>treeNode.checked</td><td>treeNode.check_Child_State</td><td>treeNode.halfCheck</td><td> half </td></tr>
+		</thead>
+		<tbody>
+			<tr><td>-</td><td>-</td><td>true</td><td>true</td></tr>
+			<tr><td colspan="4">&nbsp;</td></tr>
+			<tr><td>true</td><td>-1</td><td>false</td><td>false</td></tr>
+			<tr><td>true</td><td>0</td><td>false</td><td>false</td></tr>
+			<tr><td>true</td><td>2</td><td>false</td><td>true</td></tr>
+			<tr><td colspan="4">&nbsp;</td></tr>
+			<tr><td>false</td><td>-1</td><td>false</td><td>false</td></tr>
+			<tr><td>false</td><td>0</td><td>false</td><td>false</td></tr>
+			<tr><td>false</td><td>2</td><td>false</td><td>true</td></tr>
+		</tbody>
+	</table>
+	</div>
+	<h3>treeNode 举例</h3>
+	<h4>1. 获取第一个根节点的半选状态</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var halfCheck = treeObj.getNodes()[0].getCheckStatus();
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.getNextNode.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.getNextNode.html
new file mode 100644
index 0000000..7a0fa5c
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.getNextNode.html
@@ -0,0 +1,27 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function()</span><span class="path">treeNode.</span>getNextNode</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>获取与 treeNode 节点相邻的后一个节点。</p>
+			<p class="highlight_red">初始化节点数据时，由 zTree 增加此属性，请勿提前赋值</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>返回值</b><span>JSON</span></h4>
+	<p>与 treeNode 节点相邻的后一个节点。</p>
+	<p class="highlight_red">如果 treeNode 是最后一个节点，返回 null 。</p>
+	</div>
+	<h3>treeNode 举例</h3>
+	<h4>1. 获取当前被选中的节点的下一个节点</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var sNodes = treeObj.getSelectedNodes();
+if (sNodes.length > 0) {
+	var node = sNodes[0].getNextNode();
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.getParentNode.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.getParentNode.html
new file mode 100644
index 0000000..31309a6
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.getParentNode.html
@@ -0,0 +1,27 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function()</span><span class="path">treeNode.</span>getParentNode</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>获取 treeNode 节点的父节点。</p>
+			<p class="highlight_red">初始化节点数据时，由 zTree 增加此属性，请勿提前赋值</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>返回值</b><span>JSON</span></h4>
+	<p> treeNode 节点的父节点 JSON 数据对象。</p>
+	<p class="highlight_red">如果 treeNode 是根节点，返回 null 。</p>
+	</div>
+	<h3>treeNode 举例</h3>
+	<h4>1. 获取当前被选中的节点的父节点</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var sNodes = treeObj.getSelectedNodes();
+if (sNodes.length > 0) {
+	var node = sNodes[0].getParentNode();
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.getPreNode.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.getPreNode.html
new file mode 100644
index 0000000..9d84184
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.getPreNode.html
@@ -0,0 +1,27 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function()</span><span class="path">treeNode.</span>getPreNode</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>获取与 treeNode 节点相邻的前一个节点。</p>
+			<p class="highlight_red">初始化节点数据时，由 zTree 增加此属性，请勿提前赋值</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>返回值</b><span>JSON</span></h4>
+	<p>与 treeNode 节点相邻的前一个节点。</p>
+	<p class="highlight_red">如果 treeNode 是第一个节点，返回 null 。</p>
+	</div>
+	<h3>treeNode 举例</h3>
+	<h4>1. 获取当前被选中的节点的前一个节点</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var sNodes = treeObj.getSelectedNodes();
+if (sNodes.length > 0) {
+	var node = sNodes[0].getPreNode();
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.halfCheck.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.halfCheck.html
new file mode 100644
index 0000000..23ac744
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.halfCheck.html
@@ -0,0 +1,29 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">treeNode.</span>halfCheck</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.excheck</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>强制节点的 checkBox / radio 的 半勾选状态。<span class="highlight_red">[setting.check.enable = true & treeNode.nocheck = false 时有效]</span></p>
+			<p class="highlight_red">1、强制为半勾选状态后，不再进行自动计算半勾选状态</p>
+			<p class="highlight_red">2、设置 treeNode.halfCheck = false 或 null 才能恢复自动计算半勾选状态</p>
+			<p class="highlight_red">3、为了解决部分朋友生成 json 数据出现的兼容问题, 支持 "false","true" 字符串格式的数据</p>
+			<p>默认值：false</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p>true 表示节点的输入框 强行设置为半勾选</p>
+	<p>false 表示节点的输入框 根据 zTree 的规则自动计算半勾选状态</p>
+	</div>
+	<h3>treeNode 举例</h3>
+	<h4>1. 初始化的数据设置 默认为半勾选状态</h4>
+	<pre xmlns=""><code>var nodes = [
+{ "id":1, "name":"test1", isParent:true, checked:true, halfCheck:true },
+{ "id":2, "name":"test2", isParent:true, checked:false, halfCheck:true },
+{ "id":3, "name":"test3", isParent:true, checked:true },
+{ "id":4, "name":"test4", isParent:true, checked:false }
+]</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.icon.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.icon.html
new file mode 100644
index 0000000..69c5db1
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.icon.html
@@ -0,0 +1,33 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">treeNode.</span>icon</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>节点自定义图标的 URL 路径。</p>
+			<p class="highlight_red">1、父节点如果只设置 icon ，会导致展开、折叠时都使用同一个图标</p>
+			<p class="highlight_red">2、父节点展开、折叠使用不同的个性化图标需要同时设置 treeNode.iconOpen / treeNode.iconClose 两个属性</p>
+			<p class="highlight_red">3、如果想利用 className 设置个性化图标，需要设置 treeNode.iconSkin 属性</p>
+			<p>默认值：无</p>
+		</div>
+	</div>
+	<h3>String 格式说明</h3>
+	<div class="desc">
+	<p>图标图片的 url 可以是相对路径也可以是绝对路径</p>
+	<p class="highlight_red">设置相对路径请注意页面与图片之间的关系，确保图片能够正常加载</p>
+	</div>
+	<h3>treeNode 举例</h3>
+	<h4>1. 设置节点的个性化图标</h4>
+	<pre xmlns=""><code>var nodes = [
+	//父节点展开 折叠时使用相同的图标
+	{ name:"父节点1", icon:"/img/parent.gif"},
+
+	//父节点展开 折叠时分别使用不同的图标
+	{ name:"父节点2", iconOpen:"/img/open.gif", iconClose:"/img/close.gif"}, 
+
+	//叶子节点个性化图标
+	{ name:"叶子节点", icon:"/img/leaf.gif"}
+]</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.iconClose.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.iconClose.html
new file mode 100644
index 0000000..f51da9c
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.iconClose.html
@@ -0,0 +1,33 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">treeNode.</span>iconClose</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>父节点自定义折叠时图标的 URL 路径。</p>
+			<p class="highlight_red">1、此属性只针对父节点有效</p>
+			<p class="highlight_red">2、此属性必须与 iconOpen 同时使用</p>
+			<p class="highlight_red">3、如果想利用 className 设置个性化图标，需要设置 treeNode.iconSkin 属性</p>
+			<p>默认值：无</p>
+		</div>
+	</div>
+	<h3>String 格式说明</h3>
+	<div class="desc">
+	<p>图标图片的 url 可以是相对路径也可以是绝对路径</p>
+	<p class="highlight_red">设置相对路径请注意页面与图片之间的关系，确保图片能够正常加载</p>
+	</div>
+	<h3>treeNode 举例</h3>
+	<h4>1. 设置节点的个性化图标</h4>
+	<pre xmlns=""><code>var nodes = [
+	//父节点展开 折叠时使用相同的图标
+	{ name:"父节点1", icon:"/img/parent.gif"},
+
+	//父节点展开 折叠时分别使用不同的图标
+	{ name:"父节点2", iconOpen:"/img/open.gif", iconClose:"/img/close.gif"}, 
+
+	//叶子节点个性化图标
+	{ name:"叶子节点", icon:"/img/leaf.gif"}
+]</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.iconOpen.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.iconOpen.html
new file mode 100644
index 0000000..29c9baa
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.iconOpen.html
@@ -0,0 +1,33 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">treeNode.</span>iconOpen</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>父节点自定义展开时图标的 URL 路径。</p>
+			<p class="highlight_red">1、此属性只针对父节点有效</p>
+			<p class="highlight_red">2、此属性必须与 iconClose 同时使用</p>
+			<p class="highlight_red">3、如果想利用 className 设置个性化图标，需要设置 treeNode.iconSkin 属性</p>
+			<p>默认值：无</p>
+		</div>
+	</div>
+	<h3>String 格式说明</h3>
+	<div class="desc">
+	<p>图标图片的 url 可以是相对路径也可以是绝对路径</p>
+	<p class="highlight_red">设置相对路径请注意页面与图片之间的关系，确保图片能够正常加载</p>
+	</div>
+	<h3>treeNode 举例</h3>
+	<h4>1. 设置节点的个性化图标</h4>
+	<pre xmlns=""><code>var nodes = [
+	//父节点展开 折叠时使用相同的图标
+	{ name:"父节点1", icon:"/img/parent.gif"},
+
+	//父节点展开 折叠时分别使用不同的图标
+	{ name:"父节点2", iconOpen:"/img/open.gif", iconClose:"/img/close.gif"}, 
+
+	//叶子节点个性化图标
+	{ name:"叶子节点", icon:"/img/leaf.gif"}
+]</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.iconSkin.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.iconSkin.html
new file mode 100644
index 0000000..d5d9726
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.iconSkin.html
@@ -0,0 +1,43 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">treeNode.</span>iconSkin</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>节点自定义图标的 className</p>
+			<p class="highlight_red">1、需要修改 css，增加相应 className 的设置</p>
+			<p class="highlight_red">2、css 方式简单、方便，并且同时支持父节点展开、折叠状态切换图片</p>
+			<p class="highlight_red">3、css 建议采用图片分割渲染的方式以减少反复加载图片，并且避免图片闪动</p>
+			<p class="highlight_red">4、zTree v3.x 的 iconSkin 同样支持 IE6</p>
+			<p class="highlight_red">5、如果想直接使用 图片的Url路径 设置节点的个性化图标，需要设置 treeNode.icon / treeNode.iconOpen / treeNode.iconClose 属性</p>
+			<p>默认值：无</p>
+		</div>
+	</div>
+	<h3>String 格式说明</h3>
+	<div class="desc">
+	<p>设置个性图标的 className</p>
+	</div>
+	<h3>css & treeNode 举例</h3>
+	<h4>1. 设置节点的个性化图标</h4>
+	<pre xmlns=""><code>css 内容：
+.ztree li span.button.diy01_ico_open, .ztree li span.button.diy01_ico_close{...}
+
+.ztree li span.button.diy02_ico_open{...}
+.ztree li span.button.diy02_ico_close{...}
+
+.ztree li span.button.diy03_ico_docu{...}
+
+js中节点数据：
+var nodes = [
+	//父节点展开 折叠时使用相同的图标
+	{ name:"父节点1", iconSkin:"diy01"},
+
+	//父节点展开 折叠时分别使用不同的图标
+	{ name:"父节点2", iconSkin:"diy02"},
+
+	//叶子节点个性化图标
+	{ name:"叶子节点", iconSkin:"diy03"}
+]</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.isAjaxing.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.isAjaxing.html
new file mode 100644
index 0000000..330c120
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.isAjaxing.html
@@ -0,0 +1,26 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">treeNode.</span>isAjaxing</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>记录 treeNode 节点是否正在进行异步加载。</p>
+			<p class="highlight_red">初始化节点数据时，由 zTree 增加此属性，请勿提前赋值</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p> true 表示节点正在进行异步加载</p>
+	<p> false 表示节点没有进行异步加载</p>
+	</div>
+	<h3>treeNode 举例</h3>
+	<h4>1. 查看当前被选中的节点是否节点正在进行异步加载</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var sNodes = treeObj.getSelectedNodes();
+if (sNodes.length > 0) {
+	var isAjaxing = sNodes[0].isAjaxing;
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.isFirstNode.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.isFirstNode.html
new file mode 100644
index 0000000..83b80bd
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.isFirstNode.html
@@ -0,0 +1,28 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">treeNode.</span>isFirstNode</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>记录 treeNode 节点是否为同级节点中的第一个节点。</p>
+			<p class="highlight_red">使用 exhide 扩展后，只针对显示的节点设置此属性</p>
+			<p class="highlight_red">初始化节点数据时，由 zTree 增加此属性，请勿提前赋值</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p> true 表示是同级节点中的第一个节点</p>
+	<p> false 表示不是同级节点中的第一个节点</p>
+	<p class="highlight_red">节点被隐藏后，isFirstNode = false</p>
+	</div>
+	<h3>treeNode 举例</h3>
+	<h4>1. 查看当前被选中的节点是否是同级节点中的第一个节点</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var sNodes = treeObj.getSelectedNodes();
+if (sNodes.length > 0) {
+	var isFirstNode = sNodes[0].isFirstNode;
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.isHidden.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.isHidden.html
new file mode 100644
index 0000000..5fb388e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.isHidden.html
@@ -0,0 +1,27 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">treeNode.</span>isHidden</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exhide</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>判断 treeNode 节点是否被隐藏。</p>
+			<p class="highlight_red">1、初始化 zTree 时，如果节点设置 isHidden = true，会被自动隐藏</p>
+			<p class="highlight_red">2、请勿对已加载的节点修改此属性，隐藏 / 显示 请使用 hideNode() / hideNodes() / showNode() / showNodes() 方法</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p> true 表示被隐藏</p>
+	<p> false 表示被显示</p>
+	</div>
+	<h3>treeNode 举例</h3>
+	<h4>1. 查看第一个根节点是否被隐藏</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var sNodes = treeObj.getNodes();
+if (sNodes.length > 0) {
+	var isHidden = sNodes[0].isHidden;
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.isHover.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.isHover.html
new file mode 100644
index 0000000..dcef6eb
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.isHover.html
@@ -0,0 +1,19 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">treeNode.</span>isHover</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>记录节点 的 hover 状态，主要用于 setting.view.addHoverDom / removeHoverDom 。</p>
+			<p class="highlight_red">zTree 内部使用，请勿进行初始化 或 随意修改</p>
+			<p>默认值：false</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p>true 表示节点处于 hover 状态</p>
+	<p>false 表示节点未处于 hover 状态</p>
+	</div>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.isLastNode.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.isLastNode.html
new file mode 100644
index 0000000..5d5ac82
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.isLastNode.html
@@ -0,0 +1,28 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">treeNode.</span>isLastNode</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>记录 treeNode 节点是否为同级节点中的最后一个节点。</p>
+			<p class="highlight_red">使用 exhide 扩展后，只针对显示的节点设置此属性</p>
+			<p class="highlight_red">初始化节点数据时，由 zTree 增加此属性，请勿提前赋值</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p> true 表示是同级节点中的最后一个节点</p>
+	<p> false 表示不是同级节点中的最后一个节点</p>
+	<p class="highlight_red">节点被隐藏后，isLastNode = false</p>
+	</div>
+	<h3>treeNode 举例</h3>
+	<h4>1. 查看当前被选中的节点是否是同级节点中的最后一个节点</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var sNodes = treeObj.getSelectedNodes();
+if (sNodes.length > 0) {
+	var isLastNode = sNodes[0].isLastNode;
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.isParent.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.isParent.html
new file mode 100644
index 0000000..bab887e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.isParent.html
@@ -0,0 +1,28 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">treeNode.</span>isParent</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>记录 treeNode 节点是否为父节点。</p>
+			<p class="highlight_red">1、初始化节点数据时，根据 treeNode.children 属性判断，有子节点则设置为 true，否则为 false</p>
+			<p class="highlight_red">2、初始化节点数据时，如果设定 treeNode.isParent = true，即使无子节点数据，也会设置为父节点</p>
+			<p class="highlight_red">3、为了解决部分朋友生成 json 数据出现的兼容问题, 支持 "false","true" 字符串格式的数据</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p> true 表示是父节点</p>
+	<p> false 表示不是父节点</p>
+	</div>
+	<h3>treeNode 举例</h3>
+	<h4>1. 查看当前被选中的节点是否是父节点</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var sNodes = treeObj.getSelectedNodes();
+if (sNodes.length > 0) {
+	var isParent = sNodes[0].isParent;
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.level.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.level.html
new file mode 100644
index 0000000..aff3254
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.level.html
@@ -0,0 +1,25 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Number</span><span class="path">treeNode.</span>level</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>记录节点的层级</p>
+			<p class="highlight_red">初始化节点数据时，由 zTree 增加此属性，请勿提前赋值</p>
+		</div>
+	</div>
+	<h3>Number 格式说明</h3>
+	<div class="desc">
+	<p class="highlight_red">根节点 level = 0，依次递增</p>
+	</div>
+	<h3>treeNode 举例</h3>
+	<h4>1. 查看当前被选中的节点的级数</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var sNodes = treeObj.getSelectedNodes();
+if (sNodes.length > 0) {
+	var level = sNodes[0].level;
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.name.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.name.html
new file mode 100644
index 0000000..918f2b4
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.name.html
@@ -0,0 +1,25 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">treeNode.</span>name</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>节点名称。</p>
+			<p class="highlight_red">1、如果不使用 name 属性保存节点名称，请修改 setting.data.key.name </p>
+			<p>默认值：无</p>
+		</div>
+	</div>
+	<h3>String 格式说明</h3>
+	<div class="desc">
+	<p>节点显示的名称字符串，标准 String 即可，所有特殊字符都会被自动转义</p>
+	</div>
+	<h3>treeNode 举例</h3>
+	<h4>1. 设置节点的名称为 test1、test2、test3</h4>
+	<pre xmlns=""><code>var nodes = [
+	{ "id":1, "name":"test1"},
+	{ "id":2, "name":"test2"},
+	{ "id":3, "name":"test3"}
+]</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.nocheck.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.nocheck.html
new file mode 100644
index 0000000..afaa62f
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.nocheck.html
@@ -0,0 +1,26 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">treeNode.</span>nocheck</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.excheck</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>1、设置节点是否隐藏 checkbox / radio <span class="highlight_red">[setting.check.enable = true 时有效]</span></p>
+			<p class="highlight_red">2、为了解决部分朋友生成 json 数据出现的兼容问题, 支持 "false","true" 字符串格式的数据</p>
+			<p>默认值：false</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p class="highlight_red">true 表示此节点不显示 checkbox / radio，不影响勾选的关联关系，不影响父节点的半选状态。</p>
+	<p class="highlight_red">false 表示节点具有正常的勾选功能</p>
+	</div>
+	<h3>treeNode 举例</h3>
+	<h4>1. 不显示某个节点的 checkbox / radio </h4>
+	<pre xmlns=""><code>var nodes = [
+	{ "id":1, "name":"test1", "nocheck":true},
+	{ "id":2, "name":"test2"},
+	{ "id":3, "name":"test3"}
+]</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.open.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.open.html
new file mode 100644
index 0000000..1eb9aec
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.open.html
@@ -0,0 +1,30 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">treeNode.</span>open</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>记录 treeNode 节点的 展开 / 折叠 状态。</p>
+			<p class="highlight_red">1、初始化节点数据时，如果设定 treeNode.open = true，则会直接展开此节点</p>
+			<p class="highlight_red">2、叶子节点 treeNode.open = false</p>
+			<p class="highlight_red">3、为了解决部分朋友生成 json 数据出现的兼容问题, 支持 "false","true" 字符串格式的数据</p>
+			<p class="highlight_red">4、非异步加载模式下，无子节点的父节点设置 open=true 后，可显示为展开状态，但异步加载模式下不会生效。（v3.5.15+） </p>
+			<p>默认值：false</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p> true 表示节点为 展开 状态</p>
+	<p> false 表示节点为 折叠 状态</p>
+	</div>
+	<h3>treeNode 举例</h3>
+	<h4>1. 查看当前被选中的节点的 展开 / 折叠 状态</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var sNodes = treeObj.getSelectedNodes();
+if (sNodes.length > 0) {
+	var isOpen = sNodes[0].open;
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.parentTId.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.parentTId.html
new file mode 100644
index 0000000..d228a23
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.parentTId.html
@@ -0,0 +1,27 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">treeNode.</span>parentTId</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>treeNode 节点的父节点唯一标识 tId。</p>
+			<p class="highlight_red">1、v3.x 用 parentTId 替换了原先的 parentNode 属性，同时增加了 getParentNode 方法，以避免原先 parentNode 造成的 clone 死循环</p>
+			<p class="highlight_red">2、初始化节点数据时，由 zTree 增加此属性，请勿提前赋值</p>
+		</div>
+	</div>
+	<h3>String 格式说明</h3>
+	<div class="desc">
+	<p>zTree 内部生成的节点唯一标识，请参考 treeNode.tId 的说明</p>
+	<p class="highlight_red">如果 treeNode 是根节点，则 parentTId = null</p>
+	</div>
+	<h3>treeNode 举例</h3>
+	<h4>1. 查看当前被选中的节点的父节点 tId</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var sNodes = treeObj.getSelectedNodes();
+if (sNodes.length > 0) {
+	var parentTId = sNodes[0].parentTId;
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.tId.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.tId.html
new file mode 100644
index 0000000..c32285c
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.tId.html
@@ -0,0 +1,25 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">treeNode.</span>tId</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>treeNode 节点的唯一标识 tId。</p>
+			<p class="highlight_red">初始化节点数据时，由 zTree 增加此属性，请勿提前赋值</p>
+		</div>
+	</div>
+	<h3>String 格式说明</h3>
+	<div class="desc">
+	<p>生成规则：setting.treeId + "_" + 内部计数</p>
+	</div>
+	<h3>treeNode 举例</h3>
+	<h4>1. 查看当前被选中的节点的 tId</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var sNodes = treeObj.getSelectedNodes();
+if (sNodes.length > 0) {
+	var tId = sNodes[0].tId;
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.target.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.target.html
new file mode 100644
index 0000000..f7c1b6b
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.target.html
@@ -0,0 +1,24 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">treeNode.</span>target</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>设置点击节点后在何处打开 url。<span class="highlight_red">[treeNode.url 存在时有效]</span></p>
+			<p>默认值：无</p>
+		</div>
+	</div>
+	<h3>String 格式说明</h3>
+	<div class="desc">
+	<p>同超链接 target 属性: "_blank", "_self" 或 其他指定窗口名称 </p>
+	<p>省略此属性，则默认为 "_blank"</p>
+	</div>
+	<h3>treeNode 举例</h3>
+	<h4>1. 设置点击某节点时，弹出新页面</h4>
+	<pre xmlns=""><code>var nodes = [
+	{ "id":1, "name":"test1", "url":"http://myTest.com", "target":"_blank"},
+	......
+]</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.url.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.url.html
new file mode 100644
index 0000000..0b2e007
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.url.html
@@ -0,0 +1,25 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">treeNode.</span>url</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>节点链接的目标 URL</p>
+			<p class="highlight_red">1、编辑模式 (setting.edit.enable = true) 下此属性功能失效，如果必须使用类似功能，请利用 onClick 事件回调函数自行控制。</p>
+			<p class="highlight_red">2、如果需要在 onClick 事件回调函数中进行跳转控制，那么请将 URL 地址保存在其他自定义的属性内，请勿使用 url</p>
+			<p>默认值：无</p>
+		</div>
+	</div>
+	<h3>String 格式说明</h3>
+	<div class="desc">
+	<p>同超链接 href 属性</p>
+	</div>
+	<h3>treeNode 举例</h3>
+	<h4>1. 设置某节点点击时，跳转到 g.cn</h4>
+	<pre xmlns=""><code>var nodes = [
+	{ "id":1, "name":"Google CN", "url":"http://g.cn"},
+	......
+]</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.zAsync.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.zAsync.html
new file mode 100644
index 0000000..00e48f3
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/treeNode.zAsync.html
@@ -0,0 +1,28 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">treeNode.</span>zAsync</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>记录 treeNode 节点是否已经进行过异步加载，避免父节点反复异步加载数据。</p>
+			<p class="highlight_red">初始化节点数据时，由 zTree 增加此属性，请勿提前赋值</p>
+			<p class="highlight_red">默认值：false （无子节点的父节点）； true （有子节点的父节点 & 叶子节点）</p>
+		</div>
+	</div>
+	<h3>Boolean 格式说明</h3>
+	<div class="desc">
+	<p> true 表示父节点展开时不需要自动异步加载</p>
+	<p> false 表示父节点展开时需要自动异步加载</p>
+	<p class="highlight_red"> 此参数不会对 reAsyncChildNodes 方法造成任何影响</p>
+	</div>
+	<h3>treeNode 举例</h3>
+	<h4>1. 查看当前被选中的节点是否节点是否需要自动异步加载</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var sNodes = treeObj.getSelectedNodes();
+if (sNodes.length > 0) {
+	var zAsync = sNodes[0].zAsync;
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.addNodes.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.addNodes.html
new file mode 100644
index 0000000..eac2152
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.addNodes.html
@@ -0,0 +1,42 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(parentNode, newNodes, isSilent)</span><span class="path">zTreeObj.</span>addNodes</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>添加节点。</p>
+			<p class="highlight_red">v3.x 为了避免原先反复初始化造成的数据重复问题，在 初始化 和 添加节点 时内部进行 clone 操作。如果需要获取数据在 zTree 内的对象，请获取此方法的返回值。</p>
+			<p class="highlight_red">请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>parentNode</b><span>JSON</span></h4>
+	<p>指定的父节点，如果增加根节点，请设置 parentNode 为 null 即可。</p>
+	<p class="highlight_red">请务必保证此节点数据对象 是 zTree 内部的数据对象</p>
+	<h4 class="topLine"><b>newNodes</b><span>JSON / Array(JSON)</span></h4>
+	<p>需要增加的节点数据 JSON 对象集合，数据只需要满足 zTree 的节点数据必需的属性即可，详细请参考“treeNode 节点数据详解”</p>
+	<p class="highlight_red">1、v3.x 支持单独添加一个节点，即如果只新增一个节点，不用必须包在数组中</p>
+	<p class="highlight_red">2、使用简单数据模式，请参考 setting.data.simpleData 内的属性说明</p>
+	<h4 class="topLine"><b>isSilent</b><span>Boolean</span></h4>
+	<p>设定增加节点后是否自动展开父节点。</p>
+	<p>isSilent = true 时，不展开父节点，其他值或缺省状态都自动展开。</p>
+	<h4 class="topLine"><b>返回值</b><span>Array(JSON)</span></h4>
+	<p>返回值是 zTree 最终添加的节点数据集合</p>
+	<p class="highlight_red">如果 newNodes 是单个节点数据 JSON，返回值也是将其包在 Array 内</p>
+	<p class="highlight_red">请务必记住：返回值中的数据对象 是 newNodes 被 clone 后的，所以绝对不相等！</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 对于 id = "tree" 的 zTree 增加 1 个根节点</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var newNode = {name:"newNode1"};
+newNode = treeObj.addNodes(null, newNode);
+</code></pre>
+	<h4>2. 对于 id = "tree" 的 zTree 增加 3 个根节点</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var newNodes = [{name:"newNode1"}, {name:"newNode2"}, {name:"newNode3"}];
+newNodes = treeObj.addNodes(null, newNodes);
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.cancelEditName.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.cancelEditName.html
new file mode 100644
index 0000000..9df098f
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.cancelEditName.html
@@ -0,0 +1,30 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(newName)</span><span class="path">zTreeObj.</span>cancelEditName</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>取消节点的编辑名称状态，可以恢复原名称，也可以强行赋给新的名称。</p>
+			<p class="highlight_red">请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>newName</b><span>String</span></h4>
+	<p>重新给定的新名称。</p>
+	<p class="highlight_red">如果省略此参数，则恢复原名称。</p>
+	<h4 class="topLine"><b>返回值</b><span>无</span></h4>
+	<p>目前无任何返回值</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 取消 zTree 的编辑名称状态，恢复该节点原有名称</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+treeObj.cancelEditName();
+</code></pre>
+	<h4>2. 取消 zTree 的编辑名称状态，并且重新设定该节点名称</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+treeObj.cancelEditName("test_new_name");
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.cancelSelectedNode.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.cancelSelectedNode.html
new file mode 100644
index 0000000..26d5706
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.cancelSelectedNode.html
@@ -0,0 +1,35 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeNode)</span><span class="path">zTreeObj.</span>cancelSelectedNode</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>取消节点的选中状态。</p>
+			<p class="highlight_red">v3.x 支持多点同时选中，因此取消选中状态可以全部取消，也可以单独取消某个节点的选中状态。</p>
+			<p class="highlight_red">请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeNode</b><span>JSON</span></h4>
+	<p>需要取消选中状态的节点。</p>
+	<p class="highlight_red">请务必保证此节点数据对象 是 zTree 内部的数据对象</p>
+	<p class="highlight_red">如果省略此参数，则将取消全部被选中节点的选中状态。</p>
+	<h4 class="topLine"><b>返回值</b><span>无</span></h4>
+	<p>目前无任何返回值</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 取消当前所有被选中节点的选中状态</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+treeObj.cancelSelectedNode();
+</code></pre>
+	<h4>2. 取消当前第一个被选中节点的选中状态</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getSelectedNode();
+if (nodes.length>0) { 
+	treeObj.cancelSelectedNode(nodes[0]);
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.checkAllNodes.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.checkAllNodes.html
new file mode 100644
index 0000000..d6eaadf
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.checkAllNodes.html
@@ -0,0 +1,29 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(checked)</span><span class="path">zTreeObj.</span>checkAllNodes</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.excheck</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>勾选 或 取消勾选 全部节点。<span class="highlight_red">[setting.check.enable = true 且 setting.check.chkStyle = "checkbox" 时有效]</span></p>
+			<p class="highlight_red">此方法不会触发 beforeCheck / onCheck 事件回调函数。</p>
+			<p class="highlight_red">请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>checked</b><span>Boolean</span></h4>
+	<p>checked = true  表示勾选全部节点</p>
+	<p>checked = false 表示全部节点取消勾选</p>
+	<p class="highlight_red">不会影响 treeNode.nochecked = true 的节点。</p>
+	<p class="highlight_red">不会影响未加载的节点。</p>
+	<h4 class="topLine"><b>返回值</b><span>无</span></h4>
+	<p>目前无任何返回值</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 勾选全部节点</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+treeObj.checkAllNodes(true);
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.checkNode.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.checkNode.html
new file mode 100644
index 0000000..cb8bb7d
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.checkNode.html
@@ -0,0 +1,44 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeNode, checked, checkTypeFlag, callbackFlag)</span><span class="path">zTreeObj.</span>checkNode</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.excheck</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>勾选 或 取消勾选 单个节点。<span class="highlight_red">[setting.check.enable = true 时有效]</span></p>
+			<p class="highlight_red">v3.x 中 checkNode() 方法可以触发 beforeCheck / onCheck 事件回调函数。便于减少冗余代码</p>
+			<p class="highlight_red">请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeNode</b><span>JSON</span></h4>
+	<p>需要勾选 或 取消勾选 的节点数据</p>
+	<p class="highlight_red">请务必保证此节点数据对象 是 zTree 内部的数据对象</p>
+	<h4 class="topLine"><b>checked</b><span>Boolean</span></h4>
+	<p>checked = true  表示勾选节点</p>
+	<p>checked = false 表示节点取消勾选</p>
+	<p class="highlight_red">省略此参数，则根据对此节点的勾选状态进行 toggle 切换</p>
+	<p class="highlight_red">不影响 treeNode.nochecked = true 的节点。</p>
+	<h4 class="topLine"><b>checkTypeFlag</b><span>Boolean</span></h4>
+	<p>checkTypeFlag = true 表示按照 setting.check.chkboxType 属性进行父子节点的勾选联动操作</p>
+	<p>checkTypeFlag = false 表示只修改此节点勾选状态，无任何勾选联动操作</p>
+	<p class="highlight_red">checkTypeFlag = false 且 treeNode.checked = checked 时，不会触发回调函数，直接返回</p>
+	<p class="highlight_red">不影响父子节点中 treeNode.nochecked = true 的节点。</p>
+	<h4 class="topLine"><b>callbackFlag</b><span>Boolean</span></h4>
+	<p>callbackFlag = true 表示执行此方法时触发 beforeCheck & onCheck 事件回调函数</p>
+	<p>callbackFlag = false 表示执行此方法时不触发事件回调函数</p>
+	<p class="highlight_red">省略此参数，等同于 false</p>
+	<h4 class="topLine"><b>返回值</b><span>无</span></h4>
+	<p>目前无任何返回值</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 勾选当前选中的节点</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getSelectedNodes();
+for (var i=0, l=nodes.length; i < l; i++) {
+	treeObj.checkNode(nodes[i], true, true);
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.copyNode.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.copyNode.html
new file mode 100644
index 0000000..f1b624b
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.copyNode.html
@@ -0,0 +1,44 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(targetNode, treeNode, moveType, isSilent)</span><span class="path">zTreeObj.</span>copyNode</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>复制节点。</p>
+			<p class="highlight_red">v3.x 复制节点时进行 clone 操作。如果需要获取数据在 zTree 内的对象，请获取此方法的返回值。</p>
+			<p class="highlight_red">请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>targetNode</b><span>JSON</span></h4>
+	<p>要复制到的目标节点 JSON 数据</p>
+	<p class="highlight_red">如果复制成为根节点，请设置 targetNode 为 null 即可</p>
+	<p class="highlight_red">请务必保证此节点数据对象 是 zTree 内部的数据对象</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>需要被复制的节点数据</p>
+	<p class="highlight_red">请务必保证此节点数据对象 是 zTree 内部的数据对象</p>
+	<h4 class="topLine"><b>moveType</b><span>String</span></h4>
+	<p>复制到目标节点的相对位置</p>
+	<p class="highlight_red">"inner"：成为子节点，"prev"：成为同级前一个节点，"next"：成为同级后一个节点</p>
+	<h4 class="topLine"><b>isSilent</b><span>Boolean</span></h4>
+	<p>设定复制节点后是否自动展开父节点。</p>
+	<p>isSilent = true 时，不展开父节点，其他值或缺省状态都自动展开。</p>
+	<h4 class="topLine"><b>返回值</b><span>JSON</span></h4>
+	<p>返回值是最终加入到 zTree 内的节点数据</p>
+	<p class="highlight_red">请务必记住：返回值中的数据对象 是 treeNode 被 clone 后的，所以绝对不相等！</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 将根节点中第二个节点 复制成为 第一个节点的子节点</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getNodes();
+treeObj.copyNode(nodes[0], nodes[1], "inner");
+</code></pre>
+	<h4>2. 将根节点中第二个节点 复制成为 第一个节点的前一个节点</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getNodes();
+treeObj.copyNode(nodes[0], nodes[1], "before");
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.destroy.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.destroy.html
new file mode 100644
index 0000000..d9f6da0
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.destroy.html
@@ -0,0 +1,25 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId)</span><span class="path">zTreeObj.</span>destroy</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>从 zTree v3.4 开始提供销毁 zTree 的方法。</p>
+			<p>1、用此方法可以销毁 zTreeObj 代表的 zTree。</p>
+			<p class="highlight_red">2、销毁当前页面全部的 zTree，也可以使用 $.fn.zTree.destroy() 方法。</p>
+			<p class="highlight_red">3、重新使用已经被销毁的树，必须要使用 init 方法进行初始化。</p>
+		</div>
+	</div>
+        <h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>返回值</b><span>无</span></h4>
+	<p>目前无任何返回值</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 销毁 id 为 "treeDemo" 的 zTree</h4>
+	<pre xmlns=""><code>var zTreeObj = $.fn.zTree.getZTreeObj("treeDemo");
+zTreeObj.destroy();
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.editName.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.editName.html
new file mode 100644
index 0000000..2d4eaf7
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.editName.html
@@ -0,0 +1,29 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeNode)</span><span class="path">zTreeObj.</span>editName</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>设置某节点进入编辑名称状态。</p>
+			<p class="highlight_red">1、如果需要用 js 取消编辑名称状态，请使用 cancelEditName(newName) 方法。</p>
+			<p class="highlight_red">2、可利用此方法让当前正编辑的节点 input 输入框获取焦点。</p>
+			<p class="highlight_red">3、请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeNode</b><span>JSON</span></h4>
+	<p>指定进入编辑名称状态的节点 JSON 数据</p>
+	<p class="highlight_red">请务必保证此节点数据对象 是 zTree 内部的数据对象</p>
+	<h4 class="topLine"><b>返回值</b><span>无</span></h4>
+	<p>目前无任何返回值</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 设置根节点第一个节点进入编辑名称状态</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getNodes();
+treeObj.editName(nodes[0]);
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.expandAll.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.expandAll.html
new file mode 100644
index 0000000..aaa3e46
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.expandAll.html
@@ -0,0 +1,30 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(expandFlag)</span><span class="path">zTreeObj.</span>expandAll</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>展开 / 折叠 全部节点</p>
+			<p class="highlight_red">此方法不会触发  beforeExpand / onExpand  和 beforeCollapse / onCollapse 事件回调函数。</p>
+			<p class="highlight_red">请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>expandFlag</b><span>Boolean</span></h4>
+	<p>expandFlag = true 表示 展开 全部节点</p>
+	<p>expandFlag =  false 表示 折叠 全部节点</p>
+	<h4 class="topLine"><b>返回值</b><span>Boolean</span></h4>
+	<p>返回值表示最终实际操作情况</p>
+	<p>true 表示 展开 全部节点</p>
+	<p>false 表示 折叠 全部节点</p>
+	<p>null 表示 不存在任何父节点</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 展开全部节点</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+treeObj.expandAll(true);
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.expandNode.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.expandNode.html
new file mode 100644
index 0000000..5d96d3f
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.expandNode.html
@@ -0,0 +1,50 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeNode, expandFlag, sonSign, focus, callbackFlag)</span><span class="path">zTreeObj.</span>expandNode</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>展开 / 折叠 指定的节点</p>
+			<p class="highlight_red">v3.x 中执行此方法可以触发 beforeExpand / onExpand  或 beforeCollapse / onCollapse 事件回调函数。便于减少冗余代码</p>
+			<p class="highlight_red">请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeNode</b><span>JSON</span></h4>
+	<p>需要 展开 / 折叠 的节点数据</p>
+	<p class="highlight_red">请务必保证此节点数据对象 是 zTree 内部的数据对象</p>
+	<h4 class="topLine"><b>expandFlag</b><span>Boolean</span></h4>
+	<p>expandFlag = true 表示 展开 节点</p>
+	<p>expandFlag = false 表示 折叠 节点</p>
+	<p class="highlight_red">省略此参数，则根据对此节点的展开状态进行 toggle 切换</p>
+	<h4 class="topLine"><b>sonSign</b><span>Boolean</span></h4>
+	<p>sonSign = true 表示 全部子孙节点 进行与 expandFlag 相同的操作</p>
+	<p>sonSign = false 表示 只影响此节点，对于其 子孙节点无任何影响</p>
+	<p class="highlight_red">sonSign = false 且 treeNode.open = expandFlag 时，不会触发回调函数，直接返回</p>
+	<p class="highlight_red">省略此参数，等同于 false</p>
+	<h4 class="topLine"><b>focus</b><span>Boolean</span></h4>
+	<p>focus = true 表示 展开 / 折叠 操作后，通过设置焦点保证此焦点进入可视区域内</p>
+	<p>focus =  false 表示 展开 / 折叠 操作后，不设置任何焦点</p>
+	<p class="highlight_red">省略此参数，等同于 true</p>
+	<h4 class="topLine"><b>callbackFlag</b><span>Boolean</span></h4>
+	<p>callbackFlag = true 表示执行此方法时触发 beforeExpand / onExpand  或 beforeCollapse / onCollapse 事件回调函数</p>
+	<p>callbackFlag = false 表示执行此方法时不触发事件回调函数</p>
+	<p class="highlight_red">省略此参数，等同于 false</p>
+	<h4 class="topLine"><b>返回值</b><span>Boolean</span></h4>
+	<p>返回值表示最终实际操作情况</p>
+	<p>true 表示 展开 节点</p>
+	<p>false 表示 折叠 节点</p>
+	<p>null 表示 不是父节点</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 展开当前选择的第一个节点（包括其全部子节点）</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getSelectedNodes();
+if (nodes.length>0) {
+	treeObj.expandNode(nodes[0], true, true, true);
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.getChangeCheckedNodes.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.getChangeCheckedNodes.html
new file mode 100644
index 0000000..ba86534
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.getChangeCheckedNodes.html
@@ -0,0 +1,24 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function()</span><span class="path">zTreeObj.</span>getChangeCheckedNodes</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.excheck</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>获取输入框勾选状态被改变的节点集合（与原始数据 checkedOld 对比）。<span class="highlight_red">[setting.check.enable = true 时有效]</span></p>
+			<p class="highlight_red">请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>返回值</b><span>Array(JSON)</span></h4>
+	<p>返回全部勾选状态被改变的节点集合 Array</p>
+	<p class="highlight_red">如果需要获取每次操作后全部被改变勾选状态的节点数据，请在每次勾选操作后，遍历所有被改变勾选状态的节点数据，让其 checkedOld = checked 就可以了。</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 获取当前勾选状态被改变的节点集合</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getChangeCheckedNodes();
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.getCheckedNodes.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.getCheckedNodes.html
new file mode 100644
index 0000000..85f4ba0
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.getCheckedNodes.html
@@ -0,0 +1,28 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(checked)</span><span class="path">zTreeObj.</span>getCheckedNodes</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.excheck</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>获取输入框被勾选 或 未勾选的节点集合。<span class="highlight_red">[setting.check.enable = true 时有效]</span></p>
+			<p class="highlight_red">请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>checked</b><span>Boolean</span></h4>
+	<p>checked = true  表示获取 被勾选 的节点集合</p>
+	<p>checked = false 表示获取 未勾选 的节点集合</p>
+	<p class="highlight_red">省略此参数，等同于 true。</p>
+	<p class="highlight_red">对于 treeNode.nochecked = true 的节点不进行获取。</p>
+	<h4 class="topLine"><b>返回值</b><span>Array(JSON)</span></h4>
+	<p>返回全部符合要求的节点集合 Array</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 获取当前被勾选的节点集合</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getCheckedNodes(true);
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.getNodeByParam.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.getNodeByParam.html
new file mode 100644
index 0000000..89e72c7
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.getNodeByParam.html
@@ -0,0 +1,32 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(key, value, parentNode)</span><span class="path">zTreeObj.</span>getNodeByParam</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>根据节点数据的属性搜索，获取条件完全匹配的节点数据 JSON 对象</p>
+			<p class="highlight_red">请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>key</b><span>String</span></h4>
+	<p>需要精确匹配的属性名称</p>
+	<h4 class="topLine"><b>value</b><span>?</span></h4>
+	<p>需要精确匹配的属性值，可以是任何类型，只要保证与 key 指定的属性值保持一致即可</p>
+	<h4 class="topLine"><b>parentNode</b><span>JSON</span></h4>
+	<p>搜索范围，指定在某个父节点下的子节点中进行搜索</p>
+	<p class="highlight_red">忽略此参数，表示在全部节点中搜索</p>
+	<h4 class="topLine"><b>返回值</b><span>JSON</span></h4>
+	<p>匹配精确搜索的节点数据</p>
+	<p class="highlight_red">1、如无结果，返回 null</p>
+	<p class="highlight_red">2、如有多个节点满足查询条件，只返回第一个匹配到的节点</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 查找 id = 1 的节点数据</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var node = treeObj.getNodeByParam("id", 1, null);
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.getNodeByTId.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.getNodeByTId.html
new file mode 100644
index 0000000..76fcc48
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.getNodeByTId.html
@@ -0,0 +1,27 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(tId)</span><span class="path">zTreeObj.</span>getNodeByTId</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>根据 zTree 的唯一标识 tId 快速获取节点 JSON 数据对象</p>
+			<p class="highlight_red">通过内部的 cache 获取，不需要遍历节点。</p>
+			<p class="highlight_red">请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>tId</b><span>String</span></h4>
+	<p>节点在 zTree 内的唯一标识 tId</p>
+	<h4 class="topLine"><b>返回值</b><span>JSON</span></h4>
+	<p>tId 对应的节点 JSON 数据对象</p>
+	<p class="highlight_red">如无结果，返回 null</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 获取 tId = "tree_10" 的节点数据</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var node = treeObj.getNodeByTId("tree_10");
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.getNodeIndex.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.getNodeIndex.html
new file mode 100644
index 0000000..b2c757d
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.getNodeIndex.html
@@ -0,0 +1,30 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeNode)</span><span class="path">zTreeObj.</span>getNodeIndex</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>获取某节点在同级节点中的序号（从0开始）</p>
+			<p class="highlight_red">请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeNode</b><span>JSON</span></h4>
+	<p>需要查询顺序的节点 JSON 数据对象</p>
+	<p class="highlight_red">请务必保证此节点数据对象 是 zTree 内部的数据对象</p>
+	<h4 class="topLine"><b>返回值</b><span>Number</span></h4>
+	<p class="highlight_red">返回值从 0 开始计数</p>
+	<p class="highlight_red">如果不存在该节点数据，返回 -1</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 获取当前选中的第一个节点在同级节点中的序号</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getSelectedNodes();
+if (nodes.length>0) {
+	var index = treeObj.getNodeIndex(nodes[0]);
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.getNodes.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.getNodes.html
new file mode 100644
index 0000000..b368535
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.getNodes.html
@@ -0,0 +1,26 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function()</span><span class="path">zTreeObj.</span>getNodes</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>获取 zTree 的全部节点数据</p>
+			<p class="highlight_red">请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>返回值</b><span>Array(JSON)</span></h4>
+	<p>全部节点数据</p>
+	<p class="highlight_red">1、Array 仅仅是根节点的集合（默认情况子节点都处于 children 属性下）； </p>
+	<p class="highlight_red">2、如需遍历全部节点需要利用递归，或利用 transformToArray 方法 将数据变成简单的 Array 集合</p>
+	<p class="highlight_red">3、对于异步加载模式下，尚未加载的子节点是无法通过此方法获取的。</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 获取全部节点数据</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getNodes();
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.getNodesByFilter.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.getNodesByFilter.html
new file mode 100644
index 0000000..6917425
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.getNodesByFilter.html
@@ -0,0 +1,43 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(filter, isSingle, parentNode, invokeParam)</span><span class="path">zTreeObj.</span>getNodesByFilter</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>根据自定义规则搜索节点数据 JSON 对象集合 或 单个节点数据</p>
+			<p class="highlight_red">可自定义复杂的搜索规则</p>
+			<p class="highlight_red">请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>filter</b><span>Function</span></h4>
+	<p>自定义过滤器函数 function filter(node) {...}</p>
+	<p>filter 参数：node (节点数据 JSON)</p>
+	<p>filter 返回值：boolean (true 表示符合搜索条件；false 表示不符合搜索条件)</p>
+	<h4 class="topLine"><b>isSingle</b><span>Boolean</span></h4>
+	<p>isSingle = true 表示只查找单个节点</p>
+	<p>isSingle = false 表示查找节点集合</p>
+	<p class="highlight_red">忽略此参数，表示查找节点集合</p>
+	<h4 class="topLine"><b>parentNode</b><span>JSON</span></h4>
+	<p>可以指定在某个父节点下的子节点中搜索</p>
+	<p class="highlight_red">忽略此参数，表示在全部节点中搜索</p>
+	<h4 class="topLine"><b>invokeParam</b><span>任意类型</span></h4>
+	<p>用户自定义的数据对象，用于 filter 中进行计算</p>
+	<h4 class="topLine"><b>返回值</b><span>Array(JSON) / JSON</span></h4>
+	<p>isSingle = true 返回 第一个找到的节点数据 JSON，无结果时返回 null</p>
+	<p>isSingle = false 返回 节点数据集合 Array(JSON)，无结果时返回 [ ]</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 查找 level = 2 & name 中包含 "test" 的节点数据</h4>
+	<pre xmlns=""><code>function filter(node) {
+    return (node.level == 2 && node.name.indexOf("test")>-1);
+}
+......
+var treeObj = $.fn.zTree.getZTreeObj("tree");
+var node = treeObj.getNodesByFilter(filter, true); // 仅查找一个节点
+var nodes = treeObj.getNodesByFilter(filter); // 查找节点集合
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.getNodesByParam.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.getNodesByParam.html
new file mode 100644
index 0000000..cf45939
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.getNodesByParam.html
@@ -0,0 +1,31 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(key, value, parentNode)</span><span class="path">zTreeObj.</span>getNodesByParam</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>根据节点数据的属性搜索，获取条件完全匹配的节点数据 JSON 对象集合</p>
+			<p class="highlight_red">请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>key</b><span>String</span></h4>
+	<p>需要精确匹配的属性名称</p>
+	<h4 class="topLine"><b>value</b><span>?</span></h4>
+	<p>需要精确匹配的属性值，可以是任何类型，只要保证与 key 指定的属性值保持一致即可</p>
+	<h4 class="topLine"><b>parentNode</b><span>JSON</span></h4>
+	<p>可以指定在某个父节点下的子节点中搜索</p>
+	<p class="highlight_red">忽略此参数，表示在全部节点中搜索</p>
+	<h4 class="topLine"><b>返回值</b><span>Array(JSON)</span></h4>
+	<p>匹配精确搜索的节点数据集合</p>
+	<p class="highlight_red">如无结果，返回 [ ]</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 查找 name = "test" 的节点数据</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getNodesByParam("name", "test", null);
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.getNodesByParamFuzzy.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.getNodesByParamFuzzy.html
new file mode 100644
index 0000000..04d183f
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.getNodesByParamFuzzy.html
@@ -0,0 +1,32 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(key, value, parentNode)</span><span class="path">zTreeObj.</span>getNodesByParamFuzzy</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>根据节点数据的属性搜索，获取条件模糊匹配的节点数据 JSON 对象集合</p>
+			<p class="highlight_red">请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>key</b><span>String</span></h4>
+	<p>需要模糊匹配的属性名称</p>
+	<h4 class="topLine"><b>value</b><span>String</span></h4>
+	<p>需要模糊匹配的属性值</p>
+	<p class="highlight_red">模糊匹配只能针对 String 类型的数据</p>
+	<h4 class="topLine"><b>parentNode</b><span>JSON</span></h4>
+	<p>可以指定在某个父节点下的子节点中搜索</p>
+	<p class="highlight_red">忽略此参数，表示在全部节点中搜索</p>
+	<h4 class="topLine"><b>返回值</b><span>Array(JSON)</span></h4>
+	<p>匹配模糊搜索的节点数据集合</p>
+	<p class="highlight_red">如无结果，返回 [ ]</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 查找 name 包含 "test" 的节点数据</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getNodesByParamFuzzy("name", "test", null);
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.getSelectedNodes.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.getSelectedNodes.html
new file mode 100644
index 0000000..ab36f8e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.getSelectedNodes.html
@@ -0,0 +1,23 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function()</span><span class="path">zTreeObj.</span>getSelectedNodes</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>获取 zTree 当前被选中的节点数据集合</p>
+			<p class="highlight_red">请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>返回值</b><span>Array(JSON)</span></h4>
+	<p>当前被选中的节点数据集合</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 获取当前被选中的节点数据集合</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getSelectedNodes();
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.hideNode.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.hideNode.html
new file mode 100644
index 0000000..a1996b8
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.hideNode.html
@@ -0,0 +1,29 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeNode)</span><span class="path">zTreeObj.</span>hideNode</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exhide</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>隐藏某个节点。</p>
+			<p class="highlight_red">1、此功能不支持 exedit 扩展，因此不要在编辑状态时使用隐藏节点的方法。</p>
+			<p class="highlight_red">2、隐藏/显示节点，会影响节点的 isFirstNode 和 isLastNode 属性。</p>
+			<p class="highlight_red">3、请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeNode</b><span>JSON</span></h4>
+	<p>指定被隐藏的节点 JSON 数据</p>
+	<p class="highlight_red">请务必保证此节点数据对象 是 zTree 内部的数据对象</p>
+	<h4 class="topLine"><b>返回值</b><span>无</span></h4>
+	<p>目前无任何返回值</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 隐藏根节点第一个节点</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getNodes();
+treeObj.hideNode(nodes[0]);
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.hideNodes.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.hideNodes.html
new file mode 100644
index 0000000..cf752b5
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.hideNodes.html
@@ -0,0 +1,29 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeNodes)</span><span class="path">zTreeObj.</span>hideNodes</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exhide</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>隐藏一批节点。</p>
+			<p class="highlight_red">1、此功能不支持 exedit 扩展，因此不要在编辑状态时使用隐藏节点的方法。</p>
+			<p class="highlight_red">2、隐藏/显示节点，会影响节点的 isFirstNode 和 isLastNode 属性。</p>
+			<p class="highlight_red">3、请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeNodes</b><span>Array(JSON)</span></h4>
+	<p>指定被隐藏的节点 JSON 数据集合</p>
+	<p class="highlight_red">请务必保证这些节点数据对象 是 zTree 内部的数据对象</p>
+	<h4 class="topLine"><b>返回值</b><span>无</span></h4>
+	<p>目前无任何返回值</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 隐藏根节点第一个节点的子节点</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getNodes();
+treeObj.hideNodes(nodes[0].children);
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.moveNode.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.moveNode.html
new file mode 100644
index 0000000..27f225a
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.moveNode.html
@@ -0,0 +1,46 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(targetNode, treeNode, moveType, isSilent)</span><span class="path">zTreeObj.</span>moveNode</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>移动节点。</p>
+			<p class="highlight_red">请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>targetNode</b><span>JSON</span></h4>
+	<p>要移动到的目标节点 JSON 数据</p>
+	<p class="highlight_red">如果移动成为根节点，请设置 targetNode 为 null 即可</p>
+	<p class="highlight_red">请务必保证此节点数据对象 是 zTree 内部的数据对象</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>需要被移动的节点数据</p>
+	<p class="highlight_red">请务必保证此节点数据对象 是 zTree 内部的数据对象</p>
+	<h4 class="topLine"><b>moveType</b><span>String</span></h4>
+	<p>指定移动到目标节点的相对位置</p>
+	<p class="highlight_red">"inner"：成为子节点，"prev"：成为同级前一个节点，"next"：成为同级后一个节点</p>
+	<h4 class="topLine"><b>isSilent</b><span>Boolean</span></h4>
+	<p>设定移动节点后是否自动展开父节点。</p>
+	<p>isSilent = true 时，不展开父节点，其他值或缺省状态都自动展开。</p>
+	<h4 class="topLine"><b>返回值</b><span>JSON</span></h4>
+	<p>返回值是最终被移动的节点数据，正常情况下与 treeNode 参数完全相同</p>
+	<p class="highlight_red">如果 返回值 为 null，说明 移动失败，主要原因有：<br/>
+		&nbsp;1、targetNode 是 treeNode 父节点，且 moveType = "inner"<br/>
+		&nbsp;2、targetNode 是 treeNode 子孙节点
+	</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 将根节点中第二个节点 移动成为 第一个节点的子节点</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getNodes();
+treeObj.moveNode(nodes[0], nodes[1], "inner");
+</code></pre>
+	<h4>2. 将根节点中第二个节点 移动成为 第一个节点的前一个节点</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getNodes();
+treeObj.moveNode(nodes[0], nodes[1], "before");
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.reAsyncChildNodes.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.reAsyncChildNodes.html
new file mode 100644
index 0000000..4a354e2
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.reAsyncChildNodes.html
@@ -0,0 +1,42 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(parentNode, reloadType, isSilent)</span><span class="path">zTreeObj.</span>reAsyncChildNodes</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>强行异步加载父节点的子节点。<span class="highlight_red">[setting.async.enable = true 时有效]</span></p>
+			<p class="highlight_red">已经加载过的父节点可反复使用此方法重新加载。</p>
+			<p class="highlight_red">请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>parentNode</b><span>JSON</span></h4>
+	<p>指定需要异步加载的父节点 JSON 数据</p>
+	<p class="highlight_red">1、parentNode = null 时，相当于从根节点 Root 进行异步加载</p>
+	<p class="highlight_red">2、parentNode.isParent = false 时，不进行异步加载</p>
+	<p class="highlight_red">3、请务必保证此节点数据对象 是 zTree 内部的数据对象</p>
+	<h4 class="topLine"><b>reloadType</b><span>String</span></h4>
+	<p>reloadType = "refresh" 表示清空后重新加载。</p>
+	<p>reloadType != "refresh" 时，表示追加子节点处理。</p>
+	<h4 class="topLine"><b>isSilent</b><span>Boolean</span></h4>
+	<p>设定异步加载后是否自动展开父节点。</p>
+	<p>isSilent = true 时，不展开父节点，其他值或缺省状态都自动展开。</p>
+	<h4 class="topLine"><b>返回值</b><span>无</span></h4>
+	<p>目前无任何返回值</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 重新异步加载 zTree </h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+treeObj.reAsyncChildNodes(null, "refresh");
+</code></pre>
+	<h4>2. 重新异步加载当前选中的第一个节点</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getSelectedNodes();
+if (nodes.length>0) {
+	treeObj.reAsyncChildNodes(nodes[0], "refresh");
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.refresh.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.refresh.html
new file mode 100644
index 0000000..09a74ca
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.refresh.html
@@ -0,0 +1,24 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function()</span><span class="path">zTreeObj.</span>refresh</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>刷新 zTree 。</p>
+			<p class="highlight_red">没有特殊必要，尽量不要使用此方法。单个节点更新请使用 updateNode 方法，异步加载模式下请使用 reAsyncChildNodes 方法。</p>
+			<p class="highlight_red">请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>返回值</b><span>无</span></h4>
+	<p>目前无任何返回值</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 刷新 zTree </h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+treeObj.refresh();
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.removeChildNodes.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.removeChildNodes.html
new file mode 100644
index 0000000..588639f
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.removeChildNodes.html
@@ -0,0 +1,32 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(parentNode)</span><span class="path">zTreeObj.</span>removeChildNodes</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>清空某父节点的子节点。</p>
+			<p class="highlight_red">1、清空子节点后，父节点会自动变为叶子节点，如需要父节点保持父节点状态，请设置 setting.data.keep.parent 属性。</p>
+			<p class="highlight_red">2、请勿用此方法清空根节点，如果需要清空根节点，直接初始化 zTree，并且设置初始节点为 null 即可。</p>
+			<p class="highlight_red">3、此方法不会触发任何事件回调函数。</p>
+			<p class="highlight_red">请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>parentNode</b><span>JSON</span></h4>
+	<p>需要清空子节点的父节点数据</p>
+	<p class="highlight_red">请务必保证此节点数据对象 是 zTree 内部的数据对象</p>
+	<h4 class="topLine"><b>返回值</b><span>Array(JSON)</span></h4>
+	<p>将该父节点的子节点数据返回，如果不存在则返回 null</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 清空选中的第一个节点的子节点</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getSelectedNodes();
+if (nodes && nodes.length>0) {
+	treeObj.removeChildNodes(nodes[0]);
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.removeNode.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.removeNode.html
new file mode 100644
index 0000000..442f5c7
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.removeNode.html
@@ -0,0 +1,34 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeNode, callbackFlag)</span><span class="path">zTreeObj.</span>removeNode</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>删除节点。</p>
+			<p class="highlight_red">v3.x 中删除节点可以触发 beforeRemove / onRemove 事件回调函数。便于减少冗余代码</p>
+			<p class="highlight_red">请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeNode</b><span>JSON</span></h4>
+	<p>需要被删除的节点数据</p>
+	<p class="highlight_red">请务必保证此节点数据对象 是 zTree 内部的数据对象</p>
+	<h4 class="topLine"><b>callbackFlag</b><span>Boolean</span></h4>
+	<p>callbackFlag = true 表示执行此方法时触发 beforeRemove & onRemove 事件回调函数</p>
+	<p>callbackFlag = false 表示执行此方法时不触发事件回调函数</p>
+	<p class="highlight_red">省略此参数，等同于 false</p>
+	<h4 class="topLine"><b>返回值</b><span>无</span></h4>
+	<p>目前无任何返回值</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 删除所有选中的节点</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getSelectedNodes();
+for (var i=0, l=nodes.length; i < l; i++) {
+	treeObj.removeNode(nodes[i]);
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.selectNode.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.selectNode.html
new file mode 100644
index 0000000..6e80d81
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.selectNode.html
@@ -0,0 +1,34 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeNode, addFlag)</span><span class="path">zTreeObj.</span>selectNode</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>选中指定节点</p>
+			<p class="highlight_red">v3.x 支持同时选中多个节点。</p>
+			<p class="highlight_red">请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeNode</b><span>JSON</span></h4>
+	<p>需要被选中的节点数据</p>
+	<p class="highlight_red">请务必保证此节点数据对象 是 zTree 内部的数据对象</p>
+	<h4 class="topLine"><b>addFlag</b><span>Boolean</span></h4>
+	<p>addFlag = true 表示追加选中，会出现多点同时被选中的情况</p>
+	<p>addFlag = false 表示单独选中，原先被选中的节点会被取消选中状态</p>
+	<p class="highlight_red">setting.view.selectedMulti = false 时，此参数无效，始终进行单独选中</p>
+	<h4 class="topLine"><b>返回值</b><span>无</span></h4>
+	<p>目前无任何返回值</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 单独选中根节点中第一个节点</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getNodes();
+if (nodes.length>0) {
+	treeObj.selectNode(nodes[0]);
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.setChkDisabled.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.setChkDisabled.html
new file mode 100644
index 0000000..b042ab4
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.setChkDisabled.html
@@ -0,0 +1,44 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(node, disabled, inheritParent, inheritChildren)</span><span class="path">zTreeObj.</span>setChkDisabled</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.excheck</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>禁用 或 解禁 某个节点的 checkbox / radio <span class="highlight_red">[setting.check.enable = true 时有效]</span></p>
+			<p class="highlight_red">1、节点的 checkbox / radio 被禁用后，无法勾选或取消勾选，但能够影响父节点的半选状态</p>
+			<p class="highlight_red">2、请不要直接修改已加载节点的 treeNode.chkDisabled 属性。</p>
+			<p class="highlight_red">3、请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeNode</b><span>JSON</span></h4>
+	<p>需要禁用 或 解禁 checkbox / radio 的节点数据</p>
+	<p class="highlight_red">请务必保证此节点数据对象 是 zTree 内部的数据对象</p>
+	<h4 class="topLine"><b>disabled</b><span>Boolean</span></h4>
+	<p>disabled = true  表示禁用 checkbox / radio</p>
+	<p>disabled = false 表示解禁 checkbox / radio</p>
+	<p class="highlight_red">省略此参数，等同于 disabled = false </p>
+	<p class="highlight_red">不影响 treeNode.nochecked = true 的节点。</p>
+	<h4 class="topLine"><b>inheritParent</b><span>Boolean</span></h4>
+	<p>inheritParent = true 表示全部父节点进行同样的操作</p>
+	<p>inheritParent = false 表示不影响父节点</p>
+	<p class="highlight_red">省略此参数，等同于 inheritParent = false </p>
+	<h4 class="topLine"><b>inheritChildren</b><span>Boolean</span></h4>
+	<p>inheritChildren = true 表示全部子节点进行同样的操作</p>
+	<p>inheritChildren = false 表示不影响子节点</p>
+	<p class="highlight_red">省略此参数，等同于 inheritChildren = false </p>
+	<h4 class="topLine"><b>返回值</b><span>无</span></h4>
+	<p>目前无任何返回值</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 禁用当前选中的节点的 checkbox / radio</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getSelectedNodes();
+for (var i=0, l=nodes.length; i < l; i++) {
+	treeObj.setChkDisabled(nodes[i], true);
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.setEditable.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.setEditable.html
new file mode 100644
index 0000000..c90c8de
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.setEditable.html
@@ -0,0 +1,27 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(editable)</span><span class="path">zTreeObj.</span>setEditable</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exedit</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>设置 zTree 进入 / 取消 编辑状态。</p>
+			<p class="highlight_red">对于编辑状态的各种功能需要提前设置对应 setting 中的不同属性</p>
+			<p class="highlight_red">请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>editable</b><span>Boolean</span></h4>
+	<p>true 表示进入 编辑状态</p>
+	<p>false 表示取消 编辑状态</p>
+	<h4 class="topLine"><b>返回值</b><span>无</span></h4>
+	<p>目前无任何返回值</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 设置 zTree 进入编辑状态</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+treeObj.setEditable(true);
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.setting.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.setting.html
new file mode 100644
index 0000000..61abd53
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.setting.html
@@ -0,0 +1,13 @@
+<div class="apiDetail">
+<div>
+	<h2><span>JSON</span><span class="path">zTreeObj.</span>setting</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>zTree 对象使用的 setting 配置数据，详细请参考 “setting 配置详解”中的各个属性详细说明</p>
+			<p class="highlight_red">v3.x 取消了原先操作 setting 的方法，让用户可以较自由的修改参数，但请注意，对于 zTree 初始化有影响的参数后期修改是不会起作用的，请对各个属性有较深入的了解以后再考虑进行修改。</p>
+		</div>
+	</div>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.showNode.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.showNode.html
new file mode 100644
index 0000000..ed22d51
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.showNode.html
@@ -0,0 +1,31 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeNode)</span><span class="path">zTreeObj.</span>showNode</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exhide</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>显示某个被隐藏的节点。</p>
+			<p class="highlight_red">1、此功能不支持 exedit 扩展，因此不要在编辑状态时使用隐藏节点的方法。</p>
+			<p class="highlight_red">2、隐藏/显示节点，会影响节点的 isFirstNode 和 isLastNode 属性。</p>
+			<p class="highlight_red">3、请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeNode</b><span>JSON</span></h4>
+	<p>指定被显示的节点 JSON 数据</p>
+	<p class="highlight_red">请务必保证此节点数据对象 是 zTree 内部的数据对象</p>
+	<h4 class="topLine"><b>返回值</b><span>无</span></h4>
+	<p>目前无任何返回值</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 显示某个隐藏的节点</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var node = treeObj.getNodeByParam("isHidden", true);
+if (node) {
+  treeObj.showNode(node);
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.showNodes.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.showNodes.html
new file mode 100644
index 0000000..b090657
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.showNodes.html
@@ -0,0 +1,29 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeNodes)</span><span class="path">zTreeObj.</span>showNodes</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.exhide</span> 扩展 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>显示一批已经被隐藏的节点。</p>
+			<p class="highlight_red">1、此功能不支持 exedit 扩展，因此不要在编辑状态时使用隐藏节点的方法。</p>
+			<p class="highlight_red">2、隐藏/显示节点，会影响节点的 isFirstNode 和 isLastNode 属性。</p>
+			<p class="highlight_red">3、请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeNodes</b><span>Array(JSON)</span></h4>
+	<p>指定被显示的节点 JSON 数据集合</p>
+	<p class="highlight_red">请务必保证这些节点数据对象 是 zTree 内部的数据对象</p>
+	<h4 class="topLine"><b>返回值</b><span>无</span></h4>
+	<p>目前无任何返回值</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 显示全部隐藏的节点</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getNodesByParam("isHidden", true);
+treeObj.showNodes(nodes);
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.transformToArray.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.transformToArray.html
new file mode 100644
index 0000000..a46dc61
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.transformToArray.html
@@ -0,0 +1,25 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeNodes)</span><span class="path">zTreeObj.</span>transformToArray</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>将 zTree 使用的标准 JSON 嵌套格式的数据转换为简单 Array 格式。(免去用户自行编写递归遍历全部节点的麻烦)</p>
+			<p class="highlight_red">请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeNodes</b><span>Array(JSON) / JSON</span></h4>
+	<p>需要被转换的 zTree 节点数据对象集合 或 某个单独节点的数据对象</p>
+	<h4 class="topLine"><b>返回值</b><span>Array(JSON)</span></h4>
+	<p>转换后的简单 Array 数据格式</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 将 zTree 节点数据转换为简单 Array 格式</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.transformToArray(treeObj.getNodes());
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.transformTozTreeNodes.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.transformTozTreeNodes.html
new file mode 100644
index 0000000..8a52770
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.transformTozTreeNodes.html
@@ -0,0 +1,43 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(simpleNodes)</span><span class="path">zTreeObj.</span>transformTozTreeNodes</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>将简单 Array 格式数据转换为 zTree 使用的标准 JSON 嵌套数据格式。</p>
+			<p class="highlight_red">使用此方法，请务必设置节点唯一标识属性名称 setting.data.simpleData.idKey 和 父节点唯一标识属性名称 setting.data.simpleData.pIdKey，并且让数据满足父子关系。</p>
+			<p class="highlight_red">请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>simpleNodes</b><span>Array(JSON) / JSON</span></h4>
+	<p>需要被转换的简单 Array 格式数据 或 某个单独的数据对象</p>
+	<h4 class="topLine"><b>返回值</b><span>Array(JSON)</span></h4>
+	<p>zTree 使用的标准数据，子节点都存在于父节点数据的 children 属性中</p>
+	<p class="highlight_red">如果 simpleNodes 是一个 JSON 对象，则被简单封装成长度为 1 的数组。</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 将简单 Array 格式转换为zTree使用的标准格式</h4>
+	<pre xmlns=""><code>var setting = {
+	data: {
+		simpleData: {
+			enable: true,
+			idKey: "id",
+			pIdKey: "pId",
+			rootPId: 0,
+		}
+	}
+};
+var simpleNodes = [
+    {"id":1, "pId":0, "name":"test1"},
+    {"id":11, "pId":1, "name":"test11"},
+    {"id":12, "pId":1, "name":"test12"},
+    {"id":111, "pId":11, "name":"test111"}
+];
+var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.transformTozTreeNodes(simpleNodes);
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.updateNode.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.updateNode.html
new file mode 100644
index 0000000..847fa6e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/cn/zTreeObj.updateNode.html
@@ -0,0 +1,37 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeNode, checkTypeFlag)</span><span class="path">zTreeObj.</span>updateNode</h2>
+	<h3>概述<span class="h3_info">[ 依赖 <span class="highlight_green">jquery.ztree.core</span> 核心 js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>更新某节点数据，主要用于该节点显示属性的更新。</p>
+			<p class="highlight_red">1、可针对 name、target、 url、icon、 iconSkin、checked、nocheck 等这几个用于显示效果的参数进行更新，其他用于 zTreeNodes 的参数请不要随意更新，对于展开节点，还请调用 expandNode方法，因此请勿随意修改 open 属性。</p>
+			<p class="highlight_red">2、用此方法修改 checked 勾选状态不会触发 beforeCheck / onCheck 事件回调函数。</p>
+			<p class="highlight_red">请通过 zTree 对象执行此方法。</p>
+		</div>
+	</div>
+	<h3>Function 参数说明</h3>
+	<div class="desc">
+	<h4><b>treeNode</b><span>JSON</span></h4>
+	<p>指定需要更新的节点 JSON 数据</p>
+	<p class="highlight_red">请务必保证此节点数据对象 是 zTree 内部的数据对象</p>
+	<h4 class="topLine"><b>checkTypeFlag</b><span>Boolean</span></h4>
+	<p>checkTypeFlag = true 表示按照 setting.check.chkboxType 属性进行父子节点的勾选联动操作</p>
+	<p>checkTypeFlag = false 表示只修改此节点勾选状态，无任何勾选联动操作</p>
+	<p class="highlight_red">当 setting.check.enable = true 且 setting.check.chkStyle = "checkbox" 时才有效</p>
+	<p class="highlight_red">不影响父子节点中 treeNode.nochecked = true 的节点。</p>
+	<h4 class="topLine"><b>返回值</b><span>无</span></h4>
+	<p>目前无任何返回值</p>
+	</div>
+	<h3>function 举例</h3>
+	<h4>1. 更新根节点中第一个节点的名称</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getNodes();
+if (nodes.length>0) {
+	nodes[0].name = "test";
+	treeObj.updateNode(nodes[0]);
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/fn.zTree._z.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/fn.zTree._z.html
new file mode 100644
index 0000000..61da261
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/fn.zTree._z.html
@@ -0,0 +1,13 @@
+<div class="apiDetail">
+<div>
+	<h2><span>JSON</span><span class="path">$.fn.zTree.</span>_z</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>All of the methods in zTree v3.x are available through the '$. fn.zTree._z' calls, open it for you to develop your own zTree plug-ins.</p>
+			<p class="highlight_red">If you have no special requirements, please don't use this object, and don't modify the methods in this object.</p>
+		</div>
+	</div>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/fn.zTree.destroy.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/fn.zTree.destroy.html
new file mode 100644
index 0000000..3a31699
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/fn.zTree.destroy.html
@@ -0,0 +1,28 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId)</span><span class="path">$.fn.zTree.</span>destroy</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>From zTree v3.4, zTree support the method for destruction.</p>
+			<p>1. This method can destroy the zTree with specify treeId, and can destroy all of the zTrees.</p>
+			<p class="highlight_red">2. If you want to destory some one zTree, you can use the 'zTreeObj.destroy()' method.</p>
+			<p class="highlight_red">3. If you want to use the tree which has been destroyed, you must use the 'init()' method at first.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier</p>
+	<p class="highlight_red">If this parameter is omitted, then will destroy all of the zTrees.</p>
+	<h4 class="topLine"><b>Return </b><span>none</span></h4>
+	<p>no return value</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. destroy the zTree which its id is 'treeDemo'</h4>
+	<pre xmlns=""><code>$.fn.zTree.destroy("treeDemo");</code></pre>
+	<h4>2. destroy all of the zTrees</h4>
+	<pre xmlns=""><code>$.fn.zTree.destroy();</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/fn.zTree.getZTreeObj.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/fn.zTree.getZTreeObj.html
new file mode 100644
index 0000000..2bc0447
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/fn.zTree.getZTreeObj.html
@@ -0,0 +1,25 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId)</span><span class="path">$.fn.zTree.</span>getZTreeObj</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>zTree v3.x specifically provide the method which can use the tree's Id to get zTree object.</p>
+			<p class="highlight_red">Please initialize zTree first, then you can use this method.</p>
+			<p>Users don't need to set the global variable to hold the zTree object, and all of the callback will return 'treeId' parameters, the user can always use this method to get the zTree object.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier</p>
+	<h4 class="topLine"><b>Return </b><span>JSON</span></h4>
+	<p>zTree object</p>
+	<p>This object can provide the methods of operate the zTree</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. Get the zTree object which id is 'tree'</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/fn.zTree.init.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/fn.zTree.init.html
new file mode 100644
index 0000000..cf97d2b
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/fn.zTree.init.html
@@ -0,0 +1,75 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(obj, zSetting, zNodes)</span><span class="path">$.fn.zTree.</span>init</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>The method which used to create zTree.</p>
+			<p>1. The web page need to use W3C markup. For example: &lt;!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"&nbsp;&nbsp; &nbsp;"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"&gt;</p>
+			<p>2. Need to load jquery-1.4.2.js or other higher versions.</p>
+			<p>3. Need to load jquery-ztree.core-3.0.js. If you need to use the edit mode or checkbox / radio mode, you need to load jquery-ztree.exedit-3.0.js and jquery-ztree.excheck-3.0.js.</p>
+			<p>4. Need to load zTreeStyle.css and image files</p>
+			<p>5. If you need to use custom icons, please refer to the appropriate Demo.</p>
+			<p>6. Note: You need to set zTree container's class name to "ztree". If you need to change, don't forget to modify the css file. If you need other special styles, can modify the css file to their own needs.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>object</b><span>jQuery Object</span></h4>
+	<p>DOM Container for zTree</p>
+	<h4 class="topLine"><b>zSetting</b><span>JSON</span></h4>
+	<p>zTree's configuration data, please refer to "setting details" in the API Document.</p>
+	<h4 class="topLine"><b>zNodes</b><span>Array(JSON) / JSON</span></h4>
+	<p>zTree's node data, please refer to "treeNode data details" in the API Document.</p>
+	<p class="highlight_red">1. zTree v3.x support to add single node, that is, if only to add one node, you can use JSON without using Array.</p>
+	<p class="highlight_red">2. If you need asynchronous load root nodes, can be set to null or [ ]</p>
+	<p class="highlight_red">3. If you use simple data mode, please refer to "setting.data.simpleData" in the API Document.</p>
+	<h4 class="topLine"><b>Return </b><span>JSON</span></h4>
+	<p>zTree object</p>
+	<p>This object can provide the methods of operate the zTree</p>
+	<p class="highlight_red">You can use $.fn.zTree.getZTreeObj method at any time to obtain.</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. create a simple tree</h4>
+	<pre xmlns=""><code>&lt;!DOCTYPE html&gt;
+&lt;HTML&gt;
+ &lt;HEAD&gt;
+  &lt;TITLE&gt; ZTREE DEMO &lt;/TITLE&gt;
+  &lt;meta http-equiv="content-type" content="text/html; charset=UTF-8"&gt;
+  &lt;link rel="stylesheet" href="zTreeStyle/zTreeStyle.css" type="text/css"&gt;
+  &lt;script type="text/javascript" src="jquery-1.4.2.js"&gt;&lt;/script&gt;
+  &lt;script type="text/javascript" src="jquery.ztree.core-3.5.js"&gt;&lt;/script&gt;
+&lt;!--
+  &lt;script type="text/javascript" src="jquery.ztree.excheck-3.5.js"&gt;&lt;/script&gt;
+  &lt;script type="text/javascript" src="jquery.ztree.exedit-3.5.js"&gt;&lt;/script&gt;
+--&gt;
+  &lt;SCRIPT type="text/javascript" &gt;
+	var zTreeObj,
+	setting = {
+		view: {
+			selectedMulti: false
+		}
+	},
+	zTreeNodes = [
+		{"name":"Site Map", open:true, children: [
+			{ "name":"google", "url":"http://www.google.com", "target":"_blank"},
+			{ "name":"baidu", "url":"http://baidu.com", "target":"_blank"},
+			{ "name":"sina", "url":"http://www.sina.com.cn", "target":"_blank"}
+			]
+		}
+	];
+
+	$(document).ready(function(){
+		zTreeObj = $.fn.zTree.init($("#tree"), setting, zTreeNodes);
+
+	});
+  &lt;/SCRIPT&gt;
+ &lt;/HEAD&gt;
+
+&lt;BODY&gt;
+&lt;ul id="tree" class="ztree" style="width:230px; overflow:auto;"&gt;&lt;/ul&gt;
+ &lt;/BODY&gt;
+&lt;/HTML&gt;</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.async.autoParam.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.async.autoParam.html
new file mode 100644
index 0000000..85cd469
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.async.autoParam.html
@@ -0,0 +1,39 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Array(String)</span><span class="path">setting.async.</span>autoParam</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Required automatically submit the parameters about the properties of the parent node, when the asynchronous load. It is valid when <span class="highlight_red">[setting.async.enable = true]</span></p>
+			<p>Default：[ ]</p>
+		</div>
+	</div>
+	<h3>Array(String) Format</h3>
+	<div class="desc">
+	<p>1. Just save the attribute name of node to the array. For example: ["id", "name"]</p>
+	<p>2. You can change the parameter name. For example: server only accepts "zId" -- ["id=zId"]</p>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. set auto commit 'id' attribute</h4>
+	<pre xmlns=""><code>var setting = {
+	async: {
+		enable: true,
+		url: "http://host/getNode.php",
+		autoParam: ["id"]
+	}
+};
+If have the parent node: {id:1, name:"test"}, When asynchronously load this parent node's child nodes, will be submitted parameters: id=1
+......</code></pre>
+	<h4>2. set auto commit 'id' attribute, but parameter name is 'zId'</h4>
+	<pre xmlns=""><code>var setting = {
+	async: {
+		enable: true,
+		url: "http://host/getNode.php",
+		autoParam: ["id=zId"]
+	}
+};
+If have the parent node: {id:1, name:"test"}, When asynchronously load this parent node's child nodes, will be submitted parameters: zId=1
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.async.contentType.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.async.contentType.html
new file mode 100644
index 0000000..cc9bfcd
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.async.contentType.html
@@ -0,0 +1,29 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">setting.async.</span>contentType</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>When Ajax sending data to the server, use this content-type. It is valid when <span class="highlight_red">[setting.async.enable = true]</span></p>
+			<p>Default："application/x-www-form-urlencoded"</p>
+		</div>
+	</div>
+	<h3>String Format</h3>
+	<div class="desc">
+	<p> contentType = "application/x-www-form-urlencoded", means: the sending data format is "form" format.</p>
+	<p> contentType = "application/json",  means: the sending data format is "json" format. (for .Net)</p>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. set the sending data format to "json" format.</h4>
+	<pre xmlns=""><code>var setting = {
+	async: {
+		enable: true,
+		contentType: "application/json",
+		url: "http://host/getNode.php",
+		autoParam: ["id", "name"]
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.async.dataFilter.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.async.dataFilter.html
new file mode 100644
index 0000000..34733e4
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.async.dataFilter.html
@@ -0,0 +1,45 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, parentNode, responseData)</span><span class="path">setting.async.</span>dataFilter</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Function used to pre-process for the return data of Ajax. It is valid when <span class="highlight_red">[setting.async.enable = true]</span></p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>parentNode</b><span>JSON</span></h4>
+	<p>Parent node's JSON data object</p>
+	<p class="highlight_red">When asynchronously loading the root, the parentNode = null</p>
+	<h4 class="topLine"><b>responseData</b><span>Array(JSON) / JSON / String</span></h4>
+	<p>Ajax got Array (JSON) / JSON / String data objects</p>
+	<p class="highlight_red">From v3.4, support the string with XML format.</p>
+	<h4 class="topLine"><b>Return </b><span>Array(JSON) / JSON</span></h4>
+	<p>The return value should be the JSON data structure which is supported by the zTree.</p>
+	<p class="highlight_red">v3.x supports to load single node JSON data object.</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. Modify the node name attribute which is ajax got.</h4>
+	<pre xmlns=""><code>function ajaxDataFilter(treeId, parentNode, responseData) {
+    if (responseData) {
+      for(var i =0; i < responseData.length; i++) {
+        responseData[i].name += "_filter";
+      }
+    }
+    return responseData;
+};
+var setting = {
+	async: {
+		enable: true,
+		url: "http://host/getNode.php",
+		dataFilter: ajaxDataFilter
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.async.dataType.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.async.dataType.html
new file mode 100644
index 0000000..e6672e9
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.async.dataType.html
@@ -0,0 +1,29 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">setting.async.</span>dataType</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>The data type of Ajax. It is valid when <span class="highlight_red">[setting.async.enable = true]</span></p>
+			<p>Default："text"</p>
+		</div>
+	</div>
+	<h3>String Format</h3>
+	<div class="desc">
+	<p> dataType = "text", It can meet most of the needs.</p>
+	<p class="highlight_red">The 'dataType' in zTree and jQuery's ajax is same.</p>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. Set the dataType which ajax got is text.</h4>
+	<pre xmlns=""><code>var setting = {
+	async: {
+		enable: true,
+		dataType: "text",
+		url: "http://host/getNode.php",
+		autoParam: ["id", "name"]
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.async.enable.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.async.enable.html
new file mode 100644
index 0000000..806ba6c
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.async.enable.html
@@ -0,0 +1,30 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.async.</span>enable</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Set zTree asynchronous loading mode is turned on or off.</p>
+			<p>Default: false</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p> true - turn on asynchronous loading mode</p>
+	<p> false - turn off asynchronous loading mode</p>
+	<p class="highlight_red">If set it is true, you must set attributes in setting.async</p>
+	<p class="highlight_red">If you don't pass 'treeNodes' parameter when initialize zTree, the root nodes will get by ajax.</p>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. Turn on asynchronous loading mode</h4>
+	<pre xmlns=""><code>var setting = {
+	async: {
+		enable: true,
+		url: "http://host/getNode.php",
+		autoParam: ["id", "name"]
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.async.otherParam.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.async.otherParam.html
new file mode 100644
index 0000000..2e37390
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.async.otherParam.html
@@ -0,0 +1,40 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Array(String) / JSON</span><span class="path">setting.async.</span>otherParam</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>The static parameters of the Ajax request. (key - value) It is valid when <span class="highlight_red">[setting.async.enable = true]</span></p>
+			<p>Default: [ ]</p>
+		</div>
+	</div>
+	<h3>Array(String) Format</h3>
+	<div class="desc">
+	<p>Can be empty array. e.g. [ ].  If set key, you must set value, e.g. [key, value]. ([key] or [key, value, key] is wrong!!)</p>
+	</div>
+	<h3>JSON Format</h3>
+	<div class="desc">
+	<p>Use JSON data format set the key-value. e.g. { key1:value1, key2:value2 }</p>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. Use Array(String) Format</h4>
+	<pre xmlns=""><code>var setting = {
+	async: {
+		enable: true,
+		url: "http://host/getNode.php",
+		otherParam: ["id", "1", "name", "test"]
+	}
+};
+when zTree send ajax, the parameters will has: id=1&name=test</code></pre>
+	<h4>2. Use JSON data Format</h4>
+	<pre xmlns=""><code>var setting = {
+	async: {
+		enable: true,
+		url: "http://host/getNode.php",
+		otherParam: { "id":"1", "name":"test"}
+	}
+};
+when zTree send ajax, the parameters will has: id=1&name=test</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.async.type.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.async.type.html
new file mode 100644
index 0000000..ae54338
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.async.type.html
@@ -0,0 +1,30 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">setting.async.</span>type</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Http request mode in ajax. It is valid when <span class="highlight_red">[setting.async.enable = true]</span></p>
+			<p>Defalut: "post"</p>
+		</div>
+	</div>
+	<h3>String Format</h3>
+	<div class="desc">
+	<p> "post" - http request mode</p>
+	<p> "get" - http request mode</p>
+	<p class="highlight_red">The 'type' in zTree and jQuery's ajax is same.</p>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. Set http request mode is 'get'</h4>
+	<pre xmlns=""><code>var setting = {
+	async: {
+		enable: true,
+		type: "get",
+		url: "http://host/getNode.php",
+		autoParam: ["id", "name"]
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.async.url.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.async.url.html
new file mode 100644
index 0000000..5587f29
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.async.url.html
@@ -0,0 +1,50 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String / Function(treeId, treeNode)</span><span class="path">setting.async.</span>url</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>The URL to which the ajax request is sent. It is valid when <span class="highlight_red">[setting.async.enable = true]</span></p>
+			<p>Default: ""</p>
+		</div>
+	</div>
+	<h3>String Format</h3>
+	<div class="desc">
+	<p>A url string(e.g. "http://www.domain.com"). Note: please ensure that the url can be loaded</p>
+	<p class="highlight_red">Url can also take parameters, please note that transcode.</p>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>Parent node's JSON data object</p>
+	<p class="highlight_red">When asynchronously loading the root, the treeNode = null</p>
+	<h4 class="topLine"><b>Return </b><span>String</span></h4>
+	<p>Return value is same as 'String Format'</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. set ajax url is "nodes.php"</h4>
+	<pre xmlns=""><code>var setting = {
+	async: {
+		enable: true,
+		url: "nodes.php",
+		autoParam: ["id", "name"]
+	}
+};
+......</code></pre>
+	<h4>2. set ajax url is "function"</h4>
+	<pre xmlns=""><code>function getAsyncUrl(treeId, treeNode) {
+    return treeNode.isParent ? "nodes1.php" : "nodes2.php";
+};
+var setting = {
+	async: {
+		enable: true,
+		url: getAsyncUrl,
+		autoParam: ["id", "name"]
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.beforeAsync.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.beforeAsync.html
new file mode 100644
index 0000000..6563ff2
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.beforeAsync.html
@@ -0,0 +1,35 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNode)</span><span class="path">setting.callback.</span>beforeAsync</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to capture the event before zTree execute ajax, zTree based on return value to determine whether to execute ajax.</p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the parent node</p>
+	<p class="highlight_red">When asynchronously loading the root, the treeNode = null</p>
+	<h4 class="topLine"><b>Return </b><span>Boolean</span></h4>
+	<p>return true or false</p>
+	<p class="highlight_red">If return false, zTree will not execute ajax, and will not trigger the 'onAsyncSuccess / onAsyncError' callback.</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. If the parent node's attribute 'id' is 1, zTree will not execute ajax.</h4>
+	<pre xmlns=""><code>function zTreeBeforeAsync(treeId, treeNode) {
+    return (treeNode.id !== 1);
+};
+var setting = {
+	callback: {
+		beforeAsync: zTreeBeforeAsync
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.beforeCheck.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.beforeCheck.html
new file mode 100644
index 0000000..5260412
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.beforeCheck.html
@@ -0,0 +1,34 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNode)</span><span class="path">setting.callback.</span>beforeCheck</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.excheck</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to capture the event before check or uncheck node, zTree based on return value to determine whether to change check state.</p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which is checked or unchecked</p>
+	<h4 class="topLine"><b>Return </b><span>Boolean</span></h4>
+	<p>return true or false</p>
+	<p class="highlight_red">If return false, zTree will not change check state, and will not trigger the 'onCheck' callback.</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. disable to change check state of all nodes, and keep the check state initialization</h4>
+	<pre xmlns=""><code>function zTreeBeforeCheck(treeId, treeNode) {
+    return false;
+};
+var setting = {
+	callback: {
+		beforeCheck: zTreeBeforeCheck
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.beforeClick.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.beforeClick.html
new file mode 100644
index 0000000..8a65448
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.beforeClick.html
@@ -0,0 +1,49 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNode, clickFlag)</span><span class="path">setting.callback.</span>beforeClick</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to capture the event before click node, zTree based on return value to determine whether to trigger the 'onClick' callback.</p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which is clicked</p>
+	<h4 class="topLine"><b>clickFlag</b><span>Number</span></h4>
+	<p>Node is selected or deselected state, please see table below for details</p>
+	<table width="100%" border="0" cellspacing="1" cellpadding="0">
+		<thead><tr><td>clickFlag</td><td title="Whether to allow multi-select">selectedMulti</td><td title="Whether to press Ctrl-key">autoCancelSelected<br/>&&<br/>event.ctrlKey</td><td title="Node's selection state">isSelected</td><td>operate for selected</td></tr></thead>
+		<tbody>
+			<tr><td>1</td><td>true</td><td>false</td><td>false</td><td>node is selected (single)</td></tr>
+			<tr><td>1</td><td>true</td><td>false</td><td>true</td><td>node is selected (single)</td></tr>
+			<tr><td>2</td><td>true</td><td>true</td><td>false</td><td>node is selected (multi)</td></tr>
+			<tr><td>0</td><td>true</td><td>true</td><td>true</td><td>node is deselected</td></tr>
+			<tr><td>1</td><td>false</td><td>false</td><td>false</td><td>node is selected (single)</td></tr>
+			<tr><td>1</td><td>false</td><td>false</td><td>true</td><td>node is selected (single)</td></tr>
+			<tr><td>1</td><td>false</td><td>true</td><td>false</td><td>node is selected (single)</td></tr>
+			<tr><td>0</td><td>false</td><td>true</td><td>true</td><td>node is deselected</td></tr>
+		</tbody>
+	</table>
+	<h4 class="topLine"><b>Return </b><span>Boolean</span></h4>
+	<p>return true or false</p>
+	<p class="highlight_red">If return false, zTree will not change selected state, and will not trigger the 'onClick' callback.</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. disabled to click the node</h4>
+	<pre xmlns=""><code>function zTreeBeforeClick(treeId, treeNode, clickFlag) {
+    return (treeNode.id !== 1);
+};
+var setting = {
+	callback: {
+		beforeClick: zTreeBeforeClick
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.beforeCollapse.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.beforeCollapse.html
new file mode 100644
index 0000000..b2713e8
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.beforeCollapse.html
@@ -0,0 +1,34 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNode)</span><span class="path">setting.callback.</span>beforeCollapse</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to capture the event before collapse node, zTree based on return value to determine whether to collapse node.</p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which will be collapsed</p>
+	<h4 class="topLine"><b>Return </b><span>Boolean</span></h4>
+	<p>return true or false</p>
+	<p class="highlight_red">If return false, zTree will not collapse node, and will not trigger the 'onCollapse' callback.</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. disabled to collapse node which is expanded</h4>
+	<pre xmlns=""><code>function zTreeBeforeCollapse(treeId, treeNode) {
+    return false;
+};
+var setting = {
+	callback: {
+		beforeCollapse: zTreeBeforeCollapse
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.beforeDblClick.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.beforeDblClick.html
new file mode 100644
index 0000000..6f1c743
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.beforeDblClick.html
@@ -0,0 +1,36 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNode)</span><span class="path">setting.callback.</span>beforeDblClick</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to capture the dblclick event before the 'onDblClick' callback, zTree based on return value to determine whether to trigger the 'onDblClick' callback.</p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which is double clicked</p>
+	<p class="highlight_red">If the DOM which dblclicked isn't a node, it will return null.</p>
+	<h4 class="topLine"><b>Return </b><span>Boolean</span></h4>
+	<p>return true or false</p>
+	<p class="highlight_red">If return false, ztree will not trigger the 'onDblClick' callback, no effect on other operations.</p>
+	<p class="highlight_red">This callback function does not affect the dblclick the parent node to auto expand, please refer to setting.view.dblClickExpand properties.</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. disable to trigger the 'onDblClick' callback</h4>
+	<pre xmlns=""><code>function zTreeBeforeDblClick(treeId, treeNode) {
+    return false;
+};
+var setting = {
+	callback: {
+		beforeDblClick: zTreeBeforeDblClick
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.beforeDrag.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.beforeDrag.html
new file mode 100644
index 0000000..5175244
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.beforeDrag.html
@@ -0,0 +1,39 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNodes)</span><span class="path">setting.callback.</span>beforeDrag</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to capture the event before drag node, zTree based on return value to determine whether to start to drag node.</p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, the tree is what the treeNodes are belong to, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNodes</b><span>Array(JSON)</span></h4>
+	<p>A collection of the nodes which will be dragged</p>
+	<p class="highlight_red">v3.x allows drag and drop multiple sibling nodes, so this parameter is modified to Array(JSON).</p>
+	<p class="highlight_red">If the selected nodes aren't the sibling nodes, you can only drag one node which mouse over.</p>
+	<h4 class="topLine"><b>Return </b><span>Boolean</span></h4>
+	<p>return true or false</p>
+	<p class="highlight_red">If return false, zTree will stop drag, and will not trigger the 'onDrag / beforeDrop / onDrop' callback.</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. disable to drag all node</h4>
+	<pre xmlns=""><code>function zTreeBeforeDrag(treeId, treeNodes) {
+    return false;
+};
+var setting = {
+	edit: {
+		enable: true
+	},
+	callback: {
+		beforeDrag: zTreeBeforeDrag
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.beforeDragOpen.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.beforeDragOpen.html
new file mode 100644
index 0000000..ed1ae97
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.beforeDragOpen.html
@@ -0,0 +1,37 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNode)</span><span class="path">setting.callback.</span>beforeDragOpen</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to capture the event when drag node to collapsed parent node, zTree based on return value to determine whether to auto expand parent node.</p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, the tree is what the treeNode(parent node) is belong to, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the parent node which will be auto expanded</p>
+	<h4 class="topLine"><b>Return </b><span>Boolean</span></h4>
+	<p>return true or false</p>
+	<p class="highlight_red">If return false, zTree will not auto expand parent node.</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. disable to auto expand parent node.</h4>
+	<pre xmlns=""><code>function zTreeBeforeDragOpen(treeId, treeNode) {
+    return false;
+};
+var setting = {
+	edit: {
+		enable: true
+	},
+	callback: {
+		beforeDragOpen: zTreeBeforeDragOpen
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.beforeDrop.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.beforeDrop.html
new file mode 100644
index 0000000..7014321
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.beforeDrop.html
@@ -0,0 +1,50 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNodes, targetNode, moveType, isCopy)</span><span class="path">setting.callback.</span>beforeDrop</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to capture the event before drag-drop node, zTree based on return value to determine whether to allow drag-drop node.</p>
+			<p>Default: null</p>
+			<p class="highlight_red">When drop the nodes, if the dragged nodes is not in a valid location, this callback will not triggered, and will restore the original position.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, the tree is what the targetNode is belong to, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNodes</b><span>Array(JSON)</span></h4>
+	<p>A collection of the nodes which has been dragged</p>
+	<p class="highlight_red">The treeNodes are the data of the nodes which has been dragged, when copy nodes or move nodes.</p>
+	<h4 class="topLine"><b>targetNode</b><span>JSON</span></h4>
+	<p>JSON data object of the target node which treeNodes are drag-dropped.</p>
+	<p class="highlight_red">If the treeNodes will be root node, the targetNode = null</p>
+	<h4 class="topLine"><b>moveType</b><span>String</span></h4>
+	<p>the relative position of move to the target node</p>
+	<p class="highlight_red">"inner": will be child of targetNode</p>
+	<p class="highlight_red">"prev": will be sibling node, and be in front of targetNode</p>
+	<p class="highlight_red">"next":  will be sibling node, and be behind targetNode</p>
+	<h4 class="topLine"><b>isCopy</b><span>Boolean</span></h4>
+	<p>the flag used to judge copy node or move node</p>
+	<p class="highlight_red">true: copy node; false: move node</p>
+	<h4 class="topLine"><b>Return </b><span>Boolean</span></h4>
+	<p>return true or false</p>
+	<p class="highlight_red">If return false, zTree will restore the dragged nodes, and will not trigger the 'onDrop' callback.</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. disable to drag nodes to root</h4>
+	<pre xmlns=""><code>function zTreeBeforeDrop(treeId, treeNodes, targetNode, moveType) {
+    return !(targetNode == null || (moveType != "inner" && !targetNode.parentTId));
+};
+var setting = {
+	edit: {
+		enable: true
+	},
+	callback: {
+		beforeDrop: zTreeBeforeDrop
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.beforeEditName.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.beforeEditName.html
new file mode 100644
index 0000000..8772a3e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.beforeEditName.html
@@ -0,0 +1,38 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNode)</span><span class="path">setting.callback.</span>beforeEditName</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to capture the event before click edit button, zTree based on return value to determine whether to allow to edit the name.</p>
+			<p class="highlight_red">This callback is used to capture the event which edit button is clicked, then trigger the custom editing operation.</p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which will be edited name.</p>
+	<h4 class="topLine"><b>Return </b><span>Boolean</span></h4>
+	<p>return true or false</p>
+	<p class="highlight_red">If return false, the node will not be able to edit the name.</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. disable to edit the parent node's name</h4>
+	<pre xmlns=""><code>function zTreeBeforeEditName(treeId, treeNode) {
+	return !treeNode.isParent;
+}
+var setting = {
+	edit: {
+		enable: true
+	},
+	callback: {
+		beforeEditName: zTreeBeforeEditName
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.beforeExpand.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.beforeExpand.html
new file mode 100644
index 0000000..73cf55a
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.beforeExpand.html
@@ -0,0 +1,34 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNode)</span><span class="path">setting.callback.</span>beforeExpand</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to capture the event before expand node, zTree based on return value to determine whether to expand node.</p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which will be expanded</p>
+	<h4 class="topLine"><b>Return </b><span>Boolean</span></h4>
+	<p>return true or false</p>
+	<p class="highlight_red">If return false, zTree will not expand node, and will not trigger the 'onExpand' callback.</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. disabled to expand node which is collapsed</h4>
+	<pre xmlns=""><code>function zTreeBeforeExpand(treeId, treeNode) {
+    return false;
+};
+var setting = {
+	callback: {
+		beforeExpand: zTreeBeforeExpand
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.beforeMouseDown.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.beforeMouseDown.html
new file mode 100644
index 0000000..4af0818
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.beforeMouseDown.html
@@ -0,0 +1,35 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNode)</span><span class="path">setting.callback.</span>beforeMouseDown</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to capture the mousedown event before the 'onMouseDown' callback, zTree based on return value to determine whether to trigger the 'onMouseDown' callback.</p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which mouse over</p>
+	<p class="highlight_red">If the DOM which mouse over isn't a node, it will return null.</p>
+	<h4 class="topLine"><b>Return </b><span>Boolean</span></h4>
+	<p>return true or false</p>
+	<p class="highlight_red">If return false, zTree will not trigger the 'onMouseDown' callback, no effect on other operations.</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. disable to trigger the 'onMouseDown' callback</h4>
+	<pre xmlns=""><code>function zTreeBeforeMouseDown(treeId, treeNode) {
+    return false;
+};
+var setting = {
+	callback: {
+		beforeMouseDown: zTreeBeforeMouseDown
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.beforeMouseUp.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.beforeMouseUp.html
new file mode 100644
index 0000000..0c008fc
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.beforeMouseUp.html
@@ -0,0 +1,35 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNode)</span><span class="path">setting.callback.</span>beforeMouseUp</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to capture the mouseup event before the 'onMouseUp' callback, zTree based on return value to determine whether to trigger the 'onMouseUp' callback.</p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which mouse over</p>
+	<p class="highlight_red">If the DOM which mouse over isn't a node, it will return null.</p>
+	<h4 class="topLine"><b>Return </b><span>Boolean</span></h4>
+	<p>return true or false</p>
+	<p class="highlight_red">If return false, zTree will not trigger the 'onMouseUp' callback, no effect on other operations.</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. disable to trigger the 'onMouseUp' callback</h4>
+	<pre xmlns=""><code>function zTreeBeforeMouseUp(treeId, treeNode) {
+    return false;
+};
+var setting = {
+	callback: {
+		beforeMouseUp: zTreeBeforeMouseUp
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.beforeRemove.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.beforeRemove.html
new file mode 100644
index 0000000..38e14c1
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.beforeRemove.html
@@ -0,0 +1,37 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNode)</span><span class="path">setting.callback.</span>beforeRemove</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to capture the event before remove node, zTree based on return value to determine whether to allow to remove node.</p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which will be removed.</p>
+	<h4 class="topLine"><b>Return </b><span>Boolean</span></h4>
+	<p>return true or false</p>
+	<p class="highlight_red">If return false, zTree will not remove node, and will not trigger the 'onRemove' callback.</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. disable to remove node</h4>
+	<pre xmlns=""><code>function zTreeBeforeRemove(treeId, treeNode) {
+	return false;
+}
+var setting = {
+	edit: {
+		enable: true
+	},
+	callback: {
+		beforeRemove: zTreeBeforeRemove
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.beforeRename.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.beforeRename.html
new file mode 100644
index 0000000..76438a9
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.beforeRename.html
@@ -0,0 +1,46 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNode, newName, isCancel)</span><span class="path">setting.callback.</span>beforeRename</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to capture the event before rename(when input DOM blur or press Enter Key), zTree based on return value to determine whether to allow to rename node.</p>
+			<p class="highlight_red">When node is editing name, press the ESC key to restore the original name and stop edit name.</p>
+			<p class="highlight_red">From v3.5.13, zTree will trigger this callback when user cancel edit name. please see 'isCancel' parameter.</p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which will be rename.</p>
+	<h4 class="topLine"><b>newName</b><span>String</span></h4>
+	<p>the new name</p>
+	<h4 class="topLine"><b>isCancel</b><span>Boolean</span></h4>
+	<p>the status about cancel edit name (v3.5.13+)</p>
+	<p class="highlight_red">isCancel = true means: user cancel edit name. (press ESC or use cancelEditName() function)</p>
+	<p class="highlight_red">isCancel = false means: user submit edit name.</p>
+	<h4 class="topLine"><b>Return </b><span>Boolean</span></h4>
+	<p>return true or false</p>
+	<p class="highlight_red">If return false, the treeNode will keep the editing name, don't trigger the 'onRename' callback, and will ignore other enents, until the callback return true.</p>
+	<p class="highlight_red">If returns false, zTree will not set the input box to get focus to avoid the warning message which led to repeated triggering ‘beforeRename’ callback. Please use editName() method to set the input box to get focus when user close the warning message.</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. the length of the new name can't less than 5</h4>
+	<pre xmlns=""><code>function zTreeBeforeRename(treeId, treeNode, newName, isCancel) {
+	return newName.length > 5;
+}
+var setting = {
+	edit: {
+		enable: true
+	},
+	callback: {
+		beforeRename: zTreeBeforeRename
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.beforeRightClick.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.beforeRightClick.html
new file mode 100644
index 0000000..15c38cd
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.beforeRightClick.html
@@ -0,0 +1,35 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNode)</span><span class="path">setting.callback.</span>beforeRightClick</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to capture the right click event before the 'onRightClick' callback, zTree based on return value to determine whether to trigger the 'onRightClick' callback.</p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which is mouse right clicked</p>
+	<p class="highlight_red">If the DOM which mouse right clicked isn't a node, it will return null.</p>
+	<h4 class="topLine"><b>Return</b><span>Boolean</span></h4>
+	<p>return true or false</p>
+	<p class="highlight_red">If return false, ztree will not trigger the 'onRightClick' callback, no effect on other operations.</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. disable to trigger the 'onRightClick' callback</h4>
+	<pre xmlns=""><code>function zTreeBeforeRightClick(treeId, treeNode) {
+    return false;
+};
+var setting = {
+	callback: {
+		beforeRightClick: zTreeBeforeRightClick
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.onAsyncError.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.onAsyncError.html
new file mode 100644
index 0000000..785c8d8
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.onAsyncError.html
@@ -0,0 +1,42 @@
+<div class="apiDetail">
+<div>
+	<h2><span class="path">setting.callback.</span>onAsyncError</h2>
+	<h2><span>Function(event, treeId, treeNode, XMLHttpRequest, textStatus, errorThrown)</span>&nbsp;</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to capture the error event when execute ajax.</p>
+			<p class="highlight_red">If you set 'setting.callback.beforeAsync',and return false, zTree will not execute ajax, and will not trigger the 'onAsyncSuccess / onAsyncError' callback.</p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>event</b><span>js event Object</span></h4>
+	<p>event Object</p>
+	<h4 class="topLine"><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the parent node</p>
+	<p class="highlight_red">When load root nodes, treeNode = null</p>
+	<h4 class="topLine"><b>XMLHttpRequest</b><span>String</span></h4>
+	<p>XMLHttpRequest Object, please refer to JQuery API documentation.</p>
+	<h4 class="topLine"><b>textStatus</b><span>String</span></h4>
+	<p>a string categorizing the status of the request("success", "error"...), please refer to JQuery API documentation.</p>
+	<h4 class="topLine"><b>errorThrown</b><span>String</span></h4>
+	<p>eWhen an HTTP error occurs, errorThrown receives the textual portion of the HTTP status, please refer to JQuery API documentation.</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. When execute ajax make error, alert message.</h4>
+	<pre xmlns=""><code>function zTreeOnAsyncError(event, treeId, treeNode, XMLHttpRequest, textStatus, errorThrown) {
+    alert(XMLHttpRequest);
+};
+var setting = {
+	callback: {
+		onAsyncError: zTreeOnAsyncError
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.onAsyncSuccess.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.onAsyncSuccess.html
new file mode 100644
index 0000000..2722691
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.onAsyncSuccess.html
@@ -0,0 +1,38 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(event, treeId, treeNode, msg)</span><span class="path">setting.callback.</span>onAsyncSuccess</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to capture the complete success event when execute ajax.</p>
+			<p class="highlight_red">If you set 'setting.callback.beforeAsync',and return false, zTree will not execute ajax, and will not trigger the 'onAsyncSuccess / onAsyncError' callback.</p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>event</b><span>js event Object</span></h4>
+	<p>event Object</p>
+	<h4 class="topLine"><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the parent node</p>
+	<p class="highlight_red">When load root nodes, treeNode = null</p>
+	<h4 class="topLine"><b>msg</b><span>String / Object</span></h4>
+	<p>The actualnode data which got by ajax. User-friendly debugging.</p>
+	<p class="highlight_red">The actual data's type of msg is affected by 'setting.async.dataType', please refer to JQuery API documentation.</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. When execute ajax complete success, alert message.</h4>
+	<pre xmlns=""><code>function zTreeOnAsyncSuccess(event, treeId, treeNode, msg) {
+    alert(msg);
+};
+var setting = {
+	callback: {
+		onAsyncSuccess: zTreeOnAsyncSuccess
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.onCheck.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.onCheck.html
new file mode 100644
index 0000000..ed33f8d
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.onCheck.html
@@ -0,0 +1,34 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(event, treeId, treeNode)</span><span class="path">setting.callback.</span>onCheck</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.excheck</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to capture the check or uncheck event when check or uncheck the checkbox and radio.</p>
+			<p class="highlight_red">If you set 'setting.callback.beforeCheck',and return false, zTree will not change check state, and will not trigger the 'onCheck' callback.</p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>event</b><span>js event Object</span></h4>
+	<p>event Object</p>
+	<h4 class="topLine"><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which is checked or unchecked</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. When check or uncheck the checkbox and radio, alert info about 'tId' and 'name' and 'checked'.</h4>
+	<pre xmlns=""><code>function zTreeOnCheck(event, treeId, treeNode) {
+    alert(treeNode.tId + ", " + treeNode.name + "," + treeNode.checked);
+};
+var setting = {
+	callback: {
+		onCheck: zTreeOnCheck
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.onClick.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.onClick.html
new file mode 100644
index 0000000..a6ba29a
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.onClick.html
@@ -0,0 +1,49 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(event, treeId, treeNode, clickFlag)</span><span class="path">setting.callback.</span>onClick</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to capture the click event when click node.</p>
+			<p class="highlight_red">If you set 'setting.callback.beforeClick',and return false, zTree will not change selected state, and will not trigger the 'onClick' callback.</p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>event</b><span>js event Object</span></h4>
+	<p>event Object</p>
+	<h4 class="topLine"><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which is clicked</p>
+	<h4 class="topLine"><b>clickFlag</b><span>Number</span></h4>
+	<p>Node is selected or deselected state, please see table below for details</p>
+	<table width="100%" border="0" cellspacing="1" cellpadding="0">
+		<thead><tr><td>clickFlag</td><td title="Whether to allow multi-select">selectedMulti</td><td title="Whether to press Ctrl-key">autoCancelSelected<br/>&&<br/>event.ctrlKey</td><td title="Node's selection state">isSelected</td><td>operate for selected</td></tr></thead>
+		<tbody>
+			<tr><td>1</td><td>true</td><td>false</td><td>false</td><td>node is selected (single)</td></tr>
+			<tr><td>1</td><td>true</td><td>false</td><td>true</td><td>node is selected (single)</td></tr>
+			<tr><td>2</td><td>true</td><td>true</td><td>false</td><td>node is selected (multi)</td></tr>
+			<tr><td>0</td><td>true</td><td>true</td><td>true</td><td>node is deselected</td></tr>
+			<tr><td>1</td><td>false</td><td>false</td><td>false</td><td>node is selected (single)</td></tr>
+			<tr><td>1</td><td>false</td><td>false</td><td>true</td><td>node is selected (single)</td></tr>
+			<tr><td>1</td><td>false</td><td>true</td><td>false</td><td>node is selected (single)</td></tr>
+			<tr><td>0</td><td>false</td><td>true</td><td>true</td><td>node is deselected</td></tr>
+		</tbody>
+	</table>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. When click node, alert info about 'tId' and 'name'.</h4>
+	<pre xmlns=""><code>function zTreeOnClick(event, treeId, treeNode) {
+    alert(treeNode.tId + ", " + treeNode.name);
+};
+var setting = {
+	callback: {
+		onClick: zTreeOnClick
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.onCollapse.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.onCollapse.html
new file mode 100644
index 0000000..d605dc8
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.onCollapse.html
@@ -0,0 +1,34 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(event, treeId, treeNode)</span><span class="path">setting.callback.</span>onCollapse</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to capture the event when collapse node.</p>
+			<p class="highlight_red">If you set 'setting.callback.beforeCollapse',and return false, zTree will not collapse node, and will not trigger the 'onCollapse' callback.</p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>event</b><span>js event Object</span></h4>
+	<p>event Object</p>
+	<h4 class="topLine"><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which will be collapsed</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. When collapse node, alert info about 'tId' and 'name'.</h4>
+	<pre xmlns=""><code>function zTreeOnCollapse(event, treeId, treeNode) {
+    alert(treeNode.tId + ", " + treeNode.name);
+};
+var setting = {
+	callback: {
+		onCollapse: zTreeOnCollapse
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.onDblClick.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.onDblClick.html
new file mode 100644
index 0000000..fbd47e8
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.onDblClick.html
@@ -0,0 +1,35 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(event, treeId, treeNode)</span><span class="path">setting.callback.</span>onDblClick</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to capture the dblclick event when double click node.</p>
+			<p class="highlight_red">If you set 'setting.callback.beforeDblClick',and return false, zTree will not trigger the 'onDblClick' callback.</p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>event</b><span>js event Object</span></h4>
+	<p>event Object</p>
+	<h4 class="topLine"><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which is double clicked</p>
+	<p class="highlight_red">If the DOM which dblclicked isn't a node, it will return null.</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. When double click node, alert info about 'tId' and 'name'.</h4>
+	<pre xmlns=""><code>function zTreeOnDblClick(event, treeId, treeNode) {
+    alert(treeNode ? treeNode.tId + ", " + treeNode.name : "isRoot");
+};
+var setting = {
+	callback: {
+		onDblClick: zTreeOnDblClick
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.onDrag.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.onDrag.html
new file mode 100644
index 0000000..30c738d
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.onDrag.html
@@ -0,0 +1,34 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(event, treeId, treeNodes)</span><span class="path">setting.callback.</span>onDrag</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to capture the drag event when drag node.</p>
+			<p class="highlight_red">If you set 'setting.callback.beforeDrag',and return false, zTree will stop drag, and will not trigger the 'onDrag' callback.</p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>event</b><span>js event Object</span></h4>
+	<p>event Object</p>
+	<h4 class="topLine"><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, the tree is what the treeNodes are belong to, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNodes</b><span>Array(JSON)</span></h4>
+	<p>A collection of the nodes which will be dragged</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. When drag nodes, alert the number of dragged nodes.</h4>
+	<pre xmlns=""><code>function zTreeOnDrag(event, treeId, treeNodes) {
+    alert(treeNodes.length);
+};
+var setting = {
+	callback: {
+		onDrag: zTreeOnDrag
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.onDrop.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.onDrop.html
new file mode 100644
index 0000000..6362463
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.onDrop.html
@@ -0,0 +1,48 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(event, treeId, treeNodes, targetNode, moveType, isCopy)</span><span class="path">setting.callback.</span>onDrop</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to capture the drop event when drag-drop node.</p>
+			<p class="highlight_red">If you set 'setting.callback.beforeDrop',and return false, zTree will restore the dragged nodes, and will not trigger the 'onDrop' callback.</p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>event</b><span>js event Object</span></h4>
+	<p>event Object</p>
+	<h4 class="topLine"><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, the tree is what the targetNode is belong to, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNodes</b><span>Array(JSON)</span></h4>
+	<p>A collection of the nodes which has been dragged</p>
+	<p class="highlight_red">The treeNodes are the data of the nodes which be dragged, when move nodes.</p>
+	<p class="highlight_red">The treeNodes are the clone data of the nodes which be dragged, when copy nodes.</p>
+	<h4 class="topLine"><b>targetNode</b><span>JSON</span></h4>
+	<p>JSON data object of the target node which treeNodes are drag-dropped.</p>
+	<p class="highlight_red">If the treeNodes will be root node, the targetNode = null</p>
+	<h4 class="topLine"><b>moveType</b><span>String</span></h4>
+	<p>the relative position of move to the target node</p>
+	<p class="highlight_red">"inner": will be child of targetNode</p>
+	<p class="highlight_red">"prev": will be sibling node, and be in front of targetNode</p>
+	<p class="highlight_red">"next":  will be sibling node, and be behind targetNode</p>
+	<p class="highlight_red">If moveType is null, means drag & drop is cancel.</p>
+	<h4 class="topLine"><b>isCopy</b><span>Boolean</span></h4>
+	<p>the flag used to judge copy node or move node</p>
+	<p class="highlight_red">true: copy node; false: move node</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. When drag-drop nodes complete, alert the number of dragged nodes and info about targetNode.</h4>
+	<pre xmlns=""><code>function zTreeOnDrop(event, treeId, treeNodes, targetNode, moveType) {
+    alert(treeNodes.length + "," + (targetNode ? (targetNode.tId + ", " + targetNode.name) : "isRoot" ));
+};
+var setting = {
+	callback: {
+		onDrop: zTreeOnDrop
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.onExpand.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.onExpand.html
new file mode 100644
index 0000000..7b9d8d5
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.onExpand.html
@@ -0,0 +1,34 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(event, treeId, treeNode)</span><span class="path">setting.callback.</span>onExpand</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to capture the event when expand node.</p>
+			<p class="highlight_red">If you set 'setting.callback.beforeExpand',and return false, zTree will not expand node, and will not trigger the 'onExpand' callback.</p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>event</b><span>js event Object</span></h4>
+	<p>event Object</p>
+	<h4 class="topLine"><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which will be expanded</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. When expand node, alert info about 'tId' and 'name'.</h4>
+	<pre xmlns=""><code>function zTreeOnExpand(event, treeId, treeNode) {
+    alert(treeNode.tId + ", " + treeNode.name);
+};
+var setting = {
+	callback: {
+		onExpand: zTreeOnExpand
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.onMouseDown.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.onMouseDown.html
new file mode 100644
index 0000000..bfd714c
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.onMouseDown.html
@@ -0,0 +1,35 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(event, treeId, treeNode)</span><span class="path">setting.callback.</span>onMouseDown</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to capture the event when mouse down.</p>
+			<p class="highlight_red">If you set 'setting.callback.beforeMouseDown',and return false, zTree will not trigger the 'onMouseDown' callback.</p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>event</b><span>js event Object</span></h4>
+	<p>event Object</p>
+	<h4 class="topLine"><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which mouse over</p>
+	<p class="highlight_red">If the DOM which mouse over isn't a node, it will return null.</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. When mouse down, alert info about 'tId' and 'name'.</h4>
+	<pre xmlns=""><code>function zTreeOnMouseDown(event, treeId, treeNode) {
+    alert(treeNode ? treeNode.tId + ", " + treeNode.name : "isRoot");
+};
+var setting = {
+	callback: {
+		onMouseDown: zTreeOnMouseDown
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.onMouseUp.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.onMouseUp.html
new file mode 100644
index 0000000..93edf31
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.onMouseUp.html
@@ -0,0 +1,35 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(event, treeId, treeNode)</span><span class="path">setting.callback.</span>onMouseUp</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to capture the event when mouse up.</p>
+			<p class="highlight_red">If you set 'setting.callback.beforeMouseUp',and return false, zTree will not trigger the 'onMouseUp' callback.</p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>event</b><span>js event Object</span></h4>
+	<p>event Object</p>
+	<h4 class="topLine"><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which mouse over</p>
+	<p class="highlight_red">If the DOM which mouse over isn't a node, it will return null.</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. When mouse up, alert info about 'tId' and 'name'.</h4>
+	<pre xmlns=""><code>function zTreeOnMouseUp(event, treeId, treeNode) {
+    alert(treeNode ? treeNode.tId + ", " + treeNode.name : "isRoot");
+};
+var setting = {
+	callback: {
+		onMouseUp: zTreeOnMouseUp
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.onNodeCreated.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.onNodeCreated.html
new file mode 100644
index 0000000..a98b572
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.onNodeCreated.html
@@ -0,0 +1,35 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(event, treeId, treeNode)</span><span class="path">setting.callback.</span>onNodeCreated</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to capture the event when node's DOM is created.</p>
+			<p class="highlight_red">Because v3.x uses lazy loading technology, so the nodes which doesn't create DOM when initialized will not trigger this callback, until its parent node is expanded.</p>
+			<p class="highlight_red">Large amount of data to load, please note: do not set onNodeCreated, can improve performance as when initialized.</p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>event</b><span>js event Object</span></h4>
+	<p>event Object</p>
+	<h4 class="topLine"><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which DOM is created</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. When node's DOM is created, alert info about 'tId' and 'name'.</h4>
+	<pre xmlns=""><code>function zTreeOnNodeCreated(event, treeId, treeNode) {
+    alert(treeNode.tId + ", " + treeNode.name);
+};
+var setting = {
+	callback: {
+		onNodeCreated: zTreeOnNodeCreated
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.onRemove.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.onRemove.html
new file mode 100644
index 0000000..ce29413
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.onRemove.html
@@ -0,0 +1,34 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(event, treeId, treeNode)</span><span class="path">setting.callback.</span>onRemove</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to capture the event when remove node.</p>
+			<p class="highlight_red">If you set 'setting.callback.beforeRemove',and return false, zTree will not remove node, and will not trigger the 'onRemove' callback.</p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>event</b><span>js event Object</span></h4>
+	<p>event Object</p>
+	<h4 class="topLine"><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which was removed.</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. When remove node, alert info about 'tId' and 'name'.</h4>
+	<pre xmlns=""><code>function zTreeOnRemove(event, treeId, treeNode) {
+	alert(treeNode.tId + ", " + treeNode.name);
+}
+var setting = {
+	callback: {
+		onRemove: zTreeOnRemove
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.onRename.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.onRename.html
new file mode 100644
index 0000000..cd47eae
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.onRename.html
@@ -0,0 +1,40 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(event, treeId, treeNode, isCancel)</span><span class="path">setting.callback.</span>onRename</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to capture the event when remove node.</p>
+			<p class="highlight_red">1. If you set 'setting.callback.beforeRename',and return false, zTree will keep the editing name, and will not trigger the 'onRename' callback.</p>
+			<p class="highlight_red">2. If you modity treeNode data, and use 'updateNode' function, zTree will not trigger the 'onRename' callback.</p>
+			<p class="highlight_red">3. From v3.5.13, zTree will trigger this callback when user cancel edit name. please see 'isCancel' parameter.</p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>event</b><span>js event Object</span></h4>
+	<p>event Object</p>
+	<h4 class="topLine"><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which was rename.</p>
+	<h4 class="topLine"><b>isCancel</b><span>Boolean</span></h4>
+	<p>the status about cancel edit name (v3.5.13+)</p>
+	<p class="highlight_red">isCancel = true means: user cancel edit name. (press ESC or use cancelEditName() function)</p>
+	<p class="highlight_red">isCancel = false means: user submit edit name.</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. When rename node, alert info about 'tId' and 'name'.</h4>
+	<pre xmlns=""><code>function zTreeOnRename(event, treeId, treeNode, isCancel) {
+	alert(treeNode.tId + ", " + treeNode.name);
+}
+var setting = {
+	callback: {
+		onRename: zTreeOnRename
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.onRightClick.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.onRightClick.html
new file mode 100644
index 0000000..86b4b01
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.callback.onRightClick.html
@@ -0,0 +1,36 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(event, treeId, treeNode)</span><span class="path">setting.callback.</span>onRightClick</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to capture the event when mouse right click node.</p>
+			<p class="highlight_red">If you set 'setting.callback.beforeRightClick',and return false, zTree will not trigger the 'onRightClick' callback.</p>
+			<p class="highlight_red">If you set 'setting.callback.onRightClick', zTree will shield the browser context menu when mouse right click on zTree.</p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>event</b><span>js event Object</span></h4>
+	<p>event Object</p>
+	<h4 class="topLine"><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which is mouse right clicked</p>
+	<p class="highlight_red">If the DOM which mouse right clicked isn't a node, it will return null.</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. When mouse right click node, alert info about 'tId' and 'name'.</h4>
+	<pre xmlns=""><code>function zTreeOnRightClick(event, treeId, treeNode) {
+    alert(treeNode ? treeNode.tId + ", " + treeNode.name : "isRoot");
+};
+var setting = {
+	callback: {
+		onRightClick: zTreeOnRightClick
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.check.autoCheckTrigger.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.check.autoCheckTrigger.html
new file mode 100644
index 0000000..b8b04cc
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.check.autoCheckTrigger.html
@@ -0,0 +1,29 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.check.</span>autoCheckTrigger</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.excheck</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>When node is automatically checked or unchecked, this parameter used to set to trigger 'beforeCheck / onCheck' callback. It is valid when <span class="highlight_red">[setting.check.enable = true & setting.check.chkStyle = "checkbox"]</span></p>
+			<p class="highlight_red">1. If you set 'setting.check.chkboxType' to { "Y": "", "N": "" }, will not automatically checked or unchecked.</p>
+			<p class="highlight_red">2. If you turn on the trigger and there are many more nodes, will affect the performance, because the check or uncheck node can cause many nodes to be automatically checked or unchecked, it will trigger a lot of callbacks, according to the need to decide whether to use this feature.</p>
+			<p>Default: false</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p> true means: trigger callback</p>
+	<p> false means: don't trigger callback</p>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. When node is automatically checked or unchecked, zTree trigger 'beforeCheck / onCheck' callback.</h4>
+	<pre xmlns=""><code>var setting = {
+	check: {
+		enable: true,
+		autoCheckTrigger: true
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.check.chkDisabledInherit.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.check.chkDisabledInherit.html
new file mode 100644
index 0000000..98d824e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.check.chkDisabledInherit.html
@@ -0,0 +1,28 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.check.</span>chkDisabledInherit</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.excheck</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>When the parent node's 'chkDisabled' attribute is true, set the child nodes automatically inherit the 'chkDisabled' attribute. It is valid when <span class="highlight_red">[setting.check.enable = true]</span></p>
+			<p class="highlight_red">1. Only be used to initialize the nodes, easy batch operations. Please use the 'updateNode' method modify existing node.</p>
+			<p>Default: false</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p> true means: When add new child nodes, if parent node's 'chkDisabled' attribute is true, the child nodes automatically inherit the 'chkDisabled' attribute.</p>
+	<p> false means: When add new child nodes, the child nodes don't inherit the 'chkDisabled' attribute from parent node.</p>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1.  When add new child nodes, the child nodes automatically inherit the 'chkDisabled' attribute from parent node.</h4>
+	<pre xmlns=""><code>var setting = {
+	check: {
+		enable: true,
+		chkDisabledInherit: true
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.check.chkStyle.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.check.chkStyle.html
new file mode 100644
index 0000000..d42e757
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.check.chkStyle.html
@@ -0,0 +1,48 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">setting.check.</span>chkStyle</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.excheck</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Use the checkbox or radio. It is valid when <span class="highlight_red">[setting.check.enable = true]</span></p>
+			<p>Default: "checkbox"</p>
+		</div>
+	</div>
+	<h3>String Format</h3>
+	<div class="desc">
+	<p>When chkStyle = "checkbox", zTree show checkbox, and '<span class="highlight_red">setting.check.chkboxType</span>' attribute is valid.
+<br/>When chkStyle = "radio", zTree show radio, and '<span class="highlight_red">setting.check.radioType</span>' attribute is valid.</p>
+	<p class="highlight_red">Please note that letter case, do not change.</p>
+	</div>
+	<h3>checkbox States Descriptions</h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p><button type="button" class="chk checkbox_false_full"></button>not checked; <span class="highlight_red">If node is parent, so its child nodes have been not checked.</span> when mouse over: <button type="button" class="chk checkbox_false_full_focus"></button></p>
+			<p><button type="button" class="chk checkbox_false_part"></button>not checked; (only parent node) <span class="highlight_red">some of its child nodes have been checked.</span> when mouse over: <button type="button" class="chk checkbox_false_part_focus"></button></p>
+			<p><button type="button" class="chk checkbox_true_full"></button>be checked; <span class="highlight_red">If node is parent, so its all child nodes have been checked.</span> when mouse over: <button type="button" class="chk checkbox_true_full_focus"></button></p>
+			<p><button type="button" class="chk checkbox_true_part"></button>be checked; (only parent node) <span class="highlight_red">some of its child nodes or all have been not checked.</span> when mouse over: <button type="button" class="chk checkbox_true_part_focus"></button></p>
+		</div>
+	</div>
+	<h3>radio States Descriptions</h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p><button type="button" class="chk radio_false_full"></button>not checked; <span class="highlight_red">If node is parent, so its child have been not checked.</span> when mouse over: <button type="button" class="chk radio_false_full_focus"></button></p>
+			<p><button type="button" class="chk radio_false_part"></button>not checked; (only parent node) <span class="highlight_red">some of its child have been checked.</span> when mouse over: <button type="button" class="chk radio_false_part_focus"></button></p>
+			<p><button type="button" class="chk radio_true_full"></button>be checked; <span class="highlight_red">If node is parent, so its child have been not checked.</span> when mouse over: <button type="button" class="chk radio_true_full_focus"></button></p>
+			<p><button type="button" class="chk radio_true_part"></button>be checked; (only parent node) <span class="highlight_red">some of its child have been checked.</span> when mouse over: <button type="button" class="chk radio_true_part_focus"></button></p>
+		</div>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. use radio</h4>
+	<pre xmlns=""><code>var setting = {
+	check: {
+		enable: true,
+		chkStyle: "radio"
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.check.chkboxType.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.check.chkboxType.html
new file mode 100644
index 0000000..5cecc9e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.check.chkboxType.html
@@ -0,0 +1,31 @@
+<div class="apiDetail">
+<div>
+	<h2><span>JSON</span><span class="path">setting.check.</span>chkboxType</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.excheck</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>When one node is checked or unchecked, control its parent node and its child node auto checked or unchecked. It is valid when <span class="highlight_red">[setting.check.enable = true &amp; setting.check.chkStyle = "checkbox"]</span></p>
+			<p>Default: { "Y": "ps", "N": "ps" }</p>
+		</div>
+	</div>
+	<h3>JSON Format</h3>
+	<div class="desc">
+	<p>"Y" attribute use to set auto check after checkbox was checked.
+<br/>"N" attribute use to set auto uncheck after checkbox was unchecked.
+<br/>If value has "p", so parent nodes will be checked or unchecked.
+<br/>If value has "s", so child nodes will be checked or unchecked.</p>
+	<p class="highlight_red">Please note that letter case, do not change.</p>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. If check the node, so only auto check parent nodes; If uncheck the node, so only auto uncheck child nodes;</h4>
+	<pre xmlns=""><code>var setting = {
+	check: {
+		enable: true,
+		chkStyle: "checkbox",
+		chkboxType: { "Y": "p", "N": "s" }
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.check.enable.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.check.enable.html
new file mode 100644
index 0000000..0236b5f
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.check.enable.html
@@ -0,0 +1,26 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.check.</span>enable</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.excheck</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Set to use checkbox or radio in zTree</p>
+			<p>Default: false</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p> true means: use the checkbox or radio</p>
+	<p> false means: don't use the checkbox or radio</p>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. use the checkbox</h4>
+	<pre xmlns=""><code>var setting = {
+	check: {
+		enable: true
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.check.nocheckInherit.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.check.nocheckInherit.html
new file mode 100644
index 0000000..758b437
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.check.nocheckInherit.html
@@ -0,0 +1,28 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.check.</span>nocheckInherit</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.excheck</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>When the parent node's 'nocheck' attribute is true, set the child nodes automatically inherit the 'nocheck' attribute. It is valid when <span class="highlight_red">[setting.check.enable = true]</span></p>
+			<p class="highlight_red">1. Only be used to initialize the nodes, easy batch operations. Please use the 'updateNode' method modify existing node.</p>
+			<p>Default: false</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p> true means: When add new child nodes, if parent node's 'nocheck' attribute is true, the child nodes automatically inherit the 'nocheck' attribute.</p>
+	<p> false means: When add new child nodes, the child nodes don't inherit the 'nocheck' attribute from parent node.</p>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1.  When add new child nodes, the child nodes automatically inherit the 'nocheck' attribute from parent node.</h4>
+	<pre xmlns=""><code>var setting = {
+	check: {
+		enable: true,
+		nocheckInherit: true
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.check.radioType.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.check.radioType.html
new file mode 100644
index 0000000..be867d7
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.check.radioType.html
@@ -0,0 +1,29 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">setting.check.</span>radioType</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.excheck</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>The group about radio. It is valid when <span class="highlight_red">[setting.check.enable = true &amp; setting.check.chkStyle = "radio"]</span></p>
+			<p>Default: "level"</p>
+		</div>
+	</div>
+	<h3>String Format</h3>
+	<div class="desc">
+	<p>When radioType = "level", will be grouped with same level nodes which have the same parent node.
+<br/>When radioType = "all", will be grouped with all nodes.</p>
+	<p class="highlight_red">Please note that letter case, do not change.</p>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. Set the group about radio is all nodes.</h4>
+	<pre xmlns=""><code>var setting = {
+	check: {
+		enable: true,
+		chkStyle: "radio",
+		radioType: "all"
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.data.keep.leaf.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.data.keep.leaf.html
new file mode 100644
index 0000000..71c573e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.data.keep.leaf.html
@@ -0,0 +1,28 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.data.keep.</span>leaf</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>The leaf node's lock, the leaf node will lock the 'isParent' attribute to false.</p>
+			<p>Default: false</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p> true means: lock the leaf node, and <span class="highlight_red">the node which 'isParent' attribute is false can't add child nodes</span>.</p>
+	<p> false means: don't lock the leaf node, and <span class="highlight_red">the node which 'isParent' attribute is false can add child nodes</span>.</p>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. lock the leaf node</h4>
+	<pre xmlns=""><code>var setting = {
+	data: {
+		keep: {
+			leaf: true
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.data.keep.parent.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.data.keep.parent.html
new file mode 100644
index 0000000..5bab2f1
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.data.keep.parent.html
@@ -0,0 +1,28 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.data.keep.</span>parent</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>The parent node's lock, the parent node will lock 'isParent' attribute to true.</p>
+			<p>Default: false</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p> true means: lock the parent node, and <span class="highlight_red">if remove all of the parent node's child nodes, its 'isParent' attribute still keep to be true.</span>.</p>
+	<p> false means: don't lock the parent node, and <span class="highlight_red">if remove all of the parent node's child nodes, its 'isParent' attribute will change to be false.</span>.</p>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. lock the parent node</h4>
+	<pre xmlns=""><code>var setting = {
+	data: {
+		keep: {
+			parent: true
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.data.key.checked.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.data.key.checked.html
new file mode 100644
index 0000000..2678cf2
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.data.key.checked.html
@@ -0,0 +1,24 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">setting.data.key.</span>checked</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.excheck</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>The node data's attribute to save the checked state.</p>
+			<p>Default: "checked"</p>
+			<p class="highlight_red">Please don't set the other node attribute which zTree used. (e.g., checkedOld)</p>
+		</div>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. set the 'isChecked' attribute to save the checked state.</h4>
+	<pre xmlns=""><code>var setting = {
+	data: {
+		key: {
+			checked: "isChecked"
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.data.key.children.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.data.key.children.html
new file mode 100644
index 0000000..321a1a7
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.data.key.children.html
@@ -0,0 +1,23 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">setting.data.key.</span>children</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>The node data's attribute to save the child nodes.</p>
+			<p>Default: "children"</p>
+		</div>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. Set the 'nodes' attribute to save the child nodes.</h4>
+	<pre xmlns=""><code>var setting = {
+	data: {
+		key: {
+			children: "nodes"
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.data.key.name.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.data.key.name.html
new file mode 100644
index 0000000..0208c55
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.data.key.name.html
@@ -0,0 +1,23 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">setting.data.key.</span>name</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>The node data's attribute to save the node name.</p>
+			<p>Default: "name"</p>
+		</div>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. Set the 'ename' attribute to save the node name.</h4>
+	<pre xmlns=""><code>var setting = {
+	data: {
+		key: {
+			name: "ename"
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.data.key.title.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.data.key.title.html
new file mode 100644
index 0000000..96540eb
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.data.key.title.html
@@ -0,0 +1,24 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">setting.data.key.</span>title</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>The node data's attribute to save the 'title' attribute of node DOM. It is valid when <span class="highlight_red">[setting.view.showTitle = true]</span></p>
+			<p class="highlight_red">If set it to "", the title of node DOM will be same as 'setting.data.key.name' attribute.</p>
+			<p>Default: ""</p>
+		</div>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. Set the 'fullName' attribute to save the title of node DOM.</h4>
+	<pre xmlns=""><code>var setting = {
+	data: {
+		key: {
+			title: "fullName"
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.data.key.url.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.data.key.url.html
new file mode 100644
index 0000000..e9a08ce
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.data.key.url.html
@@ -0,0 +1,24 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">setting.data.key.</span>url</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>The node data's attribute to save the node link's url.</p>
+			<p class="highlight_red">Special: If the nodes's data can only use the 'url' attribute, and don't use the link to jump feature, you can modify this attribute to any nonexistent attribute.</p>
+			<p>Default: "url"</p>
+		</div>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. Set the 'xUrl' attribute to save the node link's url.</h4>
+	<pre xmlns=""><code>var setting = {
+	data: {
+		key: {
+			url: "xUrl"
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.data.simpleData.enable.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.data.simpleData.enable.html
new file mode 100644
index 0000000..7ea21db
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.data.simpleData.enable.html
@@ -0,0 +1,39 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.data.simpleData.</span>enable</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Set zTree's node to accept the simple data format, when zTree is initialized or when ajax get / or when use <span class="highlight_red">addNodes</span> method.</p>
+			<p>Don't have to generate the complex nested data.</p>
+			<p>Default: false</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p> true means: zTree's node accept the simple data format.</p>
+	<p> false means: zTree's node only accept the nested data format.</p>
+	<p class="highlight_red">If set it is true, you must set the other attributes in 'setting.data.simpleData'. (e.g., idKey, pIdKey, rootPId)  And let the data satisfy the parent-child relationship.</p>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. use the simple data format</h4>
+	<pre xmlns=""><code>var setting = {
+	data: {
+		simpleData: {
+			enable: true,
+			idKey: "id",
+			pIdKey: "pId",
+			rootPId: 0,
+		}
+	}
+};
+var treeNodes = [
+    {"id":1, "pId":0, "name":"test1"},
+    {"id":11, "pId":1, "name":"test11"},
+    {"id":12, "pId":1, "name":"test12"},
+    {"id":111, "pId":11, "name":"test111"}
+];
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.data.simpleData.idKey.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.data.simpleData.idKey.html
new file mode 100644
index 0000000..43df260
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.data.simpleData.idKey.html
@@ -0,0 +1,32 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">setting.data.simpleData.</span>idKey</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>The node data's attribute to save node data's unique identifier. It is valid when <span class="highlight_red">[setting.data.simpleData.enable = true]</span></p>
+			<p>Default: "id"</p>
+		</div>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. use the simple data format</h4>
+	<pre xmlns=""><code>var setting = {
+	data: {
+		simpleData: {
+			enable: true,
+			idKey: "id",
+			pIdKey: "pId",
+			rootPId: 0,
+		}
+	}
+};
+var treeNodes = [
+    {"id":1, "pId":0, "name":"test1"},
+    {"id":11, "pId":1, "name":"test11"},
+    {"id":12, "pId":1, "name":"test12"},
+    {"id":111, "pId":11, "name":"test111"}
+];
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.data.simpleData.pIdKey.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.data.simpleData.pIdKey.html
new file mode 100644
index 0000000..8378c6e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.data.simpleData.pIdKey.html
@@ -0,0 +1,32 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">setting.data.simpleData.</span>pIdKey</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>The node data's attribute to save its parent node data's unique identifier. It is valid when <span class="highlight_red">[setting.data.simpleData.enable = true]</span></p>
+			<p>Default: "pId"</p>
+		</div>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. use the simple data format</h4>
+	<pre xmlns=""><code>var setting = {
+	data: {
+		simpleData: {
+			enable: true,
+			idKey: "id",
+			pIdKey: "pId",
+			rootPId: 0
+		}
+	}
+};
+var treeNodes = [
+    {"id":1, "pId":0, "name":"test1"},
+    {"id":11, "pId":1, "name":"test11"},
+    {"id":12, "pId":1, "name":"test12"},
+    {"id":111, "pId":11, "name":"test111"}
+];
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.data.simpleData.rootPId.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.data.simpleData.rootPId.html
new file mode 100644
index 0000000..61c9bbd
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.data.simpleData.rootPId.html
@@ -0,0 +1,32 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String / Number</span><span class="path">setting.data.simpleData.</span>rootPId</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Set the default value of root's 'pIdKey' specified attribute values​​. It is valid when <span class="highlight_red">[setting.data.simpleData.enable = true]</span></p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. use the simple data format</h4>
+	<pre xmlns=""><code>var setting = {
+	data: {
+		simpleData: {
+			enable: true,
+			idKey: "id",
+			pIdKey: "pId",
+			rootPId: 0
+		}
+	}
+};
+var treeNodes = [
+    {"id":1, "pId":0, "name":"test1"},
+    {"id":11, "pId":1, "name":"test11"},
+    {"id":12, "pId":1, "name":"test12"},
+    {"id":111, "pId":11, "name":"test111"}
+];
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.edit.drag.autoExpandTrigger.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.edit.drag.autoExpandTrigger.html
new file mode 100644
index 0000000..804ee66
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.edit.drag.autoExpandTrigger.html
@@ -0,0 +1,29 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.edit.drag.</span>autoExpandTrigger</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>When drag node cause the parent node is automatically expanded, set whether to allow to trigger the 'onExpand' callback. It is valid when <span class="highlight_red">[setting.edit.enable = true]</span></p>
+			<p>Default: false</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p> true means: trigger the 'onExpand' callback.</p>
+	<p> false means: don't trigger the 'onExpand' callback.</p>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. Set to allow to trigger the 'onExpand' callback</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true,
+		drag: {
+			autoExpandTrigger: true
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.edit.drag.autoOpenTime.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.edit.drag.autoOpenTime.html
new file mode 100644
index 0000000..74982af
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.edit.drag.autoOpenTime.html
@@ -0,0 +1,25 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Number</span><span class="path">setting.edit.drag.</span>autoOpenTime</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Drag to the parent node, the parent node auto expand time interval. (Unit: ms) It is valid when <span class="highlight_red">[setting.edit.enable = true]</span></p>
+			<p>Default: 500</p>
+			<p class="highlight_red">Please adjust the value according to needs.</p>
+		</div>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. When drag node to other parent node, expand it at once.</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true,
+		drag: {
+			autoOpenTime: 0
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.edit.drag.borderMax.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.edit.drag.borderMax.html
new file mode 100644
index 0000000..edbb752
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.edit.drag.borderMax.html
@@ -0,0 +1,25 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Number</span><span class="path">setting.edit.drag.</span>borderMax</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>When drag a node to root, the zTree's inner border width. (Unit: px) It is valid when <span class="highlight_red">[setting.edit.enable = true]</span></p>
+			<p>Default: 10</p>
+			<p class="highlight_red">Please adjust the value according to needs.</p>
+		</div>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. adjust the inner border width is 20px</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true,
+		drag: {
+			borderMax: 20
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.edit.drag.borderMin.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.edit.drag.borderMin.html
new file mode 100644
index 0000000..e845853
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.edit.drag.borderMin.html
@@ -0,0 +1,25 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Number</span><span class="path">setting.edit.drag.</span>borderMin</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>When drag a node to root, the zTree's outer border width. (Unit: px) It is valid when <span class="highlight_red">[setting.edit.enable = true]</span></p>
+			<p>Default: -5</p>
+			<p class="highlight_red">Please adjust the value according to needs.</p>
+		</div>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. adjust the outer border width is 10px</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true,
+		drag: {
+			borderMin: -10
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.edit.drag.inner.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.edit.drag.inner.html
new file mode 100644
index 0000000..1065df3
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.edit.drag.inner.html
@@ -0,0 +1,60 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean / Function(treeId, treeNodes, targetNode)</span><span class="path">setting.edit.drag.</span>inner</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>When drag one node to the target node, set whether to allow the node to be the target node's child. It is valid when <span class="highlight_red">[setting.edit.enable = true]</span></p>
+			<p class="highlight_red">If the target node is root, so zTree will only trigger 'inner' and not trigger 'prev / next'.</p>
+			<p class="highlight_red">This function mainly for the appropriate limit drag and drop (auxiliary arrow), it requires a combination of 'prev, next' together, to achieve full functionality.</p>
+			<p>Default: true</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p> true means: allow the node to be the target node's child.</p>
+	<p> false means: don't allow the node to be the target node's child.</p>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNodes</b><span>Array(JSON)</span></h4>
+	<p>A collection of the nodes which has been dragged</p>
+	<h4 class="topLine"><b>targetNode</b><span>JSON</span></h4>
+	<p>JSON data object of the target node which treeNodes are draged over.</p>
+	<p class="highlight_red">If the treeNodes will be root node, the targetNode = null</p>
+	<h4 class="topLine"><b>Return </b><span>Boolean</span></h4>
+	<p>return true or false</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. disable to drag the node to the target node's inner.</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true,
+		drag: {
+			prev: true,
+			next: true,
+			inner: false
+		}
+	}
+};
+......</code></pre>
+	<h4>2. disable to drag the node to be root node's child.</h4>
+	<pre xmlns=""><code>function canInner(treeId, nodes, targetNode) {
+	return !(targetNode && targetNode.level === 0);
+}
+var setting = {
+	edit: {
+		enable: true,
+		drag: {
+			prev: true,
+			next: true,
+			inner: canInner
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.edit.drag.isCopy.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.edit.drag.isCopy.html
new file mode 100644
index 0000000..df39a8a
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.edit.drag.isCopy.html
@@ -0,0 +1,32 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.edit.drag.</span>isCopy</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>When drag-drop node, set whether to allow to copy node. It is valid when <span class="highlight_red">[setting.edit.enable = true]</span></p>
+			<p>Default: true</p>
+		</div>
+	</div>
+	<h3>Rules Description</h3>
+	<div class="desc">
+	<p>1. If isCopy = true and isMove = true, when drag-drop node, press Ctrl-Key can copy node, don't press Ctrl-Key can move node.</p>
+	<p>2. If isCopy = true and isMove = false, when drag-drop node, will copy node.</p>
+	<p>3. If isCopy = false and isMove = true, when drag-drop node, will move node.</p>
+	<p>4. If isCopy = false and isMove = false, so disable to drag-drop node.</p>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. all of the drag-drop operation will copy node.</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true,
+		drag: {
+			isCopy: true,
+			isMove: false
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.edit.drag.isMove.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.edit.drag.isMove.html
new file mode 100644
index 0000000..78cd8d3
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.edit.drag.isMove.html
@@ -0,0 +1,32 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.edit.drag.</span>isMove</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>When drag-drop node, set whether to allow to move node. It is valid when <span class="highlight_red">[setting.edit.enable = true]</span></p>
+			<p>Default: true</p>
+		</div>
+	</div>
+	<h3>Rules Description</h3>
+	<div class="desc">
+	<p>1. If isCopy = true and isMove = true, when drag-drop node, press Ctrl-Key can copy node, don't press Ctrl-Key can move node.</p>
+	<p>2. If isCopy = true and isMove = false, when drag-drop node, will copy node.</p>
+	<p>3. If isCopy = false and isMove = true, when drag-drop node, will move node.</p>
+	<p>4. If isCopy = false and isMove = false, so disable to drag-drop node.</p>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. all of the drag-drop operation will move node.</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true,
+		drag: {
+			isCopy: false,
+			isMove: true
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.edit.drag.maxShowNodeNum.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.edit.drag.maxShowNodeNum.html
new file mode 100644
index 0000000..dbc3ae4
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.edit.drag.maxShowNodeNum.html
@@ -0,0 +1,25 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Number</span><span class="path">setting.edit.drag.</span>maxShowNodeNum</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>When dragging more than one sibling node, the floating layer shows the maximum number of nodes. zTree using '...' instead of redundant nodes. It is valid when <span class="highlight_red">[setting.edit.enable = true]</span></p>
+			<p>Default: 5</p>
+			<p class="highlight_red">Please adjust the value according to needs.</p>
+		</div>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. Set the maximum number is 10</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true,
+		drag: {
+			maxShowNodeNum: 10
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.edit.drag.minMoveSize.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.edit.drag.minMoveSize.html
new file mode 100644
index 0000000..8270a99
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.edit.drag.minMoveSize.html
@@ -0,0 +1,25 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Number</span><span class="path">setting.edit.drag.</span>minMoveSize</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>The minimum offset which used to determine the drag operator start. (Unit: px) It is valid when <span class="highlight_red">[setting.edit.enable = true]</span></p>
+			<p class="highlight_red">Please adjust the value according to needs. Note: If it is too small, will easily lead to misoperation when you click mouse.</p>
+			<p>Default: 5</p>
+		</div>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. Set the minimum offset is 10px.</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true,
+		drag: {
+			minMoveSize: 10
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.edit.drag.next.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.edit.drag.next.html
new file mode 100644
index 0000000..82eb6fb
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.edit.drag.next.html
@@ -0,0 +1,59 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean / Function(treeId, treeNodes, targetNode)</span><span class="path">setting.edit.drag.</span>next</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>When drag one node to the target node, set whether to allow the node to be the target node's next sibling. It is valid when <span class="highlight_red">[setting.edit.enable = true]</span></p>
+			<p class="highlight_red">If the target node is root, so zTree will only trigger 'inner' and not trigger 'prev / next'.</p>
+			<p class="highlight_red">This function mainly for the appropriate limit drag and drop (auxiliary arrow), it requires a combination of 'prev, inner' together, to achieve full functionality.</p>
+			<p>Default: true</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p> true means: allow the node to be the target node's next sibling.</p>
+	<p> false means: don't allow the node to be the target node's next sibling.</p>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNodes</b><span>Array(JSON)</span></h4>
+	<p>A collection of the nodes which has been dragged</p>
+	<h4 class="topLine"><b>targetNode</b><span>JSON</span></h4>
+	<p>JSON data object of the target node which treeNodes are draged over.</p>
+	<h4 class="topLine"><b>Return </b><span>Boolean</span></h4>
+	<p>return true or false</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. disable to drag the node to the target node's next sibling.</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true,
+		drag: {
+			prev: true,
+			next: false,
+			inner: true
+		}
+	}
+};
+......</code></pre>
+	<h4>2. disable to drag the node to be all of the parent nodes's next sibling.</h4>
+	<pre xmlns=""><code>function canNext(treeId, nodes, targetNode) {
+	return !targetNode.isParent;
+}
+var setting = {
+	edit: {
+		enable: true,
+		drag: {
+			prev: true,
+			next: canNext,
+			inner: true
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.edit.drag.prev.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.edit.drag.prev.html
new file mode 100644
index 0000000..de6f0c8
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.edit.drag.prev.html
@@ -0,0 +1,59 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean / Function(treeId, treeNodes, targetNode)</span><span class="path">setting.edit.drag.</span>prev</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>When drag one node to the target node, set whether to allow the node to be the target node's previous sibling. It is valid when <span class="highlight_red">[setting.edit.enable = true]</span></p>
+			<p class="highlight_red">If the target node is root, so zTree will only trigger 'inner' and not trigger 'prev / next'.</p>
+			<p class="highlight_red">This function mainly for the appropriate limit drag and drop (auxiliary arrow), it requires a combination of 'next, inner' together, to achieve full functionality.</p>
+			<p>Default: true</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p> true means: allow the node to be the target node's previous sibling.</p>
+	<p> false means: don't allow the node to be the target node's previous sibling.</p>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNodes</b><span>Array(JSON)</span></h4>
+	<p>A collection of the nodes which has been dragged</p>
+	<h4 class="topLine"><b>targetNode</b><span>JSON</span></h4>
+	<p>JSON data object of the target node which treeNodes are draged over.</p>
+	<h4 class="topLine"><b>Return </b><span>Boolean</span></h4>
+	<p>return true or false</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. disable to drag the node to the target node's previous sibling.</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true,
+		drag: {
+			prev: false,
+			next: true,
+			inner: true
+		}
+	}
+};
+......</code></pre>
+	<h4>2. disable to drag the node to be all of the parent nodes's previous sibling.</h4>
+	<pre xmlns=""><code>function canPrev(treeId, nodes, targetNode) {
+	return !targetNode.isParent;
+}
+var setting = {
+	edit: {
+		enable: true,
+		drag: {
+			prev: canPrev,
+			next: true,
+			inner: true
+		}
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.edit.editNameSelectAll.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.edit.editNameSelectAll.html
new file mode 100644
index 0000000..a030359
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.edit.editNameSelectAll.html
@@ -0,0 +1,27 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.edit.</span>editNameSelectAll</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>When edit node's name, the text in input is selected or unselected. It is valid when <span class="highlight_red">[setting.edit.enable = true]</span></p>
+			<p>Default: false</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p> true means: when show the input, the text in input is selected</p>
+	<p> false means: when show the input, the text in input is not selected</p>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. When edit node's name, the text in input is selected.</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true,
+		editNameSelectAll: true
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.edit.enable.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.edit.enable.html
new file mode 100644
index 0000000..ec9d2b3
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.edit.enable.html
@@ -0,0 +1,39 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.edit.</span>enable</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Set zTree is in edit mode</p>
+			<p class="highlight_red">Please set this attribute before zTree initialization. If you need to change the edit mode after the initialization, please use zTreeObj.setEditable() method.</p>
+			<p>Default: false</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p> true means: zTree is in edit mode.</p>
+	<p> false means: zTree is not in edit mode.</p>
+	</div>
+	<h3>Editing Rules Description</h3>
+	<div class="desc">
+	<p>1. When click the node, it will not open '<span class="highlight_red">node.url</span>' specified URL.
+<br/>2. Support for dynamic tree editing.
+<br/>3. You can drag-drop nodes, and support drag-drop nodes between multiple trees.
+<br/>4. Support use drag-drop to copy or move the node. (Reference: <span class="highlight_red">setting.edit.drag.isCopy / setting.edit.drag.isMove</span>)
+<br/>5. You can use the Edit button to modify the name attribute.
+<br/>6. You can use the Remove button to remove the node.
+<br/>
+	</p>
+	<p class="highlight_red">Please note that letter case, do not change.</p>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. edit the tree</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.edit.removeTitle.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.edit.removeTitle.html
new file mode 100644
index 0000000..e217527
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.edit.removeTitle.html
@@ -0,0 +1,48 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String / Function(treeId, treeNode)</span><span class="path">setting.edit.</span>removeTitle</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>the title of the remove button DOM. It is valid when <span class="highlight_red">[setting.edit.enable = true & setting.edit.showRemoveBtn = true]</span></p>
+			<p>Default: "remove"</p>
+		</div>
+	</div>
+	<h3>String Format</h3>
+	<div class="desc">
+	<p>When the mouse over the remove button, the browser auto pop-up message content.</p>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which show the remove button</p>
+	<h4 class="topLine"><b>Return </b><span>String</span></h4>
+	<p>Return value is same as 'String Format'</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. Set title is 'remove the node' about all the remove button</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true,
+		showRemoveBtn: true,
+		removeTitle: "remove the node"
+	}
+};
+......</code></pre>
+	<h4>2. Set title is 'remove the parent node' about the parent node, and is 'remove the leaf node' about the leaf node</h4>
+	<pre xmlns=""><code>function setRemoveTitle(treeId, treeNode) {
+	return treeNode.isParent ? "remove the parent node":"remove the leaf node";
+}
+var setting = {
+	edit: {
+		enable: true,
+		showRemoveBtn: true,
+		removeTitle: setRemoveTitle
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.edit.renameTitle.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.edit.renameTitle.html
new file mode 100644
index 0000000..b8ce5a6
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.edit.renameTitle.html
@@ -0,0 +1,48 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String / Function(treeId, treeNode)</span><span class="path">setting.edit.</span>renameTitle</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>the title of the rename button DOM. It is valid when <span class="highlight_red">[setting.edit.enable = true & setting.edit.showRenameBtn = true]</span></p>
+			<p>Default: "rename"</p>
+		</div>
+	</div>
+	<h3>String Format</h3>
+	<div class="desc">
+	<p>When the mouse over the rename button, the browser auto pop-up message content.</p>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which show the rename button</p>
+	<h4 class="topLine"><b>Return </b><span>String</span></h4>
+	<p>return value is same as 'String Format'</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. Set title is 'rename the node' about all the rename button</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true,
+		showRenameBtn: true,
+		renameTitle: "rename the node"
+	}
+};
+......</code></pre>
+	<h4>2. Set title is 'rename the parent node' about the parent node, and is 'rename the leaf node' about the leaf node</h4>
+	<pre xmlns=""><code>function setRenameTitle(treeId, treeNode) {
+	return treeNode.isParent ? "rename the parent node":"rename the leaf node";
+}
+var setting = {
+	edit: {
+		enable: true,
+		showRenameBtn: true,
+		renameTitle: setRenameTitle
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.edit.showRemoveBtn.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.edit.showRemoveBtn.html
new file mode 100644
index 0000000..f0f1fe1
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.edit.showRemoveBtn.html
@@ -0,0 +1,50 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean / Function(treeId, treeNode)</span><span class="path">setting.edit.</span>showRemoveBtn</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Set to show or hide the remove button. It is valid when <span class="highlight_red">[setting.edit.enable = true]</span></p>
+			<p>When you click the remove button:</p>
+			<p>1. zTree will trigger the <span class="highlight_red">setting.callback.beforeRemove</span> callback, and you can decide whether to allow delete.</p>
+			<p>2. If you don't set the 'beforeRemove' or  the 'beforeRemove' callback return true, so zTree will trigger the <span class="highlight_red">setting.callback.onRemove</span> callback after remove the node.</p>
+			<p>Default: true</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p> true means: show the remove button</p>
+	<p> false means: hide the remove button</p>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which show the remove button</p>
+	<h4 class="topLine"><b>Return </b><span>Boolean</span></h4>
+	<p>Return value is same as 'Boolean Format'</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. Hide the remove button</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true,
+		showRemoveBtn: false
+	}
+};
+......</code></pre>
+	<h4>2. Hide the remove button of parent node</h4>
+	<pre xmlns=""><code>function setRemoveBtn(treeId, treeNode) {
+	return !treeNode.isParent;
+}
+var setting = {
+	edit: {
+		enable: true,
+		showRemoveBtn: setRemoveBtn
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.edit.showRenameBtn.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.edit.showRenameBtn.html
new file mode 100644
index 0000000..4fe2f58
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.edit.showRenameBtn.html
@@ -0,0 +1,52 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean / Function(treeId, treeNode)</span><span class="path">setting.edit.</span>showRenameBtn</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Set to show or hide the rename button. It is valid when <span class="highlight_red">[setting.edit.enable = true]</span></p>
+			<p>When you click the rename button:</p>
+			<p>1. Click the rename button, you can rename the node.</p>
+			<p>2. After rename operation (the input DOM blur or press the Enter Key), zTree will trigger the <span class="highlight_red">setting.callback.beforeRename</span> callback, and you can decide whether to allow rename.</p>
+			<p>3. If the 'beforeRename' callback return false, so zTree will keep the edit status. (Press the ESC key, can be restored to the original state.</p>
+			<p>4. If you don't set the 'beforeRename' or  the 'beforeRename' callback return true, so zTree will trigger the <span class="highlight_red">setting.callback.onRename</span> callback after rename the node.</p>
+			<p>Default: true</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p> true means: show the rename button</p>
+	<p> false means: hide the rename button</p>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which show the rename button</p>
+	<h4 class="topLine"><b>Return </b><span>Boolean</span></h4>
+	<p>Return value is same as 'Boolean Format'</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. Hide the rename button</h4>
+	<pre xmlns=""><code>var setting = {
+	edit: {
+		enable: true,
+		showRenameBtn: false
+	}
+};
+......</code></pre>
+	<h4>2. Hide the rename button of parent node</h4>
+	<pre xmlns=""><code>function setRenameBtn(treeId, treeNode) {
+	return !treeNode.isParent;
+}
+var setting = {
+	edit: {
+		enable: true,
+		showRenameBtn: setRenameBtn
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.treeId.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.treeId.html
new file mode 100644
index 0000000..e4b04b3
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.treeId.html
@@ -0,0 +1,14 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">setting.</span>treeId</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>zTree unique identifier. After the initialization, it equals to the id attribute value of the user-defined zTree container.</p>
+			<p class="highlight_red">Do not initialize or modify it, it is an internal argument.</p>
+		</div>
+	</div>
+
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.treeObj.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.treeObj.html
new file mode 100644
index 0000000..30eb66c
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.treeObj.html
@@ -0,0 +1,14 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Object</span><span class="path">setting.</span>treeObj</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>zTree DOM's jQuery object, the main function: easy to internal operations.</p>
+			<p class="highlight_red">Do not initialize or modify it, it is an internal argument.</p>
+		</div>
+	</div>
+
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.view.addDiyDom.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.view.addDiyDom.html
new file mode 100644
index 0000000..fa22bef
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.view.addDiyDom.html
@@ -0,0 +1,40 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNode)</span><span class="path">setting.view.</span>addDiyDom</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>This function used to display the custom control on the node.</p>
+			<p class="highlight_red">1. If you have huge node data, please note: this function will affect the initialization performance. If not required, it is recommended not to use this function.</p>
+			<p class="highlight_red">2. This function is an advanced application, please make sure that a better understanding of zTree before you use it.</p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which display the custom control.</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. Display button in all nodes.</h4>
+	<pre xmlns=""><code>var setting = {
+	view: {
+		addDiyDom: addDiyDom
+	}
+};
+function addDiyDom(treeId, treeNode) {
+	var aObj = $("#" + treeNode.tId + "_a");
+	if ($("#diyBtn_"+treeNode.id).length>0) return;
+	var editStr = "&lt;span id='diyBtn_space_" +treeNode.id+ "' &gt; &lt;/span&gt;"
+		+ "&lt;button type='button' class='diyBtn1' id='diyBtn_" + treeNode.id
+		+ "' title='"+treeNode.name+"' onfocus='this.blur();'&gt;&lt;/button&gt;";
+	aObj.append(editStr);
+	var btn = $("#diyBtn_"+treeNode.id);
+	if (btn) btn.bind("click", function(){alert("diy Button for " + treeNode.name);});
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.view.addHoverDom.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.view.addHoverDom.html
new file mode 100644
index 0000000..1ea8b6d
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.view.addHoverDom.html
@@ -0,0 +1,45 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNode)</span><span class="path">setting.view.</span>addHoverDom</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to display custom control when mouse move over the node. (e.g. the rename and remove button)</p>
+			<p class="highlight_red">If you use this function, so must set <span class="highlight_red">setting.view.removeHoverDom</span>, please make sure that a better understanding of zTree before you use it.</p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which need to display the custom control.</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. Display a button when mouse move over the node, and hide the button when mouse move out.</h4>
+	<pre xmlns=""><code>var setting = {
+	view: {
+		addHoverDom: addHoverDom,
+		removeHoverDom: removeHoverDom,
+		......
+	}
+};
+function addHoverDom(treeId, treeNode) {
+	var aObj = $("#" + treeNode.tId + "_a");
+	if ($("#diyBtn_"+treeNode.id).length>0) return;
+	var editStr = "&lt;span id='diyBtn_space_" +treeNode.id+ "' &gt;&nbsp;&lt;/span&gt;"
+		+ "&lt;button type='button' class='diyBtn1' id='diyBtn_" + treeNode.id
+		+ "' title='"+treeNode.name+"' onfocus='this.blur();'&gt;&lt;/button&gt;";
+	aObj.append(editStr);
+	var btn = $("#diyBtn_"+treeNode.id);
+	if (btn) btn.bind("click", function(){alert("diy Button for " + treeNode.name);});
+};
+function removeHoverDom(treeId, treeNode) {
+	$("#diyBtn_"+treeNode.id).unbind().remove();
+	$("#diyBtn_space_" +treeNode.id).unbind().remove();
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.view.autoCancelSelected.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.view.autoCancelSelected.html
new file mode 100644
index 0000000..8cc2fbb
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.view.autoCancelSelected.html
@@ -0,0 +1,27 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.view.</span>autoCancelSelected</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>When click the selected node while pressing the Ctrl key, allow to cancel selected the node.</p>
+			<p class="highlight_red">If you don't need this function, please set to false.</p>
+			<p>Default: true</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p> true means: press the Ctrl key, can cancel selected node.</p>
+	<p> false means: press the Ctrl key, can't cancel selected node.</p>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. Press the Ctrl key, can't cancel selected node.</h4>
+	<pre xmlns=""><code>var setting = {
+	view: {
+		autoCancelSelected: false
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.view.dblClickExpand.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.view.dblClickExpand.html
new file mode 100644
index 0000000..2517624
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.view.dblClickExpand.html
@@ -0,0 +1,45 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean / Function(treeId, treeNode)</span><span class="path">setting.view.</span>dblClickExpand</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>When double-click the parent node, 'dblClickExpand' is used to decide whether to expand the parent node.</p>
+			<p>Default: true</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p> true means: When double-click the parent node, zTree will expand the parent node.</p>
+	<p> false means: When double-click the parent node, zTree will not expand the parent node.</p>
+	</div>
+	<h3>Function Pamameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which be double-clicked.</p>
+	<h4 class="topLine"><b>Return </b><span>Boolean</span></h4>
+	<p>Return value is same as 'Boolean Format'</p>
+	</div>
+	<h3>Example of setting</h3>
+	<h4>1. When double-click the parent node, zTree will not expand the parent node.</h4>
+	<pre xmlns=""><code>var setting = {
+	view: {
+		dblClickExpand: false
+	}
+};
+......</code></pre>
+	<h4>2. When double-click the parent node, zTree will expand the parent node which level>0.</h4>
+	<pre xmlns=""><code>function dblClickExpand(treeId, treeNode) {
+	return treeNode.level > 0;
+};
+var setting = {
+	view: {
+		dblClickExpand: dblClickExpand
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.view.expandSpeed.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.view.expandSpeed.html
new file mode 100644
index 0000000..1911e74
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.view.expandSpeed.html
@@ -0,0 +1,31 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String / Number</span><span class="path">setting.view.</span>expandSpeed</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>The animation speed of expand or collapse node. As same as 'speed' parameter in jQuery</p>
+			<p class="highlight_red">In order to ensure zTree operating speed,  if use the IE6,  zTree will not use animation.</p>
+			<p>Default: "fast"</p>
+		</div>
+	</div>
+	<h3>String Format</h3>
+	<div class="desc">
+	<p>e.g. "slow", "normal", or "fast"</p>
+	<p class="highlight_red">If set to "", zTree will not use animation.</p>
+	</div>
+	<h3>Number Format</h3>
+	<div class="desc">
+	<p>How long the animation will run. [Unit: ms] (e.g. 1000)</p>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. Set the animation speed to slow</h4>
+	<pre xmlns=""><code>var setting = {
+	view: {
+		expandSpeed: "slow"
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.view.fontCss.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.view.fontCss.html
new file mode 100644
index 0000000..1ad5f51
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.view.fontCss.html
@@ -0,0 +1,42 @@
+<div class="apiDetail">
+<div>
+	<h2><span>JSON / Function(treeId, treeNode)</span><span class="path">setting.view.</span>fontCss</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Personalized text style, only applies to &lt;A&gt; object in the node DOM</p>
+			<p>Default: {}</p>
+		</div>
+	</div>
+	<h3>JSON Format</h3>
+	<div class="desc">
+	<p>As same as .css() method in jQuery. e.g. <span class="highlight_red">{color:"#ff0011", background:"blue"}</span></p>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which use the personalized text style</p>
+	<h4 class="topLine"><b>Return </b><span>JSON</span></h4>
+	<p>Return value is same as 'JSON Format'. e.g. <span class="highlight_red">{color:"#ff0011", background:"blue"}</span></p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. Don't modify css file, and set the node name's color to red</h4>
+	<pre xmlns=""><code>var setting = {
+	view: {
+		fontCss : {color:"red"}
+	}
+};</code></pre>
+	<h4>2. Don't modify css file, and set the root node name's color to red</h4>
+	<pre xmlns=""><code>function setFontCss(treeId, treeNode) {
+	return treeNode.level == 0 ? {color:"red"} : {};
+};
+var setting = {
+	view: {
+		fontCss: setFontCss
+	}
+};</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.view.nameIsHTML.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.view.nameIsHTML.html
new file mode 100644
index 0000000..4fe19ad
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.view.nameIsHTML.html
@@ -0,0 +1,28 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.view.</span>nameIsHTML</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Set to use HTML in 'name' attribute.</p>
+			<p class="highlight_red">If allow HTML, please do check to avoid security issues, e.g. JavaScript Injection...</p>
+			<p>Default: false</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p> true means: 'name' attribute can be HTML.</p>
+	<p> false means: 'name' attribute is only TEXT.</p>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. Set to allow HTML</h4>
+	<pre xmlns=""><code>var setting = {
+	view: {
+		nameIsHTML: true
+	}
+};
+var node = {"name":"&lt;font color='red'&gt;test&lt;/font&gt;"};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.view.removeHoverDom.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.view.removeHoverDom.html
new file mode 100644
index 0000000..0c70aff
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.view.removeHoverDom.html
@@ -0,0 +1,45 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId, treeNode)</span><span class="path">setting.view.</span>removeHoverDom</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to hide custom control when mouse move out the node. (e.g. the rename and remove button)</p>
+			<p class="highlight_red">If you use this function, so must set <span class="highlight_red">setting.view.addHoverDom</span>, please make sure that a better understanding of zTree before you use it.</p>
+			<p>Default: null</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which need to hide the custom control.</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. Display a button when mouse move over the node, and hide the button when mouse move out.</h4>
+	<pre xmlns=""><code>var setting = {
+	view: {
+		addHoverDom: addHoverDom,
+		removeHoverDom: removeHoverDom,
+		......
+	}
+};
+function addHoverDom(treeId, treeNode) {
+	var aObj = $("#" + treeNode.tId + "_a");
+	if ($("#diyBtn_"+treeNode.id).length>0) return;
+	var editStr = "&lt;span id='diyBtn_space_" +treeNode.id+ "' &gt;&nbsp;&lt;/span&gt;"
+		+ "&lt;button type='button' class='diyBtn1' id='diyBtn_" + treeNode.id
+		+ "' title='"+treeNode.name+"' onfocus='this.blur();'&gt;&lt;/button&gt;";
+	aObj.append(editStr);
+	var btn = $("#diyBtn_"+treeNode.id);
+	if (btn) btn.bind("click", function(){alert("diy Button for " + treeNode.name);});
+};
+function removeHoverDom(treeId, treeNode) {
+	$("#diyBtn_"+treeNode.id).unbind().remove();
+	$("#diyBtn_space_" +treeNode.id).unbind().remove();
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.view.selectedMulti.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.view.selectedMulti.html
new file mode 100644
index 0000000..ffa129d
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.view.selectedMulti.html
@@ -0,0 +1,28 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.view.</span>selectedMulti</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Set whether to allow select multiple nodes.</p>
+			<p>Default: true</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p> true mean: you can select multiple nodes.</p>
+	<p> false mean: you can only select one node.</p>
+	<p class="highlight_red">1. Press Ctrl key, you can select multiple nodes.</p>
+	<p class="highlight_red">2、This attribute don't affect the feature of cancel select node. ( please see setting.view.autoCancelSelected )</p>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. Only select one node.</h4>
+	<pre xmlns=""><code>var setting = {
+	view: {
+		selectedMulti: false
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.view.showIcon.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.view.showIcon.html
new file mode 100644
index 0000000..9adf003
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.view.showIcon.html
@@ -0,0 +1,45 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean / Function(treeId, treeNode)</span><span class="path">setting.view.</span>showIcon</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Set to show or hide node icon.</p>
+			<p>Default: true</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p> true means: show node icon.</p>
+	<p> false means: hide node icon.</p>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which need to show icon.</p>
+	<h4 class="topLine"><b>Return </b><span>Boolean</span></h4>
+	<p>Return value is same as 'Boolean Format'</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. Hide node icon</h4>
+	<pre xmlns=""><code>var setting = {
+	view: {
+		showIcon: false
+	}
+};
+......</code></pre>
+	<h4>2. Hide node icon which level=2</h4>
+	<pre xmlns=""><code>function showIconForTree(treeId, treeNode) {
+	return treeNode.level != 2;
+};
+var setting = {
+	view: {
+		showIcon: showIconForTree
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.view.showLine.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.view.showLine.html
new file mode 100644
index 0000000..a554014
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.view.showLine.html
@@ -0,0 +1,26 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.view.</span>showLine</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Set to show or hide line.</p>
+			<p>Default: true</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p> true means: show line.</p>
+	<p> false means: hide line.</p>
+	</div>
+	<h3>Examples of setting</h3>
+	<h4>1. Hide line</h4>
+	<pre xmlns=""><code>var setting = {
+	view: {
+		showLine: false
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.view.showTitle.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.view.showTitle.html
new file mode 100644
index 0000000..66bb26e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.view.showTitle.html
@@ -0,0 +1,47 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean / Function(treeId, treeNode)</span><span class="path">setting.view.</span>showTitle</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Set to show or hide the 'title' attribute of node DOM.</p>
+			<p class="highlight_red">Please see the <span class="highlight_red">setting.data.key.title</span> attribute</p>
+			<p>Default: true</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p> true means: show the 'title' attribute of node DOM.</p>
+	<p> false means: hide the 'title' attribute of node DOM.</p>
+	<p class="highlight_red">When setting.view.showTitle = true & setting.data.key.title = '', zTree will set the 'setting.data.key.name' attribute to the 'setting.data.key.title'.</p>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeId</b><span>String</span></h4>
+	<p>zTree unique identifier: <b class="highlight_red">treeId</b>, easy for users to control.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which need to show title.</p>
+	<h4 class="topLine"><b>Return </b><span>Boolean</span></h4>
+	<p>Return value is same as 'Boolean Format'</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. Hide the 'title' attribute of node DOM.</h4>
+	<pre xmlns=""><code>var setting = {
+	view: {
+		showTitle: false
+	}
+};
+......</code></pre>
+	<h4>2. Hide the 'title' attribute of node DOM which level=2.</h4>
+	<pre xmlns=""><code>function showTitleForTree(treeId, treeNode) {
+	return treeNode.level != 2;
+};
+var setting = {
+	view: {
+		showTitle: showTitleForTree
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.view.txtSelectedEnable.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.view.txtSelectedEnable.html
new file mode 100644
index 0000000..a380930
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/setting.view.txtSelectedEnable.html
@@ -0,0 +1,26 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">setting.view.</span>txtSelectedEnable</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Set to allow or don't allow to select the text which in zTree's DOM.</p>
+			<p>Default: false</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p> true means: Allow to select the txt which in zTree's DOM.</p>
+	<p> false means: Don't allow to select the txt which in zTree's DOM.</p>
+	</div>
+	<h3>Examples of setting & function</h3>
+	<h4>1. Allow to select the txt which in zTree's DOM.</h4>
+	<pre xmlns=""><code>var setting = {
+	view: {
+		txtSelectedEnable: true
+	}
+};
+......</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.check_Child_State.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.check_Child_State.html
new file mode 100644
index 0000000..48efb79
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.check_Child_State.html
@@ -0,0 +1,43 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Number</span><span class="path">treeNode.</span>check_Child_State</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.excheck</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to record the node's half-checked state about its all child nodes's checkbox or radio. It is valid when <span class="highlight_red">[setting.check.enable = true]</span></p>
+			<p class="highlight_red">zTree v3.x provides treeNode.getCheckStatus () method to get an accurate the half-checked status.</p>
+			<p class="highlight_red">Do not initialize or modify it, it is an internal argument.</p>
+			<p>Default: true</p>
+		</div>
+	</div>
+	<h3>Number Format</h3>
+	<div class="desc">
+	<p>Rules:</p>
+	<table width="100%" border="0" cellspacing="1" cellpadding="0">
+		<thead>
+			<tr><td colspan="4">setting.check.checkType = "checkbox"</td></tr>
+			<tr><td>treeNode.check_Child_State</td><td>Checked Status Description</td></tr>
+		</thead>
+		<tbody>
+			<tr><td>-1</td><td>Has no child nodes or all child nodes's 'nocheck' attribute is true.</td></tr>
+			<tr><td>0</td><td>All of the child nodes has not been checked.</td></tr>
+			<tr><td>1</td><td>Some of the child nodes has been checked.</td></tr>
+			<tr><td>2</td><td>All of the child nodes has been checked.</td></tr>
+		</tbody>
+	</table>
+	<br/>
+	<table width="100%" border="0" cellspacing="1" cellpadding="0">
+		<thead>
+			<tr><td colspan="4">setting.check.checkType = "radio"</td></tr>
+			<tr><td>treeNode.check_Child_State</td><td>Checked Status Description</td></tr>
+		</thead>
+		<tbody>
+			<tr><td>-1</td><td>Has no child nodes or all child nodes's 'nocheck' attribute is true.</td></tr>
+			<tr><td>0</td><td>All of the child nodes has not been checked.</td></tr>
+			<tr><td>2</td><td>Some of the child nodes has been checked.</td></tr>
+		</tbody>
+	</table>
+	</div>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.check_Focus.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.check_Focus.html
new file mode 100644
index 0000000..77b7359
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.check_Focus.html
@@ -0,0 +1,19 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">treeNode.</span>check_Focus</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.excheck</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to record the status which the checkbox or radio get focus. It is valid when <span class="highlight_red">[setting.check.enable = true]</span></p>
+			<p class="highlight_red">Do not initialize or modify it, it is an internal argument.</p>
+			<p>Default: false</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p>true means: mouse move over the checkbox</p>
+	<p>false means: mouse move out the checkbox</p>
+	</div>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.checked.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.checked.html
new file mode 100644
index 0000000..8a55f3d
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.checked.html
@@ -0,0 +1,32 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">treeNode.</span>checked</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.excheck</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>The checked status about node's checkbox or radio. It is valid when <span class="highlight_red">[setting.check.enable = true & treeNode.nocheck = false]</span></p>
+			<p class="highlight_red">1. If change the 'checked' to other attribute, please set the 'setting.data.key.checked' attribute.</p>
+			<p class="highlight_red">2. If you create node data, and set 'checked' attribute to true, zTree will check this node's checkbox or radio when zTree is initialized.</p>
+			<p class="highlight_red">3. Use the treeObj.checkNode or checkAllNodes or updateNode method, you can check or uncheck the node. Please see the API about these methods.</p>
+			<p class="highlight_red">4. zTree support identification string 'true' & 'false'.</p>
+			<p>Default: false</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p>true means: check the checkbox or radio when zTree is initialized.</p>
+	<p>false means: uncheck the checkbox or radio when zTree is initialized.</p>
+	</div>
+	<h3>Examples of treeNode</h3>
+	<h4>1. check the checkbox when zTree is initialized</h4>
+	<pre xmlns=""><code>var nodes = [
+{ "id":1, "name":"test1", checked:true },
+{ "id":2, "name":"test2", checked:true }
+]</code></pre>
+	<h4>2. Get the checked status of the first root node</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var checked = treeObj.getNodes()[0].checked;
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.checkedOld.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.checkedOld.html
new file mode 100644
index 0000000..ee51626
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.checkedOld.html
@@ -0,0 +1,25 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">treeNode.</span>checkedOld</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.excheck</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>The checked status about node's checkbox or radio when zTree was initialized. It is valid when <span class="highlight_red">[setting.check.enable = true & treeNode.nocheck = false]</span></p>
+			<p class="highlight_red">1. Do not initialize it, it will be initialized when the node is initialized.</p>
+			<p class="highlight_red">2. If you need to achieve special features, you can use the zTreeObj.getChangeCheckedNodes method and modify the value of 'checkedOld' attribute.</p>
+			<p>Default: the value of 'checked' attribute when zTree is initialized</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p>true means: the checkbox or radio is checked when zTree is initialized.</p>
+	<p>false means: the checkbox or radio is not checked when zTree is initialized.</p>
+	</div>
+	<h3>Examples of treeNode</h3>
+	<h4>1. Get the original checked status of the first root node</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var checkedOld = treeObj.getNodes()[0].checkedOld;
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.children.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.children.html
new file mode 100644
index 0000000..d765bb9
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.children.html
@@ -0,0 +1,35 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Array(JSON)</span><span class="path">treeNode.</span>children</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>The data collections of node's child nodes.</p>
+			<p class="highlight_red">1. If change the 'children' to other attribute, please set the 'setting.data.key.children' attribute.</p>
+			<p class="highlight_red">2. If you set to use dynamic tree, when a node is expanded which 'isParent' attribute is true and which has no child nodes, zTree will use ajax to get its child nodes.</p>
+			<p>Default: undefined</p>
+		</div>
+	</div>
+	<h3>Array(JSON) Format</h3>
+	<div class="desc">
+	<p>Standard JSON Data object</p>
+	</div>
+	<h3>Examples of treeNode</h3>
+	<h4>1. Use the standard JSON data object.</h4>
+	<pre xmlns=""><code>var nodes = [
+{ "id":1, "name":"test1",
+	children: [
+	{ "id":3, "name":"test3"},
+	{ "id":4, "name":"test4"},
+	{ "id":5, "name":"test5"}
+	]
+},
+{ "id":2, "name":"test2"  }
+]</code></pre>
+	<h4>2. Get the first root node's child nodes</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getNodes()[0].children;
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.chkDisabled.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.chkDisabled.html
new file mode 100644
index 0000000..7a5fcf3
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.chkDisabled.html
@@ -0,0 +1,28 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">treeNode.</span>chkDisabled</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.excheck</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>1. Set node's checkbox / radio to disabled. It is valid when <span class="highlight_red">[setting.check.enable = true]</span></p>
+			<p class="highlight_red">2. zTree support identification string 'true' & 'false'.</p>
+			<p class="highlight_red">3. Please don't change this attribute of the nodes which have been created. If you want to disable or undisable the nodes, please use 'setChkDisabled()' methods.</p>
+			<p class="highlight_red">4. When zTree initialize the nodes, if you need to the child nodes automatically inherit the 'chkDisabled' attribute, please see 'setting.check.chkDisabledInherit'.</p>
+			<p>Default: false</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p class="highlight_red">true means: this node's checkbox / radio is disabled.</p>
+	<p class="highlight_red">false means: this node's checkbox / radio is able.</p>
+	</div>
+	<h3>Examples of treeNode</h3>
+	<h4>1. disable some node's checkbox / radio </h4>
+	<pre xmlns=""><code>var nodes = [
+	{ "id":1, "name":"test1", "checked":true, "chkDisabled":true},
+	{ "id":2, "name":"test2", "chkDisabled":true},
+	{ "id":3, "name":"test3"}
+]</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.click.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.click.html
new file mode 100644
index 0000000..1f9db62
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.click.html
@@ -0,0 +1,24 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">treeNode.</span>click</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Simple click event operations. As same as : (onclick ="...") the code. If the operation is more complex, please use the onClick callback.</p>
+			<p class="highlight_red">Because IE is different to other browsers in operating the event of ‘onclick’ and ‘click’ coexistence, please do not use this parameter to control whether to allow the redirection operation (for example: treeNode.click = "return false;"). If there is similar requirements, please do not use the 'url' attribute to save the website address, but use the 'onClick' callback to control jumps.</p>
+			<p>Default: undefined</p>
+		</div>
+	</div>
+	<h3>String Format</h3>
+	<div class="desc">
+	<p>Standard javascript syntax, for example: alert ("test"); etc.</p>
+	</div>
+	<h3>Examples of treeNode</h3>
+	<h4>1. When click this node, will alert msg.</h4>
+	<pre xmlns=""><code>var nodes = [
+	{ "id":1, "name":"Google CN", "url":"http://g.cn", "click":"alert('test');"},
+	......
+]</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.diy.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.diy.html
new file mode 100644
index 0000000..68c39ba
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.diy.html
@@ -0,0 +1,15 @@
+<div class="apiDetail">
+<div>
+	<h2><span>?</span><span class="path">treeNode.</span>* DIY *</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to save other custom data of node, do not use the same attribute name with ztree used, the user can freely set.</p>
+		</div>
+	</div>
+	<h3>Examples of treeNode</h3>
+	<h4>1. Use 'ename' attribute to save more info</h4>
+	<pre xmlns=""><code>var node = { "id":1, "name":"test1", "ename":"test eName"};</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.editNameFlag.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.editNameFlag.html
new file mode 100644
index 0000000..f60ef2a
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.editNameFlag.html
@@ -0,0 +1,19 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">treeNode.</span>editNameFlag</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to save the node editing name status. It is valid when <span class="highlight_red">[setting.edit.enable = true]</span></p>
+			<p class="highlight_red">Do not initialize or modify it, it is an internal argument.</p>
+			<p>Default: false</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p>true means: node is being edited.</p>
+	<p>false means: node is not being edited.</p>
+	</div>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.getCheckStatus.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.getCheckStatus.html
new file mode 100644
index 0000000..3c9a2e6
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.getCheckStatus.html
@@ -0,0 +1,63 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function()</span><span class="path">treeNode.</span>getCheckStatus</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.excheck</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Get the node's half-checked status of checkbox or radio. It is valid when <span class="highlight_red">[setting.check.enable = true]</span></p>
+			<p class="highlight_red">Do not initialize or modify it, it is created by the zTree.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>Return</b><span>JSON</span></h4>
+	<pre xmlns=""><code>{
+	checked: true, //As same as 'treeNode.checked'
+	half: true  //Rule the table below
+}</code></pre>
+	<table width="100%" border="0" cellspacing="1" cellpadding="0">
+		<thead>
+			<tr><td colspan="4">setting.check.checkType = "checkbox"</td></tr>
+			<tr><td>treeNode.checked</td><td>treeNode.check_Child_State</td><td>treeNode.halfCheck</td><td> half </td></tr>
+		</thead>
+		<tbody>
+			<tr><td>-</td><td>-</td><td>true</td><td>true</td></tr>
+			<tr><td colspan="4">&nbsp;</td></tr>
+			<tr><td>true</td><td>-1</td><td>false</td><td>false</td></tr>
+			<tr><td>true</td><td>0</td><td>false</td><td>true</td></tr>
+			<tr><td>true</td><td>1</td><td>false</td><td>true</td></tr>
+			<tr><td>true</td><td>2</td><td>false</td><td>false</td></tr>
+			<tr><td colspan="4">&nbsp;</td></tr>
+			<tr><td>false</td><td>-1</td><td>false</td><td>false</td></tr>
+			<tr><td>false</td><td>0</td><td>false</td><td>false</td></tr>
+			<tr><td>false</td><td>1</td><td>false</td><td>true</td></tr>
+			<tr><td>false</td><td>2</td><td>false</td><td>true</td></tr>
+		</tbody>
+	</table>
+	<br/>
+	<table width="100%" border="0" cellspacing="1" cellpadding="0">
+		<thead>
+			<tr><td colspan="4">setting.check.checkType = "radio"</td></tr>
+			<tr><td>treeNode.checked</td><td>treeNode.check_Child_State</td><td>treeNode.halfCheck</td><td> half </td></tr>
+		</thead>
+		<tbody>
+			<tr><td>-</td><td>-</td><td>true</td><td>true</td></tr>
+			<tr><td colspan="4">&nbsp;</td></tr>
+			<tr><td>true</td><td>-1</td><td>false</td><td>false</td></tr>
+			<tr><td>true</td><td>0</td><td>false</td><td>false</td></tr>
+			<tr><td>true</td><td>2</td><td>false</td><td>true</td></tr>
+			<tr><td colspan="4">&nbsp;</td></tr>
+			<tr><td>false</td><td>-1</td><td>false</td><td>false</td></tr>
+			<tr><td>false</td><td>0</td><td>false</td><td>false</td></tr>
+			<tr><td>false</td><td>2</td><td>false</td><td>true</td></tr>
+		</tbody>
+	</table>
+	</div>
+	<h3>Examples of treeNode</h3>
+	<h4>1. Get the first root node's half-checked status</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var halfCheck = treeObj.getNodes()[0].getCheckStatus();
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.getNextNode.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.getNextNode.html
new file mode 100644
index 0000000..755aa6e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.getNextNode.html
@@ -0,0 +1,27 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function()</span><span class="path">treeNode.</span>getNextNode</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Get the treeNode's next sibling node.</p>
+			<p class="highlight_red">Do not initialize or modify it, it is created by the zTree.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>Return</b><span>JSON</span></h4>
+	<p>JSON data object of the treeNode's next sibling node</p>
+	<p class="highlight_red">If have not the next node, return null.</p>
+	</div>
+	<h3>Examples of treeNode</h3>
+	<h4>1. Get the first selected node's next sibling node.</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var sNodes = treeObj.getSelectedNodes();
+if (sNodes.length > 0) {
+	var node = sNodes[0].getNextNode();
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.getParentNode.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.getParentNode.html
new file mode 100644
index 0000000..16bab30
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.getParentNode.html
@@ -0,0 +1,27 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function()</span><span class="path">treeNode.</span>getParentNode</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Get the treeNode's parent node.</p>
+			<p class="highlight_red">Do not initialize or modify it, it is created by the zTree.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>Return</b><span>JSON</span></h4>
+	<p>JSON data object of treeNode's parent node.</p>
+	<p class="highlight_red">If treeNode is root, return null.</p>
+	</div>
+	<h3>Examples of treeNode</h3>
+	<h4>1. Get the first selected node's parent node.</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var sNodes = treeObj.getSelectedNodes();
+if (sNodes.length > 0) {
+	var node = sNodes[0].getParentNode();
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.getPreNode.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.getPreNode.html
new file mode 100644
index 0000000..f6745b1
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.getPreNode.html
@@ -0,0 +1,27 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function()</span><span class="path">treeNode.</span>getPreNode</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Get the treeNode's previous sibling node.</p>
+			<p class="highlight_red">Do not initialize or modify it, it is created by the zTree.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>Return</b><span>JSON</span></h4>
+	<p>JSON data object of the treeNode's previous sibling node</p>
+	<p class="highlight_red">If have not the previous node, return null.</p>
+	</div>
+	<h3>Examples of treeNode</h3>
+	<h4>1. Get the first selected node's previous sibling node.</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var sNodes = treeObj.getSelectedNodes();
+if (sNodes.length > 0) {
+	var node = sNodes[0].getPreNode();
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.halfCheck.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.halfCheck.html
new file mode 100644
index 0000000..8375326
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.halfCheck.html
@@ -0,0 +1,29 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">treeNode.</span>halfCheck</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.excheck</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Force node checkBox / radio to the half-checked status. It is valid when <span class="highlight_red">[setting.check.enable = true & treeNode.nocheck = false]</span></p>
+			<p class="highlight_red">1. If you force to the half-checked status, zTree will not automatically calculated the half-checked status about this node.</p>
+			<p class="highlight_red">2. Until you set treeNode.halfCheck to false or null, zTree will automatically calculated the half-checked status about this node.</p>
+			<p class="highlight_red">3. zTree support identification string 'true' & 'false'.</p>
+			<p>Defaul: false</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p>true means: the checkbox or radio is half-checked when zTree is initialized.</p>
+	<p>false means: the half-checked status will be automatically calculated</p>
+	</div>
+	<h3>Examples of treeNode</h3>
+	<h4>1. set the half-checked status when zTree is initialized</h4>
+	<pre xmlns=""><code>var nodes = [
+{ "id":1, "name":"test1", isParent:true, checked:true, halfCheck:true },
+{ "id":2, "name":"test2", isParent:true, checked:false, halfCheck:true },
+{ "id":3, "name":"test3", isParent:true, checked:true },
+{ "id":4, "name":"test4", isParent:true, checked:false }
+]</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.icon.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.icon.html
new file mode 100644
index 0000000..4e1c99f
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.icon.html
@@ -0,0 +1,33 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">treeNode.</span>icon</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>URL path of node's custom icon.</p>
+			<p class="highlight_red">1. If you only set the 'icon' attribute to parent node, the parent node will only show one icon when it is expanded or collapsed.</p>
+			<p class="highlight_red">2. If you need to show two icons when it is expanded or collapsed, please set the 'treeNode.iconOpen' and 'treeNode.iconClose' attribute.</p>
+			<p class="highlight_red">3. If you need to use css to set the custom icon, please set the 'treeNode.iconSkin' attribute.</p>
+			<p>Default: undefined</p>
+		</div>
+	</div>
+	<h3>String Format</h3>
+	<div class="desc">
+	<p>Icon image url can be a relative path or absolute path.</p>
+	<p class="highlight_red">If use a relative path, please note the relationship between icon image and the page, ensure the correct image path.</p>
+	</div>
+	<h3>Examples of treeNode</h3>
+	<h4>1. Set the custom icon</h4>
+	<pre xmlns=""><code>var nodes = [
+	//Only show one icon when it is expanded or collapsed.
+	{ name:"Parent Node 1", icon:"/img/parent.gif"},
+
+	//Show two icons when it is expanded or collapsed.
+	{ name:"Parent Node 2", iconOpen:"/img/open.gif", iconClose:"/img/close.gif"},
+
+	//the custom icon for leaf node
+	{ name:"Leaf Node", icon:"/img/leaf.gif"}
+]</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.iconClose.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.iconClose.html
new file mode 100644
index 0000000..2259e8f
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.iconClose.html
@@ -0,0 +1,33 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">treeNode.</span>iconClose</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>URL path of parent node's custom icon when it is collapsed.</p>
+			<p class="highlight_red">1. Only parent node support this attribute.</p>
+			<p class="highlight_red">2. This attribute must be used simultaneously with 'iconOpen' attribute.</p>
+			<p class="highlight_red">3. If you need to use css to set the custom icon, please set the 'treeNode.iconSkin' attribute.</p>
+			<p>Default: undefined</p>
+		</div>
+	</div>
+	<h3>String Format</h3>
+	<div class="desc">
+	<p>Icon image url can be a relative path or absolute path.</p>
+	<p class="highlight_red">If use a relative path, please note the relationship between icon image and the page, ensure the correct image path.</p>
+	</div>
+	<h3>Examples of treeNode</h3>
+	<h4>1. Set the custom icon</h4>
+	<pre xmlns=""><code>var nodes = [
+	//Only show one icon when it is expanded or collapsed.
+	{ name:"Parent Node 1", icon:"/img/parent.gif"},
+
+	//Show two icons when it is expanded or collapsed.
+	{ name:"Parent Node 2", iconOpen:"/img/open.gif", iconClose:"/img/close.gif"},
+
+	//the custom icon for leaf node
+	{ name:"Leaf Node", icon:"/img/leaf.gif"}
+]</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.iconOpen.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.iconOpen.html
new file mode 100644
index 0000000..3203615
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.iconOpen.html
@@ -0,0 +1,33 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">treeNode.</span>iconOpen</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>URL path of parent node's custom icon when it is expanded.</p>
+			<p class="highlight_red">1. Only parent node support this attribute.</p>
+			<p class="highlight_red">2. This attribute must be used simultaneously with 'iconClose' attribute.</p>
+			<p class="highlight_red">3. If you need to use css to set the custom icon, please set the 'treeNode.iconSkin' attribute.</p>
+			<p>Default: undefined</p>
+		</div>
+	</div>
+	<h3>String Format</h3>
+	<div class="desc">
+	<p>Icon image url can be a relative path or absolute path.</p>
+	<p class="highlight_red">If use a relative path, please note the relationship between icon image and the page, ensure the correct image path.</p>
+	</div>
+	<h3>Examples of treeNode</h3>
+	<h4>1. Set the custom icon</h4>
+	<pre xmlns=""><code>var nodes = [
+	//Only show one icon when it is expanded or collapsed.
+	{ name:"Parent Node 1", icon:"/img/parent.gif"},
+
+	//Show two icons when it is expanded or collapsed.
+	{ name:"Parent Node 2", iconOpen:"/img/open.gif", iconClose:"/img/close.gif"},
+
+	//the custom icon for leaf node
+	{ name:"Leaf Node", icon:"/img/leaf.gif"}
+]</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.iconSkin.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.iconSkin.html
new file mode 100644
index 0000000..fca7fbf
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.iconSkin.html
@@ -0,0 +1,43 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">treeNode.</span>iconSkin</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>The className of node's custom icon.</p>
+			<p class="highlight_red">1. You need to modify the css, add the definition of className.</p>
+			<p class="highlight_red">2. The css is simple, convenient, and support the parent node to switch icons when it is expanded or collapsed.</p>
+			<p class="highlight_red">3. Recommend the use of CSS Sprites, can reduce repeating load the image, to avoid image flicker.</p>
+			<p class="highlight_red">4. The 'iconSkin' support IE6 in zTree v3.x.</p>
+			<p class="highlight_red">5. If you need to use image's URL to set the custom icon, please set the 'treeNode.icon' or 'treeNode.iconOpen' or 'treeNode.iconClose' attribute.</p>
+			<p>Default: undefined</p>
+		</div>
+	</div>
+	<h3>String Format</h3>
+	<div class="desc">
+	<p>The string about custom icon's className.</p>
+	</div>
+	<h3>Examples of css & treeNode</h3>
+	<h4>1. Set the custom icon</h4>
+	<pre xmlns=""><code>css example：
+.ztree li span.button.diy01_ico_open, .ztree li span.button.diy01_ico_close{...}
+
+.ztree li span.button.diy02_ico_open{...}
+.ztree li span.button.diy02_ico_close{...}
+
+.ztree li span.button.diy03_ico_docu{...}
+
+node's data example：
+var nodes = [
+	//Only show one icon when it is expanded or collapsed.
+	{ name:"Parent Node 1", iconSkin:"diy01"},
+
+	//Show two icons when it is expanded or collapsed.
+	{ name:"Parent Node 2", iconSkin:"diy02"},
+
+	//the custom icon for leaf node
+	{ name:"Leaf Node", iconSkin:"diy03"}
+]</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.isAjaxing.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.isAjaxing.html
new file mode 100644
index 0000000..ddadf41
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.isAjaxing.html
@@ -0,0 +1,26 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">treeNode.</span>isAjaxing</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Judge whether the node's child nodes being loaded asynchronously.</p>
+			<p class="highlight_red">Do not initialize or modify it, it is created by the zTree.</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p> true means: the node's child nodes is being loaded asynchronously</p>
+	<p> false means: the node's child nodes is not being loaded asynchronously</p>
+	</div>
+	<h3>Examples of treeNode</h3>
+	<h4>1. Judge whether the first selected node's child nodes being loaded asynchronously</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var sNodes = treeObj.getSelectedNodes();
+if (sNodes.length > 0) {
+	var isAjaxing = sNodes[0].isAjaxing;
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.isFirstNode.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.isFirstNode.html
new file mode 100644
index 0000000..a8ee61c
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.isFirstNode.html
@@ -0,0 +1,28 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">treeNode.</span>isFirstNode</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Judge whether the node is the sibling nodes's first node.</p>
+			<p class="highlight_red">If you use the 'exhide' pack, so this attribute will only support the node which be shown. </p>
+			<p class="highlight_red">Do not initialize or modify it, it is created by the zTree.</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p> true means: the node is first node.</p>
+	<p> false means: the node is not first node.</p>
+	<p class="highlight_red">If the node has been hidden, isFirstNode = false</p>
+	</div>
+	<h3>Examples of treeNode</h3>
+	<h4>1. Judge whether the first selected node is the sibling nodes's first node.</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var sNodes = treeObj.getSelectedNodes();
+if (sNodes.length > 0) {
+	var isFirstNode = sNodes[0].isFirstNode;
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.isHidden.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.isHidden.html
new file mode 100644
index 0000000..3a07b94
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.isHidden.html
@@ -0,0 +1,28 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">treeNode.</span>isHidden</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exhide</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Judge whether the node has been hidden.</p>
+			<p class="highlight_red">1. When initialize zTree, the nodes which be set 'isHidden = true' will be hidden.</p>
+			<p class="highlight_red"></p>
+			<p class="highlight_red">2. Please don't change this attribute of the nodes which have been created. If you want to hide or show nodes, please use 'hideNode() / hideNodes() / showNode() / showNodes()' methods.</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p> true means: this node is hidden.</p>
+	<p> false means: this node is shown.</p>
+	</div>
+	<h3>Examples of treeNode</h3>
+	<h4>1. Judge whether the first root node has been hidden.</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var sNodes = treeObj.getNodes();
+if (sNodes.length > 0) {
+	var isHidden = sNodes[0].isHidden;
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.isHover.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.isHover.html
new file mode 100644
index 0000000..e18ed0c
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.isHover.html
@@ -0,0 +1,19 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">treeNode.</span>isHover</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to record the hover status of node's DOM. For 'setting.view.addHoverDom / removeHoverDom'.</p>
+			<p class="highlight_red">Do not initialize or modify it, it is an internal argument.</p>
+			<p>Default: false</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p>true means: the node's DOM is in hover.</p>
+	<p>false means: the node's DOM is not in hover.</p>
+	</div>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.isLastNode.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.isLastNode.html
new file mode 100644
index 0000000..cd2ca26
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.isLastNode.html
@@ -0,0 +1,28 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">treeNode.</span>isLastNode</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Judge whether the node is the sibling nodes's last node.</p>
+			<p class="highlight_red">If you use the 'exhide' pack, so this attribute will only support the node which be shown. </p>
+			<p class="highlight_red">Do not initialize or modify it, it is created by the zTree.</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p> true means: the node is last node.</p>
+	<p> false means: the node is not last node.</p>
+	<p class="highlight_red">If the node has been hidden, isLastNode = false</p>
+	</div>
+	<h3>Examples of treeNode</h3>
+	<h4>1. Judge whether the first selected node is the sibling nodes's last node.</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var sNodes = treeObj.getSelectedNodes();
+if (sNodes.length > 0) {
+	var isLastNode = sNodes[0].isLastNode;
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.isParent.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.isParent.html
new file mode 100644
index 0000000..dad4b81
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.isParent.html
@@ -0,0 +1,28 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">treeNode.</span>isParent</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Judge whether the node is the parent node.</p>
+			<p class="highlight_red">1. When zTree initialize the node data, the node which has children is set to true, otherwise false.</p>
+			<p class="highlight_red">2. When zTree initialize the node data, if set treeNode.isParent to true, the node will be set to be parent node.</p>
+			<p class="highlight_red">3. In order to solve the problem of someone make json data, supporting "false", "true" format of the data string.</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p> true means: the node is parent node.</p>
+	<p> false means: the node is not parent node.</p>
+	</div>
+	<h3>Examples of treeNode</h3>
+	<h4>1. Judge whether the first selected node is the parent node.</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var sNodes = treeObj.getSelectedNodes();
+if (sNodes.length > 0) {
+	var isParent = sNodes[0].isParent;
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.level.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.level.html
new file mode 100644
index 0000000..d151162
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.level.html
@@ -0,0 +1,25 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Number</span><span class="path">treeNode.</span>level</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>The level of node</p>
+			<p class="highlight_red">Do not initialize or modify it, it is created by the zTree.</p>
+		</div>
+	</div>
+	<h3>Number Format</h3>
+	<div class="desc">
+	<p class="highlight_red">The root node's level = 0, and next level = 1, ...</p>
+	</div>
+	<h3>Examples of treeNode</h3>
+	<h4>1. Get the first selected node's level</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var sNodes = treeObj.getSelectedNodes();
+if (sNodes.length > 0) {
+	var level = sNodes[0].level;
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.name.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.name.html
new file mode 100644
index 0000000..fa508cc
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.name.html
@@ -0,0 +1,25 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">treeNode.</span>name</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>The node's name</p>
+			<p class="highlight_red">1. If you want to change 'name' attribute, please modify the 'setting.data.key.name' attribute.</p>
+			<p>Default: undenfined</p>
+		</div>
+	</div>
+	<h3>String Format</h3>
+	<div class="desc">
+	<p>String object. The HTML special characters are escaped</p>
+	</div>
+	<h3>Examples of treeNode</h3>
+	<h4>1. Set node's name to 'test1', 'test2', 'test3'</h4>
+	<pre xmlns=""><code>var nodes = [
+	{ "id":1, "name":"test1"},
+	{ "id":2, "name":"test2"},
+	{ "id":3, "name":"test3"}
+]</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.nocheck.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.nocheck.html
new file mode 100644
index 0000000..6c4880c
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.nocheck.html
@@ -0,0 +1,26 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">treeNode.</span>nocheck</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.excheck</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>1. Set node to hide the checkbox or radio. It is valid when <span class="highlight_red">[setting.check.enable = true]</span></p>
+			<p class="highlight_red">2. zTree support identification string 'true' & 'false'.</p>
+			<p>Default: false</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p class="highlight_red">true means: the node hide the checkbox or radio, and don't affect the checked association, and don't affect its parent node's half-checked status.</p>
+	<p class="highlight_red">false means: the node show the checkbox or radio.</p>
+	</div>
+	<h3>Examples of treeNode</h3>
+	<h4>1. Hide some node's checkbox / radio </h4>
+	<pre xmlns=""><code>var nodes = [
+	{ "id":1, "name":"test1", "nocheck":true},
+	{ "id":2, "name":"test2"},
+	{ "id":3, "name":"test3"}
+]</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.open.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.open.html
new file mode 100644
index 0000000..bc910de
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.open.html
@@ -0,0 +1,30 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">treeNode.</span>open</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to record the parent node's expand status.</p>
+			<p class="highlight_red">1. When zTree initialize the node data, if you set treeNode.open = true, zTree will default expand this parent node.</p>
+			<p class="highlight_red">2. Leaf node's 'open' attribute is false.</p>
+			<p class="highlight_red">3. In order to solve the problem of someone make json data, supporting "false", "true" format of the data string.</p>
+			<p class="highlight_red">4. When setting.async.enable = false, the parent node will be expanded which have no child nodes and its attribute 'open' is true. (v3.5.15+)  </p>
+			<p>Default: false</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p> true means: the parent node is expanded.</p>
+	<p> false means: the parent node is collapsed.</p>
+	</div>
+	<h3>Examples of treeNode</h3>
+	<h4>1. Get the first selected node's expand status.</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var sNodes = treeObj.getSelectedNodes();
+if (sNodes.length > 0) {
+	var isOpen = sNodes[0].open;
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.parentTId.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.parentTId.html
new file mode 100644
index 0000000..0bc2a6d
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.parentTId.html
@@ -0,0 +1,27 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">treeNode.</span>parentTId</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>The unique identifier of node's parent node.</p>
+			<p class="highlight_red">1. zTree v3.x using 'parentTId' replaced the original 'parentNode' attribute, and increased getParentNode () method, in order to avoid the original 'parentNode' cause the clone () method infinite loop.</p>
+			<p class="highlight_red">2. Do not initialize or modify it, it is created by the zTree.</p>
+		</div>
+	</div>
+	<h3>String Format</h3>
+	<div class="desc">
+	<p>String object of node's parent node's tId. please see API about 'treeNode.tId'</p>
+	<p class="highlight_red">If treeNode is root node, parentTId is null.</p>
+	</div>
+	<h3>Examples of treeNode</h3>
+	<h4>1. Get the first selected node's parent node's tId</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var sNodes = treeObj.getSelectedNodes();
+if (sNodes.length > 0) {
+	var parentTId = sNodes[0].parentTId;
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.tId.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.tId.html
new file mode 100644
index 0000000..18c2855
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.tId.html
@@ -0,0 +1,25 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">treeNode.</span>tId</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>The unique identifier of node.</p>
+			<p class="highlight_red">Do not initialize or modify it, it is created by the zTree.</p>
+		</div>
+	</div>
+	<h3>String Format</h3>
+	<div class="desc">
+	<p>tId rules: setting.treeId + "_" + zTree counter</p>
+	</div>
+	<h3>Examples of treeNode</h3>
+	<h4>1. Get the first selected node's tId</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var sNodes = treeObj.getSelectedNodes();
+if (sNodes.length > 0) {
+	var tId = sNodes[0].tId;
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.target.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.target.html
new file mode 100644
index 0000000..176a7a3
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.target.html
@@ -0,0 +1,24 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">treeNode.</span>target</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Used to set the target where the node is clicked to open url. It is valid when <span class="highlight_red">[treeNode.url exists]</span></p>
+			<p>Default: undefined</p>
+		</div>
+	</div>
+	<h3>String Format</h3>
+	<div class="desc">
+	<p>As same as &lt;a&gt; tag's 'target' attribute. e.g.  '_blank', '_self' or other window name.</p>
+	<p>if this attribute is omitted, zTree default set it to '_blank'</p>
+	</div>
+	<h3>Exmaples of treeNode</h3>
+	<h4>1. Set target is '_blank'</h4>
+	<pre xmlns=""><code>var nodes = [
+	{ "id":1, "name":"test1", "url":"http://myTest.com", "target":"_blank"},
+	......
+]</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.url.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.url.html
new file mode 100644
index 0000000..5552445
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.url.html
@@ -0,0 +1,25 @@
+<div class="apiDetail">
+<div>
+	<h2><span>String</span><span class="path">treeNode.</span>url</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>The URL of node link</p>
+			<p class="highlight_red">1. In edit mode (setting.edit.enable = true) , this feature fails. If you must use a similar feature, please use the 'onClick' callback for their own control.</p>
+			<p class="highlight_red">2. If you use  the 'onClick' callback function to control opening URL , then set the URL  in the other custom attribute, do not use the 'url' attribute.</p>
+			<p>Default: undefined</p>
+		</div>
+	</div>
+	<h3>String Format</h3>
+	<div class="desc">
+	<p>As same as &lt;a&gt; tag's 'href' attribute.</p>
+	</div>
+	<h3>Examples of treeNode</h3>
+	<h4>1. Set the URL is 'g.cn'</h4>
+	<pre xmlns=""><code>var nodes = [
+	{ "id":1, "name":"Google CN", "url":"http://g.cn"},
+	......
+]</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.zAsync.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.zAsync.html
new file mode 100644
index 0000000..b3ff414
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/treeNode.zAsync.html
@@ -0,0 +1,28 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Boolean</span><span class="path">treeNode.</span>zAsync</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Judge whether the parent node's child nodes will be loaded asynchronously when the parent node is expanded.</p>
+			<p class="highlight_red">Do not initialize or modify it, it is created by the zTree.</p>
+			<p class="highlight_red">Default：false (the parent node which have no child nodes); true (the parent node which have child nodes or the leaf node)</p>
+		</div>
+	</div>
+	<h3>Boolean Format</h3>
+	<div class="desc">
+	<p> true means: the node's child nodes will not be loaded asynchronously when the parent node is expanded.</p>
+	<p> false means: the node's child nodes will be loaded asynchronously when the parent node is expanded.</p>
+	<p class="highlight_red"> This attribute will not effect to 'reAsyncChildNodes()' method</p>
+	</div>
+	<h3>Examples of treeNode</h3>
+	<h4>1. Judge whether the first selected node's child nodes has been loaded asynchronously</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var sNodes = treeObj.getSelectedNodes();
+if (sNodes.length > 0) {
+	var zAsync = sNodes[0].zAsync;
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.addNodes.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.addNodes.html
new file mode 100644
index 0000000..680ccc4
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.addNodes.html
@@ -0,0 +1,42 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(parentNode, newNodes, isSilent)</span><span class="path">zTreeObj.</span>addNodes</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Add nodes</p>
+			<p class="highlight_red">In order to avoid duplication data resulting from repeated initialization, zTree v3.x will automatically clone node data when zTree initialized or add nodes. If you need to get the data objects within the zTree, please get the return value of this method.</p>
+			<p class="highlight_red">Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>parentNode</b><span>JSON</span></h4>
+	<p>The additional node's parent node. If additional node is root node, please the parentNode is null.</p>
+	<p class="highlight_red">Please ensure this node data object is a data object within zTree.</p>
+	<h4 class="topLine"><b>newNodes</b><span>JSON / Array(JSON)</span></h4>
+	<p>The node data's JSON object collection which need to increase, refer to 'treeNode treeNode data details'</p>
+	<p class="highlight_red">1. zTree v3.x support to add single node, that is, if you only add a node, you can don't use the array.</p>
+	<p class="highlight_red">2. If you use simple data model, please refer to the attributes within the 'setting.data.simpleData'.</p>
+	<h4 class="topLine"><b>isSilent</b><span>Boolean</span></h4>
+	<p>Set whether to automatically expand the parent node, after add nodes.</p>
+	<p>isSilent = true means: don't auto expand the parent node. Otherwise auto expand.</p>
+	<h4 class="topLine"><b>Return </b><span>Array(JSON)</span></h4>
+	<p>return the new nodes in zTree</p>
+	<p class="highlight_red">If the newNodes is single data object, the return value is a array with length is 1.</p>
+	<p class="highlight_red">Note: the node data JSON object in the return value is not equal to the JSON object in the 'newNodes'.</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. Add one root node to zTree which id is 'tree'</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var newNode = {name:"newNode1"};
+newNode = treeObj.addNodes(null, newNode);
+</code></pre>
+	<h4>2. Add three root nodes to zTree which id is 'tree'</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var newNodes = [{name:"newNode1"}, {name:"newNode2"}, {name:"newNode3"}];
+newNodes = treeObj.addNodes(null, newNodes);
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.cancelEditName.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.cancelEditName.html
new file mode 100644
index 0000000..8afdae0
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.cancelEditName.html
@@ -0,0 +1,30 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(newName)</span><span class="path">zTreeObj.</span>cancelEditName</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Cancel the edit name status. Can restore the original name, and can also force assigned to a new name.</p>
+			<p class="highlight_red">Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>newName</b><span>String</span></h4>
+	<p>Re given a new name</p>
+	<p class="highlight_red">If this parameter is omitted, then restore the original name.</p>
+	<h4 class="topLine"><b>Return </b><span>none</span></h4>
+	<p>no return value</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. Cancel edit name, and restore the original name.</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+treeObj.cancelEditName();
+</code></pre>
+	<h4>2. Cancel edit name , and set the new name.</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+treeObj.cancelEditName("test_new_name");
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.cancelSelectedNode.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.cancelSelectedNode.html
new file mode 100644
index 0000000..581c2d2
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.cancelSelectedNode.html
@@ -0,0 +1,35 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeNode)</span><span class="path">zTreeObj.</span>cancelSelectedNode</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>To cancel the selected node.</p>
+			<p class="highlight_red">zTree v3.x support to select multiple nodes, so you can cancel a single selected node, and you can cancel all of the selected nodes too.</p>
+			<p class="highlight_red">Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which need to cancel selected.</p>
+	<p class="highlight_red">Please ensure that this data object is an internal node data object in zTree.</p>
+	<p class="highlight_red">If you omit this parameter,  zTree will cancel all of the selected nodes.</p>
+	<h4 class="topLine"><b>Return </b><span>none</span></h4>
+	<p>no return value</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. Cancel all of the selected nodes</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+treeObj.cancelSelectedNode();
+</code></pre>
+	<h4>2. Cancel the first node of the selected nodes</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getSelectedNode();
+if (nodes.length>0) { 
+	treeObj.cancelSelectedNode(nodes[0]);
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.checkAllNodes.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.checkAllNodes.html
new file mode 100644
index 0000000..276b629
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.checkAllNodes.html
@@ -0,0 +1,29 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(checked)</span><span class="path">zTreeObj.</span>checkAllNodes</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.excheck</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Check or unCheck all nodes which have been initialized. It is valid when <span class="highlight_red">[setting.check.enable = true & setting.check.chkStyle = "checkbox"]</span></p>
+			<p class="highlight_red">This method does not trigger 'beforeCheck' or 'onCheck' callback function.</p>
+			<p class="highlight_red">Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>checked</b><span>Boolean</span></h4>
+	<p>checked = true means: check all nodes.</p>
+	<p>checked = false means: uncheck all nodes.</p>
+	<p class="highlight_red">Don't affect the node which 'nochecked' attribute is true.</p>
+	<p class="highlight_red">Don't affect the node is not loaded.</p>
+	<h4 class="topLine"><b>Return </b><span>none</span></h4>
+	<p>no return value</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. check all nodes</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+treeObj.checkAllNodes(true);
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.checkNode.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.checkNode.html
new file mode 100644
index 0000000..7411ef8
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.checkNode.html
@@ -0,0 +1,44 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeNode, checked, checkTypeFlag, callbackFlag)</span><span class="path">zTreeObj.</span>checkNode</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.excheck</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Check or unCheck a single node. It is valid when <span class="highlight_red">[setting.check.enable = true]</span></p>
+			<p class="highlight_red">Use checkNode() method of zTree v3.x can trigger 'beforeCheck' or 'onCheck' callback function. for reduce redundant code.</p>
+			<p class="highlight_red">Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which need to be checked or unchecked.</p>
+	<p class="highlight_red">Please ensure that this data object is an internal node data object in zTree.</p>
+	<h4 class="topLine"><b>checked</b><span>Boolean</span></h4>
+	<p>checked = true means: check node.</p>
+	<p>checked = false means: uncheck node.</p>
+	<p class="highlight_red">If this parameter is omitted, then toggle check or uncheck depend this node's expanded state.</p>
+	<p class="highlight_red">Don't affect the node which 'nochecked' attribute is true.</p>
+	<h4 class="topLine"><b>checkTypeFlag</b><span>Boolean</span></h4>
+	<p>checkTypeFlag = true means: According to 'setting.check.chkboxType' attribute automatically check or uncheck the parent and child nodes.</p>
+	<p>checkTypeFlag = false means: only check or uncheck this node, don't affect its parent and child nodes.</p>
+	<p class="highlight_red">When checkTypeFlag = false and treeNode.checked = checked, will not trigger callback function.</p>
+	<p class="highlight_red">Don't affect the parent and child nodes which 'nochecked' attribute is true.</p>
+	<h4 class="topLine"><b>callbackFlag</b><span>Boolean</span></h4>
+	<p>callbackFlag = true means: call this method, will trigger 'beforeCheck' & 'onCheck' callback.</p>
+	<p>callbackFlag = false means: call this method, will not trigger callback.</p>
+	<p class="highlight_red">If this parameter is omitted, it is same as 'callbackFlag = false'</p>
+	<h4 class="topLine"><b>Return </b><span>none</span></h4>
+	<p>no return value</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. check the selected nodes</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getSelectedNodes();
+for (var i=0, l=nodes.length; i < l; i++) {
+	treeObj.checkNode(nodes[i], true, true);
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.copyNode.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.copyNode.html
new file mode 100644
index 0000000..a98e84d
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.copyNode.html
@@ -0,0 +1,47 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(targetNode, treeNode, moveType, isSilent)</span><span class="path">zTreeObj.</span>copyNode</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Copy the node</p>
+			<p class="highlight_red">When copy nodes, zTree v3.x will clone nodes. If you need to get the data object in zTree, please get the return value of this method.</p>
+			<p class="highlight_red">Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>targetNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which will be target.</p>
+	<p class="highlight_red">If copy the node to root node, please set the 'targetNode' to null.</p>
+	<p class="highlight_red">Please ensure that this data object is an internal node data object in zTree.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which will be copied.</p>
+	<p class="highlight_red">Please ensure that this data object is an internal node data object in zTree.</p>
+	<h4 class="topLine"><b>moveType</b><span>String</span></h4>
+	<p>Copied to the target node's relative position.</p>
+	<p class="highlight_red">"inner" means: to be taregetNode's child node.</p>
+	<p class="highlight_red">"prev" means: to be taregetNode's previous sibling node.</p>
+	<p class="highlight_red">"next" means: to be taregetNode's next sibling node.</p>
+	<h4 class="topLine"><b>isSilent</b><span>Boolean</span></h4>
+	<p>After copy the node, whether to automatically expand its parent node.</p>
+	<p>isSilent = true means: don't expand its parent node.</p>
+	<p>isSilent = false or omit this parameter means: expand its parent node.</p>
+	<h4 class="topLine"><b>Return </b><span>JSON</span></h4>
+	<p>return the new node in zTree</p>
+	<p class="highlight_red">Note: the node data JSON object in the return value is not equal to the treeNode.</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. Copy the second root node to the first root node's child node.</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getNodes();
+treeObj.copyNode(nodes[0], nodes[1], "inner");
+</code></pre>
+	<h4>2. Copy the second root node to the first root node's previous sibling node.</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getNodes();
+treeObj.copyNode(nodes[0], nodes[1], "before");
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.destroy.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.destroy.html
new file mode 100644
index 0000000..80c5281
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.destroy.html
@@ -0,0 +1,25 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeId)</span><span class="path">zTreeObj.</span>destroy</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>From zTree v3.4, zTree support the method for destruction.</p>
+			<p>1. This method can destroy the zTreeObj's zTree.</p>
+			<p class="highlight_red">2. If you want to destory all of the zTrees, you can use the '$.fn.zTree.destroy()' method.</p>
+			<p class="highlight_red">3. If you want to use the tree which has been destroyed, you must use the 'init()' method at first.</p>
+		</div>
+	</div>
+        <h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>Return </b><span>none</span></h4>
+	<p>no return value</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. destroy the zTree which its id is 'treeDemo'</h4>
+	<pre xmlns=""><code>var zTreeObj = $.fn.zTree.getZTreeObj("treeDemo");
+zTreeObj.destroy();
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.editName.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.editName.html
new file mode 100644
index 0000000..92ac5c1
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.editName.html
@@ -0,0 +1,29 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeNode)</span><span class="path">zTreeObj.</span>editName</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Start editing the node's name.</p>
+			<p class="highlight_red">1. If need to cancel editing the node's name, please use cancelEditName(newName) method.</p>
+			<p class="highlight_red">2. This method can be used to set the editing node‘s input box to get focus.</p>
+			<p class="highlight_red">3. Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which will be editing name</p>
+	<p class="highlight_red">Please ensure that this data object is an internal node data object in zTree.</p>
+	<h4 class="topLine"><b>Retrun </b><span>none</span></h4>
+	<p>no return value</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. Start editing the first selected node's name.</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getNodes();
+treeObj.editName(nodes[0]);
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.expandAll.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.expandAll.html
new file mode 100644
index 0000000..ef28a31
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.expandAll.html
@@ -0,0 +1,30 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(expandFlag)</span><span class="path">zTreeObj.</span>expandAll</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Expand or collapse all nodes.</p>
+			<p class="highlight_red">This method does not trigger 'beforeExpand / onExpand' or 'beforeCollapse / onCollapse' callback function.</p>
+			<p class="highlight_red">Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>expandFlag</b><span>Boolean</span></h4>
+	<p>expandFlag = true means: expand all nodes.</p>
+	<p>expandFlag =  false means: collapse all nodes.</p>
+	<h4 class="topLine"><b>Return </b><span>Boolean</span></h4>
+	<p>return the result of expand or collapse.</p>
+	<p>true means: expand all nodes</p>
+	<p>false means: collapse all nodes</p>
+	<p>null means: have no parent node to expand or collapse.</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. Expand all nodes</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+treeObj.expandAll(true);
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.expandNode.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.expandNode.html
new file mode 100644
index 0000000..f99ff77
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.expandNode.html
@@ -0,0 +1,50 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeNode, expandFlag, sonSign, focus, callbackFlag)</span><span class="path">zTreeObj.</span>expandNode</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Expand or collapse single node.</p>
+			<p class="highlight_red">Use expandNode() method of zTree v3.x can trigger 'beforeExpand / onExpand' or 'beforeCollapse / onCollapse' callback function. for reduce redundant code.</p>
+			<p class="highlight_red">Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which will be expanded or collapsed</p>
+	<p class="highlight_red">Please ensure that this data object is an internal node data object in zTree.</p>
+	<h4 class="topLine"><b>expandFlag</b><span>Boolean</span></h4>
+	<p>expandFlag = true means: expand the node.</p>
+	<p>expandFlag = false means: collapse the node.</p>
+	<p class="highlight_red">If this parameter is omitted, then toggle expand or collapse depend this node's expanded state.</p>
+	<h4 class="topLine"><b>sonSign</b><span>Boolean</span></h4>
+	<p>sonSign = true means: expand or collapse all of the child nodes depend the 'expandFlag' parameter.</p>
+	<p>sonSign = false means: only expand or collapse this node.</p>
+	<p class="highlight_red">When sonSign = false and treeNode.open = expandFlag, will not trigger the callback.</p>
+	<p class="highlight_red">If this parameter is omitted, it is same as 'sonSign = false'.</p>
+	<h4 class="topLine"><b>focus</b><span>Boolean</span></h4>
+	<p>focus = true means: after expand or collapse, set the focus of this node for view.</p>
+	<p>focus =  false means: after expand or coolapse, don't set the focus of this node.</p>
+	<p class="highlight_red">If this parameter is omitted, it is same as 'focus = true'.</p>
+	<h4 class="topLine"><b>callbackFlag</b><span>Boolean</span></h4>
+	<p>callbackFlag = true means: call this method, will trigger 'beforeExpand / onExpand' or 'beforeCollapse / onCollapse' callback.</p>
+	<p>callbackFlag = false means: call this method, will not trigger callback.</p>
+	<p class="highlight_red">If this parameter is omitted, it is same as 'callbackFlag = false'</p>
+	<h4 class="topLine"><b>Return </b><span>Boolean</span></h4>
+	<p>return the result of expand or collapse.</p>
+	<p>true means: expand node</p>
+	<p>false means: collapse node</p>
+	<p>null means: the node is not parent node.</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. Expand the first selected node. (and expand this node's child nodes)</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getSelectedNodes();
+if (nodes.length>0) {
+	treeObj.expandNode(nodes[0], true, true, true);
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.getChangeCheckedNodes.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.getChangeCheckedNodes.html
new file mode 100644
index 0000000..d0f9cf3
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.getChangeCheckedNodes.html
@@ -0,0 +1,24 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function()</span><span class="path">zTreeObj.</span>getChangeCheckedNodes</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.excheck</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Get the collection of nodes which be changed checked status. (Compared with the original data checkedOld) It is valid when <span class="highlight_red">[setting.check.enable = true]</span></p>
+			<p class="highlight_red">Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>Return </b><span>Array(JSON)</span></h4>
+	<p>return the collection of nodes which be changed checked status (Array)</p>
+	<p class="highlight_red">If you need to get the collection of nodes which changed the checked status, when nodes be checked or unchecked, so please set treeNode.checkedOld = treeNode.checked ( for all of the be changed checked status nodes ).</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. Get the collection of nodes which be changed checked status</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getChangeCheckedNodes();
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.getCheckedNodes.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.getCheckedNodes.html
new file mode 100644
index 0000000..7a7c3b9
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.getCheckedNodes.html
@@ -0,0 +1,28 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(checked)</span><span class="path">zTreeObj.</span>getCheckedNodes</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.excheck</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Get the collection of nodes which be checked or unchecked. It is valid when <span class="highlight_red">[setting.check.enable = true]</span></p>
+			<p class="highlight_red">Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>checked</b><span>Boolean</span></h4>
+	<p>checked = true means: get the collection of nodes which be checked</p>
+	<p>checked = false means: get the collection of nodes which be unchecked</p>
+	<p class="highlight_red">If this parameter is omitted, it is same as 'checked = true'</p>
+	<p class="highlight_red">Don't get the nodes which 'nochecked' attribute is true.</p>
+	<h4 class="topLine"><b>Return </b><span>Array(JSON)</span></h4>
+	<p>return the collection of nodes which be checked or unchecked. (Array)</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. Get the collection of nodes which be checked.</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getCheckedNodes(true);
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.getNodeByParam.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.getNodeByParam.html
new file mode 100644
index 0000000..05572e7
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.getNodeByParam.html
@@ -0,0 +1,32 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(key, value, parentNode)</span><span class="path">zTreeObj.</span>getNodeByParam</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>According to the node data attribute, search the node which exactly matches, and get the JSON object of node.</p>
+			<p class="highlight_red">Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>key</b><span>String</span></h4>
+	<p>The name of attribute which need to exactly match</p>
+	<h4 class="topLine"><b>value</b><span>?</span></h4>
+	<p>The value which need to exactly match, can be any type, please ensure its type consistent with the attribute values.</p>
+	<h4 class="topLine"><b>parentNode</b><span>JSON</span></h4>
+	<p>The search range, you can search node from a parent node's child nodes.</p>
+	<p class="highlight_red">If this parameter is omitted, zTree will search node from all nodes.</p>
+	<h4 class="topLine"><b>Return </b><span>JSON</span></h4>
+	<p>JSON data object of the node which be searched.</p>
+	<p class="highlight_red">1. If search none node, return null.</p>
+	<p class="highlight_red">2. If there are many nodes can be searched, return the first node.</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. Search the node which its 'id' attribute is 1.</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var node = treeObj.getNodeByParam("id", 1, null);
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.getNodeByTId.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.getNodeByTId.html
new file mode 100644
index 0000000..8fd26ea
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.getNodeByTId.html
@@ -0,0 +1,27 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(tId)</span><span class="path">zTreeObj.</span>getNodeByTId</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>According the unique identifier tId of zTree, quick get the node's JSON data object.</p>
+			<p class="highlight_red">Get the node from the cache, don't need to search from all nodes.</p>
+			<p class="highlight_red">Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>tId</b><span>String</span></h4>
+	<p>The unique identifier of node.</p>
+	<h4 class="topLine"><b>Return </b><span>JSON</span></h4>
+	<p>JSON data object of the node which be searched.</p>
+	<p class="highlight_red">If no result, return null.</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. 1. Search the node which its 'tId' attribute is 'tree_10'</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var node = treeObj.getNodeByTId("tree_10");
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.getNodeIndex.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.getNodeIndex.html
new file mode 100644
index 0000000..ad828e7
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.getNodeIndex.html
@@ -0,0 +1,30 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeNode)</span><span class="path">zTreeObj.</span>getNodeIndex</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Get the node's index in the same level nodes. (start from 0)</p>
+			<p class="highlight_red">Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which need to get index.</p>
+	<p class="highlight_red">Please ensure that this data object is an internal node data object in zTree.</p>
+	<h4 class="topLine"><b>Return </b><span>Number</span></h4>
+	<p class="highlight_red">return the index. (start from 0)</p>
+	<p class="highlight_red">If there is no this node, return -1.</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. Get the first selected node's index in the same level nodes.</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getSelectedNodes();
+if (nodes.length>0) {
+	var index = treeObj.getNodeIndex(nodes[0]);
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.getNodes.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.getNodes.html
new file mode 100644
index 0000000..5906a43
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.getNodes.html
@@ -0,0 +1,26 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function()</span><span class="path">zTreeObj.</span>getNodes</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Get all of the nodes in zTree</p>
+			<p class="highlight_red">Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>Return </b><span>Array(JSON)</span></h4>
+	<p>return all of the nodes</p>
+	<p class="highlight_red">1. This array is a collection of the root nodes  (the default child nodes are in the 'children' attributes);</p>
+	<p class="highlight_red">2. Traverse all the nodes need to use recursion, or the use of transformToArray() method make the nodes to be a simple array.</p>
+	<p class="highlight_red">3. For the asynchronous loading mode, can't get the nodes which are yet loaded.</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. Get all of the nodes</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getNodes();
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.getNodesByFilter.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.getNodesByFilter.html
new file mode 100644
index 0000000..2cd6baa
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.getNodesByFilter.html
@@ -0,0 +1,43 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(filter, isSingle, parentNode, invokeParam)</span><span class="path">zTreeObj.</span>getNodesByFilter</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Search the single node's data or collection of nodes's data by custom rules.</p>
+			<p class="highlight_red">Can be customized complex search rules.</p>
+			<p class="highlight_red">Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>filter</b><span>Function</span></h4>
+	<p>Custom search function. e.g. function filter(node) {...}</p>
+	<p>filter's parameter: node (node's data -- JSON)</p>
+	<p>filter's return: boolean (true means: match the rules; false means: don't match the rules)</p>
+	<h4 class="topLine"><b>isSingle</b><span>Boolean</span></h4>
+	<p>isSingle = true means: search only one node</p>
+	<p>isSingle = false means: search the array of the nodes</p>
+	<p class="highlight_red">If this parameter is omitted, as same as false</p>
+	<h4 class="topLine"><b>parentNode</b><span>JSON</span></h4>
+	<p>The search range, you can search node from a parent node's child nodes.</p>
+	<p class="highlight_red">If this parameter is omitted, zTree will search node from all nodes.</p>
+	<h4 class="topLine"><b>invokeParam</b><span>anything</span></h4>
+	<p>Custom data object by user, used to calculate in the filter function.</p>
+	<h4 class="topLine"><b>Return </b><span>Array(JSON) / JSON</span></h4>
+	<p>If isSingle = true, will return the first node's data (JSON) what be matched. If no match, return null.</p>
+	<p>If isSingle = false, will return the array of all nodes's data what be matched. if no match, return [ ].</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. Search the nodes which their 'name' contains 'test' and 'level' is 2.</h4>
+	<pre xmlns=""><code>function filter(node) {
+    return (node.level == 2 && node.name.indexOf("test")>-1);
+}
+......
+var treeObj = $.fn.zTree.getZTreeObj("tree");
+var node = treeObj.getNodesByFilter(filter, true); // search only one node
+var nodes = treeObj.getNodesByFilter(filter); // search the array of the nodes
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.getNodesByParam.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.getNodesByParam.html
new file mode 100644
index 0000000..3173af4
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.getNodesByParam.html
@@ -0,0 +1,31 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(key, value, parentNode)</span><span class="path">zTreeObj.</span>getNodesByParam</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>According to the node data attribute, search the nodes which exactly matches, and get the JSON objects collection of nodes.</p>
+			<p class="highlight_red">Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>key</b><span>String</span></h4>
+	<p>The name of attribute which need to exactly match</p>
+	<h4 class="topLine"><b>value</b><span>?</span></h4>
+	<p>The value which need to exactly match, can be any type, please ensure its type consistent with the attribute values.</p>
+	<h4 class="topLine"><b>parentNode</b><span>JSON</span></h4>
+	<p>The search range, you can search node from a parent node's child nodes.</p>
+	<p class="highlight_red">If this parameter is omitted, zTree will search node from all nodes.</p>
+	<h4 class="topLine"><b>Return </b><span>Array(JSON)</span></h4>
+	<p>The JSON data objects collection of the nodes which be searched.</p>
+	<p class="highlight_red">If search none node, return [ ].</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. Search the nodes which their 'name' attribute is 'test'.</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getNodesByParam("name", "test", null);
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.getNodesByParamFuzzy.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.getNodesByParamFuzzy.html
new file mode 100644
index 0000000..14b6c29
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.getNodesByParamFuzzy.html
@@ -0,0 +1,32 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(key, value, parentNode)</span><span class="path">zTreeObj.</span>getNodesByParamFuzzy</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>According to the node data attribute, search the nodes which fuzzy matches, and get the JSON objects collection of nodes.</p>
+			<p class="highlight_red">Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>key</b><span>String</span></h4>
+	<p>The name of attribute which need to fuzzy match</p>
+	<h4 class="topLine"><b>value</b><span>String</span></h4>
+	<p>The value which need to fuzzy match.</p>
+	<p class="highlight_red">The type of value can only be String</p>
+	<h4 class="topLine"><b>parentNode</b><span>JSON</span></h4>
+	<p>The search range, you can search node from a parent node's child nodes.</p>
+	<p class="highlight_red">If this parameter is omitted, zTree will search node from all nodes.</p>
+	<h4 class="topLine"><b>Return </b><span>Array(JSON)</span></h4>
+	<p>The JSON data objects collection of the nodes which be searched.</p>
+	<p class="highlight_red">If search none node, return [ ].</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. Search the nodes which their 'name' attribute contains the string 'test'.</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getNodesByParamFuzzy("name", "test", null);
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.getSelectedNodes.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.getSelectedNodes.html
new file mode 100644
index 0000000..4a0f060
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.getSelectedNodes.html
@@ -0,0 +1,23 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function()</span><span class="path">zTreeObj.</span>getSelectedNodes</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Get the JSON data objects collection of the selected nodes in zTree.</p>
+			<p class="highlight_red">Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>Return </b><span>Array(JSON)</span></h4>
+	<p>The JSON data objects collection of the selected nodes.</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. get the selected nodes</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getSelectedNodes();
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.hideNode.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.hideNode.html
new file mode 100644
index 0000000..f02f523
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.hideNode.html
@@ -0,0 +1,29 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeNode)</span><span class="path">zTreeObj.</span>hideNode</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exhide</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>To hide any node.</p>
+			<p class="highlight_red">1. This feature can't support the 'exedit' feature, so please don't use this feature in edit mode.</p>
+			<p class="highlight_red">2. If you hide or show the nodes, it will effect the 'isFirstNode' and 'isLastNode' attribute.</p>
+			<p class="highlight_red">3. Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which will be hidden</p>
+	<p class="highlight_red">Please ensure that this data object is an internal node data object in zTree.</p>
+	<h4 class="topLine"><b>Retrun </b><span>none</span></h4>
+	<p>no return value</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. hide the first root node.</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getNodes();
+treeObj.hideNode(nodes[0]);
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.hideNodes.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.hideNodes.html
new file mode 100644
index 0000000..9bf8e6b
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.hideNodes.html
@@ -0,0 +1,29 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeNodes)</span><span class="path">zTreeObj.</span>hideNodes</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exhide</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>To hide a group of nodes.</p>
+			<p class="highlight_red">1. This feature can't support the 'exedit' feature, so please don't use this feature in edit mode.</p>
+			<p class="highlight_red">2. If you hide or show the nodes, it will effect the 'isFirstNode' and 'isLastNode' attribute.</p>
+			<p class="highlight_red">3. Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeNodes</b><span>Array(JSON)</span></h4>
+	<p>the array of the nodes which will be hidden</p>
+	<p class="highlight_red">Please ensure that this data object is an internal node data object in zTree.</p>
+	<h4 class="topLine"><b>Retrun </b><span>none</span></h4>
+	<p>no return value</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. hide the first root node's children.</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getNodes();
+treeObj.hideNodes(nodes[0].children);
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.moveNode.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.moveNode.html
new file mode 100644
index 0000000..cb1e4df
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.moveNode.html
@@ -0,0 +1,49 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(targetNode, treeNode, moveType, isSilent)</span><span class="path">zTreeObj.</span>moveNode</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Move the node</p>
+			<p class="highlight_red">Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>targetNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which will be target.</p>
+	<p class="highlight_red">If move the node to root node, please set the 'targetNode' to null.</p>
+	<p class="highlight_red">Please ensure that this data object is an internal node data object in zTree.</p>
+	<h4 class="topLine"><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which will be moved.</p>
+	<p class="highlight_red">Please ensure that this data object is an internal node data object in zTree.</p>
+	<h4 class="topLine"><b>moveType</b><span>String</span></h4>
+	<p>Moved to the target node's relative position.</p>
+	<p class="highlight_red">"inner" means: to be taregetNode's child node.</p>
+	<p class="highlight_red">"prev" means: to be taregetNode's previous sibling node.</p>
+	<p class="highlight_red">"next" means: to be taregetNode's next sibling node.</p>
+	<h4 class="topLine"><b>isSilent</b><span>Boolean</span></h4>
+	<p>After move the node, whether to automatically expand its parent node.</p>
+	<p>isSilent = true means: don't expand its parent node.</p>
+	<p>isSilent = false or omit this parameter means: expand its parent node.</p>
+	<h4 class="topLine"><b>Return </b><span>JSON</span></h4>
+	<p>return the node which be moved, it is same as the 'treeNode' parameter.</p>
+	<p class="highlight_red">Return null means: move node has failed. The cause:<br/>
+		&nbsp;1. the targetNode is the treeNode's parent node, and moveType = "inner"<br/>
+		&nbsp;2. the targetNode is the treeNode's child node.
+	</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. Move the second root node to the first root node's child node.</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getNodes();
+treeObj.moveNode(nodes[0], nodes[1], "inner");
+</code></pre>
+	<h4>2. Move the second root node to the first root node's previous sibling node.</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getNodes();
+treeObj.moveNode(nodes[0], nodes[1], "before");
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.reAsyncChildNodes.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.reAsyncChildNodes.html
new file mode 100644
index 0000000..63a0896
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.reAsyncChildNodes.html
@@ -0,0 +1,42 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(parentNode, reloadType, isSilent)</span><span class="path">zTreeObj.</span>reAsyncChildNodes</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Forced asynchronous loading child nodes of parent node. It is valid when <span class="highlight_red">[setting.async.enable = true]</span></p>
+			<p class="highlight_red">You can use this method to reload child nodes.</p>
+			<p class="highlight_red">Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>parentNode</b><span>JSON</span></h4>
+	<p>The parent node which will asynchronous loading child nodes.</p>
+	<p class="highlight_red">1. If parentNode = null, it is same as reload root nodes.</p>
+	<p class="highlight_red">2. If parentNode.isParent = false, don't load nodes.</p>
+	<p class="highlight_red">3. Please ensure that this data object is an internal node data object in zTree.</p>
+	<h4 class="topLine"><b>reloadType</b><span>String</span></h4>
+	<p>reloadType = "refresh" means: reload child nodes.</p>
+	<p>reloadType != "refresh" means: append to load child nodes.</p>
+	<h4 class="topLine"><b>isSilent</b><span>Boolean</span></h4>
+	<p>Set whether to automatically expand the parent node, after load nodes.</p>
+	<p>isSilent = true means: don't auto expand the parent node. Otherwise auto expand.</p>
+	<h4 class="topLine"><b>Return </b><span>none</span></h4>
+	<p>no return value</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. reload root nodes</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+treeObj.reAsyncChildNodes(null, "refresh");
+</code></pre>
+	<h4>2. reload the first selected node's child nodes.</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getSelectedNodes();
+if (nodes.length>0) {
+	treeObj.reAsyncChildNodes(nodes[0], "refresh");
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.refresh.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.refresh.html
new file mode 100644
index 0000000..8316192
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.refresh.html
@@ -0,0 +1,24 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function()</span><span class="path">zTreeObj.</span>refresh</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Refresh zTree</p>
+			<p class="highlight_red">If you have no special need, try not to use this method. If you refresh single node, please use updateNode() method. If you refresh child nodes in dynamic mode, please use the reAsyncChildNodes() method.</p>
+			<p class="highlight_red">Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>Return </b><span>none</span></h4>
+	<p>no return value</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. refresh zTree </h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+treeObj.refresh();
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.removeChildNodes.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.removeChildNodes.html
new file mode 100644
index 0000000..c249e17
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.removeChildNodes.html
@@ -0,0 +1,32 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(parentNode)</span><span class="path">zTreeObj.</span>removeChildNodes</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Remove a parent node's child nodes</p>
+			<p class="highlight_red">1. After remove child nodes, the parent node will become a leaf node. Such as the need to maintain the parent node is still a parent node, set 'setting.data.keep.parent' attribute.</p>
+			<p class="highlight_red">2. Do not use this method to empty the root. If you need to empty the root, you can initialization zTree, and set the initial nodes is null.</p>
+			<p class="highlight_red">3. This method does not trigger any callback function.</p>
+			<p class="highlight_red">Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>parentNode</b><span>JSON</span></h4>
+	<p>The parent node which need to clear its child nodes.</p>
+	<p class="highlight_red">Please ensure that this data object is an internal node data object in zTree.</p>
+	<h4 class="topLine"><b>Return </b><span>Array(JSON)</span></h4>
+	<p>Return the parent node's child nodes which have been removed. If has no child nodes, return null.</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. Remove the first selected node's child nodes</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getSelectedNodes();
+if (nodes && nodes.length>0) {
+	treeObj.removeChildNodes(nodes[0]);
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.removeNode.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.removeNode.html
new file mode 100644
index 0000000..605322f
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.removeNode.html
@@ -0,0 +1,34 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeNode, callbackFlag)</span><span class="path">zTreeObj.</span>removeNode</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Remove a node</p>
+			<p class="highlight_red">Use removeNode() method of zTree v3.x can trigger 'beforeRemove / onRemove' callback function. for reduce redundant code.</p>
+			<p class="highlight_red">Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which will be removed.</p>
+	<p class="highlight_red">Please ensure that this data object is an internal node data object in zTree.</p>
+	<h4 class="topLine"><b>callbackFlag</b><span>Boolean</span></h4>
+	<p>callbackFlag = true means: call this method, will trigger 'beforeRemove' & 'onRemove' callback.</p>
+	<p>callbackFlag = false means: call this method, will not trigger callback.</p>
+	<p class="highlight_red">If this parameter is omitted, it is same as 'callbackFlag = false'</p>
+	<h4 class="topLine"><b>Return </b><span>none</span></h4>
+	<p>no return value</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. Remove all of the selected nodes.</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getSelectedNodes();
+for (var i=0, l=nodes.length; i < l; i++) {
+	treeObj.removeNode(nodes[i]);
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.selectNode.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.selectNode.html
new file mode 100644
index 0000000..237f199
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.selectNode.html
@@ -0,0 +1,34 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeNode, addFlag)</span><span class="path">zTreeObj.</span>selectNode</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Select a node</p>
+			<p class="highlight_red">zTree v3.x supports select multiple nodes.</p>
+			<p class="highlight_red">Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which will be selected.</p>
+	<p class="highlight_red">Please ensure that this data object is an internal node data object in zTree.</p>
+	<h4 class="topLine"><b>addFlag</b><span>Boolean</span></h4>
+	<p>addFlag = true means: append to select node, don't affect the previously selected node, can select multiple nodes.</p>
+	<p>addFlag = false means: select single node, prior the selected node is deselected.</p>
+	<p class="highlight_red">If setting.view.selectedMulti = false, this para, this parameter is not valid, always select single node</p>
+	<h4 class="topLine"><b>Return </b><span>none</span></h4>
+	<p>no return value</p>
+	</div>
+	<h3>Exampleso of function</h3>
+	<h4>1. Select single node which be first selected.</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getNodes();
+if (nodes.length>0) {
+	treeObj.selectNode(nodes[0]);
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.setChkDisabled.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.setChkDisabled.html
new file mode 100644
index 0000000..1d645e8
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.setChkDisabled.html
@@ -0,0 +1,44 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(node, disabled, inheritParent, inheritChildren)</span><span class="path">zTreeObj.</span>setChkDisabled</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.excheck</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Set the node's checkbox or radio is disabled or remove disabled. It is valid when <span class="highlight_red">[setting.check.enable = true]</span></p>
+			<p class="highlight_red">1. After the node's checkbox / radio is disabled, it can not be checked or unchecked, but it can affect the half-checked status of the parent node.</p>
+			<p class="highlight_red">2. Please do not directly modify the 'chkDisabled' attribute of the loaded node.</p>
+			<p class="highlight_red">3. Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which need to be checked or unchecked.</p>
+	<p class="highlight_red">Please ensure that this data object is an internal node data object in zTree.</p>
+	<h4 class="topLine"><b>disabled</b><span>Boolean</span></h4>
+	<p>disabled = true means: the node's checkbox / radio is disabled.</p>
+	<p>disabled = false means: the node's checkbox / radio is removed disabled.</p>
+	<p class="highlight_red">If this parameter is omitted, it is same as disabled = false </p>
+	<p class="highlight_red">Don't affect the node which 'nochecked' attribute is true.</p>
+	<h4 class="topLine"><b>inheritParent</b><span>Boolean</span></h4>
+	<p>inheritParent = true means: all parent nodes's disabled status will be same as this node.</p>
+	<p>inheritParent = false means: all parent nodes's disabled status will be not affected.</p>
+	<p class="highlight_red">If this parameter is omitted, it is same as 'inheritParent = false'</p>
+	<h4 class="topLine"><b>inheritChildren</b><span>Boolean</span></h4>
+	<p>inheritChildren = true means: all child nodes's disabled status will be same as this node.</p>
+	<p>inheritChildren = false means: all child nodes's disabled status will be not affected.</p>
+	<p class="highlight_red">If this parameter is omitted, it is same as 'inheritChildren = false'</p>
+	<h4 class="topLine"><b>Return </b><span>none</span></h4>
+	<p>no return value</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. Set the selected nodes's checkbox / radio to be disabled.</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getSelectedNodes();
+for (var i=0, l=nodes.length; i < l; i++) {
+	treeObj.setChkDisabled(nodes[i], true);
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.setEditable.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.setEditable.html
new file mode 100644
index 0000000..a44b0ff
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.setEditable.html
@@ -0,0 +1,27 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(editable)</span><span class="path">zTreeObj.</span>setEditable</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exedit</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Edit mode and normal mode switch.</p>
+			<p class="highlight_red">To use edit mode, please set the attributes in 'setting.edit'</p>
+			<p class="highlight_red">Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>editable</b><span>Boolean</span></h4>
+	<p>true means: set zTree to edit mode.</p>
+	<p>false means: set zTree to normal mode.</p>
+	<h4><b>Return </b><span>none</span></h4>
+	<p>no return value</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. set zTree to edit mode</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+treeObj.setEditable(true);
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.setting.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.setting.html
new file mode 100644
index 0000000..d80c139
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.setting.html
@@ -0,0 +1,14 @@
+<div class="apiDetail">
+<div>
+	<h2><span>JSON</span><span class="path">zTreeObj.</span>setting</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>The configuration data of zTree, refer to "<span class="highlight_red">setting details</span>" </p>
+			<p class="highlight_red">zTree v3.x to cancel the original operation setting method, so users can modify.</p>
+			<p class="highlight_red">Note: Modify the parameters which affect zTree initialization will not work, please first understand the different attributes.</p>
+		</div>
+	</div>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.showNode.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.showNode.html
new file mode 100644
index 0000000..53b5cbd
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.showNode.html
@@ -0,0 +1,31 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeNode)</span><span class="path">zTreeObj.</span>showNode</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exhide</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>To hide any node which be hidden.</p>
+			<p class="highlight_red">1. This feature can't support the 'exedit' feature, so please don't use this feature in edit mode.</p>
+			<p class="highlight_red">2. If you hide or show the nodes, it will effect the 'isFirstNode' and 'isLastNode' attribute.</p>
+			<p class="highlight_red">3. Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeNodes</b><span>Array(JSON)</span></h4>
+	<p>JSON data object of the node which will be shown</p>
+	<p class="highlight_red">Please ensure that this data object is an internal node data object in zTree.</p>
+	<h4 class="topLine"><b>Retrun </b><span>none</span></h4>
+	<p>no return value</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. show someone node which be hidden.</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var node = treeObj.getNodeByParam("isHidden", true);
+if (node) {
+  treeObj.showNode(node);
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.showNodes.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.showNodes.html
new file mode 100644
index 0000000..c0c926c
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.showNodes.html
@@ -0,0 +1,29 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeNodes)</span><span class="path">zTreeObj.</span>showNodes</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.exhide</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>To show a group of nodes which be hidden.</p>
+			<p class="highlight_red">1. This feature can't support the 'exedit' feature, so please don't use this feature in edit mode.</p>
+			<p class="highlight_red">2. If you hide or show the nodes, it will effect the 'isFirstNode' and 'isLastNode' attribute.</p>
+			<p class="highlight_red">3. Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeNodes</b><span>Array(JSON)</span></h4>
+	<p>the array of the nodes which will be shown</p>
+	<p class="highlight_red">Please ensure that this data object is an internal node data object in zTree.</p>
+	<h4 class="topLine"><b>Retrun </b><span>none</span></h4>
+	<p>no return value</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. show all of the nodes which be hidden.</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getNodesByParam("isHidden", true);
+treeObj.showNodes(nodes);
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.transformToArray.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.transformToArray.html
new file mode 100644
index 0000000..4b2296d
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.transformToArray.html
@@ -0,0 +1,27 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeNodes)</span><span class="path">zTreeObj.</span>transformToArray</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p></p>
+			<p>Transform the zTree nodes data into simple array.  (To avoid the user to write code to traverse all nodes)</p>
+			<p class="highlight_red">Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeNodes</b><span>Array(JSON) / JSON</span></h4>
+	<p>JSON data object of the node which need to be transformed.</p>
+	<p>or JSON data objects collection of the nodes which need to be transformed.</p>
+	<h4 class="topLine"><b>Return </b><span>Array(JSON)</span></h4>
+	<p>The JSON data objects array of the nodes which be transformed.</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. Transform the zTree nodes data into simple array.</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.transformToArray(treeObj.getNodes());
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.transformTozTreeNodes.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.transformTozTreeNodes.html
new file mode 100644
index 0000000..51d4a62
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.transformTozTreeNodes.html
@@ -0,0 +1,44 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(simpleNodes)</span><span class="path">zTreeObj.</span>transformTozTreeNodes</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Transform the simple array into zTree nodes data.</p>
+			<p class="highlight_red">If you use this method, you must set 'setting.data.simpleData.idKey' and 'setting.data.simpleData.pIdKey' attribute, and let the data are consistent with parent-child relationship.</p>
+			<p class="highlight_red">Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>simpleNodes</b><span>Array(JSON) / JSON</span></h4>
+	<p>JSON data object of the node which need to be transformed.</p>
+	<p>or JSON data objects array of the nodes which need to be transformed.</p>
+	<h4 class="topLine"><b>Return </b><span>Array(JSON)</span></h4>
+	<p>Standard data which zTree use. The child nodes are stored in the parent node's 'children' attribute.</p>
+	<p class="highlight_red">If simpleNodes is a single JSON, so the return array's length is 1.</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. Transform the simple array data into zTree nodes format.</h4>
+	<pre xmlns=""><code>var setting = {
+	data: {
+		simpleData: {
+			enable: true,
+			idKey: "id",
+			pIdKey: "pId",
+			rootPId: 0,
+		}
+	}
+};
+var simpleNodes = [
+    {"id":1, "pId":0, "name":"test1"},
+    {"id":11, "pId":1, "name":"test11"},
+    {"id":12, "pId":1, "name":"test12"},
+    {"id":111, "pId":11, "name":"test111"}
+];
+var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.transformTozTreeNodes(simpleNodes);
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.updateNode.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.updateNode.html
new file mode 100644
index 0000000..7639ff4
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/api/en/zTreeObj.updateNode.html
@@ -0,0 +1,37 @@
+<div class="apiDetail">
+<div>
+	<h2><span>Function(treeNode, checkTypeFlag)</span><span class="path">zTreeObj.</span>updateNode</h2>
+	<h3>Overview<span class="h3_info">[ depends on <span class="highlight_green">jquery.ztree.core</span> js ]</span></h3>
+	<div class="desc">
+		<p></p>
+		<div class="longdesc">
+			<p>Update node data. Primarily used to update the node's DOM.</p>
+			<p class="highlight_red">1. Can update the attributes for display (e.g. 'name', 'target', 'url', 'icon', 'iconSkin', 'checked', 'nocheck'), do not update the other attributes. For example: If you need to expand the node, please use expandNode() method, do not modify the 'open' attribute.</p>
+			<p class="highlight_red">2. Use updateNode() method of zTree can't trigger 'beforeCheck' or 'onCheck' callback function.</p>
+			<p class="highlight_red">Please use zTree object to executing the method.</p>
+		</div>
+	</div>
+	<h3>Function Parameter Descriptions</h3>
+	<div class="desc">
+	<h4><b>treeNode</b><span>JSON</span></h4>
+	<p>JSON data object of the node which need to update.</p>
+	<p class="highlight_red">Please ensure that this data object is an internal node data object in zTree.</p>
+	<h4 class="topLine"><b>checkTypeFlag</b><span>Boolean</span></h4>
+	<p>checkTypeFlag = true means: According to 'setting.check.chkboxType' attribute automatically check or uncheck the parent and child nodes.</p>
+	<p>checkTypeFlag = false means: only check or uncheck this node, don't affect its parent and child nodes.</p>
+	<p class="highlight_red">This parameter is valid when 'setting.check.enable = true' and 'setting.check.chkStyle = "checkbox"'</p>
+	<p class="highlight_red">Don't affect the parent and child nodes which 'nochecked' attribute is true.</p>
+	<h4 class="topLine"><b>Return </b><span>none</span></h4>
+	<p>no return value</p>
+	</div>
+	<h3>Examples of function</h3>
+	<h4>1. Modify the first selected node's name, and update it.</h4>
+	<pre xmlns=""><code>var treeObj = $.fn.zTree.getZTreeObj("tree");
+var nodes = treeObj.getNodes();
+if (nodes.length>0) {
+	nodes[0].name = "test";
+	treeObj.updateNode(nodes[0]);
+}
+</code></pre>
+</div>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/css/demo.css b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/css/demo.css
new file mode 100644
index 0000000..f6dba0d
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/css/demo.css
@@ -0,0 +1,33 @@
+html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, font, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td {
+	margin: 0;padding: 0;border: 0;outline: 0;font-weight: inherit;font-style: inherit;font-size: 100%;font-family: inherit;vertical-align: baseline;}
+body {color: #2f332a;font: 15px/21px Arial, Helvetica, simsun, sans-serif;background: #f0f6e4 \9;}
+h1, h2, h3, h4, h5, h6 {color: #2f332a;font-weight: bold;font-family: Helvetica, Arial, sans-serif;padding-bottom: 5px;}
+h1 {font-size: 24px;line-height: 34px;text-align: center;}
+h2 {font-size: 14px;line-height: 24px;padding-top: 5px;}
+h6 {font-weight: normal;font-size: 12px;letter-spacing: 1px;line-height: 24px;text-align: center;}
+a {color:#3C6E31;text-decoration: underline;}
+a:hover {background-color:#3C6E31;color:white;}
+input.radio {margin: 0 2px 0 8px;}
+input.radio.first {margin-left:0;}
+input.empty {color: lightgray;}
+code {color: #2f332a;}
+.highlight_red {color:#A60000;}
+.highlight_green {color:#A7F43D;}
+li {list-style: circle;font-size: 12px;}
+li.title {list-style: none;}
+ul.list {margin-left: 17px;}
+
+div.content_wrap {width: 600px;height:380px;}
+div.content_wrap div.left{float: left;width: 250px;}
+div.content_wrap div.right{float: right;width: 340px;}
+div.zTreeDemoBackground {width:250px;height:362px;text-align:left;}
+
+ul.ztree {margin-top: 10px;border: 1px solid #617775;background: #f0f6e4;width:220px;height:360px;overflow-y:scroll;overflow-x:auto;}
+ul.log {border: 1px solid #617775;background: #f0f6e4;width:300px;height:170px;overflow: hidden;}
+ul.log.small {height:45px;}
+ul.log li {color: #666666;list-style: none;padding-left: 10px;}
+ul.log li.dark {background-color: #E3E3E3;}
+
+/* ruler */
+div.ruler {height:20px; width:220px; background-color:#f0f6e4;border: 1px solid #333; margin-bottom: 5px; cursor: pointer}
+div.ruler div.cursor {height:20px; width:30px; background-color:#3C6E31; color:white; text-align: right; padding-right: 5px; cursor: pointer}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/css/zTreeStyle/img/diy/1_close.png b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/css/zTreeStyle/img/diy/1_close.png
new file mode 100644
index 0000000..68ccb3c
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/css/zTreeStyle/img/diy/1_close.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/css/zTreeStyle/img/diy/1_open.png b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/css/zTreeStyle/img/diy/1_open.png
new file mode 100644
index 0000000..d6ff36d
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/css/zTreeStyle/img/diy/1_open.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/css/zTreeStyle/img/diy/2.png b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/css/zTreeStyle/img/diy/2.png
new file mode 100644
index 0000000..9eff506
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/css/zTreeStyle/img/diy/2.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/css/zTreeStyle/img/diy/3.png b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/css/zTreeStyle/img/diy/3.png
new file mode 100644
index 0000000..d7ba6d0
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/css/zTreeStyle/img/diy/3.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/css/zTreeStyle/img/diy/4.png b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/css/zTreeStyle/img/diy/4.png
new file mode 100644
index 0000000..753e2bf
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/css/zTreeStyle/img/diy/4.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/css/zTreeStyle/img/diy/5.png b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/css/zTreeStyle/img/diy/5.png
new file mode 100644
index 0000000..0c5eccd
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/css/zTreeStyle/img/diy/5.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/css/zTreeStyle/img/diy/6.png b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/css/zTreeStyle/img/diy/6.png
new file mode 100644
index 0000000..070b835
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/css/zTreeStyle/img/diy/6.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/css/zTreeStyle/img/diy/7.png b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/css/zTreeStyle/img/diy/7.png
new file mode 100644
index 0000000..532b037
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/css/zTreeStyle/img/diy/7.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/css/zTreeStyle/img/diy/8.png b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/css/zTreeStyle/img/diy/8.png
new file mode 100644
index 0000000..a8f3a86
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/css/zTreeStyle/img/diy/8.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/css/zTreeStyle/img/diy/9.png b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/css/zTreeStyle/img/diy/9.png
new file mode 100644
index 0000000..4db73cd
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/css/zTreeStyle/img/diy/9.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/css/zTreeStyle/img/line_conn.gif b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/css/zTreeStyle/img/line_conn.gif
new file mode 100644
index 0000000..d561d36
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/css/zTreeStyle/img/line_conn.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/css/zTreeStyle/img/loading.gif b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/css/zTreeStyle/img/loading.gif
new file mode 100644
index 0000000..e8c2892
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/css/zTreeStyle/img/loading.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/css/zTreeStyle/img/zTreeStandard.gif b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/css/zTreeStyle/img/zTreeStandard.gif
new file mode 100644
index 0000000..50c94fd
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/css/zTreeStyle/img/zTreeStandard.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/css/zTreeStyle/img/zTreeStandard.png b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/css/zTreeStyle/img/zTreeStandard.png
new file mode 100644
index 0000000..ffda01e
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/css/zTreeStyle/img/zTreeStandard.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/css/zTreeStyle/zTreeStyle.css b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/css/zTreeStyle/zTreeStyle.css
new file mode 100644
index 0000000..f06554e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/css/zTreeStyle/zTreeStyle.css
@@ -0,0 +1,97 @@
+/*-------------------------------------
+zTree Style
+
+version:	3.4
+author:		Hunter.z
+email:		hunter.z@263.net
+website:	http://code.google.com/p/jquerytree/
+
+-------------------------------------*/
+
+.ztree * {padding:0; margin:0; font-size:12px; font-family: Verdana, Arial, Helvetica, AppleGothic, sans-serif}
+.ztree {margin:0; padding:5px; color:#333}
+.ztree li{padding:0; margin:0; list-style:none; line-height:14px; text-align:left; white-space:nowrap; outline:0}
+.ztree li ul{ margin:0; padding:0 0 0 18px}
+.ztree li ul.line{ background:url(./img/line_conn.gif) 0 0 repeat-y;}
+
+.ztree li a {padding:1px 3px 0 0; margin:0; cursor:pointer; height:17px; color:#333; background-color: transparent;
+	text-decoration:none; vertical-align:top; display: inline-block}
+.ztree li a:hover {text-decoration:underline}
+.ztree li a.curSelectedNode {padding-top:0px; background-color:#FFE6B0; color:black; height:16px; border:1px #FFB951 solid; opacity:0.8;}
+.ztree li a.curSelectedNode_Edit {padding-top:0px; background-color:#FFE6B0; color:black; height:16px; border:1px #FFB951 solid; opacity:0.8;}
+.ztree li a.tmpTargetNode_inner {padding-top:0px; background-color:#316AC5; color:white; height:16px; border:1px #316AC5 solid;
+	opacity:0.8; filter:alpha(opacity=80)}
+.ztree li a.tmpTargetNode_prev {}
+.ztree li a.tmpTargetNode_next {}
+.ztree li a input.rename {height:14px; width:80px; padding:0; margin:0;
+	font-size:12px; border:1px #7EC4CC solid; *border:0px}
+.ztree li span {line-height:16px; margin-right:2px}
+.ztree li span.button {line-height:0; margin:0; width:16px; height:16px; display: inline-block; vertical-align:middle;
+	border:0 none; cursor: pointer;outline:none;
+	background-color:transparent; background-repeat:no-repeat; background-attachment: scroll;
+	background-image:url("./img/zTreeStandard.png"); *background-image:url("./img/zTreeStandard.gif")}
+
+.ztree li span.button.chk {width:13px; height:13px; margin:0 3px 0 0; cursor: auto}
+.ztree li span.button.chk.checkbox_false_full {background-position:0 0}
+.ztree li span.button.chk.checkbox_false_full_focus {background-position:0 -14px}
+.ztree li span.button.chk.checkbox_false_part {background-position:0 -28px}
+.ztree li span.button.chk.checkbox_false_part_focus {background-position:0 -42px}
+.ztree li span.button.chk.checkbox_false_disable {background-position:0 -56px}
+.ztree li span.button.chk.checkbox_true_full {background-position:-14px 0}
+.ztree li span.button.chk.checkbox_true_full_focus {background-position:-14px -14px}
+.ztree li span.button.chk.checkbox_true_part {background-position:-14px -28px}
+.ztree li span.button.chk.checkbox_true_part_focus {background-position:-14px -42px}
+.ztree li span.button.chk.checkbox_true_disable {background-position:-14px -56px}
+.ztree li span.button.chk.radio_false_full {background-position:-28px 0}
+.ztree li span.button.chk.radio_false_full_focus {background-position:-28px -14px}
+.ztree li span.button.chk.radio_false_part {background-position:-28px -28px}
+.ztree li span.button.chk.radio_false_part_focus {background-position:-28px -42px}
+.ztree li span.button.chk.radio_false_disable {background-position:-28px -56px}
+.ztree li span.button.chk.radio_true_full {background-position:-42px 0}
+.ztree li span.button.chk.radio_true_full_focus {background-position:-42px -14px}
+.ztree li span.button.chk.radio_true_part {background-position:-42px -28px}
+.ztree li span.button.chk.radio_true_part_focus {background-position:-42px -42px}
+.ztree li span.button.chk.radio_true_disable {background-position:-42px -56px}
+
+.ztree li span.button.switch {width:18px; height:18px}
+.ztree li span.button.root_open{background-position:-92px -54px}
+.ztree li span.button.root_close{background-position:-74px -54px}
+.ztree li span.button.roots_open{background-position:-92px 0}
+.ztree li span.button.roots_close{background-position:-74px 0}
+.ztree li span.button.center_open{background-position:-92px -18px}
+.ztree li span.button.center_close{background-position:-74px -18px}
+.ztree li span.button.bottom_open{background-position:-92px -36px}
+.ztree li span.button.bottom_close{background-position:-74px -36px}
+.ztree li span.button.noline_open{background-position:-92px -72px}
+.ztree li span.button.noline_close{background-position:-74px -72px}
+.ztree li span.button.root_docu{ background:none;}
+.ztree li span.button.roots_docu{background-position:-56px 0}
+.ztree li span.button.center_docu{background-position:-56px -18px}
+.ztree li span.button.bottom_docu{background-position:-56px -36px}
+.ztree li span.button.noline_docu{ background:none;}
+
+.ztree li span.button.ico_open{margin-right:2px; background-position:-110px -16px; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.ico_close{margin-right:2px; background-position:-110px 0; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.ico_docu{margin-right:2px; background-position:-110px -32px; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.edit {margin-right:2px; background-position:-110px -48px; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.remove {margin-right:2px; background-position:-110px -64px; vertical-align:top; *vertical-align:middle}
+
+.ztree li span.button.ico_loading{margin-right:2px; background:url(./img/loading.gif) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+
+ul.tmpTargetzTree {background-color:#FFE6B0; opacity:0.8; filter:alpha(opacity=80)}
+
+span.tmpzTreeMove_arrow {width:16px; height:16px; display: inline-block; padding:0; margin:2px 0 0 1px; border:0 none; position:absolute;
+	background-color:transparent; background-repeat:no-repeat; background-attachment: scroll;
+	background-position:-110px -80px; background-image:url("./img/zTreeStandard.png"); *background-image:url("./img/zTreeStandard.gif")}
+
+ul.ztree.zTreeDragUL {margin:0; padding:0; position:absolute; width:auto; height:auto;overflow:hidden; background-color:#cfcfcf; border:1px #00B83F dotted; opacity:0.8; filter:alpha(opacity=80)}
+.zTreeMask {z-index:10000; background-color:#cfcfcf; opacity:0.0; filter:alpha(opacity=0); position:absolute}
+
+/* level style*/
+/*.ztree li span.button.level0 {
+	display:none;
+}
+.ztree li ul.level0 {
+	padding:0;
+	background:none;
+}*/
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/asyncData/getNodes.php b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/asyncData/getNodes.php
new file mode 100644
index 0000000..88625a2
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/asyncData/getNodes.php
@@ -0,0 +1,38 @@
+<?php ?>
+[<?php
+$pId = "0";
+$pName = "";
+$pLevel = "";
+$pCheck = "";
+if(array_key_exists( 'id',$_REQUEST)) {
+	$pId=$_REQUEST['id'];
+}
+if(array_key_exists( 'lv',$_REQUEST)) {
+	$pLevel=$_REQUEST['lv'];
+}
+if(array_key_exists('n',$_REQUEST)) {
+	$pName=$_REQUEST['n'];
+}
+if(array_key_exists('chk',$_REQUEST)) {
+	$pCheck=$_REQUEST['chk'];
+}
+if ($pId==null || $pId=="") $pId = "0";
+if ($pLevel==null || $pLevel=="") $pLevel = "0";
+if ($pName==null) $pName = "";
+else $pName = $pName.".";
+
+//for ($i=1; $i<9999; $i++) {
+//	for ($j=1; $j<999; $j++) {
+//
+//	}
+//}
+
+for ($i=1; $i<5; $i++) {
+	$nId = $pId.$i;
+	$nName = $pName."n".$i;
+	echo "{ id:'".$nId."',	name:'".$nName."',	open:true, isParent:".(( $pLevel < "2" && ($i%2)!=0)?"true":"false").($pCheck==""?"":((($pLevel < "2" && ($i%2)!=0)?", halfCheck:true":"").($i==3?", checked:true":"")))."}";
+	if ($i<4) {
+		echo ",";
+	}
+}
+?>]
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/asyncData/getNodesForBigData.php b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/asyncData/getNodesForBigData.php
new file mode 100644
index 0000000..91d002e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/asyncData/getNodesForBigData.php
@@ -0,0 +1,24 @@
+<?php ?>
+[<?php
+$pId = "-1";
+if(array_key_exists( 'id',$_REQUEST)) {
+	$pId=$_REQUEST['id'];
+}
+$pCount = "10";
+if(array_key_exists( 'count',$_REQUEST)) {
+	$pCount=$_REQUEST['count'];
+}
+if ($pId==null || $pId=="") $pId = "0";
+if ($pCount==null || $pCount=="") $pCount = "10";
+
+$max = (int)$pCount;
+for ($i=1; $i<=$max; $i++) {
+	$nId = $pId."_".$i;
+	$nName = "tree".$nId;
+	echo "{ id:'".$nId."',	name:'".$nName."'}";
+	if ($i<$max) {
+		echo ",";
+	}
+	
+}
+?>]
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/bigdata/common.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/bigdata/common.html
new file mode 100644
index 0000000..ded4358
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/bigdata/common.html
@@ -0,0 +1,190 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - big data common</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			check: {
+				enable: true
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				onNodeCreated: onNodeCreated
+			}
+		};
+
+		var dataMaker = function(count) {
+			var nodes = [], pId = -1,
+			min = 10, max = 90, level = 0, curLevel = [], prevLevel = [], levelCount,
+			i = 0,j,k,l,m;
+
+			while (i<count) {
+				if (level == 0) {
+					pId = -1;
+					levelCount = Math.round(Math.random() * max) + min;
+					for (j=0; j<levelCount && i<count; j++, i++) {
+						var n = {id:i, pId:pId, name:"Big-" +i};
+						nodes.push(n);
+						curLevel.push(n);
+					}
+				} else {
+					for (l=0, m=prevLevel.length; l<m && i<count; l++) {
+						pId = prevLevel[l].id;
+						levelCount = Math.round(Math.random() * max) + min;
+						for (j=0; j<levelCount && i<count; j++, i++) {
+							var n = {id:i, pId:pId, name:"Big-" +i};
+							nodes.push(n);
+							curLevel.push(n);
+						}
+					}
+				}
+				prevLevel = curLevel;
+				curLevel = [];
+				level++;
+			}
+			return nodes;
+		}
+
+		var ruler = {
+			doc: null,
+			ruler: null,
+			cursor: null,
+			minCount: 5000,
+			count: 5000,
+			stepCount:500,
+			minWidth: 30,
+			maxWidth: 215,
+			init: function() {
+				ruler.doc = $(document);
+				ruler.ruler = $("#ruler");
+				ruler.cursor = $("#cursor");
+				if (ruler.ruler) {
+					ruler.ruler.bind("mousedown", ruler.onMouseDown);
+					
+				}
+			},
+			onMouseDown: function(e) {
+				ruler.drawRuler(e, true);
+				ruler.doc.bind("mousemove", ruler.onMouseMove);
+				ruler.doc.bind("mouseup", ruler.onMouseUp);
+				ruler.doc.bind("selectstart", ruler.onSelect);
+				$("body").css("cursor", "pointer");
+			},
+			onMouseMove: function(e) {
+				ruler.drawRuler(e);
+				return false;
+			},
+			onMouseUp: function(e) {
+				$("body").css("cursor", "auto");
+				ruler.doc.unbind("mousemove", ruler.onMouseMove);
+				ruler.doc.unbind("mouseup", ruler.onMouseUp);
+				ruler.doc.unbind("selectstart", ruler.onSelect);
+				ruler.drawRuler(e);
+			},
+			onSelect: function (e) {
+				return false;
+			},
+			getCount: function(end) {
+				var start = ruler.ruler.offset().left+1;
+				var c = Math.max((end - start), ruler.minWidth);
+				c = Math.min(c, ruler.maxWidth);
+				return {width:c, count:(c - ruler.minWidth)*ruler.stepCount + ruler.minCount};
+			},
+			drawRuler: function(e, animate) {
+				var c = ruler.getCount(e.clientX);
+				ruler.cursor.stop();
+				if ($.browser.msie || !animate) {
+					ruler.cursor.css({width:c.width});
+				} else {
+					ruler.cursor.animate({width:c.width}, {duration: "fast",easing: "swing", complete:null});
+				}
+				ruler.count = c.count;
+				ruler.cursor.text(c.count);
+			}
+		}
+		var showNodeCount = 0;
+		function onNodeCreated(event, treeId, treeNode) {
+			showNodeCount++;
+		}
+
+		function createTree () {
+			var zNodes = dataMaker(ruler.count);
+			showNodeCount = 0;
+			$("#treeDemo").empty();
+			setting.check.enable = $("#showChk").attr("checked");
+			var time1 = new Date();
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			var time2 = new Date();
+
+			alert("节点共 " + zNodes.length + " 个, 初始化生成 DOM 的节点共 " + showNodeCount + " 个"
+				+ "\n\n 初始化 zTree 共耗时: " + (time2.getTime() - time1.getTime()) + " ms");
+		}
+
+
+		$(document).ready(function(){
+			ruler.init("ruler");
+			$("#createTree").bind("click", createTree);
+
+		});
+		//-->
+	</SCRIPT>
+ </HEAD>
+
+<BODY>
+<h1>一次性加载大数据量</h1>
+<h6>[ 文件路径: bigdata/common.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul>
+		<li><span>调整总节点数，测试加载速度：</span>
+			<div id="ruler" class="ruler" title="拖拽可调整节点数">
+				<div id="cursor" class="cursor">5000</div>
+			</div>
+			<div style="width:220px; text-align: center;">
+				<span>checkbox</span><input type="checkbox" id="showChk" title="是否显示 checkbox" class="checkbox first" />&nbsp;&nbsp;&nbsp;&nbsp;
+				[ <a id="createTree" href="#" title="初始化 zTree" onclick="return false;">初始化 zTree</a> ]
+			</div>
+		</li>
+		</ul>
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、大数据量加载说明</h2>
+				<ul class="list">
+				<li>1)、zTree v3.x 针对大数据量一次性加载进行了更深入的优化，实现了延迟加载功能，即不展开的节点不创建子节点的 DOM。</li>
+				<li class="highlight_red">2)、对于每级节点最多一百左右，但总节点数几千甚至几万，且不是全部展开的数据，一次性加载的效果最明显，速度非常快。</li>
+				<li class="highlight_red">3)、对于某一级节点数就多达几千的情况 延迟加载无效，这种情况建议考虑分页异步加载。</li>
+				<li class="highlight_red">4)、对于全部节点都展开显示的情况，延迟加载无效，这种情况建议不要全部展开。</li>
+				<li>5)、显示 checkbox / radio 会造成一定程度的性能下降。</li>
+				<li>6)、利用 addDiyDom 功能增加自定义控件会影响速度，影响程度受节点数量而定。</li>
+				<li>7)、利用 onNodeCreated 事件回调函数对节点 DOM 进行操作会影响速度，影响程度受节点数量而定。</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、setting 配置信息说明</h2>
+				<ul class="list">
+				<li>不需要进行特殊的配置</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li>对 节点数据 没有特殊要求，用户可以根据自己的需求添加自定义属性</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/bigdata/diy_async.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/bigdata/diy_async.html
new file mode 100644
index 0000000..c4a8bfb
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/bigdata/diy_async.html
@@ -0,0 +1,157 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - big data async</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			async: {
+				enable: true,
+				url: getUrl
+			},
+			check: {
+				enable: true
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			view: {
+				expandSpeed: ""
+			},
+			callback: {
+				beforeExpand: beforeExpand,
+				onAsyncSuccess: onAsyncSuccess,
+				onAsyncError: onAsyncError
+			}
+		};
+
+		var zNodes =[
+			{name:"500个节点", id:"1", count:500, times:1, isParent:true},
+			{name:"1000个节点", id:"2", count:1000, times:1, isParent:true},
+			{name:"2000个节点", id:"3", count:2000, times:1, isParent:true}
+		];
+
+		var log, className = "dark",
+		startTime = 0, endTime = 0, perCount = 100, perTime = 100;
+		function getUrl(treeId, treeNode) {
+			var curCount = (treeNode.children) ? treeNode.children.length : 0;
+			var getCount = (curCount + perCount) > treeNode.count ? (treeNode.count - curCount) : perCount;
+			var param = "id="+treeNode.id+"_"+(treeNode.times++) +"&count="+getCount;
+			return "../asyncData/getNodesForBigData.php?" + param;
+		}
+		function beforeExpand(treeId, treeNode) {
+			if (!treeNode.isAjaxing) {
+				startTime = new Date();
+				treeNode.times = 1;
+				ajaxGetNodes(treeNode, "refresh");
+				return true;
+			} else {
+				alert("zTree 正在下载数据中，请稍后展开节点。。。");
+				return false;
+			}
+		}
+		function onAsyncSuccess(event, treeId, treeNode, msg) {
+			if (!msg || msg.length == 0) {
+				return;
+			}
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			totalCount = treeNode.count;
+			if (treeNode.children.length < totalCount) {
+				setTimeout(function() {ajaxGetNodes(treeNode);}, perTime);
+			} else {
+				treeNode.icon = "";
+				zTree.updateNode(treeNode);
+				zTree.selectNode(treeNode.children[0]);
+				endTime = new Date();
+				var usedTime = (endTime.getTime() - startTime.getTime())/1000;
+				className = (className === "dark" ? "":"dark");
+				showLog("[ "+getTime()+" ]&nbsp;&nbsp;treeNode:" + treeNode.name );
+				showLog("加载完毕，共进行 "+ (treeNode.times-1) +" 次异步加载, 耗时："+ usedTime + " 秒");
+			}
+		}
+		function onAsyncError(event, treeId, treeNode, XMLHttpRequest, textStatus, errorThrown) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			alert("异步获取数据出现异常。");
+			treeNode.icon = "";
+			zTree.updateNode(treeNode);
+		}
+		function ajaxGetNodes(treeNode, reloadType) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			if (reloadType == "refresh") {
+				treeNode.icon = "../../../css/zTreeStyle/img/loading.gif";
+				zTree.updateNode(treeNode);
+			}
+			zTree.reAsyncChildNodes(treeNode, reloadType, true);
+		}
+		function showLog(str) {
+			if (!log) log = $("#log");
+			log.append("<li class='"+className+"'>"+str+"</li>");
+			if(log.children("li").length > 4) {
+				log.get(0).removeChild(log.children("li")[0]);
+			}
+		}
+		function getTime() {
+			var now= new Date(),
+			h=now.getHours(),
+			m=now.getMinutes(),
+			s=now.getSeconds(),
+			ms=now.getMilliseconds();
+			return (h+":"+m+":"+s+ " " +ms);
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+
+		});
+		//-->
+	</SCRIPT>
+ </HEAD>
+
+<BODY>
+<h1>分批异步加载大数据量</h1>
+<h6>[ 文件路径: bigdata/diy_async.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul>
+			<li class="highlight_red">&nbsp;&nbsp;&nbsp;&nbsp;此 Demo 专门用于测试分批异步加载，每次展开节点都要重新进行异步加载。</li>
+		</ul>
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、大数据量加载说明</h2>
+				<ul class="list">
+				<li>1)、对于某一级节点数多达几千个的时候，zTree 默认的延迟加载是无效的，此 Demo 演示了一种原先 zTree v2.6 时的分批加载节点的方法。</li>
+				<li class="highlight_red">2)、此方法适用于1、2千个节点必须全部显示的需求。</li>
+				<li class="highlight_red">3)、此方法并不能解决加载慢的问题，相反只会让最终结果出现的更慢，只是可以有限度的避免浏览器假死，而且显示的节点越多就越慢。</li>
+				<li>4)、对于某一级节点数至少几千个的情况，另一个解决方案是：分页异步加载。<br/>
+					async load log:<br/>
+					<ul id="log" class="log" style="height:85px"></ul></li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、setting 配置信息说明</h2>
+				<ul class="list">
+				<li>需要设置 setting.async 异步加载部分的参数</li>
+				<li>建议关闭动画效果 setting.view.expandSpeed = "";</li>
+				<li>其他不需要进行特殊的配置，根据自己的需求自行设置</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li>对 节点数据 没有特殊要求，用户可以根据自己的需求添加自定义属性</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/bigdata/page.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/bigdata/page.html
new file mode 100644
index 0000000..ef3c763
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/bigdata/page.html
@@ -0,0 +1,150 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - big data page</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			async: {
+				enable: true,
+				url: getUrl
+			},
+			check: {
+				enable: true
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			view: {
+				addDiyDom: addDiyDom
+			},
+			callback: {
+				beforeExpand: beforeExpand,
+				onAsyncSuccess: onAsyncSuccess,
+				onAsyncError: onAsyncError
+			}
+		};
+
+		var zNodes =[
+			{name:"分页测试", t:"请点击分页按钮", id:"1", count:2000, page:0, pageSize:100, isParent:true}
+		];
+		var curPage = 0;
+		function getUrl(treeId, treeNode) {
+			var param = "id="+ treeNode.id +"_"+treeNode.page +"&count="+treeNode.pageSize,
+			aObj = $("#" + treeNode.tId + "_a");
+			aObj.attr("title", "当前第 " + treeNode.page + " 页 / 共 " + treeNode.maxPage + " 页")
+			return "../asyncData/getNodesForBigData.php?" + param;
+		}
+		function goPage(treeNode, page) {
+			treeNode.page = page;
+			if (treeNode.page<1) treeNode.page = 1;
+			if (treeNode.page>treeNode.maxPage) treeNode.page = treeNode.maxPage;
+			if (curPage == treeNode.page) return;
+			curPage = treeNode.page;
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			zTree.reAsyncChildNodes(treeNode, "refresh");
+		}
+		function beforeExpand(treeId, treeNode) {
+			if (treeNode.page == 0) treeNode.page = 1;
+			return !treeNode.isAjaxing;
+		}
+		function onAsyncSuccess(event, treeId, treeNode, msg) {
+			
+		}
+		function onAsyncError(event, treeId, treeNode, XMLHttpRequest, textStatus, errorThrown) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			alert("异步获取数据出现异常。");
+			treeNode.icon = "";
+			zTree.updateNode(treeNode);
+		}
+		function addDiyDom(treeId, treeNode) {
+			if (treeNode.level>0) return;
+			var aObj = $("#" + treeNode.tId + "_a");
+			if ($("#addBtn_"+treeNode.id).length>0) return;
+			var addStr = "<span class='button lastPage' id='lastBtn_" + treeNode.id
+				+ "' title='last page' onfocus='this.blur();'></span><span class='button nextPage' id='nextBtn_" + treeNode.id
+				+ "' title='next page' onfocus='this.blur();'></span><span class='button prevPage' id='prevBtn_" + treeNode.id
+				+ "' title='prev page' onfocus='this.blur();'></span><span class='button firstPage' id='firstBtn_" + treeNode.id
+				+ "' title='first page' onfocus='this.blur();'></span>";
+			aObj.after(addStr);
+			var first = $("#firstBtn_"+treeNode.id);
+			var prev = $("#prevBtn_"+treeNode.id);
+			var next = $("#nextBtn_"+treeNode.id);
+			var last = $("#lastBtn_"+treeNode.id);
+			treeNode.maxPage = Math.round(treeNode.count/treeNode.pageSize - .5) + (treeNode.count%treeNode.pageSize == 0 ? 0:1);
+			first.bind("click", function(){
+				if (!treeNode.isAjaxing) {
+					goPage(treeNode, 1);
+				}
+			});
+			last.bind("click", function(){
+				if (!treeNode.isAjaxing) {
+					goPage(treeNode, treeNode.maxPage);
+				}
+			});
+			prev.bind("click", function(){
+				if (!treeNode.isAjaxing) {
+					goPage(treeNode, treeNode.page-1);
+				}
+			});
+			next.bind("click", function(){
+				if (!treeNode.isAjaxing) {
+					goPage(treeNode, treeNode.page+1);
+				}
+			});
+		};
+		
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+.ztree li span.button.firstPage {float:right; margin-left:2px; margin-right: 0; background-position:-144px -16px; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.prevPage {float:right; margin-left:2px; margin-right: 0; background-position:-144px -48px; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.nextPage {float:right; margin-left:2px; margin-right: 0; background-position:-144px -64px; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.lastPage {float:right; margin-left:2px; margin-right: 0; background-position:-144px -32px; vertical-align:top; *vertical-align:middle}
+	</style>
+ </HEAD>
+
+<BODY>
+<h1>分页加载大数据量</h1>
+<h6>[ 文件路径: bigdata/page.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、大数据量加载说明</h2>
+				<ul class="list">
+				<li>1)、分页方案可以有效解决某一级节点数据超大的情况。</li>
+				<li>2)、分页按钮通过自定义控件的方法实现。</li>
+				<li class="highlight_red">3)、分页方案对于 checkbox 的关联关系无能为力，只能每次翻页后进行修正。由于时间关系，Demo 中不对 checkbox 的关联进行任何修正处理。</li>
+				<li class="highlight_red">4)、分页方案中，从 zTree 得到的节点数据只有当前页的节点数据，可以在每次翻页后自行保存每页的数据，作为缓存，具体情况要根据实际需求来决定。</li>
+			</li>
+			<li class="title"><h2>2、setting 配置信息说明</h2>
+				<ul class="list">
+				<li>需要设置 setting.async 异步加载部分的参数</li>
+				<li>其他不需要进行特殊的配置，根据自己的需求自行设置</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li>对 节点数据 没有特殊要求，用户可以根据自己的需求添加自定义属性</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/core/async.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/core/async.html
new file mode 100644
index 0000000..3f2a0d9
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/core/async.html
@@ -0,0 +1,70 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - Async</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			async: {
+				enable: true,
+				url:"../asyncData/getNodes.php",
+				autoParam:["id", "name=n", "level=lv"],
+				otherParam:{"otherParam":"zTreeAsyncTest"},
+				dataFilter: filter
+			}
+		};
+
+		function filter(treeId, parentNode, childNodes) {
+			if (!childNodes) return null;
+			for (var i=0, l=childNodes.length; i<l; i++) {
+				childNodes[i].name = childNodes[i].name.replace(/\.n/g, '.');
+			}
+			return childNodes;
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>异步加载节点数据的树</h1>
+<h6>[ 文件路径: core/async.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、setting 配置信息说明</h2>
+				<ul class="list">
+				<li class="highlight_red">使用异步加载，必须设置 setting.async 中的各个属性，详细请参见 API 文档中的相关内容</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li>异步加载功能对于 treeNode 节点数据没有特别要求，如果采用简单 JSON 数据，请设置 setting.data.simple 中的属性</li>
+				<li>如果异步加载每次都只返回单层的节点数据，那么可以不设置简单 JSON 数据模式</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、其他说明</h2>
+				<ul class="list">
+				<li class="highlight_red">观察 autoParam 和 otherParam 请使用 firebug 或 浏览器的开发人员工具</li>
+				<li class="highlight_red">此 Demo 只能加载到第 4 级节点（level=3）</li>
+				<li class="highlight_red">此 Demo 利用 dataFilter 对节点的 name 进行了修改</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/core/async_fun.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/core/async_fun.html
new file mode 100644
index 0000000..3571b24
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/core/async_fun.html
@@ -0,0 +1,144 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - reAsyncChildNodes</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				selectedMulti: false
+			},
+			async: {
+				enable: true,
+				url:"../asyncData/getNodes.php",
+				autoParam:["id", "name=n", "level=lv"],
+				otherParam:{"otherParam":"zTreeAsyncTest"},
+				dataFilter: filter
+			},
+			callback: {
+				beforeClick: beforeClick,
+				beforeAsync: beforeAsync,
+				onAsyncError: onAsyncError,
+				onAsyncSuccess: onAsyncSuccess
+			}
+		};
+
+		function filter(treeId, parentNode, childNodes) {
+			if (!childNodes) return null;
+			for (var i=0, l=childNodes.length; i<l; i++) {
+				childNodes[i].name = childNodes[i].name.replace(/\.n/g, '.');
+			}
+			return childNodes;
+		}
+		function beforeClick(treeId, treeNode) {
+			if (!treeNode.isParent) {
+				alert("请选择父节点");
+				return false;
+			} else {
+				return true;
+			}
+		}
+		var log, className = "dark";
+		function beforeAsync(treeId, treeNode) {
+			className = (className === "dark" ? "":"dark");
+			showLog("[ "+getTime()+" beforeAsync ]&nbsp;&nbsp;&nbsp;&nbsp;" + ((!!treeNode && !!treeNode.name) ? treeNode.name : "root") );
+			return true;
+		}
+		function onAsyncError(event, treeId, treeNode, XMLHttpRequest, textStatus, errorThrown) {
+			showLog("[ "+getTime()+" onAsyncError ]&nbsp;&nbsp;&nbsp;&nbsp;" + ((!!treeNode && !!treeNode.name) ? treeNode.name : "root") );
+		}
+		function onAsyncSuccess(event, treeId, treeNode, msg) {
+			showLog("[ "+getTime()+" onAsyncSuccess ]&nbsp;&nbsp;&nbsp;&nbsp;" + ((!!treeNode && !!treeNode.name) ? treeNode.name : "root") );
+		}
+		
+		function showLog(str) {
+			if (!log) log = $("#log");
+			log.append("<li class='"+className+"'>"+str+"</li>");
+			if(log.children("li").length > 8) {
+				log.get(0).removeChild(log.children("li")[0]);
+			}
+		}
+		function getTime() {
+			var now= new Date(),
+			h=now.getHours(),
+			m=now.getMinutes(),
+			s=now.getSeconds(),
+			ms=now.getMilliseconds();
+			return (h+":"+m+":"+s+ " " +ms);
+		}
+
+		function refreshNode(e) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			type = e.data.type,
+			silent = e.data.silent,
+			nodes = zTree.getSelectedNodes();
+			if (nodes.length == 0) {
+				alert("请先选择一个父节点");
+			}
+			for (var i=0, l=nodes.length; i<l; i++) {
+				zTree.reAsyncChildNodes(nodes[i], type, silent);
+				if (!silent) zTree.selectNode(nodes[i]);
+			}
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting);
+			$("#refreshNode").bind("click", {type:"refresh", silent:false}, refreshNode);
+			$("#refreshNodeSilent").bind("click", {type:"refresh", silent:true}, refreshNode);
+			$("#addNode").bind("click", {type:"add", silent:false}, refreshNode);
+			$("#addNodeSilent").bind("click", {type:"add", silent:true}, refreshNode);
+		});
+		//-->
+	</SCRIPT>
+
+</HEAD>
+
+<BODY>
+<h1>用 zTree 方法异步加载节点数据</h1>
+<h6>[ 文件路径: core/async_fun.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、reAsyncChildNodes 方法操作说明</h2>
+				<ul class="list">
+				<li class="highlight_red">使用 zTreeObj.reAsyncChildNodes 方法，详细请参见 API 文档中的相关内容</li>
+				<li><p>此 Demo 只能同时选中一个父节点<br/>
+					试试看：[ <a id="refreshNode" href="#" onclick="return false;">重新加载</a> ]&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="addNode" href="#" onclick="return false;">追加</a> ]</p>
+				</li>
+				<li><p><span class="highlight_red">“悄悄地”操作只能针对 折叠状态 的父节点</span><br/>
+					试试看：[ <a id="refreshNodeSilent" href="#" onclick="return false;">悄悄地 重新加载</a> ]&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="addNodeSilent" href="#" onclick="return false;">悄悄地 追加</a> ]<br/>
+					async log:<br/>
+					<ul id="log" class="log"></ul></p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、setting 配置信息说明</h2>
+				<ul class="list">
+				<li class="highlight_red">使用 zTree 提供的 reAsyncChildNodes 方法也必须设置 setting.async 中的各个属性，详细请参见 API 文档中的相关内容</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li>同 "异步加载 节点数据" 中的说明</li>
+				</ul>
+			</li>
+			<li class="title"><h2>4、其他说明</h2>
+				<ul class="list">
+				<li>同 "异步加载 节点数据" 中的说明</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/core/click.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/core/click.html
new file mode 100644
index 0000000..50367d9
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/core/click.html
@@ -0,0 +1,107 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - beforeClick / onClick</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			data: {
+				key: {
+					title:"t"
+				},
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeClick: beforeClick,
+				onClick: onClick
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"普通的父节点", t:"我很普通，随便点我吧", open:true},
+			{ id:11, pId:1, name:"叶子节点 - 1", t:"我很普通，随便点我吧"},
+			{ id:12, pId:1, name:"叶子节点 - 2", t:"我很普通，随便点我吧"},
+			{ id:13, pId:1, name:"叶子节点 - 3", t:"我很普通，随便点我吧"},
+			{ id:2, pId:0, name:"NB的父节点", t:"点我可以，但是不能点我的子节点，有本事点一个你试试看？", open:true},
+			{ id:21, pId:2, name:"叶子节点2 - 1", t:"你哪个单位的？敢随便点我？小心点儿..", click:false},
+			{ id:22, pId:2, name:"叶子节点2 - 2", t:"我有老爸罩着呢，点击我的小心点儿..", click:false},
+			{ id:23, pId:2, name:"叶子节点2 - 3", t:"好歹我也是个领导，别普通群众就来点击我..", click:false},
+			{ id:3, pId:0, name:"郁闷的父节点", t:"别点我，我好害怕...我的子节点随便点吧...", open:true, click:false },
+			{ id:31, pId:3, name:"叶子节点3 - 1", t:"唉，随便点我吧"},
+			{ id:32, pId:3, name:"叶子节点3 - 2", t:"唉，随便点我吧"},
+			{ id:33, pId:3, name:"叶子节点3 - 3", t:"唉，随便点我吧"}
+		];
+
+		var log, className = "dark";
+		function beforeClick(treeId, treeNode, clickFlag) {
+			className = (className === "dark" ? "":"dark");
+			showLog("[ "+getTime()+" beforeClick ]&nbsp;&nbsp;" + treeNode.name );
+			return (treeNode.click != false);
+		}
+		function onClick(event, treeId, treeNode, clickFlag) {
+			showLog("[ "+getTime()+" onClick ]&nbsp;&nbsp;clickFlag = " + clickFlag + " (" + (clickFlag===1 ? "普通选中": (clickFlag===0 ? "<b>取消选中</b>" : "<b>追加选中</b>")) + ")");
+		}		
+		function showLog(str) {
+			if (!log) log = $("#log");
+			log.append("<li class='"+className+"'>"+str+"</li>");
+			if(log.children("li").length > 8) {
+				log.get(0).removeChild(log.children("li")[0]);
+			}
+		}
+		function getTime() {
+			var now= new Date(),
+			h=now.getHours(),
+			m=now.getMinutes(),
+			s=now.getSeconds();
+			return (h+":"+m+":"+s);
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>单击节点控制</h1>
+<h6>[ 文件路径: core/click.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、beforeClick / onClick 事件回调函数控制</h2>
+				<ul class="list">
+				<li>利用 click 事件回调函数 可以进行各种其他的附加操作，这里简单演示如何监控此事件</li>
+				<li><p><span class="highlight_red">请尝试按下 <b>Ctrl</b> 键进行 多节点选择 和 取消选择</span><br/>
+					click log:<br/>
+					<ul id="log" class="log"></ul></p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、setting 配置信息说明</h2>
+				<ul class="list">
+				<li class="highlight_red">需要设置 setting.callback.beforeClick 和  setting.callback.onClick 属性, 详细请参见 API 文档中的相关内容</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li>对 节点数据 没有特殊要求，用户可以根据自己的需求添加自定义属性</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/core/custom_font.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/core/custom_font.html
new file mode 100644
index 0000000..e9f901e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/core/custom_font.html
@@ -0,0 +1,67 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - Custom Font</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				fontCss: getFont,
+				nameIsHTML: true
+			}
+		};
+
+		var zNodes =[
+			{ name:"粗体字", font:{'font-weight':'bold'} },
+			{ name:"斜体字", font:{'font-style':'italic'}},
+			{ name:"有背景的字", font:{'background-color':'black', 'color':'white'}},
+			{ name:"红色字", font:{'color':'red'}},
+			{ name:"蓝色字", font:{'color':'blue'}},
+			{ name:"<span style='color:blue;margin-right:0px;'>view</span>.<span style='color:red;margin-right:0px;'>nameIsHTML</span>"},
+			{ name:"zTree 默认样式"}
+		];
+
+		function getFont(treeId, node) {
+			return node.font ? node.font : {};
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>显示自定义字体的树</h1>
+<h6>[ 文件路径: core/custom_font.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、setting 配置信息说明</h2>
+				<ul class="list">
+				<li class="highlight_red">1、节点自定义字体请设置 setting.view.fontCss 属性，详细请参见 API 文档中的相关内容</li>
+				<li class="highlight_red">2、setting.view.nameIsHTML 属性可以允许节点名称支持 HTML 内容，详细请参见 API 文档中的相关内容</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li>设置字体不需要 treeNode 设置特殊数据，但如果用于为了区别不同类型的节点，设置不同的样式，可以对相应的数据设置自定义属性</li>
+				<li>此 Demo 利用 treeNode 保存样式定义</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/core/custom_icon.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/core/custom_icon.html
new file mode 100644
index 0000000..7c8de18
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/core/custom_icon.html
@@ -0,0 +1,74 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - Custom Icon </TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			data: {
+				simpleData: {
+					enable: true
+				}
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"展开、折叠 自定义图标不同", open:true, iconOpen:"../../../css/zTreeStyle/img/diy/1_open.png", iconClose:"../../../css/zTreeStyle/img/diy/1_close.png"},
+			{ id:11, pId:1, name:"叶子节点1", icon:"../../../css/zTreeStyle/img/diy/2.png"},
+			{ id:12, pId:1, name:"叶子节点2", icon:"../../../css/zTreeStyle/img/diy/3.png"},
+			{ id:13, pId:1, name:"叶子节点3", icon:"../../../css/zTreeStyle/img/diy/5.png"},
+			{ id:2, pId:0, name:"展开、折叠 自定义图标相同", open:true, icon:"../../../css/zTreeStyle/img/diy/4.png"},
+			{ id:21, pId:2, name:"叶子节点1", icon:"../../../css/zTreeStyle/img/diy/6.png"},
+			{ id:22, pId:2, name:"叶子节点2", icon:"../../../css/zTreeStyle/img/diy/7.png"},
+			{ id:23, pId:2, name:"叶子节点3", icon:"../../../css/zTreeStyle/img/diy/8.png"},
+			{ id:3, pId:0, name:"不使用自定义图标", open:true },
+			{ id:31, pId:3, name:"叶子节点1"},
+			{ id:32, pId:3, name:"叶子节点2"},
+			{ id:33, pId:3, name:"叶子节点3"}
+
+		];
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>自定义图标 -- icon 属性</h1>
+<h6>[ 文件路径: core/custom_icon.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、setting 配置信息说明</h2>
+				<ul class="list">
+				<li>自定义图标不需要对 setting 进行特殊配置</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li>利用 节点数据的 icon / iconOpen / iconClose 属性实现自定义图标</li>
+				<li class="highlight_red">详细请参见 API 文档中的相关内容</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、其他说明</h2>
+				<ul class="list">
+				<li class="highlight_red">由于时间关系，例子直接采用 png 图片，如果需要解决 ie6 下 png 图片的透明问题，请针对 ie6 制作特殊的 gif 图片或者利用 css filter 解决</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/core/custom_iconSkin.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/core/custom_iconSkin.html
new file mode 100644
index 0000000..cde753a
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/core/custom_iconSkin.html
@@ -0,0 +1,84 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - Custom Icon Skin </TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			data: {
+				simpleData: {
+					enable: true
+				}
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"展开、折叠 自定义图标不同", open:true, iconSkin:"pIcon01"},
+			{ id:11, pId:1, name:"叶子节点1", iconSkin:"icon01"},
+			{ id:12, pId:1, name:"叶子节点2", iconSkin:"icon02"},
+			{ id:13, pId:1, name:"叶子节点3", iconSkin:"icon03"},
+			{ id:2, pId:0, name:"展开、折叠 自定义图标相同", open:true, iconSkin:"pIcon02"},
+			{ id:21, pId:2, name:"叶子节点1", iconSkin:"icon04"},
+			{ id:22, pId:2, name:"叶子节点2", iconSkin:"icon05"},
+			{ id:23, pId:2, name:"叶子节点3", iconSkin:"icon06"},
+			{ id:3, pId:0, name:"不使用自定义图标", open:true },
+			{ id:31, pId:3, name:"叶子节点1"},
+			{ id:32, pId:3, name:"叶子节点2"},
+			{ id:33, pId:3, name:"叶子节点3"}
+		];
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+.ztree li span.button.pIcon01_ico_open{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/1_open.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.pIcon01_ico_close{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/1_close.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.pIcon02_ico_open, .ztree li span.button.pIcon02_ico_close{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/2.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon01_ico_docu{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/3.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon02_ico_docu{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/4.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon03_ico_docu{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/5.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon04_ico_docu{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/6.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon05_ico_docu{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/7.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon06_ico_docu{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/8.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+	</style>
+</HEAD>
+
+<BODY>
+<h1>自定义图标 -- iconSkin 属性</h1>
+<h6>[ 文件路径: core/custom_iconSkin.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、setting 配置信息说明</h2>
+				<ul class="list">
+				<li>自定义图标不需要对 setting 进行特殊配置</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li>利用 节点数据的 iconSkin 属性 配合 css 实现自定义图标</li>
+				<li class="highlight_red">详细请参见 API 文档中的相关内容</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、其他说明</h2>
+				<ul class="list">
+				<li class="highlight_red">由于时间关系，例子直接采用 png 图片，如果需要解决 ie6 下 png 图片的透明问题，请针对 ie6 制作特殊的 gif 图片或者利用 css filter 解决</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/core/expand.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/core/expand.html
new file mode 100644
index 0000000..15b03b5
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/core/expand.html
@@ -0,0 +1,185 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - beforeExpand / onExpand && beforeCollapse / onCollapse</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				selectedMulti: false
+			},
+			data: {
+				key: {
+					title:"t"
+				},
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeClick: beforeClick,
+				beforeCollapse: beforeCollapse,
+				beforeExpand: beforeExpand,
+				onCollapse: onCollapse,
+				onExpand: onExpand
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"可折腾的父节点 1", t:"我很普通，随便 展开/折叠 我吧", open:false},
+			{ id:11, pId:1, name:"叶子节点 - 1", t:"我老爸很普通，随便折腾他吧"},
+			{ id:12, pId:1, name:"可折腾的父节点 2", t:"我和我老爸都很普通，随便折腾我和他吧", open: false},
+			{ id:121, pId:12, name:"父节点 - 121", t:"我老爸很普通，随便折腾他吧", open:true},
+			{ id:1211, pId:121, name:"父节点 - 1211", t:"我老爸很普通，随便折腾他吧", open:false},
+			{ id:1212, pId:1211, name:"叶子节点 - 1212", t:"我老爸很普通，随便折腾他吧"},
+			{ id:1213, pId:121, name:"父节点 - 1213", t:"我老爸很普通，随便折腾他吧", open:false},
+			{ id:1214, pId:1213, name:"叶子节点 - 1214", t:"我老爸很普通，随便折腾他吧"},
+			{ id:123, pId:12, name:"叶子节点 - 23", t:"我老爸很普通，随便折腾他吧"},
+			{ id:13, pId:1, name:"叶子节点 - 3", t:"我老爸很普通，随便折腾他吧"},
+			{ id:2, pId:1, name:"无法折叠的父节点", t:"休想让我折叠起来...除非你用 expandAll 方法", open:false, collapse:false},
+			{ id:21, pId:2, name:"叶子节点2 - 1", t:"哈哈哈，我老爸NB吧，不能折叠吧？"},
+			{ id:22, pId:21, name:"叶子节点2 - 2", t:"哈哈哈，我老爸NB吧，不能折叠吧？"},
+			{ id:23, pId:21, name:"叶子节点2 - 3", t:"哈哈哈，我老爸NB吧，不能折叠吧？"},
+			{ id:3, pId:2, name:"无法展开的父节点", t:"就凭你也想展开我？难呀...嘿嘿, 除非你用 expandAll 方法", open:false, expand:true},
+			{ id:31, pId:3, name:"叶子节点3 - 1", t:"居然让你看到了...莫非你用了全部节点展开？"},
+			{ id:32, pId:31, name:"叶子节点3 - 2", t:"居然让你看到了...莫非你用了全部节点展开？"},
+			{ id:33, pId:31, name:"叶子节点3 - 3", t:"居然让你看到了...莫非你用了全部节点展开？"},
+			{ id:4, pId:3, name:"空空的父节点 1", t:"一无所有...除了我自己", isParent:true, open:false}
+		];
+
+		var log, className = "dark";
+		function beforeClick(treeId, treeNode) {
+			if (treeNode.isParent) {
+				return true;
+			} else {
+				alert("这个 Demo 是用来测试 展开 / 折叠 的...\n\n去点击父节点吧... ");
+				return false;
+			}
+		}
+		function beforeCollapse(treeId, treeNode) {
+			className = (className === "dark" ? "":"dark");
+			showLog("[ "+getTime()+" beforeCollapse ]&nbsp;&nbsp;&nbsp;&nbsp;" + treeNode.name );
+			return (treeNode.collapse !== false);
+		}
+		function onCollapse(event, treeId, treeNode) {
+			showLog("[ "+getTime()+" onCollapse ]&nbsp;&nbsp;&nbsp;&nbsp;" + treeNode.name);
+		}		
+		function beforeExpand(treeId, treeNode) {
+			className = (className === "dark" ? "":"dark");
+			showLog("[ "+getTime()+" beforeExpand ]&nbsp;&nbsp;&nbsp;&nbsp;" + treeNode.name );
+			return (treeNode.expand !== false);
+		}
+		function onExpand(event, treeId, treeNode) {
+			showLog("[ "+getTime()+" onExpand ]&nbsp;&nbsp;&nbsp;&nbsp;" + treeNode.name);
+		}
+		function showLog(str) {
+			if (!log) log = $("#log");
+			log.append("<li class='"+className+"'>"+str+"</li>");
+			if(log.children("li").length > 8) {
+				log.get(0).removeChild(log.children("li")[0]);
+			}
+		}
+		function getTime() {
+			var now= new Date(),
+			h=now.getHours(),
+			m=now.getMinutes(),
+			s=now.getSeconds(),
+			ms=now.getMilliseconds();
+			return (h+":"+m+":"+s+ " " +ms);
+		}
+
+		function expandNode(e) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			type = e.data.type,
+			nodes = zTree.getSelectedNodes();
+			if (type.indexOf("All")<0 && nodes.length == 0) {
+				alert("请先选择一个父节点");
+			}
+
+			if (type == "expandAll") {
+				zTree.expandAll(true);
+			} else if (type == "collapseAll") {
+				zTree.expandAll(false);
+			} else {
+				var callbackFlag = $("#callbackTrigger").attr("checked");
+				for (var i=0, l=nodes.length; i<l; i++) {
+					zTree.setting.view.fontCss = {};
+					if (type == "expand") {
+						zTree.expandNode(nodes[i], true, null, null, callbackFlag);
+					} else if (type == "collapse") {
+						zTree.expandNode(nodes[i], false, null, null, callbackFlag);
+					} else if (type == "toggle") {
+						zTree.expandNode(nodes[i], null, null, null, callbackFlag);
+					} else if (type == "expandSon") {
+						zTree.expandNode(nodes[i], true, true, null, callbackFlag);
+					} else if (type == "collapseSon") {
+						zTree.expandNode(nodes[i], false, true, null, callbackFlag);
+					}
+				}
+			}
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			$("#expandBtn").bind("click", {type:"expand"}, expandNode);
+			$("#collapseBtn").bind("click", {type:"collapse"}, expandNode);
+			$("#toggleBtn").bind("click", {type:"toggle"}, expandNode);
+			$("#expandSonBtn").bind("click", {type:"expandSon"}, expandNode);
+			$("#collapseSonBtn").bind("click", {type:"collapseSon"}, expandNode);
+			$("#expandAllBtn").bind("click", {type:"expandAll"}, expandNode);
+			$("#collapseAllBtn").bind("click", {type:"collapseAll"}, expandNode);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>展开 / 折叠父节点控制</h1>
+<h6>[ 文件路径: core/expand.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、beforeCollapse / onCollapse<br/>&nbsp;&nbsp;beforeExpand / onExpand 事件回调函数控制</h2>
+				<ul class="list">
+				<li>利用 collapse / expand 事件回调函数 可以控制父节点是否允许 展开 / 折叠，这里简单演示如何监控此事件</li>
+				<li><p>试试看：<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" id="callbackTrigger" checked /> expandNode 方法是否触发 callback<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;单个节点--[ <a id="expandBtn" href="#" title="不想展开我就不展开你..." onclick="return false;">展开</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="collapseBtn" href="#" title="不想折叠我就不折叠你..." onclick="return false;">折叠</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="toggleBtn" href="#" title="你想怎样？..." onclick="return false;">展开 / 折叠 切换</a> ]<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;单个节点（包括子节点）--[ <a id="expandSonBtn" href="#" title="不想展开我就不展开你..." onclick="return false;">展开</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="collapseSonBtn" href="#" title="不想折叠我就不折叠你..." onclick="return false;">折叠</a> ]<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;全部节点--[ <a id="expandAllBtn" href="#" title="不管你有多NB，统统都要听我的！！" onclick="return false;">展开</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="collapseAllBtn" href="#" title="不管你有多NB，统统都要听我的！！" onclick="return false;">折叠</a> ]</p>
+				<li><p><span class="highlight_red">使用 zTreeObj.expandNode 方法，详细请参见 API 文档中的相关内容</span><br/>
+					collapse / expand log:<br/>
+					<ul id="log" class="log"></ul></p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、setting 配置信息说明</h2>
+				<ul class="list">
+				<li class="highlight_red">事件回调函数的使用，详细请参见 API 文档中 setting.callback 的相关内容</li>
+				<li class="highlight_red">如果需要调整 展开 / 折叠 的动画效果， 详细请参见 API 文档中 setting.view.expandSpeed 的相关内容</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li>对 节点数据 没有特殊要求，用户可以根据自己的需求添加自定义属性</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/core/noicon.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/core/noicon.html
new file mode 100644
index 0000000..9562163
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/core/noicon.html
@@ -0,0 +1,93 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - noIcon </TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				showIcon: showIconForTree
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"父节点1 - 展开", open:true},
+			{ id:11, pId:1, name:"父节点11 - 折叠"},
+			{ id:111, pId:11, name:"叶子节点111"},
+			{ id:112, pId:11, name:"叶子节点112"},
+			{ id:113, pId:11, name:"叶子节点113"},
+			{ id:114, pId:11, name:"叶子节点114"},
+			{ id:12, pId:1, name:"父节点12 - 折叠"},
+			{ id:121, pId:12, name:"叶子节点121"},
+			{ id:122, pId:12, name:"叶子节点122"},
+			{ id:123, pId:12, name:"叶子节点123"},
+			{ id:124, pId:12, name:"叶子节点124"},
+			{ id:13, pId:1, name:"父节点13 - 没有子节点", isParent:true},
+			{ id:2, pId:0, name:"父节点2 - 折叠"},
+			{ id:21, pId:2, name:"父节点21 - 展开", open:true},
+			{ id:211, pId:21, name:"叶子节点211"},
+			{ id:212, pId:21, name:"叶子节点212"},
+			{ id:213, pId:21, name:"叶子节点213"},
+			{ id:214, pId:21, name:"叶子节点214"},
+			{ id:22, pId:2, name:"父节点22 - 折叠"},
+			{ id:221, pId:22, name:"叶子节点221"},
+			{ id:222, pId:22, name:"叶子节点222"},
+			{ id:223, pId:22, name:"叶子节点223"},
+			{ id:224, pId:22, name:"叶子节点224"},
+			{ id:23, pId:2, name:"父节点23 - 折叠"},
+			{ id:231, pId:23, name:"叶子节点231"},
+			{ id:232, pId:23, name:"叶子节点232"},
+			{ id:233, pId:23, name:"叶子节点233"},
+			{ id:234, pId:23, name:"叶子节点234"},
+			{ id:3, pId:0, name:"父节点3 - 没有子节点", isParent:true}
+		];
+
+		function showIconForTree(treeId, treeNode) {
+			return !treeNode.isParent;
+		};
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+
+</HEAD>
+
+<BODY>
+<h1>不显示节点图标的树</h1>
+<h6>[ 文件路径: core/noicon.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、setting 配置信息说明</h2>
+				<ul class="list">
+				<li>此 Demo 利用 Function 设置了使父节点不显示图标的规则</li>
+				<li class="highlight_red">是否显示节点图标请设置 setting.view.showIcon 属性，详细请参见 API 文档中的相关内容</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li>是否显示图标，不需要 treeNode 节点数据提供特殊设置，但如果用户需要根据不同节点动态设置，可以对节点数据增加特殊属性，用于判别</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/core/noline.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/core/noline.html
new file mode 100644
index 0000000..212d97b
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/core/noline.html
@@ -0,0 +1,88 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - noLine </TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				showLine: false
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"父节点1 - 展开", open:true},
+			{ id:11, pId:1, name:"父节点11 - 折叠"},
+			{ id:111, pId:11, name:"叶子节点111"},
+			{ id:112, pId:11, name:"叶子节点112"},
+			{ id:113, pId:11, name:"叶子节点113"},
+			{ id:114, pId:11, name:"叶子节点114"},
+			{ id:12, pId:1, name:"父节点12 - 折叠"},
+			{ id:121, pId:12, name:"叶子节点121"},
+			{ id:122, pId:12, name:"叶子节点122"},
+			{ id:123, pId:12, name:"叶子节点123"},
+			{ id:124, pId:12, name:"叶子节点124"},
+			{ id:13, pId:1, name:"父节点13 - 没有子节点", isParent:true},
+			{ id:2, pId:0, name:"父节点2 - 折叠"},
+			{ id:21, pId:2, name:"父节点21 - 展开", open:true},
+			{ id:211, pId:21, name:"叶子节点211"},
+			{ id:212, pId:21, name:"叶子节点212"},
+			{ id:213, pId:21, name:"叶子节点213"},
+			{ id:214, pId:21, name:"叶子节点214"},
+			{ id:22, pId:2, name:"父节点22 - 折叠"},
+			{ id:221, pId:22, name:"叶子节点221"},
+			{ id:222, pId:22, name:"叶子节点222"},
+			{ id:223, pId:22, name:"叶子节点223"},
+			{ id:224, pId:22, name:"叶子节点224"},
+			{ id:23, pId:2, name:"父节点23 - 折叠"},
+			{ id:231, pId:23, name:"叶子节点231"},
+			{ id:232, pId:23, name:"叶子节点232"},
+			{ id:233, pId:23, name:"叶子节点233"},
+			{ id:234, pId:23, name:"叶子节点234"},
+			{ id:3, pId:0, name:"父节点3 - 没有子节点", isParent:true}
+		];
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+
+</HEAD>
+
+<BODY>
+<h1>不显示连接线的树</h1>
+<h6>[ 文件路径: core/noline.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、setting 配置信息说明</h2>
+				<ul class="list">
+				<li class="highlight_red">是否显示连接线请设置 setting.view.showLine 属性，详细请参见 API 文档中的相关内容</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li>是否显示连线，不需要 treeNode 节点数据提供特殊设置</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/core/otherMouse.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/core/otherMouse.html
new file mode 100644
index 0000000..2dff4e4
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/core/otherMouse.html
@@ -0,0 +1,132 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - Other Mouse Event</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			data: {
+				key: {
+					title:"t"
+				},
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeMouseDown: beforeMouseDown,
+				beforeMouseUp: beforeMouseUp,
+				beforeRightClick: beforeRightClick,
+				onMouseDown: onMouseDown,
+				onMouseUp: onMouseUp,
+				onRightClick: onRightClick
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"不能 右键 0", t:"试试右键，没有 onRightClick 吧？", open:true, right:false},
+			{ id:11, pId:1, name:"不能 右键 1", t:"试试右键，没有 onRightClick 吧？", right:false},
+			{ id:12, pId:1, name:"不能 右键 2", t:"试试右键，没有 onRightClick 吧？", right:false},
+			{ id:13, pId:1, name:"不能 右键 3", t:"试试右键，没有 onRightClick 吧？", right:false},
+			{ id:2, pId:0, name:"不能 Down 0", t:"试试 MouseDown ，没有 onMouseDown 吧？", open:true, down:false},
+			{ id:21, pId:2, name:"不能 Down 1", t:"试试 MouseDown ，没有 onMouseDown 吧？", down:false},
+			{ id:22, pId:2, name:"不能 Down 2", t:"试试 MouseDown ，没有 onMouseDown 吧？", down:false},
+			{ id:23, pId:2, name:"不能 Down 3", t:"试试 MouseDown ，没有 onMouseDown 吧？", down:false},
+			{ id:3, pId:0, name:"不能 Up 0", t:"试试 MouseUp ，没有 onMouseUp 吧？", open:true, up:false},
+			{ id:31, pId:3, name:"不能 Up 1", t:"试试 MouseUp ，没有 onMouseUp 吧？", up:false},
+			{ id:32, pId:3, name:"不能 Up 2", t:"试试 MouseUp ，没有 onMouseUp 吧？", up:false},
+			{ id:33, pId:3, name:"不能 Up 3", t:"试试 MouseUp ，没有 onMouseUp 吧？", up:false}
+		];
+
+		var log, className = {down:"dark", up:"dark", right:"dark"};
+		function beforeMouseDown(treeId, treeNode) {
+			className.down = (className.down === "dark" ? "":"dark");
+			showLog("[ "+getTime()+" beforeMouseDown ]&nbsp;&nbsp;" + (treeNode?treeNode.name:"root"), "down" );
+			return (!treeNode || treeNode.down != false);
+		}
+		function onMouseDown(event, treeId, treeNode) {
+			showLog("[ "+getTime()+" onMouseDown ]&nbsp;&nbsp;" + (treeNode?treeNode.name:"root"), "down" );
+		}
+		function beforeMouseUp(treeId, treeNode) {
+			className.up = (className.up === "dark" ? "":"dark");
+			showLog("[ "+getTime()+" beforeMouseUp ]&nbsp;&nbsp;" + (treeNode?treeNode.name:"root"), "up" );
+			return (!treeNode || treeNode.up != false);
+		}
+		function onMouseUp(event, treeId, treeNode) {
+			showLog("[ "+getTime()+" onMouseUp ]&nbsp;&nbsp;" + (treeNode?treeNode.name:"root"), "up" );
+		}
+		function beforeRightClick(treeId, treeNode) {
+			className.right = (className.right === "dark" ? "":"dark");
+			showLog("[ "+getTime()+" beforeRightClick ]&nbsp;&nbsp;" + (treeNode?treeNode.name:"root"), "right" );
+			return (!treeNode || treeNode.right != false);
+		}
+		function onRightClick(event, treeId, treeNode) {
+			showLog("[ "+getTime()+" onRightClick ]&nbsp;&nbsp;" + (treeNode?treeNode.name:"root"), "right" );
+		}
+		function showLog(str, logType) {
+			log = $("#log" + "_" + logType);
+			log.append("<li class='"+className[logType]+"'>"+str+"</li>");
+			if(log.children("li").length > 2) {
+				log.get(0).removeChild(log.children("li")[0]);
+			}
+		}
+		function getTime() {
+			var now= new Date(),
+			h=now.getHours(),
+			m=now.getMinutes(),
+			s=now.getSeconds(),
+			ms=now.getMilliseconds();
+			return (h+":"+m+":"+s+ " " +ms);
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>其他鼠标事件监听</h1>
+<h6>[ 文件路径: core/otherMouse.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、mousedown / mouseup / rightClick 事件回调函数控制</h2>
+				<ul class="list">
+				<li>zTree 提供 这几种鼠标事件响应，主要是为了便于用户针对一些特殊需求进行扩展开发，不会对 zTree 造成任何影响，这里简单演示如何监控此事件</li>
+				<li><p><span class="highlight_red">请尝试鼠标在 zTree 上胡乱点击（左键、右键）吧，顺便看看 log</span><br/>
+					mousedown event log:<br/>
+					<ul id="log_down" class="log small"></ul>
+					mouseup event log:<br/>
+					<ul id="log_up" class="log small"></ul>
+					rightClick event log:<br/>
+					<ul id="log_right" class="log small"></ul></p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、setting 配置信息说明</h2>
+				<ul class="list">
+				<li class="highlight_red">事件回调函数的使用，详细请参见 API 文档中 setting.callback 的相关内容</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li>对 节点数据 没有特殊要求，用户可以根据自己的需求添加自定义属性</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/core/searchNodes.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/core/searchNodes.html
new file mode 100644
index 0000000..28c2e3b
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/core/searchNodes.html
@@ -0,0 +1,173 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - getNodeByParam / getNodesByParam / getNodesByParamFuzzy</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			data: {
+				key: {
+					title: "t"
+				},
+				simpleData: {
+					enable: true
+				}				
+			},
+			view: {
+				fontCss: getFontCss
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"节点搜索演示 1", t:"id=1", open:true},
+			{ id:11, pId:1, name:"关键字可以是名字", t:"id=11"},
+			{ id:12, pId:1, name:"关键字可以是level", t:"id=12"},
+			{ id:13, pId:1, name:"关键字可以是id", t:"id=13"},
+			{ id:14, pId:1, name:"关键字可以是各种属性", t:"id=14"},
+			{ id:2, pId:0, name:"节点搜索演示 2", t:"id=2", open:true},
+			{ id:21, pId:2, name:"可以只搜索一个节点", t:"id=21"},
+			{ id:22, pId:2, name:"可以搜索节点集合", t:"id=22"},
+			{ id:23, pId:2, name:"搜我吧", t:"id=23"},
+			{ id:3, pId:0, name:"节点搜索演示 3", t:"id=3", open:true },
+			{ id:31, pId:3, name:"我的 id 是: 31", t:"id=31"},
+			{ id:32, pId:31, name:"我的 id 是: 32", t:"id=32"},
+			{ id:33, pId:32, name:"我的 id 是: 33", t:"id=33"}
+		];
+
+		function focusKey(e) {
+			if (key.hasClass("empty")) {
+				key.removeClass("empty");
+			}
+		}
+		function blurKey(e) {
+			if (key.get(0).value === "") {
+				key.addClass("empty");
+			}
+		}
+		var lastValue = "", nodeList = [], fontCss = {};
+		function clickRadio(e) {
+			lastValue = "";
+			searchNode(e);
+		}
+		function searchNode(e) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			if (!$("#getNodesByFilter").attr("checked")) {
+				var value = $.trim(key.get(0).value);
+				var keyType = "";
+				if ($("#name").attr("checked")) {
+					keyType = "name";
+				} else if ($("#level").attr("checked")) {
+					keyType = "level";
+					value = parseInt(value);
+				} else if ($("#id").attr("checked")) {
+					keyType = "id";
+					value = parseInt(value);
+				}
+				if (key.hasClass("empty")) {
+					value = "";
+				}
+				if (lastValue === value) return;
+				lastValue = value;
+				if (value === "") return;
+				updateNodes(false);
+
+				if ($("#getNodeByParam").attr("checked")) {
+					var node = zTree.getNodeByParam(keyType, value);
+					if (node === null) {
+						nodeList = [];
+					} else {
+						nodeList = [node];
+					}
+				} else if ($("#getNodesByParam").attr("checked")) {
+					nodeList = zTree.getNodesByParam(keyType, value);
+				} else if ($("#getNodesByParamFuzzy").attr("checked")) {
+					nodeList = zTree.getNodesByParamFuzzy(keyType, value);
+				}
+			} else {
+				updateNodes(false);
+				nodeList = zTree.getNodesByFilter(filter);
+			}
+			updateNodes(true);
+
+		}
+		function updateNodes(highlight) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			for( var i=0, l=nodeList.length; i<l; i++) {
+				nodeList[i].highlight = highlight;
+				zTree.updateNode(nodeList[i]);
+			}
+		}
+		function getFontCss(treeId, treeNode) {
+			return (!!treeNode.highlight) ? {color:"#A60000", "font-weight":"bold"} : {color:"#333", "font-weight":"normal"};
+		}
+		function filter(node) {
+			return !node.isParent && node.isFirstNode;
+		}
+
+		var key;
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			key = $("#key");
+			key.bind("focus", focusKey)
+			.bind("blur", blurKey)
+			.bind("propertychange", searchNode)
+			.bind("input", searchNode);
+			$("#name").bind("change", clickRadio);
+			$("#level").bind("change", clickRadio);
+			$("#id").bind("change", clickRadio);
+			$("#getNodeByParam").bind("change", clickRadio);
+			$("#getNodesByParam").bind("change", clickRadio);
+			$("#getNodesByParamFuzzy").bind("change", clickRadio);
+			$("#getNodesByFilter").bind("change", clickRadio);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>根据参数查找节点</h1>
+<h6>[ 文件路径: core/searchNodes.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、getNodeByParam / getNodesByParam / getNodesByParamFuzzy 方法操作说明</h2>
+				<ul class="list">
+				<li class="highlight_red">使用 zTreeObj.getNodeByParam / getNodesByParam / getNodesByParamFuzzy / getNodeByTId 方法，详细请参见 API 文档中的相关内容</li>
+				<li><p>搜索试试看：<br/>
+						属性值( value )：<input type="text" id="key" value="" class="empty" /><br/>
+						属性( key )：<input type="radio" id="name" name="keyType" class="radio first" checked /><span>name (string)</span><br/>
+						<input type="radio" id="level" name="keyType" class="radio" style="margin-left:68px;" /><span>level (number) ... 根节点 level = 0</span><br/>
+						<input type="radio" id="id" name="keyType" class="radio" style="margin-left:68px;" /><span>id (number)</span><br/>
+						方法：<input type="radio" id="getNodeByParam" name="funType" class="radio first" /><span>getNodeByParam</span><br/>
+						<input type="radio" id="getNodesByParam" name="funType" class="radio" style="margin-left:36px;" /><span>getNodesByParam</span><br/>
+						<input type="radio" id="getNodesByParamFuzzy" name="funType" class="radio" style="margin-left:36px;" checked /><span>getNodesByParamFuzzy (only string)</span><br/>
+						<input type="radio" id="getNodesByFilter" name="funType" class="radio" style="margin-left:36px;" /><span>getNodesByFilter (参考本页源码中 function filter)</span><br/>
+					</p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、setting 配置信息说明</h2>
+				<ul class="list">
+				<li>不需要对 setting 进行特殊设置</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li class="highlight_red">请注意各个方法使用时保证传入查找的参数类型与设定要查找的属性的类型一致</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/core/simpleData.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/core/simpleData.html
new file mode 100644
index 0000000..6d2dcb8
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/core/simpleData.html
@@ -0,0 +1,100 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - Simple Data</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			data: {
+				simpleData: {
+					enable: true
+				}
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"父节点1 - 展开", open:true},
+			{ id:11, pId:1, name:"父节点11 - 折叠"},
+			{ id:111, pId:11, name:"叶子节点111"},
+			{ id:112, pId:11, name:"叶子节点112"},
+			{ id:113, pId:11, name:"叶子节点113"},
+			{ id:114, pId:11, name:"叶子节点114"},
+			{ id:12, pId:1, name:"父节点12 - 折叠"},
+			{ id:121, pId:12, name:"叶子节点121"},
+			{ id:122, pId:12, name:"叶子节点122"},
+			{ id:123, pId:12, name:"叶子节点123"},
+			{ id:124, pId:12, name:"叶子节点124"},
+			{ id:13, pId:1, name:"父节点13 - 没有子节点", isParent:true},
+			{ id:2, pId:0, name:"父节点2 - 折叠"},
+			{ id:21, pId:2, name:"父节点21 - 展开", open:true},
+			{ id:211, pId:21, name:"叶子节点211"},
+			{ id:212, pId:21, name:"叶子节点212"},
+			{ id:213, pId:21, name:"叶子节点213"},
+			{ id:214, pId:21, name:"叶子节点214"},
+			{ id:22, pId:2, name:"父节点22 - 折叠"},
+			{ id:221, pId:22, name:"叶子节点221"},
+			{ id:222, pId:22, name:"叶子节点222"},
+			{ id:223, pId:22, name:"叶子节点223"},
+			{ id:224, pId:22, name:"叶子节点224"},
+			{ id:23, pId:2, name:"父节点23 - 折叠"},
+			{ id:231, pId:23, name:"叶子节点231"},
+			{ id:232, pId:23, name:"叶子节点232"},
+			{ id:233, pId:23, name:"叶子节点233"},
+			{ id:234, pId:23, name:"叶子节点234"},
+			{ id:3, pId:0, name:"父节点3 - 没有子节点", isParent:true, open:true}
+		];
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+ </HEAD>
+
+<BODY>
+<h1>最简单的树 -- 简单 JSON 数据</h1>
+<h6>[ 文件路径: core/simpleData.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、setting 配置信息说明</h2>
+				<ul class="list">
+				<li class="highlight_red">必须设置 setting.data.simple 内的属性，详细请参见 API 文档中的相关内容</li>
+				<li>与显示相关的内容请参考 API 文档中 setting.view 内的配置信息</li>
+				<li>name、children、title 等属性定义更改请参考 API 文档中 setting.data.key 内的配置信息</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li class="highlight_red">简单模式的 JSON 数据需要使用 id / pId 表示节点的父子包含关系，如使用其他属性设置父子关联关系请参考 setting.data.simple 内各项说明
+				<div><pre xmlns=""><code>例如：
+var nodes = [
+	{id:1, pId:0, name: "父节点1"},
+	{id:11, pId:1, name: "子节点1"},
+	{id:12, pId:1, name: "子节点2"}
+];</code></pre></div></li>
+				<li>默认展开的节点，请设置 treeNode.open 属性</li>
+				<li>无子节点的父节点，请设置 treeNode.isParent 属性</li>
+				<li>其他属性说明请参考 API 文档中 "treeNode 节点数据详解"</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、其他说明</h2>
+				<ul class="list">
+				<li>Demo 中绝大部分都采用简单 JSON 数据模式，以便于大家学习</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/core/standardData.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/core/standardData.html
new file mode 100644
index 0000000..582a6e1
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/core/standardData.html
@@ -0,0 +1,106 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - Standard Data </TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {	};
+
+		var zNodes =[
+			{ name:"父节点1 - 展开", open:true,
+				children: [
+					{ name:"父节点11 - 折叠",
+						children: [
+							{ name:"叶子节点111"},
+							{ name:"叶子节点112"},
+							{ name:"叶子节点113"},
+							{ name:"叶子节点114"}
+						]},
+					{ name:"父节点12 - 折叠",
+						children: [
+							{ name:"叶子节点121"},
+							{ name:"叶子节点122"},
+							{ name:"叶子节点123"},
+							{ name:"叶子节点124"}
+						]},
+					{ name:"父节点13 - 没有子节点", isParent:true}
+				]},
+			{ name:"父节点2 - 折叠",
+				children: [
+					{ name:"父节点21 - 展开", open:true,
+						children: [
+							{ name:"叶子节点211"},
+							{ name:"叶子节点212"},
+							{ name:"叶子节点213"},
+							{ name:"叶子节点214"}
+						]},
+					{ name:"父节点22 - 折叠",
+						children: [
+							{ name:"叶子节点221"},
+							{ name:"叶子节点222"},
+							{ name:"叶子节点223"},
+							{ name:"叶子节点224"}
+						]},
+					{ name:"父节点23 - 折叠",
+						children: [
+							{ name:"叶子节点231"},
+							{ name:"叶子节点232"},
+							{ name:"叶子节点233"},
+							{ name:"叶子节点234"}
+						]}
+				]},
+			{ name:"父节点3 - 没有子节点", isParent:true}
+
+		];
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>最简单的树 -- 标准 JSON 数据</h1>
+<h6>[ 文件路径: core/standardData.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、setting 配置信息说明</h2>
+				<ul class="list">
+				<li class="highlight_red">普通使用，无必须设置的参数</li>
+				<li>与显示相关的内容请参考 API 文档中 setting.view 内的配置信息</li>
+				<li>name、children、title 等属性定义更改请参考 API 文档中 setting.data.key 内的配置信息</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li class="highlight_red">标准的 JSON 数据需要嵌套表示节点的父子包含关系
+					<div><pre xmlns=""><code>例如：
+var nodes = [
+	{name: "父节点1", children: [
+		{name: "子节点1"},
+		{name: "子节点2"}
+	]}
+];</code></pre></div>
+				</li>
+				<li>默认展开的节点，请设置 treeNode.open 属性</li>
+				<li>无子节点的父节点，请设置 treeNode.isParent 属性</li>
+				<li>其他属性说明请参考 API 文档中 "treeNode 节点数据详解"</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/core/update_fun.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/core/update_fun.html
new file mode 100644
index 0000000..918ed82
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/core/update_fun.html
@@ -0,0 +1,143 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - updateNode</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				selectedMulti: false
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"父节点1", open:true},
+			{ id:11, pId:1, name:"叶子节点1"},
+			{ id:12, pId:1, name:"叶子节点2"},
+			{ id:13, pId:1, name:"叶子节点3"},
+			{ id:2, pId:0, name:"父节点2", open:true},
+			{ id:21, pId:2, name:"叶子节点1"},
+			{ id:22, pId:2, name:"叶子节点2"},
+			{ id:23, pId:2, name:"叶子节点3"},
+			{ id:3, pId:0, name:"父节点3", open:true },
+			{ id:31, pId:3, name:"叶子节点1"},
+			{ id:32, pId:3, name:"叶子节点2"},
+			{ id:33, pId:3, name:"叶子节点3"}
+		];
+
+		var nameCount = 0, iconCount = 1, color = [0, 0, 0];
+		function updateNode(e) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			type = e.data.type,
+			nodes = zTree.getSelectedNodes();
+			if (nodes.length == 0) {
+				alert("请先选择一个节点");
+			}
+			for (var i=0, l=nodes.length; i<l; i++) {
+				zTree.setting.view.fontCss = {};
+				if (type == "rename") {
+					nodes[i].name = nodes[i].name.replace(/_[\d]*$/g, "") + "_" + (nameCount++);
+				} else if (type == "icon") {
+					if (iconCount > 8) {
+						nodes[i].iconSkin = null;
+						iconCount = 1;
+					} else if (nodes[i].isParent) {
+						nodes[i].iconSkin = nodes[i].iconSkin ? null : "pIcon01";
+					} else {
+						nodes[i].iconSkin = "icon0" + (iconCount++);
+					}
+				} else if (type == "color") {
+					color = [0, 0, 0];
+					var r1 = Math.round(Math.random()*3 - 0.5);
+					color[r1] = 15;
+					var r2 = Math.round(Math.random()*3 - 0.5);
+					while (r2 === r1) {
+						r2 = Math.round(Math.random()*3 - 0.5);
+					}
+					color[r2] = Math.round(Math.random()*16-0.5);
+					zTree.setting.view.fontCss["color"] = "#"+color[0].toString(16)+color[1].toString(16)+color[2].toString(16);
+				} else if (type == "font") {
+					var style = $("#" + nodes[i].tId + "_a").css("font-style") ;
+					style = (style=="italic" ? "normal" : "italic");
+					zTree.setting.view.fontCss["font-style"] = style;
+				}
+				zTree.updateNode(nodes[i]);
+			}
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			$("#rename").bind("click", {type:"rename"}, updateNode);
+			$("#changeIcon").bind("click", {type:"icon"}, updateNode);
+			$("#changeColor").bind("click", {type:"color"}, updateNode);
+			$("#changeFont").bind("click", {type:"font"}, updateNode);
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+.ztree li span.button.pIcon01_ico_open{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/1_open.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.pIcon01_ico_close{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/1_close.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon01_ico_docu{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/2.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon02_ico_docu{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/3.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon03_ico_docu{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/4.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon04_ico_docu{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/5.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon05_ico_docu{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/6.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon06_ico_docu{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/7.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon07_ico_docu{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/8.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon08_ico_docu{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/9.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+	</style>
+</HEAD>
+
+<BODY>
+<h1>用 zTree 方法 更新 节点数据</h1>
+<h6>[ 文件路径: core/update_fun.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、updateNode 方法操作说明</h2>
+				<ul class="list">
+				<li class="highlight_red">使用 zTreeObj.updateNode 方法，详细请参见 API 文档中的相关内容</li>
+				<li><p>此 Demo 只能同时选中一个节点<br/>
+					试试看：[ <a id="rename" href="#" onclick="return false;">换名字</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="changeIcon" href="#" onclick="return false;">换图标</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="changeColor" href="#" onclick="return false;">换颜色</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="changeFont" href="#" onclick="return false;">斜体</a> ]</p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、setting 配置信息说明</h2>
+				<ul class="list">
+				<li>不需要对 setting 进行特殊设置</li>
+				<li class="highlight_red">配合 setting.view.fontCss 可以修改节点文字样式</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li class="highlight_red">zTreeObj.updateNode 方法的 API 文档中有详细说明</li>
+				</ul>
+			</li>
+			<li class="title"><h2>4、其他说明</h2>
+				<ul class="list">
+				<li>此 Demo 是针对 核心 js 包 core 制作的，因此不包括 checkbox 的更新操作</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/core/url.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/core/url.html
new file mode 100644
index 0000000..8550d28
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/core/url.html
@@ -0,0 +1,63 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - url</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			data: {
+				simpleData: {
+					enable: true
+				}
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"zTree Home", url:"http://www.baby666.cn", target:"_blank"},
+			{ id:2, pId:0, name:"zTree in Google", url:"http://code.google.com/p/jquerytree/", target:"_blank"},
+			{ id:3, pId:0, name:"zTree in Iteye", url:"http://ztreeapi.iteye.com/", target:"_blank"},
+			{ id:4, pId:0, name:"Nothing...", url:"", target:"_blank", click:"alert('我是不会跳转的...');"}
+		];
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+ </HEAD>
+
+<BODY>
+<h1>超链接演示</h1>
+<h6>[ 文件路径: core/url.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、setting 配置信息说明</h2>
+				<ul class="list">
+				<li>普通使用，无必须设置的参数</li>
+				<li class="highlight_red">如果需要灵活控制超链接跳转，请利用 onClick 事件回调函数进行控制，详细请参见 API 文档中的相关内容</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li class="highlight_red">1、url 属性用于设置 页面跳转的路径</li>
+				<li class="highlight_red">2、target 属性用于设置 页面跳转的窗口目标</li>
+				<li class="highlight_red">3、click 属性用于设置简单的 onClick 事件</li>
+				<li>其他属性说明请参考 API 文档中 "treeNode 节点数据详解"</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/excheck/checkbox.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/excheck/checkbox.html
new file mode 100644
index 0000000..01c5d5c
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/excheck/checkbox.html
@@ -0,0 +1,107 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - checkbox</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<!--
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			check: {
+				enable: true
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"随意勾选 1", open:true},
+			{ id:11, pId:1, name:"随意勾选 1-1", open:true},
+			{ id:111, pId:11, name:"随意勾选 1-1-1"},
+			{ id:112, pId:11, name:"随意勾选 1-1-2"},
+			{ id:12, pId:1, name:"随意勾选 1-2", open:true},
+			{ id:121, pId:12, name:"随意勾选 1-2-1"},
+			{ id:122, pId:12, name:"随意勾选 1-2-2"},
+			{ id:2, pId:0, name:"随意勾选 2", checked:true, open:true},
+			{ id:21, pId:2, name:"随意勾选 2-1"},
+			{ id:22, pId:2, name:"随意勾选 2-2", open:true},
+			{ id:221, pId:22, name:"随意勾选 2-2-1", checked:true},
+			{ id:222, pId:22, name:"随意勾选 2-2-2"},
+			{ id:23, pId:2, name:"随意勾选 2-3"}
+		];
+		
+		var code;
+		
+		function setCheck() {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			py = $("#py").attr("checked")? "p":"",
+			sy = $("#sy").attr("checked")? "s":"",
+			pn = $("#pn").attr("checked")? "p":"",
+			sn = $("#sn").attr("checked")? "s":"",
+			type = { "Y":py + sy, "N":pn + sn};
+			zTree.setting.check.chkboxType = type;
+			showCode('setting.check.chkboxType = { "Y" : "' + type.Y + '", "N" : "' + type.N + '" };');
+		}
+		function showCode(str) {
+			if (!code) code = $("#code");
+			code.empty();
+			code.append("<li>"+str+"</li>");
+		}
+		
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			setCheck();
+			$("#py").bind("change", setCheck);
+			$("#sy").bind("change", setCheck);
+			$("#pn").bind("change", setCheck);
+			$("#sn").bind("change", setCheck);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Checkbox 勾选操作</h1>
+<h6>[ 文件路径: excheck/checkbox.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、setting 配置信息说明</h2>
+				<ul class="list">
+				<li class="highlight_red">使用 checkbox，必须设置 setting.check 中的各个属性，详细请参见 API 文档中的相关内容</li>
+				<li><p>父子关联关系：<br/>
+						被勾选时：<input type="checkbox" id="py" class="checkbox first" checked /><span>关联父</span>
+						<input type="checkbox" id="sy" class="checkbox first" checked /><span>关联子</span><br/>
+						取消勾选时：<input type="checkbox" id="pn" class="checkbox first" checked /><span>关联父</span>
+						<input type="checkbox" id="sn" class="checkbox first" checked /><span>关联子</span><br/>
+						<ul id="code" class="log" style="height:20px;"></ul></p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li class="highlight_red">1)、如果需要初始化默认节点被勾选，请设置 treeNode.checked 属性，详细请参见 API 文档中的相关内容</li>
+				<li class="highlight_red">2)、如果某节点禁用 checkbox，请设置 treeNode.chkDisabled 属性，详细请参见 API 文档中的相关内容 和 'chkDisabled 演示'</li>
+				<li class="highlight_red">3)、如果某节点不显示 checkbox，请设置 treeNode.nocheck 属性，详细请参见 API 文档中的相关内容 和 'nocheck 演示'</li>
+				<li class="highlight_red">4)、如果更换 checked 属性，请参考 API 文档中 setting.data.key.checked 的详细说明</li>
+				<li>5)、其他请参考 API 文档中 treeNode.checkedOld / getCheckStatus / check_Child_State / check_Focus 的详细说明</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/excheck/checkbox_chkDisabled.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/excheck/checkbox_chkDisabled.html
new file mode 100644
index 0000000..c3ad466
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/excheck/checkbox_chkDisabled.html
@@ -0,0 +1,112 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - Checkbox chkDisabled</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<!--
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			check: {
+				enable: true,
+				chkDisabledInherit: true
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"随意勾选 1", open:true},
+			{ id:11, pId:1, name:"随意勾选 1-1", open:true},
+			{ id:111, pId:11, name:"disabled 1-1-1", chkDisabled:true},
+			{ id:112, pId:11, name:"随意勾选 1-1-2"},
+			{ id:12, pId:1, name:"disabled 1-2", chkDisabled:true, checked:true, open:true},
+			{ id:121, pId:12, name:"disabled 1-2-1", checked:true},
+			{ id:122, pId:12, name:"disabled 1-2-2"},
+			{ id:2, pId:0, name:"随意勾选 2", checked:true, open:true},
+			{ id:21, pId:2, name:"随意勾选 2-1"},
+			{ id:22, pId:2, name:"随意勾选 2-2", open:true},
+			{ id:221, pId:22, name:"随意勾选 2-2-1", checked:true},
+			{ id:222, pId:22, name:"随意勾选 2-2-2"},
+			{ id:23, pId:2, name:"随意勾选 2-3"}
+		];
+
+		function disabledNode(e) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			disabled = e.data.disabled,
+			nodes = zTree.getSelectedNodes(),
+			inheritParent = false, inheritChildren = false;
+			if (nodes.length == 0) {
+				alert("请先选择一个节点");
+			}
+			if (disabled) {
+				inheritParent = $("#py").attr("checked");
+				inheritChildren = $("#sy").attr("checked");
+			} else {
+				inheritParent = $("#pn").attr("checked");
+				inheritChildren = $("#sn").attr("checked");
+			}
+
+			for (var i=0, l=nodes.length; i<l; i++) {
+				zTree.setChkDisabled(nodes[i], disabled, inheritParent, inheritChildren);
+			}
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			$("#disabledTrue").bind("click", {disabled: true}, disabledNode);
+			$("#disabledFalse").bind("click", {disabled: false}, disabledNode);
+			
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Checkbox chkDisabled 演示</h1>
+<h6>[ 文件路径: excheck/checkbox_chkDisabled.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、setChkDisabled 方法操作说明</h2>
+				<ul class="list">
+				<li>setChkDisabled 方法可以设置节点 checkbox / radio 禁用 或 取消禁用，详细请参见 API 文档中的相关内容</li>
+				<li><p>试试看：<br/>
+					禁用时：<input type="checkbox" id="py" class="checkbox first"/><span>关联父</span>
+					<input type="checkbox" id="sy" class="checkbox first" checked /><span>关联子</span><br/>
+					取消禁用时：<input type="checkbox" id="pn" class="checkbox first" checked /><span>关联父</span>
+					<input type="checkbox" id="sn" class="checkbox first" checked /><span>关联子</span><br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="disabledTrue" href="#" title="set checkbox to be disabled." onclick="return false;">禁用</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="disabledFalse" href="#" title="set checkbox to be abled." onclick="return false;">取消禁用</a> ]
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、setting 配置信息说明</h2>
+				<ul class="list">
+				<li>这个 Demo 只简单演示 chkDisabled 的使用方法，详细配置信息请参考 ‘Checkbox 勾选操作’</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li class="highlight_red">1)、如果某节点禁用 checkbox，请设置 treeNode.chkDisabled 属性，详细请参见 API 文档中的相关内容</li>
+				<li>2)、其他请参考 ‘Checkbox 勾选操作’</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/excheck/checkbox_count.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/excheck/checkbox_count.html
new file mode 100644
index 0000000..c0d84ba
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/excheck/checkbox_count.html
@@ -0,0 +1,126 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - getChangeCheckedNodes / getCheckedNodes</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<!--
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				selectedMulti: false
+			},
+			check: {
+				enable: true
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				onCheck: onCheck
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"随意勾选 1", open:true},
+			{ id:11, pId:1, name:"随意勾选 1-1"},
+			{ id:12, pId:1, name:"随意勾选  1-2", open:true},
+			{ id:121, pId:12, name:"随意勾选 1-2-1", checked:true},
+			{ id:122, pId:12, name:"随意勾选 1-2-2"},
+			{ id:123, pId:12, name:"随意勾选 1-2-3"},
+			{ id:13, pId:1, name:"随意勾选 1-3"},
+			{ id:2, pId:0, name:"随意勾选 2", open:true},
+			{ id:21, pId:2, name:"随意勾选 2-1"},
+			{ id:22, pId:2, name:"随意勾选 2-2", open:true},
+			{ id:221, pId:22, name:"随意勾选 2-2-1", checked:true},
+			{ id:222, pId:22, name:"随意勾选 2-2-2"},
+			{ id:223, pId:22, name:"随意勾选 2-2-3"},
+			{ id:23, pId:2, name:"随意勾选 2-3", checked:true}
+		];
+
+		var clearFlag = false;
+		function onCheck(e, treeId, treeNode) {
+			count();
+			if (clearFlag) {
+				clearCheckedOldNodes();
+			}
+		}
+		function clearCheckedOldNodes() {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nodes = zTree.getChangeCheckedNodes();
+			for (var i=0, l=nodes.length; i<l; i++) {
+				nodes[i].checkedOld = nodes[i].checked;
+			}
+		}
+		function count() {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			checkCount = zTree.getCheckedNodes(true).length,
+			nocheckCount = zTree.getCheckedNodes(false).length,
+			changeCount = zTree.getChangeCheckedNodes().length;
+			$("#checkCount").text(checkCount);
+			$("#nocheckCount").text(nocheckCount);
+			$("#changeCount").text(changeCount);
+
+		}
+		function createTree() {
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			count();
+			clearFlag = $("#last").attr("checked");
+		}
+
+		$(document).ready(function(){
+			createTree();			
+			$("#init").bind("change", createTree);
+			$("#last").bind("change", createTree);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>checkbox 勾选统计</h1>
+<h6>[ 文件路径: excheck/checkbox_count.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、getChangeCheckedNodes / getCheckedNodes 方法操作说明</h2>
+				<ul class="list">
+				<li class="highlight_red">使用 zTreeObj.getChangeCheckedNodes / getCheckedNodes 方法，详细请参见 API 文档中的相关内容</li>
+				<li><p>去勾选 checkbox 比较下面的数字变化：<br/>
+					<ul id="log" class="log" style="height:110px;">
+						<li>当前被勾选的节点共 <span id="checkCount" class="highlight_red"></span> 个</li>
+						<li>当前未被勾选的节点共 <span id="nocheckCount" class="highlight_red"></span> 个</li>
+						<li>勾选状态对比规则：<input type="radio" id="init" name="stateType" class="radio first" checked /><span>与 zTree 初始化时对比</span><br/>
+							<input type="radio" id="last" name="stateType" class="radio first" style="margin-left:108px;"/><span>与上一次勾选后对比</span></li>
+						<li>当前被修改勾选状态的节点共 <span id="changeCount" class="highlight_red"></span> 个</li>
+					</ul></p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、setting 配置信息说明</h2>
+				<ul class="list">
+				<li>同 "checkbox 勾选操作" 中的说明</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li>同 "checkbox 勾选操作" 中的说明</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/excheck/checkbox_fun.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/excheck/checkbox_fun.html
new file mode 100644
index 0000000..c8a0b12
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/excheck/checkbox_fun.html
@@ -0,0 +1,172 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - beforeCheck / onCheck</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<!--
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				selectedMulti: false
+			},
+			check: {
+				enable: true
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeCheck: beforeCheck,
+				onCheck: onCheck
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"随意勾选 1", open:true},
+			{ id:11, pId:1, name:"随意勾选 1-1"},
+			{ id:12, pId:1, name:"随意勾选 1-2", open:true},
+			{ id:121, pId:12, name:"随意勾选 1-2-1"},
+			{ id:122, pId:12, name:"随意勾选 1-2-2"},
+			{ id:2, pId:0, name:"禁止勾选 2", open:true, doCheck:false},
+			{ id:21, pId:2, name:"禁止勾选 2-1", doCheck:false},
+			{ id:22, pId:2, name:"禁止勾选 2-2", checked:true, open:true, doCheck:false},
+			{ id:221, pId:22, name:"禁止勾选 2-2-1", doCheck:false},
+			{ id:222, pId:22, name:"禁止勾选 2-2-2", checked:true, doCheck:false},
+			{ id:23, pId:2, name:"禁止勾选 2-3", doCheck:false}
+		];
+		
+		var code, log, className = "dark";
+		function beforeCheck(treeId, treeNode) {
+			className = (className === "dark" ? "":"dark");
+			showLog("[ "+getTime()+" beforeCheck ]&nbsp;&nbsp;&nbsp;&nbsp;" + treeNode.name );
+			return (treeNode.doCheck !== false);
+		}
+		function onCheck(e, treeId, treeNode) {
+			showLog("[ "+getTime()+" onCheck ]&nbsp;&nbsp;&nbsp;&nbsp;" + treeNode.name );
+		}		
+		function showLog(str) {
+			if (!log) log = $("#log");
+			log.append("<li class='"+className+"'>"+str+"</li>");
+			if(log.children("li").length > 6) {
+				log.get(0).removeChild(log.children("li")[0]);
+			}
+		}
+		function getTime() {
+			var now= new Date(),
+			h=now.getHours(),
+			m=now.getMinutes(),
+			s=now.getSeconds(),
+			ms=now.getMilliseconds();
+			return (h+":"+m+":"+s+ " " +ms);
+		}
+
+		function checkNode(e) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			type = e.data.type,
+			nodes = zTree.getSelectedNodes();
+			if (type.indexOf("All")<0 && nodes.length == 0) {
+				alert("请先选择一个节点");
+			}
+
+			if (type == "checkAllTrue") {
+				zTree.checkAllNodes(true);
+			} else if (type == "checkAllFalse") {
+				zTree.checkAllNodes(false);
+			} else {
+				var callbackFlag = $("#callbackTrigger").attr("checked");
+				for (var i=0, l=nodes.length; i<l; i++) {
+					if (type == "checkTrue") {
+						zTree.checkNode(nodes[i], true, false, callbackFlag);
+					} else if (type == "checkFalse") {
+						zTree.checkNode(nodes[i], false, false, callbackFlag);
+					} else if (type == "toggle") {
+						zTree.checkNode(nodes[i], null, false, callbackFlag);
+					}else if (type == "checkTruePS") {
+						zTree.checkNode(nodes[i], true, true, callbackFlag);
+					} else if (type == "checkFalsePS") {
+						zTree.checkNode(nodes[i], false, true, callbackFlag);
+					} else if (type == "togglePS") {
+						zTree.checkNode(nodes[i], null, true, callbackFlag);
+					}
+				}
+			}
+		}
+
+		function setAutoTrigger(e) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			zTree.setting.check.autoCheckTrigger = $("#autoCallbackTrigger").attr("checked");
+			$("#autoCheckTriggerValue").html(zTree.setting.check.autoCheckTrigger ? "true" : "false");
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			$("#checkTrue").bind("click", {type:"checkTrue"}, checkNode);
+			$("#checkFalse").bind("click", {type:"checkFalse"}, checkNode);
+			$("#toggle").bind("click", {type:"toggle"}, checkNode);
+			$("#checkTruePS").bind("click", {type:"checkTruePS"}, checkNode);
+			$("#checkFalsePS").bind("click", {type:"checkFalsePS"}, checkNode);
+			$("#togglePS").bind("click", {type:"togglePS"}, checkNode);
+			$("#checkAllTrue").bind("click", {type:"checkAllTrue"}, checkNode);
+			$("#checkAllFalse").bind("click", {type:"checkAllFalse"}, checkNode);
+
+			$("#autoCallbackTrigger").bind("change", {}, setAutoTrigger);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>用 zTree 方法 勾选 checkbox</h1>
+<h6>[ 文件路径: excheck/checkbox_fun.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、beforeCheck / onCheck 事件回调函数控制</h2>
+				<ul class="list">
+				<li>利用 beforeCheck / onCheck 事件回调函数 可以控制是否允许 更改 节点勾选状态，这里简单演示如何监控此事件</li>
+				<li><p>这里还演示了 checkNode / checkAllNodes 方法触发 beforeCheck / onCheck 事件回调函数的情况，试试看：<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" id="autoCallbackTrigger" /> setting.check.autoCheckTrigger: <span id="autoCheckTriggerValue">false</span><br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" id="callbackTrigger" checked /> 执行勾选方法是否触发 callback <br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;单节点--[ <a id="checkTrue" href="#" title="不想勾选我就不勾选你..." onclick="return false;">勾选</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="checkFalse" href="#" title="不想取消勾选我就不取消你..." onclick="return false;">取消勾选</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="toggle" href="#" title="你想怎样？..." onclick="return false;">勾选 切换</a> ]<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;单节点 ( 影响父子 )--[ <a id="checkTruePS" href="#" title="不想勾选我就不勾选你..." onclick="return false;">勾选</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="checkFalsePS" href="#" title="不想取消勾选我就不取消你..." onclick="return false;">取消勾选</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="togglePS" href="#" title="你想怎样？..." onclick="return false;">勾选 切换</a> ]<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;全部节点--[ <a id="checkAllTrue" href="#" title="不管你有多NB，统统都要听我的！！" onclick="return false;">勾选</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="checkAllFalse" href="#" title="不管你有多NB，统统都要听我的！！" onclick="return false;">取消勾选</a> ]</p>
+				</li>
+				<li><p><span class="highlight_red">使用 zTreeObj.checkNode / checkAllNodes 方法，详细请参见 API 文档中的相关内容</span><br/>
+					beforeCheck / onCheck log:<br/>
+					<ul id="log" class="log" style="height:130px;"></ul></p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、setting 配置信息说明</h2>
+				<ul class="list">
+				<li>同 "checkbox 勾选操作" 中的说明</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li>同 "checkbox 勾选操作" 中的说明</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/excheck/checkbox_halfCheck.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/excheck/checkbox_halfCheck.html
new file mode 100644
index 0000000..21de1e0
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/excheck/checkbox_halfCheck.html
@@ -0,0 +1,108 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - Checkbox halfCheck</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<!--
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			async: {
+				enable: true,
+				url:"../asyncData/getNodes.php",
+				autoParam:["id", "name=n", "level=lv"],
+				otherParam:{"chk":"chk"},
+				dataFilter: dataFilter
+			},
+			check: {
+				enable: true,
+				autoCheckTrigger: true
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				onCheck: onCheck,
+				onAsyncSuccess: onAsyncSuccess
+			}
+		};
+
+		function dataFilter(treeId, parentNode, childNodes) {
+			if (parentNode.checkedEx === true) {
+				for(var i=0, l=childNodes.length; i<l; i++) {
+					childNodes[i].checked = parentNode.checked;
+					childNodes[i].halfCheck = false;
+					childNodes[i].checkedEx = true;
+				}
+			}
+			return childNodes;
+		}
+		function onCheck(event, treeId, treeNode) {
+			cancelHalf(treeNode)
+			treeNode.checkedEx = true;
+		}
+		function onAsyncSuccess(event, treeId, treeNode, msg) {
+			cancelHalf(treeNode);
+		}
+		function cancelHalf(treeNode) {
+			if (treeNode.checkedEx) return;
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			treeNode.halfCheck = false;
+			zTree.updateNode(treeNode);			
+		}
+
+		var zNodes =[
+			{ id:1, pId:0, name:"半勾选 1", halfCheck:true, isParent:true},
+			{ id:2, pId:0, name:"半勾选 2", halfCheck:true, checked:true, isParent:true},
+			{ id:3, pId:0, name:"随意勾选 3", checked:true, isParent:true}
+		];
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Checkbox halfCheck 演示</h1>
+<h6>[ 文件路径: excheck/checkbox_halfCheck.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、演示说明</h2>
+				<ul class="list">
+				<li>这个演示式实现了 异步加载模式 下简单的勾选操作</li>
+				<li class="highlight_red">1)、加载子节点后，父节点的 halfCheck 立刻失效</li>
+				<li class="highlight_red">2)、勾选父节点，可以影响之后加载的子节点的勾选状态</li>
+				<li class="highlight_red">3)、勾选父节点，可以让其子节点的 halfCheck 属性失效</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、setting 配置信息说明</h2>
+				<ul class="list">
+				<li>实现半勾选功能，不需要配置任何参数。但半勾选功能属于辅助功能，无法单独使用，因此也需要根据自己的需求配置特定参数。</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li class="highlight_red">1)、请在节点初始化之前，设置 treeNode.halfCheck 属性，详细请参见 API 文档中的相关内容</li>
+				<li>2)、其他请参考 ‘Checkbox 勾选操作’</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/excheck/checkbox_nocheck.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/excheck/checkbox_nocheck.html
new file mode 100644
index 0000000..5e99015
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/excheck/checkbox_nocheck.html
@@ -0,0 +1,96 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - no checkbox</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<!--
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			check: {
+				enable: true,
+				nocheckInherit: true
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"随意勾选 1", open:true},
+			{ id:11, pId:1, name:"随意勾选 1-1", open:true},
+			{ id:111, pId:11, name:"无 checkbox 1-1-1", nocheck:true},
+			{ id:112, pId:11, name:"随意勾选 1-1-2"},
+			{ id:12, pId:1, name:"无 checkbox 1-2", nocheck:true, open:true},
+			{ id:121, pId:12, name:"无 checkbox 1-2-1"},
+			{ id:122, pId:12, name:"无 checkbox 1-2-2"},
+			{ id:2, pId:0, name:"随意勾选 2", checked:true, open:true},
+			{ id:21, pId:2, name:"随意勾选 2-1"},
+			{ id:22, pId:2, name:"随意勾选 2-2", open:true},
+			{ id:221, pId:22, name:"随意勾选 2-2-1", checked:true},
+			{ id:222, pId:22, name:"随意勾选 2-2-2"},
+			{ id:23, pId:2, name:"随意勾选 2-3"}
+		];
+
+		function nocheckNode(e) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nocheck = e.data.nocheck,
+			nodes = zTree.getSelectedNodes();
+			if (nodes.length == 0) {
+				alert("请先选择一个节点");
+			}
+
+			for (var i=0, l=nodes.length; i<l; i++) {
+				nodes[i].nocheck = nocheck;
+				zTree.updateNode(nodes[i]);
+			}
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			$("#nocheckTrue").bind("click", {nocheck: true}, nocheckNode);
+			$("#nocheckFalse").bind("click", {nocheck: false}, nocheckNode);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Checkbox nocheck 演示</h1>
+<h6>[ 文件路径: excheck/checkbox_nocheck.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、setting 配置信息说明</h2>
+				<ul class="list">
+				<li>这个 Demo 只简单演示 nocheck 的使用方法，详细配置信息请参考 ‘Checkbox 勾选操作’</li>
+				<li class="highlight_red">setting.check.nocheckInherit 可以设置子节点自动继承父节点的 nocheck 属性，详细请参见 API 文档中的相关内容</li>
+				<li><p>试试看：<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="nocheckTrue" href="#" title="set checkbox to be hidden." onclick="return false;">隐藏</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="nocheckFalse" href="#" title="set checkbox to be show." onclick="return false;">显示</a> ]
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li class="highlight_red">1)、如果某节点不显示 checkbox，请设置 treeNode.nocheck 属性，详细请参见 API 文档中的相关内容</li>
+				<li>2)、其他请参考 ‘Checkbox 勾选操作’</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/excheck/radio.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/excheck/radio.html
new file mode 100644
index 0000000..9cd589a
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/excheck/radio.html
@@ -0,0 +1,97 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - radio</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<!--
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			check: {
+				enable: true,
+				chkStyle: "radio",
+				radioType: "level"
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"随意勾选 1", open:true},
+			{ id:11, pId:1, name:"随意勾选 1-1", open:true},
+			{ id:111, pId:11, name:"随意勾选 1-1-1"},
+			{ id:112, pId:11, name:"随意勾选 1-1-2"},
+			{ id:12, pId:1, name:"随意勾选 1-2", open:true},
+			{ id:121, pId:12, name:"随意勾选 1-2-1"},
+			{ id:122, pId:12, name:"随意勾选 1-2-2"},
+			{ id:2, pId:0, name:"随意勾选 2", open:true},
+			{ id:21, pId:2, name:"随意勾选 2-1"},
+			{ id:22, pId:2, name:"随意勾选 2-2", open:true},
+			{ id:221, pId:22, name:"随意勾选 2-2-1", checked:true},
+			{ id:222, pId:22, name:"随意勾选 2-2-2"},
+			{ id:23, pId:2, name:"随意勾选 2-3"}
+		];
+		
+		var code;		
+		function setCheck() {
+			var type = $("#level").attr("checked")? "level":"all";
+			setting.check.radioType = type;
+			showCode('setting.check.radioType = "' + type + '";');
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		}
+		function showCode(str) {
+			if (!code) code = $("#code");
+			code.empty();
+			code.append("<li>"+str+"</li>");
+		}
+		
+		$(document).ready(function(){
+			setCheck();			
+			$("#level").bind("change", setCheck);
+			$("#all").bind("change", setCheck);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Radio 勾选操作</h1>
+<h6>[ 文件路径: excheck/radio.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、setting 配置信息说明</h2>
+				<ul class="list">
+				<li class="highlight_red">使用 radio，必须设置 setting.check 中的各个属性，详细请参见 API 文档中的相关内容</li>
+				<li><p>radio 分组范围：<input type="radio" id="level" class="radio first" name="radioGroup" checked /><span>同一级内</span>
+						<input type="radio" id="all" class="radio" name="radioGroup"/><span>整棵树内</span><br/>
+						<ul id="code" class="log" style="height:20px;"></ul></p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li class="highlight_red">1)、如果需要初始化默认节点被勾选，请设置 treeNode.checked 属性，详细请参见 API 文档中的相关内容</li>
+				<li class="highlight_red">2)、如果某节点不显示 radio，请设置 treeNode.nocheck 属性，详细请参见 API 文档中的相关内容</li>
+				<li class="highlight_red">3)、如果更换 checked 属性，请参考 API 文档中 setting.data.key.checked 的详细说明</li>
+				<li>4)、其他请参考 API 文档中 treeNode.checkedOld / getCheckStatus / check_Child_State / check_Focus 的详细说明</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/excheck/radio_chkDisabled.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/excheck/radio_chkDisabled.html
new file mode 100644
index 0000000..6d330f3
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/excheck/radio_chkDisabled.html
@@ -0,0 +1,101 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - Radio chkDisabled</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<!--
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			check: {
+				enable: true,
+				chkStyle: "radio",
+				radioType: "level"
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"随意勾选 1", open:true},
+			{ id:11, pId:1, name:"随意勾选 1-1", open:true},
+			{ id:111, pId:11, name:"disabled 1-1-1", chkDisabled:true, checked:true},
+			{ id:112, pId:11, name:"随意勾选 1-1-2"},
+			{ id:12, pId:1, name:"disabled 1-2", chkDisabled:true, open:true},
+			{ id:121, pId:12, name:"disabled 1-2-1", checked:true},
+			{ id:122, pId:12, name:"disabled 1-2-2"},
+			{ id:2, pId:0, name:"随意勾选 2", checked:true, open:true},
+			{ id:21, pId:2, name:"随意勾选 2-1"},
+			{ id:22, pId:2, name:"随意勾选 2-2", open:true},
+			{ id:221, pId:22, name:"随意勾选 2-2-1", checked:true},
+			{ id:222, pId:22, name:"随意勾选 2-2-2"},
+			{ id:23, pId:2, name:"随意勾选 2-3"}
+		];
+		
+		function disabledNode(e) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			disabled = e.data.disabled,
+			nodes = zTree.getSelectedNodes();
+			if (nodes.length == 0) {
+				alert("请先选择一个节点");
+			}
+
+			for (var i=0, l=nodes.length; i<l; i++) {
+				zTree.setChkDisabled(nodes[i], disabled);
+			}
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			$("#disabledTrue").bind("click", {disabled: true}, disabledNode);
+			$("#disabledFalse").bind("click", {disabled: false}, disabledNode);
+
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Radio chkDisabled 演示</h1>
+<h6>[ 文件路径: excheck/radio_chkDisabled.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、setChkDisabled 方法操作说明</h2>
+				<ul class="list">
+				<li>setChkDisabled 方法可以设置节点 checkbox / radio 禁用 或 取消禁用，详细请参见 API 文档中的相关内容</li>
+				<li><p>试试看：<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="disabledTrue" href="#" title="set checkbox to be disabled." onclick="return false;">禁用</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="disabledFalse" href="#" title="set checkbox to be abled." onclick="return false;">取消禁用</a> ]</p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、setting 配置信息说明</h2>
+				<ul class="list">
+				<li>这个 Demo 只简单演示 chkDisabled 的使用方法，详细配置信息请参考 ‘Radio 勾选操作’</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li class="highlight_red">1)、如果某节点不显示 radio，请设置 treeNode.chkDisabled 属性，详细请参见 API 文档中的相关内容</li>
+				<li>2)、其他请参考 ‘Radio 勾选操作’</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/excheck/radio_fun.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/excheck/radio_fun.html
new file mode 100644
index 0000000..b9b5240
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/excheck/radio_fun.html
@@ -0,0 +1,151 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - beforeCheck / onCheck</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<!--
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				selectedMulti: false
+			},
+			check: {
+				enable: true,
+				chkStyle: "radio",
+				radioType: "level"
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeCheck: beforeCheck,
+				onCheck: onCheck
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"随意勾选 1", open:true},
+			{ id:11, pId:1, name:"无 radio 1-1", nocheck:true},
+			{ id:12, pId:1, name:"随意勾选 1-2", open:true},
+			{ id:121, pId:12, name:"随意勾选 1-2-1"},
+			{ id:122, pId:12, name:"随意勾选 1-2-2"},
+			{ id:123, pId:12, name:"无 radio 1-2-3", nocheck:true},
+			{ id:13, pId:1, name:"随意勾选 1-3"},
+			{ id:2, pId:0, name:"禁止勾选 2", open:true, doCheck:false},
+			{ id:21, pId:2, name:"禁止勾选 2-1", doCheck:false},
+			{ id:22, pId:2, name:"禁止勾选 2-2", checked:true, open:true, doCheck:false},
+			{ id:221, pId:22, name:"禁止勾选 2-2-1", doCheck:false},
+			{ id:222, pId:22, name:"禁止勾选 2-2-2", checked:true, doCheck:false},
+			{ id:223, pId:22, name:"禁止勾选 2-2-3", doCheck:false},
+			{ id:23, pId:2, name:"禁止勾选 2-3", doCheck:false}
+		];
+		
+		var code, log, className = "dark";
+		function beforeCheck(treeId, treeNode) {
+			className = (className === "dark" ? "":"dark");
+			showLog("[ "+getTime()+" beforeCheck ]&nbsp;&nbsp;&nbsp;&nbsp;" + treeNode.name );
+			return (treeNode.doCheck !== false);
+		}
+		function onCheck(e, treeId, treeNode) {
+			showLog("[ "+getTime()+" onCheck ]&nbsp;&nbsp;&nbsp;&nbsp;" + treeNode.name );
+		}		
+		function showLog(str) {
+			if (!log) log = $("#log");
+			log.append("<li class='"+className+"'>"+str+"</li>");
+			if(log.children("li").length > 6) {
+				log.get(0).removeChild(log.children("li")[0]);
+			}
+		}
+		function getTime() {
+			var now= new Date(),
+			h=now.getHours(),
+			m=now.getMinutes(),
+			s=now.getSeconds(),
+			ms=now.getMilliseconds();
+			return (h+":"+m+":"+s+ " " +ms);
+		}
+
+		function checkNode(e) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			type = e.data.type,
+			nodes = zTree.getSelectedNodes();
+			if (type.indexOf("All")<0 && nodes.length == 0) {
+				alert("请先选择一个节点");
+			}
+
+			if (type == "checkAllTrue") {
+				zTree.checkAllNodes(true);
+			} else if (type == "checkAllFalse") {
+				zTree.checkAllNodes(false);
+			} else {
+				var callbackFlag = $("#callbackTrigger").attr("checked");
+				for (var i=0, l=nodes.length; i<l; i++) {
+					if (type == "checkTrue") {
+						zTree.checkNode(nodes[i], true, null, callbackFlag);
+					} else if (type == "checkFalse") {
+						zTree.checkNode(nodes[i], false, null, callbackFlag);
+					}else if (type == "checkTruePS") {
+						zTree.checkNode(nodes[i], true, true, callbackFlag);
+					} else if (type == "checkFalsePS") {
+						zTree.checkNode(nodes[i], false, true, callbackFlag);
+					}
+				}
+			}
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			$("#checkTrue").bind("click", {type:"checkTrue"}, checkNode);
+			$("#checkFalse").bind("click", {type:"checkFalse"}, checkNode);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>用 zTree 方法 勾选 radio</h1>
+<h6>[ 文件路径: excheck/radio_fun.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、beforeCheck / onCheck 事件回调函数控制</h2>
+				<ul class="list">
+				<li>利用 beforeCheck / onCheck 事件回调函数 可以控制是否允许 更改 节点勾选状态，这里简单演示如何监控此事件</li>
+				<li><p>试试看：<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" id="callbackTrigger" checked /> checkNode 方法是否触发 callback<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="checkTrue" href="#" title="不想勾选我就不勾选你..." onclick="return false;">勾选</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="checkFalse" href="#" title="不想取消勾选我就不取消你..." onclick="return false;">取消勾选</a> ]</p>
+				<li><p><span class="highlight_red">使用 zTreeObj.checkNode 方法，详细请参见 API 文档中的相关内容</span><br/>
+					beforeCheck / onCheck log:<br/>
+					<ul id="log" class="log" style="height:130px;"></ul></p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、setting 配置信息说明</h2>
+				<ul class="list">
+				<li>同 "radio 勾选操作" 中的说明</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li>同 "radio 勾选操作" 中的说明</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/excheck/radio_halfCheck.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/excheck/radio_halfCheck.html
new file mode 100644
index 0000000..91f25cf
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/excheck/radio_halfCheck.html
@@ -0,0 +1,93 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - Radio halfCheck</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<!--
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			async: {
+				enable: true,
+				url:"../asyncData/getNodes.php",
+				autoParam:["id", "name=n", "level=lv"],
+				otherParam:{"chk":"chk"}
+			},
+			check: {
+				enable: true,
+				autoCheckTrigger: true,
+				chkStyle: "radio",
+				radioType: "level"
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				onAsyncSuccess: onAsyncSuccess
+			}
+		};
+
+		function onAsyncSuccess(event, treeId, treeNode, msg) {
+			cancelHalf(treeNode);
+		}
+		function cancelHalf(treeNode) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			treeNode.halfCheck = false;
+			zTree.updateNode(treeNode);			
+		}
+
+		var zNodes =[
+			{ id:1, pId:0, name:"半勾选 1", halfCheck:true, isParent:true},
+			{ id:2, pId:0, name:"半勾选 2", halfCheck:true, checked:true, isParent:true},
+			{ id:3, pId:0, name:"随意勾选 3", isParent:true}
+		];
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Radio halfCheck 演示</h1>
+<h6>[ 文件路径: excheck/radio_halfCheck.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、演示说明</h2>
+				<ul class="list">
+				<li>这个演示式实现了 异步加载模式 下简单的勾选操作</li>
+				<li class="highlight_red">1)、加载子节点后，父节点的 halfCheck 立刻失效</li>
+				<li class="highlight_red">2)、勾选父节点，不会影响子节点的勾选状态</li>
+				<li class="highlight_red">3)、勾选父节点，不会让其子节点的 halfCheck 属性失效</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、setting 配置信息说明</h2>
+				<ul class="list">
+				<li>实现半勾选功能，不需要配置任何参数。但半勾选功能属于辅助功能，无法单独使用，因此也需要根据自己的需求配置特定参数。</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li class="highlight_red">1)、请在节点初始化之前，设置 treeNode.halfCheck 属性，详细请参见 API 文档中的相关内容</li>
+				<li>2)、其他请参考 ‘Radio 勾选操作’</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/excheck/radio_nocheck.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/excheck/radio_nocheck.html
new file mode 100644
index 0000000..cc648c1
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/excheck/radio_nocheck.html
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - no radio</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<!--
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			check: {
+				enable: true,
+				chkStyle: "radio",
+				radioType: "level"
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"随意勾选 1", open:true},
+			{ id:11, pId:1, name:"随意勾选 1-1", open:true},
+			{ id:111, pId:11, name:"无 radio 1-1-1", nocheck:true},
+			{ id:112, pId:11, name:"随意勾选 1-1-2"},
+			{ id:12, pId:1, name:"无 radio 1-2", nocheck:true, open:true},
+			{ id:121, pId:12, name:"无 radio 1-2-1"},
+			{ id:122, pId:12, name:"无 radio 1-2-2"},
+			{ id:2, pId:0, name:"随意勾选 2", checked:true, open:true},
+			{ id:21, pId:2, name:"随意勾选 2-1"},
+			{ id:22, pId:2, name:"随意勾选 2-2", open:true},
+			{ id:221, pId:22, name:"随意勾选 2-2-1", checked:true},
+			{ id:222, pId:22, name:"随意勾选 2-2-2"},
+			{ id:23, pId:2, name:"随意勾选 2-3"}
+		];
+		
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Radio nocheck 演示</h1>
+<h6>[ 文件路径: excheck/radio_nocheck.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、setting 配置信息说明</h2>
+				<ul class="list">
+				<li>这个 Demo 只简单演示 nocheck 的使用方法，详细配置信息请参考 ‘Radio 勾选操作’</li>
+				<li class="highlight_red">setting.check.nocheckInherit 可以设置子节点自动继承父节点的 nocheck 属性，详细请参见 API 文档中的相关内容</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li class="highlight_red">1)、如果某节点不显示 radio，请设置 treeNode.nocheck 属性，详细请参见 API 文档中的相关内容</li>
+				<li>2)、其他请参考 ‘Radio 勾选操作’</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/exedit/async_edit.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/exedit/async_edit.html
new file mode 100644
index 0000000..eb577fb
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/exedit/async_edit.html
@@ -0,0 +1,120 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - async & edit</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			async: {
+				enable: true,
+				url:"../asyncData/getNodes.php",
+				autoParam:["id", "name=n", "level=lv"],
+				otherParam:{"otherParam":"zTreeAsyncTest"},
+				dataFilter: filter
+			},
+			view: {expandSpeed:"",
+				addHoverDom: addHoverDom,
+				removeHoverDom: removeHoverDom,
+				selectedMulti: false
+			},
+			edit: {
+				enable: true
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeRemove: beforeRemove,
+				beforeRename: beforeRename
+			}
+		};
+
+		function filter(treeId, parentNode, childNodes) {
+			if (!childNodes) return null;
+			for (var i=0, l=childNodes.length; i<l; i++) {
+				childNodes[i].name = childNodes[i].name.replace(/\.n/g, '.');
+			}
+			return childNodes;
+		}
+		function beforeRemove(treeId, treeNode) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			zTree.selectNode(treeNode);
+			return confirm("确认删除 节点 -- " + treeNode.name + " 吗？");
+		}		
+		function beforeRename(treeId, treeNode, newName) {
+			if (newName.length == 0) {
+				alert("节点名称不能为空.");
+				return false;
+			}
+			return true;
+		}
+
+		var newCount = 1;
+		function addHoverDom(treeId, treeNode) {
+			var sObj = $("#" + treeNode.tId + "_span");
+			if (treeNode.editNameFlag || $("#addBtn_"+treeNode.tId).length>0) return;
+			var addStr = "<span class='button add' id='addBtn_" + treeNode.tId
+				+ "' title='add node' onfocus='this.blur();'></span>";
+			sObj.after(addStr);
+			var btn = $("#addBtn_"+treeNode.tId);
+			if (btn) btn.bind("click", function(){
+				var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+				zTree.addNodes(treeNode, {id:(100 + newCount), pId:treeNode.id, name:"new node" + (newCount++)});
+				return false;
+			});
+		};
+		function removeHoverDom(treeId, treeNode) {
+			$("#addBtn_"+treeNode.tId).unbind().remove();
+		};
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting);
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+.ztree li span.button.add {margin-left:2px; margin-right: -1px; background-position:-144px 0; vertical-align:top; *vertical-align:middle}
+	</style>
+</HEAD>
+
+<BODY>
+<h1>异步加载 & 编辑功能 共存</h1>
+<h6>[ 文件路径: exedit/async_edit.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、异步加载 & 编辑功能 共存说明</h2>
+				<ul class="list">
+				<li>1)、此 Demo 是基于 "高级 增 / 删 / 改 节点" 修改的，并且开放了拖拽功能，可与其进行对比</li>
+				<li>2)、只需要同时开启编辑模式和异步加载模式即可实现共存</li>
+				<li class="highlight_red">3)、zTree 完善了异步加载模式下的编辑功能，对于未加载子节点的父节点，增加子节点时，会首先进行异步加载。</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、setting 配置信息说明</h2>
+				<ul class="list">
+				<li class="highlight_red">1)、使用 编辑功能，请参考 "拖拽节点基本控制" 和 "基本 增 / 删 / 改 节点" Demo 中关于 setting 的配置要求</li>
+				<li class="highlight_red">2)、使用 异步加载功能，请参考 "异步加载 节点数据" Demo 中关于 setting 的配置要求</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li>两种模式共存，对数据无特殊要求，请分别参考 "异步加载 节点数据" & "拖拽 节点 基本控制" & "基本 增 / 删 / 改 节点" 中的相关说明</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/exedit/drag.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/exedit/drag.html
new file mode 100644
index 0000000..a19da79
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/exedit/drag.html
@@ -0,0 +1,136 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - drag & drop</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			edit: {
+				enable: true,
+				showRemoveBtn: false,
+				showRenameBtn: false
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeDrag: beforeDrag,
+				beforeDrop: beforeDrop
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"随意拖拽 1", open:true},
+			{ id:11, pId:1, name:"随意拖拽 1-1"},
+			{ id:12, pId:1, name:"随意拖拽 1-2", open:true},
+			{ id:121, pId:12, name:"随意拖拽 1-2-1"},
+			{ id:122, pId:12, name:"随意拖拽 1-2-2"},
+			{ id:123, pId:12, name:"随意拖拽 1-2-3"},
+			{ id:13, pId:1, name:"禁止拖拽 1-3", open:true, drag:false},
+			{ id:131, pId:13, name:"禁止拖拽 1-3-1", drag:false},
+			{ id:132, pId:13, name:"禁止拖拽 1-3-2", drag:false},
+			{ id:133, pId:13, name:"随意拖拽 1-3-3"},
+			{ id:2, pId:0, name:"随意拖拽 2", open:true},
+			{ id:21, pId:2, name:"随意拖拽 2-1"},
+			{ id:22, pId:2, name:"禁止拖拽到我身上 2-2", open:true, drop:false},
+			{ id:221, pId:22, name:"随意拖拽 2-2-1"},
+			{ id:222, pId:22, name:"随意拖拽 2-2-2"},
+			{ id:223, pId:22, name:"随意拖拽 2-2-3"},
+			{ id:23, pId:2, name:"随意拖拽 2-3"}
+		];
+
+		function beforeDrag(treeId, treeNodes) {
+			for (var i=0,l=treeNodes.length; i<l; i++) {
+				if (treeNodes[i].drag === false) {
+					return false;
+				}
+			}
+			return true;
+		}
+		function beforeDrop(treeId, treeNodes, targetNode, moveType) {
+			return targetNode ? targetNode.drop !== false : true;
+		}
+		
+		function setCheck() {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			isCopy = $("#copy").attr("checked"),
+			isMove = $("#move").attr("checked"),
+			prev = $("#prev").attr("checked"),
+			inner = $("#inner").attr("checked"),
+			next = $("#next").attr("checked");
+			zTree.setting.edit.drag.isCopy = isCopy;
+			zTree.setting.edit.drag.isMove = isMove;
+			showCode(1, ['setting.edit.drag.isCopy = ' + isCopy, 'setting.edit.drag.isMove = ' + isMove]);
+
+			zTree.setting.edit.drag.prev = prev;
+			zTree.setting.edit.drag.inner = inner;
+			zTree.setting.edit.drag.next = next;
+			showCode(2, ['setting.edit.drag.prev = ' + prev, 'setting.edit.drag.inner = ' + inner, 'setting.edit.drag.next = ' + next]);
+		}
+		function showCode(id, str) {
+			var code = $("#code" + id);
+			code.empty();
+			for (var i=0, l=str.length; i<l; i++) {
+				code.append("<li>"+str[i]+"</li>");
+			}
+		}
+		
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			setCheck();
+			$("#copy").bind("change", setCheck);
+			$("#move").bind("change", setCheck);
+			$("#prev").bind("change", setCheck);
+			$("#inner").bind("change", setCheck);
+			$("#next").bind("change", setCheck);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>拖拽节点基本控制</h1>
+<h6>[ 文件路径: exedit/drag.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、setting 配置信息说明</h2>
+				<ul class="list">
+				<li>此 Demo 仅从功能上演示实现拖拽的基本方法和配置参数</li>
+				<li class="highlight_red">1)、使用 拖拽功能，必须设置 setting.edit 中的各个属性，详细请参见 API 文档中的相关内容</li>
+				<li class="highlight_red">2)、使用 拖拽功能的事件回调函数，必须设置 setting.callback.beforeDrag / onDrag / beforeDrop / onDrop 等属性，详细请参见 API 文档中的相关内容</li>
+				<li><p>基本拖拽设置：<br/>
+						<input type="checkbox" id="copy" class="checkbox first" checked /><span>允许复制</span>
+						<input type="checkbox" id="move" class="checkbox " checked /><span>允许移动</span><br/>
+						<ul id="code1" class="log" style="height:42px;"></ul></p>
+				</li>
+				<li><p>拖拽相对位置设置：<br/>
+						<input type="checkbox" id="prev" class="checkbox first" checked /><span>prev</span>
+						<input type="checkbox" id="inner" class="checkbox " checked /><span>inner</span>
+						<input type="checkbox" id="next" class="checkbox " checked /><span>next</span><br/>
+						<ul id="code2" class="log" style="height:65px;"></ul></p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li>对 节点数据 没有特殊要求，用户可以根据自己的需求添加自定义属性</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/exedit/drag_fun.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/exedit/drag_fun.html
new file mode 100644
index 0000000..963068d
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/exedit/drag_fun.html
@@ -0,0 +1,180 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - copyNode / moveNode</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				selectedMulti: false
+			},
+			edit: {
+				enable: true,
+				showRemoveBtn: false,
+				showRenameBtn: false
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeDrag: beforeDrag,
+				beforeClick: beforeClick
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"父节点 1", open:true},
+			{ id:11, pId:1, name:"叶子节点 1-1"},
+			{ id:12, pId:1, name:"叶子节点 1-2"},
+			{ id:13, pId:1, name:"叶子节点 1-3"},
+			{ id:2, pId:0, name:"父节点 2", open:true},
+			{ id:21, pId:2, name:"叶子节点 2-1"},
+			{ id:22, pId:2, name:"叶子节点 2-2"},
+			{ id:23, pId:2, name:"叶子节点 2-3"},
+			{ id:3, pId:0, name:"父节点 3", open:true },
+			{ id:31, pId:3, name:"叶子节点 3-1"},
+			{ id:32, pId:3, name:"叶子节点 3-2"},
+			{ id:33, pId:3, name:"叶子节点 3-3"}
+		];
+
+		function fontCss(treeNode) {
+			var aObj = $("#" + treeNode.tId + "_a");
+			aObj.removeClass("copy").removeClass("cut");
+			if (treeNode === curSrcNode) {
+				if (curType == "copy") {
+					aObj.addClass(curType);
+				} else {
+					aObj.addClass(curType);
+				}			
+			}
+		}
+
+		function beforeDrag(treeId, treeNodes) {
+			return false;
+		}
+
+		function beforeClick(treeId, treeNode) {
+			return !treeNode.isCur;
+		}
+
+		var curSrcNode, curType;
+		function setCurSrcNode(treeNode) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			if (curSrcNode) {
+				delete curSrcNode.isCur;
+				var tmpNode = curSrcNode;
+				curSrcNode = null;
+				fontCss(tmpNode);
+			}
+			curSrcNode = treeNode;
+			if (!treeNode) return;
+
+			curSrcNode.isCur = true;			
+			zTree.cancelSelectedNode();
+			fontCss(curSrcNode);
+		}
+		function copy(e) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nodes = zTree.getSelectedNodes();
+			if (nodes.length == 0) {
+				alert("请先选择一个节点");
+				return;
+			}
+			curType = "copy";
+			setCurSrcNode(nodes[0]);
+		}
+		function cut(e) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nodes = zTree.getSelectedNodes();
+			if (nodes.length == 0) {
+				alert("请先选择一个节点");
+				return;
+			}
+			curType = "cut";
+			setCurSrcNode(nodes[0]);
+		}
+		function paste(e) {
+			if (!curSrcNode) {
+				alert("请先选择一个节点进行 复制 / 剪切");
+				return;
+			}
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nodes = zTree.getSelectedNodes(),
+			targetNode = nodes.length>0? nodes[0]:null;
+			if (curSrcNode === targetNode) {
+				alert("不能移动，源节点 与 目标节点相同");
+				return;
+			} else if (curType === "cut" && ((!!targetNode && curSrcNode.parentTId === targetNode.tId) || (!targetNode && !curSrcNode.parentTId))) {
+				alert("不能移动，源节点 已经存在于 目标节点中");
+				return;
+			} else if (curType === "copy") {
+				targetNode = zTree.copyNode(targetNode, curSrcNode, "inner");
+			} else if (curType === "cut") {
+				targetNode = zTree.moveNode(targetNode, curSrcNode, "inner");
+				if (!targetNode) {
+					alert("剪切失败，源节点是目标节点的父节点");
+				}
+				targetNode = curSrcNode;
+			}
+			setCurSrcNode();
+			delete targetNode.isCur;
+			zTree.selectNode(targetNode);
+		}
+		
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			$("#copy").bind("click", copy);
+			$("#cut").bind("click", cut);
+			$("#paste").bind("click", paste);
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+.ztree li a.copy{padding-top:0; background-color:#316AC5; color:white; border:1px #316AC5 solid;}
+.ztree li a.cut{padding-top:0; background-color:silver; color:#111; border:1px #316AC5 dotted;}
+	</style>
+</HEAD>
+
+<BODY>
+<h1>用 zTree 方法 移动 / 复制节点</h1>
+<h6>[ 文件路径: exedit/drag_fun.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、copyNode / moveNode 方法操作说明</h2>
+				<ul class="list">
+				<li>利用 copyNode / moveNode 方法也可以实现 复制 / 移动 节点的目的，这里简单演示使用方法</li>
+				<li><p>对节点进行 复制 / 剪切，试试看：<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="copy" href="#" title="复制" onclick="return false;">复制</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="cut" href="#" title="剪切" onclick="return false;">剪切</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="paste" href="#" title="粘贴" onclick="return false;">粘贴</a> ]</p>
+				<li class="highlight_red">使用 zTreeObj.copyNode / moveNode 方法，详细请参见 API 文档中的相关内容</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、setting 配置信息说明</h2>
+				<ul class="list">
+				<li>同 "拖拽 节点 基本控制"</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li>同 "拖拽 节点 基本控制"</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/exedit/drag_super.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/exedit/drag_super.html
new file mode 100644
index 0000000..668746f
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/exedit/drag_super.html
@@ -0,0 +1,210 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - beforeDrag / onDrag / beforeDrop / onDrop</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			edit: {
+				drag: {
+					autoExpandTrigger: true,
+					prev: dropPrev,
+					inner: dropInner,
+					next: dropNext
+				},
+				enable: true,
+				showRemoveBtn: false,
+				showRenameBtn: false
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeDrag: beforeDrag,
+				beforeDrop: beforeDrop,
+				beforeDragOpen: beforeDragOpen,
+				onDrag: onDrag,
+				onDrop: onDrop,
+				onExpand: onExpand
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"随意拖拽 1", open:true},
+			{ id:11, pId:1, name:"随意拖拽 1-1"},
+			{ id:12, pId:1, name:"随意拖拽 1-2"},
+			{ id:121, pId:12, name:"随意拖拽 1-2-1"},
+			{ id:122, pId:12, name:"随意拖拽 1-2-2"},
+			{ id:123, pId:12, name:"随意拖拽 1-2-3"},
+			{ id:13, pId:1, name:"禁止拖拽 1-3", open:true, drag:false},
+			{ id:131, pId:13, name:"禁止拖拽 1-3-1", drag:false},
+			{ id:132, pId:13, name:"禁止拖拽 1-3-2", drag:false},
+			{ id:132, pId:13, name:"禁止拖拽 1-3-3", drag:false},
+			{ id:2, pId:0, name:"禁止子节点移走 2", open:true, childOuter:false},
+			{ id:21, pId:2, name:"我不想成为父节点 2-1", dropInner:false},
+			{ id:22, pId:2, name:"我不要成为根节点 2-2", dropRoot:false},
+			{ id:23, pId:2, name:"拖拽试试看 2-3"},
+			{ id:3, pId:0, name:"禁止子节点排序/增加 3", open:true, childOrder:false, dropInner:false},
+			{ id:31, pId:3, name:"随意拖拽 3-1"},
+			{ id:32, pId:3, name:"随意拖拽 3-2"},
+			{ id:33, pId:3, name:"随意拖拽 3-3"}
+		];
+
+		function dropPrev(treeId, nodes, targetNode) {
+			var pNode = targetNode.getParentNode();
+			if (pNode && pNode.dropInner === false) {
+				return false;
+			} else {
+				for (var i=0,l=curDragNodes.length; i<l; i++) {
+					var curPNode = curDragNodes[i].getParentNode();
+					if (curPNode && curPNode !== targetNode.getParentNode() && curPNode.childOuter === false) {
+						return false;
+					}
+				}
+			}
+			return true;
+		}
+		function dropInner(treeId, nodes, targetNode) {
+			if (targetNode && targetNode.dropInner === false) {
+				return false;
+			} else {
+				for (var i=0,l=curDragNodes.length; i<l; i++) {
+					if (!targetNode && curDragNodes[i].dropRoot === false) {
+						return false;
+					} else if (curDragNodes[i].parentTId && curDragNodes[i].getParentNode() !== targetNode && curDragNodes[i].getParentNode().childOuter === false) {
+						return false;
+					}
+				}
+			}
+			return true;
+		}
+		function dropNext(treeId, nodes, targetNode) {
+			var pNode = targetNode.getParentNode();
+			if (pNode && pNode.dropInner === false) {
+				return false;
+			} else {
+				for (var i=0,l=curDragNodes.length; i<l; i++) {
+					var curPNode = curDragNodes[i].getParentNode();
+					if (curPNode && curPNode !== targetNode.getParentNode() && curPNode.childOuter === false) {
+						return false;
+					}
+				}
+			}
+			return true;
+		}
+
+		var log, className = "dark", curDragNodes, autoExpandNode;
+		function beforeDrag(treeId, treeNodes) {
+			className = (className === "dark" ? "":"dark");
+			showLog("[ "+getTime()+" beforeDrag ]&nbsp;&nbsp;&nbsp;&nbsp; drag: " + treeNodes.length + " nodes." );
+			for (var i=0,l=treeNodes.length; i<l; i++) {
+				if (treeNodes[i].drag === false) {
+					curDragNodes = null;
+					return false;
+				} else if (treeNodes[i].parentTId && treeNodes[i].getParentNode().childDrag === false) {
+					curDragNodes = null;
+					return false;
+				}
+			}
+			curDragNodes = treeNodes;
+			return true;
+		}
+		function beforeDragOpen(treeId, treeNode) {
+			autoExpandNode = treeNode;
+			return true;
+		}
+		function beforeDrop(treeId, treeNodes, targetNode, moveType, isCopy) {
+			className = (className === "dark" ? "":"dark");
+			showLog("[ "+getTime()+" beforeDrop ]&nbsp;&nbsp;&nbsp;&nbsp; moveType:" + moveType);
+			showLog("target: " + (targetNode ? targetNode.name : "root") + "  -- is "+ (isCopy==null? "cancel" : isCopy ? "copy" : "move"));
+			return true;
+		}
+		function onDrag(event, treeId, treeNodes) {
+			className = (className === "dark" ? "":"dark");
+			showLog("[ "+getTime()+" onDrag ]&nbsp;&nbsp;&nbsp;&nbsp; drag: " + treeNodes.length + " nodes." );
+		}
+		function onDrop(event, treeId, treeNodes, targetNode, moveType, isCopy) {
+			className = (className === "dark" ? "":"dark");
+			showLog("[ "+getTime()+" onDrop ]&nbsp;&nbsp;&nbsp;&nbsp; moveType:" + moveType);
+			showLog("target: " + (targetNode ? targetNode.name : "root") + "  -- is "+ (isCopy==null? "cancel" : isCopy ? "copy" : "move"))
+		}
+		function onExpand(event, treeId, treeNode) {
+			if (treeNode === autoExpandNode) {
+				className = (className === "dark" ? "":"dark");
+				showLog("[ "+getTime()+" onExpand ]&nbsp;&nbsp;&nbsp;&nbsp;" + treeNode.name);
+			}
+		}
+
+		function showLog(str) {
+			if (!log) log = $("#log");
+			log.append("<li class='"+className+"'>"+str+"</li>");
+			if(log.children("li").length > 8) {
+				log.get(0).removeChild(log.children("li")[0]);
+			}
+		}
+		function getTime() {
+			var now= new Date(),
+			h=now.getHours(),
+			m=now.getMinutes(),
+			s=now.getSeconds(),
+			ms=now.getMilliseconds();
+			return (h+":"+m+":"+s+ " " +ms);
+		}
+
+		function setTrigger() {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			zTree.setting.edit.drag.autoExpandTrigger = $("#callbackTrigger").attr("checked");
+		}
+		
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			$("#callbackTrigger").bind("change", {}, setTrigger);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>拖拽节点高级控制</h1>
+<h6>[ 文件路径: exedit/drag_super.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、beforeDrag / onDrag<br/>&nbsp;&nbsp;beforeDrop / onDrop 事件回调函数控制</h2>
+				<ul class="list">
+				<li>此 Demo 演示合理利用配置参数实现更加灵活、更加合理的拖拽规则，操作时可以对比"基本控制"的例子</li>
+				<li>此 Demo 默认 允许复制 / 移动</li>
+				<li class="highlight_red">此 Demo 中拖拽相对位置设置为 function，可以根据节点动态设定，从而可以放弃使用 beforeDrop 回调函数，拖拽时的效果会更好</li>
+				<li><p><span class="highlight_red">在对这些灵活的配置熟悉以后，相信你能够做出更加合理的拖拽规则！</span><br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" id="callbackTrigger" checked /> 拖拽节点时自动展开父节点是否触发 callback<br/>
+					drag / drop log:<br/>
+					<ul id="log" class="log"></ul></p></li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、setting 配置信息说明</h2>
+				<ul class="list">
+				<li>同 "拖拽 节点 基本控制"</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li>同 "拖拽 节点 基本控制"</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/exedit/edit.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/exedit/edit.html
new file mode 100644
index 0000000..ed787d7
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/exedit/edit.html
@@ -0,0 +1,115 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - edit</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			edit: {
+				enable: true
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeDrag: beforeDrag
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"父节点 1", open:true},
+			{ id:11, pId:1, name:"叶子节点 1-1"},
+			{ id:12, pId:1, name:"叶子节点 1-2"},
+			{ id:13, pId:1, name:"叶子节点 1-3"},
+			{ id:2, pId:0, name:"父节点 2", open:true},
+			{ id:21, pId:2, name:"叶子节点 2-1"},
+			{ id:22, pId:2, name:"叶子节点 2-2"},
+			{ id:23, pId:2, name:"叶子节点 2-3"},
+			{ id:3, pId:0, name:"父节点 3", open:true},
+			{ id:31, pId:3, name:"叶子节点 3-1"},
+			{ id:32, pId:3, name:"叶子节点 3-2"},
+			{ id:33, pId:3, name:"叶子节点 3-3"}
+		];
+
+		function beforeDrag(treeId, treeNodes) {
+			return false;
+		}
+		
+		function setEdit() {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			remove = $("#remove").attr("checked"),
+			rename = $("#rename").attr("checked"),
+			removeTitle = $.trim($("#removeTitle").get(0).value),
+			renameTitle = $.trim($("#renameTitle").get(0).value);
+			zTree.setting.edit.showRemoveBtn = remove;
+			zTree.setting.edit.showRenameBtn = rename;
+			zTree.setting.edit.removeTitle = removeTitle;
+			zTree.setting.edit.renameTitle = renameTitle;
+			showCode(['setting.edit.showRemoveBtn = ' + remove, 'setting.edit.showRenameBtn = ' + rename,
+				'setting.edit.removeTitle = "' + removeTitle +'"', 'setting.edit.renameTitle = "' + renameTitle + '"']);
+		}
+		function showCode(str) {
+			var code = $("#code");
+			code.empty();
+			for (var i=0, l=str.length; i<l; i++) {
+				code.append("<li>"+str[i]+"</li>");
+			}
+		}
+		
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			setEdit();
+			$("#remove").bind("change", setEdit);
+			$("#rename").bind("change", setEdit);
+			$("#removeTitle").bind("propertychange", setEdit)
+			.bind("input", setEdit);
+			$("#renameTitle").bind("propertychange", setEdit)
+			.bind("input", setEdit);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>基本 增 / 删 / 改 节点</h1>
+<h6>[ 文件路径: exedit/edit.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、setting 配置信息说明</h2>
+				<ul class="list">
+				<li>此 Demo 仅从功能上演示编辑节点的基本方法和配置参数</li>
+				<li class="highlight_red">1)、使用 编辑功能，必须设置 setting.edit 中的各个属性，详细请参见 API 文档中的相关内容</li>
+				<li class="highlight_red">2)、使用 编辑功能的事件回调函数，必须设置 setting.callback.beforeRemove / onRemove / beforeRename / onRename 等属性，详细请参见 API 文档中的相关内容</li>
+				<li class="highlight_red">3)、zTree 不提供默认的增加按钮，如需实现请利用自定义控件的方法 addHoverDom / removeHoverDom ，详细请参见 API 文档中的相关内容；另外也可以参考 "高级 增 / 删 / 改 节点" 的 Demo</li>
+				<li><p>基本编辑按钮设置：<br/>
+						<input type="checkbox" id="remove" class="checkbox first" checked /><span>显示删除按钮</span>
+						<input type="checkbox" id="rename" class="checkbox " checked /><span>显示编辑按钮</span><br/>
+						remove 按钮的 title: <input type="text" id="removeTitle" value="remove" /><br/>
+						rename 按钮的 title: <input type="text" id="renameTitle" value="rename" />
+						<ul id="code" class="log" style="height:85px;"></ul></p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li>对 节点数据 没有特殊要求，用户可以根据自己的需求添加自定义属性</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/exedit/edit_fun.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/exedit/edit_fun.html
new file mode 100644
index 0000000..6201683
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/exedit/edit_fun.html
@@ -0,0 +1,194 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - addNodes / editName / removeNode / removeChildNodes</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				selectedMulti: false
+			},
+			edit: {
+				enable: true,
+				showRemoveBtn: false,
+				showRenameBtn: false
+			},
+			data: {
+				keep: {
+					parent:true,
+					leaf:true
+				},
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeDrag: beforeDrag,
+				beforeRemove: beforeRemove,
+				beforeRename: beforeRename,
+				onRemove: onRemove
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"父节点 1", open:true},
+			{ id:11, pId:1, name:"叶子节点 1-1"},
+			{ id:12, pId:1, name:"叶子节点 1-2"},
+			{ id:13, pId:1, name:"叶子节点 1-3"},
+			{ id:2, pId:0, name:"父节点 2", open:true},
+			{ id:21, pId:2, name:"叶子节点 2-1"},
+			{ id:22, pId:2, name:"叶子节点 2-2"},
+			{ id:23, pId:2, name:"叶子节点 2-3"},
+			{ id:3, pId:0, name:"父节点 3", open:true},
+			{ id:31, pId:3, name:"叶子节点 3-1"},
+			{ id:32, pId:3, name:"叶子节点 3-2"},
+			{ id:33, pId:3, name:"叶子节点 3-3"}
+		];
+		var log, className = "dark";
+		function beforeDrag(treeId, treeNodes) {
+			return false;
+		}
+		function beforeRemove(treeId, treeNode) {
+			className = (className === "dark" ? "":"dark");
+			showLog("[ "+getTime()+" beforeRemove ]&nbsp;&nbsp;&nbsp;&nbsp; " + treeNode.name);
+			return confirm("确认删除 节点 -- " + treeNode.name + " 吗？");
+		}
+		function onRemove(e, treeId, treeNode) {
+			showLog("[ "+getTime()+" onRemove ]&nbsp;&nbsp;&nbsp;&nbsp; " + treeNode.name);
+		}
+		function beforeRename(treeId, treeNode, newName) {
+			if (newName.length == 0) {
+				alert("节点名称不能为空.");
+				var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+				setTimeout(function(){zTree.editName(treeNode)}, 10);
+				return false;
+			}
+			return true;
+		}
+		function showLog(str) {
+			if (!log) log = $("#log");
+			log.append("<li class='"+className+"'>"+str+"</li>");
+			if(log.children("li").length > 8) {
+				log.get(0).removeChild(log.children("li")[0]);
+			}
+		}
+		function getTime() {
+			var now= new Date(),
+			h=now.getHours(),
+			m=now.getMinutes(),
+			s=now.getSeconds(),
+			ms=now.getMilliseconds();
+			return (h+":"+m+":"+s+ " " +ms);
+		}
+
+		var newCount = 1;
+		function add(e) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			isParent = e.data.isParent,
+			nodes = zTree.getSelectedNodes(),
+			treeNode = nodes[0];
+			if (treeNode) {
+				treeNode = zTree.addNodes(treeNode, {id:(100 + newCount), pId:treeNode.id, isParent:isParent, name:"new node" + (newCount++)});
+			} else {
+				treeNode = zTree.addNodes(null, {id:(100 + newCount), pId:0, isParent:isParent, name:"new node" + (newCount++)});
+			}
+			if (treeNode) {
+				zTree.editName(treeNode[0]);
+			} else {
+				alert("叶子节点被锁定，无法增加子节点");
+			}
+		};
+		function edit() {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nodes = zTree.getSelectedNodes(),
+			treeNode = nodes[0];
+			if (nodes.length == 0) {
+				alert("请先选择一个节点");
+				return;
+			}
+			zTree.editName(treeNode);
+		};
+		function remove(e) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nodes = zTree.getSelectedNodes(),
+			treeNode = nodes[0];
+			if (nodes.length == 0) {
+				alert("请先选择一个节点");
+				return;
+			}
+			var callbackFlag = $("#callbackTrigger").attr("checked");
+			zTree.removeNode(treeNode, callbackFlag);
+		};
+		function clearChildren(e) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nodes = zTree.getSelectedNodes(),
+			treeNode = nodes[0];
+			if (nodes.length == 0 || !nodes[0].isParent) {
+				alert("请先选择一个父节点");
+				return;
+			}
+			zTree.removeChildNodes(treeNode);
+		};
+		
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			$("#addParent").bind("click", {isParent:true}, add);
+			$("#addLeaf").bind("click", {isParent:false}, add);
+			$("#edit").bind("click", edit);
+			$("#remove").bind("click", remove);
+			$("#clearChildren").bind("click", clearChildren);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>用 zTree 方法 增 / 删 / 改 节点</h1>
+<h6>[ 文件路径: exedit/edit_fun.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、addNodes / editName / removeNode / removeChildNodes 方法操作说明</h2>
+				<ul class="list">
+				<li>利用 addNodes / editName / removeNode / removeChildNodes 方法也可以实现 增 / 删 / 改 节点的目的，这里简单演示使用方法</li>
+				<li>cancelEditName 方法仅仅是在节点进入名称编辑状态时有效，请在必要时使用，Demo 不进行此方法的演示</li>
+				<li class="highlight_red">利用 setting.data.keep.parent / leaf 属性 实现了父节点、叶子节点的状态锁定</li>
+				<li><p>对节点进行 增 / 删 / 改，试试看：<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" id="callbackTrigger" checked /> removeNode 方法是否触发 callback<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="addParent" href="#" title="增加父节点" onclick="return false;">增加父节点</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="addLeaf" href="#" title="增加叶子节点" onclick="return false;">增加叶子节点</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="edit" href="#" title="编辑名称" onclick="return false;">编辑名称</a> ]<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="remove" href="#" title="删除节点" onclick="return false;">删除节点</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="clearChildren" href="#" title="清空子节点" onclick="return false;">清空子节点</a> ]<br/>
+					remove log:<br/>
+					<ul id="log" class="log"></ul></p>
+				</li>
+				<li class="highlight_red">使用 zTreeObj.addNodes / cancelEditName / editName / removeNode / removeChildNodes 方法，详细请参见 API 文档中的相关内容</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、setting 配置信息说明</h2>
+				<ul class="list">
+				<li>同 "基本 增 / 删 / 改 节点"</li>
+				<li class="highlight_red">保持 父 / 叶子 节点状态，需要设置 setting.data.keep.parent / leaf 属性，详细请参见 API 文档中的相关内容</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li>同 "基本 增 / 删 / 改 节点"</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/exedit/edit_super.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/exedit/edit_super.html
new file mode 100644
index 0000000..fb56de2
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/exedit/edit_super.html
@@ -0,0 +1,183 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - beforeEditName / beforeRemove / onRemove / beforeRename / onRename</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				addHoverDom: addHoverDom,
+				removeHoverDom: removeHoverDom,
+				selectedMulti: false
+			},
+			edit: {
+				enable: true,
+				editNameSelectAll: true,
+				showRemoveBtn: showRemoveBtn,
+				showRenameBtn: showRenameBtn
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeDrag: beforeDrag,
+				beforeEditName: beforeEditName,
+				beforeRemove: beforeRemove,
+				beforeRename: beforeRename,
+				onRemove: onRemove,
+				onRename: onRename
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"父节点 1", open:true},
+			{ id:11, pId:1, name:"叶子节点 1-1"},
+			{ id:12, pId:1, name:"叶子节点 1-2"},
+			{ id:13, pId:1, name:"叶子节点 1-3"},
+			{ id:2, pId:0, name:"父节点 2", open:true},
+			{ id:21, pId:2, name:"叶子节点 2-1"},
+			{ id:22, pId:2, name:"叶子节点 2-2"},
+			{ id:23, pId:2, name:"叶子节点 2-3"},
+			{ id:3, pId:0, name:"父节点 3", open:true},
+			{ id:31, pId:3, name:"叶子节点 3-1"},
+			{ id:32, pId:3, name:"叶子节点 3-2"},
+			{ id:33, pId:3, name:"叶子节点 3-3"}
+		];
+		var log, className = "dark";
+		function beforeDrag(treeId, treeNodes) {
+			return false;
+		}
+		function beforeEditName(treeId, treeNode) {
+			className = (className === "dark" ? "":"dark");
+			showLog("[ "+getTime()+" beforeEditName ]&nbsp;&nbsp;&nbsp;&nbsp; " + treeNode.name);
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			zTree.selectNode(treeNode);
+			return confirm("进入节点 -- " + treeNode.name + " 的编辑状态吗？");
+		}
+		function beforeRemove(treeId, treeNode) {
+			className = (className === "dark" ? "":"dark");
+			showLog("[ "+getTime()+" beforeRemove ]&nbsp;&nbsp;&nbsp;&nbsp; " + treeNode.name);
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			zTree.selectNode(treeNode);
+			return confirm("确认删除 节点 -- " + treeNode.name + " 吗？");
+		}
+		function onRemove(e, treeId, treeNode) {
+			showLog("[ "+getTime()+" onRemove ]&nbsp;&nbsp;&nbsp;&nbsp; " + treeNode.name);
+		}
+		function beforeRename(treeId, treeNode, newName, isCancel) {
+			className = (className === "dark" ? "":"dark");
+			showLog((isCancel ? "<span style='color:red'>":"") + "[ "+getTime()+" beforeRename ]&nbsp;&nbsp;&nbsp;&nbsp; " + treeNode.name + (isCancel ? "</span>":""));
+			if (newName.length == 0) {
+				alert("节点名称不能为空.");
+				var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+				setTimeout(function(){zTree.editName(treeNode)}, 10);
+				return false;
+			}
+			return true;
+		}
+		function onRename(e, treeId, treeNode, isCancel) {
+			showLog((isCancel ? "<span style='color:red'>":"") + "[ "+getTime()+" onRename ]&nbsp;&nbsp;&nbsp;&nbsp; " + treeNode.name + (isCancel ? "</span>":""));
+		}
+		function showRemoveBtn(treeId, treeNode) {
+			return !treeNode.isFirstNode;
+		}
+		function showRenameBtn(treeId, treeNode) {
+			return !treeNode.isLastNode;
+		}
+		function showLog(str) {
+			if (!log) log = $("#log");
+			log.append("<li class='"+className+"'>"+str+"</li>");
+			if(log.children("li").length > 8) {
+				log.get(0).removeChild(log.children("li")[0]);
+			}
+		}
+		function getTime() {
+			var now= new Date(),
+			h=now.getHours(),
+			m=now.getMinutes(),
+			s=now.getSeconds(),
+			ms=now.getMilliseconds();
+			return (h+":"+m+":"+s+ " " +ms);
+		}
+
+		var newCount = 1;
+		function addHoverDom(treeId, treeNode) {
+			var sObj = $("#" + treeNode.tId + "_span");
+			if (treeNode.editNameFlag || $("#addBtn_"+treeNode.tId).length>0) return;
+			var addStr = "<span class='button add' id='addBtn_" + treeNode.tId
+				+ "' title='add node' onfocus='this.blur();'></span>";
+			sObj.after(addStr);
+			var btn = $("#addBtn_"+treeNode.tId);
+			if (btn) btn.bind("click", function(){
+				var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+				zTree.addNodes(treeNode, {id:(100 + newCount), pId:treeNode.id, name:"new node" + (newCount++)});
+				return false;
+			});
+		};
+		function removeHoverDom(treeId, treeNode) {
+			$("#addBtn_"+treeNode.tId).unbind().remove();
+		};
+		function selectAll() {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			zTree.setting.edit.editNameSelectAll =  $("#selectAll").attr("checked");
+		}
+		
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			$("#selectAll").bind("click", selectAll);
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+.ztree li span.button.add {margin-left:2px; margin-right: -1px; background-position:-144px 0; vertical-align:top; *vertical-align:middle}
+	</style>
+</HEAD>
+
+<BODY>
+<h1>高级 增 / 删 / 改 节点</h1>
+<h6>[ 文件路径: exedit/edit_super.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、beforeEditName<br/>&nbsp;&nbsp;beforeRemove / onRemove<br/>&nbsp;&nbsp;beforeRename / onRename 事件回调函数控制</h2>
+				<ul class="list">
+				<li>此 Demo 演示合理利用自定义控件、事件回调函数配合以增强用户体验，操作时可以对比"基本 增 / 删 / 改 节点"的 Demo</li>
+				<li>此 Demo 实现增加节点按钮</li>
+				<li>此 Demo 实现删除节点时进行确认</li>
+				<li>此 Demo 利用 showRenameBtn 对 isLastNode = true 的节点不显示编辑按钮 </li>
+				<li>此 Demo 利用 showRemoveBtn 对 isFirstNode = true 的节点不显示删除按钮 </li>
+				<li class="highlight_red">可以利用 beforeEditName 触发自定义的编辑操作</li>
+				<li><p><span class="highlight_red">在对这些灵活的配置熟悉以后，相信你能够做出更加合理的编辑界面！</span><br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" id="selectAll" checked /> 编辑名称时是否全选 text<br/>
+					remove / rename log:&nbsp;&nbsp;<span style="color:red">红色</span> 表示取消编辑操作 (v3.5.13+)<br/>
+					<ul id="log" class="log"></ul></p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、setting 配置信息说明</h2>
+				<ul class="list">
+				<li>同 "基本 增 / 删 / 改 节点"</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li>同 "基本 增 / 删 / 改 节点"</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/exedit/multiTree.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/exedit/multiTree.html
new file mode 100644
index 0000000..a4736a2
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/exedit/multiTree.html
@@ -0,0 +1,94 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - multiTree</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			edit: {
+				enable: true,
+				showRemoveBtn: false,
+				showRenameBtn: false
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeDrag: beforeDrag,
+				beforeDrop: beforeDrop
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"父节点 1", open:true},
+			{ id:11, pId:1, name:"叶子节点 1-1"},
+			{ id:12, pId:1, name:"叶子节点 1-2"},
+			{ id:13, pId:1, name:"叶子节点 1-3"},
+			{ id:2, pId:0, name:"父节点 2", open:true},
+			{ id:21, pId:2, name:"叶子节点 2-1"},
+			{ id:22, pId:2, name:"叶子节点 2-2"},
+			{ id:23, pId:2, name:"叶子节点 2-3"},
+			{ id:3, pId:0, name:"父节点 3", open:true},
+			{ id:31, pId:3, name:"叶子节点 3-1"},
+			{ id:32, pId:3, name:"叶子节点 3-2"},
+			{ id:33, pId:3, name:"叶子节点 3-3"}
+		];
+
+		function beforeDrag(treeId, treeNodes) {
+			for (var i=0,l=treeNodes.length; i<l; i++) {
+				if (treeNodes[i].drag === false) {
+					return false;
+				}
+			}
+			return true;
+		}
+		function beforeDrop(treeId, treeNodes, targetNode, moveType) {
+			return targetNode ? targetNode.drop !== false : true;
+		}
+		
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			$.fn.zTree.init($("#treeDemo2"), setting);
+			
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>多棵树之间 的 数据交互</h1>
+<h6>[ 文件路径: exedit/multiTree.html ]</h6>
+<div class="content_wrap">
+	<div>
+		<ul class="info">
+			<li class="title"><h2>1、setting 配置信息说明</h2>
+				<ul class="list">
+				<li>zTree 对于多棵树之间拖拽的操作非常简单，只需要创建两棵可拖拽的树即可，同时可根据 各种事件回调函数 以及 zTree 的方法配合实现较复杂的操作规则，这里只是基本演示。</li>
+				<li class="highlight_red">关于配置信息请参考拖拽、编辑等 Demo 的详细说明</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li>对 节点数据 没有特殊要求，用户可以根据自己的需求添加自定义属性</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul id="treeDemo2" class="ztree"></ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/exhide/checkbox.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/exhide/checkbox.html
new file mode 100644
index 0000000..bf73081
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/exhide/checkbox.html
@@ -0,0 +1,161 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - Hide With Checkbox Mode</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+<!--<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<script type="text/javascript" src="../../../js/jquery.ztree.exhide-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			check: {
+				enable: true
+			},
+			data: {
+				key: {
+					title: "title"
+				},
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				onCheck: onCheck
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"父节点1", title:"", checked:true, open:true},
+			{ id:11, pId:1, name:"父节点11", title:"", checked:true},
+			{ id:111, pId:11, name:"叶子节点111", title:"", checked:true, isHidden:true},
+			{ id:112, pId:11, name:"叶子节点112", title:""},
+			{ id:113, pId:11, name:"叶子节点113", title:""},
+			{ id:12, pId:1, name:"父节点12", title:"", isHidden:true},
+			{ id:121, pId:12, name:"叶子节点121", title:""},
+			{ id:122, pId:12, name:"叶子节点122", title:"", isHidden:true},
+			{ id:123, pId:12, name:"叶子节点123", title:""},
+			{ id:2, pId:0, name:"父节点2", title:""},
+			{ id:21, pId:2, name:"父节点21", title:"", isHidden:true},
+			{ id:211, pId:21, name:"叶子节点211", title:""},
+			{ id:212, pId:21, name:"叶子节点212", title:""},
+			{ id:213, pId:21, name:"叶子节点213", title:""},
+			{ id:22, pId:2, name:"父节点22", title:""},
+			{ id:221, pId:22, name:"叶子节点221", title:""},
+			{ id:222, pId:22, name:"叶子节点222", title:""},
+			{ id:223, pId:22, name:"叶子节点223", title:""}
+		];
+
+		function onCheck(e, treeId, treeNode) {
+			count();
+		}
+
+		function setTitle(node) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			var nodes = node ? [node]:zTree.transformToArray(zTree.getNodes());
+			for (var i=0, l=nodes.length; i<l; i++) {
+				var n = nodes[i];
+				n.title = "[" + n.id + "] isFirstNode = " + n.isFirstNode + ", isLastNode = " + n.isLastNode;
+				zTree.updateNode(n);
+			}
+		}
+		function count() {
+			function isForceHidden(node) {
+				if (!node.parentTId) return false;
+				var p = node.getParentNode();
+				return !!p.isHidden ? true : isForceHidden(p);
+			}
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			checkCount = zTree.getCheckedNodes(true).length,
+			nocheckCount = zTree.getCheckedNodes(false).length,
+			hiddenNodes = zTree.getNodesByParam("isHidden", true),
+			hiddenCount = hiddenNodes.length;
+
+			for (var i=0, j=hiddenNodes.length; i<j; i++) {
+				var n = hiddenNodes[i];
+				if (isForceHidden(n)) {
+					hiddenCount -= 1;
+				} else if (n.isParent) {
+					hiddenCount += zTree.transformToArray(n.children).length;
+				}
+			}
+
+			$("#isHiddenCount").text(hiddenNodes.length);
+			$("#hiddenCount").text(hiddenCount);
+			$("#checkCount").text(checkCount);
+			$("#nocheckCount").text(nocheckCount);
+		}
+		function showNodes() {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nodes = zTree.getNodesByParam("isHidden", true);
+			zTree.showNodes(nodes);
+			setTitle();
+			count();
+		}
+		function hideNodes() {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nodes = zTree.getSelectedNodes();
+			if (nodes.length == 0) {
+				alert("请至少选择一个节点");
+				return;
+			}
+			zTree.hideNodes(nodes);
+			setTitle();
+			count();
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			$("#hideNodesBtn").bind("click", {type:"rename"}, hideNodes);
+			$("#showNodesBtn").bind("click", {type:"icon"}, showNodes);
+			setTitle();
+			count();
+		});
+		//-->
+	</SCRIPT>
+ </HEAD>
+
+<BODY>
+<h1>配合 checkbox 的隐藏</h1>
+<h6>[ 文件路径: exhide/checkbox.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、setting 配置信息说明</h2>
+				<ul class="list">
+				<li>使用隐藏功能，无需设置任何参数</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li class="highlight_red">初始化时，设置 treeNode.isHidden = true; 可以让节点隐藏</li>
+				<li><p>隐藏、显示节点，看看树的变化：<br/><br/>
+					试试看：[ <a id="hideNodesBtn" href="#" onclick="return false;">隐藏选中的节点</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="showNodesBtn" href="#" onclick="return false;">显示全部被隐藏的节点</a> ]<br/><br/>
+					<ul id="log" class="log" style="height:125px;">
+						<li>isHidden = true 的节点共 <span id="isHiddenCount" class="highlight_red"></span> 个</li>
+						<li>被隐藏的节点共 <span id="hiddenCount" class="highlight_red"></span> 个</li>
+						<li>当前被勾选的节点共 <span id="checkCount" class="highlight_red"></span> 个</li>
+						<li>当前未被勾选的节点共 <span id="nocheckCount" class="highlight_red"></span> 个</li>
+						<li>隐藏节点后，可以看看仍显示节点的 isFirstNode 和 isLastNode 属性</li>
+					</ul></p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、其他说明</h2>
+				<ul class="list">
+				<li>隐藏节点操作，会影响 isFirstNode 和 isLastNode 属性，但是对于 getPreNode() 和 getNextNode() 方法无影响</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/exhide/common.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/exhide/common.html
new file mode 100644
index 0000000..600d1c0
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/exhide/common.html
@@ -0,0 +1,126 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - Hide Ordinary Node</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+<!--<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<script type="text/javascript" src="../../../js/jquery.ztree.exhide-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			data: {
+				key: {
+					title: "title"
+				},
+				simpleData: {
+					enable: true
+				}
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"父节点1", title:"", open:true},
+			{ id:11, pId:1, name:"父节点11", title:""},
+			{ id:111, pId:11, name:"叶子节点111", title:"", isHidden:true},
+			{ id:112, pId:11, name:"叶子节点112", title:""},
+			{ id:113, pId:11, name:"叶子节点113", title:""},
+			{ id:12, pId:1, name:"父节点12", title:"", isHidden:true},
+			{ id:121, pId:12, name:"叶子节点121", title:""},
+			{ id:122, pId:12, name:"叶子节点122", title:"", isHidden:true},
+			{ id:123, pId:12, name:"叶子节点123", title:""},
+			{ id:2, pId:0, name:"父节点2", title:""},
+			{ id:21, pId:2, name:"父节点21", title:"", isHidden:true},
+			{ id:211, pId:21, name:"叶子节点211", title:""},
+			{ id:212, pId:21, name:"叶子节点212", title:""},
+			{ id:213, pId:21, name:"叶子节点213", title:""},
+			{ id:22, pId:2, name:"父节点22", title:""},
+			{ id:221, pId:22, name:"叶子节点221", title:""},
+			{ id:222, pId:22, name:"叶子节点222", title:""},
+			{ id:223, pId:22, name:"叶子节点223", title:""}
+		];
+		function setTitle(node) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			var nodes = node ? [node]:zTree.transformToArray(zTree.getNodes());
+			for (var i=0, l=nodes.length; i<l; i++) {
+				var n = nodes[i];
+				n.title = "[" + n.id + "] isFirstNode = " + n.isFirstNode + ", isLastNode = " + n.isLastNode;
+				zTree.updateNode(n);
+			}
+		}
+		function count() {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			hiddenCount = zTree.getNodesByParam("isHidden", true).length;
+			$("#hiddenCount").text(hiddenCount);
+		}
+		function showNodes() {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nodes = zTree.getNodesByParam("isHidden", true);
+			zTree.showNodes(nodes);
+			setTitle();
+			count();
+		}
+		function hideNodes() {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nodes = zTree.getSelectedNodes();
+			if (nodes.length == 0) {
+				alert("请至少选择一个节点");
+				return;
+			}
+			zTree.hideNodes(nodes);
+			setTitle();
+			count();
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			$("#hideNodesBtn").bind("click", {type:"rename"}, hideNodes);
+			$("#showNodesBtn").bind("click", {type:"icon"}, showNodes);
+			setTitle();
+			count();
+		});
+		//-->
+	</SCRIPT>
+ </HEAD>
+
+<BODY>
+<h1>隐藏普通节点</h1>
+<h6>[ 文件路径: exhide/common.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、setting 配置信息说明</h2>
+				<ul class="list">
+				<li>使用此功能，无需设置任何参数</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li class="highlight_red">初始化时，设置 treeNode.isHidden = true; 可以让节点隐藏</li>
+				<li><p>隐藏、显示节点，看看树的变化：<br/><br/>
+					试试看：[ <a id="hideNodesBtn" href="#" onclick="return false;">隐藏选中的节点</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="showNodesBtn" href="#" onclick="return false;">显示全部被隐藏的节点</a> ]<br/><br/>
+					<ul id="log" class="log" style="height:65px;">
+						<li>isHidden = true 的节点共 <span id="hiddenCount" class="highlight_red"></span> 个</li>
+						<li>隐藏节点后，可以看看仍显示节点的 isFirstNode 和 isLastNode 属性</li>
+					</ul></p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、其他说明</h2>
+				<ul class="list">
+				<li>隐藏节点操作，会影响 isFirstNode 和 isLastNode 属性，但是对于 getPreNode() 和 getNextNode() 方法无影响</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/exhide/radio.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/exhide/radio.html
new file mode 100644
index 0000000..5273b73
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/exhide/radio.html
@@ -0,0 +1,162 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - Hide With Radio Mode</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+<!--<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<script type="text/javascript" src="../../../js/jquery.ztree.exhide-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			check: {
+				enable: true,
+				chkStyle: "radio"
+			},
+			data: {
+				key: {
+					title: "title"
+				},
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				onCheck: onCheck
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"父节点1", title:"", checked:true, open:true},
+			{ id:11, pId:1, name:"父节点11", title:"", checked:true},
+			{ id:111, pId:11, name:"叶子节点111", title:"", checked:true, isHidden:true},
+			{ id:112, pId:11, name:"叶子节点112", title:""},
+			{ id:113, pId:11, name:"叶子节点113", title:""},
+			{ id:12, pId:1, name:"父节点12", title:"", isHidden:true},
+			{ id:121, pId:12, name:"叶子节点121", title:""},
+			{ id:122, pId:12, name:"叶子节点122", title:"", isHidden:true},
+			{ id:123, pId:12, name:"叶子节点123", title:""},
+			{ id:2, pId:0, name:"父节点2", title:""},
+			{ id:21, pId:2, name:"父节点21", title:"", isHidden:true},
+			{ id:211, pId:21, name:"叶子节点211", title:""},
+			{ id:212, pId:21, name:"叶子节点212", title:""},
+			{ id:213, pId:21, name:"叶子节点213", title:""},
+			{ id:22, pId:2, name:"父节点22", title:""},
+			{ id:221, pId:22, name:"叶子节点221", title:""},
+			{ id:222, pId:22, name:"叶子节点222", title:""},
+			{ id:223, pId:22, name:"叶子节点223", title:""}
+		];
+
+		function onCheck(e, treeId, treeNode) {
+			count();
+		}
+
+		function setTitle(node) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			var nodes = node ? [node]:zTree.transformToArray(zTree.getNodes());
+			for (var i=0, l=nodes.length; i<l; i++) {
+				var n = nodes[i];
+				n.title = "[" + n.id + "] isFirstNode = " + n.isFirstNode + ", isLastNode = " + n.isLastNode;
+				zTree.updateNode(n);
+			}
+		}
+		function count() {
+			function isForceHidden(node) {
+				if (!node.parentTId) return false;
+				var p = node.getParentNode();
+				return !!p.isHidden ? true : isForceHidden(p);
+			}
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			checkCount = zTree.getCheckedNodes(true).length,
+			nocheckCount = zTree.getCheckedNodes(false).length,
+			hiddenNodes = zTree.getNodesByParam("isHidden", true),
+			hiddenCount = hiddenNodes.length;
+
+			for (var i=0, j=hiddenNodes.length; i<j; i++) {
+				var n = hiddenNodes[i];
+				if (isForceHidden(n)) {
+					hiddenCount -= 1;
+				} else if (n.isParent) {
+					hiddenCount += zTree.transformToArray(n.children).length;
+				}
+			}
+
+			$("#isHiddenCount").text(hiddenNodes.length);
+			$("#hiddenCount").text(hiddenCount);
+			$("#checkCount").text(checkCount);
+			$("#nocheckCount").text(nocheckCount);
+		}
+		function showNodes() {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nodes = zTree.getNodesByParam("isHidden", true);
+			zTree.showNodes(nodes);
+			setTitle();
+			count();
+		}
+		function hideNodes() {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nodes = zTree.getSelectedNodes();
+			if (nodes.length == 0) {
+				alert("请至少选择一个节点");
+				return;
+			}
+			zTree.hideNodes(nodes);
+			setTitle();
+			count();
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			$("#hideNodesBtn").bind("click", {type:"rename"}, hideNodes);
+			$("#showNodesBtn").bind("click", {type:"icon"}, showNodes);
+			setTitle();
+			count();
+		});
+		//-->
+	</SCRIPT>
+ </HEAD>
+
+<BODY>
+<h1>配合 radio 的隐藏</h1>
+<h6>[ 文件路径: exhide/radio.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、setting 配置信息说明</h2>
+				<ul class="list">
+				<li>使用隐藏功能，无需设置任何参数</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li class="highlight_red">初始化时，设置 treeNode.isHidden = true; 可以让节点隐藏</li>
+				<li><p>隐藏、显示节点，看看树的变化：<br/><br/>
+					试试看：[ <a id="hideNodesBtn" href="#" onclick="return false;">隐藏选中的节点</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="showNodesBtn" href="#" onclick="return false;">显示全部被隐藏的节点</a> ]<br/><br/>
+					<ul id="log" class="log" style="height:125px;">
+						<li>isHidden = true 的节点共 <span id="isHiddenCount" class="highlight_red"></span> 个</li>
+						<li>被隐藏的节点共 <span id="hiddenCount" class="highlight_red"></span> 个</li>
+						<li>当前被勾选的节点共 <span id="checkCount" class="highlight_red"></span> 个</li>
+						<li>当前未被勾选的节点共 <span id="nocheckCount" class="highlight_red"></span> 个</li>
+						<li>隐藏节点后，可以看看仍显示节点的 isFirstNode 和 isLastNode 属性</li>
+					</ul></p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、其他说明</h2>
+				<ul class="list">
+				<li>隐藏节点操作，会影响 isFirstNode 和 isLastNode 属性，但是对于 getPreNode() 和 getNextNode() 方法无影响</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/index.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/index.html
new file mode 100644
index 0000000..77987c0
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/index.html
@@ -0,0 +1,157 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">

+<HTML>

+ <HEAD>

+  <TITLE> ZTREE DEMO </TITLE>

+  <meta http-equiv="content-type" content="text/html; charset=UTF-8">

+  <link rel="stylesheet" href="../../css/zTreeStyle/zTreeStyle.css" type="text/css">

+  <style>

+	body {

+	background-color: white;

+	margin:0; padding:0;

+	text-align: center;

+	}

+	div, p, table, th, td {

+		list-style:none;

+		margin:0; padding:0;

+		color:#333; font-size:12px;

+		font-family:dotum, Verdana, Arial, Helvetica, AppleGothic, sans-serif;

+	}

+	#testIframe {margin-left: 10px;}

+  </style>

+<script type="text/javascript" src="../../js/jquery-1.4.4.min.js"></script>

+<script type="text/javascript" src="../../js/jquery.ztree.core-3.5.js"></script>

+  <SCRIPT type="text/javascript" >

+  <!--

+	var zTree;

+	var demoIframe;

+

+	var setting = {

+		view: {

+			dblClickExpand: false,

+			showLine: true,

+			selectedMulti: false

+		},

+		data: {

+			simpleData: {

+				enable:true,

+				idKey: "id",

+				pIdKey: "pId",

+				rootPId: ""

+			}

+		},

+		callback: {

+			beforeClick: function(treeId, treeNode) {

+				var zTree = $.fn.zTree.getZTreeObj("tree");

+				if (treeNode.isParent) {

+					zTree.expandNode(treeNode);

+					return false;

+				} else {

+					demoIframe.attr("src",treeNode.file + ".html");

+					return true;

+				}

+			}

+		}

+	};

+

+	var zNodes =[

+		{id:1, pId:0, name:"[core] 基本功能 演示", open:true},

+		{id:101, pId:1, name:"最简单的树 --  标准 JSON 数据", file:"core/standardData"},

+		{id:102, pId:1, name:"最简单的树 --  简单 JSON 数据", file:"core/simpleData"},

+		{id:103, pId:1, name:"不显示 连接线", file:"core/noline"},

+		{id:104, pId:1, name:"不显示 节点 图标", file:"core/noicon"},

+		{id:105, pId:1, name:"自定义图标 --  icon 属性", file:"core/custom_icon"},

+		{id:106, pId:1, name:"自定义图标 --  iconSkin 属性", file:"core/custom_iconSkin"},

+		{id:107, pId:1, name:"自定义字体", file:"core/custom_font"},

+		{id:115, pId:1, name:"超链接演示", file:"core/url"},

+		{id:108, pId:1, name:"异步加载 节点数据", file:"core/async"},

+		{id:109, pId:1, name:"用 zTree 方法 异步加载 节点数据", file:"core/async_fun"},

+		{id:110, pId:1, name:"用 zTree 方法 更新 节点数据", file:"core/update_fun"},

+		{id:111, pId:1, name:"单击 节点 控制", file:"core/click"},

+		{id:112, pId:1, name:"展开 / 折叠 父节点 控制", file:"core/expand"},

+		{id:113, pId:1, name:"根据 参数 查找 节点", file:"core/searchNodes"},

+		{id:114, pId:1, name:"其他 鼠标 事件监听", file:"core/otherMouse"},

+

+		{id:2, pId:0, name:"[excheck] 复/单选框功能 演示", open:false},

+		{id:201, pId:2, name:"Checkbox 勾选操作", file:"excheck/checkbox"},

+		{id:206, pId:2, name:"Checkbox nocheck 演示", file:"excheck/checkbox_nocheck"},

+		{id:207, pId:2, name:"Checkbox chkDisabled 演示", file:"excheck/checkbox_chkDisabled"},

+		{id:208, pId:2, name:"Checkbox halfCheck 演示", file:"excheck/checkbox_halfCheck"},

+		{id:202, pId:2, name:"Checkbox 勾选统计", file:"excheck/checkbox_count"},

+		{id:203, pId:2, name:"用 zTree 方法 勾选 Checkbox", file:"excheck/checkbox_fun"},

+		{id:204, pId:2, name:"Radio 勾选操作", file:"excheck/radio"},

+		{id:209, pId:2, name:"Radio nocheck 演示", file:"excheck/radio_nocheck"},

+		{id:210, pId:2, name:"Radio chkDisabled 演示", file:"excheck/radio_chkDisabled"},

+		{id:211, pId:2, name:"Radio halfCheck 演示", file:"excheck/radio_halfCheck"},

+		{id:205, pId:2, name:"用 zTree 方法 勾选 Radio", file:"excheck/radio_fun"},

+

+		{id:3, pId:0, name:"[exedit] 编辑功能 演示", open:false},

+		{id:301, pId:3, name:"拖拽 节点 基本控制", file:"exedit/drag"},

+		{id:302, pId:3, name:"拖拽 节点 高级控制", file:"exedit/drag_super"},

+		{id:303, pId:3, name:"用 zTree 方法 移动 / 复制 节点", file:"exedit/drag_fun"},

+		{id:304, pId:3, name:"基本 增 / 删 / 改 节点", file:"exedit/edit"},

+		{id:305, pId:3, name:"高级 增 / 删 / 改 节点", file:"exedit/edit_super"},

+		{id:306, pId:3, name:"用 zTree 方法 增 / 删 / 改 节点", file:"exedit/edit_fun"},

+		{id:307, pId:3, name:"异步加载 & 编辑功能 共存", file:"exedit/async_edit"},

+		{id:308, pId:3, name:"多棵树之间 的 数据交互", file:"exedit/multiTree"},

+

+		{id:4, pId:0, name:"大数据量 演示", open:false},

+		{id:401, pId:4, name:"一次性加载大数据量", file:"bigdata/common"},

+		{id:402, pId:4, name:"分批异步加载大数据量", file:"bigdata/diy_async"},

+		{id:403, pId:4, name:"分批异步加载大数据量", file:"bigdata/page"},

+

+		{id:5, pId:0, name:"组合功能 演示", open:false},

+		{id:501, pId:5, name:"冻结根节点", file:"super/oneroot"},

+		{id:502, pId:5, name:"单击展开/折叠节点", file:"super/oneclick"},

+		{id:503, pId:5, name:"保持展开单一路径", file:"super/singlepath"},

+		{id:504, pId:5, name:"添加 自定义控件", file:"super/diydom"},

+		{id:505, pId:5, name:"checkbox / radio 共存", file:"super/checkbox_radio"},

+		{id:506, pId:5, name:"左侧菜单", file:"super/left_menu"},

+		{id:513, pId:5, name:"OutLook 样式的左侧菜单", file:"super/left_menuForOutLook"},

+		{id:507, pId:5, name:"下拉菜单", file:"super/select_menu"},

+		{id:509, pId:5, name:"带 checkbox 的多选下拉菜单", file:"super/select_menu_checkbox"},

+		{id:510, pId:5, name:"带 radio 的单选下拉菜单", file:"super/select_menu_radio"},

+		{id:508, pId:5, name:"右键菜单 的 实现", file:"super/rightClickMenu"},

+		{id:511, pId:5, name:"与其他 DOM 拖拽互动", file:"super/dragWithOther"},

+		{id:512, pId:5, name:"异步加载模式下全部展开", file:"super/asyncForAll"},

+

+		{id:6, pId:0, name:"其他扩展功能 演示", open:false},

+		{id:601, pId:6, name:"隐藏普通节点", file:"exhide/common"},

+		{id:602, pId:6, name:"配合 checkbox 的隐藏", file:"exhide/checkbox"},

+		{id:603, pId:6, name:"配合 radio 的隐藏", file:"exhide/radio"}

+	];

+

+	$(document).ready(function(){

+		var t = $("#tree");

+		t = $.fn.zTree.init(t, setting, zNodes);

+		demoIframe = $("#testIframe");

+		demoIframe.bind("load", loadReady);

+		var zTree = $.fn.zTree.getZTreeObj("tree");

+		zTree.selectNode(zTree.getNodeByParam("id", 101));

+

+	});

+

+	function loadReady() {

+		var bodyH = demoIframe.contents().find("body").get(0).scrollHeight,

+		htmlH = demoIframe.contents().find("html").get(0).scrollHeight,

+		maxH = Math.max(bodyH, htmlH), minH = Math.min(bodyH, htmlH),

+		h = demoIframe.height() >= maxH ? minH:maxH ;

+		if (h < 530) h = 530;

+		demoIframe.height(h);

+	}

+

+  //-->

+  </SCRIPT>

+ </HEAD>

+

+<BODY>

+<TABLE border=0 height=600px align=left>

+	<TR>

+		<TD width=260px align=left valign=top style="BORDER-RIGHT: #999999 1px dashed">

+			<ul id="tree" class="ztree" style="width:260px; overflow:auto;"></ul>

+		</TD>

+		<TD width=770px align=left valign=top><IFRAME ID="testIframe" Name="testIframe" FRAMEBORDER=0 SCROLLING=AUTO width=100%  height=600px SRC="core/standardData.html"></IFRAME></TD>

+	</TR>

+</TABLE>

+

+</BODY>

+</HTML>

diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/super/asyncForAll.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/super/asyncForAll.html
new file mode 100644
index 0000000..8a38d98
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/super/asyncForAll.html
@@ -0,0 +1,191 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - async for All</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var demoMsg = {
+			async:"正在进行异步加载，请等一会儿再点击...",
+			expandAllOver: "全部展开完毕",
+			asyncAllOver: "后台异步加载完毕",
+			asyncAll: "已经异步加载完毕，不再重新加载",
+			expandAll: "已经异步加载完毕，使用 expandAll 方法"
+		}
+		var setting = {
+			async: {
+				enable: true,
+				url:"../asyncData/getNodes.php",
+				autoParam:["id", "name=n", "level=lv"],
+				otherParam:{"otherParam":"zTreeAsyncTest"},
+				dataFilter: filter,
+				type: "get"
+			},
+			callback: {
+				beforeAsync: beforeAsync,
+				onAsyncSuccess: onAsyncSuccess,
+				onAsyncError: onAsyncError
+			}
+		};
+
+		function filter(treeId, parentNode, childNodes) {
+			if (!childNodes) return null;
+			for (var i=0, l=childNodes.length; i<l; i++) {
+				childNodes[i].name = childNodes[i].name.replace(/\.n/g, '.');
+			}
+			return childNodes;
+		}
+
+		function beforeAsync() {
+			curAsyncCount++;
+		}
+		
+		function onAsyncSuccess(event, treeId, treeNode, msg) {
+			curAsyncCount--;
+			if (curStatus == "expand") {
+				expandNodes(treeNode.children);
+			} else if (curStatus == "async") {
+				asyncNodes(treeNode.children);
+			}
+
+			if (curAsyncCount <= 0) {
+				if (curStatus != "init" && curStatus != "") {
+					$("#demoMsg").text((curStatus == "expand") ? demoMsg.expandAllOver : demoMsg.asyncAllOver);
+					asyncForAll = true;
+				}
+				curStatus = "";
+			}
+		}
+
+		function onAsyncError(event, treeId, treeNode, XMLHttpRequest, textStatus, errorThrown) {
+			curAsyncCount--;
+
+			if (curAsyncCount <= 0) {
+				curStatus = "";
+				if (treeNode!=null) asyncForAll = true;
+			}
+		}
+
+		var curStatus = "init", curAsyncCount = 0, asyncForAll = false,
+		goAsync = false;
+		function expandAll() {
+			if (!check()) {
+				return;
+			}
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			if (asyncForAll) {
+				$("#demoMsg").text(demoMsg.expandAll);
+				zTree.expandAll(true);
+			} else {
+				expandNodes(zTree.getNodes());
+				if (!goAsync) {
+					$("#demoMsg").text(demoMsg.expandAll);
+					curStatus = "";
+				}
+			}
+		}
+		function expandNodes(nodes) {
+			if (!nodes) return;
+			curStatus = "expand";
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			for (var i=0, l=nodes.length; i<l; i++) {
+				zTree.expandNode(nodes[i], true, false, false);
+				if (nodes[i].isParent && nodes[i].zAsync) {
+					expandNodes(nodes[i].children);
+				} else {
+					goAsync = true;
+				}
+			}
+		}
+
+		function asyncAll() {
+			if (!check()) {
+				return;
+			}
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			if (asyncForAll) {
+				$("#demoMsg").text(demoMsg.asyncAll);
+			} else {
+				asyncNodes(zTree.getNodes());
+				if (!goAsync) {
+					$("#demoMsg").text(demoMsg.asyncAll);
+					curStatus = "";
+				}
+			}
+		}
+		function asyncNodes(nodes) {
+			if (!nodes) return;
+			curStatus = "async";
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			for (var i=0, l=nodes.length; i<l; i++) {
+				if (nodes[i].isParent && nodes[i].zAsync) {
+					asyncNodes(nodes[i].children);
+				} else {
+					goAsync = true;
+					zTree.reAsyncChildNodes(nodes[i], "refresh", true);
+				}
+			}
+		}
+
+		function reset() {
+			if (!check()) {
+				return;
+			}
+			asyncForAll = false;
+			goAsync = false;
+			$("#demoMsg").text("");
+			$.fn.zTree.init($("#treeDemo"), setting);
+		}
+
+		function check() {
+			if (curAsyncCount > 0) {
+				$("#demoMsg").text(demoMsg.async);
+				return false;
+			}
+			return true;
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting);
+			$("#expandAllBtn").bind("click", expandAll);
+			$("#asyncAllBtn").bind("click", asyncAll);
+			$("#resetBtn").bind("click", reset);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>异步加载模式下全部展开</h1>
+<h6>[ 文件路径: super/asyncForAll.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>实现方法说明</h2>
+				<ul class="list">
+				<li>利用 onAsyncSuccess / onAsyncError 回调函数 和 reAsyncChildNodes 或 expandNode 方法可以实现全部功能。</li>
+				<li class="highlight_red">如果父节点数量很大，请注意利用延时进行控制，避免异步进程过多。</li>
+				<li class="highlight_red">建议：演示时请利用调试工具查看 network 的 ajax 加载过程。</li>
+				<li>演示操作
+					<br/><br/>
+				[ <a id="expandAllBtn" href="#" onclick="return false;">全部展开</a> ] &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+				[ <a id="asyncAllBtn" href="#" onclick="return false;">后台自动全部加载</a> ]<br/><br/>
+				[ <a id="resetBtn" href="#" onclick="return false;">Reset zTree</a> ]<br/><br/>
+				<p class="highlight_red" id="demoMsg"></p>
+				</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/super/checkbox_radio.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/super/checkbox_radio.html
new file mode 100644
index 0000000..66a3b03
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/super/checkbox_radio.html
@@ -0,0 +1,116 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - checkbox & radio</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var IDMark_A = "_a";
+		var setting = {
+			view: {
+				addDiyDom: addDiyDom
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"父节点 1", open:true},
+			{ id:11, pId:1, name:"叶子节点 1-1"},
+			{ id:12, pId:1, name:"叶子节点 1-2"},
+			{ id:13, pId:1, name:"叶子节点 1-3"},
+			{ id:2, pId:0, name:"父节点 2", open:true},
+			{ id:21, pId:2, name:"叶子节点 2-1"},
+			{ id:22, pId:2, name:"叶子节点 2-2"},
+			{ id:23, pId:2, name:"叶子节点 2-3"},
+			{ id:3, pId:0, name:"父节点 3", open:true},
+			{ id:31, pId:3, name:"叶子节点 3-1"},
+			{ id:32, pId:3, name:"叶子节点 3-2"},
+			{ id:33, pId:3, name:"叶子节点 3-3"}
+		];
+
+		function addDiyDom(treeId, treeNode) {
+			var aObj = $("#" + treeNode.tId + IDMark_A);
+			if (treeNode.level == 0) {
+				var editStr = "<input type='checkbox' class='checkboxBtn' id='checkbox_" +treeNode.id+ "' onfocus='this.blur();'></input>";
+				aObj.before(editStr);
+				var btn = $("#checkbox_"+treeNode.id);
+			if (btn) btn.bind("change", function() {checkAccessories(treeNode, btn);});
+			} else if (treeNode.level == 1) {
+				var editStr = "<input type='radio' class='radioBtn' id='radio_" +treeNode.id+ "' name='radio_"+treeNode.getParentNode().id+"' onfocus='this.blur();'></input>";
+				aObj.before(editStr);
+				var btn = $("#radio_"+treeNode.id);
+				if (btn) btn.bind("click", function() {checkBrand(treeNode, btn);});
+			}
+		}
+
+		function checkAccessories(treeNode, btn) {
+			var checkedRadio = getCheckedRadio("radio_"+treeNode.id);
+			if (btn.attr("checked")) {
+				if (!checkedRadio) {
+					$("#radio_" + treeNode.children[0].id).attr("checked", true);
+				}
+			} else {
+				checkedRadio.attr("checked", false);
+			}
+		}
+
+		function checkBrand(treeNode, btn) {
+			if (btn.attr("checked")) {
+				var pObj = $("#checkbox_" + treeNode.getParentNode().id);
+				if (!pObj.attr("checked")) {
+					pObj.attr("checked", true);
+				}
+			}
+		}
+
+		function getCheckedRadio(radioName) {
+			var r = document.getElementsByName(radioName);
+			for(var i=0; i<r.length; i++)    {
+				if(r[i].checked)    {
+					return $(r[i]);
+				}
+			}
+			return null;
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+	  .radioBtn {height: 16px;vertical-align: middle;}
+	  .checkboxBtn {vertical-align: middle;margin-right: 2px;}
+	  </style>
+ </HEAD>
+
+<BODY>
+<h1>checkbox / radio 共存</h1>
+<h6>[ 文件路径: super/checkbox_radio.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>实现方法说明</h2>
+				<ul class="list">
+				<li>zTree 默认的 checkbox 和 radio 是无法共存的，但可以利用 自定义控件 的功能实现此需求，具体需求可以参考 "添加 自定义控件" 的详细说明</li>
+				<li class="highlight_red">对于 checkbox / radio 的联动规则，请根据需求制定自己的规则</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/super/diydom.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/super/diydom.html
new file mode 100644
index 0000000..1980ff9
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/super/diydom.html
@@ -0,0 +1,177 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - addHoverDom / removeHoverDom / addDiyDom</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+
+		var IDMark_Switch = "_switch",
+		IDMark_Icon = "_ico",
+		IDMark_Span = "_span",
+		IDMark_Input = "_input",
+		IDMark_Check = "_check",
+		IDMark_Edit = "_edit",
+		IDMark_Remove = "_remove",
+		IDMark_Ul = "_ul",
+		IDMark_A = "_a";
+		
+		var setting = {
+			view: {
+				addHoverDom: addHoverDom,
+				removeHoverDom: removeHoverDom,
+				addDiyDom: addDiyDom
+			}
+		};
+
+		var zNodes =[
+			{id:1, name:"hover事件显示控件", open:true,
+				children:[
+					   {id:11, name:"按钮1"},
+					   {id:12, name:"按钮2"},
+					   {id:13, name:"下拉框"},
+					   {id:141, name:"文本1"},
+					   {id:142, name:"文本2"},
+					   {id:15, name:"超链接"}
+
+				]},
+			{id:2, name:"始终显示控件", open:true,
+				children:[
+					   {id:21, name:"按钮1"},
+					   {id:22, name:"按钮2"},
+					   {id:23, name:"下拉框"},
+					   {id:24, name:"文本"},
+					   {id:25, name:"超链接"}
+				]}
+	 	];
+
+		function addHoverDom(treeId, treeNode) {
+			if (treeNode.parentNode && treeNode.parentNode.id!=1) return;
+			var aObj = $("#" + treeNode.tId + IDMark_A);
+			if (treeNode.id == 11) {
+				if ($("#diyBtn_"+treeNode.id).length>0) return;
+				var editStr = "<span id='diyBtn_space_" +treeNode.id+ "' >&nbsp;</span><span class='button icon03' id='diyBtn_" +treeNode.id+ "' title='"+treeNode.name+"' onfocus='this.blur();'></span>";
+				aObj.append(editStr);
+				var btn = $("#diyBtn_"+treeNode.id);
+				if (btn) btn.bind("click", function(){alert("diy Button for " + treeNode.name);});
+			} else if (treeNode.id == 12) {
+				if ($("#diyBtn_"+treeNode.id).length>0) return;
+				var editStr = "<span class='button icon04' id='diyBtn_" +treeNode.id+ "' title='"+treeNode.name+"' onfocus='this.blur();'></span>";
+				aObj.after(editStr);
+				var btn = $("#diyBtn_"+treeNode.id);
+				if (btn) btn.bind("click", function(){alert("diy Button for " + treeNode.name);});
+			} else if (treeNode.id == 13) {
+				if ($("#diyBtn_"+treeNode.id).length>0) return;
+				var editStr = "<span id='diyBtn_space_" +treeNode.id+ "' >&nbsp;</span><select class='selDemo ' id='diyBtn_" +treeNode.id+ "'><option value=1>1</option><option value=2>2</option><option value=3>3</option></select>";
+				aObj.after(editStr);
+				var btn = $("#diyBtn_"+treeNode.id);
+				if (btn) btn.bind("change", function(){alert("diy Select value="+btn.attr("value")+" for " + treeNode.name);});
+			} else if (treeNode.id == 141) {
+				if ($("#diyBtn_"+treeNode.id).length>0) return;
+				var editStr = "<span class='test' id='diyBtn_" +treeNode.id+ "'>Text Demo...</span>";
+				aObj.append(editStr);
+			} else if (treeNode.id == 142) {
+				if ($("#diyBtn_"+treeNode.id).length>0) return;
+				var editStr = "<span id='diyBtn_" +treeNode.id+ "'>Text Demo...</span>";
+				aObj.after(editStr);
+			} else if (treeNode.id == 15) {
+				if ($("#diyBtn1_"+treeNode.id).length>0) return;
+				if ($("#diyBtn2_"+treeNode.id).length>0) return;
+				var editStr = "<a id='diyBtn1_" +treeNode.id+ "' onclick='alert(1);return false;' style='margin:0 0 0 5px;'>链接1</a>" +
+					"<a id='diyBtn2_" +treeNode.id+ "' onclick='alert(2);return false;' style='margin:0 0 0 5px;'>链接2</a>";
+				aObj.append(editStr);
+			}
+		}
+
+		function removeHoverDom(treeId, treeNode) {
+			if (treeNode.parentTId && treeNode.getParentNode().id!=1) return;
+			if (treeNode.id == 15) {
+				$("#diyBtn1_"+treeNode.id).unbind().remove();
+				$("#diyBtn2_"+treeNode.id).unbind().remove();
+			} else {
+				$("#diyBtn_"+treeNode.id).unbind().remove();
+				$("#diyBtn_space_" +treeNode.id).unbind().remove();
+			}
+		}
+
+		function addDiyDom(treeId, treeNode) {
+			if (treeNode.parentNode && treeNode.parentNode.id!=2) return;
+			var aObj = $("#" + treeNode.tId + IDMark_A);
+			if (treeNode.id == 21) {
+				var editStr = "<span class='demoIcon' id='diyBtn_" +treeNode.id+ "' title='"+treeNode.name+"' onfocus='this.blur();'><span class='button icon01'></span></span>";
+				aObj.append(editStr);
+				var btn = $("#diyBtn_"+treeNode.id);
+				if (btn) btn.bind("click", function(){alert("diy Button for " + treeNode.name);});
+			} else if (treeNode.id == 22) {
+				var editStr = "<span class='demoIcon' id='diyBtn_" +treeNode.id+ "' title='"+treeNode.name+"' onfocus='this.blur();'><span class='button icon02'></span></span>";
+				aObj.after(editStr);
+				var btn = $("#diyBtn_"+treeNode.id);
+				if (btn) btn.bind("click", function(){alert("diy Button for " + treeNode.name);});
+			} else if (treeNode.id == 23) {
+				var editStr = "<select class='selDemo' id='diyBtn_" +treeNode.id+ "'><option value=1>1</option><option value=2>2</option><option value=3>3</option></select>";
+				aObj.after(editStr);
+				var btn = $("#diyBtn_"+treeNode.id);
+				if (btn) btn.bind("change", function(){alert("diy Select value="+btn.attr("value")+" for " + treeNode.name);});
+			} else if (treeNode.id == 24) {
+				var editStr = "<span id='diyBtn_" +treeNode.id+ "'>Text Demo...</span>";
+				aObj.after(editStr);
+			} else if (treeNode.id == 25) {
+				var editStr = "<a id='diyBtn1_" +treeNode.id+ "' onclick='alert(1);return false;'>链接1</a>" +
+					"<a id='diyBtn2_" +treeNode.id+ "' onclick='alert(2);return false;'>链接2</a>";
+				aObj.after(editStr);
+			}
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+.ztree li span.demoIcon{padding:0 2px 0 10px;}
+.ztree li span.button.icon01{margin:0; background: url(../../../css/zTreeStyle/img/diy/3.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon02{margin:0; background: url(../../../css/zTreeStyle/img/diy/4.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon03{margin:0; background: url(../../../css/zTreeStyle/img/diy/5.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon04{margin:0; background: url(../../../css/zTreeStyle/img/diy/6.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon05{margin:0; background: url(../../../css/zTreeStyle/img/diy/7.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon06{margin:0; background: url(../../../css/zTreeStyle/img/diy/8.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+	</style>
+ </HEAD>
+
+<BODY>
+<h1>添加自定义控件</h1>
+<h6>[ 文件路径: super/diydom.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1、实现方法说明</h2>
+				<ul class="list">
+				<li>利用 setting.view.addHoverDom / removeHoverDom / addDiyDom 这几个参数的配置可以很容易的实现自定义控件的功能</li>
+				<li class="highlight_red">添加自定义控件，请务必掌握 zTree 节点对象的命名规则，以保证正常添加 DOM 控件</li>
+				<li class="highlight_red">如果添加标准的 select / checkbox / radio 等，请注意适当调整 zTree 的布局 css，保证 zTree 能正常显示</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2、setting 配置信息说明</h2>
+				<ul class="list">
+				<li>使用 setting.view.addHoverDom / removeHoverDom / addDiyDom 属性，详细请参见 API 文档中的相关内容</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、treeNode 节点数据说明</h2>
+				<ul class="list">
+				<li>对 节点数据 没有特殊要求，用户可以根据自己的需求添加自定义属性</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/super/dragWithOther.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/super/dragWithOther.html
new file mode 100644
index 0000000..04a5b7c
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/super/dragWithOther.html
@@ -0,0 +1,235 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - drag with other DOM</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>-->
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var MoveTest = {
+			errorMsg: "放错了...请选择正确的类别！",
+			curTarget: null,
+			curTmpTarget: null,
+			noSel: function() {
+				try {
+					window.getSelection ? window.getSelection().removeAllRanges() : document.selection.empty();
+				} catch(e){}
+			},
+			dragTree2Dom: function(treeId, treeNodes) {
+				return !treeNodes[0].isParent;
+			},
+			prevTree: function(treeId, treeNodes, targetNode) {
+				return !targetNode.isParent && targetNode.parentTId == treeNodes[0].parentTId;
+			},
+			nextTree: function(treeId, treeNodes, targetNode) {
+				return !targetNode.isParent && targetNode.parentTId == treeNodes[0].parentTId;
+			},
+			innerTree: function(treeId, treeNodes, targetNode) {
+				return targetNode!=null && targetNode.isParent && targetNode.tId == treeNodes[0].parentTId;
+			},
+			dropTree2Dom: function(e, treeId, treeNodes, targetNode, moveType) {
+				var domId = "dom_" + treeNodes[0].getParentNode().id;
+				if (moveType == null && (domId == e.target.id || $(e.target).parents("#" + domId).length > 0)) {
+					var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+					zTree.removeNode(treeNodes[0]);
+
+					var newDom = $("span[domId=" + treeNodes[0].id + "]");
+					if (newDom.length > 0) {
+						newDom.removeClass("domBtn_Disabled");
+						newDom.addClass("domBtn");
+					} else {
+						$("#" + domId).append("<span class='domBtn' domId='" + treeNodes[0].id + "'>" + treeNodes[0].name + "</span>");
+					}
+					MoveTest.updateType();
+				} else if ( $(e.target).parents(".domBtnDiv").length > 0) {
+					alert(MoveTest.errorMsg);
+				}
+			},
+			dom2Tree: function(e, treeId, treeNode) {
+				var target = MoveTest.curTarget, tmpTarget = MoveTest.curTmpTarget;
+				if (!target) return;
+				var zTree = $.fn.zTree.getZTreeObj("treeDemo"), parentNode;
+				if (treeNode != null && treeNode.isParent && "dom_" + treeNode.id == target.parent().attr("id")) {
+					parentNode = treeNode;
+				} else if (treeNode != null && !treeNode.isParent && "dom_" + treeNode.getParentNode().id == target.parent().attr("id")) {
+					parentNode = treeNode.getParentNode();
+				}
+
+				if (tmpTarget) tmpTarget.remove();
+				if (!!parentNode) {
+					var nodes = zTree.addNodes(parentNode, {id:target.attr("domId"), name: target.text()});
+					zTree.selectNode(nodes[0]);
+				} else {
+					target.removeClass("domBtn_Disabled");
+					target.addClass("domBtn");
+					alert(MoveTest.errorMsg);
+				}
+				MoveTest.updateType();
+				MoveTest.curTarget = null;
+				MoveTest.curTmpTarget = null;
+			},
+			updateType: function() {
+				var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+				nodes = zTree.getNodes();
+				for (var i=0, l=nodes.length; i<l; i++) {
+					var num = nodes[i].children ? nodes[i].children.length : 0;
+					nodes[i].name = nodes[i].name.replace(/ \(.*\)/gi, "") + " (" + num + ")";
+					zTree.updateNode(nodes[i]);
+				}
+			},
+			bindDom: function() {
+				$(".domBtnDiv").bind("mousedown", MoveTest.bindMouseDown);
+			},
+			bindMouseDown: function(e) {
+				var target = e.target;
+				if (target!=null && target.className=="domBtn") {
+					var doc = $(document), target = $(target),
+					docScrollTop = doc.scrollTop(),
+					docScrollLeft = doc.scrollLeft();
+					target.addClass("domBtn_Disabled");
+					target.removeClass("domBtn");
+					curDom = $("<span class='dom_tmp domBtn'>" + target.text() + "</span>");
+					curDom.appendTo("body");
+
+					curDom.css({
+						"top": (e.clientY + docScrollTop + 3) + "px",
+						"left": (e.clientX + docScrollLeft + 3) + "px"
+					});
+					MoveTest.curTarget = target;
+					MoveTest.curTmpTarget = curDom;
+
+					doc.bind("mousemove", MoveTest.bindMouseMove);
+					doc.bind("mouseup", MoveTest.bindMouseUp);
+					doc.bind("selectstart", MoveTest.docSelect);
+				}
+				if(e.preventDefault) {
+					e.preventDefault();
+				}
+			},
+			bindMouseMove: function(e) {
+				MoveTest.noSel();
+				var doc = $(document), 
+				docScrollTop = doc.scrollTop(),
+				docScrollLeft = doc.scrollLeft(),
+				tmpTarget = MoveTest.curTmpTarget;
+				if (tmpTarget) {
+					tmpTarget.css({
+						"top": (e.clientY + docScrollTop + 3) + "px",
+						"left": (e.clientX + docScrollLeft + 3) + "px"
+					});
+				}
+				return false;
+			},
+			bindMouseUp: function(e) {
+				var doc = $(document);
+				doc.unbind("mousemove", MoveTest.bindMouseMove);
+				doc.unbind("mouseup", MoveTest.bindMouseUp);
+				doc.unbind("selectstart", MoveTest.docSelect);
+
+				var target = MoveTest.curTarget, tmpTarget = MoveTest.curTmpTarget;
+				if (tmpTarget) tmpTarget.remove();
+
+				if ($(e.target).parents("#treeDemo").length == 0) {
+					if (target) {
+						target.removeClass("domBtn_Disabled");
+						target.addClass("domBtn");
+					}
+					MoveTest.curTarget = null;
+					MoveTest.curTmpTarget = null;
+				}
+			},
+			bindSelect: function() {
+				return false;
+			}
+		};
+
+		var setting = {
+			edit: {
+				enable: true,
+				showRemoveBtn: false,
+				showRenameBtn: false,
+				drag: {
+					prev: MoveTest.prevTree,
+					next: MoveTest.nextTree,
+					inner: MoveTest.innerTree
+				}
+			},
+			data: {
+				keep: {
+					parent: true,
+					leaf: true
+				},
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeDrag: MoveTest.dragTree2Dom,
+				onDrop: MoveTest.dropTree2Dom,
+				onMouseUp: MoveTest.dom2Tree
+			},
+			view: {
+				selectedMulti: false
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"植物", isParent: true, open:true},
+			{ id:2, pId:0, name:"动物", isParent: true, open:true},
+			{ id:20, pId:2, name:"大象"},
+			{ id:29, pId:2, name:"鲨鱼"},
+			{ id:10, pId:1, name:"大白菜"},
+			{ id:19, pId:1, name:"西红柿"}
+		];
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			MoveTest.updateType();
+			MoveTest.bindDom();
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+.dom_line {margin:2px;border-bottom:1px gray dotted;height:1px}
+.domBtnDiv {display:block;padding:2px;border:1px gray dotted;background-color:powderblue}
+.categoryDiv {display:inline-block; width:335px}
+.domBtn {display:inline-block;cursor:pointer;padding:2px;margin:2px 10px;border:1px gray solid;background-color:#FFE6B0}
+.domBtn_Disabled {display:inline-block;cursor:default;padding:2px;margin:2px 10px;border:1px gray solid;background-color:#DFDFDF;color:#999999}
+.dom_tmp {position:absolute;font-size:12px;}
+	</style>
+</HEAD>
+
+<BODY>
+<h1>与其他 DOM 拖拽互动</h1>
+<h6>[ 文件路径: super/dragWithOther.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>实现方法说明</h2>
+				<ul class="list">
+				<li>zTree v3.2 版本修正了 onDrag/onDrop 中的 event 对象，因此可以较容易的控制将节点拖拽到其他 DOM </li>
+				<li class="highlight_red">将其他 DOM 拖拽到 zTree 需要自己制作相关的拖拽代码</li>
+				<li class="highlight_red">这仅仅是一个最简单的演示，如果需要更炫的效果，需要制作更复杂的代码</li>
+				</ul>
+			</li>
+			<li class="title"><h2>请拖拽下面内容到 树节点上</h2>
+				<div class="domBtnDiv">
+					<div id="dom_1" class="categoryDiv"><span class="domBtn" domId="11">大树</span><span class="domBtn" domId="12">小草</span><span class="domBtn" domId="13">花朵</span></div>
+					<div class="dom_line"></div>
+					<div id="dom_2" class="categoryDiv"><span class="domBtn" domId="21">老虎</span><span class="domBtn" domId="22">狗熊</span><span class="domBtn" domId="23">狮子</span></div>
+				</div>
+				<span class="highlight_red">也可以把二级节点拖拽到以上图层 </span>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/super/left_menu.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/super/left_menu.html
new file mode 100644
index 0000000..4b9941a
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/super/left_menu.html
@@ -0,0 +1,152 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - left_menu</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var curMenu = null, zTree_Menu = null;
+		var setting = {
+			view: {
+				showLine: true,
+				selectedMulti: false,
+				dblClickExpand: false
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				onNodeCreated: this.onNodeCreated,
+				beforeClick: this.beforeClick,
+				onClick: this.onClick
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"主菜单 1", open:true},
+			{ id:11, pId:1, name:"子菜单 1-1"},
+			{ id:111, pId:11, name:"叶子节点 1-1-1"},
+			{ id:112, pId:11, name:"叶子节点 1-1-2"},
+			{ id:113, pId:11, name:"叶子节点 1-1-3"},
+			{ id:114, pId:11, name:"叶子节点 1-1-4"},
+			{ id:12, pId:1, name:"子菜单 1-2"},
+			{ id:121, pId:12, name:"叶子节点 1-2-1"},
+			{ id:122, pId:12, name:"叶子节点 1-2-2"},
+			{ id:123, pId:12, name:"叶子节点 1-2-3"},
+			{ id:124, pId:12, name:"叶子节点 1-2-4"},
+			{ id:2, pId:0, name:"主菜单 2"},
+			{ id:21, pId:2, name:"子菜单 2-1"},
+			{ id:211, pId:21, name:"叶子节点 2-1-1"},
+			{ id:212, pId:21, name:"叶子节点 2-1-2"},
+			{ id:213, pId:21, name:"叶子节点 2-1-3"},
+			{ id:214, pId:21, name:"叶子节点 2-1-4"},
+			{ id:22, pId:2, name:"子菜单 2-2"},
+			{ id:221, pId:22, name:"叶子节点 2-2-1"},
+			{ id:222, pId:22, name:"叶子节点 2-2-2"},
+			{ id:223, pId:22, name:"叶子节点 2-2-3"},
+			{ id:224, pId:22, name:"叶子节点 2-2-4"},
+			{ id:3, pId:0, name:"主菜单 3"},
+			{ id:31, pId:3, name:"子菜单 3-1"},
+			{ id:311, pId:31, name:"叶子节点 3-1-1"},
+			{ id:312, pId:31, name:"叶子节点 3-1-2"},
+			{ id:313, pId:31, name:"叶子节点 3-1-3"},
+			{ id:314, pId:31, name:"叶子节点 3-1-4"},
+			{ id:32, pId:3, name:"子菜单 3-2"},
+			{ id:321, pId:32, name:"叶子节点 3-2-1"},
+			{ id:322, pId:32, name:"叶子节点 3-2-2"},
+			{ id:323, pId:32, name:"叶子节点 3-2-3"},
+			{ id:324, pId:32, name:"叶子节点 3-2-4"}			
+		];
+
+		function beforeClick(treeId, node) {
+			if (node.isParent) {
+				if (node.level === 0) {
+					var pNode = curMenu;
+					while (pNode && pNode.level !==0) {
+						pNode = pNode.getParentNode();
+					}
+					if (pNode !== node) {
+						var a = $("#" + pNode.tId + "_a");
+						a.removeClass("cur");
+						zTree_Menu.expandNode(pNode, false);
+					}
+					a = $("#" + node.tId + "_a");
+					a.addClass("cur");
+
+					var isOpen = false;
+					for (var i=0,l=node.children.length; i<l; i++) {
+						if(node.children[i].open) {
+							isOpen = true;
+							break;
+						}
+					}
+					if (isOpen) {
+						zTree_Menu.expandNode(node, true);
+						curMenu = node;
+					} else {
+						zTree_Menu.expandNode(node.children[0].isParent?node.children[0]:node, true);
+						curMenu = node.children[0];
+					}
+				} else {
+					zTree_Menu.expandNode(node);
+				}
+			}
+			return !node.isParent;
+		}
+		function onClick(e, treeId, node) {
+			alert("Do what you want to do!");
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			zTree_Menu = $.fn.zTree.getZTreeObj("treeDemo");
+			curMenu = zTree_Menu.getNodes()[0].children[0].children[0];
+			zTree_Menu.selectNode(curMenu);
+			var a = $("#" + zTree_Menu.getNodes()[0].tId + "_a");
+			a.addClass("cur");
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+.ztree li a.level0 {width:200px;height: 20px; text-align: center; display:block; background-color: #0B61A4; border:1px silver solid;}
+.ztree li a.level0.cur {background-color: #66A3D2; }
+.ztree li a.level0 span {display: block; color: white; padding-top:3px; font-size:12px; font-weight: bold;word-spacing: 2px;}
+.ztree li a.level0 span.button {	float:right; margin-left: 10px; visibility: visible;display:none;}
+.ztree li span.button.switch.level0 {display:none;}
+	</style>
+ </HEAD>
+
+<BODY>
+<h1>左侧菜单</h1>
+<h6>[ 文件路径: super/left_menu.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>实现方法说明</h2>
+				<ul class="list">
+				<li>在 “Demo 演示”中的左侧菜单就是用 zTree 实现的，主要是靠 css 样式负责排版，利用 setting 中的配置进行功能制作，本 Demo 对实现 左侧菜单进行简单的介绍，你也可以通过查看 “Demo 演示”页面的源码深入了解。</li>
+				<li class="highlight_red">1、关于 css 完全可以根据自己的需要进行个性化调整，例如：此 Demo 的菜单样式 就 与 “Demo 演示”页面的不一样，仅供对比参考</li>
+				<li class="highlight_red">2、主要用到的配置有：<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;setting.view.showIcon / showLine / selectedMulti / dblClickExpand<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;setting.callback.onNodeCreated / beforeClick / onClick
+				</li>
+				<li>3、是否需要限制单一路径展开，完全由你的需求而定，实现代码可参考 "保持展开单一路径"</li>
+				<li>4、其他辅助规则，请根据实际情况自行编写</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/super/left_menuForOutLook.gif b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/super/left_menuForOutLook.gif
new file mode 100644
index 0000000..c252f0f
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/super/left_menuForOutLook.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/super/left_menuForOutLook.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/super/left_menuForOutLook.html
new file mode 100644
index 0000000..bf6eb30
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/super/left_menuForOutLook.html
@@ -0,0 +1,136 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - left_menu for Outlook</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var curMenu = null, zTree_Menu = null;
+		var setting = {
+			view: {
+				showLine: false,
+				showIcon: false,
+				selectedMulti: false,
+				dblClickExpand: false,
+				addDiyDom: addDiyDom
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeClick: beforeClick
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"文件夹", open:true},
+			{ id:11, pId:1, name:"收件箱"},
+			{ id:111, pId:11, name:"收件箱1"},
+			{ id:112, pId:111, name:"收件箱2"},
+			{ id:113, pId:112, name:"收件箱3"},
+			{ id:114, pId:113, name:"收件箱4"},
+			{ id:12, pId:1, name:"垃圾邮件"},
+			{ id:13, pId:1, name:"草稿"},
+			{ id:14, pId:1, name:"已发送邮件"},
+			{ id:15, pId:1, name:"已删除邮件"},
+			{ id:3, pId:0, name:"快速视图"},
+			{ id:31, pId:3, name:"文档"},
+			{ id:32, pId:3, name:"照片"}
+		];
+
+		function addDiyDom(treeId, treeNode) {
+			var spaceWidth = 5;
+			var switchObj = $("#" + treeNode.tId + "_switch"),
+			icoObj = $("#" + treeNode.tId + "_ico");
+			switchObj.remove();
+			icoObj.before(switchObj);
+
+			if (treeNode.level > 1) {
+				var spaceStr = "<span style='display: inline-block;width:" + (spaceWidth * treeNode.level)+ "px'></span>";
+				switchObj.before(spaceStr);
+			}
+		}
+
+		function beforeClick(treeId, treeNode) {
+			if (treeNode.level == 0 ) {
+				var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+				zTree.expandNode(treeNode);
+				return false;
+			}
+			return true;
+		}
+
+		$(document).ready(function(){
+			var treeObj = $("#treeDemo");
+			$.fn.zTree.init(treeObj, setting, zNodes);
+			zTree_Menu = $.fn.zTree.getZTreeObj("treeDemo");
+			curMenu = zTree_Menu.getNodes()[0].children[0].children[0];
+			zTree_Menu.selectNode(curMenu);
+
+			treeObj.hover(function () {
+				if (!treeObj.hasClass("showIcon")) {
+					treeObj.addClass("showIcon");
+				}
+			}, function() {
+				treeObj.removeClass("showIcon");
+			});
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+.ztree * {font-size: 10pt;font-family:"Microsoft Yahei",Verdana,Simsun,"Segoe UI Web Light","Segoe UI Light","Segoe UI Web Regular","Segoe UI","Segoe UI Symbol","Helvetica Neue",Arial}
+.ztree li ul{ margin:0; padding:0}
+.ztree li {line-height:30px;}
+.ztree li a {width:200px;height:30px;padding-top: 0px;}
+.ztree li a:hover {text-decoration:none; background-color: #E7E7E7;}
+.ztree li a span.button.switch {visibility:hidden}
+.ztree.showIcon li a span.button.switch {visibility:visible}
+.ztree li a.curSelectedNode {background-color:#D4D4D4;border:0;height:30px;}
+.ztree li span {line-height:30px;}
+.ztree li span.button {margin-top: -7px;}
+.ztree li span.button.switch {width: 16px;height: 16px;}
+
+.ztree li a.level0 span {font-size: 150%;font-weight: bold;}
+.ztree li span.button {background-image:url("./left_menuForOutLook.png"); *background-image:url("./left_menuForOutLook.gif")}
+.ztree li span.button.switch.level0 {width: 20px; height:20px}
+.ztree li span.button.switch.level1 {width: 20px; height:20px}
+.ztree li span.button.noline_open {background-position: 0 0;}
+.ztree li span.button.noline_close {background-position: -18px 0;}
+.ztree li span.button.noline_open.level0 {background-position: 0 -18px;}
+.ztree li span.button.noline_close.level0 {background-position: -18px -18px;}
+	</style>
+ </HEAD>
+
+<BODY>
+<h1>OutLook 样式的左侧菜单</h1>
+<h6>[ 文件路径: super/left_menuForOutLook.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>实现方法说明</h2>
+				<ul class="list">
+				<li>帮朋友用 zTree 实现了一个貌似 Outlook.com 的菜单，特拿出来分享给大家</li>
+				<li class="highlight_red">1、请注意本页面源码中的 css 部分</li>
+				<li class="highlight_red">2、请查看源码中 js 的使用，特别是利用 addDiyDom 回调将 展开按钮 转移到 &lt;a&gt; 标签内</li>
+				<li class="highlight_red">3、利用添加 zTree 的 class 实现展开按钮的隐藏、显示</li>
+				<li>4、其他辅助规则，请根据实际情况自行编写</li>
+				<li>5、当前规则说明:<br/>
+				&nbsp;&nbsp;单击根节点可以展开、折叠;<br/>
+				&nbsp;&nbsp;非根节点只有点击 箭头 图标才可以展开、折叠;<br/>
+				</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/super/left_menuForOutLook.png b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/super/left_menuForOutLook.png
new file mode 100644
index 0000000..36e8acf
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/super/left_menuForOutLook.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/super/oneclick.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/super/oneclick.html
new file mode 100644
index 0000000..93e32a4
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/super/oneclick.html
@@ -0,0 +1,87 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - one click</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				dblClickExpand: false,
+				showLine: false
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				onClick: onClick
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"根 Root", open:true},
+			{ id:11, pId:1, name:"父节点 1-1", open:true},
+			{ id:111, pId:11, name:"叶子节点 1-1-1"},
+			{ id:112, pId:11, name:"叶子节点 1-1-2"},
+			{ id:113, pId:11, name:"叶子节点 1-1-3"},
+			{ id:114, pId:11, name:"叶子节点 1-1-4"},
+			{ id:12, pId:1, name:"父节点 1-2", open:true},
+			{ id:121, pId:12, name:"叶子节点 1-2-1"},
+			{ id:122, pId:12, name:"叶子节点 1-2-2"},
+			{ id:123, pId:12, name:"叶子节点 1-2-3"},
+			{ id:124, pId:12, name:"叶子节点 1-2-4"},
+			{ id:13, pId:1, name:"父节点 1-3", open:true},
+			{ id:131, pId:13, name:"叶子节点 1-3-1"},
+			{ id:132, pId:13, name:"叶子节点 1-3-2"},
+			{ id:133, pId:13, name:"叶子节点 1-3-3"},
+			{ id:134, pId:13, name:"叶子节点 1-3-4"}
+		];
+
+		function onClick(e,treeId, treeNode) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			zTree.expandNode(treeNode);
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+.ztree li button.switch {visibility:hidden; width:1px;}
+.ztree li button.switch.roots_docu {visibility:visible; width:16px;}
+.ztree li button.switch.center_docu {visibility:visible; width:16px;}
+.ztree li button.switch.bottom_docu {visibility:visible; width:16px;}
+	</style>
+ </HEAD>
+
+<BODY>
+<h1>单击展开/折叠节点</h1>
+<h6>[ 文件路径: super/oneclick.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>实现方法说明</h2>
+				<ul class="list">
+				<li>zTree 默认不提供单击展开节点的功能，但可以利用 onClick 事件回调函数轻松实现此功能</li>
+				<li class="highlight_red">为了避免与双击功能冲突，建议关闭双击展开节点的功能，请设置 setting.view.dblClickExpand = false </li>
+				<li class="highlight_red">可以将所有的 +/- 开关隐藏，请查看本页面源码，查看 css 设置 </li>
+				<li class="highlight_red">由于 +/- 开关与 节点连接线是配套的，所以如果不显示 +/- 开关的话，那么请设置 setting.view.showLine = false 隐藏连接线 </li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/super/oneroot.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/super/oneroot.html
new file mode 100644
index 0000000..6624e7b
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/super/oneroot.html
@@ -0,0 +1,79 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - one root</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				dblClickExpand: dblClickExpand
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"根 Root", open:true},
+			{ id:11, pId:1, name:"父节点 1-1", open:true},
+			{ id:111, pId:11, name:"叶子节点 1-1-1"},
+			{ id:112, pId:11, name:"叶子节点 1-1-2"},
+			{ id:113, pId:11, name:"叶子节点 1-1-3"},
+			{ id:114, pId:11, name:"叶子节点 1-1-4"},
+			{ id:12, pId:1, name:"父节点 1-2", open:true},
+			{ id:121, pId:12, name:"叶子节点 1-2-1"},
+			{ id:122, pId:12, name:"叶子节点 1-2-2"},
+			{ id:123, pId:12, name:"叶子节点 1-2-3"},
+			{ id:124, pId:12, name:"叶子节点 1-2-4"},
+			{ id:13, pId:1, name:"父节点 1-3", open:true},
+			{ id:131, pId:13, name:"叶子节点 1-3-1"},
+			{ id:132, pId:13, name:"叶子节点 1-3-2"},
+			{ id:133, pId:13, name:"叶子节点 1-3-3"},
+			{ id:134, pId:13, name:"叶子节点 1-3-4"}
+		];
+
+		function dblClickExpand(treeId, treeNode) {
+			return treeNode.level > 0;
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+.ztree li span.button.switch.level0 {visibility:hidden; width:1px;}
+.ztree li ul.level0 {padding:0; background:none;}
+	</style>
+ </HEAD>
+
+<BODY>
+<h1>冻结根节点</h1>
+<h6>[ 文件路径: super/oneroot.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>实现方法说明</h2>
+				<ul class="list">
+				<li>对于这种只有一个根节点，且不显示 +/- 开关的需求，需要利用 css、setting 配合使用</li>
+				<li class="highlight_red">zTree v3.x 可以针对指定的 level，进行样式设定，请查看本页面源码，查看 css 设置</li>
+				<li class="highlight_red">设置 setting.view.dblClickExpand 指向 Function，可以只针对根节点关闭双击展开的操作</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/super/rightClickMenu.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/super/rightClickMenu.html
new file mode 100644
index 0000000..9e5b404
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/super/rightClickMenu.html
@@ -0,0 +1,168 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - select menu</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				dblClickExpand: false
+			},
+			check: {
+				enable: true
+			},
+			callback: {
+				onRightClick: OnRightClick
+			}
+		};
+
+		var zNodes =[
+			{id:1, name:"无右键菜单 1", open:true, noR:true,
+				children:[
+					   {id:11, name:"节点 1-1", noR:true},
+					   {id:12, name:"节点 1-2", noR:true}
+
+				]},
+			{id:2, name:"右键操作 2", open:true,
+				children:[
+					   {id:21, name:"节点 2-1"},
+					   {id:22, name:"节点 2-2"},
+					   {id:23, name:"节点 2-3"},
+					   {id:24, name:"节点 2-4"}
+				]},
+			{id:3, name:"右键操作 3", open:true,
+				children:[
+					   {id:31, name:"节点 3-1"},
+					   {id:32, name:"节点 3-2"},
+					   {id:33, name:"节点 3-3"},
+					   {id:34, name:"节点 3-4"}
+				]}
+  	 	];
+
+		function OnRightClick(event, treeId, treeNode) {
+			if (!treeNode && event.target.tagName.toLowerCase() != "button" && $(event.target).parents("a").length == 0) {
+				zTree.cancelSelectedNode();
+				showRMenu("root", event.clientX, event.clientY);
+			} else if (treeNode && !treeNode.noR) {
+				zTree.selectNode(treeNode);
+				showRMenu("node", event.clientX, event.clientY);
+			}
+		}
+
+		function showRMenu(type, x, y) {
+			$("#rMenu ul").show();
+			if (type=="root") {
+				$("#m_del").hide();
+				$("#m_check").hide();
+				$("#m_unCheck").hide();
+			} else {
+				$("#m_del").show();
+				$("#m_check").show();
+				$("#m_unCheck").show();
+			}
+			rMenu.css({"top":y+"px", "left":x+"px", "visibility":"visible"});
+
+			$("body").bind("mousedown", onBodyMouseDown);
+		}
+		function hideRMenu() {
+			if (rMenu) rMenu.css({"visibility": "hidden"});
+			$("body").unbind("mousedown", onBodyMouseDown);
+		}
+		function onBodyMouseDown(event){
+			if (!(event.target.id == "rMenu" || $(event.target).parents("#rMenu").length>0)) {
+				rMenu.css({"visibility" : "hidden"});
+			}
+		}
+		var addCount = 1;
+		function addTreeNode() {
+			hideRMenu();
+			var newNode = { name:"增加" + (addCount++)};
+			if (zTree.getSelectedNodes()[0]) {
+				newNode.checked = zTree.getSelectedNodes()[0].checked;
+				zTree.addNodes(zTree.getSelectedNodes()[0], newNode);
+			} else {
+				zTree.addNodes(null, newNode);
+			}
+		}
+		function removeTreeNode() {
+			hideRMenu();
+			var nodes = zTree.getSelectedNodes();
+			if (nodes && nodes.length>0) {
+				if (nodes[0].children && nodes[0].children.length > 0) {
+					var msg = "要删除的节点是父节点，如果删除将连同子节点一起删掉。\n\n请确认！";
+					if (confirm(msg)==true){
+						zTree.removeNode(nodes[0]);
+					}
+				} else {
+					zTree.removeNode(nodes[0]);
+				}
+			}
+		}
+		function checkTreeNode(checked) {
+			var nodes = zTree.getSelectedNodes();
+			if (nodes && nodes.length>0) {
+				zTree.checkNode(nodes[0], checked, true);
+			}
+			hideRMenu();
+		}
+		function resetTree() {
+			hideRMenu();
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		}
+
+		var zTree, rMenu;
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			rMenu = $("#rMenu");
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+div#rMenu {position:absolute; visibility:hidden; top:0; background-color: #555;text-align: left;padding: 2px;}
+div#rMenu ul li{
+	margin: 1px 0;
+	padding: 0 5px;
+	cursor: pointer;
+	list-style: none outside none;
+	background-color: #DFDFDF;
+}
+	</style>
+ </HEAD>
+
+<BODY>
+<h1>右键菜单的实现</h1>
+<h6>[ 文件路径: super/rightClickMenu.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>实现方法说明</h2>
+				<ul class="list">
+				<li>利用 beforeRightClick / onRightClick 事件回调函数简单实现的右键菜单</li>
+				<li class="highlight_red">Demo 中的菜单比较简陋，你完全可以配合其他自定义样式的菜单图层混合使用</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+<div id="rMenu">
+	<ul>
+		<li id="m_add" onclick="addTreeNode();">增加节点</li>
+		<li id="m_del" onclick="removeTreeNode();">删除节点</li>
+		<li id="m_check" onclick="checkTreeNode(true);">Check节点</li>
+		<li id="m_unCheck" onclick="checkTreeNode(false);">unCheck节点</li>
+		<li id="m_reset" onclick="resetTree();">恢复zTree</li>
+	</ul>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/super/select_menu.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/super/select_menu.html
new file mode 100644
index 0000000..67787c6
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/super/select_menu.html
@@ -0,0 +1,124 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - select menu</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				dblClickExpand: false
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeClick: beforeClick,
+				onClick: onClick
+			}
+		};
+
+		var zNodes =[
+			{id:1, pId:0, name:"北京"},
+			{id:2, pId:0, name:"天津"},
+			{id:3, pId:0, name:"上海"},
+			{id:6, pId:0, name:"重庆"},
+			{id:4, pId:0, name:"河北省", open:true},
+			{id:41, pId:4, name:"石家庄"},
+			{id:42, pId:4, name:"保定"},
+			{id:43, pId:4, name:"邯郸"},
+			{id:44, pId:4, name:"承德"},
+			{id:5, pId:0, name:"广东省", open:true},
+			{id:51, pId:5, name:"广州"},
+			{id:52, pId:5, name:"深圳"},
+			{id:53, pId:5, name:"东莞"},
+			{id:54, pId:5, name:"佛山"},
+			{id:6, pId:0, name:"福建省", open:true},
+			{id:61, pId:6, name:"福州"},
+			{id:62, pId:6, name:"厦门"},
+			{id:63, pId:6, name:"泉州"},
+			{id:64, pId:6, name:"三明"}
+		 ];
+
+		function beforeClick(treeId, treeNode) {
+			var check = (treeNode && !treeNode.isParent);
+			if (!check) alert("只能选择城市...");
+			return check;
+		}
+		
+		function onClick(e, treeId, treeNode) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nodes = zTree.getSelectedNodes(),
+			v = "";
+			nodes.sort(function compare(a,b){return a.id-b.id;});
+			for (var i=0, l=nodes.length; i<l; i++) {
+				v += nodes[i].name + ",";
+			}
+			if (v.length > 0 ) v = v.substring(0, v.length-1);
+			var cityObj = $("#citySel");
+			cityObj.attr("value", v);
+		}
+
+		function showMenu() {
+			var cityObj = $("#citySel");
+			var cityOffset = $("#citySel").offset();
+			$("#menuContent").css({left:cityOffset.left + "px", top:cityOffset.top + cityObj.outerHeight() + "px"}).slideDown("fast");
+
+			$("body").bind("mousedown", onBodyDown);
+		}
+		function hideMenu() {
+			$("#menuContent").fadeOut("fast");
+			$("body").unbind("mousedown", onBodyDown);
+		}
+		function onBodyDown(event) {
+			if (!(event.target.id == "menuBtn" || event.target.id == "menuContent" || $(event.target).parents("#menuContent").length>0)) {
+				hideMenu();
+			}
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+	</style>
+ </HEAD>
+
+<BODY>
+<h1>下拉菜单</h1>
+<h6>[ 文件路径: super/select_menu.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul class="list">
+			<li class="title">&nbsp;&nbsp;<span class="highlight_red">选择城市时，按下 Ctrl 键可以进行多选</span></li>
+			<li class="title">&nbsp;&nbsp;城市：<input id="citySel" type="text" readonly value="" style="width:120px;"/>
+		&nbsp;<a id="menuBtn" href="#" onclick="showMenu(); return false;">选择</a></li>
+		</ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>实现方法说明</h2>
+				<ul class="list">
+				<li>用 zTree 实现这种下拉菜单，应该说是比较容易的，你只需要控制 zTree 所在容器的隐藏/显示，以及位置即可。</li>
+				<li class="highlight_red">zTree v3.x 实现了多点选中功能，因此对于需要多选的下拉菜单也易如反掌。</li>
+				<li class="highlight_red">利用 setting 的各项配置参数，完全可以满足大部分的功能需求。</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+
+<div id="menuContent" class="menuContent" style="display:none; position: absolute;">
+	<ul id="treeDemo" class="ztree" style="margin-top:0; width:160px;"></ul>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/super/select_menu_checkbox.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/super/select_menu_checkbox.html
new file mode 100644
index 0000000..529b01d
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/super/select_menu_checkbox.html
@@ -0,0 +1,126 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - checkbox select menu</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+<!--	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			check: {
+				enable: true,
+				chkboxType: {"Y":"", "N":""}
+			},
+			view: {
+				dblClickExpand: false
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeClick: beforeClick,
+				onCheck: onCheck
+			}
+		};
+
+		var zNodes =[
+			{id:1, pId:0, name:"北京"},
+			{id:2, pId:0, name:"天津"},
+			{id:3, pId:0, name:"上海"},
+			{id:6, pId:0, name:"重庆"},
+			{id:4, pId:0, name:"河北省", open:true, nocheck:true},
+			{id:41, pId:4, name:"石家庄"},
+			{id:42, pId:4, name:"保定"},
+			{id:43, pId:4, name:"邯郸"},
+			{id:44, pId:4, name:"承德"},
+			{id:5, pId:0, name:"广东省", open:true, nocheck:true},
+			{id:51, pId:5, name:"广州"},
+			{id:52, pId:5, name:"深圳"},
+			{id:53, pId:5, name:"东莞"},
+			{id:54, pId:5, name:"佛山"},
+			{id:6, pId:0, name:"福建省", open:true, nocheck:true},
+			{id:61, pId:6, name:"福州"},
+			{id:62, pId:6, name:"厦门"},
+			{id:63, pId:6, name:"泉州"},
+			{id:64, pId:6, name:"三明"}
+		 ];
+
+		function beforeClick(treeId, treeNode) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			zTree.checkNode(treeNode, !treeNode.checked, null, true);
+			return false;
+		}
+		
+		function onCheck(e, treeId, treeNode) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nodes = zTree.getCheckedNodes(true),
+			v = "";
+			for (var i=0, l=nodes.length; i<l; i++) {
+				v += nodes[i].name + ",";
+			}
+			if (v.length > 0 ) v = v.substring(0, v.length-1);
+			var cityObj = $("#citySel");
+			cityObj.attr("value", v);
+		}
+
+		function showMenu() {
+			var cityObj = $("#citySel");
+			var cityOffset = $("#citySel").offset();
+			$("#menuContent").css({left:cityOffset.left + "px", top:cityOffset.top + cityObj.outerHeight() + "px"}).slideDown("fast");
+
+			$("body").bind("mousedown", onBodyDown);
+		}
+		function hideMenu() {
+			$("#menuContent").fadeOut("fast");
+			$("body").unbind("mousedown", onBodyDown);
+		}
+		function onBodyDown(event) {
+			if (!(event.target.id == "menuBtn" || event.target.id == "citySel" || event.target.id == "menuContent" || $(event.target).parents("#menuContent").length>0)) {
+				hideMenu();
+			}
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+	</style>
+ </HEAD>
+
+<BODY>
+<h1>带 checkbox 的多选下拉菜单  -- zTree</h1>
+<h6>[ 文件路径: super/select_menu_checkbox.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul class="list">
+			<li class="title">&nbsp;&nbsp;<span class="highlight_red">勾选 checkbox 或者 点击节点 进行选择</span></li>
+			<li class="title">&nbsp;&nbsp;Test: <input id="citySel" type="text" readonly value="" style="width:120px;" onclick="showMenu();" />
+		&nbsp;<a id="menuBtn" href="#" onclick="showMenu(); return false;">select</a></li>
+		</ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>实现方法说明</h2>
+				<ul class="list">
+				<li>用 checkbox 也可以轻松实现多选的下拉菜单</li>
+				<li>此 Demo 主要用于 和 其他下拉菜单进行对比</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+
+<div id="menuContent" class="menuContent" style="display:none; position: absolute;">
+	<ul id="treeDemo" class="ztree" style="margin-top:0; width:180px; height: 300px;"></ul>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/super/select_menu_radio.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/super/select_menu_radio.html
new file mode 100644
index 0000000..cc1d439
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/super/select_menu_radio.html
@@ -0,0 +1,127 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - radio select menu</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+<!--	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			check: {
+				enable: true,
+				chkStyle: "radio",
+				radioType: "all"
+			},
+			view: {
+				dblClickExpand: false
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				onClick: onClick,
+				onCheck: onCheck
+			}
+		};
+
+		var zNodes =[
+			{id:1, pId:0, name:"北京"},
+			{id:2, pId:0, name:"天津"},
+			{id:3, pId:0, name:"上海"},
+			{id:6, pId:0, name:"重庆"},
+			{id:4, pId:0, name:"河北省", open:true, nocheck:true},
+			{id:41, pId:4, name:"石家庄"},
+			{id:42, pId:4, name:"保定"},
+			{id:43, pId:4, name:"邯郸"},
+			{id:44, pId:4, name:"承德"},
+			{id:5, pId:0, name:"广东省", open:true, nocheck:true},
+			{id:51, pId:5, name:"广州"},
+			{id:52, pId:5, name:"深圳"},
+			{id:53, pId:5, name:"东莞"},
+			{id:54, pId:5, name:"佛山"},
+			{id:6, pId:0, name:"福建省", open:true, nocheck:true},
+			{id:61, pId:6, name:"福州"},
+			{id:62, pId:6, name:"厦门"},
+			{id:63, pId:6, name:"泉州"},
+			{id:64, pId:6, name:"三明"}
+		 ];
+
+		function onClick(e, treeId, treeNode) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			zTree.checkNode(treeNode, !treeNode.checked, null, true);
+			return false;
+		}
+
+		function onCheck(e, treeId, treeNode) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nodes = zTree.getCheckedNodes(true),
+			v = "";
+			for (var i=0, l=nodes.length; i<l; i++) {
+				v += nodes[i].name + ",";
+			}
+			if (v.length > 0 ) v = v.substring(0, v.length-1);
+			var cityObj = $("#citySel");
+			cityObj.attr("value", v);
+		}
+
+		function showMenu() {
+			var cityObj = $("#citySel");
+			var cityOffset = $("#citySel").offset();
+			$("#menuContent").css({left:cityOffset.left + "px", top:cityOffset.top + cityObj.outerHeight() + "px"}).slideDown("fast");
+
+			$("body").bind("mousedown", onBodyDown);
+		}
+		function hideMenu() {
+			$("#menuContent").fadeOut("fast");
+			$("body").unbind("mousedown", onBodyDown);
+		}
+		function onBodyDown(event) {
+			if (!(event.target.id == "menuBtn" || event.target.id == "citySel" || event.target.id == "menuContent" || $(event.target).parents("#menuContent").length>0)) {
+				hideMenu();
+			}
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+	</style>
+ </HEAD>
+
+<BODY>
+<h1>带 radio 的单选下拉菜单  -- zTree</h1>
+<h6>[ 文件路径: super/select_menu_radio.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul class="list">
+			<li class="title">&nbsp;&nbsp;<span class="highlight_red">勾选 radio 或者 点击节点 进行选择</span></li>
+			<li class="title">&nbsp;&nbsp;Test: <input id="citySel" type="text" readonly value="" style="width:120px;" onclick="showMenu();" />
+		&nbsp;<a id="menuBtn" href="#" onclick="showMenu(); return false;">select</a></li>
+		</ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>实现方法说明</h2>
+				<ul class="list">
+				<li>用 radio 也可以轻松实现单选的下拉菜单</li>
+				<li>单选其实没有必要使用 radio, 此 Demo 主要用于 和 其他下拉菜单进行对比</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+
+<div id="menuContent" class="menuContent" style="display:none; position: absolute;">
+	<ul id="treeDemo" class="ztree" style="margin-top:0; width:180px; height: 300px;"></ul>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/super/singlepath.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/super/singlepath.html
new file mode 100644
index 0000000..90efb64
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/cn/super/singlepath.html
@@ -0,0 +1,150 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - single path</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				dblClickExpand: false,
+				showLine: false
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeExpand: beforeExpand,
+				onExpand: onExpand,
+				onClick: onClick
+			}
+		};
+		
+		function createNodes(maxNodesNumInLevel, maxLevel, curLevel, curPId) {
+			if (maxNodesNumInLevel<5) {
+				maxNodesNumInLevel = 5;
+			}
+			var nodes = [], num = 0;
+			while(num<3) {
+				num = parseInt(Math.random()*1024)%maxNodesNumInLevel+1;
+			}
+			for (var i=0; i<num; i++) {
+				var id = curPId ? curPId + "-" + i : "" + i, isParent = (parseInt(Math.random()*9999)%3!=0),
+				node = {id: id, pId : curPId, name : "N" + id};
+				nodes.push(node);
+				if (isParent && curLevel<maxLevel) {
+					nodes = nodes.concat(createNodes(maxNodesNumInLevel, maxLevel, curLevel+1, id));
+				}
+			}
+			return nodes;
+		}
+		var zNodes =createNodes(5, 5, 0);
+
+		var curExpandNode = null;
+		function beforeExpand(treeId, treeNode) {
+			var pNode = curExpandNode ? curExpandNode.getParentNode():null;
+			var treeNodeP = treeNode.parentTId ? treeNode.getParentNode():null;
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			for(var i=0, l=!treeNodeP ? 0:treeNodeP.children.length; i<l; i++ ) {
+				if (treeNode !== treeNodeP.children[i]) {
+					zTree.expandNode(treeNodeP.children[i], false);
+				}
+			}
+			while (pNode) {
+				if (pNode === treeNode) {
+					break;
+				}
+				pNode = pNode.getParentNode();
+			}
+			if (!pNode) {
+				singlePath(treeNode);
+			}
+
+		}
+		function singlePath(newNode) {
+			if (newNode === curExpandNode) return;
+			if (curExpandNode && curExpandNode.open==true) {
+				var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+				if (newNode.parentTId === curExpandNode.parentTId) {
+					zTree.expandNode(curExpandNode, false);
+				} else {
+					var newParents = [];
+					while (newNode) {
+						newNode = newNode.getParentNode();
+						if (newNode === curExpandNode) {
+							newParents = null;
+							break;
+						} else if (newNode) {
+							newParents.push(newNode);
+						}
+					}
+					if (newParents!=null) {
+						var oldNode = curExpandNode;
+						var oldParents = [];
+						while (oldNode) {
+							oldNode = oldNode.getParentNode();
+							if (oldNode) {
+								oldParents.push(oldNode);
+							}
+						}
+						if (newParents.length>0) {
+							zTree.expandNode(oldParents[Math.abs(oldParents.length-newParents.length)-1], false);
+						} else {
+							zTree.expandNode(oldParents[oldParents.length-1], false);
+						}
+					}
+				}
+			}
+			curExpandNode = newNode;
+		}
+
+		function onExpand(event, treeId, treeNode) {
+			curExpandNode = treeNode;
+		}
+
+		function onClick(e,treeId, treeNode) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			zTree.expandNode(treeNode, null, null, null, true);
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+.ztree li button.switch {visibility:hidden; width:1px;}
+.ztree li button.switch.roots_docu {visibility:visible; width:16px;}
+.ztree li button.switch.center_docu {visibility:visible; width:16px;}
+.ztree li button.switch.bottom_docu {visibility:visible; width:16px;}
+	</style>
+ </HEAD>
+
+<BODY>
+<h1>保持展开单一路径</h1>
+<h6>[ 文件路径: super/singlepath.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>实现方法说明</h2>
+				<ul class="list">
+				<li>此 Demo 是在 "单击展开/折叠节点" 基础上改造而来，树节点保持始终只展开一条路径。</li>
+				<li class="highlight_red">利用 setting.callback.beforeExpand / onExpand 事件回调函数实现展开规则</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/asyncData/getNodes.php b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/asyncData/getNodes.php
new file mode 100644
index 0000000..3294d9a
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/asyncData/getNodes.php
@@ -0,0 +1,38 @@
+<?php ?>
+[<?php
+$pId = "0";
+$pName = "";
+$pLevel = "";
+$pCheck = "";
+if(array_key_exists( 'id',$_REQUEST)) {
+	$pId=$_REQUEST['id'];
+}
+if(array_key_exists( 'lv',$_REQUEST)) {
+	$pLevel=$_REQUEST['lv'];
+}
+if(array_key_exists('n',$_REQUEST)) {
+	$pName=$_REQUEST['n'];
+}
+if(array_key_exists('chk',$_REQUEST)) {
+	$pCheck=$_REQUEST['chk'];
+}
+if ($pId==null || $pId=="") $pId = "0";
+if ($pLevel==null || $pLevel=="") $pLevel = "0";
+if ($pName==null) $pName = "";
+else $pName = $pName.".";
+
+//for ($i=1; $i<9999; $i++) {
+//	for ($j=1; $j<999; $j++) {
+//
+//	}
+//}
+
+for ($i=1; $i<5; $i++) {
+	$nId = $pId.$i;
+	$nName = $pName."n".$i;
+	echo "{ id:'".$nId."',	name:'".$nName."',	isParent:".(( $pLevel < "2" && ($i%2)!=0)?"true":"false").($pCheck==""?"":((($pLevel < "2" && ($i%2)!=0)?", halfCheck:true":"").($i==3?", checked:true":"")))."}";
+	if ($i<4) {
+		echo ",";
+	}
+}
+?>]
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/asyncData/getNodesForBigData.php b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/asyncData/getNodesForBigData.php
new file mode 100644
index 0000000..91d002e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/asyncData/getNodesForBigData.php
@@ -0,0 +1,24 @@
+<?php ?>
+[<?php
+$pId = "-1";
+if(array_key_exists( 'id',$_REQUEST)) {
+	$pId=$_REQUEST['id'];
+}
+$pCount = "10";
+if(array_key_exists( 'count',$_REQUEST)) {
+	$pCount=$_REQUEST['count'];
+}
+if ($pId==null || $pId=="") $pId = "0";
+if ($pCount==null || $pCount=="") $pCount = "10";
+
+$max = (int)$pCount;
+for ($i=1; $i<=$max; $i++) {
+	$nId = $pId."_".$i;
+	$nName = "tree".$nId;
+	echo "{ id:'".$nId."',	name:'".$nName."'}";
+	if ($i<$max) {
+		echo ",";
+	}
+	
+}
+?>]
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/bigdata/common.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/bigdata/common.html
new file mode 100644
index 0000000..6e1728d
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/bigdata/common.html
@@ -0,0 +1,190 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - big data common</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			check: {
+				enable: true
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				onNodeCreated: onNodeCreated
+			}
+		};
+
+		var dataMaker = function(count) {
+			var nodes = [], pId = -1,
+			min = 10, max = 90, level = 0, curLevel = [], prevLevel = [], levelCount,
+			i = 0,j,k,l,m;
+
+			while (i<count) {
+				if (level == 0) {
+					pId = -1;
+					levelCount = Math.round(Math.random() * max) + min;
+					for (j=0; j<levelCount && i<count; j++, i++) {
+						var n = {id:i, pId:pId, name:"Big-" +i};
+						nodes.push(n);
+						curLevel.push(n);
+					}
+				} else {
+					for (l=0, m=prevLevel.length; l<m && i<count; l++) {
+						pId = prevLevel[l].id;
+						levelCount = Math.round(Math.random() * max) + min;
+						for (j=0; j<levelCount && i<count; j++, i++) {
+							var n = {id:i, pId:pId, name:"Big-" +i};
+							nodes.push(n);
+							curLevel.push(n);
+						}
+					}
+				}
+				prevLevel = curLevel;
+				curLevel = [];
+				level++;
+			}
+			return nodes;
+		}
+
+		var ruler = {
+			doc: null,
+			ruler: null,
+			cursor: null,
+			minCount: 5000,
+			count: 5000,
+			stepCount:500,
+			minWidth: 30,
+			maxWidth: 215,
+			init: function() {
+				ruler.doc = $(document);
+				ruler.ruler = $("#ruler");
+				ruler.cursor = $("#cursor");
+				if (ruler.ruler) {
+					ruler.ruler.bind("mousedown", ruler.onMouseDown);
+					
+				}
+			},
+			onMouseDown: function(e) {
+				ruler.drawRuler(e, true);
+				ruler.doc.bind("mousemove", ruler.onMouseMove);
+				ruler.doc.bind("mouseup", ruler.onMouseUp);
+				ruler.doc.bind("selectstart", ruler.onSelect);
+				$("body").css("cursor", "pointer");
+			},
+			onMouseMove: function(e) {
+				ruler.drawRuler(e);
+				return false;
+			},
+			onMouseUp: function(e) {
+				$("body").css("cursor", "auto");
+				ruler.doc.unbind("mousemove", ruler.onMouseMove);
+				ruler.doc.unbind("mouseup", ruler.onMouseUp);
+				ruler.doc.unbind("selectstart", ruler.onSelect);
+				ruler.drawRuler(e);
+			},
+			onSelect: function (e) {
+				return false;
+			},
+			getCount: function(end) {
+				var start = ruler.ruler.offset().left+1;
+				var c = Math.max((end - start), ruler.minWidth);
+				c = Math.min(c, ruler.maxWidth);
+				return {width:c, count:(c - ruler.minWidth)*ruler.stepCount + ruler.minCount};
+			},
+			drawRuler: function(e, animate) {
+				var c = ruler.getCount(e.clientX);
+				ruler.cursor.stop();
+				if ($.browser.msie || !animate) {
+					ruler.cursor.css({width:c.width});
+				} else {
+					ruler.cursor.animate({width:c.width}, {duration: "fast",easing: "swing", complete:null});
+				}
+				ruler.count = c.count;
+				ruler.cursor.text(c.count);
+			}
+		}
+		var showNodeCount = 0;
+		function onNodeCreated(event, treeId, treeNode) {
+			showNodeCount++;
+		}
+
+		function createTree () {
+			var zNodes = dataMaker(ruler.count);
+			showNodeCount = 0;
+			$("#treeDemo").empty();
+			setting.check.enable = $("#showChk").attr("checked");
+			var time1 = new Date();
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			var time2 = new Date();
+
+			alert(" " + zNodes.length + " nodes are initialized, " + showNodeCount + " nodes generate the DOM object."
+				+ "\n\n Initialization zTree total time: " + (time2.getTime() - time1.getTime()) + " ms");
+		}
+
+
+		$(document).ready(function(){
+			ruler.init("ruler");
+			$("#createTree").bind("click", createTree);
+
+		});
+		//-->
+	</SCRIPT>
+ </HEAD>
+
+<BODY>
+<h1>One-time Large Data Loading</h1>
+<h6>[ File Path: bigdata/common.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul>
+		<li><span>Adjust the total number of nodes to the test load speed: </span>
+			<div id="ruler" class="ruler" title="can drag to adjust the number of nodes">
+				<div id="cursor" class="cursor">5000</div>
+			</div>
+			<div style="width:220px; text-align: center;">
+				<span>checkbox</span><input type="checkbox" id="showChk" title="whether to display checkbox" class="checkbox first" />&nbsp;&nbsp;&nbsp;&nbsp;
+				[ <a id="createTree" href="#" title="Initialize zTree" onclick="return false;">Initialize zTree</a> ]
+			</div>
+		</li>
+		</ul>
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of large data load</h2>
+				<ul class="list">
+				<li>1) zTree v3.x optimized for one-time large data loading capacity, using a lazy loading technique, which does not expand the node does not create child nodes of the DOM.</li>
+				<li class="highlight_red">2) If a maximum of 100 nodes each, but a total number of several thousand or even tens of thousands of nodes, and the parent node is collapsed by default to optimize the most obvious effect, very fast.</li>
+				<li class="highlight_red">3) For the next level there are thousands of sub-node case, the optimization of lazy loading is invalid, proposal to consider asynchronous page loading.</li>
+				<li class="highlight_red">4) if you set the data to all the parent nodes are expanded, the optimization  of lazy loading is invalid, proposal to not expand all parent node when you initialize zTree.</li>
+				<li>5) set the display checkbox / radio will affect some of the performance.</li>
+				<li>6) DOM generated using addDiyDom function will affect the speed, the number of nodes determines the number of impact situations.</li>
+				<li>7) Using 'onNodeCreated' callback function to manipulate nodes object will affect the speed, the degree of influence determined by the number of nodes.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of setting</h2>
+				<ul class="list">
+				<li>No special configuration.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3, Explanation of treeNode</h2>
+				<ul class="list">
+				<li>No special requirements on the node data, the user can add custom attributes.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/bigdata/diy_async.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/bigdata/diy_async.html
new file mode 100644
index 0000000..13e43aa
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/bigdata/diy_async.html
@@ -0,0 +1,157 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - big data async</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			async: {
+				enable: true,
+				url: getUrl
+			},
+			check: {
+				enable: true
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			view: {
+				expandSpeed: ""
+			},
+			callback: {
+				beforeExpand: beforeExpand,
+				onAsyncSuccess: onAsyncSuccess,
+				onAsyncError: onAsyncError
+			}
+		};
+
+		var zNodes =[
+			{name:"500 nodes", id:"1", count:500, times:1, isParent:true},
+			{name:"1000 nodes", id:"2", count:1000, times:1, isParent:true},
+			{name:"2000 nodes", id:"3", count:2000, times:1, isParent:true}
+		];
+
+		var log, className = "dark",
+		startTime = 0, endTime = 0, perCount = 100, perTime = 100;
+		function getUrl(treeId, treeNode) {
+			var curCount = (treeNode.children) ? treeNode.children.length : 0;
+			var getCount = (curCount + perCount) > treeNode.count ? (treeNode.count - curCount) : perCount;
+			var param = "id="+treeNode.id+"_"+(treeNode.times++) +"&count="+getCount;
+			return "../asyncData/getNodesForBigData.php?" + param;
+		}
+		function beforeExpand(treeId, treeNode) {
+			if (!treeNode.isAjaxing) {
+				startTime = new Date();
+				treeNode.times = 1;
+				ajaxGetNodes(treeNode, "refresh");
+				return true;
+			} else {
+				alert("Downloading data, Please wait to expand node...");
+				return false;
+			}
+		}
+		function onAsyncSuccess(event, treeId, treeNode, msg) {
+			if (!msg || msg.length == 0) {
+				return;
+			}
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			totalCount = treeNode.count;
+			if (treeNode.children.length < totalCount) {
+				setTimeout(function() {ajaxGetNodes(treeNode);}, perTime);
+			} else {
+				treeNode.icon = "";
+				zTree.updateNode(treeNode);
+				zTree.selectNode(treeNode.children[0]);
+				endTime = new Date();
+				var usedTime = (endTime.getTime() - startTime.getTime())/1000;
+				className = (className === "dark" ? "":"dark");
+				showLog("[ "+getTime()+" ]&nbsp;&nbsp;treeNode:" + treeNode.name );
+				showLog("Child node has finished loading, a total of "+ (treeNode.times-1) +" times the asynchronous load, elapsed time: "+ usedTime + " seconds ");
+			}
+		}
+		function onAsyncError(event, treeId, treeNode, XMLHttpRequest, textStatus, errorThrown) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			alert("ajax error...");
+			treeNode.icon = "";
+			zTree.updateNode(treeNode);
+		}
+		function ajaxGetNodes(treeNode, reloadType) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			if (reloadType == "refresh") {
+				treeNode.icon = "../../../css/zTreeStyle/img/loading.gif";
+				zTree.updateNode(treeNode);
+			}
+			zTree.reAsyncChildNodes(treeNode, reloadType, true);
+		}
+		function showLog(str) {
+			if (!log) log = $("#log");
+			log.append("<li class='"+className+"'>"+str+"</li>");
+			if(log.children("li").length > 4) {
+				log.get(0).removeChild(log.children("li")[0]);
+			}
+		}
+		function getTime() {
+			var now= new Date(),
+			h=now.getHours(),
+			m=now.getMinutes(),
+			s=now.getSeconds(),
+			ms=now.getMilliseconds();
+			return (h+":"+m+":"+s+ " " +ms);
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+
+		});
+		//-->
+	</SCRIPT>
+ </HEAD>
+
+<BODY>
+<h1>Loading Data in Batches</h1>
+<h6>[ File Path: bigdata/diy_async.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul>
+			<li class="highlight_red">&nbsp;&nbsp;&nbsp;&nbsp;Demo for testing load data in batches, each node needs to re-start to load.</li>
+		</ul>
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of large data load</h2>
+				<ul class="list">
+				<li>1) If has nodes for as many as thousands in one level, lazy loading is invalid, this demo shows how to load data in batches.</li>
+				<li class="highlight_red">2) This method applies to thousands of nodes must all display needs.</li>
+				<li class="highlight_red">3) This method doesn't solve the problem of slow loading, it will only make the final result appear more slowly, but can be limited to avoid browser suspended animation, and more nodes displayed slower.</li>
+				<li>4) For at least several thousand nodes in one level case, another solution is to: pagination loading.<br/>
+					async load log:<br/>
+					<ul id="log" class="log" style="height:85px"></ul></li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of setting</h2>
+				<ul class="list">
+				<li>Need to set the parameters in setting.async</li>
+				<li>Advised to turn off animation effects: setting.view.expandSpeed = "";</li>
+				<li>No other special configuration, the user can set their own requirements.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3, Explanation of treeNode</h2>
+				<ul class="list">
+				<li>No special requirements on the node data, the user can add custom attributes.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/bigdata/page.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/bigdata/page.html
new file mode 100644
index 0000000..f8a4963
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/bigdata/page.html
@@ -0,0 +1,150 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - big data page</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			async: {
+				enable: true,
+				url: getUrl
+			},
+			check: {
+				enable: true
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			view: {
+				addDiyDom: addDiyDom
+			},
+			callback: {
+				beforeExpand: beforeExpand,
+				onAsyncSuccess: onAsyncSuccess,
+				onAsyncError: onAsyncError
+			}
+		};
+
+		var zNodes =[
+			{name:"page test", t:"Please click the paging buttons.", id:"1", count:2000, page:0, pageSize:100, isParent:true}
+		];
+		var curPage = 0;
+		function getUrl(treeId, treeNode) {
+			var param = "id="+ treeNode.id +"_"+treeNode.page +"&count="+treeNode.pageSize,
+			aObj = $("#" + treeNode.tId + "_a");
+			aObj.attr("title", "Page " + treeNode.page + " / " + treeNode.maxPage + "")
+			return "../asyncData/getNodesForBigData.php?" + param;
+		}
+		function goPage(treeNode, page) {
+			treeNode.page = page;
+			if (treeNode.page<1) treeNode.page = 1;
+			if (treeNode.page>treeNode.maxPage) treeNode.page = treeNode.maxPage;
+			if (curPage == treeNode.page) return;
+			curPage = treeNode.page;
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			zTree.reAsyncChildNodes(treeNode, "refresh");
+		}
+		function beforeExpand(treeId, treeNode) {
+			if (treeNode.page == 0) treeNode.page = 1;
+			return !treeNode.isAjaxing;
+		}
+		function onAsyncSuccess(event, treeId, treeNode, msg) {
+			
+		}
+		function onAsyncError(event, treeId, treeNode, XMLHttpRequest, textStatus, errorThrown) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			alert("ajax error...");
+			treeNode.icon = "";
+			zTree.updateNode(treeNode);
+		}
+		function addDiyDom(treeId, treeNode) {
+			if (treeNode.level>0) return;
+			var aObj = $("#" + treeNode.tId + "_a");
+			if ($("#addBtn_"+treeNode.id).length>0) return;
+			var addStr = "<span class='button lastPage' id='lastBtn_" + treeNode.id
+				+ "' title='last page' onfocus='this.blur();'></span><span class='button nextPage' id='nextBtn_" + treeNode.id
+				+ "' title='next page' onfocus='this.blur();'></span><span class='button prevPage' id='prevBtn_" + treeNode.id
+				+ "' title='prev page' onfocus='this.blur();'></span><span class='button firstPage' id='firstBtn_" + treeNode.id
+				+ "' title='first page' onfocus='this.blur();'></span>";
+			aObj.after(addStr);
+			var first = $("#firstBtn_"+treeNode.id);
+			var prev = $("#prevBtn_"+treeNode.id);
+			var next = $("#nextBtn_"+treeNode.id);
+			var last = $("#lastBtn_"+treeNode.id);
+			treeNode.maxPage = Math.round(treeNode.count/treeNode.pageSize - .5) + (treeNode.count%treeNode.pageSize == 0 ? 0:1);
+			first.bind("click", function(){
+				if (!treeNode.isAjaxing) {
+					goPage(treeNode, 1);
+				}
+			});
+			last.bind("click", function(){
+				if (!treeNode.isAjaxing) {
+					goPage(treeNode, treeNode.maxPage);
+				}
+			});
+			prev.bind("click", function(){
+				if (!treeNode.isAjaxing) {
+					goPage(treeNode, treeNode.page-1);
+				}
+			});
+			next.bind("click", function(){
+				if (!treeNode.isAjaxing) {
+					goPage(treeNode, treeNode.page+1);
+				}
+			});
+		};
+		
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+.ztree li span.button.firstPage {float:right; margin-left:2px; margin-right: 0; background-position:-144px -16px; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.prevPage {float:right; margin-left:2px; margin-right: 0; background-position:-144px -48px; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.nextPage {float:right; margin-left:2px; margin-right: 0; background-position:-144px -64px; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.lastPage {float:right; margin-left:2px; margin-right: 0; background-position:-144px -32px; vertical-align:top; *vertical-align:middle}
+	</style>
+ </HEAD>
+
+<BODY>
+<h1>Loading Data By Pagination</h1>
+<h6>[ File Path: bigdata/page.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of large data load</h2>
+				<ul class="list">
+				<li>1) Pagination can be an effective solution to the large number of child nodes of the situation.</li>
+				<li>2) Using custom method to display the pagination button.</li>
+				<li class="highlight_red">3) Pagination lead to the association  of checkbox can not be achieved, only correction after show each page . Because of the time limitation, Demo does not deal with association of checkbox.</li>
+				<li class="highlight_red">4) The use of pagination, you can only get the current page node data from zTree. You can save the data after each page loading as the cache, according to the demand to determine the specific methods.</li>
+			</li>
+			<li class="title"><h2>2, Explanation of setting</h2>
+				<ul class="list">
+				<li>Need to set the parameters in setting.async</li>
+				<li>No other special configuration, the user can set their own requirements.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3, Explanation of treeNode</h2>
+				<ul class="list">
+				<li>No special requirements on the node data, the user can add custom attributes.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/core/async.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/core/async.html
new file mode 100644
index 0000000..9668fe6
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/core/async.html
@@ -0,0 +1,70 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - Async</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			async: {
+				enable: true,
+				url:"../asyncData/getNodes.php",
+				autoParam:["id", "name=n", "level=lv"],
+				otherParam:{"otherParam":"zTreeAsyncTest"},
+				dataFilter: filter
+			}
+		};
+
+		function filter(treeId, parentNode, childNodes) {
+			if (!childNodes) return null;
+			for (var i=0, l=childNodes.length; i<l; i++) {
+				childNodes[i].name = childNodes[i].name.replace(/\.n/g, '.');
+			}
+			return childNodes;
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Dynamic Tree with Ajax</h1>
+<h6>[ File Path: core/async.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of setting</h2>
+				<ul class="list">
+				<li class="highlight_red">For create dynamic tree with ajax,  you need to set attributes in setting.async, see the API documentation for more related contents.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of treeNode</h2>
+				<ul class="list">
+				<li>Dynamic tree with ajax doesn't need to make special treeNode node data, if use simple JSON data model, please set the attributes in setting.data.simple.</li>
+				<li>If ajax only to return node data in single level, you don't need to use simple JSON data model.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、Other explanation</h2>
+				<ul class="list">
+				<li class="highlight_red">Monitoring autoParam and otherParam use firebug or the developer tools in browser.</li>
+				<li class="highlight_red">This Demo only loading 4 level nodes (level = 3).</li>
+				<li class="highlight_red">This Demo use 'dataFilter' to modify the name of the node.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/core/async_fun.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/core/async_fun.html
new file mode 100644
index 0000000..37aea06
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/core/async_fun.html
@@ -0,0 +1,144 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - reAsyncChildNodes</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				selectedMulti: false
+			},
+			async: {
+				enable: true,
+				url:"../asyncData/getNodes.php",
+				autoParam:["id", "name=n", "level=lv"],
+				otherParam:{"otherParam":"zTreeAsyncTest"},
+				dataFilter: filter
+			},
+			callback: {
+				beforeClick: beforeClick,
+				beforeAsync: beforeAsync,
+				onAsyncError: onAsyncError,
+				onAsyncSuccess: onAsyncSuccess
+			}
+		};
+
+		function filter(treeId, parentNode, childNodes) {
+			if (!childNodes) return null;
+			for (var i=0, l=childNodes.length; i<l; i++) {
+				childNodes[i].name = childNodes[i].name.replace(/\.n/g, '.');
+			}
+			return childNodes;
+		}
+		function beforeClick(treeId, treeNode) {
+			if (!treeNode.isParent) {
+				alert("Please select one parent node...");
+				return false;
+			} else {
+				return true;
+			}
+		}
+		var log, className = "dark";
+		function beforeAsync(treeId, treeNode) {
+			className = (className === "dark" ? "":"dark");
+			showLog("[ "+getTime()+" beforeAsync ]&nbsp;&nbsp;&nbsp;&nbsp;" + ((!!treeNode && !!treeNode.name) ? treeNode.name : "root") );
+			return true;
+		}
+		function onAsyncError(event, treeId, treeNode, XMLHttpRequest, textStatus, errorThrown) {
+			showLog("[ "+getTime()+" onAsyncError ]&nbsp;&nbsp;&nbsp;&nbsp;" + ((!!treeNode && !!treeNode.name) ? treeNode.name : "root") );
+		}
+		function onAsyncSuccess(event, treeId, treeNode, msg) {
+			showLog("[ "+getTime()+" onAsyncSuccess ]&nbsp;&nbsp;&nbsp;&nbsp;" + ((!!treeNode && !!treeNode.name) ? treeNode.name : "root") );
+		}
+
+		function showLog(str) {
+			if (!log) log = $("#log");
+			log.append("<li class='"+className+"'>"+str+"</li>");
+			if(log.children("li").length > 8) {
+				log.get(0).removeChild(log.children("li")[0]);
+			}
+		}
+		function getTime() {
+			var now= new Date(),
+			h=now.getHours(),
+			m=now.getMinutes(),
+			s=now.getSeconds(),
+			ms=now.getMilliseconds();
+			return (h+":"+m+":"+s+ " " +ms);
+		}
+		
+		function refreshNode(e) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			type = e.data.type,
+			silent = e.data.silent,
+			nodes = zTree.getSelectedNodes();
+			if (nodes.length == 0) {
+				alert("Please select one parent node at first...");
+			}
+			for (var i=0, l=nodes.length; i<l; i++) {
+				zTree.reAsyncChildNodes(nodes[i], type, silent);
+				if (!silent) zTree.selectNode(nodes[i]);
+			}
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting);
+			$("#refreshNode").bind("click", {type:"refresh", silent:false}, refreshNode);
+			$("#refreshNodeSilent").bind("click", {type:"refresh", silent:true}, refreshNode);
+			$("#addNode").bind("click", {type:"add", silent:false}, refreshNode);
+			$("#addNodeSilent").bind("click", {type:"add", silent:true}, refreshNode);
+		});
+		//-->
+	</SCRIPT>
+
+</HEAD>
+
+<BODY>
+<h1>Dynamic Tree - zTree methods</h1>
+<h6>[ File Path: core/async_fun.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of reAsyncChildNodes</h2>
+				<ul class="list">
+				<li class="highlight_red">How to use zTreeObj.reAsyncChildNodes method,  please see the API documentation.</li>
+				<li><p>This Demo can only select one parent node<br/>
+					Try: [ <a id="refreshNode" href="#" onclick="return false;">reload</a> ]&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="addNode" href="#" onclick="return false;">append</a> ]</p>
+				</li>
+				<li><p><span class="highlight_red">'isSilent' parameter is only for the collapsed state of the parent node.</span><br/>
+					Try: [ <a id="refreshNodeSilent" href="#" onclick="return false;">Quietly reloaded</a> ]&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="addNodeSilent" href="#" onclick="return false;">Quietly append</a> ]<br/>
+					async log:<br/>
+					<ul id="log" class="log"></ul></p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of setting</h2>
+				<ul class="list">
+				<li class="highlight_red">For useing reAsyncChildNodes method,  you need to set attributes in setting.async, see the API documentation for more related contents.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3, Explanation of treeNode</h2>
+				<ul class="list">
+				<li>Same as 'Dynamic Tree with Ajax'</li>
+				</ul>
+			</li>
+			<li class="title"><h2>4、Other explanation</h2>
+				<ul class="list">
+				<li>Same as 'Dynamic Tree with Ajax'</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/core/click.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/core/click.html
new file mode 100644
index 0000000..4f0fa80
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/core/click.html
@@ -0,0 +1,107 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - beforeClick / onClick</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			data: {
+				key: {
+					title:"t"
+				},
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeClick: beforeClick,
+				onClick: onClick
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"ordinary parent", t:"I am ordinary, just click on me", open:true},
+			{ id:11, pId:1, name:"leaf node 1-1", t:"I am ordinary, just click on me"},
+			{ id:12, pId:1, name:"leaf node 1-2", t:"I am ordinary, just click on me"},
+			{ id:13, pId:1, name:"leaf node 1-3", t:"I am ordinary, just click on me"},
+			{ id:2, pId:0, name:"strong parent", t:"You can click on me, but you can not click on the sub-node!", open:true},
+			{ id:21, pId:2, name:"leaf node 2-1", t:"You can't click on me..", click:false},
+			{ id:22, pId:2, name:"leaf node 2-2", t:"You can't click on me..", click:false},
+			{ id:23, pId:2, name:"leaf node 2-3", t:"You can't click on me..", click:false},
+			{ id:3, pId:0, name:"weak parent", t:"You can't click on me, but you can click on the sub-node!", open:true, click:false },
+			{ id:31, pId:3, name:"leaf node 3-1", t:"please click on me.."},
+			{ id:32, pId:3, name:"leaf node 3-2", t:"please click on me.."},
+			{ id:33, pId:3, name:"leaf node 3-3", t:"please click on me.."}
+		];
+
+		var log, className = "dark";
+		function beforeClick(treeId, treeNode, clickFlag) {
+			className = (className === "dark" ? "":"dark");
+			showLog("[ "+getTime()+" beforeClick ]&nbsp;&nbsp;" + treeNode.name );
+			return (treeNode.click != false);
+		}
+		function onClick(event, treeId, treeNode, clickFlag) {
+			showLog("[ "+getTime()+" onClick ]&nbsp;&nbsp;clickFlag = " + clickFlag + " (" + (clickFlag===1 ? "single selected": (clickFlag===0 ? "<b>cancel selected</b>" : "<b>multi selected</b>")) + ")");
+		}		
+		function showLog(str) {
+			if (!log) log = $("#log");
+			log.append("<li class='"+className+"'>"+str+"</li>");
+			if(log.children("li").length > 8) {
+				log.get(0).removeChild(log.children("li")[0]);
+			}
+		}
+		function getTime() {
+			var now= new Date(),
+			h=now.getHours(),
+			m=now.getMinutes(),
+			s=now.getSeconds();
+			return (h+":"+m+":"+s);
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Control of Click Node</h1>
+<h6>[ File Path: core/click.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, 'beforeClick / onClick' callback function</h2>
+				<ul class="list">
+				<li>Use 'beforeClick / onClick' callback function can be achieved with the click on the various functions. This simple demo shows how to monitor the click event.</li>
+				<li><p><span class="highlight_red">Try pressing the <b>Ctrl</b> key for multi-node selection and deselection.</span><br/>
+					click log:<br/>
+					<ul id="log" class="log"></ul></p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of setting</h2>
+				<ul class="list">
+				<li class="highlight_red">You need to set attributes about setting.callback.beforeClick and setting.callback.onClick, see the API documentation for more related contents.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3, Explanation of treeNode</h2>
+				<ul class="list">
+				<li>No special requirements on the node data, the user can add custom attributes.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/core/custom_font.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/core/custom_font.html
new file mode 100644
index 0000000..e00253b
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/core/custom_font.html
@@ -0,0 +1,67 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - Custom Font</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				fontCss: getFont,
+				nameIsHTML: true
+			}
+		};
+
+		var zNodes =[
+			{ name:"Bold", font:{'font-weight':'bold'} },
+			{ name:"Italic", font:{'font-style':'italic'}},
+			{ name:"Background-color", font:{'background-color':'black', 'color':'white'}},
+			{ name:"Red Font", font:{'color':'red'}},
+			{ name:"Blue Font", font:{'color':'blue'}},
+			{ name:"<span style='color:blue;margin-right:0px;'>view</span>.<span style='color:red;margin-right:0px;'>nameIsHTML</span>"},
+			{ name:"zTree Default"}
+		];
+
+		function getFont(treeId, node) {
+			return node.font ? node.font : {};
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Custom Fonts</h1>
+<h6>[ File Path: core/custom_font.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of setting</h2>
+				<ul class="list">
+				<li class="highlight_red">1. For display custom fonts,  you need to set setting.view.fontCss attribute, see the API documentation for more related contents.</li>
+				<li class="highlight_red">2. If you need the node name support the HTML, please set the 'setting.view.nameIsHTML' attribute, see the API documentation for more related contents.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of treeNode</h2>
+				<ul class="list">
+				<li>Set the font does not require to special node data , but if used to differentiate between different types of nodes, the corresponding data can set custom attributes.</li>
+				<li>The css style of data stored in the nodes within this demo</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/core/custom_icon.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/core/custom_icon.html
new file mode 100644
index 0000000..17084e5
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/core/custom_icon.html
@@ -0,0 +1,74 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - Custom Icon </TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			data: {
+				simpleData: {
+					enable: true
+				}
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"Custom Icon 01", open:true, iconOpen:"../../../css/zTreeStyle/img/diy/1_open.png", iconClose:"../../../css/zTreeStyle/img/diy/1_close.png"},
+			{ id:11, pId:1, name:"leaf node 01", icon:"../../../css/zTreeStyle/img/diy/2.png"},
+			{ id:12, pId:1, name:"leaf node 02", icon:"../../../css/zTreeStyle/img/diy/3.png"},
+			{ id:13, pId:1, name:"leaf node 03", icon:"../../../css/zTreeStyle/img/diy/5.png"},
+			{ id:2, pId:0, name:"Custom Icon 02", open:true, icon:"../../../css/zTreeStyle/img/diy/4.png"},
+			{ id:21, pId:2, name:"leaf node 01", icon:"../../../css/zTreeStyle/img/diy/6.png"},
+			{ id:22, pId:2, name:"leaf node 02", icon:"../../../css/zTreeStyle/img/diy/7.png"},
+			{ id:23, pId:2, name:"leaf node 03", icon:"../../../css/zTreeStyle/img/diy/8.png"},
+			{ id:3, pId:0, name:"no Custom Icon", open:true },
+			{ id:31, pId:3, name:"leaf node 01"},
+			{ id:32, pId:3, name:"leaf node 02"},
+			{ id:33, pId:3, name:"leaf node 03"}
+
+		];
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Custom Icon - icon</h1>
+<h6>[ File Path: core/custom_icon.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of setting</h2>
+				<ul class="list">
+				<li>Custom icon does not require special configuration setting.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of treeNode</h2>
+				<ul class="list">
+				<li>Use node data’s icon / iconOpen / iconClose attribute show custom icon.</li>
+				<li class="highlight_red">See the API documentation for more related contents.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、Other explanation</h2>
+				<ul class="list">
+				<li class="highlight_red">Because of the time limitation, demo uses png images, if you need transparent images in IE6 browser, make a gif image, or use a special 'css filter' on ie6 browser.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/core/custom_iconSkin.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/core/custom_iconSkin.html
new file mode 100644
index 0000000..3e09930
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/core/custom_iconSkin.html
@@ -0,0 +1,85 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - Custom Icon Skin </TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			data: {
+				simpleData: {
+					enable: true
+				}
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"Custom Icon 01", open:true, iconSkin:"pIcon01"},
+			{ id:11, pId:1, name:"leaf node 01", iconSkin:"icon01"},
+			{ id:12, pId:1, name:"leaf node 02", iconSkin:"icon02"},
+			{ id:13, pId:1, name:"leaf node 03", iconSkin:"icon03"},
+			{ id:2, pId:0, name:"Custom Icon 02", open:true, iconSkin:"pIcon02"},
+			{ id:21, pId:2, name:"leaf node 01", iconSkin:"icon04"},
+			{ id:22, pId:2, name:"leaf node 02", iconSkin:"icon05"},
+			{ id:23, pId:2, name:"leaf node 03", iconSkin:"icon06"},
+			{ id:3, pId:0, name:"no Custom Icon", open:true },
+			{ id:31, pId:3, name:"leaf node 01"},
+			{ id:32, pId:3, name:"leaf node 02"},
+			{ id:33, pId:3, name:"leaf node 03"}
+
+		];
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+.ztree li span.button.pIcon01_ico_open{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/1_open.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.pIcon01_ico_close{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/1_close.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.pIcon02_ico_open, .ztree li span.button.pIcon02_ico_close{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/2.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon01_ico_docu{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/3.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon02_ico_docu{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/4.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon03_ico_docu{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/5.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon04_ico_docu{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/6.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon05_ico_docu{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/7.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon06_ico_docu{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/8.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+	</style>
+</HEAD>
+
+<BODY>
+<h1>Custom Icon - iconSkin</h1>
+<h6>[ File Path: core/custom_iconSkin.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of setting</h2>
+				<ul class="list">
+				<li>Custom icon does not require special configuration setting.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of treeNode</h2>
+				<ul class="list">
+				<li>Use the node data iconSkin attributes and  css show custom icon.</li>
+				<li class="highlight_red">See the API documentation for more related contents.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、Other explanation</h2>
+				<ul class="list">
+				<li class="highlight_red">Because of the time limitation, demo uses png images, if you need transparent images in IE6 browser, make a gif image, or use a special 'css filter' on ie6 browser.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/core/expand.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/core/expand.html
new file mode 100644
index 0000000..ca60474
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/core/expand.html
@@ -0,0 +1,186 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - beforeExpand / onExpand && beforeCollapse / onCollapse</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				selectedMulti: false
+			},
+			data: {
+				key: {
+					title:"t"
+				},
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeClick: beforeClick,
+				beforeCollapse: beforeCollapse,
+				beforeExpand: beforeExpand,
+				onCollapse: onCollapse,
+				onExpand: onExpand
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"ordinary parent 1", t:"I am ordinary, just expand or collapse on me", open:false},
+			{ id:11, pId:1, name:"leaf node 1-1", t:"..."},
+			{ id:12, pId:1, name:"ordinary parent 2", t:"I am ordinary, just expand or collapse on me", open:false},
+			{ id:121, pId:12, name:"parent node - 121", t:"...", open:true},
+			{ id:1211, pId:121, name:"parent node - 1211", t:"...", open:false},
+			{ id:1212, pId:1211, name:"leaf node - 1212", t:"..."},
+			{ id:1213, pId:121, name:"parent node - 1213", t:"...", open:false},
+			{ id:1214, pId:1213, name:"leaf node - 1214", t:"..."},
+			{ id:123, pId:12, name:"leaf node 2-3", t:"..."},
+			{ id:13, pId:1, name:"leaf node  1-3", t:"..."},
+			{ id:2, pId:0, name:"can't collapse me", t:"can't collapse me...Unless you use expandAll method.", open:true, collapse:false},
+			{ id:21, pId:2, name:"leaf node 2-1", t:"You can't collapse my parent"},
+			{ id:22, pId:2, name:"leaf node 2-2", t:"You can't collapse my parent"},
+			{ id:23, pId:2, name:"leaf node 2-3", t:"You can't collapse my parent"},
+			{ id:3, pId:0, name:"can't expand me", t:"can't expand me...Unless you use expandAll method.", open:false, expand:false},
+			{ id:31, pId:3, name:"leaf node 3-1", t:"OMG, you can see me!! Do you use the expandAll method?"},
+			{ id:32, pId:3, name:"leaf node 3-2", t:"OMG, you can see me!! Do you use the expandAll method?"},
+			{ id:33, pId:3, name:"leaf node 3-3", t:"OMG, you can see me!! Do you use the expandAll method?"},
+			{ id:4, pId:0, name:"empty parent 1", t:"I have nothing...", isParent:true, open:false}
+		];
+
+		var log, className = "dark";
+		function beforeClick(treeId, treeNode) {
+			if (treeNode.isParent) {
+				return true;
+			} else {
+				alert("This Demo is used to test the parent node expand / collapse...\n\nGo to click parent node... ");
+				return false;
+			}
+		}
+		function beforeCollapse(treeId, treeNode) {
+			className = (className === "dark" ? "":"dark");
+			showLog("[ "+getTime()+" beforeCollapse ]&nbsp;&nbsp;&nbsp;&nbsp;" + treeNode.name );
+			return (treeNode.collapse !== false);
+		}
+		function onCollapse(event, treeId, treeNode) {
+			showLog("[ "+getTime()+" onCollapse ]&nbsp;&nbsp;&nbsp;&nbsp;" + treeNode.name);
+		}		
+		function beforeExpand(treeId, treeNode) {
+			className = (className === "dark" ? "":"dark");
+			showLog("[ "+getTime()+" beforeExpand ]&nbsp;&nbsp;&nbsp;&nbsp;" + treeNode.name );
+			return (treeNode.expand !== false);
+		}
+		function onExpand(event, treeId, treeNode) {
+			showLog("[ "+getTime()+" onExpand ]&nbsp;&nbsp;&nbsp;&nbsp;" + treeNode.name);
+		}
+		function showLog(str) {
+			if (!log) log = $("#log");
+			log.append("<li class='"+className+"'>"+str+"</li>");
+			if(log.children("li").length > 8) {
+				log.get(0).removeChild(log.children("li")[0]);
+			}
+		}
+		function getTime() {
+			var now= new Date(),
+			h=now.getHours(),
+			m=now.getMinutes(),
+			s=now.getSeconds(),
+			ms=now.getMilliseconds();
+			return (h+":"+m+":"+s+ " " +ms);
+		}
+
+		function expandNode(e) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			type = e.data.type,
+			nodes = zTree.getSelectedNodes();
+			if (type.indexOf("All")<0 && nodes.length == 0) {
+				alert("Please select one parent node at first...");
+			}
+
+			if (type == "expandAll") {
+				zTree.expandAll(true);
+			} else if (type == "collapseAll") {
+				zTree.expandAll(false);
+			} else {
+				var callbackFlag = $("#callbackTrigger").attr("checked");
+				for (var i=0, l=nodes.length; i<l; i++) {
+					zTree.setting.view.fontCss = {};
+					if (type == "expand") {
+						zTree.expandNode(nodes[i], true, null, null, callbackFlag);
+					} else if (type == "collapse") {
+						zTree.expandNode(nodes[i], false, null, null, callbackFlag);
+					} else if (type == "toggle") {
+						zTree.expandNode(nodes[i], null, null, null, callbackFlag);
+					} else if (type == "expandSon") {
+						zTree.expandNode(nodes[i], true, true, null, callbackFlag);
+					} else if (type == "collapseSon") {
+						zTree.expandNode(nodes[i], false, true, null, callbackFlag);
+					}
+				}
+			}
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			$("#expandBtn").bind("click", {type:"expand"}, expandNode);
+			$("#collapseBtn").bind("click", {type:"collapse"}, expandNode);
+			$("#toggleBtn").bind("click", {type:"toggle"}, expandNode);
+			$("#expandSonBtn").bind("click", {type:"expandSon"}, expandNode);
+			$("#collapseSonBtn").bind("click", {type:"collapseSon"}, expandNode);
+			$("#expandAllBtn").bind("click", {type:"expandAll"}, expandNode);
+			$("#collapseAllBtn").bind("click", {type:"collapseAll"}, expandNode);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Control of Expand Node</h1>
+<h6>[ File Path: core/expand.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, 'beforeCollapse / onCollapse'<br/>&nbsp;&nbsp;'beforeExpand / onExpand' callback function</h2>
+				<ul class="list">
+				<li>Use 'beforeCollapse / onCollapse' and 'beforeExpand / onExpand' callback function can control whether to allow expand or collapse the parent node
+					. This simple demo shows how to monitor the collapse and expand event.</li>
+				<li><p>Try: <br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" id="callbackTrigger" checked /> Whether trigger the callback when execution expandNode() method.<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;Single Node --[ <a id="expandBtn" href="#" title="expand..." onclick="return false;">expand</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="collapseBtn" href="#" title="collapse..." onclick="return false;">collapse</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="toggleBtn" href="#" title="what do you want?..." onclick="return false;">toggle</a> ]<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;Single Node (including child) --[ <a id="expandSonBtn" href="#" title="expand (including child)..." onclick="return false;">expand</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="collapseSonBtn" href="#" title="collapse (including child)..." onclick="return false;">collapse</a> ]<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;All Nodes --[ <a id="expandAllBtn" href="#" title="expand All!!" onclick="return false;">expand All</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="collapseAllBtn" href="#" title="collapse All!!" onclick="return false;">collapse All</a> ]</p>
+				<li><p><span class="highlight_red">How to use zTreeObj.updateNode method,  please see the API documentation.</span><br/>
+					collapse / expand log:<br/>
+					<ul id="log" class="log"></ul></p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of setting</h2>
+				<ul class="list">
+				<li class="highlight_red">Set attributes about 'setting.callback.beforeCollapse / onCollapse / beforeExpand / onExpand', please see the API documentation for more related contents.</li>
+				<li class="highlight_red">If you need to adjust the expand / collapse animation effects, please see the API documentation about setting.view.expandSpeed.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3, Explanation of treeNode</h2>
+				<ul class="list">
+				<li>No special requirements on the node data, the user can add custom attributes.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/core/noicon.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/core/noicon.html
new file mode 100644
index 0000000..19a6664
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/core/noicon.html
@@ -0,0 +1,93 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - noIcon </TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				showIcon: showIconForTree
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"pNode 1", open:true},
+			{ id:11, pId:1, name:"pNode 11"},
+			{ id:111, pId:11, name:"leaf node 111"},
+			{ id:112, pId:11, name:"leaf node 112"},
+			{ id:113, pId:11, name:"leaf node 113"},
+			{ id:114, pId:11, name:"leaf node 114"},
+			{ id:12, pId:1, name:"pNode 12"},
+			{ id:121, pId:12, name:"leaf node 121"},
+			{ id:122, pId:12, name:"leaf node 122"},
+			{ id:123, pId:12, name:"leaf node 123"},
+			{ id:124, pId:12, name:"leaf node 124"},
+			{ id:13, pId:1, name:"pNode 13 - no child", isParent:true},
+			{ id:2, pId:0, name:"pNode 2"},
+			{ id:21, pId:2, name:"pNode 21", open:true},
+			{ id:211, pId:21, name:"leaf node 211"},
+			{ id:212, pId:21, name:"leaf node 212"},
+			{ id:213, pId:21, name:"leaf node 213"},
+			{ id:214, pId:21, name:"leaf node 214"},
+			{ id:22, pId:2, name:"pNode 22"},
+			{ id:221, pId:22, name:"leaf node 221"},
+			{ id:222, pId:22, name:"leaf node 222"},
+			{ id:223, pId:22, name:"leaf node 223"},
+			{ id:224, pId:22, name:"leaf node 224"},
+			{ id:23, pId:2, name:"pNode 23"},
+			{ id:231, pId:23, name:"leaf node 231"},
+			{ id:232, pId:23, name:"leaf node 232"},
+			{ id:233, pId:23, name:"leaf node 233"},
+			{ id:234, pId:23, name:"leaf node 234"},
+			{ id:3, pId:0, name:"pNode 3 - no child", isParent:true}
+		];
+
+		function showIconForTree(treeId, treeNode) {
+			return !treeNode.isParent;
+		};
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+
+</HEAD>
+
+<BODY>
+<h1>Don't Show Icon</h1>
+<h6>[ File Path: core/noicon.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of setting</h2>
+				<ul class="list">
+				<li>This Demo using Function set to the parent node does not display the icon.</li>
+				<li class="highlight_red">Whether to display the icon, you need to set setting.view.showIcon attribute, see the API documentation for more related contents.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of treeNode</h2>
+				<ul class="list">
+				<li>TreeNode data does not require special settings. If you need some node display icon, and some nodes are not displayed, you can add special attributes to the node data for identification.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/core/noline.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/core/noline.html
new file mode 100644
index 0000000..d61792f
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/core/noline.html
@@ -0,0 +1,88 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - noLine </TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				showLine: false
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"pNode 1", open:true},
+			{ id:11, pId:1, name:"pNode 11"},
+			{ id:111, pId:11, name:"leaf node 111"},
+			{ id:112, pId:11, name:"leaf node 112"},
+			{ id:113, pId:11, name:"leaf node 113"},
+			{ id:114, pId:11, name:"leaf node 114"},
+			{ id:12, pId:1, name:"pNode 12"},
+			{ id:121, pId:12, name:"leaf node 121"},
+			{ id:122, pId:12, name:"leaf node 122"},
+			{ id:123, pId:12, name:"leaf node 123"},
+			{ id:124, pId:12, name:"leaf node 124"},
+			{ id:13, pId:1, name:"pNode 13 - no child", isParent:true},
+			{ id:2, pId:0, name:"pNode 2"},
+			{ id:21, pId:2, name:"pNode 21", open:true},
+			{ id:211, pId:21, name:"leaf node 211"},
+			{ id:212, pId:21, name:"leaf node 212"},
+			{ id:213, pId:21, name:"leaf node 213"},
+			{ id:214, pId:21, name:"leaf node 214"},
+			{ id:22, pId:2, name:"pNode 22"},
+			{ id:221, pId:22, name:"leaf node 221"},
+			{ id:222, pId:22, name:"leaf node 222"},
+			{ id:223, pId:22, name:"leaf node 223"},
+			{ id:224, pId:22, name:"leaf node 224"},
+			{ id:23, pId:2, name:"pNode 23"},
+			{ id:231, pId:23, name:"leaf node 231"},
+			{ id:232, pId:23, name:"leaf node 232"},
+			{ id:233, pId:23, name:"leaf node 233"},
+			{ id:234, pId:23, name:"leaf node 234"},
+			{ id:3, pId:0, name:"pNode 3 - no child", isParent:true}
+		];
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+
+</HEAD>
+
+<BODY>
+<h1>Don't Show Line</h1>
+<h6>[ File Path: core/noline.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of setting</h2>
+				<ul class="list">
+				<li class="highlight_red">Whether to display the line, you need to set setting.view.showLine attribute, see the API documentation for more related contents.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of treeNode</h2>
+				<ul class="list">
+				<li>TreeNode data does not require special settings</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/core/otherMouse.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/core/otherMouse.html
new file mode 100644
index 0000000..0e18a0c
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/core/otherMouse.html
@@ -0,0 +1,132 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - Other Mouse Event</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			data: {
+				key: {
+					title:"t"
+				},
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeMouseDown: beforeMouseDown,
+				beforeMouseUp: beforeMouseUp,
+				beforeRightClick: beforeRightClick,
+				onMouseDown: onMouseDown,
+				onMouseUp: onMouseUp,
+				onRightClick: onRightClick
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"Can't rClick 0", t:"Try RightClick", open:true, right:false},
+			{ id:11, pId:1, name:"Can't rClick 1", t:"Try RightClick", right:false},
+			{ id:12, pId:1, name:"Can't rClick 2", t:"Try RightClick", right:false},
+			{ id:13, pId:1, name:"Can't rClick 3", t:"Try RightClick", right:false},
+			{ id:2, pId:0, name:"Can't msDown 0", t:"Try MouseDown", open:true, down:false},
+			{ id:21, pId:2, name:"Can't msDown 1", t:"Try MouseDown", down:false},
+			{ id:22, pId:2, name:"Can't msDown 2", t:"Try MouseDown", down:false},
+			{ id:23, pId:2, name:"Can't msDown 3", t:"Try MouseDown", down:false},
+			{ id:3, pId:0, name:"Can't msUp 0", t:"Try MouseUp", open:true, up:false},
+			{ id:31, pId:3, name:"Can't msUp 1", t:"Try MouseUp", up:false},
+			{ id:32, pId:3, name:"Can't msUp 2", t:"Try MouseUp", up:false},
+			{ id:33, pId:3, name:"Can't msUp 3", t:"Try MouseUp", up:false}
+		];
+
+		var log, className = {down:"dark", up:"dark", right:"dark"};
+		function beforeMouseDown(treeId, treeNode) {
+			className.down = (className.down === "dark" ? "":"dark");
+			showLog("[ "+getTime()+" beforeMouseDown ]&nbsp;&nbsp;" + (treeNode?treeNode.name:"root"), "down" );
+			return (!treeNode || treeNode.down != false);
+		}
+		function onMouseDown(event, treeId, treeNode) {
+			showLog("[ "+getTime()+" onMouseDown ]&nbsp;&nbsp;" + (treeNode?treeNode.name:"root"), "down" );
+		}
+		function beforeMouseUp(treeId, treeNode) {
+			className.up = (className.up === "dark" ? "":"dark");
+			showLog("[ "+getTime()+" beforeMouseUp ]&nbsp;&nbsp;" + (treeNode?treeNode.name:"root"), "up" );
+			return (!treeNode || treeNode.up != false);
+		}
+		function onMouseUp(event, treeId, treeNode) {
+			showLog("[ "+getTime()+" onMouseUp ]&nbsp;&nbsp;" + (treeNode?treeNode.name:"root"), "up" );
+		}
+		function beforeRightClick(treeId, treeNode) {
+			className.right = (className.right === "dark" ? "":"dark");
+			showLog("[ "+getTime()+" beforeRightClick ]&nbsp;&nbsp;" + (treeNode?treeNode.name:"root"), "right" );
+			return (!treeNode || treeNode.right != false);
+		}
+		function onRightClick(event, treeId, treeNode) {
+			showLog("[ "+getTime()+" onRightClick ]&nbsp;&nbsp;" + (treeNode?treeNode.name:"root"), "right" );
+		}
+		function showLog(str, logType) {
+			log = $("#log" + "_" + logType);
+			log.append("<li class='"+className[logType]+"'>"+str+"</li>");
+			if(log.children("li").length > 2) {
+				log.get(0).removeChild(log.children("li")[0]);
+			}
+		}
+		function getTime() {
+			var now= new Date(),
+			h=now.getHours(),
+			m=now.getMinutes(),
+			s=now.getSeconds(),
+			ms=now.getMilliseconds();
+			return (h+":"+m+":"+s+ " " +ms);
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Other Mouse Events for zTree</h1>
+<h6>[ File Path: core/otherMouse.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, 'beforeMousedown / onMousedown / beforeMouseup / onMouseup / beforeRightClick / onRightClick' callback function</h2>
+				<ul class="list">
+				<li>zTree provide these types of mouse event callbacks, in order to facilitate the user to extend the functionality. And doesn't affect zTree normal function, This simple demo shows how to monitor the mousedown/mouseup/rightClick event.</li>
+				<li><p><span class="highlight_red">Try clicking with the mouse on the zTree (left or right),  by the way to see log.</span><br/>
+					mousedown event log:<br/>
+					<ul id="log_down" class="log small"></ul>
+					mouseup event log:<br/>
+					<ul id="log_up" class="log small"></ul>
+					rightClick event log:<br/>
+					<ul id="log_right" class="log small"></ul></p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of setting</h2>
+				<ul class="list">
+				<li class="highlight_red">Set attributes about 'setting.callback.beforeMousedown / onMousedown / beforeMouseup / onMouseup / beforeRightClick / onRightClick', please see the API documentation for more related contents.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3, Explanation of treeNode</h2>
+				<ul class="list">
+				<li>No special requirements on the node data, the user can add custom attributes.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/core/searchNodes.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/core/searchNodes.html
new file mode 100644
index 0000000..1d0695a
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/core/searchNodes.html
@@ -0,0 +1,173 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - getNodeByParam / getNodesByParam / getNodesByParamFuzzy</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			data: {
+				key: {
+					title: "t"
+				},
+				simpleData: {
+					enable: true
+				}
+			},
+			view: {
+				fontCss: getFontCss
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"search node demo 1", t:"id=1", open:true},
+			{ id:11, pId:1, name:"can search 'name'", t:"id=11"},
+			{ id:12, pId:1, name:"can search 'level'", t:"id=12"},
+			{ id:13, pId:1, name:"can search 'id'", t:"id=13"},
+			{ id:14, pId:1, name:"can search other attr", t:"id=14"},
+			{ id:2, pId:0, name:"search node demo 2", t:"id=2", open:true},
+			{ id:21, pId:2, name:"can search single node", t:"id=21"},
+			{ id:22, pId:2, name:"can search nodes array", t:"id=22"},
+			{ id:23, pId:2, name:"search me", t:"id=23"},
+			{ id:3, pId:0, name:"search node demo 3", t:"id=3", open:true },
+			{ id:31, pId:3, name:"My id is : 31", t:"id=31"},
+			{ id:32, pId:31, name:"My id is : 32", t:"id=32"},
+			{ id:33, pId:32, name:"My id is : 33", t:"id=33"}
+		];
+
+		function focusKey(e) {
+			if (key.hasClass("empty")) {
+				key.removeClass("empty");
+			}
+		}
+		function blurKey(e) {
+			if (key.get(0).value === "") {
+				key.addClass("empty");
+			}
+		}
+		var lastValue = "", nodeList = [], fontCss = {};
+		function clickRadio(e) {
+			lastValue = "";
+			searchNode(e);
+		}
+		function searchNode(e) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			if (!$("#getNodesByFilter").attr("checked")) {
+				var value = $.trim(key.get(0).value);
+				var keyType = "";
+				if ($("#name").attr("checked")) {
+					keyType = "name";
+				} else if ($("#level").attr("checked")) {
+					keyType = "level";
+					value = parseInt(value);
+				} else if ($("#id").attr("checked")) {
+					keyType = "id";
+					value = parseInt(value);
+				}
+				if (key.hasClass("empty")) {
+					value = "";
+				}
+				if (lastValue === value) return;
+				lastValue = value;
+				if (value === "") return;
+				updateNodes(false);
+
+				if ($("#getNodeByParam").attr("checked")) {
+					var node = zTree.getNodeByParam(keyType, value);
+					if (node === null) {
+						nodeList = [];
+					} else {
+						nodeList = [node];
+					}
+				} else if ($("#getNodesByParam").attr("checked")) {
+					nodeList = zTree.getNodesByParam(keyType, value);
+				} else if ($("#getNodesByParamFuzzy").attr("checked")) {
+					nodeList = zTree.getNodesByParamFuzzy(keyType, value);
+				}
+			} else {
+				updateNodes(false);
+				nodeList = zTree.getNodesByFilter(filter);
+			}
+			updateNodes(true);
+
+		}
+		function updateNodes(highlight) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			for( var i=0, l=nodeList.length; i<l; i++) {
+				nodeList[i].highlight = highlight;
+				zTree.updateNode(nodeList[i]);
+			}
+		}
+		function getFontCss(treeId, treeNode) {
+			return (!!treeNode.highlight) ? {color:"#A60000", "font-weight":"bold"} : {color:"#333", "font-weight":"normal"};
+		}
+		function filter(node) {
+			return !node.isParent && node.isFirstNode;
+		}
+
+		var key;
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			key = $("#key");
+			key.bind("focus", focusKey)
+			.bind("blur", blurKey)
+			.bind("propertychange", searchNode)
+			.bind("input", searchNode);
+			$("#name").bind("change", clickRadio);
+			$("#level").bind("change", clickRadio);
+			$("#id").bind("change", clickRadio);
+			$("#getNodeByParam").bind("change", clickRadio);
+			$("#getNodesByParam").bind("change", clickRadio);
+			$("#getNodesByParamFuzzy").bind("change", clickRadio);
+			$("#getNodesByFilter").bind("change", clickRadio);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Search Nodes</h1>
+<h6>[ File Path: core/searchNodes.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of getNodeByParam / getNodesByParam / getNodesByParamFuzzy</h2>
+				<ul class="list">
+				<li class="highlight_red">How to use ’zTreeObj.getNodeByParam / getNodesByParam / getNodesByParamFuzzy / getNodeByTId‘ method,  please see the API documentation.</li>
+				<li><p>Try to search: <br/>
+						attribute( value ): <input type="text" id="key" value="" class="empty" /><br/>
+						attribute( key ): <input type="radio" id="name" name="keyType" class="radio first" checked /><span>name (string)</span><br/>
+						<input type="radio" id="level" name="keyType" class="radio" style="margin-left:68px;" /><span>level (number) ... root node's level is 0</span><br/>
+						<input type="radio" id="id" name="keyType" class="radio" style="margin-left:68px;" /><span>id (number)</span><br/>
+						method: <input type="radio" id="getNodeByParam" name="funType" class="radio first" /><span>getNodeByParam</span><br/>
+						<input type="radio" id="getNodesByParam" name="funType" class="radio" style="margin-left:36px;" /><span>getNodesByParam</span><br/>
+						<input type="radio" id="getNodesByParamFuzzy" name="funType" class="radio" style="margin-left:36px;" checked /><span>getNodesByParamFuzzy (only string)</span><br/>
+						<input type="radio" id="getNodesByFilter" name="funType" class="radio" style="margin-left:36px;" /><span>getNodesByFilter (see source: function filter)</span><br/>
+					</p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of setting</h2>
+				<ul class="list">
+				<li>Do not need to set the setting.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3, Explanation of treeNode</h2>
+				<ul class="list">
+				<li class="highlight_red">Note: Please ensure that the incoming value type is  the same as  type of attribute.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/core/simpleData.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/core/simpleData.html
new file mode 100644
index 0000000..bf07831
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/core/simpleData.html
@@ -0,0 +1,100 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - Simple Data</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			data: {
+				simpleData: {
+					enable: true
+				}
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"pNode 1", open:true},
+			{ id:11, pId:1, name:"pNode 11"},
+			{ id:111, pId:11, name:"leaf node 111"},
+			{ id:112, pId:11, name:"leaf node 112"},
+			{ id:113, pId:11, name:"leaf node 113"},
+			{ id:114, pId:11, name:"leaf node 114"},
+			{ id:12, pId:1, name:"pNode 12"},
+			{ id:121, pId:12, name:"leaf node 121"},
+			{ id:122, pId:12, name:"leaf node 122"},
+			{ id:123, pId:12, name:"leaf node 123"},
+			{ id:124, pId:12, name:"leaf node 124"},
+			{ id:13, pId:1, name:"pNode 13 - no child", isParent:true},
+			{ id:2, pId:0, name:"pNode 2"},
+			{ id:21, pId:2, name:"pNode 21", open:true},
+			{ id:211, pId:21, name:"leaf node 211"},
+			{ id:212, pId:21, name:"leaf node 212"},
+			{ id:213, pId:21, name:"leaf node 213"},
+			{ id:214, pId:21, name:"leaf node 214"},
+			{ id:22, pId:2, name:"pNode 22"},
+			{ id:221, pId:22, name:"leaf node 221"},
+			{ id:222, pId:22, name:"leaf node 222"},
+			{ id:223, pId:22, name:"leaf node 223"},
+			{ id:224, pId:22, name:"leaf node 224"},
+			{ id:23, pId:2, name:"pNode 23"},
+			{ id:231, pId:23, name:"leaf node 231"},
+			{ id:232, pId:23, name:"leaf node 232"},
+			{ id:233, pId:23, name:"leaf node 233"},
+			{ id:234, pId:23, name:"leaf node 234"},
+			{ id:3, pId:0, name:"pNode 3 - no child", isParent:true}
+		];
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+ </HEAD>
+
+<BODY>
+<h1>Simple JSON Data</h1>
+<h6>[ File Path: core/simpleData.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of setting</h2>
+				<ul class="list">
+				<li class="highlight_red">Must set setting.data.simple attributes,  see the API documentation for more related contents.</li>
+				<li>The setting.view in API documentation is associated with the display of the zTree.</li>
+				<li>To change the 'name', 'children', 'title' attribute, please refer to the API documentation about 'setting.data.key'.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of treeNode</h2>
+				<ul class="list">
+				<li class="highlight_red">Id / pId that include parent-child relationship between nodes is needed if you use Simple model of the JSON data, and other attributes please refer to the instructions within setting.data.simple.
+				<div><pre xmlns=""><code>For example:
+var nodes = [
+	{id:1, pId:0, name: "pNode 01"},
+	{id:11, pId:1, name: "child 01"},
+	{id:12, pId:1, name: "child 02"}
+];</code></pre></div></li>
+				<li>To set nodes expanded by default, set treeNode.open attribute.</li>
+				<li>To get parent node which has no child node, set treeNode.isParent attribute.</li>
+				<li>Please refer to the API documentation "treeNode data details" to view other attributes description.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、Other explanation</h2>
+				<ul class="list">
+				<li>The simple JSON data model has been used almost everywhere, which can be learned easily.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/core/standardData.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/core/standardData.html
new file mode 100644
index 0000000..909a63b
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/core/standardData.html
@@ -0,0 +1,106 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - Standard Data </TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {	};
+
+		var zNodes =[
+			{ name:"pNode 01", open:true,
+				children: [
+					{ name:"pNode 11",
+						children: [
+							{ name:"leaf node 111"},
+							{ name:"leaf node 112"},
+							{ name:"leaf node 113"},
+							{ name:"leaf node 114"}
+						]},
+					{ name:"pNode 12",
+						children: [
+							{ name:"leaf node 121"},
+							{ name:"leaf node 122"},
+							{ name:"leaf node 123"},
+							{ name:"leaf node 124"}
+						]},
+					{ name:"pNode 13 - no child", isParent:true}
+				]},
+			{ name:"pNode 02",
+				children: [
+					{ name:"pNode 21", open:true,
+						children: [
+							{ name:"leaf node 211"},
+							{ name:"leaf node 212"},
+							{ name:"leaf node 213"},
+							{ name:"leaf node 214"}
+						]},
+					{ name:"pNode 22",
+						children: [
+							{ name:"leaf node 221"},
+							{ name:"leaf node 222"},
+							{ name:"leaf node 223"},
+							{ name:"leaf node 224"}
+						]},
+					{ name:"pNode 23",
+						children: [
+							{ name:"leaf node 231"},
+							{ name:"leaf node 232"},
+							{ name:"leaf node 233"},
+							{ name:"leaf node 234"}
+						]}
+				]},
+			{ name:"pNode 3 - no child", isParent:true}
+
+		];
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Standard JSON Data</h1>
+<h6>[ File Path: core/standardData.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of setting</h2>
+				<ul class="list">
+				<li class="highlight_red">No extrally setting needed for basic functions.</li>
+				<li>The setting.view in API documentation is associated with the display of the zTree.</li>
+				<li>To change the 'name', 'children', 'title' attribute, please refer to the API documentation about 'setting.data.key'.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of treeNode</h2>
+				<ul class="list">
+				<li class="highlight_red">Need to use nested JSON data that include parent-child relationship between nodes
+					<div><pre xmlns=""><code>For example:
+var nodes = [
+	{name: "pNode 01", children: [
+		{name: "child 01"},
+		{name: "child 02"}
+	]}
+];</code></pre></div>
+				</li>
+				<li>To set nodes expanded by default, set treeNode.open attribute.</li>
+				<li>No child nodes of parent node, set treeNode.isParent attribute.</li>
+				<li>Please refer to the API documentation "treeNode data details" to view other attributes description.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/core/update_fun.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/core/update_fun.html
new file mode 100644
index 0000000..0909a34
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/core/update_fun.html
@@ -0,0 +1,143 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - updateNode</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				selectedMulti: false
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"pNode 01", open:true},
+			{ id:11, pId:1, name:"leaf node 01"},
+			{ id:12, pId:1, name:"leaf node 02"},
+			{ id:13, pId:1, name:"leaf node 03"},
+			{ id:2, pId:0, name:"pNode 02", open:true},
+			{ id:21, pId:2, name:"leaf node 01"},
+			{ id:22, pId:2, name:"leaf node 02"},
+			{ id:23, pId:2, name:"leaf node 03"},
+			{ id:3, pId:0, name:"pNode 03", open:true },
+			{ id:31, pId:3, name:"leaf node 01"},
+			{ id:32, pId:3, name:"leaf node 02"},
+			{ id:33, pId:3, name:"leaf node 03"}
+		];
+
+		var nameCount = 0, iconCount = 1, color = [0, 0, 0];
+		function updateNode(e) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			type = e.data.type,
+			nodes = zTree.getSelectedNodes();
+			if (nodes.length == 0) {
+				alert("Please select one node...");
+			}
+			for (var i=0, l=nodes.length; i<l; i++) {
+				zTree.setting.view.fontCss = {};
+				if (type == "rename") {
+					nodes[i].name = nodes[i].name.replace(/_[\d]*$/g, "") + "_" + (nameCount++);
+				} else if (type == "icon") {
+					if (iconCount > 8) {
+						nodes[i].iconSkin = null;
+						iconCount = 1;
+					} else if (nodes[i].isParent) {
+						nodes[i].iconSkin = nodes[i].iconSkin ? null : "pIcon01";
+					} else {
+						nodes[i].iconSkin = "icon0" + (iconCount++);
+					}
+				} else if (type == "color") {
+					color = [0, 0, 0];
+					var r1 = Math.round(Math.random()*3 - 0.5);
+					color[r1] = 15;
+					var r2 = Math.round(Math.random()*3 - 0.5);
+					while (r2 === r1) {
+						r2 = Math.round(Math.random()*3 - 0.5);
+					}
+					color[r2] = Math.round(Math.random()*16-0.5);
+					zTree.setting.view.fontCss["color"] = "#"+color[0].toString(16)+color[1].toString(16)+color[2].toString(16);
+				} else if (type == "font") {
+					var style = $("#" + nodes[i].tId + "_a").css("font-style") ;
+					style = (style=="italic" ? "normal" : "italic");
+					zTree.setting.view.fontCss["font-style"] = style;
+				}
+				zTree.updateNode(nodes[i]);
+			}
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			$("#rename").bind("click", {type:"rename"}, updateNode);
+			$("#changeIcon").bind("click", {type:"icon"}, updateNode);
+			$("#changeColor").bind("click", {type:"color"}, updateNode);
+			$("#changeFont").bind("click", {type:"font"}, updateNode);
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+.ztree li span.button.pIcon01_ico_open{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/1_open.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.pIcon01_ico_close{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/1_close.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon01_ico_docu{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/2.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon02_ico_docu{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/3.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon03_ico_docu{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/4.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon04_ico_docu{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/5.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon05_ico_docu{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/6.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon06_ico_docu{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/7.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon07_ico_docu{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/8.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon08_ico_docu{margin-right:2px; background: url(../../../css/zTreeStyle/img/diy/9.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+	</style>
+</HEAD>
+
+<BODY>
+<h1>Update Node - zTree methods</h1>
+<h6>[ File Path: core/update_fun.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of updateNode</h2>
+				<ul class="list">
+				<li class="highlight_red">How to use zTreeObj.updateNode method,  please see the API documentation.</li>
+				<li><p>This Demo can only select one parent node<br/>
+					Try: [ <a id="rename" href="#" onclick="return false;">Change Name</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="changeIcon" href="#" onclick="return false;">Change Icon</a> ]<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="changeColor" href="#" onclick="return false;">Change Color</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="changeFont" href="#" onclick="return false;">Change Italic Font</a> ]</p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of setting</h2>
+				<ul class="list">
+				<li>Do not need to set the setting.</li>
+				<li class="highlight_red">You can modify the node style with setting.view.fontCss.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3, Explanation of treeNode</h2>
+				<ul class="list">
+				<li class="highlight_red">In the API documentation has detail description about the 'zTreeObj.updateNode method'.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>4、Other explanation</h2>
+				<ul class="list">
+				<li>This demo only made ​by the core js, so does not include the checkbox update.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/core/url.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/core/url.html
new file mode 100644
index 0000000..788b03f
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/core/url.html
@@ -0,0 +1,63 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - url</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			data: {
+				simpleData: {
+					enable: true
+				}
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"zTree Home", url:"http://www.baby666.cn", target:"_blank"},
+			{ id:2, pId:0, name:"zTree in Google", url:"http://code.google.com/p/jquerytree/", target:"_blank"},
+			{ id:3, pId:0, name:"zTree in Iteye", url:"http://ztreeapi.iteye.com/", target:"_blank"},
+			{ id:4, pId:0, name:"Nothing...", url:"", target:"_blank", click:"alert('I can not jump...');"}
+		];
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+ </HEAD>
+
+<BODY>
+<h1>Hyperlinks Demo</h1>
+<h6>[ File Path: core/url.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of setting</h2>
+				<ul class="list">
+				<li>No extrally setting needed for basic functions.</li>
+				<li class="highlight_red">If you need flexible control of hyperlinks to jump, please use the 'onClick' callback. See the API documentation for more related contents.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of treeNode</h2>
+				<ul class="list">
+				<li class="highlight_red">1. the 'url' attribute is used to save the hyperlink's path.</li>
+				<li class="highlight_red">2. the 'target' attribute is used to save the hyperlink's target.</li>
+				<li class="highlight_red">3. the 'click' attribute is used to save the hyperlink's 'onclick' attribute.</li>
+				<li>Please refer to the API documentation "treeNode data details" to view other attributes description.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/excheck/checkbox.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/excheck/checkbox.html
new file mode 100644
index 0000000..f2a1408
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/excheck/checkbox.html
@@ -0,0 +1,107 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - checkbox</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<!--
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			check: {
+				enable: true
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"can check 1", open:true},
+			{ id:11, pId:1, name:"can check 1-1", open:true},
+			{ id:111, pId:11, name:"can check 1-1-1"},
+			{ id:112, pId:11, name:"can check 1-1-2"},
+			{ id:12, pId:1, name:"can check 1-2", open:true},
+			{ id:121, pId:12, name:"can check 1-2-1"},
+			{ id:122, pId:12, name:"can check 1-2-2"},
+			{ id:2, pId:0, name:"can check 2", checked:true, open:true},
+			{ id:21, pId:2, name:"can check 2-1"},
+			{ id:22, pId:2, name:"can check 2-2", open:true},
+			{ id:221, pId:22, name:"can check 2-2-1", checked:true},
+			{ id:222, pId:22, name:"can check 2-2-2"},
+			{ id:23, pId:2, name:"can check 2-3"}
+		];
+
+		var code;
+
+		function setCheck() {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			py = $("#py").attr("checked")? "p":"",
+			sy = $("#sy").attr("checked")? "s":"",
+			pn = $("#pn").attr("checked")? "p":"",
+			sn = $("#sn").attr("checked")? "s":"",
+			type = { "Y":py + sy, "N":pn + sn};
+			zTree.setting.check.chkboxType = type;
+			showCode('setting.check.chkboxType = { "Y" : "' + type.Y + '", "N" : "' + type.N + '" };');
+		}
+		function showCode(str) {
+			if (!code) code = $("#code");
+			code.empty();
+			code.append("<li>"+str+"</li>");
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			setCheck();
+			$("#py").bind("change", setCheck);
+			$("#sy").bind("change", setCheck);
+			$("#pn").bind("change", setCheck);
+			$("#sn").bind("change", setCheck);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Checkbox Operation</h1>
+<h6>[ File Path: excheck/checkbox.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of setting</h2>
+				<ul class="list">
+				<li class="highlight_red">Must set setting.check attributes, see the API documentation for more related contents.</li>
+				<li><p>Linkage relationship between parent and child nodes:<br/>
+						check: <input type="checkbox" id="py" class="checkbox first" checked /><span>affect the parent</span>
+						<input type="checkbox" id="sy" class="checkbox first" checked /><span>affect the child</span><br/>
+						uncheck: <input type="checkbox" id="pn" class="checkbox first" checked /><span>affect the parent</span>
+						<input type="checkbox" id="sn" class="checkbox first" checked /><span>affect the child</span><br/>
+						<ul id="code" class="log" style="height:20px;"></ul></p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of treeNode</h2>
+				<ul class="list">
+				<li class="highlight_red">1), If you need to initialize the node is checked, please set treeNode.checked attribute. See the API documentation for more related contents.</li>
+				<li class="highlight_red">2), If you need to initialize the node's checkbox is disabled, please set treeNode.chkDisabled attribute. See the API documentation for more related contents and 'chkDisabled Demo'.</li>
+				<li class="highlight_red">3), If you need to initialize the node don't show checkbox, please set treeNode.nocheck attribute. See the API documentation for more related contents and 'nocheck Demo'.</li>
+				<li class="highlight_red">4), If you need to change 'checked' to other attribute, please set setting.data.key.checked attribute. See the API documentation for more related contents.</li>
+				<li>5), By the way, please see the API documentation for 'treeNode.checkedOld / getCheckStatus / check_Child_State / check_Focus'.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/excheck/checkbox_chkDisabled.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/excheck/checkbox_chkDisabled.html
new file mode 100644
index 0000000..1296e13
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/excheck/checkbox_chkDisabled.html
@@ -0,0 +1,111 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - Checkbox chkDisabled</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<!--
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			check: {
+				enable: true,
+				chkDisabledInherit: true
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"can check 1", open:true},
+			{ id:11, pId:1, name:"can check 1-1", open:true},
+			{ id:111, pId:11, name:"disabled 1-1-1", chkDisabled:true},
+			{ id:112, pId:11, name:"can check 1-1-2"},
+			{ id:12, pId:1, name:"disabled 1-2", chkDisabled:true, checked:true, open:true},
+			{ id:121, pId:12, name:"disabled 1-2-1", checked:true},
+			{ id:122, pId:12, name:"disabled 1-2-2"},
+			{ id:2, pId:0, name:"can check 2", checked:true, open:true},
+			{ id:21, pId:2, name:"can check 2-1"},
+			{ id:22, pId:2, name:"can check 2-2", open:true},
+			{ id:221, pId:22, name:"can check 2-2-1", checked:true},
+			{ id:222, pId:22, name:"can check 2-2-2"},
+			{ id:23, pId:2, name:"can check 2-3"}
+		];
+
+		function disabledNode(e) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			disabled = e.data.disabled,
+			nodes = zTree.getSelectedNodes();
+			if (nodes.length == 0) {
+				alert("Please select one node at first...");
+			}
+			if (disabled) {
+				inheritParent = $("#py").attr("checked");
+				inheritChildren = $("#sy").attr("checked");
+			} else {
+				inheritParent = $("#pn").attr("checked");
+				inheritChildren = $("#sn").attr("checked");
+			}
+
+			for (var i=0, l=nodes.length; i<l; i++) {
+				zTree.setChkDisabled(nodes[i], disabled, inheritParent, inheritChildren);
+			}
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			$("#disabledTrue").bind("click", {disabled: true}, disabledNode);
+			$("#disabledFalse").bind("click", {disabled: false}, disabledNode);
+
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Checkbox chkDisabled Demo</h1>
+<h6>[ File Path: excheck/checkbox_chkDisabled.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of 'setChkDisabled' method</h2>
+				<ul class="list">
+				<li>'setChkDisabled' method can set the node's checkbox / radio to be disabled or abled. See the API documentation for more related contents.</li>
+				<li><p>Try:<br/>
+					disabled: <input type="checkbox" id="py" class="checkbox first" /><span>affect the parent</span>
+					<input type="checkbox" id="sy" class="checkbox first" checked /><span>affect the child</span><br/>
+					unDisabled: <input type="checkbox" id="pn" class="checkbox first" checked /><span>affect the parent</span>
+					<input type="checkbox" id="sn" class="checkbox first" checked /><span>affect the child</span><br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="disabledTrue" href="#" title="set checkbox to be disabled." onclick="return false;">be disabled</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="disabledFalse" href="#" title="set checkbox to be abled." onclick="return false;">be abled</a> ]</p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of setting</h2>
+				<ul class="list">
+				<li>This Demo only shows how use the ‘chkDisabled’ attribute, detailed configuration information, please refer to 'Checkbox Operation'</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3, Explanation of treeNode</h2>
+				<ul class="list">
+				<li class="highlight_red">1), If you need to initialize the node's checkbox is disabled, please set treeNode.chkDisabled attribute. See the API documentation for more related contents.</li>
+				<li>2), By the way, please see the 'Checkbox Operation' Demo.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/excheck/checkbox_count.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/excheck/checkbox_count.html
new file mode 100644
index 0000000..ae44390
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/excheck/checkbox_count.html
@@ -0,0 +1,127 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - getChangeCheckedNodes / getCheckedNodes</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<!--
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				selectedMulti: false
+			},
+			check: {
+				enable: true
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				onCheck: onCheck
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"can check 1", open:true},
+			{ id:11, pId:1, name:"can check 1-1"},
+			{ id:12, pId:1, name:"can check  1-2", open:true},
+			{ id:121, pId:12, name:"can check 1-2-1", checked:true},
+			{ id:122, pId:12, name:"can check 1-2-2"},
+			{ id:123, pId:12, name:"can check 1-2-3"},
+			{ id:13, pId:1, name:"can check 1-3"},
+			{ id:2, pId:0, name:"can check 2", open:true},
+			{ id:21, pId:2, name:"can check 2-1"},
+			{ id:22, pId:2, name:"can check 2-2", open:true},
+			{ id:221, pId:22, name:"can check 2-2-1", checked:true},
+			{ id:222, pId:22, name:"can check 2-2-2"},
+			{ id:223, pId:22, name:"can check 2-2-3"},
+			{ id:23, pId:2, name:"can check 2-3", checked:true}
+		];
+
+		var clearFlag = false;
+		function onCheck(e, treeId, treeNode) {
+			count();
+			if (clearFlag) {
+				clearCheckedOldNodes();
+			}
+		}
+		function clearCheckedOldNodes() {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nodes = zTree.getChangeCheckedNodes();
+			for (var i=0, l=nodes.length; i<l; i++) {
+				nodes[i].checkedOld = nodes[i].checked;
+			}
+		}
+		function count() {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			checkCount = zTree.getCheckedNodes(true).length,
+			nocheckCount = zTree.getCheckedNodes(false).length,
+			changeCount = zTree.getChangeCheckedNodes().length;
+			$("#checkCount").text(checkCount);
+			$("#nocheckCount").text(nocheckCount);
+			$("#changeCount").text(changeCount);
+
+		}
+		function createTree() {
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			count();
+			clearFlag = $("#last").attr("checked");
+		}
+
+		$(document).ready(function(){
+			createTree();			
+			$("#init").bind("change", createTree);
+			$("#last").bind("change", createTree);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Statistics Checkbox is Checked</h1>
+<h6>[ File Path: excheck/checkbox_count.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of getChangeCheckedNodes / getCheckedNodes</h2>
+				<ul class="list">
+				<li class="highlight_red">How to use zTreeObj.getChangeCheckedNodes / getCheckedNodes method,  please see the API documentation.</li>
+				<li><p>Check the checkbox, observe the number of changes:<br/>
+					<ul id="log" class="log" style="height:130px;">
+						<li>Total check node: <span id="checkCount" class="highlight_red"></span></li>
+						<li>Total uncheck node: <span id="nocheckCount" class="highlight_red"></span></li>
+						<li>Modify the state of checkbox: <br/>
+							<input type="radio" id="init" name="stateType" class="radio first" checked style="margin-left:68px;"/><span>Compared with zTree initialization</span><br/>
+							<input type="radio" id="last" name="stateType" class="radio first" style="margin-left:68px;"/><span>Compared with the last check</span></li>
+						<li>Total change the checkbox state of node: <span id="changeCount" class="highlight_red"></span></li>
+					</ul></p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of setting</h2>
+				<ul class="list">
+				<li>Same as 'Checkbox Operation'</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3, Explanation of treeNode</h2>
+				<ul class="list">
+				<li>Same as 'Checkbox Operation'</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/excheck/checkbox_fun.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/excheck/checkbox_fun.html
new file mode 100644
index 0000000..0562fe6
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/excheck/checkbox_fun.html
@@ -0,0 +1,172 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - beforeCheck / onCheck</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<!--
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				selectedMulti: false
+			},
+			check: {
+				enable: true
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeCheck: beforeCheck,
+				onCheck: onCheck
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"can check 1", open:true},
+			{ id:11, pId:1, name:"can check 1-1"},
+			{ id:12, pId:1, name:"can check 1-2", open:true},
+			{ id:121, pId:12, name:"can check 1-2-1"},
+			{ id:122, pId:12, name:"can check 1-2-2"},
+			{ id:2, pId:0, name:"can't check 2", open:true, doCheck:false},
+			{ id:21, pId:2, name:"can't check 2-1", doCheck:false},
+			{ id:22, pId:2, name:"can't check 2-2", checked:true, open:true, doCheck:false},
+			{ id:221, pId:22, name:"can't chk 2-2-1", doCheck:false},
+			{ id:222, pId:22, name:"can't chk 2-2-2", checked:true, doCheck:false},
+			{ id:23, pId:2, name:"can't check 2-3", doCheck:false}
+		];
+		
+		var code, log, className = "dark";
+		function beforeCheck(treeId, treeNode) {
+			className = (className === "dark" ? "":"dark");
+			showLog("[ "+getTime()+" beforeCheck ]&nbsp;&nbsp;&nbsp;&nbsp;" + treeNode.name );
+			return (treeNode.doCheck !== false);
+		}
+		function onCheck(e, treeId, treeNode) {
+			showLog("[ "+getTime()+" onCheck ]&nbsp;&nbsp;&nbsp;&nbsp;" + treeNode.name );
+		}		
+		function showLog(str) {
+			if (!log) log = $("#log");
+			log.append("<li class='"+className+"'>"+str+"</li>");
+			if(log.children("li").length > 6) {
+				log.get(0).removeChild(log.children("li")[0]);
+			}
+		}
+		function getTime() {
+			var now= new Date(),
+			h=now.getHours(),
+			m=now.getMinutes(),
+			s=now.getSeconds(),
+			ms=now.getMilliseconds();
+			return (h+":"+m+":"+s+ " " +ms);
+		}
+
+		function checkNode(e) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			type = e.data.type,
+			nodes = zTree.getSelectedNodes();
+			if (type.indexOf("All")<0 && nodes.length == 0) {
+				alert("Please select one node at first...");
+			}
+
+			if (type == "checkAllTrue") {
+				zTree.checkAllNodes(true);
+			} else if (type == "checkAllFalse") {
+				zTree.checkAllNodes(false);
+			} else {
+				var callbackFlag = $("#callbackTrigger").attr("checked");
+				for (var i=0, l=nodes.length; i<l; i++) {
+					if (type == "checkTrue") {
+						zTree.checkNode(nodes[i], true, false, callbackFlag);
+					} else if (type == "checkFalse") {
+						zTree.checkNode(nodes[i], false, false, callbackFlag);
+					} else if (type == "toggle") {
+						zTree.checkNode(nodes[i], null, false, callbackFlag);
+					}else if (type == "checkTruePS") {
+						zTree.checkNode(nodes[i], true, true, callbackFlag);
+					} else if (type == "checkFalsePS") {
+						zTree.checkNode(nodes[i], false, true, callbackFlag);
+					} else if (type == "togglePS") {
+						zTree.checkNode(nodes[i], null, true, callbackFlag);
+					}
+				}
+			}
+		}
+
+		function setAutoTrigger(e) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			zTree.setting.check.autoCheckTrigger = $("#autoCallbackTrigger").attr("checked");
+			$("#autoCheckTriggerValue").html(zTree.setting.check.autoCheckTrigger ? "true" : "false");
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			$("#checkTrue").bind("click", {type:"checkTrue"}, checkNode);
+			$("#checkFalse").bind("click", {type:"checkFalse"}, checkNode);
+			$("#toggle").bind("click", {type:"toggle"}, checkNode);
+			$("#checkTruePS").bind("click", {type:"checkTruePS"}, checkNode);
+			$("#checkFalsePS").bind("click", {type:"checkFalsePS"}, checkNode);
+			$("#togglePS").bind("click", {type:"togglePS"}, checkNode);
+			$("#checkAllTrue").bind("click", {type:"checkAllTrue"}, checkNode);
+			$("#checkAllFalse").bind("click", {type:"checkAllFalse"}, checkNode);
+
+			$("#autoCallbackTrigger").bind("change", {}, setAutoTrigger);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Checkbox - zTree methods</h1>
+<h6>[ File Path: excheck/checkbox_fun.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, 'beforeCheck / onCheck' callback function</h2>
+				<ul class="list">
+				<li>Use 'beforeCheck / onCheck' callback function can control whether to allow changes to the node check state. This simple demo shows how to monitor the check event.</li>
+				<li><p>By the way also demonstrates how to use the 'checkNode / checkAllNodes' method triggers 'beforeCheck / onCheck' callback, Try: <br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" id="autoCallbackTrigger" /> setting.check.autoCheckTrigger: <span id="autoCheckTriggerValue">false</span><br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" id="callbackTrigger" checked /> Whether trigger the callback when execution checkNode() method. <br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;Node --[ <a id="checkTrue" href="#" title="check..." onclick="return false;">check</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="checkFalse" href="#" title="uncheck..." onclick="return false;">uncheck</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="toggle" href="#" title="toggle..." onclick="return false;">toggle</a> ]<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;Node (relationships) --[ <a id="checkTruePS" href="#" title="check(relationships)..." onclick="return false;">check</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="checkFalsePS" href="#" title="uncheck(maintain relationships)..." onclick="return false;">uncheck</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="togglePS" href="#" title="toggle..." onclick="return false;">toggle</a> ]<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;All Nodes --[ <a id="checkAllTrue" href="#" title="check All!!" onclick="return false;">check</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="checkAllFalse" href="#" title="uncheck All!!" onclick="return false;">uncheck</a> ]</p>
+				</li>
+				<li><p><span class="highlight_red">How to use 'zTreeObj.checkNode / checkAllNodes' method,  please see the API documentation.</span><br/>
+					beforeCheck / onCheck log:<br/>
+					<ul id="log" class="log" style="height:130px;"></ul></p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of setting</h2>
+				<ul class="list">
+				<li>Same as 'Checkbox Operation'</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3, Explanation of treeNode</h2>
+				<ul class="list">
+				<li>Same as 'Checkbox Operation'</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/excheck/checkbox_halfCheck.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/excheck/checkbox_halfCheck.html
new file mode 100644
index 0000000..368cd5a
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/excheck/checkbox_halfCheck.html
@@ -0,0 +1,108 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - Checkbox halfCheck</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<!--
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			async: {
+				enable: true,
+				url:"../asyncData/getNodes.php",
+				autoParam:["id", "name=n", "level=lv"],
+				otherParam:{"chk":"chk"},
+				dataFilter: dataFilter
+			},
+			check: {
+				enable: true,
+				autoCheckTrigger: true
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				onCheck: onCheck,
+				onAsyncSuccess: onAsyncSuccess
+			}
+		};
+
+		function dataFilter(treeId, parentNode, childNodes) {
+			if (parentNode.checkedEx === true) {
+				for(var i=0, l=childNodes.length; i<l; i++) {
+					childNodes[i].checked = parentNode.checked;
+					childNodes[i].halfCheck = false;
+					childNodes[i].checkedEx = true;
+				}
+			}
+			return childNodes;
+		}
+		function onCheck(event, treeId, treeNode) {
+			cancelHalf(treeNode)
+			treeNode.checkedEx = true;
+		}
+		function onAsyncSuccess(event, treeId, treeNode, msg) {
+			cancelHalf(treeNode);
+		}
+		function cancelHalf(treeNode) {
+			if (treeNode.checkedEx) return;
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			treeNode.halfCheck = false;
+			zTree.updateNode(treeNode);			
+		}
+
+		var zNodes =[
+			{ id:1, pId:0, name:"half 1", halfCheck:true, isParent:true},
+			{ id:2, pId:0, name:"half 2", halfCheck:true, checked:true, isParent:true},
+			{ id:3, pId:0, name:"no half 3", checked:true, isParent:true}
+		];
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Checkbox halfCheck Demo</h1>
+<h6>[ File Path: excheck/checkbox_halfCheck.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of Demo</h2>
+				<ul class="list">
+				<li>This demo implements the check operation of the dynamic tree</li>
+				<li class="highlight_red">1). After loaded child nodes, the parent node's 'halfCheck' attribute will be invalid immediately.</li>
+				<li class="highlight_red">2). If you check the parent node, so will effect the child nodes's check status.</li>
+				<li class="highlight_red">3). If you check the parent node, it's child node's 'halfCheck' attribute will be invalid.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of setting</h2>
+				<ul class="list">
+				<li>Half-checked functional don't need to configure any parameter. But it is accessibility, can not used alone. So please configure the parameters which you need.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3, Explanation of treeNode</h2>
+				<ul class="list">
+				<li class="highlight_red">1), Please set treeNode.halfCheck attribute, before zTree initialize. See the API documentation for more related contents.</li>
+				<li>2), By the way, please see the 'Checkbox Operation' Demo.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/excheck/checkbox_nocheck.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/excheck/checkbox_nocheck.html
new file mode 100644
index 0000000..8a20b84
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/excheck/checkbox_nocheck.html
@@ -0,0 +1,95 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - no checkbox</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<!--
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			check: {
+				enable: true,
+				nocheckInherit: true
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"can check 1", open:true},
+			{ id:11, pId:1, name:"can check 1-1", open:true},
+			{ id:111, pId:11, name:"no checkbox 1-1-1", nocheck:true},
+			{ id:112, pId:11, name:"can check 1-1-2"},
+			{ id:12, pId:1, name:"no checkbox 1-2", nocheck:true, open:true},
+			{ id:121, pId:12, name:"no checkbox 1-2-1"},
+			{ id:122, pId:12, name:"no checkbox 1-2-2"},
+			{ id:2, pId:0, name:"can check 2", checked:true, open:true},
+			{ id:21, pId:2, name:"can check 2-1"},
+			{ id:22, pId:2, name:"can check 2-2", open:true},
+			{ id:221, pId:22, name:"can check 2-2-1", checked:true},
+			{ id:222, pId:22, name:"can check 2-2-2"},
+			{ id:23, pId:2, name:"can check 2-3"}
+		];
+		function nocheckNode(e) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nocheck = e.data.nocheck,
+			nodes = zTree.getSelectedNodes();
+			if (nodes.length == 0) {
+				alert("Please select one node at first...");
+			}
+
+			for (var i=0, l=nodes.length; i<l; i++) {
+				nodes[i].nocheck = nocheck;
+				zTree.updateNode(nodes[i]);
+			}
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			$("#nocheckTrue").bind("click", {nocheck: true}, nocheckNode);
+			$("#nocheckFalse").bind("click", {nocheck: false}, nocheckNode);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Checkbox nocheck Demo</h1>
+<h6>[ File Path: excheck/checkbox_nocheck.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of setting</h2>
+				<ul class="list">
+				<li>This Demo only shows how use the ‘nocheck’ attribute, detailed configuration information, please refer to 'Checkbox Operation'</li>
+				<li class="highlight_red">setting.check.nocheckInherit can set the child nodes to automatically inherit the parent node's 'nocheck' attribute. See the API documentation for more related contents.</li>
+				<li><p>Try:<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="nocheckTrue" href="#" title="set checkbox to be hidden." onclick="return false;">hide checkbox</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="nocheckFalse" href="#" title="set checkbox to be show." onclick="return false;">show checkbox</a> ]
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of treeNode</h2>
+				<ul class="list">
+				<li class="highlight_red">1), If you need to initialize the node don't show checkbox, please set treeNode.nocheck attribute. See the API documentation for more related contents.</li>
+				<li>2), By the way, please see the 'Checkbox Operation' Demo.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/excheck/radio.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/excheck/radio.html
new file mode 100644
index 0000000..f21c5bc
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/excheck/radio.html
@@ -0,0 +1,97 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - radio</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<!--
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			check: {
+				enable: true,
+				chkStyle: "radio",
+				radioType: "level"
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"can check 1", open:true},
+			{ id:11, pId:1, name:"can check 1-1", open:true},
+			{ id:111, pId:11, name:"can check 1-1-1"},
+			{ id:112, pId:11, name:"can check 1-1-2"},
+			{ id:12, pId:1, name:"can check 1-2", open:true},
+			{ id:121, pId:12, name:"can check 1-2-1"},
+			{ id:122, pId:12, name:"can check 1-2-2"},
+			{ id:2, pId:0, name:"can check 2", checked:true, open:true},
+			{ id:21, pId:2, name:"can check 2-1"},
+			{ id:22, pId:2, name:"can check 2-2", open:true},
+			{ id:221, pId:22, name:"can check 2-2-1", checked:true},
+			{ id:222, pId:22, name:"can check 2-2-2"},
+			{ id:23, pId:2, name:"can check 2-3"}
+		];
+		
+		var code;		
+		function setCheck() {
+			var type = $("#level").attr("checked")? "level":"all";
+			setting.check.radioType = type;
+			showCode('setting.check.radioType = "' + type + '";');
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		}
+		function showCode(str) {
+			if (!code) code = $("#code");
+			code.empty();
+			code.append("<li>"+str+"</li>");
+		}
+		
+		$(document).ready(function(){
+			setCheck();			
+			$("#level").bind("change", setCheck);
+			$("#all").bind("change", setCheck);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Radio Operation</h1>
+<h6>[ File Path: excheck/radio.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of setting</h2>
+				<ul class="list">
+				<li class="highlight_red">Must set setting.check attributes, see the API documentation for more related contents.</li>
+				<li><p>group range of radio: <br/><input type="radio" id="level" class="radio first" name="radioGroup" checked /><span>within the same level</span>
+						<input type="radio" id="all" class="radio" name="radioGroup"/><span>within the whole tree</span><br/>
+						<ul id="code" class="log" style="height:20px;"></ul></p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of treeNode</h2>
+				<ul class="list">
+				<li class="highlight_red">1), If you need to initialize the node is checked, please set treeNode.checked attribute. See the API documentation for more related contents.</li>
+				<li class="highlight_red">2), If you need to initialize the node don't show radio, please set treeNode.nocheck attribute. See the API documentation for more related contents.</li>
+				<li class="highlight_red">3), If you need to change 'checked' to other attribute, please set setting.data.key.checked attribute. See the API documentation for more related contents.</li>
+				<li>4), By the way, please see the API documentation for 'treeNode.checkedOld / getCheckStatus / check_Child_State / check_Focus'.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/excheck/radio_chkDisabled.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/excheck/radio_chkDisabled.html
new file mode 100644
index 0000000..08282d7
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/excheck/radio_chkDisabled.html
@@ -0,0 +1,101 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - Radio chkDisabled</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<!--
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			check: {
+				enable: true,
+				chkStyle: "radio",
+				radioType: "level"
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"can check 1", open:true},
+			{ id:11, pId:1, name:"can check 1-1", open:true},
+			{ id:111, pId:11, name:"disabled 1-1-1", chkDisabled:true, checked:true},
+			{ id:112, pId:11, name:"can check 1-1-2"},
+			{ id:12, pId:1, name:"disabled 1-2", chkDisabled:true, open:true},
+			{ id:121, pId:12, name:"disabled 1-2-1", checked:true},
+			{ id:122, pId:12, name:"disabled 1-2-2"},
+			{ id:2, pId:0, name:"can check 2", checked:true, open:true},
+			{ id:21, pId:2, name:"can check 2-1"},
+			{ id:22, pId:2, name:"can check 2-2", open:true},
+			{ id:221, pId:22, name:"can check 2-2-1", checked:true},
+			{ id:222, pId:22, name:"can check 2-2-2"},
+			{ id:23, pId:2, name:"can check 2-3"}
+		];
+		
+		function disabledNode(e) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			disabled = e.data.disabled,
+			nodes = zTree.getSelectedNodes();
+			if (nodes.length == 0) {
+				alert("Please select one node at first...");
+			}
+
+			for (var i=0, l=nodes.length; i<l; i++) {
+				zTree.setChkDisabled(nodes[i], disabled);
+			}
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			$("#disabledTrue").bind("click", {disabled: true}, disabledNode);
+			$("#disabledFalse").bind("click", {disabled: false}, disabledNode);
+
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Radio chkDisabled Demo</h1>
+<h6>[ File Path: excheck/radio_chkDisabled.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of 'setChkDisabled' method</h2>
+				<ul class="list">
+				<li>'setChkDisabled' method can set the node's checkbox / radio to be disabled or abled. See the API documentation for more related contents.</li>
+				<li><p>Try:<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="disabledTrue" href="#" title="set checkbox to be disabled." onclick="return false;">be disabled</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="disabledFalse" href="#" title="set checkbox to be abled." onclick="return false;">be abled</a> ]</p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of setting</h2>
+				<ul class="list">
+				<li>This Demo only shows how use the ‘nocheck’ attribute, detailed configuration information, please refer to 'Radio Operation'</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3, Explanation of treeNode</h2>
+				<ul class="list">
+				<li class="highlight_red">1), If you need to initialize the node don't show radio, please set treeNode.chkDisabled attribute. See the API documentation for more related contents.</li>
+				<li>2), By the way, please see the 'Radio Operation' Demo.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/excheck/radio_fun.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/excheck/radio_fun.html
new file mode 100644
index 0000000..9a32fc3
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/excheck/radio_fun.html
@@ -0,0 +1,151 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - beforeCheck / onCheck</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<!--
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				selectedMulti: false
+			},
+			check: {
+				enable: true,
+				chkStyle: "radio",
+				radioType: "level"
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeCheck: beforeCheck,
+				onCheck: onCheck
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"can check 1", open:true},
+			{ id:11, pId:1, name:"no radio 1-1", nocheck:true},
+			{ id:12, pId:1, name:"can check 1-2", open:true},
+			{ id:121, pId:12, name:"can check 1-2-1"},
+			{ id:122, pId:12, name:"can check 1-2-2"},
+			{ id:123, pId:12, name:"no radio 1-2-3", nocheck:true},
+			{ id:13, pId:1, name:"can check 1-3"},
+			{ id:2, pId:0, name:"can't check 2", open:true, doCheck:false},
+			{ id:21, pId:2, name:"can't check 2-1", doCheck:false},
+			{ id:22, pId:2, name:"can't check 2-2", checked:true, open:true, doCheck:false},
+			{ id:221, pId:22, name:"can't chk 2-2-1", doCheck:false},
+			{ id:222, pId:22, name:"can't chk 2-2-2", checked:true, doCheck:false},
+			{ id:223, pId:22, name:"can't chk 2-2-3", doCheck:false},
+			{ id:23, pId:2, name:"can't check 2-3", doCheck:false}
+		];
+		
+		var code, log, className = "dark";
+		function beforeCheck(treeId, treeNode) {
+			className = (className === "dark" ? "":"dark");
+			showLog("[ "+getTime()+" beforeCheck ]&nbsp;&nbsp;&nbsp;&nbsp;" + treeNode.name );
+			return (treeNode.doCheck !== false);
+		}
+		function onCheck(e, treeId, treeNode) {
+			showLog("[ "+getTime()+" onCheck ]&nbsp;&nbsp;&nbsp;&nbsp;" + treeNode.name );
+		}		
+		function showLog(str) {
+			if (!log) log = $("#log");
+			log.append("<li class='"+className+"'>"+str+"</li>");
+			if(log.children("li").length > 6) {
+				log.get(0).removeChild(log.children("li")[0]);
+			}
+		}
+		function getTime() {
+			var now= new Date(),
+			h=now.getHours(),
+			m=now.getMinutes(),
+			s=now.getSeconds(),
+			ms=now.getMilliseconds();
+			return (h+":"+m+":"+s+ " " +ms);
+		}
+
+		function checkNode(e) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			type = e.data.type,
+			nodes = zTree.getSelectedNodes();
+			if (type.indexOf("All")<0 && nodes.length == 0) {
+				alert("Please select one node at first...");
+			}
+
+			if (type == "checkAllTrue") {
+				zTree.checkAllNodes(true);
+			} else if (type == "checkAllFalse") {
+				zTree.checkAllNodes(false);
+			} else {
+				var callbackFlag = $("#callbackTrigger").attr("checked");
+				for (var i=0, l=nodes.length; i<l; i++) {
+					if (type == "checkTrue") {
+						zTree.checkNode(nodes[i], true, null, callbackFlag);
+					} else if (type == "checkFalse") {
+						zTree.checkNode(nodes[i], false, null, callbackFlag);
+					}else if (type == "checkTruePS") {
+						zTree.checkNode(nodes[i], true, true, callbackFlag);
+					} else if (type == "checkFalsePS") {
+						zTree.checkNode(nodes[i], false, true, callbackFlag);
+					}
+				}
+			}
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			$("#checkTrue").bind("click", {type:"checkTrue"}, checkNode);
+			$("#checkFalse").bind("click", {type:"checkFalse"}, checkNode);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Radio - zTree methods</h1>
+<h6>[ File Path: excheck/radio_fun.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, 'beforeCheck / onCheck' callback function</h2>
+				<ul class="list">
+				<li>Use 'beforeCheck / onCheck' callback function can control whether to allow changes to the node check state. This simple demo shows how to monitor the check event.</li>
+				<li><p>By the way also demonstrates how to use the 'checkNode' method triggers 'beforeCheck / onCheck' callback, Try: <br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" id="callbackTrigger" checked /> Whether trigger the callback when execution checkNode() method.<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="checkTrue" href="#" title="check..." onclick="return false;">check</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="checkFalse" href="#" title="uncheck..." onclick="return false;">uncheck</a> ]</p>
+				<li><p><span class="highlight_red">How to use 'zTreeObj.checkNode' method,  please see the API documentation.</span><br/>
+					beforeCheck / onCheck log:<br/>
+					<ul id="log" class="log" style="height:130px;"></ul></p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of setting</h2>
+				<ul class="list">
+				<li>Same as 'Radio Operation'</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3, Explanation of treeNode</h2>
+				<ul class="list">
+				<li>Same as 'Radio Operation'</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/excheck/radio_halfCheck.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/excheck/radio_halfCheck.html
new file mode 100644
index 0000000..932e837
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/excheck/radio_halfCheck.html
@@ -0,0 +1,93 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - Radio halfCheck</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<!--
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			async: {
+				enable: true,
+				url:"../asyncData/getNodes.php",
+				autoParam:["id", "name=n", "level=lv"],
+				otherParam:{"chk":"chk"}
+			},
+			check: {
+				enable: true,
+				autoCheckTrigger: true,
+				chkStyle: "radio",
+				radioType: "level"
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				onAsyncSuccess: onAsyncSuccess
+			}
+		};
+
+		function onAsyncSuccess(event, treeId, treeNode, msg) {
+			cancelHalf(treeNode);
+		}
+		function cancelHalf(treeNode) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			treeNode.halfCheck = false;
+			zTree.updateNode(treeNode);			
+		}
+
+		var zNodes =[
+			{ id:1, pId:0, name:"half 1", halfCheck:true, isParent:true},
+			{ id:2, pId:0, name:"half 2", halfCheck:true, checked:true, isParent:true},
+			{ id:3, pId:0, name:"no half 3", isParent:true}
+		];
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Radio halfCheck Demo</h1>
+<h6>[ File Path: excheck/radio_halfCheck.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of Demo</h2>
+				<ul class="list">
+				<li>This demo implements the check operation of the dynamic tree</li>
+				<li class="highlight_red">1). After loaded child nodes, the parent node's 'halfCheck' attribute will be invalid immediately.</li>
+				<li class="highlight_red">2). If you check the parent node, will not effect the child nodes's check status.</li>
+				<li class="highlight_red">3). If you check the parent node, it's child node's 'halfCheck' attribute will still be valid.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of setting</h2>
+				<ul class="list">
+				<li>Half-checked functional don't need to configure any parameter. But it is accessibility, can not used alone. So please configure the parameters which you need.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3, Explanation of treeNode</h2>
+				<ul class="list">
+				<li class="highlight_red">1), Please set treeNode.halfCheck attribute, before zTree initialize. See the API documentation for more related contents.</li>
+				<li>2), By the way, please see the 'Radio Operation' Demo.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/excheck/radio_nocheck.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/excheck/radio_nocheck.html
new file mode 100644
index 0000000..e9e3b48
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/excheck/radio_nocheck.html
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - no radio</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<!--
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			check: {
+				enable: true,
+				chkStyle: "radio",
+				radioType: "level"
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"can check 1", open:true},
+			{ id:11, pId:1, name:"can check 1-1", open:true},
+			{ id:111, pId:11, name:"no radio 1-1-1", nocheck:true},
+			{ id:112, pId:11, name:"can check 1-1-2"},
+			{ id:12, pId:1, name:"no radio 1-2", nocheck:true, open:true},
+			{ id:121, pId:12, name:"no radio 1-2-1"},
+			{ id:122, pId:12, name:"no radio 1-2-2"},
+			{ id:2, pId:0, name:"can check 2", checked:true, open:true},
+			{ id:21, pId:2, name:"can check 2-1"},
+			{ id:22, pId:2, name:"can check 2-2", open:true},
+			{ id:221, pId:22, name:"can check 2-2-1", checked:true},
+			{ id:222, pId:22, name:"can check 2-2-2"},
+			{ id:23, pId:2, name:"can check 2-3"}
+		];
+		
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Radio nocheck Demo</h1>
+<h6>[ File Path: excheck/radio_nocheck.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of setting</h2>
+				<ul class="list">
+				<li>This Demo only shows how use the ‘nocheck’ attribute, detailed configuration information, please refer to 'Radio Operation'</li>
+				<li class="highlight_red">setting.check.nocheckInherit can set the child nodes to automatically inherit the parent node's 'nocheck' attribute. See the API documentation for more related contents.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of treeNode</h2>
+				<ul class="list">
+				<li class="highlight_red">1), If you need to initialize the node don't show radio, please set treeNode.nocheck attribute. See the API documentation for more related contents.</li>
+				<li>2), By the way, please see the 'Radio Operation' Demo.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/exedit/async_edit.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/exedit/async_edit.html
new file mode 100644
index 0000000..26c6db9
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/exedit/async_edit.html
@@ -0,0 +1,120 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - async & edit</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			async: {
+				enable: true,
+				url:"../asyncData/getNodes.php",
+				autoParam:["id", "name=n", "level=lv"],
+				otherParam:{"otherParam":"zTreeAsyncTest"},
+				dataFilter: filter
+			},
+			view: {expandSpeed:"",
+				addHoverDom: addHoverDom,
+				removeHoverDom: removeHoverDom,
+				selectedMulti: false
+			},
+			edit: {
+				enable: true
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeRemove: beforeRemove,
+				beforeRename: beforeRename
+			}
+		};
+
+		function filter(treeId, parentNode, childNodes) {
+			if (!childNodes) return null;
+			for (var i=0, l=childNodes.length; i<l; i++) {
+				childNodes[i].name = childNodes[i].name.replace(/\.n/g, '.');
+			}
+			return childNodes;
+		}
+		function beforeRemove(treeId, treeNode) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			zTree.selectNode(treeNode);
+			return confirm("Confirm delete node '" + treeNode.name + "' it?");
+		}		
+		function beforeRename(treeId, treeNode, newName) {
+			if (newName.length == 0) {
+				alert("Node name can not be empty.");
+				return false;
+			}
+			return true;
+		}
+
+		var newCount = 1;
+		function addHoverDom(treeId, treeNode) {
+			var sObj = $("#" + treeNode.tId + "_span");
+			if (treeNode.editNameFlag || $("#addBtn_"+treeNode.tId).length>0) return;
+			var addStr = "<span class='button add' id='addBtn_" + treeNode.tId
+				+ "' title='add node' onfocus='this.blur();'></span>";
+			sObj.after(addStr);
+			var btn = $("#addBtn_"+treeNode.tId);
+			if (btn) btn.bind("click", function(){
+				var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+				zTree.addNodes(treeNode, {id:(100 + newCount), pId:treeNode.id, name:"new node" + (newCount++)});
+				return false;
+			});
+		};
+		function removeHoverDom(treeId, treeNode) {
+			$("#addBtn_"+treeNode.tId).unbind().remove();
+		};
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting);
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+.ztree li span.button.add {margin-left:2px; margin-right: -1px; background-position:-144px 0; vertical-align:top; *vertical-align:middle}
+	</style>
+</HEAD>
+
+<BODY>
+<h1>Editing Dynamic Tree</h1>
+<h6>[ File Path: exedit/async_edit.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of editing dynamic tree</h2>
+				<ul class="list">
+				<li>1) This Demo is based on the "Advanced Edit Nodes" to modify, and open to drag and drop functionality, can be compared with that demo.</li>
+				<li>2) At the same time set the editing mode and dynamic mode can be achieved editing dynamic tree.</li>
+				<li class="highlight_red">3) zTree improved editing capabilities in dynamic mode, if the parent node hasn‘t loaded the child nodes, it will first load the child nodes before it add child node.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of setting</h2>
+				<ul class="list">
+				<li class="highlight_red">1) Use editing features, please refer to "Normal Drag Node Operation" & "Basic Edit Nodes" demo of the instructions.</li>
+				<li class="highlight_red">2) Use dynamic loading, please refer to "Dynamic Tree with Ajax" demo of the instructions.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3, Explanation of treeNode</h2>
+				<ul class="list">
+				<li>No special requirements on the node data, please refer to "Dynamic Tree with Ajax" & "Normal Drag Node Operation" & "Basic Edit Nodes" demo of the instructions</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/exedit/drag.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/exedit/drag.html
new file mode 100644
index 0000000..30aff42
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/exedit/drag.html
@@ -0,0 +1,136 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - drag & drop</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			edit: {
+				enable: true,
+				showRemoveBtn: false,
+				showRenameBtn: false
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeDrag: beforeDrag,
+				beforeDrop: beforeDrop
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"can drag 1", open:true},
+			{ id:11, pId:1, name:"can drag 1-1"},
+			{ id:12, pId:1, name:"can drag 1-2", open:true},
+			{ id:121, pId:12, name:"can drag 1-2-1"},
+			{ id:122, pId:12, name:"can drag 1-2-2"},
+			{ id:123, pId:12, name:"can drag 1-2-3"},
+			{ id:13, pId:1, name:"can't drag 1-3", open:true, drag:false},
+			{ id:131, pId:13, name:"can't drag 1-3-1", drag:false},
+			{ id:132, pId:13, name:"can't drag 1-3-2", drag:false},
+			{ id:133, pId:13, name:"can drag 1-3-3"},
+			{ id:2, pId:0, name:"can drag 2", open:true},
+			{ id:21, pId:2, name:"can drag 2-1"},
+			{ id:22, pId:2, name:"can't drop 2-2", open:true, drop:false},
+			{ id:221, pId:22, name:"can drag 2-2-1"},
+			{ id:222, pId:22, name:"can drag 2-2-2"},
+			{ id:223, pId:22, name:"can drag 2-2-3"},
+			{ id:23, pId:2, name:"can drag 2-3"}
+		];
+
+		function beforeDrag(treeId, treeNodes) {
+			for (var i=0,l=treeNodes.length; i<l; i++) {
+				if (treeNodes[i].drag === false) {
+					return false;
+				}
+			}
+			return true;
+		}
+		function beforeDrop(treeId, treeNodes, targetNode, moveType) {
+			return targetNode ? targetNode.drop !== false : true;
+		}
+
+		function setCheck() {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			isCopy = $("#copy").attr("checked"),
+			isMove = $("#move").attr("checked"),
+			prev = $("#prev").attr("checked"),
+			inner = $("#inner").attr("checked"),
+			next = $("#next").attr("checked");
+			zTree.setting.edit.drag.isCopy = isCopy;
+			zTree.setting.edit.drag.isMove = isMove;
+			showCode(1, ['setting.edit.drag.isCopy = ' + isCopy, 'setting.edit.drag.isMove = ' + isMove]);
+
+			zTree.setting.edit.drag.prev = prev;
+			zTree.setting.edit.drag.inner = inner;
+			zTree.setting.edit.drag.next = next;
+			showCode(2, ['setting.edit.drag.prev = ' + prev, 'setting.edit.drag.inner = ' + inner, 'setting.edit.drag.next = ' + next]);
+		}
+		function showCode(id, str) {
+			var code = $("#code" + id);
+			code.empty();
+			for (var i=0, l=str.length; i<l; i++) {
+				code.append("<li>"+str[i]+"</li>");
+			}
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			setCheck();
+			$("#copy").bind("change", setCheck);
+			$("#move").bind("change", setCheck);
+			$("#prev").bind("change", setCheck);
+			$("#inner").bind("change", setCheck);
+			$("#next").bind("change", setCheck);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Normal Drag Node Operation</h1>
+<h6>[ File Path: exedit/drag.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of setting</h2>
+				<ul class="list">
+				<li>This Demo only shows how to drag & drop nodes using the basic method and configure parameters.</li>
+				<li class="highlight_red">1) Must set 'setting.edit' attributes, see the API documentation for more related contents.</li>
+				<li class="highlight_red">2) If you want to use drag & drop callback, muse to set 'setting.callback.beforeDrag / onDrag / beforeDrop / onDrop' attributes, see the API documentation for more related contents.</li>
+				<li><p>Basic settings:<br/>
+						<input type="checkbox" id="copy" class="checkbox first" checked /><span>can Copy</span>
+						<input type="checkbox" id="move" class="checkbox " checked /><span>can Move</span><br/>
+						<ul id="code1" class="log" style="height:42px;"></ul></p>
+				</li>
+				<li><p>Position settings:<br/>
+						<input type="checkbox" id="prev" class="checkbox first" checked /><span>prev</span>
+						<input type="checkbox" id="inner" class="checkbox " checked /><span>inner</span>
+						<input type="checkbox" id="next" class="checkbox " checked /><span>next</span><br/>
+						<ul id="code2" class="log" style="height:65px;"></ul></p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of treeNode</h2>
+				<ul class="list">
+				<li>No special requirements on the node data, the user can add custom attributes.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/exedit/drag_fun.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/exedit/drag_fun.html
new file mode 100644
index 0000000..1215ba2
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/exedit/drag_fun.html
@@ -0,0 +1,180 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - copyNode / moveNode</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				selectedMulti: false
+			},
+			edit: {
+				enable: true,
+				showRemoveBtn: false,
+				showRenameBtn: false
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeDrag: beforeDrag,
+				beforeClick: beforeClick
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"parent node 1", open:true},
+			{ id:11, pId:1, name:"leaf node 1-1"},
+			{ id:12, pId:1, name:"leaf node 1-2"},
+			{ id:13, pId:1, name:"leaf node 1-3"},
+			{ id:2, pId:0, name:"parent node 2", open:true},
+			{ id:21, pId:2, name:"leaf node 2-1"},
+			{ id:22, pId:2, name:"leaf node 2-2"},
+			{ id:23, pId:2, name:"leaf node 2-3"},
+			{ id:3, pId:0, name:"parent node 3", open:true },
+			{ id:31, pId:3, name:"leaf node 3-1"},
+			{ id:32, pId:3, name:"leaf node 3-2"},
+			{ id:33, pId:3, name:"leaf node 3-3"}
+		];
+
+		function fontCss(treeNode) {
+			var aObj = $("#" + treeNode.tId + "_a");
+			aObj.removeClass("copy").removeClass("cut");
+			if (treeNode === curSrcNode) {
+				if (curType == "copy") {
+					aObj.addClass(curType);
+				} else {
+					aObj.addClass(curType);
+				}			
+			}
+		}
+
+		function beforeDrag(treeId, treeNodes) {
+			return false;
+		}
+
+		function beforeClick(treeId, treeNode) {
+			return !treeNode.isCur;
+		}
+
+		var curSrcNode, curType;
+		function setCurSrcNode(treeNode) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			if (curSrcNode) {
+				delete curSrcNode.isCur;
+				var tmpNode = curSrcNode;
+				curSrcNode = null;
+				fontCss(tmpNode);
+			}
+			curSrcNode = treeNode;
+			if (!treeNode) return;
+
+			curSrcNode.isCur = true;			
+			zTree.cancelSelectedNode();
+			fontCss(curSrcNode);
+		}
+		function copy(e) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nodes = zTree.getSelectedNodes();
+			if (nodes.length == 0) {
+				alert("Please select one node at first...");
+				return;
+			}
+			curType = "copy";
+			setCurSrcNode(nodes[0]);
+		}
+		function cut(e) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nodes = zTree.getSelectedNodes();
+			if (nodes.length == 0) {
+				alert("Please select one node at first...");
+				return;
+			}
+			curType = "cut";
+			setCurSrcNode(nodes[0]);
+		}
+		function paste(e) {
+			if (!curSrcNode) {
+				alert("Please select one node to copy or cut at first...");
+				return;
+			}
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nodes = zTree.getSelectedNodes(),
+			targetNode = nodes.length>0? nodes[0]:null;
+			if (curSrcNode === targetNode) {
+				alert("Can't move, the same source node and destination node.");
+				return;
+			} else if (curType === "cut" && ((!!targetNode && curSrcNode.parentTId === targetNode.tId) || (!targetNode && !curSrcNode.parentTId))) {
+				alert("Can't move, source node is the target node's child.");
+				return;
+			} else if (curType === "copy") {
+				targetNode = zTree.copyNode(targetNode, curSrcNode, "inner");
+			} else if (curType === "cut") {
+				targetNode = zTree.moveNode(targetNode, curSrcNode, "inner");
+				if (!targetNode) {
+					alert("Cutting failure, source node is the target node's parent.");
+				}
+				targetNode = curSrcNode;
+			}
+			setCurSrcNode();
+			delete targetNode.isCur;
+			zTree.selectNode(targetNode);
+		}
+		
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			$("#copy").bind("click", copy);
+			$("#cut").bind("click", cut);
+			$("#paste").bind("click", paste);
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+.ztree li a.copy{padding-top:0; background-color:#316AC5; color:white; border:1px #316AC5 solid;}
+.ztree li a.cut{padding-top:0; background-color:silver; color:#111; border:1px #316AC5 dotted;}
+	</style>
+</HEAD>
+
+<BODY>
+<h1>Move / Copy - zTree methods</h1>
+<h6>[ File Path: exedit/drag_fun.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of 'copyNode / moveNode' method</h2>
+				<ul class="list">
+				<li>Use 'copyNode / moveNode' method can also be achieved copy / move nodes.</li>
+				<li><p>Try to copy or cut node:<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="copy" href="#" title="copy" onclick="return false;">copy</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="cut" href="#" title="cut" onclick="return false;">cut</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="paste" href="#" title="paste" onclick="return false;">paste</a> ]</p>
+				<li class="highlight_red">How to use 'zTreeObj.copyNode / moveNode' method,  please see the API documentation.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of setting</h2>
+				<ul class="list">
+				<li>Same as 'Normal Drag Node Operation'</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3, Explanation of treeNode</h2>
+				<ul class="list">
+				<li>Same as 'Normal Drag Node Operation'</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/exedit/drag_super.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/exedit/drag_super.html
new file mode 100644
index 0000000..559f1ff
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/exedit/drag_super.html
@@ -0,0 +1,210 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - beforeDrag / onDrag / beforeDrop / onDrop</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			edit: {
+				drag: {
+					autoExpandTrigger: true,
+					prev: dropPrev,
+					inner: dropInner,
+					next: dropNext
+				},
+				enable: true,
+				showRemoveBtn: false,
+				showRenameBtn: false
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeDrag: beforeDrag,
+				beforeDrop: beforeDrop,
+				beforeDragOpen: beforeDragOpen,
+				onDrag: onDrag,
+				onDrop: onDrop,
+				onExpand: onExpand
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"can drag 1", open:true},
+			{ id:11, pId:1, name:"can drag 1-1"},
+			{ id:12, pId:1, name:"can drag 1-2"},
+			{ id:121, pId:12, name:"can drag 1-2-1"},
+			{ id:122, pId:12, name:"can drag 1-2-2"},
+			{ id:123, pId:12, name:"can drag 1-2-3"},
+			{ id:13, pId:1, name:"can't drag 1-3", open:true, drag:false},
+			{ id:131, pId:13, name:"can't drag 1-3-1", drag:false},
+			{ id:132, pId:13, name:"can't drag 1-3-2", drag:false},
+			{ id:132, pId:13, name:"can't drag 1-3-3", drag:false},
+			{ id:2, pId:0, name:"can't drag my child out 2", open:true, childOuter:false},
+			{ id:21, pId:2, name:"can't be parent  2-1", dropInner:false},
+			{ id:22, pId:2, name:"can't be root 2-2", dropRoot:false},
+			{ id:23, pId:2, name:"try to drag me 2-3"},
+			{ id:3, pId:0, name:"can't add/sort my child 3", open:true, childOrder:false, dropInner:false},
+			{ id:31, pId:3, name:"can drag 3-1"},
+			{ id:32, pId:3, name:"can drag 3-2"},
+			{ id:33, pId:3, name:"can drag 3-3"}
+		];
+
+		function dropPrev(treeId, nodes, targetNode) {
+			var pNode = targetNode.getParentNode();
+			if (pNode && pNode.dropInner === false) {
+				return false;
+			} else {
+				for (var i=0,l=curDragNodes.length; i<l; i++) {
+					var curPNode = curDragNodes[i].getParentNode();
+					if (curPNode && curPNode !== targetNode.getParentNode() && curPNode.childOuter === false) {
+						return false;
+					}
+				}
+			}
+			return true;
+		}
+		function dropInner(treeId, nodes, targetNode) {
+			if (targetNode && targetNode.dropInner === false) {
+				return false;
+			} else {
+				for (var i=0,l=curDragNodes.length; i<l; i++) {
+					if (!targetNode && curDragNodes[i].dropRoot === false) {
+						return false;
+					} else if (curDragNodes[i].parentTId && curDragNodes[i].getParentNode() !== targetNode && curDragNodes[i].getParentNode().childOuter === false) {
+						return false;
+					}
+				}
+			}
+			return true;
+		}
+		function dropNext(treeId, nodes, targetNode) {
+			var pNode = targetNode.getParentNode();
+			if (pNode && pNode.dropInner === false) {
+				return false;
+			} else {
+				for (var i=0,l=curDragNodes.length; i<l; i++) {
+					var curPNode = curDragNodes[i].getParentNode();
+					if (curPNode && curPNode !== targetNode.getParentNode() && curPNode.childOuter === false) {
+						return false;
+					}
+				}
+			}
+			return true;
+		}
+
+		var log, className = "dark", curDragNodes, autoExpandNode;
+		function beforeDrag(treeId, treeNodes) {
+			className = (className === "dark" ? "":"dark");
+			showLog("[ "+getTime()+" beforeDrag ]&nbsp;&nbsp;&nbsp;&nbsp; drag: " + treeNodes.length + " nodes." );
+			for (var i=0,l=treeNodes.length; i<l; i++) {
+				if (treeNodes[i].drag === false) {
+					curDragNodes = null;
+					return false;
+				} else if (treeNodes[i].parentTId && treeNodes[i].getParentNode().childDrag === false) {
+					curDragNodes = null;
+					return false;
+				}
+			}
+			curDragNodes = treeNodes;
+			return true;
+		}
+		function beforeDragOpen(treeId, treeNode) {
+			autoExpandNode = treeNode;
+			return true;
+		}
+		function beforeDrop(treeId, treeNodes, targetNode, moveType, isCopy) {
+			className = (className === "dark" ? "":"dark");
+			showLog("[ "+getTime()+" beforeDrop ]&nbsp;&nbsp;&nbsp;&nbsp; moveType:" + moveType);
+			showLog("target: " + (targetNode ? targetNode.name : "root") + "  -- is "+ (isCopy==null? "cancel" : isCopy ? "copy" : "move"));
+			return true;
+		}
+		function onDrag(event, treeId, treeNodes) {
+			className = (className === "dark" ? "":"dark");
+			showLog("[ "+getTime()+" onDrag ]&nbsp;&nbsp;&nbsp;&nbsp; drag: " + treeNodes.length + " nodes." );
+		}
+		function onDrop(event, treeId, treeNodes, targetNode, moveType, isCopy) {
+			className = (className === "dark" ? "":"dark");
+			showLog("[ "+getTime()+" onDrop ]&nbsp;&nbsp;&nbsp;&nbsp; moveType:" + moveType);
+			showLog("target: " + (targetNode ? targetNode.name : "root") + "  -- is "+ (isCopy==null? "cancel" : isCopy ? "copy" : "move"))
+		}
+		function onExpand(event, treeId, treeNode) {
+			if (treeNode === autoExpandNode) {
+				className = (className === "dark" ? "":"dark");
+				showLog("[ "+getTime()+" onExpand ]&nbsp;&nbsp;&nbsp;&nbsp;" + treeNode.name);
+			}
+		}
+
+		function showLog(str) {
+			if (!log) log = $("#log");
+			log.append("<li class='"+className+"'>"+str+"</li>");
+			if(log.children("li").length > 8) {
+				log.get(0).removeChild(log.children("li")[0]);
+			}
+		}
+		function getTime() {
+			var now= new Date(),
+			h=now.getHours(),
+			m=now.getMinutes(),
+			s=now.getSeconds(),
+			ms=now.getMilliseconds();
+			return (h+":"+m+":"+s+ " " +ms);
+		}
+
+		function setTrigger() {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			zTree.setting.edit.drag.autoExpandTrigger = $("#callbackTrigger").attr("checked");
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			$("#callbackTrigger").bind("change", {}, setTrigger);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Advanced Drag Node Operation</h1>
+<h6>[ File Path: exedit/drag_super.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, 'beforeDrag / onDrag'<br/>&nbsp;&nbsp;'beforeDrop / onDrop' callback function</h2>
+				<ul class="list">
+				<li>This Demo shows the configuration parameters to achieve a more flexible use of drag and drop rules, the operation can be compared with "Normal Drag Node Operation" example.</li>
+				<li>This Demo default allows copy & move.</li>
+				<li class="highlight_red">This Demo set 'setting.edit.drag.prev / inner / next'  as 'function', you can dynamically set according to the node, which can not use beforeDrop callback function, the effect of drag and drop will be better.</li>
+				<li><p><span class="highlight_red">After be familiar with these configurations, I think you can design a more flexible and rational rules!</span><br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" id="callbackTrigger" checked /> 拖拽节点时自动展开父节点是否触发 callback<br/>
+					drag / drop log:<br/>
+					<ul id="log" class="log"></ul></p></li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of setting</h2>
+				<ul class="list">
+				<li>Same as 'Normal Drag Node Operation'</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3, Explanation of treeNode</h2>
+				<ul class="list">
+				<li>Same as 'Normal Drag Node Operation'</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/exedit/edit.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/exedit/edit.html
new file mode 100644
index 0000000..fd60f05
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/exedit/edit.html
@@ -0,0 +1,115 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - edit</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			edit: {
+				enable: true
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeDrag: beforeDrag
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"parent node 1", open:true},
+			{ id:11, pId:1, name:"leaf node 1-1"},
+			{ id:12, pId:1, name:"leaf node 1-2"},
+			{ id:13, pId:1, name:"leaf node 1-3"},
+			{ id:2, pId:0, name:"parent node 2", open:true},
+			{ id:21, pId:2, name:"leaf node 2-1"},
+			{ id:22, pId:2, name:"leaf node 2-2"},
+			{ id:23, pId:2, name:"leaf node 2-3"},
+			{ id:3, pId:0, name:"parent node 3", open:true },
+			{ id:31, pId:3, name:"leaf node 3-1"},
+			{ id:32, pId:3, name:"leaf node 3-2"},
+			{ id:33, pId:3, name:"leaf node 3-3"}
+		];
+
+		function beforeDrag(treeId, treeNodes) {
+			return false;
+		}
+		
+		function setEdit() {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			remove = $("#remove").attr("checked"),
+			rename = $("#rename").attr("checked"),
+			removeTitle = $.trim($("#removeTitle").get(0).value),
+			renameTitle = $.trim($("#renameTitle").get(0).value);
+			zTree.setting.edit.showRemoveBtn = remove;
+			zTree.setting.edit.showRenameBtn = rename;
+			zTree.setting.edit.removeTitle = removeTitle;
+			zTree.setting.edit.renameTitle = renameTitle;
+			showCode(['setting.edit.showRemoveBtn = ' + remove, 'setting.edit.showRenameBtn = ' + rename,
+				'setting.edit.removeTitle = "' + removeTitle +'"', 'setting.edit.renameTitle = "' + renameTitle + '"']);
+		}
+		function showCode(str) {
+			var code = $("#code");
+			code.empty();
+			for (var i=0, l=str.length; i<l; i++) {
+				code.append("<li>"+str[i]+"</li>");
+			}
+		}
+		
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			setEdit();
+			$("#remove").bind("change", setEdit);
+			$("#rename").bind("change", setEdit);
+			$("#removeTitle").bind("propertychange", setEdit)
+			.bind("input", setEdit);
+			$("#renameTitle").bind("propertychange", setEdit)
+			.bind("input", setEdit);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Basic Edit Nodes</h1>
+<h6>[ File Path: exedit/edit.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of setting</h2>
+				<ul class="list">
+				<li>This Demo only shows how to edit nodes using the basic method and configure parameters.</li>
+				<li class="highlight_red">1) Must set 'setting.edit' attributes, see the API documentation for more related contents.</li>
+				<li class="highlight_red">2) If you want to use remove / rename callback, muse to set 'setting.callback.beforeRemove / onRemove / beforeRename / onRename' attributes, see the API documentation for more related contents.</li>
+				<li class="highlight_red">3) zTree do not provide buttons for add nodes, please use the custom control methods 'addHoverDom / removeHoverDom' to achieve added functionality, see the API documentation for more related contents. Another way, you can see the demo named 'Advanced Edit Nodes'.</li>
+				<li><p>Edit button setting:<br/>
+						<input type="checkbox" id="remove" class="checkbox first" checked /><span>show remove button</span>
+						<input type="checkbox" id="rename" class="checkbox " checked /><span>show edit button</span><br/>
+						title for remove: <input type="text" id="removeTitle" value="remove" /><br/>
+						title for rename: <input type="text" id="renameTitle" value="rename" />
+						<ul id="code" class="log" style="height:85px;"></ul></p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of treeNode</h2>
+				<ul class="list">
+				<li>No special requirements on the node data, the user can add custom attributes.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/exedit/edit_fun.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/exedit/edit_fun.html
new file mode 100644
index 0000000..09c471e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/exedit/edit_fun.html
@@ -0,0 +1,194 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - addNodes / editName / removeNode / removeChildNodes</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				selectedMulti: false
+			},
+			edit: {
+				enable: true,
+				showRemoveBtn: false,
+				showRenameBtn: false
+			},
+			data: {
+				keep: {
+					parent:true,
+					leaf:true
+				},
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeDrag: beforeDrag,
+				beforeRemove: beforeRemove,
+				beforeRename: beforeRename,
+				onRemove: onRemove
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"parent node 1", open:true},
+			{ id:11, pId:1, name:"leaf node 1-1"},
+			{ id:12, pId:1, name:"leaf node 1-2"},
+			{ id:13, pId:1, name:"leaf node 1-3"},
+			{ id:2, pId:0, name:"parent node 2", open:true},
+			{ id:21, pId:2, name:"leaf node 2-1"},
+			{ id:22, pId:2, name:"leaf node 2-2"},
+			{ id:23, pId:2, name:"leaf node 2-3"},
+			{ id:3, pId:0, name:"parent node 3", open:true },
+			{ id:31, pId:3, name:"leaf node 3-1"},
+			{ id:32, pId:3, name:"leaf node 3-2"},
+			{ id:33, pId:3, name:"leaf node 3-3"}
+		];
+		var log, className = "dark";
+		function beforeDrag(treeId, treeNodes) {
+			return false;
+		}
+		function beforeRemove(treeId, treeNode) {
+			className = (className === "dark" ? "":"dark");
+			showLog("[ "+getTime()+" beforeRemove ]&nbsp;&nbsp;&nbsp;&nbsp; " + treeNode.name);
+			return confirm("Confirm delete node '" + treeNode.name + "' it?");
+		}
+		function onRemove(e, treeId, treeNode) {
+			showLog("[ "+getTime()+" onRemove ]&nbsp;&nbsp;&nbsp;&nbsp; " + treeNode.name);
+		}
+		function beforeRename(treeId, treeNode, newName) {
+			if (newName.length == 0) {
+				alert("Node name can not be empty.");
+				var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+				setTimeout(function(){zTree.editName(treeNode)}, 10);
+				return false;
+			}
+			return true;
+		}
+		function showLog(str) {
+			if (!log) log = $("#log");
+			log.append("<li class='"+className+"'>"+str+"</li>");
+			if(log.children("li").length > 8) {
+				log.get(0).removeChild(log.children("li")[0]);
+			}
+		}
+		function getTime() {
+			var now= new Date(),
+			h=now.getHours(),
+			m=now.getMinutes(),
+			s=now.getSeconds(),
+			ms=now.getMilliseconds();
+			return (h+":"+m+":"+s+ " " +ms);
+		}
+		
+		var newCount = 1;
+		function add(e) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			isParent = e.data.isParent,
+			nodes = zTree.getSelectedNodes(),
+			treeNode = nodes[0];
+			if (treeNode) {
+				treeNode = zTree.addNodes(treeNode, {id:(100 + newCount), pId:treeNode.id, isParent:isParent, name:"new node" + (newCount++)});
+			} else {
+				treeNode = zTree.addNodes(null, {id:(100 + newCount), pId:0, isParent:isParent, name:"new node" + (newCount++)});
+			}
+			if (treeNode) {
+				zTree.editName(treeNode[0]);
+			} else {
+				alert("Leaf node is locked and can not add child node.");
+			}
+		};
+		function edit() {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nodes = zTree.getSelectedNodes(),
+			treeNode = nodes[0];
+			if (nodes.length == 0) {
+				alert("Please select one node at first...");
+				return;
+			}
+			zTree.editName(treeNode);
+		};
+		function remove(e) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nodes = zTree.getSelectedNodes(),
+			treeNode = nodes[0];
+			if (nodes.length == 0) {
+				alert("Please select one node at first...");
+				return;
+			}
+			var callbackFlag = $("#callbackTrigger").attr("checked");
+			zTree.removeNode(treeNode, callbackFlag);
+		};
+		function clearChildren(e) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nodes = zTree.getSelectedNodes(),
+			treeNode = nodes[0];
+			if (nodes.length == 0 || !nodes[0].isParent) {
+				alert("Please select one parent node at first...");
+				return;
+			}
+			zTree.removeChildNodes(treeNode);
+		};
+		
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			$("#addParent").bind("click", {isParent:true}, add);
+			$("#addLeaf").bind("click", {isParent:false}, add);
+			$("#edit").bind("click", edit);
+			$("#remove").bind("click", remove);
+			$("#clearChildren").bind("click", clearChildren);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Edit Nodes - zTree methods</h1>
+<h6>[ File Path: exedit/edit_fun.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of 'addNodes / editName / removeNode / removeChildNodes' method</h2>
+				<ul class="list">
+				<li>Use 'addNodes / editName / removeNode / removeChildNodes' method can also be achieved copy / move nodes.</li>
+				<li>Method 'cancelEditName' is effective, only when edit the node name. Please use it when necessary, this demo doesn't show how to use the method.</li>
+				<li class="highlight_red">Use setting.data.keep.parent / leaf attribute, you can lock the parent node and leaf node.</li>
+				<li><p>Try to edit node:<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" id="callbackTrigger" checked /> Whether trigger the callback when execution removeNode() method.<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="addParent" href="#" title="add parent node" onclick="return false;">add parent node</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="addLeaf" href="#" title="add leaf node" onclick="return false;">add leaf node</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="edit" href="#" title="edit name" onclick="return false;">edit name</a> ]<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="remove" href="#" title="remove node" onclick="return false;">remove node</a> ]
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="clearChildren" href="#" title="make child nodes to empty" onclick="return false;">make child nodes to empty</a> ]<br/>
+					remove log:<br/>
+					<ul id="log" class="log"></ul></p>
+				</li>
+				<li class="highlight_red">How to use 'zTreeObj.addNodes / cancelEditName / editName / removeNode / removeChildNodes' method,  please see the API documentation.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of setting</h2>
+				<ul class="list">
+				<li>Same as 'Basic Edit Nodes'</li>
+				<li class="highlight_red">Lock the parent / leaf node status, need to set setting.data.keep.parent / leaf attribute, see the API documentation for more related contents</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3, Explanation of treeNode</h2>
+				<ul class="list">
+				<li>Same as 'Basic Edit Nodes'</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/exedit/edit_super.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/exedit/edit_super.html
new file mode 100644
index 0000000..c00286d
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/exedit/edit_super.html
@@ -0,0 +1,183 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - beforeEditName / beforeRemove / onRemove / beforeRename / onRename</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				addHoverDom: addHoverDom,
+				removeHoverDom: removeHoverDom,
+				selectedMulti: false
+			},
+			edit: {
+				enable: true,
+				editNameSelectAll: true,
+				showRemoveBtn: showRemoveBtn,
+				showRenameBtn: showRenameBtn
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeDrag: beforeDrag,
+				beforeEditName: beforeEditName,
+				beforeRemove: beforeRemove,
+				beforeRename: beforeRename,
+				onRemove: onRemove,
+				onRename: onRename
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"parent node 1", open:true},
+			{ id:11, pId:1, name:"leaf node 1-1"},
+			{ id:12, pId:1, name:"leaf node 1-2"},
+			{ id:13, pId:1, name:"leaf node 1-3"},
+			{ id:2, pId:0, name:"parent node 2", open:true},
+			{ id:21, pId:2, name:"leaf node 2-1"},
+			{ id:22, pId:2, name:"leaf node 2-2"},
+			{ id:23, pId:2, name:"leaf node 2-3"},
+			{ id:3, pId:0, name:"parent node 3", open:true },
+			{ id:31, pId:3, name:"leaf node 3-1"},
+			{ id:32, pId:3, name:"leaf node 3-2"},
+			{ id:33, pId:3, name:"leaf node 3-3"}
+		];
+		var log, className = "dark";
+		function beforeDrag(treeId, treeNodes) {
+			return false;
+		}
+		function beforeEditName(treeId, treeNode) {
+			className = (className === "dark" ? "":"dark");
+			showLog("[ "+getTime()+" beforeEditName ]&nbsp;&nbsp;&nbsp;&nbsp; " + treeNode.name);
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			zTree.selectNode(treeNode);
+			return confirm("Start node '" + treeNode.name + "' editorial status?");
+		}
+		function beforeRemove(treeId, treeNode) {
+			className = (className === "dark" ? "":"dark");
+			showLog("[ "+getTime()+" beforeRemove ]&nbsp;&nbsp;&nbsp;&nbsp; " + treeNode.name);
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			zTree.selectNode(treeNode);
+			return confirm("Confirm delete node '" + treeNode.name + "' it?");
+		}
+		function onRemove(e, treeId, treeNode) {
+			showLog("[ "+getTime()+" onRemove ]&nbsp;&nbsp;&nbsp;&nbsp; " + treeNode.name);
+		}
+		function beforeRename(treeId, treeNode, newName, isCancel) {
+			className = (className === "dark" ? "":"dark");
+			showLog((isCancel ? "<span style='color:red'>":"") + "[ "+getTime()+" beforeRename ]&nbsp;&nbsp;&nbsp;&nbsp; " + treeNode.name + (isCancel ? "</span>":""));
+			if (newName.length == 0) {
+				alert("Node name can not be empty.");
+				var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+				setTimeout(function(){zTree.editName(treeNode)}, 10);
+				return false;
+			}
+			return true;
+		}
+		function onRename(e, treeId, treeNode, isCancel) {
+			showLog((isCancel ? "<span style='color:red'>":"") + "[ "+getTime()+" onRename ]&nbsp;&nbsp;&nbsp;&nbsp; " + treeNode.name + (isCancel ? "</span>":""));
+		}
+		function showRemoveBtn(treeId, treeNode) {
+			return !treeNode.isFirstNode;
+		}
+		function showRenameBtn(treeId, treeNode) {
+			return !treeNode.isLastNode;
+		}
+		function showLog(str) {
+			if (!log) log = $("#log");
+			log.append("<li class='"+className+"'>"+str+"</li>");
+			if(log.children("li").length > 8) {
+				log.get(0).removeChild(log.children("li")[0]);
+			}
+		}
+		function getTime() {
+			var now= new Date(),
+			h=now.getHours(),
+			m=now.getMinutes(),
+			s=now.getSeconds(),
+			ms=now.getMilliseconds();
+			return (h+":"+m+":"+s+ " " +ms);
+		}
+
+		var newCount = 1;
+		function addHoverDom(treeId, treeNode) {
+			var sObj = $("#" + treeNode.tId + "_span");
+			if (treeNode.editNameFlag || $("#addBtn_"+treeNode.tId).length>0) return;
+			var addStr = "<span class='button add' id='addBtn_" + treeNode.tId
+				+ "' title='add node' onfocus='this.blur();'></span>";
+			sObj.after(addStr);
+			var btn = $("#addBtn_"+treeNode.tId);
+			if (btn) btn.bind("click", function(){
+				var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+				zTree.addNodes(treeNode, {id:(100 + newCount), pId:treeNode.id, name:"new node" + (newCount++)});
+				return false;
+			});
+		};
+		function removeHoverDom(treeId, treeNode) {
+			$("#addBtn_"+treeNode.tId).unbind().remove();
+		};
+		function selectAll() {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			zTree.setting.edit.editNameSelectAll =  $("#selectAll").attr("checked");
+		}
+		
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			$("#selectAll").bind("click", selectAll);
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+.ztree li span.button.add {margin-left:2px; margin-right: -1px; background-position:-144px 0; vertical-align:top; *vertical-align:middle}
+	</style>
+</HEAD>
+
+<BODY>
+<h1>Advanced Edit Nodes</h1>
+<h6>[ File Path: exedit/edit_super.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, 'beforeDrag / onDrag'<br/>&nbsp;&nbsp;'beforeEditName'<br/>&nbsp;&nbsp;'beforeRemove / onRemove'<br/>&nbsp;&nbsp;'beforeRename / onRename' callback function</h2>
+				<ul class="list">
+				<li>This demo shows the use of custom controls, the callback function to enhance the user experience, the operation can be compared with "Basic Edit Nodes" example.</li>
+				<li>This demo achieve the Add nodes button.</li>
+				<li>This demo achieve the confirmation when deleting node.</li>
+				<li>This demo use the 'showRenameBtn' to hide the rename button, when the treeNode's isLastNode = true</li>
+				<li>This demo use the 'showRemoveBtn' to hide the delete button, when the treeNode's isFirstNode = true</li>
+				<li class="highlight_red">Can use 'beforeEditName' callback trigger custom editing.</li>
+				<li><p><span class="highlight_red">After be familiar with these configurations, I think you can design a more flexible and rational rules!</span><br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" id="selectAll" checked /> Whether select all text, when edit node's name.<br/>
+					remove / rename log:&nbsp;&nbsp;<span style="color:red">RED</span> is cancel edit (v3.5.13+)<br/>
+					<ul id="log" class="log"></ul></p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of setting</h2>
+				<ul class="list">
+				<li>Same as 'Basic Edit Nodes'</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3, Explanation of treeNode</h2>
+				<ul class="list">
+				<li>Same as 'Basic Edit Nodes'</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/exedit/multiTree.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/exedit/multiTree.html
new file mode 100644
index 0000000..b078f1b
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/exedit/multiTree.html
@@ -0,0 +1,94 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - multiTree</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			edit: {
+				enable: true,
+				showRemoveBtn: false,
+				showRenameBtn: false
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeDrag: beforeDrag,
+				beforeDrop: beforeDrop
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"parent node 1", open:true},
+			{ id:11, pId:1, name:"leaf node 1-1"},
+			{ id:12, pId:1, name:"leaf node 1-2"},
+			{ id:13, pId:1, name:"leaf node 1-3"},
+			{ id:2, pId:0, name:"parent node 2", open:true},
+			{ id:21, pId:2, name:"leaf node 2-1"},
+			{ id:22, pId:2, name:"leaf node 2-2"},
+			{ id:23, pId:2, name:"leaf node 2-3"},
+			{ id:3, pId:0, name:"parent node 3", open:true },
+			{ id:31, pId:3, name:"leaf node 3-1"},
+			{ id:32, pId:3, name:"leaf node 3-2"},
+			{ id:33, pId:3, name:"leaf node 3-3"}
+		];
+
+		function beforeDrag(treeId, treeNodes) {
+			for (var i=0,l=treeNodes.length; i<l; i++) {
+				if (treeNodes[i].drag === false) {
+					return false;
+				}
+			}
+			return true;
+		}
+		function beforeDrop(treeId, treeNodes, targetNode, moveType) {
+			return targetNode ? targetNode.drop !== false : true;
+		}
+		
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			$.fn.zTree.init($("#treeDemo2"), setting);
+			
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Multiple Trees</h1>
+<h6>[ File Path: exedit/multiTree.html ]</h6>
+<div class="content_wrap">
+	<div>
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of setting</h2>
+				<ul class="list">
+				<li>zTree enables drag and drop nodes between multiple trees, only need to create two draggable tree can be. And you can use the callback function and zTree method achieve a more complex operating rules, here is only the basic demo.</li>
+				<li class="highlight_red">On the 'setting' configuration information please refer to drag and drop, edit, etc. demo's instructions</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of treeNode</h2>
+				<ul class="list">
+				<li>No special requirements on the node data, the user can add custom attributes.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul id="treeDemo2" class="ztree"></ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/exhide/checkbox.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/exhide/checkbox.html
new file mode 100644
index 0000000..759701a
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/exhide/checkbox.html
@@ -0,0 +1,161 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - Hide With Checkbox Mode</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+<!--<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<script type="text/javascript" src="../../../js/jquery.ztree.exhide-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			check: {
+				enable: true
+			},
+			data: {
+				key: {
+					title: "title"
+				},
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				onCheck: onCheck
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"pNode 1", title:"", checked:true, open:true},
+			{ id:11, pId:1, name:"pNode 11", title:"", checked:true},
+			{ id:111, pId:11, name:"leaf node 111", title:"", checked:true, isHidden:true},
+			{ id:112, pId:11, name:"leaf node 112", title:""},
+			{ id:113, pId:11, name:"leaf node 113", title:""},
+			{ id:12, pId:1, name:"pNode 12", title:"", isHidden:true},
+			{ id:121, pId:12, name:"leaf node 121", title:""},
+			{ id:122, pId:12, name:"leaf node 122", title:"", isHidden:true},
+			{ id:123, pId:12, name:"leaf node 123", title:""},
+			{ id:2, pId:0, name:"pNode 2", title:""},
+			{ id:21, pId:2, name:"pNode 21", title:"", isHidden:true},
+			{ id:211, pId:21, name:"leaf node 211", title:""},
+			{ id:212, pId:21, name:"leaf node 212", title:""},
+			{ id:213, pId:21, name:"leaf node 213", title:""},
+			{ id:22, pId:2, name:"pNode 22", title:""},
+			{ id:221, pId:22, name:"leaf node 221", title:""},
+			{ id:222, pId:22, name:"leaf node 222", title:""},
+			{ id:223, pId:22, name:"leaf node 223", title:""}
+		];
+
+		function onCheck(e, treeId, treeNode) {
+			count();
+		}
+
+		function setTitle(node) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			var nodes = node ? [node]:zTree.transformToArray(zTree.getNodes());
+			for (var i=0, l=nodes.length; i<l; i++) {
+				var n = nodes[i];
+				n.title = "[" + n.id + "] isFirstNode = " + n.isFirstNode + ", isLastNode = " + n.isLastNode;
+				zTree.updateNode(n);
+			}
+		}
+		function count() {
+			function isForceHidden(node) {
+				if (!node.parentTId) return false;
+				var p = node.getParentNode();
+				return !!p.isHidden ? true : isForceHidden(p);
+			}
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			checkCount = zTree.getCheckedNodes(true).length,
+			nocheckCount = zTree.getCheckedNodes(false).length,
+			hiddenNodes = zTree.getNodesByParam("isHidden", true),
+			hiddenCount = hiddenNodes.length;
+
+			for (var i=0, j=hiddenNodes.length; i<j; i++) {
+				var n = hiddenNodes[i];
+				if (isForceHidden(n)) {
+					hiddenCount -= 1;
+				} else if (n.isParent) {
+					hiddenCount += zTree.transformToArray(n.children).length;
+				}
+			}
+
+			$("#isHiddenCount").text(hiddenNodes.length);
+			$("#hiddenCount").text(hiddenCount);
+			$("#checkCount").text(checkCount);
+			$("#nocheckCount").text(nocheckCount);
+		}
+		function showNodes() {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nodes = zTree.getNodesByParam("isHidden", true);
+			zTree.showNodes(nodes);
+			setTitle();
+			count();
+		}
+		function hideNodes() {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nodes = zTree.getSelectedNodes();
+			if (nodes.length == 0) {
+				alert("Please select one node at least.");
+				return;
+			}
+			zTree.hideNodes(nodes);
+			setTitle();
+			count();
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			$("#hideNodesBtn").bind("click", {type:"rename"}, hideNodes);
+			$("#showNodesBtn").bind("click", {type:"icon"}, showNodes);
+			setTitle();
+			count();
+		});
+		//-->
+	</SCRIPT>
+ </HEAD>
+
+<BODY>
+<h1>Hide With Checkbox Mode</h1>
+<h6>[ File Path: exhide/checkbox.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of setting</h2>
+				<ul class="list">
+				<li>Use the freature which to hide nodes, you don't need to set any attributes.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of treeNode</h2>
+				<ul class="list">
+				<li class="highlight_red">Before you init zTree, set treeNode.isHidden = true, and you can hide the node.</li>
+				<li><p>Hide or show the nodes:<br/>
+					Try: [ <a id="hideNodesBtn" href="#" onclick="return false;">Hide the nodes which be selected</a> ]<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="showNodesBtn" href="#" onclick="return false;">Show all of the nodes which be hidden</a> ]<br/>
+					<ul id="log" class="log" style="height:125px;">
+						<li>Total nodes which 'isHidden' attribute is true: <span id="isHiddenCount" class="highlight_red"></span></li>
+						<li>Total hidden nodes: <span id="hiddenCount" class="highlight_red"></span></li>
+						<li>Total check nodes: <span id="checkCount" class="highlight_red"></span>
+							&nbsp;&nbsp;Total uncheck nodes: <span id="nocheckCount" class="highlight_red"></span></li>
+						<li>After hide nodes, you can see the 'isFirstNode' and 'isLastNode' attributes on the nodes which still be shown.</li>
+					</ul></p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、Other explanation</h2>
+				<ul class="list">
+				<li>Hide nodes will effect the 'isFirstNode' and 'isLastNode' attributes, but will not effect the 'getPreNode()' and 'getNextNode()' method.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/exhide/common.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/exhide/common.html
new file mode 100644
index 0000000..9d660a9
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/exhide/common.html
@@ -0,0 +1,126 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - Hide Ordinary Node</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+<!--<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<script type="text/javascript" src="../../../js/jquery.ztree.exhide-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			data: {
+				key: {
+					title: "title"
+				},
+				simpleData: {
+					enable: true
+				}
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"pNode 1", title:"", open:true},
+			{ id:11, pId:1, name:"pNode 11", title:""},
+			{ id:111, pId:11, name:"leaf node  111", title:"", isHidden:true},
+			{ id:112, pId:11, name:"leaf node  112", title:""},
+			{ id:113, pId:11, name:"leaf node  113", title:""},
+			{ id:12, pId:1, name:"pNode 12", title:"", isHidden:true},
+			{ id:121, pId:12, name:"leaf node  121", title:""},
+			{ id:122, pId:12, name:"leaf node  122", title:"", isHidden:true},
+			{ id:123, pId:12, name:"leaf node  123", title:""},
+			{ id:2, pId:0, name:"pNode 2", title:""},
+			{ id:21, pId:2, name:"pNode 21", title:"", isHidden:true},
+			{ id:211, pId:21, name:"leaf node  211", title:""},
+			{ id:212, pId:21, name:"leaf node  212", title:""},
+			{ id:213, pId:21, name:"leaf node  213", title:""},
+			{ id:22, pId:2, name:"pNode 22", title:""},
+			{ id:221, pId:22, name:"leaf node  221", title:""},
+			{ id:222, pId:22, name:"leaf node  222", title:""},
+			{ id:223, pId:22, name:"leaf node  223", title:""}
+		];
+		function setTitle(node) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			var nodes = node ? [node]:zTree.transformToArray(zTree.getNodes());
+			for (var i=0, l=nodes.length; i<l; i++) {
+				var n = nodes[i];
+				n.title = "[" + n.id + "] isFirstNode = " + n.isFirstNode + ", isLastNode = " + n.isLastNode;
+				zTree.updateNode(n);
+			}
+		}
+		function count() {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			hiddenCount = zTree.getNodesByParam("isHidden", true).length;
+			$("#hiddenCount").text(hiddenCount);
+		}
+		function showNodes() {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nodes = zTree.getNodesByParam("isHidden", true);
+			zTree.showNodes(nodes);
+			setTitle();
+			count();
+		}
+		function hideNodes() {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nodes = zTree.getSelectedNodes();
+			if (nodes.length == 0) {
+				alert("Please select one node at least.");
+				return;
+			}
+			zTree.hideNodes(nodes);
+			setTitle();
+			count();
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			$("#hideNodesBtn").bind("click", {type:"rename"}, hideNodes);
+			$("#showNodesBtn").bind("click", {type:"icon"}, showNodes);
+			setTitle();
+			count();
+		});
+		//-->
+	</SCRIPT>
+ </HEAD>
+
+<BODY>
+<h1>Hide Ordinary Node</h1>
+<h6>[ File Path: exhide/common.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of setting</h2>
+				<ul class="list">
+				<li>Use this freature, you don't need to set any attributes.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of treeNode</h2>
+				<ul class="list">
+				<li class="highlight_red">Before you init zTree, set treeNode.isHidden = true, and you can hide the node.</li>
+				<li><p>Hide or show the nodes:<br/><br/>
+					Try: [ <a id="hideNodesBtn" href="#" onclick="return false;">Hide the nodes which be selected</a> ]<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="showNodesBtn" href="#" onclick="return false;">Show all of the nodes which be hidden</a> ]<br/><br/>
+					<ul id="log" class="log" style="height:65px;">
+						<li>Total hidden nodes ('isHidden' is true): <span id="hiddenCount" class="highlight_red"></span> 个</li>
+						<li>After hide nodes, you can see the 'isFirstNode' and 'isLastNode' attributes on the nodes which still be shown.</li>
+					</ul></p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、Other explanation</h2>
+				<ul class="list">
+				<li>Hide nodes will effect the 'isFirstNode' and 'isLastNode' attributes, but will not effect the 'getPreNode()' and 'getNextNode()' method.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/exhide/radio.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/exhide/radio.html
new file mode 100644
index 0000000..639d69c
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/exhide/radio.html
@@ -0,0 +1,162 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - Hide With Radio Mode</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+<!--<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<script type="text/javascript" src="../../../js/jquery.ztree.exhide-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			check: {
+				enable: true,
+				chkStyle: "radio"
+			},
+			data: {
+				key: {
+					title: "title"
+				},
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				onCheck: onCheck
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"pNode 1", title:"", checked:true, open:true},
+			{ id:11, pId:1, name:"pNode 11", title:"", checked:true},
+			{ id:111, pId:11, name:"leaf node 111", title:"", checked:true, isHidden:true},
+			{ id:112, pId:11, name:"leaf node 112", title:""},
+			{ id:113, pId:11, name:"leaf node 113", title:""},
+			{ id:12, pId:1, name:"pNode 12", title:"", isHidden:true},
+			{ id:121, pId:12, name:"leaf node 121", title:""},
+			{ id:122, pId:12, name:"leaf node 122", title:"", isHidden:true},
+			{ id:123, pId:12, name:"leaf node 123", title:""},
+			{ id:2, pId:0, name:"pNode 2", title:""},
+			{ id:21, pId:2, name:"pNode 21", title:"", isHidden:true},
+			{ id:211, pId:21, name:"leaf node 211", title:""},
+			{ id:212, pId:21, name:"leaf node 212", title:""},
+			{ id:213, pId:21, name:"leaf node 213", title:""},
+			{ id:22, pId:2, name:"pNode 22", title:""},
+			{ id:221, pId:22, name:"leaf node 221", title:""},
+			{ id:222, pId:22, name:"leaf node 222", title:""},
+			{ id:223, pId:22, name:"leaf node 223", title:""}
+		];
+
+		function onCheck(e, treeId, treeNode) {
+			count();
+		}
+
+		function setTitle(node) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			var nodes = node ? [node]:zTree.transformToArray(zTree.getNodes());
+			for (var i=0, l=nodes.length; i<l; i++) {
+				var n = nodes[i];
+				n.title = "[" + n.id + "] isFirstNode = " + n.isFirstNode + ", isLastNode = " + n.isLastNode;
+				zTree.updateNode(n);
+			}
+		}
+		function count() {
+			function isForceHidden(node) {
+				if (!node.parentTId) return false;
+				var p = node.getParentNode();
+				return !!p.isHidden ? true : isForceHidden(p);
+			}
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			checkCount = zTree.getCheckedNodes(true).length,
+			nocheckCount = zTree.getCheckedNodes(false).length,
+			hiddenNodes = zTree.getNodesByParam("isHidden", true),
+			hiddenCount = hiddenNodes.length;
+
+			for (var i=0, j=hiddenNodes.length; i<j; i++) {
+				var n = hiddenNodes[i];
+				if (isForceHidden(n)) {
+					hiddenCount -= 1;
+				} else if (n.isParent) {
+					hiddenCount += zTree.transformToArray(n.children).length;
+				}
+			}
+
+			$("#isHiddenCount").text(hiddenNodes.length);
+			$("#hiddenCount").text(hiddenCount);
+			$("#checkCount").text(checkCount);
+			$("#nocheckCount").text(nocheckCount);
+		}
+		function showNodes() {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nodes = zTree.getNodesByParam("isHidden", true);
+			zTree.showNodes(nodes);
+			setTitle();
+			count();
+		}
+		function hideNodes() {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nodes = zTree.getSelectedNodes();
+			if (nodes.length == 0) {
+				alert("Please select one node at least.");
+				return;
+			}
+			zTree.hideNodes(nodes);
+			setTitle();
+			count();
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			$("#hideNodesBtn").bind("click", {type:"rename"}, hideNodes);
+			$("#showNodesBtn").bind("click", {type:"icon"}, showNodes);
+			setTitle();
+			count();
+		});
+		//-->
+	</SCRIPT>
+ </HEAD>
+
+<BODY>
+<h1>Hide With Radio Mode</h1>
+<h6>[ File Path: exhide/radio.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of setting</h2>
+				<ul class="list">
+				<li>Use the freature which to hide nodes, you don't need to set any attributes.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of treeNode</h2>
+				<ul class="list">
+				<li class="highlight_red">Before you init zTree, set treeNode.isHidden = true, and you can hide the node.</li>
+				<li><p>Hide or show the nodes:<br/>
+					Try: [ <a id="hideNodesBtn" href="#" onclick="return false;">Hide the nodes which be selected</a> ]<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;[ <a id="showNodesBtn" href="#" onclick="return false;">Show all of the nodes which be hidden</a> ]<br/>
+					<ul id="log" class="log" style="height:125px;">
+						<li>Total nodes which 'isHidden' attribute is true: <span id="isHiddenCount" class="highlight_red"></span></li>
+						<li>Total hidden nodes: <span id="hiddenCount" class="highlight_red"></span></li>
+						<li>Total check nodes: <span id="checkCount" class="highlight_red"></span>
+							&nbsp;&nbsp;Total uncheck nodes: <span id="nocheckCount" class="highlight_red"></span></li>
+						<li>After hide nodes, you can see the 'isFirstNode' and 'isLastNode' attributes on the nodes which still be shown.</li>
+					</ul></p>
+				</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3、Other explanation</h2>
+				<ul class="list">
+				<li>Hide nodes will effect the 'isFirstNode' and 'isLastNode' attributes, but will not effect the 'getPreNode()' and 'getNextNode()' method.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/index.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/index.html
new file mode 100644
index 0000000..95d878e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/index.html
@@ -0,0 +1,157 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">

+<HTML>

+ <HEAD>

+  <TITLE> ZTREE DEMO </TITLE>

+  <meta http-equiv="content-type" content="text/html; charset=UTF-8">

+  <link rel="stylesheet" href="../../css/zTreeStyle/zTreeStyle.css" type="text/css">

+  <style>

+	body {

+	background-color: white;

+	margin:0; padding:0;

+	text-align: center;

+	}

+	div, p, table, th, td {

+		list-style:none; 

+		margin:0; padding:0; 

+		color:#333; font-size:12px; 

+		font-family:dotum, Verdana, Arial, Helvetica, AppleGothic, sans-serif;

+	}

+	#testIframe {margin-left: 10px;}

+  </style>

+<script type="text/javascript" src="../../js/jquery-1.4.4.min.js"></script>

+<script type="text/javascript" src="../../js/jquery.ztree.core-3.5.js"></script>

+  <SCRIPT type="text/javascript" >

+  <!--

+	var zTree;

+	var demoIframe;

+

+	var setting = {

+		view: {

+			dblClickExpand: false,

+			showLine: true,

+			selectedMulti: false

+		},

+		data: {

+			simpleData: {

+				enable:true,

+				idKey: "id",

+				pIdKey: "pId",

+				rootPId: ""

+			}

+		},

+		callback: {

+			beforeClick: function(treeId, treeNode) {

+				var zTree = $.fn.zTree.getZTreeObj("tree");

+				if (treeNode.isParent) {

+					zTree.expandNode(treeNode);

+					return false;

+				} else {

+					demoIframe.attr("src",treeNode.file + ".html");

+					return true;

+				}

+			}

+		}

+	};

+

+	var zNodes = [

+		{id:1, pId:0, name:"[core] Basic Functions", open:false},

+		{id:101, pId:1, name:"Standard JSON Data", file:"core/standardData"},

+		{id:102, pId:1, name:"Simple JSON Data", file:"core/simpleData"},

+		{id:103, pId:1, name:"Don't Show Line", file:"core/noline"},

+		{id:104, pId:1, name:"Don't Show Icon", file:"core/noicon"},

+		{id:105, pId:1, name:"Custom Icon - icon", file:"core/custom_icon"},

+		{id:106, pId:1, name:"Custom Icon - iconSkin", file:"core/custom_iconSkin"},

+		{id:107, pId:1, name:"Custom Fonts", file:"core/custom_font"},

+		{id:115, pId:1, name:"Hyperlinks Demo", file:"core/url"},

+		{id:108, pId:1, name:"Dynamic Tree with Ajax", file:"core/async"},

+		{id:109, pId:1, name:"Dynamic Tree - zTree methods", file:"core/async_fun"},

+		{id:110, pId:1, name:"Update Node - zTree methods", file:"core/update_fun"},

+		{id:111, pId:1, name:"Control of Click Node", file:"core/click"},

+		{id:112, pId:1, name:"Control of Expand Node", file:"core/expand"},

+		{id:113, pId:1, name:"Search Nodes", file:"core/searchNodes"},

+		{id:114, pId:1, name:"Other Mouse Events for zTree", file:"core/otherMouse"},

+

+		{id:2, pId:0, name:"[excheck] Checkbox & Radio", open:false},

+		{id:201, pId:2, name:"Checkbox Operation", file:"excheck/checkbox"},

+		{id:206, pId:2, name:"Checkbox nocheck Demo", file:"excheck/checkbox_nocheck"},

+		{id:207, pId:2, name:"Checkbox chkDisabled Demo", file:"excheck/checkbox_chkDisabled"},

+		{id:208, pId:2, name:"Checkbox halfCheck Demo", file:"excheck/checkbox_halfCheck"},

+		{id:202, pId:2, name:"Statistics Checkbox is Checked", file:"excheck/checkbox_count"},

+		{id:203, pId:2, name:"Checkbox - zTree methods", file:"excheck/checkbox_fun"},

+		{id:204, pId:2, name:"Radio Operation", file:"excheck/radio"},

+		{id:209, pId:2, name:"Radio nocheck Demo", file:"excheck/radio_nocheck"},

+		{id:210, pId:2, name:"Radio chkDisabled Demo", file:"excheck/radio_chkDisabled"},

+		{id:211, pId:2, name:"Radio halfCheck Demo", file:"excheck/radio_halfCheck"},

+		{id:205, pId:2, name:"Radio - zTree methods", file:"excheck/radio_fun"},

+

+		{id:3, pId:0, name:"[exedit] Editing", open:false},

+		{id:301, pId:3, name:"Normal Drag Node Operation", file:"exedit/drag"},

+		{id:302, pId:3, name:"Advanced Drag Node Operation", file:"exedit/drag_super"},

+		{id:303, pId:3, name:"Move / Copy - zTree methods", file:"exedit/drag_fun"},

+		{id:304, pId:3, name:"Basic Edit Nodes", file:"exedit/edit"},

+		{id:305, pId:3, name:"Advanced Edit Nodes", file:"exedit/edit_super"},

+		{id:306, pId:3, name:"Edit Nodes - zTree methods", file:"exedit/edit_fun"},

+		{id:307, pId:3, name:"Editing Dynamic Tree", file:"exedit/async_edit"},

+		{id:308, pId:3, name:"Multiple Trees", file:"exedit/multiTree"},

+

+		{id:4, pId:0, name:"Large Amount of Data Loading", open:false},

+		{id:401, pId:4, name:"One-time Large Data Loading", file:"bigdata/common"},

+		{id:402, pId:4, name:"Loading Data in Batches", file:"bigdata/diy_async"},

+		{id:403, pId:4, name:"Loading Data By Pagination", file:"bigdata/page"},

+

+		{id:5, pId:0, name:"Multi-functional", open:false},

+		{id:501, pId:5, name:"Freeze the Root Node", file:"super/oneroot"},

+		{id:502, pId:5, name:"Click to Expand Node", file:"super/oneclick"},

+		{id:503, pId:5, name:"Keep Single Path", file:"super/singlepath"},

+		{id:504, pId:5, name:"Adding Custom DOM", file:"super/diydom"},

+		{id:505, pId:5, name:"Checkbox / Radio Coexistence", file:"super/checkbox_radio"},

+		{id:506, pId:5, name:"Left Menu", file:"super/left_menu"},

+		{id:513, pId:5, name:"Left Menu Like OutLook Style", file:"super/left_menuForOutLook"},

+		{id:507, pId:5, name:"Drop-down Menu", file:"super/select_menu"},

+		{id:509, pId:5, name:"Drop-down Menu with checkbox", file:"super/select_menu_checkbox"},

+		{id:510, pId:5, name:"Drop-down Menu with radio", file:"super/select_menu_radio"},

+		{id:508, pId:5, name:"Right-click Menu", file:"super/rightClickMenu"},

+		{id:511, pId:5, name:"Drag With Other DOMs", file:"super/dragWithOther"},

+		{id:512, pId:5, name:"Expand All Nodes with Async", file:"super/asyncForAll"},

+

+		{id:6, pId:0, name:"Other Extension Package", open:false},

+		{id:601, pId:6, name:"hide ordinary node", file:"exhide/common"},

+		{id:602, pId:6, name:"hide with checkbox mode", file:"exhide/checkbox"},

+		{id:603, pId:6, name:"hide with radio mode", file:"exhide/radio"}

+	];

+

+	$(document).ready(function(){

+		var t = $("#tree");

+		t = $.fn.zTree.init(t, setting, zNodes);

+		demoIframe = $("#testIframe");

+		demoIframe.bind("load", loadReady);

+		var zTree = $.fn.zTree.getZTreeObj("tree");

+		zTree.selectNode(zTree.getNodeByParam("id", 101));

+	

+	});

+

+	function loadReady() {

+		var bodyH = demoIframe.contents().find("body").get(0).scrollHeight,

+		htmlH = demoIframe.contents().find("html").get(0).scrollHeight,

+		maxH = Math.max(bodyH, htmlH), minH = Math.min(bodyH, htmlH),

+		h = demoIframe.height() >= maxH ? minH:maxH ;

+		if (h < 530) h = 530;

+		demoIframe.height(h);

+	}

+

+  //-->

+  </SCRIPT>

+ </HEAD>

+

+<BODY>

+<TABLE border=0 height=600px align=left>

+	<TR>

+		<TD width=260px align=left valign=top style="BORDER-RIGHT: #999999 1px dashed">

+			<ul id="tree" class="ztree" style="width:260px; overflow:auto;"></ul>

+		</TD>

+		<TD width=770px align=left valign=top><IFRAME ID="testIframe" Name="testIframe" FRAMEBORDER=0 SCROLLING=AUTO width=100%  height=600px SRC="core/standardData.html"></IFRAME></TD>

+	</TR>

+</TABLE>

+

+ </BODY>

+</HTML>

diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/super/asyncForAll.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/super/asyncForAll.html
new file mode 100644
index 0000000..eea4a9b
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/super/asyncForAll.html
@@ -0,0 +1,192 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - async for All</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var demoMsg = {
+			async: "Loading asynchronous, please wait a moment and then click...",
+			expandAllOver: "Expansion Completed.",
+			asyncAllOver: "Asynchronously loading Completed.",
+			asyncAll: "Asynchronously loading Completed, no need to reload it again.",
+			expandAll: "Asynchronously loading completed, please use expandAll method."
+		}
+
+		var setting = {
+			async: {
+				enable: true,
+				url:"../asyncData/getNodes.php",
+				autoParam:["id", "name=n", "level=lv"],
+				otherParam:{"otherParam":"zTreeAsyncTest"},
+				dataFilter: filter,
+				type: "get"
+			},
+			callback: {
+				beforeAsync: beforeAsync,
+				onAsyncSuccess: onAsyncSuccess,
+				onAsyncError: onAsyncError
+			}
+		};
+
+		function filter(treeId, parentNode, childNodes) {
+			if (!childNodes) return null;
+			for (var i=0, l=childNodes.length; i<l; i++) {
+				childNodes[i].name = childNodes[i].name.replace(/\.n/g, '.');
+			}
+			return childNodes;
+		}
+
+		function beforeAsync() {
+			curAsyncCount++;
+		}
+		
+		function onAsyncSuccess(event, treeId, treeNode, msg) {
+			curAsyncCount--;
+			if (curStatus == "expand") {
+				expandNodes(treeNode.children);
+			} else if (curStatus == "async") {
+				asyncNodes(treeNode.children);
+			}
+
+			if (curAsyncCount <= 0) {
+				if (curStatus != "init" && curStatus != "") {
+					$("#demoMsg").text((curStatus == "expand") ? demoMsg.expandAllOver : demoMsg.asyncAllOver);
+					asyncForAll = true;
+				}
+				curStatus = "";
+			}
+		}
+
+		function onAsyncError(event, treeId, treeNode, XMLHttpRequest, textStatus, errorThrown) {
+			curAsyncCount--;
+
+			if (curAsyncCount <= 0) {
+				curStatus = "";
+				if (treeNode!=null) asyncForAll = true;
+			}
+		}
+
+		var curStatus = "init", curAsyncCount = 0, asyncForAll = false,
+		goAsync = false;
+		function expandAll() {
+			if (!check()) {
+				return;
+			}
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			if (asyncForAll) {
+				$("#demoMsg").text(demoMsg.expandAll);
+				zTree.expandAll(true);
+			} else {
+				expandNodes(zTree.getNodes());
+				if (!goAsync) {
+					$("#demoMsg").text(demoMsg.expandAll);
+					curStatus = "";
+				}
+			}
+		}
+		function expandNodes(nodes) {
+			if (!nodes) return;
+			curStatus = "expand";
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			for (var i=0, l=nodes.length; i<l; i++) {
+				zTree.expandNode(nodes[i], true, false, false);
+				if (nodes[i].isParent && nodes[i].zAsync) {
+					expandNodes(nodes[i].children);
+				} else {
+					goAsync = true;
+				}
+			}
+		}
+
+		function asyncAll() {
+			if (!check()) {
+				return;
+			}
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			if (asyncForAll) {
+				$("#demoMsg").text(demoMsg.asyncAll);
+			} else {
+				asyncNodes(zTree.getNodes());
+				if (!goAsync) {
+					$("#demoMsg").text(demoMsg.asyncAll);
+					curStatus = "";
+				}
+			}
+		}
+		function asyncNodes(nodes) {
+			if (!nodes) return;
+			curStatus = "async";
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			for (var i=0, l=nodes.length; i<l; i++) {
+				if (nodes[i].isParent && nodes[i].zAsync) {
+					asyncNodes(nodes[i].children);
+				} else {
+					goAsync = true;
+					zTree.reAsyncChildNodes(nodes[i], "refresh", true);
+				}
+			}
+		}
+
+		function reset() {
+			if (!check()) {
+				return;
+			}
+			asyncForAll = false;
+			goAsync = false;
+			$("#demoMsg").text("");
+			$.fn.zTree.init($("#treeDemo"), setting);
+		}
+
+		function check() {
+			if (curAsyncCount > 0) {
+				$("#demoMsg").text(demoMsg.async);
+				return false;
+			}
+			return true;
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting);
+			$("#expandAllBtn").bind("click", expandAll);
+			$("#asyncAllBtn").bind("click", asyncAll);
+			$("#resetBtn").bind("click", reset);
+		});
+		//-->
+	</SCRIPT>
+</HEAD>
+
+<BODY>
+<h1>Expand All Nodes with Async</h1>
+<h6>[ File Path: super/asyncForAll.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>Explanation of implementation method</h2>
+				<ul class="list">
+				<li>Using 'onAsyncSuccess' / 'onAsyncError' callback and 'reAsyncChildNodes' or 'expandNode' method, you will achieve all functionalities.</li>
+				<li class="highlight_red">Note: If there are large amount parent nodes, please use delay to avoid excessive asynchronous process.</li>
+				<li class="highlight_red">Recommendation: please use the debugging tools to view the ajax loading process with network.</li>
+				<li>Demonstrate operation
+					<br/><br/>
+				[ <a id="expandAllBtn" href="#" onclick="return false;">Expand All Nodes</a> ] &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+				[ <a id="asyncAllBtn" href="#" onclick="return false;">Load all nodes (don't expand)</a> ]<br/><br/>
+				[ <a id="resetBtn" href="#" onclick="return false;">Reset zTree</a> ]<br/><br/>
+				<p class="highlight_red" id="demoMsg"></p>
+				</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/super/checkbox_radio.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/super/checkbox_radio.html
new file mode 100644
index 0000000..87ce15d
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/super/checkbox_radio.html
@@ -0,0 +1,116 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - checkbox & radio</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var IDMark_A = "_a";
+		var setting = {
+			view: {
+				addDiyDom: addDiyDom
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"parent node 1", open:true},
+			{ id:11, pId:1, name:"leaf node 1-1"},
+			{ id:12, pId:1, name:"leaf node 1-2"},
+			{ id:13, pId:1, name:"leaf node 1-3"},
+			{ id:2, pId:0, name:"parent node 2", open:true},
+			{ id:21, pId:2, name:"leaf node 2-1"},
+			{ id:22, pId:2, name:"leaf node 2-2"},
+			{ id:23, pId:2, name:"leaf node 2-3"},
+			{ id:3, pId:0, name:"parent node 3", open:true },
+			{ id:31, pId:3, name:"leaf node 3-1"},
+			{ id:32, pId:3, name:"leaf node 3-2"},
+			{ id:33, pId:3, name:"leaf node 3-3"}
+		];
+
+		function addDiyDom(treeId, treeNode) {
+			var aObj = $("#" + treeNode.tId + IDMark_A);
+			if (treeNode.level == 0) {
+				var editStr = "<input type='checkbox' class='checkboxBtn' id='checkbox_" +treeNode.id+ "' onfocus='this.blur();'></input>";
+				aObj.before(editStr);
+				var btn = $("#checkbox_"+treeNode.id);
+			if (btn) btn.bind("change", function() {checkAccessories(treeNode, btn);});
+			} else if (treeNode.level == 1) {
+				var editStr = "<input type='radio' class='radioBtn' id='radio_" +treeNode.id+ "' name='radio_"+treeNode.getParentNode().id+"' onfocus='this.blur();'></input>";
+				aObj.before(editStr);
+				var btn = $("#radio_"+treeNode.id);
+				if (btn) btn.bind("click", function() {checkBrand(treeNode, btn);});
+			}
+		}
+
+		function checkAccessories(treeNode, btn) {
+			var checkedRadio = getCheckedRadio("radio_"+treeNode.id);
+			if (btn.attr("checked")) {
+				if (!checkedRadio) {
+					$("#radio_" + treeNode.children[0].id).attr("checked", true);
+				}
+			} else {
+				checkedRadio.attr("checked", false);
+			}
+		}
+
+		function checkBrand(treeNode, btn) {
+			if (btn.attr("checked")) {
+				var pObj = $("#checkbox_" + treeNode.getParentNode().id);
+				if (!pObj.attr("checked")) {
+					pObj.attr("checked", true);
+				}
+			}
+		}
+
+		function getCheckedRadio(radioName) {
+			var r = document.getElementsByName(radioName);
+			for(var i=0; i<r.length; i++)    {
+				if(r[i].checked)    {
+					return $(r[i]);
+				}
+			}
+			return null;
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+	  .radioBtn {height: 16px;vertical-align: middle;}
+	  .checkboxBtn {vertical-align: middle;margin-right: 2px;}
+	  </style>
+ </HEAD>
+
+<BODY>
+<h1>Checkbox / Radio Coexistence</h1>
+<h6>[ File Path: super/checkbox_radio.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>Explanation of implementation method</h2>
+				<ul class="list">
+				<li>zTree default checkbox and radio can not coexist, but can be used the custom DOM features to achieve this requirement, refer to the "Adding Custom DOM".</li>
+				<li class="highlight_red">For checkbox / radio association rules of the parent nodes and child nodes, according to the needs to develop its own rules.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/super/diydom.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/super/diydom.html
new file mode 100644
index 0000000..07649d2
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/super/diydom.html
@@ -0,0 +1,177 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - addHoverDom / removeHoverDom / addDiyDom</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+
+		var IDMark_Switch = "_switch",
+		IDMark_Icon = "_ico",
+		IDMark_Span = "_span",
+		IDMark_Input = "_input",
+		IDMark_Check = "_check",
+		IDMark_Edit = "_edit",
+		IDMark_Remove = "_remove",
+		IDMark_Ul = "_ul",
+		IDMark_A = "_a";
+		
+		var setting = {
+			view: {
+				addHoverDom: addHoverDom,
+				removeHoverDom: removeHoverDom,
+				addDiyDom: addDiyDom
+			}
+		};
+
+		var zNodes =[
+			{id:1, name:"Hover DOM", open:true,
+				children:[
+					   {id:11, name:"button 1-1"},
+					   {id:12, name:"button 1-2"},
+					   {id:13, name:"select box 1-3"},
+					   {id:141, name:"text 1-4-1"},
+					   {id:142, name:"text 1-4-2"},
+					   {id:15, name:"hyperlinks 1-5"}
+
+				]},
+			{id:2, name:"General DOM", open:true,
+				children:[
+					   {id:21, name:"button 2-1"},
+					   {id:22, name:"button 2-2"},
+					   {id:23, name:"select box 2-3"},
+					   {id:24, name:"text 2-4"},
+					   {id:25, name:"hyperlinks 2-5"}
+				]}
+	 	];
+
+		function addHoverDom(treeId, treeNode) {
+			if (treeNode.parentNode && treeNode.parentNode.id!=1) return;
+			var aObj = $("#" + treeNode.tId + IDMark_A);
+			if (treeNode.id == 11) {
+				if ($("#diyBtn_"+treeNode.id).length>0) return;
+				var editStr = "<span id='diyBtn_space_" +treeNode.id+ "' >&nbsp;</span><span class='button icon03' id='diyBtn_" +treeNode.id+ "' title='"+treeNode.name+"' onfocus='this.blur();'></span>";
+				aObj.append(editStr);
+				var btn = $("#diyBtn_"+treeNode.id);
+				if (btn) btn.bind("click", function(){alert("diy Button for " + treeNode.name);});
+			} else if (treeNode.id == 12) {
+				if ($("#diyBtn_"+treeNode.id).length>0) return;
+				var editStr = "<span class='button icon04' id='diyBtn_" +treeNode.id+ "' title='"+treeNode.name+"' onfocus='this.blur();'></span>";
+				aObj.after(editStr);
+				var btn = $("#diyBtn_"+treeNode.id);
+				if (btn) btn.bind("click", function(){alert("diy Button for " + treeNode.name);});
+			} else if (treeNode.id == 13) {
+				if ($("#diyBtn_"+treeNode.id).length>0) return;
+				var editStr = "<span id='diyBtn_space_" +treeNode.id+ "' >&nbsp;</span><select class='selDemo ' id='diyBtn_" +treeNode.id+ "'><option value=1>1</option><option value=2>2</option><option value=3>3</option></select>";
+				aObj.after(editStr);
+				var btn = $("#diyBtn_"+treeNode.id);
+				if (btn) btn.bind("change", function(){alert("diy Select value="+btn.attr("value")+" for " + treeNode.name);});
+			} else if (treeNode.id == 141) {
+				if ($("#diyBtn_"+treeNode.id).length>0) return;
+				var editStr = "<span class='test' id='diyBtn_" +treeNode.id+ "'>Text Demo...</span>";
+				aObj.append(editStr);
+			} else if (treeNode.id == 142) {
+				if ($("#diyBtn_"+treeNode.id).length>0) return;
+				var editStr = "<span id='diyBtn_" +treeNode.id+ "'>Text Demo...</span>";
+				aObj.after(editStr);
+			} else if (treeNode.id == 15) {
+				if ($("#diyBtn1_"+treeNode.id).length>0) return;
+				if ($("#diyBtn2_"+treeNode.id).length>0) return;
+				var editStr = "<a id='diyBtn1_" +treeNode.id+ "' onclick='alert(1);return false;' style='margin:0 0 0 5px;'>link_1</a>" +
+					"<a id='diyBtn2_" +treeNode.id+ "' onclick='alert(2);return false;' style='margin:0 0 0 5px;'>link_2</a>";
+				aObj.append(editStr);
+			}
+		}
+
+		function removeHoverDom(treeId, treeNode) {
+			if (treeNode.parentTId && treeNode.getParentNode().id!=1) return;
+			if (treeNode.id == 15) {
+				$("#diyBtn1_"+treeNode.id).unbind().remove();
+				$("#diyBtn2_"+treeNode.id).unbind().remove();
+			} else {
+				$("#diyBtn_"+treeNode.id).unbind().remove();
+				$("#diyBtn_space_" +treeNode.id).unbind().remove();
+			}
+		}
+
+		function addDiyDom(treeId, treeNode) {
+			if (treeNode.parentNode && treeNode.parentNode.id!=2) return;
+			var aObj = $("#" + treeNode.tId + IDMark_A);
+			if (treeNode.id == 21) {
+				var editStr = "<span class='demoIcon' id='diyBtn_" +treeNode.id+ "' title='"+treeNode.name+"' onfocus='this.blur();'><span class='button icon01'></span></span>";
+				aObj.append(editStr);
+				var btn = $("#diyBtn_"+treeNode.id);
+				if (btn) btn.bind("click", function(){alert("diy Button for " + treeNode.name);});
+			} else if (treeNode.id == 22) {
+				var editStr = "<span class='demoIcon' id='diyBtn_" +treeNode.id+ "' title='"+treeNode.name+"' onfocus='this.blur();'><span class='button icon02'></span></span>";
+				aObj.after(editStr);
+				var btn = $("#diyBtn_"+treeNode.id);
+				if (btn) btn.bind("click", function(){alert("diy Button for " + treeNode.name);});
+			} else if (treeNode.id == 23) {
+				var editStr = "<select class='selDemo' id='diyBtn_" +treeNode.id+ "'><option value=1>1</option><option value=2>2</option><option value=3>3</option></select>";
+				aObj.after(editStr);
+				var btn = $("#diyBtn_"+treeNode.id);
+				if (btn) btn.bind("change", function(){alert("diy Select value="+btn.attr("value")+" for " + treeNode.name);});
+			} else if (treeNode.id == 24) {
+				var editStr = "<span id='diyBtn_" +treeNode.id+ "'>Text Demo...</span>";
+				aObj.after(editStr);
+			} else if (treeNode.id == 25) {
+				var editStr = "<a id='diyBtn1_" +treeNode.id+ "' onclick='alert(1);return false;'>链接1</a>" +
+					"<a id='diyBtn2_" +treeNode.id+ "' onclick='alert(2);return false;'>链接2</a>";
+				aObj.after(editStr);
+			}
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+.ztree li span.demoIcon{padding:0 2px 0 10px;}
+.ztree li span.button.icon01{margin:0; background: url(../../../css/zTreeStyle/img/diy/3.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon02{margin:0; background: url(../../../css/zTreeStyle/img/diy/4.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon03{margin:0; background: url(../../../css/zTreeStyle/img/diy/5.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon04{margin:0; background: url(../../../css/zTreeStyle/img/diy/6.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon05{margin:0; background: url(../../../css/zTreeStyle/img/diy/7.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.icon06{margin:0; background: url(../../../css/zTreeStyle/img/diy/8.png) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+	</style>
+ </HEAD>
+
+<BODY>
+<h1>Adding Custom DOM</h1>
+<h6>[ File Path: super/diydom.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>1, Explanation of implementation method</h2>
+				<ul class="list">
+				<li>Use 'setting.view.addHoverDom / removeHoverDom / addDiyDom' attributes can easily display custom DOM.</li>
+				<li class="highlight_red">Adding custom DOM, is important to understand zTree node object naming rules to ensure the normal controls add DOM.</li>
+				<li class="highlight_red">If you add the browser's default ’select / checkbox / radio‘ DOM, please adjust the css, to ensure correctly display zTree.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>2, Explanation of setting</h2>
+				<ul class="list">
+				<li>Set 'setting.view.addHoverDom / removeHoverDom / addDiyDom' attributes, see the API documentation for more related contents.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>3, Explanation of treeNode</h2>
+				<ul class="list">
+				<li>No special requirements on the node data, the user can add custom attributes.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/super/dragWithOther.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/super/dragWithOther.html
new file mode 100644
index 0000000..31426c3
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/super/dragWithOther.html
@@ -0,0 +1,234 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - drag with other DOM</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>-->
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var MoveTest = {
+			errorMsg: "Error!...Please drag it to the correct category!",
+			curTarget: null,
+			curTmpTarget: null,
+			noSel: function() {
+				try {
+					window.getSelection ? window.getSelection().removeAllRanges() : document.selection.empty();
+				} catch(e){}
+			},
+			dragTree2Dom: function(treeId, treeNodes) {
+				return !treeNodes[0].isParent;
+			},
+			prevTree: function(treeId, treeNodes, targetNode) {
+				return !targetNode.isParent && targetNode.parentTId == treeNodes[0].parentTId;
+			},
+			nextTree: function(treeId, treeNodes, targetNode) {
+				return !targetNode.isParent && targetNode.parentTId == treeNodes[0].parentTId;
+			},
+			innerTree: function(treeId, treeNodes, targetNode) {
+				return targetNode!=null && targetNode.isParent && targetNode.tId == treeNodes[0].parentTId;
+			},
+			dropTree2Dom: function(e, treeId, treeNodes, targetNode, moveType) {
+				var domId = "dom_" + treeNodes[0].getParentNode().id;
+				if (moveType == null && (domId == e.target.id || $(e.target).parents("#" + domId).length > 0)) {
+					var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+					zTree.removeNode(treeNodes[0]);
+
+					var newDom = $("span[domId=" + treeNodes[0].id + "]");
+					if (newDom.length > 0) {
+						newDom.removeClass("domBtn_Disabled");
+						newDom.addClass("domBtn");
+					} else {
+						$("#" + domId).append("<span class='domBtn' domId='" + treeNodes[0].id + "'>" + treeNodes[0].name + "</span>");
+					}
+					MoveTest.updateType();
+				} else if ( $(e.target).parents(".domBtnDiv").length > 0) {
+					alert(MoveTest.errorMsg);
+				}
+			},
+			dom2Tree: function(e, treeId, treeNode) {
+				var target = MoveTest.curTarget, tmpTarget = MoveTest.curTmpTarget;
+				if (!target) return;
+				var zTree = $.fn.zTree.getZTreeObj("treeDemo"), parentNode;
+				if (treeNode != null && treeNode.isParent && "dom_" + treeNode.id == target.parent().attr("id")) {
+					parentNode = treeNode;
+				} else if (treeNode != null && !treeNode.isParent && "dom_" + treeNode.getParentNode().id == target.parent().attr("id")) {
+					parentNode = treeNode.getParentNode();
+				}
+
+				if (tmpTarget) tmpTarget.remove();
+				if (!!parentNode) {
+					var nodes = zTree.addNodes(parentNode, {id:target.attr("domId"), name: target.text()});
+					zTree.selectNode(nodes[0]);
+				} else {
+					target.removeClass("domBtn_Disabled");
+					target.addClass("domBtn");
+					alert(MoveTest.errorMsg);
+				}
+				MoveTest.curTarget = null;
+				MoveTest.curTmpTarget = null;
+			},
+			updateType: function() {
+				var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+				nodes = zTree.getNodes();
+				for (var i=0, l=nodes.length; i<l; i++) {
+					var num = nodes[i].children ? nodes[i].children.length : 0;
+					nodes[i].name = nodes[i].name.replace(/ \(.*\)/gi, "") + " (" + num + ")";
+					zTree.updateNode(nodes[i]);
+				}
+			},
+			bindDom: function() {
+				$(".domBtnDiv").bind("mousedown", MoveTest.bindMouseDown);
+			},
+			bindMouseDown: function(e) {
+				var target = e.target;
+				if (target!=null && target.className=="domBtn") {
+					var doc = $(document), target = $(target),
+					docScrollTop = doc.scrollTop(),
+					docScrollLeft = doc.scrollLeft();
+					target.addClass("domBtn_Disabled");
+					target.removeClass("domBtn");
+					curDom = $("<span class='dom_tmp domBtn'>" + target.text() + "</span>");
+					curDom.appendTo("body");
+
+					curDom.css({
+						"top": (e.clientY + docScrollTop + 3) + "px",
+						"left": (e.clientX + docScrollLeft + 3) + "px"
+					});
+					MoveTest.curTarget = target;
+					MoveTest.curTmpTarget = curDom;
+
+					doc.bind("mousemove", MoveTest.bindMouseMove);
+					doc.bind("mouseup", MoveTest.bindMouseUp);
+					doc.bind("selectstart", MoveTest.docSelect);
+				}
+				if(e.preventDefault) {
+					e.preventDefault();
+				}
+			},
+			bindMouseMove: function(e) {
+				MoveTest.noSel();
+				var doc = $(document), 
+				docScrollTop = doc.scrollTop(),
+				docScrollLeft = doc.scrollLeft(),
+				tmpTarget = MoveTest.curTmpTarget;
+				if (tmpTarget) {
+					tmpTarget.css({
+						"top": (e.clientY + docScrollTop + 3) + "px",
+						"left": (e.clientX + docScrollLeft + 3) + "px"
+					});
+				}
+				return false;
+			},
+			bindMouseUp: function(e) {
+				var doc = $(document);
+				doc.unbind("mousemove", MoveTest.bindMouseMove);
+				doc.unbind("mouseup", MoveTest.bindMouseUp);
+				doc.unbind("selectstart", MoveTest.docSelect);
+
+				var target = MoveTest.curTarget, tmpTarget = MoveTest.curTmpTarget;
+				if (tmpTarget) tmpTarget.remove();
+
+				if ($(e.target).parents("#treeDemo").length == 0) {
+					if (target) {
+						target.removeClass("domBtn_Disabled");
+						target.addClass("domBtn");
+					}
+					MoveTest.curTarget = null;
+					MoveTest.curTmpTarget = null;
+				}
+			},
+			bindSelect: function() {
+				return false;
+			}
+		};
+
+		var setting = {
+			edit: {
+				enable: true,
+				showRemoveBtn: false,
+				showRenameBtn: false,
+				drag: {
+					prev: MoveTest.prevTree,
+					next: MoveTest.nextTree,
+					inner: MoveTest.innerTree
+				}
+			},
+			data: {
+				keep: {
+					parent: true,
+					leaf: true
+				},
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeDrag: MoveTest.dragTree2Dom,
+				onDrop: MoveTest.dropTree2Dom,
+				onMouseUp: MoveTest.dom2Tree
+			},
+			view: {
+				selectedMulti: false
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"PLANT", isParent: true, open:true},
+			{ id:2, pId:0, name:"ANIMAL", isParent: true, open:true},
+			{ id:20, pId:2, name:"Elephant"},
+			{ id:29, pId:2, name:"Shark"},
+			{ id:10, pId:1, name:"Cabbage"},
+			{ id:19, pId:1, name:"Tomato"}
+		];
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			MoveTest.updateType();
+			MoveTest.bindDom();
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+.dom_line {margin:2px;border-bottom:1px gray dotted;height:1px}
+.domBtnDiv {display:block;padding:2px;border:1px gray dotted;background-color:powderblue}
+.categoryDiv {display:inline-block; width:335px}
+.domBtn {display:inline-block;cursor:pointer;padding:2px;margin:2px 10px;border:1px gray solid;background-color:#FFE6B0}
+.domBtn_Disabled {display:inline-block;cursor:default;padding:2px;margin:2px 10px;border:1px gray solid;background-color:#DFDFDF;color:#999999}
+.dom_tmp {position:absolute;font-size:12px;}
+	</style>
+</HEAD>
+
+<BODY>
+<h1>Drag With Other DOMs</h1>
+<h6>[ File Path: super/dragWithOther.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>Explanation of implementation method</h2>
+				<ul class="list">
+				<li>zTree v3.2 modified the event object in onDrag/onDrop, thus the nodes can be draged to other DOMs easily.</li>
+				<li class="highlight_red">To drag other DOMS to zTree, you need to build the drag codes by yourself.</li>
+				<li class="highlight_red">This is just a simple Demo. If you need more features, please build more complicated codes.</li>
+				</ul>
+			</li>
+			<li class="title"><h2>Please drag and drop the following content to the tree node</h2>
+				<div class="domBtnDiv">
+					<div id="dom_1" class="categoryDiv"><span class="domBtn" domId="11">Tree</span><span class="domBtn" domId="12">Grass</span><span class="domBtn" domId="13">Flower</span></div>
+					<div class="dom_line"></div>
+					<div id="dom_2" class="categoryDiv"><span class="domBtn" domId="21">Tiger</span><span class="domBtn" domId="22">Bear</span><span class="domBtn" domId="23">Lion</span></div>
+				</div>
+				<span class="highlight_red">You can drag the nodes of level 2 to the above layer.</span>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/super/left_menu.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/super/left_menu.html
new file mode 100644
index 0000000..7dfe588
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/super/left_menu.html
@@ -0,0 +1,152 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - left_menu</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var curMenu = null, zTree_Menu = null;
+		var setting = {
+			view: {
+				showLine: true,
+				selectedMulti: false,
+				dblClickExpand: false
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				onNodeCreated: this.onNodeCreated,
+				beforeClick: this.beforeClick,
+				onClick: this.onClick
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"Main Menu 1", open:true},
+			{ id:11, pId:1, name:"Sub Menu 1-1"},
+			{ id:111, pId:11, name:"Leaf Node 1-1-1"},
+			{ id:112, pId:11, name:"Leaf Node 1-1-2"},
+			{ id:113, pId:11, name:"Leaf Node 1-1-3"},
+			{ id:114, pId:11, name:"Leaf Node 1-1-4"},
+			{ id:12, pId:1, name:"Sub Menu 1-2"},
+			{ id:121, pId:12, name:"Leaf Node 1-2-1"},
+			{ id:122, pId:12, name:"Leaf Node 1-2-2"},
+			{ id:123, pId:12, name:"Leaf Node 1-2-3"},
+			{ id:124, pId:12, name:"Leaf Node 1-2-4"},
+			{ id:2, pId:0, name:"Main Menu 2"},
+			{ id:21, pId:2, name:"Sub Menu 2-1"},
+			{ id:211, pId:21, name:"Leaf Node 2-1-1"},
+			{ id:212, pId:21, name:"Leaf Node 2-1-2"},
+			{ id:213, pId:21, name:"Leaf Node 2-1-3"},
+			{ id:214, pId:21, name:"Leaf Node 2-1-4"},
+			{ id:22, pId:2, name:"Sub Menu 2-2"},
+			{ id:221, pId:22, name:"Leaf Node 2-2-1"},
+			{ id:222, pId:22, name:"Leaf Node 2-2-2"},
+			{ id:223, pId:22, name:"Leaf Node 2-2-3"},
+			{ id:224, pId:22, name:"Leaf Node 2-2-4"},
+			{ id:3, pId:0, name:"Main Menu 3"},
+			{ id:31, pId:3, name:"Sub Menu 3-1"},
+			{ id:311, pId:31, name:"Leaf Node 3-1-1"},
+			{ id:312, pId:31, name:"Leaf Node 3-1-2"},
+			{ id:313, pId:31, name:"Leaf Node 3-1-3"},
+			{ id:314, pId:31, name:"Leaf Node 3-1-4"},
+			{ id:32, pId:3, name:"Sub Menu 3-2"},
+			{ id:321, pId:32, name:"Leaf Node 3-2-1"},
+			{ id:322, pId:32, name:"Leaf Node 3-2-2"},
+			{ id:323, pId:32, name:"Leaf Node 3-2-3"},
+			{ id:324, pId:32, name:"Leaf Node 3-2-4"}
+		];
+
+		function beforeClick(treeId, node) {
+			if (node.isParent) {
+				if (node.level === 0) {
+					var pNode = curMenu;
+					while (pNode && pNode.level !==0) {
+						pNode = pNode.getParentNode();
+					}
+					if (pNode !== node) {
+						var a = $("#" + pNode.tId + "_a");
+						a.removeClass("cur");
+						zTree_Menu.expandNode(pNode, false);
+					}
+					a = $("#" + node.tId + "_a");
+					a.addClass("cur");
+
+					var isOpen = false;
+					for (var i=0,l=node.children.length; i<l; i++) {
+						if(node.children[i].open) {
+							isOpen = true;
+							break;
+						}
+					}
+					if (isOpen) {
+						zTree_Menu.expandNode(node, true);
+						curMenu = node;
+					} else {
+						zTree_Menu.expandNode(node.children[0].isParent?node.children[0]:node, true);
+						curMenu = node.children[0];
+					}
+				} else {
+					zTree_Menu.expandNode(node);
+				}
+			}
+			return !node.isParent;
+		}
+		function onClick(e, treeId, node) {
+			alert("Do what you want to do!");
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			zTree_Menu = $.fn.zTree.getZTreeObj("treeDemo");
+			curMenu = zTree_Menu.getNodes()[0].children[0].children[0];
+			zTree_Menu.selectNode(curMenu);
+			var a = $("#" + zTree_Menu.getNodes()[0].tId + "_a");
+			a.addClass("cur");
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+.ztree li a.level0 {width:200px;height: 20px; text-align: center; display:block; background-color: #0B61A4; border:1px silver solid;}
+.ztree li a.level0.cur {background-color: #66A3D2; }
+.ztree li a.level0 span {display: block; color: white; padding-top:3px; font-size:12px; font-weight: bold;word-spacing: 2px;}
+.ztree li a.level0 span.button {	float:right; margin-left: 10px; visibility: visible;display:none;}
+.ztree li span.button.switch.level0 {display:none;}
+	</style>
+ </HEAD>
+
+<BODY>
+<h1>Left Menu</h1>
+<h6>[ File Path: super/left_menu.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>Explanation of implementation method</h2>
+				<ul class="list">
+				<li>The menu in the Demo's Web page is to use zTree to achieve, is to use css set interface, use the configuration 'setting' to achieve features, this demo achieve a simple example of the left menu, you can view the source code of Demo's Web Page for in-depth study.</li>
+				<li class="highlight_red">1. According to your needs to modify the css, for example: the menu style on this Demo and Demo's Web page not the same.</li>
+				<li class="highlight_red">2. Main configuration:<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;setting.view.showIcon / showLine / selectedMulti / dblClickExpand<br/>
+					&nbsp;&nbsp;&nbsp;&nbsp;setting.callback.onNodeCreated / beforeClick / onClick
+				</li>
+				<li>3. If need to keep single path, please refer to the source code of "Keep Single Path" Demo.</li>
+				<li>4. Other auxiliary rules, please write code based on your needs.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/super/left_menuForOutLook.gif b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/super/left_menuForOutLook.gif
new file mode 100644
index 0000000..c252f0f
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/super/left_menuForOutLook.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/super/left_menuForOutLook.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/super/left_menuForOutLook.html
new file mode 100644
index 0000000..8f7ddff
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/super/left_menuForOutLook.html
@@ -0,0 +1,136 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - left_menu for Outlook</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var curMenu = null, zTree_Menu = null;
+		var setting = {
+			view: {
+				showLine: false,
+				showIcon: false,
+				selectedMulti: false,
+				dblClickExpand: false,
+				addDiyDom: addDiyDom
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeClick: beforeClick
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"Folders", open:true},
+			{ id:11, pId:1, name:"Inbox"},
+			{ id:111, pId:11, name:"Inbox1"},
+			{ id:112, pId:111, name:"Inbox2"},
+			{ id:113, pId:112, name:"Inbox3"},
+			{ id:114, pId:113, name:"Inbox4"},
+			{ id:12, pId:1, name:"Junk"},
+			{ id:13, pId:1, name:"Drafts"},
+			{ id:14, pId:1, name:"Sent"},
+			{ id:15, pId:1, name:"Deleted"},
+			{ id:3, pId:0, name:"Quick views"},
+			{ id:31, pId:3, name:"Documents"},
+			{ id:32, pId:3, name:"Photos"}
+		];
+
+		function addDiyDom(treeId, treeNode) {
+			var spaceWidth = 5;
+			var switchObj = $("#" + treeNode.tId + "_switch"),
+			icoObj = $("#" + treeNode.tId + "_ico");
+			switchObj.remove();
+			icoObj.before(switchObj);
+
+			if (treeNode.level > 1) {
+				var spaceStr = "<span style='display: inline-block;width:" + (spaceWidth * treeNode.level)+ "px'></span>";
+				switchObj.before(spaceStr);
+			}
+		}
+
+		function beforeClick(treeId, treeNode) {
+			if (treeNode.level == 0 ) {
+				var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+				zTree.expandNode(treeNode);
+				return false;
+			}
+			return true;
+		}
+
+		$(document).ready(function(){
+			var treeObj = $("#treeDemo");
+			$.fn.zTree.init(treeObj, setting, zNodes);
+			zTree_Menu = $.fn.zTree.getZTreeObj("treeDemo");
+			curMenu = zTree_Menu.getNodes()[0].children[0].children[0];
+			zTree_Menu.selectNode(curMenu);
+
+			treeObj.hover(function () {
+				if (!treeObj.hasClass("showIcon")) {
+					treeObj.addClass("showIcon");
+				}
+			}, function() {
+				treeObj.removeClass("showIcon");
+			});
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+.ztree * {font-size: 10pt;font-family:"Microsoft Yahei",Verdana,Simsun,"Segoe UI Web Light","Segoe UI Light","Segoe UI Web Regular","Segoe UI","Segoe UI Symbol","Helvetica Neue",Arial}
+.ztree li ul{ margin:0; padding:0}
+.ztree li {line-height:30px;}
+.ztree li a {width:200px;height:30px;padding-top: 0px;}
+.ztree li a:hover {text-decoration:none; background-color: #E7E7E7;}
+.ztree li a span.button.switch {visibility:hidden}
+.ztree.showIcon li a span.button.switch {visibility:visible}
+.ztree li a.curSelectedNode {background-color:#D4D4D4;border:0;height:30px;}
+.ztree li span {line-height:30px;}
+.ztree li span.button {margin-top: -7px;}
+.ztree li span.button.switch {width: 16px;height: 16px;}
+
+.ztree li a.level0 span {font-size: 150%;font-weight: bold;}
+.ztree li span.button {background-image:url("./left_menuForOutLook.png"); *background-image:url("./left_menuForOutLook.gif")}
+.ztree li span.button.switch.level0 {width: 20px; height:20px}
+.ztree li span.button.switch.level1 {width: 20px; height:20px}
+.ztree li span.button.noline_open {background-position: 0 0;}
+.ztree li span.button.noline_close {background-position: -18px 0;}
+.ztree li span.button.noline_open.level0 {background-position: 0 -18px;}
+.ztree li span.button.noline_close.level0 {background-position: -18px -18px;}
+	</style>
+ </HEAD>
+
+<BODY>
+<h1>Left Menu Like OutLook Style</h1>
+<h6>[ File Path: super/left_menuForOutLook.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>Explanation of implementation method</h2>
+				<ul class="list">
+				<li>I make one left menu which resembles outlook.com, so share to everyone.</li>
+				<li class="highlight_red">1. Please note that the css code of the source of this page.</li>
+				<li class="highlight_red">2. Please note that the javascript code of the source of this page, especially the switch button is moved into the &lt;a&gt; tag  when 'addDiyDom' callback be called</li>
+				<li class="highlight_red">3. Use the method of add zTree class name to implement the switch button be hidden or showing.</li>
+				<li>4. Other auxiliary rules, please write code based on your needs.</li>
+				<li>5. The current rule description:<br/>
+				&nbsp;&nbsp;Click the root node can control the parent node be expanded or collapsed;<br/>
+				&nbsp;&nbsp;The parent nodes without root only are only clicked the arrow icon can control be expanded or  collapsed;br/>
+				</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/super/left_menuForOutLook.png b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/super/left_menuForOutLook.png
new file mode 100644
index 0000000..36e8acf
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/super/left_menuForOutLook.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/super/oneclick.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/super/oneclick.html
new file mode 100644
index 0000000..9679ec3
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/super/oneclick.html
@@ -0,0 +1,87 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - one click</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				dblClickExpand: false,
+				showLine: false
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				onClick: onClick
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"Root", open:true},
+			{ id:11, pId:1, name:"Parent Node 1-1", open:true},
+			{ id:111, pId:11, name:"Leaf Node 1-1-1"},
+			{ id:112, pId:11, name:"Leaf Node 1-1-2"},
+			{ id:113, pId:11, name:"Leaf Node 1-1-3"},
+			{ id:114, pId:11, name:"Leaf Node 1-1-4"},
+			{ id:12, pId:1, name:"Parent Node 1-2", open:true},
+			{ id:121, pId:12, name:"Leaf Node 1-2-1"},
+			{ id:122, pId:12, name:"Leaf Node 1-2-2"},
+			{ id:123, pId:12, name:"Leaf Node 1-2-3"},
+			{ id:124, pId:12, name:"Leaf Node 1-2-4"},
+			{ id:13, pId:1, name:"Parent Node 1-3", open:true},
+			{ id:131, pId:13, name:"Leaf Node 1-3-1"},
+			{ id:132, pId:13, name:"Leaf Node 1-3-2"},
+			{ id:133, pId:13, name:"Leaf Node 1-3-3"},
+			{ id:134, pId:13, name:"Leaf Node 1-3-4"}
+		];
+
+		function onClick(e,treeId, treeNode) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			zTree.expandNode(treeNode);
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+.ztree li button.switch {visibility:hidden; width:1px;}
+.ztree li button.switch.roots_docu {visibility:visible; width:16px;}
+.ztree li button.switch.center_docu {visibility:visible; width:16px;}
+.ztree li button.switch.bottom_docu {visibility:visible; width:16px;}
+	</style>
+ </HEAD>
+
+<BODY>
+<h1>Click to Expand Node</h1>
+<h6>[ File Path: super/oneclick.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>Explanation of implementation method</h2>
+				<ul class="list">
+				<li>zTree not provide a default click to expand node feature, but can use the onClick callback functions to easily implement this feature.</li>
+				<li class="highlight_red">In order to avoid conflict with the double-clicking, I recommended to turn off double-clicking expand node function, please set setting.view.dblClickExpand = false</li>
+				<li class="highlight_red">You can hide all the +/- switch, please see the page source, see the css.</li>
+				<li class="highlight_red">If you do not show + / - switch, then please set 'setting.view.showLine = false' to hide line.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/super/oneroot.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/super/oneroot.html
new file mode 100644
index 0000000..9d7eb53
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/super/oneroot.html
@@ -0,0 +1,79 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - one root</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				dblClickExpand: dblClickExpand
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			}
+		};
+
+		var zNodes =[
+			{ id:1, pId:0, name:"Root", open:true},
+			{ id:11, pId:1, name:"Parent Node 1-1", open:true},
+			{ id:111, pId:11, name:"Leaf Node 1-1-1"},
+			{ id:112, pId:11, name:"Leaf Node 1-1-2"},
+			{ id:113, pId:11, name:"Leaf Node 1-1-3"},
+			{ id:114, pId:11, name:"Leaf Node 1-1-4"},
+			{ id:12, pId:1, name:"Parent Node 1-2", open:true},
+			{ id:121, pId:12, name:"Leaf Node 1-2-1"},
+			{ id:122, pId:12, name:"Leaf Node 1-2-2"},
+			{ id:123, pId:12, name:"Leaf Node 1-2-3"},
+			{ id:124, pId:12, name:"Leaf Node 1-2-4"},
+			{ id:13, pId:1, name:"Parent Node 1-3", open:true},
+			{ id:131, pId:13, name:"Leaf Node 1-3-1"},
+			{ id:132, pId:13, name:"Leaf Node 1-3-2"},
+			{ id:133, pId:13, name:"Leaf Node 1-3-3"},
+			{ id:134, pId:13, name:"Leaf Node 1-3-4"}
+		];
+
+		function dblClickExpand(treeId, treeNode) {
+			return treeNode.level > 0;
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+.ztree li span.button.switch.level0 {visibility:hidden; width:1px;}
+.ztree li ul.level0 {padding:0; background:none;}
+	</style>
+ </HEAD>
+
+<BODY>
+<h1>Freeze the Root Node</h1>
+<h6>[ File Path: demo/super/oneroot.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>Explanation of implementation method</h2>
+				<ul class="list">
+				<li>For only one root, and do not show +/- switch needs need to modify the css, and set the setting.</li>
+				<li class="highlight_red">zTree v3.x can be for a given level, set the style, check out the page source, see the css.</li>
+				<li class="highlight_red">Set setting.view.dblClickExpand to Function, you can turn off double-clicking for expand the root node.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/super/rightClickMenu.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/super/rightClickMenu.html
new file mode 100644
index 0000000..06e640c
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/super/rightClickMenu.html
@@ -0,0 +1,168 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - select menu</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				dblClickExpand: false
+			},
+			check: {
+				enable: true
+			},
+			callback: {
+				onRightClick: OnRightClick
+			}
+		};
+
+		var zNodes =[
+			{id:1, name:"No right-click menu 1", open:true, noR:true,
+				children:[
+					   {id:11, name:"Leaf Node 1-1", noR:true},
+					   {id:12, name:"Leaf Node 1-2", noR:true}
+
+				]},
+			{id:2, name:"Right-click 2", open:true,
+				children:[
+					   {id:21, name:"Leaf Node 2-1"},
+					   {id:22, name:"Leaf Node 2-2"},
+					   {id:23, name:"Leaf Node 2-3"},
+					   {id:24, name:"Leaf Node 2-4"}
+				]},
+			{id:3, name:"Right-click 3", open:true,
+				children:[
+					   {id:31, name:"Leaf Node 3-1"},
+					   {id:32, name:"Leaf Node 3-2"},
+					   {id:33, name:"Leaf Node 3-3"},
+					   {id:34, name:"Leaf Node 3-4"}
+				]}
+  	 	];
+
+		function OnRightClick(event, treeId, treeNode) {
+			if (!treeNode && event.target.tagName.toLowerCase() != "button" && $(event.target).parents("a").length == 0) {
+				zTree.cancelSelectedNode();
+				showRMenu("root", event.clientX, event.clientY);
+			} else if (treeNode && !treeNode.noR) {
+				zTree.selectNode(treeNode);
+				showRMenu("node", event.clientX, event.clientY);
+			}
+		}
+
+		function showRMenu(type, x, y) {
+			$("#rMenu ul").show();
+			if (type=="root") {
+				$("#m_del").hide();
+				$("#m_check").hide();
+				$("#m_unCheck").hide();
+			} else {
+				$("#m_del").show();
+				$("#m_check").show();
+				$("#m_unCheck").show();
+			}
+			rMenu.css({"top":y+"px", "left":x+"px", "visibility":"visible"});
+
+			$("body").bind("mousedown", onBodyMouseDown);
+		}
+		function hideRMenu() {
+			if (rMenu) rMenu.css({"visibility": "hidden"});
+			$("body").unbind("mousedown", onBodyMouseDown);
+		}
+		function onBodyMouseDown(event){
+			if (!(event.target.id == "rMenu" || $(event.target).parents("#rMenu").length>0)) {
+				rMenu.css({"visibility" : "hidden"});
+			}
+		}
+		var addCount = 1;
+		function addTreeNode() {
+			hideRMenu();
+			var newNode = { name:"newNode " + (addCount++)};
+			if (zTree.getSelectedNodes()[0]) {
+				newNode.checked = zTree.getSelectedNodes()[0].checked;
+				zTree.addNodes(zTree.getSelectedNodes()[0], newNode);
+			} else {
+				zTree.addNodes(null, newNode);
+			}
+		}
+		function removeTreeNode() {
+			hideRMenu();
+			var nodes = zTree.getSelectedNodes();
+			if (nodes && nodes.length>0) {
+				if (nodes[0].children && nodes[0].children.length > 0) {
+					var msg = "If you delete this node will be deleted along with sub-nodes. \n\nPlease confirm!";
+					if (confirm(msg)==true){
+						zTree.removeNode(nodes[0]);
+					}
+				} else {
+					zTree.removeNode(nodes[0]);
+				}
+			}
+		}
+		function checkTreeNode(checked) {
+			var nodes = zTree.getSelectedNodes();
+			if (nodes && nodes.length>0) {
+				zTree.checkNode(nodes[0], checked, true);
+			}
+			hideRMenu();
+		}
+		function resetTree() {
+			hideRMenu();
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		}
+
+		var zTree, rMenu;
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+			zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			rMenu = $("#rMenu");
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+div#rMenu {position:absolute; visibility:hidden; top:0; background-color: #555;text-align: left;padding: 2px;}
+div#rMenu ul li{
+	margin: 1px 0;
+	padding: 0 5px;
+	cursor: pointer;
+	list-style: none outside none;
+	background-color: #DFDFDF;
+}
+	</style>
+ </HEAD>
+
+<BODY>
+<h1>Right-click Menu</h1>
+<h6>[ File Path: super/rightClickMenu.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>Explanation of implementation method</h2>
+				<ul class="list">
+				<li>Use 'beforeRightClick / onRightClick' callback function achieve right-click menu.</li>
+				<li class="highlight_red">Demo's menu is ugly, you can use a custom menu fine style.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+<div id="rMenu">
+	<ul>
+		<li id="m_add" onclick="addTreeNode();">Add Node</li>
+		<li id="m_del" onclick="removeTreeNode();">Delete Node</li>
+		<li id="m_check" onclick="checkTreeNode(true);">Check Node</li>
+		<li id="m_unCheck" onclick="checkTreeNode(false);">Uncheck Node</li>
+		<li id="m_reset" onclick="resetTree();">Resume zTree</li>
+	</ul>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/super/select_menu.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/super/select_menu.html
new file mode 100644
index 0000000..6423f6e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/super/select_menu.html
@@ -0,0 +1,124 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - select menu</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				dblClickExpand: false
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeClick: beforeClick,
+				onClick: onClick
+			}
+		};
+
+		var zNodes =[
+			{id:1, pId:0, name:"Beijing"},
+			{id:2, pId:0, name:"Tianjin"},
+			{id:3, pId:0, name:"Shanghai"},
+			{id:6, pId:0, name:"Chongqing"},
+			{id:4, pId:0, name:"Hebei Province", open:true},
+			{id:41, pId:4, name:"Shijiazhuang"},
+			{id:42, pId:4, name:"Baoding"},
+			{id:43, pId:4, name:"Handan"},
+			{id:44, pId:4, name:"Chengde"},
+			{id:5, pId:0, name:"Guangdong Province", open:true},
+			{id:51, pId:5, name:"Guangzhou"},
+			{id:52, pId:5, name:"Shenzhen"},
+			{id:53, pId:5, name:"Dongguan"},
+			{id:54, pId:5, name:"Fushan"},
+			{id:6, pId:0, name:"Fujian Province", open:true},
+			{id:61, pId:6, name:"Fuzhou"},
+			{id:62, pId:6, name:"Xiamen"},
+			{id:63, pId:6, name:"Quanzhou"},
+			{id:64, pId:6, name:"Sanming"}
+		 ];
+
+		function beforeClick(treeId, treeNode) {
+			var check = (treeNode && !treeNode.isParent);
+			if (!check) alert("Do not select province...");
+			return check;
+		}
+		
+		function onClick(e, treeId, treeNode) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nodes = zTree.getSelectedNodes(),
+			v = "";
+			nodes.sort(function compare(a,b){return a.id-b.id;});
+			for (var i=0, l=nodes.length; i<l; i++) {
+				v += nodes[i].name + ",";
+			}
+			if (v.length > 0 ) v = v.substring(0, v.length-1);
+			var cityObj = $("#citySel");
+			cityObj.attr("value", v);
+		}
+
+		function showMenu() {
+			var cityObj = $("#citySel");
+			var cityOffset = $("#citySel").offset();
+			$("#menuContent").css({left:cityOffset.left + "px", top:cityOffset.top + cityObj.outerHeight() + "px"}).slideDown("fast");
+
+			$("body").bind("mousedown", onBodyDown);
+		}
+		function hideMenu() {
+			$("#menuContent").fadeOut("fast");
+			$("body").unbind("mousedown", onBodyDown);
+		}
+		function onBodyDown(event) {
+			if (!(event.target.id == "menuBtn" || event.target.id == "menuContent" || $(event.target).parents("#menuContent").length>0)) {
+				hideMenu();
+			}
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+	</style>
+ </HEAD>
+
+<BODY>
+<h1>Drop-down Menu</h1>
+<h6>[ File Path: super/select_menu.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul class="list">
+			<li class="title">&nbsp;&nbsp;<span class="highlight_red">Press Ctrl key to select multiple cities</span></li>
+			<li class="title">&nbsp;&nbsp;city: <input id="citySel" type="text" readonly value="" style="width:120px;"/>
+		&nbsp;<a id="menuBtn" href="#" onclick="showMenu(); return false;">select</a></li>
+		</ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>Explanation of implementation method</h2>
+				<ul class="list">
+				<li>Achieve this drop-down menu, it is relatively easy, you only need to control zTree Hide / Show, and location.</li>
+				<li class="highlight_red">Use zTree v3.x, you can select multiple nodes, so the multi-selection is also easy.</li>
+				<li class="highlight_red">Use the configuration parameters setting, fully meet the needs of most of the functionality.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+
+<div id="menuContent" class="menuContent" style="display:none; position: absolute;">
+	<ul id="treeDemo" class="ztree" style="margin-top:0; width:160px;"></ul>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/super/select_menu_checkbox.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/super/select_menu_checkbox.html
new file mode 100644
index 0000000..06b50d2
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/super/select_menu_checkbox.html
@@ -0,0 +1,126 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - checkbox select menu</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+<!--	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			check: {
+				enable: true,
+				chkboxType: {"Y":"", "N":""}
+			},
+			view: {
+				dblClickExpand: false
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeClick: beforeClick,
+				onCheck: onCheck
+			}
+		};
+
+		var zNodes =[
+			{id:1, pId:0, name:"Beijing"},
+			{id:2, pId:0, name:"Tianjin"},
+			{id:3, pId:0, name:"Shanghai"},
+			{id:6, pId:0, name:"Chongqing"},
+			{id:4, pId:0, name:"Hebei Province", open:true},
+			{id:41, pId:4, name:"Shijiazhuang"},
+			{id:42, pId:4, name:"Baoding"},
+			{id:43, pId:4, name:"Handan"},
+			{id:44, pId:4, name:"Chengde"},
+			{id:5, pId:0, name:"Guangdong Province", open:true},
+			{id:51, pId:5, name:"Guangzhou"},
+			{id:52, pId:5, name:"Shenzhen"},
+			{id:53, pId:5, name:"Dongguan"},
+			{id:54, pId:5, name:"Fushan"},
+			{id:6, pId:0, name:"Fujian Province", open:true},
+			{id:61, pId:6, name:"Fuzhou"},
+			{id:62, pId:6, name:"Xiamen"},
+			{id:63, pId:6, name:"Quanzhou"},
+			{id:64, pId:6, name:"Sanming"}
+		 ];
+
+		function beforeClick(treeId, treeNode) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			zTree.checkNode(treeNode, !treeNode.checked, null, true);
+			return false;
+		}
+		
+		function onCheck(e, treeId, treeNode) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nodes = zTree.getCheckedNodes(true),
+			v = "";
+			for (var i=0, l=nodes.length; i<l; i++) {
+				v += nodes[i].name + ",";
+			}
+			if (v.length > 0 ) v = v.substring(0, v.length-1);
+			var cityObj = $("#citySel");
+			cityObj.attr("value", v);
+		}
+
+		function showMenu() {
+			var cityObj = $("#citySel");
+			var cityOffset = $("#citySel").offset();
+			$("#menuContent").css({left:cityOffset.left + "px", top:cityOffset.top + cityObj.outerHeight() + "px"}).slideDown("fast");
+
+			$("body").bind("mousedown", onBodyDown);
+		}
+		function hideMenu() {
+			$("#menuContent").fadeOut("fast");
+			$("body").unbind("mousedown", onBodyDown);
+		}
+		function onBodyDown(event) {
+			if (!(event.target.id == "menuBtn" || event.target.id == "citySel" || event.target.id == "menuContent" || $(event.target).parents("#menuContent").length>0)) {
+				hideMenu();
+			}
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+	</style>
+ </HEAD>
+
+<BODY>
+<h1>Drop-down Menu with checkbox</h1>
+<h6>[ File Path: super/select_menu_checkbox.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul class="list">
+			<li class="title">&nbsp;&nbsp;<span class="highlight_red">Check the checkbox to select or click the node</span></li>
+			<li class="title">&nbsp;&nbsp;Test: <input id="citySel" type="text" readonly value="" style="width:120px;" onclick="showMenu();" />
+		&nbsp;<a id="menuBtn" href="#" onclick="showMenu(); return false;">select</a></li>
+		</ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>Explanation of implementation method</h2>
+				<ul class="list">
+				<li>You can achieve multi-selected drop-down menu with checkbox.</li>
+				<li>This Demo is mainly used for compare with other drop-down menu.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+
+<div id="menuContent" class="menuContent" style="display:none; position: absolute;">
+	<ul id="treeDemo" class="ztree" style="margin-top:0; width:180px; height: 300px;"></ul>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/super/select_menu_radio.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/super/select_menu_radio.html
new file mode 100644
index 0000000..7e9e9d1
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/super/select_menu_radio.html
@@ -0,0 +1,127 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - radio select menu</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+<!--	<script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			check: {
+				enable: true,
+				chkStyle: "radio",
+				radioType: "all"
+			},
+			view: {
+				dblClickExpand: false
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				onClick: onClick,
+				onCheck: onCheck
+			}
+		};
+
+		var zNodes =[
+			{id:1, pId:0, name:"Beijing"},
+			{id:2, pId:0, name:"Tianjin"},
+			{id:3, pId:0, name:"Shanghai"},
+			{id:6, pId:0, name:"Chongqing"},
+			{id:4, pId:0, name:"Hebei Province", open:true},
+			{id:41, pId:4, name:"Shijiazhuang"},
+			{id:42, pId:4, name:"Baoding"},
+			{id:43, pId:4, name:"Handan"},
+			{id:44, pId:4, name:"Chengde"},
+			{id:5, pId:0, name:"Guangdong Province", open:true},
+			{id:51, pId:5, name:"Guangzhou"},
+			{id:52, pId:5, name:"Shenzhen"},
+			{id:53, pId:5, name:"Dongguan"},
+			{id:54, pId:5, name:"Fushan"},
+			{id:6, pId:0, name:"Fujian Province", open:true},
+			{id:61, pId:6, name:"Fuzhou"},
+			{id:62, pId:6, name:"Xiamen"},
+			{id:63, pId:6, name:"Quanzhou"},
+			{id:64, pId:6, name:"Sanming"}
+		 ];
+
+		function onClick(e, treeId, treeNode) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			zTree.checkNode(treeNode, !treeNode.checked, null, true);
+			return false;
+		}
+
+		function onCheck(e, treeId, treeNode) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo"),
+			nodes = zTree.getCheckedNodes(true),
+			v = "";
+			for (var i=0, l=nodes.length; i<l; i++) {
+				v += nodes[i].name + ",";
+			}
+			if (v.length > 0 ) v = v.substring(0, v.length-1);
+			var cityObj = $("#citySel");
+			cityObj.attr("value", v);
+		}
+
+		function showMenu() {
+			var cityObj = $("#citySel");
+			var cityOffset = $("#citySel").offset();
+			$("#menuContent").css({left:cityOffset.left + "px", top:cityOffset.top + cityObj.outerHeight() + "px"}).slideDown("fast");
+
+			$("body").bind("mousedown", onBodyDown);
+		}
+		function hideMenu() {
+			$("#menuContent").fadeOut("fast");
+			$("body").unbind("mousedown", onBodyDown);
+		}
+		function onBodyDown(event) {
+			if (!(event.target.id == "menuBtn" || event.target.id == "citySel" || event.target.id == "menuContent" || $(event.target).parents("#menuContent").length>0)) {
+				hideMenu();
+			}
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+	</style>
+ </HEAD>
+
+<BODY>
+<h1>Drop-down Menu with radio</h1>
+<h6>[ File Path: super/select_menu_radio.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul class="list">
+			<li class="title">&nbsp;&nbsp;<span class="highlight_red">Check the radio to select or click the node</span></li>
+			<li class="title">&nbsp;&nbsp;Test: <input id="citySel" type="text" readonly value="" style="width:120px;" onclick="showMenu();" />
+		&nbsp;<a id="menuBtn" href="#" onclick="showMenu(); return false;">select</a></li>
+		</ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>Explanation of implementation method</h2>
+				<ul class="list">
+				<li>You can achieve single-selected drop-down menu with radio.</li>
+				<li>This Demo is mainly used for compare with other drop-down menu.</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+
+<div id="menuContent" class="menuContent" style="display:none; position: absolute;">
+	<ul id="treeDemo" class="ztree" style="margin-top:0; width:180px; height: 300px;"></ul>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/super/singlepath.html b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/super/singlepath.html
new file mode 100644
index 0000000..f48499d
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/demo/en/super/singlepath.html
@@ -0,0 +1,150 @@
+<!DOCTYPE html>
+<HTML>
+<HEAD>
+	<TITLE> ZTREE DEMO - single path</TITLE>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../css/demo.css" type="text/css">
+	<link rel="stylesheet" href="../../../css/zTreeStyle/zTreeStyle.css" type="text/css">
+	<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+	<script type="text/javascript" src="../../../js/jquery.ztree.core-3.5.js"></script>
+	<!--  <script type="text/javascript" src="../../../js/jquery.ztree.excheck-3.5.js"></script>
+	  <script type="text/javascript" src="../../../js/jquery.ztree.exedit-3.5.js"></script>-->
+	<SCRIPT type="text/javascript">
+		<!--
+		var setting = {
+			view: {
+				dblClickExpand: false,
+				showLine: false
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				beforeExpand: beforeExpand,
+				onExpand: onExpand,
+				onClick: onClick
+			}
+		};
+
+				function createNodes(maxNodesNumInLevel, maxLevel, curLevel, curPId) {
+			if (maxNodesNumInLevel<5) {
+				maxNodesNumInLevel = 5;
+			}
+			var nodes = [], num = 0;
+			while(num<3) {
+				num = parseInt(Math.random()*1024)%maxNodesNumInLevel+1;
+			}
+			for (var i=0; i<num; i++) {
+				var id = curPId ? curPId + "-" + i : "" + i, isParent = (parseInt(Math.random()*9999)%3!=0),
+				node = {id: id, pId : curPId, name : "N" + id};
+				nodes.push(node);
+				if (isParent && curLevel<maxLevel) {
+					nodes = nodes.concat(createNodes(maxNodesNumInLevel, maxLevel, curLevel+1, id));
+				}
+			}
+			return nodes;
+		}
+		var zNodes =createNodes(5, 5, 0);
+
+		var curExpandNode = null;
+		function beforeExpand(treeId, treeNode) {
+			var pNode = curExpandNode ? curExpandNode.getParentNode():null;
+			var treeNodeP = treeNode.parentTId ? treeNode.getParentNode():null;
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			for(var i=0, l=!treeNodeP ? 0:treeNodeP.children.length; i<l; i++ ) {
+				if (treeNode !== treeNodeP.children[i]) {
+					zTree.expandNode(treeNodeP.children[i], false);
+				}
+			}
+			while (pNode) {
+				if (pNode === treeNode) {
+					break;
+				}
+				pNode = pNode.getParentNode();
+			}
+			if (!pNode) {
+				singlePath(treeNode);
+			}
+
+		}
+		function singlePath(newNode) {
+			if (newNode === curExpandNode) return;
+			if (curExpandNode && curExpandNode.open==true) {
+				var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+				if (newNode.parentTId === curExpandNode.parentTId) {
+					zTree.expandNode(curExpandNode, false);
+				} else {
+					var newParents = [];
+					while (newNode) {
+						newNode = newNode.getParentNode();
+						if (newNode === curExpandNode) {
+							newParents = null;
+							break;
+						} else if (newNode) {
+							newParents.push(newNode);
+						}
+					}
+					if (newParents!=null) {
+						var oldNode = curExpandNode;
+						var oldParents = [];
+						while (oldNode) {
+							oldNode = oldNode.getParentNode();
+							if (oldNode) {
+								oldParents.push(oldNode);
+							}
+						}
+						if (newParents.length>0) {
+							zTree.expandNode(oldParents[Math.abs(oldParents.length-newParents.length)-1], false);
+						} else {
+							zTree.expandNode(oldParents[oldParents.length-1], false);
+						}
+					}
+				}
+			}
+			curExpandNode = newNode;
+		}
+
+		function onExpand(event, treeId, treeNode) {
+			curExpandNode = treeNode;
+		}
+
+		function onClick(e,treeId, treeNode) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			zTree.expandNode(treeNode, null, null, null, true);
+		}
+
+		$(document).ready(function(){
+			$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+		});
+		//-->
+	</SCRIPT>
+	<style type="text/css">
+.ztree li button.switch {visibility:hidden; width:1px;}
+.ztree li button.switch.roots_docu {visibility:visible; width:16px;}
+.ztree li button.switch.center_docu {visibility:visible; width:16px;}
+.ztree li button.switch.bottom_docu {visibility:visible; width:16px;}
+	</style>
+ </HEAD>
+
+<BODY>
+<h1>Keep Single Path</h1>
+<h6>[ File Path: super/singlepath.html ]</h6>
+<div class="content_wrap">
+	<div class="zTreeDemoBackground left">
+		<ul id="treeDemo" class="ztree"></ul>
+	</div>
+	<div class="right">
+		<ul class="info">
+			<li class="title"><h2>Explanation of implementation method</h2>
+				<ul class="list">
+				<li>This Demo is the transformation from "Click to Expand Node" demo​​, tree only expand single path.</li>
+				<li class="highlight_red">Use 'setting.callback.beforeExpand / onExpand' callback function to achieve rules about expand </li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/js/jquery-1.4.4.min.js b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/js/jquery-1.4.4.min.js
new file mode 100644
index 0000000..8f3ca2e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/js/jquery-1.4.4.min.js
@@ -0,0 +1,167 @@
+/*!
+ * jQuery JavaScript Library v1.4.4
+ * http://jquery.com/
+ *
+ * Copyright 2010, John Resig
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * Includes Sizzle.js
+ * http://sizzlejs.com/
+ * Copyright 2010, The Dojo Foundation
+ * Released under the MIT, BSD, and GPL Licenses.
+ *
+ * Date: Thu Nov 11 19:04:53 2010 -0500
+ */
+(function(E,B){function ka(a,b,d){if(d===B&&a.nodeType===1){d=a.getAttribute("data-"+b);if(typeof d==="string"){try{d=d==="true"?true:d==="false"?false:d==="null"?null:!c.isNaN(d)?parseFloat(d):Ja.test(d)?c.parseJSON(d):d}catch(e){}c.data(a,b,d)}else d=B}return d}function U(){return false}function ca(){return true}function la(a,b,d){d[0].type=a;return c.event.handle.apply(b,d)}function Ka(a){var b,d,e,f,h,l,k,o,x,r,A,C=[];f=[];h=c.data(this,this.nodeType?"events":"__events__");if(typeof h==="function")h=
+h.events;if(!(a.liveFired===this||!h||!h.live||a.button&&a.type==="click")){if(a.namespace)A=RegExp("(^|\\.)"+a.namespace.split(".").join("\\.(?:.*\\.)?")+"(\\.|$)");a.liveFired=this;var J=h.live.slice(0);for(k=0;k<J.length;k++){h=J[k];h.origType.replace(X,"")===a.type?f.push(h.selector):J.splice(k--,1)}f=c(a.target).closest(f,a.currentTarget);o=0;for(x=f.length;o<x;o++){r=f[o];for(k=0;k<J.length;k++){h=J[k];if(r.selector===h.selector&&(!A||A.test(h.namespace))){l=r.elem;e=null;if(h.preType==="mouseenter"||
+h.preType==="mouseleave"){a.type=h.preType;e=c(a.relatedTarget).closest(h.selector)[0]}if(!e||e!==l)C.push({elem:l,handleObj:h,level:r.level})}}}o=0;for(x=C.length;o<x;o++){f=C[o];if(d&&f.level>d)break;a.currentTarget=f.elem;a.data=f.handleObj.data;a.handleObj=f.handleObj;A=f.handleObj.origHandler.apply(f.elem,arguments);if(A===false||a.isPropagationStopped()){d=f.level;if(A===false)b=false;if(a.isImmediatePropagationStopped())break}}return b}}function Y(a,b){return(a&&a!=="*"?a+".":"")+b.replace(La,
+"`").replace(Ma,"&")}function ma(a,b,d){if(c.isFunction(b))return c.grep(a,function(f,h){return!!b.call(f,h,f)===d});else if(b.nodeType)return c.grep(a,function(f){return f===b===d});else if(typeof b==="string"){var e=c.grep(a,function(f){return f.nodeType===1});if(Na.test(b))return c.filter(b,e,!d);else b=c.filter(b,e)}return c.grep(a,function(f){return c.inArray(f,b)>=0===d})}function na(a,b){var d=0;b.each(function(){if(this.nodeName===(a[d]&&a[d].nodeName)){var e=c.data(a[d++]),f=c.data(this,
+e);if(e=e&&e.events){delete f.handle;f.events={};for(var h in e)for(var l in e[h])c.event.add(this,h,e[h][l],e[h][l].data)}}})}function Oa(a,b){b.src?c.ajax({url:b.src,async:false,dataType:"script"}):c.globalEval(b.text||b.textContent||b.innerHTML||"");b.parentNode&&b.parentNode.removeChild(b)}function oa(a,b,d){var e=b==="width"?a.offsetWidth:a.offsetHeight;if(d==="border")return e;c.each(b==="width"?Pa:Qa,function(){d||(e-=parseFloat(c.css(a,"padding"+this))||0);if(d==="margin")e+=parseFloat(c.css(a,
+"margin"+this))||0;else e-=parseFloat(c.css(a,"border"+this+"Width"))||0});return e}function da(a,b,d,e){if(c.isArray(b)&&b.length)c.each(b,function(f,h){d||Ra.test(a)?e(a,h):da(a+"["+(typeof h==="object"||c.isArray(h)?f:"")+"]",h,d,e)});else if(!d&&b!=null&&typeof b==="object")c.isEmptyObject(b)?e(a,""):c.each(b,function(f,h){da(a+"["+f+"]",h,d,e)});else e(a,b)}function S(a,b){var d={};c.each(pa.concat.apply([],pa.slice(0,b)),function(){d[this]=a});return d}function qa(a){if(!ea[a]){var b=c("<"+
+a+">").appendTo("body"),d=b.css("display");b.remove();if(d==="none"||d==="")d="block";ea[a]=d}return ea[a]}function fa(a){return c.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:false}var t=E.document,c=function(){function a(){if(!b.isReady){try{t.documentElement.doScroll("left")}catch(j){setTimeout(a,1);return}b.ready()}}var b=function(j,s){return new b.fn.init(j,s)},d=E.jQuery,e=E.$,f,h=/^(?:[^<]*(<[\w\W]+>)[^>]*$|#([\w\-]+)$)/,l=/\S/,k=/^\s+/,o=/\s+$/,x=/\W/,r=/\d/,A=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,
+C=/^[\],:{}\s]*$/,J=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,w=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,I=/(?:^|:|,)(?:\s*\[)+/g,L=/(webkit)[ \/]([\w.]+)/,g=/(opera)(?:.*version)?[ \/]([\w.]+)/,i=/(msie) ([\w.]+)/,n=/(mozilla)(?:.*? rv:([\w.]+))?/,m=navigator.userAgent,p=false,q=[],u,y=Object.prototype.toString,F=Object.prototype.hasOwnProperty,M=Array.prototype.push,N=Array.prototype.slice,O=String.prototype.trim,D=Array.prototype.indexOf,R={};b.fn=b.prototype={init:function(j,
+s){var v,z,H;if(!j)return this;if(j.nodeType){this.context=this[0]=j;this.length=1;return this}if(j==="body"&&!s&&t.body){this.context=t;this[0]=t.body;this.selector="body";this.length=1;return this}if(typeof j==="string")if((v=h.exec(j))&&(v[1]||!s))if(v[1]){H=s?s.ownerDocument||s:t;if(z=A.exec(j))if(b.isPlainObject(s)){j=[t.createElement(z[1])];b.fn.attr.call(j,s,true)}else j=[H.createElement(z[1])];else{z=b.buildFragment([v[1]],[H]);j=(z.cacheable?z.fragment.cloneNode(true):z.fragment).childNodes}return b.merge(this,
+j)}else{if((z=t.getElementById(v[2]))&&z.parentNode){if(z.id!==v[2])return f.find(j);this.length=1;this[0]=z}this.context=t;this.selector=j;return this}else if(!s&&!x.test(j)){this.selector=j;this.context=t;j=t.getElementsByTagName(j);return b.merge(this,j)}else return!s||s.jquery?(s||f).find(j):b(s).find(j);else if(b.isFunction(j))return f.ready(j);if(j.selector!==B){this.selector=j.selector;this.context=j.context}return b.makeArray(j,this)},selector:"",jquery:"1.4.4",length:0,size:function(){return this.length},
+toArray:function(){return N.call(this,0)},get:function(j){return j==null?this.toArray():j<0?this.slice(j)[0]:this[j]},pushStack:function(j,s,v){var z=b();b.isArray(j)?M.apply(z,j):b.merge(z,j);z.prevObject=this;z.context=this.context;if(s==="find")z.selector=this.selector+(this.selector?" ":"")+v;else if(s)z.selector=this.selector+"."+s+"("+v+")";return z},each:function(j,s){return b.each(this,j,s)},ready:function(j){b.bindReady();if(b.isReady)j.call(t,b);else q&&q.push(j);return this},eq:function(j){return j===
+-1?this.slice(j):this.slice(j,+j+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(N.apply(this,arguments),"slice",N.call(arguments).join(","))},map:function(j){return this.pushStack(b.map(this,function(s,v){return j.call(s,v,s)}))},end:function(){return this.prevObject||b(null)},push:M,sort:[].sort,splice:[].splice};b.fn.init.prototype=b.fn;b.extend=b.fn.extend=function(){var j,s,v,z,H,G=arguments[0]||{},K=1,Q=arguments.length,ga=false;
+if(typeof G==="boolean"){ga=G;G=arguments[1]||{};K=2}if(typeof G!=="object"&&!b.isFunction(G))G={};if(Q===K){G=this;--K}for(;K<Q;K++)if((j=arguments[K])!=null)for(s in j){v=G[s];z=j[s];if(G!==z)if(ga&&z&&(b.isPlainObject(z)||(H=b.isArray(z)))){if(H){H=false;v=v&&b.isArray(v)?v:[]}else v=v&&b.isPlainObject(v)?v:{};G[s]=b.extend(ga,v,z)}else if(z!==B)G[s]=z}return G};b.extend({noConflict:function(j){E.$=e;if(j)E.jQuery=d;return b},isReady:false,readyWait:1,ready:function(j){j===true&&b.readyWait--;
+if(!b.readyWait||j!==true&&!b.isReady){if(!t.body)return setTimeout(b.ready,1);b.isReady=true;if(!(j!==true&&--b.readyWait>0))if(q){var s=0,v=q;for(q=null;j=v[s++];)j.call(t,b);b.fn.trigger&&b(t).trigger("ready").unbind("ready")}}},bindReady:function(){if(!p){p=true;if(t.readyState==="complete")return setTimeout(b.ready,1);if(t.addEventListener){t.addEventListener("DOMContentLoaded",u,false);E.addEventListener("load",b.ready,false)}else if(t.attachEvent){t.attachEvent("onreadystatechange",u);E.attachEvent("onload",
+b.ready);var j=false;try{j=E.frameElement==null}catch(s){}t.documentElement.doScroll&&j&&a()}}},isFunction:function(j){return b.type(j)==="function"},isArray:Array.isArray||function(j){return b.type(j)==="array"},isWindow:function(j){return j&&typeof j==="object"&&"setInterval"in j},isNaN:function(j){return j==null||!r.test(j)||isNaN(j)},type:function(j){return j==null?String(j):R[y.call(j)]||"object"},isPlainObject:function(j){if(!j||b.type(j)!=="object"||j.nodeType||b.isWindow(j))return false;if(j.constructor&&
+!F.call(j,"constructor")&&!F.call(j.constructor.prototype,"isPrototypeOf"))return false;for(var s in j);return s===B||F.call(j,s)},isEmptyObject:function(j){for(var s in j)return false;return true},error:function(j){throw j;},parseJSON:function(j){if(typeof j!=="string"||!j)return null;j=b.trim(j);if(C.test(j.replace(J,"@").replace(w,"]").replace(I,"")))return E.JSON&&E.JSON.parse?E.JSON.parse(j):(new Function("return "+j))();else b.error("Invalid JSON: "+j)},noop:function(){},globalEval:function(j){if(j&&
+l.test(j)){var s=t.getElementsByTagName("head")[0]||t.documentElement,v=t.createElement("script");v.type="text/javascript";if(b.support.scriptEval)v.appendChild(t.createTextNode(j));else v.text=j;s.insertBefore(v,s.firstChild);s.removeChild(v)}},nodeName:function(j,s){return j.nodeName&&j.nodeName.toUpperCase()===s.toUpperCase()},each:function(j,s,v){var z,H=0,G=j.length,K=G===B||b.isFunction(j);if(v)if(K)for(z in j){if(s.apply(j[z],v)===false)break}else for(;H<G;){if(s.apply(j[H++],v)===false)break}else if(K)for(z in j){if(s.call(j[z],
+z,j[z])===false)break}else for(v=j[0];H<G&&s.call(v,H,v)!==false;v=j[++H]);return j},trim:O?function(j){return j==null?"":O.call(j)}:function(j){return j==null?"":j.toString().replace(k,"").replace(o,"")},makeArray:function(j,s){var v=s||[];if(j!=null){var z=b.type(j);j.length==null||z==="string"||z==="function"||z==="regexp"||b.isWindow(j)?M.call(v,j):b.merge(v,j)}return v},inArray:function(j,s){if(s.indexOf)return s.indexOf(j);for(var v=0,z=s.length;v<z;v++)if(s[v]===j)return v;return-1},merge:function(j,
+s){var v=j.length,z=0;if(typeof s.length==="number")for(var H=s.length;z<H;z++)j[v++]=s[z];else for(;s[z]!==B;)j[v++]=s[z++];j.length=v;return j},grep:function(j,s,v){var z=[],H;v=!!v;for(var G=0,K=j.length;G<K;G++){H=!!s(j[G],G);v!==H&&z.push(j[G])}return z},map:function(j,s,v){for(var z=[],H,G=0,K=j.length;G<K;G++){H=s(j[G],G,v);if(H!=null)z[z.length]=H}return z.concat.apply([],z)},guid:1,proxy:function(j,s,v){if(arguments.length===2)if(typeof s==="string"){v=j;j=v[s];s=B}else if(s&&!b.isFunction(s)){v=
+s;s=B}if(!s&&j)s=function(){return j.apply(v||this,arguments)};if(j)s.guid=j.guid=j.guid||s.guid||b.guid++;return s},access:function(j,s,v,z,H,G){var K=j.length;if(typeof s==="object"){for(var Q in s)b.access(j,Q,s[Q],z,H,v);return j}if(v!==B){z=!G&&z&&b.isFunction(v);for(Q=0;Q<K;Q++)H(j[Q],s,z?v.call(j[Q],Q,H(j[Q],s)):v,G);return j}return K?H(j[0],s):B},now:function(){return(new Date).getTime()},uaMatch:function(j){j=j.toLowerCase();j=L.exec(j)||g.exec(j)||i.exec(j)||j.indexOf("compatible")<0&&n.exec(j)||
+[];return{browser:j[1]||"",version:j[2]||"0"}},browser:{}});b.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(j,s){R["[object "+s+"]"]=s.toLowerCase()});m=b.uaMatch(m);if(m.browser){b.browser[m.browser]=true;b.browser.version=m.version}if(b.browser.webkit)b.browser.safari=true;if(D)b.inArray=function(j,s){return D.call(s,j)};if(!/\s/.test("\u00a0")){k=/^[\s\xA0]+/;o=/[\s\xA0]+$/}f=b(t);if(t.addEventListener)u=function(){t.removeEventListener("DOMContentLoaded",u,
+false);b.ready()};else if(t.attachEvent)u=function(){if(t.readyState==="complete"){t.detachEvent("onreadystatechange",u);b.ready()}};return E.jQuery=E.$=b}();(function(){c.support={};var a=t.documentElement,b=t.createElement("script"),d=t.createElement("div"),e="script"+c.now();d.style.display="none";d.innerHTML="   <link/><table></table><a href='/a' style='color:red;float:left;opacity:.55;'>a</a><input type='checkbox'/>";var f=d.getElementsByTagName("*"),h=d.getElementsByTagName("a")[0],l=t.createElement("select"),
+k=l.appendChild(t.createElement("option"));if(!(!f||!f.length||!h)){c.support={leadingWhitespace:d.firstChild.nodeType===3,tbody:!d.getElementsByTagName("tbody").length,htmlSerialize:!!d.getElementsByTagName("link").length,style:/red/.test(h.getAttribute("style")),hrefNormalized:h.getAttribute("href")==="/a",opacity:/^0.55$/.test(h.style.opacity),cssFloat:!!h.style.cssFloat,checkOn:d.getElementsByTagName("input")[0].value==="on",optSelected:k.selected,deleteExpando:true,optDisabled:false,checkClone:false,
+scriptEval:false,noCloneEvent:true,boxModel:null,inlineBlockNeedsLayout:false,shrinkWrapBlocks:false,reliableHiddenOffsets:true};l.disabled=true;c.support.optDisabled=!k.disabled;b.type="text/javascript";try{b.appendChild(t.createTextNode("window."+e+"=1;"))}catch(o){}a.insertBefore(b,a.firstChild);if(E[e]){c.support.scriptEval=true;delete E[e]}try{delete b.test}catch(x){c.support.deleteExpando=false}a.removeChild(b);if(d.attachEvent&&d.fireEvent){d.attachEvent("onclick",function r(){c.support.noCloneEvent=
+false;d.detachEvent("onclick",r)});d.cloneNode(true).fireEvent("onclick")}d=t.createElement("div");d.innerHTML="<input type='radio' name='radiotest' checked='checked'/>";a=t.createDocumentFragment();a.appendChild(d.firstChild);c.support.checkClone=a.cloneNode(true).cloneNode(true).lastChild.checked;c(function(){var r=t.createElement("div");r.style.width=r.style.paddingLeft="1px";t.body.appendChild(r);c.boxModel=c.support.boxModel=r.offsetWidth===2;if("zoom"in r.style){r.style.display="inline";r.style.zoom=
+1;c.support.inlineBlockNeedsLayout=r.offsetWidth===2;r.style.display="";r.innerHTML="<div style='width:4px;'></div>";c.support.shrinkWrapBlocks=r.offsetWidth!==2}r.innerHTML="<table><tr><td style='padding:0;display:none'></td><td>t</td></tr></table>";var A=r.getElementsByTagName("td");c.support.reliableHiddenOffsets=A[0].offsetHeight===0;A[0].style.display="";A[1].style.display="none";c.support.reliableHiddenOffsets=c.support.reliableHiddenOffsets&&A[0].offsetHeight===0;r.innerHTML="";t.body.removeChild(r).style.display=
+"none"});a=function(r){var A=t.createElement("div");r="on"+r;var C=r in A;if(!C){A.setAttribute(r,"return;");C=typeof A[r]==="function"}return C};c.support.submitBubbles=a("submit");c.support.changeBubbles=a("change");a=b=d=f=h=null}})();var ra={},Ja=/^(?:\{.*\}|\[.*\])$/;c.extend({cache:{},uuid:0,expando:"jQuery"+c.now(),noData:{embed:true,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:true},data:function(a,b,d){if(c.acceptData(a)){a=a==E?ra:a;var e=a.nodeType,f=e?a[c.expando]:null,h=
+c.cache;if(!(e&&!f&&typeof b==="string"&&d===B)){if(e)f||(a[c.expando]=f=++c.uuid);else h=a;if(typeof b==="object")if(e)h[f]=c.extend(h[f],b);else c.extend(h,b);else if(e&&!h[f])h[f]={};a=e?h[f]:h;if(d!==B)a[b]=d;return typeof b==="string"?a[b]:a}}},removeData:function(a,b){if(c.acceptData(a)){a=a==E?ra:a;var d=a.nodeType,e=d?a[c.expando]:a,f=c.cache,h=d?f[e]:e;if(b){if(h){delete h[b];d&&c.isEmptyObject(h)&&c.removeData(a)}}else if(d&&c.support.deleteExpando)delete a[c.expando];else if(a.removeAttribute)a.removeAttribute(c.expando);
+else if(d)delete f[e];else for(var l in a)delete a[l]}},acceptData:function(a){if(a.nodeName){var b=c.noData[a.nodeName.toLowerCase()];if(b)return!(b===true||a.getAttribute("classid")!==b)}return true}});c.fn.extend({data:function(a,b){var d=null;if(typeof a==="undefined"){if(this.length){var e=this[0].attributes,f;d=c.data(this[0]);for(var h=0,l=e.length;h<l;h++){f=e[h].name;if(f.indexOf("data-")===0){f=f.substr(5);ka(this[0],f,d[f])}}}return d}else if(typeof a==="object")return this.each(function(){c.data(this,
+a)});var k=a.split(".");k[1]=k[1]?"."+k[1]:"";if(b===B){d=this.triggerHandler("getData"+k[1]+"!",[k[0]]);if(d===B&&this.length){d=c.data(this[0],a);d=ka(this[0],a,d)}return d===B&&k[1]?this.data(k[0]):d}else return this.each(function(){var o=c(this),x=[k[0],b];o.triggerHandler("setData"+k[1]+"!",x);c.data(this,a,b);o.triggerHandler("changeData"+k[1]+"!",x)})},removeData:function(a){return this.each(function(){c.removeData(this,a)})}});c.extend({queue:function(a,b,d){if(a){b=(b||"fx")+"queue";var e=
+c.data(a,b);if(!d)return e||[];if(!e||c.isArray(d))e=c.data(a,b,c.makeArray(d));else e.push(d);return e}},dequeue:function(a,b){b=b||"fx";var d=c.queue(a,b),e=d.shift();if(e==="inprogress")e=d.shift();if(e){b==="fx"&&d.unshift("inprogress");e.call(a,function(){c.dequeue(a,b)})}}});c.fn.extend({queue:function(a,b){if(typeof a!=="string"){b=a;a="fx"}if(b===B)return c.queue(this[0],a);return this.each(function(){var d=c.queue(this,a,b);a==="fx"&&d[0]!=="inprogress"&&c.dequeue(this,a)})},dequeue:function(a){return this.each(function(){c.dequeue(this,
+a)})},delay:function(a,b){a=c.fx?c.fx.speeds[a]||a:a;b=b||"fx";return this.queue(b,function(){var d=this;setTimeout(function(){c.dequeue(d,b)},a)})},clearQueue:function(a){return this.queue(a||"fx",[])}});var sa=/[\n\t]/g,ha=/\s+/,Sa=/\r/g,Ta=/^(?:href|src|style)$/,Ua=/^(?:button|input)$/i,Va=/^(?:button|input|object|select|textarea)$/i,Wa=/^a(?:rea)?$/i,ta=/^(?:radio|checkbox)$/i;c.props={"for":"htmlFor","class":"className",readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing",rowspan:"rowSpan",
+colspan:"colSpan",tabindex:"tabIndex",usemap:"useMap",frameborder:"frameBorder"};c.fn.extend({attr:function(a,b){return c.access(this,a,b,true,c.attr)},removeAttr:function(a){return this.each(function(){c.attr(this,a,"");this.nodeType===1&&this.removeAttribute(a)})},addClass:function(a){if(c.isFunction(a))return this.each(function(x){var r=c(this);r.addClass(a.call(this,x,r.attr("class")))});if(a&&typeof a==="string")for(var b=(a||"").split(ha),d=0,e=this.length;d<e;d++){var f=this[d];if(f.nodeType===
+1)if(f.className){for(var h=" "+f.className+" ",l=f.className,k=0,o=b.length;k<o;k++)if(h.indexOf(" "+b[k]+" ")<0)l+=" "+b[k];f.className=c.trim(l)}else f.className=a}return this},removeClass:function(a){if(c.isFunction(a))return this.each(function(o){var x=c(this);x.removeClass(a.call(this,o,x.attr("class")))});if(a&&typeof a==="string"||a===B)for(var b=(a||"").split(ha),d=0,e=this.length;d<e;d++){var f=this[d];if(f.nodeType===1&&f.className)if(a){for(var h=(" "+f.className+" ").replace(sa," "),
+l=0,k=b.length;l<k;l++)h=h.replace(" "+b[l]+" "," ");f.className=c.trim(h)}else f.className=""}return this},toggleClass:function(a,b){var d=typeof a,e=typeof b==="boolean";if(c.isFunction(a))return this.each(function(f){var h=c(this);h.toggleClass(a.call(this,f,h.attr("class"),b),b)});return this.each(function(){if(d==="string")for(var f,h=0,l=c(this),k=b,o=a.split(ha);f=o[h++];){k=e?k:!l.hasClass(f);l[k?"addClass":"removeClass"](f)}else if(d==="undefined"||d==="boolean"){this.className&&c.data(this,
+"__className__",this.className);this.className=this.className||a===false?"":c.data(this,"__className__")||""}})},hasClass:function(a){a=" "+a+" ";for(var b=0,d=this.length;b<d;b++)if((" "+this[b].className+" ").replace(sa," ").indexOf(a)>-1)return true;return false},val:function(a){if(!arguments.length){var b=this[0];if(b){if(c.nodeName(b,"option")){var d=b.attributes.value;return!d||d.specified?b.value:b.text}if(c.nodeName(b,"select")){var e=b.selectedIndex;d=[];var f=b.options;b=b.type==="select-one";
+if(e<0)return null;var h=b?e:0;for(e=b?e+1:f.length;h<e;h++){var l=f[h];if(l.selected&&(c.support.optDisabled?!l.disabled:l.getAttribute("disabled")===null)&&(!l.parentNode.disabled||!c.nodeName(l.parentNode,"optgroup"))){a=c(l).val();if(b)return a;d.push(a)}}return d}if(ta.test(b.type)&&!c.support.checkOn)return b.getAttribute("value")===null?"on":b.value;return(b.value||"").replace(Sa,"")}return B}var k=c.isFunction(a);return this.each(function(o){var x=c(this),r=a;if(this.nodeType===1){if(k)r=
+a.call(this,o,x.val());if(r==null)r="";else if(typeof r==="number")r+="";else if(c.isArray(r))r=c.map(r,function(C){return C==null?"":C+""});if(c.isArray(r)&&ta.test(this.type))this.checked=c.inArray(x.val(),r)>=0;else if(c.nodeName(this,"select")){var A=c.makeArray(r);c("option",this).each(function(){this.selected=c.inArray(c(this).val(),A)>=0});if(!A.length)this.selectedIndex=-1}else this.value=r}})}});c.extend({attrFn:{val:true,css:true,html:true,text:true,data:true,width:true,height:true,offset:true},
+attr:function(a,b,d,e){if(!a||a.nodeType===3||a.nodeType===8)return B;if(e&&b in c.attrFn)return c(a)[b](d);e=a.nodeType!==1||!c.isXMLDoc(a);var f=d!==B;b=e&&c.props[b]||b;var h=Ta.test(b);if((b in a||a[b]!==B)&&e&&!h){if(f){b==="type"&&Ua.test(a.nodeName)&&a.parentNode&&c.error("type property can't be changed");if(d===null)a.nodeType===1&&a.removeAttribute(b);else a[b]=d}if(c.nodeName(a,"form")&&a.getAttributeNode(b))return a.getAttributeNode(b).nodeValue;if(b==="tabIndex")return(b=a.getAttributeNode("tabIndex"))&&
+b.specified?b.value:Va.test(a.nodeName)||Wa.test(a.nodeName)&&a.href?0:B;return a[b]}if(!c.support.style&&e&&b==="style"){if(f)a.style.cssText=""+d;return a.style.cssText}f&&a.setAttribute(b,""+d);if(!a.attributes[b]&&a.hasAttribute&&!a.hasAttribute(b))return B;a=!c.support.hrefNormalized&&e&&h?a.getAttribute(b,2):a.getAttribute(b);return a===null?B:a}});var X=/\.(.*)$/,ia=/^(?:textarea|input|select)$/i,La=/\./g,Ma=/ /g,Xa=/[^\w\s.|`]/g,Ya=function(a){return a.replace(Xa,"\\$&")},ua={focusin:0,focusout:0};
+c.event={add:function(a,b,d,e){if(!(a.nodeType===3||a.nodeType===8)){if(c.isWindow(a)&&a!==E&&!a.frameElement)a=E;if(d===false)d=U;else if(!d)return;var f,h;if(d.handler){f=d;d=f.handler}if(!d.guid)d.guid=c.guid++;if(h=c.data(a)){var l=a.nodeType?"events":"__events__",k=h[l],o=h.handle;if(typeof k==="function"){o=k.handle;k=k.events}else if(!k){a.nodeType||(h[l]=h=function(){});h.events=k={}}if(!o)h.handle=o=function(){return typeof c!=="undefined"&&!c.event.triggered?c.event.handle.apply(o.elem,
+arguments):B};o.elem=a;b=b.split(" ");for(var x=0,r;l=b[x++];){h=f?c.extend({},f):{handler:d,data:e};if(l.indexOf(".")>-1){r=l.split(".");l=r.shift();h.namespace=r.slice(0).sort().join(".")}else{r=[];h.namespace=""}h.type=l;if(!h.guid)h.guid=d.guid;var A=k[l],C=c.event.special[l]||{};if(!A){A=k[l]=[];if(!C.setup||C.setup.call(a,e,r,o)===false)if(a.addEventListener)a.addEventListener(l,o,false);else a.attachEvent&&a.attachEvent("on"+l,o)}if(C.add){C.add.call(a,h);if(!h.handler.guid)h.handler.guid=
+d.guid}A.push(h);c.event.global[l]=true}a=null}}},global:{},remove:function(a,b,d,e){if(!(a.nodeType===3||a.nodeType===8)){if(d===false)d=U;var f,h,l=0,k,o,x,r,A,C,J=a.nodeType?"events":"__events__",w=c.data(a),I=w&&w[J];if(w&&I){if(typeof I==="function"){w=I;I=I.events}if(b&&b.type){d=b.handler;b=b.type}if(!b||typeof b==="string"&&b.charAt(0)==="."){b=b||"";for(f in I)c.event.remove(a,f+b)}else{for(b=b.split(" ");f=b[l++];){r=f;k=f.indexOf(".")<0;o=[];if(!k){o=f.split(".");f=o.shift();x=RegExp("(^|\\.)"+
+c.map(o.slice(0).sort(),Ya).join("\\.(?:.*\\.)?")+"(\\.|$)")}if(A=I[f])if(d){r=c.event.special[f]||{};for(h=e||0;h<A.length;h++){C=A[h];if(d.guid===C.guid){if(k||x.test(C.namespace)){e==null&&A.splice(h--,1);r.remove&&r.remove.call(a,C)}if(e!=null)break}}if(A.length===0||e!=null&&A.length===1){if(!r.teardown||r.teardown.call(a,o)===false)c.removeEvent(a,f,w.handle);delete I[f]}}else for(h=0;h<A.length;h++){C=A[h];if(k||x.test(C.namespace)){c.event.remove(a,r,C.handler,h);A.splice(h--,1)}}}if(c.isEmptyObject(I)){if(b=
+w.handle)b.elem=null;delete w.events;delete w.handle;if(typeof w==="function")c.removeData(a,J);else c.isEmptyObject(w)&&c.removeData(a)}}}}},trigger:function(a,b,d,e){var f=a.type||a;if(!e){a=typeof a==="object"?a[c.expando]?a:c.extend(c.Event(f),a):c.Event(f);if(f.indexOf("!")>=0){a.type=f=f.slice(0,-1);a.exclusive=true}if(!d){a.stopPropagation();c.event.global[f]&&c.each(c.cache,function(){this.events&&this.events[f]&&c.event.trigger(a,b,this.handle.elem)})}if(!d||d.nodeType===3||d.nodeType===
+8)return B;a.result=B;a.target=d;b=c.makeArray(b);b.unshift(a)}a.currentTarget=d;(e=d.nodeType?c.data(d,"handle"):(c.data(d,"__events__")||{}).handle)&&e.apply(d,b);e=d.parentNode||d.ownerDocument;try{if(!(d&&d.nodeName&&c.noData[d.nodeName.toLowerCase()]))if(d["on"+f]&&d["on"+f].apply(d,b)===false){a.result=false;a.preventDefault()}}catch(h){}if(!a.isPropagationStopped()&&e)c.event.trigger(a,b,e,true);else if(!a.isDefaultPrevented()){var l;e=a.target;var k=f.replace(X,""),o=c.nodeName(e,"a")&&k===
+"click",x=c.event.special[k]||{};if((!x._default||x._default.call(d,a)===false)&&!o&&!(e&&e.nodeName&&c.noData[e.nodeName.toLowerCase()])){try{if(e[k]){if(l=e["on"+k])e["on"+k]=null;c.event.triggered=true;e[k]()}}catch(r){}if(l)e["on"+k]=l;c.event.triggered=false}}},handle:function(a){var b,d,e,f;d=[];var h=c.makeArray(arguments);a=h[0]=c.event.fix(a||E.event);a.currentTarget=this;b=a.type.indexOf(".")<0&&!a.exclusive;if(!b){e=a.type.split(".");a.type=e.shift();d=e.slice(0).sort();e=RegExp("(^|\\.)"+
+d.join("\\.(?:.*\\.)?")+"(\\.|$)")}a.namespace=a.namespace||d.join(".");f=c.data(this,this.nodeType?"events":"__events__");if(typeof f==="function")f=f.events;d=(f||{})[a.type];if(f&&d){d=d.slice(0);f=0;for(var l=d.length;f<l;f++){var k=d[f];if(b||e.test(k.namespace)){a.handler=k.handler;a.data=k.data;a.handleObj=k;k=k.handler.apply(this,h);if(k!==B){a.result=k;if(k===false){a.preventDefault();a.stopPropagation()}}if(a.isImmediatePropagationStopped())break}}}return a.result},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),
+fix:function(a){if(a[c.expando])return a;var b=a;a=c.Event(b);for(var d=this.props.length,e;d;){e=this.props[--d];a[e]=b[e]}if(!a.target)a.target=a.srcElement||t;if(a.target.nodeType===3)a.target=a.target.parentNode;if(!a.relatedTarget&&a.fromElement)a.relatedTarget=a.fromElement===a.target?a.toElement:a.fromElement;if(a.pageX==null&&a.clientX!=null){b=t.documentElement;d=t.body;a.pageX=a.clientX+(b&&b.scrollLeft||d&&d.scrollLeft||0)-(b&&b.clientLeft||d&&d.clientLeft||0);a.pageY=a.clientY+(b&&b.scrollTop||
+d&&d.scrollTop||0)-(b&&b.clientTop||d&&d.clientTop||0)}if(a.which==null&&(a.charCode!=null||a.keyCode!=null))a.which=a.charCode!=null?a.charCode:a.keyCode;if(!a.metaKey&&a.ctrlKey)a.metaKey=a.ctrlKey;if(!a.which&&a.button!==B)a.which=a.button&1?1:a.button&2?3:a.button&4?2:0;return a},guid:1E8,proxy:c.proxy,special:{ready:{setup:c.bindReady,teardown:c.noop},live:{add:function(a){c.event.add(this,Y(a.origType,a.selector),c.extend({},a,{handler:Ka,guid:a.handler.guid}))},remove:function(a){c.event.remove(this,
+Y(a.origType,a.selector),a)}},beforeunload:{setup:function(a,b,d){if(c.isWindow(this))this.onbeforeunload=d},teardown:function(a,b){if(this.onbeforeunload===b)this.onbeforeunload=null}}}};c.removeEvent=t.removeEventListener?function(a,b,d){a.removeEventListener&&a.removeEventListener(b,d,false)}:function(a,b,d){a.detachEvent&&a.detachEvent("on"+b,d)};c.Event=function(a){if(!this.preventDefault)return new c.Event(a);if(a&&a.type){this.originalEvent=a;this.type=a.type}else this.type=a;this.timeStamp=
+c.now();this[c.expando]=true};c.Event.prototype={preventDefault:function(){this.isDefaultPrevented=ca;var a=this.originalEvent;if(a)if(a.preventDefault)a.preventDefault();else a.returnValue=false},stopPropagation:function(){this.isPropagationStopped=ca;var a=this.originalEvent;if(a){a.stopPropagation&&a.stopPropagation();a.cancelBubble=true}},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=ca;this.stopPropagation()},isDefaultPrevented:U,isPropagationStopped:U,isImmediatePropagationStopped:U};
+var va=function(a){var b=a.relatedTarget;try{for(;b&&b!==this;)b=b.parentNode;if(b!==this){a.type=a.data;c.event.handle.apply(this,arguments)}}catch(d){}},wa=function(a){a.type=a.data;c.event.handle.apply(this,arguments)};c.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){c.event.special[a]={setup:function(d){c.event.add(this,b,d&&d.selector?wa:va,a)},teardown:function(d){c.event.remove(this,b,d&&d.selector?wa:va)}}});if(!c.support.submitBubbles)c.event.special.submit={setup:function(){if(this.nodeName.toLowerCase()!==
+"form"){c.event.add(this,"click.specialSubmit",function(a){var b=a.target,d=b.type;if((d==="submit"||d==="image")&&c(b).closest("form").length){a.liveFired=B;return la("submit",this,arguments)}});c.event.add(this,"keypress.specialSubmit",function(a){var b=a.target,d=b.type;if((d==="text"||d==="password")&&c(b).closest("form").length&&a.keyCode===13){a.liveFired=B;return la("submit",this,arguments)}})}else return false},teardown:function(){c.event.remove(this,".specialSubmit")}};if(!c.support.changeBubbles){var V,
+xa=function(a){var b=a.type,d=a.value;if(b==="radio"||b==="checkbox")d=a.checked;else if(b==="select-multiple")d=a.selectedIndex>-1?c.map(a.options,function(e){return e.selected}).join("-"):"";else if(a.nodeName.toLowerCase()==="select")d=a.selectedIndex;return d},Z=function(a,b){var d=a.target,e,f;if(!(!ia.test(d.nodeName)||d.readOnly)){e=c.data(d,"_change_data");f=xa(d);if(a.type!=="focusout"||d.type!=="radio")c.data(d,"_change_data",f);if(!(e===B||f===e))if(e!=null||f){a.type="change";a.liveFired=
+B;return c.event.trigger(a,b,d)}}};c.event.special.change={filters:{focusout:Z,beforedeactivate:Z,click:function(a){var b=a.target,d=b.type;if(d==="radio"||d==="checkbox"||b.nodeName.toLowerCase()==="select")return Z.call(this,a)},keydown:function(a){var b=a.target,d=b.type;if(a.keyCode===13&&b.nodeName.toLowerCase()!=="textarea"||a.keyCode===32&&(d==="checkbox"||d==="radio")||d==="select-multiple")return Z.call(this,a)},beforeactivate:function(a){a=a.target;c.data(a,"_change_data",xa(a))}},setup:function(){if(this.type===
+"file")return false;for(var a in V)c.event.add(this,a+".specialChange",V[a]);return ia.test(this.nodeName)},teardown:function(){c.event.remove(this,".specialChange");return ia.test(this.nodeName)}};V=c.event.special.change.filters;V.focus=V.beforeactivate}t.addEventListener&&c.each({focus:"focusin",blur:"focusout"},function(a,b){function d(e){e=c.event.fix(e);e.type=b;return c.event.trigger(e,null,e.target)}c.event.special[b]={setup:function(){ua[b]++===0&&t.addEventListener(a,d,true)},teardown:function(){--ua[b]===
+0&&t.removeEventListener(a,d,true)}}});c.each(["bind","one"],function(a,b){c.fn[b]=function(d,e,f){if(typeof d==="object"){for(var h in d)this[b](h,e,d[h],f);return this}if(c.isFunction(e)||e===false){f=e;e=B}var l=b==="one"?c.proxy(f,function(o){c(this).unbind(o,l);return f.apply(this,arguments)}):f;if(d==="unload"&&b!=="one")this.one(d,e,f);else{h=0;for(var k=this.length;h<k;h++)c.event.add(this[h],d,l,e)}return this}});c.fn.extend({unbind:function(a,b){if(typeof a==="object"&&!a.preventDefault)for(var d in a)this.unbind(d,
+a[d]);else{d=0;for(var e=this.length;d<e;d++)c.event.remove(this[d],a,b)}return this},delegate:function(a,b,d,e){return this.live(b,d,e,a)},undelegate:function(a,b,d){return arguments.length===0?this.unbind("live"):this.die(b,null,d,a)},trigger:function(a,b){return this.each(function(){c.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0]){var d=c.Event(a);d.preventDefault();d.stopPropagation();c.event.trigger(d,b,this[0]);return d.result}},toggle:function(a){for(var b=arguments,d=
+1;d<b.length;)c.proxy(a,b[d++]);return this.click(c.proxy(a,function(e){var f=(c.data(this,"lastToggle"+a.guid)||0)%d;c.data(this,"lastToggle"+a.guid,f+1);e.preventDefault();return b[f].apply(this,arguments)||false}))},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}});var ya={focus:"focusin",blur:"focusout",mouseenter:"mouseover",mouseleave:"mouseout"};c.each(["live","die"],function(a,b){c.fn[b]=function(d,e,f,h){var l,k=0,o,x,r=h||this.selector;h=h?this:c(this.context);if(typeof d===
+"object"&&!d.preventDefault){for(l in d)h[b](l,e,d[l],r);return this}if(c.isFunction(e)){f=e;e=B}for(d=(d||"").split(" ");(l=d[k++])!=null;){o=X.exec(l);x="";if(o){x=o[0];l=l.replace(X,"")}if(l==="hover")d.push("mouseenter"+x,"mouseleave"+x);else{o=l;if(l==="focus"||l==="blur"){d.push(ya[l]+x);l+=x}else l=(ya[l]||l)+x;if(b==="live"){x=0;for(var A=h.length;x<A;x++)c.event.add(h[x],"live."+Y(l,r),{data:e,selector:r,handler:f,origType:l,origHandler:f,preType:o})}else h.unbind("live."+Y(l,r),f)}}return this}});
+c.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error".split(" "),function(a,b){c.fn[b]=function(d,e){if(e==null){e=d;d=null}return arguments.length>0?this.bind(b,d,e):this.trigger(b)};if(c.attrFn)c.attrFn[b]=true});E.attachEvent&&!E.addEventListener&&c(E).bind("unload",function(){for(var a in c.cache)if(c.cache[a].handle)try{c.event.remove(c.cache[a].handle.elem)}catch(b){}});
+(function(){function a(g,i,n,m,p,q){p=0;for(var u=m.length;p<u;p++){var y=m[p];if(y){var F=false;for(y=y[g];y;){if(y.sizcache===n){F=m[y.sizset];break}if(y.nodeType===1&&!q){y.sizcache=n;y.sizset=p}if(y.nodeName.toLowerCase()===i){F=y;break}y=y[g]}m[p]=F}}}function b(g,i,n,m,p,q){p=0;for(var u=m.length;p<u;p++){var y=m[p];if(y){var F=false;for(y=y[g];y;){if(y.sizcache===n){F=m[y.sizset];break}if(y.nodeType===1){if(!q){y.sizcache=n;y.sizset=p}if(typeof i!=="string"){if(y===i){F=true;break}}else if(k.filter(i,
+[y]).length>0){F=y;break}}y=y[g]}m[p]=F}}}var d=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,e=0,f=Object.prototype.toString,h=false,l=true;[0,0].sort(function(){l=false;return 0});var k=function(g,i,n,m){n=n||[];var p=i=i||t;if(i.nodeType!==1&&i.nodeType!==9)return[];if(!g||typeof g!=="string")return n;var q,u,y,F,M,N=true,O=k.isXML(i),D=[],R=g;do{d.exec("");if(q=d.exec(R)){R=q[3];D.push(q[1]);if(q[2]){F=q[3];
+break}}}while(q);if(D.length>1&&x.exec(g))if(D.length===2&&o.relative[D[0]])u=L(D[0]+D[1],i);else for(u=o.relative[D[0]]?[i]:k(D.shift(),i);D.length;){g=D.shift();if(o.relative[g])g+=D.shift();u=L(g,u)}else{if(!m&&D.length>1&&i.nodeType===9&&!O&&o.match.ID.test(D[0])&&!o.match.ID.test(D[D.length-1])){q=k.find(D.shift(),i,O);i=q.expr?k.filter(q.expr,q.set)[0]:q.set[0]}if(i){q=m?{expr:D.pop(),set:C(m)}:k.find(D.pop(),D.length===1&&(D[0]==="~"||D[0]==="+")&&i.parentNode?i.parentNode:i,O);u=q.expr?k.filter(q.expr,
+q.set):q.set;if(D.length>0)y=C(u);else N=false;for(;D.length;){q=M=D.pop();if(o.relative[M])q=D.pop();else M="";if(q==null)q=i;o.relative[M](y,q,O)}}else y=[]}y||(y=u);y||k.error(M||g);if(f.call(y)==="[object Array]")if(N)if(i&&i.nodeType===1)for(g=0;y[g]!=null;g++){if(y[g]&&(y[g]===true||y[g].nodeType===1&&k.contains(i,y[g])))n.push(u[g])}else for(g=0;y[g]!=null;g++)y[g]&&y[g].nodeType===1&&n.push(u[g]);else n.push.apply(n,y);else C(y,n);if(F){k(F,p,n,m);k.uniqueSort(n)}return n};k.uniqueSort=function(g){if(w){h=
+l;g.sort(w);if(h)for(var i=1;i<g.length;i++)g[i]===g[i-1]&&g.splice(i--,1)}return g};k.matches=function(g,i){return k(g,null,null,i)};k.matchesSelector=function(g,i){return k(i,null,null,[g]).length>0};k.find=function(g,i,n){var m;if(!g)return[];for(var p=0,q=o.order.length;p<q;p++){var u,y=o.order[p];if(u=o.leftMatch[y].exec(g)){var F=u[1];u.splice(1,1);if(F.substr(F.length-1)!=="\\"){u[1]=(u[1]||"").replace(/\\/g,"");m=o.find[y](u,i,n);if(m!=null){g=g.replace(o.match[y],"");break}}}}m||(m=i.getElementsByTagName("*"));
+return{set:m,expr:g}};k.filter=function(g,i,n,m){for(var p,q,u=g,y=[],F=i,M=i&&i[0]&&k.isXML(i[0]);g&&i.length;){for(var N in o.filter)if((p=o.leftMatch[N].exec(g))!=null&&p[2]){var O,D,R=o.filter[N];D=p[1];q=false;p.splice(1,1);if(D.substr(D.length-1)!=="\\"){if(F===y)y=[];if(o.preFilter[N])if(p=o.preFilter[N](p,F,n,y,m,M)){if(p===true)continue}else q=O=true;if(p)for(var j=0;(D=F[j])!=null;j++)if(D){O=R(D,p,j,F);var s=m^!!O;if(n&&O!=null)if(s)q=true;else F[j]=false;else if(s){y.push(D);q=true}}if(O!==
+B){n||(F=y);g=g.replace(o.match[N],"");if(!q)return[];break}}}if(g===u)if(q==null)k.error(g);else break;u=g}return F};k.error=function(g){throw"Syntax error, unrecognized expression: "+g;};var o=k.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\((even|odd|[\dn+\-]*)\))?/,
+POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(g){return g.getAttribute("href")}},relative:{"+":function(g,i){var n=typeof i==="string",m=n&&!/\W/.test(i);n=n&&!m;if(m)i=i.toLowerCase();m=0;for(var p=g.length,q;m<p;m++)if(q=g[m]){for(;(q=q.previousSibling)&&q.nodeType!==1;);g[m]=n||q&&q.nodeName.toLowerCase()===
+i?q||false:q===i}n&&k.filter(i,g,true)},">":function(g,i){var n,m=typeof i==="string",p=0,q=g.length;if(m&&!/\W/.test(i))for(i=i.toLowerCase();p<q;p++){if(n=g[p]){n=n.parentNode;g[p]=n.nodeName.toLowerCase()===i?n:false}}else{for(;p<q;p++)if(n=g[p])g[p]=m?n.parentNode:n.parentNode===i;m&&k.filter(i,g,true)}},"":function(g,i,n){var m,p=e++,q=b;if(typeof i==="string"&&!/\W/.test(i)){m=i=i.toLowerCase();q=a}q("parentNode",i,p,g,m,n)},"~":function(g,i,n){var m,p=e++,q=b;if(typeof i==="string"&&!/\W/.test(i)){m=
+i=i.toLowerCase();q=a}q("previousSibling",i,p,g,m,n)}},find:{ID:function(g,i,n){if(typeof i.getElementById!=="undefined"&&!n)return(g=i.getElementById(g[1]))&&g.parentNode?[g]:[]},NAME:function(g,i){if(typeof i.getElementsByName!=="undefined"){for(var n=[],m=i.getElementsByName(g[1]),p=0,q=m.length;p<q;p++)m[p].getAttribute("name")===g[1]&&n.push(m[p]);return n.length===0?null:n}},TAG:function(g,i){return i.getElementsByTagName(g[1])}},preFilter:{CLASS:function(g,i,n,m,p,q){g=" "+g[1].replace(/\\/g,
+"")+" ";if(q)return g;q=0;for(var u;(u=i[q])!=null;q++)if(u)if(p^(u.className&&(" "+u.className+" ").replace(/[\t\n]/g," ").indexOf(g)>=0))n||m.push(u);else if(n)i[q]=false;return false},ID:function(g){return g[1].replace(/\\/g,"")},TAG:function(g){return g[1].toLowerCase()},CHILD:function(g){if(g[1]==="nth"){var i=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(g[2]==="even"&&"2n"||g[2]==="odd"&&"2n+1"||!/\D/.test(g[2])&&"0n+"+g[2]||g[2]);g[2]=i[1]+(i[2]||1)-0;g[3]=i[3]-0}g[0]=e++;return g},ATTR:function(g,i,n,
+m,p,q){i=g[1].replace(/\\/g,"");if(!q&&o.attrMap[i])g[1]=o.attrMap[i];if(g[2]==="~=")g[4]=" "+g[4]+" ";return g},PSEUDO:function(g,i,n,m,p){if(g[1]==="not")if((d.exec(g[3])||"").length>1||/^\w/.test(g[3]))g[3]=k(g[3],null,null,i);else{g=k.filter(g[3],i,n,true^p);n||m.push.apply(m,g);return false}else if(o.match.POS.test(g[0])||o.match.CHILD.test(g[0]))return true;return g},POS:function(g){g.unshift(true);return g}},filters:{enabled:function(g){return g.disabled===false&&g.type!=="hidden"},disabled:function(g){return g.disabled===
+true},checked:function(g){return g.checked===true},selected:function(g){return g.selected===true},parent:function(g){return!!g.firstChild},empty:function(g){return!g.firstChild},has:function(g,i,n){return!!k(n[3],g).length},header:function(g){return/h\d/i.test(g.nodeName)},text:function(g){return"text"===g.type},radio:function(g){return"radio"===g.type},checkbox:function(g){return"checkbox"===g.type},file:function(g){return"file"===g.type},password:function(g){return"password"===g.type},submit:function(g){return"submit"===
+g.type},image:function(g){return"image"===g.type},reset:function(g){return"reset"===g.type},button:function(g){return"button"===g.type||g.nodeName.toLowerCase()==="button"},input:function(g){return/input|select|textarea|button/i.test(g.nodeName)}},setFilters:{first:function(g,i){return i===0},last:function(g,i,n,m){return i===m.length-1},even:function(g,i){return i%2===0},odd:function(g,i){return i%2===1},lt:function(g,i,n){return i<n[3]-0},gt:function(g,i,n){return i>n[3]-0},nth:function(g,i,n){return n[3]-
+0===i},eq:function(g,i,n){return n[3]-0===i}},filter:{PSEUDO:function(g,i,n,m){var p=i[1],q=o.filters[p];if(q)return q(g,n,i,m);else if(p==="contains")return(g.textContent||g.innerText||k.getText([g])||"").indexOf(i[3])>=0;else if(p==="not"){i=i[3];n=0;for(m=i.length;n<m;n++)if(i[n]===g)return false;return true}else k.error("Syntax error, unrecognized expression: "+p)},CHILD:function(g,i){var n=i[1],m=g;switch(n){case "only":case "first":for(;m=m.previousSibling;)if(m.nodeType===1)return false;if(n===
+"first")return true;m=g;case "last":for(;m=m.nextSibling;)if(m.nodeType===1)return false;return true;case "nth":n=i[2];var p=i[3];if(n===1&&p===0)return true;var q=i[0],u=g.parentNode;if(u&&(u.sizcache!==q||!g.nodeIndex)){var y=0;for(m=u.firstChild;m;m=m.nextSibling)if(m.nodeType===1)m.nodeIndex=++y;u.sizcache=q}m=g.nodeIndex-p;return n===0?m===0:m%n===0&&m/n>=0}},ID:function(g,i){return g.nodeType===1&&g.getAttribute("id")===i},TAG:function(g,i){return i==="*"&&g.nodeType===1||g.nodeName.toLowerCase()===
+i},CLASS:function(g,i){return(" "+(g.className||g.getAttribute("class"))+" ").indexOf(i)>-1},ATTR:function(g,i){var n=i[1];n=o.attrHandle[n]?o.attrHandle[n](g):g[n]!=null?g[n]:g.getAttribute(n);var m=n+"",p=i[2],q=i[4];return n==null?p==="!=":p==="="?m===q:p==="*="?m.indexOf(q)>=0:p==="~="?(" "+m+" ").indexOf(q)>=0:!q?m&&n!==false:p==="!="?m!==q:p==="^="?m.indexOf(q)===0:p==="$="?m.substr(m.length-q.length)===q:p==="|="?m===q||m.substr(0,q.length+1)===q+"-":false},POS:function(g,i,n,m){var p=o.setFilters[i[2]];
+if(p)return p(g,n,i,m)}}},x=o.match.POS,r=function(g,i){return"\\"+(i-0+1)},A;for(A in o.match){o.match[A]=RegExp(o.match[A].source+/(?![^\[]*\])(?![^\(]*\))/.source);o.leftMatch[A]=RegExp(/(^(?:.|\r|\n)*?)/.source+o.match[A].source.replace(/\\(\d+)/g,r))}var C=function(g,i){g=Array.prototype.slice.call(g,0);if(i){i.push.apply(i,g);return i}return g};try{Array.prototype.slice.call(t.documentElement.childNodes,0)}catch(J){C=function(g,i){var n=0,m=i||[];if(f.call(g)==="[object Array]")Array.prototype.push.apply(m,
+g);else if(typeof g.length==="number")for(var p=g.length;n<p;n++)m.push(g[n]);else for(;g[n];n++)m.push(g[n]);return m}}var w,I;if(t.documentElement.compareDocumentPosition)w=function(g,i){if(g===i){h=true;return 0}if(!g.compareDocumentPosition||!i.compareDocumentPosition)return g.compareDocumentPosition?-1:1;return g.compareDocumentPosition(i)&4?-1:1};else{w=function(g,i){var n,m,p=[],q=[];n=g.parentNode;m=i.parentNode;var u=n;if(g===i){h=true;return 0}else if(n===m)return I(g,i);else if(n){if(!m)return 1}else return-1;
+for(;u;){p.unshift(u);u=u.parentNode}for(u=m;u;){q.unshift(u);u=u.parentNode}n=p.length;m=q.length;for(u=0;u<n&&u<m;u++)if(p[u]!==q[u])return I(p[u],q[u]);return u===n?I(g,q[u],-1):I(p[u],i,1)};I=function(g,i,n){if(g===i)return n;for(g=g.nextSibling;g;){if(g===i)return-1;g=g.nextSibling}return 1}}k.getText=function(g){for(var i="",n,m=0;g[m];m++){n=g[m];if(n.nodeType===3||n.nodeType===4)i+=n.nodeValue;else if(n.nodeType!==8)i+=k.getText(n.childNodes)}return i};(function(){var g=t.createElement("div"),
+i="script"+(new Date).getTime(),n=t.documentElement;g.innerHTML="<a name='"+i+"'/>";n.insertBefore(g,n.firstChild);if(t.getElementById(i)){o.find.ID=function(m,p,q){if(typeof p.getElementById!=="undefined"&&!q)return(p=p.getElementById(m[1]))?p.id===m[1]||typeof p.getAttributeNode!=="undefined"&&p.getAttributeNode("id").nodeValue===m[1]?[p]:B:[]};o.filter.ID=function(m,p){var q=typeof m.getAttributeNode!=="undefined"&&m.getAttributeNode("id");return m.nodeType===1&&q&&q.nodeValue===p}}n.removeChild(g);
+n=g=null})();(function(){var g=t.createElement("div");g.appendChild(t.createComment(""));if(g.getElementsByTagName("*").length>0)o.find.TAG=function(i,n){var m=n.getElementsByTagName(i[1]);if(i[1]==="*"){for(var p=[],q=0;m[q];q++)m[q].nodeType===1&&p.push(m[q]);m=p}return m};g.innerHTML="<a href='#'></a>";if(g.firstChild&&typeof g.firstChild.getAttribute!=="undefined"&&g.firstChild.getAttribute("href")!=="#")o.attrHandle.href=function(i){return i.getAttribute("href",2)};g=null})();t.querySelectorAll&&
+function(){var g=k,i=t.createElement("div");i.innerHTML="<p class='TEST'></p>";if(!(i.querySelectorAll&&i.querySelectorAll(".TEST").length===0)){k=function(m,p,q,u){p=p||t;m=m.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!u&&!k.isXML(p))if(p.nodeType===9)try{return C(p.querySelectorAll(m),q)}catch(y){}else if(p.nodeType===1&&p.nodeName.toLowerCase()!=="object"){var F=p.getAttribute("id"),M=F||"__sizzle__";F||p.setAttribute("id",M);try{return C(p.querySelectorAll("#"+M+" "+m),q)}catch(N){}finally{F||
+p.removeAttribute("id")}}return g(m,p,q,u)};for(var n in g)k[n]=g[n];i=null}}();(function(){var g=t.documentElement,i=g.matchesSelector||g.mozMatchesSelector||g.webkitMatchesSelector||g.msMatchesSelector,n=false;try{i.call(t.documentElement,"[test!='']:sizzle")}catch(m){n=true}if(i)k.matchesSelector=function(p,q){q=q.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!k.isXML(p))try{if(n||!o.match.PSEUDO.test(q)&&!/!=/.test(q))return i.call(p,q)}catch(u){}return k(q,null,null,[p]).length>0}})();(function(){var g=
+t.createElement("div");g.innerHTML="<div class='test e'></div><div class='test'></div>";if(!(!g.getElementsByClassName||g.getElementsByClassName("e").length===0)){g.lastChild.className="e";if(g.getElementsByClassName("e").length!==1){o.order.splice(1,0,"CLASS");o.find.CLASS=function(i,n,m){if(typeof n.getElementsByClassName!=="undefined"&&!m)return n.getElementsByClassName(i[1])};g=null}}})();k.contains=t.documentElement.contains?function(g,i){return g!==i&&(g.contains?g.contains(i):true)}:t.documentElement.compareDocumentPosition?
+function(g,i){return!!(g.compareDocumentPosition(i)&16)}:function(){return false};k.isXML=function(g){return(g=(g?g.ownerDocument||g:0).documentElement)?g.nodeName!=="HTML":false};var L=function(g,i){for(var n,m=[],p="",q=i.nodeType?[i]:i;n=o.match.PSEUDO.exec(g);){p+=n[0];g=g.replace(o.match.PSEUDO,"")}g=o.relative[g]?g+"*":g;n=0;for(var u=q.length;n<u;n++)k(g,q[n],m);return k.filter(p,m)};c.find=k;c.expr=k.selectors;c.expr[":"]=c.expr.filters;c.unique=k.uniqueSort;c.text=k.getText;c.isXMLDoc=k.isXML;
+c.contains=k.contains})();var Za=/Until$/,$a=/^(?:parents|prevUntil|prevAll)/,ab=/,/,Na=/^.[^:#\[\.,]*$/,bb=Array.prototype.slice,cb=c.expr.match.POS;c.fn.extend({find:function(a){for(var b=this.pushStack("","find",a),d=0,e=0,f=this.length;e<f;e++){d=b.length;c.find(a,this[e],b);if(e>0)for(var h=d;h<b.length;h++)for(var l=0;l<d;l++)if(b[l]===b[h]){b.splice(h--,1);break}}return b},has:function(a){var b=c(a);return this.filter(function(){for(var d=0,e=b.length;d<e;d++)if(c.contains(this,b[d]))return true})},
+not:function(a){return this.pushStack(ma(this,a,false),"not",a)},filter:function(a){return this.pushStack(ma(this,a,true),"filter",a)},is:function(a){return!!a&&c.filter(a,this).length>0},closest:function(a,b){var d=[],e,f,h=this[0];if(c.isArray(a)){var l,k={},o=1;if(h&&a.length){e=0;for(f=a.length;e<f;e++){l=a[e];k[l]||(k[l]=c.expr.match.POS.test(l)?c(l,b||this.context):l)}for(;h&&h.ownerDocument&&h!==b;){for(l in k){e=k[l];if(e.jquery?e.index(h)>-1:c(h).is(e))d.push({selector:l,elem:h,level:o})}h=
+h.parentNode;o++}}return d}l=cb.test(a)?c(a,b||this.context):null;e=0;for(f=this.length;e<f;e++)for(h=this[e];h;)if(l?l.index(h)>-1:c.find.matchesSelector(h,a)){d.push(h);break}else{h=h.parentNode;if(!h||!h.ownerDocument||h===b)break}d=d.length>1?c.unique(d):d;return this.pushStack(d,"closest",a)},index:function(a){if(!a||typeof a==="string")return c.inArray(this[0],a?c(a):this.parent().children());return c.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var d=typeof a==="string"?c(a,b||this.context):
+c.makeArray(a),e=c.merge(this.get(),d);return this.pushStack(!d[0]||!d[0].parentNode||d[0].parentNode.nodeType===11||!e[0]||!e[0].parentNode||e[0].parentNode.nodeType===11?e:c.unique(e))},andSelf:function(){return this.add(this.prevObject)}});c.each({parent:function(a){return(a=a.parentNode)&&a.nodeType!==11?a:null},parents:function(a){return c.dir(a,"parentNode")},parentsUntil:function(a,b,d){return c.dir(a,"parentNode",d)},next:function(a){return c.nth(a,2,"nextSibling")},prev:function(a){return c.nth(a,
+2,"previousSibling")},nextAll:function(a){return c.dir(a,"nextSibling")},prevAll:function(a){return c.dir(a,"previousSibling")},nextUntil:function(a,b,d){return c.dir(a,"nextSibling",d)},prevUntil:function(a,b,d){return c.dir(a,"previousSibling",d)},siblings:function(a){return c.sibling(a.parentNode.firstChild,a)},children:function(a){return c.sibling(a.firstChild)},contents:function(a){return c.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:c.makeArray(a.childNodes)}},function(a,
+b){c.fn[a]=function(d,e){var f=c.map(this,b,d);Za.test(a)||(e=d);if(e&&typeof e==="string")f=c.filter(e,f);f=this.length>1?c.unique(f):f;if((this.length>1||ab.test(e))&&$a.test(a))f=f.reverse();return this.pushStack(f,a,bb.call(arguments).join(","))}});c.extend({filter:function(a,b,d){if(d)a=":not("+a+")";return b.length===1?c.find.matchesSelector(b[0],a)?[b[0]]:[]:c.find.matches(a,b)},dir:function(a,b,d){var e=[];for(a=a[b];a&&a.nodeType!==9&&(d===B||a.nodeType!==1||!c(a).is(d));){a.nodeType===1&&
+e.push(a);a=a[b]}return e},nth:function(a,b,d){b=b||1;for(var e=0;a;a=a[d])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){for(var d=[];a;a=a.nextSibling)a.nodeType===1&&a!==b&&d.push(a);return d}});var za=/ jQuery\d+="(?:\d+|null)"/g,$=/^\s+/,Aa=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,Ba=/<([\w:]+)/,db=/<tbody/i,eb=/<|&#?\w+;/,Ca=/<(?:script|object|embed|option|style)/i,Da=/checked\s*(?:[^=]|=\s*.checked.)/i,fb=/\=([^="'>\s]+\/)>/g,P={option:[1,
+"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]};P.optgroup=P.option;P.tbody=P.tfoot=P.colgroup=P.caption=P.thead;P.th=P.td;if(!c.support.htmlSerialize)P._default=[1,"div<div>","</div>"];c.fn.extend({text:function(a){if(c.isFunction(a))return this.each(function(b){var d=
+c(this);d.text(a.call(this,b,d.text()))});if(typeof a!=="object"&&a!==B)return this.empty().append((this[0]&&this[0].ownerDocument||t).createTextNode(a));return c.text(this)},wrapAll:function(a){if(c.isFunction(a))return this.each(function(d){c(this).wrapAll(a.call(this,d))});if(this[0]){var b=c(a,this[0].ownerDocument).eq(0).clone(true);this[0].parentNode&&b.insertBefore(this[0]);b.map(function(){for(var d=this;d.firstChild&&d.firstChild.nodeType===1;)d=d.firstChild;return d}).append(this)}return this},
+wrapInner:function(a){if(c.isFunction(a))return this.each(function(b){c(this).wrapInner(a.call(this,b))});return this.each(function(){var b=c(this),d=b.contents();d.length?d.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){c(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){c.nodeName(this,"body")||c(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.appendChild(a)})},
+prepend:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b,this)});else if(arguments.length){var a=c(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b,
+this.nextSibling)});else if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,c(arguments[0]).toArray());return a}},remove:function(a,b){for(var d=0,e;(e=this[d])!=null;d++)if(!a||c.filter(a,[e]).length){if(!b&&e.nodeType===1){c.cleanData(e.getElementsByTagName("*"));c.cleanData([e])}e.parentNode&&e.parentNode.removeChild(e)}return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++)for(b.nodeType===1&&c.cleanData(b.getElementsByTagName("*"));b.firstChild;)b.removeChild(b.firstChild);
+return this},clone:function(a){var b=this.map(function(){if(!c.support.noCloneEvent&&!c.isXMLDoc(this)){var d=this.outerHTML,e=this.ownerDocument;if(!d){d=e.createElement("div");d.appendChild(this.cloneNode(true));d=d.innerHTML}return c.clean([d.replace(za,"").replace(fb,'="$1">').replace($,"")],e)[0]}else return this.cloneNode(true)});if(a===true){na(this,b);na(this.find("*"),b.find("*"))}return b},html:function(a){if(a===B)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(za,""):null;
+else if(typeof a==="string"&&!Ca.test(a)&&(c.support.leadingWhitespace||!$.test(a))&&!P[(Ba.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Aa,"<$1></$2>");try{for(var b=0,d=this.length;b<d;b++)if(this[b].nodeType===1){c.cleanData(this[b].getElementsByTagName("*"));this[b].innerHTML=a}}catch(e){this.empty().append(a)}}else c.isFunction(a)?this.each(function(f){var h=c(this);h.html(a.call(this,f,h.html()))}):this.empty().append(a);return this},replaceWith:function(a){if(this[0]&&this[0].parentNode){if(c.isFunction(a))return this.each(function(b){var d=
+c(this),e=d.html();d.replaceWith(a.call(this,b,e))});if(typeof a!=="string")a=c(a).detach();return this.each(function(){var b=this.nextSibling,d=this.parentNode;c(this).remove();b?c(b).before(a):c(d).append(a)})}else return this.pushStack(c(c.isFunction(a)?a():a),"replaceWith",a)},detach:function(a){return this.remove(a,true)},domManip:function(a,b,d){var e,f,h,l=a[0],k=[];if(!c.support.checkClone&&arguments.length===3&&typeof l==="string"&&Da.test(l))return this.each(function(){c(this).domManip(a,
+b,d,true)});if(c.isFunction(l))return this.each(function(x){var r=c(this);a[0]=l.call(this,x,b?r.html():B);r.domManip(a,b,d)});if(this[0]){e=l&&l.parentNode;e=c.support.parentNode&&e&&e.nodeType===11&&e.childNodes.length===this.length?{fragment:e}:c.buildFragment(a,this,k);h=e.fragment;if(f=h.childNodes.length===1?h=h.firstChild:h.firstChild){b=b&&c.nodeName(f,"tr");f=0;for(var o=this.length;f<o;f++)d.call(b?c.nodeName(this[f],"table")?this[f].getElementsByTagName("tbody")[0]||this[f].appendChild(this[f].ownerDocument.createElement("tbody")):
+this[f]:this[f],f>0||e.cacheable||this.length>1?h.cloneNode(true):h)}k.length&&c.each(k,Oa)}return this}});c.buildFragment=function(a,b,d){var e,f,h;b=b&&b[0]?b[0].ownerDocument||b[0]:t;if(a.length===1&&typeof a[0]==="string"&&a[0].length<512&&b===t&&!Ca.test(a[0])&&(c.support.checkClone||!Da.test(a[0]))){f=true;if(h=c.fragments[a[0]])if(h!==1)e=h}if(!e){e=b.createDocumentFragment();c.clean(a,b,e,d)}if(f)c.fragments[a[0]]=h?e:1;return{fragment:e,cacheable:f}};c.fragments={};c.each({appendTo:"append",
+prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){c.fn[a]=function(d){var e=[];d=c(d);var f=this.length===1&&this[0].parentNode;if(f&&f.nodeType===11&&f.childNodes.length===1&&d.length===1){d[b](this[0]);return this}else{f=0;for(var h=d.length;f<h;f++){var l=(f>0?this.clone(true):this).get();c(d[f])[b](l);e=e.concat(l)}return this.pushStack(e,a,d.selector)}}});c.extend({clean:function(a,b,d,e){b=b||t;if(typeof b.createElement==="undefined")b=b.ownerDocument||
+b[0]&&b[0].ownerDocument||t;for(var f=[],h=0,l;(l=a[h])!=null;h++){if(typeof l==="number")l+="";if(l){if(typeof l==="string"&&!eb.test(l))l=b.createTextNode(l);else if(typeof l==="string"){l=l.replace(Aa,"<$1></$2>");var k=(Ba.exec(l)||["",""])[1].toLowerCase(),o=P[k]||P._default,x=o[0],r=b.createElement("div");for(r.innerHTML=o[1]+l+o[2];x--;)r=r.lastChild;if(!c.support.tbody){x=db.test(l);k=k==="table"&&!x?r.firstChild&&r.firstChild.childNodes:o[1]==="<table>"&&!x?r.childNodes:[];for(o=k.length-
+1;o>=0;--o)c.nodeName(k[o],"tbody")&&!k[o].childNodes.length&&k[o].parentNode.removeChild(k[o])}!c.support.leadingWhitespace&&$.test(l)&&r.insertBefore(b.createTextNode($.exec(l)[0]),r.firstChild);l=r.childNodes}if(l.nodeType)f.push(l);else f=c.merge(f,l)}}if(d)for(h=0;f[h];h++)if(e&&c.nodeName(f[h],"script")&&(!f[h].type||f[h].type.toLowerCase()==="text/javascript"))e.push(f[h].parentNode?f[h].parentNode.removeChild(f[h]):f[h]);else{f[h].nodeType===1&&f.splice.apply(f,[h+1,0].concat(c.makeArray(f[h].getElementsByTagName("script"))));
+d.appendChild(f[h])}return f},cleanData:function(a){for(var b,d,e=c.cache,f=c.event.special,h=c.support.deleteExpando,l=0,k;(k=a[l])!=null;l++)if(!(k.nodeName&&c.noData[k.nodeName.toLowerCase()]))if(d=k[c.expando]){if((b=e[d])&&b.events)for(var o in b.events)f[o]?c.event.remove(k,o):c.removeEvent(k,o,b.handle);if(h)delete k[c.expando];else k.removeAttribute&&k.removeAttribute(c.expando);delete e[d]}}});var Ea=/alpha\([^)]*\)/i,gb=/opacity=([^)]*)/,hb=/-([a-z])/ig,ib=/([A-Z])/g,Fa=/^-?\d+(?:px)?$/i,
+jb=/^-?\d/,kb={position:"absolute",visibility:"hidden",display:"block"},Pa=["Left","Right"],Qa=["Top","Bottom"],W,Ga,aa,lb=function(a,b){return b.toUpperCase()};c.fn.css=function(a,b){if(arguments.length===2&&b===B)return this;return c.access(this,a,b,true,function(d,e,f){return f!==B?c.style(d,e,f):c.css(d,e)})};c.extend({cssHooks:{opacity:{get:function(a,b){if(b){var d=W(a,"opacity","opacity");return d===""?"1":d}else return a.style.opacity}}},cssNumber:{zIndex:true,fontWeight:true,opacity:true,
+zoom:true,lineHeight:true},cssProps:{"float":c.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,b,d,e){if(!(!a||a.nodeType===3||a.nodeType===8||!a.style)){var f,h=c.camelCase(b),l=a.style,k=c.cssHooks[h];b=c.cssProps[h]||h;if(d!==B){if(!(typeof d==="number"&&isNaN(d)||d==null)){if(typeof d==="number"&&!c.cssNumber[h])d+="px";if(!k||!("set"in k)||(d=k.set(a,d))!==B)try{l[b]=d}catch(o){}}}else{if(k&&"get"in k&&(f=k.get(a,false,e))!==B)return f;return l[b]}}},css:function(a,b,d){var e,f=c.camelCase(b),
+h=c.cssHooks[f];b=c.cssProps[f]||f;if(h&&"get"in h&&(e=h.get(a,true,d))!==B)return e;else if(W)return W(a,b,f)},swap:function(a,b,d){var e={},f;for(f in b){e[f]=a.style[f];a.style[f]=b[f]}d.call(a);for(f in b)a.style[f]=e[f]},camelCase:function(a){return a.replace(hb,lb)}});c.curCSS=c.css;c.each(["height","width"],function(a,b){c.cssHooks[b]={get:function(d,e,f){var h;if(e){if(d.offsetWidth!==0)h=oa(d,b,f);else c.swap(d,kb,function(){h=oa(d,b,f)});if(h<=0){h=W(d,b,b);if(h==="0px"&&aa)h=aa(d,b,b);
+if(h!=null)return h===""||h==="auto"?"0px":h}if(h<0||h==null){h=d.style[b];return h===""||h==="auto"?"0px":h}return typeof h==="string"?h:h+"px"}},set:function(d,e){if(Fa.test(e)){e=parseFloat(e);if(e>=0)return e+"px"}else return e}}});if(!c.support.opacity)c.cssHooks.opacity={get:function(a,b){return gb.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var d=a.style;d.zoom=1;var e=c.isNaN(b)?"":"alpha(opacity="+b*100+")",f=
+d.filter||"";d.filter=Ea.test(f)?f.replace(Ea,e):d.filter+" "+e}};if(t.defaultView&&t.defaultView.getComputedStyle)Ga=function(a,b,d){var e;d=d.replace(ib,"-$1").toLowerCase();if(!(b=a.ownerDocument.defaultView))return B;if(b=b.getComputedStyle(a,null)){e=b.getPropertyValue(d);if(e===""&&!c.contains(a.ownerDocument.documentElement,a))e=c.style(a,d)}return e};if(t.documentElement.currentStyle)aa=function(a,b){var d,e,f=a.currentStyle&&a.currentStyle[b],h=a.style;if(!Fa.test(f)&&jb.test(f)){d=h.left;
+e=a.runtimeStyle.left;a.runtimeStyle.left=a.currentStyle.left;h.left=b==="fontSize"?"1em":f||0;f=h.pixelLeft+"px";h.left=d;a.runtimeStyle.left=e}return f===""?"auto":f};W=Ga||aa;if(c.expr&&c.expr.filters){c.expr.filters.hidden=function(a){var b=a.offsetHeight;return a.offsetWidth===0&&b===0||!c.support.reliableHiddenOffsets&&(a.style.display||c.css(a,"display"))==="none"};c.expr.filters.visible=function(a){return!c.expr.filters.hidden(a)}}var mb=c.now(),nb=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,
+ob=/^(?:select|textarea)/i,pb=/^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,qb=/^(?:GET|HEAD)$/,Ra=/\[\]$/,T=/\=\?(&|$)/,ja=/\?/,rb=/([?&])_=[^&]*/,sb=/^(\w+:)?\/\/([^\/?#]+)/,tb=/%20/g,ub=/#.*$/,Ha=c.fn.load;c.fn.extend({load:function(a,b,d){if(typeof a!=="string"&&Ha)return Ha.apply(this,arguments);else if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var f=a.slice(e,a.length);a=a.slice(0,e)}e="GET";if(b)if(c.isFunction(b)){d=b;b=null}else if(typeof b===
+"object"){b=c.param(b,c.ajaxSettings.traditional);e="POST"}var h=this;c.ajax({url:a,type:e,dataType:"html",data:b,complete:function(l,k){if(k==="success"||k==="notmodified")h.html(f?c("<div>").append(l.responseText.replace(nb,"")).find(f):l.responseText);d&&h.each(d,[l.responseText,k,l])}});return this},serialize:function(){return c.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?c.makeArray(this.elements):this}).filter(function(){return this.name&&
+!this.disabled&&(this.checked||ob.test(this.nodeName)||pb.test(this.type))}).map(function(a,b){var d=c(this).val();return d==null?null:c.isArray(d)?c.map(d,function(e){return{name:b.name,value:e}}):{name:b.name,value:d}}).get()}});c.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){c.fn[b]=function(d){return this.bind(b,d)}});c.extend({get:function(a,b,d,e){if(c.isFunction(b)){e=e||d;d=b;b=null}return c.ajax({type:"GET",url:a,data:b,success:d,dataType:e})},
+getScript:function(a,b){return c.get(a,null,b,"script")},getJSON:function(a,b,d){return c.get(a,b,d,"json")},post:function(a,b,d,e){if(c.isFunction(b)){e=e||d;d=b;b={}}return c.ajax({type:"POST",url:a,data:b,success:d,dataType:e})},ajaxSetup:function(a){c.extend(c.ajaxSettings,a)},ajaxSettings:{url:location.href,global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:function(){return new E.XMLHttpRequest},accepts:{xml:"application/xml, text/xml",html:"text/html",
+script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},ajax:function(a){var b=c.extend(true,{},c.ajaxSettings,a),d,e,f,h=b.type.toUpperCase(),l=qb.test(h);b.url=b.url.replace(ub,"");b.context=a&&a.context!=null?a.context:b;if(b.data&&b.processData&&typeof b.data!=="string")b.data=c.param(b.data,b.traditional);if(b.dataType==="jsonp"){if(h==="GET")T.test(b.url)||(b.url+=(ja.test(b.url)?"&":"?")+(b.jsonp||"callback")+"=?");else if(!b.data||
+!T.test(b.data))b.data=(b.data?b.data+"&":"")+(b.jsonp||"callback")+"=?";b.dataType="json"}if(b.dataType==="json"&&(b.data&&T.test(b.data)||T.test(b.url))){d=b.jsonpCallback||"jsonp"+mb++;if(b.data)b.data=(b.data+"").replace(T,"="+d+"$1");b.url=b.url.replace(T,"="+d+"$1");b.dataType="script";var k=E[d];E[d]=function(m){if(c.isFunction(k))k(m);else{E[d]=B;try{delete E[d]}catch(p){}}f=m;c.handleSuccess(b,w,e,f);c.handleComplete(b,w,e,f);r&&r.removeChild(A)}}if(b.dataType==="script"&&b.cache===null)b.cache=
+false;if(b.cache===false&&l){var o=c.now(),x=b.url.replace(rb,"$1_="+o);b.url=x+(x===b.url?(ja.test(b.url)?"&":"?")+"_="+o:"")}if(b.data&&l)b.url+=(ja.test(b.url)?"&":"?")+b.data;b.global&&c.active++===0&&c.event.trigger("ajaxStart");o=(o=sb.exec(b.url))&&(o[1]&&o[1].toLowerCase()!==location.protocol||o[2].toLowerCase()!==location.host);if(b.dataType==="script"&&h==="GET"&&o){var r=t.getElementsByTagName("head")[0]||t.documentElement,A=t.createElement("script");if(b.scriptCharset)A.charset=b.scriptCharset;
+A.src=b.url;if(!d){var C=false;A.onload=A.onreadystatechange=function(){if(!C&&(!this.readyState||this.readyState==="loaded"||this.readyState==="complete")){C=true;c.handleSuccess(b,w,e,f);c.handleComplete(b,w,e,f);A.onload=A.onreadystatechange=null;r&&A.parentNode&&r.removeChild(A)}}}r.insertBefore(A,r.firstChild);return B}var J=false,w=b.xhr();if(w){b.username?w.open(h,b.url,b.async,b.username,b.password):w.open(h,b.url,b.async);try{if(b.data!=null&&!l||a&&a.contentType)w.setRequestHeader("Content-Type",
+b.contentType);if(b.ifModified){c.lastModified[b.url]&&w.setRequestHeader("If-Modified-Since",c.lastModified[b.url]);c.etag[b.url]&&w.setRequestHeader("If-None-Match",c.etag[b.url])}o||w.setRequestHeader("X-Requested-With","XMLHttpRequest");w.setRequestHeader("Accept",b.dataType&&b.accepts[b.dataType]?b.accepts[b.dataType]+", */*; q=0.01":b.accepts._default)}catch(I){}if(b.beforeSend&&b.beforeSend.call(b.context,w,b)===false){b.global&&c.active--===1&&c.event.trigger("ajaxStop");w.abort();return false}b.global&&
+c.triggerGlobal(b,"ajaxSend",[w,b]);var L=w.onreadystatechange=function(m){if(!w||w.readyState===0||m==="abort"){J||c.handleComplete(b,w,e,f);J=true;if(w)w.onreadystatechange=c.noop}else if(!J&&w&&(w.readyState===4||m==="timeout")){J=true;w.onreadystatechange=c.noop;e=m==="timeout"?"timeout":!c.httpSuccess(w)?"error":b.ifModified&&c.httpNotModified(w,b.url)?"notmodified":"success";var p;if(e==="success")try{f=c.httpData(w,b.dataType,b)}catch(q){e="parsererror";p=q}if(e==="success"||e==="notmodified")d||
+c.handleSuccess(b,w,e,f);else c.handleError(b,w,e,p);d||c.handleComplete(b,w,e,f);m==="timeout"&&w.abort();if(b.async)w=null}};try{var g=w.abort;w.abort=function(){w&&Function.prototype.call.call(g,w);L("abort")}}catch(i){}b.async&&b.timeout>0&&setTimeout(function(){w&&!J&&L("timeout")},b.timeout);try{w.send(l||b.data==null?null:b.data)}catch(n){c.handleError(b,w,null,n);c.handleComplete(b,w,e,f)}b.async||L();return w}},param:function(a,b){var d=[],e=function(h,l){l=c.isFunction(l)?l():l;d[d.length]=
+encodeURIComponent(h)+"="+encodeURIComponent(l)};if(b===B)b=c.ajaxSettings.traditional;if(c.isArray(a)||a.jquery)c.each(a,function(){e(this.name,this.value)});else for(var f in a)da(f,a[f],b,e);return d.join("&").replace(tb,"+")}});c.extend({active:0,lastModified:{},etag:{},handleError:function(a,b,d,e){a.error&&a.error.call(a.context,b,d,e);a.global&&c.triggerGlobal(a,"ajaxError",[b,a,e])},handleSuccess:function(a,b,d,e){a.success&&a.success.call(a.context,e,d,b);a.global&&c.triggerGlobal(a,"ajaxSuccess",
+[b,a])},handleComplete:function(a,b,d){a.complete&&a.complete.call(a.context,b,d);a.global&&c.triggerGlobal(a,"ajaxComplete",[b,a]);a.global&&c.active--===1&&c.event.trigger("ajaxStop")},triggerGlobal:function(a,b,d){(a.context&&a.context.url==null?c(a.context):c.event).trigger(b,d)},httpSuccess:function(a){try{return!a.status&&location.protocol==="file:"||a.status>=200&&a.status<300||a.status===304||a.status===1223}catch(b){}return false},httpNotModified:function(a,b){var d=a.getResponseHeader("Last-Modified"),
+e=a.getResponseHeader("Etag");if(d)c.lastModified[b]=d;if(e)c.etag[b]=e;return a.status===304},httpData:function(a,b,d){var e=a.getResponseHeader("content-type")||"",f=b==="xml"||!b&&e.indexOf("xml")>=0;a=f?a.responseXML:a.responseText;f&&a.documentElement.nodeName==="parsererror"&&c.error("parsererror");if(d&&d.dataFilter)a=d.dataFilter(a,b);if(typeof a==="string")if(b==="json"||!b&&e.indexOf("json")>=0)a=c.parseJSON(a);else if(b==="script"||!b&&e.indexOf("javascript")>=0)c.globalEval(a);return a}});
+if(E.ActiveXObject)c.ajaxSettings.xhr=function(){if(E.location.protocol!=="file:")try{return new E.XMLHttpRequest}catch(a){}try{return new E.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}};c.support.ajax=!!c.ajaxSettings.xhr();var ea={},vb=/^(?:toggle|show|hide)$/,wb=/^([+\-]=)?([\d+.\-]+)(.*)$/,ba,pa=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];c.fn.extend({show:function(a,b,d){if(a||a===0)return this.animate(S("show",
+3),a,b,d);else{d=0;for(var e=this.length;d<e;d++){a=this[d];b=a.style.display;if(!c.data(a,"olddisplay")&&b==="none")b=a.style.display="";b===""&&c.css(a,"display")==="none"&&c.data(a,"olddisplay",qa(a.nodeName))}for(d=0;d<e;d++){a=this[d];b=a.style.display;if(b===""||b==="none")a.style.display=c.data(a,"olddisplay")||""}return this}},hide:function(a,b,d){if(a||a===0)return this.animate(S("hide",3),a,b,d);else{a=0;for(b=this.length;a<b;a++){d=c.css(this[a],"display");d!=="none"&&c.data(this[a],"olddisplay",
+d)}for(a=0;a<b;a++)this[a].style.display="none";return this}},_toggle:c.fn.toggle,toggle:function(a,b,d){var e=typeof a==="boolean";if(c.isFunction(a)&&c.isFunction(b))this._toggle.apply(this,arguments);else a==null||e?this.each(function(){var f=e?a:c(this).is(":hidden");c(this)[f?"show":"hide"]()}):this.animate(S("toggle",3),a,b,d);return this},fadeTo:function(a,b,d,e){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,d,e)},animate:function(a,b,d,e){var f=c.speed(b,
+d,e);if(c.isEmptyObject(a))return this.each(f.complete);return this[f.queue===false?"each":"queue"](function(){var h=c.extend({},f),l,k=this.nodeType===1,o=k&&c(this).is(":hidden"),x=this;for(l in a){var r=c.camelCase(l);if(l!==r){a[r]=a[l];delete a[l];l=r}if(a[l]==="hide"&&o||a[l]==="show"&&!o)return h.complete.call(this);if(k&&(l==="height"||l==="width")){h.overflow=[this.style.overflow,this.style.overflowX,this.style.overflowY];if(c.css(this,"display")==="inline"&&c.css(this,"float")==="none")if(c.support.inlineBlockNeedsLayout)if(qa(this.nodeName)===
+"inline")this.style.display="inline-block";else{this.style.display="inline";this.style.zoom=1}else this.style.display="inline-block"}if(c.isArray(a[l])){(h.specialEasing=h.specialEasing||{})[l]=a[l][1];a[l]=a[l][0]}}if(h.overflow!=null)this.style.overflow="hidden";h.curAnim=c.extend({},a);c.each(a,function(A,C){var J=new c.fx(x,h,A);if(vb.test(C))J[C==="toggle"?o?"show":"hide":C](a);else{var w=wb.exec(C),I=J.cur()||0;if(w){var L=parseFloat(w[2]),g=w[3]||"px";if(g!=="px"){c.style(x,A,(L||1)+g);I=(L||
+1)/J.cur()*I;c.style(x,A,I+g)}if(w[1])L=(w[1]==="-="?-1:1)*L+I;J.custom(I,L,g)}else J.custom(I,C,"")}});return true})},stop:function(a,b){var d=c.timers;a&&this.queue([]);this.each(function(){for(var e=d.length-1;e>=0;e--)if(d[e].elem===this){b&&d[e](true);d.splice(e,1)}});b||this.dequeue();return this}});c.each({slideDown:S("show",1),slideUp:S("hide",1),slideToggle:S("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){c.fn[a]=function(d,e,f){return this.animate(b,
+d,e,f)}});c.extend({speed:function(a,b,d){var e=a&&typeof a==="object"?c.extend({},a):{complete:d||!d&&b||c.isFunction(a)&&a,duration:a,easing:d&&b||b&&!c.isFunction(b)&&b};e.duration=c.fx.off?0:typeof e.duration==="number"?e.duration:e.duration in c.fx.speeds?c.fx.speeds[e.duration]:c.fx.speeds._default;e.old=e.complete;e.complete=function(){e.queue!==false&&c(this).dequeue();c.isFunction(e.old)&&e.old.call(this)};return e},easing:{linear:function(a,b,d,e){return d+e*a},swing:function(a,b,d,e){return(-Math.cos(a*
+Math.PI)/2+0.5)*e+d}},timers:[],fx:function(a,b,d){this.options=b;this.elem=a;this.prop=d;if(!b.orig)b.orig={}}});c.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this);(c.fx.step[this.prop]||c.fx.step._default)(this)},cur:function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];var a=parseFloat(c.css(this.elem,this.prop));return a&&a>-1E4?a:0},custom:function(a,b,d){function e(l){return f.step(l)}
+var f=this,h=c.fx;this.startTime=c.now();this.start=a;this.end=b;this.unit=d||this.unit||"px";this.now=this.start;this.pos=this.state=0;e.elem=this.elem;if(e()&&c.timers.push(e)&&!ba)ba=setInterval(h.tick,h.interval)},show:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.show=true;this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur());c(this.elem).show()},hide:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.hide=true;
+this.custom(this.cur(),0)},step:function(a){var b=c.now(),d=true;if(a||b>=this.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;for(var e in this.options.curAnim)if(this.options.curAnim[e]!==true)d=false;if(d){if(this.options.overflow!=null&&!c.support.shrinkWrapBlocks){var f=this.elem,h=this.options;c.each(["","X","Y"],function(k,o){f.style["overflow"+o]=h.overflow[k]})}this.options.hide&&c(this.elem).hide();if(this.options.hide||
+this.options.show)for(var l in this.options.curAnim)c.style(this.elem,l,this.options.orig[l]);this.options.complete.call(this.elem)}return false}else{a=b-this.startTime;this.state=a/this.options.duration;b=this.options.easing||(c.easing.swing?"swing":"linear");this.pos=c.easing[this.options.specialEasing&&this.options.specialEasing[this.prop]||b](this.state,a,0,1,this.options.duration);this.now=this.start+(this.end-this.start)*this.pos;this.update()}return true}};c.extend(c.fx,{tick:function(){for(var a=
+c.timers,b=0;b<a.length;b++)a[b]()||a.splice(b--,1);a.length||c.fx.stop()},interval:13,stop:function(){clearInterval(ba);ba=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){c.style(a.elem,"opacity",a.now)},_default:function(a){if(a.elem.style&&a.elem.style[a.prop]!=null)a.elem.style[a.prop]=(a.prop==="width"||a.prop==="height"?Math.max(0,a.now):a.now)+a.unit;else a.elem[a.prop]=a.now}}});if(c.expr&&c.expr.filters)c.expr.filters.animated=function(a){return c.grep(c.timers,function(b){return a===
+b.elem}).length};var xb=/^t(?:able|d|h)$/i,Ia=/^(?:body|html)$/i;c.fn.offset="getBoundingClientRect"in t.documentElement?function(a){var b=this[0],d;if(a)return this.each(function(l){c.offset.setOffset(this,a,l)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return c.offset.bodyOffset(b);try{d=b.getBoundingClientRect()}catch(e){}var f=b.ownerDocument,h=f.documentElement;if(!d||!c.contains(h,b))return d||{top:0,left:0};b=f.body;f=fa(f);return{top:d.top+(f.pageYOffset||c.support.boxModel&&
+h.scrollTop||b.scrollTop)-(h.clientTop||b.clientTop||0),left:d.left+(f.pageXOffset||c.support.boxModel&&h.scrollLeft||b.scrollLeft)-(h.clientLeft||b.clientLeft||0)}}:function(a){var b=this[0];if(a)return this.each(function(x){c.offset.setOffset(this,a,x)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return c.offset.bodyOffset(b);c.offset.initialize();var d,e=b.offsetParent,f=b.ownerDocument,h=f.documentElement,l=f.body;d=(f=f.defaultView)?f.getComputedStyle(b,null):b.currentStyle;
+for(var k=b.offsetTop,o=b.offsetLeft;(b=b.parentNode)&&b!==l&&b!==h;){if(c.offset.supportsFixedPosition&&d.position==="fixed")break;d=f?f.getComputedStyle(b,null):b.currentStyle;k-=b.scrollTop;o-=b.scrollLeft;if(b===e){k+=b.offsetTop;o+=b.offsetLeft;if(c.offset.doesNotAddBorder&&!(c.offset.doesAddBorderForTableAndCells&&xb.test(b.nodeName))){k+=parseFloat(d.borderTopWidth)||0;o+=parseFloat(d.borderLeftWidth)||0}e=b.offsetParent}if(c.offset.subtractsBorderForOverflowNotVisible&&d.overflow!=="visible"){k+=
+parseFloat(d.borderTopWidth)||0;o+=parseFloat(d.borderLeftWidth)||0}d=d}if(d.position==="relative"||d.position==="static"){k+=l.offsetTop;o+=l.offsetLeft}if(c.offset.supportsFixedPosition&&d.position==="fixed"){k+=Math.max(h.scrollTop,l.scrollTop);o+=Math.max(h.scrollLeft,l.scrollLeft)}return{top:k,left:o}};c.offset={initialize:function(){var a=t.body,b=t.createElement("div"),d,e,f,h=parseFloat(c.css(a,"marginTop"))||0;c.extend(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",
+height:"1px",visibility:"hidden"});b.innerHTML="<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";a.insertBefore(b,a.firstChild);d=b.firstChild;e=d.firstChild;f=d.nextSibling.firstChild.firstChild;this.doesNotAddBorder=e.offsetTop!==5;this.doesAddBorderForTableAndCells=
+f.offsetTop===5;e.style.position="fixed";e.style.top="20px";this.supportsFixedPosition=e.offsetTop===20||e.offsetTop===15;e.style.position=e.style.top="";d.style.overflow="hidden";d.style.position="relative";this.subtractsBorderForOverflowNotVisible=e.offsetTop===-5;this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==h;a.removeChild(b);c.offset.initialize=c.noop},bodyOffset:function(a){var b=a.offsetTop,d=a.offsetLeft;c.offset.initialize();if(c.offset.doesNotIncludeMarginInBodyOffset){b+=parseFloat(c.css(a,
+"marginTop"))||0;d+=parseFloat(c.css(a,"marginLeft"))||0}return{top:b,left:d}},setOffset:function(a,b,d){var e=c.css(a,"position");if(e==="static")a.style.position="relative";var f=c(a),h=f.offset(),l=c.css(a,"top"),k=c.css(a,"left"),o=e==="absolute"&&c.inArray("auto",[l,k])>-1;e={};var x={};if(o)x=f.position();l=o?x.top:parseInt(l,10)||0;k=o?x.left:parseInt(k,10)||0;if(c.isFunction(b))b=b.call(a,d,h);if(b.top!=null)e.top=b.top-h.top+l;if(b.left!=null)e.left=b.left-h.left+k;"using"in b?b.using.call(a,
+e):f.css(e)}};c.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),d=this.offset(),e=Ia.test(b[0].nodeName)?{top:0,left:0}:b.offset();d.top-=parseFloat(c.css(a,"marginTop"))||0;d.left-=parseFloat(c.css(a,"marginLeft"))||0;e.top+=parseFloat(c.css(b[0],"borderTopWidth"))||0;e.left+=parseFloat(c.css(b[0],"borderLeftWidth"))||0;return{top:d.top-e.top,left:d.left-e.left}},offsetParent:function(){return this.map(function(){for(var a=this.offsetParent||t.body;a&&!Ia.test(a.nodeName)&&
+c.css(a,"position")==="static";)a=a.offsetParent;return a})}});c.each(["Left","Top"],function(a,b){var d="scroll"+b;c.fn[d]=function(e){var f=this[0],h;if(!f)return null;if(e!==B)return this.each(function(){if(h=fa(this))h.scrollTo(!a?e:c(h).scrollLeft(),a?e:c(h).scrollTop());else this[d]=e});else return(h=fa(f))?"pageXOffset"in h?h[a?"pageYOffset":"pageXOffset"]:c.support.boxModel&&h.document.documentElement[d]||h.document.body[d]:f[d]}});c.each(["Height","Width"],function(a,b){var d=b.toLowerCase();
+c.fn["inner"+b]=function(){return this[0]?parseFloat(c.css(this[0],d,"padding")):null};c.fn["outer"+b]=function(e){return this[0]?parseFloat(c.css(this[0],d,e?"margin":"border")):null};c.fn[d]=function(e){var f=this[0];if(!f)return e==null?null:this;if(c.isFunction(e))return this.each(function(l){var k=c(this);k[d](e.call(this,l,k[d]()))});if(c.isWindow(f))return f.document.compatMode==="CSS1Compat"&&f.document.documentElement["client"+b]||f.document.body["client"+b];else if(f.nodeType===9)return Math.max(f.documentElement["client"+
+b],f.body["scroll"+b],f.documentElement["scroll"+b],f.body["offset"+b],f.documentElement["offset"+b]);else if(e===B){f=c.css(f,d);var h=parseFloat(f);return c.isNaN(h)?f:h}else return this.css(d,typeof e==="string"?e:e+"px")}})})(window);
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/js/jquery.ztree.all-3.5.js b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/js/jquery.ztree.all-3.5.js
new file mode 100644
index 0000000..f434293
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/js/jquery.ztree.all-3.5.js
@@ -0,0 +1,3487 @@
+
+/*
+ * JQuery zTree core v3.5.15
+ * http://zTree.me/
+ *
+ * Copyright (c) 2010 Hunter.z
+ *
+ * Licensed same as jquery - MIT License
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ * email: hunter.z@263.net
+ * Date: 2013-10-15
+ */
+(function($){
+	var settings = {}, roots = {}, caches = {},
+	//default consts of core
+	_consts = {
+		className: {
+			BUTTON: "button",
+			LEVEL: "level",
+			ICO_LOADING: "ico_loading",
+			SWITCH: "switch"
+		},
+		event: {
+			NODECREATED: "ztree_nodeCreated",
+			CLICK: "ztree_click",
+			EXPAND: "ztree_expand",
+			COLLAPSE: "ztree_collapse",
+			ASYNC_SUCCESS: "ztree_async_success",
+			ASYNC_ERROR: "ztree_async_error"
+		},
+		id: {
+			A: "_a",
+			ICON: "_ico",
+			SPAN: "_span",
+			SWITCH: "_switch",
+			UL: "_ul"
+		},
+		line: {
+			ROOT: "root",
+			ROOTS: "roots",
+			CENTER: "center",
+			BOTTOM: "bottom",
+			NOLINE: "noline",
+			LINE: "line"
+		},
+		folder: {
+			OPEN: "open",
+			CLOSE: "close",
+			DOCU: "docu"
+		},
+		node: {
+			CURSELECTED: "curSelectedNode"
+		}
+	},
+	//default setting of core
+	_setting = {
+		treeId: "",
+		treeObj: null,
+		view: {
+			addDiyDom: null,
+			autoCancelSelected: true,
+			dblClickExpand: true,
+			expandSpeed: "fast",
+			fontCss: {},
+			nameIsHTML: false,
+			selectedMulti: true,
+			showIcon: true,
+			showLine: true,
+			showTitle: true,
+			txtSelectedEnable: false
+		},
+		data: {
+			key: {
+				children: "children",
+				name: "name",
+				title: "",
+				url: "url"
+			},
+			simpleData: {
+				enable: false,
+				idKey: "id",
+				pIdKey: "pId",
+				rootPId: null
+			},
+			keep: {
+				parent: false,
+				leaf: false
+			}
+		},
+		async: {
+			enable: false,
+			contentType: "application/x-www-form-urlencoded",
+			type: "post",
+			dataType: "text",
+			url: "",
+			autoParam: [],
+			otherParam: [],
+			dataFilter: null
+		},
+		callback: {
+			beforeAsync:null,
+			beforeClick:null,
+			beforeDblClick:null,
+			beforeRightClick:null,
+			beforeMouseDown:null,
+			beforeMouseUp:null,
+			beforeExpand:null,
+			beforeCollapse:null,
+			beforeRemove:null,
+
+			onAsyncError:null,
+			onAsyncSuccess:null,
+			onNodeCreated:null,
+			onClick:null,
+			onDblClick:null,
+			onRightClick:null,
+			onMouseDown:null,
+			onMouseUp:null,
+			onExpand:null,
+			onCollapse:null,
+			onRemove:null
+		}
+	},
+	//default root of core
+	//zTree use root to save full data
+	_initRoot = function (setting) {
+		var r = data.getRoot(setting);
+		if (!r) {
+			r = {};
+			data.setRoot(setting, r);
+		}
+		r[setting.data.key.children] = [];
+		r.expandTriggerFlag = false;
+		r.curSelectedList = [];
+		r.noSelection = true;
+		r.createdNodes = [];
+		r.zId = 0;
+		r._ver = (new Date()).getTime();
+	},
+	//default cache of core
+	_initCache = function(setting) {
+		var c = data.getCache(setting);
+		if (!c) {
+			c = {};
+			data.setCache(setting, c);
+		}
+		c.nodes = [];
+		c.doms = [];
+	},
+	//default bindEvent of core
+	_bindEvent = function(setting) {
+		var o = setting.treeObj,
+		c = consts.event;
+		o.bind(c.NODECREATED, function (event, treeId, node) {
+			tools.apply(setting.callback.onNodeCreated, [event, treeId, node]);
+		});
+
+		o.bind(c.CLICK, function (event, srcEvent, treeId, node, clickFlag) {
+			tools.apply(setting.callback.onClick, [srcEvent, treeId, node, clickFlag]);
+		});
+
+		o.bind(c.EXPAND, function (event, treeId, node) {
+			tools.apply(setting.callback.onExpand, [event, treeId, node]);
+		});
+
+		o.bind(c.COLLAPSE, function (event, treeId, node) {
+			tools.apply(setting.callback.onCollapse, [event, treeId, node]);
+		});
+
+		o.bind(c.ASYNC_SUCCESS, function (event, treeId, node, msg) {
+			tools.apply(setting.callback.onAsyncSuccess, [event, treeId, node, msg]);
+		});
+
+		o.bind(c.ASYNC_ERROR, function (event, treeId, node, XMLHttpRequest, textStatus, errorThrown) {
+			tools.apply(setting.callback.onAsyncError, [event, treeId, node, XMLHttpRequest, textStatus, errorThrown]);
+		});
+	},
+	_unbindEvent = function(setting) {
+		var o = setting.treeObj,
+		c = consts.event;
+		o.unbind(c.NODECREATED)
+		.unbind(c.CLICK)
+		.unbind(c.EXPAND)
+		.unbind(c.COLLAPSE)
+		.unbind(c.ASYNC_SUCCESS)
+		.unbind(c.ASYNC_ERROR);
+	},
+	//default event proxy of core
+	_eventProxy = function(event) {
+		var target = event.target,
+		setting = data.getSetting(event.data.treeId),
+		tId = "", node = null,
+		nodeEventType = "", treeEventType = "",
+		nodeEventCallback = null, treeEventCallback = null,
+		tmp = null;
+
+		if (tools.eqs(event.type, "mousedown")) {
+			treeEventType = "mousedown";
+		} else if (tools.eqs(event.type, "mouseup")) {
+			treeEventType = "mouseup";
+		} else if (tools.eqs(event.type, "contextmenu")) {
+			treeEventType = "contextmenu";
+		} else if (tools.eqs(event.type, "click")) {
+			if (tools.eqs(target.tagName, "span") && target.getAttribute("treeNode"+ consts.id.SWITCH) !== null) {
+				tId = tools.getNodeMainDom(target).id;
+				nodeEventType = "switchNode";
+			} else {
+				tmp = tools.getMDom(setting, target, [{tagName:"a", attrName:"treeNode"+consts.id.A}]);
+				if (tmp) {
+					tId = tools.getNodeMainDom(tmp).id;
+					nodeEventType = "clickNode";
+				}
+			}
+		} else if (tools.eqs(event.type, "dblclick")) {
+			treeEventType = "dblclick";
+			tmp = tools.getMDom(setting, target, [{tagName:"a", attrName:"treeNode"+consts.id.A}]);
+			if (tmp) {
+				tId = tools.getNodeMainDom(tmp).id;
+				nodeEventType = "switchNode";
+			}
+		}
+		if (treeEventType.length > 0 && tId.length == 0) {
+			tmp = tools.getMDom(setting, target, [{tagName:"a", attrName:"treeNode"+consts.id.A}]);
+			if (tmp) {tId = tools.getNodeMainDom(tmp).id;}
+		}
+		// event to node
+		if (tId.length>0) {
+			node = data.getNodeCache(setting, tId);
+			switch (nodeEventType) {
+				case "switchNode" :
+					if (!node.isParent) {
+						nodeEventType = "";
+					} else if (tools.eqs(event.type, "click")
+						|| (tools.eqs(event.type, "dblclick") && tools.apply(setting.view.dblClickExpand, [setting.treeId, node], setting.view.dblClickExpand))) {
+						nodeEventCallback = handler.onSwitchNode;
+					} else {
+						nodeEventType = "";
+					}
+					break;
+				case "clickNode" :
+					nodeEventCallback = handler.onClickNode;
+					break;
+			}
+		}
+		// event to zTree
+		switch (treeEventType) {
+			case "mousedown" :
+				treeEventCallback = handler.onZTreeMousedown;
+				break;
+			case "mouseup" :
+				treeEventCallback = handler.onZTreeMouseup;
+				break;
+			case "dblclick" :
+				treeEventCallback = handler.onZTreeDblclick;
+				break;
+			case "contextmenu" :
+				treeEventCallback = handler.onZTreeContextmenu;
+				break;
+		}
+		var proxyResult = {
+			stop: false,
+			node: node,
+			nodeEventType: nodeEventType,
+			nodeEventCallback: nodeEventCallback,
+			treeEventType: treeEventType,
+			treeEventCallback: treeEventCallback
+		};
+		return proxyResult
+	},
+	//default init node of core
+	_initNode = function(setting, level, n, parentNode, isFirstNode, isLastNode, openFlag) {
+		if (!n) return;
+		var r = data.getRoot(setting),
+		childKey = setting.data.key.children;
+		n.level = level;
+		n.tId = setting.treeId + "_" + (++r.zId);
+		n.parentTId = parentNode ? parentNode.tId : null;
+		n.open = (typeof n.open == "string") ? tools.eqs(n.open, "true") : !!n.open;
+		if (n[childKey] && n[childKey].length > 0) {
+			n.isParent = true;
+			n.zAsync = true;
+		} else {
+			n.isParent = (typeof n.isParent == "string") ? tools.eqs(n.isParent, "true") : !!n.isParent;
+			n.open = (n.isParent && !setting.async.enable) ? n.open : false;
+			n.zAsync = !n.isParent;
+		}
+		n.isFirstNode = isFirstNode;
+		n.isLastNode = isLastNode;
+		n.getParentNode = function() {return data.getNodeCache(setting, n.parentTId);};
+		n.getPreNode = function() {return data.getPreNode(setting, n);};
+		n.getNextNode = function() {return data.getNextNode(setting, n);};
+		n.isAjaxing = false;
+		data.fixPIdKeyValue(setting, n);
+	},
+	_init = {
+		bind: [_bindEvent],
+		unbind: [_unbindEvent],
+		caches: [_initCache],
+		nodes: [_initNode],
+		proxys: [_eventProxy],
+		roots: [_initRoot],
+		beforeA: [],
+		afterA: [],
+		innerBeforeA: [],
+		innerAfterA: [],
+		zTreeTools: []
+	},
+	//method of operate data
+	data = {
+		addNodeCache: function(setting, node) {
+			data.getCache(setting).nodes[data.getNodeCacheId(node.tId)] = node;
+		},
+		getNodeCacheId: function(tId) {
+			return tId.substring(tId.lastIndexOf("_")+1);
+		},
+		addAfterA: function(afterA) {
+			_init.afterA.push(afterA);
+		},
+		addBeforeA: function(beforeA) {
+			_init.beforeA.push(beforeA);
+		},
+		addInnerAfterA: function(innerAfterA) {
+			_init.innerAfterA.push(innerAfterA);
+		},
+		addInnerBeforeA: function(innerBeforeA) {
+			_init.innerBeforeA.push(innerBeforeA);
+		},
+		addInitBind: function(bindEvent) {
+			_init.bind.push(bindEvent);
+		},
+		addInitUnBind: function(unbindEvent) {
+			_init.unbind.push(unbindEvent);
+		},
+		addInitCache: function(initCache) {
+			_init.caches.push(initCache);
+		},
+		addInitNode: function(initNode) {
+			_init.nodes.push(initNode);
+		},
+		addInitProxy: function(initProxy, isFirst) {
+			if (!!isFirst) {
+				_init.proxys.splice(0,0,initProxy);
+			} else {
+				_init.proxys.push(initProxy);
+			}
+		},
+		addInitRoot: function(initRoot) {
+			_init.roots.push(initRoot);
+		},
+		addNodesData: function(setting, parentNode, nodes) {
+			var childKey = setting.data.key.children;
+			if (!parentNode[childKey]) parentNode[childKey] = [];
+			if (parentNode[childKey].length > 0) {
+				parentNode[childKey][parentNode[childKey].length - 1].isLastNode = false;
+				view.setNodeLineIcos(setting, parentNode[childKey][parentNode[childKey].length - 1]);
+			}
+			parentNode.isParent = true;
+			parentNode[childKey] = parentNode[childKey].concat(nodes);
+		},
+		addSelectedNode: function(setting, node) {
+			var root = data.getRoot(setting);
+			if (!data.isSelectedNode(setting, node)) {
+				root.curSelectedList.push(node);
+			}
+		},
+		addCreatedNode: function(setting, node) {
+			if (!!setting.callback.onNodeCreated || !!setting.view.addDiyDom) {
+				var root = data.getRoot(setting);
+				root.createdNodes.push(node);
+			}
+		},
+		addZTreeTools: function(zTreeTools) {
+			_init.zTreeTools.push(zTreeTools);
+		},
+		exSetting: function(s) {
+			$.extend(true, _setting, s);
+		},
+		fixPIdKeyValue: function(setting, node) {
+			if (setting.data.simpleData.enable) {
+				node[setting.data.simpleData.pIdKey] = node.parentTId ? node.getParentNode()[setting.data.simpleData.idKey] : setting.data.simpleData.rootPId;
+			}
+		},
+		getAfterA: function(setting, node, array) {
+			for (var i=0, j=_init.afterA.length; i<j; i++) {
+				_init.afterA[i].apply(this, arguments);
+			}
+		},
+		getBeforeA: function(setting, node, array) {
+			for (var i=0, j=_init.beforeA.length; i<j; i++) {
+				_init.beforeA[i].apply(this, arguments);
+			}
+		},
+		getInnerAfterA: function(setting, node, array) {
+			for (var i=0, j=_init.innerAfterA.length; i<j; i++) {
+				_init.innerAfterA[i].apply(this, arguments);
+			}
+		},
+		getInnerBeforeA: function(setting, node, array) {
+			for (var i=0, j=_init.innerBeforeA.length; i<j; i++) {
+				_init.innerBeforeA[i].apply(this, arguments);
+			}
+		},
+		getCache: function(setting) {
+			return caches[setting.treeId];
+		},
+		getNextNode: function(setting, node) {
+			if (!node) return null;
+			var childKey = setting.data.key.children,
+			p = node.parentTId ? node.getParentNode() : data.getRoot(setting);
+			for (var i=0, l=p[childKey].length-1; i<=l; i++) {
+				if (p[childKey][i] === node) {
+					return (i==l ? null : p[childKey][i+1]);
+				}
+			}
+			return null;
+		},
+		getNodeByParam: function(setting, nodes, key, value) {
+			if (!nodes || !key) return null;
+			var childKey = setting.data.key.children;
+			for (var i = 0, l = nodes.length; i < l; i++) {
+				if (nodes[i][key] == value) {
+					return nodes[i];
+				}
+				var tmp = data.getNodeByParam(setting, nodes[i][childKey], key, value);
+				if (tmp) return tmp;
+			}
+			return null;
+		},
+		getNodeCache: function(setting, tId) {
+			if (!tId) return null;
+			var n = caches[setting.treeId].nodes[data.getNodeCacheId(tId)];
+			return n ? n : null;
+		},
+		getNodeName: function(setting, node) {
+			var nameKey = setting.data.key.name;
+			return "" + node[nameKey];
+		},
+		getNodeTitle: function(setting, node) {
+			var t = setting.data.key.title === "" ? setting.data.key.name : setting.data.key.title;
+			return "" + node[t];
+		},
+		getNodes: function(setting) {
+			return data.getRoot(setting)[setting.data.key.children];
+		},
+		getNodesByParam: function(setting, nodes, key, value) {
+			if (!nodes || !key) return [];
+			var childKey = setting.data.key.children,
+			result = [];
+			for (var i = 0, l = nodes.length; i < l; i++) {
+				if (nodes[i][key] == value) {
+					result.push(nodes[i]);
+				}
+				result = result.concat(data.getNodesByParam(setting, nodes[i][childKey], key, value));
+			}
+			return result;
+		},
+		getNodesByParamFuzzy: function(setting, nodes, key, value) {
+			if (!nodes || !key) return [];
+			var childKey = setting.data.key.children,
+			result = [];
+			value = value.toLowerCase();
+			for (var i = 0, l = nodes.length; i < l; i++) {
+				if (typeof nodes[i][key] == "string" && nodes[i][key].toLowerCase().indexOf(value)>-1) {
+					result.push(nodes[i]);
+				}
+				result = result.concat(data.getNodesByParamFuzzy(setting, nodes[i][childKey], key, value));
+			}
+			return result;
+		},
+		getNodesByFilter: function(setting, nodes, filter, isSingle, invokeParam) {
+			if (!nodes) return (isSingle ? null : []);
+			var childKey = setting.data.key.children,
+			result = isSingle ? null : [];
+			for (var i = 0, l = nodes.length; i < l; i++) {
+				if (tools.apply(filter, [nodes[i], invokeParam], false)) {
+					if (isSingle) {return nodes[i];}
+					result.push(nodes[i]);
+				}
+				var tmpResult = data.getNodesByFilter(setting, nodes[i][childKey], filter, isSingle, invokeParam);
+				if (isSingle && !!tmpResult) {return tmpResult;}
+				result = isSingle ? tmpResult : result.concat(tmpResult);
+			}
+			return result;
+		},
+		getPreNode: function(setting, node) {
+			if (!node) return null;
+			var childKey = setting.data.key.children,
+			p = node.parentTId ? node.getParentNode() : data.getRoot(setting);
+			for (var i=0, l=p[childKey].length; i<l; i++) {
+				if (p[childKey][i] === node) {
+					return (i==0 ? null : p[childKey][i-1]);
+				}
+			}
+			return null;
+		},
+		getRoot: function(setting) {
+			return setting ? roots[setting.treeId] : null;
+		},
+		getRoots: function() {
+			return roots;
+		},
+		getSetting: function(treeId) {
+			return settings[treeId];
+		},
+		getSettings: function() {
+			return settings;
+		},
+		getZTreeTools: function(treeId) {
+			var r = this.getRoot(this.getSetting(treeId));
+			return r ? r.treeTools : null;
+		},
+		initCache: function(setting) {
+			for (var i=0, j=_init.caches.length; i<j; i++) {
+				_init.caches[i].apply(this, arguments);
+			}
+		},
+		initNode: function(setting, level, node, parentNode, preNode, nextNode) {
+			for (var i=0, j=_init.nodes.length; i<j; i++) {
+				_init.nodes[i].apply(this, arguments);
+			}
+		},
+		initRoot: function(setting) {
+			for (var i=0, j=_init.roots.length; i<j; i++) {
+				_init.roots[i].apply(this, arguments);
+			}
+		},
+		isSelectedNode: function(setting, node) {
+			var root = data.getRoot(setting);
+			for (var i=0, j=root.curSelectedList.length; i<j; i++) {
+				if(node === root.curSelectedList[i]) return true;
+			}
+			return false;
+		},
+		removeNodeCache: function(setting, node) {
+			var childKey = setting.data.key.children;
+			if (node[childKey]) {
+				for (var i=0, l=node[childKey].length; i<l; i++) {
+					arguments.callee(setting, node[childKey][i]);
+				}
+			}
+			data.getCache(setting).nodes[data.getNodeCacheId(node.tId)] = null;
+		},
+		removeSelectedNode: function(setting, node) {
+			var root = data.getRoot(setting);
+			for (var i=0, j=root.curSelectedList.length; i<j; i++) {
+				if(node === root.curSelectedList[i] || !data.getNodeCache(setting, root.curSelectedList[i].tId)) {
+					root.curSelectedList.splice(i, 1);
+					i--;j--;
+				}
+			}
+		},
+		setCache: function(setting, cache) {
+			caches[setting.treeId] = cache;
+		},
+		setRoot: function(setting, root) {
+			roots[setting.treeId] = root;
+		},
+		setZTreeTools: function(setting, zTreeTools) {
+			for (var i=0, j=_init.zTreeTools.length; i<j; i++) {
+				_init.zTreeTools[i].apply(this, arguments);
+			}
+		},
+		transformToArrayFormat: function (setting, nodes) {
+			if (!nodes) return [];
+			var childKey = setting.data.key.children,
+			r = [];
+			if (tools.isArray(nodes)) {
+				for (var i=0, l=nodes.length; i<l; i++) {
+					r.push(nodes[i]);
+					if (nodes[i][childKey])
+						r = r.concat(data.transformToArrayFormat(setting, nodes[i][childKey]));
+				}
+			} else {
+				r.push(nodes);
+				if (nodes[childKey])
+					r = r.concat(data.transformToArrayFormat(setting, nodes[childKey]));
+			}
+			return r;
+		},
+		transformTozTreeFormat: function(setting, sNodes) {
+			var i,l,
+			key = setting.data.simpleData.idKey,
+			parentKey = setting.data.simpleData.pIdKey,
+			childKey = setting.data.key.children;
+			if (!key || key=="" || !sNodes) return [];
+
+			if (tools.isArray(sNodes)) {
+				var r = [];
+				var tmpMap = [];
+				for (i=0, l=sNodes.length; i<l; i++) {
+					tmpMap[sNodes[i][key]] = sNodes[i];
+				}
+				for (i=0, l=sNodes.length; i<l; i++) {
+					if (tmpMap[sNodes[i][parentKey]] && sNodes[i][key] != sNodes[i][parentKey]) {
+						if (!tmpMap[sNodes[i][parentKey]][childKey])
+							tmpMap[sNodes[i][parentKey]][childKey] = [];
+						tmpMap[sNodes[i][parentKey]][childKey].push(sNodes[i]);
+					} else {
+						r.push(sNodes[i]);
+					}
+				}
+				return r;
+			}else {
+				return [sNodes];
+			}
+		}
+	},
+	//method of event proxy
+	event = {
+		bindEvent: function(setting) {
+			for (var i=0, j=_init.bind.length; i<j; i++) {
+				_init.bind[i].apply(this, arguments);
+			}
+		},
+		unbindEvent: function(setting) {
+			for (var i=0, j=_init.unbind.length; i<j; i++) {
+				_init.unbind[i].apply(this, arguments);
+			}
+		},
+		bindTree: function(setting) {
+			var eventParam = {
+				treeId: setting.treeId
+			},
+			o = setting.treeObj;
+			if (!setting.view.txtSelectedEnable) {
+				// for can't select text
+				o.bind('selectstart', function(e){
+					var node
+					var n = e.originalEvent.srcElement.nodeName.toLowerCase();
+					return (n === "input" || n === "textarea" );
+				}).css({
+					"-moz-user-select":"-moz-none"
+				});
+			}
+			o.bind('click', eventParam, event.proxy);
+			o.bind('dblclick', eventParam, event.proxy);
+			o.bind('mouseover', eventParam, event.proxy);
+			o.bind('mouseout', eventParam, event.proxy);
+			o.bind('mousedown', eventParam, event.proxy);
+			o.bind('mouseup', eventParam, event.proxy);
+			o.bind('contextmenu', eventParam, event.proxy);
+		},
+		unbindTree: function(setting) {
+			var o = setting.treeObj;
+			o.unbind('click', event.proxy)
+			.unbind('dblclick', event.proxy)
+			.unbind('mouseover', event.proxy)
+			.unbind('mouseout', event.proxy)
+			.unbind('mousedown', event.proxy)
+			.unbind('mouseup', event.proxy)
+			.unbind('contextmenu', event.proxy);
+		},
+		doProxy: function(e) {
+			var results = [];
+			for (var i=0, j=_init.proxys.length; i<j; i++) {
+				var proxyResult = _init.proxys[i].apply(this, arguments);
+				results.push(proxyResult);
+				if (proxyResult.stop) {
+					break;
+				}
+			}
+			return results;
+		},
+		proxy: function(e) {
+			var setting = data.getSetting(e.data.treeId);
+			if (!tools.uCanDo(setting, e)) return true;
+			var results = event.doProxy(e),
+			r = true, x = false;
+			for (var i=0, l=results.length; i<l; i++) {
+				var proxyResult = results[i];
+				if (proxyResult.nodeEventCallback) {
+					x = true;
+					r = proxyResult.nodeEventCallback.apply(proxyResult, [e, proxyResult.node]) && r;
+				}
+				if (proxyResult.treeEventCallback) {
+					x = true;
+					r = proxyResult.treeEventCallback.apply(proxyResult, [e, proxyResult.node]) && r;
+				}
+			}
+			return r;
+		}
+	},
+	//method of event handler
+	handler = {
+		onSwitchNode: function (event, node) {
+			var setting = data.getSetting(event.data.treeId);
+			if (node.open) {
+				if (tools.apply(setting.callback.beforeCollapse, [setting.treeId, node], true) == false) return true;
+				data.getRoot(setting).expandTriggerFlag = true;
+				view.switchNode(setting, node);
+			} else {
+				if (tools.apply(setting.callback.beforeExpand, [setting.treeId, node], true) == false) return true;
+				data.getRoot(setting).expandTriggerFlag = true;
+				view.switchNode(setting, node);
+			}
+			return true;
+		},
+		onClickNode: function (event, node) {
+			var setting = data.getSetting(event.data.treeId),
+			clickFlag = ( (setting.view.autoCancelSelected && event.ctrlKey) && data.isSelectedNode(setting, node)) ? 0 : (setting.view.autoCancelSelected && event.ctrlKey && setting.view.selectedMulti) ? 2 : 1;
+			if (tools.apply(setting.callback.beforeClick, [setting.treeId, node, clickFlag], true) == false) return true;
+			if (clickFlag === 0) {
+				view.cancelPreSelectedNode(setting, node);
+			} else {
+				view.selectNode(setting, node, clickFlag === 2);
+			}
+			setting.treeObj.trigger(consts.event.CLICK, [event, setting.treeId, node, clickFlag]);
+			return true;
+		},
+		onZTreeMousedown: function(event, node) {
+			var setting = data.getSetting(event.data.treeId);
+			if (tools.apply(setting.callback.beforeMouseDown, [setting.treeId, node], true)) {
+				tools.apply(setting.callback.onMouseDown, [event, setting.treeId, node]);
+			}
+			return true;
+		},
+		onZTreeMouseup: function(event, node) {
+			var setting = data.getSetting(event.data.treeId);
+			if (tools.apply(setting.callback.beforeMouseUp, [setting.treeId, node], true)) {
+				tools.apply(setting.callback.onMouseUp, [event, setting.treeId, node]);
+			}
+			return true;
+		},
+		onZTreeDblclick: function(event, node) {
+			var setting = data.getSetting(event.data.treeId);
+			if (tools.apply(setting.callback.beforeDblClick, [setting.treeId, node], true)) {
+				tools.apply(setting.callback.onDblClick, [event, setting.treeId, node]);
+			}
+			return true;
+		},
+		onZTreeContextmenu: function(event, node) {
+			var setting = data.getSetting(event.data.treeId);
+			if (tools.apply(setting.callback.beforeRightClick, [setting.treeId, node], true)) {
+				tools.apply(setting.callback.onRightClick, [event, setting.treeId, node]);
+			}
+			return (typeof setting.callback.onRightClick) != "function";
+		}
+	},
+	//method of tools for zTree
+	tools = {
+		apply: function(fun, param, defaultValue) {
+			if ((typeof fun) == "function") {
+				return fun.apply(zt, param?param:[]);
+			}
+			return defaultValue;
+		},
+		canAsync: function(setting, node) {
+			var childKey = setting.data.key.children;
+			return (setting.async.enable && node && node.isParent && !(node.zAsync || (node[childKey] && node[childKey].length > 0)));
+		},
+		clone: function (obj){
+			if (obj === null) return null;
+			var o = tools.isArray(obj) ? [] : {};
+			for(var i in obj){
+				o[i] = (obj[i] instanceof Date) ? new Date(obj[i].getTime()) : (typeof obj[i] === "object" ? arguments.callee(obj[i]) : obj[i]);
+			}
+			return o;
+		},
+		eqs: function(str1, str2) {
+			return str1.toLowerCase() === str2.toLowerCase();
+		},
+		isArray: function(arr) {
+			return Object.prototype.toString.apply(arr) === "[object Array]";
+		},
+		$: function(node, exp, setting) {
+			if (!!exp && typeof exp != "string") {
+				setting = exp;
+				exp = "";
+			}
+			if (typeof node == "string") {
+				return $(node, setting ? setting.treeObj.get(0).ownerDocument : null);
+			} else {
+				return $("#" + node.tId + exp, setting ? setting.treeObj : null);
+			}
+		},
+		getMDom: function (setting, curDom, targetExpr) {
+			if (!curDom) return null;
+			while (curDom && curDom.id !== setting.treeId) {
+				for (var i=0, l=targetExpr.length; curDom.tagName && i<l; i++) {
+					if (tools.eqs(curDom.tagName, targetExpr[i].tagName) && curDom.getAttribute(targetExpr[i].attrName) !== null) {
+						return curDom;
+					}
+				}
+				curDom = curDom.parentNode;
+			}
+			return null;
+		},
+		getNodeMainDom:function(target) {
+			return ($(target).parent("li").get(0) || $(target).parentsUntil("li").parent().get(0));
+		},
+		isChildOrSelf: function(dom, parentId) {
+			return ( $(dom).closest("#" + parentId).length> 0 );
+		},
+		uCanDo: function(setting, e) {
+			return true;
+		}
+	},
+	//method of operate ztree dom
+	view = {
+		addNodes: function(setting, parentNode, newNodes, isSilent) {
+			if (setting.data.keep.leaf && parentNode && !parentNode.isParent) {
+				return;
+			}
+			if (!tools.isArray(newNodes)) {
+				newNodes = [newNodes];
+			}
+			if (setting.data.simpleData.enable) {
+				newNodes = data.transformTozTreeFormat(setting, newNodes);
+			}
+			if (parentNode) {
+				var target_switchObj = $$(parentNode, consts.id.SWITCH, setting),
+				target_icoObj = $$(parentNode, consts.id.ICON, setting),
+				target_ulObj = $$(parentNode, consts.id.UL, setting);
+
+				if (!parentNode.open) {
+					view.replaceSwitchClass(parentNode, target_switchObj, consts.folder.CLOSE);
+					view.replaceIcoClass(parentNode, target_icoObj, consts.folder.CLOSE);
+					parentNode.open = false;
+					target_ulObj.css({
+						"display": "none"
+					});
+				}
+
+				data.addNodesData(setting, parentNode, newNodes);
+				view.createNodes(setting, parentNode.level + 1, newNodes, parentNode);
+				if (!isSilent) {
+					view.expandCollapseParentNode(setting, parentNode, true);
+				}
+			} else {
+				data.addNodesData(setting, data.getRoot(setting), newNodes);
+				view.createNodes(setting, 0, newNodes, null);
+			}
+		},
+		appendNodes: function(setting, level, nodes, parentNode, initFlag, openFlag) {
+			if (!nodes) return [];
+			var html = [],
+			childKey = setting.data.key.children;
+			for (var i = 0, l = nodes.length; i < l; i++) {
+				var node = nodes[i];
+				if (initFlag) {
+					var tmpPNode = (parentNode) ? parentNode: data.getRoot(setting),
+					tmpPChild = tmpPNode[childKey],
+					isFirstNode = ((tmpPChild.length == nodes.length) && (i == 0)),
+					isLastNode = (i == (nodes.length - 1));
+					data.initNode(setting, level, node, parentNode, isFirstNode, isLastNode, openFlag);
+					data.addNodeCache(setting, node);
+				}
+
+				var childHtml = [];
+				if (node[childKey] && node[childKey].length > 0) {
+					//make child html first, because checkType
+					childHtml = view.appendNodes(setting, level + 1, node[childKey], node, initFlag, openFlag && node.open);
+				}
+				if (openFlag) {
+
+					view.makeDOMNodeMainBefore(html, setting, node);
+					view.makeDOMNodeLine(html, setting, node);
+					data.getBeforeA(setting, node, html);
+					view.makeDOMNodeNameBefore(html, setting, node);
+					data.getInnerBeforeA(setting, node, html);
+					view.makeDOMNodeIcon(html, setting, node);
+					data.getInnerAfterA(setting, node, html);
+					view.makeDOMNodeNameAfter(html, setting, node);
+					data.getAfterA(setting, node, html);
+					if (node.isParent && node.open) {
+						view.makeUlHtml(setting, node, html, childHtml.join(''));
+					}
+					view.makeDOMNodeMainAfter(html, setting, node);
+					data.addCreatedNode(setting, node);
+				}
+			}
+			return html;
+		},
+		appendParentULDom: function(setting, node) {
+			var html = [],
+			nObj = $$(node, setting);
+			if (!nObj.get(0) && !!node.parentTId) {
+				view.appendParentULDom(setting, node.getParentNode());
+				nObj = $$(node, setting);
+			}
+			var ulObj = $$(node, consts.id.UL, setting);
+			if (ulObj.get(0)) {
+				ulObj.remove();
+			}
+			var childKey = setting.data.key.children,
+			childHtml = view.appendNodes(setting, node.level+1, node[childKey], node, false, true);
+			view.makeUlHtml(setting, node, html, childHtml.join(''));
+			nObj.append(html.join(''));
+		},
+		asyncNode: function(setting, node, isSilent, callback) {
+			var i, l;
+			if (node && !node.isParent) {
+				tools.apply(callback);
+				return false;
+			} else if (node && node.isAjaxing) {
+				return false;
+			} else if (tools.apply(setting.callback.beforeAsync, [setting.treeId, node], true) == false) {
+				tools.apply(callback);
+				return false;
+			}
+			if (node) {
+				node.isAjaxing = true;
+				var icoObj = $$(node, consts.id.ICON, setting);
+				icoObj.attr({"style":"", "class":consts.className.BUTTON + " " + consts.className.ICO_LOADING});
+			}
+
+			var tmpParam = {};
+			for (i = 0, l = setting.async.autoParam.length; node && i < l; i++) {
+				var pKey = setting.async.autoParam[i].split("="), spKey = pKey;
+				if (pKey.length>1) {
+					spKey = pKey[1];
+					pKey = pKey[0];
+				}
+				tmpParam[spKey] = node[pKey];
+			}
+			if (tools.isArray(setting.async.otherParam)) {
+				for (i = 0, l = setting.async.otherParam.length; i < l; i += 2) {
+					tmpParam[setting.async.otherParam[i]] = setting.async.otherParam[i + 1];
+				}
+			} else {
+				for (var p in setting.async.otherParam) {
+					tmpParam[p] = setting.async.otherParam[p];
+				}
+			}
+
+			var _tmpV = data.getRoot(setting)._ver;
+			$.ajax({
+				contentType: setting.async.contentType,
+				type: setting.async.type,
+				url: tools.apply(setting.async.url, [setting.treeId, node], setting.async.url),
+				data: tmpParam,
+				dataType: setting.async.dataType,
+				success: function(msg) {
+					if (_tmpV != data.getRoot(setting)._ver) {
+						return;
+					}
+					var newNodes = [];
+					try {
+						if (!msg || msg.length == 0) {
+							newNodes = [];
+						} else if (typeof msg == "string") {
+							newNodes = eval("(" + msg + ")");
+						} else {
+							newNodes = msg;
+						}
+					} catch(err) {
+						newNodes = msg;
+					}
+
+					if (node) {
+						node.isAjaxing = null;
+						node.zAsync = true;
+					}
+					view.setNodeLineIcos(setting, node);
+					if (newNodes && newNodes !== "") {
+						newNodes = tools.apply(setting.async.dataFilter, [setting.treeId, node, newNodes], newNodes);
+						view.addNodes(setting, node, !!newNodes ? tools.clone(newNodes) : [], !!isSilent);
+					} else {
+						view.addNodes(setting, node, [], !!isSilent);
+					}
+					setting.treeObj.trigger(consts.event.ASYNC_SUCCESS, [setting.treeId, node, msg]);
+					tools.apply(callback);
+				},
+				error: function(XMLHttpRequest, textStatus, errorThrown) {
+					if (_tmpV != data.getRoot(setting)._ver) {
+						return;
+					}
+					if (node) node.isAjaxing = null;
+					view.setNodeLineIcos(setting, node);
+					setting.treeObj.trigger(consts.event.ASYNC_ERROR, [setting.treeId, node, XMLHttpRequest, textStatus, errorThrown]);
+				}
+			});
+			return true;
+		},
+		cancelPreSelectedNode: function (setting, node) {
+			var list = data.getRoot(setting).curSelectedList;
+			for (var i=0, j=list.length-1; j>=i; j--) {
+				if (!node || node === list[j]) {
+					$$(list[j], consts.id.A, setting).removeClass(consts.node.CURSELECTED);
+					if (node) {
+						data.removeSelectedNode(setting, node);
+						break;
+					}
+				}
+			}
+			if (!node) data.getRoot(setting).curSelectedList = [];
+		},
+		createNodeCallback: function(setting) {
+			if (!!setting.callback.onNodeCreated || !!setting.view.addDiyDom) {
+				var root = data.getRoot(setting);
+				while (root.createdNodes.length>0) {
+					var node = root.createdNodes.shift();
+					tools.apply(setting.view.addDiyDom, [setting.treeId, node]);
+					if (!!setting.callback.onNodeCreated) {
+						setting.treeObj.trigger(consts.event.NODECREATED, [setting.treeId, node]);
+					}
+				}
+			}
+		},
+		createNodes: function(setting, level, nodes, parentNode) {
+			if (!nodes || nodes.length == 0) return;
+			var root = data.getRoot(setting),
+			childKey = setting.data.key.children,
+			openFlag = !parentNode || parentNode.open || !!$$(parentNode[childKey][0], setting).get(0);
+			root.createdNodes = [];
+			var zTreeHtml = view.appendNodes(setting, level, nodes, parentNode, true, openFlag);
+			if (!parentNode) {
+				setting.treeObj.append(zTreeHtml.join(''));
+			} else {
+				var ulObj = $$(parentNode, consts.id.UL, setting);
+				if (ulObj.get(0)) {
+					ulObj.append(zTreeHtml.join(''));
+				}
+			}
+			view.createNodeCallback(setting);
+		},
+		destroy: function(setting) {
+			if (!setting) return;
+			data.initCache(setting);
+			data.initRoot(setting);
+			event.unbindTree(setting);
+			event.unbindEvent(setting);
+			setting.treeObj.empty();
+		},
+		expandCollapseNode: function(setting, node, expandFlag, animateFlag, callback) {
+			var root = data.getRoot(setting),
+			childKey = setting.data.key.children;
+			if (!node) {
+				tools.apply(callback, []);
+				return;
+			}
+			if (root.expandTriggerFlag) {
+				var _callback = callback;
+				callback = function(){
+					if (_callback) _callback();
+					if (node.open) {
+						setting.treeObj.trigger(consts.event.EXPAND, [setting.treeId, node]);
+					} else {
+						setting.treeObj.trigger(consts.event.COLLAPSE, [setting.treeId, node]);
+					}
+				};
+				root.expandTriggerFlag = false;
+			}
+			if (!node.open && node.isParent && ((!$$(node, consts.id.UL, setting).get(0)) || (node[childKey] && node[childKey].length>0 && !$$(node[childKey][0], setting).get(0)))) {
+				view.appendParentULDom(setting, node);
+				view.createNodeCallback(setting);
+			}
+			if (node.open == expandFlag) {
+				tools.apply(callback, []);
+				return;
+			}
+			var ulObj = $$(node, consts.id.UL, setting),
+			switchObj = $$(node, consts.id.SWITCH, setting),
+			icoObj = $$(node, consts.id.ICON, setting);
+
+			if (node.isParent) {
+				node.open = !node.open;
+				if (node.iconOpen && node.iconClose) {
+					icoObj.attr("style", view.makeNodeIcoStyle(setting, node));
+				}
+
+				if (node.open) {
+					view.replaceSwitchClass(node, switchObj, consts.folder.OPEN);
+					view.replaceIcoClass(node, icoObj, consts.folder.OPEN);
+					if (animateFlag == false || setting.view.expandSpeed == "") {
+						ulObj.show();
+						tools.apply(callback, []);
+					} else {
+						if (node[childKey] && node[childKey].length > 0) {
+							ulObj.slideDown(setting.view.expandSpeed, callback);
+						} else {
+							ulObj.show();
+							tools.apply(callback, []);
+						}
+					}
+				} else {
+					view.replaceSwitchClass(node, switchObj, consts.folder.CLOSE);
+					view.replaceIcoClass(node, icoObj, consts.folder.CLOSE);
+					if (animateFlag == false || setting.view.expandSpeed == "" || !(node[childKey] && node[childKey].length > 0)) {
+						ulObj.hide();
+						tools.apply(callback, []);
+					} else {
+						ulObj.slideUp(setting.view.expandSpeed, callback);
+					}
+				}
+			} else {
+				tools.apply(callback, []);
+			}
+		},
+		expandCollapseParentNode: function(setting, node, expandFlag, animateFlag, callback) {
+			if (!node) return;
+			if (!node.parentTId) {
+				view.expandCollapseNode(setting, node, expandFlag, animateFlag, callback);
+				return;
+			} else {
+				view.expandCollapseNode(setting, node, expandFlag, animateFlag);
+			}
+			if (node.parentTId) {
+				view.expandCollapseParentNode(setting, node.getParentNode(), expandFlag, animateFlag, callback);
+			}
+		},
+		expandCollapseSonNode: function(setting, node, expandFlag, animateFlag, callback) {
+			var root = data.getRoot(setting),
+			childKey = setting.data.key.children,
+			treeNodes = (node) ? node[childKey]: root[childKey],
+			selfAnimateSign = (node) ? false : animateFlag,
+			expandTriggerFlag = data.getRoot(setting).expandTriggerFlag;
+			data.getRoot(setting).expandTriggerFlag = false;
+			if (treeNodes) {
+				for (var i = 0, l = treeNodes.length; i < l; i++) {
+					if (treeNodes[i]) view.expandCollapseSonNode(setting, treeNodes[i], expandFlag, selfAnimateSign);
+				}
+			}
+			data.getRoot(setting).expandTriggerFlag = expandTriggerFlag;
+			view.expandCollapseNode(setting, node, expandFlag, animateFlag, callback );
+		},
+		makeDOMNodeIcon: function(html, setting, node) {
+			var nameStr = data.getNodeName(setting, node),
+			name = setting.view.nameIsHTML ? nameStr : nameStr.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;');
+			html.push("<span id='", node.tId, consts.id.ICON,
+				"' title='' treeNode", consts.id.ICON," class='", view.makeNodeIcoClass(setting, node),
+				"' style='", view.makeNodeIcoStyle(setting, node), "'></span><span id='", node.tId, consts.id.SPAN,
+				"'>",name,"</span>");
+		},
+		makeDOMNodeLine: function(html, setting, node) {
+			html.push("<span id='", node.tId, consts.id.SWITCH,	"' title='' class='", view.makeNodeLineClass(setting, node), "' treeNode", consts.id.SWITCH,"></span>");
+		},
+		makeDOMNodeMainAfter: function(html, setting, node) {
+			html.push("</li>");
+		},
+		makeDOMNodeMainBefore: function(html, setting, node) {
+			html.push("<li id='", node.tId, "' class='", consts.className.LEVEL, node.level,"' tabindex='0' hidefocus='true' treenode>");
+		},
+		makeDOMNodeNameAfter: function(html, setting, node) {
+			html.push("</a>");
+		},
+		makeDOMNodeNameBefore: function(html, setting, node) {
+			var title = data.getNodeTitle(setting, node),
+			url = view.makeNodeUrl(setting, node),
+			fontcss = view.makeNodeFontCss(setting, node),
+			fontStyle = [];
+			for (var f in fontcss) {
+				fontStyle.push(f, ":", fontcss[f], ";");
+			}
+			html.push("<a id='", node.tId, consts.id.A, "' class='", consts.className.LEVEL, node.level,"' treeNode", consts.id.A," onclick=\"", (node.click || ''),
+				"\" ", ((url != null && url.length > 0) ? "href='" + url + "'" : ""), " target='",view.makeNodeTarget(node),"' style='", fontStyle.join(''),
+				"'");
+			if (tools.apply(setting.view.showTitle, [setting.treeId, node], setting.view.showTitle) && title) {html.push("title='", title.replace(/'/g,"&#39;").replace(/</g,'&lt;').replace(/>/g,'&gt;'),"'");}
+			html.push(">");
+		},
+		makeNodeFontCss: function(setting, node) {
+			var fontCss = tools.apply(setting.view.fontCss, [setting.treeId, node], setting.view.fontCss);
+			return (fontCss && ((typeof fontCss) != "function")) ? fontCss : {};
+		},
+		makeNodeIcoClass: function(setting, node) {
+			var icoCss = ["ico"];
+			if (!node.isAjaxing) {
+				icoCss[0] = (node.iconSkin ? node.iconSkin + "_" : "") + icoCss[0];
+				if (node.isParent) {
+					icoCss.push(node.open ? consts.folder.OPEN : consts.folder.CLOSE);
+				} else {
+					icoCss.push(consts.folder.DOCU);
+				}
+			}
+			return consts.className.BUTTON + " " + icoCss.join('_');
+		},
+		makeNodeIcoStyle: function(setting, node) {
+			var icoStyle = [];
+			if (!node.isAjaxing) {
+				var icon = (node.isParent && node.iconOpen && node.iconClose) ? (node.open ? node.iconOpen : node.iconClose) : node.icon;
+				if (icon) icoStyle.push("background:url(", icon, ") 0 0 no-repeat;");
+				if (setting.view.showIcon == false || !tools.apply(setting.view.showIcon, [setting.treeId, node], true)) {
+					icoStyle.push("width:0px;height:0px;");
+				}
+			}
+			return icoStyle.join('');
+		},
+		makeNodeLineClass: function(setting, node) {
+			var lineClass = [];
+			if (setting.view.showLine) {
+				if (node.level == 0 && node.isFirstNode && node.isLastNode) {
+					lineClass.push(consts.line.ROOT);
+				} else if (node.level == 0 && node.isFirstNode) {
+					lineClass.push(consts.line.ROOTS);
+				} else if (node.isLastNode) {
+					lineClass.push(consts.line.BOTTOM);
+				} else {
+					lineClass.push(consts.line.CENTER);
+				}
+			} else {
+				lineClass.push(consts.line.NOLINE);
+			}
+			if (node.isParent) {
+				lineClass.push(node.open ? consts.folder.OPEN : consts.folder.CLOSE);
+			} else {
+				lineClass.push(consts.folder.DOCU);
+			}
+			return view.makeNodeLineClassEx(node) + lineClass.join('_');
+		},
+		makeNodeLineClassEx: function(node) {
+			return consts.className.BUTTON + " " + consts.className.LEVEL + node.level + " " + consts.className.SWITCH + " ";
+		},
+		makeNodeTarget: function(node) {
+			return (node.target || "_blank");
+		},
+		makeNodeUrl: function(setting, node) {
+			var urlKey = setting.data.key.url;
+			return node[urlKey] ? node[urlKey] : null;
+		},
+		makeUlHtml: function(setting, node, html, content) {
+			html.push("<ul id='", node.tId, consts.id.UL, "' class='", consts.className.LEVEL, node.level, " ", view.makeUlLineClass(setting, node), "' style='display:", (node.open ? "block": "none"),"'>");
+			html.push(content);
+			html.push("</ul>");
+		},
+		makeUlLineClass: function(setting, node) {
+			return ((setting.view.showLine && !node.isLastNode) ? consts.line.LINE : "");
+		},
+		removeChildNodes: function(setting, node) {
+			if (!node) return;
+			var childKey = setting.data.key.children,
+			nodes = node[childKey];
+			if (!nodes) return;
+
+			for (var i = 0, l = nodes.length; i < l; i++) {
+				data.removeNodeCache(setting, nodes[i]);
+			}
+			data.removeSelectedNode(setting);
+			delete node[childKey];
+
+			if (!setting.data.keep.parent) {
+				node.isParent = false;
+				node.open = false;
+				var tmp_switchObj = $$(node, consts.id.SWITCH, setting),
+				tmp_icoObj = $$(node, consts.id.ICON, setting);
+				view.replaceSwitchClass(node, tmp_switchObj, consts.folder.DOCU);
+				view.replaceIcoClass(node, tmp_icoObj, consts.folder.DOCU);
+				$$(node, consts.id.UL, setting).remove();
+			} else {
+				$$(node, consts.id.UL, setting).empty();
+			}
+		},
+		setFirstNode: function(setting, parentNode) {
+			var childKey = setting.data.key.children, childLength = parentNode[childKey].length;
+			if ( childLength > 0) {
+				parentNode[childKey][0].isFirstNode = true;
+			}
+		},
+		setLastNode: function(setting, parentNode) {
+			var childKey = setting.data.key.children, childLength = parentNode[childKey].length;
+			if ( childLength > 0) {
+				parentNode[childKey][childLength - 1].isLastNode = true;
+			}
+		},
+		removeNode: function(setting, node) {
+			var root = data.getRoot(setting),
+			childKey = setting.data.key.children,
+			parentNode = (node.parentTId) ? node.getParentNode() : root;
+
+			node.isFirstNode = false;
+			node.isLastNode = false;
+			node.getPreNode = function() {return null;};
+			node.getNextNode = function() {return null;};
+
+			if (!data.getNodeCache(setting, node.tId)) {
+				return;
+			}
+
+			$$(node, setting).remove();
+			data.removeNodeCache(setting, node);
+			data.removeSelectedNode(setting, node);
+
+			for (var i = 0, l = parentNode[childKey].length; i < l; i++) {
+				if (parentNode[childKey][i].tId == node.tId) {
+					parentNode[childKey].splice(i, 1);
+					break;
+				}
+			}
+			view.setFirstNode(setting, parentNode);
+			view.setLastNode(setting, parentNode);
+
+			var tmp_ulObj,tmp_switchObj,tmp_icoObj,
+			childLength = parentNode[childKey].length;
+
+			//repair nodes old parent
+			if (!setting.data.keep.parent && childLength == 0) {
+				//old parentNode has no child nodes
+				parentNode.isParent = false;
+				parentNode.open = false;
+				tmp_ulObj = $$(parentNode, consts.id.UL, setting);
+				tmp_switchObj = $$(parentNode, consts.id.SWITCH, setting);
+				tmp_icoObj = $$(parentNode, consts.id.ICON, setting);
+				view.replaceSwitchClass(parentNode, tmp_switchObj, consts.folder.DOCU);
+				view.replaceIcoClass(parentNode, tmp_icoObj, consts.folder.DOCU);
+				tmp_ulObj.css("display", "none");
+
+			} else if (setting.view.showLine && childLength > 0) {
+				//old parentNode has child nodes
+				var newLast = parentNode[childKey][childLength - 1];
+				tmp_ulObj = $$(newLast, consts.id.UL, setting);
+				tmp_switchObj = $$(newLast, consts.id.SWITCH, setting);
+				tmp_icoObj = $$(newLast, consts.id.ICON, setting);
+				if (parentNode == root) {
+					if (parentNode[childKey].length == 1) {
+						//node was root, and ztree has only one root after move node
+						view.replaceSwitchClass(newLast, tmp_switchObj, consts.line.ROOT);
+					} else {
+						var tmp_first_switchObj = $$(parentNode[childKey][0], consts.id.SWITCH, setting);
+						view.replaceSwitchClass(parentNode[childKey][0], tmp_first_switchObj, consts.line.ROOTS);
+						view.replaceSwitchClass(newLast, tmp_switchObj, consts.line.BOTTOM);
+					}
+				} else {
+					view.replaceSwitchClass(newLast, tmp_switchObj, consts.line.BOTTOM);
+				}
+				tmp_ulObj.removeClass(consts.line.LINE);
+			}
+		},
+		replaceIcoClass: function(node, obj, newName) {
+			if (!obj || node.isAjaxing) return;
+			var tmpName = obj.attr("class");
+			if (tmpName == undefined) return;
+			var tmpList = tmpName.split("_");
+			switch (newName) {
+				case consts.folder.OPEN:
+				case consts.folder.CLOSE:
+				case consts.folder.DOCU:
+					tmpList[tmpList.length-1] = newName;
+					break;
+			}
+			obj.attr("class", tmpList.join("_"));
+		},
+		replaceSwitchClass: function(node, obj, newName) {
+			if (!obj) return;
+			var tmpName = obj.attr("class");
+			if (tmpName == undefined) return;
+			var tmpList = tmpName.split("_");
+			switch (newName) {
+				case consts.line.ROOT:
+				case consts.line.ROOTS:
+				case consts.line.CENTER:
+				case consts.line.BOTTOM:
+				case consts.line.NOLINE:
+					tmpList[0] = view.makeNodeLineClassEx(node) + newName;
+					break;
+				case consts.folder.OPEN:
+				case consts.folder.CLOSE:
+				case consts.folder.DOCU:
+					tmpList[1] = newName;
+					break;
+			}
+			obj.attr("class", tmpList.join("_"));
+			if (newName !== consts.folder.DOCU) {
+				obj.removeAttr("disabled");
+			} else {
+				obj.attr("disabled", "disabled");
+			}
+		},
+		selectNode: function(setting, node, addFlag) {
+			if (!addFlag) {
+				view.cancelPreSelectedNode(setting);
+			}
+			$$(node, consts.id.A, setting).addClass(consts.node.CURSELECTED);
+			data.addSelectedNode(setting, node);
+		},
+		setNodeFontCss: function(setting, treeNode) {
+			var aObj = $$(treeNode, consts.id.A, setting),
+			fontCss = view.makeNodeFontCss(setting, treeNode);
+			if (fontCss) {
+				aObj.css(fontCss);
+			}
+		},
+		setNodeLineIcos: function(setting, node) {
+			if (!node) return;
+			var switchObj = $$(node, consts.id.SWITCH, setting),
+			ulObj = $$(node, consts.id.UL, setting),
+			icoObj = $$(node, consts.id.ICON, setting),
+			ulLine = view.makeUlLineClass(setting, node);
+			if (ulLine.length==0) {
+				ulObj.removeClass(consts.line.LINE);
+			} else {
+				ulObj.addClass(ulLine);
+			}
+			switchObj.attr("class", view.makeNodeLineClass(setting, node));
+			if (node.isParent) {
+				switchObj.removeAttr("disabled");
+			} else {
+				switchObj.attr("disabled", "disabled");
+			}
+			icoObj.removeAttr("style");
+			icoObj.attr("style", view.makeNodeIcoStyle(setting, node));
+			icoObj.attr("class", view.makeNodeIcoClass(setting, node));
+		},
+		setNodeName: function(setting, node) {
+			var title = data.getNodeTitle(setting, node),
+			nObj = $$(node, consts.id.SPAN, setting);
+			nObj.empty();
+			if (setting.view.nameIsHTML) {
+				nObj.html(data.getNodeName(setting, node));
+			} else {
+				nObj.text(data.getNodeName(setting, node));
+			}
+			if (tools.apply(setting.view.showTitle, [setting.treeId, node], setting.view.showTitle)) {
+				var aObj = $$(node, consts.id.A, setting);
+				aObj.attr("title", !title ? "" : title);
+			}
+		},
+		setNodeTarget: function(setting, node) {
+			var aObj = $$(node, consts.id.A, setting);
+			aObj.attr("target", view.makeNodeTarget(node));
+		},
+		setNodeUrl: function(setting, node) {
+			var aObj = $$(node, consts.id.A, setting),
+			url = view.makeNodeUrl(setting, node);
+			if (url == null || url.length == 0) {
+				aObj.removeAttr("href");
+			} else {
+				aObj.attr("href", url);
+			}
+		},
+		switchNode: function(setting, node) {
+			if (node.open || !tools.canAsync(setting, node)) {
+				view.expandCollapseNode(setting, node, !node.open);
+			} else if (setting.async.enable) {
+				if (!view.asyncNode(setting, node)) {
+					view.expandCollapseNode(setting, node, !node.open);
+					return;
+				}
+			} else if (node) {
+				view.expandCollapseNode(setting, node, !node.open);
+			}
+		}
+	};
+	// zTree defind
+	$.fn.zTree = {
+		consts : _consts,
+		_z : {
+			tools: tools,
+			view: view,
+			event: event,
+			data: data
+		},
+		getZTreeObj: function(treeId) {
+			var o = data.getZTreeTools(treeId);
+			return o ? o : null;
+		},
+		destroy: function(treeId) {
+			if (!!treeId && treeId.length > 0) {
+				view.destroy(data.getSetting(treeId));
+			} else {
+				for(var s in settings) {
+					view.destroy(settings[s]);
+				}
+			}
+		},
+		init: function(obj, zSetting, zNodes) {
+			var setting = tools.clone(_setting);
+			$.extend(true, setting, zSetting);
+			setting.treeId = obj.attr("id");
+			setting.treeObj = obj;
+			setting.treeObj.empty();
+			settings[setting.treeId] = setting;
+			//For some older browser,(e.g., ie6)
+			if(typeof document.body.style.maxHeight === "undefined") {
+				setting.view.expandSpeed = "";
+			}
+			data.initRoot(setting);
+			var root = data.getRoot(setting),
+			childKey = setting.data.key.children;
+			zNodes = zNodes ? tools.clone(tools.isArray(zNodes)? zNodes : [zNodes]) : [];
+			if (setting.data.simpleData.enable) {
+				root[childKey] = data.transformTozTreeFormat(setting, zNodes);
+			} else {
+				root[childKey] = zNodes;
+			}
+
+			data.initCache(setting);
+			event.unbindTree(setting);
+			event.bindTree(setting);
+			event.unbindEvent(setting);
+			event.bindEvent(setting);
+
+			var zTreeTools = {
+				setting : setting,
+				addNodes : function(parentNode, newNodes, isSilent) {
+					if (!newNodes) return null;
+					if (!parentNode) parentNode = null;
+					if (parentNode && !parentNode.isParent && setting.data.keep.leaf) return null;
+					var xNewNodes = tools.clone(tools.isArray(newNodes)? newNodes: [newNodes]);
+					function addCallback() {
+						view.addNodes(setting, parentNode, xNewNodes, (isSilent==true));
+					}
+
+					if (tools.canAsync(setting, parentNode)) {
+						view.asyncNode(setting, parentNode, isSilent, addCallback);
+					} else {
+						addCallback();
+					}
+					return xNewNodes;
+				},
+				cancelSelectedNode : function(node) {
+					view.cancelPreSelectedNode(setting, node);
+				},
+				destroy : function() {
+					view.destroy(setting);
+				},
+				expandAll : function(expandFlag) {
+					expandFlag = !!expandFlag;
+					view.expandCollapseSonNode(setting, null, expandFlag, true);
+					return expandFlag;
+				},
+				expandNode : function(node, expandFlag, sonSign, focus, callbackFlag) {
+					if (!node || !node.isParent) return null;
+					if (expandFlag !== true && expandFlag !== false) {
+						expandFlag = !node.open;
+					}
+					callbackFlag = !!callbackFlag;
+
+					if (callbackFlag && expandFlag && (tools.apply(setting.callback.beforeExpand, [setting.treeId, node], true) == false)) {
+						return null;
+					} else if (callbackFlag && !expandFlag && (tools.apply(setting.callback.beforeCollapse, [setting.treeId, node], true) == false)) {
+						return null;
+					}
+					if (expandFlag && node.parentTId) {
+						view.expandCollapseParentNode(setting, node.getParentNode(), expandFlag, false);
+					}
+					if (expandFlag === node.open && !sonSign) {
+						return null;
+					}
+
+					data.getRoot(setting).expandTriggerFlag = callbackFlag;
+					if (!tools.canAsync(setting, node) && sonSign) {
+						view.expandCollapseSonNode(setting, node, expandFlag, true, function() {
+							if (focus !== false) {try{$$(node, setting).focus().blur();}catch(e){}}
+						});
+					} else {
+						node.open = !expandFlag;
+						view.switchNode(this.setting, node);
+						if (focus !== false) {try{$$(node, setting).focus().blur();}catch(e){}}
+					}
+					return expandFlag;
+				},
+				getNodes : function() {
+					return data.getNodes(setting);
+				},
+				getNodeByParam : function(key, value, parentNode) {
+					if (!key) return null;
+					return data.getNodeByParam(setting, parentNode?parentNode[setting.data.key.children]:data.getNodes(setting), key, value);
+				},
+				getNodeByTId : function(tId) {
+					return data.getNodeCache(setting, tId);
+				},
+				getNodesByParam : function(key, value, parentNode) {
+					if (!key) return null;
+					return data.getNodesByParam(setting, parentNode?parentNode[setting.data.key.children]:data.getNodes(setting), key, value);
+				},
+				getNodesByParamFuzzy : function(key, value, parentNode) {
+					if (!key) return null;
+					return data.getNodesByParamFuzzy(setting, parentNode?parentNode[setting.data.key.children]:data.getNodes(setting), key, value);
+				},
+				getNodesByFilter: function(filter, isSingle, parentNode, invokeParam) {
+					isSingle = !!isSingle;
+					if (!filter || (typeof filter != "function")) return (isSingle ? null : []);
+					return data.getNodesByFilter(setting, parentNode?parentNode[setting.data.key.children]:data.getNodes(setting), filter, isSingle, invokeParam);
+				},
+				getNodeIndex : function(node) {
+					if (!node) return null;
+					var childKey = setting.data.key.children,
+					parentNode = (node.parentTId) ? node.getParentNode() : data.getRoot(setting);
+					for (var i=0, l = parentNode[childKey].length; i < l; i++) {
+						if (parentNode[childKey][i] == node) return i;
+					}
+					return -1;
+				},
+				getSelectedNodes : function() {
+					var r = [], list = data.getRoot(setting).curSelectedList;
+					for (var i=0, l=list.length; i<l; i++) {
+						r.push(list[i]);
+					}
+					return r;
+				},
+				isSelectedNode : function(node) {
+					return data.isSelectedNode(setting, node);
+				},
+				reAsyncChildNodes : function(parentNode, reloadType, isSilent) {
+					if (!this.setting.async.enable) return;
+					var isRoot = !parentNode;
+					if (isRoot) {
+						parentNode = data.getRoot(setting);
+					}
+					if (reloadType=="refresh") {
+						var childKey = this.setting.data.key.children;
+						for (var i = 0, l = parentNode[childKey] ? parentNode[childKey].length : 0; i < l; i++) {
+							data.removeNodeCache(setting, parentNode[childKey][i]);
+						}
+						data.removeSelectedNode(setting);
+						parentNode[childKey] = [];
+						if (isRoot) {
+							this.setting.treeObj.empty();
+						} else {
+							var ulObj = $$(parentNode, consts.id.UL, setting);
+							ulObj.empty();
+						}
+					}
+					view.asyncNode(this.setting, isRoot? null:parentNode, !!isSilent);
+				},
+				refresh : function() {
+					this.setting.treeObj.empty();
+					var root = data.getRoot(setting),
+					nodes = root[setting.data.key.children]
+					data.initRoot(setting);
+					root[setting.data.key.children] = nodes
+					data.initCache(setting);
+					view.createNodes(setting, 0, root[setting.data.key.children]);
+				},
+				removeChildNodes : function(node) {
+					if (!node) return null;
+					var childKey = setting.data.key.children,
+					nodes = node[childKey];
+					view.removeChildNodes(setting, node);
+					return nodes ? nodes : null;
+				},
+				removeNode : function(node, callbackFlag) {
+					if (!node) return;
+					callbackFlag = !!callbackFlag;
+					if (callbackFlag && tools.apply(setting.callback.beforeRemove, [setting.treeId, node], true) == false) return;
+					view.removeNode(setting, node);
+					if (callbackFlag) {
+						this.setting.treeObj.trigger(consts.event.REMOVE, [setting.treeId, node]);
+					}
+				},
+				selectNode : function(node, addFlag) {
+					if (!node) return;
+					if (tools.uCanDo(setting)) {
+						addFlag = setting.view.selectedMulti && addFlag;
+						if (node.parentTId) {
+							view.expandCollapseParentNode(setting, node.getParentNode(), true, false, function() {
+								try{$$(node, setting).focus().blur();}catch(e){}
+							});
+						} else {
+							try{$$(node, setting).focus().blur();}catch(e){}
+						}
+						view.selectNode(setting, node, addFlag);
+					}
+				},
+				transformTozTreeNodes : function(simpleNodes) {
+					return data.transformTozTreeFormat(setting, simpleNodes);
+				},
+				transformToArray : function(nodes) {
+					return data.transformToArrayFormat(setting, nodes);
+				},
+				updateNode : function(node, checkTypeFlag) {
+					if (!node) return;
+					var nObj = $$(node, setting);
+					if (nObj.get(0) && tools.uCanDo(setting)) {
+						view.setNodeName(setting, node);
+						view.setNodeTarget(setting, node);
+						view.setNodeUrl(setting, node);
+						view.setNodeLineIcos(setting, node);
+						view.setNodeFontCss(setting, node);
+					}
+				}
+			}
+			root.treeTools = zTreeTools;
+			data.setZTreeTools(setting, zTreeTools);
+
+			if (root[childKey] && root[childKey].length > 0) {
+				view.createNodes(setting, 0, root[childKey]);
+			} else if (setting.async.enable && setting.async.url && setting.async.url !== '') {
+				view.asyncNode(setting);
+			}
+			return zTreeTools;
+		}
+	};
+
+	var zt = $.fn.zTree,
+	$$ = tools.$,
+	consts = zt.consts;
+})(jQuery);
+/*
+ * JQuery zTree excheck v3.5.15
+ * http://zTree.me/
+ *
+ * Copyright (c) 2010 Hunter.z
+ *
+ * Licensed same as jquery - MIT License
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ * email: hunter.z@263.net
+ * Date: 2013-10-15
+ */
+(function($){
+	//default consts of excheck
+	var _consts = {
+		event: {
+			CHECK: "ztree_check"
+		},
+		id: {
+			CHECK: "_check"
+		},
+		checkbox: {
+			STYLE: "checkbox",
+			DEFAULT: "chk",
+			DISABLED: "disable",
+			FALSE: "false",
+			TRUE: "true",
+			FULL: "full",
+			PART: "part",
+			FOCUS: "focus"
+		},
+		radio: {
+			STYLE: "radio",
+			TYPE_ALL: "all",
+			TYPE_LEVEL: "level"
+		}
+	},
+	//default setting of excheck
+	_setting = {
+		check: {
+			enable: false,
+			autoCheckTrigger: false,
+			chkStyle: _consts.checkbox.STYLE,
+			nocheckInherit: false,
+			chkDisabledInherit: false,
+			radioType: _consts.radio.TYPE_LEVEL,
+			chkboxType: {
+				"Y": "ps",
+				"N": "ps"
+			}
+		},
+		data: {
+			key: {
+				checked: "checked"
+			}
+		},
+		callback: {
+			beforeCheck:null,
+			onCheck:null
+		}
+	},
+	//default root of excheck
+	_initRoot = function (setting) {
+		var r = data.getRoot(setting);
+		r.radioCheckedList = [];
+	},
+	//default cache of excheck
+	_initCache = function(treeId) {},
+	//default bind event of excheck
+	_bindEvent = function(setting) {
+		var o = setting.treeObj,
+		c = consts.event;
+		o.bind(c.CHECK, function (event, srcEvent, treeId, node) {
+			tools.apply(setting.callback.onCheck, [!!srcEvent?srcEvent : event, treeId, node]);
+		});
+	},
+	_unbindEvent = function(setting) {
+		var o = setting.treeObj,
+		c = consts.event;
+		o.unbind(c.CHECK);
+	},
+	//default event proxy of excheck
+	_eventProxy = function(e) {
+		var target = e.target,
+		setting = data.getSetting(e.data.treeId),
+		tId = "", node = null,
+		nodeEventType = "", treeEventType = "",
+		nodeEventCallback = null, treeEventCallback = null;
+
+		if (tools.eqs(e.type, "mouseover")) {
+			if (setting.check.enable && tools.eqs(target.tagName, "span") && target.getAttribute("treeNode"+ consts.id.CHECK) !== null) {
+				tId = tools.getNodeMainDom(target).id;
+				nodeEventType = "mouseoverCheck";
+			}
+		} else if (tools.eqs(e.type, "mouseout")) {
+			if (setting.check.enable && tools.eqs(target.tagName, "span") && target.getAttribute("treeNode"+ consts.id.CHECK) !== null) {
+				tId = tools.getNodeMainDom(target).id;
+				nodeEventType = "mouseoutCheck";
+			}
+		} else if (tools.eqs(e.type, "click")) {
+			if (setting.check.enable && tools.eqs(target.tagName, "span") && target.getAttribute("treeNode"+ consts.id.CHECK) !== null) {
+				tId = tools.getNodeMainDom(target).id;
+				nodeEventType = "checkNode";
+			}
+		}
+		if (tId.length>0) {
+			node = data.getNodeCache(setting, tId);
+			switch (nodeEventType) {
+				case "checkNode" :
+					nodeEventCallback = _handler.onCheckNode;
+					break;
+				case "mouseoverCheck" :
+					nodeEventCallback = _handler.onMouseoverCheck;
+					break;
+				case "mouseoutCheck" :
+					nodeEventCallback = _handler.onMouseoutCheck;
+					break;
+			}
+		}
+		var proxyResult = {
+			stop: nodeEventType === "checkNode",
+			node: node,
+			nodeEventType: nodeEventType,
+			nodeEventCallback: nodeEventCallback,
+			treeEventType: treeEventType,
+			treeEventCallback: treeEventCallback
+		};
+		return proxyResult
+	},
+	//default init node of excheck
+	_initNode = function(setting, level, n, parentNode, isFirstNode, isLastNode, openFlag) {
+		if (!n) return;
+		var checkedKey = setting.data.key.checked;
+		if (typeof n[checkedKey] == "string") n[checkedKey] = tools.eqs(n[checkedKey], "true");
+		n[checkedKey] = !!n[checkedKey];
+		n.checkedOld = n[checkedKey];
+		if (typeof n.nocheck == "string") n.nocheck = tools.eqs(n.nocheck, "true");
+		n.nocheck = !!n.nocheck || (setting.check.nocheckInherit && parentNode && !!parentNode.nocheck);
+		if (typeof n.chkDisabled == "string") n.chkDisabled = tools.eqs(n.chkDisabled, "true");
+		n.chkDisabled = !!n.chkDisabled || (setting.check.chkDisabledInherit && parentNode && !!parentNode.chkDisabled);
+		if (typeof n.halfCheck == "string") n.halfCheck = tools.eqs(n.halfCheck, "true");
+		n.halfCheck = !!n.halfCheck;
+		n.check_Child_State = -1;
+		n.check_Focus = false;
+		n.getCheckStatus = function() {return data.getCheckStatus(setting, n);};
+
+		if (setting.check.chkStyle == consts.radio.STYLE && setting.check.radioType == consts.radio.TYPE_ALL && n[checkedKey] ) {
+			var r = data.getRoot(setting);
+			r.radioCheckedList.push(n);
+		}
+	},
+	//add dom for check
+	_beforeA = function(setting, node, html) {
+		var checkedKey = setting.data.key.checked;
+		if (setting.check.enable) {
+			data.makeChkFlag(setting, node);
+			html.push("<span ID='", node.tId, consts.id.CHECK, "' class='", view.makeChkClass(setting, node), "' treeNode", consts.id.CHECK, (node.nocheck === true?" style='display:none;'":""),"></span>");
+		}
+	},
+	//update zTreeObj, add method of check
+	_zTreeTools = function(setting, zTreeTools) {
+		zTreeTools.checkNode = function(node, checked, checkTypeFlag, callbackFlag) {
+			var checkedKey = setting.data.key.checked;
+			if (node.chkDisabled === true) return;
+			if (checked !== true && checked !== false) {
+				checked = !node[checkedKey];
+			}
+			callbackFlag = !!callbackFlag;
+
+			if (node[checkedKey] === checked && !checkTypeFlag) {
+				return;
+			} else if (callbackFlag && tools.apply(this.setting.callback.beforeCheck, [setting.treeId, node], true) == false) {
+				return;
+			}
+			if (tools.uCanDo(this.setting) && setting.check.enable && node.nocheck !== true) {
+				node[checkedKey] = checked;
+				var checkObj = $$(node, consts.id.CHECK, setting);
+				if (checkTypeFlag || setting.check.chkStyle === consts.radio.STYLE) view.checkNodeRelation(setting, node);
+				view.setChkClass(setting, checkObj, node);
+				view.repairParentChkClassWithSelf(setting, node);
+				if (callbackFlag) {
+					setting.treeObj.trigger(consts.event.CHECK, [null, setting.treeId, node]);
+				}
+			}
+		}
+
+		zTreeTools.checkAllNodes = function(checked) {
+			view.repairAllChk(setting, !!checked);
+		}
+
+		zTreeTools.getCheckedNodes = function(checked) {
+			var childKey = setting.data.key.children;
+			checked = (checked !== false);
+			return data.getTreeCheckedNodes(setting, data.getRoot(setting)[childKey], checked);
+		}
+
+		zTreeTools.getChangeCheckedNodes = function() {
+			var childKey = setting.data.key.children;
+			return data.getTreeChangeCheckedNodes(setting, data.getRoot(setting)[childKey]);
+		}
+
+		zTreeTools.setChkDisabled = function(node, disabled, inheritParent, inheritChildren) {
+			disabled = !!disabled;
+			inheritParent = !!inheritParent;
+			inheritChildren = !!inheritChildren;
+			view.repairSonChkDisabled(setting, node, disabled, inheritChildren);
+			view.repairParentChkDisabled(setting, node.getParentNode(), disabled, inheritParent);
+		}
+
+		var _updateNode = zTreeTools.updateNode;
+		zTreeTools.updateNode = function(node, checkTypeFlag) {
+			if (_updateNode) _updateNode.apply(zTreeTools, arguments);
+			if (!node || !setting.check.enable) return;
+			var nObj = $$(node, setting);
+			if (nObj.get(0) && tools.uCanDo(setting)) {
+				var checkObj = $$(node, consts.id.CHECK, setting);
+				if (checkTypeFlag == true || setting.check.chkStyle === consts.radio.STYLE) view.checkNodeRelation(setting, node);
+				view.setChkClass(setting, checkObj, node);
+				view.repairParentChkClassWithSelf(setting, node);
+			}
+		}
+	},
+	//method of operate data
+	_data = {
+		getRadioCheckedList: function(setting) {
+			var checkedList = data.getRoot(setting).radioCheckedList;
+			for (var i=0, j=checkedList.length; i<j; i++) {
+				if(!data.getNodeCache(setting, checkedList[i].tId)) {
+					checkedList.splice(i, 1);
+					i--; j--;
+				}
+			}
+			return checkedList;
+		},
+		getCheckStatus: function(setting, node) {
+			if (!setting.check.enable || node.nocheck || node.chkDisabled) return null;
+			var checkedKey = setting.data.key.checked,
+			r = {
+				checked: node[checkedKey],
+				half: node.halfCheck ? node.halfCheck : (setting.check.chkStyle == consts.radio.STYLE ? (node.check_Child_State === 2) : (node[checkedKey] ? (node.check_Child_State > -1 && node.check_Child_State < 2) : (node.check_Child_State > 0)))
+			};
+			return r;
+		},
+		getTreeCheckedNodes: function(setting, nodes, checked, results) {
+			if (!nodes) return [];
+			var childKey = setting.data.key.children,
+			checkedKey = setting.data.key.checked,
+			onlyOne = (checked && setting.check.chkStyle == consts.radio.STYLE && setting.check.radioType == consts.radio.TYPE_ALL);
+			results = !results ? [] : results;
+			for (var i = 0, l = nodes.length; i < l; i++) {
+				if (nodes[i].nocheck !== true && nodes[i].chkDisabled !== true && nodes[i][checkedKey] == checked) {
+					results.push(nodes[i]);
+					if(onlyOne) {
+						break;
+					}
+				}
+				data.getTreeCheckedNodes(setting, nodes[i][childKey], checked, results);
+				if(onlyOne && results.length > 0) {
+					break;
+				}
+			}
+			return results;
+		},
+		getTreeChangeCheckedNodes: function(setting, nodes, results) {
+			if (!nodes) return [];
+			var childKey = setting.data.key.children,
+			checkedKey = setting.data.key.checked;
+			results = !results ? [] : results;
+			for (var i = 0, l = nodes.length; i < l; i++) {
+				if (nodes[i].nocheck !== true && nodes[i].chkDisabled !== true && nodes[i][checkedKey] != nodes[i].checkedOld) {
+					results.push(nodes[i]);
+				}
+				data.getTreeChangeCheckedNodes(setting, nodes[i][childKey], results);
+			}
+			return results;
+		},
+		makeChkFlag: function(setting, node) {
+			if (!node) return;
+			var childKey = setting.data.key.children,
+			checkedKey = setting.data.key.checked,
+			chkFlag = -1;
+			if (node[childKey]) {
+				for (var i = 0, l = node[childKey].length; i < l; i++) {
+					var cNode = node[childKey][i];
+					var tmp = -1;
+					if (setting.check.chkStyle == consts.radio.STYLE) {
+						if (cNode.nocheck === true || cNode.chkDisabled === true) {
+							tmp = cNode.check_Child_State;
+						} else if (cNode.halfCheck === true) {
+							tmp = 2;
+						} else if (cNode[checkedKey]) {
+							tmp = 2;
+						} else {
+							tmp = cNode.check_Child_State > 0 ? 2:0;
+						}
+						if (tmp == 2) {
+							chkFlag = 2; break;
+						} else if (tmp == 0){
+							chkFlag = 0;
+						}
+					} else if (setting.check.chkStyle == consts.checkbox.STYLE) {
+						if (cNode.nocheck === true || cNode.chkDisabled === true) {
+							tmp = cNode.check_Child_State;
+						} else if (cNode.halfCheck === true) {
+							tmp = 1;
+						} else if (cNode[checkedKey] ) {
+							tmp = (cNode.check_Child_State === -1 || cNode.check_Child_State === 2) ? 2 : 1;
+						} else {
+							tmp = (cNode.check_Child_State > 0) ? 1 : 0;
+						}
+						if (tmp === 1) {
+							chkFlag = 1; break;
+						} else if (tmp === 2 && chkFlag > -1 && i > 0 && tmp !== chkFlag) {
+							chkFlag = 1; break;
+						} else if (chkFlag === 2 && tmp > -1 && tmp < 2) {
+							chkFlag = 1; break;
+						} else if (tmp > -1) {
+							chkFlag = tmp;
+						}
+					}
+				}
+			}
+			node.check_Child_State = chkFlag;
+		}
+	},
+	//method of event proxy
+	_event = {
+
+	},
+	//method of event handler
+	_handler = {
+		onCheckNode: function (event, node) {
+			if (node.chkDisabled === true) return false;
+			var setting = data.getSetting(event.data.treeId),
+			checkedKey = setting.data.key.checked;
+			if (tools.apply(setting.callback.beforeCheck, [setting.treeId, node], true) == false) return true;
+			node[checkedKey] = !node[checkedKey];
+			view.checkNodeRelation(setting, node);
+			var checkObj = $$(node, consts.id.CHECK, setting);
+			view.setChkClass(setting, checkObj, node);
+			view.repairParentChkClassWithSelf(setting, node);
+			setting.treeObj.trigger(consts.event.CHECK, [event, setting.treeId, node]);
+			return true;
+		},
+		onMouseoverCheck: function(event, node) {
+			if (node.chkDisabled === true) return false;
+			var setting = data.getSetting(event.data.treeId),
+			checkObj = $$(node, consts.id.CHECK, setting);
+			node.check_Focus = true;
+			view.setChkClass(setting, checkObj, node);
+			return true;
+		},
+		onMouseoutCheck: function(event, node) {
+			if (node.chkDisabled === true) return false;
+			var setting = data.getSetting(event.data.treeId),
+			checkObj = $$(node, consts.id.CHECK, setting);
+			node.check_Focus = false;
+			view.setChkClass(setting, checkObj, node);
+			return true;
+		}
+	},
+	//method of tools for zTree
+	_tools = {
+
+	},
+	//method of operate ztree dom
+	_view = {
+		checkNodeRelation: function(setting, node) {
+			var pNode, i, l,
+			childKey = setting.data.key.children,
+			checkedKey = setting.data.key.checked,
+			r = consts.radio;
+			if (setting.check.chkStyle == r.STYLE) {
+				var checkedList = data.getRadioCheckedList(setting);
+				if (node[checkedKey]) {
+					if (setting.check.radioType == r.TYPE_ALL) {
+						for (i = checkedList.length-1; i >= 0; i--) {
+							pNode = checkedList[i];
+							pNode[checkedKey] = false;
+							checkedList.splice(i, 1);
+
+							view.setChkClass(setting, $$(pNode, consts.id.CHECK, setting), pNode);
+							if (pNode.parentTId != node.parentTId) {
+								view.repairParentChkClassWithSelf(setting, pNode);
+							}
+						}
+						checkedList.push(node);
+					} else {
+						var parentNode = (node.parentTId) ? node.getParentNode() : data.getRoot(setting);
+						for (i = 0, l = parentNode[childKey].length; i < l; i++) {
+							pNode = parentNode[childKey][i];
+							if (pNode[checkedKey] && pNode != node) {
+								pNode[checkedKey] = false;
+								view.setChkClass(setting, $$(pNode, consts.id.CHECK, setting), pNode);
+							}
+						}
+					}
+				} else if (setting.check.radioType == r.TYPE_ALL) {
+					for (i = 0, l = checkedList.length; i < l; i++) {
+						if (node == checkedList[i]) {
+							checkedList.splice(i, 1);
+							break;
+						}
+					}
+				}
+
+			} else {
+				if (node[checkedKey] && (!node[childKey] || node[childKey].length==0 || setting.check.chkboxType.Y.indexOf("s") > -1)) {
+					view.setSonNodeCheckBox(setting, node, true);
+				}
+				if (!node[checkedKey] && (!node[childKey] || node[childKey].length==0 || setting.check.chkboxType.N.indexOf("s") > -1)) {
+					view.setSonNodeCheckBox(setting, node, false);
+				}
+				if (node[checkedKey] && setting.check.chkboxType.Y.indexOf("p") > -1) {
+					view.setParentNodeCheckBox(setting, node, true);
+				}
+				if (!node[checkedKey] && setting.check.chkboxType.N.indexOf("p") > -1) {
+					view.setParentNodeCheckBox(setting, node, false);
+				}
+			}
+		},
+		makeChkClass: function(setting, node) {
+			var checkedKey = setting.data.key.checked,
+			c = consts.checkbox, r = consts.radio,
+			fullStyle = "";
+			if (node.chkDisabled === true) {
+				fullStyle = c.DISABLED;
+			} else if (node.halfCheck) {
+				fullStyle = c.PART;
+			} else if (setting.check.chkStyle == r.STYLE) {
+				fullStyle = (node.check_Child_State < 1)? c.FULL:c.PART;
+			} else {
+				fullStyle = node[checkedKey] ? ((node.check_Child_State === 2 || node.check_Child_State === -1) ? c.FULL:c.PART) : ((node.check_Child_State < 1)? c.FULL:c.PART);
+			}
+			var chkName = setting.check.chkStyle + "_" + (node[checkedKey] ? c.TRUE : c.FALSE) + "_" + fullStyle;
+			chkName = (node.check_Focus && node.chkDisabled !== true) ? chkName + "_" + c.FOCUS : chkName;
+			return consts.className.BUTTON + " " + c.DEFAULT + " " + chkName;
+		},
+		repairAllChk: function(setting, checked) {
+			if (setting.check.enable && setting.check.chkStyle === consts.checkbox.STYLE) {
+				var checkedKey = setting.data.key.checked,
+				childKey = setting.data.key.children,
+				root = data.getRoot(setting);
+				for (var i = 0, l = root[childKey].length; i<l ; i++) {
+					var node = root[childKey][i];
+					if (node.nocheck !== true && node.chkDisabled !== true) {
+						node[checkedKey] = checked;
+					}
+					view.setSonNodeCheckBox(setting, node, checked);
+				}
+			}
+		},
+		repairChkClass: function(setting, node) {
+			if (!node) return;
+			data.makeChkFlag(setting, node);
+			if (node.nocheck !== true) {
+				var checkObj = $$(node, consts.id.CHECK, setting);
+				view.setChkClass(setting, checkObj, node);
+			}
+		},
+		repairParentChkClass: function(setting, node) {
+			if (!node || !node.parentTId) return;
+			var pNode = node.getParentNode();
+			view.repairChkClass(setting, pNode);
+			view.repairParentChkClass(setting, pNode);
+		},
+		repairParentChkClassWithSelf: function(setting, node) {
+			if (!node) return;
+			var childKey = setting.data.key.children;
+			if (node[childKey] && node[childKey].length > 0) {
+				view.repairParentChkClass(setting, node[childKey][0]);
+			} else {
+				view.repairParentChkClass(setting, node);
+			}
+		},
+		repairSonChkDisabled: function(setting, node, chkDisabled, inherit) {
+			if (!node) return;
+			var childKey = setting.data.key.children;
+			if (node.chkDisabled != chkDisabled) {
+				node.chkDisabled = chkDisabled;
+			}
+			view.repairChkClass(setting, node);
+			if (node[childKey] && inherit) {
+				for (var i = 0, l = node[childKey].length; i < l; i++) {
+					var sNode = node[childKey][i];
+					view.repairSonChkDisabled(setting, sNode, chkDisabled, inherit);
+				}
+			}
+		},
+		repairParentChkDisabled: function(setting, node, chkDisabled, inherit) {
+			if (!node) return;
+			if (node.chkDisabled != chkDisabled && inherit) {
+				node.chkDisabled = chkDisabled;
+			}
+			view.repairChkClass(setting, node);
+			view.repairParentChkDisabled(setting, node.getParentNode(), chkDisabled, inherit);
+		},
+		setChkClass: function(setting, obj, node) {
+			if (!obj) return;
+			if (node.nocheck === true) {
+				obj.hide();
+			} else {
+				obj.show();
+			}
+			obj.removeClass();
+			obj.addClass(view.makeChkClass(setting, node));
+		},
+		setParentNodeCheckBox: function(setting, node, value, srcNode) {
+			var childKey = setting.data.key.children,
+			checkedKey = setting.data.key.checked,
+			checkObj = $$(node, consts.id.CHECK, setting);
+			if (!srcNode) srcNode = node;
+			data.makeChkFlag(setting, node);
+			if (node.nocheck !== true && node.chkDisabled !== true) {
+				node[checkedKey] = value;
+				view.setChkClass(setting, checkObj, node);
+				if (setting.check.autoCheckTrigger && node != srcNode) {
+					setting.treeObj.trigger(consts.event.CHECK, [null, setting.treeId, node]);
+				}
+			}
+			if (node.parentTId) {
+				var pSign = true;
+				if (!value) {
+					var pNodes = node.getParentNode()[childKey];
+					for (var i = 0, l = pNodes.length; i < l; i++) {
+						if ((pNodes[i].nocheck !== true && pNodes[i].chkDisabled !== true && pNodes[i][checkedKey])
+						|| ((pNodes[i].nocheck === true || pNodes[i].chkDisabled === true) && pNodes[i].check_Child_State > 0)) {
+							pSign = false;
+							break;
+						}
+					}
+				}
+				if (pSign) {
+					view.setParentNodeCheckBox(setting, node.getParentNode(), value, srcNode);
+				}
+			}
+		},
+		setSonNodeCheckBox: function(setting, node, value, srcNode) {
+			if (!node) return;
+			var childKey = setting.data.key.children,
+			checkedKey = setting.data.key.checked,
+			checkObj = $$(node, consts.id.CHECK, setting);
+			if (!srcNode) srcNode = node;
+
+			var hasDisable = false;
+			if (node[childKey]) {
+				for (var i = 0, l = node[childKey].length; i < l && node.chkDisabled !== true; i++) {
+					var sNode = node[childKey][i];
+					view.setSonNodeCheckBox(setting, sNode, value, srcNode);
+					if (sNode.chkDisabled === true) hasDisable = true;
+				}
+			}
+
+			if (node != data.getRoot(setting) && node.chkDisabled !== true) {
+				if (hasDisable && node.nocheck !== true) {
+					data.makeChkFlag(setting, node);
+				}
+				if (node.nocheck !== true && node.chkDisabled !== true) {
+					node[checkedKey] = value;
+					if (!hasDisable) node.check_Child_State = (node[childKey] && node[childKey].length > 0) ? (value ? 2 : 0) : -1;
+				} else {
+					node.check_Child_State = -1;
+				}
+				view.setChkClass(setting, checkObj, node);
+				if (setting.check.autoCheckTrigger && node != srcNode && node.nocheck !== true && node.chkDisabled !== true) {
+					setting.treeObj.trigger(consts.event.CHECK, [null, setting.treeId, node]);
+				}
+			}
+
+		}
+	},
+
+	_z = {
+		tools: _tools,
+		view: _view,
+		event: _event,
+		data: _data
+	};
+	$.extend(true, $.fn.zTree.consts, _consts);
+	$.extend(true, $.fn.zTree._z, _z);
+
+	var zt = $.fn.zTree,
+	tools = zt._z.tools,
+	consts = zt.consts,
+	view = zt._z.view,
+	data = zt._z.data,
+	event = zt._z.event,
+	$$ = tools.$;
+
+	data.exSetting(_setting);
+	data.addInitBind(_bindEvent);
+	data.addInitUnBind(_unbindEvent);
+	data.addInitCache(_initCache);
+	data.addInitNode(_initNode);
+	data.addInitProxy(_eventProxy, true);
+	data.addInitRoot(_initRoot);
+	data.addBeforeA(_beforeA);
+	data.addZTreeTools(_zTreeTools);
+
+	var _createNodes = view.createNodes;
+	view.createNodes = function(setting, level, nodes, parentNode) {
+		if (_createNodes) _createNodes.apply(view, arguments);
+		if (!nodes) return;
+		view.repairParentChkClassWithSelf(setting, parentNode);
+	}
+	var _removeNode = view.removeNode;
+	view.removeNode = function(setting, node) {
+		var parentNode = node.getParentNode();
+		if (_removeNode) _removeNode.apply(view, arguments);
+		if (!node || !parentNode) return;
+		view.repairChkClass(setting, parentNode);
+		view.repairParentChkClass(setting, parentNode);
+	}
+
+	var _appendNodes = view.appendNodes;
+	view.appendNodes = function(setting, level, nodes, parentNode, initFlag, openFlag) {
+		var html = "";
+		if (_appendNodes) {
+			html = _appendNodes.apply(view, arguments);
+		}
+		if (parentNode) {
+			data.makeChkFlag(setting, parentNode);
+		}
+		return html;
+	}
+})(jQuery);
+/*
+ * JQuery zTree exedit v3.5.15
+ * http://zTree.me/
+ *
+ * Copyright (c) 2010 Hunter.z
+ *
+ * Licensed same as jquery - MIT License
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ * email: hunter.z@263.net
+ * Date: 2013-10-15
+ */
+(function($){
+	//default consts of exedit
+	var _consts = {
+		event: {
+			DRAG: "ztree_drag",
+			DROP: "ztree_drop",
+			REMOVE: "ztree_remove",
+			RENAME: "ztree_rename"
+		},
+		id: {
+			EDIT: "_edit",
+			INPUT: "_input",
+			REMOVE: "_remove"
+		},
+		move: {
+			TYPE_INNER: "inner",
+			TYPE_PREV: "prev",
+			TYPE_NEXT: "next"
+		},
+		node: {
+			CURSELECTED_EDIT: "curSelectedNode_Edit",
+			TMPTARGET_TREE: "tmpTargetzTree",
+			TMPTARGET_NODE: "tmpTargetNode"
+		}
+	},
+	//default setting of exedit
+	_setting = {
+		edit: {
+			enable: false,
+			editNameSelectAll: false,
+			showRemoveBtn: true,
+			showRenameBtn: true,
+			removeTitle: "remove",
+			renameTitle: "rename",
+			drag: {
+				autoExpandTrigger: false,
+				isCopy: true,
+				isMove: true,
+				prev: true,
+				next: true,
+				inner: true,
+				minMoveSize: 5,
+				borderMax: 10,
+				borderMin: -5,
+				maxShowNodeNum: 5,
+				autoOpenTime: 500
+			}
+		},
+		view: {
+			addHoverDom: null,
+			removeHoverDom: null
+		},
+		callback: {
+			beforeDrag:null,
+			beforeDragOpen:null,
+			beforeDrop:null,
+			beforeEditName:null,
+			beforeRename:null,
+			onDrag:null,
+			onDrop:null,
+			onRename:null
+		}
+	},
+	//default root of exedit
+	_initRoot = function (setting) {
+		var r = data.getRoot(setting), rs = data.getRoots();
+		r.curEditNode = null;
+		r.curEditInput = null;
+		r.curHoverNode = null;
+		r.dragFlag = 0;
+		r.dragNodeShowBefore = [];
+		r.dragMaskList = new Array();
+		rs.showHoverDom = true;
+	},
+	//default cache of exedit
+	_initCache = function(treeId) {},
+	//default bind event of exedit
+	_bindEvent = function(setting) {
+		var o = setting.treeObj;
+		var c = consts.event;
+		o.bind(c.RENAME, function (event, treeId, treeNode, isCancel) {
+			tools.apply(setting.callback.onRename, [event, treeId, treeNode, isCancel]);
+		});
+
+		o.bind(c.REMOVE, function (event, treeId, treeNode) {
+			tools.apply(setting.callback.onRemove, [event, treeId, treeNode]);
+		});
+
+		o.bind(c.DRAG, function (event, srcEvent, treeId, treeNodes) {
+			tools.apply(setting.callback.onDrag, [srcEvent, treeId, treeNodes]);
+		});
+
+		o.bind(c.DROP, function (event, srcEvent, treeId, treeNodes, targetNode, moveType, isCopy) {
+			tools.apply(setting.callback.onDrop, [srcEvent, treeId, treeNodes, targetNode, moveType, isCopy]);
+		});
+	},
+	_unbindEvent = function(setting) {
+		var o = setting.treeObj;
+		var c = consts.event;
+		o.unbind(c.RENAME);
+		o.unbind(c.REMOVE);
+		o.unbind(c.DRAG);
+		o.unbind(c.DROP);
+	},
+	//default event proxy of exedit
+	_eventProxy = function(e) {
+		var target = e.target,
+		setting = data.getSetting(e.data.treeId),
+		relatedTarget = e.relatedTarget,
+		tId = "", node = null,
+		nodeEventType = "", treeEventType = "",
+		nodeEventCallback = null, treeEventCallback = null,
+		tmp = null;
+
+		if (tools.eqs(e.type, "mouseover")) {
+			tmp = tools.getMDom(setting, target, [{tagName:"a", attrName:"treeNode"+consts.id.A}]);
+			if (tmp) {
+				tId = tools.getNodeMainDom(tmp).id;
+				nodeEventType = "hoverOverNode";
+			}
+		} else if (tools.eqs(e.type, "mouseout")) {
+			tmp = tools.getMDom(setting, relatedTarget, [{tagName:"a", attrName:"treeNode"+consts.id.A}]);
+			if (!tmp) {
+				tId = "remove";
+				nodeEventType = "hoverOutNode";
+			}
+		} else if (tools.eqs(e.type, "mousedown")) {
+			tmp = tools.getMDom(setting, target, [{tagName:"a", attrName:"treeNode"+consts.id.A}]);
+			if (tmp) {
+				tId = tools.getNodeMainDom(tmp).id;
+				nodeEventType = "mousedownNode";
+			}
+		}
+		if (tId.length>0) {
+			node = data.getNodeCache(setting, tId);
+			switch (nodeEventType) {
+				case "mousedownNode" :
+					nodeEventCallback = _handler.onMousedownNode;
+					break;
+				case "hoverOverNode" :
+					nodeEventCallback = _handler.onHoverOverNode;
+					break;
+				case "hoverOutNode" :
+					nodeEventCallback = _handler.onHoverOutNode;
+					break;
+			}
+		}
+		var proxyResult = {
+			stop: false,
+			node: node,
+			nodeEventType: nodeEventType,
+			nodeEventCallback: nodeEventCallback,
+			treeEventType: treeEventType,
+			treeEventCallback: treeEventCallback
+		};
+		return proxyResult
+	},
+	//default init node of exedit
+	_initNode = function(setting, level, n, parentNode, isFirstNode, isLastNode, openFlag) {
+		if (!n) return;
+		n.isHover = false;
+		n.editNameFlag = false;
+	},
+	//update zTreeObj, add method of edit
+	_zTreeTools = function(setting, zTreeTools) {
+		zTreeTools.cancelEditName = function(newName) {
+			var root = data.getRoot(setting);
+			if (!root.curEditNode) return;
+			view.cancelCurEditNode(setting, newName?newName:null, true);
+		}
+		zTreeTools.copyNode = function(targetNode, node, moveType, isSilent) {
+			if (!node) return null;
+			if (targetNode && !targetNode.isParent && setting.data.keep.leaf && moveType === consts.move.TYPE_INNER) return null;
+			var newNode = tools.clone(node);
+			if (!targetNode) {
+				targetNode = null;
+				moveType = consts.move.TYPE_INNER;
+			}
+			if (moveType == consts.move.TYPE_INNER) {
+				function copyCallback() {
+					view.addNodes(setting, targetNode, [newNode], isSilent);
+				}
+
+				if (tools.canAsync(setting, targetNode)) {
+					view.asyncNode(setting, targetNode, isSilent, copyCallback);
+				} else {
+					copyCallback();
+				}
+			} else {
+				view.addNodes(setting, targetNode.parentNode, [newNode], isSilent);
+				view.moveNode(setting, targetNode, newNode, moveType, false, isSilent);
+			}
+			return newNode;
+		}
+		zTreeTools.editName = function(node) {
+			if (!node || !node.tId || node !== data.getNodeCache(setting, node.tId)) return;
+			if (node.parentTId) view.expandCollapseParentNode(setting, node.getParentNode(), true);
+			view.editNode(setting, node)
+		}
+		zTreeTools.moveNode = function(targetNode, node, moveType, isSilent) {
+			if (!node) return node;
+			if (targetNode && !targetNode.isParent && setting.data.keep.leaf && moveType === consts.move.TYPE_INNER) {
+				return null;
+			} else if (targetNode && ((node.parentTId == targetNode.tId && moveType == consts.move.TYPE_INNER) || $$(node, setting).find("#" + targetNode.tId).length > 0)) {
+				return null;
+			} else if (!targetNode) {
+				targetNode = null;
+			}
+			function moveCallback() {
+				view.moveNode(setting, targetNode, node, moveType, false, isSilent);
+			}
+			if (tools.canAsync(setting, targetNode) && moveType === consts.move.TYPE_INNER) {
+				view.asyncNode(setting, targetNode, isSilent, moveCallback);
+			} else {
+				moveCallback();
+			}
+			return node;
+		}
+		zTreeTools.setEditable = function(editable) {
+			setting.edit.enable = editable;
+			return this.refresh();
+		}
+	},
+	//method of operate data
+	_data = {
+		setSonNodeLevel: function(setting, parentNode, node) {
+			if (!node) return;
+			var childKey = setting.data.key.children;
+			node.level = (parentNode)? parentNode.level + 1 : 0;
+			if (!node[childKey]) return;
+			for (var i = 0, l = node[childKey].length; i < l; i++) {
+				if (node[childKey][i]) data.setSonNodeLevel(setting, node, node[childKey][i]);
+			}
+		}
+	},
+	//method of event proxy
+	_event = {
+
+	},
+	//method of event handler
+	_handler = {
+		onHoverOverNode: function(event, node) {
+			var setting = data.getSetting(event.data.treeId),
+			root = data.getRoot(setting);
+			if (root.curHoverNode != node) {
+				_handler.onHoverOutNode(event);
+			}
+			root.curHoverNode = node;
+			view.addHoverDom(setting, node);
+		},
+		onHoverOutNode: function(event, node) {
+			var setting = data.getSetting(event.data.treeId),
+			root = data.getRoot(setting);
+			if (root.curHoverNode && !data.isSelectedNode(setting, root.curHoverNode)) {
+				view.removeTreeDom(setting, root.curHoverNode);
+				root.curHoverNode = null;
+			}
+		},
+		onMousedownNode: function(eventMouseDown, _node) {
+			var i,l,
+			setting = data.getSetting(eventMouseDown.data.treeId),
+			root = data.getRoot(setting), roots = data.getRoots();
+			//right click can't drag & drop
+			if (eventMouseDown.button == 2 || !setting.edit.enable || (!setting.edit.drag.isCopy && !setting.edit.drag.isMove)) return true;
+
+			//input of edit node name can't drag & drop
+			var target = eventMouseDown.target,
+			_nodes = data.getRoot(setting).curSelectedList,
+			nodes = [];
+			if (!data.isSelectedNode(setting, _node)) {
+				nodes = [_node];
+			} else {
+				for (i=0, l=_nodes.length; i<l; i++) {
+					if (_nodes[i].editNameFlag && tools.eqs(target.tagName, "input") && target.getAttribute("treeNode"+consts.id.INPUT) !== null) {
+						return true;
+					}
+					nodes.push(_nodes[i]);
+					if (nodes[0].parentTId !== _nodes[i].parentTId) {
+						nodes = [_node];
+						break;
+					}
+				}
+			}
+
+			view.editNodeBlur = true;
+			view.cancelCurEditNode(setting);
+
+			var doc = $(setting.treeObj.get(0).ownerDocument),
+			body = $(setting.treeObj.get(0).ownerDocument.body), curNode, tmpArrow, tmpTarget,
+			isOtherTree = false,
+			targetSetting = setting,
+			sourceSetting = setting,
+			preNode, nextNode,
+			preTmpTargetNodeId = null,
+			preTmpMoveType = null,
+			tmpTargetNodeId = null,
+			moveType = consts.move.TYPE_INNER,
+			mouseDownX = eventMouseDown.clientX,
+			mouseDownY = eventMouseDown.clientY,
+			startTime = (new Date()).getTime();
+
+			if (tools.uCanDo(setting)) {
+				doc.bind("mousemove", _docMouseMove);
+			}
+			function _docMouseMove(event) {
+				//avoid start drag after click node
+				if (root.dragFlag == 0 && Math.abs(mouseDownX - event.clientX) < setting.edit.drag.minMoveSize
+					&& Math.abs(mouseDownY - event.clientY) < setting.edit.drag.minMoveSize) {
+					return true;
+				}
+				var i, l, tmpNode, tmpDom, tmpNodes,
+				childKey = setting.data.key.children;
+				body.css("cursor", "pointer");
+
+				if (root.dragFlag == 0) {
+					if (tools.apply(setting.callback.beforeDrag, [setting.treeId, nodes], true) == false) {
+						_docMouseUp(event);
+						return true;
+					}
+
+					for (i=0, l=nodes.length; i<l; i++) {
+						if (i==0) {
+							root.dragNodeShowBefore = [];
+						}
+						tmpNode = nodes[i];
+						if (tmpNode.isParent && tmpNode.open) {
+							view.expandCollapseNode(setting, tmpNode, !tmpNode.open);
+							root.dragNodeShowBefore[tmpNode.tId] = true;
+						} else {
+							root.dragNodeShowBefore[tmpNode.tId] = false;
+						}
+					}
+
+					root.dragFlag = 1;
+					roots.showHoverDom = false;
+					tools.showIfameMask(setting, true);
+
+					//sort
+					var isOrder = true, lastIndex = -1;
+					if (nodes.length>1) {
+						var pNodes = nodes[0].parentTId ? nodes[0].getParentNode()[childKey] : data.getNodes(setting);
+						tmpNodes = [];
+						for (i=0, l=pNodes.length; i<l; i++) {
+							if (root.dragNodeShowBefore[pNodes[i].tId] !== undefined) {
+								if (isOrder && lastIndex > -1 && (lastIndex+1) !== i) {
+									isOrder = false;
+								}
+								tmpNodes.push(pNodes[i]);
+								lastIndex = i;
+							}
+							if (nodes.length === tmpNodes.length) {
+								nodes = tmpNodes;
+								break;
+							}
+						}
+					}
+					if (isOrder) {
+						preNode = nodes[0].getPreNode();
+						nextNode = nodes[nodes.length-1].getNextNode();
+					}
+
+					//set node in selected
+					curNode = $$("<ul class='zTreeDragUL'></ul>", setting);
+					for (i=0, l=nodes.length; i<l; i++) {
+						tmpNode = nodes[i];
+						tmpNode.editNameFlag = false;
+						view.selectNode(setting, tmpNode, i>0);
+						view.removeTreeDom(setting, tmpNode);
+
+						tmpDom = $$("<li id='"+ tmpNode.tId +"_tmp'></li>", setting);
+						tmpDom.append($$(tmpNode, consts.id.A, setting).clone());
+						tmpDom.css("padding", "0");
+						tmpDom.children("#" + tmpNode.tId + consts.id.A).removeClass(consts.node.CURSELECTED);
+						curNode.append(tmpDom);
+						if (i == setting.edit.drag.maxShowNodeNum-1) {
+							tmpDom = $$("<li id='"+ tmpNode.tId +"_moretmp'><a>  ...  </a></li>", setting);
+							curNode.append(tmpDom);
+							break;
+						}
+					}
+					curNode.attr("id", nodes[0].tId + consts.id.UL + "_tmp");
+					curNode.addClass(setting.treeObj.attr("class"));
+					curNode.appendTo(body);
+
+					tmpArrow = $$("<span class='tmpzTreeMove_arrow'></span>", setting);
+					tmpArrow.attr("id", "zTreeMove_arrow_tmp");
+					tmpArrow.appendTo(body);
+
+					setting.treeObj.trigger(consts.event.DRAG, [event, setting.treeId, nodes]);
+				}
+
+				if (root.dragFlag == 1) {
+					if (tmpTarget && tmpArrow.attr("id") == event.target.id && tmpTargetNodeId && (event.clientX + doc.scrollLeft()+2) > ($("#" + tmpTargetNodeId + consts.id.A, tmpTarget).offset().left)) {
+						var xT = $("#" + tmpTargetNodeId + consts.id.A, tmpTarget);
+						event.target = (xT.length > 0) ? xT.get(0) : event.target;
+					} else if (tmpTarget) {
+						tmpTarget.removeClass(consts.node.TMPTARGET_TREE);
+						if (tmpTargetNodeId) $("#" + tmpTargetNodeId + consts.id.A, tmpTarget).removeClass(consts.node.TMPTARGET_NODE + "_" + consts.move.TYPE_PREV)
+							.removeClass(consts.node.TMPTARGET_NODE + "_" + _consts.move.TYPE_NEXT).removeClass(consts.node.TMPTARGET_NODE + "_" + _consts.move.TYPE_INNER);
+					}
+					tmpTarget = null;
+					tmpTargetNodeId = null;
+
+					//judge drag & drop in multi ztree
+					isOtherTree = false;
+					targetSetting = setting;
+					var settings = data.getSettings();
+					for (var s in settings) {
+						if (settings[s].treeId && settings[s].edit.enable && settings[s].treeId != setting.treeId
+							&& (event.target.id == settings[s].treeId || $(event.target).parents("#" + settings[s].treeId).length>0)) {
+							isOtherTree = true;
+							targetSetting = settings[s];
+						}
+					}
+
+					var docScrollTop = doc.scrollTop(),
+					docScrollLeft = doc.scrollLeft(),
+					treeOffset = targetSetting.treeObj.offset(),
+					scrollHeight = targetSetting.treeObj.get(0).scrollHeight,
+					scrollWidth = targetSetting.treeObj.get(0).scrollWidth,
+					dTop = (event.clientY + docScrollTop - treeOffset.top),
+					dBottom = (targetSetting.treeObj.height() + treeOffset.top - event.clientY - docScrollTop),
+					dLeft = (event.clientX + docScrollLeft - treeOffset.left),
+					dRight = (targetSetting.treeObj.width() + treeOffset.left - event.clientX - docScrollLeft),
+					isTop = (dTop < setting.edit.drag.borderMax && dTop > setting.edit.drag.borderMin),
+					isBottom = (dBottom < setting.edit.drag.borderMax && dBottom > setting.edit.drag.borderMin),
+					isLeft = (dLeft < setting.edit.drag.borderMax && dLeft > setting.edit.drag.borderMin),
+					isRight = (dRight < setting.edit.drag.borderMax && dRight > setting.edit.drag.borderMin),
+					isTreeInner = dTop > setting.edit.drag.borderMin && dBottom > setting.edit.drag.borderMin && dLeft > setting.edit.drag.borderMin && dRight > setting.edit.drag.borderMin,
+					isTreeTop = (isTop && targetSetting.treeObj.scrollTop() <= 0),
+					isTreeBottom = (isBottom && (targetSetting.treeObj.scrollTop() + targetSetting.treeObj.height()+10) >= scrollHeight),
+					isTreeLeft = (isLeft && targetSetting.treeObj.scrollLeft() <= 0),
+					isTreeRight = (isRight && (targetSetting.treeObj.scrollLeft() + targetSetting.treeObj.width()+10) >= scrollWidth);
+
+					if (event.target && tools.isChildOrSelf(event.target, targetSetting.treeId)) {
+						//get node <li> dom
+						var targetObj = event.target;
+						while (targetObj && targetObj.tagName && !tools.eqs(targetObj.tagName, "li") && targetObj.id != targetSetting.treeId) {
+							targetObj = targetObj.parentNode;
+						}
+
+						var canMove = true;
+						//don't move to self or children of self
+						for (i=0, l=nodes.length; i<l; i++) {
+							tmpNode = nodes[i];
+							if (targetObj.id === tmpNode.tId) {
+								canMove = false;
+								break;
+							} else if ($$(tmpNode, setting).find("#" + targetObj.id).length > 0) {
+								canMove = false;
+								break;
+							}
+						}
+						if (canMove && event.target && tools.isChildOrSelf(event.target, targetObj.id + consts.id.A)) {
+							tmpTarget = $(targetObj);
+							tmpTargetNodeId = targetObj.id;
+						}
+					}
+
+					//the mouse must be in zTree
+					tmpNode = nodes[0];
+					if (isTreeInner && tools.isChildOrSelf(event.target, targetSetting.treeId)) {
+						//judge mouse move in root of ztree
+						if (!tmpTarget && (event.target.id == targetSetting.treeId || isTreeTop || isTreeBottom || isTreeLeft || isTreeRight) && (isOtherTree || (!isOtherTree && tmpNode.parentTId))) {
+							tmpTarget = targetSetting.treeObj;
+						}
+						//auto scroll top
+						if (isTop) {
+							targetSetting.treeObj.scrollTop(targetSetting.treeObj.scrollTop()-10);
+						} else if (isBottom)  {
+							targetSetting.treeObj.scrollTop(targetSetting.treeObj.scrollTop()+10);
+						}
+						if (isLeft) {
+							targetSetting.treeObj.scrollLeft(targetSetting.treeObj.scrollLeft()-10);
+						} else if (isRight) {
+							targetSetting.treeObj.scrollLeft(targetSetting.treeObj.scrollLeft()+10);
+						}
+						//auto scroll left
+						if (tmpTarget && tmpTarget != targetSetting.treeObj && tmpTarget.offset().left < targetSetting.treeObj.offset().left) {
+							targetSetting.treeObj.scrollLeft(targetSetting.treeObj.scrollLeft()+ tmpTarget.offset().left - targetSetting.treeObj.offset().left);
+						}
+					}
+
+					curNode.css({
+						"top": (event.clientY + docScrollTop + 3) + "px",
+						"left": (event.clientX + docScrollLeft + 3) + "px"
+					});
+
+					var dX = 0;
+					var dY = 0;
+					if (tmpTarget && tmpTarget.attr("id")!=targetSetting.treeId) {
+						var tmpTargetNode = tmpTargetNodeId == null ? null: data.getNodeCache(targetSetting, tmpTargetNodeId),
+						isCopy = (event.ctrlKey && setting.edit.drag.isMove && setting.edit.drag.isCopy) || (!setting.edit.drag.isMove && setting.edit.drag.isCopy),
+						isPrev = !!(preNode && tmpTargetNodeId === preNode.tId),
+						isNext = !!(nextNode && tmpTargetNodeId === nextNode.tId),
+						isInner = (tmpNode.parentTId && tmpNode.parentTId == tmpTargetNodeId),
+						canPrev = (isCopy || !isNext) && tools.apply(targetSetting.edit.drag.prev, [targetSetting.treeId, nodes, tmpTargetNode], !!targetSetting.edit.drag.prev),
+						canNext = (isCopy || !isPrev) && tools.apply(targetSetting.edit.drag.next, [targetSetting.treeId, nodes, tmpTargetNode], !!targetSetting.edit.drag.next),
+						canInner = (isCopy || !isInner) && !(targetSetting.data.keep.leaf && !tmpTargetNode.isParent) && tools.apply(targetSetting.edit.drag.inner, [targetSetting.treeId, nodes, tmpTargetNode], !!targetSetting.edit.drag.inner);
+						if (!canPrev && !canNext && !canInner) {
+							tmpTarget = null;
+							tmpTargetNodeId = "";
+							moveType = consts.move.TYPE_INNER;
+							tmpArrow.css({
+								"display":"none"
+							});
+							if (window.zTreeMoveTimer) {
+								clearTimeout(window.zTreeMoveTimer);
+								window.zTreeMoveTargetNodeTId = null
+							}
+						} else {
+							var tmpTargetA = $("#" + tmpTargetNodeId + consts.id.A, tmpTarget),
+							tmpNextA = tmpTargetNode.isLastNode ? null : $("#" + tmpTargetNode.getNextNode().tId + consts.id.A, tmpTarget.next()),
+							tmpTop = tmpTargetA.offset().top,
+							tmpLeft = tmpTargetA.offset().left,
+							prevPercent = canPrev ? (canInner ? 0.25 : (canNext ? 0.5 : 1) ) : -1,
+							nextPercent = canNext ? (canInner ? 0.75 : (canPrev ? 0.5 : 0) ) : -1,
+							dY_percent = (event.clientY + docScrollTop - tmpTop)/tmpTargetA.height();
+							if ((prevPercent==1 ||dY_percent<=prevPercent && dY_percent>=-.2) && canPrev) {
+								dX = 1 - tmpArrow.width();
+								dY = tmpTop - tmpArrow.height()/2;
+								moveType = consts.move.TYPE_PREV;
+							} else if ((nextPercent==0 || dY_percent>=nextPercent && dY_percent<=1.2) && canNext) {
+								dX = 1 - tmpArrow.width();
+								dY = (tmpNextA == null || (tmpTargetNode.isParent && tmpTargetNode.open)) ? (tmpTop + tmpTargetA.height() - tmpArrow.height()/2) : (tmpNextA.offset().top - tmpArrow.height()/2);
+								moveType = consts.move.TYPE_NEXT;
+							}else {
+								dX = 5 - tmpArrow.width();
+								dY = tmpTop;
+								moveType = consts.move.TYPE_INNER;
+							}
+							tmpArrow.css({
+								"display":"block",
+								"top": dY + "px",
+								"left": (tmpLeft + dX) + "px"
+							});
+							tmpTargetA.addClass(consts.node.TMPTARGET_NODE + "_" + moveType);
+
+							if (preTmpTargetNodeId != tmpTargetNodeId || preTmpMoveType != moveType) {
+								startTime = (new Date()).getTime();
+							}
+							if (tmpTargetNode && tmpTargetNode.isParent && moveType == consts.move.TYPE_INNER) {
+								var startTimer = true;
+								if (window.zTreeMoveTimer && window.zTreeMoveTargetNodeTId !== tmpTargetNode.tId) {
+									clearTimeout(window.zTreeMoveTimer);
+									window.zTreeMoveTargetNodeTId = null;
+								}else if (window.zTreeMoveTimer && window.zTreeMoveTargetNodeTId === tmpTargetNode.tId) {
+									startTimer = false;
+								}
+								if (startTimer) {
+									window.zTreeMoveTimer = setTimeout(function() {
+										if (moveType != consts.move.TYPE_INNER) return;
+										if (tmpTargetNode && tmpTargetNode.isParent && !tmpTargetNode.open && (new Date()).getTime() - startTime > targetSetting.edit.drag.autoOpenTime
+											&& tools.apply(targetSetting.callback.beforeDragOpen, [targetSetting.treeId, tmpTargetNode], true)) {
+											view.switchNode(targetSetting, tmpTargetNode);
+											if (targetSetting.edit.drag.autoExpandTrigger) {
+												targetSetting.treeObj.trigger(consts.event.EXPAND, [targetSetting.treeId, tmpTargetNode]);
+											}
+										}
+									}, targetSetting.edit.drag.autoOpenTime+50);
+									window.zTreeMoveTargetNodeTId = tmpTargetNode.tId;
+								}
+							}
+						}
+					} else {
+						moveType = consts.move.TYPE_INNER;
+						if (tmpTarget && tools.apply(targetSetting.edit.drag.inner, [targetSetting.treeId, nodes, null], !!targetSetting.edit.drag.inner)) {
+							tmpTarget.addClass(consts.node.TMPTARGET_TREE);
+						} else {
+							tmpTarget = null;
+						}
+						tmpArrow.css({
+							"display":"none"
+						});
+						if (window.zTreeMoveTimer) {
+							clearTimeout(window.zTreeMoveTimer);
+							window.zTreeMoveTargetNodeTId = null;
+						}
+					}
+					preTmpTargetNodeId = tmpTargetNodeId;
+					preTmpMoveType = moveType;
+				}
+				return false;
+			}
+
+			doc.bind("mouseup", _docMouseUp);
+			function _docMouseUp(event) {
+				if (window.zTreeMoveTimer) {
+					clearTimeout(window.zTreeMoveTimer);
+					window.zTreeMoveTargetNodeTId = null;
+				}
+				preTmpTargetNodeId = null;
+				preTmpMoveType = null;
+				doc.unbind("mousemove", _docMouseMove);
+				doc.unbind("mouseup", _docMouseUp);
+				doc.unbind("selectstart", _docSelect);
+				body.css("cursor", "auto");
+				if (tmpTarget) {
+					tmpTarget.removeClass(consts.node.TMPTARGET_TREE);
+					if (tmpTargetNodeId) $("#" + tmpTargetNodeId + consts.id.A, tmpTarget).removeClass(consts.node.TMPTARGET_NODE + "_" + consts.move.TYPE_PREV)
+							.removeClass(consts.node.TMPTARGET_NODE + "_" + _consts.move.TYPE_NEXT).removeClass(consts.node.TMPTARGET_NODE + "_" + _consts.move.TYPE_INNER);
+				}
+				tools.showIfameMask(setting, false);
+
+				roots.showHoverDom = true;
+				if (root.dragFlag == 0) return;
+				root.dragFlag = 0;
+
+				var i, l, tmpNode;
+				for (i=0, l=nodes.length; i<l; i++) {
+					tmpNode = nodes[i];
+					if (tmpNode.isParent && root.dragNodeShowBefore[tmpNode.tId] && !tmpNode.open) {
+						view.expandCollapseNode(setting, tmpNode, !tmpNode.open);
+						delete root.dragNodeShowBefore[tmpNode.tId];
+					}
+				}
+
+				if (curNode) curNode.remove();
+				if (tmpArrow) tmpArrow.remove();
+
+				var isCopy = (event.ctrlKey && setting.edit.drag.isMove && setting.edit.drag.isCopy) || (!setting.edit.drag.isMove && setting.edit.drag.isCopy);
+				if (!isCopy && tmpTarget && tmpTargetNodeId && nodes[0].parentTId && tmpTargetNodeId==nodes[0].parentTId && moveType == consts.move.TYPE_INNER) {
+					tmpTarget = null;
+				}
+				if (tmpTarget) {
+					var dragTargetNode = tmpTargetNodeId == null ? null: data.getNodeCache(targetSetting, tmpTargetNodeId);
+					if (tools.apply(setting.callback.beforeDrop, [targetSetting.treeId, nodes, dragTargetNode, moveType, isCopy], true) == false) {
+						view.selectNodes(sourceSetting, nodes);
+						return;
+					}
+					var newNodes = isCopy ? tools.clone(nodes) : nodes;
+
+					function dropCallback() {
+						if (isOtherTree) {
+							if (!isCopy) {
+								for(var i=0, l=nodes.length; i<l; i++) {
+									view.removeNode(setting, nodes[i]);
+								}
+							}
+							if (moveType == consts.move.TYPE_INNER) {
+								view.addNodes(targetSetting, dragTargetNode, newNodes);
+							} else {
+								view.addNodes(targetSetting, dragTargetNode.getParentNode(), newNodes);
+								if (moveType == consts.move.TYPE_PREV) {
+									for (i=0, l=newNodes.length; i<l; i++) {
+										view.moveNode(targetSetting, dragTargetNode, newNodes[i], moveType, false);
+									}
+								} else {
+									for (i=-1, l=newNodes.length-1; i<l; l--) {
+										view.moveNode(targetSetting, dragTargetNode, newNodes[l], moveType, false);
+									}
+								}
+							}
+						} else {
+							if (isCopy && moveType == consts.move.TYPE_INNER) {
+								view.addNodes(targetSetting, dragTargetNode, newNodes);
+							} else {
+								if (isCopy) {
+									view.addNodes(targetSetting, dragTargetNode.getParentNode(), newNodes);
+								}
+								if (moveType != consts.move.TYPE_NEXT) {
+									for (i=0, l=newNodes.length; i<l; i++) {
+										view.moveNode(targetSetting, dragTargetNode, newNodes[i], moveType, false);
+									}
+								} else {
+									for (i=-1, l=newNodes.length-1; i<l; l--) {
+										view.moveNode(targetSetting, dragTargetNode, newNodes[l], moveType, false);
+									}
+								}
+							}
+						}
+						view.selectNodes(targetSetting, newNodes);
+						$$(newNodes[0], setting).focus().blur();
+
+						setting.treeObj.trigger(consts.event.DROP, [event, targetSetting.treeId, newNodes, dragTargetNode, moveType, isCopy]);
+					}
+
+					if (moveType == consts.move.TYPE_INNER && tools.canAsync(targetSetting, dragTargetNode)) {
+						view.asyncNode(targetSetting, dragTargetNode, false, dropCallback);
+					} else {
+						dropCallback();
+					}
+
+				} else {
+					view.selectNodes(sourceSetting, nodes);
+					setting.treeObj.trigger(consts.event.DROP, [event, setting.treeId, nodes, null, null, null]);
+				}
+			}
+
+			doc.bind("selectstart", _docSelect);
+			function _docSelect() {
+				return false;
+			}
+
+			//Avoid FireFox's Bug
+			//If zTree Div CSS set 'overflow', so drag node outside of zTree, and event.target is error.
+			if(eventMouseDown.preventDefault) {
+				eventMouseDown.preventDefault();
+			}
+			return true;
+		}
+	},
+	//method of tools for zTree
+	_tools = {
+		getAbs: function (obj) {
+			var oRect = obj.getBoundingClientRect(),
+			scrollTop = document.body.scrollTop+document.documentElement.scrollTop,
+			scrollLeft = document.body.scrollLeft+document.documentElement.scrollLeft;
+			return [oRect.left+scrollLeft,oRect.top+scrollTop];
+		},
+		inputFocus: function(inputObj) {
+			if (inputObj.get(0)) {
+				inputObj.focus();
+				tools.setCursorPosition(inputObj.get(0), inputObj.val().length);
+			}
+		},
+		inputSelect: function(inputObj) {
+			if (inputObj.get(0)) {
+				inputObj.focus();
+				inputObj.select();
+			}
+		},
+		setCursorPosition: function(obj, pos){
+			if(obj.setSelectionRange) {
+				obj.focus();
+				obj.setSelectionRange(pos,pos);
+			} else if (obj.createTextRange) {
+				var range = obj.createTextRange();
+				range.collapse(true);
+				range.moveEnd('character', pos);
+				range.moveStart('character', pos);
+				range.select();
+			}
+		},
+		showIfameMask: function(setting, showSign) {
+			var root = data.getRoot(setting);
+			//clear full mask
+			while (root.dragMaskList.length > 0) {
+				root.dragMaskList[0].remove();
+				root.dragMaskList.shift();
+			}
+			if (showSign) {
+				//show mask
+				var iframeList = $$("iframe", setting);
+				for (var i = 0, l = iframeList.length; i < l; i++) {
+					var obj = iframeList.get(i),
+					r = tools.getAbs(obj),
+					dragMask = $$("<div id='zTreeMask_" + i + "' class='zTreeMask' style='top:" + r[1] + "px; left:" + r[0] + "px; width:" + obj.offsetWidth + "px; height:" + obj.offsetHeight + "px;'></div>", setting);
+					dragMask.appendTo($$("body", setting));
+					root.dragMaskList.push(dragMask);
+				}
+			}
+		}
+	},
+	//method of operate ztree dom
+	_view = {
+		addEditBtn: function(setting, node) {
+			if (node.editNameFlag || $$(node, consts.id.EDIT, setting).length > 0) {
+				return;
+			}
+			if (!tools.apply(setting.edit.showRenameBtn, [setting.treeId, node], setting.edit.showRenameBtn)) {
+				return;
+			}
+			var aObj = $$(node, consts.id.A, setting),
+			editStr = "<span class='" + consts.className.BUTTON + " edit' id='" + node.tId + consts.id.EDIT + "' title='"+tools.apply(setting.edit.renameTitle, [setting.treeId, node], setting.edit.renameTitle)+"' treeNode"+consts.id.EDIT+" style='display:none;'></span>";
+			aObj.append(editStr);
+
+			$$(node, consts.id.EDIT, setting).bind('click',
+				function() {
+					if (!tools.uCanDo(setting) || tools.apply(setting.callback.beforeEditName, [setting.treeId, node], true) == false) return false;
+					view.editNode(setting, node);
+					return false;
+				}
+				).show();
+		},
+		addRemoveBtn: function(setting, node) {
+			if (node.editNameFlag || $$(node, consts.id.REMOVE, setting).length > 0) {
+				return;
+			}
+			if (!tools.apply(setting.edit.showRemoveBtn, [setting.treeId, node], setting.edit.showRemoveBtn)) {
+				return;
+			}
+			var aObj = $$(node, consts.id.A, setting),
+			removeStr = "<span class='" + consts.className.BUTTON + " remove' id='" + node.tId + consts.id.REMOVE + "' title='"+tools.apply(setting.edit.removeTitle, [setting.treeId, node], setting.edit.removeTitle)+"' treeNode"+consts.id.REMOVE+" style='display:none;'></span>";
+			aObj.append(removeStr);
+
+			$$(node, consts.id.REMOVE, setting).bind('click',
+				function() {
+					if (!tools.uCanDo(setting) || tools.apply(setting.callback.beforeRemove, [setting.treeId, node], true) == false) return false;
+					view.removeNode(setting, node);
+					setting.treeObj.trigger(consts.event.REMOVE, [setting.treeId, node]);
+					return false;
+				}
+				).bind('mousedown',
+				function(eventMouseDown) {
+					return true;
+				}
+				).show();
+		},
+		addHoverDom: function(setting, node) {
+			if (data.getRoots().showHoverDom) {
+				node.isHover = true;
+				if (setting.edit.enable) {
+					view.addEditBtn(setting, node);
+					view.addRemoveBtn(setting, node);
+				}
+				tools.apply(setting.view.addHoverDom, [setting.treeId, node]);
+			}
+		},
+		cancelCurEditNode: function (setting, forceName, isCancel) {
+			var root = data.getRoot(setting),
+			nameKey = setting.data.key.name,
+			node = root.curEditNode;
+
+			if (node) {
+				var inputObj = root.curEditInput,
+				newName = forceName ? forceName:(isCancel ? node[nameKey]: inputObj.val());
+				if (tools.apply(setting.callback.beforeRename, [setting.treeId, node, newName, isCancel], true) === false) {
+					return false;
+				} else {
+					node[nameKey] = newName;
+					setting.treeObj.trigger(consts.event.RENAME, [setting.treeId, node, isCancel]);
+				}
+				var aObj = $$(node, consts.id.A, setting);
+				aObj.removeClass(consts.node.CURSELECTED_EDIT);
+				inputObj.unbind();
+				view.setNodeName(setting, node);
+				node.editNameFlag = false;
+				root.curEditNode = null;
+				root.curEditInput = null;
+				view.selectNode(setting, node, false);
+			}
+			root.noSelection = true;
+			return true;
+		},
+		editNode: function(setting, node) {
+			var root = data.getRoot(setting);
+			view.editNodeBlur = false;
+			if (data.isSelectedNode(setting, node) && root.curEditNode == node && node.editNameFlag) {
+				setTimeout(function() {tools.inputFocus(root.curEditInput);}, 0);
+				return;
+			}
+			var nameKey = setting.data.key.name;
+			node.editNameFlag = true;
+			view.removeTreeDom(setting, node);
+			view.cancelCurEditNode(setting);
+			view.selectNode(setting, node, false);
+			$$(node, consts.id.SPAN, setting).html("<input type=text class='rename' id='" + node.tId + consts.id.INPUT + "' treeNode" + consts.id.INPUT + " >");
+			var inputObj = $$(node, consts.id.INPUT, setting);
+			inputObj.attr("value", node[nameKey]);
+			if (setting.edit.editNameSelectAll) {
+				tools.inputSelect(inputObj);
+			} else {
+				tools.inputFocus(inputObj);
+			}
+
+			inputObj.bind('blur', function(event) {
+				if (!view.editNodeBlur) {
+					view.cancelCurEditNode(setting);
+				}
+			}).bind('keydown', function(event) {
+				if (event.keyCode=="13") {
+					view.editNodeBlur = true;
+					view.cancelCurEditNode(setting);
+				} else if (event.keyCode=="27") {
+					view.cancelCurEditNode(setting, null, true);
+				}
+			}).bind('click', function(event) {
+				return false;
+			}).bind('dblclick', function(event) {
+				return false;
+			});
+
+			$$(node, consts.id.A, setting).addClass(consts.node.CURSELECTED_EDIT);
+			root.curEditInput = inputObj;
+			root.noSelection = false;
+			root.curEditNode = node;
+		},
+		moveNode: function(setting, targetNode, node, moveType, animateFlag, isSilent) {
+			var root = data.getRoot(setting),
+			childKey = setting.data.key.children;
+			if (targetNode == node) return;
+			if (setting.data.keep.leaf && targetNode && !targetNode.isParent && moveType == consts.move.TYPE_INNER) return;
+			var oldParentNode = (node.parentTId ? node.getParentNode(): root),
+			targetNodeIsRoot = (targetNode === null || targetNode == root);
+			if (targetNodeIsRoot && targetNode === null) targetNode = root;
+			if (targetNodeIsRoot) moveType = consts.move.TYPE_INNER;
+			var targetParentNode = (targetNode.parentTId ? targetNode.getParentNode() : root);
+
+			if (moveType != consts.move.TYPE_PREV && moveType != consts.move.TYPE_NEXT) {
+				moveType = consts.move.TYPE_INNER;
+			}
+
+			if (moveType == consts.move.TYPE_INNER) {
+				if (targetNodeIsRoot) {
+					//parentTId of root node is null
+					node.parentTId = null;
+				} else {
+					if (!targetNode.isParent) {
+						targetNode.isParent = true;
+						targetNode.open = !!targetNode.open;
+						view.setNodeLineIcos(setting, targetNode);
+					}
+					node.parentTId = targetNode.tId;
+				}
+			}
+
+			//move node Dom
+			var targetObj, target_ulObj;
+			if (targetNodeIsRoot) {
+				targetObj = setting.treeObj;
+				target_ulObj = targetObj;
+			} else {
+				if (!isSilent && moveType == consts.move.TYPE_INNER) {
+					view.expandCollapseNode(setting, targetNode, true, false);
+				} else if (!isSilent) {
+					view.expandCollapseNode(setting, targetNode.getParentNode(), true, false);
+				}
+				targetObj = $$(targetNode, setting);
+				target_ulObj = $$(targetNode, consts.id.UL, setting);
+				if (!!targetObj.get(0) && !target_ulObj.get(0)) {
+					var ulstr = [];
+					view.makeUlHtml(setting, targetNode, ulstr, '');
+					targetObj.append(ulstr.join(''));
+				}
+				target_ulObj = $$(targetNode, consts.id.UL, setting);
+			}
+			var nodeDom = $$(node, setting);
+			if (!nodeDom.get(0)) {
+				nodeDom = view.appendNodes(setting, node.level, [node], null, false, true).join('');
+			} else if (!targetObj.get(0)) {
+				nodeDom.remove();
+			}
+			if (target_ulObj.get(0) && moveType == consts.move.TYPE_INNER) {
+				target_ulObj.append(nodeDom);
+			} else if (targetObj.get(0) && moveType == consts.move.TYPE_PREV) {
+				targetObj.before(nodeDom);
+			} else if (targetObj.get(0) && moveType == consts.move.TYPE_NEXT) {
+				targetObj.after(nodeDom);
+			}
+
+			//repair the data after move
+			var i,l,
+			tmpSrcIndex = -1,
+			tmpTargetIndex = 0,
+			oldNeighbor = null,
+			newNeighbor = null,
+			oldLevel = node.level;
+			if (node.isFirstNode) {
+				tmpSrcIndex = 0;
+				if (oldParentNode[childKey].length > 1 ) {
+					oldNeighbor = oldParentNode[childKey][1];
+					oldNeighbor.isFirstNode = true;
+				}
+			} else if (node.isLastNode) {
+				tmpSrcIndex = oldParentNode[childKey].length -1;
+				oldNeighbor = oldParentNode[childKey][tmpSrcIndex - 1];
+				oldNeighbor.isLastNode = true;
+			} else {
+				for (i = 0, l = oldParentNode[childKey].length; i < l; i++) {
+					if (oldParentNode[childKey][i].tId == node.tId) {
+						tmpSrcIndex = i;
+						break;
+					}
+				}
+			}
+			if (tmpSrcIndex >= 0) {
+				oldParentNode[childKey].splice(tmpSrcIndex, 1);
+			}
+			if (moveType != consts.move.TYPE_INNER) {
+				for (i = 0, l = targetParentNode[childKey].length; i < l; i++) {
+					if (targetParentNode[childKey][i].tId == targetNode.tId) tmpTargetIndex = i;
+				}
+			}
+			if (moveType == consts.move.TYPE_INNER) {
+				if (!targetNode[childKey]) targetNode[childKey] = new Array();
+				if (targetNode[childKey].length > 0) {
+					newNeighbor = targetNode[childKey][targetNode[childKey].length - 1];
+					newNeighbor.isLastNode = false;
+				}
+				targetNode[childKey].splice(targetNode[childKey].length, 0, node);
+				node.isLastNode = true;
+				node.isFirstNode = (targetNode[childKey].length == 1);
+			} else if (targetNode.isFirstNode && moveType == consts.move.TYPE_PREV) {
+				targetParentNode[childKey].splice(tmpTargetIndex, 0, node);
+				newNeighbor = targetNode;
+				newNeighbor.isFirstNode = false;
+				node.parentTId = targetNode.parentTId;
+				node.isFirstNode = true;
+				node.isLastNode = false;
+
+			} else if (targetNode.isLastNode && moveType == consts.move.TYPE_NEXT) {
+				targetParentNode[childKey].splice(tmpTargetIndex + 1, 0, node);
+				newNeighbor = targetNode;
+				newNeighbor.isLastNode = false;
+				node.parentTId = targetNode.parentTId;
+				node.isFirstNode = false;
+				node.isLastNode = true;
+
+			} else {
+				if (moveType == consts.move.TYPE_PREV) {
+					targetParentNode[childKey].splice(tmpTargetIndex, 0, node);
+				} else {
+					targetParentNode[childKey].splice(tmpTargetIndex + 1, 0, node);
+				}
+				node.parentTId = targetNode.parentTId;
+				node.isFirstNode = false;
+				node.isLastNode = false;
+			}
+			data.fixPIdKeyValue(setting, node);
+			data.setSonNodeLevel(setting, node.getParentNode(), node);
+
+			//repair node what been moved
+			view.setNodeLineIcos(setting, node);
+			view.repairNodeLevelClass(setting, node, oldLevel)
+
+			//repair node's old parentNode dom
+			if (!setting.data.keep.parent && oldParentNode[childKey].length < 1) {
+				//old parentNode has no child nodes
+				oldParentNode.isParent = false;
+				oldParentNode.open = false;
+				var tmp_ulObj = $$(oldParentNode, consts.id.UL, setting),
+				tmp_switchObj = $$(oldParentNode, consts.id.SWITCH, setting),
+				tmp_icoObj = $$(oldParentNode, consts.id.ICON, setting);
+				view.replaceSwitchClass(oldParentNode, tmp_switchObj, consts.folder.DOCU);
+				view.replaceIcoClass(oldParentNode, tmp_icoObj, consts.folder.DOCU);
+				tmp_ulObj.css("display", "none");
+
+			} else if (oldNeighbor) {
+				//old neigbor node
+				view.setNodeLineIcos(setting, oldNeighbor);
+			}
+
+			//new neigbor node
+			if (newNeighbor) {
+				view.setNodeLineIcos(setting, newNeighbor);
+			}
+
+			//repair checkbox / radio
+			if (!!setting.check && setting.check.enable && view.repairChkClass) {
+				view.repairChkClass(setting, oldParentNode);
+				view.repairParentChkClassWithSelf(setting, oldParentNode);
+				if (oldParentNode != node.parent)
+					view.repairParentChkClassWithSelf(setting, node);
+			}
+
+			//expand parents after move
+			if (!isSilent) {
+				view.expandCollapseParentNode(setting, node.getParentNode(), true, animateFlag);
+			}
+		},
+		removeEditBtn: function(setting, node) {
+			$$(node, consts.id.EDIT, setting).unbind().remove();
+		},
+		removeRemoveBtn: function(setting, node) {
+			$$(node, consts.id.REMOVE, setting).unbind().remove();
+		},
+		removeTreeDom: function(setting, node) {
+			node.isHover = false;
+			view.removeEditBtn(setting, node);
+			view.removeRemoveBtn(setting, node);
+			tools.apply(setting.view.removeHoverDom, [setting.treeId, node]);
+		},
+		repairNodeLevelClass: function(setting, node, oldLevel) {
+			if (oldLevel === node.level) return;
+			var liObj = $$(node, setting),
+			aObj = $$(node, consts.id.A, setting),
+			ulObj = $$(node, consts.id.UL, setting),
+			oldClass = consts.className.LEVEL + oldLevel,
+			newClass = consts.className.LEVEL + node.level;
+			liObj.removeClass(oldClass);
+			liObj.addClass(newClass);
+			aObj.removeClass(oldClass);
+			aObj.addClass(newClass);
+			ulObj.removeClass(oldClass);
+			ulObj.addClass(newClass);
+		},
+		selectNodes : function(setting, nodes) {
+			for (var i=0, l=nodes.length; i<l; i++) {
+				view.selectNode(setting, nodes[i], i>0);
+			}
+		}
+	},
+
+	_z = {
+		tools: _tools,
+		view: _view,
+		event: _event,
+		data: _data
+	};
+	$.extend(true, $.fn.zTree.consts, _consts);
+	$.extend(true, $.fn.zTree._z, _z);
+
+	var zt = $.fn.zTree,
+	tools = zt._z.tools,
+	consts = zt.consts,
+	view = zt._z.view,
+	data = zt._z.data,
+	event = zt._z.event,
+	$$ = tools.$;
+
+	data.exSetting(_setting);
+	data.addInitBind(_bindEvent);
+	data.addInitUnBind(_unbindEvent);
+	data.addInitCache(_initCache);
+	data.addInitNode(_initNode);
+	data.addInitProxy(_eventProxy);
+	data.addInitRoot(_initRoot);
+	data.addZTreeTools(_zTreeTools);
+
+	var _cancelPreSelectedNode = view.cancelPreSelectedNode;
+	view.cancelPreSelectedNode = function (setting, node) {
+		var list = data.getRoot(setting).curSelectedList;
+		for (var i=0, j=list.length; i<j; i++) {
+			if (!node || node === list[i]) {
+				view.removeTreeDom(setting, list[i]);
+				if (node) break;
+			}
+		}
+		if (_cancelPreSelectedNode) _cancelPreSelectedNode.apply(view, arguments);
+	}
+
+	var _createNodes = view.createNodes;
+	view.createNodes = function(setting, level, nodes, parentNode) {
+		if (_createNodes) {
+			_createNodes.apply(view, arguments);
+		}
+		if (!nodes) return;
+		if (view.repairParentChkClassWithSelf) {
+			view.repairParentChkClassWithSelf(setting, parentNode);
+		}
+	}
+
+	var _makeNodeUrl = view.makeNodeUrl;
+	view.makeNodeUrl = function(setting, node) {
+		return setting.edit.enable ? null : (_makeNodeUrl.apply(view, arguments));
+	}
+
+	var _removeNode = view.removeNode;
+	view.removeNode = function(setting, node) {
+		var root = data.getRoot(setting);
+		if (root.curEditNode === node) root.curEditNode = null;
+		if (_removeNode) {
+			_removeNode.apply(view, arguments);
+		}
+	}
+
+	var _selectNode = view.selectNode;
+	view.selectNode = function(setting, node, addFlag) {
+		var root = data.getRoot(setting);
+		if (data.isSelectedNode(setting, node) && root.curEditNode == node && node.editNameFlag) {
+			return false;
+		}
+		if (_selectNode) _selectNode.apply(view, arguments);
+		view.addHoverDom(setting, node);
+		return true;
+	}
+
+	var _uCanDo = tools.uCanDo;
+	tools.uCanDo = function(setting, e) {
+		var root = data.getRoot(setting);
+		if (e && (tools.eqs(e.type, "mouseover") || tools.eqs(e.type, "mouseout") || tools.eqs(e.type, "mousedown") || tools.eqs(e.type, "mouseup"))) {
+			return true;
+		}
+		if (root.curEditNode) {
+			view.editNodeBlur = false;
+			root.curEditInput.focus();
+		}
+		return (!root.curEditNode) && (_uCanDo ? _uCanDo.apply(view, arguments) : true);
+	}
+})(jQuery);
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/js/jquery.ztree.all-3.5.min.js b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/js/jquery.ztree.all-3.5.min.js
new file mode 100644
index 0000000..bfd0505
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/js/jquery.ztree.all-3.5.min.js
@@ -0,0 +1,157 @@
+
+/*
+ * JQuery zTree core v3.5.15
+ * http://zTree.me/
+ *
+ * Copyright (c) 2010 Hunter.z
+ *
+ * Licensed same as jquery - MIT License
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ * email: hunter.z@263.net
+ * Date: 2013-10-15
+ */
+(function(p){var G,H,I,J,K,L,r={},u={},v={},M={treeId:"",treeObj:null,view:{addDiyDom:null,autoCancelSelected:!0,dblClickExpand:!0,expandSpeed:"fast",fontCss:{},nameIsHTML:!1,selectedMulti:!0,showIcon:!0,showLine:!0,showTitle:!0,txtSelectedEnable:!1},data:{key:{children:"children",name:"name",title:"",url:"url"},simpleData:{enable:!1,idKey:"id",pIdKey:"pId",rootPId:null},keep:{parent:!1,leaf:!1}},async:{enable:!1,contentType:"application/x-www-form-urlencoded",type:"post",dataType:"text",url:"",autoParam:[],
+otherParam:[],dataFilter:null},callback:{beforeAsync:null,beforeClick:null,beforeDblClick:null,beforeRightClick:null,beforeMouseDown:null,beforeMouseUp:null,beforeExpand:null,beforeCollapse:null,beforeRemove:null,onAsyncError:null,onAsyncSuccess:null,onNodeCreated:null,onClick:null,onDblClick:null,onRightClick:null,onMouseDown:null,onMouseUp:null,onExpand:null,onCollapse:null,onRemove:null}},w=[function(b){var a=b.treeObj,c=e.event;a.bind(c.NODECREATED,function(a,c,g){j.apply(b.callback.onNodeCreated,
+[a,c,g])});a.bind(c.CLICK,function(a,c,g,l,h){j.apply(b.callback.onClick,[c,g,l,h])});a.bind(c.EXPAND,function(a,c,g){j.apply(b.callback.onExpand,[a,c,g])});a.bind(c.COLLAPSE,function(a,c,g){j.apply(b.callback.onCollapse,[a,c,g])});a.bind(c.ASYNC_SUCCESS,function(a,c,g,l){j.apply(b.callback.onAsyncSuccess,[a,c,g,l])});a.bind(c.ASYNC_ERROR,function(a,c,g,l,h,e){j.apply(b.callback.onAsyncError,[a,c,g,l,h,e])})}],x=[function(b){var a=e.event;b.treeObj.unbind(a.NODECREATED).unbind(a.CLICK).unbind(a.EXPAND).unbind(a.COLLAPSE).unbind(a.ASYNC_SUCCESS).unbind(a.ASYNC_ERROR)}],
+y=[function(b){var a=h.getCache(b);a||(a={},h.setCache(b,a));a.nodes=[];a.doms=[]}],z=[function(b,a,c,d,f,g){if(c){var l=h.getRoot(b),e=b.data.key.children;c.level=a;c.tId=b.treeId+"_"+ ++l.zId;c.parentTId=d?d.tId:null;c.open=typeof c.open=="string"?j.eqs(c.open,"true"):!!c.open;c[e]&&c[e].length>0?(c.isParent=!0,c.zAsync=!0):(c.isParent=typeof c.isParent=="string"?j.eqs(c.isParent,"true"):!!c.isParent,c.open=c.isParent&&!b.async.enable?c.open:!1,c.zAsync=!c.isParent);c.isFirstNode=f;c.isLastNode=
+g;c.getParentNode=function(){return h.getNodeCache(b,c.parentTId)};c.getPreNode=function(){return h.getPreNode(b,c)};c.getNextNode=function(){return h.getNextNode(b,c)};c.isAjaxing=!1;h.fixPIdKeyValue(b,c)}}],s=[function(b){var a=b.target,c=h.getSetting(b.data.treeId),d="",f=null,g="",l="",i=null,n=null,k=null;if(j.eqs(b.type,"mousedown"))l="mousedown";else if(j.eqs(b.type,"mouseup"))l="mouseup";else if(j.eqs(b.type,"contextmenu"))l="contextmenu";else if(j.eqs(b.type,"click"))if(j.eqs(a.tagName,"span")&&
+a.getAttribute("treeNode"+e.id.SWITCH)!==null)d=j.getNodeMainDom(a).id,g="switchNode";else{if(k=j.getMDom(c,a,[{tagName:"a",attrName:"treeNode"+e.id.A}]))d=j.getNodeMainDom(k).id,g="clickNode"}else if(j.eqs(b.type,"dblclick")&&(l="dblclick",k=j.getMDom(c,a,[{tagName:"a",attrName:"treeNode"+e.id.A}])))d=j.getNodeMainDom(k).id,g="switchNode";if(l.length>0&&d.length==0&&(k=j.getMDom(c,a,[{tagName:"a",attrName:"treeNode"+e.id.A}])))d=j.getNodeMainDom(k).id;if(d.length>0)switch(f=h.getNodeCache(c,d),g){case "switchNode":f.isParent?
+j.eqs(b.type,"click")||j.eqs(b.type,"dblclick")&&j.apply(c.view.dblClickExpand,[c.treeId,f],c.view.dblClickExpand)?i=G:g="":g="";break;case "clickNode":i=H}switch(l){case "mousedown":n=I;break;case "mouseup":n=J;break;case "dblclick":n=K;break;case "contextmenu":n=L}return{stop:!1,node:f,nodeEventType:g,nodeEventCallback:i,treeEventType:l,treeEventCallback:n}}],A=[function(b){var a=h.getRoot(b);a||(a={},h.setRoot(b,a));a[b.data.key.children]=[];a.expandTriggerFlag=!1;a.curSelectedList=[];a.noSelection=
+!0;a.createdNodes=[];a.zId=0;a._ver=(new Date).getTime()}],B=[],C=[],D=[],E=[],F=[],h={addNodeCache:function(b,a){h.getCache(b).nodes[h.getNodeCacheId(a.tId)]=a},getNodeCacheId:function(b){return b.substring(b.lastIndexOf("_")+1)},addAfterA:function(b){C.push(b)},addBeforeA:function(b){B.push(b)},addInnerAfterA:function(b){E.push(b)},addInnerBeforeA:function(b){D.push(b)},addInitBind:function(b){w.push(b)},addInitUnBind:function(b){x.push(b)},addInitCache:function(b){y.push(b)},addInitNode:function(b){z.push(b)},
+addInitProxy:function(b,a){a?s.splice(0,0,b):s.push(b)},addInitRoot:function(b){A.push(b)},addNodesData:function(b,a,c){var d=b.data.key.children;a[d]||(a[d]=[]);if(a[d].length>0)a[d][a[d].length-1].isLastNode=!1,i.setNodeLineIcos(b,a[d][a[d].length-1]);a.isParent=!0;a[d]=a[d].concat(c)},addSelectedNode:function(b,a){var c=h.getRoot(b);h.isSelectedNode(b,a)||c.curSelectedList.push(a)},addCreatedNode:function(b,a){(b.callback.onNodeCreated||b.view.addDiyDom)&&h.getRoot(b).createdNodes.push(a)},addZTreeTools:function(b){F.push(b)},
+exSetting:function(b){p.extend(!0,M,b)},fixPIdKeyValue:function(b,a){b.data.simpleData.enable&&(a[b.data.simpleData.pIdKey]=a.parentTId?a.getParentNode()[b.data.simpleData.idKey]:b.data.simpleData.rootPId)},getAfterA:function(b,a,c){for(var d=0,f=C.length;d<f;d++)C[d].apply(this,arguments)},getBeforeA:function(b,a,c){for(var d=0,f=B.length;d<f;d++)B[d].apply(this,arguments)},getInnerAfterA:function(b,a,c){for(var d=0,f=E.length;d<f;d++)E[d].apply(this,arguments)},getInnerBeforeA:function(b,a,c){for(var d=
+0,f=D.length;d<f;d++)D[d].apply(this,arguments)},getCache:function(b){return v[b.treeId]},getNextNode:function(b,a){if(!a)return null;for(var c=b.data.key.children,d=a.parentTId?a.getParentNode():h.getRoot(b),f=0,g=d[c].length-1;f<=g;f++)if(d[c][f]===a)return f==g?null:d[c][f+1];return null},getNodeByParam:function(b,a,c,d){if(!a||!c)return null;for(var f=b.data.key.children,g=0,l=a.length;g<l;g++){if(a[g][c]==d)return a[g];var e=h.getNodeByParam(b,a[g][f],c,d);if(e)return e}return null},getNodeCache:function(b,
+a){if(!a)return null;var c=v[b.treeId].nodes[h.getNodeCacheId(a)];return c?c:null},getNodeName:function(b,a){return""+a[b.data.key.name]},getNodeTitle:function(b,a){return""+a[b.data.key.title===""?b.data.key.name:b.data.key.title]},getNodes:function(b){return h.getRoot(b)[b.data.key.children]},getNodesByParam:function(b,a,c,d){if(!a||!c)return[];for(var f=b.data.key.children,g=[],l=0,e=a.length;l<e;l++)a[l][c]==d&&g.push(a[l]),g=g.concat(h.getNodesByParam(b,a[l][f],c,d));return g},getNodesByParamFuzzy:function(b,
+a,c,d){if(!a||!c)return[];for(var f=b.data.key.children,g=[],d=d.toLowerCase(),l=0,e=a.length;l<e;l++)typeof a[l][c]=="string"&&a[l][c].toLowerCase().indexOf(d)>-1&&g.push(a[l]),g=g.concat(h.getNodesByParamFuzzy(b,a[l][f],c,d));return g},getNodesByFilter:function(b,a,c,d,f){if(!a)return d?null:[];for(var g=b.data.key.children,e=d?null:[],i=0,n=a.length;i<n;i++){if(j.apply(c,[a[i],f],!1)){if(d)return a[i];e.push(a[i])}var k=h.getNodesByFilter(b,a[i][g],c,d,f);if(d&&k)return k;e=d?k:e.concat(k)}return e},
+getPreNode:function(b,a){if(!a)return null;for(var c=b.data.key.children,d=a.parentTId?a.getParentNode():h.getRoot(b),f=0,g=d[c].length;f<g;f++)if(d[c][f]===a)return f==0?null:d[c][f-1];return null},getRoot:function(b){return b?u[b.treeId]:null},getRoots:function(){return u},getSetting:function(b){return r[b]},getSettings:function(){return r},getZTreeTools:function(b){return(b=this.getRoot(this.getSetting(b)))?b.treeTools:null},initCache:function(b){for(var a=0,c=y.length;a<c;a++)y[a].apply(this,
+arguments)},initNode:function(b,a,c,d,f,g){for(var e=0,h=z.length;e<h;e++)z[e].apply(this,arguments)},initRoot:function(b){for(var a=0,c=A.length;a<c;a++)A[a].apply(this,arguments)},isSelectedNode:function(b,a){for(var c=h.getRoot(b),d=0,f=c.curSelectedList.length;d<f;d++)if(a===c.curSelectedList[d])return!0;return!1},removeNodeCache:function(b,a){var c=b.data.key.children;if(a[c])for(var d=0,f=a[c].length;d<f;d++)arguments.callee(b,a[c][d]);h.getCache(b).nodes[h.getNodeCacheId(a.tId)]=null},removeSelectedNode:function(b,
+a){for(var c=h.getRoot(b),d=0,f=c.curSelectedList.length;d<f;d++)if(a===c.curSelectedList[d]||!h.getNodeCache(b,c.curSelectedList[d].tId))c.curSelectedList.splice(d,1),d--,f--},setCache:function(b,a){v[b.treeId]=a},setRoot:function(b,a){u[b.treeId]=a},setZTreeTools:function(b,a){for(var c=0,d=F.length;c<d;c++)F[c].apply(this,arguments)},transformToArrayFormat:function(b,a){if(!a)return[];var c=b.data.key.children,d=[];if(j.isArray(a))for(var f=0,g=a.length;f<g;f++)d.push(a[f]),a[f][c]&&(d=d.concat(h.transformToArrayFormat(b,
+a[f][c])));else d.push(a),a[c]&&(d=d.concat(h.transformToArrayFormat(b,a[c])));return d},transformTozTreeFormat:function(b,a){var c,d,f=b.data.simpleData.idKey,g=b.data.simpleData.pIdKey,e=b.data.key.children;if(!f||f==""||!a)return[];if(j.isArray(a)){var h=[],i=[];for(c=0,d=a.length;c<d;c++)i[a[c][f]]=a[c];for(c=0,d=a.length;c<d;c++)i[a[c][g]]&&a[c][f]!=a[c][g]?(i[a[c][g]][e]||(i[a[c][g]][e]=[]),i[a[c][g]][e].push(a[c])):h.push(a[c]);return h}else return[a]}},m={bindEvent:function(b){for(var a=0,
+c=w.length;a<c;a++)w[a].apply(this,arguments)},unbindEvent:function(b){for(var a=0,c=x.length;a<c;a++)x[a].apply(this,arguments)},bindTree:function(b){var a={treeId:b.treeId},c=b.treeObj;b.view.txtSelectedEnable||c.bind("selectstart",function(a){a=a.originalEvent.srcElement.nodeName.toLowerCase();return a==="input"||a==="textarea"}).css({"-moz-user-select":"-moz-none"});c.bind("click",a,m.proxy);c.bind("dblclick",a,m.proxy);c.bind("mouseover",a,m.proxy);c.bind("mouseout",a,m.proxy);c.bind("mousedown",
+a,m.proxy);c.bind("mouseup",a,m.proxy);c.bind("contextmenu",a,m.proxy)},unbindTree:function(b){b.treeObj.unbind("click",m.proxy).unbind("dblclick",m.proxy).unbind("mouseover",m.proxy).unbind("mouseout",m.proxy).unbind("mousedown",m.proxy).unbind("mouseup",m.proxy).unbind("contextmenu",m.proxy)},doProxy:function(b){for(var a=[],c=0,d=s.length;c<d;c++){var f=s[c].apply(this,arguments);a.push(f);if(f.stop)break}return a},proxy:function(b){var a=h.getSetting(b.data.treeId);if(!j.uCanDo(a,b))return!0;
+for(var a=m.doProxy(b),c=!0,d=0,f=a.length;d<f;d++){var g=a[d];g.nodeEventCallback&&(c=g.nodeEventCallback.apply(g,[b,g.node])&&c);g.treeEventCallback&&(c=g.treeEventCallback.apply(g,[b,g.node])&&c)}return c}};G=function(b,a){var c=h.getSetting(b.data.treeId);if(a.open){if(j.apply(c.callback.beforeCollapse,[c.treeId,a],!0)==!1)return!0}else if(j.apply(c.callback.beforeExpand,[c.treeId,a],!0)==!1)return!0;h.getRoot(c).expandTriggerFlag=!0;i.switchNode(c,a);return!0};H=function(b,a){var c=h.getSetting(b.data.treeId),
+d=c.view.autoCancelSelected&&b.ctrlKey&&h.isSelectedNode(c,a)?0:c.view.autoCancelSelected&&b.ctrlKey&&c.view.selectedMulti?2:1;if(j.apply(c.callback.beforeClick,[c.treeId,a,d],!0)==!1)return!0;d===0?i.cancelPreSelectedNode(c,a):i.selectNode(c,a,d===2);c.treeObj.trigger(e.event.CLICK,[b,c.treeId,a,d]);return!0};I=function(b,a){var c=h.getSetting(b.data.treeId);j.apply(c.callback.beforeMouseDown,[c.treeId,a],!0)&&j.apply(c.callback.onMouseDown,[b,c.treeId,a]);return!0};J=function(b,a){var c=h.getSetting(b.data.treeId);
+j.apply(c.callback.beforeMouseUp,[c.treeId,a],!0)&&j.apply(c.callback.onMouseUp,[b,c.treeId,a]);return!0};K=function(b,a){var c=h.getSetting(b.data.treeId);j.apply(c.callback.beforeDblClick,[c.treeId,a],!0)&&j.apply(c.callback.onDblClick,[b,c.treeId,a]);return!0};L=function(b,a){var c=h.getSetting(b.data.treeId);j.apply(c.callback.beforeRightClick,[c.treeId,a],!0)&&j.apply(c.callback.onRightClick,[b,c.treeId,a]);return typeof c.callback.onRightClick!="function"};var j={apply:function(b,a,c){return typeof b==
+"function"?b.apply(N,a?a:[]):c},canAsync:function(b,a){var c=b.data.key.children;return b.async.enable&&a&&a.isParent&&!(a.zAsync||a[c]&&a[c].length>0)},clone:function(b){if(b===null)return null;var a=j.isArray(b)?[]:{},c;for(c in b)a[c]=b[c]instanceof Date?new Date(b[c].getTime()):typeof b[c]==="object"?arguments.callee(b[c]):b[c];return a},eqs:function(b,a){return b.toLowerCase()===a.toLowerCase()},isArray:function(b){return Object.prototype.toString.apply(b)==="[object Array]"},$:function(b,a,
+c){a&&typeof a!="string"&&(c=a,a="");return typeof b=="string"?p(b,c?c.treeObj.get(0).ownerDocument:null):p("#"+b.tId+a,c?c.treeObj:null)},getMDom:function(b,a,c){if(!a)return null;for(;a&&a.id!==b.treeId;){for(var d=0,f=c.length;a.tagName&&d<f;d++)if(j.eqs(a.tagName,c[d].tagName)&&a.getAttribute(c[d].attrName)!==null)return a;a=a.parentNode}return null},getNodeMainDom:function(b){return p(b).parent("li").get(0)||p(b).parentsUntil("li").parent().get(0)},isChildOrSelf:function(b,a){return p(b).closest("#"+
+a).length>0},uCanDo:function(){return!0}},i={addNodes:function(b,a,c,d){if(!b.data.keep.leaf||!a||a.isParent)if(j.isArray(c)||(c=[c]),b.data.simpleData.enable&&(c=h.transformTozTreeFormat(b,c)),a){var f=k(a,e.id.SWITCH,b),g=k(a,e.id.ICON,b),l=k(a,e.id.UL,b);if(!a.open)i.replaceSwitchClass(a,f,e.folder.CLOSE),i.replaceIcoClass(a,g,e.folder.CLOSE),a.open=!1,l.css({display:"none"});h.addNodesData(b,a,c);i.createNodes(b,a.level+1,c,a);d||i.expandCollapseParentNode(b,a,!0)}else h.addNodesData(b,h.getRoot(b),
+c),i.createNodes(b,0,c,null)},appendNodes:function(b,a,c,d,f,g){if(!c)return[];for(var e=[],j=b.data.key.children,k=0,m=c.length;k<m;k++){var o=c[k];if(f){var t=(d?d:h.getRoot(b))[j].length==c.length&&k==0;h.initNode(b,a,o,d,t,k==c.length-1,g);h.addNodeCache(b,o)}t=[];o[j]&&o[j].length>0&&(t=i.appendNodes(b,a+1,o[j],o,f,g&&o.open));g&&(i.makeDOMNodeMainBefore(e,b,o),i.makeDOMNodeLine(e,b,o),h.getBeforeA(b,o,e),i.makeDOMNodeNameBefore(e,b,o),h.getInnerBeforeA(b,o,e),i.makeDOMNodeIcon(e,b,o),h.getInnerAfterA(b,
+o,e),i.makeDOMNodeNameAfter(e,b,o),h.getAfterA(b,o,e),o.isParent&&o.open&&i.makeUlHtml(b,o,e,t.join("")),i.makeDOMNodeMainAfter(e,b,o),h.addCreatedNode(b,o))}return e},appendParentULDom:function(b,a){var c=[],d=k(a,b);!d.get(0)&&a.parentTId&&(i.appendParentULDom(b,a.getParentNode()),d=k(a,b));var f=k(a,e.id.UL,b);f.get(0)&&f.remove();f=i.appendNodes(b,a.level+1,a[b.data.key.children],a,!1,!0);i.makeUlHtml(b,a,c,f.join(""));d.append(c.join(""))},asyncNode:function(b,a,c,d){var f,g;if(a&&!a.isParent)return j.apply(d),
+!1;else if(a&&a.isAjaxing)return!1;else if(j.apply(b.callback.beforeAsync,[b.treeId,a],!0)==!1)return j.apply(d),!1;if(a)a.isAjaxing=!0,k(a,e.id.ICON,b).attr({style:"","class":e.className.BUTTON+" "+e.className.ICO_LOADING});var l={};for(f=0,g=b.async.autoParam.length;a&&f<g;f++){var q=b.async.autoParam[f].split("="),n=q;q.length>1&&(n=q[1],q=q[0]);l[n]=a[q]}if(j.isArray(b.async.otherParam))for(f=0,g=b.async.otherParam.length;f<g;f+=2)l[b.async.otherParam[f]]=b.async.otherParam[f+1];else for(var m in b.async.otherParam)l[m]=
+b.async.otherParam[m];var o=h.getRoot(b)._ver;p.ajax({contentType:b.async.contentType,type:b.async.type,url:j.apply(b.async.url,[b.treeId,a],b.async.url),data:l,dataType:b.async.dataType,success:function(f){if(o==h.getRoot(b)._ver){var g=[];try{g=!f||f.length==0?[]:typeof f=="string"?eval("("+f+")"):f}catch(l){g=f}if(a)a.isAjaxing=null,a.zAsync=!0;i.setNodeLineIcos(b,a);g&&g!==""?(g=j.apply(b.async.dataFilter,[b.treeId,a,g],g),i.addNodes(b,a,g?j.clone(g):[],!!c)):i.addNodes(b,a,[],!!c);b.treeObj.trigger(e.event.ASYNC_SUCCESS,
+[b.treeId,a,f]);j.apply(d)}},error:function(c,d,f){if(o==h.getRoot(b)._ver){if(a)a.isAjaxing=null;i.setNodeLineIcos(b,a);b.treeObj.trigger(e.event.ASYNC_ERROR,[b.treeId,a,c,d,f])}}});return!0},cancelPreSelectedNode:function(b,a){for(var c=h.getRoot(b).curSelectedList,d=c.length-1;d>=0;d--)if(!a||a===c[d])if(k(c[d],e.id.A,b).removeClass(e.node.CURSELECTED),a){h.removeSelectedNode(b,a);break}if(!a)h.getRoot(b).curSelectedList=[]},createNodeCallback:function(b){if(b.callback.onNodeCreated||b.view.addDiyDom)for(var a=
+h.getRoot(b);a.createdNodes.length>0;){var c=a.createdNodes.shift();j.apply(b.view.addDiyDom,[b.treeId,c]);b.callback.onNodeCreated&&b.treeObj.trigger(e.event.NODECREATED,[b.treeId,c])}},createNodes:function(b,a,c,d){if(c&&c.length!=0){var f=h.getRoot(b),g=b.data.key.children,g=!d||d.open||!!k(d[g][0],b).get(0);f.createdNodes=[];a=i.appendNodes(b,a,c,d,!0,g);d?(d=k(d,e.id.UL,b),d.get(0)&&d.append(a.join(""))):b.treeObj.append(a.join(""));i.createNodeCallback(b)}},destroy:function(b){b&&(h.initCache(b),
+h.initRoot(b),m.unbindTree(b),m.unbindEvent(b),b.treeObj.empty())},expandCollapseNode:function(b,a,c,d,f){var g=h.getRoot(b),l=b.data.key.children;if(a){if(g.expandTriggerFlag){var q=f,f=function(){q&&q();a.open?b.treeObj.trigger(e.event.EXPAND,[b.treeId,a]):b.treeObj.trigger(e.event.COLLAPSE,[b.treeId,a])};g.expandTriggerFlag=!1}if(!a.open&&a.isParent&&(!k(a,e.id.UL,b).get(0)||a[l]&&a[l].length>0&&!k(a[l][0],b).get(0)))i.appendParentULDom(b,a),i.createNodeCallback(b);if(a.open==c)j.apply(f,[]);else{var c=
+k(a,e.id.UL,b),g=k(a,e.id.SWITCH,b),n=k(a,e.id.ICON,b);a.isParent?(a.open=!a.open,a.iconOpen&&a.iconClose&&n.attr("style",i.makeNodeIcoStyle(b,a)),a.open?(i.replaceSwitchClass(a,g,e.folder.OPEN),i.replaceIcoClass(a,n,e.folder.OPEN),d==!1||b.view.expandSpeed==""?(c.show(),j.apply(f,[])):a[l]&&a[l].length>0?c.slideDown(b.view.expandSpeed,f):(c.show(),j.apply(f,[]))):(i.replaceSwitchClass(a,g,e.folder.CLOSE),i.replaceIcoClass(a,n,e.folder.CLOSE),d==!1||b.view.expandSpeed==""||!(a[l]&&a[l].length>0)?
+(c.hide(),j.apply(f,[])):c.slideUp(b.view.expandSpeed,f))):j.apply(f,[])}}else j.apply(f,[])},expandCollapseParentNode:function(b,a,c,d,f){a&&(a.parentTId?(i.expandCollapseNode(b,a,c,d),a.parentTId&&i.expandCollapseParentNode(b,a.getParentNode(),c,d,f)):i.expandCollapseNode(b,a,c,d,f))},expandCollapseSonNode:function(b,a,c,d,f){var g=h.getRoot(b),e=b.data.key.children,g=a?a[e]:g[e],e=a?!1:d,j=h.getRoot(b).expandTriggerFlag;h.getRoot(b).expandTriggerFlag=!1;if(g)for(var k=0,m=g.length;k<m;k++)g[k]&&
+i.expandCollapseSonNode(b,g[k],c,e);h.getRoot(b).expandTriggerFlag=j;i.expandCollapseNode(b,a,c,d,f)},makeDOMNodeIcon:function(b,a,c){var d=h.getNodeName(a,c),d=a.view.nameIsHTML?d:d.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;");b.push("<span id='",c.tId,e.id.ICON,"' title='' treeNode",e.id.ICON," class='",i.makeNodeIcoClass(a,c),"' style='",i.makeNodeIcoStyle(a,c),"'></span><span id='",c.tId,e.id.SPAN,"'>",d,"</span>")},makeDOMNodeLine:function(b,a,c){b.push("<span id='",c.tId,
+e.id.SWITCH,"' title='' class='",i.makeNodeLineClass(a,c),"' treeNode",e.id.SWITCH,"></span>")},makeDOMNodeMainAfter:function(b){b.push("</li>")},makeDOMNodeMainBefore:function(b,a,c){b.push("<li id='",c.tId,"' class='",e.className.LEVEL,c.level,"' tabindex='0' hidefocus='true' treenode>")},makeDOMNodeNameAfter:function(b){b.push("</a>")},makeDOMNodeNameBefore:function(b,a,c){var d=h.getNodeTitle(a,c),f=i.makeNodeUrl(a,c),g=i.makeNodeFontCss(a,c),l=[],k;for(k in g)l.push(k,":",g[k],";");b.push("<a id='",
+c.tId,e.id.A,"' class='",e.className.LEVEL,c.level,"' treeNode",e.id.A,' onclick="',c.click||"",'" ',f!=null&&f.length>0?"href='"+f+"'":""," target='",i.makeNodeTarget(c),"' style='",l.join(""),"'");j.apply(a.view.showTitle,[a.treeId,c],a.view.showTitle)&&d&&b.push("title='",d.replace(/'/g,"&#39;").replace(/</g,"&lt;").replace(/>/g,"&gt;"),"'");b.push(">")},makeNodeFontCss:function(b,a){var c=j.apply(b.view.fontCss,[b.treeId,a],b.view.fontCss);return c&&typeof c!="function"?c:{}},makeNodeIcoClass:function(b,
+a){var c=["ico"];a.isAjaxing||(c[0]=(a.iconSkin?a.iconSkin+"_":"")+c[0],a.isParent?c.push(a.open?e.folder.OPEN:e.folder.CLOSE):c.push(e.folder.DOCU));return e.className.BUTTON+" "+c.join("_")},makeNodeIcoStyle:function(b,a){var c=[];if(!a.isAjaxing){var d=a.isParent&&a.iconOpen&&a.iconClose?a.open?a.iconOpen:a.iconClose:a.icon;d&&c.push("background:url(",d,") 0 0 no-repeat;");(b.view.showIcon==!1||!j.apply(b.view.showIcon,[b.treeId,a],!0))&&c.push("width:0px;height:0px;")}return c.join("")},makeNodeLineClass:function(b,
+a){var c=[];b.view.showLine?a.level==0&&a.isFirstNode&&a.isLastNode?c.push(e.line.ROOT):a.level==0&&a.isFirstNode?c.push(e.line.ROOTS):a.isLastNode?c.push(e.line.BOTTOM):c.push(e.line.CENTER):c.push(e.line.NOLINE);a.isParent?c.push(a.open?e.folder.OPEN:e.folder.CLOSE):c.push(e.folder.DOCU);return i.makeNodeLineClassEx(a)+c.join("_")},makeNodeLineClassEx:function(b){return e.className.BUTTON+" "+e.className.LEVEL+b.level+" "+e.className.SWITCH+" "},makeNodeTarget:function(b){return b.target||"_blank"},
+makeNodeUrl:function(b,a){var c=b.data.key.url;return a[c]?a[c]:null},makeUlHtml:function(b,a,c,d){c.push("<ul id='",a.tId,e.id.UL,"' class='",e.className.LEVEL,a.level," ",i.makeUlLineClass(b,a),"' style='display:",a.open?"block":"none","'>");c.push(d);c.push("</ul>")},makeUlLineClass:function(b,a){return b.view.showLine&&!a.isLastNode?e.line.LINE:""},removeChildNodes:function(b,a){if(a){var c=b.data.key.children,d=a[c];if(d){for(var f=0,g=d.length;f<g;f++)h.removeNodeCache(b,d[f]);h.removeSelectedNode(b);
+delete a[c];b.data.keep.parent?k(a,e.id.UL,b).empty():(a.isParent=!1,a.open=!1,c=k(a,e.id.SWITCH,b),d=k(a,e.id.ICON,b),i.replaceSwitchClass(a,c,e.folder.DOCU),i.replaceIcoClass(a,d,e.folder.DOCU),k(a,e.id.UL,b).remove())}}},setFirstNode:function(b,a){var c=b.data.key.children;if(a[c].length>0)a[c][0].isFirstNode=!0},setLastNode:function(b,a){var c=b.data.key.children,d=a[c].length;if(d>0)a[c][d-1].isLastNode=!0},removeNode:function(b,a){var c=h.getRoot(b),d=b.data.key.children,f=a.parentTId?a.getParentNode():
+c;a.isFirstNode=!1;a.isLastNode=!1;a.getPreNode=function(){return null};a.getNextNode=function(){return null};if(h.getNodeCache(b,a.tId)){k(a,b).remove();h.removeNodeCache(b,a);h.removeSelectedNode(b,a);for(var g=0,l=f[d].length;g<l;g++)if(f[d][g].tId==a.tId){f[d].splice(g,1);break}i.setFirstNode(b,f);i.setLastNode(b,f);var j,g=f[d].length;if(!b.data.keep.parent&&g==0)f.isParent=!1,f.open=!1,g=k(f,e.id.UL,b),l=k(f,e.id.SWITCH,b),j=k(f,e.id.ICON,b),i.replaceSwitchClass(f,l,e.folder.DOCU),i.replaceIcoClass(f,
+j,e.folder.DOCU),g.css("display","none");else if(b.view.showLine&&g>0){var n=f[d][g-1],g=k(n,e.id.UL,b),l=k(n,e.id.SWITCH,b);j=k(n,e.id.ICON,b);f==c?f[d].length==1?i.replaceSwitchClass(n,l,e.line.ROOT):(c=k(f[d][0],e.id.SWITCH,b),i.replaceSwitchClass(f[d][0],c,e.line.ROOTS),i.replaceSwitchClass(n,l,e.line.BOTTOM)):i.replaceSwitchClass(n,l,e.line.BOTTOM);g.removeClass(e.line.LINE)}}},replaceIcoClass:function(b,a,c){if(a&&!b.isAjaxing&&(b=a.attr("class"),b!=void 0)){b=b.split("_");switch(c){case e.folder.OPEN:case e.folder.CLOSE:case e.folder.DOCU:b[b.length-
+1]=c}a.attr("class",b.join("_"))}},replaceSwitchClass:function(b,a,c){if(a){var d=a.attr("class");if(d!=void 0){d=d.split("_");switch(c){case e.line.ROOT:case e.line.ROOTS:case e.line.CENTER:case e.line.BOTTOM:case e.line.NOLINE:d[0]=i.makeNodeLineClassEx(b)+c;break;case e.folder.OPEN:case e.folder.CLOSE:case e.folder.DOCU:d[1]=c}a.attr("class",d.join("_"));c!==e.folder.DOCU?a.removeAttr("disabled"):a.attr("disabled","disabled")}}},selectNode:function(b,a,c){c||i.cancelPreSelectedNode(b);k(a,e.id.A,
+b).addClass(e.node.CURSELECTED);h.addSelectedNode(b,a)},setNodeFontCss:function(b,a){var c=k(a,e.id.A,b),d=i.makeNodeFontCss(b,a);d&&c.css(d)},setNodeLineIcos:function(b,a){if(a){var c=k(a,e.id.SWITCH,b),d=k(a,e.id.UL,b),f=k(a,e.id.ICON,b),g=i.makeUlLineClass(b,a);g.length==0?d.removeClass(e.line.LINE):d.addClass(g);c.attr("class",i.makeNodeLineClass(b,a));a.isParent?c.removeAttr("disabled"):c.attr("disabled","disabled");f.removeAttr("style");f.attr("style",i.makeNodeIcoStyle(b,a));f.attr("class",
+i.makeNodeIcoClass(b,a))}},setNodeName:function(b,a){var c=h.getNodeTitle(b,a),d=k(a,e.id.SPAN,b);d.empty();b.view.nameIsHTML?d.html(h.getNodeName(b,a)):d.text(h.getNodeName(b,a));j.apply(b.view.showTitle,[b.treeId,a],b.view.showTitle)&&k(a,e.id.A,b).attr("title",!c?"":c)},setNodeTarget:function(b,a){k(a,e.id.A,b).attr("target",i.makeNodeTarget(a))},setNodeUrl:function(b,a){var c=k(a,e.id.A,b),d=i.makeNodeUrl(b,a);d==null||d.length==0?c.removeAttr("href"):c.attr("href",d)},switchNode:function(b,a){a.open||
+!j.canAsync(b,a)?i.expandCollapseNode(b,a,!a.open):b.async.enable?i.asyncNode(b,a)||i.expandCollapseNode(b,a,!a.open):a&&i.expandCollapseNode(b,a,!a.open)}};p.fn.zTree={consts:{className:{BUTTON:"button",LEVEL:"level",ICO_LOADING:"ico_loading",SWITCH:"switch"},event:{NODECREATED:"ztree_nodeCreated",CLICK:"ztree_click",EXPAND:"ztree_expand",COLLAPSE:"ztree_collapse",ASYNC_SUCCESS:"ztree_async_success",ASYNC_ERROR:"ztree_async_error"},id:{A:"_a",ICON:"_ico",SPAN:"_span",SWITCH:"_switch",UL:"_ul"},line:{ROOT:"root",
+ROOTS:"roots",CENTER:"center",BOTTOM:"bottom",NOLINE:"noline",LINE:"line"},folder:{OPEN:"open",CLOSE:"close",DOCU:"docu"},node:{CURSELECTED:"curSelectedNode"}},_z:{tools:j,view:i,event:m,data:h},getZTreeObj:function(b){return(b=h.getZTreeTools(b))?b:null},destroy:function(b){if(b&&b.length>0)i.destroy(h.getSetting(b));else for(var a in r)i.destroy(r[a])},init:function(b,a,c){var d=j.clone(M);p.extend(!0,d,a);d.treeId=b.attr("id");d.treeObj=b;d.treeObj.empty();r[d.treeId]=d;if(typeof document.body.style.maxHeight===
+"undefined")d.view.expandSpeed="";h.initRoot(d);b=h.getRoot(d);a=d.data.key.children;c=c?j.clone(j.isArray(c)?c:[c]):[];b[a]=d.data.simpleData.enable?h.transformTozTreeFormat(d,c):c;h.initCache(d);m.unbindTree(d);m.bindTree(d);m.unbindEvent(d);m.bindEvent(d);c={setting:d,addNodes:function(a,b,c){function e(){i.addNodes(d,a,h,c==!0)}if(!b)return null;a||(a=null);if(a&&!a.isParent&&d.data.keep.leaf)return null;var h=j.clone(j.isArray(b)?b:[b]);j.canAsync(d,a)?i.asyncNode(d,a,c,e):e();return h},cancelSelectedNode:function(a){i.cancelPreSelectedNode(d,
+a)},destroy:function(){i.destroy(d)},expandAll:function(a){a=!!a;i.expandCollapseSonNode(d,null,a,!0);return a},expandNode:function(a,b,c,e,n){if(!a||!a.isParent)return null;b!==!0&&b!==!1&&(b=!a.open);if((n=!!n)&&b&&j.apply(d.callback.beforeExpand,[d.treeId,a],!0)==!1)return null;else if(n&&!b&&j.apply(d.callback.beforeCollapse,[d.treeId,a],!0)==!1)return null;b&&a.parentTId&&i.expandCollapseParentNode(d,a.getParentNode(),b,!1);if(b===a.open&&!c)return null;h.getRoot(d).expandTriggerFlag=n;if(!j.canAsync(d,
+a)&&c)i.expandCollapseSonNode(d,a,b,!0,function(){if(e!==!1)try{k(a,d).focus().blur()}catch(b){}});else if(a.open=!b,i.switchNode(this.setting,a),e!==!1)try{k(a,d).focus().blur()}catch(m){}return b},getNodes:function(){return h.getNodes(d)},getNodeByParam:function(a,b,c){return!a?null:h.getNodeByParam(d,c?c[d.data.key.children]:h.getNodes(d),a,b)},getNodeByTId:function(a){return h.getNodeCache(d,a)},getNodesByParam:function(a,b,c){return!a?null:h.getNodesByParam(d,c?c[d.data.key.children]:h.getNodes(d),
+a,b)},getNodesByParamFuzzy:function(a,b,c){return!a?null:h.getNodesByParamFuzzy(d,c?c[d.data.key.children]:h.getNodes(d),a,b)},getNodesByFilter:function(a,b,c,e){b=!!b;return!a||typeof a!="function"?b?null:[]:h.getNodesByFilter(d,c?c[d.data.key.children]:h.getNodes(d),a,b,e)},getNodeIndex:function(a){if(!a)return null;for(var b=d.data.key.children,c=a.parentTId?a.getParentNode():h.getRoot(d),e=0,i=c[b].length;e<i;e++)if(c[b][e]==a)return e;return-1},getSelectedNodes:function(){for(var a=[],b=h.getRoot(d).curSelectedList,
+c=0,e=b.length;c<e;c++)a.push(b[c]);return a},isSelectedNode:function(a){return h.isSelectedNode(d,a)},reAsyncChildNodes:function(a,b,c){if(this.setting.async.enable){var j=!a;j&&(a=h.getRoot(d));if(b=="refresh"){for(var b=this.setting.data.key.children,m=0,p=a[b]?a[b].length:0;m<p;m++)h.removeNodeCache(d,a[b][m]);h.removeSelectedNode(d);a[b]=[];j?this.setting.treeObj.empty():k(a,e.id.UL,d).empty()}i.asyncNode(this.setting,j?null:a,!!c)}},refresh:function(){this.setting.treeObj.empty();var a=h.getRoot(d),
+b=a[d.data.key.children];h.initRoot(d);a[d.data.key.children]=b;h.initCache(d);i.createNodes(d,0,a[d.data.key.children])},removeChildNodes:function(a){if(!a)return null;var b=a[d.data.key.children];i.removeChildNodes(d,a);return b?b:null},removeNode:function(a,b){a&&(b=!!b,b&&j.apply(d.callback.beforeRemove,[d.treeId,a],!0)==!1||(i.removeNode(d,a),b&&this.setting.treeObj.trigger(e.event.REMOVE,[d.treeId,a])))},selectNode:function(a,b){if(a&&j.uCanDo(d)){b=d.view.selectedMulti&&b;if(a.parentTId)i.expandCollapseParentNode(d,
+a.getParentNode(),!0,!1,function(){try{k(a,d).focus().blur()}catch(b){}});else try{k(a,d).focus().blur()}catch(c){}i.selectNode(d,a,b)}},transformTozTreeNodes:function(a){return h.transformTozTreeFormat(d,a)},transformToArray:function(a){return h.transformToArrayFormat(d,a)},updateNode:function(a){a&&k(a,d).get(0)&&j.uCanDo(d)&&(i.setNodeName(d,a),i.setNodeTarget(d,a),i.setNodeUrl(d,a),i.setNodeLineIcos(d,a),i.setNodeFontCss(d,a))}};b.treeTools=c;h.setZTreeTools(d,c);b[a]&&b[a].length>0?i.createNodes(d,
+0,b[a]):d.async.enable&&d.async.url&&d.async.url!==""&&i.asyncNode(d);return c}};var N=p.fn.zTree,k=j.$,e=N.consts})(jQuery);
+
+/*
+ * JQuery zTree excheck v3.5.15
+ * http://zTree.me/
+ *
+ * Copyright (c) 2010 Hunter.z
+ *
+ * Licensed same as jquery - MIT License
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ * email: hunter.z@263.net
+ * Date: 2013-10-15
+ */
+(function(m){var p,q,r,o={event:{CHECK:"ztree_check"},id:{CHECK:"_check"},checkbox:{STYLE:"checkbox",DEFAULT:"chk",DISABLED:"disable",FALSE:"false",TRUE:"true",FULL:"full",PART:"part",FOCUS:"focus"},radio:{STYLE:"radio",TYPE_ALL:"all",TYPE_LEVEL:"level"}},v={check:{enable:!1,autoCheckTrigger:!1,chkStyle:o.checkbox.STYLE,nocheckInherit:!1,chkDisabledInherit:!1,radioType:o.radio.TYPE_LEVEL,chkboxType:{Y:"ps",N:"ps"}},data:{key:{checked:"checked"}},callback:{beforeCheck:null,onCheck:null}};p=function(b,
+a){if(a.chkDisabled===!0)return!1;var c=f.getSetting(b.data.treeId),d=c.data.key.checked;if(k.apply(c.callback.beforeCheck,[c.treeId,a],!0)==!1)return!0;a[d]=!a[d];e.checkNodeRelation(c,a);d=n(a,j.id.CHECK,c);e.setChkClass(c,d,a);e.repairParentChkClassWithSelf(c,a);c.treeObj.trigger(j.event.CHECK,[b,c.treeId,a]);return!0};q=function(b,a){if(a.chkDisabled===!0)return!1;var c=f.getSetting(b.data.treeId),d=n(a,j.id.CHECK,c);a.check_Focus=!0;e.setChkClass(c,d,a);return!0};r=function(b,a){if(a.chkDisabled===
+!0)return!1;var c=f.getSetting(b.data.treeId),d=n(a,j.id.CHECK,c);a.check_Focus=!1;e.setChkClass(c,d,a);return!0};m.extend(!0,m.fn.zTree.consts,o);m.extend(!0,m.fn.zTree._z,{tools:{},view:{checkNodeRelation:function(b,a){var c,d,h,i=b.data.key.children,l=b.data.key.checked;c=j.radio;if(b.check.chkStyle==c.STYLE){var g=f.getRadioCheckedList(b);if(a[l])if(b.check.radioType==c.TYPE_ALL){for(d=g.length-1;d>=0;d--)c=g[d],c[l]=!1,g.splice(d,1),e.setChkClass(b,n(c,j.id.CHECK,b),c),c.parentTId!=a.parentTId&&
+e.repairParentChkClassWithSelf(b,c);g.push(a)}else{g=a.parentTId?a.getParentNode():f.getRoot(b);for(d=0,h=g[i].length;d<h;d++)c=g[i][d],c[l]&&c!=a&&(c[l]=!1,e.setChkClass(b,n(c,j.id.CHECK,b),c))}else if(b.check.radioType==c.TYPE_ALL)for(d=0,h=g.length;d<h;d++)if(a==g[d]){g.splice(d,1);break}}else a[l]&&(!a[i]||a[i].length==0||b.check.chkboxType.Y.indexOf("s")>-1)&&e.setSonNodeCheckBox(b,a,!0),!a[l]&&(!a[i]||a[i].length==0||b.check.chkboxType.N.indexOf("s")>-1)&&e.setSonNodeCheckBox(b,a,!1),a[l]&&
+b.check.chkboxType.Y.indexOf("p")>-1&&e.setParentNodeCheckBox(b,a,!0),!a[l]&&b.check.chkboxType.N.indexOf("p")>-1&&e.setParentNodeCheckBox(b,a,!1)},makeChkClass:function(b,a){var c=b.data.key.checked,d=j.checkbox,h=j.radio,i="",i=a.chkDisabled===!0?d.DISABLED:a.halfCheck?d.PART:b.check.chkStyle==h.STYLE?a.check_Child_State<1?d.FULL:d.PART:a[c]?a.check_Child_State===2||a.check_Child_State===-1?d.FULL:d.PART:a.check_Child_State<1?d.FULL:d.PART,c=b.check.chkStyle+"_"+(a[c]?d.TRUE:d.FALSE)+"_"+i,c=a.check_Focus&&
+a.chkDisabled!==!0?c+"_"+d.FOCUS:c;return j.className.BUTTON+" "+d.DEFAULT+" "+c},repairAllChk:function(b,a){if(b.check.enable&&b.check.chkStyle===j.checkbox.STYLE)for(var c=b.data.key.checked,d=b.data.key.children,h=f.getRoot(b),i=0,l=h[d].length;i<l;i++){var g=h[d][i];g.nocheck!==!0&&g.chkDisabled!==!0&&(g[c]=a);e.setSonNodeCheckBox(b,g,a)}},repairChkClass:function(b,a){if(a&&(f.makeChkFlag(b,a),a.nocheck!==!0)){var c=n(a,j.id.CHECK,b);e.setChkClass(b,c,a)}},repairParentChkClass:function(b,a){if(a&&
+a.parentTId){var c=a.getParentNode();e.repairChkClass(b,c);e.repairParentChkClass(b,c)}},repairParentChkClassWithSelf:function(b,a){if(a){var c=b.data.key.children;a[c]&&a[c].length>0?e.repairParentChkClass(b,a[c][0]):e.repairParentChkClass(b,a)}},repairSonChkDisabled:function(b,a,c,d){if(a){var h=b.data.key.children;if(a.chkDisabled!=c)a.chkDisabled=c;e.repairChkClass(b,a);if(a[h]&&d)for(var i=0,l=a[h].length;i<l;i++)e.repairSonChkDisabled(b,a[h][i],c,d)}},repairParentChkDisabled:function(b,a,c,
+d){if(a){if(a.chkDisabled!=c&&d)a.chkDisabled=c;e.repairChkClass(b,a);e.repairParentChkDisabled(b,a.getParentNode(),c,d)}},setChkClass:function(b,a,c){a&&(c.nocheck===!0?a.hide():a.show(),a.removeClass(),a.addClass(e.makeChkClass(b,c)))},setParentNodeCheckBox:function(b,a,c,d){var h=b.data.key.children,i=b.data.key.checked,l=n(a,j.id.CHECK,b);d||(d=a);f.makeChkFlag(b,a);a.nocheck!==!0&&a.chkDisabled!==!0&&(a[i]=c,e.setChkClass(b,l,a),b.check.autoCheckTrigger&&a!=d&&b.treeObj.trigger(j.event.CHECK,
+[null,b.treeId,a]));if(a.parentTId){l=!0;if(!c)for(var h=a.getParentNode()[h],g=0,k=h.length;g<k;g++)if(h[g].nocheck!==!0&&h[g].chkDisabled!==!0&&h[g][i]||(h[g].nocheck===!0||h[g].chkDisabled===!0)&&h[g].check_Child_State>0){l=!1;break}l&&e.setParentNodeCheckBox(b,a.getParentNode(),c,d)}},setSonNodeCheckBox:function(b,a,c,d){if(a){var h=b.data.key.children,i=b.data.key.checked,l=n(a,j.id.CHECK,b);d||(d=a);var g=!1;if(a[h])for(var k=0,m=a[h].length;k<m&&a.chkDisabled!==!0;k++){var o=a[h][k];e.setSonNodeCheckBox(b,
+o,c,d);o.chkDisabled===!0&&(g=!0)}if(a!=f.getRoot(b)&&a.chkDisabled!==!0){g&&a.nocheck!==!0&&f.makeChkFlag(b,a);if(a.nocheck!==!0&&a.chkDisabled!==!0){if(a[i]=c,!g)a.check_Child_State=a[h]&&a[h].length>0?c?2:0:-1}else a.check_Child_State=-1;e.setChkClass(b,l,a);b.check.autoCheckTrigger&&a!=d&&a.nocheck!==!0&&a.chkDisabled!==!0&&b.treeObj.trigger(j.event.CHECK,[null,b.treeId,a])}}}},event:{},data:{getRadioCheckedList:function(b){for(var a=f.getRoot(b).radioCheckedList,c=0,d=a.length;c<d;c++)f.getNodeCache(b,
+a[c].tId)||(a.splice(c,1),c--,d--);return a},getCheckStatus:function(b,a){if(!b.check.enable||a.nocheck||a.chkDisabled)return null;var c=b.data.key.checked;return{checked:a[c],half:a.halfCheck?a.halfCheck:b.check.chkStyle==j.radio.STYLE?a.check_Child_State===2:a[c]?a.check_Child_State>-1&&a.check_Child_State<2:a.check_Child_State>0}},getTreeCheckedNodes:function(b,a,c,d){if(!a)return[];for(var h=b.data.key.children,i=b.data.key.checked,e=c&&b.check.chkStyle==j.radio.STYLE&&b.check.radioType==j.radio.TYPE_ALL,
+d=!d?[]:d,g=0,k=a.length;g<k;g++){if(a[g].nocheck!==!0&&a[g].chkDisabled!==!0&&a[g][i]==c&&(d.push(a[g]),e))break;f.getTreeCheckedNodes(b,a[g][h],c,d);if(e&&d.length>0)break}return d},getTreeChangeCheckedNodes:function(b,a,c){if(!a)return[];for(var d=b.data.key.children,h=b.data.key.checked,c=!c?[]:c,i=0,e=a.length;i<e;i++)a[i].nocheck!==!0&&a[i].chkDisabled!==!0&&a[i][h]!=a[i].checkedOld&&c.push(a[i]),f.getTreeChangeCheckedNodes(b,a[i][d],c);return c},makeChkFlag:function(b,a){if(a){var c=b.data.key.children,
+d=b.data.key.checked,h=-1;if(a[c])for(var i=0,e=a[c].length;i<e;i++){var g=a[c][i],f=-1;if(b.check.chkStyle==j.radio.STYLE)if(f=g.nocheck===!0||g.chkDisabled===!0?g.check_Child_State:g.halfCheck===!0?2:g[d]?2:g.check_Child_State>0?2:0,f==2){h=2;break}else f==0&&(h=0);else if(b.check.chkStyle==j.checkbox.STYLE)if(f=g.nocheck===!0||g.chkDisabled===!0?g.check_Child_State:g.halfCheck===!0?1:g[d]?g.check_Child_State===-1||g.check_Child_State===2?2:1:g.check_Child_State>0?1:0,f===1){h=1;break}else if(f===
+2&&h>-1&&i>0&&f!==h){h=1;break}else if(h===2&&f>-1&&f<2){h=1;break}else f>-1&&(h=f)}a.check_Child_State=h}}}});var m=m.fn.zTree,k=m._z.tools,j=m.consts,e=m._z.view,f=m._z.data,n=k.$;f.exSetting(v);f.addInitBind(function(b){b.treeObj.bind(j.event.CHECK,function(a,c,d,h){k.apply(b.callback.onCheck,[c?c:a,d,h])})});f.addInitUnBind(function(b){b.treeObj.unbind(j.event.CHECK)});f.addInitCache(function(){});f.addInitNode(function(b,a,c,d){if(c){a=b.data.key.checked;typeof c[a]=="string"&&(c[a]=k.eqs(c[a],
+"true"));c[a]=!!c[a];c.checkedOld=c[a];if(typeof c.nocheck=="string")c.nocheck=k.eqs(c.nocheck,"true");c.nocheck=!!c.nocheck||b.check.nocheckInherit&&d&&!!d.nocheck;if(typeof c.chkDisabled=="string")c.chkDisabled=k.eqs(c.chkDisabled,"true");c.chkDisabled=!!c.chkDisabled||b.check.chkDisabledInherit&&d&&!!d.chkDisabled;if(typeof c.halfCheck=="string")c.halfCheck=k.eqs(c.halfCheck,"true");c.halfCheck=!!c.halfCheck;c.check_Child_State=-1;c.check_Focus=!1;c.getCheckStatus=function(){return f.getCheckStatus(b,
+c)};b.check.chkStyle==j.radio.STYLE&&b.check.radioType==j.radio.TYPE_ALL&&c[a]&&f.getRoot(b).radioCheckedList.push(c)}});f.addInitProxy(function(b){var a=b.target,c=f.getSetting(b.data.treeId),d="",h=null,e="",l=null;if(k.eqs(b.type,"mouseover")){if(c.check.enable&&k.eqs(a.tagName,"span")&&a.getAttribute("treeNode"+j.id.CHECK)!==null)d=k.getNodeMainDom(a).id,e="mouseoverCheck"}else if(k.eqs(b.type,"mouseout")){if(c.check.enable&&k.eqs(a.tagName,"span")&&a.getAttribute("treeNode"+j.id.CHECK)!==null)d=
+k.getNodeMainDom(a).id,e="mouseoutCheck"}else if(k.eqs(b.type,"click")&&c.check.enable&&k.eqs(a.tagName,"span")&&a.getAttribute("treeNode"+j.id.CHECK)!==null)d=k.getNodeMainDom(a).id,e="checkNode";if(d.length>0)switch(h=f.getNodeCache(c,d),e){case "checkNode":l=p;break;case "mouseoverCheck":l=q;break;case "mouseoutCheck":l=r}return{stop:e==="checkNode",node:h,nodeEventType:e,nodeEventCallback:l,treeEventType:"",treeEventCallback:null}},!0);f.addInitRoot(function(b){f.getRoot(b).radioCheckedList=[]});
+f.addBeforeA(function(b,a,c){b.check.enable&&(f.makeChkFlag(b,a),c.push("<span ID='",a.tId,j.id.CHECK,"' class='",e.makeChkClass(b,a),"' treeNode",j.id.CHECK,a.nocheck===!0?" style='display:none;'":"","></span>"))});f.addZTreeTools(function(b,a){a.checkNode=function(a,c,i,f){var g=b.data.key.checked;if(a.chkDisabled!==!0&&(c!==!0&&c!==!1&&(c=!a[g]),f=!!f,(a[g]!==c||i)&&!(f&&k.apply(this.setting.callback.beforeCheck,[b.treeId,a],!0)==!1)&&k.uCanDo(this.setting)&&b.check.enable&&a.nocheck!==!0))a[g]=
+c,c=n(a,j.id.CHECK,b),(i||b.check.chkStyle===j.radio.STYLE)&&e.checkNodeRelation(b,a),e.setChkClass(b,c,a),e.repairParentChkClassWithSelf(b,a),f&&b.treeObj.trigger(j.event.CHECK,[null,b.treeId,a])};a.checkAllNodes=function(a){e.repairAllChk(b,!!a)};a.getCheckedNodes=function(a){var c=b.data.key.children;return f.getTreeCheckedNodes(b,f.getRoot(b)[c],a!==!1)};a.getChangeCheckedNodes=function(){var a=b.data.key.children;return f.getTreeChangeCheckedNodes(b,f.getRoot(b)[a])};a.setChkDisabled=function(a,
+c,f,j){c=!!c;f=!!f;e.repairSonChkDisabled(b,a,c,!!j);e.repairParentChkDisabled(b,a.getParentNode(),c,f)};var c=a.updateNode;a.updateNode=function(d,f){c&&c.apply(a,arguments);if(d&&b.check.enable&&n(d,b).get(0)&&k.uCanDo(b)){var i=n(d,j.id.CHECK,b);(f==!0||b.check.chkStyle===j.radio.STYLE)&&e.checkNodeRelation(b,d);e.setChkClass(b,i,d);e.repairParentChkClassWithSelf(b,d)}}});var s=e.createNodes;e.createNodes=function(b,a,c,d){s&&s.apply(e,arguments);c&&e.repairParentChkClassWithSelf(b,d)};var t=e.removeNode;
+e.removeNode=function(b,a){var c=a.getParentNode();t&&t.apply(e,arguments);a&&c&&(e.repairChkClass(b,c),e.repairParentChkClass(b,c))};var u=e.appendNodes;e.appendNodes=function(b,a,c,d,h,i){var j="";u&&(j=u.apply(e,arguments));d&&f.makeChkFlag(b,d);return j}})(jQuery);
+
+/*
+ * JQuery zTree exedit v3.5.15
+ * http://zTree.me/
+ *
+ * Copyright (c) 2010 Hunter.z
+ *
+ * Licensed same as jquery - MIT License
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ * email: hunter.z@263.net
+ * Date: 2013-10-15
+ */
+(function(w){var I={event:{DRAG:"ztree_drag",DROP:"ztree_drop",REMOVE:"ztree_remove",RENAME:"ztree_rename"},id:{EDIT:"_edit",INPUT:"_input",REMOVE:"_remove"},move:{TYPE_INNER:"inner",TYPE_PREV:"prev",TYPE_NEXT:"next"},node:{CURSELECTED_EDIT:"curSelectedNode_Edit",TMPTARGET_TREE:"tmpTargetzTree",TMPTARGET_NODE:"tmpTargetNode"}},x={onHoverOverNode:function(b,a){var c=n.getSetting(b.data.treeId),d=n.getRoot(c);if(d.curHoverNode!=a)x.onHoverOutNode(b);d.curHoverNode=a;e.addHoverDom(c,a)},onHoverOutNode:function(b){var b=
+n.getSetting(b.data.treeId),a=n.getRoot(b);if(a.curHoverNode&&!n.isSelectedNode(b,a.curHoverNode))e.removeTreeDom(b,a.curHoverNode),a.curHoverNode=null},onMousedownNode:function(b,a){function c(b){if(B.dragFlag==0&&Math.abs(N-b.clientX)<f.edit.drag.minMoveSize&&Math.abs(O-b.clientY)<f.edit.drag.minMoveSize)return!0;var a,c,o,k,i;i=f.data.key.children;M.css("cursor","pointer");if(B.dragFlag==0){if(g.apply(f.callback.beforeDrag,[f.treeId,m],!0)==!1)return l(b),!0;for(a=0,c=m.length;a<c;a++){if(a==0)B.dragNodeShowBefore=
+[];o=m[a];o.isParent&&o.open?(e.expandCollapseNode(f,o,!o.open),B.dragNodeShowBefore[o.tId]=!0):B.dragNodeShowBefore[o.tId]=!1}B.dragFlag=1;t.showHoverDom=!1;g.showIfameMask(f,!0);o=!0;k=-1;if(m.length>1){var j=m[0].parentTId?m[0].getParentNode()[i]:n.getNodes(f);i=[];for(a=0,c=j.length;a<c;a++)if(B.dragNodeShowBefore[j[a].tId]!==void 0&&(o&&k>-1&&k+1!==a&&(o=!1),i.push(j[a]),k=a),m.length===i.length){m=i;break}}o&&(H=m[0].getPreNode(),R=m[m.length-1].getNextNode());C=p("<ul class='zTreeDragUL'></ul>",
+f);for(a=0,c=m.length;a<c;a++)if(o=m[a],o.editNameFlag=!1,e.selectNode(f,o,a>0),e.removeTreeDom(f,o),k=p("<li id='"+o.tId+"_tmp'></li>",f),k.append(p(o,d.id.A,f).clone()),k.css("padding","0"),k.children("#"+o.tId+d.id.A).removeClass(d.node.CURSELECTED),C.append(k),a==f.edit.drag.maxShowNodeNum-1){k=p("<li id='"+o.tId+"_moretmp'><a>  ...  </a></li>",f);C.append(k);break}C.attr("id",m[0].tId+d.id.UL+"_tmp");C.addClass(f.treeObj.attr("class"));C.appendTo(M);A=p("<span class='tmpzTreeMove_arrow'></span>",
+f);A.attr("id","zTreeMove_arrow_tmp");A.appendTo(M);f.treeObj.trigger(d.event.DRAG,[b,f.treeId,m])}if(B.dragFlag==1){s&&A.attr("id")==b.target.id&&u&&b.clientX+F.scrollLeft()+2>w("#"+u+d.id.A,s).offset().left?(o=w("#"+u+d.id.A,s),b.target=o.length>0?o.get(0):b.target):s&&(s.removeClass(d.node.TMPTARGET_TREE),u&&w("#"+u+d.id.A,s).removeClass(d.node.TMPTARGET_NODE+"_"+d.move.TYPE_PREV).removeClass(d.node.TMPTARGET_NODE+"_"+I.move.TYPE_NEXT).removeClass(d.node.TMPTARGET_NODE+"_"+I.move.TYPE_INNER));
+u=s=null;J=!1;h=f;o=n.getSettings();for(var D in o)if(o[D].treeId&&o[D].edit.enable&&o[D].treeId!=f.treeId&&(b.target.id==o[D].treeId||w(b.target).parents("#"+o[D].treeId).length>0))J=!0,h=o[D];D=F.scrollTop();k=F.scrollLeft();i=h.treeObj.offset();a=h.treeObj.get(0).scrollHeight;o=h.treeObj.get(0).scrollWidth;c=b.clientY+D-i.top;var q=h.treeObj.height()+i.top-b.clientY-D,r=b.clientX+k-i.left,x=h.treeObj.width()+i.left-b.clientX-k;i=c<f.edit.drag.borderMax&&c>f.edit.drag.borderMin;var j=q<f.edit.drag.borderMax&&
+q>f.edit.drag.borderMin,K=r<f.edit.drag.borderMax&&r>f.edit.drag.borderMin,G=x<f.edit.drag.borderMax&&x>f.edit.drag.borderMin,q=c>f.edit.drag.borderMin&&q>f.edit.drag.borderMin&&r>f.edit.drag.borderMin&&x>f.edit.drag.borderMin,r=i&&h.treeObj.scrollTop()<=0,x=j&&h.treeObj.scrollTop()+h.treeObj.height()+10>=a,P=K&&h.treeObj.scrollLeft()<=0,Q=G&&h.treeObj.scrollLeft()+h.treeObj.width()+10>=o;if(b.target&&g.isChildOrSelf(b.target,h.treeId)){for(var E=b.target;E&&E.tagName&&!g.eqs(E.tagName,"li")&&E.id!=
+h.treeId;)E=E.parentNode;var S=!0;for(a=0,c=m.length;a<c;a++)if(o=m[a],E.id===o.tId){S=!1;break}else if(p(o,f).find("#"+E.id).length>0){S=!1;break}if(S&&b.target&&g.isChildOrSelf(b.target,E.id+d.id.A))s=w(E),u=E.id}o=m[0];if(q&&g.isChildOrSelf(b.target,h.treeId)){if(!s&&(b.target.id==h.treeId||r||x||P||Q)&&(J||!J&&o.parentTId))s=h.treeObj;i?h.treeObj.scrollTop(h.treeObj.scrollTop()-10):j&&h.treeObj.scrollTop(h.treeObj.scrollTop()+10);K?h.treeObj.scrollLeft(h.treeObj.scrollLeft()-10):G&&h.treeObj.scrollLeft(h.treeObj.scrollLeft()+
+10);s&&s!=h.treeObj&&s.offset().left<h.treeObj.offset().left&&h.treeObj.scrollLeft(h.treeObj.scrollLeft()+s.offset().left-h.treeObj.offset().left)}C.css({top:b.clientY+D+3+"px",left:b.clientX+k+3+"px"});i=a=0;if(s&&s.attr("id")!=h.treeId){var y=u==null?null:n.getNodeCache(h,u);c=b.ctrlKey&&f.edit.drag.isMove&&f.edit.drag.isCopy||!f.edit.drag.isMove&&f.edit.drag.isCopy;a=!!(H&&u===H.tId);i=!!(R&&u===R.tId);k=o.parentTId&&o.parentTId==u;o=(c||!i)&&g.apply(h.edit.drag.prev,[h.treeId,m,y],!!h.edit.drag.prev);
+a=(c||!a)&&g.apply(h.edit.drag.next,[h.treeId,m,y],!!h.edit.drag.next);G=(c||!k)&&!(h.data.keep.leaf&&!y.isParent)&&g.apply(h.edit.drag.inner,[h.treeId,m,y],!!h.edit.drag.inner);if(!o&&!a&&!G){if(s=null,u="",v=d.move.TYPE_INNER,A.css({display:"none"}),window.zTreeMoveTimer)clearTimeout(window.zTreeMoveTimer),window.zTreeMoveTargetNodeTId=null}else{c=w("#"+u+d.id.A,s);i=y.isLastNode?null:w("#"+y.getNextNode().tId+d.id.A,s.next());j=c.offset().top;k=c.offset().left;K=o?G?0.25:a?0.5:1:-1;G=a?G?0.75:
+o?0.5:0:-1;b=(b.clientY+D-j)/c.height();(K==1||b<=K&&b>=-0.2)&&o?(a=1-A.width(),i=j-A.height()/2,v=d.move.TYPE_PREV):(G==0||b>=G&&b<=1.2)&&a?(a=1-A.width(),i=i==null||y.isParent&&y.open?j+c.height()-A.height()/2:i.offset().top-A.height()/2,v=d.move.TYPE_NEXT):(a=5-A.width(),i=j,v=d.move.TYPE_INNER);A.css({display:"block",top:i+"px",left:k+a+"px"});c.addClass(d.node.TMPTARGET_NODE+"_"+v);if(T!=u||U!=v)L=(new Date).getTime();if(y&&y.isParent&&v==d.move.TYPE_INNER&&(b=!0,window.zTreeMoveTimer&&window.zTreeMoveTargetNodeTId!==
+y.tId?(clearTimeout(window.zTreeMoveTimer),window.zTreeMoveTargetNodeTId=null):window.zTreeMoveTimer&&window.zTreeMoveTargetNodeTId===y.tId&&(b=!1),b))window.zTreeMoveTimer=setTimeout(function(){v==d.move.TYPE_INNER&&y&&y.isParent&&!y.open&&(new Date).getTime()-L>h.edit.drag.autoOpenTime&&g.apply(h.callback.beforeDragOpen,[h.treeId,y],!0)&&(e.switchNode(h,y),h.edit.drag.autoExpandTrigger&&h.treeObj.trigger(d.event.EXPAND,[h.treeId,y]))},h.edit.drag.autoOpenTime+50),window.zTreeMoveTargetNodeTId=y.tId}}else if(v=
+d.move.TYPE_INNER,s&&g.apply(h.edit.drag.inner,[h.treeId,m,null],!!h.edit.drag.inner)?s.addClass(d.node.TMPTARGET_TREE):s=null,A.css({display:"none"}),window.zTreeMoveTimer)clearTimeout(window.zTreeMoveTimer),window.zTreeMoveTargetNodeTId=null;T=u;U=v}return!1}function l(b){if(window.zTreeMoveTimer)clearTimeout(window.zTreeMoveTimer),window.zTreeMoveTargetNodeTId=null;U=T=null;F.unbind("mousemove",c);F.unbind("mouseup",l);F.unbind("selectstart",k);M.css("cursor","auto");s&&(s.removeClass(d.node.TMPTARGET_TREE),
+u&&w("#"+u+d.id.A,s).removeClass(d.node.TMPTARGET_NODE+"_"+d.move.TYPE_PREV).removeClass(d.node.TMPTARGET_NODE+"_"+I.move.TYPE_NEXT).removeClass(d.node.TMPTARGET_NODE+"_"+I.move.TYPE_INNER));g.showIfameMask(f,!1);t.showHoverDom=!0;if(B.dragFlag!=0){B.dragFlag=0;var a,i,j;for(a=0,i=m.length;a<i;a++)j=m[a],j.isParent&&B.dragNodeShowBefore[j.tId]&&!j.open&&(e.expandCollapseNode(f,j,!j.open),delete B.dragNodeShowBefore[j.tId]);C&&C.remove();A&&A.remove();var q=b.ctrlKey&&f.edit.drag.isMove&&f.edit.drag.isCopy||
+!f.edit.drag.isMove&&f.edit.drag.isCopy;!q&&s&&u&&m[0].parentTId&&u==m[0].parentTId&&v==d.move.TYPE_INNER&&(s=null);if(s){var r=u==null?null:n.getNodeCache(h,u);if(g.apply(f.callback.beforeDrop,[h.treeId,m,r,v,q],!0)==!1)e.selectNodes(x,m);else{var z=q?g.clone(m):m;a=function(){if(J){if(!q)for(var a=0,c=m.length;a<c;a++)e.removeNode(f,m[a]);if(v==d.move.TYPE_INNER)e.addNodes(h,r,z);else if(e.addNodes(h,r.getParentNode(),z),v==d.move.TYPE_PREV)for(a=0,c=z.length;a<c;a++)e.moveNode(h,r,z[a],v,!1);else for(a=
+-1,c=z.length-1;a<c;c--)e.moveNode(h,r,z[c],v,!1)}else if(q&&v==d.move.TYPE_INNER)e.addNodes(h,r,z);else if(q&&e.addNodes(h,r.getParentNode(),z),v!=d.move.TYPE_NEXT)for(a=0,c=z.length;a<c;a++)e.moveNode(h,r,z[a],v,!1);else for(a=-1,c=z.length-1;a<c;c--)e.moveNode(h,r,z[c],v,!1);e.selectNodes(h,z);p(z[0],f).focus().blur();f.treeObj.trigger(d.event.DROP,[b,h.treeId,z,r,v,q])};v==d.move.TYPE_INNER&&g.canAsync(h,r)?e.asyncNode(h,r,!1,a):a()}}else e.selectNodes(x,m),f.treeObj.trigger(d.event.DROP,[b,f.treeId,
+m,null,null,null])}}function k(){return!1}var i,j,f=n.getSetting(b.data.treeId),B=n.getRoot(f),t=n.getRoots();if(b.button==2||!f.edit.enable||!f.edit.drag.isCopy&&!f.edit.drag.isMove)return!0;var q=b.target,r=n.getRoot(f).curSelectedList,m=[];if(n.isSelectedNode(f,a))for(i=0,j=r.length;i<j;i++){if(r[i].editNameFlag&&g.eqs(q.tagName,"input")&&q.getAttribute("treeNode"+d.id.INPUT)!==null)return!0;m.push(r[i]);if(m[0].parentTId!==r[i].parentTId){m=[a];break}}else m=[a];e.editNodeBlur=!0;e.cancelCurEditNode(f);
+var F=w(f.treeObj.get(0).ownerDocument),M=w(f.treeObj.get(0).ownerDocument.body),C,A,s,J=!1,h=f,x=f,H,R,T=null,U=null,u=null,v=d.move.TYPE_INNER,N=b.clientX,O=b.clientY,L=(new Date).getTime();g.uCanDo(f)&&F.bind("mousemove",c);F.bind("mouseup",l);F.bind("selectstart",k);b.preventDefault&&b.preventDefault();return!0}};w.extend(!0,w.fn.zTree.consts,I);w.extend(!0,w.fn.zTree._z,{tools:{getAbs:function(b){b=b.getBoundingClientRect();return[b.left+(document.body.scrollLeft+document.documentElement.scrollLeft),
+b.top+(document.body.scrollTop+document.documentElement.scrollTop)]},inputFocus:function(b){b.get(0)&&(b.focus(),g.setCursorPosition(b.get(0),b.val().length))},inputSelect:function(b){b.get(0)&&(b.focus(),b.select())},setCursorPosition:function(b,a){if(b.setSelectionRange)b.focus(),b.setSelectionRange(a,a);else if(b.createTextRange){var c=b.createTextRange();c.collapse(!0);c.moveEnd("character",a);c.moveStart("character",a);c.select()}},showIfameMask:function(b,a){for(var c=n.getRoot(b);c.dragMaskList.length>
+0;)c.dragMaskList[0].remove(),c.dragMaskList.shift();if(a)for(var d=p("iframe",b),e=0,i=d.length;e<i;e++){var j=d.get(e),f=g.getAbs(j),j=p("<div id='zTreeMask_"+e+"' class='zTreeMask' style='top:"+f[1]+"px; left:"+f[0]+"px; width:"+j.offsetWidth+"px; height:"+j.offsetHeight+"px;'></div>",b);j.appendTo(p("body",b));c.dragMaskList.push(j)}}},view:{addEditBtn:function(b,a){if(!(a.editNameFlag||p(a,d.id.EDIT,b).length>0)&&g.apply(b.edit.showRenameBtn,[b.treeId,a],b.edit.showRenameBtn)){var c=p(a,d.id.A,
+b),l="<span class='"+d.className.BUTTON+" edit' id='"+a.tId+d.id.EDIT+"' title='"+g.apply(b.edit.renameTitle,[b.treeId,a],b.edit.renameTitle)+"' treeNode"+d.id.EDIT+" style='display:none;'></span>";c.append(l);p(a,d.id.EDIT,b).bind("click",function(){if(!g.uCanDo(b)||g.apply(b.callback.beforeEditName,[b.treeId,a],!0)==!1)return!1;e.editNode(b,a);return!1}).show()}},addRemoveBtn:function(b,a){if(!(a.editNameFlag||p(a,d.id.REMOVE,b).length>0)&&g.apply(b.edit.showRemoveBtn,[b.treeId,a],b.edit.showRemoveBtn)){var c=
+p(a,d.id.A,b),l="<span class='"+d.className.BUTTON+" remove' id='"+a.tId+d.id.REMOVE+"' title='"+g.apply(b.edit.removeTitle,[b.treeId,a],b.edit.removeTitle)+"' treeNode"+d.id.REMOVE+" style='display:none;'></span>";c.append(l);p(a,d.id.REMOVE,b).bind("click",function(){if(!g.uCanDo(b)||g.apply(b.callback.beforeRemove,[b.treeId,a],!0)==!1)return!1;e.removeNode(b,a);b.treeObj.trigger(d.event.REMOVE,[b.treeId,a]);return!1}).bind("mousedown",function(){return!0}).show()}},addHoverDom:function(b,a){if(n.getRoots().showHoverDom)a.isHover=
+!0,b.edit.enable&&(e.addEditBtn(b,a),e.addRemoveBtn(b,a)),g.apply(b.view.addHoverDom,[b.treeId,a])},cancelCurEditNode:function(b,a,c){var l=n.getRoot(b),k=b.data.key.name,i=l.curEditNode;if(i){var j=l.curEditInput,a=a?a:c?i[k]:j.val();if(g.apply(b.callback.beforeRename,[b.treeId,i,a,c],!0)===!1)return!1;else i[k]=a,b.treeObj.trigger(d.event.RENAME,[b.treeId,i,c]);p(i,d.id.A,b).removeClass(d.node.CURSELECTED_EDIT);j.unbind();e.setNodeName(b,i);i.editNameFlag=!1;l.curEditNode=null;l.curEditInput=null;
+e.selectNode(b,i,!1)}return l.noSelection=!0},editNode:function(b,a){var c=n.getRoot(b);e.editNodeBlur=!1;if(n.isSelectedNode(b,a)&&c.curEditNode==a&&a.editNameFlag)setTimeout(function(){g.inputFocus(c.curEditInput)},0);else{var l=b.data.key.name;a.editNameFlag=!0;e.removeTreeDom(b,a);e.cancelCurEditNode(b);e.selectNode(b,a,!1);p(a,d.id.SPAN,b).html("<input type=text class='rename' id='"+a.tId+d.id.INPUT+"' treeNode"+d.id.INPUT+" >");var k=p(a,d.id.INPUT,b);k.attr("value",a[l]);b.edit.editNameSelectAll?
+g.inputSelect(k):g.inputFocus(k);k.bind("blur",function(){e.editNodeBlur||e.cancelCurEditNode(b)}).bind("keydown",function(a){a.keyCode=="13"?(e.editNodeBlur=!0,e.cancelCurEditNode(b)):a.keyCode=="27"&&e.cancelCurEditNode(b,null,!0)}).bind("click",function(){return!1}).bind("dblclick",function(){return!1});p(a,d.id.A,b).addClass(d.node.CURSELECTED_EDIT);c.curEditInput=k;c.noSelection=!1;c.curEditNode=a}},moveNode:function(b,a,c,l,k,i){var j=n.getRoot(b),f=b.data.key.children;if(a!=c&&(!b.data.keep.leaf||
+!a||a.isParent||l!=d.move.TYPE_INNER)){var g=c.parentTId?c.getParentNode():j,t=a===null||a==j;t&&a===null&&(a=j);if(t)l=d.move.TYPE_INNER;j=a.parentTId?a.getParentNode():j;if(l!=d.move.TYPE_PREV&&l!=d.move.TYPE_NEXT)l=d.move.TYPE_INNER;if(l==d.move.TYPE_INNER)if(t)c.parentTId=null;else{if(!a.isParent)a.isParent=!0,a.open=!!a.open,e.setNodeLineIcos(b,a);c.parentTId=a.tId}var q;t?q=t=b.treeObj:(!i&&l==d.move.TYPE_INNER?e.expandCollapseNode(b,a,!0,!1):i||e.expandCollapseNode(b,a.getParentNode(),!0,!1),
+t=p(a,b),q=p(a,d.id.UL,b),t.get(0)&&!q.get(0)&&(q=[],e.makeUlHtml(b,a,q,""),t.append(q.join(""))),q=p(a,d.id.UL,b));var r=p(c,b);r.get(0)?t.get(0)||r.remove():r=e.appendNodes(b,c.level,[c],null,!1,!0).join("");q.get(0)&&l==d.move.TYPE_INNER?q.append(r):t.get(0)&&l==d.move.TYPE_PREV?t.before(r):t.get(0)&&l==d.move.TYPE_NEXT&&t.after(r);var m=-1,w=0,x=null,t=null,C=c.level;if(c.isFirstNode){if(m=0,g[f].length>1)x=g[f][1],x.isFirstNode=!0}else if(c.isLastNode)m=g[f].length-1,x=g[f][m-1],x.isLastNode=
+!0;else for(q=0,r=g[f].length;q<r;q++)if(g[f][q].tId==c.tId){m=q;break}m>=0&&g[f].splice(m,1);if(l!=d.move.TYPE_INNER)for(q=0,r=j[f].length;q<r;q++)j[f][q].tId==a.tId&&(w=q);if(l==d.move.TYPE_INNER){a[f]||(a[f]=[]);if(a[f].length>0)t=a[f][a[f].length-1],t.isLastNode=!1;a[f].splice(a[f].length,0,c);c.isLastNode=!0;c.isFirstNode=a[f].length==1}else a.isFirstNode&&l==d.move.TYPE_PREV?(j[f].splice(w,0,c),t=a,t.isFirstNode=!1,c.parentTId=a.parentTId,c.isFirstNode=!0,c.isLastNode=!1):a.isLastNode&&l==d.move.TYPE_NEXT?
+(j[f].splice(w+1,0,c),t=a,t.isLastNode=!1,c.parentTId=a.parentTId,c.isFirstNode=!1,c.isLastNode=!0):(l==d.move.TYPE_PREV?j[f].splice(w,0,c):j[f].splice(w+1,0,c),c.parentTId=a.parentTId,c.isFirstNode=!1,c.isLastNode=!1);n.fixPIdKeyValue(b,c);n.setSonNodeLevel(b,c.getParentNode(),c);e.setNodeLineIcos(b,c);e.repairNodeLevelClass(b,c,C);!b.data.keep.parent&&g[f].length<1?(g.isParent=!1,g.open=!1,a=p(g,d.id.UL,b),l=p(g,d.id.SWITCH,b),f=p(g,d.id.ICON,b),e.replaceSwitchClass(g,l,d.folder.DOCU),e.replaceIcoClass(g,
+f,d.folder.DOCU),a.css("display","none")):x&&e.setNodeLineIcos(b,x);t&&e.setNodeLineIcos(b,t);b.check&&b.check.enable&&e.repairChkClass&&(e.repairChkClass(b,g),e.repairParentChkClassWithSelf(b,g),g!=c.parent&&e.repairParentChkClassWithSelf(b,c));i||e.expandCollapseParentNode(b,c.getParentNode(),!0,k)}},removeEditBtn:function(b,a){p(a,d.id.EDIT,b).unbind().remove()},removeRemoveBtn:function(b,a){p(a,d.id.REMOVE,b).unbind().remove()},removeTreeDom:function(b,a){a.isHover=!1;e.removeEditBtn(b,a);e.removeRemoveBtn(b,
+a);g.apply(b.view.removeHoverDom,[b.treeId,a])},repairNodeLevelClass:function(b,a,c){if(c!==a.level){var e=p(a,b),g=p(a,d.id.A,b),b=p(a,d.id.UL,b),c=d.className.LEVEL+c,a=d.className.LEVEL+a.level;e.removeClass(c);e.addClass(a);g.removeClass(c);g.addClass(a);b.removeClass(c);b.addClass(a)}},selectNodes:function(b,a){for(var c=0,d=a.length;c<d;c++)e.selectNode(b,a[c],c>0)}},event:{},data:{setSonNodeLevel:function(b,a,c){if(c){var d=b.data.key.children;c.level=a?a.level+1:0;if(c[d])for(var a=0,e=c[d].length;a<
+e;a++)c[d][a]&&n.setSonNodeLevel(b,c,c[d][a])}}}});var H=w.fn.zTree,g=H._z.tools,d=H.consts,e=H._z.view,n=H._z.data,p=g.$;n.exSetting({edit:{enable:!1,editNameSelectAll:!1,showRemoveBtn:!0,showRenameBtn:!0,removeTitle:"remove",renameTitle:"rename",drag:{autoExpandTrigger:!1,isCopy:!0,isMove:!0,prev:!0,next:!0,inner:!0,minMoveSize:5,borderMax:10,borderMin:-5,maxShowNodeNum:5,autoOpenTime:500}},view:{addHoverDom:null,removeHoverDom:null},callback:{beforeDrag:null,beforeDragOpen:null,beforeDrop:null,
+beforeEditName:null,beforeRename:null,onDrag:null,onDrop:null,onRename:null}});n.addInitBind(function(b){var a=b.treeObj,c=d.event;a.bind(c.RENAME,function(a,c,d,e){g.apply(b.callback.onRename,[a,c,d,e])});a.bind(c.REMOVE,function(a,c,d){g.apply(b.callback.onRemove,[a,c,d])});a.bind(c.DRAG,function(a,c,d,e){g.apply(b.callback.onDrag,[c,d,e])});a.bind(c.DROP,function(a,c,d,e,f,n,p){g.apply(b.callback.onDrop,[c,d,e,f,n,p])})});n.addInitUnBind(function(b){var b=b.treeObj,a=d.event;b.unbind(a.RENAME);
+b.unbind(a.REMOVE);b.unbind(a.DRAG);b.unbind(a.DROP)});n.addInitCache(function(){});n.addInitNode(function(b,a,c){if(c)c.isHover=!1,c.editNameFlag=!1});n.addInitProxy(function(b){var a=b.target,c=n.getSetting(b.data.treeId),e=b.relatedTarget,k="",i=null,j="",f=null,p=null;if(g.eqs(b.type,"mouseover")){if(p=g.getMDom(c,a,[{tagName:"a",attrName:"treeNode"+d.id.A}]))k=g.getNodeMainDom(p).id,j="hoverOverNode"}else if(g.eqs(b.type,"mouseout"))p=g.getMDom(c,e,[{tagName:"a",attrName:"treeNode"+d.id.A}]),
+p||(k="remove",j="hoverOutNode");else if(g.eqs(b.type,"mousedown")&&(p=g.getMDom(c,a,[{tagName:"a",attrName:"treeNode"+d.id.A}])))k=g.getNodeMainDom(p).id,j="mousedownNode";if(k.length>0)switch(i=n.getNodeCache(c,k),j){case "mousedownNode":f=x.onMousedownNode;break;case "hoverOverNode":f=x.onHoverOverNode;break;case "hoverOutNode":f=x.onHoverOutNode}return{stop:!1,node:i,nodeEventType:j,nodeEventCallback:f,treeEventType:"",treeEventCallback:null}});n.addInitRoot(function(b){var b=n.getRoot(b),a=n.getRoots();
+b.curEditNode=null;b.curEditInput=null;b.curHoverNode=null;b.dragFlag=0;b.dragNodeShowBefore=[];b.dragMaskList=[];a.showHoverDom=!0});n.addZTreeTools(function(b,a){a.cancelEditName=function(a){n.getRoot(b).curEditNode&&e.cancelCurEditNode(b,a?a:null,!0)};a.copyNode=function(a,l,k,i){if(!l)return null;if(a&&!a.isParent&&b.data.keep.leaf&&k===d.move.TYPE_INNER)return null;var j=g.clone(l);if(!a)a=null,k=d.move.TYPE_INNER;k==d.move.TYPE_INNER?(l=function(){e.addNodes(b,a,[j],i)},g.canAsync(b,a)?e.asyncNode(b,
+a,i,l):l()):(e.addNodes(b,a.parentNode,[j],i),e.moveNode(b,a,j,k,!1,i));return j};a.editName=function(a){a&&a.tId&&a===n.getNodeCache(b,a.tId)&&(a.parentTId&&e.expandCollapseParentNode(b,a.getParentNode(),!0),e.editNode(b,a))};a.moveNode=function(a,l,k,i){function j(){e.moveNode(b,a,l,k,!1,i)}if(!l)return l;if(a&&!a.isParent&&b.data.keep.leaf&&k===d.move.TYPE_INNER)return null;else if(a&&(l.parentTId==a.tId&&k==d.move.TYPE_INNER||p(l,b).find("#"+a.tId).length>0))return null;else a||(a=null);g.canAsync(b,
+a)&&k===d.move.TYPE_INNER?e.asyncNode(b,a,i,j):j();return l};a.setEditable=function(a){b.edit.enable=a;return this.refresh()}});var N=e.cancelPreSelectedNode;e.cancelPreSelectedNode=function(b,a){for(var c=n.getRoot(b).curSelectedList,d=0,g=c.length;d<g;d++)if(!a||a===c[d])if(e.removeTreeDom(b,c[d]),a)break;N&&N.apply(e,arguments)};var O=e.createNodes;e.createNodes=function(b,a,c,d){O&&O.apply(e,arguments);c&&e.repairParentChkClassWithSelf&&e.repairParentChkClassWithSelf(b,d)};var V=e.makeNodeUrl;
+e.makeNodeUrl=function(b,a){return b.edit.enable?null:V.apply(e,arguments)};var L=e.removeNode;e.removeNode=function(b,a){var c=n.getRoot(b);if(c.curEditNode===a)c.curEditNode=null;L&&L.apply(e,arguments)};var P=e.selectNode;e.selectNode=function(b,a,c){var d=n.getRoot(b);if(n.isSelectedNode(b,a)&&d.curEditNode==a&&a.editNameFlag)return!1;P&&P.apply(e,arguments);e.addHoverDom(b,a);return!0};var Q=g.uCanDo;g.uCanDo=function(b,a){var c=n.getRoot(b);if(a&&(g.eqs(a.type,"mouseover")||g.eqs(a.type,"mouseout")||
+g.eqs(a.type,"mousedown")||g.eqs(a.type,"mouseup")))return!0;if(c.curEditNode)e.editNodeBlur=!1,c.curEditInput.focus();return!c.curEditNode&&(Q?Q.apply(e,arguments):!0)}})(jQuery);
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/js/jquery.ztree.core-3.5.js b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/js/jquery.ztree.core-3.5.js
new file mode 100644
index 0000000..2b274e3
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/js/jquery.ztree.core-3.5.js
@@ -0,0 +1,1677 @@
+/*
+ * JQuery zTree core v3.5.15
+ * http://zTree.me/
+ *
+ * Copyright (c) 2010 Hunter.z
+ *
+ * Licensed same as jquery - MIT License
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ * email: hunter.z@263.net
+ * Date: 2013-10-15
+ */
+(function($){
+	var settings = {}, roots = {}, caches = {},
+	//default consts of core
+	_consts = {
+		className: {
+			BUTTON: "button",
+			LEVEL: "level",
+			ICO_LOADING: "ico_loading",
+			SWITCH: "switch"
+		},
+		event: {
+			NODECREATED: "ztree_nodeCreated",
+			CLICK: "ztree_click",
+			EXPAND: "ztree_expand",
+			COLLAPSE: "ztree_collapse",
+			ASYNC_SUCCESS: "ztree_async_success",
+			ASYNC_ERROR: "ztree_async_error"
+		},
+		id: {
+			A: "_a",
+			ICON: "_ico",
+			SPAN: "_span",
+			SWITCH: "_switch",
+			UL: "_ul"
+		},
+		line: {
+			ROOT: "root",
+			ROOTS: "roots",
+			CENTER: "center",
+			BOTTOM: "bottom",
+			NOLINE: "noline",
+			LINE: "line"
+		},
+		folder: {
+			OPEN: "open",
+			CLOSE: "close",
+			DOCU: "docu"
+		},
+		node: {
+			CURSELECTED: "curSelectedNode"
+		}
+	},
+	//default setting of core
+	_setting = {
+		treeId: "",
+		treeObj: null,
+		view: {
+			addDiyDom: null,
+			autoCancelSelected: true,
+			dblClickExpand: true,
+			expandSpeed: "fast",
+			fontCss: {},
+			nameIsHTML: false,
+			selectedMulti: true,
+			showIcon: true,
+			showLine: true,
+			showTitle: true,
+			txtSelectedEnable: false
+		},
+		data: {
+			key: {
+				children: "children",
+				name: "name",
+				title: "",
+				url: "url"
+			},
+			simpleData: {
+				enable: false,
+				idKey: "id",
+				pIdKey: "pId",
+				rootPId: null
+			},
+			keep: {
+				parent: false,
+				leaf: false
+			}
+		},
+		async: {
+			enable: false,
+			contentType: "application/x-www-form-urlencoded",
+			type: "post",
+			dataType: "text",
+			url: "",
+			autoParam: [],
+			otherParam: [],
+			dataFilter: null
+		},
+		callback: {
+			beforeAsync:null,
+			beforeClick:null,
+			beforeDblClick:null,
+			beforeRightClick:null,
+			beforeMouseDown:null,
+			beforeMouseUp:null,
+			beforeExpand:null,
+			beforeCollapse:null,
+			beforeRemove:null,
+
+			onAsyncError:null,
+			onAsyncSuccess:null,
+			onNodeCreated:null,
+			onClick:null,
+			onDblClick:null,
+			onRightClick:null,
+			onMouseDown:null,
+			onMouseUp:null,
+			onExpand:null,
+			onCollapse:null,
+			onRemove:null
+		}
+	},
+	//default root of core
+	//zTree use root to save full data
+	_initRoot = function (setting) {
+		var r = data.getRoot(setting);
+		if (!r) {
+			r = {};
+			data.setRoot(setting, r);
+		}
+		r[setting.data.key.children] = [];
+		r.expandTriggerFlag = false;
+		r.curSelectedList = [];
+		r.noSelection = true;
+		r.createdNodes = [];
+		r.zId = 0;
+		r._ver = (new Date()).getTime();
+	},
+	//default cache of core
+	_initCache = function(setting) {
+		var c = data.getCache(setting);
+		if (!c) {
+			c = {};
+			data.setCache(setting, c);
+		}
+		c.nodes = [];
+		c.doms = [];
+	},
+	//default bindEvent of core
+	_bindEvent = function(setting) {
+		var o = setting.treeObj,
+		c = consts.event;
+		o.bind(c.NODECREATED, function (event, treeId, node) {
+			tools.apply(setting.callback.onNodeCreated, [event, treeId, node]);
+		});
+
+		o.bind(c.CLICK, function (event, srcEvent, treeId, node, clickFlag) {
+			tools.apply(setting.callback.onClick, [srcEvent, treeId, node, clickFlag]);
+		});
+
+		o.bind(c.EXPAND, function (event, treeId, node) {
+			tools.apply(setting.callback.onExpand, [event, treeId, node]);
+		});
+
+		o.bind(c.COLLAPSE, function (event, treeId, node) {
+			tools.apply(setting.callback.onCollapse, [event, treeId, node]);
+		});
+
+		o.bind(c.ASYNC_SUCCESS, function (event, treeId, node, msg) {
+			tools.apply(setting.callback.onAsyncSuccess, [event, treeId, node, msg]);
+		});
+
+		o.bind(c.ASYNC_ERROR, function (event, treeId, node, XMLHttpRequest, textStatus, errorThrown) {
+			tools.apply(setting.callback.onAsyncError, [event, treeId, node, XMLHttpRequest, textStatus, errorThrown]);
+		});
+	},
+	_unbindEvent = function(setting) {
+		var o = setting.treeObj,
+		c = consts.event;
+		o.unbind(c.NODECREATED)
+		.unbind(c.CLICK)
+		.unbind(c.EXPAND)
+		.unbind(c.COLLAPSE)
+		.unbind(c.ASYNC_SUCCESS)
+		.unbind(c.ASYNC_ERROR);
+	},
+	//default event proxy of core
+	_eventProxy = function(event) {
+		var target = event.target,
+		setting = data.getSetting(event.data.treeId),
+		tId = "", node = null,
+		nodeEventType = "", treeEventType = "",
+		nodeEventCallback = null, treeEventCallback = null,
+		tmp = null;
+
+		if (tools.eqs(event.type, "mousedown")) {
+			treeEventType = "mousedown";
+		} else if (tools.eqs(event.type, "mouseup")) {
+			treeEventType = "mouseup";
+		} else if (tools.eqs(event.type, "contextmenu")) {
+			treeEventType = "contextmenu";
+		} else if (tools.eqs(event.type, "click")) {
+			if (tools.eqs(target.tagName, "span") && target.getAttribute("treeNode"+ consts.id.SWITCH) !== null) {
+				tId = tools.getNodeMainDom(target).id;
+				nodeEventType = "switchNode";
+			} else {
+				tmp = tools.getMDom(setting, target, [{tagName:"a", attrName:"treeNode"+consts.id.A}]);
+				if (tmp) {
+					tId = tools.getNodeMainDom(tmp).id;
+					nodeEventType = "clickNode";
+				}
+			}
+		} else if (tools.eqs(event.type, "dblclick")) {
+			treeEventType = "dblclick";
+			tmp = tools.getMDom(setting, target, [{tagName:"a", attrName:"treeNode"+consts.id.A}]);
+			if (tmp) {
+				tId = tools.getNodeMainDom(tmp).id;
+				nodeEventType = "switchNode";
+			}
+		}
+		if (treeEventType.length > 0 && tId.length == 0) {
+			tmp = tools.getMDom(setting, target, [{tagName:"a", attrName:"treeNode"+consts.id.A}]);
+			if (tmp) {tId = tools.getNodeMainDom(tmp).id;}
+		}
+		// event to node
+		if (tId.length>0) {
+			node = data.getNodeCache(setting, tId);
+			switch (nodeEventType) {
+				case "switchNode" :
+					if (!node.isParent) {
+						nodeEventType = "";
+					} else if (tools.eqs(event.type, "click")
+						|| (tools.eqs(event.type, "dblclick") && tools.apply(setting.view.dblClickExpand, [setting.treeId, node], setting.view.dblClickExpand))) {
+						nodeEventCallback = handler.onSwitchNode;
+					} else {
+						nodeEventType = "";
+					}
+					break;
+				case "clickNode" :
+					nodeEventCallback = handler.onClickNode;
+					break;
+			}
+		}
+		// event to zTree
+		switch (treeEventType) {
+			case "mousedown" :
+				treeEventCallback = handler.onZTreeMousedown;
+				break;
+			case "mouseup" :
+				treeEventCallback = handler.onZTreeMouseup;
+				break;
+			case "dblclick" :
+				treeEventCallback = handler.onZTreeDblclick;
+				break;
+			case "contextmenu" :
+				treeEventCallback = handler.onZTreeContextmenu;
+				break;
+		}
+		var proxyResult = {
+			stop: false,
+			node: node,
+			nodeEventType: nodeEventType,
+			nodeEventCallback: nodeEventCallback,
+			treeEventType: treeEventType,
+			treeEventCallback: treeEventCallback
+		};
+		return proxyResult
+	},
+	//default init node of core
+	_initNode = function(setting, level, n, parentNode, isFirstNode, isLastNode, openFlag) {
+		if (!n) return;
+		var r = data.getRoot(setting),
+		childKey = setting.data.key.children;
+		n.level = level;
+		n.tId = setting.treeId + "_" + (++r.zId);
+		n.parentTId = parentNode ? parentNode.tId : null;
+		n.open = (typeof n.open == "string") ? tools.eqs(n.open, "true") : !!n.open;
+		if (n[childKey] && n[childKey].length > 0) {
+			n.isParent = true;
+			n.zAsync = true;
+		} else {
+			n.isParent = (typeof n.isParent == "string") ? tools.eqs(n.isParent, "true") : !!n.isParent;
+			n.open = (n.isParent && !setting.async.enable) ? n.open : false;
+			n.zAsync = !n.isParent;
+		}
+		n.isFirstNode = isFirstNode;
+		n.isLastNode = isLastNode;
+		n.getParentNode = function() {return data.getNodeCache(setting, n.parentTId);};
+		n.getPreNode = function() {return data.getPreNode(setting, n);};
+		n.getNextNode = function() {return data.getNextNode(setting, n);};
+		n.isAjaxing = false;
+		data.fixPIdKeyValue(setting, n);
+	},
+	_init = {
+		bind: [_bindEvent],
+		unbind: [_unbindEvent],
+		caches: [_initCache],
+		nodes: [_initNode],
+		proxys: [_eventProxy],
+		roots: [_initRoot],
+		beforeA: [],
+		afterA: [],
+		innerBeforeA: [],
+		innerAfterA: [],
+		zTreeTools: []
+	},
+	//method of operate data
+	data = {
+		addNodeCache: function(setting, node) {
+			data.getCache(setting).nodes[data.getNodeCacheId(node.tId)] = node;
+		},
+		getNodeCacheId: function(tId) {
+			return tId.substring(tId.lastIndexOf("_")+1);
+		},
+		addAfterA: function(afterA) {
+			_init.afterA.push(afterA);
+		},
+		addBeforeA: function(beforeA) {
+			_init.beforeA.push(beforeA);
+		},
+		addInnerAfterA: function(innerAfterA) {
+			_init.innerAfterA.push(innerAfterA);
+		},
+		addInnerBeforeA: function(innerBeforeA) {
+			_init.innerBeforeA.push(innerBeforeA);
+		},
+		addInitBind: function(bindEvent) {
+			_init.bind.push(bindEvent);
+		},
+		addInitUnBind: function(unbindEvent) {
+			_init.unbind.push(unbindEvent);
+		},
+		addInitCache: function(initCache) {
+			_init.caches.push(initCache);
+		},
+		addInitNode: function(initNode) {
+			_init.nodes.push(initNode);
+		},
+		addInitProxy: function(initProxy, isFirst) {
+			if (!!isFirst) {
+				_init.proxys.splice(0,0,initProxy);
+			} else {
+				_init.proxys.push(initProxy);
+			}
+		},
+		addInitRoot: function(initRoot) {
+			_init.roots.push(initRoot);
+		},
+		addNodesData: function(setting, parentNode, nodes) {
+			var childKey = setting.data.key.children;
+			if (!parentNode[childKey]) parentNode[childKey] = [];
+			if (parentNode[childKey].length > 0) {
+				parentNode[childKey][parentNode[childKey].length - 1].isLastNode = false;
+				view.setNodeLineIcos(setting, parentNode[childKey][parentNode[childKey].length - 1]);
+			}
+			parentNode.isParent = true;
+			parentNode[childKey] = parentNode[childKey].concat(nodes);
+		},
+		addSelectedNode: function(setting, node) {
+			var root = data.getRoot(setting);
+			if (!data.isSelectedNode(setting, node)) {
+				root.curSelectedList.push(node);
+			}
+		},
+		addCreatedNode: function(setting, node) {
+			if (!!setting.callback.onNodeCreated || !!setting.view.addDiyDom) {
+				var root = data.getRoot(setting);
+				root.createdNodes.push(node);
+			}
+		},
+		addZTreeTools: function(zTreeTools) {
+			_init.zTreeTools.push(zTreeTools);
+		},
+		exSetting: function(s) {
+			$.extend(true, _setting, s);
+		},
+		fixPIdKeyValue: function(setting, node) {
+			if (setting.data.simpleData.enable) {
+				node[setting.data.simpleData.pIdKey] = node.parentTId ? node.getParentNode()[setting.data.simpleData.idKey] : setting.data.simpleData.rootPId;
+			}
+		},
+		getAfterA: function(setting, node, array) {
+			for (var i=0, j=_init.afterA.length; i<j; i++) {
+				_init.afterA[i].apply(this, arguments);
+			}
+		},
+		getBeforeA: function(setting, node, array) {
+			for (var i=0, j=_init.beforeA.length; i<j; i++) {
+				_init.beforeA[i].apply(this, arguments);
+			}
+		},
+		getInnerAfterA: function(setting, node, array) {
+			for (var i=0, j=_init.innerAfterA.length; i<j; i++) {
+				_init.innerAfterA[i].apply(this, arguments);
+			}
+		},
+		getInnerBeforeA: function(setting, node, array) {
+			for (var i=0, j=_init.innerBeforeA.length; i<j; i++) {
+				_init.innerBeforeA[i].apply(this, arguments);
+			}
+		},
+		getCache: function(setting) {
+			return caches[setting.treeId];
+		},
+		getNextNode: function(setting, node) {
+			if (!node) return null;
+			var childKey = setting.data.key.children,
+			p = node.parentTId ? node.getParentNode() : data.getRoot(setting);
+			for (var i=0, l=p[childKey].length-1; i<=l; i++) {
+				if (p[childKey][i] === node) {
+					return (i==l ? null : p[childKey][i+1]);
+				}
+			}
+			return null;
+		},
+		getNodeByParam: function(setting, nodes, key, value) {
+			if (!nodes || !key) return null;
+			var childKey = setting.data.key.children;
+			for (var i = 0, l = nodes.length; i < l; i++) {
+				if (nodes[i][key] == value) {
+					return nodes[i];
+				}
+				var tmp = data.getNodeByParam(setting, nodes[i][childKey], key, value);
+				if (tmp) return tmp;
+			}
+			return null;
+		},
+		getNodeCache: function(setting, tId) {
+			if (!tId) return null;
+			var n = caches[setting.treeId].nodes[data.getNodeCacheId(tId)];
+			return n ? n : null;
+		},
+		getNodeName: function(setting, node) {
+			var nameKey = setting.data.key.name;
+			return "" + node[nameKey];
+		},
+		getNodeTitle: function(setting, node) {
+			var t = setting.data.key.title === "" ? setting.data.key.name : setting.data.key.title;
+			return "" + node[t];
+		},
+		getNodes: function(setting) {
+			return data.getRoot(setting)[setting.data.key.children];
+		},
+		getNodesByParam: function(setting, nodes, key, value) {
+			if (!nodes || !key) return [];
+			var childKey = setting.data.key.children,
+			result = [];
+			for (var i = 0, l = nodes.length; i < l; i++) {
+				if (nodes[i][key] == value) {
+					result.push(nodes[i]);
+				}
+				result = result.concat(data.getNodesByParam(setting, nodes[i][childKey], key, value));
+			}
+			return result;
+		},
+		getNodesByParamFuzzy: function(setting, nodes, key, value) {
+			if (!nodes || !key) return [];
+			var childKey = setting.data.key.children,
+			result = [];
+			value = value.toLowerCase();
+			for (var i = 0, l = nodes.length; i < l; i++) {
+				if (typeof nodes[i][key] == "string" && nodes[i][key].toLowerCase().indexOf(value)>-1) {
+					result.push(nodes[i]);
+				}
+				result = result.concat(data.getNodesByParamFuzzy(setting, nodes[i][childKey], key, value));
+			}
+			return result;
+		},
+		getNodesByFilter: function(setting, nodes, filter, isSingle, invokeParam) {
+			if (!nodes) return (isSingle ? null : []);
+			var childKey = setting.data.key.children,
+			result = isSingle ? null : [];
+			for (var i = 0, l = nodes.length; i < l; i++) {
+				if (tools.apply(filter, [nodes[i], invokeParam], false)) {
+					if (isSingle) {return nodes[i];}
+					result.push(nodes[i]);
+				}
+				var tmpResult = data.getNodesByFilter(setting, nodes[i][childKey], filter, isSingle, invokeParam);
+				if (isSingle && !!tmpResult) {return tmpResult;}
+				result = isSingle ? tmpResult : result.concat(tmpResult);
+			}
+			return result;
+		},
+		getPreNode: function(setting, node) {
+			if (!node) return null;
+			var childKey = setting.data.key.children,
+			p = node.parentTId ? node.getParentNode() : data.getRoot(setting);
+			for (var i=0, l=p[childKey].length; i<l; i++) {
+				if (p[childKey][i] === node) {
+					return (i==0 ? null : p[childKey][i-1]);
+				}
+			}
+			return null;
+		},
+		getRoot: function(setting) {
+			return setting ? roots[setting.treeId] : null;
+		},
+		getRoots: function() {
+			return roots;
+		},
+		getSetting: function(treeId) {
+			return settings[treeId];
+		},
+		getSettings: function() {
+			return settings;
+		},
+		getZTreeTools: function(treeId) {
+			var r = this.getRoot(this.getSetting(treeId));
+			return r ? r.treeTools : null;
+		},
+		initCache: function(setting) {
+			for (var i=0, j=_init.caches.length; i<j; i++) {
+				_init.caches[i].apply(this, arguments);
+			}
+		},
+		initNode: function(setting, level, node, parentNode, preNode, nextNode) {
+			for (var i=0, j=_init.nodes.length; i<j; i++) {
+				_init.nodes[i].apply(this, arguments);
+			}
+		},
+		initRoot: function(setting) {
+			for (var i=0, j=_init.roots.length; i<j; i++) {
+				_init.roots[i].apply(this, arguments);
+			}
+		},
+		isSelectedNode: function(setting, node) {
+			var root = data.getRoot(setting);
+			for (var i=0, j=root.curSelectedList.length; i<j; i++) {
+				if(node === root.curSelectedList[i]) return true;
+			}
+			return false;
+		},
+		removeNodeCache: function(setting, node) {
+			var childKey = setting.data.key.children;
+			if (node[childKey]) {
+				for (var i=0, l=node[childKey].length; i<l; i++) {
+					arguments.callee(setting, node[childKey][i]);
+				}
+			}
+			data.getCache(setting).nodes[data.getNodeCacheId(node.tId)] = null;
+		},
+		removeSelectedNode: function(setting, node) {
+			var root = data.getRoot(setting);
+			for (var i=0, j=root.curSelectedList.length; i<j; i++) {
+				if(node === root.curSelectedList[i] || !data.getNodeCache(setting, root.curSelectedList[i].tId)) {
+					root.curSelectedList.splice(i, 1);
+					i--;j--;
+				}
+			}
+		},
+		setCache: function(setting, cache) {
+			caches[setting.treeId] = cache;
+		},
+		setRoot: function(setting, root) {
+			roots[setting.treeId] = root;
+		},
+		setZTreeTools: function(setting, zTreeTools) {
+			for (var i=0, j=_init.zTreeTools.length; i<j; i++) {
+				_init.zTreeTools[i].apply(this, arguments);
+			}
+		},
+		transformToArrayFormat: function (setting, nodes) {
+			if (!nodes) return [];
+			var childKey = setting.data.key.children,
+			r = [];
+			if (tools.isArray(nodes)) {
+				for (var i=0, l=nodes.length; i<l; i++) {
+					r.push(nodes[i]);
+					if (nodes[i][childKey])
+						r = r.concat(data.transformToArrayFormat(setting, nodes[i][childKey]));
+				}
+			} else {
+				r.push(nodes);
+				if (nodes[childKey])
+					r = r.concat(data.transformToArrayFormat(setting, nodes[childKey]));
+			}
+			return r;
+		},
+		transformTozTreeFormat: function(setting, sNodes) {
+			var i,l,
+			key = setting.data.simpleData.idKey,
+			parentKey = setting.data.simpleData.pIdKey,
+			childKey = setting.data.key.children;
+			if (!key || key=="" || !sNodes) return [];
+
+			if (tools.isArray(sNodes)) {
+				var r = [];
+				var tmpMap = [];
+				for (i=0, l=sNodes.length; i<l; i++) {
+					tmpMap[sNodes[i][key]] = sNodes[i];
+				}
+				for (i=0, l=sNodes.length; i<l; i++) {
+					if (tmpMap[sNodes[i][parentKey]] && sNodes[i][key] != sNodes[i][parentKey]) {
+						if (!tmpMap[sNodes[i][parentKey]][childKey])
+							tmpMap[sNodes[i][parentKey]][childKey] = [];
+						tmpMap[sNodes[i][parentKey]][childKey].push(sNodes[i]);
+					} else {
+						r.push(sNodes[i]);
+					}
+				}
+				return r;
+			}else {
+				return [sNodes];
+			}
+		}
+	},
+	//method of event proxy
+	event = {
+		bindEvent: function(setting) {
+			for (var i=0, j=_init.bind.length; i<j; i++) {
+				_init.bind[i].apply(this, arguments);
+			}
+		},
+		unbindEvent: function(setting) {
+			for (var i=0, j=_init.unbind.length; i<j; i++) {
+				_init.unbind[i].apply(this, arguments);
+			}
+		},
+		bindTree: function(setting) {
+			var eventParam = {
+				treeId: setting.treeId
+			},
+			o = setting.treeObj;
+			if (!setting.view.txtSelectedEnable) {
+				// for can't select text
+				o.bind('selectstart', function(e){
+					var node
+					var n = e.originalEvent.srcElement.nodeName.toLowerCase();
+					return (n === "input" || n === "textarea" );
+				}).css({
+					"-moz-user-select":"-moz-none"
+				});
+			}
+			o.bind('click', eventParam, event.proxy);
+			o.bind('dblclick', eventParam, event.proxy);
+			o.bind('mouseover', eventParam, event.proxy);
+			o.bind('mouseout', eventParam, event.proxy);
+			o.bind('mousedown', eventParam, event.proxy);
+			o.bind('mouseup', eventParam, event.proxy);
+			o.bind('contextmenu', eventParam, event.proxy);
+		},
+		unbindTree: function(setting) {
+			var o = setting.treeObj;
+			o.unbind('click', event.proxy)
+			.unbind('dblclick', event.proxy)
+			.unbind('mouseover', event.proxy)
+			.unbind('mouseout', event.proxy)
+			.unbind('mousedown', event.proxy)
+			.unbind('mouseup', event.proxy)
+			.unbind('contextmenu', event.proxy);
+		},
+		doProxy: function(e) {
+			var results = [];
+			for (var i=0, j=_init.proxys.length; i<j; i++) {
+				var proxyResult = _init.proxys[i].apply(this, arguments);
+				results.push(proxyResult);
+				if (proxyResult.stop) {
+					break;
+				}
+			}
+			return results;
+		},
+		proxy: function(e) {
+			var setting = data.getSetting(e.data.treeId);
+			if (!tools.uCanDo(setting, e)) return true;
+			var results = event.doProxy(e),
+			r = true, x = false;
+			for (var i=0, l=results.length; i<l; i++) {
+				var proxyResult = results[i];
+				if (proxyResult.nodeEventCallback) {
+					x = true;
+					r = proxyResult.nodeEventCallback.apply(proxyResult, [e, proxyResult.node]) && r;
+				}
+				if (proxyResult.treeEventCallback) {
+					x = true;
+					r = proxyResult.treeEventCallback.apply(proxyResult, [e, proxyResult.node]) && r;
+				}
+			}
+			return r;
+		}
+	},
+	//method of event handler
+	handler = {
+		onSwitchNode: function (event, node) {
+			var setting = data.getSetting(event.data.treeId);
+			if (node.open) {
+				if (tools.apply(setting.callback.beforeCollapse, [setting.treeId, node], true) == false) return true;
+				data.getRoot(setting).expandTriggerFlag = true;
+				view.switchNode(setting, node);
+			} else {
+				if (tools.apply(setting.callback.beforeExpand, [setting.treeId, node], true) == false) return true;
+				data.getRoot(setting).expandTriggerFlag = true;
+				view.switchNode(setting, node);
+			}
+			return true;
+		},
+		onClickNode: function (event, node) {
+			var setting = data.getSetting(event.data.treeId),
+			clickFlag = ( (setting.view.autoCancelSelected && event.ctrlKey) && data.isSelectedNode(setting, node)) ? 0 : (setting.view.autoCancelSelected && event.ctrlKey && setting.view.selectedMulti) ? 2 : 1;
+			if (tools.apply(setting.callback.beforeClick, [setting.treeId, node, clickFlag], true) == false) return true;
+			if (clickFlag === 0) {
+				view.cancelPreSelectedNode(setting, node);
+			} else {
+				view.selectNode(setting, node, clickFlag === 2);
+			}
+			setting.treeObj.trigger(consts.event.CLICK, [event, setting.treeId, node, clickFlag]);
+			return true;
+		},
+		onZTreeMousedown: function(event, node) {
+			var setting = data.getSetting(event.data.treeId);
+			if (tools.apply(setting.callback.beforeMouseDown, [setting.treeId, node], true)) {
+				tools.apply(setting.callback.onMouseDown, [event, setting.treeId, node]);
+			}
+			return true;
+		},
+		onZTreeMouseup: function(event, node) {
+			var setting = data.getSetting(event.data.treeId);
+			if (tools.apply(setting.callback.beforeMouseUp, [setting.treeId, node], true)) {
+				tools.apply(setting.callback.onMouseUp, [event, setting.treeId, node]);
+			}
+			return true;
+		},
+		onZTreeDblclick: function(event, node) {
+			var setting = data.getSetting(event.data.treeId);
+			if (tools.apply(setting.callback.beforeDblClick, [setting.treeId, node], true)) {
+				tools.apply(setting.callback.onDblClick, [event, setting.treeId, node]);
+			}
+			return true;
+		},
+		onZTreeContextmenu: function(event, node) {
+			var setting = data.getSetting(event.data.treeId);
+			if (tools.apply(setting.callback.beforeRightClick, [setting.treeId, node], true)) {
+				tools.apply(setting.callback.onRightClick, [event, setting.treeId, node]);
+			}
+			return (typeof setting.callback.onRightClick) != "function";
+		}
+	},
+	//method of tools for zTree
+	tools = {
+		apply: function(fun, param, defaultValue) {
+			if ((typeof fun) == "function") {
+				return fun.apply(zt, param?param:[]);
+			}
+			return defaultValue;
+		},
+		canAsync: function(setting, node) {
+			var childKey = setting.data.key.children;
+			return (setting.async.enable && node && node.isParent && !(node.zAsync || (node[childKey] && node[childKey].length > 0)));
+		},
+		clone: function (obj){
+			if (obj === null) return null;
+			var o = tools.isArray(obj) ? [] : {};
+			for(var i in obj){
+				o[i] = (obj[i] instanceof Date) ? new Date(obj[i].getTime()) : (typeof obj[i] === "object" ? arguments.callee(obj[i]) : obj[i]);
+			}
+			return o;
+		},
+		eqs: function(str1, str2) {
+			return str1.toLowerCase() === str2.toLowerCase();
+		},
+		isArray: function(arr) {
+			return Object.prototype.toString.apply(arr) === "[object Array]";
+		},
+		$: function(node, exp, setting) {
+			if (!!exp && typeof exp != "string") {
+				setting = exp;
+				exp = "";
+			}
+			if (typeof node == "string") {
+				return $(node, setting ? setting.treeObj.get(0).ownerDocument : null);
+			} else {
+				return $("#" + node.tId + exp, setting ? setting.treeObj : null);
+			}
+		},
+		getMDom: function (setting, curDom, targetExpr) {
+			if (!curDom) return null;
+			while (curDom && curDom.id !== setting.treeId) {
+				for (var i=0, l=targetExpr.length; curDom.tagName && i<l; i++) {
+					if (tools.eqs(curDom.tagName, targetExpr[i].tagName) && curDom.getAttribute(targetExpr[i].attrName) !== null) {
+						return curDom;
+					}
+				}
+				curDom = curDom.parentNode;
+			}
+			return null;
+		},
+		getNodeMainDom:function(target) {
+			return ($(target).parent("li").get(0) || $(target).parentsUntil("li").parent().get(0));
+		},
+		isChildOrSelf: function(dom, parentId) {
+			return ( $(dom).closest("#" + parentId).length> 0 );
+		},
+		uCanDo: function(setting, e) {
+			return true;
+		}
+	},
+	//method of operate ztree dom
+	view = {
+		addNodes: function(setting, parentNode, newNodes, isSilent) {
+			if (setting.data.keep.leaf && parentNode && !parentNode.isParent) {
+				return;
+			}
+			if (!tools.isArray(newNodes)) {
+				newNodes = [newNodes];
+			}
+			if (setting.data.simpleData.enable) {
+				newNodes = data.transformTozTreeFormat(setting, newNodes);
+			}
+			if (parentNode) {
+				var target_switchObj = $$(parentNode, consts.id.SWITCH, setting),
+				target_icoObj = $$(parentNode, consts.id.ICON, setting),
+				target_ulObj = $$(parentNode, consts.id.UL, setting);
+
+				if (!parentNode.open) {
+					view.replaceSwitchClass(parentNode, target_switchObj, consts.folder.CLOSE);
+					view.replaceIcoClass(parentNode, target_icoObj, consts.folder.CLOSE);
+					parentNode.open = false;
+					target_ulObj.css({
+						"display": "none"
+					});
+				}
+
+				data.addNodesData(setting, parentNode, newNodes);
+				view.createNodes(setting, parentNode.level + 1, newNodes, parentNode);
+				if (!isSilent) {
+					view.expandCollapseParentNode(setting, parentNode, true);
+				}
+			} else {
+				data.addNodesData(setting, data.getRoot(setting), newNodes);
+				view.createNodes(setting, 0, newNodes, null);
+			}
+		},
+		appendNodes: function(setting, level, nodes, parentNode, initFlag, openFlag) {
+			if (!nodes) return [];
+			var html = [],
+			childKey = setting.data.key.children;
+			for (var i = 0, l = nodes.length; i < l; i++) {
+				var node = nodes[i];
+				if (initFlag) {
+					var tmpPNode = (parentNode) ? parentNode: data.getRoot(setting),
+					tmpPChild = tmpPNode[childKey],
+					isFirstNode = ((tmpPChild.length == nodes.length) && (i == 0)),
+					isLastNode = (i == (nodes.length - 1));
+					data.initNode(setting, level, node, parentNode, isFirstNode, isLastNode, openFlag);
+					data.addNodeCache(setting, node);
+				}
+
+				var childHtml = [];
+				if (node[childKey] && node[childKey].length > 0) {
+					//make child html first, because checkType
+					childHtml = view.appendNodes(setting, level + 1, node[childKey], node, initFlag, openFlag && node.open);
+				}
+				if (openFlag) {
+
+					view.makeDOMNodeMainBefore(html, setting, node);
+					view.makeDOMNodeLine(html, setting, node);
+					data.getBeforeA(setting, node, html);
+					view.makeDOMNodeNameBefore(html, setting, node);
+					data.getInnerBeforeA(setting, node, html);
+					view.makeDOMNodeIcon(html, setting, node);
+					data.getInnerAfterA(setting, node, html);
+					view.makeDOMNodeNameAfter(html, setting, node);
+					data.getAfterA(setting, node, html);
+					if (node.isParent && node.open) {
+						view.makeUlHtml(setting, node, html, childHtml.join(''));
+					}
+					view.makeDOMNodeMainAfter(html, setting, node);
+					data.addCreatedNode(setting, node);
+				}
+			}
+			return html;
+		},
+		appendParentULDom: function(setting, node) {
+			var html = [],
+			nObj = $$(node, setting);
+			if (!nObj.get(0) && !!node.parentTId) {
+				view.appendParentULDom(setting, node.getParentNode());
+				nObj = $$(node, setting);
+			}
+			var ulObj = $$(node, consts.id.UL, setting);
+			if (ulObj.get(0)) {
+				ulObj.remove();
+			}
+			var childKey = setting.data.key.children,
+			childHtml = view.appendNodes(setting, node.level+1, node[childKey], node, false, true);
+			view.makeUlHtml(setting, node, html, childHtml.join(''));
+			nObj.append(html.join(''));
+		},
+		asyncNode: function(setting, node, isSilent, callback) {
+			var i, l;
+			if (node && !node.isParent) {
+				tools.apply(callback);
+				return false;
+			} else if (node && node.isAjaxing) {
+				return false;
+			} else if (tools.apply(setting.callback.beforeAsync, [setting.treeId, node], true) == false) {
+				tools.apply(callback);
+				return false;
+			}
+			if (node) {
+				node.isAjaxing = true;
+				var icoObj = $$(node, consts.id.ICON, setting);
+				icoObj.attr({"style":"", "class":consts.className.BUTTON + " " + consts.className.ICO_LOADING});
+			}
+
+			var tmpParam = {};
+			for (i = 0, l = setting.async.autoParam.length; node && i < l; i++) {
+				var pKey = setting.async.autoParam[i].split("="), spKey = pKey;
+				if (pKey.length>1) {
+					spKey = pKey[1];
+					pKey = pKey[0];
+				}
+				tmpParam[spKey] = node[pKey];
+			}
+			if (tools.isArray(setting.async.otherParam)) {
+				for (i = 0, l = setting.async.otherParam.length; i < l; i += 2) {
+					tmpParam[setting.async.otherParam[i]] = setting.async.otherParam[i + 1];
+				}
+			} else {
+				for (var p in setting.async.otherParam) {
+					tmpParam[p] = setting.async.otherParam[p];
+				}
+			}
+
+			var _tmpV = data.getRoot(setting)._ver;
+			$.ajax({
+				contentType: setting.async.contentType,
+				type: setting.async.type,
+				url: tools.apply(setting.async.url, [setting.treeId, node], setting.async.url),
+				data: tmpParam,
+				dataType: setting.async.dataType,
+				success: function(msg) {
+					if (_tmpV != data.getRoot(setting)._ver) {
+						return;
+					}
+					var newNodes = [];
+					try {
+						if (!msg || msg.length == 0) {
+							newNodes = [];
+						} else if (typeof msg == "string") {
+							newNodes = eval("(" + msg + ")");
+						} else {
+							newNodes = msg;
+						}
+					} catch(err) {
+						newNodes = msg;
+					}
+
+					if (node) {
+						node.isAjaxing = null;
+						node.zAsync = true;
+					}
+					view.setNodeLineIcos(setting, node);
+					if (newNodes && newNodes !== "") {
+						newNodes = tools.apply(setting.async.dataFilter, [setting.treeId, node, newNodes], newNodes);
+						view.addNodes(setting, node, !!newNodes ? tools.clone(newNodes) : [], !!isSilent);
+					} else {
+						view.addNodes(setting, node, [], !!isSilent);
+					}
+					setting.treeObj.trigger(consts.event.ASYNC_SUCCESS, [setting.treeId, node, msg]);
+					tools.apply(callback);
+				},
+				error: function(XMLHttpRequest, textStatus, errorThrown) {
+					if (_tmpV != data.getRoot(setting)._ver) {
+						return;
+					}
+					if (node) node.isAjaxing = null;
+					view.setNodeLineIcos(setting, node);
+					setting.treeObj.trigger(consts.event.ASYNC_ERROR, [setting.treeId, node, XMLHttpRequest, textStatus, errorThrown]);
+				}
+			});
+			return true;
+		},
+		cancelPreSelectedNode: function (setting, node) {
+			var list = data.getRoot(setting).curSelectedList;
+			for (var i=0, j=list.length-1; j>=i; j--) {
+				if (!node || node === list[j]) {
+					$$(list[j], consts.id.A, setting).removeClass(consts.node.CURSELECTED);
+					if (node) {
+						data.removeSelectedNode(setting, node);
+						break;
+					}
+				}
+			}
+			if (!node) data.getRoot(setting).curSelectedList = [];
+		},
+		createNodeCallback: function(setting) {
+			if (!!setting.callback.onNodeCreated || !!setting.view.addDiyDom) {
+				var root = data.getRoot(setting);
+				while (root.createdNodes.length>0) {
+					var node = root.createdNodes.shift();
+					tools.apply(setting.view.addDiyDom, [setting.treeId, node]);
+					if (!!setting.callback.onNodeCreated) {
+						setting.treeObj.trigger(consts.event.NODECREATED, [setting.treeId, node]);
+					}
+				}
+			}
+		},
+		createNodes: function(setting, level, nodes, parentNode) {
+			if (!nodes || nodes.length == 0) return;
+			var root = data.getRoot(setting),
+			childKey = setting.data.key.children,
+			openFlag = !parentNode || parentNode.open || !!$$(parentNode[childKey][0], setting).get(0);
+			root.createdNodes = [];
+			var zTreeHtml = view.appendNodes(setting, level, nodes, parentNode, true, openFlag);
+			if (!parentNode) {
+				setting.treeObj.append(zTreeHtml.join(''));
+			} else {
+				var ulObj = $$(parentNode, consts.id.UL, setting);
+				if (ulObj.get(0)) {
+					ulObj.append(zTreeHtml.join(''));
+				}
+			}
+			view.createNodeCallback(setting);
+		},
+		destroy: function(setting) {
+			if (!setting) return;
+			data.initCache(setting);
+			data.initRoot(setting);
+			event.unbindTree(setting);
+			event.unbindEvent(setting);
+			setting.treeObj.empty();
+		},
+		expandCollapseNode: function(setting, node, expandFlag, animateFlag, callback) {
+			var root = data.getRoot(setting),
+			childKey = setting.data.key.children;
+			if (!node) {
+				tools.apply(callback, []);
+				return;
+			}
+			if (root.expandTriggerFlag) {
+				var _callback = callback;
+				callback = function(){
+					if (_callback) _callback();
+					if (node.open) {
+						setting.treeObj.trigger(consts.event.EXPAND, [setting.treeId, node]);
+					} else {
+						setting.treeObj.trigger(consts.event.COLLAPSE, [setting.treeId, node]);
+					}
+				};
+				root.expandTriggerFlag = false;
+			}
+			if (!node.open && node.isParent && ((!$$(node, consts.id.UL, setting).get(0)) || (node[childKey] && node[childKey].length>0 && !$$(node[childKey][0], setting).get(0)))) {
+				view.appendParentULDom(setting, node);
+				view.createNodeCallback(setting);
+			}
+			if (node.open == expandFlag) {
+				tools.apply(callback, []);
+				return;
+			}
+			var ulObj = $$(node, consts.id.UL, setting),
+			switchObj = $$(node, consts.id.SWITCH, setting),
+			icoObj = $$(node, consts.id.ICON, setting);
+
+			if (node.isParent) {
+				node.open = !node.open;
+				if (node.iconOpen && node.iconClose) {
+					icoObj.attr("style", view.makeNodeIcoStyle(setting, node));
+				}
+
+				if (node.open) {
+					view.replaceSwitchClass(node, switchObj, consts.folder.OPEN);
+					view.replaceIcoClass(node, icoObj, consts.folder.OPEN);
+					if (animateFlag == false || setting.view.expandSpeed == "") {
+						ulObj.show();
+						tools.apply(callback, []);
+					} else {
+						if (node[childKey] && node[childKey].length > 0) {
+							ulObj.slideDown(setting.view.expandSpeed, callback);
+						} else {
+							ulObj.show();
+							tools.apply(callback, []);
+						}
+					}
+				} else {
+					view.replaceSwitchClass(node, switchObj, consts.folder.CLOSE);
+					view.replaceIcoClass(node, icoObj, consts.folder.CLOSE);
+					if (animateFlag == false || setting.view.expandSpeed == "" || !(node[childKey] && node[childKey].length > 0)) {
+						ulObj.hide();
+						tools.apply(callback, []);
+					} else {
+						ulObj.slideUp(setting.view.expandSpeed, callback);
+					}
+				}
+			} else {
+				tools.apply(callback, []);
+			}
+		},
+		expandCollapseParentNode: function(setting, node, expandFlag, animateFlag, callback) {
+			if (!node) return;
+			if (!node.parentTId) {
+				view.expandCollapseNode(setting, node, expandFlag, animateFlag, callback);
+				return;
+			} else {
+				view.expandCollapseNode(setting, node, expandFlag, animateFlag);
+			}
+			if (node.parentTId) {
+				view.expandCollapseParentNode(setting, node.getParentNode(), expandFlag, animateFlag, callback);
+			}
+		},
+		expandCollapseSonNode: function(setting, node, expandFlag, animateFlag, callback) {
+			var root = data.getRoot(setting),
+			childKey = setting.data.key.children,
+			treeNodes = (node) ? node[childKey]: root[childKey],
+			selfAnimateSign = (node) ? false : animateFlag,
+			expandTriggerFlag = data.getRoot(setting).expandTriggerFlag;
+			data.getRoot(setting).expandTriggerFlag = false;
+			if (treeNodes) {
+				for (var i = 0, l = treeNodes.length; i < l; i++) {
+					if (treeNodes[i]) view.expandCollapseSonNode(setting, treeNodes[i], expandFlag, selfAnimateSign);
+				}
+			}
+			data.getRoot(setting).expandTriggerFlag = expandTriggerFlag;
+			view.expandCollapseNode(setting, node, expandFlag, animateFlag, callback );
+		},
+		makeDOMNodeIcon: function(html, setting, node) {
+			var nameStr = data.getNodeName(setting, node),
+			name = setting.view.nameIsHTML ? nameStr : nameStr.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;');
+			html.push("<span id='", node.tId, consts.id.ICON,
+				"' title='' treeNode", consts.id.ICON," class='", view.makeNodeIcoClass(setting, node),
+				"' style='", view.makeNodeIcoStyle(setting, node), "'></span><span id='", node.tId, consts.id.SPAN,
+				"'>",name,"</span>");
+		},
+		makeDOMNodeLine: function(html, setting, node) {
+			html.push("<span id='", node.tId, consts.id.SWITCH,	"' title='' class='", view.makeNodeLineClass(setting, node), "' treeNode", consts.id.SWITCH,"></span>");
+		},
+		makeDOMNodeMainAfter: function(html, setting, node) {
+			html.push("</li>");
+		},
+		makeDOMNodeMainBefore: function(html, setting, node) {
+			html.push("<li id='", node.tId, "' class='", consts.className.LEVEL, node.level,"' tabindex='0' hidefocus='true' treenode>");
+		},
+		makeDOMNodeNameAfter: function(html, setting, node) {
+			html.push("</a>");
+		},
+		makeDOMNodeNameBefore: function(html, setting, node) {
+			var title = data.getNodeTitle(setting, node),
+			url = view.makeNodeUrl(setting, node),
+			fontcss = view.makeNodeFontCss(setting, node),
+			fontStyle = [];
+			for (var f in fontcss) {
+				fontStyle.push(f, ":", fontcss[f], ";");
+			}
+			html.push("<a id='", node.tId, consts.id.A, "' class='", consts.className.LEVEL, node.level,"' treeNode", consts.id.A," onclick=\"", (node.click || ''),
+				"\" ", ((url != null && url.length > 0) ? "href='" + url + "'" : ""), " target='",view.makeNodeTarget(node),"' style='", fontStyle.join(''),
+				"'");
+			if (tools.apply(setting.view.showTitle, [setting.treeId, node], setting.view.showTitle) && title) {html.push("title='", title.replace(/'/g,"&#39;").replace(/</g,'&lt;').replace(/>/g,'&gt;'),"'");}
+			html.push(">");
+		},
+		makeNodeFontCss: function(setting, node) {
+			var fontCss = tools.apply(setting.view.fontCss, [setting.treeId, node], setting.view.fontCss);
+			return (fontCss && ((typeof fontCss) != "function")) ? fontCss : {};
+		},
+		makeNodeIcoClass: function(setting, node) {
+			var icoCss = ["ico"];
+			if (!node.isAjaxing) {
+				icoCss[0] = (node.iconSkin ? node.iconSkin + "_" : "") + icoCss[0];
+				if (node.isParent) {
+					icoCss.push(node.open ? consts.folder.OPEN : consts.folder.CLOSE);
+				} else {
+					icoCss.push(consts.folder.DOCU);
+				}
+			}
+			return consts.className.BUTTON + " " + icoCss.join('_');
+		},
+		makeNodeIcoStyle: function(setting, node) {
+			var icoStyle = [];
+			if (!node.isAjaxing) {
+				var icon = (node.isParent && node.iconOpen && node.iconClose) ? (node.open ? node.iconOpen : node.iconClose) : node.icon;
+				if (icon) icoStyle.push("background:url(", icon, ") 0 0 no-repeat;");
+				if (setting.view.showIcon == false || !tools.apply(setting.view.showIcon, [setting.treeId, node], true)) {
+					icoStyle.push("width:0px;height:0px;");
+				}
+			}
+			return icoStyle.join('');
+		},
+		makeNodeLineClass: function(setting, node) {
+			var lineClass = [];
+			if (setting.view.showLine) {
+				if (node.level == 0 && node.isFirstNode && node.isLastNode) {
+					lineClass.push(consts.line.ROOT);
+				} else if (node.level == 0 && node.isFirstNode) {
+					lineClass.push(consts.line.ROOTS);
+				} else if (node.isLastNode) {
+					lineClass.push(consts.line.BOTTOM);
+				} else {
+					lineClass.push(consts.line.CENTER);
+				}
+			} else {
+				lineClass.push(consts.line.NOLINE);
+			}
+			if (node.isParent) {
+				lineClass.push(node.open ? consts.folder.OPEN : consts.folder.CLOSE);
+			} else {
+				lineClass.push(consts.folder.DOCU);
+			}
+			return view.makeNodeLineClassEx(node) + lineClass.join('_');
+		},
+		makeNodeLineClassEx: function(node) {
+			return consts.className.BUTTON + " " + consts.className.LEVEL + node.level + " " + consts.className.SWITCH + " ";
+		},
+		makeNodeTarget: function(node) {
+			return (node.target || "_blank");
+		},
+		makeNodeUrl: function(setting, node) {
+			var urlKey = setting.data.key.url;
+			return node[urlKey] ? node[urlKey] : null;
+		},
+		makeUlHtml: function(setting, node, html, content) {
+			html.push("<ul id='", node.tId, consts.id.UL, "' class='", consts.className.LEVEL, node.level, " ", view.makeUlLineClass(setting, node), "' style='display:", (node.open ? "block": "none"),"'>");
+			html.push(content);
+			html.push("</ul>");
+		},
+		makeUlLineClass: function(setting, node) {
+			return ((setting.view.showLine && !node.isLastNode) ? consts.line.LINE : "");
+		},
+		removeChildNodes: function(setting, node) {
+			if (!node) return;
+			var childKey = setting.data.key.children,
+			nodes = node[childKey];
+			if (!nodes) return;
+
+			for (var i = 0, l = nodes.length; i < l; i++) {
+				data.removeNodeCache(setting, nodes[i]);
+			}
+			data.removeSelectedNode(setting);
+			delete node[childKey];
+
+			if (!setting.data.keep.parent) {
+				node.isParent = false;
+				node.open = false;
+				var tmp_switchObj = $$(node, consts.id.SWITCH, setting),
+				tmp_icoObj = $$(node, consts.id.ICON, setting);
+				view.replaceSwitchClass(node, tmp_switchObj, consts.folder.DOCU);
+				view.replaceIcoClass(node, tmp_icoObj, consts.folder.DOCU);
+				$$(node, consts.id.UL, setting).remove();
+			} else {
+				$$(node, consts.id.UL, setting).empty();
+			}
+		},
+		setFirstNode: function(setting, parentNode) {
+			var childKey = setting.data.key.children, childLength = parentNode[childKey].length;
+			if ( childLength > 0) {
+				parentNode[childKey][0].isFirstNode = true;
+			}
+		},
+		setLastNode: function(setting, parentNode) {
+			var childKey = setting.data.key.children, childLength = parentNode[childKey].length;
+			if ( childLength > 0) {
+				parentNode[childKey][childLength - 1].isLastNode = true;
+			}
+		},
+		removeNode: function(setting, node) {
+			var root = data.getRoot(setting),
+			childKey = setting.data.key.children,
+			parentNode = (node.parentTId) ? node.getParentNode() : root;
+
+			node.isFirstNode = false;
+			node.isLastNode = false;
+			node.getPreNode = function() {return null;};
+			node.getNextNode = function() {return null;};
+
+			if (!data.getNodeCache(setting, node.tId)) {
+				return;
+			}
+
+			$$(node, setting).remove();
+			data.removeNodeCache(setting, node);
+			data.removeSelectedNode(setting, node);
+
+			for (var i = 0, l = parentNode[childKey].length; i < l; i++) {
+				if (parentNode[childKey][i].tId == node.tId) {
+					parentNode[childKey].splice(i, 1);
+					break;
+				}
+			}
+			view.setFirstNode(setting, parentNode);
+			view.setLastNode(setting, parentNode);
+
+			var tmp_ulObj,tmp_switchObj,tmp_icoObj,
+			childLength = parentNode[childKey].length;
+
+			//repair nodes old parent
+			if (!setting.data.keep.parent && childLength == 0) {
+				//old parentNode has no child nodes
+				parentNode.isParent = false;
+				parentNode.open = false;
+				tmp_ulObj = $$(parentNode, consts.id.UL, setting);
+				tmp_switchObj = $$(parentNode, consts.id.SWITCH, setting);
+				tmp_icoObj = $$(parentNode, consts.id.ICON, setting);
+				view.replaceSwitchClass(parentNode, tmp_switchObj, consts.folder.DOCU);
+				view.replaceIcoClass(parentNode, tmp_icoObj, consts.folder.DOCU);
+				tmp_ulObj.css("display", "none");
+
+			} else if (setting.view.showLine && childLength > 0) {
+				//old parentNode has child nodes
+				var newLast = parentNode[childKey][childLength - 1];
+				tmp_ulObj = $$(newLast, consts.id.UL, setting);
+				tmp_switchObj = $$(newLast, consts.id.SWITCH, setting);
+				tmp_icoObj = $$(newLast, consts.id.ICON, setting);
+				if (parentNode == root) {
+					if (parentNode[childKey].length == 1) {
+						//node was root, and ztree has only one root after move node
+						view.replaceSwitchClass(newLast, tmp_switchObj, consts.line.ROOT);
+					} else {
+						var tmp_first_switchObj = $$(parentNode[childKey][0], consts.id.SWITCH, setting);
+						view.replaceSwitchClass(parentNode[childKey][0], tmp_first_switchObj, consts.line.ROOTS);
+						view.replaceSwitchClass(newLast, tmp_switchObj, consts.line.BOTTOM);
+					}
+				} else {
+					view.replaceSwitchClass(newLast, tmp_switchObj, consts.line.BOTTOM);
+				}
+				tmp_ulObj.removeClass(consts.line.LINE);
+			}
+		},
+		replaceIcoClass: function(node, obj, newName) {
+			if (!obj || node.isAjaxing) return;
+			var tmpName = obj.attr("class");
+			if (tmpName == undefined) return;
+			var tmpList = tmpName.split("_");
+			switch (newName) {
+				case consts.folder.OPEN:
+				case consts.folder.CLOSE:
+				case consts.folder.DOCU:
+					tmpList[tmpList.length-1] = newName;
+					break;
+			}
+			obj.attr("class", tmpList.join("_"));
+		},
+		replaceSwitchClass: function(node, obj, newName) {
+			if (!obj) return;
+			var tmpName = obj.attr("class");
+			if (tmpName == undefined) return;
+			var tmpList = tmpName.split("_");
+			switch (newName) {
+				case consts.line.ROOT:
+				case consts.line.ROOTS:
+				case consts.line.CENTER:
+				case consts.line.BOTTOM:
+				case consts.line.NOLINE:
+					tmpList[0] = view.makeNodeLineClassEx(node) + newName;
+					break;
+				case consts.folder.OPEN:
+				case consts.folder.CLOSE:
+				case consts.folder.DOCU:
+					tmpList[1] = newName;
+					break;
+			}
+			obj.attr("class", tmpList.join("_"));
+			if (newName !== consts.folder.DOCU) {
+				obj.removeAttr("disabled");
+			} else {
+				obj.attr("disabled", "disabled");
+			}
+		},
+		selectNode: function(setting, node, addFlag) {
+			if (!addFlag) {
+				view.cancelPreSelectedNode(setting);
+			}
+			$$(node, consts.id.A, setting).addClass(consts.node.CURSELECTED);
+			data.addSelectedNode(setting, node);
+		},
+		setNodeFontCss: function(setting, treeNode) {
+			var aObj = $$(treeNode, consts.id.A, setting),
+			fontCss = view.makeNodeFontCss(setting, treeNode);
+			if (fontCss) {
+				aObj.css(fontCss);
+			}
+		},
+		setNodeLineIcos: function(setting, node) {
+			if (!node) return;
+			var switchObj = $$(node, consts.id.SWITCH, setting),
+			ulObj = $$(node, consts.id.UL, setting),
+			icoObj = $$(node, consts.id.ICON, setting),
+			ulLine = view.makeUlLineClass(setting, node);
+			if (ulLine.length==0) {
+				ulObj.removeClass(consts.line.LINE);
+			} else {
+				ulObj.addClass(ulLine);
+			}
+			switchObj.attr("class", view.makeNodeLineClass(setting, node));
+			if (node.isParent) {
+				switchObj.removeAttr("disabled");
+			} else {
+				switchObj.attr("disabled", "disabled");
+			}
+			icoObj.removeAttr("style");
+			icoObj.attr("style", view.makeNodeIcoStyle(setting, node));
+			icoObj.attr("class", view.makeNodeIcoClass(setting, node));
+		},
+		setNodeName: function(setting, node) {
+			var title = data.getNodeTitle(setting, node),
+			nObj = $$(node, consts.id.SPAN, setting);
+			nObj.empty();
+			if (setting.view.nameIsHTML) {
+				nObj.html(data.getNodeName(setting, node));
+			} else {
+				nObj.text(data.getNodeName(setting, node));
+			}
+			if (tools.apply(setting.view.showTitle, [setting.treeId, node], setting.view.showTitle)) {
+				var aObj = $$(node, consts.id.A, setting);
+				aObj.attr("title", !title ? "" : title);
+			}
+		},
+		setNodeTarget: function(setting, node) {
+			var aObj = $$(node, consts.id.A, setting);
+			aObj.attr("target", view.makeNodeTarget(node));
+		},
+		setNodeUrl: function(setting, node) {
+			var aObj = $$(node, consts.id.A, setting),
+			url = view.makeNodeUrl(setting, node);
+			if (url == null || url.length == 0) {
+				aObj.removeAttr("href");
+			} else {
+				aObj.attr("href", url);
+			}
+		},
+		switchNode: function(setting, node) {
+			if (node.open || !tools.canAsync(setting, node)) {
+				view.expandCollapseNode(setting, node, !node.open);
+			} else if (setting.async.enable) {
+				if (!view.asyncNode(setting, node)) {
+					view.expandCollapseNode(setting, node, !node.open);
+					return;
+				}
+			} else if (node) {
+				view.expandCollapseNode(setting, node, !node.open);
+			}
+		}
+	};
+	// zTree defind
+	$.fn.zTree = {
+		consts : _consts,
+		_z : {
+			tools: tools,
+			view: view,
+			event: event,
+			data: data
+		},
+		getZTreeObj: function(treeId) {
+			var o = data.getZTreeTools(treeId);
+			return o ? o : null;
+		},
+		destroy: function(treeId) {
+			if (!!treeId && treeId.length > 0) {
+				view.destroy(data.getSetting(treeId));
+			} else {
+				for(var s in settings) {
+					view.destroy(settings[s]);
+				}
+			}
+		},
+		init: function(obj, zSetting, zNodes) {
+			var setting = tools.clone(_setting);
+			$.extend(true, setting, zSetting);
+			setting.treeId = obj.attr("id");
+			setting.treeObj = obj;
+			setting.treeObj.empty();
+			settings[setting.treeId] = setting;
+			//For some older browser,(e.g., ie6)
+			if(typeof document.body.style.maxHeight === "undefined") {
+				setting.view.expandSpeed = "";
+			}
+			data.initRoot(setting);
+			var root = data.getRoot(setting),
+			childKey = setting.data.key.children;
+			zNodes = zNodes ? tools.clone(tools.isArray(zNodes)? zNodes : [zNodes]) : [];
+			if (setting.data.simpleData.enable) {
+				root[childKey] = data.transformTozTreeFormat(setting, zNodes);
+			} else {
+				root[childKey] = zNodes;
+			}
+
+			data.initCache(setting);
+			event.unbindTree(setting);
+			event.bindTree(setting);
+			event.unbindEvent(setting);
+			event.bindEvent(setting);
+
+			var zTreeTools = {
+				setting : setting,
+				addNodes : function(parentNode, newNodes, isSilent) {
+					if (!newNodes) return null;
+					if (!parentNode) parentNode = null;
+					if (parentNode && !parentNode.isParent && setting.data.keep.leaf) return null;
+					var xNewNodes = tools.clone(tools.isArray(newNodes)? newNodes: [newNodes]);
+					function addCallback() {
+						view.addNodes(setting, parentNode, xNewNodes, (isSilent==true));
+					}
+
+					if (tools.canAsync(setting, parentNode)) {
+						view.asyncNode(setting, parentNode, isSilent, addCallback);
+					} else {
+						addCallback();
+					}
+					return xNewNodes;
+				},
+				cancelSelectedNode : function(node) {
+					view.cancelPreSelectedNode(setting, node);
+				},
+				destroy : function() {
+					view.destroy(setting);
+				},
+				expandAll : function(expandFlag) {
+					expandFlag = !!expandFlag;
+					view.expandCollapseSonNode(setting, null, expandFlag, true);
+					return expandFlag;
+				},
+				expandNode : function(node, expandFlag, sonSign, focus, callbackFlag) {
+					if (!node || !node.isParent) return null;
+					if (expandFlag !== true && expandFlag !== false) {
+						expandFlag = !node.open;
+					}
+					callbackFlag = !!callbackFlag;
+
+					if (callbackFlag && expandFlag && (tools.apply(setting.callback.beforeExpand, [setting.treeId, node], true) == false)) {
+						return null;
+					} else if (callbackFlag && !expandFlag && (tools.apply(setting.callback.beforeCollapse, [setting.treeId, node], true) == false)) {
+						return null;
+					}
+					if (expandFlag && node.parentTId) {
+						view.expandCollapseParentNode(setting, node.getParentNode(), expandFlag, false);
+					}
+					if (expandFlag === node.open && !sonSign) {
+						return null;
+					}
+
+					data.getRoot(setting).expandTriggerFlag = callbackFlag;
+					if (!tools.canAsync(setting, node) && sonSign) {
+						view.expandCollapseSonNode(setting, node, expandFlag, true, function() {
+							if (focus !== false) {try{$$(node, setting).focus().blur();}catch(e){}}
+						});
+					} else {
+						node.open = !expandFlag;
+						view.switchNode(this.setting, node);
+						if (focus !== false) {try{$$(node, setting).focus().blur();}catch(e){}}
+					}
+					return expandFlag;
+				},
+				getNodes : function() {
+					return data.getNodes(setting);
+				},
+				getNodeByParam : function(key, value, parentNode) {
+					if (!key) return null;
+					return data.getNodeByParam(setting, parentNode?parentNode[setting.data.key.children]:data.getNodes(setting), key, value);
+				},
+				getNodeByTId : function(tId) {
+					return data.getNodeCache(setting, tId);
+				},
+				getNodesByParam : function(key, value, parentNode) {
+					if (!key) return null;
+					return data.getNodesByParam(setting, parentNode?parentNode[setting.data.key.children]:data.getNodes(setting), key, value);
+				},
+				getNodesByParamFuzzy : function(key, value, parentNode) {
+					if (!key) return null;
+					return data.getNodesByParamFuzzy(setting, parentNode?parentNode[setting.data.key.children]:data.getNodes(setting), key, value);
+				},
+				getNodesByFilter: function(filter, isSingle, parentNode, invokeParam) {
+					isSingle = !!isSingle;
+					if (!filter || (typeof filter != "function")) return (isSingle ? null : []);
+					return data.getNodesByFilter(setting, parentNode?parentNode[setting.data.key.children]:data.getNodes(setting), filter, isSingle, invokeParam);
+				},
+				getNodeIndex : function(node) {
+					if (!node) return null;
+					var childKey = setting.data.key.children,
+					parentNode = (node.parentTId) ? node.getParentNode() : data.getRoot(setting);
+					for (var i=0, l = parentNode[childKey].length; i < l; i++) {
+						if (parentNode[childKey][i] == node) return i;
+					}
+					return -1;
+				},
+				getSelectedNodes : function() {
+					var r = [], list = data.getRoot(setting).curSelectedList;
+					for (var i=0, l=list.length; i<l; i++) {
+						r.push(list[i]);
+					}
+					return r;
+				},
+				isSelectedNode : function(node) {
+					return data.isSelectedNode(setting, node);
+				},
+				reAsyncChildNodes : function(parentNode, reloadType, isSilent) {
+					if (!this.setting.async.enable) return;
+					var isRoot = !parentNode;
+					if (isRoot) {
+						parentNode = data.getRoot(setting);
+					}
+					if (reloadType=="refresh") {
+						var childKey = this.setting.data.key.children;
+						for (var i = 0, l = parentNode[childKey] ? parentNode[childKey].length : 0; i < l; i++) {
+							data.removeNodeCache(setting, parentNode[childKey][i]);
+						}
+						data.removeSelectedNode(setting);
+						parentNode[childKey] = [];
+						if (isRoot) {
+							this.setting.treeObj.empty();
+						} else {
+							var ulObj = $$(parentNode, consts.id.UL, setting);
+							ulObj.empty();
+						}
+					}
+					view.asyncNode(this.setting, isRoot? null:parentNode, !!isSilent);
+				},
+				refresh : function() {
+					this.setting.treeObj.empty();
+					var root = data.getRoot(setting),
+					nodes = root[setting.data.key.children]
+					data.initRoot(setting);
+					root[setting.data.key.children] = nodes
+					data.initCache(setting);
+					view.createNodes(setting, 0, root[setting.data.key.children]);
+				},
+				removeChildNodes : function(node) {
+					if (!node) return null;
+					var childKey = setting.data.key.children,
+					nodes = node[childKey];
+					view.removeChildNodes(setting, node);
+					return nodes ? nodes : null;
+				},
+				removeNode : function(node, callbackFlag) {
+					if (!node) return;
+					callbackFlag = !!callbackFlag;
+					if (callbackFlag && tools.apply(setting.callback.beforeRemove, [setting.treeId, node], true) == false) return;
+					view.removeNode(setting, node);
+					if (callbackFlag) {
+						this.setting.treeObj.trigger(consts.event.REMOVE, [setting.treeId, node]);
+					}
+				},
+				selectNode : function(node, addFlag) {
+					if (!node) return;
+					if (tools.uCanDo(setting)) {
+						addFlag = setting.view.selectedMulti && addFlag;
+						if (node.parentTId) {
+							view.expandCollapseParentNode(setting, node.getParentNode(), true, false, function() {
+								try{$$(node, setting).focus().blur();}catch(e){}
+							});
+						} else {
+							try{$$(node, setting).focus().blur();}catch(e){}
+						}
+						view.selectNode(setting, node, addFlag);
+					}
+				},
+				transformTozTreeNodes : function(simpleNodes) {
+					return data.transformTozTreeFormat(setting, simpleNodes);
+				},
+				transformToArray : function(nodes) {
+					return data.transformToArrayFormat(setting, nodes);
+				},
+				updateNode : function(node, checkTypeFlag) {
+					if (!node) return;
+					var nObj = $$(node, setting);
+					if (nObj.get(0) && tools.uCanDo(setting)) {
+						view.setNodeName(setting, node);
+						view.setNodeTarget(setting, node);
+						view.setNodeUrl(setting, node);
+						view.setNodeLineIcos(setting, node);
+						view.setNodeFontCss(setting, node);
+					}
+				}
+			}
+			root.treeTools = zTreeTools;
+			data.setZTreeTools(setting, zTreeTools);
+
+			if (root[childKey] && root[childKey].length > 0) {
+				view.createNodes(setting, 0, root[childKey]);
+			} else if (setting.async.enable && setting.async.url && setting.async.url !== '') {
+				view.asyncNode(setting);
+			}
+			return zTreeTools;
+		}
+	};
+
+	var zt = $.fn.zTree,
+	$$ = tools.$,
+	consts = zt.consts;
+})(jQuery);
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/js/jquery.ztree.core-3.5.min.js b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/js/jquery.ztree.core-3.5.min.js
new file mode 100644
index 0000000..42ab8b4
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/js/jquery.ztree.core-3.5.min.js
@@ -0,0 +1,68 @@
+/*
+ * JQuery zTree core v3.5.15
+ * http://zTree.me/
+ *
+ * Copyright (c) 2010 Hunter.z
+ *
+ * Licensed same as jquery - MIT License
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ * email: hunter.z@263.net
+ * Date: 2013-10-15
+ */
+(function(p){var G,H,I,J,K,L,r={},u={},v={},M={treeId:"",treeObj:null,view:{addDiyDom:null,autoCancelSelected:!0,dblClickExpand:!0,expandSpeed:"fast",fontCss:{},nameIsHTML:!1,selectedMulti:!0,showIcon:!0,showLine:!0,showTitle:!0,txtSelectedEnable:!1},data:{key:{children:"children",name:"name",title:"",url:"url"},simpleData:{enable:!1,idKey:"id",pIdKey:"pId",rootPId:null},keep:{parent:!1,leaf:!1}},async:{enable:!1,contentType:"application/x-www-form-urlencoded",type:"post",dataType:"text",url:"",autoParam:[],
+otherParam:[],dataFilter:null},callback:{beforeAsync:null,beforeClick:null,beforeDblClick:null,beforeRightClick:null,beforeMouseDown:null,beforeMouseUp:null,beforeExpand:null,beforeCollapse:null,beforeRemove:null,onAsyncError:null,onAsyncSuccess:null,onNodeCreated:null,onClick:null,onDblClick:null,onRightClick:null,onMouseDown:null,onMouseUp:null,onExpand:null,onCollapse:null,onRemove:null}},w=[function(b){var a=b.treeObj,c=e.event;a.bind(c.NODECREATED,function(a,c,g){j.apply(b.callback.onNodeCreated,
+[a,c,g])});a.bind(c.CLICK,function(a,c,g,l,h){j.apply(b.callback.onClick,[c,g,l,h])});a.bind(c.EXPAND,function(a,c,g){j.apply(b.callback.onExpand,[a,c,g])});a.bind(c.COLLAPSE,function(a,c,g){j.apply(b.callback.onCollapse,[a,c,g])});a.bind(c.ASYNC_SUCCESS,function(a,c,g,l){j.apply(b.callback.onAsyncSuccess,[a,c,g,l])});a.bind(c.ASYNC_ERROR,function(a,c,g,l,h,e){j.apply(b.callback.onAsyncError,[a,c,g,l,h,e])})}],x=[function(b){var a=e.event;b.treeObj.unbind(a.NODECREATED).unbind(a.CLICK).unbind(a.EXPAND).unbind(a.COLLAPSE).unbind(a.ASYNC_SUCCESS).unbind(a.ASYNC_ERROR)}],
+y=[function(b){var a=h.getCache(b);a||(a={},h.setCache(b,a));a.nodes=[];a.doms=[]}],z=[function(b,a,c,d,f,g){if(c){var l=h.getRoot(b),e=b.data.key.children;c.level=a;c.tId=b.treeId+"_"+ ++l.zId;c.parentTId=d?d.tId:null;c.open=typeof c.open=="string"?j.eqs(c.open,"true"):!!c.open;c[e]&&c[e].length>0?(c.isParent=!0,c.zAsync=!0):(c.isParent=typeof c.isParent=="string"?j.eqs(c.isParent,"true"):!!c.isParent,c.open=c.isParent&&!b.async.enable?c.open:!1,c.zAsync=!c.isParent);c.isFirstNode=f;c.isLastNode=
+g;c.getParentNode=function(){return h.getNodeCache(b,c.parentTId)};c.getPreNode=function(){return h.getPreNode(b,c)};c.getNextNode=function(){return h.getNextNode(b,c)};c.isAjaxing=!1;h.fixPIdKeyValue(b,c)}}],s=[function(b){var a=b.target,c=h.getSetting(b.data.treeId),d="",f=null,g="",l="",i=null,n=null,k=null;if(j.eqs(b.type,"mousedown"))l="mousedown";else if(j.eqs(b.type,"mouseup"))l="mouseup";else if(j.eqs(b.type,"contextmenu"))l="contextmenu";else if(j.eqs(b.type,"click"))if(j.eqs(a.tagName,"span")&&
+a.getAttribute("treeNode"+e.id.SWITCH)!==null)d=j.getNodeMainDom(a).id,g="switchNode";else{if(k=j.getMDom(c,a,[{tagName:"a",attrName:"treeNode"+e.id.A}]))d=j.getNodeMainDom(k).id,g="clickNode"}else if(j.eqs(b.type,"dblclick")&&(l="dblclick",k=j.getMDom(c,a,[{tagName:"a",attrName:"treeNode"+e.id.A}])))d=j.getNodeMainDom(k).id,g="switchNode";if(l.length>0&&d.length==0&&(k=j.getMDom(c,a,[{tagName:"a",attrName:"treeNode"+e.id.A}])))d=j.getNodeMainDom(k).id;if(d.length>0)switch(f=h.getNodeCache(c,d),g){case "switchNode":f.isParent?
+j.eqs(b.type,"click")||j.eqs(b.type,"dblclick")&&j.apply(c.view.dblClickExpand,[c.treeId,f],c.view.dblClickExpand)?i=G:g="":g="";break;case "clickNode":i=H}switch(l){case "mousedown":n=I;break;case "mouseup":n=J;break;case "dblclick":n=K;break;case "contextmenu":n=L}return{stop:!1,node:f,nodeEventType:g,nodeEventCallback:i,treeEventType:l,treeEventCallback:n}}],A=[function(b){var a=h.getRoot(b);a||(a={},h.setRoot(b,a));a[b.data.key.children]=[];a.expandTriggerFlag=!1;a.curSelectedList=[];a.noSelection=
+!0;a.createdNodes=[];a.zId=0;a._ver=(new Date).getTime()}],B=[],C=[],D=[],E=[],F=[],h={addNodeCache:function(b,a){h.getCache(b).nodes[h.getNodeCacheId(a.tId)]=a},getNodeCacheId:function(b){return b.substring(b.lastIndexOf("_")+1)},addAfterA:function(b){C.push(b)},addBeforeA:function(b){B.push(b)},addInnerAfterA:function(b){E.push(b)},addInnerBeforeA:function(b){D.push(b)},addInitBind:function(b){w.push(b)},addInitUnBind:function(b){x.push(b)},addInitCache:function(b){y.push(b)},addInitNode:function(b){z.push(b)},
+addInitProxy:function(b,a){a?s.splice(0,0,b):s.push(b)},addInitRoot:function(b){A.push(b)},addNodesData:function(b,a,c){var d=b.data.key.children;a[d]||(a[d]=[]);if(a[d].length>0)a[d][a[d].length-1].isLastNode=!1,i.setNodeLineIcos(b,a[d][a[d].length-1]);a.isParent=!0;a[d]=a[d].concat(c)},addSelectedNode:function(b,a){var c=h.getRoot(b);h.isSelectedNode(b,a)||c.curSelectedList.push(a)},addCreatedNode:function(b,a){(b.callback.onNodeCreated||b.view.addDiyDom)&&h.getRoot(b).createdNodes.push(a)},addZTreeTools:function(b){F.push(b)},
+exSetting:function(b){p.extend(!0,M,b)},fixPIdKeyValue:function(b,a){b.data.simpleData.enable&&(a[b.data.simpleData.pIdKey]=a.parentTId?a.getParentNode()[b.data.simpleData.idKey]:b.data.simpleData.rootPId)},getAfterA:function(b,a,c){for(var d=0,f=C.length;d<f;d++)C[d].apply(this,arguments)},getBeforeA:function(b,a,c){for(var d=0,f=B.length;d<f;d++)B[d].apply(this,arguments)},getInnerAfterA:function(b,a,c){for(var d=0,f=E.length;d<f;d++)E[d].apply(this,arguments)},getInnerBeforeA:function(b,a,c){for(var d=
+0,f=D.length;d<f;d++)D[d].apply(this,arguments)},getCache:function(b){return v[b.treeId]},getNextNode:function(b,a){if(!a)return null;for(var c=b.data.key.children,d=a.parentTId?a.getParentNode():h.getRoot(b),f=0,g=d[c].length-1;f<=g;f++)if(d[c][f]===a)return f==g?null:d[c][f+1];return null},getNodeByParam:function(b,a,c,d){if(!a||!c)return null;for(var f=b.data.key.children,g=0,l=a.length;g<l;g++){if(a[g][c]==d)return a[g];var e=h.getNodeByParam(b,a[g][f],c,d);if(e)return e}return null},getNodeCache:function(b,
+a){if(!a)return null;var c=v[b.treeId].nodes[h.getNodeCacheId(a)];return c?c:null},getNodeName:function(b,a){return""+a[b.data.key.name]},getNodeTitle:function(b,a){return""+a[b.data.key.title===""?b.data.key.name:b.data.key.title]},getNodes:function(b){return h.getRoot(b)[b.data.key.children]},getNodesByParam:function(b,a,c,d){if(!a||!c)return[];for(var f=b.data.key.children,g=[],l=0,e=a.length;l<e;l++)a[l][c]==d&&g.push(a[l]),g=g.concat(h.getNodesByParam(b,a[l][f],c,d));return g},getNodesByParamFuzzy:function(b,
+a,c,d){if(!a||!c)return[];for(var f=b.data.key.children,g=[],d=d.toLowerCase(),l=0,e=a.length;l<e;l++)typeof a[l][c]=="string"&&a[l][c].toLowerCase().indexOf(d)>-1&&g.push(a[l]),g=g.concat(h.getNodesByParamFuzzy(b,a[l][f],c,d));return g},getNodesByFilter:function(b,a,c,d,f){if(!a)return d?null:[];for(var g=b.data.key.children,e=d?null:[],i=0,n=a.length;i<n;i++){if(j.apply(c,[a[i],f],!1)){if(d)return a[i];e.push(a[i])}var k=h.getNodesByFilter(b,a[i][g],c,d,f);if(d&&k)return k;e=d?k:e.concat(k)}return e},
+getPreNode:function(b,a){if(!a)return null;for(var c=b.data.key.children,d=a.parentTId?a.getParentNode():h.getRoot(b),f=0,g=d[c].length;f<g;f++)if(d[c][f]===a)return f==0?null:d[c][f-1];return null},getRoot:function(b){return b?u[b.treeId]:null},getRoots:function(){return u},getSetting:function(b){return r[b]},getSettings:function(){return r},getZTreeTools:function(b){return(b=this.getRoot(this.getSetting(b)))?b.treeTools:null},initCache:function(b){for(var a=0,c=y.length;a<c;a++)y[a].apply(this,
+arguments)},initNode:function(b,a,c,d,f,g){for(var e=0,h=z.length;e<h;e++)z[e].apply(this,arguments)},initRoot:function(b){for(var a=0,c=A.length;a<c;a++)A[a].apply(this,arguments)},isSelectedNode:function(b,a){for(var c=h.getRoot(b),d=0,f=c.curSelectedList.length;d<f;d++)if(a===c.curSelectedList[d])return!0;return!1},removeNodeCache:function(b,a){var c=b.data.key.children;if(a[c])for(var d=0,f=a[c].length;d<f;d++)arguments.callee(b,a[c][d]);h.getCache(b).nodes[h.getNodeCacheId(a.tId)]=null},removeSelectedNode:function(b,
+a){for(var c=h.getRoot(b),d=0,f=c.curSelectedList.length;d<f;d++)if(a===c.curSelectedList[d]||!h.getNodeCache(b,c.curSelectedList[d].tId))c.curSelectedList.splice(d,1),d--,f--},setCache:function(b,a){v[b.treeId]=a},setRoot:function(b,a){u[b.treeId]=a},setZTreeTools:function(b,a){for(var c=0,d=F.length;c<d;c++)F[c].apply(this,arguments)},transformToArrayFormat:function(b,a){if(!a)return[];var c=b.data.key.children,d=[];if(j.isArray(a))for(var f=0,g=a.length;f<g;f++)d.push(a[f]),a[f][c]&&(d=d.concat(h.transformToArrayFormat(b,
+a[f][c])));else d.push(a),a[c]&&(d=d.concat(h.transformToArrayFormat(b,a[c])));return d},transformTozTreeFormat:function(b,a){var c,d,f=b.data.simpleData.idKey,g=b.data.simpleData.pIdKey,e=b.data.key.children;if(!f||f==""||!a)return[];if(j.isArray(a)){var h=[],i=[];for(c=0,d=a.length;c<d;c++)i[a[c][f]]=a[c];for(c=0,d=a.length;c<d;c++)i[a[c][g]]&&a[c][f]!=a[c][g]?(i[a[c][g]][e]||(i[a[c][g]][e]=[]),i[a[c][g]][e].push(a[c])):h.push(a[c]);return h}else return[a]}},m={bindEvent:function(b){for(var a=0,
+c=w.length;a<c;a++)w[a].apply(this,arguments)},unbindEvent:function(b){for(var a=0,c=x.length;a<c;a++)x[a].apply(this,arguments)},bindTree:function(b){var a={treeId:b.treeId},c=b.treeObj;b.view.txtSelectedEnable||c.bind("selectstart",function(a){a=a.originalEvent.srcElement.nodeName.toLowerCase();return a==="input"||a==="textarea"}).css({"-moz-user-select":"-moz-none"});c.bind("click",a,m.proxy);c.bind("dblclick",a,m.proxy);c.bind("mouseover",a,m.proxy);c.bind("mouseout",a,m.proxy);c.bind("mousedown",
+a,m.proxy);c.bind("mouseup",a,m.proxy);c.bind("contextmenu",a,m.proxy)},unbindTree:function(b){b.treeObj.unbind("click",m.proxy).unbind("dblclick",m.proxy).unbind("mouseover",m.proxy).unbind("mouseout",m.proxy).unbind("mousedown",m.proxy).unbind("mouseup",m.proxy).unbind("contextmenu",m.proxy)},doProxy:function(b){for(var a=[],c=0,d=s.length;c<d;c++){var f=s[c].apply(this,arguments);a.push(f);if(f.stop)break}return a},proxy:function(b){var a=h.getSetting(b.data.treeId);if(!j.uCanDo(a,b))return!0;
+for(var a=m.doProxy(b),c=!0,d=0,f=a.length;d<f;d++){var g=a[d];g.nodeEventCallback&&(c=g.nodeEventCallback.apply(g,[b,g.node])&&c);g.treeEventCallback&&(c=g.treeEventCallback.apply(g,[b,g.node])&&c)}return c}};G=function(b,a){var c=h.getSetting(b.data.treeId);if(a.open){if(j.apply(c.callback.beforeCollapse,[c.treeId,a],!0)==!1)return!0}else if(j.apply(c.callback.beforeExpand,[c.treeId,a],!0)==!1)return!0;h.getRoot(c).expandTriggerFlag=!0;i.switchNode(c,a);return!0};H=function(b,a){var c=h.getSetting(b.data.treeId),
+d=c.view.autoCancelSelected&&b.ctrlKey&&h.isSelectedNode(c,a)?0:c.view.autoCancelSelected&&b.ctrlKey&&c.view.selectedMulti?2:1;if(j.apply(c.callback.beforeClick,[c.treeId,a,d],!0)==!1)return!0;d===0?i.cancelPreSelectedNode(c,a):i.selectNode(c,a,d===2);c.treeObj.trigger(e.event.CLICK,[b,c.treeId,a,d]);return!0};I=function(b,a){var c=h.getSetting(b.data.treeId);j.apply(c.callback.beforeMouseDown,[c.treeId,a],!0)&&j.apply(c.callback.onMouseDown,[b,c.treeId,a]);return!0};J=function(b,a){var c=h.getSetting(b.data.treeId);
+j.apply(c.callback.beforeMouseUp,[c.treeId,a],!0)&&j.apply(c.callback.onMouseUp,[b,c.treeId,a]);return!0};K=function(b,a){var c=h.getSetting(b.data.treeId);j.apply(c.callback.beforeDblClick,[c.treeId,a],!0)&&j.apply(c.callback.onDblClick,[b,c.treeId,a]);return!0};L=function(b,a){var c=h.getSetting(b.data.treeId);j.apply(c.callback.beforeRightClick,[c.treeId,a],!0)&&j.apply(c.callback.onRightClick,[b,c.treeId,a]);return typeof c.callback.onRightClick!="function"};var j={apply:function(b,a,c){return typeof b==
+"function"?b.apply(N,a?a:[]):c},canAsync:function(b,a){var c=b.data.key.children;return b.async.enable&&a&&a.isParent&&!(a.zAsync||a[c]&&a[c].length>0)},clone:function(b){if(b===null)return null;var a=j.isArray(b)?[]:{},c;for(c in b)a[c]=b[c]instanceof Date?new Date(b[c].getTime()):typeof b[c]==="object"?arguments.callee(b[c]):b[c];return a},eqs:function(b,a){return b.toLowerCase()===a.toLowerCase()},isArray:function(b){return Object.prototype.toString.apply(b)==="[object Array]"},$:function(b,a,
+c){a&&typeof a!="string"&&(c=a,a="");return typeof b=="string"?p(b,c?c.treeObj.get(0).ownerDocument:null):p("#"+b.tId+a,c?c.treeObj:null)},getMDom:function(b,a,c){if(!a)return null;for(;a&&a.id!==b.treeId;){for(var d=0,f=c.length;a.tagName&&d<f;d++)if(j.eqs(a.tagName,c[d].tagName)&&a.getAttribute(c[d].attrName)!==null)return a;a=a.parentNode}return null},getNodeMainDom:function(b){return p(b).parent("li").get(0)||p(b).parentsUntil("li").parent().get(0)},isChildOrSelf:function(b,a){return p(b).closest("#"+
+a).length>0},uCanDo:function(){return!0}},i={addNodes:function(b,a,c,d){if(!b.data.keep.leaf||!a||a.isParent)if(j.isArray(c)||(c=[c]),b.data.simpleData.enable&&(c=h.transformTozTreeFormat(b,c)),a){var f=k(a,e.id.SWITCH,b),g=k(a,e.id.ICON,b),l=k(a,e.id.UL,b);if(!a.open)i.replaceSwitchClass(a,f,e.folder.CLOSE),i.replaceIcoClass(a,g,e.folder.CLOSE),a.open=!1,l.css({display:"none"});h.addNodesData(b,a,c);i.createNodes(b,a.level+1,c,a);d||i.expandCollapseParentNode(b,a,!0)}else h.addNodesData(b,h.getRoot(b),
+c),i.createNodes(b,0,c,null)},appendNodes:function(b,a,c,d,f,g){if(!c)return[];for(var e=[],j=b.data.key.children,k=0,m=c.length;k<m;k++){var o=c[k];if(f){var t=(d?d:h.getRoot(b))[j].length==c.length&&k==0;h.initNode(b,a,o,d,t,k==c.length-1,g);h.addNodeCache(b,o)}t=[];o[j]&&o[j].length>0&&(t=i.appendNodes(b,a+1,o[j],o,f,g&&o.open));g&&(i.makeDOMNodeMainBefore(e,b,o),i.makeDOMNodeLine(e,b,o),h.getBeforeA(b,o,e),i.makeDOMNodeNameBefore(e,b,o),h.getInnerBeforeA(b,o,e),i.makeDOMNodeIcon(e,b,o),h.getInnerAfterA(b,
+o,e),i.makeDOMNodeNameAfter(e,b,o),h.getAfterA(b,o,e),o.isParent&&o.open&&i.makeUlHtml(b,o,e,t.join("")),i.makeDOMNodeMainAfter(e,b,o),h.addCreatedNode(b,o))}return e},appendParentULDom:function(b,a){var c=[],d=k(a,b);!d.get(0)&&a.parentTId&&(i.appendParentULDom(b,a.getParentNode()),d=k(a,b));var f=k(a,e.id.UL,b);f.get(0)&&f.remove();f=i.appendNodes(b,a.level+1,a[b.data.key.children],a,!1,!0);i.makeUlHtml(b,a,c,f.join(""));d.append(c.join(""))},asyncNode:function(b,a,c,d){var f,g;if(a&&!a.isParent)return j.apply(d),
+!1;else if(a&&a.isAjaxing)return!1;else if(j.apply(b.callback.beforeAsync,[b.treeId,a],!0)==!1)return j.apply(d),!1;if(a)a.isAjaxing=!0,k(a,e.id.ICON,b).attr({style:"","class":e.className.BUTTON+" "+e.className.ICO_LOADING});var l={};for(f=0,g=b.async.autoParam.length;a&&f<g;f++){var q=b.async.autoParam[f].split("="),n=q;q.length>1&&(n=q[1],q=q[0]);l[n]=a[q]}if(j.isArray(b.async.otherParam))for(f=0,g=b.async.otherParam.length;f<g;f+=2)l[b.async.otherParam[f]]=b.async.otherParam[f+1];else for(var m in b.async.otherParam)l[m]=
+b.async.otherParam[m];var o=h.getRoot(b)._ver;p.ajax({contentType:b.async.contentType,type:b.async.type,url:j.apply(b.async.url,[b.treeId,a],b.async.url),data:l,dataType:b.async.dataType,success:function(f){if(o==h.getRoot(b)._ver){var g=[];try{g=!f||f.length==0?[]:typeof f=="string"?eval("("+f+")"):f}catch(l){g=f}if(a)a.isAjaxing=null,a.zAsync=!0;i.setNodeLineIcos(b,a);g&&g!==""?(g=j.apply(b.async.dataFilter,[b.treeId,a,g],g),i.addNodes(b,a,g?j.clone(g):[],!!c)):i.addNodes(b,a,[],!!c);b.treeObj.trigger(e.event.ASYNC_SUCCESS,
+[b.treeId,a,f]);j.apply(d)}},error:function(c,d,f){if(o==h.getRoot(b)._ver){if(a)a.isAjaxing=null;i.setNodeLineIcos(b,a);b.treeObj.trigger(e.event.ASYNC_ERROR,[b.treeId,a,c,d,f])}}});return!0},cancelPreSelectedNode:function(b,a){for(var c=h.getRoot(b).curSelectedList,d=c.length-1;d>=0;d--)if(!a||a===c[d])if(k(c[d],e.id.A,b).removeClass(e.node.CURSELECTED),a){h.removeSelectedNode(b,a);break}if(!a)h.getRoot(b).curSelectedList=[]},createNodeCallback:function(b){if(b.callback.onNodeCreated||b.view.addDiyDom)for(var a=
+h.getRoot(b);a.createdNodes.length>0;){var c=a.createdNodes.shift();j.apply(b.view.addDiyDom,[b.treeId,c]);b.callback.onNodeCreated&&b.treeObj.trigger(e.event.NODECREATED,[b.treeId,c])}},createNodes:function(b,a,c,d){if(c&&c.length!=0){var f=h.getRoot(b),g=b.data.key.children,g=!d||d.open||!!k(d[g][0],b).get(0);f.createdNodes=[];a=i.appendNodes(b,a,c,d,!0,g);d?(d=k(d,e.id.UL,b),d.get(0)&&d.append(a.join(""))):b.treeObj.append(a.join(""));i.createNodeCallback(b)}},destroy:function(b){b&&(h.initCache(b),
+h.initRoot(b),m.unbindTree(b),m.unbindEvent(b),b.treeObj.empty())},expandCollapseNode:function(b,a,c,d,f){var g=h.getRoot(b),l=b.data.key.children;if(a){if(g.expandTriggerFlag){var q=f,f=function(){q&&q();a.open?b.treeObj.trigger(e.event.EXPAND,[b.treeId,a]):b.treeObj.trigger(e.event.COLLAPSE,[b.treeId,a])};g.expandTriggerFlag=!1}if(!a.open&&a.isParent&&(!k(a,e.id.UL,b).get(0)||a[l]&&a[l].length>0&&!k(a[l][0],b).get(0)))i.appendParentULDom(b,a),i.createNodeCallback(b);if(a.open==c)j.apply(f,[]);else{var c=
+k(a,e.id.UL,b),g=k(a,e.id.SWITCH,b),n=k(a,e.id.ICON,b);a.isParent?(a.open=!a.open,a.iconOpen&&a.iconClose&&n.attr("style",i.makeNodeIcoStyle(b,a)),a.open?(i.replaceSwitchClass(a,g,e.folder.OPEN),i.replaceIcoClass(a,n,e.folder.OPEN),d==!1||b.view.expandSpeed==""?(c.show(),j.apply(f,[])):a[l]&&a[l].length>0?c.slideDown(b.view.expandSpeed,f):(c.show(),j.apply(f,[]))):(i.replaceSwitchClass(a,g,e.folder.CLOSE),i.replaceIcoClass(a,n,e.folder.CLOSE),d==!1||b.view.expandSpeed==""||!(a[l]&&a[l].length>0)?
+(c.hide(),j.apply(f,[])):c.slideUp(b.view.expandSpeed,f))):j.apply(f,[])}}else j.apply(f,[])},expandCollapseParentNode:function(b,a,c,d,f){a&&(a.parentTId?(i.expandCollapseNode(b,a,c,d),a.parentTId&&i.expandCollapseParentNode(b,a.getParentNode(),c,d,f)):i.expandCollapseNode(b,a,c,d,f))},expandCollapseSonNode:function(b,a,c,d,f){var g=h.getRoot(b),e=b.data.key.children,g=a?a[e]:g[e],e=a?!1:d,j=h.getRoot(b).expandTriggerFlag;h.getRoot(b).expandTriggerFlag=!1;if(g)for(var k=0,m=g.length;k<m;k++)g[k]&&
+i.expandCollapseSonNode(b,g[k],c,e);h.getRoot(b).expandTriggerFlag=j;i.expandCollapseNode(b,a,c,d,f)},makeDOMNodeIcon:function(b,a,c){var d=h.getNodeName(a,c),d=a.view.nameIsHTML?d:d.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;");b.push("<span id='",c.tId,e.id.ICON,"' title='' treeNode",e.id.ICON," class='",i.makeNodeIcoClass(a,c),"' style='",i.makeNodeIcoStyle(a,c),"'></span><span id='",c.tId,e.id.SPAN,"'>",d,"</span>")},makeDOMNodeLine:function(b,a,c){b.push("<span id='",c.tId,
+e.id.SWITCH,"' title='' class='",i.makeNodeLineClass(a,c),"' treeNode",e.id.SWITCH,"></span>")},makeDOMNodeMainAfter:function(b){b.push("</li>")},makeDOMNodeMainBefore:function(b,a,c){b.push("<li id='",c.tId,"' class='",e.className.LEVEL,c.level,"' tabindex='0' hidefocus='true' treenode>")},makeDOMNodeNameAfter:function(b){b.push("</a>")},makeDOMNodeNameBefore:function(b,a,c){var d=h.getNodeTitle(a,c),f=i.makeNodeUrl(a,c),g=i.makeNodeFontCss(a,c),l=[],k;for(k in g)l.push(k,":",g[k],";");b.push("<a id='",
+c.tId,e.id.A,"' class='",e.className.LEVEL,c.level,"' treeNode",e.id.A,' onclick="',c.click||"",'" ',f!=null&&f.length>0?"href='"+f+"'":""," target='",i.makeNodeTarget(c),"' style='",l.join(""),"'");j.apply(a.view.showTitle,[a.treeId,c],a.view.showTitle)&&d&&b.push("title='",d.replace(/'/g,"&#39;").replace(/</g,"&lt;").replace(/>/g,"&gt;"),"'");b.push(">")},makeNodeFontCss:function(b,a){var c=j.apply(b.view.fontCss,[b.treeId,a],b.view.fontCss);return c&&typeof c!="function"?c:{}},makeNodeIcoClass:function(b,
+a){var c=["ico"];a.isAjaxing||(c[0]=(a.iconSkin?a.iconSkin+"_":"")+c[0],a.isParent?c.push(a.open?e.folder.OPEN:e.folder.CLOSE):c.push(e.folder.DOCU));return e.className.BUTTON+" "+c.join("_")},makeNodeIcoStyle:function(b,a){var c=[];if(!a.isAjaxing){var d=a.isParent&&a.iconOpen&&a.iconClose?a.open?a.iconOpen:a.iconClose:a.icon;d&&c.push("background:url(",d,") 0 0 no-repeat;");(b.view.showIcon==!1||!j.apply(b.view.showIcon,[b.treeId,a],!0))&&c.push("width:0px;height:0px;")}return c.join("")},makeNodeLineClass:function(b,
+a){var c=[];b.view.showLine?a.level==0&&a.isFirstNode&&a.isLastNode?c.push(e.line.ROOT):a.level==0&&a.isFirstNode?c.push(e.line.ROOTS):a.isLastNode?c.push(e.line.BOTTOM):c.push(e.line.CENTER):c.push(e.line.NOLINE);a.isParent?c.push(a.open?e.folder.OPEN:e.folder.CLOSE):c.push(e.folder.DOCU);return i.makeNodeLineClassEx(a)+c.join("_")},makeNodeLineClassEx:function(b){return e.className.BUTTON+" "+e.className.LEVEL+b.level+" "+e.className.SWITCH+" "},makeNodeTarget:function(b){return b.target||"_blank"},
+makeNodeUrl:function(b,a){var c=b.data.key.url;return a[c]?a[c]:null},makeUlHtml:function(b,a,c,d){c.push("<ul id='",a.tId,e.id.UL,"' class='",e.className.LEVEL,a.level," ",i.makeUlLineClass(b,a),"' style='display:",a.open?"block":"none","'>");c.push(d);c.push("</ul>")},makeUlLineClass:function(b,a){return b.view.showLine&&!a.isLastNode?e.line.LINE:""},removeChildNodes:function(b,a){if(a){var c=b.data.key.children,d=a[c];if(d){for(var f=0,g=d.length;f<g;f++)h.removeNodeCache(b,d[f]);h.removeSelectedNode(b);
+delete a[c];b.data.keep.parent?k(a,e.id.UL,b).empty():(a.isParent=!1,a.open=!1,c=k(a,e.id.SWITCH,b),d=k(a,e.id.ICON,b),i.replaceSwitchClass(a,c,e.folder.DOCU),i.replaceIcoClass(a,d,e.folder.DOCU),k(a,e.id.UL,b).remove())}}},setFirstNode:function(b,a){var c=b.data.key.children;if(a[c].length>0)a[c][0].isFirstNode=!0},setLastNode:function(b,a){var c=b.data.key.children,d=a[c].length;if(d>0)a[c][d-1].isLastNode=!0},removeNode:function(b,a){var c=h.getRoot(b),d=b.data.key.children,f=a.parentTId?a.getParentNode():
+c;a.isFirstNode=!1;a.isLastNode=!1;a.getPreNode=function(){return null};a.getNextNode=function(){return null};if(h.getNodeCache(b,a.tId)){k(a,b).remove();h.removeNodeCache(b,a);h.removeSelectedNode(b,a);for(var g=0,l=f[d].length;g<l;g++)if(f[d][g].tId==a.tId){f[d].splice(g,1);break}i.setFirstNode(b,f);i.setLastNode(b,f);var j,g=f[d].length;if(!b.data.keep.parent&&g==0)f.isParent=!1,f.open=!1,g=k(f,e.id.UL,b),l=k(f,e.id.SWITCH,b),j=k(f,e.id.ICON,b),i.replaceSwitchClass(f,l,e.folder.DOCU),i.replaceIcoClass(f,
+j,e.folder.DOCU),g.css("display","none");else if(b.view.showLine&&g>0){var n=f[d][g-1],g=k(n,e.id.UL,b),l=k(n,e.id.SWITCH,b);j=k(n,e.id.ICON,b);f==c?f[d].length==1?i.replaceSwitchClass(n,l,e.line.ROOT):(c=k(f[d][0],e.id.SWITCH,b),i.replaceSwitchClass(f[d][0],c,e.line.ROOTS),i.replaceSwitchClass(n,l,e.line.BOTTOM)):i.replaceSwitchClass(n,l,e.line.BOTTOM);g.removeClass(e.line.LINE)}}},replaceIcoClass:function(b,a,c){if(a&&!b.isAjaxing&&(b=a.attr("class"),b!=void 0)){b=b.split("_");switch(c){case e.folder.OPEN:case e.folder.CLOSE:case e.folder.DOCU:b[b.length-
+1]=c}a.attr("class",b.join("_"))}},replaceSwitchClass:function(b,a,c){if(a){var d=a.attr("class");if(d!=void 0){d=d.split("_");switch(c){case e.line.ROOT:case e.line.ROOTS:case e.line.CENTER:case e.line.BOTTOM:case e.line.NOLINE:d[0]=i.makeNodeLineClassEx(b)+c;break;case e.folder.OPEN:case e.folder.CLOSE:case e.folder.DOCU:d[1]=c}a.attr("class",d.join("_"));c!==e.folder.DOCU?a.removeAttr("disabled"):a.attr("disabled","disabled")}}},selectNode:function(b,a,c){c||i.cancelPreSelectedNode(b);k(a,e.id.A,
+b).addClass(e.node.CURSELECTED);h.addSelectedNode(b,a)},setNodeFontCss:function(b,a){var c=k(a,e.id.A,b),d=i.makeNodeFontCss(b,a);d&&c.css(d)},setNodeLineIcos:function(b,a){if(a){var c=k(a,e.id.SWITCH,b),d=k(a,e.id.UL,b),f=k(a,e.id.ICON,b),g=i.makeUlLineClass(b,a);g.length==0?d.removeClass(e.line.LINE):d.addClass(g);c.attr("class",i.makeNodeLineClass(b,a));a.isParent?c.removeAttr("disabled"):c.attr("disabled","disabled");f.removeAttr("style");f.attr("style",i.makeNodeIcoStyle(b,a));f.attr("class",
+i.makeNodeIcoClass(b,a))}},setNodeName:function(b,a){var c=h.getNodeTitle(b,a),d=k(a,e.id.SPAN,b);d.empty();b.view.nameIsHTML?d.html(h.getNodeName(b,a)):d.text(h.getNodeName(b,a));j.apply(b.view.showTitle,[b.treeId,a],b.view.showTitle)&&k(a,e.id.A,b).attr("title",!c?"":c)},setNodeTarget:function(b,a){k(a,e.id.A,b).attr("target",i.makeNodeTarget(a))},setNodeUrl:function(b,a){var c=k(a,e.id.A,b),d=i.makeNodeUrl(b,a);d==null||d.length==0?c.removeAttr("href"):c.attr("href",d)},switchNode:function(b,a){a.open||
+!j.canAsync(b,a)?i.expandCollapseNode(b,a,!a.open):b.async.enable?i.asyncNode(b,a)||i.expandCollapseNode(b,a,!a.open):a&&i.expandCollapseNode(b,a,!a.open)}};p.fn.zTree={consts:{className:{BUTTON:"button",LEVEL:"level",ICO_LOADING:"ico_loading",SWITCH:"switch"},event:{NODECREATED:"ztree_nodeCreated",CLICK:"ztree_click",EXPAND:"ztree_expand",COLLAPSE:"ztree_collapse",ASYNC_SUCCESS:"ztree_async_success",ASYNC_ERROR:"ztree_async_error"},id:{A:"_a",ICON:"_ico",SPAN:"_span",SWITCH:"_switch",UL:"_ul"},line:{ROOT:"root",
+ROOTS:"roots",CENTER:"center",BOTTOM:"bottom",NOLINE:"noline",LINE:"line"},folder:{OPEN:"open",CLOSE:"close",DOCU:"docu"},node:{CURSELECTED:"curSelectedNode"}},_z:{tools:j,view:i,event:m,data:h},getZTreeObj:function(b){return(b=h.getZTreeTools(b))?b:null},destroy:function(b){if(b&&b.length>0)i.destroy(h.getSetting(b));else for(var a in r)i.destroy(r[a])},init:function(b,a,c){var d=j.clone(M);p.extend(!0,d,a);d.treeId=b.attr("id");d.treeObj=b;d.treeObj.empty();r[d.treeId]=d;if(typeof document.body.style.maxHeight===
+"undefined")d.view.expandSpeed="";h.initRoot(d);b=h.getRoot(d);a=d.data.key.children;c=c?j.clone(j.isArray(c)?c:[c]):[];b[a]=d.data.simpleData.enable?h.transformTozTreeFormat(d,c):c;h.initCache(d);m.unbindTree(d);m.bindTree(d);m.unbindEvent(d);m.bindEvent(d);c={setting:d,addNodes:function(a,b,c){function e(){i.addNodes(d,a,h,c==!0)}if(!b)return null;a||(a=null);if(a&&!a.isParent&&d.data.keep.leaf)return null;var h=j.clone(j.isArray(b)?b:[b]);j.canAsync(d,a)?i.asyncNode(d,a,c,e):e();return h},cancelSelectedNode:function(a){i.cancelPreSelectedNode(d,
+a)},destroy:function(){i.destroy(d)},expandAll:function(a){a=!!a;i.expandCollapseSonNode(d,null,a,!0);return a},expandNode:function(a,b,c,e,n){if(!a||!a.isParent)return null;b!==!0&&b!==!1&&(b=!a.open);if((n=!!n)&&b&&j.apply(d.callback.beforeExpand,[d.treeId,a],!0)==!1)return null;else if(n&&!b&&j.apply(d.callback.beforeCollapse,[d.treeId,a],!0)==!1)return null;b&&a.parentTId&&i.expandCollapseParentNode(d,a.getParentNode(),b,!1);if(b===a.open&&!c)return null;h.getRoot(d).expandTriggerFlag=n;if(!j.canAsync(d,
+a)&&c)i.expandCollapseSonNode(d,a,b,!0,function(){if(e!==!1)try{k(a,d).focus().blur()}catch(b){}});else if(a.open=!b,i.switchNode(this.setting,a),e!==!1)try{k(a,d).focus().blur()}catch(m){}return b},getNodes:function(){return h.getNodes(d)},getNodeByParam:function(a,b,c){return!a?null:h.getNodeByParam(d,c?c[d.data.key.children]:h.getNodes(d),a,b)},getNodeByTId:function(a){return h.getNodeCache(d,a)},getNodesByParam:function(a,b,c){return!a?null:h.getNodesByParam(d,c?c[d.data.key.children]:h.getNodes(d),
+a,b)},getNodesByParamFuzzy:function(a,b,c){return!a?null:h.getNodesByParamFuzzy(d,c?c[d.data.key.children]:h.getNodes(d),a,b)},getNodesByFilter:function(a,b,c,e){b=!!b;return!a||typeof a!="function"?b?null:[]:h.getNodesByFilter(d,c?c[d.data.key.children]:h.getNodes(d),a,b,e)},getNodeIndex:function(a){if(!a)return null;for(var b=d.data.key.children,c=a.parentTId?a.getParentNode():h.getRoot(d),e=0,i=c[b].length;e<i;e++)if(c[b][e]==a)return e;return-1},getSelectedNodes:function(){for(var a=[],b=h.getRoot(d).curSelectedList,
+c=0,e=b.length;c<e;c++)a.push(b[c]);return a},isSelectedNode:function(a){return h.isSelectedNode(d,a)},reAsyncChildNodes:function(a,b,c){if(this.setting.async.enable){var j=!a;j&&(a=h.getRoot(d));if(b=="refresh"){for(var b=this.setting.data.key.children,m=0,p=a[b]?a[b].length:0;m<p;m++)h.removeNodeCache(d,a[b][m]);h.removeSelectedNode(d);a[b]=[];j?this.setting.treeObj.empty():k(a,e.id.UL,d).empty()}i.asyncNode(this.setting,j?null:a,!!c)}},refresh:function(){this.setting.treeObj.empty();var a=h.getRoot(d),
+b=a[d.data.key.children];h.initRoot(d);a[d.data.key.children]=b;h.initCache(d);i.createNodes(d,0,a[d.data.key.children])},removeChildNodes:function(a){if(!a)return null;var b=a[d.data.key.children];i.removeChildNodes(d,a);return b?b:null},removeNode:function(a,b){a&&(b=!!b,b&&j.apply(d.callback.beforeRemove,[d.treeId,a],!0)==!1||(i.removeNode(d,a),b&&this.setting.treeObj.trigger(e.event.REMOVE,[d.treeId,a])))},selectNode:function(a,b){if(a&&j.uCanDo(d)){b=d.view.selectedMulti&&b;if(a.parentTId)i.expandCollapseParentNode(d,
+a.getParentNode(),!0,!1,function(){try{k(a,d).focus().blur()}catch(b){}});else try{k(a,d).focus().blur()}catch(c){}i.selectNode(d,a,b)}},transformTozTreeNodes:function(a){return h.transformTozTreeFormat(d,a)},transformToArray:function(a){return h.transformToArrayFormat(d,a)},updateNode:function(a){a&&k(a,d).get(0)&&j.uCanDo(d)&&(i.setNodeName(d,a),i.setNodeTarget(d,a),i.setNodeUrl(d,a),i.setNodeLineIcos(d,a),i.setNodeFontCss(d,a))}};b.treeTools=c;h.setZTreeTools(d,c);b[a]&&b[a].length>0?i.createNodes(d,
+0,b[a]):d.async.enable&&d.async.url&&d.async.url!==""&&i.asyncNode(d);return c}};var N=p.fn.zTree,k=j.$,e=N.consts})(jQuery);
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/js/jquery.ztree.excheck-3.5.js b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/js/jquery.ztree.excheck-3.5.js
new file mode 100644
index 0000000..c3fbfc5
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/js/jquery.ztree.excheck-3.5.js
@@ -0,0 +1,626 @@
+/*
+ * JQuery zTree excheck v3.5.15
+ * http://zTree.me/
+ *
+ * Copyright (c) 2010 Hunter.z
+ *
+ * Licensed same as jquery - MIT License
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ * email: hunter.z@263.net
+ * Date: 2013-10-15
+ */
+(function($){
+	//default consts of excheck
+	var _consts = {
+		event: {
+			CHECK: "ztree_check"
+		},
+		id: {
+			CHECK: "_check"
+		},
+		checkbox: {
+			STYLE: "checkbox",
+			DEFAULT: "chk",
+			DISABLED: "disable",
+			FALSE: "false",
+			TRUE: "true",
+			FULL: "full",
+			PART: "part",
+			FOCUS: "focus"
+		},
+		radio: {
+			STYLE: "radio",
+			TYPE_ALL: "all",
+			TYPE_LEVEL: "level"
+		}
+	},
+	//default setting of excheck
+	_setting = {
+		check: {
+			enable: false,
+			autoCheckTrigger: false,
+			chkStyle: _consts.checkbox.STYLE,
+			nocheckInherit: false,
+			chkDisabledInherit: false,
+			radioType: _consts.radio.TYPE_LEVEL,
+			chkboxType: {
+				"Y": "ps",
+				"N": "ps"
+			}
+		},
+		data: {
+			key: {
+				checked: "checked"
+			}
+		},
+		callback: {
+			beforeCheck:null,
+			onCheck:null
+		}
+	},
+	//default root of excheck
+	_initRoot = function (setting) {
+		var r = data.getRoot(setting);
+		r.radioCheckedList = [];
+	},
+	//default cache of excheck
+	_initCache = function(treeId) {},
+	//default bind event of excheck
+	_bindEvent = function(setting) {
+		var o = setting.treeObj,
+		c = consts.event;
+		o.bind(c.CHECK, function (event, srcEvent, treeId, node) {
+			tools.apply(setting.callback.onCheck, [!!srcEvent?srcEvent : event, treeId, node]);
+		});
+	},
+	_unbindEvent = function(setting) {
+		var o = setting.treeObj,
+		c = consts.event;
+		o.unbind(c.CHECK);
+	},
+	//default event proxy of excheck
+	_eventProxy = function(e) {
+		var target = e.target,
+		setting = data.getSetting(e.data.treeId),
+		tId = "", node = null,
+		nodeEventType = "", treeEventType = "",
+		nodeEventCallback = null, treeEventCallback = null;
+
+		if (tools.eqs(e.type, "mouseover")) {
+			if (setting.check.enable && tools.eqs(target.tagName, "span") && target.getAttribute("treeNode"+ consts.id.CHECK) !== null) {
+				tId = tools.getNodeMainDom(target).id;
+				nodeEventType = "mouseoverCheck";
+			}
+		} else if (tools.eqs(e.type, "mouseout")) {
+			if (setting.check.enable && tools.eqs(target.tagName, "span") && target.getAttribute("treeNode"+ consts.id.CHECK) !== null) {
+				tId = tools.getNodeMainDom(target).id;
+				nodeEventType = "mouseoutCheck";
+			}
+		} else if (tools.eqs(e.type, "click")) {
+			if (setting.check.enable && tools.eqs(target.tagName, "span") && target.getAttribute("treeNode"+ consts.id.CHECK) !== null) {
+				tId = tools.getNodeMainDom(target).id;
+				nodeEventType = "checkNode";
+			}
+		}
+		if (tId.length>0) {
+			node = data.getNodeCache(setting, tId);
+			switch (nodeEventType) {
+				case "checkNode" :
+					nodeEventCallback = _handler.onCheckNode;
+					break;
+				case "mouseoverCheck" :
+					nodeEventCallback = _handler.onMouseoverCheck;
+					break;
+				case "mouseoutCheck" :
+					nodeEventCallback = _handler.onMouseoutCheck;
+					break;
+			}
+		}
+		var proxyResult = {
+			stop: nodeEventType === "checkNode",
+			node: node,
+			nodeEventType: nodeEventType,
+			nodeEventCallback: nodeEventCallback,
+			treeEventType: treeEventType,
+			treeEventCallback: treeEventCallback
+		};
+		return proxyResult
+	},
+	//default init node of excheck
+	_initNode = function(setting, level, n, parentNode, isFirstNode, isLastNode, openFlag) {
+		if (!n) return;
+		var checkedKey = setting.data.key.checked;
+		if (typeof n[checkedKey] == "string") n[checkedKey] = tools.eqs(n[checkedKey], "true");
+		n[checkedKey] = !!n[checkedKey];
+		n.checkedOld = n[checkedKey];
+		if (typeof n.nocheck == "string") n.nocheck = tools.eqs(n.nocheck, "true");
+		n.nocheck = !!n.nocheck || (setting.check.nocheckInherit && parentNode && !!parentNode.nocheck);
+		if (typeof n.chkDisabled == "string") n.chkDisabled = tools.eqs(n.chkDisabled, "true");
+		n.chkDisabled = !!n.chkDisabled || (setting.check.chkDisabledInherit && parentNode && !!parentNode.chkDisabled);
+		if (typeof n.halfCheck == "string") n.halfCheck = tools.eqs(n.halfCheck, "true");
+		n.halfCheck = !!n.halfCheck;
+		n.check_Child_State = -1;
+		n.check_Focus = false;
+		n.getCheckStatus = function() {return data.getCheckStatus(setting, n);};
+
+		if (setting.check.chkStyle == consts.radio.STYLE && setting.check.radioType == consts.radio.TYPE_ALL && n[checkedKey] ) {
+			var r = data.getRoot(setting);
+			r.radioCheckedList.push(n);
+		}
+	},
+	//add dom for check
+	_beforeA = function(setting, node, html) {
+		var checkedKey = setting.data.key.checked;
+		if (setting.check.enable) {
+			data.makeChkFlag(setting, node);
+			html.push("<span ID='", node.tId, consts.id.CHECK, "' class='", view.makeChkClass(setting, node), "' treeNode", consts.id.CHECK, (node.nocheck === true?" style='display:none;'":""),"></span>");
+		}
+	},
+	//update zTreeObj, add method of check
+	_zTreeTools = function(setting, zTreeTools) {
+		zTreeTools.checkNode = function(node, checked, checkTypeFlag, callbackFlag) {
+			var checkedKey = setting.data.key.checked;
+			if (node.chkDisabled === true) return;
+			if (checked !== true && checked !== false) {
+				checked = !node[checkedKey];
+			}
+			callbackFlag = !!callbackFlag;
+
+			if (node[checkedKey] === checked && !checkTypeFlag) {
+				return;
+			} else if (callbackFlag && tools.apply(this.setting.callback.beforeCheck, [setting.treeId, node], true) == false) {
+				return;
+			}
+			if (tools.uCanDo(this.setting) && setting.check.enable && node.nocheck !== true) {
+				node[checkedKey] = checked;
+				var checkObj = $$(node, consts.id.CHECK, setting);
+				if (checkTypeFlag || setting.check.chkStyle === consts.radio.STYLE) view.checkNodeRelation(setting, node);
+				view.setChkClass(setting, checkObj, node);
+				view.repairParentChkClassWithSelf(setting, node);
+				if (callbackFlag) {
+					setting.treeObj.trigger(consts.event.CHECK, [null, setting.treeId, node]);
+				}
+			}
+		}
+
+		zTreeTools.checkAllNodes = function(checked) {
+			view.repairAllChk(setting, !!checked);
+		}
+
+		zTreeTools.getCheckedNodes = function(checked) {
+			var childKey = setting.data.key.children;
+			checked = (checked !== false);
+			return data.getTreeCheckedNodes(setting, data.getRoot(setting)[childKey], checked);
+		}
+
+		zTreeTools.getChangeCheckedNodes = function() {
+			var childKey = setting.data.key.children;
+			return data.getTreeChangeCheckedNodes(setting, data.getRoot(setting)[childKey]);
+		}
+
+		zTreeTools.setChkDisabled = function(node, disabled, inheritParent, inheritChildren) {
+			disabled = !!disabled;
+			inheritParent = !!inheritParent;
+			inheritChildren = !!inheritChildren;
+			view.repairSonChkDisabled(setting, node, disabled, inheritChildren);
+			view.repairParentChkDisabled(setting, node.getParentNode(), disabled, inheritParent);
+		}
+
+		var _updateNode = zTreeTools.updateNode;
+		zTreeTools.updateNode = function(node, checkTypeFlag) {
+			if (_updateNode) _updateNode.apply(zTreeTools, arguments);
+			if (!node || !setting.check.enable) return;
+			var nObj = $$(node, setting);
+			if (nObj.get(0) && tools.uCanDo(setting)) {
+				var checkObj = $$(node, consts.id.CHECK, setting);
+				if (checkTypeFlag == true || setting.check.chkStyle === consts.radio.STYLE) view.checkNodeRelation(setting, node);
+				view.setChkClass(setting, checkObj, node);
+				view.repairParentChkClassWithSelf(setting, node);
+			}
+		}
+	},
+	//method of operate data
+	_data = {
+		getRadioCheckedList: function(setting) {
+			var checkedList = data.getRoot(setting).radioCheckedList;
+			for (var i=0, j=checkedList.length; i<j; i++) {
+				if(!data.getNodeCache(setting, checkedList[i].tId)) {
+					checkedList.splice(i, 1);
+					i--; j--;
+				}
+			}
+			return checkedList;
+		},
+		getCheckStatus: function(setting, node) {
+			if (!setting.check.enable || node.nocheck || node.chkDisabled) return null;
+			var checkedKey = setting.data.key.checked,
+			r = {
+				checked: node[checkedKey],
+				half: node.halfCheck ? node.halfCheck : (setting.check.chkStyle == consts.radio.STYLE ? (node.check_Child_State === 2) : (node[checkedKey] ? (node.check_Child_State > -1 && node.check_Child_State < 2) : (node.check_Child_State > 0)))
+			};
+			return r;
+		},
+		getTreeCheckedNodes: function(setting, nodes, checked, results) {
+			if (!nodes) return [];
+			var childKey = setting.data.key.children,
+			checkedKey = setting.data.key.checked,
+			onlyOne = (checked && setting.check.chkStyle == consts.radio.STYLE && setting.check.radioType == consts.radio.TYPE_ALL);
+			results = !results ? [] : results;
+			for (var i = 0, l = nodes.length; i < l; i++) {
+				if (nodes[i].nocheck !== true && nodes[i].chkDisabled !== true && nodes[i][checkedKey] == checked) {
+					results.push(nodes[i]);
+					if(onlyOne) {
+						break;
+					}
+				}
+				data.getTreeCheckedNodes(setting, nodes[i][childKey], checked, results);
+				if(onlyOne && results.length > 0) {
+					break;
+				}
+			}
+			return results;
+		},
+		getTreeChangeCheckedNodes: function(setting, nodes, results) {
+			if (!nodes) return [];
+			var childKey = setting.data.key.children,
+			checkedKey = setting.data.key.checked;
+			results = !results ? [] : results;
+			for (var i = 0, l = nodes.length; i < l; i++) {
+				if (nodes[i].nocheck !== true && nodes[i].chkDisabled !== true && nodes[i][checkedKey] != nodes[i].checkedOld) {
+					results.push(nodes[i]);
+				}
+				data.getTreeChangeCheckedNodes(setting, nodes[i][childKey], results);
+			}
+			return results;
+		},
+		makeChkFlag: function(setting, node) {
+			if (!node) return;
+			var childKey = setting.data.key.children,
+			checkedKey = setting.data.key.checked,
+			chkFlag = -1;
+			if (node[childKey]) {
+				for (var i = 0, l = node[childKey].length; i < l; i++) {
+					var cNode = node[childKey][i];
+					var tmp = -1;
+					if (setting.check.chkStyle == consts.radio.STYLE) {
+						if (cNode.nocheck === true || cNode.chkDisabled === true) {
+							tmp = cNode.check_Child_State;
+						} else if (cNode.halfCheck === true) {
+							tmp = 2;
+						} else if (cNode[checkedKey]) {
+							tmp = 2;
+						} else {
+							tmp = cNode.check_Child_State > 0 ? 2:0;
+						}
+						if (tmp == 2) {
+							chkFlag = 2; break;
+						} else if (tmp == 0){
+							chkFlag = 0;
+						}
+					} else if (setting.check.chkStyle == consts.checkbox.STYLE) {
+						if (cNode.nocheck === true || cNode.chkDisabled === true) {
+							tmp = cNode.check_Child_State;
+						} else if (cNode.halfCheck === true) {
+							tmp = 1;
+						} else if (cNode[checkedKey] ) {
+							tmp = (cNode.check_Child_State === -1 || cNode.check_Child_State === 2) ? 2 : 1;
+						} else {
+							tmp = (cNode.check_Child_State > 0) ? 1 : 0;
+						}
+						if (tmp === 1) {
+							chkFlag = 1; break;
+						} else if (tmp === 2 && chkFlag > -1 && i > 0 && tmp !== chkFlag) {
+							chkFlag = 1; break;
+						} else if (chkFlag === 2 && tmp > -1 && tmp < 2) {
+							chkFlag = 1; break;
+						} else if (tmp > -1) {
+							chkFlag = tmp;
+						}
+					}
+				}
+			}
+			node.check_Child_State = chkFlag;
+		}
+	},
+	//method of event proxy
+	_event = {
+
+	},
+	//method of event handler
+	_handler = {
+		onCheckNode: function (event, node) {
+			if (node.chkDisabled === true) return false;
+			var setting = data.getSetting(event.data.treeId),
+			checkedKey = setting.data.key.checked;
+			if (tools.apply(setting.callback.beforeCheck, [setting.treeId, node], true) == false) return true;
+			node[checkedKey] = !node[checkedKey];
+			view.checkNodeRelation(setting, node);
+			var checkObj = $$(node, consts.id.CHECK, setting);
+			view.setChkClass(setting, checkObj, node);
+			view.repairParentChkClassWithSelf(setting, node);
+			setting.treeObj.trigger(consts.event.CHECK, [event, setting.treeId, node]);
+			return true;
+		},
+		onMouseoverCheck: function(event, node) {
+			if (node.chkDisabled === true) return false;
+			var setting = data.getSetting(event.data.treeId),
+			checkObj = $$(node, consts.id.CHECK, setting);
+			node.check_Focus = true;
+			view.setChkClass(setting, checkObj, node);
+			return true;
+		},
+		onMouseoutCheck: function(event, node) {
+			if (node.chkDisabled === true) return false;
+			var setting = data.getSetting(event.data.treeId),
+			checkObj = $$(node, consts.id.CHECK, setting);
+			node.check_Focus = false;
+			view.setChkClass(setting, checkObj, node);
+			return true;
+		}
+	},
+	//method of tools for zTree
+	_tools = {
+
+	},
+	//method of operate ztree dom
+	_view = {
+		checkNodeRelation: function(setting, node) {
+			var pNode, i, l,
+			childKey = setting.data.key.children,
+			checkedKey = setting.data.key.checked,
+			r = consts.radio;
+			if (setting.check.chkStyle == r.STYLE) {
+				var checkedList = data.getRadioCheckedList(setting);
+				if (node[checkedKey]) {
+					if (setting.check.radioType == r.TYPE_ALL) {
+						for (i = checkedList.length-1; i >= 0; i--) {
+							pNode = checkedList[i];
+							pNode[checkedKey] = false;
+							checkedList.splice(i, 1);
+
+							view.setChkClass(setting, $$(pNode, consts.id.CHECK, setting), pNode);
+							if (pNode.parentTId != node.parentTId) {
+								view.repairParentChkClassWithSelf(setting, pNode);
+							}
+						}
+						checkedList.push(node);
+					} else {
+						var parentNode = (node.parentTId) ? node.getParentNode() : data.getRoot(setting);
+						for (i = 0, l = parentNode[childKey].length; i < l; i++) {
+							pNode = parentNode[childKey][i];
+							if (pNode[checkedKey] && pNode != node) {
+								pNode[checkedKey] = false;
+								view.setChkClass(setting, $$(pNode, consts.id.CHECK, setting), pNode);
+							}
+						}
+					}
+				} else if (setting.check.radioType == r.TYPE_ALL) {
+					for (i = 0, l = checkedList.length; i < l; i++) {
+						if (node == checkedList[i]) {
+							checkedList.splice(i, 1);
+							break;
+						}
+					}
+				}
+
+			} else {
+				if (node[checkedKey] && (!node[childKey] || node[childKey].length==0 || setting.check.chkboxType.Y.indexOf("s") > -1)) {
+					view.setSonNodeCheckBox(setting, node, true);
+				}
+				if (!node[checkedKey] && (!node[childKey] || node[childKey].length==0 || setting.check.chkboxType.N.indexOf("s") > -1)) {
+					view.setSonNodeCheckBox(setting, node, false);
+				}
+				if (node[checkedKey] && setting.check.chkboxType.Y.indexOf("p") > -1) {
+					view.setParentNodeCheckBox(setting, node, true);
+				}
+				if (!node[checkedKey] && setting.check.chkboxType.N.indexOf("p") > -1) {
+					view.setParentNodeCheckBox(setting, node, false);
+				}
+			}
+		},
+		makeChkClass: function(setting, node) {
+			var checkedKey = setting.data.key.checked,
+			c = consts.checkbox, r = consts.radio,
+			fullStyle = "";
+			if (node.chkDisabled === true) {
+				fullStyle = c.DISABLED;
+			} else if (node.halfCheck) {
+				fullStyle = c.PART;
+			} else if (setting.check.chkStyle == r.STYLE) {
+				fullStyle = (node.check_Child_State < 1)? c.FULL:c.PART;
+			} else {
+				fullStyle = node[checkedKey] ? ((node.check_Child_State === 2 || node.check_Child_State === -1) ? c.FULL:c.PART) : ((node.check_Child_State < 1)? c.FULL:c.PART);
+			}
+			var chkName = setting.check.chkStyle + "_" + (node[checkedKey] ? c.TRUE : c.FALSE) + "_" + fullStyle;
+			chkName = (node.check_Focus && node.chkDisabled !== true) ? chkName + "_" + c.FOCUS : chkName;
+			return consts.className.BUTTON + " " + c.DEFAULT + " " + chkName;
+		},
+		repairAllChk: function(setting, checked) {
+			if (setting.check.enable && setting.check.chkStyle === consts.checkbox.STYLE) {
+				var checkedKey = setting.data.key.checked,
+				childKey = setting.data.key.children,
+				root = data.getRoot(setting);
+				for (var i = 0, l = root[childKey].length; i<l ; i++) {
+					var node = root[childKey][i];
+					if (node.nocheck !== true && node.chkDisabled !== true) {
+						node[checkedKey] = checked;
+					}
+					view.setSonNodeCheckBox(setting, node, checked);
+				}
+			}
+		},
+		repairChkClass: function(setting, node) {
+			if (!node) return;
+			data.makeChkFlag(setting, node);
+			if (node.nocheck !== true) {
+				var checkObj = $$(node, consts.id.CHECK, setting);
+				view.setChkClass(setting, checkObj, node);
+			}
+		},
+		repairParentChkClass: function(setting, node) {
+			if (!node || !node.parentTId) return;
+			var pNode = node.getParentNode();
+			view.repairChkClass(setting, pNode);
+			view.repairParentChkClass(setting, pNode);
+		},
+		repairParentChkClassWithSelf: function(setting, node) {
+			if (!node) return;
+			var childKey = setting.data.key.children;
+			if (node[childKey] && node[childKey].length > 0) {
+				view.repairParentChkClass(setting, node[childKey][0]);
+			} else {
+				view.repairParentChkClass(setting, node);
+			}
+		},
+		repairSonChkDisabled: function(setting, node, chkDisabled, inherit) {
+			if (!node) return;
+			var childKey = setting.data.key.children;
+			if (node.chkDisabled != chkDisabled) {
+				node.chkDisabled = chkDisabled;
+			}
+			view.repairChkClass(setting, node);
+			if (node[childKey] && inherit) {
+				for (var i = 0, l = node[childKey].length; i < l; i++) {
+					var sNode = node[childKey][i];
+					view.repairSonChkDisabled(setting, sNode, chkDisabled, inherit);
+				}
+			}
+		},
+		repairParentChkDisabled: function(setting, node, chkDisabled, inherit) {
+			if (!node) return;
+			if (node.chkDisabled != chkDisabled && inherit) {
+				node.chkDisabled = chkDisabled;
+			}
+			view.repairChkClass(setting, node);
+			view.repairParentChkDisabled(setting, node.getParentNode(), chkDisabled, inherit);
+		},
+		setChkClass: function(setting, obj, node) {
+			if (!obj) return;
+			if (node.nocheck === true) {
+				obj.hide();
+			} else {
+				obj.show();
+			}
+			obj.removeClass();
+			obj.addClass(view.makeChkClass(setting, node));
+		},
+		setParentNodeCheckBox: function(setting, node, value, srcNode) {
+			var childKey = setting.data.key.children,
+			checkedKey = setting.data.key.checked,
+			checkObj = $$(node, consts.id.CHECK, setting);
+			if (!srcNode) srcNode = node;
+			data.makeChkFlag(setting, node);
+			if (node.nocheck !== true && node.chkDisabled !== true) {
+				node[checkedKey] = value;
+				view.setChkClass(setting, checkObj, node);
+				if (setting.check.autoCheckTrigger && node != srcNode) {
+					setting.treeObj.trigger(consts.event.CHECK, [null, setting.treeId, node]);
+				}
+			}
+			if (node.parentTId) {
+				var pSign = true;
+				if (!value) {
+					var pNodes = node.getParentNode()[childKey];
+					for (var i = 0, l = pNodes.length; i < l; i++) {
+						if ((pNodes[i].nocheck !== true && pNodes[i].chkDisabled !== true && pNodes[i][checkedKey])
+						|| ((pNodes[i].nocheck === true || pNodes[i].chkDisabled === true) && pNodes[i].check_Child_State > 0)) {
+							pSign = false;
+							break;
+						}
+					}
+				}
+				if (pSign) {
+					view.setParentNodeCheckBox(setting, node.getParentNode(), value, srcNode);
+				}
+			}
+		},
+		setSonNodeCheckBox: function(setting, node, value, srcNode) {
+			if (!node) return;
+			var childKey = setting.data.key.children,
+			checkedKey = setting.data.key.checked,
+			checkObj = $$(node, consts.id.CHECK, setting);
+			if (!srcNode) srcNode = node;
+
+			var hasDisable = false;
+			if (node[childKey]) {
+				for (var i = 0, l = node[childKey].length; i < l && node.chkDisabled !== true; i++) {
+					var sNode = node[childKey][i];
+					view.setSonNodeCheckBox(setting, sNode, value, srcNode);
+					if (sNode.chkDisabled === true) hasDisable = true;
+				}
+			}
+
+			if (node != data.getRoot(setting) && node.chkDisabled !== true) {
+				if (hasDisable && node.nocheck !== true) {
+					data.makeChkFlag(setting, node);
+				}
+				if (node.nocheck !== true && node.chkDisabled !== true) {
+					node[checkedKey] = value;
+					if (!hasDisable) node.check_Child_State = (node[childKey] && node[childKey].length > 0) ? (value ? 2 : 0) : -1;
+				} else {
+					node.check_Child_State = -1;
+				}
+				view.setChkClass(setting, checkObj, node);
+				if (setting.check.autoCheckTrigger && node != srcNode && node.nocheck !== true && node.chkDisabled !== true) {
+					setting.treeObj.trigger(consts.event.CHECK, [null, setting.treeId, node]);
+				}
+			}
+
+		}
+	},
+
+	_z = {
+		tools: _tools,
+		view: _view,
+		event: _event,
+		data: _data
+	};
+	$.extend(true, $.fn.zTree.consts, _consts);
+	$.extend(true, $.fn.zTree._z, _z);
+
+	var zt = $.fn.zTree,
+	tools = zt._z.tools,
+	consts = zt.consts,
+	view = zt._z.view,
+	data = zt._z.data,
+	event = zt._z.event,
+	$$ = tools.$;
+
+	data.exSetting(_setting);
+	data.addInitBind(_bindEvent);
+	data.addInitUnBind(_unbindEvent);
+	data.addInitCache(_initCache);
+	data.addInitNode(_initNode);
+	data.addInitProxy(_eventProxy, true);
+	data.addInitRoot(_initRoot);
+	data.addBeforeA(_beforeA);
+	data.addZTreeTools(_zTreeTools);
+
+	var _createNodes = view.createNodes;
+	view.createNodes = function(setting, level, nodes, parentNode) {
+		if (_createNodes) _createNodes.apply(view, arguments);
+		if (!nodes) return;
+		view.repairParentChkClassWithSelf(setting, parentNode);
+	}
+	var _removeNode = view.removeNode;
+	view.removeNode = function(setting, node) {
+		var parentNode = node.getParentNode();
+		if (_removeNode) _removeNode.apply(view, arguments);
+		if (!node || !parentNode) return;
+		view.repairChkClass(setting, parentNode);
+		view.repairParentChkClass(setting, parentNode);
+	}
+
+	var _appendNodes = view.appendNodes;
+	view.appendNodes = function(setting, level, nodes, parentNode, initFlag, openFlag) {
+		var html = "";
+		if (_appendNodes) {
+			html = _appendNodes.apply(view, arguments);
+		}
+		if (parentNode) {
+			data.makeChkFlag(setting, parentNode);
+		}
+		return html;
+	}
+})(jQuery);
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/js/jquery.ztree.excheck-3.5.min.js b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/js/jquery.ztree.excheck-3.5.min.js
new file mode 100644
index 0000000..3845590
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/js/jquery.ztree.excheck-3.5.min.js
@@ -0,0 +1,33 @@
+/*
+ * JQuery zTree excheck v3.5.15
+ * http://zTree.me/
+ *
+ * Copyright (c) 2010 Hunter.z
+ *
+ * Licensed same as jquery - MIT License
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ * email: hunter.z@263.net
+ * Date: 2013-10-15
+ */
+(function(m){var p,q,r,o={event:{CHECK:"ztree_check"},id:{CHECK:"_check"},checkbox:{STYLE:"checkbox",DEFAULT:"chk",DISABLED:"disable",FALSE:"false",TRUE:"true",FULL:"full",PART:"part",FOCUS:"focus"},radio:{STYLE:"radio",TYPE_ALL:"all",TYPE_LEVEL:"level"}},v={check:{enable:!1,autoCheckTrigger:!1,chkStyle:o.checkbox.STYLE,nocheckInherit:!1,chkDisabledInherit:!1,radioType:o.radio.TYPE_LEVEL,chkboxType:{Y:"ps",N:"ps"}},data:{key:{checked:"checked"}},callback:{beforeCheck:null,onCheck:null}};p=function(b,
+a){if(a.chkDisabled===!0)return!1;var c=f.getSetting(b.data.treeId),d=c.data.key.checked;if(k.apply(c.callback.beforeCheck,[c.treeId,a],!0)==!1)return!0;a[d]=!a[d];e.checkNodeRelation(c,a);d=n(a,j.id.CHECK,c);e.setChkClass(c,d,a);e.repairParentChkClassWithSelf(c,a);c.treeObj.trigger(j.event.CHECK,[b,c.treeId,a]);return!0};q=function(b,a){if(a.chkDisabled===!0)return!1;var c=f.getSetting(b.data.treeId),d=n(a,j.id.CHECK,c);a.check_Focus=!0;e.setChkClass(c,d,a);return!0};r=function(b,a){if(a.chkDisabled===
+!0)return!1;var c=f.getSetting(b.data.treeId),d=n(a,j.id.CHECK,c);a.check_Focus=!1;e.setChkClass(c,d,a);return!0};m.extend(!0,m.fn.zTree.consts,o);m.extend(!0,m.fn.zTree._z,{tools:{},view:{checkNodeRelation:function(b,a){var c,d,h,i=b.data.key.children,l=b.data.key.checked;c=j.radio;if(b.check.chkStyle==c.STYLE){var g=f.getRadioCheckedList(b);if(a[l])if(b.check.radioType==c.TYPE_ALL){for(d=g.length-1;d>=0;d--)c=g[d],c[l]=!1,g.splice(d,1),e.setChkClass(b,n(c,j.id.CHECK,b),c),c.parentTId!=a.parentTId&&
+e.repairParentChkClassWithSelf(b,c);g.push(a)}else{g=a.parentTId?a.getParentNode():f.getRoot(b);for(d=0,h=g[i].length;d<h;d++)c=g[i][d],c[l]&&c!=a&&(c[l]=!1,e.setChkClass(b,n(c,j.id.CHECK,b),c))}else if(b.check.radioType==c.TYPE_ALL)for(d=0,h=g.length;d<h;d++)if(a==g[d]){g.splice(d,1);break}}else a[l]&&(!a[i]||a[i].length==0||b.check.chkboxType.Y.indexOf("s")>-1)&&e.setSonNodeCheckBox(b,a,!0),!a[l]&&(!a[i]||a[i].length==0||b.check.chkboxType.N.indexOf("s")>-1)&&e.setSonNodeCheckBox(b,a,!1),a[l]&&
+b.check.chkboxType.Y.indexOf("p")>-1&&e.setParentNodeCheckBox(b,a,!0),!a[l]&&b.check.chkboxType.N.indexOf("p")>-1&&e.setParentNodeCheckBox(b,a,!1)},makeChkClass:function(b,a){var c=b.data.key.checked,d=j.checkbox,h=j.radio,i="",i=a.chkDisabled===!0?d.DISABLED:a.halfCheck?d.PART:b.check.chkStyle==h.STYLE?a.check_Child_State<1?d.FULL:d.PART:a[c]?a.check_Child_State===2||a.check_Child_State===-1?d.FULL:d.PART:a.check_Child_State<1?d.FULL:d.PART,c=b.check.chkStyle+"_"+(a[c]?d.TRUE:d.FALSE)+"_"+i,c=a.check_Focus&&
+a.chkDisabled!==!0?c+"_"+d.FOCUS:c;return j.className.BUTTON+" "+d.DEFAULT+" "+c},repairAllChk:function(b,a){if(b.check.enable&&b.check.chkStyle===j.checkbox.STYLE)for(var c=b.data.key.checked,d=b.data.key.children,h=f.getRoot(b),i=0,l=h[d].length;i<l;i++){var g=h[d][i];g.nocheck!==!0&&g.chkDisabled!==!0&&(g[c]=a);e.setSonNodeCheckBox(b,g,a)}},repairChkClass:function(b,a){if(a&&(f.makeChkFlag(b,a),a.nocheck!==!0)){var c=n(a,j.id.CHECK,b);e.setChkClass(b,c,a)}},repairParentChkClass:function(b,a){if(a&&
+a.parentTId){var c=a.getParentNode();e.repairChkClass(b,c);e.repairParentChkClass(b,c)}},repairParentChkClassWithSelf:function(b,a){if(a){var c=b.data.key.children;a[c]&&a[c].length>0?e.repairParentChkClass(b,a[c][0]):e.repairParentChkClass(b,a)}},repairSonChkDisabled:function(b,a,c,d){if(a){var h=b.data.key.children;if(a.chkDisabled!=c)a.chkDisabled=c;e.repairChkClass(b,a);if(a[h]&&d)for(var i=0,l=a[h].length;i<l;i++)e.repairSonChkDisabled(b,a[h][i],c,d)}},repairParentChkDisabled:function(b,a,c,
+d){if(a){if(a.chkDisabled!=c&&d)a.chkDisabled=c;e.repairChkClass(b,a);e.repairParentChkDisabled(b,a.getParentNode(),c,d)}},setChkClass:function(b,a,c){a&&(c.nocheck===!0?a.hide():a.show(),a.removeClass(),a.addClass(e.makeChkClass(b,c)))},setParentNodeCheckBox:function(b,a,c,d){var h=b.data.key.children,i=b.data.key.checked,l=n(a,j.id.CHECK,b);d||(d=a);f.makeChkFlag(b,a);a.nocheck!==!0&&a.chkDisabled!==!0&&(a[i]=c,e.setChkClass(b,l,a),b.check.autoCheckTrigger&&a!=d&&b.treeObj.trigger(j.event.CHECK,
+[null,b.treeId,a]));if(a.parentTId){l=!0;if(!c)for(var h=a.getParentNode()[h],g=0,k=h.length;g<k;g++)if(h[g].nocheck!==!0&&h[g].chkDisabled!==!0&&h[g][i]||(h[g].nocheck===!0||h[g].chkDisabled===!0)&&h[g].check_Child_State>0){l=!1;break}l&&e.setParentNodeCheckBox(b,a.getParentNode(),c,d)}},setSonNodeCheckBox:function(b,a,c,d){if(a){var h=b.data.key.children,i=b.data.key.checked,l=n(a,j.id.CHECK,b);d||(d=a);var g=!1;if(a[h])for(var k=0,m=a[h].length;k<m&&a.chkDisabled!==!0;k++){var o=a[h][k];e.setSonNodeCheckBox(b,
+o,c,d);o.chkDisabled===!0&&(g=!0)}if(a!=f.getRoot(b)&&a.chkDisabled!==!0){g&&a.nocheck!==!0&&f.makeChkFlag(b,a);if(a.nocheck!==!0&&a.chkDisabled!==!0){if(a[i]=c,!g)a.check_Child_State=a[h]&&a[h].length>0?c?2:0:-1}else a.check_Child_State=-1;e.setChkClass(b,l,a);b.check.autoCheckTrigger&&a!=d&&a.nocheck!==!0&&a.chkDisabled!==!0&&b.treeObj.trigger(j.event.CHECK,[null,b.treeId,a])}}}},event:{},data:{getRadioCheckedList:function(b){for(var a=f.getRoot(b).radioCheckedList,c=0,d=a.length;c<d;c++)f.getNodeCache(b,
+a[c].tId)||(a.splice(c,1),c--,d--);return a},getCheckStatus:function(b,a){if(!b.check.enable||a.nocheck||a.chkDisabled)return null;var c=b.data.key.checked;return{checked:a[c],half:a.halfCheck?a.halfCheck:b.check.chkStyle==j.radio.STYLE?a.check_Child_State===2:a[c]?a.check_Child_State>-1&&a.check_Child_State<2:a.check_Child_State>0}},getTreeCheckedNodes:function(b,a,c,d){if(!a)return[];for(var h=b.data.key.children,i=b.data.key.checked,e=c&&b.check.chkStyle==j.radio.STYLE&&b.check.radioType==j.radio.TYPE_ALL,
+d=!d?[]:d,g=0,k=a.length;g<k;g++){if(a[g].nocheck!==!0&&a[g].chkDisabled!==!0&&a[g][i]==c&&(d.push(a[g]),e))break;f.getTreeCheckedNodes(b,a[g][h],c,d);if(e&&d.length>0)break}return d},getTreeChangeCheckedNodes:function(b,a,c){if(!a)return[];for(var d=b.data.key.children,h=b.data.key.checked,c=!c?[]:c,i=0,e=a.length;i<e;i++)a[i].nocheck!==!0&&a[i].chkDisabled!==!0&&a[i][h]!=a[i].checkedOld&&c.push(a[i]),f.getTreeChangeCheckedNodes(b,a[i][d],c);return c},makeChkFlag:function(b,a){if(a){var c=b.data.key.children,
+d=b.data.key.checked,h=-1;if(a[c])for(var i=0,e=a[c].length;i<e;i++){var g=a[c][i],f=-1;if(b.check.chkStyle==j.radio.STYLE)if(f=g.nocheck===!0||g.chkDisabled===!0?g.check_Child_State:g.halfCheck===!0?2:g[d]?2:g.check_Child_State>0?2:0,f==2){h=2;break}else f==0&&(h=0);else if(b.check.chkStyle==j.checkbox.STYLE)if(f=g.nocheck===!0||g.chkDisabled===!0?g.check_Child_State:g.halfCheck===!0?1:g[d]?g.check_Child_State===-1||g.check_Child_State===2?2:1:g.check_Child_State>0?1:0,f===1){h=1;break}else if(f===
+2&&h>-1&&i>0&&f!==h){h=1;break}else if(h===2&&f>-1&&f<2){h=1;break}else f>-1&&(h=f)}a.check_Child_State=h}}}});var m=m.fn.zTree,k=m._z.tools,j=m.consts,e=m._z.view,f=m._z.data,n=k.$;f.exSetting(v);f.addInitBind(function(b){b.treeObj.bind(j.event.CHECK,function(a,c,d,h){k.apply(b.callback.onCheck,[c?c:a,d,h])})});f.addInitUnBind(function(b){b.treeObj.unbind(j.event.CHECK)});f.addInitCache(function(){});f.addInitNode(function(b,a,c,d){if(c){a=b.data.key.checked;typeof c[a]=="string"&&(c[a]=k.eqs(c[a],
+"true"));c[a]=!!c[a];c.checkedOld=c[a];if(typeof c.nocheck=="string")c.nocheck=k.eqs(c.nocheck,"true");c.nocheck=!!c.nocheck||b.check.nocheckInherit&&d&&!!d.nocheck;if(typeof c.chkDisabled=="string")c.chkDisabled=k.eqs(c.chkDisabled,"true");c.chkDisabled=!!c.chkDisabled||b.check.chkDisabledInherit&&d&&!!d.chkDisabled;if(typeof c.halfCheck=="string")c.halfCheck=k.eqs(c.halfCheck,"true");c.halfCheck=!!c.halfCheck;c.check_Child_State=-1;c.check_Focus=!1;c.getCheckStatus=function(){return f.getCheckStatus(b,
+c)};b.check.chkStyle==j.radio.STYLE&&b.check.radioType==j.radio.TYPE_ALL&&c[a]&&f.getRoot(b).radioCheckedList.push(c)}});f.addInitProxy(function(b){var a=b.target,c=f.getSetting(b.data.treeId),d="",h=null,e="",l=null;if(k.eqs(b.type,"mouseover")){if(c.check.enable&&k.eqs(a.tagName,"span")&&a.getAttribute("treeNode"+j.id.CHECK)!==null)d=k.getNodeMainDom(a).id,e="mouseoverCheck"}else if(k.eqs(b.type,"mouseout")){if(c.check.enable&&k.eqs(a.tagName,"span")&&a.getAttribute("treeNode"+j.id.CHECK)!==null)d=
+k.getNodeMainDom(a).id,e="mouseoutCheck"}else if(k.eqs(b.type,"click")&&c.check.enable&&k.eqs(a.tagName,"span")&&a.getAttribute("treeNode"+j.id.CHECK)!==null)d=k.getNodeMainDom(a).id,e="checkNode";if(d.length>0)switch(h=f.getNodeCache(c,d),e){case "checkNode":l=p;break;case "mouseoverCheck":l=q;break;case "mouseoutCheck":l=r}return{stop:e==="checkNode",node:h,nodeEventType:e,nodeEventCallback:l,treeEventType:"",treeEventCallback:null}},!0);f.addInitRoot(function(b){f.getRoot(b).radioCheckedList=[]});
+f.addBeforeA(function(b,a,c){b.check.enable&&(f.makeChkFlag(b,a),c.push("<span ID='",a.tId,j.id.CHECK,"' class='",e.makeChkClass(b,a),"' treeNode",j.id.CHECK,a.nocheck===!0?" style='display:none;'":"","></span>"))});f.addZTreeTools(function(b,a){a.checkNode=function(a,c,i,f){var g=b.data.key.checked;if(a.chkDisabled!==!0&&(c!==!0&&c!==!1&&(c=!a[g]),f=!!f,(a[g]!==c||i)&&!(f&&k.apply(this.setting.callback.beforeCheck,[b.treeId,a],!0)==!1)&&k.uCanDo(this.setting)&&b.check.enable&&a.nocheck!==!0))a[g]=
+c,c=n(a,j.id.CHECK,b),(i||b.check.chkStyle===j.radio.STYLE)&&e.checkNodeRelation(b,a),e.setChkClass(b,c,a),e.repairParentChkClassWithSelf(b,a),f&&b.treeObj.trigger(j.event.CHECK,[null,b.treeId,a])};a.checkAllNodes=function(a){e.repairAllChk(b,!!a)};a.getCheckedNodes=function(a){var c=b.data.key.children;return f.getTreeCheckedNodes(b,f.getRoot(b)[c],a!==!1)};a.getChangeCheckedNodes=function(){var a=b.data.key.children;return f.getTreeChangeCheckedNodes(b,f.getRoot(b)[a])};a.setChkDisabled=function(a,
+c,f,j){c=!!c;f=!!f;e.repairSonChkDisabled(b,a,c,!!j);e.repairParentChkDisabled(b,a.getParentNode(),c,f)};var c=a.updateNode;a.updateNode=function(d,f){c&&c.apply(a,arguments);if(d&&b.check.enable&&n(d,b).get(0)&&k.uCanDo(b)){var i=n(d,j.id.CHECK,b);(f==!0||b.check.chkStyle===j.radio.STYLE)&&e.checkNodeRelation(b,d);e.setChkClass(b,i,d);e.repairParentChkClassWithSelf(b,d)}}});var s=e.createNodes;e.createNodes=function(b,a,c,d){s&&s.apply(e,arguments);c&&e.repairParentChkClassWithSelf(b,d)};var t=e.removeNode;
+e.removeNode=function(b,a){var c=a.getParentNode();t&&t.apply(e,arguments);a&&c&&(e.repairChkClass(b,c),e.repairParentChkClass(b,c))};var u=e.appendNodes;e.appendNodes=function(b,a,c,d,h,i){var j="";u&&(j=u.apply(e,arguments));d&&f.makeChkFlag(b,d);return j}})(jQuery);
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/js/jquery.ztree.exedit-3.5.js b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/js/jquery.ztree.exedit-3.5.js
new file mode 100644
index 0000000..485b3a3
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/js/jquery.ztree.exedit-3.5.js
@@ -0,0 +1,1183 @@
+/*
+ * JQuery zTree exedit v3.5.15
+ * http://zTree.me/
+ *
+ * Copyright (c) 2010 Hunter.z
+ *
+ * Licensed same as jquery - MIT License
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ * email: hunter.z@263.net
+ * Date: 2013-10-15
+ */
+(function($){
+	//default consts of exedit
+	var _consts = {
+		event: {
+			DRAG: "ztree_drag",
+			DROP: "ztree_drop",
+			REMOVE: "ztree_remove",
+			RENAME: "ztree_rename"
+		},
+		id: {
+			EDIT: "_edit",
+			INPUT: "_input",
+			REMOVE: "_remove"
+		},
+		move: {
+			TYPE_INNER: "inner",
+			TYPE_PREV: "prev",
+			TYPE_NEXT: "next"
+		},
+		node: {
+			CURSELECTED_EDIT: "curSelectedNode_Edit",
+			TMPTARGET_TREE: "tmpTargetzTree",
+			TMPTARGET_NODE: "tmpTargetNode"
+		}
+	},
+	//default setting of exedit
+	_setting = {
+		edit: {
+			enable: false,
+			editNameSelectAll: false,
+			showRemoveBtn: true,
+			showRenameBtn: true,
+			removeTitle: "remove",
+			renameTitle: "rename",
+			drag: {
+				autoExpandTrigger: false,
+				isCopy: true,
+				isMove: true,
+				prev: true,
+				next: true,
+				inner: true,
+				minMoveSize: 5,
+				borderMax: 10,
+				borderMin: -5,
+				maxShowNodeNum: 5,
+				autoOpenTime: 500
+			}
+		},
+		view: {
+			addHoverDom: null,
+			removeHoverDom: null
+		},
+		callback: {
+			beforeDrag:null,
+			beforeDragOpen:null,
+			beforeDrop:null,
+			beforeEditName:null,
+			beforeRename:null,
+			onDrag:null,
+			onDrop:null,
+			onRename:null
+		}
+	},
+	//default root of exedit
+	_initRoot = function (setting) {
+		var r = data.getRoot(setting), rs = data.getRoots();
+		r.curEditNode = null;
+		r.curEditInput = null;
+		r.curHoverNode = null;
+		r.dragFlag = 0;
+		r.dragNodeShowBefore = [];
+		r.dragMaskList = new Array();
+		rs.showHoverDom = true;
+	},
+	//default cache of exedit
+	_initCache = function(treeId) {},
+	//default bind event of exedit
+	_bindEvent = function(setting) {
+		var o = setting.treeObj;
+		var c = consts.event;
+		o.bind(c.RENAME, function (event, treeId, treeNode, isCancel) {
+			tools.apply(setting.callback.onRename, [event, treeId, treeNode, isCancel]);
+		});
+
+		o.bind(c.REMOVE, function (event, treeId, treeNode) {
+			tools.apply(setting.callback.onRemove, [event, treeId, treeNode]);
+		});
+
+		o.bind(c.DRAG, function (event, srcEvent, treeId, treeNodes) {
+			tools.apply(setting.callback.onDrag, [srcEvent, treeId, treeNodes]);
+		});
+
+		o.bind(c.DROP, function (event, srcEvent, treeId, treeNodes, targetNode, moveType, isCopy) {
+			tools.apply(setting.callback.onDrop, [srcEvent, treeId, treeNodes, targetNode, moveType, isCopy]);
+		});
+	},
+	_unbindEvent = function(setting) {
+		var o = setting.treeObj;
+		var c = consts.event;
+		o.unbind(c.RENAME);
+		o.unbind(c.REMOVE);
+		o.unbind(c.DRAG);
+		o.unbind(c.DROP);
+	},
+	//default event proxy of exedit
+	_eventProxy = function(e) {
+		var target = e.target,
+		setting = data.getSetting(e.data.treeId),
+		relatedTarget = e.relatedTarget,
+		tId = "", node = null,
+		nodeEventType = "", treeEventType = "",
+		nodeEventCallback = null, treeEventCallback = null,
+		tmp = null;
+
+		if (tools.eqs(e.type, "mouseover")) {
+			tmp = tools.getMDom(setting, target, [{tagName:"a", attrName:"treeNode"+consts.id.A}]);
+			if (tmp) {
+				tId = tools.getNodeMainDom(tmp).id;
+				nodeEventType = "hoverOverNode";
+			}
+		} else if (tools.eqs(e.type, "mouseout")) {
+			tmp = tools.getMDom(setting, relatedTarget, [{tagName:"a", attrName:"treeNode"+consts.id.A}]);
+			if (!tmp) {
+				tId = "remove";
+				nodeEventType = "hoverOutNode";
+			}
+		} else if (tools.eqs(e.type, "mousedown")) {
+			tmp = tools.getMDom(setting, target, [{tagName:"a", attrName:"treeNode"+consts.id.A}]);
+			if (tmp) {
+				tId = tools.getNodeMainDom(tmp).id;
+				nodeEventType = "mousedownNode";
+			}
+		}
+		if (tId.length>0) {
+			node = data.getNodeCache(setting, tId);
+			switch (nodeEventType) {
+				case "mousedownNode" :
+					nodeEventCallback = _handler.onMousedownNode;
+					break;
+				case "hoverOverNode" :
+					nodeEventCallback = _handler.onHoverOverNode;
+					break;
+				case "hoverOutNode" :
+					nodeEventCallback = _handler.onHoverOutNode;
+					break;
+			}
+		}
+		var proxyResult = {
+			stop: false,
+			node: node,
+			nodeEventType: nodeEventType,
+			nodeEventCallback: nodeEventCallback,
+			treeEventType: treeEventType,
+			treeEventCallback: treeEventCallback
+		};
+		return proxyResult
+	},
+	//default init node of exedit
+	_initNode = function(setting, level, n, parentNode, isFirstNode, isLastNode, openFlag) {
+		if (!n) return;
+		n.isHover = false;
+		n.editNameFlag = false;
+	},
+	//update zTreeObj, add method of edit
+	_zTreeTools = function(setting, zTreeTools) {
+		zTreeTools.cancelEditName = function(newName) {
+			var root = data.getRoot(setting);
+			if (!root.curEditNode) return;
+			view.cancelCurEditNode(setting, newName?newName:null, true);
+		}
+		zTreeTools.copyNode = function(targetNode, node, moveType, isSilent) {
+			if (!node) return null;
+			if (targetNode && !targetNode.isParent && setting.data.keep.leaf && moveType === consts.move.TYPE_INNER) return null;
+			var newNode = tools.clone(node);
+			if (!targetNode) {
+				targetNode = null;
+				moveType = consts.move.TYPE_INNER;
+			}
+			if (moveType == consts.move.TYPE_INNER) {
+				function copyCallback() {
+					view.addNodes(setting, targetNode, [newNode], isSilent);
+				}
+
+				if (tools.canAsync(setting, targetNode)) {
+					view.asyncNode(setting, targetNode, isSilent, copyCallback);
+				} else {
+					copyCallback();
+				}
+			} else {
+				view.addNodes(setting, targetNode.parentNode, [newNode], isSilent);
+				view.moveNode(setting, targetNode, newNode, moveType, false, isSilent);
+			}
+			return newNode;
+		}
+		zTreeTools.editName = function(node) {
+			if (!node || !node.tId || node !== data.getNodeCache(setting, node.tId)) return;
+			if (node.parentTId) view.expandCollapseParentNode(setting, node.getParentNode(), true);
+			view.editNode(setting, node)
+		}
+		zTreeTools.moveNode = function(targetNode, node, moveType, isSilent) {
+			if (!node) return node;
+			if (targetNode && !targetNode.isParent && setting.data.keep.leaf && moveType === consts.move.TYPE_INNER) {
+				return null;
+			} else if (targetNode && ((node.parentTId == targetNode.tId && moveType == consts.move.TYPE_INNER) || $$(node, setting).find("#" + targetNode.tId).length > 0)) {
+				return null;
+			} else if (!targetNode) {
+				targetNode = null;
+			}
+			function moveCallback() {
+				view.moveNode(setting, targetNode, node, moveType, false, isSilent);
+			}
+			if (tools.canAsync(setting, targetNode) && moveType === consts.move.TYPE_INNER) {
+				view.asyncNode(setting, targetNode, isSilent, moveCallback);
+			} else {
+				moveCallback();
+			}
+			return node;
+		}
+		zTreeTools.setEditable = function(editable) {
+			setting.edit.enable = editable;
+			return this.refresh();
+		}
+	},
+	//method of operate data
+	_data = {
+		setSonNodeLevel: function(setting, parentNode, node) {
+			if (!node) return;
+			var childKey = setting.data.key.children;
+			node.level = (parentNode)? parentNode.level + 1 : 0;
+			if (!node[childKey]) return;
+			for (var i = 0, l = node[childKey].length; i < l; i++) {
+				if (node[childKey][i]) data.setSonNodeLevel(setting, node, node[childKey][i]);
+			}
+		}
+	},
+	//method of event proxy
+	_event = {
+
+	},
+	//method of event handler
+	_handler = {
+		onHoverOverNode: function(event, node) {
+			var setting = data.getSetting(event.data.treeId),
+			root = data.getRoot(setting);
+			if (root.curHoverNode != node) {
+				_handler.onHoverOutNode(event);
+			}
+			root.curHoverNode = node;
+			view.addHoverDom(setting, node);
+		},
+		onHoverOutNode: function(event, node) {
+			var setting = data.getSetting(event.data.treeId),
+			root = data.getRoot(setting);
+			if (root.curHoverNode && !data.isSelectedNode(setting, root.curHoverNode)) {
+				view.removeTreeDom(setting, root.curHoverNode);
+				root.curHoverNode = null;
+			}
+		},
+		onMousedownNode: function(eventMouseDown, _node) {
+			var i,l,
+			setting = data.getSetting(eventMouseDown.data.treeId),
+			root = data.getRoot(setting), roots = data.getRoots();
+			//right click can't drag & drop
+			if (eventMouseDown.button == 2 || !setting.edit.enable || (!setting.edit.drag.isCopy && !setting.edit.drag.isMove)) return true;
+
+			//input of edit node name can't drag & drop
+			var target = eventMouseDown.target,
+			_nodes = data.getRoot(setting).curSelectedList,
+			nodes = [];
+			if (!data.isSelectedNode(setting, _node)) {
+				nodes = [_node];
+			} else {
+				for (i=0, l=_nodes.length; i<l; i++) {
+					if (_nodes[i].editNameFlag && tools.eqs(target.tagName, "input") && target.getAttribute("treeNode"+consts.id.INPUT) !== null) {
+						return true;
+					}
+					nodes.push(_nodes[i]);
+					if (nodes[0].parentTId !== _nodes[i].parentTId) {
+						nodes = [_node];
+						break;
+					}
+				}
+			}
+
+			view.editNodeBlur = true;
+			view.cancelCurEditNode(setting);
+
+			var doc = $(setting.treeObj.get(0).ownerDocument),
+			body = $(setting.treeObj.get(0).ownerDocument.body), curNode, tmpArrow, tmpTarget,
+			isOtherTree = false,
+			targetSetting = setting,
+			sourceSetting = setting,
+			preNode, nextNode,
+			preTmpTargetNodeId = null,
+			preTmpMoveType = null,
+			tmpTargetNodeId = null,
+			moveType = consts.move.TYPE_INNER,
+			mouseDownX = eventMouseDown.clientX,
+			mouseDownY = eventMouseDown.clientY,
+			startTime = (new Date()).getTime();
+
+			if (tools.uCanDo(setting)) {
+				doc.bind("mousemove", _docMouseMove);
+			}
+			function _docMouseMove(event) {
+				//avoid start drag after click node
+				if (root.dragFlag == 0 && Math.abs(mouseDownX - event.clientX) < setting.edit.drag.minMoveSize
+					&& Math.abs(mouseDownY - event.clientY) < setting.edit.drag.minMoveSize) {
+					return true;
+				}
+				var i, l, tmpNode, tmpDom, tmpNodes,
+				childKey = setting.data.key.children;
+				body.css("cursor", "pointer");
+
+				if (root.dragFlag == 0) {
+					if (tools.apply(setting.callback.beforeDrag, [setting.treeId, nodes], true) == false) {
+						_docMouseUp(event);
+						return true;
+					}
+
+					for (i=0, l=nodes.length; i<l; i++) {
+						if (i==0) {
+							root.dragNodeShowBefore = [];
+						}
+						tmpNode = nodes[i];
+						if (tmpNode.isParent && tmpNode.open) {
+							view.expandCollapseNode(setting, tmpNode, !tmpNode.open);
+							root.dragNodeShowBefore[tmpNode.tId] = true;
+						} else {
+							root.dragNodeShowBefore[tmpNode.tId] = false;
+						}
+					}
+
+					root.dragFlag = 1;
+					roots.showHoverDom = false;
+					tools.showIfameMask(setting, true);
+
+					//sort
+					var isOrder = true, lastIndex = -1;
+					if (nodes.length>1) {
+						var pNodes = nodes[0].parentTId ? nodes[0].getParentNode()[childKey] : data.getNodes(setting);
+						tmpNodes = [];
+						for (i=0, l=pNodes.length; i<l; i++) {
+							if (root.dragNodeShowBefore[pNodes[i].tId] !== undefined) {
+								if (isOrder && lastIndex > -1 && (lastIndex+1) !== i) {
+									isOrder = false;
+								}
+								tmpNodes.push(pNodes[i]);
+								lastIndex = i;
+							}
+							if (nodes.length === tmpNodes.length) {
+								nodes = tmpNodes;
+								break;
+							}
+						}
+					}
+					if (isOrder) {
+						preNode = nodes[0].getPreNode();
+						nextNode = nodes[nodes.length-1].getNextNode();
+					}
+
+					//set node in selected
+					curNode = $$("<ul class='zTreeDragUL'></ul>", setting);
+					for (i=0, l=nodes.length; i<l; i++) {
+						tmpNode = nodes[i];
+						tmpNode.editNameFlag = false;
+						view.selectNode(setting, tmpNode, i>0);
+						view.removeTreeDom(setting, tmpNode);
+
+						tmpDom = $$("<li id='"+ tmpNode.tId +"_tmp'></li>", setting);
+						tmpDom.append($$(tmpNode, consts.id.A, setting).clone());
+						tmpDom.css("padding", "0");
+						tmpDom.children("#" + tmpNode.tId + consts.id.A).removeClass(consts.node.CURSELECTED);
+						curNode.append(tmpDom);
+						if (i == setting.edit.drag.maxShowNodeNum-1) {
+							tmpDom = $$("<li id='"+ tmpNode.tId +"_moretmp'><a>  ...  </a></li>", setting);
+							curNode.append(tmpDom);
+							break;
+						}
+					}
+					curNode.attr("id", nodes[0].tId + consts.id.UL + "_tmp");
+					curNode.addClass(setting.treeObj.attr("class"));
+					curNode.appendTo(body);
+
+					tmpArrow = $$("<span class='tmpzTreeMove_arrow'></span>", setting);
+					tmpArrow.attr("id", "zTreeMove_arrow_tmp");
+					tmpArrow.appendTo(body);
+
+					setting.treeObj.trigger(consts.event.DRAG, [event, setting.treeId, nodes]);
+				}
+
+				if (root.dragFlag == 1) {
+					if (tmpTarget && tmpArrow.attr("id") == event.target.id && tmpTargetNodeId && (event.clientX + doc.scrollLeft()+2) > ($("#" + tmpTargetNodeId + consts.id.A, tmpTarget).offset().left)) {
+						var xT = $("#" + tmpTargetNodeId + consts.id.A, tmpTarget);
+						event.target = (xT.length > 0) ? xT.get(0) : event.target;
+					} else if (tmpTarget) {
+						tmpTarget.removeClass(consts.node.TMPTARGET_TREE);
+						if (tmpTargetNodeId) $("#" + tmpTargetNodeId + consts.id.A, tmpTarget).removeClass(consts.node.TMPTARGET_NODE + "_" + consts.move.TYPE_PREV)
+							.removeClass(consts.node.TMPTARGET_NODE + "_" + _consts.move.TYPE_NEXT).removeClass(consts.node.TMPTARGET_NODE + "_" + _consts.move.TYPE_INNER);
+					}
+					tmpTarget = null;
+					tmpTargetNodeId = null;
+
+					//judge drag & drop in multi ztree
+					isOtherTree = false;
+					targetSetting = setting;
+					var settings = data.getSettings();
+					for (var s in settings) {
+						if (settings[s].treeId && settings[s].edit.enable && settings[s].treeId != setting.treeId
+							&& (event.target.id == settings[s].treeId || $(event.target).parents("#" + settings[s].treeId).length>0)) {
+							isOtherTree = true;
+							targetSetting = settings[s];
+						}
+					}
+
+					var docScrollTop = doc.scrollTop(),
+					docScrollLeft = doc.scrollLeft(),
+					treeOffset = targetSetting.treeObj.offset(),
+					scrollHeight = targetSetting.treeObj.get(0).scrollHeight,
+					scrollWidth = targetSetting.treeObj.get(0).scrollWidth,
+					dTop = (event.clientY + docScrollTop - treeOffset.top),
+					dBottom = (targetSetting.treeObj.height() + treeOffset.top - event.clientY - docScrollTop),
+					dLeft = (event.clientX + docScrollLeft - treeOffset.left),
+					dRight = (targetSetting.treeObj.width() + treeOffset.left - event.clientX - docScrollLeft),
+					isTop = (dTop < setting.edit.drag.borderMax && dTop > setting.edit.drag.borderMin),
+					isBottom = (dBottom < setting.edit.drag.borderMax && dBottom > setting.edit.drag.borderMin),
+					isLeft = (dLeft < setting.edit.drag.borderMax && dLeft > setting.edit.drag.borderMin),
+					isRight = (dRight < setting.edit.drag.borderMax && dRight > setting.edit.drag.borderMin),
+					isTreeInner = dTop > setting.edit.drag.borderMin && dBottom > setting.edit.drag.borderMin && dLeft > setting.edit.drag.borderMin && dRight > setting.edit.drag.borderMin,
+					isTreeTop = (isTop && targetSetting.treeObj.scrollTop() <= 0),
+					isTreeBottom = (isBottom && (targetSetting.treeObj.scrollTop() + targetSetting.treeObj.height()+10) >= scrollHeight),
+					isTreeLeft = (isLeft && targetSetting.treeObj.scrollLeft() <= 0),
+					isTreeRight = (isRight && (targetSetting.treeObj.scrollLeft() + targetSetting.treeObj.width()+10) >= scrollWidth);
+
+					if (event.target && tools.isChildOrSelf(event.target, targetSetting.treeId)) {
+						//get node <li> dom
+						var targetObj = event.target;
+						while (targetObj && targetObj.tagName && !tools.eqs(targetObj.tagName, "li") && targetObj.id != targetSetting.treeId) {
+							targetObj = targetObj.parentNode;
+						}
+
+						var canMove = true;
+						//don't move to self or children of self
+						for (i=0, l=nodes.length; i<l; i++) {
+							tmpNode = nodes[i];
+							if (targetObj.id === tmpNode.tId) {
+								canMove = false;
+								break;
+							} else if ($$(tmpNode, setting).find("#" + targetObj.id).length > 0) {
+								canMove = false;
+								break;
+							}
+						}
+						if (canMove && event.target && tools.isChildOrSelf(event.target, targetObj.id + consts.id.A)) {
+							tmpTarget = $(targetObj);
+							tmpTargetNodeId = targetObj.id;
+						}
+					}
+
+					//the mouse must be in zTree
+					tmpNode = nodes[0];
+					if (isTreeInner && tools.isChildOrSelf(event.target, targetSetting.treeId)) {
+						//judge mouse move in root of ztree
+						if (!tmpTarget && (event.target.id == targetSetting.treeId || isTreeTop || isTreeBottom || isTreeLeft || isTreeRight) && (isOtherTree || (!isOtherTree && tmpNode.parentTId))) {
+							tmpTarget = targetSetting.treeObj;
+						}
+						//auto scroll top
+						if (isTop) {
+							targetSetting.treeObj.scrollTop(targetSetting.treeObj.scrollTop()-10);
+						} else if (isBottom)  {
+							targetSetting.treeObj.scrollTop(targetSetting.treeObj.scrollTop()+10);
+						}
+						if (isLeft) {
+							targetSetting.treeObj.scrollLeft(targetSetting.treeObj.scrollLeft()-10);
+						} else if (isRight) {
+							targetSetting.treeObj.scrollLeft(targetSetting.treeObj.scrollLeft()+10);
+						}
+						//auto scroll left
+						if (tmpTarget && tmpTarget != targetSetting.treeObj && tmpTarget.offset().left < targetSetting.treeObj.offset().left) {
+							targetSetting.treeObj.scrollLeft(targetSetting.treeObj.scrollLeft()+ tmpTarget.offset().left - targetSetting.treeObj.offset().left);
+						}
+					}
+
+					curNode.css({
+						"top": (event.clientY + docScrollTop + 3) + "px",
+						"left": (event.clientX + docScrollLeft + 3) + "px"
+					});
+
+					var dX = 0;
+					var dY = 0;
+					if (tmpTarget && tmpTarget.attr("id")!=targetSetting.treeId) {
+						var tmpTargetNode = tmpTargetNodeId == null ? null: data.getNodeCache(targetSetting, tmpTargetNodeId),
+						isCopy = (event.ctrlKey && setting.edit.drag.isMove && setting.edit.drag.isCopy) || (!setting.edit.drag.isMove && setting.edit.drag.isCopy),
+						isPrev = !!(preNode && tmpTargetNodeId === preNode.tId),
+						isNext = !!(nextNode && tmpTargetNodeId === nextNode.tId),
+						isInner = (tmpNode.parentTId && tmpNode.parentTId == tmpTargetNodeId),
+						canPrev = (isCopy || !isNext) && tools.apply(targetSetting.edit.drag.prev, [targetSetting.treeId, nodes, tmpTargetNode], !!targetSetting.edit.drag.prev),
+						canNext = (isCopy || !isPrev) && tools.apply(targetSetting.edit.drag.next, [targetSetting.treeId, nodes, tmpTargetNode], !!targetSetting.edit.drag.next),
+						canInner = (isCopy || !isInner) && !(targetSetting.data.keep.leaf && !tmpTargetNode.isParent) && tools.apply(targetSetting.edit.drag.inner, [targetSetting.treeId, nodes, tmpTargetNode], !!targetSetting.edit.drag.inner);
+						if (!canPrev && !canNext && !canInner) {
+							tmpTarget = null;
+							tmpTargetNodeId = "";
+							moveType = consts.move.TYPE_INNER;
+							tmpArrow.css({
+								"display":"none"
+							});
+							if (window.zTreeMoveTimer) {
+								clearTimeout(window.zTreeMoveTimer);
+								window.zTreeMoveTargetNodeTId = null
+							}
+						} else {
+							var tmpTargetA = $("#" + tmpTargetNodeId + consts.id.A, tmpTarget),
+							tmpNextA = tmpTargetNode.isLastNode ? null : $("#" + tmpTargetNode.getNextNode().tId + consts.id.A, tmpTarget.next()),
+							tmpTop = tmpTargetA.offset().top,
+							tmpLeft = tmpTargetA.offset().left,
+							prevPercent = canPrev ? (canInner ? 0.25 : (canNext ? 0.5 : 1) ) : -1,
+							nextPercent = canNext ? (canInner ? 0.75 : (canPrev ? 0.5 : 0) ) : -1,
+							dY_percent = (event.clientY + docScrollTop - tmpTop)/tmpTargetA.height();
+							if ((prevPercent==1 ||dY_percent<=prevPercent && dY_percent>=-.2) && canPrev) {
+								dX = 1 - tmpArrow.width();
+								dY = tmpTop - tmpArrow.height()/2;
+								moveType = consts.move.TYPE_PREV;
+							} else if ((nextPercent==0 || dY_percent>=nextPercent && dY_percent<=1.2) && canNext) {
+								dX = 1 - tmpArrow.width();
+								dY = (tmpNextA == null || (tmpTargetNode.isParent && tmpTargetNode.open)) ? (tmpTop + tmpTargetA.height() - tmpArrow.height()/2) : (tmpNextA.offset().top - tmpArrow.height()/2);
+								moveType = consts.move.TYPE_NEXT;
+							}else {
+								dX = 5 - tmpArrow.width();
+								dY = tmpTop;
+								moveType = consts.move.TYPE_INNER;
+							}
+							tmpArrow.css({
+								"display":"block",
+								"top": dY + "px",
+								"left": (tmpLeft + dX) + "px"
+							});
+							tmpTargetA.addClass(consts.node.TMPTARGET_NODE + "_" + moveType);
+
+							if (preTmpTargetNodeId != tmpTargetNodeId || preTmpMoveType != moveType) {
+								startTime = (new Date()).getTime();
+							}
+							if (tmpTargetNode && tmpTargetNode.isParent && moveType == consts.move.TYPE_INNER) {
+								var startTimer = true;
+								if (window.zTreeMoveTimer && window.zTreeMoveTargetNodeTId !== tmpTargetNode.tId) {
+									clearTimeout(window.zTreeMoveTimer);
+									window.zTreeMoveTargetNodeTId = null;
+								}else if (window.zTreeMoveTimer && window.zTreeMoveTargetNodeTId === tmpTargetNode.tId) {
+									startTimer = false;
+								}
+								if (startTimer) {
+									window.zTreeMoveTimer = setTimeout(function() {
+										if (moveType != consts.move.TYPE_INNER) return;
+										if (tmpTargetNode && tmpTargetNode.isParent && !tmpTargetNode.open && (new Date()).getTime() - startTime > targetSetting.edit.drag.autoOpenTime
+											&& tools.apply(targetSetting.callback.beforeDragOpen, [targetSetting.treeId, tmpTargetNode], true)) {
+											view.switchNode(targetSetting, tmpTargetNode);
+											if (targetSetting.edit.drag.autoExpandTrigger) {
+												targetSetting.treeObj.trigger(consts.event.EXPAND, [targetSetting.treeId, tmpTargetNode]);
+											}
+										}
+									}, targetSetting.edit.drag.autoOpenTime+50);
+									window.zTreeMoveTargetNodeTId = tmpTargetNode.tId;
+								}
+							}
+						}
+					} else {
+						moveType = consts.move.TYPE_INNER;
+						if (tmpTarget && tools.apply(targetSetting.edit.drag.inner, [targetSetting.treeId, nodes, null], !!targetSetting.edit.drag.inner)) {
+							tmpTarget.addClass(consts.node.TMPTARGET_TREE);
+						} else {
+							tmpTarget = null;
+						}
+						tmpArrow.css({
+							"display":"none"
+						});
+						if (window.zTreeMoveTimer) {
+							clearTimeout(window.zTreeMoveTimer);
+							window.zTreeMoveTargetNodeTId = null;
+						}
+					}
+					preTmpTargetNodeId = tmpTargetNodeId;
+					preTmpMoveType = moveType;
+				}
+				return false;
+			}
+
+			doc.bind("mouseup", _docMouseUp);
+			function _docMouseUp(event) {
+				if (window.zTreeMoveTimer) {
+					clearTimeout(window.zTreeMoveTimer);
+					window.zTreeMoveTargetNodeTId = null;
+				}
+				preTmpTargetNodeId = null;
+				preTmpMoveType = null;
+				doc.unbind("mousemove", _docMouseMove);
+				doc.unbind("mouseup", _docMouseUp);
+				doc.unbind("selectstart", _docSelect);
+				body.css("cursor", "auto");
+				if (tmpTarget) {
+					tmpTarget.removeClass(consts.node.TMPTARGET_TREE);
+					if (tmpTargetNodeId) $("#" + tmpTargetNodeId + consts.id.A, tmpTarget).removeClass(consts.node.TMPTARGET_NODE + "_" + consts.move.TYPE_PREV)
+							.removeClass(consts.node.TMPTARGET_NODE + "_" + _consts.move.TYPE_NEXT).removeClass(consts.node.TMPTARGET_NODE + "_" + _consts.move.TYPE_INNER);
+				}
+				tools.showIfameMask(setting, false);
+
+				roots.showHoverDom = true;
+				if (root.dragFlag == 0) return;
+				root.dragFlag = 0;
+
+				var i, l, tmpNode;
+				for (i=0, l=nodes.length; i<l; i++) {
+					tmpNode = nodes[i];
+					if (tmpNode.isParent && root.dragNodeShowBefore[tmpNode.tId] && !tmpNode.open) {
+						view.expandCollapseNode(setting, tmpNode, !tmpNode.open);
+						delete root.dragNodeShowBefore[tmpNode.tId];
+					}
+				}
+
+				if (curNode) curNode.remove();
+				if (tmpArrow) tmpArrow.remove();
+
+				var isCopy = (event.ctrlKey && setting.edit.drag.isMove && setting.edit.drag.isCopy) || (!setting.edit.drag.isMove && setting.edit.drag.isCopy);
+				if (!isCopy && tmpTarget && tmpTargetNodeId && nodes[0].parentTId && tmpTargetNodeId==nodes[0].parentTId && moveType == consts.move.TYPE_INNER) {
+					tmpTarget = null;
+				}
+				if (tmpTarget) {
+					var dragTargetNode = tmpTargetNodeId == null ? null: data.getNodeCache(targetSetting, tmpTargetNodeId);
+					if (tools.apply(setting.callback.beforeDrop, [targetSetting.treeId, nodes, dragTargetNode, moveType, isCopy], true) == false) {
+						view.selectNodes(sourceSetting, nodes);
+						return;
+					}
+					var newNodes = isCopy ? tools.clone(nodes) : nodes;
+
+					function dropCallback() {
+						if (isOtherTree) {
+							if (!isCopy) {
+								for(var i=0, l=nodes.length; i<l; i++) {
+									view.removeNode(setting, nodes[i]);
+								}
+							}
+							if (moveType == consts.move.TYPE_INNER) {
+								view.addNodes(targetSetting, dragTargetNode, newNodes);
+							} else {
+								view.addNodes(targetSetting, dragTargetNode.getParentNode(), newNodes);
+								if (moveType == consts.move.TYPE_PREV) {
+									for (i=0, l=newNodes.length; i<l; i++) {
+										view.moveNode(targetSetting, dragTargetNode, newNodes[i], moveType, false);
+									}
+								} else {
+									for (i=-1, l=newNodes.length-1; i<l; l--) {
+										view.moveNode(targetSetting, dragTargetNode, newNodes[l], moveType, false);
+									}
+								}
+							}
+						} else {
+							if (isCopy && moveType == consts.move.TYPE_INNER) {
+								view.addNodes(targetSetting, dragTargetNode, newNodes);
+							} else {
+								if (isCopy) {
+									view.addNodes(targetSetting, dragTargetNode.getParentNode(), newNodes);
+								}
+								if (moveType != consts.move.TYPE_NEXT) {
+									for (i=0, l=newNodes.length; i<l; i++) {
+										view.moveNode(targetSetting, dragTargetNode, newNodes[i], moveType, false);
+									}
+								} else {
+									for (i=-1, l=newNodes.length-1; i<l; l--) {
+										view.moveNode(targetSetting, dragTargetNode, newNodes[l], moveType, false);
+									}
+								}
+							}
+						}
+						view.selectNodes(targetSetting, newNodes);
+						$$(newNodes[0], setting).focus().blur();
+
+						setting.treeObj.trigger(consts.event.DROP, [event, targetSetting.treeId, newNodes, dragTargetNode, moveType, isCopy]);
+					}
+
+					if (moveType == consts.move.TYPE_INNER && tools.canAsync(targetSetting, dragTargetNode)) {
+						view.asyncNode(targetSetting, dragTargetNode, false, dropCallback);
+					} else {
+						dropCallback();
+					}
+
+				} else {
+					view.selectNodes(sourceSetting, nodes);
+					setting.treeObj.trigger(consts.event.DROP, [event, setting.treeId, nodes, null, null, null]);
+				}
+			}
+
+			doc.bind("selectstart", _docSelect);
+			function _docSelect() {
+				return false;
+			}
+
+			//Avoid FireFox's Bug
+			//If zTree Div CSS set 'overflow', so drag node outside of zTree, and event.target is error.
+			if(eventMouseDown.preventDefault) {
+				eventMouseDown.preventDefault();
+			}
+			return true;
+		}
+	},
+	//method of tools for zTree
+	_tools = {
+		getAbs: function (obj) {
+			var oRect = obj.getBoundingClientRect(),
+			scrollTop = document.body.scrollTop+document.documentElement.scrollTop,
+			scrollLeft = document.body.scrollLeft+document.documentElement.scrollLeft;
+			return [oRect.left+scrollLeft,oRect.top+scrollTop];
+		},
+		inputFocus: function(inputObj) {
+			if (inputObj.get(0)) {
+				inputObj.focus();
+				tools.setCursorPosition(inputObj.get(0), inputObj.val().length);
+			}
+		},
+		inputSelect: function(inputObj) {
+			if (inputObj.get(0)) {
+				inputObj.focus();
+				inputObj.select();
+			}
+		},
+		setCursorPosition: function(obj, pos){
+			if(obj.setSelectionRange) {
+				obj.focus();
+				obj.setSelectionRange(pos,pos);
+			} else if (obj.createTextRange) {
+				var range = obj.createTextRange();
+				range.collapse(true);
+				range.moveEnd('character', pos);
+				range.moveStart('character', pos);
+				range.select();
+			}
+		},
+		showIfameMask: function(setting, showSign) {
+			var root = data.getRoot(setting);
+			//clear full mask
+			while (root.dragMaskList.length > 0) {
+				root.dragMaskList[0].remove();
+				root.dragMaskList.shift();
+			}
+			if (showSign) {
+				//show mask
+				var iframeList = $$("iframe", setting);
+				for (var i = 0, l = iframeList.length; i < l; i++) {
+					var obj = iframeList.get(i),
+					r = tools.getAbs(obj),
+					dragMask = $$("<div id='zTreeMask_" + i + "' class='zTreeMask' style='top:" + r[1] + "px; left:" + r[0] + "px; width:" + obj.offsetWidth + "px; height:" + obj.offsetHeight + "px;'></div>", setting);
+					dragMask.appendTo($$("body", setting));
+					root.dragMaskList.push(dragMask);
+				}
+			}
+		}
+	},
+	//method of operate ztree dom
+	_view = {
+		addEditBtn: function(setting, node) {
+			if (node.editNameFlag || $$(node, consts.id.EDIT, setting).length > 0) {
+				return;
+			}
+			if (!tools.apply(setting.edit.showRenameBtn, [setting.treeId, node], setting.edit.showRenameBtn)) {
+				return;
+			}
+			var aObj = $$(node, consts.id.A, setting),
+			editStr = "<span class='" + consts.className.BUTTON + " edit' id='" + node.tId + consts.id.EDIT + "' title='"+tools.apply(setting.edit.renameTitle, [setting.treeId, node], setting.edit.renameTitle)+"' treeNode"+consts.id.EDIT+" style='display:none;'></span>";
+			aObj.append(editStr);
+
+			$$(node, consts.id.EDIT, setting).bind('click',
+				function() {
+					if (!tools.uCanDo(setting) || tools.apply(setting.callback.beforeEditName, [setting.treeId, node], true) == false) return false;
+					view.editNode(setting, node);
+					return false;
+				}
+				).show();
+		},
+		addRemoveBtn: function(setting, node) {
+			if (node.editNameFlag || $$(node, consts.id.REMOVE, setting).length > 0) {
+				return;
+			}
+			if (!tools.apply(setting.edit.showRemoveBtn, [setting.treeId, node], setting.edit.showRemoveBtn)) {
+				return;
+			}
+			var aObj = $$(node, consts.id.A, setting),
+			removeStr = "<span class='" + consts.className.BUTTON + " remove' id='" + node.tId + consts.id.REMOVE + "' title='"+tools.apply(setting.edit.removeTitle, [setting.treeId, node], setting.edit.removeTitle)+"' treeNode"+consts.id.REMOVE+" style='display:none;'></span>";
+			aObj.append(removeStr);
+
+			$$(node, consts.id.REMOVE, setting).bind('click',
+				function() {
+					if (!tools.uCanDo(setting) || tools.apply(setting.callback.beforeRemove, [setting.treeId, node], true) == false) return false;
+					view.removeNode(setting, node);
+					setting.treeObj.trigger(consts.event.REMOVE, [setting.treeId, node]);
+					return false;
+				}
+				).bind('mousedown',
+				function(eventMouseDown) {
+					return true;
+				}
+				).show();
+		},
+		addHoverDom: function(setting, node) {
+			if (data.getRoots().showHoverDom) {
+				node.isHover = true;
+				if (setting.edit.enable) {
+					view.addEditBtn(setting, node);
+					view.addRemoveBtn(setting, node);
+				}
+				tools.apply(setting.view.addHoverDom, [setting.treeId, node]);
+			}
+		},
+		cancelCurEditNode: function (setting, forceName, isCancel) {
+			var root = data.getRoot(setting),
+			nameKey = setting.data.key.name,
+			node = root.curEditNode;
+
+			if (node) {
+				var inputObj = root.curEditInput,
+				newName = forceName ? forceName:(isCancel ? node[nameKey]: inputObj.val());
+				if (tools.apply(setting.callback.beforeRename, [setting.treeId, node, newName, isCancel], true) === false) {
+					return false;
+				} else {
+					node[nameKey] = newName;
+					setting.treeObj.trigger(consts.event.RENAME, [setting.treeId, node, isCancel]);
+				}
+				var aObj = $$(node, consts.id.A, setting);
+				aObj.removeClass(consts.node.CURSELECTED_EDIT);
+				inputObj.unbind();
+				view.setNodeName(setting, node);
+				node.editNameFlag = false;
+				root.curEditNode = null;
+				root.curEditInput = null;
+				view.selectNode(setting, node, false);
+			}
+			root.noSelection = true;
+			return true;
+		},
+		editNode: function(setting, node) {
+			var root = data.getRoot(setting);
+			view.editNodeBlur = false;
+			if (data.isSelectedNode(setting, node) && root.curEditNode == node && node.editNameFlag) {
+				setTimeout(function() {tools.inputFocus(root.curEditInput);}, 0);
+				return;
+			}
+			var nameKey = setting.data.key.name;
+			node.editNameFlag = true;
+			view.removeTreeDom(setting, node);
+			view.cancelCurEditNode(setting);
+			view.selectNode(setting, node, false);
+			$$(node, consts.id.SPAN, setting).html("<input type=text class='rename' id='" + node.tId + consts.id.INPUT + "' treeNode" + consts.id.INPUT + " >");
+			var inputObj = $$(node, consts.id.INPUT, setting);
+			inputObj.attr("value", node[nameKey]);
+			if (setting.edit.editNameSelectAll) {
+				tools.inputSelect(inputObj);
+			} else {
+				tools.inputFocus(inputObj);
+			}
+
+			inputObj.bind('blur', function(event) {
+				if (!view.editNodeBlur) {
+					view.cancelCurEditNode(setting);
+				}
+			}).bind('keydown', function(event) {
+				if (event.keyCode=="13") {
+					view.editNodeBlur = true;
+					view.cancelCurEditNode(setting);
+				} else if (event.keyCode=="27") {
+					view.cancelCurEditNode(setting, null, true);
+				}
+			}).bind('click', function(event) {
+				return false;
+			}).bind('dblclick', function(event) {
+				return false;
+			});
+
+			$$(node, consts.id.A, setting).addClass(consts.node.CURSELECTED_EDIT);
+			root.curEditInput = inputObj;
+			root.noSelection = false;
+			root.curEditNode = node;
+		},
+		moveNode: function(setting, targetNode, node, moveType, animateFlag, isSilent) {
+			var root = data.getRoot(setting),
+			childKey = setting.data.key.children;
+			if (targetNode == node) return;
+			if (setting.data.keep.leaf && targetNode && !targetNode.isParent && moveType == consts.move.TYPE_INNER) return;
+			var oldParentNode = (node.parentTId ? node.getParentNode(): root),
+			targetNodeIsRoot = (targetNode === null || targetNode == root);
+			if (targetNodeIsRoot && targetNode === null) targetNode = root;
+			if (targetNodeIsRoot) moveType = consts.move.TYPE_INNER;
+			var targetParentNode = (targetNode.parentTId ? targetNode.getParentNode() : root);
+
+			if (moveType != consts.move.TYPE_PREV && moveType != consts.move.TYPE_NEXT) {
+				moveType = consts.move.TYPE_INNER;
+			}
+
+			if (moveType == consts.move.TYPE_INNER) {
+				if (targetNodeIsRoot) {
+					//parentTId of root node is null
+					node.parentTId = null;
+				} else {
+					if (!targetNode.isParent) {
+						targetNode.isParent = true;
+						targetNode.open = !!targetNode.open;
+						view.setNodeLineIcos(setting, targetNode);
+					}
+					node.parentTId = targetNode.tId;
+				}
+			}
+
+			//move node Dom
+			var targetObj, target_ulObj;
+			if (targetNodeIsRoot) {
+				targetObj = setting.treeObj;
+				target_ulObj = targetObj;
+			} else {
+				if (!isSilent && moveType == consts.move.TYPE_INNER) {
+					view.expandCollapseNode(setting, targetNode, true, false);
+				} else if (!isSilent) {
+					view.expandCollapseNode(setting, targetNode.getParentNode(), true, false);
+				}
+				targetObj = $$(targetNode, setting);
+				target_ulObj = $$(targetNode, consts.id.UL, setting);
+				if (!!targetObj.get(0) && !target_ulObj.get(0)) {
+					var ulstr = [];
+					view.makeUlHtml(setting, targetNode, ulstr, '');
+					targetObj.append(ulstr.join(''));
+				}
+				target_ulObj = $$(targetNode, consts.id.UL, setting);
+			}
+			var nodeDom = $$(node, setting);
+			if (!nodeDom.get(0)) {
+				nodeDom = view.appendNodes(setting, node.level, [node], null, false, true).join('');
+			} else if (!targetObj.get(0)) {
+				nodeDom.remove();
+			}
+			if (target_ulObj.get(0) && moveType == consts.move.TYPE_INNER) {
+				target_ulObj.append(nodeDom);
+			} else if (targetObj.get(0) && moveType == consts.move.TYPE_PREV) {
+				targetObj.before(nodeDom);
+			} else if (targetObj.get(0) && moveType == consts.move.TYPE_NEXT) {
+				targetObj.after(nodeDom);
+			}
+
+			//repair the data after move
+			var i,l,
+			tmpSrcIndex = -1,
+			tmpTargetIndex = 0,
+			oldNeighbor = null,
+			newNeighbor = null,
+			oldLevel = node.level;
+			if (node.isFirstNode) {
+				tmpSrcIndex = 0;
+				if (oldParentNode[childKey].length > 1 ) {
+					oldNeighbor = oldParentNode[childKey][1];
+					oldNeighbor.isFirstNode = true;
+				}
+			} else if (node.isLastNode) {
+				tmpSrcIndex = oldParentNode[childKey].length -1;
+				oldNeighbor = oldParentNode[childKey][tmpSrcIndex - 1];
+				oldNeighbor.isLastNode = true;
+			} else {
+				for (i = 0, l = oldParentNode[childKey].length; i < l; i++) {
+					if (oldParentNode[childKey][i].tId == node.tId) {
+						tmpSrcIndex = i;
+						break;
+					}
+				}
+			}
+			if (tmpSrcIndex >= 0) {
+				oldParentNode[childKey].splice(tmpSrcIndex, 1);
+			}
+			if (moveType != consts.move.TYPE_INNER) {
+				for (i = 0, l = targetParentNode[childKey].length; i < l; i++) {
+					if (targetParentNode[childKey][i].tId == targetNode.tId) tmpTargetIndex = i;
+				}
+			}
+			if (moveType == consts.move.TYPE_INNER) {
+				if (!targetNode[childKey]) targetNode[childKey] = new Array();
+				if (targetNode[childKey].length > 0) {
+					newNeighbor = targetNode[childKey][targetNode[childKey].length - 1];
+					newNeighbor.isLastNode = false;
+				}
+				targetNode[childKey].splice(targetNode[childKey].length, 0, node);
+				node.isLastNode = true;
+				node.isFirstNode = (targetNode[childKey].length == 1);
+			} else if (targetNode.isFirstNode && moveType == consts.move.TYPE_PREV) {
+				targetParentNode[childKey].splice(tmpTargetIndex, 0, node);
+				newNeighbor = targetNode;
+				newNeighbor.isFirstNode = false;
+				node.parentTId = targetNode.parentTId;
+				node.isFirstNode = true;
+				node.isLastNode = false;
+
+			} else if (targetNode.isLastNode && moveType == consts.move.TYPE_NEXT) {
+				targetParentNode[childKey].splice(tmpTargetIndex + 1, 0, node);
+				newNeighbor = targetNode;
+				newNeighbor.isLastNode = false;
+				node.parentTId = targetNode.parentTId;
+				node.isFirstNode = false;
+				node.isLastNode = true;
+
+			} else {
+				if (moveType == consts.move.TYPE_PREV) {
+					targetParentNode[childKey].splice(tmpTargetIndex, 0, node);
+				} else {
+					targetParentNode[childKey].splice(tmpTargetIndex + 1, 0, node);
+				}
+				node.parentTId = targetNode.parentTId;
+				node.isFirstNode = false;
+				node.isLastNode = false;
+			}
+			data.fixPIdKeyValue(setting, node);
+			data.setSonNodeLevel(setting, node.getParentNode(), node);
+
+			//repair node what been moved
+			view.setNodeLineIcos(setting, node);
+			view.repairNodeLevelClass(setting, node, oldLevel)
+
+			//repair node's old parentNode dom
+			if (!setting.data.keep.parent && oldParentNode[childKey].length < 1) {
+				//old parentNode has no child nodes
+				oldParentNode.isParent = false;
+				oldParentNode.open = false;
+				var tmp_ulObj = $$(oldParentNode, consts.id.UL, setting),
+				tmp_switchObj = $$(oldParentNode, consts.id.SWITCH, setting),
+				tmp_icoObj = $$(oldParentNode, consts.id.ICON, setting);
+				view.replaceSwitchClass(oldParentNode, tmp_switchObj, consts.folder.DOCU);
+				view.replaceIcoClass(oldParentNode, tmp_icoObj, consts.folder.DOCU);
+				tmp_ulObj.css("display", "none");
+
+			} else if (oldNeighbor) {
+				//old neigbor node
+				view.setNodeLineIcos(setting, oldNeighbor);
+			}
+
+			//new neigbor node
+			if (newNeighbor) {
+				view.setNodeLineIcos(setting, newNeighbor);
+			}
+
+			//repair checkbox / radio
+			if (!!setting.check && setting.check.enable && view.repairChkClass) {
+				view.repairChkClass(setting, oldParentNode);
+				view.repairParentChkClassWithSelf(setting, oldParentNode);
+				if (oldParentNode != node.parent)
+					view.repairParentChkClassWithSelf(setting, node);
+			}
+
+			//expand parents after move
+			if (!isSilent) {
+				view.expandCollapseParentNode(setting, node.getParentNode(), true, animateFlag);
+			}
+		},
+		removeEditBtn: function(setting, node) {
+			$$(node, consts.id.EDIT, setting).unbind().remove();
+		},
+		removeRemoveBtn: function(setting, node) {
+			$$(node, consts.id.REMOVE, setting).unbind().remove();
+		},
+		removeTreeDom: function(setting, node) {
+			node.isHover = false;
+			view.removeEditBtn(setting, node);
+			view.removeRemoveBtn(setting, node);
+			tools.apply(setting.view.removeHoverDom, [setting.treeId, node]);
+		},
+		repairNodeLevelClass: function(setting, node, oldLevel) {
+			if (oldLevel === node.level) return;
+			var liObj = $$(node, setting),
+			aObj = $$(node, consts.id.A, setting),
+			ulObj = $$(node, consts.id.UL, setting),
+			oldClass = consts.className.LEVEL + oldLevel,
+			newClass = consts.className.LEVEL + node.level;
+			liObj.removeClass(oldClass);
+			liObj.addClass(newClass);
+			aObj.removeClass(oldClass);
+			aObj.addClass(newClass);
+			ulObj.removeClass(oldClass);
+			ulObj.addClass(newClass);
+		},
+		selectNodes : function(setting, nodes) {
+			for (var i=0, l=nodes.length; i<l; i++) {
+				view.selectNode(setting, nodes[i], i>0);
+			}
+		}
+	},
+
+	_z = {
+		tools: _tools,
+		view: _view,
+		event: _event,
+		data: _data
+	};
+	$.extend(true, $.fn.zTree.consts, _consts);
+	$.extend(true, $.fn.zTree._z, _z);
+
+	var zt = $.fn.zTree,
+	tools = zt._z.tools,
+	consts = zt.consts,
+	view = zt._z.view,
+	data = zt._z.data,
+	event = zt._z.event,
+	$$ = tools.$;
+
+	data.exSetting(_setting);
+	data.addInitBind(_bindEvent);
+	data.addInitUnBind(_unbindEvent);
+	data.addInitCache(_initCache);
+	data.addInitNode(_initNode);
+	data.addInitProxy(_eventProxy);
+	data.addInitRoot(_initRoot);
+	data.addZTreeTools(_zTreeTools);
+
+	var _cancelPreSelectedNode = view.cancelPreSelectedNode;
+	view.cancelPreSelectedNode = function (setting, node) {
+		var list = data.getRoot(setting).curSelectedList;
+		for (var i=0, j=list.length; i<j; i++) {
+			if (!node || node === list[i]) {
+				view.removeTreeDom(setting, list[i]);
+				if (node) break;
+			}
+		}
+		if (_cancelPreSelectedNode) _cancelPreSelectedNode.apply(view, arguments);
+	}
+
+	var _createNodes = view.createNodes;
+	view.createNodes = function(setting, level, nodes, parentNode) {
+		if (_createNodes) {
+			_createNodes.apply(view, arguments);
+		}
+		if (!nodes) return;
+		if (view.repairParentChkClassWithSelf) {
+			view.repairParentChkClassWithSelf(setting, parentNode);
+		}
+	}
+
+	var _makeNodeUrl = view.makeNodeUrl;
+	view.makeNodeUrl = function(setting, node) {
+		return setting.edit.enable ? null : (_makeNodeUrl.apply(view, arguments));
+	}
+
+	var _removeNode = view.removeNode;
+	view.removeNode = function(setting, node) {
+		var root = data.getRoot(setting);
+		if (root.curEditNode === node) root.curEditNode = null;
+		if (_removeNode) {
+			_removeNode.apply(view, arguments);
+		}
+	}
+
+	var _selectNode = view.selectNode;
+	view.selectNode = function(setting, node, addFlag) {
+		var root = data.getRoot(setting);
+		if (data.isSelectedNode(setting, node) && root.curEditNode == node && node.editNameFlag) {
+			return false;
+		}
+		if (_selectNode) _selectNode.apply(view, arguments);
+		view.addHoverDom(setting, node);
+		return true;
+	}
+
+	var _uCanDo = tools.uCanDo;
+	tools.uCanDo = function(setting, e) {
+		var root = data.getRoot(setting);
+		if (e && (tools.eqs(e.type, "mouseover") || tools.eqs(e.type, "mouseout") || tools.eqs(e.type, "mousedown") || tools.eqs(e.type, "mouseup"))) {
+			return true;
+		}
+		if (root.curEditNode) {
+			view.editNodeBlur = false;
+			root.curEditInput.focus();
+		}
+		return (!root.curEditNode) && (_uCanDo ? _uCanDo.apply(view, arguments) : true);
+	}
+})(jQuery);
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/js/jquery.ztree.exedit-3.5.min.js b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/js/jquery.ztree.exedit-3.5.min.js
new file mode 100644
index 0000000..c9eacef
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/js/jquery.ztree.exedit-3.5.min.js
@@ -0,0 +1,52 @@
+/*
+ * JQuery zTree exedit v3.5.15
+ * http://zTree.me/
+ *
+ * Copyright (c) 2010 Hunter.z
+ *
+ * Licensed same as jquery - MIT License
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ * email: hunter.z@263.net
+ * Date: 2013-10-15
+ */
+(function(w){var I={event:{DRAG:"ztree_drag",DROP:"ztree_drop",REMOVE:"ztree_remove",RENAME:"ztree_rename"},id:{EDIT:"_edit",INPUT:"_input",REMOVE:"_remove"},move:{TYPE_INNER:"inner",TYPE_PREV:"prev",TYPE_NEXT:"next"},node:{CURSELECTED_EDIT:"curSelectedNode_Edit",TMPTARGET_TREE:"tmpTargetzTree",TMPTARGET_NODE:"tmpTargetNode"}},x={onHoverOverNode:function(b,a){var c=n.getSetting(b.data.treeId),d=n.getRoot(c);if(d.curHoverNode!=a)x.onHoverOutNode(b);d.curHoverNode=a;e.addHoverDom(c,a)},onHoverOutNode:function(b){var b=
+n.getSetting(b.data.treeId),a=n.getRoot(b);if(a.curHoverNode&&!n.isSelectedNode(b,a.curHoverNode))e.removeTreeDom(b,a.curHoverNode),a.curHoverNode=null},onMousedownNode:function(b,a){function c(b){if(B.dragFlag==0&&Math.abs(N-b.clientX)<f.edit.drag.minMoveSize&&Math.abs(O-b.clientY)<f.edit.drag.minMoveSize)return!0;var a,c,o,k,i;i=f.data.key.children;M.css("cursor","pointer");if(B.dragFlag==0){if(g.apply(f.callback.beforeDrag,[f.treeId,m],!0)==!1)return l(b),!0;for(a=0,c=m.length;a<c;a++){if(a==0)B.dragNodeShowBefore=
+[];o=m[a];o.isParent&&o.open?(e.expandCollapseNode(f,o,!o.open),B.dragNodeShowBefore[o.tId]=!0):B.dragNodeShowBefore[o.tId]=!1}B.dragFlag=1;t.showHoverDom=!1;g.showIfameMask(f,!0);o=!0;k=-1;if(m.length>1){var j=m[0].parentTId?m[0].getParentNode()[i]:n.getNodes(f);i=[];for(a=0,c=j.length;a<c;a++)if(B.dragNodeShowBefore[j[a].tId]!==void 0&&(o&&k>-1&&k+1!==a&&(o=!1),i.push(j[a]),k=a),m.length===i.length){m=i;break}}o&&(H=m[0].getPreNode(),R=m[m.length-1].getNextNode());C=p("<ul class='zTreeDragUL'></ul>",
+f);for(a=0,c=m.length;a<c;a++)if(o=m[a],o.editNameFlag=!1,e.selectNode(f,o,a>0),e.removeTreeDom(f,o),k=p("<li id='"+o.tId+"_tmp'></li>",f),k.append(p(o,d.id.A,f).clone()),k.css("padding","0"),k.children("#"+o.tId+d.id.A).removeClass(d.node.CURSELECTED),C.append(k),a==f.edit.drag.maxShowNodeNum-1){k=p("<li id='"+o.tId+"_moretmp'><a>  ...  </a></li>",f);C.append(k);break}C.attr("id",m[0].tId+d.id.UL+"_tmp");C.addClass(f.treeObj.attr("class"));C.appendTo(M);A=p("<span class='tmpzTreeMove_arrow'></span>",
+f);A.attr("id","zTreeMove_arrow_tmp");A.appendTo(M);f.treeObj.trigger(d.event.DRAG,[b,f.treeId,m])}if(B.dragFlag==1){s&&A.attr("id")==b.target.id&&u&&b.clientX+F.scrollLeft()+2>w("#"+u+d.id.A,s).offset().left?(o=w("#"+u+d.id.A,s),b.target=o.length>0?o.get(0):b.target):s&&(s.removeClass(d.node.TMPTARGET_TREE),u&&w("#"+u+d.id.A,s).removeClass(d.node.TMPTARGET_NODE+"_"+d.move.TYPE_PREV).removeClass(d.node.TMPTARGET_NODE+"_"+I.move.TYPE_NEXT).removeClass(d.node.TMPTARGET_NODE+"_"+I.move.TYPE_INNER));
+u=s=null;J=!1;h=f;o=n.getSettings();for(var D in o)if(o[D].treeId&&o[D].edit.enable&&o[D].treeId!=f.treeId&&(b.target.id==o[D].treeId||w(b.target).parents("#"+o[D].treeId).length>0))J=!0,h=o[D];D=F.scrollTop();k=F.scrollLeft();i=h.treeObj.offset();a=h.treeObj.get(0).scrollHeight;o=h.treeObj.get(0).scrollWidth;c=b.clientY+D-i.top;var q=h.treeObj.height()+i.top-b.clientY-D,r=b.clientX+k-i.left,x=h.treeObj.width()+i.left-b.clientX-k;i=c<f.edit.drag.borderMax&&c>f.edit.drag.borderMin;var j=q<f.edit.drag.borderMax&&
+q>f.edit.drag.borderMin,K=r<f.edit.drag.borderMax&&r>f.edit.drag.borderMin,G=x<f.edit.drag.borderMax&&x>f.edit.drag.borderMin,q=c>f.edit.drag.borderMin&&q>f.edit.drag.borderMin&&r>f.edit.drag.borderMin&&x>f.edit.drag.borderMin,r=i&&h.treeObj.scrollTop()<=0,x=j&&h.treeObj.scrollTop()+h.treeObj.height()+10>=a,P=K&&h.treeObj.scrollLeft()<=0,Q=G&&h.treeObj.scrollLeft()+h.treeObj.width()+10>=o;if(b.target&&g.isChildOrSelf(b.target,h.treeId)){for(var E=b.target;E&&E.tagName&&!g.eqs(E.tagName,"li")&&E.id!=
+h.treeId;)E=E.parentNode;var S=!0;for(a=0,c=m.length;a<c;a++)if(o=m[a],E.id===o.tId){S=!1;break}else if(p(o,f).find("#"+E.id).length>0){S=!1;break}if(S&&b.target&&g.isChildOrSelf(b.target,E.id+d.id.A))s=w(E),u=E.id}o=m[0];if(q&&g.isChildOrSelf(b.target,h.treeId)){if(!s&&(b.target.id==h.treeId||r||x||P||Q)&&(J||!J&&o.parentTId))s=h.treeObj;i?h.treeObj.scrollTop(h.treeObj.scrollTop()-10):j&&h.treeObj.scrollTop(h.treeObj.scrollTop()+10);K?h.treeObj.scrollLeft(h.treeObj.scrollLeft()-10):G&&h.treeObj.scrollLeft(h.treeObj.scrollLeft()+
+10);s&&s!=h.treeObj&&s.offset().left<h.treeObj.offset().left&&h.treeObj.scrollLeft(h.treeObj.scrollLeft()+s.offset().left-h.treeObj.offset().left)}C.css({top:b.clientY+D+3+"px",left:b.clientX+k+3+"px"});i=a=0;if(s&&s.attr("id")!=h.treeId){var y=u==null?null:n.getNodeCache(h,u);c=b.ctrlKey&&f.edit.drag.isMove&&f.edit.drag.isCopy||!f.edit.drag.isMove&&f.edit.drag.isCopy;a=!!(H&&u===H.tId);i=!!(R&&u===R.tId);k=o.parentTId&&o.parentTId==u;o=(c||!i)&&g.apply(h.edit.drag.prev,[h.treeId,m,y],!!h.edit.drag.prev);
+a=(c||!a)&&g.apply(h.edit.drag.next,[h.treeId,m,y],!!h.edit.drag.next);G=(c||!k)&&!(h.data.keep.leaf&&!y.isParent)&&g.apply(h.edit.drag.inner,[h.treeId,m,y],!!h.edit.drag.inner);if(!o&&!a&&!G){if(s=null,u="",v=d.move.TYPE_INNER,A.css({display:"none"}),window.zTreeMoveTimer)clearTimeout(window.zTreeMoveTimer),window.zTreeMoveTargetNodeTId=null}else{c=w("#"+u+d.id.A,s);i=y.isLastNode?null:w("#"+y.getNextNode().tId+d.id.A,s.next());j=c.offset().top;k=c.offset().left;K=o?G?0.25:a?0.5:1:-1;G=a?G?0.75:
+o?0.5:0:-1;b=(b.clientY+D-j)/c.height();(K==1||b<=K&&b>=-0.2)&&o?(a=1-A.width(),i=j-A.height()/2,v=d.move.TYPE_PREV):(G==0||b>=G&&b<=1.2)&&a?(a=1-A.width(),i=i==null||y.isParent&&y.open?j+c.height()-A.height()/2:i.offset().top-A.height()/2,v=d.move.TYPE_NEXT):(a=5-A.width(),i=j,v=d.move.TYPE_INNER);A.css({display:"block",top:i+"px",left:k+a+"px"});c.addClass(d.node.TMPTARGET_NODE+"_"+v);if(T!=u||U!=v)L=(new Date).getTime();if(y&&y.isParent&&v==d.move.TYPE_INNER&&(b=!0,window.zTreeMoveTimer&&window.zTreeMoveTargetNodeTId!==
+y.tId?(clearTimeout(window.zTreeMoveTimer),window.zTreeMoveTargetNodeTId=null):window.zTreeMoveTimer&&window.zTreeMoveTargetNodeTId===y.tId&&(b=!1),b))window.zTreeMoveTimer=setTimeout(function(){v==d.move.TYPE_INNER&&y&&y.isParent&&!y.open&&(new Date).getTime()-L>h.edit.drag.autoOpenTime&&g.apply(h.callback.beforeDragOpen,[h.treeId,y],!0)&&(e.switchNode(h,y),h.edit.drag.autoExpandTrigger&&h.treeObj.trigger(d.event.EXPAND,[h.treeId,y]))},h.edit.drag.autoOpenTime+50),window.zTreeMoveTargetNodeTId=y.tId}}else if(v=
+d.move.TYPE_INNER,s&&g.apply(h.edit.drag.inner,[h.treeId,m,null],!!h.edit.drag.inner)?s.addClass(d.node.TMPTARGET_TREE):s=null,A.css({display:"none"}),window.zTreeMoveTimer)clearTimeout(window.zTreeMoveTimer),window.zTreeMoveTargetNodeTId=null;T=u;U=v}return!1}function l(b){if(window.zTreeMoveTimer)clearTimeout(window.zTreeMoveTimer),window.zTreeMoveTargetNodeTId=null;U=T=null;F.unbind("mousemove",c);F.unbind("mouseup",l);F.unbind("selectstart",k);M.css("cursor","auto");s&&(s.removeClass(d.node.TMPTARGET_TREE),
+u&&w("#"+u+d.id.A,s).removeClass(d.node.TMPTARGET_NODE+"_"+d.move.TYPE_PREV).removeClass(d.node.TMPTARGET_NODE+"_"+I.move.TYPE_NEXT).removeClass(d.node.TMPTARGET_NODE+"_"+I.move.TYPE_INNER));g.showIfameMask(f,!1);t.showHoverDom=!0;if(B.dragFlag!=0){B.dragFlag=0;var a,i,j;for(a=0,i=m.length;a<i;a++)j=m[a],j.isParent&&B.dragNodeShowBefore[j.tId]&&!j.open&&(e.expandCollapseNode(f,j,!j.open),delete B.dragNodeShowBefore[j.tId]);C&&C.remove();A&&A.remove();var q=b.ctrlKey&&f.edit.drag.isMove&&f.edit.drag.isCopy||
+!f.edit.drag.isMove&&f.edit.drag.isCopy;!q&&s&&u&&m[0].parentTId&&u==m[0].parentTId&&v==d.move.TYPE_INNER&&(s=null);if(s){var r=u==null?null:n.getNodeCache(h,u);if(g.apply(f.callback.beforeDrop,[h.treeId,m,r,v,q],!0)==!1)e.selectNodes(x,m);else{var z=q?g.clone(m):m;a=function(){if(J){if(!q)for(var a=0,c=m.length;a<c;a++)e.removeNode(f,m[a]);if(v==d.move.TYPE_INNER)e.addNodes(h,r,z);else if(e.addNodes(h,r.getParentNode(),z),v==d.move.TYPE_PREV)for(a=0,c=z.length;a<c;a++)e.moveNode(h,r,z[a],v,!1);else for(a=
+-1,c=z.length-1;a<c;c--)e.moveNode(h,r,z[c],v,!1)}else if(q&&v==d.move.TYPE_INNER)e.addNodes(h,r,z);else if(q&&e.addNodes(h,r.getParentNode(),z),v!=d.move.TYPE_NEXT)for(a=0,c=z.length;a<c;a++)e.moveNode(h,r,z[a],v,!1);else for(a=-1,c=z.length-1;a<c;c--)e.moveNode(h,r,z[c],v,!1);e.selectNodes(h,z);p(z[0],f).focus().blur();f.treeObj.trigger(d.event.DROP,[b,h.treeId,z,r,v,q])};v==d.move.TYPE_INNER&&g.canAsync(h,r)?e.asyncNode(h,r,!1,a):a()}}else e.selectNodes(x,m),f.treeObj.trigger(d.event.DROP,[b,f.treeId,
+m,null,null,null])}}function k(){return!1}var i,j,f=n.getSetting(b.data.treeId),B=n.getRoot(f),t=n.getRoots();if(b.button==2||!f.edit.enable||!f.edit.drag.isCopy&&!f.edit.drag.isMove)return!0;var q=b.target,r=n.getRoot(f).curSelectedList,m=[];if(n.isSelectedNode(f,a))for(i=0,j=r.length;i<j;i++){if(r[i].editNameFlag&&g.eqs(q.tagName,"input")&&q.getAttribute("treeNode"+d.id.INPUT)!==null)return!0;m.push(r[i]);if(m[0].parentTId!==r[i].parentTId){m=[a];break}}else m=[a];e.editNodeBlur=!0;e.cancelCurEditNode(f);
+var F=w(f.treeObj.get(0).ownerDocument),M=w(f.treeObj.get(0).ownerDocument.body),C,A,s,J=!1,h=f,x=f,H,R,T=null,U=null,u=null,v=d.move.TYPE_INNER,N=b.clientX,O=b.clientY,L=(new Date).getTime();g.uCanDo(f)&&F.bind("mousemove",c);F.bind("mouseup",l);F.bind("selectstart",k);b.preventDefault&&b.preventDefault();return!0}};w.extend(!0,w.fn.zTree.consts,I);w.extend(!0,w.fn.zTree._z,{tools:{getAbs:function(b){b=b.getBoundingClientRect();return[b.left+(document.body.scrollLeft+document.documentElement.scrollLeft),
+b.top+(document.body.scrollTop+document.documentElement.scrollTop)]},inputFocus:function(b){b.get(0)&&(b.focus(),g.setCursorPosition(b.get(0),b.val().length))},inputSelect:function(b){b.get(0)&&(b.focus(),b.select())},setCursorPosition:function(b,a){if(b.setSelectionRange)b.focus(),b.setSelectionRange(a,a);else if(b.createTextRange){var c=b.createTextRange();c.collapse(!0);c.moveEnd("character",a);c.moveStart("character",a);c.select()}},showIfameMask:function(b,a){for(var c=n.getRoot(b);c.dragMaskList.length>
+0;)c.dragMaskList[0].remove(),c.dragMaskList.shift();if(a)for(var d=p("iframe",b),e=0,i=d.length;e<i;e++){var j=d.get(e),f=g.getAbs(j),j=p("<div id='zTreeMask_"+e+"' class='zTreeMask' style='top:"+f[1]+"px; left:"+f[0]+"px; width:"+j.offsetWidth+"px; height:"+j.offsetHeight+"px;'></div>",b);j.appendTo(p("body",b));c.dragMaskList.push(j)}}},view:{addEditBtn:function(b,a){if(!(a.editNameFlag||p(a,d.id.EDIT,b).length>0)&&g.apply(b.edit.showRenameBtn,[b.treeId,a],b.edit.showRenameBtn)){var c=p(a,d.id.A,
+b),l="<span class='"+d.className.BUTTON+" edit' id='"+a.tId+d.id.EDIT+"' title='"+g.apply(b.edit.renameTitle,[b.treeId,a],b.edit.renameTitle)+"' treeNode"+d.id.EDIT+" style='display:none;'></span>";c.append(l);p(a,d.id.EDIT,b).bind("click",function(){if(!g.uCanDo(b)||g.apply(b.callback.beforeEditName,[b.treeId,a],!0)==!1)return!1;e.editNode(b,a);return!1}).show()}},addRemoveBtn:function(b,a){if(!(a.editNameFlag||p(a,d.id.REMOVE,b).length>0)&&g.apply(b.edit.showRemoveBtn,[b.treeId,a],b.edit.showRemoveBtn)){var c=
+p(a,d.id.A,b),l="<span class='"+d.className.BUTTON+" remove' id='"+a.tId+d.id.REMOVE+"' title='"+g.apply(b.edit.removeTitle,[b.treeId,a],b.edit.removeTitle)+"' treeNode"+d.id.REMOVE+" style='display:none;'></span>";c.append(l);p(a,d.id.REMOVE,b).bind("click",function(){if(!g.uCanDo(b)||g.apply(b.callback.beforeRemove,[b.treeId,a],!0)==!1)return!1;e.removeNode(b,a);b.treeObj.trigger(d.event.REMOVE,[b.treeId,a]);return!1}).bind("mousedown",function(){return!0}).show()}},addHoverDom:function(b,a){if(n.getRoots().showHoverDom)a.isHover=
+!0,b.edit.enable&&(e.addEditBtn(b,a),e.addRemoveBtn(b,a)),g.apply(b.view.addHoverDom,[b.treeId,a])},cancelCurEditNode:function(b,a,c){var l=n.getRoot(b),k=b.data.key.name,i=l.curEditNode;if(i){var j=l.curEditInput,a=a?a:c?i[k]:j.val();if(g.apply(b.callback.beforeRename,[b.treeId,i,a,c],!0)===!1)return!1;else i[k]=a,b.treeObj.trigger(d.event.RENAME,[b.treeId,i,c]);p(i,d.id.A,b).removeClass(d.node.CURSELECTED_EDIT);j.unbind();e.setNodeName(b,i);i.editNameFlag=!1;l.curEditNode=null;l.curEditInput=null;
+e.selectNode(b,i,!1)}return l.noSelection=!0},editNode:function(b,a){var c=n.getRoot(b);e.editNodeBlur=!1;if(n.isSelectedNode(b,a)&&c.curEditNode==a&&a.editNameFlag)setTimeout(function(){g.inputFocus(c.curEditInput)},0);else{var l=b.data.key.name;a.editNameFlag=!0;e.removeTreeDom(b,a);e.cancelCurEditNode(b);e.selectNode(b,a,!1);p(a,d.id.SPAN,b).html("<input type=text class='rename' id='"+a.tId+d.id.INPUT+"' treeNode"+d.id.INPUT+" >");var k=p(a,d.id.INPUT,b);k.attr("value",a[l]);b.edit.editNameSelectAll?
+g.inputSelect(k):g.inputFocus(k);k.bind("blur",function(){e.editNodeBlur||e.cancelCurEditNode(b)}).bind("keydown",function(a){a.keyCode=="13"?(e.editNodeBlur=!0,e.cancelCurEditNode(b)):a.keyCode=="27"&&e.cancelCurEditNode(b,null,!0)}).bind("click",function(){return!1}).bind("dblclick",function(){return!1});p(a,d.id.A,b).addClass(d.node.CURSELECTED_EDIT);c.curEditInput=k;c.noSelection=!1;c.curEditNode=a}},moveNode:function(b,a,c,l,k,i){var j=n.getRoot(b),f=b.data.key.children;if(a!=c&&(!b.data.keep.leaf||
+!a||a.isParent||l!=d.move.TYPE_INNER)){var g=c.parentTId?c.getParentNode():j,t=a===null||a==j;t&&a===null&&(a=j);if(t)l=d.move.TYPE_INNER;j=a.parentTId?a.getParentNode():j;if(l!=d.move.TYPE_PREV&&l!=d.move.TYPE_NEXT)l=d.move.TYPE_INNER;if(l==d.move.TYPE_INNER)if(t)c.parentTId=null;else{if(!a.isParent)a.isParent=!0,a.open=!!a.open,e.setNodeLineIcos(b,a);c.parentTId=a.tId}var q;t?q=t=b.treeObj:(!i&&l==d.move.TYPE_INNER?e.expandCollapseNode(b,a,!0,!1):i||e.expandCollapseNode(b,a.getParentNode(),!0,!1),
+t=p(a,b),q=p(a,d.id.UL,b),t.get(0)&&!q.get(0)&&(q=[],e.makeUlHtml(b,a,q,""),t.append(q.join(""))),q=p(a,d.id.UL,b));var r=p(c,b);r.get(0)?t.get(0)||r.remove():r=e.appendNodes(b,c.level,[c],null,!1,!0).join("");q.get(0)&&l==d.move.TYPE_INNER?q.append(r):t.get(0)&&l==d.move.TYPE_PREV?t.before(r):t.get(0)&&l==d.move.TYPE_NEXT&&t.after(r);var m=-1,w=0,x=null,t=null,C=c.level;if(c.isFirstNode){if(m=0,g[f].length>1)x=g[f][1],x.isFirstNode=!0}else if(c.isLastNode)m=g[f].length-1,x=g[f][m-1],x.isLastNode=
+!0;else for(q=0,r=g[f].length;q<r;q++)if(g[f][q].tId==c.tId){m=q;break}m>=0&&g[f].splice(m,1);if(l!=d.move.TYPE_INNER)for(q=0,r=j[f].length;q<r;q++)j[f][q].tId==a.tId&&(w=q);if(l==d.move.TYPE_INNER){a[f]||(a[f]=[]);if(a[f].length>0)t=a[f][a[f].length-1],t.isLastNode=!1;a[f].splice(a[f].length,0,c);c.isLastNode=!0;c.isFirstNode=a[f].length==1}else a.isFirstNode&&l==d.move.TYPE_PREV?(j[f].splice(w,0,c),t=a,t.isFirstNode=!1,c.parentTId=a.parentTId,c.isFirstNode=!0,c.isLastNode=!1):a.isLastNode&&l==d.move.TYPE_NEXT?
+(j[f].splice(w+1,0,c),t=a,t.isLastNode=!1,c.parentTId=a.parentTId,c.isFirstNode=!1,c.isLastNode=!0):(l==d.move.TYPE_PREV?j[f].splice(w,0,c):j[f].splice(w+1,0,c),c.parentTId=a.parentTId,c.isFirstNode=!1,c.isLastNode=!1);n.fixPIdKeyValue(b,c);n.setSonNodeLevel(b,c.getParentNode(),c);e.setNodeLineIcos(b,c);e.repairNodeLevelClass(b,c,C);!b.data.keep.parent&&g[f].length<1?(g.isParent=!1,g.open=!1,a=p(g,d.id.UL,b),l=p(g,d.id.SWITCH,b),f=p(g,d.id.ICON,b),e.replaceSwitchClass(g,l,d.folder.DOCU),e.replaceIcoClass(g,
+f,d.folder.DOCU),a.css("display","none")):x&&e.setNodeLineIcos(b,x);t&&e.setNodeLineIcos(b,t);b.check&&b.check.enable&&e.repairChkClass&&(e.repairChkClass(b,g),e.repairParentChkClassWithSelf(b,g),g!=c.parent&&e.repairParentChkClassWithSelf(b,c));i||e.expandCollapseParentNode(b,c.getParentNode(),!0,k)}},removeEditBtn:function(b,a){p(a,d.id.EDIT,b).unbind().remove()},removeRemoveBtn:function(b,a){p(a,d.id.REMOVE,b).unbind().remove()},removeTreeDom:function(b,a){a.isHover=!1;e.removeEditBtn(b,a);e.removeRemoveBtn(b,
+a);g.apply(b.view.removeHoverDom,[b.treeId,a])},repairNodeLevelClass:function(b,a,c){if(c!==a.level){var e=p(a,b),g=p(a,d.id.A,b),b=p(a,d.id.UL,b),c=d.className.LEVEL+c,a=d.className.LEVEL+a.level;e.removeClass(c);e.addClass(a);g.removeClass(c);g.addClass(a);b.removeClass(c);b.addClass(a)}},selectNodes:function(b,a){for(var c=0,d=a.length;c<d;c++)e.selectNode(b,a[c],c>0)}},event:{},data:{setSonNodeLevel:function(b,a,c){if(c){var d=b.data.key.children;c.level=a?a.level+1:0;if(c[d])for(var a=0,e=c[d].length;a<
+e;a++)c[d][a]&&n.setSonNodeLevel(b,c,c[d][a])}}}});var H=w.fn.zTree,g=H._z.tools,d=H.consts,e=H._z.view,n=H._z.data,p=g.$;n.exSetting({edit:{enable:!1,editNameSelectAll:!1,showRemoveBtn:!0,showRenameBtn:!0,removeTitle:"remove",renameTitle:"rename",drag:{autoExpandTrigger:!1,isCopy:!0,isMove:!0,prev:!0,next:!0,inner:!0,minMoveSize:5,borderMax:10,borderMin:-5,maxShowNodeNum:5,autoOpenTime:500}},view:{addHoverDom:null,removeHoverDom:null},callback:{beforeDrag:null,beforeDragOpen:null,beforeDrop:null,
+beforeEditName:null,beforeRename:null,onDrag:null,onDrop:null,onRename:null}});n.addInitBind(function(b){var a=b.treeObj,c=d.event;a.bind(c.RENAME,function(a,c,d,e){g.apply(b.callback.onRename,[a,c,d,e])});a.bind(c.REMOVE,function(a,c,d){g.apply(b.callback.onRemove,[a,c,d])});a.bind(c.DRAG,function(a,c,d,e){g.apply(b.callback.onDrag,[c,d,e])});a.bind(c.DROP,function(a,c,d,e,f,n,p){g.apply(b.callback.onDrop,[c,d,e,f,n,p])})});n.addInitUnBind(function(b){var b=b.treeObj,a=d.event;b.unbind(a.RENAME);
+b.unbind(a.REMOVE);b.unbind(a.DRAG);b.unbind(a.DROP)});n.addInitCache(function(){});n.addInitNode(function(b,a,c){if(c)c.isHover=!1,c.editNameFlag=!1});n.addInitProxy(function(b){var a=b.target,c=n.getSetting(b.data.treeId),e=b.relatedTarget,k="",i=null,j="",f=null,p=null;if(g.eqs(b.type,"mouseover")){if(p=g.getMDom(c,a,[{tagName:"a",attrName:"treeNode"+d.id.A}]))k=g.getNodeMainDom(p).id,j="hoverOverNode"}else if(g.eqs(b.type,"mouseout"))p=g.getMDom(c,e,[{tagName:"a",attrName:"treeNode"+d.id.A}]),
+p||(k="remove",j="hoverOutNode");else if(g.eqs(b.type,"mousedown")&&(p=g.getMDom(c,a,[{tagName:"a",attrName:"treeNode"+d.id.A}])))k=g.getNodeMainDom(p).id,j="mousedownNode";if(k.length>0)switch(i=n.getNodeCache(c,k),j){case "mousedownNode":f=x.onMousedownNode;break;case "hoverOverNode":f=x.onHoverOverNode;break;case "hoverOutNode":f=x.onHoverOutNode}return{stop:!1,node:i,nodeEventType:j,nodeEventCallback:f,treeEventType:"",treeEventCallback:null}});n.addInitRoot(function(b){var b=n.getRoot(b),a=n.getRoots();
+b.curEditNode=null;b.curEditInput=null;b.curHoverNode=null;b.dragFlag=0;b.dragNodeShowBefore=[];b.dragMaskList=[];a.showHoverDom=!0});n.addZTreeTools(function(b,a){a.cancelEditName=function(a){n.getRoot(b).curEditNode&&e.cancelCurEditNode(b,a?a:null,!0)};a.copyNode=function(a,l,k,i){if(!l)return null;if(a&&!a.isParent&&b.data.keep.leaf&&k===d.move.TYPE_INNER)return null;var j=g.clone(l);if(!a)a=null,k=d.move.TYPE_INNER;k==d.move.TYPE_INNER?(l=function(){e.addNodes(b,a,[j],i)},g.canAsync(b,a)?e.asyncNode(b,
+a,i,l):l()):(e.addNodes(b,a.parentNode,[j],i),e.moveNode(b,a,j,k,!1,i));return j};a.editName=function(a){a&&a.tId&&a===n.getNodeCache(b,a.tId)&&(a.parentTId&&e.expandCollapseParentNode(b,a.getParentNode(),!0),e.editNode(b,a))};a.moveNode=function(a,l,k,i){function j(){e.moveNode(b,a,l,k,!1,i)}if(!l)return l;if(a&&!a.isParent&&b.data.keep.leaf&&k===d.move.TYPE_INNER)return null;else if(a&&(l.parentTId==a.tId&&k==d.move.TYPE_INNER||p(l,b).find("#"+a.tId).length>0))return null;else a||(a=null);g.canAsync(b,
+a)&&k===d.move.TYPE_INNER?e.asyncNode(b,a,i,j):j();return l};a.setEditable=function(a){b.edit.enable=a;return this.refresh()}});var N=e.cancelPreSelectedNode;e.cancelPreSelectedNode=function(b,a){for(var c=n.getRoot(b).curSelectedList,d=0,g=c.length;d<g;d++)if(!a||a===c[d])if(e.removeTreeDom(b,c[d]),a)break;N&&N.apply(e,arguments)};var O=e.createNodes;e.createNodes=function(b,a,c,d){O&&O.apply(e,arguments);c&&e.repairParentChkClassWithSelf&&e.repairParentChkClassWithSelf(b,d)};var V=e.makeNodeUrl;
+e.makeNodeUrl=function(b,a){return b.edit.enable?null:V.apply(e,arguments)};var L=e.removeNode;e.removeNode=function(b,a){var c=n.getRoot(b);if(c.curEditNode===a)c.curEditNode=null;L&&L.apply(e,arguments)};var P=e.selectNode;e.selectNode=function(b,a,c){var d=n.getRoot(b);if(n.isSelectedNode(b,a)&&d.curEditNode==a&&a.editNameFlag)return!1;P&&P.apply(e,arguments);e.addHoverDom(b,a);return!0};var Q=g.uCanDo;g.uCanDo=function(b,a){var c=n.getRoot(b);if(a&&(g.eqs(a.type,"mouseover")||g.eqs(a.type,"mouseout")||
+g.eqs(a.type,"mousedown")||g.eqs(a.type,"mouseup")))return!0;if(c.curEditNode)e.editNodeBlur=!1,c.curEditInput.focus();return!c.curEditNode&&(Q?Q.apply(e,arguments):!0)}})(jQuery);
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/js/jquery.ztree.exhide-3.5.js b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/js/jquery.ztree.exhide-3.5.js
new file mode 100644
index 0000000..a35655d
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/js/jquery.ztree.exhide-3.5.js
@@ -0,0 +1,363 @@
+/*
+ * JQuery zTree exHideNodes v3.5.15
+ * http://zTree.me/
+ *
+ * Copyright (c) 2010 Hunter.z
+ *
+ * Licensed same as jquery - MIT License
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ * email: hunter.z@263.net
+ * Date: 2013-10-15
+ */
+(function($){
+	//default init node of exLib
+	var _initNode = function(setting, level, n, parentNode, isFirstNode, isLastNode, openFlag) {
+		if (typeof n.isHidden == "string") n.isHidden = tools.eqs(n.isHidden, "true");
+		n.isHidden = !!n.isHidden;
+		data.initHideForExCheck(setting, n);
+	},
+	//add dom for check
+	_beforeA = function(setting, node, html) {},
+	//update zTreeObj, add method of exLib
+	_zTreeTools = function(setting, zTreeTools) {
+		zTreeTools.showNodes = function(nodes, options) {
+			view.showNodes(setting, nodes, options);
+		}
+		zTreeTools.showNode = function(node, options) {
+			if (!node) {
+				return;
+			}
+			view.showNodes(setting, [node], options);
+		}
+		zTreeTools.hideNodes = function(nodes, options) {
+			view.hideNodes(setting, nodes, options);
+		}
+		zTreeTools.hideNode = function(node, options) {
+			if (!node) {
+				return;
+			}
+			view.hideNodes(setting, [node], options);
+		}
+
+		var _checkNode = zTreeTools.checkNode;
+		if (_checkNode) {
+			zTreeTools.checkNode = function(node, checked, checkTypeFlag, callbackFlag) {
+				if (!!node && !!node.isHidden) {
+					return;
+				}
+				_checkNode.apply(zTreeTools, arguments);
+			}
+		}
+	},
+	//method of operate data
+	_data = {
+		initHideForExCheck: function(setting, n) {
+			if (n.isHidden && setting.check && setting.check.enable) {
+				if(typeof n._nocheck == "undefined") {
+					n._nocheck = !!n.nocheck
+					n.nocheck = true;
+				}
+				n.check_Child_State = -1;
+				if (view.repairParentChkClassWithSelf) {
+					view.repairParentChkClassWithSelf(setting, n);
+				}
+			}
+		},
+		initShowForExCheck: function(setting, n) {
+			if (!n.isHidden && setting.check && setting.check.enable) {
+				if(typeof n._nocheck != "undefined") {
+					n.nocheck = n._nocheck;
+					delete n._nocheck;
+				}
+				if (view.setChkClass) {
+					var checkObj = $$(n, consts.id.CHECK, setting);
+					view.setChkClass(setting, checkObj, n);
+				}
+				if (view.repairParentChkClassWithSelf) {
+					view.repairParentChkClassWithSelf(setting, n);
+				}
+			}
+		}
+	},
+	//method of operate ztree dom
+	_view = {
+		clearOldFirstNode: function(setting, node) {
+			var n = node.getNextNode();
+			while(!!n){
+				if (n.isFirstNode) {
+					n.isFirstNode = false;
+					view.setNodeLineIcos(setting, n);
+					break;
+				}
+				if (n.isLastNode) {
+					break;
+				}
+				n = n.getNextNode();
+			}
+		},
+		clearOldLastNode: function(setting, node) {
+			var n = node.getPreNode();
+			while(!!n){
+				if (n.isLastNode) {
+					n.isLastNode = false;
+					view.setNodeLineIcos(setting, n);
+					break;
+				}
+				if (n.isFirstNode) {
+					break;
+				}
+				n = n.getPreNode();
+			}
+		},
+		makeDOMNodeMainBefore: function(html, setting, node) {
+			html.push("<li ", (node.isHidden ? "style='display:none;' " : ""), "id='", node.tId, "' class='", consts.className.LEVEL, node.level,"' tabindex='0' hidefocus='true' treenode>");
+		},
+		showNode: function(setting, node, options) {
+			node.isHidden = false;
+			data.initShowForExCheck(setting, node);
+			$$(node, setting).show();
+		},
+		showNodes: function(setting, nodes, options) {
+			if (!nodes || nodes.length == 0) {
+				return;
+			}
+			var pList = {}, i, j;
+			for (i=0, j=nodes.length; i<j; i++) {
+				var n = nodes[i];
+				if (!pList[n.parentTId]) {
+					var pn = n.getParentNode();
+					pList[n.parentTId] = (pn === null) ? data.getRoot(setting) : n.getParentNode();
+				}
+				view.showNode(setting, n, options);
+			}
+			for (var tId in pList) {
+				var children = pList[tId][setting.data.key.children];
+				view.setFirstNodeForShow(setting, children);
+				view.setLastNodeForShow(setting, children);
+			}
+		},
+		hideNode: function(setting, node, options) {
+			node.isHidden = true;
+			node.isFirstNode = false;
+			node.isLastNode = false;
+			data.initHideForExCheck(setting, node);
+			view.cancelPreSelectedNode(setting, node);
+			$$(node, setting).hide();
+		},
+		hideNodes: function(setting, nodes, options) {
+			if (!nodes || nodes.length == 0) {
+				return;
+			}
+			var pList = {}, i, j;
+			for (i=0, j=nodes.length; i<j; i++) {
+				var n = nodes[i];
+				if ((n.isFirstNode || n.isLastNode) && !pList[n.parentTId]) {
+					var pn = n.getParentNode();
+					pList[n.parentTId] = (pn === null) ? data.getRoot(setting) : n.getParentNode();
+				}
+				view.hideNode(setting, n, options);
+			}
+			for (var tId in pList) {
+				var children = pList[tId][setting.data.key.children];
+				view.setFirstNodeForHide(setting, children);
+				view.setLastNodeForHide(setting, children);
+			}
+		},
+		setFirstNode: function(setting, parentNode) {
+			var childKey = setting.data.key.children, childLength = parentNode[childKey].length;
+			if (childLength > 0 && !parentNode[childKey][0].isHidden) {
+				parentNode[childKey][0].isFirstNode = true;
+			} else if (childLength > 0) {
+				view.setFirstNodeForHide(setting, parentNode[childKey]);
+			}
+		},
+		setLastNode: function(setting, parentNode) {
+			var childKey = setting.data.key.children, childLength = parentNode[childKey].length;
+			if (childLength > 0 && !parentNode[childKey][0].isHidden) {
+				parentNode[childKey][childLength - 1].isLastNode = true;
+			} else if (childLength > 0) {
+				view.setLastNodeForHide(setting, parentNode[childKey]);
+			}
+		},
+		setFirstNodeForHide: function(setting, nodes) {
+			var n,i,j;
+			for (i=0, j=nodes.length; i<j; i++) {
+				n = nodes[i];
+				if (n.isFirstNode) {
+					break;
+				}
+				if (!n.isHidden && !n.isFirstNode) {
+					n.isFirstNode = true;
+					view.setNodeLineIcos(setting, n);
+					break;
+				} else {
+					n = null;
+				}
+			}
+			return n;
+		},
+		setFirstNodeForShow: function(setting, nodes) {
+			var n,i,j, first, old;
+			for(i=0, j=nodes.length; i<j; i++) {
+				n = nodes[i];
+				if (!first && !n.isHidden && n.isFirstNode) {
+					first = n;
+					break;
+				} else if (!first && !n.isHidden && !n.isFirstNode) {
+					n.isFirstNode = true;
+					first = n;
+					view.setNodeLineIcos(setting, n);
+				} else if (first && n.isFirstNode) {
+					n.isFirstNode = false;
+					old = n;
+					view.setNodeLineIcos(setting, n);
+					break;
+				} else {
+					n = null;
+				}
+			}
+			return {"new":first, "old":old};
+		},
+		setLastNodeForHide: function(setting, nodes) {
+			var n,i;
+			for (i=nodes.length-1; i>=0; i--) {
+				n = nodes[i];
+				if (n.isLastNode) {
+					break;
+				}
+				if (!n.isHidden && !n.isLastNode) {
+					n.isLastNode = true;
+					view.setNodeLineIcos(setting, n);
+					break;
+				} else {
+					n = null;
+				}
+			}
+			return n;
+		},
+		setLastNodeForShow: function(setting, nodes) {
+			var n,i,j, last, old;
+			for (i=nodes.length-1; i>=0; i--) {
+				n = nodes[i];
+				if (!last && !n.isHidden && n.isLastNode) {
+					last = n;
+					break;
+				} else if (!last && !n.isHidden && !n.isLastNode) {
+					n.isLastNode = true;
+					last = n;
+					view.setNodeLineIcos(setting, n);
+				} else if (last && n.isLastNode) {
+					n.isLastNode = false;
+					old = n;
+					view.setNodeLineIcos(setting, n);
+					break;
+				} else {
+					n = null;
+				}
+			}
+			return {"new":last, "old":old};
+		}
+	},
+
+	_z = {
+		view: _view,
+		data: _data
+	};
+	$.extend(true, $.fn.zTree._z, _z);
+
+	var zt = $.fn.zTree,
+	tools = zt._z.tools,
+	consts = zt.consts,
+	view = zt._z.view,
+	data = zt._z.data,
+	event = zt._z.event,
+	$$ = tools.$;
+
+	data.addInitNode(_initNode);
+	data.addBeforeA(_beforeA);
+	data.addZTreeTools(_zTreeTools);
+
+//	Override method in core
+	var _dInitNode = data.initNode;
+	data.initNode = function(setting, level, node, parentNode, isFirstNode, isLastNode, openFlag) {
+		var tmpPNode = (parentNode) ? parentNode: data.getRoot(setting),
+			children = tmpPNode[setting.data.key.children];
+		data.tmpHideFirstNode = view.setFirstNodeForHide(setting, children);
+		data.tmpHideLastNode = view.setLastNodeForHide(setting, children);
+		view.setNodeLineIcos(setting, data.tmpHideFirstNode);
+		view.setNodeLineIcos(setting, data.tmpHideLastNode);
+		isFirstNode = (data.tmpHideFirstNode === node);
+		isLastNode = (data.tmpHideLastNode === node);
+		if (_dInitNode) _dInitNode.apply(data, arguments);
+		if (isLastNode) {
+			view.clearOldLastNode(setting, node);
+		}
+	};
+
+	var _makeChkFlag = data.makeChkFlag;
+	if (!!_makeChkFlag) {
+		data.makeChkFlag = function(setting, node) {
+			if (!!node && !!node.isHidden) {
+				return;
+			}
+			_makeChkFlag.apply(data, arguments);
+		}
+	}
+
+	var _getTreeCheckedNodes = data.getTreeCheckedNodes;
+	if (!!_getTreeCheckedNodes) {
+		data.getTreeCheckedNodes = function(setting, nodes, checked, results) {
+			if (!!nodes && nodes.length > 0) {
+				var p = nodes[0].getParentNode();
+				if (!!p && !!p.isHidden) {
+					return [];
+				}
+			}
+			return _getTreeCheckedNodes.apply(data, arguments);
+		}
+	}
+
+	var _getTreeChangeCheckedNodes = data.getTreeChangeCheckedNodes;
+	if (!!_getTreeChangeCheckedNodes) {
+		data.getTreeChangeCheckedNodes = function(setting, nodes, results) {
+			if (!!nodes && nodes.length > 0) {
+				var p = nodes[0].getParentNode();
+				if (!!p && !!p.isHidden) {
+					return [];
+				}
+			}
+			return _getTreeChangeCheckedNodes.apply(data, arguments);
+		}
+	}
+
+	var _expandCollapseSonNode = view.expandCollapseSonNode;
+	if (!!_expandCollapseSonNode) {
+		view.expandCollapseSonNode = function(setting, node, expandFlag, animateFlag, callback) {
+			if (!!node && !!node.isHidden) {
+				return;
+			}
+			_expandCollapseSonNode.apply(view, arguments);
+		}
+	}
+
+	var _setSonNodeCheckBox = view.setSonNodeCheckBox;
+	if (!!_setSonNodeCheckBox) {
+		view.setSonNodeCheckBox = function(setting, node, value, srcNode) {
+			if (!!node && !!node.isHidden) {
+				return;
+			}
+			_setSonNodeCheckBox.apply(view, arguments);
+		}
+	}
+
+	var _repairParentChkClassWithSelf = view.repairParentChkClassWithSelf;
+	if (!!_repairParentChkClassWithSelf) {
+		view.repairParentChkClassWithSelf = function(setting, node) {
+			if (!!node && !!node.isHidden) {
+				return;
+			}
+			_repairParentChkClassWithSelf.apply(view, arguments);
+		}
+	}
+})(jQuery);
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/js/jquery.ztree.exhide-3.5.min.js b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/js/jquery.ztree.exhide-3.5.min.js
new file mode 100644
index 0000000..06c41b0
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/js/jquery.ztree.exhide-3.5.min.js
@@ -0,0 +1,22 @@
+/*
+ * JQuery zTree exHideNodes v3.5.15
+ * http://zTree.me/
+ *
+ * Copyright (c) 2010 Hunter.z
+ *
+ * Licensed same as jquery - MIT License
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ * email: hunter.z@263.net
+ * Date: 2013-10-15
+ */
+(function(i){i.extend(!0,i.fn.zTree._z,{view:{clearOldFirstNode:function(c,a){for(var b=a.getNextNode();b;){if(b.isFirstNode){b.isFirstNode=!1;d.setNodeLineIcos(c,b);break}if(b.isLastNode)break;b=b.getNextNode()}},clearOldLastNode:function(c,a){for(var b=a.getPreNode();b;){if(b.isLastNode){b.isLastNode=!1;d.setNodeLineIcos(c,b);break}if(b.isFirstNode)break;b=b.getPreNode()}},makeDOMNodeMainBefore:function(c,a,b){c.push("<li ",b.isHidden?"style='display:none;' ":"","id='",b.tId,"' class='",l.className.LEVEL,
+b.level,"' tabindex='0' hidefocus='true' treenode>")},showNode:function(c,a){a.isHidden=!1;f.initShowForExCheck(c,a);j(a,c).show()},showNodes:function(c,a,b){if(a&&a.length!=0){var e={},g,k;for(g=0,k=a.length;g<k;g++){var h=a[g];if(!e[h.parentTId]){var i=h.getParentNode();e[h.parentTId]=i===null?f.getRoot(c):h.getParentNode()}d.showNode(c,h,b)}for(var j in e)a=e[j][c.data.key.children],d.setFirstNodeForShow(c,a),d.setLastNodeForShow(c,a)}},hideNode:function(c,a){a.isHidden=!0;a.isFirstNode=!1;a.isLastNode=
+!1;f.initHideForExCheck(c,a);d.cancelPreSelectedNode(c,a);j(a,c).hide()},hideNodes:function(c,a,b){if(a&&a.length!=0){var e={},g,k;for(g=0,k=a.length;g<k;g++){var h=a[g];if((h.isFirstNode||h.isLastNode)&&!e[h.parentTId]){var i=h.getParentNode();e[h.parentTId]=i===null?f.getRoot(c):h.getParentNode()}d.hideNode(c,h,b)}for(var j in e)a=e[j][c.data.key.children],d.setFirstNodeForHide(c,a),d.setLastNodeForHide(c,a)}},setFirstNode:function(c,a){var b=c.data.key.children,e=a[b].length;e>0&&!a[b][0].isHidden?
+a[b][0].isFirstNode=!0:e>0&&d.setFirstNodeForHide(c,a[b])},setLastNode:function(c,a){var b=c.data.key.children,e=a[b].length;e>0&&!a[b][0].isHidden?a[b][e-1].isLastNode=!0:e>0&&d.setLastNodeForHide(c,a[b])},setFirstNodeForHide:function(c,a){var b,e,g;for(e=0,g=a.length;e<g;e++){b=a[e];if(b.isFirstNode)break;if(!b.isHidden&&!b.isFirstNode){b.isFirstNode=!0;d.setNodeLineIcos(c,b);break}else b=null}return b},setFirstNodeForShow:function(c,a){var b,e,g,f,h;for(e=0,g=a.length;e<g;e++)if(b=a[e],!f&&!b.isHidden&&
+b.isFirstNode){f=b;break}else if(!f&&!b.isHidden&&!b.isFirstNode)b.isFirstNode=!0,f=b,d.setNodeLineIcos(c,b);else if(f&&b.isFirstNode){b.isFirstNode=!1;h=b;d.setNodeLineIcos(c,b);break}return{"new":f,old:h}},setLastNodeForHide:function(c,a){var b,e;for(e=a.length-1;e>=0;e--){b=a[e];if(b.isLastNode)break;if(!b.isHidden&&!b.isLastNode){b.isLastNode=!0;d.setNodeLineIcos(c,b);break}else b=null}return b},setLastNodeForShow:function(c,a){var b,e,g,f;for(e=a.length-1;e>=0;e--)if(b=a[e],!g&&!b.isHidden&&
+b.isLastNode){g=b;break}else if(!g&&!b.isHidden&&!b.isLastNode)b.isLastNode=!0,g=b,d.setNodeLineIcos(c,b);else if(g&&b.isLastNode){b.isLastNode=!1;f=b;d.setNodeLineIcos(c,b);break}return{"new":g,old:f}}},data:{initHideForExCheck:function(c,a){if(a.isHidden&&c.check&&c.check.enable){if(typeof a._nocheck=="undefined")a._nocheck=!!a.nocheck,a.nocheck=!0;a.check_Child_State=-1;d.repairParentChkClassWithSelf&&d.repairParentChkClassWithSelf(c,a)}},initShowForExCheck:function(c,a){if(!a.isHidden&&c.check&&
+c.check.enable){if(typeof a._nocheck!="undefined")a.nocheck=a._nocheck,delete a._nocheck;if(d.setChkClass){var b=j(a,l.id.CHECK,c);d.setChkClass(c,b,a)}d.repairParentChkClassWithSelf&&d.repairParentChkClassWithSelf(c,a)}}}});var i=i.fn.zTree,m=i._z.tools,l=i.consts,d=i._z.view,f=i._z.data,j=m.$;f.addInitNode(function(c,a,b){if(typeof b.isHidden=="string")b.isHidden=m.eqs(b.isHidden,"true");b.isHidden=!!b.isHidden;f.initHideForExCheck(c,b)});f.addBeforeA(function(){});f.addZTreeTools(function(c,a){a.showNodes=
+function(a,b){d.showNodes(c,a,b)};a.showNode=function(a,b){a&&d.showNodes(c,[a],b)};a.hideNodes=function(a,b){d.hideNodes(c,a,b)};a.hideNode=function(a,b){a&&d.hideNodes(c,[a],b)};var b=a.checkNode;if(b)a.checkNode=function(c,d,f,h){(!c||!c.isHidden)&&b.apply(a,arguments)}});var n=f.initNode;f.initNode=function(c,a,b,e,g,i,h){var j=(e?e:f.getRoot(c))[c.data.key.children];f.tmpHideFirstNode=d.setFirstNodeForHide(c,j);f.tmpHideLastNode=d.setLastNodeForHide(c,j);d.setNodeLineIcos(c,f.tmpHideFirstNode);
+d.setNodeLineIcos(c,f.tmpHideLastNode);g=f.tmpHideFirstNode===b;i=f.tmpHideLastNode===b;n&&n.apply(f,arguments);i&&d.clearOldLastNode(c,b)};var o=f.makeChkFlag;if(o)f.makeChkFlag=function(c,a){(!a||!a.isHidden)&&o.apply(f,arguments)};var p=f.getTreeCheckedNodes;if(p)f.getTreeCheckedNodes=function(c,a,b,e){if(a&&a.length>0){var d=a[0].getParentNode();if(d&&d.isHidden)return[]}return p.apply(f,arguments)};var q=f.getTreeChangeCheckedNodes;if(q)f.getTreeChangeCheckedNodes=function(c,a,b){if(a&&a.length>
+0){var d=a[0].getParentNode();if(d&&d.isHidden)return[]}return q.apply(f,arguments)};var r=d.expandCollapseSonNode;if(r)d.expandCollapseSonNode=function(c,a,b,e,f){(!a||!a.isHidden)&&r.apply(d,arguments)};var s=d.setSonNodeCheckBox;if(s)d.setSonNodeCheckBox=function(c,a,b,e){(!a||!a.isHidden)&&s.apply(d,arguments)};var t=d.repairParentChkClassWithSelf;if(t)d.repairParentChkClassWithSelf=function(c,a){(!a||!a.isHidden)&&t.apply(d,arguments)}})(jQuery);
diff --git a/pluss-manage-page/src/main/resources/static/resources/auth/zTree/log v3.x.txt b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/log v3.x.txt
new file mode 100644
index 0000000..3b81e44
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/auth/zTree/log v3.x.txt	
@@ -0,0 +1,199 @@
+=ZTree v3.x (JQuery Tree插件) 更新日志=

+

+<font color="red">为了更好的优化及扩展zTree, 因此决定升级为v3.x，并且对之前的v2.x不兼容，会有很多结构上的修改，对此深感无奈与抱歉，请大家谅解。</font>

+<font color="red">

+

+具体修改内容可参考：

+

+   * [http://www.ztree.me/v3/api.php zTree v3.0 API 文档]

+

+   * [http://www.ztree.me/v3/demo.php#_101 zTree v3.0 Demo 演示]

+

+   * [http://www.ztree.me/v3/faq.php#_101 zTree v3.0 常见问题]

+

+</font>

+

+<font color=#041594>

+

+*2013.10.19* v3.5.15

+   * 【增加】setting.view.txtSelectedEnable 属性，满足部分项目中客户对于可以选择节点文本信息的强烈欲望。

+

+   * 【修改】 exhide 扩展包导致操作子节点后 isLastNode 属性异常 的bug

+   * 【修改】 使用 cancelEditName 方法时，beforeRename & onRename 的 isCancel 始终为 false 的bug

+   * 【修改】 编辑状态， beforeRename 回调 return false 时，提示信息导致 input 失去焦点后， 当树再次得到焦点时，让 input 自动获取焦点

+   * 【修改】 判断拖拽到节点的 <a> 标签中自定义的无 id 组件判断错误的bug

+   * 【修改】 async_edit.html demo 中 添加按钮 显示的 bug

+   * 【修改】 当没有开启异步加载模式下，对于没有子节点的父节点，即使设置 open=true 在初始化时也不会设置为展开状态的bug （对于异步加载模式下依然会强行设置为折叠状态）

+

+*2013.06.28* v3.5.14

+   * 【修改】 拖拽节点时 iframe 遮罩异常的bug

+   * 【修改】 清空子节点后重新添加子节点无法显示的bug

+

+*2013.06.02* v3.5.13

+

+   * 【增加】beforeRename & onRename 增加 isCancel 参数，可以监控用户 ESC 取消编辑的事件

+

+   * 【修改】初始化时 radioType="all", 父节点未展开 且 子节点有被勾选，点击其他 radio 时，不会取消勾选该子节点的bug

+   * 【修改】多棵树拖拽时，拖拽无效后会导致目标书已选择的节点清空的 bug。

+   * 【修改】多棵树拖拽时，会触发 addHoverDom 的bug。

+   * 【修改】多棵树拖拽时，由于 beforeDrog 或 prev / inner / next 返回 false 后未触发原始节点的 addHoverDom 的bug

+   * 【修改】异步加载时，对于未加载子节点的父节点使用 expandNode 方法时， sonSign 设置为 true后，导致异步加载的节点无法正常显示的bug

+   * 【修改】一次性加载全部数据，如果父节点 A 未展开，但下一级的父节点 A1 设置了 open=true 的时候，使用 expandAll 方法导致 A1 的下一级父节点出现重复的 bug

+   * 【修改】增加对 iframe 的支持，可以只在主页面加载 zTree 的 js，在 iframe 内创建树 [https://github.com/zTree/zTree_v3/issues/7 Issue Info]

+   * 【修改】引入 exhide 扩展包 导致页面上同时加载多棵树时，根节点 的 连接线图标出现异常 的 bug [http://tieba.baidu.com/p/2277416574]

+   * 【修改】excheck & exedit 扩展包中事件代理获取节点 tId 的方法，保证适当修改 DOM 结构也能得到 tId

+

+*2013.03.11* v3.5.12

+   * 【修改】由于 jquery 1.9 中移除 event.srcElement 导致的 js 报错的bug。

+   * 【修改】在异步加载模式下，使用 moveNode 方法，且 moveType != "inner" 时，也会导致 targetNode 自动加载子节点的 bug

+   * 【修改】对已经显示的节点(nochecked=true)使用 showNodes 或 showNode 方法后，导致勾选框出现的bug。

+   * 【修改】对已经隐藏的节点(nochecked=false)使用 hideNodes 或 hideNode 方法后，导致勾选框消失的bug。

+   * 【修改】getNodesByParamFuzzy 支持 大小写模糊。

+   * 【修改】className 结构，提取 _consts.className.BUTTON / LEVEL / ICO_LOADING / SWITCH，便于快速修改 css 冲突。

+     例如：与 WordPress 产生冲突后，直接修改 core 中的 "button" 和 "level" 即可。  Issue: https://github.com/zTree/zTree_v3/issues/2

+

+*2013.01.28* v3.5.02

+   * 【增加】setting.check.chkDisabledInherit 属性，用于设置 chkDisabled 在初始化时子节点是否可以继承父节点的 chkDisabled 属性

+   * 【删除】内部 noSel 方法，使用 selectstart事件 和 "-moz-user-select"样式 处理禁止 节点文字被选择的功能

+   * 【修改】不兼容 jQuery 1.9 的bug

+   * 【修改】onDrop 的触发规则，保证异步加载模式下，可以在延迟加载结束后触发，避免 onDrop 中被拖拽的节点是已经更新后的数据。

+   * 【修改】setChkDisabled 方法，增加 inheritParent, inheritChildren 参数设置是否让父子节点继承 disabled

+   * 【修改】异步加载时 拼接参数的方法，由 string 修改为 json 对象

+   * 【修正】1-2-3 3级节点时，如果 2级节点 全部设置为 nocheck 或 chkDisabled后，勾选3级节点时，1级节点的半勾选状态错误的 bug

+   * 【修改】Demo: checkbox_nocheck.html & checkbox_chkDisabled.html;

+   * 【修改】Demo: edit_super.html，增加 showRenameBtn & showRemoveBtn 的演示

+   * 【修改】Demo: asyncForAll, 将 post 修改为 get；为了避免由于 IE10 的 bug 造成的客户端 以及 服务端崩溃

+      IE10 ajax Post 无法提交参数的bug (http://bugs.jquery.com/ticket/12790)

+

+*2012.12.21* v3.5.01

+   * 【优化】clone 方法

+   * 【修正】对于初始化无 children 属性的父节点进行 reAsyncChildNodes 操作时出错的 bug

+   * 【修正】beforeRename 回调中使用 cancelEditName 方法后，再 return false 导致无法重新进行编辑的 bug

+   * 【修正】exedit 扩展包让 setting.data.key.url 失效的 bug

+   * 【修正】setting.check.autoCheckTrigger 设置为 true 时，onCheck 回调缺少 event 参数的 bug

+   * 【修正】singlepath.html Demo 中的 bug

+

+*2012.11.20* v3.5

+   * 【优化】原先的 clone 方法 （特别感谢：愚人码头）

+   * 【修改】隐藏父节点后，使用 expandAll 方法导致 父节点展开的 bug

+   * 【修改】使用 jQuery v1.7 以上时，设置 zTree 容器 ul 隐藏（visibility: hidden;）后， 调用 selectNode 导致 IE 浏览器报错 Can't move focus 的 bug

+   * 【修改】正在异步加载时，执行 destory 或 init 方法后，异步加载的节点影响新树的 bug

+   * 【修改】方法 reAsyncChildNodes 在 refresh 的时候未清空内部 cache 导致内存泄露 的 bug

+   * 【修改】批量节点拖拽到其他父节点内（inner）时，导致顺序反转 的 bug

+   * 【修改】对于 使用 html格式的 节点无法触发 双击事件 的 bug

+   * 【修改】onCheck 回调中的 event ，保证与触发事件中的 event 一致

+   * 【修改】异步加载时，在 onNodeCreated 中执行 selectNode 后，导致节点折叠的 bug

+   * 【修改】API 中 dataFilter 的参数名称 childNodes ->  responseData

+   * 【修改】API 中 iconSkin 的 举例内容

+   * 【修改】API 中 chkDisabled 的说明

+   * 【修改】Demo 中 index.html 内的 loadReady 重复绑定问题

+

+*2012.09.03* v3.4

+   * 【增加】 Demo —— OutLook 样式的左侧菜单

+   * 【增加】清空 zTree 的方法 $.fn.zTree.destory(treeId) & zTree.destory()

+

+   * 【修改】core核心文件内 _eventProxy 方法中获取 tId 的方法，提高 DOM 的灵活性

+   * 【修改】初始化时 多层父节点的 checkbox 半选状态计算错误的 bug

+   * 【修改】同时选中父、子节点后，利用 getSelectedNodes 获取选中节点并利用 removeNode 删除时报错的 bug

+   * 【修改】treeNode.chkDisabled / nocheck 属性，支持字符串格式的 "false"/"true"

+   * 【修改】异步加载模式下无法利用 server 返回 xml 并且 在 dataFilter 中继续处理的 bug

+   * 【修改】title 只允许设置为 string 类型值的问题。 修正后允许设置为 number 类型的值

+   * 【修改】zId 计数规则 & Cache 保存，减少 IE9 的 bug 造成的内存泄漏

+   * 【修改】API 页面搜索功能导致 IE 崩溃的 bug

+

+*2012.07.16* v3.3

+   * 【增加】扩展库 exhide -- 节点隐藏功能

+

+   * 【修改】getNodesByFilter 方法，添加 invokeParam 自定义参数

+   * 【修改】拖拽中测试代码未删除，导致出现黄颜色的 iframe 遮罩层的 bug

+   * 【修改】延迟加载方法 对于使用 expandAll 进行全部展开时，导致 onNodeCreated 回调 和 addDiyDom 方法触发过早的 bug

+   * 【修改】使用 moveNode 移动尚未生成 DOM 的节点时，视图会出现异常的 bug

+   * 【修改】删除节点后，相关节点的 isFirstNode 属性未重置的 bug

+   * 【修改】getPreNode(),getNextNode() 方法在对于特殊情况时计算错误的 bug

+   * 【修改】设置 title 之后，如果重新将 title 内容设置为空后，会导致无法更新 title 的 bug

+   * 【修改】针对 setting.check.chkStyle=="radio" && setting.check.radioType=="all" 的情况时，getTreeCheckedNodes方法优化，找到一个结果就 break

+   * 【修改】zTreeObj.getCheckedNodes(false) 在 radioType = "all" 时计算错误的 bug

+   * 【修改】完善 API 中 beforeDrop / onDrop 的关于 treeId 的说明

+

+*2012.05.13* v3.2

+   * 【增加】setting.data.key.url 允许修改 treeNode.url 属性

+   * 【增加】getNodesByFilter(filter, isSingle) 方法

+   * 【增加】"与其他 DOM 拖拽互动" 的 Demo (http://www.ztree.me/v3/demo.php#_511)

+   * 【增加】"异步加载模式下全部展开" 的 Demo (http://www.ztree.me/v3/demo.php#_512)

+

+   * 【修改】代码结构，将 addNodes、removeNode、removeChildNodes 方法 和 beforeRemove、onRemove 回调 转移到 core 内

+   * 【修改】IE7的环境下无子节点的父节点反复展开出现多余空行的 bug

+   * 【修改】异步加载时，如果出现网络异常等，会导致 图标显示错误的 bug

+   * 【修改】dataFilter中 return null 导致异常 的 bug

+   * 【修改】removeChildNodes 方法清空子节点后，无法正常添加节点的 bug

+   * 【修改】moveNode 后节点中的自定义元素的事件丢失的 bug

+   * 【修改】moveNode 方法中设置 isSilent = true 时，如果移动到已展开的 父节点后，出现异常的 bug

+   * 【修改】onClick/onDrag/onDrop 回调中 event 不是原始 event 的 bug

+   * 【修改】onDrop 回调中 当拖拽无效时，无法获得 treeNodes 的 bug

+   * 【修改】onDrop 无法判断拖拽是 移动还是复制的问题

+   * 【修改】未开启异步加载模式时，拖拽节点到子节点为空的父节点内时 出现异常 的 bug

+   * 【修改】拖拽过程中，反复在 父节点图标上划动时，会出现停顿的 bug

+            (需要css 结构—— button -> span.button)

+

+   * 【修改】拖拽操作时箭头 与 targetNode 背景之间的细节现实问题，便于用户拖拽时更容易区分 prev、next 和 inner 操作

+   * 【修改】拖拽操作时IE6/7 下 在 节点<a> 右侧 10px 内会导致 targetNode = root 的 bug

+   * 【修改】编辑模式下 默认的编辑按钮、删除按钮点击后，如果相应的 before 回调 return false 时会触发 onClick 回调的 bug

+

+*2012.02.14* v3.1

+   * 【增加】ajax 的参数 setting.async.contentType ，让提交参数适用于 json 数据提交 （主要适用于 .Net 的开发）。

+   * 【增加】setting.edit.editNameSelectAll, 用于设定编辑节点名称时初次显示 input 后 text 内容为全选

+   * 【修改】异步加载 规则，不再仅仅依靠父节点的子节点数来判定，增加内部属性 zAsync，保证默认状态下父节点及时无子节点也只能异步加载一次，除非使用 reAsyncChildNodes 方法强行控制异步加载。

+   * 【修改】放大浏览器后导致 界面出现多余连接线的bug （需要更新：icon 图标和 css ）

+   * 【修改】在编辑状态，如果节点名超过编辑框宽度，左右键在框内不起作用的bug（IE 6 7 8 出现）

+      CSS 中 filter:alpha(opacity=80) 造成的，应该是 ie 的 bug，需要更新 css 文件

+   * 【修改】title 设置后，如果属性不存在，则默认为 title 为空，便于数据容错和用户灵活使用

+   * 【修改】editName 方法如果针对尚未展开的 父节点，会导致该父节点自动展开的 bug

+   * 【修改】title 中存在标签时导致 title 显示异常的bug（例如：蓝色字22%"'`<input/>`）

+

+*2012.01.10* v3.0

+   * 【增加】setting.check.autoCheckTrigger 默认值 false，可以设置联动选中时是否触发事件回调函数

+   * 【增加】setting.callback.beforeEditName 回调函数，以保证用户可以捕获点击编辑按钮的事件

+   * 【增加】treeNode.chkDisabled 属性，显示 checkbox 但是用户无法修改 checkbox 状态，并且该 checkbox 会影响父节点的 checkbox 的半选状态

+   * 【增加】setting.check.nocheckInherit 属性，用户设置子节点继承 nocheck 属性，用于批量初始化节点，不适用于已经显示的节点

+   * 【增加】setting.edit.drag.autoExpandTrigger 默认值 false，可以设置自动展开、折叠操作时是否触发事件回调函数

+   * 【增加】setting.view.nameIsHTML 默认值 false，允许用户对 name 设置 DOM 对象

+   * 【增加】treeNode.click 属性的说明文档

+   * 【增加】treeObj.setChkDisabled 方法用于设置 checkbox / radio disabled 状态

+   * 【增加】treeNode.halfCheck 属性，用于强制设定节点的半选状态

+

+   * 【修改】异步加载 & 编辑功能 共存时，拖拽节点 或 增加节点 导致 ie 上报错的 bug （apply 方法引起）

+   * 【修改】zTreeStyle 样式冲突

+   * 【修改】setting.data.key.title 默认值设置为 ""，初始化时自动赋值为 setting.data.key.name 这样可避免希望 title 与 name 一致的用户反复设置参数

+   * 【修改】点击叶子节点的连接线会触发 expand 事件的 bug

+   * 【修改】IE 下 点击叶子节点连线会出现虚线框的 bug

+   * 【修改】updateNode 导致 checkbox 半选状态错误的 bug

+   * 【修改】checkNode 方法实现 toggle 操作, 取消 expandAll 方法的 toggle 操作

+   * 【修改】zTree 内鼠标移动会抢页面上 input 内的焦点的 bug

+   * 【修改】beforeRename / onRename 的触发方式——即使名称内容未改变也会触发，便于用户配合 beforeEditName 捕获编辑状态的结束，赋予用户更多调整规则的权利

+   * 【修改】与 easyUI 共存时无法拖拽的bug

+   * 【修改】beforeRename 在 Firefox 下如果利用 alert，会触发两次的 bug

+   * 【修改】checkNode/expandNode/removeNode 方法，默认不触发回调函数，恢复 v2.6 的默认状态，同时增加 callbackFlag 参数，设置为 true 时，可以触发回调函数

+   * 【修改】IE9下“根据参数查找节点”的Demo 报错：行14 重新声明常量属性(Demo 自身的问题，定义了history变量)

+   * 【修改】初始化 zTree 时 onNodeCreated 事件回调函数中无法 用 getZTreeObj 获取 zTree 对象的 bug

+   * 【修改】setting.edit.drag.prev / next / inner 参数，增加被拖拽的节点集合

+   * 【修改】异步加载模式下，otherParam 使用Array数组会出错的 bug。例如： ["id", "1", "name", "test"]

+   * 【修改】FireFox 下多棵树拖拽异常的 bug

+   * 【修改】exedit 中调用 excheck库的方法时没有进行容错处理，导致如果只加入 exedit 而没有 excheck的时候，会出现 js 错误

+   * 【修改】显示 checkbox 的 zTree 在编辑模式下，移动节点不会更新父节点半选状态的 bug

+   * 【修改】treeNode.childs --> children; treeObject.removeChilds --> removeChildNodes; setting.data.key.childs --> children（英文不好惹的祸！抱歉了！）

+   * 【修改】onRemove 回调中得到的 treeNode 还可以查找 preNode、nextNode 的bug。 修正后，getPreNode 和 getNextNode 都返回 null； 为了便于查找父节点，getParentNode 仍保留

+   * 【修改】简单数据模式下，如果 id 与 pId 的值相同会导致该节点无法正常加载的 bug

+   * 【修改】移动或删除中间节点会导致最后一个节点连接线图标变小的 bug

+

+*2011.09.05* v3.0 beta

+   * 【修改】zTree 的 js 代码架构全面修改，并且拆分

+   * 【修改】zTree 的 css 样式全面修改，对浏览器可以更好地兼容，同时解决了以前1个像素差的问题

+   * 【优化】采用延迟加载技术，一次性加载大数据量的节点性能飞速提升

+   * 【增加】支持多节点同时选中、拖拽

+   * 【增加】checkNode、checkAllNodes 等多种方法

+   * 【增加】IE6 自动取消动画展开、折叠的功能

+   * 【修正】异步加载 & 编辑模式 能够更完美的共存

+   * 【修正】setting 配置更加合理，并且增加了若干项配置参数

+   * 【修正】treeNode 节点数据的属性更加合理，并且增加了一些方法

+   * 【修正】拖拽操作更加灵活方便，更容易制定自己的规则

+   * 【修正】其他若干修改，详细对比请参考 url：[http://www.ztree.me/v3/faq.php#_101 zTree v3.0 常见问题]

diff --git a/pluss-manage-page/src/main/resources/static/resources/cash/cashDetails.js b/pluss-manage-page/src/main/resources/static/resources/cash/cashDetails.js
new file mode 100644
index 0000000..c2e8201
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/cash/cashDetails.js
@@ -0,0 +1,96 @@
+/**
+ * create by robot 
+ * date Thu Sep 12 16:16:36 CST 2019 
+ */ 
+
+$(document).ready(function(){
+	//form表单样式
+	layui.use(['layer', 'form'], function() {
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+	//li 切换事件
+	$(".nav-tabs>li").click(function() {
+		var index = $(".nav-tabs>li").index(this);
+		$(this).addClass("active").siblings("li").removeClass("active");
+		
+	})
+	//弹出一个提示层
+	$('.fa-save').on('click', function() {
+		saveCash();
+	});
+
+	//绑定标签栏事件
+	$(document).on('click','.nav-tabs li',function(){
+
+		var action =$(this).data('action');
+		 switch (action) {
+			case "base"://基本资料
+				goBase();
+				break;  
+			case "functions"://多功能
+				goFunctions();
+				break;
+			case "extends"://扩展    
+				goExtends();         
+				break;           
+		 }
+	})
+
+	//加载第一个标签
+	$('.nav-tabs li').eq(0).click();
+	
+});
+
+
+//跳转基本信息 
+function goBase(){
+	var url=ctx+'/cash/queryCashBaseInfo?id='+$('#cashId').val();
+	$('.tab-content').load(url);
+	              
+}
+//跳转多功能输入
+function goFunctions(){ 
+	var url=ctx+'/cash/queryCashFunctionsInfo?id='+$('#cashId').val();
+	$('.tab-content').load(url);  
+	
+}
+//跳转到扩展   
+function goExtends(){
+	
+	var url=ctx+'/cash/queryCashExtendsInfo?id='+$('#cashId').val();
+	$('.tab-content').load(url);          
+}  
+  
+
+ 
+//保存
+function saveCash(){
+	 
+	$(".fa-save").attr("disabled","disabled");
+	$('.fa-save').html('正在保存...')
+	$.ajax({
+		url:ctx+"/cash/saveCash",
+		type:"POST",
+		dataType:'json',
+		data:$("#data_form").serializeArray(),
+		complete:function(){
+			$(".fa-save").removeAttr("disabled");
+			$('.fa-save').html('保存')
+		},        
+		success:function(service){ 
+		
+			layer.confirm('保存成功,是否前往列表？', {
+				  btn: ['确认','取消'] //按钮
+				}, function(){
+					$('#goback span').trigger('click'); 
+				}, function(){         
+					layer.closeAll();
+			});  
+			
+		}
+	});  
+}
+ 
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/cash/cashList.js b/pluss-manage-page/src/main/resources/static/resources/cash/cashList.js
new file mode 100644
index 0000000..c7ace4c
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/cash/cashList.js
@@ -0,0 +1,504 @@
+/**
+ * create by robot
+ * date Thu Sep 12 16:16:36 CST 2019
+ */
+
+
+
+var table, form;
+
+var pageIndex=1;
+$(document).ready(function(){
+	//调用查询
+	pageIndex=StringUtil.getQueryString('pageIndex');
+	if(pageIndex==undefined||pageIndex==null){
+		pageIndex=1;
+	}
+
+	//绑定hover操作
+	$(document).on('mouseenter','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").show();
+		var width=15;
+		$(this).children('div').find('li').each(function(){
+			//获取li宽度
+			width+=$(this).width();
+		});
+		$(this).children('div').width(width);
+	})
+	$(document).on('mouseleave','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").hide();
+	});
+
+	//日历控件
+	layui.use(['layer', 'form', 'laydate', 'table'], function() {
+		var layer = layui.layer;
+		var laydate = layui.laydate;
+		form = layui.form;
+		table = layui.table;
+		laydate.render({
+			elem: '#date1', //指定元素
+			format:'yyyy-MM-dd 00:00:00'
+		});
+		laydate.render({
+			elem: '#date2', //指定元素
+			format:'yyyy-MM-dd 23:59:59'
+		});
+
+		form.render();
+
+		//执行一个 table 实例
+		table.render({
+			elem: '#demo'
+			, id: 'idTest'
+			, url: ctx + '/cash/page' //数据接口
+			, autoSort: false
+			, where: {
+				column: 'createDt'
+				, asc: false
+			}
+			, response: {
+				statusName: 'code' //数据状态的字段名称，默认：code
+				, countName: 'count' //数据总数的字段名称，默认：count
+				, dataName: 'data' //默数据列表的字段名称，认：data
+				, statusCode: 200
+			}
+			, parseData: function (res) { //res 即为原始返回的数据
+				return {
+					"code": res.code, //解析接口状态
+					"msg": res.message, //解析提示文本
+					"count": res.data.total, //解析数据长度
+					"data": res.data.records //解析数据列表
+				};
+			}
+			, request: {
+				pageName: 'current' //页码的参数名称，默认：page
+				, limitName: 'size' //每页数据量的参数名，默认：limit
+			}
+			, title: 'app首页菜单表'
+			, page: true //开启分页
+			, toolbar: '#toolBar' //开启工具栏，此处显示默认图标，可以自定义模板，详见文档
+			, defaultToolbar: ['filter']
+			, cols: [[ //表头
+				{type: 'checkbox'}
+				, {field: '', title: '序号', type: 'numbers'}
+				, {field: 'userId', title: '用户ID', minWidth: 86, align: "center"}
+				, {field: 'userName', title: '用户名', minWidth: 86, align: "center"}
+				, {field: 'logo', title: '头像', minWidth: 80, templet: '#imgTemp', align: "center", hide: true}
+				// , {field: 'alias', title: '商户简称', width: 150, align: "center"}
+				, {field: 'phone', title: '手机号', minWidth: 120, align: "center"}
+				, {field: 'cashTotalAmt', title: '已提现总额', minWidth: 100, align: "right"}
+				, {field: 'totalProfit', title: '总分润', minWidth: 86, align: "right", templet: function(d) {
+
+						return (null2Zero(d.totalProfit) + null2Zero(d.totalShareMoney)).toFixed(2);
+					}}
+				, {field: 'totalProfit', title: '剩余可提现(实时)', width: 140, align: "right", templet: function(d) {
+
+						return (null2Zero(d.totalProfit) + null2Zero(d.totalShareMoney) - null2Zero(d.cashTotalAmt)).toFixed(2);
+					}}
+				, {field: 'cashAmt', title: '申请提现金额', minWidth: 120, align: "right"}
+				, {field: 'virRealCashAmt', title: '实际到账', minWidth: 100, align: "right"}
+				, {field: 'baseServiceCharge', title: '基本手续费', minWidth: 100, align: "right"}
+				, {field: 'rate', title: '税率(%)', minWidth: 86, align: "right"}
+				, {field: 'ratioCharge', title: '税费', minWidth: 100, align: "right"}
+				, {field: 'virTotalCharge', title: '总手续费', minWidth: 100, align: "right"}
+				, {field: 'remark', title: '备注', width: 150, align: "center"}
+				, {field: 'status', title: '状态', width: 100, align: "center", templet: function (d) {
+						if(d.status == '0'){
+							return '<span style="color: #FF0000">审核中</span>';
+						}else if(d.status == '1'){
+							return '<span style="color: #00B83F">提现成功</span>';
+						}else if(d.status == '2'){
+							return '<span style="color: #2f3e44">提现失败</span>';
+						}
+
+						return '';
+					}}
+				, {field: 'cashNumber', title: '提现单号', width: 150, align: "center", hide: true}
+				, {field: 'accountName', title: '支付宝账户名', width: 100, align: "center"}
+				, {field: 'accountNo', title: '支付宝账号', width: 150, align: "center"}
+				, {field: 'updator', title: '审核人', width: 150, align: "center", hide: true}
+				, {field: 'type', title: '提现类型', width: 100, templet: function (d) {
+						if(d.type == '0'){
+							return '粉丝分润';
+						}else if(d.type == '1'){
+							return '推广分润';
+						}else if(d.type == '2'){
+							return '银行卡提现';
+						}
+
+						return '其他';
+					}}
+				, {
+					field: 'createDt',
+					title: '创建时间',
+					width: 160,
+					sort: true,
+					hide: false,
+					templet: "<div>{{layui.util.toDateString(d.createDt, 'yyyy-MM-dd HH:mm:ss')}}</div>"
+				}
+				, {
+					field: 'updateDt',
+					title: '审核时间',
+					width: 165,
+					sort: true,
+					hide: false,
+					templet: "<div>{{layui.util.toDateString(d.updateDt, 'yyyy-MM-dd HH:mm:ss')}}</div>"
+				}
+				, {fixed: 'right', title: '操作', width: 260, align: 'left', toolbar: '#barDemo'}
+			]]
+		});
+
+		table.on('tool(test)', function(obj) {
+			var that = this, data = obj.data;
+			switch (obj.event) {
+				case 'auditPass':
+					auditPass(data);
+					break;
+				case 'auditSuccess':
+					auditSuccess(data);
+					break;
+				case 'auditRefuse':
+					auditRefuse(data.id);
+					break;
+			}
+		})
+
+		table.on('toolbar(test)', function(obj) {
+			var checkStatus = table.checkStatus(obj.config.id);
+			switch(obj.event){
+				case 'search':
+					queryCash2()
+					break;
+				case 'batchPass':
+					var idArr = [];
+					checkStatus.data.forEach(function(item) {
+						idArr.push(item.id);
+					});
+
+					batchPass(idArr);
+					break;
+			}
+		})
+	});
+	//行选中事件
+	$("#allCheck").find("span").click(function() {
+		$(this).toggleClass('checked');
+		if($(this).hasClass('checked')){
+			//所有列选中
+		  $(".checker").find("span").each(function () {
+		         $(this).addClass("checked");
+		    })
+		}else{
+			//所有列取消选中
+			$(".checker").find("span").each(function () {
+				 $(this).removeClass("checked");
+		    })
+		}
+	});
+
+	//单个选中
+	$(document).on('click','.checkeBox span',function() {
+		$(this).toggleClass('checked');
+		//设置头部事件
+		var length=$('.checkeBox span').length;
+		var count=0;
+		$(".checkeBox").find("span").each(function () {
+	        if($(this).hasClass("checked")){
+	        	count++;
+	        }
+	   })
+		//全选
+	   if(count==length){
+		   $("#allCheck").find("span").addClass('checked');
+	   }else{
+		   $("#allCheck").find("span").removeClass('checked');
+	   }
+	})
+	//左右div高度相等
+	var left_content_height = $(".right-content").height();
+	$(".left-content").height(left_content_height+35);
+	var sub_left_height=$(".res-menu").height(left_content_height-60);
+
+	let data = {"userId":$("#userId").val(),"beginTime":$("#date1").val(),"endTime":$("#date2").val()};
+	loadOrderData(data);
+});
+
+function loadOrderData(data){
+	$.ajax({
+		url : ctx + '/cash/otherData',
+		type : "get",
+		data : data,
+		dataType : "json",
+		success : function(res) {
+			if(res.code == 200){
+				// $("#transAmountCount").text(res.data.transAmountCount || "0.00");
+				$("#shareAmountCount").text(res.data.shareAmountCount || "0.00");
+				$("#fansAmountCount").text(res.data.fansAmountCount || "0.00");
+				$("#useCashAmtCount").text(res.data.useCashAmtCount || "0.00");
+				$("#inCashAmtCount").text(res.data.inCashAmtCount || "0.00");
+				$("#profitAmountCount").text(res.data.profitAmountCount || "0.00");
+			}
+		},
+		error : function(err) {
+
+		}
+	});
+}
+
+
+function batchPass(idArr) {
+	if (idArr == null || idArr.length === 0) {
+		layer.msg("至少选择一条记录");
+		return;
+	}
+
+	layer.open({
+		type: 1,
+		closeBtn: 1,
+		title: '批量通过',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">批量通过确认？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r', //按钮居中
+		shade: 0.3, //不显示遮罩
+		yes: function() {
+			var index = layer.load(1, {shade: [0.1, '#000']});
+			$.ajax({
+				url: ctx + "/cash/batchPass"
+				, type: 'post'
+				, data: {
+					'ids': idArr
+				}
+				, success: function (d) {
+					layer.close(index);
+					if (d.code == 200) {
+						queryCash2()
+					} else {
+						layer.closeAll();
+						layer.msg(d.message)
+					}
+				}
+				, error: function (req, textStatus, errorThrown) {
+					layer.msg(textStatus)
+				}
+			})
+		}
+	});
+}
+
+function queryCash2() {
+	table.reload("idTest", {
+		where: { //请求参数（注意：这里面的参数可任意定义，并非下面固定的格式）
+			userName:$('#userName').val()
+			, status:$('#status').val()
+			, type:$('#type').val()
+			, userId:$("#userId").val()
+			, phone:$("#phone").val()
+			, beginTime:$("#date1").val()
+			, endTime:$("#date2").val()
+		}
+	}, true);
+	let data = {"userId":$("#userId").val(),"beginTime":$("#date1").val(),"endTime":$("#date2").val()};
+	loadOrderData(data);
+}
+
+//初始化新增
+function initAddCash(){
+	window.location=ctx+'/cash/queryCashDetails?pageIndex='+pageIndex;
+}
+
+//初始化修改
+function showCashDetails(id){
+	window.location=ctx+'/cash/queryCashDetails?id='+id+'&pageIndex='+pageIndex;
+}
+
+//头部编辑
+function initEditCash(){
+	var count=0;
+	var id=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+        	 id=$(this).data('id');
+         }
+    })
+    if(count>1){
+    	layer.msg('只能选中一行记录进行操作!');
+    	return ;
+    }
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	 if(id>0){
+	  showCashDetails(id);
+	 }
+}
+//头部删除
+function initBatchDeleteCash(){
+	var count=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+         }
+    })
+
+	 if(count == 0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+
+
+	layer.open({
+		type: 1,
+		closeBtn: 1,
+		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r', //按钮居中
+		shade: 0.3, //不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteBatchCash();
+		}
+	});
+
+}
+//批量删除
+function deleteBatchCash(){
+
+	$(".checkeBox").find("span").each(function () {
+        if($(this).hasClass("checked")){
+        	var id=$(this).data('id');
+        	deleteCash(id,false);
+        	layer.msg('删除成功!');
+        }
+   })
+}
+
+//审核通过
+function auditPass(data){
+	layer.open({
+		type: 2,
+		area: ['400px', '300px'],
+		content: ctx + "/cash/pass/" + data.id,
+		shade: 0.3, //不显示遮罩
+	});
+}
+
+function realAuditPass(id){
+	$.ajax({
+		url:ctx+'/cash/realAuditPass',
+		data:{
+			'id':id,
+			'remark': $('textarea[id="remark"]').val()
+		},
+		dataType:'json',
+		type:'post',
+		success:function(res){
+			layer.msg('提现申请已通过');
+			queryCash2(pageIndex);
+		},
+		error:function(res){
+			layer.msg('通过失败，系统繁忙请稍后再试');
+			queryCash2(pageIndex);
+		}
+	})
+
+}
+//审核拒绝
+function auditRefuse(id){
+	layer.open({
+		type: 1,
+		closeBtn: 1,
+		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">拒绝原因：<input style="border:0.5px solid #C0C0C0; height:25px;"  type="text" id="reason"></div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r', //按钮居中
+		shade: 0.3, //不显示遮罩
+		yes: function() {
+			realauditRefuse(id,$('#reason').val());
+		}
+	});
+}
+//审核通过
+function auditSuccess(obj){
+	var index = layer.confirm('确定审核通过?', {icon: 3, title:'提示'}, function(index){
+		realAuditSuccess(obj.id);
+	});
+}
+function realAuditSuccess(id){
+	var index = layer.load(1, {shade: [0.1, '#000']});
+	$.ajax({
+		url:ctx+'/cash/auditSuccess',
+		data:{
+			'id':id,
+			"status":"1",
+		},
+		dataType:'json',
+		type:'post',
+		success:function(res){
+			layer.closeAll();
+			if(res.code == 200){
+				layer.msg(res.message,{icon:1})
+				queryCash2();
+			}else{
+				layer.msg("操作失败",{icon:2})
+			}
+		},
+		error:function(res){
+			layer.msg('通过失败，系统繁忙请稍后再试');
+		}
+	})
+}
+
+function realauditRefuse(id,reason){
+	if(StringUtil.isBlank(reason)){
+		layer.msg('请输入拒绝原因');
+		return;
+	}
+	$.ajax({
+		url:ctx+'/cash/realauditRefuse',
+		data:{
+			'id':id,
+			"reason":reason,
+		},
+		dataType:'json',
+		type:'post',
+		success:function(res){
+			layer.closeAll();
+			layer.msg('提现申请已拒绝');
+			queryCash2(pageIndex);
+		},
+		error:function(res){
+			layer.closeAll();
+			layer.msg('通过失败，系统繁忙请稍后再试');
+			queryCash2(pageIndex);
+		}
+	})
+}
+
+//时间格式化处理
+function dateFtt(fmt,date)
+{ //author: meizz
+  var o = {
+    "M+" : date.getMonth()+1,                 //月份
+    "d+" : date.getDate(),                    //日
+    "h+" : date.getHours(),                   //小时
+    "m+" : date.getMinutes(),                 //分
+    "s+" : date.getSeconds(),                 //秒
+    "q+" : Math.floor((date.getMonth()+3)/3), //季度
+    "S"  : date.getMilliseconds()             //毫秒
+  };
+  if(/(y+)/.test(fmt))
+    fmt=fmt.replace(RegExp.$1, (date.getFullYear()+"").substr(4 - RegExp.$1.length));
+  for(var k in o)
+    if(new RegExp("("+ k +")").test(fmt))
+  fmt = fmt.replace(RegExp.$1, (RegExp.$1.length==1) ? (o[k]) : (("00"+ o[k]).substr((""+ o[k]).length)));
+  return fmt;
+}
diff --git a/pluss-manage-page/src/main/resources/static/resources/css/2.mp3 b/pluss-manage-page/src/main/resources/static/resources/css/2.mp3
new file mode 100644
index 0000000..fa5c2cd
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/css/2.mp3 differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/css/animate.css b/pluss-manage-page/src/main/resources/static/resources/css/animate.css
new file mode 100644
index 0000000..0f9fba1
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/css/animate.css
@@ -0,0 +1,2848 @@
+@charset "UTF-8";
+
+/*!
+Animate.css - http://daneden.me/animate
+Licensed under the MIT license
+
+Copyright (c) 2013 Daniel Eden
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+.animated {
+    -webkit-animation-duration: 1s;
+    animation-duration: 1s;
+    -webkit-animation-fill-mode: both;
+    animation-fill-mode: both;
+    z-index: 100;
+}
+
+.animated.infinite {
+    -webkit-animation-iteration-count: infinite;
+    animation-iteration-count: infinite;
+}
+
+.animated.hinge {
+    -webkit-animation-duration: 2s;
+    animation-duration: 2s;
+}
+
+@-webkit-keyframes bounce {
+    0%, 20%, 50%, 80%, 100% {
+        -webkit-transform: translateY(0);
+        transform: translateY(0);
+    }
+
+    40% {
+        -webkit-transform: translateY(-30px);
+        transform: translateY(-30px);
+    }
+
+    60% {
+        -webkit-transform: translateY(-15px);
+        transform: translateY(-15px);
+    }
+}
+
+@keyframes bounce {
+    0%, 20%, 50%, 80%, 100% {
+        -webkit-transform: translateY(0);
+        -ms-transform: translateY(0);
+        transform: translateY(0);
+    }
+
+    40% {
+        -webkit-transform: translateY(-30px);
+        -ms-transform: translateY(-30px);
+        transform: translateY(-30px);
+    }
+
+    60% {
+        -webkit-transform: translateY(-15px);
+        -ms-transform: translateY(-15px);
+        transform: translateY(-15px);
+    }
+}
+
+.bounce {
+    -webkit-animation-name: bounce;
+    animation-name: bounce;
+}
+
+@-webkit-keyframes flash {
+    0%, 50%, 100% {
+        opacity: 1;
+    }
+
+    25%, 75% {
+        opacity: 0;
+    }
+}
+
+@keyframes flash {
+    0%, 50%, 100% {
+        opacity: 1;
+    }
+
+    25%, 75% {
+        opacity: 0;
+    }
+}
+
+.flash {
+    -webkit-animation-name: flash;
+    animation-name: flash;
+}
+
+/* originally authored by Nick Pettit - https://github.com/nickpettit/glide */
+
+@-webkit-keyframes pulse {
+    0% {
+        -webkit-transform: scale(1);
+        transform: scale(1);
+    }
+
+    50% {
+        -webkit-transform: scale(1.1);
+        transform: scale(1.1);
+    }
+
+    100% {
+        -webkit-transform: scale(1);
+        transform: scale(1);
+    }
+}
+
+@keyframes pulse {
+    0% {
+        -webkit-transform: scale(1);
+        -ms-transform: scale(1);
+        transform: scale(1);
+    }
+
+    50% {
+        -webkit-transform: scale(1.1);
+        -ms-transform: scale(1.1);
+        transform: scale(1.1);
+    }
+
+    100% {
+        -webkit-transform: scale(1);
+        -ms-transform: scale(1);
+        transform: scale(1);
+    }
+}
+
+.pulse {
+    -webkit-animation-name: pulse;
+    animation-name: pulse;
+}
+
+@-webkit-keyframes rubberBand {
+    0% {
+        -webkit-transform: scale(1);
+        transform: scale(1);
+    }
+
+    30% {
+        -webkit-transform: scaleX(1.25) scaleY(0.75);
+        transform: scaleX(1.25) scaleY(0.75);
+    }
+
+    40% {
+        -webkit-transform: scaleX(0.75) scaleY(1.25);
+        transform: scaleX(0.75) scaleY(1.25);
+    }
+
+    60% {
+        -webkit-transform: scaleX(1.15) scaleY(0.85);
+        transform: scaleX(1.15) scaleY(0.85);
+    }
+
+    100% {
+        -webkit-transform: scale(1);
+        transform: scale(1);
+    }
+}
+
+@keyframes rubberBand {
+    0% {
+        -webkit-transform: scale(1);
+        -ms-transform: scale(1);
+        transform: scale(1);
+    }
+
+    30% {
+        -webkit-transform: scaleX(1.25) scaleY(0.75);
+        -ms-transform: scaleX(1.25) scaleY(0.75);
+        transform: scaleX(1.25) scaleY(0.75);
+    }
+
+    40% {
+        -webkit-transform: scaleX(0.75) scaleY(1.25);
+        -ms-transform: scaleX(0.75) scaleY(1.25);
+        transform: scaleX(0.75) scaleY(1.25);
+    }
+
+    60% {
+        -webkit-transform: scaleX(1.15) scaleY(0.85);
+        -ms-transform: scaleX(1.15) scaleY(0.85);
+        transform: scaleX(1.15) scaleY(0.85);
+    }
+
+    100% {
+        -webkit-transform: scale(1);
+        -ms-transform: scale(1);
+        transform: scale(1);
+    }
+}
+
+.rubberBand {
+    -webkit-animation-name: rubberBand;
+    animation-name: rubberBand;
+}
+
+@-webkit-keyframes shake {
+    0%, 100% {
+        -webkit-transform: translateX(0);
+        transform: translateX(0);
+    }
+
+    10%, 30%, 50%, 70%, 90% {
+        -webkit-transform: translateX(-10px);
+        transform: translateX(-10px);
+    }
+
+    20%, 40%, 60%, 80% {
+        -webkit-transform: translateX(10px);
+        transform: translateX(10px);
+    }
+}
+
+@keyframes shake {
+    0%, 100% {
+        -webkit-transform: translateX(0);
+        -ms-transform: translateX(0);
+        transform: translateX(0);
+    }
+
+    10%, 30%, 50%, 70%, 90% {
+        -webkit-transform: translateX(-10px);
+        -ms-transform: translateX(-10px);
+        transform: translateX(-10px);
+    }
+
+    20%, 40%, 60%, 80% {
+        -webkit-transform: translateX(10px);
+        -ms-transform: translateX(10px);
+        transform: translateX(10px);
+    }
+}
+
+.shake {
+    -webkit-animation-name: shake;
+    animation-name: shake;
+}
+
+@-webkit-keyframes swing {
+    20% {
+        -webkit-transform: rotate(15deg);
+        transform: rotate(15deg);
+    }
+
+    40% {
+        -webkit-transform: rotate(-10deg);
+        transform: rotate(-10deg);
+    }
+
+    60% {
+        -webkit-transform: rotate(5deg);
+        transform: rotate(5deg);
+    }
+
+    80% {
+        -webkit-transform: rotate(-5deg);
+        transform: rotate(-5deg);
+    }
+
+    100% {
+        -webkit-transform: rotate(0deg);
+        transform: rotate(0deg);
+    }
+}
+
+@keyframes swing {
+    20% {
+        -webkit-transform: rotate(15deg);
+        -ms-transform: rotate(15deg);
+        transform: rotate(15deg);
+    }
+
+    40% {
+        -webkit-transform: rotate(-10deg);
+        -ms-transform: rotate(-10deg);
+        transform: rotate(-10deg);
+    }
+
+    60% {
+        -webkit-transform: rotate(5deg);
+        -ms-transform: rotate(5deg);
+        transform: rotate(5deg);
+    }
+
+    80% {
+        -webkit-transform: rotate(-5deg);
+        -ms-transform: rotate(-5deg);
+        transform: rotate(-5deg);
+    }
+
+    100% {
+        -webkit-transform: rotate(0deg);
+        -ms-transform: rotate(0deg);
+        transform: rotate(0deg);
+    }
+}
+
+.swing {
+    -webkit-transform-origin: top center;
+    -ms-transform-origin: top center;
+    transform-origin: top center;
+    -webkit-animation-name: swing;
+    animation-name: swing;
+}
+
+@-webkit-keyframes tada {
+    0% {
+        -webkit-transform: scale(1);
+        transform: scale(1);
+    }
+
+    10%, 20% {
+        -webkit-transform: scale(0.9) rotate(-3deg);
+        transform: scale(0.9) rotate(-3deg);
+    }
+
+    30%, 50%, 70%, 90% {
+        -webkit-transform: scale(1.1) rotate(3deg);
+        transform: scale(1.1) rotate(3deg);
+    }
+
+    40%, 60%, 80% {
+        -webkit-transform: scale(1.1) rotate(-3deg);
+        transform: scale(1.1) rotate(-3deg);
+    }
+
+    100% {
+        -webkit-transform: scale(1) rotate(0);
+        transform: scale(1) rotate(0);
+    }
+}
+
+@keyframes tada {
+    0% {
+        -webkit-transform: scale(1);
+        -ms-transform: scale(1);
+        transform: scale(1);
+    }
+
+    10%, 20% {
+        -webkit-transform: scale(0.9) rotate(-3deg);
+        -ms-transform: scale(0.9) rotate(-3deg);
+        transform: scale(0.9) rotate(-3deg);
+    }
+
+    30%, 50%, 70%, 90% {
+        -webkit-transform: scale(1.1) rotate(3deg);
+        -ms-transform: scale(1.1) rotate(3deg);
+        transform: scale(1.1) rotate(3deg);
+    }
+
+    40%, 60%, 80% {
+        -webkit-transform: scale(1.1) rotate(-3deg);
+        -ms-transform: scale(1.1) rotate(-3deg);
+        transform: scale(1.1) rotate(-3deg);
+    }
+
+    100% {
+        -webkit-transform: scale(1) rotate(0);
+        -ms-transform: scale(1) rotate(0);
+        transform: scale(1) rotate(0);
+    }
+}
+
+.tada {
+    -webkit-animation-name: tada;
+    animation-name: tada;
+}
+
+/* originally authored by Nick Pettit - https://github.com/nickpettit/glide */
+
+@-webkit-keyframes wobble {
+    0% {
+        -webkit-transform: translateX(0%);
+        transform: translateX(0%);
+    }
+
+    15% {
+        -webkit-transform: translateX(-25%) rotate(-5deg);
+        transform: translateX(-25%) rotate(-5deg);
+    }
+
+    30% {
+        -webkit-transform: translateX(20%) rotate(3deg);
+        transform: translateX(20%) rotate(3deg);
+    }
+
+    45% {
+        -webkit-transform: translateX(-15%) rotate(-3deg);
+        transform: translateX(-15%) rotate(-3deg);
+    }
+
+    60% {
+        -webkit-transform: translateX(10%) rotate(2deg);
+        transform: translateX(10%) rotate(2deg);
+    }
+
+    75% {
+        -webkit-transform: translateX(-5%) rotate(-1deg);
+        transform: translateX(-5%) rotate(-1deg);
+    }
+
+    100% {
+        -webkit-transform: translateX(0%);
+        transform: translateX(0%);
+    }
+}
+
+@keyframes wobble {
+    0% {
+        -webkit-transform: translateX(0%);
+        -ms-transform: translateX(0%);
+        transform: translateX(0%);
+    }
+
+    15% {
+        -webkit-transform: translateX(-25%) rotate(-5deg);
+        -ms-transform: translateX(-25%) rotate(-5deg);
+        transform: translateX(-25%) rotate(-5deg);
+    }
+
+    30% {
+        -webkit-transform: translateX(20%) rotate(3deg);
+        -ms-transform: translateX(20%) rotate(3deg);
+        transform: translateX(20%) rotate(3deg);
+    }
+
+    45% {
+        -webkit-transform: translateX(-15%) rotate(-3deg);
+        -ms-transform: translateX(-15%) rotate(-3deg);
+        transform: translateX(-15%) rotate(-3deg);
+    }
+
+    60% {
+        -webkit-transform: translateX(10%) rotate(2deg);
+        -ms-transform: translateX(10%) rotate(2deg);
+        transform: translateX(10%) rotate(2deg);
+    }
+
+    75% {
+        -webkit-transform: translateX(-5%) rotate(-1deg);
+        -ms-transform: translateX(-5%) rotate(-1deg);
+        transform: translateX(-5%) rotate(-1deg);
+    }
+
+    100% {
+        -webkit-transform: translateX(0%);
+        -ms-transform: translateX(0%);
+        transform: translateX(0%);
+    }
+}
+
+.wobble {
+    -webkit-animation-name: wobble;
+    animation-name: wobble;
+}
+
+@-webkit-keyframes bounceIn {
+    0% {
+        opacity: 0;
+        -webkit-transform: scale(.3);
+        transform: scale(.3);
+    }
+
+    50% {
+        opacity: 1;
+        -webkit-transform: scale(1.05);
+        transform: scale(1.05);
+    }
+
+    70% {
+        -webkit-transform: scale(.9);
+        transform: scale(.9);
+    }
+
+    100% {
+        opacity: 1;
+        -webkit-transform: scale(1);
+        transform: scale(1);
+    }
+}
+
+@keyframes bounceIn {
+    0% {
+        opacity: 0;
+        -webkit-transform: scale(.3);
+        -ms-transform: scale(.3);
+        transform: scale(.3);
+    }
+
+    50% {
+        opacity: 1;
+        -webkit-transform: scale(1.05);
+        -ms-transform: scale(1.05);
+        transform: scale(1.05);
+    }
+
+    70% {
+        -webkit-transform: scale(.9);
+        -ms-transform: scale(.9);
+        transform: scale(.9);
+    }
+
+    100% {
+        opacity: 1;
+        -webkit-transform: scale(1);
+        -ms-transform: scale(1);
+        transform: scale(1);
+    }
+}
+
+.bounceIn {
+    -webkit-animation-name: bounceIn;
+    animation-name: bounceIn;
+}
+
+@-webkit-keyframes bounceInDown {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateY(-2000px);
+        transform: translateY(-2000px);
+    }
+
+    60% {
+        opacity: 1;
+        -webkit-transform: translateY(30px);
+        transform: translateY(30px);
+    }
+
+    80% {
+        -webkit-transform: translateY(-10px);
+        transform: translateY(-10px);
+    }
+
+    100% {
+        -webkit-transform: translateY(0);
+        transform: translateY(0);
+    }
+}
+
+@keyframes bounceInDown {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateY(-2000px);
+        -ms-transform: translateY(-2000px);
+        transform: translateY(-2000px);
+    }
+
+    60% {
+        opacity: 1;
+        -webkit-transform: translateY(30px);
+        -ms-transform: translateY(30px);
+        transform: translateY(30px);
+    }
+
+    80% {
+        -webkit-transform: translateY(-10px);
+        -ms-transform: translateY(-10px);
+        transform: translateY(-10px);
+    }
+
+    100% {
+        -webkit-transform: translateY(0);
+        -ms-transform: translateY(0);
+        transform: translateY(0);
+    }
+}
+
+.bounceInDown {
+    -webkit-animation-name: bounceInDown;
+    animation-name: bounceInDown;
+}
+
+@-webkit-keyframes bounceInLeft {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateX(-2000px);
+        transform: translateX(-2000px);
+    }
+
+    60% {
+        opacity: 1;
+        -webkit-transform: translateX(30px);
+        transform: translateX(30px);
+    }
+
+    80% {
+        -webkit-transform: translateX(-10px);
+        transform: translateX(-10px);
+    }
+
+    100% {
+        -webkit-transform: translateX(0);
+        transform: translateX(0);
+    }
+}
+
+@keyframes bounceInLeft {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateX(-2000px);
+        -ms-transform: translateX(-2000px);
+        transform: translateX(-2000px);
+    }
+
+    60% {
+        opacity: 1;
+        -webkit-transform: translateX(30px);
+        -ms-transform: translateX(30px);
+        transform: translateX(30px);
+    }
+
+    80% {
+        -webkit-transform: translateX(-10px);
+        -ms-transform: translateX(-10px);
+        transform: translateX(-10px);
+    }
+
+    100% {
+        -webkit-transform: translateX(0);
+        -ms-transform: translateX(0);
+        transform: translateX(0);
+    }
+}
+
+.bounceInLeft {
+    -webkit-animation-name: bounceInLeft;
+    animation-name: bounceInLeft;
+}
+
+@-webkit-keyframes bounceInRight {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateX(2000px);
+        transform: translateX(2000px);
+    }
+
+    60% {
+        opacity: 1;
+        -webkit-transform: translateX(-30px);
+        transform: translateX(-30px);
+    }
+
+    80% {
+        -webkit-transform: translateX(10px);
+        transform: translateX(10px);
+    }
+
+    100% {
+        -webkit-transform: translateX(0);
+        transform: translateX(0);
+    }
+}
+
+@keyframes bounceInRight {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateX(2000px);
+        -ms-transform: translateX(2000px);
+        transform: translateX(2000px);
+    }
+
+    60% {
+        opacity: 1;
+        -webkit-transform: translateX(-30px);
+        -ms-transform: translateX(-30px);
+        transform: translateX(-30px);
+    }
+
+    80% {
+        -webkit-transform: translateX(10px);
+        -ms-transform: translateX(10px);
+        transform: translateX(10px);
+    }
+
+    100% {
+        -webkit-transform: translateX(0);
+        -ms-transform: translateX(0);
+        transform: translateX(0);
+    }
+}
+
+.bounceInRight {
+    -webkit-animation-name: bounceInRight;
+    animation-name: bounceInRight;
+}
+
+@-webkit-keyframes bounceInUp {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateY(2000px);
+        transform: translateY(2000px);
+    }
+
+    60% {
+        opacity: 1;
+        -webkit-transform: translateY(-30px);
+        transform: translateY(-30px);
+    }
+
+    80% {
+        -webkit-transform: translateY(10px);
+        transform: translateY(10px);
+    }
+
+    100% {
+        -webkit-transform: translateY(0);
+        transform: translateY(0);
+    }
+}
+
+@keyframes bounceInUp {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateY(2000px);
+        -ms-transform: translateY(2000px);
+        transform: translateY(2000px);
+    }
+
+    60% {
+        opacity: 1;
+        -webkit-transform: translateY(-30px);
+        -ms-transform: translateY(-30px);
+        transform: translateY(-30px);
+    }
+
+    80% {
+        -webkit-transform: translateY(10px);
+        -ms-transform: translateY(10px);
+        transform: translateY(10px);
+    }
+
+    100% {
+        -webkit-transform: translateY(0);
+        -ms-transform: translateY(0);
+        transform: translateY(0);
+    }
+}
+
+.bounceInUp {
+    -webkit-animation-name: bounceInUp;
+    animation-name: bounceInUp;
+}
+
+@-webkit-keyframes bounceOut {
+    0% {
+        -webkit-transform: scale(1);
+        transform: scale(1);
+    }
+
+    25% {
+        -webkit-transform: scale(.95);
+        transform: scale(.95);
+    }
+
+    50% {
+        opacity: 1;
+        -webkit-transform: scale(1.1);
+        transform: scale(1.1);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: scale(.3);
+        transform: scale(.3);
+    }
+}
+
+@keyframes bounceOut {
+    0% {
+        -webkit-transform: scale(1);
+        -ms-transform: scale(1);
+        transform: scale(1);
+    }
+
+    25% {
+        -webkit-transform: scale(.95);
+        -ms-transform: scale(.95);
+        transform: scale(.95);
+    }
+
+    50% {
+        opacity: 1;
+        -webkit-transform: scale(1.1);
+        -ms-transform: scale(1.1);
+        transform: scale(1.1);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: scale(.3);
+        -ms-transform: scale(.3);
+        transform: scale(.3);
+    }
+}
+
+.bounceOut {
+    -webkit-animation-name: bounceOut;
+    animation-name: bounceOut;
+}
+
+@-webkit-keyframes bounceOutDown {
+    0% {
+        -webkit-transform: translateY(0);
+        transform: translateY(0);
+    }
+
+    20% {
+        opacity: 1;
+        -webkit-transform: translateY(-20px);
+        transform: translateY(-20px);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateY(2000px);
+        transform: translateY(2000px);
+    }
+}
+
+@keyframes bounceOutDown {
+    0% {
+        -webkit-transform: translateY(0);
+        -ms-transform: translateY(0);
+        transform: translateY(0);
+    }
+
+    20% {
+        opacity: 1;
+        -webkit-transform: translateY(-20px);
+        -ms-transform: translateY(-20px);
+        transform: translateY(-20px);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateY(2000px);
+        -ms-transform: translateY(2000px);
+        transform: translateY(2000px);
+    }
+}
+
+.bounceOutDown {
+    -webkit-animation-name: bounceOutDown;
+    animation-name: bounceOutDown;
+}
+
+@-webkit-keyframes bounceOutLeft {
+    0% {
+        -webkit-transform: translateX(0);
+        transform: translateX(0);
+    }
+
+    20% {
+        opacity: 1;
+        -webkit-transform: translateX(20px);
+        transform: translateX(20px);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateX(-2000px);
+        transform: translateX(-2000px);
+    }
+}
+
+@keyframes bounceOutLeft {
+    0% {
+        -webkit-transform: translateX(0);
+        -ms-transform: translateX(0);
+        transform: translateX(0);
+    }
+
+    20% {
+        opacity: 1;
+        -webkit-transform: translateX(20px);
+        -ms-transform: translateX(20px);
+        transform: translateX(20px);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateX(-2000px);
+        -ms-transform: translateX(-2000px);
+        transform: translateX(-2000px);
+    }
+}
+
+.bounceOutLeft {
+    -webkit-animation-name: bounceOutLeft;
+    animation-name: bounceOutLeft;
+}
+
+@-webkit-keyframes bounceOutRight {
+    0% {
+        -webkit-transform: translateX(0);
+        transform: translateX(0);
+    }
+
+    20% {
+        opacity: 1;
+        -webkit-transform: translateX(-20px);
+        transform: translateX(-20px);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateX(2000px);
+        transform: translateX(2000px);
+    }
+}
+
+@keyframes bounceOutRight {
+    0% {
+        -webkit-transform: translateX(0);
+        -ms-transform: translateX(0);
+        transform: translateX(0);
+    }
+
+    20% {
+        opacity: 1;
+        -webkit-transform: translateX(-20px);
+        -ms-transform: translateX(-20px);
+        transform: translateX(-20px);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateX(2000px);
+        -ms-transform: translateX(2000px);
+        transform: translateX(2000px);
+    }
+}
+
+.bounceOutRight {
+    -webkit-animation-name: bounceOutRight;
+    animation-name: bounceOutRight;
+}
+
+@-webkit-keyframes bounceOutUp {
+    0% {
+        -webkit-transform: translateY(0);
+        transform: translateY(0);
+    }
+
+    20% {
+        opacity: 1;
+        -webkit-transform: translateY(20px);
+        transform: translateY(20px);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateY(-2000px);
+        transform: translateY(-2000px);
+    }
+}
+
+@keyframes bounceOutUp {
+    0% {
+        -webkit-transform: translateY(0);
+        -ms-transform: translateY(0);
+        transform: translateY(0);
+    }
+
+    20% {
+        opacity: 1;
+        -webkit-transform: translateY(20px);
+        -ms-transform: translateY(20px);
+        transform: translateY(20px);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateY(-2000px);
+        -ms-transform: translateY(-2000px);
+        transform: translateY(-2000px);
+    }
+}
+
+.bounceOutUp {
+    -webkit-animation-name: bounceOutUp;
+    animation-name: bounceOutUp;
+}
+
+@-webkit-keyframes fadeIn {
+    0% {
+        opacity: 0;
+    }
+
+    100% {
+        opacity: 1;
+    }
+}
+
+@keyframes fadeIn {
+    0% {
+        opacity: 0;
+    }
+
+    100% {
+        opacity: 1;
+    }
+}
+
+.fadeIn {
+    -webkit-animation-name: fadeIn;
+    animation-name: fadeIn;
+}
+
+@-webkit-keyframes fadeInDown {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateY(-20px);
+        transform: translateY(-20px);
+    }
+
+    100% {
+        opacity: 1;
+        -webkit-transform: translateY(0);
+        transform: translateY(0);
+    }
+}
+
+@keyframes fadeInDown {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateY(-20px);
+        -ms-transform: translateY(-20px);
+        transform: translateY(-20px);
+    }
+
+    100% {
+        opacity: 1;
+        -webkit-transform: translateY(0);
+        -ms-transform: translateY(0);
+        transform: translateY(0);
+    }
+}
+
+.fadeInDown {
+    -webkit-animation-name: fadeInDown;
+    animation-name: fadeInDown;
+}
+
+@-webkit-keyframes fadeInDownBig {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateY(-2000px);
+        transform: translateY(-2000px);
+    }
+
+    100% {
+        opacity: 1;
+        -webkit-transform: translateY(0);
+        transform: translateY(0);
+    }
+}
+
+@keyframes fadeInDownBig {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateY(-2000px);
+        -ms-transform: translateY(-2000px);
+        transform: translateY(-2000px);
+    }
+
+    100% {
+        opacity: 1;
+        -webkit-transform: translateY(0);
+        -ms-transform: translateY(0);
+        transform: translateY(0);
+    }
+}
+
+.fadeInDownBig {
+    -webkit-animation-name: fadeInDownBig;
+    animation-name: fadeInDownBig;
+}
+
+@-webkit-keyframes fadeInLeft {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateX(-20px);
+        transform: translateX(-20px);
+    }
+
+    100% {
+        opacity: 1;
+        -webkit-transform: translateX(0);
+        transform: translateX(0);
+    }
+}
+
+@keyframes fadeInLeft {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateX(-20px);
+        -ms-transform: translateX(-20px);
+        transform: translateX(-20px);
+    }
+
+    100% {
+        opacity: 1;
+        -webkit-transform: translateX(0);
+        -ms-transform: translateX(0);
+        transform: translateX(0);
+    }
+}
+
+.fadeInLeft {
+    -webkit-animation-name: fadeInLeft;
+    animation-name: fadeInLeft;
+}
+
+@-webkit-keyframes fadeInLeftBig {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateX(-2000px);
+        transform: translateX(-2000px);
+    }
+
+    100% {
+        opacity: 1;
+        -webkit-transform: translateX(0);
+        transform: translateX(0);
+    }
+}
+
+@keyframes fadeInLeftBig {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateX(-2000px);
+        -ms-transform: translateX(-2000px);
+        transform: translateX(-2000px);
+    }
+
+    100% {
+        opacity: 1;
+        -webkit-transform: translateX(0);
+        -ms-transform: translateX(0);
+        transform: translateX(0);
+    }
+}
+
+.fadeInLeftBig {
+    -webkit-animation-name: fadeInLeftBig;
+    animation-name: fadeInLeftBig;
+}
+
+@-webkit-keyframes fadeInRight {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateX(20px);
+        transform: translateX(20px);
+    }
+
+    100% {
+        opacity: 1;
+        -webkit-transform: translateX(0);
+        transform: translateX(0);
+    }
+}
+
+@keyframes fadeInRight {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateX(40px);
+        -ms-transform: translateX(40px);
+        transform: translateX(40px);
+    }
+
+    100% {
+        opacity: 1;
+        -webkit-transform: translateX(0);
+        -ms-transform: translateX(0);
+        transform: translateX(0);
+    }
+}
+
+.fadeInRight {
+    -webkit-animation-name: fadeInRight;
+    animation-name: fadeInRight;
+}
+
+@-webkit-keyframes fadeInRightBig {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateX(2000px);
+        transform: translateX(2000px);
+    }
+
+    100% {
+        opacity: 1;
+        -webkit-transform: translateX(0);
+        transform: translateX(0);
+    }
+}
+
+@keyframes fadeInRightBig {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateX(2000px);
+        -ms-transform: translateX(2000px);
+        transform: translateX(2000px);
+    }
+
+    100% {
+        opacity: 1;
+        -webkit-transform: translateX(0);
+        -ms-transform: translateX(0);
+        transform: translateX(0);
+    }
+}
+
+.fadeInRightBig {
+    -webkit-animation-name: fadeInRightBig;
+    animation-name: fadeInRightBig;
+}
+
+@-webkit-keyframes fadeInUp {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateY(20px);
+        transform: translateY(20px);
+    }
+
+    100% {
+        opacity: 1;
+        -webkit-transform: translateY(0);
+        transform: translateY(0);
+    }
+}
+
+@keyframes fadeInUp {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateY(20px);
+        -ms-transform: translateY(20px);
+        transform: translateY(20px);
+    }
+
+    100% {
+        opacity: 1;
+        -webkit-transform: translateY(0);
+        -ms-transform: translateY(0);
+        transform: translateY(0);
+    }
+}
+
+.fadeInUp {
+    -webkit-animation-name: fadeInUp;
+    animation-name: fadeInUp;
+}
+
+@-webkit-keyframes fadeInUpBig {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateY(2000px);
+        transform: translateY(2000px);
+    }
+
+    100% {
+        opacity: 1;
+        -webkit-transform: translateY(0);
+        transform: translateY(0);
+    }
+}
+
+@keyframes fadeInUpBig {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateY(2000px);
+        -ms-transform: translateY(2000px);
+        transform: translateY(2000px);
+    }
+
+    100% {
+        opacity: 1;
+        -webkit-transform: translateY(0);
+        -ms-transform: translateY(0);
+        transform: translateY(0);
+    }
+}
+
+.fadeInUpBig {
+    -webkit-animation-name: fadeInUpBig;
+    animation-name: fadeInUpBig;
+}
+
+@-webkit-keyframes fadeOut {
+    0% {
+        opacity: 1;
+    }
+
+    100% {
+        opacity: 0;
+    }
+}
+
+@keyframes fadeOut {
+    0% {
+        opacity: 1;
+    }
+
+    100% {
+        opacity: 0;
+    }
+}
+
+.fadeOut {
+    -webkit-animation-name: fadeOut;
+    animation-name: fadeOut;
+}
+
+@-webkit-keyframes fadeOutDown {
+    0% {
+        opacity: 1;
+        -webkit-transform: translateY(0);
+        transform: translateY(0);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateY(20px);
+        transform: translateY(20px);
+    }
+}
+
+@keyframes fadeOutDown {
+    0% {
+        opacity: 1;
+        -webkit-transform: translateY(0);
+        -ms-transform: translateY(0);
+        transform: translateY(0);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateY(20px);
+        -ms-transform: translateY(20px);
+        transform: translateY(20px);
+    }
+}
+
+.fadeOutDown {
+    -webkit-animation-name: fadeOutDown;
+    animation-name: fadeOutDown;
+}
+
+@-webkit-keyframes fadeOutDownBig {
+    0% {
+        opacity: 1;
+        -webkit-transform: translateY(0);
+        transform: translateY(0);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateY(2000px);
+        transform: translateY(2000px);
+    }
+}
+
+@keyframes fadeOutDownBig {
+    0% {
+        opacity: 1;
+        -webkit-transform: translateY(0);
+        -ms-transform: translateY(0);
+        transform: translateY(0);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateY(2000px);
+        -ms-transform: translateY(2000px);
+        transform: translateY(2000px);
+    }
+}
+
+.fadeOutDownBig {
+    -webkit-animation-name: fadeOutDownBig;
+    animation-name: fadeOutDownBig;
+}
+
+@-webkit-keyframes fadeOutLeft {
+    0% {
+        opacity: 1;
+        -webkit-transform: translateX(0);
+        transform: translateX(0);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateX(-20px);
+        transform: translateX(-20px);
+    }
+}
+
+@keyframes fadeOutLeft {
+    0% {
+        opacity: 1;
+        -webkit-transform: translateX(0);
+        -ms-transform: translateX(0);
+        transform: translateX(0);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateX(-20px);
+        -ms-transform: translateX(-20px);
+        transform: translateX(-20px);
+    }
+}
+
+.fadeOutLeft {
+    -webkit-animation-name: fadeOutLeft;
+    animation-name: fadeOutLeft;
+}
+
+@-webkit-keyframes fadeOutLeftBig {
+    0% {
+        opacity: 1;
+        -webkit-transform: translateX(0);
+        transform: translateX(0);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateX(-2000px);
+        transform: translateX(-2000px);
+    }
+}
+
+@keyframes fadeOutLeftBig {
+    0% {
+        opacity: 1;
+        -webkit-transform: translateX(0);
+        -ms-transform: translateX(0);
+        transform: translateX(0);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateX(-2000px);
+        -ms-transform: translateX(-2000px);
+        transform: translateX(-2000px);
+    }
+}
+
+.fadeOutLeftBig {
+    -webkit-animation-name: fadeOutLeftBig;
+    animation-name: fadeOutLeftBig;
+}
+
+@-webkit-keyframes fadeOutRight {
+    0% {
+        opacity: 1;
+        -webkit-transform: translateX(0);
+        transform: translateX(0);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateX(20px);
+        transform: translateX(20px);
+    }
+}
+
+@keyframes fadeOutRight {
+    0% {
+        opacity: 1;
+        -webkit-transform: translateX(0);
+        -ms-transform: translateX(0);
+        transform: translateX(0);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateX(20px);
+        -ms-transform: translateX(20px);
+        transform: translateX(20px);
+    }
+}
+
+.fadeOutRight {
+    -webkit-animation-name: fadeOutRight;
+    animation-name: fadeOutRight;
+}
+
+@-webkit-keyframes fadeOutRightBig {
+    0% {
+        opacity: 1;
+        -webkit-transform: translateX(0);
+        transform: translateX(0);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateX(2000px);
+        transform: translateX(2000px);
+    }
+}
+
+@keyframes fadeOutRightBig {
+    0% {
+        opacity: 1;
+        -webkit-transform: translateX(0);
+        -ms-transform: translateX(0);
+        transform: translateX(0);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateX(2000px);
+        -ms-transform: translateX(2000px);
+        transform: translateX(2000px);
+    }
+}
+
+.fadeOutRightBig {
+    -webkit-animation-name: fadeOutRightBig;
+    animation-name: fadeOutRightBig;
+}
+
+@-webkit-keyframes fadeOutUp {
+    0% {
+        opacity: 1;
+        -webkit-transform: translateY(0);
+        transform: translateY(0);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateY(-20px);
+        transform: translateY(-20px);
+    }
+}
+
+@keyframes fadeOutUp {
+    0% {
+        opacity: 1;
+        -webkit-transform: translateY(0);
+        -ms-transform: translateY(0);
+        transform: translateY(0);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateY(-20px);
+        -ms-transform: translateY(-20px);
+        transform: translateY(-20px);
+    }
+}
+
+.fadeOutUp {
+    -webkit-animation-name: fadeOutUp;
+    animation-name: fadeOutUp;
+}
+
+@-webkit-keyframes fadeOutUpBig {
+    0% {
+        opacity: 1;
+        -webkit-transform: translateY(0);
+        transform: translateY(0);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateY(-2000px);
+        transform: translateY(-2000px);
+    }
+}
+
+@keyframes fadeOutUpBig {
+    0% {
+        opacity: 1;
+        -webkit-transform: translateY(0);
+        -ms-transform: translateY(0);
+        transform: translateY(0);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateY(-2000px);
+        -ms-transform: translateY(-2000px);
+        transform: translateY(-2000px);
+    }
+}
+
+.fadeOutUpBig {
+    -webkit-animation-name: fadeOutUpBig;
+    animation-name: fadeOutUpBig;
+}
+
+@-webkit-keyframes flip {
+    0% {
+        -webkit-transform: perspective(400px) translateZ(0) rotateY(0) scale(1);
+        transform: perspective(400px) translateZ(0) rotateY(0) scale(1);
+        -webkit-animation-timing-function: ease-out;
+        animation-timing-function: ease-out;
+    }
+
+    40% {
+        -webkit-transform: perspective(400px) translateZ(150px) rotateY(170deg) scale(1);
+        transform: perspective(400px) translateZ(150px) rotateY(170deg) scale(1);
+        -webkit-animation-timing-function: ease-out;
+        animation-timing-function: ease-out;
+    }
+
+    50% {
+        -webkit-transform: perspective(400px) translateZ(150px) rotateY(190deg) scale(1);
+        transform: perspective(400px) translateZ(150px) rotateY(190deg) scale(1);
+        -webkit-animation-timing-function: ease-in;
+        animation-timing-function: ease-in;
+    }
+
+    80% {
+        -webkit-transform: perspective(400px) translateZ(0) rotateY(360deg) scale(.95);
+        transform: perspective(400px) translateZ(0) rotateY(360deg) scale(.95);
+        -webkit-animation-timing-function: ease-in;
+        animation-timing-function: ease-in;
+    }
+
+    100% {
+        -webkit-transform: perspective(400px) translateZ(0) rotateY(360deg) scale(1);
+        transform: perspective(400px) translateZ(0) rotateY(360deg) scale(1);
+        -webkit-animation-timing-function: ease-in;
+        animation-timing-function: ease-in;
+    }
+}
+
+@keyframes flip {
+    0% {
+        -webkit-transform: perspective(400px) translateZ(0) rotateY(0) scale(1);
+        -ms-transform: perspective(400px) translateZ(0) rotateY(0) scale(1);
+        transform: perspective(400px) translateZ(0) rotateY(0) scale(1);
+        -webkit-animation-timing-function: ease-out;
+        animation-timing-function: ease-out;
+    }
+
+    40% {
+        -webkit-transform: perspective(400px) translateZ(150px) rotateY(170deg) scale(1);
+        -ms-transform: perspective(400px) translateZ(150px) rotateY(170deg) scale(1);
+        transform: perspective(400px) translateZ(150px) rotateY(170deg) scale(1);
+        -webkit-animation-timing-function: ease-out;
+        animation-timing-function: ease-out;
+    }
+
+    50% {
+        -webkit-transform: perspective(400px) translateZ(150px) rotateY(190deg) scale(1);
+        -ms-transform: perspective(400px) translateZ(150px) rotateY(190deg) scale(1);
+        transform: perspective(400px) translateZ(150px) rotateY(190deg) scale(1);
+        -webkit-animation-timing-function: ease-in;
+        animation-timing-function: ease-in;
+    }
+
+    80% {
+        -webkit-transform: perspective(400px) translateZ(0) rotateY(360deg) scale(.95);
+        -ms-transform: perspective(400px) translateZ(0) rotateY(360deg) scale(.95);
+        transform: perspective(400px) translateZ(0) rotateY(360deg) scale(.95);
+        -webkit-animation-timing-function: ease-in;
+        animation-timing-function: ease-in;
+    }
+
+    100% {
+        -webkit-transform: perspective(400px) translateZ(0) rotateY(360deg) scale(1);
+        -ms-transform: perspective(400px) translateZ(0) rotateY(360deg) scale(1);
+        transform: perspective(400px) translateZ(0) rotateY(360deg) scale(1);
+        -webkit-animation-timing-function: ease-in;
+        animation-timing-function: ease-in;
+    }
+}
+
+.animated.flip {
+    -webkit-backface-visibility: visible;
+    -ms-backface-visibility: visible;
+    backface-visibility: visible;
+    -webkit-animation-name: flip;
+    animation-name: flip;
+}
+
+@-webkit-keyframes flipInX {
+    0% {
+        -webkit-transform: perspective(400px) rotateX(90deg);
+        transform: perspective(400px) rotateX(90deg);
+        opacity: 0;
+    }
+
+    40% {
+        -webkit-transform: perspective(400px) rotateX(-10deg);
+        transform: perspective(400px) rotateX(-10deg);
+    }
+
+    70% {
+        -webkit-transform: perspective(400px) rotateX(10deg);
+        transform: perspective(400px) rotateX(10deg);
+    }
+
+    100% {
+        -webkit-transform: perspective(400px) rotateX(0deg);
+        transform: perspective(400px) rotateX(0deg);
+        opacity: 1;
+    }
+}
+
+@keyframes flipInX {
+    0% {
+        -webkit-transform: perspective(400px) rotateX(90deg);
+        -ms-transform: perspective(400px) rotateX(90deg);
+        transform: perspective(400px) rotateX(90deg);
+        opacity: 0;
+    }
+
+    40% {
+        -webkit-transform: perspective(400px) rotateX(-10deg);
+        -ms-transform: perspective(400px) rotateX(-10deg);
+        transform: perspective(400px) rotateX(-10deg);
+    }
+
+    70% {
+        -webkit-transform: perspective(400px) rotateX(10deg);
+        -ms-transform: perspective(400px) rotateX(10deg);
+        transform: perspective(400px) rotateX(10deg);
+    }
+
+    100% {
+        -webkit-transform: perspective(400px) rotateX(0deg);
+        -ms-transform: perspective(400px) rotateX(0deg);
+        transform: perspective(400px) rotateX(0deg);
+        opacity: 1;
+    }
+}
+
+.flipInX {
+    -webkit-backface-visibility: visible !important;
+    -ms-backface-visibility: visible !important;
+    backface-visibility: visible !important;
+    -webkit-animation-name: flipInX;
+    animation-name: flipInX;
+}
+
+@-webkit-keyframes flipInY {
+    0% {
+        -webkit-transform: perspective(400px) rotateY(90deg);
+        transform: perspective(400px) rotateY(90deg);
+        opacity: 0;
+    }
+
+    40% {
+        -webkit-transform: perspective(400px) rotateY(-10deg);
+        transform: perspective(400px) rotateY(-10deg);
+    }
+
+    70% {
+        -webkit-transform: perspective(400px) rotateY(10deg);
+        transform: perspective(400px) rotateY(10deg);
+    }
+
+    100% {
+        -webkit-transform: perspective(400px) rotateY(0deg);
+        transform: perspective(400px) rotateY(0deg);
+        opacity: 1;
+    }
+}
+
+@keyframes flipInY {
+    0% {
+        -webkit-transform: perspective(400px) rotateY(90deg);
+        -ms-transform: perspective(400px) rotateY(90deg);
+        transform: perspective(400px) rotateY(90deg);
+        opacity: 0;
+    }
+
+    40% {
+        -webkit-transform: perspective(400px) rotateY(-10deg);
+        -ms-transform: perspective(400px) rotateY(-10deg);
+        transform: perspective(400px) rotateY(-10deg);
+    }
+
+    70% {
+        -webkit-transform: perspective(400px) rotateY(10deg);
+        -ms-transform: perspective(400px) rotateY(10deg);
+        transform: perspective(400px) rotateY(10deg);
+    }
+
+    100% {
+        -webkit-transform: perspective(400px) rotateY(0deg);
+        -ms-transform: perspective(400px) rotateY(0deg);
+        transform: perspective(400px) rotateY(0deg);
+        opacity: 1;
+    }
+}
+
+.flipInY {
+    -webkit-backface-visibility: visible !important;
+    -ms-backface-visibility: visible !important;
+    backface-visibility: visible !important;
+    -webkit-animation-name: flipInY;
+    animation-name: flipInY;
+}
+
+@-webkit-keyframes flipOutX {
+    0% {
+        -webkit-transform: perspective(400px) rotateX(0deg);
+        transform: perspective(400px) rotateX(0deg);
+        opacity: 1;
+    }
+
+    100% {
+        -webkit-transform: perspective(400px) rotateX(90deg);
+        transform: perspective(400px) rotateX(90deg);
+        opacity: 0;
+    }
+}
+
+@keyframes flipOutX {
+    0% {
+        -webkit-transform: perspective(400px) rotateX(0deg);
+        -ms-transform: perspective(400px) rotateX(0deg);
+        transform: perspective(400px) rotateX(0deg);
+        opacity: 1;
+    }
+
+    100% {
+        -webkit-transform: perspective(400px) rotateX(90deg);
+        -ms-transform: perspective(400px) rotateX(90deg);
+        transform: perspective(400px) rotateX(90deg);
+        opacity: 0;
+    }
+}
+
+.flipOutX {
+    -webkit-animation-name: flipOutX;
+    animation-name: flipOutX;
+    -webkit-backface-visibility: visible !important;
+    -ms-backface-visibility: visible !important;
+    backface-visibility: visible !important;
+}
+
+@-webkit-keyframes flipOutY {
+    0% {
+        -webkit-transform: perspective(400px) rotateY(0deg);
+        transform: perspective(400px) rotateY(0deg);
+        opacity: 1;
+    }
+
+    100% {
+        -webkit-transform: perspective(400px) rotateY(90deg);
+        transform: perspective(400px) rotateY(90deg);
+        opacity: 0;
+    }
+}
+
+@keyframes flipOutY {
+    0% {
+        -webkit-transform: perspective(400px) rotateY(0deg);
+        -ms-transform: perspective(400px) rotateY(0deg);
+        transform: perspective(400px) rotateY(0deg);
+        opacity: 1;
+    }
+
+    100% {
+        -webkit-transform: perspective(400px) rotateY(90deg);
+        -ms-transform: perspective(400px) rotateY(90deg);
+        transform: perspective(400px) rotateY(90deg);
+        opacity: 0;
+    }
+}
+
+.flipOutY {
+    -webkit-backface-visibility: visible !important;
+    -ms-backface-visibility: visible !important;
+    backface-visibility: visible !important;
+    -webkit-animation-name: flipOutY;
+    animation-name: flipOutY;
+}
+
+@-webkit-keyframes lightSpeedIn {
+    0% {
+        -webkit-transform: translateX(100%) skewX(-30deg);
+        transform: translateX(100%) skewX(-30deg);
+        opacity: 0;
+    }
+
+    60% {
+        -webkit-transform: translateX(-20%) skewX(30deg);
+        transform: translateX(-20%) skewX(30deg);
+        opacity: 1;
+    }
+
+    80% {
+        -webkit-transform: translateX(0%) skewX(-15deg);
+        transform: translateX(0%) skewX(-15deg);
+        opacity: 1;
+    }
+
+    100% {
+        -webkit-transform: translateX(0%) skewX(0deg);
+        transform: translateX(0%) skewX(0deg);
+        opacity: 1;
+    }
+}
+
+@keyframes lightSpeedIn {
+    0% {
+        -webkit-transform: translateX(100%) skewX(-30deg);
+        -ms-transform: translateX(100%) skewX(-30deg);
+        transform: translateX(100%) skewX(-30deg);
+        opacity: 0;
+    }
+
+    60% {
+        -webkit-transform: translateX(-20%) skewX(30deg);
+        -ms-transform: translateX(-20%) skewX(30deg);
+        transform: translateX(-20%) skewX(30deg);
+        opacity: 1;
+    }
+
+    80% {
+        -webkit-transform: translateX(0%) skewX(-15deg);
+        -ms-transform: translateX(0%) skewX(-15deg);
+        transform: translateX(0%) skewX(-15deg);
+        opacity: 1;
+    }
+
+    100% {
+        -webkit-transform: translateX(0%) skewX(0deg);
+        -ms-transform: translateX(0%) skewX(0deg);
+        transform: translateX(0%) skewX(0deg);
+        opacity: 1;
+    }
+}
+
+.lightSpeedIn {
+    -webkit-animation-name: lightSpeedIn;
+    animation-name: lightSpeedIn;
+    -webkit-animation-timing-function: ease-out;
+    animation-timing-function: ease-out;
+}
+
+@-webkit-keyframes lightSpeedOut {
+    0% {
+        -webkit-transform: translateX(0%) skewX(0deg);
+        transform: translateX(0%) skewX(0deg);
+        opacity: 1;
+    }
+
+    100% {
+        -webkit-transform: translateX(100%) skewX(-30deg);
+        transform: translateX(100%) skewX(-30deg);
+        opacity: 0;
+    }
+}
+
+@keyframes lightSpeedOut {
+    0% {
+        -webkit-transform: translateX(0%) skewX(0deg);
+        -ms-transform: translateX(0%) skewX(0deg);
+        transform: translateX(0%) skewX(0deg);
+        opacity: 1;
+    }
+
+    100% {
+        -webkit-transform: translateX(100%) skewX(-30deg);
+        -ms-transform: translateX(100%) skewX(-30deg);
+        transform: translateX(100%) skewX(-30deg);
+        opacity: 0;
+    }
+}
+
+.lightSpeedOut {
+    -webkit-animation-name: lightSpeedOut;
+    animation-name: lightSpeedOut;
+    -webkit-animation-timing-function: ease-in;
+    animation-timing-function: ease-in;
+}
+
+@-webkit-keyframes rotateIn {
+    0% {
+        -webkit-transform-origin: center center;
+        transform-origin: center center;
+        -webkit-transform: rotate(-200deg);
+        transform: rotate(-200deg);
+        opacity: 0;
+    }
+
+    100% {
+        -webkit-transform-origin: center center;
+        transform-origin: center center;
+        -webkit-transform: rotate(0);
+        transform: rotate(0);
+        opacity: 1;
+    }
+}
+
+@keyframes rotateIn {
+    0% {
+        -webkit-transform-origin: center center;
+        -ms-transform-origin: center center;
+        transform-origin: center center;
+        -webkit-transform: rotate(-200deg);
+        -ms-transform: rotate(-200deg);
+        transform: rotate(-200deg);
+        opacity: 0;
+    }
+
+    100% {
+        -webkit-transform-origin: center center;
+        -ms-transform-origin: center center;
+        transform-origin: center center;
+        -webkit-transform: rotate(0);
+        -ms-transform: rotate(0);
+        transform: rotate(0);
+        opacity: 1;
+    }
+}
+
+.rotateIn {
+    -webkit-animation-name: rotateIn;
+    animation-name: rotateIn;
+}
+
+@-webkit-keyframes rotateInDownLeft {
+    0% {
+        -webkit-transform-origin: left bottom;
+        transform-origin: left bottom;
+        -webkit-transform: rotate(-90deg);
+        transform: rotate(-90deg);
+        opacity: 0;
+    }
+
+    100% {
+        -webkit-transform-origin: left bottom;
+        transform-origin: left bottom;
+        -webkit-transform: rotate(0);
+        transform: rotate(0);
+        opacity: 1;
+    }
+}
+
+@keyframes rotateInDownLeft {
+    0% {
+        -webkit-transform-origin: left bottom;
+        -ms-transform-origin: left bottom;
+        transform-origin: left bottom;
+        -webkit-transform: rotate(-90deg);
+        -ms-transform: rotate(-90deg);
+        transform: rotate(-90deg);
+        opacity: 0;
+    }
+
+    100% {
+        -webkit-transform-origin: left bottom;
+        -ms-transform-origin: left bottom;
+        transform-origin: left bottom;
+        -webkit-transform: rotate(0);
+        -ms-transform: rotate(0);
+        transform: rotate(0);
+        opacity: 1;
+    }
+}
+
+.rotateInDownLeft {
+    -webkit-animation-name: rotateInDownLeft;
+    animation-name: rotateInDownLeft;
+}
+
+@-webkit-keyframes rotateInDownRight {
+    0% {
+        -webkit-transform-origin: right bottom;
+        transform-origin: right bottom;
+        -webkit-transform: rotate(90deg);
+        transform: rotate(90deg);
+        opacity: 0;
+    }
+
+    100% {
+        -webkit-transform-origin: right bottom;
+        transform-origin: right bottom;
+        -webkit-transform: rotate(0);
+        transform: rotate(0);
+        opacity: 1;
+    }
+}
+
+@keyframes rotateInDownRight {
+    0% {
+        -webkit-transform-origin: right bottom;
+        -ms-transform-origin: right bottom;
+        transform-origin: right bottom;
+        -webkit-transform: rotate(90deg);
+        -ms-transform: rotate(90deg);
+        transform: rotate(90deg);
+        opacity: 0;
+    }
+
+    100% {
+        -webkit-transform-origin: right bottom;
+        -ms-transform-origin: right bottom;
+        transform-origin: right bottom;
+        -webkit-transform: rotate(0);
+        -ms-transform: rotate(0);
+        transform: rotate(0);
+        opacity: 1;
+    }
+}
+
+.rotateInDownRight {
+    -webkit-animation-name: rotateInDownRight;
+    animation-name: rotateInDownRight;
+}
+
+@-webkit-keyframes rotateInUpLeft {
+    0% {
+        -webkit-transform-origin: left bottom;
+        transform-origin: left bottom;
+        -webkit-transform: rotate(90deg);
+        transform: rotate(90deg);
+        opacity: 0;
+    }
+
+    100% {
+        -webkit-transform-origin: left bottom;
+        transform-origin: left bottom;
+        -webkit-transform: rotate(0);
+        transform: rotate(0);
+        opacity: 1;
+    }
+}
+
+@keyframes rotateInUpLeft {
+    0% {
+        -webkit-transform-origin: left bottom;
+        -ms-transform-origin: left bottom;
+        transform-origin: left bottom;
+        -webkit-transform: rotate(90deg);
+        -ms-transform: rotate(90deg);
+        transform: rotate(90deg);
+        opacity: 0;
+    }
+
+    100% {
+        -webkit-transform-origin: left bottom;
+        -ms-transform-origin: left bottom;
+        transform-origin: left bottom;
+        -webkit-transform: rotate(0);
+        -ms-transform: rotate(0);
+        transform: rotate(0);
+        opacity: 1;
+    }
+}
+
+.rotateInUpLeft {
+    -webkit-animation-name: rotateInUpLeft;
+    animation-name: rotateInUpLeft;
+}
+
+@-webkit-keyframes rotateInUpRight {
+    0% {
+        -webkit-transform-origin: right bottom;
+        transform-origin: right bottom;
+        -webkit-transform: rotate(-90deg);
+        transform: rotate(-90deg);
+        opacity: 0;
+    }
+
+    100% {
+        -webkit-transform-origin: right bottom;
+        transform-origin: right bottom;
+        -webkit-transform: rotate(0);
+        transform: rotate(0);
+        opacity: 1;
+    }
+}
+
+@keyframes rotateInUpRight {
+    0% {
+        -webkit-transform-origin: right bottom;
+        -ms-transform-origin: right bottom;
+        transform-origin: right bottom;
+        -webkit-transform: rotate(-90deg);
+        -ms-transform: rotate(-90deg);
+        transform: rotate(-90deg);
+        opacity: 0;
+    }
+
+    100% {
+        -webkit-transform-origin: right bottom;
+        -ms-transform-origin: right bottom;
+        transform-origin: right bottom;
+        -webkit-transform: rotate(0);
+        -ms-transform: rotate(0);
+        transform: rotate(0);
+        opacity: 1;
+    }
+}
+
+.rotateInUpRight {
+    -webkit-animation-name: rotateInUpRight;
+    animation-name: rotateInUpRight;
+}
+
+@-webkit-keyframes rotateOut {
+    0% {
+        -webkit-transform-origin: center center;
+        transform-origin: center center;
+        -webkit-transform: rotate(0);
+        transform: rotate(0);
+        opacity: 1;
+    }
+
+    100% {
+        -webkit-transform-origin: center center;
+        transform-origin: center center;
+        -webkit-transform: rotate(200deg);
+        transform: rotate(200deg);
+        opacity: 0;
+    }
+}
+
+@keyframes rotateOut {
+    0% {
+        -webkit-transform-origin: center center;
+        -ms-transform-origin: center center;
+        transform-origin: center center;
+        -webkit-transform: rotate(0);
+        -ms-transform: rotate(0);
+        transform: rotate(0);
+        opacity: 1;
+    }
+
+    100% {
+        -webkit-transform-origin: center center;
+        -ms-transform-origin: center center;
+        transform-origin: center center;
+        -webkit-transform: rotate(200deg);
+        -ms-transform: rotate(200deg);
+        transform: rotate(200deg);
+        opacity: 0;
+    }
+}
+
+.rotateOut {
+    -webkit-animation-name: rotateOut;
+    animation-name: rotateOut;
+}
+
+@-webkit-keyframes rotateOutDownLeft {
+    0% {
+        -webkit-transform-origin: left bottom;
+        transform-origin: left bottom;
+        -webkit-transform: rotate(0);
+        transform: rotate(0);
+        opacity: 1;
+    }
+
+    100% {
+        -webkit-transform-origin: left bottom;
+        transform-origin: left bottom;
+        -webkit-transform: rotate(90deg);
+        transform: rotate(90deg);
+        opacity: 0;
+    }
+}
+
+@keyframes rotateOutDownLeft {
+    0% {
+        -webkit-transform-origin: left bottom;
+        -ms-transform-origin: left bottom;
+        transform-origin: left bottom;
+        -webkit-transform: rotate(0);
+        -ms-transform: rotate(0);
+        transform: rotate(0);
+        opacity: 1;
+    }
+
+    100% {
+        -webkit-transform-origin: left bottom;
+        -ms-transform-origin: left bottom;
+        transform-origin: left bottom;
+        -webkit-transform: rotate(90deg);
+        -ms-transform: rotate(90deg);
+        transform: rotate(90deg);
+        opacity: 0;
+    }
+}
+
+.rotateOutDownLeft {
+    -webkit-animation-name: rotateOutDownLeft;
+    animation-name: rotateOutDownLeft;
+}
+
+@-webkit-keyframes rotateOutDownRight {
+    0% {
+        -webkit-transform-origin: right bottom;
+        transform-origin: right bottom;
+        -webkit-transform: rotate(0);
+        transform: rotate(0);
+        opacity: 1;
+    }
+
+    100% {
+        -webkit-transform-origin: right bottom;
+        transform-origin: right bottom;
+        -webkit-transform: rotate(-90deg);
+        transform: rotate(-90deg);
+        opacity: 0;
+    }
+}
+
+@keyframes rotateOutDownRight {
+    0% {
+        -webkit-transform-origin: right bottom;
+        -ms-transform-origin: right bottom;
+        transform-origin: right bottom;
+        -webkit-transform: rotate(0);
+        -ms-transform: rotate(0);
+        transform: rotate(0);
+        opacity: 1;
+    }
+
+    100% {
+        -webkit-transform-origin: right bottom;
+        -ms-transform-origin: right bottom;
+        transform-origin: right bottom;
+        -webkit-transform: rotate(-90deg);
+        -ms-transform: rotate(-90deg);
+        transform: rotate(-90deg);
+        opacity: 0;
+    }
+}
+
+.rotateOutDownRight {
+    -webkit-animation-name: rotateOutDownRight;
+    animation-name: rotateOutDownRight;
+}
+
+@-webkit-keyframes rotateOutUpLeft {
+    0% {
+        -webkit-transform-origin: left bottom;
+        transform-origin: left bottom;
+        -webkit-transform: rotate(0);
+        transform: rotate(0);
+        opacity: 1;
+    }
+
+    100% {
+        -webkit-transform-origin: left bottom;
+        transform-origin: left bottom;
+        -webkit-transform: rotate(-90deg);
+        transform: rotate(-90deg);
+        opacity: 0;
+    }
+}
+
+@keyframes rotateOutUpLeft {
+    0% {
+        -webkit-transform-origin: left bottom;
+        -ms-transform-origin: left bottom;
+        transform-origin: left bottom;
+        -webkit-transform: rotate(0);
+        -ms-transform: rotate(0);
+        transform: rotate(0);
+        opacity: 1;
+    }
+
+    100% {
+        -webkit-transform-origin: left bottom;
+        -ms-transform-origin: left bottom;
+        transform-origin: left bottom;
+        -webkit-transform: rotate(-90deg);
+        -ms-transform: rotate(-90deg);
+        transform: rotate(-90deg);
+        opacity: 0;
+    }
+}
+
+.rotateOutUpLeft {
+    -webkit-animation-name: rotateOutUpLeft;
+    animation-name: rotateOutUpLeft;
+}
+
+@-webkit-keyframes rotateOutUpRight {
+    0% {
+        -webkit-transform-origin: right bottom;
+        transform-origin: right bottom;
+        -webkit-transform: rotate(0);
+        transform: rotate(0);
+        opacity: 1;
+    }
+
+    100% {
+        -webkit-transform-origin: right bottom;
+        transform-origin: right bottom;
+        -webkit-transform: rotate(90deg);
+        transform: rotate(90deg);
+        opacity: 0;
+    }
+}
+
+@keyframes rotateOutUpRight {
+    0% {
+        -webkit-transform-origin: right bottom;
+        -ms-transform-origin: right bottom;
+        transform-origin: right bottom;
+        -webkit-transform: rotate(0);
+        -ms-transform: rotate(0);
+        transform: rotate(0);
+        opacity: 1;
+    }
+
+    100% {
+        -webkit-transform-origin: right bottom;
+        -ms-transform-origin: right bottom;
+        transform-origin: right bottom;
+        -webkit-transform: rotate(90deg);
+        -ms-transform: rotate(90deg);
+        transform: rotate(90deg);
+        opacity: 0;
+    }
+}
+
+.rotateOutUpRight {
+    -webkit-animation-name: rotateOutUpRight;
+    animation-name: rotateOutUpRight;
+}
+
+@-webkit-keyframes slideInDown {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateY(-2000px);
+        transform: translateY(-2000px);
+    }
+
+    100% {
+        -webkit-transform: translateY(0);
+        transform: translateY(0);
+    }
+}
+
+@keyframes slideInDown {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateY(-2000px);
+        -ms-transform: translateY(-2000px);
+        transform: translateY(-2000px);
+    }
+
+    100% {
+        -webkit-transform: translateY(0);
+        -ms-transform: translateY(0);
+        transform: translateY(0);
+    }
+}
+
+.slideInDown {
+    -webkit-animation-name: slideInDown;
+    animation-name: slideInDown;
+}
+
+@-webkit-keyframes slideInLeft {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateX(-2000px);
+        transform: translateX(-2000px);
+    }
+
+    100% {
+        -webkit-transform: translateX(0);
+        transform: translateX(0);
+    }
+}
+
+@keyframes slideInLeft {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateX(-2000px);
+        -ms-transform: translateX(-2000px);
+        transform: translateX(-2000px);
+    }
+
+    100% {
+        -webkit-transform: translateX(0);
+        -ms-transform: translateX(0);
+        transform: translateX(0);
+    }
+}
+
+.slideInLeft {
+    -webkit-animation-name: slideInLeft;
+    animation-name: slideInLeft;
+}
+
+@-webkit-keyframes slideInRight {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateX(2000px);
+        transform: translateX(2000px);
+    }
+
+    100% {
+        -webkit-transform: translateX(0);
+        transform: translateX(0);
+    }
+}
+
+@keyframes slideInRight {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateX(2000px);
+        -ms-transform: translateX(2000px);
+        transform: translateX(2000px);
+    }
+
+    100% {
+        -webkit-transform: translateX(0);
+        -ms-transform: translateX(0);
+        transform: translateX(0);
+    }
+}
+
+.slideInRight {
+    -webkit-animation-name: slideInRight;
+    animation-name: slideInRight;
+}
+
+@-webkit-keyframes slideOutLeft {
+    0% {
+        -webkit-transform: translateX(0);
+        transform: translateX(0);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateX(-2000px);
+        transform: translateX(-2000px);
+    }
+}
+
+@keyframes slideOutLeft {
+    0% {
+        -webkit-transform: translateX(0);
+        -ms-transform: translateX(0);
+        transform: translateX(0);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateX(-2000px);
+        -ms-transform: translateX(-2000px);
+        transform: translateX(-2000px);
+    }
+}
+
+.slideOutLeft {
+    -webkit-animation-name: slideOutLeft;
+    animation-name: slideOutLeft;
+}
+
+@-webkit-keyframes slideOutRight {
+    0% {
+        -webkit-transform: translateX(0);
+        transform: translateX(0);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateX(2000px);
+        transform: translateX(2000px);
+    }
+}
+
+@keyframes slideOutRight {
+    0% {
+        -webkit-transform: translateX(0);
+        -ms-transform: translateX(0);
+        transform: translateX(0);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateX(2000px);
+        -ms-transform: translateX(2000px);
+        transform: translateX(2000px);
+    }
+}
+
+.slideOutRight {
+    -webkit-animation-name: slideOutRight;
+    animation-name: slideOutRight;
+}
+
+@-webkit-keyframes slideOutUp {
+    0% {
+        -webkit-transform: translateY(0);
+        transform: translateY(0);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateY(-2000px);
+        transform: translateY(-2000px);
+    }
+}
+
+@keyframes slideOutUp {
+    0% {
+        -webkit-transform: translateY(0);
+        -ms-transform: translateY(0);
+        transform: translateY(0);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateY(-2000px);
+        -ms-transform: translateY(-2000px);
+        transform: translateY(-2000px);
+    }
+}
+
+.slideOutUp {
+    -webkit-animation-name: slideOutUp;
+    animation-name: slideOutUp;
+}
+
+@-webkit-keyframes slideOutDown {
+    0% {
+        -webkit-transform: translateY(0);
+        transform: translateY(0);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateY(2000px);
+        transform: translateY(2000px);
+    }
+}
+
+@keyframes slideOutDown {
+    0% {
+        -webkit-transform: translateY(0);
+        -ms-transform: translateY(0);
+        transform: translateY(0);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateY(2000px);
+        -ms-transform: translateY(2000px);
+        transform: translateY(2000px);
+    }
+}
+
+.slideOutDown {
+    -webkit-animation-name: slideOutDown;
+    animation-name: slideOutDown;
+}
+
+@-webkit-keyframes hinge {
+    0% {
+        -webkit-transform: rotate(0);
+        transform: rotate(0);
+        -webkit-transform-origin: top left;
+        transform-origin: top left;
+        -webkit-animation-timing-function: ease-in-out;
+        animation-timing-function: ease-in-out;
+    }
+
+    20%, 60% {
+        -webkit-transform: rotate(80deg);
+        transform: rotate(80deg);
+        -webkit-transform-origin: top left;
+        transform-origin: top left;
+        -webkit-animation-timing-function: ease-in-out;
+        animation-timing-function: ease-in-out;
+    }
+
+    40% {
+        -webkit-transform: rotate(60deg);
+        transform: rotate(60deg);
+        -webkit-transform-origin: top left;
+        transform-origin: top left;
+        -webkit-animation-timing-function: ease-in-out;
+        animation-timing-function: ease-in-out;
+    }
+
+    80% {
+        -webkit-transform: rotate(60deg) translateY(0);
+        transform: rotate(60deg) translateY(0);
+        -webkit-transform-origin: top left;
+        transform-origin: top left;
+        -webkit-animation-timing-function: ease-in-out;
+        animation-timing-function: ease-in-out;
+        opacity: 1;
+    }
+
+    100% {
+        -webkit-transform: translateY(700px);
+        transform: translateY(700px);
+        opacity: 0;
+    }
+}
+
+@keyframes hinge {
+    0% {
+        -webkit-transform: rotate(0);
+        -ms-transform: rotate(0);
+        transform: rotate(0);
+        -webkit-transform-origin: top left;
+        -ms-transform-origin: top left;
+        transform-origin: top left;
+        -webkit-animation-timing-function: ease-in-out;
+        animation-timing-function: ease-in-out;
+    }
+
+    20%, 60% {
+        -webkit-transform: rotate(80deg);
+        -ms-transform: rotate(80deg);
+        transform: rotate(80deg);
+        -webkit-transform-origin: top left;
+        -ms-transform-origin: top left;
+        transform-origin: top left;
+        -webkit-animation-timing-function: ease-in-out;
+        animation-timing-function: ease-in-out;
+    }
+
+    40% {
+        -webkit-transform: rotate(60deg);
+        -ms-transform: rotate(60deg);
+        transform: rotate(60deg);
+        -webkit-transform-origin: top left;
+        -ms-transform-origin: top left;
+        transform-origin: top left;
+        -webkit-animation-timing-function: ease-in-out;
+        animation-timing-function: ease-in-out;
+    }
+
+    80% {
+        -webkit-transform: rotate(60deg) translateY(0);
+        -ms-transform: rotate(60deg) translateY(0);
+        transform: rotate(60deg) translateY(0);
+        -webkit-transform-origin: top left;
+        -ms-transform-origin: top left;
+        transform-origin: top left;
+        -webkit-animation-timing-function: ease-in-out;
+        animation-timing-function: ease-in-out;
+        opacity: 1;
+    }
+
+    100% {
+        -webkit-transform: translateY(700px);
+        -ms-transform: translateY(700px);
+        transform: translateY(700px);
+        opacity: 0;
+    }
+}
+
+.hinge {
+    -webkit-animation-name: hinge;
+    animation-name: hinge;
+}
+
+/* originally authored by Nick Pettit - https://github.com/nickpettit/glide */
+
+@-webkit-keyframes rollIn {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateX(-100%) rotate(-120deg);
+        transform: translateX(-100%) rotate(-120deg);
+    }
+
+    100% {
+        opacity: 1;
+        -webkit-transform: translateX(0px) rotate(0deg);
+        transform: translateX(0px) rotate(0deg);
+    }
+}
+
+@keyframes rollIn {
+    0% {
+        opacity: 0;
+        -webkit-transform: translateX(-100%) rotate(-120deg);
+        -ms-transform: translateX(-100%) rotate(-120deg);
+        transform: translateX(-100%) rotate(-120deg);
+    }
+
+    100% {
+        opacity: 1;
+        -webkit-transform: translateX(0px) rotate(0deg);
+        -ms-transform: translateX(0px) rotate(0deg);
+        transform: translateX(0px) rotate(0deg);
+    }
+}
+
+.rollIn {
+    -webkit-animation-name: rollIn;
+    animation-name: rollIn;
+}
+
+/* originally authored by Nick Pettit - https://github.com/nickpettit/glide */
+
+@-webkit-keyframes rollOut {
+    0% {
+        opacity: 1;
+        -webkit-transform: translateX(0px) rotate(0deg);
+        transform: translateX(0px) rotate(0deg);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateX(100%) rotate(120deg);
+        transform: translateX(100%) rotate(120deg);
+    }
+}
+
+@keyframes rollOut {
+    0% {
+        opacity: 1;
+        -webkit-transform: translateX(0px) rotate(0deg);
+        -ms-transform: translateX(0px) rotate(0deg);
+        transform: translateX(0px) rotate(0deg);
+    }
+
+    100% {
+        opacity: 0;
+        -webkit-transform: translateX(100%) rotate(120deg);
+        -ms-transform: translateX(100%) rotate(120deg);
+        transform: translateX(100%) rotate(120deg);
+    }
+}
+
+.rollOut {
+    -webkit-animation-name: rollOut;
+    animation-name: rollOut;
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/css/bootstrap.min.css b/pluss-manage-page/src/main/resources/static/resources/css/bootstrap.min.css
new file mode 100644
index 0000000..d242dd1
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/css/bootstrap.min.css
@@ -0,0 +1,7979 @@
+html {
+	font-family: sans-serif;
+	-webkit-text-size-adjust: 100%;
+	-ms-text-size-adjust: 100%
+}
+
+body {
+	margin: 0
+}
+
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+main,
+menu,
+nav,
+section,
+summary {
+	display: block
+}
+
+audio,
+canvas,
+progress,
+video {
+	display: inline-block;
+	vertical-align: baseline
+}
+
+audio:not([controls]) {
+	display: none;
+	height: 0
+}
+
+[hidden],
+template {
+	display: none
+}
+
+a {
+	background-color: transparent
+}
+
+a:active,
+a:hover {
+	outline: 0
+}
+
+abbr[title] {
+	border-bottom: 1px dotted
+}
+
+b,
+strong {
+	font-weight: 700
+}
+
+dfn {
+	font-style: italic
+}
+
+h1 {
+	margin: .67em 0;
+	font-size: 2em
+}
+
+mark {
+	color: #000;
+	background: #ff0
+}
+
+small {
+	font-size: 80%
+}
+
+sub,
+sup {
+	position: relative;
+	font-size: 75%;
+	line-height: 0;
+	vertical-align: baseline
+}
+
+sup {
+	top: -.5em
+}
+
+sub {
+	bottom: -.25em
+}
+
+img {
+	border: 0
+}
+
+svg:not(:root) {
+	overflow: hidden
+}
+
+figure {
+	margin: 1em 40px
+}
+
+hr {
+	height: 0;
+	-webkit-box-sizing: content-box;
+	-moz-box-sizing: content-box;
+	box-sizing: content-box
+}
+
+pre {
+	overflow: auto
+}
+
+code,
+kbd,
+pre,
+samp {
+	font-family: monospace, monospace;
+	font-size: 1em
+}
+
+button,
+input,
+optgroup,
+select,
+textarea {
+	margin: 0;
+	font: inherit;
+	color: inherit
+}
+
+button {
+	overflow: visible
+}
+
+button,
+select {
+	text-transform: none
+}
+
+button,
+html input[type=button],
+input[type=reset],
+input[type=submit] {
+	-webkit-appearance: button;
+	cursor: pointer
+}
+
+button[disabled],
+html input[disabled] {
+	cursor: default
+}
+
+button::-moz-focus-inner,
+input::-moz-focus-inner {
+	padding: 0;
+	border: 0
+}
+
+input {
+	line-height: normal
+}
+
+input[type=checkbox],
+input[type=radio] {
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+	padding: 0
+}
+
+input[type=number]::-webkit-inner-spin-button,
+input[type=number]::-webkit-outer-spin-button {
+	height: auto
+}
+
+input[type=search] {
+	-webkit-box-sizing: content-box;
+	-moz-box-sizing: content-box;
+	box-sizing: content-box;
+	-webkit-appearance: textfield
+}
+
+input[type=search]::-webkit-search-cancel-button,
+input[type=search]::-webkit-search-decoration {
+	-webkit-appearance: none
+}
+
+fieldset {
+	padding: .35em .625em .75em;
+	margin: 0 2px;
+	border: 1px solid silver
+}
+
+legend {
+	padding: 0;
+	border: 0
+}
+
+textarea {
+	overflow: auto
+}
+
+optgroup {
+	font-weight: 700
+}
+
+table {
+	border-spacing: 0;
+	border-collapse: collapse
+}
+
+td,
+th {
+	padding: 0
+}
+
+
+/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */
+
+@media print {
+	*,
+	:after,
+	:before {
+		color: #000!important;
+		text-shadow: none!important;
+		background: 0 0!important;
+		-webkit-box-shadow: none!important;
+		box-shadow: none!important
+	}
+	blockquote,
+	pre {
+		border: 1px solid #999;
+		page-break-inside: avoid
+	}
+	thead {
+		display: table-header-group
+	}
+	img,
+	tr {
+		page-break-inside: avoid
+	}
+	img {
+		max-width: 100%!important
+	}
+	h2,
+	h3,
+	p {
+		orphans: 3;
+		widows: 3
+	}
+	h2,
+	h3 {
+		page-break-after: avoid
+	}
+	.navbar {
+		display: none
+	}
+	.btn>.caret,
+	.dropup>.btn>.caret {
+		border-top-color: #000!important
+	}
+	.label {
+		border: 1px solid #000
+	}
+	.table {
+		border-collapse: collapse!important
+	}
+	.table td,
+	.table th {
+		background-color: #fff!important
+	}
+	.table-bordered td,
+	.table-bordered th {
+		border: 1px solid #ddd!important
+	}
+}
+
+@font-face {
+	font-family: 'Glyphicons Halflings';
+	src: url(../../fonts/glyphicons-halflings-regular.eot);
+	src: url(../../fonts/glyphicons-halflings-regular.eot?#iefix) format('embedded-opentype'), url(../../fonts/glyphicons-halflings-regular.woff2) format('woff2'), url(../../fonts/glyphicons-halflings-regular.woff) format('woff'), url(../../fonts/glyphicons-halflings-regular.ttf) format('truetype'), url(../../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular) format('svg')
+}
+
+.glyphicon {
+	position: relative;
+	top: 1px;
+	display: inline-block;
+	font-family: 'Glyphicons Halflings';
+	font-style: normal;
+	font-weight: 400;
+	line-height: 1;
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale
+}
+
+.glyphicon-asterisk:before {
+	content: "\002a"
+}
+
+.glyphicon-plus:before {
+	content: "\002b"
+}
+
+.glyphicon-eur:before,
+.glyphicon-euro:before {
+	content: "\20ac"
+}
+
+.glyphicon-minus:before {
+	content: "\2212"
+}
+
+.glyphicon-cloud:before {
+	content: "\2601"
+}
+
+.glyphicon-envelope:before {
+	content: "\2709"
+}
+
+.glyphicon-pencil:before {
+	content: "\270f"
+}
+
+.glyphicon-glass:before {
+	content: "\e001"
+}
+
+.glyphicon-music:before {
+	content: "\e002"
+}
+
+.glyphicon-search:before {
+	content: "\e003"
+}
+
+.glyphicon-heart:before {
+	content: "\e005"
+}
+
+.glyphicon-star:before {
+	content: "\e006"
+}
+
+.glyphicon-star-empty:before {
+	content: "\e007"
+}
+
+.glyphicon-user:before {
+	content: "\e008"
+}
+
+.glyphicon-film:before {
+	content: "\e009"
+}
+
+.glyphicon-th-large:before {
+	content: "\e010"
+}
+
+.glyphicon-th:before {
+	content: "\e011"
+}
+
+.glyphicon-th-list:before {
+	content: "\e012"
+}
+
+.glyphicon-ok:before {
+	content: "\e013"
+}
+
+.glyphicon-remove:before {
+	content: "\e014"
+}
+
+.glyphicon-zoom-in:before {
+	content: "\e015"
+}
+
+.glyphicon-zoom-out:before {
+	content: "\e016"
+}
+
+.glyphicon-off:before {
+	content: "\e017"
+}
+
+.glyphicon-signal:before {
+	content: "\e018"
+}
+
+.glyphicon-cog:before {
+	content: "\e019"
+}
+
+.glyphicon-trash:before {
+	content: "\e020"
+}
+
+.glyphicon-home:before {
+	content: "\e021"
+}
+
+.glyphicon-file:before {
+	content: "\e022"
+}
+
+.glyphicon-time:before {
+	content: "\e023"
+}
+
+.glyphicon-road:before {
+	content: "\e024"
+}
+
+.glyphicon-download-alt:before {
+	content: "\e025"
+}
+
+.glyphicon-download:before {
+	content: "\e026"
+}
+
+.glyphicon-upload:before {
+	content: "\e027"
+}
+
+.glyphicon-inbox:before {
+	content: "\e028"
+}
+
+.glyphicon-play-circle:before {
+	content: "\e029"
+}
+
+.glyphicon-repeat:before {
+	content: "\e030"
+}
+
+.glyphicon-refresh:before {
+	content: "\e031"
+}
+
+.glyphicon-list-alt:before {
+	content: "\e032"
+}
+
+.glyphicon-lock:before {
+	content: "\e033"
+}
+
+.glyphicon-flag:before {
+	content: "\e034"
+}
+
+.glyphicon-headphones:before {
+	content: "\e035"
+}
+
+.glyphicon-volume-off:before {
+	content: "\e036"
+}
+
+.glyphicon-volume-down:before {
+	content: "\e037"
+}
+
+.glyphicon-volume-up:before {
+	content: "\e038"
+}
+
+.glyphicon-qrcode:before {
+	content: "\e039"
+}
+
+.glyphicon-barcode:before {
+	content: "\e040"
+}
+
+.glyphicon-tag:before {
+	content: "\e041"
+}
+
+.glyphicon-tags:before {
+	content: "\e042"
+}
+
+.glyphicon-book:before {
+	content: "\e043"
+}
+
+.glyphicon-bookmark:before {
+	content: "\e044"
+}
+
+.glyphicon-print:before {
+	content: "\e045"
+}
+
+.glyphicon-camera:before {
+	content: "\e046"
+}
+
+.glyphicon-font:before {
+	content: "\e047"
+}
+
+.glyphicon-bold:before {
+	content: "\e048"
+}
+
+.glyphicon-italic:before {
+	content: "\e049"
+}
+
+.glyphicon-text-height:before {
+	content: "\e050"
+}
+
+.glyphicon-text-width:before {
+	content: "\e051"
+}
+
+.glyphicon-align-left:before {
+	content: "\e052"
+}
+
+.glyphicon-align-center:before {
+	content: "\e053"
+}
+
+.glyphicon-align-right:before {
+	content: "\e054"
+}
+
+.glyphicon-align-justify:before {
+	content: "\e055"
+}
+
+.glyphicon-list:before {
+	content: "\e056"
+}
+
+.glyphicon-indent-left:before {
+	content: "\e057"
+}
+
+.glyphicon-indent-right:before {
+	content: "\e058"
+}
+
+.glyphicon-facetime-video:before {
+	content: "\e059"
+}
+
+.glyphicon-picture:before {
+	content: "\e060"
+}
+
+.glyphicon-map-marker:before {
+	content: "\e062"
+}
+
+.glyphicon-adjust:before {
+	content: "\e063"
+}
+
+.glyphicon-tint:before {
+	content: "\e064"
+}
+
+.glyphicon-edit:before {
+	content: "\e065"
+}
+
+.glyphicon-share:before {
+	content: "\e066"
+}
+
+.glyphicon-check:before {
+	content: "\e067"
+}
+
+.glyphicon-move:before {
+	content: "\e068"
+}
+
+.glyphicon-step-backward:before {
+	content: "\e069"
+}
+
+.glyphicon-fast-backward:before {
+	content: "\e070"
+}
+
+.glyphicon-backward:before {
+	content: "\e071"
+}
+
+.glyphicon-play:before {
+	content: "\e072"
+}
+
+.glyphicon-pause:before {
+	content: "\e073"
+}
+
+.glyphicon-stop:before {
+	content: "\e074"
+}
+
+.glyphicon-forward:before {
+	content: "\e075"
+}
+
+.glyphicon-fast-forward:before {
+	content: "\e076"
+}
+
+.glyphicon-step-forward:before {
+	content: "\e077"
+}
+
+.glyphicon-eject:before {
+	content: "\e078"
+}
+
+.glyphicon-chevron-left:before {
+	content: "\e079"
+}
+
+.glyphicon-chevron-right:before {
+	content: "\e080"
+}
+
+.glyphicon-plus-sign:before {
+	content: "\e081"
+}
+
+.glyphicon-minus-sign:before {
+	content: "\e082"
+}
+
+.glyphicon-remove-sign:before {
+	content: "\e083"
+}
+
+.glyphicon-ok-sign:before {
+	content: "\e084"
+}
+
+.glyphicon-question-sign:before {
+	content: "\e085"
+}
+
+.glyphicon-info-sign:before {
+	content: "\e086"
+}
+
+.glyphicon-screenshot:before {
+	content: "\e087"
+}
+
+.glyphicon-remove-circle:before {
+	content: "\e088"
+}
+
+.glyphicon-ok-circle:before {
+	content: "\e089"
+}
+
+.glyphicon-ban-circle:before {
+	content: "\e090"
+}
+
+.glyphicon-arrow-left:before {
+	content: "\e091"
+}
+
+.glyphicon-arrow-right:before {
+	content: "\e092"
+}
+
+.glyphicon-arrow-up:before {
+	content: "\e093"
+}
+
+.glyphicon-arrow-down:before {
+	content: "\e094"
+}
+
+.glyphicon-share-alt:before {
+	content: "\e095"
+}
+
+.glyphicon-resize-full:before {
+	content: "\e096"
+}
+
+.glyphicon-resize-small:before {
+	content: "\e097"
+}
+
+.glyphicon-exclamation-sign:before {
+	content: "\e101"
+}
+
+.glyphicon-gift:before {
+	content: "\e102"
+}
+
+.glyphicon-leaf:before {
+	content: "\e103"
+}
+
+.glyphicon-fire:before {
+	content: "\e104"
+}
+
+.glyphicon-eye-open:before {
+	content: "\e105"
+}
+
+.glyphicon-eye-close:before {
+	content: "\e106"
+}
+
+.glyphicon-warning-sign:before {
+	content: "\e107"
+}
+
+.glyphicon-plane:before {
+	content: "\e108"
+}
+
+.glyphicon-calendar:before {
+	content: "\e109"
+}
+
+.glyphicon-random:before {
+	content: "\e110"
+}
+
+.glyphicon-comment:before {
+	content: "\e111"
+}
+
+.glyphicon-magnet:before {
+	content: "\e112"
+}
+
+.glyphicon-chevron-up:before {
+	content: "\e113"
+}
+
+.glyphicon-chevron-down:before {
+	content: "\e114"
+}
+
+.glyphicon-retweet:before {
+	content: "\e115"
+}
+
+.glyphicon-shopping-cart:before {
+	content: "\e116"
+}
+
+.glyphicon-folder-close:before {
+	content: "\e117"
+}
+
+.glyphicon-folder-open:before {
+	content: "\e118"
+}
+
+.glyphicon-resize-vertical:before {
+	content: "\e119"
+}
+
+.glyphicon-resize-horizontal:before {
+	content: "\e120"
+}
+
+.glyphicon-hdd:before {
+	content: "\e121"
+}
+
+.glyphicon-bullhorn:before {
+	content: "\e122"
+}
+
+.glyphicon-bell:before {
+	content: "\e123"
+}
+
+.glyphicon-certificate:before {
+	content: "\e124"
+}
+
+.glyphicon-thumbs-up:before {
+	content: "\e125"
+}
+
+.glyphicon-thumbs-down:before {
+	content: "\e126"
+}
+
+.glyphicon-hand-right:before {
+	content: "\e127"
+}
+
+.glyphicon-hand-left:before {
+	content: "\e128"
+}
+
+.glyphicon-hand-up:before {
+	content: "\e129"
+}
+
+.glyphicon-hand-down:before {
+	content: "\e130"
+}
+
+.glyphicon-circle-arrow-right:before {
+	content: "\e131"
+}
+
+.glyphicon-circle-arrow-left:before {
+	content: "\e132"
+}
+
+.glyphicon-circle-arrow-up:before {
+	content: "\e133"
+}
+
+.glyphicon-circle-arrow-down:before {
+	content: "\e134"
+}
+
+.glyphicon-globe:before {
+	content: "\e135"
+}
+
+.glyphicon-wrench:before {
+	content: "\e136"
+}
+
+.glyphicon-tasks:before {
+	content: "\e137"
+}
+
+.glyphicon-filter:before {
+	content: "\e138"
+}
+
+.glyphicon-briefcase:before {
+	content: "\e139"
+}
+
+.glyphicon-fullscreen:before {
+	content: "\e140"
+}
+
+.glyphicon-dashboard:before {
+	content: "\e141"
+}
+
+.glyphicon-paperclip:before {
+	content: "\e142"
+}
+
+.glyphicon-heart-empty:before {
+	content: "\e143"
+}
+
+.glyphicon-link:before {
+	content: "\e144"
+}
+
+.glyphicon-phone:before {
+	content: "\e145"
+}
+
+.glyphicon-pushpin:before {
+	content: "\e146"
+}
+
+.glyphicon-usd:before {
+	content: "\e148"
+}
+
+.glyphicon-gbp:before {
+	content: "\e149"
+}
+
+.glyphicon-sort:before {
+	content: "\e150"
+}
+
+.glyphicon-sort-by-alphabet:before {
+	content: "\e151"
+}
+
+.glyphicon-sort-by-alphabet-alt:before {
+	content: "\e152"
+}
+
+.glyphicon-sort-by-order:before {
+	content: "\e153"
+}
+
+.glyphicon-sort-by-order-alt:before {
+	content: "\e154"
+}
+
+.glyphicon-sort-by-attributes:before {
+	content: "\e155"
+}
+
+.glyphicon-sort-by-attributes-alt:before {
+	content: "\e156"
+}
+
+.glyphicon-unchecked:before {
+	content: "\e157"
+}
+
+.glyphicon-expand:before {
+	content: "\e158"
+}
+
+.glyphicon-collapse-down:before {
+	content: "\e159"
+}
+
+.glyphicon-collapse-up:before {
+	content: "\e160"
+}
+
+.glyphicon-log-in:before {
+	content: "\e161"
+}
+
+.glyphicon-flash:before {
+	content: "\e162"
+}
+
+.glyphicon-log-out:before {
+	content: "\e163"
+}
+
+.glyphicon-new-window:before {
+	content: "\e164"
+}
+
+.glyphicon-record:before {
+	content: "\e165"
+}
+
+.glyphicon-save:before {
+	content: "\e166"
+}
+
+.glyphicon-open:before {
+	content: "\e167"
+}
+
+.glyphicon-saved:before {
+	content: "\e168"
+}
+
+.glyphicon-import:before {
+	content: "\e169"
+}
+
+.glyphicon-export:before {
+	content: "\e170"
+}
+
+.glyphicon-send:before {
+	content: "\e171"
+}
+
+.glyphicon-floppy-disk:before {
+	content: "\e172"
+}
+
+.glyphicon-floppy-saved:before {
+	content: "\e173"
+}
+
+.glyphicon-floppy-remove:before {
+	content: "\e174"
+}
+
+.glyphicon-floppy-save:before {
+	content: "\e175"
+}
+
+.glyphicon-floppy-open:before {
+	content: "\e176"
+}
+
+.glyphicon-credit-card:before {
+	content: "\e177"
+}
+
+.glyphicon-transfer:before {
+	content: "\e178"
+}
+
+.glyphicon-cutlery:before {
+	content: "\e179"
+}
+
+.glyphicon-header:before {
+	content: "\e180"
+}
+
+.glyphicon-compressed:before {
+	content: "\e181"
+}
+
+.glyphicon-earphone:before {
+	content: "\e182"
+}
+
+.glyphicon-phone-alt:before {
+	content: "\e183"
+}
+
+.glyphicon-tower:before {
+	content: "\e184"
+}
+
+.glyphicon-stats:before {
+	content: "\e185"
+}
+
+.glyphicon-sd-video:before {
+	content: "\e186"
+}
+
+.glyphicon-hd-video:before {
+	content: "\e187"
+}
+
+.glyphicon-subtitles:before {
+	content: "\e188"
+}
+
+.glyphicon-sound-stereo:before {
+	content: "\e189"
+}
+
+.glyphicon-sound-dolby:before {
+	content: "\e190"
+}
+
+.glyphicon-sound-5-1:before {
+	content: "\e191"
+}
+
+.glyphicon-sound-6-1:before {
+	content: "\e192"
+}
+
+.glyphicon-sound-7-1:before {
+	content: "\e193"
+}
+
+.glyphicon-copyright-mark:before {
+	content: "\e194"
+}
+
+.glyphicon-registration-mark:before {
+	content: "\e195"
+}
+
+.glyphicon-cloud-download:before {
+	content: "\e197"
+}
+
+.glyphicon-cloud-upload:before {
+	content: "\e198"
+}
+
+.glyphicon-tree-conifer:before {
+	content: "\e199"
+}
+
+.glyphicon-tree-deciduous:before {
+	content: "\e200"
+}
+
+.glyphicon-cd:before {
+	content: "\e201"
+}
+
+.glyphicon-save-file:before {
+	content: "\e202"
+}
+
+.glyphicon-open-file:before {
+	content: "\e203"
+}
+
+.glyphicon-level-up:before {
+	content: "\e204"
+}
+
+.glyphicon-copy:before {
+	content: "\e205"
+}
+
+.glyphicon-paste:before {
+	content: "\e206"
+}
+
+.glyphicon-alert:before {
+	content: "\e209"
+}
+
+.glyphicon-equalizer:before {
+	content: "\e210"
+}
+
+.glyphicon-king:before {
+	content: "\e211"
+}
+
+.glyphicon-queen:before {
+	content: "\e212"
+}
+
+.glyphicon-pawn:before {
+	content: "\e213"
+}
+
+.glyphicon-bishop:before {
+	content: "\e214"
+}
+
+.glyphicon-knight:before {
+	content: "\e215"
+}
+
+.glyphicon-baby-formula:before {
+	content: "\e216"
+}
+
+.glyphicon-tent:before {
+	content: "\26fa"
+}
+
+.glyphicon-blackboard:before {
+	content: "\e218"
+}
+
+.glyphicon-bed:before {
+	content: "\e219"
+}
+
+.glyphicon-apple:before {
+	content: "\f8ff"
+}
+
+.glyphicon-erase:before {
+	content: "\e221"
+}
+
+.glyphicon-hourglass:before {
+	content: "\231b"
+}
+
+.glyphicon-lamp:before {
+	content: "\e223"
+}
+
+.glyphicon-duplicate:before {
+	content: "\e224"
+}
+
+.glyphicon-piggy-bank:before {
+	content: "\e225"
+}
+
+.glyphicon-scissors:before {
+	content: "\e226"
+}
+
+.glyphicon-bitcoin:before {
+	content: "\e227"
+}
+
+.glyphicon-btc:before {
+	content: "\e227"
+}
+
+.glyphicon-xbt:before {
+	content: "\e227"
+}
+
+.glyphicon-yen:before {
+	content: "\00a5"
+}
+
+.glyphicon-jpy:before {
+	content: "\00a5"
+}
+
+.glyphicon-ruble:before {
+	content: "\20bd"
+}
+
+.glyphicon-rub:before {
+	content: "\20bd"
+}
+
+.glyphicon-scale:before {
+	content: "\e230"
+}
+
+.glyphicon-ice-lolly:before {
+	content: "\e231"
+}
+
+.glyphicon-ice-lolly-tasted:before {
+	content: "\e232"
+}
+
+.glyphicon-education:before {
+	content: "\e233"
+}
+
+.glyphicon-option-horizontal:before {
+	content: "\e234"
+}
+
+.glyphicon-option-vertical:before {
+	content: "\e235"
+}
+
+.glyphicon-menu-hamburger:before {
+	content: "\e236"
+}
+
+.glyphicon-modal-window:before {
+	content: "\e237"
+}
+
+.glyphicon-oil:before {
+	content: "\e238"
+}
+
+.glyphicon-grain:before {
+	content: "\e239"
+}
+
+.glyphicon-sunglasses:before {
+	content: "\e240"
+}
+
+.glyphicon-text-size:before {
+	content: "\e241"
+}
+
+.glyphicon-text-color:before {
+	content: "\e242"
+}
+
+.glyphicon-text-background:before {
+	content: "\e243"
+}
+
+.glyphicon-object-align-top:before {
+	content: "\e244"
+}
+
+.glyphicon-object-align-bottom:before {
+	content: "\e245"
+}
+
+.glyphicon-object-align-horizontal:before {
+	content: "\e246"
+}
+
+.glyphicon-object-align-left:before {
+	content: "\e247"
+}
+
+.glyphicon-object-align-vertical:before {
+	content: "\e248"
+}
+
+.glyphicon-object-align-right:before {
+	content: "\e249"
+}
+
+.glyphicon-triangle-right:before {
+	content: "\e250"
+}
+
+.glyphicon-triangle-left:before {
+	content: "\e251"
+}
+
+.glyphicon-triangle-bottom:before {
+	content: "\e252"
+}
+
+.glyphicon-triangle-top:before {
+	content: "\e253"
+}
+
+.glyphicon-console:before {
+	content: "\e254"
+}
+
+.glyphicon-superscript:before {
+	content: "\e255"
+}
+
+.glyphicon-subscript:before {
+	content: "\e256"
+}
+
+.glyphicon-menu-left:before {
+	content: "\e257"
+}
+
+.glyphicon-menu-right:before {
+	content: "\e258"
+}
+
+.glyphicon-menu-down:before {
+	content: "\e259"
+}
+
+.glyphicon-menu-up:before {
+	content: "\e260"
+}
+
+* {
+	/* 修改为w3c模型 */
+	/*-webkit-box-sizing: border-box;*/
+	/*-moz-box-sizing: border-box;*/
+	/*box-sizing: border-box;*/
+}
+
+:after,
+:before {
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box
+}
+
+html {
+	font-size: 10px;
+	-webkit-tap-highlight-color: rgba(0, 0, 0, 0)
+}
+
+body {
+	font-family: "Helvetica Neue", Helvetica, Tahoma, Arial, 'Microsoft Yahei', 'Hiragino Sans GB', 'WenQuanYi Micro Hei', sans-serif;
+	font-size: 14px;
+	line-height: 1.42857143;
+	color: #333;
+	background-color: #fff
+}
+
+button,
+input,
+select,
+textarea {
+	font-family: inherit;
+	font-size: inherit;
+	line-height: inherit
+}
+
+a {
+	color: #ff5e5f;
+	text-decoration: none
+}
+
+a:focus,
+a:hover {
+	color: #23527c;
+	text-decoration: underline
+}
+
+a:focus {
+	outline: 5px auto -webkit-focus-ring-color;
+	outline-offset: -2px
+}
+
+figure {
+	margin: 0
+}
+
+img {
+	vertical-align: middle
+}
+
+.carousel-inner>.item>a>img,
+.carousel-inner>.item>img,
+.img-responsive,
+.thumbnail a>img,
+.thumbnail>img {
+	display: block;
+	max-width: 100%;
+	height: auto
+}
+
+.img-rounded {
+	border-radius: 6px
+}
+
+.img-thumbnail {
+	display: inline-block;
+	max-width: 100%;
+	height: auto;
+	padding: 4px;
+	line-height: 1.42857143;
+	background-color: #fff;
+	border: 1px solid #ddd;
+	border-radius: 4px;
+	-webkit-transition: all .2s ease-in-out;
+	-o-transition: all .2s ease-in-out;
+	transition: all .2s ease-in-out
+}
+
+.img-circle {
+	border-radius: 50%
+}
+
+hr {
+	margin-top: 20px;
+	margin-bottom: 20px;
+	border: 0;
+	border-top: 1px solid #eee
+}
+
+.sr-only {
+	position: absolute;
+	width: 1px;
+	height: 1px;
+	padding: 0;
+	margin: -1px;
+	overflow: hidden;
+	clip: rect(0, 0, 0, 0);
+	border: 0
+}
+
+.sr-only-focusable:active,
+.sr-only-focusable:focus {
+	position: static;
+	width: auto;
+	height: auto;
+	margin: 0;
+	overflow: visible;
+	clip: auto
+}
+
+[role=button] {
+	cursor: pointer
+}
+
+.h1,
+.h2,
+.h3,
+.h4,
+.h5,
+.h6,
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+	font-family: inherit;
+	font-weight: 500;
+	line-height: 1.1;
+	color: inherit
+}
+
+.h1 .small,
+.h1 small,
+.h2 .small,
+.h2 small,
+.h3 .small,
+.h3 small,
+.h4 .small,
+.h4 small,
+.h5 .small,
+.h5 small,
+.h6 .small,
+.h6 small,
+h1 .small,
+h1 small,
+h2 .small,
+h2 small,
+h3 .small,
+h3 small,
+h4 .small,
+h4 small,
+h5 .small,
+h5 small,
+h6 .small,
+h6 small {
+	font-weight: 400;
+	line-height: 1;
+	color: #777
+}
+
+.h1,
+.h2,
+.h3,
+h1,
+h2,
+h3 {
+	margin-top: 20px;
+	margin-bottom: 10px
+}
+
+.h1 .small,
+.h1 small,
+.h2 .small,
+.h2 small,
+.h3 .small,
+.h3 small,
+h1 .small,
+h1 small,
+h2 .small,
+h2 small,
+h3 .small,
+h3 small {
+	font-size: 65%
+}
+
+.h4,
+.h5,
+.h6,
+h4,
+h5,
+h6 {
+	margin-top: 10px;
+	margin-bottom: 10px
+}
+
+.h4 .small,
+.h4 small,
+.h5 .small,
+.h5 small,
+.h6 .small,
+.h6 small,
+h4 .small,
+h4 small,
+h5 .small,
+h5 small,
+h6 .small,
+h6 small {
+	font-size: 75%
+}
+
+.h1,
+h1 {
+	font-size: 36px
+}
+
+.h2,
+h2 {
+	font-size: 30px
+}
+
+.h3,
+h3 {
+	font-size: 24px
+}
+
+.h4,
+h4 {
+	font-size: 18px
+}
+
+.h5,
+h5 {
+	font-size: 14px
+}
+
+.h6,
+h6 {
+	font-size: 12px
+}
+
+p {
+	margin: 0 0 10px
+}
+
+.lead {
+	margin-bottom: 20px;
+	font-size: 16px;
+	font-weight: 300;
+	line-height: 1.4
+}
+
+@media (min-width:768px) {
+	.lead {
+		font-size: 21px
+	}
+}
+
+.small,
+small {
+	font-size: 85%
+}
+
+.mark,
+mark {
+	padding: .2em;
+	background-color: #fcf8e3
+}
+
+.text-left {
+	text-align: left
+}
+
+.text-right {
+	text-align: right
+}
+
+.text-center {
+	text-align: center
+}
+
+.text-justify {
+	text-align: justify
+}
+
+.text-nowrap {
+	white-space: nowrap
+}
+
+.text-lowercase {
+	text-transform: lowercase
+}
+
+.text-uppercase {
+	text-transform: uppercase
+}
+
+.text-capitalize {
+	text-transform: capitalize
+}
+
+.text-muted {
+	color: #777
+}
+
+.text-primary {
+	color: #ff5e5f
+}
+
+a.text-primary:focus,
+a.text-primary:hover {
+	color: #ff5f60
+}
+
+.text-success {
+	color: #3c763d
+}
+
+a.text-success:focus,
+a.text-success:hover {
+	color: #2b542c
+}
+
+.text-info {
+	color: #31708f
+}
+
+a.text-info:focus,
+a.text-info:hover {
+	color: #245269
+}
+
+.text-warning {
+	color: #8a6d3b
+}
+
+a.text-warning:focus,
+a.text-warning:hover {
+	color: #66512c
+}
+
+.text-danger {
+	color: #a94442
+}
+
+a.text-danger:focus,
+a.text-danger:hover {
+	color: #843534
+}
+
+.bg-primary {
+	color: #fff;
+	background-color: #ff5e5f
+}
+
+a.bg-primary:focus,
+a.bg-primary:hover {
+	background-color: #ff5f60
+}
+
+.bg-success {
+	background-color: #dff0d8
+}
+
+a.bg-success:focus,
+a.bg-success:hover {
+	background-color: #c1e2b3
+}
+
+.bg-info {
+	background-color: #d9edf7
+}
+
+a.bg-info:focus,
+a.bg-info:hover {
+	background-color: #afd9ee
+}
+
+.bg-warning {
+	background-color: #fcf8e3
+}
+
+a.bg-warning:focus,
+a.bg-warning:hover {
+	background-color: #f7ecb5
+}
+
+.bg-danger {
+	background-color: #f2dede
+}
+
+a.bg-danger:focus,
+a.bg-danger:hover {
+	background-color: #e4b9b9
+}
+
+.page-header {
+	padding-bottom: 9px;
+	margin: 40px 0 20px;
+	border-bottom: 1px solid #eee
+}
+
+ol,
+ul {
+	margin-top: 0;
+	margin-bottom: 10px
+}
+
+ol ol,
+ol ul,
+ul ol,
+ul ul {
+	margin-bottom: 0
+}
+
+.list-unstyled {
+	padding-left: 0;
+	list-style: none
+}
+
+.list-inline {
+	padding-left: 0;
+	margin-left: -5px;
+	list-style: none
+}
+
+.list-inline>li {
+	display: inline-block;
+	padding-right: 5px;
+	padding-left: 5px
+}
+
+dl {
+	margin-top: 0;
+	margin-bottom: 20px
+}
+
+dd,
+dt {
+	line-height: 1.42857143
+}
+
+dt {
+	font-weight: 700
+}
+
+dd {
+	margin-left: 0
+}
+
+@media (min-width:768px) {
+	.dl-horizontal dt {
+		float: left;
+		width: 160px;
+		overflow: hidden;
+		clear: left;
+		text-align: right;
+		text-overflow: ellipsis;
+		white-space: nowrap
+	}
+	.dl-horizontal dd {
+		margin-left: 180px
+	}
+}
+
+abbr[data-original-title],
+abbr[title] {
+	cursor: help;
+	border-bottom: 1px dotted #777
+}
+
+.initialism {
+	font-size: 90%;
+	text-transform: uppercase
+}
+
+blockquote {
+	padding: 10px 20px;
+	margin: 0 0 20px;
+	font-size: 17.5px;
+	border-left: 5px solid #eee
+}
+
+blockquote ol:last-child,
+blockquote p:last-child,
+blockquote ul:last-child {
+	margin-bottom: 0
+}
+
+blockquote .small,
+blockquote footer,
+blockquote small {
+	display: block;
+	font-size: 80%;
+	line-height: 1.42857143;
+	color: #777
+}
+
+blockquote .small:before,
+blockquote footer:before,
+blockquote small:before {
+	content: '\2014 \00A0'
+}
+
+.blockquote-reverse,
+blockquote.pull-right {
+	padding-right: 15px;
+	padding-left: 0;
+	text-align: right;
+	border-right: 5px solid #eee;
+	border-left: 0
+}
+
+.blockquote-reverse .small:before,
+.blockquote-reverse footer:before,
+.blockquote-reverse small:before,
+blockquote.pull-right .small:before,
+blockquote.pull-right footer:before,
+blockquote.pull-right small:before {
+	content: ''
+}
+
+.blockquote-reverse .small:after,
+.blockquote-reverse footer:after,
+.blockquote-reverse small:after,
+blockquote.pull-right .small:after,
+blockquote.pull-right footer:after,
+blockquote.pull-right small:after {
+	content: '\00A0 \2014'
+}
+
+address {
+	margin-bottom: 20px;
+	font-style: normal;
+	line-height: 1.42857143
+}
+
+code,
+kbd,
+pre,
+samp {
+	font-family: Menlo, Monaco, Consolas, "Courier New", monospace
+}
+
+code {
+	padding: 2px 4px;
+	font-size: 90%;
+	color: #c7254e;
+	background-color: #f9f2f4;
+	border-radius: 4px
+}
+
+kbd {
+	padding: 2px 4px;
+	font-size: 90%;
+	color: #fff;
+	background-color: #333;
+	border-radius: 3px;
+	-webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .25);
+	box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .25)
+}
+
+kbd kbd {
+	padding: 0;
+	font-size: 100%;
+	font-weight: 700;
+	-webkit-box-shadow: none;
+	box-shadow: none
+}
+
+pre {
+	display: block;
+	padding: 9.5px;
+	margin: 0 0 10px;
+	font-size: 13px;
+	line-height: 1.42857143;
+	color: #333;
+	word-break: break-all;
+	word-wrap: break-word;
+	background-color: #f5f5f5;
+	border: 1px solid #ccc;
+	border-radius: 4px
+}
+
+pre code {
+	padding: 0;
+	font-size: inherit;
+	color: inherit;
+	white-space: pre-wrap;
+	background-color: transparent;
+	border-radius: 0
+}
+
+.pre-scrollable {
+	max-height: 340px;
+	overflow-y: scroll
+}
+
+.container {
+	padding-right: 15px;
+	padding-left: 15px;
+	margin-right: auto;
+	margin-left: auto
+}
+
+@media (min-width:768px) {
+	.container {
+		width: 750px
+	}
+}
+
+@media (min-width:992px) {
+	.container {
+		width: 970px
+	}
+}
+
+@media (min-width:1200px) {
+	.container {
+		width: 1170px
+	}
+}
+
+.container-fluid {
+	padding-right: 15px;
+	padding-left: 15px;
+	margin-right: auto;
+	margin-left: auto
+}
+
+.row {
+	margin-left:10px
+}
+
+.col-lg-1,
+.col-lg-10,
+.col-lg-11,
+.col-lg-12,
+.col-lg-2,
+.col-lg-3,
+.col-lg-4,
+.col-lg-5,
+.col-lg-6,
+.col-lg-7,
+.col-lg-8,
+.col-lg-9,
+.col-md-1,
+.col-md-10,
+.col-md-11,
+.col-md-12,
+.col-md-2,
+.col-md-3,
+.col-md-4,
+.col-md-5,
+.col-md-6,
+.col-md-7,
+.col-md-8,
+.col-md-9,
+.col-sm-1,
+.col-sm-10,
+.col-sm-11,
+.col-sm-12,
+.col-sm-2,
+.col-sm-3,
+.col-sm-4,
+.col-sm-5,
+.col-sm-6,
+.col-sm-7,
+.col-sm-8,
+.col-sm-9,
+.col-xs-1,
+.col-xs-10,
+.col-xs-11,
+.col-xs-12,
+.col-xs-2,
+.col-xs-3,
+.col-xs-4,
+.col-xs-5,
+.col-xs-6,
+.col-xs-7,
+.col-xs-8,
+.col-xs-9 {
+	position: relative;
+	min-height: 1px;
+	padding-right: 10px;
+	padding-left: 10px
+}
+
+.col-xs-1,
+.col-xs-10,
+.col-xs-11,
+.col-xs-12,
+.col-xs-2,
+.col-xs-3,
+.col-xs-4,
+.col-xs-5,
+.col-xs-6,
+.col-xs-7,
+.col-xs-8,
+.col-xs-9 {
+	float: left
+}
+
+.col-xs-12 {
+	width: 100%
+}
+
+.col-xs-11 {
+	width: 91.66666667%
+}
+
+.col-xs-10 {
+	width: 83.33333333%
+}
+
+.col-xs-9 {
+	width: 75%
+}
+
+.col-xs-8 {
+	width: 66.66666667%
+}
+
+.col-xs-7 {
+	width: 58.33333333%
+}
+
+.col-xs-6 {
+	width: 50%
+}
+
+.col-xs-5 {
+	width: 41.66666667%
+}
+
+.col-xs-4 {
+	width: 33.33333333%
+}
+
+.col-xs-3 {
+	width: 25%
+}
+
+.col-xs-2 {
+	width: 16.66666667%
+}
+
+.col-xs-1 {
+	width: 8.33333333%
+}
+
+.col-xs-pull-12 {
+	right: 100%
+}
+
+.col-xs-pull-11 {
+	right: 91.66666667%
+}
+
+.col-xs-pull-10 {
+	right: 83.33333333%
+}
+
+.col-xs-pull-9 {
+	right: 75%
+}
+
+.col-xs-pull-8 {
+	right: 66.66666667%
+}
+
+.col-xs-pull-7 {
+	right: 58.33333333%
+}
+
+.col-xs-pull-6 {
+	right: 50%
+}
+
+.col-xs-pull-5 {
+	right: 41.66666667%
+}
+
+.col-xs-pull-4 {
+	right: 33.33333333%
+}
+
+.col-xs-pull-3 {
+	right: 25%
+}
+
+.col-xs-pull-2 {
+	right: 16.66666667%
+}
+
+.col-xs-pull-1 {
+	right: 8.33333333%
+}
+
+.col-xs-pull-0 {
+	right: auto
+}
+
+.col-xs-push-12 {
+	left: 100%
+}
+
+.col-xs-push-11 {
+	left: 91.66666667%
+}
+
+.col-xs-push-10 {
+	left: 83.33333333%
+}
+
+.col-xs-push-9 {
+	left: 75%
+}
+
+.col-xs-push-8 {
+	left: 66.66666667%
+}
+
+.col-xs-push-7 {
+	left: 58.33333333%
+}
+
+.col-xs-push-6 {
+	left: 50%
+}
+
+.col-xs-push-5 {
+	left: 41.66666667%
+}
+
+.col-xs-push-4 {
+	left: 33.33333333%
+}
+
+.col-xs-push-3 {
+	left: 25%
+}
+
+.col-xs-push-2 {
+	left: 16.66666667%
+}
+
+.col-xs-push-1 {
+	left: 8.33333333%
+}
+
+.col-xs-push-0 {
+	left: auto
+}
+
+.col-xs-offset-12 {
+	margin-left: 100%
+}
+
+.col-xs-offset-11 {
+	margin-left: 91.66666667%
+}
+
+.col-xs-offset-10 {
+	margin-left: 83.33333333%
+}
+
+.col-xs-offset-9 {
+	margin-left: 75%
+}
+
+.col-xs-offset-8 {
+	margin-left: 66.66666667%
+}
+
+.col-xs-offset-7 {
+	margin-left: 58.33333333%
+}
+
+.col-xs-offset-6 {
+	margin-left: 50%
+}
+
+.col-xs-offset-5 {
+	margin-left: 41.66666667%
+}
+
+.col-xs-offset-4 {
+	margin-left: 33.33333333%
+}
+
+.col-xs-offset-3 {
+	margin-left: 25%
+}
+
+.col-xs-offset-2 {
+	margin-left: 16.66666667%
+}
+
+.col-xs-offset-1 {
+	margin-left: 8.33333333%
+}
+
+.col-xs-offset-0 {
+	margin-left: 0
+}
+
+@media (min-width:768px) {
+	.col-sm-1,
+	.col-sm-10,
+	.col-sm-11,
+	.col-sm-12,
+	.col-sm-2,
+	.col-sm-3,
+	.col-sm-4,
+	.col-sm-5,
+	.col-sm-6,
+	.col-sm-7,
+	.col-sm-8,
+	.col-sm-9 {
+		float: left
+	}
+	.col-sm-12 {
+		width: 100%
+	}
+	.col-sm-11 {
+		width: 91.66666667%
+	}
+	.col-sm-10 {
+		width: 83.33333333%
+	}
+	.col-sm-9 {
+		width: 75%
+	}
+	.col-sm-8 {
+		width: 66.66666667%
+	}
+	.col-sm-7 {
+		width: 58.33333333%
+	}
+	.col-sm-6 {
+		width: 50%
+	}
+	.col-sm-5 {
+		width: 41.66666667%
+	}
+	.col-sm-4 {
+		width: 33.33333333%
+	}
+	.col-sm-3 {
+		width: 25%
+	}
+	.col-sm-2 {
+		width: 16.66666667%
+	}
+	.col-sm-1 {
+		width: 8.33333333%
+	}
+	.col-sm-pull-12 {
+		right: 100%
+	}
+	.col-sm-pull-11 {
+		right: 91.66666667%
+	}
+	.col-sm-pull-10 {
+		right: 83.33333333%
+	}
+	.col-sm-pull-9 {
+		right: 75%
+	}
+	.col-sm-pull-8 {
+		right: 66.66666667%
+	}
+	.col-sm-pull-7 {
+		right: 58.33333333%
+	}
+	.col-sm-pull-6 {
+		right: 50%
+	}
+	.col-sm-pull-5 {
+		right: 41.66666667%
+	}
+	.col-sm-pull-4 {
+		right: 33.33333333%
+	}
+	.col-sm-pull-3 {
+		right: 25%
+	}
+	.col-sm-pull-2 {
+		right: 16.66666667%
+	}
+	.col-sm-pull-1 {
+		right: 8.33333333%
+	}
+	.col-sm-pull-0 {
+		right: auto
+	}
+	.col-sm-push-12 {
+		left: 100%
+	}
+	.col-sm-push-11 {
+		left: 91.66666667%
+	}
+	.col-sm-push-10 {
+		left: 83.33333333%
+	}
+	.col-sm-push-9 {
+		left: 75%
+	}
+	.col-sm-push-8 {
+		left: 66.66666667%
+	}
+	.col-sm-push-7 {
+		left: 58.33333333%
+	}
+	.col-sm-push-6 {
+		left: 50%
+	}
+	.col-sm-push-5 {
+		left: 41.66666667%
+	}
+	.col-sm-push-4 {
+		left: 33.33333333%
+	}
+	.col-sm-push-3 {
+		left: 25%
+	}
+	.col-sm-push-2 {
+		left: 16.66666667%
+	}
+	.col-sm-push-1 {
+		left: 8.33333333%
+	}
+	.col-sm-push-0 {
+		left: auto
+	}
+	.col-sm-offset-12 {
+		margin-left: 100%
+	}
+	.col-sm-offset-11 {
+		margin-left: 91.66666667%
+	}
+	.col-sm-offset-10 {
+		margin-left: 83.33333333%
+	}
+	.col-sm-offset-9 {
+		margin-left: 75%
+	}
+	.col-sm-offset-8 {
+		margin-left: 66.66666667%
+	}
+	.col-sm-offset-7 {
+		margin-left: 58.33333333%
+	}
+	.col-sm-offset-6 {
+		margin-left: 50%
+	}
+	.col-sm-offset-5 {
+		margin-left: 41.66666667%
+	}
+	.col-sm-offset-4 {
+		margin-left: 33.33333333%
+	}
+	.col-sm-offset-3 {
+		margin-left: 25%
+	}
+	.col-sm-offset-2 {
+		margin-left: 16.66666667%
+	}
+	.col-sm-offset-1 {
+		margin-left: 8.33333333%
+	}
+	.col-sm-offset-0 {
+		margin-left: 0
+	}
+}
+
+@media (min-width:992px) {
+	.col-md-1,
+	.col-md-10,
+	.col-md-11,
+	.col-md-12,
+	.col-md-2,
+	.col-md-3,
+	.col-md-4,
+	.col-md-5,
+	.col-md-6,
+	.col-md-7,
+	.col-md-8,
+	.col-md-9 {
+		float: left
+	}
+	.col-md-12 {
+		width: 100%
+	}
+	.col-md-11 {
+		width: 91.66666667%
+	}
+	.col-md-10 {
+		width: 83.33333333%
+	}
+	.col-md-9 {
+		width: 75%
+	}
+	.col-md-8 {
+		width: 66.66666667%
+	}
+	.col-md-7 {
+		width: 58.33333333%
+	}
+	.col-md-6 {
+		width: 50%
+	}
+	.col-md-5 {
+		width: 41.66666667%
+	}
+	.col-md-4 {
+		width: 33.33333333%
+	}
+	.col-md-3 {
+		width: 25%
+	}
+	.col-md-2 {
+		width: 16.66666667%
+	}
+	.col-md-1 {
+		width: 8.33333333%
+	}
+	.col-md-pull-12 {
+		right: 100%
+	}
+	.col-md-pull-11 {
+		right: 91.66666667%
+	}
+	.col-md-pull-10 {
+		right: 83.33333333%
+	}
+	.col-md-pull-9 {
+		right: 75%
+	}
+	.col-md-pull-8 {
+		right: 66.66666667%
+	}
+	.col-md-pull-7 {
+		right: 58.33333333%
+	}
+	.col-md-pull-6 {
+		right: 50%
+	}
+	.col-md-pull-5 {
+		right: 41.66666667%
+	}
+	.col-md-pull-4 {
+		right: 33.33333333%
+	}
+	.col-md-pull-3 {
+		right: 25%
+	}
+	.col-md-pull-2 {
+		right: 16.66666667%
+	}
+	.col-md-pull-1 {
+		right: 8.33333333%
+	}
+	.col-md-pull-0 {
+		right: auto
+	}
+	.col-md-push-12 {
+		left: 100%
+	}
+	.col-md-push-11 {
+		left: 91.66666667%
+	}
+	.col-md-push-10 {
+		left: 83.33333333%
+	}
+	.col-md-push-9 {
+		left: 75%
+	}
+	.col-md-push-8 {
+		left: 66.66666667%
+	}
+	.col-md-push-7 {
+		left: 58.33333333%
+	}
+	.col-md-push-6 {
+		left: 50%
+	}
+	.col-md-push-5 {
+		left: 41.66666667%
+	}
+	.col-md-push-4 {
+		left: 33.33333333%
+	}
+	.col-md-push-3 {
+		left: 25%
+	}
+	.col-md-push-2 {
+		left: 16.66666667%
+	}
+	.col-md-push-1 {
+		left: 8.33333333%
+	}
+	.col-md-push-0 {
+		left: auto
+	}
+	.col-md-offset-12 {
+		margin-left: 100%
+	}
+	.col-md-offset-11 {
+		margin-left: 91.66666667%
+	}
+	.col-md-offset-10 {
+		margin-left: 83.33333333%
+	}
+	.col-md-offset-9 {
+		margin-left: 75%
+	}
+	.col-md-offset-8 {
+		margin-left: 66.66666667%
+	}
+	.col-md-offset-7 {
+		margin-left: 58.33333333%
+	}
+	.col-md-offset-6 {
+		margin-left: 50%
+	}
+	.col-md-offset-5 {
+		margin-left: 41.66666667%
+	}
+	.col-md-offset-4 {
+		margin-left: 33.33333333%
+	}
+	.col-md-offset-3 {
+		margin-left: 25%
+	}
+	.col-md-offset-2 {
+		margin-left: 16.66666667%
+	}
+	.col-md-offset-1 {
+		margin-left: 8.33333333%
+	}
+	.col-md-offset-0 {
+		margin-left: 0
+	}
+}
+
+@media (min-width:1000px) {
+	.col-lg-1,
+	.col-lg-10,
+	.col-lg-11,
+	.col-lg-12,
+	.col-lg-2,
+	.col-lg-3,
+	.col-lg-4,
+	.col-lg-5,
+	.col-lg-6,
+	.col-lg-7,
+	.col-lg-8,
+	.col-lg-9 {
+		float: left
+	}
+	.col-lg-12 {
+		width: 100%
+	}
+	.col-lg-11 {
+		width: 91.66666667%
+	}
+	.col-lg-10 {
+		width: 83.33333333%
+	}
+	.col-lg-9 {
+		width: 75%
+	}
+	.col-lg-8 {
+		width: 66.66666667%
+	}
+	.col-lg-7 {
+		width: 58.33333333%
+	}
+	.col-lg-6 {
+		width: 50%
+	}
+	.col-lg-5 {
+		width: 41.66666667%
+	}
+	.col-lg-4 {
+		width: 33.33333333%
+	}
+	.col-lg-3 {
+		width: 25%
+	}
+	.col-lg-2 {
+		width: 16.66666667%
+	}
+	.col-lg-1 {
+		width: 8.33333333%
+	}
+	.col-lg-pull-12 {
+		right: 100%
+	}
+	.col-lg-pull-11 {
+		right: 91.66666667%
+	}
+	.col-lg-pull-10 {
+		right: 83.33333333%
+	}
+	.col-lg-pull-9 {
+		right: 75%
+	}
+	.col-lg-pull-8 {
+		right: 66.66666667%
+	}
+	.col-lg-pull-7 {
+		right: 58.33333333%
+	}
+	.col-lg-pull-6 {
+		right: 50%
+	}
+	.col-lg-pull-5 {
+		right: 41.66666667%
+	}
+	.col-lg-pull-4 {
+		right: 33.33333333%
+	}
+	.col-lg-pull-3 {
+		right: 25%
+	}
+	.col-lg-pull-2 {
+		right: 16.66666667%
+	}
+	.col-lg-pull-1 {
+		right: 8.33333333%
+	}
+	.col-lg-pull-0 {
+		right: auto
+	}
+	.col-lg-push-12 {
+		left: 100%
+	}
+	.col-lg-push-11 {
+		left: 91.66666667%
+	}
+	.col-lg-push-10 {
+		left: 83.33333333%
+	}
+	.col-lg-push-9 {
+		left: 75%
+	}
+	.col-lg-push-8 {
+		left: 66.66666667%
+	}
+	.col-lg-push-7 {
+		left: 58.33333333%
+	}
+	.col-lg-push-6 {
+		left: 50%
+	}
+	.col-lg-push-5 {
+		left: 41.66666667%
+	}
+	.col-lg-push-4 {
+		left: 33.33333333%
+	}
+	.col-lg-push-3 {
+		left: 25%
+	}
+	.col-lg-push-2 {
+		left: 16.66666667%
+	}
+	.col-lg-push-1 {
+		left: 8.33333333%
+	}
+	.col-lg-push-0 {
+		left: auto
+	}
+	.col-lg-offset-12 {
+		margin-left: 100%
+	}
+	.col-lg-offset-11 {
+		margin-left: 91.66666667%
+	}
+	.col-lg-offset-10 {
+		margin-left: 83.33333333%
+	}
+	.col-lg-offset-9 {
+		margin-left: 75%
+	}
+	.col-lg-offset-8 {
+		margin-left: 66.66666667%
+	}
+	.col-lg-offset-7 {
+		margin-left: 58.33333333%
+	}
+	.col-lg-offset-6 {
+		margin-left: 50%
+	}
+	.col-lg-offset-5 {
+		margin-left: 41.66666667%
+	}
+	.col-lg-offset-4 {
+		margin-left: 33.33333333%
+	}
+	.col-lg-offset-3 {
+		margin-left: 25%
+	}
+	.col-lg-offset-2 {
+		margin-left: 16.66666667%
+	}
+	.col-lg-offset-1 {
+		margin-left: 8.33333333%
+	}
+	.col-lg-offset-0 {
+		margin-left: 0
+	}
+}
+
+table {
+	background-color: transparent
+}
+
+caption {
+	padding-top: 8px;
+	padding-bottom: 8px;
+	color: #777;
+	text-align: left
+}
+
+th {
+	text-align: left
+}
+
+.table {
+	width: 100%;
+	max-width: 100%;
+	margin-bottom: 20px
+}
+
+.table>tbody>tr>td,
+.table>tbody>tr>th,
+.table>tfoot>tr>td,
+.table>tfoot>tr>th,
+.table>thead>tr>td,
+.table>thead>tr>th {
+	padding: 8px;
+	line-height: 1.42857143;
+	vertical-align: top;
+	border-top: 1px solid #ddd
+}
+
+.table>thead>tr>th {
+	vertical-align: bottom;
+	border-bottom: 2px solid #ddd
+}
+
+.table>caption+thead>tr:first-child>td,
+.table>caption+thead>tr:first-child>th,
+.table>colgroup+thead>tr:first-child>td,
+.table>colgroup+thead>tr:first-child>th,
+.table>thead:first-child>tr:first-child>td,
+.table>thead:first-child>tr:first-child>th {
+	border-top: 0
+}
+
+.table>tbody+tbody {
+	border-top: 2px solid #ddd
+}
+
+.table .table {
+	background-color: #fff
+}
+
+.table-condensed>tbody>tr>td,
+.table-condensed>tbody>tr>th,
+.table-condensed>tfoot>tr>td,
+.table-condensed>tfoot>tr>th,
+.table-condensed>thead>tr>td,
+.table-condensed>thead>tr>th {
+	padding: 5px
+}
+
+.table-bordered {
+	border: 1px solid #ddd
+}
+
+.table-bordered>tbody>tr>td,
+.table-bordered>tbody>tr>th,
+.table-bordered>tfoot>tr>td,
+.table-bordered>tfoot>tr>th,
+.table-bordered>thead>tr>td,
+.table-bordered>thead>tr>th {
+	border: 1px solid #ddd
+}
+
+.table-bordered>thead>tr>td,
+.table-bordered>thead>tr>th {
+	border-bottom-width: 2px
+}
+
+.table-striped>tbody>tr:nth-of-type(odd) {
+	background-color: #f4f5f9
+}
+
+.table-hover>tbody>tr:hover {
+	background-color: #f5f5f5
+}
+
+table col[class*=col-] {
+	position: static;
+	display: table-column;
+	float: none
+}
+
+table td[class*=col-],
+table th[class*=col-] {
+	position: static;
+	display: table-cell;
+	float: none
+}
+
+.table>tbody>tr.active>td,
+.table>tbody>tr.active>th,
+.table>tbody>tr>td.active,
+.table>tbody>tr>th.active,
+.table>tfoot>tr.active>td,
+.table>tfoot>tr.active>th,
+.table>tfoot>tr>td.active,
+.table>tfoot>tr>th.active,
+.table>thead>tr.active>td,
+.table>thead>tr.active>th,
+.table>thead>tr>td.active,
+.table>thead>tr>th.active {
+	background-color: #f5f5f5
+}
+
+.table-hover>tbody>tr.active:hover>td,
+.table-hover>tbody>tr.active:hover>th,
+.table-hover>tbody>tr:hover>.active,
+.table-hover>tbody>tr>td.active:hover,
+.table-hover>tbody>tr>th.active:hover {
+	background-color: #e8e8e8
+}
+
+.table>tbody>tr.success>td,
+.table>tbody>tr.success>th,
+.table>tbody>tr>td.success,
+.table>tbody>tr>th.success,
+.table>tfoot>tr.success>td,
+.table>tfoot>tr.success>th,
+.table>tfoot>tr>td.success,
+.table>tfoot>tr>th.success,
+.table>thead>tr.success>td,
+.table>thead>tr.success>th,
+.table>thead>tr>td.success,
+.table>thead>tr>th.success {
+	background-color: #dff0d8
+}
+
+.table-hover>tbody>tr.success:hover>td,
+.table-hover>tbody>tr.success:hover>th,
+.table-hover>tbody>tr:hover>.success,
+.table-hover>tbody>tr>td.success:hover,
+.table-hover>tbody>tr>th.success:hover {
+	background-color: #d0e9c6
+}
+
+.table>tbody>tr.info>td,
+.table>tbody>tr.info>th,
+.table>tbody>tr>td.info,
+.table>tbody>tr>th.info,
+.table>tfoot>tr.info>td,
+.table>tfoot>tr.info>th,
+.table>tfoot>tr>td.info,
+.table>tfoot>tr>th.info,
+.table>thead>tr.info>td,
+.table>thead>tr.info>th,
+.table>thead>tr>td.info,
+.table>thead>tr>th.info {
+	background-color: #d9edf7
+}
+
+.table-hover>tbody>tr.info:hover>td,
+.table-hover>tbody>tr.info:hover>th,
+.table-hover>tbody>tr:hover>.info,
+.table-hover>tbody>tr>td.info:hover,
+.table-hover>tbody>tr>th.info:hover {
+	background-color: #c4e3f3
+}
+
+.table>tbody>tr.warning>td,
+.table>tbody>tr.warning>th,
+.table>tbody>tr>td.warning,
+.table>tbody>tr>th.warning,
+.table>tfoot>tr.warning>td,
+.table>tfoot>tr.warning>th,
+.table>tfoot>tr>td.warning,
+.table>tfoot>tr>th.warning,
+.table>thead>tr.warning>td,
+.table>thead>tr.warning>th,
+.table>thead>tr>td.warning,
+.table>thead>tr>th.warning {
+	background-color: #fcf8e3
+}
+
+.table-hover>tbody>tr.warning:hover>td,
+.table-hover>tbody>tr.warning:hover>th,
+.table-hover>tbody>tr:hover>.warning,
+.table-hover>tbody>tr>td.warning:hover,
+.table-hover>tbody>tr>th.warning:hover {
+	background-color: #faf2cc
+}
+
+.table>tbody>tr.danger>td,
+.table>tbody>tr.danger>th,
+.table>tbody>tr>td.danger,
+.table>tbody>tr>th.danger,
+.table>tfoot>tr.danger>td,
+.table>tfoot>tr.danger>th,
+.table>tfoot>tr>td.danger,
+.table>tfoot>tr>th.danger,
+.table>thead>tr.danger>td,
+.table>thead>tr.danger>th,
+.table>thead>tr>td.danger,
+.table>thead>tr>th.danger {
+	background-color: #f2dede
+}
+
+.table-hover>tbody>tr.danger:hover>td,
+.table-hover>tbody>tr.danger:hover>th,
+.table-hover>tbody>tr:hover>.danger,
+.table-hover>tbody>tr>td.danger:hover,
+.table-hover>tbody>tr>th.danger:hover {
+	background-color: #ebcccc
+}
+
+.table-responsive {
+	min-height: .01%;
+	overflow-x: auto
+}
+
+@media screen and (max-width:767px) {
+	.table-responsive {
+		width: 100%;
+		margin-bottom: 15px;
+		overflow-y: hidden;
+		-ms-overflow-style: -ms-autohiding-scrollbar;
+		border: 1px solid #ddd
+	}
+	.table-responsive>.table {
+		margin-bottom: 0
+	}
+	.table-responsive>.table>tbody>tr>td,
+	.table-responsive>.table>tbody>tr>th,
+	.table-responsive>.table>tfoot>tr>td,
+	.table-responsive>.table>tfoot>tr>th,
+	.table-responsive>.table>thead>tr>td,
+	.table-responsive>.table>thead>tr>th {
+		white-space: nowrap
+	}
+	.table-responsive>.table-bordered {
+		border: 0
+	}
+	.table-responsive>.table-bordered>tbody>tr>td:first-child,
+	.table-responsive>.table-bordered>tbody>tr>th:first-child,
+	.table-responsive>.table-bordered>tfoot>tr>td:first-child,
+	.table-responsive>.table-bordered>tfoot>tr>th:first-child,
+	.table-responsive>.table-bordered>thead>tr>td:first-child,
+	.table-responsive>.table-bordered>thead>tr>th:first-child {
+		border-left: 0
+	}
+	.table-responsive>.table-bordered>tbody>tr>td:last-child,
+	.table-responsive>.table-bordered>tbody>tr>th:last-child,
+	.table-responsive>.table-bordered>tfoot>tr>td:last-child,
+	.table-responsive>.table-bordered>tfoot>tr>th:last-child,
+	.table-responsive>.table-bordered>thead>tr>td:last-child,
+	.table-responsive>.table-bordered>thead>tr>th:last-child {
+		border-right: 0
+	}
+	.table-responsive>.table-bordered>tbody>tr:last-child>td,
+	.table-responsive>.table-bordered>tbody>tr:last-child>th,
+	.table-responsive>.table-bordered>tfoot>tr:last-child>td,
+	.table-responsive>.table-bordered>tfoot>tr:last-child>th {
+		border-bottom: 0
+	}
+}
+
+fieldset {
+	min-width: 0;
+	padding: 0;
+	margin: 0;
+	border: 0
+}
+
+legend {
+	display: block;
+	width: 100%;
+	padding: 0;
+	margin-bottom: 20px;
+	font-size: 21px;
+	line-height: inherit;
+	color: #333;
+	border: 0;
+	border-bottom: 1px solid #e5e5e5
+}
+
+label {
+	display: inline-block;
+	max-width: 100%;
+	margin-bottom: 5px;
+	font-weight: 700
+}
+
+input[type=search] {
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box
+}
+
+input[type=checkbox],
+input[type=radio] {
+	margin: 0 4px;
+	margin-top: 1px\9;
+	line-height: normal
+}
+
+input[type=file] {
+	display: block
+}
+
+input[type=range] {
+	display: block;
+	width: 100%
+}
+
+select[multiple],
+select[size] {
+	height: auto
+}
+
+input[type=file]:focus,
+input[type=checkbox]:focus,
+input[type=radio]:focus {
+	outline: 5px auto -webkit-focus-ring-color;
+	outline-offset: -2px
+}
+
+output {
+	display: block;
+	padding-top: 7px;
+	font-size: 14px;
+	line-height: 1.42857143;
+	color: #555
+}
+
+.form-control {
+	display: inline-block;
+	width: 100%;
+	height: 34px;
+	padding: 6px 12px;
+	font-size: 14px;
+	line-height: 1.42857143;
+	color: #555;
+	background-color: #fff;
+	background-image: none;
+	border: 1px solid #ccc;
+	border-radius: 4px;
+	-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+	box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+	-webkit-transition: border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s;
+	-o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
+	transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s
+}
+
+.form-control:focus {
+	border-color: #66afe9;
+	outline: 0;
+	-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, .6);
+	box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, .6)
+}
+
+.form-control::-moz-placeholder {
+	color: #999;
+	opacity: 1
+}
+
+.form-control:-ms-input-placeholder {
+	color: #999
+}
+
+.form-control::-webkit-input-placeholder {
+	color: #999
+}
+
+.form-control::-ms-expand {
+	background-color: transparent;
+	border: 0
+}
+
+.form-control[disabled],
+.form-control[readonly],
+fieldset[disabled] .form-control {
+	background-color: #eee;
+	opacity: 1
+}
+
+.form-control[disabled],
+fieldset[disabled] .form-control {
+	cursor: not-allowed
+}
+
+textarea.form-control {
+	height: auto
+}
+
+input[type=search] {
+	-webkit-appearance: none
+}
+
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+	input[type=date].form-control,
+	input[type=time].form-control,
+	input[type=datetime-local].form-control,
+	input[type=month].form-control {
+		line-height: 34px
+	}
+	.input-group-sm input[type=date],
+	.input-group-sm input[type=time],
+	.input-group-sm input[type=datetime-local],
+	.input-group-sm input[type=month],
+	input[type=date].input-sm,
+	input[type=time].input-sm,
+	input[type=datetime-local].input-sm,
+	input[type=month].input-sm {
+		line-height: 30px
+	}
+	.input-group-lg input[type=date],
+	.input-group-lg input[type=time],
+	.input-group-lg input[type=datetime-local],
+	.input-group-lg input[type=month],
+	input[type=date].input-lg,
+	input[type=time].input-lg,
+	input[type=datetime-local].input-lg,
+	input[type=month].input-lg {
+		line-height: 46px
+	}
+}
+
+.form-group {
+	margin-bottom: 15px
+}
+
+.checkbox,
+.radio {
+	position: relative;
+	display: block;
+	margin-top: 10px;
+	margin-bottom: 10px
+}
+
+.checkbox label,
+.radio label {
+	min-height: 20px;
+	padding-left: 20px;
+	margin-bottom: 0;
+	font-weight: 400;
+	cursor: pointer
+}
+
+.checkbox+.checkbox,
+.radio+.radio {
+	margin-top: -5px
+}
+
+.checkbox-inline,
+.radio-inline {
+	position: relative;
+	display: inline-block;
+	padding-left: 20px;
+	margin-bottom: 0;
+	font-weight: 400;
+	vertical-align: middle;
+	cursor: pointer
+}
+
+.checkbox-inline+.checkbox-inline,
+.radio-inline+.radio-inline {
+	margin-top: 0;
+	margin-left: 10px
+}
+
+fieldset[disabled] input[type=checkbox],
+fieldset[disabled] input[type=radio],
+input[type=checkbox].disabled,
+input[type=checkbox][disabled],
+input[type=radio].disabled,
+input[type=radio][disabled] {
+	cursor: not-allowed
+}
+
+.checkbox-inline.disabled,
+.radio-inline.disabled,
+fieldset[disabled] .checkbox-inline,
+fieldset[disabled] .radio-inline {
+	cursor: not-allowed
+}
+
+.checkbox.disabled label,
+.radio.disabled label,
+fieldset[disabled] .checkbox label,
+fieldset[disabled] .radio label {
+	cursor: not-allowed
+}
+
+.form-control-static {
+	min-height: 34px;
+	padding-top: 7px;
+	padding-bottom: 7px;
+	margin-bottom: 0
+}
+
+.form-control-static.input-lg,
+.form-control-static.input-sm {
+	padding-right: 0;
+	padding-left: 0
+}
+
+.input-sm {
+	height: 30px;
+	padding: 5px 10px;
+	font-size: 12px;
+	line-height: 1.5;
+	border-radius: 3px
+}
+
+select.input-sm {
+	height: 30px;
+	line-height: 30px
+}
+
+select[multiple].input-sm,
+textarea.input-sm {
+	height: auto
+}
+
+.form-group-sm .form-control {
+	height: 30px;
+	padding: 5px 10px;
+	font-size: 12px;
+	line-height: 1.5;
+	border-radius: 3px
+}
+
+.form-group-sm select.form-control {
+	height: 30px;
+	line-height: 30px
+}
+
+.form-group-sm select[multiple].form-control,
+.form-group-sm textarea.form-control {
+	height: auto
+}
+
+.form-group-sm .form-control-static {
+	height: 30px;
+	min-height: 32px;
+	padding: 6px 10px;
+	font-size: 12px;
+	line-height: 1.5
+}
+
+.input-lg {
+	height: 46px;
+	padding: 10px 16px;
+	font-size: 18px;
+	line-height: 1.3333333;
+	border-radius: 6px
+}
+
+select.input-lg {
+	height: 46px;
+	line-height: 46px
+}
+
+select[multiple].input-lg,
+textarea.input-lg {
+	height: auto
+}
+
+.form-group-lg .form-control {
+	height: 46px;
+	padding: 10px 16px;
+	font-size: 18px;
+	line-height: 1.3333333;
+	border-radius: 6px
+}
+
+.form-group-lg select.form-control {
+	height: 46px;
+	line-height: 46px
+}
+
+.form-group-lg select[multiple].form-control,
+.form-group-lg textarea.form-control {
+	height: auto
+}
+
+.form-group-lg .form-control-static {
+	height: 46px;
+	min-height: 38px;
+	padding: 11px 16px;
+	font-size: 18px;
+	line-height: 1.3333333
+}
+
+.has-feedback {
+	position: relative
+}
+
+.has-feedback .form-control {
+	padding-right: 42.5px
+}
+
+.form-control-feedback {
+	position: absolute;
+	top: 0;
+	right: 0;
+	z-index: 2;
+	display: block;
+	width: 34px;
+	height: 34px;
+	line-height: 34px;
+	text-align: center;
+	pointer-events: none
+}
+
+.form-group-lg .form-control+.form-control-feedback,
+.input-group-lg+.form-control-feedback,
+.input-lg+.form-control-feedback {
+	width: 46px;
+	height: 46px;
+	line-height: 46px
+}
+
+.form-group-sm .form-control+.form-control-feedback,
+.input-group-sm+.form-control-feedback,
+.input-sm+.form-control-feedback {
+	width: 30px;
+	height: 30px;
+	line-height: 30px
+}
+
+.has-success .checkbox,
+.has-success .checkbox-inline,
+.has-success .control-label,
+.has-success .help-block,
+.has-success .radio,
+.has-success .radio-inline,
+.has-success.checkbox label,
+.has-success.checkbox-inline label,
+.has-success.radio label,
+.has-success.radio-inline label {
+	color: #3c763d
+}
+
+.has-success .form-control {
+	border-color: #3c763d;
+	-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+	box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075)
+}
+
+.has-success .form-control:focus {
+	border-color: #2b542c;
+	-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #67b168;
+	box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #67b168
+}
+
+.has-success .input-group-addon {
+	color: #3c763d;
+	background-color: #dff0d8;
+	border-color: #3c763d
+}
+
+.has-success .form-control-feedback {
+	color: #3c763d
+}
+
+.has-warning .checkbox,
+.has-warning .checkbox-inline,
+.has-warning .control-label,
+.has-warning .help-block,
+.has-warning .radio,
+.has-warning .radio-inline,
+.has-warning.checkbox label,
+.has-warning.checkbox-inline label,
+.has-warning.radio label,
+.has-warning.radio-inline label {
+	color: #8a6d3b
+}
+
+.has-warning .form-control {
+	border-color: #8a6d3b;
+	-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+	box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075)
+}
+
+.has-warning .form-control:focus {
+	border-color: #66512c;
+	-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #c0a16b;
+	box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #c0a16b
+}
+
+.has-warning .input-group-addon {
+	color: #8a6d3b;
+	background-color: #fcf8e3;
+	border-color: #8a6d3b
+}
+
+.has-warning .form-control-feedback {
+	color: #8a6d3b
+}
+
+.has-error .checkbox,
+.has-error .checkbox-inline,
+.has-error .control-label,
+.has-error .help-block,
+.has-error .radio,
+.has-error .radio-inline,
+.has-error.checkbox label,
+.has-error.checkbox-inline label,
+.has-error.radio label,
+.has-error.radio-inline label {
+	color: #a94442
+}
+
+.has-error .form-control {
+	border-color: #a94442;
+	-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+	box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075)
+}
+
+.has-error .form-control:focus {
+	border-color: #843534;
+	-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #ce8483;
+	box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #ce8483
+}
+
+.has-error .input-group-addon {
+	color: #a94442;
+	background-color: #f2dede;
+	border-color: #a94442
+}
+
+.has-error .form-control-feedback {
+	color: #a94442
+}
+
+.has-feedback label~.form-control-feedback {
+	top: 25px
+}
+
+.has-feedback label.sr-only~.form-control-feedback {
+	top: 0
+}
+
+.help-block {
+	display: block;
+	margin-top: 5px;
+	margin-bottom: 10px;
+	color: #737373
+}
+
+@media (min-width:768px) {
+	.form-inline .form-group {
+		display: inline-block;
+		margin-bottom: 0;
+		vertical-align: middle
+	}
+	.form-inline .form-control {
+		display: inline-block;
+		width: auto;
+		vertical-align: middle
+	}
+	.form-inline .form-control-static {
+		display: inline-block
+	}
+	.form-inline .input-group {
+		display: inline-table;
+		vertical-align: middle
+	}
+	.form-inline .input-group .form-control,
+	.form-inline .input-group .input-group-addon,
+	.form-inline .input-group .input-group-btn {
+		width: auto
+	}
+	.form-inline .input-group>.form-control {
+		width: 100%
+	}
+	.form-inline .control-label {
+		margin-bottom: 0;
+		vertical-align: middle
+	}
+	.form-inline .checkbox,
+	.form-inline .radio {
+		display: inline-block;
+		margin-top: 0;
+		margin-bottom: 0;
+		vertical-align: middle
+	}
+	.form-inline .checkbox label,
+	.form-inline .radio label {
+		padding-left: 0
+	}
+	.form-inline .checkbox input[type=checkbox],
+	.form-inline .radio input[type=radio] {
+		position: relative;
+		margin-left: 0
+	}
+	.form-inline .has-feedback .form-control-feedback {
+		top: 0
+	}
+}
+
+.form-horizontal .checkbox,
+.form-horizontal .checkbox-inline,
+.form-horizontal .radio,
+.form-horizontal .radio-inline {
+	padding-top: 7px;
+	margin-top: 0;
+	margin-bottom: 0
+}
+
+.form-horizontal .checkbox,
+.form-horizontal .radio {
+	min-height: 27px
+}
+
+.form-horizontal .form-group {
+	margin-right: -15px;
+	margin-left: -15px
+}
+
+@media (min-width:768px) {
+	.form-horizontal .control-label {
+		padding-top: 7px;
+		margin-bottom: 0;
+		text-align: right
+	}
+}
+
+.form-horizontal .has-feedback .form-control-feedback {
+	right: 15px
+}
+
+@media (min-width:768px) {
+	.form-horizontal .form-group-lg .control-label {
+		padding-top: 11px;
+		font-size: 18px
+	}
+}
+
+@media (min-width:768px) {
+	.form-horizontal .form-group-sm .control-label {
+		padding-top: 6px;
+		font-size: 12px
+	}
+}
+
+.btn {
+	display: inline-block;
+	padding: 6px 12px;
+	margin-bottom: 0;
+	font-size: 14px;
+	font-weight: 400;
+	line-height: 1.42857143;
+	text-align: center;
+	white-space: nowrap;
+	vertical-align: middle;
+	-ms-touch-action: manipulation;
+	touch-action: manipulation;
+	cursor: pointer;
+	-webkit-user-select: none;
+	-moz-user-select: none;
+	-ms-user-select: none;
+	user-select: none;
+	background-image: none;
+	border: 1px solid transparent;
+	border-radius: 4px
+}
+
+.btn.active.focus,
+.btn.active:focus,
+.btn.focus,
+.btn:active.focus,
+.btn:active:focus,
+.btn:focus {
+	outline: 5px auto -webkit-focus-ring-color;
+	outline-offset: -2px
+}
+
+.btn.focus,
+.btn:focus,
+.btn:hover {
+	color: #333;
+	text-decoration: none
+}
+
+.btn.active,
+.btn:active {
+	background-image: none;
+	outline: 0;
+	-webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
+	box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125)
+}
+
+.btn.disabled,
+.btn[disabled],
+fieldset[disabled] .btn {
+	cursor: not-allowed;
+	filter: alpha(opacity=65);
+	-webkit-box-shadow: none;
+	box-shadow: none;
+	opacity: .65
+}
+
+a.btn.disabled,
+fieldset[disabled] a.btn {
+	pointer-events: none
+}
+
+.btn-default {
+	color: #333;
+	background-color: #fff;
+	border-color: #ccc
+}
+
+.btn-default.focus,
+.btn-default:focus {
+	color: #333;
+	background-color: #e6e6e6;
+	border-color: #8c8c8c
+}
+
+.btn-default:hover {
+	color: #333;
+	background-color: #e6e6e6;
+	border-color: #adadad
+}
+
+.btn-default.active,
+.btn-default:active,
+.open>.dropdown-toggle.btn-default {
+	color: #333;
+	background-color: #e6e6e6;
+	border-color: #adadad
+}
+
+.btn-default.active.focus,
+.btn-default.active:focus,
+.btn-default.active:hover,
+.btn-default:active.focus,
+.btn-default:active:focus,
+.btn-default:active:hover,
+.open>.dropdown-toggle.btn-default.focus,
+.open>.dropdown-toggle.btn-default:focus,
+.open>.dropdown-toggle.btn-default:hover {
+	color: #333;
+	background-color: #d4d4d4;
+	border-color: #8c8c8c
+}
+
+.btn-default.active,
+.btn-default:active,
+.open>.dropdown-toggle.btn-default {
+	background-image: none
+}
+
+.btn-default.disabled.focus,
+.btn-default.disabled:focus,
+.btn-default.disabled:hover,
+.btn-default[disabled].focus,
+.btn-default[disabled]:focus,
+.btn-default[disabled]:hover,
+fieldset[disabled] .btn-default.focus,
+fieldset[disabled] .btn-default:focus,
+fieldset[disabled] .btn-default:hover {
+	background-color: #fff;
+	border-color: #ccc
+}
+
+.btn-default .badge {
+	color: #fff;
+	background-color: #333
+}
+
+.btn-primary {
+	color: #fff;
+	background-color: #ff5e5f;
+	border-color: #ff5e5f
+}
+
+.btn-primary.focus,
+.btn-primary:focus {
+	color: #fff;
+	background-color: #ff5f60;
+	border-color: #ff5f60
+}
+
+.btn-primary:hover {
+	color: #fff;
+	background-color: #ff5f60;
+	border-color: #ff5f60
+}
+
+.btn-primary.active,
+.btn-primary:active,
+.open>.dropdown-toggle.btn-primary {
+	color: #fff;
+	background-color: #ff5f60;
+	border-color: #ff5f60
+}
+
+.btn-primary.active.focus,
+.btn-primary.active:focus,
+.btn-primary.active:hover,
+.btn-primary:active.focus,
+.btn-primary:active:focus,
+.btn-primary:active:hover,
+.open>.dropdown-toggle.btn-primary.focus,
+.open>.dropdown-toggle.btn-primary:focus,
+.open>.dropdown-toggle.btn-primary:hover {
+	color: #fff;
+	background-color: #ff5f60;
+	border-color: #ff5f60
+}
+
+.btn-primary.active,
+.btn-primary:active,
+.open>.dropdown-toggle.btn-primary {
+	background-image: none
+}
+
+.btn-primary.disabled.focus,
+.btn-primary.disabled:focus,
+.btn-primary.disabled:hover,
+.btn-primary[disabled].focus,
+.btn-primary[disabled]:focus,
+.btn-primary[disabled]:hover,
+fieldset[disabled] .btn-primary.focus,
+fieldset[disabled] .btn-primary:focus,
+fieldset[disabled] .btn-primary:hover {
+	background-color: #ff5e5f;
+	border-color: #ff5e5f
+}
+
+.btn-primary .badge {
+	color: #ff5e5f;
+	background-color: #fff
+}
+
+.btn-success {
+	color: #fff;
+	background-color: #5cb85c;
+	border-color: #4cae4c
+}
+
+.btn-success.focus,
+.btn-success:focus {
+	color: #fff;
+	background-color: #449d44;
+	border-color: #255625
+}
+
+.btn-success:hover {
+	color: #fff;
+	background-color: #449d44;
+	border-color: #398439
+}
+
+.btn-success.active,
+.btn-success:active,
+.open>.dropdown-toggle.btn-success {
+	color: #fff;
+	background-color: #449d44;
+	border-color: #398439
+}
+
+.btn-success.active.focus,
+.btn-success.active:focus,
+.btn-success.active:hover,
+.btn-success:active.focus,
+.btn-success:active:focus,
+.btn-success:active:hover,
+.open>.dropdown-toggle.btn-success.focus,
+.open>.dropdown-toggle.btn-success:focus,
+.open>.dropdown-toggle.btn-success:hover {
+	color: #fff;
+	background-color: #398439;
+	border-color: #255625
+}
+
+.btn-success.active,
+.btn-success:active,
+.open>.dropdown-toggle.btn-success {
+	background-image: none
+}
+
+.btn-success.disabled.focus,
+.btn-success.disabled:focus,
+.btn-success.disabled:hover,
+.btn-success[disabled].focus,
+.btn-success[disabled]:focus,
+.btn-success[disabled]:hover,
+fieldset[disabled] .btn-success.focus,
+fieldset[disabled] .btn-success:focus,
+fieldset[disabled] .btn-success:hover {
+	background-color: #5cb85c;
+	border-color: #4cae4c
+}
+
+.btn-success .badge {
+	color: #5cb85c;
+	background-color: #fff
+}
+
+.btn-info {
+	color: #fff;
+	background-color: #5bc0de;
+	border-color: #46b8da
+}
+
+.btn-info.focus,
+.btn-info:focus {
+	color: #fff;
+	background-color: #31b0d5;
+	border-color: #1b6d85
+}
+
+.btn-info:hover {
+	color: #fff;
+	background-color: #31b0d5;
+	border-color: #269abc
+}
+
+.btn-info.active,
+.btn-info:active,
+.open>.dropdown-toggle.btn-info {
+	color: #fff;
+	background-color: #31b0d5;
+	border-color: #269abc
+}
+
+.btn-info.active.focus,
+.btn-info.active:focus,
+.btn-info.active:hover,
+.btn-info:active.focus,
+.btn-info:active:focus,
+.btn-info:active:hover,
+.open>.dropdown-toggle.btn-info.focus,
+.open>.dropdown-toggle.btn-info:focus,
+.open>.dropdown-toggle.btn-info:hover {
+	color: #fff;
+	background-color: #269abc;
+	border-color: #1b6d85
+}
+
+.btn-info.active,
+.btn-info:active,
+.open>.dropdown-toggle.btn-info {
+	background-image: none
+}
+
+.btn-info.disabled.focus,
+.btn-info.disabled:focus,
+.btn-info.disabled:hover,
+.btn-info[disabled].focus,
+.btn-info[disabled]:focus,
+.btn-info[disabled]:hover,
+fieldset[disabled] .btn-info.focus,
+fieldset[disabled] .btn-info:focus,
+fieldset[disabled] .btn-info:hover {
+	background-color: #5bc0de;
+	border-color: #46b8da
+}
+
+.btn-info .badge {
+	color: #5bc0de;
+	background-color: #fff
+}
+
+.btn-warning {
+	color: #fff;
+	background-color: #f0ad4e;
+	border-color: #eea236
+}
+
+.btn-warning.focus,
+.btn-warning:focus {
+	color: #fff;
+	background-color: #ec971f;
+	border-color: #985f0d
+}
+
+.btn-warning:hover {
+	color: #fff;
+	background-color: #ec971f;
+	border-color: #d58512
+}
+
+.btn-warning.active,
+.btn-warning:active,
+.open>.dropdown-toggle.btn-warning {
+	color: #fff;
+	background-color: #ec971f;
+	border-color: #d58512
+}
+
+.btn-warning.active.focus,
+.btn-warning.active:focus,
+.btn-warning.active:hover,
+.btn-warning:active.focus,
+.btn-warning:active:focus,
+.btn-warning:active:hover,
+.open>.dropdown-toggle.btn-warning.focus,
+.open>.dropdown-toggle.btn-warning:focus,
+.open>.dropdown-toggle.btn-warning:hover {
+	color: #fff;
+	background-color: #d58512;
+	border-color: #985f0d
+}
+
+.btn-warning.active,
+.btn-warning:active,
+.open>.dropdown-toggle.btn-warning {
+	background-image: none
+}
+
+.btn-warning.disabled.focus,
+.btn-warning.disabled:focus,
+.btn-warning.disabled:hover,
+.btn-warning[disabled].focus,
+.btn-warning[disabled]:focus,
+.btn-warning[disabled]:hover,
+fieldset[disabled] .btn-warning.focus,
+fieldset[disabled] .btn-warning:focus,
+fieldset[disabled] .btn-warning:hover {
+	background-color: #f0ad4e;
+	border-color: #eea236
+}
+
+.btn-warning .badge {
+	color: #f0ad4e;
+	background-color: #fff
+}
+
+.btn-danger {
+	color: #fff;
+	background-color: #d9534f;
+	border-color: #d43f3a
+}
+
+.btn-danger.focus,
+.btn-danger:focus {
+	color: #fff;
+	background-color: #c9302c;
+	border-color: #761c19
+}
+
+.btn-danger:hover {
+	color: #fff;
+	background-color: #c9302c;
+	border-color: #ac2925
+}
+
+.btn-danger.active,
+.btn-danger:active,
+.open>.dropdown-toggle.btn-danger {
+	color: #fff;
+	background-color: #c9302c;
+	border-color: #ac2925
+}
+
+.btn-danger.active.focus,
+.btn-danger.active:focus,
+.btn-danger.active:hover,
+.btn-danger:active.focus,
+.btn-danger:active:focus,
+.btn-danger:active:hover,
+.open>.dropdown-toggle.btn-danger.focus,
+.open>.dropdown-toggle.btn-danger:focus,
+.open>.dropdown-toggle.btn-danger:hover {
+	color: #fff;
+	background-color: #ac2925;
+	border-color: #761c19
+}
+
+.btn-danger.active,
+.btn-danger:active,
+.open>.dropdown-toggle.btn-danger {
+	background-image: none
+}
+
+.btn-danger.disabled.focus,
+.btn-danger.disabled:focus,
+.btn-danger.disabled:hover,
+.btn-danger[disabled].focus,
+.btn-danger[disabled]:focus,
+.btn-danger[disabled]:hover,
+fieldset[disabled] .btn-danger.focus,
+fieldset[disabled] .btn-danger:focus,
+fieldset[disabled] .btn-danger:hover {
+	background-color: #d9534f;
+	border-color: #d43f3a
+}
+
+.btn-danger .badge {
+	color: #d9534f;
+	background-color: #fff
+}
+
+.btn-link {
+	font-weight: 400;
+	color: #ff5e5f;
+	border-radius: 0
+}
+
+.btn-link,
+.btn-link.active,
+.btn-link:active,
+.btn-link[disabled],
+fieldset[disabled] .btn-link {
+	background-color: transparent;
+	-webkit-box-shadow: none;
+	box-shadow: none
+}
+
+.btn-link,
+.btn-link:active,
+.btn-link:focus,
+.btn-link:hover {
+	border-color: transparent
+}
+
+.btn-link:focus,
+.btn-link:hover {
+	color: #23527c;
+	text-decoration: underline;
+	background-color: transparent
+}
+
+.btn-link[disabled]:focus,
+.btn-link[disabled]:hover,
+fieldset[disabled] .btn-link:focus,
+fieldset[disabled] .btn-link:hover {
+	color: #777;
+	text-decoration: none
+}
+
+.btn-group-lg>.btn,
+.btn-lg {
+	padding: 10px 16px;
+	font-size: 18px;
+	line-height: 1.3333333;
+	border-radius: 6px
+}
+
+.btn-group-sm>.btn,
+.btn-sm {
+	padding: 5px 10px;
+	font-size: 12px;
+	line-height: 1.5;
+	border-radius: 3px
+}
+
+.btn-group-xs>.btn,
+.btn-xs {
+	padding: 1px 5px;
+	font-size: 12px;
+	line-height: 1.5;
+	border-radius: 3px
+}
+
+.btn-block {
+	display: block;
+	width: 100%
+}
+
+.btn-block+.btn-block {
+	margin-top: 5px
+}
+
+input[type=button].btn-block,
+input[type=reset].btn-block,
+input[type=submit].btn-block {
+	width: 100%
+}
+
+.fade {
+	opacity: 0;
+	-webkit-transition: opacity .15s linear;
+	-o-transition: opacity .15s linear;
+	transition: opacity .15s linear
+}
+
+.fade.in {
+	opacity: 1
+}
+
+.collapse {
+	display: none
+}
+
+.collapse.in {
+	display: block
+}
+
+tr.collapse.in {
+	display: table-row
+}
+
+tbody.collapse.in {
+	display: table-row-group
+}
+
+.collapsing {
+	position: relative;
+	height: 0;
+	overflow: hidden;
+	-webkit-transition-timing-function: ease;
+	-o-transition-timing-function: ease;
+	transition-timing-function: ease;
+	-webkit-transition-duration: .35s;
+	-o-transition-duration: .35s;
+	transition-duration: .35s;
+	-webkit-transition-property: height, visibility;
+	-o-transition-property: height, visibility;
+	transition-property: height, visibility
+}
+
+.caret {
+	display: inline-block;
+	width: 0;
+	height: 0;
+	margin-left: 2px;
+	vertical-align: middle;
+	border-top: 4px dashed;
+	border-top: 4px solid\9;
+	border-right: 4px solid transparent;
+	border-left: 4px solid transparent
+}
+
+.dropdown,
+.dropup {
+	position: relative
+}
+
+.dropdown-toggle:focus {
+	outline: 0
+}
+
+.dropdown-menu {
+	position: absolute;
+	top: 100%;
+	left: 0;
+	z-index: 1000;
+	display: none;
+	float: left;
+	min-width: 160px;
+	padding: 5px 0;
+	margin: 2px 0 0;
+	font-size: 14px;
+	text-align: left;
+	list-style: none;
+	background-color: #fff;
+	-webkit-background-clip: padding-box;
+	background-clip: padding-box;
+	border: 1px solid #ccc;
+	border: 1px solid rgba(0, 0, 0, .15);
+	border-radius: 4px;
+	-webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, .175);
+	box-shadow: 0 6px 12px rgba(0, 0, 0, .175)
+}
+
+.dropdown-menu.pull-right {
+	right: 0;
+	left: auto
+}
+
+.dropdown-menu .divider {
+	height: 1px;
+	margin: 9px 0;
+	overflow: hidden;
+	background-color: #e5e5e5
+}
+
+.dropdown-menu>li>a {
+	display: block;
+	padding: 3px 20px;
+	clear: both;
+	font-weight: 400;
+	line-height: 1.42857143;
+	color: #333;
+	white-space: nowrap
+}
+
+.dropdown-menu>li>a:focus,
+.dropdown-menu>li>a:hover {
+	color: #262626;
+	text-decoration: none;
+	background-color: #f5f5f5
+}
+
+.dropdown-menu>.active>a,
+.dropdown-menu>.active>a:focus,
+.dropdown-menu>.active>a:hover {
+	color: #fff;
+	text-decoration: none;
+	background-color: #ff5e5f;
+	outline: 0
+}
+
+.dropdown-menu>.disabled>a,
+.dropdown-menu>.disabled>a:focus,
+.dropdown-menu>.disabled>a:hover {
+	color: #777
+}
+
+.dropdown-menu>.disabled>a:focus,
+.dropdown-menu>.disabled>a:hover {
+	text-decoration: none;
+	cursor: not-allowed;
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.gradient(enabled=false)
+}
+
+.open>.dropdown-menu {
+	display: block
+}
+
+.open>a {
+	outline: 0
+}
+
+.dropdown-menu-right {
+	right: 0;
+	left: auto
+}
+
+.dropdown-menu-left {
+	right: auto;
+	left: 0
+}
+
+.dropdown-header {
+	display: block;
+	padding: 3px 20px;
+	font-size: 12px;
+	line-height: 1.42857143;
+	color: #777;
+	white-space: nowrap
+}
+
+.dropdown-backdrop {
+	position: fixed;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	left: 0;
+	z-index: 990
+}
+
+.pull-right>.dropdown-menu {
+	right: 0;
+	left: auto
+}
+
+.dropup .caret,
+.navbar-fixed-bottom .dropdown .caret {
+	content: "";
+	border-top: 0;
+	border-bottom: 4px dashed;
+	border-bottom: 4px solid\9
+}
+
+.dropup .dropdown-menu,
+.navbar-fixed-bottom .dropdown .dropdown-menu {
+	top: auto;
+	bottom: 100%;
+	margin-bottom: 2px
+}
+
+@media (min-width:768px) {
+	.navbar-right .dropdown-menu {
+		right: 0;
+		left: auto
+	}
+	.navbar-right .dropdown-menu-left {
+		right: auto;
+		left: 0
+	}
+}
+
+.btn-group,
+.btn-group-vertical {
+	position: relative;
+	display: inline-block;
+	vertical-align: middle
+}
+
+.btn-group-vertical>.btn,
+.btn-group>.btn {
+	position: relative;
+	float: left
+}
+
+.btn-group-vertical>.btn.active,
+.btn-group-vertical>.btn:active,
+.btn-group-vertical>.btn:focus,
+.btn-group-vertical>.btn:hover,
+.btn-group>.btn.active,
+.btn-group>.btn:active,
+.btn-group>.btn:focus,
+.btn-group>.btn:hover {
+	z-index: 2
+}
+
+.btn-group .btn+.btn,
+.btn-group .btn+.btn-group,
+.btn-group .btn-group+.btn,
+.btn-group .btn-group+.btn-group {
+	margin-left: -1px
+}
+
+.btn-toolbar {
+	margin-left: -5px
+}
+
+.btn-toolbar .btn,
+.btn-toolbar .btn-group,
+.btn-toolbar .input-group {
+	float: left
+}
+
+.btn-toolbar>.btn,
+.btn-toolbar>.btn-group,
+.btn-toolbar>.input-group {
+	margin-left: 5px
+}
+
+.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle) {
+	border-radius: 0
+}
+
+.btn-group>.btn:first-child {
+	margin-left: 0
+}
+
+.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle) {
+	border-top-right-radius: 0;
+	border-bottom-right-radius: 0
+}
+
+.btn-group>.btn:last-child:not(:first-child),
+.btn-group>.dropdown-toggle:not(:first-child) {
+	border-top-left-radius: 0;
+	border-bottom-left-radius: 0
+}
+
+.btn-group>.btn-group {
+	float: left
+}
+
+.btn-group>.btn-group:not(:first-child):not(:last-child)>.btn {
+	border-radius: 0
+}
+
+.btn-group>.btn-group:first-child:not(:last-child)>.btn:last-child,
+.btn-group>.btn-group:first-child:not(:last-child)>.dropdown-toggle {
+	border-top-right-radius: 0;
+	border-bottom-right-radius: 0
+}
+
+.btn-group>.btn-group:last-child:not(:first-child)>.btn:first-child {
+	border-top-left-radius: 0;
+	border-bottom-left-radius: 0
+}
+
+.btn-group .dropdown-toggle:active,
+.btn-group.open .dropdown-toggle {
+	outline: 0
+}
+
+.btn-group>.btn+.dropdown-toggle {
+	padding-right: 8px;
+	padding-left: 8px
+}
+
+.btn-group>.btn-lg+.dropdown-toggle {
+	padding-right: 12px;
+	padding-left: 12px
+}
+
+.btn-group.open .dropdown-toggle {
+	-webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
+	box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125)
+}
+
+.btn-group.open .dropdown-toggle.btn-link {
+	-webkit-box-shadow: none;
+	box-shadow: none
+}
+
+.btn .caret {
+	margin-left: 0
+}
+
+.btn-lg .caret {
+	border-width: 5px 5px 0;
+	border-bottom-width: 0
+}
+
+.dropup .btn-lg .caret {
+	border-width: 0 5px 5px
+}
+
+.btn-group-vertical>.btn,
+.btn-group-vertical>.btn-group,
+.btn-group-vertical>.btn-group>.btn {
+	display: block;
+	float: none;
+	width: 100%;
+	max-width: 100%
+}
+
+.btn-group-vertical>.btn-group>.btn {
+	float: none
+}
+
+.btn-group-vertical>.btn+.btn,
+.btn-group-vertical>.btn+.btn-group,
+.btn-group-vertical>.btn-group+.btn,
+.btn-group-vertical>.btn-group+.btn-group {
+	margin-top: -1px;
+	margin-left: 0
+}
+
+.btn-group-vertical>.btn:not(:first-child):not(:last-child) {
+	border-radius: 0
+}
+
+.btn-group-vertical>.btn:first-child:not(:last-child) {
+	border-top-left-radius: 4px;
+	border-top-right-radius: 4px;
+	border-bottom-right-radius: 0;
+	border-bottom-left-radius: 0
+}
+
+.btn-group-vertical>.btn:last-child:not(:first-child) {
+	border-top-left-radius: 0;
+	border-top-right-radius: 0;
+	border-bottom-right-radius: 4px;
+	border-bottom-left-radius: 4px
+}
+
+.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn {
+	border-radius: 0
+}
+
+.btn-group-vertical>.btn-group:first-child:not(:last-child)>.btn:last-child,
+.btn-group-vertical>.btn-group:first-child:not(:last-child)>.dropdown-toggle {
+	border-bottom-right-radius: 0;
+	border-bottom-left-radius: 0
+}
+
+.btn-group-vertical>.btn-group:last-child:not(:first-child)>.btn:first-child {
+	border-top-left-radius: 0;
+	border-top-right-radius: 0
+}
+
+.btn-group-justified {
+	display: table;
+	width: 100%;
+	table-layout: fixed;
+	border-collapse: separate
+}
+
+.btn-group-justified>.btn,
+.btn-group-justified>.btn-group {
+	display: table-cell;
+	float: none;
+	width: 1%
+}
+
+.btn-group-justified>.btn-group .btn {
+	width: 100%
+}
+
+.btn-group-justified>.btn-group .dropdown-menu {
+	left: auto
+}
+
+[data-toggle=buttons]>.btn input[type=checkbox],
+[data-toggle=buttons]>.btn input[type=radio],
+[data-toggle=buttons]>.btn-group>.btn input[type=checkbox],
+[data-toggle=buttons]>.btn-group>.btn input[type=radio] {
+	position: absolute;
+	clip: rect(0, 0, 0, 0);
+	pointer-events: none
+}
+
+.input-group {
+	position: relative;
+	display: table;
+	border-collapse: separate
+}
+
+.input-group[class*=col-] {
+	float: none;
+	padding-right: 0;
+	padding-left: 0
+}
+
+.input-group .form-control {
+	position: relative;
+	z-index: 2;
+	float: left;
+	width: 100%;
+	margin-bottom: 0
+}
+
+.input-group .form-control:focus {
+	z-index: 3
+}
+
+.input-group-lg>.form-control,
+.input-group-lg>.input-group-addon,
+.input-group-lg>.input-group-btn>.btn {
+	height: 46px;
+	padding: 10px 16px;
+	font-size: 18px;
+	line-height: 1.3333333;
+	border-radius: 6px
+}
+
+select.input-group-lg>.form-control,
+select.input-group-lg>.input-group-addon,
+select.input-group-lg>.input-group-btn>.btn {
+	height: 46px;
+	line-height: 46px
+}
+
+select[multiple].input-group-lg>.form-control,
+select[multiple].input-group-lg>.input-group-addon,
+select[multiple].input-group-lg>.input-group-btn>.btn,
+textarea.input-group-lg>.form-control,
+textarea.input-group-lg>.input-group-addon,
+textarea.input-group-lg>.input-group-btn>.btn {
+	height: auto
+}
+
+.input-group-sm>.form-control,
+.input-group-sm>.input-group-addon,
+.input-group-sm>.input-group-btn>.btn {
+	height: 30px;
+	padding: 5px 10px;
+	font-size: 12px;
+	line-height: 1.5;
+	border-radius: 3px
+}
+
+select.input-group-sm>.form-control,
+select.input-group-sm>.input-group-addon,
+select.input-group-sm>.input-group-btn>.btn {
+	height: 30px;
+	line-height: 30px
+}
+
+select[multiple].input-group-sm>.form-control,
+select[multiple].input-group-sm>.input-group-addon,
+select[multiple].input-group-sm>.input-group-btn>.btn,
+textarea.input-group-sm>.form-control,
+textarea.input-group-sm>.input-group-addon,
+textarea.input-group-sm>.input-group-btn>.btn {
+	height: auto
+}
+
+.input-group .form-control,
+.input-group-addon,
+.input-group-btn {
+	display: table-cell
+}
+
+.input-group .form-control:not(:first-child):not(:last-child),
+.input-group-addon:not(:first-child):not(:last-child),
+.input-group-btn:not(:first-child):not(:last-child) {
+	border-radius: 0
+}
+
+.input-group-addon,
+.input-group-btn {
+	width: 1%;
+	white-space: nowrap;
+	vertical-align: middle
+}
+
+.input-group-addon {
+	padding: 6px 12px;
+	font-size: 14px;
+	font-weight: 400;
+	line-height: 1;
+	color: #555;
+	text-align: center;
+	background-color: #eee;
+	border: 1px solid #ccc;
+	border-radius: 4px
+}
+
+.input-group-addon.input-sm {
+	padding: 5px 10px;
+	font-size: 12px;
+	border-radius: 3px
+}
+
+.input-group-addon.input-lg {
+	padding: 10px 16px;
+	font-size: 18px;
+	border-radius: 6px
+}
+
+.input-group-addon input[type=checkbox],
+.input-group-addon input[type=radio] {
+	margin-top: 0
+}
+
+.input-group .form-control:first-child,
+.input-group-addon:first-child,
+.input-group-btn:first-child>.btn,
+.input-group-btn:first-child>.btn-group>.btn,
+.input-group-btn:first-child>.dropdown-toggle,
+.input-group-btn:last-child>.btn-group:not(:last-child)>.btn,
+.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle) {
+	border-top-right-radius: 0;
+	border-bottom-right-radius: 0
+}
+
+.input-group-addon:first-child {
+	border-right: 0
+}
+
+.input-group .form-control:last-child,
+.input-group-addon:last-child,
+.input-group-btn:first-child>.btn-group:not(:first-child)>.btn,
+.input-group-btn:first-child>.btn:not(:first-child),
+.input-group-btn:last-child>.btn,
+.input-group-btn:last-child>.btn-group>.btn,
+.input-group-btn:last-child>.dropdown-toggle {
+	border-top-left-radius: 0;
+	border-bottom-left-radius: 0
+}
+
+.input-group-addon:last-child {
+	border-left: 0
+}
+
+.input-group-btn {
+	position: relative;
+	font-size: 0;
+	white-space: nowrap
+}
+
+.input-group-btn>.btn {
+	position: relative
+}
+
+.input-group-btn>.btn+.btn {
+	margin-left: -1px
+}
+
+.input-group-btn>.btn:active,
+.input-group-btn>.btn:focus,
+.input-group-btn>.btn:hover {
+	z-index: 2
+}
+
+.input-group-btn:first-child>.btn,
+.input-group-btn:first-child>.btn-group {
+	margin-right: -1px
+}
+
+.input-group-btn:last-child>.btn,
+.input-group-btn:last-child>.btn-group {
+	z-index: 2;
+	margin-left: -1px
+}
+
+.nav {
+	padding-left: 0;
+	margin-bottom: 0;
+	list-style: none
+}
+
+.nav>li {
+	position: relative;
+	display: block
+}
+
+.nav>li>a {
+	position: relative;
+	display: block;
+	padding:5px 10px
+}
+
+.nav>li>a:focus,
+.nav>li>a:hover {
+	text-decoration: none;
+	background-color: #eee
+}
+
+.nav>li.disabled>a {
+	color: #777
+}
+
+.nav>li.disabled>a:focus,
+.nav>li.disabled>a:hover {
+	color: #777;
+	text-decoration: none;
+	cursor: not-allowed;
+	background-color: transparent
+}
+
+.nav .open>a,
+.nav .open>a:focus,
+.nav .open>a:hover {
+	background-color: #eee;
+	border-color: #ff5e5f
+}
+
+.nav .nav-divider {
+	height: 1px;
+	margin: 9px 0;
+	overflow: hidden;
+	background-color: #e5e5e5
+}
+
+.nav>li>a>img {
+	max-width: none
+}
+
+.nav-tabs {
+	border-bottom: 1px solid #ddd
+}
+
+.nav-tabs>li {
+	float: left;
+	margin-bottom: -1px
+}
+
+.nav-tabs>li>a {
+	margin-right: 2px;
+	line-height: 1.42857143;
+	border: 1px solid transparent;
+	border-radius: 4px 4px 0 0
+}
+
+.nav-tabs>li>a:hover {
+	border-color: #eee #eee #eee
+}
+
+.nav-tabs>li.active>a,
+.nav-tabs>li.active>a:focus,
+.nav-tabs>li.active>a:hover {
+	color: #555;
+	cursor: default;
+	background-color: #fff;
+	border: 1px solid #ddd;
+	border-bottom-color: transparent
+}
+
+.nav-tabs.nav-justified {
+	width: 100%;
+	border-bottom: 0
+}
+
+.nav-tabs.nav-justified>li {
+	float: none
+}
+
+.nav-tabs.nav-justified>li>a {
+	margin-bottom: 5px;
+	text-align: center
+}
+
+.nav-tabs.nav-justified>.dropdown .dropdown-menu {
+	top: auto;
+	left: auto
+}
+
+@media (min-width:768px) {
+	.nav-tabs.nav-justified>li {
+		display: table-cell;
+		width: 1%
+	}
+	.nav-tabs.nav-justified>li>a {
+		margin-bottom: 0
+	}
+}
+
+.nav-tabs.nav-justified>li>a {
+	margin-right: 0;
+	border-radius: 4px
+}
+
+.nav-tabs.nav-justified>.active>a,
+.nav-tabs.nav-justified>.active>a:focus,
+.nav-tabs.nav-justified>.active>a:hover {
+	border: 1px solid #ddd
+}
+
+@media (min-width:768px) {
+	.nav-tabs.nav-justified>li>a {
+		border-bottom: 1px solid #ddd;
+		border-radius: 4px 4px 0 0
+	}
+	.nav-tabs.nav-justified>.active>a,
+	.nav-tabs.nav-justified>.active>a:focus,
+	.nav-tabs.nav-justified>.active>a:hover {
+		border-bottom-color: #fff
+	}
+}
+
+.nav-pills>li {
+	float: left
+}
+
+.nav-pills>li>a {
+	border-radius: 4px
+}
+
+.nav-pills>li+li {
+	margin-left: 2px
+}
+
+.nav-pills>li.active>a,
+.nav-pills>li.active>a:focus,
+.nav-pills>li.active>a:hover {
+	color: #fff;
+	background-color: #ff5e5f
+}
+
+.nav-stacked>li {
+	float: none
+}
+
+.nav-stacked>li+li {
+	margin-top: 2px;
+	margin-left: 0
+}
+
+.nav-justified {
+	width: 100%
+}
+
+.nav-justified>li {
+	float: none
+}
+
+.nav-justified>li>a {
+	margin-bottom: 5px;
+	text-align: center
+}
+
+.nav-justified>.dropdown .dropdown-menu {
+	top: auto;
+	left: auto
+}
+
+@media (min-width:768px) {
+	.nav-justified>li {
+		display: table-cell;
+		width: 1%
+	}
+	.nav-justified>li>a {
+		margin-bottom: 0
+	}
+}
+
+.nav-tabs-justified {
+	border-bottom: 0
+}
+
+.nav-tabs-justified>li>a {
+	margin-right: 0;
+	border-radius: 4px
+}
+
+.nav-tabs-justified>.active>a,
+.nav-tabs-justified>.active>a:focus,
+.nav-tabs-justified>.active>a:hover {
+	border: 1px solid #ddd
+}
+
+@media (min-width:768px) {
+	.nav-tabs-justified>li>a {
+		border-bottom: 1px solid #ddd;
+		border-radius: 4px 4px 0 0
+	}
+	.nav-tabs-justified>.active>a,
+	.nav-tabs-justified>.active>a:focus,
+	.nav-tabs-justified>.active>a:hover {
+		border-bottom-color: #fff
+	}
+}
+
+.tab-content>.tab-pane {
+	display: none
+}
+
+.tab-content>.active {
+	display: block
+}
+
+.nav-tabs .dropdown-menu {
+	margin-top: -1px;
+	border-top-left-radius: 0;
+	border-top-right-radius: 0
+}
+
+.navbar {
+	position: relative;
+	min-height: 45px;
+	margin-bottom: 20px;
+	border: 1px solid transparent
+}
+
+@media (min-width:768px) {
+	.navbar {
+		border-radius: 4px
+	}
+}
+
+@media (min-width:768px) {
+	.navbar-header {
+		float: left
+	}
+}
+
+.navbar-collapse {
+	overflow-x: visible;
+	-webkit-overflow-scrolling: touch;
+	border-top: 1px solid transparent;
+	-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1);
+	box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1)
+}
+
+.navbar-collapse.in {
+	overflow-y: auto
+}
+
+@media (min-width:768px) {
+	.navbar-collapse {
+		width: auto;
+		border-top: 0;
+		-webkit-box-shadow: none;
+		box-shadow: none
+	}
+	.navbar-collapse.collapse {
+		display: block!important;
+		height: auto!important;
+		padding-bottom: 0;
+		overflow: visible!important
+	}
+	.navbar-collapse.in {
+		overflow-y: visible
+	}
+	.navbar-fixed-bottom .navbar-collapse,
+	.navbar-fixed-top .navbar-collapse,
+	.navbar-static-top .navbar-collapse {
+		padding-right: 0;
+		padding-left: 0
+	}
+}
+
+.navbar-fixed-bottom .navbar-collapse,
+.navbar-fixed-top .navbar-collapse {
+	max-height: 340px
+}
+
+@media (max-device-width:480px) and (orientation:landscape) {
+	.navbar-fixed-bottom .navbar-collapse,
+	.navbar-fixed-top .navbar-collapse {
+		max-height: 200px
+	}
+}
+
+.container-fluid>.navbar-collapse,
+.container-fluid>.navbar-header,
+.container>.navbar-collapse,
+.container>.navbar-header {
+	margin-right: -15px;
+	margin-left: -15px
+}
+
+@media (min-width:768px) {
+	.container-fluid>.navbar-collapse,
+	.container-fluid>.navbar-header,
+	.container>.navbar-collapse,
+	.container>.navbar-header {
+		margin-right: 0;
+		margin-left: 0
+	}
+}
+
+.navbar-static-top {
+	z-index: 1000;
+	border-width: 0 0 1px
+}
+
+@media (min-width:768px) {
+	.navbar-static-top {
+		border-radius: 0
+	}
+}
+
+.navbar-fixed-bottom,
+.navbar-fixed-top {
+	position: fixed;
+	right: 0;
+	left: 0;
+	z-index: 1030
+}
+
+@media (min-width:768px) {
+	.navbar-fixed-bottom,
+	.navbar-fixed-top {
+		border-radius: 0
+	}
+}
+
+.navbar-fixed-top {
+	top: 0;
+	border-width: 0 0 1px
+}
+
+.navbar-fixed-bottom {
+	bottom: 0;
+	margin-bottom: 0;
+	border-width: 1px 0 0
+}
+
+.navbar-brand {
+	float: left;
+	height: 50px;
+	padding: 15px 15px;
+	font-size: 18px;
+	line-height: 20px
+}
+
+.navbar-brand:focus,
+.navbar-brand:hover {
+	text-decoration: none
+}
+
+.navbar-brand>img {
+	display: block
+}
+
+@media (min-width:768px) {
+	.navbar>.container .navbar-brand,
+	.navbar>.container-fluid .navbar-brand {
+		margin-left: -15px
+	}
+}
+
+.navbar-toggle {
+	position: relative;
+	float: right;
+	padding: 9px 10px;
+	margin-top: 8px;
+	margin-right: 15px;
+	margin-bottom: 8px;
+	background-color: transparent;
+	background-image: none;
+	border: 1px solid transparent;
+	border-radius: 4px
+}
+
+.navbar-toggle:focus {
+	outline: 0
+}
+
+.navbar-toggle .icon-bar {
+	display: block;
+	width: 22px;
+	height: 2px;
+	border-radius: 1px
+}
+
+.navbar-toggle .icon-bar+.icon-bar {
+	margin-top: 4px
+}
+
+@media (min-width:768px) {
+	.navbar-toggle {
+		display: none
+	}
+}
+.navbar-container{
+	box-shadow: 0 2px 4px 0 rgba(0, 0, 0, .25);
+}
+.navbar-nav {
+	margin: 7.5px -15px;
+}
+
+.navbar-nav>li>a {
+	padding-top: 10px;
+	padding-bottom: 10px;
+	line-height: 20px
+}
+
+@media (max-width:767px) {
+	.navbar-nav .open .dropdown-menu {
+		position: static;
+		float: none;
+		width: auto;
+		margin-top: 0;
+		background-color: transparent;
+		border: 0;
+		-webkit-box-shadow: none;
+		box-shadow: none
+	}
+	.navbar-nav .open .dropdown-menu .dropdown-header,
+	.navbar-nav .open .dropdown-menu>li>a {
+		padding: 5px 15px 5px 25px
+	}
+	.navbar-nav .open .dropdown-menu>li>a {
+		line-height: 20px
+	}
+	.navbar-nav .open .dropdown-menu>li>a:focus,
+	.navbar-nav .open .dropdown-menu>li>a:hover {
+		background-image: none
+	}
+}
+
+@media (min-width:768px) {
+	.navbar-nav {
+		float: left;
+		margin: 0;
+	}
+	.navbar-nav>li {
+		float: left
+	}
+	
+}
+
+.navbar-form {
+	padding: 10px 15px;
+	margin-top: 8px;
+	margin-right: -15px;
+	margin-bottom: 8px;
+	margin-left: -15px;
+	border-top: 1px solid transparent;
+	border-bottom: 1px solid transparent;
+	-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1), 0 1px 0 rgba(255, 255, 255, .1);
+	box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1), 0 1px 0 rgba(255, 255, 255, .1)
+}
+
+@media (min-width:768px) {
+	.navbar-form .form-group {
+		display: inline-block;
+		margin-bottom: 0;
+		vertical-align: middle
+	}
+	.navbar-form .form-control {
+		display: inline-block;
+		width: auto;
+		vertical-align: middle
+	}
+	.navbar-form .form-control-static {
+		display: inline-block
+	}
+	.navbar-form .input-group {
+		display: inline-table;
+		vertical-align: middle
+	}
+	.navbar-form .input-group .form-control,
+	.navbar-form .input-group .input-group-addon,
+	.navbar-form .input-group .input-group-btn {
+		width: auto
+	}
+	.navbar-form .input-group>.form-control {
+		width: 100%
+	}
+	.navbar-form .control-label {
+		margin-bottom: 0;
+		vertical-align: middle
+	}
+	.navbar-form .checkbox,
+	.navbar-form .radio {
+		display: inline-block;
+		margin-top: 0;
+		margin-bottom: 0;
+		vertical-align: middle
+	}
+	.navbar-form .checkbox label,
+	.navbar-form .radio label {
+		padding-left: 0
+	}
+	.navbar-form .checkbox input[type=checkbox],
+	.navbar-form .radio input[type=radio] {
+		position: relative;
+		margin-left: 0
+	}
+	.navbar-form .has-feedback .form-control-feedback {
+		top: 0
+	}
+}
+
+@media (max-width:767px) {
+	.navbar-form .form-group {
+		margin-bottom: 5px
+	}
+	.navbar-form .form-group:last-child {
+		margin-bottom: 0
+	}
+}
+
+@media (min-width:768px) {
+	.navbar-form {
+		width: auto;
+		padding-top: 0;
+		padding-bottom: 0;
+		margin-right: 0;
+		margin-left: 0;
+		border: 0;
+		-webkit-box-shadow: none;
+		box-shadow: none
+	}
+}
+
+.navbar-nav>li>.dropdown-menu {
+	margin-top: 0;
+	border-top-left-radius: 0;
+	border-top-right-radius: 0
+}
+
+.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu {
+	margin-bottom: 0;
+	border-top-left-radius: 4px;
+	border-top-right-radius: 4px;
+	border-bottom-right-radius: 0;
+	border-bottom-left-radius: 0
+}
+
+.navbar-btn {
+	margin-top: 8px;
+	margin-bottom: 8px
+}
+
+.navbar-btn.btn-sm {
+	margin-top: 10px;
+	margin-bottom: 10px
+}
+
+.navbar-btn.btn-xs {
+	margin-top: 14px;
+	margin-bottom: 14px
+}
+
+.navbar-text {
+	margin-top: 15px;
+	margin-bottom: 15px
+}
+
+@media (min-width:768px) {
+	.navbar-text {
+		float: left;
+		margin-right: 15px;
+		margin-left: 15px
+	}
+}
+
+@media (min-width:768px) {
+	.navbar-left {
+		float: left!important
+	}
+	.navbar-right {
+		float: right!important;
+		margin-right: -15px
+	}
+	.navbar-right~.navbar-right {
+		margin-right: 0
+	}
+}
+
+.navbar-default {
+	background-color: #f8f8f8;
+	border-color: #e7e7e7
+}
+
+.navbar-default .navbar-brand {
+	color: #777
+}
+
+.navbar-default .navbar-brand:focus,
+.navbar-default .navbar-brand:hover {
+	color: #5e5e5e;
+	background-color: transparent
+}
+
+.navbar-default .navbar-text {
+	color: #777
+}
+
+.navbar-default .navbar-nav>li>a {
+	color: #777
+}
+
+.navbar-default .navbar-nav>li>a:focus,
+.navbar-default .navbar-nav>li>a:hover {
+	color: #333;
+	background-color: transparent
+}
+
+.navbar-default .navbar-nav>.active>a,
+.navbar-default .navbar-nav>.active>a:focus,
+.navbar-default .navbar-nav>.active>a:hover {
+	color: #555;
+	background-color: #e7e7e7
+}
+
+.navbar-default .navbar-nav>.disabled>a,
+.navbar-default .navbar-nav>.disabled>a:focus,
+.navbar-default .navbar-nav>.disabled>a:hover {
+	color: #ccc;
+	background-color: transparent
+}
+
+.navbar-default .navbar-toggle {
+	border-color: #ddd
+}
+
+.navbar-default .navbar-toggle:focus,
+.navbar-default .navbar-toggle:hover {
+	background-color: #ddd
+}
+
+.navbar-default .navbar-toggle .icon-bar {
+	background-color: #888
+}
+
+.navbar-default .navbar-collapse,
+.navbar-default .navbar-form {
+	border-color: #e7e7e7
+}
+
+.navbar-default .navbar-nav>.open>a,
+.navbar-default .navbar-nav>.open>a:focus,
+.navbar-default .navbar-nav>.open>a:hover {
+	color: #555;
+	background-color: #e7e7e7
+}
+
+@media (max-width:767px) {
+	.navbar-default .navbar-nav .open .dropdown-menu>li>a {
+		color: #777
+	}
+	.navbar-default .navbar-nav .open .dropdown-menu>li>a:focus,
+	.navbar-default .navbar-nav .open .dropdown-menu>li>a:hover {
+		color: #333;
+		background-color: transparent
+	}
+	.navbar-default .navbar-nav .open .dropdown-menu>.active>a,
+	.navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus,
+	.navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover {
+		color: #555;
+		background-color: #e7e7e7
+	}
+	.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a,
+	.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:focus,
+	.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:hover {
+		color: #ccc;
+		background-color: transparent
+	}
+}
+
+.navbar-default .navbar-link {
+	color: #777
+}
+
+.navbar-default .navbar-link:hover {
+	color: #333
+}
+
+.navbar-default .btn-link {
+	color: #777
+}
+
+.navbar-default .btn-link:focus,
+.navbar-default .btn-link:hover {
+	color: #333
+}
+
+.navbar-default .btn-link[disabled]:focus,
+.navbar-default .btn-link[disabled]:hover,
+fieldset[disabled] .navbar-default .btn-link:focus,
+fieldset[disabled] .navbar-default .btn-link:hover {
+	color: #ccc
+}
+
+.navbar-inverse {
+	background-color: #222;
+	border-color: #080808
+}
+
+.navbar-inverse .navbar-brand {
+	color: #9d9d9d
+}
+
+.navbar-inverse .navbar-brand:focus,
+.navbar-inverse .navbar-brand:hover {
+	color: #fff;
+	background-color: transparent
+}
+
+.navbar-inverse .navbar-text {
+	color: #9d9d9d
+}
+
+.navbar-inverse .navbar-nav>li>a {
+	color: #9d9d9d
+}
+
+.navbar-inverse .navbar-nav>li>a:focus,
+.navbar-inverse .navbar-nav>li>a:hover {
+	color: #fff;
+	background-color: transparent
+}
+
+.navbar-inverse .navbar-nav>.active>a,
+.navbar-inverse .navbar-nav>.active>a:focus,
+.navbar-inverse .navbar-nav>.active>a:hover {
+	color: #fff;
+	background-color: #080808
+}
+
+.navbar-inverse .navbar-nav>.disabled>a,
+.navbar-inverse .navbar-nav>.disabled>a:focus,
+.navbar-inverse .navbar-nav>.disabled>a:hover {
+	color: #444;
+	background-color: transparent
+}
+
+.navbar-inverse .navbar-toggle {
+	border-color: #333
+}
+
+.navbar-inverse .navbar-toggle:focus,
+.navbar-inverse .navbar-toggle:hover {
+	background-color: #333
+}
+
+.navbar-inverse .navbar-toggle .icon-bar {
+	background-color: #fff
+}
+
+.navbar-inverse .navbar-collapse,
+.navbar-inverse .navbar-form {
+	border-color: #101010
+}
+
+.navbar-inverse .navbar-nav>.open>a,
+.navbar-inverse .navbar-nav>.open>a:focus,
+.navbar-inverse .navbar-nav>.open>a:hover {
+	color: #fff;
+	background-color: #080808
+}
+
+@media (max-width:767px) {
+	.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header {
+		border-color: #080808
+	}
+	.navbar-inverse .navbar-nav .open .dropdown-menu .divider {
+		background-color: #080808
+	}
+	.navbar-inverse .navbar-nav .open .dropdown-menu>li>a {
+		color: #9d9d9d
+	}
+	.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus,
+	.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover {
+		color: #fff;
+		background-color: transparent
+	}
+	.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,
+	.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus,
+	.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover {
+		color: #fff;
+		background-color: #080808
+	}
+	.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a,
+	.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:focus,
+	.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:hover {
+		color: #444;
+		background-color: transparent
+	}
+}
+
+.navbar-inverse .navbar-link {
+	color: #9d9d9d
+}
+
+.navbar-inverse .navbar-link:hover {
+	color: #fff
+}
+
+.navbar-inverse .btn-link {
+	color: #9d9d9d
+}
+
+.navbar-inverse .btn-link:focus,
+.navbar-inverse .btn-link:hover {
+	color: #fff
+}
+
+.navbar-inverse .btn-link[disabled]:focus,
+.navbar-inverse .btn-link[disabled]:hover,
+fieldset[disabled] .navbar-inverse .btn-link:focus,
+fieldset[disabled] .navbar-inverse .btn-link:hover {
+	color: #444
+}
+
+.breadcrumb {
+	padding: 8px 15px;
+	margin-bottom: 20px;
+	list-style: none;
+	background-color: #f5f5f5;
+	border-radius: 4px
+}
+
+.breadcrumb>li {
+	display: inline-block
+}
+
+.breadcrumb>li+li:before {
+	padding: 0 5px;
+	color: #ccc;
+	content: "/\00a0"
+}
+
+.breadcrumb>.active {
+	color: #777
+}
+
+.pagination ul {
+	display: inline-block;
+	*display: inline;
+	margin-bottom: 0;
+	margin-left: 0;
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+	*zoom: 1;
+	-webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+	-moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+	box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05)
+}
+
+.pagination ul>li {
+	display: inline
+}
+
+.pagination ul>li>a,
+.pagination ul>li>span {
+	float: left;
+	padding: 4px 12px;
+	line-height: 20px;
+	text-decoration: none;
+	background-color: #fff;
+	border: 1px solid #ddd;
+	border-left-width: 0;
+	color:#999
+}
+
+.pagination ul>li>a:hover,
+.pagination ul>li>a:focus,
+.pagination ul>.active>a,
+.pagination ul>.active>span {
+	background-color: #f5f5f5
+}
+
+.pagination ul>.active>a,
+.pagination ul>.active>span {
+	color: #0d638f;
+	cursor: default
+}
+
+.pagination ul>.disabled>span,
+.pagination ul>.disabled>a,
+.pagination ul>.disabled>a:hover,
+.pagination ul>.disabled>a:focus {
+	color: #0d638f;
+	cursor: default;
+	background-color: transparent
+}
+
+.pagination ul>li:first-child>a,
+.pagination ul>li:first-child>span {
+	border-left-width: 1px;
+	-webkit-border-bottom-left-radius: 4px;
+	border-bottom-left-radius: 4px;
+	-webkit-border-top-left-radius: 4px;
+	border-top-left-radius: 4px;
+	-moz-border-radius-bottomleft: 4px;
+	-moz-border-radius-topleft: 4px
+}
+
+.pagination ul>li:last-child>a,
+.pagination ul>li:last-child>span {
+	-webkit-border-top-right-radius: 4px;
+	border-top-right-radius: 4px;
+	-webkit-border-bottom-right-radius: 4px;
+	border-bottom-right-radius: 4px;
+	-moz-border-radius-topright: 4px;
+	-moz-border-radius-bottomright: 4px
+}
+.pager {
+	padding-left: 0;
+	margin: 20px 0;
+	text-align: center;
+	list-style: none
+}
+
+.pager li {
+	display: inline
+}
+
+.pager li>a,
+.pager li>span {
+	display: inline-block;
+	padding: 5px 14px;
+	background-color: #fff;
+	border: 1px solid #ddd;
+	border-radius: 15px
+}
+
+.pager li>a:focus,
+.pager li>a:hover {
+	text-decoration: none;
+	background-color: #eee
+}
+
+.pager .next>a,
+.pager .next>span {
+	float: right
+}
+
+.pager .previous>a,
+.pager .previous>span {
+	float: left
+}
+
+.pager .disabled>a,
+.pager .disabled>a:focus,
+.pager .disabled>a:hover,
+.pager .disabled>span {
+	color: #777;
+	cursor: not-allowed;
+	background-color: #fff
+}
+
+.label {
+	display: inline;
+	padding: .2em .6em .3em;
+	font-size: 75%;
+	font-weight: 700;
+	line-height: 1;
+	color: #fff;
+	text-align: center;
+	white-space: nowrap;
+	vertical-align: baseline;
+	border-radius: .25em
+}
+
+a.label:focus,
+a.label:hover {
+	color: #fff;
+	text-decoration: none;
+	cursor: pointer
+}
+
+.label:empty {
+	display: none
+}
+
+.btn .label {
+	position: relative;
+	top: -1px
+}
+
+.label-default {
+	background-color: #777
+}
+
+.label-default[href]:focus,
+.label-default[href]:hover {
+	background-color: #5e5e5e
+}
+
+.label-primary {
+	background-color: #ff5e5f
+}
+
+.label-primary[href]:focus,
+.label-primary[href]:hover {
+	background-color: #ff5f60
+}
+
+.label-success {
+	background-color: #5cb85c
+}
+
+.label-success[href]:focus,
+.label-success[href]:hover {
+	background-color: #449d44
+}
+
+.label-info {
+	background-color: #5bc0de
+}
+
+.label-info[href]:focus,
+.label-info[href]:hover {
+	background-color: #31b0d5
+}
+
+.label-warning {
+	background-color: #f0ad4e
+}
+
+.label-warning[href]:focus,
+.label-warning[href]:hover {
+	background-color: #ec971f
+}
+
+.label-danger {
+	background-color: #d9534f
+}
+
+.label-danger[href]:focus,
+.label-danger[href]:hover {
+	background-color: #c9302c
+}
+
+.badge {
+	display: inline-block;
+	min-width: 10px;
+	padding: 3px 7px;
+	font-size: 12px;
+	font-weight: 700;
+	line-height: 1;
+	color: #fff;
+	text-align: center;
+	white-space: nowrap;
+	vertical-align: middle;
+	background-color: #777;
+	border-radius: 10px
+}
+
+.badge:empty {
+	display: none
+}
+
+.btn .badge {
+	position: relative;
+	top: -1px
+}
+
+.btn-group-xs>.btn .badge,
+.btn-xs .badge {
+	top: 0;
+	padding: 1px 5px
+}
+
+a.badge:focus,
+a.badge:hover {
+	color: #fff;
+	text-decoration: none;
+	cursor: pointer
+}
+
+.list-group-item.active>.badge,
+.nav-pills>.active>a>.badge {
+	color: #ff5e5f;
+	background-color: #fff
+}
+
+.list-group-item>.badge {
+	float: right
+}
+
+.list-group-item>.badge+.badge {
+	margin-right: 5px
+}
+
+.nav-pills>li>a>.badge {
+	margin-left: 3px
+}
+
+.jumbotron {
+	padding-top: 30px;
+	padding-bottom: 30px;
+	margin-bottom: 30px;
+	color: inherit;
+	background-color: #eee
+}
+
+.jumbotron .h1,
+.jumbotron h1 {
+	color: inherit
+}
+
+.jumbotron p {
+	margin-bottom: 15px;
+	font-size: 21px;
+	font-weight: 200
+}
+
+.jumbotron>hr {
+	border-top-color: #d5d5d5
+}
+
+.container .jumbotron,
+.container-fluid .jumbotron {
+	padding-right: 15px;
+	padding-left: 15px;
+	border-radius: 6px
+}
+
+.jumbotron .container {
+	max-width: 100%
+}
+
+@media screen and (min-width:768px) {
+	.jumbotron {
+		padding-top: 48px;
+		padding-bottom: 48px
+	}
+	.container .jumbotron,
+	.container-fluid .jumbotron {
+		padding-right: 60px;
+		padding-left: 60px
+	}
+	.jumbotron .h1,
+	.jumbotron h1 {
+		font-size: 63px
+	}
+}
+
+.thumbnail {
+	display: block;
+	padding: 4px;
+	margin-bottom: 20px;
+	line-height: 1.42857143;
+	background-color: #fff;
+	border: 1px solid #ddd;
+	border-radius: 4px;
+	-webkit-transition: border .2s ease-in-out;
+	-o-transition: border .2s ease-in-out;
+	transition: border .2s ease-in-out
+}
+
+.thumbnail a>img,
+.thumbnail>img {
+	margin-right: auto;
+	margin-left: auto
+}
+
+a.thumbnail.active,
+a.thumbnail:focus,
+a.thumbnail:hover {
+	border-color: #ff5e5f
+}
+
+.thumbnail .caption {
+	padding: 9px;
+	color: #333
+}
+
+.alert {
+	padding: 15px;
+	margin-bottom: 20px;
+	border: 1px solid transparent;
+	border-radius: 4px
+}
+
+.alert h4 {
+	margin-top: 0;
+	color: inherit
+}
+
+.alert .alert-link {
+	font-weight: 700
+}
+
+.alert>p,
+.alert>ul {
+	margin-bottom: 0
+}
+
+.alert>p+p {
+	margin-top: 5px
+}
+
+.alert-dismissable,
+.alert-dismissible {
+	padding-right: 35px
+}
+
+.alert-dismissable .close,
+.alert-dismissible .close {
+	position: relative;
+	top: -2px;
+	right: -21px;
+	color: inherit
+}
+
+.alert-success {
+	color: #3c763d;
+	background-color: #dff0d8;
+	border-color: #d6e9c6
+}
+
+.alert-success hr {
+	border-top-color: #c9e2b3
+}
+
+.alert-success .alert-link {
+	color: #2b542c
+}
+
+.alert-info {
+	color: #31708f;
+	background-color: #d9edf7;
+	border-color: #bce8f1
+}
+
+.alert-info hr {
+	border-top-color: #a6e1ec
+}
+
+.alert-info .alert-link {
+	color: #245269
+}
+
+.alert-warning {
+	color: #8a6d3b;
+	background-color: #fcf8e3;
+	border-color: #faebcc
+}
+
+.alert-warning hr {
+	border-top-color: #f7e1b5
+}
+
+.alert-warning .alert-link {
+	color: #66512c
+}
+
+.alert-danger {
+	color: #a94442;
+	background-color: #f2dede;
+	border-color: #ebccd1
+}
+
+.alert-danger hr {
+	border-top-color: #e4b9c0
+}
+
+.alert-danger .alert-link {
+	color: #843534
+}
+
+@-webkit-keyframes progress-bar-stripes {
+	from {
+		background-position: 40px 0
+	}
+	to {
+		background-position: 0 0
+	}
+}
+
+@-o-keyframes progress-bar-stripes {
+	from {
+		background-position: 40px 0
+	}
+	to {
+		background-position: 0 0
+	}
+}
+
+@keyframes progress-bar-stripes {
+	from {
+		background-position: 40px 0
+	}
+	to {
+		background-position: 0 0
+	}
+}
+
+.progress {
+	height: 20px;
+	margin-bottom: 20px;
+	overflow: hidden;
+	background-color: #f5f5f5;
+	border-radius: 4px;
+	-webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, .1);
+	box-shadow: inset 0 1px 2px rgba(0, 0, 0, .1)
+}
+
+.progress-bar {
+	float: left;
+	width: 0;
+	height: 100%;
+	font-size: 12px;
+	line-height: 20px;
+	color: #fff;
+	text-align: center;
+	background-color: #ff5e5f;
+	-webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .15);
+	box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .15);
+	-webkit-transition: width .6s ease;
+	-o-transition: width .6s ease;
+	transition: width .6s ease
+}
+
+.progress-bar-striped,
+.progress-striped .progress-bar {
+	background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+	background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+	background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+	-webkit-background-size: 40px 40px;
+	background-size: 40px 40px
+}
+
+.progress-bar.active,
+.progress.active .progress-bar {
+	-webkit-animation: progress-bar-stripes 2s linear infinite;
+	-o-animation: progress-bar-stripes 2s linear infinite;
+	animation: progress-bar-stripes 2s linear infinite
+}
+
+.progress-bar-success {
+	background-color: #5cb85c
+}
+
+.progress-striped .progress-bar-success {
+	background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+	background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+	background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent)
+}
+
+.progress-bar-info {
+	background-color: #5bc0de
+}
+
+.progress-striped .progress-bar-info {
+	background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+	background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+	background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent)
+}
+
+.progress-bar-warning {
+	background-color: #f0ad4e
+}
+
+.progress-striped .progress-bar-warning {
+	background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+	background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+	background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent)
+}
+
+.progress-bar-danger {
+	background-color: #d9534f
+}
+
+.progress-striped .progress-bar-danger {
+	background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+	background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+	background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent)
+}
+
+.media {
+	margin-top: 15px
+}
+
+.media:first-child {
+	margin-top: 0
+}
+
+.media,
+.media-body {
+	overflow: hidden;
+	zoom: 1
+}
+
+.media-body {
+	width: 10000px
+}
+
+.media-object {
+	display: block
+}
+
+.media-object.img-thumbnail {
+	max-width: none
+}
+
+.media-right,
+.media>.pull-right {
+	padding-left: 10px
+}
+
+.media-left,
+.media>.pull-left {
+	padding-right: 10px
+}
+
+.media-body,
+.media-left,
+.media-right {
+	display: table-cell;
+	vertical-align: top
+}
+
+.media-middle {
+	vertical-align: middle
+}
+
+.media-bottom {
+	vertical-align: bottom
+}
+
+.media-heading {
+	margin-top: 0;
+	margin-bottom: 5px
+}
+
+.media-list {
+	padding-left: 0;
+	list-style: none
+}
+
+.list-group {
+	padding-left: 0;
+	margin-bottom: 20px
+}
+
+.list-group-item {
+	position: relative;
+	display: block;
+	padding: 10px 15px;
+	margin-bottom: -1px;
+	background-color: #fff;
+	border: 1px solid #ddd
+}
+
+.list-group-item:first-child {
+	border-top-left-radius: 4px;
+	border-top-right-radius: 4px
+}
+
+.list-group-item:last-child {
+	margin-bottom: 0;
+	border-bottom-right-radius: 4px;
+	border-bottom-left-radius: 4px
+}
+
+a.list-group-item,
+button.list-group-item {
+	color: #555
+}
+
+a.list-group-item .list-group-item-heading,
+button.list-group-item .list-group-item-heading {
+	color: #333
+}
+
+a.list-group-item:focus,
+a.list-group-item:hover,
+button.list-group-item:focus,
+button.list-group-item:hover {
+	color: #555;
+	text-decoration: none;
+	background-color: #f5f5f5
+}
+
+button.list-group-item {
+	width: 100%;
+	text-align: left
+}
+
+.list-group-item.disabled,
+.list-group-item.disabled:focus,
+.list-group-item.disabled:hover {
+	color: #777;
+	cursor: not-allowed;
+	background-color: #eee
+}
+
+.list-group-item.disabled .list-group-item-heading,
+.list-group-item.disabled:focus .list-group-item-heading,
+.list-group-item.disabled:hover .list-group-item-heading {
+	color: inherit
+}
+
+.list-group-item.disabled .list-group-item-text,
+.list-group-item.disabled:focus .list-group-item-text,
+.list-group-item.disabled:hover .list-group-item-text {
+	color: #777
+}
+
+.list-group-item.active,
+.list-group-item.active:focus,
+.list-group-item.active:hover {
+	z-index: 2;
+	color: #fff;
+	background-color: #ff5e5f;
+	border-color: #ff5e5f
+}
+
+.list-group-item.active .list-group-item-heading,
+.list-group-item.active .list-group-item-heading>.small,
+.list-group-item.active .list-group-item-heading>small,
+.list-group-item.active:focus .list-group-item-heading,
+.list-group-item.active:focus .list-group-item-heading>.small,
+.list-group-item.active:focus .list-group-item-heading>small,
+.list-group-item.active:hover .list-group-item-heading,
+.list-group-item.active:hover .list-group-item-heading>.small,
+.list-group-item.active:hover .list-group-item-heading>small {
+	color: inherit
+}
+
+.list-group-item.active .list-group-item-text,
+.list-group-item.active:focus .list-group-item-text,
+.list-group-item.active:hover .list-group-item-text {
+	color: #c7ddef
+}
+
+.list-group-item-success {
+	color: #3c763d;
+	background-color: #dff0d8
+}
+
+a.list-group-item-success,
+button.list-group-item-success {
+	color: #3c763d
+}
+
+a.list-group-item-success .list-group-item-heading,
+button.list-group-item-success .list-group-item-heading {
+	color: inherit
+}
+
+a.list-group-item-success:focus,
+a.list-group-item-success:hover,
+button.list-group-item-success:focus,
+button.list-group-item-success:hover {
+	color: #3c763d;
+	background-color: #d0e9c6
+}
+
+a.list-group-item-success.active,
+a.list-group-item-success.active:focus,
+a.list-group-item-success.active:hover,
+button.list-group-item-success.active,
+button.list-group-item-success.active:focus,
+button.list-group-item-success.active:hover {
+	color: #fff;
+	background-color: #3c763d;
+	border-color: #3c763d
+}
+
+.list-group-item-info {
+	color: #31708f;
+	background-color: #d9edf7
+}
+
+a.list-group-item-info,
+button.list-group-item-info {
+	color: #31708f
+}
+
+a.list-group-item-info .list-group-item-heading,
+button.list-group-item-info .list-group-item-heading {
+	color: inherit
+}
+
+a.list-group-item-info:focus,
+a.list-group-item-info:hover,
+button.list-group-item-info:focus,
+button.list-group-item-info:hover {
+	color: #31708f;
+	background-color: #c4e3f3
+}
+
+a.list-group-item-info.active,
+a.list-group-item-info.active:focus,
+a.list-group-item-info.active:hover,
+button.list-group-item-info.active,
+button.list-group-item-info.active:focus,
+button.list-group-item-info.active:hover {
+	color: #fff;
+	background-color: #31708f;
+	border-color: #31708f
+}
+
+.list-group-item-warning {
+	color: #8a6d3b;
+	background-color: #fcf8e3
+}
+
+a.list-group-item-warning,
+button.list-group-item-warning {
+	color: #8a6d3b
+}
+
+a.list-group-item-warning .list-group-item-heading,
+button.list-group-item-warning .list-group-item-heading {
+	color: inherit
+}
+
+a.list-group-item-warning:focus,
+a.list-group-item-warning:hover,
+button.list-group-item-warning:focus,
+button.list-group-item-warning:hover {
+	color: #8a6d3b;
+	background-color: #faf2cc
+}
+
+a.list-group-item-warning.active,
+a.list-group-item-warning.active:focus,
+a.list-group-item-warning.active:hover,
+button.list-group-item-warning.active,
+button.list-group-item-warning.active:focus,
+button.list-group-item-warning.active:hover {
+	color: #fff;
+	background-color: #8a6d3b;
+	border-color: #8a6d3b
+}
+
+.list-group-item-danger {
+	color: #a94442;
+	background-color: #f2dede
+}
+
+a.list-group-item-danger,
+button.list-group-item-danger {
+	color: #a94442
+}
+
+a.list-group-item-danger .list-group-item-heading,
+button.list-group-item-danger .list-group-item-heading {
+	color: inherit
+}
+
+a.list-group-item-danger:focus,
+a.list-group-item-danger:hover,
+button.list-group-item-danger:focus,
+button.list-group-item-danger:hover {
+	color: #a94442;
+	background-color: #ebcccc
+}
+
+a.list-group-item-danger.active,
+a.list-group-item-danger.active:focus,
+a.list-group-item-danger.active:hover,
+button.list-group-item-danger.active,
+button.list-group-item-danger.active:focus,
+button.list-group-item-danger.active:hover {
+	color: #fff;
+	background-color: #a94442;
+	border-color: #a94442
+}
+
+.list-group-item-heading {
+	margin-top: 0;
+	margin-bottom: 5px
+}
+
+.list-group-item-text {
+	margin-bottom: 0;
+	line-height: 1.3
+}
+
+.panel {
+	margin-bottom: 20px;
+	background-color: #fff;
+	border: 1px solid transparent;
+	border-radius: 4px;
+	-webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, .05);
+	box-shadow: 0 1px 1px rgba(0, 0, 0, .05)
+}
+
+.panel-body {
+	padding: 15px
+}
+
+.panel-heading {
+	padding: 10px 15px;
+	border-bottom: 1px solid transparent;
+	border-top-left-radius: 3px;
+	border-top-right-radius: 3px
+}
+
+.panel-heading>.dropdown .dropdown-toggle {
+	color: inherit
+}
+
+.panel-title {
+	margin-top: 0;
+	margin-bottom: 0;
+	font-size: 16px;
+	color: inherit
+}
+
+.panel-title>.small,
+.panel-title>.small>a,
+.panel-title>a,
+.panel-title>small,
+.panel-title>small>a {
+	color: inherit
+}
+
+.panel-footer {
+	padding: 10px 15px;
+	background-color: #f5f5f5;
+	border-top: 1px solid #ddd;
+	border-bottom-right-radius: 3px;
+	border-bottom-left-radius: 3px
+}
+
+.panel>.list-group,
+.panel>.panel-collapse>.list-group {
+	margin-bottom: 0
+}
+
+.panel>.list-group .list-group-item,
+.panel>.panel-collapse>.list-group .list-group-item {
+	border-width: 1px 0;
+	border-radius: 0
+}
+
+.panel>.list-group:first-child .list-group-item:first-child,
+.panel>.panel-collapse>.list-group:first-child .list-group-item:first-child {
+	border-top: 0;
+	border-top-left-radius: 3px;
+	border-top-right-radius: 3px
+}
+
+.panel>.list-group:last-child .list-group-item:last-child,
+.panel>.panel-collapse>.list-group:last-child .list-group-item:last-child {
+	border-bottom: 0;
+	border-bottom-right-radius: 3px;
+	border-bottom-left-radius: 3px
+}
+
+.panel>.panel-heading+.panel-collapse>.list-group .list-group-item:first-child {
+	border-top-left-radius: 0;
+	border-top-right-radius: 0
+}
+
+.panel-heading+.list-group .list-group-item:first-child {
+	border-top-width: 0
+}
+
+.list-group+.panel-footer {
+	border-top-width: 0
+}
+
+.panel>.panel-collapse>.table,
+.panel>.table,
+.panel>.table-responsive>.table {
+	margin-bottom: 0
+}
+
+.panel>.panel-collapse>.table caption,
+.panel>.table caption,
+.panel>.table-responsive>.table caption {
+	padding-right: 15px;
+	padding-left: 15px
+}
+
+.panel>.table-responsive:first-child>.table:first-child,
+.panel>.table:first-child {
+	border-top-left-radius: 3px;
+	border-top-right-radius: 3px
+}
+
+.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child,
+.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child,
+.panel>.table:first-child>tbody:first-child>tr:first-child,
+.panel>.table:first-child>thead:first-child>tr:first-child {
+	border-top-left-radius: 3px;
+	border-top-right-radius: 3px
+}
+
+.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:first-child,
+.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:first-child,
+.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:first-child,
+.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:first-child,
+.panel>.table:first-child>tbody:first-child>tr:first-child td:first-child,
+.panel>.table:first-child>tbody:first-child>tr:first-child th:first-child,
+.panel>.table:first-child>thead:first-child>tr:first-child td:first-child,
+.panel>.table:first-child>thead:first-child>tr:first-child th:first-child {
+	border-top-left-radius: 3px
+}
+
+.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:last-child,
+.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:last-child,
+.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:last-child,
+.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:last-child,
+.panel>.table:first-child>tbody:first-child>tr:first-child td:last-child,
+.panel>.table:first-child>tbody:first-child>tr:first-child th:last-child,
+.panel>.table:first-child>thead:first-child>tr:first-child td:last-child,
+.panel>.table:first-child>thead:first-child>tr:first-child th:last-child {
+	border-top-right-radius: 3px
+}
+
+.panel>.table-responsive:last-child>.table:last-child,
+.panel>.table:last-child {
+	border-bottom-right-radius: 3px;
+	border-bottom-left-radius: 3px
+}
+
+.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child,
+.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child,
+.panel>.table:last-child>tbody:last-child>tr:last-child,
+.panel>.table:last-child>tfoot:last-child>tr:last-child {
+	border-bottom-right-radius: 3px;
+	border-bottom-left-radius: 3px
+}
+
+.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:first-child,
+.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:first-child,
+.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:first-child,
+.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:first-child,
+.panel>.table:last-child>tbody:last-child>tr:last-child td:first-child,
+.panel>.table:last-child>tbody:last-child>tr:last-child th:first-child,
+.panel>.table:last-child>tfoot:last-child>tr:last-child td:first-child,
+.panel>.table:last-child>tfoot:last-child>tr:last-child th:first-child {
+	border-bottom-left-radius: 3px
+}
+
+.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:last-child,
+.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:last-child,
+.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:last-child,
+.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:last-child,
+.panel>.table:last-child>tbody:last-child>tr:last-child td:last-child,
+.panel>.table:last-child>tbody:last-child>tr:last-child th:last-child,
+.panel>.table:last-child>tfoot:last-child>tr:last-child td:last-child,
+.panel>.table:last-child>tfoot:last-child>tr:last-child th:last-child {
+	border-bottom-right-radius: 3px
+}
+
+.panel>.panel-body+.table,
+.panel>.panel-body+.table-responsive,
+.panel>.table+.panel-body,
+.panel>.table-responsive+.panel-body {
+	border-top: 1px solid #ddd
+}
+
+.panel>.table>tbody:first-child>tr:first-child td,
+.panel>.table>tbody:first-child>tr:first-child th {
+	border-top: 0
+}
+
+.panel>.table-bordered,
+.panel>.table-responsive>.table-bordered {
+	border: 0
+}
+
+.panel>.table-bordered>tbody>tr>td:first-child,
+.panel>.table-bordered>tbody>tr>th:first-child,
+.panel>.table-bordered>tfoot>tr>td:first-child,
+.panel>.table-bordered>tfoot>tr>th:first-child,
+.panel>.table-bordered>thead>tr>td:first-child,
+.panel>.table-bordered>thead>tr>th:first-child,
+.panel>.table-responsive>.table-bordered>tbody>tr>td:first-child,
+.panel>.table-responsive>.table-bordered>tbody>tr>th:first-child,
+.panel>.table-responsive>.table-bordered>tfoot>tr>td:first-child,
+.panel>.table-responsive>.table-bordered>tfoot>tr>th:first-child,
+.panel>.table-responsive>.table-bordered>thead>tr>td:first-child,
+.panel>.table-responsive>.table-bordered>thead>tr>th:first-child {
+	border-left: 0
+}
+
+.panel>.table-bordered>tbody>tr>td:last-child,
+.panel>.table-bordered>tbody>tr>th:last-child,
+.panel>.table-bordered>tfoot>tr>td:last-child,
+.panel>.table-bordered>tfoot>tr>th:last-child,
+.panel>.table-bordered>thead>tr>td:last-child,
+.panel>.table-bordered>thead>tr>th:last-child,
+.panel>.table-responsive>.table-bordered>tbody>tr>td:last-child,
+.panel>.table-responsive>.table-bordered>tbody>tr>th:last-child,
+.panel>.table-responsive>.table-bordered>tfoot>tr>td:last-child,
+.panel>.table-responsive>.table-bordered>tfoot>tr>th:last-child,
+.panel>.table-responsive>.table-bordered>thead>tr>td:last-child,
+.panel>.table-responsive>.table-bordered>thead>tr>th:last-child {
+	border-right: 0
+}
+
+.panel>.table-bordered>tbody>tr:first-child>td,
+.panel>.table-bordered>tbody>tr:first-child>th,
+.panel>.table-bordered>thead>tr:first-child>td,
+.panel>.table-bordered>thead>tr:first-child>th,
+.panel>.table-responsive>.table-bordered>tbody>tr:first-child>td,
+.panel>.table-responsive>.table-bordered>tbody>tr:first-child>th,
+.panel>.table-responsive>.table-bordered>thead>tr:first-child>td,
+.panel>.table-responsive>.table-bordered>thead>tr:first-child>th {
+	border-bottom: 0
+}
+
+.panel>.table-bordered>tbody>tr:last-child>td,
+.panel>.table-bordered>tbody>tr:last-child>th,
+.panel>.table-bordered>tfoot>tr:last-child>td,
+.panel>.table-bordered>tfoot>tr:last-child>th,
+.panel>.table-responsive>.table-bordered>tbody>tr:last-child>td,
+.panel>.table-responsive>.table-bordered>tbody>tr:last-child>th,
+.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>td,
+.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>th {
+	border-bottom: 0
+}
+
+.panel>.table-responsive {
+	margin-bottom: 0;
+	border: 0
+}
+
+.panel-group {
+	margin-bottom: 20px
+}
+
+.panel-group .panel {
+	margin-bottom: 0;
+	border-radius: 4px
+}
+
+.panel-group .panel+.panel {
+	margin-top: 5px
+}
+
+.panel-group .panel-heading {
+	border-bottom: 0
+}
+
+.panel-group .panel-heading+.panel-collapse>.list-group,
+.panel-group .panel-heading+.panel-collapse>.panel-body {
+	border-top: 1px solid #ddd
+}
+
+.panel-group .panel-footer {
+	border-top: 0
+}
+
+.panel-group .panel-footer+.panel-collapse .panel-body {
+	border-bottom: 1px solid #ddd
+}
+
+.panel-default {
+	border-color: #ddd
+}
+
+.panel-default>.panel-heading {
+	color: #333;
+	background-color: #f5f5f5;
+	border-color: #ddd
+}
+
+.panel-default>.panel-heading+.panel-collapse>.panel-body {
+	border-top-color: #ddd
+}
+
+.panel-default>.panel-heading .badge {
+	color: #f5f5f5;
+	background-color: #333
+}
+
+.panel-default>.panel-footer+.panel-collapse>.panel-body {
+	border-bottom-color: #ddd
+}
+
+.panel-primary {
+	border-color: #ff5e5f
+}
+
+.panel-primary>.panel-heading {
+	color: #fff;
+	background-color: #ff5e5f;
+	border-color: #ff5e5f
+}
+
+.panel-primary>.panel-heading+.panel-collapse>.panel-body {
+	border-top-color: #ff5e5f
+}
+
+.panel-primary>.panel-heading .badge {
+	color: #ff5e5f;
+	background-color: #fff
+}
+
+.panel-primary>.panel-footer+.panel-collapse>.panel-body {
+	border-bottom-color: #ff5e5f
+}
+
+.panel-success {
+	border-color: #d6e9c6
+}
+
+.panel-success>.panel-heading {
+	color: #3c763d;
+	background-color: #dff0d8;
+	border-color: #d6e9c6
+}
+
+.panel-success>.panel-heading+.panel-collapse>.panel-body {
+	border-top-color: #d6e9c6
+}
+
+.panel-success>.panel-heading .badge {
+	color: #dff0d8;
+	background-color: #3c763d
+}
+
+.panel-success>.panel-footer+.panel-collapse>.panel-body {
+	border-bottom-color: #d6e9c6
+}
+
+.panel-info {
+	border-color: #bce8f1
+}
+
+.panel-info>.panel-heading {
+	color: #31708f;
+	background-color: #d9edf7;
+	border-color: #bce8f1
+}
+
+.panel-info>.panel-heading+.panel-collapse>.panel-body {
+	border-top-color: #bce8f1
+}
+
+.panel-info>.panel-heading .badge {
+	color: #d9edf7;
+	background-color: #31708f
+}
+
+.panel-info>.panel-footer+.panel-collapse>.panel-body {
+	border-bottom-color: #bce8f1
+}
+
+.panel-warning {
+	border-color: #faebcc
+}
+
+.panel-warning>.panel-heading {
+	color: #8a6d3b;
+	background-color: #fcf8e3;
+	border-color: #faebcc
+}
+
+.panel-warning>.panel-heading+.panel-collapse>.panel-body {
+	border-top-color: #faebcc
+}
+
+.panel-warning>.panel-heading .badge {
+	color: #fcf8e3;
+	background-color: #8a6d3b
+}
+
+.panel-warning>.panel-footer+.panel-collapse>.panel-body {
+	border-bottom-color: #faebcc
+}
+
+.panel-danger {
+	border-color: #ebccd1
+}
+
+.panel-danger>.panel-heading {
+	color: #a94442;
+	background-color: #f2dede;
+	border-color: #ebccd1
+}
+
+.panel-danger>.panel-heading+.panel-collapse>.panel-body {
+	border-top-color: #ebccd1
+}
+
+.panel-danger>.panel-heading .badge {
+	color: #f2dede;
+	background-color: #a94442
+}
+
+.panel-danger>.panel-footer+.panel-collapse>.panel-body {
+	border-bottom-color: #ebccd1
+}
+
+.embed-responsive {
+	position: relative;
+	display: block;
+	height: 0;
+	padding: 0;
+	overflow: hidden
+}
+
+.embed-responsive .embed-responsive-item,
+.embed-responsive embed,
+.embed-responsive iframe,
+.embed-responsive object,
+.embed-responsive video {
+	position: absolute;
+	top: 0;
+	bottom: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	border: 0
+}
+
+.embed-responsive-16by9 {
+	padding-bottom: 56.25%
+}
+
+.embed-responsive-4by3 {
+	padding-bottom: 75%
+}
+
+.well {
+	min-height: 20px;
+	padding: 19px;
+	margin-bottom: 20px;
+	background-color: #f5f5f5;
+	border: 1px solid #e3e3e3;
+	border-radius: 4px;
+	-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05);
+	box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05)
+}
+
+.well blockquote {
+	border-color: #ddd;
+	border-color: rgba(0, 0, 0, .15)
+}
+
+.well-lg {
+	padding: 24px;
+	border-radius: 6px
+}
+
+.well-sm {
+	padding: 9px;
+	border-radius: 3px
+}
+
+.close {
+	float: right;
+	font-size: 21px;
+	font-weight: 700;
+	line-height: 1;
+	color: #000;
+	text-shadow: 0 1px 0 #fff;
+	filter: alpha(opacity=20);
+	opacity: .2
+}
+
+.close:focus,
+.close:hover {
+	color: #000;
+	text-decoration: none;
+	cursor: pointer;
+	filter: alpha(opacity=50);
+	opacity: .5
+}
+
+button.close {
+	-webkit-appearance: none;
+	padding: 0;
+	cursor: pointer;
+	background: 0 0;
+	border: 0
+}
+
+.modal-open {
+	overflow: hidden
+}
+
+.modal {
+	position: fixed;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	left: 0;
+	z-index: 1050;
+	display: none;
+	overflow: hidden;
+	-webkit-overflow-scrolling: touch;
+	outline: 0
+}
+
+.modal.fade .modal-dialog {
+	-webkit-transition: -webkit-transform .3s ease-out;
+	-o-transition: -o-transform .3s ease-out;
+	transition: transform .3s ease-out;
+	-webkit-transform: translate(0, -25%);
+	-ms-transform: translate(0, -25%);
+	-o-transform: translate(0, -25%);
+	transform: translate(0, -25%)
+}
+
+.modal.in .modal-dialog {
+	-webkit-transform: translate(0, 0);
+	-ms-transform: translate(0, 0);
+	-o-transform: translate(0, 0);
+	transform: translate(0, 0)
+}
+
+.modal-open .modal {
+	overflow-x: hidden;
+	overflow-y: auto
+}
+
+.modal-dialog {
+	position: relative;
+	width: auto;
+	margin: 10px
+}
+
+.modal-content {
+	position: relative;
+	background-color: #fff;
+	-webkit-background-clip: padding-box;
+	background-clip: padding-box;
+	border: 1px solid #999;
+	border: 1px solid rgba(0, 0, 0, .2);
+	border-radius: 6px;
+	outline: 0;
+	-webkit-box-shadow: 0 3px 9px rgba(0, 0, 0, .5);
+	box-shadow: 0 3px 9px rgba(0, 0, 0, .5)
+}
+
+.modal-backdrop {
+	position: fixed;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	left: 0;
+	z-index: 1040;
+	background-color: #000
+}
+
+.modal-backdrop.fade {
+	filter: alpha(opacity=0);
+	opacity: 0
+}
+
+.modal-backdrop.in {
+	filter: alpha(opacity=50);
+	opacity: .5
+}
+
+.modal-header {
+	padding: 15px;
+	border-bottom: 1px solid #e5e5e5
+}
+
+.modal-header .close {
+	margin-top: -2px
+}
+
+.modal-title {
+	margin: 0;
+	line-height: 1.42857143
+}
+
+.modal-body {
+	position: relative;
+	padding: 15px
+}
+
+.modal-footer {
+	padding: 15px;
+	text-align: right;
+	border-top: 1px solid #e5e5e5
+}
+
+.modal-footer .btn+.btn {
+	margin-bottom: 0;
+	margin-left: 5px
+}
+
+.modal-footer .btn-group .btn+.btn {
+	margin-left: -1px
+}
+
+.modal-footer .btn-block+.btn-block {
+	margin-left: 0
+}
+
+.modal-scrollbar-measure {
+	position: absolute;
+	top: -9999px;
+	width: 50px;
+	height: 50px;
+	overflow: scroll
+}
+
+@media (min-width:768px) {
+	.modal-dialog {
+		width: 600px;
+		margin: 30px auto
+	}
+	.modal-content {
+		-webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, .5);
+		box-shadow: 0 5px 15px rgba(0, 0, 0, .5)
+	}
+	.modal-sm {
+		width: 300px
+	}
+}
+
+@media (min-width:992px) {
+	.modal-lg {
+		width: 900px
+	}
+}
+
+.tooltip {
+	position: absolute;
+	z-index: 1070;
+	display: block;
+	font-family: "Helvetica Neue", Helvetica, Tahoma, Arial, 'Microsoft Yahei', 'Hiragino Sans GB', 'WenQuanYi Micro Hei', sans-serif;
+	font-size: 12px;
+	font-style: normal;
+	font-weight: 400;
+	line-height: 1.42857143;
+	text-align: left;
+	text-align: start;
+	text-decoration: none;
+	text-shadow: none;
+	text-transform: none;
+	letter-spacing: normal;
+	word-break: normal;
+	word-spacing: normal;
+	word-wrap: normal;
+	white-space: normal;
+	filter: alpha(opacity=0);
+	opacity: 0;
+	line-break: auto
+}
+
+.tooltip.in {
+	filter: alpha(opacity=90);
+	opacity: .9
+}
+
+.tooltip.top {
+	padding: 5px 0;
+	margin-top: -3px
+}
+
+.tooltip.right {
+	padding: 0 5px;
+	margin-left: 3px
+}
+
+.tooltip.bottom {
+	padding: 5px 0;
+	margin-top: 3px
+}
+
+.tooltip.left {
+	padding: 0 5px;
+	margin-left: -3px
+}
+
+.tooltip-inner {
+	max-width: 200px;
+	padding: 3px 8px;
+	color: #fff;
+	text-align: center;
+	background-color: #000;
+	border-radius: 4px
+}
+
+.tooltip-arrow {
+	position: absolute;
+	width: 0;
+	height: 0;
+	border-color: transparent;
+	border-style: solid
+}
+
+.tooltip.top .tooltip-arrow {
+	bottom: 0;
+	left: 50%;
+	margin-left: -5px;
+	border-width: 5px 5px 0;
+	border-top-color: #000
+}
+
+.tooltip.top-left .tooltip-arrow {
+	right: 5px;
+	bottom: 0;
+	margin-bottom: -5px;
+	border-width: 5px 5px 0;
+	border-top-color: #000
+}
+
+.tooltip.top-right .tooltip-arrow {
+	bottom: 0;
+	left: 5px;
+	margin-bottom: -5px;
+	border-width: 5px 5px 0;
+	border-top-color: #000
+}
+
+.tooltip.right .tooltip-arrow {
+	top: 50%;
+	left: 0;
+	margin-top: -5px;
+	border-width: 5px 5px 5px 0;
+	border-right-color: #000
+}
+
+.tooltip.left .tooltip-arrow {
+	top: 50%;
+	right: 0;
+	margin-top: -5px;
+	border-width: 5px 0 5px 5px;
+	border-left-color: #000
+}
+
+.tooltip.bottom .tooltip-arrow {
+	top: 0;
+	left: 50%;
+	margin-left: -5px;
+	border-width: 0 5px 5px;
+	border-bottom-color: #000
+}
+
+.tooltip.bottom-left .tooltip-arrow {
+	top: 0;
+	right: 5px;
+	margin-top: -5px;
+	border-width: 0 5px 5px;
+	border-bottom-color: #000
+}
+
+.tooltip.bottom-right .tooltip-arrow {
+	top: 0;
+	left: 5px;
+	margin-top: -5px;
+	border-width: 0 5px 5px;
+	border-bottom-color: #000
+}
+
+.popover {
+	position: absolute;
+	top: 0;
+	left: 0;
+	z-index: 1060;
+	display: none;
+	max-width: 276px;
+	padding: 1px;
+	font-family: "Helvetica Neue", Helvetica, Tahoma, Arial, 'Microsoft Yahei', 'Hiragino Sans GB', 'WenQuanYi Micro Hei', sans-serif;
+	font-size: 14px;
+	font-style: normal;
+	font-weight: 400;
+	line-height: 1.42857143;
+	text-align: left;
+	text-align: start;
+	text-decoration: none;
+	text-shadow: none;
+	text-transform: none;
+	letter-spacing: normal;
+	word-break: normal;
+	word-spacing: normal;
+	word-wrap: normal;
+	white-space: normal;
+	background-color: #fff;
+	-webkit-background-clip: padding-box;
+	background-clip: padding-box;
+	border: 1px solid #ccc;
+	border: 1px solid rgba(0, 0, 0, .2);
+	border-radius: 6px;
+	-webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, .2);
+	box-shadow: 0 5px 10px rgba(0, 0, 0, .2);
+	line-break: auto
+}
+
+.popover.top {
+	margin-top: -10px
+}
+
+.popover.right {
+	margin-left: 10px
+}
+
+.popover.bottom {
+	margin-top: 10px
+}
+
+.popover.left {
+	margin-left: -10px
+}
+
+.popover-title {
+	padding: 8px 14px;
+	margin: 0;
+	font-size: 14px;
+	background-color: #f7f7f7;
+	border-bottom: 1px solid #ebebeb;
+	border-radius: 5px 5px 0 0
+}
+
+.popover-content {
+	padding: 9px 14px
+}
+
+.popover>.arrow,
+.popover>.arrow:after {
+	position: absolute;
+	display: block;
+	width: 0;
+	height: 0;
+	border-color: transparent;
+	border-style: solid
+}
+
+.popover>.arrow {
+	border-width: 11px
+}
+
+.popover>.arrow:after {
+	content: "";
+	border-width: 10px
+}
+
+.popover.top>.arrow {
+	bottom: -11px;
+	left: 50%;
+	margin-left: -11px;
+	border-top-color: #999;
+	border-top-color: rgba(0, 0, 0, .25);
+	border-bottom-width: 0
+}
+
+.popover.top>.arrow:after {
+	bottom: 1px;
+	margin-left: -10px;
+	content: " ";
+	border-top-color: #fff;
+	border-bottom-width: 0
+}
+
+.popover.right>.arrow {
+	top: 50%;
+	left: -11px;
+	margin-top: -11px;
+	border-right-color: #999;
+	border-right-color: rgba(0, 0, 0, .25);
+	border-left-width: 0
+}
+
+.popover.right>.arrow:after {
+	bottom: -10px;
+	left: 1px;
+	content: " ";
+	border-right-color: #fff;
+	border-left-width: 0
+}
+
+.popover.bottom>.arrow {
+	top: -11px;
+	left: 50%;
+	margin-left: -11px;
+	border-top-width: 0;
+	border-bottom-color: #999;
+	border-bottom-color: rgba(0, 0, 0, .25)
+}
+
+.popover.bottom>.arrow:after {
+	top: 1px;
+	margin-left: -10px;
+	content: " ";
+	border-top-width: 0;
+	border-bottom-color: #fff
+}
+
+.popover.left>.arrow {
+	top: 50%;
+	right: -11px;
+	margin-top: -11px;
+	border-right-width: 0;
+	border-left-color: #999;
+	border-left-color: rgba(0, 0, 0, .25)
+}
+
+.popover.left>.arrow:after {
+	right: 1px;
+	bottom: -10px;
+	content: " ";
+	border-right-width: 0;
+	border-left-color: #fff
+}
+
+.carousel {
+	position: relative
+}
+
+.carousel-inner {
+	position: relative;
+	width: 100%;
+	overflow: hidden
+}
+
+.carousel-inner>.item {
+	position: relative;
+	display: none;
+	-webkit-transition: .6s ease-in-out left;
+	-o-transition: .6s ease-in-out left;
+	transition: .6s ease-in-out left
+}
+
+.carousel-inner>.item>a>img,
+.carousel-inner>.item>img {
+	line-height: 1
+}
+
+@media all and (transform-3d),
+(-webkit-transform-3d) {
+	.carousel-inner>.item {
+		-webkit-transition: -webkit-transform .6s ease-in-out;
+		-o-transition: -o-transform .6s ease-in-out;
+		transition: transform .6s ease-in-out;
+		-webkit-backface-visibility: hidden;
+		backface-visibility: hidden;
+		-webkit-perspective: 1000px;
+		perspective: 1000px
+	}
+	.carousel-inner>.item.active.right,
+	.carousel-inner>.item.next {
+		left: 0;
+		-webkit-transform: translate3d(100%, 0, 0);
+		transform: translate3d(100%, 0, 0)
+	}
+	.carousel-inner>.item.active.left,
+	.carousel-inner>.item.prev {
+		left: 0;
+		-webkit-transform: translate3d(-100%, 0, 0);
+		transform: translate3d(-100%, 0, 0)
+	}
+	.carousel-inner>.item.active,
+	.carousel-inner>.item.next.left,
+	.carousel-inner>.item.prev.right {
+		left: 0;
+		-webkit-transform: translate3d(0, 0, 0);
+		transform: translate3d(0, 0, 0)
+	}
+}
+
+.carousel-inner>.active,
+.carousel-inner>.next,
+.carousel-inner>.prev {
+	display: block
+}
+
+.carousel-inner>.active {
+	left: 0
+}
+
+.carousel-inner>.next,
+.carousel-inner>.prev {
+	position: absolute;
+	top: 0;
+	width: 100%
+}
+
+.carousel-inner>.next {
+	left: 100%
+}
+
+.carousel-inner>.prev {
+	left: -100%
+}
+
+.carousel-inner>.next.left,
+.carousel-inner>.prev.right {
+	left: 0
+}
+
+.carousel-inner>.active.left {
+	left: -100%
+}
+
+.carousel-inner>.active.right {
+	left: 100%
+}
+
+.carousel-control {
+	position: absolute;
+	top: 0;
+	bottom: 0;
+	left: 0;
+	width: 15%;
+	font-size: 20px;
+	color: #fff;
+	text-align: center;
+	text-shadow: 0 1px 2px rgba(0, 0, 0, .6);
+	background-color: rgba(0, 0, 0, 0);
+	filter: alpha(opacity=50);
+	opacity: .5
+}
+
+.carousel-control.left {
+	background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, .5) 0, rgba(0, 0, 0, .0001) 100%);
+	background-image: -o-linear-gradient(left, rgba(0, 0, 0, .5) 0, rgba(0, 0, 0, .0001) 100%);
+	background-image: -webkit-gradient(linear, left top, right top, from(rgba(0, 0, 0, .5)), to(rgba(0, 0, 0, .0001)));
+	background-image: linear-gradient(to right, rgba(0, 0, 0, .5) 0, rgba(0, 0, 0, .0001) 100%);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1);
+	background-repeat: repeat-x
+}
+
+.carousel-control.right {
+	right: 0;
+	left: auto;
+	background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, .0001) 0, rgba(0, 0, 0, .5) 100%);
+	background-image: -o-linear-gradient(left, rgba(0, 0, 0, .0001) 0, rgba(0, 0, 0, .5) 100%);
+	background-image: -webkit-gradient(linear, left top, right top, from(rgba(0, 0, 0, .0001)), to(rgba(0, 0, 0, .5)));
+	background-image: linear-gradient(to right, rgba(0, 0, 0, .0001) 0, rgba(0, 0, 0, .5) 100%);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1);
+	background-repeat: repeat-x
+}
+
+.carousel-control:focus,
+.carousel-control:hover {
+	color: #fff;
+	text-decoration: none;
+	filter: alpha(opacity=90);
+	outline: 0;
+	opacity: .9
+}
+
+.carousel-control .glyphicon-chevron-left,
+.carousel-control .glyphicon-chevron-right,
+.carousel-control .icon-next,
+.carousel-control .icon-prev {
+	position: absolute;
+	top: 50%;
+	z-index: 5;
+	display: inline-block;
+	margin-top: -10px
+}
+
+.carousel-control .glyphicon-chevron-left,
+.carousel-control .icon-prev {
+	left: 50%;
+	margin-left: -10px
+}
+
+.carousel-control .glyphicon-chevron-right,
+.carousel-control .icon-next {
+	right: 50%;
+	margin-right: -10px
+}
+
+.carousel-control .icon-next,
+.carousel-control .icon-prev {
+	width: 20px;
+	height: 20px;
+	font-family: serif;
+	line-height: 1
+}
+
+.carousel-control .icon-prev:before {
+	content: '\2039'
+}
+
+.carousel-control .icon-next:before {
+	content: '\203a'
+}
+
+.carousel-indicators {
+	position: absolute;
+	bottom: 10px;
+	left: 50%;
+	z-index: 15;
+	width: 60%;
+	padding-left: 0;
+	margin-left: -30%;
+	text-align: center;
+	list-style: none
+}
+
+.carousel-indicators li {
+	display: inline-block;
+	width: 10px;
+	height: 10px;
+	margin: 1px;
+	text-indent: -999px;
+	cursor: pointer;
+	background-color: #000\9;
+	background-color: rgba(0, 0, 0, 0);
+	border: 1px solid #fff;
+	border-radius: 10px
+}
+
+.carousel-indicators .active {
+	width: 12px;
+	height: 12px;
+	margin: 0;
+	background-color: #fff
+}
+
+.carousel-caption {
+	position: absolute;
+	right: 15%;
+	bottom: 20px;
+	left: 15%;
+	z-index: 10;
+	padding-top: 20px;
+	padding-bottom: 20px;
+	color: #fff;
+	text-align: center;
+	text-shadow: 0 1px 2px rgba(0, 0, 0, .6)
+}
+
+.carousel-caption .btn {
+	text-shadow: none
+}
+
+@media screen and (min-width:768px) {
+	.carousel-control .glyphicon-chevron-left,
+	.carousel-control .glyphicon-chevron-right,
+	.carousel-control .icon-next,
+	.carousel-control .icon-prev {
+		width: 30px;
+		height: 30px;
+		margin-top: -10px;
+		font-size: 30px
+	}
+	.carousel-control .glyphicon-chevron-left,
+	.carousel-control .icon-prev {
+		margin-left: -10px
+	}
+	.carousel-control .glyphicon-chevron-right,
+	.carousel-control .icon-next {
+		margin-right: -10px
+	}
+	.carousel-caption {
+		right: 20%;
+		left: 20%;
+		padding-bottom: 30px
+	}
+	.carousel-indicators {
+		bottom: 20px
+	}
+}
+
+.btn-group-vertical>.btn-group:after,
+.btn-group-vertical>.btn-group:before,
+.btn-toolbar:after,
+.btn-toolbar:before,
+.clearfix:after,
+.clearfix:before,
+.container-fluid:after,
+.container-fluid:before,
+.container:after,
+.container:before,
+.dl-horizontal dd:after,
+.dl-horizontal dd:before,
+.form-horizontal .form-group:after,
+.form-horizontal .form-group:before,
+.modal-footer:after,
+.modal-footer:before,
+.modal-header:after,
+.modal-header:before,
+.nav:after,
+.nav:before,
+.navbar-collapse:after,
+.navbar-collapse:before,
+.navbar-header:after,
+.navbar-header:before,
+.navbar:after,
+.navbar:before,
+.pager:after,
+.pager:before,
+.panel-body:after,
+.panel-body:before,
+.row:after,
+.row:before {
+	display: table;
+	content: " "
+}
+
+.btn-group-vertical>.btn-group:after,
+.btn-toolbar:after,
+.clearfix:after,
+.container-fluid:after,
+.container:after,
+.dl-horizontal dd:after,
+.form-horizontal .form-group:after,
+.modal-footer:after,
+.modal-header:after,
+.nav:after,
+.navbar-collapse:after,
+.navbar-header:after,
+.navbar:after,
+.pager:after,
+.panel-body:after,
+.row:after {
+	clear: both
+}
+
+.center-block {
+	display: block;
+	margin-right: auto;
+	margin-left: auto
+}
+
+.pull-right {
+	float: right!important
+}
+
+.pull-left {
+	float: left!important
+}
+
+.hide {
+	display: none!important
+}
+
+.show {
+	display: block!important
+}
+
+.invisible {
+	visibility: hidden
+}
+
+.text-hide {
+	font: 0/0 a;
+	color: transparent;
+	text-shadow: none;
+	background-color: transparent;
+	border: 0
+}
+
+.hidden {
+	display: none!important
+}
+
+.affix {
+	position: fixed
+}
+
+@-ms-viewport {
+	width: device-width
+}
+
+.visible-lg,
+.visible-md,
+.visible-sm,
+.visible-xs {
+	display: none!important
+}
+
+.visible-lg-block,
+.visible-lg-inline,
+.visible-lg-inline-block,
+.visible-md-block,
+.visible-md-inline,
+.visible-md-inline-block,
+.visible-sm-block,
+.visible-sm-inline,
+.visible-sm-inline-block,
+.visible-xs-block,
+.visible-xs-inline,
+.visible-xs-inline-block {
+	display: none!important
+}
+
+@media (max-width:767px) {
+	.visible-xs {
+		display: block!important
+	}
+	table.visible-xs {
+		display: table!important
+	}
+	tr.visible-xs {
+		display: table-row!important
+	}
+	td.visible-xs,
+	th.visible-xs {
+		display: table-cell!important
+	}
+}
+
+@media (max-width:767px) {
+	.visible-xs-block {
+		display: block!important
+	}
+}
+
+@media (max-width:767px) {
+	.visible-xs-inline {
+		display: inline!important
+	}
+}
+
+@media (max-width:767px) {
+	.visible-xs-inline-block {
+		display: inline-block!important
+	}
+}
+
+@media (min-width:768px) and (max-width:991px) {
+	.visible-sm {
+		display: block!important
+	}
+	table.visible-sm {
+		display: table!important
+	}
+	tr.visible-sm {
+		display: table-row!important
+	}
+	td.visible-sm,
+	th.visible-sm {
+		display: table-cell!important
+	}
+}
+
+@media (min-width:768px) and (max-width:991px) {
+	.visible-sm-block {
+		display: block!important
+	}
+}
+
+@media (min-width:768px) and (max-width:991px) {
+	.visible-sm-inline {
+		display: inline!important
+	}
+}
+
+@media (min-width:768px) and (max-width:991px) {
+	.visible-sm-inline-block {
+		display: inline-block!important
+	}
+}
+
+@media (min-width:992px) and (max-width:1199px) {
+	.visible-md {
+		display: block!important
+	}
+	table.visible-md {
+		display: table!important
+	}
+	tr.visible-md {
+		display: table-row!important
+	}
+	td.visible-md,
+	th.visible-md {
+		display: table-cell!important
+	}
+}
+
+@media (min-width:992px) and (max-width:1199px) {
+	.visible-md-block {
+		display: block!important
+	}
+}
+
+@media (min-width:992px) and (max-width:1199px) {
+	.visible-md-inline {
+		display: inline!important
+	}
+}
+
+@media (min-width:992px) and (max-width:1199px) {
+	.visible-md-inline-block {
+		display: inline-block!important
+	}
+}
+
+@media (min-width:1200px) {
+	.visible-lg {
+		display: block!important
+	}
+	table.visible-lg {
+		display: table!important
+	}
+	tr.visible-lg {
+		display: table-row!important
+	}
+	td.visible-lg,
+	th.visible-lg {
+		display: table-cell!important
+	}
+}
+
+@media (min-width:1200px) {
+	.visible-lg-block {
+		display: block!important
+	}
+}
+
+@media (min-width:1200px) {
+	.visible-lg-inline {
+		display: inline!important
+	}
+}
+
+@media (min-width:1200px) {
+	.visible-lg-inline-block {
+		display: inline-block!important
+	}
+}
+
+@media (max-width:767px) {
+	.hidden-xs {
+		display: none!important
+	}
+}
+
+@media (min-width:768px) and (max-width:991px) {
+	.hidden-sm {
+		display: none!important
+	}
+}
+
+@media (min-width:992px) and (max-width:1199px) {
+	.hidden-md {
+		display: none!important
+	}
+}
+
+@media (min-width:1200px) {
+	.hidden-lg {
+		display: none!important
+	}
+}
+
+.visible-print {
+	display: none!important
+}
+
+@media print {
+	.visible-print {
+		display: block!important
+	}
+	table.visible-print {
+		display: table!important
+	}
+	tr.visible-print {
+		display: table-row!important
+	}
+	td.visible-print,
+	th.visible-print {
+		display: table-cell!important
+	}
+}
+
+.visible-print-block {
+	display: none!important
+}
+
+@media print {
+	.visible-print-block {
+		display: block!important
+	}
+}
+
+.visible-print-inline {
+	display: none!important
+}
+
+@media print {
+	.visible-print-inline {
+		display: inline!important
+	}
+}
+
+.visible-print-inline-block {
+	display: none!important
+}
+
+@media print {
+	.visible-print-inline-block {
+		display: inline-block!important
+	}
+}
+
+@media print {
+	.hidden-print {
+		display: none!important
+	}
+}
+
+.dropdown-menu-lg {
+	width: 230px
+}
+
+.dropdown-menu-lg li {
+	overflow: hidden;
+}
+
+.btn.blue {
+	background: #007BFF;
+	color: #fff;
+}
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/css/code.css b/pluss-manage-page/src/main/resources/static/resources/css/code.css
new file mode 100644
index 0000000..9143a25
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/css/code.css
@@ -0,0 +1,2 @@
+/** layui-v2.5.6 MIT License By https://www.layui.com */
+ html #layuicss-skincodecss{display:none;position:absolute;width:1989px}.layui-code-h3,.layui-code-view{position:relative;font-size:12px}.layui-code-view{display:block;margin:10px 0;padding:0;border:1px solid #e2e2e2;border-left-width:6px;background-color:#F2F2F2;color:#333;font-family:Courier New}.layui-code-h3{padding:0 10px;height:32px;line-height:32px;border-bottom:1px solid #e2e2e2}.layui-code-h3 a{position:absolute;right:10px;top:0;color:#999}.layui-code-view .layui-code-ol{position:relative;overflow:auto}.layui-code-view .layui-code-ol li{position:relative;margin-left:45px;line-height:20px;padding:0 5px;border-left:1px solid #e2e2e2;list-style-type:decimal-leading-zero;*list-style-type:decimal;background-color:#fff}.layui-code-view pre{margin:0}.layui-code-notepad{border:1px solid #0C0C0C;border-left-color:#3F3F3F;background-color:#0C0C0C;color:#C2BE9E}.layui-code-notepad .layui-code-h3{border-bottom:none}.layui-code-notepad .layui-code-ol li{background-color:#3F3F3F;border-left:none}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/css/font-awesome.min.css b/pluss-manage-page/src/main/resources/static/resources/css/font-awesome.min.css
new file mode 100644
index 0000000..540440c
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/css/font-awesome.min.css
@@ -0,0 +1,4 @@
+/*!
+ *  Font Awesome 4.7.0 by @davegandy - http://fontawesome.io - @fontawesome
+ *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
+ */@font-face{font-family:'FontAwesome';src:url('../fonts/fontawesome-webfont.eot?v=4.7.0');src:url('../fonts/fontawesome-webfont.eot?#iefix&v=4.7.0') format('embedded-opentype'),url('../fonts/fontawesome-webfont.woff2?v=4.7.0') format('woff2'),url('../fonts/fontawesome-webfont.woff?v=4.7.0') format('woff'),url('../fonts/fontawesome-webfont.ttf?v=4.7.0') format('truetype'),url('../fonts/fontawesome-webfont.svg?v=4.7.0#fontawesomeregular') format('svg');font-weight:normal;font-style:normal}.fa{display:inline-block;font:normal normal normal 14px/1 FontAwesome;font-size:inherit;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fa-lg{font-size:1.33333333em;line-height:.75em;vertical-align:-15%}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-fw{width:1.28571429em;text-align:center}.fa-ul{padding-left:0;margin-left:2.14285714em;list-style-type:none}.fa-ul>li{position:relative}.fa-li{position:absolute;left:-2.14285714em;width:2.14285714em;top:.14285714em;text-align:center}.fa-li.fa-lg{left:-1.85714286em}.fa-border{padding:.2em .25em .15em;border:solid .08em #eee;border-radius:.1em}.fa-pull-left{float:left}.fa-pull-right{float:right}.fa.fa-pull-left{margin-right:.3em}.fa.fa-pull-right{margin-left:.3em}.pull-right{float:right}.pull-left{float:left}.fa.pull-left{margin-right:.3em}.fa.pull-right{margin-left:.3em}.fa-spin{-webkit-animation:fa-spin 2s infinite linear;animation:fa-spin 2s infinite linear}.fa-pulse{-webkit-animation:fa-spin 1s infinite steps(8);animation:fa-spin 1s infinite steps(8)}@-webkit-keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}.fa-rotate-90{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=1)";-webkit-transform:rotate(90deg);-ms-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2)";-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=3)";-webkit-transform:rotate(270deg);-ms-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)";-webkit-transform:scale(-1, 1);-ms-transform:scale(-1, 1);transform:scale(-1, 1)}.fa-flip-vertical{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)";-webkit-transform:scale(1, -1);-ms-transform:scale(1, -1);transform:scale(1, -1)}:root .fa-rotate-90,:root .fa-rotate-180,:root .fa-rotate-270,:root .fa-flip-horizontal,:root .fa-flip-vertical{filter:none}.fa-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:middle}.fa-stack-1x,.fa-stack-2x{position:absolute;left:0;width:100%;text-align:center}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-glass:before{content:"\f000"}.fa-music:before{content:"\f001"}.fa-search:before{content:"\f002"}.fa-envelope-o:before{content:"\f003"}.fa-heart:before{content:"\f004"}.fa-star:before{content:"\f005"}.fa-star-o:before{content:"\f006"}.fa-user:before{content:"\f007"}.fa-film:before{content:"\f008"}.fa-th-large:before{content:"\f009"}.fa-th:before{content:"\f00a"}.fa-th-list:before{content:"\f00b"}.fa-check:before{content:"\f00c"}.fa-remove:before,.fa-close:before,.fa-times:before{content:"\f00d"}.fa-search-plus:before{content:"\f00e"}.fa-search-minus:before{content:"\f010"}.fa-power-off:before{content:"\f011"}.fa-signal:before{content:"\f012"}.fa-gear:before,.fa-cog:before{content:"\f013"}.fa-trash-o:before{content:"\f014"}.fa-home:before{content:"\f015"}.fa-file-o:before{content:"\f016"}.fa-clock-o:before{content:"\f017"}.fa-road:before{content:"\f018"}.fa-download:before{content:"\f019"}.fa-arrow-circle-o-down:before{content:"\f01a"}.fa-arrow-circle-o-up:before{content:"\f01b"}.fa-inbox:before{content:"\f01c"}.fa-play-circle-o:before{content:"\f01d"}.fa-rotate-right:before,.fa-repeat:before{content:"\f01e"}.fa-refresh:before{content:"\f021"}.fa-list-alt:before{content:"\f022"}.fa-lock:before{content:"\f023"}.fa-flag:before{content:"\f024"}.fa-headphones:before{content:"\f025"}.fa-volume-off:before{content:"\f026"}.fa-volume-down:before{content:"\f027"}.fa-volume-up:before{content:"\f028"}.fa-qrcode:before{content:"\f029"}.fa-barcode:before{content:"\f02a"}.fa-tag:before{content:"\f02b"}.fa-tags:before{content:"\f02c"}.fa-book:before{content:"\f02d"}.fa-bookmark:before{content:"\f02e"}.fa-print:before{content:"\f02f"}.fa-camera:before{content:"\f030"}.fa-font:before{content:"\f031"}.fa-bold:before{content:"\f032"}.fa-italic:before{content:"\f033"}.fa-text-height:before{content:"\f034"}.fa-text-width:before{content:"\f035"}.fa-align-left:before{content:"\f036"}.fa-align-center:before{content:"\f037"}.fa-align-right:before{content:"\f038"}.fa-align-justify:before{content:"\f039"}.fa-list:before{content:"\f03a"}.fa-dedent:before,.fa-outdent:before{content:"\f03b"}.fa-indent:before{content:"\f03c"}.fa-video-camera:before{content:"\f03d"}.fa-photo:before,.fa-image:before,.fa-picture-o:before{content:"\f03e"}.fa-pencil:before{content:"\f040"}.fa-map-marker:before{content:"\f041"}.fa-adjust:before{content:"\f042"}.fa-tint:before{content:"\f043"}.fa-edit:before,.fa-pencil-square-o:before{content:"\f044"}.fa-share-square-o:before{content:"\f045"}.fa-check-square-o:before{content:"\f046"}.fa-arrows:before{content:"\f047"}.fa-step-backward:before{content:"\f048"}.fa-fast-backward:before{content:"\f049"}.fa-backward:before{content:"\f04a"}.fa-play:before{content:"\f04b"}.fa-pause:before{content:"\f04c"}.fa-stop:before{content:"\f04d"}.fa-forward:before{content:"\f04e"}.fa-fast-forward:before{content:"\f050"}.fa-step-forward:before{content:"\f051"}.fa-eject:before{content:"\f052"}.fa-chevron-left:before{content:"\f053"}.fa-chevron-right:before{content:"\f054"}.fa-plus-circle:before{content:"\f055"}.fa-minus-circle:before{content:"\f056"}.fa-times-circle:before{content:"\f057"}.fa-check-circle:before{content:"\f058"}.fa-question-circle:before{content:"\f059"}.fa-info-circle:before{content:"\f05a"}.fa-crosshairs:before{content:"\f05b"}.fa-times-circle-o:before{content:"\f05c"}.fa-check-circle-o:before{content:"\f05d"}.fa-ban:before{content:"\f05e"}.fa-arrow-left:before{content:"\f060"}.fa-arrow-right:before{content:"\f061"}.fa-arrow-up:before{content:"\f062"}.fa-arrow-down:before{content:"\f063"}.fa-mail-forward:before,.fa-share:before{content:"\f064"}.fa-expand:before{content:"\f065"}.fa-compress:before{content:"\f066"}.fa-plus:before{content:"\f067"}.fa-minus:before{content:"\f068"}.fa-asterisk:before{content:"\f069"}.fa-exclamation-circle:before{content:"\f06a"}.fa-gift:before{content:"\f06b"}.fa-leaf:before{content:"\f06c"}.fa-fire:before{content:"\f06d"}.fa-eye:before{content:"\f06e"}.fa-eye-slash:before{content:"\f070"}.fa-warning:before,.fa-exclamation-triangle:before{content:"\f071"}.fa-plane:before{content:"\f072"}.fa-calendar:before{content:"\f073"}.fa-random:before{content:"\f074"}.fa-comment:before{content:"\f075"}.fa-magnet:before{content:"\f076"}.fa-chevron-up:before{content:"\f077"}.fa-chevron-down:before{content:"\f078"}.fa-retweet:before{content:"\f079"}.fa-shopping-cart:before{content:"\f07a"}.fa-folder:before{content:"\f07b"}.fa-folder-open:before{content:"\f07c"}.fa-arrows-v:before{content:"\f07d"}.fa-arrows-h:before{content:"\f07e"}.fa-bar-chart-o:before,.fa-bar-chart:before{content:"\f080"}.fa-twitter-square:before{content:"\f081"}.fa-facebook-square:before{content:"\f082"}.fa-camera-retro:before{content:"\f083"}.fa-key:before{content:"\f084"}.fa-gears:before,.fa-cogs:before{content:"\f085"}.fa-comments:before{content:"\f086"}.fa-thumbs-o-up:before{content:"\f087"}.fa-thumbs-o-down:before{content:"\f088"}.fa-star-half:before{content:"\f089"}.fa-heart-o:before{content:"\f08a"}.fa-sign-out:before{content:"\f08b"}.fa-linkedin-square:before{content:"\f08c"}.fa-thumb-tack:before{content:"\f08d"}.fa-external-link:before{content:"\f08e"}.fa-sign-in:before{content:"\f090"}.fa-trophy:before{content:"\f091"}.fa-github-square:before{content:"\f092"}.fa-upload:before{content:"\f093"}.fa-lemon-o:before{content:"\f094"}.fa-phone:before{content:"\f095"}.fa-square-o:before{content:"\f096"}.fa-bookmark-o:before{content:"\f097"}.fa-phone-square:before{content:"\f098"}.fa-twitter:before{content:"\f099"}.fa-facebook-f:before,.fa-facebook:before{content:"\f09a"}.fa-github:before{content:"\f09b"}.fa-unlock:before{content:"\f09c"}.fa-credit-card:before{content:"\f09d"}.fa-feed:before,.fa-rss:before{content:"\f09e"}.fa-hdd-o:before{content:"\f0a0"}.fa-bullhorn:before{content:"\f0a1"}.fa-bell:before{content:"\f0f3"}.fa-certificate:before{content:"\f0a3"}.fa-hand-o-right:before{content:"\f0a4"}.fa-hand-o-left:before{content:"\f0a5"}.fa-hand-o-up:before{content:"\f0a6"}.fa-hand-o-down:before{content:"\f0a7"}.fa-arrow-circle-left:before{content:"\f0a8"}.fa-arrow-circle-right:before{content:"\f0a9"}.fa-arrow-circle-up:before{content:"\f0aa"}.fa-arrow-circle-down:before{content:"\f0ab"}.fa-globe:before{content:"\f0ac"}.fa-wrench:before{content:"\f0ad"}.fa-tasks:before{content:"\f0ae"}.fa-filter:before{content:"\f0b0"}.fa-briefcase:before{content:"\f0b1"}.fa-arrows-alt:before{content:"\f0b2"}.fa-group:before,.fa-users:before{content:"\f0c0"}.fa-chain:before,.fa-link:before{content:"\f0c1"}.fa-cloud:before{content:"\f0c2"}.fa-flask:before{content:"\f0c3"}.fa-cut:before,.fa-scissors:before{content:"\f0c4"}.fa-copy:before,.fa-files-o:before{content:"\f0c5"}.fa-paperclip:before{content:"\f0c6"}.fa-save:before,.fa-floppy-o:before{content:"\f0c7"}.fa-square:before{content:"\f0c8"}.fa-navicon:before,.fa-reorder:before,.fa-bars:before{content:"\f0c9"}.fa-list-ul:before{content:"\f0ca"}.fa-list-ol:before{content:"\f0cb"}.fa-strikethrough:before{content:"\f0cc"}.fa-underline:before{content:"\f0cd"}.fa-table:before{content:"\f0ce"}.fa-magic:before{content:"\f0d0"}.fa-truck:before{content:"\f0d1"}.fa-pinterest:before{content:"\f0d2"}.fa-pinterest-square:before{content:"\f0d3"}.fa-google-plus-square:before{content:"\f0d4"}.fa-google-plus:before{content:"\f0d5"}.fa-money:before{content:"\f0d6"}.fa-caret-down:before{content:"\f0d7"}.fa-caret-up:before{content:"\f0d8"}.fa-caret-left:before{content:"\f0d9"}.fa-caret-right:before{content:"\f0da"}.fa-columns:before{content:"\f0db"}.fa-unsorted:before,.fa-sort:before{content:"\f0dc"}.fa-sort-down:before,.fa-sort-desc:before{content:"\f0dd"}.fa-sort-up:before,.fa-sort-asc:before{content:"\f0de"}.fa-envelope:before{content:"\f0e0"}.fa-linkedin:before{content:"\f0e1"}.fa-rotate-left:before,.fa-undo:before{content:"\f0e2"}.fa-legal:before,.fa-gavel:before{content:"\f0e3"}.fa-dashboard:before,.fa-tachometer:before{content:"\f0e4"}.fa-comment-o:before{content:"\f0e5"}.fa-comments-o:before{content:"\f0e6"}.fa-flash:before,.fa-bolt:before{content:"\f0e7"}.fa-sitemap:before{content:"\f0e8"}.fa-umbrella:before{content:"\f0e9"}.fa-paste:before,.fa-clipboard:before{content:"\f0ea"}.fa-lightbulb-o:before{content:"\f0eb"}.fa-exchange:before{content:"\f0ec"}.fa-cloud-download:before{content:"\f0ed"}.fa-cloud-upload:before{content:"\f0ee"}.fa-user-md:before{content:"\f0f0"}.fa-stethoscope:before{content:"\f0f1"}.fa-suitcase:before{content:"\f0f2"}.fa-bell-o:before{content:"\f0a2"}.fa-coffee:before{content:"\f0f4"}.fa-cutlery:before{content:"\f0f5"}.fa-file-text-o:before{content:"\f0f6"}.fa-building-o:before{content:"\f0f7"}.fa-hospital-o:before{content:"\f0f8"}.fa-ambulance:before{content:"\f0f9"}.fa-medkit:before{content:"\f0fa"}.fa-fighter-jet:before{content:"\f0fb"}.fa-beer:before{content:"\f0fc"}.fa-h-square:before{content:"\f0fd"}.fa-plus-square:before{content:"\f0fe"}.fa-angle-double-left:before{content:"\f100"}.fa-angle-double-right:before{content:"\f101"}.fa-angle-double-up:before{content:"\f102"}.fa-angle-double-down:before{content:"\f103"}.fa-angle-left:before{content:"\f104"}.fa-angle-right:before{content:"\f105"}.fa-angle-up:before{content:"\f106"}.fa-angle-down:before{content:"\f107"}.fa-desktop:before{content:"\f108"}.fa-laptop:before{content:"\f109"}.fa-tablet:before{content:"\f10a"}.fa-mobile-phone:before,.fa-mobile:before{content:"\f10b"}.fa-circle-o:before{content:"\f10c"}.fa-quote-left:before{content:"\f10d"}.fa-quote-right:before{content:"\f10e"}.fa-spinner:before{content:"\f110"}.fa-circle:before{content:"\f111"}.fa-mail-reply:before,.fa-reply:before{content:"\f112"}.fa-github-alt:before{content:"\f113"}.fa-folder-o:before{content:"\f114"}.fa-folder-open-o:before{content:"\f115"}.fa-smile-o:before{content:"\f118"}.fa-frown-o:before{content:"\f119"}.fa-meh-o:before{content:"\f11a"}.fa-gamepad:before{content:"\f11b"}.fa-keyboard-o:before{content:"\f11c"}.fa-flag-o:before{content:"\f11d"}.fa-flag-checkered:before{content:"\f11e"}.fa-terminal:before{content:"\f120"}.fa-code:before{content:"\f121"}.fa-mail-reply-all:before,.fa-reply-all:before{content:"\f122"}.fa-star-half-empty:before,.fa-star-half-full:before,.fa-star-half-o:before{content:"\f123"}.fa-location-arrow:before{content:"\f124"}.fa-crop:before{content:"\f125"}.fa-code-fork:before{content:"\f126"}.fa-unlink:before,.fa-chain-broken:before{content:"\f127"}.fa-question:before{content:"\f128"}.fa-info:before{content:"\f129"}.fa-exclamation:before{content:"\f12a"}.fa-superscript:before{content:"\f12b"}.fa-subscript:before{content:"\f12c"}.fa-eraser:before{content:"\f12d"}.fa-puzzle-piece:before{content:"\f12e"}.fa-microphone:before{content:"\f130"}.fa-microphone-slash:before{content:"\f131"}.fa-shield:before{content:"\f132"}.fa-calendar-o:before{content:"\f133"}.fa-fire-extinguisher:before{content:"\f134"}.fa-rocket:before{content:"\f135"}.fa-maxcdn:before{content:"\f136"}.fa-chevron-circle-left:before{content:"\f137"}.fa-chevron-circle-right:before{content:"\f138"}.fa-chevron-circle-up:before{content:"\f139"}.fa-chevron-circle-down:before{content:"\f13a"}.fa-html5:before{content:"\f13b"}.fa-css3:before{content:"\f13c"}.fa-anchor:before{content:"\f13d"}.fa-unlock-alt:before{content:"\f13e"}.fa-bullseye:before{content:"\f140"}.fa-ellipsis-h:before{content:"\f141"}.fa-ellipsis-v:before{content:"\f142"}.fa-rss-square:before{content:"\f143"}.fa-play-circle:before{content:"\f144"}.fa-ticket:before{content:"\f145"}.fa-minus-square:before{content:"\f146"}.fa-minus-square-o:before{content:"\f147"}.fa-level-up:before{content:"\f148"}.fa-level-down:before{content:"\f149"}.fa-check-square:before{content:"\f14a"}.fa-pencil-square:before{content:"\f14b"}.fa-external-link-square:before{content:"\f14c"}.fa-share-square:before{content:"\f14d"}.fa-compass:before{content:"\f14e"}.fa-toggle-down:before,.fa-caret-square-o-down:before{content:"\f150"}.fa-toggle-up:before,.fa-caret-square-o-up:before{content:"\f151"}.fa-toggle-right:before,.fa-caret-square-o-right:before{content:"\f152"}.fa-euro:before,.fa-eur:before{content:"\f153"}.fa-gbp:before{content:"\f154"}.fa-dollar:before,.fa-usd:before{content:"\f155"}.fa-rupee:before,.fa-inr:before{content:"\f156"}.fa-cny:before,.fa-rmb:before,.fa-yen:before,.fa-jpy:before{content:"\f157"}.fa-ruble:before,.fa-rouble:before,.fa-rub:before{content:"\f158"}.fa-won:before,.fa-krw:before{content:"\f159"}.fa-bitcoin:before,.fa-btc:before{content:"\f15a"}.fa-file:before{content:"\f15b"}.fa-file-text:before{content:"\f15c"}.fa-sort-alpha-asc:before{content:"\f15d"}.fa-sort-alpha-desc:before{content:"\f15e"}.fa-sort-amount-asc:before{content:"\f160"}.fa-sort-amount-desc:before{content:"\f161"}.fa-sort-numeric-asc:before{content:"\f162"}.fa-sort-numeric-desc:before{content:"\f163"}.fa-thumbs-up:before{content:"\f164"}.fa-thumbs-down:before{content:"\f165"}.fa-youtube-square:before{content:"\f166"}.fa-youtube:before{content:"\f167"}.fa-xing:before{content:"\f168"}.fa-xing-square:before{content:"\f169"}.fa-youtube-play:before{content:"\f16a"}.fa-dropbox:before{content:"\f16b"}.fa-stack-overflow:before{content:"\f16c"}.fa-instagram:before{content:"\f16d"}.fa-flickr:before{content:"\f16e"}.fa-adn:before{content:"\f170"}.fa-bitbucket:before{content:"\f171"}.fa-bitbucket-square:before{content:"\f172"}.fa-tumblr:before{content:"\f173"}.fa-tumblr-square:before{content:"\f174"}.fa-long-arrow-down:before{content:"\f175"}.fa-long-arrow-up:before{content:"\f176"}.fa-long-arrow-left:before{content:"\f177"}.fa-long-arrow-right:before{content:"\f178"}.fa-apple:before{content:"\f179"}.fa-windows:before{content:"\f17a"}.fa-android:before{content:"\f17b"}.fa-linux:before{content:"\f17c"}.fa-dribbble:before{content:"\f17d"}.fa-skype:before{content:"\f17e"}.fa-foursquare:before{content:"\f180"}.fa-trello:before{content:"\f181"}.fa-female:before{content:"\f182"}.fa-male:before{content:"\f183"}.fa-gittip:before,.fa-gratipay:before{content:"\f184"}.fa-sun-o:before{content:"\f185"}.fa-moon-o:before{content:"\f186"}.fa-archive:before{content:"\f187"}.fa-bug:before{content:"\f188"}.fa-vk:before{content:"\f189"}.fa-weibo:before{content:"\f18a"}.fa-renren:before{content:"\f18b"}.fa-pagelines:before{content:"\f18c"}.fa-stack-exchange:before{content:"\f18d"}.fa-arrow-circle-o-right:before{content:"\f18e"}.fa-arrow-circle-o-left:before{content:"\f190"}.fa-toggle-left:before,.fa-caret-square-o-left:before{content:"\f191"}.fa-dot-circle-o:before{content:"\f192"}.fa-wheelchair:before{content:"\f193"}.fa-vimeo-square:before{content:"\f194"}.fa-turkish-lira:before,.fa-try:before{content:"\f195"}.fa-plus-square-o:before{content:"\f196"}.fa-space-shuttle:before{content:"\f197"}.fa-slack:before{content:"\f198"}.fa-envelope-square:before{content:"\f199"}.fa-wordpress:before{content:"\f19a"}.fa-openid:before{content:"\f19b"}.fa-institution:before,.fa-bank:before,.fa-university:before{content:"\f19c"}.fa-mortar-board:before,.fa-graduation-cap:before{content:"\f19d"}.fa-yahoo:before{content:"\f19e"}.fa-google:before{content:"\f1a0"}.fa-reddit:before{content:"\f1a1"}.fa-reddit-square:before{content:"\f1a2"}.fa-stumbleupon-circle:before{content:"\f1a3"}.fa-stumbleupon:before{content:"\f1a4"}.fa-delicious:before{content:"\f1a5"}.fa-digg:before{content:"\f1a6"}.fa-pied-piper-pp:before{content:"\f1a7"}.fa-pied-piper-alt:before{content:"\f1a8"}.fa-drupal:before{content:"\f1a9"}.fa-joomla:before{content:"\f1aa"}.fa-language:before{content:"\f1ab"}.fa-fax:before{content:"\f1ac"}.fa-building:before{content:"\f1ad"}.fa-child:before{content:"\f1ae"}.fa-paw:before{content:"\f1b0"}.fa-spoon:before{content:"\f1b1"}.fa-cube:before{content:"\f1b2"}.fa-cubes:before{content:"\f1b3"}.fa-behance:before{content:"\f1b4"}.fa-behance-square:before{content:"\f1b5"}.fa-steam:before{content:"\f1b6"}.fa-steam-square:before{content:"\f1b7"}.fa-recycle:before{content:"\f1b8"}.fa-automobile:before,.fa-car:before{content:"\f1b9"}.fa-cab:before,.fa-taxi:before{content:"\f1ba"}.fa-tree:before{content:"\f1bb"}.fa-spotify:before{content:"\f1bc"}.fa-deviantart:before{content:"\f1bd"}.fa-soundcloud:before{content:"\f1be"}.fa-database:before{content:"\f1c0"}.fa-file-pdf-o:before{content:"\f1c1"}.fa-file-word-o:before{content:"\f1c2"}.fa-file-excel-o:before{content:"\f1c3"}.fa-file-powerpoint-o:before{content:"\f1c4"}.fa-file-photo-o:before,.fa-file-picture-o:before,.fa-file-image-o:before{content:"\f1c5"}.fa-file-zip-o:before,.fa-file-archive-o:before{content:"\f1c6"}.fa-file-sound-o:before,.fa-file-audio-o:before{content:"\f1c7"}.fa-file-movie-o:before,.fa-file-video-o:before{content:"\f1c8"}.fa-file-code-o:before{content:"\f1c9"}.fa-vine:before{content:"\f1ca"}.fa-codepen:before{content:"\f1cb"}.fa-jsfiddle:before{content:"\f1cc"}.fa-life-bouy:before,.fa-life-buoy:before,.fa-life-saver:before,.fa-support:before,.fa-life-ring:before{content:"\f1cd"}.fa-circle-o-notch:before{content:"\f1ce"}.fa-ra:before,.fa-resistance:before,.fa-rebel:before{content:"\f1d0"}.fa-ge:before,.fa-empire:before{content:"\f1d1"}.fa-git-square:before{content:"\f1d2"}.fa-git:before{content:"\f1d3"}.fa-y-combinator-square:before,.fa-yc-square:before,.fa-hacker-news:before{content:"\f1d4"}.fa-tencent-weibo:before{content:"\f1d5"}.fa-qq:before{content:"\f1d6"}.fa-wechat:before,.fa-weixin:before{content:"\f1d7"}.fa-send:before,.fa-paper-plane:before{content:"\f1d8"}.fa-send-o:before,.fa-paper-plane-o:before{content:"\f1d9"}.fa-history:before{content:"\f1da"}.fa-circle-thin:before{content:"\f1db"}.fa-header:before{content:"\f1dc"}.fa-paragraph:before{content:"\f1dd"}.fa-sliders:before{content:"\f1de"}.fa-share-alt:before{content:"\f1e0"}.fa-share-alt-square:before{content:"\f1e1"}.fa-bomb:before{content:"\f1e2"}.fa-soccer-ball-o:before,.fa-futbol-o:before{content:"\f1e3"}.fa-tty:before{content:"\f1e4"}.fa-binoculars:before{content:"\f1e5"}.fa-plug:before{content:"\f1e6"}.fa-slideshare:before{content:"\f1e7"}.fa-twitch:before{content:"\f1e8"}.fa-yelp:before{content:"\f1e9"}.fa-newspaper-o:before{content:"\f1ea"}.fa-wifi:before{content:"\f1eb"}.fa-calculator:before{content:"\f1ec"}.fa-paypal:before{content:"\f1ed"}.fa-google-wallet:before{content:"\f1ee"}.fa-cc-visa:before{content:"\f1f0"}.fa-cc-mastercard:before{content:"\f1f1"}.fa-cc-discover:before{content:"\f1f2"}.fa-cc-amex:before{content:"\f1f3"}.fa-cc-paypal:before{content:"\f1f4"}.fa-cc-stripe:before{content:"\f1f5"}.fa-bell-slash:before{content:"\f1f6"}.fa-bell-slash-o:before{content:"\f1f7"}.fa-trash:before{content:"\f1f8"}.fa-copyright:before{content:"\f1f9"}.fa-at:before{content:"\f1fa"}.fa-eyedropper:before{content:"\f1fb"}.fa-paint-brush:before{content:"\f1fc"}.fa-birthday-cake:before{content:"\f1fd"}.fa-area-chart:before{content:"\f1fe"}.fa-pie-chart:before{content:"\f200"}.fa-line-chart:before{content:"\f201"}.fa-lastfm:before{content:"\f202"}.fa-lastfm-square:before{content:"\f203"}.fa-toggle-off:before{content:"\f204"}.fa-toggle-on:before{content:"\f205"}.fa-bicycle:before{content:"\f206"}.fa-bus:before{content:"\f207"}.fa-ioxhost:before{content:"\f208"}.fa-angellist:before{content:"\f209"}.fa-cc:before{content:"\f20a"}.fa-shekel:before,.fa-sheqel:before,.fa-ils:before{content:"\f20b"}.fa-meanpath:before{content:"\f20c"}.fa-buysellads:before{content:"\f20d"}.fa-connectdevelop:before{content:"\f20e"}.fa-dashcube:before{content:"\f210"}.fa-forumbee:before{content:"\f211"}.fa-leanpub:before{content:"\f212"}.fa-sellsy:before{content:"\f213"}.fa-shirtsinbulk:before{content:"\f214"}.fa-simplybuilt:before{content:"\f215"}.fa-skyatlas:before{content:"\f216"}.fa-cart-plus:before{content:"\f217"}.fa-cart-arrow-down:before{content:"\f218"}.fa-diamond:before{content:"\f219"}.fa-ship:before{content:"\f21a"}.fa-user-secret:before{content:"\f21b"}.fa-motorcycle:before{content:"\f21c"}.fa-street-view:before{content:"\f21d"}.fa-heartbeat:before{content:"\f21e"}.fa-venus:before{content:"\f221"}.fa-mars:before{content:"\f222"}.fa-mercury:before{content:"\f223"}.fa-intersex:before,.fa-transgender:before{content:"\f224"}.fa-transgender-alt:before{content:"\f225"}.fa-venus-double:before{content:"\f226"}.fa-mars-double:before{content:"\f227"}.fa-venus-mars:before{content:"\f228"}.fa-mars-stroke:before{content:"\f229"}.fa-mars-stroke-v:before{content:"\f22a"}.fa-mars-stroke-h:before{content:"\f22b"}.fa-neuter:before{content:"\f22c"}.fa-genderless:before{content:"\f22d"}.fa-facebook-official:before{content:"\f230"}.fa-pinterest-p:before{content:"\f231"}.fa-whatsapp:before{content:"\f232"}.fa-server:before{content:"\f233"}.fa-user-plus:before{content:"\f234"}.fa-user-times:before{content:"\f235"}.fa-hotel:before,.fa-bed:before{content:"\f236"}.fa-viacoin:before{content:"\f237"}.fa-train:before{content:"\f238"}.fa-subway:before{content:"\f239"}.fa-medium:before{content:"\f23a"}.fa-yc:before,.fa-y-combinator:before{content:"\f23b"}.fa-optin-monster:before{content:"\f23c"}.fa-opencart:before{content:"\f23d"}.fa-expeditedssl:before{content:"\f23e"}.fa-battery-4:before,.fa-battery:before,.fa-battery-full:before{content:"\f240"}.fa-battery-3:before,.fa-battery-three-quarters:before{content:"\f241"}.fa-battery-2:before,.fa-battery-half:before{content:"\f242"}.fa-battery-1:before,.fa-battery-quarter:before{content:"\f243"}.fa-battery-0:before,.fa-battery-empty:before{content:"\f244"}.fa-mouse-pointer:before{content:"\f245"}.fa-i-cursor:before{content:"\f246"}.fa-object-group:before{content:"\f247"}.fa-object-ungroup:before{content:"\f248"}.fa-sticky-note:before{content:"\f249"}.fa-sticky-note-o:before{content:"\f24a"}.fa-cc-jcb:before{content:"\f24b"}.fa-cc-diners-club:before{content:"\f24c"}.fa-clone:before{content:"\f24d"}.fa-balance-scale:before{content:"\f24e"}.fa-hourglass-o:before{content:"\f250"}.fa-hourglass-1:before,.fa-hourglass-start:before{content:"\f251"}.fa-hourglass-2:before,.fa-hourglass-half:before{content:"\f252"}.fa-hourglass-3:before,.fa-hourglass-end:before{content:"\f253"}.fa-hourglass:before{content:"\f254"}.fa-hand-grab-o:before,.fa-hand-rock-o:before{content:"\f255"}.fa-hand-stop-o:before,.fa-hand-paper-o:before{content:"\f256"}.fa-hand-scissors-o:before{content:"\f257"}.fa-hand-lizard-o:before{content:"\f258"}.fa-hand-spock-o:before{content:"\f259"}.fa-hand-pointer-o:before{content:"\f25a"}.fa-hand-peace-o:before{content:"\f25b"}.fa-trademark:before{content:"\f25c"}.fa-registered:before{content:"\f25d"}.fa-creative-commons:before{content:"\f25e"}.fa-gg:before{content:"\f260"}.fa-gg-circle:before{content:"\f261"}.fa-tripadvisor:before{content:"\f262"}.fa-odnoklassniki:before{content:"\f263"}.fa-odnoklassniki-square:before{content:"\f264"}.fa-get-pocket:before{content:"\f265"}.fa-wikipedia-w:before{content:"\f266"}.fa-safari:before{content:"\f267"}.fa-chrome:before{content:"\f268"}.fa-firefox:before{content:"\f269"}.fa-opera:before{content:"\f26a"}.fa-internet-explorer:before{content:"\f26b"}.fa-tv:before,.fa-television:before{content:"\f26c"}.fa-contao:before{content:"\f26d"}.fa-500px:before{content:"\f26e"}.fa-amazon:before{content:"\f270"}.fa-calendar-plus-o:before{content:"\f271"}.fa-calendar-minus-o:before{content:"\f272"}.fa-calendar-times-o:before{content:"\f273"}.fa-calendar-check-o:before{content:"\f274"}.fa-industry:before{content:"\f275"}.fa-map-pin:before{content:"\f276"}.fa-map-signs:before{content:"\f277"}.fa-map-o:before{content:"\f278"}.fa-map:before{content:"\f279"}.fa-commenting:before{content:"\f27a"}.fa-commenting-o:before{content:"\f27b"}.fa-houzz:before{content:"\f27c"}.fa-vimeo:before{content:"\f27d"}.fa-black-tie:before{content:"\f27e"}.fa-fonticons:before{content:"\f280"}.fa-reddit-alien:before{content:"\f281"}.fa-edge:before{content:"\f282"}.fa-credit-card-alt:before{content:"\f283"}.fa-codiepie:before{content:"\f284"}.fa-modx:before{content:"\f285"}.fa-fort-awesome:before{content:"\f286"}.fa-usb:before{content:"\f287"}.fa-product-hunt:before{content:"\f288"}.fa-mixcloud:before{content:"\f289"}.fa-scribd:before{content:"\f28a"}.fa-pause-circle:before{content:"\f28b"}.fa-pause-circle-o:before{content:"\f28c"}.fa-stop-circle:before{content:"\f28d"}.fa-stop-circle-o:before{content:"\f28e"}.fa-shopping-bag:before{content:"\f290"}.fa-shopping-basket:before{content:"\f291"}.fa-hashtag:before{content:"\f292"}.fa-bluetooth:before{content:"\f293"}.fa-bluetooth-b:before{content:"\f294"}.fa-percent:before{content:"\f295"}.fa-gitlab:before{content:"\f296"}.fa-wpbeginner:before{content:"\f297"}.fa-wpforms:before{content:"\f298"}.fa-envira:before{content:"\f299"}.fa-universal-access:before{content:"\f29a"}.fa-wheelchair-alt:before{content:"\f29b"}.fa-question-circle-o:before{content:"\f29c"}.fa-blind:before{content:"\f29d"}.fa-audio-description:before{content:"\f29e"}.fa-volume-control-phone:before{content:"\f2a0"}.fa-braille:before{content:"\f2a1"}.fa-assistive-listening-systems:before{content:"\f2a2"}.fa-asl-interpreting:before,.fa-american-sign-language-interpreting:before{content:"\f2a3"}.fa-deafness:before,.fa-hard-of-hearing:before,.fa-deaf:before{content:"\f2a4"}.fa-glide:before{content:"\f2a5"}.fa-glide-g:before{content:"\f2a6"}.fa-signing:before,.fa-sign-language:before{content:"\f2a7"}.fa-low-vision:before{content:"\f2a8"}.fa-viadeo:before{content:"\f2a9"}.fa-viadeo-square:before{content:"\f2aa"}.fa-snapchat:before{content:"\f2ab"}.fa-snapchat-ghost:before{content:"\f2ac"}.fa-snapchat-square:before{content:"\f2ad"}.fa-pied-piper:before{content:"\f2ae"}.fa-first-order:before{content:"\f2b0"}.fa-yoast:before{content:"\f2b1"}.fa-themeisle:before{content:"\f2b2"}.fa-google-plus-circle:before,.fa-google-plus-official:before{content:"\f2b3"}.fa-fa:before,.fa-font-awesome:before{content:"\f2b4"}.fa-handshake-o:before{content:"\f2b5"}.fa-envelope-open:before{content:"\f2b6"}.fa-envelope-open-o:before{content:"\f2b7"}.fa-linode:before{content:"\f2b8"}.fa-address-book:before{content:"\f2b9"}.fa-address-book-o:before{content:"\f2ba"}.fa-vcard:before,.fa-address-card:before{content:"\f2bb"}.fa-vcard-o:before,.fa-address-card-o:before{content:"\f2bc"}.fa-user-circle:before{content:"\f2bd"}.fa-user-circle-o:before{content:"\f2be"}.fa-user-o:before{content:"\f2c0"}.fa-id-badge:before{content:"\f2c1"}.fa-drivers-license:before,.fa-id-card:before{content:"\f2c2"}.fa-drivers-license-o:before,.fa-id-card-o:before{content:"\f2c3"}.fa-quora:before{content:"\f2c4"}.fa-free-code-camp:before{content:"\f2c5"}.fa-telegram:before{content:"\f2c6"}.fa-thermometer-4:before,.fa-thermometer:before,.fa-thermometer-full:before{content:"\f2c7"}.fa-thermometer-3:before,.fa-thermometer-three-quarters:before{content:"\f2c8"}.fa-thermometer-2:before,.fa-thermometer-half:before{content:"\f2c9"}.fa-thermometer-1:before,.fa-thermometer-quarter:before{content:"\f2ca"}.fa-thermometer-0:before,.fa-thermometer-empty:before{content:"\f2cb"}.fa-shower:before{content:"\f2cc"}.fa-bathtub:before,.fa-s15:before,.fa-bath:before{content:"\f2cd"}.fa-podcast:before{content:"\f2ce"}.fa-window-maximize:before{content:"\f2d0"}.fa-window-minimize:before{content:"\f2d1"}.fa-window-restore:before{content:"\f2d2"}.fa-times-rectangle:before,.fa-window-close:before{content:"\f2d3"}.fa-times-rectangle-o:before,.fa-window-close-o:before{content:"\f2d4"}.fa-bandcamp:before{content:"\f2d5"}.fa-grav:before{content:"\f2d6"}.fa-etsy:before{content:"\f2d7"}.fa-imdb:before{content:"\f2d8"}.fa-ravelry:before{content:"\f2d9"}.fa-eercast:before{content:"\f2da"}.fa-microchip:before{content:"\f2db"}.fa-snowflake-o:before{content:"\f2dc"}.fa-superpowers:before{content:"\f2dd"}.fa-wpexplorer:before{content:"\f2de"}.fa-meetup:before{content:"\f2e0"}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0, 0, 0, 0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}
diff --git a/pluss-manage-page/src/main/resources/static/resources/css/index/first.css b/pluss-manage-page/src/main/resources/static/resources/css/index/first.css
new file mode 100644
index 0000000..069b234
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/css/index/first.css
@@ -0,0 +1,163 @@
+.container-first {
+	background-color: rgb(242, 242, 242);
+	margin: 0.5%;
+}
+
+.top-a-height {
+	height: 144px;
+}
+
+.number {
+	font-size: 30px;
+	font-family: Source Han Sans CN;
+	font-weight: 500;
+	color: rgba(255, 255, 255, 1);
+}
+
+.desc {
+	font-size: 16px;
+	font-family: Source Han Sans CN;
+	font-weight: 400;
+	color: rgba(255, 255, 255, 1);;
+	margin-top: 26px;
+}
+
+.now-tj {
+	font-size: 18px;
+	font-family: Source Han Sans CN;
+	font-weight: 400;
+	color: rgba(51, 51, 51, 1);
+}
+
+.details {
+	padding-left: 34px;
+	float: left;
+	width: 50%;
+}
+
+.md-tj {
+	margin: 20px 20px 0px 20px;
+}
+
+.echarts-top {
+	margin-top: 3%;
+}
+
+.echarts-title {
+	font-size: 18px;
+	font-family: Source Han Sans CN;
+	font-weight: 500;
+	color: rgba(51, 51, 51, 1);
+	line-height: 34px;
+}
+
+.title-tab {
+	width: 6px;
+	height: 21px;
+	background: rgba(0, 168, 236, 1);
+	float:left;
+	margin: 8px;
+}
+
+.echarts-model {
+	height: 419px;
+	background: rgba(255, 255, 255, 1);
+	border-radius: 10px;
+	float: left;
+}
+
+.echarts-md {
+	width: 99%;
+}
+
+.echarts-img {
+	height: 380px;
+	width:100%;
+}
+
+.tj-value {
+	width: 100%;
+	background: rgba(255, 255, 255, 1);
+	border-radius: 10px;
+	margin-top:15px;
+	border:0
+}
+.tj-content{
+    display:flex;
+    justify-content:flex-start;
+	flex-wrap: wrap;
+}
+.tj-body{
+    /*width:20%;*/
+    box-shadow:2px 2px 10px #909090;
+    height: 130px;
+}
+.next{
+    margin-left:5px;
+}
+.md-type{
+    margin-top:10px;
+}
+.md-pre-body{
+    text-align: center;
+    font-size:20px;
+    margin-top:8px;
+    color:#000;
+	padding: 15px 0 0 0;
+}
+.md-positionr {
+	float: left;
+	width: 32%;
+}
+
+.md-positionr1 {
+	float: left;
+	width: 16%;
+}
+
+.md-line {
+	border: 0.5px solid rgba(218, 218, 218, 1);
+	float: left;
+	height:34px;
+	margin-top: 0px;
+	color:#B4B4B4;
+}
+
+.md-desc {
+	font-size: 12px;
+	font-family: Source Han Sans CN;
+	line-height: 10px;
+	text-align: center;
+}
+
+.md-number {
+	font-size: 12px;
+	font-family: Source Han Sans CN;
+	color: rgba(51, 51, 51, 1);
+	line-height: 30px;
+	text-align: center;
+	margin: 0;
+}
+
+.choose-btn {
+	color: #ff5e5f;
+	border:1px solid #ff5e5f;
+}
+
+.choose-btn.focus,
+.choose-btn:focus {
+	color: #fff;
+	background:rgba(0,168,236,1);
+}
+
+.choose-btn:hover {
+	color: #fff;
+	background:rgba(0,168,236,1);
+}
+
+.choose-btn.active,
+.choose-btn:active,
+.open>.dropdown-toggle.choose-btn {
+	color: #fff;
+	background:#ff5e5f;
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/css/jquery.mCustomScrollbar.css b/pluss-manage-page/src/main/resources/static/resources/css/jquery.mCustomScrollbar.css
new file mode 100644
index 0000000..c925ae7
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/css/jquery.mCustomScrollbar.css
@@ -0,0 +1,473 @@
+/* basic scrollbar styling */
+/* vertical scrollbar */
+.mCSB_container{
+	width:98px;
+	padding-bottom:50px;
+}
+.menu-min .mCSB_container{
+	width:38px;
+	padding-bottom:50px;
+}
+.mCSB_container.mCS_no_scrollbar{.mCSB_container
+	margin-right:0;
+}
+.mCS_disabled>.mCustomScrollBox>.mCSB_container.mCS_no_scrollbar,
+.mCS_destroyed>.mCustomScrollBox>.mCSB_container.mCS_no_scrollbar{
+	margin-right:30px;
+}
+.mCustomScrollBox>.mCSB_scrollTools{
+	width:6px;
+	height:100%;
+	top:0;
+	right:0;
+}
+.mCSB_scrollTools .mCSB_draggerContainer{
+	position:absolute;
+	top:0;
+	left:0;
+	bottom:0;
+	right:0; 
+	height:auto;
+}
+.mCSB_scrollTools a+.mCSB_draggerContainer{
+	margin:20px 0;
+}
+.mCSB_scrollTools .mCSB_draggerRail{
+	width:2px;
+	height:100%;
+	margin:0 auto;
+	-webkit-border-radius:10px;
+	-moz-border-radius:10px;
+	border-radius:10px;
+}
+.mCSB_scrollTools .mCSB_dragger{
+	cursor:pointer;
+	width:100%;
+	height:30px;
+}
+.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{
+	width:4px;
+	height:100%;
+	margin:0 auto;
+	-webkit-border-radius:10px;
+	-moz-border-radius:10px;
+	border-radius:10px;
+	text-align:center;
+}
+.mCSB_scrollTools .mCSB_buttonUp,
+.mCSB_scrollTools .mCSB_buttonDown{
+	display:block;
+	position:relative;
+	height:20px;
+	margin:0 auto;
+	cursor:pointer;
+}
+.mCSB_scrollTools .mCSB_buttonDown{
+	top:100%;
+	margin-top:-40px;
+}
+/* horizontal scrollbar */
+.mCSB_horizontal>.mCSB_container{
+	height:auto;
+	margin-right:0;
+	margin-bottom:30px;
+}
+.mCSB_horizontal>.mCSB_container.mCS_no_scrollbar{
+	margin-bottom:0;
+}
+.mCS_disabled>.mCSB_horizontal>.mCSB_container.mCS_no_scrollbar,
+.mCS_destroyed>.mCSB_horizontal>.mCSB_container.mCS_no_scrollbar{
+	margin-right:0;
+	margin-bottom:30px;
+}
+.mCSB_horizontal.mCustomScrollBox>.mCSB_scrollTools{
+	width:100%;
+	height:16px;
+	top:auto;
+	right:auto;
+	bottom:0;
+	left:0;
+}
+.mCSB_horizontal>.mCSB_scrollTools a+.mCSB_draggerContainer{
+	margin:0 20px;
+}
+.mCSB_horizontal>.mCSB_scrollTools .mCSB_draggerRail{
+	width:100%;
+	height:2px;
+	margin:7px 0;
+	-webkit-border-radius:10px;
+	-moz-border-radius:10px;
+	border-radius:10px;
+}
+.mCSB_horizontal>.mCSB_scrollTools .mCSB_dragger{
+	width:30px;
+	height:100%;
+}
+.mCSB_horizontal>.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{
+	width:100%;
+	height:4px;
+	margin:6px auto;
+	-webkit-border-radius:10px;
+	-moz-border-radius:10px;
+	border-radius:10px;
+}
+.mCSB_horizontal>.mCSB_scrollTools .mCSB_buttonLeft,
+.mCSB_horizontal>.mCSB_scrollTools .mCSB_buttonRight{
+	display:block;
+	position:relative;
+	width:20px;
+	height:100%;
+	margin:0 auto;
+	cursor:pointer;
+	float:left;
+}
+.mCSB_horizontal>.mCSB_scrollTools .mCSB_buttonRight{
+	margin-left:-40px;
+	float:right;
+}
+.mCustomScrollBox{
+	-ms-touch-action:none; /*MSPointer events - direct all pointer events to js*/
+}
+
+/* default scrollbar colors and backgrounds (default theme) */
+.mCustomScrollBox>.mCSB_scrollTools{
+	opacity:0;
+	filter:"alpha(opacity=0)"; -ms-filter:"alpha(opacity=0)"; /* old ie */
+}
+.mCustomScrollBox:hover>.mCSB_scrollTools{
+	opacity:1;
+	filter:"alpha(opacity=100)"; -ms-filter:"alpha(opacity=100)"; /* old ie */
+}
+.mCSB_scrollTools .mCSB_draggerRail{
+	background:#000; /* rgba fallback */
+	background:rgba(0,0,0,0.4);
+	filter:"alpha(opacity=40)"; -ms-filter:"alpha(opacity=40)"; /* old ie */
+}
+.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{
+	background:#fff; /* rgba fallback */
+	background:rgba(255,255,255,0.75);
+	filter:"alpha(opacity=75)"; -ms-filter:"alpha(opacity=75)"; /* old ie */
+}
+.mCSB_scrollTools .mCSB_dragger:hover .mCSB_dragger_bar{
+	background:rgba(255,255,255,0.85);
+	filter:"alpha(opacity=85)"; -ms-filter:"alpha(opacity=85)"; /* old ie */
+}
+.mCSB_scrollTools .mCSB_dragger:active .mCSB_dragger_bar,
+.mCSB_scrollTools .mCSB_dragger.mCSB_dragger_onDrag .mCSB_dragger_bar{
+	background:rgba(255,255,255,0.9);
+	filter:"alpha(opacity=90)"; -ms-filter:"alpha(opacity=90)"; /* old ie */
+}
+.mCSB_scrollTools .mCSB_buttonUp,
+.mCSB_scrollTools .mCSB_buttonDown,
+.mCSB_scrollTools .mCSB_buttonLeft,
+.mCSB_scrollTools .mCSB_buttonRight{
+	background-image:url(mCSB_buttons.png);
+	background-repeat:no-repeat;
+	opacity:0.4;
+	filter:"alpha(opacity=40)"; -ms-filter:"alpha(opacity=40)"; /* old ie */
+}
+.mCSB_scrollTools .mCSB_buttonUp{
+	background-position:0 0;
+	/* 
+	sprites locations are 0 0/-16px 0/-32px 0/-48px 0 (light) and -80px 0/-96px 0/-112px 0/-128px 0 (dark) 
+	*/
+}
+.mCSB_scrollTools .mCSB_buttonDown{
+	background-position:0 -20px;
+	/* 
+	sprites locations are 0 -20px/-16px -20px/-32px -20px/-48px -20px (light) and -80px -20px/-96px -20px/-112px -20px/-128px -20px (dark) 
+	*/
+}
+.mCSB_scrollTools .mCSB_buttonLeft{
+	background-position:0 -40px;
+	/* 
+	sprites locations are 0 -40px/-20px -40px/-40px -40px/-60px -40px (light) and -80px -40px/-100px -40px/-120px -40px/-140px -40px (dark) 
+	*/
+}
+.mCSB_scrollTools .mCSB_buttonRight{
+	background-position:0 -56px;
+	/* 
+	sprites locations are 0 -56px/-20px -56px/-40px -56px/-60px -56px (light) and -80px -56px/-100px -56px/-120px -56px/-140px -56px (dark) 
+	*/
+}
+.mCSB_scrollTools .mCSB_buttonUp:hover,
+.mCSB_scrollTools .mCSB_buttonDown:hover,
+.mCSB_scrollTools .mCSB_buttonLeft:hover,
+.mCSB_scrollTools .mCSB_buttonRight:hover{
+	opacity:0.75;
+	filter:"alpha(opacity=75)"; -ms-filter:"alpha(opacity=75)"; /* old ie */
+}
+.mCSB_scrollTools .mCSB_buttonUp:active,
+.mCSB_scrollTools .mCSB_buttonDown:active,
+.mCSB_scrollTools .mCSB_buttonLeft:active,
+.mCSB_scrollTools .mCSB_buttonRight:active{
+	opacity:0.9;
+	filter:"alpha(opacity=90)"; -ms-filter:"alpha(opacity=90)"; /* old ie */
+}
+
+/*scrollbar themes*/
+/*dark (dark colored scrollbar)*/
+.mCS-dark>.mCSB_scrollTools .mCSB_draggerRail{
+	background:#000; /* rgba fallback */
+	background:rgba(0,0,0,0.15);
+}
+.mCS-dark>.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{
+	background:#000; /* rgba fallback */
+	background:rgba(0,0,0,0.75);
+}
+.mCS-dark>.mCSB_scrollTools .mCSB_dragger:hover .mCSB_dragger_bar{
+	background:rgba(0,0,0,0.85);
+}
+.mCS-dark>.mCSB_scrollTools .mCSB_dragger:active .mCSB_dragger_bar,
+.mCS-dark>.mCSB_scrollTools .mCSB_dragger.mCSB_dragger_onDrag .mCSB_dragger_bar{
+	background:rgba(0,0,0,0.9);
+}
+.mCS-dark>.mCSB_scrollTools .mCSB_buttonUp{
+	background-position:-80px 0;
+}
+.mCS-dark>.mCSB_scrollTools .mCSB_buttonDown{
+	background-position:-80px -20px;
+}
+.mCS-dark>.mCSB_scrollTools .mCSB_buttonLeft{
+	background-position:-80px -40px;
+}
+.mCS-dark>.mCSB_scrollTools .mCSB_buttonRight{
+	background-position:-80px -56px;
+}
+/*light-2*/
+.mCS-light-2>.mCSB_scrollTools .mCSB_draggerRail{
+	width:4px;
+	background:#fff; /* rgba fallback */
+	background:rgba(255,255,255,0.1);
+	-webkit-border-radius:1px;
+	-moz-border-radius:1px;
+	border-radius:1px;
+}
+.mCS-light-2>.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{
+	width:4px;
+	background:#fff; /* rgba fallback */
+	background:rgba(255,255,255,0.75);
+	-webkit-border-radius:1px;
+	-moz-border-radius:1px;
+	border-radius:1px;
+}
+.mCS-light-2.mCSB_horizontal>.mCSB_scrollTools .mCSB_draggerRail{
+	width:100%;
+	height:4px;
+	margin:6px 0;
+}
+.mCS-light-2.mCSB_horizontal>.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{
+	width:100%;
+	height:4px;
+	margin:6px auto;
+}
+.mCS-light-2>.mCSB_scrollTools .mCSB_dragger:hover .mCSB_dragger_bar{
+	background:rgba(255,255,255,0.85);
+}
+.mCS-light-2>.mCSB_scrollTools .mCSB_dragger:active .mCSB_dragger_bar,
+.mCS-light-2>.mCSB_scrollTools .mCSB_dragger.mCSB_dragger_onDrag .mCSB_dragger_bar{
+	background:rgba(255,255,255,0.9);
+}
+.mCS-light-2>.mCSB_scrollTools .mCSB_buttonUp{
+	background-position:-32px 0;
+}
+.mCS-light-2>.mCSB_scrollTools .mCSB_buttonDown{
+	background-position:-32px -20px;
+}
+.mCS-light-2>.mCSB_scrollTools .mCSB_buttonLeft{
+	background-position:-40px -40px;
+}
+.mCS-light-2>.mCSB_scrollTools .mCSB_buttonRight{
+	background-position:-40px -56px;
+}
+/*dark-2*/
+.mCS-dark-2>.mCSB_scrollTools .mCSB_draggerRail{
+	width:4px;
+	background:#000; /* rgba fallback */
+	background:rgba(0,0,0,0.1);
+	-webkit-border-radius:1px;
+	-moz-border-radius:1px;
+	border-radius:1px;
+}
+.mCS-dark-2>.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{
+	width:4px;
+	background:#000; /* rgba fallback */
+	background:rgba(0,0,0,0.75);
+	-webkit-border-radius:1px;
+	-moz-border-radius:1px;
+	border-radius:1px;
+}
+.mCS-dark-2.mCSB_horizontal>.mCSB_scrollTools .mCSB_draggerRail{
+	width:100%;
+	height:4px;
+	margin:6px 0;
+}
+.mCS-dark-2.mCSB_horizontal>.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{
+	width:100%;
+	height:4px;
+	margin:6px auto;
+}
+.mCS-dark-2>.mCSB_scrollTools .mCSB_dragger:hover .mCSB_dragger_bar{
+	background:rgba(0,0,0,0.85);
+}
+.mCS-dark-2>.mCSB_scrollTools .mCSB_dragger:active .mCSB_dragger_bar,
+.mCS-dark-2>.mCSB_scrollTools .mCSB_dragger.mCSB_dragger_onDrag .mCSB_dragger_bar{
+	background:rgba(0,0,0,0.9);
+}
+.mCS-dark-2>.mCSB_scrollTools .mCSB_buttonUp{
+	background-position:-112px 0;
+}
+.mCS-dark-2>.mCSB_scrollTools .mCSB_buttonDown{
+	background-position:-112px -20px;
+}
+.mCS-dark-2>.mCSB_scrollTools .mCSB_buttonLeft{
+	background-position:-120px -40px;
+}
+.mCS-dark-2>.mCSB_scrollTools .mCSB_buttonRight{
+	background-position:-120px -56px;
+}
+/*light-thick*/
+.mCS-light-thick>.mCSB_scrollTools .mCSB_draggerRail{
+	width:4px;
+	background:#fff; /* rgba fallback */
+	background:rgba(255,255,255,0.1);
+	-webkit-border-radius:2px;
+	-moz-border-radius:2px;
+	border-radius:2px;
+}
+.mCS-light-thick>.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{
+	width:6px;
+	background:#fff; /* rgba fallback */
+	background:rgba(255,255,255,0.75);
+	-webkit-border-radius:2px;
+	-moz-border-radius:2px;
+	border-radius:2px;
+}
+.mCS-light-thick.mCSB_horizontal>.mCSB_scrollTools .mCSB_draggerRail{
+	width:100%;
+	height:4px;
+	margin:6px 0;
+}
+.mCS-light-thick.mCSB_horizontal>.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{
+	width:100%;
+	height:6px;
+	margin:5px auto;
+}
+.mCS-light-thick>.mCSB_scrollTools .mCSB_dragger:hover .mCSB_dragger_bar{
+	background:rgba(255,255,255,0.85);
+}
+.mCS-light-thick>.mCSB_scrollTools .mCSB_dragger:active .mCSB_dragger_bar,
+.mCS-light-thick>.mCSB_scrollTools .mCSB_dragger.mCSB_dragger_onDrag .mCSB_dragger_bar{
+	background:rgba(255,255,255,0.9);
+}
+.mCS-light-thick>.mCSB_scrollTools .mCSB_buttonUp{
+	background-position:-16px 0;
+}
+.mCS-light-thick>.mCSB_scrollTools .mCSB_buttonDown{
+	background-position:-16px -20px;
+}
+.mCS-light-thick>.mCSB_scrollTools .mCSB_buttonLeft{
+	background-position:-20px -40px;
+}
+.mCS-light-thick>.mCSB_scrollTools .mCSB_buttonRight{
+	background-position:-20px -56px;
+}
+/*dark-thick*/
+.mCS-dark-thick>.mCSB_scrollTools .mCSB_draggerRail{
+	width:4px;
+	background:#000; /* rgba fallback */
+	background:rgba(0,0,0,0.1);
+	-webkit-border-radius:2px;
+	-moz-border-radius:2px;
+	border-radius:2px;
+}
+.mCS-dark-thick>.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{
+	width:6px;
+	background:#000; /* rgba fallback */
+	background:rgba(0,0,0,0.75);
+	-webkit-border-radius:2px;
+	-moz-border-radius:2px;
+	border-radius:2px;
+}
+.mCS-dark-thick.mCSB_horizontal>.mCSB_scrollTools .mCSB_draggerRail{
+	width:100%;
+	height:4px;
+	margin:6px 0;
+}
+.mCS-dark-thick.mCSB_horizontal>.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{
+	width:100%;
+	height:6px;
+	margin:5px auto;
+}
+.mCS-dark-thick>.mCSB_scrollTools .mCSB_dragger:hover .mCSB_dragger_bar{
+	background:rgba(0,0,0,0.85);
+}
+.mCS-dark-thick>.mCSB_scrollTools .mCSB_dragger:active .mCSB_dragger_bar,
+.mCS-dark-thick>.mCSB_scrollTools .mCSB_dragger.mCSB_dragger_onDrag .mCSB_dragger_bar{
+	background:rgba(0,0,0,0.9);
+}
+.mCS-dark-thick>.mCSB_scrollTools .mCSB_buttonUp{
+	background-position:-96px 0;
+}
+.mCS-dark-thick>.mCSB_scrollTools .mCSB_buttonDown{
+	background-position:-96px -20px;
+}
+.mCS-dark-thick>.mCSB_scrollTools .mCSB_buttonLeft{
+	background-position:-100px -40px;
+}
+.mCS-dark-thick>.mCSB_scrollTools .mCSB_buttonRight{
+	background-position:-100px -56px;
+}
+/*light-thin*/
+.mCS-light-thin>.mCSB_scrollTools .mCSB_draggerRail{
+	background:#fff; /* rgba fallback */
+	background:rgba(255,255,255,0.1);
+}
+.mCS-light-thin>.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{
+	width:2px;
+}
+.mCS-light-thin.mCSB_horizontal>.mCSB_scrollTools .mCSB_draggerRail{
+	width:100%;
+}
+.mCS-light-thin.mCSB_horizontal>.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{
+	width:100%;
+	height:2px;
+	margin:7px auto;
+}
+/*dark-thin*/
+.mCS-dark-thin>.mCSB_scrollTools .mCSB_draggerRail{
+	background:#000; /* rgba fallback */
+	background:rgba(0,0,0,0.15);
+}
+.mCS-dark-thin>.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{
+	width:2px;
+	background:#000; /* rgba fallback */
+	background:rgba(0,0,0,0.75);
+}
+.mCS-dark-thin.mCSB_horizontal>.mCSB_scrollTools .mCSB_draggerRail{
+	width:100%;
+}
+.mCS-dark-thin.mCSB_horizontal>.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{
+	width:100%;
+	height:2px;
+	margin:7px auto;
+}
+.mCS-dark-thin>.mCSB_scrollTools .mCSB_dragger:hover .mCSB_dragger_bar{
+	background:rgba(0,0,0,0.85);
+}
+.mCS-dark-thin>.mCSB_scrollTools .mCSB_dragger:active .mCSB_dragger_bar,
+.mCS-dark-thin>.mCSB_scrollTools .mCSB_dragger.mCSB_dragger_onDrag .mCSB_dragger_bar{
+	background:rgba(0,0,0,0.9);
+}
+.mCS-dark-thin>.mCSB_scrollTools .mCSB_buttonUp{
+	background-position:-80px 0;
+}
+.mCS-dark-thin>.mCSB_scrollTools .mCSB_buttonDown{
+	background-position:-80px -20px;
+}
+.mCS-dark-thin>.mCSB_scrollTools .mCSB_buttonLeft{
+	background-position:-80px -40px;
+}
+.mCS-dark-thin>.mCSB_scrollTools .mCSB_buttonRight{
+	background-position:-80px -56px;
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/css/layui.css b/pluss-manage-page/src/main/resources/static/resources/css/layui.css
new file mode 100644
index 0000000..61cb7cd
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/css/layui.css
@@ -0,0 +1 @@
+.layui-inline,img{display:inline-block;vertical-align:middle}h1,h2,h3,h4,h5,h6{font-weight:400}a,body{color:#333}.layui-edge,.layui-header,.layui-inline,.layui-main{position:relative}.layui-edge,hr{height:0;overflow:hidden}.layui-layout-body,.layui-side,.layui-side-scroll{overflow-x:hidden}.layui-btn,.layui-edge,.layui-inline,img{vertical-align:middle}.layui-btn,.layui-disabled,.layui-icon,.layui-unselect{-moz-user-select:none;-webkit-user-select:none;-ms-user-select:none}.layui-edge,.layui-elip,hr{overflow:hidden}blockquote,body,button,dd,div,dl,dt,form,h1,h2,h3,h4,h5,h6,input,li,ol,p,pre,td,textarea,th,ul{margin:0;padding:0;-webkit-tap-highlight-color:rgba(0,0,0,0)}a:active,a:hover{outline:0}img{border:none}li{list-style:none}table{border-collapse:collapse;border-spacing:0}h4,h5,h6{font-size:100%}button,input,optgroup,option,select,textarea{font-family:inherit;font-size:inherit;font-style:inherit;font-weight:inherit;outline:0}pre{white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space:-o-pre-wrap;word-wrap:break-word}body{line-height:1.6;color:rgba(0,0,0,.85);font:14px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif}hr{line-height:0;margin:10px 0;padding:0;border:none!important;border-bottom:1px solid #eee!important;clear:both;background:0 0}a{text-decoration:none}a:hover{color:#777}a cite{font-style:normal;*cursor:pointer}.layui-border-box,.layui-border-box *{box-sizing:border-box}.layui-box,.layui-box *{box-sizing:content-box}.layui-clear{clear:both;*zoom:1}.layui-clear:after{content:'\20';clear:both;*zoom:1;display:block;height:0}.layui-inline{*display:inline;*zoom:1}.layui-btn,.layui-btn-group,.layui-edge{display:inline-block}.layui-edge{width:0;border-width:6px;border-style:dashed;border-color:transparent}.layui-edge-top{top:-4px;border-bottom-color:#999;border-bottom-style:solid}.layui-edge-right{border-left-color:#999;border-left-style:solid}.layui-edge-bottom{top:2px;border-top-color:#999;border-top-style:solid}.layui-edge-left{border-right-color:#999;border-right-style:solid}.layui-elip{text-overflow:ellipsis;white-space:nowrap}.layui-disabled,.layui-disabled:hover{color:#d2d2d2!important;cursor:not-allowed!important}.layui-circle{border-radius:100%}.layui-show{display:block!important}.layui-hide{display:none!important}.layui-show-v{visibility:visible!important}.layui-hide-v{visibility:hidden!important}@font-face{font-family:layui-icon;src:url(../font/iconfont.eot?v=256);src:url(../font/iconfont.eot?v=256#iefix) format('embedded-opentype'),url(../font/iconfont.woff2?v=256) format('woff2'),url(../font/iconfont.woff?v=256) format('woff'),url(../font/iconfont.ttf?v=256) format('truetype'),url(../font/iconfont.svg?v=256#layui-icon) format('svg')}.layui-icon{font-family:layui-icon!important;font-size:16px;font-style:normal;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.layui-icon-reply-fill:before{content:"\e611"}.layui-icon-set-fill:before{content:"\e614"}.layui-icon-menu-fill:before{content:"\e60f"}.layui-icon-search:before{content:"\e615"}.layui-icon-share:before{content:"\e641"}.layui-icon-set-sm:before{content:"\e620"}.layui-icon-engine:before{content:"\e628"}.layui-icon-close:before{content:"\1006"}.layui-icon-close-fill:before{content:"\1007"}.layui-icon-chart-screen:before{content:"\e629"}.layui-icon-star:before{content:"\e600"}.layui-icon-circle-dot:before{content:"\e617"}.layui-icon-chat:before{content:"\e606"}.layui-icon-release:before{content:"\e609"}.layui-icon-list:before{content:"\e60a"}.layui-icon-chart:before{content:"\e62c"}.layui-icon-ok-circle:before{content:"\1005"}.layui-icon-layim-theme:before{content:"\e61b"}.layui-icon-table:before{content:"\e62d"}.layui-icon-right:before{content:"\e602"}.layui-icon-left:before{content:"\e603"}.layui-icon-cart-simple:before{content:"\e698"}.layui-icon-face-cry:before{content:"\e69c"}.layui-icon-face-smile:before{content:"\e6af"}.layui-icon-survey:before{content:"\e6b2"}.layui-icon-tree:before{content:"\e62e"}.layui-icon-ie:before{content:"\e7bb"}.layui-icon-upload-circle:before{content:"\e62f"}.layui-icon-add-circle:before{content:"\e61f"}.layui-icon-download-circle:before{content:"\e601"}.layui-icon-templeate-1:before{content:"\e630"}.layui-icon-util:before{content:"\e631"}.layui-icon-face-surprised:before{content:"\e664"}.layui-icon-edit:before{content:"\e642"}.layui-icon-speaker:before{content:"\e645"}.layui-icon-down:before{content:"\e61a"}.layui-icon-file:before{content:"\e621"}.layui-icon-layouts:before{content:"\e632"}.layui-icon-rate-half:before{content:"\e6c9"}.layui-icon-add-circle-fine:before{content:"\e608"}.layui-icon-prev-circle:before{content:"\e633"}.layui-icon-read:before{content:"\e705"}.layui-icon-404:before{content:"\e61c"}.layui-icon-carousel:before{content:"\e634"}.layui-icon-help:before{content:"\e607"}.layui-icon-code-circle:before{content:"\e635"}.layui-icon-windows:before{content:"\e67f"}.layui-icon-water:before{content:"\e636"}.layui-icon-username:before{content:"\e66f"}.layui-icon-find-fill:before{content:"\e670"}.layui-icon-about:before{content:"\e60b"}.layui-icon-location:before{content:"\e715"}.layui-icon-up:before{content:"\e619"}.layui-icon-pause:before{content:"\e651"}.layui-icon-date:before{content:"\e637"}.layui-icon-layim-uploadfile:before{content:"\e61d"}.layui-icon-delete:before{content:"\e640"}.layui-icon-play:before{content:"\e652"}.layui-icon-top:before{content:"\e604"}.layui-icon-firefox:before{content:"\e686"}.layui-icon-friends:before{content:"\e612"}.layui-icon-refresh-3:before{content:"\e9aa"}.layui-icon-ok:before{content:"\e605"}.layui-icon-layer:before{content:"\e638"}.layui-icon-face-smile-fine:before{content:"\e60c"}.layui-icon-dollar:before{content:"\e659"}.layui-icon-group:before{content:"\e613"}.layui-icon-layim-download:before{content:"\e61e"}.layui-icon-picture-fine:before{content:"\e60d"}.layui-icon-link:before{content:"\e64c"}.layui-icon-diamond:before{content:"\e735"}.layui-icon-log:before{content:"\e60e"}.layui-icon-key:before{content:"\e683"}.layui-icon-rate-solid:before{content:"\e67a"}.layui-icon-fonts-del:before{content:"\e64f"}.layui-icon-unlink:before{content:"\e64d"}.layui-icon-fonts-clear:before{content:"\e639"}.layui-icon-triangle-r:before{content:"\e623"}.layui-icon-circle:before{content:"\e63f"}.layui-icon-radio:before{content:"\e643"}.layui-icon-align-center:before{content:"\e647"}.layui-icon-align-right:before{content:"\e648"}.layui-icon-align-left:before{content:"\e649"}.layui-icon-loading-1:before{content:"\e63e"}.layui-icon-return:before{content:"\e65c"}.layui-icon-fonts-strong:before{content:"\e62b"}.layui-icon-upload:before{content:"\e67c"}.layui-icon-dialogue:before{content:"\e63a"}.layui-icon-video:before{content:"\e6ed"}.layui-icon-headset:before{content:"\e6fc"}.layui-icon-cellphone-fine:before{content:"\e63b"}.layui-icon-add-1:before{content:"\e654"}.layui-icon-face-smile-b:before{content:"\e650"}.layui-icon-fonts-html:before{content:"\e64b"}.layui-icon-screen-full:before{content:"\e622"}.layui-icon-form:before{content:"\e63c"}.layui-icon-cart:before{content:"\e657"}.layui-icon-camera-fill:before{content:"\e65d"}.layui-icon-tabs:before{content:"\e62a"}.layui-icon-heart-fill:before{content:"\e68f"}.layui-icon-fonts-code:before{content:"\e64e"}.layui-icon-ios:before{content:"\e680"}.layui-icon-at:before{content:"\e687"}.layui-icon-fire:before{content:"\e756"}.layui-icon-set:before{content:"\e716"}.layui-icon-fonts-u:before{content:"\e646"}.layui-icon-triangle-d:before{content:"\e625"}.layui-icon-tips:before{content:"\e702"}.layui-icon-picture:before{content:"\e64a"}.layui-icon-more-vertical:before{content:"\e671"}.layui-icon-bluetooth:before{content:"\e689"}.layui-icon-flag:before{content:"\e66c"}.layui-icon-loading:before{content:"\e63d"}.layui-icon-fonts-i:before{content:"\e644"}.layui-icon-refresh-1:before{content:"\e666"}.layui-icon-rmb:before{content:"\e65e"}.layui-icon-addition:before{content:"\e624"}.layui-icon-home:before{content:"\e68e"}.layui-icon-time:before{content:"\e68d"}.layui-icon-user:before{content:"\e770"}.layui-icon-notice:before{content:"\e667"}.layui-icon-chrome:before{content:"\e68a"}.layui-icon-edge:before{content:"\e68b"}.layui-icon-login-weibo:before{content:"\e675"}.layui-icon-voice:before{content:"\e688"}.layui-icon-upload-drag:before{content:"\e681"}.layui-icon-login-qq:before{content:"\e676"}.layui-icon-snowflake:before{content:"\e6b1"}.layui-icon-heart:before{content:"\e68c"}.layui-icon-logout:before{content:"\e682"}.layui-icon-file-b:before{content:"\e655"}.layui-icon-template:before{content:"\e663"}.layui-icon-transfer:before{content:"\e691"}.layui-icon-auz:before{content:"\e672"}.layui-icon-console:before{content:"\e665"}.layui-icon-app:before{content:"\e653"}.layui-icon-prev:before{content:"\e65a"}.layui-icon-website:before{content:"\e7ae"}.layui-icon-next:before{content:"\e65b"}.layui-icon-component:before{content:"\e857"}.layui-icon-android:before{content:"\e684"}.layui-icon-more:before{content:"\e65f"}.layui-icon-login-wechat:before{content:"\e677"}.layui-icon-shrink-right:before{content:"\e668"}.layui-icon-spread-left:before{content:"\e66b"}.layui-icon-camera:before{content:"\e660"}.layui-icon-note:before{content:"\e66e"}.layui-icon-refresh:before{content:"\e669"}.layui-icon-female:before{content:"\e661"}.layui-icon-male:before{content:"\e662"}.layui-icon-screen-restore:before{content:"\e758"}.layui-icon-password:before{content:"\e673"}.layui-icon-senior:before{content:"\e674"}.layui-icon-theme:before{content:"\e66a"}.layui-icon-tread:before{content:"\e6c5"}.layui-icon-praise:before{content:"\e6c6"}.layui-icon-star-fill:before{content:"\e658"}.layui-icon-rate:before{content:"\e67b"}.layui-icon-template-1:before{content:"\e656"}.layui-icon-vercode:before{content:"\e679"}.layui-icon-service:before{content:"\e626"}.layui-icon-cellphone:before{content:"\e678"}.layui-icon-print:before{content:"\e66d"}.layui-icon-cols:before{content:"\e610"}.layui-icon-wifi:before{content:"\e7e0"}.layui-icon-export:before{content:"\e67d"}.layui-icon-rss:before{content:"\e808"}.layui-icon-slider:before{content:"\e714"}.layui-icon-email:before{content:"\e618"}.layui-icon-subtraction:before{content:"\e67e"}.layui-icon-mike:before{content:"\e6dc"}.layui-icon-light:before{content:"\e748"}.layui-icon-gift:before{content:"\e627"}.layui-icon-mute:before{content:"\e685"}.layui-icon-reduce-circle:before{content:"\e616"}.layui-icon-music:before{content:"\e690"}.layui-main{width:1140px;margin:0 auto}.layui-header{z-index:1000;height:60px}.layui-header a:hover{transition:all .5s;-webkit-transition:all .5s}.layui-side{position:fixed;left:0;top:0;bottom:0;z-index:999;width:200px}.layui-side-scroll{position:relative;width:220px;height:100%}.layui-body{position:relative;left:200px;right:0;top:0;bottom:0;z-index:900;width:auto;box-sizing:border-box}.layui-layout-admin .layui-header{position:fixed;top:0;left:0;right:0;background-color:#23262E}.layui-layout-admin .layui-side{top:60px;width:200px;overflow-x:hidden}.layui-layout-admin .layui-body{position:absolute;top:60px;padding-bottom:44px}.layui-layout-admin .layui-main{width:auto;margin:0 15px}.layui-layout-admin .layui-footer{position:fixed;left:200px;right:0;bottom:0;z-index:990;height:44px;line-height:44px;padding:0 15px;box-shadow:-1px 0 4px rgb(0 0 0 / 12%);background-color:#FAFAFA}.layui-layout-admin .layui-logo{position:absolute;left:0;top:0;width:200px;height:100%;line-height:60px;text-align:center;color:#009688;font-size:16px;box-shadow:0 1px 2px 0 rgb(0 0 0 / 15%)}.layui-layout-admin .layui-header .layui-nav{background:0 0}.layui-layout-left{position:absolute!important;left:200px;top:0}.layui-layout-right{position:absolute!important;right:0;top:0}.layui-container{position:relative;margin:0 auto;padding:0 15px;box-sizing:border-box}.layui-fluid{position:relative;margin:0 auto;padding:0 15px}.layui-row:after,.layui-row:before{content:"";display:block;clear:both}.layui-col-lg1,.layui-col-lg10,.layui-col-lg11,.layui-col-lg12,.layui-col-lg2,.layui-col-lg3,.layui-col-lg4,.layui-col-lg5,.layui-col-lg6,.layui-col-lg7,.layui-col-lg8,.layui-col-lg9,.layui-col-md1,.layui-col-md10,.layui-col-md11,.layui-col-md12,.layui-col-md2,.layui-col-md3,.layui-col-md4,.layui-col-md5,.layui-col-md6,.layui-col-md7,.layui-col-md8,.layui-col-md9,.layui-col-sm1,.layui-col-sm10,.layui-col-sm11,.layui-col-sm12,.layui-col-sm2,.layui-col-sm3,.layui-col-sm4,.layui-col-sm5,.layui-col-sm6,.layui-col-sm7,.layui-col-sm8,.layui-col-sm9,.layui-col-xs1,.layui-col-xs10,.layui-col-xs11,.layui-col-xs12,.layui-col-xs2,.layui-col-xs3,.layui-col-xs4,.layui-col-xs5,.layui-col-xs6,.layui-col-xs7,.layui-col-xs8,.layui-col-xs9{position:relative;display:block;box-sizing:border-box}.layui-col-xs1,.layui-col-xs10,.layui-col-xs11,.layui-col-xs12,.layui-col-xs2,.layui-col-xs3,.layui-col-xs4,.layui-col-xs5,.layui-col-xs6,.layui-col-xs7,.layui-col-xs8,.layui-col-xs9{float:left}.layui-col-xs1{width:8.33333333%}.layui-col-xs2{width:16.66666667%}.layui-col-xs3{width:25%}.layui-col-xs4{width:33.33333333%}.layui-col-xs5{width:41.66666667%}.layui-col-xs6{width:50%}.layui-col-xs7{width:58.33333333%}.layui-col-xs8{width:66.66666667%}.layui-col-xs9{width:75%}.layui-col-xs10{width:83.33333333%}.layui-col-xs11{width:91.66666667%}.layui-col-xs12{width:100%}.layui-col-xs-offset1{margin-left:8.33333333%}.layui-col-xs-offset2{margin-left:16.66666667%}.layui-col-xs-offset3{margin-left:25%}.layui-col-xs-offset4{margin-left:33.33333333%}.layui-col-xs-offset5{margin-left:41.66666667%}.layui-col-xs-offset6{margin-left:50%}.layui-col-xs-offset7{margin-left:58.33333333%}.layui-col-xs-offset8{margin-left:66.66666667%}.layui-col-xs-offset9{margin-left:75%}.layui-col-xs-offset10{margin-left:83.33333333%}.layui-col-xs-offset11{margin-left:91.66666667%}.layui-col-xs-offset12{margin-left:100%}@media screen and (max-width:768px){.layui-hide-xs{display:none!important}.layui-show-xs-block{display:block!important}.layui-show-xs-inline{display:inline!important}.layui-show-xs-inline-block{display:inline-block!important}}@media screen and (min-width:768px){.layui-container{width:750px}.layui-hide-sm{display:none!important}.layui-show-sm-block{display:block!important}.layui-show-sm-inline{display:inline!important}.layui-show-sm-inline-block{display:inline-block!important}.layui-col-sm1,.layui-col-sm10,.layui-col-sm11,.layui-col-sm12,.layui-col-sm2,.layui-col-sm3,.layui-col-sm4,.layui-col-sm5,.layui-col-sm6,.layui-col-sm7,.layui-col-sm8,.layui-col-sm9{float:left}.layui-col-sm1{width:8.33333333%}.layui-col-sm2{width:16.66666667%}.layui-col-sm3{width:25%}.layui-col-sm4{width:33.33333333%}.layui-col-sm5{width:41.66666667%}.layui-col-sm6{width:50%}.layui-col-sm7{width:58.33333333%}.layui-col-sm8{width:66.66666667%}.layui-col-sm9{width:75%}.layui-col-sm10{width:83.33333333%}.layui-col-sm11{width:91.66666667%}.layui-col-sm12{width:100%}.layui-col-sm-offset1{margin-left:8.33333333%}.layui-col-sm-offset2{margin-left:16.66666667%}.layui-col-sm-offset3{margin-left:25%}.layui-col-sm-offset4{margin-left:33.33333333%}.layui-col-sm-offset5{margin-left:41.66666667%}.layui-col-sm-offset6{margin-left:50%}.layui-col-sm-offset7{margin-left:58.33333333%}.layui-col-sm-offset8{margin-left:66.66666667%}.layui-col-sm-offset9{margin-left:75%}.layui-col-sm-offset10{margin-left:83.33333333%}.layui-col-sm-offset11{margin-left:91.66666667%}.layui-col-sm-offset12{margin-left:100%}}@media screen and (min-width:992px){.layui-container{width:970px}.layui-hide-md{display:none!important}.layui-show-md-block{display:block!important}.layui-show-md-inline{display:inline!important}.layui-show-md-inline-block{display:inline-block!important}.layui-col-md1,.layui-col-md10,.layui-col-md11,.layui-col-md12,.layui-col-md2,.layui-col-md3,.layui-col-md4,.layui-col-md5,.layui-col-md6,.layui-col-md7,.layui-col-md8,.layui-col-md9{float:left}.layui-col-md1{width:8.33333333%}.layui-col-md2{width:16.66666667%}.layui-col-md3{width:25%}.layui-col-md4{width:33.33333333%}.layui-col-md5{width:41.66666667%}.layui-col-md6{width:50%}.layui-col-md7{width:58.33333333%}.layui-col-md8{width:66.66666667%}.layui-col-md9{width:75%}.layui-col-md10{width:83.33333333%}.layui-col-md11{width:91.66666667%}.layui-col-md12{width:100%}.layui-col-md-offset1{margin-left:8.33333333%}.layui-col-md-offset2{margin-left:16.66666667%}.layui-col-md-offset3{margin-left:25%}.layui-col-md-offset4{margin-left:33.33333333%}.layui-col-md-offset5{margin-left:41.66666667%}.layui-col-md-offset6{margin-left:50%}.layui-col-md-offset7{margin-left:58.33333333%}.layui-col-md-offset8{margin-left:66.66666667%}.layui-col-md-offset9{margin-left:75%}.layui-col-md-offset10{margin-left:83.33333333%}.layui-col-md-offset11{margin-left:91.66666667%}.layui-col-md-offset12{margin-left:100%}}@media screen and (min-width:1200px){.layui-container{width:1170px}.layui-hide-lg{display:none!important}.layui-show-lg-block{display:block!important}.layui-show-lg-inline{display:inline!important}.layui-show-lg-inline-block{display:inline-block!important}.layui-col-lg1,.layui-col-lg10,.layui-col-lg11,.layui-col-lg12,.layui-col-lg2,.layui-col-lg3,.layui-col-lg4,.layui-col-lg5,.layui-col-lg6,.layui-col-lg7,.layui-col-lg8,.layui-col-lg9{float:left}.layui-col-lg1{width:8.33333333%}.layui-col-lg2{width:16.66666667%}.layui-col-lg3{width:25%}.layui-col-lg4{width:33.33333333%}.layui-col-lg5{width:41.66666667%}.layui-col-lg6{width:50%}.layui-col-lg7{width:58.33333333%}.layui-col-lg8{width:66.66666667%}.layui-col-lg9{width:75%}.layui-col-lg10{width:83.33333333%}.layui-col-lg11{width:91.66666667%}.layui-col-lg12{width:100%}.layui-col-lg-offset1{margin-left:8.33333333%}.layui-col-lg-offset2{margin-left:16.66666667%}.layui-col-lg-offset3{margin-left:25%}.layui-col-lg-offset4{margin-left:33.33333333%}.layui-col-lg-offset5{margin-left:41.66666667%}.layui-col-lg-offset6{margin-left:50%}.layui-col-lg-offset7{margin-left:58.33333333%}.layui-col-lg-offset8{margin-left:66.66666667%}.layui-col-lg-offset9{margin-left:75%}.layui-col-lg-offset10{margin-left:83.33333333%}.layui-col-lg-offset11{margin-left:91.66666667%}.layui-col-lg-offset12{margin-left:100%}}.layui-col-space1{margin:-.5px}.layui-col-space1>*{padding:.5px}.layui-col-space2{margin:-1px}.layui-col-space2>*{padding:1px}.layui-col-space4{margin:-2px}.layui-col-space4>*{padding:2px}.layui-col-space5{margin:-2.5px}.layui-col-space5>*{padding:2.5px}.layui-col-space6{margin:-3px}.layui-col-space6>*{padding:3px}.layui-col-space8{margin:-4px}.layui-col-space8>*{padding:4px}.layui-col-space10{margin:-5px}.layui-col-space10>*{padding:5px}.layui-col-space12{margin:-6px}.layui-col-space12>*{padding:6px}.layui-col-space14{margin:-7px}.layui-col-space14>*{padding:7px}.layui-col-space15{margin:-7.5px}.layui-col-space15>*{padding:7.5px}.layui-col-space16{margin:-8px}.layui-col-space16>*{padding:8px}.layui-col-space18{margin:-9px}.layui-col-space18>*{padding:9px}.layui-col-space20{margin:-10px}.layui-col-space20>*{padding:10px}.layui-col-space22{margin:-11px}.layui-col-space22>*{padding:11px}.layui-col-space24{margin:-12px}.layui-col-space24>*{padding:12px}.layui-col-space25{margin:-12.5px}.layui-col-space25>*{padding:12.5px}.layui-col-space26{margin:-13px}.layui-col-space26>*{padding:13px}.layui-col-space28{margin:-14px}.layui-col-space28>*{padding:14px}.layui-col-space30{margin:-15px}.layui-col-space30>*{padding:15px}.layui-btn,.layui-input,.layui-select,.layui-textarea,.layui-upload-button{outline:0;-webkit-appearance:none;transition:all .3s;-webkit-transition:all .3s;box-sizing:border-box}.layui-elem-quote{margin-bottom:10px;padding:15px;line-height:1.6;border-left:5px solid #5FB878;border-radius:0 2px 2px 0;background-color:#FAFAFA}.layui-quote-nm{border-style:solid;border-width:1px 1px 1px 5px;background:0 0}.layui-elem-field{margin-bottom:10px;padding:0;border-width:1px;border-style:solid}.layui-elem-field legend{margin-left:20px;padding:0 10px;font-size:20px;font-weight:300}.layui-field-title{margin:10px 0 20px;border-width:1px 0 0}.layui-field-box{padding:15px}.layui-field-title .layui-field-box{padding:10px 0}.layui-progress{position:relative;height:6px;border-radius:20px;background-color:#eee}.layui-progress-bar{position:absolute;left:0;top:0;width:0;max-width:100%;height:6px;border-radius:20px;text-align:right;background-color:#5FB878;transition:all .3s;-webkit-transition:all .3s}.layui-progress-big,.layui-progress-big .layui-progress-bar{height:18px;line-height:18px}.layui-progress-text{position:relative;top:-20px;line-height:18px;font-size:12px;color:#666}.layui-progress-big .layui-progress-text{position:static;padding:0 10px;color:#fff}.layui-collapse{border-width:1px;border-style:solid;border-radius:2px}.layui-colla-content,.layui-colla-item{border-top-width:1px;border-top-style:solid}.layui-colla-item:first-child{border-top:none}.layui-colla-title{position:relative;height:42px;line-height:42px;padding:0 15px 0 35px;color:#333;background-color:#FAFAFA;cursor:pointer;font-size:14px;overflow:hidden}.layui-colla-content{display:none;padding:10px 15px;line-height:1.6;color:#666}.layui-colla-icon{position:absolute;left:15px;top:0;font-size:14px}.layui-card-body,.layui-card-header,.layui-form-label,.layui-form-mid,.layui-form-select,.layui-input-block,.layui-input-inline,.layui-panel,.layui-textarea{position:relative}.layui-card{margin-bottom:15px;border-radius:2px;background-color:#fff;box-shadow:0 1px 2px 0 rgba(0,0,0,.05)}.layui-card:last-child{margin-bottom:0}.layui-card-header{height:42px;line-height:42px;padding:0 15px;border-bottom:1px solid #f6f6f6;color:#333;border-radius:2px 2px 0 0;font-size:14px}.layui-card-body{padding:10px 15px;line-height:24px}.layui-card-body[pad15]{padding:15px}.layui-card-body[pad20]{padding:20px}.layui-card-body .layui-table{margin:5px 0}.layui-card .layui-tab{margin:0}.layui-panel{border-width:1px;border-style:solid;border-radius:2px;box-shadow:1px 1px 4px rgb(0 0 0 / 8%);background-color:#fff;color:#666}.layui-bg-black,.layui-bg-blue,.layui-bg-cyan,.layui-bg-green,.layui-bg-orange,.layui-bg-red{color:#fff!important}.layui-panel-window{position:relative;padding:15px;border-radius:0;border-top:5px solid #eee;background-color:#fff}.layui-border,.layui-border-black,.layui-border-blue,.layui-border-cyan,.layui-border-green,.layui-border-orange,.layui-border-red{border-width:1px;border-style:solid}.layui-auxiliar-moving{position:fixed;left:0;right:0;top:0;bottom:0;width:100%;height:100%;background:0 0;z-index:9999999999}.layui-bg-red{background-color:#FF5722!important}.layui-bg-orange{background-color:#FFB800!important}.layui-bg-green{background-color:#009688!important}.layui-bg-cyan{background-color:#2F4056!important}.layui-bg-blue{background-color:#1E9FFF!important}.layui-bg-black{background-color:#393D49!important}.layui-bg-gray{background-color:#FAFAFA!important;color:#666!important}.layui-badge-rim,.layui-border,.layui-colla-content,.layui-colla-item,.layui-collapse,.layui-elem-field,.layui-form-pane .layui-form-item[pane],.layui-form-pane .layui-form-label,.layui-input,.layui-layedit,.layui-layedit-tool,.layui-panel,.layui-quote-nm,.layui-select,.layui-tab-bar,.layui-tab-card,.layui-tab-title,.layui-tab-title .layui-this:after,.layui-textarea{border-color:#eee}.layui-border{color:#666!important}.layui-border-red{border-color:#FF5722!important;color:#FF5722!important}.layui-border-orange{border-color:#FFB800!important;color:#FFB800!important}.layui-border-green{border-color:#009688!important;color:#009688!important}.layui-border-cyan{border-color:#2F4056!important;color:#2F4056!important}.layui-border-blue{border-color:#1E9FFF!important;color:#1E9FFF!important}.layui-border-black{border-color:#393D49!important;color:#393D49!important}.layui-timeline-item:before{background-color:#eee}.layui-text{line-height:1.6;font-size:14px;color:#666}.layui-text h1,.layui-text h2,.layui-text h3{font-weight:500;color:#333}.layui-text h1{font-size:30px}.layui-text h2{font-size:24px}.layui-text h3{font-size:18px}.layui-text a:not(.layui-btn){color:#01AAED}.layui-text a:not(.layui-btn):hover{text-decoration:underline}.layui-text ul{padding:5px 0 5px 15px}.layui-text ul li{margin-top:5px;list-style-type:disc}.layui-text em,.layui-word-aux{color:#999!important;padding-left:5px!important;padding-right:5px!important}.layui-text p{margin:10px 0}.layui-text p:first-child{margin-top:0}.layui-font-12{font-size:12px!important}.layui-font-14{font-size:14px!important}.layui-font-16{font-size:16px!important}.layui-font-18{font-size:18px!important}.layui-font-20{font-size:20px!important}.layui-font-red{color:#FF5722!important}.layui-font-orange{color:#FFB800!important}.layui-font-green{color:#009688!important}.layui-font-cyan{color:#2F4056!important}.layui-font-blue{color:#01AAED!important}.layui-font-black{color:#000!important}.layui-font-gray{color:#c2c2c2!important}.layui-btn{height:38px;line-height:38px;border:1px solid transparent;padding:0 18px;background-color:#009688;color:#fff;white-space:nowrap;text-align:center;font-size:14px;border-radius:2px;cursor:pointer}.layui-btn:hover{opacity:.8;filter:alpha(opacity=80);color:#fff}.layui-btn:active{opacity:1;filter:alpha(opacity=100)}.layui-btn+.layui-btn{margin-left:10px}.layui-btn-container{font-size:0}.layui-btn-container .layui-btn{margin-right:10px;margin-bottom:10px}.layui-btn-container .layui-btn+.layui-btn{margin-left:0}.layui-table .layui-btn-container .layui-btn{margin-bottom:9px}.layui-btn-radius{border-radius:100px}.layui-btn .layui-icon{padding:0 2px;vertical-align:middle\9;vertical-align:bottom}.layui-btn-primary{border-color:#d2d2d2;background:0 0;color:#666}.layui-btn-primary:hover{border-color:#009688;color:#333}.layui-btn-normal{background-color:#1E9FFF}.layui-btn-warm{background-color:#FFB800}.layui-btn-danger{background-color:#FF5722}.layui-btn-checked{background-color:#5FB878}.layui-btn-disabled,.layui-btn-disabled:active,.layui-btn-disabled:hover{border-color:#eee!important;background-color:#FBFBFB!important;color:#d2d2d2!important;cursor:not-allowed!important;opacity:1}.layui-btn-lg{height:44px;line-height:44px;padding:0 25px;font-size:16px}.layui-btn-sm{height:30px;line-height:30px;padding:0 10px;font-size:12px}.layui-btn-xs{height:22px;line-height:22px;padding:0 5px;font-size:12px}.layui-btn-xs i{font-size:12px!important}.layui-btn-group{vertical-align:middle;font-size:0}.layui-btn-group .layui-btn{margin-left:0!important;margin-right:0!important;border-left:1px solid rgba(255,255,255,.5);border-radius:0}.layui-btn-group .layui-btn-primary{border-left:none}.layui-btn-group .layui-btn-primary:hover{border-color:#d2d2d2;color:#009688}.layui-btn-group .layui-btn:first-child{border-left:none;border-radius:2px 0 0 2px}.layui-btn-group .layui-btn-primary:first-child{border-left:1px solid #d2d2d2}.layui-btn-group .layui-btn:last-child{border-radius:0 2px 2px 0}.layui-btn-group .layui-btn+.layui-btn{margin-left:0}.layui-btn-group+.layui-btn-group{margin-left:10px}.layui-btn-fluid{width:100%}.layui-input,.layui-select,.layui-textarea{height:38px;line-height:1.3;line-height:38px\9;border-width:1px;border-style:solid;background-color:#fff;border-radius:2px}.layui-input::-webkit-input-placeholder,.layui-select::-webkit-input-placeholder,.layui-textarea::-webkit-input-placeholder{line-height:1.3}.layui-input,.layui-textarea{display:block;width:100%;padding-left:10px}.layui-input:hover,.layui-textarea:hover{border-color:#eee!important}.layui-input:focus,.layui-textarea:focus{border-color:#d2d2d2!important}.layui-textarea{min-height:100px;height:auto;line-height:20px;padding:6px 10px;resize:vertical}.layui-select{padding:0 10px}.layui-form input[type=checkbox],.layui-form input[type=radio],.layui-form select{display:none}.layui-form [lay-ignore]{display:initial}.layui-form-item{margin-bottom:15px;clear:both;*zoom:1}.layui-form-item:after{content:'\20';clear:both;*zoom:1;display:block;height:0}.layui-form-label{float:left;display:block;padding:9px 15px;width:80px;font-weight:400;line-height:20px;text-align:right}.layui-form-label-col{display:block;float:none;padding:9px 0;line-height:20px;text-align:left}.layui-form-item .layui-inline{margin-bottom:5px;margin-right:10px}.layui-input-block{margin-left:110px;min-height:36px}.layui-input-inline{display:inline-block;vertical-align:middle}.layui-form-item .layui-input-inline{float:left;width:190px;margin-right:10px}.layui-form-text .layui-input-inline{width:auto}.layui-form-mid{float:left;display:block;padding:9px 0!important;line-height:20px;margin-right:10px}.layui-form-danger+.layui-form-select .layui-input,.layui-form-danger:focus{border-color:#FF5722!important}.layui-form-select .layui-input{padding-right:30px;cursor:pointer}.layui-form-select .layui-edge{position:absolute;right:10px;top:50%;margin-top:-3px;cursor:pointer;border-width:6px;border-top-color:#c2c2c2;border-top-style:solid;transition:all .3s;-webkit-transition:all .3s}.layui-form-select dl{display:none;position:absolute;left:0;top:42px;padding:5px 0;z-index:899;min-width:100%;border:1px solid #d2d2d2;max-height:300px;overflow-y:auto;background-color:#fff;border-radius:2px;box-shadow:0 2px 4px rgba(0,0,0,.12);box-sizing:border-box}.layui-form-select dl dd,.layui-form-select dl dt{padding:0 10px;line-height:36px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}.layui-form-select dl dt{font-size:12px;color:#999}.layui-form-select dl dd{cursor:pointer}.layui-form-select dl dd:hover{background-color:#F6F6F6;-webkit-transition:.5s all;transition:.5s all}.layui-form-select .layui-select-group dd{padding-left:20px}.layui-form-select dl dd.layui-select-tips{padding-left:10px!important;color:#999}.layui-form-select dl dd.layui-this{background-color:#5FB878;color:#fff}.layui-form-checkbox,.layui-form-select dl dd.layui-disabled{background-color:#fff}.layui-form-selected dl{display:block}.layui-form-checkbox,.layui-form-checkbox *,.layui-form-switch{display:inline-block;vertical-align:middle}.layui-form-selected .layui-edge{margin-top:-9px;-webkit-transform:rotate(180deg);transform:rotate(180deg);margin-top:-3px\9}:root .layui-form-selected .layui-edge{margin-top:-9px\0/IE9}.layui-form-selectup dl{top:auto;bottom:42px}.layui-select-none{margin:5px 0;text-align:center;color:#999}.layui-select-disabled .layui-disabled{border-color:#eee!important}.layui-select-disabled .layui-edge{border-top-color:#d2d2d2}.layui-form-checkbox{position:relative;height:30px;line-height:30px;margin-right:10px;padding-right:30px;cursor:pointer;font-size:0;-webkit-transition:.1s linear;transition:.1s linear;box-sizing:border-box}.layui-form-checkbox span{padding:0 10px;height:100%;font-size:14px;border-radius:2px 0 0 2px;background-color:#d2d2d2;color:#fff;overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.layui-form-checkbox:hover span{background-color:#c2c2c2}.layui-form-checkbox i{position:absolute;right:0;top:0;width:30px;height:28px;border:1px solid #d2d2d2;border-left:none;border-radius:0 2px 2px 0;color:#fff;font-size:20px;text-align:center}.layui-form-checkbox:hover i{border-color:#c2c2c2;color:#c2c2c2}.layui-form-checked,.layui-form-checked:hover{border-color:#5FB878}.layui-form-checked span,.layui-form-checked:hover span{background-color:#5FB878}.layui-form-checked i,.layui-form-checked:hover i{color:#5FB878}.layui-form-item .layui-form-checkbox{margin-top:4px}.layui-form-checkbox[lay-skin=primary]{height:auto!important;line-height:normal!important;min-width:18px;min-height:18px;border:none!important;margin-right:0;padding-left:28px;padding-right:0;background:0 0}.layui-form-checkbox[lay-skin=primary] span{padding-left:0;padding-right:15px;line-height:18px;background:0 0;color:#666}.layui-form-checkbox[lay-skin=primary] i{right:auto;left:0;width:16px;height:16px;line-height:16px;border:1px solid #d2d2d2;font-size:12px;border-radius:2px;background-color:#fff;-webkit-transition:.1s linear;transition:.1s linear}.layui-form-checkbox[lay-skin=primary]:hover i{border-color:#5FB878;color:#fff}.layui-form-checked[lay-skin=primary] i{border-color:#5FB878!important;background-color:#5FB878;color:#fff}.layui-checkbox-disbaled[lay-skin=primary] span{background:0 0!important;color:#c2c2c2!important}.layui-checkbox-disbaled[lay-skin=primary]:hover i{border-color:#d2d2d2}.layui-form-item .layui-form-checkbox[lay-skin=primary]{margin-top:10px}.layui-form-switch{position:relative;height:22px;line-height:22px;min-width:35px;padding:0 5px;margin-top:8px;border:1px solid #d2d2d2;border-radius:20px;cursor:pointer;background-color:#fff;-webkit-transition:.1s linear;transition:.1s linear}.layui-form-switch i{position:absolute;left:5px;top:3px;width:16px;height:16px;border-radius:20px;background-color:#d2d2d2;-webkit-transition:.1s linear;transition:.1s linear}.layui-form-switch em{position:relative;top:0;width:25px;margin-left:21px;padding:0!important;text-align:center!important;color:#999!important;font-style:normal!important;font-size:12px}.layui-form-onswitch{border-color:#5FB878;background-color:#5FB878}.layui-checkbox-disbaled,.layui-checkbox-disbaled i{border-color:#eee!important}.layui-form-onswitch i{left:100%;margin-left:-21px;background-color:#fff}.layui-form-onswitch em{margin-left:5px;margin-right:21px;color:#fff!important}.layui-checkbox-disbaled span{background-color:#eee!important}.layui-checkbox-disbaled em{color:#d2d2d2!important}.layui-checkbox-disbaled:hover i{color:#fff!important}[lay-radio]{display:none}.layui-form-radio,.layui-form-radio *{display:inline-block;vertical-align:middle}.layui-form-radio{line-height:28px;margin:6px 10px 0 0;padding-right:10px;cursor:pointer;font-size:0}.layui-form-radio *{font-size:14px}.layui-form-radio>i{margin-right:8px;font-size:22px;color:#c2c2c2}.layui-form-radio:hover *,.layui-form-radioed,.layui-form-radioed>i{color:#5FB878}.layui-radio-disbaled>i{color:#eee!important}.layui-radio-disbaled *{color:#c2c2c2!important}.layui-form-pane .layui-form-label{width:110px;padding:8px 15px;height:38px;line-height:20px;border-width:1px;border-style:solid;border-radius:2px 0 0 2px;text-align:center;background-color:#FBFBFB;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;box-sizing:border-box}.layui-form-pane .layui-input-inline{margin-left:-1px}.layui-form-pane .layui-input-block{margin-left:110px;left:-1px}.layui-form-pane .layui-input{border-radius:0 2px 2px 0}.layui-form-pane .layui-form-text .layui-form-label{float:none;width:100%;border-radius:2px;box-sizing:border-box;text-align:left}.layui-form-pane .layui-form-text .layui-input-inline{display:block;margin:0;top:-1px;clear:both}.layui-form-pane .layui-form-text .layui-input-block{margin:0;left:0;top:-1px}.layui-form-pane .layui-form-text .layui-textarea{min-height:100px;border-radius:0 0 2px 2px}.layui-form-pane .layui-form-checkbox{margin:4px 0 4px 10px}.layui-form-pane .layui-form-radio,.layui-form-pane .layui-form-switch{margin-top:6px;margin-left:10px}.layui-form-pane .layui-form-item[pane]{position:relative;border-width:1px;border-style:solid}.layui-form-pane .layui-form-item[pane] .layui-form-label{position:absolute;left:0;top:0;height:100%;border-width:0 1px 0 0}.layui-form-pane .layui-form-item[pane] .layui-input-inline{margin-left:110px}@media screen and (max-width:450px){.layui-form-item .layui-form-label{text-overflow:ellipsis;overflow:hidden;white-space:nowrap}.layui-form-item .layui-inline{display:block;margin-right:0;margin-bottom:20px;clear:both}.layui-form-item .layui-inline:after{content:'\20';clear:both;display:block;height:0}.layui-form-item .layui-input-inline{display:block;float:none;left:-3px;width:auto!important;margin:0 0 10px 112px}.layui-form-item .layui-input-inline+.layui-form-mid{margin-left:110px;top:-5px;padding:0}.layui-form-item .layui-form-checkbox{margin-right:5px;margin-bottom:5px}}.layui-layedit{border-width:1px;border-style:solid;border-radius:2px}.layui-layedit-tool{padding:3px 5px;border-bottom-width:1px;border-bottom-style:solid;font-size:0}.layedit-tool-fixed{position:fixed;top:0;border-top:1px solid #eee}.layui-layedit-tool .layedit-tool-mid,.layui-layedit-tool .layui-icon{display:inline-block;vertical-align:middle;text-align:center;font-size:14px}.layui-layedit-tool .layui-icon{position:relative;width:32px;height:30px;line-height:30px;margin:3px 5px;color:#777;cursor:pointer;border-radius:2px}.layui-layedit-tool .layui-icon:hover{color:#393D49}.layui-layedit-tool .layui-icon:active{color:#000}.layui-layedit-tool .layedit-tool-active{background-color:#eee;color:#000}.layui-layedit-tool .layui-disabled,.layui-layedit-tool .layui-disabled:hover{color:#d2d2d2;cursor:not-allowed}.layui-layedit-tool .layedit-tool-mid{width:1px;height:18px;margin:0 10px;background-color:#d2d2d2}.layedit-tool-html{width:50px!important;font-size:30px!important}.layedit-tool-b,.layedit-tool-code,.layedit-tool-help{font-size:16px!important}.layedit-tool-d,.layedit-tool-face,.layedit-tool-image,.layedit-tool-unlink{font-size:18px!important}.layedit-tool-image input{position:absolute;font-size:0;left:0;top:0;width:100%;height:100%;opacity:.01;filter:Alpha(opacity=1);cursor:pointer}.layui-layedit-iframe iframe{display:block;width:100%}#LAY_layedit_code{overflow:hidden}.layui-laypage{display:inline-block;*display:inline;*zoom:1;vertical-align:middle;margin:10px 0;font-size:0}.layui-laypage>a:first-child,.layui-laypage>a:first-child em{border-radius:2px 0 0 2px}.layui-laypage>a:last-child,.layui-laypage>a:last-child em{border-radius:0 2px 2px 0}.layui-laypage>:first-child{margin-left:0!important}.layui-laypage>:last-child{margin-right:0!important}.layui-laypage a,.layui-laypage button,.layui-laypage input,.layui-laypage select,.layui-laypage span{border:1px solid #eee}.layui-laypage a,.layui-laypage span{display:inline-block;*display:inline;*zoom:1;vertical-align:middle;padding:0 15px;height:28px;line-height:28px;margin:0 -1px 5px 0;background-color:#fff;color:#333;font-size:12px}.layui-flow-more a *,.layui-laypage input,.layui-table-view select[lay-ignore]{display:inline-block}.layui-laypage a:hover{color:#009688}.layui-laypage em{font-style:normal}.layui-laypage .layui-laypage-spr{color:#999;font-weight:700}.layui-laypage a{text-decoration:none}.layui-laypage .layui-laypage-curr{position:relative}.layui-laypage .layui-laypage-curr em{position:relative;color:#fff}.layui-laypage .layui-laypage-curr .layui-laypage-em{position:absolute;left:-1px;top:-1px;padding:1px;width:100%;height:100%;background-color:#009688}.layui-laypage-em{border-radius:2px}.layui-laypage-next em,.layui-laypage-prev em{font-family:Sim sun;font-size:16px}.layui-laypage .layui-laypage-count,.layui-laypage .layui-laypage-limits,.layui-laypage .layui-laypage-refresh,.layui-laypage .layui-laypage-skip{margin-left:10px;margin-right:10px;padding:0;border:none}.layui-laypage .layui-laypage-limits,.layui-laypage .layui-laypage-refresh{vertical-align:top}.layui-laypage .layui-laypage-refresh i{font-size:18px;cursor:pointer}.layui-laypage select{height:22px;padding:3px;border-radius:2px;cursor:pointer}.layui-laypage .layui-laypage-skip{height:30px;line-height:30px;color:#999}.layui-laypage button,.layui-laypage input{height:30px;line-height:30px;border-radius:2px;vertical-align:top;background-color:#fff;box-sizing:border-box}.layui-laypage input{width:40px;margin:0 10px;padding:0 3px;text-align:center}.layui-laypage input:focus,.layui-laypage select:focus{border-color:#009688!important}.layui-laypage button{margin-left:10px;padding:0 10px;cursor:pointer}.layui-table,.layui-table-view{margin:10px 0}.layui-flow-more{margin:10px 0;text-align:center;color:#999;font-size:14px}.layui-flow-more a{height:32px;line-height:32px}.layui-flow-more a *{vertical-align:top}.layui-flow-more a cite{padding:0 20px;border-radius:3px;background-color:#eee;color:#333;font-style:normal}.layui-flow-more a cite:hover{opacity:.8}.layui-flow-more a i{font-size:30px;color:#737383}.layui-table{width:100%;background-color:#fff;color:#666}.layui-table tr{transition:all .3s;-webkit-transition:all .3s}.layui-table th{text-align:left;font-weight:400}.layui-table tbody tr:hover,.layui-table thead tr,.layui-table-click,.layui-table-header,.layui-table-hover,.layui-table-mend,.layui-table-patch,.layui-table-tool,.layui-table-total,.layui-table-total tr,.layui-table[lay-even] tr:nth-child(even){background-color:#FAFAFA}.layui-table td,.layui-table th,.layui-table-col-set,.layui-table-fixed-r,.layui-table-grid-down,.layui-table-header,.layui-table-page,.layui-table-tips-main,.layui-table-tool,.layui-table-total,.layui-table-view,.layui-table[lay-skin=line],.layui-table[lay-skin=row]{border-width:1px;border-style:solid;border-color:#eee}.layui-table td,.layui-table th{position:relative;padding:9px 15px;min-height:20px;line-height:20px;font-size:14px}.layui-table[lay-skin=line] td,.layui-table[lay-skin=line] th{border-width:0 0 1px}.layui-table[lay-skin=row] td,.layui-table[lay-skin=row] th{border-width:0 1px 0 0}.layui-table[lay-skin=nob] td,.layui-table[lay-skin=nob] th{border:none}.layui-table img{max-width:100px}.layui-table[lay-size=lg] td,.layui-table[lay-size=lg] th{padding:15px 30px}.layui-table-view .layui-table[lay-size=lg] .layui-table-cell{height:40px;line-height:40px}.layui-table[lay-size=sm] td,.layui-table[lay-size=sm] th{font-size:12px;padding:5px 10px}.layui-table-view .layui-table[lay-size=sm] .layui-table-cell{height:20px;line-height:20px}.layui-table[lay-data]{display:none}.layui-table-box{position:relative;overflow:hidden}.layui-table-view .layui-table{position:relative;width:auto;margin:0}.layui-table-view .layui-table[lay-skin=line]{border-width:0 1px 0 0}.layui-table-view .layui-table[lay-skin=row]{border-width:0 0 1px}.layui-table-view .layui-table td,.layui-table-view .layui-table th{padding:5px 0;border-top:none;border-left:none}.layui-table-view .layui-table th.layui-unselect .layui-table-cell span{cursor:pointer}.layui-table-view .layui-table td{cursor:default}.layui-table-view .layui-table td[data-edit=text]{cursor:text}.layui-table-view .layui-form-checkbox[lay-skin=primary] i{width:18px;height:18px}.layui-table-view .layui-form-radio{line-height:0;padding:0}.layui-table-view .layui-form-radio>i{margin:0;font-size:20px}.layui-table-init{position:absolute;left:0;top:0;width:100%;height:100%;text-align:center;z-index:110}.layui-table-init .layui-icon{position:absolute;left:50%;top:50%;margin:-15px 0 0 -15px;font-size:30px;color:#c2c2c2}.layui-table-header{border-width:0 0 1px;overflow:hidden}.layui-table-header .layui-table{margin-bottom:-1px}.layui-table-tool .layui-inline[lay-event]{position:relative;width:26px;height:26px;padding:5px;line-height:16px;margin-right:10px;text-align:center;color:#333;border:1px solid #ccc;cursor:pointer;-webkit-transition:.5s all;transition:.5s all}.layui-table-tool .layui-inline[lay-event]:hover{border:1px solid #999}.layui-table-tool-temp{padding-right:120px}.layui-table-tool-self{position:absolute;right:17px;top:10px}.layui-table-tool .layui-table-tool-self .layui-inline[lay-event]{margin:0 0 0 10px}.layui-table-tool-panel{position:absolute;top:29px;left:-1px;padding:5px 0;min-width:150px;min-height:40px;border:1px solid #d2d2d2;text-align:left;overflow-y:auto;background-color:#fff;box-shadow:0 2px 4px rgba(0,0,0,.12)}.layui-table-cell,.layui-table-tool-panel li{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.layui-table-tool-panel li{padding:0 10px;line-height:30px;-webkit-transition:.5s all;transition:.5s all}.layui-menu li,.layui-menu-body-title a:hover,.layui-menu-body-title>.layui-icon:hover{transition:all .3s}.layui-table-tool-panel li .layui-form-checkbox[lay-skin=primary]{width:100%;padding-left:28px}.layui-table-tool-panel li:hover{background-color:#F6F6F6}.layui-table-tool-panel li .layui-form-checkbox[lay-skin=primary] i{position:absolute;left:0;top:0}.layui-table-tool-panel li .layui-form-checkbox[lay-skin=primary] span{padding:0}.layui-table-tool .layui-table-tool-self .layui-table-tool-panel{left:auto;right:-1px}.layui-table-col-set{position:absolute;right:0;top:0;width:20px;height:100%;border-width:0 0 0 1px;background-color:#fff}.layui-table-sort{width:10px;height:20px;margin-left:5px;cursor:pointer!important}.layui-table-sort .layui-edge{position:absolute;left:5px;border-width:5px}.layui-table-sort .layui-table-sort-asc{top:3px;border-top:none;border-bottom-style:solid;border-bottom-color:#b2b2b2}.layui-table-sort .layui-table-sort-asc:hover{border-bottom-color:#666}.layui-table-sort .layui-table-sort-desc{bottom:5px;border-bottom:none;border-top-style:solid;border-top-color:#b2b2b2}.layui-table-sort .layui-table-sort-desc:hover{border-top-color:#666}.layui-table-sort[lay-sort=asc] .layui-table-sort-asc{border-bottom-color:#000}.layui-table-sort[lay-sort=desc] .layui-table-sort-desc{border-top-color:#000}.layui-table-cell{height:28px;line-height:28px;padding:0 15px;position:relative;box-sizing:border-box}.layui-table-cell .layui-form-checkbox[lay-skin=primary]{top:-1px;padding:0}.layui-table-cell .layui-table-link{color:#01AAED}.laytable-cell-checkbox,.laytable-cell-numbers,.laytable-cell-radio,.laytable-cell-space{padding:0;text-align:center}.layui-table-body{position:relative;overflow:auto;margin-right:-1px;margin-bottom:-1px}.layui-table-body .layui-none{line-height:26px;padding:30px 15px;text-align:center;color:#999}.layui-table-fixed{position:absolute;left:0;top:0;z-index:101}.layui-table-fixed .layui-table-body{overflow:hidden}.layui-table-fixed-l{box-shadow:0 -1px 8px rgba(0,0,0,.08)}.layui-table-fixed-r{left:auto;right:-1px;border-width:0 0 0 1px;box-shadow:-1px 0 8px rgba(0,0,0,.08)}.layui-table-fixed-r .layui-table-header{position:relative;overflow:visible}.layui-table-mend{position:absolute;right:-49px;top:0;height:100%;width:50px}.layui-table-tool{position:relative;z-index:890;width:100%;min-height:50px;line-height:30px;padding:10px 15px;border-width:0 0 1px}.layui-table-tool .layui-btn-container{margin-bottom:-10px}.layui-table-page,.layui-table-total{border-width:1px 0 0;margin-bottom:-1px;overflow:hidden}.layui-table-page{position:relative;width:100%;padding:7px 7px 0;height:41px;font-size:12px;white-space:nowrap}.layui-table-page>div{height:26px}.layui-table-page .layui-laypage{margin:0}.layui-table-page .layui-laypage a,.layui-table-page .layui-laypage span{height:26px;line-height:26px;margin-bottom:10px;border:none;background:0 0}.layui-table-page .layui-laypage a,.layui-table-page .layui-laypage span.layui-laypage-curr{padding:0 12px}.layui-table-page .layui-laypage span{margin-left:0;padding:0}.layui-table-page .layui-laypage .layui-laypage-prev{margin-left:-7px!important}.layui-table-page .layui-laypage .layui-laypage-curr .layui-laypage-em{left:0;top:0;padding:0}.layui-table-page .layui-laypage button,.layui-table-page .layui-laypage input{height:26px;line-height:26px}.layui-table-page .layui-laypage input{width:40px}.layui-table-page .layui-laypage button{padding:0 10px}.layui-table-page select{height:18px}.layui-table-patch .layui-table-cell{padding:0;width:30px}.layui-table-edit{position:absolute;left:0;top:0;width:100%;height:100%;padding:0 14px 1px;border-radius:0;box-shadow:1px 1px 20px rgba(0,0,0,.15)}.layui-table-edit:focus{border-color:#5FB878!important}select.layui-table-edit{padding:0 0 0 10px;border-color:#d2d2d2}.layui-table-view .layui-form-checkbox,.layui-table-view .layui-form-radio,.layui-table-view .layui-form-switch{top:0;margin:0;box-sizing:content-box}.layui-colorpicker-alpha-slider,.layui-colorpicker-side-slider,.layui-menu,.layui-menu *,.layui-nav{box-sizing:border-box}.layui-table-view .layui-form-checkbox{top:-1px;height:26px;line-height:26px}.layui-table-view .layui-form-checkbox i{height:26px}.layui-table-grid .layui-table-cell{overflow:visible}.layui-table-grid-down{position:absolute;top:0;right:0;width:26px;height:100%;padding:5px 0;border-width:0 0 0 1px;text-align:center;background-color:#fff;color:#999;cursor:pointer}.layui-table-grid-down .layui-icon{position:absolute;top:50%;left:50%;margin:-8px 0 0 -8px}.layui-table-grid-down:hover{background-color:#fbfbfb}body .layui-table-tips .layui-layer-content{background:0 0;padding:0;box-shadow:0 1px 6px rgba(0,0,0,.12)}.layui-table-tips-main{margin:-44px 0 0 -1px;max-height:150px;padding:8px 15px;font-size:14px;overflow-y:scroll;background-color:#fff;color:#666}.layui-table-tips-c{position:absolute;right:-3px;top:-13px;width:20px;height:20px;padding:3px;cursor:pointer;background-color:#666;border-radius:50%;color:#fff}.layui-table-tips-c:hover{background-color:#777}.layui-table-tips-c:before{position:relative;right:-2px}.layui-upload-file{display:none!important;opacity:.01;filter:Alpha(opacity=1)}.layui-upload-drag,.layui-upload-form,.layui-upload-wrap{display:inline-block}.layui-upload-list{margin:10px 0}.layui-upload-choose{max-width:200px;padding:0 10px;color:#999;font-size:14px;text-overflow:ellipsis;overflow:hidden;white-space:nowrap}.layui-upload-drag{position:relative;padding:30px;border:1px dashed #e2e2e2;background-color:#fff;text-align:center;cursor:pointer;color:#999}.layui-upload-drag .layui-icon{font-size:50px;color:#009688}.layui-upload-drag[lay-over]{border-color:#009688}.layui-upload-iframe{position:absolute;width:0;height:0;border:0;visibility:hidden}.layui-upload-wrap{position:relative;vertical-align:middle}.layui-upload-wrap .layui-upload-file{display:block!important;position:absolute;left:0;top:0;z-index:10;font-size:100px;width:100%;height:100%;opacity:.01;filter:Alpha(opacity=1);cursor:pointer}.layui-btn-container .layui-upload-choose{padding-left:0}.layui-menu{position:relative;margin:5px 0;background-color:#fff}.layui-menu li,.layui-menu-body-title a{padding:5px 15px}.layui-menu li{position:relative;margin:1px 0;width:calc(100% + 1px);line-height:26px;color:rgba(0,0,0,.8);font-size:14px;white-space:nowrap;cursor:pointer}.layui-menu li:hover{background-color:#F6F6F6}.layui-menu-item-parent:hover>.layui-menu-body-panel{display:block;animation-name:layui-fadein;animation-duration:.3s;animation-fill-mode:both;animation-delay:.2s}.layui-menu-item-group .layui-menu-body-title,.layui-menu-item-parent .layui-menu-body-title{padding-right:25px}.layui-menu .layui-menu-item-divider:hover,.layui-menu .layui-menu-item-group:hover,.layui-menu .layui-menu-item-none:hover{background:0 0;cursor:default}.layui-menu .layui-menu-item-group>ul{margin:5px 0 -5px}.layui-menu .layui-menu-item-group>.layui-menu-body-title{color:rgba(0,0,0,.35);user-select:none}.layui-menu .layui-menu-item-none{color:rgba(0,0,0,.35);cursor:default;text-align:center}.layui-menu .layui-menu-item-divider{margin:5px 0;padding:0;height:0;line-height:0;border-bottom:1px solid #eee;overflow:hidden}.layui-menu .layui-menu-item-down:hover,.layui-menu .layui-menu-item-up:hover{cursor:pointer}.layui-menu .layui-menu-item-up>.layui-menu-body-title{color:rgba(0,0,0,.8)}.layui-menu .layui-menu-item-up>ul{visibility:hidden;height:0;overflow:hidden}.layui-menu .layui-menu-item-down:hover>.layui-menu-body-title>.layui-icon,.layui-menu .layui-menu-item-up>.layui-menu-body-title:hover>.layui-icon{color:rgba(0,0,0,1)}.layui-menu .layui-menu-item-down>ul{visibility:visible;height:auto}.layui-breadcrumb,.layui-tree-btnGroup{visibility:hidden}.layui-menu .layui-menu-item-checked,.layui-menu .layui-menu-item-checked2{background-color:#F6F6F6!important;color:#5FB878}.layui-menu .layui-menu-item-checked a,.layui-menu .layui-menu-item-checked2 a{color:#5FB878}.layui-menu .layui-menu-item-checked:after{position:absolute;right:0;top:0;bottom:0;border-right:3px solid #5FB878;content:""}.layui-menu-body-title{position:relative;overflow:hidden;text-overflow:ellipsis}.layui-menu-body-title a{display:block;margin:-5px -15px;color:rgba(0,0,0,.8)}.layui-menu-body-title>.layui-icon{position:absolute;right:0;top:0;font-size:14px}.layui-menu-body-title>.layui-icon-right{right:-1px}.layui-menu-body-panel{display:none;position:absolute;top:-7px;left:100%;z-index:1000;margin-left:13px;padding:5px 0}.layui-menu-body-panel:before{content:"";position:absolute;width:20px;left:-16px;top:0;bottom:0}.layui-menu-body-panel-left{left:auto;right:100%;margin:0 13px}.layui-menu-body-panel-left:before{left:auto;right:-16px}.layui-menu-lg li{line-height:32px}.layui-menu-lg .layui-menu-body-title a:hover,.layui-menu-lg li:hover{background:0 0;color:#5FB878}.layui-menu-lg li .layui-menu-body-panel{margin-left:14px}.layui-menu-lg li .layui-menu-body-panel-left{margin:0 15px}.layui.mDropdown{position:absolute;left:-999999px;top:-999999px;z-index:66666666;margin:5px 0;min-width:100px}.layui.mDropdown:before{content:"";position:absolute;width:100%;height:6px;left:0;top:-6px}.layui-nav{position:relative;padding:0 20px;background-color:#393D49;color:#fff;border-radius:2px;font-size:0}.layui-nav *{font-size:14px}.layui-nav .layui-nav-item{position:relative;display:inline-block;*display:inline;*zoom:1;vertical-align:middle;line-height:60px}.layui-nav .layui-nav-item a{display:block;padding:0 20px;color:#fff;color:rgba(255,255,255,.7);transition:all .3s;-webkit-transition:all .3s}.layui-nav .layui-this:after,.layui-nav-bar{content:"";position:absolute;left:0;top:0;width:0;height:5px;background-color:#5FB878;transition:all .2s;-webkit-transition:all .2s;pointer-events:none}.layui-nav-bar{z-index:1000}.layui-nav[lay-bar=disabled] .layui-nav-bar{display:none}.layui-nav .layui-nav-item a:hover,.layui-nav .layui-this a{color:#fff}.layui-nav .layui-this:after{top:auto;bottom:0;width:100%}.layui-nav-img{width:30px;height:30px;margin-right:10px;border-radius:50%}.layui-nav .layui-nav-more{position:absolute;top:0;right:3px;left:auto!important;margin-top:0;font-size:12px;cursor:pointer;transition:all .2s;-webkit-transition:all .2s}.layui-nav .layui-nav-mored,.layui-nav-itemed>a .layui-nav-more{transform:rotate(180deg)}.layui-nav-child{display:none;position:absolute;left:0;top:65px;min-width:100%;line-height:36px;padding:5px 0;box-shadow:0 2px 4px rgba(0,0,0,.12);border:1px solid #eee;background-color:#fff;z-index:100;border-radius:2px;white-space:nowrap}.layui-nav .layui-nav-child a{color:#666;color:rgba(0,0,0,.8)}.layui-nav .layui-nav-child a:hover{background-color:#F6F6F6;color:rgba(0,0,0,.8)}.layui-nav-child dd{margin:1px 0;position:relative}.layui-nav-child dd.layui-this{background-color:#F6F6F6;color:#000}.layui-nav-child dd.layui-this:after{display:none}.layui-nav-child-r{left:auto;right:0}.layui-nav-child-c{text-align:center}.layui-nav-tree{width:200px;padding:0}.layui-nav-tree .layui-nav-item{display:block;width:100%;line-height:40px}.layui-nav-tree .layui-nav-item a{position:relative;height:40px;line-height:40px;text-overflow:ellipsis;overflow:hidden;white-space:nowrap}.layui-nav-tree .layui-nav-item>a{padding-top:5px;padding-bottom:5px}.layui-nav-tree .layui-nav-more{right:15px}.layui-nav-tree .layui-nav-item>a .layui-nav-more{padding:5px 0}.layui-nav-tree .layui-nav-bar{width:5px;height:0;background-color:#009688}.layui-side .layui-nav-tree .layui-nav-bar{width:2px}.layui-nav-tree .layui-nav-child dd.layui-this,.layui-nav-tree .layui-nav-child dd.layui-this a,.layui-nav-tree .layui-this,.layui-nav-tree .layui-this>a,.layui-nav-tree .layui-this>a:hover{background-color:#009688;color:#fff}.layui-nav-tree .layui-this:after{display:none}.layui-nav-itemed>a,.layui-nav-tree .layui-nav-title a,.layui-nav-tree .layui-nav-title a:hover{color:#fff!important}.layui-nav-tree .layui-nav-child{position:relative;z-index:0;top:0;border:none;box-shadow:none}.layui-nav-tree .layui-nav-child dd{margin:0}.layui-nav-tree .layui-nav-child a{color:#fff;color:rgba(255,255,255,.7)}.layui-nav-tree .layui-nav-child,.layui-nav-tree .layui-nav-child a:hover{background:0 0;color:#fff}.layui-nav-itemed>.layui-nav-child{display:block;background-color:rgba(0,0,0,.3)!important}.layui-nav-itemed>.layui-nav-child>.layui-this>.layui-nav-child{display:block}.layui-nav-side{position:fixed;top:0;bottom:0;left:0;overflow-x:hidden;z-index:999}.layui-breadcrumb{font-size:0}.layui-breadcrumb>*{font-size:14px}.layui-breadcrumb a{color:#999!important}.layui-breadcrumb a:hover{color:#5FB878!important}.layui-breadcrumb a cite{color:#666;font-style:normal}.layui-breadcrumb span[lay-separator]{margin:0 10px;color:#999}.layui-tab{margin:10px 0;text-align:left!important}.layui-tab[overflow]>.layui-tab-title{overflow:hidden}.layui-tab-title{position:relative;left:0;height:40px;white-space:nowrap;font-size:0;border-bottom-width:1px;border-bottom-style:solid;transition:all .2s;-webkit-transition:all .2s}.layui-tab-title li{display:inline-block;*display:inline;*zoom:1;vertical-align:middle;font-size:14px;transition:all .2s;-webkit-transition:all .2s;position:relative;line-height:40px;min-width:65px;padding:0 15px;text-align:center;cursor:pointer}.layui-tab-title li a{display:block;padding:0 15px;margin:0 -15px}.layui-tab-title .layui-this{color:#000}.layui-tab-title .layui-this:after{position:absolute;left:0;top:0;content:"";width:100%;height:41px;border-width:1px;border-style:solid;border-bottom-color:#fff;border-radius:2px 2px 0 0;box-sizing:border-box;pointer-events:none}.layui-tab-bar{position:absolute;right:0;top:0;z-index:10;width:30px;height:39px;line-height:39px;border-width:1px;border-style:solid;border-radius:2px;text-align:center;background-color:#fff;cursor:pointer}.layui-tab-bar .layui-icon{position:relative;display:inline-block;top:3px;transition:all .3s;-webkit-transition:all .3s}.layui-tab-item{display:none}.layui-tab-more{padding-right:30px;height:auto!important;white-space:normal!important}.layui-tab-more li.layui-this:after{border-bottom-color:#eee;border-radius:2px}.layui-tab-more .layui-tab-bar .layui-icon{top:-2px;top:3px\9;-webkit-transform:rotate(180deg);transform:rotate(180deg)}:root .layui-tab-more .layui-tab-bar .layui-icon{top:-2px\0/IE9}.layui-tab-content{padding:15px 0}.layui-tab-title li .layui-tab-close{position:relative;display:inline-block;width:18px;height:18px;line-height:20px;margin-left:8px;top:1px;text-align:center;font-size:14px;color:#c2c2c2;transition:all .2s;-webkit-transition:all .2s}.layui-tab-title li .layui-tab-close:hover{border-radius:2px;background-color:#FF5722;color:#fff}.layui-tab-brief>.layui-tab-title .layui-this{color:#009688}.layui-tab-brief>.layui-tab-more li.layui-this:after,.layui-tab-brief>.layui-tab-title .layui-this:after{border:none;border-radius:0;border-bottom:2px solid #5FB878}.layui-tab-brief[overflow]>.layui-tab-title .layui-this:after{top:-1px}.layui-tab-card{border-width:1px;border-style:solid;border-radius:2px;box-shadow:0 2px 5px 0 rgba(0,0,0,.1)}.layui-tab-card>.layui-tab-title{background-color:#FAFAFA}.layui-tab-card>.layui-tab-title li{margin-right:-1px;margin-left:-1px}.layui-tab-card>.layui-tab-title .layui-this{background-color:#fff}.layui-tab-card>.layui-tab-title .layui-this:after{border-top:none;border-width:1px;border-bottom-color:#fff}.layui-tab-card>.layui-tab-title .layui-tab-bar{height:40px;line-height:40px;border-radius:0;border-top:none;border-right:none}.layui-tab-card>.layui-tab-more .layui-this{background:0 0;color:#5FB878}.layui-tab-card>.layui-tab-more .layui-this:after{border:none}.layui-timeline{padding-left:5px}.layui-timeline-item{position:relative;padding-bottom:20px}.layui-timeline-axis{position:absolute;left:-5px;top:0;z-index:10;width:20px;height:20px;line-height:20px;background-color:#fff;color:#5FB878;border-radius:50%;text-align:center;cursor:pointer}.layui-timeline-axis:hover{color:#FF5722}.layui-timeline-item:before{content:"";position:absolute;left:5px;top:0;z-index:0;width:1px;height:100%}.layui-timeline-item:first-child:before{display:block}.layui-timeline-item:last-child:before{display:none}.layui-timeline-content{padding-left:25px}.layui-timeline-title{position:relative;margin-bottom:10px;line-height:22px}.layui-badge,.layui-badge-dot,.layui-badge-rim{position:relative;display:inline-block;padding:0 6px;font-size:12px;text-align:center;background-color:#FF5722;color:#fff;border-radius:2px}.layui-badge{height:18px;line-height:18px}.layui-badge-dot{width:8px;height:8px;padding:0;border-radius:50%}.layui-badge-rim{height:18px;line-height:18px;border-width:1px;border-style:solid;background-color:#fff;color:#666}.layui-btn .layui-badge,.layui-btn .layui-badge-dot{margin-left:5px}.layui-nav .layui-badge,.layui-nav .layui-badge-dot{position:absolute;top:50%;margin:-5px 6px 0}.layui-nav .layui-badge{margin-top:-10px}.layui-tab-title .layui-badge,.layui-tab-title .layui-badge-dot{left:5px;top:-2px}.layui-carousel{position:relative;left:0;top:0;background-color:#f8f8f8}.layui-carousel>[carousel-item]{position:relative;width:100%;height:100%;overflow:hidden}.layui-carousel>[carousel-item]:before{position:absolute;content:'\e63d';left:50%;top:50%;width:100px;line-height:20px;margin:-10px 0 0 -50px;text-align:center;color:#c2c2c2;font-family:layui-icon!important;font-size:30px;font-style:normal;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.layui-carousel>[carousel-item]>*{display:none;position:absolute;left:0;top:0;width:100%;height:100%;background-color:#f8f8f8;transition-duration:.3s;-webkit-transition-duration:.3s}.layui-carousel-updown>*{-webkit-transition:.3s ease-in-out up;transition:.3s ease-in-out up}.layui-carousel-arrow{display:none\9;opacity:0;position:absolute;left:10px;top:50%;margin-top:-18px;width:36px;height:36px;line-height:36px;text-align:center;font-size:20px;border:0;border-radius:50%;background-color:rgba(0,0,0,.2);color:#fff;-webkit-transition-duration:.3s;transition-duration:.3s;cursor:pointer}.layui-carousel-arrow[lay-type=add]{left:auto!important;right:10px}.layui-carousel:hover .layui-carousel-arrow[lay-type=add],.layui-carousel[lay-arrow=always] .layui-carousel-arrow[lay-type=add]{right:20px}.layui-carousel[lay-arrow=always] .layui-carousel-arrow{opacity:1;left:20px}.layui-carousel[lay-arrow=none] .layui-carousel-arrow{display:none}.layui-carousel-arrow:hover,.layui-carousel-ind ul:hover{background-color:rgba(0,0,0,.35)}.layui-carousel:hover .layui-carousel-arrow{display:block\9;opacity:1;left:20px}.layui-carousel-ind{position:relative;top:-35px;width:100%;line-height:0!important;text-align:center;font-size:0}.layui-carousel[lay-indicator=outside]{margin-bottom:30px}.layui-carousel[lay-indicator=outside] .layui-carousel-ind{top:10px}.layui-carousel[lay-indicator=outside] .layui-carousel-ind ul{background-color:rgba(0,0,0,.5)}.layui-carousel[lay-indicator=none] .layui-carousel-ind{display:none}.layui-carousel-ind ul{display:inline-block;padding:5px;background-color:rgba(0,0,0,.2);border-radius:10px;-webkit-transition-duration:.3s;transition-duration:.3s}.layui-carousel-ind li{display:inline-block;width:10px;height:10px;margin:0 3px;font-size:14px;background-color:#eee;background-color:rgba(255,255,255,.5);border-radius:50%;cursor:pointer;-webkit-transition-duration:.3s;transition-duration:.3s}.layui-carousel-ind li:hover{background-color:rgba(255,255,255,.7)}.layui-carousel-ind li.layui-this{background-color:#fff}.layui-carousel>[carousel-item]>.layui-carousel-next,.layui-carousel>[carousel-item]>.layui-carousel-prev,.layui-carousel>[carousel-item]>.layui-this{display:block}.layui-carousel>[carousel-item]>.layui-this{left:0}.layui-carousel>[carousel-item]>.layui-carousel-prev{left:-100%}.layui-carousel>[carousel-item]>.layui-carousel-next{left:100%}.layui-carousel>[carousel-item]>.layui-carousel-next.layui-carousel-left,.layui-carousel>[carousel-item]>.layui-carousel-prev.layui-carousel-right{left:0}.layui-carousel>[carousel-item]>.layui-this.layui-carousel-left{left:-100%}.layui-carousel>[carousel-item]>.layui-this.layui-carousel-right{left:100%}.layui-carousel[lay-anim=updown] .layui-carousel-arrow{left:50%!important;top:20px;margin:0 0 0 -18px}.layui-carousel[lay-anim=updown]>[carousel-item]>*,.layui-carousel[lay-anim=fade]>[carousel-item]>*{left:0!important}.layui-carousel[lay-anim=updown] .layui-carousel-arrow[lay-type=add]{top:auto!important;bottom:20px}.layui-carousel[lay-anim=updown] .layui-carousel-ind{position:absolute;top:50%;right:20px;width:auto;height:auto}.layui-carousel[lay-anim=updown] .layui-carousel-ind ul{padding:3px 5px}.layui-carousel[lay-anim=updown] .layui-carousel-ind li{display:block;margin:6px 0}.layui-carousel[lay-anim=updown]>[carousel-item]>.layui-this{top:0}.layui-carousel[lay-anim=updown]>[carousel-item]>.layui-carousel-prev{top:-100%}.layui-carousel[lay-anim=updown]>[carousel-item]>.layui-carousel-next{top:100%}.layui-carousel[lay-anim=updown]>[carousel-item]>.layui-carousel-next.layui-carousel-left,.layui-carousel[lay-anim=updown]>[carousel-item]>.layui-carousel-prev.layui-carousel-right{top:0}.layui-carousel[lay-anim=updown]>[carousel-item]>.layui-this.layui-carousel-left{top:-100%}.layui-carousel[lay-anim=updown]>[carousel-item]>.layui-this.layui-carousel-right{top:100%}.layui-carousel[lay-anim=fade]>[carousel-item]>.layui-carousel-next,.layui-carousel[lay-anim=fade]>[carousel-item]>.layui-carousel-prev{opacity:0}.layui-carousel[lay-anim=fade]>[carousel-item]>.layui-carousel-next.layui-carousel-left,.layui-carousel[lay-anim=fade]>[carousel-item]>.layui-carousel-prev.layui-carousel-right{opacity:1}.layui-carousel[lay-anim=fade]>[carousel-item]>.layui-this.layui-carousel-left,.layui-carousel[lay-anim=fade]>[carousel-item]>.layui-this.layui-carousel-right{opacity:0}.layui-fixbar{position:fixed;right:15px;bottom:15px;z-index:999999}.layui-fixbar li{width:50px;height:50px;line-height:50px;margin-bottom:1px;text-align:center;cursor:pointer;font-size:30px;background-color:#9F9F9F;color:#fff;border-radius:2px;opacity:.95}.layui-fixbar li:hover{opacity:.85}.layui-fixbar li:active{opacity:1}.layui-fixbar .layui-fixbar-top{display:none;font-size:40px}body .layui-util-face{border:none;background:0 0}body .layui-util-face .layui-layer-content{padding:0;background-color:#fff;color:#666;box-shadow:none}.layui-util-face .layui-layer-TipsG{display:none}.layui-transfer-active,.layui-transfer-box{display:inline-block;vertical-align:middle}.layui-util-face ul{position:relative;width:372px;padding:10px;border:1px solid #D9D9D9;background-color:#fff;box-shadow:0 0 20px rgba(0,0,0,.2)}.layui-util-face ul li{cursor:pointer;float:left;border:1px solid #e8e8e8;height:22px;width:26px;overflow:hidden;margin:-1px 0 0 -1px;padding:4px 2px;text-align:center}.layui-util-face ul li:hover{position:relative;z-index:2;border:1px solid #eb7350;background:#fff9ec}.layui-code{position:relative;margin:10px 0;padding:15px;line-height:20px;border:1px solid #eee;border-left-width:6px;background-color:#FAFAFA;color:#333;font-family:Courier New;font-size:12px}.layui-transfer-box,.layui-transfer-header,.layui-transfer-search{border-width:0;border-style:solid;border-color:#eee}.layui-transfer-box{position:relative;border-width:1px;width:200px;height:360px;border-radius:2px;background-color:#fff}.layui-transfer-box .layui-form-checkbox{width:100%;margin:0!important}.layui-transfer-header{height:38px;line-height:38px;padding:0 10px;border-bottom-width:1px}.layui-transfer-search{position:relative;padding:10px;border-bottom-width:1px}.layui-transfer-search .layui-input{height:32px;padding-left:30px;font-size:12px}.layui-transfer-search .layui-icon-search{position:absolute;left:20px;top:50%;margin-top:-8px;color:#666}.layui-transfer-active{margin:0 15px}.layui-transfer-active .layui-btn{display:block;margin:0;padding:0 15px;background-color:#5FB878;border-color:#5FB878;color:#fff}.layui-transfer-active .layui-btn-disabled{background-color:#FBFBFB;border-color:#eee;color:#d2d2d2}.layui-transfer-active .layui-btn:first-child{margin-bottom:15px}.layui-transfer-active .layui-btn .layui-icon{margin:0;font-size:14px!important}.layui-transfer-data{padding:5px 0;overflow:auto}.layui-transfer-data li{height:32px;line-height:32px;padding:0 10px}.layui-transfer-data li:hover{background-color:#F6F6F6;transition:.5s all}.layui-transfer-data .layui-none{padding:15px 10px;text-align:center;color:#999}.layui-rate,.layui-rate *{display:inline-block;vertical-align:middle}.layui-rate{padding:10px 5px 10px 0;font-size:0}.layui-rate li i.layui-icon{font-size:20px;color:#FFB800;margin-right:5px;transition:all .3s;-webkit-transition:all .3s}.layui-rate li i:hover{cursor:pointer;transform:scale(1.12);-webkit-transform:scale(1.12)}.layui-rate[readonly] li i:hover{cursor:default;transform:scale(1)}.layui-colorpicker{width:26px;height:26px;border:1px solid #eee;padding:5px;border-radius:2px;line-height:24px;display:inline-block;cursor:pointer;transition:all .3s;-webkit-transition:all .3s}.layui-colorpicker:hover{border-color:#d2d2d2}.layui-colorpicker.layui-colorpicker-lg{width:34px;height:34px;line-height:32px}.layui-colorpicker.layui-colorpicker-sm{width:24px;height:24px;line-height:22px}.layui-colorpicker.layui-colorpicker-xs{width:22px;height:22px;line-height:20px}.layui-colorpicker-trigger-bgcolor{display:block;background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAIAAADZF8uwAAAAGUlEQVQYV2M4gwH+YwCGIasIUwhT25BVBADtzYNYrHvv4gAAAABJRU5ErkJggg==);border-radius:2px}.layui-colorpicker-trigger-span{display:block;height:100%;box-sizing:border-box;border:1px solid rgba(0,0,0,.15);border-radius:2px;text-align:center}.layui-colorpicker-trigger-i{display:inline-block;color:#FFF;font-size:12px}.layui-colorpicker-trigger-i.layui-icon-close{color:#999}.layui-colorpicker-main{position:absolute;z-index:66666666;width:280px;padding:7px;background:#FFF;border:1px solid #d2d2d2;border-radius:2px;box-shadow:0 2px 4px rgba(0,0,0,.12)}.layui-colorpicker-main-wrapper{height:180px;position:relative}.layui-colorpicker-basis{width:260px;height:100%;position:relative}.layui-colorpicker-basis-white{width:100%;height:100%;position:absolute;top:0;left:0;background:linear-gradient(90deg,#FFF,hsla(0,0%,100%,0))}.layui-colorpicker-basis-black{width:100%;height:100%;position:absolute;top:0;left:0;background:linear-gradient(0deg,#000,transparent)}.layui-colorpicker-basis-cursor{width:10px;height:10px;border:1px solid #FFF;border-radius:50%;position:absolute;top:-3px;right:-3px;cursor:pointer}.layui-colorpicker-side{position:absolute;top:0;right:0;width:12px;height:100%;background:linear-gradient(red,#FF0,#0F0,#0FF,#00F,#F0F,red)}.layui-colorpicker-side-slider{width:100%;height:5px;box-shadow:0 0 1px #888;background:#FFF;border-radius:1px;border:1px solid #f0f0f0;cursor:pointer;position:absolute;left:0}.layui-colorpicker-main-alpha{display:none;height:12px;margin-top:7px;background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAIAAADZF8uwAAAAGUlEQVQYV2M4gwH+YwCGIasIUwhT25BVBADtzYNYrHvv4gAAAABJRU5ErkJggg==)}.layui-colorpicker-alpha-bgcolor{height:100%;position:relative}.layui-colorpicker-alpha-slider{width:5px;height:100%;box-shadow:0 0 1px #888;background:#FFF;border-radius:1px;border:1px solid #f0f0f0;cursor:pointer;position:absolute;top:0}.layui-colorpicker-main-pre{padding-top:7px;font-size:0}.layui-colorpicker-pre{width:20px;height:20px;border-radius:2px;display:inline-block;margin-left:6px;margin-bottom:7px;cursor:pointer}.layui-colorpicker-pre:nth-child(11n+1){margin-left:0}.layui-colorpicker-pre-isalpha{background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAIAAADZF8uwAAAAGUlEQVQYV2M4gwH+YwCGIasIUwhT25BVBADtzYNYrHvv4gAAAABJRU5ErkJggg==)}.layui-colorpicker-pre.layui-this{box-shadow:0 0 3px 2px rgba(0,0,0,.15)}.layui-colorpicker-pre>div{height:100%;border-radius:2px}.layui-colorpicker-main-input{text-align:right;padding-top:7px}.layui-colorpicker-main-input .layui-btn-container .layui-btn{margin:0 0 0 10px}.layui-colorpicker-main-input div.layui-inline{float:left;margin-right:10px;font-size:14px}.layui-colorpicker-main-input input.layui-input{width:150px;height:30px;color:#666}.layui-slider{height:4px;background:#eee;border-radius:3px;position:relative;cursor:pointer}.layui-slider-bar{border-radius:3px;position:absolute;height:100%}.layui-slider-step{position:absolute;top:0;width:4px;height:4px;border-radius:50%;background:#FFF;-webkit-transform:translateX(-50%);transform:translateX(-50%)}.layui-slider-wrap{width:36px;height:36px;position:absolute;top:-16px;-webkit-transform:translateX(-50%);transform:translateX(-50%);z-index:10;text-align:center}.layui-slider-wrap-btn{width:12px;height:12px;border-radius:50%;background:#FFF;display:inline-block;vertical-align:middle;cursor:pointer;transition:.3s}.layui-slider-wrap:after{content:"";height:100%;display:inline-block;vertical-align:middle}.layui-slider-wrap-btn.layui-slider-hover,.layui-slider-wrap-btn:hover{transform:scale(1.2)}.layui-slider-wrap-btn.layui-disabled:hover{transform:scale(1)!important}.layui-slider-tips{position:absolute;top:-42px;z-index:66666666;white-space:nowrap;display:none;-webkit-transform:translateX(-50%);transform:translateX(-50%);color:#FFF;background:#000;border-radius:3px;height:25px;line-height:25px;padding:0 10px}.layui-slider-tips:after{content:"";position:absolute;bottom:-12px;left:50%;margin-left:-6px;width:0;height:0;border-width:6px;border-style:solid;border-color:#000 transparent transparent}.layui-slider-input{width:70px;height:32px;border:1px solid #eee;border-radius:3px;font-size:16px;line-height:32px;position:absolute;right:0;top:-14px}.layui-slider-input-btn{position:absolute;top:0;right:0;width:20px;height:100%;border-left:1px solid #eee}.layui-slider-input-btn i{cursor:pointer;position:absolute;right:0;bottom:0;width:20px;height:50%;font-size:12px;line-height:16px;text-align:center;color:#999}.layui-slider-input-btn i:first-child{top:0;border-bottom:1px solid #eee}.layui-slider-input-txt{height:100%;font-size:14px}.layui-slider-input-txt input{height:100%;border:none}.layui-slider-input-btn i:hover{color:#009688}.layui-slider-vertical{width:4px;margin-left:33px}.layui-slider-vertical .layui-slider-bar{width:4px}.layui-slider-vertical .layui-slider-step{top:auto;left:0;-webkit-transform:translateY(50%);transform:translateY(50%)}.layui-slider-vertical .layui-slider-wrap{top:auto;left:-16px;-webkit-transform:translateY(50%);transform:translateY(50%)}.layui-slider-vertical .layui-slider-tips{top:auto;left:2px}@media \0screen{.layui-slider-wrap-btn{margin-left:-20px}.layui-slider-vertical .layui-slider-wrap-btn{margin-left:0;margin-bottom:-20px}.layui-slider-vertical .layui-slider-tips{margin-left:-8px}.layui-slider>span{margin-left:8px}}.layui-tree{line-height:22px}.layui-tree .layui-form-checkbox{margin:0!important}.layui-tree-set{width:100%;position:relative}.layui-tree-pack{display:none;padding-left:20px;position:relative}.layui-tree-iconClick,.layui-tree-main{display:inline-block;vertical-align:middle}.layui-tree-line .layui-tree-pack{padding-left:27px}.layui-tree-line .layui-tree-set .layui-tree-set:after{content:"";position:absolute;top:14px;left:-9px;width:17px;height:0;border-top:1px dotted #c0c4cc}.layui-tree-entry{position:relative;padding:3px 0;height:20px;white-space:nowrap}.layui-tree-entry:hover{background-color:#eee}.layui-tree-line .layui-tree-entry:hover{background-color:rgba(0,0,0,0)}.layui-tree-line .layui-tree-entry:hover .layui-tree-txt{color:#999;text-decoration:underline;transition:.3s}.layui-tree-main{cursor:pointer;padding-right:10px}.layui-tree-line .layui-tree-set:before{content:"";position:absolute;top:0;left:-9px;width:0;height:100%;border-left:1px dotted #c0c4cc}.layui-tree-line .layui-tree-set.layui-tree-setLineShort:before{height:13px}.layui-tree-line .layui-tree-set.layui-tree-setHide:before{height:0}.layui-tree-iconClick{position:relative;height:20px;line-height:20px;margin:0 10px;color:#c0c4cc}.layui-tree-icon{height:12px;line-height:12px;width:12px;text-align:center;border:1px solid #c0c4cc}.layui-tree-iconClick .layui-icon{font-size:18px}.layui-tree-icon .layui-icon{font-size:12px;color:#666}.layui-tree-iconArrow{padding:0 5px}.layui-tree-iconArrow:after{content:"";position:absolute;left:4px;top:3px;z-index:100;width:0;height:0;border-width:5px;border-style:solid;border-color:transparent transparent transparent #c0c4cc;transition:.5s}.layui-tree-btnGroup,.layui-tree-editInput{position:relative;vertical-align:middle;display:inline-block}.layui-tree-spread>.layui-tree-entry>.layui-tree-iconClick>.layui-tree-iconArrow:after{transform:rotate(90deg) translate(3px,4px)}.layui-tree-txt{display:inline-block;vertical-align:middle;color:#555}.layui-tree-search{margin-bottom:15px;color:#666}.layui-tree-btnGroup .layui-icon{display:inline-block;vertical-align:middle;padding:0 2px;cursor:pointer}.layui-tree-btnGroup .layui-icon:hover{color:#999;transition:.3s}.layui-tree-entry:hover .layui-tree-btnGroup{visibility:visible}.layui-tree-editInput{height:20px;line-height:20px;padding:0 3px;border:none;background-color:rgba(0,0,0,.05)}.layui-tree-emptyText{text-align:center;color:#999}.layui-anim{-webkit-animation-duration:.3s;-webkit-animation-fill-mode:both;animation-duration:.3s;animation-fill-mode:both}.layui-anim.layui-icon{display:inline-block}.layui-anim-loop{-webkit-animation-iteration-count:infinite;animation-iteration-count:infinite}.layui-trans,.layui-trans a{transition:all .2s;-webkit-transition:all .2s}@-webkit-keyframes layui-rotate{from{-webkit-transform:rotate(0)}to{-webkit-transform:rotate(360deg)}}@keyframes layui-rotate{from{transform:rotate(0)}to{transform:rotate(360deg)}}.layui-anim-rotate{-webkit-animation-name:layui-rotate;animation-name:layui-rotate;-webkit-animation-duration:1s;animation-duration:1s;-webkit-animation-timing-function:linear;animation-timing-function:linear}@-webkit-keyframes layui-up{from{-webkit-transform:translate3d(0,100%,0);opacity:.3}to{-webkit-transform:translate3d(0,0,0);opacity:1}}@keyframes layui-up{from{transform:translate3d(0,100%,0);opacity:.3}to{transform:translate3d(0,0,0);opacity:1}}.layui-anim-up{-webkit-animation-name:layui-up;animation-name:layui-up}@-webkit-keyframes layui-upbit{from{-webkit-transform:translate3d(0,15px,0);opacity:.3}to{-webkit-transform:translate3d(0,0,0);opacity:1}}@keyframes layui-upbit{from{transform:translate3d(0,15px,0);opacity:.3}to{transform:translate3d(0,0,0);opacity:1}}.layui-anim-upbit{-webkit-animation-name:layui-upbit;animation-name:layui-upbit}@keyframes layui-down{0%{opacity:.3;transform:translate3d(0,-100%,0)}100%{opacity:1;transform:translate3d(0,0,0)}}.layui-anim-down{animation-name:layui-down}@keyframes layui-downbit{0%{opacity:.3;transform:translate3d(0,-5px,0)}100%{opacity:1;transform:translate3d(0,0,0)}}.layui-anim-downbit{animation-name:layui-downbit}@-webkit-keyframes layui-scale{0%{opacity:.3;-webkit-transform:scale(.5)}100%{opacity:1;-webkit-transform:scale(1)}}@keyframes layui-scale{0%{opacity:.3;-ms-transform:scale(.5);transform:scale(.5)}100%{opacity:1;-ms-transform:scale(1);transform:scale(1)}}.layui-anim-scale{-webkit-animation-name:layui-scale;animation-name:layui-scale}@-webkit-keyframes layui-scale-spring{0%{opacity:.5;-webkit-transform:scale(.5)}80%{opacity:.8;-webkit-transform:scale(1.1)}100%{opacity:1;-webkit-transform:scale(1)}}@keyframes layui-scale-spring{0%{opacity:.5;transform:scale(.5)}80%{opacity:.8;transform:scale(1.1)}100%{opacity:1;transform:scale(1)}}.layui-anim-scaleSpring{-webkit-animation-name:layui-scale-spring;animation-name:layui-scale-spring}@keyframes layui-scalesmall{0%{opacity:.3;transform:scale(1.5)}100%{opacity:1;transform:scale(1)}}.layui-anim-scalesmall{animation-name:layui-scalesmall}@keyframes layui-scalesmall-spring{0%{opacity:.3;transform:scale(1.5)}80%{opacity:.8;transform:scale(.9)}100%{opacity:1;transform:scale(1)}}.layui-anim-scalesmall-spring{animation-name:layui-scalesmall-spring}@-webkit-keyframes layui-fadein{0%{opacity:0}100%{opacity:1}}@keyframes layui-fadein{0%{opacity:0}100%{opacity:1}}.layui-anim-fadein{-webkit-animation-name:layui-fadein;animation-name:layui-fadein}@-webkit-keyframes layui-fadeout{0%{opacity:1}100%{opacity:0}}@keyframes layui-fadeout{0%{opacity:1}100%{opacity:0}}.layui-anim-fadeout{-webkit-animation-name:layui-fadeout;animation-name:layui-fadeout}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/css/login.css b/pluss-manage-page/src/main/resources/static/resources/css/login.css
new file mode 100644
index 0000000..12c9d28
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/css/login.css
@@ -0,0 +1,672 @@
+/***
+Login page
+***/
+a, button,div, img, input, label{
+    -webkit-border-radius: 0!important;
+    -moz-border-radius: 0!important;
+    border-radius: 4px!important;
+ }
+.login {
+  background-color: #ccc !important; }
+
+.login .logo {
+  margin: 50px auto 20px auto;
+  padding: 15px;
+  text-align: center; }
+
+.login .logo div {
+    font-size: 30px;
+    color: #ffffff;
+}
+
+.login .content {
+/*   background: url(../images/login/bg-white-lock.png) repeat; */
+    background: #fff;
+    box-shadow: 0 0 20px rgba(0,0,0,.08), inset 0 0 3px #fff;
+  width: 360px;
+  margin: 0 auto;
+  margin-bottom: 0px;
+  padding: 30px;
+  padding-top: 20px;
+  padding-bottom: 15px;
+  -webkit-border-radius: 7px;
+  -moz-border-radius: 7px;
+  -ms-border-radius: 7px;
+  -o-border-radius: 7px;
+  border-radius: 7px; }
+
+.login .content h3 {
+     color: #4d5250;}
+
+.login .content h4 {
+      color: #4d5250;}
+
+.login .content p,
+.login .content label {
+  color: #afafaf; }
+
+.login .mt-checkbox > span:after {
+  border-color: #69d0d1; }
+
+.login .content .login-form{
+  padding: 0px;
+  margin: 0px; }
+
+.login .content .form-control {
+    background-color: #fff !important;
+    border-color: #e4e4e4;
+    border: 1px solid #e4e4e4;
+    border-radius: 0;
+    -webkit-transition: border 150ms linear;
+    transition: border 150ms linear;
+    box-shadow: none;}
+  
+.login .content .create-account {
+    border-top: 1px solid #eee;
+    text-align: center;
+    padding-top: 20px;
+    margin-left: -30px;
+    margin-right: -30px;
+}
+
+.login .content .form-title {
+  font-weight: 300;
+  margin-bottom: 25px; }
+
+.login .content .form-actions {
+  background-color: transparent;
+  clear: both;
+  border: 0px;
+  padding: 5px 30px 40px 30px;
+  margin-left: -30px;
+  margin-right: -30px; }
+
+.login .content .form-actions .rememberme {
+  display: inline-block; 
+  font-weight: 100;}
+
+.login .content .form-actions .btn {
+  border-radius: 4px!important;
+  margin-top: 1px; }
+
+/* footer copyright */
+.login .copyright {
+  text-align: center;
+  margin: 0 auto;
+  padding: 10px;
+  color: #eee;
+  font-size: 13px; }
+  
+  .login .copyright a{
+    color: #eee !important;
+  }
+  
+
+@media (max-width: 480px) {
+  /***
+  Login page
+  ***/
+  .login .logo {
+    margin-top: 10px; }
+  .login .content {
+    padding: 30px;
+    /* width: 222px; */ }
+  .login .content h3 {
+    font-size: 22px; }
+  .login .checkbox {
+    font-size: 13px; } }
+    
+.btn.green {
+    color: #FFF;
+    background-color: #3385ff;
+    border-color: #2d78f4;
+}    
+
+  .form-control:focus {
+       border: 1px solid #4b8df9 !important; }
+/***
+Input icons
+***/
+.input-icon {
+  position: relative;
+  left: 0; }
+  .input-icon > .form-control {
+    padding-left: 33px; }
+    .input-group .input-icon > .form-control {
+      -webkit-border-radius: 4px 0 0 4px;
+      -moz-border-radius: 4px 0 0 4px;
+      -ms-border-radius: 4px 0 0 4px;
+      -o-border-radius: 4px 0 0 4px;
+      border-radius: 4px 0 0 4px; }
+  .input-icon > i {
+    color: #ccc;
+    display: block;
+    position: absolute;
+    margin: 11px 2px 4px 10px;
+    z-index: 3;
+    width: 16px;
+    font-size: 16px;
+    text-align: center;
+    left: 0; }
+    .modal .input-icon > i {
+      z-index: 10055; }
+    .has-success .input-icon > i {
+      color: #36c6d3; }
+    .has-warning .input-icon > i {
+      color: #F1C40F; }
+    .has-info .input-icon > i {
+      color: #659be0; }
+    .has-error .input-icon > i {
+      color: #ed6b75; }
+  .input-icon.right {
+    left: auto;
+    right: 0; }
+    .input-icon.right > .form-control {
+      padding-right: 33px;
+      padding-left: 12px; }
+      .input-group .input-icon.right > .form-control {
+        -webkit-border-radius: 0 4px 4px 0;
+        -moz-border-radius: 0 4px 4px 0;
+        -ms-border-radius: 0 4px 4px 0;
+        -o-border-radius: 0 4px 4px 0;
+        border-radius: 0 4px 4px 0; }
+    .input-icon.right > i {
+      left: auto;
+      right: 8px;
+      float: right; }
+  .input-icon.input-icon-lg > i {
+    margin-top: 16px; }
+  .input-icon.input-icon-sm > i {
+    margin-top: 8px;
+    font-size: 13px; }    
+    
+[class^="fa-"],
+[class*=" fa-"]{
+  display: inline-block;
+  *margin-right: .3em;
+  line-height: 12px;
+  -webkit-font-smoothing: antialiased; }
+    
+.red{
+	color: red;
+}
+ /***
+checkbox
+***/   
+   .mt-radio,
+.mt-checkbox {
+  display: inline-block;
+  position: relative;
+  padding-left: 30px;
+  margin-bottom: 15px;
+  cursor: pointer;
+  font-size: 14px;
+  webkit-transition: all 0.3s;
+  -moz-transition: all 0.3s;
+  -ms-transition: all 0.3s;
+  -o-transition: all 0.3s;
+  transition: all 0.3s; }
+  .mt-radio.mt-radio-disabled, .mt-radio.mt-checkbox-disabled,
+  .mt-checkbox.mt-radio-disabled,
+  .mt-checkbox.mt-checkbox-disabled {
+    opacity: 0.6 ;
+    filter: alpha(opacity=60) ; }
+  .mt-radio > input,
+  .mt-checkbox > input {
+    position: absolute;
+    z-index: -1;
+    opacity: 0 ;
+    filter: alpha(opacity=0) ; }
+  .mt-radio > span,
+  .mt-checkbox > span {
+    border: 1px solid transparent;
+    position: absolute;
+    top: 0px;
+    left: 0;
+    height: 19px;
+    width: 19px;
+    background: #E6E6E6; }
+    .mt-radio > span:after,
+    .mt-checkbox > span:after {
+      content: '';
+      position: absolute;
+      display: none; }
+  .mt-radio:hover > input:not([disabled]) ~ span,
+  .mt-radio > input:focus ~ span,
+  .mt-checkbox:hover > input:not([disabled]) ~ span,
+  .mt-checkbox > input:focus ~ span {
+    background: #d9d9d9;
+    webkit-transition: all 0.3s;
+    -moz-transition: all 0.3s;
+    -ms-transition: all 0.3s;
+    -o-transition: all 0.3s;
+    transition: all 0.3s; }
+  .mt-radio > input:checked ~ span,
+  .mt-checkbox > input:checked ~ span {
+    webkit-transition: all 0.3s;
+    -moz-transition: all 0.3s;
+    -ms-transition: all 0.3s;
+    -o-transition: all 0.3s;
+    transition: all 0.3s;
+    background: #d9d9d9; }
+    .mt-radio > input:checked ~ span:after,
+    .mt-checkbox > input:checked ~ span:after {
+      display: block; }
+  .mt-radio:hover > input:not([disabled]):checked ~ span,
+  .mt-radio > input:checked ~ span,
+  .mt-checkbox:hover > input:not([disabled]):checked ~ span,
+  .mt-checkbox > input:checked ~ span {
+    webkit-transition: all 0.3s;
+    -moz-transition: all 0.3s;
+    -ms-transition: all 0.3s;
+    -o-transition: all 0.3s;
+    transition: all 0.3s;
+    background: #d9d9d9; }
+  .mt-radio > input:disabled ~ span,
+  .mt-checkbox > input:disabled ~ span {
+    opacity: 0.6 ;
+    filter: alpha(opacity=60) ;
+    pointer-events: none; }
+  .mt-radio.mt-radio-outline > span, .mt-radio.mt-checkbox-outline > span,
+  .mt-checkbox.mt-radio-outline > span,
+  .mt-checkbox.mt-checkbox-outline > span {
+    border: 1px solid #d9d9d9;
+    background: none; }
+  .mt-radio.mt-radio-outline:hover > input:not([disabled]) ~ span,
+  .mt-radio.mt-radio-outline > input:focus ~ span, .mt-radio.mt-checkbox-outline:hover > input:not([disabled]) ~ span,
+  .mt-radio.mt-checkbox-outline > input:focus ~ span,
+  .mt-checkbox.mt-radio-outline:hover > input:not([disabled]) ~ span,
+  .mt-checkbox.mt-radio-outline > input:focus ~ span,
+  .mt-checkbox.mt-checkbox-outline:hover > input:not([disabled]) ~ span,
+  .mt-checkbox.mt-checkbox-outline > input:focus ~ span {
+    border: 1px solid #d9d9d9;
+    background: none; }
+  .mt-radio.mt-radio-outline > input:checked ~ span, .mt-radio.mt-checkbox-outline > input:checked ~ span,
+  .mt-checkbox.mt-radio-outline > input:checked ~ span,
+  .mt-checkbox.mt-checkbox-outline > input:checked ~ span {
+    border: 1px solid #d9d9d9;
+    background: none; }
+  .mt-radio.mt-radio-outline:hover > input:not([disabled]):checked ~ span,
+  .mt-radio.mt-radio-outline > input:checked ~ span, .mt-radio.mt-checkbox-outline:hover > input:not([disabled]):checked ~ span,
+  .mt-radio.mt-checkbox-outline > input:checked ~ span,
+  .mt-checkbox.mt-radio-outline:hover > input:not([disabled]):checked ~ span,
+  .mt-checkbox.mt-radio-outline > input:checked ~ span,
+  .mt-checkbox.mt-checkbox-outline:hover > input:not([disabled]):checked ~ span,
+  .mt-checkbox.mt-checkbox-outline > input:checked ~ span {
+    border: 1px solid #d9d9d9;
+    background: none; } 
+ .mt-checkbox > span:after {
+  left: 6px;
+  top: 3px;
+  width: 5px;
+  height: 10px;
+  border: solid #666666;
+  border-width: 0 2px 2px 0;
+  transform: rotate(45deg); }
+
+.mt-checkbox > input:disabled ~ span:after {
+  border-color: #666666; }
+
+.form-inline .mt-checkbox {
+  margin-left: 15px;
+  margin-right: 15px; }
+
+
+.mt-checkbox-list,
+.mt-radio-list {
+  padding: 10px 0; }
+  .form-horizontal .form-group .mt-checkbox-list, .form-horizontal .form-group
+  .mt-radio-list {
+    padding-top: 0; }
+  .mt-checkbox-list .mt-checkbox,
+  .mt-checkbox-list .mt-radio,
+  .mt-radio-list .mt-checkbox,
+  .mt-radio-list .mt-radio {
+    display: block; }
+
+.mt-checkbox-inline,
+.mt-radio-inline {
+  padding: 10px 0; }
+  .form-horizontal .form-group .mt-checkbox-inline, .form-horizontal .form-group
+  .mt-radio-inline {
+    padding-top: 8px; }
+  .mt-checkbox-inline .mt-checkbox,
+  .mt-checkbox-inline .mt-radio,
+  .mt-radio-inline .mt-checkbox,
+  .mt-radio-inline .mt-radio {
+    display: inline-block;
+    margin-right: 15px; }
+    .mt-checkbox-inline .mt-checkbox:last-child,
+    .mt-checkbox-inline .mt-radio:last-child,
+    .mt-radio-inline .mt-checkbox:last-child,
+    .mt-radio-inline .mt-radio:last-child {
+      margin-right: 0; }   
+    
+    
+    /* IE8 & IE9 mode utilities */
+.visible-ie8 {
+  display: none; }
+
+.ie8 .visible-ie8 {
+  display: inherit !important; }
+
+.visible-ie9 {
+  display: none; }
+
+.ie9 .visible-ie9 {
+  display: inherit !important; }
+
+.hidden-ie8 {
+  display: inherit; }
+
+.ie8 .hidden-ie8 {
+  display: none !important; }
+
+.hidden-ie9 {
+  display: inherit; }
+
+.ie9 .hidden-ie9 {
+  display: none !important; }
+    
+.align-right {
+    text-align: right !important;
+}
+    
+
+.subsystem-container {
+    text-align: left;
+    font-size: 0;
+   padding: 10px 0 12px 5px;
+  -moz-transition: border-left-color 0.5s, box-shadow 0.5s, background-color 0.5s;
+  -o-transition: border-left-color 0.5s, box-shadow 0.5s, background-color 0.5s;
+  -webkit-transition: border-left-color 0.5s, box-shadow 0.5s, background-color 0.5s;
+  transition: border-left-color 0.5s, box-shadow 0.5s, background-color 0.5s;
+ border-top: 1px  solid #EAEEF0;
+}
+.subsystem {
+  display: inline-block;
+  width: 300px;
+  height: 66px;
+  color: #555;
+  box-shadow: none;
+  border-radius: 0;
+  margin: -1px 0 0 -1px;
+  padding: 8px 3px 6px 9px;
+/*   border: 1px dotted;
+  border-color: #D8D8D8 !important; */
+ border-bottom: 1px dotted #D8D8D8;
+  vertical-align: middle;
+  text-align: left;
+  position: relative;
+  cursor:pointer;
+}
+.subsystem > .subsystem-icon {
+  display: inline-block;
+  vertical-align: top;
+  width: 44px;
+}
+.subsystem > .subsystem-icon > .ibps-icon {
+  display: inline-block;
+  height: 42px;
+  margin: 0;
+  padding: 1px 1px 0 2px;
+   background-color: transparent;
+  border-width: 0;
+  text-align: center;
+  position: relative;
+  border-radius: 100%;
+  -webkit-box-shadow: 1px 1px 0 rgba(0,0,0,0.2);
+  box-shadow: 1px 1px 0 rgba(0,0,0,0.2);
+}
+.subsystem > .subsystem-icon > .ibps-icon:before {
+    font-size: 24px;
+    display: block;
+    padding: 12px 0 15px;
+    width: 40px;
+    text-align: center;
+    border-radius: 100%;
+    color: #FFFFFF;
+    background-color: transparent;
+    background-color: rgba(255, 255, 255, 0.2);
+    text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.14);
+}
+
+.subsystem > .subsystem-data {
+  display: inline-block;
+  border-width: 0;
+  border-top-width: 0;
+  font-size: 18px;
+  text-align: left;
+  min-width: 130px;
+  padding-left: 8px;
+  top: 10px;
+  width: 240px;
+   position:relative;
+   line-height:23px;
+   overflow:hidden;
+    white-space: nowrap;
+}
+.subsystem > .subsystem-data::after {
+    font-weight:bold;
+    position:absolute;
+    bottom:0;
+    right:0;
+    padding:0 20px 1px 45px;
+}
+.subsystem-button{
+	padding:5px;
+}
+
+
+.subsystem-blue {
+  color: #6fb3e0;
+  border-color: #6fb3e0;
+}
+.subsystem-blue > .subsystem-icon > .ibps-icon {
+  background-color: #6fb3e0;
+}
+.subsystem-blue > .subsystem-icon > .ibps-image {
+  background: #6fb3e0;
+}
+.subsystem-blue.subsystem-dark {
+  background-color: #6fb3e0;
+  border-color: #6fb3e0;
+}
+.subsystem-blue2 {
+  color: #3983c2;
+  border-color: #3983c2;
+}
+.subsystem-blue2 > .subsystem-icon > .ibps-icon {
+  background-color: #3983c2;
+}
+.subsystem-blue2 > .subsystem-icon > .ibps-image {
+  background: #3983c2;
+}
+.subsystem-blue2.subsystem-dark {
+  background-color: #3983c2;
+  border-color: #3983c2;
+}
+.subsystem-blue3 {
+  color: #1144eb;
+  border-color: #1144eb;
+}
+.subsystem-blue3 > .subsystem-icon > .ibps-icon {
+  background-color: #1144eb;
+}
+.subsystem-blue3 > .subsystem-icon > .ibps-image {
+  background: #1144eb;
+}
+
+.subsystem-blue3.subsystem-dark {
+  background-color: #1144eb;
+  border-color: #1144eb;
+}
+.subsystem-red {
+  color: #d53f40;
+  border-color: #d53f40;
+}
+.subsystem-red > .subsystem-icon > .ibps-icon {
+  background-color: #d53f40;
+}
+.subsystem-red > .subsystem-icon > .ibps-image {
+  background: #d53f40;
+}
+.subsystem-red.subsystem-dark {
+  background-color: #d53f40;
+  border-color: #d53f40;
+}
+.subsystem-brown {
+  color: #c67a3e;
+  border-color: #c67a3e;
+}
+.subsystem-brown > .subsystem-icon > .ibps-icon {
+  background-color: #c67a3e;
+}
+.subsystem-brown > .subsystem-icon > .ibps-image {
+  background: #c67a3e;
+}
+.subsystem-brown.subsystem-dark {
+  background-color: #c67a3e;
+  border-color: #c67a3e;
+}
+.subsystem-wood {
+  color: #7b3f25;
+  border-color: #7b3f25;
+}
+.subsystem-wood > .subsystem-icon > .ibps-icon {
+  background-color: #7b3f25;
+}
+.subsystem-wood > .subsystem-icon > .ibps-image {
+  background: #7b3f25;
+}
+.subsystem-wood.subsystem-dark {
+  background-color: #7b3f25;
+  border-color: #7b3f25;
+}
+.subsystem-light-brown {
+  color: #cebea5;
+  border-color: #cebea5;
+}
+.subsystem-light-brown > .subsystem-icon > .ibps-icon {
+  background-color: #cebea5;
+}
+.subsystem-light-brown  > .subsystem-icon > .ibps-image {
+  background: #cebea5;
+}
+.subsystem-light-brown.subsystem-dark {
+  background-color: #cebea5;
+  border-color: #cebea5;
+}
+.subsystem-orange {
+  color: #e8b110;
+  border-color: #e8b110;
+}
+.subsystem-orange > .subsystem-icon > .ibps-icon {
+  background-color: #e8b110;
+}
+.subsystem-orange  > .subsystem-icon > .ibps-image {
+  background: #e8b110;
+}
+.subsystem-orange.subsystem-dark {
+  background-color: #e8b110;
+  border-color: #e8b110;
+}
+.subsystem-orange2 {
+  color: #f79263;
+  border-color: #f79263;
+}
+.subsystem-orange2 > .subsystem-icon > .ibps-icon {
+  background-color: #f79263;
+}
+.subsystem-orange2  > .subsystem-icon > .ibps-image {
+  background: #f79263;
+}
+.subsystem-orange2.subsystem-dark {
+  background-color: #f79263;
+  border-color: #f79263;
+}
+.subsystem-green {
+  color: #9abc32;
+  border-color: #9abc32;
+}
+.subsystem-green > .subsystem-icon > .ibps-icon {
+  background-color: #9abc32;
+}
+.subsystem-green  > .subsystem-icon > .ibps-image {
+  background: #9abc32;
+}
+.subsystem-green.subsystem-dark {
+  background-color: #9abc32;
+  border-color: #9abc32;
+}
+.subsystem-green2 {
+  color: #0490a6;
+  border-color: #0490a6;
+}
+.subsystem-green2 > .subsystem-icon > .ibps-icon {
+  background-color: #0490a6;
+}
+.subsystem-green2  > .subsystem-icon > .ibps-image {
+  background: #0490a6;
+}
+.subsystem-green2.subsystem-dark {
+  background-color: #0490a6;
+  border-color: #0490a6;
+}
+.subsystem-grey {
+  color: #999999;
+  border-color: #999999;
+}
+.subsystem-grey > .subsystem-icon > .ibps-icon {
+  background-color: #999999;
+}
+.subsystem-grey  > .subsystem-icon > .ibps-image {
+  background: #999999;
+}
+.subsystem-grey.subsystem-dark {
+  background-color: #999999;
+  border-color: #999999;
+}
+.subsystem-black {
+  color: #393939;
+  border-color: #393939;
+}
+.subsystem-black > .subsystem-icon > .ibps-icon {
+  background-color: #393939;
+}
+.subsystem-black  > .subsystem-icon > .ibps-image {
+  background: #393939;
+}
+.subsystem-black.subsystem-dark {
+  background-color: #393939;
+  border-color: #393939;
+}
+
+
+
+  input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill {
+    background-color: rgb(250, 255, 189); 
+    background-image: none;
+    color: rgb(0, 0, 0);
+  }
+
+.style-toggle {
+    float: right;
+    margin-top: -5px;
+    padding: 10px;
+}
+.btn-sm {
+    padding: 3px 10px;
+    font-size: 12px;
+    line-height: 1.5;
+    border-radius: 2px !important;
+}
+/*在线帮助*/
+.suspend{width:40px;height:198px;position:fixed;top:200px;right:0;overflow:hidden;z-index:9999;}
+.suspend dl{width:120px;height:198px;border-radius:25px 0 0 25px;padding-left:40px;box-shadow:0 0 5px #e4e8ec;}
+.suspend dl dt{width:40px;height:198px;background:url(../images/suspend.png);position:absolute;top:0;left:0;cursor:pointer;}
+.suspend dl dd.suspendQQ{width:120px;height:85px;background:#ffffff;}
+.suspend dl dd.suspendQQ a{width:120px;height:85px;display:block;background:url(../images/suspend.png) -40px 0;overflow:hidden;}
+.suspend dl dd.suspendTel{width:120px;height:112px;background:#ffffff;border-top:1px solid #e4e8ec;}
+.suspend dl dd.suspendTel a{width:120px;height:112px;display:block;background:url(../images/suspend.png) -40px -86px;overflow:hidden;}
+/** html .suspend{position:absolute;left:expression(eval(document.documentElement.scrollRight));top:expression(eval(document.documentElement.scrollTop+200))}*/
diff --git a/pluss-manage-page/src/main/resources/static/resources/css/main1.0.css b/pluss-manage-page/src/main/resources/static/resources/css/main1.0.css
new file mode 100644
index 0000000..1e10c0a
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/css/main1.0.css
@@ -0,0 +1,2357 @@
+@charset "utf-8";
+
+/*----main.css v1.0.6(2015.04.27) 作者：宣梦梦----*/
+
+
+/**********单独设置项**********/
+
+a {
+    text-decoration: none;
+}
+textarea{
+  resize: none;
+}
+.white {
+    color: #FFF
+}
+
+.red {
+    color: #F00
+}
+
+.green {
+    color: #09bfc5
+}
+
+.blue {
+    color: #569bef
+}
+
+.yellow {
+    color: #FF0
+}
+
+.lblue {
+    color: #b3cef6
+}
+
+.black {
+    color: #000
+}
+
+.brown {
+    color: #3c1c05
+}
+.gray{
+	color:#b5b5b5;
+}
+.dgray {
+    color: #444
+}
+
+.mgray {
+    color: #898989
+}
+
+.lgray {
+    color: #9c9c9c
+}
+.orange{
+	color:#ff7b00;
+}
+.whitebg {
+    background: #FFF
+}
+
+.cccbg {
+    background: #f9f9f9
+}
+
+.redbg {
+    background: #F00
+}
+
+.greenbg {
+    background: #44b548
+}
+
+.bluebg {
+    background: #5b8cff
+}
+
+.yellowbg {
+    background: #FF0
+}
+
+.lbluebg {
+    background: #5b8cff
+}
+.qbluebg {
+    background: #2fbdbe
+}
+.blackbg {
+    background: #000
+}
+
+.brownbg {
+    background: #3c1c05
+}
+
+.dgraybg {
+    background: #cccccc
+}
+
+.mgraybg {
+    background: #999
+}
+
+.lgraybg {
+    background: #F2F2F2
+}
+.cgraybg {
+    background: #c1c3c4
+}
+.orangebg{
+    background: #f68f3b
+}
+
+/**********初始化**********/
+
+* {
+    margin: 0;
+    padding: 0;
+    font-family: "微软雅黑";
+}
+
+
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+    font-size: 100%
+}
+
+address,
+cite,
+dfn,
+em,
+i,
+var,
+caption {
+    font-style: normal
+}
+
+code,
+kbd,
+pre,
+samp {
+    font-family: courier new, courier, monospace
+}
+
+sup {
+    vertical-align: text-top
+}
+
+sub {
+    vertical-align: text-bottom
+}
+
+small {
+    font-size: 12px
+}
+
+legend {
+    color: #000
+}
+
+p {
+    word-wrap: break-word
+}
+
+q:before,
+q:after {
+    content: '';
+    cursor: pointer
+}
+
+ul,
+ol,
+li {
+    list-style: none
+}
+
+a,
+a img,
+button {
+    cursor: pointer
+}
+
+button,
+input,
+select,
+textarea {
+    font-size: 100%
+}
+
+table {
+    border-collapse: collapse;
+    border-spacing: 0
+}
+
+img,
+input,
+select,
+button {
+    border: 0;
+    vertical-align: middle
+}
+
+a,
+area {
+    blr: expression_r(this.onFocus=this.blur())
+}
+
+a:focus,
+input:focus,
+button:focus {
+    outline: 0;
+
+}
+::-ms-clear {
+    display: none
+}
+
+::-ms-reveal {
+    display: none
+}
+
+body {
+    font-size: 12px;
+    font-family: ""微软雅黑"";
+    color: #333;
+    position: relative
+}
+
+select {
+    outline: 0
+}
+
+ul {
+    list-style: none
+}
+
+a {
+    text-decoration: none
+}
+
+
+/**********块元素设置**********/
+
+.dline {
+    display: inline
+}
+
+.dnone {
+    display: none
+}
+
+.dblock {
+    display: block
+}
+
+.dlblock {
+    display: inline-block;
+}
+
+
+/**********字体大小**********/
+
+.f12 {
+    font-size: 12px
+}
+
+.f14 {
+    font-size: 14px
+}
+
+.f16 {
+    font-size: 16px
+}
+
+.f18 {
+    font-size: 18px
+}
+
+.f20 {
+    font-size: 20px
+}
+
+.f22 {
+    font-size: 22px
+}
+
+.f24 {
+    font-size: 24px
+}
+
+.f26 {
+    font-size: 26px
+}
+
+.f28 {
+    font-size: 28px
+}
+
+.f30 {
+    font-size: 30px
+}
+
+.f32 {
+    font-size: 32px
+}
+
+.f48 {
+    font-size: 48px
+}
+
+.f64 {
+    font-size: 64px
+}
+
+.f72 {
+    font-size: 72px
+}
+
+
+/**********字体粗细**********/
+
+.fw400 {
+    font-weight: 400
+}
+
+.fw600 {
+    font-weight: 600
+}
+
+.fw800 {
+    font-weight: 800
+}
+
+
+/**********行高**********/
+
+.lh100 {
+    line-height: 100%
+}
+
+.lh150 {
+    line-height: 150%
+}
+
+.lh180 {
+    line-height: 180%
+}
+
+.lh200 {
+    line-height: 200%
+}
+
+.lh250 {
+    line-height: 250%
+}
+
+.lh300 {
+    line-height: 300%
+}
+
+.lh400 {
+    line-height: 400%
+}
+.lh130 {
+    line-height: 130px
+}
+
+/**********字体描述**********/
+
+.unl {
+    text-decoration: underline
+}
+
+.crossline {
+    text-decoration: line-through
+}
+
+.nounl {
+    text-decoration: none
+}
+
+
+/**********字体**********/
+
+.simsun {
+    font-family: \5B8B\4F53
+}
+
+.simhei {
+    font-family: \9ED1\4F53
+}
+
+.yahei {
+    font-family: \5FAE\8F6F\96C5\9ED1
+}
+
+
+/**********首行缩进**********/
+
+.tit0 {
+    text-indent: 0
+}
+
+.tit1 {
+    text-indent: 1em
+}
+
+.tit2 {
+    text-indent: 2em
+}
+
+.tit3 {
+    text-indent: 3em
+}
+
+.tit4 {
+    text-indent: 4em
+}
+
+.tit5 {
+    text-indent: 5em
+}
+
+.tit6 {
+    text-indent: 6em
+}
+
+.tit7 {
+    text-indent: 7em
+}
+
+.tit8 {
+    text-indent: 8em
+}
+
+.tit9 {
+    text-indent: 9em
+}
+
+
+/**********文字水平对齐**********/
+
+.textl {
+    text-align: left
+}
+
+.textc {
+    text-align: center
+}
+
+.textr {
+    text-align: right
+}
+
+
+/**********文字垂直对齐**********/
+
+.vt {
+    vertical-align: top
+}
+
+.vm {
+    vertical-align: middle
+}
+
+.vb {
+    vertical-align: bottom
+}
+.vs {
+    vertical-align: sub
+}
+/**********容器浮动**********/
+
+.fl {
+    float: left
+}
+
+.fr {
+    display: block !important;
+    float: right
+}
+
+.fht {
+    float: inherit
+}
+
+.fc {
+    margin: 0 auto
+}
+
+
+/**********外间距**********/
+
+.mg5 {
+    margin: 5px
+}
+
+.mg10 {
+    margin: 10px
+}
+
+.mg15 {
+    margin: 15px
+}
+
+.mg20 {
+    margin: 20px
+}
+
+.mg25 {
+    margin: 25px
+}
+
+.mg30 {
+    margin: 30px
+}
+
+
+/**********上外间距**********/
+
+.mt1 {
+    margin-top: 1px
+}
+
+.mt2 {
+    margin-top: 2px
+}
+
+.mt3 {
+    margin-top: 3px
+}
+
+.mt4 {
+    margin-top: 4px
+}
+
+.mt5 {
+    margin-top: 5px
+}
+
+.mt6 {
+    margin-top: 6px
+}
+
+.mt7 {
+    margin-top: 7px
+}
+
+.mt8 {
+    margin-top: 8px
+}
+
+.mt9 {
+    margin-top: 9px
+}
+
+.mt10 {
+    margin-top: 10px
+}
+
+.mt15 {
+    margin-top: 15px
+}
+
+.mt20 {
+    margin-top: 20px
+}
+
+.mt25 {
+    margin-top: 25px
+}
+
+.mt30 {
+    margin-top: 30px
+}
+
+.mt35 {
+    margin-top: 35px
+}
+
+.mt40 {
+    margin-top: 40px
+}
+
+.mt45 {
+    margin-top: 45px
+}
+
+.mt50 {
+    margin-top: 50px
+}
+
+.mt55 {
+    margin-top: 55px
+}
+
+.mt60 {
+    margin-top: 60px
+}
+
+.mt65 {
+    margin-top: 65px
+}
+
+.mt70 {
+    margin-top: 70px
+}
+
+.mt75 {
+    margin-top: 75px
+}
+
+.mt80 {
+    margin-top: 80px
+}
+
+.mt85 {
+    margin-top: 85px
+}
+
+.mt90 {
+    margin-top: 90px
+}
+
+.mt95 {
+    margin-top: 90px
+}
+
+.mt100 {
+    margin-top: 100px
+}
+.mt145 {
+    margin-top: 145px
+}
+.mt162 {
+    margin-top: 162px
+}
+.mt200 {
+    margin-top: 200px
+}
+
+
+/**********左外间距**********/
+.ml1{margin-left:1px}
+.ml2{margin-left:2px}
+.ml3{margin-left:3px}
+.ml4{margin-left:4px}
+.ml5{margin-left:5px}
+.ml6{margin-left:6px}
+.ml7{margin-left:7px}
+.ml8{margin-left:8px}
+.ml9{margin-left:9px}
+.ml10{margin-left:10px}
+.ml14{margin-left:14px}
+.ml15{margin-left:15px}
+.ml18{margin-left:18px}
+.ml20{margin-left:20px}
+.ml22{margin-left:22px}
+.ml24{margin-left:24px}
+.ml25{margin-left:25px}
+.ml30{margin-left:30px}
+.ml35{margin-left:35px}
+.ml40{margin-left:40px}
+.ml45{margin-left:45px}
+.ml50{margin-left:50px}
+.ml55{margin-left:55px}
+.ml60{margin-left:60px}
+.ml65{margin-left:65px}
+.ml70{margin-left:70px}
+.ml75{margin-left:75px}
+.ml80{margin-left:80px}
+.ml85{margin-left:85px}
+.ml90{margin-left:90px}
+.ml95{margin-left:95px}
+.ml100{margin-left:100px}
+.ml104{margin-left:104px}
+.ml115{margin-left:115px}
+.ml180{margin-left:180px}
+.ml200{margin-left:200px}
+
+
+/**********下外间距**********/
+
+.mb1 {
+    margin-bottom: 1px
+}
+
+.mb2 {
+    margin-bottom: 2px
+}
+
+.mb3 {
+    margin-bottom: 3px
+}
+
+.mb4 {
+    margin-bottom: 4px
+}
+
+.mb5 {
+    margin-bottom: 5px
+}
+
+.mb6 {
+    margin-bottom: 6px
+}
+
+.mb7 {
+    margin-bottom: 7px
+}
+
+.mb8 {
+    margin-bottom: 8px
+}
+
+.mb9 {
+    margin-bottom: 9px
+}
+
+.mb10 {
+    margin-bottom: 10px
+}
+
+.mb15 {
+    margin-bottom: 15px
+}
+
+.mb20 {
+    margin-bottom: 20px
+}
+
+.mb25 {
+    margin-bottom: 25px
+}
+
+.mb30 {
+    margin-bottom: 30px
+}
+
+.mb35 {
+    margin-bottom: 35px
+}
+
+.mb40 {
+    margin-bottom: 40px
+}
+
+.mb45 {
+    margin-bottom: 45px
+}
+
+.mb50 {
+    margin-bottom: 50px
+}
+
+.mb55 {
+    margin-bottom: 55px
+}
+
+.mb60 {
+    margin-bottom: 60px
+}
+
+.mb65 {
+    margin-bottom: 65px
+}
+
+.mb70 {
+    margin-bottom: 70px
+}
+
+.mb75 {
+    margin-bottom: 75px
+}
+
+.mb80 {
+    margin-bottom: 80px
+}
+
+.mb85 {
+    margin-bottom: 85px
+}
+
+.mb90 {
+    margin-bottom: 90px
+}
+
+.mb100 {
+    margin-bottom: 100px
+}
+
+.mb200 {
+    margin-bottom: 200px
+}
+
+
+/**********内间距**********/
+
+.pd4 {
+    padding: 4px
+}
+
+.pd5 {
+    padding: 5px
+}
+.pd7 {
+    padding: 7px
+}
+
+.pd10 {
+    padding: 10px
+}
+
+.pd15 {
+    padding: 15px
+}
+
+.pd20 {
+    padding: 20px
+}
+
+.pd25 {
+    padding: 25px
+}
+
+.pd30 {
+    padding: 30px
+}
+.pd40 {
+    padding:40px
+}
+
+
+/**********上内间距**********/
+
+.pt1 {
+    padding-top: 1px
+}
+
+.pt2 {
+    padding-top: 2px
+}
+
+.pt3 {
+    padding-top: 3px
+}
+
+.pt4 {
+    padding-top: 4px
+}
+
+.pt5 {
+    padding-top: 5px
+}
+
+.pt6 {
+    padding-top: 6px
+}
+
+.pt7 {
+    padding-top: 7px
+}
+
+.pt8 {
+    padding-top: 8px
+}
+
+.pt9 {
+    padding-top: 9px
+}
+
+.pt10 {
+    padding-top: 10px
+}
+
+.pt15 {
+    padding-top: 15px
+}
+
+.pt20 {
+    padding-top: 20px
+}
+
+.pt25 {
+    padding-top: 25px
+}
+
+.pt30 {
+    padding-top: 30px
+}
+
+.pt35 {
+    padding-top: 35px
+}
+
+.pt40 {
+    padding-top: 40px
+}
+
+.pt45 {
+    padding-top: 45px
+}
+
+.pt50 {
+    padding-top: 50px
+}
+
+
+/**********左内间距**********/
+
+.pl1 {
+    padding-left: 1px
+}
+
+.pl2 {
+    padding-left: 2px
+}
+
+.pl3 {
+    padding-left: 3px
+}
+
+.pl4 {
+    padding-left: 4px
+}
+
+.pl5 {
+    padding-left: 5px
+}
+
+.pl6 {
+    padding-left: 6px
+}
+
+.pl7 {
+    padding-left: 7px
+}
+
+.pl8 {
+    padding-left: 8px
+}
+
+.pl9 {
+    padding-left: 9px
+}
+
+.pl10 {
+    padding-left: 10px
+}
+
+.pl15 {
+    padding-left: 15px
+}
+
+.pl20 {
+    padding-left: 20px
+}
+
+.pl25 {
+    padding-left: 25px
+}
+
+.pl30 {
+    padding-left: 30px
+}
+
+.pl35 {
+    padding-left: 35px
+}
+
+.pl40 {
+    padding-left: 40px
+}
+
+.pl45 {
+    padding-left: 45px
+}
+
+.pl50 {
+    padding-left: 50px
+}
+
+.pl100 {
+    padding-left: 100px
+}
+
+.pl150 {
+    padding-left: 150px
+}
+
+
+/**********右内间距**********/
+
+.pr1 {
+    padding-right: 1px
+}
+
+.pr2 {
+    padding-right: 2px
+}
+
+.pr3 {
+    padding-right: 3px
+}
+
+.pr4 {
+    padding-right: 4px
+}
+
+.pr5 {
+    padding-right: 5px
+}
+
+.pr6 {
+    padding-right: 6px
+}
+
+.pr7 {
+    padding-right: 7px
+}
+
+.pr8 {
+    padding-right: 8px
+}
+
+.pr9 {
+    padding-right: 9px
+}
+
+.pr10 {
+    padding-right: 10px
+}
+
+.pr15 {
+    padding-right: 15px
+}
+
+.pr20 {
+    padding-right: 20px
+}
+
+.pr25 {
+    padding-right: 25px
+}
+
+.pr30 {
+    padding-right: 30px
+}
+
+.pr35 {
+    padding-right: 35px
+}
+
+.pr40 {
+    padding-right: 40px
+}
+
+.pr45 {
+    padding-right: 45px
+}
+
+.pr50 {
+    padding-right: 50px
+}
+
+
+/**********下内间距**********/
+
+.pb1 {
+    padding-bottom: 1px
+}
+
+.pb2 {
+    padding-bottom: 2px
+}
+
+.pb3 {
+    padding-bottom: 3px
+}
+
+.pb4 {
+    padding-bottom: 4px
+}
+
+.pb5 {
+    padding-bottom: 5px
+}
+
+.pb6 {
+    padding-bottom: 6px
+}
+
+.pb7 {
+    padding-bottom: 7px
+}
+
+.pb8 {
+    padding-bottom: 8px
+}
+
+.pb9 {
+    padding-bottom: 9px
+}
+
+.pb10 {
+    padding-bottom: 10px
+}
+
+.pb15 {
+    padding-bottom: 15px
+}
+
+.pb20 {
+    padding-bottom: 20px
+}
+
+.pb25 {
+    padding-bottom: 25px
+}
+
+.pb30 {
+    padding-bottom: 30px
+}
+
+.pb35 {
+    padding-bottom: 35px
+}
+
+.pb40 {
+    padding-bottom: 40px
+}
+
+.pb45 {
+    padding-bottom: 45px
+}
+
+.pb50 {
+    padding-bottom: 50px
+}
+
+
+/**********宽度**********/
+.w10{width:10px}
+.w15{width:15px}
+.w16{width:16px}
+.w20{width:20px}
+.w25{width:25px}
+.w30{width:30px}
+.w34{width:34px}
+.w38{width:38px}
+.w40{width:40px}
+.w45{width:45px}
+.w50{width:50px}
+.w60{width:60px}
+.w62{width:62px}
+.w70{width:70px}
+.w80{width:80px}
+.w85{width:85px}
+.w90{width:90px}
+.w100{width:100px}
+.w110{width:110px}
+.w120{width:120px}
+.w124{width:124px}
+.w130{width:130px}
+.w140{width:140px}
+.w150{width:150px}
+.w160{width:160px}
+.w170{width:170px}
+.w180{width:180px}
+.w190{width:190px}
+.w200{width:200px}
+.w202{width:202px}
+.w210{width:210px}
+.w220{width:220px}
+.w230{width:230px}
+.w240{width:240px}
+.w250{width:250px}
+.w260{width:260px}
+.w270{width:270px}
+.w280{width:280px}
+.w285{width:285px}
+.w288{width:288px}
+.w290{width:290px}
+.w300{width:300px}
+.w400{width:400px}
+.w410{width:410px}
+.w500{width:500px}
+.w520{width:520px}
+.w530{width:530px}
+.w550{width:550px}
+.w600{width:600px}
+.w700{width:700px}
+.w800{width:800px}
+.w810{width:810px}
+.w900{width:900px}
+.w1000{width:1000px}
+.w1100{width:1100px}
+.w1170{width:1170px}
+.w1180{width:1180px}
+.w1190{width:1190px}
+.w1200{width:1200px}
+.w1216{width:1216px}
+.w1220{width:1220px}
+
+/**********高度**********/
+
+.h10 {
+    height: 10px
+}
+
+.h15 {
+    height: 15px
+}
+
+.h20 {
+    height: 20px
+}
+
+.h25 {
+    height: 25px
+}
+
+.h30 {
+    height: 30px
+}
+
+.h35 {
+    height: 35px
+}
+
+.h40 {
+    height: 40px
+}
+
+.h45 {
+    height: 45px
+}
+
+.h50 {
+    height: 50px;
+    line-height:50px;
+}
+
+.h55 {
+    height: 55px
+}
+
+.h60 {
+    height: 60px
+}
+
+.h65 {
+    height: 65px
+}
+
+.h70 {
+    height: 70px
+}
+
+.h75 {
+    height: 75px
+}
+
+.h80 {
+    height: 80px
+}
+
+.h85 {
+    height: 85px
+}
+
+.h90 {
+    height: 90px
+}
+
+.h95 {
+    height: 95px
+}
+
+.h100 {
+    height: 100px
+}
+
+.h110 {
+    height: 110px
+}
+
+.h120 {
+    height: 120px
+}
+
+.h130 {
+    height: 130px
+}
+
+.h140 {
+    height: 140px
+}
+
+.h150 {
+    height: 150px
+}
+
+.h160 {
+    height: 160px
+}
+
+.h170 {
+    height: 170px
+}
+
+.h180 {
+    height: 180px
+}
+
+.h190 {
+    height: 190px
+}
+
+.h200 {
+    height: 200px
+}
+
+.h210 {
+    height: 210px
+}
+
+.h220 {
+    height: 220px
+}
+
+.h230 {
+    height: 230px
+}
+
+.h240 {
+    height: 240px
+}
+
+.h250 {
+    height: 250px
+}
+
+.h260 {
+    height: 260px
+}
+
+.h270 {
+    height: 270px
+}
+
+.h280 {
+    height: 280px
+}
+
+.h290 {
+    height: 290px
+}
+
+.h300 {
+    height: 300px
+}
+
+.h400 {
+    height: 400px
+}
+
+.h500 {
+    height: 500px
+}
+
+.h600 {
+    height: 600px
+}
+
+.h700 {
+    height: 700px
+}
+
+.h800 {
+    height: 800px
+}
+
+.h900 {
+    height: 900px
+}
+
+
+/**********边框**********/
+
+.bdf {
+    border: 1px solid #fff
+}
+
+.bde {
+    border: 1px solid #eee
+}
+
+.bdd {
+    border: 1px solid #ddd
+}
+
+.bdc {
+    border: 1px solid #ccc
+}
+
+.bdb {
+    border: 1px solid #bbb
+}
+
+.bda {
+    border: 1px solid #aaa
+}
+
+.bd9 {
+    border: 1px solid #999
+}
+
+.bd8 {
+    border: 1px solid #888
+}
+
+.bd7 {
+    border: 1px solid #777
+}
+
+.bd6 {
+    border: 1px solid #666
+}
+
+.bd5 {
+    border: 1px solid #555
+}
+
+.bd4 {
+    border: 1px solid #444
+}
+
+.bd3 {
+    border: 1px solid #333
+}
+
+.bd2 {
+    border: 1px solid #222
+}
+
+.bd1 {
+    border: 1px solid #111
+}
+
+.bd0 {
+    border: 1px solid #000
+}
+.bdblue {
+    border: 1px solid #5b8cff
+}
+.bdred {
+    border: 1px solid red;
+}
+/**********左边框**********/
+
+.bdlf {
+    border-left: 1px solid #fff
+}
+
+.bdle {
+    border-left: 1px solid #eee
+}
+
+.bdld {
+    border-left: 1px solid #ddd
+}
+
+.bdlc {
+    border-left: 1px solid #ccc
+}
+
+.bdlb {
+    border-left: 1px solid #bbb
+}
+
+.bdla {
+    border-left: 1px solid #aaa
+}
+
+.bdl9 {
+    border-left: 1px solid #999
+}
+
+.bdl8 {
+    border-left: 1px solid #888
+}
+
+.bdl7 {
+    border-left: 1px solid #777
+}
+
+.bdl6 {
+    border-left: 1px solid #666
+}
+
+.bdl5 {
+    border-left: 1px solid #555
+}
+
+.bdl4 {
+    border-left: 1px solid #444
+}
+
+.bdl3 {
+    border-left: 1px solid #333
+}
+
+.bdl2 {
+    border-left: 1px solid #222
+}
+
+.bdl1 {
+    border-left: 1px solid #111
+}
+
+.bdl0 {
+    border-left: 1px solid #000
+}
+
+.bdls {
+    border-left: 8px solid #169BD5
+}
+
+
+/**********右边框**********/
+
+.bdrf {
+    border-right: 1px solid #fff
+}
+
+.bdre {
+    border-right: 1px solid #eee
+}
+
+.bdrd {
+    border-right: 1px solid #ddd
+}
+
+.bdrc {
+    border-right: 1px solid #ccc
+}
+
+.bdrb {
+    border-right: 1px solid #bbb
+}
+
+.bdra {
+    border-right: 1px solid #aaa
+}
+
+.bdr9 {
+    border-right: 1px solid #999
+}
+
+.bdr8 {
+    border-right: 1px solid #888
+}
+
+.bdr7 {
+    border-right: 1px solid #777
+}
+
+.bdr6 {
+    border-right: 1px solid #666
+}
+
+.bdr5 {
+    border-right: 1px solid #555
+}
+
+.bdr4 {
+    border-right: 1px solid #444
+}
+
+.bdr3 {
+    border-right: 1px solid #333
+}
+
+.bdr2 {
+    border-right: 1px solid #222
+}
+
+.bdr1 {
+    border-right: 1px solid #111
+}
+
+.bdr0 {
+    border-right: 1px solid #000
+}
+
+
+/**********上边框**********/
+
+.bdtf {
+    border-top: 1px solid #fff
+}
+
+.bdte {
+    border-top: 1px solid #eee
+}
+
+.bdtd {
+    border-top: 1px solid #ddd
+}
+
+.bdtc {
+    border-top: 1px solid #ccc
+}
+
+.bdtb {
+    border-top: 1px solid #bbb
+}
+
+.bdta {
+    border-top: 1px solid #aaa
+}
+
+.bdt9 {
+    border-top: 1px solid #999
+}
+
+.bdt8 {
+    border-top: 1px solid #888
+}
+
+.bdt7 {
+    border-top: 1px solid #777
+}
+
+.bdt6 {
+    border-top: 1px solid #666
+}
+
+.bdt5 {
+    border-top: 1px solid #555
+}
+
+.bdt4 {
+    border-top: 1px solid #444
+}
+
+.bdt3 {
+    border-top: 1px solid #333
+}
+
+.bdt2 {
+    border-top: 1px solid #222
+}
+
+.bdt1 {
+    border-top: 1px solid #111
+}
+
+.bdt0 {
+    border-top: 1px solid #000
+}
+
+
+/**********下边框**********/
+
+.bdbf {
+    border-bottom: 1px solid #fff
+}
+
+.bdbe {
+    border-bottom: 1px solid #eee
+}
+
+.bdbd {
+    border-bottom: 1px solid #ddd
+}
+
+.bdbc {
+    border-bottom: 1px solid #ccc
+}
+
+.bdbb {
+    border-bottom: 1px solid #bbb
+}
+
+.bdba {
+    border-bottom: 1px solid #aaa
+}
+
+.bdb9 {
+    border-bottom: 1px solid #999
+}
+
+.bdb8 {
+    border-bottom: 1px solid #888
+}
+
+.bdb7 {
+    border-bottom: 1px solid #777
+}
+
+.bdb6 {
+    border-bottom: 1px solid #666
+}
+
+.bdb5 {
+    border-bottom: 1px solid #555
+}
+
+.bdb4 {
+    border-bottom: 1px solid #444
+}
+
+.bdb3 {
+    border-bottom: 1px solid #333
+}
+
+.bdb2 {
+    border-bottom: 1px solid #222
+}
+
+.bdb1 {
+    border-bottom: 1px solid #111
+}
+
+.bdb0 {
+    border-bottom: 1px solid #000
+}
+
+.bdbd {
+    border-bottom: 1px dotted #ccc
+}
+
+
+/*圆角*/
+
+.radius3 {
+    border-radius: 3px;
+}
+
+.radius5 {
+    border-radius: 5px;
+}
+
+.radius15 {
+    border-radius: 15px;
+}
+
+.radius50 {
+    border-radius: 50%;
+}
+
+
+/**********百分比宽度**********/
+.wp18{
+	width:18%;
+}
+.wp10{
+	width:10%;
+}
+.wp8{
+	width:8%;
+}
+.wp15{
+	width:15%;
+}
+.wp20{
+	width:20%;
+}
+.wp25{
+	width:25%;
+}
+.wp30{
+    width: 30%
+}
+.wp33 {
+    width: 33%
+}
+.wp34 {
+    width: 34%
+}
+.wp40{
+	width:40%;
+}
+.wp48{
+	width:48%;
+}
+.wp50 {
+    width: 50%
+}
+
+.wp60 {
+    width: 60%
+}
+.wp63 {
+    width: 63%
+}
+.wp70 {
+    width: 70%
+}
+.wp75 {
+    width: 75%
+}
+.wp80 {
+    width: 80%
+}
+
+.wp90 {
+    width: 90%
+}
+
+.wp92 {
+    width: 92%
+}
+
+.wp94 {
+    width: 94%
+}
+
+.wp96 {
+    width: 96%
+}
+
+.wp98 {
+    width: 98%
+}
+
+.wp100 {
+    width: 100%
+}
+.hp100{
+	height:100%;
+}
+
+/**********百分比外间距**********/
+
+.mlp1 {
+    margin-left: 1%
+}
+
+.mlp2 {
+    margin-left: 2%
+}
+
+.mlp3 {
+    margin-left: 3%
+}
+
+.mlp4 {
+    margin-left: 4%
+}
+
+.mlp5 {
+    margin-left: 5%
+}
+.mlp15 {
+    margin-left: 15%
+}
+.mlp25 {
+    margin-left: 25%
+}
+.mrp1 {
+    margin-right: 1%
+}
+
+.mrp2 {
+    margin-right: 2%
+}
+
+.mrp3 {
+    margin-right: 3%
+}
+
+.mrp4 {
+    margin-right: 4%
+}
+
+.mrp5 {
+    margin-right: 5%
+}
+.mrp15 {
+    margin-right: 15%
+}
+.mrp25 {
+    margin-right: 25%
+}
+.mr1{margin-right:1px}
+.mr2{margin-right:2px}
+.mr3{margin-right:3px}
+.mr4{margin-right:4px}
+.mr5{margin-right:5px}
+.mr6{margin-right:6px}
+.mr7{margin-right:7px}
+.mr8{margin-right:8px}
+.mr9{margin-right:9px}
+.mr10{margin-right:10px}
+.mr14{margin-right:14px}
+.mr15{margin-right:15px}
+.mr18{margin-right:18px}
+.mr20{margin-right:20px}
+.mr25{margin-right:25px}
+.mr30{margin-right:30px}
+.mr35{margin-right:35px}
+.mr40{margin-right:40px}
+.mr45{margin-right:45px}
+.mr50{margin-right:50px}
+.mr55{margin-right:55px}
+.mr60{margin-right:60px}
+.mr65{margin-right:65px}
+.mr70{margin-right:70px}
+.mr75{margin-right:75px}
+.mr80{margin-right:80px}
+.mr85{margin-right:85px}
+.mr90{margin-right:90px}
+.mr95{margin-right:95px}
+.mr100{margin-right:100px}
+.mr200{margin-right:200px}
+
+/**********百分比内间距**********/
+
+.plp1 {
+    padding-left: 1%
+}
+
+.plp2 {
+    padding-left: 2%
+}
+
+.plp3 {
+    padding-left: 3%
+}
+
+.plp4 {
+    padding-left: 4%
+}
+
+.plp5 {
+    padding-left: 5%
+}
+
+.prp1 {
+    padding-right: 1%
+}
+
+.prp2 {
+    padding-right: 2%
+}
+
+.prp3 {
+    padding-right: 3%
+}
+
+.prp4 {
+    padding-right: 4%
+}
+
+.prp5 {
+    padding-right: 5%
+}
+
+
+/**********清除样式**********/
+
+.clear {
+    display: block;
+    clear: both;
+    font-size: 0;
+    line-height: 0;
+    height: 0;
+    overflow: hidden;
+    content: ".";
+}
+
+.clearfix:after {
+    content: "\200B";
+    display: block;
+    height: 0;
+    clear: both;
+}
+.positionr{
+	position:relative;
+}
+.positiona{
+	position:absolute;
+}
+.positionf{
+	position:fixed;
+}
+.opacity0{
+	filter:alpha(opacity=100);       /* IE */
+    -moz-opacity:0;              /* 老版Mozilla */
+    -khtml-opacity:0;              /* 老版Safari */
+     opacity: 0;           /* 支持opacity的浏览器*/
+}
+.top0{
+	top:0;
+}
+.left{
+	left:0;
+}
+.bottom0{
+	bottom:0;
+}
+.bottom40{
+	bottom:40px;
+}
+.zd98{
+	z-index:98;
+}
+.zd99{
+	z-index:99;
+}
+.zd100{
+	z-index:100;
+}
+.zd101{
+	z-index:101;
+}
+.dn{
+	display:none;
+}
+.right80{
+	right:80px;
+}
+.w352{
+	width:352px;
+	}
+.right0{
+	right:0;
+}
+.top3{
+	top:3px;
+}
+.cursor{
+    cursor: pointer;
+    }
+.cursorall{
+    cursor:not-allowed;
+    }
+.right10{
+    right:10px;
+}
+.top4{
+    top:4px;
+}
+.pt150{
+	padding-top:150px;
+}
+.left50{
+	left:50%;
+}
+.top50{
+	top:50%;
+}
+.ml175{
+	margin-left:175px;
+}
+.shadow{
+	box-shadow:2px 2px 5px #ccc;
+}
+.top6{
+	top:6px;
+} 
+.right180{
+	right:-180px;
+}
+.left0{
+	left:0;
+}
+.blackShodow{
+	z-index: 100;
+	background: rgba(0, 0, 0, 0.5);
+}
+.radius10{
+	border-radius:10px;
+}
+.ml75{
+	margin-left:75px;
+}
+.w192{
+	width:192px;
+}
+.top30{
+	top:30%;
+}
+.ml-200{
+	margin-left:-200px;
+}
+.rgba4{
+	background:rgba(0,0,0,0.4);
+}
+.animate-box{
+	width:0;
+	overflow:hidden;
+}
+.top52{
+    	top:52px
+    }
+    .box-flex{
+	display: -webkit-box;
+    display: -moz-box;
+    display: -ms-flexbox;
+    display: -webkit-flex;
+    display: flex;
+}
+.flex{
+	    -webkit-box-flex: 1;
+    -webkit-flex: 1;
+    -ms-flex: 1;
+    flex: 1;
+}
+.w92{
+width:92px
+}
+.bottom50{
+  bottom:50px;
+}
+.bdgreen {
+    border: 1px solid #44b548;
+}
+.bdyellow{
+ border:2px solid #FF0;
+}
+.bs{
+ box-sizing: border-box;
+}
+.top52{
+  top:52px;
+}
+/*结算成功*/
+.pop-box {
+    background: rgba(0, 0, 0, 0.6);
+    z-index: 103;
+}
+.check {
+    left: 50%;
+    margin-left: -200px;
+    top: 30%;
+    background-color: #F5F9FC;
+    border-radius: 2px;
+    color: #95999C;
+}
+.check .order_top a {
+    top: 10px;
+    right: 20px;
+    color: #B6B9BE;
+}
+
+/*订单详情*/
+.order-tab {
+    width: 100%;
+    overflow: hidden;
+    background: #fff;
+    padding-top: 20px;
+    border-bottom: 1px #fa8363 solid;
+}
+
+.order-tab li {
+    font-weight: bold;
+    font-size: 16px;
+    color: #8697b0;
+    padding: 10px 20px;
+    cursor: pointer;
+}
+
+.order-tab li.current {
+    color: #384351;
+    border-bottom: 2px solid #f8714a;
+}
+
+.order-tab>div {
+    margin-right: 40px;
+}
+.cbluebg{
+    background: #EEF3F7;
+}
+.service-type li.current a{
+	color:dodgerblue;
+	border:1px solid dodgerblue;
+}
+
+
+/*项目样式*/
+
+
+a {
+    text-decoration: none;
+}
+textarea{
+  resize: none;
+}
+.white {
+    color: #FFF
+}
+.red {
+    color: #F00
+}
+.ared {
+    color:#FD5B78;
+}
+.green {
+    color: #09bfc5
+}
+.blue {
+    color: #569bef
+}
+.yellow {
+    color: #FF0
+}
+.lblue {
+    color: #b3cef6
+}
+.black {
+    color: #000
+}
+.brown {
+    color: #3c1c05
+}
+.gray{
+	color:#b5b5b5;
+}
+.dgray {
+    color: #444
+}
+.mgray {
+    color: #898989
+}
+.lgray {
+    color: #9c9c9c
+}
+.orange{
+	color:#ff7b00;
+}
+.whitebg {
+    background: #FFF
+}
+.cccbg {
+    background: #f9f9f9
+}
+.redbg {
+    background: #F00;
+    #FD5B78
+}
+.aredbg {
+    background:#FD5B78;
+}
+.greenbg {
+    background: #44b548
+}
+.bluebg {
+    background: #5b8cff
+}
+.yellowbg {
+    background: #FF0
+}
+.lbluebg {
+    background: #5b8cff
+}
+.blackbg {
+    background: #000
+}
+.brownbg {
+    background: #3c1c05
+}
+.dgraybg {
+    background: #cccccc
+}
+.mgraybg {
+    background: #999
+}
+.lgraybg {
+    background: #F2F2F2
+}
+.cgraybg {
+    background: #c1c3c4
+}
+.orangebg{
+    background: #f68f3b
+}
+
+
+/**********定位样式**********/
+.pr{position:relative}
+.pa{position:absolute}
+/**********新增样式**********/
+.agray{color:#40484d;}
+.bgray{color:#dfe3e5;}
+.cgray{color:#d4d4d4;}
+.egray{color:#777;}
+.fgray{color:#11232f;}
+.ggray{color:#697d84;}
+.hgray{color:#eaf0ed;}
+.igray{color:#232830;}
+.jgray{color:#78808d;}
+.kgray{color:#636363;}
+.ogray{color:#58595f;}
+.pgray{color:#808088;}
+.qgray{color:#b1b1b1;}
+.ablue{color:#60acde;}
+.bblue{color:#83a3d2;}
+.awhitebg{background-color:#f7f7f8;}
+.agraybg{background-color:#333;}
+.bgraybg{background-color:#2f2f2f;}
+.cgraybg{background-color:#bbb;}
+.egraybg{background-color:#eaf0ed;}
+.fgraybg{background-color:#2d343f;}
+.ggraybg{background-color:#40506a;}
+.igraybg{background-color:#232830;}
+.jgraybg{background-color:#dcdcdd;}
+.kgraybg{background-color:#ececec;}
+.abluebg{background-color:#60acde;}
+.ablackbga{background-color:rgba(0, 0, 0, .75);}
+.bdbg{border-bottom: 1px solid #363b44;}
+.lhp15{line-height:15px;}
+.lhp20{line-height:20px;}
+.lhp22{line-height:22px;}
+.lhp24{line-height:24px;}
+.lhp30{line-height:30px;}
+.lhp34{line-height:34px;}
+.lhp35{line-height:35px;}
+.lhp40{line-height:40px;}
+.lhp45{line-height:45px;}
+.lhp48{line-height:48px;}
+.lhp50{line-height:50px;}
+.lhp60{line-height:60px;}
+.lhp98{line-height:98px;}
+.ofa{overflow:auto;}
+.ofh{overflow:hidden;}
+.brs5{border-radius:5px;}
+.brs10{border-radius:10px;}
+.brs30{border-radius:30px;}
+.cp{cursor: pointer;}
+.b0{border:0;}
+.bdlg{border-left:1px solid #363b44}
+.bdbh{border-bottom:1px solid #eaeaea}
+.bdi{border:1px solid #ececec}
+.bdj{border:1px solid #5b8cff}
+.ml90{margin-left:90px;}
+.ml100{margin-left:100px;}
+.ml78{margin-left:78px;}
+.w64{width:64px}
+.default{
+	background:no-repeat center center;
+	background-size:100px 100px;
+}
+.pd6{
+ padding:6px;
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/css/modules/code.css b/pluss-manage-page/src/main/resources/static/resources/css/modules/code.css
new file mode 100644
index 0000000..d0d3822
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/css/modules/code.css
@@ -0,0 +1,2 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ html #layuicss-skincodecss{display:none;position:absolute;width:1989px}.layui-code-h3,.layui-code-view{position:relative;font-size:12px}.layui-code-view{display:block;margin:10px 0;padding:0;border:1px solid #e2e2e2;border-left-width:6px;background-color:#F2F2F2;color:#333;font-family:Courier New}.layui-code-h3{padding:0 10px;height:32px;line-height:32px;border-bottom:1px solid #e2e2e2}.layui-code-h3 a{position:absolute;right:10px;top:0;color:#999}.layui-code-view .layui-code-ol{position:relative;overflow:auto}.layui-code-view .layui-code-ol li{position:relative;margin-left:45px;line-height:20px;padding:0 5px;border-left:1px solid #e2e2e2;list-style-type:decimal-leading-zero;*list-style-type:decimal;background-color:#fff}.layui-code-view pre{margin:0}.layui-code-notepad{border:1px solid #0C0C0C;border-left-color:#3F3F3F;background-color:#0C0C0C;color:#C2BE9E}.layui-code-notepad .layui-code-h3{border-bottom:none}.layui-code-notepad .layui-code-ol li{background-color:#3F3F3F;border-left:none}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/css/modules/laydate/default/laydate.css b/pluss-manage-page/src/main/resources/static/resources/css/modules/laydate/default/laydate.css
new file mode 100644
index 0000000..b900971
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/css/modules/laydate/default/laydate.css
@@ -0,0 +1,2 @@
+/** layui-v2.5.6 MIT License By https://www.layui.com */
+ .laydate-set-ym,.layui-laydate,.layui-laydate *,.layui-laydate-list{box-sizing:border-box}html #layuicss-laydate{display:none;position:absolute;width:1989px}.layui-laydate *{margin:0;padding:0}.layui-laydate{position:absolute;z-index:66666666;margin:5px 0;border-radius:2px;font-size:14px;-webkit-animation-duration:.3s;animation-duration:.3s;-webkit-animation-fill-mode:both;animation-fill-mode:both;-webkit-animation-name:laydate-upbit;animation-name:laydate-upbit}.layui-laydate-main{width:272px}.layui-laydate-content td,.layui-laydate-header *,.layui-laydate-list li{transition-duration:.3s;-webkit-transition-duration:.3s}@-webkit-keyframes laydate-upbit{from{-webkit-transform:translate3d(0,20px,0);opacity:.3}to{-webkit-transform:translate3d(0,0,0);opacity:1}}@keyframes laydate-upbit{from{transform:translate3d(0,20px,0);opacity:.3}to{transform:translate3d(0,0,0);opacity:1}}.layui-laydate-static{position:relative;z-index:0;display:inline-block;margin:0;-webkit-animation:none;animation:none}.laydate-ym-show .laydate-next-m,.laydate-ym-show .laydate-prev-m{display:none!important}.laydate-ym-show .laydate-next-y,.laydate-ym-show .laydate-prev-y{display:inline-block!important}.laydate-time-show .laydate-set-ym span[lay-type=month],.laydate-time-show .laydate-set-ym span[lay-type=year],.laydate-time-show .layui-laydate-header .layui-icon,.laydate-ym-show .laydate-set-ym span[lay-type=month]{display:none!important}.layui-laydate-header{position:relative;line-height:30px;padding:10px 70px 5px}.laydate-set-ym span,.layui-laydate-header i{padding:0 5px;cursor:pointer}.layui-laydate-header *{display:inline-block;vertical-align:bottom}.layui-laydate-header i{position:absolute;top:10px;color:#999;font-size:18px}.layui-laydate-header i.laydate-prev-y{left:15px}.layui-laydate-header i.laydate-prev-m{left:45px}.layui-laydate-header i.laydate-next-y{right:15px}.layui-laydate-header i.laydate-next-m{right:45px}.laydate-set-ym{width:100%;text-align:center;text-overflow:ellipsis;overflow:hidden;white-space:nowrap}.laydate-time-text{cursor:default!important}.layui-laydate-content{position:relative;padding:10px;-moz-user-select:none;-webkit-user-select:none;-ms-user-select:none}.layui-laydate-content table{border-collapse:collapse;border-spacing:0}.layui-laydate-content td,.layui-laydate-content th{width:36px;height:30px;padding:5px;text-align:center}.layui-laydate-content td{position:relative;cursor:pointer}.laydate-day-mark{position:absolute;left:0;top:0;width:100%;height:100%;line-height:30px;font-size:12px;overflow:hidden}.laydate-day-mark::after{position:absolute;content:'';right:2px;top:2px;width:5px;height:5px;border-radius:50%}.layui-laydate-footer{position:relative;height:46px;line-height:26px;padding:10px 20px}.layui-laydate-footer span{margin-right:15px;display:inline-block;cursor:pointer;font-size:12px}.layui-laydate-footer span:hover{color:#5FB878}.laydate-footer-btns{position:absolute;right:10px;top:10px}.laydate-footer-btns span{height:26px;line-height:26px;margin:0 0 0 -1px;padding:0 10px;border:1px solid #C9C9C9;background-color:#fff;white-space:nowrap;vertical-align:top;border-radius:2px}.layui-laydate-list>li,.layui-laydate-range .layui-laydate-main{display:inline-block;vertical-align:middle}.layui-laydate-list{position:absolute;left:0;top:0;width:100%;height:100%;padding:10px;background-color:#fff}.layui-laydate-list>li{position:relative;width:33.3%;height:36px;line-height:36px;margin:3px 0;text-align:center;cursor:pointer}.laydate-month-list>li{width:25%;margin:17px 0}.laydate-time-list>li{height:100%;margin:0;line-height:normal;cursor:default}.laydate-time-list p{position:relative;top:-4px;line-height:29px}.laydate-time-list ol{height:181px;overflow:hidden}.laydate-time-list>li:hover ol{overflow-y:auto}.laydate-time-list ol li{width:130%;padding-left:33px;line-height:30px;text-align:left;cursor:pointer}.layui-laydate-hint{position:absolute;top:115px;left:50%;width:250px;margin-left:-125px;line-height:20px;padding:15px;text-align:center;font-size:12px}.layui-laydate-range{width:546px}.layui-laydate-range .laydate-main-list-0 .laydate-next-m,.layui-laydate-range .laydate-main-list-0 .laydate-next-y,.layui-laydate-range .laydate-main-list-1 .laydate-prev-m,.layui-laydate-range .laydate-main-list-1 .laydate-prev-y{display:none}.layui-laydate-range .laydate-main-list-1 .layui-laydate-content{border-left:1px solid #e2e2e2}.layui-laydate,.layui-laydate-hint{border:1px solid #d2d2d2;box-shadow:0 2px 4px rgba(0,0,0,.12);background-color:#fff;color:#666}.layui-laydate-header{border-bottom:1px solid #e2e2e2}.layui-laydate-header i:hover,.layui-laydate-header span:hover{color:#5FB878}.layui-laydate-content{border-top:none 0;border-bottom:none 0}.layui-laydate-content th{font-weight:400;color:#333}.layui-laydate-content td{color:#666}.layui-laydate-content td.laydate-selected{background-color:#00F7DE}.laydate-selected:hover{background-color:#00F7DE!important}.layui-laydate-content td:hover,.layui-laydate-list li:hover{background-color:#eaeaea;color:#333}.laydate-time-list li ol{margin:0;padding:0;border:1px solid #e2e2e2;border-left-width:0}.laydate-time-list li:first-child ol{border-left-width:1px}.laydate-time-list>li:hover{background:0 0}.layui-laydate-content .laydate-day-next,.layui-laydate-content .laydate-day-prev{color:#d2d2d2}.laydate-selected.laydate-day-next,.laydate-selected.laydate-day-prev{background-color:#f8f8f8!important}.layui-laydate-footer{border-top:1px solid #e2e2e2}.layui-laydate-hint{color:#FF5722}.laydate-day-mark::after{background-color:#5FB878}.layui-laydate-content td.layui-this .laydate-day-mark::after{display:none}.layui-laydate-footer span[lay-type=date]{color:#5FB878}.layui-laydate .layui-this{background-color:#009688!important;color:#fff!important}.layui-laydate .laydate-disabled,.layui-laydate .laydate-disabled:hover{background:0 0!important;color:#d2d2d2!important;cursor:not-allowed!important;-moz-user-select:none;-webkit-user-select:none;-ms-user-select:none}.laydate-theme-molv{border:none}.laydate-theme-molv.layui-laydate-range{width:548px}.laydate-theme-molv .layui-laydate-main{width:274px}.laydate-theme-molv .layui-laydate-header{border:none;background-color:#009688}.laydate-theme-molv .layui-laydate-header i,.laydate-theme-molv .layui-laydate-header span{color:#f6f6f6}.laydate-theme-molv .layui-laydate-header i:hover,.laydate-theme-molv .layui-laydate-header span:hover{color:#fff}.laydate-theme-molv .layui-laydate-content{border:1px solid #e2e2e2;border-top:none;border-bottom:none}.laydate-theme-molv .laydate-main-list-1 .layui-laydate-content{border-left:none}.laydate-theme-grid .laydate-month-list>li,.laydate-theme-grid .laydate-year-list>li,.laydate-theme-grid .layui-laydate-content td,.laydate-theme-grid .layui-laydate-content thead,.laydate-theme-molv .layui-laydate-footer{border:1px solid #e2e2e2}.laydate-theme-grid .laydate-selected,.laydate-theme-grid .laydate-selected:hover{background-color:#f2f2f2!important;color:#009688!important}.laydate-theme-grid .laydate-selected.laydate-day-next,.laydate-theme-grid .laydate-selected.laydate-day-prev{color:#d2d2d2!important}.laydate-theme-grid .laydate-month-list,.laydate-theme-grid .laydate-year-list{margin:1px 0 0 1px}.laydate-theme-grid .laydate-month-list>li,.laydate-theme-grid .laydate-year-list>li{margin:0 -1px -1px 0}.laydate-theme-grid .laydate-year-list>li{height:43px;line-height:43px}.laydate-theme-grid .laydate-month-list>li{height:71px;line-height:71px}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/css/modules/laydialog/default/icon-ext.png b/pluss-manage-page/src/main/resources/static/resources/css/modules/laydialog/default/icon-ext.png
new file mode 100644
index 0000000..bbbb669
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/css/modules/laydialog/default/icon-ext.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/css/modules/laydialog/default/icon.png b/pluss-manage-page/src/main/resources/static/resources/css/modules/laydialog/default/icon.png
new file mode 100644
index 0000000..3e17da8
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/css/modules/laydialog/default/icon.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/css/modules/laydialog/default/laydialog.css b/pluss-manage-page/src/main/resources/static/resources/css/modules/laydialog/default/laydialog.css
new file mode 100644
index 0000000..219814d
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/css/modules/laydialog/default/laydialog.css
@@ -0,0 +1,182 @@
+/**
+ 
+ @Name: laydialog
+ @Author: 贤心
+ 
+ **/
+
+/* *html{background-image: url(about:blank); background-attachment: fixed;} */
+html #layuicss-laydialog{display: none; position: absolute; width: 1989px;}
+
+/* common */
+.layui-laydialog-shade, .layui-laydialog{position:fixed; _position:absolute; pointer-events: auto;}
+.layui-laydialog-shade{top:0; left:0; width:100%; height:100%; _height:expression(document.body.offsetHeight+"px");}
+.layui-laydialog{-webkit-overflow-scrolling: touch;}
+.layui-laydialog{top:150px; left: 0; margin:0; padding:0; background-color:#fff; -webkit-background-clip: content; border-radius: 2px; box-shadow: 1px 1px 50px rgba(0,0,0,.3);}
+.layui-laydialog-close{position:absolute;}
+.layui-laydialog-content{position:relative;}
+.layui-laydialog-border{border: 1px solid #B2B2B2; border: 1px solid rgba(0,0,0,.1); box-shadow: 1px 1px 5px rgba(0,0,0,.2);}
+.layui-laydialog-load{background:url('data:image/gif;base64,R0lGODlhPAAYALMPAPPJp/HYxfSwkf50Df5TD/+HAPe5bvqHR/twOviZavyrMu/m3f9EAP9mAP+ZAO7u7iH/C05FVFNDQVBFMi4wAwEAAAAh/wtYTVAgRGF0YVhNUDw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYwIDYxLjEzNDc3NywgMjAxMC8wMi8xMi0xNzozMjowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wUmlnaHRzPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvcmlnaHRzLyIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcFJpZ2h0czpNYXJrZWQ9IkZhbHNlIiB4bXBNTTpPcmlnaW5hbERvY3VtZW50SUQ9InhtcC5kaWQ6QUNDRERBRjMxRTIwNjgxMTg4QzZERjVGQ0I0MDI1NDkiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NTlDMEI5MzU5RTY2MTFFMTkxRDY5NkVCMDBGOTBFRUYiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NTlDMEI5MzQ5RTY2MTFFMTkxRDY5NkVCMDBGOTBFRUYiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNSBNYWNpbnRvc2giPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpENzU2N0YwMTMyMjA2ODExODhDNkRGNUZDQjQwMjU0OSIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpBQ0NEREFGMzFFMjA2ODExODhDNkRGNUZDQjQwMjU0OSIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PgH//v38+/r5+Pf29fTz8vHw7+7t7Ovq6ejn5uXk4+Lh4N/e3dzb2tnY19bV1NPS0dDPzs3My8rJyMfGxcTDwsHAv769vLu6ubi3trW0s7KxsK+urayrqqmop6alpKOioaCfnp2cm5qZmJeWlZSTkpGQj46NjIuKiYiHhoWEg4KBgH9+fXx7enl4d3Z1dHNycXBvbm1sa2ppaGdmZWRjYmFgX15dXFtaWVhXVlVUU1JRUE9OTUxLSklIR0ZFRENCQUA/Pj08Ozo5ODc2NTQzMjEwLy4tLCsqKSgnJiUkIyIhIB8eHRwbGhkYFxYVFBMSERAPDg0MCwoJCAcGBQQDAgEAACH5BAkFAA8ALAAAAAA8ABgAAATy8MlJq7046827/2AWCEdpCkGodkHSvHCcLGttLUOsw0NqW4EDYog4+CyInbJxwAQMiqjCcMQkGNgsNmFxLZXcisFBLpMNGYF2zRBQAt9vFWCuOwCXAJt9FMSXbhILdnY0FQd7a00SB39Kiw9jhGZoFQSJWgQTjksTCpNmChaYa5ucOxOgdaOkWaanMamqZRaXrZoSObAvA56zDqKHrQyQjbtME5KqlW/DRwbHDcwBv1UTV5hhEnDHVcqEzF2J2te75BLflBsCCFoIgRU4pwOGFQCfZQp4PxUBSX8IrPELscDLkhkDB7bQxQthwocQI0rMEAEAIfkECQUADwAsAAAAADwAGAAABOjwyUmrvTjrzbv/ILcAiWCUQKh+y9G88DsIa40JcQ4ji30JCIZQeAhcAgOdMvEYKZ5PQA8UHFoZtEpSuVQ4vmCHwuhJXK+EqcTA5YbfYrUmcD4jKNt2rAB/GzoHdWdTAXo6fXByGASCV1k4hjADiG8pG41XTA9skS98lGB/l5hDmgmdnqChHIykWBKQnZOqDpYaVaRkAKgvtA6KFwCudxO8DZ+UCh64grYPp7yqwBgLzFYEWRNIvAlecGMhAq1DCGQVu7JNBn7THQDvAObBeVwJ7T4gLW2i+P0PAQkOCBQoxZ/BgwgTYogAACH5BAkFAA8ALAAAAAA8ABgAAATV8MlJq7046827/2AojmMgHE2aIslCckAcb8Kg3umQvFhCMEAgYXcR4HCFpEJhCPAkiKAUiLAEbMdGwcHtcg28w3R8qKCyA6/aASABxvC2JJBNrdcuURQ+rUqMWVt3XmAhC3xweWdHg2oKIm+IU3KLOI1qkJKTEpU3l14iAZpSTg+dKp9cjyKjQRMGdYKXhSFio2VzdQ2ppSEBP5IEvQ9YR7J3tCICmgIVALrHhE+/cMIXCboDxwpy0z5BQ8POxUcD3U88CwnkKQni6E8yMXnw9fb3+BURACH5BAkFAA8ALAAAAAA8ABgAAATe8MlJq7046827/2AojqQUCEeaJkC5CUgcJ0G2JE2u60jrVgICY0gcIhaXQ25QaDp1vt8jUKwaLbhGwcHtcgeNQe23EFqrAkogt/W6cwlp4mwlICW4gXvvyI1LZnRFaRJgfHtghCRUglUIJjmHbgUNBy4AjY4SAGGSXpSWJZiZRI8PnHqeXKAujKQMpmsNqquVP4GZioa0iT8Hrwx/Sqmefj8BuHRxE5xanmChPwKZRxVKznxgDX8/AAh00RQL18S1YYpSDzffpVEXAjvxB9zpiwnaOQfo9fz9/v8ApUQAACH5BAkFAA8ALAAAAAA8ABgAAATO8MlJq7046827/2AojmS1AIkhJEBQasFBMDRDHC62JE3v97iXJVEr1hKThUHBdBQGv99gIZwIjFiG4AFweL/eQtSHqD4Cs2yR0AW7xeOGoXpQYwvuPHQ8FabtNA15g3ENWyUBgEUDg3mFBy8AijV4jWB7UZAlkpMMlZZemD+aJImdjKBej0KdDIKpDoWHJXWdn42iPzmIrQagcGOkL0SKSG15wFF9ZgJ/WLMBvpeFCLtmMVhBOjxxB1RmJgDiAN8bAQkH6Qcs4O3u7/Dx4BEAIfkECQUADwAsAAAAADwAGAAABMrwyUmrvTjrzbv/YCiOV5AgKCosZIsFCCPPc5KZQ6M3QxK4lgWBRuMVFEgDS5LYOXc24CRGlBUc2CwW8BA8vw2BtFuVDbRoByAHdg6WrmG1kU63v9EWoMy41rVsdzoDQAllBH9oBYJOPy2GVYiJWYuMOlyPh5OUlpcuApqbDpWWjiQBfH6TgYxSVER0m50NeS2gZap1BrOmLpBVuVpcTYy1QLdzuQamAqxuYmMTMGUJcBYmeL3REgAJ3gkC2hgLAOUA1tvp6uvs7R8RACH5BAkFAA8ALAAAAAA8ABgAAATs8MlJq7046827/2AojpmQICgqBGSLCQgjz3OyZEFy7LvgXoDZoEAsDBoyxGWRaDifzgHgNwkQGA2HdqstyBKWA3TsZFEPDAJ37RjIzBIBmTy4uQKyAnuNPEwWR3NjPi4CWHtrXgQTcoJjAz8xA4hrbxJijmNwIzF6lFtXUw+YmU+iJJ2foAyipKUNp5wMk6oOV2aupZsihlmqioyvUT94DJ6USEoSAcINYJGHlF6sFE2lA7sjxQ3HXNN+FAu5ZIRUAlcEtF1IDAh2FQaC2FQUATE0NOVACYENAyv0LMCgQeBAtoAIEypcyLDhhAgAIfkECQUADwAsAAAAADwAGAAABODwyUmrvTjrzbv/YCiOWiAgTJoiSUC+V0KodEokZWIIugtPAYNCUSgMZjWV4BI4NJ7QxsH3Mjiu2OsgqaJKFoOoeLB4AbJoR4PLQFQQ4rh7tEin2QyqIM5fiqx2WVtcfg9hfGMjCoFZBWxzC4h8Xh6MaI8SAJJxACKWWZgPmptRnSGLn45ccwGkUWUhgJaDSTgSh6QDIwGfDkhJeq4Ntn+zbAQUYLmwI7Joa2ymQLhxA5QiAKhXBdBcBxcLcHEHzD+Zv0kEhRcACQfvCdLmFAEytdfzZgD7AOX5/wADCrwQAQAh+QQJBQAPACwAAAAAPAAYAAAE6fDJSau9OOvNu/8gFiQkKSxh+gkE474uEqj0tSBw/gq1twCKYBCAOuiOhJllkRg0no0BDxRQOK5YhyJx7BIsAKj4ifgsrNlsodtNUBbOsdjgMaTvA7buOznI5UoaC3eELXowSgF/cm4bAIR3DYcwUwKLYwMcdpBZkpMujQaXY5qcnZ+gEgmjYhyPpleen42WrFEcg7AOqC4AEoq2Bx1onGu8FAi2vriwvAzCE2Gj0B1VhApGqEkVAnFyByhmm1gGKDifUxULfmN0PerZbATLGD8A9+8ZLF0y+f4PAhAIFJgg0L+DCBMqrBABACH5BAkFAA8ALAAAAAA8ABgAAATz8MlJq7046827/2AWCEhpCkGodkHCvHCcpGtdBUSswwRt3waFUGHwVRC7JAOBaR2eh9nG4KhaqwaLS5lMaBvgMNiLAVzPDgAlwOUaBeJ4Q3BZoNGLiaCtpEsWcnJGElR3V1kSSHw7TBIJgXFkFAqGVwoTi0oTA5BiAxaVZ5iZOxOdcaChVqOkMaanYRaUqpcSOa0vBJuwDZ8VhaGID4q4jQ+PsJITAaoOPlu4kgG8g4TBa7gvRsiQyr+GwhMHuAcWBpDhFwCzVQpqFgu3iwR5FgAHYgfvP2vEXAj7+K1YMI7LgXoCf7SQx4CAlIQQI0qcmCECACH5BAkFAA8ALAAAAAA8ABgAAATe8MlJq7046827/2AXACQZnuCSEEzrEkmAzpjAunhLCDRmKI5g0LC4BHJIl+wRSByeh1hKSBUWKYtbMkdQNb7gb+IDrFIVlcR2iwi7GzwOwGwGTI7r5Pu91NDpEwJ5SAR7bmMaC39mVweDOYZuAxsBi1VLCI84kW6UllSYmi6cYZ6fQaGiDKRfkxunQRNqqoWkiBoGpwaBqi2sfRmKn1cPWb21hreUZWYKwA+zogkGhrsguVVEF5maCBIAB2EHdicLAecBxBYL3HkI6j0zgmvK8T1NWgwwz/b9/v8AMUQAACH5BAkFAA8ALAAAAAA8ABgAAATY8MlJq7046827/+AXACQQhCi4CATjvoSwpFww2nMWtG/vEieaZQFwGI8ORbCy4Pl6hMZhmlimFMiswypBPKGNsDicoBm02pxE8IWN3w0BaoHWGijOLxzO5RTrWRMBbT97b2UgWIBIQQmEDIZvAyGKi0aNj5FvlJZHmISaYyFnnVtrmaENkyCknRMAj1GhiB90nXcTeU+pfRytgGoPjoSyhrQqlWgATLo+xW+4NH9ZCsGCzT5vB8tCEkQG4Aa9EwtehAjW3TQLCdgJ6erdAgn0CXLx+Pn6+xwRACH5BAkFAA8ALAAAAAA8ABgAAATM8MlJq7046827/2AojuSzCAeiqsJSaoChzIoBaALB7DyfvJaAwkEsEhWBS6LHIDQaTt0PKFkMjViFiwLoOZ/gJ0FAfVyx2Ypu9w2HB9QAeu5ISgQ9t75BfhnoaAYTCDxte08HQIBzE2sMh25wL4toE3mQYYqURpY8mJmTm0WdO59gQH+ighKEbKaJLwCiDjd3l5h9L2eAChQBjoZ7di9ylMMSS4WHBFNUVnRaSkx6DM1lDwC7CgBbFwCOTAy51yQLCeDM3eTr7O3u7yMRACH5BAkFAA8ALAAAAAA8ABgAAATO8MlJq7046827/2AojiQVCEmaCEGpLYbizI5iLFlwMHzPHy1XJSCjGRVBU6JBYDZ8PEJSuCgaj7jJssHtMqGIrKt6LdeyAq/660sIHwaz2fBYrNdQxnRkldMUD1t3XQRQAi4BfmYBA4NqYIiKZQGOjz4IkZJGlJVdkCULmkYLjZ1Pl0KiNIGmhT6HLnGidJyVeXsioaJZgneuPZhviZJicIO/UcVjfVgWAAeWl7hjskY3GQsIeTxhbxcLAeEByhjPCOcIBwDe7O3u7/DxEhEAIfkECQUADwAsAAAAADwAGAAABMHwyUmrvTjrzbv/YCiOWGACgbcALEpygeHMtGNoAsLsPCG8GEBt6FAAEofkIRE48J68A7ASIBILjay2QYB6f9PHQmElDrbarveZmsrKRLR2/USE4dazXE1ntElVeENYcg19O2CAgoOFhocJQIGLM4RyhwyQL5KTlWiXiSSTNHpofHR/JG+TjZcEYQuinWmfYQ9CgrJZpmtStQ+bRAYAB1sHAAKHoLUxVjcZOV4+vhYxBtYACx0CCdwJytPg4eLj5B8RACH5BAkFAA8ALAAAAAA8ABgAAATI8MlJq7046827/2AojtgCGKgBLGSbLYojz7LClgnC7AyS3C7KgkacJQKWAIHHZBCQQQmsSG0khMsmkwB0GajUQkMg1WmbiO5oCKYOGsjE+Xz1tt3WR3a+DX7vRGIDAXxnUCQxgDRiDQCFWgAuiYoyjI6PTJEtk5SChJg8hyMAlDNvV3uPBEFspQ1wD3KgdZKlYnULqXNcUa2ADQYUn3xPURIBnFQHmkJmWmnGE1NUNi+yTD/RFQEGCt4KBqIvAOQr2ufo6errIhEAIfkECQUADwAsAAAAADwAGAAABLTwyUmrvTjrzbv/YCiO2QIYSqoYxkK+GODMdG1owoHsyCHAF0NtSLtZAgiGcqlEBIATGXEKqCwIzCyD4IIqplNFJanNIqBSMLEqAZTL7NdXTRRLDm/tAUgHT7B5TAR8fUQTgVqEhTWHiEyKizN/jkqDMHORdg9kjmcwaYtxApQMPzALkTNdEpx5nkBCi0YTAYgEcbCFsxQLrUwIq1APAXS4Fjm/AsHCDwsoQy3M0tPU1dbXGBEAIfkECQUADwAsAAAAADwAGAAABNbwyUmrvTjrzbv/4BWMZGiCC+CsrKMYyyljQWuvSqAFQA/os0kgcSjejoqYRYBgOJ8EQDDRqDYKR6Ql8ew+EzKBtTHIZqUTgHfNQKPGDXNWQWmyuwgTdSzPAgN3a0AfA2NYfTcGEgKBXgIhcIeILYoPXI1fkIaTNpWXmAxgIIVWZZwsaIygDI8ge1Wmpw5/qwyDHgFwsisUBKAEJ69XspUSapitJgabk0kVB40HQQAHsJy3ab5eUUEWCwpyzhkCCeUJbt0VCwZZMOnvxgbyBujw9vf4+RcRACH5BAUFAA8ALAAAAAA8ABgAAATi8MlJq7046827/2AWjGRogovirKyjAMspY0Zrr0owe0Fy/IeE7gG4GRWxS4LAaDIIiaQn0ahaq0KjVmEJMJ1gwpAjuJob2jSgggC7GYjO4nwdpLcUwfst4FDpVQV3WlJfe04EHAOAVYNaaw8Bh29jGIyNjjcGEgCTbpAZl2iZNptEnmCgGIuMpKUSkqhNlUqXgq4roIaTiRsBtrgrUgmyCR1/dHa4XBMLu28EUhsGgAYqrrReh2IgAAdXB2sLrqYWS24H0juR13flFwsA8jDr8DVq9fkB9ywKBur5AgocSPBCBAA7') #eee center center no-repeat;}
+.layui-laydialog-ico{ background:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAANIAAAA9CAMAAADvVccnAAAC7lBMVEUAAAA9pX1UqeQmJTQjIzN0dHRUqeT0mxHwfSYuje3qT0BgYGYsKzrpUUI4m912dnYQzW0Au5x1dXX0xQDrVDsAupt1dXXqTz92dnboTj/zmxEAupt2dnbqUUH0mxJTqeHoVER1dXV2dnYsKzoQzmwQzmzpUEAnJzIQzWz0xQAQzW12dnboU0ToVEXoVEXnTTzpVER2dnboVEQQzWzoTTx1dXX2xwDqTj8Qzm33yADpU0P1xgD4yQB1dXX6tAl2dnboTT31xgD0nBEAuprpUUEuje31mxDqUkL0rQoHw4p2dnZVqePnTDzzxAB3d3d2dnb0xQDoTz8QzWx2dnYFwY8GwYx2dnYlJDUQzW3oVETzmxEQzW3zmxL1xgDnTT12dnZUqeR1dXXoTT12dnYuje0QzWz3xwDrVEPqTj4uje1zc3PoUEF1dXXpTT31xgDnTDzzmhHsUEAAvJz2xwAAupslJDT0xAB2dnbnTT12dnYAu5vpTj7zmxEAupoQz242kuz3mBD2xgARzWznTDx1dXUQzm3zmxEAuproVEX0xQAAupvoUUF2dnYAupv1xgB1dXXoTz/7ywBUqeMQz27oVEUAupsQzm3nU0UAupsuje3ymhEuje11dXXymxD0xAD0xgB0dHTzmxH1xgAQzWxzc3P7nRAAvZ37nREAuZoAupoAupv1xgDoTDwQzmxUquMlJTTzmhH0mRLpU0QAupsAupsAupsuje1VquQlJDTznBH3xwBzc3MQzW0Aupr0xQD1mhAlJTQrKjrnTDzzmxBVqeQlJTV1dXUAuZsQzWzoUED4nBAuje0uje0lJDQuje0uje3zmxHzxQAQzW3ymhD6nRAlIzX3mBD0xQAMyHrymxLnTDwQzm3zxQBUqeQkIzPpSzsoJTYQzWwuje31xQBzc3PzmxFTqORUquTzmhFUqeQQzW1TqOR3d3cuje1VquQmJTUAupsRzW30xQDzmxHoVEXmTT3nTT3oU0R4eHgtLDvZ3m1xAAAA7HRSTlMABM/PLlIuKwRSFAh3jgf5yGUj9Aj0RxoZDvnRrjTiF8I504BGOisWEvz07c/89fDg3tvRy3NlVU9GMC0aEAnY2M+mj4V4MyIOC+nf38LAubetkWobDvK3cWTy6+rp5uS3fHFtbGtoZ2RdWE8wHuK2n0dFIunf18mhn4l8YVAsJhwT+vfBvru2tqqjmpaBgWFdVEQi6OHd1sbBuK+nlpGNhnlzYV1aVUssIhPIk4Ln58zKx8Ktm5aNjYyIfXhrXlpB+8Kunp6SXlcmE+3p3tjUypuYdnRbVzszwbyrWVhIPx+fnpqQi3pozrWjdJwlHLUAAAy/SURBVGje7JhpTFRXFMfvfCCQMXQGGNkxQJCAoMPIAIIga2TJ4LDoREAgYFhSQBAMu4QCbqUqBquGUIu4F0xcP2hdEk3cPqltqlUT07RNmuZ+eOvM195377szj3mDsU2Tfuk/4b17OZnh/bjnnHfOAU4Vjf70e97Vq3m//zRaBFT67vK9WwfCwg7cunf5O7VVW9gyeTAx8eBkS6FWbf2ip/nXstzcsl+be75QGVcEe82adBDCemulfxb4e4obaXqXrNcnv2saiVMZn1/cz/N8aHV1KLrOXCxyA7oQxjDMSiR0C7vgBqVNO+kQ1q5DWis4TqZp3YCO9XJcfABSPMf1HnOD8p/TQV1CvclUX2KDMLx9BViqoA+LZosoWsyLH4JUQE+TWZZdg4RuyU/doDbP8PyOa11nhofPdF3bwfOPvJXW7hsM83XY4BM/vyeDYV8zzI1upXV3pENISiyYqqqaKkhMEhyRu5XW9FKO25V7535q6v07ubs4rjRdeUSVOlgysTMqGICs9nNWE4RzSw6qsNFotxtzkKR7YyFQKkbPsvqKs6uRzlZI6xiF0ed8KL8qb7OTL28VH3reh24/80NA+Vvpdms+gvL7jG4NrYKQ5Bvk/K/6JglCq4FuN6UioNOZdJt5GkGlbqLbrDmoC28HTgV/VQLD/V37VotoXGyNCEGKaF00ipYp4NJ2ln23YRvdbduwjx3b7rL+wPP7CRCFQl74A90cZpibl5TWSzcZ5jDdFAhCeazSGlsuCAV0c4TjDm1UWjce4rgjlCgclqSAJQrsgybKpO0XxYJYxRcXiOKkge4qWHa7BihUfJdlK+jmPM9/A9z0Dc+fxwsNOqN8d2s+OifyfS2Otb7uVt+1jhZy+s1c/LfkeNLn59PJYX0bzzUTD5iDpkDgpmArDM8iRG/FnIilxogcsVOO1Lvsmhjgpg1r2O3ykYQ6iZ4PDz93MoV64zhimEGg0iDDdOM4EtYWqK3o5HA8pXPxd4Ck1wscUulrvLnDcTiePocJgU6S4BV0FQ0f48Wk2KlKCEGd4iR5epaNASrFyL/dtJ/fT+PmR57/kcbXfv4RcvriU8xN4EEHmFPFAIRECuWerAeFyBD0zaXcIZIiArjesrJerpYwlXGl6JuDTZB6nf/3fdmzFC/QBqXwahRzEJGKKUdslJxMT8+DisaXXoMe/SK/wxuokYD3Dv6ij+YCs+cS8KBLe5gLGp80x/EMgMjanC7f0SZ5RsZxR5qPzzGuFsdREWLoQWG0wJUV4Xiq5Y75aI7CCUoUDSesCXCnHBq/wfAVoKNuPBZ4UOx4XYf06Ps0nqyafexZ9Pd+5vMA1WhX1yigyuNnNm0Lo4GkDqewbSEnSSC1OdZnyETXHWkknE6GFPXKgZQuo70O4NLlcOotWmHSecmZfAs8CkB7NgyUXa8e+hsW7UPAowrsvj5xNWtWS+uRiqdA1tmKEeKQNXFglN+xGXjU5urQ0cvMnq3ATVu7t0nXPczlQsdx7Byx64WkWEwUKazHi6DjQmEPV0sSwntuwQf7cin3niSLWq6nHWZTTyPBEwV/A0ThsDJIrNPijwAqutHWjWtj2H34QdCbdrUzipKlB9Xo0W8e8NeUGEq8a/wDP+aUO9G2m8wF6R7G3GsRrsupaL1wEvlDISKSk1Si0JLKLdDEPU/uvfIpgVyuuQEOAKJKiI9LE90nv2bP2axp9kW0MBSY+7XOMCo3N0r3RXtaBXtFWr1hWbaJJkCWxcd0BZlu812KsujFi+euXRd/+0vmsDvRl8zKbuJ5t/rXDgEnU2TQs+uEiHje5KH4I0CpnlKuTC6HTse/HNBVAqLP4VGM1JctZ732kvpye5oUkna73fl2bUSbZ+ieZi/Xj8XgT1TU6KeJcURfU6EhnqcHeaFnAHClBJIqiM6E5t1Y+URFtGcvXvmtPBC5bgoomBIdTiJQte5gacB9oFDmAg4prNSAsi02OXSirNAUbrVat0Bd5QoaTGaj9E2Fol1sc5YSdvt4ofSXjOYTKJSwpjEGxpPZVq9JBlerhxVIq1YpkIar/whb6Yc/sFX+bDEhIkhhieuqAFVGoiBEPgMupMTcgFQF0aZDXMAx4ETKjS7xJyVEHxyw9k1s6eubjbZFEXM2rMsJkRZTnUOuSBrq3I2DyWJhT8SBZbT1xNjHkX6Wkd6cGqREKwmRZyTD8kjzXO17sASpnWRwkxUADZB+vGgxYYJ2jORRITn2jyNhx1MhUcfrkh2vmxR1lMiz462X4mk5x8vMlUs76nhWmxfxsuxwdE2ZDUYuGB0oO16CMccAlpE2pw47nkrU8Wh6UCKp00PxPczkIlKnB0dSRkYSZVKnh427Amgg0fSQokCa0CE3DJSRohKyzcZY4Ekklkh60IxMA4WmRzQkPeAkrkJSJ3GJKV9BRJO4iygC3RCTVp3EScWwqwcvaBKvhOEKpLnHwIW0UzfbiTIekWG371uL5a3vB3psU/bOKziJx53QKwsHPfZGZCKvWiWS+lVLi28FkfpVi8sHdE7Xn5FXrYO8aqkyAwLIhr5q/WF9FkYyzaKrl+SF7TLSBPRqFeX6vs1irDOXl5vrxi1t8vmLreRVq/lTqn6omthXGvKqpQWRGokWRIPO7M3s/XhBRJjaVAURVjrtZmlBNEE8zz+7PqWh4auvGhoaZkll3m6zBXfYcTCF9IvmKS2OoEaz6BtCskNHXA32vOmamjdA1puammlaEOGyVY2kLluLn+xVl60CLlu1rrI1oioIl60CLlt3bQRqkbIVBMLoYKnCewxLEhLq6xMSEnQTOK9b4ZzG0G9vRI//UERXqkax0yBd+w20bI1ha5qK8bM11bAxctnq1lx4V1d7/9vNBdEX8824P6fNBXkhYc+Lcspfg+sjGyKLNRqDQMjQkjFGWqMBVeh1z1zNxYYxNvlVU9OrZHZsA20u3FpAw4MHhr/XAjo8t4AOVwtINB8f0CwvaQsYpYMpQKVA1GWQkHmoVVu1ZnFI2QJOv2IljVVMy8Xrhk9s1AdVRK5GXfDUqAvKRp0OIY4At0b9HLSlqIhMyO3wf7dc7NeqiMrFcgNt1MnTx61ualodp2zU6Thlxhso5D3z0XHKgY+OUw56Gqdkzs9n4jgqw2xEDVA3EAwU0nxfAmez5MrbLD6Mdev/HtofhrjGKXeLl1Sf0jjlPx96ac7pYHRKFqDymtApBnkdneJ4awdwqqN13F6uVQ699i0dei1t3r0fodHkCzKafLHMaDLfDynf02gSQSX6ViH5JiIgT6PJ06n376eeVo0mQVQf1JnCd34e1e5VOZBtg/VeinGroWBctAy1FRrQsrBtyCKOD33KaJKq6OJM6CcOkE/t9TRAFtYhCYLjepunATIXgIRuC+4D5KzALRDqbAklNh2EpqPBbsWPr12015k7O811aOEb8ekDZDrmvy2N+W8vM+b3I2N+v3805n8pjflfqsb8GMr/6GNrdPSWgYb2YLU1I63fYhRFo6U/LcPjmP+XZKRfpDH///qrHft3TRyM4zj+8UcEiaTg0EkQ6uDQ2fHolKWCS4euV8xS9w6d8g8IBTdxvfluU6GLhevUXjs5esgNLccldo3bPfk+z9fEH3hSgmeoLyTJgy5vnofEPHt7H0sif9YsFJpn+cTqr22r2+l0LTuBuNArtVNHOK1VdCwzzPajKzy2TQPxoB05M0caFmWf3ZnnLOLgwplzgXmmO8fE7rv1nDne7WJR3Jo0Z4mGQNZdksVKL59DXoDSeUgJJBmgcSqAyOgnzpITHcx4cpc8GSA5EL5ItjIzrSSQGqRnBimQSYDGbwFEJVGhiMOGR+czOWeVBBeZcl7UXFnybBoUcqea1EWySKPiV6HoJ5VpXP4mlLeYlK+ppeY3eQ21DGt5SHZbLbUsn3xtW6ZMaTmVpjlwErGrE04i6R93nJRROCmtRJlUP6aGAw2a54nDAQ2P65CsB5eb5IE8WICMKalDOClTbalZ4qKBmqUAJ7Eok64d4jkN3NygIS5IE9IvV7nEpfjwqAtuytFUqSQugkriIsikJFNJKRZtUsFhX/yNF1aA1HGDJlHEOlByU1p1KomLYKskVYQxJU2YSnpjO5tk0PG1BcFP+iR/MYCwzaRr1eDJhec57194f3rCCOCkXF8YApsk7ert4XU06n0PklLD4bB/v/Wk4CZed9bexK3NbuKtcFIZ+Ln9JH7UanV13ztc/ai11GSte9RunkTPp1ASPZ928g9R0TBEkuGjpLGuiyTdN15IIkFSxDTPWeC972/r76rQQ5WI2Tq/Evq4Ivf/Sorny0WGqXGagexfAT/ai3p4O6W+fjvFist2SmjTCysZvOmFvb3/7C/DRJIh08ft/wAAAABJRU5ErkJggg==') no-repeat;}
+.layui-laydialog-dialog .layui-laydialog-ico,
+.layui-laydialog-setwin a,
+.layui-laydialog-btn a{display:inline-block; *display:inline; *zoom:1; vertical-align:top;}
+
+.layui-laydialog-move{display: none; position: fixed; *position: absolute; left: 0px; top: 0px; width: 100%; height: 100%; cursor: move; opacity: 0; filter:alpha(opacity=0); background-color: #fff; z-index: 2147483647;}
+.layui-laydialog-resize{position: absolute; width: 15px; height: 15px; right: 0; bottom: 0; cursor: se-resize;}
+
+/* 动画 */
+.laydialog-anim{-webkit-animation-fill-mode: both; animation-fill-mode: both; -webkit-animation-duration:.3s; animation-duration:.3s;}
+
+@-webkit-keyframes laydialog-bounceIn { /* 默认 */
+	0% {opacity: 0; -webkit-transform: scale(.5); transform: scale(.5)}
+	100% {opacity: 1; -webkit-transform: scale(1); transform: scale(1)}
+}
+@keyframes laydialog-bounceIn {
+	0% {opacity: 0; -webkit-transform: scale(.5); -ms-transform: scale(.5); transform: scale(.5)}
+	100% {opacity: 1; -webkit-transform: scale(1); -ms-transform: scale(1); transform: scale(1)}
+}
+.laydialog-anim-00{-webkit-animation-name: laydialog-bounceIn;animation-name: laydialog-bounceIn}
+
+@-webkit-keyframes laydialog-zoomInDown{0%{opacity:0;-webkit-transform:scale(.1) translateY(-2000px);transform:scale(.1) translateY(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateY(60px);transform:scale(.475) translateY(60px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}@keyframes laydialog-zoomInDown{0%{opacity:0;-webkit-transform:scale(.1) translateY(-2000px);-ms-transform:scale(.1) translateY(-2000px);transform:scale(.1) translateY(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateY(60px);-ms-transform:scale(.475) translateY(60px);transform:scale(.475) translateY(60px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}.laydialog-anim-01{-webkit-animation-name:laydialog-zoomInDown;animation-name:laydialog-zoomInDown}
+
+@-webkit-keyframes laydialog-fadeInUpBig{0%{opacity:0;-webkit-transform:translateY(2000px);transform:translateY(2000px)}100%{opacity:1;-webkit-transform:translateY(0);transform:translateY(0)}}@keyframes laydialog-fadeInUpBig{0%{opacity:0;-webkit-transform:translateY(2000px);-ms-transform:translateY(2000px);transform:translateY(2000px)}100%{opacity:1;-webkit-transform:translateY(0);-ms-transform:translateY(0);transform:translateY(0)}}.laydialog-anim-02{-webkit-animation-name:laydialog-fadeInUpBig;animation-name:laydialog-fadeInUpBig}
+
+@-webkit-keyframes laydialog-zoomInLeft{0%{opacity:0;-webkit-transform:scale(.1) translateX(-2000px);transform:scale(.1) translateX(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateX(48px);transform:scale(.475) translateX(48px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}@keyframes laydialog-zoomInLeft{0%{opacity:0;-webkit-transform:scale(.1) translateX(-2000px);-ms-transform:scale(.1) translateX(-2000px);transform:scale(.1) translateX(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateX(48px);-ms-transform:scale(.475) translateX(48px);transform:scale(.475) translateX(48px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}.laydialog-anim-03{-webkit-animation-name:laydialog-zoomInLeft;animation-name:laydialog-zoomInLeft}
+
+@-webkit-keyframes laydialog-rollIn{0%{opacity:0;-webkit-transform:translateX(-100%) rotate(-120deg);transform:translateX(-100%) rotate(-120deg)}100%{opacity:1;-webkit-transform:translateX(0px) rotate(0deg);transform:translateX(0px) rotate(0deg)}}@keyframes laydialog-rollIn{0%{opacity:0;-webkit-transform:translateX(-100%) rotate(-120deg);-ms-transform:translateX(-100%) rotate(-120deg);transform:translateX(-100%) rotate(-120deg)}100%{opacity:1;-webkit-transform:translateX(0px) rotate(0deg);-ms-transform:translateX(0px) rotate(0deg);transform:translateX(0px) rotate(0deg)}}.laydialog-anim-04{-webkit-animation-name:laydialog-rollIn;animation-name:laydialog-rollIn}
+
+@keyframes laydialog-fadeIn{0%{opacity:0}100%{opacity:1}}.laydialog-anim-05{-webkit-animation-name:laydialog-fadeIn;animation-name:laydialog-fadeIn}
+
+@-webkit-keyframes laydialog-shake{0%,100%{-webkit-transform:translateX(0);transform:translateX(0)}10%,30%,50%,70%,90%{-webkit-transform:translateX(-10px);transform:translateX(-10px)}20%,40%,60%,80%{-webkit-transform:translateX(10px);transform:translateX(10px)}}@keyframes laydialog-shake{0%,100%{-webkit-transform:translateX(0);-ms-transform:translateX(0);transform:translateX(0)}10%,30%,50%,70%,90%{-webkit-transform:translateX(-10px);-ms-transform:translateX(-10px);transform:translateX(-10px)}20%,40%,60%,80%{-webkit-transform:translateX(10px);-ms-transform:translateX(10px);transform:translateX(10px)}}.laydialog-anim-06{-webkit-animation-name:laydialog-shake;animation-name:laydialog-shake}@-webkit-keyframes fadeIn{0%{opacity:0}100%{opacity:1}}
+
+/* 标题栏 */
+.layui-laydialog-title{padding:0 80px 0 20px; height:42px; line-height:42px; border-bottom:1px solid #eee; font-size:14px; color:#333; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; background-color: #F8F8F8; border-radius: 2px 2px 0 0;}
+.layui-laydialog-setwin{position:absolute; right:15px; *right:0; top:15px; font-size:0; line-height: initial;}
+.layui-laydialog-setwin a{position:relative; width: 16px; height:16px; margin-left:10px; font-size:12px; _overflow:hidden;}
+.layui-laydialog-setwin .layui-laydialog-min cite{position:absolute; width:14px; height:2px; left:0; top:50%; margin-top:-1px; background-color:#2E2D3C; cursor:pointer; _overflow:hidden;}
+.layui-laydialog-setwin .layui-laydialog-min:hover cite{background-color:#2D93CA; }
+.layui-laydialog-setwin .layui-laydialog-max{background-position:-32px -40px;}
+.layui-laydialog-setwin .layui-laydialog-max:hover{background-position:-16px -40px;}
+.layui-laydialog-setwin .layui-laydialog-maxmin{background-position:-65px -40px;}
+.layui-laydialog-setwin .layui-laydialog-maxmin:hover{background-position:-49px -40px;}
+.layui-laydialog-setwin .layui-laydialog-close1{background-position: 1px -40px; cursor: pointer;}
+.layui-laydialog-setwin .layui-laydialog-close1:hover{opacity:0.7;}
+.layui-laydialog-setwin .layui-laydialog-close2{position:absolute; right:-28px; top:-28px; width:30px; height:30px;  margin-left:0; background-position:-149px -31px; *right:-18px; _display:none;}
+.layui-laydialog-setwin .layui-laydialog-close2:hover{ background-position:-180px -31px;}
+
+/* 按钮栏 */
+.layui-laydialog-btn{text-align: right; padding: 0 10px 12px; pointer-events: auto; user-select: none; -webkit-user-select: none;}
+.layui-laydialog-btn a{height: 28px; line-height: 28px; margin: 0 6px; padding: 0 15px;border-radius: 2px; font-weight:400; cursor:pointer; text-decoration: none;}
+.layui-laydialog-btn a:hover{opacity: 0.9; text-decoration: none;}
+.layui-laydialog-btn a:active{opacity: 0.8;}
+/* .layui-laydialog-btn .layui-laydialog-btn0{border-color: #4898d5; background-color: #2e8ded; color:#fff;}
+ */
+.layui-laydialog-btn-l{text-align: left;}
+.layui-laydialog-btn-c{text-align: center;}
+
+/* 定制化 */
+.layui-laydialog-dialog{min-width:260px;}
+.layui-laydialog-dialog .layui-laydialog-content{position: relative; padding:20px; line-height:24px; word-break: break-all; overflow:hidden; font-size:14px; overflow-x: hidden; overflow-y:auto;}
+.layui-laydialog-dialog .layui-laydialog-content .layui-laydialog-ico{position:absolute; top:16px; left:15px; _left:-40px; width:30px; height:30px;}
+.layui-laydialog-ico1{background-position:-30px 0 }
+.layui-laydialog-ico2{background-position:-60px 0;}
+.layui-laydialog-ico3{background-position:-90px 0;}
+.layui-laydialog-ico4{background-position:-120px 0;}
+.layui-laydialog-ico5{background-position:-150px 0;}
+.layui-laydialog-ico6{background-position:-180px 0;}
+.layui-laydialog-rim{border:6px solid #8D8D8D; border:6px solid rgba(0,0,0,.3); border-radius:5px; box-shadow: none;}
+.layui-laydialog-msg{min-width:180px; border:1px solid #D3D4D3; box-shadow: none;}
+.layui-laydialog-hui{min-width:100px;  background-color: #000; filter:alpha(opacity=60); background-color: rgba(0,0,0,0.6); color: #fff; border:none;}
+.layui-laydialog-hui .layui-laydialog-content{padding:12px 25px; text-align:center;}
+.layui-laydialog-dialog .layui-laydialog-padding{padding: 20px 20px 20px 55px; text-align: left;}
+.layui-laydialog-page .layui-laydialog-content{position:relative; overflow:auto;}
+.layui-laydialog-page .layui-laydialog-btn,.layui-laydialog-iframe .layui-laydialog-btn{padding-top:10px;}
+.layui-laydialog-nobg{background:none;}
+.layui-laydialog-iframe iframe{display: block; width: 100%;}
+
+.layui-laydialog-loading{border-radius:100%; background:none;  box-shadow:none;  border:none;}
+.layui-laydialog-loading .layui-laydialog-content{width:60px; height:24px;background:url('data:image/gif;base64,R0lGODlhPAAYALMPAPPJp/HYxfSwkf50Df5TD/+HAPe5bvqHR/twOviZavyrMu/m3f9EAP9mAP+ZAO7u7iH/C05FVFNDQVBFMi4wAwEAAAAh/wtYTVAgRGF0YVhNUDw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYwIDYxLjEzNDc3NywgMjAxMC8wMi8xMi0xNzozMjowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wUmlnaHRzPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvcmlnaHRzLyIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcFJpZ2h0czpNYXJrZWQ9IkZhbHNlIiB4bXBNTTpPcmlnaW5hbERvY3VtZW50SUQ9InhtcC5kaWQ6QUNDRERBRjMxRTIwNjgxMTg4QzZERjVGQ0I0MDI1NDkiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NTlDMEI5MzU5RTY2MTFFMTkxRDY5NkVCMDBGOTBFRUYiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NTlDMEI5MzQ5RTY2MTFFMTkxRDY5NkVCMDBGOTBFRUYiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNSBNYWNpbnRvc2giPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpENzU2N0YwMTMyMjA2ODExODhDNkRGNUZDQjQwMjU0OSIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpBQ0NEREFGMzFFMjA2ODExODhDNkRGNUZDQjQwMjU0OSIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PgH//v38+/r5+Pf29fTz8vHw7+7t7Ovq6ejn5uXk4+Lh4N/e3dzb2tnY19bV1NPS0dDPzs3My8rJyMfGxcTDwsHAv769vLu6ubi3trW0s7KxsK+urayrqqmop6alpKOioaCfnp2cm5qZmJeWlZSTkpGQj46NjIuKiYiHhoWEg4KBgH9+fXx7enl4d3Z1dHNycXBvbm1sa2ppaGdmZWRjYmFgX15dXFtaWVhXVlVUU1JRUE9OTUxLSklIR0ZFRENCQUA/Pj08Ozo5ODc2NTQzMjEwLy4tLCsqKSgnJiUkIyIhIB8eHRwbGhkYFxYVFBMSERAPDg0MCwoJCAcGBQQDAgEAACH5BAkFAA8ALAAAAAA8ABgAAATy8MlJq7046827/2AWCEdpCkGodkHSvHCcLGttLUOsw0NqW4EDYog4+CyInbJxwAQMiqjCcMQkGNgsNmFxLZXcisFBLpMNGYF2zRBQAt9vFWCuOwCXAJt9FMSXbhILdnY0FQd7a00SB39Kiw9jhGZoFQSJWgQTjksTCpNmChaYa5ucOxOgdaOkWaanMamqZRaXrZoSObAvA56zDqKHrQyQjbtME5KqlW/DRwbHDcwBv1UTV5hhEnDHVcqEzF2J2te75BLflBsCCFoIgRU4pwOGFQCfZQp4PxUBSX8IrPELscDLkhkDB7bQxQthwocQI0rMEAEAIfkECQUADwAsAAAAADwAGAAABOjwyUmrvTjrzbv/ILcAiWCUQKh+y9G88DsIa40JcQ4ji30JCIZQeAhcAgOdMvEYKZ5PQA8UHFoZtEpSuVQ4vmCHwuhJXK+EqcTA5YbfYrUmcD4jKNt2rAB/GzoHdWdTAXo6fXByGASCV1k4hjADiG8pG41XTA9skS98lGB/l5hDmgmdnqChHIykWBKQnZOqDpYaVaRkAKgvtA6KFwCudxO8DZ+UCh64grYPp7yqwBgLzFYEWRNIvAlecGMhAq1DCGQVu7JNBn7THQDvAObBeVwJ7T4gLW2i+P0PAQkOCBQoxZ/BgwgTYogAACH5BAkFAA8ALAAAAAA8ABgAAATV8MlJq7046827/2AojmMgHE2aIslCckAcb8Kg3umQvFhCMEAgYXcR4HCFpEJhCPAkiKAUiLAEbMdGwcHtcg28w3R8qKCyA6/aASABxvC2JJBNrdcuURQ+rUqMWVt3XmAhC3xweWdHg2oKIm+IU3KLOI1qkJKTEpU3l14iAZpSTg+dKp9cjyKjQRMGdYKXhSFio2VzdQ2ppSEBP5IEvQ9YR7J3tCICmgIVALrHhE+/cMIXCboDxwpy0z5BQ8POxUcD3U88CwnkKQni6E8yMXnw9fb3+BURACH5BAkFAA8ALAAAAAA8ABgAAATe8MlJq7046827/2AojqQUCEeaJkC5CUgcJ0G2JE2u60jrVgICY0gcIhaXQ25QaDp1vt8jUKwaLbhGwcHtcgeNQe23EFqrAkogt/W6cwlp4mwlICW4gXvvyI1LZnRFaRJgfHtghCRUglUIJjmHbgUNBy4AjY4SAGGSXpSWJZiZRI8PnHqeXKAujKQMpmsNqquVP4GZioa0iT8Hrwx/Sqmefj8BuHRxE5xanmChPwKZRxVKznxgDX8/AAh00RQL18S1YYpSDzffpVEXAjvxB9zpiwnaOQfo9fz9/v8ApUQAACH5BAkFAA8ALAAAAAA8ABgAAATO8MlJq7046827/2AojmS1AIkhJEBQasFBMDRDHC62JE3v97iXJVEr1hKThUHBdBQGv99gIZwIjFiG4AFweL/eQtSHqD4Cs2yR0AW7xeOGoXpQYwvuPHQ8FabtNA15g3ENWyUBgEUDg3mFBy8AijV4jWB7UZAlkpMMlZZemD+aJImdjKBej0KdDIKpDoWHJXWdn42iPzmIrQagcGOkL0SKSG15wFF9ZgJ/WLMBvpeFCLtmMVhBOjxxB1RmJgDiAN8bAQkH6Qcs4O3u7/Dx4BEAIfkECQUADwAsAAAAADwAGAAABMrwyUmrvTjrzbv/YCiOV5AgKCosZIsFCCPPc5KZQ6M3QxK4lgWBRuMVFEgDS5LYOXc24CRGlBUc2CwW8BA8vw2BtFuVDbRoByAHdg6WrmG1kU63v9EWoMy41rVsdzoDQAllBH9oBYJOPy2GVYiJWYuMOlyPh5OUlpcuApqbDpWWjiQBfH6TgYxSVER0m50NeS2gZap1BrOmLpBVuVpcTYy1QLdzuQamAqxuYmMTMGUJcBYmeL3REgAJ3gkC2hgLAOUA1tvp6uvs7R8RACH5BAkFAA8ALAAAAAA8ABgAAATs8MlJq7046827/2AojpmQICgqBGSLCQgjz3OyZEFy7LvgXoDZoEAsDBoyxGWRaDifzgHgNwkQGA2HdqstyBKWA3TsZFEPDAJ37RjIzBIBmTy4uQKyAnuNPEwWR3NjPi4CWHtrXgQTcoJjAz8xA4hrbxJijmNwIzF6lFtXUw+YmU+iJJ2foAyipKUNp5wMk6oOV2aupZsihlmqioyvUT94DJ6USEoSAcINYJGHlF6sFE2lA7sjxQ3HXNN+FAu5ZIRUAlcEtF1IDAh2FQaC2FQUATE0NOVACYENAyv0LMCgQeBAtoAIEypcyLDhhAgAIfkECQUADwAsAAAAADwAGAAABODwyUmrvTjrzbv/YCiOWiAgTJoiSUC+V0KodEokZWIIugtPAYNCUSgMZjWV4BI4NJ7QxsH3Mjiu2OsgqaJKFoOoeLB4AbJoR4PLQFQQ4rh7tEin2QyqIM5fiqx2WVtcfg9hfGMjCoFZBWxzC4h8Xh6MaI8SAJJxACKWWZgPmptRnSGLn45ccwGkUWUhgJaDSTgSh6QDIwGfDkhJeq4Ntn+zbAQUYLmwI7Joa2ymQLhxA5QiAKhXBdBcBxcLcHEHzD+Zv0kEhRcACQfvCdLmFAEytdfzZgD7AOX5/wADCrwQAQAh+QQJBQAPACwAAAAAPAAYAAAE6fDJSau9OOvNu/8gFiQkKSxh+gkE474uEqj0tSBw/gq1twCKYBCAOuiOhJllkRg0no0BDxRQOK5YhyJx7BIsAKj4ifgsrNlsodtNUBbOsdjgMaTvA7buOznI5UoaC3eELXowSgF/cm4bAIR3DYcwUwKLYwMcdpBZkpMujQaXY5qcnZ+gEgmjYhyPpleen42WrFEcg7AOqC4AEoq2Bx1onGu8FAi2vriwvAzCE2Gj0B1VhApGqEkVAnFyByhmm1gGKDifUxULfmN0PerZbATLGD8A9+8ZLF0y+f4PAhAIFJgg0L+DCBMqrBABACH5BAkFAA8ALAAAAAA8ABgAAATz8MlJq7046827/2AWCEhpCkGodkHCvHCcpGtdBUSswwRt3waFUGHwVRC7JAOBaR2eh9nG4KhaqwaLS5lMaBvgMNiLAVzPDgAlwOUaBeJ4Q3BZoNGLiaCtpEsWcnJGElR3V1kSSHw7TBIJgXFkFAqGVwoTi0oTA5BiAxaVZ5iZOxOdcaChVqOkMaanYRaUqpcSOa0vBJuwDZ8VhaGID4q4jQ+PsJITAaoOPlu4kgG8g4TBa7gvRsiQyr+GwhMHuAcWBpDhFwCzVQpqFgu3iwR5FgAHYgfvP2vEXAj7+K1YMI7LgXoCf7SQx4CAlIQQI0qcmCECACH5BAkFAA8ALAAAAAA8ABgAAATe8MlJq7046827/2AXACQZnuCSEEzrEkmAzpjAunhLCDRmKI5g0LC4BHJIl+wRSByeh1hKSBUWKYtbMkdQNb7gb+IDrFIVlcR2iwi7GzwOwGwGTI7r5Pu91NDpEwJ5SAR7bmMaC39mVweDOYZuAxsBi1VLCI84kW6UllSYmi6cYZ6fQaGiDKRfkxunQRNqqoWkiBoGpwaBqi2sfRmKn1cPWb21hreUZWYKwA+zogkGhrsguVVEF5maCBIAB2EHdicLAecBxBYL3HkI6j0zgmvK8T1NWgwwz/b9/v8AMUQAACH5BAkFAA8ALAAAAAA8ABgAAATY8MlJq7046827/+AXACQQhCi4CATjvoSwpFww2nMWtG/vEieaZQFwGI8ORbCy4Pl6hMZhmlimFMiswypBPKGNsDicoBm02pxE8IWN3w0BaoHWGijOLxzO5RTrWRMBbT97b2UgWIBIQQmEDIZvAyGKi0aNj5FvlJZHmISaYyFnnVtrmaENkyCknRMAj1GhiB90nXcTeU+pfRytgGoPjoSyhrQqlWgATLo+xW+4NH9ZCsGCzT5vB8tCEkQG4Aa9EwtehAjW3TQLCdgJ6erdAgn0CXLx+Pn6+xwRACH5BAkFAA8ALAAAAAA8ABgAAATM8MlJq7046827/2AojuSzCAeiqsJSaoChzIoBaALB7DyfvJaAwkEsEhWBS6LHIDQaTt0PKFkMjViFiwLoOZ/gJ0FAfVyx2Ypu9w2HB9QAeu5ISgQ9t75BfhnoaAYTCDxte08HQIBzE2sMh25wL4toE3mQYYqURpY8mJmTm0WdO59gQH+ighKEbKaJLwCiDjd3l5h9L2eAChQBjoZ7di9ylMMSS4WHBFNUVnRaSkx6DM1lDwC7CgBbFwCOTAy51yQLCeDM3eTr7O3u7yMRACH5BAkFAA8ALAAAAAA8ABgAAATO8MlJq7046827/2AojiQVCEmaCEGpLYbizI5iLFlwMHzPHy1XJSCjGRVBU6JBYDZ8PEJSuCgaj7jJssHtMqGIrKt6LdeyAq/660sIHwaz2fBYrNdQxnRkldMUD1t3XQRQAi4BfmYBA4NqYIiKZQGOjz4IkZJGlJVdkCULmkYLjZ1Pl0KiNIGmhT6HLnGidJyVeXsioaJZgneuPZhviZJicIO/UcVjfVgWAAeWl7hjskY3GQsIeTxhbxcLAeEByhjPCOcIBwDe7O3u7/DxEhEAIfkECQUADwAsAAAAADwAGAAABMHwyUmrvTjrzbv/YCiOWGACgbcALEpygeHMtGNoAsLsPCG8GEBt6FAAEofkIRE48J68A7ASIBILjay2QYB6f9PHQmElDrbarveZmsrKRLR2/USE4dazXE1ntElVeENYcg19O2CAgoOFhocJQIGLM4RyhwyQL5KTlWiXiSSTNHpofHR/JG+TjZcEYQuinWmfYQ9CgrJZpmtStQ+bRAYAB1sHAAKHoLUxVjcZOV4+vhYxBtYACx0CCdwJytPg4eLj5B8RACH5BAkFAA8ALAAAAAA8ABgAAATI8MlJq7046827/2AojtgCGKgBLGSbLYojz7LClgnC7AyS3C7KgkacJQKWAIHHZBCQQQmsSG0khMsmkwB0GajUQkMg1WmbiO5oCKYOGsjE+Xz1tt3WR3a+DX7vRGIDAXxnUCQxgDRiDQCFWgAuiYoyjI6PTJEtk5SChJg8hyMAlDNvV3uPBEFspQ1wD3KgdZKlYnULqXNcUa2ADQYUn3xPURIBnFQHmkJmWmnGE1NUNi+yTD/RFQEGCt4KBqIvAOQr2ufo6errIhEAIfkECQUADwAsAAAAADwAGAAABLTwyUmrvTjrzbv/YCiO2QIYSqoYxkK+GODMdG1owoHsyCHAF0NtSLtZAgiGcqlEBIATGXEKqCwIzCyD4IIqplNFJanNIqBSMLEqAZTL7NdXTRRLDm/tAUgHT7B5TAR8fUQTgVqEhTWHiEyKizN/jkqDMHORdg9kjmcwaYtxApQMPzALkTNdEpx5nkBCi0YTAYgEcbCFsxQLrUwIq1APAXS4Fjm/AsHCDwsoQy3M0tPU1dbXGBEAIfkECQUADwAsAAAAADwAGAAABNbwyUmrvTjrzbv/4BWMZGiCC+CsrKMYyyljQWuvSqAFQA/os0kgcSjejoqYRYBgOJ8EQDDRqDYKR6Ql8ew+EzKBtTHIZqUTgHfNQKPGDXNWQWmyuwgTdSzPAgN3a0AfA2NYfTcGEgKBXgIhcIeILYoPXI1fkIaTNpWXmAxgIIVWZZwsaIygDI8ge1Wmpw5/qwyDHgFwsisUBKAEJ69XspUSapitJgabk0kVB40HQQAHsJy3ab5eUUEWCwpyzhkCCeUJbt0VCwZZMOnvxgbyBujw9vf4+RcRACH5BAUFAA8ALAAAAAA8ABgAAATi8MlJq7046827/2AWjGRogovirKyjAMspY0Zrr0owe0Fy/IeE7gG4GRWxS4LAaDIIiaQn0ahaq0KjVmEJMJ1gwpAjuJob2jSgggC7GYjO4nwdpLcUwfst4FDpVQV3WlJfe04EHAOAVYNaaw8Bh29jGIyNjjcGEgCTbpAZl2iZNptEnmCgGIuMpKUSkqhNlUqXgq4roIaTiRsBtrgrUgmyCR1/dHa4XBMLu28EUhsGgAYqrrReh2IgAAdXB2sLrqYWS24H0juR13flFwsA8jDr8DVq9fkB9ywKBur5AgocSPBCBAA7') no-repeat;}
+.layui-laydialog-loading .layui-laydialog-loading1{width:37px; height:37px; background:url('data:image/gif;base64,R0lGODlhJQAlAJECAL3L2AYrTv///wAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQFCgACACwAAAAAJQAlAAACi5SPqcvtDyGYIFpF690i8xUw3qJBwUlSadmcLqYmGQu6KDIeM13beGzYWWy3DlB4IYaMk+Dso2RWkFCfLPcRvFbZxFLUDTt21BW56TyjRep1e20+i+eYMR145W2eefj+6VFmgTQi+ECVY8iGxcg35phGo/iDFwlTyXWphwlm1imGRdcnuqhHeop6UAAAIfkEBQoAAgAsEAACAAQACwAAAgWMj6nLXAAh+QQFCgACACwVAAUACgALAAACFZQvgRi92dyJcVJlLobUdi8x4bIhBQAh+QQFCgACACwXABEADAADAAACBYyPqcsFACH5BAUKAAIALBUAFQAKAAsAAAITlGKZwWoMHYxqtmplxlNT7ixGAQAh+QQFCgACACwQABgABAALAAACBYyPqctcACH5BAUKAAIALAUAFQAKAAsAAAIVlC+BGL3Z3IlxUmUuhtR2LzHhsiEFACH5BAUKAAIALAEAEQAMAAMAAAIFjI+pywUAIfkEBQoAAgAsBQAFAAoACwAAAhOUYJnAagwdjGq2amXGU1PuLEYBACH5BAUKAAIALBAAAgAEAAsAAAIFhI+py1wAIfkEBQoAAgAsFQAFAAoACwAAAhWUL4AIvdnciXFSZS6G1HYvMeGyIQUAIfkEBQoAAgAsFwARAAwAAwAAAgWEj6nLBQAh+QQFCgACACwVABUACgALAAACE5RgmcBqDB2MarZqZcZTU+4sRgEAIfkEBQoAAgAsEAAYAAQACwAAAgWEj6nLXAAh+QQFCgACACwFABUACgALAAACFZQvgAi92dyJcVJlLobUdi8x4bIhBQAh+QQFCgACACwBABEADAADAAACBYSPqcsFADs=') no-repeat;}
+.layui-laydialog-loading .layui-laydialog-loading2, .layui-laydialog-ico16{width:32px; height:32px; background:url('data:image/gif;base64,R0lGODlhIAAgALMAAP///7Ozs/v7+9bW1uHh4fLy8rq6uoGBgTQ0NAEBARsbG8TExJeXl/39/VRUVAAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQFBQAAACwAAAAAIAAgAAAE5xDISSlLrOrNp0pKNRCdFhxVolJLEJQUoSgOpSYT4RowNSsvyW1icA16k8MMMRkCBjskBTFDAZyuAEkqCfxIQ2hgQRFvAQEEIjNxVDW6XNE4YagRjuBCwe60smQUDnd4Rz1ZAQZnFAGDd0hihh12CEE9kjAEVlycXIg7BAsMB6SlnJ87paqbSKiKoqusnbMdmDC2tXQlkUhziYtyWTxIfy6BE8WJt5YEvpJivxNaGmLHT0VnOgGYf0dZXS7APdpB309RnHOG5gDqXGLDaC457D1zZ/V/nmOM82XiHQjYKhKP1oZmADdEAAAh+QQFBQAAACwAAAAAGAAXAAAEchDISasKNeuJFKoHs4mUYlJIkmjIV54Soypsa0wmLSnqoTEtBw52mG0AjhYpBxioEqRNy8V0qFzNw+GGwlJki4lBqx1IBgjMkRIghwjrzcDti2/Gh7D9qN774wQGAYOEfwCChIV/gYmDho+QkZKTR3p7EQAh+QQFBQAAACwBAAAAHQAOAAAEchDISWdANesNHHJZwE2DUSEo5SjKKB2HOKGYFLD1CB/DnEoIlkti2PlyuKGEATMBaAACSyGbEDYD4zN1YIEmh0SCQQgYehNmTNNaKsQJXmBuuEYPi9ECAU/UFnNzeUp9VBQEBoFOLmFxWHNoQw6RWEocEQAh+QQFBQAAACwHAAAAGQARAAAEaRDICdZZNOvNDsvfBhBDdpwZgohBgE3nQaki0AYEjEqOGmqDlkEnAzBUjhrA0CoBYhLVSkm4SaAAWkahCFAWTU0A4RxzFWJnzXFWJJWb9pTihRu5dvghl+/7NQmBggo/fYKHCX8AiAmEEQAh+QQFBQAAACwOAAAAEgAYAAAEZXCwAaq9ODAMDOUAI17McYDhWA3mCYpb1RooXBktmsbt944BU6zCQCBQiwPB4jAihiCK86irTB20qvWp7Xq/FYV4TNWNz4oqWoEIgL0HX/eQSLi69boCikTkE2VVDAp5d1p0CW4RACH5BAUFAAAALA4AAAASAB4AAASAkBgCqr3YBIMXvkEIMsxXhcFFpiZqBaTXisBClibgAnd+ijYGq2I4HAamwXBgNHJ8BEbzgPNNjz7LwpnFDLvgLGJMdnw/5DRCrHaE3xbKm6FQwOt1xDnpwCvcJgcJMgEIeCYOCQlrF4YmBIoJVV2CCXZvCooHbwGRcAiKcmFUJhEAIfkEBQUAAAAsDwABABEAHwAABHsQyAkGoRivELInnOFlBjeM1BCiFBdcbMUtKQdTN0CUJru5NJQrYMh5VIFTTKJcOj2HqJQRhEqvqGuU+uw6AwgEwxkOO55lxIihoDjKY8pBoThPxmpAYi+hKzoeewkTdHkZghMIdCOIhIuHfBMOjxiNLR4KCW1ODAlxSxEAIfkEBQUAAAAsCAAOABgAEgAABGwQyEkrCDgbYvvMoOF5ILaNaIoGKroch9hacD3MFMHUBzMHiBtgwJMBFolDB4GoGGBCACKRcAAUWAmzOWJQExysQsJgWj0KqvKalTiYPhp1LBFTtp10Is6mT5gdVFx1bRN8FTsVCAqDOB9+KhEAIfkEBQUAAAAsAgASAB0ADgAABHgQyEmrBePS4bQdQZBdR5IcHmWEgUFQgWKaKbWwwSIhc4LonsXhBSCsQoOSScGQDJiWwOHQnAxWBIYJNXEoFCiEWDI9jCzESey7GwMM5doEwW4jJoypQQ743u1WcTV0CgFzbhJ5XClfHYd/EwZnHoYVDgiOfHKQNREAIfkEBQUAAAAsAAAPABkAEQAABGeQqUQruDjrW3vaYCZ5X2ie6EkcKaooTAsi7ytnTq046BBsNcTvItz4AotMwKZBIC6H6CVAJaCcT0CUBTgaTg5nTCu9GKiDEMPJg5YBBOpwlnVzLwtqyKnZagZWahoMB2M3GgsHSRsRACH5BAUFAAAALAEACAARABgAAARcMKR0gL34npkUyyCAcAmyhBijkGi2UW02VHFt33iu7yiDIDaD4/erEYGDlu/nuBAOJ9Dvc2EcDgFAYIuaXS3bbOh6MIC5IAP5Eh5fk2exC4tpgwZyiyFgvhEMBBEAIfkEBQUAAAAsAAACAA4AHQAABHMQyAnYoViSlFDGXBJ808Ep5KRwV8qEg+pRCOeoioKMwJK0Ekcu54h9AoghKgXIMZgAApQZcCCu2Ax2O6NUud2pmJcyHA4L0uDM/ljYDCnGfGakJQE5YH0wUBYBAUYfBIFkHwaBgxkDgX5lgXpHAXcpBIsRADs=') no-repeat;}
+.layui-laydialog-tips{background: none; box-shadow:none; border:none;}
+.layui-laydialog-tips .layui-laydialog-content{position: relative; line-height: 22px; min-width: 12px; padding: 8px 15px; font-size: 12px; _float:left; border-radius: 2px; box-shadow: 1px 1px 3px rgba(0,0,0,.2); background-color: #000; color: #fff;}
+.layui-laydialog-tips .layui-laydialog-close{right:-2px; top:-1px;}
+.layui-laydialog-tips i.layui-laydialog-TipsG{ position:absolute;  width:0; height:0; border-width:8px; border-color:transparent; border-style:dashed; *overflow:hidden;}
+.layui-laydialog-tips i.layui-laydialog-TipsT, .layui-laydialog-tips i.layui-laydialog-TipsB{left:5px; border-right-style:solid; border-right-color: #000;}
+.layui-laydialog-tips i.layui-laydialog-TipsT{bottom:-8px;}
+.layui-laydialog-tips i.layui-laydialog-TipsB{top:-8px;}
+.layui-laydialog-tips i.layui-laydialog-TipsR, .layui-laydialog-tips i.layui-laydialog-TipsL{top: 5px; border-bottom-style:solid; border-bottom-color: #000;}
+.layui-laydialog-tips i.layui-laydialog-TipsR{left:-8px;}
+.layui-laydialog-tips i.layui-laydialog-TipsL{right:-8px;}
+
+/* skin */
+.layui-laydialog-lan[type="dialog"]{min-width:280px;}
+.layui-laydialog-lan .layui-laydialog-title{background:#4476A7; color:#fff; border: none;}
+.layui-laydialog-lan .layui-laydialog-btn{padding: 5px 10px 10px; text-align: right; border-top:1px solid #E9E7E7}
+.layui-laydialog-lan .layui-laydialog-btn a{background: #fff; border-color: #E9E7E7; color: #333;}
+.layui-laydialog-lan .layui-laydialog-btn .layui-laydialog-btn1{background:#C9C5C5;}
+.layui-laydialog-molv .layui-laydialog-title{background: #009f95; color:#fff; border: none;}
+.layui-laydialog-molv .layui-laydialog-btn a{background: #009f95; border-color: #009f95;}
+.layui-laydialog-molv .layui-laydialog-btn .layui-laydialog-btn1{background:#92B8B1;}
+
+
+/**
+ 
+ @Name: laydialog拓展样式
+ 
+ */
+
+.layui-laydialog-iconext{background:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAALQAAABkCAYAAAAv8xodAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAK6wAACusBgosNWgAAABZ0RVh0Q3JlYXRpb24gVGltZQAwNS8xMS8xNNdPc0oAAAAcdEVYdFNvZnR3YXJlAEFkb2JlIEZpcmV3b3JrcyBDUzbovLKMAAAWb0lEQVR4nO2de2wU172Av5l92t4Hti/YQHmVmFcSE7+WR0h0uRRVVC2pKldpCFJQEJAiFwg4diikgLEghEhpVLVQNblBSFEUVYoi+hc0FQoE87B52JQAiQnBJDY2wfix633O7P1jdwbbxe9d7yx3PgnJc87iM2M+js+cx+8nhMNhdHQeFcRE34COTizRhdZ5pNCF1nmk0IXWeaQwPqxQEIRYtpEKOABL9NoLtAKhWDbSDRF4EsgAbEBHtL3LAIN9CV6+fHlSvS0fOXLkof9oj8pzDJZ499A2YCxgWbJkiSUnJ8cApADZgCEO7ZmAImAyYFuxYsV4Iv+ZpgIFcWhPR2PEU2gbkAlQU1Mz67PPPvvvq1ev/s/f/va3LCIyp8e4PROQD4wrLi7Oam9vP/Dhhx/+9f79+3/Kz8+3AxPi0KaOxoiX0KrM169ff6KgoGAKgMFgEF944YWZ0c9Y+vrLw8BEpAceV1xcnHX48OE3HQ7HRIAxY8ZM2bdv39Lo5zJi2KaOBomH0D1knjFjxsTulX6/Pxj9Uo5Re4rMY1esWDH+8OHDb6akpGR2/4Db7fZEv4zXuF1HI8Ra6H5lDgQC0ttvv/1l9NIfg/Z6yPzee+/t6S1zY2PjpdWrV/8retkagzZ1NEwshR5Q5j179pzfu3dvOxBg5HINKHNTU1Ody+WqbG1tDQENQOcI29TROA+dthsGGYAd+pd5165d94nIfHeE7Q1K5qKioorvv/8+ANwGakfYZlwIh8MEg0F1OtFoNGIwxGMCKL4Eg0G6urqQJAlRFElNTcVsNo/6fcSih84A7BaLRRiCzCMZy5qAQoYm86URtBc3FJnNZjMzZswgKyuLQCCAJEmJvrUhEQwGcbvdZGdn88ILL5CTk0NnZ2dCnmOkPbQqc11d3eMPk3n37t01lZWVbcRW5v966aWXJh44cKAyWWWWZZlgMIjD4aCoqIj09HRkWeb48eO0tbUlTS+tyDxz5kz2799Peno6LS0trFq1Cr/fT2pq6qjez0iE1mUeJorM6enpFBUVkZaWRigUIhgMEgwGB/4GGiEQCOB2u5kzZw779u0jPT0yze/xeJAkKdYrzoNiuELrMg8TSZIIBoNkZWVRWFiI2WwmHA7j8/k4d+4cnZ2dCRl7DhWlZ37iiSd46623cDgcANy5c4c33ngDj8eD0+kc9fsajtC6zMMkGAwiSRKTJk0iLy9PHVZ4PB7Onj1LR0cHZrMZUdT2njGlZ87Ly2P//v1YrVYAmpqaKC0tpaGhAbvdnpBh01CFHm2ZzURmMx4ZmadNm0Zubi6iKCIIAm1tbZw5cwav14vJZNK8zH6/H7fbTWFhIXv27Okh85YtW7h9+zY2mw2TyZSQ+xuK0KrMly9ffiInJ2dC98pEyNzY2HjJ5XJVJoPMoVCI2bNnM2vWLCCyo/Hu3bucPXuWUCiE2WxOyJhzKCgyL1y4kMrKSiyWyO6Fb7/9li1bttDS0pJQmWHwQidU5oMHD+6xWq09NhYlg8zKtJwsy+Tm5vLYY48RDocRRZGmpiaqq6uRZRmTyaR5mX0+Hx6Ph2eeeYbdu3er0jY0NFBaWqoJmWFwQg8kc2j37t3ndZl70l3mvLw8pk6dSjgcxmAw8O2333LhwgVEUUyKF0C/36/KXFFRoUpbX19PaWkp9+7dw263YzTGap1u+Ax0B7rMwyAcDhMIBDAajbhcLsaPH48sy4iiyNdff01tbS1GozHhvdlgUHrmpUuXsmPHDvU3ybVr1ygtLaW9vV0zMkP/QusyDwNljtlsNlNUVMS4ceNUma9evcrVq1eTSma3282yZcvYvn27KvP169cpKyujo6NDUzJD30Kn8UDmJ3NycsZ3r4yDzABzeURkTklJweVykZGRQTgcRhAEamtr+eabbzCZTJoSoC+UnvnnP/85W7duVWWuq6ujtLQUn8+XsKm5/ujrJ2sDuHDhwpxRktkJZC9evDg92WV2OBy4XC5sNhuyLCPLMpcuXaKhoQGj0ZgUMnu9XtxuN7/61a947bXX1PLa2lrKy8s1KzP0LbR18uTJ4uzZs3vMM0uSJMdBZohuOy0rK1vUW+bm5uZ/a11mgFAohM1mY8GCBaSmpiJJEj6fj9raWpqbmzGZTJoUoDfBYBCPx/MfMl+8eJGtW7fS1dWlWZmhn912zc3N4WCvjQUGg0H85S9/mR29NEf/xAIvQGNj43/skU5PT//xypUrp0YvHUQO2WoOWZZxOp04HA4kScJgMNDS0sKdO3cQRVGzAvQmGAwyZswY1q5dq5bduHGD9evX4/F4cDgcmn6WvoTu8vv94YMHD16WJKnHUamCgoIpNTU1s6KXY4mEKRgprQAlJSWn6+vrP+9eYTabUysqKirKy8tnEBmaFKFBqUVR5M6dO9y+fRuj0YgkSUyePJk5c+aoG4+SAYPBgMfj4cqVK2rZhAkT+NnPfoYsywQCgQTe3cD0JXQrENq4ceMPf/7zny+OgtR+4JbX65Vzc3PfSUapTSYTsixz7tw5Ghoa1F5s5syZ5Ofnq2NsraM8x86dO6mpqQEgJSWF7du3s3z5ctxuN16vN8F32Td9CS0BzYyu1HUksdSCIKiLJDU1Ndy4cQODwUA4HGbatGkUFhYC9DidokVEUcThcODz+Xj99deprq4GIs9XXl5OcXExbrebrq6uBN/pw+lvJ0wIXeoho2wwunTpEteuXUMURWRZZtKkSbhcLkRR1LzUBoMBu91OIBDg97//PefOnVPrNm/ezPPPP4/H49Gk1ANt7dKlHgbKXPOVK1e4fPkygiAgyzLZ2dksXLgQq9WaFFI7HA78fj9btmzhxIkTat2mTZt48cUXNSn1YPYq6lIPA5PJhMlk4uuvv+bChQuqvJmZmcyfP5/U1FQCgQCyHKvwJLFHGX4IgsCOHTt6SF1SUsKqVavweDx4PJ5+vsvoMtjNt7rUw0BZ4r516xbV1dWEQiHC4TBOp5OFCxfidDrVDUxaRZFalmXeeOMNjh8/rtatW7eOl19+ma6uLs1IPZTd5LrUw8BgMGAymWhsbOTs2bP4/ZH4OmlpaSxcuJCxY8eqm/+1iiiK2O12ALZv386xY8fUujVr1rBu3To8Hg9utztRt6gy1OMRutTDwGAwYDabaWlpoaqqSh13WiwWXC4X2dnZSSO10Whk9+7dHD16VK1btWoVJSUlmuiph3PeR5d6GCh7n9vb2zl16hSdnZ0IgoDRaKSoqIgpU6aoJ1u0ijL8EEWRHTt2cOTIEbVu5cqVbNiwIeE99XAPsOlSDwNRFDGZTHg8Hqqqqrh37x6CIGAwGMjPz2f69OlIkqRpqQVBwG63Y7Va2bt3L59++qlat2LFCkpLS+nq6kqY1CM5kalLPQyUntrn81FVVUVzc7N6MDY3N1cNOKNllOGHxWJh3759fPLJJ2pdcXExr776Kj6fLyHL5CM9YqxLPQwEQVCXmM+cOUNDQwMQ2bap5d65O0pPrUj90UcfqXW/+MUvyMjISMizxOLMvC71MFCkFgSB6upqTp06xcmTJ+no6EiKPdPwQOqUlBTeffddDh48yHfffcfHH39MW1tbQk7lxCoIxHCkHmkE/6FKnTvC9uKCsgBz7949fD5fUgSa6Y4gCDgcDiwWC4cOHWLdunUcOHAAs9mc1ELDIKU+fvz4tOilPQZtDkrq4uLiLGAcGk1JocxVJ0Ogmb5wOp2MGzcOg8FAdnY2NpstIfcR65/egFIXFRVNjn4ZqxwrA0q9fv36Z6KXmhRaJ3bEozvoV+qOjg5l5j2Wm4P7lbq+vv776JeJX8rSiSvxevtQpM7auHHjD62trTWrV6+e5vP5gqWlpV9HPxOLHCvdqQPwer1TcnNz3zly5MjN3Nxc16VLl86sXbv2dLQ9PcfKI47wsC2MMQxLZSTyAtj77KEXaIlVI73IBaY8pPwk0KZnktU2I80kG+/5oRDQRORwq5VIKjcf8f3VX0fkdHg2kTFza/Qe2uLYpo5GiHcPrTm0vKleZ+T010ObiaQStkavfUR6uViPfbujJJ13EOnFlaTzo74W/Kj8qn5UnmOw9DXLYQbGA9a8vDxTXl6eiYjY2TwQPNYUEEky74gmnbcRSUJfRCSKv47OgPQl9BiAo0ePTjl//vzi8+fPL/7nP/+pLIhkEXup04EJ+fn59vv37//pww8//Gt7e/uBbgsi+ehS6wyCvoROcTqdwpIlS2YIUX7yk5/M+Pzzz6dH62MtdQbAvn37lo4ZM2YKgMPhmHj48OE3dal1hkKfCys+nw9Jknpsl3r22Wcfi5PUIeiRZB6AlJSUzF5SF6BLrdMP/YYC++CDD/4d7jUt8Oyzzz526tSpx6KXsZK6FWD16tX/amxs7BGMUZE6Oq4eiy61Tj/0FwpMeuWVV+6+//77tb2lXrhw4fQYS90JNLS2toZcLldlU1NTXffKlJSUzPfee2+PLrXOQAwUCkxas2ZN8/vvv1/be5NRHKSuBW5///33gaKioopklFqSJPx+P36/n0AgkLRz3oFAgLa2NlpbW2lvb0+KmHwK/W1OCtJN6g8++KBuEFKPdBP9JZJUakmSCAQCZGVlkZOTg8lk0nx0pIchSRJut5ucnBx+85vfkJWVhdvtThqpB9ptFwTuMHipxzH6UheiAaklSSIzM5Onn36auXPnsmjRIjU+nNbPCHbH7/fjdDrZu3cvJSUlHDhwgJycnKSRerChwAaUuqqqKid6OWpSv/TSSxOB/0IjUgeDQfx+P6FQCKfTyfz580lPT9d8dKTuCIKAJElq7JDMzEz279/PrFmz6OzsTNr40L0ZUOoFCxb8eLSlPnDgQKVWpDYajbjdbk6fPo3f7yccDpOamsqCBQsYN24cgUBA04FkFMxmM263mz/84Q+0tEQ2RGZmZvL222/z+OOPa76nHmooMF3qPlBibrS2tlJVVaVGEDKbzcybN48f/ehHBINBTcsAD0Lp3rx5k82bN9Pc3AxEjli9++67PPXUU5ruqYcTCiyhUj9snlprUnd0dPDFF1/Q0dGhBpIpKChg6tSpSJKkealNJhM2m41bt26xefNm7ty5A4DVauXNN98kPz8ft9utxunTEsMNBZYwqV0uV+UgpU5IzmFFap/PxxdffMEPP/yAIAgIgsBTTz3FzJkzkyLniiJ1Q0MDJSUl3Lp1CwCbzcZbb73FvHnz8Hg8mpN6JKHAtC51AQmSWom5EQwGOX36tJoJC2DOnDk8+eSThEIhzc9VK1I3Nzfz2muvcfv2bQA1DNjTTz+N2+3G5/Ml+E4fMNJQYANKfe7cuVGV+uDBg3u0IrXZbEaWZU6fPq0mEgqHw+Tk5JCXl6cmEtK61Ha7naamJjZu3Mg333wDRN4NKioqWLRokaZ66liEAutX6qKiolGV2mq1pmtFaniQc6Wmpob6+no1PcW0adOYN28eoihqvqc2Go3Y7Xbu3r3Lpk2buH79OhAJB7x3716WLFmimZ46VqHAdKn7Qcki2z2RUDgcZuLEicybNw+z2az5BRhF6ra2NsrKyvjqq6+AyDvDrl27+OlPf4rH40m41LEMBTZUqUcaaGaoUs8dYXsjQomMdPXqVerq6hAEgXA4TFZWFvPnz1cTCSWD1Pfv3+d3v/sdly9fBiLDq+3bt7Ns2bKESx3rUGADSt0tFJgjBm32kPq777670L1SkXrx4sXpRI6POWPQ5rBRktffuHGDCxcuIEkSsiyTkZHBokWLcDgcmpdamaf2er2UlZVRVxdZGhBFkW3btiU8OWc8QoH1kLr3B+bNm6fEzIhVKDBV6vnz5+9pbm7+d/dKq9WaXlZWtih6mRmjNoeNkkiooaGB6upqvF4vsixjt9uZP38+NptN8yF1Fak9Hg/l5eXU1tYCkZ66rKyM5557Do/Hk5CpyXiEAnMABovFIixZsiS7d6XX61Veh2O1DpwSbZOVK1dOTU9P/3HvDzQ2NioRkzSR09dgMCCKIk1NTbS0tGAwGJAkCafTidPp1HQPraDkMXS73fz2t7/lxo0bQETqdevWqRm+RptYC50B2C0Wi3D16tXcadOm9RA6EAgEKysrlazosRhopRA5Fe4sLy+fUVFRUWE2m3vEnq6vr/+8pKTkdPRSE6HAlFwqc+bMYfLkyUiShNFo5Pbt2zQ1NSVNBFLlRXbZsmVMmDBBLf/yyy/p6upS852PJrGMnDSgzK+//nrNO++800Ektsf9EbY3KJlzc3Pf8Xq9MnCL+MYUGRTKGDk/P5+pU6ciyzIGg4GGhgY1QWci4ioPFa/Xi8fj4bnnnqOsrEwNTlRTU8POnTuRZTkhzxEroYcq890Rtjccmf9jPD+ahMNhdWxcWFjIpEmTVJlv3LhBXV2dmn9F6yjp237961+zefNmtby6upqtW7cSCATUbFmjTSyEzgRsQ5R5JOPnpJQ5GAxiMBgoLCxk/PjxyLKMKIpcu3aNK1euqC+LWkeR+fnnn2fTpk1q+blz59i2bRuBQAC73Z6Q4QaMXOhMwOZ0OoWLFy/qMj8ERWar1UpRUREZGRnIsowgCFy+fJmvvvoq6WR+8cUXKSkpUctPnDjBtm3b1PQUiXwHGInQuswDoOzVSEtLw+VyMWbMGMLhMOFwmIsXL3Lr1i1MJlNSJAnyeDx0dXWxatUq1q1bp5afOHGCHTt2aEJmGL7QuswDoMjsdDpxuVykpaWp4+jz58/T2NioLolrHUXml19+mTVr1qjlx48fZ+fOnQCakBmGJ7Qu8wAo2WDHjh1LYWEhFktkDcnv91NTU0NLS0vSyOx2u+nq6uKVV15h1apVavmxY8fYtWuXuhyuBZlh6ELrMg+AciJl/PjxFBQUqGPjrq4uzp49S1tbW9KkblN65pKSElauXKmWHz16lMrKSs3JDEMTWpd5AEKhEKFQiClTpjB37lxEUUQQBDo6Ojhz5gwejydpZFZ65g0bNrBixQq1/MiRI+zZsweLxYLD4dBccPzBCq3LPAChUAhJkpg+fTq5uQ9yfN67d0/ds5EseQgVmUtLSykuLlbLP/30U/bt24fVasVms2lOZhic0LrMg0CWZdLT01WZlb0a1dXVSJKE2WzWpAC9CQQC+P1+Xn311R4yf/LJJ+zfvx+LxYLdbtfsswwktC7zEAiFQni9XlJSUmhoaOD8+fM9cnonA6FQiIyMDJYvX66WffTRR/zxj38kJSVF0zJD/0LrMg8Bo9FIZ2cnJ0+eJC0tTd1FlwwLJt0xmUy0tbXx8ccfs3TpUv7xj39w6NChpJAZ+hY6jdGVGSL5BZNSZugZvsDn8yXNtFxvlJM1f/nLX/j73/9Oa2ur+gKYDPQltA2gqqpqzijJnAGMKy4uzkpGmRVEUUyKl76BsNlsavL5sWPHJvhuhkZfP32r0+kUZs+ePbF7YZxkhmiOlfXr1z+TrDLraIO+hA62t7eHOzo6upSCOMoM0cyy3ZLME73WZdYZEn0J7QcoLy+/ePPmzeabN2/e2bBhw9k4yQyRkyT+tWvXnj527Nj/trS0fPnZZ58d0mXWGSp9pUYWiIQa6J1mwgf8QGxlVhgDPPOQ8pjKrCev1zbxSl4fJpKOwsGD09l+oGMkjQ1AG3CSSAZbJen8HUZ+VEvn/xEP7aF1dJKV5J9j0tHphi60ziOFLrTOI4UutM4jhS60ziPF/wHgvbfirVNMHAAAAABJRU5ErkJggg==') no-repeat;}
+
+/* prompt模式 */
+.layui-laydialog-prompt .layui-laydialog-input{display: block; width: 230px; height: 36px; margin: 0 auto; line-height: 30px; padding-left: 10px; border: 1px solid #e6e6e6; color: #333;}
+.layui-laydialog-prompt textarea.layui-laydialog-input{width: 300px; height: 100px; line-height: 20px; padding: 6px 10px;}
+.layui-laydialog-prompt .layui-laydialog-content{padding: 20px;}
+.layui-laydialog-prompt .layui-laydialog-btn{padding-top: 0;}
+
+/* tab模式 */
+.layui-laydialog-tab{box-shadow:1px 1px 50px rgba(0,0,0,.4);}
+.layui-laydialog-tab .layui-laydialog-title{padding-left:0; overflow: visible;}
+.layui-laydialog-tab .layui-laydialog-title span{position:relative; float:left; min-width:80px; max-width:260px; padding:0 20px; text-align:center; cursor:default; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; cursor: pointer;}
+.layui-laydialog-tab .layui-laydialog-title span.layui-this{height: 43px; border-left: 1px solid #eee; border-right: 1px solid #eee; background-color: #fff; z-index: 10;}
+.layui-laydialog-tab .layui-laydialog-title span:first-child{border-left:none;}
+.layui-laydialog-tabmain{line-height:24px; clear:both;}
+.layui-laydialog-tabmain .layui-laydialog-tabli{display:none;}
+.layui-laydialog-tabmain .layui-laydialog-tabli.layui-this{display: block;}
+
+/* photo模式 */
+.layui-laydialog-photos{-webkit-animation-duration: .8s; animation-duration: .8s;}
+.layui-laydialog-photos .layui-laydialog-content{overflow:hidden; text-align: center;}
+.layui-laydialog-photos .layui-laydialog-phimg img{position: relative; width:100%; display: inline-block; *display:inline; *zoom:1; vertical-align:top;}
+.layui-laydialog-imguide,.layui-laydialog-imgbar{display:none;}
+.layui-laydialog-imgprev, .layui-laydialog-imgnext{position:absolute; top:50%; width:27px; _width:44px; height:44px;  margin-top:-22px; outline:none;blr:expression(this.onFocus=this.blur());}
+.layui-laydialog-imgprev{left:10px; background-position:-5px -5px; _background-position:-70px -5px;}
+.layui-laydialog-imgprev:hover{background-position:-33px -5px; _background-position:-120px -5px;}
+.layui-laydialog-imgnext{right:10px; _right:8px; background-position:-5px -50px; _background-position:-70px -50px;}
+.layui-laydialog-imgnext:hover{background-position:-33px -50px; _background-position:-120px -50px;}
+.layui-laydialog-imgbar{position:absolute; left:0; bottom:0; width:100%; height:32px; line-height:32px; background-color:rgba(0,0,0,.8); background-color:#000\9; filter:Alpha(opacity=80); color:#fff; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; font-size:0;}
+.layui-laydialog-imgtit{/*position:absolute; left:20px;*/}
+.layui-laydialog-imgtit *{display:inline-block; *display:inline; *zoom:1; vertical-align:top; font-size:12px;}
+.layui-laydialog-imgtit a{max-width:65%;  text-overflow: ellipsis; overflow: hidden; white-space: nowrap; color:#fff;}
+.layui-laydialog-imgtit a:hover{color:#fff; text-decoration:underline;}
+.layui-laydialog-imgtit em{padding-left:10px; font-style: normal;}
+
+/* 关闭动画 */
+@-webkit-keyframes laydialog-bounceOut {
+  100% {opacity: 0; -webkit-transform: scale(.7); transform: scale(.7)}
+  30% {-webkit-transform: scale(1.05); transform: scale(1.05)}
+  0% {-webkit-transform: scale(1); transform: scale(1);}
+}
+@keyframes laydialog-bounceOut {
+  100% {opacity: 0; -webkit-transform: scale(.7); -ms-transform: scale(.7); transform: scale(.7);}
+  30% {-webkit-transform: scale(1.05); -ms-transform: scale(1.05); transform: scale(1.05);}
+  0% {-webkit-transform: scale(1); -ms-transform: scale(1);transform: scale(1);}
+}
+.laydialog-anim-close{-webkit-animation-name: laydialog-bounceOut; animation-name: laydialog-bounceOut; -webkit-animation-fill-mode: both; animation-fill-mode: both; -webkit-animation-duration:.2s; animation-duration:.2s;}
+
+@media screen and (max-width: 1100px) {
+  .layui-laydialog-iframe{overflow-y: auto; -webkit-overflow-scrolling: touch;}
+}
+
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/css/modules/laydialog/default/loading-0.gif b/pluss-manage-page/src/main/resources/static/resources/css/modules/laydialog/default/loading-0.gif
new file mode 100644
index 0000000..6f3c953
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/css/modules/laydialog/default/loading-0.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/css/modules/laydialog/default/loading-1.gif b/pluss-manage-page/src/main/resources/static/resources/css/modules/laydialog/default/loading-1.gif
new file mode 100644
index 0000000..db3a483
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/css/modules/laydialog/default/loading-1.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/css/modules/laydialog/default/loading-2.gif b/pluss-manage-page/src/main/resources/static/resources/css/modules/laydialog/default/loading-2.gif
new file mode 100644
index 0000000..5bb90fd
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/css/modules/laydialog/default/loading-2.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/css/modules/layer/default/icon-ext.png b/pluss-manage-page/src/main/resources/static/resources/css/modules/layer/default/icon-ext.png
new file mode 100644
index 0000000..bbbb669
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/css/modules/layer/default/icon-ext.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/css/modules/layer/default/icon.png b/pluss-manage-page/src/main/resources/static/resources/css/modules/layer/default/icon.png
new file mode 100644
index 0000000..3e17da8
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/css/modules/layer/default/icon.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/css/modules/layer/default/layer.css b/pluss-manage-page/src/main/resources/static/resources/css/modules/layer/default/layer.css
new file mode 100644
index 0000000..032ae12
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/css/modules/layer/default/layer.css
@@ -0,0 +1,2 @@
+/** layui-v2.5.6 MIT License By https://www.layui.com */
+ .layui-layer-imgbar,.layui-layer-imgtit a,.layui-layer-tab .layui-layer-title span,.layui-layer-title{text-overflow:ellipsis;white-space:nowrap}html #layuicss-layer{display:none;position:absolute;width:1989px}.layui-layer,.layui-layer-shade{position:fixed;_position:absolute;pointer-events:auto}.layui-layer-shade{top:0;left:0;width:100%;height:100%;_height:expression(document.body.offsetHeight+"px")}.layui-layer{-webkit-overflow-scrolling:touch;top:150px;left:0;margin:0;padding:0;background-color:#fff;-webkit-background-clip:content;border-radius:2px;box-shadow:1px 1px 50px rgba(0,0,0,.3)}.layui-layer-close{position:absolute}.layui-layer-content{position:relative}.layui-layer-border{border:1px solid #B2B2B2;border:1px solid rgba(0,0,0,.1);box-shadow:1px 1px 5px rgba(0,0,0,.2)}.layui-layer-load{background:url(loading-1.gif) center center no-repeat #eee}.layui-layer-ico{background:url(icon.png) no-repeat}.layui-layer-btn a,.layui-layer-dialog .layui-layer-ico,.layui-layer-setwin a{display:inline-block;*display:inline;*zoom:1;vertical-align:top}.layui-layer-move{display:none;position:fixed;*position:absolute;left:0;top:0;width:100%;height:100%;cursor:move;opacity:0;filter:alpha(opacity=0);background-color:#fff;z-index:2147483647}.layui-layer-resize{position:absolute;width:15px;height:15px;right:0;bottom:0;cursor:se-resize}.layer-anim{-webkit-animation-fill-mode:both;animation-fill-mode:both;-webkit-animation-duration:.3s;animation-duration:.3s}@-webkit-keyframes layer-bounceIn{0%{opacity:0;-webkit-transform:scale(.5);transform:scale(.5)}100%{opacity:1;-webkit-transform:scale(1);transform:scale(1)}}@keyframes layer-bounceIn{0%{opacity:0;-webkit-transform:scale(.5);-ms-transform:scale(.5);transform:scale(.5)}100%{opacity:1;-webkit-transform:scale(1);-ms-transform:scale(1);transform:scale(1)}}.layer-anim-00{-webkit-animation-name:layer-bounceIn;animation-name:layer-bounceIn}@-webkit-keyframes layer-zoomInDown{0%{opacity:0;-webkit-transform:scale(.1) translateY(-2000px);transform:scale(.1) translateY(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateY(60px);transform:scale(.475) translateY(60px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}@keyframes layer-zoomInDown{0%{opacity:0;-webkit-transform:scale(.1) translateY(-2000px);-ms-transform:scale(.1) translateY(-2000px);transform:scale(.1) translateY(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateY(60px);-ms-transform:scale(.475) translateY(60px);transform:scale(.475) translateY(60px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}.layer-anim-01{-webkit-animation-name:layer-zoomInDown;animation-name:layer-zoomInDown}@-webkit-keyframes layer-fadeInUpBig{0%{opacity:0;-webkit-transform:translateY(2000px);transform:translateY(2000px)}100%{opacity:1;-webkit-transform:translateY(0);transform:translateY(0)}}@keyframes layer-fadeInUpBig{0%{opacity:0;-webkit-transform:translateY(2000px);-ms-transform:translateY(2000px);transform:translateY(2000px)}100%{opacity:1;-webkit-transform:translateY(0);-ms-transform:translateY(0);transform:translateY(0)}}.layer-anim-02{-webkit-animation-name:layer-fadeInUpBig;animation-name:layer-fadeInUpBig}@-webkit-keyframes layer-zoomInLeft{0%{opacity:0;-webkit-transform:scale(.1) translateX(-2000px);transform:scale(.1) translateX(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateX(48px);transform:scale(.475) translateX(48px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}@keyframes layer-zoomInLeft{0%{opacity:0;-webkit-transform:scale(.1) translateX(-2000px);-ms-transform:scale(.1) translateX(-2000px);transform:scale(.1) translateX(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateX(48px);-ms-transform:scale(.475) translateX(48px);transform:scale(.475) translateX(48px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}.layer-anim-03{-webkit-animation-name:layer-zoomInLeft;animation-name:layer-zoomInLeft}@-webkit-keyframes layer-rollIn{0%{opacity:0;-webkit-transform:translateX(-100%) rotate(-120deg);transform:translateX(-100%) rotate(-120deg)}100%{opacity:1;-webkit-transform:translateX(0) rotate(0);transform:translateX(0) rotate(0)}}@keyframes layer-rollIn{0%{opacity:0;-webkit-transform:translateX(-100%) rotate(-120deg);-ms-transform:translateX(-100%) rotate(-120deg);transform:translateX(-100%) rotate(-120deg)}100%{opacity:1;-webkit-transform:translateX(0) rotate(0);-ms-transform:translateX(0) rotate(0);transform:translateX(0) rotate(0)}}.layer-anim-04{-webkit-animation-name:layer-rollIn;animation-name:layer-rollIn}@keyframes layer-fadeIn{0%{opacity:0}100%{opacity:1}}.layer-anim-05{-webkit-animation-name:layer-fadeIn;animation-name:layer-fadeIn}@-webkit-keyframes layer-shake{0%,100%{-webkit-transform:translateX(0);transform:translateX(0)}10%,30%,50%,70%,90%{-webkit-transform:translateX(-10px);transform:translateX(-10px)}20%,40%,60%,80%{-webkit-transform:translateX(10px);transform:translateX(10px)}}@keyframes layer-shake{0%,100%{-webkit-transform:translateX(0);-ms-transform:translateX(0);transform:translateX(0)}10%,30%,50%,70%,90%{-webkit-transform:translateX(-10px);-ms-transform:translateX(-10px);transform:translateX(-10px)}20%,40%,60%,80%{-webkit-transform:translateX(10px);-ms-transform:translateX(10px);transform:translateX(10px)}}.layer-anim-06{-webkit-animation-name:layer-shake;animation-name:layer-shake}@-webkit-keyframes fadeIn{0%{opacity:0}100%{opacity:1}}.layui-layer-title{padding:0 80px 0 20px;height:42px;line-height:42px;border-bottom:1px solid #eee;font-size:14px;color:#333;overflow:hidden;background-color:#F8F8F8;border-radius:2px 2px 0 0}.layui-layer-setwin{position:absolute;right:15px;*right:0;top:15px;font-size:0;line-height:initial}.layui-layer-setwin a{position:relative;width:16px;height:16px;margin-left:10px;font-size:12px;_overflow:hidden}.layui-layer-setwin .layui-layer-min cite{position:absolute;width:14px;height:2px;left:0;top:50%;margin-top:-1px;background-color:#2E2D3C;cursor:pointer;_overflow:hidden}.layui-layer-setwin .layui-layer-min:hover cite{background-color:#2D93CA}.layui-layer-setwin .layui-layer-max{background-position:-32px -40px}.layui-layer-setwin .layui-layer-max:hover{background-position:-16px -40px}.layui-layer-setwin .layui-layer-maxmin{background-position:-65px -40px}.layui-layer-setwin .layui-layer-maxmin:hover{background-position:-49px -40px}.layui-layer-setwin .layui-layer-close1{background-position:1px -40px;cursor:pointer}.layui-layer-setwin .layui-layer-close1:hover{opacity:.7}.layui-layer-setwin .layui-layer-close2{position:absolute;right:-28px;top:-28px;width:30px;height:30px;margin-left:0;background-position:-149px -31px;*right:-18px;_display:none}.layui-layer-setwin .layui-layer-close2:hover{background-position:-180px -31px}.layui-layer-btn{text-align:right;padding:0 15px 12px;pointer-events:auto;user-select:none;-webkit-user-select:none}.layui-layer-btn a{height:28px;line-height:28px;margin:5px 5px 0;padding:0 15px;border:1px solid #dedede;background-color:#fff;color:#333;border-radius:2px;font-weight:400;cursor:pointer;text-decoration:none}.layui-layer-btn a:hover{opacity:.9;text-decoration:none}.layui-layer-btn a:active{opacity:.8}.layui-layer-btn .layui-layer-btn0{border-color:#1E9FFF;background-color:#1E9FFF;color:#fff}.layui-layer-btn-l{text-align:left}.layui-layer-btn-c{text-align:center}.layui-layer-dialog{min-width:260px}.layui-layer-dialog .layui-layer-content{position:relative;padding:20px;line-height:24px;word-break:break-all;overflow:hidden;font-size:14px;overflow-x:hidden;overflow-y:auto}.layui-layer-dialog .layui-layer-content .layui-layer-ico{position:absolute;top:16px;left:15px;_left:-40px;width:30px;height:30px}.layui-layer-ico1{background-position:-30px 0}.layui-layer-ico2{background-position:-60px 0}.layui-layer-ico3{background-position:-90px 0}.layui-layer-ico4{background-position:-120px 0}.layui-layer-ico5{background-position:-150px 0}.layui-layer-ico6{background-position:-180px 0}.layui-layer-rim{border:6px solid #8D8D8D;border:6px solid rgba(0,0,0,.3);border-radius:5px;box-shadow:none}.layui-layer-msg{min-width:180px;border:1px solid #D3D4D3;box-shadow:none}.layui-layer-hui{min-width:100px;background-color:#000;filter:alpha(opacity=60);background-color:rgba(0,0,0,.6);color:#fff;border:none}.layui-layer-hui .layui-layer-content{padding:12px 25px;text-align:center}.layui-layer-dialog .layui-layer-padding{padding:20px 20px 20px 55px;text-align:left}.layui-layer-page .layui-layer-content{position:relative;overflow:auto}.layui-layer-iframe .layui-layer-btn,.layui-layer-page .layui-layer-btn{padding-top:10px}.layui-layer-nobg{background:0 0}.layui-layer-iframe iframe{display:block;width:100%}.layui-layer-loading{border-radius:100%;background:0 0;box-shadow:none;border:none}.layui-layer-loading .layui-layer-content{width:60px;height:24px;background:url(loading-0.gif) no-repeat}.layui-layer-loading .layui-layer-loading1{width:37px;height:37px;background:url(loading-1.gif) no-repeat}.layui-layer-ico16,.layui-layer-loading .layui-layer-loading2{width:32px;height:32px;background:url(loading-2.gif) no-repeat}.layui-layer-tips{background:0 0;box-shadow:none;border:none}.layui-layer-tips .layui-layer-content{position:relative;line-height:22px;min-width:12px;padding:8px 15px;font-size:12px;_float:left;border-radius:2px;box-shadow:1px 1px 3px rgba(0,0,0,.2);background-color:#000;color:#fff}.layui-layer-tips .layui-layer-close{right:-2px;top:-1px}.layui-layer-tips i.layui-layer-TipsG{position:absolute;width:0;height:0;border-width:8px;border-color:transparent;border-style:dashed;*overflow:hidden}.layui-layer-tips i.layui-layer-TipsB,.layui-layer-tips i.layui-layer-TipsT{left:5px;border-right-style:solid;border-right-color:#000}.layui-layer-tips i.layui-layer-TipsT{bottom:-8px}.layui-layer-tips i.layui-layer-TipsB{top:-8px}.layui-layer-tips i.layui-layer-TipsL,.layui-layer-tips i.layui-layer-TipsR{top:5px;border-bottom-style:solid;border-bottom-color:#000}.layui-layer-tips i.layui-layer-TipsR{left:-8px}.layui-layer-tips i.layui-layer-TipsL{right:-8px}.layui-layer-lan[type=dialog]{min-width:280px}.layui-layer-lan .layui-layer-title{background:#4476A7;color:#fff;border:none}.layui-layer-lan .layui-layer-btn{padding:5px 10px 10px;text-align:right;border-top:1px solid #E9E7E7}.layui-layer-lan .layui-layer-btn a{background:#fff;border-color:#E9E7E7;color:#333}.layui-layer-lan .layui-layer-btn .layui-layer-btn1{background:#C9C5C5}.layui-layer-molv .layui-layer-title{background:#009f95;color:#fff;border:none}.layui-layer-molv .layui-layer-btn a{background:#009f95;border-color:#009f95}.layui-layer-molv .layui-layer-btn .layui-layer-btn1{background:#92B8B1}.layui-layer-iconext{background:url(icon-ext.png) no-repeat}.layui-layer-prompt .layui-layer-input{display:block;width:230px;height:36px;margin:0 auto;line-height:30px;padding-left:10px;border:1px solid #e6e6e6;color:#333}.layui-layer-prompt textarea.layui-layer-input{width:300px;height:100px;line-height:20px;padding:6px 10px}.layui-layer-prompt .layui-layer-content{padding:20px}.layui-layer-prompt .layui-layer-btn{padding-top:0}.layui-layer-tab{box-shadow:1px 1px 50px rgba(0,0,0,.4)}.layui-layer-tab .layui-layer-title{padding-left:0;overflow:visible}.layui-layer-tab .layui-layer-title span{position:relative;float:left;min-width:80px;max-width:260px;padding:0 20px;text-align:center;overflow:hidden;cursor:pointer}.layui-layer-tab .layui-layer-title span.layui-this{height:43px;border-left:1px solid #eee;border-right:1px solid #eee;background-color:#fff;z-index:10}.layui-layer-tab .layui-layer-title span:first-child{border-left:none}.layui-layer-tabmain{line-height:24px;clear:both}.layui-layer-tabmain .layui-layer-tabli{display:none}.layui-layer-tabmain .layui-layer-tabli.layui-this{display:block}.layui-layer-photos{-webkit-animation-duration:.8s;animation-duration:.8s}.layui-layer-photos .layui-layer-content{overflow:hidden;text-align:center}.layui-layer-photos .layui-layer-phimg img{position:relative;width:100%;display:inline-block;*display:inline;*zoom:1;vertical-align:top}.layui-layer-imgbar,.layui-layer-imguide{display:none}.layui-layer-imgnext,.layui-layer-imgprev{position:absolute;top:50%;width:27px;_width:44px;height:44px;margin-top:-22px;outline:0;blr:expression(this.onFocus=this.blur())}.layui-layer-imgprev{left:10px;background-position:-5px -5px;_background-position:-70px -5px}.layui-layer-imgprev:hover{background-position:-33px -5px;_background-position:-120px -5px}.layui-layer-imgnext{right:10px;_right:8px;background-position:-5px -50px;_background-position:-70px -50px}.layui-layer-imgnext:hover{background-position:-33px -50px;_background-position:-120px -50px}.layui-layer-imgbar{position:absolute;left:0;bottom:0;width:100%;height:32px;line-height:32px;background-color:rgba(0,0,0,.8);background-color:#000\9;filter:Alpha(opacity=80);color:#fff;overflow:hidden;font-size:0}.layui-layer-imgtit *{display:inline-block;*display:inline;*zoom:1;vertical-align:top;font-size:12px}.layui-layer-imgtit a{max-width:65%;overflow:hidden;color:#fff}.layui-layer-imgtit a:hover{color:#fff;text-decoration:underline}.layui-layer-imgtit em{padding-left:10px;font-style:normal}@-webkit-keyframes layer-bounceOut{100%{opacity:0;-webkit-transform:scale(.7);transform:scale(.7)}30%{-webkit-transform:scale(1.05);transform:scale(1.05)}0%{-webkit-transform:scale(1);transform:scale(1)}}@keyframes layer-bounceOut{100%{opacity:0;-webkit-transform:scale(.7);-ms-transform:scale(.7);transform:scale(.7)}30%{-webkit-transform:scale(1.05);-ms-transform:scale(1.05);transform:scale(1.05)}0%{-webkit-transform:scale(1);-ms-transform:scale(1);transform:scale(1)}}.layer-anim-close{-webkit-animation-name:layer-bounceOut;animation-name:layer-bounceOut;-webkit-animation-fill-mode:both;animation-fill-mode:both;-webkit-animation-duration:.2s;animation-duration:.2s}@media screen and (max-width:1100px){.layui-layer-iframe{overflow-y:auto;-webkit-overflow-scrolling:touch}}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/css/modules/layer/default/loading-0.gif b/pluss-manage-page/src/main/resources/static/resources/css/modules/layer/default/loading-0.gif
new file mode 100644
index 0000000..6f3c953
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/css/modules/layer/default/loading-0.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/css/modules/layer/default/loading-1.gif b/pluss-manage-page/src/main/resources/static/resources/css/modules/layer/default/loading-1.gif
new file mode 100644
index 0000000..db3a483
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/css/modules/layer/default/loading-1.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/css/modules/layer/default/loading-2.gif b/pluss-manage-page/src/main/resources/static/resources/css/modules/layer/default/loading-2.gif
new file mode 100644
index 0000000..5bb90fd
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/css/modules/layer/default/loading-2.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/css/modules/laypage/default/laypage.css b/pluss-manage-page/src/main/resources/static/resources/css/modules/laypage/default/laypage.css
new file mode 100644
index 0000000..6c49f65
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/css/modules/laypage/default/laypage.css
@@ -0,0 +1,118 @@
+/*!
+ laypage默认样式
+*/
+.laypage_main a, .laypage_main input,.laypage_main select, .laypage_main span {
+	height: 26px;
+	line-height: 26px
+}
+
+/* .laypage_main button, .laypage_main input, .laypageskin_default a {
+	border: 1px solid #ccc;
+	background-color: #fff
+} */
+
+
+.laypage_main {
+	font-size: 0;
+	clear: both;
+	color: #666
+}
+
+.laypage_main * {
+	display: inline-block;
+	vertical-align: top;
+	font-size: 12px
+}
+
+.laypage_main a {
+	text-decoration: none;
+	color: #666
+}
+
+.laypage_main a, .laypage_main span {
+	margin: 0 3px 6px;
+	padding: 0 5px
+}
+.laypage_main  .disabled{
+	opacity: .35;
+    filter: Alpha(Opacity=35);
+    background-image: none;
+}
+
+.laypage_main input {
+	width: 40px;
+	margin: 0 5px;
+	padding: 0 5px
+}
+.laypage_main select {
+	width: 50px;
+	margin: 0 5px;
+	padding: 0 5px
+}
+
+
+.laypage_main button {
+	height: 28px;
+	line-height: 28px;
+	margin-left: 5px;
+	padding: 0 10px;
+	color: #666
+}
+
+.laypageskin_default span {
+	height: 28px;
+	line-height: 28px;
+	color: #999
+}
+
+.laypageskin_default .laypage_curr {
+	font-weight: 700;
+	color: #666
+}
+
+.laypageskin_molv a, .laypageskin_molv span {
+	padding: 0 12px;
+	border-radius: 2px
+}
+
+.laypageskin_molv a {
+	background-color: #f1eff0
+}
+
+.laypageskin_molv .laypage_curr {
+	background-color: #00AA91;
+	color: #fff
+}
+
+.laypageskin_molv input {
+	height: 24px;
+	line-height: 24px
+}
+
+.laypageskin_molv button {
+	height: 26px;
+	line-height: 26px
+}
+
+.laypageskin_yahei {
+	color: #333
+}
+
+.laypageskin_yahei a, .laypageskin_yahei span {
+	padding: 0 13px;
+	border-radius: 2px;
+	color: #333
+}
+
+.laypageskin_yahei .laypage_curr {
+	background-color: #333;
+	color: #fff
+}
+
+.laypageskin_flow {
+	text-align: center
+}
+
+.laypageskin_flow .page_nomore {
+	color: #999
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/css/pagination.css b/pluss-manage-page/src/main/resources/static/resources/css/pagination.css
new file mode 100644
index 0000000..780fe73
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/css/pagination.css
@@ -0,0 +1,86 @@
+@charset "UTF-8";
+.pagination {
+    position: relative;
+    text-align: center;
+    zoom: 1;
+}
+
+.pagination:before,
+.pagination:after {
+    content: "";
+    display: table;
+}
+
+.pagination:after {
+    clear: both;
+    overflow: hidden;
+}
+
+.pagination span {
+    float: left;
+    padding:0 13px;
+    height: 30px;
+    line-height: 30px;
+    color: #bdbdbd;
+    font-size: 12px;
+    box-sizing: border-box;
+}
+
+.pagination .active {
+    float: left;
+    padding:0 13px;
+    height: 30px;
+    line-height: 30px;
+    background: #ff5e5f;
+    color: #fff;
+    font-size: 12px;
+    border: 1px solid #ff5e5f;
+}
+
+.pagination a {
+    float: left;
+     padding:0 13px;
+     height: 30px;
+    line-height: 30px;
+    background: #fff;
+    border: 1px solid #ebebeb;
+    color: #bdbdbd;
+    font-size: 12px;
+     margin-right:-1px;
+}
+
+.pagination a:hover {
+    color: #ff5e5f;
+}
+
+.pagination .next,
+.pagination .prev {
+    font-family: "Simsun";
+    font-size: 12px;
+}
+
+.now,
+.count {
+    padding: 0 5px;
+    color: #ff5e5f;
+}
+
+.eg img {
+    max-width: 800px;
+    min-height: 500px;
+}
+
+.pagination input{
+    float: left;
+    margin: 0 2px;
+    width: 30px;
+    height: 30px;
+    line-height: 30px;
+    text-align: center;
+    background: #fff;
+    border: 1px solid #ebebeb;
+    outline: none;
+    color: #bdbdbd;
+    font-size: 12px;
+    border-radius: 2px;
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/css/reset.css b/pluss-manage-page/src/main/resources/static/resources/css/reset.css
new file mode 100644
index 0000000..47b850e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/css/reset.css
@@ -0,0 +1,4229 @@
+/*----main.css v1.0.6(2015.05.27) 作者：宣梦梦----*/
+/**********单独设置项**********/
+
+a {
+	text-decoration: none;
+	display: block;
+	color: #333
+}
+::-webkit-scrollbar {
+    width: 6px;
+    height: 6px;
+    background-color: #f5f5f5;
+    }
+    ::-webkit-scrollbar-thumb {
+    background-color: #3d4a5dd9;
+}
+:active, :focus, :visited, a, a:active, a:focus, a:visited,a:hover{
+    outline: 0;
+    text-decoration: none;
+}
+::-webkit-scrollbar-track {
+	background-color: #F5F5F5;
+}
+
+::-webkit-scrollbar {
+    width: 6px;
+    height: 9px;
+	background-color: #F5F5F5;
+}
+
+::-webkit-scrollbar-thumb {
+	background-color: #999;
+}
+.white {
+	color: #FFF
+}
+
+.red {
+	color: #F00
+}
+
+.green {
+	color: #1FB5AD
+}
+
+.blue {
+	color: #2584c6
+}
+
+.dblue {
+	color: #59ACE2
+}
+
+.yellow {
+	color: #bdbd3f
+}
+
+.lblue {
+	color: #798eab;
+}
+.dddbg {
+	background-color: #f9f9f9
+}
+
+.black {
+	color: #000
+}
+
+.brown {
+	color: #3c1c05
+}
+
+.dgray {
+	color: #AEB2B7
+}
+
+.mgray {
+	color: #666
+}
+
+.bgray {
+	color: #aeb2b7
+}
+
+.lgray {
+	color: #9c9c9c
+}
+
+.orange {
+	color: #FA8564
+}
+
+.whitebg {
+	background: #FFF
+}
+
+.gwhitebg {
+	background: #F6F6F6
+}
+
+.redbg {
+	background: #F00
+}
+
+.greenbg {
+	background: #34cb1c
+}
+
+.lgreenbg {
+	background: #1FB5AD
+}
+
+.bluebg {
+	background: #0090ff
+}
+.purple {
+	color: #6379bb
+}
+.yellowbg {
+	background: #fec400
+}
+
+.orangebg {
+	background: #FA8564
+}
+
+.purplebg {
+	background: #a52bf2
+}
+
+.lbluebg {
+	background: #F2F9FD
+}
+
+.blackbg {
+	background: #000
+}
+
+.brownbg {
+	background: #3c1c05
+}
+
+.graybg {
+	background: gray
+}
+
+.dgraybg {
+	background: #444
+}
+
+.mgraybg {
+	background: #c7cbd6
+}
+
+.bgraybg {
+	background: #32323A
+}
+
+.lgraybg {
+	background: #f2f2f2
+}
+
+.agraybg {
+	background-color: #E0E1E7
+}
+.dbluebg{
+	background-color:#090c0e;
+}
+
+/**********初始化**********/
+
+* {
+	margin: 0;
+	padding: 0
+}
+
+address,
+cite,
+dfn,
+em,
+i,
+var,
+caption {
+	font-style: normal
+}
+
+code,
+kbd,
+pre,
+samp {
+	font-family: courier new, courier, monospace
+}
+
+sup {
+	vertical-align: text-top
+}
+
+sub {
+	vertical-align: text-bottom
+}
+
+small {
+	font-size: 12px
+}
+
+legend {
+	color: #000
+}
+
+p {
+	word-wrap: break-word
+}
+
+q:before,
+q:after {
+	content: '';
+	cursor: pointer
+}
+
+ul,
+ol,
+li {
+	list-style: none
+}
+
+a,
+a img,
+button {
+	cursor: pointer
+}
+
+button,
+input,
+select,
+textarea {
+	font-size: 100%;
+	
+}
+input:-internal-autofill-selected{
+	box-shadow: 0 0 0px 1000px white inset;
+}
+table {
+	border-collapse: collapse;
+	border-spacing: 0
+}
+
+img,
+input,
+select,
+button {
+	border: 0;
+	vertical-align: middle
+}
+
+a,
+area {
+	blr: expression_r(this.onFocus=this.blur())
+}
+
+a:focus,
+input:focus,
+button:focus {
+	outline: 0
+}
+
+::-ms-clear {
+	display: none
+}
+
+::-ms-reveal {
+	display: none
+}
+
+body {
+	font-size: 12px;
+	font-family: "Helvetica Neue", Helvetica, Tahoma, Arial, 'Microsoft Yahei', 'Hiragino Sans GB', 'WenQuanYi Micro Hei', sans-serif;
+	color: #8a8a8a;
+	position: relative
+}
+select {
+	outline: 0
+}
+
+ul {
+	list-style: none
+}
+
+a {
+	text-decoration: none
+}
+
+textarea {
+	resize: none;
+	border: none;
+	outline: 0;
+}
+
+/**********块元素设置**********/
+
+.dline {
+	display: inline
+}
+
+.dnone {
+	display: none
+}
+
+.dblock {
+	display: block
+}
+
+.dlblock {
+	display: inline-block;
+}
+
+
+/**********字体大小**********/
+
+.f12 {
+	font-size: 12px
+}
+.f13 {
+	font-size: 13px
+}
+.f14 {
+	font-size: 14px
+}
+
+.f16 {
+	font-size: 16px
+}
+
+.f18 {
+	font-size: 18px
+}
+
+.f20 {
+	font-size: 20px
+}
+
+.f22 {
+	font-size: 22px
+}
+
+.f24 {
+	font-size: 24px
+}
+
+.f26 {
+	font-size: 26px
+}
+
+.f28 {
+	font-size: 28px
+}
+
+.f30 {
+	font-size: 30px
+}
+
+.f32 {
+	font-size: 32px
+}
+
+.f48 {
+	font-size: 48px
+}
+
+.f64 {
+	font-size: 64px
+}
+
+.f72 {
+	font-size: 72px
+}
+
+
+/**********字体粗细**********/
+
+.fw400 {
+	font-weight: 400
+}
+
+.fw600 {
+	font-weight: 600
+}
+
+.fw800 {
+	font-weight: 800
+}
+
+
+/**********行高**********/
+
+.lh50 {
+	line-height: 50px
+}
+
+.lh80 {
+	line-height: 80px
+}
+
+.lh100 {
+	line-height: 100%
+}
+
+.lh150 {
+	line-height: 150%
+}
+
+.lh180 {
+	line-height: 180%
+}
+
+.lh200 {
+	line-height: 200%
+}
+
+.lh250 {
+	line-height: 250%
+}
+
+.lh300 {
+	line-height: 300%
+}
+
+
+/**********字体描述**********/
+
+.unl {
+	text-decoration: underline
+}
+
+.crossline {
+	text-decoration: line-through
+}
+
+.nounl {
+	text-decoration: none
+}
+
+
+/**********字体**********/
+
+.simsun {
+	font-family: \5B8B\4F53
+}
+
+.simhei {
+	font-family: \9ED1\4F53
+}
+
+.yahei {
+	font-family: \5FAE\8F6F\96C5\9ED1
+}
+
+
+/**********首行缩进**********/
+
+.tit0 {
+	text-indent: 0
+}
+
+.tit1 {
+	text-indent: 1em
+}
+
+.tit2 {
+	text-indent: 2em
+}
+
+.tit3 {
+	text-indent: 3em
+}
+
+.tit4 {
+	text-indent: 4em
+}
+
+.tit5 {
+	text-indent: 5em
+}
+
+.tit6 {
+	text-indent: 6em
+}
+
+.tit7 {
+	text-indent: 7em
+}
+
+.tit8 {
+	text-indent: 8em
+}
+
+.tit9 {
+	text-indent: 9em
+}
+
+
+/**********文字水平对齐**********/
+
+.textl {
+	text-align: left
+}
+
+.textc {
+	text-align: center
+}
+
+.textr {
+	text-align: right
+}
+
+
+/**********文字垂直对齐**********/
+
+.vt {
+	vertical-align: top
+}
+
+.vm {
+	vertical-align: middle
+}
+
+.vb {
+	vertical-align: bottom
+}
+
+
+/**********容器浮动**********/
+
+.fl {
+	float: left
+}
+
+.fr {
+	display: block !important;
+	float: right
+}
+
+.fc {
+	margin: 0 auto
+}
+
+
+/**********外间距**********/
+
+.mg5 {
+	margin: 2px
+}
+
+.mg5 {
+	margin: 5px
+}
+
+.mg10 {
+	margin: 10px
+}
+
+.mg15 {
+	margin: 15px
+}
+
+.mg20 {
+	margin: 20px
+}
+
+.mg25 {
+	margin: 25px
+}
+
+.mg30 {
+	margin: 30px
+}
+
+
+/**********上外间距**********/
+
+.mt1 {
+	margin-top: 1px
+}
+
+.mt2 {
+	margin-top: 2px
+}
+
+.mt3 {
+	margin-top: 3px
+}
+
+.mt4 {
+	margin-top: 4px
+}
+
+.mt5 {
+	margin-top: 5px
+}
+
+.mt6 {
+	margin-top: 6px
+}
+
+.mt7 {
+	margin-top: 7px
+}
+
+.mt8 {
+	margin-top: 8px
+}
+
+.mt9 {
+	margin-top: 9px
+}
+
+.mt10 {
+	margin-top: 10px
+}
+
+.mt15 {
+	margin-top: 15px
+}
+
+.mt20 {
+	margin-top: 20px
+}
+
+.mt25 {
+	margin-top: 25px
+}
+
+.mt30 {
+	margin-top: 30px
+}
+
+.mt35 {
+	margin-top: 35px
+}
+
+.mt40 {
+	margin-top: 40px
+}
+
+.mt45 {
+	margin-top: 45px
+}
+
+.mt50 {
+	margin-top: 50px
+}
+
+.mt55 {
+	margin-top: 55px
+}
+
+.mt60 {
+	margin-top: 60px
+}
+
+.mt65 {
+	margin-top: 65px
+}
+
+.mt70 {
+	margin-top: 70px
+}
+
+.mt75 {
+	margin-top: 75px
+}
+
+.mt80 {
+	margin-top: 80px
+}
+
+.mt85 {
+	margin-top: 85px
+}
+
+.mt90 {
+	margin-top: 90px
+}
+
+.mt95 {
+	margin-top: 90px
+}
+
+.mt100 {
+	margin-top: 100px
+}
+
+.mt200 {
+	margin-top: 200px
+}
+
+
+/**********左外间距**********/
+.ml0{
+	margin-left: 0px
+}
+.ml1 {
+	margin-left: 1px
+}
+
+.ml2 {
+	margin-left: 2px
+}
+
+.ml3 {
+	margin-left: 3px
+}
+
+.ml4 {
+	margin-left: 4px
+}
+
+.ml5 {
+	margin-left: 5px
+}
+
+.ml6 {
+	margin-left: 6px
+}
+
+.ml7 {
+	margin-left: 7px
+}
+
+.ml8 {
+	margin-left: 8px
+}
+
+.ml9 {
+	margin-left: 9px
+}
+
+.ml10 {
+	margin-left: 10px
+}
+
+.ml15 {
+	margin-left: 15px
+}
+
+.ml20 {
+	margin-left: 20px
+}
+
+.ml25 {
+	margin-left: 25px
+}
+
+.ml30 {
+	margin-left: 30px
+}
+
+.ml35 {
+	margin-left: 35px
+}
+
+.ml40 {
+	margin-left: 40px
+}
+
+.ml45 {
+	margin-left: 45px
+}
+
+.ml50 {
+	margin-left: 50px
+}
+
+.ml55 {
+	margin-left: 55px
+}
+
+.ml60 {
+	margin-left: 60px
+}
+
+.ml65 {
+	margin-left: 65px
+}
+
+.ml70 {
+	margin-left: 70px
+}
+
+.ml75 {
+	margin-left: 75px
+}
+
+.ml80 {
+	margin-left: 80px
+}
+
+.ml85 {
+	margin-left: 85px
+}
+
+.ml90 {
+	margin-left: 90px
+}
+
+.ml95 {
+	margin-left: 95px
+}
+
+.ml100 {
+	margin-left: 100px
+}
+.ml105 {
+	margin-left: 105px
+}
+.ml120 {
+	margin-left: 120px
+}
+.ml190 {
+	margin-left: 190px
+}
+.ml240 {
+	margin-left: 240px
+}
+
+.ml330 {
+	margin-left: 330px
+}
+
+
+/**********右外间距**********/
+.mr0 {
+	margin-right: 0px
+}
+.mr1 {
+	margin-right: 1px
+}
+
+.mr2 {
+	margin-right: 2px
+}
+
+.mr3 {
+	margin-right: 3px
+}
+
+.mr4 {
+	margin-right: 4px
+}
+
+.mr5 {
+	margin-right: 5px
+}
+
+.mr6 {
+	margin-right: 6px
+}
+
+.mr7 {
+	margin-right: 7px
+}
+
+.mr8 {
+	margin-right: 8px
+}
+
+.mr9 {
+	margin-right: 9px
+}
+
+.mr10 {
+	margin-right: 10px
+}
+
+.mr15 {
+	margin-right: 15px
+}
+
+.mr20 {
+	margin-right: 20px
+}
+
+.mr25 {
+	margin-right: 25px
+}
+
+.mr30 {
+	margin-right: 30px
+}
+
+.mr35 {
+	margin-right: 35px
+}
+
+.mr40 {
+	margin-right: 40px
+}
+
+.mr45 {
+	margin-right: 45px
+}
+
+.mr50 {
+	margin-right: 50px
+}
+
+.mr55 {
+	margin-right: 55px
+}
+
+.mr60 {
+	margin-right: 60px
+}
+
+.mr65 {
+	margin-right: 65px
+}
+
+.mr70 {
+	margin-right: 70px
+}
+
+.mr75 {
+	margin-right: 75px
+}
+
+.mr80 {
+	margin-right: 80px
+}
+
+.mr85 {
+	margin-right: 85px
+}
+
+.mr90 {
+	margin-right: 90px
+}
+
+.mr95 {
+	margin-right: 95px
+}
+
+.mr100 {
+	margin-right: 100px
+}
+
+.mr200 {
+	margin-right: 200px
+}
+
+
+/**********下外间距**********/
+
+.mb1 {
+	margin-bottom: 1px
+}
+
+.mb2 {
+	margin-bottom: 2px
+}
+
+.mb3 {
+	margin-bottom: 3px
+}
+
+.mb4 {
+	margin-bottom: 4px
+}
+
+.mb5 {
+	margin-bottom: 5px
+}
+
+.mb6 {
+	margin-bottom: 6px
+}
+
+.mb7 {
+	margin-bottom: 7px
+}
+
+.mb8 {
+	margin-bottom: 8px
+}
+
+.mb9 {
+	margin-bottom: 9px
+}
+
+.mb10 {
+	margin-bottom: 10px
+}
+
+.mb15 {
+	margin-bottom: 15px
+}
+
+.mb20 {
+	margin-bottom: 20px
+}
+
+.mb25 {
+	margin-bottom: 25px
+}
+
+.mb30 {
+	margin-bottom: 30px
+}
+
+.mb35 {
+	margin-bottom: 35px
+}
+
+.mb40 {
+	margin-bottom: 40px
+}
+
+.mb45 {
+	margin-bottom: 45px
+}
+
+.mb50 {
+	margin-bottom: 50px
+}
+
+.mb55 {
+	margin-bottom: 55px
+}
+
+.mb60 {
+	margin-bottom: 60px
+}
+
+.mb65 {
+	margin-bottom: 65px
+}
+
+.mb70 {
+	margin-bottom: 70px
+}
+
+.mb75 {
+	margin-bottom: 75px
+}
+
+.mb80 {
+	margin-bottom: 80px
+}
+
+.mb85 {
+	margin-bottom: 85px
+}
+
+.mb90 {
+	margin-bottom: 90px
+}
+
+.mb100 {
+	margin-bottom: 100px
+}
+
+.mb200 {
+	margin-bottom: 200px
+}
+
+
+/**********内间距**********/
+
+.pd2 {
+	padding: 2px
+}
+
+.pd5 {
+	padding: 5px
+}
+
+.pd7 {
+	padding: 7px
+}
+
+.pd10 {
+	padding: 10px
+}
+
+.pd15 {
+	padding: 15px
+}
+
+.pd20 {
+	padding: 20px
+}
+
+.pd25 {
+	padding: 25px
+}
+
+.pd30 {
+	padding: 30px
+}
+
+.pd40 {
+	padding: 40px
+}
+
+
+/**********上内间距**********/
+
+.pt1 {
+	padding-top: 1px
+}
+
+.pt2 {
+	padding-top: 2px
+}
+
+.pt3 {
+	padding-top: 3px
+}
+
+.pt4 {
+	padding-top: 4px
+}
+
+.pt5 {
+	padding-top: 5px
+}
+
+.pt6 {
+	padding-top: 6px
+}
+
+.pt7 {
+	padding-top: 7px
+}
+
+.pt8 {
+	padding-top: 8px
+}
+
+.pt9 {
+	padding-top: 9px
+}
+
+.pt10 {
+	padding-top: 10px
+}
+.pt12 {
+	padding-top: 12px
+}
+.pt13 {
+	padding-top: 13px
+}
+.pt15 {
+	padding-top: 15px
+}
+
+.pt20 {
+	padding-top: 20px
+}
+
+.pt25 {
+	padding-top: 25px
+}
+
+.pt30 {
+	padding-top: 30px
+}
+
+.pt35 {
+	padding-top: 35px
+}
+
+.pt40 {
+	padding-top: 40px
+}
+
+.pt45 {
+	padding-top: 45px
+}
+
+.pt50 {
+	padding-top: 50px
+}
+
+
+/**********左内间距**********/
+
+.pl1 {
+	padding-left: 1px
+}
+
+.pl2 {
+	padding-left: 2px
+}
+
+.pl3 {
+	padding-left: 3px
+}
+
+.pl4 {
+	padding-left: 4px
+}
+
+.pl5 {
+	padding-left: 5px
+}
+
+.pl6 {
+	padding-left: 6px
+}
+
+.pl7 {
+	padding-left: 7px
+}
+
+.pl8 {
+	padding-left: 8px
+}
+
+.pl9 {
+	padding-left: 9px
+}
+
+.pl10 {
+	padding-left: 10px
+}
+
+.pl15 {
+	padding-left: 15px
+}
+
+.pl20 {
+	padding-left: 20px
+}
+
+.pl25 {
+	padding-left: 25px
+}
+
+.pl30 {
+	padding-left: 30px
+}
+
+.pl35 {
+	padding-left: 35px
+}
+
+.pl40 {
+	padding-left: 40px
+}
+
+.pl45 {
+	padding-left: 45px
+}
+
+.pl50 {
+	padding-left: 50px
+}
+
+.pl60 {
+	padding-left: 60px
+}
+
+.pl70 {
+	padding-left: 70px
+}
+
+.pl80 {
+	padding-left: 80px
+}
+
+.pl90 {
+	padding-left: 90px
+}
+.pl190 {
+	padding-left: 190px
+}
+
+
+/**********右内间距**********/
+
+.pr1 {
+	padding-right: 1px
+}
+
+.pr2 {
+	padding-right: 2px
+}
+
+.pr3 {
+	padding-right: 3px
+}
+
+.pr4 {
+	padding-right: 4px
+}
+
+.pr5 {
+	padding-right: 5px
+}
+
+.pr6 {
+	padding-right: 6px
+}
+
+.pr7 {
+	padding-right: 7px
+}
+
+.pr8 {
+	padding-right: 8px
+}
+
+.pr9 {
+	padding-right: 9px
+}
+
+.pr10 {
+	padding-right: 10px
+}
+
+.pr15 {
+	padding-right: 15px
+}
+
+.pr20 {
+	padding-right: 20px
+}
+
+.pr25 {
+	padding-right: 25px
+}
+
+.pr30 {
+	padding-right: 30px
+}
+
+.pr35 {
+	padding-right: 35px
+}
+
+.pr40 {
+	padding-right: 40px
+}
+
+.pr45 {
+	padding-right: 45px
+}
+
+.pr50 {
+	padding-right: 50px
+}
+
+.pr60 {
+	padding-right: 60px
+}
+
+.pr70 {
+	padding-right: 70px
+}
+
+.pr80 {
+	padding-right: 80px
+}
+
+.pr90 {
+	padding-right: 90px
+}
+
+.pr100 {
+	padding-right: 100px
+}
+
+.pr150 {
+	padding-right: 150px
+}
+
+.pr185 {
+	padding-right: 185px
+}
+
+.pr200 {
+	padding-right: 200px
+}
+
+
+/**********下内间距**********/
+
+.pb1 {
+	padding-bottom: 1px
+}
+
+.pb2 {
+	padding-bottom: 2px
+}
+
+.pb3 {
+	padding-bottom: 3px
+}
+
+.pb4 {
+	padding-bottom: 4px
+}
+
+.pb5 {
+	padding-bottom: 5px
+}
+
+.pb6 {
+	padding-bottom: 6px
+}
+
+.pb7 {
+	padding-bottom: 7px
+}
+
+.pb8 {
+	padding-bottom: 8px
+}
+
+.pb9 {
+	padding-bottom: 9px
+}
+
+.pb10 {
+	padding-bottom: 10px
+}
+.pb12 {
+	padding-bottom: 12px
+}
+.pb13 {
+	padding-bottom: 13px
+}
+.pb15 {
+	padding-bottom: 15px
+}
+
+.pb20 {
+	padding-bottom: 20px
+}
+
+.pb25 {
+	padding-bottom: 25px
+}
+
+.pb30 {
+	padding-bottom: 30px
+}
+
+.pb35 {
+	padding-bottom: 35px
+}
+
+.pb40 {
+	padding-bottom: 40px
+}
+
+.pb45 {
+	padding-bottom: 45px
+}
+
+.pb50 {
+	padding-bottom: 50px
+}
+
+
+/**********宽度**********/
+
+.w10 {
+	width: 10px
+}
+
+.w15 {
+	width: 15px
+}
+.w16 {
+	width: 16px
+}
+.h16 {
+    height: 16px
+}
+.w20 {
+	width: 20px
+}
+
+.w25 {
+	width: 25px
+}
+
+.w30 {
+	width: 30px
+}
+
+.w36 {
+	width: 36px
+}
+
+.w40 {
+	width: 40px
+}
+
+.w50 {
+	width: 50px
+}
+
+.w60 {
+	width: 60px
+}
+
+.w70 {
+	width: 70px
+}
+
+.w80 {
+	width: 80px
+}
+
+.w90 {
+	width: 90px
+}
+
+.w100 {
+	width: 100px
+}
+.w105 {
+	width: 105px
+}
+.w110 {
+	width: 110px
+}
+
+.w120 {
+	width: 120px
+}
+
+.w130 {
+	width: 130px
+}
+
+.w140 {
+	width: 140px
+}
+
+.w150 {
+	width: 150px
+}
+
+.w160 {
+	width: 160px
+}
+
+.w170 {
+	width: 170px
+}
+
+.w180 {
+	width: 180px
+}
+
+.w190 {
+	width: 190px
+}
+
+.w200 {
+	width: 200px
+}
+
+.w210 {
+	width: 210px
+}
+
+.w220 {
+	width: 220px
+}
+
+.w230 {
+	width: 230px
+}
+
+.w240 {
+	width: 240px
+}
+
+.w250 {
+	width: 250px
+}
+
+.w260 {
+	width: 260px
+}
+
+.w270 {
+	width: 270px
+}
+
+.w280 {
+	width: 280px
+}
+
+.w290 {
+	width: 290px
+}
+
+.w300 {
+	width: 300px
+}
+
+.w320 {
+	width: 320px
+}
+
+.w400 {
+	width: 400px
+}
+
+.w500 {
+	width: 500px
+}
+
+.w600 {
+	width: 600px
+}
+
+.w700 {
+	width: 700px
+}
+
+.w800 {
+	width: 800px
+}
+
+.w900 {
+	width: 900px
+}
+
+.w1000 {
+	width: 1000px
+}
+
+
+/**********高度**********/
+
+.h10 {
+	height: 10px
+}
+
+.h15 {
+	height: 15px
+}
+
+.h20 {
+	height: 20px
+}
+
+.h25 {
+	height: 25px
+}
+
+.h30 {
+	height: 30px
+}
+.h32 {
+	height: 32px
+}
+.h35 {
+	height: 35px
+}
+
+.h40 {
+	height: 40px
+}
+
+.h45 {
+	height: 45px
+}
+
+.h50 {
+	height: 50px
+}
+
+.h55 {
+	height: 55px
+}
+
+.h60 {
+	height: 60px
+}
+
+.h65 {
+	height: 65px
+}
+
+.h70 {
+	height: 70px
+}
+
+.h75 {
+	height: 75px
+}
+
+.h80 {
+	height: 80px
+}
+
+.h85 {
+	height: 85px
+}
+
+.h90 {
+	height: 90px
+}
+
+.h95 {
+	height: 95px
+}
+
+.h100 {
+	height: 100px
+}
+
+.h110 {
+	height: 110px
+}
+
+.h120 {
+	height: 120px
+}
+
+.h130 {
+	height: 130px
+}
+
+.h140 {
+	height: 140px
+}
+
+.h150 {
+	height: 150px
+}
+
+.h160 {
+	height: 160px
+}
+
+.h170 {
+	height: 170px
+}
+
+.h180 {
+	height: 180px
+}
+
+.h190 {
+	height: 190px
+}
+
+.h200 {
+	height: 200px
+}
+
+.h210 {
+	height: 210px
+}
+
+.h220 {
+	height: 220px
+}
+
+.h230 {
+	height: 230px
+}
+
+.h240 {
+	height: 240px
+}
+
+.h250 {
+	height: 250px
+}
+
+.h260 {
+	height: 260px
+}
+
+.h270 {
+	height: 270px
+}
+
+.h280 {
+	height: 280px
+}
+
+.h290 {
+	height: 290px
+}
+
+.h300 {
+	height: 300px
+}
+
+.h400 {
+	height: 400px
+}
+
+.h500 {
+	height: 500px
+}
+
+.h600 {
+	height: 600px
+}
+
+.h700 {
+	height: 700px
+}
+
+.h800 {
+	height: 800px
+}
+
+.h900 {
+	height: 900px
+}
+
+
+/**********边框**********/
+
+.bdf {
+	border: 1px solid #fff
+}
+
+.bde {
+	border: 1px solid #eee
+}
+
+.bdd {
+	border: 1px solid #ddd
+}
+
+.bdc {
+	border: 1px solid #ccc
+}
+
+.bdb {
+	border: 1px solid #bbb
+}
+
+.bdd {
+	border: 1px solid #ddd
+}
+
+.bda {
+	border: 1px solid #aaa
+}
+
+.bd9 {
+	border: 1px solid #999
+}
+
+.bd8 {
+	border: 1px solid #888
+}
+
+.bd7 {
+	border: 1px solid #777
+}
+
+.bd6 {
+	border: 1px solid #666
+}
+
+.bd5 {
+	border: 1px solid #555
+}
+
+.bd4 {
+	border: 1px solid #444
+}
+
+.bd3 {
+	border: 1px solid #333
+}
+
+.bd2 {
+	border: 1px solid #222
+}
+
+.bd1 {
+	border: 1px solid #111
+}
+
+.bd0 {
+	border: 1px solid #000
+}
+
+
+/**********左边框**********/
+
+.bdlf {
+	border-left: 1px solid #fff
+}
+
+.bdle {
+	border-left: 1px solid #eee
+}
+
+.bdld {
+	border-left: 1px solid #ddd
+}
+
+.bdlc {
+	border-left: 1px solid #ccc
+}
+
+.bdlb {
+	border-left: 1px solid #bbb
+}
+
+.bdla {
+	border-left: 1px solid #aaa
+}
+
+.bdl9 {
+	border-left: 1px solid #999
+}
+
+.bdl8 {
+	border-left: 1px solid #888
+}
+
+.bdl7 {
+	border-left: 1px solid #777
+}
+
+.bdl6 {
+	border-left: 1px solid #666
+}
+
+.bdl5 {
+	border-left: 1px solid #555
+}
+
+.bdl4 {
+	border-left: 1px solid #444
+}
+
+.bdl3 {
+	border-left: 1px solid #333
+}
+
+.bdl2 {
+	border-left: 1px solid #222
+}
+
+.bdl1 {
+	border-left: 1px solid #111
+}
+
+.bdl0 {
+	border-left: 1px solid #000
+}
+
+
+/**********右边框**********/
+
+.bdrf {
+	border-right: 1px solid #fff
+}
+
+.bdre {
+	border-right: 1px solid #eee
+}
+
+.bdrd {
+	border-right: 1px solid #ddd
+}
+
+.bdrc {
+	border-right: 1px solid #ccc
+}
+
+.bdrb {
+	border-right: 1px solid #bbb
+}
+
+.bdra {
+	border-right: 1px solid #aaa
+}
+
+.bdr9 {
+	border-right: 1px solid #999
+}
+
+.bdr8 {
+	border-right: 1px solid #888
+}
+
+.bdr7 {
+	border-right: 1px solid #777
+}
+
+.bdr6 {
+	border-right: 1px solid #666
+}
+
+.bdr5 {
+	border-right: 1px solid #555
+}
+
+.bdr4 {
+	border-right: 1px solid #444
+}
+
+.bdr3 {
+	border-right: 1px solid #333
+}
+
+.bdr2 {
+	border-right: 1px solid #222
+}
+
+.bdr1 {
+	border-right: 1px solid #111
+}
+
+.bdr0 {
+	border-right: 1px solid #000
+}
+
+
+/**********上边框**********/
+
+.bdtf {
+	border-top: 1px solid #fff
+}
+
+.bdte {
+	border-top: 1px solid #eee
+}
+
+.bdtd {
+	border-top: 1px solid #ddd
+}
+
+.bdtc {
+	border-top: 1px solid #ccc
+}
+
+.bdtb {
+	border-top: 1px solid #bbb
+}
+
+.bdta {
+	border-top: 1px solid #aaa
+}
+
+.bdt9 {
+	border-top: 1px solid #999
+}
+
+.bdt8 {
+	border-top: 1px solid #888
+}
+
+.bdt7 {
+	border-top: 1px solid #777
+}
+
+.bdt6 {
+	border-top: 1px solid #666
+}
+
+.bdt5 {
+	border-top: 1px solid #555
+}
+
+.bdt4 {
+	border-top: 1px solid #444
+}
+
+.bdt3 {
+	border-top: 1px solid #333
+}
+
+.bdt2 {
+	border-top: 1px solid #222
+}
+
+.bdt1 {
+	border-top: 1px solid #111
+}
+
+.bdt0 {
+	border-top: 1px solid #000
+}
+
+
+/**********下边框**********/
+
+.bdbf {
+	border-bottom: 1px solid #fff
+}
+
+.bdbe {
+	border-bottom: 1px solid #eee
+}
+
+.bdbd {
+	border-bottom: 1px solid #ddd
+}
+
+.bdbc {
+	border-bottom: 1px solid #ccc
+}
+
+.bdbb {
+	border-bottom: 1px solid #bbb
+}
+
+.bdba {
+	border-bottom: 1px solid #aaa
+}
+
+.bdb9 {
+	border-bottom: 1px solid #999
+}
+
+.bdb8 {
+	border-bottom: 1px solid #888
+}
+
+.bdb7 {
+	border-bottom: 1px solid #777
+}
+
+.bdb6 {
+	border-bottom: 1px solid #666
+}
+
+.bdb5 {
+	border-bottom: 1px solid #555
+}
+
+.bdb4 {
+	border-bottom: 1px solid #444
+}
+
+.bdb3 {
+	border-bottom: 1px solid #333
+}
+
+.bdb2 {
+	border-bottom: 1px solid #222
+}
+
+.bdb1 {
+	border-bottom: 1px solid #3f4e54
+}
+
+.bdb0 {
+	border-bottom: 1px solid #000
+}
+
+.bdbg {
+	border-bottom: 1px solid #3C3C44
+}
+.bddot{
+	border: 1px dashed #E0E1E7
+}
+
+/**********百分比宽度**********/
+
+.wp7 {
+	width: 7%
+}
+
+.wp10 {
+	width: 10%
+}
+
+.wp11 {
+	width: 11%
+}
+
+.wp14 {
+	width: 14%
+}
+
+.wp15 {
+	width: 15%
+}
+
+.wp20 {
+	width: 20%
+}
+
+.wp25 {
+	width: 25%
+}
+
+.wp30 {
+	width: 30%
+}
+
+.wp33 {
+	width: 33.33%
+}
+
+.wp34 {
+	width: 34%
+}
+
+.wp40 {
+	width: 40%
+}
+.wp50 {
+	width: 50%
+}
+
+.wp55 {
+	width: 55%
+}
+
+.wp60 {
+	width: 60%
+}
+
+.wp70 {
+	width: 70%
+}
+
+.wp80 {
+	width: 80%
+}
+
+.wp90 {
+	width: 90%
+}
+
+.wp92 {
+	width: 92%
+}
+
+.wp94 {
+	width: 94%
+}
+
+.wp96 {
+	width: 96%
+}
+
+.wp98 {
+	width: 98%
+}
+
+.wp100 {
+	width: 100%
+}
+
+
+/**********清除样式**********/
+
+.clear {
+	display: block;
+	clear: both;
+	font-size: 0;
+	line-height: 0;
+	height: 0;
+	overflow: hidden;
+	content: ".";
+}
+
+.clearfix:after {
+	content: "\200B";
+	display: block;
+	height: 0;
+	clear: both;
+}
+
+
+/*定位样式*/
+
+.positionr {
+	position: relative;
+}
+
+.positionf {
+	position: fixed;
+}
+
+.positiona {
+	position: absolute;
+}
+
+.top0 {
+	top: 0
+}
+.top36{
+	top: 36px;
+}
+.top45{
+	top: 45px;
+}
+.top60{
+	top: 60px;
+}
+.top130{
+	top: 130px;
+}
+.left130 {
+	left: 130px
+}
+.leftp50{
+	left:50%;
+}
+.right10 {
+	right: 10px
+}
+
+.right125 {
+	right: 125px
+}
+
+.bottom0 {
+	bottom: 0
+}
+
+.bottom20 {
+	bottom: 20px;
+}
+.bottom60 {
+	bottom: 60px;
+}
+.zd98 {
+	z-index: 98;
+}
+
+.zd99 {
+	z-index: 99;
+}
+
+.zd100 {
+	z-index: 100;
+}
+
+.zd101 {
+	z-index: 101;
+}
+.zd1000 {
+	z-index: 1000;
+}
+.dn {
+	display: none;
+}
+
+
+/*鼠标样式*/
+
+.cursor {
+	cursor: pointer;
+}
+
+
+/*透明度*/
+
+.opacity0 {
+	filter: alpha(opacity=100);
+	/* IE */
+	-moz-opacity: 0;
+	/* 老版Mozilla */
+	-khtml-opacity: 0;
+	/* 老版Safari */
+	opacity: 0;
+	/* 支持opacity的浏览器*/
+	background: rgba(43, 48, 60, 10);
+}
+
+.opacity09 {
+	filter: alpha(opacity=90);
+	/* IE */
+	-moz-opacity: 0.9;
+	/* 老版Mozilla */
+	-khtml-opacity: 0.9;
+	/* 老版Safari */
+	opacity: 0.9;
+	/* 支持opacity的浏览器*/
+	background: rgba(43, 48, 60, 0.9);
+}
+
+
+/*圆角*/
+
+.radius3 {
+	border-radius: 3px;
+}
+
+.radius5 {
+	border-radius: 5px;
+}
+
+.radius10 {
+	border-radius: 10px;
+}
+
+.radiusp50 {
+	border-radius: 50%;
+}
+
+.radiustlr {
+	border-top-left-radius: 5px;
+	border-top-right-radius: 5px;
+}
+/*placeholder颜色*/
+
+.white::-webkit-input-placeholder {
+	/* WebKit, Blink, Edge */
+	color: #fff;
+}
+
+.white:-moz-placeholder {
+	/* Mozilla Firefox 4 to 18 */
+	color: #fff;
+}
+
+.white::-moz-placeholder {
+	/* Mozilla Firefox 19+ */
+	color: #fff;
+}
+
+.white:-ms-input-placeholder {
+	/* Internet Explorer 10-11 */
+	color: #fff;
+}
+
+
+/*纵向横向滚动*/
+
+.overflowy {
+	overflow-y: auto;
+}
+
+.overflowx {
+	overflow-x: auto;
+}
+.box-flex {
+	display: -webkit-box;
+	display: -moz-box;
+	display: -ms-flexbox;
+	display: -webkit-flex;
+	display: flex;
+}
+
+.flex1 {
+	flex: 1;
+	-webkit-flex: 1;
+	-ms-flex: 1;
+	-moz-flex: 1;
+}
+
+.flex2 {
+	flex: 2;
+	-webkit-flex: 2;
+	-ms-flex: 2;
+	-moz-flex: 2;
+}
+
+.flex3 {
+	flex: 3;
+	-webkit-flex: 3;
+	-ms-flex: 3;
+	-moz-flex: 3;
+}
+
+.flex4 {
+	flex: 4;
+	-webkit-flex: 4;
+	-ms-flex: 4;
+	-moz-flex: 4;
+}
+
+.flex5 {
+	flex: 5;
+	-webkit-flex: 5;
+	-ms-flex: 5;
+	-moz-flex: 5;
+}
+
+.flex6 {
+	flex: 6;
+	-webkit-flex: 6;
+	-ms-flex: 6;
+	-moz-flex: 6;
+}
+
+.flex7 {
+	flex: 7;
+	-webkit-flex: 7;
+	-ms-flex: 7;
+	-moz-flex: 7;
+}
+
+.flex8 {
+	flex: 8;
+	-webkit-flex: 8;
+	-ms-flex: 8;
+	-moz-flex: 8;
+}
+
+
+/*层级*/
+
+.zIndex99 {
+	z-index: 99;
+}
+
+.zIndex999 {
+	z-index: 999;
+}
+
+.zIndex9999 {
+	z-index: 9999;
+}
+
+
+/*超出1行后省略*/
+
+.overFont {
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	-ms-text-overflow: ellipsis;
+	-o-text-overflow: ellipsis;
+}
+
+
+/*超出2行后省略  */
+
+.overFont2 {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	-ms-text-overflow: ellipsis;
+	-o-text-overflow: ellipsis;
+	display: -webkit-box !important;
+	-webkit-box-orient: vertical;
+	-webkit-line-clamp: 2;
+	word-break: break-word;
+}
+
+.borderBox {
+	box-sizing: border-box;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+}
+
+.left0 {
+	left: 0;
+}
+.left80 {
+	left: 80px;
+}
+
+.right0 {
+	right: 0;
+}
+
+.right500 {
+	right: 500px;
+}
+
+.top28 {
+	top: 28px;
+}
+
+.top40 {
+	top: 40px;
+}
+
+.top80 {
+	top: 80px;
+}
+
+.w380 {
+	width: 380px;
+}
+.wp88{
+	width: 88%;
+}
+.bottom50{
+  bottom:50px;
+}
+.boxsizing{
+	box-sizing: content-box;
+}
+/*侧导航栏*/
+.slidebar-list>ul>li a{
+  white-space:nowrap;
+}
+.slidebar-list>ul>li:hover{
+    background:#ff5e5f;
+}
+.slidebar-list>ul>li.current a{
+    background: #ff5e5f;
+    color: #fff;
+}
+.slidebar-list .sub-nav li.current a {
+    color: white;
+}
+.slidebar-list>ul>li>a i.icon:before {
+    -webkit-transition: all 0.4s ease;
+    -o-transition: all 0.4s ease;
+    transition: all 0.4s ease;
+    -webkit-transform: rotate(0deg);
+    -ms-transform: rotate(0deg);
+    -o-transform: rotate(0deg);
+    transform: rotate(0deg);
+}
+.nav-wrap-up{
+	 -webkit-transition: all 0.4s ease;
+    -o-transition: all 0.4s ease;
+    transition: all 0.4s ease;
+}
+.slidebar-list>ul>li>a.current i.icon:before {
+    -webkit-transform: rotate(90deg);
+    -ms-transform: rotate(90deg);
+    -o-transform: rotate(90deg);
+    transform: rotate(90deg);
+}
+div.selector,
+div.selector span,
+div.checker span,
+div.radio span,
+div.uploader,
+div.uploader span.action,
+div.button,
+div.button span {
+	background-image: url("../images/sprite.png");
+	background-repeat: no-repeat;
+	-webkit-font-smoothing: antialiased;
+}
+
+div.selector,
+div.checker,
+div.button,
+div.radio,
+div.uploader {
+	display: -moz-inline-box;
+	display: inline-block;
+	*display: inline;
+	zoom: 1;
+	vertical-align: middle;
+	/* Keeping this as :focus to remove browser styles */
+}
+
+div.selector:focus,
+div.checker:focus,
+div.button:focus,
+div.radio:focus,
+div.uploader:focus {
+	outline: 0;
+}
+
+div.selector,
+div.selector *,
+div.radio,
+div.radio *,
+div.checker,
+div.checker *,
+div.uploader,
+div.uploader *,
+div.button,
+div.button * {
+	margin: 0;
+	padding: 0;
+}
+div.checker,
+div.checker span,
+div.checker input {
+	width: 19px;
+	height: 19px;
+}
+
+div.checker span {
+	display: -moz-inline-box;
+	display: inline-block;
+	*display: inline;
+	zoom: 1;
+	text-align: center;
+	background-position: 0 -260px;
+}
+
+div.checker span.checked {
+	background-position: -76px -260px;
+}
+
+div.checker input {
+	opacity: 0;
+	filter: alpha(opacity=0);
+	-moz-opacity: 0;
+	border: none;
+	background: none;
+	display: -moz-inline-box;
+	display: inline-block;
+	*display: inline;
+	zoom: 1;
+}
+
+div.checker.active span {
+	background-position: -19px -260px;
+}
+
+div.checker.active span.checked {
+	background-position: -95px -260px;
+}
+
+div.checker.hover span,
+div.checker.focus span {
+	background-position: -38px -260px;
+}
+
+div.checker.hover span.checked,
+div.checker.focus span.checked {
+	background-position: -114px -260px;
+}
+
+div.checker.hover.active span,
+div.checker.focus.active span {
+	background-position: -57px -260px;
+}
+
+div.checker.hover.active span.checked,
+div.checker.focus.active span.checked {
+	background-position: -133px -260px;
+}
+
+div.checker.disabled,
+div.checker.disabled.active {
+	background-position: -152px -260px;
+}
+
+div.checker.disabled span.checked,
+div.checker.disabled.active span.checked {
+	background-position: -171px -260px;
+}
+
+
+/* Radio */
+
+div.radio {
+	position: relative;
+}
+
+div.radio,
+div.radio span,
+div.radio input {
+	width: 18px;
+	height: 18px;
+}
+
+div.radio span {
+	display: -moz-inline-box;
+	display: inline-block;
+	*display: inline;
+	zoom: 1;
+	text-align: center;
+	background-position: 0 -279px;
+}
+
+div.radio span.checked {
+	background-position: -72px -279px;
+}
+
+div.radio input {
+	opacity: 0;
+	filter: alpha(opacity=0);
+	-moz-opacity: 0;
+	border: none;
+	background: none;
+	display: -moz-inline-box;
+	display: inline-block;
+	*display: inline;
+	zoom: 1;
+	text-align: center;
+}
+
+div.radio.active span {
+	background-position: -18px -18px -279px;
+}
+
+div.radio.active span.checked {
+	background-position: -90px -279px;
+}
+
+div.radio.hover span,
+div.radio.focus span {
+	background-position: -36px -36px -279px;
+}
+
+div.radio.hover span.checked,
+div.radio.focus span.checked {
+	background-position: -108px -279px;
+}
+
+div.radio.hover.active span,
+div.radio.focus.active span {
+	background-position: -54px -279px;
+}
+
+div.radio.hover.active span.checked,
+div.radio.focus.active span.checked {
+	background-position: -126px -279px;
+}
+
+div.radio.disabled span,
+div.radio.disabled.active span {
+	background-position: -144px -279px;
+}
+
+div.radio.disabled span.checked,
+div.radio.disabled.active span.checked {
+	background-position: -162px -279px;
+}
+.navbar-nav>.selected>a,
+.navbar-nav>.selected>a:focus, 
+.navbar-nav>.selected>a:hover {
+ background: #ff5e5f !important;
+    color: #fff !important
+}
+.icon-animated-bell {
+	display: inline-block;
+	-moz-animation: ringing 2s 5 ease 1s;
+	-webkit-animation: ringing 2s 5 ease 1s;
+	-o-animation: ringing 2s 5 ease 1s;
+	-ms-animation: ringing 2s 5 ease 1s;
+	animation: ringing 2s 5 ease 1s;
+	-moz-transform-origin: 50% 0;
+	-webkit-transform-origin: 50% 0;
+	-o-transform-origin: 50% 0;
+	-ms-transform-origin: 50% 0;
+	transform-origin: 50% 0
+}
+
+@-moz-keyframes ringing {
+  0% {
+    -moz-transform: rotate(-15deg);
+  }
+  2% {
+    -moz-transform: rotate(15deg);
+  }
+  4% {
+    -moz-transform: rotate(-18deg);
+  }
+  6% {
+    -moz-transform: rotate(18deg);
+  }
+  8% {
+    -moz-transform: rotate(-22deg);
+  }
+  10% {
+    -moz-transform: rotate(22deg);
+  }
+  12% {
+    -moz-transform: rotate(-18deg);
+  }
+  14% {
+    -moz-transform: rotate(18deg);
+  }
+  16% {
+    -moz-transform: rotate(-12deg);
+  }
+  18% {
+    -moz-transform: rotate(12deg);
+  }
+  20% {
+    -moz-transform: rotate(0deg);
+  }
+}
+@-webkit-keyframes ringing {
+  0% {
+    -webkit-transform: rotate(-15deg);
+  }
+  2% {
+    -webkit-transform: rotate(15deg);
+  }
+  4% {
+    -webkit-transform: rotate(-18deg);
+  }
+  6% {
+    -webkit-transform: rotate(18deg);
+  }
+  8% {
+    -webkit-transform: rotate(-22deg);
+  }
+  10% {
+    -webkit-transform: rotate(22deg);
+  }
+  12% {
+    -webkit-transform: rotate(-18deg);
+  }
+  14% {
+    -webkit-transform: rotate(18deg);
+  }
+  16% {
+    -webkit-transform: rotate(-12deg);
+  }
+  18% {
+    -webkit-transform: rotate(12deg);
+  }
+  20% {
+    -webkit-transform: rotate(0deg);
+  }
+}
+@-ms-keyframes ringing {
+  0% {
+    -ms-transform: rotate(-15deg);
+  }
+  2% {
+    -ms-transform: rotate(15deg);
+  }
+  4% {
+    -ms-transform: rotate(-18deg);
+  }
+  6% {
+    -ms-transform: rotate(18deg);
+  }
+  8% {
+    -ms-transform: rotate(-22deg);
+  }
+  10% {
+    -ms-transform: rotate(22deg);
+  }
+  12% {
+    -ms-transform: rotate(-18deg);
+  }
+  14% {
+    -ms-transform: rotate(18deg);
+  }
+  16% {
+    -ms-transform: rotate(-12deg);
+  }
+  18% {
+    -ms-transform: rotate(12deg);
+  }
+  20% {
+    -ms-transform: rotate(0deg);
+  }
+}
+@keyframes ringing {
+  0% {
+    transform: rotate(-15deg);
+  }
+  2% {
+    transform: rotate(15deg);
+  }
+  4% {
+    transform: rotate(-18deg);
+  }
+  6% {
+    transform: rotate(18deg);
+  }
+  8% {
+    transform: rotate(-22deg);
+  }
+  10% {
+    transform: rotate(22deg);
+  }
+  12% {
+    transform: rotate(-18deg);
+  }
+  14% {
+    transform: rotate(18deg);
+  }
+  16% {
+    transform: rotate(-12deg);
+  }
+  18% {
+    transform: rotate(12deg);
+  }
+  20% {
+    transform: rotate(0deg);
+  }
+}
+.icon-animated-vertical {
+	display: inline-block;
+	-moz-animation: vertical 2s 5 ease 2s;
+	-webkit-animation: vertical 2s 5 ease 2s;
+	-o-animation: vertical 2s 5 ease 2s;
+	-ms-animation: vertical 2s 5 ease 2s;
+	animation: vertical 2s 5 ease 2s
+}
+@-moz-keyframes vertical {
+  0% {
+    -moz-transform: translate(0, -3px);
+  }
+  4% {
+    -moz-transform: translate(0, 3px);
+  }
+  8% {
+    -moz-transform: translate(0, -3px);
+  }
+  12% {
+    -moz-transform: translate(0, 3px);
+  }
+  16% {
+    -moz-transform: translate(0, -3px);
+  }
+  20% {
+    -moz-transform: translate(0, 3px);
+  }
+  22% {
+    -moz-transform: translate(0, 0);
+  }
+}
+@-webkit-keyframes vertical {
+  0% {
+    -webkit-transform: translate(0, -3px);
+  }
+  4% {
+    -webkit-transform: translate(0, 3px);
+  }
+  8% {
+    -webkit-transform: translate(0, -3px);
+  }
+  12% {
+    -webkit-transform: translate(0, 3px);
+  }
+  16% {
+    -webkit-transform: translate(0, -3px);
+  }
+  20% {
+    -webkit-transform: translate(0, 3px);
+  }
+  22% {
+    -webkit-transform: translate(0, 0);
+  }
+}
+@-ms-keyframes vertical {
+  0% {
+    -ms-transform: translate(0, -3px);
+  }
+  4% {
+    -ms-transform: translate(0, 3px);
+  }
+  8% {
+    -ms-transform: translate(0, -3px);
+  }
+  12% {
+    -ms-transform: translate(0, 3px);
+  }
+  16% {
+    -ms-transform: translate(0, -3px);
+  }
+  20% {
+    -ms-transform: translate(0, 3px);
+  }
+  22% {
+    -ms-transform: translate(0, 0);
+  }
+}
+@keyframes vertical {
+  0% {
+    transform: translate(0, -3px);
+  }
+  4% {
+    transform: translate(0, 3px);
+  }
+  8% {
+    transform: translate(0, -3px);
+  }
+  12% {
+    transform: translate(0, 3px);
+  }
+  16% {
+    transform: translate(0, -3px);
+  }
+  20% {
+    transform: translate(0, 3px);
+  }
+  22% {
+    transform: translate(0, 0);
+  }
+}
+.icon-animated-hand-pointer {
+  display: inline-block;
+  -moz-animation: hand-pointer 2.0s 4 ease 2.0s;
+  -webkit-animation: hand-pointer 2.0s 4 ease 2.0s;
+  -o-animation: hand-pointer 2.0s 4 ease 2.0s;
+  -ms-animation: hand-pointer 2.0s 4 ease 2.0s;
+  animation: hand-pointer 2.0s 4 ease 2.0s;
+}
+@-moz-keyframes hand-pointer {
+  0% {
+    -moz-transform: translate(0, 0);
+  }
+  6% {
+    -moz-transform: translate(5px, 0);
+  }
+  12% {
+    -moz-transform: translate(0, 0);
+  }
+  18% {
+    -moz-transform: translate(5px, 0);
+  }
+  24% {
+    -moz-transform: translate(0, 0);
+  }
+  30% {
+    -moz-transform: translate(5px, 0);
+  }
+  36% {
+    -moz-transform: translate(0, 0);
+  }
+}
+.icon-animated-wrench {
+  display: inline-block;
+  -moz-animation: wrenching 2.5s 4 ease;
+  -webkit-animation: wrenching 2.5s 4 ease;
+  -o-animation: wrenching 2.5s 4 ease;
+  -ms-animation: wrenching 2.5s 4 ease;
+  animation: wrenching 2.5s 4 ease;
+  -moz-transform-origin: 90% 35%;
+  -webkit-transform-origin: 90% 35%;
+  -o-transform-origin: 90% 35%;
+  -ms-transform-origin: 90% 35%;
+  transform-origin: 90% 35%;
+}
+@-moz-keyframes wrenching {
+  0% {
+    -moz-transform: rotate(-12deg);
+  }
+  8% {
+    -moz-transform: rotate(12deg);
+  }
+  10% {
+    -moz-transform: rotate(24deg);
+  }
+  18% {
+    -moz-transform: rotate(-24deg);
+  }
+  20% {
+    -moz-transform: rotate(-24deg);
+  }
+  28% {
+    -moz-transform: rotate(24deg);
+  }
+  30% {
+    -moz-transform: rotate(24deg);
+  }
+  38% {
+    -moz-transform: rotate(-24deg);
+  }
+  40% {
+    -moz-transform: rotate(-24deg);
+  }
+  48% {
+    -moz-transform: rotate(24deg);
+  }
+  50% {
+    -moz-transform: rotate(24deg);
+  }
+  58% {
+    -moz-transform: rotate(-24deg);
+  }
+  60% {
+    -moz-transform: rotate(-24deg);
+  }
+  68% {
+    -moz-transform: rotate(24deg);
+  }
+  75% {
+    -moz-transform: rotate(0deg);
+  }
+}
+@-webkit-keyframes wrenching {
+  0% {
+    -webkit-transform: rotate(-12deg);
+  }
+  8% {
+    -webkit-transform: rotate(12deg);
+  }
+  10% {
+    -webkit-transform: rotate(24deg);
+  }
+  18% {
+    -webkit-transform: rotate(-24deg);
+  }
+  20% {
+    -webkit-transform: rotate(-24deg);
+  }
+  28% {
+    -webkit-transform: rotate(24deg);
+  }
+  30% {
+    -webkit-transform: rotate(24deg);
+  }
+  38% {
+    -webkit-transform: rotate(-24deg);
+  }
+  40% {
+    -webkit-transform: rotate(-24deg);
+  }
+  48% {
+    -webkit-transform: rotate(24deg);
+  }
+  50% {
+    -webkit-transform: rotate(24deg);
+  }
+  58% {
+    -webkit-transform: rotate(-24deg);
+  }
+  60% {
+    -webkit-transform: rotate(-24deg);
+  }
+  68% {
+    -webkit-transform: rotate(24deg);
+  }
+  75% {
+    -webkit-transform: rotate(0deg);
+  }
+}
+@-o-keyframes wrenching {
+  0% {
+    -o-transform: rotate(-12deg);
+  }
+  8% {
+    -o-transform: rotate(12deg);
+  }
+  10% {
+    -o-transform: rotate(24deg);
+  }
+  18% {
+    -o-transform: rotate(-24deg);
+  }
+  20% {
+    -o-transform: rotate(-24deg);
+  }
+  28% {
+    -o-transform: rotate(24deg);
+  }
+  30% {
+    -o-transform: rotate(24deg);
+  }
+  38% {
+    -o-transform: rotate(-24deg);
+  }
+  40% {
+    -o-transform: rotate(-24deg);
+  }
+  48% {
+    -o-transform: rotate(24deg);
+  }
+  50% {
+    -o-transform: rotate(24deg);
+  }
+  58% {
+    -o-transform: rotate(-24deg);
+  }
+  60% {
+    -o-transform: rotate(-24deg);
+  }
+  68% {
+    -o-transform: rotate(24deg);
+  }
+  75% {
+    -o-transform: rotate(0deg);
+  }
+}
+@-ms-keyframes wrenching {
+  0% {
+    -ms-transform: rotate(-12deg);
+  }
+  8% {
+    -ms-transform: rotate(12deg);
+  }
+  10% {
+    -ms-transform: rotate(24deg);
+  }
+  18% {
+    -ms-transform: rotate(-24deg);
+  }
+  20% {
+    -ms-transform: rotate(-24deg);
+  }
+  28% {
+    -ms-transform: rotate(24deg);
+  }
+  30% {
+    -ms-transform: rotate(24deg);
+  }
+  38% {
+    -ms-transform: rotate(-24deg);
+  }
+  40% {
+    -ms-transform: rotate(-24deg);
+  }
+  48% {
+    -ms-transform: rotate(24deg);
+  }
+  50% {
+    -ms-transform: rotate(24deg);
+  }
+  58% {
+    -ms-transform: rotate(-24deg);
+  }
+  60% {
+    -ms-transform: rotate(-24deg);
+  }
+  68% {
+    -ms-transform: rotate(24deg);
+  }
+  75% {
+    -ms-transform: rotate(0deg);
+  }
+}
+@keyframes wrenching {
+  0% {
+    transform: rotate(-12deg);
+  }
+  8% {
+    transform: rotate(12deg);
+  }
+  10% {
+    transform: rotate(24deg);
+  }
+  18% {
+    transform: rotate(-24deg);
+  }
+  20% {
+    transform: rotate(-24deg);
+  }
+  28% {
+    transform: rotate(24deg);
+  }
+  30% {
+    transform: rotate(24deg);
+  }
+  38% {
+    transform: rotate(-24deg);
+  }
+  40% {
+    transform: rotate(-24deg);
+  }
+  48% {
+    transform: rotate(24deg);
+  }
+  50% {
+    transform: rotate(24deg);
+  }
+  58% {
+    transform: rotate(-24deg);
+  }
+  60% {
+    transform: rotate(-24deg);
+  }
+  68% {
+    transform: rotate(24deg);
+  }
+  75% {
+    transform: rotate(0deg);
+  }
+}
+@-moz-keyframes blinking {
+  0% {
+    opacity: 1;
+  }
+  40% {
+    opacity: 0;
+  }
+  80% {
+    opacity: 1;
+  }
+}
+@-webkit-keyframes blinking {
+  0% {
+    opacity: 1;
+  }
+  40% {
+    opacity: 0;
+  }
+  80% {
+    opacity: 1;
+  }
+}
+@-ms-keyframes blinking {
+  0% {
+    opacity: 1;
+  }
+  40% {
+    opacity: 0;
+  }
+  80% {
+    opacity: 1;
+  }
+}
+@keyframes blinking {
+  0% {
+    opacity: 1;
+  }
+  40% {
+    opacity: 0;
+  }
+  80% {
+    opacity: 1;
+  }
+}
+@-moz-keyframes pulsating {
+  0% {
+    -moz-transform: scale(1);
+  }
+  5% {
+    -moz-transform: scale(0.75);
+  }
+  10% {
+    -moz-transform: scale(1);
+  }
+  15% {
+    -moz-transform: scale(1.25);
+  }
+  20% {
+    -moz-transform: scale(1);
+  }
+  25% {
+    -moz-transform: scale(0.75);
+  }
+  30% {
+    -moz-transform: scale(1);
+  }
+  35% {
+    -moz-transform: scale(1.25);
+  }
+  40% {
+    -moz-transform: scale(1);
+  }
+}
+@-webkit-keyframes pulsating {
+  0% {
+    -webkit-transform: scale(1);
+  }
+  5% {
+    -webkit-transform: scale(0.75);
+  }
+  10% {
+    -webkit-transform: scale(1);
+  }
+  15% {
+    -webkit-transform: scale(1.25);
+  }
+  20% {
+    -webkit-transform: scale(1);
+  }
+  25% {
+    -webkit-transform: scale(0.75);
+  }
+  30% {
+    -webkit-transform: scale(1);
+  }
+  35% {
+    -webkit-transform: scale(1.25);
+  }
+  40% {
+    -webkit-transform: scale(1);
+  }
+}
+@-ms-keyframes pulsating {
+  0% {
+    -ms-transform: scale(1);
+  }
+  5% {
+    -ms-transform: scale(0.75);
+  }
+  10% {
+    -ms-transform: scale(1);
+  }
+  15% {
+    -ms-transform: scale(1.25);
+  }
+  20% {
+    -ms-transform: scale(1);
+  }
+  25% {
+    -ms-transform: scale(0.75);
+  }
+  30% {
+    -ms-transform: scale(1);
+  }
+  35% {
+    -ms-transform: scale(1.25);
+  }
+  40% {
+    -ms-transform: scale(1);
+  }
+}
+@keyframes pulsating {
+  0% {
+    transform: scale(1);
+  }
+  5% {
+    transform: scale(0.75);
+  }
+  10% {
+    transform: scale(1);
+  }
+  15% {
+    transform: scale(1.25);
+  }
+  20% {
+    transform: scale(1);
+  }
+  25% {
+    transform: scale(0.75);
+  }
+  30% {
+    transform: scale(1);
+  }
+  35% {
+    transform: scale(1.25);
+  }
+  40% {
+    transform: scale(1);
+  }
+}
+.btn-scroll-up {
+	border-width: 0;
+	position: fixed;
+	right: 2px;
+	z-index: 99;
+	-webkit-transition-duration: .3s;
+	transition-duration: .3s;
+	opacity: 0;
+	filter: alpha(opacity = 0);
+	bottom: -24px;
+	visibility: hidden
+}
+
+.btn-scroll-up.display {
+	opacity: .7;
+	filter: alpha(opacity = 70);
+	bottom: 2px;
+	visibility: visible
+}
+
+.btn-scroll-up:hover {
+	opacity: 1;
+	filter: alpha(opacity = 100)
+}
+
+.btn-scroll-up:focus {
+	outline: 0
+}
+
+@media ( min-width :768px) {
+	.main-container.container>.btn-scroll-up {
+		right: auto;
+		margin-left: 714px
+	}
+}
+
+@media ( min-width :992px) {
+	.main-container.container>.btn-scroll-up {
+		right: auto;
+		margin-left: 934px
+	}
+}
+
+@media ( min-width :1200px) {
+	.main-container.container>.btn-scroll-up {
+		right: auto;
+		margin-left: 1134px
+	}
+}
+
+.sidebar:before {
+	content: "";
+	display: block;
+	width: inherit;
+	position: absolute;
+	top: 0;
+	bottom: 0;
+	z-index: -1;
+	background-color: inherit;
+	border-style: inherit;
+	border-color: inherit;
+	border-width: inherit
+}
+.sidebar .sidebar-toggle:before {
+	content: "";
+	display: block;
+	height: 0;
+	border-top: 1px solid #f2f2f2;
+	border-color: inherit;
+	position: absolute;
+	left: 5px;
+	right: 5px;
+	top: 16px
+}
+/* skin 1 */
+.nav-list > li > a {
+  background-color: #1e1e1f;
+  color: #bac2c8;
+  padding:8px 10px;
+}
+
+.nav-list > li.open > a,
+.nav-list > li.open:hover > a {
+  color: #85c0ec;
+  background-color: #364150;
+}
+.nav-list > li > a:hover{
+	background: #ff5e5f;
+    color: #fff;
+}
+.nav-list > li.active > a, .nav > li.selected > a {
+    background: #ff5e5f;
+    color: #fff;
+}
+.nav-list > li.active > .submenu li.active > a:after {
+  top: 5px;
+}
+.nav-list > li .submenu {
+  background-color: #333d3f;
+}
+.nav-list > li .submenu > li > a:hover {
+  background-color: #2d3638;
+}
+.nav-list > li.active .submenu > li > a {
+    border-top-color: #454d4e;
+    background-color: #2d3638;
+}
+.nav-list > li.active .submenu > li > a:hover {
+  background-color: #14191a;
+}
+.nav-list > li > .submenu {
+  border-top-color: #505a5b;
+}
+.nav-list > li.active > .submenu {
+  border-top-color: #2f3e44;
+}
+.nav-list > li > .submenu > li > a {
+  color: #d9dfe6;
+}
+.nav-list > li > .submenu > li:hover > a {
+  color: #8ab4de;
+}
+.nav-list > li > .submenu > li.active > a {
+  	color: #b4bcc8;
+    background-color: #3e4b5c;
+}
+.nav-list > li > .submenu:before,
+.nav-list > li > .submenu > li:before {
+  border-color: #646c70;
+}
+.nav-list > li.active > .submenu:before,
+.nav-list > li.active > .submenu > li:before {
+  border-color: #3f4e54;
+}
+.nav-list > li .submenu li > .submenu li > a {
+  color: #d9dfe6;
+}
+.nav-list > li .submenu li > .submenu li:hover > a {
+  color: #8ab4de;
+}
+.nav-list > li .submenu li.open > a,
+.nav-list > li .submenu li > .submenu > li.open > a {
+  color: #85c0ec;
+}
+.nav-list > li .submenu li > .submenu li.active > a {
+  color: #61a8dd;
+}
+.nav-list > li .submenu li > .submenu li.active:hover > a {
+  color: #85c0ec;
+}
+.sidebar .nav-list > li.active.highlight,
+.sidebar .nav-list > li.active.highlight + li {
+  border-color: #506b7f;
+}
+.sidebar .nav-list > li.active.highlight + li:last-child {
+  border-bottom-color: #3f4e54;
+}
+.sidebar .nav-list > li.active.highlight > a:after {
+  border-right-color: transparent;
+  -moz-border-right-colors: none;
+  border-left-color: #141a1b;
+  -moz-border-left-colors: #141a1b;
+  border-width: 20px 0 20px 10px;
+  z-index: 1;
+  top: 0;
+  right: -10px;
+}
+.sidebar .nav-list > li.active.highlight > a:before {
+  border-left-color: #506b7f;
+  -moz-border-left-colors: #506b7f;
+  border-style: solid;
+  border-color: transparent;
+  border-width: 20px 0 20px 10px;
+  content: "";
+  position: absolute;
+  right: -11px;
+  top: 0;
+  z-index: 1;
+}
+.sidebar-shortcuts,
+.sidebar-shortcuts-mini {
+  background-color: #364150;
+  border-color: #3f4e54;
+}
+.sidebar > .nav-search {
+  background-color: #364150;
+  border-color: #3f4e54;
+}
+
+@media (min-width: 992px) {
+  .breadcrumbs.breadcrumbs-fixed {
+    border-bottom-width: 1px;
+  }
+}
+@media only screen and (max-width: 991px) {
+  .sidebar.responsive {
+    border-width: 0;
+    -webkit-box-shadow: none;
+    box-shadow: none;
+  }
+}
+.sidebar.menu-min{
+    width: 43px;
+}
+.sidebar.menu-min .sidebar-toggle{
+	padding-bottom:4px;
+}
+.sidebar.menu-min .nav-wrap-up .nav-wrap{
+	top:30px;
+}
+.sidebar.menu-min .sidebar-toggle>.ibps-icon {
+    font-size: 13px;
+    width:17px;
+    height:17px;
+    line-height: 14px;
+    border-width: 1px;
+}
+.sidebar.menu-min .nav-list > li.open > a {
+  background-color: #364150;
+  color: #bac2c8;
+}
+.sidebar.menu-min .nav-list > li.active > a:after {
+  border-width: 9px 6px;
+  top: 10px;
+}
+.sidebar.menu-min .nav-list > li.active.highlight > a:after {
+  border-width: 20px 0 20px 10px;
+  top: 0;
+}
+.sidebar.menu-min .nav-list > li.active:hover > a:after {
+  border-right-color: #242a2b;
+}
+
+.sidebar.menu-min .nav-list > li:hover > a {
+  color: #e1eaf1;
+}
+.sidebar.menu-min .nav-list > li > a > .menu-text {
+  background-color: #414b51;
+}
+.sidebar.menu-min .nav-list > li.active > a > .menu-text {
+  background-color: #242a2b;
+  border: 0px solid #3b4547;
+  border-width: 1px 1px 0;
+  border-left-color: #305675;
+}
+.sidebar.menu-min .nav-list > li.active > a:not(.dropdown-toggle) > .menu-text {
+  border-width: 1px;
+  border-top-color: #4a5c63;
+  border-bottom-color: #4a5c63;
+  border-right-color: #4a5c63;
+}
+.sidebar.menu-min .nav-list > li.open.active > a {
+  background-color: #141a1b;
+}
+.sidebar.menu-min .nav-list > li > .submenu:after {
+  display: none;
+}
+.sidebar .nav-list > li > .submenu {
+  background-color: #333d3f;
+  border-top-color: #5a606a;
+  border-top-width: 1px !important;
+}
+.sidebar.menu-min .sidebar-shortcuts-large {
+  background-color: #364150;
+  -webkit-box-shadow: none;
+  box-shadow: none;
+  border: 1px solid #4a5c63;
+  border-width: 0 1px 1px 0;
+  top: 0;
+}
+@media (max-width: 991px) {
+  .sidebar.responsive-min .nav-list > li.open > a {
+    background-color: #222a2d;
+    color: #bac2c8;
+  }
+  .sidebar.responsive-min .nav-list > li.active > a:after {
+    border-width: 9px 6px;
+    top: 10px;
+  }
+  .sidebar.responsive-min .nav-list > li.active.highlight > a:after {
+    border-width: 20px 0 20px 10px;
+    top: 0;
+  }
+  .sidebar.responsive-min .nav-list > li.active:hover > a:after {
+    border-right-color: #242a2b;
+  }
+  .sidebar.responsive-min .nav-list > li.active > a,
+  .sidebar.responsive-min .nav-list > li.active > a:hover {
+    background-color: #141a1b;
+    color: #7bb7e5;
+  }
+  .sidebar.responsive-min .nav-list > li:hover > a {
+    color: #e1eaf1;
+  }
+  .sidebar.responsive-min .nav-list > li > a > .menu-text {
+    background-color: #414b51;
+  }
+  .sidebar.responsive-min .nav-list > li.active > a > .menu-text {
+    background-color: #242a2b;
+    border: 0px solid #3b4547;
+    border-width: 1px 1px 0;
+    border-left-color: #305675;
+  }
+  .sidebar.responsive-min .nav-list > li.active > a:not(.dropdown-toggle) > .menu-text {
+    border-width: 1px;
+    border-top-color: #4a5c63;
+    border-bottom-color: #4a5c63;
+    border-right-color: #4a5c63;
+  }
+  .sidebar.responsive-min .nav-list > li.active:hover > a,
+  .sidebar.responsive-min .nav-list > li.active > a > .menu-text {
+    color: #7bb7e5;
+  }
+  .sidebar.responsive-min .nav-list > li.open.active > a {
+    background-color: #141a1b;
+  }
+  .sidebar.responsive-min .nav-list > li > a > .menu-text,
+  .sidebar.responsive-min .nav-list > li > .submenu {
+    border-width: 0;
+    border-left: 1px solid #181d1f;
+    -webkit-box-shadow: none;
+    box-shadow: none;
+  }
+  .sidebar.responsive-min .nav-list > li > .submenu {
+    border-top: 1px solid #3f4e54;
+  }
+  .sidebar.responsive-min .nav-list > li > .submenu:after {
+    display: none;
+  }
+  .sidebar.responsive-min .nav-list > li > .submenu {
+    background-color: #333d3f;
+    border-top-color: #5a606a;
+    border-top-width: 1px !important;
+  }
+  .sidebar.responsive-min .nav-list > li.active > .submenu {
+    background-color: #181e20;
+    border-top-color: #3b4547;
+    border-left-color: #305675;
+  }
+  .sidebar.responsive-min .nav-list > li > .arrow:after {
+    border-right-color: #414b51;
+    -moz-border-right-colors: #414b51;
+  }
+  .sidebar.responsive-min .nav-list > li > .arrow:before {
+    border-right-color: #111415;
+    -moz-border-right-colors: #242a2b;
+  }
+  .sidebar.responsive-min .nav-list > li.active > .arrow:after {
+    border-right-color: #242a2b;
+    -moz-border-right-colors: #242a2b;
+  }
+  .sidebar.responsive-min .nav-list > li.active > .arrow:before {
+    border-right-color: #50a0dd;
+    -moz-border-right-colors: #50a0dd;
+  }
+  .sidebar.responsive-min .sidebar-shortcuts-large {
+    background-color: #222a2d;
+    -webkit-box-shadow: none;
+    box-shadow: none;
+    border: 1px solid #4a5c63;
+    border-width: 0 1px 1px 0;
+    top: 0;
+  }
+}
+@media only screen and (min-width: 992px) {
+  .nav-list > li.active > .submenu li.hover > .submenu {
+    border-left-color: #475561;
+  }
+  .nav-list > li.active > .submenu li.hover > .submenu {
+    background-color: #171e1f;
+  }
+}
+@media only screen and (min-width: 992px) and (max-width: 991px) {
+  .sidebar.navbar-collapse .nav-list li.hover > .submenu {
+    padding-bottom: 0;
+  }
+  .sidebar.navbar-collapse .nav-list li.hover > .submenu {
+    border-top-color: #505a5b;
+  }
+  .sidebar.navbar-collapse .nav-list li.hover.active > .submenu {
+    border-top-color: #2f3e44;
+  }
+  .sidebar.navbar-collapse .nav-list li.hover.active > .submenu,
+  .sidebar.navbar-collapse .nav-list > li > .submenu li.hover > .submenu,
+  .sidebar.navbar-collapse .nav-list li.active > .submenu li.hover.active > .submenu {
+    border-left-width: 0;
+  }
+  .sidebar.navbar-collapse .nav-list > li > .submenu li.hover > .submenu {
+    padding: 0;
+  }
+  .sidebar.navbar-collapse .nav-list li li.hover > .submenu > li:first-child > a {
+    border-top-width: 1px;
+  }
+}
+.sidebar.navbar-collapse .nav-list > li .submenu > li.hover:hover > a {
+  background-color: #2d3638;
+}
+.sidebar.navbar-collapse .nav-list > li.active .submenu > li.hover:hover > a {
+  background-color: #2d3638;
+}
+@media only screen and (min-width: 992px) {
+  .sidebar:not(.navbar-collapse) .nav-list > li .submenu > li.hover:hover > a {
+    background-color: #2d3638;
+  }
+  .sidebar:not(.navbar-collapse) .nav-list > li.active .submenu > li.hover:hover > a {
+    background-color: #14191a;
+  }
+}
+.nav-list li > .arrow:after {
+  border-right-color: #353c3d;
+  -moz-border-right-colors: #353c3d;
+}
+.nav-list li > .arrow:before {
+  border-right-color: #1d2122;
+  -moz-border-right-colors: #1d2122;
+}
+.nav-list > li.active > .arrow:after {
+  border-right-color: #171e1f;
+  -moz-border-right-colors: #171e1f;
+}
+.nav-list > li.active > .arrow:before {
+  border-right-color: #50a0dd;
+  -moz-border-right-colors: #50a0dd;
+}
+.nav-list > li.active > .submenu li.hover > .arrow:before {
+  border-right-color: #4f6e86;
+  -moz-border-right-colors: #8fb6d5;
+}
+.nav-list > li.active > .submenu li.hover.active > .arrow:before {
+  border-right-color: #305675;
+  -moz-border-right-colors: #2290e9;
+}
+.nav-list > li.active > .submenu li.hover > .arrow:after {
+  border-right-color: #171e1f;
+  -moz-border-right-colors: #171e1f;
+}
+.nav-list li.pull_up > .arrow:after {
+  border-right-color: #353c3d !important;
+  -moz-border-right-colors: #353c3d !important;
+}
+.nav-list li.pull_up > .arrow:before {
+  border-right-color: #1d2122 !important;
+  -moz-border-right-colors: #1d2122 !important;
+}
+.nav-list li.pull_up.active > .arrow:after {
+  border-right-color: #171e1f !important;
+  -moz-border-right-colors: #171e1f !important;
+}
+.nav-list li.pull_up.active > .arrow:before {
+  border-right-color: #50a0dd !important;
+  -moz-border-right-colors: #50a0dd !important;
+}
+.main-container .menu-toggler {
+  background-color: #444444;
+}
+.main-container .menu-toggler:before {
+  border-top-color: #87b87f;
+  border-bottom-color: #6fb3e0;
+}
+.main-container .menu-toggler:after {
+  border-top-color: #ffa24d;
+  border-bottom-color: #d15b47;
+}
+.main-container .menu-toggler > .toggler-text {
+  border-top-color: #444444;
+  -moz-border-top-colors: #444444;
+}
+.skin-1.display {
+  background-color: #5d82a2;
+}
+.skin-1.display:before {
+  border-top-color: #b5d3b0;
+  border-bottom-color: #aed4ee;
+}
+.skin-1.display:after {
+  border-top-color: #ffca9a;
+  border-bottom-color: #e09284;
+}
+.skin-1.display > .toggler-text {
+  border-top-color: #5d82a2;
+  -moz-border-top-colors: #5d82a2;
+}
+.navbar .navbar-toggle {
+  background-color: #4D9DCC;
+}
+.navbar .navbar-toggle:focus {
+  background-color: #4D9DCC;
+  border-color: transparent;
+}
+.navbar .navbar-toggle:hover {
+  background-color: #3992c6;
+  border-color: rgba(255, 255, 255, 0.1);
+}
+.navbar .navbar-toggle.display,
+.navbar .navbar-toggle[data-toggle=collapse]:not(.collapsed) {
+  background-color: #3384b3;
+  box-shadow: inset 1px 1px 2px 0 rgba(0, 0, 0, 0.25);
+  border-color: rgba(255, 255, 255, 0.35);
+}
+@media only screen and (min-width: 768px) {
+  .container.main-container:before {
+    box-shadow: 0 0 0 1px rgba(255, 255, 255, 0.1);
+  }
+}
+.nav-list>li:hover:before{
+	content: "";
+	position: absolute;
+	top: 0;
+	left: 0;
+	z-index: 1;
+	bottom: 0;
+	width: 3px;
+	background-color: #629cc9
+}
+.top23{
+	top:23px;
+}
+/*.nav-list li.active>a:after {
+	display: block;
+	content: "";
+	position: absolute;
+	right: 0;
+	top: 15px;
+	border: 8px solid transparent;
+	border-width: 14px 10px;
+    border-right-color: #FFF;
+    z-index:99;
+}*/
+.nav-list li.hover-show>.arrow {
+    display: block;
+    position: absolute;
+    top: 8px;
+    right: 1px;
+    z-index: 100;
+}
+.nav-list li.hover-show>.arrow:before, .nav-list li.hover-show>.arrow:after {
+    border: 1px solid transparent;
+    display: block;
+    height: 0;
+    width: 0;
+    position: absolute;
+    left: -19px;
+    top: 0;
+    right: auto;
+    bottom: auto;
+    content: "";
+    border-width: 10px;
+  
+}
+.nav-list li.hover-show>.arrow:before {
+    border-right-color: #000;
+    -moz-border-right-colors: #000;
+    left:-20px;
+}
+.nav-list li.hover-show>.arrow:after {
+    border-right-color: #353c3d;
+    -moz-border-right-colors: #353c3d;
+}
+.nav-list li.active.hover-show>a:after {
+	display: none;
+}
+.menu-min li.hover-show>.arrow:after{
+	 border-right-color: #414b51;
+    -moz-border-right-colors: #414b51;
+}
+.nav-list li.hover>.submenu {
+		position: absolute;
+		left: 100%;
+		margin-left: -1px;
+		top: -10px;
+		bottom: auto;
+		z-index:99;
+		width: 176px;
+		border: 1px solid #000000;
+		display: none;
+		
+}
+.label-important, .label.label-important, .badge.badge-important, .badge-important {
+    background-color: #d15b47;
+}
+.label-success, .label.label-success, .badge.badge-success, .badge-success {
+    background-color: #82af6f;
+}
+.menutext{
+	text-shadow:0 1px 0 rgba(0, 0, 0, .25);
+}
+.navbar-header a:hover{
+	text-decoration:none;
+	color:white;
+}
+.navbar-nav>li>a:hover{
+	background:#202b37;
+	color:#fff;
+}
+.ibps-nav>li.purple>a {
+	background-color: #892e65
+}
+
+.ibps-nav>li.purple>a:hover,.ibps-nav>li.purple>a:focus,.ibps-nav>li.open.purple>a
+	{
+	background-color: #762c59
+}
+
+.ibps-nav>li.green>a {
+	background-color: #2e8965
+}
+
+.ibps-nav>li.green>a:hover,.ibps-nav>li.green>a:focus,.ibps-nav>li.open.green>a
+	{
+	background-color: #2c7659
+}
+
+.ibps-nav>li.light-blue>a {
+	background-color: #62a8d1
+}
+
+.ibps-nav>li.light-blue>a:hover,.ibps-nav>li.light-blue>a:focus,.ibps-nav>li.open.light-blue>a
+	{
+		color:#fff;
+	background-color: #579ec8
+}
+.sidebar.menu-min .nav-list>li>a{
+	padding:7px 5px;
+	overflow: inherit;
+}
+.sidebar.menu-min .nav-list>li>a>.menu-text{
+	display: none;
+    text-align: left;
+    position: absolute;
+    top: -5px;
+    left: 37px;
+    z-index: 100;
+    width: 176px;
+    height: 43px;
+    line-height: 43px;
+    padding-left: 12px;
+    border-left:1px solid #181d1f;
+}
+.menu-icon{
+	width:10px;
+	height:10px;
+	line-height: inherit;
+	vertical-align:sub;
+}
+.menu-min .nav-list li.hover>.submenu{
+	top:41px;
+}
+.menu-min .nav-list > li.hover-show>a .menu-text {
+display:inline-block;
+}
+/*内容body*/
+/*CONTENTTABS*/
+.page-tabs a.active {
+    background: #ff5e5f;
+    color: #fff;
+}
+.breadcrumbs {
+  border-width: 0;
+  background-color: #f0f0f0;
+}
+.content-tabs button:hover {
+	background: #fafafa;
+}
+nav.page-tabs {
+	overflow: hidden;
+	height:32px;
+}
+.page-tabs a i:hover ,.page-tabs a.active i:hover  {
+	color: #c00 !important;
+}
+.content-tabs .roll-nav:hover {
+	color: #777;
+	background: #f2f2f2;
+	cursor: pointer;
+}
+.page-tabs a {
+	color: #999;
+	border-radius: 4px;
+}
+.roll-right.J_tabClose {
+	right: 0;
+	width: 80px;
+}
+.roll-right.J_tabExit {
+	background: #fff;
+	height: 40px;
+	width: 60px;
+	outline: none;
+}
+.dropdown-menu-right {
+	left: auto;
+}
+.J_mainContent {
+    height: calc(100% - 30px);
+}
+.tabs-container .nav-tabs>li.active>a, .tabs-container .nav-tabs>li.active>a:hover, .tabs-container .nav-tabs>li.active>a:focus {
+    border-left: 1px solid #e7eaec;
+    border-right: 1px solid #e7eaec;
+    border-top: 3px solid #ff5f60;
+    border-bottom-color: #fff;
+    color:#ff5f60;
+}
+.ops_itemDiv{
+	border-radius: 8px;
+    box-shadow: 2px 2px 5px #969696;
+    padding: 2px;
+    right: 10px;
+    top: -8px;
+	display:none;
+}
diff --git a/pluss-manage-page/src/main/resources/static/resources/css/screen/reset.css b/pluss-manage-page/src/main/resources/static/resources/css/screen/reset.css
new file mode 100644
index 0000000..55539fd
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/css/screen/reset.css
@@ -0,0 +1,2667 @@
+/*----main.css v1.0.6(2015.05.27) 作者：宣梦梦----*/
+/**********单独设置项**********/
+
+a {
+	text-decoration: none;
+	display: block;
+	color: #333
+}
+::-webkit-scrollbar {
+    width: 6px;
+    height: 6px;
+    background-color: #f5f5f5;
+    }
+    ::-webkit-scrollbar-thumb {
+    background-color: #3d4a5dd9;
+}
+:active, :focus, :visited, a, a:active, a:focus, a:visited,a:hover{
+    outline: 0;
+    text-decoration: none;
+}
+::-webkit-scrollbar-track {
+	background-color: #F5F5F5;
+}
+
+::-webkit-scrollbar {
+    width: 6px;
+    height: 9px;
+	background-color: #F5F5F5;
+}
+
+::-webkit-scrollbar-thumb {
+	background-color: #999;
+}
+.white {
+	color: #FFF
+}
+
+.red {
+	color: #d75750
+}
+
+.green {
+	color: #6ae5e2
+}
+
+.blue {
+	color: #00b4ff
+}
+
+.dblue {
+	color: #3669c1
+}
+
+.yellow {
+	color: #bdbd3f
+}
+
+.lblue {
+	color: #798eab;
+}
+.dddbg {
+	background-color: #f9f9f9
+}
+
+.black {
+	color: #000
+}
+
+.brown {
+	color: #3c1c05
+}
+
+.dgray {
+	color: #AEB2B7
+}
+
+.mgray {
+	color: #666
+}
+
+.bgray {
+	color: #aeb2b7
+}
+
+.lgray {
+	color: #9c9c9c
+}
+
+.orange {
+	  background-image:-webkit-linear-gradient(bottom,#e4be70,#eb9e47); 
+    -webkit-background-clip:text; 
+    -webkit-text-fill-color:transparent; 
+}
+
+.whitebg {
+	background: #FFF
+}
+
+.gwhitebg {
+	background: #F6F6F6
+}
+
+.redbg {
+	background: #F00
+}
+
+.greenbg {
+	background: #34cb1c
+}
+
+.lgreenbg {
+	background: #1FB5AD
+}
+
+.bluebg {
+	background: #0090ff
+}
+.purple {
+	color: #6379bb
+}
+.yellowbg {
+	background: #fec400
+}
+
+.orangebg {
+	background: #FA8564
+}
+
+.purplebg {
+	background: #a52bf2
+}
+
+.lbluebg {
+	background: #F2F9FD
+}
+
+.blackbg {
+	background: #000
+}
+
+.brownbg {
+	background: #3c1c05
+}
+
+.graybg {
+	background: gray
+}
+
+.dgraybg {
+	background: #444
+}
+
+.mgraybg {
+	background: #c7cbd6
+}
+
+.bgraybg {
+	background: #32323A
+}
+
+.lgraybg {
+	background: #f2f2f2
+}
+
+.agraybg {
+	background-color: #E0E1E7
+}
+.dbluebg{
+	background-color:#2b3643;
+}
+
+/**********初始化**********/
+
+* {
+	margin: 0;
+	padding: 0
+}
+
+address,
+cite,
+dfn,
+em,
+i,
+var,
+caption {
+	font-style: normal
+}
+
+code,
+kbd,
+pre,
+samp {
+	font-family: courier new, courier, monospace
+}
+
+sup {
+	vertical-align: text-top
+}
+
+sub {
+	vertical-align: text-bottom
+}
+
+small {
+	font-size: 12px
+}
+
+legend {
+	color: #000
+}
+
+p {
+	word-wrap: break-word
+}
+
+q:before,
+q:after {
+	content: '';
+	cursor: pointer
+}
+
+ul,
+ol,
+li {
+	list-style: none
+}
+
+a,
+a img,
+button {
+	cursor: pointer
+}
+
+button,
+input,
+select,
+textarea {
+	font-size: 100%;
+	
+}
+input:-internal-autofill-selected{
+	box-shadow: 0 0 0px 1000px white inset;
+}
+table {
+	border-collapse: collapse;
+	border-spacing: 0
+}
+
+img,
+input,
+select,
+button {
+	border: 0;
+	vertical-align: middle
+}
+
+a,
+area {
+	blr: expression_r(this.onFocus=this.blur())
+}
+
+a:focus,
+input:focus,
+button:focus {
+	outline: 0
+}
+
+::-ms-clear {
+	display: none
+}
+
+::-ms-reveal {
+	display: none
+}
+
+body {
+	font-size:0.2rem;
+	font-family: "Helvetica Neue", Helvetica, Tahoma, Arial, 'Microsoft Yahei', 'Hiragino Sans GB', 'WenQuanYi Micro Hei', sans-serif;
+	color: #8a8a8a;
+	position: relative
+}
+select {
+	outline: 0
+}
+
+ul {
+	list-style: none
+}
+
+a {
+	text-decoration: none
+}
+
+textarea {
+	resize: none;
+	border: none;
+	outline: 0;
+}
+
+/**********块元素设置**********/
+
+.dline {
+	display: inline
+}
+
+.dnone {
+	display: none
+}
+
+.dblock {
+	display: block
+}
+
+.dlblock {
+	display: inline-block;
+}
+
+
+/**********字体大小**********/
+
+.f12 {
+	font-size: 12px
+}
+.f13 {
+	font-size: 13px
+}
+.f14 {
+	font-size: .4rem
+}
+
+.f16 {
+	font-size: 1rem
+}
+
+.f18 {
+	font-size: 18px
+}
+
+.f20 {
+	font-size: 20px
+}
+
+.f22 {
+	font-size: 22px
+}
+
+.f24 {
+	font-size: 1.4rem
+}
+
+.f26 {
+	font-size: 26px
+}
+
+.f28 {
+	font-size: 28px
+}
+
+.f30 {
+	font-size: 30px
+}
+
+.f32 {
+	font-size: 32px
+}
+
+.f48 {
+	font-size: 48px
+}
+
+.f64 {
+	font-size: 64px
+}
+
+.f72 {
+	font-size: 72px
+}
+
+
+/**********字体粗细**********/
+
+.fw400 {
+	font-weight: 400
+}
+
+.fw600 {
+	font-weight: 600
+}
+
+.fw800 {
+	font-weight: 800
+}
+
+
+/**********行高**********/
+.lh25 {
+	line-height: 25px
+}
+.lh50 {
+	line-height: 50px
+}
+
+.lh80 {
+	line-height: 80px
+}
+
+.lh100 {
+	line-height: 100%
+}
+
+.lh150 {
+	line-height: 150%
+}
+
+.lh180 {
+	line-height: 180%
+}
+
+.lh200 {
+	line-height: 200%
+}
+
+.lh250 {
+	line-height: 250%
+}
+
+.lh300 {
+	line-height: 300%
+}
+
+
+/**********字体描述**********/
+
+.unl {
+	text-decoration: underline
+}
+
+.crossline {
+	text-decoration: line-through
+}
+
+.nounl {
+	text-decoration: none
+}
+
+
+/**********字体**********/
+
+.simsun {
+	font-family: \5B8B\4F53
+}
+
+.simhei {
+	font-family: \9ED1\4F53
+}
+
+.yahei {
+	font-family: \5FAE\8F6F\96C5\9ED1
+}
+
+
+/**********首行缩进**********/
+
+.tit0 {
+	text-indent: 0
+}
+
+.tit1 {
+	text-indent: 1em
+}
+
+.tit2 {
+	text-indent: 2em
+}
+
+.tit3 {
+	text-indent: 3em
+}
+
+.tit4 {
+	text-indent: 4em
+}
+
+.tit5 {
+	text-indent: 5em
+}
+
+.tit6 {
+	text-indent: 6em
+}
+
+.tit7 {
+	text-indent: 7em
+}
+
+.tit8 {
+	text-indent: 8em
+}
+
+.tit9 {
+	text-indent: 9em
+}
+
+
+/**********文字水平对齐**********/
+
+.textl {
+	text-align: left
+}
+
+.textc {
+	text-align: center
+}
+
+.textr {
+	text-align: right
+}
+
+
+/**********文字垂直对齐**********/
+
+.vt {
+	vertical-align: top
+}
+
+.vm {
+	vertical-align: middle
+}
+
+.vb {
+	vertical-align: bottom
+}
+
+
+/**********容器浮动**********/
+
+.fl {
+	float: left
+}
+
+.fr {
+	display: block !important;
+	float: right
+}
+
+.fc {
+	margin: 0 auto
+}
+
+
+/**********外间距**********/
+
+.mg5 {
+	margin: 2px
+}
+
+.mg5 {
+	margin: 5px
+}
+
+.mg10 {
+	margin: 10px
+}
+
+.mg15 {
+	margin: 15px
+}
+
+.mg20 {
+	margin: 20px
+}
+
+.mg25 {
+	margin: 25px
+}
+
+.mg30 {
+	margin: 30px
+}
+
+
+/**********上外间距**********/
+
+.mt1 {
+	margin-top: 1px
+}
+
+.mt2 {
+	margin-top: 2px
+}
+
+.mt3 {
+	margin-top: 3px
+}
+
+.mt4 {
+	margin-top: 4px
+}
+
+.mt5 {
+	margin-top: 5px
+}
+
+.mt6 {
+	margin-top: 6px
+}
+
+.mt7 {
+	margin-top: 7px
+}
+
+.mt8 {
+	margin-top: 8px
+}
+
+.mt9 {
+	margin-top: 9px
+}
+
+.mt10 {
+	margin-top: 10px
+}
+
+.mt15 {
+	margin-top: 15px
+}
+
+.mt20 {
+	margin-top: 20px
+}
+
+.mt25 {
+	margin-top: 25px
+}
+
+.mt30 {
+	margin-top: 30px
+}
+
+.mt35 {
+	margin-top: 35px
+}
+
+.mt40 {
+	margin-top: 40px
+}
+
+.mt45 {
+	margin-top: 45px
+}
+
+.mt50 {
+	margin-top: 50px
+}
+
+.mt55 {
+	margin-top: 55px
+}
+
+.mt60 {
+	margin-top: 60px
+}
+
+.mt65 {
+	margin-top: 65px
+}
+
+.mt70 {
+	margin-top: 70px
+}
+
+.mt75 {
+	margin-top: 75px
+}
+
+.mt80 {
+	margin-top: 80px
+}
+
+.mt85 {
+	margin-top: 85px
+}
+
+.mt90 {
+	margin-top: 90px
+}
+
+.mt95 {
+	margin-top: 90px
+}
+
+.mt100 {
+	margin-top: 100px
+}
+
+.mt200 {
+	margin-top: 200px
+}
+
+
+/**********左外间距**********/
+.ml0{
+	margin-left: 0px
+}
+.ml1 {
+	margin-left: 1px
+}
+
+.ml2 {
+	margin-left: 2px
+}
+
+.ml3 {
+	margin-left: 3px
+}
+
+.ml4 {
+	margin-left: 4px
+}
+
+.ml5 {
+	margin-left: 5px
+}
+
+.ml6 {
+	margin-left: 6px
+}
+
+.ml7 {
+	margin-left: 7px
+}
+
+.ml8 {
+	margin-left: 8px
+}
+
+.ml9 {
+	margin-left: 9px
+}
+
+.ml10 {
+	margin-left: 10px
+}
+
+.ml15 {
+	margin-left: 15px
+}
+
+.ml20 {
+	margin-left: 20px
+}
+
+.ml25 {
+	margin-left: 25px
+}
+
+.ml30 {
+	margin-left: 30px
+}
+
+.ml35 {
+	margin-left: 35px
+}
+
+.ml40 {
+	margin-left: 40px
+}
+
+.ml45 {
+	margin-left: 45px
+}
+.ml50 {
+	margin-left: 50px
+}
+
+.ml55 {
+	margin-left: 55px
+}
+
+.ml60 {
+	margin-left: 60px
+}
+
+.ml65 {
+	margin-left: 65px
+}
+
+.ml70 {
+	margin-left: 70px
+}
+
+.ml75 {
+	margin-left: 75px
+}
+
+.ml80 {
+	margin-left: 80px
+}
+
+.ml85 {
+	margin-left: 85px
+}
+
+.ml90 {
+	margin-left: 90px
+}
+
+.ml95 {
+	margin-left: 95px
+}
+
+.ml100 {
+	margin-left: 100px
+}
+.ml105 {
+	margin-left: 105px
+}
+.ml120 {
+	margin-left: 120px
+}
+.ml130 {
+	margin-left: 130px
+}
+.ml140 {
+	margin-left: 140px
+}
+.ml190 {
+	margin-left: 190px
+}
+.ml240 {
+	margin-left: 240px
+}
+
+.ml330 {
+	margin-left: 330px
+}
+
+
+/**********右外间距**********/
+.mr0 {
+	margin-right: 0px
+}
+.mr1 {
+	margin-right: 1px
+}
+
+.mr2 {
+	margin-right: 2px
+}
+
+.mr3 {
+	margin-right: 3px
+}
+
+.mr4 {
+	margin-right: 4px
+}
+
+.mr5 {
+	margin-right: 5px
+}
+
+.mr6 {
+	margin-right: 6px
+}
+
+.mr7 {
+	margin-right: 7px
+}
+
+.mr8 {
+	margin-right: 8px
+}
+
+.mr9 {
+	margin-right: 9px
+}
+
+.mr10 {
+	margin-right: 10px
+}
+
+.mr15 {
+	margin-right: 15px
+}
+
+.mr20 {
+	margin-right: 20px
+}
+
+.mr25 {
+	margin-right: 25px
+}
+
+.mr30 {
+	margin-right: 30px
+}
+
+.mr35 {
+	margin-right: 35px
+}
+
+.mr40 {
+	margin-right: 40px
+}
+
+.mr45 {
+	margin-right: 45px
+}
+
+.mr50 {
+	margin-right: 50px
+}
+
+.mr55 {
+	margin-right: 55px
+}
+
+.mr60 {
+	margin-right: 60px
+}
+
+.mr65 {
+	margin-right: 65px
+}
+
+.mr70 {
+	margin-right: 70px
+}
+
+.mr75 {
+	margin-right: 75px
+}
+
+.mr80 {
+	margin-right: 80px
+}
+
+.mr85 {
+	margin-right: 85px
+}
+
+.mr90 {
+	margin-right: 90px
+}
+
+.mr95 {
+	margin-right: 95px
+}
+
+.mr100 {
+	margin-right: 100px
+}
+
+.mr200 {
+	margin-right: 200px
+}
+
+
+/**********下外间距**********/
+
+.mb1 {
+	margin-bottom: 1px
+}
+
+.mb2 {
+	margin-bottom: 2px
+}
+
+.mb3 {
+	margin-bottom: 3px
+}
+
+.mb4 {
+	margin-bottom: 4px
+}
+
+.mb5 {
+	margin-bottom: 5px
+}
+
+.mb6 {
+	margin-bottom: 6px
+}
+
+.mb7 {
+	margin-bottom: 7px
+}
+
+.mb8 {
+	margin-bottom: 8px
+}
+
+.mb9 {
+	margin-bottom: 9px
+}
+
+.mb10 {
+	margin-bottom: 10px
+}
+
+.mb15 {
+	margin-bottom: 15px
+}
+
+.mb20 {
+	margin-bottom: 20px
+}
+
+.mb25 {
+	margin-bottom: 25px
+}
+
+.mb30 {
+	margin-bottom: 30px
+}
+
+.mb35 {
+	margin-bottom: 35px
+}
+
+.mb40 {
+	margin-bottom: 40px
+}
+
+.mb45 {
+	margin-bottom: 45px
+}
+
+.mb50 {
+	margin-bottom: 50px
+}
+
+.mb55 {
+	margin-bottom: 55px
+}
+
+.mb60 {
+	margin-bottom: 60px
+}
+
+.mb65 {
+	margin-bottom: 65px
+}
+
+.mb70 {
+	margin-bottom: 70px
+}
+
+.mb75 {
+	margin-bottom: 75px
+}
+
+.mb80 {
+	margin-bottom: 80px
+}
+
+.mb85 {
+	margin-bottom: 85px
+}
+
+.mb90 {
+	margin-bottom: 90px
+}
+
+.mb100 {
+	margin-bottom: 100px
+}
+
+.mb200 {
+	margin-bottom: 200px
+}
+
+
+/**********内间距**********/
+
+.pd2 {
+	padding: 2px
+}
+
+.pd5 {
+	padding: 5px
+}
+
+.pd7 {
+	padding: 7px
+}
+
+.pd10 {
+	padding: 10px
+}
+
+.pd15 {
+	padding: 15px
+}
+
+.pd20 {
+	padding: 20px
+}
+
+.pd25 {
+	padding: 25px
+}
+
+.pd30 {
+	padding: 30px
+}
+
+.pd40 {
+	padding: 40px
+}
+
+
+/**********上内间距**********/
+
+.pt1 {
+	padding-top: 1px
+}
+
+.pt2 {
+	padding-top: 2px
+}
+
+.pt3 {
+	padding-top: 3px
+}
+
+.pt4 {
+	padding-top: 4px
+}
+
+.pt5 {
+	padding-top: 5px
+}
+
+.pt6 {
+	padding-top: 6px
+}
+
+.pt7 {
+	padding-top: 7px
+}
+
+.pt8 {
+	padding-top: 8px
+}
+
+.pt9 {
+	padding-top: 9px
+}
+
+.pt10 {
+	padding-top: 10px
+}
+.pt12 {
+	padding-top: 12px
+}
+.pt13 {
+	padding-top: 13px
+}
+
+.pt15 {
+	padding-top: 15px
+}
+
+.pt20 {
+	padding-top: 20px
+}
+
+.pt25 {
+	padding-top: 25px
+}
+
+.pt30 {
+	padding-top: 30px
+}
+
+.pt35 {
+	padding-top: 35px
+}
+
+.pt40 {
+	padding-top: 40px
+}
+
+.pt45 {
+	padding-top: 45px
+}
+
+.pt50 {
+	padding-top: 50px
+}
+
+
+/**********左内间距**********/
+
+.pl1 {
+	padding-left: 1px
+}
+
+.pl2 {
+	padding-left: 2px
+}
+
+.pl3 {
+	padding-left: 3px
+}
+
+.pl4 {
+	padding-left: 4px
+}
+
+.pl5 {
+	padding-left: 5px
+}
+
+.pl6 {
+	padding-left: 6px
+}
+
+.pl7 {
+	padding-left: 7px
+}
+
+.pl8 {
+	padding-left: 8px
+}
+
+.pl9 {
+	padding-left: 9px
+}
+
+.pl10 {
+	padding-left: 10px
+}
+
+.pl15 {
+	padding-left: 15px
+}
+
+.pl20 {
+	padding-left: 20px
+}
+
+.pl25 {
+	padding-left: 25px
+}
+
+.pl30 {
+	padding-left: 30px
+}
+
+.pl35 {
+	padding-left: 35px
+}
+
+.pl40 {
+	padding-left: 40px
+}
+
+.pl45 {
+	padding-left: 45px
+}
+
+.pl50 {
+	padding-left: 50px
+}
+
+.pl60 {
+	padding-left: 60px
+}
+
+.pl70 {
+	padding-left: 70px
+}
+
+.pl80 {
+	padding-left: 80px
+}
+
+.pl90 {
+	padding-left: 90px
+}
+.pl190 {
+	padding-left: 190px
+}
+
+
+/**********右内间距**********/
+
+.pr1 {
+	padding-right: 1px
+}
+
+.pr2 {
+	padding-right: 2px
+}
+
+.pr3 {
+	padding-right: 3px
+}
+
+.pr4 {
+	padding-right: 4px
+}
+
+.pr5 {
+	padding-right: 5px
+}
+
+.pr6 {
+	padding-right: 6px
+}
+
+.pr7 {
+	padding-right: 7px
+}
+
+.pr8 {
+	padding-right: 8px
+}
+
+.pr9 {
+	padding-right: 9px
+}
+
+.pr10 {
+	padding-right: 10px
+}
+
+.pr15 {
+	padding-right: 15px
+}
+
+.pr20 {
+	padding-right: 20px
+}
+
+.pr25 {
+	padding-right: 25px
+}
+
+.pr30 {
+	padding-right: 30px
+}
+
+.pr35 {
+	padding-right: 35px
+}
+
+.pr40 {
+	padding-right: 40px
+}
+
+.pr45 {
+	padding-right: 45px
+}
+
+.pr50 {
+	padding-right: 50px
+}
+
+.pr60 {
+	padding-right: 60px
+}
+
+.pr70 {
+	padding-right: 70px
+}
+
+.pr80 {
+	padding-right: 80px
+}
+
+.pr90 {
+	padding-right: 90px
+}
+
+.pr100 {
+	padding-right: 100px
+}
+
+.pr150 {
+	padding-right: 150px
+}
+
+.pr185 {
+	padding-right: 185px
+}
+
+.pr200 {
+	padding-right: 200px
+}
+
+
+/**********下内间距**********/
+
+.pb1 {
+	padding-bottom: 1px
+}
+
+.pb2 {
+	padding-bottom: 2px
+}
+
+.pb3 {
+	padding-bottom: 3px
+}
+
+.pb4 {
+	padding-bottom: 4px
+}
+
+.pb5 {
+	padding-bottom: 5px
+}
+
+.pb6 {
+	padding-bottom: 6px
+}
+
+.pb7 {
+	padding-bottom: 7px
+}
+
+.pb8 {
+	padding-bottom: 8px
+}
+
+.pb9 {
+	padding-bottom: 9px
+}
+
+.pb10 {
+	padding-bottom: 10px
+}
+.pb12 {
+	padding-bottom: 12px
+}
+.pb13 {
+	padding-bottom: 13px
+}
+.pb15 {
+	padding-bottom: 15px
+}
+
+.pb20 {
+	padding-bottom: 20px
+}
+
+.pb25 {
+	padding-bottom: 25px
+}
+
+.pb30 {
+	padding-bottom: 30px
+}
+
+.pb35 {
+	padding-bottom: 35px
+}
+
+.pb40 {
+	padding-bottom: 40px
+}
+
+.pb45 {
+	padding-bottom: 45px
+}
+
+.pb50 {
+	padding-bottom: 50px
+}
+
+
+/**********宽度**********/
+
+.w10 {
+	width: 10px
+}
+
+.w15 {
+	width: 15px
+}
+
+.w20 {
+	width: 20px
+}
+
+.w25 {
+	width: 25px
+}
+
+.w30 {
+	width: 30px
+}
+
+.w36 {
+	width: 36px
+}
+
+.w40 {
+	width: 40px
+}
+
+.w50 {
+	width: 50px
+}
+
+.w60 {
+	width: 60px
+}
+
+.w70 {
+	width: 70px
+}
+
+.w80 {
+	width: 80px
+}
+
+.w90 {
+	width: 90px
+}
+
+.w100 {
+	width: 100px
+}
+.w105 {
+	width: 105px
+}
+.w110 {
+	width: 110px
+}
+
+.w120 {
+	width: 120px
+}
+
+.w130 {
+	width: 130px
+}
+
+.w140 {
+	width: 140px
+}
+
+.w150 {
+	width: 150px
+}
+
+.w160 {
+	width: 160px
+}
+
+.w170 {
+	width: 170px
+}
+
+.w180 {
+	width: 180px
+}
+
+.w190 {
+	width: 190px
+}
+
+.w200 {
+	width: 200px
+}
+
+.w210 {
+	width: 210px
+}
+
+.w220 {
+	width: 220px
+}
+
+.w230 {
+	width: 230px
+}
+
+.w240 {
+	width: 240px
+}
+
+.w250 {
+	width: 250px
+}
+
+.w260 {
+	width: 260px
+}
+
+.w270 {
+	width: 270px
+}
+
+.w280 {
+	width: 280px
+}
+
+.w290 {
+	width: 290px
+}
+
+.w300 {
+	width: 300px
+}
+
+.w320 {
+	width: 320px
+}
+
+.w400 {
+	width: 400px
+}
+
+.w500 {
+	width: 500px
+}
+
+.w600 {
+	width: 600px
+}
+
+.w700 {
+	width: 700px
+}
+
+.w800 {
+	width: 800px
+}
+
+.w900 {
+	width: 900px
+}
+
+.w1000 {
+	width: 1000px
+}
+
+
+/**********高度**********/
+
+.h10 {
+	height: 10px
+}
+
+.h15 {
+	height: 15px
+}
+
+.h20 {
+	height: 20px
+}
+
+.h25 {
+	height: 25px
+}
+
+.h30 {
+	height: 30px
+}
+.h32 {
+	height: 32px
+}
+.h35 {
+	height: 35px
+}
+
+.h40 {
+	height: 40px
+}
+
+.h45 {
+	height: 45px
+}
+
+.h50 {
+	height: 50px
+}
+
+.h55 {
+	height: 55px
+}
+
+.h60 {
+	height: 43px
+}
+
+.h65 {
+	height: 65px
+}
+
+.h70 {
+	height: 70px
+}
+
+.h75 {
+	height: 75px
+}
+
+.h80 {
+	height: 80px
+}
+
+.h85 {
+	height: 85px
+}
+
+.h90 {
+	height: 90px
+}
+
+.h95 {
+	height: 95px
+}
+
+.h100 {
+	height: 100px
+}
+
+.h110 {
+	height: 110px
+}
+
+.h120 {
+	height: 120px
+}
+
+.h130 {
+	height: 130px
+}
+
+.h140 {
+	height: 140px
+}
+
+.h150 {
+	height: 150px
+}
+
+.h160 {
+	height: 160px
+}
+
+.h170 {
+	height: 170px
+}
+
+.h180 {
+	height: 180px
+}
+
+.h190 {
+	height: 190px
+}
+
+.h200 {
+	height: 200px
+}
+
+.h210 {
+	height: 210px
+}
+
+.h220 {
+	height: 220px
+}
+
+.h230 {
+	height: 230px
+}
+
+.h240 {
+	height: 240px
+}
+
+.h250 {
+	height: 250px
+}
+
+.h260 {
+	height: 260px
+}
+
+.h270 {
+	height: 270px
+}
+
+.h280 {
+	height: 280px
+}
+
+.h290 {
+	height: 290px
+}
+
+.h300 {
+	height: 300px
+}
+.h350 {
+	height: 350px
+}
+
+.h400 {
+	height: 400px
+}
+
+.h500 {
+	height: 500px
+}
+
+.h600 {
+	height: 600px
+}
+
+.h700 {
+	height: 700px
+}
+
+.h800 {
+	height: 800px
+}
+
+.h900 {
+	height: 900px
+}
+
+
+/**********边框**********/
+
+.bdf {
+	border: 1px solid #fff
+}
+
+.bde {
+	border: 1px solid #eee
+}
+
+.bdd {
+	border: 1px solid #ddd
+}
+
+.bdc {
+	border: 1px solid #ccc
+}
+
+.bdb {
+	border: 1px solid #bbb
+}
+.bdd {
+	border: 1px solid #ddd
+}
+
+.bda {
+	border: 1px solid #aaa
+}
+
+.bd9 {
+	border: 1px solid #999
+}
+
+.bd8 {
+	border: 1px solid #888
+}
+
+.bd7 {
+	border: 1px solid #777
+}
+
+.bd6 {
+	border: 1px solid #666
+}
+
+.bd5 {
+	border: 1px solid #555
+}
+
+.bd4 {
+	border: 1px solid #444
+}
+
+.bd3 {
+	border: 1px solid #333
+}
+
+.bd2 {
+	border: 1px solid #222
+}
+
+.bd1 {
+	border: 1px solid #111
+}
+
+.bd0 {
+	border: 1px solid #000
+}
+
+
+/**********左边框**********/
+
+.bdlf {
+	border-left: 1px solid #fff
+}
+
+.bdle {
+	border-left: 1px solid #eee
+}
+
+.bdld {
+	border-left: 1px solid #ddd
+}
+
+.bdlc {
+	border-left: 1px solid #ccc
+}
+
+.bdlb {
+	border-left: 1px solid #bbb
+}
+
+.bdla {
+	border-left: 1px solid #aaa
+}
+
+.bdl9 {
+	border-left: 1px solid #999
+}
+
+.bdl8 {
+	border-left: 1px solid #888
+}
+
+.bdl7 {
+	border-left: 1px solid #777
+}
+
+.bdl6 {
+	border-left: 1px solid #666
+}
+
+.bdl5 {
+	border-left: 1px solid #555
+}
+
+.bdl4 {
+	border-left: 1px solid #444
+}
+
+.bdl3 {
+	border-left: 1px solid #333
+}
+
+.bdl2 {
+	border-left: 1px solid #222
+}
+
+.bdl1 {
+	border-left: 1px solid #111
+}
+
+.bdl0 {
+	border-left: 1px solid #000
+}
+
+
+/**********右边框**********/
+
+.bdrf {
+	border-right: 1px solid #fff
+}
+
+.bdre {
+	border-right: 1px solid #eee
+}
+
+.bdrd {
+	border-right: 1px solid #ddd
+}
+
+.bdrc {
+	border-right: 1px solid #ccc
+}
+
+.bdrb {
+	border-right: 1px solid #bbb
+}
+
+.bdra {
+	border-right: 1px solid #aaa
+}
+
+.bdr9 {
+	border-right: 1px solid #999
+}
+
+.bdr8 {
+	border-right: 1px solid #888
+}
+
+.bdr7 {
+	border-right: 1px solid #777
+}
+
+.bdr6 {
+	border-right: 1px solid #666
+}
+
+.bdr5 {
+	border-right: 1px solid #555
+}
+
+.bdr4 {
+	border-right: 1px solid #444
+}
+
+.bdr3 {
+	border-right: 1px solid #333
+}
+
+.bdr2 {
+	border-right: 1px solid #222
+}
+
+.bdr1 {
+	border-right: 1px solid #111
+}
+
+.bdr0 {
+	border-right: 1px solid #000
+}
+
+
+/**********上边框**********/
+
+.bdtf {
+	border-top: 1px solid #fff
+}
+
+.bdte {
+	border-top: 1px solid #eee
+}
+
+.bdtd {
+	border-top: 1px solid #ddd
+}
+
+.bdtc {
+	border-top: 1px solid #ccc
+}
+
+.bdtb {
+	border-top: 1px solid #bbb
+}
+
+.bdta {
+	border-top: 1px solid #aaa
+}
+
+.bdt9 {
+	border-top: 1px solid #999
+}
+
+.bdt8 {
+	border-top: 1px solid #888
+}
+
+.bdt7 {
+	border-top: 1px solid #777
+}
+
+.bdt6 {
+	border-top: 1px solid #666
+}
+
+.bdt5 {
+	border-top: 1px solid #555
+}
+
+.bdt4 {
+	border-top: 1px solid #444
+}
+
+.bdt3 {
+	border-top: 1px solid #333
+}
+
+.bdt2 {
+	border-top: 1px solid #222
+}
+
+.bdt1 {
+	border-top: 1px solid #111
+}
+
+.bdt0 {
+	border-top: 1px solid #000
+}
+
+
+/**********下边框**********/
+
+.bdbf {
+	border-bottom: 1px solid #fff
+}
+
+.bdbe {
+	border-bottom: 1px solid #eee
+}
+
+.bdbd {
+	border-bottom: 1px solid #ddd
+}
+
+.bdbc {
+	border-bottom: 1px solid #ccc
+}
+
+.bdbb {
+	border-bottom: 1px solid #bbb
+}
+
+.bdba {
+	border-bottom: 1px solid #aaa
+}
+
+.bdb9 {
+	border-bottom: 1px solid #999
+}
+
+.bdb8 {
+	border-bottom: 1px solid #888
+}
+
+.bdb7 {
+	border-bottom: 1px solid #777
+}
+
+.bdb6 {
+	border-bottom: 1px solid #666
+}
+
+.bdb5 {
+	border-bottom: 1px solid #555
+}
+
+.bdb4 {
+	border-bottom: 1px solid #444
+}
+
+.bdb3 {
+	border-bottom: 1px solid #333
+}
+
+.bdb2 {
+	border-bottom: 1px solid #222
+}
+
+.bdb1 {
+	border-bottom: 1px solid #3f4e54
+}
+
+.bdb0 {
+	border-bottom: 1px solid #000
+}
+
+.bdbg {
+	border-bottom: 1px solid #3C3C44
+}
+.bddot{
+	border: 1px dashed #E0E1E7
+}
+
+/**********百分比宽度**********/
+
+.wp7 {
+	width: 7%
+}
+
+.wp10 {
+	width: 10%
+}
+
+.wp11 {
+	width: 11%
+}
+
+.wp14 {
+	width: 14%
+}
+
+.wp15 {
+	width: 15%
+}
+
+.wp20 {
+	width: 20%
+}
+
+.wp25 {
+	width: 25%
+}
+
+.wp30 {
+	width: 30%
+}
+
+.wp33 {
+	width: 33.33%
+}
+
+.wp34 {
+	width: 34%
+}
+
+.wp40 {
+	width: 40%
+}
+.wp50 {
+	width: 50%
+}
+
+.wp55 {
+	width: 55%
+}
+
+.wp60 {
+	width: 60%
+}
+
+.wp70 {
+	width: 70%
+}
+
+.wp80 {
+	width: 80%
+}
+
+.wp90 {
+	width: 90%
+}
+
+.wp92 {
+	width: 92%
+}
+
+.wp94 {
+	width: 94%
+}
+
+.wp96 {
+	width: 96%
+}
+
+.wp98 {
+	width: 98%
+}
+
+.wp100 {
+	width: 100%
+}
+
+
+/**********清除样式**********/
+
+.clear {
+	display: block;
+	clear: both;
+	font-size: 0;
+	line-height: 0;
+	height: 0;
+	overflow: hidden;
+	content: ".";
+}
+
+.clearfix:after {
+	content: "\200B";
+	display: block;
+	height: 0;
+	clear: both;
+}
+
+
+/*定位样式*/
+
+.positionr {
+	position: relative;
+}
+
+.positionf {
+	position: fixed;
+}
+
+.positiona {
+	position: absolute;
+}
+
+.top0 {
+	top: 0
+}
+.top45{
+	top: 45px;
+}
+.top50{
+	top: 50px;
+}
+.top60{
+	top: 60px;
+}
+.top130{
+	top: 130px;
+}
+.left130 {
+	left: 130px
+}
+.leftp50{
+	left:50%;
+}
+.right10 {
+	right: 10px
+}
+
+.right125 {
+	right: 125px
+}
+
+.bottom0 {
+	bottom: 0
+}
+
+.bottom20 {
+	bottom: 20px;
+}
+.bottom60 {
+	bottom: 60px;
+}
+.zd98 {
+	z-index: 98;
+}
+
+.zd99 {
+	z-index: 99;
+}
+
+.zd100 {
+	z-index: 100;
+}
+
+.zd101 {
+	z-index: 101;
+}
+.zd1000 {
+	z-index: 1000;
+}
+.dn {
+	display: none;
+}
+
+
+/*鼠标样式*/
+
+.cursor {
+	cursor: pointer;
+}
+
+
+/*透明度*/
+
+.opacity0 {
+	filter: alpha(opacity=100);
+	/* IE */
+	-moz-opacity: 0;
+	/* 老版Mozilla */
+	-khtml-opacity: 0;
+	/* 老版Safari */
+	opacity: 0;
+	/* 支持opacity的浏览器*/
+	background: rgba(43, 48, 60, 10);
+}
+
+.opacity09 {
+	filter: alpha(opacity=90);
+	/* IE */
+	-moz-opacity: 0.9;
+	/* 老版Mozilla */
+	-khtml-opacity: 0.9;
+	/* 老版Safari */
+	opacity: 0.9;
+	/* 支持opacity的浏览器*/
+	background: rgba(43, 48, 60, 0.9);
+}
+
+
+/*圆角*/
+
+.radius3 {
+	border-radius: 3px;
+}
+
+.radius5 {
+	border-radius: 5px;
+}
+
+.radius10 {
+	border-radius: 10px;
+}
+
+.radiusp50 {
+	border-radius: 50%;
+}
+
+.radiustlr {
+	border-top-left-radius: 5px;
+	border-top-right-radius: 5px;
+}
+/*placeholder颜色*/
+
+.white::-webkit-input-placeholder {
+	/* WebKit, Blink, Edge */
+	color: #fff;
+}
+
+.white:-moz-placeholder {
+	/* Mozilla Firefox 4 to 18 */
+	color: #fff;
+}
+
+.white::-moz-placeholder {
+	/* Mozilla Firefox 19+ */
+	color: #fff;
+}
+
+.white:-ms-input-placeholder {
+	/* Internet Explorer 10-11 */
+	color: #fff;
+}
+
+
+/*纵向横向滚动*/
+
+.overflowy {
+	overflow-y: auto;
+}
+
+.overflowx {
+	overflow-x: auto;
+}
+.box-flex {
+	display: -webkit-box;
+	display: -moz-box;
+	display: -ms-flexbox;
+	display: -webkit-flex;
+	display: flex;
+}
+
+.flex1 {
+	flex: 1;
+	-webkit-flex: 1;
+	-ms-flex: 1;
+	-moz-flex: 1;
+}
+
+.flex2 {
+	flex: 2;
+	-webkit-flex: 2;
+	-ms-flex: 2;
+	-moz-flex: 2;
+}
+
+.flex3 {
+	flex: 3;
+	-webkit-flex: 3;
+	-ms-flex: 3;
+	-moz-flex: 3;
+}
+
+.flex4 {
+	flex: 4;
+	-webkit-flex: 4;
+	-ms-flex: 4;
+	-moz-flex: 4;
+}
+
+.flex5 {
+	flex: 5;
+	-webkit-flex: 5;
+	-ms-flex: 5;
+	-moz-flex: 5;
+}
+
+.flex6 {
+	flex: 6;
+	-webkit-flex: 6;
+	-ms-flex: 6;
+	-moz-flex: 6;
+}
+
+.flex7 {
+	flex: 7;
+	-webkit-flex: 7;
+	-ms-flex: 7;
+	-moz-flex: 7;
+}
+
+.flex8 {
+	flex: 8;
+	-webkit-flex: 8;
+	-ms-flex: 8;
+	-moz-flex: 8;
+}
+
+
+/*层级*/
+
+.zIndex99 {
+	z-index: 99;
+}
+
+.zIndex999 {
+	z-index: 999;
+}
+
+.zIndex9999 {
+	z-index: 9999;
+}
+
+
+/*超出1行后省略*/
+
+.overFont {
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	-ms-text-overflow: ellipsis;
+	-o-text-overflow: ellipsis;
+}
+
+
+/*超出2行后省略  */
+
+.overFont2 {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	-ms-text-overflow: ellipsis;
+	-o-text-overflow: ellipsis;
+	display: -webkit-box !important;
+	-webkit-box-orient: vertical;
+	-webkit-line-clamp: 2;
+	word-break: break-word;
+}
+
+.borderBox {
+	box-sizing: border-box;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+}
+
+.left0 {
+	left: 0;
+}
+.left80 {
+	left: 80px;
+}
+
+.right0 {
+	right: 0;
+}
+
+.right500 {
+	right: 500px;
+}
+
+.top28 {
+	top: 28px;
+}
+
+.top40 {
+	top: 40px;
+}
+
+.top80 {
+	top: 80px;
+}
+
+.w380 {
+	width: 380px;
+}
+.wp88{
+	width: 88%;
+}
+.bottom50{
+  bottom:50px;
+}
+.boxsizing{
+	box-sizing: content-box;
+}
+.bdblue{
+	background:rgba(230, 247, 255, 1);
+	border:1px solid rgba(145, 213, 255, 1);
+	box-sizing: border-box;
+}
+.pl100{
+	padding-left:100px;
+}
+.top12{
+	top:12px;
+}
+.wp16{
+	width:16.2%;
+}
+.wp15{
+	width:15%;
+}
+.bdlblue{
+	border:1px solid #0090FF;
+}
+.bdlrblue{
+	border-left:1px solid #0090FF;
+	border-right:1px solid #0090FF;
+}
+.w450{
+	width:450px;
+}
+.ml250{
+	margin-left:250px;
+}
+.commonbg{
+	background-color:#111e5b !important;
+	background-image: url("/resources/images/screen/left-top.png"), url("/resources/images/screen/left-bottom.png"), url("/resources/images/screen/right-top.png"), url("/resources/images/screen/right-bottom.png");
+	background-repeat: no-repeat, no-repeat, no-repeat, no-repeat; 
+	background-position: left top, left bottom, right top,right bottom; 
+	border:1px solid #10379f;
+	box-shadow: inset  0px 0px 10px #10379f;
+}
+
+.wave {
+				width: 8rem;
+				height:8rem;
+				overflow: hidden;
+				border-radius: 50%;
+				background: rgba(255, 203, 103, .6);
+				margin:0 auto;
+				position: relative;
+				text-align: center;
+				vertical-align: middle;
+			}
+
+			.wave canvas {
+				position: absolute;
+				left: 0;
+				top: 0;
+				z-index: 1;
+			}
+
+			.huadong .notice_active {
+				overflow: hidden;
+				position: relative;
+				line-height: 43px;
+			}
+
+			.huadong .notice_active li {
+				line-height: 43px;
+				overflow: hidden;
+			}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/css/swiper.min.css b/pluss-manage-page/src/main/resources/static/resources/css/swiper.min.css
new file mode 100644
index 0000000..6adcd71
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/css/swiper.min.css
@@ -0,0 +1,12 @@
+/**
+ * Swiper 4.4.6
+ * Most modern mobile touch slider and framework with hardware accelerated transitions
+ * http://www.idangero.us/swiper/
+ *
+ * Copyright 2014-2018 Vladimir Kharlampidi
+ *
+ * Released under the MIT License
+ *
+ * Released on: December 19, 2018
+ */
+.swiper-container{margin:0 auto;position:relative;overflow:hidden;list-style:none;padding:0;z-index:1}.swiper-container-no-flexbox .swiper-slide{float:left}.swiper-container-vertical>.swiper-wrapper{-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column}.swiper-wrapper{position:relative;width:100%;height:100%;z-index:1;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-transition-property:-webkit-transform;transition-property:-webkit-transform;-o-transition-property:transform;transition-property:transform;transition-property:transform,-webkit-transform;-webkit-box-sizing:content-box;box-sizing:content-box}.swiper-container-android .swiper-slide,.swiper-wrapper{-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}.swiper-container-multirow>.swiper-wrapper{-webkit-flex-wrap:wrap;-ms-flex-wrap:wrap;flex-wrap:wrap}.swiper-container-free-mode>.swiper-wrapper{-webkit-transition-timing-function:ease-out;-o-transition-timing-function:ease-out;transition-timing-function:ease-out;margin:0 auto}.swiper-slide{-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0;width:100%;height:100%;position:relative;-webkit-transition-property:-webkit-transform;transition-property:-webkit-transform;-o-transition-property:transform;transition-property:transform;transition-property:transform,-webkit-transform}.swiper-slide-invisible-blank{visibility:hidden}.swiper-container-autoheight,.swiper-container-autoheight .swiper-slide{height:auto}.swiper-container-autoheight .swiper-wrapper{-webkit-box-align:start;-webkit-align-items:flex-start;-ms-flex-align:start;align-items:flex-start;-webkit-transition-property:height,-webkit-transform;transition-property:height,-webkit-transform;-o-transition-property:transform,height;transition-property:transform,height;transition-property:transform,height,-webkit-transform}.swiper-container-3d{-webkit-perspective:1200px;perspective:1200px}.swiper-container-3d .swiper-cube-shadow,.swiper-container-3d .swiper-slide,.swiper-container-3d .swiper-slide-shadow-bottom,.swiper-container-3d .swiper-slide-shadow-left,.swiper-container-3d .swiper-slide-shadow-right,.swiper-container-3d .swiper-slide-shadow-top,.swiper-container-3d .swiper-wrapper{-webkit-transform-style:preserve-3d;transform-style:preserve-3d}.swiper-container-3d .swiper-slide-shadow-bottom,.swiper-container-3d .swiper-slide-shadow-left,.swiper-container-3d .swiper-slide-shadow-right,.swiper-container-3d .swiper-slide-shadow-top{position:absolute;left:0;top:0;width:100%;height:100%;pointer-events:none;z-index:10}.swiper-container-3d .swiper-slide-shadow-left{background-image:-webkit-gradient(linear,right top,left top,from(rgba(0,0,0,.5)),to(rgba(0,0,0,0)));background-image:-webkit-linear-gradient(right,rgba(0,0,0,.5),rgba(0,0,0,0));background-image:-o-linear-gradient(right,rgba(0,0,0,.5),rgba(0,0,0,0));background-image:linear-gradient(to left,rgba(0,0,0,.5),rgba(0,0,0,0))}.swiper-container-3d .swiper-slide-shadow-right{background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.5)),to(rgba(0,0,0,0)));background-image:-webkit-linear-gradient(left,rgba(0,0,0,.5),rgba(0,0,0,0));background-image:-o-linear-gradient(left,rgba(0,0,0,.5),rgba(0,0,0,0));background-image:linear-gradient(to right,rgba(0,0,0,.5),rgba(0,0,0,0))}.swiper-container-3d .swiper-slide-shadow-top{background-image:-webkit-gradient(linear,left bottom,left top,from(rgba(0,0,0,.5)),to(rgba(0,0,0,0)));background-image:-webkit-linear-gradient(bottom,rgba(0,0,0,.5),rgba(0,0,0,0));background-image:-o-linear-gradient(bottom,rgba(0,0,0,.5),rgba(0,0,0,0));background-image:linear-gradient(to top,rgba(0,0,0,.5),rgba(0,0,0,0))}.swiper-container-3d .swiper-slide-shadow-bottom{background-image:-webkit-gradient(linear,left top,left bottom,from(rgba(0,0,0,.5)),to(rgba(0,0,0,0)));background-image:-webkit-linear-gradient(top,rgba(0,0,0,.5),rgba(0,0,0,0));background-image:-o-linear-gradient(top,rgba(0,0,0,.5),rgba(0,0,0,0));background-image:linear-gradient(to bottom,rgba(0,0,0,.5),rgba(0,0,0,0))}.swiper-container-wp8-horizontal,.swiper-container-wp8-horizontal>.swiper-wrapper{-ms-touch-action:pan-y;touch-action:pan-y}.swiper-container-wp8-vertical,.swiper-container-wp8-vertical>.swiper-wrapper{-ms-touch-action:pan-x;touch-action:pan-x}.swiper-button-next,.swiper-button-prev{position:absolute;top:50%;width:27px;height:44px;margin-top:-22px;z-index:10;cursor:pointer;background-size:27px 44px;background-position:center;background-repeat:no-repeat}.swiper-button-next.swiper-button-disabled,.swiper-button-prev.swiper-button-disabled{opacity:.35;cursor:auto;pointer-events:none}.swiper-button-prev,.swiper-container-rtl .swiper-button-next{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2027%2044'%3E%3Cpath%20d%3D'M0%2C22L22%2C0l2.1%2C2.1L4.2%2C22l19.9%2C19.9L22%2C44L0%2C22L0%2C22L0%2C22z'%20fill%3D'%23007aff'%2F%3E%3C%2Fsvg%3E");left:10px;right:auto}.swiper-button-next,.swiper-container-rtl .swiper-button-prev{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2027%2044'%3E%3Cpath%20d%3D'M27%2C22L27%2C22L5%2C44l-2.1-2.1L22.8%2C22L2.9%2C2.1L5%2C0L27%2C22L27%2C22z'%20fill%3D'%23007aff'%2F%3E%3C%2Fsvg%3E");right:10px;left:auto}.swiper-button-prev.swiper-button-white,.swiper-container-rtl .swiper-button-next.swiper-button-white{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2027%2044'%3E%3Cpath%20d%3D'M0%2C22L22%2C0l2.1%2C2.1L4.2%2C22l19.9%2C19.9L22%2C44L0%2C22L0%2C22L0%2C22z'%20fill%3D'%23ffffff'%2F%3E%3C%2Fsvg%3E")}.swiper-button-next.swiper-button-white,.swiper-container-rtl .swiper-button-prev.swiper-button-white{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2027%2044'%3E%3Cpath%20d%3D'M27%2C22L27%2C22L5%2C44l-2.1-2.1L22.8%2C22L2.9%2C2.1L5%2C0L27%2C22L27%2C22z'%20fill%3D'%23ffffff'%2F%3E%3C%2Fsvg%3E")}.swiper-button-prev.swiper-button-black,.swiper-container-rtl .swiper-button-next.swiper-button-black{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2027%2044'%3E%3Cpath%20d%3D'M0%2C22L22%2C0l2.1%2C2.1L4.2%2C22l19.9%2C19.9L22%2C44L0%2C22L0%2C22L0%2C22z'%20fill%3D'%23000000'%2F%3E%3C%2Fsvg%3E")}.swiper-button-next.swiper-button-black,.swiper-container-rtl .swiper-button-prev.swiper-button-black{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2027%2044'%3E%3Cpath%20d%3D'M27%2C22L27%2C22L5%2C44l-2.1-2.1L22.8%2C22L2.9%2C2.1L5%2C0L27%2C22L27%2C22z'%20fill%3D'%23000000'%2F%3E%3C%2Fsvg%3E")}.swiper-button-lock{display:none}.swiper-pagination{position:absolute;text-align:center;-webkit-transition:.3s opacity;-o-transition:.3s opacity;transition:.3s opacity;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0);z-index:10}.swiper-pagination.swiper-pagination-hidden{opacity:0}.swiper-container-horizontal>.swiper-pagination-bullets,.swiper-pagination-custom,.swiper-pagination-fraction{bottom:10px;left:0;width:100%}.swiper-pagination-bullets-dynamic{overflow:hidden;font-size:0}.swiper-pagination-bullets-dynamic .swiper-pagination-bullet{-webkit-transform:scale(.33);-ms-transform:scale(.33);transform:scale(.33);position:relative}.swiper-pagination-bullets-dynamic .swiper-pagination-bullet-active{-webkit-transform:scale(1);-ms-transform:scale(1);transform:scale(1)}.swiper-pagination-bullets-dynamic .swiper-pagination-bullet-active-main{-webkit-transform:scale(1);-ms-transform:scale(1);transform:scale(1)}.swiper-pagination-bullets-dynamic .swiper-pagination-bullet-active-prev{-webkit-transform:scale(.66);-ms-transform:scale(.66);transform:scale(.66)}.swiper-pagination-bullets-dynamic .swiper-pagination-bullet-active-prev-prev{-webkit-transform:scale(.33);-ms-transform:scale(.33);transform:scale(.33)}.swiper-pagination-bullets-dynamic .swiper-pagination-bullet-active-next{-webkit-transform:scale(.66);-ms-transform:scale(.66);transform:scale(.66)}.swiper-pagination-bullets-dynamic .swiper-pagination-bullet-active-next-next{-webkit-transform:scale(.33);-ms-transform:scale(.33);transform:scale(.33)}.swiper-pagination-bullet{width:8px;height:8px;display:inline-block;border-radius:100%;background:#000;opacity:.2}button.swiper-pagination-bullet{border:none;margin:0;padding:0;-webkit-box-shadow:none;box-shadow:none;-webkit-appearance:none;-moz-appearance:none;appearance:none}.swiper-pagination-clickable .swiper-pagination-bullet{cursor:pointer}.swiper-pagination-bullet-active{opacity:1;background:#007aff}.swiper-container-vertical>.swiper-pagination-bullets{right:10px;top:50%;-webkit-transform:translate3d(0,-50%,0);transform:translate3d(0,-50%,0)}.swiper-container-vertical>.swiper-pagination-bullets .swiper-pagination-bullet{margin:6px 0;display:block}.swiper-container-vertical>.swiper-pagination-bullets.swiper-pagination-bullets-dynamic{top:50%;-webkit-transform:translateY(-50%);-ms-transform:translateY(-50%);transform:translateY(-50%);width:8px}.swiper-container-vertical>.swiper-pagination-bullets.swiper-pagination-bullets-dynamic .swiper-pagination-bullet{display:inline-block;-webkit-transition:.2s top,.2s -webkit-transform;transition:.2s top,.2s -webkit-transform;-o-transition:.2s transform,.2s top;transition:.2s transform,.2s top;transition:.2s transform,.2s top,.2s -webkit-transform}.swiper-container-horizontal>.swiper-pagination-bullets .swiper-pagination-bullet{margin:0 4px}.swiper-container-horizontal>.swiper-pagination-bullets.swiper-pagination-bullets-dynamic{left:50%;-webkit-transform:translateX(-50%);-ms-transform:translateX(-50%);transform:translateX(-50%);white-space:nowrap}.swiper-container-horizontal>.swiper-pagination-bullets.swiper-pagination-bullets-dynamic .swiper-pagination-bullet{-webkit-transition:.2s left,.2s -webkit-transform;transition:.2s left,.2s -webkit-transform;-o-transition:.2s transform,.2s left;transition:.2s transform,.2s left;transition:.2s transform,.2s left,.2s -webkit-transform}.swiper-container-horizontal.swiper-container-rtl>.swiper-pagination-bullets-dynamic .swiper-pagination-bullet{-webkit-transition:.2s right,.2s -webkit-transform;transition:.2s right,.2s -webkit-transform;-o-transition:.2s transform,.2s right;transition:.2s transform,.2s right;transition:.2s transform,.2s right,.2s -webkit-transform}.swiper-pagination-progressbar{background:rgba(0,0,0,.25);position:absolute}.swiper-pagination-progressbar .swiper-pagination-progressbar-fill{background:#007aff;position:absolute;left:0;top:0;width:100%;height:100%;-webkit-transform:scale(0);-ms-transform:scale(0);transform:scale(0);-webkit-transform-origin:left top;-ms-transform-origin:left top;transform-origin:left top}.swiper-container-rtl .swiper-pagination-progressbar .swiper-pagination-progressbar-fill{-webkit-transform-origin:right top;-ms-transform-origin:right top;transform-origin:right top}.swiper-container-horizontal>.swiper-pagination-progressbar,.swiper-container-vertical>.swiper-pagination-progressbar.swiper-pagination-progressbar-opposite{width:100%;height:4px;left:0;top:0}.swiper-container-horizontal>.swiper-pagination-progressbar.swiper-pagination-progressbar-opposite,.swiper-container-vertical>.swiper-pagination-progressbar{width:4px;height:100%;left:0;top:0}.swiper-pagination-white .swiper-pagination-bullet-active{background:#fff}.swiper-pagination-progressbar.swiper-pagination-white{background:rgba(255,255,255,.25)}.swiper-pagination-progressbar.swiper-pagination-white .swiper-pagination-progressbar-fill{background:#fff}.swiper-pagination-black .swiper-pagination-bullet-active{background:#000}.swiper-pagination-progressbar.swiper-pagination-black{background:rgba(0,0,0,.25)}.swiper-pagination-progressbar.swiper-pagination-black .swiper-pagination-progressbar-fill{background:#000}.swiper-pagination-lock{display:none}.swiper-scrollbar{border-radius:10px;position:relative;-ms-touch-action:none;background:rgba(0,0,0,.1)}.swiper-container-horizontal>.swiper-scrollbar{position:absolute;left:1%;bottom:3px;z-index:50;height:5px;width:98%}.swiper-container-vertical>.swiper-scrollbar{position:absolute;right:3px;top:1%;z-index:50;width:5px;height:98%}.swiper-scrollbar-drag{height:100%;width:100%;position:relative;background:rgba(0,0,0,.5);border-radius:10px;left:0;top:0}.swiper-scrollbar-cursor-drag{cursor:move}.swiper-scrollbar-lock{display:none}.swiper-zoom-container{width:100%;height:100%;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;text-align:center}.swiper-zoom-container>canvas,.swiper-zoom-container>img,.swiper-zoom-container>svg{max-width:100%;max-height:100%;-o-object-fit:contain;object-fit:contain}.swiper-slide-zoomed{cursor:move}.swiper-lazy-preloader{width:42px;height:42px;position:absolute;left:50%;top:50%;margin-left:-21px;margin-top:-21px;z-index:10;-webkit-transform-origin:50%;-ms-transform-origin:50%;transform-origin:50%;-webkit-animation:swiper-preloader-spin 1s steps(12,end) infinite;animation:swiper-preloader-spin 1s steps(12,end) infinite}.swiper-lazy-preloader:after{display:block;content:'';width:100%;height:100%;background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg%20viewBox%3D'0%200%20120%20120'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20xmlns%3Axlink%3D'http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink'%3E%3Cdefs%3E%3Cline%20id%3D'l'%20x1%3D'60'%20x2%3D'60'%20y1%3D'7'%20y2%3D'27'%20stroke%3D'%236c6c6c'%20stroke-width%3D'11'%20stroke-linecap%3D'round'%2F%3E%3C%2Fdefs%3E%3Cg%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(30%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(60%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(90%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(120%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(150%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.37'%20transform%3D'rotate(180%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.46'%20transform%3D'rotate(210%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.56'%20transform%3D'rotate(240%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.66'%20transform%3D'rotate(270%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.75'%20transform%3D'rotate(300%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.85'%20transform%3D'rotate(330%2060%2C60)'%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E");background-position:50%;background-size:100%;background-repeat:no-repeat}.swiper-lazy-preloader-white:after{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg%20viewBox%3D'0%200%20120%20120'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20xmlns%3Axlink%3D'http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink'%3E%3Cdefs%3E%3Cline%20id%3D'l'%20x1%3D'60'%20x2%3D'60'%20y1%3D'7'%20y2%3D'27'%20stroke%3D'%23fff'%20stroke-width%3D'11'%20stroke-linecap%3D'round'%2F%3E%3C%2Fdefs%3E%3Cg%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(30%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(60%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(90%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(120%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(150%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.37'%20transform%3D'rotate(180%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.46'%20transform%3D'rotate(210%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.56'%20transform%3D'rotate(240%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.66'%20transform%3D'rotate(270%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.75'%20transform%3D'rotate(300%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.85'%20transform%3D'rotate(330%2060%2C60)'%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E")}@-webkit-keyframes swiper-preloader-spin{100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes swiper-preloader-spin{100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.swiper-container .swiper-notification{position:absolute;left:0;top:0;pointer-events:none;opacity:0;z-index:-1000}.swiper-container-fade.swiper-container-free-mode .swiper-slide{-webkit-transition-timing-function:ease-out;-o-transition-timing-function:ease-out;transition-timing-function:ease-out}.swiper-container-fade .swiper-slide{pointer-events:none;-webkit-transition-property:opacity;-o-transition-property:opacity;transition-property:opacity}.swiper-container-fade .swiper-slide .swiper-slide{pointer-events:none}.swiper-container-fade .swiper-slide-active,.swiper-container-fade .swiper-slide-active .swiper-slide-active{pointer-events:auto}.swiper-container-cube{overflow:visible}.swiper-container-cube .swiper-slide{pointer-events:none;-webkit-backface-visibility:hidden;backface-visibility:hidden;z-index:1;visibility:hidden;-webkit-transform-origin:0 0;-ms-transform-origin:0 0;transform-origin:0 0;width:100%;height:100%}.swiper-container-cube .swiper-slide .swiper-slide{pointer-events:none}.swiper-container-cube.swiper-container-rtl .swiper-slide{-webkit-transform-origin:100% 0;-ms-transform-origin:100% 0;transform-origin:100% 0}.swiper-container-cube .swiper-slide-active,.swiper-container-cube .swiper-slide-active .swiper-slide-active{pointer-events:auto}.swiper-container-cube .swiper-slide-active,.swiper-container-cube .swiper-slide-next,.swiper-container-cube .swiper-slide-next+.swiper-slide,.swiper-container-cube .swiper-slide-prev{pointer-events:auto;visibility:visible}.swiper-container-cube .swiper-slide-shadow-bottom,.swiper-container-cube .swiper-slide-shadow-left,.swiper-container-cube .swiper-slide-shadow-right,.swiper-container-cube .swiper-slide-shadow-top{z-index:0;-webkit-backface-visibility:hidden;backface-visibility:hidden}.swiper-container-cube .swiper-cube-shadow{position:absolute;left:0;bottom:0;width:100%;height:100%;background:#000;opacity:.6;-webkit-filter:blur(50px);filter:blur(50px);z-index:0}.swiper-container-flip{overflow:visible}.swiper-container-flip .swiper-slide{pointer-events:none;-webkit-backface-visibility:hidden;backface-visibility:hidden;z-index:1}.swiper-container-flip .swiper-slide .swiper-slide{pointer-events:none}.swiper-container-flip .swiper-slide-active,.swiper-container-flip .swiper-slide-active .swiper-slide-active{pointer-events:auto}.swiper-container-flip .swiper-slide-shadow-bottom,.swiper-container-flip .swiper-slide-shadow-left,.swiper-container-flip .swiper-slide-shadow-right,.swiper-container-flip .swiper-slide-shadow-top{z-index:0;-webkit-backface-visibility:hidden;backface-visibility:hidden}.swiper-container-coverflow .swiper-wrapper{-ms-perspective:1200px}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/css/tencentVideo/baby-blue.css b/pluss-manage-page/src/main/resources/static/resources/css/tencentVideo/baby-blue.css
new file mode 100644
index 0000000..04a73e6
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/css/tencentVideo/baby-blue.css
@@ -0,0 +1,1581 @@
+@media screen and (min-width: 35.5em) {
+    .u-sm-1,
+    .u-sm-1-1,
+    .u-sm-1-2,
+    .u-sm-1-3,
+    .u-sm-2-3,
+    .u-sm-1-4,
+    .u-sm-3-4,
+    .u-sm-1-5,
+    .u-sm-2-5,
+    .u-sm-3-5,
+    .u-sm-4-5,
+    .u-sm-5-5,
+    .u-sm-1-6,
+    .u-sm-5-6,
+    .u-sm-1-8,
+    .u-sm-3-8,
+    .u-sm-5-8,
+    .u-sm-7-8,
+    .u-sm-1-12,
+    .u-sm-5-12,
+    .u-sm-7-12,
+    .u-sm-11-12,
+    .u-sm-1-24,
+    .u-sm-2-24,
+    .u-sm-3-24,
+    .u-sm-4-24,
+    .u-sm-5-24,
+    .u-sm-6-24,
+    .u-sm-7-24,
+    .u-sm-8-24,
+    .u-sm-9-24,
+    .u-sm-10-24,
+    .u-sm-11-24,
+    .u-sm-12-24,
+    .u-sm-13-24,
+    .u-sm-14-24,
+    .u-sm-15-24,
+    .u-sm-16-24,
+    .u-sm-17-24,
+    .u-sm-18-24,
+    .u-sm-19-24,
+    .u-sm-20-24,
+    .u-sm-21-24,
+    .u-sm-22-24,
+    .u-sm-23-24,
+    .u-sm-24-24 {
+        display: inline-block;
+        *display: inline;
+        zoom: 1;
+        letter-spacing: normal;
+        word-spacing: normal;
+        vertical-align: top;
+        text-rendering: auto;
+    }
+
+    .u-sm-1-24 {
+        width: 4.1667%;
+        *width: 4.1357%;
+    }
+
+    .u-sm-1-12,
+    .u-sm-2-24 {
+        width: 8.3333%;
+        *width: 8.3023%;
+    }
+
+    .u-sm-1-8,
+    .u-sm-3-24 {
+        width: 12.5000%;
+        *width: 12.4690%;
+    }
+
+    .u-sm-1-6,
+    .u-sm-4-24 {
+        width: 16.6667%;
+        *width: 16.6357%;
+    }
+
+    .u-sm-1-5 {
+        width: 20%;
+        *width: 19.9690%;
+    }
+
+    .u-sm-5-24 {
+        width: 20.8333%;
+        *width: 20.8023%;
+    }
+
+    .u-sm-1-4,
+    .u-sm-6-24 {
+        width: 25%;
+        *width: 24.9690%;
+    }
+
+    .u-sm-7-24 {
+        width: 29.1667%;
+        *width: 29.1357%;
+    }
+
+    .u-sm-1-3,
+    .u-sm-8-24 {
+        width: 33.3333%;
+        *width: 33.3023%;
+    }
+
+    .u-sm-3-8,
+    .u-sm-9-24 {
+        width: 37.5000%;
+        *width: 37.4690%;
+    }
+
+    .u-sm-2-5 {
+        width: 40%;
+        *width: 39.9690%;
+    }
+
+    .u-sm-5-12,
+    .u-sm-10-24 {
+        width: 41.6667%;
+        *width: 41.6357%;
+    }
+
+    .u-sm-11-24 {
+        width: 45.8333%;
+        *width: 45.8023%;
+    }
+
+    .u-sm-1-2,
+    .u-sm-12-24 {
+        width: 50%;
+        *width: 49.9690%;
+    }
+
+    .u-sm-13-24 {
+        width: 54.1667%;
+        *width: 54.1357%;
+    }
+
+    .u-sm-7-12,
+    .u-sm-14-24 {
+        width: 58.3333%;
+        *width: 58.3023%;
+    }
+
+    .u-sm-3-5 {
+        width: 60%;
+        *width: 59.9690%;
+    }
+
+    .u-sm-5-8,
+    .u-sm-15-24 {
+        width: 62.5000%;
+        *width: 62.4690%;
+    }
+
+    .u-sm-2-3,
+    .u-sm-16-24 {
+        width: 66.6667%;
+        *width: 66.6357%;
+    }
+
+    .u-sm-17-24 {
+        width: 70.8333%;
+        *width: 70.8023%;
+    }
+
+    .u-sm-3-4,
+    .u-sm-18-24 {
+        width: 75%;
+        *width: 74.9690%;
+    }
+
+    .u-sm-19-24 {
+        width: 79.1667%;
+        *width: 79.1357%;
+    }
+
+    .u-sm-4-5 {
+        width: 80%;
+        *width: 79.9690%;
+    }
+
+    .u-sm-5-6,
+    .u-sm-20-24 {
+        width: 83.3333%;
+        *width: 83.3023%;
+    }
+
+    .u-sm-7-8,
+    .u-sm-21-24 {
+        width: 87.5000%;
+        *width: 87.4690%;
+    }
+
+    .u-sm-11-12,
+    .u-sm-22-24 {
+        width: 91.6667%;
+        *width: 91.6357%;
+    }
+
+    .u-sm-23-24 {
+        width: 95.8333%;
+        *width: 95.8023%;
+    }
+
+    .u-sm-1,
+    .u-sm-1-1,
+    .u-sm-5-5,
+    .u-sm-24-24 {
+        width: 100%;
+    }
+}
+
+@media screen and (min-width: 48em) {
+    .u-md-1,
+    .u-md-1-1,
+    .u-md-1-2,
+    .u-md-1-3,
+    .u-md-2-3,
+    .u-md-1-4,
+    .u-md-3-4,
+    .u-md-1-5,
+    .u-md-2-5,
+    .u-md-3-5,
+    .u-md-4-5,
+    .u-md-5-5,
+    .u-md-1-6,
+    .u-md-5-6,
+    .u-md-1-8,
+    .u-md-3-8,
+    .u-md-5-8,
+    .u-md-7-8,
+    .u-md-1-12,
+    .u-md-5-12,
+    .u-md-7-12,
+    .u-md-11-12,
+    .u-md-1-24,
+    .u-md-2-24,
+    .u-md-3-24,
+    .u-md-4-24,
+    .u-md-5-24,
+    .u-md-6-24,
+    .u-md-7-24,
+    .u-md-8-24,
+    .u-md-9-24,
+    .u-md-10-24,
+    .u-md-11-24,
+    .u-md-12-24,
+    .u-md-13-24,
+    .u-md-14-24,
+    .u-md-15-24,
+    .u-md-16-24,
+    .u-md-17-24,
+    .u-md-18-24,
+    .u-md-19-24,
+    .u-md-20-24,
+    .u-md-21-24,
+    .u-md-22-24,
+    .u-md-23-24,
+    .u-md-24-24 {
+        display: inline-block;
+        *display: inline;
+        zoom: 1;
+        letter-spacing: normal;
+        word-spacing: normal;
+        vertical-align: top;
+        text-rendering: auto;
+    }
+
+    .u-md-1-24 {
+        width: 4.1667%;
+        *width: 4.1357%;
+    }
+
+    .u-md-1-12,
+    .u-md-2-24 {
+        width: 8.3333%;
+        *width: 8.3023%;
+    }
+
+    .u-md-1-8,
+    .u-md-3-24 {
+        width: 12.5000%;
+        *width: 12.4690%;
+    }
+
+    .u-md-1-6,
+    .u-md-4-24 {
+        width: 16.6667%;
+        *width: 16.6357%;
+    }
+
+    .u-md-1-5 {
+        width: 20%;
+        *width: 19.9690%;
+    }
+
+    .u-md-5-24 {
+        width: 20.8333%;
+        *width: 20.8023%;
+    }
+
+    .u-md-1-4,
+    .u-md-6-24 {
+        width: 25%;
+        *width: 24.9690%;
+    }
+
+    .u-md-7-24 {
+        width: 29.1667%;
+        *width: 29.1357%;
+    }
+
+    .u-md-1-3,
+    .u-md-8-24 {
+        width: 33.3333%;
+        *width: 33.3023%;
+    }
+
+    .u-md-3-8,
+    .u-md-9-24 {
+        width: 37.5000%;
+        *width: 37.4690%;
+    }
+
+    .u-md-2-5 {
+        width: 40%;
+        *width: 39.9690%;
+    }
+
+    .u-md-5-12,
+    .u-md-10-24 {
+        width: 41.6667%;
+        *width: 41.6357%;
+    }
+
+    .u-md-11-24 {
+        width: 45.8333%;
+        *width: 45.8023%;
+    }
+
+    .u-md-1-2,
+    .u-md-12-24 {
+        width: 50%;
+        *width: 49.9690%;
+    }
+
+    .u-md-13-24 {
+        width: 54.1667%;
+        *width: 54.1357%;
+    }
+
+    .u-md-7-12,
+    .u-md-14-24 {
+        width: 58.3333%;
+        *width: 58.3023%;
+    }
+
+    .u-md-3-5 {
+        width: 60%;
+        *width: 59.9690%;
+    }
+
+    .u-md-5-8,
+    .u-md-15-24 {
+        width: 62.5000%;
+        *width: 62.4690%;
+    }
+
+    .u-md-2-3,
+    .u-md-16-24 {
+        width: 66.6667%;
+        *width: 66.6357%;
+    }
+
+    .u-md-17-24 {
+        width: 70.8333%;
+        *width: 70.8023%;
+    }
+
+    .u-md-3-4,
+    .u-md-18-24 {
+        width: 75%;
+        *width: 74.9690%;
+    }
+
+    .u-md-19-24 {
+        width: 79.1667%;
+        *width: 79.1357%;
+    }
+
+    .u-md-4-5 {
+        width: 80%;
+        *width: 79.9690%;
+    }
+
+    .u-md-5-6,
+    .u-md-20-24 {
+        width: 83.3333%;
+        *width: 83.3023%;
+    }
+
+    .u-md-7-8,
+    .u-md-21-24 {
+        width: 87.5000%;
+        *width: 87.4690%;
+    }
+
+    .u-md-11-12,
+    .u-md-22-24 {
+        width: 91.6667%;
+        *width: 91.6357%;
+    }
+
+    .u-md-23-24 {
+        width: 95.8333%;
+        *width: 95.8023%;
+    }
+
+    .u-md-1,
+    .u-md-1-1,
+    .u-md-5-5,
+    .u-md-24-24 {
+        width: 100%;
+    }
+}
+
+@media screen and (min-width: 58em) {
+    .u-lg-1,
+    .u-lg-1-1,
+    .u-lg-1-2,
+    .u-lg-1-3,
+    .u-lg-2-3,
+    .u-lg-1-4,
+    .u-lg-3-4,
+    .u-lg-1-5,
+    .u-lg-2-5,
+    .u-lg-3-5,
+    .u-lg-4-5,
+    .u-lg-5-5,
+    .u-lg-1-6,
+    .u-lg-5-6,
+    .u-lg-1-8,
+    .u-lg-3-8,
+    .u-lg-5-8,
+    .u-lg-7-8,
+    .u-lg-1-12,
+    .u-lg-5-12,
+    .u-lg-7-12,
+    .u-lg-11-12,
+    .u-lg-1-24,
+    .u-lg-2-24,
+    .u-lg-3-24,
+    .u-lg-4-24,
+    .u-lg-5-24,
+    .u-lg-6-24,
+    .u-lg-7-24,
+    .u-lg-8-24,
+    .u-lg-9-24,
+    .u-lg-10-24,
+    .u-lg-11-24,
+    .u-lg-12-24,
+    .u-lg-13-24,
+    .u-lg-14-24,
+    .u-lg-15-24,
+    .u-lg-16-24,
+    .u-lg-17-24,
+    .u-lg-18-24,
+    .u-lg-19-24,
+    .u-lg-20-24,
+    .u-lg-21-24,
+    .u-lg-22-24,
+    .u-lg-23-24,
+    .u-lg-24-24 {
+        display: inline-block;
+        *display: inline;
+        zoom: 1;
+        letter-spacing: normal;
+        word-spacing: normal;
+        vertical-align: top;
+        text-rendering: auto;
+    }
+
+    .u-lg-1-24 {
+        width: 4.1667%;
+        *width: 4.1357%;
+    }
+
+    .u-lg-1-12,
+    .u-lg-2-24 {
+        width: 8.3333%;
+        *width: 8.3023%;
+    }
+
+    .u-lg-1-8,
+    .u-lg-3-24 {
+        width: 12.5000%;
+        *width: 12.4690%;
+    }
+
+    .u-lg-1-6,
+    .u-lg-4-24 {
+        width: 16.6667%;
+        *width: 16.6357%;
+    }
+
+    .u-lg-1-5 {
+        width: 20%;
+        *width: 19.9690%;
+    }
+
+    .u-lg-5-24 {
+        width: 20.8333%;
+        *width: 20.8023%;
+    }
+
+    .u-lg-1-4,
+    .u-lg-6-24 {
+        width: 25%;
+        *width: 24.9690%;
+    }
+
+    .u-lg-7-24 {
+        width: 29.1667%;
+        *width: 29.1357%;
+    }
+
+    .u-lg-1-3,
+    .u-lg-8-24 {
+        width: 33.3333%;
+        *width: 33.3023%;
+    }
+
+    .u-lg-3-8,
+    .u-lg-9-24 {
+        width: 37.5000%;
+        *width: 37.4690%;
+    }
+
+    .u-lg-2-5 {
+        width: 40%;
+        *width: 39.9690%;
+    }
+
+    .u-lg-5-12,
+    .u-lg-10-24 {
+        width: 41.6667%;
+        *width: 41.6357%;
+    }
+
+    .u-lg-11-24 {
+        width: 45.8333%;
+        *width: 45.8023%;
+    }
+
+    .u-lg-1-2,
+    .u-lg-12-24 {
+        width: 50%;
+        *width: 49.9690%;
+    }
+
+    .u-lg-13-24 {
+        width: 54.1667%;
+        *width: 54.1357%;
+    }
+
+    .u-lg-7-12,
+    .u-lg-14-24 {
+        width: 58.3333%;
+        *width: 58.3023%;
+    }
+
+    .u-lg-3-5 {
+        width: 60%;
+        *width: 59.9690%;
+    }
+
+    .u-lg-5-8,
+    .u-lg-15-24 {
+        width: 62.5000%;
+        *width: 62.4690%;
+    }
+
+    .u-lg-2-3,
+    .u-lg-16-24 {
+        width: 66.6667%;
+        *width: 66.6357%;
+    }
+
+    .u-lg-17-24 {
+        width: 70.8333%;
+        *width: 70.8023%;
+    }
+
+    .u-lg-3-4,
+    .u-lg-18-24 {
+        width: 75%;
+        *width: 74.9690%;
+    }
+
+    .u-lg-19-24 {
+        width: 79.1667%;
+        *width: 79.1357%;
+    }
+
+    .u-lg-4-5 {
+        width: 80%;
+        *width: 79.9690%;
+    }
+
+    .u-lg-5-6,
+    .u-lg-20-24 {
+        width: 83.3333%;
+        *width: 83.3023%;
+    }
+
+    .u-lg-7-8,
+    .u-lg-21-24 {
+        width: 87.5000%;
+        *width: 87.4690%;
+    }
+
+    .u-lg-11-12,
+    .u-lg-22-24 {
+        width: 91.6667%;
+        *width: 91.6357%;
+    }
+
+    .u-lg-23-24 {
+        width: 95.8333%;
+        *width: 95.8023%;
+    }
+
+    .u-lg-1,
+    .u-lg-1-1,
+    .u-lg-5-5,
+    .u-lg-24-24 {
+        width: 100%;
+    }
+}
+
+@media screen and (min-width: 75em) {
+    .u-xl-1,
+    .u-xl-1-1,
+    .u-xl-1-2,
+    .u-xl-1-3,
+    .u-xl-2-3,
+    .u-xl-1-4,
+    .u-xl-3-4,
+    .u-xl-1-5,
+    .u-xl-2-5,
+    .u-xl-3-5,
+    .u-xl-4-5,
+    .u-xl-5-5,
+    .u-xl-1-6,
+    .u-xl-5-6,
+    .u-xl-1-8,
+    .u-xl-3-8,
+    .u-xl-5-8,
+    .u-xl-7-8,
+    .u-xl-1-12,
+    .u-xl-5-12,
+    .u-xl-7-12,
+    .u-xl-11-12,
+    .u-xl-1-24,
+    .u-xl-2-24,
+    .u-xl-3-24,
+    .u-xl-4-24,
+    .u-xl-5-24,
+    .u-xl-6-24,
+    .u-xl-7-24,
+    .u-xl-8-24,
+    .u-xl-9-24,
+    .u-xl-10-24,
+    .u-xl-11-24,
+    .u-xl-12-24,
+    .u-xl-13-24,
+    .u-xl-14-24,
+    .u-xl-15-24,
+    .u-xl-16-24,
+    .u-xl-17-24,
+    .u-xl-18-24,
+    .u-xl-19-24,
+    .u-xl-20-24,
+    .u-xl-21-24,
+    .u-xl-22-24,
+    .u-xl-23-24,
+    .u-xl-24-24 {
+        display: inline-block;
+        *display: inline;
+        zoom: 1;
+        letter-spacing: normal;
+        word-spacing: normal;
+        vertical-align: top;
+        text-rendering: auto;
+    }
+
+    .u-xl-1-24 {
+        width: 4.1667%;
+        *width: 4.1357%;
+    }
+
+    .u-xl-1-12,
+    .u-xl-2-24 {
+        width: 8.3333%;
+        *width: 8.3023%;
+    }
+
+    .u-xl-1-8,
+    .u-xl-3-24 {
+        width: 12.5000%;
+        *width: 12.4690%;
+    }
+
+    .u-xl-1-6,
+    .u-xl-4-24 {
+        width: 16.6667%;
+        *width: 16.6357%;
+    }
+
+    .u-xl-1-5 {
+        width: 20%;
+        *width: 19.9690%;
+    }
+
+    .u-xl-5-24 {
+        width: 20.8333%;
+        *width: 20.8023%;
+    }
+
+    .u-xl-1-4,
+    .u-xl-6-24 {
+        width: 25%;
+        *width: 24.9690%;
+    }
+
+    .u-xl-7-24 {
+        width: 29.1667%;
+        *width: 29.1357%;
+    }
+
+    .u-xl-1-3,
+    .u-xl-8-24 {
+        width: 33.3333%;
+        *width: 33.3023%;
+    }
+
+    .u-xl-3-8,
+    .u-xl-9-24 {
+        width: 37.5000%;
+        *width: 37.4690%;
+    }
+
+    .u-xl-2-5 {
+        width: 40%;
+        *width: 39.9690%;
+    }
+
+    .u-xl-5-12,
+    .u-xl-10-24 {
+        width: 41.6667%;
+        *width: 41.6357%;
+    }
+
+    .u-xl-11-24 {
+        width: 45.8333%;
+        *width: 45.8023%;
+    }
+
+    .u-xl-1-2,
+    .u-xl-12-24 {
+        width: 50%;
+        *width: 49.9690%;
+    }
+
+    .u-xl-13-24 {
+        width: 54.1667%;
+        *width: 54.1357%;
+    }
+
+    .u-xl-7-12,
+    .u-xl-14-24 {
+        width: 58.3333%;
+        *width: 58.3023%;
+    }
+
+    .u-xl-3-5 {
+        width: 60%;
+        *width: 59.9690%;
+    }
+
+    .u-xl-5-8,
+    .u-xl-15-24 {
+        width: 62.5000%;
+        *width: 62.4690%;
+    }
+
+    .u-xl-2-3,
+    .u-xl-16-24 {
+        width: 66.6667%;
+        *width: 66.6357%;
+    }
+
+    .u-xl-17-24 {
+        width: 70.8333%;
+        *width: 70.8023%;
+    }
+
+    .u-xl-3-4,
+    .u-xl-18-24 {
+        width: 75%;
+        *width: 74.9690%;
+    }
+
+    .u-xl-19-24 {
+        width: 79.1667%;
+        *width: 79.1357%;
+    }
+
+    .u-xl-4-5 {
+        width: 80%;
+        *width: 79.9690%;
+    }
+
+    .u-xl-5-6,
+    .u-xl-20-24 {
+        width: 83.3333%;
+        *width: 83.3023%;
+    }
+
+    .u-xl-7-8,
+    .u-xl-21-24 {
+        width: 87.5000%;
+        *width: 87.4690%;
+    }
+
+    .u-xl-11-12,
+    .u-xl-22-24 {
+        width: 91.6667%;
+        *width: 91.6357%;
+    }
+
+    .u-xl-23-24 {
+        width: 95.8333%;
+        *width: 95.8023%;
+    }
+
+    .u-xl-1,
+    .u-xl-1-1,
+    .u-xl-5-5,
+    .u-xl-24-24 {
+        width: 100%;
+    }
+}
+* {
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+            box-sizing: border-box;
+}
+
+*:before,
+*:after {
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+            box-sizing: border-box;
+}
+
+html, button, input, select, textarea,
+.pure-g [class *= "pure-u"] {
+    font-family: sans-serif;
+    font-weight: 100;
+    letter-spacing: 0.01em;
+}
+
+
+/* --------------------------
+ * Element Styles
+ * --------------------------
+*/
+
+body {
+    min-width: 320px;
+    background-color: #fff;
+    color: #777;
+    line-height: 1.6;
+}
+
+h1, h2, h3, h4, h5, h6 {
+    font-weight: bold;
+    color: rgb(75, 75, 75);
+}
+h3 {
+    font-size: 1.25em;
+}
+h4 {
+    font-size: 1.125em;
+}
+
+a {
+    color: #3b8bba; /* block-background-text-normal */
+    text-decoration: none;
+}
+
+a:visited {
+    color: #265778; /* block-normal-text-normal */
+}
+
+dt {
+    font-weight: bold;
+}
+dd {
+    margin: 0 0 10px 0;
+}
+
+aside {
+    background: #1f8dd6; /* same color as selected state on site menu */
+    margin: 1em 0;
+    padding: 0.3em 1em;
+    border-radius: 3px;
+    color: #fff;
+}
+    aside a, aside a:visited {
+        color: rgb(169, 226, 255);
+    }
+
+
+/* --------------------------
+ * Layout Styles
+ * --------------------------
+*/
+
+/* Navigation Push Styles */
+#layout {
+    position: relative;
+    padding-left: 0;
+}
+    #layout.active #menu {
+        left: 160px;
+        width: 160px;
+    }
+
+/* Apply the .box class on the immediate parent of any grid element (pure-u-*) to apply some padding. */
+.l-box {
+    padding: 1em;
+}
+
+.l-wrap {
+    margin-left: auto;
+    margin-right: auto;
+}
+.content .l-wrap {
+    margin-left: -1em;
+    margin-right: -1em;
+}
+
+
+/* --------------------------
+ * Header Module Styles
+ * --------------------------
+*/
+
+.header {
+    font-family: "Raleway", "Helvetica Neue", Helvetica, Arial, sans-serif;
+    max-width: 768px;
+    margin: 0 auto;
+    padding: 1em;
+    text-align: center;
+    border-bottom: 1px solid #eee;
+    background: #fff;
+    letter-spacing: 0.05em;
+}
+    .header h1 {
+        font-size: 300%;
+        font-weight: 100;
+        margin: 0;
+    }
+     .header h2 {
+        font-size: 125%;
+        font-weight: 100;
+        line-height: 1.5;
+        margin: 0;
+        color: #666;
+        letter-spacing: -0.02em;
+    }
+
+
+ /* --------------------------
+  * Content Module Styles
+  * --------------------------
+ */
+
+/* The content div is placed as a wrapper around all the docs */
+.content {
+    margin-left: auto;
+    margin-right: auto;
+    padding-left: 1em;
+    padding-right: 1em;
+    max-width: 768px;
+}
+
+    .content .content-subhead {
+        margin: 2em 0 1em 0;
+        font-weight: 300;
+        color: #888;
+        position: relative;
+    }
+
+    .content .content-spaced {
+        line-height: 1.8;
+    }
+
+    .content .content-quote {
+        font-family: "Georgia", serif;
+        color: #666;
+        font-style: italic;
+        line-height: 1.8;
+        border-left: 5px solid #ddd;
+        padding-left: 1.5em;
+    }
+
+    .content-link {
+        position: absolute;
+        top: 0;
+        right: 0;
+        display: block;
+        height: 100%;
+        width: 20px;
+        background: transparent url('/img/link-icon.png') no-repeat center center;
+        background-size: 20px 20px;
+    }
+
+    @media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 2dppx) {
+        .content-link {
+            background-image: url('/img/link-icon@2x.png');
+        }
+    }
+
+
+/* --------------------------
+ * Code Styles
+ * --------------------------
+*/
+
+pre,
+code {
+    font-family: Consolas, Courier, monospace;
+    color: #333;
+    background: rgb(250, 250, 250);
+}
+
+code {
+    padding: 0.2em 0.4em;
+    white-space: nowrap;
+}
+.content p code {
+    font-size: 90%;
+}
+
+.code {
+    margin-left: -1em;
+    margin-right: -1em;
+    padding: 1em;
+    border: 1px solid #eee;
+    border-left-width: 0;
+    border-right-width: 0;
+    overflow-x: auto;
+    -webkit-overflow-scrolling: touch;
+}
+.code code {
+    font-size: 95%;
+    white-space: pre;
+    word-wrap: normal;
+    padding: 0;
+    background: none;
+}
+.code-wrap code {
+    white-space: pre-wrap;
+    word-wrap: break-word;
+}
+
+/* --------------------------
+ * Footer Module Styles
+ * --------------------------
+*/
+
+.footer {
+    font-size: 87.5%;
+    border-top: 1px solid #eee;
+    margin-top: 3.4286em;
+    padding: 1.1429em;
+    background: rgb(250, 250, 250);
+}
+
+.legal {
+    line-height: 1.6;
+    text-align: center;
+    margin: 0 auto;
+}
+
+    .legal-license {
+        margin-top: 0;
+    }
+    .legal-links {
+        list-style: none;
+        padding: 0;
+        margin-bottom: 0;
+    }
+    .legal-copyright {
+        margin-top: 0;
+        margin-bottom: 0;
+    }
+
+
+/* --------------------------
+ * Main Navigation Bar Styles
+ * --------------------------
+*/
+
+/* Add transition to containers so they can push in and out */
+#layout,
+#menu,
+.menu-link {
+    -webkit-transition: all 0.2s ease-out;
+    -moz-transition: all 0.2s ease-out;
+    -ms-transition: all 0.2s ease-out;
+    -o-transition: all 0.2s ease-out;
+    transition: all 0.2s ease-out;
+}
+
+#layout.active .menu-link {
+    left: 160px;
+}
+
+#menu {
+    margin-left: -160px; /* "#menu" width */
+    width: 160px;
+    position: fixed;
+    top: 0;
+    left: 0;
+    bottom: 0;
+    z-index: 1000; /* so the menu or its navicon stays above all content */
+    background: #191818;
+    overflow-y: auto;
+    -webkit-overflow-scrolling: touch;
+}
+    #menu a {
+        color: #999;
+        border: none;
+        white-space: normal;
+        padding: 0.625em 1em;
+    }
+
+    #menu .pure-menu-open {
+        background: transparent;
+        border: 0;
+    }
+
+    #menu .pure-menu ul {
+        border: none;
+        background: transparent;
+        display: block;
+    }
+
+    #menu .pure-menu ul,
+    #menu .pure-menu .menu-item-divided {
+        border-top: 1px solid #333;
+    }
+
+        #menu .pure-menu li a:hover,
+        #menu .pure-menu li a:focus {
+            background: #333;
+        }
+
+    .menu-link {
+        position: fixed;
+        display: block; /* show this only on small screens */
+        top: 0;
+        left: 0; /* "#menu width" */
+        background: #000;
+        background: rgba(0,0,0,0.7);
+        font-size: 11px; /* change this value to increase/decrease button size */
+        z-index: 10;
+        width: 4em;
+        height: 4em;
+        padding: 1em;
+    }
+
+        .menu-link:hover,
+        .menu-link:focus {
+            background: #000;
+        }
+
+        .menu-link span {
+            position: relative;
+            display: block;
+            margin-top: 0.9em;
+        }
+
+        .menu-link span,
+        .menu-link span:before,
+        .menu-link span:after {
+            background-color: #fff;
+            width: 100%;
+            height: .2em;
+            -webkit-transition: all 0.4s;
+               -moz-transition: all 0.4s;
+                -ms-transition: all 0.4s;
+                 -o-transition: all 0.4s;
+                    transition: all 0.4s;
+        }
+
+            .menu-link span:before,
+            .menu-link span:after {
+                position: absolute;
+                top: -.55em;
+                content: " ";
+            }
+
+            .menu-link span:after {
+                top: .55em;
+            }
+
+        .menu-link.active span {
+            background: transparent;
+        }
+
+            .menu-link.active span:before {
+                -webkit-transform: rotate(45deg) translate(.5em, .4em);
+                   -moz-transform: rotate(45deg) translate(.5em, .4em);
+                    -ms-transform: rotate(45deg) translate(.5em, .4em);
+                     -o-transform: rotate(45deg) translate(.5em, .4em);
+                        transform: rotate(45deg) translate(.5em, .4em);
+            }
+
+            .menu-link.active span:after {
+                -webkit-transform: rotate(-45deg) translate(.4em, -.3em);
+                   -moz-transform: rotate(-45deg) translate(.4em, -.3em);
+                    -ms-transform: rotate(-45deg) translate(.4em, -.3em);
+                     -o-transform: rotate(-45deg) translate(.4em, -.3em);
+                        transform: rotate(-45deg) translate(.4em, -.3em);
+            }
+
+    #menu .pure-menu-heading {
+        font-size: 125%;
+        font-weight: 300;
+        letter-spacing: 0.1em;
+        color: #fff;
+        margin-top: 0;
+        padding: 0.5em 0.8em;
+        text-transform: uppercase;
+    }
+    #menu .pure-menu-heading:hover,
+    #menu .pure-menu-heading:focus {
+        color: #999;
+    }
+
+    #menu .pure-menu-selected {
+        background: #1f8dd6;
+    }
+
+        #menu .pure-menu-selected a {
+            color: #fff;
+        }
+
+        #menu li.pure-menu-selected a:hover,
+        #menu li.pure-menu-selected a:focus {
+            background: none;
+        }
+
+
+
+/* ---------------------
+ * Smaller Module Styles
+ * ---------------------
+*/
+
+.pure-img-responsive {
+    max-width: 100%;
+    height: auto;
+}
+
+.pure-paginator .pure-button {
+    -webkit-box-sizing: content-box;
+    -moz-box-sizing: content-box;
+    box-sizing: content-box;
+}
+
+.pure-button {
+    font-family: inherit;
+}
+a.pure-button-primary {
+    color: white;
+}
+
+
+/* green call to action button class */
+.notice {
+    background-color: #61B842;
+    color: white;
+}
+
+.muted {
+    color: #ccc;
+}
+
+
+
+/* -------------
+ * Table Styles
+ * -------------
+*/
+
+.pure-table th,
+.pure-table td {
+    padding: 0.5em 1em;
+}
+
+.table-responsive {
+    margin-left: -1em;
+    margin-right: -1em;
+    overflow-x: auto;
+    -webkit-overflow-scrolling: touch;
+    margin-bottom: 1em;
+}
+.table-responsive table {
+    width: 100%;
+    min-width: 35.5em;
+    border-left-width: 0;
+    border-right-width: 0;
+}
+
+.table-responsive .mq-table {
+    width: 100%;
+    min-width: 44em;
+}
+.mq-table th.highlight {
+    background-color: rgb(255, 234, 133);
+}
+.mq-table td.highlight {
+    background-color: rgb(255, 250, 229);
+}
+.mq-table th.highlight code,
+.mq-table td.highlight code {
+    background: rgb(255, 255, 243);
+}
+.mq-table-mq code {
+    font-size: 0.875em;
+}
+
+/* ----------------------------
+ * Example for full-width Grids
+ * ----------------------------
+*/
+
+.grids-example {
+    background: rgb(250, 250, 250);
+    margin: 2em auto;
+    border-top: 1px solid #ddd;
+    border-bottom: 1px solid #ddd;
+}
+
+/* --------------------------
+ * State Rules
+ * --------------------------
+*/
+
+
+.is-code-full {
+    text-align: center;
+}
+.is-code-full .code {
+    margin-left: auto;
+    margin-right: auto;
+}
+.is-code-full code {
+    display: inline-block;
+    max-width: 768px;
+    margin-left: auto;
+    margin-right: auto;
+}
+
+
+/* --------------------------
+ * Responsive Styles
+ * --------------------------
+*/
+
+@media screen and (min-width: 35.5em) {
+
+    .legal-license {
+        text-align: left;
+        margin: 0;
+    }
+    .legal-copyright,
+    .legal-links,
+    .legal-links li {
+        text-align: right;
+        margin: 0;
+    }
+
+}
+
+@media screen and (min-width: 48em) {
+
+    .l-wrap,
+    .l-wrap .content {
+        padding-left: 1em;
+        padding-right: 1em;
+    }
+    .content .l-wrap {
+        margin-left: -2em;
+        margin-right: -2em;
+    }
+
+    .header,
+    .content {
+        padding-left: 2em;
+        padding-right: 2em;
+    }
+
+    .header h1 {
+        font-size: 320%;
+    }
+    .header h2 {
+        font-size: 128%;
+    }
+
+    .content p {
+        font-size: 1.125em;
+    }
+
+    .code {
+        margin-left: auto;
+        margin-right: auto;
+        border-left-width: 1px;
+        border-right-width: 1px;
+    }
+
+    .table-responsive {
+        margin-left: auto;
+        margin-right: auto;
+    }
+    .table-responsive table {
+        border-left-width: 1px;
+        border-right-width: 1px;
+    }
+
+}
+
+@media (max-width: 58em) {
+    /* Only apply this when the window is smaller. Otherwise, the following
+    case results in extra padding on the left:
+        * Make the window small. (Rotate to portrait on a mobile.)
+        * Tap the menu to trigger the active state.
+        * Make the window large again. (Rotate to landscape on mobile.)
+    */
+    #layout.active {
+        position: relative;
+        left: 160px;
+    }
+}
+
+@media (min-width: 58em) {
+
+    #layout {
+        padding-left: 160px; /* left col width "#menu" */
+        left: 0;
+    }
+    #menu {
+        left: 160px;
+    }
+    .menu-link {
+        position: fixed;
+        left: 160px;
+        display: none;
+    }
+    #layout.active .menu-link {
+        left: 160px;
+    }
+
+}
+
+.layout-item {
+    margin-top: 2em;
+    padding-top: 2em;
+    border-top: 1px solid #eee;
+}
+.layout-item-screenshot {
+    text-align: center;
+}
+.layout-item-head {
+    margin-top: 0; /* so that the .layout-item-head lines up with the image */
+}
+.layout-item-modules {
+    padding: 0;
+}
+.layout-item-module {
+    margin-right: 0.5714em;
+    font-size: 0.875em;
+}
+.layout-item-module-base a {
+    border-left: 3px solid rgb(14, 144, 210);
+}
+.layout-item-module-grids a {
+    border-left: 3px solid rgb(128, 88, 165);
+}
+.layout-item-module-forms a {
+    border-left: 3px solid rgb(94, 185, 94);
+}
+.layout-item-module-buttons a {
+    border-left: 3px solid rgb(221, 81, 76);
+}
+.layout-item-module-tables a {
+    border-left: 3px solid rgb(243, 123, 29);
+}
+.layout-item-module-menus a {
+    border-left: 3px solid rgb(250, 210, 50);
+}
+.layout-item-module a:link,
+.layout-item-module a:visited {
+    text-transform: capitalize;
+    color: rgb(75, 75, 75);
+    padding: 0 0.5714em;
+    line-height: 1.75;
+    display: block;
+}
+
+/**
+ * Baby Blue theme for RainbowJS
+ *
+ * @author tilomitra
+ */
+
+pre .comment {
+    color: #999;
+}
+
+pre .tag,
+pre .tag-name,
+pre .support.tag-name {
+    color: rgb(85, 85, 85);
+}
+
+pre .keyword,
+pre .css-property,
+pre .vendor-prefix,
+pre .sass,
+pre .class,
+pre .id,
+pre .css-value,
+pre .entity.function,
+pre .storage.function {
+    font-weight: bold;
+}
+
+pre .css-property,
+pre .css-value,
+pre .vendor-prefix,
+pre .support.namespace {
+    color: #333;
+}
+
+pre .constant.numeric,
+pre .keyword.unit,
+pre .hex-color {
+    font-weight: normal;
+    color: #099;
+}
+
+pre .attribute,
+pre .variable,
+pre .support {
+    color:  #757575; /* skinbuilder block-page-text-normal with #1f8dd6 as primary */
+}
+
+pre .string,
+pre .support.value  {
+    font-weight: normal;
+    color: #3b8bba; /* skinbuilder block-mine-text-low with #1f8dd6 as primary */
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/css/tencentVideo/bootstrap.css b/pluss-manage-page/src/main/resources/static/resources/css/tencentVideo/bootstrap.css
new file mode 100644
index 0000000..ac66c6a
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/css/tencentVideo/bootstrap.css
@@ -0,0 +1,6757 @@
+/*!
+ * Bootstrap v3.3.7 (http://getbootstrap.com)
+ * Copyright 2011-2016 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ */
+/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */
+html {
+    font-family: sans-serif;
+    -webkit-text-size-adjust: 100%;
+        -ms-text-size-adjust: 100%;
+  }
+  body {
+    margin: 0;
+  }
+  article,
+  aside,
+  details,
+  figcaption,
+  figure,
+  footer,
+  header,
+  hgroup,
+  main,
+  menu,
+  nav,
+  section,
+  summary {
+    display: block;
+  }
+  audio,
+  canvas,
+  progress,
+  video {
+    display: inline-block;
+    vertical-align: baseline;
+  }
+  audio:not([controls]) {
+    display: none;
+    height: 0;
+  }
+  [hidden],
+  template {
+    display: none;
+  }
+  a {
+    background-color: transparent;
+  }
+  a:active,
+  a:hover {
+    outline: 0;
+  }
+  abbr[title] {
+    border-bottom: 1px dotted;
+  }
+  b,
+  strong {
+    font-weight: bold;
+  }
+  dfn {
+    font-style: italic;
+  }
+  h1 {
+    margin: .67em 0;
+    font-size: 2em;
+  }
+  mark {
+    color: #000;
+    background: #ff0;
+  }
+  small {
+    font-size: 80%;
+  }
+  sub,
+  sup {
+    position: relative;
+    font-size: 75%;
+    line-height: 0;
+    vertical-align: baseline;
+  }
+  sup {
+    top: -.5em;
+  }
+  sub {
+    bottom: -.25em;
+  }
+  img {
+    border: 0;
+  }
+  svg:not(:root) {
+    overflow: hidden;
+  }
+  figure {
+    margin: 1em 40px;
+  }
+  hr {
+    height: 0;
+    -webkit-box-sizing: content-box;
+       -moz-box-sizing: content-box;
+            box-sizing: content-box;
+  }
+  pre {
+    overflow: auto;
+  }
+  code,
+  kbd,
+  pre,
+  samp {
+    font-family: monospace, monospace;
+    font-size: 1em;
+  }
+  button,
+  input,
+  optgroup,
+  select,
+  textarea {
+    margin: 0;
+    font: inherit;
+    color: inherit;
+  }
+  button {
+    overflow: visible;
+  }
+  button,
+  select {
+    text-transform: none;
+  }
+  button,
+  html input[type="button"],
+  input[type="reset"],
+  input[type="submit"] {
+    -webkit-appearance: button;
+    cursor: pointer;
+  }
+  button[disabled],
+  html input[disabled] {
+    cursor: default;
+  }
+  button::-moz-focus-inner,
+  input::-moz-focus-inner {
+    padding: 0;
+    border: 0;
+  }
+  input {
+    line-height: normal;
+  }
+  input[type="checkbox"],
+  input[type="radio"] {
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+            box-sizing: border-box;
+    padding: 0;
+  }
+  input[type="number"]::-webkit-inner-spin-button,
+  input[type="number"]::-webkit-outer-spin-button {
+    height: auto;
+  }
+  input[type="search"] {
+    -webkit-box-sizing: content-box;
+       -moz-box-sizing: content-box;
+            box-sizing: content-box;
+    -webkit-appearance: textfield;
+  }
+  input[type="search"]::-webkit-search-cancel-button,
+  input[type="search"]::-webkit-search-decoration {
+    -webkit-appearance: none;
+  }
+  fieldset {
+    padding: .35em .625em .75em;
+    margin: 0 2px;
+    border: 1px solid #c0c0c0;
+  }
+  legend {
+    padding: 0;
+    border: 0;
+  }
+  textarea {
+    overflow: auto;
+  }
+  optgroup {
+    font-weight: bold;
+  }
+  table {
+    border-spacing: 0;
+    border-collapse: collapse;
+  }
+  td,
+  th {
+    padding: 0;
+  }
+  /*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */
+  @media print {
+    *,
+    *:before,
+    *:after {
+      color: #000 !important;
+      text-shadow: none !important;
+      background: transparent !important;
+      -webkit-box-shadow: none !important;
+              box-shadow: none !important;
+    }
+    a,
+    a:visited {
+      text-decoration: underline;
+    }
+    a[href]:after {
+      content: " (" attr(href) ")";
+    }
+    abbr[title]:after {
+      content: " (" attr(title) ")";
+    }
+    a[href^="#"]:after,
+    a[href^="javascript:"]:after {
+      content: "";
+    }
+    pre,
+    blockquote {
+      border: 1px solid #999;
+  
+      page-break-inside: avoid;
+    }
+    thead {
+      display: table-header-group;
+    }
+    tr,
+    img {
+      page-break-inside: avoid;
+    }
+    img {
+      max-width: 100% !important;
+    }
+    p,
+    h2,
+    h3 {
+      orphans: 3;
+      widows: 3;
+    }
+    h2,
+    h3 {
+      page-break-after: avoid;
+    }
+    .navbar {
+      display: none;
+    }
+    .btn > .caret,
+    .dropup > .btn > .caret {
+      border-top-color: #000 !important;
+    }
+    .label {
+      border: 1px solid #000;
+    }
+    .table {
+      border-collapse: collapse !important;
+    }
+    .table td,
+    .table th {
+      background-color: #fff !important;
+    }
+    .table-bordered th,
+    .table-bordered td {
+      border: 1px solid #ddd !important;
+    }
+  }
+  @font-face {
+    font-family: 'Glyphicons Halflings';
+  
+    src: url('../fonts/glyphicons-halflings-regular.eot');
+    src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff2') format('woff2'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
+  }
+  .glyphicon {
+    position: relative;
+    top: 1px;
+    display: inline-block;
+    font-family: 'Glyphicons Halflings';
+    font-style: normal;
+    font-weight: normal;
+    line-height: 1;
+  
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
+  }
+  .glyphicon-asterisk:before {
+    content: "\002a";
+  }
+  .glyphicon-plus:before {
+    content: "\002b";
+  }
+  .glyphicon-euro:before,
+  .glyphicon-eur:before {
+    content: "\20ac";
+  }
+  .glyphicon-minus:before {
+    content: "\2212";
+  }
+  .glyphicon-cloud:before {
+    content: "\2601";
+  }
+  .glyphicon-envelope:before {
+    content: "\2709";
+  }
+  .glyphicon-pencil:before {
+    content: "\270f";
+  }
+  .glyphicon-glass:before {
+    content: "\e001";
+  }
+  .glyphicon-music:before {
+    content: "\e002";
+  }
+  .glyphicon-search:before {
+    content: "\e003";
+  }
+  .glyphicon-heart:before {
+    content: "\e005";
+  }
+  .glyphicon-star:before {
+    content: "\e006";
+  }
+  .glyphicon-star-empty:before {
+    content: "\e007";
+  }
+  .glyphicon-user:before {
+    content: "\e008";
+  }
+  .glyphicon-film:before {
+    content: "\e009";
+  }
+  .glyphicon-th-large:before {
+    content: "\e010";
+  }
+  .glyphicon-th:before {
+    content: "\e011";
+  }
+  .glyphicon-th-list:before {
+    content: "\e012";
+  }
+  .glyphicon-ok:before {
+    content: "\e013";
+  }
+  .glyphicon-remove:before {
+    content: "\e014";
+  }
+  .glyphicon-zoom-in:before {
+    content: "\e015";
+  }
+  .glyphicon-zoom-out:before {
+    content: "\e016";
+  }
+  .glyphicon-off:before {
+    content: "\e017";
+  }
+  .glyphicon-signal:before {
+    content: "\e018";
+  }
+  .glyphicon-cog:before {
+    content: "\e019";
+  }
+  .glyphicon-trash:before {
+    content: "\e020";
+  }
+  .glyphicon-home:before {
+    content: "\e021";
+  }
+  .glyphicon-file:before {
+    content: "\e022";
+  }
+  .glyphicon-time:before {
+    content: "\e023";
+  }
+  .glyphicon-road:before {
+    content: "\e024";
+  }
+  .glyphicon-download-alt:before {
+    content: "\e025";
+  }
+  .glyphicon-download:before {
+    content: "\e026";
+  }
+  .glyphicon-upload:before {
+    content: "\e027";
+  }
+  .glyphicon-inbox:before {
+    content: "\e028";
+  }
+  .glyphicon-play-circle:before {
+    content: "\e029";
+  }
+  .glyphicon-repeat:before {
+    content: "\e030";
+  }
+  .glyphicon-refresh:before {
+    content: "\e031";
+  }
+  .glyphicon-list-alt:before {
+    content: "\e032";
+  }
+  .glyphicon-lock:before {
+    content: "\e033";
+  }
+  .glyphicon-flag:before {
+    content: "\e034";
+  }
+  .glyphicon-headphones:before {
+    content: "\e035";
+  }
+  .glyphicon-volume-off:before {
+    content: "\e036";
+  }
+  .glyphicon-volume-down:before {
+    content: "\e037";
+  }
+  .glyphicon-volume-up:before {
+    content: "\e038";
+  }
+  .glyphicon-qrcode:before {
+    content: "\e039";
+  }
+  .glyphicon-barcode:before {
+    content: "\e040";
+  }
+  .glyphicon-tag:before {
+    content: "\e041";
+  }
+  .glyphicon-tags:before {
+    content: "\e042";
+  }
+  .glyphicon-book:before {
+    content: "\e043";
+  }
+  .glyphicon-bookmark:before {
+    content: "\e044";
+  }
+  .glyphicon-print:before {
+    content: "\e045";
+  }
+  .glyphicon-camera:before {
+    content: "\e046";
+  }
+  .glyphicon-font:before {
+    content: "\e047";
+  }
+  .glyphicon-bold:before {
+    content: "\e048";
+  }
+  .glyphicon-italic:before {
+    content: "\e049";
+  }
+  .glyphicon-text-height:before {
+    content: "\e050";
+  }
+  .glyphicon-text-width:before {
+    content: "\e051";
+  }
+  .glyphicon-align-left:before {
+    content: "\e052";
+  }
+  .glyphicon-align-center:before {
+    content: "\e053";
+  }
+  .glyphicon-align-right:before {
+    content: "\e054";
+  }
+  .glyphicon-align-justify:before {
+    content: "\e055";
+  }
+  .glyphicon-list:before {
+    content: "\e056";
+  }
+  .glyphicon-indent-left:before {
+    content: "\e057";
+  }
+  .glyphicon-indent-right:before {
+    content: "\e058";
+  }
+  .glyphicon-facetime-video:before {
+    content: "\e059";
+  }
+  .glyphicon-picture:before {
+    content: "\e060";
+  }
+  .glyphicon-map-marker:before {
+    content: "\e062";
+  }
+  .glyphicon-adjust:before {
+    content: "\e063";
+  }
+  .glyphicon-tint:before {
+    content: "\e064";
+  }
+  .glyphicon-edit:before {
+    content: "\e065";
+  }
+  .glyphicon-share:before {
+    content: "\e066";
+  }
+  .glyphicon-check:before {
+    content: "\e067";
+  }
+  .glyphicon-move:before {
+    content: "\e068";
+  }
+  .glyphicon-step-backward:before {
+    content: "\e069";
+  }
+  .glyphicon-fast-backward:before {
+    content: "\e070";
+  }
+  .glyphicon-backward:before {
+    content: "\e071";
+  }
+  .glyphicon-play:before {
+    content: "\e072";
+  }
+  .glyphicon-pause:before {
+    content: "\e073";
+  }
+  .glyphicon-stop:before {
+    content: "\e074";
+  }
+  .glyphicon-forward:before {
+    content: "\e075";
+  }
+  .glyphicon-fast-forward:before {
+    content: "\e076";
+  }
+  .glyphicon-step-forward:before {
+    content: "\e077";
+  }
+  .glyphicon-eject:before {
+    content: "\e078";
+  }
+  .glyphicon-chevron-left:before {
+    content: "\e079";
+  }
+  .glyphicon-chevron-right:before {
+    content: "\e080";
+  }
+  .glyphicon-plus-sign:before {
+    content: "\e081";
+  }
+  .glyphicon-minus-sign:before {
+    content: "\e082";
+  }
+  .glyphicon-remove-sign:before {
+    content: "\e083";
+  }
+  .glyphicon-ok-sign:before {
+    content: "\e084";
+  }
+  .glyphicon-question-sign:before {
+    content: "\e085";
+  }
+  .glyphicon-info-sign:before {
+    content: "\e086";
+  }
+  .glyphicon-screenshot:before {
+    content: "\e087";
+  }
+  .glyphicon-remove-circle:before {
+    content: "\e088";
+  }
+  .glyphicon-ok-circle:before {
+    content: "\e089";
+  }
+  .glyphicon-ban-circle:before {
+    content: "\e090";
+  }
+  .glyphicon-arrow-left:before {
+    content: "\e091";
+  }
+  .glyphicon-arrow-right:before {
+    content: "\e092";
+  }
+  .glyphicon-arrow-up:before {
+    content: "\e093";
+  }
+  .glyphicon-arrow-down:before {
+    content: "\e094";
+  }
+  .glyphicon-share-alt:before {
+    content: "\e095";
+  }
+  .glyphicon-resize-full:before {
+    content: "\e096";
+  }
+  .glyphicon-resize-small:before {
+    content: "\e097";
+  }
+  .glyphicon-exclamation-sign:before {
+    content: "\e101";
+  }
+  .glyphicon-gift:before {
+    content: "\e102";
+  }
+  .glyphicon-leaf:before {
+    content: "\e103";
+  }
+  .glyphicon-fire:before {
+    content: "\e104";
+  }
+  .glyphicon-eye-open:before {
+    content: "\e105";
+  }
+  .glyphicon-eye-close:before {
+    content: "\e106";
+  }
+  .glyphicon-warning-sign:before {
+    content: "\e107";
+  }
+  .glyphicon-plane:before {
+    content: "\e108";
+  }
+  .glyphicon-calendar:before {
+    content: "\e109";
+  }
+  .glyphicon-random:before {
+    content: "\e110";
+  }
+  .glyphicon-comment:before {
+    content: "\e111";
+  }
+  .glyphicon-magnet:before {
+    content: "\e112";
+  }
+  .glyphicon-chevron-up:before {
+    content: "\e113";
+  }
+  .glyphicon-chevron-down:before {
+    content: "\e114";
+  }
+  .glyphicon-retweet:before {
+    content: "\e115";
+  }
+  .glyphicon-shopping-cart:before {
+    content: "\e116";
+  }
+  .glyphicon-folder-close:before {
+    content: "\e117";
+  }
+  .glyphicon-folder-open:before {
+    content: "\e118";
+  }
+  .glyphicon-resize-vertical:before {
+    content: "\e119";
+  }
+  .glyphicon-resize-horizontal:before {
+    content: "\e120";
+  }
+  .glyphicon-hdd:before {
+    content: "\e121";
+  }
+  .glyphicon-bullhorn:before {
+    content: "\e122";
+  }
+  .glyphicon-bell:before {
+    content: "\e123";
+  }
+  .glyphicon-certificate:before {
+    content: "\e124";
+  }
+  .glyphicon-thumbs-up:before {
+    content: "\e125";
+  }
+  .glyphicon-thumbs-down:before {
+    content: "\e126";
+  }
+  .glyphicon-hand-right:before {
+    content: "\e127";
+  }
+  .glyphicon-hand-left:before {
+    content: "\e128";
+  }
+  .glyphicon-hand-up:before {
+    content: "\e129";
+  }
+  .glyphicon-hand-down:before {
+    content: "\e130";
+  }
+  .glyphicon-circle-arrow-right:before {
+    content: "\e131";
+  }
+  .glyphicon-circle-arrow-left:before {
+    content: "\e132";
+  }
+  .glyphicon-circle-arrow-up:before {
+    content: "\e133";
+  }
+  .glyphicon-circle-arrow-down:before {
+    content: "\e134";
+  }
+  .glyphicon-globe:before {
+    content: "\e135";
+  }
+  .glyphicon-wrench:before {
+    content: "\e136";
+  }
+  .glyphicon-tasks:before {
+    content: "\e137";
+  }
+  .glyphicon-filter:before {
+    content: "\e138";
+  }
+  .glyphicon-briefcase:before {
+    content: "\e139";
+  }
+  .glyphicon-fullscreen:before {
+    content: "\e140";
+  }
+  .glyphicon-dashboard:before {
+    content: "\e141";
+  }
+  .glyphicon-paperclip:before {
+    content: "\e142";
+  }
+  .glyphicon-heart-empty:before {
+    content: "\e143";
+  }
+  .glyphicon-link:before {
+    content: "\e144";
+  }
+  .glyphicon-phone:before {
+    content: "\e145";
+  }
+  .glyphicon-pushpin:before {
+    content: "\e146";
+  }
+  .glyphicon-usd:before {
+    content: "\e148";
+  }
+  .glyphicon-gbp:before {
+    content: "\e149";
+  }
+  .glyphicon-sort:before {
+    content: "\e150";
+  }
+  .glyphicon-sort-by-alphabet:before {
+    content: "\e151";
+  }
+  .glyphicon-sort-by-alphabet-alt:before {
+    content: "\e152";
+  }
+  .glyphicon-sort-by-order:before {
+    content: "\e153";
+  }
+  .glyphicon-sort-by-order-alt:before {
+    content: "\e154";
+  }
+  .glyphicon-sort-by-attributes:before {
+    content: "\e155";
+  }
+  .glyphicon-sort-by-attributes-alt:before {
+    content: "\e156";
+  }
+  .glyphicon-unchecked:before {
+    content: "\e157";
+  }
+  .glyphicon-expand:before {
+    content: "\e158";
+  }
+  .glyphicon-collapse-down:before {
+    content: "\e159";
+  }
+  .glyphicon-collapse-up:before {
+    content: "\e160";
+  }
+  .glyphicon-log-in:before {
+    content: "\e161";
+  }
+  .glyphicon-flash:before {
+    content: "\e162";
+  }
+  .glyphicon-log-out:before {
+    content: "\e163";
+  }
+  .glyphicon-new-window:before {
+    content: "\e164";
+  }
+  .glyphicon-record:before {
+    content: "\e165";
+  }
+  .glyphicon-save:before {
+    content: "\e166";
+  }
+  .glyphicon-open:before {
+    content: "\e167";
+  }
+  .glyphicon-saved:before {
+    content: "\e168";
+  }
+  .glyphicon-import:before {
+    content: "\e169";
+  }
+  .glyphicon-export:before {
+    content: "\e170";
+  }
+  .glyphicon-send:before {
+    content: "\e171";
+  }
+  .glyphicon-floppy-disk:before {
+    content: "\e172";
+  }
+  .glyphicon-floppy-saved:before {
+    content: "\e173";
+  }
+  .glyphicon-floppy-remove:before {
+    content: "\e174";
+  }
+  .glyphicon-floppy-save:before {
+    content: "\e175";
+  }
+  .glyphicon-floppy-open:before {
+    content: "\e176";
+  }
+  .glyphicon-credit-card:before {
+    content: "\e177";
+  }
+  .glyphicon-transfer:before {
+    content: "\e178";
+  }
+  .glyphicon-cutlery:before {
+    content: "\e179";
+  }
+  .glyphicon-header:before {
+    content: "\e180";
+  }
+  .glyphicon-compressed:before {
+    content: "\e181";
+  }
+  .glyphicon-earphone:before {
+    content: "\e182";
+  }
+  .glyphicon-phone-alt:before {
+    content: "\e183";
+  }
+  .glyphicon-tower:before {
+    content: "\e184";
+  }
+  .glyphicon-stats:before {
+    content: "\e185";
+  }
+  .glyphicon-sd-video:before {
+    content: "\e186";
+  }
+  .glyphicon-hd-video:before {
+    content: "\e187";
+  }
+  .glyphicon-subtitles:before {
+    content: "\e188";
+  }
+  .glyphicon-sound-stereo:before {
+    content: "\e189";
+  }
+  .glyphicon-sound-dolby:before {
+    content: "\e190";
+  }
+  .glyphicon-sound-5-1:before {
+    content: "\e191";
+  }
+  .glyphicon-sound-6-1:before {
+    content: "\e192";
+  }
+  .glyphicon-sound-7-1:before {
+    content: "\e193";
+  }
+  .glyphicon-copyright-mark:before {
+    content: "\e194";
+  }
+  .glyphicon-registration-mark:before {
+    content: "\e195";
+  }
+  .glyphicon-cloud-download:before {
+    content: "\e197";
+  }
+  .glyphicon-cloud-upload:before {
+    content: "\e198";
+  }
+  .glyphicon-tree-conifer:before {
+    content: "\e199";
+  }
+  .glyphicon-tree-deciduous:before {
+    content: "\e200";
+  }
+  .glyphicon-cd:before {
+    content: "\e201";
+  }
+  .glyphicon-save-file:before {
+    content: "\e202";
+  }
+  .glyphicon-open-file:before {
+    content: "\e203";
+  }
+  .glyphicon-level-up:before {
+    content: "\e204";
+  }
+  .glyphicon-copy:before {
+    content: "\e205";
+  }
+  .glyphicon-paste:before {
+    content: "\e206";
+  }
+  .glyphicon-alert:before {
+    content: "\e209";
+  }
+  .glyphicon-equalizer:before {
+    content: "\e210";
+  }
+  .glyphicon-king:before {
+    content: "\e211";
+  }
+  .glyphicon-queen:before {
+    content: "\e212";
+  }
+  .glyphicon-pawn:before {
+    content: "\e213";
+  }
+  .glyphicon-bishop:before {
+    content: "\e214";
+  }
+  .glyphicon-knight:before {
+    content: "\e215";
+  }
+  .glyphicon-baby-formula:before {
+    content: "\e216";
+  }
+  .glyphicon-tent:before {
+    content: "\26fa";
+  }
+  .glyphicon-blackboard:before {
+    content: "\e218";
+  }
+  .glyphicon-bed:before {
+    content: "\e219";
+  }
+  .glyphicon-apple:before {
+    content: "\f8ff";
+  }
+  .glyphicon-erase:before {
+    content: "\e221";
+  }
+  .glyphicon-hourglass:before {
+    content: "\231b";
+  }
+  .glyphicon-lamp:before {
+    content: "\e223";
+  }
+  .glyphicon-duplicate:before {
+    content: "\e224";
+  }
+  .glyphicon-piggy-bank:before {
+    content: "\e225";
+  }
+  .glyphicon-scissors:before {
+    content: "\e226";
+  }
+  .glyphicon-bitcoin:before {
+    content: "\e227";
+  }
+  .glyphicon-btc:before {
+    content: "\e227";
+  }
+  .glyphicon-xbt:before {
+    content: "\e227";
+  }
+  .glyphicon-yen:before {
+    content: "\00a5";
+  }
+  .glyphicon-jpy:before {
+    content: "\00a5";
+  }
+  .glyphicon-ruble:before {
+    content: "\20bd";
+  }
+  .glyphicon-rub:before {
+    content: "\20bd";
+  }
+  .glyphicon-scale:before {
+    content: "\e230";
+  }
+  .glyphicon-ice-lolly:before {
+    content: "\e231";
+  }
+  .glyphicon-ice-lolly-tasted:before {
+    content: "\e232";
+  }
+  .glyphicon-education:before {
+    content: "\e233";
+  }
+  .glyphicon-option-horizontal:before {
+    content: "\e234";
+  }
+  .glyphicon-option-vertical:before {
+    content: "\e235";
+  }
+  .glyphicon-menu-hamburger:before {
+    content: "\e236";
+  }
+  .glyphicon-modal-window:before {
+    content: "\e237";
+  }
+  .glyphicon-oil:before {
+    content: "\e238";
+  }
+  .glyphicon-grain:before {
+    content: "\e239";
+  }
+  .glyphicon-sunglasses:before {
+    content: "\e240";
+  }
+  .glyphicon-text-size:before {
+    content: "\e241";
+  }
+  .glyphicon-text-color:before {
+    content: "\e242";
+  }
+  .glyphicon-text-background:before {
+    content: "\e243";
+  }
+  .glyphicon-object-align-top:before {
+    content: "\e244";
+  }
+  .glyphicon-object-align-bottom:before {
+    content: "\e245";
+  }
+  .glyphicon-object-align-horizontal:before {
+    content: "\e246";
+  }
+  .glyphicon-object-align-left:before {
+    content: "\e247";
+  }
+  .glyphicon-object-align-vertical:before {
+    content: "\e248";
+  }
+  .glyphicon-object-align-right:before {
+    content: "\e249";
+  }
+  .glyphicon-triangle-right:before {
+    content: "\e250";
+  }
+  .glyphicon-triangle-left:before {
+    content: "\e251";
+  }
+  .glyphicon-triangle-bottom:before {
+    content: "\e252";
+  }
+  .glyphicon-triangle-top:before {
+    content: "\e253";
+  }
+  .glyphicon-console:before {
+    content: "\e254";
+  }
+  .glyphicon-superscript:before {
+    content: "\e255";
+  }
+  .glyphicon-subscript:before {
+    content: "\e256";
+  }
+  .glyphicon-menu-left:before {
+    content: "\e257";
+  }
+  .glyphicon-menu-right:before {
+    content: "\e258";
+  }
+  .glyphicon-menu-down:before {
+    content: "\e259";
+  }
+  .glyphicon-menu-up:before {
+    content: "\e260";
+  }
+  * {
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+            box-sizing: border-box;
+  }
+  *:before,
+  *:after {
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+            box-sizing: border-box;
+  }
+  html {
+    font-size: 10px;
+  
+    -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+  }
+  body {
+    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+    font-size: 14px;
+    line-height: 1.42857143;
+    color: #333;
+    background-color: #fff;
+  }
+  input,
+  button,
+  select,
+  textarea {
+    font-family: inherit;
+    font-size: inherit;
+    line-height: inherit;
+  }
+  a {
+    color: #337ab7;
+    text-decoration: none;
+  }
+  a:hover,
+  a:focus {
+    color: #23527c;
+    text-decoration: underline;
+  }
+  a:focus {
+    outline: 5px auto -webkit-focus-ring-color;
+    outline-offset: -2px;
+  }
+  figure {
+    margin: 0;
+  }
+  img {
+    vertical-align: middle;
+  }
+  .img-responsive,
+  .thumbnail > img,
+  .thumbnail a > img,
+  .carousel-inner > .item > img,
+  .carousel-inner > .item > a > img {
+    display: block;
+    max-width: 100%;
+    height: auto;
+  }
+  .img-rounded {
+    border-radius: 6px;
+  }
+  .img-thumbnail {
+    display: inline-block;
+    max-width: 100%;
+    height: auto;
+    padding: 4px;
+    line-height: 1.42857143;
+    background-color: #fff;
+    border: 1px solid #ddd;
+    border-radius: 4px;
+    -webkit-transition: all .2s ease-in-out;
+         -o-transition: all .2s ease-in-out;
+            transition: all .2s ease-in-out;
+  }
+  .img-circle {
+    border-radius: 50%;
+  }
+  hr {
+    margin-top: 20px;
+    margin-bottom: 20px;
+    border: 0;
+    border-top: 1px solid #eee;
+  }
+  .sr-only {
+    position: absolute;
+    width: 1px;
+    height: 1px;
+    padding: 0;
+    margin: -1px;
+    overflow: hidden;
+    clip: rect(0, 0, 0, 0);
+    border: 0;
+  }
+  .sr-only-focusable:active,
+  .sr-only-focusable:focus {
+    position: static;
+    width: auto;
+    height: auto;
+    margin: 0;
+    overflow: visible;
+    clip: auto;
+  }
+  [role="button"] {
+    cursor: pointer;
+  }
+  h1,
+  h2,
+  h3,
+  h4,
+  h5,
+  h6,
+  .h1,
+  .h2,
+  .h3,
+  .h4,
+  .h5,
+  .h6 {
+    font-family: inherit;
+    font-weight: 500;
+    line-height: 1.1;
+    color: inherit;
+  }
+  h1 small,
+  h2 small,
+  h3 small,
+  h4 small,
+  h5 small,
+  h6 small,
+  .h1 small,
+  .h2 small,
+  .h3 small,
+  .h4 small,
+  .h5 small,
+  .h6 small,
+  h1 .small,
+  h2 .small,
+  h3 .small,
+  h4 .small,
+  h5 .small,
+  h6 .small,
+  .h1 .small,
+  .h2 .small,
+  .h3 .small,
+  .h4 .small,
+  .h5 .small,
+  .h6 .small {
+    font-weight: normal;
+    line-height: 1;
+    color: #777;
+  }
+  h1,
+  .h1,
+  h2,
+  .h2,
+  h3,
+  .h3 {
+    margin-top: 20px;
+    margin-bottom: 10px;
+  }
+  h1 small,
+  .h1 small,
+  h2 small,
+  .h2 small,
+  h3 small,
+  .h3 small,
+  h1 .small,
+  .h1 .small,
+  h2 .small,
+  .h2 .small,
+  h3 .small,
+  .h3 .small {
+    font-size: 65%;
+  }
+  h4,
+  .h4,
+  h5,
+  .h5,
+  h6,
+  .h6 {
+    margin-top: 10px;
+    margin-bottom: 10px;
+  }
+  h4 small,
+  .h4 small,
+  h5 small,
+  .h5 small,
+  h6 small,
+  .h6 small,
+  h4 .small,
+  .h4 .small,
+  h5 .small,
+  .h5 .small,
+  h6 .small,
+  .h6 .small {
+    font-size: 75%;
+  }
+  h1,
+  .h1 {
+    font-size: 36px;
+  }
+  h2,
+  .h2 {
+    font-size: 30px;
+  }
+  h3,
+  .h3 {
+    font-size: 24px;
+  }
+  h4,
+  .h4 {
+    font-size: 18px;
+  }
+  h5,
+  .h5 {
+    font-size: 14px;
+  }
+  h6,
+  .h6 {
+    font-size: 12px;
+  }
+  p {
+    margin: 0 0 10px;
+  }
+  .lead {
+    margin-bottom: 20px;
+    font-size: 16px;
+    font-weight: 300;
+    line-height: 1.4;
+  }
+  @media (min-width: 768px) {
+    .lead {
+      font-size: 21px;
+    }
+  }
+  small,
+  .small {
+    font-size: 85%;
+  }
+  mark,
+  .mark {
+    padding: .2em;
+    background-color: #fcf8e3;
+  }
+  .text-left {
+    text-align: left;
+  }
+  .text-right {
+    text-align: right;
+  }
+  .text-center {
+    text-align: center;
+  }
+  .text-justify {
+    text-align: justify;
+  }
+  .text-nowrap {
+    white-space: nowrap;
+  }
+  .text-lowercase {
+    text-transform: lowercase;
+  }
+  .text-uppercase {
+    text-transform: uppercase;
+  }
+  .text-capitalize {
+    text-transform: capitalize;
+  }
+  .text-muted {
+    color: #777;
+  }
+  .text-primary {
+    color: #337ab7;
+  }
+  a.text-primary:hover,
+  a.text-primary:focus {
+    color: #286090;
+  }
+  .text-success {
+    color: #3c763d;
+  }
+  a.text-success:hover,
+  a.text-success:focus {
+    color: #2b542c;
+  }
+  .text-info {
+    color: #31708f;
+  }
+  a.text-info:hover,
+  a.text-info:focus {
+    color: #245269;
+  }
+  .text-warning {
+    color: #8a6d3b;
+  }
+  a.text-warning:hover,
+  a.text-warning:focus {
+    color: #66512c;
+  }
+  .text-danger {
+    color: #a94442;
+  }
+  a.text-danger:hover,
+  a.text-danger:focus {
+    color: #843534;
+  }
+  .bg-primary {
+    color: #fff;
+    background-color: #337ab7;
+  }
+  a.bg-primary:hover,
+  a.bg-primary:focus {
+    background-color: #286090;
+  }
+  .bg-success {
+    background-color: #dff0d8;
+  }
+  a.bg-success:hover,
+  a.bg-success:focus {
+    background-color: #c1e2b3;
+  }
+  .bg-info {
+    background-color: #d9edf7;
+  }
+  a.bg-info:hover,
+  a.bg-info:focus {
+    background-color: #afd9ee;
+  }
+  .bg-warning {
+    background-color: #fcf8e3;
+  }
+  a.bg-warning:hover,
+  a.bg-warning:focus {
+    background-color: #f7ecb5;
+  }
+  .bg-danger {
+    background-color: #f2dede;
+  }
+  a.bg-danger:hover,
+  a.bg-danger:focus {
+    background-color: #e4b9b9;
+  }
+  .page-header {
+    padding-bottom: 9px;
+    margin: 40px 0 20px;
+    border-bottom: 1px solid #eee;
+  }
+  ul,
+  ol {
+    margin-top: 0;
+    margin-bottom: 10px;
+  }
+  ul ul,
+  ol ul,
+  ul ol,
+  ol ol {
+    margin-bottom: 0;
+  }
+  .list-unstyled {
+    padding-left: 0;
+    list-style: none;
+  }
+  .list-inline {
+    padding-left: 0;
+    margin-left: -5px;
+    list-style: none;
+  }
+  .list-inline > li {
+    display: inline-block;
+    padding-right: 5px;
+    padding-left: 5px;
+  }
+  dl {
+    margin-top: 0;
+    margin-bottom: 20px;
+  }
+  dt,
+  dd {
+    line-height: 1.42857143;
+  }
+  dt {
+    font-weight: bold;
+  }
+  dd {
+    margin-left: 0;
+  }
+  @media (min-width: 768px) {
+    .dl-horizontal dt {
+      float: left;
+      width: 160px;
+      overflow: hidden;
+      clear: left;
+      text-align: right;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+    .dl-horizontal dd {
+      margin-left: 180px;
+    }
+  }
+  abbr[title],
+  abbr[data-original-title] {
+    cursor: help;
+    border-bottom: 1px dotted #777;
+  }
+  .initialism {
+    font-size: 90%;
+    text-transform: uppercase;
+  }
+  blockquote {
+    padding: 10px 20px;
+    margin: 0 0 20px;
+    font-size: 17.5px;
+    border-left: 5px solid #eee;
+  }
+  blockquote p:last-child,
+  blockquote ul:last-child,
+  blockquote ol:last-child {
+    margin-bottom: 0;
+  }
+  blockquote footer,
+  blockquote small,
+  blockquote .small {
+    display: block;
+    font-size: 80%;
+    line-height: 1.42857143;
+    color: #777;
+  }
+  blockquote footer:before,
+  blockquote small:before,
+  blockquote .small:before {
+    content: '\2014 \00A0';
+  }
+  .blockquote-reverse,
+  blockquote.pull-right {
+    padding-right: 15px;
+    padding-left: 0;
+    text-align: right;
+    border-right: 5px solid #eee;
+    border-left: 0;
+  }
+  .blockquote-reverse footer:before,
+  blockquote.pull-right footer:before,
+  .blockquote-reverse small:before,
+  blockquote.pull-right small:before,
+  .blockquote-reverse .small:before,
+  blockquote.pull-right .small:before {
+    content: '';
+  }
+  .blockquote-reverse footer:after,
+  blockquote.pull-right footer:after,
+  .blockquote-reverse small:after,
+  blockquote.pull-right small:after,
+  .blockquote-reverse .small:after,
+  blockquote.pull-right .small:after {
+    content: '\00A0 \2014';
+  }
+  address {
+    margin-bottom: 20px;
+    font-style: normal;
+    line-height: 1.42857143;
+  }
+  code,
+  kbd,
+  pre,
+  samp {
+    font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
+  }
+  code {
+    padding: 2px 4px;
+    font-size: 90%;
+    color: #c7254e;
+    background-color: #f9f2f4;
+    border-radius: 4px;
+  }
+  kbd {
+    padding: 2px 4px;
+    font-size: 90%;
+    color: #fff;
+    background-color: #333;
+    border-radius: 3px;
+    -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .25);
+            box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .25);
+  }
+  kbd kbd {
+    padding: 0;
+    font-size: 100%;
+    font-weight: bold;
+    -webkit-box-shadow: none;
+            box-shadow: none;
+  }
+  pre {
+    display: block;
+    padding: 9.5px;
+    margin: 0 0 10px;
+    font-size: 13px;
+    line-height: 1.42857143;
+    color: #333;
+    word-break: break-all;
+    word-wrap: break-word;
+    background-color: #f5f5f5;
+    border: 1px solid #ccc;
+    border-radius: 4px;
+  }
+  pre code {
+    padding: 0;
+    font-size: inherit;
+    color: inherit;
+    white-space: pre-wrap;
+    background-color: transparent;
+    border-radius: 0;
+  }
+  .pre-scrollable {
+    max-height: 340px;
+    overflow-y: scroll;
+  }
+  .container {
+    padding-right: 15px;
+    padding-left: 15px;
+    margin-right: auto;
+    margin-left: auto;
+  }
+  @media (min-width: 768px) {
+    .container {
+      width: 750px;
+    }
+  }
+  @media (min-width: 992px) {
+    .container {
+      width: 970px;
+    }
+  }
+  @media (min-width: 1200px) {
+    .container {
+      width: 1170px;
+    }
+  }
+  .container-fluid {
+    padding-right: 15px;
+    padding-left: 15px;
+    margin-right: auto;
+    margin-left: auto;
+  }
+  .row {
+    margin-right: -15px;
+    margin-left: -15px;
+  }
+  .col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12 {
+    position: relative;
+    min-height: 1px;
+    padding-right: 15px;
+    padding-left: 15px;
+  }
+  .col-xs-1, .col-xs-2, .col-xs-3, .col-xs-4, .col-xs-5, .col-xs-6, .col-xs-7, .col-xs-8, .col-xs-9, .col-xs-10, .col-xs-11, .col-xs-12 {
+    float: left;
+  }
+  .col-xs-12 {
+    width: 100%;
+  }
+  .col-xs-11 {
+    width: 91.66666667%;
+  }
+  .col-xs-10 {
+    width: 83.33333333%;
+  }
+  .col-xs-9 {
+    width: 75%;
+  }
+  .col-xs-8 {
+    width: 66.66666667%;
+  }
+  .col-xs-7 {
+    width: 58.33333333%;
+  }
+  .col-xs-6 {
+    width: 50%;
+  }
+  .col-xs-5 {
+    width: 41.66666667%;
+  }
+  .col-xs-4 {
+    width: 33.33333333%;
+  }
+  .col-xs-3 {
+    width: 25%;
+  }
+  .col-xs-2 {
+    width: 16.66666667%;
+  }
+  .col-xs-1 {
+    width: 8.33333333%;
+  }
+  .col-xs-pull-12 {
+    right: 100%;
+  }
+  .col-xs-pull-11 {
+    right: 91.66666667%;
+  }
+  .col-xs-pull-10 {
+    right: 83.33333333%;
+  }
+  .col-xs-pull-9 {
+    right: 75%;
+  }
+  .col-xs-pull-8 {
+    right: 66.66666667%;
+  }
+  .col-xs-pull-7 {
+    right: 58.33333333%;
+  }
+  .col-xs-pull-6 {
+    right: 50%;
+  }
+  .col-xs-pull-5 {
+    right: 41.66666667%;
+  }
+  .col-xs-pull-4 {
+    right: 33.33333333%;
+  }
+  .col-xs-pull-3 {
+    right: 25%;
+  }
+  .col-xs-pull-2 {
+    right: 16.66666667%;
+  }
+  .col-xs-pull-1 {
+    right: 8.33333333%;
+  }
+  .col-xs-pull-0 {
+    right: auto;
+  }
+  .col-xs-push-12 {
+    left: 100%;
+  }
+  .col-xs-push-11 {
+    left: 91.66666667%;
+  }
+  .col-xs-push-10 {
+    left: 83.33333333%;
+  }
+  .col-xs-push-9 {
+    left: 75%;
+  }
+  .col-xs-push-8 {
+    left: 66.66666667%;
+  }
+  .col-xs-push-7 {
+    left: 58.33333333%;
+  }
+  .col-xs-push-6 {
+    left: 50%;
+  }
+  .col-xs-push-5 {
+    left: 41.66666667%;
+  }
+  .col-xs-push-4 {
+    left: 33.33333333%;
+  }
+  .col-xs-push-3 {
+    left: 25%;
+  }
+  .col-xs-push-2 {
+    left: 16.66666667%;
+  }
+  .col-xs-push-1 {
+    left: 8.33333333%;
+  }
+  .col-xs-push-0 {
+    left: auto;
+  }
+  .col-xs-offset-12 {
+    margin-left: 100%;
+  }
+  .col-xs-offset-11 {
+    margin-left: 91.66666667%;
+  }
+  .col-xs-offset-10 {
+    margin-left: 83.33333333%;
+  }
+  .col-xs-offset-9 {
+    margin-left: 75%;
+  }
+  .col-xs-offset-8 {
+    margin-left: 66.66666667%;
+  }
+  .col-xs-offset-7 {
+    margin-left: 58.33333333%;
+  }
+  .col-xs-offset-6 {
+    margin-left: 50%;
+  }
+  .col-xs-offset-5 {
+    margin-left: 41.66666667%;
+  }
+  .col-xs-offset-4 {
+    margin-left: 33.33333333%;
+  }
+  .col-xs-offset-3 {
+    margin-left: 25%;
+  }
+  .col-xs-offset-2 {
+    margin-left: 16.66666667%;
+  }
+  .col-xs-offset-1 {
+    margin-left: 8.33333333%;
+  }
+  .col-xs-offset-0 {
+    margin-left: 0;
+  }
+  @media (min-width: 768px) {
+    .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12 {
+      float: left;
+    }
+    .col-sm-12 {
+      width: 100%;
+    }
+    .col-sm-11 {
+      width: 91.66666667%;
+    }
+    .col-sm-10 {
+      width: 83.33333333%;
+    }
+    .col-sm-9 {
+      width: 75%;
+    }
+    .col-sm-8 {
+      width: 66.66666667%;
+    }
+    .col-sm-7 {
+      width: 58.33333333%;
+    }
+    .col-sm-6 {
+      width: 50%;
+    }
+    .col-sm-5 {
+      width: 41.66666667%;
+    }
+    .col-sm-4 {
+      width: 33.33333333%;
+    }
+    .col-sm-3 {
+      width: 25%;
+    }
+    .col-sm-2 {
+      width: 16.66666667%;
+    }
+    .col-sm-1 {
+      width: 8.33333333%;
+    }
+    .col-sm-pull-12 {
+      right: 100%;
+    }
+    .col-sm-pull-11 {
+      right: 91.66666667%;
+    }
+    .col-sm-pull-10 {
+      right: 83.33333333%;
+    }
+    .col-sm-pull-9 {
+      right: 75%;
+    }
+    .col-sm-pull-8 {
+      right: 66.66666667%;
+    }
+    .col-sm-pull-7 {
+      right: 58.33333333%;
+    }
+    .col-sm-pull-6 {
+      right: 50%;
+    }
+    .col-sm-pull-5 {
+      right: 41.66666667%;
+    }
+    .col-sm-pull-4 {
+      right: 33.33333333%;
+    }
+    .col-sm-pull-3 {
+      right: 25%;
+    }
+    .col-sm-pull-2 {
+      right: 16.66666667%;
+    }
+    .col-sm-pull-1 {
+      right: 8.33333333%;
+    }
+    .col-sm-pull-0 {
+      right: auto;
+    }
+    .col-sm-push-12 {
+      left: 100%;
+    }
+    .col-sm-push-11 {
+      left: 91.66666667%;
+    }
+    .col-sm-push-10 {
+      left: 83.33333333%;
+    }
+    .col-sm-push-9 {
+      left: 75%;
+    }
+    .col-sm-push-8 {
+      left: 66.66666667%;
+    }
+    .col-sm-push-7 {
+      left: 58.33333333%;
+    }
+    .col-sm-push-6 {
+      left: 50%;
+    }
+    .col-sm-push-5 {
+      left: 41.66666667%;
+    }
+    .col-sm-push-4 {
+      left: 33.33333333%;
+    }
+    .col-sm-push-3 {
+      left: 25%;
+    }
+    .col-sm-push-2 {
+      left: 16.66666667%;
+    }
+    .col-sm-push-1 {
+      left: 8.33333333%;
+    }
+    .col-sm-push-0 {
+      left: auto;
+    }
+    .col-sm-offset-12 {
+      margin-left: 100%;
+    }
+    .col-sm-offset-11 {
+      margin-left: 91.66666667%;
+    }
+    .col-sm-offset-10 {
+      margin-left: 83.33333333%;
+    }
+    .col-sm-offset-9 {
+      margin-left: 75%;
+    }
+    .col-sm-offset-8 {
+      margin-left: 66.66666667%;
+    }
+    .col-sm-offset-7 {
+      margin-left: 58.33333333%;
+    }
+    .col-sm-offset-6 {
+      margin-left: 50%;
+    }
+    .col-sm-offset-5 {
+      margin-left: 41.66666667%;
+    }
+    .col-sm-offset-4 {
+      margin-left: 33.33333333%;
+    }
+    .col-sm-offset-3 {
+      margin-left: 25%;
+    }
+    .col-sm-offset-2 {
+      margin-left: 16.66666667%;
+    }
+    .col-sm-offset-1 {
+      margin-left: 8.33333333%;
+    }
+    .col-sm-offset-0 {
+      margin-left: 0;
+    }
+  }
+  @media (min-width: 992px) {
+    .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12 {
+      float: left;
+    }
+    .col-md-12 {
+      width: 100%;
+    }
+    .col-md-11 {
+      width: 91.66666667%;
+    }
+    .col-md-10 {
+      width: 83.33333333%;
+    }
+    .col-md-9 {
+      width: 75%;
+    }
+    .col-md-8 {
+      width: 66.66666667%;
+    }
+    .col-md-7 {
+      width: 58.33333333%;
+    }
+    .col-md-6 {
+      width: 50%;
+    }
+    .col-md-5 {
+      width: 41.66666667%;
+    }
+    .col-md-4 {
+      width: 33.33333333%;
+    }
+    .col-md-3 {
+      width: 25%;
+    }
+    .col-md-2 {
+      width: 16.66666667%;
+    }
+    .col-md-1 {
+      width: 8.33333333%;
+    }
+    .col-md-pull-12 {
+      right: 100%;
+    }
+    .col-md-pull-11 {
+      right: 91.66666667%;
+    }
+    .col-md-pull-10 {
+      right: 83.33333333%;
+    }
+    .col-md-pull-9 {
+      right: 75%;
+    }
+    .col-md-pull-8 {
+      right: 66.66666667%;
+    }
+    .col-md-pull-7 {
+      right: 58.33333333%;
+    }
+    .col-md-pull-6 {
+      right: 50%;
+    }
+    .col-md-pull-5 {
+      right: 41.66666667%;
+    }
+    .col-md-pull-4 {
+      right: 33.33333333%;
+    }
+    .col-md-pull-3 {
+      right: 25%;
+    }
+    .col-md-pull-2 {
+      right: 16.66666667%;
+    }
+    .col-md-pull-1 {
+      right: 8.33333333%;
+    }
+    .col-md-pull-0 {
+      right: auto;
+    }
+    .col-md-push-12 {
+      left: 100%;
+    }
+    .col-md-push-11 {
+      left: 91.66666667%;
+    }
+    .col-md-push-10 {
+      left: 83.33333333%;
+    }
+    .col-md-push-9 {
+      left: 75%;
+    }
+    .col-md-push-8 {
+      left: 66.66666667%;
+    }
+    .col-md-push-7 {
+      left: 58.33333333%;
+    }
+    .col-md-push-6 {
+      left: 50%;
+    }
+    .col-md-push-5 {
+      left: 41.66666667%;
+    }
+    .col-md-push-4 {
+      left: 33.33333333%;
+    }
+    .col-md-push-3 {
+      left: 25%;
+    }
+    .col-md-push-2 {
+      left: 16.66666667%;
+    }
+    .col-md-push-1 {
+      left: 8.33333333%;
+    }
+    .col-md-push-0 {
+      left: auto;
+    }
+    .col-md-offset-12 {
+      margin-left: 100%;
+    }
+    .col-md-offset-11 {
+      margin-left: 91.66666667%;
+    }
+    .col-md-offset-10 {
+      margin-left: 83.33333333%;
+    }
+    .col-md-offset-9 {
+      margin-left: 75%;
+    }
+    .col-md-offset-8 {
+      margin-left: 66.66666667%;
+    }
+    .col-md-offset-7 {
+      margin-left: 58.33333333%;
+    }
+    .col-md-offset-6 {
+      margin-left: 50%;
+    }
+    .col-md-offset-5 {
+      margin-left: 41.66666667%;
+    }
+    .col-md-offset-4 {
+      margin-left: 33.33333333%;
+    }
+    .col-md-offset-3 {
+      margin-left: 25%;
+    }
+    .col-md-offset-2 {
+      margin-left: 16.66666667%;
+    }
+    .col-md-offset-1 {
+      margin-left: 8.33333333%;
+    }
+    .col-md-offset-0 {
+      margin-left: 0;
+    }
+  }
+  @media (min-width: 1200px) {
+    .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12 {
+      float: left;
+    }
+    .col-lg-12 {
+      width: 100%;
+    }
+    .col-lg-11 {
+      width: 91.66666667%;
+    }
+    .col-lg-10 {
+      width: 83.33333333%;
+    }
+    .col-lg-9 {
+      width: 75%;
+    }
+    .col-lg-8 {
+      width: 66.66666667%;
+    }
+    .col-lg-7 {
+      width: 58.33333333%;
+    }
+    .col-lg-6 {
+      width: 50%;
+    }
+    .col-lg-5 {
+      width: 41.66666667%;
+    }
+    .col-lg-4 {
+      width: 33.33333333%;
+    }
+    .col-lg-3 {
+      width: 25%;
+    }
+    .col-lg-2 {
+      width: 16.66666667%;
+    }
+    .col-lg-1 {
+      width: 8.33333333%;
+    }
+    .col-lg-pull-12 {
+      right: 100%;
+    }
+    .col-lg-pull-11 {
+      right: 91.66666667%;
+    }
+    .col-lg-pull-10 {
+      right: 83.33333333%;
+    }
+    .col-lg-pull-9 {
+      right: 75%;
+    }
+    .col-lg-pull-8 {
+      right: 66.66666667%;
+    }
+    .col-lg-pull-7 {
+      right: 58.33333333%;
+    }
+    .col-lg-pull-6 {
+      right: 50%;
+    }
+    .col-lg-pull-5 {
+      right: 41.66666667%;
+    }
+    .col-lg-pull-4 {
+      right: 33.33333333%;
+    }
+    .col-lg-pull-3 {
+      right: 25%;
+    }
+    .col-lg-pull-2 {
+      right: 16.66666667%;
+    }
+    .col-lg-pull-1 {
+      right: 8.33333333%;
+    }
+    .col-lg-pull-0 {
+      right: auto;
+    }
+    .col-lg-push-12 {
+      left: 100%;
+    }
+    .col-lg-push-11 {
+      left: 91.66666667%;
+    }
+    .col-lg-push-10 {
+      left: 83.33333333%;
+    }
+    .col-lg-push-9 {
+      left: 75%;
+    }
+    .col-lg-push-8 {
+      left: 66.66666667%;
+    }
+    .col-lg-push-7 {
+      left: 58.33333333%;
+    }
+    .col-lg-push-6 {
+      left: 50%;
+    }
+    .col-lg-push-5 {
+      left: 41.66666667%;
+    }
+    .col-lg-push-4 {
+      left: 33.33333333%;
+    }
+    .col-lg-push-3 {
+      left: 25%;
+    }
+    .col-lg-push-2 {
+      left: 16.66666667%;
+    }
+    .col-lg-push-1 {
+      left: 8.33333333%;
+    }
+    .col-lg-push-0 {
+      left: auto;
+    }
+    .col-lg-offset-12 {
+      margin-left: 100%;
+    }
+    .col-lg-offset-11 {
+      margin-left: 91.66666667%;
+    }
+    .col-lg-offset-10 {
+      margin-left: 83.33333333%;
+    }
+    .col-lg-offset-9 {
+      margin-left: 75%;
+    }
+    .col-lg-offset-8 {
+      margin-left: 66.66666667%;
+    }
+    .col-lg-offset-7 {
+      margin-left: 58.33333333%;
+    }
+    .col-lg-offset-6 {
+      margin-left: 50%;
+    }
+    .col-lg-offset-5 {
+      margin-left: 41.66666667%;
+    }
+    .col-lg-offset-4 {
+      margin-left: 33.33333333%;
+    }
+    .col-lg-offset-3 {
+      margin-left: 25%;
+    }
+    .col-lg-offset-2 {
+      margin-left: 16.66666667%;
+    }
+    .col-lg-offset-1 {
+      margin-left: 8.33333333%;
+    }
+    .col-lg-offset-0 {
+      margin-left: 0;
+    }
+  }
+  table {
+    background-color: transparent;
+  }
+  caption {
+    padding-top: 8px;
+    padding-bottom: 8px;
+    color: #777;
+    text-align: left;
+  }
+  th {
+    text-align: left;
+  }
+  .table {
+    width: 100%;
+    max-width: 100%;
+    margin-bottom: 20px;
+  }
+  .table > thead > tr > th,
+  .table > tbody > tr > th,
+  .table > tfoot > tr > th,
+  .table > thead > tr > td,
+  .table > tbody > tr > td,
+  .table > tfoot > tr > td {
+    padding: 8px;
+    line-height: 1.42857143;
+    vertical-align: top;
+    border-top: 1px solid #ddd;
+  }
+  .table > thead > tr > th {
+    vertical-align: bottom;
+    border-bottom: 2px solid #ddd;
+  }
+  .table > caption + thead > tr:first-child > th,
+  .table > colgroup + thead > tr:first-child > th,
+  .table > thead:first-child > tr:first-child > th,
+  .table > caption + thead > tr:first-child > td,
+  .table > colgroup + thead > tr:first-child > td,
+  .table > thead:first-child > tr:first-child > td {
+    border-top: 0;
+  }
+  .table > tbody + tbody {
+    border-top: 2px solid #ddd;
+  }
+  .table .table {
+    background-color: #fff;
+  }
+  .table-condensed > thead > tr > th,
+  .table-condensed > tbody > tr > th,
+  .table-condensed > tfoot > tr > th,
+  .table-condensed > thead > tr > td,
+  .table-condensed > tbody > tr > td,
+  .table-condensed > tfoot > tr > td {
+    padding: 5px;
+  }
+  .table-bordered {
+    border: 1px solid #ddd;
+  }
+  .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 #ddd;
+  }
+  .table-bordered > thead > tr > th,
+  .table-bordered > thead > tr > td {
+    border-bottom-width: 2px;
+  }
+  .table-striped > tbody > tr:nth-of-type(odd) {
+    background-color: #f9f9f9;
+  }
+  .table-hover > tbody > tr:hover {
+    background-color: #f5f5f5;
+  }
+  table col[class*="col-"] {
+    position: static;
+    display: table-column;
+    float: none;
+  }
+  table td[class*="col-"],
+  table th[class*="col-"] {
+    position: static;
+    display: table-cell;
+    float: none;
+  }
+  .table > thead > tr > td.active,
+  .table > tbody > tr > td.active,
+  .table > tfoot > tr > td.active,
+  .table > thead > tr > th.active,
+  .table > tbody > tr > th.active,
+  .table > tfoot > tr > th.active,
+  .table > thead > tr.active > td,
+  .table > tbody > tr.active > td,
+  .table > tfoot > tr.active > td,
+  .table > thead > tr.active > th,
+  .table > tbody > tr.active > th,
+  .table > tfoot > tr.active > th {
+    background-color: #f5f5f5;
+  }
+  .table-hover > tbody > tr > td.active:hover,
+  .table-hover > tbody > tr > th.active:hover,
+  .table-hover > tbody > tr.active:hover > td,
+  .table-hover > tbody > tr:hover > .active,
+  .table-hover > tbody > tr.active:hover > th {
+    background-color: #e8e8e8;
+  }
+  .table > thead > tr > td.success,
+  .table > tbody > tr > td.success,
+  .table > tfoot > tr > td.success,
+  .table > thead > tr > th.success,
+  .table > tbody > tr > th.success,
+  .table > tfoot > tr > th.success,
+  .table > thead > tr.success > td,
+  .table > tbody > tr.success > td,
+  .table > tfoot > tr.success > td,
+  .table > thead > tr.success > th,
+  .table > tbody > tr.success > th,
+  .table > tfoot > tr.success > th {
+    background-color: #dff0d8;
+  }
+  .table-hover > tbody > tr > td.success:hover,
+  .table-hover > tbody > tr > th.success:hover,
+  .table-hover > tbody > tr.success:hover > td,
+  .table-hover > tbody > tr:hover > .success,
+  .table-hover > tbody > tr.success:hover > th {
+    background-color: #d0e9c6;
+  }
+  .table > thead > tr > td.info,
+  .table > tbody > tr > td.info,
+  .table > tfoot > tr > td.info,
+  .table > thead > tr > th.info,
+  .table > tbody > tr > th.info,
+  .table > tfoot > tr > th.info,
+  .table > thead > tr.info > td,
+  .table > tbody > tr.info > td,
+  .table > tfoot > tr.info > td,
+  .table > thead > tr.info > th,
+  .table > tbody > tr.info > th,
+  .table > tfoot > tr.info > th {
+    background-color: #d9edf7;
+  }
+  .table-hover > tbody > tr > td.info:hover,
+  .table-hover > tbody > tr > th.info:hover,
+  .table-hover > tbody > tr.info:hover > td,
+  .table-hover > tbody > tr:hover > .info,
+  .table-hover > tbody > tr.info:hover > th {
+    background-color: #c4e3f3;
+  }
+  .table > thead > tr > td.warning,
+  .table > tbody > tr > td.warning,
+  .table > tfoot > tr > td.warning,
+  .table > thead > tr > th.warning,
+  .table > tbody > tr > th.warning,
+  .table > tfoot > tr > th.warning,
+  .table > thead > tr.warning > td,
+  .table > tbody > tr.warning > td,
+  .table > tfoot > tr.warning > td,
+  .table > thead > tr.warning > th,
+  .table > tbody > tr.warning > th,
+  .table > tfoot > tr.warning > th {
+    background-color: #fcf8e3;
+  }
+  .table-hover > tbody > tr > td.warning:hover,
+  .table-hover > tbody > tr > th.warning:hover,
+  .table-hover > tbody > tr.warning:hover > td,
+  .table-hover > tbody > tr:hover > .warning,
+  .table-hover > tbody > tr.warning:hover > th {
+    background-color: #faf2cc;
+  }
+  .table > thead > tr > td.danger,
+  .table > tbody > tr > td.danger,
+  .table > tfoot > tr > td.danger,
+  .table > thead > tr > th.danger,
+  .table > tbody > tr > th.danger,
+  .table > tfoot > tr > th.danger,
+  .table > thead > tr.danger > td,
+  .table > tbody > tr.danger > td,
+  .table > tfoot > tr.danger > td,
+  .table > thead > tr.danger > th,
+  .table > tbody > tr.danger > th,
+  .table > tfoot > tr.danger > th {
+    background-color: #f2dede;
+  }
+  .table-hover > tbody > tr > td.danger:hover,
+  .table-hover > tbody > tr > th.danger:hover,
+  .table-hover > tbody > tr.danger:hover > td,
+  .table-hover > tbody > tr:hover > .danger,
+  .table-hover > tbody > tr.danger:hover > th {
+    background-color: #ebcccc;
+  }
+  .table-responsive {
+    min-height: .01%;
+    overflow-x: auto;
+  }
+  @media screen and (max-width: 767px) {
+    .table-responsive {
+      width: 100%;
+      margin-bottom: 15px;
+      overflow-y: hidden;
+      -ms-overflow-style: -ms-autohiding-scrollbar;
+      border: 1px solid #ddd;
+    }
+    .table-responsive > .table {
+      margin-bottom: 0;
+    }
+    .table-responsive > .table > thead > tr > th,
+    .table-responsive > .table > tbody > tr > th,
+    .table-responsive > .table > tfoot > tr > th,
+    .table-responsive > .table > thead > tr > td,
+    .table-responsive > .table > tbody > tr > td,
+    .table-responsive > .table > tfoot > tr > td {
+      white-space: nowrap;
+    }
+    .table-responsive > .table-bordered {
+      border: 0;
+    }
+    .table-responsive > .table-bordered > thead > tr > th:first-child,
+    .table-responsive > .table-bordered > tbody > tr > th:first-child,
+    .table-responsive > .table-bordered > tfoot > tr > th:first-child,
+    .table-responsive > .table-bordered > thead > tr > td:first-child,
+    .table-responsive > .table-bordered > tbody > tr > td:first-child,
+    .table-responsive > .table-bordered > tfoot > tr > td:first-child {
+      border-left: 0;
+    }
+    .table-responsive > .table-bordered > thead > tr > th:last-child,
+    .table-responsive > .table-bordered > tbody > tr > th:last-child,
+    .table-responsive > .table-bordered > tfoot > tr > th:last-child,
+    .table-responsive > .table-bordered > thead > tr > td:last-child,
+    .table-responsive > .table-bordered > tbody > tr > td:last-child,
+    .table-responsive > .table-bordered > tfoot > tr > td:last-child {
+      border-right: 0;
+    }
+    .table-responsive > .table-bordered > tbody > tr:last-child > th,
+    .table-responsive > .table-bordered > tfoot > tr:last-child > th,
+    .table-responsive > .table-bordered > tbody > tr:last-child > td,
+    .table-responsive > .table-bordered > tfoot > tr:last-child > td {
+      border-bottom: 0;
+    }
+  }
+  fieldset {
+    min-width: 0;
+    padding: 0;
+    margin: 0;
+    border: 0;
+  }
+  legend {
+    display: block;
+    width: 100%;
+    padding: 0;
+    margin-bottom: 20px;
+    font-size: 21px;
+    line-height: inherit;
+    color: #333;
+    border: 0;
+    border-bottom: 1px solid #e5e5e5;
+  }
+  label {
+    display: inline-block;
+    max-width: 100%;
+    margin-bottom: 5px;
+    font-weight: bold;
+  }
+  input[type="search"] {
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+            box-sizing: border-box;
+  }
+  input[type="radio"],
+  input[type="checkbox"] {
+    margin: 4px 0 0;
+    margin-top: 1px \9;
+    line-height: normal;
+  }
+  input[type="file"] {
+    display: block;
+  }
+  input[type="range"] {
+    display: block;
+    width: 100%;
+  }
+  select[multiple],
+  select[size] {
+    height: auto;
+  }
+  input[type="file"]:focus,
+  input[type="radio"]:focus,
+  input[type="checkbox"]:focus {
+    outline: 5px auto -webkit-focus-ring-color;
+    outline-offset: -2px;
+  }
+  output {
+    display: block;
+    padding-top: 7px;
+    font-size: 14px;
+    line-height: 1.42857143;
+    color: #555;
+  }
+  .form-control {
+    display: block;
+    width: 100%;
+    height: 34px;
+    padding: 6px 12px;
+    font-size: 14px;
+    line-height: 1.42857143;
+    color: #555;
+    background-color: #fff;
+    background-image: none;
+    border: 1px solid #ccc;
+    border-radius: 4px;
+    -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+            box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+    -webkit-transition: border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s;
+         -o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
+            transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
+  }
+  .form-control:focus {
+    border-color: #66afe9;
+    outline: 0;
+    -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, .6);
+            box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, .6);
+  }
+  .form-control::-moz-placeholder {
+    color: #999;
+    opacity: 1;
+  }
+  .form-control:-ms-input-placeholder {
+    color: #999;
+  }
+  .form-control::-webkit-input-placeholder {
+    color: #999;
+  }
+  .form-control::-ms-expand {
+    background-color: transparent;
+    border: 0;
+  }
+  .form-control[disabled],
+  .form-control[readonly],
+  fieldset[disabled] .form-control {
+    background-color: #eee;
+    opacity: 1;
+  }
+  .form-control[disabled],
+  fieldset[disabled] .form-control {
+    cursor: not-allowed;
+  }
+  textarea.form-control {
+    height: auto;
+  }
+  input[type="search"] {
+    -webkit-appearance: none;
+  }
+  @media screen and (-webkit-min-device-pixel-ratio: 0) {
+    input[type="date"].form-control,
+    input[type="time"].form-control,
+    input[type="datetime-local"].form-control,
+    input[type="month"].form-control {
+      line-height: 34px;
+    }
+    input[type="date"].input-sm,
+    input[type="time"].input-sm,
+    input[type="datetime-local"].input-sm,
+    input[type="month"].input-sm,
+    .input-group-sm input[type="date"],
+    .input-group-sm input[type="time"],
+    .input-group-sm input[type="datetime-local"],
+    .input-group-sm input[type="month"] {
+      line-height: 30px;
+    }
+    input[type="date"].input-lg,
+    input[type="time"].input-lg,
+    input[type="datetime-local"].input-lg,
+    input[type="month"].input-lg,
+    .input-group-lg input[type="date"],
+    .input-group-lg input[type="time"],
+    .input-group-lg input[type="datetime-local"],
+    .input-group-lg input[type="month"] {
+      line-height: 46px;
+    }
+  }
+  .form-group {
+    margin-bottom: 15px;
+  }
+  .radio,
+  .checkbox {
+    position: relative;
+    display: block;
+    margin-top: 10px;
+    margin-bottom: 10px;
+  }
+  .radio label,
+  .checkbox label {
+    min-height: 20px;
+    padding-left: 20px;
+    margin-bottom: 0;
+    font-weight: normal;
+    cursor: pointer;
+  }
+  .radio input[type="radio"],
+  .radio-inline input[type="radio"],
+  .checkbox input[type="checkbox"],
+  .checkbox-inline input[type="checkbox"] {
+    position: absolute;
+    margin-top: 4px \9;
+    margin-left: -20px;
+  }
+  .radio + .radio,
+  .checkbox + .checkbox {
+    margin-top: -5px;
+  }
+  .radio-inline,
+  .checkbox-inline {
+    position: relative;
+    display: inline-block;
+    padding-left: 20px;
+    margin-bottom: 0;
+    font-weight: normal;
+    vertical-align: middle;
+    cursor: pointer;
+  }
+  .radio-inline + .radio-inline,
+  .checkbox-inline + .checkbox-inline {
+    margin-top: 0;
+    margin-left: 10px;
+  }
+  input[type="radio"][disabled],
+  input[type="checkbox"][disabled],
+  input[type="radio"].disabled,
+  input[type="checkbox"].disabled,
+  fieldset[disabled] input[type="radio"],
+  fieldset[disabled] input[type="checkbox"] {
+    cursor: not-allowed;
+  }
+  .radio-inline.disabled,
+  .checkbox-inline.disabled,
+  fieldset[disabled] .radio-inline,
+  fieldset[disabled] .checkbox-inline {
+    cursor: not-allowed;
+  }
+  .radio.disabled label,
+  .checkbox.disabled label,
+  fieldset[disabled] .radio label,
+  fieldset[disabled] .checkbox label {
+    cursor: not-allowed;
+  }
+  .form-control-static {
+    min-height: 34px;
+    padding-top: 7px;
+    padding-bottom: 7px;
+    margin-bottom: 0;
+  }
+  .form-control-static.input-lg,
+  .form-control-static.input-sm {
+    padding-right: 0;
+    padding-left: 0;
+  }
+  .input-sm {
+    height: 30px;
+    padding: 5px 10px;
+    font-size: 12px;
+    line-height: 1.5;
+    border-radius: 3px;
+  }
+  select.input-sm {
+    height: 30px;
+    line-height: 30px;
+  }
+  textarea.input-sm,
+  select[multiple].input-sm {
+    height: auto;
+  }
+  .form-group-sm .form-control {
+    height: 30px;
+    padding: 5px 10px;
+    font-size: 12px;
+    line-height: 1.5;
+    border-radius: 3px;
+  }
+  .form-group-sm select.form-control {
+    height: 30px;
+    line-height: 30px;
+  }
+  .form-group-sm textarea.form-control,
+  .form-group-sm select[multiple].form-control {
+    height: auto;
+  }
+  .form-group-sm .form-control-static {
+    height: 30px;
+    min-height: 32px;
+    padding: 6px 10px;
+    font-size: 12px;
+    line-height: 1.5;
+  }
+  .input-lg {
+    height: 46px;
+    padding: 10px 16px;
+    font-size: 18px;
+    line-height: 1.3333333;
+    border-radius: 6px;
+  }
+  select.input-lg {
+    height: 46px;
+    line-height: 46px;
+  }
+  textarea.input-lg,
+  select[multiple].input-lg {
+    height: auto;
+  }
+  .form-group-lg .form-control {
+    height: 46px;
+    padding: 10px 16px;
+    font-size: 18px;
+    line-height: 1.3333333;
+    border-radius: 6px;
+  }
+  .form-group-lg select.form-control {
+    height: 46px;
+    line-height: 46px;
+  }
+  .form-group-lg textarea.form-control,
+  .form-group-lg select[multiple].form-control {
+    height: auto;
+  }
+  .form-group-lg .form-control-static {
+    height: 46px;
+    min-height: 38px;
+    padding: 11px 16px;
+    font-size: 18px;
+    line-height: 1.3333333;
+  }
+  .has-feedback {
+    position: relative;
+  }
+  .has-feedback .form-control {
+    padding-right: 42.5px;
+  }
+  .form-control-feedback {
+    position: absolute;
+    top: 0;
+    right: 0;
+    z-index: 2;
+    display: block;
+    width: 34px;
+    height: 34px;
+    line-height: 34px;
+    text-align: center;
+    pointer-events: none;
+  }
+  .input-lg + .form-control-feedback,
+  .input-group-lg + .form-control-feedback,
+  .form-group-lg .form-control + .form-control-feedback {
+    width: 46px;
+    height: 46px;
+    line-height: 46px;
+  }
+  .input-sm + .form-control-feedback,
+  .input-group-sm + .form-control-feedback,
+  .form-group-sm .form-control + .form-control-feedback {
+    width: 30px;
+    height: 30px;
+    line-height: 30px;
+  }
+  .has-success .help-block,
+  .has-success .control-label,
+  .has-success .radio,
+  .has-success .checkbox,
+  .has-success .radio-inline,
+  .has-success .checkbox-inline,
+  .has-success.radio label,
+  .has-success.checkbox label,
+  .has-success.radio-inline label,
+  .has-success.checkbox-inline label {
+    color: #3c763d;
+  }
+  .has-success .form-control {
+    border-color: #3c763d;
+    -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+            box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+  }
+  .has-success .form-control:focus {
+    border-color: #2b542c;
+    -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #67b168;
+            box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #67b168;
+  }
+  .has-success .input-group-addon {
+    color: #3c763d;
+    background-color: #dff0d8;
+    border-color: #3c763d;
+  }
+  .has-success .form-control-feedback {
+    color: #3c763d;
+  }
+  .has-warning .help-block,
+  .has-warning .control-label,
+  .has-warning .radio,
+  .has-warning .checkbox,
+  .has-warning .radio-inline,
+  .has-warning .checkbox-inline,
+  .has-warning.radio label,
+  .has-warning.checkbox label,
+  .has-warning.radio-inline label,
+  .has-warning.checkbox-inline label {
+    color: #8a6d3b;
+  }
+  .has-warning .form-control {
+    border-color: #8a6d3b;
+    -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+            box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+  }
+  .has-warning .form-control:focus {
+    border-color: #66512c;
+    -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #c0a16b;
+            box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #c0a16b;
+  }
+  .has-warning .input-group-addon {
+    color: #8a6d3b;
+    background-color: #fcf8e3;
+    border-color: #8a6d3b;
+  }
+  .has-warning .form-control-feedback {
+    color: #8a6d3b;
+  }
+  .has-error .help-block,
+  .has-error .control-label,
+  .has-error .radio,
+  .has-error .checkbox,
+  .has-error .radio-inline,
+  .has-error .checkbox-inline,
+  .has-error.radio label,
+  .has-error.checkbox label,
+  .has-error.radio-inline label,
+  .has-error.checkbox-inline label {
+    color: #a94442;
+  }
+  .has-error .form-control {
+    border-color: #a94442;
+    -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+            box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+  }
+  .has-error .form-control:focus {
+    border-color: #843534;
+    -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #ce8483;
+            box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #ce8483;
+  }
+  .has-error .input-group-addon {
+    color: #a94442;
+    background-color: #f2dede;
+    border-color: #a94442;
+  }
+  .has-error .form-control-feedback {
+    color: #a94442;
+  }
+  .has-feedback label ~ .form-control-feedback {
+    top: 25px;
+  }
+  .has-feedback label.sr-only ~ .form-control-feedback {
+    top: 0;
+  }
+  .help-block {
+    display: block;
+    margin-top: 5px;
+    margin-bottom: 10px;
+    color: #737373;
+  }
+  @media (min-width: 768px) {
+    .form-inline .form-group {
+      display: inline-block;
+      margin-bottom: 0;
+      vertical-align: middle;
+    }
+    .form-inline .form-control {
+      display: inline-block;
+      width: auto;
+      vertical-align: middle;
+    }
+    .form-inline .form-control-static {
+      display: inline-block;
+    }
+    .form-inline .input-group {
+      display: inline-table;
+      vertical-align: middle;
+    }
+    .form-inline .input-group .input-group-addon,
+    .form-inline .input-group .input-group-btn,
+    .form-inline .input-group .form-control {
+      width: auto;
+    }
+    .form-inline .input-group > .form-control {
+      width: 100%;
+    }
+    .form-inline .control-label {
+      margin-bottom: 0;
+      vertical-align: middle;
+    }
+    .form-inline .radio,
+    .form-inline .checkbox {
+      display: inline-block;
+      margin-top: 0;
+      margin-bottom: 0;
+      vertical-align: middle;
+    }
+    .form-inline .radio label,
+    .form-inline .checkbox label {
+      padding-left: 0;
+    }
+    .form-inline .radio input[type="radio"],
+    .form-inline .checkbox input[type="checkbox"] {
+      position: relative;
+      margin-left: 0;
+    }
+    .form-inline .has-feedback .form-control-feedback {
+      top: 0;
+    }
+  }
+  .form-horizontal .radio,
+  .form-horizontal .checkbox,
+  .form-horizontal .radio-inline,
+  .form-horizontal .checkbox-inline {
+    padding-top: 7px;
+    margin-top: 0;
+    margin-bottom: 0;
+  }
+  .form-horizontal .radio,
+  .form-horizontal .checkbox {
+    min-height: 27px;
+  }
+  .form-horizontal .form-group {
+    margin-right: -15px;
+    margin-left: -15px;
+  }
+  @media (min-width: 768px) {
+    .form-horizontal .control-label {
+      padding-top: 7px;
+      margin-bottom: 0;
+      text-align: right;
+    }
+  }
+  .form-horizontal .has-feedback .form-control-feedback {
+    right: 15px;
+  }
+  @media (min-width: 768px) {
+    .form-horizontal .form-group-lg .control-label {
+      padding-top: 11px;
+      font-size: 18px;
+    }
+  }
+  @media (min-width: 768px) {
+    .form-horizontal .form-group-sm .control-label {
+      padding-top: 6px;
+      font-size: 12px;
+    }
+  }
+  .btn {
+    display: inline-block;
+    padding: 6px 12px;
+    margin-bottom: 0;
+    font-size: 14px;
+    font-weight: normal;
+    line-height: 1.42857143;
+    text-align: center;
+    white-space: nowrap;
+    vertical-align: middle;
+    -ms-touch-action: manipulation;
+        touch-action: manipulation;
+    cursor: pointer;
+    -webkit-user-select: none;
+       -moz-user-select: none;
+        -ms-user-select: none;
+            user-select: none;
+    background-image: none;
+    border: 1px solid transparent;
+    border-radius: 4px;
+  }
+  .btn:focus,
+  .btn:active:focus,
+  .btn.active:focus,
+  .btn.focus,
+  .btn:active.focus,
+  .btn.active.focus {
+    outline: 5px auto -webkit-focus-ring-color;
+    outline-offset: -2px;
+  }
+  .btn:hover,
+  .btn:focus,
+  .btn.focus {
+    color: #333;
+    text-decoration: none;
+  }
+  .btn:active,
+  .btn.active {
+    background-image: none;
+    outline: 0;
+    -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
+            box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
+  }
+  .btn.disabled,
+  .btn[disabled],
+  fieldset[disabled] .btn {
+    cursor: not-allowed;
+    filter: alpha(opacity=65);
+    -webkit-box-shadow: none;
+            box-shadow: none;
+    opacity: .65;
+  }
+  a.btn.disabled,
+  fieldset[disabled] a.btn {
+    pointer-events: none;
+  }
+  .btn-default {
+    color: #333;
+    background-color: #fff;
+    border-color: #ccc;
+  }
+  .btn-default:focus,
+  .btn-default.focus {
+    color: #333;
+    background-color: #e6e6e6;
+    border-color: #8c8c8c;
+  }
+  .btn-default:hover {
+    color: #333;
+    background-color: #e6e6e6;
+    border-color: #adadad;
+  }
+  .btn-default:active,
+  .btn-default.active,
+  .open > .dropdown-toggle.btn-default {
+    color: #333;
+    background-color: #e6e6e6;
+    border-color: #adadad;
+  }
+  .btn-default:active:hover,
+  .btn-default.active:hover,
+  .open > .dropdown-toggle.btn-default:hover,
+  .btn-default:active:focus,
+  .btn-default.active:focus,
+  .open > .dropdown-toggle.btn-default:focus,
+  .btn-default:active.focus,
+  .btn-default.active.focus,
+  .open > .dropdown-toggle.btn-default.focus {
+    color: #333;
+    background-color: #d4d4d4;
+    border-color: #8c8c8c;
+  }
+  .btn-default:active,
+  .btn-default.active,
+  .open > .dropdown-toggle.btn-default {
+    background-image: none;
+  }
+  .btn-default.disabled:hover,
+  .btn-default[disabled]:hover,
+  fieldset[disabled] .btn-default:hover,
+  .btn-default.disabled:focus,
+  .btn-default[disabled]:focus,
+  fieldset[disabled] .btn-default:focus,
+  .btn-default.disabled.focus,
+  .btn-default[disabled].focus,
+  fieldset[disabled] .btn-default.focus {
+    background-color: #fff;
+    border-color: #ccc;
+  }
+  .btn-default .badge {
+    color: #fff;
+    background-color: #333;
+  }
+  .btn-primary {
+    color: #fff;
+    background-color: #337ab7;
+    border-color: #2e6da4;
+  }
+  .btn-primary:focus,
+  .btn-primary.focus {
+    color: #fff;
+    background-color: #286090;
+    border-color: #122b40;
+  }
+  .btn-primary:hover {
+    color: #fff;
+    background-color: #286090;
+    border-color: #204d74;
+  }
+  .btn-primary:active,
+  .btn-primary.active,
+  .open > .dropdown-toggle.btn-primary {
+    color: #fff;
+    background-color: #286090;
+    border-color: #204d74;
+  }
+  .btn-primary:active:hover,
+  .btn-primary.active:hover,
+  .open > .dropdown-toggle.btn-primary:hover,
+  .btn-primary:active:focus,
+  .btn-primary.active:focus,
+  .open > .dropdown-toggle.btn-primary:focus,
+  .btn-primary:active.focus,
+  .btn-primary.active.focus,
+  .open > .dropdown-toggle.btn-primary.focus {
+    color: #fff;
+    background-color: #204d74;
+    border-color: #122b40;
+  }
+  .btn-primary:active,
+  .btn-primary.active,
+  .open > .dropdown-toggle.btn-primary {
+    background-image: none;
+  }
+  .btn-primary.disabled:hover,
+  .btn-primary[disabled]:hover,
+  fieldset[disabled] .btn-primary:hover,
+  .btn-primary.disabled:focus,
+  .btn-primary[disabled]:focus,
+  fieldset[disabled] .btn-primary:focus,
+  .btn-primary.disabled.focus,
+  .btn-primary[disabled].focus,
+  fieldset[disabled] .btn-primary.focus {
+    background-color: #337ab7;
+    border-color: #2e6da4;
+  }
+  .btn-primary .badge {
+    color: #337ab7;
+    background-color: #fff;
+  }
+  .btn-success {
+    color: #fff;
+    background-color: #5cb85c;
+    border-color: #4cae4c;
+  }
+  .btn-success:focus,
+  .btn-success.focus {
+    color: #fff;
+    background-color: #449d44;
+    border-color: #255625;
+  }
+  .btn-success:hover {
+    color: #fff;
+    background-color: #449d44;
+    border-color: #398439;
+  }
+  .btn-success:active,
+  .btn-success.active,
+  .open > .dropdown-toggle.btn-success {
+    color: #fff;
+    background-color: #449d44;
+    border-color: #398439;
+  }
+  .btn-success:active:hover,
+  .btn-success.active:hover,
+  .open > .dropdown-toggle.btn-success:hover,
+  .btn-success:active:focus,
+  .btn-success.active:focus,
+  .open > .dropdown-toggle.btn-success:focus,
+  .btn-success:active.focus,
+  .btn-success.active.focus,
+  .open > .dropdown-toggle.btn-success.focus {
+    color: #fff;
+    background-color: #398439;
+    border-color: #255625;
+  }
+  .btn-success:active,
+  .btn-success.active,
+  .open > .dropdown-toggle.btn-success {
+    background-image: none;
+  }
+  .btn-success.disabled:hover,
+  .btn-success[disabled]:hover,
+  fieldset[disabled] .btn-success:hover,
+  .btn-success.disabled:focus,
+  .btn-success[disabled]:focus,
+  fieldset[disabled] .btn-success:focus,
+  .btn-success.disabled.focus,
+  .btn-success[disabled].focus,
+  fieldset[disabled] .btn-success.focus {
+    background-color: #5cb85c;
+    border-color: #4cae4c;
+  }
+  .btn-success .badge {
+    color: #5cb85c;
+    background-color: #fff;
+  }
+  .btn-info {
+    color: #fff;
+    background-color: #5bc0de;
+    border-color: #46b8da;
+  }
+  .btn-info:focus,
+  .btn-info.focus {
+    color: #fff;
+    background-color: #31b0d5;
+    border-color: #1b6d85;
+  }
+  .btn-info:hover {
+    color: #fff;
+    background-color: #31b0d5;
+    border-color: #269abc;
+  }
+  .btn-info:active,
+  .btn-info.active,
+  .open > .dropdown-toggle.btn-info {
+    color: #fff;
+    background-color: #31b0d5;
+    border-color: #269abc;
+  }
+  .btn-info:active:hover,
+  .btn-info.active:hover,
+  .open > .dropdown-toggle.btn-info:hover,
+  .btn-info:active:focus,
+  .btn-info.active:focus,
+  .open > .dropdown-toggle.btn-info:focus,
+  .btn-info:active.focus,
+  .btn-info.active.focus,
+  .open > .dropdown-toggle.btn-info.focus {
+    color: #fff;
+    background-color: #269abc;
+    border-color: #1b6d85;
+  }
+  .btn-info:active,
+  .btn-info.active,
+  .open > .dropdown-toggle.btn-info {
+    background-image: none;
+  }
+  .btn-info.disabled:hover,
+  .btn-info[disabled]:hover,
+  fieldset[disabled] .btn-info:hover,
+  .btn-info.disabled:focus,
+  .btn-info[disabled]:focus,
+  fieldset[disabled] .btn-info:focus,
+  .btn-info.disabled.focus,
+  .btn-info[disabled].focus,
+  fieldset[disabled] .btn-info.focus {
+    background-color: #5bc0de;
+    border-color: #46b8da;
+  }
+  .btn-info .badge {
+    color: #5bc0de;
+    background-color: #fff;
+  }
+  .btn-warning {
+    color: #fff;
+    background-color: #f0ad4e;
+    border-color: #eea236;
+  }
+  .btn-warning:focus,
+  .btn-warning.focus {
+    color: #fff;
+    background-color: #ec971f;
+    border-color: #985f0d;
+  }
+  .btn-warning:hover {
+    color: #fff;
+    background-color: #ec971f;
+    border-color: #d58512;
+  }
+  .btn-warning:active,
+  .btn-warning.active,
+  .open > .dropdown-toggle.btn-warning {
+    color: #fff;
+    background-color: #ec971f;
+    border-color: #d58512;
+  }
+  .btn-warning:active:hover,
+  .btn-warning.active:hover,
+  .open > .dropdown-toggle.btn-warning:hover,
+  .btn-warning:active:focus,
+  .btn-warning.active:focus,
+  .open > .dropdown-toggle.btn-warning:focus,
+  .btn-warning:active.focus,
+  .btn-warning.active.focus,
+  .open > .dropdown-toggle.btn-warning.focus {
+    color: #fff;
+    background-color: #d58512;
+    border-color: #985f0d;
+  }
+  .btn-warning:active,
+  .btn-warning.active,
+  .open > .dropdown-toggle.btn-warning {
+    background-image: none;
+  }
+  .btn-warning.disabled:hover,
+  .btn-warning[disabled]:hover,
+  fieldset[disabled] .btn-warning:hover,
+  .btn-warning.disabled:focus,
+  .btn-warning[disabled]:focus,
+  fieldset[disabled] .btn-warning:focus,
+  .btn-warning.disabled.focus,
+  .btn-warning[disabled].focus,
+  fieldset[disabled] .btn-warning.focus {
+    background-color: #f0ad4e;
+    border-color: #eea236;
+  }
+  .btn-warning .badge {
+    color: #f0ad4e;
+    background-color: #fff;
+  }
+  .btn-danger {
+    color: #fff;
+    background-color: #d9534f;
+    border-color: #d43f3a;
+  }
+  .btn-danger:focus,
+  .btn-danger.focus {
+    color: #fff;
+    background-color: #c9302c;
+    border-color: #761c19;
+  }
+  .btn-danger:hover {
+    color: #fff;
+    background-color: #c9302c;
+    border-color: #ac2925;
+  }
+  .btn-danger:active,
+  .btn-danger.active,
+  .open > .dropdown-toggle.btn-danger {
+    color: #fff;
+    background-color: #c9302c;
+    border-color: #ac2925;
+  }
+  .btn-danger:active:hover,
+  .btn-danger.active:hover,
+  .open > .dropdown-toggle.btn-danger:hover,
+  .btn-danger:active:focus,
+  .btn-danger.active:focus,
+  .open > .dropdown-toggle.btn-danger:focus,
+  .btn-danger:active.focus,
+  .btn-danger.active.focus,
+  .open > .dropdown-toggle.btn-danger.focus {
+    color: #fff;
+    background-color: #ac2925;
+    border-color: #761c19;
+  }
+  .btn-danger:active,
+  .btn-danger.active,
+  .open > .dropdown-toggle.btn-danger {
+    background-image: none;
+  }
+  .btn-danger.disabled:hover,
+  .btn-danger[disabled]:hover,
+  fieldset[disabled] .btn-danger:hover,
+  .btn-danger.disabled:focus,
+  .btn-danger[disabled]:focus,
+  fieldset[disabled] .btn-danger:focus,
+  .btn-danger.disabled.focus,
+  .btn-danger[disabled].focus,
+  fieldset[disabled] .btn-danger.focus {
+    background-color: #d9534f;
+    border-color: #d43f3a;
+  }
+  .btn-danger .badge {
+    color: #d9534f;
+    background-color: #fff;
+  }
+  .btn-link {
+    font-weight: normal;
+    color: #337ab7;
+    border-radius: 0;
+  }
+  .btn-link,
+  .btn-link:active,
+  .btn-link.active,
+  .btn-link[disabled],
+  fieldset[disabled] .btn-link {
+    background-color: transparent;
+    -webkit-box-shadow: none;
+            box-shadow: none;
+  }
+  .btn-link,
+  .btn-link:hover,
+  .btn-link:focus,
+  .btn-link:active {
+    border-color: transparent;
+  }
+  .btn-link:hover,
+  .btn-link:focus {
+    color: #23527c;
+    text-decoration: underline;
+    background-color: transparent;
+  }
+  .btn-link[disabled]:hover,
+  fieldset[disabled] .btn-link:hover,
+  .btn-link[disabled]:focus,
+  fieldset[disabled] .btn-link:focus {
+    color: #777;
+    text-decoration: none;
+  }
+  .btn-lg,
+  .btn-group-lg > .btn {
+    padding: 10px 16px;
+    font-size: 18px;
+    line-height: 1.3333333;
+    border-radius: 6px;
+  }
+  .btn-sm,
+  .btn-group-sm > .btn {
+    padding: 5px 10px;
+    font-size: 12px;
+    line-height: 1.5;
+    border-radius: 3px;
+  }
+  .btn-xs,
+  .btn-group-xs > .btn {
+    padding: 1px 5px;
+    font-size: 12px;
+    line-height: 1.5;
+    border-radius: 3px;
+  }
+  .btn-block {
+    display: block;
+    width: 100%;
+  }
+  .btn-block + .btn-block {
+    margin-top: 5px;
+  }
+  input[type="submit"].btn-block,
+  input[type="reset"].btn-block,
+  input[type="button"].btn-block {
+    width: 100%;
+  }
+  .fade {
+    opacity: 0;
+    -webkit-transition: opacity .15s linear;
+         -o-transition: opacity .15s linear;
+            transition: opacity .15s linear;
+  }
+  .fade.in {
+    opacity: 1;
+  }
+  .collapse {
+    display: none;
+  }
+  .collapse.in {
+    display: block;
+  }
+  tr.collapse.in {
+    display: table-row;
+  }
+  tbody.collapse.in {
+    display: table-row-group;
+  }
+  .collapsing {
+    position: relative;
+    height: 0;
+    overflow: hidden;
+    -webkit-transition-timing-function: ease;
+         -o-transition-timing-function: ease;
+            transition-timing-function: ease;
+    -webkit-transition-duration: .35s;
+         -o-transition-duration: .35s;
+            transition-duration: .35s;
+    -webkit-transition-property: height, visibility;
+         -o-transition-property: height, visibility;
+            transition-property: height, visibility;
+  }
+  .caret {
+    display: inline-block;
+    width: 0;
+    height: 0;
+    margin-left: 2px;
+    vertical-align: middle;
+    border-top: 4px dashed;
+    border-top: 4px solid \9;
+    border-right: 4px solid transparent;
+    border-left: 4px solid transparent;
+  }
+  .dropup,
+  .dropdown {
+    position: relative;
+  }
+  .dropdown-toggle:focus {
+    outline: 0;
+  }
+  .dropdown-menu {
+    position: absolute;
+    top: 100%;
+    left: 0;
+    z-index: 1000;
+    display: none;
+    float: left;
+    min-width: 160px;
+    padding: 5px 0;
+    margin: 2px 0 0;
+    font-size: 14px;
+    text-align: left;
+    list-style: none;
+    background-color: #fff;
+    -webkit-background-clip: padding-box;
+            background-clip: padding-box;
+    border: 1px solid #ccc;
+    border: 1px solid rgba(0, 0, 0, .15);
+    border-radius: 4px;
+    -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, .175);
+            box-shadow: 0 6px 12px rgba(0, 0, 0, .175);
+  }
+  .dropdown-menu.pull-right {
+    right: 0;
+    left: auto;
+  }
+  .dropdown-menu .divider {
+    height: 1px;
+    margin: 9px 0;
+    overflow: hidden;
+    background-color: #e5e5e5;
+  }
+  .dropdown-menu > li > a {
+    display: block;
+    padding: 3px 20px;
+    clear: both;
+    font-weight: normal;
+    line-height: 1.42857143;
+    color: #333;
+    white-space: nowrap;
+  }
+  .dropdown-menu > li > a:hover,
+  .dropdown-menu > li > a:focus {
+    color: #262626;
+    text-decoration: none;
+    background-color: #f5f5f5;
+  }
+  .dropdown-menu > .active > a,
+  .dropdown-menu > .active > a:hover,
+  .dropdown-menu > .active > a:focus {
+    color: #fff;
+    text-decoration: none;
+    background-color: #337ab7;
+    outline: 0;
+  }
+  .dropdown-menu > .disabled > a,
+  .dropdown-menu > .disabled > a:hover,
+  .dropdown-menu > .disabled > a:focus {
+    color: #777;
+  }
+  .dropdown-menu > .disabled > a:hover,
+  .dropdown-menu > .disabled > a:focus {
+    text-decoration: none;
+    cursor: not-allowed;
+    background-color: transparent;
+    background-image: none;
+    filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+  }
+  .open > .dropdown-menu {
+    display: block;
+  }
+  .open > a {
+    outline: 0;
+  }
+  .dropdown-menu-right {
+    right: 0;
+    left: auto;
+  }
+  .dropdown-menu-left {
+    right: auto;
+    left: 0;
+  }
+  .dropdown-header {
+    display: block;
+    padding: 3px 20px;
+    font-size: 12px;
+    line-height: 1.42857143;
+    color: #777;
+    white-space: nowrap;
+  }
+  .dropdown-backdrop {
+    position: fixed;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    z-index: 990;
+  }
+  .pull-right > .dropdown-menu {
+    right: 0;
+    left: auto;
+  }
+  .dropup .caret,
+  .navbar-fixed-bottom .dropdown .caret {
+    content: "";
+    border-top: 0;
+    border-bottom: 4px dashed;
+    border-bottom: 4px solid \9;
+  }
+  .dropup .dropdown-menu,
+  .navbar-fixed-bottom .dropdown .dropdown-menu {
+    top: auto;
+    bottom: 100%;
+    margin-bottom: 2px;
+  }
+  @media (min-width: 768px) {
+    .navbar-right .dropdown-menu {
+      right: 0;
+      left: auto;
+    }
+    .navbar-right .dropdown-menu-left {
+      right: auto;
+      left: 0;
+    }
+  }
+  .btn-group,
+  .btn-group-vertical {
+    position: relative;
+    display: inline-block;
+    vertical-align: middle;
+  }
+  .btn-group > .btn,
+  .btn-group-vertical > .btn {
+    position: relative;
+    float: left;
+  }
+  .btn-group > .btn:hover,
+  .btn-group-vertical > .btn:hover,
+  .btn-group > .btn:focus,
+  .btn-group-vertical > .btn:focus,
+  .btn-group > .btn:active,
+  .btn-group-vertical > .btn:active,
+  .btn-group > .btn.active,
+  .btn-group-vertical > .btn.active {
+    z-index: 2;
+  }
+  .btn-group .btn + .btn,
+  .btn-group .btn + .btn-group,
+  .btn-group .btn-group + .btn,
+  .btn-group .btn-group + .btn-group {
+    margin-left: -1px;
+  }
+  .btn-toolbar {
+    margin-left: -5px;
+  }
+  .btn-toolbar .btn,
+  .btn-toolbar .btn-group,
+  .btn-toolbar .input-group {
+    float: left;
+  }
+  .btn-toolbar > .btn,
+  .btn-toolbar > .btn-group,
+  .btn-toolbar > .input-group {
+    margin-left: 5px;
+  }
+  .btn-group > .btn:not(:first-child):not(:last-child):not(.dropdown-toggle) {
+    border-radius: 0;
+  }
+  .btn-group > .btn:first-child {
+    margin-left: 0;
+  }
+  .btn-group > .btn:first-child:not(:last-child):not(.dropdown-toggle) {
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0;
+  }
+  .btn-group > .btn:last-child:not(:first-child),
+  .btn-group > .dropdown-toggle:not(:first-child) {
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
+  }
+  .btn-group > .btn-group {
+    float: left;
+  }
+  .btn-group > .btn-group:not(:first-child):not(:last-child) > .btn {
+    border-radius: 0;
+  }
+  .btn-group > .btn-group:first-child:not(:last-child) > .btn:last-child,
+  .btn-group > .btn-group:first-child:not(:last-child) > .dropdown-toggle {
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0;
+  }
+  .btn-group > .btn-group:last-child:not(:first-child) > .btn:first-child {
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
+  }
+  .btn-group .dropdown-toggle:active,
+  .btn-group.open .dropdown-toggle {
+    outline: 0;
+  }
+  .btn-group > .btn + .dropdown-toggle {
+    padding-right: 8px;
+    padding-left: 8px;
+  }
+  .btn-group > .btn-lg + .dropdown-toggle {
+    padding-right: 12px;
+    padding-left: 12px;
+  }
+  .btn-group.open .dropdown-toggle {
+    -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
+            box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
+  }
+  .btn-group.open .dropdown-toggle.btn-link {
+    -webkit-box-shadow: none;
+            box-shadow: none;
+  }
+  .btn .caret {
+    margin-left: 0;
+  }
+  .btn-lg .caret {
+    border-width: 5px 5px 0;
+    border-bottom-width: 0;
+  }
+  .dropup .btn-lg .caret {
+    border-width: 0 5px 5px;
+  }
+  .btn-group-vertical > .btn,
+  .btn-group-vertical > .btn-group,
+  .btn-group-vertical > .btn-group > .btn {
+    display: block;
+    float: none;
+    width: 100%;
+    max-width: 100%;
+  }
+  .btn-group-vertical > .btn-group > .btn {
+    float: none;
+  }
+  .btn-group-vertical > .btn + .btn,
+  .btn-group-vertical > .btn + .btn-group,
+  .btn-group-vertical > .btn-group + .btn,
+  .btn-group-vertical > .btn-group + .btn-group {
+    margin-top: -1px;
+    margin-left: 0;
+  }
+  .btn-group-vertical > .btn:not(:first-child):not(:last-child) {
+    border-radius: 0;
+  }
+  .btn-group-vertical > .btn:first-child:not(:last-child) {
+    border-top-left-radius: 4px;
+    border-top-right-radius: 4px;
+    border-bottom-right-radius: 0;
+    border-bottom-left-radius: 0;
+  }
+  .btn-group-vertical > .btn:last-child:not(:first-child) {
+    border-top-left-radius: 0;
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 4px;
+    border-bottom-left-radius: 4px;
+  }
+  .btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn {
+    border-radius: 0;
+  }
+  .btn-group-vertical > .btn-group:first-child:not(:last-child) > .btn:last-child,
+  .btn-group-vertical > .btn-group:first-child:not(:last-child) > .dropdown-toggle {
+    border-bottom-right-radius: 0;
+    border-bottom-left-radius: 0;
+  }
+  .btn-group-vertical > .btn-group:last-child:not(:first-child) > .btn:first-child {
+    border-top-left-radius: 0;
+    border-top-right-radius: 0;
+  }
+  .btn-group-justified {
+    display: table;
+    width: 100%;
+    table-layout: fixed;
+    border-collapse: separate;
+  }
+  .btn-group-justified > .btn,
+  .btn-group-justified > .btn-group {
+    display: table-cell;
+    float: none;
+    width: 1%;
+  }
+  .btn-group-justified > .btn-group .btn {
+    width: 100%;
+  }
+  .btn-group-justified > .btn-group .dropdown-menu {
+    left: auto;
+  }
+  [data-toggle="buttons"] > .btn input[type="radio"],
+  [data-toggle="buttons"] > .btn-group > .btn input[type="radio"],
+  [data-toggle="buttons"] > .btn input[type="checkbox"],
+  [data-toggle="buttons"] > .btn-group > .btn input[type="checkbox"] {
+    position: absolute;
+    clip: rect(0, 0, 0, 0);
+    pointer-events: none;
+  }
+  .input-group {
+    position: relative;
+    display: table;
+    border-collapse: separate;
+  }
+  .input-group[class*="col-"] {
+    float: none;
+    padding-right: 0;
+    padding-left: 0;
+  }
+  .input-group .form-control {
+    position: relative;
+    z-index: 2;
+    float: left;
+    width: 100%;
+    margin-bottom: 0;
+  }
+  .input-group .form-control:focus {
+    z-index: 3;
+  }
+  .input-group-lg > .form-control,
+  .input-group-lg > .input-group-addon,
+  .input-group-lg > .input-group-btn > .btn {
+    height: 46px;
+    padding: 10px 16px;
+    font-size: 18px;
+    line-height: 1.3333333;
+    border-radius: 6px;
+  }
+  select.input-group-lg > .form-control,
+  select.input-group-lg > .input-group-addon,
+  select.input-group-lg > .input-group-btn > .btn {
+    height: 46px;
+    line-height: 46px;
+  }
+  textarea.input-group-lg > .form-control,
+  textarea.input-group-lg > .input-group-addon,
+  textarea.input-group-lg > .input-group-btn > .btn,
+  select[multiple].input-group-lg > .form-control,
+  select[multiple].input-group-lg > .input-group-addon,
+  select[multiple].input-group-lg > .input-group-btn > .btn {
+    height: auto;
+  }
+  .input-group-sm > .form-control,
+  .input-group-sm > .input-group-addon,
+  .input-group-sm > .input-group-btn > .btn {
+    height: 30px;
+    padding: 5px 10px;
+    font-size: 12px;
+    line-height: 1.5;
+    border-radius: 3px;
+  }
+  select.input-group-sm > .form-control,
+  select.input-group-sm > .input-group-addon,
+  select.input-group-sm > .input-group-btn > .btn {
+    height: 30px;
+    line-height: 30px;
+  }
+  textarea.input-group-sm > .form-control,
+  textarea.input-group-sm > .input-group-addon,
+  textarea.input-group-sm > .input-group-btn > .btn,
+  select[multiple].input-group-sm > .form-control,
+  select[multiple].input-group-sm > .input-group-addon,
+  select[multiple].input-group-sm > .input-group-btn > .btn {
+    height: auto;
+  }
+  .input-group-addon,
+  .input-group-btn,
+  .input-group .form-control {
+    display: table-cell;
+  }
+  .input-group-addon:not(:first-child):not(:last-child),
+  .input-group-btn:not(:first-child):not(:last-child),
+  .input-group .form-control:not(:first-child):not(:last-child) {
+    border-radius: 0;
+  }
+  .input-group-addon,
+  .input-group-btn {
+    width: 1%;
+    white-space: nowrap;
+    vertical-align: middle;
+  }
+  .input-group-addon {
+    padding: 6px 12px;
+    font-size: 14px;
+    font-weight: normal;
+    line-height: 1;
+    color: #555;
+    text-align: center;
+    background-color: #eee;
+    border: 1px solid #ccc;
+    border-radius: 4px;
+  }
+  .input-group-addon.input-sm {
+    padding: 5px 10px;
+    font-size: 12px;
+    border-radius: 3px;
+  }
+  .input-group-addon.input-lg {
+    padding: 10px 16px;
+    font-size: 18px;
+    border-radius: 6px;
+  }
+  .input-group-addon input[type="radio"],
+  .input-group-addon input[type="checkbox"] {
+    margin-top: 0;
+  }
+  .input-group .form-control:first-child,
+  .input-group-addon:first-child,
+  .input-group-btn:first-child > .btn,
+  .input-group-btn:first-child > .btn-group > .btn,
+  .input-group-btn:first-child > .dropdown-toggle,
+  .input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle),
+  .input-group-btn:last-child > .btn-group:not(:last-child) > .btn {
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0;
+  }
+  .input-group-addon:first-child {
+    border-right: 0;
+  }
+  .input-group .form-control:last-child,
+  .input-group-addon:last-child,
+  .input-group-btn:last-child > .btn,
+  .input-group-btn:last-child > .btn-group > .btn,
+  .input-group-btn:last-child > .dropdown-toggle,
+  .input-group-btn:first-child > .btn:not(:first-child),
+  .input-group-btn:first-child > .btn-group:not(:first-child) > .btn {
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
+  }
+  .input-group-addon:last-child {
+    border-left: 0;
+  }
+  .input-group-btn {
+    position: relative;
+    font-size: 0;
+    white-space: nowrap;
+  }
+  .input-group-btn > .btn {
+    position: relative;
+  }
+  .input-group-btn > .btn + .btn {
+    margin-left: -1px;
+  }
+  .input-group-btn > .btn:hover,
+  .input-group-btn > .btn:focus,
+  .input-group-btn > .btn:active {
+    z-index: 2;
+  }
+  .input-group-btn:first-child > .btn,
+  .input-group-btn:first-child > .btn-group {
+    margin-right: -1px;
+  }
+  .input-group-btn:last-child > .btn,
+  .input-group-btn:last-child > .btn-group {
+    z-index: 2;
+    margin-left: -1px;
+  }
+  .nav {
+    padding-left: 0;
+    margin-bottom: 0;
+    list-style: none;
+  }
+  .nav > li {
+    position: relative;
+    display: block;
+  }
+  .nav > li > a {
+    position: relative;
+    display: block;
+    padding: 10px 15px;
+  }
+  .nav > li > a:hover,
+  .nav > li > a:focus {
+    text-decoration: none;
+    background-color: #eee;
+  }
+  .nav > li.disabled > a {
+    color: #777;
+  }
+  .nav > li.disabled > a:hover,
+  .nav > li.disabled > a:focus {
+    color: #777;
+    text-decoration: none;
+    cursor: not-allowed;
+    background-color: transparent;
+  }
+  .nav .open > a,
+  .nav .open > a:hover,
+  .nav .open > a:focus {
+    background-color: #eee;
+    border-color: #337ab7;
+  }
+  .nav .nav-divider {
+    height: 1px;
+    margin: 9px 0;
+    overflow: hidden;
+    background-color: #e5e5e5;
+  }
+  .nav > li > a > img {
+    max-width: none;
+  }
+  .nav-tabs {
+    border-bottom: 1px solid #ddd;
+  }
+  .nav-tabs > li {
+    float: left;
+    margin-bottom: -1px;
+  }
+  .nav-tabs > li > a {
+    margin-right: 2px;
+    line-height: 1.42857143;
+    border: 1px solid transparent;
+    border-radius: 4px 4px 0 0;
+  }
+  .nav-tabs > li > a:hover {
+    border-color: #eee #eee #ddd;
+  }
+  .nav-tabs > li.active > a,
+  .nav-tabs > li.active > a:hover,
+  .nav-tabs > li.active > a:focus {
+    color: #555;
+    cursor: default;
+    background-color: #fff;
+    border: 1px solid #ddd;
+    border-bottom-color: transparent;
+  }
+  .nav-tabs.nav-justified {
+    width: 100%;
+    border-bottom: 0;
+  }
+  .nav-tabs.nav-justified > li {
+    float: none;
+  }
+  .nav-tabs.nav-justified > li > a {
+    margin-bottom: 5px;
+    text-align: center;
+  }
+  .nav-tabs.nav-justified > .dropdown .dropdown-menu {
+    top: auto;
+    left: auto;
+  }
+  @media (min-width: 768px) {
+    .nav-tabs.nav-justified > li {
+      display: table-cell;
+      width: 1%;
+    }
+    .nav-tabs.nav-justified > li > a {
+      margin-bottom: 0;
+    }
+  }
+  .nav-tabs.nav-justified > li > a {
+    margin-right: 0;
+    border-radius: 4px;
+  }
+  .nav-tabs.nav-justified > .active > a,
+  .nav-tabs.nav-justified > .active > a:hover,
+  .nav-tabs.nav-justified > .active > a:focus {
+    border: 1px solid #ddd;
+  }
+  @media (min-width: 768px) {
+    .nav-tabs.nav-justified > li > a {
+      border-bottom: 1px solid #ddd;
+      border-radius: 4px 4px 0 0;
+    }
+    .nav-tabs.nav-justified > .active > a,
+    .nav-tabs.nav-justified > .active > a:hover,
+    .nav-tabs.nav-justified > .active > a:focus {
+      border-bottom-color: #fff;
+    }
+  }
+  .nav-pills > li {
+    float: left;
+  }
+  .nav-pills > li > a {
+    border-radius: 4px;
+  }
+  .nav-pills > li + li {
+    margin-left: 2px;
+  }
+  .nav-pills > li.active > a,
+  .nav-pills > li.active > a:hover,
+  .nav-pills > li.active > a:focus {
+    color: #fff;
+    background-color: #337ab7;
+  }
+  .nav-stacked > li {
+    float: none;
+  }
+  .nav-stacked > li + li {
+    margin-top: 2px;
+    margin-left: 0;
+  }
+  .nav-justified {
+    width: 100%;
+  }
+  .nav-justified > li {
+    float: none;
+  }
+  .nav-justified > li > a {
+    margin-bottom: 5px;
+    text-align: center;
+  }
+  .nav-justified > .dropdown .dropdown-menu {
+    top: auto;
+    left: auto;
+  }
+  @media (min-width: 768px) {
+    .nav-justified > li {
+      display: table-cell;
+      width: 1%;
+    }
+    .nav-justified > li > a {
+      margin-bottom: 0;
+    }
+  }
+  .nav-tabs-justified {
+    border-bottom: 0;
+  }
+  .nav-tabs-justified > li > a {
+    margin-right: 0;
+    border-radius: 4px;
+  }
+  .nav-tabs-justified > .active > a,
+  .nav-tabs-justified > .active > a:hover,
+  .nav-tabs-justified > .active > a:focus {
+    border: 1px solid #ddd;
+  }
+  @media (min-width: 768px) {
+    .nav-tabs-justified > li > a {
+      border-bottom: 1px solid #ddd;
+      border-radius: 4px 4px 0 0;
+    }
+    .nav-tabs-justified > .active > a,
+    .nav-tabs-justified > .active > a:hover,
+    .nav-tabs-justified > .active > a:focus {
+      border-bottom-color: #fff;
+    }
+  }
+  .tab-content > .tab-pane {
+    display: none;
+  }
+  .tab-content > .active {
+    display: block;
+  }
+  .nav-tabs .dropdown-menu {
+    margin-top: -1px;
+    border-top-left-radius: 0;
+    border-top-right-radius: 0;
+  }
+  .navbar {
+    position: relative;
+    min-height: 50px;
+    margin-bottom: 20px;
+    border: 1px solid transparent;
+  }
+  @media (min-width: 768px) {
+    .navbar {
+      border-radius: 4px;
+    }
+  }
+  @media (min-width: 768px) {
+    .navbar-header {
+      float: left;
+    }
+  }
+  .navbar-collapse {
+    padding-right: 15px;
+    padding-left: 15px;
+    overflow-x: visible;
+    -webkit-overflow-scrolling: touch;
+    border-top: 1px solid transparent;
+    -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1);
+            box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1);
+  }
+  .navbar-collapse.in {
+    overflow-y: auto;
+  }
+  @media (min-width: 768px) {
+    .navbar-collapse {
+      width: auto;
+      border-top: 0;
+      -webkit-box-shadow: none;
+              box-shadow: none;
+    }
+    .navbar-collapse.collapse {
+      display: block !important;
+      height: auto !important;
+      padding-bottom: 0;
+      overflow: visible !important;
+    }
+    .navbar-collapse.in {
+      overflow-y: visible;
+    }
+    .navbar-fixed-top .navbar-collapse,
+    .navbar-static-top .navbar-collapse,
+    .navbar-fixed-bottom .navbar-collapse {
+      padding-right: 0;
+      padding-left: 0;
+    }
+  }
+  .navbar-fixed-top .navbar-collapse,
+  .navbar-fixed-bottom .navbar-collapse {
+    max-height: 340px;
+  }
+  @media (max-device-width: 480px) and (orientation: landscape) {
+    .navbar-fixed-top .navbar-collapse,
+    .navbar-fixed-bottom .navbar-collapse {
+      max-height: 200px;
+    }
+  }
+  .container > .navbar-header,
+  .container-fluid > .navbar-header,
+  .container > .navbar-collapse,
+  .container-fluid > .navbar-collapse {
+    margin-right: -15px;
+    margin-left: -15px;
+  }
+  @media (min-width: 768px) {
+    .container > .navbar-header,
+    .container-fluid > .navbar-header,
+    .container > .navbar-collapse,
+    .container-fluid > .navbar-collapse {
+      margin-right: 0;
+      margin-left: 0;
+    }
+  }
+  .navbar-static-top {
+    z-index: 1000;
+    border-width: 0 0 1px;
+  }
+  @media (min-width: 768px) {
+    .navbar-static-top {
+      border-radius: 0;
+    }
+  }
+  .navbar-fixed-top,
+  .navbar-fixed-bottom {
+    position: fixed;
+    right: 0;
+    left: 0;
+    z-index: 1030;
+  }
+  @media (min-width: 768px) {
+    .navbar-fixed-top,
+    .navbar-fixed-bottom {
+      border-radius: 0;
+    }
+  }
+  .navbar-fixed-top {
+    top: 0;
+    border-width: 0 0 1px;
+  }
+  .navbar-fixed-bottom {
+    bottom: 0;
+    margin-bottom: 0;
+    border-width: 1px 0 0;
+  }
+  .navbar-brand {
+    float: left;
+    height: 50px;
+    padding: 15px 15px;
+    font-size: 18px;
+    line-height: 20px;
+  }
+  .navbar-brand:hover,
+  .navbar-brand:focus {
+    text-decoration: none;
+  }
+  .navbar-brand > img {
+    display: block;
+  }
+  @media (min-width: 768px) {
+    .navbar > .container .navbar-brand,
+    .navbar > .container-fluid .navbar-brand {
+      margin-left: -15px;
+    }
+  }
+  .navbar-toggle {
+    position: relative;
+    float: right;
+    padding: 9px 10px;
+    margin-top: 8px;
+    margin-right: 15px;
+    margin-bottom: 8px;
+    background-color: transparent;
+    background-image: none;
+    border: 1px solid transparent;
+    border-radius: 4px;
+  }
+  .navbar-toggle:focus {
+    outline: 0;
+  }
+  .navbar-toggle .icon-bar {
+    display: block;
+    width: 22px;
+    height: 2px;
+    border-radius: 1px;
+  }
+  .navbar-toggle .icon-bar + .icon-bar {
+    margin-top: 4px;
+  }
+  @media (min-width: 768px) {
+    .navbar-toggle {
+      display: none;
+    }
+  }
+  .navbar-nav {
+    margin: 7.5px -15px;
+  }
+  .navbar-nav > li > a {
+    padding-top: 10px;
+    padding-bottom: 10px;
+    line-height: 20px;
+  }
+  @media (max-width: 767px) {
+    .navbar-nav .open .dropdown-menu {
+      position: static;
+      float: none;
+      width: auto;
+      margin-top: 0;
+      background-color: transparent;
+      border: 0;
+      -webkit-box-shadow: none;
+              box-shadow: none;
+    }
+    .navbar-nav .open .dropdown-menu > li > a,
+    .navbar-nav .open .dropdown-menu .dropdown-header {
+      padding: 5px 15px 5px 25px;
+    }
+    .navbar-nav .open .dropdown-menu > li > a {
+      line-height: 20px;
+    }
+    .navbar-nav .open .dropdown-menu > li > a:hover,
+    .navbar-nav .open .dropdown-menu > li > a:focus {
+      background-image: none;
+    }
+  }
+  @media (min-width: 768px) {
+    .navbar-nav {
+      float: left;
+      margin: 0;
+    }
+    .navbar-nav > li {
+      float: left;
+    }
+    .navbar-nav > li > a {
+      padding-top: 15px;
+      padding-bottom: 15px;
+    }
+  }
+  .navbar-form {
+    padding: 10px 15px;
+    margin-top: 8px;
+    margin-right: -15px;
+    margin-bottom: 8px;
+    margin-left: -15px;
+    border-top: 1px solid transparent;
+    border-bottom: 1px solid transparent;
+    -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1), 0 1px 0 rgba(255, 255, 255, .1);
+            box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1), 0 1px 0 rgba(255, 255, 255, .1);
+  }
+  @media (min-width: 768px) {
+    .navbar-form .form-group {
+      display: inline-block;
+      margin-bottom: 0;
+      vertical-align: middle;
+    }
+    .navbar-form .form-control {
+      display: inline-block;
+      width: auto;
+      vertical-align: middle;
+    }
+    .navbar-form .form-control-static {
+      display: inline-block;
+    }
+    .navbar-form .input-group {
+      display: inline-table;
+      vertical-align: middle;
+    }
+    .navbar-form .input-group .input-group-addon,
+    .navbar-form .input-group .input-group-btn,
+    .navbar-form .input-group .form-control {
+      width: auto;
+    }
+    .navbar-form .input-group > .form-control {
+      width: 100%;
+    }
+    .navbar-form .control-label {
+      margin-bottom: 0;
+      vertical-align: middle;
+    }
+    .navbar-form .radio,
+    .navbar-form .checkbox {
+      display: inline-block;
+      margin-top: 0;
+      margin-bottom: 0;
+      vertical-align: middle;
+    }
+    .navbar-form .radio label,
+    .navbar-form .checkbox label {
+      padding-left: 0;
+    }
+    .navbar-form .radio input[type="radio"],
+    .navbar-form .checkbox input[type="checkbox"] {
+      position: relative;
+      margin-left: 0;
+    }
+    .navbar-form .has-feedback .form-control-feedback {
+      top: 0;
+    }
+  }
+  @media (max-width: 767px) {
+    .navbar-form .form-group {
+      margin-bottom: 5px;
+    }
+    .navbar-form .form-group:last-child {
+      margin-bottom: 0;
+    }
+  }
+  @media (min-width: 768px) {
+    .navbar-form {
+      width: auto;
+      padding-top: 0;
+      padding-bottom: 0;
+      margin-right: 0;
+      margin-left: 0;
+      border: 0;
+      -webkit-box-shadow: none;
+              box-shadow: none;
+    }
+  }
+  .navbar-nav > li > .dropdown-menu {
+    margin-top: 0;
+    border-top-left-radius: 0;
+    border-top-right-radius: 0;
+  }
+  .navbar-fixed-bottom .navbar-nav > li > .dropdown-menu {
+    margin-bottom: 0;
+    border-top-left-radius: 4px;
+    border-top-right-radius: 4px;
+    border-bottom-right-radius: 0;
+    border-bottom-left-radius: 0;
+  }
+  .navbar-btn {
+    margin-top: 8px;
+    margin-bottom: 8px;
+  }
+  .navbar-btn.btn-sm {
+    margin-top: 10px;
+    margin-bottom: 10px;
+  }
+  .navbar-btn.btn-xs {
+    margin-top: 14px;
+    margin-bottom: 14px;
+  }
+  .navbar-text {
+    margin-top: 15px;
+    margin-bottom: 15px;
+  }
+  @media (min-width: 768px) {
+    .navbar-text {
+      float: left;
+      margin-right: 15px;
+      margin-left: 15px;
+    }
+  }
+  @media (min-width: 768px) {
+    .navbar-left {
+      float: left !important;
+    }
+    .navbar-right {
+      float: right !important;
+      margin-right: -15px;
+    }
+    .navbar-right ~ .navbar-right {
+      margin-right: 0;
+    }
+  }
+  .navbar-default {
+    background-color: #f8f8f8;
+    border-color: #e7e7e7;
+  }
+  .navbar-default .navbar-brand {
+    color: #777;
+  }
+  .navbar-default .navbar-brand:hover,
+  .navbar-default .navbar-brand:focus {
+    color: #5e5e5e;
+    background-color: transparent;
+  }
+  .navbar-default .navbar-text {
+    color: #777;
+  }
+  .navbar-default .navbar-nav > li > a {
+    color: #777;
+  }
+  .navbar-default .navbar-nav > li > a:hover,
+  .navbar-default .navbar-nav > li > a:focus {
+    color: #333;
+    background-color: transparent;
+  }
+  .navbar-default .navbar-nav > .active > a,
+  .navbar-default .navbar-nav > .active > a:hover,
+  .navbar-default .navbar-nav > .active > a:focus {
+    color: #555;
+    background-color: #e7e7e7;
+  }
+  .navbar-default .navbar-nav > .disabled > a,
+  .navbar-default .navbar-nav > .disabled > a:hover,
+  .navbar-default .navbar-nav > .disabled > a:focus {
+    color: #ccc;
+    background-color: transparent;
+  }
+  .navbar-default .navbar-toggle {
+    border-color: #ddd;
+  }
+  .navbar-default .navbar-toggle:hover,
+  .navbar-default .navbar-toggle:focus {
+    background-color: #ddd;
+  }
+  .navbar-default .navbar-toggle .icon-bar {
+    background-color: #888;
+  }
+  .navbar-default .navbar-collapse,
+  .navbar-default .navbar-form {
+    border-color: #e7e7e7;
+  }
+  .navbar-default .navbar-nav > .open > a,
+  .navbar-default .navbar-nav > .open > a:hover,
+  .navbar-default .navbar-nav > .open > a:focus {
+    color: #555;
+    background-color: #e7e7e7;
+  }
+  @media (max-width: 767px) {
+    .navbar-default .navbar-nav .open .dropdown-menu > li > a {
+      color: #777;
+    }
+    .navbar-default .navbar-nav .open .dropdown-menu > li > a:hover,
+    .navbar-default .navbar-nav .open .dropdown-menu > li > a:focus {
+      color: #333;
+      background-color: transparent;
+    }
+    .navbar-default .navbar-nav .open .dropdown-menu > .active > a,
+    .navbar-default .navbar-nav .open .dropdown-menu > .active > a:hover,
+    .navbar-default .navbar-nav .open .dropdown-menu > .active > a:focus {
+      color: #555;
+      background-color: #e7e7e7;
+    }
+    .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a,
+    .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:hover,
+    .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:focus {
+      color: #ccc;
+      background-color: transparent;
+    }
+  }
+  .navbar-default .navbar-link {
+    color: #777;
+  }
+  .navbar-default .navbar-link:hover {
+    color: #333;
+  }
+  .navbar-default .btn-link {
+    color: #777;
+  }
+  .navbar-default .btn-link:hover,
+  .navbar-default .btn-link:focus {
+    color: #333;
+  }
+  .navbar-default .btn-link[disabled]:hover,
+  fieldset[disabled] .navbar-default .btn-link:hover,
+  .navbar-default .btn-link[disabled]:focus,
+  fieldset[disabled] .navbar-default .btn-link:focus {
+    color: #ccc;
+  }
+  .navbar-inverse {
+    background-color: #222;
+    border-color: #080808;
+  }
+  .navbar-inverse .navbar-brand {
+    color: #9d9d9d;
+  }
+  .navbar-inverse .navbar-brand:hover,
+  .navbar-inverse .navbar-brand:focus {
+    color: #fff;
+    background-color: transparent;
+  }
+  .navbar-inverse .navbar-text {
+    color: #9d9d9d;
+  }
+  .navbar-inverse .navbar-nav > li > a {
+    color: #9d9d9d;
+  }
+  .navbar-inverse .navbar-nav > li > a:hover,
+  .navbar-inverse .navbar-nav > li > a:focus {
+    color: #fff;
+    background-color: transparent;
+  }
+  .navbar-inverse .navbar-nav > .active > a,
+  .navbar-inverse .navbar-nav > .active > a:hover,
+  .navbar-inverse .navbar-nav > .active > a:focus {
+    color: #fff;
+    background-color: #080808;
+  }
+  .navbar-inverse .navbar-nav > .disabled > a,
+  .navbar-inverse .navbar-nav > .disabled > a:hover,
+  .navbar-inverse .navbar-nav > .disabled > a:focus {
+    color: #444;
+    background-color: transparent;
+  }
+  .navbar-inverse .navbar-toggle {
+    border-color: #333;
+  }
+  .navbar-inverse .navbar-toggle:hover,
+  .navbar-inverse .navbar-toggle:focus {
+    background-color: #333;
+  }
+  .navbar-inverse .navbar-toggle .icon-bar {
+    background-color: #fff;
+  }
+  .navbar-inverse .navbar-collapse,
+  .navbar-inverse .navbar-form {
+    border-color: #101010;
+  }
+  .navbar-inverse .navbar-nav > .open > a,
+  .navbar-inverse .navbar-nav > .open > a:hover,
+  .navbar-inverse .navbar-nav > .open > a:focus {
+    color: #fff;
+    background-color: #080808;
+  }
+  @media (max-width: 767px) {
+    .navbar-inverse .navbar-nav .open .dropdown-menu > .dropdown-header {
+      border-color: #080808;
+    }
+    .navbar-inverse .navbar-nav .open .dropdown-menu .divider {
+      background-color: #080808;
+    }
+    .navbar-inverse .navbar-nav .open .dropdown-menu > li > a {
+      color: #9d9d9d;
+    }
+    .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:hover,
+    .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:focus {
+      color: #fff;
+      background-color: transparent;
+    }
+    .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a,
+    .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:hover,
+    .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:focus {
+      color: #fff;
+      background-color: #080808;
+    }
+    .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a,
+    .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:hover,
+    .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:focus {
+      color: #444;
+      background-color: transparent;
+    }
+  }
+  .navbar-inverse .navbar-link {
+    color: #9d9d9d;
+  }
+  .navbar-inverse .navbar-link:hover {
+    color: #fff;
+  }
+  .navbar-inverse .btn-link {
+    color: #9d9d9d;
+  }
+  .navbar-inverse .btn-link:hover,
+  .navbar-inverse .btn-link:focus {
+    color: #fff;
+  }
+  .navbar-inverse .btn-link[disabled]:hover,
+  fieldset[disabled] .navbar-inverse .btn-link:hover,
+  .navbar-inverse .btn-link[disabled]:focus,
+  fieldset[disabled] .navbar-inverse .btn-link:focus {
+    color: #444;
+  }
+  .breadcrumb {
+    padding: 8px 15px;
+    margin-bottom: 20px;
+    list-style: none;
+    background-color: #f5f5f5;
+    border-radius: 4px;
+  }
+  .breadcrumb > li {
+    display: inline-block;
+  }
+  .breadcrumb > li + li:before {
+    padding: 0 5px;
+    color: #ccc;
+    content: "/\00a0";
+  }
+  .breadcrumb > .active {
+    color: #777;
+  }
+  .pagination {
+    display: inline-block;
+    padding-left: 0;
+    margin: 20px 0;
+    border-radius: 4px;
+  }
+  .pagination > li {
+    display: inline;
+  }
+  .pagination > li > a,
+  .pagination > li > span {
+    position: relative;
+    float: left;
+    padding: 6px 12px;
+    margin-left: -1px;
+    line-height: 1.42857143;
+    color: #337ab7;
+    text-decoration: none;
+    background-color: #fff;
+    border: 1px solid #ddd;
+  }
+  .pagination > li:first-child > a,
+  .pagination > li:first-child > span {
+    margin-left: 0;
+    border-top-left-radius: 4px;
+    border-bottom-left-radius: 4px;
+  }
+  .pagination > li:last-child > a,
+  .pagination > li:last-child > span {
+    border-top-right-radius: 4px;
+    border-bottom-right-radius: 4px;
+  }
+  .pagination > li > a:hover,
+  .pagination > li > span:hover,
+  .pagination > li > a:focus,
+  .pagination > li > span:focus {
+    z-index: 2;
+    color: #23527c;
+    background-color: #eee;
+    border-color: #ddd;
+  }
+  .pagination > .active > a,
+  .pagination > .active > span,
+  .pagination > .active > a:hover,
+  .pagination > .active > span:hover,
+  .pagination > .active > a:focus,
+  .pagination > .active > span:focus {
+    z-index: 3;
+    color: #fff;
+    cursor: default;
+    background-color: #337ab7;
+    border-color: #337ab7;
+  }
+  .pagination > .disabled > span,
+  .pagination > .disabled > span:hover,
+  .pagination > .disabled > span:focus,
+  .pagination > .disabled > a,
+  .pagination > .disabled > a:hover,
+  .pagination > .disabled > a:focus {
+    color: #777;
+    cursor: not-allowed;
+    background-color: #fff;
+    border-color: #ddd;
+  }
+  .pagination-lg > li > a,
+  .pagination-lg > li > span {
+    padding: 10px 16px;
+    font-size: 18px;
+    line-height: 1.3333333;
+  }
+  .pagination-lg > li:first-child > a,
+  .pagination-lg > li:first-child > span {
+    border-top-left-radius: 6px;
+    border-bottom-left-radius: 6px;
+  }
+  .pagination-lg > li:last-child > a,
+  .pagination-lg > li:last-child > span {
+    border-top-right-radius: 6px;
+    border-bottom-right-radius: 6px;
+  }
+  .pagination-sm > li > a,
+  .pagination-sm > li > span {
+    padding: 5px 10px;
+    font-size: 12px;
+    line-height: 1.5;
+  }
+  .pagination-sm > li:first-child > a,
+  .pagination-sm > li:first-child > span {
+    border-top-left-radius: 3px;
+    border-bottom-left-radius: 3px;
+  }
+  .pagination-sm > li:last-child > a,
+  .pagination-sm > li:last-child > span {
+    border-top-right-radius: 3px;
+    border-bottom-right-radius: 3px;
+  }
+  .pager {
+    padding-left: 0;
+    margin: 20px 0;
+    text-align: center;
+    list-style: none;
+  }
+  .pager li {
+    display: inline;
+  }
+  .pager li > a,
+  .pager li > span {
+    display: inline-block;
+    padding: 5px 14px;
+    background-color: #fff;
+    border: 1px solid #ddd;
+    border-radius: 15px;
+  }
+  .pager li > a:hover,
+  .pager li > a:focus {
+    text-decoration: none;
+    background-color: #eee;
+  }
+  .pager .next > a,
+  .pager .next > span {
+    float: right;
+  }
+  .pager .previous > a,
+  .pager .previous > span {
+    float: left;
+  }
+  .pager .disabled > a,
+  .pager .disabled > a:hover,
+  .pager .disabled > a:focus,
+  .pager .disabled > span {
+    color: #777;
+    cursor: not-allowed;
+    background-color: #fff;
+  }
+  .label {
+    display: inline;
+    padding: .2em .6em .3em;
+    font-size: 75%;
+    font-weight: bold;
+    line-height: 1;
+    color: #fff;
+    text-align: center;
+    white-space: nowrap;
+    vertical-align: baseline;
+    border-radius: .25em;
+  }
+  a.label:hover,
+  a.label:focus {
+    color: #fff;
+    text-decoration: none;
+    cursor: pointer;
+  }
+  .label:empty {
+    display: none;
+  }
+  .btn .label {
+    position: relative;
+    top: -1px;
+  }
+  .label-default {
+    background-color: #777;
+  }
+  .label-default[href]:hover,
+  .label-default[href]:focus {
+    background-color: #5e5e5e;
+  }
+  .label-primary {
+    background-color: #337ab7;
+  }
+  .label-primary[href]:hover,
+  .label-primary[href]:focus {
+    background-color: #286090;
+  }
+  .label-success {
+    background-color: #5cb85c;
+  }
+  .label-success[href]:hover,
+  .label-success[href]:focus {
+    background-color: #449d44;
+  }
+  .label-info {
+    background-color: #5bc0de;
+  }
+  .label-info[href]:hover,
+  .label-info[href]:focus {
+    background-color: #31b0d5;
+  }
+  .label-warning {
+    background-color: #f0ad4e;
+  }
+  .label-warning[href]:hover,
+  .label-warning[href]:focus {
+    background-color: #ec971f;
+  }
+  .label-danger {
+    background-color: #d9534f;
+  }
+  .label-danger[href]:hover,
+  .label-danger[href]:focus {
+    background-color: #c9302c;
+  }
+  .badge {
+    display: inline-block;
+    min-width: 10px;
+    padding: 3px 7px;
+    font-size: 12px;
+    font-weight: bold;
+    line-height: 1;
+    color: #fff;
+    text-align: center;
+    white-space: nowrap;
+    vertical-align: middle;
+    background-color: #777;
+    border-radius: 10px;
+  }
+  .badge:empty {
+    display: none;
+  }
+  .btn .badge {
+    position: relative;
+    top: -1px;
+  }
+  .btn-xs .badge,
+  .btn-group-xs > .btn .badge {
+    top: 0;
+    padding: 1px 5px;
+  }
+  a.badge:hover,
+  a.badge:focus {
+    color: #fff;
+    text-decoration: none;
+    cursor: pointer;
+  }
+  .list-group-item.active > .badge,
+  .nav-pills > .active > a > .badge {
+    color: #337ab7;
+    background-color: #fff;
+  }
+  .list-group-item > .badge {
+    float: right;
+  }
+  .list-group-item > .badge + .badge {
+    margin-right: 5px;
+  }
+  .nav-pills > li > a > .badge {
+    margin-left: 3px;
+  }
+  .jumbotron {
+    padding-top: 30px;
+    padding-bottom: 30px;
+    margin-bottom: 30px;
+    color: inherit;
+    background-color: #eee;
+  }
+  .jumbotron h1,
+  .jumbotron .h1 {
+    color: inherit;
+  }
+  .jumbotron p {
+    margin-bottom: 15px;
+    font-size: 21px;
+    font-weight: 200;
+  }
+  .jumbotron > hr {
+    border-top-color: #d5d5d5;
+  }
+  .container .jumbotron,
+  .container-fluid .jumbotron {
+    padding-right: 15px;
+    padding-left: 15px;
+    border-radius: 6px;
+  }
+  .jumbotron .container {
+    max-width: 100%;
+  }
+  @media screen and (min-width: 768px) {
+    .jumbotron {
+      padding-top: 48px;
+      padding-bottom: 48px;
+    }
+    .container .jumbotron,
+    .container-fluid .jumbotron {
+      padding-right: 60px;
+      padding-left: 60px;
+    }
+    .jumbotron h1,
+    .jumbotron .h1 {
+      font-size: 63px;
+    }
+  }
+  .thumbnail {
+    display: block;
+    padding: 4px;
+    margin-bottom: 20px;
+    line-height: 1.42857143;
+    background-color: #fff;
+    border: 1px solid #ddd;
+    border-radius: 4px;
+    -webkit-transition: border .2s ease-in-out;
+         -o-transition: border .2s ease-in-out;
+            transition: border .2s ease-in-out;
+  }
+  .thumbnail > img,
+  .thumbnail a > img {
+    margin-right: auto;
+    margin-left: auto;
+  }
+  a.thumbnail:hover,
+  a.thumbnail:focus,
+  a.thumbnail.active {
+    border-color: #337ab7;
+  }
+  .thumbnail .caption {
+    padding: 9px;
+    color: #333;
+  }
+  .alert {
+    padding: 15px;
+    margin-bottom: 20px;
+    border: 1px solid transparent;
+    border-radius: 4px;
+  }
+  .alert h4 {
+    margin-top: 0;
+    color: inherit;
+  }
+  .alert .alert-link {
+    font-weight: bold;
+  }
+  .alert > p,
+  .alert > ul {
+    margin-bottom: 0;
+  }
+  .alert > p + p {
+    margin-top: 5px;
+  }
+  .alert-dismissable,
+  .alert-dismissible {
+    padding-right: 35px;
+  }
+  .alert-dismissable .close,
+  .alert-dismissible .close {
+    position: relative;
+    top: -2px;
+    right: -21px;
+    color: inherit;
+  }
+  .alert-success {
+    color: #3c763d;
+    background-color: #dff0d8;
+    border-color: #d6e9c6;
+  }
+  .alert-success hr {
+    border-top-color: #c9e2b3;
+  }
+  .alert-success .alert-link {
+    color: #2b542c;
+  }
+  .alert-info {
+    color: #31708f;
+    background-color: #d9edf7;
+    border-color: #bce8f1;
+  }
+  .alert-info hr {
+    border-top-color: #a6e1ec;
+  }
+  .alert-info .alert-link {
+    color: #245269;
+  }
+  .alert-warning {
+    color: #8a6d3b;
+    background-color: #fcf8e3;
+    border-color: #faebcc;
+  }
+  .alert-warning hr {
+    border-top-color: #f7e1b5;
+  }
+  .alert-warning .alert-link {
+    color: #66512c;
+  }
+  .alert-danger {
+    color: #a94442;
+    background-color: #f2dede;
+    border-color: #ebccd1;
+  }
+  .alert-danger hr {
+    border-top-color: #e4b9c0;
+  }
+  .alert-danger .alert-link {
+    color: #843534;
+  }
+  @-webkit-keyframes progress-bar-stripes {
+    from {
+      background-position: 40px 0;
+    }
+    to {
+      background-position: 0 0;
+    }
+  }
+  @-o-keyframes progress-bar-stripes {
+    from {
+      background-position: 40px 0;
+    }
+    to {
+      background-position: 0 0;
+    }
+  }
+  @keyframes progress-bar-stripes {
+    from {
+      background-position: 40px 0;
+    }
+    to {
+      background-position: 0 0;
+    }
+  }
+  .progress {
+    height: 20px;
+    margin-bottom: 20px;
+    overflow: hidden;
+    background-color: #f5f5f5;
+    border-radius: 4px;
+    -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, .1);
+            box-shadow: inset 0 1px 2px rgba(0, 0, 0, .1);
+  }
+  .progress-bar {
+    float: left;
+    width: 0;
+    height: 100%;
+    font-size: 12px;
+    line-height: 20px;
+    color: #fff;
+    text-align: center;
+    background-color: #337ab7;
+    -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .15);
+            box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .15);
+    -webkit-transition: width .6s ease;
+         -o-transition: width .6s ease;
+            transition: width .6s ease;
+  }
+  .progress-striped .progress-bar,
+  .progress-bar-striped {
+    background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+    background-image:      -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+    background-image:         linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+    -webkit-background-size: 40px 40px;
+            background-size: 40px 40px;
+  }
+  .progress.active .progress-bar,
+  .progress-bar.active {
+    -webkit-animation: progress-bar-stripes 2s linear infinite;
+         -o-animation: progress-bar-stripes 2s linear infinite;
+            animation: progress-bar-stripes 2s linear infinite;
+  }
+  .progress-bar-success {
+    background-color: #5cb85c;
+  }
+  .progress-striped .progress-bar-success {
+    background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+    background-image:      -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+    background-image:         linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+  }
+  .progress-bar-info {
+    background-color: #5bc0de;
+  }
+  .progress-striped .progress-bar-info {
+    background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+    background-image:      -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+    background-image:         linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+  }
+  .progress-bar-warning {
+    background-color: #f0ad4e;
+  }
+  .progress-striped .progress-bar-warning {
+    background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+    background-image:      -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+    background-image:         linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+  }
+  .progress-bar-danger {
+    background-color: #d9534f;
+  }
+  .progress-striped .progress-bar-danger {
+    background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+    background-image:      -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+    background-image:         linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+  }
+  .media {
+    margin-top: 15px;
+  }
+  .media:first-child {
+    margin-top: 0;
+  }
+  .media,
+  .media-body {
+    overflow: hidden;
+    zoom: 1;
+  }
+  .media-body {
+    width: 10000px;
+  }
+  .media-object {
+    display: block;
+  }
+  .media-object.img-thumbnail {
+    max-width: none;
+  }
+  .media-right,
+  .media > .pull-right {
+    padding-left: 10px;
+  }
+  .media-left,
+  .media > .pull-left {
+    padding-right: 10px;
+  }
+  .media-left,
+  .media-right,
+  .media-body {
+    display: table-cell;
+    vertical-align: top;
+  }
+  .media-middle {
+    vertical-align: middle;
+  }
+  .media-bottom {
+    vertical-align: bottom;
+  }
+  .media-heading {
+    margin-top: 0;
+    margin-bottom: 5px;
+  }
+  .media-list {
+    padding-left: 0;
+    list-style: none;
+  }
+  .list-group {
+    padding-left: 0;
+    margin-bottom: 20px;
+  }
+  .list-group-item {
+    position: relative;
+    display: block;
+    padding: 10px 15px;
+    margin-bottom: -1px;
+    background-color: #fff;
+    border: 1px solid #ddd;
+  }
+  .list-group-item:first-child {
+    border-top-left-radius: 4px;
+    border-top-right-radius: 4px;
+  }
+  .list-group-item:last-child {
+    margin-bottom: 0;
+    border-bottom-right-radius: 4px;
+    border-bottom-left-radius: 4px;
+  }
+  a.list-group-item,
+  button.list-group-item {
+    color: #555;
+  }
+  a.list-group-item .list-group-item-heading,
+  button.list-group-item .list-group-item-heading {
+    color: #333;
+  }
+  a.list-group-item:hover,
+  button.list-group-item:hover,
+  a.list-group-item:focus,
+  button.list-group-item:focus {
+    color: #555;
+    text-decoration: none;
+    background-color: #f5f5f5;
+  }
+  button.list-group-item {
+    width: 100%;
+    text-align: left;
+  }
+  .list-group-item.disabled,
+  .list-group-item.disabled:hover,
+  .list-group-item.disabled:focus {
+    color: #777;
+    cursor: not-allowed;
+    background-color: #eee;
+  }
+  .list-group-item.disabled .list-group-item-heading,
+  .list-group-item.disabled:hover .list-group-item-heading,
+  .list-group-item.disabled:focus .list-group-item-heading {
+    color: inherit;
+  }
+  .list-group-item.disabled .list-group-item-text,
+  .list-group-item.disabled:hover .list-group-item-text,
+  .list-group-item.disabled:focus .list-group-item-text {
+    color: #777;
+  }
+  .list-group-item.active,
+  .list-group-item.active:hover,
+  .list-group-item.active:focus {
+    z-index: 2;
+    color: #fff;
+    background-color: #337ab7;
+    border-color: #337ab7;
+  }
+  .list-group-item.active .list-group-item-heading,
+  .list-group-item.active:hover .list-group-item-heading,
+  .list-group-item.active:focus .list-group-item-heading,
+  .list-group-item.active .list-group-item-heading > small,
+  .list-group-item.active:hover .list-group-item-heading > small,
+  .list-group-item.active:focus .list-group-item-heading > small,
+  .list-group-item.active .list-group-item-heading > .small,
+  .list-group-item.active:hover .list-group-item-heading > .small,
+  .list-group-item.active:focus .list-group-item-heading > .small {
+    color: inherit;
+  }
+  .list-group-item.active .list-group-item-text,
+  .list-group-item.active:hover .list-group-item-text,
+  .list-group-item.active:focus .list-group-item-text {
+    color: #c7ddef;
+  }
+  .list-group-item-success {
+    color: #3c763d;
+    background-color: #dff0d8;
+  }
+  a.list-group-item-success,
+  button.list-group-item-success {
+    color: #3c763d;
+  }
+  a.list-group-item-success .list-group-item-heading,
+  button.list-group-item-success .list-group-item-heading {
+    color: inherit;
+  }
+  a.list-group-item-success:hover,
+  button.list-group-item-success:hover,
+  a.list-group-item-success:focus,
+  button.list-group-item-success:focus {
+    color: #3c763d;
+    background-color: #d0e9c6;
+  }
+  a.list-group-item-success.active,
+  button.list-group-item-success.active,
+  a.list-group-item-success.active:hover,
+  button.list-group-item-success.active:hover,
+  a.list-group-item-success.active:focus,
+  button.list-group-item-success.active:focus {
+    color: #fff;
+    background-color: #3c763d;
+    border-color: #3c763d;
+  }
+  .list-group-item-info {
+    color: #31708f;
+    background-color: #d9edf7;
+  }
+  a.list-group-item-info,
+  button.list-group-item-info {
+    color: #31708f;
+  }
+  a.list-group-item-info .list-group-item-heading,
+  button.list-group-item-info .list-group-item-heading {
+    color: inherit;
+  }
+  a.list-group-item-info:hover,
+  button.list-group-item-info:hover,
+  a.list-group-item-info:focus,
+  button.list-group-item-info:focus {
+    color: #31708f;
+    background-color: #c4e3f3;
+  }
+  a.list-group-item-info.active,
+  button.list-group-item-info.active,
+  a.list-group-item-info.active:hover,
+  button.list-group-item-info.active:hover,
+  a.list-group-item-info.active:focus,
+  button.list-group-item-info.active:focus {
+    color: #fff;
+    background-color: #31708f;
+    border-color: #31708f;
+  }
+  .list-group-item-warning {
+    color: #8a6d3b;
+    background-color: #fcf8e3;
+  }
+  a.list-group-item-warning,
+  button.list-group-item-warning {
+    color: #8a6d3b;
+  }
+  a.list-group-item-warning .list-group-item-heading,
+  button.list-group-item-warning .list-group-item-heading {
+    color: inherit;
+  }
+  a.list-group-item-warning:hover,
+  button.list-group-item-warning:hover,
+  a.list-group-item-warning:focus,
+  button.list-group-item-warning:focus {
+    color: #8a6d3b;
+    background-color: #faf2cc;
+  }
+  a.list-group-item-warning.active,
+  button.list-group-item-warning.active,
+  a.list-group-item-warning.active:hover,
+  button.list-group-item-warning.active:hover,
+  a.list-group-item-warning.active:focus,
+  button.list-group-item-warning.active:focus {
+    color: #fff;
+    background-color: #8a6d3b;
+    border-color: #8a6d3b;
+  }
+  .list-group-item-danger {
+    color: #a94442;
+    background-color: #f2dede;
+  }
+  a.list-group-item-danger,
+  button.list-group-item-danger {
+    color: #a94442;
+  }
+  a.list-group-item-danger .list-group-item-heading,
+  button.list-group-item-danger .list-group-item-heading {
+    color: inherit;
+  }
+  a.list-group-item-danger:hover,
+  button.list-group-item-danger:hover,
+  a.list-group-item-danger:focus,
+  button.list-group-item-danger:focus {
+    color: #a94442;
+    background-color: #ebcccc;
+  }
+  a.list-group-item-danger.active,
+  button.list-group-item-danger.active,
+  a.list-group-item-danger.active:hover,
+  button.list-group-item-danger.active:hover,
+  a.list-group-item-danger.active:focus,
+  button.list-group-item-danger.active:focus {
+    color: #fff;
+    background-color: #a94442;
+    border-color: #a94442;
+  }
+  .list-group-item-heading {
+    margin-top: 0;
+    margin-bottom: 5px;
+  }
+  .list-group-item-text {
+    margin-bottom: 0;
+    line-height: 1.3;
+  }
+  .panel {
+    margin-bottom: 20px;
+    background-color: #fff;
+    border: 1px solid transparent;
+    border-radius: 4px;
+    -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, .05);
+            box-shadow: 0 1px 1px rgba(0, 0, 0, .05);
+  }
+  .panel-body {
+    padding: 15px;
+  }
+  .panel-heading {
+    padding: 10px 15px;
+    border-bottom: 1px solid transparent;
+    border-top-left-radius: 3px;
+    border-top-right-radius: 3px;
+  }
+  .panel-heading > .dropdown .dropdown-toggle {
+    color: inherit;
+  }
+  .panel-title {
+    margin-top: 0;
+    margin-bottom: 0;
+    font-size: 16px;
+    color: inherit;
+  }
+  .panel-title > a,
+  .panel-title > small,
+  .panel-title > .small,
+  .panel-title > small > a,
+  .panel-title > .small > a {
+    color: inherit;
+  }
+  .panel-footer {
+    padding: 10px 15px;
+    background-color: #f5f5f5;
+    border-top: 1px solid #ddd;
+    border-bottom-right-radius: 3px;
+    border-bottom-left-radius: 3px;
+  }
+  .panel > .list-group,
+  .panel > .panel-collapse > .list-group {
+    margin-bottom: 0;
+  }
+  .panel > .list-group .list-group-item,
+  .panel > .panel-collapse > .list-group .list-group-item {
+    border-width: 1px 0;
+    border-radius: 0;
+  }
+  .panel > .list-group:first-child .list-group-item:first-child,
+  .panel > .panel-collapse > .list-group:first-child .list-group-item:first-child {
+    border-top: 0;
+    border-top-left-radius: 3px;
+    border-top-right-radius: 3px;
+  }
+  .panel > .list-group:last-child .list-group-item:last-child,
+  .panel > .panel-collapse > .list-group:last-child .list-group-item:last-child {
+    border-bottom: 0;
+    border-bottom-right-radius: 3px;
+    border-bottom-left-radius: 3px;
+  }
+  .panel > .panel-heading + .panel-collapse > .list-group .list-group-item:first-child {
+    border-top-left-radius: 0;
+    border-top-right-radius: 0;
+  }
+  .panel-heading + .list-group .list-group-item:first-child {
+    border-top-width: 0;
+  }
+  .list-group + .panel-footer {
+    border-top-width: 0;
+  }
+  .panel > .table,
+  .panel > .table-responsive > .table,
+  .panel > .panel-collapse > .table {
+    margin-bottom: 0;
+  }
+  .panel > .table caption,
+  .panel > .table-responsive > .table caption,
+  .panel > .panel-collapse > .table caption {
+    padding-right: 15px;
+    padding-left: 15px;
+  }
+  .panel > .table:first-child,
+  .panel > .table-responsive:first-child > .table:first-child {
+    border-top-left-radius: 3px;
+    border-top-right-radius: 3px;
+  }
+  .panel > .table:first-child > thead:first-child > tr:first-child,
+  .panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child,
+  .panel > .table:first-child > tbody:first-child > tr:first-child,
+  .panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child {
+    border-top-left-radius: 3px;
+    border-top-right-radius: 3px;
+  }
+  .panel > .table:first-child > thead:first-child > tr:first-child td:first-child,
+  .panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:first-child,
+  .panel > .table:first-child > tbody:first-child > tr:first-child td:first-child,
+  .panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child td:first-child,
+  .panel > .table:first-child > thead:first-child > tr:first-child th:first-child,
+  .panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:first-child,
+  .panel > .table:first-child > tbody:first-child > tr:first-child th:first-child,
+  .panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:first-child {
+    border-top-left-radius: 3px;
+  }
+  .panel > .table:first-child > thead:first-child > tr:first-child td:last-child,
+  .panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:last-child,
+  .panel > .table:first-child > tbody:first-child > tr:first-child td:last-child,
+  .panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child td:last-child,
+  .panel > .table:first-child > thead:first-child > tr:first-child th:last-child,
+  .panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:last-child,
+  .panel > .table:first-child > tbody:first-child > tr:first-child th:last-child,
+  .panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:last-child {
+    border-top-right-radius: 3px;
+  }
+  .panel > .table:last-child,
+  .panel > .table-responsive:last-child > .table:last-child {
+    border-bottom-right-radius: 3px;
+    border-bottom-left-radius: 3px;
+  }
+  .panel > .table:last-child > tbody:last-child > tr:last-child,
+  .panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child,
+  .panel > .table:last-child > tfoot:last-child > tr:last-child,
+  .panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child {
+    border-bottom-right-radius: 3px;
+    border-bottom-left-radius: 3px;
+  }
+  .panel > .table:last-child > tbody:last-child > tr:last-child td:first-child,
+  .panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:first-child,
+  .panel > .table:last-child > tfoot:last-child > tr:last-child td:first-child,
+  .panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child td:first-child,
+  .panel > .table:last-child > tbody:last-child > tr:last-child th:first-child,
+  .panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:first-child,
+  .panel > .table:last-child > tfoot:last-child > tr:last-child th:first-child,
+  .panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:first-child {
+    border-bottom-left-radius: 3px;
+  }
+  .panel > .table:last-child > tbody:last-child > tr:last-child td:last-child,
+  .panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:last-child,
+  .panel > .table:last-child > tfoot:last-child > tr:last-child td:last-child,
+  .panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child td:last-child,
+  .panel > .table:last-child > tbody:last-child > tr:last-child th:last-child,
+  .panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:last-child,
+  .panel > .table:last-child > tfoot:last-child > tr:last-child th:last-child,
+  .panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:last-child {
+    border-bottom-right-radius: 3px;
+  }
+  .panel > .panel-body + .table,
+  .panel > .panel-body + .table-responsive,
+  .panel > .table + .panel-body,
+  .panel > .table-responsive + .panel-body {
+    border-top: 1px solid #ddd;
+  }
+  .panel > .table > tbody:first-child > tr:first-child th,
+  .panel > .table > tbody:first-child > tr:first-child td {
+    border-top: 0;
+  }
+  .panel > .table-bordered,
+  .panel > .table-responsive > .table-bordered {
+    border: 0;
+  }
+  .panel > .table-bordered > thead > tr > th:first-child,
+  .panel > .table-responsive > .table-bordered > thead > tr > th:first-child,
+  .panel > .table-bordered > tbody > tr > th:first-child,
+  .panel > .table-responsive > .table-bordered > tbody > tr > th:first-child,
+  .panel > .table-bordered > tfoot > tr > th:first-child,
+  .panel > .table-responsive > .table-bordered > tfoot > tr > th:first-child,
+  .panel > .table-bordered > thead > tr > td:first-child,
+  .panel > .table-responsive > .table-bordered > thead > tr > td:first-child,
+  .panel > .table-bordered > tbody > tr > td:first-child,
+  .panel > .table-responsive > .table-bordered > tbody > tr > td:first-child,
+  .panel > .table-bordered > tfoot > tr > td:first-child,
+  .panel > .table-responsive > .table-bordered > tfoot > tr > td:first-child {
+    border-left: 0;
+  }
+  .panel > .table-bordered > thead > tr > th:last-child,
+  .panel > .table-responsive > .table-bordered > thead > tr > th:last-child,
+  .panel > .table-bordered > tbody > tr > th:last-child,
+  .panel > .table-responsive > .table-bordered > tbody > tr > th:last-child,
+  .panel > .table-bordered > tfoot > tr > th:last-child,
+  .panel > .table-responsive > .table-bordered > tfoot > tr > th:last-child,
+  .panel > .table-bordered > thead > tr > td:last-child,
+  .panel > .table-responsive > .table-bordered > thead > tr > td:last-child,
+  .panel > .table-bordered > tbody > tr > td:last-child,
+  .panel > .table-responsive > .table-bordered > tbody > tr > td:last-child,
+  .panel > .table-bordered > tfoot > tr > td:last-child,
+  .panel > .table-responsive > .table-bordered > tfoot > tr > td:last-child {
+    border-right: 0;
+  }
+  .panel > .table-bordered > thead > tr:first-child > td,
+  .panel > .table-responsive > .table-bordered > thead > tr:first-child > td,
+  .panel > .table-bordered > tbody > tr:first-child > td,
+  .panel > .table-responsive > .table-bordered > tbody > tr:first-child > td,
+  .panel > .table-bordered > thead > tr:first-child > th,
+  .panel > .table-responsive > .table-bordered > thead > tr:first-child > th,
+  .panel > .table-bordered > tbody > tr:first-child > th,
+  .panel > .table-responsive > .table-bordered > tbody > tr:first-child > th {
+    border-bottom: 0;
+  }
+  .panel > .table-bordered > tbody > tr:last-child > td,
+  .panel > .table-responsive > .table-bordered > tbody > tr:last-child > td,
+  .panel > .table-bordered > tfoot > tr:last-child > td,
+  .panel > .table-responsive > .table-bordered > tfoot > tr:last-child > td,
+  .panel > .table-bordered > tbody > tr:last-child > th,
+  .panel > .table-responsive > .table-bordered > tbody > tr:last-child > th,
+  .panel > .table-bordered > tfoot > tr:last-child > th,
+  .panel > .table-responsive > .table-bordered > tfoot > tr:last-child > th {
+    border-bottom: 0;
+  }
+  .panel > .table-responsive {
+    margin-bottom: 0;
+    border: 0;
+  }
+  .panel-group {
+    margin-bottom: 20px;
+  }
+  .panel-group .panel {
+    margin-bottom: 0;
+    border-radius: 4px;
+  }
+  .panel-group .panel + .panel {
+    margin-top: 5px;
+  }
+  .panel-group .panel-heading {
+    border-bottom: 0;
+  }
+  .panel-group .panel-heading + .panel-collapse > .panel-body,
+  .panel-group .panel-heading + .panel-collapse > .list-group {
+    border-top: 1px solid #ddd;
+  }
+  .panel-group .panel-footer {
+    border-top: 0;
+  }
+  .panel-group .panel-footer + .panel-collapse .panel-body {
+    border-bottom: 1px solid #ddd;
+  }
+  .panel-default {
+    border-color: #ddd;
+  }
+  .panel-default > .panel-heading {
+    color: #333;
+    background-color: #f5f5f5;
+    border-color: #ddd;
+  }
+  .panel-default > .panel-heading + .panel-collapse > .panel-body {
+    border-top-color: #ddd;
+  }
+  .panel-default > .panel-heading .badge {
+    color: #f5f5f5;
+    background-color: #333;
+  }
+  .panel-default > .panel-footer + .panel-collapse > .panel-body {
+    border-bottom-color: #ddd;
+  }
+  .panel-primary {
+    border-color: #337ab7;
+  }
+  .panel-primary > .panel-heading {
+    color: #fff;
+    background-color: #337ab7;
+    border-color: #337ab7;
+  }
+  .panel-primary > .panel-heading + .panel-collapse > .panel-body {
+    border-top-color: #337ab7;
+  }
+  .panel-primary > .panel-heading .badge {
+    color: #337ab7;
+    background-color: #fff;
+  }
+  .panel-primary > .panel-footer + .panel-collapse > .panel-body {
+    border-bottom-color: #337ab7;
+  }
+  .panel-success {
+    border-color: #d6e9c6;
+  }
+  .panel-success > .panel-heading {
+    color: #3c763d;
+    background-color: #dff0d8;
+    border-color: #d6e9c6;
+  }
+  .panel-success > .panel-heading + .panel-collapse > .panel-body {
+    border-top-color: #d6e9c6;
+  }
+  .panel-success > .panel-heading .badge {
+    color: #dff0d8;
+    background-color: #3c763d;
+  }
+  .panel-success > .panel-footer + .panel-collapse > .panel-body {
+    border-bottom-color: #d6e9c6;
+  }
+  .panel-info {
+    border-color: #bce8f1;
+  }
+  .panel-info > .panel-heading {
+    color: #31708f;
+    background-color: #d9edf7;
+    border-color: #bce8f1;
+  }
+  .panel-info > .panel-heading + .panel-collapse > .panel-body {
+    border-top-color: #bce8f1;
+  }
+  .panel-info > .panel-heading .badge {
+    color: #d9edf7;
+    background-color: #31708f;
+  }
+  .panel-info > .panel-footer + .panel-collapse > .panel-body {
+    border-bottom-color: #bce8f1;
+  }
+  .panel-warning {
+    border-color: #faebcc;
+  }
+  .panel-warning > .panel-heading {
+    color: #8a6d3b;
+    background-color: #fcf8e3;
+    border-color: #faebcc;
+  }
+  .panel-warning > .panel-heading + .panel-collapse > .panel-body {
+    border-top-color: #faebcc;
+  }
+  .panel-warning > .panel-heading .badge {
+    color: #fcf8e3;
+    background-color: #8a6d3b;
+  }
+  .panel-warning > .panel-footer + .panel-collapse > .panel-body {
+    border-bottom-color: #faebcc;
+  }
+  .panel-danger {
+    border-color: #ebccd1;
+  }
+  .panel-danger > .panel-heading {
+    color: #a94442;
+    background-color: #f2dede;
+    border-color: #ebccd1;
+  }
+  .panel-danger > .panel-heading + .panel-collapse > .panel-body {
+    border-top-color: #ebccd1;
+  }
+  .panel-danger > .panel-heading .badge {
+    color: #f2dede;
+    background-color: #a94442;
+  }
+  .panel-danger > .panel-footer + .panel-collapse > .panel-body {
+    border-bottom-color: #ebccd1;
+  }
+  .embed-responsive {
+    position: relative;
+    display: block;
+    height: 0;
+    padding: 0;
+    overflow: hidden;
+  }
+  .embed-responsive .embed-responsive-item,
+  .embed-responsive iframe,
+  .embed-responsive embed,
+  .embed-responsive object,
+  .embed-responsive video {
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    border: 0;
+  }
+  .embed-responsive-16by9 {
+    padding-bottom: 56.25%;
+  }
+  .embed-responsive-4by3 {
+    padding-bottom: 75%;
+  }
+  .well {
+    min-height: 20px;
+    padding: 19px;
+    margin-bottom: 20px;
+    background-color: #f5f5f5;
+    border: 1px solid #e3e3e3;
+    border-radius: 4px;
+    -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05);
+            box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05);
+  }
+  .well blockquote {
+    border-color: #ddd;
+    border-color: rgba(0, 0, 0, .15);
+  }
+  .well-lg {
+    padding: 24px;
+    border-radius: 6px;
+  }
+  .well-sm {
+    padding: 9px;
+    border-radius: 3px;
+  }
+  .close {
+    float: right;
+    font-size: 21px;
+    font-weight: bold;
+    line-height: 1;
+    color: #000;
+    text-shadow: 0 1px 0 #fff;
+    filter: alpha(opacity=20);
+    opacity: .2;
+  }
+  .close:hover,
+  .close:focus {
+    color: #000;
+    text-decoration: none;
+    cursor: pointer;
+    filter: alpha(opacity=50);
+    opacity: .5;
+  }
+  button.close {
+    -webkit-appearance: none;
+    padding: 0;
+    cursor: pointer;
+    background: transparent;
+    border: 0;
+  }
+  .modal-open {
+    overflow: hidden;
+  }
+  .modal {
+    position: fixed;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    z-index: 1050;
+    display: none;
+    overflow: hidden;
+    -webkit-overflow-scrolling: touch;
+    outline: 0;
+  }
+  .modal.fade .modal-dialog {
+    -webkit-transition: -webkit-transform .3s ease-out;
+         -o-transition:      -o-transform .3s ease-out;
+            transition:         transform .3s ease-out;
+    -webkit-transform: translate(0, -25%);
+        -ms-transform: translate(0, -25%);
+         -o-transform: translate(0, -25%);
+            transform: translate(0, -25%);
+  }
+  .modal.in .modal-dialog {
+    -webkit-transform: translate(0, 0);
+        -ms-transform: translate(0, 0);
+         -o-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
+  .modal-open .modal {
+    overflow-x: hidden;
+    overflow-y: auto;
+  }
+  .modal-dialog {
+    position: relative;
+    width: auto;
+    margin: 10px;
+  }
+  .modal-content {
+    position: relative;
+    background-color: #fff;
+    -webkit-background-clip: padding-box;
+            background-clip: padding-box;
+    border: 1px solid #999;
+    border: 1px solid rgba(0, 0, 0, .2);
+    border-radius: 6px;
+    outline: 0;
+    -webkit-box-shadow: 0 3px 9px rgba(0, 0, 0, .5);
+            box-shadow: 0 3px 9px rgba(0, 0, 0, .5);
+  }
+  .modal-backdrop {
+    position: fixed;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    z-index: 1040;
+    background-color: #000;
+  }
+  .modal-backdrop.fade {
+    filter: alpha(opacity=0);
+    opacity: 0;
+  }
+  .modal-backdrop.in {
+    filter: alpha(opacity=50);
+    opacity: .5;
+  }
+  .modal-header {
+    padding: 15px;
+    border-bottom: 1px solid #e5e5e5;
+  }
+  .modal-header .close {
+    margin-top: -2px;
+  }
+  .modal-title {
+    margin: 0;
+    line-height: 1.42857143;
+  }
+  .modal-body {
+    position: relative;
+    padding: 15px;
+  }
+  .modal-footer {
+    padding: 15px;
+    text-align: right;
+    border-top: 1px solid #e5e5e5;
+  }
+  .modal-footer .btn + .btn {
+    margin-bottom: 0;
+    margin-left: 5px;
+  }
+  .modal-footer .btn-group .btn + .btn {
+    margin-left: -1px;
+  }
+  .modal-footer .btn-block + .btn-block {
+    margin-left: 0;
+  }
+  .modal-scrollbar-measure {
+    position: absolute;
+    top: -9999px;
+    width: 50px;
+    height: 50px;
+    overflow: scroll;
+  }
+  @media (min-width: 768px) {
+    .modal-dialog {
+      width: 600px;
+      margin: 30px auto;
+    }
+    .modal-content {
+      -webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, .5);
+              box-shadow: 0 5px 15px rgba(0, 0, 0, .5);
+    }
+    .modal-sm {
+      width: 300px;
+    }
+  }
+  @media (min-width: 992px) {
+    .modal-lg {
+      width: 900px;
+    }
+  }
+  .tooltip {
+    position: absolute;
+    z-index: 1070;
+    display: block;
+    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+    font-size: 12px;
+    font-style: normal;
+    font-weight: normal;
+    line-height: 1.42857143;
+    text-align: left;
+    text-align: start;
+    text-decoration: none;
+    text-shadow: none;
+    text-transform: none;
+    letter-spacing: normal;
+    word-break: normal;
+    word-spacing: normal;
+    word-wrap: normal;
+    white-space: normal;
+    filter: alpha(opacity=0);
+    opacity: 0;
+  
+    line-break: auto;
+  }
+  .tooltip.in {
+    filter: alpha(opacity=90);
+    opacity: .9;
+  }
+  .tooltip.top {
+    padding: 5px 0;
+    margin-top: -3px;
+  }
+  .tooltip.right {
+    padding: 0 5px;
+    margin-left: 3px;
+  }
+  .tooltip.bottom {
+    padding: 5px 0;
+    margin-top: 3px;
+  }
+  .tooltip.left {
+    padding: 0 5px;
+    margin-left: -3px;
+  }
+  .tooltip-inner {
+    max-width: 200px;
+    padding: 3px 8px;
+    color: #fff;
+    text-align: center;
+    background-color: #000;
+    border-radius: 4px;
+  }
+  .tooltip-arrow {
+    position: absolute;
+    width: 0;
+    height: 0;
+    border-color: transparent;
+    border-style: solid;
+  }
+  .tooltip.top .tooltip-arrow {
+    bottom: 0;
+    left: 50%;
+    margin-left: -5px;
+    border-width: 5px 5px 0;
+    border-top-color: #000;
+  }
+  .tooltip.top-left .tooltip-arrow {
+    right: 5px;
+    bottom: 0;
+    margin-bottom: -5px;
+    border-width: 5px 5px 0;
+    border-top-color: #000;
+  }
+  .tooltip.top-right .tooltip-arrow {
+    bottom: 0;
+    left: 5px;
+    margin-bottom: -5px;
+    border-width: 5px 5px 0;
+    border-top-color: #000;
+  }
+  .tooltip.right .tooltip-arrow {
+    top: 50%;
+    left: 0;
+    margin-top: -5px;
+    border-width: 5px 5px 5px 0;
+    border-right-color: #000;
+  }
+  .tooltip.left .tooltip-arrow {
+    top: 50%;
+    right: 0;
+    margin-top: -5px;
+    border-width: 5px 0 5px 5px;
+    border-left-color: #000;
+  }
+  .tooltip.bottom .tooltip-arrow {
+    top: 0;
+    left: 50%;
+    margin-left: -5px;
+    border-width: 0 5px 5px;
+    border-bottom-color: #000;
+  }
+  .tooltip.bottom-left .tooltip-arrow {
+    top: 0;
+    right: 5px;
+    margin-top: -5px;
+    border-width: 0 5px 5px;
+    border-bottom-color: #000;
+  }
+  .tooltip.bottom-right .tooltip-arrow {
+    top: 0;
+    left: 5px;
+    margin-top: -5px;
+    border-width: 0 5px 5px;
+    border-bottom-color: #000;
+  }
+  .popover {
+    position: absolute;
+    top: 0;
+    left: 0;
+    z-index: 1060;
+    display: none;
+    max-width: 276px;
+    padding: 1px;
+    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+    font-size: 14px;
+    font-style: normal;
+    font-weight: normal;
+    line-height: 1.42857143;
+    text-align: left;
+    text-align: start;
+    text-decoration: none;
+    text-shadow: none;
+    text-transform: none;
+    letter-spacing: normal;
+    word-break: normal;
+    word-spacing: normal;
+    word-wrap: normal;
+    white-space: normal;
+    background-color: #fff;
+    -webkit-background-clip: padding-box;
+            background-clip: padding-box;
+    border: 1px solid #ccc;
+    border: 1px solid rgba(0, 0, 0, .2);
+    border-radius: 6px;
+    -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, .2);
+            box-shadow: 0 5px 10px rgba(0, 0, 0, .2);
+  
+    line-break: auto;
+  }
+  .popover.top {
+    margin-top: -10px;
+  }
+  .popover.right {
+    margin-left: 10px;
+  }
+  .popover.bottom {
+    margin-top: 10px;
+  }
+  .popover.left {
+    margin-left: -10px;
+  }
+  .popover-title {
+    padding: 8px 14px;
+    margin: 0;
+    font-size: 14px;
+    background-color: #f7f7f7;
+    border-bottom: 1px solid #ebebeb;
+    border-radius: 5px 5px 0 0;
+  }
+  .popover-content {
+    padding: 9px 14px;
+  }
+  .popover > .arrow,
+  .popover > .arrow:after {
+    position: absolute;
+    display: block;
+    width: 0;
+    height: 0;
+    border-color: transparent;
+    border-style: solid;
+  }
+  .popover > .arrow {
+    border-width: 11px;
+  }
+  .popover > .arrow:after {
+    content: "";
+    border-width: 10px;
+  }
+  .popover.top > .arrow {
+    bottom: -11px;
+    left: 50%;
+    margin-left: -11px;
+    border-top-color: #999;
+    border-top-color: rgba(0, 0, 0, .25);
+    border-bottom-width: 0;
+  }
+  .popover.top > .arrow:after {
+    bottom: 1px;
+    margin-left: -10px;
+    content: " ";
+    border-top-color: #fff;
+    border-bottom-width: 0;
+  }
+  .popover.right > .arrow {
+    top: 50%;
+    left: -11px;
+    margin-top: -11px;
+    border-right-color: #999;
+    border-right-color: rgba(0, 0, 0, .25);
+    border-left-width: 0;
+  }
+  .popover.right > .arrow:after {
+    bottom: -10px;
+    left: 1px;
+    content: " ";
+    border-right-color: #fff;
+    border-left-width: 0;
+  }
+  .popover.bottom > .arrow {
+    top: -11px;
+    left: 50%;
+    margin-left: -11px;
+    border-top-width: 0;
+    border-bottom-color: #999;
+    border-bottom-color: rgba(0, 0, 0, .25);
+  }
+  .popover.bottom > .arrow:after {
+    top: 1px;
+    margin-left: -10px;
+    content: " ";
+    border-top-width: 0;
+    border-bottom-color: #fff;
+  }
+  .popover.left > .arrow {
+    top: 50%;
+    right: -11px;
+    margin-top: -11px;
+    border-right-width: 0;
+    border-left-color: #999;
+    border-left-color: rgba(0, 0, 0, .25);
+  }
+  .popover.left > .arrow:after {
+    right: 1px;
+    bottom: -10px;
+    content: " ";
+    border-right-width: 0;
+    border-left-color: #fff;
+  }
+  .carousel {
+    position: relative;
+  }
+  .carousel-inner {
+    position: relative;
+    width: 100%;
+    overflow: hidden;
+  }
+  .carousel-inner > .item {
+    position: relative;
+    display: none;
+    -webkit-transition: .6s ease-in-out left;
+         -o-transition: .6s ease-in-out left;
+            transition: .6s ease-in-out left;
+  }
+  .carousel-inner > .item > img,
+  .carousel-inner > .item > a > img {
+    line-height: 1;
+  }
+  @media all and (transform-3d), (-webkit-transform-3d) {
+    .carousel-inner > .item {
+      -webkit-transition: -webkit-transform .6s ease-in-out;
+           -o-transition:      -o-transform .6s ease-in-out;
+              transition:         transform .6s ease-in-out;
+  
+      -webkit-backface-visibility: hidden;
+              backface-visibility: hidden;
+      -webkit-perspective: 1000px;
+              perspective: 1000px;
+    }
+    .carousel-inner > .item.next,
+    .carousel-inner > .item.active.right {
+      left: 0;
+      -webkit-transform: translate3d(100%, 0, 0);
+              transform: translate3d(100%, 0, 0);
+    }
+    .carousel-inner > .item.prev,
+    .carousel-inner > .item.active.left {
+      left: 0;
+      -webkit-transform: translate3d(-100%, 0, 0);
+              transform: translate3d(-100%, 0, 0);
+    }
+    .carousel-inner > .item.next.left,
+    .carousel-inner > .item.prev.right,
+    .carousel-inner > .item.active {
+      left: 0;
+      -webkit-transform: translate3d(0, 0, 0);
+              transform: translate3d(0, 0, 0);
+    }
+  }
+  .carousel-inner > .active,
+  .carousel-inner > .next,
+  .carousel-inner > .prev {
+    display: block;
+  }
+  .carousel-inner > .active {
+    left: 0;
+  }
+  .carousel-inner > .next,
+  .carousel-inner > .prev {
+    position: absolute;
+    top: 0;
+    width: 100%;
+  }
+  .carousel-inner > .next {
+    left: 100%;
+  }
+  .carousel-inner > .prev {
+    left: -100%;
+  }
+  .carousel-inner > .next.left,
+  .carousel-inner > .prev.right {
+    left: 0;
+  }
+  .carousel-inner > .active.left {
+    left: -100%;
+  }
+  .carousel-inner > .active.right {
+    left: 100%;
+  }
+  .carousel-control {
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    width: 15%;
+    font-size: 20px;
+    color: #fff;
+    text-align: center;
+    text-shadow: 0 1px 2px rgba(0, 0, 0, .6);
+    background-color: rgba(0, 0, 0, 0);
+    filter: alpha(opacity=50);
+    opacity: .5;
+  }
+  .carousel-control.left {
+    background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, .5) 0%, rgba(0, 0, 0, .0001) 100%);
+    background-image:      -o-linear-gradient(left, rgba(0, 0, 0, .5) 0%, rgba(0, 0, 0, .0001) 100%);
+    background-image: -webkit-gradient(linear, left top, right top, from(rgba(0, 0, 0, .5)), to(rgba(0, 0, 0, .0001)));
+    background-image:         linear-gradient(to right, rgba(0, 0, 0, .5) 0%, rgba(0, 0, 0, .0001) 100%);
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1);
+    background-repeat: repeat-x;
+  }
+  .carousel-control.right {
+    right: 0;
+    left: auto;
+    background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, .0001) 0%, rgba(0, 0, 0, .5) 100%);
+    background-image:      -o-linear-gradient(left, rgba(0, 0, 0, .0001) 0%, rgba(0, 0, 0, .5) 100%);
+    background-image: -webkit-gradient(linear, left top, right top, from(rgba(0, 0, 0, .0001)), to(rgba(0, 0, 0, .5)));
+    background-image:         linear-gradient(to right, rgba(0, 0, 0, .0001) 0%, rgba(0, 0, 0, .5) 100%);
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1);
+    background-repeat: repeat-x;
+  }
+  .carousel-control:hover,
+  .carousel-control:focus {
+    color: #fff;
+    text-decoration: none;
+    filter: alpha(opacity=90);
+    outline: 0;
+    opacity: .9;
+  }
+  .carousel-control .icon-prev,
+  .carousel-control .icon-next,
+  .carousel-control .glyphicon-chevron-left,
+  .carousel-control .glyphicon-chevron-right {
+    position: absolute;
+    top: 50%;
+    z-index: 5;
+    display: inline-block;
+    margin-top: -10px;
+  }
+  .carousel-control .icon-prev,
+  .carousel-control .glyphicon-chevron-left {
+    left: 50%;
+    margin-left: -10px;
+  }
+  .carousel-control .icon-next,
+  .carousel-control .glyphicon-chevron-right {
+    right: 50%;
+    margin-right: -10px;
+  }
+  .carousel-control .icon-prev,
+  .carousel-control .icon-next {
+    width: 20px;
+    height: 20px;
+    font-family: serif;
+    line-height: 1;
+  }
+  .carousel-control .icon-prev:before {
+    content: '\2039';
+  }
+  .carousel-control .icon-next:before {
+    content: '\203a';
+  }
+  .carousel-indicators {
+    position: absolute;
+    bottom: 10px;
+    left: 50%;
+    z-index: 15;
+    width: 60%;
+    padding-left: 0;
+    margin-left: -30%;
+    text-align: center;
+    list-style: none;
+  }
+  .carousel-indicators li {
+    display: inline-block;
+    width: 10px;
+    height: 10px;
+    margin: 1px;
+    text-indent: -999px;
+    cursor: pointer;
+    background-color: #000 \9;
+    background-color: rgba(0, 0, 0, 0);
+    border: 1px solid #fff;
+    border-radius: 10px;
+  }
+  .carousel-indicators .active {
+    width: 12px;
+    height: 12px;
+    margin: 0;
+    background-color: #fff;
+  }
+  .carousel-caption {
+    position: absolute;
+    right: 15%;
+    bottom: 20px;
+    left: 15%;
+    z-index: 10;
+    padding-top: 20px;
+    padding-bottom: 20px;
+    color: #fff;
+    text-align: center;
+    text-shadow: 0 1px 2px rgba(0, 0, 0, .6);
+  }
+  .carousel-caption .btn {
+    text-shadow: none;
+  }
+  @media screen and (min-width: 768px) {
+    .carousel-control .glyphicon-chevron-left,
+    .carousel-control .glyphicon-chevron-right,
+    .carousel-control .icon-prev,
+    .carousel-control .icon-next {
+      width: 30px;
+      height: 30px;
+      margin-top: -10px;
+      font-size: 30px;
+    }
+    .carousel-control .glyphicon-chevron-left,
+    .carousel-control .icon-prev {
+      margin-left: -10px;
+    }
+    .carousel-control .glyphicon-chevron-right,
+    .carousel-control .icon-next {
+      margin-right: -10px;
+    }
+    .carousel-caption {
+      right: 20%;
+      left: 20%;
+      padding-bottom: 30px;
+    }
+    .carousel-indicators {
+      bottom: 20px;
+    }
+  }
+  .clearfix:before,
+  .clearfix:after,
+  .dl-horizontal dd:before,
+  .dl-horizontal dd:after,
+  .container:before,
+  .container:after,
+  .container-fluid:before,
+  .container-fluid:after,
+  .row:before,
+  .row:after,
+  .form-horizontal .form-group:before,
+  .form-horizontal .form-group:after,
+  .btn-toolbar:before,
+  .btn-toolbar:after,
+  .btn-group-vertical > .btn-group:before,
+  .btn-group-vertical > .btn-group:after,
+  .nav:before,
+  .nav:after,
+  .navbar:before,
+  .navbar:after,
+  .navbar-header:before,
+  .navbar-header:after,
+  .navbar-collapse:before,
+  .navbar-collapse:after,
+  .pager:before,
+  .pager:after,
+  .panel-body:before,
+  .panel-body:after,
+  .modal-header:before,
+  .modal-header:after,
+  .modal-footer:before,
+  .modal-footer:after {
+    display: table;
+    content: " ";
+  }
+  .clearfix:after,
+  .dl-horizontal dd:after,
+  .container:after,
+  .container-fluid:after,
+  .row:after,
+  .form-horizontal .form-group:after,
+  .btn-toolbar:after,
+  .btn-group-vertical > .btn-group:after,
+  .nav:after,
+  .navbar:after,
+  .navbar-header:after,
+  .navbar-collapse:after,
+  .pager:after,
+  .panel-body:after,
+  .modal-header:after,
+  .modal-footer:after {
+    clear: both;
+  }
+  .center-block {
+    display: block;
+    margin-right: auto;
+    margin-left: auto;
+  }
+  .pull-right {
+    float: right !important;
+  }
+  .pull-left {
+    float: left !important;
+  }
+  .hide {
+    display: none !important;
+  }
+  .show {
+    display: block !important;
+  }
+  .invisible {
+    visibility: hidden;
+  }
+  .text-hide {
+    font: 0/0 a;
+    color: transparent;
+    text-shadow: none;
+    background-color: transparent;
+    border: 0;
+  }
+  .hidden {
+    display: none !important;
+  }
+  .affix {
+    position: fixed;
+  }
+  @-ms-viewport {
+    width: device-width;
+  }
+  .visible-xs,
+  .visible-sm,
+  .visible-md,
+  .visible-lg {
+    display: none !important;
+  }
+  .visible-xs-block,
+  .visible-xs-inline,
+  .visible-xs-inline-block,
+  .visible-sm-block,
+  .visible-sm-inline,
+  .visible-sm-inline-block,
+  .visible-md-block,
+  .visible-md-inline,
+  .visible-md-inline-block,
+  .visible-lg-block,
+  .visible-lg-inline,
+  .visible-lg-inline-block {
+    display: none !important;
+  }
+  @media (max-width: 767px) {
+    .visible-xs {
+      display: block !important;
+    }
+    table.visible-xs {
+      display: table !important;
+    }
+    tr.visible-xs {
+      display: table-row !important;
+    }
+    th.visible-xs,
+    td.visible-xs {
+      display: table-cell !important;
+    }
+  }
+  @media (max-width: 767px) {
+    .visible-xs-block {
+      display: block !important;
+    }
+  }
+  @media (max-width: 767px) {
+    .visible-xs-inline {
+      display: inline !important;
+    }
+  }
+  @media (max-width: 767px) {
+    .visible-xs-inline-block {
+      display: inline-block !important;
+    }
+  }
+  @media (min-width: 768px) and (max-width: 991px) {
+    .visible-sm {
+      display: block !important;
+    }
+    table.visible-sm {
+      display: table !important;
+    }
+    tr.visible-sm {
+      display: table-row !important;
+    }
+    th.visible-sm,
+    td.visible-sm {
+      display: table-cell !important;
+    }
+  }
+  @media (min-width: 768px) and (max-width: 991px) {
+    .visible-sm-block {
+      display: block !important;
+    }
+  }
+  @media (min-width: 768px) and (max-width: 991px) {
+    .visible-sm-inline {
+      display: inline !important;
+    }
+  }
+  @media (min-width: 768px) and (max-width: 991px) {
+    .visible-sm-inline-block {
+      display: inline-block !important;
+    }
+  }
+  @media (min-width: 992px) and (max-width: 1199px) {
+    .visible-md {
+      display: block !important;
+    }
+    table.visible-md {
+      display: table !important;
+    }
+    tr.visible-md {
+      display: table-row !important;
+    }
+    th.visible-md,
+    td.visible-md {
+      display: table-cell !important;
+    }
+  }
+  @media (min-width: 992px) and (max-width: 1199px) {
+    .visible-md-block {
+      display: block !important;
+    }
+  }
+  @media (min-width: 992px) and (max-width: 1199px) {
+    .visible-md-inline {
+      display: inline !important;
+    }
+  }
+  @media (min-width: 992px) and (max-width: 1199px) {
+    .visible-md-inline-block {
+      display: inline-block !important;
+    }
+  }
+  @media (min-width: 1200px) {
+    .visible-lg {
+      display: block !important;
+    }
+    table.visible-lg {
+      display: table !important;
+    }
+    tr.visible-lg {
+      display: table-row !important;
+    }
+    th.visible-lg,
+    td.visible-lg {
+      display: table-cell !important;
+    }
+  }
+  @media (min-width: 1200px) {
+    .visible-lg-block {
+      display: block !important;
+    }
+  }
+  @media (min-width: 1200px) {
+    .visible-lg-inline {
+      display: inline !important;
+    }
+  }
+  @media (min-width: 1200px) {
+    .visible-lg-inline-block {
+      display: inline-block !important;
+    }
+  }
+  @media (max-width: 767px) {
+    .hidden-xs {
+      display: none !important;
+    }
+  }
+  @media (min-width: 768px) and (max-width: 991px) {
+    .hidden-sm {
+      display: none !important;
+    }
+  }
+  @media (min-width: 992px) and (max-width: 1199px) {
+    .hidden-md {
+      display: none !important;
+    }
+  }
+  @media (min-width: 1200px) {
+    .hidden-lg {
+      display: none !important;
+    }
+  }
+  .visible-print {
+    display: none !important;
+  }
+  @media print {
+    .visible-print {
+      display: block !important;
+    }
+    table.visible-print {
+      display: table !important;
+    }
+    tr.visible-print {
+      display: table-row !important;
+    }
+    th.visible-print,
+    td.visible-print {
+      display: table-cell !important;
+    }
+  }
+  .visible-print-block {
+    display: none !important;
+  }
+  @media print {
+    .visible-print-block {
+      display: block !important;
+    }
+  }
+  .visible-print-inline {
+    display: none !important;
+  }
+  @media print {
+    .visible-print-inline {
+      display: inline !important;
+    }
+  }
+  .visible-print-inline-block {
+    display: none !important;
+  }
+  @media print {
+    .visible-print-inline-block {
+      display: inline-block !important;
+    }
+  }
+  @media print {
+    .hidden-print {
+      display: none !important;
+    }
+  }
+  /*# sourceMappingURL=bootstrap.css.map */
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/css/tencentVideo/pure-min.css b/pluss-manage-page/src/main/resources/static/resources/css/tencentVideo/pure-min.css
new file mode 100644
index 0000000..e3ddfbf
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/css/tencentVideo/pure-min.css
@@ -0,0 +1,11 @@
+/*!
+Pure v1.0.0
+Copyright 2013 Yahoo!
+Licensed under the BSD License.
+https://github.com/yahoo/pure/blob/master/LICENSE.md
+*/
+/*!
+normalize.css v^3.0 | MIT License | git.io/normalize
+Copyright (c) Nicolas Gallagher and Jonathan Neal
+*/
+/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */.pure-button:focus,a:active,a:hover{outline:0}.pure-table,table{border-collapse:collapse;border-spacing:0}html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}abbr[title]{border-bottom:1px dotted}b,optgroup,strong{font-weight:700}dfn{font-style:italic}h1{font-size:2em;margin:.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{box-sizing:content-box;height:0}pre,textarea{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}.pure-button,input{line-height:normal}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-appearance:textfield;box-sizing:content-box}.pure-button,.pure-form input:not([type]),.pure-menu{box-sizing:border-box}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend,td,th{padding:0}legend{border:0}.hidden,[hidden]{display:none!important}.pure-img{max-width:100%;height:auto;display:block}.pure-g{letter-spacing:-.31em;text-rendering:optimizespeed;font-family:FreeSans,Arimo,"Droid Sans",Helvetica,Arial,sans-serif;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-flow:row wrap;-ms-flex-flow:row wrap;flex-flow:row wrap;-webkit-align-content:flex-start;-ms-flex-line-pack:start;align-content:flex-start}@media all and (-ms-high-contrast:none),(-ms-high-contrast:active){table .pure-g{display:block}}.opera-only :-o-prefocus,.pure-g{word-spacing:-.43em}.pure-u,.pure-u-1,.pure-u-1-1,.pure-u-1-12,.pure-u-1-2,.pure-u-1-24,.pure-u-1-3,.pure-u-1-4,.pure-u-1-5,.pure-u-1-6,.pure-u-1-8,.pure-u-10-24,.pure-u-11-12,.pure-u-11-24,.pure-u-12-24,.pure-u-13-24,.pure-u-14-24,.pure-u-15-24,.pure-u-16-24,.pure-u-17-24,.pure-u-18-24,.pure-u-19-24,.pure-u-2-24,.pure-u-2-3,.pure-u-2-5,.pure-u-20-24,.pure-u-21-24,.pure-u-22-24,.pure-u-23-24,.pure-u-24-24,.pure-u-3-24,.pure-u-3-4,.pure-u-3-5,.pure-u-3-8,.pure-u-4-24,.pure-u-4-5,.pure-u-5-12,.pure-u-5-24,.pure-u-5-5,.pure-u-5-6,.pure-u-5-8,.pure-u-6-24,.pure-u-7-12,.pure-u-7-24,.pure-u-7-8,.pure-u-8-24,.pure-u-9-24{letter-spacing:normal;word-spacing:normal;vertical-align:top;text-rendering:auto;display:inline-block;zoom:1}.pure-g [class*=pure-u]{font-family:sans-serif}.pure-u-1-24{width:4.1667%}.pure-u-1-12,.pure-u-2-24{width:8.3333%}.pure-u-1-8,.pure-u-3-24{width:12.5%}.pure-u-1-6,.pure-u-4-24{width:16.6667%}.pure-u-1-5{width:20%}.pure-u-5-24{width:20.8333%}.pure-u-1-4,.pure-u-6-24{width:25%}.pure-u-7-24{width:29.1667%}.pure-u-1-3,.pure-u-8-24{width:33.3333%}.pure-u-3-8,.pure-u-9-24{width:37.5%}.pure-u-2-5{width:40%}.pure-u-10-24,.pure-u-5-12{width:41.6667%}.pure-u-11-24{width:45.8333%}.pure-u-1-2,.pure-u-12-24{width:50%}.pure-u-13-24{width:54.1667%}.pure-u-14-24,.pure-u-7-12{width:58.3333%}.pure-u-3-5{width:60%}.pure-u-15-24,.pure-u-5-8{width:62.5%}.pure-u-16-24,.pure-u-2-3{width:66.6667%}.pure-u-17-24{width:70.8333%}.pure-u-18-24,.pure-u-3-4{width:75%}.pure-u-19-24{width:79.1667%}.pure-u-4-5{width:80%}.pure-u-20-24,.pure-u-5-6{width:83.3333%}.pure-u-21-24,.pure-u-7-8{width:87.5%}.pure-u-11-12,.pure-u-22-24{width:91.6667%}.pure-u-23-24{width:95.8333%}.pure-u-1,.pure-u-1-1,.pure-u-24-24,.pure-u-5-5{width:100%}.pure-button{display:inline-block;zoom:1;white-space:nowrap;vertical-align:middle;text-align:center;cursor:pointer;-webkit-user-drag:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.pure-button::-moz-focus-inner{padding:0;border:0}.pure-button-group{letter-spacing:-.31em;text-rendering:optimizespeed}.opera-only :-o-prefocus,.pure-button-group{word-spacing:-.43em}.pure-button{font-family:inherit;font-size:100%;padding:.5em 1em;color:#444;color:rgba(0,0,0,.8);border:1px solid #999;border:transparent;background-color:#E6E6E6;text-decoration:none;border-radius:2px}.pure-button-hover,.pure-button:focus,.pure-button:hover{filter:alpha(opacity=90);background-image:-webkit-linear-gradient(transparent,rgba(0,0,0,.05) 40%,rgba(0,0,0,.1));background-image:linear-gradient(transparent,rgba(0,0,0,.05) 40%,rgba(0,0,0,.1))}.pure-button-active,.pure-button:active{box-shadow:0 0 0 1px rgba(0,0,0,.15) inset,0 0 6px rgba(0,0,0,.2) inset;border-color:#000\9}.pure-button-disabled,.pure-button-disabled:active,.pure-button-disabled:focus,.pure-button-disabled:hover,.pure-button[disabled]{border:none;background-image:none;filter:alpha(opacity=40);opacity:.4;cursor:not-allowed;box-shadow:none;pointer-events:none}.pure-button-hidden{display:none}.pure-button-primary,.pure-button-selected,a.pure-button-primary,a.pure-button-selected{background-color:#0078e7;color:#fff}.pure-button-group .pure-button{letter-spacing:normal;word-spacing:normal;vertical-align:top;text-rendering:auto;margin:0;border-radius:0;border-right:1px solid #111;border-right:1px solid rgba(0,0,0,.2)}.pure-button-group .pure-button:first-child{border-top-left-radius:2px;border-bottom-left-radius:2px}.pure-button-group .pure-button:last-child{border-top-right-radius:2px;border-bottom-right-radius:2px;border-right:none}.pure-form input[type=password],.pure-form input[type=email],.pure-form input[type=url],.pure-form input[type=date],.pure-form input[type=month],.pure-form input[type=time],.pure-form input[type=datetime],.pure-form input[type=datetime-local],.pure-form input[type=week],.pure-form input[type=tel],.pure-form input[type=color],.pure-form input[type=number],.pure-form input[type=search],.pure-form input[type=text],.pure-form select,.pure-form textarea{padding:.5em .6em;display:inline-block;border:1px solid #ccc;box-shadow:inset 0 1px 3px #ddd;border-radius:4px;vertical-align:middle;box-sizing:border-box}.pure-form input:not([type]){padding:.5em .6em;display:inline-block;border:1px solid #ccc;box-shadow:inset 0 1px 3px #ddd;border-radius:4px}.pure-form input[type=color]{padding:.2em .5em}.pure-form input:not([type]):focus,.pure-form input[type=password]:focus,.pure-form input[type=email]:focus,.pure-form input[type=url]:focus,.pure-form input[type=date]:focus,.pure-form input[type=month]:focus,.pure-form input[type=time]:focus,.pure-form input[type=datetime]:focus,.pure-form input[type=datetime-local]:focus,.pure-form input[type=week]:focus,.pure-form input[type=tel]:focus,.pure-form input[type=color]:focus,.pure-form input[type=number]:focus,.pure-form input[type=search]:focus,.pure-form input[type=text]:focus,.pure-form select:focus,.pure-form textarea:focus{outline:0;border-color:#129FEA}.pure-form input[type=file]:focus,.pure-form input[type=checkbox]:focus,.pure-form input[type=radio]:focus{outline:#129FEA auto 1px}.pure-form .pure-checkbox,.pure-form .pure-radio{margin:.5em 0;display:block}.pure-form input:not([type])[disabled],.pure-form input[type=password][disabled],.pure-form input[type=email][disabled],.pure-form input[type=url][disabled],.pure-form input[type=date][disabled],.pure-form input[type=month][disabled],.pure-form input[type=time][disabled],.pure-form input[type=datetime][disabled],.pure-form input[type=datetime-local][disabled],.pure-form input[type=week][disabled],.pure-form input[type=tel][disabled],.pure-form input[type=color][disabled],.pure-form input[type=number][disabled],.pure-form input[type=search][disabled],.pure-form input[type=text][disabled],.pure-form select[disabled],.pure-form textarea[disabled]{cursor:not-allowed;background-color:#eaeded;color:#cad2d3}.pure-form input[readonly],.pure-form select[readonly],.pure-form textarea[readonly]{background-color:#eee;color:#777;border-color:#ccc}.pure-form input:focus:invalid,.pure-form select:focus:invalid,.pure-form textarea:focus:invalid{color:#b94a48;border-color:#e9322d}.pure-form input[type=file]:focus:invalid:focus,.pure-form input[type=checkbox]:focus:invalid:focus,.pure-form input[type=radio]:focus:invalid:focus{outline-color:#e9322d}.pure-form select{height:2.25em;border:1px solid #ccc;background-color:#fff}.pure-form select[multiple]{height:auto}.pure-form label{margin:.5em 0 .2em}.pure-form fieldset{margin:0;padding:.35em 0 .75em;border:0}.pure-form legend{display:block;width:100%;padding:.3em 0;margin-bottom:.3em;color:#333;border-bottom:1px solid #e5e5e5}.pure-form-stacked input:not([type]),.pure-form-stacked input[type=password],.pure-form-stacked input[type=email],.pure-form-stacked input[type=url],.pure-form-stacked input[type=date],.pure-form-stacked input[type=month],.pure-form-stacked input[type=time],.pure-form-stacked input[type=datetime],.pure-form-stacked input[type=datetime-local],.pure-form-stacked input[type=week],.pure-form-stacked input[type=tel],.pure-form-stacked input[type=color],.pure-form-stacked input[type=file],.pure-form-stacked input[type=number],.pure-form-stacked input[type=search],.pure-form-stacked input[type=text],.pure-form-stacked label,.pure-form-stacked select,.pure-form-stacked textarea{display:block;margin:.25em 0}.pure-form-aligned .pure-help-inline,.pure-form-aligned input,.pure-form-aligned select,.pure-form-aligned textarea,.pure-form-message-inline{display:inline-block;vertical-align:middle}.pure-form-aligned textarea{vertical-align:top}.pure-form-aligned .pure-control-group{margin-bottom:.5em}.pure-form-aligned .pure-control-group label{text-align:right;display:inline-block;vertical-align:middle;width:10em;margin:0 1em 0 0}.pure-form-aligned .pure-controls{margin:1.5em 0 0 11em}.pure-form .pure-input-rounded,.pure-form input.pure-input-rounded{border-radius:2em;padding:.5em 1em}.pure-form .pure-group fieldset{margin-bottom:10px}.pure-form .pure-group input,.pure-form .pure-group textarea{display:block;padding:10px;margin:0 0 -1px;border-radius:0;position:relative;top:-1px}.pure-form .pure-group input:focus,.pure-form .pure-group textarea:focus{z-index:3}.pure-form .pure-group input:first-child,.pure-form .pure-group textarea:first-child{top:1px;border-radius:4px 4px 0 0;margin:0}.pure-form .pure-group input:first-child:last-child,.pure-form .pure-group textarea:first-child:last-child{top:1px;border-radius:4px;margin:0}.pure-form .pure-group input:last-child,.pure-form .pure-group textarea:last-child{top:-2px;border-radius:0 0 4px 4px;margin:0}.pure-form .pure-group button{margin:.35em 0}.pure-form .pure-input-1{width:100%}.pure-form .pure-input-3-4{width:75%}.pure-form .pure-input-2-3{width:66%}.pure-form .pure-input-1-2{width:50%}.pure-form .pure-input-1-3{width:33%}.pure-form .pure-input-1-4{width:25%}.pure-form .pure-help-inline,.pure-form-message-inline{display:inline-block;padding-left:.3em;color:#666;vertical-align:middle;font-size:.875em}.pure-form-message{display:block;color:#666;font-size:.875em}@media only screen and (max-width :480px){.pure-form button[type=submit]{margin:.7em 0 0}.pure-form input:not([type]),.pure-form input[type=password],.pure-form input[type=email],.pure-form input[type=url],.pure-form input[type=date],.pure-form input[type=month],.pure-form input[type=time],.pure-form input[type=datetime],.pure-form input[type=datetime-local],.pure-form input[type=week],.pure-form input[type=tel],.pure-form input[type=color],.pure-form input[type=number],.pure-form input[type=search],.pure-form input[type=text],.pure-form label{margin-bottom:.3em;display:block}.pure-group input:not([type]),.pure-group input[type=password],.pure-group input[type=email],.pure-group input[type=url],.pure-group input[type=date],.pure-group input[type=month],.pure-group input[type=time],.pure-group input[type=datetime],.pure-group input[type=datetime-local],.pure-group input[type=week],.pure-group input[type=tel],.pure-group input[type=color],.pure-group input[type=number],.pure-group input[type=search],.pure-group input[type=text]{margin-bottom:0}.pure-form-aligned .pure-control-group label{margin-bottom:.3em;text-align:left;display:block;width:100%}.pure-form-aligned .pure-controls{margin:1.5em 0 0}.pure-form .pure-help-inline,.pure-form-message,.pure-form-message-inline{display:block;font-size:.75em;padding:.2em 0 .8em}}.pure-menu-fixed{position:fixed;left:0;top:0;z-index:3}.pure-menu-item,.pure-menu-list{position:relative}.pure-menu-list{list-style:none;margin:0;padding:0}.pure-menu-item{padding:0;margin:0;height:100%}.pure-menu-heading,.pure-menu-link{display:block;text-decoration:none;white-space:nowrap}.pure-menu-horizontal{width:100%;white-space:nowrap}.pure-menu-horizontal .pure-menu-list{display:inline-block}.pure-menu-horizontal .pure-menu-heading,.pure-menu-horizontal .pure-menu-item,.pure-menu-horizontal .pure-menu-separator{display:inline-block;zoom:1;vertical-align:middle}.pure-menu-item .pure-menu-item{display:block}.pure-menu-children{display:none;position:absolute;left:100%;top:0;margin:0;padding:0;z-index:3}.pure-menu-horizontal .pure-menu-children{left:0;top:auto;width:inherit}.pure-menu-active>.pure-menu-children,.pure-menu-allow-hover:hover>.pure-menu-children{display:block;position:absolute}.pure-menu-has-children>.pure-menu-link:after{padding-left:.5em;content:"\25B8";font-size:small}.pure-menu-horizontal .pure-menu-has-children>.pure-menu-link:after{content:"\25BE"}.pure-menu-scrollable{overflow-y:scroll;overflow-x:hidden}.pure-menu-scrollable .pure-menu-list{display:block}.pure-menu-horizontal.pure-menu-scrollable .pure-menu-list{display:inline-block}.pure-menu-horizontal.pure-menu-scrollable{white-space:nowrap;overflow-y:hidden;overflow-x:auto;-ms-overflow-style:none;-webkit-overflow-scrolling:touch;padding:.5em 0}.pure-menu-horizontal.pure-menu-scrollable::-webkit-scrollbar{display:none}.pure-menu-horizontal .pure-menu-children .pure-menu-separator,.pure-menu-separator{background-color:#ccc;height:1px;margin:.3em 0}.pure-menu-horizontal .pure-menu-separator{width:1px;height:1.3em;margin:0 .3em}.pure-menu-horizontal .pure-menu-children .pure-menu-separator{display:block;width:auto}.pure-menu-heading{text-transform:uppercase;color:#565d64}.pure-menu-link{color:#777}.pure-menu-children{background-color:#fff}.pure-menu-disabled,.pure-menu-heading,.pure-menu-link{padding:.5em 1em}.pure-menu-disabled{opacity:.5}.pure-menu-disabled .pure-menu-link:hover{background-color:transparent}.pure-menu-active>.pure-menu-link,.pure-menu-link:focus,.pure-menu-link:hover{background-color:#eee}.pure-menu-selected .pure-menu-link,.pure-menu-selected .pure-menu-link:visited{color:#000}.pure-table{empty-cells:show;border:1px solid #cbcbcb}.pure-table caption{color:#000;font:italic 85%/1 arial,sans-serif;padding:1em 0;text-align:center}.pure-table td,.pure-table th{border-left:1px solid #cbcbcb;border-width:0 0 0 1px;font-size:inherit;margin:0;overflow:visible;padding:.5em 1em}.pure-table td:first-child,.pure-table th:first-child{border-left-width:0}.pure-table thead{background-color:#e0e0e0;color:#000;text-align:left;vertical-align:bottom}.pure-table td{background-color:transparent}.pure-table-odd td,.pure-table-striped tr:nth-child(2n-1) td{background-color:#f2f2f2}.pure-table-bordered td{border-bottom:1px solid #cbcbcb}.pure-table-bordered tbody>tr:last-child>td{border-bottom-width:0}.pure-table-horizontal td,.pure-table-horizontal th{border-width:0 0 1px;border-bottom:1px solid #cbcbcb}.pure-table-horizontal tbody>tr:last-child>td{border-bottom-width:0}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/css/tencentVideo/style.css b/pluss-manage-page/src/main/resources/static/resources/css/tencentVideo/style.css
new file mode 100644
index 0000000..f8ed28e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/css/tencentVideo/style.css
@@ -0,0 +1,205 @@
+body {
+    font: 14px "Lucida Grande", Helvetica, Arial, sans-serif;
+}
+
+a {
+    color: #00B7FF;
+}
+
+body {
+    display: -webkit-flex;
+    -webkit-flex-direction: column;
+    align-content: center;
+}
+
+#button-container {
+    position: absolute;
+    bottom: 50px;
+    left: 50px;
+    /* display: -webkit-flex; */
+    -webkit-flex-direction: column;
+}
+
+.desc{
+    display: -webkit-flex;
+}
+
+.login-box {
+    display: -webkit-flex;
+    -webkit-flex-direction: column;
+    margin-left: auto;
+    margin-right: auto;
+    margin-top: 100px;
+    width:250px
+}
+.container{
+    padding:10px;
+}
+#video-container {
+    /* position: absolute; */
+    /* height: 100%; */
+    /* width: 100%; */
+    background-color: white;
+    margin: 0;
+}
+
+#video-section {
+    position: absolute;
+    width: 100%;
+    height: 100%;
+}
+
+#local-video-wrap,
+#remote-video-wrap {
+    text-align: center;
+}
+
+#remote-video-wrap video {
+    /* -moz-transform: scale(-1, 1);
+    -ms-transform: scale(-1, 1);
+    -o-transform: scale(-1, 1);
+    -webkit-transform: scale(-1, 1);
+    transform: scale(-1, 1); */
+}
+
+.video-item {
+    display: inline-block;
+    width: 400px;
+    height: 320px;
+    margin: 0 10px;
+    background: black;
+}
+
+circle {
+    fill: #666;
+    fill-opacity: 0.6;
+}
+
+svg.on circle {
+    fill-opacity: 0;
+}
+
+path.on {
+    display: none;
+}
+
+path.off {
+    display: block;
+}
+
+svg.on path.on {
+    display: block;
+}
+
+svg.on path.off {
+    display: none;
+}
+
+svg {
+    width: 48px;
+    height: 48px;
+    border-radius: 48px;
+    box-shadow: 2px 2px 24px #444;
+    display: block;
+    margin: 0 0 3vh 0;
+}
+
+svg:hover {
+    box-shadow: 4px 4px 48px #666;
+}
+
+#icons.active svg {}
+
+#mute-audio {}
+
+#mute-audio:hover,
+#mute-audio.on {
+    background: #407cf7;
+}
+
+#mute-audio:hover circle {
+    fill: #407cf7;
+}
+
+#mute-video {}
+
+#mute-video:hover,
+#mute-video.on {
+    background: #407cf7;
+}
+
+#mute-video:hover circle {
+    fill: #407cf7;
+}
+
+#switch-video {}
+
+#switch-video:hover {
+    background: #407cf7;
+}
+
+#switch-video:hover circle {
+    fill: #407cf7;
+}
+
+#fullscreen {}
+
+#fullscreen:hover,
+#fullscreen.on {
+    background: #407cf7;
+}
+
+#fullscreen:hover circle {
+    fill: #407cf7;
+}
+
+#hangup {}
+
+#hangup:hover {
+    background: #dd2c00;
+}
+
+#hangup:hover circle {
+    fill: #dd2c00;
+}
+
+video {
+    width: 100%!important;
+    height: auto!important;
+}
+/* @media (min-width: 800px) {
+    video {
+        width: 50%!important;
+        height: auto!important;
+    }
+    svg {
+        width: 60px!important;
+        height: 60px!important;
+    }
+}  */
+label{width:100%}
+.entry_room {
+    display: -webkit-flex;
+    width:300px;margin: auto;
+    -webkit-flex-direction: column;
+    margin-top:50px;
+}
+.video-item {
+    -webkit-order: 0;
+    -ms-flex-order: 0;
+    order: 0;
+    -webkit-flex: 0 1 auto;
+    -ms-flex: 0 1 auto;
+    flex: 0 1 auto;
+    -webkit-align-self: auto;
+    -ms-flex-item-align: auto;
+    align-self: auto;
+}
+
+
+audio{
+    padding:20px;background:#eee;
+    margin:20px auto;
+    height:70px;
+    display: block;
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/css/ySelect.css b/pluss-manage-page/src/main/resources/static/resources/css/ySelect.css
new file mode 100644
index 0000000..5d0e39d
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/css/ySelect.css
@@ -0,0 +1,175 @@
+.fs-wrap {
+    position: relative;
+    display: inline-block;
+    width: 200px;
+    margin: 3px;
+    font-size: 12px;
+    line-height: 1;
+}
+
+.fs-label-wrap {
+    position: relative;
+    border: 1px solid #ccc;
+    cursor: default;
+    color: #555;
+    border-radius: 4px;
+    box-shadow: inset 0 1px 1px rgba(0,0,0,.075);
+}
+
+.fs-label-wrap,
+.fs-dropdown {
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+}
+
+.fs-label-wrap .fs-label {
+    padding: 4px 22px 4px 8px;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+    cursor: pointer;
+}
+
+.fs-arrow {
+    width: 0;
+    height: 0;
+    border-left: 4px solid transparent;
+    border-right: 4px solid transparent;
+    border-top: 6px solid #000;
+    position: absolute;
+    top: 0;
+    right: 4px;
+    bottom: 0;
+    margin: auto;
+    cursor: pointer;
+}
+
+.fs-dropdown {
+    position: absolute;
+    background-color: #fff;
+    border: 1px solid #ccc;
+    /*margin-top: 2px;*/
+    width: 100%;
+    z-index: 1000;
+    border-radius: 4px;
+}
+
+.fs-dropdown .fs-options {
+    max-height: 200px;
+    overflow: auto;
+}
+
+.fs-search input {
+    width: 90%;
+    padding: 2px 4px;
+    border: 0;
+
+}
+
+.fs-selectAll {
+    float: right;
+    cursor: pointer;
+    margin-top: 4px;
+    height: auto;
+}
+
+.fs-selectAll.selected {
+    float: right;
+    cursor: pointer;
+    margin-top: 4px;
+    height: auto;
+    color: green;
+}
+
+.fs-selectAll:hover{
+    background-color: #eee;
+}
+
+.fs-option,
+.fs-search,
+.fs-optgroup-label {
+    padding: 6px 8px;
+    border-bottom: 1px solid #eee;
+    cursor: default;
+}
+
+.fs-option {
+    cursor: pointer;
+}
+
+.fs-option.hl {
+    background-color: #f5f5f5;
+}
+
+.fs-wrap.multiple .fs-option {
+    position: relative;
+    padding-left: 30px;
+}
+
+.fs-wrap.multiple .fs-checkbox {
+    position: absolute;
+    display: block;
+    width: 30px;
+    top: 0;
+    left: 0;
+    bottom: 0;
+}
+
+.fs-wrap.multiple .fs-option .fs-checkbox i {
+    position: absolute;
+    margin: auto;
+    left: 0;
+    right: 0;
+    top: 0;
+    bottom: 0;
+    width: 14px;
+    height: 14px;
+    border: 1px solid #aeaeae;
+    border-radius: 4px;
+    background-color: #fff;
+}
+
+.fs-wrap.multiple .fs-option.selected .fs-checkbox i {
+    background-color: rgb(17, 169, 17);
+    border-color: transparent;
+    background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAGCAYAAAD+Bd/7AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEgAACxIB0t1+/AAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNXG14zYAAABMSURBVAiZfc0xDkAAFIPhd2Kr1WRjcAExuIgzGUTIZ/AkImjSofnbNBAfHvzAHjOKNzhiQ42IDFXCDivaaxAJd0xYshT3QqBxqnxeHvhunpu23xnmAAAAAElFTkSuQmCC');
+    background-repeat: no-repeat;
+    background-position: center;
+}
+
+
+.fs-wrap .fs-option:hover {
+    /*background-color: #f5f5f5;*/
+    background: #D1F3E5;
+    border-radius: 4px;
+    margin-left:0px;
+    margin-right:2px;
+}
+
+.fs-optgroup-label {
+    font-weight: bold;
+}
+
+.hidden {
+    display: none;
+}
+
+.fs-options::-webkit-scrollbar {
+ width: 6px;
+}
+ .fs-options::-webkit-scrollbar-track {
+ -webkit-border-radius: 2em;
+ -moz-border-radius: 2em;
+ border-radius:2em;
+ -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
+  background: rgba(0,0,0,0.1);
+}
+ .fs-options::-webkit-scrollbar-thumb {
+   -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
+  background: rgba(0,0,0,0.2);
+ -webkit-border-radius: 2em;
+ -moz-border-radius: 2em;
+ border-radius:2em;
+}
diff --git a/pluss-manage-page/src/main/resources/static/resources/device/deviceDetails.js b/pluss-manage-page/src/main/resources/static/resources/device/deviceDetails.js
new file mode 100644
index 0000000..f32af09
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/device/deviceDetails.js
@@ -0,0 +1,166 @@
+/**
+ * create by robot 
+ * date Thu Sep 12 16:16:36 CST 2019 
+ */ 
+
+$(document).ready(function(){
+	//form表单样式
+	layui.use(['layer', 'form'], function() {
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+	//li 切换事件
+	$(".nav-tabs>li").click(function() {
+		var index = $(".nav-tabs>li").index(this);
+		$(this).addClass("active").siblings("li").removeClass("active");
+		
+	})
+	//弹出一个提示层
+	$('.fa-save').on('click', function() {
+		saveDevice();
+	});
+
+	//绑定标签栏事件
+	$(document).on('click','.nav-tabs li',function(){
+
+		var action =$(this).data('action');
+		 switch (action) {
+			case "base"://基本资料
+				goBase();
+				break;  
+			case "functions"://多功能
+				goFunctions();
+				break;
+			case "extends"://扩展    
+				goExtends();         
+				break;           
+		 }
+	})
+
+	//加载第一个标签
+	$('.nav-tabs li').eq(0).click();
+	
+});
+
+
+//跳转基本信息 
+function goBase(){
+	var url=ctx+'/device/queryDeviceBaseInfo?id='+$('#deviceId').val();
+	$('.tab-content').load(url);
+	              
+}
+//跳转多功能输入
+function goFunctions(){ 
+	var url=ctx+'/device/queryDeviceFunctionsInfo?id='+$('#deviceId').val();
+	$('.tab-content').load(url);  
+	
+}
+//跳转到扩展   
+function goExtends(){
+	
+	var url=ctx+'/device/queryDeviceExtendsInfo?id='+$('#deviceId').val();
+	$('.tab-content').load(url);          
+}  
+  
+
+ 
+//保存
+function saveDevice(){
+	var id =$("#id").val();
+	var name =$("#name").val();
+	var deviceLogo =$("#deviceLogo").val();
+	var detail=UM.getEditor('detail').getContent().trim();
+	var unitPrice =$("#unitPrice").val();
+	var venderName =$("#venderName").val();
+	var venderModel =$("#venderModel").val();
+	var aisleModel =$("#aisleModel").val();
+	var introDesc =$("#introDesc").val();
+	var seq =$("#seq").val();
+	var status =$("#status").val();
+	if(StringUtil.isBlank(name)){
+		layer.msg('请输入设备名称');
+		return;
+	}
+	if(StringUtil.isBlank(deviceLogo)){
+		layer.msg('请上传图片');
+		return;
+	}
+	if(StringUtil.isBlank(detail)){
+		layer.msg('请输入设备详情');
+		return;
+	}
+	if(StringUtil.isBlank(venderName)){
+		layer.msg('请输入厂家名称');
+		return;
+	}
+	if(StringUtil.isBlank(venderModel)){
+		layer.msg('请输入厂家型号');
+		return;
+	}
+	if(StringUtil.isBlank(aisleModel)){
+		layer.msg('请输入通道机器型号');
+		return;
+	}
+	if(StringUtil.isBlank(introDesc)){
+		layer.msg('请输入简介');
+		return;
+	}
+	if(StringUtil.isNotJustInteger(seq)){
+		if(StringUtil.isBlank(seq)){
+			layer.msg('请输入排序');
+			return;
+		}
+		layer.msg('请输入正确的排序格式');
+		return;
+	}
+	if(StringUtil.isBlank(status)){
+		layer.msg('请选择状态');
+		return;
+	}
+	$(".fa-save").attr("disabled","disabled");
+	$('.fa-save').html('正在保存...')
+	$.ajax({
+		url:ctx+"/device/saveDevice",
+		type:"POST",
+		dataType:'json',
+		data:{
+			"id":id,
+			"name":name,
+			"deviceLogo":deviceLogo,
+			"detail":detail,
+			"unitPrice":unitPrice,
+			"venderName":venderName,
+			"venderModel":venderModel,
+			"aisleModel":aisleModel,
+			"introDesc":introDesc,
+			"seq":seq,
+			"status":status,
+		},
+		complete:function(){
+			$(".fa-save").removeAttr("disabled");
+			$('.fa-save').html('保存')
+		},        
+		success:function(service){ 
+		
+			layer.confirm('保存成功,是否前往列表？', {
+				  btn: ['确认','取消'] //按钮
+				}, function(){
+					$('#goback span').trigger('click'); 
+				}, function(){         
+					layer.closeAll();
+			});  
+			
+		}
+	});  
+}
+
+function uploadImage2(){
+	$.seocooUpload(function(data){
+		var url=data.url;
+		$('#demo2').attr("src",url);
+		$('#deviceLogo').val(url);
+	})
+}
+ 
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/device/deviceList.js b/pluss-manage-page/src/main/resources/static/resources/device/deviceList.js
new file mode 100644
index 0000000..31f514e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/device/deviceList.js
@@ -0,0 +1,303 @@
+/**
+ * create by robot 
+ * date Thu Sep 12 16:16:36 CST 2019 
+ */ 
+
+var pageIndex=1;
+$(document).ready(function(){
+	//调用查询
+	pageIndex=StringUtil.getQueryString('pageIndex');
+	if(pageIndex==undefined||pageIndex==null){
+		pageIndex=1;
+	}
+	queryDevice(pageIndex);
+	//绑定hover操作
+	$(document).on('mouseenter','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").show();
+		var width=15;
+		$(this).children('div').find('li').each(function(){
+			//获取li宽度
+			width+=$(this).width();
+		});
+		$(this).children('div').width(width);
+	})
+	$(document).on('mouseleave','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").hide();
+	});
+
+	//日历控件
+	layui.use(['layer', 'laydate'], function() {
+		var layer = layui.layer;
+		laydate = layui.laydate;
+		laydate.render({
+		elem: '#date1' //指定元素
+		});
+		laydate.render({
+			elem: '#date2' //指定元素
+		});
+	});
+
+
+	//行选中事件
+	$("#allCheck").find("span").click(function() {
+		$(this).toggleClass('checked');
+		if($(this).hasClass('checked')){
+			//所有列选中
+		  $(".checker").find("span").each(function () {
+		         $(this).addClass("checked");
+		    })
+		}else{
+			//所有列取消选中
+			$(".checker").find("span").each(function () {
+				 $(this).removeClass("checked");
+		    })
+		}
+	});
+
+	//单个选中
+	$(document).on('click','.checkeBox span',function() {
+		$(this).toggleClass('checked');
+		//设置头部事件
+		var length=$('.checkeBox span').length;
+		var count=0;
+		$(".checkeBox").find("span").each(function () {
+	        if($(this).hasClass("checked")){
+	        	count++;
+	        }
+	   })
+		//全选
+	   if(count==length){
+		   $("#allCheck").find("span").addClass('checked');
+	   }else{
+		   $("#allCheck").find("span").removeClass('checked');
+	   }
+	})
+	//左右div高度相等
+	var left_content_height = $(".right-content").height();
+	$(".left-content").height(left_content_height+35);
+	var sub_left_height=$(".res-menu").height(left_content_height-60);
+});
+
+//查询
+function queryDevice(index){
+	if(typeof(index)=='undefined'){
+		index=1;
+	}
+	var url=ctx+'/device/queryDeviceByPage';
+	$.ajax({  
+        url:url,  
+        type:"post", 
+        dataType:"json",  
+        data:{  
+        	"currPage":index,
+        	"name":$('#name').val(),
+        	"venderName":$('#venderName').val(),
+        	"venderModel":$('#venderModel').val(),
+        	"status":$('#status').val(),
+        	"startTime":$('#date1').val(),
+        	"endTime":$('#date2').val(),
+        },  
+       success:function(result){  
+        	//渲染数据
+        	$('#data_content').empty();
+        	var header='';
+        	var presentPage=result.currPage;
+        	$.each(result.deviceList,function(i){
+        		var orderNumber=(presentPage-1)*12+i+1;
+        		var device=result.deviceList[i];
+        		var data='';
+        		data+='<tr class="odd">';
+        		data+='<td class="textc">';
+				data+='		 <div class="checker checkeBox">';        		data+='		 <span class=""  data-id="'+device.id+'"><input type="checkbox"  value=""></span>';
+        		data+='		</div>';
+        		data+='</td>';
+        		data+='<td class="textc">'+orderNumber+'</td>';
+        		data+='<td class="textc">'+device.name+'</td>';
+        		data+='<td class="textc"><a href="javascript:void(0);" onclick="enlargePicture(\''+device.deviceLogo+'\')"><img src="'+device.deviceLogo+'" onerror="javascript:this.src=\'https://www.shouyinbei.net/resources/images/error.jpg\'"   height="30px" width="30px"></img></a></td>';
+        		data+='<td class="textc">'+device.venderName+'</td>';
+        		data+='<td class="textc">'+device.venderModel+'</td>';
+        		var status='';
+        			if(device.status==0){
+        				status='不显示';
+        			}
+        			if(device.status==1){
+        				status='显示';
+        			}
+        		data+='<td class="textc">'+status+'</td>';
+        		/*data+='<td class="textc">'+device.inventory+'</td>';*/
+        		data+='<td class="textc">'+device.unitPrice+'</td>';
+        		data+='<td class="textc">'+device.seq+'</td>';
+        		var createDt='';
+        		if(StringUtil.isNotBlank(device.createDt)){
+        			createDt=new Date(device.createDt).toYYYYMMDDHHMMSS();
+        		}
+        		data+='<td class="textc">'+createDt+'</td>';
+        		data+='<td class="textc">';
+        		data+='<div class="positionr listOperaters">';
+        		data+='		<a href="javascript:void(0);"  class="icon-large dlblock w16 h16"><img src="'+resourcePath+'/images/angle-down.png"/></a>';
+        		data+='		<div class="ops_box ops_itemDiv positiona clearfix whitebg">';
+        		data+='			<ul>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showDeviceDetails('+device.id+')" class="btn btn-primary fa fa-edit ops_more f12">编辑</a></li>';
+//        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="initDeleteDevice('+device.id+')" class="btn btn-primary fa fa-remove ops_more f12">删除</a></li>';
+//        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showDeviceDetails('+device.id+')" class="btn btn-primary fa fa-detail ops_more f12">明细</a></li>';
+        	    data+='			</ul>';
+              data+='		</div>';
+        	    data+='</div>';
+        	    data+='</td>';
+        	    data+='</tr>';
+        	    $('#data_content').append(data);
+        	});
+        	//分页
+        	$('#pageCount').html(result.pageCount);
+      	$('#currPage').html(result.currPage);
+          $('#totalCount').html(result.count);
+           	//设置分页
+           	pageIndex=result.currPage;
+			$('#pagination').pagination({
+				pageCount: result.pageCount,
+				jump: true,
+				coping: true,
+				jump: true,
+				homePage: '首页',
+				endPage: '末页',
+				prevContent: '上页',
+				nextContent: '下页',
+				current:result.currPage,
+				callback:function(api){
+					pageIndex=api.getCurrent();
+					queryDevice(api.getCurrent());
+				}
+			});
+        } 
+    });  
+	//表头列不选中
+	$("#allCheck").find("span").removeClass('checked');
+}
+
+//初始化新增
+function initAddDevice(){
+	window.location=ctx+'/device/queryDeviceDetails?pageIndex='+pageIndex;
+}
+
+//初始化修改
+function showDeviceDetails(id){
+	window.location=ctx+'/device/queryDeviceDetails?id='+id+'&pageIndex='+pageIndex;
+}
+
+//初始化删除
+function initDeleteDevice(id){
+	
+		layer.open({
+		type: 1,
+		closeBtn: 1,		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r'	, //按钮居中
+		shade: 0.3 ,//不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteDevice(id,true);
+		}
+	});
+}
+
+//删除
+function deleteDevice(id,showMsg){
+	$.ajax({
+		url:ctx+'/device/deleteDevice',
+		data:[{
+			name:'id',
+			value:id
+		}],
+		type:'POST',
+		dataType:'json',
+		success:function(){
+			queryDevice(pageIndex);
+			if(showMsg){
+				layer.msg('删除成功!');	
+			}
+		}
+	});
+}
+//头部编辑
+function initEditDevice(){
+	var count=0;
+	var id=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+        	 id=$(this).data('id');
+         }
+    })
+    if(count>1){
+    	layer.msg('只能选中一行记录进行操作!');
+    	return ;
+    }
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	 if(id>0){
+	  showDeviceDetails(id);
+	 }
+}
+//头部删除
+function initBatchDeleteDevice(){
+	var count=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+         }
+    })
+	
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	
+
+	layer.open({
+		type: 1,
+		closeBtn: 1,
+		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r', //按钮居中
+		shade: 0.3, //不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteBatchDevice();
+		}
+	});
+	
+}
+//批量删除
+function deleteBatchDevice(){
+	
+	$(".checkeBox").find("span").each(function () {
+        if($(this).hasClass("checked")){
+        	var id=$(this).data('id');
+        	deleteDevice(id,false);
+        	layer.msg('删除成功!');	
+        }
+   })
+}
+
+//点击放大图片
+function enlargePicture(billPicUrl){
+	//alert("即将弹出图片");
+	var data='';
+	data+='<img src="'+billPicUrl+'"  class="img" onerror="javascript:this.src=\'https://www.shouyinbei.net/resources/images/error.jpg\'" >';
+	$('#picture').append(data);
+	$('#pictureWindow').show();
+}
+
+function hidePictureWindow(){
+	$('#picture').empty();
+	$('#pictureWindow').hide();
+}
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/fonts/FontAwesome.otf b/pluss-manage-page/src/main/resources/static/resources/fonts/FontAwesome.otf
new file mode 100644
index 0000000..401ec0f
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/fonts/FontAwesome.otf differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/fonts/fontawesome-webfont.eot b/pluss-manage-page/src/main/resources/static/resources/fonts/fontawesome-webfont.eot
new file mode 100644
index 0000000..e9f60ca
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/fonts/fontawesome-webfont.eot differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/fonts/fontawesome-webfont.svg b/pluss-manage-page/src/main/resources/static/resources/fonts/fontawesome-webfont.svg
new file mode 100644
index 0000000..855c845
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/fonts/fontawesome-webfont.svg
@@ -0,0 +1,2671 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg>
+<metadata>
+Created by FontForge 20120731 at Mon Oct 24 17:37:40 2016
+ By ,,,
+Copyright Dave Gandy 2016. All rights reserved.
+</metadata>
+<defs>
+<font id="FontAwesome" horiz-adv-x="1536" >
+  <font-face 
+    font-family="FontAwesome"
+    font-weight="400"
+    font-stretch="normal"
+    units-per-em="1792"
+    panose-1="0 0 0 0 0 0 0 0 0 0"
+    ascent="1536"
+    descent="-256"
+    bbox="-1.02083 -256.962 2304.6 1537.02"
+    underline-thickness="0"
+    underline-position="0"
+    unicode-range="U+0020-F500"
+  />
+<missing-glyph horiz-adv-x="896" 
+d="M224 112h448v1312h-448v-1312zM112 0v1536h672v-1536h-672z" />
+    <glyph glyph-name=".notdef" horiz-adv-x="896" 
+d="M224 112h448v1312h-448v-1312zM112 0v1536h672v-1536h-672z" />
+    <glyph glyph-name=".null" horiz-adv-x="0" 
+ />
+    <glyph glyph-name="nonmarkingreturn" horiz-adv-x="597" 
+ />
+    <glyph glyph-name="space" unicode=" " horiz-adv-x="448" 
+ />
+    <glyph glyph-name="dieresis" unicode="&#xa8;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="copyright" unicode="&#xa9;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="registered" unicode="&#xae;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="acute" unicode="&#xb4;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="AE" unicode="&#xc6;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="Oslash" unicode="&#xd8;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="trademark" unicode="&#x2122;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="infinity" unicode="&#x221e;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="notequal" unicode="&#x2260;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="glass" unicode="&#xf000;" horiz-adv-x="1792" 
+d="M1699 1350q0 -35 -43 -78l-632 -632v-768h320q26 0 45 -19t19 -45t-19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45t45 19h320v768l-632 632q-43 43 -43 78q0 23 18 36.5t38 17.5t43 4h1408q23 0 43 -4t38 -17.5t18 -36.5z" />
+    <glyph glyph-name="music" unicode="&#xf001;" 
+d="M1536 1312v-1120q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v537l-768 -237v-709q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89
+t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v967q0 31 19 56.5t49 35.5l832 256q12 4 28 4q40 0 68 -28t28 -68z" />
+    <glyph glyph-name="search" unicode="&#xf002;" horiz-adv-x="1664" 
+d="M1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -52 -38 -90t-90 -38q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5
+t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z" />
+    <glyph glyph-name="envelope" unicode="&#xf003;" horiz-adv-x="1792" 
+d="M1664 32v768q-32 -36 -69 -66q-268 -206 -426 -338q-51 -43 -83 -67t-86.5 -48.5t-102.5 -24.5h-1h-1q-48 0 -102.5 24.5t-86.5 48.5t-83 67q-158 132 -426 338q-37 30 -69 66v-768q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1664 1083v11v13.5t-0.5 13
+t-3 12.5t-5.5 9t-9 7.5t-14 2.5h-1472q-13 0 -22.5 -9.5t-9.5 -22.5q0 -168 147 -284q193 -152 401 -317q6 -5 35 -29.5t46 -37.5t44.5 -31.5t50.5 -27.5t43 -9h1h1q20 0 43 9t50.5 27.5t44.5 31.5t46 37.5t35 29.5q208 165 401 317q54 43 100.5 115.5t46.5 131.5z
+M1792 1120v-1088q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="heart" unicode="&#xf004;" horiz-adv-x="1792" 
+d="M896 -128q-26 0 -44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5q224 0 351 -124t127 -344q0 -221 -229 -450l-623 -600
+q-18 -18 -44 -18z" />
+    <glyph glyph-name="star" unicode="&#xf005;" horiz-adv-x="1664" 
+d="M1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -21 -10.5 -35.5t-30.5 -14.5q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455
+l502 -73q56 -9 56 -46z" />
+    <glyph glyph-name="star_empty" unicode="&#xf006;" horiz-adv-x="1664" 
+d="M1137 532l306 297l-422 62l-189 382l-189 -382l-422 -62l306 -297l-73 -421l378 199l377 -199zM1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -50 -41 -50q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500
+l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455l502 -73q56 -9 56 -46z" />
+    <glyph glyph-name="user" unicode="&#xf007;" horiz-adv-x="1280" 
+d="M1280 137q0 -109 -62.5 -187t-150.5 -78h-854q-88 0 -150.5 78t-62.5 187q0 85 8.5 160.5t31.5 152t58.5 131t94 89t134.5 34.5q131 -128 313 -128t313 128q76 0 134.5 -34.5t94 -89t58.5 -131t31.5 -152t8.5 -160.5zM1024 1024q0 -159 -112.5 -271.5t-271.5 -112.5
+t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5z" />
+    <glyph glyph-name="film" unicode="&#xf008;" horiz-adv-x="1920" 
+d="M384 -64v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 320v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 704v128q0 26 -19 45t-45 19h-128
+q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1408 -64v512q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-512q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM384 1088v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45
+t45 -19h128q26 0 45 19t19 45zM1792 -64v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1408 704v512q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-512q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1792 320v128
+q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1792 704v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1792 1088v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19
+t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1920 1248v-1344q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1344q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="th_large" unicode="&#xf009;" horiz-adv-x="1664" 
+d="M768 512v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM768 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 512v-384q0 -52 -38 -90t-90 -38
+h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="th" unicode="&#xf00a;" horiz-adv-x="1792" 
+d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 288v-192q0 -40 -28 -68t-68 -28h-320
+q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28
+h320q40 0 68 -28t28 -68zM1792 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 800v-192
+q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68z" />
+    <glyph glyph-name="th_list" unicode="&#xf00b;" horiz-adv-x="1792" 
+d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 288v-192q0 -40 -28 -68t-68 -28h-960
+q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h960q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 800v-192q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v192q0 40 28 68t68 28
+h960q40 0 68 -28t28 -68zM1792 1312v-192q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h960q40 0 68 -28t28 -68z" />
+    <glyph glyph-name="ok" unicode="&#xf00c;" horiz-adv-x="1792" 
+d="M1671 970q0 -40 -28 -68l-724 -724l-136 -136q-28 -28 -68 -28t-68 28l-136 136l-362 362q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -295l656 657q28 28 68 28t68 -28l136 -136q28 -28 28 -68z" />
+    <glyph glyph-name="remove" unicode="&#xf00d;" horiz-adv-x="1408" 
+d="M1298 214q0 -40 -28 -68l-136 -136q-28 -28 -68 -28t-68 28l-294 294l-294 -294q-28 -28 -68 -28t-68 28l-136 136q-28 28 -28 68t28 68l294 294l-294 294q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -294l294 294q28 28 68 28t68 -28l136 -136q28 -28 28 -68
+t-28 -68l-294 -294l294 -294q28 -28 28 -68z" />
+    <glyph glyph-name="zoom_in" unicode="&#xf00e;" horiz-adv-x="1664" 
+d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-224q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v224h-224q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h224v224q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5v-224h224
+q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5
+t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z" />
+    <glyph glyph-name="zoom_out" unicode="&#xf010;" horiz-adv-x="1664" 
+d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-576q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h576q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5z
+M1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z
+" />
+    <glyph glyph-name="off" unicode="&#xf011;" 
+d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61t-298 61t-245 164t-164 245t-61 298q0 182 80.5 343t226.5 270q43 32 95.5 25t83.5 -50q32 -42 24.5 -94.5t-49.5 -84.5q-98 -74 -151.5 -181t-53.5 -228q0 -104 40.5 -198.5t109.5 -163.5t163.5 -109.5
+t198.5 -40.5t198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5q0 121 -53.5 228t-151.5 181q-42 32 -49.5 84.5t24.5 94.5q31 43 84 50t95 -25q146 -109 226.5 -270t80.5 -343zM896 1408v-640q0 -52 -38 -90t-90 -38t-90 38t-38 90v640q0 52 38 90t90 38t90 -38t38 -90z" />
+    <glyph glyph-name="signal" unicode="&#xf012;" horiz-adv-x="1792" 
+d="M256 96v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM640 224v-320q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1024 480v-576q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23
+v576q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1408 864v-960q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 1376v-1472q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1472q0 14 9 23t23 9h192q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="cog" unicode="&#xf013;" 
+d="M1024 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1536 749v-222q0 -12 -8 -23t-20 -13l-185 -28q-19 -54 -39 -91q35 -50 107 -138q10 -12 10 -25t-9 -23q-27 -37 -99 -108t-94 -71q-12 0 -26 9l-138 108q-44 -23 -91 -38
+q-16 -136 -29 -186q-7 -28 -36 -28h-222q-14 0 -24.5 8.5t-11.5 21.5l-28 184q-49 16 -90 37l-141 -107q-10 -9 -25 -9q-14 0 -25 11q-126 114 -165 168q-7 10 -7 23q0 12 8 23q15 21 51 66.5t54 70.5q-27 50 -41 99l-183 27q-13 2 -21 12.5t-8 23.5v222q0 12 8 23t19 13
+l186 28q14 46 39 92q-40 57 -107 138q-10 12 -10 24q0 10 9 23q26 36 98.5 107.5t94.5 71.5q13 0 26 -10l138 -107q44 23 91 38q16 136 29 186q7 28 36 28h222q14 0 24.5 -8.5t11.5 -21.5l28 -184q49 -16 90 -37l142 107q9 9 24 9q13 0 25 -10q129 -119 165 -170q7 -8 7 -22
+q0 -12 -8 -23q-15 -21 -51 -66.5t-54 -70.5q26 -50 41 -98l183 -28q13 -2 21 -12.5t8 -23.5z" />
+    <glyph glyph-name="trash" unicode="&#xf014;" horiz-adv-x="1408" 
+d="M512 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM768 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1024 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576
+q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1152 76v948h-896v-948q0 -22 7 -40.5t14.5 -27t10.5 -8.5h832q3 0 10.5 8.5t14.5 27t7 40.5zM480 1152h448l-48 117q-7 9 -17 11h-317q-10 -2 -17 -11zM1408 1120v-64q0 -14 -9 -23t-23 -9h-96v-948q0 -83 -47 -143.5t-113 -60.5h-832
+q-66 0 -113 58.5t-47 141.5v952h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h309l70 167q15 37 54 63t79 26h320q40 0 79 -26t54 -63l70 -167h309q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="home" unicode="&#xf015;" horiz-adv-x="1664" 
+d="M1408 544v-480q0 -26 -19 -45t-45 -19h-384v384h-256v-384h-384q-26 0 -45 19t-19 45v480q0 1 0.5 3t0.5 3l575 474l575 -474q1 -2 1 -6zM1631 613l-62 -74q-8 -9 -21 -11h-3q-13 0 -21 7l-692 577l-692 -577q-12 -8 -24 -7q-13 2 -21 11l-62 74q-8 10 -7 23.5t11 21.5
+l719 599q32 26 76 26t76 -26l244 -204v195q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-408l219 -182q10 -8 11 -21.5t-7 -23.5z" />
+    <glyph glyph-name="file_alt" unicode="&#xf016;" 
+d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+" />
+    <glyph glyph-name="time" unicode="&#xf017;" 
+d="M896 992v-448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640
+q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="road" unicode="&#xf018;" horiz-adv-x="1920" 
+d="M1111 540v4l-24 320q-1 13 -11 22.5t-23 9.5h-186q-13 0 -23 -9.5t-11 -22.5l-24 -320v-4q-1 -12 8 -20t21 -8h244q12 0 21 8t8 20zM1870 73q0 -73 -46 -73h-704q13 0 22 9.5t8 22.5l-20 256q-1 13 -11 22.5t-23 9.5h-272q-13 0 -23 -9.5t-11 -22.5l-20 -256
+q-1 -13 8 -22.5t22 -9.5h-704q-46 0 -46 73q0 54 26 116l417 1044q8 19 26 33t38 14h339q-13 0 -23 -9.5t-11 -22.5l-15 -192q-1 -14 8 -23t22 -9h166q13 0 22 9t8 23l-15 192q-1 13 -11 22.5t-23 9.5h339q20 0 38 -14t26 -33l417 -1044q26 -62 26 -116z" />
+    <glyph glyph-name="download_alt" unicode="&#xf019;" horiz-adv-x="1664" 
+d="M1280 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 416v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h465l135 -136
+q58 -56 136 -56t136 56l136 136h464q40 0 68 -28t28 -68zM1339 985q17 -41 -14 -70l-448 -448q-18 -19 -45 -19t-45 19l-448 448q-31 29 -14 70q17 39 59 39h256v448q0 26 19 45t45 19h256q26 0 45 -19t19 -45v-448h256q42 0 59 -39z" />
+    <glyph glyph-name="download" unicode="&#xf01a;" 
+d="M1120 608q0 -12 -10 -24l-319 -319q-11 -9 -23 -9t-23 9l-320 320q-15 16 -7 35q8 20 30 20h192v352q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-352h192q14 0 23 -9t9 -23zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273
+t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="upload" unicode="&#xf01b;" 
+d="M1118 660q-8 -20 -30 -20h-192v-352q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v352h-192q-14 0 -23 9t-9 23q0 12 10 24l319 319q11 9 23 9t23 -9l320 -320q15 -16 7 -35zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198
+t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="inbox" unicode="&#xf01c;" 
+d="M1023 576h316q-1 3 -2.5 8.5t-2.5 7.5l-212 496h-708l-212 -496q-1 -3 -2.5 -8.5t-2.5 -7.5h316l95 -192h320zM1536 546v-482q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v482q0 62 25 123l238 552q10 25 36.5 42t52.5 17h832q26 0 52.5 -17t36.5 -42l238 -552
+q25 -61 25 -123z" />
+    <glyph glyph-name="play_circle" unicode="&#xf01d;" 
+d="M1184 640q0 -37 -32 -55l-544 -320q-15 -9 -32 -9q-16 0 -32 8q-32 19 -32 56v640q0 37 32 56q33 18 64 -1l544 -320q32 -18 32 -55zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640
+q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="repeat" unicode="&#xf01e;" 
+d="M1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l138 138q-148 137 -349 137q-104 0 -198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5q119 0 225 52t179 147q7 10 23 12q15 0 25 -9
+l137 -138q9 -8 9.5 -20.5t-7.5 -22.5q-109 -132 -264 -204.5t-327 -72.5q-156 0 -298 61t-245 164t-164 245t-61 298t61 298t164 245t245 164t298 61q147 0 284.5 -55.5t244.5 -156.5l130 129q29 31 70 14q39 -17 39 -59z" />
+    <glyph glyph-name="refresh" unicode="&#xf021;" 
+d="M1511 480q0 -5 -1 -7q-64 -268 -268 -434.5t-478 -166.5q-146 0 -282.5 55t-243.5 157l-129 -129q-19 -19 -45 -19t-45 19t-19 45v448q0 26 19 45t45 19h448q26 0 45 -19t19 -45t-19 -45l-137 -137q71 -66 161 -102t187 -36q134 0 250 65t186 179q11 17 53 117
+q8 23 30 23h192q13 0 22.5 -9.5t9.5 -22.5zM1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-26 0 -45 19t-19 45t19 45l138 138q-148 137 -349 137q-134 0 -250 -65t-186 -179q-11 -17 -53 -117q-8 -23 -30 -23h-199q-13 0 -22.5 9.5t-9.5 22.5v7q65 268 270 434.5t480 166.5
+q146 0 284 -55.5t245 -156.5l130 129q19 19 45 19t45 -19t19 -45z" />
+    <glyph glyph-name="list_alt" unicode="&#xf022;" horiz-adv-x="1792" 
+d="M384 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M384 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1536 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5t9.5 -22.5z
+M1536 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5t9.5 -22.5zM1536 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5
+t9.5 -22.5zM1664 160v832q0 13 -9.5 22.5t-22.5 9.5h-1472q-13 0 -22.5 -9.5t-9.5 -22.5v-832q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1792 1248v-1088q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1472q66 0 113 -47
+t47 -113z" />
+    <glyph glyph-name="lock" unicode="&#xf023;" horiz-adv-x="1152" 
+d="M320 768h512v192q0 106 -75 181t-181 75t-181 -75t-75 -181v-192zM1152 672v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v192q0 184 132 316t316 132t316 -132t132 -316v-192h32q40 0 68 -28t28 -68z" />
+    <glyph glyph-name="flag" unicode="&#xf024;" horiz-adv-x="1792" 
+d="M320 1280q0 -72 -64 -110v-1266q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v1266q-64 38 -64 110q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -25 -12.5 -38.5t-39.5 -27.5q-215 -116 -369 -116q-61 0 -123.5 22t-108.5 48
+t-115.5 48t-142.5 22q-192 0 -464 -146q-17 -9 -33 -9q-26 0 -45 19t-19 45v742q0 32 31 55q21 14 79 43q236 120 421 120q107 0 200 -29t219 -88q38 -19 88 -19q54 0 117.5 21t110 47t88 47t54.5 21q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="headphones" unicode="&#xf025;" horiz-adv-x="1664" 
+d="M1664 650q0 -166 -60 -314l-20 -49l-185 -33q-22 -83 -90.5 -136.5t-156.5 -53.5v-32q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-32q71 0 130 -35.5t93 -95.5l68 12q29 95 29 193q0 148 -88 279t-236.5 209t-315.5 78
+t-315.5 -78t-236.5 -209t-88 -279q0 -98 29 -193l68 -12q34 60 93 95.5t130 35.5v32q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v32q-88 0 -156.5 53.5t-90.5 136.5l-185 33l-20 49q-60 148 -60 314q0 151 67 291t179 242.5
+t266 163.5t320 61t320 -61t266 -163.5t179 -242.5t67 -291z" />
+    <glyph glyph-name="volume_off" unicode="&#xf026;" horiz-adv-x="768" 
+d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45z" />
+    <glyph glyph-name="volume_down" unicode="&#xf027;" horiz-adv-x="1152" 
+d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 36
+t12 56.5t-12 56.5t-29 36t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142z" />
+    <glyph glyph-name="volume_up" unicode="&#xf028;" horiz-adv-x="1664" 
+d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 36
+t12 56.5t-12 56.5t-29 36t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142zM1408 640q0 -153 -85 -282.5t-225 -188.5q-13 -5 -25 -5q-27 0 -46 19t-19 45q0 39 39 59q56 29 76 44q74 54 115.5 135.5t41.5 173.5t-41.5 173.5
+t-115.5 135.5q-20 15 -76 44q-39 20 -39 59q0 26 19 45t45 19q13 0 26 -5q140 -59 225 -188.5t85 -282.5zM1664 640q0 -230 -127 -422.5t-338 -283.5q-13 -5 -26 -5q-26 0 -45 19t-19 45q0 36 39 59q7 4 22.5 10.5t22.5 10.5q46 25 82 51q123 91 192 227t69 289t-69 289
+t-192 227q-36 26 -82 51q-7 4 -22.5 10.5t-22.5 10.5q-39 23 -39 59q0 26 19 45t45 19q13 0 26 -5q211 -91 338 -283.5t127 -422.5z" />
+    <glyph glyph-name="qrcode" unicode="&#xf029;" horiz-adv-x="1408" 
+d="M384 384v-128h-128v128h128zM384 1152v-128h-128v128h128zM1152 1152v-128h-128v128h128zM128 129h384v383h-384v-383zM128 896h384v384h-384v-384zM896 896h384v384h-384v-384zM640 640v-640h-640v640h640zM1152 128v-128h-128v128h128zM1408 128v-128h-128v128h128z
+M1408 640v-384h-384v128h-128v-384h-128v640h384v-128h128v128h128zM640 1408v-640h-640v640h640zM1408 1408v-640h-640v640h640z" />
+    <glyph glyph-name="barcode" unicode="&#xf02a;" horiz-adv-x="1792" 
+d="M63 0h-63v1408h63v-1408zM126 1h-32v1407h32v-1407zM220 1h-31v1407h31v-1407zM377 1h-31v1407h31v-1407zM534 1h-62v1407h62v-1407zM660 1h-31v1407h31v-1407zM723 1h-31v1407h31v-1407zM786 1h-31v1407h31v-1407zM943 1h-63v1407h63v-1407zM1100 1h-63v1407h63v-1407z
+M1226 1h-63v1407h63v-1407zM1352 1h-63v1407h63v-1407zM1446 1h-63v1407h63v-1407zM1635 1h-94v1407h94v-1407zM1698 1h-32v1407h32v-1407zM1792 0h-63v1408h63v-1408z" />
+    <glyph glyph-name="tag" unicode="&#xf02b;" 
+d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5
+l715 -714q37 -39 37 -91z" />
+    <glyph glyph-name="tags" unicode="&#xf02c;" horiz-adv-x="1920" 
+d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5
+l715 -714q37 -39 37 -91zM1899 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-36 0 -59 14t-53 45l470 470q37 37 37 90q0 52 -37 91l-715 714q-38 38 -102 64.5t-117 26.5h224q53 0 117 -26.5t102 -64.5l715 -714q37 -39 37 -91z" />
+    <glyph glyph-name="book" unicode="&#xf02d;" horiz-adv-x="1664" 
+d="M1639 1058q40 -57 18 -129l-275 -906q-19 -64 -76.5 -107.5t-122.5 -43.5h-923q-77 0 -148.5 53.5t-99.5 131.5q-24 67 -2 127q0 4 3 27t4 37q1 8 -3 21.5t-3 19.5q2 11 8 21t16.5 23.5t16.5 23.5q23 38 45 91.5t30 91.5q3 10 0.5 30t-0.5 28q3 11 17 28t17 23
+q21 36 42 92t25 90q1 9 -2.5 32t0.5 28q4 13 22 30.5t22 22.5q19 26 42.5 84.5t27.5 96.5q1 8 -3 25.5t-2 26.5q2 8 9 18t18 23t17 21q8 12 16.5 30.5t15 35t16 36t19.5 32t26.5 23.5t36 11.5t47.5 -5.5l-1 -3q38 9 51 9h761q74 0 114 -56t18 -130l-274 -906
+q-36 -119 -71.5 -153.5t-128.5 -34.5h-869q-27 0 -38 -15q-11 -16 -1 -43q24 -70 144 -70h923q29 0 56 15.5t35 41.5l300 987q7 22 5 57q38 -15 59 -43zM575 1056q-4 -13 2 -22.5t20 -9.5h608q13 0 25.5 9.5t16.5 22.5l21 64q4 13 -2 22.5t-20 9.5h-608q-13 0 -25.5 -9.5
+t-16.5 -22.5zM492 800q-4 -13 2 -22.5t20 -9.5h608q13 0 25.5 9.5t16.5 22.5l21 64q4 13 -2 22.5t-20 9.5h-608q-13 0 -25.5 -9.5t-16.5 -22.5z" />
+    <glyph glyph-name="bookmark" unicode="&#xf02e;" horiz-adv-x="1280" 
+d="M1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289q0 34 19.5 62t52.5 41q21 9 44 9h1048z" />
+    <glyph glyph-name="print" unicode="&#xf02f;" horiz-adv-x="1664" 
+d="M384 0h896v256h-896v-256zM384 640h896v384h-160q-40 0 -68 28t-28 68v160h-640v-640zM1536 576q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 576v-416q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-160q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68
+v160h-224q-13 0 -22.5 9.5t-9.5 22.5v416q0 79 56.5 135.5t135.5 56.5h64v544q0 40 28 68t68 28h672q40 0 88 -20t76 -48l152 -152q28 -28 48 -76t20 -88v-256h64q79 0 135.5 -56.5t56.5 -135.5z" />
+    <glyph glyph-name="camera" unicode="&#xf030;" horiz-adv-x="1920" 
+d="M960 864q119 0 203.5 -84.5t84.5 -203.5t-84.5 -203.5t-203.5 -84.5t-203.5 84.5t-84.5 203.5t84.5 203.5t203.5 84.5zM1664 1280q106 0 181 -75t75 -181v-896q0 -106 -75 -181t-181 -75h-1408q-106 0 -181 75t-75 181v896q0 106 75 181t181 75h224l51 136
+q19 49 69.5 84.5t103.5 35.5h512q53 0 103.5 -35.5t69.5 -84.5l51 -136h224zM960 128q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+    <glyph glyph-name="font" unicode="&#xf031;" horiz-adv-x="1664" 
+d="M725 977l-170 -450q33 0 136.5 -2t160.5 -2q19 0 57 2q-87 253 -184 452zM0 -128l2 79q23 7 56 12.5t57 10.5t49.5 14.5t44.5 29t31 50.5l237 616l280 724h75h53q8 -14 11 -21l205 -480q33 -78 106 -257.5t114 -274.5q15 -34 58 -144.5t72 -168.5q20 -45 35 -57
+q19 -15 88 -29.5t84 -20.5q6 -38 6 -57q0 -5 -0.5 -13.5t-0.5 -12.5q-63 0 -190 8t-191 8q-76 0 -215 -7t-178 -8q0 43 4 78l131 28q1 0 12.5 2.5t15.5 3.5t14.5 4.5t15 6.5t11 8t9 11t2.5 14q0 16 -31 96.5t-72 177.5t-42 100l-450 2q-26 -58 -76.5 -195.5t-50.5 -162.5
+q0 -22 14 -37.5t43.5 -24.5t48.5 -13.5t57 -8.5t41 -4q1 -19 1 -58q0 -9 -2 -27q-58 0 -174.5 10t-174.5 10q-8 0 -26.5 -4t-21.5 -4q-80 -14 -188 -14z" />
+    <glyph glyph-name="bold" unicode="&#xf032;" horiz-adv-x="1408" 
+d="M555 15q74 -32 140 -32q376 0 376 335q0 114 -41 180q-27 44 -61.5 74t-67.5 46.5t-80.5 25t-84 10.5t-94.5 2q-73 0 -101 -10q0 -53 -0.5 -159t-0.5 -158q0 -8 -1 -67.5t-0.5 -96.5t4.5 -83.5t12 -66.5zM541 761q42 -7 109 -7q82 0 143 13t110 44.5t74.5 89.5t25.5 142
+q0 70 -29 122.5t-79 82t-108 43.5t-124 14q-50 0 -130 -13q0 -50 4 -151t4 -152q0 -27 -0.5 -80t-0.5 -79q0 -46 1 -69zM0 -128l2 94q15 4 85 16t106 27q7 12 12.5 27t8.5 33.5t5.5 32.5t3 37.5t0.5 34v35.5v30q0 982 -22 1025q-4 8 -22 14.5t-44.5 11t-49.5 7t-48.5 4.5
+t-30.5 3l-4 83q98 2 340 11.5t373 9.5q23 0 68 -0.5t68 -0.5q70 0 136.5 -13t128.5 -42t108 -71t74 -104.5t28 -137.5q0 -52 -16.5 -95.5t-39 -72t-64.5 -57.5t-73 -45t-84 -40q154 -35 256.5 -134t102.5 -248q0 -100 -35 -179.5t-93.5 -130.5t-138 -85.5t-163.5 -48.5
+t-176 -14q-44 0 -132 3t-132 3q-106 0 -307 -11t-231 -12z" />
+    <glyph glyph-name="italic" unicode="&#xf033;" horiz-adv-x="1024" 
+d="M0 -126l17 85q22 7 61.5 16.5t72 19t59.5 23.5q28 35 41 101q1 7 62 289t114 543.5t52 296.5v25q-24 13 -54.5 18.5t-69.5 8t-58 5.5l19 103q33 -2 120 -6.5t149.5 -7t120.5 -2.5q48 0 98.5 2.5t121 7t98.5 6.5q-5 -39 -19 -89q-30 -10 -101.5 -28.5t-108.5 -33.5
+q-8 -19 -14 -42.5t-9 -40t-7.5 -45.5t-6.5 -42q-27 -148 -87.5 -419.5t-77.5 -355.5q-2 -9 -13 -58t-20 -90t-16 -83.5t-6 -57.5l1 -18q17 -4 185 -31q-3 -44 -16 -99q-11 0 -32.5 -1.5t-32.5 -1.5q-29 0 -87 10t-86 10q-138 2 -206 2q-51 0 -143 -9t-121 -11z" />
+    <glyph glyph-name="text_height" unicode="&#xf034;" horiz-adv-x="1792" 
+d="M1744 128q33 0 42 -18.5t-11 -44.5l-126 -162q-20 -26 -49 -26t-49 26l-126 162q-20 26 -11 44.5t42 18.5h80v1024h-80q-33 0 -42 18.5t11 44.5l126 162q20 26 49 26t49 -26l126 -162q20 -26 11 -44.5t-42 -18.5h-80v-1024h80zM81 1407l54 -27q12 -5 211 -5q44 0 132 2
+t132 2q36 0 107.5 -0.5t107.5 -0.5h293q6 0 21 -0.5t20.5 0t16 3t17.5 9t15 17.5l42 1q4 0 14 -0.5t14 -0.5q2 -112 2 -336q0 -80 -5 -109q-39 -14 -68 -18q-25 44 -54 128q-3 9 -11 48t-14.5 73.5t-7.5 35.5q-6 8 -12 12.5t-15.5 6t-13 2.5t-18 0.5t-16.5 -0.5
+q-17 0 -66.5 0.5t-74.5 0.5t-64 -2t-71 -6q-9 -81 -8 -136q0 -94 2 -388t2 -455q0 -16 -2.5 -71.5t0 -91.5t12.5 -69q40 -21 124 -42.5t120 -37.5q5 -40 5 -50q0 -14 -3 -29l-34 -1q-76 -2 -218 8t-207 10q-50 0 -151 -9t-152 -9q-3 51 -3 52v9q17 27 61.5 43t98.5 29t78 27
+q19 42 19 383q0 101 -3 303t-3 303v117q0 2 0.5 15.5t0.5 25t-1 25.5t-3 24t-5 14q-11 12 -162 12q-33 0 -93 -12t-80 -26q-19 -13 -34 -72.5t-31.5 -111t-42.5 -53.5q-42 26 -56 44v383z" />
+    <glyph glyph-name="text_width" unicode="&#xf035;" 
+d="M81 1407l54 -27q12 -5 211 -5q44 0 132 2t132 2q70 0 246.5 1t304.5 0.5t247 -4.5q33 -1 56 31l42 1q4 0 14 -0.5t14 -0.5q2 -112 2 -336q0 -80 -5 -109q-39 -14 -68 -18q-25 44 -54 128q-3 9 -11 47.5t-15 73.5t-7 36q-10 13 -27 19q-5 2 -66 2q-30 0 -93 1t-103 1
+t-94 -2t-96 -7q-9 -81 -8 -136l1 -152v52q0 -55 1 -154t1.5 -180t0.5 -153q0 -16 -2.5 -71.5t0 -91.5t12.5 -69q40 -21 124 -42.5t120 -37.5q5 -40 5 -50q0 -14 -3 -29l-34 -1q-76 -2 -218 8t-207 10q-50 0 -151 -9t-152 -9q-3 51 -3 52v9q17 27 61.5 43t98.5 29t78 27
+q7 16 11.5 74t6 145.5t1.5 155t-0.5 153.5t-0.5 89q0 7 -2.5 21.5t-2.5 22.5q0 7 0.5 44t1 73t0 76.5t-3 67.5t-6.5 32q-11 12 -162 12q-41 0 -163 -13.5t-138 -24.5q-19 -12 -34 -71.5t-31.5 -111.5t-42.5 -54q-42 26 -56 44v383zM1310 125q12 0 42 -19.5t57.5 -41.5
+t59.5 -49t36 -30q26 -21 26 -49t-26 -49q-4 -3 -36 -30t-59.5 -49t-57.5 -41.5t-42 -19.5q-13 0 -20.5 10.5t-10 28.5t-2.5 33.5t1.5 33t1.5 19.5h-1024q0 -2 1.5 -19.5t1.5 -33t-2.5 -33.5t-10 -28.5t-20.5 -10.5q-12 0 -42 19.5t-57.5 41.5t-59.5 49t-36 30q-26 21 -26 49
+t26 49q4 3 36 30t59.5 49t57.5 41.5t42 19.5q13 0 20.5 -10.5t10 -28.5t2.5 -33.5t-1.5 -33t-1.5 -19.5h1024q0 2 -1.5 19.5t-1.5 33t2.5 33.5t10 28.5t20.5 10.5z" />
+    <glyph glyph-name="align_left" unicode="&#xf036;" horiz-adv-x="1792" 
+d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45
+t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="align_center" unicode="&#xf037;" horiz-adv-x="1792" 
+d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h896q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45t-45 -19
+h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h640q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="align_right" unicode="&#xf038;" horiz-adv-x="1792" 
+d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45
+t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="align_justify" unicode="&#xf039;" horiz-adv-x="1792" 
+d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45
+t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="list" unicode="&#xf03a;" horiz-adv-x="1792" 
+d="M256 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM256 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5
+t9.5 -22.5zM256 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1344
+q13 0 22.5 -9.5t9.5 -22.5zM256 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5
+t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192
+q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5z" />
+    <glyph glyph-name="indent_left" unicode="&#xf03b;" horiz-adv-x="1792" 
+d="M384 992v-576q0 -13 -9.5 -22.5t-22.5 -9.5q-14 0 -23 9l-288 288q-9 9 -9 23t9 23l288 288q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5
+t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088
+q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5t9.5 -22.5z" />
+    <glyph glyph-name="indent_right" unicode="&#xf03c;" horiz-adv-x="1792" 
+d="M352 704q0 -14 -9 -23l-288 -288q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v576q0 13 9.5 22.5t22.5 9.5q14 0 23 -9l288 -288q9 -9 9 -23zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5
+t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088
+q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5t9.5 -22.5z" />
+    <glyph glyph-name="facetime_video" unicode="&#xf03d;" horiz-adv-x="1792" 
+d="M1792 1184v-1088q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-403 403v-166q0 -119 -84.5 -203.5t-203.5 -84.5h-704q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h704q119 0 203.5 -84.5t84.5 -203.5v-165l403 402q18 19 45 19q12 0 25 -5
+q39 -17 39 -59z" />
+    <glyph glyph-name="picture" unicode="&#xf03e;" horiz-adv-x="1920" 
+d="M640 960q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1664 576v-448h-1408v192l320 320l160 -160l512 512zM1760 1280h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-1216q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5v1216
+q0 13 -9.5 22.5t-22.5 9.5zM1920 1248v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="pencil" unicode="&#xf040;" 
+d="M363 0l91 91l-235 235l-91 -91v-107h128v-128h107zM886 928q0 22 -22 22q-10 0 -17 -7l-542 -542q-7 -7 -7 -17q0 -22 22 -22q10 0 17 7l542 542q7 7 7 17zM832 1120l416 -416l-832 -832h-416v416zM1515 1024q0 -53 -37 -90l-166 -166l-416 416l166 165q36 38 90 38
+q53 0 91 -38l235 -234q37 -39 37 -91z" />
+    <glyph glyph-name="map_marker" unicode="&#xf041;" horiz-adv-x="1024" 
+d="M768 896q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1024 896q0 -109 -33 -179l-364 -774q-16 -33 -47.5 -52t-67.5 -19t-67.5 19t-46.5 52l-365 774q-33 70 -33 179q0 212 150 362t362 150t362 -150t150 -362z" />
+    <glyph glyph-name="adjust" unicode="&#xf042;" 
+d="M768 96v1088q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="tint" unicode="&#xf043;" horiz-adv-x="1024" 
+d="M512 384q0 36 -20 69q-1 1 -15.5 22.5t-25.5 38t-25 44t-21 50.5q-4 16 -21 16t-21 -16q-7 -23 -21 -50.5t-25 -44t-25.5 -38t-15.5 -22.5q-20 -33 -20 -69q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 512q0 -212 -150 -362t-362 -150t-362 150t-150 362
+q0 145 81 275q6 9 62.5 90.5t101 151t99.5 178t83 201.5q9 30 34 47t51 17t51.5 -17t33.5 -47q28 -93 83 -201.5t99.5 -178t101 -151t62.5 -90.5q81 -127 81 -275z" />
+    <glyph glyph-name="edit" unicode="&#xf044;" horiz-adv-x="1792" 
+d="M888 352l116 116l-152 152l-116 -116v-56h96v-96h56zM1328 1072q-16 16 -33 -1l-350 -350q-17 -17 -1 -33t33 1l350 350q17 17 1 33zM1408 478v-190q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832
+q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-14 -14 -32 -8q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v126q0 13 9 22l64 64q15 15 35 7t20 -29zM1312 1216l288 -288l-672 -672h-288v288zM1756 1084l-92 -92
+l-288 288l92 92q28 28 68 28t68 -28l152 -152q28 -28 28 -68t-28 -68z" />
+    <glyph glyph-name="share" unicode="&#xf045;" horiz-adv-x="1664" 
+d="M1408 547v-259q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h255v0q13 0 22.5 -9.5t9.5 -22.5q0 -27 -26 -32q-77 -26 -133 -60q-10 -4 -16 -4h-112q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832
+q66 0 113 47t47 113v214q0 19 18 29q28 13 54 37q16 16 35 8q21 -9 21 -29zM1645 1043l-384 -384q-18 -19 -45 -19q-12 0 -25 5q-39 17 -39 59v192h-160q-323 0 -438 -131q-119 -137 -74 -473q3 -23 -20 -34q-8 -2 -12 -2q-16 0 -26 13q-10 14 -21 31t-39.5 68.5t-49.5 99.5
+t-38.5 114t-17.5 122q0 49 3.5 91t14 90t28 88t47 81.5t68.5 74t94.5 61.5t124.5 48.5t159.5 30.5t196.5 11h160v192q0 42 39 59q13 5 25 5q26 0 45 -19l384 -384q19 -19 19 -45t-19 -45z" />
+    <glyph glyph-name="check" unicode="&#xf046;" horiz-adv-x="1664" 
+d="M1408 606v-318q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-10 -10 -23 -10q-3 0 -9 2q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832
+q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v254q0 13 9 22l64 64q10 10 23 10q6 0 12 -3q20 -8 20 -29zM1639 1095l-814 -814q-24 -24 -57 -24t-57 24l-430 430q-24 24 -24 57t24 57l110 110q24 24 57 24t57 -24l263 -263l647 647q24 24 57 24t57 -24l110 -110
+q24 -24 24 -57t-24 -57z" />
+    <glyph glyph-name="move" unicode="&#xf047;" horiz-adv-x="1792" 
+d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-384v-384h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v384h-384v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45
+t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h384v384h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45t-19 -45t-45 -19h-128v-384h384v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z" />
+    <glyph glyph-name="step_backward" unicode="&#xf048;" horiz-adv-x="1024" 
+d="M979 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 10 13 19z" />
+    <glyph glyph-name="fast_backward" unicode="&#xf049;" horiz-adv-x="1792" 
+d="M1747 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 10 13 19l710 710
+q19 19 32 13t13 -32v-710q4 10 13 19z" />
+    <glyph glyph-name="backward" unicode="&#xf04a;" horiz-adv-x="1664" 
+d="M1619 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-19 19 -19 45t19 45l710 710q19 19 32 13t13 -32v-710q4 10 13 19z" />
+    <glyph glyph-name="play" unicode="&#xf04b;" horiz-adv-x="1408" 
+d="M1384 609l-1328 -738q-23 -13 -39.5 -3t-16.5 36v1472q0 26 16.5 36t39.5 -3l1328 -738q23 -13 23 -31t-23 -31z" />
+    <glyph glyph-name="pause" unicode="&#xf04c;" 
+d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45zM640 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="stop" unicode="&#xf04d;" 
+d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="forward" unicode="&#xf04e;" horiz-adv-x="1664" 
+d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q9 -9 13 -19v710q0 26 13 32t32 -13l710 -710q19 -19 19 -45t-19 -45l-710 -710q-19 -19 -32 -13t-13 32v710q-4 -10 -13 -19z" />
+    <glyph glyph-name="fast_forward" unicode="&#xf050;" horiz-adv-x="1792" 
+d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q9 -9 13 -19v710q0 26 13 32t32 -13l710 -710q9 -9 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-4 -10 -13 -19l-710 -710
+q-19 -19 -32 -13t-13 32v710q-4 -10 -13 -19z" />
+    <glyph glyph-name="step_forward" unicode="&#xf051;" horiz-adv-x="1024" 
+d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q9 -9 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-4 -10 -13 -19z" />
+    <glyph glyph-name="eject" unicode="&#xf052;" horiz-adv-x="1538" 
+d="M14 557l710 710q19 19 45 19t45 -19l710 -710q19 -19 13 -32t-32 -13h-1472q-26 0 -32 13t13 32zM1473 0h-1408q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1408q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19z" />
+    <glyph glyph-name="chevron_left" unicode="&#xf053;" horiz-adv-x="1280" 
+d="M1171 1235l-531 -531l531 -531q19 -19 19 -45t-19 -45l-166 -166q-19 -19 -45 -19t-45 19l-742 742q-19 19 -19 45t19 45l742 742q19 19 45 19t45 -19l166 -166q19 -19 19 -45t-19 -45z" />
+    <glyph glyph-name="chevron_right" unicode="&#xf054;" horiz-adv-x="1280" 
+d="M1107 659l-742 -742q-19 -19 -45 -19t-45 19l-166 166q-19 19 -19 45t19 45l531 531l-531 531q-19 19 -19 45t19 45l166 166q19 19 45 19t45 -19l742 -742q19 -19 19 -45t-19 -45z" />
+    <glyph glyph-name="plus_sign" unicode="&#xf055;" 
+d="M1216 576v128q0 26 -19 45t-45 19h-256v256q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-256h-256q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h256v-256q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v256h256q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5
+t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="minus_sign" unicode="&#xf056;" 
+d="M1216 576v128q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5
+t103 -385.5z" />
+    <glyph glyph-name="remove_sign" unicode="&#xf057;" 
+d="M1149 414q0 26 -19 45l-181 181l181 181q19 19 19 45q0 27 -19 46l-90 90q-19 19 -46 19q-26 0 -45 -19l-181 -181l-181 181q-19 19 -45 19q-27 0 -46 -19l-90 -90q-19 -19 -19 -46q0 -26 19 -45l181 -181l-181 -181q-19 -19 -19 -45q0 -27 19 -46l90 -90q19 -19 46 -19
+q26 0 45 19l181 181l181 -181q19 -19 45 -19q27 0 46 19l90 90q19 19 19 46zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="ok_sign" unicode="&#xf058;" 
+d="M1284 802q0 28 -18 46l-91 90q-19 19 -45 19t-45 -19l-408 -407l-226 226q-19 19 -45 19t-45 -19l-91 -90q-18 -18 -18 -46q0 -27 18 -45l362 -362q19 -19 45 -19q27 0 46 19l543 543q18 18 18 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103
+t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="question_sign" unicode="&#xf059;" 
+d="M896 160v192q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h192q14 0 23 9t9 23zM1152 832q0 88 -55.5 163t-138.5 116t-170 41q-243 0 -371 -213q-15 -24 8 -42l132 -100q7 -6 19 -6q16 0 25 12q53 68 86 92q34 24 86 24q48 0 85.5 -26t37.5 -59
+q0 -38 -20 -61t-68 -45q-63 -28 -115.5 -86.5t-52.5 -125.5v-36q0 -14 9 -23t23 -9h192q14 0 23 9t9 23q0 19 21.5 49.5t54.5 49.5q32 18 49 28.5t46 35t44.5 48t28 60.5t12.5 81zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5
+t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="info_sign" unicode="&#xf05a;" 
+d="M1024 160v160q0 14 -9 23t-23 9h-96v512q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h96v-320h-96q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h448q14 0 23 9t9 23zM896 1056v160q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23
+t23 -9h192q14 0 23 9t9 23zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="screenshot" unicode="&#xf05b;" 
+d="M1197 512h-109q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h109q-32 108 -112.5 188.5t-188.5 112.5v-109q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v109q-108 -32 -188.5 -112.5t-112.5 -188.5h109q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-109
+q32 -108 112.5 -188.5t188.5 -112.5v109q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-109q108 32 188.5 112.5t112.5 188.5zM1536 704v-128q0 -26 -19 -45t-45 -19h-143q-37 -161 -154.5 -278.5t-278.5 -154.5v-143q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v143
+q-161 37 -278.5 154.5t-154.5 278.5h-143q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h143q37 161 154.5 278.5t278.5 154.5v143q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-143q161 -37 278.5 -154.5t154.5 -278.5h143q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="remove_circle" unicode="&#xf05c;" 
+d="M1097 457l-146 -146q-10 -10 -23 -10t-23 10l-137 137l-137 -137q-10 -10 -23 -10t-23 10l-146 146q-10 10 -10 23t10 23l137 137l-137 137q-10 10 -10 23t10 23l146 146q10 10 23 10t23 -10l137 -137l137 137q10 10 23 10t23 -10l146 -146q10 -10 10 -23t-10 -23
+l-137 -137l137 -137q10 -10 10 -23t-10 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5
+t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="ok_circle" unicode="&#xf05d;" 
+d="M1171 723l-422 -422q-19 -19 -45 -19t-45 19l-294 294q-19 19 -19 45t19 45l102 102q19 19 45 19t45 -19l147 -147l275 275q19 19 45 19t45 -19l102 -102q19 -19 19 -45t-19 -45zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198
+t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="ban_circle" unicode="&#xf05e;" 
+d="M1312 643q0 161 -87 295l-754 -753q137 -89 297 -89q111 0 211.5 43.5t173.5 116.5t116 174.5t43 212.5zM313 344l755 754q-135 91 -300 91q-148 0 -273 -73t-198 -199t-73 -274q0 -162 89 -299zM1536 643q0 -157 -61 -300t-163.5 -246t-245 -164t-298.5 -61t-298.5 61
+t-245 164t-163.5 246t-61 300t61 299.5t163.5 245.5t245 164t298.5 61t298.5 -61t245 -164t163.5 -245.5t61 -299.5z" />
+    <glyph glyph-name="arrow_left" unicode="&#xf060;" 
+d="M1536 640v-128q0 -53 -32.5 -90.5t-84.5 -37.5h-704l293 -294q38 -36 38 -90t-38 -90l-75 -76q-37 -37 -90 -37q-52 0 -91 37l-651 652q-37 37 -37 90q0 52 37 91l651 650q38 38 91 38q52 0 90 -38l75 -74q38 -38 38 -91t-38 -91l-293 -293h704q52 0 84.5 -37.5
+t32.5 -90.5z" />
+    <glyph glyph-name="arrow_right" unicode="&#xf061;" 
+d="M1472 576q0 -54 -37 -91l-651 -651q-39 -37 -91 -37q-51 0 -90 37l-75 75q-38 38 -38 91t38 91l293 293h-704q-52 0 -84.5 37.5t-32.5 90.5v128q0 53 32.5 90.5t84.5 37.5h704l-293 294q-38 36 -38 90t38 90l75 75q38 38 90 38q53 0 91 -38l651 -651q37 -35 37 -90z" />
+    <glyph glyph-name="arrow_up" unicode="&#xf062;" horiz-adv-x="1664" 
+d="M1611 565q0 -51 -37 -90l-75 -75q-38 -38 -91 -38q-54 0 -90 38l-294 293v-704q0 -52 -37.5 -84.5t-90.5 -32.5h-128q-53 0 -90.5 32.5t-37.5 84.5v704l-294 -293q-36 -38 -90 -38t-90 38l-75 75q-38 38 -38 90q0 53 38 91l651 651q35 37 90 37q54 0 91 -37l651 -651
+q37 -39 37 -91z" />
+    <glyph glyph-name="arrow_down" unicode="&#xf063;" horiz-adv-x="1664" 
+d="M1611 704q0 -53 -37 -90l-651 -652q-39 -37 -91 -37q-53 0 -90 37l-651 652q-38 36 -38 90q0 53 38 91l74 75q39 37 91 37q53 0 90 -37l294 -294v704q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-704l294 294q37 37 90 37q52 0 91 -37l75 -75q37 -39 37 -91z" />
+    <glyph glyph-name="share_alt" unicode="&#xf064;" horiz-adv-x="1792" 
+d="M1792 896q0 -26 -19 -45l-512 -512q-19 -19 -45 -19t-45 19t-19 45v256h-224q-98 0 -175.5 -6t-154 -21.5t-133 -42.5t-105.5 -69.5t-80 -101t-48.5 -138.5t-17.5 -181q0 -55 5 -123q0 -6 2.5 -23.5t2.5 -26.5q0 -15 -8.5 -25t-23.5 -10q-16 0 -28 17q-7 9 -13 22
+t-13.5 30t-10.5 24q-127 285 -127 451q0 199 53 333q162 403 875 403h224v256q0 26 19 45t45 19t45 -19l512 -512q19 -19 19 -45z" />
+    <glyph glyph-name="resize_full" unicode="&#xf065;" 
+d="M755 480q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23zM1536 1344v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332
+q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="resize_small" unicode="&#xf066;" 
+d="M768 576v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45zM1523 1248q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45
+t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23z" />
+    <glyph glyph-name="plus" unicode="&#xf067;" horiz-adv-x="1408" 
+d="M1408 800v-192q0 -40 -28 -68t-68 -28h-416v-416q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v416h-416q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h416v416q0 40 28 68t68 28h192q40 0 68 -28t28 -68v-416h416q40 0 68 -28t28 -68z" />
+    <glyph glyph-name="minus" unicode="&#xf068;" horiz-adv-x="1408" 
+d="M1408 800v-192q0 -40 -28 -68t-68 -28h-1216q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h1216q40 0 68 -28t28 -68z" />
+    <glyph glyph-name="asterisk" unicode="&#xf069;" horiz-adv-x="1664" 
+d="M1482 486q46 -26 59.5 -77.5t-12.5 -97.5l-64 -110q-26 -46 -77.5 -59.5t-97.5 12.5l-266 153v-307q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v307l-266 -153q-46 -26 -97.5 -12.5t-77.5 59.5l-64 110q-26 46 -12.5 97.5t59.5 77.5l266 154l-266 154
+q-46 26 -59.5 77.5t12.5 97.5l64 110q26 46 77.5 59.5t97.5 -12.5l266 -153v307q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-307l266 153q46 26 97.5 12.5t77.5 -59.5l64 -110q26 -46 12.5 -97.5t-59.5 -77.5l-266 -154z" />
+    <glyph glyph-name="exclamation_sign" unicode="&#xf06a;" 
+d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM896 161v190q0 14 -9 23.5t-22 9.5h-192q-13 0 -23 -10t-10 -23v-190q0 -13 10 -23t23 -10h192
+q13 0 22 9.5t9 23.5zM894 505l18 621q0 12 -10 18q-10 8 -24 8h-220q-14 0 -24 -8q-10 -6 -10 -18l17 -621q0 -10 10 -17.5t24 -7.5h185q14 0 23.5 7.5t10.5 17.5z" />
+    <glyph glyph-name="gift" unicode="&#xf06b;" 
+d="M928 180v56v468v192h-320v-192v-468v-56q0 -25 18 -38.5t46 -13.5h192q28 0 46 13.5t18 38.5zM472 1024h195l-126 161q-26 31 -69 31q-40 0 -68 -28t-28 -68t28 -68t68 -28zM1160 1120q0 40 -28 68t-68 28q-43 0 -69 -31l-125 -161h194q40 0 68 28t28 68zM1536 864v-320
+q0 -14 -9 -23t-23 -9h-96v-416q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v416h-96q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h440q-93 0 -158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5q107 0 168 -77l128 -165l128 165q61 77 168 77q93 0 158.5 -65.5t65.5 -158.5
+t-65.5 -158.5t-158.5 -65.5h440q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="leaf" unicode="&#xf06c;" horiz-adv-x="1792" 
+d="M1280 832q0 26 -19 45t-45 19q-172 0 -318 -49.5t-259.5 -134t-235.5 -219.5q-19 -21 -19 -45q0 -26 19 -45t45 -19q24 0 45 19q27 24 74 71t67 66q137 124 268.5 176t313.5 52q26 0 45 19t19 45zM1792 1030q0 -95 -20 -193q-46 -224 -184.5 -383t-357.5 -268
+q-214 -108 -438 -108q-148 0 -286 47q-15 5 -88 42t-96 37q-16 0 -39.5 -32t-45 -70t-52.5 -70t-60 -32q-43 0 -63.5 17.5t-45.5 59.5q-2 4 -6 11t-5.5 10t-3 9.5t-1.5 13.5q0 35 31 73.5t68 65.5t68 56t31 48q0 4 -14 38t-16 44q-9 51 -9 104q0 115 43.5 220t119 184.5
+t170.5 139t204 95.5q55 18 145 25.5t179.5 9t178.5 6t163.5 24t113.5 56.5l29.5 29.5t29.5 28t27 20t36.5 16t43.5 4.5q39 0 70.5 -46t47.5 -112t24 -124t8 -96z" />
+    <glyph glyph-name="fire" unicode="&#xf06d;" horiz-adv-x="1408" 
+d="M1408 -160v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1152 896q0 -78 -24.5 -144t-64 -112.5t-87.5 -88t-96 -77.5t-87.5 -72t-64 -81.5t-24.5 -96.5q0 -96 67 -224l-4 1l1 -1
+q-90 41 -160 83t-138.5 100t-113.5 122.5t-72.5 150.5t-27.5 184q0 78 24.5 144t64 112.5t87.5 88t96 77.5t87.5 72t64 81.5t24.5 96.5q0 94 -66 224l3 -1l-1 1q90 -41 160 -83t138.5 -100t113.5 -122.5t72.5 -150.5t27.5 -184z" />
+    <glyph glyph-name="eye_open" unicode="&#xf06e;" horiz-adv-x="1792" 
+d="M1664 576q-152 236 -381 353q61 -104 61 -225q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 121 61 225q-229 -117 -381 -353q133 -205 333.5 -326.5t434.5 -121.5t434.5 121.5t333.5 326.5zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5
+t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1792 576q0 -34 -20 -69q-140 -230 -376.5 -368.5t-499.5 -138.5t-499.5 139t-376.5 368q-20 35 -20 69t20 69q140 229 376.5 368t499.5 139t499.5 -139t376.5 -368q20 -35 20 -69z" />
+    <glyph glyph-name="eye_close" unicode="&#xf070;" horiz-adv-x="1792" 
+d="M555 201l78 141q-87 63 -136 159t-49 203q0 121 61 225q-229 -117 -381 -353q167 -258 427 -375zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1307 1151q0 -7 -1 -9
+q-106 -189 -316 -567t-315 -566l-49 -89q-10 -16 -28 -16q-12 0 -134 70q-16 10 -16 28q0 12 44 87q-143 65 -263.5 173t-208.5 245q-20 31 -20 69t20 69q153 235 380 371t496 136q89 0 180 -17l54 97q10 16 28 16q5 0 18 -6t31 -15.5t33 -18.5t31.5 -18.5t19.5 -11.5
+q16 -10 16 -27zM1344 704q0 -139 -79 -253.5t-209 -164.5l280 502q8 -45 8 -84zM1792 576q0 -35 -20 -69q-39 -64 -109 -145q-150 -172 -347.5 -267t-419.5 -95l74 132q212 18 392.5 137t301.5 307q-115 179 -282 294l63 112q95 -64 182.5 -153t144.5 -184q20 -34 20 -69z
+" />
+    <glyph glyph-name="warning_sign" unicode="&#xf071;" horiz-adv-x="1792" 
+d="M1024 161v190q0 14 -9.5 23.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -23.5v-190q0 -14 9.5 -23.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 23.5zM1022 535l18 459q0 12 -10 19q-13 11 -24 11h-220q-11 0 -24 -11q-10 -7 -10 -21l17 -457q0 -10 10 -16.5t24 -6.5h185
+q14 0 23.5 6.5t10.5 16.5zM1008 1469l768 -1408q35 -63 -2 -126q-17 -29 -46.5 -46t-63.5 -17h-1536q-34 0 -63.5 17t-46.5 46q-37 63 -2 126l768 1408q17 31 47 49t65 18t65 -18t47 -49z" />
+    <glyph glyph-name="plane" unicode="&#xf072;" horiz-adv-x="1408" 
+d="M1376 1376q44 -52 12 -148t-108 -172l-161 -161l160 -696q5 -19 -12 -33l-128 -96q-7 -6 -19 -6q-4 0 -7 1q-15 3 -21 16l-279 508l-259 -259l53 -194q5 -17 -8 -31l-96 -96q-9 -9 -23 -9h-2q-15 2 -24 13l-189 252l-252 189q-11 7 -13 23q-1 13 9 25l96 97q9 9 23 9
+q6 0 8 -1l194 -53l259 259l-508 279q-14 8 -17 24q-2 16 9 27l128 128q14 13 30 8l665 -159l160 160q76 76 172 108t148 -12z" />
+    <glyph glyph-name="calendar" unicode="&#xf073;" horiz-adv-x="1664" 
+d="M128 -128h288v288h-288v-288zM480 -128h320v288h-320v-288zM128 224h288v320h-288v-320zM480 224h320v320h-320v-320zM128 608h288v288h-288v-288zM864 -128h320v288h-320v-288zM480 608h320v288h-320v-288zM1248 -128h288v288h-288v-288zM864 224h320v320h-320v-320z
+M512 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1248 224h288v320h-288v-320zM864 608h320v288h-320v-288zM1248 608h288v288h-288v-288zM1280 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64
+q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1664 1152v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47
+h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="random" unicode="&#xf074;" horiz-adv-x="1792" 
+d="M666 1055q-60 -92 -137 -273q-22 45 -37 72.5t-40.5 63.5t-51 56.5t-63 35t-81.5 14.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q250 0 410 -225zM1792 256q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v192q-32 0 -85 -0.5t-81 -1t-73 1
+t-71 5t-64 10.5t-63 18.5t-58 28.5t-59 40t-55 53.5t-56 69.5q59 93 136 273q22 -45 37 -72.5t40.5 -63.5t51 -56.5t63 -35t81.5 -14.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23zM1792 1152q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5
+v192h-256q-48 0 -87 -15t-69 -45t-51 -61.5t-45 -77.5q-32 -62 -78 -171q-29 -66 -49.5 -111t-54 -105t-64 -100t-74 -83t-90 -68.5t-106.5 -42t-128 -16.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q48 0 87 15t69 45t51 61.5t45 77.5q32 62 78 171q29 66 49.5 111
+t54 105t64 100t74 83t90 68.5t106.5 42t128 16.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z" />
+    <glyph glyph-name="comment" unicode="&#xf075;" horiz-adv-x="1792" 
+d="M1792 640q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22q-17 -2 -30.5 9t-17.5 29v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281
+q0 130 71 248.5t191 204.5t286 136.5t348 50.5q244 0 450 -85.5t326 -233t120 -321.5z" />
+    <glyph glyph-name="magnet" unicode="&#xf076;" 
+d="M1536 704v-128q0 -201 -98.5 -362t-274 -251.5t-395.5 -90.5t-395.5 90.5t-274 251.5t-98.5 362v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-128q0 -52 23.5 -90t53.5 -57t71 -30t64 -13t44 -2t44 2t64 13t71 30t53.5 57t23.5 90v128q0 26 19 45t45 19h384
+q26 0 45 -19t19 -45zM512 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45zM1536 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="chevron_up" unicode="&#xf077;" horiz-adv-x="1792" 
+d="M1683 205l-166 -165q-19 -19 -45 -19t-45 19l-531 531l-531 -531q-19 -19 -45 -19t-45 19l-166 165q-19 19 -19 45.5t19 45.5l742 741q19 19 45 19t45 -19l742 -741q19 -19 19 -45.5t-19 -45.5z" />
+    <glyph glyph-name="chevron_down" unicode="&#xf078;" horiz-adv-x="1792" 
+d="M1683 728l-742 -741q-19 -19 -45 -19t-45 19l-742 741q-19 19 -19 45.5t19 45.5l166 165q19 19 45 19t45 -19l531 -531l531 531q19 19 45 19t45 -19l166 -165q19 -19 19 -45.5t-19 -45.5z" />
+    <glyph glyph-name="retweet" unicode="&#xf079;" horiz-adv-x="1920" 
+d="M1280 32q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-8 0 -13.5 2t-9 7t-5.5 8t-3 11.5t-1 11.5v13v11v160v416h-192q-26 0 -45 19t-19 45q0 24 15 41l320 384q19 22 49 22t49 -22l320 -384q15 -17 15 -41q0 -26 -19 -45t-45 -19h-192v-384h576q16 0 25 -11l160 -192q7 -10 7 -21
+zM1920 448q0 -24 -15 -41l-320 -384q-20 -23 -49 -23t-49 23l-320 384q-15 17 -15 41q0 26 19 45t45 19h192v384h-576q-16 0 -25 12l-160 192q-7 9 -7 20q0 13 9.5 22.5t22.5 9.5h960q8 0 13.5 -2t9 -7t5.5 -8t3 -11.5t1 -11.5v-13v-11v-160v-416h192q26 0 45 -19t19 -45z
+" />
+    <glyph glyph-name="shopping_cart" unicode="&#xf07a;" horiz-adv-x="1664" 
+d="M640 0q0 -52 -38 -90t-90 -38t-90 38t-38 90t38 90t90 38t90 -38t38 -90zM1536 0q0 -52 -38 -90t-90 -38t-90 38t-38 90t38 90t90 38t90 -38t38 -90zM1664 1088v-512q0 -24 -16.5 -42.5t-40.5 -21.5l-1044 -122q13 -60 13 -70q0 -16 -24 -64h920q26 0 45 -19t19 -45
+t-19 -45t-45 -19h-1024q-26 0 -45 19t-19 45q0 11 8 31.5t16 36t21.5 40t15.5 29.5l-177 823h-204q-26 0 -45 19t-19 45t19 45t45 19h256q16 0 28.5 -6.5t19.5 -15.5t13 -24.5t8 -26t5.5 -29.5t4.5 -26h1201q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="folder_close" unicode="&#xf07b;" horiz-adv-x="1664" 
+d="M1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />
+    <glyph glyph-name="folder_open" unicode="&#xf07c;" horiz-adv-x="1920" 
+d="M1879 584q0 -31 -31 -66l-336 -396q-43 -51 -120.5 -86.5t-143.5 -35.5h-1088q-34 0 -60.5 13t-26.5 43q0 31 31 66l336 396q43 51 120.5 86.5t143.5 35.5h1088q34 0 60.5 -13t26.5 -43zM1536 928v-160h-832q-94 0 -197 -47.5t-164 -119.5l-337 -396l-5 -6q0 4 -0.5 12.5
+t-0.5 12.5v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158z" />
+    <glyph glyph-name="resize_vertical" unicode="&#xf07d;" horiz-adv-x="768" 
+d="M704 1216q0 -26 -19 -45t-45 -19h-128v-1024h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v1024h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45z" />
+    <glyph glyph-name="resize_horizontal" unicode="&#xf07e;" horiz-adv-x="1792" 
+d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-1024v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h1024v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z" />
+    <glyph glyph-name="bar_chart" unicode="&#xf080;" horiz-adv-x="2048" 
+d="M640 640v-512h-256v512h256zM1024 1152v-1024h-256v1024h256zM2048 0v-128h-2048v1536h128v-1408h1920zM1408 896v-768h-256v768h256zM1792 1280v-1152h-256v1152h256z" />
+    <glyph glyph-name="twitter_sign" unicode="&#xf081;" 
+d="M1280 926q-56 -25 -121 -34q68 40 93 117q-65 -38 -134 -51q-61 66 -153 66q-87 0 -148.5 -61.5t-61.5 -148.5q0 -29 5 -48q-129 7 -242 65t-192 155q-29 -50 -29 -106q0 -114 91 -175q-47 1 -100 26v-2q0 -75 50 -133.5t123 -72.5q-29 -8 -51 -8q-13 0 -39 4
+q21 -63 74.5 -104t121.5 -42q-116 -90 -261 -90q-26 0 -50 3q148 -94 322 -94q112 0 210 35.5t168 95t120.5 137t75 162t24.5 168.5q0 18 -1 27q63 45 105 109zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5
+t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="facebook_sign" unicode="&#xf082;" 
+d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-188v595h199l30 232h-229v148q0 56 23.5 84t91.5 28l122 1v207q-63 9 -178 9q-136 0 -217.5 -80t-81.5 -226v-171h-200v-232h200v-595h-532q-119 0 -203.5 84.5t-84.5 203.5v960
+q0 119 84.5 203.5t203.5 84.5h960z" />
+    <glyph glyph-name="camera_retro" unicode="&#xf083;" horiz-adv-x="1792" 
+d="M928 704q0 14 -9 23t-23 9q-66 0 -113 -47t-47 -113q0 -14 9 -23t23 -9t23 9t9 23q0 40 28 68t68 28q14 0 23 9t9 23zM1152 574q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM128 0h1536v128h-1536v-128zM1280 574q0 159 -112.5 271.5
+t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM256 1216h384v128h-384v-128zM128 1024h1536v118v138h-828l-64 -128h-644v-128zM1792 1280v-1280q0 -53 -37.5 -90.5t-90.5 -37.5h-1536q-53 0 -90.5 37.5t-37.5 90.5v1280
+q0 53 37.5 90.5t90.5 37.5h1536q53 0 90.5 -37.5t37.5 -90.5z" />
+    <glyph glyph-name="key" unicode="&#xf084;" horiz-adv-x="1792" 
+d="M832 1024q0 80 -56 136t-136 56t-136 -56t-56 -136q0 -42 19 -83q-41 19 -83 19q-80 0 -136 -56t-56 -136t56 -136t136 -56t136 56t56 136q0 42 -19 83q41 -19 83 -19q80 0 136 56t56 136zM1683 320q0 -17 -49 -66t-66 -49q-9 0 -28.5 16t-36.5 33t-38.5 40t-24.5 26
+l-96 -96l220 -220q28 -28 28 -68q0 -42 -39 -81t-81 -39q-40 0 -68 28l-671 671q-176 -131 -365 -131q-163 0 -265.5 102.5t-102.5 265.5q0 160 95 313t248 248t313 95q163 0 265.5 -102.5t102.5 -265.5q0 -189 -131 -365l355 -355l96 96q-3 3 -26 24.5t-40 38.5t-33 36.5
+t-16 28.5q0 17 49 66t66 49q13 0 23 -10q6 -6 46 -44.5t82 -79.5t86.5 -86t73 -78t28.5 -41z" />
+    <glyph glyph-name="cogs" unicode="&#xf085;" horiz-adv-x="1920" 
+d="M896 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1664 128q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 1152q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5
+t90.5 37.5t37.5 90.5zM1280 731v-185q0 -10 -7 -19.5t-16 -10.5l-155 -24q-11 -35 -32 -76q34 -48 90 -115q7 -11 7 -20q0 -12 -7 -19q-23 -30 -82.5 -89.5t-78.5 -59.5q-11 0 -21 7l-115 90q-37 -19 -77 -31q-11 -108 -23 -155q-7 -24 -30 -24h-186q-11 0 -20 7.5t-10 17.5
+l-23 153q-34 10 -75 31l-118 -89q-7 -7 -20 -7q-11 0 -21 8q-144 133 -144 160q0 9 7 19q10 14 41 53t47 61q-23 44 -35 82l-152 24q-10 1 -17 9.5t-7 19.5v185q0 10 7 19.5t16 10.5l155 24q11 35 32 76q-34 48 -90 115q-7 11 -7 20q0 12 7 20q22 30 82 89t79 59q11 0 21 -7
+l115 -90q34 18 77 32q11 108 23 154q7 24 30 24h186q11 0 20 -7.5t10 -17.5l23 -153q34 -10 75 -31l118 89q8 7 20 7q11 0 21 -8q144 -133 144 -160q0 -8 -7 -19q-12 -16 -42 -54t-45 -60q23 -48 34 -82l152 -23q10 -2 17 -10.5t7 -19.5zM1920 198v-140q0 -16 -149 -31
+q-12 -27 -30 -52q51 -113 51 -138q0 -4 -4 -7q-122 -71 -124 -71q-8 0 -46 47t-52 68q-20 -2 -30 -2t-30 2q-14 -21 -52 -68t-46 -47q-2 0 -124 71q-4 3 -4 7q0 25 51 138q-18 25 -30 52q-149 15 -149 31v140q0 16 149 31q13 29 30 52q-51 113 -51 138q0 4 4 7q4 2 35 20
+t59 34t30 16q8 0 46 -46.5t52 -67.5q20 2 30 2t30 -2q51 71 92 112l6 2q4 0 124 -70q4 -3 4 -7q0 -25 -51 -138q17 -23 30 -52q149 -15 149 -31zM1920 1222v-140q0 -16 -149 -31q-12 -27 -30 -52q51 -113 51 -138q0 -4 -4 -7q-122 -71 -124 -71q-8 0 -46 47t-52 68
+q-20 -2 -30 -2t-30 2q-14 -21 -52 -68t-46 -47q-2 0 -124 71q-4 3 -4 7q0 25 51 138q-18 25 -30 52q-149 15 -149 31v140q0 16 149 31q13 29 30 52q-51 113 -51 138q0 4 4 7q4 2 35 20t59 34t30 16q8 0 46 -46.5t52 -67.5q20 2 30 2t30 -2q51 71 92 112l6 2q4 0 124 -70
+q4 -3 4 -7q0 -25 -51 -138q17 -23 30 -52q149 -15 149 -31z" />
+    <glyph glyph-name="comments" unicode="&#xf086;" horiz-adv-x="1792" 
+d="M1408 768q0 -139 -94 -257t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q-124 72 -195 177t-71 224
+q0 139 94 257t256.5 186.5t353.5 68.5t353.5 -68.5t256.5 -186.5t94 -257zM1792 512q0 -120 -71 -224.5t-195 -176.5q10 -24 20.5 -44t25 -38.5t22.5 -29t26 -29.5t23 -25q1 -1 4 -4.5t4.5 -5t4 -5t3.5 -5.5l2.5 -5t2 -6t0.5 -6.5t-1 -6.5q-3 -14 -13 -22t-22 -7
+q-50 7 -86 16q-154 40 -278 128q-90 -16 -176 -16q-271 0 -472 132q58 -4 88 -4q161 0 309 45t264 129q125 92 192 212t67 254q0 77 -23 152q129 -71 204 -178t75 -230z" />
+    <glyph glyph-name="thumbs_up_alt" unicode="&#xf087;" 
+d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 768q0 51 -39 89.5t-89 38.5h-352q0 58 48 159.5t48 160.5q0 98 -32 145t-128 47q-26 -26 -38 -85t-30.5 -125.5t-59.5 -109.5q-22 -23 -77 -91q-4 -5 -23 -30t-31.5 -41t-34.5 -42.5
+t-40 -44t-38.5 -35.5t-40 -27t-35.5 -9h-32v-640h32q13 0 31.5 -3t33 -6.5t38 -11t35 -11.5t35.5 -12.5t29 -10.5q211 -73 342 -73h121q192 0 192 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 47.5q32 1 53.5 47t21.5 81zM1536 769
+q0 -89 -49 -163q9 -33 9 -69q0 -77 -38 -144q3 -21 3 -43q0 -101 -60 -178q1 -139 -85 -219.5t-227 -80.5h-36h-93q-96 0 -189.5 22.5t-216.5 65.5q-116 40 -138 40h-288q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5h274q36 24 137 155q58 75 107 128
+q24 25 35.5 85.5t30.5 126.5t62 108q39 37 90 37q84 0 151 -32.5t102 -101.5t35 -186q0 -93 -48 -192h176q104 0 180 -76t76 -179z" />
+    <glyph glyph-name="thumbs_down_alt" unicode="&#xf088;" 
+d="M256 1088q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 512q0 35 -21.5 81t-53.5 47q15 17 25 47.5t10 55.5q0 69 -53 119q18 31 18 69q0 37 -17.5 73.5t-47.5 52.5q5 30 5 56q0 85 -49 126t-136 41h-128q-131 0 -342 -73q-5 -2 -29 -10.5
+t-35.5 -12.5t-35 -11.5t-38 -11t-33 -6.5t-31.5 -3h-32v-640h32q16 0 35.5 -9t40 -27t38.5 -35.5t40 -44t34.5 -42.5t31.5 -41t23 -30q55 -68 77 -91q41 -43 59.5 -109.5t30.5 -125.5t38 -85q96 0 128 47t32 145q0 59 -48 160.5t-48 159.5h352q50 0 89 38.5t39 89.5z
+M1536 511q0 -103 -76 -179t-180 -76h-176q48 -99 48 -192q0 -118 -35 -186q-35 -69 -102 -101.5t-151 -32.5q-51 0 -90 37q-34 33 -54 82t-25.5 90.5t-17.5 84.5t-31 64q-48 50 -107 127q-101 131 -137 155h-274q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5
+h288q22 0 138 40q128 44 223 66t200 22h112q140 0 226.5 -79t85.5 -216v-5q60 -77 60 -178q0 -22 -3 -43q38 -67 38 -144q0 -36 -9 -69q49 -73 49 -163z" />
+    <glyph glyph-name="star_half" unicode="&#xf089;" horiz-adv-x="896" 
+d="M832 1504v-1339l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41z" />
+    <glyph glyph-name="heart_empty" unicode="&#xf08a;" horiz-adv-x="1792" 
+d="M1664 940q0 81 -21.5 143t-55 98.5t-81.5 59.5t-94 31t-98 8t-112 -25.5t-110.5 -64t-86.5 -72t-60 -61.5q-18 -22 -49 -22t-49 22q-24 28 -60 61.5t-86.5 72t-110.5 64t-112 25.5t-98 -8t-94 -31t-81.5 -59.5t-55 -98.5t-21.5 -143q0 -168 187 -355l581 -560l580 559
+q188 188 188 356zM1792 940q0 -221 -229 -450l-623 -600q-18 -18 -44 -18t-44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5
+q224 0 351 -124t127 -344z" />
+    <glyph glyph-name="signout" unicode="&#xf08b;" horiz-adv-x="1664" 
+d="M640 96q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h320q13 0 22.5 -9.5t9.5 -22.5q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-66 0 -113 -47t-47 -113v-704
+q0 -66 47 -113t113 -47h288h11h13t11.5 -1t11.5 -3t8 -5.5t7 -9t2 -13.5zM1568 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45z" />
+    <glyph glyph-name="linkedin_sign" unicode="&#xf08c;" 
+d="M237 122h231v694h-231v-694zM483 1030q-1 52 -36 86t-93 34t-94.5 -34t-36.5 -86q0 -51 35.5 -85.5t92.5 -34.5h1q59 0 95 34.5t36 85.5zM1068 122h231v398q0 154 -73 233t-193 79q-136 0 -209 -117h2v101h-231q3 -66 0 -694h231v388q0 38 7 56q15 35 45 59.5t74 24.5
+q116 0 116 -157v-371zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="pushpin" unicode="&#xf08d;" horiz-adv-x="1152" 
+d="M480 672v448q0 14 -9 23t-23 9t-23 -9t-9 -23v-448q0 -14 9 -23t23 -9t23 9t9 23zM1152 320q0 -26 -19 -45t-45 -19h-429l-51 -483q-2 -12 -10.5 -20.5t-20.5 -8.5h-1q-27 0 -32 27l-76 485h-404q-26 0 -45 19t-19 45q0 123 78.5 221.5t177.5 98.5v512q-52 0 -90 38
+t-38 90t38 90t90 38h640q52 0 90 -38t38 -90t-38 -90t-90 -38v-512q99 0 177.5 -98.5t78.5 -221.5z" />
+    <glyph glyph-name="external_link" unicode="&#xf08e;" horiz-adv-x="1792" 
+d="M1408 608v-320q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h704q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v320
+q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1792 1472v-512q0 -26 -19 -45t-45 -19t-45 19l-176 176l-652 -652q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l652 652l-176 176q-19 19 -19 45t19 45t45 19h512q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="signin" unicode="&#xf090;" 
+d="M1184 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45zM1536 992v-704q0 -119 -84.5 -203.5t-203.5 -84.5h-320q-13 0 -22.5 9.5t-9.5 22.5
+q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q66 0 113 47t47 113v704q0 66 -47 113t-113 47h-288h-11h-13t-11.5 1t-11.5 3t-8 5.5t-7 9t-2 13.5q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="trophy" unicode="&#xf091;" horiz-adv-x="1664" 
+d="M458 653q-74 162 -74 371h-256v-96q0 -78 94.5 -162t235.5 -113zM1536 928v96h-256q0 -209 -74 -371q141 29 235.5 113t94.5 162zM1664 1056v-128q0 -71 -41.5 -143t-112 -130t-173 -97.5t-215.5 -44.5q-42 -54 -95 -95q-38 -34 -52.5 -72.5t-14.5 -89.5q0 -54 30.5 -91
+t97.5 -37q75 0 133.5 -45.5t58.5 -114.5v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 69 58.5 114.5t133.5 45.5q67 0 97.5 37t30.5 91q0 51 -14.5 89.5t-52.5 72.5q-53 41 -95 95q-113 5 -215.5 44.5t-173 97.5t-112 130t-41.5 143v128q0 40 28 68t68 28h288v96
+q0 66 47 113t113 47h576q66 0 113 -47t47 -113v-96h288q40 0 68 -28t28 -68z" />
+    <glyph glyph-name="github_sign" unicode="&#xf092;" 
+d="M519 336q4 6 -3 13q-9 7 -14 2q-4 -6 3 -13q9 -7 14 -2zM491 377q-5 7 -12 4q-6 -4 0 -12q7 -8 12 -5q6 4 0 13zM450 417q2 4 -5 8q-7 2 -8 -2q-3 -5 4 -8q8 -2 9 2zM471 394q2 1 1.5 4.5t-3.5 5.5q-6 7 -10 3t1 -11q6 -6 11 -2zM557 319q2 7 -9 11q-9 3 -13 -4
+q-2 -7 9 -11q9 -3 13 4zM599 316q0 8 -12 8q-10 0 -10 -8t11 -8t11 8zM638 323q-2 7 -13 5t-9 -9q2 -8 12 -6t10 10zM1280 640q0 212 -150 362t-362 150t-362 -150t-150 -362q0 -167 98 -300.5t252 -185.5q18 -3 26.5 5t8.5 20q0 52 -1 95q-6 -1 -15.5 -2.5t-35.5 -2t-48 4
+t-43.5 20t-29.5 41.5q-23 59 -57 74q-2 1 -4.5 3.5l-8 8t-7 9.5t4 7.5t19.5 3.5q6 0 15 -2t30 -15.5t33 -35.5q16 -28 37.5 -42t43.5 -14t38 3.5t30 9.5q7 47 33 69q-49 6 -86 18.5t-73 39t-55.5 76t-19.5 119.5q0 79 53 137q-24 62 5 136q19 6 54.5 -7.5t60.5 -29.5l26 -16
+q58 17 128 17t128 -17q11 7 28.5 18t55.5 26t57 9q29 -74 5 -136q53 -58 53 -137q0 -57 -14 -100.5t-35.5 -70t-53.5 -44.5t-62.5 -26t-68.5 -12q35 -31 35 -95q0 -40 -0.5 -89t-0.5 -51q0 -12 8.5 -20t26.5 -5q154 52 252 185.5t98 300.5zM1536 1120v-960
+q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="upload_alt" unicode="&#xf093;" horiz-adv-x="1664" 
+d="M1280 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 288v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h427q21 -56 70.5 -92
+t110.5 -36h256q61 0 110.5 36t70.5 92h427q40 0 68 -28t28 -68zM1339 936q-17 -40 -59 -40h-256v-448q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v448h-256q-42 0 -59 40q-17 39 14 69l448 448q18 19 45 19t45 -19l448 -448q31 -30 14 -69z" />
+    <glyph glyph-name="lemon" unicode="&#xf094;" 
+d="M1407 710q0 44 -7 113.5t-18 96.5q-12 30 -17 44t-9 36.5t-4 48.5q0 23 5 68.5t5 67.5q0 37 -10 55q-4 1 -13 1q-19 0 -58 -4.5t-59 -4.5q-60 0 -176 24t-175 24q-43 0 -94.5 -11.5t-85 -23.5t-89.5 -34q-137 -54 -202 -103q-96 -73 -159.5 -189.5t-88 -236t-24.5 -248.5
+q0 -40 12.5 -120t12.5 -121q0 -23 -11 -66.5t-11 -65.5t12 -36.5t34 -14.5q24 0 72.5 11t73.5 11q57 0 169.5 -15.5t169.5 -15.5q181 0 284 36q129 45 235.5 152.5t166 245.5t59.5 275zM1535 712q0 -165 -70 -327.5t-196 -288t-281 -180.5q-124 -44 -326 -44
+q-57 0 -170 14.5t-169 14.5q-24 0 -72.5 -14.5t-73.5 -14.5q-73 0 -123.5 55.5t-50.5 128.5q0 24 11 68t11 67q0 40 -12.5 120.5t-12.5 121.5q0 111 18 217.5t54.5 209.5t100.5 194t150 156q78 59 232 120q194 78 316 78q60 0 175.5 -24t173.5 -24q19 0 57 5t58 5
+q81 0 118 -50.5t37 -134.5q0 -23 -5 -68t-5 -68q0 -13 2 -25t3.5 -16.5t7.5 -20.5t8 -20q16 -40 25 -118.5t9 -136.5z" />
+    <glyph glyph-name="phone" unicode="&#xf095;" horiz-adv-x="1408" 
+d="M1408 296q0 -27 -10 -70.5t-21 -68.5q-21 -50 -122 -106q-94 -51 -186 -51q-27 0 -53 3.5t-57.5 12.5t-47 14.5t-55.5 20.5t-49 18q-98 35 -175 83q-127 79 -264 216t-216 264q-48 77 -83 175q-3 9 -18 49t-20.5 55.5t-14.5 47t-12.5 57.5t-3.5 53q0 92 51 186
+q56 101 106 122q25 11 68.5 21t70.5 10q14 0 21 -3q18 -6 53 -76q11 -19 30 -54t35 -63.5t31 -53.5q3 -4 17.5 -25t21.5 -35.5t7 -28.5q0 -20 -28.5 -50t-62 -55t-62 -53t-28.5 -46q0 -9 5 -22.5t8.5 -20.5t14 -24t11.5 -19q76 -137 174 -235t235 -174q2 -1 19 -11.5t24 -14
+t20.5 -8.5t22.5 -5q18 0 46 28.5t53 62t55 62t50 28.5q14 0 28.5 -7t35.5 -21.5t25 -17.5q25 -15 53.5 -31t63.5 -35t54 -30q70 -35 76 -53q3 -7 3 -21z" />
+    <glyph glyph-name="check_empty" unicode="&#xf096;" horiz-adv-x="1408" 
+d="M1120 1280h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v832q0 66 -47 113t-113 47zM1408 1120v-832q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832
+q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="bookmark_empty" unicode="&#xf097;" horiz-adv-x="1280" 
+d="M1152 1280h-1024v-1242l423 406l89 85l89 -85l423 -406v1242zM1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289
+q0 34 19.5 62t52.5 41q21 9 44 9h1048z" />
+    <glyph glyph-name="phone_sign" unicode="&#xf098;" 
+d="M1280 343q0 11 -2 16t-18 16.5t-40.5 25t-47.5 26.5t-45.5 25t-28.5 15q-5 3 -19 13t-25 15t-21 5q-15 0 -36.5 -20.5t-39.5 -45t-38.5 -45t-33.5 -20.5q-7 0 -16.5 3.5t-15.5 6.5t-17 9.5t-14 8.5q-99 55 -170 126.5t-127 170.5q-2 3 -8.5 14t-9.5 17t-6.5 15.5
+t-3.5 16.5q0 13 20.5 33.5t45 38.5t45 39.5t20.5 36.5q0 10 -5 21t-15 25t-13 19q-3 6 -15 28.5t-25 45.5t-26.5 47.5t-25 40.5t-16.5 18t-16 2q-48 0 -101 -22q-46 -21 -80 -94.5t-34 -130.5q0 -16 2.5 -34t5 -30.5t9 -33t10 -29.5t12.5 -33t11 -30q60 -164 216.5 -320.5
+t320.5 -216.5q6 -2 30 -11t33 -12.5t29.5 -10t33 -9t30.5 -5t34 -2.5q57 0 130.5 34t94.5 80q22 53 22 101zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z
+" />
+    <glyph glyph-name="twitter" unicode="&#xf099;" horiz-adv-x="1664" 
+d="M1620 1128q-67 -98 -162 -167q1 -14 1 -42q0 -130 -38 -259.5t-115.5 -248.5t-184.5 -210.5t-258 -146t-323 -54.5q-271 0 -496 145q35 -4 78 -4q225 0 401 138q-105 2 -188 64.5t-114 159.5q33 -5 61 -5q43 0 85 11q-112 23 -185.5 111.5t-73.5 205.5v4q68 -38 146 -41
+q-66 44 -105 115t-39 154q0 88 44 163q121 -149 294.5 -238.5t371.5 -99.5q-8 38 -8 74q0 134 94.5 228.5t228.5 94.5q140 0 236 -102q109 21 205 78q-37 -115 -142 -178q93 10 186 50z" />
+    <glyph glyph-name="facebook" unicode="&#xf09a;" horiz-adv-x="1024" 
+d="M959 1524v-264h-157q-86 0 -116 -36t-30 -108v-189h293l-39 -296h-254v-759h-306v759h-255v296h255v218q0 186 104 288.5t277 102.5q147 0 228 -12z" />
+    <glyph glyph-name="github" unicode="&#xf09b;" 
+d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5q0 -251 -146.5 -451.5t-378.5 -277.5q-27 -5 -40 7t-13 30q0 3 0.5 76.5t0.5 134.5q0 97 -52 142q57 6 102.5 18t94 39t81 66.5t53 105t20.5 150.5q0 119 -79 206q37 91 -8 204q-28 9 -81 -11t-92 -44l-38 -24
+q-93 26 -192 26t-192 -26q-16 11 -42.5 27t-83.5 38.5t-85 13.5q-45 -113 -8 -204q-79 -87 -79 -206q0 -85 20.5 -150t52.5 -105t80.5 -67t94 -39t102.5 -18q-39 -36 -49 -103q-21 -10 -45 -15t-57 -5t-65.5 21.5t-55.5 62.5q-19 32 -48.5 52t-49.5 24l-20 3q-21 0 -29 -4.5
+t-5 -11.5t9 -14t13 -12l7 -5q22 -10 43.5 -38t31.5 -51l10 -23q13 -38 44 -61.5t67 -30t69.5 -7t55.5 3.5l23 4q0 -38 0.5 -88.5t0.5 -54.5q0 -18 -13 -30t-40 -7q-232 77 -378.5 277.5t-146.5 451.5q0 209 103 385.5t279.5 279.5t385.5 103zM291 305q3 7 -7 12
+q-10 3 -13 -2q-3 -7 7 -12q9 -6 13 2zM322 271q7 5 -2 16q-10 9 -16 3q-7 -5 2 -16q10 -10 16 -3zM352 226q9 7 0 19q-8 13 -17 6q-9 -5 0 -18t17 -7zM394 184q8 8 -4 19q-12 12 -20 3q-9 -8 4 -19q12 -12 20 -3zM451 159q3 11 -13 16q-15 4 -19 -7t13 -15q15 -6 19 6z
+M514 154q0 13 -17 11q-16 0 -16 -11q0 -13 17 -11q16 0 16 11zM572 164q-2 11 -18 9q-16 -3 -14 -15t18 -8t14 14z" />
+    <glyph glyph-name="unlock" unicode="&#xf09c;" horiz-adv-x="1664" 
+d="M1664 960v-256q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45v256q0 106 -75 181t-181 75t-181 -75t-75 -181v-192h96q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h672v192q0 185 131.5 316.5t316.5 131.5
+t316.5 -131.5t131.5 -316.5z" />
+    <glyph glyph-name="credit_card" unicode="&#xf09d;" horiz-adv-x="1920" 
+d="M1760 1408q66 0 113 -47t47 -113v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600zM160 1280q-13 0 -22.5 -9.5t-9.5 -22.5v-224h1664v224q0 13 -9.5 22.5t-22.5 9.5h-1600zM1760 0q13 0 22.5 9.5t9.5 22.5v608h-1664v-608
+q0 -13 9.5 -22.5t22.5 -9.5h1600zM256 128v128h256v-128h-256zM640 128v128h384v-128h-384z" />
+    <glyph glyph-name="rss" unicode="&#xf09e;" horiz-adv-x="1408" 
+d="M384 192q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 69q2 -28 -17 -48q-18 -21 -47 -21h-135q-25 0 -43 16.5t-20 41.5q-22 229 -184.5 391.5t-391.5 184.5q-25 2 -41.5 20t-16.5 43v135q0 29 21 47q17 17 43 17h5q160 -13 306 -80.5
+t259 -181.5q114 -113 181.5 -259t80.5 -306zM1408 67q2 -27 -18 -47q-18 -20 -46 -20h-143q-26 0 -44.5 17.5t-19.5 42.5q-12 215 -101 408.5t-231.5 336t-336 231.5t-408.5 102q-25 1 -42.5 19.5t-17.5 43.5v143q0 28 20 46q18 18 44 18h3q262 -13 501.5 -120t425.5 -294
+q187 -186 294 -425.5t120 -501.5z" />
+    <glyph glyph-name="hdd" unicode="&#xf0a0;" 
+d="M1040 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1296 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1408 160v320q0 13 -9.5 22.5t-22.5 9.5
+h-1216q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h1216q13 0 22.5 9.5t9.5 22.5zM178 640h1180l-157 482q-4 13 -16 21.5t-26 8.5h-782q-14 0 -26 -8.5t-16 -21.5zM1536 480v-320q0 -66 -47 -113t-113 -47h-1216q-66 0 -113 47t-47 113v320q0 25 16 75
+l197 606q17 53 63 86t101 33h782q55 0 101 -33t63 -86l197 -606q16 -50 16 -75z" />
+    <glyph glyph-name="bullhorn" unicode="&#xf0a1;" horiz-adv-x="1792" 
+d="M1664 896q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5v-384q0 -52 -38 -90t-90 -38q-417 347 -812 380q-58 -19 -91 -66t-31 -100.5t40 -92.5q-20 -33 -23 -65.5t6 -58t33.5 -55t48 -50t61.5 -50.5q-29 -58 -111.5 -83t-168.5 -11.5t-132 55.5q-7 23 -29.5 87.5
+t-32 94.5t-23 89t-15 101t3.5 98.5t22 110.5h-122q-66 0 -113 47t-47 113v192q0 66 47 113t113 47h480q435 0 896 384q52 0 90 -38t38 -90v-384zM1536 292v954q-394 -302 -768 -343v-270q377 -42 768 -341z" />
+    <glyph glyph-name="bell" unicode="&#xf0a2;" horiz-adv-x="1792" 
+d="M912 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM246 128h1300q-266 300 -266 832q0 51 -24 105t-69 103t-121.5 80.5t-169.5 31.5t-169.5 -31.5t-121.5 -80.5t-69 -103t-24 -105q0 -532 -266 -832z
+M1728 128q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q50 42 91 88t85 119.5t74.5 158.5t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q190 -28 307 -158.5
+t117 -282.5q0 -139 19.5 -260t50 -206t74.5 -158.5t85 -119.5t91 -88z" />
+    <glyph glyph-name="certificate" unicode="&#xf0a3;" 
+d="M1376 640l138 -135q30 -28 20 -70q-12 -41 -52 -51l-188 -48l53 -186q12 -41 -19 -70q-29 -31 -70 -19l-186 53l-48 -188q-10 -40 -51 -52q-12 -2 -19 -2q-31 0 -51 22l-135 138l-135 -138q-28 -30 -70 -20q-41 11 -51 52l-48 188l-186 -53q-41 -12 -70 19q-31 29 -19 70
+l53 186l-188 48q-40 10 -52 51q-10 42 20 70l138 135l-138 135q-30 28 -20 70q12 41 52 51l188 48l-53 186q-12 41 19 70q29 31 70 19l186 -53l48 188q10 41 51 51q41 12 70 -19l135 -139l135 139q29 30 70 19q41 -10 51 -51l48 -188l186 53q41 12 70 -19q31 -29 19 -70
+l-53 -186l188 -48q40 -10 52 -51q10 -42 -20 -70z" />
+    <glyph glyph-name="hand_right" unicode="&#xf0a4;" horiz-adv-x="1792" 
+d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 768q0 51 -39 89.5t-89 38.5h-576q0 20 15 48.5t33 55t33 68t15 84.5q0 67 -44.5 97.5t-115.5 30.5q-24 0 -90 -139q-24 -44 -37 -65q-40 -64 -112 -145q-71 -81 -101 -106
+q-69 -57 -140 -57h-32v-640h32q72 0 167 -32t193.5 -64t179.5 -32q189 0 189 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 47.5h331q52 0 90 38t38 90zM1792 769q0 -105 -75.5 -181t-180.5 -76h-169q-4 -62 -37 -119q3 -21 3 -43
+q0 -101 -60 -178q1 -139 -85 -219.5t-227 -80.5q-133 0 -322 69q-164 59 -223 59h-288q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5h288q10 0 21.5 4.5t23.5 14t22.5 18t24 22.5t20.5 21.5t19 21.5t14 17q65 74 100 129q13 21 33 62t37 72t40.5 63t55 49.5
+t69.5 17.5q125 0 206.5 -67t81.5 -189q0 -68 -22 -128h374q104 0 180 -76t76 -179z" />
+    <glyph glyph-name="hand_left" unicode="&#xf0a5;" horiz-adv-x="1792" 
+d="M1376 128h32v640h-32q-35 0 -67.5 12t-62.5 37t-50 46t-49 54q-8 9 -12 14q-72 81 -112 145q-14 22 -38 68q-1 3 -10.5 22.5t-18.5 36t-20 35.5t-21.5 30.5t-18.5 11.5q-71 0 -115.5 -30.5t-44.5 -97.5q0 -43 15 -84.5t33 -68t33 -55t15 -48.5h-576q-50 0 -89 -38.5
+t-39 -89.5q0 -52 38 -90t90 -38h331q-15 -17 -25 -47.5t-10 -55.5q0 -69 53 -119q-18 -32 -18 -69t17.5 -73.5t47.5 -52.5q-4 -24 -4 -56q0 -85 48.5 -126t135.5 -41q84 0 183 32t194 64t167 32zM1664 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45z
+M1792 768v-640q0 -53 -37.5 -90.5t-90.5 -37.5h-288q-59 0 -223 -59q-190 -69 -317 -69q-142 0 -230 77.5t-87 217.5l1 5q-61 76 -61 178q0 22 3 43q-33 57 -37 119h-169q-105 0 -180.5 76t-75.5 181q0 103 76 179t180 76h374q-22 60 -22 128q0 122 81.5 189t206.5 67
+q38 0 69.5 -17.5t55 -49.5t40.5 -63t37 -72t33 -62q35 -55 100 -129q2 -3 14 -17t19 -21.5t20.5 -21.5t24 -22.5t22.5 -18t23.5 -14t21.5 -4.5h288q53 0 90.5 -37.5t37.5 -90.5z" />
+    <glyph glyph-name="hand_up" unicode="&#xf0a6;" 
+d="M1280 -64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 700q0 189 -167 189q-26 0 -56 -5q-16 30 -52.5 47.5t-73.5 17.5t-69 -18q-50 53 -119 53q-25 0 -55.5 -10t-47.5 -25v331q0 52 -38 90t-90 38q-51 0 -89.5 -39t-38.5 -89v-576
+q-20 0 -48.5 15t-55 33t-68 33t-84.5 15q-67 0 -97.5 -44.5t-30.5 -115.5q0 -24 139 -90q44 -24 65 -37q64 -40 145 -112q81 -71 106 -101q57 -69 57 -140v-32h640v32q0 72 32 167t64 193.5t32 179.5zM1536 705q0 -133 -69 -322q-59 -164 -59 -223v-288q0 -53 -37.5 -90.5
+t-90.5 -37.5h-640q-53 0 -90.5 37.5t-37.5 90.5v288q0 10 -4.5 21.5t-14 23.5t-18 22.5t-22.5 24t-21.5 20.5t-21.5 19t-17 14q-74 65 -129 100q-21 13 -62 33t-72 37t-63 40.5t-49.5 55t-17.5 69.5q0 125 67 206.5t189 81.5q68 0 128 -22v374q0 104 76 180t179 76
+q105 0 181 -75.5t76 -180.5v-169q62 -4 119 -37q21 3 43 3q101 0 178 -60q139 1 219.5 -85t80.5 -227z" />
+    <glyph glyph-name="hand_down" unicode="&#xf0a7;" 
+d="M1408 576q0 84 -32 183t-64 194t-32 167v32h-640v-32q0 -35 -12 -67.5t-37 -62.5t-46 -50t-54 -49q-9 -8 -14 -12q-81 -72 -145 -112q-22 -14 -68 -38q-3 -1 -22.5 -10.5t-36 -18.5t-35.5 -20t-30.5 -21.5t-11.5 -18.5q0 -71 30.5 -115.5t97.5 -44.5q43 0 84.5 15t68 33
+t55 33t48.5 15v-576q0 -50 38.5 -89t89.5 -39q52 0 90 38t38 90v331q46 -35 103 -35q69 0 119 53q32 -18 69 -18t73.5 17.5t52.5 47.5q24 -4 56 -4q85 0 126 48.5t41 135.5zM1280 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 580
+q0 -142 -77.5 -230t-217.5 -87l-5 1q-76 -61 -178 -61q-22 0 -43 3q-54 -30 -119 -37v-169q0 -105 -76 -180.5t-181 -75.5q-103 0 -179 76t-76 180v374q-54 -22 -128 -22q-121 0 -188.5 81.5t-67.5 206.5q0 38 17.5 69.5t49.5 55t63 40.5t72 37t62 33q55 35 129 100
+q3 2 17 14t21.5 19t21.5 20.5t22.5 24t18 22.5t14 23.5t4.5 21.5v288q0 53 37.5 90.5t90.5 37.5h640q53 0 90.5 -37.5t37.5 -90.5v-288q0 -59 59 -223q69 -190 69 -317z" />
+    <glyph glyph-name="circle_arrow_left" unicode="&#xf0a8;" 
+d="M1280 576v128q0 26 -19 45t-45 19h-502l189 189q19 19 19 45t-19 45l-91 91q-18 18 -45 18t-45 -18l-362 -362l-91 -91q-18 -18 -18 -45t18 -45l91 -91l362 -362q18 -18 45 -18t45 18l91 91q18 18 18 45t-18 45l-189 189h502q26 0 45 19t19 45zM1536 640
+q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="circle_arrow_right" unicode="&#xf0a9;" 
+d="M1285 640q0 27 -18 45l-91 91l-362 362q-18 18 -45 18t-45 -18l-91 -91q-18 -18 -18 -45t18 -45l189 -189h-502q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h502l-189 -189q-19 -19 -19 -45t19 -45l91 -91q18 -18 45 -18t45 18l362 362l91 91q18 18 18 45zM1536 640
+q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="circle_arrow_up" unicode="&#xf0aa;" 
+d="M1284 641q0 27 -18 45l-362 362l-91 91q-18 18 -45 18t-45 -18l-91 -91l-362 -362q-18 -18 -18 -45t18 -45l91 -91q18 -18 45 -18t45 18l189 189v-502q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v502l189 -189q19 -19 45 -19t45 19l91 91q18 18 18 45zM1536 640
+q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="circle_arrow_down" unicode="&#xf0ab;" 
+d="M1284 639q0 27 -18 45l-91 91q-18 18 -45 18t-45 -18l-189 -189v502q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-502l-189 189q-19 19 -45 19t-45 -19l-91 -91q-18 -18 -18 -45t18 -45l362 -362l91 -91q18 -18 45 -18t45 18l91 91l362 362q18 18 18 45zM1536 640
+q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="globe" unicode="&#xf0ac;" 
+d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1042 887q-2 -1 -9.5 -9.5t-13.5 -9.5q2 0 4.5 5t5 11t3.5 7q6 7 22 15q14 6 52 12q34 8 51 -11
+q-2 2 9.5 13t14.5 12q3 2 15 4.5t15 7.5l2 22q-12 -1 -17.5 7t-6.5 21q0 -2 -6 -8q0 7 -4.5 8t-11.5 -1t-9 -1q-10 3 -15 7.5t-8 16.5t-4 15q-2 5 -9.5 11t-9.5 10q-1 2 -2.5 5.5t-3 6.5t-4 5.5t-5.5 2.5t-7 -5t-7.5 -10t-4.5 -5q-3 2 -6 1.5t-4.5 -1t-4.5 -3t-5 -3.5
+q-3 -2 -8.5 -3t-8.5 -2q15 5 -1 11q-10 4 -16 3q9 4 7.5 12t-8.5 14h5q-1 4 -8.5 8.5t-17.5 8.5t-13 6q-8 5 -34 9.5t-33 0.5q-5 -6 -4.5 -10.5t4 -14t3.5 -12.5q1 -6 -5.5 -13t-6.5 -12q0 -7 14 -15.5t10 -21.5q-3 -8 -16 -16t-16 -12q-5 -8 -1.5 -18.5t10.5 -16.5
+q2 -2 1.5 -4t-3.5 -4.5t-5.5 -4t-6.5 -3.5l-3 -2q-11 -5 -20.5 6t-13.5 26q-7 25 -16 30q-23 8 -29 -1q-5 13 -41 26q-25 9 -58 4q6 1 0 15q-7 15 -19 12q3 6 4 17.5t1 13.5q3 13 12 23q1 1 7 8.5t9.5 13.5t0.5 6q35 -4 50 11q5 5 11.5 17t10.5 17q9 6 14 5.5t14.5 -5.5
+t14.5 -5q14 -1 15.5 11t-7.5 20q12 -1 3 17q-4 7 -8 9q-12 4 -27 -5q-8 -4 2 -8q-1 1 -9.5 -10.5t-16.5 -17.5t-16 5q-1 1 -5.5 13.5t-9.5 13.5q-8 0 -16 -15q3 8 -11 15t-24 8q19 12 -8 27q-7 4 -20.5 5t-19.5 -4q-5 -7 -5.5 -11.5t5 -8t10.5 -5.5t11.5 -4t8.5 -3
+q14 -10 8 -14q-2 -1 -8.5 -3.5t-11.5 -4.5t-6 -4q-3 -4 0 -14t-2 -14q-5 5 -9 17.5t-7 16.5q7 -9 -25 -6l-10 1q-4 0 -16 -2t-20.5 -1t-13.5 8q-4 8 0 20q1 4 4 2q-4 3 -11 9.5t-10 8.5q-46 -15 -94 -41q6 -1 12 1q5 2 13 6.5t10 5.5q34 14 42 7l5 5q14 -16 20 -25
+q-7 4 -30 1q-20 -6 -22 -12q7 -12 5 -18q-4 3 -11.5 10t-14.5 11t-15 5q-16 0 -22 -1q-146 -80 -235 -222q7 -7 12 -8q4 -1 5 -9t2.5 -11t11.5 3q9 -8 3 -19q1 1 44 -27q19 -17 21 -21q3 -11 -10 -18q-1 2 -9 9t-9 4q-3 -5 0.5 -18.5t10.5 -12.5q-7 0 -9.5 -16t-2.5 -35.5
+t-1 -23.5l2 -1q-3 -12 5.5 -34.5t21.5 -19.5q-13 -3 20 -43q6 -8 8 -9q3 -2 12 -7.5t15 -10t10 -10.5q4 -5 10 -22.5t14 -23.5q-2 -6 9.5 -20t10.5 -23q-1 0 -2.5 -1t-2.5 -1q3 -7 15.5 -14t15.5 -13q1 -3 2 -10t3 -11t8 -2q2 20 -24 62q-15 25 -17 29q-3 5 -5.5 15.5
+t-4.5 14.5q2 0 6 -1.5t8.5 -3.5t7.5 -4t2 -3q-3 -7 2 -17.5t12 -18.5t17 -19t12 -13q6 -6 14 -19.5t0 -13.5q9 0 20 -10.5t17 -19.5q5 -8 8 -26t5 -24q2 -7 8.5 -13.5t12.5 -9.5l16 -8t13 -7q5 -2 18.5 -10.5t21.5 -11.5q10 -4 16 -4t14.5 2.5t13.5 3.5q15 2 29 -15t21 -21
+q36 -19 55 -11q-2 -1 0.5 -7.5t8 -15.5t9 -14.5t5.5 -8.5q5 -6 18 -15t18 -15q6 4 7 9q-3 -8 7 -20t18 -10q14 3 14 32q-31 -15 -49 18q0 1 -2.5 5.5t-4 8.5t-2.5 8.5t0 7.5t5 3q9 0 10 3.5t-2 12.5t-4 13q-1 8 -11 20t-12 15q-5 -9 -16 -8t-16 9q0 -1 -1.5 -5.5t-1.5 -6.5
+q-13 0 -15 1q1 3 2.5 17.5t3.5 22.5q1 4 5.5 12t7.5 14.5t4 12.5t-4.5 9.5t-17.5 2.5q-19 -1 -26 -20q-1 -3 -3 -10.5t-5 -11.5t-9 -7q-7 -3 -24 -2t-24 5q-13 8 -22.5 29t-9.5 37q0 10 2.5 26.5t3 25t-5.5 24.5q3 2 9 9.5t10 10.5q2 1 4.5 1.5t4.5 0t4 1.5t3 6q-1 1 -4 3
+q-3 3 -4 3q7 -3 28.5 1.5t27.5 -1.5q15 -11 22 2q0 1 -2.5 9.5t-0.5 13.5q5 -27 29 -9q3 -3 15.5 -5t17.5 -5q3 -2 7 -5.5t5.5 -4.5t5 0.5t8.5 6.5q10 -14 12 -24q11 -40 19 -44q7 -3 11 -2t4.5 9.5t0 14t-1.5 12.5l-1 8v18l-1 8q-15 3 -18.5 12t1.5 18.5t15 18.5q1 1 8 3.5
+t15.5 6.5t12.5 8q21 19 15 35q7 0 11 9q-1 0 -5 3t-7.5 5t-4.5 2q9 5 2 16q5 3 7.5 11t7.5 10q9 -12 21 -2q8 8 1 16q5 7 20.5 10.5t18.5 9.5q7 -2 8 2t1 12t3 12q4 5 15 9t13 5l17 11q3 4 0 4q18 -2 31 11q10 11 -6 20q3 6 -3 9.5t-15 5.5q3 1 11.5 0.5t10.5 1.5
+q15 10 -7 16q-17 5 -43 -12zM879 10q206 36 351 189q-3 3 -12.5 4.5t-12.5 3.5q-18 7 -24 8q1 7 -2.5 13t-8 9t-12.5 8t-11 7q-2 2 -7 6t-7 5.5t-7.5 4.5t-8.5 2t-10 -1l-3 -1q-3 -1 -5.5 -2.5t-5.5 -3t-4 -3t0 -2.5q-21 17 -36 22q-5 1 -11 5.5t-10.5 7t-10 1.5t-11.5 -7
+q-5 -5 -6 -15t-2 -13q-7 5 0 17.5t2 18.5q-3 6 -10.5 4.5t-12 -4.5t-11.5 -8.5t-9 -6.5t-8.5 -5.5t-8.5 -7.5q-3 -4 -6 -12t-5 -11q-2 4 -11.5 6.5t-9.5 5.5q2 -10 4 -35t5 -38q7 -31 -12 -48q-27 -25 -29 -40q-4 -22 12 -26q0 -7 -8 -20.5t-7 -21.5q0 -6 2 -16z" />
+    <glyph glyph-name="wrench" unicode="&#xf0ad;" horiz-adv-x="1664" 
+d="M384 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1028 484l-682 -682q-37 -37 -90 -37q-52 0 -91 37l-106 108q-38 36 -38 90q0 53 38 91l681 681q39 -98 114.5 -173.5t173.5 -114.5zM1662 919q0 -39 -23 -106q-47 -134 -164.5 -217.5
+t-258.5 -83.5q-185 0 -316.5 131.5t-131.5 316.5t131.5 316.5t316.5 131.5q58 0 121.5 -16.5t107.5 -46.5q16 -11 16 -28t-16 -28l-293 -169v-224l193 -107q5 3 79 48.5t135.5 81t70.5 35.5q15 0 23.5 -10t8.5 -25z" />
+    <glyph glyph-name="tasks" unicode="&#xf0ae;" horiz-adv-x="1792" 
+d="M1024 128h640v128h-640v-128zM640 640h1024v128h-1024v-128zM1280 1152h384v128h-384v-128zM1792 320v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 832v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19
+t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="filter" unicode="&#xf0b0;" horiz-adv-x="1408" 
+d="M1403 1241q17 -41 -14 -70l-493 -493v-742q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-256 256q-19 19 -19 45v486l-493 493q-31 29 -14 70q17 39 59 39h1280q42 0 59 -39z" />
+    <glyph glyph-name="briefcase" unicode="&#xf0b1;" horiz-adv-x="1792" 
+d="M640 1280h512v128h-512v-128zM1792 640v-480q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v480h672v-160q0 -26 19 -45t45 -19h320q26 0 45 19t19 45v160h672zM1024 640v-128h-256v128h256zM1792 1120v-384h-1792v384q0 66 47 113t113 47h352v160q0 40 28 68
+t68 28h576q40 0 68 -28t28 -68v-160h352q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="fullscreen" unicode="&#xf0b2;" 
+d="M1283 995l-355 -355l355 -355l144 144q29 31 70 14q39 -17 39 -59v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l144 144l-355 355l-355 -355l144 -144q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l144 -144
+l355 355l-355 355l-144 -144q-19 -19 -45 -19q-12 0 -24 5q-40 17 -40 59v448q0 26 19 45t45 19h448q42 0 59 -40q17 -39 -14 -69l-144 -144l355 -355l355 355l-144 144q-31 30 -14 69q17 40 59 40h448q26 0 45 -19t19 -45v-448q0 -42 -39 -59q-13 -5 -25 -5q-26 0 -45 19z
+" />
+    <glyph glyph-name="group" unicode="&#xf0c0;" horiz-adv-x="1920" 
+d="M593 640q-162 -5 -265 -128h-134q-82 0 -138 40.5t-56 118.5q0 353 124 353q6 0 43.5 -21t97.5 -42.5t119 -21.5q67 0 133 23q-5 -37 -5 -66q0 -139 81 -256zM1664 3q0 -120 -73 -189.5t-194 -69.5h-874q-121 0 -194 69.5t-73 189.5q0 53 3.5 103.5t14 109t26.5 108.5
+t43 97.5t62 81t85.5 53.5t111.5 20q10 0 43 -21.5t73 -48t107 -48t135 -21.5t135 21.5t107 48t73 48t43 21.5q61 0 111.5 -20t85.5 -53.5t62 -81t43 -97.5t26.5 -108.5t14 -109t3.5 -103.5zM640 1280q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75
+t75 -181zM1344 896q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5zM1920 671q0 -78 -56 -118.5t-138 -40.5h-134q-103 123 -265 128q81 117 81 256q0 29 -5 66q66 -23 133 -23q59 0 119 21.5t97.5 42.5
+t43.5 21q124 0 124 -353zM1792 1280q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181z" />
+    <glyph glyph-name="link" unicode="&#xf0c1;" horiz-adv-x="1664" 
+d="M1456 320q0 40 -28 68l-208 208q-28 28 -68 28q-42 0 -72 -32q3 -3 19 -18.5t21.5 -21.5t15 -19t13 -25.5t3.5 -27.5q0 -40 -28 -68t-68 -28q-15 0 -27.5 3.5t-25.5 13t-19 15t-21.5 21.5t-18.5 19q-33 -31 -33 -73q0 -40 28 -68l206 -207q27 -27 68 -27q40 0 68 26
+l147 146q28 28 28 67zM753 1025q0 40 -28 68l-206 207q-28 28 -68 28q-39 0 -68 -27l-147 -146q-28 -28 -28 -67q0 -40 28 -68l208 -208q27 -27 68 -27q42 0 72 31q-3 3 -19 18.5t-21.5 21.5t-15 19t-13 25.5t-3.5 27.5q0 40 28 68t68 28q15 0 27.5 -3.5t25.5 -13t19 -15
+t21.5 -21.5t18.5 -19q33 31 33 73zM1648 320q0 -120 -85 -203l-147 -146q-83 -83 -203 -83q-121 0 -204 85l-206 207q-83 83 -83 203q0 123 88 209l-88 88q-86 -88 -208 -88q-120 0 -204 84l-208 208q-84 84 -84 204t85 203l147 146q83 83 203 83q121 0 204 -85l206 -207
+q83 -83 83 -203q0 -123 -88 -209l88 -88q86 88 208 88q120 0 204 -84l208 -208q84 -84 84 -204z" />
+    <glyph glyph-name="cloud" unicode="&#xf0c2;" horiz-adv-x="1920" 
+d="M1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088q-185 0 -316.5 131.5t-131.5 316.5q0 132 71 241.5t187 163.5q-2 28 -2 43q0 212 150 362t362 150q158 0 286.5 -88t187.5 -230q70 62 166 62q106 0 181 -75t75 -181q0 -75 -41 -138q129 -30 213 -134.5t84 -239.5z
+" />
+    <glyph glyph-name="beaker" unicode="&#xf0c3;" horiz-adv-x="1664" 
+d="M1527 88q56 -89 21.5 -152.5t-140.5 -63.5h-1152q-106 0 -140.5 63.5t21.5 152.5l503 793v399h-64q-26 0 -45 19t-19 45t19 45t45 19h512q26 0 45 -19t19 -45t-19 -45t-45 -19h-64v-399zM748 813l-272 -429h712l-272 429l-20 31v37v399h-128v-399v-37z" />
+    <glyph glyph-name="cut" unicode="&#xf0c4;" horiz-adv-x="1792" 
+d="M960 640q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1260 576l507 -398q28 -20 25 -56q-5 -35 -35 -51l-128 -64q-13 -7 -29 -7q-17 0 -31 8l-690 387l-110 -66q-8 -4 -12 -5q14 -49 10 -97q-7 -77 -56 -147.5t-132 -123.5q-132 -84 -277 -84
+q-136 0 -222 78q-90 84 -79 207q7 76 56 147t131 124q132 84 278 84q83 0 151 -31q9 13 22 22l122 73l-122 73q-13 9 -22 22q-68 -31 -151 -31q-146 0 -278 84q-82 53 -131 124t-56 147q-5 59 15.5 113t63.5 93q85 79 222 79q145 0 277 -84q83 -52 132 -123t56 -148
+q4 -48 -10 -97q4 -1 12 -5l110 -66l690 387q14 8 31 8q16 0 29 -7l128 -64q30 -16 35 -51q3 -36 -25 -56zM579 836q46 42 21 108t-106 117q-92 59 -192 59q-74 0 -113 -36q-46 -42 -21 -108t106 -117q92 -59 192 -59q74 0 113 36zM494 91q81 51 106 117t-21 108
+q-39 36 -113 36q-100 0 -192 -59q-81 -51 -106 -117t21 -108q39 -36 113 -36q100 0 192 59zM672 704l96 -58v11q0 36 33 56l14 8l-79 47l-26 -26q-3 -3 -10 -11t-12 -12q-2 -2 -4 -3.5t-3 -2.5zM896 480l96 -32l736 576l-128 64l-768 -431v-113l-160 -96l9 -8q2 -2 7 -6
+q4 -4 11 -12t11 -12l26 -26zM1600 64l128 64l-520 408l-177 -138q-2 -3 -13 -7z" />
+    <glyph glyph-name="copy" unicode="&#xf0c5;" horiz-adv-x="1792" 
+d="M1696 1152q40 0 68 -28t28 -68v-1216q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v288h-544q-40 0 -68 28t-28 68v672q0 40 20 88t48 76l408 408q28 28 76 48t88 20h416q40 0 68 -28t28 -68v-328q68 40 128 40h416zM1152 939l-299 -299h299v299zM512 1323l-299 -299
+h299v299zM708 676l316 316v416h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h512v256q0 40 20 88t48 76zM1664 -128v1152h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h896z" />
+    <glyph glyph-name="paper_clip" unicode="&#xf0c6;" horiz-adv-x="1408" 
+d="M1404 151q0 -117 -79 -196t-196 -79q-135 0 -235 100l-777 776q-113 115 -113 271q0 159 110 270t269 111q158 0 273 -113l605 -606q10 -10 10 -22q0 -16 -30.5 -46.5t-46.5 -30.5q-13 0 -23 10l-606 607q-79 77 -181 77q-106 0 -179 -75t-73 -181q0 -105 76 -181
+l776 -777q63 -63 145 -63q64 0 106 42t42 106q0 82 -63 145l-581 581q-26 24 -60 24q-29 0 -48 -19t-19 -48q0 -32 25 -59l410 -410q10 -10 10 -22q0 -16 -31 -47t-47 -31q-12 0 -22 10l-410 410q-63 61 -63 149q0 82 57 139t139 57q88 0 149 -63l581 -581q100 -98 100 -235
+z" />
+    <glyph glyph-name="save" unicode="&#xf0c7;" 
+d="M384 0h768v384h-768v-384zM1280 0h128v896q0 14 -10 38.5t-20 34.5l-281 281q-10 10 -34 20t-39 10v-416q0 -40 -28 -68t-68 -28h-576q-40 0 -68 28t-28 68v416h-128v-1280h128v416q0 40 28 68t68 28h832q40 0 68 -28t28 -68v-416zM896 928v320q0 13 -9.5 22.5t-22.5 9.5
+h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5zM1536 896v-928q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h928q40 0 88 -20t76 -48l280 -280q28 -28 48 -76t20 -88z" />
+    <glyph glyph-name="sign_blank" unicode="&#xf0c8;" 
+d="M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="reorder" unicode="&#xf0c9;" 
+d="M1536 192v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 704v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 1216v-128q0 -26 -19 -45
+t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="ul" unicode="&#xf0ca;" horiz-adv-x="1792" 
+d="M384 128q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM384 640q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5
+t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5zM384 1152q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1792 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z
+M1792 1248v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z" />
+    <glyph glyph-name="ol" unicode="&#xf0cb;" horiz-adv-x="1792" 
+d="M381 -84q0 -80 -54.5 -126t-135.5 -46q-106 0 -172 66l57 88q49 -45 106 -45q29 0 50.5 14.5t21.5 42.5q0 64 -105 56l-26 56q8 10 32.5 43.5t42.5 54t37 38.5v1q-16 0 -48.5 -1t-48.5 -1v-53h-106v152h333v-88l-95 -115q51 -12 81 -49t30 -88zM383 543v-159h-362
+q-6 36 -6 54q0 51 23.5 93t56.5 68t66 47.5t56.5 43.5t23.5 45q0 25 -14.5 38.5t-39.5 13.5q-46 0 -81 -58l-85 59q24 51 71.5 79.5t105.5 28.5q73 0 123 -41.5t50 -112.5q0 -50 -34 -91.5t-75 -64.5t-75.5 -50.5t-35.5 -52.5h127v60h105zM1792 224v-192q0 -13 -9.5 -22.5
+t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 14 9 23t23 9h1216q13 0 22.5 -9.5t9.5 -22.5zM384 1123v-99h-335v99h107q0 41 0.5 121.5t0.5 121.5v12h-2q-8 -17 -50 -54l-71 76l136 127h106v-404h108zM1792 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216
+q-13 0 -22.5 9.5t-9.5 22.5v192q0 14 9 23t23 9h1216q13 0 22.5 -9.5t9.5 -22.5zM1792 1248v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z" />
+    <glyph glyph-name="strikethrough" unicode="&#xf0cc;" horiz-adv-x="1792" 
+d="M1760 640q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1728q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h1728zM483 704q-28 35 -51 80q-48 98 -48 188q0 181 134 309q133 127 393 127q50 0 167 -19q66 -12 177 -48q10 -38 21 -118q14 -123 14 -183q0 -18 -5 -45l-12 -3l-84 6
+l-14 2q-50 149 -103 205q-88 91 -210 91q-114 0 -182 -59q-67 -58 -67 -146q0 -73 66 -140t279 -129q69 -20 173 -66q58 -28 95 -52h-743zM990 448h411q7 -39 7 -92q0 -111 -41 -212q-23 -56 -71 -104q-37 -35 -109 -81q-80 -48 -153 -66q-80 -21 -203 -21q-114 0 -195 23
+l-140 40q-57 16 -72 28q-8 8 -8 22v13q0 108 -2 156q-1 30 0 68l2 37v44l102 2q15 -34 30 -71t22.5 -56t12.5 -27q35 -57 80 -94q43 -36 105 -57q59 -22 132 -22q64 0 139 27q77 26 122 86q47 61 47 129q0 84 -81 157q-34 29 -137 71z" />
+    <glyph glyph-name="underline" unicode="&#xf0cd;" 
+d="M48 1313q-37 2 -45 4l-3 88q13 1 40 1q60 0 112 -4q132 -7 166 -7q86 0 168 3q116 4 146 5q56 0 86 2l-1 -14l2 -64v-9q-60 -9 -124 -9q-60 0 -79 -25q-13 -14 -13 -132q0 -13 0.5 -32.5t0.5 -25.5l1 -229l14 -280q6 -124 51 -202q35 -59 96 -92q88 -47 177 -47
+q104 0 191 28q56 18 99 51q48 36 65 64q36 56 53 114q21 73 21 229q0 79 -3.5 128t-11 122.5t-13.5 159.5l-4 59q-5 67 -24 88q-34 35 -77 34l-100 -2l-14 3l2 86h84l205 -10q76 -3 196 10l18 -2q6 -38 6 -51q0 -7 -4 -31q-45 -12 -84 -13q-73 -11 -79 -17q-15 -15 -15 -41
+q0 -7 1.5 -27t1.5 -31q8 -19 22 -396q6 -195 -15 -304q-15 -76 -41 -122q-38 -65 -112 -123q-75 -57 -182 -89q-109 -33 -255 -33q-167 0 -284 46q-119 47 -179 122q-61 76 -83 195q-16 80 -16 237v333q0 188 -17 213q-25 36 -147 39zM1536 -96v64q0 14 -9 23t-23 9h-1472
+q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h1472q14 0 23 9t9 23z" />
+    <glyph glyph-name="table" unicode="&#xf0ce;" horiz-adv-x="1664" 
+d="M512 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM512 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23
+v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM512 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 160v192
+q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192
+q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1664 1248v-1088q0 -66 -47 -113t-113 -47h-1344q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1344q66 0 113 -47t47 -113
+z" />
+    <glyph glyph-name="magic" unicode="&#xf0d0;" horiz-adv-x="1664" 
+d="M1190 955l293 293l-107 107l-293 -293zM1637 1248q0 -27 -18 -45l-1286 -1286q-18 -18 -45 -18t-45 18l-198 198q-18 18 -18 45t18 45l1286 1286q18 18 45 18t45 -18l198 -198q18 -18 18 -45zM286 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM636 1276
+l196 -60l-196 -60l-60 -196l-60 196l-196 60l196 60l60 196zM1566 798l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM926 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98z" />
+    <glyph glyph-name="truck" unicode="&#xf0d1;" horiz-adv-x="1792" 
+d="M640 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM256 640h384v256h-158q-13 0 -22 -9l-195 -195q-9 -9 -9 -22v-30zM1536 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM1792 1216v-1024q0 -15 -4 -26.5t-13.5 -18.5
+t-16.5 -11.5t-23.5 -6t-22.5 -2t-25.5 0t-22.5 0.5q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-64q-3 0 -22.5 -0.5t-25.5 0t-22.5 2t-23.5 6t-16.5 11.5t-13.5 18.5t-4 26.5q0 26 19 45t45 19v320q0 8 -0.5 35t0 38
+t2.5 34.5t6.5 37t14 30.5t22.5 30l198 198q19 19 50.5 32t58.5 13h160v192q0 26 19 45t45 19h1024q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="pinterest" unicode="&#xf0d2;" 
+d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103q-111 0 -218 32q59 93 78 164q9 34 54 211q20 -39 73 -67.5t114 -28.5q121 0 216 68.5t147 188.5t52 270q0 114 -59.5 214t-172.5 163t-255 63q-105 0 -196 -29t-154.5 -77t-109 -110.5t-67 -129.5t-21.5 -134
+q0 -104 40 -183t117 -111q30 -12 38 20q2 7 8 31t8 30q6 23 -11 43q-51 61 -51 151q0 151 104.5 259.5t273.5 108.5q151 0 235.5 -82t84.5 -213q0 -170 -68.5 -289t-175.5 -119q-61 0 -98 43.5t-23 104.5q8 35 26.5 93.5t30 103t11.5 75.5q0 50 -27 83t-77 33
+q-62 0 -105 -57t-43 -142q0 -73 25 -122l-99 -418q-17 -70 -13 -177q-206 91 -333 281t-127 423q0 209 103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="pinterest_sign" unicode="&#xf0d3;" 
+d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-725q85 122 108 210q9 34 53 209q21 -39 73.5 -67t112.5 -28q181 0 295.5 147.5t114.5 373.5q0 84 -35 162.5t-96.5 139t-152.5 97t-197 36.5q-104 0 -194.5 -28.5t-153 -76.5
+t-107.5 -109.5t-66.5 -128t-21.5 -132.5q0 -102 39.5 -180t116.5 -110q13 -5 23.5 0t14.5 19q10 44 15 61q6 23 -11 42q-50 62 -50 150q0 150 103.5 256.5t270.5 106.5q149 0 232.5 -81t83.5 -210q0 -168 -67.5 -286t-173.5 -118q-60 0 -97 43.5t-23 103.5q8 34 26.5 92.5
+t29.5 102t11 74.5q0 49 -26.5 81.5t-75.5 32.5q-61 0 -103.5 -56.5t-42.5 -139.5q0 -72 24 -121l-98 -414q-24 -100 -7 -254h-183q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960z" />
+    <glyph glyph-name="google_plus_sign" unicode="&#xf0d4;" 
+d="M917 631q0 26 -6 64h-362v-132h217q-3 -24 -16.5 -50t-37.5 -53t-66.5 -44.5t-96.5 -17.5q-99 0 -169 71t-70 171t70 171t169 71q92 0 153 -59l104 101q-108 100 -257 100q-160 0 -272 -112.5t-112 -271.5t112 -271.5t272 -112.5q165 0 266.5 105t101.5 270zM1262 585
+h109v110h-109v110h-110v-110h-110v-110h110v-110h110v110zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="google_plus" unicode="&#xf0d5;" horiz-adv-x="2304" 
+d="M1437 623q0 -208 -87 -370.5t-248 -254t-369 -91.5q-149 0 -285 58t-234 156t-156 234t-58 285t58 285t156 234t234 156t285 58q286 0 491 -192l-199 -191q-117 113 -292 113q-123 0 -227.5 -62t-165.5 -168.5t-61 -232.5t61 -232.5t165.5 -168.5t227.5 -62
+q83 0 152.5 23t114.5 57.5t78.5 78.5t49 83t21.5 74h-416v252h692q12 -63 12 -122zM2304 745v-210h-209v-209h-210v209h-209v210h209v209h210v-209h209z" />
+    <glyph glyph-name="money" unicode="&#xf0d6;" horiz-adv-x="1920" 
+d="M768 384h384v96h-128v448h-114l-148 -137l77 -80q42 37 55 57h2v-288h-128v-96zM1280 640q0 -70 -21 -142t-59.5 -134t-101.5 -101t-138 -39t-138 39t-101.5 101t-59.5 134t-21 142t21 142t59.5 134t101.5 101t138 39t138 -39t101.5 -101t59.5 -134t21 -142zM1792 384
+v512q-106 0 -181 75t-75 181h-1152q0 -106 -75 -181t-181 -75v-512q106 0 181 -75t75 -181h1152q0 106 75 181t181 75zM1920 1216v-1152q0 -26 -19 -45t-45 -19h-1792q-26 0 -45 19t-19 45v1152q0 26 19 45t45 19h1792q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="caret_down" unicode="&#xf0d7;" horiz-adv-x="1024" 
+d="M1024 832q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="caret_up" unicode="&#xf0d8;" horiz-adv-x="1024" 
+d="M1024 320q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
+    <glyph glyph-name="caret_left" unicode="&#xf0d9;" horiz-adv-x="640" 
+d="M640 1088v-896q0 -26 -19 -45t-45 -19t-45 19l-448 448q-19 19 -19 45t19 45l448 448q19 19 45 19t45 -19t19 -45z" />
+    <glyph glyph-name="caret_right" unicode="&#xf0da;" horiz-adv-x="640" 
+d="M576 640q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19t-19 45v896q0 26 19 45t45 19t45 -19l448 -448q19 -19 19 -45z" />
+    <glyph glyph-name="columns" unicode="&#xf0db;" horiz-adv-x="1664" 
+d="M160 0h608v1152h-640v-1120q0 -13 9.5 -22.5t22.5 -9.5zM1536 32v1120h-640v-1152h608q13 0 22.5 9.5t9.5 22.5zM1664 1248v-1216q0 -66 -47 -113t-113 -47h-1344q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1344q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="sort" unicode="&#xf0dc;" horiz-adv-x="1024" 
+d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45zM1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
+    <glyph glyph-name="sort_down" unicode="&#xf0dd;" horiz-adv-x="1024" 
+d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="sort_up" unicode="&#xf0de;" horiz-adv-x="1024" 
+d="M1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
+    <glyph glyph-name="envelope_alt" unicode="&#xf0e0;" horiz-adv-x="1792" 
+d="M1792 826v-794q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v794q44 -49 101 -87q362 -246 497 -345q57 -42 92.5 -65.5t94.5 -48t110 -24.5h1h1q51 0 110 24.5t94.5 48t92.5 65.5q170 123 498 345q57 39 100 87zM1792 1120q0 -79 -49 -151t-122 -123
+q-376 -261 -468 -325q-10 -7 -42.5 -30.5t-54 -38t-52 -32.5t-57.5 -27t-50 -9h-1h-1q-23 0 -50 9t-57.5 27t-52 32.5t-54 38t-42.5 30.5q-91 64 -262 182.5t-205 142.5q-62 42 -117 115.5t-55 136.5q0 78 41.5 130t118.5 52h1472q65 0 112.5 -47t47.5 -113z" />
+    <glyph glyph-name="linkedin" unicode="&#xf0e1;" 
+d="M349 911v-991h-330v991h330zM370 1217q1 -73 -50.5 -122t-135.5 -49h-2q-82 0 -132 49t-50 122q0 74 51.5 122.5t134.5 48.5t133 -48.5t51 -122.5zM1536 488v-568h-329v530q0 105 -40.5 164.5t-126.5 59.5q-63 0 -105.5 -34.5t-63.5 -85.5q-11 -30 -11 -81v-553h-329
+q2 399 2 647t-1 296l-1 48h329v-144h-2q20 32 41 56t56.5 52t87 43.5t114.5 15.5q171 0 275 -113.5t104 -332.5z" />
+    <glyph glyph-name="undo" unicode="&#xf0e2;" 
+d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61q-172 0 -327 72.5t-264 204.5q-7 10 -6.5 22.5t8.5 20.5l137 138q10 9 25 9q16 -2 23 -12q73 -95 179 -147t225 -52q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5
+t-163.5 109.5t-198.5 40.5q-98 0 -188 -35.5t-160 -101.5l137 -138q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l130 -129q107 101 244.5 156.5t284.5 55.5q156 0 298 -61t245 -164t164 -245t61 -298z" />
+    <glyph glyph-name="legal" unicode="&#xf0e3;" horiz-adv-x="1792" 
+d="M1771 0q0 -53 -37 -90l-107 -108q-39 -37 -91 -37q-53 0 -90 37l-363 364q-38 36 -38 90q0 53 43 96l-256 256l-126 -126q-14 -14 -34 -14t-34 14q2 -2 12.5 -12t12.5 -13t10 -11.5t10 -13.5t6 -13.5t5.5 -16.5t1.5 -18q0 -38 -28 -68q-3 -3 -16.5 -18t-19 -20.5
+t-18.5 -16.5t-22 -15.5t-22 -9t-26 -4.5q-40 0 -68 28l-408 408q-28 28 -28 68q0 13 4.5 26t9 22t15.5 22t16.5 18.5t20.5 19t18 16.5q30 28 68 28q10 0 18 -1.5t16.5 -5.5t13.5 -6t13.5 -10t11.5 -10t13 -12.5t12 -12.5q-14 14 -14 34t14 34l348 348q14 14 34 14t34 -14
+q-2 2 -12.5 12t-12.5 13t-10 11.5t-10 13.5t-6 13.5t-5.5 16.5t-1.5 18q0 38 28 68q3 3 16.5 18t19 20.5t18.5 16.5t22 15.5t22 9t26 4.5q40 0 68 -28l408 -408q28 -28 28 -68q0 -13 -4.5 -26t-9 -22t-15.5 -22t-16.5 -18.5t-20.5 -19t-18 -16.5q-30 -28 -68 -28
+q-10 0 -18 1.5t-16.5 5.5t-13.5 6t-13.5 10t-11.5 10t-13 12.5t-12 12.5q14 -14 14 -34t-14 -34l-126 -126l256 -256q43 43 96 43q52 0 91 -37l363 -363q37 -39 37 -91z" />
+    <glyph glyph-name="dashboard" unicode="&#xf0e4;" horiz-adv-x="1792" 
+d="M384 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM576 832q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1004 351l101 382q6 26 -7.5 48.5t-38.5 29.5
+t-48 -6.5t-30 -39.5l-101 -382q-60 -5 -107 -43.5t-63 -98.5q-20 -77 20 -146t117 -89t146 20t89 117q16 60 -6 117t-72 91zM1664 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 1024q0 53 -37.5 90.5
+t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1472 832q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1792 384q0 -261 -141 -483q-19 -29 -54 -29h-1402q-35 0 -54 29
+q-141 221 -141 483q0 182 71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="comment_alt" unicode="&#xf0e5;" horiz-adv-x="1792" 
+d="M896 1152q-204 0 -381.5 -69.5t-282 -187.5t-104.5 -255q0 -112 71.5 -213.5t201.5 -175.5l87 -50l-27 -96q-24 -91 -70 -172q152 63 275 171l43 38l57 -6q69 -8 130 -8q204 0 381.5 69.5t282 187.5t104.5 255t-104.5 255t-282 187.5t-381.5 69.5zM1792 640
+q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22h-5q-15 0 -27 10.5t-16 27.5v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281q0 174 120 321.5
+t326 233t450 85.5t450 -85.5t326 -233t120 -321.5z" />
+    <glyph glyph-name="comments_alt" unicode="&#xf0e6;" horiz-adv-x="1792" 
+d="M704 1152q-153 0 -286 -52t-211.5 -141t-78.5 -191q0 -82 53 -158t149 -132l97 -56l-35 -84q34 20 62 39l44 31l53 -10q78 -14 153 -14q153 0 286 52t211.5 141t78.5 191t-78.5 191t-211.5 141t-286 52zM704 1280q191 0 353.5 -68.5t256.5 -186.5t94 -257t-94 -257
+t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q-124 72 -195 177t-71 224q0 139 94 257t256.5 186.5
+t353.5 68.5zM1526 111q10 -24 20.5 -44t25 -38.5t22.5 -29t26 -29.5t23 -25q1 -1 4 -4.5t4.5 -5t4 -5t3.5 -5.5l2.5 -5t2 -6t0.5 -6.5t-1 -6.5q-3 -14 -13 -22t-22 -7q-50 7 -86 16q-154 40 -278 128q-90 -16 -176 -16q-271 0 -472 132q58 -4 88 -4q161 0 309 45t264 129
+q125 92 192 212t67 254q0 77 -23 152q129 -71 204 -178t75 -230q0 -120 -71 -224.5t-195 -176.5z" />
+    <glyph glyph-name="bolt" unicode="&#xf0e7;" horiz-adv-x="896" 
+d="M885 970q18 -20 7 -44l-540 -1157q-13 -25 -42 -25q-4 0 -14 2q-17 5 -25.5 19t-4.5 30l197 808l-406 -101q-4 -1 -12 -1q-18 0 -31 11q-18 15 -13 39l201 825q4 14 16 23t28 9h328q19 0 32 -12.5t13 -29.5q0 -8 -5 -18l-171 -463l396 98q8 2 12 2q19 0 34 -15z" />
+    <glyph glyph-name="sitemap" unicode="&#xf0e8;" horiz-adv-x="1792" 
+d="M1792 288v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320
+q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192q0 52 38 90t90 38h512v192h-96q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h320q40 0 68 -28t28 -68v-320q0 -40 -28 -68t-68 -28h-96v-192h512q52 0 90 -38t38 -90v-192h96q40 0 68 -28t28 -68
+z" />
+    <glyph glyph-name="umbrella" unicode="&#xf0e9;" horiz-adv-x="1664" 
+d="M896 708v-580q0 -104 -76 -180t-180 -76t-180 76t-76 180q0 26 19 45t45 19t45 -19t19 -45q0 -50 39 -89t89 -39t89 39t39 89v580q33 11 64 11t64 -11zM1664 681q0 -13 -9.5 -22.5t-22.5 -9.5q-11 0 -23 10q-49 46 -93 69t-102 23q-68 0 -128 -37t-103 -97
+q-7 -10 -17.5 -28t-14.5 -24q-11 -17 -28 -17q-18 0 -29 17q-4 6 -14.5 24t-17.5 28q-43 60 -102.5 97t-127.5 37t-127.5 -37t-102.5 -97q-7 -10 -17.5 -28t-14.5 -24q-11 -17 -29 -17q-17 0 -28 17q-4 6 -14.5 24t-17.5 28q-43 60 -103 97t-128 37q-58 0 -102 -23t-93 -69
+q-12 -10 -23 -10q-13 0 -22.5 9.5t-9.5 22.5q0 5 1 7q45 183 172.5 319.5t298 204.5t360.5 68q140 0 274.5 -40t246.5 -113.5t194.5 -187t115.5 -251.5q1 -2 1 -7zM896 1408v-98q-42 2 -64 2t-64 -2v98q0 26 19 45t45 19t45 -19t19 -45z" />
+    <glyph glyph-name="paste" unicode="&#xf0ea;" horiz-adv-x="1792" 
+d="M768 -128h896v640h-416q-40 0 -68 28t-28 68v416h-384v-1152zM1024 1312v64q0 13 -9.5 22.5t-22.5 9.5h-704q-13 0 -22.5 -9.5t-9.5 -22.5v-64q0 -13 9.5 -22.5t22.5 -9.5h704q13 0 22.5 9.5t9.5 22.5zM1280 640h299l-299 299v-299zM1792 512v-672q0 -40 -28 -68t-68 -28
+h-960q-40 0 -68 28t-28 68v160h-544q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h1088q40 0 68 -28t28 -68v-328q21 -13 36 -28l408 -408q28 -28 48 -76t20 -88z" />
+    <glyph glyph-name="light_bulb" unicode="&#xf0eb;" horiz-adv-x="1024" 
+d="M736 960q0 -13 -9.5 -22.5t-22.5 -9.5t-22.5 9.5t-9.5 22.5q0 46 -54 71t-106 25q-13 0 -22.5 9.5t-9.5 22.5t9.5 22.5t22.5 9.5q50 0 99.5 -16t87 -54t37.5 -90zM896 960q0 72 -34.5 134t-90 101.5t-123 62t-136.5 22.5t-136.5 -22.5t-123 -62t-90 -101.5t-34.5 -134
+q0 -101 68 -180q10 -11 30.5 -33t30.5 -33q128 -153 141 -298h228q13 145 141 298q10 11 30.5 33t30.5 33q68 79 68 180zM1024 960q0 -155 -103 -268q-45 -49 -74.5 -87t-59.5 -95.5t-34 -107.5q47 -28 47 -82q0 -37 -25 -64q25 -27 25 -64q0 -52 -45 -81q13 -23 13 -47
+q0 -46 -31.5 -71t-77.5 -25q-20 -44 -60 -70t-87 -26t-87 26t-60 70q-46 0 -77.5 25t-31.5 71q0 24 13 47q-45 29 -45 81q0 37 25 64q-25 27 -25 64q0 54 47 82q-4 50 -34 107.5t-59.5 95.5t-74.5 87q-103 113 -103 268q0 99 44.5 184.5t117 142t164 89t186.5 32.5
+t186.5 -32.5t164 -89t117 -142t44.5 -184.5z" />
+    <glyph glyph-name="exchange" unicode="&#xf0ec;" horiz-adv-x="1792" 
+d="M1792 352v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5q-12 0 -24 10l-319 320q-9 9 -9 22q0 14 9 23l320 320q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5v-192h1376q13 0 22.5 -9.5t9.5 -22.5zM1792 896q0 -14 -9 -23l-320 -320q-9 -9 -23 -9
+q-13 0 -22.5 9.5t-9.5 22.5v192h-1376q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1376v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z" />
+    <glyph glyph-name="cloud_download" unicode="&#xf0ed;" horiz-adv-x="1920" 
+d="M1280 608q0 14 -9 23t-23 9h-224v352q0 13 -9.5 22.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-352h-224q-13 0 -22.5 -9.5t-9.5 -22.5q0 -14 9 -23l352 -352q9 -9 23 -9t23 9l351 351q10 12 10 24zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088
+q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z" />
+    <glyph glyph-name="cloud_upload" unicode="&#xf0ee;" horiz-adv-x="1920" 
+d="M1280 672q0 14 -9 23l-352 352q-9 9 -23 9t-23 -9l-351 -351q-10 -12 -10 -24q0 -14 9 -23t23 -9h224v-352q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5v352h224q13 0 22.5 9.5t9.5 22.5zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088
+q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z" />
+    <glyph glyph-name="user_md" unicode="&#xf0f0;" horiz-adv-x="1408" 
+d="M384 192q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45zM1408 131q0 -121 -73 -190t-194 -69h-874q-121 0 -194 69t-73 190q0 68 5.5 131t24 138t47.5 132.5t81 103t120 60.5q-22 -52 -22 -120v-203q-58 -20 -93 -70t-35 -111q0 -80 56 -136t136 -56
+t136 56t56 136q0 61 -35.5 111t-92.5 70v203q0 62 25 93q132 -104 295 -104t295 104q25 -31 25 -93v-64q-106 0 -181 -75t-75 -181v-89q-32 -29 -32 -71q0 -40 28 -68t68 -28t68 28t28 68q0 42 -32 71v89q0 52 38 90t90 38t90 -38t38 -90v-89q-32 -29 -32 -71q0 -40 28 -68
+t68 -28t68 28t28 68q0 42 -32 71v89q0 68 -34.5 127.5t-93.5 93.5q0 10 0.5 42.5t0 48t-2.5 41.5t-7 47t-13 40q68 -15 120 -60.5t81 -103t47.5 -132.5t24 -138t5.5 -131zM1088 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5
+t271.5 -112.5t112.5 -271.5z" />
+    <glyph glyph-name="stethoscope" unicode="&#xf0f1;" horiz-adv-x="1408" 
+d="M1280 832q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 832q0 -62 -35.5 -111t-92.5 -70v-395q0 -159 -131.5 -271.5t-316.5 -112.5t-316.5 112.5t-131.5 271.5v132q-164 20 -274 128t-110 252v512q0 26 19 45t45 19q6 0 16 -2q17 30 47 48
+t65 18q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5q-33 0 -64 18v-402q0 -106 94 -181t226 -75t226 75t94 181v402q-31 -18 -64 -18q-53 0 -90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5q35 0 65 -18t47 -48q10 2 16 2q26 0 45 -19t19 -45v-512q0 -144 -110 -252
+t-274 -128v-132q0 -106 94 -181t226 -75t226 75t94 181v395q-57 21 -92.5 70t-35.5 111q0 80 56 136t136 56t136 -56t56 -136z" />
+    <glyph glyph-name="suitcase" unicode="&#xf0f2;" horiz-adv-x="1792" 
+d="M640 1152h512v128h-512v-128zM288 1152v-1280h-64q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h64zM1408 1152v-1280h-1024v1280h128v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h128zM1792 928v-832q0 -92 -66 -158t-158 -66h-64v1280h64q92 0 158 -66
+t66 -158z" />
+    <glyph glyph-name="bell_alt" unicode="&#xf0f3;" horiz-adv-x="1792" 
+d="M912 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM1728 128q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q50 42 91 88t85 119.5t74.5 158.5
+t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q190 -28 307 -158.5t117 -282.5q0 -139 19.5 -260t50 -206t74.5 -158.5t85 -119.5t91 -88z" />
+    <glyph glyph-name="coffee" unicode="&#xf0f4;" horiz-adv-x="1920" 
+d="M1664 896q0 80 -56 136t-136 56h-64v-384h64q80 0 136 56t56 136zM0 128h1792q0 -106 -75 -181t-181 -75h-1280q-106 0 -181 75t-75 181zM1856 896q0 -159 -112.5 -271.5t-271.5 -112.5h-64v-32q0 -92 -66 -158t-158 -66h-704q-92 0 -158 66t-66 158v736q0 26 19 45
+t45 19h1152q159 0 271.5 -112.5t112.5 -271.5z" />
+    <glyph glyph-name="food" unicode="&#xf0f5;" horiz-adv-x="1408" 
+d="M640 1472v-640q0 -61 -35.5 -111t-92.5 -70v-779q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v779q-57 20 -92.5 70t-35.5 111v640q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45
+t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45zM1408 1472v-1600q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v512h-224q-13 0 -22.5 9.5t-9.5 22.5v800q0 132 94 226t226 94h256q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="file_text_alt" unicode="&#xf0f6;" 
+d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+M384 736q0 14 9 23t23 9h704q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64zM1120 512q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704zM1120 256q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704
+q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704z" />
+    <glyph glyph-name="building" unicode="&#xf0f7;" horiz-adv-x="1408" 
+d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M1152 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M640 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M1152 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M640 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M1152 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M640 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M896 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M896 -128h384v1536h-1152v-1536h384v224q0 13 9.5 22.5t22.5 9.5h320q13 0 22.5 -9.5t9.5 -22.5v-224zM1408 1472v-1664q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h1280q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="hospital" unicode="&#xf0f8;" horiz-adv-x="1408" 
+d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M1152 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M640 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M896 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M896 -128h384v1152h-256v-32q0 -40 -28 -68t-68 -28h-448q-40 0 -68 28t-28 68v32h-256v-1152h384v224q0 13 9.5 22.5t22.5 9.5h320q13 0 22.5 -9.5t9.5 -22.5v-224zM896 1056v320q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-96h-128v96q0 13 -9.5 22.5
+t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5v96h128v-96q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1408 1088v-1280q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1280q0 26 19 45t45 19h320
+v288q0 40 28 68t68 28h448q40 0 68 -28t28 -68v-288h320q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="ambulance" unicode="&#xf0f9;" horiz-adv-x="1920" 
+d="M640 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM256 640h384v256h-158q-14 -2 -22 -9l-195 -195q-7 -12 -9 -22v-30zM1536 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5
+t90.5 37.5t37.5 90.5zM1664 800v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v224h224q14 0 23 9t9 23zM1920 1344v-1152
+q0 -26 -19 -45t-45 -19h-192q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-128q-26 0 -45 19t-19 45t19 45t45 19v416q0 26 13 58t32 51l198 198q19 19 51 32t58 13h160v320q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="medkit" unicode="&#xf0fa;" horiz-adv-x="1792" 
+d="M1280 416v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v224h224q14 0 23 9t9 23zM640 1152h512v128h-512v-128zM256 1152v-1280h-32
+q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h32zM1440 1152v-1280h-1088v1280h160v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h160zM1792 928v-832q0 -92 -66 -158t-158 -66h-32v1280h32q92 0 158 -66t66 -158z" />
+    <glyph glyph-name="fighter_jet" unicode="&#xf0fb;" horiz-adv-x="1920" 
+d="M1920 576q-1 -32 -288 -96l-352 -32l-224 -64h-64l-293 -352h69q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-96h-160h-64v32h64v416h-160l-192 -224h-96l-32 32v192h32v32h128v8l-192 24v128l192 24v8h-128v32h-32v192l32 32h96l192 -224h160v416h-64v32h64h160h96
+q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-69l293 -352h64l224 -64l352 -32q128 -28 200 -52t80 -34z" />
+    <glyph glyph-name="beer" unicode="&#xf0fc;" horiz-adv-x="1664" 
+d="M640 640v384h-256v-256q0 -53 37.5 -90.5t90.5 -37.5h128zM1664 192v-192h-1152v192l128 192h-128q-159 0 -271.5 112.5t-112.5 271.5v320l-64 64l32 128h480l32 128h960l32 -192l-64 -32v-800z" />
+    <glyph glyph-name="h_sign" unicode="&#xf0fd;" 
+d="M1280 192v896q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-512v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-896q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h512v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1536 1120v-960
+q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="f0fe" unicode="&#xf0fe;" 
+d="M1280 576v128q0 26 -19 45t-45 19h-320v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-320q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h320v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h320q26 0 45 19t19 45zM1536 1120v-960
+q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="double_angle_left" unicode="&#xf100;" horiz-adv-x="1024" 
+d="M627 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23zM1011 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23
+t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23z" />
+    <glyph glyph-name="double_angle_right" unicode="&#xf101;" horiz-adv-x="1024" 
+d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM979 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23
+l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
+    <glyph glyph-name="double_angle_up" unicode="&#xf102;" horiz-adv-x="1152" 
+d="M1075 224q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM1075 608q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393
+q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
+    <glyph glyph-name="double_angle_down" unicode="&#xf103;" horiz-adv-x="1152" 
+d="M1075 672q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23zM1075 1056q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23
+t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
+    <glyph glyph-name="angle_left" unicode="&#xf104;" horiz-adv-x="640" 
+d="M627 992q0 -13 -10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
+    <glyph glyph-name="angle_right" unicode="&#xf105;" horiz-adv-x="640" 
+d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
+    <glyph glyph-name="angle_up" unicode="&#xf106;" horiz-adv-x="1152" 
+d="M1075 352q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
+    <glyph glyph-name="angle_down" unicode="&#xf107;" horiz-adv-x="1152" 
+d="M1075 800q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
+    <glyph glyph-name="desktop" unicode="&#xf108;" horiz-adv-x="1920" 
+d="M1792 544v832q0 13 -9.5 22.5t-22.5 9.5h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-832q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5zM1920 1376v-1088q0 -66 -47 -113t-113 -47h-544q0 -37 16 -77.5t32 -71t16 -43.5q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19
+t-19 45q0 14 16 44t32 70t16 78h-544q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="laptop" unicode="&#xf109;" horiz-adv-x="1920" 
+d="M416 256q-66 0 -113 47t-47 113v704q0 66 47 113t113 47h1088q66 0 113 -47t47 -113v-704q0 -66 -47 -113t-113 -47h-1088zM384 1120v-704q0 -13 9.5 -22.5t22.5 -9.5h1088q13 0 22.5 9.5t9.5 22.5v704q0 13 -9.5 22.5t-22.5 9.5h-1088q-13 0 -22.5 -9.5t-9.5 -22.5z
+M1760 192h160v-96q0 -40 -47 -68t-113 -28h-1600q-66 0 -113 28t-47 68v96h160h1600zM1040 96q16 0 16 16t-16 16h-160q-16 0 -16 -16t16 -16h160z" />
+    <glyph glyph-name="tablet" unicode="&#xf10a;" horiz-adv-x="1152" 
+d="M640 128q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1024 288v960q0 13 -9.5 22.5t-22.5 9.5h-832q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h832q13 0 22.5 9.5t9.5 22.5zM1152 1248v-1088q0 -66 -47 -113t-113 -47h-832
+q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h832q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="mobile_phone" unicode="&#xf10b;" horiz-adv-x="768" 
+d="M464 128q0 33 -23.5 56.5t-56.5 23.5t-56.5 -23.5t-23.5 -56.5t23.5 -56.5t56.5 -23.5t56.5 23.5t23.5 56.5zM672 288v704q0 13 -9.5 22.5t-22.5 9.5h-512q-13 0 -22.5 -9.5t-9.5 -22.5v-704q0 -13 9.5 -22.5t22.5 -9.5h512q13 0 22.5 9.5t9.5 22.5zM480 1136
+q0 16 -16 16h-160q-16 0 -16 -16t16 -16h160q16 0 16 16zM768 1152v-1024q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v1024q0 52 38 90t90 38h512q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="circle_blank" unicode="&#xf10c;" 
+d="M768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103
+t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="quote_left" unicode="&#xf10d;" horiz-adv-x="1664" 
+d="M768 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 -181v-32q0 -40 28 -68t68 -28h224q80 0 136 -56t56 -136z
+M1664 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 -181v-32q0 -40 28 -68t68 -28h224q80 0 136 -56t56 -136z" />
+    <glyph glyph-name="quote_right" unicode="&#xf10e;" horiz-adv-x="1664" 
+d="M768 1216v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 56 136t136 56h384q80 0 136 -56t56 -136zM1664 1216
+v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 56 136t136 56h384q80 0 136 -56t56 -136z" />
+    <glyph glyph-name="spinner" unicode="&#xf110;" horiz-adv-x="1792" 
+d="M526 142q0 -53 -37.5 -90.5t-90.5 -37.5q-52 0 -90 38t-38 90q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1024 -64q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM320 640q0 -53 -37.5 -90.5t-90.5 -37.5
+t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1522 142q0 -52 -38 -90t-90 -38q-53 0 -90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM558 1138q0 -66 -47 -113t-113 -47t-113 47t-47 113t47 113t113 47t113 -47t47 -113z
+M1728 640q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1088 1344q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1618 1138q0 -93 -66 -158.5t-158 -65.5q-93 0 -158.5 65.5t-65.5 158.5
+q0 92 65.5 158t158.5 66q92 0 158 -66t66 -158z" />
+    <glyph glyph-name="circle" unicode="&#xf111;" 
+d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="reply" unicode="&#xf112;" horiz-adv-x="1792" 
+d="M1792 416q0 -166 -127 -451q-3 -7 -10.5 -24t-13.5 -30t-13 -22q-12 -17 -28 -17q-15 0 -23.5 10t-8.5 25q0 9 2.5 26.5t2.5 23.5q5 68 5 123q0 101 -17.5 181t-48.5 138.5t-80 101t-105.5 69.5t-133 42.5t-154 21.5t-175.5 6h-224v-256q0 -26 -19 -45t-45 -19t-45 19
+l-512 512q-19 19 -19 45t19 45l512 512q19 19 45 19t45 -19t19 -45v-256h224q713 0 875 -403q53 -134 53 -333z" />
+    <glyph glyph-name="github_alt" unicode="&#xf113;" horiz-adv-x="1664" 
+d="M640 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1280 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1440 320
+q0 120 -69 204t-187 84q-41 0 -195 -21q-71 -11 -157 -11t-157 11q-152 21 -195 21q-118 0 -187 -84t-69 -204q0 -88 32 -153.5t81 -103t122 -60t140 -29.5t149 -7h168q82 0 149 7t140 29.5t122 60t81 103t32 153.5zM1664 496q0 -207 -61 -331q-38 -77 -105.5 -133t-141 -86
+t-170 -47.5t-171.5 -22t-167 -4.5q-78 0 -142 3t-147.5 12.5t-152.5 30t-137 51.5t-121 81t-86 115q-62 123 -62 331q0 237 136 396q-27 82 -27 170q0 116 51 218q108 0 190 -39.5t189 -123.5q147 35 309 35q148 0 280 -32q105 82 187 121t189 39q51 -102 51 -218
+q0 -87 -27 -168q136 -160 136 -398z" />
+    <glyph glyph-name="folder_close_alt" unicode="&#xf114;" horiz-adv-x="1664" 
+d="M1536 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68v-960q0 -40 28 -68t68 -28h1216q40 0 68 28t28 68zM1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320
+q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />
+    <glyph glyph-name="folder_open_alt" unicode="&#xf115;" horiz-adv-x="1920" 
+d="M1781 605q0 35 -53 35h-1088q-40 0 -85.5 -21.5t-71.5 -52.5l-294 -363q-18 -24 -18 -40q0 -35 53 -35h1088q40 0 86 22t71 53l294 363q18 22 18 39zM640 768h768v160q0 40 -28 68t-68 28h-576q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68
+v-853l256 315q44 53 116 87.5t140 34.5zM1909 605q0 -62 -46 -120l-295 -363q-43 -53 -116 -87.5t-140 -34.5h-1088q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158v-160h192q54 0 99 -24.5t67 -70.5q15 -32 15 -68z
+" />
+    <glyph glyph-name="expand_alt" unicode="&#xf116;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="collapse_alt" unicode="&#xf117;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="smile" unicode="&#xf118;" 
+d="M1134 461q-37 -121 -138 -195t-228 -74t-228 74t-138 195q-8 25 4 48.5t38 31.5q25 8 48.5 -4t31.5 -38q25 -80 92.5 -129.5t151.5 -49.5t151.5 49.5t92.5 129.5q8 26 32 38t49 4t37 -31.5t4 -48.5zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5
+t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5
+t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="frown" unicode="&#xf119;" 
+d="M1134 307q8 -25 -4 -48.5t-37 -31.5t-49 4t-32 38q-25 80 -92.5 129.5t-151.5 49.5t-151.5 -49.5t-92.5 -129.5q-8 -26 -31.5 -38t-48.5 -4q-26 8 -38 31.5t-4 48.5q37 121 138 195t228 74t228 -74t138 -195zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5
+t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204
+t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="meh" unicode="&#xf11a;" 
+d="M1152 448q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h640q26 0 45 -19t19 -45zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5
+t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640
+q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="gamepad" unicode="&#xf11b;" horiz-adv-x="1920" 
+d="M832 448v128q0 14 -9 23t-23 9h-192v192q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-192h-192q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h192v-192q0 -14 9 -23t23 -9h128q14 0 23 9t9 23v192h192q14 0 23 9t9 23zM1408 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5
+t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 640q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1920 512q0 -212 -150 -362t-362 -150q-192 0 -338 128h-220q-146 -128 -338 -128q-212 0 -362 150
+t-150 362t150 362t362 150h896q212 0 362 -150t150 -362z" />
+    <glyph glyph-name="keyboard" unicode="&#xf11c;" horiz-adv-x="1920" 
+d="M384 368v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM512 624v-96q0 -16 -16 -16h-224q-16 0 -16 16v96q0 16 16 16h224q16 0 16 -16zM384 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1408 368v-96q0 -16 -16 -16
+h-864q-16 0 -16 16v96q0 16 16 16h864q16 0 16 -16zM768 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM640 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1024 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16
+h96q16 0 16 -16zM896 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1280 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1664 368v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1152 880v-96
+q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1408 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1664 880v-352q0 -16 -16 -16h-224q-16 0 -16 16v96q0 16 16 16h112v240q0 16 16 16h96q16 0 16 -16zM1792 128v896h-1664v-896
+h1664zM1920 1024v-896q0 -53 -37.5 -90.5t-90.5 -37.5h-1664q-53 0 -90.5 37.5t-37.5 90.5v896q0 53 37.5 90.5t90.5 37.5h1664q53 0 90.5 -37.5t37.5 -90.5z" />
+    <glyph glyph-name="flag_alt" unicode="&#xf11d;" horiz-adv-x="1792" 
+d="M1664 491v616q-169 -91 -306 -91q-82 0 -145 32q-100 49 -184 76.5t-178 27.5q-173 0 -403 -127v-599q245 113 433 113q55 0 103.5 -7.5t98 -26t77 -31t82.5 -39.5l28 -14q44 -22 101 -22q120 0 293 92zM320 1280q0 -35 -17.5 -64t-46.5 -46v-1266q0 -14 -9 -23t-23 -9
+h-64q-14 0 -23 9t-9 23v1266q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -39 -35 -57q-10 -5 -17 -9q-218 -116 -369 -116q-88 0 -158 35l-28 14q-64 33 -99 48t-91 29t-114 14q-102 0 -235.5 -44t-228.5 -102
+q-15 -9 -33 -9q-16 0 -32 8q-32 19 -32 56v742q0 35 31 55q35 21 78.5 42.5t114 52t152.5 49.5t155 19q112 0 209 -31t209 -86q38 -19 89 -19q122 0 310 112q22 12 31 17q31 16 62 -2q31 -20 31 -55z" />
+    <glyph glyph-name="flag_checkered" unicode="&#xf11e;" horiz-adv-x="1792" 
+d="M832 536v192q-181 -16 -384 -117v-185q205 96 384 110zM832 954v197q-172 -8 -384 -126v-189q215 111 384 118zM1664 491v184q-235 -116 -384 -71v224q-20 6 -39 15q-5 3 -33 17t-34.5 17t-31.5 15t-34.5 15.5t-32.5 13t-36 12.5t-35 8.5t-39.5 7.5t-39.5 4t-44 2
+q-23 0 -49 -3v-222h19q102 0 192.5 -29t197.5 -82q19 -9 39 -15v-188q42 -17 91 -17q120 0 293 92zM1664 918v189q-169 -91 -306 -91q-45 0 -78 8v-196q148 -42 384 90zM320 1280q0 -35 -17.5 -64t-46.5 -46v-1266q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v1266
+q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -39 -35 -57q-10 -5 -17 -9q-218 -116 -369 -116q-88 0 -158 35l-28 14q-64 33 -99 48t-91 29t-114 14q-102 0 -235.5 -44t-228.5 -102q-15 -9 -33 -9q-16 0 -32 8
+q-32 19 -32 56v742q0 35 31 55q35 21 78.5 42.5t114 52t152.5 49.5t155 19q112 0 209 -31t209 -86q38 -19 89 -19q122 0 310 112q22 12 31 17q31 16 62 -2q31 -20 31 -55z" />
+    <glyph glyph-name="terminal" unicode="&#xf120;" horiz-adv-x="1664" 
+d="M585 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23t-10 -23zM1664 96v-64q0 -14 -9 -23t-23 -9h-960q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h960q14 0 23 -9
+t9 -23z" />
+    <glyph glyph-name="code" unicode="&#xf121;" horiz-adv-x="1920" 
+d="M617 137l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23zM1208 1204l-373 -1291q-4 -13 -15.5 -19.5t-23.5 -2.5l-62 17q-13 4 -19.5 15.5t-2.5 24.5
+l373 1291q4 13 15.5 19.5t23.5 2.5l62 -17q13 -4 19.5 -15.5t2.5 -24.5zM1865 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23t-10 -23z" />
+    <glyph glyph-name="reply_all" unicode="&#xf122;" horiz-adv-x="1792" 
+d="M640 454v-70q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-69l-397 -398q-19 -19 -19 -45t19 -45zM1792 416q0 -58 -17 -133.5t-38.5 -138t-48 -125t-40.5 -90.5l-20 -40q-8 -17 -28 -17q-6 0 -9 1
+q-25 8 -23 34q43 400 -106 565q-64 71 -170.5 110.5t-267.5 52.5v-251q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-262q411 -28 599 -221q169 -173 169 -509z" />
+    <glyph glyph-name="star_half_empty" unicode="&#xf123;" horiz-adv-x="1664" 
+d="M1186 579l257 250l-356 52l-66 10l-30 60l-159 322v-963l59 -31l318 -168l-60 355l-12 66zM1638 841l-363 -354l86 -500q5 -33 -6 -51.5t-34 -18.5q-17 0 -40 12l-449 236l-449 -236q-23 -12 -40 -12q-23 0 -34 18.5t-6 51.5l86 500l-364 354q-32 32 -23 59.5t54 34.5
+l502 73l225 455q20 41 49 41q28 0 49 -41l225 -455l502 -73q45 -7 54 -34.5t-24 -59.5z" />
+    <glyph glyph-name="location_arrow" unicode="&#xf124;" horiz-adv-x="1408" 
+d="M1401 1187l-640 -1280q-17 -35 -57 -35q-5 0 -15 2q-22 5 -35.5 22.5t-13.5 39.5v576h-576q-22 0 -39.5 13.5t-22.5 35.5t4 42t29 30l1280 640q13 7 29 7q27 0 45 -19q15 -14 18.5 -34.5t-6.5 -39.5z" />
+    <glyph glyph-name="crop" unicode="&#xf125;" horiz-adv-x="1664" 
+d="M557 256h595v595zM512 301l595 595h-595v-595zM1664 224v-192q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v224h-864q-14 0 -23 9t-9 23v864h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224v224q0 14 9 23t23 9h192q14 0 23 -9t9 -23
+v-224h851l246 247q10 9 23 9t23 -9q9 -10 9 -23t-9 -23l-247 -246v-851h224q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="code_fork" unicode="&#xf126;" horiz-adv-x="1024" 
+d="M288 64q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM288 1216q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM928 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1024 1088q0 -52 -26 -96.5t-70 -69.5
+q-2 -287 -226 -414q-67 -38 -203 -81q-128 -40 -169.5 -71t-41.5 -100v-26q44 -25 70 -69.5t26 -96.5q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 52 26 96.5t70 69.5v820q-44 25 -70 69.5t-26 96.5q0 80 56 136t136 56t136 -56t56 -136q0 -52 -26 -96.5t-70 -69.5v-497
+q54 26 154 57q55 17 87.5 29.5t70.5 31t59 39.5t40.5 51t28 69.5t8.5 91.5q-44 25 -70 69.5t-26 96.5q0 80 56 136t136 56t136 -56t56 -136z" />
+    <glyph glyph-name="unlink" unicode="&#xf127;" horiz-adv-x="1664" 
+d="M439 265l-256 -256q-11 -9 -23 -9t-23 9q-9 10 -9 23t9 23l256 256q10 9 23 9t23 -9q9 -10 9 -23t-9 -23zM608 224v-320q0 -14 -9 -23t-23 -9t-23 9t-9 23v320q0 14 9 23t23 9t23 -9t9 -23zM384 448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23t9 23t23 9h320
+q14 0 23 -9t9 -23zM1648 320q0 -120 -85 -203l-147 -146q-83 -83 -203 -83q-121 0 -204 85l-334 335q-21 21 -42 56l239 18l273 -274q27 -27 68 -27.5t68 26.5l147 146q28 28 28 67q0 40 -28 68l-274 275l18 239q35 -21 56 -42l336 -336q84 -86 84 -204zM1031 1044l-239 -18
+l-273 274q-28 28 -68 28q-39 0 -68 -27l-147 -146q-28 -28 -28 -67q0 -40 28 -68l274 -274l-18 -240q-35 21 -56 42l-336 336q-84 86 -84 204q0 120 85 203l147 146q83 83 203 83q121 0 204 -85l334 -335q21 -21 42 -56zM1664 960q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9
+t-9 23t9 23t23 9h320q14 0 23 -9t9 -23zM1120 1504v-320q0 -14 -9 -23t-23 -9t-23 9t-9 23v320q0 14 9 23t23 9t23 -9t9 -23zM1527 1353l-256 -256q-11 -9 -23 -9t-23 9q-9 10 -9 23t9 23l256 256q10 9 23 9t23 -9q9 -10 9 -23t-9 -23z" />
+    <glyph glyph-name="question" unicode="&#xf128;" horiz-adv-x="1024" 
+d="M704 280v-240q0 -16 -12 -28t-28 -12h-240q-16 0 -28 12t-12 28v240q0 16 12 28t28 12h240q16 0 28 -12t12 -28zM1020 880q0 -54 -15.5 -101t-35 -76.5t-55 -59.5t-57.5 -43.5t-61 -35.5q-41 -23 -68.5 -65t-27.5 -67q0 -17 -12 -32.5t-28 -15.5h-240q-15 0 -25.5 18.5
+t-10.5 37.5v45q0 83 65 156.5t143 108.5q59 27 84 56t25 76q0 42 -46.5 74t-107.5 32q-65 0 -108 -29q-35 -25 -107 -115q-13 -16 -31 -16q-12 0 -25 8l-164 125q-13 10 -15.5 25t5.5 28q160 266 464 266q80 0 161 -31t146 -83t106 -127.5t41 -158.5z" />
+    <glyph glyph-name="_279" unicode="&#xf129;" horiz-adv-x="640" 
+d="M640 192v-128q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64v384h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-576h64q26 0 45 -19t19 -45zM512 1344v-192q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v192
+q0 26 19 45t45 19h256q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="exclamation" unicode="&#xf12a;" horiz-adv-x="640" 
+d="M512 288v-224q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v224q0 26 19 45t45 19h256q26 0 45 -19t19 -45zM542 1344l-28 -768q-1 -26 -20.5 -45t-45.5 -19h-256q-26 0 -45.5 19t-20.5 45l-28 768q-1 26 17.5 45t44.5 19h320q26 0 44.5 -19t17.5 -45z" />
+    <glyph glyph-name="superscript" unicode="&#xf12b;" 
+d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3q-1 -3 -2.5 -6.5t-3.5 -8t-3 -6.5q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109z
+M1534 846v-206h-514l-3 27q-4 28 -4 46q0 64 26 117t65 86.5t84 65t84 54.5t65 54t26 64q0 38 -29.5 62.5t-70.5 24.5q-51 0 -97 -39q-14 -11 -36 -38l-105 92q26 37 63 66q83 65 188 65q110 0 178 -59.5t68 -158.5q0 -56 -24.5 -103t-62 -76.5t-81.5 -58.5t-82 -50.5
+t-65.5 -51.5t-30.5 -63h232v80h126z" />
+    <glyph glyph-name="subscript" unicode="&#xf12c;" 
+d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3q-1 -3 -2.5 -6.5t-3.5 -8t-3 -6.5q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109z
+M1536 -50v-206h-514l-4 27q-3 45 -3 46q0 64 26 117t65 86.5t84 65t84 54.5t65 54t26 64q0 38 -29.5 62.5t-70.5 24.5q-51 0 -97 -39q-14 -11 -36 -38l-105 92q26 37 63 66q80 65 188 65q110 0 178 -59.5t68 -158.5q0 -66 -34.5 -118.5t-84 -86t-99.5 -62.5t-87 -63t-41 -73
+h232v80h126z" />
+    <glyph glyph-name="_283" unicode="&#xf12d;" horiz-adv-x="1920" 
+d="M896 128l336 384h-768l-336 -384h768zM1909 1205q15 -34 9.5 -71.5t-30.5 -65.5l-896 -1024q-38 -44 -96 -44h-768q-38 0 -69.5 20.5t-47.5 54.5q-15 34 -9.5 71.5t30.5 65.5l896 1024q38 44 96 44h768q38 0 69.5 -20.5t47.5 -54.5z" />
+    <glyph glyph-name="puzzle_piece" unicode="&#xf12e;" horiz-adv-x="1664" 
+d="M1664 438q0 -81 -44.5 -135t-123.5 -54q-41 0 -77.5 17.5t-59 38t-56.5 38t-71 17.5q-110 0 -110 -124q0 -39 16 -115t15 -115v-5q-22 0 -33 -1q-34 -3 -97.5 -11.5t-115.5 -13.5t-98 -5q-61 0 -103 26.5t-42 83.5q0 37 17.5 71t38 56.5t38 59t17.5 77.5q0 79 -54 123.5
+t-135 44.5q-84 0 -143 -45.5t-59 -127.5q0 -43 15 -83t33.5 -64.5t33.5 -53t15 -50.5q0 -45 -46 -89q-37 -35 -117 -35q-95 0 -245 24q-9 2 -27.5 4t-27.5 4l-13 2q-1 0 -3 1q-2 0 -2 1v1024q2 -1 17.5 -3.5t34 -5t21.5 -3.5q150 -24 245 -24q80 0 117 35q46 44 46 89
+q0 22 -15 50.5t-33.5 53t-33.5 64.5t-15 83q0 82 59 127.5t144 45.5q80 0 134 -44.5t54 -123.5q0 -41 -17.5 -77.5t-38 -59t-38 -56.5t-17.5 -71q0 -57 42 -83.5t103 -26.5q64 0 180 15t163 17v-2q-1 -2 -3.5 -17.5t-5 -34t-3.5 -21.5q-24 -150 -24 -245q0 -80 35 -117
+q44 -46 89 -46q22 0 50.5 15t53 33.5t64.5 33.5t83 15q82 0 127.5 -59t45.5 -143z" />
+    <glyph glyph-name="microphone" unicode="&#xf130;" horiz-adv-x="1152" 
+d="M1152 832v-128q0 -221 -147.5 -384.5t-364.5 -187.5v-132h256q26 0 45 -19t19 -45t-19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h256v132q-217 24 -364.5 187.5t-147.5 384.5v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -185 131.5 -316.5t316.5 -131.5
+t316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45zM896 1216v-512q0 -132 -94 -226t-226 -94t-226 94t-94 226v512q0 132 94 226t226 94t226 -94t94 -226z" />
+    <glyph glyph-name="microphone_off" unicode="&#xf131;" horiz-adv-x="1408" 
+d="M271 591l-101 -101q-42 103 -42 214v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -53 15 -113zM1385 1193l-361 -361v-128q0 -132 -94 -226t-226 -94q-55 0 -109 19l-96 -96q97 -51 205 -51q185 0 316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45v-128
+q0 -221 -147.5 -384.5t-364.5 -187.5v-132h256q26 0 45 -19t19 -45t-19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h256v132q-125 13 -235 81l-254 -254q-10 -10 -23 -10t-23 10l-82 82q-10 10 -10 23t10 23l1234 1234q10 10 23 10t23 -10l82 -82q10 -10 10 -23
+t-10 -23zM1005 1325l-621 -621v512q0 132 94 226t226 94q102 0 184.5 -59t116.5 -152z" />
+    <glyph glyph-name="shield" unicode="&#xf132;" horiz-adv-x="1280" 
+d="M1088 576v640h-448v-1137q119 63 213 137q235 184 235 360zM1280 1344v-768q0 -86 -33.5 -170.5t-83 -150t-118 -127.5t-126.5 -103t-121 -77.5t-89.5 -49.5t-42.5 -20q-12 -6 -26 -6t-26 6q-16 7 -42.5 20t-89.5 49.5t-121 77.5t-126.5 103t-118 127.5t-83 150
+t-33.5 170.5v768q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="calendar_empty" unicode="&#xf133;" horiz-adv-x="1664" 
+d="M128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280
+q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="fire_extinguisher" unicode="&#xf134;" horiz-adv-x="1408" 
+d="M512 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 1376v-320q0 -16 -12 -25q-8 -7 -20 -7q-4 0 -7 1l-448 96q-11 2 -18 11t-7 20h-256v-102q111 -23 183.5 -111t72.5 -203v-800q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v800
+q0 106 62.5 190.5t161.5 114.5v111h-32q-59 0 -115 -23.5t-91.5 -53t-66 -66.5t-40.5 -53.5t-14 -24.5q-17 -35 -57 -35q-16 0 -29 7q-23 12 -31.5 37t3.5 49q5 10 14.5 26t37.5 53.5t60.5 70t85 67t108.5 52.5q-25 42 -25 86q0 66 47 113t113 47t113 -47t47 -113
+q0 -33 -14 -64h302q0 11 7 20t18 11l448 96q3 1 7 1q12 0 20 -7q12 -9 12 -25z" />
+    <glyph glyph-name="rocket" unicode="&#xf135;" horiz-adv-x="1664" 
+d="M1440 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1664 1376q0 -249 -75.5 -430.5t-253.5 -360.5q-81 -80 -195 -176l-20 -379q-2 -16 -16 -26l-384 -224q-7 -4 -16 -4q-12 0 -23 9l-64 64q-13 14 -8 32l85 276l-281 281l-276 -85q-3 -1 -9 -1
+q-14 0 -23 9l-64 64q-17 19 -5 39l224 384q10 14 26 16l379 20q96 114 176 195q188 187 358 258t431 71q14 0 24 -9.5t10 -22.5z" />
+    <glyph glyph-name="maxcdn" unicode="&#xf136;" horiz-adv-x="1792" 
+d="M1745 763l-164 -763h-334l178 832q13 56 -15 88q-27 33 -83 33h-169l-204 -953h-334l204 953h-286l-204 -953h-334l204 953l-153 327h1276q101 0 189.5 -40.5t147.5 -113.5q60 -73 81 -168.5t0 -194.5z" />
+    <glyph glyph-name="chevron_sign_left" unicode="&#xf137;" 
+d="M909 141l102 102q19 19 19 45t-19 45l-307 307l307 307q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5
+t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="chevron_sign_right" unicode="&#xf138;" 
+d="M717 141l454 454q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l307 -307l-307 -307q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5
+t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="chevron_sign_up" unicode="&#xf139;" 
+d="M1165 397l102 102q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l307 307l307 -307q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5
+t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="chevron_sign_down" unicode="&#xf13a;" 
+d="M813 237l454 454q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-307 -307l-307 307q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5
+t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="html5" unicode="&#xf13b;" horiz-adv-x="1408" 
+d="M1130 939l16 175h-884l47 -534h612l-22 -228l-197 -53l-196 53l-13 140h-175l22 -278l362 -100h4v1l359 99l50 544h-644l-15 181h674zM0 1408h1408l-128 -1438l-578 -162l-574 162z" />
+    <glyph glyph-name="css3" unicode="&#xf13c;" horiz-adv-x="1792" 
+d="M275 1408h1505l-266 -1333l-804 -267l-698 267l71 356h297l-29 -147l422 -161l486 161l68 339h-1208l58 297h1209l38 191h-1208z" />
+    <glyph glyph-name="anchor" unicode="&#xf13d;" horiz-adv-x="1792" 
+d="M960 1280q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1792 352v-352q0 -22 -20 -30q-8 -2 -12 -2q-12 0 -23 9l-93 93q-119 -143 -318.5 -226.5t-429.5 -83.5t-429.5 83.5t-318.5 226.5l-93 -93q-9 -9 -23 -9q-4 0 -12 2q-20 8 -20 30v352
+q0 14 9 23t23 9h352q22 0 30 -20q8 -19 -7 -35l-100 -100q67 -91 189.5 -153.5t271.5 -82.5v647h-192q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h192v163q-58 34 -93 92.5t-35 128.5q0 106 75 181t181 75t181 -75t75 -181q0 -70 -35 -128.5t-93 -92.5v-163h192q26 0 45 -19
+t19 -45v-128q0 -26 -19 -45t-45 -19h-192v-647q149 20 271.5 82.5t189.5 153.5l-100 100q-15 16 -7 35q8 20 30 20h352q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="unlock_alt" unicode="&#xf13e;" horiz-adv-x="1152" 
+d="M1056 768q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v320q0 185 131.5 316.5t316.5 131.5t316.5 -131.5t131.5 -316.5q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45q0 106 -75 181t-181 75t-181 -75t-75 -181
+v-320h736z" />
+    <glyph glyph-name="bullseye" unicode="&#xf140;" 
+d="M1024 640q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM1152 640q0 159 -112.5 271.5t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM1280 640q0 -212 -150 -362t-362 -150t-362 150
+t-150 362t150 362t362 150t362 -150t150 -362zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640
+q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="ellipsis_horizontal" unicode="&#xf141;" horiz-adv-x="1408" 
+d="M384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM896 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM1408 800v-192q0 -40 -28 -68t-68 -28h-192
+q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" />
+    <glyph glyph-name="ellipsis_vertical" unicode="&#xf142;" horiz-adv-x="384" 
+d="M384 288v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 1312v-192q0 -40 -28 -68t-68 -28h-192
+q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" />
+    <glyph glyph-name="_303" unicode="&#xf143;" 
+d="M512 256q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM863 162q-13 233 -176.5 396.5t-396.5 176.5q-14 1 -24 -9t-10 -23v-128q0 -13 8.5 -22t21.5 -10q154 -11 264 -121t121 -264q1 -13 10 -21.5t22 -8.5h128
+q13 0 23 10t9 24zM1247 161q-5 154 -56 297.5t-139.5 260t-205 205t-260 139.5t-297.5 56q-14 1 -23 -9q-10 -10 -10 -23v-128q0 -13 9 -22t22 -10q204 -7 378 -111.5t278.5 -278.5t111.5 -378q1 -13 10 -22t22 -9h128q13 0 23 10q11 9 9 23zM1536 1120v-960
+q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="play_sign" unicode="&#xf144;" 
+d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1152 585q32 18 32 55t-32 55l-544 320q-31 19 -64 1q-32 -19 -32 -56v-640q0 -37 32 -56
+q16 -8 32 -8q17 0 32 9z" />
+    <glyph glyph-name="ticket" unicode="&#xf145;" horiz-adv-x="1792" 
+d="M1024 1084l316 -316l-572 -572l-316 316zM813 105l618 618q19 19 19 45t-19 45l-362 362q-18 18 -45 18t-45 -18l-618 -618q-19 -19 -19 -45t19 -45l362 -362q18 -18 45 -18t45 18zM1702 742l-907 -908q-37 -37 -90.5 -37t-90.5 37l-126 126q56 56 56 136t-56 136
+t-136 56t-136 -56l-125 126q-37 37 -37 90.5t37 90.5l907 906q37 37 90.5 37t90.5 -37l125 -125q-56 -56 -56 -136t56 -136t136 -56t136 56l126 -125q37 -37 37 -90.5t-37 -90.5z" />
+    <glyph glyph-name="minus_sign_alt" unicode="&#xf146;" 
+d="M1280 576v128q0 26 -19 45t-45 19h-896q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h896q26 0 45 19t19 45zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5
+t84.5 -203.5z" />
+    <glyph glyph-name="check_minus" unicode="&#xf147;" horiz-adv-x="1408" 
+d="M1152 736v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h832q14 0 23 -9t9 -23zM1280 288v832q0 66 -47 113t-113 47h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113zM1408 1120v-832q0 -119 -84.5 -203.5
+t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="level_up" unicode="&#xf148;" horiz-adv-x="1024" 
+d="M1018 933q-18 -37 -58 -37h-192v-864q0 -14 -9 -23t-23 -9h-704q-21 0 -29 18q-8 20 4 35l160 192q9 11 25 11h320v640h-192q-40 0 -58 37q-17 37 9 68l320 384q18 22 49 22t49 -22l320 -384q27 -32 9 -68z" />
+    <glyph glyph-name="level_down" unicode="&#xf149;" horiz-adv-x="1024" 
+d="M32 1280h704q13 0 22.5 -9.5t9.5 -23.5v-863h192q40 0 58 -37t-9 -69l-320 -384q-18 -22 -49 -22t-49 22l-320 384q-26 31 -9 69q18 37 58 37h192v640h-320q-14 0 -25 11l-160 192q-13 14 -4 34q9 19 29 19z" />
+    <glyph glyph-name="check_sign" unicode="&#xf14a;" 
+d="M685 237l614 614q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-467 -467l-211 211q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l358 -358q19 -19 45 -19t45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5
+t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="edit_sign" unicode="&#xf14b;" 
+d="M404 428l152 -152l-52 -52h-56v96h-96v56zM818 818q14 -13 -3 -30l-291 -291q-17 -17 -30 -3q-14 13 3 30l291 291q17 17 30 3zM544 128l544 544l-288 288l-544 -544v-288h288zM1152 736l92 92q28 28 28 68t-28 68l-152 152q-28 28 -68 28t-68 -28l-92 -92zM1536 1120
+v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="_312" unicode="&#xf14c;" 
+d="M1280 608v480q0 26 -19 45t-45 19h-480q-42 0 -59 -39q-17 -41 14 -70l144 -144l-534 -534q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l534 534l144 -144q18 -19 45 -19q12 0 25 5q39 17 39 59zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960
+q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="share_sign" unicode="&#xf14d;" 
+d="M1005 435l352 352q19 19 19 45t-19 45l-352 352q-30 31 -69 14q-40 -17 -40 -59v-160q-119 0 -216 -19.5t-162.5 -51t-114 -79t-76.5 -95.5t-44.5 -109t-21.5 -111.5t-5 -110.5q0 -181 167 -404q11 -12 25 -12q7 0 13 3q22 9 19 33q-44 354 62 473q46 52 130 75.5
+t224 23.5v-160q0 -42 40 -59q12 -5 24 -5q26 0 45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="compass" unicode="&#xf14e;" 
+d="M640 448l256 128l-256 128v-256zM1024 1039v-542l-512 -256v542zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103
+t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="collapse" unicode="&#xf150;" 
+d="M1145 861q18 -35 -5 -66l-320 -448q-19 -27 -52 -27t-52 27l-320 448q-23 31 -5 66q17 35 57 35h640q40 0 57 -35zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120
+v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="collapse_top" unicode="&#xf151;" 
+d="M1145 419q-17 -35 -57 -35h-640q-40 0 -57 35q-18 35 5 66l320 448q19 27 52 27t52 -27l320 -448q23 -31 5 -66zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120v-960
+q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="_317" unicode="&#xf152;" 
+d="M1088 640q0 -33 -27 -52l-448 -320q-31 -23 -66 -5q-35 17 -35 57v640q0 40 35 57q35 18 66 -5l448 -320q27 -19 27 -52zM1280 160v960q0 14 -9 23t-23 9h-960q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h960q14 0 23 9t9 23zM1536 1120v-960q0 -119 -84.5 -203.5
+t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="eur" unicode="&#xf153;" horiz-adv-x="1024" 
+d="M976 229l35 -159q3 -12 -3 -22.5t-17 -14.5l-5 -1q-4 -2 -10.5 -3.5t-16 -4.5t-21.5 -5.5t-25.5 -5t-30 -5t-33.5 -4.5t-36.5 -3t-38.5 -1q-234 0 -409 130.5t-238 351.5h-95q-13 0 -22.5 9.5t-9.5 22.5v113q0 13 9.5 22.5t22.5 9.5h66q-2 57 1 105h-67q-14 0 -23 9
+t-9 23v114q0 14 9 23t23 9h98q67 210 243.5 338t400.5 128q102 0 194 -23q11 -3 20 -15q6 -11 3 -24l-43 -159q-3 -13 -14 -19.5t-24 -2.5l-4 1q-4 1 -11.5 2.5l-17.5 3.5t-22.5 3.5t-26 3t-29 2.5t-29.5 1q-126 0 -226 -64t-150 -176h468q16 0 25 -12q10 -12 7 -26
+l-24 -114q-5 -26 -32 -26h-488q-3 -37 0 -105h459q15 0 25 -12q9 -12 6 -27l-24 -112q-2 -11 -11 -18.5t-20 -7.5h-387q48 -117 149.5 -185.5t228.5 -68.5q18 0 36 1.5t33.5 3.5t29.5 4.5t24.5 5t18.5 4.5l12 3l5 2q13 5 26 -2q12 -7 15 -21z" />
+    <glyph glyph-name="gbp" unicode="&#xf154;" horiz-adv-x="1024" 
+d="M1020 399v-367q0 -14 -9 -23t-23 -9h-956q-14 0 -23 9t-9 23v150q0 13 9.5 22.5t22.5 9.5h97v383h-95q-14 0 -23 9.5t-9 22.5v131q0 14 9 23t23 9h95v223q0 171 123.5 282t314.5 111q185 0 335 -125q9 -8 10 -20.5t-7 -22.5l-103 -127q-9 -11 -22 -12q-13 -2 -23 7
+q-5 5 -26 19t-69 32t-93 18q-85 0 -137 -47t-52 -123v-215h305q13 0 22.5 -9t9.5 -23v-131q0 -13 -9.5 -22.5t-22.5 -9.5h-305v-379h414v181q0 13 9 22.5t23 9.5h162q14 0 23 -9.5t9 -22.5z" />
+    <glyph glyph-name="usd" unicode="&#xf155;" horiz-adv-x="1024" 
+d="M978 351q0 -153 -99.5 -263.5t-258.5 -136.5v-175q0 -14 -9 -23t-23 -9h-135q-13 0 -22.5 9.5t-9.5 22.5v175q-66 9 -127.5 31t-101.5 44.5t-74 48t-46.5 37.5t-17.5 18q-17 21 -2 41l103 135q7 10 23 12q15 2 24 -9l2 -2q113 -99 243 -125q37 -8 74 -8q81 0 142.5 43
+t61.5 122q0 28 -15 53t-33.5 42t-58.5 37.5t-66 32t-80 32.5q-39 16 -61.5 25t-61.5 26.5t-62.5 31t-56.5 35.5t-53.5 42.5t-43.5 49t-35.5 58t-21 66.5t-8.5 78q0 138 98 242t255 134v180q0 13 9.5 22.5t22.5 9.5h135q14 0 23 -9t9 -23v-176q57 -6 110.5 -23t87 -33.5
+t63.5 -37.5t39 -29t15 -14q17 -18 5 -38l-81 -146q-8 -15 -23 -16q-14 -3 -27 7q-3 3 -14.5 12t-39 26.5t-58.5 32t-74.5 26t-85.5 11.5q-95 0 -155 -43t-60 -111q0 -26 8.5 -48t29.5 -41.5t39.5 -33t56 -31t60.5 -27t70 -27.5q53 -20 81 -31.5t76 -35t75.5 -42.5t62 -50
+t53 -63.5t31.5 -76.5t13 -94z" />
+    <glyph glyph-name="inr" unicode="&#xf156;" horiz-adv-x="898" 
+d="M898 1066v-102q0 -14 -9 -23t-23 -9h-168q-23 -144 -129 -234t-276 -110q167 -178 459 -536q14 -16 4 -34q-8 -18 -29 -18h-195q-16 0 -25 12q-306 367 -498 571q-9 9 -9 22v127q0 13 9.5 22.5t22.5 9.5h112q132 0 212.5 43t102.5 125h-427q-14 0 -23 9t-9 23v102
+q0 14 9 23t23 9h413q-57 113 -268 113h-145q-13 0 -22.5 9.5t-9.5 22.5v133q0 14 9 23t23 9h832q14 0 23 -9t9 -23v-102q0 -14 -9 -23t-23 -9h-233q47 -61 64 -144h171q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="jpy" unicode="&#xf157;" horiz-adv-x="1027" 
+d="M603 0h-172q-13 0 -22.5 9t-9.5 23v330h-288q-13 0 -22.5 9t-9.5 23v103q0 13 9.5 22.5t22.5 9.5h288v85h-288q-13 0 -22.5 9t-9.5 23v104q0 13 9.5 22.5t22.5 9.5h214l-321 578q-8 16 0 32q10 16 28 16h194q19 0 29 -18l215 -425q19 -38 56 -125q10 24 30.5 68t27.5 61
+l191 420q8 19 29 19h191q17 0 27 -16q9 -14 1 -31l-313 -579h215q13 0 22.5 -9.5t9.5 -22.5v-104q0 -14 -9.5 -23t-22.5 -9h-290v-85h290q13 0 22.5 -9.5t9.5 -22.5v-103q0 -14 -9.5 -23t-22.5 -9h-290v-330q0 -13 -9.5 -22.5t-22.5 -9.5z" />
+    <glyph glyph-name="rub" unicode="&#xf158;" horiz-adv-x="1280" 
+d="M1043 971q0 100 -65 162t-171 62h-320v-448h320q106 0 171 62t65 162zM1280 971q0 -193 -126.5 -315t-326.5 -122h-340v-118h505q14 0 23 -9t9 -23v-128q0 -14 -9 -23t-23 -9h-505v-192q0 -14 -9.5 -23t-22.5 -9h-167q-14 0 -23 9t-9 23v192h-224q-14 0 -23 9t-9 23v128
+q0 14 9 23t23 9h224v118h-224q-14 0 -23 9t-9 23v149q0 13 9 22.5t23 9.5h224v629q0 14 9 23t23 9h539q200 0 326.5 -122t126.5 -315z" />
+    <glyph glyph-name="krw" unicode="&#xf159;" horiz-adv-x="1792" 
+d="M514 341l81 299h-159l75 -300q1 -1 1 -3t1 -3q0 1 0.5 3.5t0.5 3.5zM630 768l35 128h-292l32 -128h225zM822 768h139l-35 128h-70zM1271 340l78 300h-162l81 -299q0 -1 0.5 -3.5t1.5 -3.5q0 1 0.5 3t0.5 3zM1382 768l33 128h-297l34 -128h230zM1792 736v-64q0 -14 -9 -23
+t-23 -9h-213l-164 -616q-7 -24 -31 -24h-159q-24 0 -31 24l-166 616h-209l-167 -616q-7 -24 -31 -24h-159q-11 0 -19.5 7t-10.5 17l-160 616h-208q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h175l-33 128h-142q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h109l-89 344q-5 15 5 28
+q10 12 26 12h137q26 0 31 -24l90 -360h359l97 360q7 24 31 24h126q24 0 31 -24l98 -360h365l93 360q5 24 31 24h137q16 0 26 -12q10 -13 5 -28l-91 -344h111q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-145l-34 -128h179q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="btc" unicode="&#xf15a;" horiz-adv-x="1280" 
+d="M1167 896q18 -182 -131 -258q117 -28 175 -103t45 -214q-7 -71 -32.5 -125t-64.5 -89t-97 -58.5t-121.5 -34.5t-145.5 -15v-255h-154v251q-80 0 -122 1v-252h-154v255q-18 0 -54 0.5t-55 0.5h-200l31 183h111q50 0 58 51v402h16q-6 1 -16 1v287q-13 68 -89 68h-111v164
+l212 -1q64 0 97 1v252h154v-247q82 2 122 2v245h154v-252q79 -7 140 -22.5t113 -45t82.5 -78t36.5 -114.5zM952 351q0 36 -15 64t-37 46t-57.5 30.5t-65.5 18.5t-74 9t-69 3t-64.5 -1t-47.5 -1v-338q8 0 37 -0.5t48 -0.5t53 1.5t58.5 4t57 8.5t55.5 14t47.5 21t39.5 30
+t24.5 40t9.5 51zM881 827q0 33 -12.5 58.5t-30.5 42t-48 28t-55 16.5t-61.5 8t-58 2.5t-54 -1t-39.5 -0.5v-307q5 0 34.5 -0.5t46.5 0t50 2t55 5.5t51.5 11t48.5 18.5t37 27t27 38.5t9 51z" />
+    <glyph glyph-name="file" unicode="&#xf15b;" 
+d="M1024 1024v472q22 -14 36 -28l408 -408q14 -14 28 -36h-472zM896 992q0 -40 28 -68t68 -28h544v-1056q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h800v-544z" />
+    <glyph glyph-name="file_text" unicode="&#xf15c;" 
+d="M1468 1060q14 -14 28 -36h-472v472q22 -14 36 -28zM992 896h544v-1056q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h800v-544q0 -40 28 -68t68 -28zM1152 160v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704
+q14 0 23 9t9 23zM1152 416v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM1152 672v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23z" />
+    <glyph glyph-name="sort_by_alphabet" unicode="&#xf15d;" horiz-adv-x="1664" 
+d="M1191 1128h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1572 -23
+v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567v-89l-369 -530q-6 -8 -21 -26l-11 -11v-2l14 2q9 2 30 2h248v119h121zM1661 874v-106h-288v106h75l-47 144h-243l-47 -144h75v-106h-287v106h70l230 662h162
+l230 -662h70z" />
+    <glyph glyph-name="_329" unicode="&#xf15e;" horiz-adv-x="1664" 
+d="M1191 104h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1661 -150
+v-106h-288v106h75l-47 144h-243l-47 -144h75v-106h-287v106h70l230 662h162l230 -662h70zM1572 1001v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567v-89l-369 -530q-6 -8 -21 -26l-11 -10v-3l14 3q9 1 30 1h248
+v119h121z" />
+    <glyph glyph-name="sort_by_attributes" unicode="&#xf160;" horiz-adv-x="1792" 
+d="M736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1792 -32v-192q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h832
+q14 0 23 -9t9 -23zM1600 480v-192q0 -14 -9 -23t-23 -9h-640q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h640q14 0 23 -9t9 -23zM1408 992v-192q0 -14 -9 -23t-23 -9h-448q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h448q14 0 23 -9t9 -23zM1216 1504v-192q0 -14 -9 -23t-23 -9h-256
+q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h256q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="sort_by_attributes_alt" unicode="&#xf161;" horiz-adv-x="1792" 
+d="M1216 -32v-192q0 -14 -9 -23t-23 -9h-256q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h256q14 0 23 -9t9 -23zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192
+q14 0 23 -9t9 -23zM1408 480v-192q0 -14 -9 -23t-23 -9h-448q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h448q14 0 23 -9t9 -23zM1600 992v-192q0 -14 -9 -23t-23 -9h-640q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h640q14 0 23 -9t9 -23zM1792 1504v-192q0 -14 -9 -23t-23 -9h-832
+q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h832q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="sort_by_order" unicode="&#xf162;" 
+d="M1346 223q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23
+zM1486 165q0 -62 -13 -121.5t-41 -114t-68 -95.5t-98.5 -65.5t-127.5 -24.5q-62 0 -108 16q-24 8 -42 15l39 113q15 -7 31 -11q37 -13 75 -13q84 0 134.5 58.5t66.5 145.5h-2q-21 -23 -61.5 -37t-84.5 -14q-106 0 -173 71.5t-67 172.5q0 105 72 178t181 73q123 0 205 -94.5
+t82 -252.5zM1456 882v-114h-469v114h167v432q0 7 0.5 19t0.5 17v16h-2l-7 -12q-8 -13 -26 -31l-62 -58l-82 86l192 185h123v-654h165z" />
+    <glyph glyph-name="sort_by_order_alt" unicode="&#xf163;" 
+d="M1346 1247q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9
+t9 -23zM1456 -142v-114h-469v114h167v432q0 7 0.5 19t0.5 17v16h-2l-7 -12q-8 -13 -26 -31l-62 -58l-82 86l192 185h123v-654h165zM1486 1189q0 -62 -13 -121.5t-41 -114t-68 -95.5t-98.5 -65.5t-127.5 -24.5q-62 0 -108 16q-24 8 -42 15l39 113q15 -7 31 -11q37 -13 75 -13
+q84 0 134.5 58.5t66.5 145.5h-2q-21 -23 -61.5 -37t-84.5 -14q-106 0 -173 71.5t-67 172.5q0 105 72 178t181 73q123 0 205 -94.5t82 -252.5z" />
+    <glyph glyph-name="_334" unicode="&#xf164;" horiz-adv-x="1664" 
+d="M256 192q0 26 -19 45t-45 19q-27 0 -45.5 -19t-18.5 -45q0 -27 18.5 -45.5t45.5 -18.5q26 0 45 18.5t19 45.5zM416 704v-640q0 -26 -19 -45t-45 -19h-288q-26 0 -45 19t-19 45v640q0 26 19 45t45 19h288q26 0 45 -19t19 -45zM1600 704q0 -86 -55 -149q15 -44 15 -76
+q3 -76 -43 -137q17 -56 0 -117q-15 -57 -54 -94q9 -112 -49 -181q-64 -76 -197 -78h-36h-76h-17q-66 0 -144 15.5t-121.5 29t-120.5 39.5q-123 43 -158 44q-26 1 -45 19.5t-19 44.5v641q0 25 18 43.5t43 20.5q24 2 76 59t101 121q68 87 101 120q18 18 31 48t17.5 48.5
+t13.5 60.5q7 39 12.5 61t19.5 52t34 50q19 19 45 19q46 0 82.5 -10.5t60 -26t40 -40.5t24 -45t12 -50t5 -45t0.5 -39q0 -38 -9.5 -76t-19 -60t-27.5 -56q-3 -6 -10 -18t-11 -22t-8 -24h277q78 0 135 -57t57 -135z" />
+    <glyph glyph-name="_335" unicode="&#xf165;" horiz-adv-x="1664" 
+d="M256 960q0 -26 -19 -45t-45 -19q-27 0 -45.5 19t-18.5 45q0 27 18.5 45.5t45.5 18.5q26 0 45 -18.5t19 -45.5zM416 448v640q0 26 -19 45t-45 19h-288q-26 0 -45 -19t-19 -45v-640q0 -26 19 -45t45 -19h288q26 0 45 19t19 45zM1545 597q55 -61 55 -149q-1 -78 -57.5 -135
+t-134.5 -57h-277q4 -14 8 -24t11 -22t10 -18q18 -37 27 -57t19 -58.5t10 -76.5q0 -24 -0.5 -39t-5 -45t-12 -50t-24 -45t-40 -40.5t-60 -26t-82.5 -10.5q-26 0 -45 19q-20 20 -34 50t-19.5 52t-12.5 61q-9 42 -13.5 60.5t-17.5 48.5t-31 48q-33 33 -101 120q-49 64 -101 121
+t-76 59q-25 2 -43 20.5t-18 43.5v641q0 26 19 44.5t45 19.5q35 1 158 44q77 26 120.5 39.5t121.5 29t144 15.5h17h76h36q133 -2 197 -78q58 -69 49 -181q39 -37 54 -94q17 -61 0 -117q46 -61 43 -137q0 -32 -15 -76z" />
+    <glyph glyph-name="youtube_sign" unicode="&#xf166;" 
+d="M919 233v157q0 50 -29 50q-17 0 -33 -16v-224q16 -16 33 -16q29 0 29 49zM1103 355h66v34q0 51 -33 51t-33 -51v-34zM532 621v-70h-80v-423h-74v423h-78v70h232zM733 495v-367h-67v40q-39 -45 -76 -45q-33 0 -42 28q-6 17 -6 54v290h66v-270q0 -24 1 -26q1 -15 15 -15
+q20 0 42 31v280h67zM985 384v-146q0 -52 -7 -73q-12 -42 -53 -42q-35 0 -68 41v-36h-67v493h67v-161q32 40 68 40q41 0 53 -42q7 -21 7 -74zM1236 255v-9q0 -29 -2 -43q-3 -22 -15 -40q-27 -40 -80 -40q-52 0 -81 38q-21 27 -21 86v129q0 59 20 86q29 38 80 38t78 -38
+q21 -29 21 -86v-76h-133v-65q0 -51 34 -51q24 0 30 26q0 1 0.5 7t0.5 16.5v21.5h68zM785 1079v-156q0 -51 -32 -51t-32 51v156q0 52 32 52t32 -52zM1318 366q0 177 -19 260q-10 44 -43 73.5t-76 34.5q-136 15 -412 15q-275 0 -411 -15q-44 -5 -76.5 -34.5t-42.5 -73.5
+q-20 -87 -20 -260q0 -176 20 -260q10 -43 42.5 -73t75.5 -35q137 -15 412 -15t412 15q43 5 75.5 35t42.5 73q20 84 20 260zM563 1017l90 296h-75l-51 -195l-53 195h-78q7 -23 23 -69l24 -69q35 -103 46 -158v-201h74v201zM852 936v130q0 58 -21 87q-29 38 -78 38
+q-51 0 -78 -38q-21 -29 -21 -87v-130q0 -58 21 -87q27 -38 78 -38q49 0 78 38q21 27 21 87zM1033 816h67v370h-67v-283q-22 -31 -42 -31q-15 0 -16 16q-1 2 -1 26v272h-67v-293q0 -37 6 -55q11 -27 43 -27q36 0 77 45v-40zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5
+h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="youtube" unicode="&#xf167;" 
+d="M971 292v-211q0 -67 -39 -67q-23 0 -45 22v301q22 22 45 22q39 0 39 -67zM1309 291v-46h-90v46q0 68 45 68t45 -68zM343 509h107v94h-312v-94h105v-569h100v569zM631 -60h89v494h-89v-378q-30 -42 -57 -42q-18 0 -21 21q-1 3 -1 35v364h-89v-391q0 -49 8 -73
+q12 -37 58 -37q48 0 102 61v-54zM1060 88v197q0 73 -9 99q-17 56 -71 56q-50 0 -93 -54v217h-89v-663h89v48q45 -55 93 -55q54 0 71 55q9 27 9 100zM1398 98v13h-91q0 -51 -2 -61q-7 -36 -40 -36q-46 0 -46 69v87h179v103q0 79 -27 116q-39 51 -106 51q-68 0 -107 -51
+q-28 -37 -28 -116v-173q0 -79 29 -116q39 -51 108 -51q72 0 108 53q18 27 21 54q2 9 2 58zM790 1011v210q0 69 -43 69t-43 -69v-210q0 -70 43 -70t43 70zM1509 260q0 -234 -26 -350q-14 -59 -58 -99t-102 -46q-184 -21 -555 -21t-555 21q-58 6 -102.5 46t-57.5 99
+q-26 112 -26 350q0 234 26 350q14 59 58 99t103 47q183 20 554 20t555 -20q58 -7 102.5 -47t57.5 -99q26 -112 26 -350zM511 1536h102l-121 -399v-271h-100v271q-14 74 -61 212q-37 103 -65 187h106l71 -263zM881 1203v-175q0 -81 -28 -118q-38 -51 -106 -51q-67 0 -105 51
+q-28 38 -28 118v175q0 80 28 117q38 51 105 51q68 0 106 -51q28 -37 28 -117zM1216 1365v-499h-91v55q-53 -62 -103 -62q-46 0 -59 37q-8 24 -8 75v394h91v-367q0 -33 1 -35q3 -22 21 -22q27 0 57 43v381h91z" />
+    <glyph glyph-name="xing" unicode="&#xf168;" horiz-adv-x="1408" 
+d="M597 869q-10 -18 -257 -456q-27 -46 -65 -46h-239q-21 0 -31 17t0 36l253 448q1 0 0 1l-161 279q-12 22 -1 37q9 15 32 15h239q40 0 66 -45zM1403 1511q11 -16 0 -37l-528 -934v-1l336 -615q11 -20 1 -37q-10 -15 -32 -15h-239q-42 0 -66 45l-339 622q18 32 531 942
+q25 45 64 45h241q22 0 31 -15z" />
+    <glyph glyph-name="xing_sign" unicode="&#xf169;" 
+d="M685 771q0 1 -126 222q-21 34 -52 34h-184q-18 0 -26 -11q-7 -12 1 -29l125 -216v-1l-196 -346q-9 -14 0 -28q8 -13 24 -13h185q31 0 50 36zM1309 1268q-7 12 -24 12h-187q-30 0 -49 -35l-411 -729q1 -2 262 -481q20 -35 52 -35h184q18 0 25 12q8 13 -1 28l-260 476v1
+l409 723q8 16 0 28zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="youtube_play" unicode="&#xf16a;" horiz-adv-x="1792" 
+d="M711 408l484 250l-484 253v-503zM896 1270q168 0 324.5 -4.5t229.5 -9.5l73 -4q1 0 17 -1.5t23 -3t23.5 -4.5t28.5 -8t28 -13t31 -19.5t29 -26.5q6 -6 15.5 -18.5t29 -58.5t26.5 -101q8 -64 12.5 -136.5t5.5 -113.5v-40v-136q1 -145 -18 -290q-7 -55 -25 -99.5t-32 -61.5
+l-14 -17q-14 -15 -29 -26.5t-31 -19t-28 -12.5t-28.5 -8t-24 -4.5t-23 -3t-16.5 -1.5q-251 -19 -627 -19q-207 2 -359.5 6.5t-200.5 7.5l-49 4l-36 4q-36 5 -54.5 10t-51 21t-56.5 41q-6 6 -15.5 18.5t-29 58.5t-26.5 101q-8 64 -12.5 136.5t-5.5 113.5v40v136
+q-1 145 18 290q7 55 25 99.5t32 61.5l14 17q14 15 29 26.5t31 19.5t28 13t28.5 8t23.5 4.5t23 3t17 1.5q251 18 627 18z" />
+    <glyph glyph-name="dropbox" unicode="&#xf16b;" horiz-adv-x="1792" 
+d="M402 829l494 -305l-342 -285l-490 319zM1388 274v-108l-490 -293v-1l-1 1l-1 -1v1l-489 293v108l147 -96l342 284v2l1 -1l1 1v-2l343 -284zM554 1418l342 -285l-494 -304l-338 270zM1390 829l338 -271l-489 -319l-343 285zM1239 1418l489 -319l-338 -270l-494 304z" />
+    <glyph glyph-name="stackexchange" unicode="&#xf16c;" 
+d="M1289 -96h-1118v480h-160v-640h1438v640h-160v-480zM347 428l33 157l783 -165l-33 -156zM450 802l67 146l725 -339l-67 -145zM651 1158l102 123l614 -513l-102 -123zM1048 1536l477 -641l-128 -96l-477 641zM330 65v159h800v-159h-800z" />
+    <glyph glyph-name="instagram" unicode="&#xf16d;" 
+d="M1024 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1162 640q0 -164 -115 -279t-279 -115t-279 115t-115 279t115 279t279 115t279 -115t115 -279zM1270 1050q0 -38 -27 -65t-65 -27t-65 27t-27 65t27 65t65 27t65 -27t27 -65zM768 1270
+q-7 0 -76.5 0.5t-105.5 0t-96.5 -3t-103 -10t-71.5 -18.5q-50 -20 -88 -58t-58 -88q-11 -29 -18.5 -71.5t-10 -103t-3 -96.5t0 -105.5t0.5 -76.5t-0.5 -76.5t0 -105.5t3 -96.5t10 -103t18.5 -71.5q20 -50 58 -88t88 -58q29 -11 71.5 -18.5t103 -10t96.5 -3t105.5 0t76.5 0.5
+t76.5 -0.5t105.5 0t96.5 3t103 10t71.5 18.5q50 20 88 58t58 88q11 29 18.5 71.5t10 103t3 96.5t0 105.5t-0.5 76.5t0.5 76.5t0 105.5t-3 96.5t-10 103t-18.5 71.5q-20 50 -58 88t-88 58q-29 11 -71.5 18.5t-103 10t-96.5 3t-105.5 0t-76.5 -0.5zM1536 640q0 -229 -5 -317
+q-10 -208 -124 -322t-322 -124q-88 -5 -317 -5t-317 5q-208 10 -322 124t-124 322q-5 88 -5 317t5 317q10 208 124 322t322 124q88 5 317 5t317 -5q208 -10 322 -124t124 -322q5 -88 5 -317z" />
+    <glyph glyph-name="flickr" unicode="&#xf16e;" 
+d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM698 640q0 88 -62 150t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150zM1262 640q0 88 -62 150
+t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150z" />
+    <glyph glyph-name="adn" unicode="&#xf170;" 
+d="M768 914l201 -306h-402zM1133 384h94l-459 691l-459 -691h94l104 160h522zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="f171" unicode="&#xf171;" horiz-adv-x="1408" 
+d="M815 677q8 -63 -50.5 -101t-111.5 -6q-39 17 -53.5 58t-0.5 82t52 58q36 18 72.5 12t64 -35.5t27.5 -67.5zM926 698q-14 107 -113 164t-197 13q-63 -28 -100.5 -88.5t-34.5 -129.5q4 -91 77.5 -155t165.5 -56q91 8 152 84t50 168zM1165 1240q-20 27 -56 44.5t-58 22
+t-71 12.5q-291 47 -566 -2q-43 -7 -66 -12t-55 -22t-50 -43q30 -28 76 -45.5t73.5 -22t87.5 -11.5q228 -29 448 -1q63 8 89.5 12t72.5 21.5t75 46.5zM1222 205q-8 -26 -15.5 -76.5t-14 -84t-28.5 -70t-58 -56.5q-86 -48 -189.5 -71.5t-202 -22t-201.5 18.5q-46 8 -81.5 18
+t-76.5 27t-73 43.5t-52 61.5q-25 96 -57 292l6 16l18 9q223 -148 506.5 -148t507.5 148q21 -6 24 -23t-5 -45t-8 -37zM1403 1166q-26 -167 -111 -655q-5 -30 -27 -56t-43.5 -40t-54.5 -31q-252 -126 -610 -88q-248 27 -394 139q-15 12 -25.5 26.5t-17 35t-9 34t-6 39.5
+t-5.5 35q-9 50 -26.5 150t-28 161.5t-23.5 147.5t-22 158q3 26 17.5 48.5t31.5 37.5t45 30t46 22.5t48 18.5q125 46 313 64q379 37 676 -50q155 -46 215 -122q16 -20 16.5 -51t-5.5 -54z" />
+    <glyph glyph-name="bitbucket_sign" unicode="&#xf172;" 
+d="M848 666q0 43 -41 66t-77 1q-43 -20 -42.5 -72.5t43.5 -70.5q39 -23 81 4t36 72zM928 682q8 -66 -36 -121t-110 -61t-119 40t-56 113q-2 49 25.5 93t72.5 64q70 31 141.5 -10t81.5 -118zM1100 1073q-20 -21 -53.5 -34t-53 -16t-63.5 -8q-155 -20 -324 0q-44 6 -63 9.5
+t-52.5 16t-54.5 32.5q13 19 36 31t40 15.5t47 8.5q198 35 408 1q33 -5 51 -8.5t43 -16t39 -31.5zM1142 327q0 7 5.5 26.5t3 32t-17.5 16.5q-161 -106 -365 -106t-366 106l-12 -6l-5 -12q26 -154 41 -210q47 -81 204 -108q249 -46 428 53q34 19 49 51.5t22.5 85.5t12.5 71z
+M1272 1020q9 53 -8 75q-43 55 -155 88q-216 63 -487 36q-132 -12 -226 -46q-38 -15 -59.5 -25t-47 -34t-29.5 -54q8 -68 19 -138t29 -171t24 -137q1 -5 5 -31t7 -36t12 -27t22 -28q105 -80 284 -100q259 -28 440 63q24 13 39.5 23t31 29t19.5 40q48 267 80 473zM1536 1120
+v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="tumblr" unicode="&#xf173;" horiz-adv-x="1024" 
+d="M944 207l80 -237q-23 -35 -111 -66t-177 -32q-104 -2 -190.5 26t-142.5 74t-95 106t-55.5 120t-16.5 118v544h-168v215q72 26 129 69.5t91 90t58 102t34 99t15 88.5q1 5 4.5 8.5t7.5 3.5h244v-424h333v-252h-334v-518q0 -30 6.5 -56t22.5 -52.5t49.5 -41.5t81.5 -14
+q78 2 134 29z" />
+    <glyph glyph-name="tumblr_sign" unicode="&#xf174;" 
+d="M1136 75l-62 183q-44 -22 -103 -22q-36 -1 -62 10.5t-38.5 31.5t-17.5 40.5t-5 43.5v398h257v194h-256v326h-188q-8 0 -9 -10q-5 -44 -17.5 -87t-39 -95t-77 -95t-118.5 -68v-165h130v-418q0 -57 21.5 -115t65 -111t121 -85.5t176.5 -30.5q69 1 136.5 25t85.5 50z
+M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="long_arrow_down" unicode="&#xf175;" horiz-adv-x="768" 
+d="M765 237q8 -19 -5 -35l-350 -384q-10 -10 -23 -10q-14 0 -24 10l-355 384q-13 16 -5 35q9 19 29 19h224v1248q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1248h224q21 0 29 -19z" />
+    <glyph glyph-name="long_arrow_up" unicode="&#xf176;" horiz-adv-x="768" 
+d="M765 1043q-9 -19 -29 -19h-224v-1248q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1248h-224q-21 0 -29 19t5 35l350 384q10 10 23 10q14 0 24 -10l355 -384q13 -16 5 -35z" />
+    <glyph glyph-name="long_arrow_left" unicode="&#xf177;" horiz-adv-x="1792" 
+d="M1792 736v-192q0 -14 -9 -23t-23 -9h-1248v-224q0 -21 -19 -29t-35 5l-384 350q-10 10 -10 23q0 14 10 24l384 354q16 14 35 6q19 -9 19 -29v-224h1248q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="long_arrow_right" unicode="&#xf178;" horiz-adv-x="1792" 
+d="M1728 643q0 -14 -10 -24l-384 -354q-16 -14 -35 -6q-19 9 -19 29v224h-1248q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h1248v224q0 21 19 29t35 -5l384 -350q10 -10 10 -23z" />
+    <glyph glyph-name="apple" unicode="&#xf179;" horiz-adv-x="1408" 
+d="M1393 321q-39 -125 -123 -250q-129 -196 -257 -196q-49 0 -140 32q-86 32 -151 32q-61 0 -142 -33q-81 -34 -132 -34q-152 0 -301 259q-147 261 -147 503q0 228 113 374q113 144 284 144q72 0 177 -30q104 -30 138 -30q45 0 143 34q102 34 173 34q119 0 213 -65
+q52 -36 104 -100q-79 -67 -114 -118q-65 -94 -65 -207q0 -124 69 -223t158 -126zM1017 1494q0 -61 -29 -136q-30 -75 -93 -138q-54 -54 -108 -72q-37 -11 -104 -17q3 149 78 257q74 107 250 148q1 -3 2.5 -11t2.5 -11q0 -4 0.5 -10t0.5 -10z" />
+    <glyph glyph-name="windows" unicode="&#xf17a;" horiz-adv-x="1664" 
+d="M682 530v-651l-682 94v557h682zM682 1273v-659h-682v565zM1664 530v-786l-907 125v661h907zM1664 1408v-794h-907v669z" />
+    <glyph glyph-name="android" unicode="&#xf17b;" horiz-adv-x="1408" 
+d="M493 1053q16 0 27.5 11.5t11.5 27.5t-11.5 27.5t-27.5 11.5t-27 -11.5t-11 -27.5t11 -27.5t27 -11.5zM915 1053q16 0 27 11.5t11 27.5t-11 27.5t-27 11.5t-27.5 -11.5t-11.5 -27.5t11.5 -27.5t27.5 -11.5zM103 869q42 0 72 -30t30 -72v-430q0 -43 -29.5 -73t-72.5 -30
+t-73 30t-30 73v430q0 42 30 72t73 30zM1163 850v-666q0 -46 -32 -78t-77 -32h-75v-227q0 -43 -30 -73t-73 -30t-73 30t-30 73v227h-138v-227q0 -43 -30 -73t-73 -30q-42 0 -72 30t-30 73l-1 227h-74q-46 0 -78 32t-32 78v666h918zM931 1255q107 -55 171 -153.5t64 -215.5
+h-925q0 117 64 215.5t172 153.5l-71 131q-7 13 5 20q13 6 20 -6l72 -132q95 42 201 42t201 -42l72 132q7 12 20 6q12 -7 5 -20zM1408 767v-430q0 -43 -30 -73t-73 -30q-42 0 -72 30t-30 73v430q0 43 30 72.5t72 29.5q43 0 73 -29.5t30 -72.5z" />
+    <glyph glyph-name="linux" unicode="&#xf17c;" 
+d="M663 1125q-11 -1 -15.5 -10.5t-8.5 -9.5q-5 -1 -5 5q0 12 19 15h10zM750 1111q-4 -1 -11.5 6.5t-17.5 4.5q24 11 32 -2q3 -6 -3 -9zM399 684q-4 1 -6 -3t-4.5 -12.5t-5.5 -13.5t-10 -13q-10 -11 -1 -12q4 -1 12.5 7t12.5 18q1 3 2 7t2 6t1.5 4.5t0.5 4v3t-1 2.5t-3 2z
+M1254 325q0 18 -55 42q4 15 7.5 27.5t5 26t3 21.5t0.5 22.5t-1 19.5t-3.5 22t-4 20.5t-5 25t-5.5 26.5q-10 48 -47 103t-72 75q24 -20 57 -83q87 -162 54 -278q-11 -40 -50 -42q-31 -4 -38.5 18.5t-8 83.5t-11.5 107q-9 39 -19.5 69t-19.5 45.5t-15.5 24.5t-13 15t-7.5 7
+q-14 62 -31 103t-29.5 56t-23.5 33t-15 40q-4 21 6 53.5t4.5 49.5t-44.5 25q-15 3 -44.5 18t-35.5 16q-8 1 -11 26t8 51t36 27q37 3 51 -30t4 -58q-11 -19 -2 -26.5t30 -0.5q13 4 13 36v37q-5 30 -13.5 50t-21 30.5t-23.5 15t-27 7.5q-107 -8 -89 -134q0 -15 -1 -15
+q-9 9 -29.5 10.5t-33 -0.5t-15.5 5q1 57 -16 90t-45 34q-27 1 -41.5 -27.5t-16.5 -59.5q-1 -15 3.5 -37t13 -37.5t15.5 -13.5q10 3 16 14q4 9 -7 8q-7 0 -15.5 14.5t-9.5 33.5q-1 22 9 37t34 14q17 0 27 -21t9.5 -39t-1.5 -22q-22 -15 -31 -29q-8 -12 -27.5 -23.5
+t-20.5 -12.5q-13 -14 -15.5 -27t7.5 -18q14 -8 25 -19.5t16 -19t18.5 -13t35.5 -6.5q47 -2 102 15q2 1 23 7t34.5 10.5t29.5 13t21 17.5q9 14 20 8q5 -3 6.5 -8.5t-3 -12t-16.5 -9.5q-20 -6 -56.5 -21.5t-45.5 -19.5q-44 -19 -70 -23q-25 -5 -79 2q-10 2 -9 -2t17 -19
+q25 -23 67 -22q17 1 36 7t36 14t33.5 17.5t30 17t24.5 12t17.5 2.5t8.5 -11q0 -2 -1 -4.5t-4 -5t-6 -4.5t-8.5 -5t-9 -4.5t-10 -5t-9.5 -4.5q-28 -14 -67.5 -44t-66.5 -43t-49 -1q-21 11 -63 73q-22 31 -25 22q-1 -3 -1 -10q0 -25 -15 -56.5t-29.5 -55.5t-21 -58t11.5 -63
+q-23 -6 -62.5 -90t-47.5 -141q-2 -18 -1.5 -69t-5.5 -59q-8 -24 -29 -3q-32 31 -36 94q-2 28 4 56q4 19 -1 18q-2 -1 -4 -5q-36 -65 10 -166q5 -12 25 -28t24 -20q20 -23 104 -90.5t93 -76.5q16 -15 17.5 -38t-14 -43t-45.5 -23q8 -15 29 -44.5t28 -54t7 -70.5q46 24 7 92
+q-4 8 -10.5 16t-9.5 12t-2 6q3 5 13 9.5t20 -2.5q46 -52 166 -36q133 15 177 87q23 38 34 30q12 -6 10 -52q-1 -25 -23 -92q-9 -23 -6 -37.5t24 -15.5q3 19 14.5 77t13.5 90q2 21 -6.5 73.5t-7.5 97t23 70.5q15 18 51 18q1 37 34.5 53t72.5 10.5t60 -22.5zM626 1152
+q3 17 -2.5 30t-11.5 15q-9 2 -9 -7q2 -5 5 -6q10 0 7 -15q-3 -20 8 -20q3 0 3 3zM1045 955q-2 8 -6.5 11.5t-13 5t-14.5 5.5q-5 3 -9.5 8t-7 8t-5.5 6.5t-4 4t-4 -1.5q-14 -16 7 -43.5t39 -31.5q9 -1 14.5 8t3.5 20zM867 1168q0 11 -5 19.5t-11 12.5t-9 3q-6 0 -8 -2t0 -4
+t5 -3q14 -4 18 -31q0 -3 8 2q2 2 2 3zM921 1401q0 2 -2.5 5t-9 7t-9.5 6q-15 15 -24 15q-9 -1 -11.5 -7.5t-1 -13t-0.5 -12.5q-1 -4 -6 -10.5t-6 -9t3 -8.5q4 -3 8 0t11 9t15 9q1 1 9 1t15 2t9 7zM1486 60q20 -12 31 -24.5t12 -24t-2.5 -22.5t-15.5 -22t-23.5 -19.5
+t-30 -18.5t-31.5 -16.5t-32 -15.5t-27 -13q-38 -19 -85.5 -56t-75.5 -64q-17 -16 -68 -19.5t-89 14.5q-18 9 -29.5 23.5t-16.5 25.5t-22 19.5t-47 9.5q-44 1 -130 1q-19 0 -57 -1.5t-58 -2.5q-44 -1 -79.5 -15t-53.5 -30t-43.5 -28.5t-53.5 -11.5q-29 1 -111 31t-146 43
+q-19 4 -51 9.5t-50 9t-39.5 9.5t-33.5 14.5t-17 19.5q-10 23 7 66.5t18 54.5q1 16 -4 40t-10 42.5t-4.5 36.5t10.5 27q14 12 57 14t60 12q30 18 42 35t12 51q21 -73 -32 -106q-32 -20 -83 -15q-34 3 -43 -10q-13 -15 5 -57q2 -6 8 -18t8.5 -18t4.5 -17t1 -22q0 -15 -17 -49
+t-14 -48q3 -17 37 -26q20 -6 84.5 -18.5t99.5 -20.5q24 -6 74 -22t82.5 -23t55.5 -4q43 6 64.5 28t23 48t-7.5 58.5t-19 52t-20 36.5q-121 190 -169 242q-68 74 -113 40q-11 -9 -15 15q-3 16 -2 38q1 29 10 52t24 47t22 42q8 21 26.5 72t29.5 78t30 61t39 54
+q110 143 124 195q-12 112 -16 310q-2 90 24 151.5t106 104.5q39 21 104 21q53 1 106 -13.5t89 -41.5q57 -42 91.5 -121.5t29.5 -147.5q-5 -95 30 -214q34 -113 133 -218q55 -59 99.5 -163t59.5 -191q8 -49 5 -84.5t-12 -55.5t-20 -22q-10 -2 -23.5 -19t-27 -35.5
+t-40.5 -33.5t-61 -14q-18 1 -31.5 5t-22.5 13.5t-13.5 15.5t-11.5 20.5t-9 19.5q-22 37 -41 30t-28 -49t7 -97q20 -70 1 -195q-10 -65 18 -100.5t73 -33t85 35.5q59 49 89.5 66.5t103.5 42.5q53 18 77 36.5t18.5 34.5t-25 28.5t-51.5 23.5q-33 11 -49.5 48t-15 72.5
+t15.5 47.5q1 -31 8 -56.5t14.5 -40.5t20.5 -28.5t21 -19t21.5 -13t16.5 -9.5z" />
+    <glyph glyph-name="dribble" unicode="&#xf17d;" 
+d="M1024 36q-42 241 -140 498h-2l-2 -1q-16 -6 -43 -16.5t-101 -49t-137 -82t-131 -114.5t-103 -148l-15 11q184 -150 418 -150q132 0 256 52zM839 643q-21 49 -53 111q-311 -93 -673 -93q-1 -7 -1 -21q0 -124 44 -236.5t124 -201.5q50 89 123.5 166.5t142.5 124.5t130.5 81
+t99.5 48l37 13q4 1 13 3.5t13 4.5zM732 855q-120 213 -244 378q-138 -65 -234 -186t-128 -272q302 0 606 80zM1416 536q-210 60 -409 29q87 -239 128 -469q111 75 185 189.5t96 250.5zM611 1277q-1 0 -2 -1q1 1 2 1zM1201 1132q-185 164 -433 164q-76 0 -155 -19
+q131 -170 246 -382q69 26 130 60.5t96.5 61.5t65.5 57t37.5 40.5zM1424 647q-3 232 -149 410l-1 -1q-9 -12 -19 -24.5t-43.5 -44.5t-71 -60.5t-100 -65t-131.5 -64.5q25 -53 44 -95q2 -5 6.5 -17t7.5 -17q36 5 74.5 7t73.5 2t69 -1.5t64 -4t56.5 -5.5t48 -6.5t36.5 -6
+t25 -4.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="skype" unicode="&#xf17e;" 
+d="M1173 473q0 50 -19.5 91.5t-48.5 68.5t-73 49t-82.5 34t-87.5 23l-104 24q-30 7 -44 10.5t-35 11.5t-30 16t-16.5 21t-7.5 30q0 77 144 77q43 0 77 -12t54 -28.5t38 -33.5t40 -29t48 -12q47 0 75.5 32t28.5 77q0 55 -56 99.5t-142 67.5t-182 23q-68 0 -132 -15.5
+t-119.5 -47t-89 -87t-33.5 -128.5q0 -61 19 -106.5t56 -75.5t80 -48.5t103 -32.5l146 -36q90 -22 112 -36q32 -20 32 -60q0 -39 -40 -64.5t-105 -25.5q-51 0 -91.5 16t-65 38.5t-45.5 45t-46 38.5t-54 16q-50 0 -75.5 -30t-25.5 -75q0 -92 122 -157.5t291 -65.5
+q73 0 140 18.5t122.5 53.5t88.5 93.5t33 131.5zM1536 256q0 -159 -112.5 -271.5t-271.5 -112.5q-130 0 -234 80q-77 -16 -150 -16q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5q0 73 16 150q-80 104 -80 234q0 159 112.5 271.5t271.5 112.5q130 0 234 -80
+q77 16 150 16q143 0 273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -73 -16 -150q80 -104 80 -234z" />
+    <glyph glyph-name="foursquare" unicode="&#xf180;" horiz-adv-x="1280" 
+d="M1000 1102l37 194q5 23 -9 40t-35 17h-712q-23 0 -38.5 -17t-15.5 -37v-1101q0 -7 6 -1l291 352q23 26 38 33.5t48 7.5h239q22 0 37 14.5t18 29.5q24 130 37 191q4 21 -11.5 40t-36.5 19h-294q-29 0 -48 19t-19 48v42q0 29 19 47.5t48 18.5h346q18 0 35 13.5t20 29.5z
+M1227 1324q-15 -73 -53.5 -266.5t-69.5 -350t-35 -173.5q-6 -22 -9 -32.5t-14 -32.5t-24.5 -33t-38.5 -21t-58 -10h-271q-13 0 -22 -10q-8 -9 -426 -494q-22 -25 -58.5 -28.5t-48.5 5.5q-55 22 -55 98v1410q0 55 38 102.5t120 47.5h888q95 0 127 -53t10 -159zM1227 1324
+l-158 -790q4 17 35 173.5t69.5 350t53.5 266.5z" />
+    <glyph glyph-name="trello" unicode="&#xf181;" 
+d="M704 192v1024q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-1024q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1376 576v640q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-640q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408
+q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="female" unicode="&#xf182;" horiz-adv-x="1280" 
+d="M1280 480q0 -40 -28 -68t-68 -28q-51 0 -80 43l-227 341h-45v-132l247 -411q9 -15 9 -33q0 -26 -19 -45t-45 -19h-192v-272q0 -46 -33 -79t-79 -33h-160q-46 0 -79 33t-33 79v272h-192q-26 0 -45 19t-19 45q0 18 9 33l247 411v132h-45l-227 -341q-29 -43 -80 -43
+q-40 0 -68 28t-28 68q0 29 16 53l256 384q73 107 176 107h384q103 0 176 -107l256 -384q16 -24 16 -53zM864 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
+    <glyph glyph-name="male" unicode="&#xf183;" horiz-adv-x="1024" 
+d="M1024 832v-416q0 -40 -28 -68t-68 -28t-68 28t-28 68v352h-64v-912q0 -46 -33 -79t-79 -33t-79 33t-33 79v464h-64v-464q0 -46 -33 -79t-79 -33t-79 33t-33 79v912h-64v-352q0 -40 -28 -68t-68 -28t-68 28t-28 68v416q0 80 56 136t136 56h640q80 0 136 -56t56 -136z
+M736 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
+    <glyph glyph-name="gittip" unicode="&#xf184;" 
+d="M773 234l350 473q16 22 24.5 59t-6 85t-61.5 79q-40 26 -83 25.5t-73.5 -17.5t-54.5 -45q-36 -40 -96 -40q-59 0 -95 40q-24 28 -54.5 45t-73.5 17.5t-84 -25.5q-46 -31 -60.5 -79t-6 -85t24.5 -59zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103
+t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="sun" unicode="&#xf185;" horiz-adv-x="1792" 
+d="M1472 640q0 117 -45.5 223.5t-123 184t-184 123t-223.5 45.5t-223.5 -45.5t-184 -123t-123 -184t-45.5 -223.5t45.5 -223.5t123 -184t184 -123t223.5 -45.5t223.5 45.5t184 123t123 184t45.5 223.5zM1748 363q-4 -15 -20 -20l-292 -96v-306q0 -16 -13 -26q-15 -10 -29 -4
+l-292 94l-180 -248q-10 -13 -26 -13t-26 13l-180 248l-292 -94q-14 -6 -29 4q-13 10 -13 26v306l-292 96q-16 5 -20 20q-5 17 4 29l180 248l-180 248q-9 13 -4 29q4 15 20 20l292 96v306q0 16 13 26q15 10 29 4l292 -94l180 248q9 12 26 12t26 -12l180 -248l292 94
+q14 6 29 -4q13 -10 13 -26v-306l292 -96q16 -5 20 -20q5 -16 -4 -29l-180 -248l180 -248q9 -12 4 -29z" />
+    <glyph glyph-name="_366" unicode="&#xf186;" 
+d="M1262 233q-54 -9 -110 -9q-182 0 -337 90t-245 245t-90 337q0 192 104 357q-201 -60 -328.5 -229t-127.5 -384q0 -130 51 -248.5t136.5 -204t204 -136.5t248.5 -51q144 0 273.5 61.5t220.5 171.5zM1465 318q-94 -203 -283.5 -324.5t-413.5 -121.5q-156 0 -298 61
+t-245 164t-164 245t-61 298q0 153 57.5 292.5t156 241.5t235.5 164.5t290 68.5q44 2 61 -39q18 -41 -15 -72q-86 -78 -131.5 -181.5t-45.5 -218.5q0 -148 73 -273t198 -198t273 -73q118 0 228 51q41 18 72 -13q14 -14 17.5 -34t-4.5 -38z" />
+    <glyph glyph-name="archive" unicode="&#xf187;" horiz-adv-x="1792" 
+d="M1088 704q0 26 -19 45t-45 19h-256q-26 0 -45 -19t-19 -45t19 -45t45 -19h256q26 0 45 19t19 45zM1664 896v-960q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v960q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1728 1344v-256q0 -26 -19 -45t-45 -19h-1536
+q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1536q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="bug" unicode="&#xf188;" horiz-adv-x="1664" 
+d="M1632 576q0 -26 -19 -45t-45 -19h-224q0 -171 -67 -290l208 -209q19 -19 19 -45t-19 -45q-18 -19 -45 -19t-45 19l-198 197q-5 -5 -15 -13t-42 -28.5t-65 -36.5t-82 -29t-97 -13v896h-128v-896q-51 0 -101.5 13.5t-87 33t-66 39t-43.5 32.5l-15 14l-183 -207
+q-20 -21 -48 -21q-24 0 -43 16q-19 18 -20.5 44.5t15.5 46.5l202 227q-58 114 -58 274h-224q-26 0 -45 19t-19 45t19 45t45 19h224v294l-173 173q-19 19 -19 45t19 45t45 19t45 -19l173 -173h844l173 173q19 19 45 19t45 -19t19 -45t-19 -45l-173 -173v-294h224q26 0 45 -19
+t19 -45zM1152 1152h-640q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5z" />
+    <glyph glyph-name="vk" unicode="&#xf189;" horiz-adv-x="1920" 
+d="M1917 1016q23 -64 -150 -294q-24 -32 -65 -85q-40 -51 -55 -72t-30.5 -49.5t-12 -42t13 -34.5t32.5 -43t57 -53q4 -2 5 -4q141 -131 191 -221q3 -5 6.5 -12.5t7 -26.5t-0.5 -34t-25 -27.5t-59 -12.5l-256 -4q-24 -5 -56 5t-52 22l-20 12q-30 21 -70 64t-68.5 77.5t-61 58
+t-56.5 15.5q-3 -1 -8 -3.5t-17 -14.5t-21.5 -29.5t-17 -52t-6.5 -77.5q0 -15 -3.5 -27.5t-7.5 -18.5l-4 -5q-18 -19 -53 -22h-115q-71 -4 -146 16.5t-131.5 53t-103 66t-70.5 57.5l-25 24q-10 10 -27.5 30t-71.5 91t-106 151t-122.5 211t-130.5 272q-6 16 -6 27t3 16l4 6
+q15 19 57 19l274 2q12 -2 23 -6.5t16 -8.5l5 -3q16 -11 24 -32q20 -50 46 -103.5t41 -81.5l16 -29q29 -60 56 -104t48.5 -68.5t41.5 -38.5t34 -14t27 5q2 1 5 5t12 22t13.5 47t9.5 81t0 125q-2 40 -9 73t-14 46l-6 12q-25 34 -85 43q-13 2 5 24q16 19 38 30q53 26 239 24
+q82 -1 135 -13q20 -5 33.5 -13.5t20.5 -24t10.5 -32t3.5 -45.5t-1 -55t-2.5 -70.5t-1.5 -82.5q0 -11 -1 -42t-0.5 -48t3.5 -40.5t11.5 -39t22.5 -24.5q8 -2 17 -4t26 11t38 34.5t52 67t68 107.5q60 104 107 225q4 10 10 17.5t11 10.5l4 3l5 2.5t13 3t20 0.5l288 2
+q39 5 64 -2.5t31 -16.5z" />
+    <glyph glyph-name="weibo" unicode="&#xf18a;" horiz-adv-x="1792" 
+d="M675 252q21 34 11 69t-45 50q-34 14 -73 1t-60 -46q-22 -34 -13 -68.5t43 -50.5t74.5 -2.5t62.5 47.5zM769 373q8 13 3.5 26.5t-17.5 18.5q-14 5 -28.5 -0.5t-21.5 -18.5q-17 -31 13 -45q14 -5 29 0.5t22 18.5zM943 266q-45 -102 -158 -150t-224 -12
+q-107 34 -147.5 126.5t6.5 187.5q47 93 151.5 139t210.5 19q111 -29 158.5 -119.5t2.5 -190.5zM1255 426q-9 96 -89 170t-208.5 109t-274.5 21q-223 -23 -369.5 -141.5t-132.5 -264.5q9 -96 89 -170t208.5 -109t274.5 -21q223 23 369.5 141.5t132.5 264.5zM1563 422
+q0 -68 -37 -139.5t-109 -137t-168.5 -117.5t-226 -83t-270.5 -31t-275 33.5t-240.5 93t-171.5 151t-65 199.5q0 115 69.5 245t197.5 258q169 169 341.5 236t246.5 -7q65 -64 20 -209q-4 -14 -1 -20t10 -7t14.5 0.5t13.5 3.5l6 2q139 59 246 59t153 -61q45 -63 0 -178
+q-2 -13 -4.5 -20t4.5 -12.5t12 -7.5t17 -6q57 -18 103 -47t80 -81.5t34 -116.5zM1489 1046q42 -47 54.5 -108.5t-6.5 -117.5q-8 -23 -29.5 -34t-44.5 -4q-23 8 -34 29.5t-4 44.5q20 63 -24 111t-107 35q-24 -5 -45 8t-25 37q-5 24 8 44.5t37 25.5q60 13 119 -5.5t101 -65.5z
+M1670 1209q87 -96 112.5 -222.5t-13.5 -241.5q-9 -27 -34 -40t-52 -4t-40 34t-5 52q28 82 10 172t-80 158q-62 69 -148 95.5t-173 8.5q-28 -6 -52 9.5t-30 43.5t9.5 51.5t43.5 29.5q123 26 244 -11.5t208 -134.5z" />
+    <glyph glyph-name="renren" unicode="&#xf18b;" 
+d="M1133 -34q-171 -94 -368 -94q-196 0 -367 94q138 87 235.5 211t131.5 268q35 -144 132.5 -268t235.5 -211zM638 1394v-485q0 -252 -126.5 -459.5t-330.5 -306.5q-181 215 -181 495q0 187 83.5 349.5t229.5 269.5t325 137zM1536 638q0 -280 -181 -495
+q-204 99 -330.5 306.5t-126.5 459.5v485q179 -30 325 -137t229.5 -269.5t83.5 -349.5z" />
+    <glyph glyph-name="_372" unicode="&#xf18c;" horiz-adv-x="1408" 
+d="M1402 433q-32 -80 -76 -138t-91 -88.5t-99 -46.5t-101.5 -14.5t-96.5 8.5t-86.5 22t-69.5 27.5t-46 22.5l-17 10q-113 -228 -289.5 -359.5t-384.5 -132.5q-19 0 -32 13t-13 32t13 31.5t32 12.5q173 1 322.5 107.5t251.5 294.5q-36 -14 -72 -23t-83 -13t-91 2.5t-93 28.5
+t-92 59t-84.5 100t-74.5 146q114 47 214 57t167.5 -7.5t124.5 -56.5t88.5 -77t56.5 -82q53 131 79 291q-7 -1 -18 -2.5t-46.5 -2.5t-69.5 0.5t-81.5 10t-88.5 23t-84 42.5t-75 65t-54.5 94.5t-28.5 127.5q70 28 133.5 36.5t112.5 -1t92 -30t73.5 -50t56 -61t42 -63t27.5 -56
+t16 -39.5l4 -16q12 122 12 195q-8 6 -21.5 16t-49 44.5t-63.5 71.5t-54 93t-33 112.5t12 127t70 138.5q73 -25 127.5 -61.5t84.5 -76.5t48 -85t20.5 -89t-0.5 -85.5t-13 -76.5t-19 -62t-17 -42l-7 -15q1 -4 1 -50t-1 -72q3 7 10 18.5t30.5 43t50.5 58t71 55.5t91.5 44.5
+t112 14.5t132.5 -24q-2 -78 -21.5 -141.5t-50 -104.5t-69.5 -71.5t-81.5 -45.5t-84.5 -24t-80 -9.5t-67.5 1t-46.5 4.5l-17 3q-23 -147 -73 -283q6 7 18 18.5t49.5 41t77.5 52.5t99.5 42t117.5 20t129 -23.5t137 -77.5z" />
+    <glyph glyph-name="stack_exchange" unicode="&#xf18d;" horiz-adv-x="1280" 
+d="M1259 283v-66q0 -85 -57.5 -144.5t-138.5 -59.5h-57l-260 -269v269h-529q-81 0 -138.5 59.5t-57.5 144.5v66h1238zM1259 609v-255h-1238v255h1238zM1259 937v-255h-1238v255h1238zM1259 1077v-67h-1238v67q0 84 57.5 143.5t138.5 59.5h846q81 0 138.5 -59.5t57.5 -143.5z
+" />
+    <glyph glyph-name="_374" unicode="&#xf18e;" 
+d="M1152 640q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v192h-352q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h352v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198
+t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="arrow_circle_alt_left" unicode="&#xf190;" 
+d="M1152 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-352v-192q0 -14 -9 -23t-23 -9q-12 0 -24 10l-319 319q-9 9 -9 23t9 23l320 320q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5v-192h352q13 0 22.5 -9.5t9.5 -22.5zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198
+t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="_376" unicode="&#xf191;" 
+d="M1024 960v-640q0 -26 -19 -45t-45 -19q-20 0 -37 12l-448 320q-27 19 -27 52t27 52l448 320q17 12 37 12q26 0 45 -19t19 -45zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5z
+M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="dot_circle_alt" unicode="&#xf192;" 
+d="M1024 640q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5
+t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="_378" unicode="&#xf193;" horiz-adv-x="1664" 
+d="M1023 349l102 -204q-58 -179 -210 -290t-339 -111q-156 0 -288.5 77.5t-210 210t-77.5 288.5q0 181 104.5 330t274.5 211l17 -131q-122 -54 -195 -165.5t-73 -244.5q0 -185 131.5 -316.5t316.5 -131.5q126 0 232.5 65t165 175.5t49.5 236.5zM1571 249l58 -114l-256 -128
+q-13 -7 -29 -7q-40 0 -57 35l-239 477h-472q-24 0 -42.5 16.5t-21.5 40.5l-96 779q-2 17 6 42q14 51 57 82.5t97 31.5q66 0 113 -47t47 -113q0 -69 -52 -117.5t-120 -41.5l37 -289h423v-128h-407l16 -128h455q40 0 57 -35l228 -455z" />
+    <glyph glyph-name="vimeo_square" unicode="&#xf194;" 
+d="M1292 898q10 216 -161 222q-231 8 -312 -261q44 19 82 19q85 0 74 -96q-4 -57 -74 -167t-105 -110q-43 0 -82 169q-13 54 -45 255q-30 189 -160 177q-59 -7 -164 -100l-81 -72l-81 -72l52 -67q76 52 87 52q57 0 107 -179q15 -55 45 -164.5t45 -164.5q68 -179 164 -179
+q157 0 383 294q220 283 226 444zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="_380" unicode="&#xf195;" horiz-adv-x="1152" 
+d="M1152 704q0 -191 -94.5 -353t-256.5 -256.5t-353 -94.5h-160q-14 0 -23 9t-9 23v611l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v93l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v250q0 14 9 23t23 9h160
+q14 0 23 -9t9 -23v-181l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-93l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-487q188 13 318 151t130 328q0 14 9 23t23 9h160q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="plus_square_o" unicode="&#xf196;" horiz-adv-x="1408" 
+d="M1152 736v-64q0 -14 -9 -23t-23 -9h-352v-352q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v352h-352q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h352v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-352h352q14 0 23 -9t9 -23zM1280 288v832q0 66 -47 113t-113 47h-832
+q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113zM1408 1120v-832q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="_382" unicode="&#xf197;" horiz-adv-x="2176" 
+d="M620 416q-110 -64 -268 -64h-128v64h-64q-13 0 -22.5 23.5t-9.5 56.5q0 24 7 49q-58 2 -96.5 10.5t-38.5 20.5t38.5 20.5t96.5 10.5q-7 25 -7 49q0 33 9.5 56.5t22.5 23.5h64v64h128q158 0 268 -64h1113q42 -7 106.5 -18t80.5 -14q89 -15 150 -40.5t83.5 -47.5t22.5 -40
+t-22.5 -40t-83.5 -47.5t-150 -40.5q-16 -3 -80.5 -14t-106.5 -18h-1113zM1739 668q53 -36 53 -92t-53 -92l81 -30q68 48 68 122t-68 122zM625 400h1015q-217 -38 -456 -80q-57 0 -113 -24t-83 -48l-28 -24l-288 -288q-26 -26 -70.5 -45t-89.5 -19h-96l-93 464h29
+q157 0 273 64zM352 816h-29l93 464h96q46 0 90 -19t70 -45l288 -288q4 -4 11 -10.5t30.5 -23t48.5 -29t61.5 -23t72.5 -10.5l456 -80h-1015q-116 64 -273 64z" />
+    <glyph glyph-name="_383" unicode="&#xf198;" horiz-adv-x="1664" 
+d="M1519 760q62 0 103.5 -40.5t41.5 -101.5q0 -97 -93 -130l-172 -59l56 -167q7 -21 7 -47q0 -59 -42 -102t-101 -43q-47 0 -85.5 27t-53.5 72l-55 165l-310 -106l55 -164q8 -24 8 -47q0 -59 -42 -102t-102 -43q-47 0 -85 27t-53 72l-55 163l-153 -53q-29 -9 -50 -9
+q-61 0 -101.5 40t-40.5 101q0 47 27.5 85t71.5 53l156 53l-105 313l-156 -54q-26 -8 -48 -8q-60 0 -101 40.5t-41 100.5q0 47 27.5 85t71.5 53l157 53l-53 159q-8 24 -8 47q0 60 42 102.5t102 42.5q47 0 85 -27t53 -72l54 -160l310 105l-54 160q-8 24 -8 47q0 59 42.5 102
+t101.5 43q47 0 85.5 -27.5t53.5 -71.5l53 -161l162 55q21 6 43 6q60 0 102.5 -39.5t42.5 -98.5q0 -45 -30 -81.5t-74 -51.5l-157 -54l105 -316l164 56q24 8 46 8zM725 498l310 105l-105 315l-310 -107z" />
+    <glyph glyph-name="_384" unicode="&#xf199;" 
+d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM1280 352v436q-31 -35 -64 -55q-34 -22 -132.5 -85t-151.5 -99q-98 -69 -164 -69v0v0q-66 0 -164 69
+q-47 32 -142 92.5t-142 92.5q-12 8 -33 27t-31 27v-436q0 -40 28 -68t68 -28h832q40 0 68 28t28 68zM1280 925q0 41 -27.5 70t-68.5 29h-832q-40 0 -68 -28t-28 -68q0 -37 30.5 -76.5t67.5 -64.5q47 -32 137.5 -89t129.5 -83q3 -2 17 -11.5t21 -14t21 -13t23.5 -13
+t21.5 -9.5t22.5 -7.5t20.5 -2.5t20.5 2.5t22.5 7.5t21.5 9.5t23.5 13t21 13t21 14t17 11.5l267 174q35 23 66.5 62.5t31.5 73.5z" />
+    <glyph glyph-name="_385" unicode="&#xf19a;" horiz-adv-x="1792" 
+d="M127 640q0 163 67 313l367 -1005q-196 95 -315 281t-119 411zM1415 679q0 -19 -2.5 -38.5t-10 -49.5t-11.5 -44t-17.5 -59t-17.5 -58l-76 -256l-278 826q46 3 88 8q19 2 26 18.5t-2.5 31t-28.5 13.5l-205 -10q-75 1 -202 10q-12 1 -20.5 -5t-11.5 -15t-1.5 -18.5t9 -16.5
+t19.5 -8l80 -8l120 -328l-168 -504l-280 832q46 3 88 8q19 2 26 18.5t-2.5 31t-28.5 13.5l-205 -10q-7 0 -23 0.5t-26 0.5q105 160 274.5 253.5t367.5 93.5q147 0 280.5 -53t238.5 -149h-10q-55 0 -92 -40.5t-37 -95.5q0 -12 2 -24t4 -21.5t8 -23t9 -21t12 -22.5t12.5 -21
+t14.5 -24t14 -23q63 -107 63 -212zM909 573l237 -647q1 -6 5 -11q-126 -44 -255 -44q-112 0 -217 32zM1570 1009q95 -174 95 -369q0 -209 -104 -385.5t-279 -278.5l235 678q59 169 59 276q0 42 -6 79zM896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286
+t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM896 -215q173 0 331.5 68t273 182.5t182.5 273t68 331.5t-68 331.5t-182.5 273t-273 182.5t-331.5 68t-331.5 -68t-273 -182.5t-182.5 -273t-68 -331.5t68 -331.5t182.5 -273
+t273 -182.5t331.5 -68z" />
+    <glyph glyph-name="_386" unicode="&#xf19b;" horiz-adv-x="1792" 
+d="M1086 1536v-1536l-272 -128q-228 20 -414 102t-293 208.5t-107 272.5q0 140 100.5 263.5t275 205.5t391.5 108v-172q-217 -38 -356.5 -150t-139.5 -255q0 -152 154.5 -267t388.5 -145v1360zM1755 954l37 -390l-525 114l147 83q-119 70 -280 99v172q277 -33 481 -157z" />
+    <glyph glyph-name="_387" unicode="&#xf19c;" horiz-adv-x="2048" 
+d="M960 1536l960 -384v-128h-128q0 -26 -20.5 -45t-48.5 -19h-1526q-28 0 -48.5 19t-20.5 45h-128v128zM256 896h256v-768h128v768h256v-768h128v768h256v-768h128v768h256v-768h59q28 0 48.5 -19t20.5 -45v-64h-1664v64q0 26 20.5 45t48.5 19h59v768zM1851 -64
+q28 0 48.5 -19t20.5 -45v-128h-1920v128q0 26 20.5 45t48.5 19h1782z" />
+    <glyph glyph-name="_388" unicode="&#xf19d;" horiz-adv-x="2304" 
+d="M1774 700l18 -316q4 -69 -82 -128t-235 -93.5t-323 -34.5t-323 34.5t-235 93.5t-82 128l18 316l574 -181q22 -7 48 -7t48 7zM2304 1024q0 -23 -22 -31l-1120 -352q-4 -1 -10 -1t-10 1l-652 206q-43 -34 -71 -111.5t-34 -178.5q63 -36 63 -109q0 -69 -58 -107l58 -433
+q2 -14 -8 -25q-9 -11 -24 -11h-192q-15 0 -24 11q-10 11 -8 25l58 433q-58 38 -58 107q0 73 65 111q11 207 98 330l-333 104q-22 8 -22 31t22 31l1120 352q4 1 10 1t10 -1l1120 -352q22 -8 22 -31z" />
+    <glyph glyph-name="_389" unicode="&#xf19e;" 
+d="M859 579l13 -707q-62 11 -105 11q-41 0 -105 -11l13 707q-40 69 -168.5 295.5t-216.5 374.5t-181 287q58 -15 108 -15q44 0 111 15q63 -111 133.5 -229.5t167 -276.5t138.5 -227q37 61 109.5 177.5t117.5 190t105 176t107 189.5q54 -14 107 -14q56 0 114 14v0
+q-28 -39 -60 -88.5t-49.5 -78.5t-56.5 -96t-49 -84q-146 -248 -353 -610z" />
+    <glyph glyph-name="uniF1A0" unicode="&#xf1a0;" 
+d="M768 750h725q12 -67 12 -128q0 -217 -91 -387.5t-259.5 -266.5t-386.5 -96q-157 0 -299 60.5t-245 163.5t-163.5 245t-60.5 299t60.5 299t163.5 245t245 163.5t299 60.5q300 0 515 -201l-209 -201q-123 119 -306 119q-129 0 -238.5 -65t-173.5 -176.5t-64 -243.5
+t64 -243.5t173.5 -176.5t238.5 -65q87 0 160 24t120 60t82 82t51.5 87t22.5 78h-436v264z" />
+    <glyph glyph-name="f1a1" unicode="&#xf1a1;" horiz-adv-x="1792" 
+d="M1095 369q16 -16 0 -31q-62 -62 -199 -62t-199 62q-16 15 0 31q6 6 15 6t15 -6q48 -49 169 -49q120 0 169 49q6 6 15 6t15 -6zM788 550q0 -37 -26 -63t-63 -26t-63.5 26t-26.5 63q0 38 26.5 64t63.5 26t63 -26.5t26 -63.5zM1183 550q0 -37 -26.5 -63t-63.5 -26t-63 26
+t-26 63t26 63.5t63 26.5t63.5 -26t26.5 -64zM1434 670q0 49 -35 84t-85 35t-86 -36q-130 90 -311 96l63 283l200 -45q0 -37 26 -63t63 -26t63.5 26.5t26.5 63.5t-26.5 63.5t-63.5 26.5q-54 0 -80 -50l-221 49q-19 5 -25 -16l-69 -312q-180 -7 -309 -97q-35 37 -87 37
+q-50 0 -85 -35t-35 -84q0 -35 18.5 -64t49.5 -44q-6 -27 -6 -56q0 -142 140 -243t337 -101q198 0 338 101t140 243q0 32 -7 57q30 15 48 43.5t18 63.5zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191
+t348 71t348 -71t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="_392" unicode="&#xf1a2;" 
+d="M939 407q13 -13 0 -26q-53 -53 -171 -53t-171 53q-13 13 0 26q5 6 13 6t13 -6q42 -42 145 -42t145 42q5 6 13 6t13 -6zM676 563q0 -31 -23 -54t-54 -23t-54 23t-23 54q0 32 22.5 54.5t54.5 22.5t54.5 -22.5t22.5 -54.5zM1014 563q0 -31 -23 -54t-54 -23t-54 23t-23 54
+q0 32 22.5 54.5t54.5 22.5t54.5 -22.5t22.5 -54.5zM1229 666q0 42 -30 72t-73 30q-42 0 -73 -31q-113 78 -267 82l54 243l171 -39q1 -32 23.5 -54t53.5 -22q32 0 54.5 22.5t22.5 54.5t-22.5 54.5t-54.5 22.5q-48 0 -69 -43l-189 42q-17 5 -21 -13l-60 -268q-154 -6 -265 -83
+q-30 32 -74 32q-43 0 -73 -30t-30 -72q0 -30 16 -55t42 -38q-5 -25 -5 -48q0 -122 120 -208.5t289 -86.5q170 0 290 86.5t120 208.5q0 25 -6 49q25 13 40.5 37.5t15.5 54.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960
+q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="_393" unicode="&#xf1a3;" 
+d="M866 697l90 27v62q0 79 -58 135t-138 56t-138 -55.5t-58 -134.5v-283q0 -20 -14 -33.5t-33 -13.5t-32.5 13.5t-13.5 33.5v120h-151v-122q0 -82 57.5 -139t139.5 -57q81 0 138.5 56.5t57.5 136.5v280q0 19 13.5 33t33.5 14q19 0 32.5 -14t13.5 -33v-54zM1199 502v122h-150
+v-126q0 -20 -13.5 -33.5t-33.5 -13.5q-19 0 -32.5 14t-13.5 33v123l-90 -26l-60 28v-123q0 -80 58 -137t139 -57t138.5 57t57.5 139zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103
+t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="f1a4" unicode="&#xf1a4;" horiz-adv-x="1920" 
+d="M1062 824v118q0 42 -30 72t-72 30t-72 -30t-30 -72v-612q0 -175 -126 -299t-303 -124q-178 0 -303.5 125.5t-125.5 303.5v266h328v-262q0 -43 30 -72.5t72 -29.5t72 29.5t30 72.5v620q0 171 126.5 292t301.5 121q176 0 302 -122t126 -294v-136l-195 -58zM1592 602h328
+v-266q0 -178 -125.5 -303.5t-303.5 -125.5q-177 0 -303 124.5t-126 300.5v268l131 -61l195 58v-270q0 -42 30 -71.5t72 -29.5t72 29.5t30 71.5v275z" />
+    <glyph glyph-name="_395" unicode="&#xf1a5;" 
+d="M1472 160v480h-704v704h-480q-93 0 -158.5 -65.5t-65.5 -158.5v-480h704v-704h480q93 0 158.5 65.5t65.5 158.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5
+t84.5 -203.5z" />
+    <glyph glyph-name="_396" unicode="&#xf1a6;" horiz-adv-x="2048" 
+d="M328 1254h204v-983h-532v697h328v286zM328 435v369h-123v-369h123zM614 968v-697h205v697h-205zM614 1254v-204h205v204h-205zM901 968h533v-942h-533v163h328v82h-328v697zM1229 435v369h-123v-369h123zM1516 968h532v-942h-532v163h327v82h-327v697zM1843 435v369h-123
+v-369h123z" />
+    <glyph glyph-name="_397" unicode="&#xf1a7;" 
+d="M1046 516q0 -64 -38 -109t-91 -45q-43 0 -70 15v277q28 17 70 17q53 0 91 -45.5t38 -109.5zM703 944q0 -64 -38 -109.5t-91 -45.5q-43 0 -70 15v277q28 17 70 17q53 0 91 -45t38 -109zM1265 513q0 134 -88 229t-213 95q-20 0 -39 -3q-23 -78 -78 -136q-87 -95 -211 -101
+v-636l211 41v206q51 -19 117 -19q125 0 213 95t88 229zM922 940q0 134 -88.5 229t-213.5 95q-74 0 -141 -36h-186v-840l211 41v206q55 -19 116 -19q125 0 213.5 95t88.5 229zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960
+q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="_398" unicode="&#xf1a8;" horiz-adv-x="2038" 
+d="M1222 607q75 3 143.5 -20.5t118 -58.5t101 -94.5t84 -108t75.5 -120.5q33 -56 78.5 -109t75.5 -80.5t99 -88.5q-48 -30 -108.5 -57.5t-138.5 -59t-114 -47.5q-44 37 -74 115t-43.5 164.5t-33 180.5t-42.5 168.5t-72.5 123t-122.5 48.5l-10 -2l-6 -4q4 -5 13 -14
+q6 -5 28 -23.5t25.5 -22t19 -18t18 -20.5t11.5 -21t10.5 -27.5t4.5 -31t4 -40.5l1 -33q1 -26 -2.5 -57.5t-7.5 -52t-12.5 -58.5t-11.5 -53q-35 1 -101 -9.5t-98 -10.5q-39 0 -72 10q-2 16 -2 47q0 74 3 96q2 13 31.5 41.5t57 59t26.5 51.5q-24 2 -43 -24
+q-36 -53 -111.5 -99.5t-136.5 -46.5q-25 0 -75.5 63t-106.5 139.5t-84 96.5q-6 4 -27 30q-482 -112 -513 -112q-16 0 -28 11t-12 27q0 15 8.5 26.5t22.5 14.5l486 106q-8 14 -8 25t5.5 17.5t16 11.5t20 7t23 4.5t18.5 4.5q4 1 15.5 7.5t17.5 6.5q15 0 28 -16t20 -33
+q163 37 172 37q17 0 29.5 -11t12.5 -28q0 -15 -8.5 -26t-23.5 -14l-182 -40l-1 -16q-1 -26 81.5 -117.5t104.5 -91.5q47 0 119 80t72 129q0 36 -23.5 53t-51 18.5t-51 11.5t-23.5 34q0 16 10 34l-68 19q43 44 43 117q0 26 -5 58q82 16 144 16q44 0 71.5 -1.5t48.5 -8.5
+t31 -13.5t20.5 -24.5t15.5 -33.5t17 -47.5t24 -60l50 25q-3 -40 -23 -60t-42.5 -21t-40 -6.5t-16.5 -20.5zM1282 842q-5 5 -13.5 15.5t-12 14.5t-10.5 11.5t-10 10.5l-8 8t-8.5 7.5t-8 5t-8.5 4.5q-7 3 -14.5 5t-20.5 2.5t-22 0.5h-32.5h-37.5q-126 0 -217 -43
+q16 30 36 46.5t54 29.5t65.5 36t46 36.5t50 55t43.5 50.5q12 -9 28 -31.5t32 -36.5t38 -13l12 1v-76l22 -1q247 95 371 190q28 21 50 39t42.5 37.5t33 31t29.5 34t24 31t24.5 37t23 38t27 47.5t29.5 53l7 9q-2 -53 -43 -139q-79 -165 -205 -264t-306 -142q-14 -3 -42 -7.5
+t-50 -9.5t-39 -14q3 -19 24.5 -46t21.5 -34q0 -11 -26 -30zM1061 -79q39 26 131.5 47.5t146.5 21.5q9 0 22.5 -15.5t28 -42.5t26 -50t24 -51t14.5 -33q-121 -45 -244 -45q-61 0 -125 11zM822 568l48 12l109 -177l-73 -48zM1323 51q3 -15 3 -16q0 -7 -17.5 -14.5t-46 -13
+t-54 -9.5t-53.5 -7.5t-32 -4.5l-7 43q21 2 60.5 8.5t72 10t60.5 3.5h14zM866 679l-96 -20l-6 17q10 1 32.5 7t34.5 6q19 0 35 -10zM1061 45h31l10 -83l-41 -12v95zM1950 1535v1v-1zM1950 1535l-1 -5l-2 -2l1 3zM1950 1535l1 1z" />
+    <glyph glyph-name="_399" unicode="&#xf1a9;" 
+d="M1167 -50q-5 19 -24 5q-30 -22 -87 -39t-131 -17q-129 0 -193 49q-5 4 -13 4q-11 0 -26 -12q-7 -6 -7.5 -16t7.5 -20q34 -32 87.5 -46t102.5 -12.5t99 4.5q41 4 84.5 20.5t65 30t28.5 20.5q12 12 7 29zM1128 65q-19 47 -39 61q-23 15 -76 15q-47 0 -71 -10
+q-29 -12 -78 -56q-26 -24 -12 -44q9 -8 17.5 -4.5t31.5 23.5q3 2 10.5 8.5t10.5 8.5t10 7t11.5 7t12.5 5t15 4.5t16.5 2.5t20.5 1q27 0 44.5 -7.5t23 -14.5t13.5 -22q10 -17 12.5 -20t12.5 1q23 12 14 34zM1483 346q0 22 -5 44.5t-16.5 45t-34 36.5t-52.5 14
+q-33 0 -97 -41.5t-129 -83.5t-101 -42q-27 -1 -63.5 19t-76 49t-83.5 58t-100 49t-111 19q-115 -1 -197 -78.5t-84 -178.5q-2 -112 74 -164q29 -20 62.5 -28.5t103.5 -8.5q57 0 132 32.5t134 71t120 70.5t93 31q26 -1 65 -31.5t71.5 -67t68 -67.5t55.5 -32q35 -3 58.5 14
+t55.5 63q28 41 42.5 101t14.5 106zM1536 506q0 -164 -62 -304.5t-166 -236t-242.5 -149.5t-290.5 -54t-293 57.5t-247.5 157t-170.5 241.5t-64 302q0 89 19.5 172.5t49 145.5t70.5 118.5t78.5 94t78.5 69.5t64.5 46.5t42.5 24.5q14 8 51 26.5t54.5 28.5t48 30t60.5 44
+q36 28 58 72.5t30 125.5q129 -155 186 -193q44 -29 130 -68t129 -66q21 -13 39 -25t60.5 -46.5t76 -70.5t75 -95t69 -122t47 -148.5t19.5 -177.5z" />
+    <glyph glyph-name="_400" unicode="&#xf1aa;" 
+d="M1070 463l-160 -160l-151 -152l-30 -30q-65 -64 -151.5 -87t-171.5 -2q-16 -70 -72 -115t-129 -45q-85 0 -145 60.5t-60 145.5q0 72 44.5 128t113.5 72q-22 86 1 173t88 152l12 12l151 -152l-11 -11q-37 -37 -37 -89t37 -90q37 -37 89 -37t89 37l30 30l151 152l161 160z
+M729 1145l12 -12l-152 -152l-12 12q-37 37 -89 37t-89 -37t-37 -89.5t37 -89.5l29 -29l152 -152l160 -160l-151 -152l-161 160l-151 152l-30 30q-68 67 -90 159.5t5 179.5q-70 15 -115 71t-45 129q0 85 60 145.5t145 60.5q76 0 133.5 -49t69.5 -123q84 20 169.5 -3.5
+t149.5 -87.5zM1536 78q0 -85 -60 -145.5t-145 -60.5q-74 0 -131 47t-71 118q-86 -28 -179.5 -6t-161.5 90l-11 12l151 152l12 -12q37 -37 89 -37t89 37t37 89t-37 89l-30 30l-152 152l-160 160l152 152l160 -160l152 -152l29 -30q64 -64 87.5 -150.5t2.5 -171.5
+q76 -11 126.5 -68.5t50.5 -134.5zM1534 1202q0 -77 -51 -135t-127 -69q26 -85 3 -176.5t-90 -158.5l-12 -12l-151 152l12 12q37 37 37 89t-37 89t-89 37t-89 -37l-30 -30l-152 -152l-160 -160l-152 152l161 160l152 152l29 30q67 67 159 89.5t178 -3.5q11 75 68.5 126
+t135.5 51q85 0 145 -60.5t60 -145.5z" />
+    <glyph glyph-name="f1ab" unicode="&#xf1ab;" 
+d="M654 458q-1 -3 -12.5 0.5t-31.5 11.5l-20 9q-44 20 -87 49q-7 5 -41 31.5t-38 28.5q-67 -103 -134 -181q-81 -95 -105 -110q-4 -2 -19.5 -4t-18.5 0q6 4 82 92q21 24 85.5 115t78.5 118q17 30 51 98.5t36 77.5q-8 1 -110 -33q-8 -2 -27.5 -7.5t-34.5 -9.5t-17 -5
+q-2 -2 -2 -10.5t-1 -9.5q-5 -10 -31 -15q-23 -7 -47 0q-18 4 -28 21q-4 6 -5 23q6 2 24.5 5t29.5 6q58 16 105 32q100 35 102 35q10 2 43 19.5t44 21.5q9 3 21.5 8t14.5 5.5t6 -0.5q2 -12 -1 -33q0 -2 -12.5 -27t-26.5 -53.5t-17 -33.5q-25 -50 -77 -131l64 -28
+q12 -6 74.5 -32t67.5 -28q4 -1 10.5 -25.5t4.5 -30.5zM449 944q3 -15 -4 -28q-12 -23 -50 -38q-30 -12 -60 -12q-26 3 -49 26q-14 15 -18 41l1 3q3 -3 19.5 -5t26.5 0t58 16q36 12 55 14q17 0 21 -17zM1147 815l63 -227l-139 42zM39 15l694 232v1032l-694 -233v-1031z
+M1280 332l102 -31l-181 657l-100 31l-216 -536l102 -31l45 110l211 -65zM777 1294l573 -184v380zM1088 -29l158 -13l-54 -160l-40 66q-130 -83 -276 -108q-58 -12 -91 -12h-84q-79 0 -199.5 39t-183.5 85q-8 7 -8 16q0 8 5 13.5t13 5.5q4 0 18 -7.5t30.5 -16.5t20.5 -11
+q73 -37 159.5 -61.5t157.5 -24.5q95 0 167 14.5t157 50.5q15 7 30.5 15.5t34 19t28.5 16.5zM1536 1050v-1079l-774 246q-14 -6 -375 -127.5t-368 -121.5q-13 0 -18 13q0 1 -1 3v1078q3 9 4 10q5 6 20 11q107 36 149 50v384l558 -198q2 0 160.5 55t316 108.5t161.5 53.5
+q20 0 20 -21v-418z" />
+    <glyph glyph-name="_402" unicode="&#xf1ac;" horiz-adv-x="1792" 
+d="M288 1152q66 0 113 -47t47 -113v-1088q0 -66 -47 -113t-113 -47h-128q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h128zM1664 989q58 -34 93 -93t35 -128v-768q0 -106 -75 -181t-181 -75h-864q-66 0 -113 47t-47 113v1536q0 40 28 68t68 28h672q40 0 88 -20t76 -48
+l152 -152q28 -28 48 -76t20 -88v-163zM928 0v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM928 256v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM928 512v128q0 14 -9 23
+t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1184 0v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1184 256v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128
+q14 0 23 9t9 23zM1184 512v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1440 0v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1440 256v128q0 14 -9 23t-23 9h-128
+q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1440 512v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1536 896v256h-160q-40 0 -68 28t-28 68v160h-640v-512h896z" />
+    <glyph glyph-name="_403" unicode="&#xf1ad;" 
+d="M1344 1536q26 0 45 -19t19 -45v-1664q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h1280zM512 1248v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM512 992v-64q0 -14 9 -23t23 -9h64q14 0 23 9
+t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM512 736v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM512 480v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM384 160v64
+q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM384 416v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM384 672v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64
+q14 0 23 9t9 23zM384 928v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM384 1184v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 -96v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9
+t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM896 416v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 672v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 928v64
+q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 1184v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 160v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64
+q14 0 23 9t9 23zM1152 416v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 672v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 928v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9
+t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 1184v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23z" />
+    <glyph glyph-name="_404" unicode="&#xf1ae;" horiz-adv-x="1280" 
+d="M1188 988l-292 -292v-824q0 -46 -33 -79t-79 -33t-79 33t-33 79v384h-64v-384q0 -46 -33 -79t-79 -33t-79 33t-33 79v824l-292 292q-28 28 -28 68t28 68q29 28 68.5 28t67.5 -28l228 -228h368l228 228q28 28 68 28t68 -28q28 -29 28 -68.5t-28 -67.5zM864 1152
+q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
+    <glyph glyph-name="uniF1B1" unicode="&#xf1b0;" horiz-adv-x="1664" 
+d="M780 1064q0 -60 -19 -113.5t-63 -92.5t-105 -39q-76 0 -138 57.5t-92 135.5t-30 151q0 60 19 113.5t63 92.5t105 39q77 0 138.5 -57.5t91.5 -135t30 -151.5zM438 581q0 -80 -42 -139t-119 -59q-76 0 -141.5 55.5t-100.5 133.5t-35 152q0 80 42 139.5t119 59.5
+q76 0 141.5 -55.5t100.5 -134t35 -152.5zM832 608q118 0 255 -97.5t229 -237t92 -254.5q0 -46 -17 -76.5t-48.5 -45t-64.5 -20t-76 -5.5q-68 0 -187.5 45t-182.5 45q-66 0 -192.5 -44.5t-200.5 -44.5q-183 0 -183 146q0 86 56 191.5t139.5 192.5t187.5 146t193 59zM1071 819
+q-61 0 -105 39t-63 92.5t-19 113.5q0 74 30 151.5t91.5 135t138.5 57.5q61 0 105 -39t63 -92.5t19 -113.5q0 -73 -30 -151t-92 -135.5t-138 -57.5zM1503 923q77 0 119 -59.5t42 -139.5q0 -74 -35 -152t-100.5 -133.5t-141.5 -55.5q-77 0 -119 59t-42 139q0 74 35 152.5
+t100.5 134t141.5 55.5z" />
+    <glyph glyph-name="_406" unicode="&#xf1b1;" horiz-adv-x="768" 
+d="M704 1008q0 -145 -57 -243.5t-152 -135.5l45 -821q2 -26 -16 -45t-44 -19h-192q-26 0 -44 19t-16 45l45 821q-95 37 -152 135.5t-57 243.5q0 128 42.5 249.5t117.5 200t160 78.5t160 -78.5t117.5 -200t42.5 -249.5z" />
+    <glyph glyph-name="_407" unicode="&#xf1b2;" horiz-adv-x="1792" 
+d="M896 -93l640 349v636l-640 -233v-752zM832 772l698 254l-698 254l-698 -254zM1664 1024v-768q0 -35 -18 -65t-49 -47l-704 -384q-28 -16 -61 -16t-61 16l-704 384q-31 17 -49 47t-18 65v768q0 40 23 73t61 47l704 256q22 8 44 8t44 -8l704 -256q38 -14 61 -47t23 -73z
+" />
+    <glyph glyph-name="_408" unicode="&#xf1b3;" horiz-adv-x="2304" 
+d="M640 -96l384 192v314l-384 -164v-342zM576 358l404 173l-404 173l-404 -173zM1664 -96l384 192v314l-384 -164v-342zM1600 358l404 173l-404 173l-404 -173zM1152 651l384 165v266l-384 -164v-267zM1088 1030l441 189l-441 189l-441 -189zM2176 512v-416q0 -36 -19 -67
+t-52 -47l-448 -224q-25 -14 -57 -14t-57 14l-448 224q-4 2 -7 4q-2 -2 -7 -4l-448 -224q-25 -14 -57 -14t-57 14l-448 224q-33 16 -52 47t-19 67v416q0 38 21.5 70t56.5 48l434 186v400q0 38 21.5 70t56.5 48l448 192q23 10 50 10t50 -10l448 -192q35 -16 56.5 -48t21.5 -70
+v-400l434 -186q36 -16 57 -48t21 -70z" />
+    <glyph glyph-name="_409" unicode="&#xf1b4;" horiz-adv-x="2048" 
+d="M1848 1197h-511v-124h511v124zM1596 771q-90 0 -146 -52.5t-62 -142.5h408q-18 195 -200 195zM1612 186q63 0 122 32t76 87h221q-100 -307 -427 -307q-214 0 -340.5 132t-126.5 347q0 208 130.5 345.5t336.5 137.5q138 0 240.5 -68t153 -179t50.5 -248q0 -17 -2 -47h-658
+q0 -111 57.5 -171.5t166.5 -60.5zM277 236h296q205 0 205 167q0 180 -199 180h-302v-347zM277 773h281q78 0 123.5 36.5t45.5 113.5q0 144 -190 144h-260v-294zM0 1282h594q87 0 155 -14t126.5 -47.5t90 -96.5t31.5 -154q0 -181 -172 -263q114 -32 172 -115t58 -204
+q0 -75 -24.5 -136.5t-66 -103.5t-98.5 -71t-121 -42t-134 -13h-611v1260z" />
+    <glyph glyph-name="_410" unicode="&#xf1b5;" 
+d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM499 1041h-371v-787h382q117 0 197 57.5t80 170.5q0 158 -143 200q107 52 107 164q0 57 -19.5 96.5
+t-56.5 60.5t-79 29.5t-97 8.5zM477 723h-176v184h163q119 0 119 -90q0 -94 -106 -94zM486 388h-185v217h189q124 0 124 -113q0 -104 -128 -104zM1136 356q-68 0 -104 38t-36 107h411q1 10 1 30q0 132 -74.5 220.5t-203.5 88.5q-128 0 -210 -86t-82 -216q0 -135 79 -217
+t213 -82q205 0 267 191h-138q-11 -34 -47.5 -54t-75.5 -20zM1126 722q113 0 124 -122h-254q4 56 39 89t91 33zM964 988h319v-77h-319v77z" />
+    <glyph glyph-name="_411" unicode="&#xf1b6;" horiz-adv-x="1792" 
+d="M1582 954q0 -101 -71.5 -172.5t-172.5 -71.5t-172.5 71.5t-71.5 172.5t71.5 172.5t172.5 71.5t172.5 -71.5t71.5 -172.5zM812 212q0 104 -73 177t-177 73q-27 0 -54 -6l104 -42q77 -31 109.5 -106.5t1.5 -151.5q-31 -77 -107 -109t-152 -1q-21 8 -62 24.5t-61 24.5
+q32 -60 91 -96.5t130 -36.5q104 0 177 73t73 177zM1642 953q0 126 -89.5 215.5t-215.5 89.5q-127 0 -216.5 -89.5t-89.5 -215.5q0 -127 89.5 -216t216.5 -89q126 0 215.5 89t89.5 216zM1792 953q0 -189 -133.5 -322t-321.5 -133l-437 -319q-12 -129 -109 -218t-229 -89
+q-121 0 -214 76t-118 192l-230 92v429l389 -157q79 48 173 48q13 0 35 -2l284 407q2 187 135.5 319t320.5 132q188 0 321.5 -133.5t133.5 -321.5z" />
+    <glyph glyph-name="_412" unicode="&#xf1b7;" 
+d="M1242 889q0 80 -57 136.5t-137 56.5t-136.5 -57t-56.5 -136q0 -80 56.5 -136.5t136.5 -56.5t137 56.5t57 136.5zM632 301q0 -83 -58 -140.5t-140 -57.5q-56 0 -103 29t-72 77q52 -20 98 -40q60 -24 120 1.5t85 86.5q24 60 -1.5 120t-86.5 84l-82 33q22 5 42 5
+q82 0 140 -57.5t58 -140.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v153l172 -69q20 -92 93.5 -152t168.5 -60q104 0 181 70t87 173l345 252q150 0 255.5 105.5t105.5 254.5q0 150 -105.5 255.5t-255.5 105.5
+q-148 0 -253 -104.5t-107 -252.5l-225 -322q-9 1 -28 1q-75 0 -137 -37l-297 119v468q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5zM1289 887q0 -100 -71 -170.5t-171 -70.5t-170.5 70.5t-70.5 170.5t70.5 171t170.5 71q101 0 171.5 -70.5t70.5 -171.5z
+" />
+    <glyph glyph-name="_413" unicode="&#xf1b8;" horiz-adv-x="1792" 
+d="M836 367l-15 -368l-2 -22l-420 29q-36 3 -67 31.5t-47 65.5q-11 27 -14.5 55t4 65t12 55t21.5 64t19 53q78 -12 509 -28zM449 953l180 -379l-147 92q-63 -72 -111.5 -144.5t-72.5 -125t-39.5 -94.5t-18.5 -63l-4 -21l-190 357q-17 26 -18 56t6 47l8 18q35 63 114 188
+l-140 86zM1680 436l-188 -359q-12 -29 -36.5 -46.5t-43.5 -20.5l-18 -4q-71 -7 -219 -12l8 -164l-230 367l211 362l7 -173q170 -16 283 -5t170 33zM895 1360q-47 -63 -265 -435l-317 187l-19 12l225 356q20 31 60 45t80 10q24 -2 48.5 -12t42 -21t41.5 -33t36 -34.5
+t36 -39.5t32 -35zM1550 1053l212 -363q18 -37 12.5 -76t-27.5 -74q-13 -20 -33 -37t-38 -28t-48.5 -22t-47 -16t-51.5 -14t-46 -12q-34 72 -265 436l313 195zM1407 1279l142 83l-220 -373l-419 20l151 86q-34 89 -75 166t-75.5 123.5t-64.5 80t-47 46.5l-17 13l405 -1
+q31 3 58 -10.5t39 -28.5l11 -15q39 -61 112 -190z" />
+    <glyph glyph-name="_414" unicode="&#xf1b9;" horiz-adv-x="2048" 
+d="M480 448q0 66 -47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47t113 47t47 113zM516 768h1016l-89 357q-2 8 -14 17.5t-21 9.5h-768q-9 0 -21 -9.5t-14 -17.5zM1888 448q0 66 -47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47t113 47t47 113zM2048 544v-384
+q0 -14 -9 -23t-23 -9h-96v-128q0 -80 -56 -136t-136 -56t-136 56t-56 136v128h-1024v-128q0 -80 -56 -136t-136 -56t-136 56t-56 136v128h-96q-14 0 -23 9t-9 23v384q0 93 65.5 158.5t158.5 65.5h28l105 419q23 94 104 157.5t179 63.5h768q98 0 179 -63.5t104 -157.5
+l105 -419h28q93 0 158.5 -65.5t65.5 -158.5z" />
+    <glyph glyph-name="_415" unicode="&#xf1ba;" horiz-adv-x="2048" 
+d="M1824 640q93 0 158.5 -65.5t65.5 -158.5v-384q0 -14 -9 -23t-23 -9h-96v-64q0 -80 -56 -136t-136 -56t-136 56t-56 136v64h-1024v-64q0 -80 -56 -136t-136 -56t-136 56t-56 136v64h-96q-14 0 -23 9t-9 23v384q0 93 65.5 158.5t158.5 65.5h28l105 419q23 94 104 157.5
+t179 63.5h128v224q0 14 9 23t23 9h448q14 0 23 -9t9 -23v-224h128q98 0 179 -63.5t104 -157.5l105 -419h28zM320 160q66 0 113 47t47 113t-47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47zM516 640h1016l-89 357q-2 8 -14 17.5t-21 9.5h-768q-9 0 -21 -9.5t-14 -17.5z
+M1728 160q66 0 113 47t47 113t-47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47z" />
+    <glyph glyph-name="_416" unicode="&#xf1bb;" 
+d="M1504 64q0 -26 -19 -45t-45 -19h-462q1 -17 6 -87.5t5 -108.5q0 -25 -18 -42.5t-43 -17.5h-320q-25 0 -43 17.5t-18 42.5q0 38 5 108.5t6 87.5h-462q-26 0 -45 19t-19 45t19 45l402 403h-229q-26 0 -45 19t-19 45t19 45l402 403h-197q-26 0 -45 19t-19 45t19 45l384 384
+q19 19 45 19t45 -19l384 -384q19 -19 19 -45t-19 -45t-45 -19h-197l402 -403q19 -19 19 -45t-19 -45t-45 -19h-229l402 -403q19 -19 19 -45z" />
+    <glyph glyph-name="_417" unicode="&#xf1bc;" 
+d="M1127 326q0 32 -30 51q-193 115 -447 115q-133 0 -287 -34q-42 -9 -42 -52q0 -20 13.5 -34.5t35.5 -14.5q5 0 37 8q132 27 243 27q226 0 397 -103q19 -11 33 -11q19 0 33 13.5t14 34.5zM1223 541q0 40 -35 61q-237 141 -548 141q-153 0 -303 -42q-48 -13 -48 -64
+q0 -25 17.5 -42.5t42.5 -17.5q7 0 37 8q122 33 251 33q279 0 488 -124q24 -13 38 -13q25 0 42.5 17.5t17.5 42.5zM1331 789q0 47 -40 70q-126 73 -293 110.5t-343 37.5q-204 0 -364 -47q-23 -7 -38.5 -25.5t-15.5 -48.5q0 -31 20.5 -52t51.5 -21q11 0 40 8q133 37 307 37
+q159 0 309.5 -34t253.5 -95q21 -12 40 -12q29 0 50.5 20.5t21.5 51.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="_418" unicode="&#xf1bd;" horiz-adv-x="1024" 
+d="M1024 1233l-303 -582l24 -31h279v-415h-507l-44 -30l-142 -273l-30 -30h-301v303l303 583l-24 30h-279v415h507l44 30l142 273l30 30h301v-303z" />
+    <glyph glyph-name="_419" unicode="&#xf1be;" horiz-adv-x="2304" 
+d="M784 164l16 241l-16 523q-1 10 -7.5 17t-16.5 7q-9 0 -16 -7t-7 -17l-14 -523l14 -241q1 -10 7.5 -16.5t15.5 -6.5q22 0 24 23zM1080 193l11 211l-12 586q0 16 -13 24q-8 5 -16 5t-16 -5q-13 -8 -13 -24l-1 -6l-10 -579q0 -1 11 -236v-1q0 -10 6 -17q9 -11 23 -11
+q11 0 20 9q9 7 9 20zM35 533l20 -128l-20 -126q-2 -9 -9 -9t-9 9l-17 126l17 128q2 9 9 9t9 -9zM121 612l26 -207l-26 -203q-2 -9 -10 -9q-9 0 -9 10l-23 202l23 207q0 9 9 9q8 0 10 -9zM401 159zM213 650l25 -245l-25 -237q0 -11 -11 -11q-10 0 -12 11l-21 237l21 245
+q2 12 12 12q11 0 11 -12zM307 657l23 -252l-23 -244q-2 -13 -14 -13q-13 0 -13 13l-21 244l21 252q0 13 13 13q12 0 14 -13zM401 639l21 -234l-21 -246q-2 -16 -16 -16q-6 0 -10.5 4.5t-4.5 11.5l-20 246l20 234q0 6 4.5 10.5t10.5 4.5q14 0 16 -15zM784 164zM495 785
+l21 -380l-21 -246q0 -7 -5 -12.5t-12 -5.5q-16 0 -18 18l-18 246l18 380q2 18 18 18q7 0 12 -5.5t5 -12.5zM589 871l19 -468l-19 -244q0 -8 -5.5 -13.5t-13.5 -5.5q-18 0 -20 19l-16 244l16 468q2 19 20 19q8 0 13.5 -5.5t5.5 -13.5zM687 911l18 -506l-18 -242
+q-2 -21 -22 -21q-19 0 -21 21l-16 242l16 506q0 9 6.5 15.5t14.5 6.5q9 0 15 -6.5t7 -15.5zM1079 169v0v0v0zM881 915l15 -510l-15 -239q0 -10 -7.5 -17.5t-17.5 -7.5t-17 7t-8 18l-14 239l14 510q0 11 7.5 18t17.5 7t17.5 -7t7.5 -18zM980 896l14 -492l-14 -236
+q0 -11 -8 -19t-19 -8t-19 8t-9 19l-12 236l12 492q1 12 9 20t19 8t18.5 -8t8.5 -20zM1192 404l-14 -231v0q0 -13 -9 -22t-22 -9t-22 9t-10 22l-6 114l-6 117l12 636v3q2 15 12 24q9 7 20 7q8 0 15 -5q14 -8 16 -26zM2304 423q0 -117 -83 -199.5t-200 -82.5h-786
+q-13 2 -22 11t-9 22v899q0 23 28 33q85 34 181 34q195 0 338 -131.5t160 -323.5q53 22 110 22q117 0 200 -83t83 -201z" />
+    <glyph glyph-name="uniF1C0" unicode="&#xf1c0;" 
+d="M768 768q237 0 443 43t325 127v-170q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5t-103 128v170q119 -84 325 -127t443 -43zM768 0q237 0 443 43t325 127v-170q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5t-103 128v170q119 -84 325 -127
+t443 -43zM768 384q237 0 443 43t325 127v-170q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5t-103 128v170q119 -84 325 -127t443 -43zM768 1536q208 0 385 -34.5t280 -93.5t103 -128v-128q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5
+t-103 128v128q0 69 103 128t280 93.5t385 34.5z" />
+    <glyph glyph-name="uniF1C1" unicode="&#xf1c1;" 
+d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+M894 465q33 -26 84 -56q59 7 117 7q147 0 177 -49q16 -22 2 -52q0 -1 -1 -2l-2 -2v-1q-6 -38 -71 -38q-48 0 -115 20t-130 53q-221 -24 -392 -83q-153 -262 -242 -262q-15 0 -28 7l-24 12q-1 1 -6 5q-10 10 -6 36q9 40 56 91.5t132 96.5q14 9 23 -6q2 -2 2 -4q52 85 107 197
+q68 136 104 262q-24 82 -30.5 159.5t6.5 127.5q11 40 42 40h21h1q23 0 35 -15q18 -21 9 -68q-2 -6 -4 -8q1 -3 1 -8v-30q-2 -123 -14 -192q55 -164 146 -238zM318 54q52 24 137 158q-51 -40 -87.5 -84t-49.5 -74zM716 974q-15 -42 -2 -132q1 7 7 44q0 3 7 43q1 4 4 8
+q-1 1 -1 2q-1 2 -1 3q-1 22 -13 36q0 -1 -1 -2v-2zM592 313q135 54 284 81q-2 1 -13 9.5t-16 13.5q-76 67 -127 176q-27 -86 -83 -197q-30 -56 -45 -83zM1238 329q-24 24 -140 24q76 -28 124 -28q14 0 18 1q0 1 -2 3z" />
+    <glyph glyph-name="_422" unicode="&#xf1c2;" 
+d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+M233 768v-107h70l164 -661h159l128 485q7 20 10 46q2 16 2 24h4l3 -24q1 -3 3.5 -20t5.5 -26l128 -485h159l164 661h70v107h-300v-107h90l-99 -438q-5 -20 -7 -46l-2 -21h-4q0 3 -0.5 6.5t-1.5 8t-1 6.5q-1 5 -4 21t-5 25l-144 545h-114l-144 -545q-2 -9 -4.5 -24.5
+t-3.5 -21.5l-4 -21h-4l-2 21q-2 26 -7 46l-99 438h90v107h-300z" />
+    <glyph glyph-name="_423" unicode="&#xf1c3;" 
+d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+M429 106v-106h281v106h-75l103 161q5 7 10 16.5t7.5 13.5t3.5 4h2q1 -4 5 -10q2 -4 4.5 -7.5t6 -8t6.5 -8.5l107 -161h-76v-106h291v106h-68l-192 273l195 282h67v107h-279v-107h74l-103 -159q-4 -7 -10 -16.5t-9 -13.5l-2 -3h-2q-1 4 -5 10q-6 11 -17 23l-106 159h76v107
+h-290v-107h68l189 -272l-194 -283h-68z" />
+    <glyph glyph-name="_424" unicode="&#xf1c4;" 
+d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+M416 106v-106h327v106h-93v167h137q76 0 118 15q67 23 106.5 87t39.5 146q0 81 -37 141t-100 87q-48 19 -130 19h-368v-107h92v-555h-92zM769 386h-119v268h120q52 0 83 -18q56 -33 56 -115q0 -89 -62 -120q-31 -15 -78 -15z" />
+    <glyph glyph-name="_425" unicode="&#xf1c5;" 
+d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+M1280 320v-320h-1024v192l192 192l128 -128l384 384zM448 512q-80 0 -136 56t-56 136t56 136t136 56t136 -56t56 -136t-56 -136t-136 -56z" />
+    <glyph glyph-name="_426" unicode="&#xf1c6;" 
+d="M640 1152v128h-128v-128h128zM768 1024v128h-128v-128h128zM640 896v128h-128v-128h128zM768 768v128h-128v-128h128zM1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400
+v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-128v-128h-128v128h-512v-1536h1280zM781 593l107 -349q8 -27 8 -52q0 -83 -72.5 -137.5t-183.5 -54.5t-183.5 54.5t-72.5 137.5q0 25 8 52q21 63 120 396v128h128v-128h79
+q22 0 39 -13t23 -34zM640 128q53 0 90.5 19t37.5 45t-37.5 45t-90.5 19t-90.5 -19t-37.5 -45t37.5 -45t90.5 -19z" />
+    <glyph glyph-name="_427" unicode="&#xf1c7;" 
+d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+M620 686q20 -8 20 -30v-544q0 -22 -20 -30q-8 -2 -12 -2q-12 0 -23 9l-166 167h-131q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h131l166 167q16 15 35 7zM1037 -3q31 0 50 24q129 159 129 363t-129 363q-16 21 -43 24t-47 -14q-21 -17 -23.5 -43.5t14.5 -47.5
+q100 -123 100 -282t-100 -282q-17 -21 -14.5 -47.5t23.5 -42.5q18 -15 40 -15zM826 145q27 0 47 20q87 93 87 219t-87 219q-18 19 -45 20t-46 -17t-20 -44.5t18 -46.5q52 -57 52 -131t-52 -131q-19 -20 -18 -46.5t20 -44.5q20 -17 44 -17z" />
+    <glyph glyph-name="_428" unicode="&#xf1c8;" 
+d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+M768 768q52 0 90 -38t38 -90v-384q0 -52 -38 -90t-90 -38h-384q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h384zM1260 766q20 -8 20 -30v-576q0 -22 -20 -30q-8 -2 -12 -2q-14 0 -23 9l-265 266v90l265 266q9 9 23 9q4 0 12 -2z" />
+    <glyph glyph-name="_429" unicode="&#xf1c9;" 
+d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+M480 768q8 11 21 12.5t24 -6.5l51 -38q11 -8 12.5 -21t-6.5 -24l-182 -243l182 -243q8 -11 6.5 -24t-12.5 -21l-51 -38q-11 -8 -24 -6.5t-21 12.5l-226 301q-14 19 0 38zM1282 467q14 -19 0 -38l-226 -301q-8 -11 -21 -12.5t-24 6.5l-51 38q-11 8 -12.5 21t6.5 24l182 243
+l-182 243q-8 11 -6.5 24t12.5 21l51 38q11 8 24 6.5t21 -12.5zM662 6q-13 2 -20.5 13t-5.5 24l138 831q2 13 13 20.5t24 5.5l63 -10q13 -2 20.5 -13t5.5 -24l-138 -831q-2 -13 -13 -20.5t-24 -5.5z" />
+    <glyph glyph-name="_430" unicode="&#xf1ca;" 
+d="M1497 709v-198q-101 -23 -198 -23q-65 -136 -165.5 -271t-181.5 -215.5t-128 -106.5q-80 -45 -162 3q-28 17 -60.5 43.5t-85 83.5t-102.5 128.5t-107.5 184t-105.5 244t-91.5 314.5t-70.5 390h283q26 -218 70 -398.5t104.5 -317t121.5 -235.5t140 -195q169 169 287 406
+q-142 72 -223 220t-81 333q0 192 104 314.5t284 122.5q178 0 273 -105.5t95 -297.5q0 -159 -58 -286q-7 -1 -19.5 -3t-46 -2t-63 6t-62 25.5t-50.5 51.5q31 103 31 184q0 87 -29 132t-79 45q-53 0 -85 -49.5t-32 -140.5q0 -186 105 -293.5t267 -107.5q62 0 121 14z" />
+    <glyph glyph-name="_431" unicode="&#xf1cb;" horiz-adv-x="1792" 
+d="M216 367l603 -402v359l-334 223zM154 511l193 129l-193 129v-258zM973 -35l603 402l-269 180l-334 -223v-359zM896 458l272 182l-272 182l-272 -182zM485 733l334 223v359l-603 -402zM1445 640l193 -129v258zM1307 733l269 180l-603 402v-359zM1792 913v-546
+q0 -41 -34 -64l-819 -546q-21 -13 -43 -13t-43 13l-819 546q-34 23 -34 64v546q0 41 34 64l819 546q21 13 43 13t43 -13l819 -546q34 -23 34 -64z" />
+    <glyph glyph-name="_432" unicode="&#xf1cc;" horiz-adv-x="2048" 
+d="M1800 764q111 -46 179.5 -145.5t68.5 -221.5q0 -164 -118 -280.5t-285 -116.5q-4 0 -11.5 0.5t-10.5 0.5h-1209h-1h-2h-5q-170 10 -288 125.5t-118 280.5q0 110 55 203t147 147q-12 39 -12 82q0 115 82 196t199 81q95 0 172 -58q75 154 222.5 248t326.5 94
+q166 0 306 -80.5t221.5 -218.5t81.5 -301q0 -6 -0.5 -18t-0.5 -18zM468 498q0 -122 84 -193t208 -71q137 0 240 99q-16 20 -47.5 56.5t-43.5 50.5q-67 -65 -144 -65q-55 0 -93.5 33.5t-38.5 87.5q0 53 38.5 87t91.5 34q44 0 84.5 -21t73 -55t65 -75t69 -82t77 -75t97 -55
+t121.5 -21q121 0 204.5 71.5t83.5 190.5q0 121 -84 192t-207 71q-143 0 -241 -97l93 -108q66 64 142 64q52 0 92 -33t40 -84q0 -57 -37 -91.5t-94 -34.5q-43 0 -82.5 21t-72 55t-65.5 75t-69.5 82t-77.5 75t-96.5 55t-118.5 21q-122 0 -207 -70.5t-85 -189.5z" />
+    <glyph glyph-name="_433" unicode="&#xf1cd;" horiz-adv-x="1792" 
+d="M896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM896 1408q-190 0 -361 -90l194 -194q82 28 167 28t167 -28l194 194q-171 90 -361 90zM218 279l194 194
+q-28 82 -28 167t28 167l-194 194q-90 -171 -90 -361t90 -361zM896 -128q190 0 361 90l-194 194q-82 -28 -167 -28t-167 28l-194 -194q171 -90 361 -90zM896 256q159 0 271.5 112.5t112.5 271.5t-112.5 271.5t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5
+t271.5 -112.5zM1380 473l194 -194q90 171 90 361t-90 361l-194 -194q28 -82 28 -167t-28 -167z" />
+    <glyph glyph-name="_434" unicode="&#xf1ce;" horiz-adv-x="1792" 
+d="M1760 640q0 -176 -68.5 -336t-184 -275.5t-275.5 -184t-336 -68.5t-336 68.5t-275.5 184t-184 275.5t-68.5 336q0 213 97 398.5t265 305.5t374 151v-228q-221 -45 -366.5 -221t-145.5 -406q0 -130 51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5
+t136.5 204t51 248.5q0 230 -145.5 406t-366.5 221v228q206 -31 374 -151t265 -305.5t97 -398.5z" />
+    <glyph glyph-name="uniF1D0" unicode="&#xf1d0;" horiz-adv-x="1792" 
+d="M19 662q8 217 116 406t305 318h5q0 -1 -1 -3q-8 -8 -28 -33.5t-52 -76.5t-60 -110.5t-44.5 -135.5t-14 -150.5t39 -157.5t108.5 -154q50 -50 102 -69.5t90.5 -11.5t69.5 23.5t47 32.5l16 16q39 51 53 116.5t6.5 122.5t-21 107t-26.5 80l-14 29q-10 25 -30.5 49.5t-43 41
+t-43.5 29.5t-35 19l-13 6l104 115q39 -17 78 -52t59 -61l19 -27q1 48 -18.5 103.5t-40.5 87.5l-20 31l161 183l160 -181q-33 -46 -52.5 -102.5t-22.5 -90.5l-4 -33q22 37 61.5 72.5t67.5 52.5l28 17l103 -115q-44 -14 -85 -50t-60 -65l-19 -29q-31 -56 -48 -133.5t-7 -170
+t57 -156.5q33 -45 77.5 -60.5t85 -5.5t76 26.5t57.5 33.5l21 16q60 53 96.5 115t48.5 121.5t10 121.5t-18 118t-37 107.5t-45.5 93t-45 72t-34.5 47.5l-13 17q-14 13 -7 13l10 -3q40 -29 62.5 -46t62 -50t64 -58t58.5 -65t55.5 -77t45.5 -88t38 -103t23.5 -117t10.5 -136
+q3 -259 -108 -465t-312 -321t-456 -115q-185 0 -351 74t-283.5 198t-184 293t-60.5 353z" />
+    <glyph glyph-name="uniF1D1" unicode="&#xf1d1;" horiz-adv-x="1792" 
+d="M874 -102v-66q-208 6 -385 109.5t-283 275.5l58 34q29 -49 73 -99l65 57q148 -168 368 -212l-17 -86q65 -12 121 -13zM276 428l-83 -28q22 -60 49 -112l-57 -33q-98 180 -98 385t98 385l57 -33q-30 -56 -49 -112l82 -28q-35 -100 -35 -212q0 -109 36 -212zM1528 251
+l58 -34q-106 -172 -283 -275.5t-385 -109.5v66q56 1 121 13l-17 86q220 44 368 212l65 -57q44 50 73 99zM1377 805l-233 -80q14 -42 14 -85t-14 -85l232 -80q-31 -92 -98 -169l-185 162q-57 -67 -147 -85l48 -241q-52 -10 -98 -10t-98 10l48 241q-90 18 -147 85l-185 -162
+q-67 77 -98 169l232 80q-14 42 -14 85t14 85l-233 80q33 93 99 169l185 -162q59 68 147 86l-48 240q44 10 98 10t98 -10l-48 -240q88 -18 147 -86l185 162q66 -76 99 -169zM874 1448v-66q-65 -2 -121 -13l17 -86q-220 -42 -368 -211l-65 56q-38 -42 -73 -98l-57 33
+q106 172 282 275.5t385 109.5zM1705 640q0 -205 -98 -385l-57 33q27 52 49 112l-83 28q36 103 36 212q0 112 -35 212l82 28q-19 56 -49 112l57 33q98 -180 98 -385zM1585 1063l-57 -33q-35 56 -73 98l-65 -56q-148 169 -368 211l17 86q-56 11 -121 13v66q209 -6 385 -109.5
+t282 -275.5zM1748 640q0 173 -67.5 331t-181.5 272t-272 181.5t-331 67.5t-331 -67.5t-272 -181.5t-181.5 -272t-67.5 -331t67.5 -331t181.5 -272t272 -181.5t331 -67.5t331 67.5t272 181.5t181.5 272t67.5 331zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71
+t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="uniF1D2" unicode="&#xf1d2;" 
+d="M582 228q0 -66 -93 -66q-107 0 -107 63q0 64 98 64q102 0 102 -61zM546 694q0 -85 -74 -85q-77 0 -77 84q0 90 77 90q36 0 55 -25.5t19 -63.5zM712 769v125q-78 -29 -135 -29q-50 29 -110 29q-86 0 -145 -57t-59 -143q0 -50 29.5 -102t73.5 -67v-3q-38 -17 -38 -85
+q0 -53 41 -77v-3q-113 -37 -113 -139q0 -45 20 -78.5t54 -51t72 -25.5t81 -8q224 0 224 188q0 67 -48 99t-126 46q-27 5 -51.5 20.5t-24.5 39.5q0 44 49 52q77 15 122 70t45 134q0 24 -10 52q37 9 49 13zM771 350h137q-2 27 -2 82v387q0 46 2 69h-137q3 -23 3 -71v-392
+q0 -50 -3 -75zM1280 366v121q-30 -21 -68 -21q-53 0 -53 82v225h52q9 0 26.5 -1t26.5 -1v117h-105q0 82 3 102h-140q4 -24 4 -55v-47h-60v-117q36 3 37 3q3 0 11 -0.5t12 -0.5v-2h-2v-217q0 -37 2.5 -64t11.5 -56.5t24.5 -48.5t43.5 -31t66 -12q64 0 108 24zM924 1072
+q0 36 -24 63.5t-60 27.5t-60.5 -27t-24.5 -64q0 -36 25 -62.5t60 -26.5t59.5 27t24.5 62zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="_438" unicode="&#xf1d3;" horiz-adv-x="1792" 
+d="M595 22q0 100 -165 100q-158 0 -158 -104q0 -101 172 -101q151 0 151 105zM536 777q0 61 -30 102t-89 41q-124 0 -124 -145q0 -135 124 -135q119 0 119 137zM805 1101v-202q-36 -12 -79 -22q16 -43 16 -84q0 -127 -73 -216.5t-197 -112.5q-40 -8 -59.5 -27t-19.5 -58
+q0 -31 22.5 -51.5t58 -32t78.5 -22t86 -25.5t78.5 -37.5t58 -64t22.5 -98.5q0 -304 -363 -304q-69 0 -130 12.5t-116 41t-87.5 82t-32.5 127.5q0 165 182 225v4q-67 41 -67 126q0 109 63 137v4q-72 24 -119.5 108.5t-47.5 165.5q0 139 95 231.5t235 92.5q96 0 178 -47
+q98 0 218 47zM1123 220h-222q4 45 4 134v609q0 94 -4 128h222q-4 -33 -4 -124v-613q0 -89 4 -134zM1724 442v-196q-71 -39 -174 -39q-62 0 -107 20t-70 50t-39.5 78t-18.5 92t-4 103v351h2v4q-7 0 -19 1t-18 1q-21 0 -59 -6v190h96v76q0 54 -6 89h227q-6 -41 -6 -165h171
+v-190q-15 0 -43.5 2t-42.5 2h-85v-365q0 -131 87 -131q61 0 109 33zM1148 1389q0 -58 -39 -101.5t-96 -43.5q-58 0 -98 43.5t-40 101.5q0 59 39.5 103t98.5 44q58 0 96.5 -44.5t38.5 -102.5z" />
+    <glyph glyph-name="_439" unicode="&#xf1d4;" 
+d="M809 532l266 499h-112l-157 -312q-24 -48 -44 -92l-42 92l-155 312h-120l263 -493v-324h101v318zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="uniF1D5" unicode="&#xf1d5;" horiz-adv-x="1280" 
+d="M842 964q0 -80 -57 -136.5t-136 -56.5q-60 0 -111 35q-62 -67 -115 -146q-247 -371 -202 -859q1 -22 -12.5 -38.5t-34.5 -18.5h-5q-20 0 -35 13.5t-17 33.5q-14 126 -3.5 247.5t29.5 217t54 186t69 155.5t74 125q61 90 132 165q-16 35 -16 77q0 80 56.5 136.5t136.5 56.5
+t136.5 -56.5t56.5 -136.5zM1223 953q0 -158 -78 -292t-212.5 -212t-292.5 -78q-64 0 -131 14q-21 5 -32.5 23.5t-6.5 39.5q5 20 23 31.5t39 7.5q51 -13 108 -13q97 0 186 38t153 102t102 153t38 186t-38 186t-102 153t-153 102t-186 38t-186 -38t-153 -102t-102 -153
+t-38 -186q0 -114 52 -218q10 -20 3.5 -40t-25.5 -30t-39.5 -3t-30.5 26q-64 123 -64 265q0 119 46.5 227t124.5 186t186 124t226 46q158 0 292.5 -78t212.5 -212.5t78 -292.5z" />
+    <glyph glyph-name="uniF1D6" unicode="&#xf1d6;" horiz-adv-x="1792" 
+d="M270 730q-8 19 -8 52q0 20 11 49t24 45q-1 22 7.5 53t22.5 43q0 139 92.5 288.5t217.5 209.5q139 66 324 66q133 0 266 -55q49 -21 90 -48t71 -56t55 -68t42 -74t32.5 -84.5t25.5 -89.5t22 -98l1 -5q55 -83 55 -150q0 -14 -9 -40t-9 -38q0 -1 1.5 -3.5t3.5 -5t2 -3.5
+q77 -114 120.5 -214.5t43.5 -208.5q0 -43 -19.5 -100t-55.5 -57q-9 0 -19.5 7.5t-19 17.5t-19 26t-16 26.5t-13.5 26t-9 17.5q-1 1 -3 1l-5 -4q-59 -154 -132 -223q20 -20 61.5 -38.5t69 -41.5t35.5 -65q-2 -4 -4 -16t-7 -18q-64 -97 -302 -97q-53 0 -110.5 9t-98 20
+t-104.5 30q-15 5 -23 7q-14 4 -46 4.5t-40 1.5q-41 -45 -127.5 -65t-168.5 -20q-35 0 -69 1.5t-93 9t-101 20.5t-74.5 40t-32.5 64q0 40 10 59.5t41 48.5q11 2 40.5 13t49.5 12q4 0 14 2q2 2 2 4l-2 3q-48 11 -108 105.5t-73 156.5l-5 3q-4 0 -12 -20q-18 -41 -54.5 -74.5
+t-77.5 -37.5h-1q-4 0 -6 4.5t-5 5.5q-23 54 -23 100q0 275 252 466z" />
+    <glyph glyph-name="uniF1D7" unicode="&#xf1d7;" horiz-adv-x="2048" 
+d="M580 1075q0 41 -25 66t-66 25q-43 0 -76 -25.5t-33 -65.5q0 -39 33 -64.5t76 -25.5q41 0 66 24.5t25 65.5zM1323 568q0 28 -25.5 50t-65.5 22q-27 0 -49.5 -22.5t-22.5 -49.5q0 -28 22.5 -50.5t49.5 -22.5q40 0 65.5 22t25.5 51zM1087 1075q0 41 -24.5 66t-65.5 25
+q-43 0 -76 -25.5t-33 -65.5q0 -39 33 -64.5t76 -25.5q41 0 65.5 24.5t24.5 65.5zM1722 568q0 28 -26 50t-65 22q-27 0 -49.5 -22.5t-22.5 -49.5q0 -28 22.5 -50.5t49.5 -22.5q39 0 65 22t26 51zM1456 965q-31 4 -70 4q-169 0 -311 -77t-223.5 -208.5t-81.5 -287.5
+q0 -78 23 -152q-35 -3 -68 -3q-26 0 -50 1.5t-55 6.5t-44.5 7t-54.5 10.5t-50 10.5l-253 -127l72 218q-290 203 -290 490q0 169 97.5 311t264 223.5t363.5 81.5q176 0 332.5 -66t262 -182.5t136.5 -260.5zM2048 404q0 -117 -68.5 -223.5t-185.5 -193.5l55 -181l-199 109
+q-150 -37 -218 -37q-169 0 -311 70.5t-223.5 191.5t-81.5 264t81.5 264t223.5 191.5t311 70.5q161 0 303 -70.5t227.5 -192t85.5 -263.5z" />
+    <glyph glyph-name="_443" unicode="&#xf1d8;" horiz-adv-x="1792" 
+d="M1764 1525q33 -24 27 -64l-256 -1536q-5 -29 -32 -45q-14 -8 -31 -8q-11 0 -24 5l-453 185l-242 -295q-18 -23 -49 -23q-13 0 -22 4q-19 7 -30.5 23.5t-11.5 36.5v349l864 1059l-1069 -925l-395 162q-37 14 -40 55q-2 40 32 59l1664 960q15 9 32 9q20 0 36 -11z" />
+    <glyph glyph-name="_444" unicode="&#xf1d9;" horiz-adv-x="1792" 
+d="M1764 1525q33 -24 27 -64l-256 -1536q-5 -29 -32 -45q-14 -8 -31 -8q-11 0 -24 5l-527 215l-298 -327q-18 -21 -47 -21q-14 0 -23 4q-19 7 -30 23.5t-11 36.5v452l-472 193q-37 14 -40 55q-3 39 32 59l1664 960q35 21 68 -2zM1422 26l221 1323l-1434 -827l336 -137
+l863 639l-478 -797z" />
+    <glyph glyph-name="_445" unicode="&#xf1da;" 
+d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61q-172 0 -327 72.5t-264 204.5q-7 10 -6.5 22.5t8.5 20.5l137 138q10 9 25 9q16 -2 23 -12q73 -95 179 -147t225 -52q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5
+t-163.5 109.5t-198.5 40.5q-98 0 -188 -35.5t-160 -101.5l137 -138q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l130 -129q107 101 244.5 156.5t284.5 55.5q156 0 298 -61t245 -164t164 -245t61 -298zM896 928v-448q0 -14 -9 -23
+t-23 -9h-320q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="_446" unicode="&#xf1db;" 
+d="M768 1280q-130 0 -248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5t-51 248.5t-136.5 204t-204 136.5t-248.5 51zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103
+t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="_447" unicode="&#xf1dc;" horiz-adv-x="1792" 
+d="M1682 -128q-44 0 -132.5 3.5t-133.5 3.5q-44 0 -132 -3.5t-132 -3.5q-24 0 -37 20.5t-13 45.5q0 31 17 46t39 17t51 7t45 15q33 21 33 140l-1 391q0 21 -1 31q-13 4 -50 4h-675q-38 0 -51 -4q-1 -10 -1 -31l-1 -371q0 -142 37 -164q16 -10 48 -13t57 -3.5t45 -15
+t20 -45.5q0 -26 -12.5 -48t-36.5 -22q-47 0 -139.5 3.5t-138.5 3.5q-43 0 -128 -3.5t-127 -3.5q-23 0 -35.5 21t-12.5 45q0 30 15.5 45t36 17.5t47.5 7.5t42 15q33 23 33 143l-1 57v813q0 3 0.5 26t0 36.5t-1.5 38.5t-3.5 42t-6.5 36.5t-11 31.5t-16 18q-15 10 -45 12t-53 2
+t-41 14t-18 45q0 26 12 48t36 22q46 0 138.5 -3.5t138.5 -3.5q42 0 126.5 3.5t126.5 3.5q25 0 37.5 -22t12.5 -48q0 -30 -17 -43.5t-38.5 -14.5t-49.5 -4t-43 -13q-35 -21 -35 -160l1 -320q0 -21 1 -32q13 -3 39 -3h699q25 0 38 3q1 11 1 32l1 320q0 139 -35 160
+q-18 11 -58.5 12.5t-66 13t-25.5 49.5q0 26 12.5 48t37.5 22q44 0 132 -3.5t132 -3.5q43 0 129 3.5t129 3.5q25 0 37.5 -22t12.5 -48q0 -30 -17.5 -44t-40 -14.5t-51.5 -3t-44 -12.5q-35 -23 -35 -161l1 -943q0 -119 34 -140q16 -10 46 -13.5t53.5 -4.5t41.5 -15.5t18 -44.5
+q0 -26 -12 -48t-36 -22z" />
+    <glyph glyph-name="_448" unicode="&#xf1dd;" horiz-adv-x="1280" 
+d="M1278 1347v-73q0 -29 -18.5 -61t-42.5 -32q-50 0 -54 -1q-26 -6 -32 -31q-3 -11 -3 -64v-1152q0 -25 -18 -43t-43 -18h-108q-25 0 -43 18t-18 43v1218h-143v-1218q0 -25 -17.5 -43t-43.5 -18h-108q-26 0 -43.5 18t-17.5 43v496q-147 12 -245 59q-126 58 -192 179
+q-64 117 -64 259q0 166 88 286q88 118 209 159q111 37 417 37h479q25 0 43 -18t18 -43z" />
+    <glyph glyph-name="_449" unicode="&#xf1de;" 
+d="M352 128v-128h-352v128h352zM704 256q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h256zM864 640v-128h-864v128h864zM224 1152v-128h-224v128h224zM1536 128v-128h-736v128h736zM576 1280q26 0 45 -19t19 -45v-256
+q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h256zM1216 768q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h256zM1536 640v-128h-224v128h224zM1536 1152v-128h-864v128h864z" />
+    <glyph glyph-name="uniF1E0" unicode="&#xf1e0;" 
+d="M1216 512q133 0 226.5 -93.5t93.5 -226.5t-93.5 -226.5t-226.5 -93.5t-226.5 93.5t-93.5 226.5q0 12 2 34l-360 180q-92 -86 -218 -86q-133 0 -226.5 93.5t-93.5 226.5t93.5 226.5t226.5 93.5q126 0 218 -86l360 180q-2 22 -2 34q0 133 93.5 226.5t226.5 93.5
+t226.5 -93.5t93.5 -226.5t-93.5 -226.5t-226.5 -93.5q-126 0 -218 86l-360 -180q2 -22 2 -34t-2 -34l360 -180q92 86 218 86z" />
+    <glyph glyph-name="_451" unicode="&#xf1e1;" 
+d="M1280 341q0 88 -62.5 151t-150.5 63q-84 0 -145 -58l-241 120q2 16 2 23t-2 23l241 120q61 -58 145 -58q88 0 150.5 63t62.5 151t-62.5 150.5t-150.5 62.5t-151 -62.5t-63 -150.5q0 -7 2 -23l-241 -120q-62 57 -145 57q-88 0 -150.5 -62.5t-62.5 -150.5t62.5 -150.5
+t150.5 -62.5q83 0 145 57l241 -120q-2 -16 -2 -23q0 -88 63 -150.5t151 -62.5t150.5 62.5t62.5 150.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="_452" unicode="&#xf1e2;" horiz-adv-x="1792" 
+d="M571 947q-10 25 -34 35t-49 0q-108 -44 -191 -127t-127 -191q-10 -25 0 -49t35 -34q13 -5 24 -5q42 0 60 40q34 84 98.5 148.5t148.5 98.5q25 11 35 35t0 49zM1513 1303l46 -46l-244 -243l68 -68q19 -19 19 -45.5t-19 -45.5l-64 -64q89 -161 89 -343q0 -143 -55.5 -273.5
+t-150 -225t-225 -150t-273.5 -55.5t-273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5q182 0 343 -89l64 64q19 19 45.5 19t45.5 -19l68 -68zM1521 1359q-10 -10 -22 -10q-13 0 -23 10l-91 90q-9 10 -9 23t9 23q10 9 23 9t23 -9l90 -91
+q10 -9 10 -22.5t-10 -22.5zM1751 1129q-11 -9 -23 -9t-23 9l-90 91q-10 9 -10 22.5t10 22.5q9 10 22.5 10t22.5 -10l91 -90q9 -10 9 -23t-9 -23zM1792 1312q0 -14 -9 -23t-23 -9h-96q-14 0 -23 9t-9 23t9 23t23 9h96q14 0 23 -9t9 -23zM1600 1504v-96q0 -14 -9 -23t-23 -9
+t-23 9t-9 23v96q0 14 9 23t23 9t23 -9t9 -23zM1751 1449l-91 -90q-10 -10 -22 -10q-13 0 -23 10q-10 9 -10 22.5t10 22.5l90 91q10 9 23 9t23 -9q9 -10 9 -23t-9 -23z" />
+    <glyph glyph-name="_453" unicode="&#xf1e3;" horiz-adv-x="1792" 
+d="M609 720l287 208l287 -208l-109 -336h-355zM896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM1515 186q149 203 149 454v3l-102 -89l-240 224l63 323
+l134 -12q-150 206 -389 282l53 -124l-287 -159l-287 159l53 124q-239 -76 -389 -282l135 12l62 -323l-240 -224l-102 89v-3q0 -251 149 -454l30 132l326 -40l139 -298l-116 -69q117 -39 240 -39t240 39l-116 69l139 298l326 40z" />
+    <glyph glyph-name="_454" unicode="&#xf1e4;" horiz-adv-x="1792" 
+d="M448 224v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM256 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM832 224v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23
+v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM640 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM66 768q-28 0 -47 19t-19 46v129h514v-129q0 -27 -19 -46t-46 -19h-383zM1216 224v-192q0 -14 -9 -23t-23 -9h-192
+q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1024 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1600 224v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23
+zM1408 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 1016v-13h-514v10q0 104 -382 102q-382 -1 -382 -102v-10h-514v13q0 17 8.5 43t34 64t65.5 75.5t110.5 76t160 67.5t224 47.5t293.5 18.5t293 -18.5t224 -47.5
+t160.5 -67.5t110.5 -76t65.5 -75.5t34 -64t8.5 -43zM1792 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 962v-129q0 -27 -19 -46t-46 -19h-384q-27 0 -46 19t-19 46v129h514z" />
+    <glyph glyph-name="_455" unicode="&#xf1e5;" horiz-adv-x="1792" 
+d="M704 1216v-768q0 -26 -19 -45t-45 -19v-576q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v512l249 873q7 23 31 23h424zM1024 1216v-704h-256v704h256zM1792 320v-512q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v576q-26 0 -45 19t-19 45v768h424q24 0 31 -23z
+M736 1504v-224h-352v224q0 14 9 23t23 9h288q14 0 23 -9t9 -23zM1408 1504v-224h-352v224q0 14 9 23t23 9h288q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="_456" unicode="&#xf1e6;" horiz-adv-x="1792" 
+d="M1755 1083q37 -38 37 -90.5t-37 -90.5l-401 -400l150 -150l-160 -160q-163 -163 -389.5 -186.5t-411.5 100.5l-362 -362h-181v181l362 362q-124 185 -100.5 411.5t186.5 389.5l160 160l150 -150l400 401q38 37 91 37t90 -37t37 -90.5t-37 -90.5l-400 -401l234 -234
+l401 400q38 37 91 37t90 -37z" />
+    <glyph glyph-name="_457" unicode="&#xf1e7;" horiz-adv-x="1792" 
+d="M873 796q0 -83 -63.5 -142.5t-152.5 -59.5t-152.5 59.5t-63.5 142.5q0 84 63.5 143t152.5 59t152.5 -59t63.5 -143zM1375 796q0 -83 -63 -142.5t-153 -59.5q-89 0 -152.5 59.5t-63.5 142.5q0 84 63.5 143t152.5 59q90 0 153 -59t63 -143zM1600 616v667q0 87 -32 123.5
+t-111 36.5h-1112q-83 0 -112.5 -34t-29.5 -126v-673q43 -23 88.5 -40t81 -28t81 -18.5t71 -11t70 -4t58.5 -0.5t56.5 2t44.5 2q68 1 95 -27q6 -6 10 -9q26 -25 61 -51q7 91 118 87q5 0 36.5 -1.5t43 -2t45.5 -1t53 1t54.5 4.5t61 8.5t62 13.5t67 19.5t67.5 27t72 34.5z
+M1763 621q-121 -149 -372 -252q84 -285 -23 -465q-66 -113 -183 -148q-104 -32 -182 15q-86 51 -82 164l-1 326v1q-8 2 -24.5 6t-23.5 5l-1 -338q4 -114 -83 -164q-79 -47 -183 -15q-117 36 -182 150q-105 180 -22 463q-251 103 -372 252q-25 37 -4 63t60 -1q4 -2 11.5 -7
+t10.5 -8v694q0 72 47 123t114 51h1257q67 0 114 -51t47 -123v-694l21 15q39 27 60 1t-4 -63z" />
+    <glyph glyph-name="_458" unicode="&#xf1e8;" horiz-adv-x="1792" 
+d="M896 1102v-434h-145v434h145zM1294 1102v-434h-145v434h145zM1294 342l253 254v795h-1194v-1049h326v-217l217 217h398zM1692 1536v-1013l-434 -434h-326l-217 -217h-217v217h-398v1158l109 289h1483z" />
+    <glyph glyph-name="_459" unicode="&#xf1e9;" 
+d="M773 217v-127q-1 -292 -6 -305q-12 -32 -51 -40q-54 -9 -181.5 38t-162.5 89q-13 15 -17 36q-1 12 4 26q4 10 34 47t181 216q1 0 60 70q15 19 39.5 24.5t49.5 -3.5q24 -10 37.5 -29t12.5 -42zM624 468q-3 -55 -52 -70l-120 -39q-275 -88 -292 -88q-35 2 -54 36
+q-12 25 -17 75q-8 76 1 166.5t30 124.5t56 32q13 0 202 -77q71 -29 115 -47l84 -34q23 -9 35.5 -30.5t11.5 -48.5zM1450 171q-7 -54 -91.5 -161t-135.5 -127q-37 -14 -63 7q-14 10 -184 287l-47 77q-14 21 -11.5 46t19.5 46q35 43 83 26q1 -1 119 -40q203 -66 242 -79.5
+t47 -20.5q28 -22 22 -61zM778 803q5 -102 -54 -122q-58 -17 -114 71l-378 598q-8 35 19 62q41 43 207.5 89.5t224.5 31.5q40 -10 49 -45q3 -18 22 -305.5t24 -379.5zM1440 695q3 -39 -26 -59q-15 -10 -329 -86q-67 -15 -91 -23l1 2q-23 -6 -46 4t-37 32q-30 47 0 87
+q1 1 75 102q125 171 150 204t34 39q28 19 65 2q48 -23 123 -133.5t81 -167.5v-3z" />
+    <glyph glyph-name="_460" unicode="&#xf1ea;" horiz-adv-x="2048" 
+d="M1024 1024h-384v-384h384v384zM1152 384v-128h-640v128h640zM1152 1152v-640h-640v640h640zM1792 384v-128h-512v128h512zM1792 640v-128h-512v128h512zM1792 896v-128h-512v128h512zM1792 1152v-128h-512v128h512zM256 192v960h-128v-960q0 -26 19 -45t45 -19t45 19
+t19 45zM1920 192v1088h-1536v-1088q0 -33 -11 -64h1483q26 0 45 19t19 45zM2048 1408v-1216q0 -80 -56 -136t-136 -56h-1664q-80 0 -136 56t-56 136v1088h256v128h1792z" />
+    <glyph glyph-name="_461" unicode="&#xf1eb;" horiz-adv-x="2048" 
+d="M1024 13q-20 0 -93 73.5t-73 93.5q0 32 62.5 54t103.5 22t103.5 -22t62.5 -54q0 -20 -73 -93.5t-93 -73.5zM1294 284q-2 0 -40 25t-101.5 50t-128.5 25t-128.5 -25t-101 -50t-40.5 -25q-18 0 -93.5 75t-75.5 93q0 13 10 23q78 77 196 121t233 44t233 -44t196 -121
+q10 -10 10 -23q0 -18 -75.5 -93t-93.5 -75zM1567 556q-11 0 -23 8q-136 105 -252 154.5t-268 49.5q-85 0 -170.5 -22t-149 -53t-113.5 -62t-79 -53t-31 -22q-17 0 -92 75t-75 93q0 12 10 22q132 132 320 205t380 73t380 -73t320 -205q10 -10 10 -22q0 -18 -75 -93t-92 -75z
+M1838 827q-11 0 -22 9q-179 157 -371.5 236.5t-420.5 79.5t-420.5 -79.5t-371.5 -236.5q-11 -9 -22 -9q-17 0 -92.5 75t-75.5 93q0 13 10 23q187 186 445 288t527 102t527 -102t445 -288q10 -10 10 -23q0 -18 -75.5 -93t-92.5 -75z" />
+    <glyph glyph-name="_462" unicode="&#xf1ec;" horiz-adv-x="1792" 
+d="M384 0q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM768 0q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM384 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5
+t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1152 0q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM768 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5
+t37.5 90.5zM384 768q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1152 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM768 768q0 53 -37.5 90.5t-90.5 37.5
+t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1536 0v384q0 52 -38 90t-90 38t-90 -38t-38 -90v-384q0 -52 38 -90t90 -38t90 38t38 90zM1152 768q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5z
+M1536 1088v256q0 26 -19 45t-45 19h-1280q-26 0 -45 -19t-19 -45v-256q0 -26 19 -45t45 -19h1280q26 0 45 19t19 45zM1536 768q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 1408v-1536q0 -52 -38 -90t-90 -38
+h-1408q-52 0 -90 38t-38 90v1536q0 52 38 90t90 38h1408q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="_463" unicode="&#xf1ed;" 
+d="M1519 890q18 -84 -4 -204q-87 -444 -565 -444h-44q-25 0 -44 -16.5t-24 -42.5l-4 -19l-55 -346l-2 -15q-5 -26 -24.5 -42.5t-44.5 -16.5h-251q-21 0 -33 15t-9 36q9 56 26.5 168t26.5 168t27 167.5t27 167.5q5 37 43 37h131q133 -2 236 21q175 39 287 144q102 95 155 246
+q24 70 35 133q1 6 2.5 7.5t3.5 1t6 -3.5q79 -59 98 -162zM1347 1172q0 -107 -46 -236q-80 -233 -302 -315q-113 -40 -252 -42q0 -1 -90 -1l-90 1q-100 0 -118 -96q-2 -8 -85 -530q-1 -10 -12 -10h-295q-22 0 -36.5 16.5t-11.5 38.5l232 1471q5 29 27.5 48t51.5 19h598
+q34 0 97.5 -13t111.5 -32q107 -41 163.5 -123t56.5 -196z" />
+    <glyph glyph-name="_464" unicode="&#xf1ee;" horiz-adv-x="1792" 
+d="M441 864q33 0 52 -26q266 -364 362 -774h-446q-127 441 -367 749q-12 16 -3 33.5t29 17.5h373zM1000 507q-49 -199 -125 -393q-79 310 -256 594q40 221 44 449q211 -340 337 -650zM1099 1216q235 -324 384.5 -698.5t184.5 -773.5h-451q-41 665 -553 1472h435zM1792 640
+q0 -424 -101 -812q-67 560 -359 1083q-25 301 -106 584q-4 16 5.5 28.5t25.5 12.5h359q21 0 38.5 -13t22.5 -33q115 -409 115 -850z" />
+    <glyph glyph-name="uniF1F0" unicode="&#xf1f0;" horiz-adv-x="2304" 
+d="M1975 546h-138q14 37 66 179l3 9q4 10 10 26t9 26l12 -55zM531 611l-58 295q-11 54 -75 54h-268l-2 -13q311 -79 403 -336zM710 960l-162 -438l-17 89q-26 70 -85 129.5t-131 88.5l135 -510h175l261 641h-176zM849 318h166l104 642h-166zM1617 944q-69 27 -149 27
+q-123 0 -201 -59t-79 -153q-1 -102 145 -174q48 -23 67 -41t19 -39q0 -30 -30 -46t-69 -16q-86 0 -156 33l-22 11l-23 -144q74 -34 185 -34q130 -1 208.5 59t80.5 160q0 106 -140 174q-49 25 -71 42t-22 38q0 22 24.5 38.5t70.5 16.5q70 1 124 -24l15 -8zM2042 960h-128
+q-65 0 -87 -54l-246 -588h174l35 96h212q5 -22 20 -96h154zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="_466" unicode="&#xf1f1;" horiz-adv-x="2304" 
+d="M1119 1195q-128 85 -281 85q-103 0 -197.5 -40.5t-162.5 -108.5t-108.5 -162t-40.5 -197q0 -104 40.5 -198t108.5 -162t162 -108.5t198 -40.5q153 0 281 85q-131 107 -178 265.5t0.5 316.5t177.5 265zM1152 1171q-126 -99 -172 -249.5t-0.5 -300.5t172.5 -249
+q127 99 172.5 249t-0.5 300.5t-172 249.5zM1185 1195q130 -107 177.5 -265.5t0.5 -317t-178 -264.5q128 -85 281 -85q104 0 198 40.5t162 108.5t108.5 162t40.5 198q0 103 -40.5 197t-108.5 162t-162.5 108.5t-197.5 40.5q-153 0 -281 -85zM1926 473h7v3h-17v-3h7v-17h3v17z
+M1955 456h4v20h-5l-6 -13l-6 13h-5v-20h3v15l6 -13h4l5 13v-15zM1947 16v-2h-2h-3v3h3h2v-1zM1947 7h3l-4 5h2l1 1q1 1 1 3t-1 3l-1 1h-3h-6v-13h3v5h1zM685 75q0 19 11 31t30 12q18 0 29 -12.5t11 -30.5q0 -19 -11 -31t-29 -12q-19 0 -30 12t-11 31zM1158 119q30 0 35 -32
+h-70q5 32 35 32zM1514 75q0 19 11 31t29 12t29.5 -12.5t11.5 -30.5q0 -19 -11 -31t-30 -12q-18 0 -29 12t-11 31zM1786 75q0 18 11.5 30.5t29.5 12.5t29.5 -12.5t11.5 -30.5q0 -19 -11.5 -31t-29.5 -12t-29.5 12.5t-11.5 30.5zM1944 3q-2 0 -4 1q-1 0 -3 2t-2 3q-1 2 -1 4
+q0 3 1 4q0 2 2 4l1 1q2 0 2 1q2 1 4 1q3 0 4 -1l4 -2l2 -4v-1q1 -2 1 -3l-1 -1v-3t-1 -1l-1 -2q-2 -2 -4 -2q-1 -1 -4 -1zM599 7h30v85q0 24 -14.5 38.5t-39.5 15.5q-32 0 -47 -24q-14 24 -45 24q-24 0 -39 -20v16h-30v-135h30v75q0 36 33 36q30 0 30 -36v-75h29v75
+q0 36 33 36q30 0 30 -36v-75zM765 7h29v68v67h-29v-16q-17 20 -43 20q-29 0 -48 -20t-19 -51t19 -51t48 -20q28 0 43 20v-17zM943 48q0 34 -47 40l-14 2q-23 4 -23 14q0 15 25 15q23 0 43 -11l12 24q-22 14 -55 14q-26 0 -41 -12t-15 -32q0 -33 47 -39l13 -2q24 -4 24 -14
+q0 -17 -31 -17q-25 0 -45 14l-13 -23q25 -17 58 -17q29 0 45.5 12t16.5 32zM1073 14l-8 25q-13 -7 -26 -7q-19 0 -19 22v61h48v27h-48v41h-30v-41h-28v-27h28v-61q0 -50 47 -50q21 0 36 10zM1159 146q-29 0 -48 -20t-19 -51q0 -32 19.5 -51.5t49.5 -19.5q33 0 55 19l-14 22
+q-18 -15 -39 -15q-34 0 -41 33h101v12q0 32 -18 51.5t-46 19.5zM1318 146q-23 0 -35 -20v16h-30v-135h30v76q0 35 29 35q10 0 18 -4l9 28q-9 4 -21 4zM1348 75q0 -31 19.5 -51t52.5 -20q29 0 48 16l-14 24q-18 -13 -35 -12q-18 0 -29.5 12t-11.5 31t11.5 31t29.5 12
+q19 0 35 -12l14 24q-20 16 -48 16q-33 0 -52.5 -20t-19.5 -51zM1593 7h30v68v67h-30v-16q-15 20 -42 20q-29 0 -48.5 -20t-19.5 -51t19.5 -51t48.5 -20q28 0 42 20v-17zM1726 146q-23 0 -35 -20v16h-29v-135h29v76q0 35 29 35q10 0 18 -4l9 28q-8 4 -21 4zM1866 7h29v68v122
+h-29v-71q-15 20 -43 20t-47.5 -20.5t-19.5 -50.5t19.5 -50.5t47.5 -20.5q29 0 43 20v-17zM1944 27l-2 -1h-3q-2 -1 -4 -3q-3 -1 -3 -4q-1 -2 -1 -6q0 -3 1 -5q0 -2 3 -4q2 -2 4 -3t5 -1q4 0 6 1q0 1 2 2l2 1q1 1 3 4q1 2 1 5q0 4 -1 6q-1 1 -3 4q0 1 -2 2l-2 1q-1 0 -3 0.5
+t-3 0.5zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="_467" unicode="&#xf1f2;" horiz-adv-x="2304" 
+d="M313 759q0 -51 -36 -84q-29 -26 -89 -26h-17v220h17q61 0 89 -27q36 -31 36 -83zM2089 824q0 -52 -64 -52h-19v101h20q63 0 63 -49zM380 759q0 74 -50 120.5t-129 46.5h-95v-333h95q74 0 119 38q60 51 60 128zM410 593h65v333h-65v-333zM730 694q0 40 -20.5 62t-75.5 42
+q-29 10 -39.5 19t-10.5 23q0 16 13.5 26.5t34.5 10.5q29 0 53 -27l34 44q-41 37 -98 37q-44 0 -74 -27.5t-30 -67.5q0 -35 18 -55.5t64 -36.5q37 -13 45 -19q19 -12 19 -34q0 -20 -14 -33.5t-36 -13.5q-48 0 -71 44l-42 -40q44 -64 115 -64q51 0 83 30.5t32 79.5zM1008 604
+v77q-37 -37 -78 -37q-49 0 -80.5 32.5t-31.5 82.5q0 48 31.5 81.5t77.5 33.5q43 0 81 -38v77q-40 20 -80 20q-74 0 -125.5 -50.5t-51.5 -123.5t51 -123.5t125 -50.5q42 0 81 19zM2240 0v527q-65 -40 -144.5 -84t-237.5 -117t-329.5 -137.5t-417.5 -134.5t-504 -118h1569
+q26 0 45 19t19 45zM1389 757q0 75 -53 128t-128 53t-128 -53t-53 -128t53 -128t128 -53t128 53t53 128zM1541 584l144 342h-71l-90 -224l-89 224h-71l142 -342h35zM1714 593h184v56h-119v90h115v56h-115v74h119v57h-184v-333zM2105 593h80l-105 140q76 16 76 94q0 47 -31 73
+t-87 26h-97v-333h65v133h9zM2304 1274v-1268q0 -56 -38.5 -95t-93.5 -39h-2040q-55 0 -93.5 39t-38.5 95v1268q0 56 38.5 95t93.5 39h2040q55 0 93.5 -39t38.5 -95z" />
+    <glyph glyph-name="f1f3" unicode="&#xf1f3;" horiz-adv-x="2304" 
+d="M119 854h89l-45 108zM740 328l74 79l-70 79h-163v-49h142v-55h-142v-54h159zM898 406l99 -110v217zM1186 453q0 33 -40 33h-84v-69h83q41 0 41 36zM1475 457q0 29 -42 29h-82v-61h81q43 0 43 32zM1197 923q0 29 -42 29h-82v-60h81q43 0 43 31zM1656 854h89l-44 108z
+M699 1009v-271h-66v212l-94 -212h-57l-94 212v-212h-132l-25 60h-135l-25 -60h-70l116 271h96l110 -257v257h106l85 -184l77 184h108zM1255 453q0 -20 -5.5 -35t-14 -25t-22.5 -16.5t-26 -10t-31.5 -4.5t-31.5 -1t-32.5 0.5t-29.5 0.5v-91h-126l-80 90l-83 -90h-256v271h260
+l80 -89l82 89h207q109 0 109 -89zM964 794v-56h-217v271h217v-57h-152v-49h148v-55h-148v-54h152zM2304 235v-229q0 -55 -38.5 -94.5t-93.5 -39.5h-2040q-55 0 -93.5 39.5t-38.5 94.5v678h111l25 61h55l25 -61h218v46l19 -46h113l20 47v-47h541v99l10 1q10 0 10 -14v-86h279
+v23q23 -12 55 -18t52.5 -6.5t63 0.5t51.5 1l25 61h56l25 -61h227v58l34 -58h182v378h-180v-44l-25 44h-185v-44l-23 44h-249q-69 0 -109 -22v22h-172v-22q-24 22 -73 22h-628l-43 -97l-43 97h-198v-44l-22 44h-169l-78 -179v391q0 55 38.5 94.5t93.5 39.5h2040
+q55 0 93.5 -39.5t38.5 -94.5v-678h-120q-51 0 -81 -22v22h-177q-55 0 -78 -22v22h-316v-22q-31 22 -87 22h-209v-22q-23 22 -91 22h-234l-54 -58l-50 58h-349v-378h343l55 59l52 -59h211v89h21q59 0 90 13v-102h174v99h8q8 0 10 -2t2 -10v-87h529q57 0 88 24v-24h168
+q60 0 95 17zM1546 469q0 -23 -12 -43t-34 -29q25 -9 34 -26t9 -46v-54h-65v45q0 33 -12 43.5t-46 10.5h-69v-99h-65v271h154q48 0 77 -15t29 -58zM1269 936q0 -24 -12.5 -44t-33.5 -29q26 -9 34.5 -25.5t8.5 -46.5v-53h-65q0 9 0.5 26.5t0 25t-3 18.5t-8.5 16t-17.5 8.5
+t-29.5 3.5h-70v-98h-64v271l153 -1q49 0 78 -14.5t29 -57.5zM1798 327v-56h-216v271h216v-56h-151v-49h148v-55h-148v-54zM1372 1009v-271h-66v271h66zM2065 357q0 -86 -102 -86h-126v58h126q34 0 34 25q0 16 -17 21t-41.5 5t-49.5 3.5t-42 22.5t-17 55q0 39 26 60t66 21
+h130v-57h-119q-36 0 -36 -25q0 -16 17.5 -20.5t42 -4t49 -2.5t42 -21.5t17.5 -54.5zM2304 407v-101q-24 -35 -88 -35h-125v58h125q33 0 33 25q0 13 -12.5 19t-31 5.5t-40 2t-40 8t-31 24t-12.5 48.5q0 39 26.5 60t66.5 21h129v-57h-118q-36 0 -36 -25q0 -20 29 -22t68.5 -5
+t56.5 -26zM2139 1008v-270h-92l-122 203v-203h-132l-26 60h-134l-25 -60h-75q-129 0 -129 133q0 138 133 138h63v-59q-7 0 -28 1t-28.5 0.5t-23 -2t-21.5 -6.5t-14.5 -13.5t-11.5 -23t-3 -33.5q0 -38 13.5 -58t49.5 -20h29l92 213h97l109 -256v256h99l114 -188v188h66z" />
+    <glyph glyph-name="_469" unicode="&#xf1f4;" horiz-adv-x="2304" 
+d="M745 630q0 -37 -25.5 -61.5t-62.5 -24.5q-29 0 -46.5 16t-17.5 44q0 37 25 62.5t62 25.5q28 0 46.5 -16.5t18.5 -45.5zM1530 779q0 -42 -22 -57t-66 -15l-32 -1l17 107q2 11 13 11h18q22 0 35 -2t25 -12.5t12 -30.5zM1881 630q0 -36 -25.5 -61t-61.5 -25q-29 0 -47 16
+t-18 44q0 37 25 62.5t62 25.5q28 0 46.5 -16.5t18.5 -45.5zM513 801q0 59 -38.5 85.5t-100.5 26.5h-160q-19 0 -21 -19l-65 -408q-1 -6 3 -11t10 -5h76q20 0 22 19l18 110q1 8 7 13t15 6.5t17 1.5t19 -1t14 -1q86 0 135 48.5t49 134.5zM822 489l41 261q1 6 -3 11t-10 5h-76
+q-14 0 -17 -33q-27 40 -95 40q-72 0 -122.5 -54t-50.5 -127q0 -59 34.5 -94t92.5 -35q28 0 58 12t48 32q-4 -12 -4 -21q0 -16 13 -16h69q19 0 22 19zM1269 752q0 5 -4 9.5t-9 4.5h-77q-11 0 -18 -10l-106 -156l-44 150q-5 16 -22 16h-75q-5 0 -9 -4.5t-4 -9.5q0 -2 19.5 -59
+t42 -123t23.5 -70q-82 -112 -82 -120q0 -13 13 -13h77q11 0 18 10l255 368q2 2 2 7zM1649 801q0 59 -38.5 85.5t-100.5 26.5h-159q-20 0 -22 -19l-65 -408q-1 -6 3 -11t10 -5h82q12 0 16 13l18 116q1 8 7 13t15 6.5t17 1.5t19 -1t14 -1q86 0 135 48.5t49 134.5zM1958 489
+l41 261q1 6 -3 11t-10 5h-76q-14 0 -17 -33q-26 40 -95 40q-72 0 -122.5 -54t-50.5 -127q0 -59 34.5 -94t92.5 -35q29 0 59 12t47 32q0 -1 -2 -9t-2 -12q0 -16 13 -16h69q19 0 22 19zM2176 898v1q0 14 -13 14h-74q-11 0 -13 -11l-65 -416l-1 -2q0 -5 4 -9.5t10 -4.5h66
+q19 0 21 19zM392 764q-5 -35 -26 -46t-60 -11l-33 -1l17 107q2 11 13 11h19q40 0 58 -11.5t12 -48.5zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="_470" unicode="&#xf1f5;" horiz-adv-x="2304" 
+d="M1597 633q0 -69 -21 -106q-19 -35 -52 -35q-23 0 -41 9v224q29 30 57 30q57 0 57 -122zM2035 669h-110q6 98 56 98q51 0 54 -98zM476 534q0 59 -33 91.5t-101 57.5q-36 13 -52 24t-16 25q0 26 38 26q58 0 124 -33l18 112q-67 32 -149 32q-77 0 -123 -38q-48 -39 -48 -109
+q0 -58 32.5 -90.5t99.5 -56.5q39 -14 54.5 -25.5t15.5 -27.5q0 -31 -48 -31q-29 0 -70 12.5t-72 30.5l-18 -113q72 -41 168 -41q81 0 129 37q51 41 51 117zM771 749l19 111h-96v135l-129 -21l-18 -114l-46 -8l-17 -103h62v-219q0 -84 44 -120q38 -30 111 -30q32 0 79 11v118
+q-32 -7 -44 -7q-42 0 -42 50v197h77zM1087 724v139q-15 3 -28 3q-32 0 -55.5 -16t-33.5 -46l-10 56h-131v-471h150v306q26 31 82 31q16 0 26 -2zM1124 389h150v471h-150v-471zM1746 638q0 122 -45 179q-40 52 -111 52q-64 0 -117 -56l-8 47h-132v-645l150 25v151
+q36 -11 68 -11q83 0 134 56q61 65 61 202zM1278 986q0 33 -23 56t-56 23t-56 -23t-23 -56t23 -56.5t56 -23.5t56 23.5t23 56.5zM2176 629q0 113 -48 176q-50 64 -144 64q-96 0 -151.5 -66t-55.5 -180q0 -128 63 -188q55 -55 161 -55q101 0 160 40l-16 103q-57 -31 -128 -31
+q-43 0 -63 19q-23 19 -28 66h248q2 14 2 52zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="_471" unicode="&#xf1f6;" horiz-adv-x="2048" 
+d="M1558 684q61 -356 298 -556q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-180.5 74.5t-75.5 180.5zM1024 -176q16 0 16 16t-16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5zM2026 1424q8 -10 7.5 -23.5t-10.5 -22.5
+l-1872 -1622q-10 -8 -23.5 -7t-21.5 11l-84 96q-8 10 -7.5 23.5t10.5 21.5l186 161q-19 32 -19 66q50 42 91 88t85 119.5t74.5 158.5t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q124 -18 219 -82.5t148 -157.5
+l418 363q10 8 23.5 7t21.5 -11z" />
+    <glyph glyph-name="_472" unicode="&#xf1f7;" horiz-adv-x="2048" 
+d="M1040 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM503 315l877 760q-42 88 -132.5 146.5t-223.5 58.5q-93 0 -169.5 -31.5t-121.5 -80.5t-69 -103t-24 -105q0 -384 -137 -645zM1856 128
+q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-180.5 74.5t-75.5 180.5l149 129h757q-166 187 -227 459l111 97q61 -356 298 -556zM1942 1520l84 -96q8 -10 7.5 -23.5t-10.5 -22.5l-1872 -1622q-10 -8 -23.5 -7t-21.5 11l-84 96q-8 10 -7.5 23.5t10.5 21.5l186 161
+q-19 32 -19 66q50 42 91 88t85 119.5t74.5 158.5t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q124 -18 219 -82.5t148 -157.5l418 363q10 8 23.5 7t21.5 -11z" />
+    <glyph glyph-name="_473" unicode="&#xf1f8;" horiz-adv-x="1408" 
+d="M512 160v704q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-704q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM768 160v704q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-704q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1024 160v704q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-704
+q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM480 1152h448l-48 117q-7 9 -17 11h-317q-10 -2 -17 -11zM1408 1120v-64q0 -14 -9 -23t-23 -9h-96v-948q0 -83 -47 -143.5t-113 -60.5h-832q-66 0 -113 58.5t-47 141.5v952h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h309l70 167
+q15 37 54 63t79 26h320q40 0 79 -26t54 -63l70 -167h309q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="_474" unicode="&#xf1f9;" 
+d="M1150 462v-109q0 -50 -36.5 -89t-94 -60.5t-118 -32.5t-117.5 -11q-205 0 -342.5 139t-137.5 346q0 203 136 339t339 136q34 0 75.5 -4.5t93 -18t92.5 -34t69 -56.5t28 -81v-109q0 -16 -16 -16h-118q-16 0 -16 16v70q0 43 -65.5 67.5t-137.5 24.5q-140 0 -228.5 -91.5
+t-88.5 -237.5q0 -151 91.5 -249.5t233.5 -98.5q68 0 138 24t70 66v70q0 7 4.5 11.5t10.5 4.5h119q6 0 11 -4.5t5 -11.5zM768 1280q-130 0 -248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5
+t-51 248.5t-136.5 204t-204 136.5t-248.5 51zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="_475" unicode="&#xf1fa;" 
+d="M972 761q0 108 -53.5 169t-147.5 61q-63 0 -124 -30.5t-110 -84.5t-79.5 -137t-30.5 -180q0 -112 53.5 -173t150.5 -61q96 0 176 66.5t122.5 166t42.5 203.5zM1536 640q0 -111 -37 -197t-98.5 -135t-131.5 -74.5t-145 -27.5q-6 0 -15.5 -0.5t-16.5 -0.5q-95 0 -142 53
+q-28 33 -33 83q-52 -66 -131.5 -110t-173.5 -44q-161 0 -249.5 95.5t-88.5 269.5q0 157 66 290t179 210.5t246 77.5q87 0 155 -35.5t106 -99.5l2 19l11 56q1 6 5.5 12t9.5 6h118q5 0 13 -11q5 -5 3 -16l-120 -614q-5 -24 -5 -48q0 -39 12.5 -52t44.5 -13q28 1 57 5.5t73 24
+t77 50t57 89.5t24 137q0 292 -174 466t-466 174q-130 0 -248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51q228 0 405 144q11 9 24 8t21 -12l41 -49q8 -12 7 -24q-2 -13 -12 -22q-102 -83 -227.5 -128t-258.5 -45q-156 0 -298 61
+t-245 164t-164 245t-61 298t61 298t164 245t245 164t298 61q344 0 556 -212t212 -556z" />
+    <glyph glyph-name="_476" unicode="&#xf1fb;" horiz-adv-x="1792" 
+d="M1698 1442q94 -94 94 -226.5t-94 -225.5l-225 -223l104 -104q10 -10 10 -23t-10 -23l-210 -210q-10 -10 -23 -10t-23 10l-105 105l-603 -603q-37 -37 -90 -37h-203l-256 -128l-64 64l128 256v203q0 53 37 90l603 603l-105 105q-10 10 -10 23t10 23l210 210q10 10 23 10
+t23 -10l104 -104l223 225q93 94 225.5 94t226.5 -94zM512 64l576 576l-192 192l-576 -576v-192h192z" />
+    <glyph glyph-name="f1fc" unicode="&#xf1fc;" horiz-adv-x="1792" 
+d="M1615 1536q70 0 122.5 -46.5t52.5 -116.5q0 -63 -45 -151q-332 -629 -465 -752q-97 -91 -218 -91q-126 0 -216.5 92.5t-90.5 219.5q0 128 92 212l638 579q59 54 130 54zM706 502q39 -76 106.5 -130t150.5 -76l1 -71q4 -213 -129.5 -347t-348.5 -134q-123 0 -218 46.5
+t-152.5 127.5t-86.5 183t-29 220q7 -5 41 -30t62 -44.5t59 -36.5t46 -17q41 0 55 37q25 66 57.5 112.5t69.5 76t88 47.5t103 25.5t125 10.5z" />
+    <glyph glyph-name="_478" unicode="&#xf1fd;" horiz-adv-x="1792" 
+d="M1792 128v-384h-1792v384q45 0 85 14t59 27.5t47 37.5q30 27 51.5 38t56.5 11q24 0 44 -7t31 -15t33 -27q29 -25 47 -38t58 -27t86 -14q45 0 85 14.5t58 27t48 37.5q21 19 32.5 27t31 15t43.5 7q35 0 56.5 -11t51.5 -38q28 -24 47 -37.5t59 -27.5t85 -14t85 14t59 27.5
+t47 37.5q30 27 51.5 38t56.5 11q34 0 55.5 -11t51.5 -38q28 -24 47 -37.5t59 -27.5t85 -14zM1792 448v-192q-24 0 -44 7t-31 15t-33 27q-29 25 -47 38t-58 27t-85 14q-46 0 -86 -14t-58 -27t-47 -38q-22 -19 -33 -27t-31 -15t-44 -7q-35 0 -56.5 11t-51.5 38q-29 25 -47 38
+t-58 27t-86 14q-45 0 -85 -14.5t-58 -27t-48 -37.5q-21 -19 -32.5 -27t-31 -15t-43.5 -7q-35 0 -56.5 11t-51.5 38q-28 24 -47 37.5t-59 27.5t-85 14q-46 0 -86 -14t-58 -27t-47 -38q-30 -27 -51.5 -38t-56.5 -11v192q0 80 56 136t136 56h64v448h256v-448h256v448h256v-448
+h256v448h256v-448h64q80 0 136 -56t56 -136zM512 1312q0 -77 -36 -118.5t-92 -41.5q-53 0 -90.5 37.5t-37.5 90.5q0 29 9.5 51t23.5 34t31 28t31 31.5t23.5 44.5t9.5 67q38 0 83 -74t45 -150zM1024 1312q0 -77 -36 -118.5t-92 -41.5q-53 0 -90.5 37.5t-37.5 90.5
+q0 29 9.5 51t23.5 34t31 28t31 31.5t23.5 44.5t9.5 67q38 0 83 -74t45 -150zM1536 1312q0 -77 -36 -118.5t-92 -41.5q-53 0 -90.5 37.5t-37.5 90.5q0 29 9.5 51t23.5 34t31 28t31 31.5t23.5 44.5t9.5 67q38 0 83 -74t45 -150z" />
+    <glyph glyph-name="_479" unicode="&#xf1fe;" horiz-adv-x="2048" 
+d="M2048 0v-128h-2048v1536h128v-1408h1920zM1664 1024l256 -896h-1664v576l448 576l576 -576z" />
+    <glyph glyph-name="_480" unicode="&#xf200;" horiz-adv-x="1792" 
+d="M768 646l546 -546q-106 -108 -247.5 -168t-298.5 -60q-209 0 -385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103v-762zM955 640h773q0 -157 -60 -298.5t-168 -247.5zM1664 768h-768v768q209 0 385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="_481" unicode="&#xf201;" horiz-adv-x="2048" 
+d="M2048 0v-128h-2048v1536h128v-1408h1920zM1920 1248v-435q0 -21 -19.5 -29.5t-35.5 7.5l-121 121l-633 -633q-10 -10 -23 -10t-23 10l-233 233l-416 -416l-192 192l585 585q10 10 23 10t23 -10l233 -233l464 464l-121 121q-16 16 -7.5 35.5t29.5 19.5h435q14 0 23 -9
+t9 -23z" />
+    <glyph glyph-name="_482" unicode="&#xf202;" horiz-adv-x="1792" 
+d="M1292 832q0 -6 10 -41q10 -29 25 -49.5t41 -34t44 -20t55 -16.5q325 -91 325 -332q0 -146 -105.5 -242.5t-254.5 -96.5q-59 0 -111.5 18.5t-91.5 45.5t-77 74.5t-63 87.5t-53.5 103.5t-43.5 103t-39.5 106.5t-35.5 95q-32 81 -61.5 133.5t-73.5 96.5t-104 64t-142 20
+q-96 0 -183 -55.5t-138 -144.5t-51 -185q0 -160 106.5 -279.5t263.5 -119.5q177 0 258 95q56 63 83 116l84 -152q-15 -34 -44 -70l1 -1q-131 -152 -388 -152q-147 0 -269.5 79t-190.5 207.5t-68 274.5q0 105 43.5 206t116 176.5t172 121.5t204.5 46q87 0 159 -19t123.5 -50
+t95 -80t72.5 -99t58.5 -117t50.5 -124.5t50 -130.5t55 -127q96 -200 233 -200q81 0 138.5 48.5t57.5 128.5q0 42 -19 72t-50.5 46t-72.5 31.5t-84.5 27t-87.5 34t-81 52t-65 82t-39 122.5q-3 16 -3 33q0 110 87.5 192t198.5 78q78 -3 120.5 -14.5t90.5 -53.5h-1
+q12 -11 23 -24.5t26 -36t19 -27.5l-129 -99q-26 49 -54 70v1q-23 21 -97 21q-49 0 -84 -33t-35 -83z" />
+    <glyph glyph-name="_483" unicode="&#xf203;" 
+d="M1432 484q0 173 -234 239q-35 10 -53 16.5t-38 25t-29 46.5q0 2 -2 8.5t-3 12t-1 7.5q0 36 24.5 59.5t60.5 23.5q54 0 71 -15h-1q20 -15 39 -51l93 71q-39 54 -49 64q-33 29 -67.5 39t-85.5 10q-80 0 -142 -57.5t-62 -137.5q0 -7 2 -23q16 -96 64.5 -140t148.5 -73
+q29 -8 49 -15.5t45 -21.5t38.5 -34.5t13.5 -46.5v-5q1 -58 -40.5 -93t-100.5 -35q-97 0 -167 144q-23 47 -51.5 121.5t-48 125.5t-54 110.5t-74 95.5t-103.5 60.5t-147 24.5q-101 0 -192 -56t-144 -148t-50 -192v-1q4 -108 50.5 -199t133.5 -147.5t196 -56.5q186 0 279 110
+q20 27 31 51l-60 109q-42 -80 -99 -116t-146 -36q-115 0 -191 87t-76 204q0 105 82 189t186 84q112 0 170 -53.5t104 -172.5q8 -21 25.5 -68.5t28.5 -76.5t31.5 -74.5t38.5 -74t45.5 -62.5t55.5 -53.5t66 -33t80 -13.5q107 0 183 69.5t76 174.5zM1536 1120v-960
+q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="_484" unicode="&#xf204;" horiz-adv-x="2048" 
+d="M1152 640q0 104 -40.5 198.5t-109.5 163.5t-163.5 109.5t-198.5 40.5t-198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5t198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5zM1920 640q0 104 -40.5 198.5
+t-109.5 163.5t-163.5 109.5t-198.5 40.5h-386q119 -90 188.5 -224t69.5 -288t-69.5 -288t-188.5 -224h386q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5zM2048 640q0 -130 -51 -248.5t-136.5 -204t-204 -136.5t-248.5 -51h-768q-130 0 -248.5 51t-204 136.5
+t-136.5 204t-51 248.5t51 248.5t136.5 204t204 136.5t248.5 51h768q130 0 248.5 -51t204 -136.5t136.5 -204t51 -248.5z" />
+    <glyph glyph-name="_485" unicode="&#xf205;" horiz-adv-x="2048" 
+d="M0 640q0 130 51 248.5t136.5 204t204 136.5t248.5 51h768q130 0 248.5 -51t204 -136.5t136.5 -204t51 -248.5t-51 -248.5t-136.5 -204t-204 -136.5t-248.5 -51h-768q-130 0 -248.5 51t-204 136.5t-136.5 204t-51 248.5zM1408 128q104 0 198.5 40.5t163.5 109.5
+t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5t-163.5 109.5t-198.5 40.5t-198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5z" />
+    <glyph glyph-name="_486" unicode="&#xf206;" horiz-adv-x="2304" 
+d="M762 384h-314q-40 0 -57.5 35t6.5 67l188 251q-65 31 -137 31q-132 0 -226 -94t-94 -226t94 -226t226 -94q115 0 203 72.5t111 183.5zM576 512h186q-18 85 -75 148zM1056 512l288 384h-480l-99 -132q105 -103 126 -252h165zM2176 448q0 132 -94 226t-226 94
+q-60 0 -121 -24l174 -260q15 -23 10 -49t-27 -40q-15 -11 -36 -11q-35 0 -53 29l-174 260q-93 -95 -93 -225q0 -132 94 -226t226 -94t226 94t94 226zM2304 448q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 97 39.5 183.5t109.5 149.5l-65 98l-353 -469
+q-18 -26 -51 -26h-197q-23 -164 -149 -274t-294 -110q-185 0 -316.5 131.5t-131.5 316.5t131.5 316.5t316.5 131.5q114 0 215 -55l137 183h-224q-26 0 -45 19t-19 45t19 45t45 19h384v-128h435l-85 128h-222q-26 0 -45 19t-19 45t19 45t45 19h256q33 0 53 -28l267 -400
+q91 44 192 44q185 0 316.5 -131.5t131.5 -316.5z" />
+    <glyph glyph-name="_487" unicode="&#xf207;" 
+d="M384 320q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1408 320q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1362 716l-72 384q-5 23 -22.5 37.5t-40.5 14.5
+h-918q-23 0 -40.5 -14.5t-22.5 -37.5l-72 -384q-5 -30 14 -53t49 -23h1062q30 0 49 23t14 53zM1136 1328q0 20 -14 34t-34 14h-640q-20 0 -34 -14t-14 -34t14 -34t34 -14h640q20 0 34 14t14 34zM1536 603v-603h-128v-128q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5
+t-37.5 90.5v128h-768v-128q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5v128h-128v603q0 112 25 223l103 454q9 78 97.5 137t230 89t312.5 30t312.5 -30t230 -89t97.5 -137l105 -454q23 -102 23 -223z" />
+    <glyph glyph-name="_488" unicode="&#xf208;" horiz-adv-x="2048" 
+d="M1463 704q0 -35 -25 -60.5t-61 -25.5h-702q-36 0 -61 25.5t-25 60.5t25 60.5t61 25.5h702q36 0 61 -25.5t25 -60.5zM1677 704q0 86 -23 170h-982q-36 0 -61 25t-25 60q0 36 25 61t61 25h908q-88 143 -235 227t-320 84q-177 0 -327.5 -87.5t-238 -237.5t-87.5 -327
+q0 -86 23 -170h982q36 0 61 -25t25 -60q0 -36 -25 -61t-61 -25h-908q88 -143 235.5 -227t320.5 -84q132 0 253 51.5t208 139t139 208t52 253.5zM2048 959q0 -35 -25 -60t-61 -25h-131q17 -85 17 -170q0 -167 -65.5 -319.5t-175.5 -263t-262.5 -176t-319.5 -65.5
+q-246 0 -448.5 133t-301.5 350h-189q-36 0 -61 25t-25 61q0 35 25 60t61 25h132q-17 85 -17 170q0 167 65.5 319.5t175.5 263t262.5 176t320.5 65.5q245 0 447.5 -133t301.5 -350h188q36 0 61 -25t25 -61z" />
+    <glyph glyph-name="_489" unicode="&#xf209;" horiz-adv-x="1280" 
+d="M953 1158l-114 -328l117 -21q165 451 165 518q0 56 -38 56q-57 0 -130 -225zM654 471l33 -88q37 42 71 67l-33 5.5t-38.5 7t-32.5 8.5zM362 1367q0 -98 159 -521q17 10 49 10q15 0 75 -5l-121 351q-75 220 -123 220q-19 0 -29 -17.5t-10 -37.5zM283 608q0 -36 51.5 -119
+t117.5 -153t100 -70q14 0 25.5 13t11.5 27q0 24 -32 102q-13 32 -32 72t-47.5 89t-61.5 81t-62 32q-20 0 -45.5 -27t-25.5 -47zM125 273q0 -41 25 -104q59 -145 183.5 -227t281.5 -82q227 0 382 170q152 169 152 427q0 43 -1 67t-11.5 62t-30.5 56q-56 49 -211.5 75.5
+t-270.5 26.5q-37 0 -49 -11q-12 -5 -12 -35q0 -34 21.5 -60t55.5 -40t77.5 -23.5t87.5 -11.5t85 -4t70 0h23q24 0 40 -19q15 -19 19 -55q-28 -28 -96 -54q-61 -22 -93 -46q-64 -46 -108.5 -114t-44.5 -137q0 -31 18.5 -88.5t18.5 -87.5l-3 -12q-4 -12 -4 -14
+q-137 10 -146 216q-8 -2 -41 -2q2 -7 2 -21q0 -53 -40.5 -89.5t-94.5 -36.5q-82 0 -166.5 78t-84.5 159q0 34 33 67q52 -64 60 -76q77 -104 133 -104q12 0 26.5 8.5t14.5 20.5q0 34 -87.5 145t-116.5 111q-43 0 -70 -44.5t-27 -90.5zM11 264q0 101 42.5 163t136.5 88
+q-28 74 -28 104q0 62 61 123t122 61q29 0 70 -15q-163 462 -163 567q0 80 41 130.5t119 50.5q131 0 325 -581q6 -17 8 -23q6 16 29 79.5t43.5 118.5t54 127.5t64.5 123t70.5 86.5t76.5 36q71 0 112 -49t41 -122q0 -108 -159 -550q61 -15 100.5 -46t58.5 -78t26 -93.5
+t7 -110.5q0 -150 -47 -280t-132 -225t-211 -150t-278 -55q-111 0 -223 42q-149 57 -258 191.5t-109 286.5z" />
+    <glyph glyph-name="_490" unicode="&#xf20a;" horiz-adv-x="2048" 
+d="M785 528h207q-14 -158 -98.5 -248.5t-214.5 -90.5q-162 0 -254.5 116t-92.5 316q0 194 93 311.5t233 117.5q148 0 232 -87t97 -247h-203q-5 64 -35.5 99t-81.5 35q-57 0 -88.5 -60.5t-31.5 -177.5q0 -48 5 -84t18 -69.5t40 -51.5t66 -18q95 0 109 139zM1497 528h206
+q-14 -158 -98 -248.5t-214 -90.5q-162 0 -254.5 116t-92.5 316q0 194 93 311.5t233 117.5q148 0 232 -87t97 -247h-204q-4 64 -35 99t-81 35q-57 0 -88.5 -60.5t-31.5 -177.5q0 -48 5 -84t18 -69.5t39.5 -51.5t65.5 -18q49 0 76.5 38t33.5 101zM1856 647q0 207 -15.5 307
+t-60.5 161q-6 8 -13.5 14t-21.5 15t-16 11q-86 63 -697 63q-625 0 -710 -63q-5 -4 -17.5 -11.5t-21 -14t-14.5 -14.5q-45 -60 -60 -159.5t-15 -308.5q0 -208 15 -307.5t60 -160.5q6 -8 15 -15t20.5 -14t17.5 -12q44 -33 239.5 -49t470.5 -16q610 0 697 65q5 4 17 11t20.5 14
+t13.5 16q46 60 61 159t15 309zM2048 1408v-1536h-2048v1536h2048z" />
+    <glyph glyph-name="_491" unicode="&#xf20b;" 
+d="M992 912v-496q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v496q0 112 -80 192t-192 80h-272v-1152q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v1344q0 14 9 23t23 9h464q135 0 249 -66.5t180.5 -180.5t66.5 -249zM1376 1376v-880q0 -135 -66.5 -249t-180.5 -180.5
+t-249 -66.5h-464q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h160q14 0 23 -9t9 -23v-768h272q112 0 192 80t80 192v880q0 14 9 23t23 9h160q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="_492" unicode="&#xf20c;" 
+d="M1311 694v-114q0 -24 -13.5 -38t-37.5 -14h-202q-24 0 -38 14t-14 38v114q0 24 14 38t38 14h202q24 0 37.5 -14t13.5 -38zM821 464v250q0 53 -32.5 85.5t-85.5 32.5h-133q-68 0 -96 -52q-28 52 -96 52h-130q-53 0 -85.5 -32.5t-32.5 -85.5v-250q0 -22 21 -22h55
+q22 0 22 22v230q0 24 13.5 38t38.5 14h94q24 0 38 -14t14 -38v-230q0 -22 21 -22h54q22 0 22 22v230q0 24 14 38t38 14h97q24 0 37.5 -14t13.5 -38v-230q0 -22 22 -22h55q21 0 21 22zM1410 560v154q0 53 -33 85.5t-86 32.5h-264q-53 0 -86 -32.5t-33 -85.5v-410
+q0 -21 22 -21h55q21 0 21 21v180q31 -42 94 -42h191q53 0 86 32.5t33 85.5zM1536 1176v-1072q0 -96 -68 -164t-164 -68h-1072q-96 0 -164 68t-68 164v1072q0 96 68 164t164 68h1072q96 0 164 -68t68 -164z" />
+    <glyph glyph-name="_493" unicode="&#xf20d;" 
+d="M915 450h-294l147 551zM1001 128h311l-324 1024h-440l-324 -1024h311l383 314zM1536 1120v-960q0 -118 -85 -203t-203 -85h-960q-118 0 -203 85t-85 203v960q0 118 85 203t203 85h960q118 0 203 -85t85 -203z" />
+    <glyph glyph-name="_494" unicode="&#xf20e;" horiz-adv-x="2048" 
+d="M2048 641q0 -21 -13 -36.5t-33 -19.5l-205 -356q3 -9 3 -18q0 -20 -12.5 -35.5t-32.5 -19.5l-193 -337q3 -8 3 -16q0 -23 -16.5 -40t-40.5 -17q-25 0 -41 18h-400q-17 -20 -43 -20t-43 20h-399q-17 -20 -43 -20q-23 0 -40 16.5t-17 40.5q0 8 4 20l-193 335
+q-20 4 -32.5 19.5t-12.5 35.5q0 9 3 18l-206 356q-20 5 -32.5 20.5t-12.5 35.5q0 21 13.5 36.5t33.5 19.5l199 344q0 1 -0.5 3t-0.5 3q0 36 34 51l209 363q-4 10 -4 18q0 24 17 40.5t40 16.5q26 0 44 -21h396q16 21 43 21t43 -21h398q18 21 44 21q23 0 40 -16.5t17 -40.5
+q0 -6 -4 -18l207 -358q23 -1 39 -17.5t16 -38.5q0 -13 -7 -27l187 -324q19 -4 31.5 -19.5t12.5 -35.5zM1063 -158h389l-342 354h-143l-342 -354h360q18 16 39 16t39 -16zM112 654q1 -4 1 -13q0 -10 -2 -15l208 -360l15 -6l188 199v347l-187 194q-13 -8 -29 -10zM986 1438
+h-388l190 -200l554 200h-280q-16 -16 -38 -16t-38 16zM1689 226q1 6 5 11l-64 68l-17 -79h76zM1583 226l22 105l-252 266l-296 -307l63 -64h463zM1495 -142l16 28l65 310h-427l333 -343q8 4 13 5zM578 -158h5l342 354h-373v-335l4 -6q14 -5 22 -13zM552 226h402l64 66
+l-309 321l-157 -166v-221zM359 226h163v189l-168 -177q4 -8 5 -12zM358 1051q0 -1 0.5 -2t0.5 -2q0 -16 -8 -29l171 -177v269zM552 1121v-311l153 -157l297 314l-223 236zM556 1425l-4 -8v-264l205 74l-191 201q-6 -2 -10 -3zM1447 1438h-16l-621 -224l213 -225zM1023 946
+l-297 -315l311 -319l296 307zM688 634l-136 141v-284zM1038 270l-42 -44h85zM1374 618l238 -251l132 624l-3 5l-1 1zM1718 1018q-8 13 -8 29v2l-216 376q-5 1 -13 5l-437 -463l310 -327zM522 1142v223l-163 -282zM522 196h-163l163 -283v283zM1607 196l-48 -227l130 227h-82
+zM1729 266l207 361q-2 10 -2 14q0 1 3 16l-171 296l-129 -612l77 -82q5 3 15 7z" />
+    <glyph glyph-name="f210" unicode="&#xf210;" 
+d="M0 856q0 131 91.5 226.5t222.5 95.5h742l352 358v-1470q0 -132 -91.5 -227t-222.5 -95h-780q-131 0 -222.5 95t-91.5 227v790zM1232 102l-176 180v425q0 46 -32 79t-78 33h-484q-46 0 -78 -33t-32 -79v-492q0 -46 32.5 -79.5t77.5 -33.5h770z" />
+    <glyph glyph-name="_496" unicode="&#xf211;" 
+d="M934 1386q-317 -121 -556 -362.5t-358 -560.5q-20 89 -20 176q0 208 102.5 384.5t278.5 279t384 102.5q82 0 169 -19zM1203 1267q93 -65 164 -155q-389 -113 -674.5 -400.5t-396.5 -676.5q-93 72 -155 162q112 386 395 671t667 399zM470 -67q115 356 379.5 622t619.5 384
+q40 -92 54 -195q-292 -120 -516 -345t-343 -518q-103 14 -194 52zM1536 -125q-193 50 -367 115q-135 -84 -290 -107q109 205 274 370.5t369 275.5q-21 -152 -101 -284q65 -175 115 -370z" />
+    <glyph glyph-name="f212" unicode="&#xf212;" horiz-adv-x="2048" 
+d="M1893 1144l155 -1272q-131 0 -257 57q-200 91 -393 91q-226 0 -374 -148q-148 148 -374 148q-193 0 -393 -91q-128 -57 -252 -57h-5l155 1272q224 127 482 127q233 0 387 -106q154 106 387 106q258 0 482 -127zM1398 157q129 0 232 -28.5t260 -93.5l-124 1021
+q-171 78 -368 78q-224 0 -374 -141q-150 141 -374 141q-197 0 -368 -78l-124 -1021q105 43 165.5 65t148.5 39.5t178 17.5q202 0 374 -108q172 108 374 108zM1438 191l-55 907q-211 -4 -359 -155q-152 155 -374 155q-176 0 -336 -66l-114 -941q124 51 228.5 76t221.5 25
+q209 0 374 -102q172 107 374 102z" />
+    <glyph glyph-name="_498" unicode="&#xf213;" horiz-adv-x="2048" 
+d="M1500 165v733q0 21 -15 36t-35 15h-93q-20 0 -35 -15t-15 -36v-733q0 -20 15 -35t35 -15h93q20 0 35 15t15 35zM1216 165v531q0 20 -15 35t-35 15h-101q-20 0 -35 -15t-15 -35v-531q0 -20 15 -35t35 -15h101q20 0 35 15t15 35zM924 165v429q0 20 -15 35t-35 15h-101
+q-20 0 -35 -15t-15 -35v-429q0 -20 15 -35t35 -15h101q20 0 35 15t15 35zM632 165v362q0 20 -15 35t-35 15h-101q-20 0 -35 -15t-15 -35v-362q0 -20 15 -35t35 -15h101q20 0 35 15t15 35zM2048 311q0 -166 -118 -284t-284 -118h-1244q-166 0 -284 118t-118 284
+q0 116 63 214.5t168 148.5q-10 34 -10 73q0 113 80.5 193.5t193.5 80.5q102 0 180 -67q45 183 194 300t338 117q149 0 275 -73.5t199.5 -199.5t73.5 -275q0 -66 -14 -122q135 -33 221 -142.5t86 -247.5z" />
+    <glyph glyph-name="_499" unicode="&#xf214;" 
+d="M0 1536h1536v-1392l-776 -338l-760 338v1392zM1436 209v926h-1336v-926l661 -294zM1436 1235v201h-1336v-201h1336zM181 937v-115h-37v115h37zM181 789v-115h-37v115h37zM181 641v-115h-37v115h37zM181 493v-115h-37v115h37zM181 345v-115h-37v115h37zM207 202l15 34
+l105 -47l-15 -33zM343 142l15 34l105 -46l-15 -34zM478 82l15 34l105 -46l-15 -34zM614 23l15 33l104 -46l-15 -34zM797 10l105 46l15 -33l-105 -47zM932 70l105 46l15 -34l-105 -46zM1068 130l105 46l15 -34l-105 -46zM1203 189l105 47l15 -34l-105 -46zM259 1389v-36h-114
+v36h114zM421 1389v-36h-115v36h115zM583 1389v-36h-115v36h115zM744 1389v-36h-114v36h114zM906 1389v-36h-114v36h114zM1068 1389v-36h-115v36h115zM1230 1389v-36h-115v36h115zM1391 1389v-36h-114v36h114zM181 1049v-79h-37v115h115v-36h-78zM421 1085v-36h-115v36h115z
+M583 1085v-36h-115v36h115zM744 1085v-36h-114v36h114zM906 1085v-36h-114v36h114zM1068 1085v-36h-115v36h115zM1230 1085v-36h-115v36h115zM1355 970v79h-78v36h115v-115h-37zM1355 822v115h37v-115h-37zM1355 674v115h37v-115h-37zM1355 526v115h37v-115h-37zM1355 378
+v115h37v-115h-37zM1355 230v115h37v-115h-37zM760 265q-129 0 -221 91.5t-92 221.5q0 129 92 221t221 92q130 0 221.5 -92t91.5 -221q0 -130 -91.5 -221.5t-221.5 -91.5zM595 646q0 -36 19.5 -56.5t49.5 -25t64 -7t64 -2t49.5 -9t19.5 -30.5q0 -49 -112 -49q-97 0 -123 51
+h-3l-31 -63q67 -42 162 -42q29 0 56.5 5t55.5 16t45.5 33t17.5 53q0 46 -27.5 69.5t-67.5 27t-79.5 3t-67 5t-27.5 25.5q0 21 20.5 33t40.5 15t41 3q34 0 70.5 -11t51.5 -34h3l30 58q-3 1 -21 8.5t-22.5 9t-19.5 7t-22 7t-20 4.5t-24 4t-23 1q-29 0 -56.5 -5t-54 -16.5
+t-43 -34t-16.5 -53.5z" />
+    <glyph glyph-name="_500" unicode="&#xf215;" horiz-adv-x="2048" 
+d="M863 504q0 112 -79.5 191.5t-191.5 79.5t-191 -79.5t-79 -191.5t79 -191t191 -79t191.5 79t79.5 191zM1726 505q0 112 -79 191t-191 79t-191.5 -79t-79.5 -191q0 -113 79.5 -192t191.5 -79t191 79.5t79 191.5zM2048 1314v-1348q0 -44 -31.5 -75.5t-76.5 -31.5h-1832
+q-45 0 -76.5 31.5t-31.5 75.5v1348q0 44 31.5 75.5t76.5 31.5h431q44 0 76 -31.5t32 -75.5v-161h754v161q0 44 32 75.5t76 31.5h431q45 0 76.5 -31.5t31.5 -75.5z" />
+    <glyph glyph-name="_501" unicode="&#xf216;" horiz-adv-x="2048" 
+d="M1430 953zM1690 749q148 0 253 -98.5t105 -244.5q0 -157 -109 -261.5t-267 -104.5q-85 0 -162 27.5t-138 73.5t-118 106t-109 126t-103.5 132.5t-108.5 126.5t-117 106t-136 73.5t-159 27.5q-154 0 -251.5 -91.5t-97.5 -244.5q0 -157 104 -250t263 -93q100 0 208 37.5
+t193 98.5q5 4 21 18.5t30 24t22 9.5q14 0 24.5 -10.5t10.5 -24.5q0 -24 -60 -77q-101 -88 -234.5 -142t-260.5 -54q-133 0 -245.5 58t-180 165t-67.5 241q0 205 141.5 341t347.5 136q120 0 226.5 -43.5t185.5 -113t151.5 -153t139 -167.5t133.5 -153.5t149.5 -113
+t172.5 -43.5q102 0 168.5 61.5t66.5 162.5q0 95 -64.5 159t-159.5 64q-30 0 -81.5 -18.5t-68.5 -18.5q-20 0 -35.5 15t-15.5 35q0 18 8.5 57t8.5 59q0 159 -107.5 263t-266.5 104q-58 0 -111.5 -18.5t-84 -40.5t-55.5 -40.5t-33 -18.5q-15 0 -25.5 10.5t-10.5 25.5
+q0 19 25 46q59 67 147 103.5t182 36.5q191 0 318 -125.5t127 -315.5q0 -37 -4 -66q57 15 115 15z" />
+    <glyph glyph-name="_502" unicode="&#xf217;" horiz-adv-x="1664" 
+d="M1216 832q0 26 -19 45t-45 19h-128v128q0 26 -19 45t-45 19t-45 -19t-19 -45v-128h-128q-26 0 -45 -19t-19 -45t19 -45t45 -19h128v-128q0 -26 19 -45t45 -19t45 19t19 45v128h128q26 0 45 19t19 45zM640 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5
+t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1536 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1664 1088v-512q0 -24 -16 -42.5t-41 -21.5l-1044 -122q1 -7 4.5 -21.5t6 -26.5t2.5 -22q0 -16 -24 -64h920
+q26 0 45 -19t19 -45t-19 -45t-45 -19h-1024q-26 0 -45 19t-19 45q0 14 11 39.5t29.5 59.5t20.5 38l-177 823h-204q-26 0 -45 19t-19 45t19 45t45 19h256q16 0 28.5 -6.5t20 -15.5t13 -24.5t7.5 -26.5t5.5 -29.5t4.5 -25.5h1201q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="_503" unicode="&#xf218;" horiz-adv-x="1664" 
+d="M1280 832q0 26 -19 45t-45 19t-45 -19l-147 -146v293q0 26 -19 45t-45 19t-45 -19t-19 -45v-293l-147 146q-19 19 -45 19t-45 -19t-19 -45t19 -45l256 -256q19 -19 45 -19t45 19l256 256q19 19 19 45zM640 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5
+t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1536 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1664 1088v-512q0 -24 -16 -42.5t-41 -21.5l-1044 -122q1 -7 4.5 -21.5t6 -26.5t2.5 -22q0 -16 -24 -64h920
+q26 0 45 -19t19 -45t-19 -45t-45 -19h-1024q-26 0 -45 19t-19 45q0 14 11 39.5t29.5 59.5t20.5 38l-177 823h-204q-26 0 -45 19t-19 45t19 45t45 19h256q16 0 28.5 -6.5t20 -15.5t13 -24.5t7.5 -26.5t5.5 -29.5t4.5 -25.5h1201q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="_504" unicode="&#xf219;" horiz-adv-x="2048" 
+d="M212 768l623 -665l-300 665h-323zM1024 -4l349 772h-698zM538 896l204 384h-262l-288 -384h346zM1213 103l623 665h-323zM683 896h682l-204 384h-274zM1510 896h346l-288 384h-262zM1651 1382l384 -512q14 -18 13 -41.5t-17 -40.5l-960 -1024q-18 -20 -47 -20t-47 20
+l-960 1024q-16 17 -17 40.5t13 41.5l384 512q18 26 51 26h1152q33 0 51 -26z" />
+    <glyph glyph-name="_505" unicode="&#xf21a;" horiz-adv-x="2048" 
+d="M1811 -19q19 19 45 19t45 -19l128 -128l-90 -90l-83 83l-83 -83q-18 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83
+q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-128 128l90 90l83 -83l83 83q19 19 45 19t45 -19l83 -83l83 83q19 19 45 19t45 -19l83 -83l83 83q19 19 45 19t45 -19l83 -83l83 83q19 19 45 19t45 -19l83 -83l83 83q19 19 45 19t45 -19l83 -83l83 83
+q19 19 45 19t45 -19l83 -83zM237 19q-19 -19 -45 -19t-45 19l-128 128l90 90l83 -82l83 82q19 19 45 19t45 -19l83 -82l64 64v293l-210 314q-17 26 -7 56.5t40 40.5l177 58v299h128v128h256v128h256v-128h256v-128h128v-299l177 -58q30 -10 40 -40.5t-7 -56.5l-210 -314
+v-293l19 18q19 19 45 19t45 -19l83 -82l83 82q19 19 45 19t45 -19l128 -128l-90 -90l-83 83l-83 -83q-18 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83
+q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83zM640 1152v-128l384 128l384 -128v128h-128v128h-512v-128h-128z" />
+    <glyph glyph-name="_506" unicode="&#xf21b;" 
+d="M576 0l96 448l-96 128l-128 64zM832 0l128 640l-128 -64l-96 -128zM992 1010q-2 4 -4 6q-10 8 -96 8q-70 0 -167 -19q-7 -2 -21 -2t-21 2q-97 19 -167 19q-86 0 -96 -8q-2 -2 -4 -6q2 -18 4 -27q2 -3 7.5 -6.5t7.5 -10.5q2 -4 7.5 -20.5t7 -20.5t7.5 -17t8.5 -17t9 -14
+t12 -13.5t14 -9.5t17.5 -8t20.5 -4t24.5 -2q36 0 59 12.5t32.5 30t14.5 34.5t11.5 29.5t17.5 12.5h12q11 0 17.5 -12.5t11.5 -29.5t14.5 -34.5t32.5 -30t59 -12.5q13 0 24.5 2t20.5 4t17.5 8t14 9.5t12 13.5t9 14t8.5 17t7.5 17t7 20.5t7.5 20.5q2 7 7.5 10.5t7.5 6.5
+q2 9 4 27zM1408 131q0 -121 -73 -190t-194 -69h-874q-121 0 -194 69t-73 190q0 61 4.5 118t19 125.5t37.5 123.5t63.5 103.5t93.5 74.5l-90 220h214q-22 64 -22 128q0 12 2 32q-194 40 -194 96q0 57 210 99q17 62 51.5 134t70.5 114q32 37 76 37q30 0 84 -31t84 -31t84 31
+t84 31q44 0 76 -37q36 -42 70.5 -114t51.5 -134q210 -42 210 -99q0 -56 -194 -96q7 -81 -20 -160h214l-82 -225q63 -33 107.5 -96.5t65.5 -143.5t29 -151.5t8 -148.5z" />
+    <glyph glyph-name="_507" unicode="&#xf21c;" horiz-adv-x="2304" 
+d="M2301 500q12 -103 -22 -198.5t-99 -163.5t-158.5 -106t-196.5 -31q-161 11 -279.5 125t-134.5 274q-12 111 27.5 210.5t118.5 170.5l-71 107q-96 -80 -151 -194t-55 -244q0 -27 -18.5 -46.5t-45.5 -19.5h-256h-69q-23 -164 -149 -274t-294 -110q-185 0 -316.5 131.5
+t-131.5 316.5t131.5 316.5t316.5 131.5q76 0 152 -27l24 45q-123 110 -304 110h-64q-26 0 -45 19t-19 45t19 45t45 19h128q78 0 145 -13.5t116.5 -38.5t71.5 -39.5t51 -36.5h512h115l-85 128h-222q-30 0 -49 22.5t-14 52.5q4 23 23 38t43 15h253q33 0 53 -28l70 -105
+l114 114q19 19 46 19h101q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-179l115 -172q131 63 275 36q143 -26 244 -134.5t118 -253.5zM448 128q115 0 203 72.5t111 183.5h-314q-35 0 -55 31q-18 32 -1 63l147 277q-47 13 -91 13q-132 0 -226 -94t-94 -226t94 -226
+t226 -94zM1856 128q132 0 226 94t94 226t-94 226t-226 94q-60 0 -121 -24l174 -260q15 -23 10 -49t-27 -40q-15 -11 -36 -11q-35 0 -53 29l-174 260q-93 -95 -93 -225q0 -132 94 -226t226 -94z" />
+    <glyph glyph-name="_508" unicode="&#xf21d;" 
+d="M1408 0q0 -63 -61.5 -113.5t-164 -81t-225 -46t-253.5 -15.5t-253.5 15.5t-225 46t-164 81t-61.5 113.5q0 49 33 88.5t91 66.5t118 44.5t131 29.5q26 5 48 -10.5t26 -41.5q5 -26 -10.5 -48t-41.5 -26q-58 -10 -106 -23.5t-76.5 -25.5t-48.5 -23.5t-27.5 -19.5t-8.5 -12
+q3 -11 27 -26.5t73 -33t114 -32.5t160.5 -25t201.5 -10t201.5 10t160.5 25t114 33t73 33.5t27 27.5q-1 4 -8.5 11t-27.5 19t-48.5 23.5t-76.5 25t-106 23.5q-26 4 -41.5 26t-10.5 48q4 26 26 41.5t48 10.5q71 -12 131 -29.5t118 -44.5t91 -66.5t33 -88.5zM1024 896v-384
+q0 -26 -19 -45t-45 -19h-64v-384q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v384h-64q-26 0 -45 19t-19 45v384q0 53 37.5 90.5t90.5 37.5h384q53 0 90.5 -37.5t37.5 -90.5zM928 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5
+t158.5 -65.5t65.5 -158.5z" />
+    <glyph glyph-name="_509" unicode="&#xf21e;" horiz-adv-x="1792" 
+d="M1280 512h305q-5 -6 -10 -10.5t-9 -7.5l-3 -4l-623 -600q-18 -18 -44 -18t-44 18l-624 602q-5 2 -21 20h369q22 0 39.5 13.5t22.5 34.5l70 281l190 -667q6 -20 23 -33t39 -13q21 0 38 13t23 33l146 485l56 -112q18 -35 57 -35zM1792 940q0 -145 -103 -300h-369l-111 221
+q-8 17 -25.5 27t-36.5 8q-45 -5 -56 -46l-129 -430l-196 686q-6 20 -23.5 33t-39.5 13t-39 -13.5t-22 -34.5l-116 -464h-423q-103 155 -103 300q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5q224 0 351 -124
+t127 -344z" />
+    <glyph glyph-name="venus" unicode="&#xf221;" horiz-adv-x="1280" 
+d="M1152 960q0 -221 -147.5 -384.5t-364.5 -187.5v-260h224q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-224q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v260q-150 16 -271.5 103t-186 224t-52.5 292
+q11 134 80.5 249t182 188t245.5 88q170 19 319 -54t236 -212t87 -306zM128 960q0 -185 131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5z" />
+    <glyph glyph-name="_511" unicode="&#xf222;" 
+d="M1472 1408q26 0 45 -19t19 -45v-416q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v262l-382 -383q126 -156 126 -359q0 -117 -45.5 -223.5t-123 -184t-184 -123t-223.5 -45.5t-223.5 45.5t-184 123t-123 184t-45.5 223.5t45.5 223.5t123 184t184 123t223.5 45.5
+q203 0 359 -126l382 382h-261q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h416zM576 0q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+    <glyph glyph-name="_512" unicode="&#xf223;" horiz-adv-x="1280" 
+d="M830 1220q145 -72 233.5 -210.5t88.5 -305.5q0 -221 -147.5 -384.5t-364.5 -187.5v-132h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96v-96q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v96h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96v132q-217 24 -364.5 187.5
+t-147.5 384.5q0 167 88.5 305.5t233.5 210.5q-165 96 -228 273q-6 16 3.5 29.5t26.5 13.5h69q21 0 29 -20q44 -106 140 -171t214 -65t214 65t140 171q8 20 37 20h61q17 0 26.5 -13.5t3.5 -29.5q-63 -177 -228 -273zM576 256q185 0 316.5 131.5t131.5 316.5t-131.5 316.5
+t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+    <glyph glyph-name="_513" unicode="&#xf224;" 
+d="M1024 1504q0 14 9 23t23 9h288q26 0 45 -19t19 -45v-288q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v134l-254 -255q126 -158 126 -359q0 -221 -147.5 -384.5t-364.5 -187.5v-132h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96v-96q0 -14 -9 -23t-23 -9h-64
+q-14 0 -23 9t-9 23v96h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96v132q-149 16 -270.5 103t-186.5 223.5t-53 291.5q16 204 160 353.5t347 172.5q118 14 228 -19t198 -103l255 254h-134q-14 0 -23 9t-9 23v64zM576 256q185 0 316.5 131.5t131.5 316.5t-131.5 316.5
+t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+    <glyph glyph-name="_514" unicode="&#xf225;" horiz-adv-x="1792" 
+d="M1280 1504q0 14 9 23t23 9h288q26 0 45 -19t19 -45v-288q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v134l-254 -255q126 -158 126 -359q0 -221 -147.5 -384.5t-364.5 -187.5v-132h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96v-96q0 -14 -9 -23t-23 -9h-64
+q-14 0 -23 9t-9 23v96h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96v132q-217 24 -364.5 187.5t-147.5 384.5q0 201 126 359l-52 53l-101 -111q-9 -10 -22 -10.5t-23 7.5l-48 44q-10 8 -10.5 21.5t8.5 23.5l105 115l-111 112v-134q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9
+t-9 23v288q0 26 19 45t45 19h288q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-133l106 -107l86 94q9 10 22 10.5t23 -7.5l48 -44q10 -8 10.5 -21.5t-8.5 -23.5l-90 -99l57 -56q158 126 359 126t359 -126l255 254h-134q-14 0 -23 9t-9 23v64zM832 256q185 0 316.5 131.5
+t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+    <glyph glyph-name="_515" unicode="&#xf226;" horiz-adv-x="1792" 
+d="M1790 1007q12 -155 -52.5 -292t-186 -224t-271.5 -103v-260h224q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-512v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-224q-14 0 -23 9t-9 23v64q0 14 9 23
+t23 9h224v260q-150 16 -271.5 103t-186 224t-52.5 292q17 206 164.5 356.5t352.5 169.5q206 21 377 -94q171 115 377 94q205 -19 352.5 -169.5t164.5 -356.5zM896 647q128 131 128 313t-128 313q-128 -131 -128 -313t128 -313zM576 512q115 0 218 57q-154 165 -154 391
+q0 224 154 391q-103 57 -218 57q-185 0 -316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5zM1152 128v260q-137 15 -256 94q-119 -79 -256 -94v-260h512zM1216 512q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5q-115 0 -218 -57q154 -167 154 -391
+q0 -226 -154 -391q103 -57 218 -57z" />
+    <glyph glyph-name="_516" unicode="&#xf227;" horiz-adv-x="1920" 
+d="M1536 1120q0 14 9 23t23 9h288q26 0 45 -19t19 -45v-288q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v134l-254 -255q76 -95 107.5 -214t9.5 -247q-31 -182 -166 -312t-318 -156q-210 -29 -384.5 80t-241.5 300q-117 6 -221 57.5t-177.5 133t-113.5 192.5t-32 230
+q9 135 78 252t182 191.5t248 89.5q118 14 227.5 -19t198.5 -103l255 254h-134q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h288q26 0 45 -19t19 -45v-288q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v134l-254 -255q59 -74 93 -169q182 -9 328 -124l255 254h-134q-14 0 -23 9
+t-9 23v64zM1024 704q0 20 -4 58q-162 -25 -271 -150t-109 -292q0 -20 4 -58q162 25 271 150t109 292zM128 704q0 -168 111 -294t276 -149q-3 29 -3 59q0 210 135 369.5t338 196.5q-53 120 -163.5 193t-245.5 73q-185 0 -316.5 -131.5t-131.5 -316.5zM1088 -128
+q185 0 316.5 131.5t131.5 316.5q0 168 -111 294t-276 149q3 -28 3 -59q0 -210 -135 -369.5t-338 -196.5q53 -120 163.5 -193t245.5 -73z" />
+    <glyph glyph-name="_517" unicode="&#xf228;" horiz-adv-x="2048" 
+d="M1664 1504q0 14 9 23t23 9h288q26 0 45 -19t19 -45v-288q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v134l-254 -255q76 -95 107.5 -214t9.5 -247q-32 -180 -164.5 -310t-313.5 -157q-223 -34 -409 90q-117 -78 -256 -93v-132h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23
+t-23 -9h-96v-96q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v96h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96v132q-155 17 -279.5 109.5t-187 237.5t-39.5 307q25 187 159.5 322.5t320.5 164.5q224 34 410 -90q146 97 320 97q201 0 359 -126l255 254h-134q-14 0 -23 9
+t-9 23v64zM896 391q128 131 128 313t-128 313q-128 -131 -128 -313t128 -313zM128 704q0 -185 131.5 -316.5t316.5 -131.5q117 0 218 57q-154 167 -154 391t154 391q-101 57 -218 57q-185 0 -316.5 -131.5t-131.5 -316.5zM1216 256q185 0 316.5 131.5t131.5 316.5
+t-131.5 316.5t-316.5 131.5q-117 0 -218 -57q154 -167 154 -391t-154 -391q101 -57 218 -57z" />
+    <glyph glyph-name="_518" unicode="&#xf229;" 
+d="M1472 1408q26 0 45 -19t19 -45v-416q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v262l-213 -214l140 -140q9 -10 9 -23t-9 -22l-46 -46q-9 -9 -22 -9t-23 9l-140 141l-78 -79q126 -156 126 -359q0 -117 -45.5 -223.5t-123 -184t-184 -123t-223.5 -45.5t-223.5 45.5
+t-184 123t-123 184t-45.5 223.5t45.5 223.5t123 184t184 123t223.5 45.5q203 0 359 -126l78 78l-172 172q-9 10 -9 23t9 22l46 46q9 9 22 9t23 -9l172 -172l213 213h-261q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h416zM576 0q185 0 316.5 131.5t131.5 316.5t-131.5 316.5
+t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+    <glyph glyph-name="_519" unicode="&#xf22a;" horiz-adv-x="1280" 
+d="M640 892q217 -24 364.5 -187.5t147.5 -384.5q0 -167 -87 -306t-236 -212t-319 -54q-133 15 -245.5 88t-182 188t-80.5 249q-12 155 52.5 292t186 224t271.5 103v132h-160q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h160v165l-92 -92q-10 -9 -23 -9t-22 9l-46 46q-9 9 -9 22
+t9 23l202 201q19 19 45 19t45 -19l202 -201q9 -10 9 -23t-9 -22l-46 -46q-9 -9 -22 -9t-23 9l-92 92v-165h160q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-160v-132zM576 -128q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5
+t131.5 -316.5t316.5 -131.5z" />
+    <glyph glyph-name="_520" unicode="&#xf22b;" horiz-adv-x="2048" 
+d="M1901 621q19 -19 19 -45t-19 -45l-294 -294q-9 -10 -22.5 -10t-22.5 10l-45 45q-10 9 -10 22.5t10 22.5l185 185h-294v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-132q-24 -217 -187.5 -364.5t-384.5 -147.5q-167 0 -306 87t-212 236t-54 319q15 133 88 245.5
+t188 182t249 80.5q155 12 292 -52.5t224 -186t103 -271.5h132v224q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-224h294l-185 185q-10 9 -10 22.5t10 22.5l45 45q9 10 22.5 10t22.5 -10zM576 128q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5
+t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+    <glyph glyph-name="_521" unicode="&#xf22c;" horiz-adv-x="1280" 
+d="M1152 960q0 -221 -147.5 -384.5t-364.5 -187.5v-612q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v612q-217 24 -364.5 187.5t-147.5 384.5q0 117 45.5 223.5t123 184t184 123t223.5 45.5t223.5 -45.5t184 -123t123 -184t45.5 -223.5zM576 512q185 0 316.5 131.5
+t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+    <glyph glyph-name="_522" unicode="&#xf22d;" horiz-adv-x="1280" 
+d="M1024 576q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1152 576q0 -117 -45.5 -223.5t-123 -184t-184 -123t-223.5 -45.5t-223.5 45.5t-184 123t-123 184t-45.5 223.5t45.5 223.5t123 184t184 123
+t223.5 45.5t223.5 -45.5t184 -123t123 -184t45.5 -223.5z" />
+    <glyph glyph-name="_523" unicode="&#xf22e;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="_524" unicode="&#xf22f;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="_525" unicode="&#xf230;" 
+d="M1451 1408q35 0 60 -25t25 -60v-1366q0 -35 -25 -60t-60 -25h-391v595h199l30 232h-229v148q0 56 23.5 84t91.5 28l122 1v207q-63 9 -178 9q-136 0 -217.5 -80t-81.5 -226v-171h-200v-232h200v-595h-735q-35 0 -60 25t-25 60v1366q0 35 25 60t60 25h1366z" />
+    <glyph glyph-name="_526" unicode="&#xf231;" horiz-adv-x="1280" 
+d="M0 939q0 108 37.5 203.5t103.5 166.5t152 123t185 78t202 26q158 0 294 -66.5t221 -193.5t85 -287q0 -96 -19 -188t-60 -177t-100 -149.5t-145 -103t-189 -38.5q-68 0 -135 32t-96 88q-10 -39 -28 -112.5t-23.5 -95t-20.5 -71t-26 -71t-32 -62.5t-46 -77.5t-62 -86.5
+l-14 -5l-9 10q-15 157 -15 188q0 92 21.5 206.5t66.5 287.5t52 203q-32 65 -32 169q0 83 52 156t132 73q61 0 95 -40.5t34 -102.5q0 -66 -44 -191t-44 -187q0 -63 45 -104.5t109 -41.5q55 0 102 25t78.5 68t56 95t38 110.5t20 111t6.5 99.5q0 173 -109.5 269.5t-285.5 96.5
+q-200 0 -334 -129.5t-134 -328.5q0 -44 12.5 -85t27 -65t27 -45.5t12.5 -30.5q0 -28 -15 -73t-37 -45q-2 0 -17 3q-51 15 -90.5 56t-61 94.5t-32.5 108t-11 106.5z" />
+    <glyph glyph-name="_527" unicode="&#xf232;" 
+d="M985 562q13 0 97.5 -44t89.5 -53q2 -5 2 -15q0 -33 -17 -76q-16 -39 -71 -65.5t-102 -26.5q-57 0 -190 62q-98 45 -170 118t-148 185q-72 107 -71 194v8q3 91 74 158q24 22 52 22q6 0 18 -1.5t19 -1.5q19 0 26.5 -6.5t15.5 -27.5q8 -20 33 -88t25 -75q0 -21 -34.5 -57.5
+t-34.5 -46.5q0 -7 5 -15q34 -73 102 -137q56 -53 151 -101q12 -7 22 -7q15 0 54 48.5t52 48.5zM782 32q127 0 243.5 50t200.5 134t134 200.5t50 243.5t-50 243.5t-134 200.5t-200.5 134t-243.5 50t-243.5 -50t-200.5 -134t-134 -200.5t-50 -243.5q0 -203 120 -368l-79 -233
+l242 77q158 -104 345 -104zM782 1414q153 0 292.5 -60t240.5 -161t161 -240.5t60 -292.5t-60 -292.5t-161 -240.5t-240.5 -161t-292.5 -60q-195 0 -365 94l-417 -134l136 405q-108 178 -108 389q0 153 60 292.5t161 240.5t240.5 161t292.5 60z" />
+    <glyph glyph-name="_528" unicode="&#xf233;" horiz-adv-x="1792" 
+d="M128 128h1024v128h-1024v-128zM128 640h1024v128h-1024v-128zM1696 192q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM128 1152h1024v128h-1024v-128zM1696 704q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1696 1216
+q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1792 384v-384h-1792v384h1792zM1792 896v-384h-1792v384h1792zM1792 1408v-384h-1792v384h1792z" />
+    <glyph glyph-name="_529" unicode="&#xf234;" horiz-adv-x="2048" 
+d="M704 640q-159 0 -271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5t-112.5 -271.5t-271.5 -112.5zM1664 512h352q13 0 22.5 -9.5t9.5 -22.5v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-352v-352q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5
+t-9.5 22.5v352h-352q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h352v352q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5v-352zM928 288q0 -52 38 -90t90 -38h256v-238q-68 -50 -171 -50h-874q-121 0 -194 69t-73 190q0 53 3.5 103.5t14 109t26.5 108.5
+t43 97.5t62 81t85.5 53.5t111.5 20q19 0 39 -17q79 -61 154.5 -91.5t164.5 -30.5t164.5 30.5t154.5 91.5q20 17 39 17q132 0 217 -96h-223q-52 0 -90 -38t-38 -90v-192z" />
+    <glyph glyph-name="_530" unicode="&#xf235;" horiz-adv-x="2048" 
+d="M704 640q-159 0 -271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5t-112.5 -271.5t-271.5 -112.5zM1781 320l249 -249q9 -9 9 -23q0 -13 -9 -22l-136 -136q-9 -9 -22 -9q-14 0 -23 9l-249 249l-249 -249q-9 -9 -23 -9q-13 0 -22 9l-136 136
+q-9 9 -9 22q0 14 9 23l249 249l-249 249q-9 9 -9 23q0 13 9 22l136 136q9 9 22 9q14 0 23 -9l249 -249l249 249q9 9 23 9q13 0 22 -9l136 -136q9 -9 9 -22q0 -14 -9 -23zM1283 320l-181 -181q-37 -37 -37 -91q0 -53 37 -90l83 -83q-21 -3 -44 -3h-874q-121 0 -194 69
+t-73 190q0 53 3.5 103.5t14 109t26.5 108.5t43 97.5t62 81t85.5 53.5t111.5 20q19 0 39 -17q154 -122 319 -122t319 122q20 17 39 17q28 0 57 -6q-28 -27 -41 -50t-13 -56q0 -54 37 -91z" />
+    <glyph glyph-name="_531" unicode="&#xf236;" horiz-adv-x="2048" 
+d="M256 512h1728q26 0 45 -19t19 -45v-448h-256v256h-1536v-256h-256v1216q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-704zM832 832q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM2048 576v64q0 159 -112.5 271.5t-271.5 112.5h-704
+q-26 0 -45 -19t-19 -45v-384h1152z" />
+    <glyph glyph-name="_532" unicode="&#xf237;" 
+d="M1536 1536l-192 -448h192v-192h-274l-55 -128h329v-192h-411l-357 -832l-357 832h-411v192h329l-55 128h-274v192h192l-192 448h256l323 -768h378l323 768h256zM768 320l108 256h-216z" />
+    <glyph glyph-name="_533" unicode="&#xf238;" 
+d="M1088 1536q185 0 316.5 -93.5t131.5 -226.5v-896q0 -130 -125.5 -222t-305.5 -97l213 -202q16 -15 8 -35t-30 -20h-1056q-22 0 -30 20t8 35l213 202q-180 5 -305.5 97t-125.5 222v896q0 133 131.5 226.5t316.5 93.5h640zM768 192q80 0 136 56t56 136t-56 136t-136 56
+t-136 -56t-56 -136t56 -136t136 -56zM1344 768v512h-1152v-512h1152z" />
+    <glyph glyph-name="_534" unicode="&#xf239;" 
+d="M1088 1536q185 0 316.5 -93.5t131.5 -226.5v-896q0 -130 -125.5 -222t-305.5 -97l213 -202q16 -15 8 -35t-30 -20h-1056q-22 0 -30 20t8 35l213 202q-180 5 -305.5 97t-125.5 222v896q0 133 131.5 226.5t316.5 93.5h640zM288 224q66 0 113 47t47 113t-47 113t-113 47
+t-113 -47t-47 -113t47 -113t113 -47zM704 768v512h-544v-512h544zM1248 224q66 0 113 47t47 113t-47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47zM1408 768v512h-576v-512h576z" />
+    <glyph glyph-name="_535" unicode="&#xf23a;" horiz-adv-x="1792" 
+d="M597 1115v-1173q0 -25 -12.5 -42.5t-36.5 -17.5q-17 0 -33 8l-465 233q-21 10 -35.5 33.5t-14.5 46.5v1140q0 20 10 34t29 14q14 0 44 -15l511 -256q3 -3 3 -5zM661 1014l534 -866l-534 266v600zM1792 996v-1054q0 -25 -14 -40.5t-38 -15.5t-47 13l-441 220zM1789 1116
+q0 -3 -256.5 -419.5t-300.5 -487.5l-390 634l324 527q17 28 52 28q14 0 26 -6l541 -270q4 -2 4 -6z" />
+    <glyph glyph-name="_536" unicode="&#xf23b;" 
+d="M809 532l266 499h-112l-157 -312q-24 -48 -44 -92l-42 92l-155 312h-120l263 -493v-324h101v318zM1536 1408v-1536h-1536v1536h1536z" />
+    <glyph glyph-name="_537" unicode="&#xf23c;" horiz-adv-x="2296" 
+d="M478 -139q-8 -16 -27 -34.5t-37 -25.5q-25 -9 -51.5 3.5t-28.5 31.5q-1 22 40 55t68 38q23 4 34 -21.5t2 -46.5zM1819 -139q7 -16 26 -34.5t38 -25.5q25 -9 51.5 3.5t27.5 31.5q2 22 -39.5 55t-68.5 38q-22 4 -33 -21.5t-2 -46.5zM1867 -30q13 -27 56.5 -59.5t77.5 -41.5
+q45 -13 82 4.5t37 50.5q0 46 -67.5 100.5t-115.5 59.5q-40 5 -63.5 -37.5t-6.5 -76.5zM428 -30q-13 -27 -56 -59.5t-77 -41.5q-45 -13 -82 4.5t-37 50.5q0 46 67.5 100.5t115.5 59.5q40 5 63 -37.5t6 -76.5zM1158 1094h1q-41 0 -76 -15q27 -8 44 -30.5t17 -49.5
+q0 -35 -27 -60t-65 -25q-52 0 -80 43q-5 -23 -5 -42q0 -74 56 -126.5t135 -52.5q80 0 136 52.5t56 126.5t-56 126.5t-136 52.5zM1462 1312q-99 109 -220.5 131.5t-245.5 -44.5q27 60 82.5 96.5t118 39.5t121.5 -17t99.5 -74.5t44.5 -131.5zM2212 73q8 -11 -11 -42
+q7 -23 7 -40q1 -56 -44.5 -112.5t-109.5 -91.5t-118 -37q-48 -2 -92 21.5t-66 65.5q-687 -25 -1259 0q-23 -41 -66.5 -65t-92.5 -22q-86 3 -179.5 80.5t-92.5 160.5q2 22 7 40q-19 31 -11 42q6 10 31 1q14 22 41 51q-7 29 2 38q11 10 39 -4q29 20 59 34q0 29 13 37
+q23 12 51 -16q35 5 61 -2q18 -4 38 -19v73q-11 0 -18 2q-53 10 -97 44.5t-55 87.5q-9 38 0 81q15 62 93 95q2 17 19 35.5t36 23.5t33 -7.5t19 -30.5h13q46 -5 60 -23q3 -3 5 -7q10 1 30.5 3.5t30.5 3.5q-15 11 -30 17q-23 40 -91 43q0 6 1 10q-62 2 -118.5 18.5t-84.5 47.5
+q-32 36 -42.5 92t-2.5 112q16 126 90 179q23 16 52 4.5t32 -40.5q0 -1 1.5 -14t2.5 -21t3 -20t5.5 -19t8.5 -10q27 -14 76 -12q48 46 98 74q-40 4 -162 -14l47 46q61 58 163 111q145 73 282 86q-20 8 -41 15.5t-47 14t-42.5 10.5t-47.5 11t-43 10q595 126 904 -139
+q98 -84 158 -222q85 -10 121 9h1q5 3 8.5 10t5.5 19t3 19.5t3 21.5l1 14q3 28 32 40t52 -5q73 -52 91 -178q7 -57 -3.5 -113t-42.5 -91q-28 -32 -83.5 -48.5t-115.5 -18.5v-10q-71 -2 -95 -43q-14 -5 -31 -17q11 -1 32 -3.5t30 -3.5q1 5 5 8q16 18 60 23h13q5 18 19 30t33 8
+t36 -23t19 -36q79 -32 93 -95q9 -40 1 -81q-12 -53 -56 -88t-97 -44q-10 -2 -17 -2q0 -49 -1 -73q20 15 38 19q26 7 61 2q28 28 51 16q14 -9 14 -37q33 -16 59 -34q27 13 38 4q10 -10 2 -38q28 -30 41 -51q23 8 31 -1zM1937 1025q0 -29 -9 -54q82 -32 112 -132
+q4 37 -9.5 98.5t-41.5 90.5q-20 19 -36 17t-16 -20zM1859 925q35 -42 47.5 -108.5t-0.5 -124.5q67 13 97 45q13 14 18 28q-3 64 -31 114.5t-79 66.5q-15 -15 -52 -21zM1822 921q-30 0 -44 1q42 -115 53 -239q21 0 43 3q16 68 1 135t-53 100zM258 839q30 100 112 132
+q-9 25 -9 54q0 18 -16.5 20t-35.5 -17q-28 -29 -41.5 -90.5t-9.5 -98.5zM294 737q29 -31 97 -45q-13 58 -0.5 124.5t47.5 108.5v0q-37 6 -52 21q-51 -16 -78.5 -66t-31.5 -115q9 -17 18 -28zM471 683q14 124 73 235q-19 -4 -55 -18l-45 -19v1q-46 -89 -20 -196q25 -3 47 -3z
+M1434 644q8 -38 16.5 -108.5t11.5 -89.5q3 -18 9.5 -21.5t23.5 4.5q40 20 62 85.5t23 125.5q-24 2 -146 4zM1152 1285q-116 0 -199 -82.5t-83 -198.5q0 -117 83 -199.5t199 -82.5t199 82.5t83 199.5q0 116 -83 198.5t-199 82.5zM1380 646q-105 2 -211 0v1q-1 -27 2.5 -86
+t13.5 -66q29 -14 93.5 -14.5t95.5 10.5q9 3 11 39t-0.5 69.5t-4.5 46.5zM1112 447q8 4 9.5 48t-0.5 88t-4 63v1q-212 -3 -214 -3q-4 -20 -7 -62t0 -83t14 -46q34 -15 101 -16t101 10zM718 636q-16 -59 4.5 -118.5t77.5 -84.5q15 -8 24 -5t12 21q3 16 8 90t10 103
+q-69 -2 -136 -6zM591 510q3 -23 -34 -36q132 -141 271.5 -240t305.5 -154q172 49 310.5 146t293.5 250q-33 13 -30 34q0 2 0.5 3.5t1.5 3t1 2.5v1v-1q-17 2 -50 5.5t-48 4.5q-26 -90 -82 -132q-51 -38 -82 1q-5 6 -9 14q-7 13 -17 62q-2 -5 -5 -9t-7.5 -7t-8 -5.5t-9.5 -4
+l-10 -2.5t-12 -2l-12 -1.5t-13.5 -1t-13.5 -0.5q-106 -9 -163 11q-4 -17 -10 -26.5t-21 -15t-23 -7t-36 -3.5q-6 -1 -9 -1q-179 -17 -203 40q-2 -63 -56 -54q-47 8 -91 54q-12 13 -20 26q-17 29 -26 65q-58 -6 -87 -10q1 -2 4 -10zM507 -118q3 14 3 30q-17 71 -51 130
+t-73 70q-41 12 -101.5 -14.5t-104.5 -80t-39 -107.5q35 -53 100 -93t119 -42q51 -2 94 28t53 79zM510 53q23 -63 27 -119q195 113 392 174q-98 52 -180.5 120t-179.5 165q-6 -4 -29 -13q0 -1 -1 -4t-1 -5q31 -18 22 -37q-12 -23 -56 -34q-10 -13 -29 -24h-1q-2 -83 1 -150
+q19 -34 35 -73zM579 -113q532 -21 1145 0q-254 147 -428 196q-76 -35 -156 -57q-8 -3 -16 0q-65 21 -129 49q-208 -60 -416 -188h-1v-1q1 0 1 1zM1763 -67q4 54 28 120q14 38 33 71l-1 -1q3 77 3 153q-15 8 -30 25q-42 9 -56 33q-9 20 22 38q-2 4 -2 9q-16 4 -28 12
+q-204 -190 -383 -284q198 -59 414 -176zM2155 -90q5 54 -39 107.5t-104 80t-102 14.5q-38 -11 -72.5 -70.5t-51.5 -129.5q0 -16 3 -30q10 -49 53 -79t94 -28q54 2 119 42t100 93z" />
+    <glyph glyph-name="_538" unicode="&#xf23d;" horiz-adv-x="2304" 
+d="M1524 -25q0 -68 -48 -116t-116 -48t-116.5 48t-48.5 116t48.5 116.5t116.5 48.5t116 -48.5t48 -116.5zM775 -25q0 -68 -48.5 -116t-116.5 -48t-116 48t-48 116t48 116.5t116 48.5t116.5 -48.5t48.5 -116.5zM0 1469q57 -60 110.5 -104.5t121 -82t136 -63t166 -45.5
+t200 -31.5t250 -18.5t304 -9.5t372.5 -2.5q139 0 244.5 -5t181 -16.5t124 -27.5t71 -39.5t24 -51.5t-19.5 -64t-56.5 -76.5t-89.5 -91t-116 -104.5t-139 -119q-185 -157 -286 -247q29 51 76.5 109t94 105.5t94.5 98.5t83 91.5t54 80.5t13 70t-45.5 55.5t-116.5 41t-204 23.5
+t-304 5q-168 -2 -314 6t-256 23t-204.5 41t-159.5 51.5t-122.5 62.5t-91.5 66.5t-68 71.5t-50.5 69.5t-40 68t-36.5 59.5z" />
+    <glyph glyph-name="_539" unicode="&#xf23e;" horiz-adv-x="1792" 
+d="M896 1472q-169 0 -323 -66t-265.5 -177.5t-177.5 -265.5t-66 -323t66 -323t177.5 -265.5t265.5 -177.5t323 -66t323 66t265.5 177.5t177.5 265.5t66 323t-66 323t-177.5 265.5t-265.5 177.5t-323 66zM896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348
+t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM496 704q16 0 16 -16v-480q0 -16 -16 -16h-32q-16 0 -16 16v480q0 16 16 16h32zM896 640q53 0 90.5 -37.5t37.5 -90.5q0 -35 -17.5 -64t-46.5 -46v-114q0 -14 -9 -23
+t-23 -9h-64q-14 0 -23 9t-9 23v114q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5zM896 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM544 928v-96
+q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v96q0 93 65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5v-96q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v96q0 146 -103 249t-249 103t-249 -103t-103 -249zM1408 192v512q0 26 -19 45t-45 19h-896q-26 0 -45 -19t-19 -45v-512
+q0 -26 19 -45t45 -19h896q26 0 45 19t19 45z" />
+    <glyph glyph-name="_540" unicode="&#xf240;" horiz-adv-x="2304" 
+d="M1920 1024v-768h-1664v768h1664zM2048 448h128v384h-128v288q0 14 -9 23t-23 9h-1856q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h1856q14 0 23 9t9 23v288zM2304 832v-384q0 -53 -37.5 -90.5t-90.5 -37.5v-160q0 -66 -47 -113t-113 -47h-1856q-66 0 -113 47t-47 113
+v960q0 66 47 113t113 47h1856q66 0 113 -47t47 -113v-160q53 0 90.5 -37.5t37.5 -90.5z" />
+    <glyph glyph-name="_541" unicode="&#xf241;" horiz-adv-x="2304" 
+d="M256 256v768h1280v-768h-1280zM2176 960q53 0 90.5 -37.5t37.5 -90.5v-384q0 -53 -37.5 -90.5t-90.5 -37.5v-160q0 -66 -47 -113t-113 -47h-1856q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1856q66 0 113 -47t47 -113v-160zM2176 448v384h-128v288q0 14 -9 23t-23 9
+h-1856q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h1856q14 0 23 9t9 23v288h128z" />
+    <glyph glyph-name="_542" unicode="&#xf242;" horiz-adv-x="2304" 
+d="M256 256v768h896v-768h-896zM2176 960q53 0 90.5 -37.5t37.5 -90.5v-384q0 -53 -37.5 -90.5t-90.5 -37.5v-160q0 -66 -47 -113t-113 -47h-1856q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1856q66 0 113 -47t47 -113v-160zM2176 448v384h-128v288q0 14 -9 23t-23 9
+h-1856q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h1856q14 0 23 9t9 23v288h128z" />
+    <glyph glyph-name="_543" unicode="&#xf243;" horiz-adv-x="2304" 
+d="M256 256v768h512v-768h-512zM2176 960q53 0 90.5 -37.5t37.5 -90.5v-384q0 -53 -37.5 -90.5t-90.5 -37.5v-160q0 -66 -47 -113t-113 -47h-1856q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1856q66 0 113 -47t47 -113v-160zM2176 448v384h-128v288q0 14 -9 23t-23 9
+h-1856q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h1856q14 0 23 9t9 23v288h128z" />
+    <glyph glyph-name="_544" unicode="&#xf244;" horiz-adv-x="2304" 
+d="M2176 960q53 0 90.5 -37.5t37.5 -90.5v-384q0 -53 -37.5 -90.5t-90.5 -37.5v-160q0 -66 -47 -113t-113 -47h-1856q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1856q66 0 113 -47t47 -113v-160zM2176 448v384h-128v288q0 14 -9 23t-23 9h-1856q-14 0 -23 -9t-9 -23
+v-960q0 -14 9 -23t23 -9h1856q14 0 23 9t9 23v288h128z" />
+    <glyph glyph-name="_545" unicode="&#xf245;" horiz-adv-x="1280" 
+d="M1133 493q31 -30 14 -69q-17 -40 -59 -40h-382l201 -476q10 -25 0 -49t-34 -35l-177 -75q-25 -10 -49 0t-35 34l-191 452l-312 -312q-19 -19 -45 -19q-12 0 -24 5q-40 17 -40 59v1504q0 42 40 59q12 5 24 5q27 0 45 -19z" />
+    <glyph glyph-name="_546" unicode="&#xf246;" horiz-adv-x="1024" 
+d="M832 1408q-320 0 -320 -224v-416h128v-128h-128v-544q0 -224 320 -224h64v-128h-64q-272 0 -384 146q-112 -146 -384 -146h-64v128h64q320 0 320 224v544h-128v128h128v416q0 224 -320 224h-64v128h64q272 0 384 -146q112 146 384 146h64v-128h-64z" />
+    <glyph glyph-name="_547" unicode="&#xf247;" horiz-adv-x="2048" 
+d="M2048 1152h-128v-1024h128v-384h-384v128h-1280v-128h-384v384h128v1024h-128v384h384v-128h1280v128h384v-384zM1792 1408v-128h128v128h-128zM128 1408v-128h128v128h-128zM256 -128v128h-128v-128h128zM1664 0v128h128v1024h-128v128h-1280v-128h-128v-1024h128v-128
+h1280zM1920 -128v128h-128v-128h128zM1280 896h384v-768h-896v256h-384v768h896v-256zM512 512h640v512h-640v-512zM1536 256v512h-256v-384h-384v-128h640z" />
+    <glyph glyph-name="_548" unicode="&#xf248;" horiz-adv-x="2304" 
+d="M2304 768h-128v-640h128v-384h-384v128h-896v-128h-384v384h128v128h-384v-128h-384v384h128v640h-128v384h384v-128h896v128h384v-384h-128v-128h384v128h384v-384zM2048 1024v-128h128v128h-128zM1408 1408v-128h128v128h-128zM128 1408v-128h128v128h-128zM256 256
+v128h-128v-128h128zM1536 384h-128v-128h128v128zM384 384h896v128h128v640h-128v128h-896v-128h-128v-640h128v-128zM896 -128v128h-128v-128h128zM2176 -128v128h-128v-128h128zM2048 128v640h-128v128h-384v-384h128v-384h-384v128h-384v-128h128v-128h896v128h128z" />
+    <glyph glyph-name="_549" unicode="&#xf249;" 
+d="M1024 288v-416h-928q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h1344q40 0 68 -28t28 -68v-928h-416q-40 0 -68 -28t-28 -68zM1152 256h381q-15 -82 -65 -132l-184 -184q-50 -50 -132 -65v381z" />
+    <glyph glyph-name="_550" unicode="&#xf24a;" 
+d="M1400 256h-248v-248q29 10 41 22l185 185q12 12 22 41zM1120 384h288v896h-1280v-1280h896v288q0 40 28 68t68 28zM1536 1312v-1024q0 -40 -20 -88t-48 -76l-184 -184q-28 -28 -76 -48t-88 -20h-1024q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h1344q40 0 68 -28t28 -68
+z" />
+    <glyph glyph-name="_551" unicode="&#xf24b;" horiz-adv-x="2304" 
+d="M1951 538q0 -26 -15.5 -44.5t-38.5 -23.5q-8 -2 -18 -2h-153v140h153q10 0 18 -2q23 -5 38.5 -23.5t15.5 -44.5zM1933 751q0 -25 -15 -42t-38 -21q-3 -1 -15 -1h-139v129h139q3 0 8.5 -0.5t6.5 -0.5q23 -4 38 -21.5t15 -42.5zM728 587v308h-228v-308q0 -58 -38 -94.5
+t-105 -36.5q-108 0 -229 59v-112q53 -15 121 -23t109 -9l42 -1q328 0 328 217zM1442 403v113q-99 -52 -200 -59q-108 -8 -169 41t-61 142t61 142t169 41q101 -7 200 -58v112q-48 12 -100 19.5t-80 9.5l-28 2q-127 6 -218.5 -14t-140.5 -60t-71 -88t-22 -106t22 -106t71 -88
+t140.5 -60t218.5 -14q101 4 208 31zM2176 518q0 54 -43 88.5t-109 39.5v3q57 8 89 41.5t32 79.5q0 55 -41 88t-107 36q-3 0 -12 0.5t-14 0.5h-455v-510h491q74 0 121.5 36.5t47.5 96.5zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90
+t90 38h2048q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="_552" unicode="&#xf24c;" horiz-adv-x="2304" 
+d="M858 295v693q-106 -41 -172 -135.5t-66 -211.5t66 -211.5t172 -134.5zM1362 641q0 117 -66 211.5t-172 135.5v-694q106 41 172 135.5t66 211.5zM1577 641q0 -159 -78.5 -294t-213.5 -213.5t-294 -78.5q-119 0 -227.5 46.5t-187 125t-125 187t-46.5 227.5q0 159 78.5 294
+t213.5 213.5t294 78.5t294 -78.5t213.5 -213.5t78.5 -294zM1960 634q0 139 -55.5 261.5t-147.5 205.5t-213.5 131t-252.5 48h-301q-176 0 -323.5 -81t-235 -230t-87.5 -335q0 -171 87 -317.5t236 -231.5t323 -85h301q129 0 251.5 50.5t214.5 135t147.5 202.5t55.5 246z
+M2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="_553" unicode="&#xf24d;" horiz-adv-x="1792" 
+d="M1664 -96v1088q0 13 -9.5 22.5t-22.5 9.5h-1088q-13 0 -22.5 -9.5t-9.5 -22.5v-1088q0 -13 9.5 -22.5t22.5 -9.5h1088q13 0 22.5 9.5t9.5 22.5zM1792 992v-1088q0 -66 -47 -113t-113 -47h-1088q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1088q66 0 113 -47t47 -113
+zM1408 1376v-160h-128v160q0 13 -9.5 22.5t-22.5 9.5h-1088q-13 0 -22.5 -9.5t-9.5 -22.5v-1088q0 -13 9.5 -22.5t22.5 -9.5h160v-128h-160q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1088q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="_554" unicode="&#xf24e;" horiz-adv-x="2304" 
+d="M1728 1088l-384 -704h768zM448 1088l-384 -704h768zM1269 1280q-14 -40 -45.5 -71.5t-71.5 -45.5v-1291h608q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1344q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h608v1291q-40 14 -71.5 45.5t-45.5 71.5h-491q-14 0 -23 9t-9 23v64
+q0 14 9 23t23 9h491q21 57 70 92.5t111 35.5t111 -35.5t70 -92.5h491q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-491zM1088 1264q33 0 56.5 23.5t23.5 56.5t-23.5 56.5t-56.5 23.5t-56.5 -23.5t-23.5 -56.5t23.5 -56.5t56.5 -23.5zM2176 384q0 -73 -46.5 -131t-117.5 -91
+t-144.5 -49.5t-139.5 -16.5t-139.5 16.5t-144.5 49.5t-117.5 91t-46.5 131q0 11 35 81t92 174.5t107 195.5t102 184t56 100q18 33 56 33t56 -33q4 -7 56 -100t102 -184t107 -195.5t92 -174.5t35 -81zM896 384q0 -73 -46.5 -131t-117.5 -91t-144.5 -49.5t-139.5 -16.5
+t-139.5 16.5t-144.5 49.5t-117.5 91t-46.5 131q0 11 35 81t92 174.5t107 195.5t102 184t56 100q18 33 56 33t56 -33q4 -7 56 -100t102 -184t107 -195.5t92 -174.5t35 -81z" />
+    <glyph glyph-name="_555" unicode="&#xf250;" 
+d="M1408 1408q0 -261 -106.5 -461.5t-266.5 -306.5q160 -106 266.5 -306.5t106.5 -461.5h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1472q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96q0 261 106.5 461.5t266.5 306.5q-160 106 -266.5 306.5t-106.5 461.5h-96q-14 0 -23 9
+t-9 23v64q0 14 9 23t23 9h1472q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96zM874 700q77 29 149 92.5t129.5 152.5t92.5 210t35 253h-1024q0 -132 35 -253t92.5 -210t129.5 -152.5t149 -92.5q19 -7 30.5 -23.5t11.5 -36.5t-11.5 -36.5t-30.5 -23.5q-77 -29 -149 -92.5
+t-129.5 -152.5t-92.5 -210t-35 -253h1024q0 132 -35 253t-92.5 210t-129.5 152.5t-149 92.5q-19 7 -30.5 23.5t-11.5 36.5t11.5 36.5t30.5 23.5z" />
+    <glyph glyph-name="_556" unicode="&#xf251;" 
+d="M1408 1408q0 -261 -106.5 -461.5t-266.5 -306.5q160 -106 266.5 -306.5t106.5 -461.5h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1472q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96q0 261 106.5 461.5t266.5 306.5q-160 106 -266.5 306.5t-106.5 461.5h-96q-14 0 -23 9
+t-9 23v64q0 14 9 23t23 9h1472q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96zM1280 1408h-1024q0 -66 9 -128h1006q9 61 9 128zM1280 -128q0 130 -34 249.5t-90.5 208t-126.5 152t-146 94.5h-230q-76 -31 -146 -94.5t-126.5 -152t-90.5 -208t-34 -249.5h1024z" />
+    <glyph glyph-name="_557" unicode="&#xf252;" 
+d="M1408 1408q0 -261 -106.5 -461.5t-266.5 -306.5q160 -106 266.5 -306.5t106.5 -461.5h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1472q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96q0 261 106.5 461.5t266.5 306.5q-160 106 -266.5 306.5t-106.5 461.5h-96q-14 0 -23 9
+t-9 23v64q0 14 9 23t23 9h1472q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96zM1280 1408h-1024q0 -206 85 -384h854q85 178 85 384zM1223 192q-54 141 -145.5 241.5t-194.5 142.5h-230q-103 -42 -194.5 -142.5t-145.5 -241.5h910z" />
+    <glyph glyph-name="_558" unicode="&#xf253;" 
+d="M1408 1408q0 -261 -106.5 -461.5t-266.5 -306.5q160 -106 266.5 -306.5t106.5 -461.5h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1472q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96q0 261 106.5 461.5t266.5 306.5q-160 106 -266.5 306.5t-106.5 461.5h-96q-14 0 -23 9
+t-9 23v64q0 14 9 23t23 9h1472q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96zM874 700q77 29 149 92.5t129.5 152.5t92.5 210t35 253h-1024q0 -132 35 -253t92.5 -210t129.5 -152.5t149 -92.5q19 -7 30.5 -23.5t11.5 -36.5t-11.5 -36.5t-30.5 -23.5q-137 -51 -244 -196
+h700q-107 145 -244 196q-19 7 -30.5 23.5t-11.5 36.5t11.5 36.5t30.5 23.5z" />
+    <glyph glyph-name="_559" unicode="&#xf254;" 
+d="M1504 -64q14 0 23 -9t9 -23v-128q0 -14 -9 -23t-23 -9h-1472q-14 0 -23 9t-9 23v128q0 14 9 23t23 9h1472zM130 0q3 55 16 107t30 95t46 87t53.5 76t64.5 69.5t66 60t70.5 55t66.5 47.5t65 43q-43 28 -65 43t-66.5 47.5t-70.5 55t-66 60t-64.5 69.5t-53.5 76t-46 87
+t-30 95t-16 107h1276q-3 -55 -16 -107t-30 -95t-46 -87t-53.5 -76t-64.5 -69.5t-66 -60t-70.5 -55t-66.5 -47.5t-65 -43q43 -28 65 -43t66.5 -47.5t70.5 -55t66 -60t64.5 -69.5t53.5 -76t46 -87t30 -95t16 -107h-1276zM1504 1536q14 0 23 -9t9 -23v-128q0 -14 -9 -23t-23 -9
+h-1472q-14 0 -23 9t-9 23v128q0 14 9 23t23 9h1472z" />
+    <glyph glyph-name="_560" unicode="&#xf255;" 
+d="M768 1152q-53 0 -90.5 -37.5t-37.5 -90.5v-128h-32v93q0 48 -32 81.5t-80 33.5q-46 0 -79 -33t-33 -79v-429l-32 30v172q0 48 -32 81.5t-80 33.5q-46 0 -79 -33t-33 -79v-224q0 -47 35 -82l310 -296q39 -39 39 -102q0 -26 19 -45t45 -19h640q26 0 45 19t19 45v25
+q0 41 10 77l108 436q10 36 10 77v246q0 48 -32 81.5t-80 33.5q-46 0 -79 -33t-33 -79v-32h-32v125q0 40 -25 72.5t-64 40.5q-14 2 -23 2q-46 0 -79 -33t-33 -79v-128h-32v122q0 51 -32.5 89.5t-82.5 43.5q-5 1 -13 1zM768 1280q84 0 149 -50q57 34 123 34q59 0 111 -27
+t86 -76q27 7 59 7q100 0 170 -71.5t70 -171.5v-246q0 -51 -13 -108l-109 -436q-6 -24 -6 -71q0 -80 -56 -136t-136 -56h-640q-84 0 -138 58.5t-54 142.5l-308 296q-76 73 -76 175v224q0 99 70.5 169.5t169.5 70.5q11 0 16 -1q6 95 75.5 160t164.5 65q52 0 98 -21
+q72 69 174 69z" />
+    <glyph glyph-name="_561" unicode="&#xf256;" horiz-adv-x="1792" 
+d="M880 1408q-46 0 -79 -33t-33 -79v-656h-32v528q0 46 -33 79t-79 33t-79 -33t-33 -79v-528v-256l-154 205q-38 51 -102 51q-53 0 -90.5 -37.5t-37.5 -90.5q0 -43 26 -77l384 -512q38 -51 102 -51h688q34 0 61 22t34 56l76 405q5 32 5 59v498q0 46 -33 79t-79 33t-79 -33
+t-33 -79v-272h-32v528q0 46 -33 79t-79 33t-79 -33t-33 -79v-528h-32v656q0 46 -33 79t-79 33zM880 1536q68 0 125.5 -35.5t88.5 -96.5q19 4 42 4q99 0 169.5 -70.5t70.5 -169.5v-17q105 6 180.5 -64t75.5 -175v-498q0 -40 -8 -83l-76 -404q-14 -79 -76.5 -131t-143.5 -52
+h-688q-60 0 -114.5 27.5t-90.5 74.5l-384 512q-51 68 -51 154q0 106 75 181t181 75q78 0 128 -34v434q0 99 70.5 169.5t169.5 70.5q23 0 42 -4q31 61 88.5 96.5t125.5 35.5z" />
+    <glyph glyph-name="_562" unicode="&#xf257;" horiz-adv-x="1792" 
+d="M1073 -128h-177q-163 0 -226 141q-23 49 -23 102v5q-62 30 -98.5 88.5t-36.5 127.5q0 38 5 48h-261q-106 0 -181 75t-75 181t75 181t181 75h113l-44 17q-74 28 -119.5 93.5t-45.5 145.5q0 106 75 181t181 75q46 0 91 -17l628 -239h401q106 0 181 -75t75 -181v-668
+q0 -88 -54 -157.5t-140 -90.5l-339 -85q-92 -23 -186 -23zM1024 583l-155 -71l-163 -74q-30 -14 -48 -41.5t-18 -60.5q0 -46 33 -79t79 -33q26 0 46 10l338 154q-49 10 -80.5 50t-31.5 90v55zM1344 272q0 46 -33 79t-79 33q-26 0 -46 -10l-290 -132q-28 -13 -37 -17
+t-30.5 -17t-29.5 -23.5t-16 -29t-8 -40.5q0 -50 31.5 -82t81.5 -32q20 0 38 9l352 160q30 14 48 41.5t18 60.5zM1112 1024l-650 248q-24 8 -46 8q-53 0 -90.5 -37.5t-37.5 -90.5q0 -40 22.5 -73t59.5 -47l526 -200v-64h-640q-53 0 -90.5 -37.5t-37.5 -90.5t37.5 -90.5
+t90.5 -37.5h535l233 106v198q0 63 46 106l111 102h-69zM1073 0q82 0 155 19l339 85q43 11 70 45.5t27 78.5v668q0 53 -37.5 90.5t-90.5 37.5h-308l-136 -126q-36 -33 -36 -82v-296q0 -46 33 -77t79 -31t79 35t33 81v208h32v-208q0 -70 -57 -114q52 -8 86.5 -48.5t34.5 -93.5
+q0 -42 -23 -78t-61 -53l-310 -141h91z" />
+    <glyph glyph-name="_563" unicode="&#xf258;" horiz-adv-x="2048" 
+d="M1151 1536q61 0 116 -28t91 -77l572 -781q118 -159 118 -359v-355q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v177l-286 143h-546q-80 0 -136 56t-56 136v32q0 119 84.5 203.5t203.5 84.5h420l42 128h-686q-100 0 -173.5 67.5t-81.5 166.5q-65 79 -65 182v32
+q0 80 56 136t136 56h959zM1920 -64v355q0 157 -93 284l-573 781q-39 52 -103 52h-959q-26 0 -45 -19t-19 -45q0 -32 1.5 -49.5t9.5 -40.5t25 -43q10 31 35.5 50t56.5 19h832v-32h-832q-26 0 -45 -19t-19 -45q0 -44 3 -58q8 -44 44 -73t81 -29h640h91q40 0 68 -28t28 -68
+q0 -15 -5 -30l-64 -192q-10 -29 -35 -47.5t-56 -18.5h-443q-66 0 -113 -47t-47 -113v-32q0 -26 19 -45t45 -19h561q16 0 29 -7l317 -158q24 -13 38.5 -36t14.5 -50v-197q0 -26 19 -45t45 -19h384q26 0 45 19t19 45z" />
+    <glyph glyph-name="_564" unicode="&#xf259;" horiz-adv-x="2048" 
+d="M459 -256q-77 0 -137.5 47.5t-79.5 122.5l-101 401q-13 57 -13 108q0 45 -5 67l-116 477q-7 27 -7 57q0 93 62 161t155 78q17 85 82.5 139t152.5 54q83 0 148 -51.5t85 -132.5l83 -348l103 428q20 81 85 132.5t148 51.5q89 0 155.5 -57.5t80.5 -144.5q92 -10 152 -79
+t60 -162q0 -24 -7 -59l-123 -512q10 7 37.5 28.5t38.5 29.5t35 23t41 20.5t41.5 11t49.5 5.5q105 0 180 -74t75 -179q0 -62 -28.5 -118t-78.5 -94l-507 -380q-68 -51 -153 -51h-694zM1104 1408q-38 0 -68.5 -24t-39.5 -62l-164 -682h-127l-145 602q-9 38 -39.5 62t-68.5 24
+q-48 0 -80 -33t-32 -80q0 -15 3 -28l132 -547h-26l-99 408q-9 37 -40 62.5t-69 25.5q-47 0 -80 -33t-33 -79q0 -14 3 -26l116 -478q7 -28 9 -86t10 -88l100 -401q8 -32 34 -52.5t59 -20.5h694q42 0 76 26l507 379q56 43 56 110q0 52 -37.5 88.5t-89.5 36.5q-43 0 -77 -26
+l-307 -230v227q0 4 32 138t68 282t39 161q4 18 4 29q0 47 -32 81t-79 34q-39 0 -69.5 -24t-39.5 -62l-116 -482h-26l150 624q3 14 3 28q0 48 -31.5 82t-79.5 34z" />
+    <glyph glyph-name="_565" unicode="&#xf25a;" horiz-adv-x="1792" 
+d="M640 1408q-53 0 -90.5 -37.5t-37.5 -90.5v-512v-384l-151 202q-41 54 -107 54q-52 0 -89 -38t-37 -90q0 -43 26 -77l384 -512q38 -51 102 -51h718q22 0 39.5 13.5t22.5 34.5l92 368q24 96 24 194v217q0 41 -28 71t-68 30t-68 -28t-28 -68h-32v61q0 48 -32 81.5t-80 33.5
+q-46 0 -79 -33t-33 -79v-64h-32v90q0 55 -37 94.5t-91 39.5q-53 0 -90.5 -37.5t-37.5 -90.5v-96h-32v570q0 55 -37 94.5t-91 39.5zM640 1536q107 0 181.5 -77.5t74.5 -184.5v-220q22 2 32 2q99 0 173 -69q47 21 99 21q113 0 184 -87q27 7 56 7q94 0 159 -67.5t65 -161.5
+v-217q0 -116 -28 -225l-92 -368q-16 -64 -68 -104.5t-118 -40.5h-718q-60 0 -114.5 27.5t-90.5 74.5l-384 512q-51 68 -51 154q0 105 74.5 180.5t179.5 75.5q71 0 130 -35v547q0 106 75 181t181 75zM768 128v384h-32v-384h32zM1024 128v384h-32v-384h32zM1280 128v384h-32
+v-384h32z" />
+    <glyph glyph-name="_566" unicode="&#xf25b;" 
+d="M1288 889q60 0 107 -23q141 -63 141 -226v-177q0 -94 -23 -186l-85 -339q-21 -86 -90.5 -140t-157.5 -54h-668q-106 0 -181 75t-75 181v401l-239 628q-17 45 -17 91q0 106 75 181t181 75q80 0 145.5 -45.5t93.5 -119.5l17 -44v113q0 106 75 181t181 75t181 -75t75 -181
+v-261q27 5 48 5q69 0 127.5 -36.5t88.5 -98.5zM1072 896q-33 0 -60.5 -18t-41.5 -48l-74 -163l-71 -155h55q50 0 90 -31.5t50 -80.5l154 338q10 20 10 46q0 46 -33 79t-79 33zM1293 761q-22 0 -40.5 -8t-29 -16t-23.5 -29.5t-17 -30.5t-17 -37l-132 -290q-10 -20 -10 -46
+q0 -46 33 -79t79 -33q33 0 60.5 18t41.5 48l160 352q9 18 9 38q0 50 -32 81.5t-82 31.5zM128 1120q0 -22 8 -46l248 -650v-69l102 111q43 46 106 46h198l106 233v535q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5v-640h-64l-200 526q-14 37 -47 59.5t-73 22.5
+q-53 0 -90.5 -37.5t-37.5 -90.5zM1180 -128q44 0 78.5 27t45.5 70l85 339q19 73 19 155v91l-141 -310q-17 -38 -53 -61t-78 -23q-53 0 -93.5 34.5t-48.5 86.5q-44 -57 -114 -57h-208v32h208q46 0 81 33t35 79t-31 79t-77 33h-296q-49 0 -82 -36l-126 -136v-308
+q0 -53 37.5 -90.5t90.5 -37.5h668z" />
+    <glyph glyph-name="_567" unicode="&#xf25c;" horiz-adv-x="1973" 
+d="M857 992v-117q0 -13 -9.5 -22t-22.5 -9h-298v-812q0 -13 -9 -22.5t-22 -9.5h-135q-13 0 -22.5 9t-9.5 23v812h-297q-13 0 -22.5 9t-9.5 22v117q0 14 9 23t23 9h793q13 0 22.5 -9.5t9.5 -22.5zM1895 995l77 -961q1 -13 -8 -24q-10 -10 -23 -10h-134q-12 0 -21 8.5
+t-10 20.5l-46 588l-189 -425q-8 -19 -29 -19h-120q-20 0 -29 19l-188 427l-45 -590q-1 -12 -10 -20.5t-21 -8.5h-135q-13 0 -23 10q-9 10 -9 24l78 961q1 12 10 20.5t21 8.5h142q20 0 29 -19l220 -520q10 -24 20 -51q3 7 9.5 24.5t10.5 26.5l221 520q9 19 29 19h141
+q13 0 22 -8.5t10 -20.5z" />
+    <glyph glyph-name="_568" unicode="&#xf25d;" horiz-adv-x="1792" 
+d="M1042 833q0 88 -60 121q-33 18 -117 18h-123v-281h162q66 0 102 37t36 105zM1094 548l205 -373q8 -17 -1 -31q-8 -16 -27 -16h-152q-20 0 -28 17l-194 365h-155v-350q0 -14 -9 -23t-23 -9h-134q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h294q128 0 190 -24q85 -31 134 -109
+t49 -180q0 -92 -42.5 -165.5t-115.5 -109.5q6 -10 9 -16zM896 1376q-150 0 -286 -58.5t-234.5 -157t-157 -234.5t-58.5 -286t58.5 -286t157 -234.5t234.5 -157t286 -58.5t286 58.5t234.5 157t157 234.5t58.5 286t-58.5 286t-157 234.5t-234.5 157t-286 58.5zM1792 640
+q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="_569" unicode="&#xf25e;" horiz-adv-x="1792" 
+d="M605 303q153 0 257 104q14 18 3 36l-45 82q-6 13 -24 17q-16 2 -27 -11l-4 -3q-4 -4 -11.5 -10t-17.5 -13.5t-23.5 -14.5t-28.5 -13t-33.5 -9.5t-37.5 -3.5q-76 0 -125 50t-49 127q0 76 48 125.5t122 49.5q37 0 71.5 -14t50.5 -28l16 -14q11 -11 26 -10q16 2 24 14l53 78
+q13 20 -2 39q-3 4 -11 12t-30 23.5t-48.5 28t-67.5 22.5t-86 10q-148 0 -246 -96.5t-98 -240.5q0 -146 97 -241.5t247 -95.5zM1235 303q153 0 257 104q14 18 4 36l-45 82q-8 14 -25 17q-16 2 -27 -11l-4 -3q-4 -4 -11.5 -10t-17.5 -13.5t-23.5 -14.5t-28.5 -13t-33.5 -9.5
+t-37.5 -3.5q-76 0 -125 50t-49 127q0 76 48 125.5t122 49.5q37 0 71.5 -14t50.5 -28l16 -14q11 -11 26 -10q16 2 24 14l53 78q13 20 -2 39q-3 4 -11 12t-30 23.5t-48.5 28t-67.5 22.5t-86 10q-147 0 -245.5 -96.5t-98.5 -240.5q0 -146 97 -241.5t247 -95.5zM896 1376
+q-150 0 -286 -58.5t-234.5 -157t-157 -234.5t-58.5 -286t58.5 -286t157 -234.5t234.5 -157t286 -58.5t286 58.5t234.5 157t157 234.5t58.5 286t-58.5 286t-157 234.5t-234.5 157t-286 58.5zM896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286t-286 -191
+t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71z" />
+    <glyph glyph-name="f260" unicode="&#xf260;" horiz-adv-x="2048" 
+d="M736 736l384 -384l-384 -384l-672 672l672 672l168 -168l-96 -96l-72 72l-480 -480l480 -480l193 193l-289 287zM1312 1312l672 -672l-672 -672l-168 168l96 96l72 -72l480 480l-480 480l-193 -193l289 -287l-96 -96l-384 384z" />
+    <glyph glyph-name="f261" unicode="&#xf261;" horiz-adv-x="1792" 
+d="M717 182l271 271l-279 279l-88 -88l192 -191l-96 -96l-279 279l279 279l40 -40l87 87l-127 128l-454 -454zM1075 190l454 454l-454 454l-271 -271l279 -279l88 88l-192 191l96 96l279 -279l-279 -279l-40 40l-87 -88zM1792 640q0 -182 -71 -348t-191 -286t-286 -191
+t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="_572" unicode="&#xf262;" horiz-adv-x="2304" 
+d="M651 539q0 -39 -27.5 -66.5t-65.5 -27.5q-39 0 -66.5 27.5t-27.5 66.5q0 38 27.5 65.5t66.5 27.5q38 0 65.5 -27.5t27.5 -65.5zM1805 540q0 -39 -27.5 -66.5t-66.5 -27.5t-66.5 27.5t-27.5 66.5t27.5 66t66.5 27t66.5 -27t27.5 -66zM765 539q0 79 -56.5 136t-136.5 57
+t-136.5 -56.5t-56.5 -136.5t56.5 -136.5t136.5 -56.5t136.5 56.5t56.5 136.5zM1918 540q0 80 -56.5 136.5t-136.5 56.5q-79 0 -136 -56.5t-57 -136.5t56.5 -136.5t136.5 -56.5t136.5 56.5t56.5 136.5zM850 539q0 -116 -81.5 -197.5t-196.5 -81.5q-116 0 -197.5 82t-81.5 197
+t82 196.5t197 81.5t196.5 -81.5t81.5 -196.5zM2004 540q0 -115 -81.5 -196.5t-197.5 -81.5q-115 0 -196.5 81.5t-81.5 196.5t81.5 196.5t196.5 81.5q116 0 197.5 -81.5t81.5 -196.5zM1040 537q0 191 -135.5 326.5t-326.5 135.5q-125 0 -231 -62t-168 -168.5t-62 -231.5
+t62 -231.5t168 -168.5t231 -62q191 0 326.5 135.5t135.5 326.5zM1708 1110q-254 111 -556 111q-319 0 -573 -110q117 0 223 -45.5t182.5 -122.5t122 -183t45.5 -223q0 115 43.5 219.5t118 180.5t177.5 123t217 50zM2187 537q0 191 -135 326.5t-326 135.5t-326.5 -135.5
+t-135.5 -326.5t135.5 -326.5t326.5 -135.5t326 135.5t135 326.5zM1921 1103h383q-44 -51 -75 -114.5t-40 -114.5q110 -151 110 -337q0 -156 -77 -288t-209 -208.5t-287 -76.5q-133 0 -249 56t-196 155q-47 -56 -129 -179q-11 22 -53.5 82.5t-74.5 97.5
+q-80 -99 -196.5 -155.5t-249.5 -56.5q-155 0 -287 76.5t-209 208.5t-77 288q0 186 110 337q-9 51 -40 114.5t-75 114.5h365q149 100 355 156.5t432 56.5q224 0 421 -56t348 -157z" />
+    <glyph glyph-name="f263" unicode="&#xf263;" horiz-adv-x="1280" 
+d="M640 629q-188 0 -321 133t-133 320q0 188 133 321t321 133t321 -133t133 -321q0 -187 -133 -320t-321 -133zM640 1306q-92 0 -157.5 -65.5t-65.5 -158.5q0 -92 65.5 -157.5t157.5 -65.5t157.5 65.5t65.5 157.5q0 93 -65.5 158.5t-157.5 65.5zM1163 574q13 -27 15 -49.5
+t-4.5 -40.5t-26.5 -38.5t-42.5 -37t-61.5 -41.5q-115 -73 -315 -94l73 -72l267 -267q30 -31 30 -74t-30 -73l-12 -13q-31 -30 -74 -30t-74 30q-67 68 -267 268l-267 -268q-31 -30 -74 -30t-73 30l-12 13q-31 30 -31 73t31 74l267 267l72 72q-203 21 -317 94
+q-39 25 -61.5 41.5t-42.5 37t-26.5 38.5t-4.5 40.5t15 49.5q10 20 28 35t42 22t56 -2t65 -35q5 -4 15 -11t43 -24.5t69 -30.5t92 -24t113 -11q91 0 174 25.5t120 50.5l38 25q33 26 65 35t56 2t42 -22t28 -35z" />
+    <glyph glyph-name="_574" unicode="&#xf264;" 
+d="M927 956q0 -66 -46.5 -112.5t-112.5 -46.5t-112.5 46.5t-46.5 112.5t46.5 112.5t112.5 46.5t112.5 -46.5t46.5 -112.5zM1141 593q-10 20 -28 32t-47.5 9.5t-60.5 -27.5q-10 -8 -29 -20t-81 -32t-127 -20t-124 18t-86 36l-27 18q-31 25 -60.5 27.5t-47.5 -9.5t-28 -32
+q-22 -45 -2 -74.5t87 -73.5q83 -53 226 -67l-51 -52q-142 -142 -191 -190q-22 -22 -22 -52.5t22 -52.5l9 -9q22 -22 52.5 -22t52.5 22l191 191q114 -115 191 -191q22 -22 52.5 -22t52.5 22l9 9q22 22 22 52.5t-22 52.5l-191 190l-52 52q141 14 225 67q67 44 87 73.5t-2 74.5
+zM1092 956q0 134 -95 229t-229 95t-229 -95t-95 -229t95 -229t229 -95t229 95t95 229zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="_575" unicode="&#xf265;" horiz-adv-x="1720" 
+d="M1565 1408q65 0 110 -45.5t45 -110.5v-519q0 -176 -68 -336t-182.5 -275t-274 -182.5t-334.5 -67.5q-176 0 -335.5 67.5t-274.5 182.5t-183 275t-68 336v519q0 64 46 110t110 46h1409zM861 344q47 0 82 33l404 388q37 35 37 85q0 49 -34.5 83.5t-83.5 34.5q-47 0 -82 -33
+l-323 -310l-323 310q-35 33 -81 33q-49 0 -83.5 -34.5t-34.5 -83.5q0 -51 36 -85l405 -388q33 -33 81 -33z" />
+    <glyph glyph-name="_576" unicode="&#xf266;" horiz-adv-x="2304" 
+d="M1494 -103l-295 695q-25 -49 -158.5 -305.5t-198.5 -389.5q-1 -1 -27.5 -0.5t-26.5 1.5q-82 193 -255.5 587t-259.5 596q-21 50 -66.5 107.5t-103.5 100.5t-102 43q0 5 -0.5 24t-0.5 27h583v-50q-39 -2 -79.5 -16t-66.5 -43t-10 -64q26 -59 216.5 -499t235.5 -540
+q31 61 140 266.5t131 247.5q-19 39 -126 281t-136 295q-38 69 -201 71v50l513 -1v-47q-60 -2 -93.5 -25t-12.5 -69q33 -70 87 -189.5t86 -187.5q110 214 173 363q24 55 -10 79.5t-129 26.5q1 7 1 25v24q64 0 170.5 0.5t180 1t92.5 0.5v-49q-62 -2 -119 -33t-90 -81
+l-213 -442q13 -33 127.5 -290t121.5 -274l441 1017q-14 38 -49.5 62.5t-65 31.5t-55.5 8v50l460 -4l1 -2l-1 -44q-139 -4 -201 -145q-526 -1216 -559 -1291h-49z" />
+    <glyph glyph-name="_577" unicode="&#xf267;" horiz-adv-x="1792" 
+d="M949 643q0 -26 -16.5 -45t-41.5 -19q-26 0 -45 16.5t-19 41.5q0 26 17 45t42 19t44 -16.5t19 -41.5zM964 585l350 581q-9 -8 -67.5 -62.5t-125.5 -116.5t-136.5 -127t-117 -110.5t-50.5 -51.5l-349 -580q7 7 67 62t126 116.5t136 127t117 111t50 50.5zM1611 640
+q0 -201 -104 -371q-3 2 -17 11t-26.5 16.5t-16.5 7.5q-13 0 -13 -13q0 -10 59 -44q-74 -112 -184.5 -190.5t-241.5 -110.5l-16 67q-1 10 -15 10q-5 0 -8 -5.5t-2 -9.5l16 -68q-72 -15 -146 -15q-199 0 -372 105q1 2 13 20.5t21.5 33.5t9.5 19q0 13 -13 13q-6 0 -17 -14.5
+t-22.5 -34.5t-13.5 -23q-113 75 -192 187.5t-110 244.5l69 15q10 3 10 15q0 5 -5.5 8t-10.5 2l-68 -15q-14 72 -14 139q0 206 109 379q2 -1 18.5 -12t30 -19t17.5 -8q13 0 13 12q0 6 -12.5 15.5t-32.5 21.5l-20 12q77 112 189 189t244 107l15 -67q2 -10 15 -10q5 0 8 5.5
+t2 10.5l-15 66q71 13 134 13q204 0 379 -109q-39 -56 -39 -65q0 -13 12 -13q11 0 48 64q111 -75 187.5 -186t107.5 -241l-56 -12q-10 -2 -10 -16q0 -5 5.5 -8t9.5 -2l57 13q14 -72 14 -140zM1696 640q0 163 -63.5 311t-170.5 255t-255 170.5t-311 63.5t-311 -63.5
+t-255 -170.5t-170.5 -255t-63.5 -311t63.5 -311t170.5 -255t255 -170.5t311 -63.5t311 63.5t255 170.5t170.5 255t63.5 311zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191
+t191 -286t71 -348z" />
+    <glyph glyph-name="_578" unicode="&#xf268;" horiz-adv-x="1792" 
+d="M893 1536q240 2 451 -120q232 -134 352 -372l-742 39q-160 9 -294 -74.5t-185 -229.5l-276 424q128 159 311 245.5t383 87.5zM146 1131l337 -663q72 -143 211 -217t293 -45l-230 -451q-212 33 -385 157.5t-272.5 316t-99.5 411.5q0 267 146 491zM1732 962
+q58 -150 59.5 -310.5t-48.5 -306t-153 -272t-246 -209.5q-230 -133 -498 -119l405 623q88 131 82.5 290.5t-106.5 277.5zM896 942q125 0 213.5 -88.5t88.5 -213.5t-88.5 -213.5t-213.5 -88.5t-213.5 88.5t-88.5 213.5t88.5 213.5t213.5 88.5z" />
+    <glyph glyph-name="_579" unicode="&#xf269;" horiz-adv-x="1792" 
+d="M903 -256q-283 0 -504.5 150.5t-329.5 398.5q-58 131 -67 301t26 332.5t111 312t179 242.5l-11 -281q11 14 68 15.5t70 -15.5q42 81 160.5 138t234.5 59q-54 -45 -119.5 -148.5t-58.5 -163.5q25 -8 62.5 -13.5t63 -7.5t68 -4t50.5 -3q15 -5 9.5 -45.5t-30.5 -75.5
+q-5 -7 -16.5 -18.5t-56.5 -35.5t-101 -34l15 -189l-139 67q-18 -43 -7.5 -81.5t36 -66.5t65.5 -41.5t81 -6.5q51 9 98 34.5t83.5 45t73.5 17.5q61 -4 89.5 -33t19.5 -65q-1 -2 -2.5 -5.5t-8.5 -12.5t-18 -15.5t-31.5 -10.5t-46.5 -1q-60 -95 -144.5 -135.5t-209.5 -29.5
+q74 -61 162.5 -82.5t168.5 -6t154.5 52t128 87.5t80.5 104q43 91 39 192.5t-37.5 188.5t-78.5 125q87 -38 137 -79.5t77 -112.5q15 170 -57.5 343t-209.5 284q265 -77 412 -279.5t151 -517.5q2 -127 -40.5 -255t-123.5 -238t-189 -196t-247.5 -135.5t-288.5 -49.5z" />
+    <glyph glyph-name="_580" unicode="&#xf26a;" horiz-adv-x="1792" 
+d="M1493 1308q-165 110 -359 110q-155 0 -293 -73t-240 -200q-75 -93 -119.5 -218t-48.5 -266v-42q4 -141 48.5 -266t119.5 -218q102 -127 240 -200t293 -73q194 0 359 110q-121 -108 -274.5 -168t-322.5 -60q-29 0 -43 1q-175 8 -333 82t-272 193t-181 281t-67 339
+q0 182 71 348t191 286t286 191t348 71h3q168 -1 320.5 -60.5t273.5 -167.5zM1792 640q0 -192 -77 -362.5t-213 -296.5q-104 -63 -222 -63q-137 0 -255 84q154 56 253.5 233t99.5 405q0 227 -99 404t-253 234q119 83 254 83q119 0 226 -65q135 -125 210.5 -295t75.5 -361z
+" />
+    <glyph glyph-name="_581" unicode="&#xf26b;" horiz-adv-x="1792" 
+d="M1792 599q0 -56 -7 -104h-1151q0 -146 109.5 -244.5t257.5 -98.5q99 0 185.5 46.5t136.5 130.5h423q-56 -159 -170.5 -281t-267.5 -188.5t-321 -66.5q-187 0 -356 83q-228 -116 -394 -116q-237 0 -237 263q0 115 45 275q17 60 109 229q199 360 475 606
+q-184 -79 -427 -354q63 274 283.5 449.5t501.5 175.5q30 0 45 -1q255 117 433 117q64 0 116 -13t94.5 -40.5t66.5 -76.5t24 -115q0 -116 -75 -286q101 -182 101 -390zM1722 1239q0 83 -53 132t-137 49q-108 0 -254 -70q121 -47 222.5 -131.5t170.5 -195.5q51 135 51 216z
+M128 2q0 -86 48.5 -132.5t134.5 -46.5q115 0 266 83q-122 72 -213.5 183t-137.5 245q-98 -205 -98 -332zM632 715h728q-5 142 -113 237t-251 95q-144 0 -251.5 -95t-112.5 -237z" />
+    <glyph glyph-name="_582" unicode="&#xf26c;" horiz-adv-x="2048" 
+d="M1792 288v960q0 13 -9.5 22.5t-22.5 9.5h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5zM1920 1248v-960q0 -66 -47 -113t-113 -47h-736v-128h352q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23
+v64q0 14 9 23t23 9h352v128h-736q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="_583" unicode="&#xf26d;" horiz-adv-x="1792" 
+d="M138 1408h197q-70 -64 -126 -149q-36 -56 -59 -115t-30 -125.5t-8.5 -120t10.5 -132t21 -126t28 -136.5q4 -19 6 -28q51 -238 81 -329q57 -171 152 -275h-272q-48 0 -82 34t-34 82v1304q0 48 34 82t82 34zM1346 1408h308q48 0 82 -34t34 -82v-1304q0 -48 -34 -82t-82 -34
+h-178q212 210 196 565l-469 -101q-2 -45 -12 -82t-31 -72t-59.5 -59.5t-93.5 -36.5q-123 -26 -199 40q-32 27 -53 61t-51.5 129t-64.5 258q-35 163 -45.5 263t-5.5 139t23 77q20 41 62.5 73t102.5 45q45 12 83.5 6.5t67 -17t54 -35t43 -48t34.5 -56.5l468 100
+q-68 175 -180 287z" />
+    <glyph glyph-name="_584" unicode="&#xf26e;" 
+d="M1401 -11l-6 -6q-113 -113 -259 -175q-154 -64 -317 -64q-165 0 -317 64q-148 63 -259 175q-113 112 -175 258q-42 103 -54 189q-4 28 48 36q51 8 56 -20q1 -1 1 -4q18 -90 46 -159q50 -124 152 -226q98 -98 226 -152q132 -56 276 -56q143 0 276 56q128 55 225 152l6 6
+q10 10 25 6q12 -3 33 -22q36 -37 17 -58zM929 604l-66 -66l63 -63q21 -21 -7 -49q-17 -17 -32 -17q-10 0 -19 10l-62 61l-66 -66q-5 -5 -15 -5q-15 0 -31 16l-2 2q-18 15 -18 29q0 7 8 17l66 65l-66 66q-16 16 14 45q18 18 31 18q6 0 13 -5l65 -66l65 65q18 17 48 -13
+q27 -27 11 -44zM1400 547q0 -118 -46 -228q-45 -105 -126 -186q-80 -80 -187 -126t-228 -46t-228 46t-187 126q-82 82 -125 186q-15 33 -15 40h-1q-9 27 43 44q50 16 60 -12q37 -99 97 -167h1v339v2q3 136 102 232q105 103 253 103q147 0 251 -103t104 -249
+q0 -147 -104.5 -251t-250.5 -104q-58 0 -112 16q-28 11 -13 61q16 51 44 43l14 -3q14 -3 33 -6t30 -3q104 0 176 71.5t72 174.5q0 101 -72 171q-71 71 -175 71q-107 0 -178 -80q-64 -72 -64 -160v-413q110 -67 242 -67q96 0 185 36.5t156 103.5t103.5 155t36.5 183
+q0 198 -141 339q-140 140 -339 140q-200 0 -340 -140q-53 -53 -77 -87l-2 -2q-8 -11 -13 -15.5t-21.5 -9.5t-38.5 3q-21 5 -36.5 16.5t-15.5 26.5v680q0 15 10.5 26.5t27.5 11.5h877q30 0 30 -55t-30 -55h-811v-483h1q40 42 102 84t108 61q109 46 231 46q121 0 228 -46
+t187 -126q81 -81 126 -186q46 -112 46 -229zM1369 1128q9 -8 9 -18t-5.5 -18t-16.5 -21q-26 -26 -39 -26q-9 0 -16 7q-106 91 -207 133q-128 56 -276 56q-133 0 -262 -49q-27 -10 -45 37q-9 25 -8 38q3 16 16 20q130 57 299 57q164 0 316 -64q137 -58 235 -152z" />
+    <glyph glyph-name="_585" unicode="&#xf270;" horiz-adv-x="1792" 
+d="M1551 60q15 6 26 3t11 -17.5t-15 -33.5q-13 -16 -44 -43.5t-95.5 -68t-141 -74t-188 -58t-229.5 -24.5q-119 0 -238 31t-209 76.5t-172.5 104t-132.5 105t-84 87.5q-8 9 -10 16.5t1 12t8 7t11.5 2t11.5 -4.5q192 -117 300 -166q389 -176 799 -90q190 40 391 135z
+M1758 175q11 -16 2.5 -69.5t-28.5 -102.5q-34 -83 -85 -124q-17 -14 -26 -9t0 24q21 45 44.5 121.5t6.5 98.5q-5 7 -15.5 11.5t-27 6t-29.5 2.5t-35 0t-31.5 -2t-31 -3t-22.5 -2q-6 -1 -13 -1.5t-11 -1t-8.5 -1t-7 -0.5h-5.5h-4.5t-3 0.5t-2 1.5l-1.5 3q-6 16 47 40t103 30
+q46 7 108 1t76 -24zM1364 618q0 -31 13.5 -64t32 -58t37.5 -46t33 -32l13 -11l-227 -224q-40 37 -79 75.5t-58 58.5l-19 20q-11 11 -25 33q-38 -59 -97.5 -102.5t-127.5 -63.5t-140 -23t-137.5 21t-117.5 65.5t-83 113t-31 162.5q0 84 28 154t72 116.5t106.5 83t122.5 57
+t130 34.5t119.5 18.5t99.5 6.5v127q0 65 -21 97q-34 53 -121 53q-6 0 -16.5 -1t-40.5 -12t-56 -29.5t-56 -59.5t-48 -96l-294 27q0 60 22 119t67 113t108 95t151.5 65.5t190.5 24.5q100 0 181 -25t129.5 -61.5t81 -83t45 -86t12.5 -73.5v-589zM692 597q0 -86 70 -133
+q66 -44 139 -22q84 25 114 123q14 45 14 101v162q-59 -2 -111 -12t-106.5 -33.5t-87 -71t-32.5 -114.5z" />
+    <glyph glyph-name="_586" unicode="&#xf271;" horiz-adv-x="1792" 
+d="M1536 1280q52 0 90 -38t38 -90v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128zM1152 1376v-288q0 -14 9 -23t23 -9
+h64q14 0 23 9t9 23v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM384 1376v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM1536 -128v1024h-1408v-1024h1408zM896 448h224q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-224
+v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-224q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v224q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-224z" />
+    <glyph glyph-name="_587" unicode="&#xf272;" horiz-adv-x="1792" 
+d="M1152 416v-64q0 -14 -9 -23t-23 -9h-576q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h576q14 0 23 -9t9 -23zM128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23
+t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47
+t47 -113v-96h128q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="_588" unicode="&#xf273;" horiz-adv-x="1792" 
+d="M1111 151l-46 -46q-9 -9 -22 -9t-23 9l-188 189l-188 -189q-10 -9 -23 -9t-22 9l-46 46q-9 9 -9 22t9 23l189 188l-189 188q-9 10 -9 23t9 22l46 46q9 9 22 9t23 -9l188 -188l188 188q10 9 23 9t22 -9l46 -46q9 -9 9 -22t-9 -23l-188 -188l188 -188q9 -10 9 -23t-9 -22z
+M128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280
+q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="_589" unicode="&#xf274;" horiz-adv-x="1792" 
+d="M1303 572l-512 -512q-10 -9 -23 -9t-23 9l-288 288q-9 10 -9 23t9 22l46 46q9 9 22 9t23 -9l220 -220l444 444q10 9 23 9t22 -9l46 -46q9 -9 9 -22t-9 -23zM128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23
+t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47
+t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="_590" unicode="&#xf275;" horiz-adv-x="1792" 
+d="M448 1536q26 0 45 -19t19 -45v-891l536 429q17 14 40 14q26 0 45 -19t19 -45v-379l536 429q17 14 40 14q26 0 45 -19t19 -45v-1152q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h384z" />
+    <glyph glyph-name="_591" unicode="&#xf276;" horiz-adv-x="1024" 
+d="M512 448q66 0 128 15v-655q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v655q62 -15 128 -15zM512 1536q212 0 362 -150t150 -362t-150 -362t-362 -150t-362 150t-150 362t150 362t362 150zM512 1312q14 0 23 9t9 23t-9 23t-23 9q-146 0 -249 -103t-103 -249
+q0 -14 9 -23t23 -9t23 9t9 23q0 119 84.5 203.5t203.5 84.5z" />
+    <glyph glyph-name="_592" unicode="&#xf277;" horiz-adv-x="1792" 
+d="M1745 1239q10 -10 10 -23t-10 -23l-141 -141q-28 -28 -68 -28h-1344q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h576v64q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-64h512q40 0 68 -28zM768 320h256v-512q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v512zM1600 768
+q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19h-1344q-40 0 -68 28l-141 141q-10 10 -10 23t10 23l141 141q28 28 68 28h512v192h256v-192h576z" />
+    <glyph glyph-name="_593" unicode="&#xf278;" horiz-adv-x="2048" 
+d="M2020 1525q28 -20 28 -53v-1408q0 -20 -11 -36t-29 -23l-640 -256q-24 -11 -48 0l-616 246l-616 -246q-10 -5 -24 -5q-19 0 -36 11q-28 20 -28 53v1408q0 20 11 36t29 23l640 256q24 11 48 0l616 -246l616 246q32 13 60 -6zM736 1390v-1270l576 -230v1270zM128 1173
+v-1270l544 217v1270zM1920 107v1270l-544 -217v-1270z" />
+    <glyph glyph-name="_594" unicode="&#xf279;" horiz-adv-x="1792" 
+d="M512 1536q13 0 22.5 -9.5t9.5 -22.5v-1472q0 -20 -17 -28l-480 -256q-7 -4 -15 -4q-13 0 -22.5 9.5t-9.5 22.5v1472q0 20 17 28l480 256q7 4 15 4zM1760 1536q13 0 22.5 -9.5t9.5 -22.5v-1472q0 -20 -17 -28l-480 -256q-7 -4 -15 -4q-13 0 -22.5 9.5t-9.5 22.5v1472
+q0 20 17 28l480 256q7 4 15 4zM640 1536q8 0 14 -3l512 -256q18 -10 18 -29v-1472q0 -13 -9.5 -22.5t-22.5 -9.5q-8 0 -14 3l-512 256q-18 10 -18 29v1472q0 13 9.5 22.5t22.5 9.5z" />
+    <glyph glyph-name="_595" unicode="&#xf27a;" horiz-adv-x="1792" 
+d="M640 640q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 640q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1408 640q0 53 -37.5 90.5t-90.5 37.5
+t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1792 640q0 -174 -120 -321.5t-326 -233t-450 -85.5q-110 0 -211 18q-173 -173 -435 -229q-52 -10 -86 -13q-12 -1 -22 6t-13 18q-4 15 20 37q5 5 23.5 21.5t25.5 23.5t23.5 25.5t24 31.5t20.5 37
+t20 48t14.5 57.5t12.5 72.5q-146 90 -229.5 216.5t-83.5 269.5q0 174 120 321.5t326 233t450 85.5t450 -85.5t326 -233t120 -321.5z" />
+    <glyph glyph-name="_596" unicode="&#xf27b;" horiz-adv-x="1792" 
+d="M640 640q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1024 640q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 -53 -37.5 -90.5t-90.5 -37.5
+t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM896 1152q-204 0 -381.5 -69.5t-282 -187.5t-104.5 -255q0 -112 71.5 -213.5t201.5 -175.5l87 -50l-27 -96q-24 -91 -70 -172q152 63 275 171l43 38l57 -6q69 -8 130 -8q204 0 381.5 69.5t282 187.5
+t104.5 255t-104.5 255t-282 187.5t-381.5 69.5zM1792 640q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22h-5q-15 0 -27 10.5t-16 27.5v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51
+t27 59t26 76q-157 89 -247.5 220t-90.5 281q0 130 71 248.5t191 204.5t286 136.5t348 50.5t348 -50.5t286 -136.5t191 -204.5t71 -248.5z" />
+    <glyph glyph-name="_597" unicode="&#xf27c;" horiz-adv-x="1024" 
+d="M512 345l512 295v-591l-512 -296v592zM0 640v-591l512 296zM512 1527v-591l-512 -296v591zM512 936l512 295v-591z" />
+    <glyph glyph-name="_598" unicode="&#xf27d;" horiz-adv-x="1792" 
+d="M1709 1018q-10 -236 -332 -651q-333 -431 -562 -431q-142 0 -240 263q-44 160 -132 482q-72 262 -157 262q-18 0 -127 -76l-77 98q24 21 108 96.5t130 115.5q156 138 241 146q95 9 153 -55.5t81 -203.5q44 -287 66 -373q55 -249 120 -249q51 0 154 161q101 161 109 246
+q13 139 -109 139q-57 0 -121 -26q120 393 459 382q251 -8 236 -326z" />
+    <glyph glyph-name="f27e" unicode="&#xf27e;" 
+d="M0 1408h1536v-1536h-1536v1536zM1085 293l-221 631l221 297h-634l221 -297l-221 -631l317 -304z" />
+    <glyph glyph-name="uniF280" unicode="&#xf280;" 
+d="M0 1408h1536v-1536h-1536v1536zM908 1088l-12 -33l75 -83l-31 -114l25 -25l107 57l107 -57l25 25l-31 114l75 83l-12 33h-95l-53 96h-32l-53 -96h-95zM641 925q32 0 44.5 -16t11.5 -63l174 21q0 55 -17.5 92.5t-50.5 56t-69 25.5t-85 7q-133 0 -199 -57.5t-66 -182.5v-72
+h-96v-128h76q20 0 20 -8v-382q0 -14 -5 -20t-18 -7l-73 -7v-88h448v86l-149 14q-6 1 -8.5 1.5t-3.5 2.5t-0.5 4t1 7t0.5 10v387h191l38 128h-231q-6 0 -2 6t4 9v80q0 27 1.5 40.5t7.5 28t19.5 20t36.5 5.5zM1248 96v86l-54 9q-7 1 -9.5 2.5t-2.5 3t1 7.5t1 12v520h-275
+l-23 -101l83 -22q23 -7 23 -27v-370q0 -14 -6 -18.5t-20 -6.5l-70 -9v-86h352z" />
+    <glyph glyph-name="uniF281" unicode="&#xf281;" horiz-adv-x="1792" 
+d="M1792 690q0 -58 -29.5 -105.5t-79.5 -72.5q12 -46 12 -96q0 -155 -106.5 -287t-290.5 -208.5t-400 -76.5t-399.5 76.5t-290 208.5t-106.5 287q0 47 11 94q-51 25 -82 73.5t-31 106.5q0 82 58 140.5t141 58.5q85 0 145 -63q218 152 515 162l116 521q3 13 15 21t26 5
+l369 -81q18 37 54 59.5t79 22.5q62 0 106 -43.5t44 -105.5t-44 -106t-106 -44t-105.5 43.5t-43.5 105.5l-334 74l-104 -472q300 -9 519 -160q58 61 143 61q83 0 141 -58.5t58 -140.5zM418 491q0 -62 43.5 -106t105.5 -44t106 44t44 106t-44 105.5t-106 43.5q-61 0 -105 -44
+t-44 -105zM1228 136q11 11 11 26t-11 26q-10 10 -25 10t-26 -10q-41 -42 -121 -62t-160 -20t-160 20t-121 62q-11 10 -26 10t-25 -10q-11 -10 -11 -25.5t11 -26.5q43 -43 118.5 -68t122.5 -29.5t91 -4.5t91 4.5t122.5 29.5t118.5 68zM1225 341q62 0 105.5 44t43.5 106
+q0 61 -44 105t-105 44q-62 0 -106 -43.5t-44 -105.5t44 -106t106 -44z" />
+    <glyph glyph-name="_602" unicode="&#xf282;" horiz-adv-x="1792" 
+d="M69 741h1q16 126 58.5 241.5t115 217t167.5 176t223.5 117.5t276.5 43q231 0 414 -105.5t294 -303.5q104 -187 104 -442v-188h-1125q1 -111 53.5 -192.5t136.5 -122.5t189.5 -57t213 -3t208 46.5t173.5 84.5v-377q-92 -55 -229.5 -92t-312.5 -38t-316 53
+q-189 73 -311.5 249t-124.5 372q-3 242 111 412t325 268q-48 -60 -78 -125.5t-46 -159.5h635q8 77 -8 140t-47 101.5t-70.5 66.5t-80.5 41t-75 20.5t-56 8.5l-22 1q-135 -5 -259.5 -44.5t-223.5 -104.5t-176 -140.5t-138 -163.5z" />
+    <glyph glyph-name="_603" unicode="&#xf283;" horiz-adv-x="2304" 
+d="M0 32v608h2304v-608q0 -66 -47 -113t-113 -47h-1984q-66 0 -113 47t-47 113zM640 256v-128h384v128h-384zM256 256v-128h256v128h-256zM2144 1408q66 0 113 -47t47 -113v-224h-2304v224q0 66 47 113t113 47h1984z" />
+    <glyph glyph-name="_604" unicode="&#xf284;" horiz-adv-x="1792" 
+d="M1584 246l-218 111q-74 -120 -196.5 -189t-263.5 -69q-147 0 -271 72t-196 196t-72 270q0 110 42.5 209.5t115 172t172 115t209.5 42.5q131 0 247.5 -60.5t192.5 -168.5l215 125q-110 169 -286.5 265t-378.5 96q-161 0 -308 -63t-253 -169t-169 -253t-63 -308t63 -308
+t169 -253t253 -169t308 -63q213 0 397.5 107t290.5 292zM1030 643l693 -352q-116 -253 -334.5 -400t-492.5 -147q-182 0 -348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71q260 0 470.5 -133.5t335.5 -366.5zM1543 640h-39v-160h-96v352h136q32 0 54.5 -20
+t28.5 -48t1 -56t-27.5 -48t-57.5 -20z" />
+    <glyph glyph-name="uniF285" unicode="&#xf285;" horiz-adv-x="1792" 
+d="M1427 827l-614 386l92 151h855zM405 562l-184 116v858l1183 -743zM1424 697l147 -95v-858l-532 335zM1387 718l-500 -802h-855l356 571z" />
+    <glyph glyph-name="uniF286" unicode="&#xf286;" horiz-adv-x="1792" 
+d="M640 528v224q0 16 -16 16h-96q-16 0 -16 -16v-224q0 -16 16 -16h96q16 0 16 16zM1152 528v224q0 16 -16 16h-96q-16 0 -16 -16v-224q0 -16 16 -16h96q16 0 16 16zM1664 496v-752h-640v320q0 80 -56 136t-136 56t-136 -56t-56 -136v-320h-640v752q0 16 16 16h96
+q16 0 16 -16v-112h128v624q0 16 16 16h96q16 0 16 -16v-112h128v112q0 16 16 16h96q16 0 16 -16v-112h128v112q0 6 2.5 9.5t8.5 5t9.5 2t11.5 0t9 -0.5v391q-32 15 -32 50q0 23 16.5 39t38.5 16t38.5 -16t16.5 -39q0 -35 -32 -50v-17q45 10 83 10q21 0 59.5 -7.5t54.5 -7.5
+q17 0 47 7.5t37 7.5q16 0 16 -16v-210q0 -15 -35 -21.5t-62 -6.5q-18 0 -54.5 7.5t-55.5 7.5q-40 0 -90 -12v-133q1 0 9 0.5t11.5 0t9.5 -2t8.5 -5t2.5 -9.5v-112h128v112q0 16 16 16h96q16 0 16 -16v-112h128v112q0 16 16 16h96q16 0 16 -16v-624h128v112q0 16 16 16h96
+q16 0 16 -16z" />
+    <glyph glyph-name="_607" unicode="&#xf287;" horiz-adv-x="2304" 
+d="M2288 731q16 -8 16 -27t-16 -27l-320 -192q-8 -5 -16 -5q-9 0 -16 4q-16 10 -16 28v128h-858q37 -58 83 -165q16 -37 24.5 -55t24 -49t27 -47t27 -34t31.5 -26t33 -8h96v96q0 14 9 23t23 9h320q14 0 23 -9t9 -23v-320q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23v96h-96
+q-32 0 -61 10t-51 23.5t-45 40.5t-37 46t-33.5 57t-28.5 57.5t-28 60.5q-23 53 -37 81.5t-36 65t-44.5 53.5t-46.5 17h-360q-22 -84 -91 -138t-157 -54q-106 0 -181 75t-75 181t75 181t181 75q88 0 157 -54t91 -138h104q24 0 46.5 17t44.5 53.5t36 65t37 81.5q19 41 28 60.5
+t28.5 57.5t33.5 57t37 46t45 40.5t51 23.5t61 10h107q21 57 70 92.5t111 35.5q80 0 136 -56t56 -136t-56 -136t-136 -56q-62 0 -111 35.5t-70 92.5h-107q-17 0 -33 -8t-31.5 -26t-27 -34t-27 -47t-24 -49t-24.5 -55q-46 -107 -83 -165h1114v128q0 18 16 28t32 -1z" />
+    <glyph glyph-name="_608" unicode="&#xf288;" horiz-adv-x="1792" 
+d="M1150 774q0 -56 -39.5 -95t-95.5 -39h-253v269h253q56 0 95.5 -39.5t39.5 -95.5zM1329 774q0 130 -91.5 222t-222.5 92h-433v-896h180v269h253q130 0 222 91.5t92 221.5zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348
+t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="_609" unicode="&#xf289;" horiz-adv-x="2304" 
+d="M1645 438q0 59 -34 106.5t-87 68.5q-7 -45 -23 -92q-7 -24 -27.5 -38t-44.5 -14q-12 0 -24 3q-31 10 -45 38.5t-4 58.5q23 71 23 143q0 123 -61 227.5t-166 165.5t-228 61q-134 0 -247 -73t-167 -194q108 -28 188 -106q22 -23 22 -55t-22 -54t-54 -22t-55 22
+q-75 75 -180 75q-106 0 -181 -74.5t-75 -180.5t75 -180.5t181 -74.5h1046q79 0 134.5 55.5t55.5 133.5zM1798 438q0 -142 -100.5 -242t-242.5 -100h-1046q-169 0 -289 119.5t-120 288.5q0 153 100 267t249 136q62 184 221 298t354 114q235 0 408.5 -158.5t196.5 -389.5
+q116 -25 192.5 -118.5t76.5 -214.5zM2048 438q0 -175 -97 -319q-23 -33 -64 -33q-24 0 -43 13q-26 17 -32 48.5t12 57.5q71 104 71 233t-71 233q-18 26 -12 57t32 49t57.5 11.5t49.5 -32.5q97 -142 97 -318zM2304 438q0 -244 -134 -443q-23 -34 -64 -34q-23 0 -42 13
+q-26 18 -32.5 49t11.5 57q108 164 108 358q0 195 -108 357q-18 26 -11.5 57.5t32.5 48.5q26 18 57 12t49 -33q134 -198 134 -442z" />
+    <glyph glyph-name="_610" unicode="&#xf28a;" 
+d="M1500 -13q0 -89 -63 -152.5t-153 -63.5t-153.5 63.5t-63.5 152.5q0 90 63.5 153.5t153.5 63.5t153 -63.5t63 -153.5zM1267 268q-115 -15 -192.5 -102.5t-77.5 -205.5q0 -74 33 -138q-146 -78 -379 -78q-109 0 -201 21t-153.5 54.5t-110.5 76.5t-76 85t-44.5 83
+t-23.5 66.5t-6 39.5q0 19 4.5 42.5t18.5 56t36.5 58t64 43.5t94.5 18t94 -17.5t63 -41t35.5 -53t17.5 -49t4 -33.5q0 -34 -23 -81q28 -27 82 -42t93 -17l40 -1q115 0 190 51t75 133q0 26 -9 48.5t-31.5 44.5t-49.5 41t-74 44t-93.5 47.5t-119.5 56.5q-28 13 -43 20
+q-116 55 -187 100t-122.5 102t-72 125.5t-20.5 162.5q0 78 20.5 150t66 137.5t112.5 114t166.5 77t221.5 28.5q120 0 220 -26t164.5 -67t109.5 -94t64 -105.5t19 -103.5q0 -46 -15 -82.5t-36.5 -58t-48.5 -36t-49 -19.5t-39 -5h-8h-32t-39 5t-44 14t-41 28t-37 46t-24 70.5
+t-10 97.5q-15 16 -59 25.5t-81 10.5l-37 1q-68 0 -117.5 -31t-70.5 -70t-21 -76q0 -24 5 -43t24 -46t53 -51t97 -53.5t150 -58.5q76 -25 138.5 -53.5t109 -55.5t83 -59t60.5 -59.5t41 -62.5t26.5 -62t14.5 -63.5t6 -62t1 -62.5z" />
+    <glyph glyph-name="_611" unicode="&#xf28b;" 
+d="M704 352v576q0 14 -9 23t-23 9h-256q-14 0 -23 -9t-9 -23v-576q0 -14 9 -23t23 -9h256q14 0 23 9t9 23zM1152 352v576q0 14 -9 23t-23 9h-256q-14 0 -23 -9t-9 -23v-576q0 -14 9 -23t23 -9h256q14 0 23 9t9 23zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103
+t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="_612" unicode="&#xf28c;" 
+d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM768 96q148 0 273 73t198 198t73 273t-73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273
+t73 -273t198 -198t273 -73zM864 320q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-192zM480 320q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-192z" />
+    <glyph glyph-name="_613" unicode="&#xf28d;" 
+d="M1088 352v576q0 14 -9 23t-23 9h-576q-14 0 -23 -9t-9 -23v-576q0 -14 9 -23t23 -9h576q14 0 23 9t9 23zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5
+t103 -385.5z" />
+    <glyph glyph-name="_614" unicode="&#xf28e;" 
+d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM768 96q148 0 273 73t198 198t73 273t-73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273
+t73 -273t198 -198t273 -73zM480 320q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h576q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-576z" />
+    <glyph glyph-name="_615" unicode="&#xf290;" horiz-adv-x="1792" 
+d="M1757 128l35 -313q3 -28 -16 -50q-19 -21 -48 -21h-1664q-29 0 -48 21q-19 22 -16 50l35 313h1722zM1664 967l86 -775h-1708l86 775q3 24 21 40.5t43 16.5h256v-128q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5v128h384v-128q0 -53 37.5 -90.5t90.5 -37.5
+t90.5 37.5t37.5 90.5v128h256q25 0 43 -16.5t21 -40.5zM1280 1152v-256q0 -26 -19 -45t-45 -19t-45 19t-19 45v256q0 106 -75 181t-181 75t-181 -75t-75 -181v-256q0 -26 -19 -45t-45 -19t-45 19t-19 45v256q0 159 112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5z" />
+    <glyph glyph-name="_616" unicode="&#xf291;" horiz-adv-x="2048" 
+d="M1920 768q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5h-15l-115 -662q-8 -46 -44 -76t-82 -30h-1280q-46 0 -82 30t-44 76l-115 662h-15q-53 0 -90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5h1792zM485 -32q26 2 43.5 22.5t15.5 46.5l-32 416q-2 26 -22.5 43.5
+t-46.5 15.5t-43.5 -22.5t-15.5 -46.5l32 -416q2 -25 20.5 -42t43.5 -17h5zM896 32v416q0 26 -19 45t-45 19t-45 -19t-19 -45v-416q0 -26 19 -45t45 -19t45 19t19 45zM1280 32v416q0 26 -19 45t-45 19t-45 -19t-19 -45v-416q0 -26 19 -45t45 -19t45 19t19 45zM1632 27l32 416
+q2 26 -15.5 46.5t-43.5 22.5t-46.5 -15.5t-22.5 -43.5l-32 -416q-2 -26 15.5 -46.5t43.5 -22.5h5q25 0 43.5 17t20.5 42zM476 1244l-93 -412h-132l101 441q19 88 89 143.5t160 55.5h167q0 26 19 45t45 19h384q26 0 45 -19t19 -45h167q90 0 160 -55.5t89 -143.5l101 -441
+h-132l-93 412q-11 44 -45.5 72t-79.5 28h-167q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45h-167q-45 0 -79.5 -28t-45.5 -72z" />
+    <glyph glyph-name="_617" unicode="&#xf292;" horiz-adv-x="1792" 
+d="M991 512l64 256h-254l-64 -256h254zM1759 1016l-56 -224q-7 -24 -31 -24h-327l-64 -256h311q15 0 25 -12q10 -14 6 -28l-56 -224q-5 -24 -31 -24h-327l-81 -328q-7 -24 -31 -24h-224q-16 0 -26 12q-9 12 -6 28l78 312h-254l-81 -328q-7 -24 -31 -24h-225q-15 0 -25 12
+q-9 12 -6 28l78 312h-311q-15 0 -25 12q-9 12 -6 28l56 224q7 24 31 24h327l64 256h-311q-15 0 -25 12q-10 14 -6 28l56 224q5 24 31 24h327l81 328q7 24 32 24h224q15 0 25 -12q9 -12 6 -28l-78 -312h254l81 328q7 24 32 24h224q15 0 25 -12q9 -12 6 -28l-78 -312h311
+q15 0 25 -12q9 -12 6 -28z" />
+    <glyph glyph-name="_618" unicode="&#xf293;" 
+d="M841 483l148 -148l-149 -149zM840 1094l149 -149l-148 -148zM710 -130l464 464l-306 306l306 306l-464 464v-611l-255 255l-93 -93l320 -321l-320 -321l93 -93l255 255v-611zM1429 640q0 -209 -32 -365.5t-87.5 -257t-140.5 -162.5t-181.5 -86.5t-219.5 -24.5
+t-219.5 24.5t-181.5 86.5t-140.5 162.5t-87.5 257t-32 365.5t32 365.5t87.5 257t140.5 162.5t181.5 86.5t219.5 24.5t219.5 -24.5t181.5 -86.5t140.5 -162.5t87.5 -257t32 -365.5z" />
+    <glyph glyph-name="_619" unicode="&#xf294;" horiz-adv-x="1024" 
+d="M596 113l173 172l-173 172v-344zM596 823l173 172l-173 172v-344zM628 640l356 -356l-539 -540v711l-297 -296l-108 108l372 373l-372 373l108 108l297 -296v711l539 -540z" />
+    <glyph glyph-name="_620" unicode="&#xf295;" 
+d="M1280 256q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM512 1024q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM1536 256q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5
+t112.5 -271.5zM1440 1344q0 -20 -13 -38l-1056 -1408q-19 -26 -51 -26h-160q-26 0 -45 19t-19 45q0 20 13 38l1056 1408q19 26 51 26h160q26 0 45 -19t19 -45zM768 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5
+t271.5 -112.5t112.5 -271.5z" />
+    <glyph glyph-name="_621" unicode="&#xf296;" horiz-adv-x="1792" 
+d="M104 830l792 -1015l-868 630q-18 13 -25 34.5t0 42.5l101 308v0zM566 830h660l-330 -1015v0zM368 1442l198 -612h-462l198 612q8 23 33 23t33 -23zM1688 830l101 -308q7 -21 0 -42.5t-25 -34.5l-868 -630l792 1015v0zM1688 830h-462l198 612q8 23 33 23t33 -23z" />
+    <glyph glyph-name="_622" unicode="&#xf297;" horiz-adv-x="1792" 
+d="M384 704h160v224h-160v-224zM1221 372v92q-104 -36 -243 -38q-135 -1 -259.5 46.5t-220.5 122.5l1 -96q88 -80 212 -128.5t272 -47.5q129 0 238 49zM640 704h640v224h-640v-224zM1792 736q0 -187 -99 -352q89 -102 89 -229q0 -157 -129.5 -268t-313.5 -111
+q-122 0 -225 52.5t-161 140.5q-19 -1 -57 -1t-57 1q-58 -88 -161 -140.5t-225 -52.5q-184 0 -313.5 111t-129.5 268q0 127 89 229q-99 165 -99 352q0 209 120 385.5t326.5 279.5t449.5 103t449.5 -103t326.5 -279.5t120 -385.5z" />
+    <glyph glyph-name="_623" unicode="&#xf298;" 
+d="M515 625v-128h-252v128h252zM515 880v-127h-252v127h252zM1273 369v-128h-341v128h341zM1273 625v-128h-672v128h672zM1273 880v-127h-672v127h672zM1408 20v1240q0 8 -6 14t-14 6h-32l-378 -256l-210 171l-210 -171l-378 256h-32q-8 0 -14 -6t-6 -14v-1240q0 -8 6 -14
+t14 -6h1240q8 0 14 6t6 14zM553 1130l185 150h-406zM983 1130l221 150h-406zM1536 1260v-1240q0 -62 -43 -105t-105 -43h-1240q-62 0 -105 43t-43 105v1240q0 62 43 105t105 43h1240q62 0 105 -43t43 -105z" />
+    <glyph glyph-name="_624" unicode="&#xf299;" horiz-adv-x="1792" 
+d="M896 720q-104 196 -160 278q-139 202 -347 318q-34 19 -70 36q-89 40 -94 32t34 -38l39 -31q62 -43 112.5 -93.5t94.5 -116.5t70.5 -113t70.5 -131q9 -17 13 -25q44 -84 84 -153t98 -154t115.5 -150t131 -123.5t148.5 -90.5q153 -66 154 -60q1 3 -49 37q-53 36 -81 57
+q-77 58 -179 211t-185 310zM549 177q-76 60 -132.5 125t-98 143.5t-71 154.5t-58.5 186t-52 209t-60.5 252t-76.5 289q273 0 497.5 -36t379 -92t271 -144.5t185.5 -172.5t110 -198.5t56 -199.5t12.5 -198.5t-9.5 -173t-20 -143.5t-13 -107l323 -327h-104l-281 285
+q-22 -2 -91.5 -14t-121.5 -19t-138 -6t-160.5 17t-167.5 59t-179 111z" />
+    <glyph glyph-name="_625" unicode="&#xf29a;" horiz-adv-x="1792" 
+d="M1374 879q-6 26 -28.5 39.5t-48.5 7.5q-261 -62 -401 -62t-401 62q-26 6 -48.5 -7.5t-28.5 -39.5t7.5 -48.5t39.5 -28.5q194 -46 303 -58q-2 -158 -15.5 -269t-26.5 -155.5t-41 -115.5l-9 -21q-10 -25 1 -49t36 -34q9 -4 23 -4q44 0 60 41l8 20q54 139 71 259h42
+q17 -120 71 -259l8 -20q16 -41 60 -41q14 0 23 4q25 10 36 34t1 49l-9 21q-28 71 -41 115.5t-26.5 155.5t-15.5 269q109 12 303 58q26 6 39.5 28.5t7.5 48.5zM1024 1024q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5z
+M1600 640q0 -143 -55.5 -273.5t-150 -225t-225 -150t-273.5 -55.5t-273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5zM896 1408q-156 0 -298 -61t-245 -164t-164 -245t-61 -298t61 -298
+t164 -245t245 -164t298 -61t298 61t245 164t164 245t61 298t-61 298t-164 245t-245 164t-298 61zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="_626" unicode="&#xf29b;" 
+d="M1438 723q34 -35 29 -82l-44 -551q-4 -42 -34.5 -70t-71.5 -28q-6 0 -9 1q-44 3 -72.5 36.5t-25.5 77.5l35 429l-143 -8q55 -113 55 -240q0 -216 -148 -372l-137 137q91 101 91 235q0 145 -102.5 248t-247.5 103q-134 0 -236 -92l-137 138q120 114 284 141l264 300
+l-149 87l-181 -161q-33 -30 -77 -27.5t-73 35.5t-26.5 77t34.5 73l239 213q26 23 60 26.5t64 -14.5l488 -283q36 -21 48 -68q17 -67 -26 -117l-205 -232l371 20q49 3 83 -32zM1240 1180q-74 0 -126 52t-52 126t52 126t126 52t126.5 -52t52.5 -126t-52.5 -126t-126.5 -52z
+M613 -62q106 0 196 61l139 -139q-146 -116 -335 -116q-148 0 -273.5 73t-198.5 198t-73 273q0 188 116 336l139 -139q-60 -88 -60 -197q0 -145 102.5 -247.5t247.5 -102.5z" />
+    <glyph glyph-name="_627" unicode="&#xf29c;" 
+d="M880 336v-160q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v160q0 14 9 23t23 9h160q14 0 23 -9t9 -23zM1136 832q0 -50 -15 -90t-45.5 -69t-52 -44t-59.5 -36q-32 -18 -46.5 -28t-26 -24t-11.5 -29v-32q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v68q0 35 10.5 64.5
+t24 47.5t39 35.5t41 25.5t44.5 21q53 25 75 43t22 49q0 42 -43.5 71.5t-95.5 29.5q-56 0 -95 -27q-29 -20 -80 -83q-9 -12 -25 -12q-11 0 -19 6l-108 82q-10 7 -12 20t5 23q122 192 349 192q129 0 238.5 -89.5t109.5 -214.5zM768 1280q-130 0 -248.5 -51t-204 -136.5
+t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5t-51 248.5t-136.5 204t-204 136.5t-248.5 51zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5
+t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="_628" unicode="&#xf29d;" horiz-adv-x="1408" 
+d="M366 1225q-64 0 -110 45.5t-46 110.5q0 64 46 109.5t110 45.5t109.5 -45.5t45.5 -109.5q0 -65 -45.5 -110.5t-109.5 -45.5zM917 583q0 -50 -30 -67.5t-63.5 -6.5t-47.5 34l-367 438q-7 12 -14 15.5t-11 1.5l-3 -3q-7 -8 4 -21l122 -139l1 -354l-161 -457
+q-67 -192 -92 -234q-15 -26 -28 -32q-50 -26 -103 -1q-29 13 -41.5 43t-9.5 57q2 17 197 618l5 416l-85 -164l35 -222q4 -24 -1 -42t-14 -27.5t-19 -16t-17 -7.5l-7 -2q-19 -3 -34.5 3t-24 16t-14 22t-7.5 19.5t-2 9.5l-46 299l211 381q23 34 113 34q75 0 107 -40l424 -521
+q7 -5 14 -17l3 -3l-1 -1q7 -13 7 -29zM514 433q43 -113 88.5 -225t69.5 -168l24 -55q36 -93 42 -125q11 -70 -36 -97q-35 -22 -66 -16t-51 22t-29 35h-1q-6 16 -8 25l-124 351zM1338 -159q31 -49 31 -57q0 -5 -3 -7q-9 -5 -14.5 0.5t-15.5 26t-16 30.5q-114 172 -423 661
+q3 -1 7 1t7 4l3 2q11 9 11 17z" />
+    <glyph glyph-name="_629" unicode="&#xf29e;" horiz-adv-x="2304" 
+d="M504 542h171l-1 265zM1530 641q0 87 -50.5 140t-146.5 53h-54v-388h52q91 0 145 57t54 138zM956 1018l1 -756q0 -14 -9.5 -24t-23.5 -10h-216q-14 0 -23.5 10t-9.5 24v62h-291l-55 -81q-10 -15 -28 -15h-267q-21 0 -30.5 18t3.5 35l556 757q9 14 27 14h332q14 0 24 -10
+t10 -24zM1783 641q0 -193 -125.5 -303t-324.5 -110h-270q-14 0 -24 10t-10 24v756q0 14 10 24t24 10h268q200 0 326 -109t126 -302zM1939 640q0 -11 -0.5 -29t-8 -71.5t-21.5 -102t-44.5 -108t-73.5 -102.5h-51q38 45 66.5 104.5t41.5 112t21 98t9 72.5l1 27q0 8 -0.5 22.5
+t-7.5 60t-20 91.5t-41 111.5t-66 124.5h43q41 -47 72 -107t45.5 -111.5t23 -96t10.5 -70.5zM2123 640q0 -11 -0.5 -29t-8 -71.5t-21.5 -102t-45 -108t-74 -102.5h-51q38 45 66.5 104.5t41.5 112t21 98t9 72.5l1 27q0 8 -0.5 22.5t-7.5 60t-19.5 91.5t-40.5 111.5t-66 124.5
+h43q41 -47 72 -107t45.5 -111.5t23 -96t10.5 -70.5zM2304 640q0 -11 -0.5 -29t-8 -71.5t-21.5 -102t-44.5 -108t-73.5 -102.5h-51q38 45 66 104.5t41 112t21 98t9 72.5l1 27q0 8 -0.5 22.5t-7.5 60t-19.5 91.5t-40.5 111.5t-66 124.5h43q41 -47 72 -107t45.5 -111.5t23 -96
+t9.5 -70.5z" />
+    <glyph glyph-name="uniF2A0" unicode="&#xf2a0;" horiz-adv-x="1408" 
+d="M617 -153q0 11 -13 58t-31 107t-20 69q-1 4 -5 26.5t-8.5 36t-13.5 21.5q-15 14 -51 14q-23 0 -70 -5.5t-71 -5.5q-34 0 -47 11q-6 5 -11 15.5t-7.5 20t-6.5 24t-5 18.5q-37 128 -37 255t37 255q1 4 5 18.5t6.5 24t7.5 20t11 15.5q13 11 47 11q24 0 71 -5.5t70 -5.5
+q36 0 51 14q9 8 13.5 21.5t8.5 36t5 26.5q2 9 20 69t31 107t13 58q0 22 -43.5 52.5t-75.5 42.5q-20 8 -45 8q-34 0 -98 -18q-57 -17 -96.5 -40.5t-71 -66t-46 -70t-45.5 -94.5q-6 -12 -9 -19q-49 -107 -68 -216t-19 -244t19 -244t68 -216q56 -122 83 -161q63 -91 179 -127
+l6 -2q64 -18 98 -18q25 0 45 8q32 12 75.5 42.5t43.5 52.5zM776 760q-26 0 -45 19t-19 45.5t19 45.5q37 37 37 90q0 52 -37 91q-19 19 -19 45t19 45t45 19t45 -19q75 -75 75 -181t-75 -181q-21 -19 -45 -19zM957 579q-27 0 -45 19q-19 19 -19 45t19 45q112 114 112 272
+t-112 272q-19 19 -19 45t19 45t45 19t45 -19q150 -150 150 -362t-150 -362q-18 -19 -45 -19zM1138 398q-27 0 -45 19q-19 19 -19 45t19 45q90 91 138.5 208t48.5 245t-48.5 245t-138.5 208q-19 19 -19 45t19 45t45 19t45 -19q109 -109 167 -249t58 -294t-58 -294t-167 -249
+q-18 -19 -45 -19z" />
+    <glyph glyph-name="uniF2A1" unicode="&#xf2a1;" horiz-adv-x="2176" 
+d="M192 352q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM704 352q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM704 864q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM1472 352
+q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM1984 352q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM1472 864q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM1984 864
+q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM1984 1376q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM384 192q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 192q0 -80 -56 -136
+t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM384 704q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 704q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM384 1216q0 -80 -56 -136t-136 -56
+t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1664 192q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 1216q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM2176 192q0 -80 -56 -136t-136 -56t-136 56
+t-56 136t56 136t136 56t136 -56t56 -136zM1664 704q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM2176 704q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1664 1216q0 -80 -56 -136t-136 -56t-136 56t-56 136
+t56 136t136 56t136 -56t56 -136zM2176 1216q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136z" />
+    <glyph glyph-name="uniF2A2" unicode="&#xf2a2;" horiz-adv-x="1792" 
+d="M128 -192q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45zM320 0q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45zM365 365l256 -256l-90 -90l-256 256zM704 384q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45z
+M1411 704q0 -59 -11.5 -108.5t-37.5 -93.5t-44 -67.5t-53 -64.5q-31 -35 -45.5 -54t-33.5 -50t-26.5 -64t-7.5 -74q0 -159 -112.5 -271.5t-271.5 -112.5q-26 0 -45 19t-19 45t19 45t45 19q106 0 181 75t75 181q0 57 11.5 105.5t37 91t43.5 66.5t52 63q40 46 59.5 72
+t37.5 74.5t18 103.5q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5q0 -26 -19 -45t-45 -19t-45 19t-19 45q0 117 45.5 223.5t123 184t184 123t223.5 45.5t223.5 -45.5t184 -123t123 -184t45.5 -223.5zM896 576q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45
+t45 19t45 -19t19 -45zM1184 704q0 -26 -19 -45t-45 -19t-45 19t-19 45q0 93 -65.5 158.5t-158.5 65.5q-92 0 -158 -65.5t-66 -158.5q0 -26 -19 -45t-45 -19t-45 19t-19 45q0 146 103 249t249 103t249 -103t103 -249zM1578 993q10 -25 -1 -49t-36 -34q-9 -4 -23 -4
+q-19 0 -35.5 11t-23.5 30q-68 178 -224 295q-21 16 -25 42t12 47q17 21 43 25t47 -12q183 -137 266 -351zM1788 1074q9 -25 -1.5 -49t-35.5 -34q-11 -4 -23 -4q-44 0 -60 41q-92 238 -297 393q-22 16 -25.5 42t12.5 47q16 22 42 25.5t47 -12.5q235 -175 341 -449z" />
+    <glyph glyph-name="uniF2A3" unicode="&#xf2a3;" horiz-adv-x="2304" 
+d="M1032 576q-59 2 -84 55q-17 34 -48 53.5t-68 19.5q-53 0 -90.5 -37.5t-37.5 -90.5q0 -56 36 -89l10 -8q34 -31 82 -31q37 0 68 19.5t48 53.5q25 53 84 55zM1600 704q0 56 -36 89l-10 8q-34 31 -82 31q-37 0 -68 -19.5t-48 -53.5q-25 -53 -84 -55q59 -2 84 -55
+q17 -34 48 -53.5t68 -19.5q53 0 90.5 37.5t37.5 90.5zM1174 925q-17 -35 -55 -48t-73 4q-62 31 -134 31q-51 0 -99 -17q3 0 9.5 0.5t9.5 0.5q92 0 170.5 -50t118.5 -133q17 -36 3.5 -73.5t-49.5 -54.5q-18 -9 -39 -9q21 0 39 -9q36 -17 49.5 -54.5t-3.5 -73.5
+q-40 -83 -118.5 -133t-170.5 -50h-6q-16 2 -44 4l-290 27l-239 -120q-14 -7 -29 -7q-40 0 -57 35l-160 320q-11 23 -4 47.5t29 37.5l209 119l148 267q17 155 91.5 291.5t195.5 236.5q31 25 70.5 21.5t64.5 -34.5t21.5 -70t-34.5 -65q-70 -59 -117 -128q123 84 267 101
+q40 5 71.5 -19t35.5 -64q5 -40 -19 -71.5t-64 -35.5q-84 -10 -159 -55q46 10 99 10q115 0 218 -50q36 -18 49 -55.5t-5 -73.5zM2137 1085l160 -320q11 -23 4 -47.5t-29 -37.5l-209 -119l-148 -267q-17 -155 -91.5 -291.5t-195.5 -236.5q-26 -22 -61 -22q-45 0 -74 35
+q-25 31 -21.5 70t34.5 65q70 59 117 128q-123 -84 -267 -101q-4 -1 -12 -1q-36 0 -63.5 24t-31.5 60q-5 40 19 71.5t64 35.5q84 10 159 55q-46 -10 -99 -10q-115 0 -218 50q-36 18 -49 55.5t5 73.5q17 35 55 48t73 -4q62 -31 134 -31q51 0 99 17q-3 0 -9.5 -0.5t-9.5 -0.5
+q-92 0 -170.5 50t-118.5 133q-17 36 -3.5 73.5t49.5 54.5q18 9 39 9q-21 0 -39 9q-36 17 -49.5 54.5t3.5 73.5q40 83 118.5 133t170.5 50h6h1q14 -2 42 -4l291 -27l239 120q14 7 29 7q40 0 57 -35z" />
+    <glyph glyph-name="uniF2A4" unicode="&#xf2a4;" horiz-adv-x="1792" 
+d="M1056 704q0 -26 19 -45t45 -19t45 19t19 45q0 146 -103 249t-249 103t-249 -103t-103 -249q0 -26 19 -45t45 -19t45 19t19 45q0 93 66 158.5t158 65.5t158 -65.5t66 -158.5zM835 1280q-117 0 -223.5 -45.5t-184 -123t-123 -184t-45.5 -223.5q0 -26 19 -45t45 -19t45 19
+t19 45q0 185 131.5 316.5t316.5 131.5t316.5 -131.5t131.5 -316.5q0 -55 -18 -103.5t-37.5 -74.5t-59.5 -72q-34 -39 -52 -63t-43.5 -66.5t-37 -91t-11.5 -105.5q0 -106 -75 -181t-181 -75q-26 0 -45 -19t-19 -45t19 -45t45 -19q159 0 271.5 112.5t112.5 271.5q0 41 7.5 74
+t26.5 64t33.5 50t45.5 54q35 41 53 64.5t44 67.5t37.5 93.5t11.5 108.5q0 117 -45.5 223.5t-123 184t-184 123t-223.5 45.5zM591 561l226 -226l-579 -579q-12 -12 -29 -12t-29 12l-168 168q-12 12 -12 29t12 29zM1612 1524l168 -168q12 -12 12 -29t-12 -30l-233 -233
+l-26 -25l-71 -71q-66 153 -195 258l91 91l207 207q13 12 30 12t29 -12z" />
+    <glyph glyph-name="uniF2A5" unicode="&#xf2a5;" 
+d="M866 1021q0 -27 -13 -94q-11 -50 -31.5 -150t-30.5 -150q-2 -11 -4.5 -12.5t-13.5 -2.5q-20 -2 -31 -2q-58 0 -84 49.5t-26 113.5q0 88 35 174t103 124q28 14 51 14q28 0 36.5 -16.5t8.5 -47.5zM1352 597q0 14 -39 75.5t-52 66.5q-21 8 -34 8q-91 0 -226 -77l-2 2
+q3 22 27.5 135t24.5 178q0 233 -242 233q-24 0 -68 -6q-94 -17 -168.5 -89.5t-111.5 -166.5t-37 -189q0 -146 80.5 -225t227.5 -79q25 0 25 -3t-1 -5q-4 -34 -26 -117q-14 -52 -51.5 -101t-82.5 -49q-42 0 -42 47q0 24 10.5 47.5t25 39.5t29.5 28.5t26 20t11 8.5q0 3 -7 10
+q-24 22 -58.5 36.5t-65.5 14.5q-35 0 -63.5 -34t-41 -75t-12.5 -75q0 -88 51.5 -142t138.5 -54q82 0 155 53t117.5 126t65.5 153q6 22 15.5 66.5t14.5 66.5q3 12 14 18q118 60 227 60q48 0 127 -18q1 -1 4 -1q5 0 9.5 4.5t4.5 8.5zM1536 1120v-960q0 -119 -84.5 -203.5
+t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="uniF2A6" unicode="&#xf2a6;" horiz-adv-x="1535" 
+d="M744 1231q0 24 -2 38.5t-8.5 30t-21 23t-37.5 7.5q-39 0 -78 -23q-105 -58 -159 -190.5t-54 -269.5q0 -44 8.5 -85.5t26.5 -80.5t52.5 -62.5t81.5 -23.5q4 0 18 -0.5t20 0t16 3t15 8.5t7 16q16 77 48 231.5t48 231.5q19 91 19 146zM1498 575q0 -7 -7.5 -13.5t-15.5 -6.5
+l-6 1q-22 3 -62 11t-72 12.5t-63 4.5q-167 0 -351 -93q-15 -8 -21 -27q-10 -36 -24.5 -105.5t-22.5 -100.5q-23 -91 -70 -179.5t-112.5 -164.5t-154.5 -123t-185 -47q-135 0 -214.5 83.5t-79.5 219.5q0 53 19.5 117t63 116.5t97.5 52.5q38 0 120 -33.5t83 -61.5
+q0 -1 -16.5 -12.5t-39.5 -31t-46 -44.5t-39 -61t-16 -74q0 -33 16.5 -53t48.5 -20q45 0 85 31.5t66.5 78t48 105.5t32.5 107t16 90v9q0 2 -3.5 3.5t-8.5 1.5h-10t-10 -0.5t-6 -0.5q-227 0 -352 122.5t-125 348.5q0 108 34.5 221t96 210t156 167.5t204.5 89.5q52 9 106 9
+q374 0 374 -360q0 -98 -38 -273t-43 -211l3 -3q101 57 182.5 88t167.5 31q22 0 53 -13q19 -7 80 -102.5t61 -116.5z" />
+    <glyph glyph-name="uniF2A7" unicode="&#xf2a7;" horiz-adv-x="1664" 
+d="M831 863q32 0 59 -18l222 -148q61 -40 110 -97l146 -170q40 -46 29 -106l-72 -413q-6 -32 -29.5 -53.5t-55.5 -25.5l-527 -56l-352 -32h-9q-39 0 -67.5 28t-28.5 68q0 37 27 64t65 32l260 32h-448q-41 0 -69.5 30t-26.5 71q2 39 32 65t69 26l442 1l-521 64q-41 5 -66 37
+t-19 73q6 35 34.5 57.5t65.5 22.5h10l481 -60l-351 94q-38 10 -62 41.5t-18 68.5q6 36 33 58.5t62 22.5q6 0 20 -2l448 -96l217 -37q1 0 3 -0.5t3 -0.5q23 0 30.5 23t-12.5 36l-186 125q-35 23 -42 63.5t18 73.5q27 38 76 38zM761 661l186 -125l-218 37l-5 2l-36 38
+l-238 262q-1 1 -2.5 3.5t-2.5 3.5q-24 31 -18.5 70t37.5 64q31 23 68 17.5t64 -33.5l142 -147q-2 -1 -5 -3.5t-4 -4.5q-32 -45 -23 -99t55 -85zM1648 1115l15 -266q4 -73 -11 -147l-48 -219q-12 -59 -67 -87l-106 -54q2 62 -39 109l-146 170q-53 61 -117 103l-222 148
+q-34 23 -76 23q-51 0 -88 -37l-235 312q-25 33 -18 73.5t41 63.5q33 22 71.5 14t62.5 -40l266 -352l-262 455q-21 35 -10.5 75t47.5 59q35 18 72.5 6t57.5 -46l241 -420l-136 337q-15 35 -4.5 74t44.5 56q37 19 76 6t56 -51l193 -415l101 -196q8 -15 23 -17.5t27 7.5t11 26
+l-12 224q-2 41 26 71t69 31q39 0 67 -28.5t30 -67.5z" />
+    <glyph glyph-name="uniF2A8" unicode="&#xf2a8;" horiz-adv-x="1792" 
+d="M335 180q-2 0 -6 2q-86 57 -168.5 145t-139.5 180q-21 30 -21 69q0 9 2 19t4 18t7 18t8.5 16t10.5 17t10 15t12 15.5t11 14.5q184 251 452 365q-110 198 -110 211q0 19 17 29q116 64 128 64q18 0 28 -16l124 -229q92 19 192 19q266 0 497.5 -137.5t378.5 -369.5
+q20 -31 20 -69t-20 -69q-91 -142 -218.5 -253.5t-278.5 -175.5q110 -198 110 -211q0 -20 -17 -29q-116 -64 -127 -64q-19 0 -29 16l-124 229l-64 119l-444 820l7 7q-58 -24 -99 -47q3 -5 127 -234t243 -449t119 -223q0 -7 -9 -9q-13 -3 -72 -3q-57 0 -60 7l-456 841
+q-39 -28 -82 -68q24 -43 214 -393.5t190 -354.5q0 -10 -11 -10q-14 0 -82.5 22t-72.5 28l-106 197l-224 413q-44 -53 -78 -106q2 -3 18 -25t23 -34l176 -327q0 -10 -10 -10zM1165 282l49 -91q273 111 450 385q-180 277 -459 389q67 -64 103 -148.5t36 -176.5
+q0 -106 -47 -200.5t-132 -157.5zM848 896q0 -20 14 -34t34 -14q86 0 147 -61t61 -147q0 -20 14 -34t34 -14t34 14t14 34q0 126 -89 215t-215 89q-20 0 -34 -14t-14 -34zM1214 961l-9 4l7 -7z" />
+    <glyph glyph-name="uniF2A9" unicode="&#xf2a9;" horiz-adv-x="1280" 
+d="M1050 430q0 -215 -147 -374q-148 -161 -378 -161q-232 0 -378 161q-147 159 -147 374q0 147 68 270.5t189 196.5t268 73q96 0 182 -31q-32 -62 -39 -126q-66 28 -143 28q-167 0 -280.5 -123t-113.5 -291q0 -170 112.5 -288.5t281.5 -118.5t281 118.5t112 288.5
+q0 89 -32 166q66 13 123 49q41 -98 41 -212zM846 619q0 -192 -79.5 -345t-238.5 -253l-14 -1q-29 0 -62 5q83 32 146.5 102.5t99.5 154.5t58.5 189t30 192.5t7.5 178.5q0 69 -3 103q55 -160 55 -326zM791 947v-2q-73 214 -206 440q88 -59 142.5 -186.5t63.5 -251.5z
+M1035 744q-83 0 -160 75q218 120 290 247q19 37 21 56q-42 -94 -139.5 -166.5t-204.5 -97.5q-35 54 -35 113q0 37 17 79t43 68q46 44 157 74q59 16 106 58.5t74 100.5q74 -105 74 -253q0 -109 -24 -170q-32 -77 -88.5 -130.5t-130.5 -53.5z" />
+    <glyph glyph-name="uniF2AA" unicode="&#xf2aa;" 
+d="M1050 495q0 78 -28 147q-41 -25 -85 -34q22 -50 22 -114q0 -117 -77 -198.5t-193 -81.5t-193.5 81.5t-77.5 198.5q0 115 78 199.5t193 84.5q53 0 98 -19q4 43 27 87q-60 21 -125 21q-154 0 -257.5 -108.5t-103.5 -263.5t103.5 -261t257.5 -106t257.5 106.5t103.5 260.5z
+M872 850q2 -24 2 -71q0 -63 -5 -123t-20.5 -132.5t-40.5 -130t-68.5 -106t-100.5 -70.5q21 -3 42 -3h10q219 139 219 411q0 116 -38 225zM872 850q-4 80 -44 171.5t-98 130.5q92 -156 142 -302zM1207 955q0 102 -51 174q-41 -86 -124 -109q-69 -19 -109 -53.5t-40 -99.5
+q0 -40 24 -77q74 17 140.5 67t95.5 115q-4 -52 -74.5 -111.5t-138.5 -97.5q52 -52 110 -52q51 0 90 37t60 90q17 42 17 117zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5
+t84.5 -203.5z" />
+    <glyph glyph-name="uniF2AB" unicode="&#xf2ab;" 
+d="M1279 388q0 22 -22 27q-67 15 -118 59t-80 108q-7 19 -7 25q0 15 19.5 26t43 17t43 20.5t19.5 36.5q0 19 -18.5 31.5t-38.5 12.5q-12 0 -32 -8t-31 -8q-4 0 -12 2q5 95 5 114q0 79 -17 114q-36 78 -103 121.5t-152 43.5q-199 0 -275 -165q-17 -35 -17 -114q0 -19 5 -114
+q-4 -2 -14 -2q-12 0 -32 7.5t-30 7.5q-21 0 -38.5 -12t-17.5 -32q0 -21 19.5 -35.5t43 -20.5t43 -17t19.5 -26q0 -6 -7 -25q-64 -138 -198 -167q-22 -5 -22 -27q0 -46 137 -68q2 -5 6 -26t11.5 -30.5t23.5 -9.5q12 0 37.5 4.5t39.5 4.5q35 0 67 -15t54 -32.5t57.5 -32.5
+t76.5 -15q43 0 79 15t57.5 32.5t53.5 32.5t67 15q14 0 39.5 -4t38.5 -4q16 0 23 10t11 30t6 25q137 22 137 68zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5
+t103 -385.5z" />
+    <glyph glyph-name="uniF2AC" unicode="&#xf2ac;" horiz-adv-x="1664" 
+d="M848 1408q134 1 240.5 -68.5t163.5 -192.5q27 -58 27 -179q0 -47 -9 -191q14 -7 28 -7q18 0 51 13.5t51 13.5q29 0 56 -18t27 -46q0 -32 -31.5 -54t-69 -31.5t-69 -29t-31.5 -47.5q0 -15 12 -43q37 -82 102.5 -150t144.5 -101q28 -12 80 -23q28 -6 28 -35
+q0 -70 -219 -103q-7 -11 -11 -39t-14 -46.5t-33 -18.5q-20 0 -62 6.5t-64 6.5q-37 0 -62 -5q-32 -5 -63 -22.5t-58 -38t-58 -40.5t-76 -33.5t-99 -13.5q-52 0 -96.5 13.5t-75 33.5t-57.5 40.5t-58 38t-62 22.5q-26 5 -63 5q-24 0 -65.5 -7.5t-58.5 -7.5q-25 0 -35 18.5
+t-14 47.5t-11 40q-219 33 -219 103q0 29 28 35q52 11 80 23q78 32 144.5 101t102.5 150q12 28 12 43q0 28 -31.5 47.5t-69.5 29.5t-69.5 31.5t-31.5 52.5q0 27 26 45.5t55 18.5q15 0 48 -13t53 -13q18 0 32 7q-9 142 -9 190q0 122 27 180q64 137 172 198t264 63z" />
+    <glyph glyph-name="uniF2AD" unicode="&#xf2ad;" 
+d="M1280 388q0 22 -22 27q-67 14 -118 58t-80 109q-7 14 -7 25q0 15 19.5 26t42.5 17t42.5 20.5t19.5 36.5q0 19 -18.5 31.5t-38.5 12.5q-11 0 -31 -8t-32 -8q-4 0 -12 2q5 63 5 115q0 78 -17 114q-36 78 -102.5 121.5t-152.5 43.5q-198 0 -275 -165q-18 -38 -18 -115
+q0 -38 6 -114q-10 -2 -15 -2q-11 0 -31.5 8t-30.5 8q-20 0 -37.5 -12.5t-17.5 -32.5q0 -21 19.5 -35.5t42.5 -20.5t42.5 -17t19.5 -26q0 -11 -7 -25q-64 -138 -198 -167q-22 -5 -22 -27q0 -47 138 -69q2 -5 6 -26t11 -30.5t23 -9.5q13 0 38.5 5t38.5 5q35 0 67.5 -15
+t54.5 -32.5t57.5 -32.5t76.5 -15q43 0 79 15t57.5 32.5t54 32.5t67.5 15q13 0 39 -4.5t39 -4.5q15 0 22.5 9.5t11.5 31t5 24.5q138 22 138 69zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960
+q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="uniF2AE" unicode="&#xf2ae;" horiz-adv-x="2304" 
+d="M2304 1536q-69 -46 -125 -92t-89 -81t-59.5 -71.5t-37.5 -57.5t-22 -44.5t-14 -29.5q-10 -18 -35.5 -136.5t-48.5 -164.5q-15 -29 -50 -60.5t-67.5 -50.5t-72.5 -41t-48 -28q-47 -31 -151 -231q-341 14 -630 -158q-92 -53 -303 -179q47 16 86 31t55 22l15 7
+q71 27 163 64.5t133.5 53.5t108 34.5t142.5 31.5q186 31 465 -7q1 0 10 -3q11 -6 14 -17t-3 -22l-194 -345q-15 -29 -47 -22q-128 24 -354 24q-146 0 -402 -44.5t-392 -46.5q-82 -1 -149 13t-107 37t-61 40t-33 34l-1 1v2q0 6 6 6q138 0 371 55q192 366 374.5 524t383.5 158
+q5 0 14.5 -0.5t38 -5t55 -12t61.5 -24.5t63 -39.5t54 -59t40 -82.5l102 177q2 4 21 42.5t44.5 86.5t61 109.5t84 133.5t100.5 137q66 82 128 141.5t121.5 96.5t92.5 53.5t88 39.5z" />
+    <glyph glyph-name="uniF2B0" unicode="&#xf2b0;" 
+d="M1322 640q0 -45 -5 -76l-236 14l224 -78q-19 -73 -58 -141l-214 103l177 -158q-44 -61 -107 -108l-157 178l103 -215q-61 -37 -140 -59l-79 228l14 -240q-38 -6 -76 -6t-76 6l14 238l-78 -226q-74 19 -140 59l103 215l-157 -178q-59 43 -108 108l178 158l-214 -104
+q-39 69 -58 141l224 79l-237 -14q-5 42 -5 76q0 35 5 77l238 -14l-225 79q19 73 58 140l214 -104l-177 159q46 61 107 108l158 -178l-103 215q67 39 140 58l77 -224l-13 236q36 6 75 6q38 0 76 -6l-14 -237l78 225q74 -19 140 -59l-103 -214l158 178q61 -47 107 -108
+l-177 -159l213 104q37 -62 58 -141l-224 -78l237 14q5 -31 5 -77zM1352 640q0 160 -78.5 295.5t-213 214t-292.5 78.5q-119 0 -227 -46.5t-186.5 -125t-124.5 -187.5t-46 -229q0 -119 46 -228t124.5 -187.5t186.5 -125t227 -46.5q158 0 292.5 78.5t213 214t78.5 294.5z
+M1425 1023v-766l-657 -383l-657 383v766l657 383zM768 -183l708 412v823l-708 411l-708 -411v-823zM1536 1088v-896l-768 -448l-768 448v896l768 448z" />
+    <glyph glyph-name="uniF2B1" unicode="&#xf2b1;" horiz-adv-x="1664" 
+d="M339 1318h691l-26 -72h-665q-110 0 -188.5 -79t-78.5 -189v-771q0 -95 60.5 -169.5t153.5 -93.5q23 -5 98 -5v-72h-45q-140 0 -239.5 100t-99.5 240v771q0 140 99.5 240t239.5 100zM1190 1536h247l-482 -1294q-23 -61 -40.5 -103.5t-45 -98t-54 -93.5t-64.5 -78.5
+t-79.5 -65t-95.5 -41t-116 -18.5v195q163 26 220 182q20 52 20 105q0 54 -20 106l-285 733h228l187 -585zM1664 978v-1111h-795q37 55 45 73h678v1038q0 85 -49.5 155t-129.5 99l25 67q101 -34 163.5 -123.5t62.5 -197.5z" />
+    <glyph glyph-name="uniF2B2" unicode="&#xf2b2;" horiz-adv-x="1792" 
+d="M852 1227q0 -29 -17 -52.5t-45 -23.5t-45 23.5t-17 52.5t17 52.5t45 23.5t45 -23.5t17 -52.5zM688 -149v114q0 30 -20.5 51.5t-50.5 21.5t-50 -21.5t-20 -51.5v-114q0 -30 20.5 -52t49.5 -22q30 0 50.5 22t20.5 52zM860 -149v114q0 30 -20 51.5t-50 21.5t-50.5 -21.5
+t-20.5 -51.5v-114q0 -30 20.5 -52t50.5 -22q29 0 49.5 22t20.5 52zM1034 -149v114q0 30 -20.5 51.5t-50.5 21.5t-50.5 -21.5t-20.5 -51.5v-114q0 -30 20.5 -52t50.5 -22t50.5 22t20.5 52zM1208 -149v114q0 30 -20.5 51.5t-50.5 21.5t-50.5 -21.5t-20.5 -51.5v-114
+q0 -30 20.5 -52t50.5 -22t50.5 22t20.5 52zM1476 535q-84 -160 -232 -259.5t-323 -99.5q-123 0 -229.5 51.5t-178.5 137t-113 197.5t-41 232q0 88 21 174q-104 -175 -104 -390q0 -162 65 -312t185 -251q30 57 91 57q56 0 86 -50q32 50 87 50q56 0 86 -50q32 50 87 50t87 -50
+q30 50 86 50q28 0 52.5 -15.5t37.5 -40.5q112 94 177 231.5t73 287.5zM1326 564q0 75 -72 75q-17 0 -47 -6q-95 -19 -149 -19q-226 0 -226 243q0 86 30 204q-83 -127 -83 -275q0 -150 89 -260.5t235 -110.5q111 0 210 70q13 48 13 79zM884 1223q0 50 -32 89.5t-81 39.5
+t-81 -39.5t-32 -89.5q0 -51 31.5 -90.5t81.5 -39.5t81.5 39.5t31.5 90.5zM1513 884q0 96 -37.5 179t-113 137t-173.5 54q-77 0 -149 -35t-127 -94q-48 -159 -48 -268q0 -104 45.5 -157t147.5 -53q53 0 142 19q36 6 53 6q51 0 77.5 -28t26.5 -80q0 -26 -4 -46
+q75 68 117.5 165.5t42.5 200.5zM1792 667q0 -111 -33.5 -249.5t-93.5 -204.5q-58 -64 -195 -142.5t-228 -104.5l-4 -1v-114q0 -43 -29.5 -75t-72.5 -32q-56 0 -86 50q-32 -50 -87 -50t-87 50q-30 -50 -86 -50q-55 0 -87 50q-30 -50 -86 -50q-47 0 -75 33.5t-28 81.5
+q-90 -68 -198 -68q-118 0 -211 80q54 1 106 20q-113 31 -182 127q32 -7 71 -7q89 0 164 46q-192 192 -240 306q-24 56 -24 160q0 57 9 125.5t31.5 146.5t55 141t86.5 105t120 42q59 0 81 -52q19 29 42 54q2 3 12 13t13 16q10 15 23 38t25 42t28 39q87 111 211.5 177
+t260.5 66q35 0 62 -4q59 64 146 64q83 0 140 -57q5 -5 5 -12q0 -5 -6 -13.5t-12.5 -16t-16 -17l-10.5 -10.5q17 -6 36 -18t19 -24q0 -6 -16 -25q157 -138 197 -378q25 30 60 30q45 0 100 -49q90 -80 90 -279z" />
+    <glyph glyph-name="uniF2B3" unicode="&#xf2b3;" 
+d="M917 631q0 33 -6 64h-362v-132h217q-12 -76 -74.5 -120.5t-142.5 -44.5q-99 0 -169 71.5t-70 170.5t70 170.5t169 71.5q93 0 153 -59l104 101q-108 100 -257 100q-160 0 -272 -112.5t-112 -271.5t112 -271.5t272 -112.5q165 0 266.5 105t101.5 270zM1262 585h109v110
+h-109v110h-110v-110h-110v-110h110v-110h110v110zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="uniF2B4" unicode="&#xf2b4;" 
+d="M1536 1024v-839q0 -48 -49 -62q-174 -52 -338 -52q-73 0 -215.5 29.5t-227.5 29.5q-164 0 -370 -48v-338h-160v1368q-63 25 -101 81t-38 124q0 91 64 155t155 64t155 -64t64 -155q0 -68 -38 -124t-101 -81v-68q190 44 343 44q99 0 198 -15q14 -2 111.5 -22.5t149.5 -20.5
+q77 0 165 18q11 2 80 21t89 19q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="uniF2B5" unicode="&#xf2b5;" horiz-adv-x="2304" 
+d="M192 384q40 0 56 32t0 64t-56 32t-56 -32t0 -64t56 -32zM1665 442q-10 13 -38.5 50t-41.5 54t-38 49t-42.5 53t-40.5 47t-45 49l-125 -140q-83 -94 -208.5 -92t-205.5 98q-57 69 -56.5 158t58.5 157l177 206q-22 11 -51 16.5t-47.5 6t-56.5 -0.5t-49 -1q-92 0 -158 -66
+l-158 -158h-155v-544q5 0 21 0.5t22 0t19.5 -2t20.5 -4.5t17.5 -8.5t18.5 -13.5l297 -292q115 -111 227 -111q78 0 125 47q57 -20 112.5 8t72.5 85q74 -6 127 44q20 18 36 45.5t14 50.5q10 -10 43 -10q43 0 77 21t49.5 53t12 71.5t-30.5 73.5zM1824 384h96v512h-93l-157 180
+q-66 76 -169 76h-167q-89 0 -146 -67l-209 -243q-28 -33 -28 -75t27 -75q43 -51 110 -52t111 49l193 218q25 23 53.5 21.5t47 -27t8.5 -56.5q16 -19 56 -63t60 -68q29 -36 82.5 -105.5t64.5 -84.5q52 -66 60 -140zM2112 384q40 0 56 32t0 64t-56 32t-56 -32t0 -64t56 -32z
+M2304 960v-640q0 -26 -19 -45t-45 -19h-434q-27 -65 -82 -106.5t-125 -51.5q-33 -48 -80.5 -81.5t-102.5 -45.5q-42 -53 -104.5 -81.5t-128.5 -24.5q-60 -34 -126 -39.5t-127.5 14t-117 53.5t-103.5 81l-287 282h-358q-26 0 -45 19t-19 45v672q0 26 19 45t45 19h421
+q14 14 47 48t47.5 48t44 40t50.5 37.5t51 25.5t62 19.5t68 5.5h117q99 0 181 -56q82 56 181 56h167q35 0 67 -6t56.5 -14.5t51.5 -26.5t44.5 -31t43 -39.5t39 -42t41 -48t41.5 -48.5h355q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="uniF2B6" unicode="&#xf2b6;" horiz-adv-x="1792" 
+d="M1792 882v-978q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v978q0 15 11 24q8 7 39 34.5t41.5 36t45.5 37.5t70 55.5t96 73t143.5 107t192.5 140.5q5 4 52.5 40t71.5 52.5t64 35t69 18.5t69 -18.5t65 -35.5t71 -52t52 -40q110 -80 192.5 -140.5t143.5 -107
+t96 -73t70 -55.5t45.5 -37.5t41.5 -36t39 -34.5q11 -9 11 -24zM1228 297q263 191 345 252q11 8 12.5 20.5t-6.5 23.5l-38 52q-8 11 -21 12.5t-24 -6.5q-231 -169 -343 -250q-5 -3 -52 -39t-71.5 -52.5t-64.5 -35t-69 -18.5t-69 18.5t-64.5 35t-71.5 52.5t-52 39
+q-186 134 -343 250q-11 8 -24 6.5t-21 -12.5l-38 -52q-8 -11 -6.5 -23.5t12.5 -20.5q82 -61 345 -252q10 -8 50 -38t65 -47t64 -39.5t77.5 -33.5t75.5 -11t75.5 11t79 34.5t64.5 39.5t65 47.5t48 36.5z" />
+    <glyph glyph-name="uniF2B7" unicode="&#xf2b7;" horiz-adv-x="1792" 
+d="M1474 623l39 -51q8 -11 6.5 -23.5t-11.5 -20.5q-43 -34 -126.5 -98.5t-146.5 -113t-67 -51.5q-39 -32 -60 -48t-60.5 -41t-76.5 -36.5t-74 -11.5h-1h-1q-37 0 -74 11.5t-76 36.5t-61 41.5t-60 47.5q-5 4 -65 50.5t-143.5 111t-122.5 94.5q-11 8 -12.5 20.5t6.5 23.5
+l37 52q8 11 21.5 13t24.5 -7q94 -73 306 -236q5 -4 43.5 -35t60.5 -46.5t56.5 -32.5t58.5 -17h1h1q24 0 58.5 17t56.5 32.5t60.5 46.5t43.5 35q258 198 313 242q11 8 24 6.5t21 -12.5zM1664 -96v928q-90 83 -159 139q-91 74 -389 304q-3 2 -43 35t-61 48t-56 32.5t-59 17.5
+h-1h-1q-24 0 -59 -17.5t-56 -32.5t-61 -48t-43 -35q-215 -166 -315.5 -245.5t-129.5 -104t-82 -74.5q-14 -12 -21 -19v-928q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1792 832v-928q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v928q0 56 41 94
+q123 114 350 290.5t233 181.5q36 30 59 47.5t61.5 42t76 36.5t74.5 12h1h1q37 0 74.5 -12t76 -36.5t61.5 -42t59 -47.5q43 -36 156 -122t226 -177t201 -173q41 -38 41 -94z" />
+    <glyph glyph-name="uniF2B8" unicode="&#xf2b8;" 
+d="M330 1l202 -214l-34 236l-216 213zM556 -225l274 218l-11 245l-300 -215zM245 413l227 -213l-48 327l-245 204zM495 189l317 214l-14 324l-352 -200zM843 178l95 -80l-2 239l-103 79q0 -1 1 -8.5t0 -12t-5 -7.5l-78 -52l85 -70q7 -6 7 -88zM138 930l256 -200l-68 465
+l-279 173zM1173 267l15 234l-230 -164l2 -240zM417 722l373 194l-19 441l-423 -163zM1270 357l20 233l-226 142l-2 -105l144 -95q6 -4 4 -9l-7 -119zM1461 496l30 222l-179 -128l-20 -228zM1273 329l-71 49l-8 -117q0 -5 -4 -8l-234 -187q-7 -5 -14 0l-98 83l7 -161
+q0 -5 -4 -8l-293 -234q-4 -2 -6 -2q-8 2 -8 3l-228 242q-4 4 -59 277q-2 7 5 11l61 37q-94 86 -95 92l-72 351q-2 7 6 12l94 45q-133 100 -135 108l-96 466q-2 10 7 13l433 135q5 0 8 -1l317 -153q6 -4 6 -9l20 -463q0 -7 -6 -10l-118 -61l126 -85q5 -2 5 -8l5 -123l121 74
+q5 4 11 0l84 -56l3 110q0 6 5 9l206 126q6 3 11 0l245 -135q4 -4 5 -7t-6.5 -60t-17.5 -124.5t-10 -70.5q0 -5 -4 -7l-191 -153q-6 -5 -13 0z" />
+    <glyph glyph-name="uniF2B9" unicode="&#xf2b9;" horiz-adv-x="1664" 
+d="M1201 298q0 57 -5.5 107t-21 100.5t-39.5 86t-64 58t-91 22.5q-6 -4 -33.5 -20.5t-42.5 -24.5t-40.5 -20t-49 -17t-46.5 -5t-46.5 5t-49 17t-40.5 20t-42.5 24.5t-33.5 20.5q-51 0 -91 -22.5t-64 -58t-39.5 -86t-21 -100.5t-5.5 -107q0 -73 42 -121.5t103 -48.5h576
+q61 0 103 48.5t42 121.5zM1028 892q0 108 -76.5 184t-183.5 76t-183.5 -76t-76.5 -184q0 -107 76.5 -183t183.5 -76t183.5 76t76.5 183zM1664 352v-192q0 -14 -9 -23t-23 -9h-96v-224q0 -66 -47 -113t-113 -47h-1216q-66 0 -113 47t-47 113v1472q0 66 47 113t113 47h1216
+q66 0 113 -47t47 -113v-224h96q14 0 23 -9t9 -23v-192q0 -14 -9 -23t-23 -9h-96v-128h96q14 0 23 -9t9 -23v-192q0 -14 -9 -23t-23 -9h-96v-128h96q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="uniF2BA" unicode="&#xf2ba;" horiz-adv-x="1664" 
+d="M1028 892q0 -107 -76.5 -183t-183.5 -76t-183.5 76t-76.5 183q0 108 76.5 184t183.5 76t183.5 -76t76.5 -184zM980 672q46 0 82.5 -17t60 -47.5t39.5 -67t24 -81t11.5 -82.5t3.5 -79q0 -67 -39.5 -118.5t-105.5 -51.5h-576q-66 0 -105.5 51.5t-39.5 118.5q0 48 4.5 93.5
+t18.5 98.5t36.5 91.5t63 64.5t93.5 26h5q7 -4 32 -19.5t35.5 -21t33 -17t37 -16t35 -9t39.5 -4.5t39.5 4.5t35 9t37 16t33 17t35.5 21t32 19.5zM1664 928q0 -13 -9.5 -22.5t-22.5 -9.5h-96v-128h96q13 0 22.5 -9.5t9.5 -22.5v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-96v-128h96
+q13 0 22.5 -9.5t9.5 -22.5v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-96v-224q0 -66 -47 -113t-113 -47h-1216q-66 0 -113 47t-47 113v1472q0 66 47 113t113 47h1216q66 0 113 -47t47 -113v-224h96q13 0 22.5 -9.5t9.5 -22.5v-192zM1408 -96v1472q0 13 -9.5 22.5t-22.5 9.5h-1216
+q-13 0 -22.5 -9.5t-9.5 -22.5v-1472q0 -13 9.5 -22.5t22.5 -9.5h1216q13 0 22.5 9.5t9.5 22.5z" />
+    <glyph glyph-name="uniF2BB" unicode="&#xf2bb;" horiz-adv-x="2048" 
+d="M1024 405q0 64 -9 117.5t-29.5 103t-60.5 78t-97 28.5q-6 -4 -30 -18t-37.5 -21.5t-35.5 -17.5t-43 -14.5t-42 -4.5t-42 4.5t-43 14.5t-35.5 17.5t-37.5 21.5t-30 18q-57 0 -97 -28.5t-60.5 -78t-29.5 -103t-9 -117.5t37 -106.5t91 -42.5h512q54 0 91 42.5t37 106.5z
+M867 925q0 94 -66.5 160.5t-160.5 66.5t-160.5 -66.5t-66.5 -160.5t66.5 -160.5t160.5 -66.5t160.5 66.5t66.5 160.5zM1792 416v64q0 14 -9 23t-23 9h-576q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h576q14 0 23 9t9 23zM1792 676v56q0 15 -10.5 25.5t-25.5 10.5h-568
+q-15 0 -25.5 -10.5t-10.5 -25.5v-56q0 -15 10.5 -25.5t25.5 -10.5h568q15 0 25.5 10.5t10.5 25.5zM1792 928v64q0 14 -9 23t-23 9h-576q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h576q14 0 23 9t9 23zM2048 1248v-1216q0 -66 -47 -113t-113 -47h-352v96q0 14 -9 23t-23 9
+h-64q-14 0 -23 -9t-9 -23v-96h-768v96q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-96h-352q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1728q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2BC" unicode="&#xf2bc;" horiz-adv-x="2048" 
+d="M1024 405q0 -64 -37 -106.5t-91 -42.5h-512q-54 0 -91 42.5t-37 106.5t9 117.5t29.5 103t60.5 78t97 28.5q6 -4 30 -18t37.5 -21.5t35.5 -17.5t43 -14.5t42 -4.5t42 4.5t43 14.5t35.5 17.5t37.5 21.5t30 18q57 0 97 -28.5t60.5 -78t29.5 -103t9 -117.5zM867 925
+q0 -94 -66.5 -160.5t-160.5 -66.5t-160.5 66.5t-66.5 160.5t66.5 160.5t160.5 66.5t160.5 -66.5t66.5 -160.5zM1792 480v-64q0 -14 -9 -23t-23 -9h-576q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h576q14 0 23 -9t9 -23zM1792 732v-56q0 -15 -10.5 -25.5t-25.5 -10.5h-568
+q-15 0 -25.5 10.5t-10.5 25.5v56q0 15 10.5 25.5t25.5 10.5h568q15 0 25.5 -10.5t10.5 -25.5zM1792 992v-64q0 -14 -9 -23t-23 -9h-576q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h576q14 0 23 -9t9 -23zM1920 32v1216q0 13 -9.5 22.5t-22.5 9.5h-1728q-13 0 -22.5 -9.5
+t-9.5 -22.5v-1216q0 -13 9.5 -22.5t22.5 -9.5h352v96q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-96h768v96q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-96h352q13 0 22.5 9.5t9.5 22.5zM2048 1248v-1216q0 -66 -47 -113t-113 -47h-1728q-66 0 -113 47t-47 113v1216q0 66 47 113
+t113 47h1728q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2BD" unicode="&#xf2bd;" horiz-adv-x="1792" 
+d="M1523 197q-22 155 -87.5 257.5t-184.5 118.5q-67 -74 -159.5 -115.5t-195.5 -41.5t-195.5 41.5t-159.5 115.5q-119 -16 -184.5 -118.5t-87.5 -257.5q106 -150 271 -237.5t356 -87.5t356 87.5t271 237.5zM1280 896q0 159 -112.5 271.5t-271.5 112.5t-271.5 -112.5
+t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM1792 640q0 -182 -71 -347.5t-190.5 -286t-285.5 -191.5t-349 -71q-182 0 -348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="uniF2BE" unicode="&#xf2be;" horiz-adv-x="1792" 
+d="M896 1536q182 0 348 -71t286 -191t191 -286t71 -348q0 -181 -70.5 -347t-190.5 -286t-286 -191.5t-349 -71.5t-349 71t-285.5 191.5t-190.5 286t-71 347.5t71 348t191 286t286 191t348 71zM1515 185q149 205 149 455q0 156 -61 298t-164 245t-245 164t-298 61t-298 -61
+t-245 -164t-164 -245t-61 -298q0 -250 149 -455q66 327 306 327q131 -128 313 -128t313 128q240 0 306 -327zM1280 832q0 159 -112.5 271.5t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5z" />
+    <glyph glyph-name="uniF2C0" unicode="&#xf2c0;" 
+d="M1201 752q47 -14 89.5 -38t89 -73t79.5 -115.5t55 -172t22 -236.5q0 -154 -100 -263.5t-241 -109.5h-854q-141 0 -241 109.5t-100 263.5q0 131 22 236.5t55 172t79.5 115.5t89 73t89.5 38q-79 125 -79 272q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5
+t198.5 -40.5t163.5 -109.5t109.5 -163.5t40.5 -198.5q0 -147 -79 -272zM768 1408q-159 0 -271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5t-112.5 271.5t-271.5 112.5zM1195 -128q88 0 150.5 71.5t62.5 173.5q0 239 -78.5 377t-225.5 145
+q-145 -127 -336 -127t-336 127q-147 -7 -225.5 -145t-78.5 -377q0 -102 62.5 -173.5t150.5 -71.5h854z" />
+    <glyph glyph-name="uniF2C1" unicode="&#xf2c1;" horiz-adv-x="1280" 
+d="M1024 278q0 -64 -37 -107t-91 -43h-512q-54 0 -91 43t-37 107t9 118t29.5 104t61 78.5t96.5 28.5q80 -75 188 -75t188 75q56 0 96.5 -28.5t61 -78.5t29.5 -104t9 -118zM870 797q0 -94 -67.5 -160.5t-162.5 -66.5t-162.5 66.5t-67.5 160.5t67.5 160.5t162.5 66.5
+t162.5 -66.5t67.5 -160.5zM1152 -96v1376h-1024v-1376q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1280 1376v-1472q0 -66 -47 -113t-113 -47h-960q-66 0 -113 47t-47 113v1472q0 66 47 113t113 47h352v-96q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v96h352
+q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2C2" unicode="&#xf2c2;" horiz-adv-x="2048" 
+d="M896 324q0 54 -7.5 100.5t-24.5 90t-51 68.5t-81 25q-64 -64 -156 -64t-156 64q-47 0 -81 -25t-51 -68.5t-24.5 -90t-7.5 -100.5q0 -55 31.5 -93.5t75.5 -38.5h426q44 0 75.5 38.5t31.5 93.5zM768 768q0 80 -56 136t-136 56t-136 -56t-56 -136t56 -136t136 -56t136 56
+t56 136zM1792 288v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM1408 544v64q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1792 544v64q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23
+v-64q0 -14 9 -23t23 -9h192q14 0 23 9t9 23zM1792 800v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM128 1152h1792v96q0 14 -9 23t-23 9h-1728q-14 0 -23 -9t-9 -23v-96zM2048 1248v-1216q0 -66 -47 -113t-113 -47h-1728
+q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1728q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2C3" unicode="&#xf2c3;" horiz-adv-x="2048" 
+d="M896 324q0 -55 -31.5 -93.5t-75.5 -38.5h-426q-44 0 -75.5 38.5t-31.5 93.5q0 54 7.5 100.5t24.5 90t51 68.5t81 25q64 -64 156 -64t156 64q47 0 81 -25t51 -68.5t24.5 -90t7.5 -100.5zM768 768q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136z
+M1792 352v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704q14 0 23 -9t9 -23zM1408 608v-64q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h320q14 0 23 -9t9 -23zM1792 608v-64q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v64
+q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 864v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704q14 0 23 -9t9 -23zM1920 32v1120h-1792v-1120q0 -13 9.5 -22.5t22.5 -9.5h1728q13 0 22.5 9.5t9.5 22.5zM2048 1248v-1216q0 -66 -47 -113t-113 -47
+h-1728q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1728q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2C4" unicode="&#xf2c4;" horiz-adv-x="1792" 
+d="M1255 749q0 318 -105 474.5t-330 156.5q-222 0 -326 -157t-104 -474q0 -316 104 -471.5t326 -155.5q74 0 131 17q-22 43 -39 73t-44 65t-53.5 56.5t-63 36t-77.5 14.5q-46 0 -79 -16l-49 97q105 91 276 91q132 0 215.5 -54t150.5 -155q67 149 67 402zM1645 117h117
+q3 -27 -2 -67t-26.5 -95t-58 -100.5t-107 -78t-162.5 -32.5q-71 0 -130.5 19t-105.5 56t-79 78t-66 96q-97 -27 -205 -27q-150 0 -292.5 58t-253 158.5t-178 249t-67.5 317.5q0 170 67.5 319.5t178.5 250.5t253.5 159t291.5 58q121 0 238.5 -36t217 -106t176 -164.5
+t119.5 -219t43 -261.5q0 -190 -80.5 -347.5t-218.5 -264.5q47 -70 93.5 -106.5t104.5 -36.5q61 0 94 37.5t38 85.5z" />
+    <glyph glyph-name="uniF2C5" unicode="&#xf2c5;" horiz-adv-x="2304" 
+d="M453 -101q0 -21 -16 -37.5t-37 -16.5q-1 0 -13 3q-63 15 -162 140q-225 284 -225 676q0 341 213 614q39 51 95 103.5t94 52.5q19 0 35 -13.5t16 -32.5q0 -27 -63 -90q-98 -102 -147 -184q-119 -199 -119 -449q0 -281 123 -491q50 -85 136 -173q2 -3 14.5 -16t19.5 -21
+t17 -20.5t14.5 -23.5t4.5 -21zM1796 33q0 -29 -17.5 -48.5t-46.5 -19.5h-1081q-26 0 -45 19t-19 45q0 29 17.5 48.5t46.5 19.5h1081q26 0 45 -19t19 -45zM1581 644q0 -134 -67 -233q-25 -38 -69.5 -78.5t-83.5 -60.5q-16 -10 -27 -10q-7 0 -15 6t-8 12q0 9 19 30t42 46
+t42 67.5t19 88.5q0 76 -35 130q-29 42 -46 42q-3 0 -3 -5q0 -12 7.5 -35.5t7.5 -36.5q0 -22 -21.5 -35t-44.5 -13q-66 0 -66 76q0 15 1.5 44t1.5 44q0 25 -10 46q-13 25 -42 53.5t-51 28.5q-5 0 -7 -0.5t-3.5 -2.5t-1.5 -6q0 -2 16 -26t16 -54q0 -37 -19 -68t-46 -54
+t-53.5 -46t-45.5 -54t-19 -68q0 -98 42 -160q29 -43 79 -63q16 -5 17 -10q1 -2 1 -5q0 -16 -18 -16q-6 0 -33 11q-119 43 -195 139.5t-76 218.5q0 55 24.5 115.5t60 115t70.5 108.5t59.5 113.5t24.5 111.5q0 53 -25 94q-29 48 -56 64q-19 9 -19 21q0 20 41 20q50 0 110 -29
+q41 -19 71 -44.5t49.5 -51t33.5 -62.5t22 -69t16 -80q0 -1 3 -17.5t4.5 -25t5.5 -25t9 -27t11 -21.5t14.5 -16.5t18.5 -5.5q23 0 37 14t14 37q0 25 -20 67t-20 52t10 10q27 0 93 -70q72 -76 102.5 -156t30.5 -186zM2304 615q0 -274 -138 -503q-19 -32 -48 -72t-68 -86.5
+t-81 -77t-74 -30.5q-16 0 -31 15.5t-15 31.5q0 15 29 50.5t68.5 77t48.5 52.5q183 230 183 531q0 131 -20.5 235t-72.5 211q-58 119 -163 228q-2 3 -13 13.5t-16.5 16.5t-15 17.5t-15 20t-9.5 18.5t-4 19q0 19 16 35.5t35 16.5q70 0 196 -169q98 -131 146 -273t60 -314
+q2 -42 2 -64z" />
+    <glyph glyph-name="uniF2C6" unicode="&#xf2c6;" horiz-adv-x="1792" 
+d="M1189 229l147 693q9 44 -10.5 63t-51.5 7l-864 -333q-29 -11 -39.5 -25t-2.5 -26.5t32 -19.5l221 -69l513 323q21 14 32 6q7 -5 -4 -15l-415 -375v0v0l-16 -228q23 0 45 22l108 104l224 -165q64 -36 81 38zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71
+t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="uniF2C7" unicode="&#xf2c7;" horiz-adv-x="1024" 
+d="M640 192q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 60 35 110t93 71v907h128v-907q58 -21 93 -71t35 -110zM768 192q0 77 -34 144t-94 112v768q0 80 -56 136t-136 56t-136 -56t-56 -136v-768q-60 -45 -94 -112t-34 -144q0 -133 93.5 -226.5t226.5 -93.5t226.5 93.5
+t93.5 226.5zM896 192q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 182 128 313v711q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5v-711q128 -131 128 -313zM1024 768v-128h-192v128h192zM1024 1024v-128h-192v128h192zM1024 1280v-128h-192
+v128h192z" />
+    <glyph glyph-name="uniF2C8" unicode="&#xf2c8;" horiz-adv-x="1024" 
+d="M640 192q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 60 35 110t93 71v651h128v-651q58 -21 93 -71t35 -110zM768 192q0 77 -34 144t-94 112v768q0 80 -56 136t-136 56t-136 -56t-56 -136v-768q-60 -45 -94 -112t-34 -144q0 -133 93.5 -226.5t226.5 -93.5t226.5 93.5
+t93.5 226.5zM896 192q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 182 128 313v711q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5v-711q128 -131 128 -313zM1024 768v-128h-192v128h192zM1024 1024v-128h-192v128h192zM1024 1280v-128h-192
+v128h192z" />
+    <glyph glyph-name="uniF2C9" unicode="&#xf2c9;" horiz-adv-x="1024" 
+d="M640 192q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 60 35 110t93 71v395h128v-395q58 -21 93 -71t35 -110zM768 192q0 77 -34 144t-94 112v768q0 80 -56 136t-136 56t-136 -56t-56 -136v-768q-60 -45 -94 -112t-34 -144q0 -133 93.5 -226.5t226.5 -93.5t226.5 93.5
+t93.5 226.5zM896 192q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 182 128 313v711q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5v-711q128 -131 128 -313zM1024 768v-128h-192v128h192zM1024 1024v-128h-192v128h192zM1024 1280v-128h-192
+v128h192z" />
+    <glyph glyph-name="uniF2CA" unicode="&#xf2ca;" horiz-adv-x="1024" 
+d="M640 192q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 60 35 110t93 71v139h128v-139q58 -21 93 -71t35 -110zM768 192q0 77 -34 144t-94 112v768q0 80 -56 136t-136 56t-136 -56t-56 -136v-768q-60 -45 -94 -112t-34 -144q0 -133 93.5 -226.5t226.5 -93.5t226.5 93.5
+t93.5 226.5zM896 192q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 182 128 313v711q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5v-711q128 -131 128 -313zM1024 768v-128h-192v128h192zM1024 1024v-128h-192v128h192zM1024 1280v-128h-192
+v128h192z" />
+    <glyph glyph-name="uniF2CB" unicode="&#xf2cb;" horiz-adv-x="1024" 
+d="M640 192q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 79 56 135.5t136 56.5t136 -56.5t56 -135.5zM768 192q0 77 -34 144t-94 112v768q0 80 -56 136t-136 56t-136 -56t-56 -136v-768q-60 -45 -94 -112t-34 -144q0 -133 93.5 -226.5t226.5 -93.5t226.5 93.5t93.5 226.5z
+M896 192q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 182 128 313v711q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5v-711q128 -131 128 -313zM1024 768v-128h-192v128h192zM1024 1024v-128h-192v128h192zM1024 1280v-128h-192v128h192z" />
+    <glyph glyph-name="uniF2CC" unicode="&#xf2cc;" horiz-adv-x="1920" 
+d="M1433 1287q10 -10 10 -23t-10 -23l-626 -626q-10 -10 -23 -10t-23 10l-82 82q-10 10 -10 23t10 23l44 44q-72 91 -81.5 207t46.5 215q-74 71 -176 71q-106 0 -181 -75t-75 -181v-1280h-256v1280q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5q106 0 201 -41
+t166 -115q94 39 197 24.5t185 -79.5l44 44q10 10 23 10t23 -10zM1344 1024q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1600 896q-26 0 -45 19t-19 45t19 45t45 19t45 -19t19 -45t-19 -45t-45 -19zM1856 1024q26 0 45 -19t19 -45t-19 -45t-45 -19
+t-45 19t-19 45t19 45t45 19zM1216 896q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1408 832q0 26 19 45t45 19t45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45zM1728 896q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1088 768
+q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1344 640q-26 0 -45 19t-19 45t19 45t45 19t45 -19t19 -45t-19 -45t-45 -19zM1600 768q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1216 512q-26 0 -45 19t-19 45t19 45t45 19t45 -19
+t19 -45t-19 -45t-45 -19zM1472 640q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1088 512q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1344 512q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1216 384
+q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1088 256q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19z" />
+    <glyph glyph-name="uniF2CD" unicode="&#xf2cd;" horiz-adv-x="1792" 
+d="M1664 448v-192q0 -169 -128 -286v-194q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v118q-63 -22 -128 -22h-768q-65 0 -128 22v-110q0 -17 -9.5 -28.5t-22.5 -11.5h-64q-13 0 -22.5 11.5t-9.5 28.5v186q-128 117 -128 286v192h1536zM704 864q0 -14 -9 -23t-23 -9t-23 9
+t-9 23t9 23t23 9t23 -9t9 -23zM768 928q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM704 992q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM832 992q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM768 1056q0 -14 -9 -23t-23 -9t-23 9
+t-9 23t9 23t23 9t23 -9t9 -23zM704 1120q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM1792 608v-64q0 -14 -9 -23t-23 -9h-1728q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96v640q0 106 75 181t181 75q108 0 184 -78q46 19 98 12t93 -39l22 22q11 11 22 0l42 -42
+q11 -11 0 -22l-314 -314q-11 -11 -22 0l-42 42q-11 11 0 22l22 22q-36 46 -40.5 104t23.5 108q-37 35 -88 35q-53 0 -90.5 -37.5t-37.5 -90.5v-640h1504q14 0 23 -9t9 -23zM896 1056q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM832 1120q0 -14 -9 -23t-23 -9
+t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM768 1184q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM960 1120q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM896 1184q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM832 1248q0 -14 -9 -23
+t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM1024 1184q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM960 1248q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM1088 1248q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23z" />
+    <glyph glyph-name="uniF2CE" unicode="&#xf2ce;" 
+d="M994 344q0 -86 -17 -197q-31 -215 -55 -313q-22 -90 -152 -90t-152 90q-24 98 -55 313q-17 110 -17 197q0 168 224 168t224 -168zM1536 768q0 -240 -134 -434t-350 -280q-8 -3 -15 3t-6 15q7 48 10 66q4 32 6 47q1 9 9 12q159 81 255.5 234t96.5 337q0 180 -91 330.5
+t-247 234.5t-337 74q-124 -7 -237 -61t-193.5 -140.5t-128 -202t-46.5 -240.5q1 -184 99 -336.5t257 -231.5q7 -3 9 -12q3 -21 6 -45q1 -9 5 -32.5t6 -35.5q1 -9 -6.5 -15t-15.5 -2q-148 58 -261 169.5t-173.5 264t-52.5 319.5q7 143 66 273.5t154.5 227t225 157.5t272.5 70
+q164 10 315.5 -46.5t261 -160.5t175 -250.5t65.5 -308.5zM994 800q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5zM1282 768q0 -122 -53.5 -228.5t-146.5 -177.5q-8 -6 -16 -2t-10 14q-6 52 -29 92q-7 10 3 20
+q58 54 91 127t33 155q0 111 -58.5 204t-157.5 141.5t-212 36.5q-133 -15 -229 -113t-109 -231q-10 -92 23.5 -176t98.5 -144q10 -10 3 -20q-24 -41 -29 -93q-2 -9 -10 -13t-16 2q-95 74 -148.5 183t-51.5 234q3 131 69 244t177 181.5t241 74.5q144 7 268 -60t196.5 -187.5
+t72.5 -263.5z" />
+    <glyph glyph-name="uniF2D0" unicode="&#xf2d0;" horiz-adv-x="1792" 
+d="M256 128h1280v768h-1280v-768zM1792 1248v-1216q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2D1" unicode="&#xf2d1;" horiz-adv-x="1792" 
+d="M1792 224v-192q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v192q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2D2" unicode="&#xf2d2;" horiz-adv-x="2048" 
+d="M256 0h768v512h-768v-512zM1280 512h512v768h-768v-256h96q66 0 113 -47t47 -113v-352zM2048 1376v-960q0 -66 -47 -113t-113 -47h-608v-352q0 -66 -47 -113t-113 -47h-960q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h608v352q0 66 47 113t113 47h960q66 0 113 -47
+t47 -113z" />
+    <glyph glyph-name="uniF2D3" unicode="&#xf2d3;" horiz-adv-x="1792" 
+d="M1175 215l146 146q10 10 10 23t-10 23l-233 233l233 233q10 10 10 23t-10 23l-146 146q-10 10 -23 10t-23 -10l-233 -233l-233 233q-10 10 -23 10t-23 -10l-146 -146q-10 -10 -10 -23t10 -23l233 -233l-233 -233q-10 -10 -10 -23t10 -23l146 -146q10 -10 23 -10t23 10
+l233 233l233 -233q10 -10 23 -10t23 10zM1792 1248v-1216q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2D4" unicode="&#xf2d4;" horiz-adv-x="1792" 
+d="M1257 425l-146 -146q-10 -10 -23 -10t-23 10l-169 169l-169 -169q-10 -10 -23 -10t-23 10l-146 146q-10 10 -10 23t10 23l169 169l-169 169q-10 10 -10 23t10 23l146 146q10 10 23 10t23 -10l169 -169l169 169q10 10 23 10t23 -10l146 -146q10 -10 10 -23t-10 -23
+l-169 -169l169 -169q10 -10 10 -23t-10 -23zM256 128h1280v1024h-1280v-1024zM1792 1248v-1216q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2D5" unicode="&#xf2d5;" horiz-adv-x="1792" 
+d="M1070 358l306 564h-654l-306 -564h654zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="uniF2D6" unicode="&#xf2d6;" horiz-adv-x="1794" 
+d="M1291 1060q-15 17 -35 8.5t-26 -28.5t5 -38q14 -17 40 -14.5t34 20.5t-18 52zM895 814q-8 -8 -19.5 -8t-18.5 8q-8 8 -8 19t8 18q7 8 18.5 8t19.5 -8q7 -7 7 -18t-7 -19zM1060 740l-35 -35q-12 -13 -29.5 -13t-30.5 13l-38 38q-12 13 -12 30t12 30l35 35q12 12 29.5 12
+t30.5 -12l38 -39q12 -12 12 -29.5t-12 -29.5zM951 870q-7 -8 -18.5 -8t-19.5 8q-7 8 -7 19t7 19q8 8 19 8t19 -8t8 -19t-8 -19zM1354 968q-34 -64 -107.5 -85.5t-127.5 16.5q-38 28 -61 66.5t-21 87.5t39 92t75.5 53t70.5 -5t70 -51q2 -2 13 -12.5t14.5 -13.5t13 -13.5
+t12.5 -15.5t10 -15.5t8.5 -18t4 -18.5t1 -21t-5 -22t-9.5 -24zM1555 486q3 20 -8.5 34.5t-27.5 21.5t-33 17t-23 20q-40 71 -84 98.5t-113 11.5q19 13 40 18.5t33 4.5l12 -1q2 45 -34 90q6 20 6.5 40.5t-2.5 30.5l-3 10q43 24 71 65t34 91q10 84 -43 150.5t-137 76.5
+q-60 7 -114 -18.5t-82 -74.5q-30 -51 -33.5 -101t14.5 -87t43.5 -64t56.5 -42q-45 4 -88 36t-57 88q-28 108 32 222q-16 21 -29 32q-50 0 -89 -19q19 24 42 37t36 14l13 1q0 50 -13 78q-10 21 -32.5 28.5t-47 -3.5t-37.5 -40q2 4 4 7q-7 -28 -6.5 -75.5t19 -117t48.5 -122.5
+q-25 -14 -47 -36q-35 -16 -85.5 -70.5t-84.5 -101.5l-33 -46q-90 -34 -181 -125.5t-75 -162.5q1 -16 11 -27q-15 -12 -30 -30q-21 -25 -21 -54t21.5 -40t63.5 6q41 19 77 49.5t55 60.5q-2 2 -6.5 5t-20.5 7.5t-33 3.5q23 5 51 12.5t40 10t27.5 6t26 4t23.5 0.5q14 -7 22 34
+q7 37 7 90q0 102 -40 150q106 -103 101 -219q-1 -29 -15 -50t-27 -27l-13 -6q-4 -7 -19 -32t-26 -45.5t-26.5 -52t-25 -61t-17 -63t-6.5 -66.5t10 -63q-35 54 -37 80q-22 -24 -34.5 -39t-33.5 -42t-30.5 -46t-16.5 -41t-0.5 -38t25.5 -27q45 -25 144 64t190.5 221.5
+t122.5 228.5q86 52 145 115.5t86 119.5q47 -93 154 -178q104 -83 167 -80q39 2 46 43zM1794 640q0 -182 -71 -348t-191 -286t-286.5 -191t-348.5 -71t-348.5 71t-286.5 191t-191 286t-71 348t71 348t191 286t286.5 191t348.5 71t348.5 -71t286.5 -191t191 -286t71 -348z" />
+    <glyph glyph-name="uniF2D7" unicode="&#xf2d7;" 
+d="M518 1353v-655q103 -1 191.5 1.5t125.5 5.5l37 3q68 2 90.5 24.5t39.5 94.5l33 142h103l-14 -322l7 -319h-103l-29 127q-15 68 -45 93t-84 26q-87 8 -352 8v-556q0 -78 43.5 -115.5t133.5 -37.5h357q35 0 59.5 2t55 7.5t54 18t48.5 32t46 50.5t39 73l93 216h89
+q-6 -37 -31.5 -252t-30.5 -276q-146 5 -263.5 8t-162.5 4h-44h-628l-376 -12v102l127 25q67 13 91.5 37t25.5 79l8 643q3 402 -8 645q-2 61 -25.5 84t-91.5 36l-127 24v102l376 -12h702q139 0 374 27q-6 -68 -14 -194.5t-12 -219.5l-5 -92h-93l-32 124q-31 121 -74 179.5
+t-113 58.5h-548q-28 0 -35.5 -8.5t-7.5 -30.5z" />
+    <glyph glyph-name="uniF2D8" unicode="&#xf2d8;" 
+d="M922 739v-182q0 -4 0.5 -15t0 -15l-1.5 -12t-3.5 -11.5t-6.5 -7.5t-11 -5.5t-16 -1.5v309q9 0 16 -1t11 -5t6.5 -5.5t3.5 -9.5t1 -10.5v-13.5v-14zM1238 643v-121q0 -1 0.5 -12.5t0 -15.5t-2.5 -11.5t-7.5 -10.5t-13.5 -3q-9 0 -14 9q-4 10 -4 165v7v8.5v9t1.5 8.5l3.5 7
+t5 5.5t8 1.5q6 0 10 -1.5t6.5 -4.5t4 -6t2 -8.5t0.5 -8v-9.5v-9zM180 407h122v472h-122v-472zM614 407h106v472h-159l-28 -221q-20 148 -32 221h-158v-472h107v312l45 -312h76l43 319v-319zM1039 712q0 67 -5 90q-3 16 -11 28.5t-17 20.5t-25 14t-26.5 8.5t-31 4t-29 1.5
+h-29.5h-12h-91v-472h56q169 -1 197 24.5t25 180.5q-1 62 -1 100zM1356 515v133q0 29 -2 45t-9.5 33.5t-24.5 25t-46 7.5q-46 0 -77 -34v154h-117v-472h110l7 30q30 -36 77 -36q50 0 66 30.5t16 83.5zM1536 1248v-1216q0 -66 -47 -113t-113 -47h-1216q-66 0 -113 47t-47 113
+v1216q0 66 47 113t113 47h1216q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2D9" unicode="&#xf2d9;" horiz-adv-x="2176" 
+d="M1143 -197q-6 1 -11 4q-13 8 -36 23t-86 65t-116.5 104.5t-112 140t-89.5 172.5q-17 3 -175 37q66 -213 235 -362t391 -184zM502 409l168 -28q-25 76 -41 167.5t-19 145.5l-4 53q-84 -82 -121 -224q5 -65 17 -114zM612 1018q-43 -64 -77 -148q44 46 74 68zM2049 584
+q0 161 -62 307t-167.5 252t-250.5 168.5t-304 62.5q-147 0 -281 -52.5t-240 -148.5q-30 -58 -45 -160q60 51 143 83.5t158.5 43t143 13.5t108.5 -1l40 -3q33 -1 53 -15.5t24.5 -33t6.5 -37t-1 -28.5q-126 11 -227.5 0.5t-183 -43.5t-142.5 -71.5t-131 -98.5
+q4 -36 11.5 -92.5t35.5 -178t62 -179.5q123 -6 247.5 14.5t214.5 53.5t162.5 67t109.5 59l37 24q22 16 39.5 20.5t30.5 -5t17 -34.5q14 -97 -39 -121q-208 -97 -467 -134q-135 -20 -317 -16q41 -96 110 -176.5t137 -127t130.5 -79t101.5 -43.5l39 -12q143 -23 263 15
+q195 99 314 289t119 418zM2123 621q-14 -135 -40 -212q-70 -208 -181.5 -346.5t-318.5 -253.5q-48 -33 -82 -44q-72 -26 -163 -16q-36 -3 -73 -3q-283 0 -504.5 173t-295.5 442q-1 0 -4 0.5t-5 0.5q-6 -50 2.5 -112.5t26 -115t36 -98t31.5 -71.5l14 -26q8 -12 54 -82
+q-71 38 -124.5 106.5t-78.5 140t-39.5 137t-17.5 107.5l-2 42q-5 2 -33.5 12.5t-48.5 18t-53 20.5t-57.5 25t-50 25.5t-42.5 27t-25 25.5q19 -10 50.5 -25.5t113 -45.5t145.5 -38l2 32q11 149 94 290q41 202 176 365q28 115 81 214q15 28 32 45t49 32q158 74 303.5 104
+t302 11t306.5 -97q220 -115 333 -336t87 -474z" />
+    <glyph glyph-name="uniF2DA" unicode="&#xf2da;" horiz-adv-x="1792" 
+d="M1341 752q29 44 -6.5 129.5t-121.5 142.5q-58 39 -125.5 53.5t-118 4.5t-68.5 -37q-12 -23 -4.5 -28t42.5 -10q23 -3 38.5 -5t44.5 -9.5t56 -17.5q36 -13 67.5 -31.5t53 -37t40 -38.5t30.5 -38t22 -34.5t16.5 -28.5t12 -18.5t10.5 -6t11 9.5zM1704 178
+q-52 -127 -148.5 -220t-214.5 -141.5t-253 -60.5t-266 13.5t-251 91t-210 161.5t-141.5 235.5t-46.5 303.5q1 41 8.5 84.5t12.5 64t24 80.5t23 73q-51 -208 1 -397t173 -318t291 -206t346 -83t349 74.5t289 244.5q20 27 18 14q0 -4 -4 -14zM1465 627q0 -104 -40.5 -199
+t-108.5 -164t-162 -109.5t-198 -40.5t-198 40.5t-162 109.5t-108.5 164t-40.5 199t40.5 199t108.5 164t162 109.5t198 40.5t198 -40.5t162 -109.5t108.5 -164t40.5 -199zM1752 915q-65 147 -180.5 251t-253 153.5t-292 53.5t-301 -36.5t-275.5 -129t-220 -211.5t-131 -297
+t-10 -373q-49 161 -51.5 311.5t35.5 272.5t109 227t165.5 180.5t207 126t232 71t242.5 9t236 -54t216 -124.5t178 -197q33 -50 62 -121t31 -112zM1690 573q12 244 -136.5 416t-396.5 240q-8 0 -10 5t24 8q125 -4 230 -50t173 -120t116 -168.5t58.5 -199t-1 -208
+t-61.5 -197.5t-122.5 -167t-185 -117.5t-248.5 -46.5q108 30 201.5 80t174 123t129.5 176.5t55 225.5z" />
+    <glyph glyph-name="uniF2DB" unicode="&#xf2db;" 
+d="M192 256v-128h-112q-16 0 -16 16v16h-48q-16 0 -16 16v32q0 16 16 16h48v16q0 16 16 16h112zM192 512v-128h-112q-16 0 -16 16v16h-48q-16 0 -16 16v32q0 16 16 16h48v16q0 16 16 16h112zM192 768v-128h-112q-16 0 -16 16v16h-48q-16 0 -16 16v32q0 16 16 16h48v16
+q0 16 16 16h112zM192 1024v-128h-112q-16 0 -16 16v16h-48q-16 0 -16 16v32q0 16 16 16h48v16q0 16 16 16h112zM192 1280v-128h-112q-16 0 -16 16v16h-48q-16 0 -16 16v32q0 16 16 16h48v16q0 16 16 16h112zM1280 1440v-1472q0 -40 -28 -68t-68 -28h-832q-40 0 -68 28
+t-28 68v1472q0 40 28 68t68 28h832q40 0 68 -28t28 -68zM1536 208v-32q0 -16 -16 -16h-48v-16q0 -16 -16 -16h-112v128h112q16 0 16 -16v-16h48q16 0 16 -16zM1536 464v-32q0 -16 -16 -16h-48v-16q0 -16 -16 -16h-112v128h112q16 0 16 -16v-16h48q16 0 16 -16zM1536 720v-32
+q0 -16 -16 -16h-48v-16q0 -16 -16 -16h-112v128h112q16 0 16 -16v-16h48q16 0 16 -16zM1536 976v-32q0 -16 -16 -16h-48v-16q0 -16 -16 -16h-112v128h112q16 0 16 -16v-16h48q16 0 16 -16zM1536 1232v-32q0 -16 -16 -16h-48v-16q0 -16 -16 -16h-112v128h112q16 0 16 -16v-16
+h48q16 0 16 -16z" />
+    <glyph glyph-name="uniF2DC" unicode="&#xf2dc;" horiz-adv-x="1664" 
+d="M1566 419l-167 -33l186 -107q23 -13 29.5 -38.5t-6.5 -48.5q-14 -23 -39 -29.5t-48 6.5l-186 106l55 -160q13 -38 -12 -63.5t-60.5 -20.5t-48.5 42l-102 300l-271 156v-313l208 -238q16 -18 17 -39t-11 -36.5t-28.5 -25t-37 -5.5t-36.5 22l-112 128v-214q0 -26 -19 -45
+t-45 -19t-45 19t-19 45v214l-112 -128q-16 -18 -36.5 -22t-37 5.5t-28.5 25t-11 36.5t17 39l208 238v313l-271 -156l-102 -300q-13 -37 -48.5 -42t-60.5 20.5t-12 63.5l55 160l-186 -106q-23 -13 -48 -6.5t-39 29.5q-13 23 -6.5 48.5t29.5 38.5l186 107l-167 33
+q-29 6 -42 29t-8.5 46.5t25.5 40t50 10.5l310 -62l271 157l-271 157l-310 -62q-4 -1 -13 -1q-27 0 -44 18t-19 40t11 43t40 26l167 33l-186 107q-23 13 -29.5 38.5t6.5 48.5t39 30t48 -7l186 -106l-55 160q-13 38 12 63.5t60.5 20.5t48.5 -42l102 -300l271 -156v313
+l-208 238q-16 18 -17 39t11 36.5t28.5 25t37 5.5t36.5 -22l112 -128v214q0 26 19 45t45 19t45 -19t19 -45v-214l112 128q16 18 36.5 22t37 -5.5t28.5 -25t11 -36.5t-17 -39l-208 -238v-313l271 156l102 300q13 37 48.5 42t60.5 -20.5t12 -63.5l-55 -160l186 106
+q23 13 48 6.5t39 -29.5q13 -23 6.5 -48.5t-29.5 -38.5l-186 -107l167 -33q27 -5 40 -26t11 -43t-19 -40t-44 -18q-9 0 -13 1l-310 62l-271 -157l271 -157l310 62q29 6 50 -10.5t25.5 -40t-8.5 -46.5t-42 -29z" />
+    <glyph glyph-name="uniF2DD" unicode="&#xf2dd;" horiz-adv-x="1792" 
+d="M1473 607q7 118 -33 226.5t-113 189t-177 131t-221 57.5q-116 7 -225.5 -32t-192 -110.5t-135 -175t-59.5 -220.5q-7 -118 33 -226.5t113 -189t177.5 -131t221.5 -57.5q155 -9 293 59t224 195.5t94 283.5zM1792 1536l-349 -348q120 -117 180.5 -272t50.5 -321
+q-11 -183 -102 -339t-241 -255.5t-332 -124.5l-999 -132l347 347q-120 116 -180.5 271.5t-50.5 321.5q11 184 102 340t241.5 255.5t332.5 124.5q167 22 500 66t500 66z" />
+    <glyph glyph-name="uniF2DE" unicode="&#xf2de;" horiz-adv-x="1792" 
+d="M948 508l163 -329h-51l-175 350l-171 -350h-49l179 374l-78 33l21 49l240 -102l-21 -50zM563 1100l304 -130l-130 -304l-304 130zM907 915l240 -103l-103 -239l-239 102zM1188 765l191 -81l-82 -190l-190 81zM1680 640q0 159 -62 304t-167.5 250.5t-250.5 167.5t-304 62
+t-304 -62t-250.5 -167.5t-167.5 -250.5t-62 -304t62 -304t167.5 -250.5t250.5 -167.5t304 -62t304 62t250.5 167.5t167.5 250.5t62 304zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71
+t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="uniF2E0" unicode="&#xf2e0;" horiz-adv-x="1920" 
+d="M1334 302q-4 24 -27.5 34t-49.5 10.5t-48.5 12.5t-25.5 38q-5 47 33 139.5t75 181t32 127.5q-14 101 -117 103q-45 1 -75 -16l-3 -2l-5 -2.5t-4.5 -2t-5 -2t-5 -0.5t-6 1.5t-6 3.5t-6.5 5q-3 2 -9 8.5t-9 9t-8.5 7.5t-9.5 7.5t-9.5 5.5t-11 4.5t-11.5 2.5q-30 5 -48 -3
+t-45 -31q-1 -1 -9 -8.5t-12.5 -11t-15 -10t-16.5 -5.5t-17 3q-54 27 -84 40q-41 18 -94 -5t-76 -65q-16 -28 -41 -98.5t-43.5 -132.5t-40 -134t-21.5 -73q-22 -69 18.5 -119t110.5 -46q30 2 50.5 15t38.5 46q7 13 79 199.5t77 194.5q6 11 21.5 18t29.5 0q27 -15 21 -53
+q-2 -18 -51 -139.5t-50 -132.5q-6 -38 19.5 -56.5t60.5 -7t55 49.5q4 8 45.5 92t81.5 163.5t46 88.5q20 29 41 28q29 0 25 -38q-2 -16 -65.5 -147.5t-70.5 -159.5q-12 -53 13 -103t74 -74q17 -9 51 -15.5t71.5 -8t62.5 14t20 48.5zM383 86q3 -15 -5 -27.5t-23 -15.5
+q-14 -3 -26.5 5t-15.5 23q-3 14 5 27t22 16t27 -5t16 -23zM953 -177q12 -17 8.5 -37.5t-20.5 -32.5t-37.5 -8t-32.5 21q-11 17 -7.5 37.5t20.5 32.5t37.5 8t31.5 -21zM177 635q-18 -27 -49.5 -33t-57.5 13q-26 18 -32 50t12 58q18 27 49.5 33t57.5 -12q26 -19 32 -50.5
+t-12 -58.5zM1467 -42q19 -28 13 -61.5t-34 -52.5t-60.5 -13t-51.5 34t-13 61t33 53q28 19 60.5 13t52.5 -34zM1579 562q69 -113 42.5 -244.5t-134.5 -207.5q-90 -63 -199 -60q-20 -80 -84.5 -127t-143.5 -44.5t-140 57.5q-12 -9 -13 -10q-103 -71 -225 -48.5t-193 126.5
+q-50 73 -53 164q-83 14 -142.5 70.5t-80.5 128t-2 152t81 138.5q-36 60 -38 128t24.5 125t79.5 98.5t121 50.5q32 85 99 148t146.5 91.5t168 17t159.5 -66.5q72 21 140 17.5t128.5 -36t104.5 -80t67.5 -115t17.5 -140.5q52 -16 87 -57t45.5 -89t-5.5 -99.5t-58 -87.5z
+M455 1222q14 -20 9.5 -44.5t-24.5 -38.5q-19 -14 -43.5 -9.5t-37.5 24.5q-14 20 -9.5 44.5t24.5 38.5q19 14 43.5 9.5t37.5 -24.5zM614 1503q4 -16 -5 -30.5t-26 -18.5t-31 5.5t-18 26.5q-3 17 6.5 31t25.5 18q17 4 31 -5.5t17 -26.5zM1800 555q4 -20 -6.5 -37t-30.5 -21
+q-19 -4 -36 6.5t-21 30.5t6.5 37t30.5 22q20 4 36.5 -7.5t20.5 -30.5zM1136 1448q16 -27 8.5 -58.5t-35.5 -47.5q-27 -16 -57.5 -8.5t-46.5 34.5q-16 28 -8.5 59t34.5 48t58 9t47 -36zM1882 792q4 -15 -4 -27.5t-23 -16.5q-15 -3 -27.5 5.5t-15.5 22.5q-3 15 5 28t23 16
+q14 3 26.5 -5t15.5 -23zM1691 1033q15 -22 10.5 -49t-26.5 -43q-22 -15 -49 -10t-42 27t-10 49t27 43t48.5 11t41.5 -28z" />
+    <glyph glyph-name="uniF2E1" unicode="&#xf2e1;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2E2" unicode="&#xf2e2;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2E3" unicode="&#xf2e3;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2E4" unicode="&#xf2e4;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2E5" unicode="&#xf2e5;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2E6" unicode="&#xf2e6;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2E7" unicode="&#xf2e7;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="_698" unicode="&#xf2e8;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2E9" unicode="&#xf2e9;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2EA" unicode="&#xf2ea;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2EB" unicode="&#xf2eb;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2EC" unicode="&#xf2ec;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2ED" unicode="&#xf2ed;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2EE" unicode="&#xf2ee;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="lessequal" unicode="&#xf500;" horiz-adv-x="1792" 
+ />
+  </font>
+</defs></svg>
diff --git a/pluss-manage-page/src/main/resources/static/resources/fonts/fontawesome-webfont.ttf b/pluss-manage-page/src/main/resources/static/resources/fonts/fontawesome-webfont.ttf
new file mode 100644
index 0000000..35acda2
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/fonts/fontawesome-webfont.ttf differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/fonts/fontawesome-webfont.woff b/pluss-manage-page/src/main/resources/static/resources/fonts/fontawesome-webfont.woff
new file mode 100644
index 0000000..400014a
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/fonts/fontawesome-webfont.woff differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/fonts/fontawesome-webfont.woff2 b/pluss-manage-page/src/main/resources/static/resources/fonts/fontawesome-webfont.woff2
new file mode 100644
index 0000000..4d13fc6
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/fonts/fontawesome-webfont.woff2 differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/fonts/iconfont.eot b/pluss-manage-page/src/main/resources/static/resources/fonts/iconfont.eot
new file mode 100644
index 0000000..622d7ec
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/fonts/iconfont.eot differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/fonts/iconfont.svg b/pluss-manage-page/src/main/resources/static/resources/fonts/iconfont.svg
new file mode 100644
index 0000000..999ca1f
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/fonts/iconfont.svg
@@ -0,0 +1,554 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<!--
+2013-9-30: Created.
+-->
+<svg>
+<metadata>
+Created by iconfont
+</metadata>
+<defs>
+
+<font id="layui-icon" horiz-adv-x="1024" >
+  <font-face
+    font-family="layui-icon"
+    font-weight="500"
+    font-stretch="normal"
+    units-per-em="1024"
+    ascent="896"
+    descent="-128"
+  />
+    <missing-glyph />
+    
+    <glyph glyph-name="reply-fill" unicode="&#58897;" d="M507.904 835.5840000000001q93.184 1.024 175.104-33.792t143.872-94.72 97.792-141.312 36.864-174.592q1.024-88.064-30.208-165.888t-87.04-137.728-131.072-98.816-162.304-48.128q-22.528-3.072-48.128-5.12t-56.832-3.072-69.632 0-86.528 6.144q-106.496 10.24-158.208 26.624t-41.472 18.432q54.272 9.216 93.184 29.696 20.48 11.264 16.896 32.256t-19.968 39.424q-52.224 57.344-84.48 133.632t-34.304 164.352q-1.024 93.184 33.792 175.104t95.232 143.36 142.336 97.28 175.104 36.864zM707.584 385.024q0-26.624 18.432-45.568t45.056-18.944 45.568 18.944 18.944 45.568-18.944 45.056-45.568 18.432-45.056-18.432-18.432-45.056zM450.56 385.024q0-26.624 19.456-46.08t46.08-19.456q27.648 0 46.592 19.456t18.944 46.08q0 27.648-18.944 46.592t-46.592 18.944q-26.624 0-46.08-18.944t-19.456-46.592zM196.608 386.048q0-26.624 18.944-46.08t45.568-19.456q27.648 0 46.592 19.456t18.944 46.08-18.944 45.568-46.592 18.944q-26.624 0-45.568-18.944t-18.944-45.568z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="set-fill" unicode="&#58900;" d="M916.9398 445.2101l-69.9664 10.7833c-18.6619 2.863-38.1388 17.826-43.3424 33.2487-5.1618 15.3809-15.0883 65.4524-3.9288 80.6661l41.9004 57.135c11.1595 15.2346 9.3832 38.5985-3.9706 51.9314l-30.6364 30.6573c-13.3538 13.3538-36.7177 15.151-51.9314 3.9497l-57.135-41.8795c-15.2346-11.1804-39.4344-14.3987-53.7704-7.168-14.3569 7.2307-57.3022 35.7773-60.1652 54.4183l-10.7833 69.9664C570.3471 807.6016 552.542 822.8571 533.6712 822.8571h-43.34236734693877c-18.8709 0-36.6759-15.2555-39.5389-33.9174l-10.7833-69.9664c-2.863-18.6619-17.826-38.1388-33.2487-43.3424-15.4018-5.1827-65.4524-15.1092-80.687-3.9288L268.9567 713.5817c-15.2346 11.1804-38.6194 9.3832-51.9523-3.9497l-30.6364-30.6573c-13.3747-13.3538-15.151-36.7177-3.9706-51.9314l41.9004-57.135c11.1595-15.2346 14.3778-39.4136 7.168-53.7704-7.2307-14.3569-35.7773-57.2813-54.4183-60.1443l-69.9664-10.7833C88.3984 442.3471 73.1429 424.542 73.1429 405.6712v-43.34236734693877c0-18.8709 15.2555-36.6759 33.9174-39.5389l69.9664-10.7833c18.6619-2.863 38.1388-17.8469 43.3424-33.2487 5.1618-15.4018 15.0883-65.4733 3.9288-80.687l-41.9004-57.135c-11.1595-15.2346-9.3832-38.6194 3.9706-51.9314l30.6364-30.6573c13.3538-13.3538 36.7177-15.151 51.9523-3.9706l57.135 41.9213c15.2346 11.1386 39.4136 14.3778 53.7704 7.168 14.3569-7.2307 57.2813-35.7773 60.1443-54.4183l10.7833-69.9664c2.863-18.6619 20.6472-33.9174 39.5389-33.9174h43.34236734693877c18.8709 0 36.6759 15.2555 39.5389 33.9174l10.7833 69.9664c2.863 18.6619 17.826 38.1388 33.2487 43.3215 15.4018 5.1827 65.4524 15.0883 80.6661 3.9288l57.1559-41.9213c15.2346-11.1595 38.5985-9.3623 51.9314 3.9706l30.6364 30.6573c13.3747 13.3329 15.151 36.7177 3.9706 51.9314l-41.9004 57.135c-11.1595 15.2346-14.3778 39.4136-7.168 53.7496 7.2307 14.3778 35.7773 57.3231 54.4183 60.1861l69.9664 10.7833c18.6619 2.863 33.9174 20.6472 33.9174 39.5389v43.34236734693877C950.8571 424.542 935.6016 442.3471 916.9398 445.2101zM512 210.4633c-95.838 0-173.5367 77.6986-173.5367 173.5367s77.6986 173.5367 173.5367 173.5367 173.5367-77.6986 173.5367-173.5367S607.838 210.4633 512 210.4633zM512 384m-104.7824 0a5.014 5.014 0 1 1 209.5647 0 5.014 5.014 0 1 1-209.5647 0Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="menu-fill" unicode="&#58895;" d="M511.999488 834.254727c-248.678712 0-450.273176-201.585181-450.273176-450.254727s201.594464-450.254727 450.273176-450.254727 450.273176 201.585181 450.273176 450.254727S760.6782 834.254727 511.999488 834.254727zM266.371377 589.705012l491.256222 0 0-33.772174L266.371377 555.932838 266.371377 589.705012zM757.627599 178.29396499999996L266.371377 178.29396499999996l0 33.773198 491.256222 0L757.627599 178.29396499999996zM140.487278 367.11340099999995l0 33.771151 743.024421 0 0-33.771151L140.487278 367.11340099999995z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="search" unicode="&#58901;" d="M439.323351 120.52219c-49.280352 0-97.09834 9.656941-142.126681 28.699646-43.480015 18.388812-82.522793 44.706201-116.043584 78.225619s-59.841305 72.560596-78.230871 116.03883C83.878729 388.513804 74.222416 436.330856 74.222416 485.609189c0 49.284473 9.656313 97.104595 28.699798 142.133138 18.388542 43.479257 44.71008 82.520435 78.231894 116.03883 33.518745 33.515325 72.562546 59.832713 116.043584 78.219479 45.027318 19.039635 92.846329 28.694529 142.125658 28.694529 49.280352 0 97.099364-9.653871 142.126681-28.694529 43.481039-18.385742 82.525863-44.704155 116.044608-78.220502 33.520791-33.518395 59.842328-72.559573 78.230871-116.03883 19.042462-45.028543 28.699798-92.848665 28.699798-142.133138 0-49.278333-9.657336-97.095385-28.701845-142.122905-18.388542-43.47721-44.708033-82.520435-78.228824-116.03883s-72.563569-59.838853-116.043584-78.226642C536.422715 130.177084 488.603703 120.52219 439.323351 120.52219zM439.323351 797.483242c-171.975699 0-311.887855-139.906423-311.887855-311.875077S267.347652 173.734112 439.323351 173.734112s311.887855 139.907447 311.887855 311.874053S611.299051 797.483242 439.323351 797.483242zM890.678206-48.734702c-22.121716 0-42.90387 8.562003-58.541653 24.115234L674.672953 128.025071l37.039062 38.20616 157.888289-153.058978c5.606924-5.606695 13.091693-8.692986 21.077901-8.692986 7.983139 0 15.464837 3.087315 21.070738 8.69094 5.616135 5.622044 8.715856 13.126972 8.715856 21.123087 0 7.980765-3.091535 15.46318-8.702552 21.067828l-0.301888 0.306992L758.714395 213.230662l38.207726 37.035498 152.611906-157.427472c15.571265-15.638165 24.144876-36.422538 24.144876-58.549487 0-22.195511-8.625801-43.054585-24.287121-58.735729C933.723298-40.112324 912.876674-48.734702 890.678206-48.734702zM281.015489 327.245392c-42.340005 42.320874-65.652899 98.584296-65.643689 158.421102 0.008187 59.818387 23.319034 116.074645 65.637549 158.4078l37.634651-37.619806c-66.60666-66.629513-66.60973-175.00071-0.007163-241.577011L281.015489 327.245392z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="share" unicode="&#58945;" d="M769.714 306.453c-51.754 0-97.702-24.851-126.571-63.269L394.479 367.94100000000003c3.93 13.798 6.034 28.364 6.034 43.424 0 16.496-2.527 32.399-7.211 47.35l247.724 124.288c28.71-40.052 75.647-66.151 128.687-66.151 87.388 0 158.229 70.84 158.229 158.229 0 87.388-70.841 158.229-158.229 158.229-87.389 0-158.229-70.841-158.229-158.229 0-6.046 0.352-12.009 1.011-17.88L351.22 526.116c-28.371 26.943-66.723 43.479-108.938 43.479-87.388 0-158.229-70.84-158.229-158.229s70.84-158.229 158.229-158.229c43.752 0 83.354 17.758 111.997 46.459l258.676-129.779c-0.964-7.062-1.474-14.266-1.474-21.592 0-87.389 70.84-158.229 158.229-158.229s158.229 70.84 158.229 158.229C927.938 235.61199999999997 857.103 306.453 769.714 306.453L769.714 306.453z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="set-sm" unicode="&#58912;" d="M946.367 405.895c0.02 21.85-13.04 38.49-31.74 41.57-18.69 3.07-79.05 13.01-85.99 14.14-6.95 1.15-14.09 8.07-15.4 11.45-1.32 3.37-8.94 22.2-11.87 29.46-2.95 7.27-1.92 16.58 4.39 25.52 6.3 8.93 39.9 55.87 48.38 67.72 8.49 11.87 8.65 34.61-4.84 48.39-13.48 13.78-47.75 47.09-56.73 55.86-8.99 8.76-31.08 8.64-42.67 0.43-11.58-8.2-71.69-51.01-71.69-51.01s-9.97-6.89-20.67-2.64c-10.7 4.24-33.43 14.07-33.43 14.07s-7.19 5.43-9.68 19.79c-2.5 14.37-11.11 65.28-14.07 82.7-2.97 17.42-20.67 29.62-37.83 29.46-17.16-0.14-57.91 0-74.33 0s-32.26-15.68-34.75-29.46c-2.49-13.79-11.56-69.16-14.07-84.45-2.52-15.3-11.44-18.48-11.44-18.48s-19.56-8.06-29.91-12.31c-10.34-4.26-15.39-2.64-30.35 7.48-14.95 10.11-44.74 31.03-63.04 43.83-18.3 12.81-38.12 7.92-49.26-3.52s-36.06-35.77-51.02-50.43c-14.95-14.66-12.61-37.54 0.58-55.71 13.2-18.18 32.34-45.43 41.35-58.21 9.01-12.78 10.84-19.5 8.36-26.82-2.49-7.34-6.64-16.58-11.43-27.72-4.81-11.13-9.69-13.64-27.86-17.01-17.36-3.21-58.42-9.92-77.4-13.31-18.99-3.37-30.66-21.43-30.66-41.81l0-64.66c0-24.34 13.2-37.24 38.42-41.93 25.22-4.69 62.66-10.66 74.77-12.61 12.1-1.95 17.67-6.6 21.41-15.54 3.73-8.94 5.13-10.12 9.37-22.57 4.26-12.47 6.46-15.55-4.98-31.67-11.44-16.13-34.31-48.11-46.03-64.51-11.74-16.4-6.45-37.83 4.98-49.85 11.44-12.03 35.47-35.64 48.97-48.97 13.49-13.33 35.19-16.28 53.36-3.52 18.19 12.75 54.98 38.99 65.69 46.62 10.7 7.63 21.91 5.28 27.85 2.94 5.94-2.35 11.25-4.6 22-9.1 10.73-4.48 13.85-11.2 16.41-23.45 2.57-12.24 10.19-56.85 13.93-78.59 3.75-21.72 18.91-33.43 40.62-33.72 21.7-0.29 33.27-0.12 61.57 0 28.29 0.13 41.86 12.61 45.45 31.38 3.59 18.76 12.45 72.94 14.22 83.72 1.78 10.76 5.94 14.73 13.63 18.47 7.7 3.74 14.32 6.47 26.84 11.88 12.51 5.4 18.91 0.66 27.7-5.72 8.8-6.39 47.51-33.78 63.78-45.31 16.28-11.53 36.73-10.33 51.9 4.4 15.18 14.73 31.62 30.99 49.27 48.38 17.64 17.4 12.16 39.59 4.4 51.46-7.77 11.88-44.49 62.95-49.71 70.23-5.21 7.28-4.4 18.62-1.75 24.63 2.64 6.01 8.44 18.24 11.72 25.22 3.29 6.97 9.6 11.22 18.18 12.9 8.58 1.69 62.72 11 83.75 14.61 21.03 3.64 31.11 19.92 31.26 39.92C946.427 359.93499999999995 946.347 388.525 946.367 405.895zM908.587 338.615c0.21-5.76-4.66-10.65-8.82-11.38-4.17-0.73-63.26-11.38-81.48-14.29-18.21-2.92-33.23-15.07-38.72-28.06-3.98-9.44-5.47-13.51-10.59-26.96-5.12-13.44-4.64-32.19 2.56-42.26 7.2-10.08 46.82-64.9 50.38-70.45s4.27-11.95-1.28-17.5-40.99-41.2-47.39-47.39c-6.41-6.19-11.83-4.8-18.79 0-6.95 4.8-39.61 26.39-64.44 44.36-16.96 12.28-32.82 12.43-48.7 6.02-15.87-6.42 1.28 0.28-22.2-8.97-23.48-9.25-30.23-27.62-33.73-48.24-3.5-20.63-10.67-62.98-11.95-70.45-1.28-7.47-5.55-11.1-13.66-11.1l-64.9 0c-8.11 0-11.74 2.99-14.52 11.95-2.77 8.97-10.03 54.87-12.8 74.29-2.78 19.43-13.82 36.12-24.77 40.56-10.94 4.45-4.98 2.14-27.32 11.1-22.34 8.97-39.63 4.5-51.23-3.84-11.61-8.34-58.64-42.69-65.33-46.96-6.68-4.28-14.65-3.28-18.35 0.42-3.7 3.7-40.56 40.56-46.54 46.54-5.98 5.98-5.36 12.92 0 20.49 5.36 7.58 28.39 40.76 40.99 57.95 12.59 17.2 17.93 34.74 9.82 53.49-8.12 18.74-4.42 10.24-12.39 28.6-7.96 18.36-24.28 24.46-38.42 26.9-14.14 2.43-68.88 11.53-76.85 13.23-7.97 1.71-11.95 7.26-11.95 14.09l0 66.18c0 9.53 7.67 12.44 12.38 13.23 4.7 0.8 54.22 9.18 73 12.39 18.79 3.2 36.36 11.32 43.55 29.03 7.19 17.7 4.27 11.1 11.1 27.32 6.83 16.23 3.8 33.94-7.68 49.96-11.49 16.01-38.85 54-44.4 61.9-5.55 7.9-5.77 12.6 0.85 19.21 6.62 6.62 42.05 42.48 46.96 46.97 4.91 4.48 12.07 5.4 18.36 0.85 6.3-4.55 49.31-35.65 64.04-46.11 14.73-10.46 32.35-12.56 49.1-5.55 16.75 7.02 10.25 4.48 26.9 11.1s24.84 19.09 28.18 39.71c3.33 20.61 11.95 74.14 12.81 77.7 0.85 3.55 5.55 10.46 11.74 10.46s65.82-0.07 69.8 0c3.99 0.07 10.3-3.29 11.32-9.18 1.02-5.9 13.02-74.29 14.94-86.25 1.92-11.95 15.58-28.57 25.54-32.73 9.96-4.16 21.35-8.75 31.31-13.09 9.97-4.34 30.13-1.91 36.15 2.28 6.03 4.18 70.52 48.81 75.43 52.37 4.91 3.56 11.52 3.27 17.64-2.85s43.34-43.19 47.54-47.53c4.19-4.34 4.66-8.66 1.14-13.66-3.53-5.01-36.72-51.8-47.54-67.46-10.81-15.65-11.73-33.73-5.41-48.96 6.33-15.22 3.99-9.39 9.11-21.91 5.13-12.53 16.28-29.03 33.59-31.88 17.31-2.85 76.92-12.74 84.82-13.95 7.9-1.21 11.1-7.18 11.1-13.37S908.377 344.385 908.587 338.615zM526.833 573.1949999999999c-110.45 0-200-89.54-200-200s89.55-200 200-200c110.46 0 200 89.54 200 200S637.293 573.1949999999999 526.833 573.1949999999999zM526.833 208.19500000000005c-91.12 0-165 73.87-165 165s73.88 165 165 165c91.13 0 165-73.87 165-165S617.963 208.19500000000005 526.833 208.19500000000005z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="engine" unicode="&#58920;" d="M422.214332 360.70413299999996L186.183684 360.70413299999996l0 46.568461 236.030648 0c10.379577 40.075407 46.47537 69.794509 89.785668 69.794509 51.432433 0 93.067103-41.657943 93.067103-93.067103C605.067103 332.56756700000005 563.40916 290.909624 512 290.909624 468.689703 290.909624 432.593909 320.65199900000005 422.214332 360.70413299999996L422.214332 360.70413299999996zM512 779.634098c-218.529658 0-395.634098-177.10444-395.634098-395.634098 0-218.529658 177.10444-395.634098 395.634098-395.634098 154.76275 0 288.417257 89.064217 353.440885 218.55293l101.398692-59.112389-23.063141-39.959044-62.161099 35.909613c-33.745261-51.595341-77.42792-96.115813-129.093079-129.744711l35.653614-61.765464-40.308133-23.295867-35.653614 61.765464c-53.620057-27.345298-113.360805-44.404109-176.894987-47.73209L535.319139-127.99706800000001l-46.568461 0 0 70.981412c-63.534182 3.327981-123.27493 20.386792-176.894987 47.73209l-35.653614-61.765464-40.308133 23.295867 35.653614 61.765464c-51.665159 33.628898-95.347818 78.149371-129.093079 129.744711l-62.161099-35.909613-23.295867 40.308133 62.114553 35.863067c-27.415116 53.550239-44.799743 113.104807-48.127724 176.685534L0.002932 360.70413299999996l0 46.568461 70.958139 0c3.327981 63.580727 20.712609 123.135295 48.127724 176.685534l-62.114553 35.863067 23.295867 40.308133 62.161099-35.909613c33.745261 51.595341 77.42792 96.115813 129.093079 129.744711l-35.653614 61.765464 40.308133 23.295867 35.653614-61.765464c53.620057 27.345298 113.360805 44.404109 176.894987 47.73209L488.727406 895.997068l46.568461 0 0-70.981412c63.534182-3.327981 123.27493-20.386792 176.894987-47.73209l35.653614 61.765464 40.308133-23.295867-35.653614-61.765464c51.665159-33.628898 95.347818-78.149371 129.093079-129.744711l62.161099 35.909613 23.063141-39.959044-101.398692-59.112389C800.417257 690.569881 666.76275 779.634098 512 779.634098L512 779.634098z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="close" unicode="&#4102;" d="M783.483 701.249L512 429.775 240.517 701.249c-10.082 10.083-26.429 10.083-36.51 0-10.083-10.082-10.083-26.429 0-36.509l271.481-271.475L204.008 121.78800000000001c-10.083-10.081-10.083-26.428 0-36.508 10.082-10.082 26.429-10.082 36.51 0L512 356.755l271.483-271.475c10.082-10.082 26.429-10.082 36.513 0 10.081 10.083 10.081 26.428 0 36.508L548.51 393.265l271.485 271.474c10.081 10.083 10.081 26.429 0 36.509C809.912 711.33 793.564 711.33 783.483 701.249z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="close-fill" unicode="&#4103;" d="M512 822.022125c-217.47508 0-394.423141-176.949085-394.423141-394.423141 0-217.474057 176.948061-394.422118 394.423141-394.422118 217.473033 0 394.422118 176.948061 394.422118 394.422118C906.422118 645.07304 729.473033 822.022125 512 822.022125zM702.228529 270.92978200000005c8.030907-8.030907 8.030907-21.052478 0-29.083385s-21.052478-8.030907-29.083385 0L512 402.992563 350.853833 241.84741899999995c-8.030907-8.030907-21.052478-8.030907-29.083385 0s-8.030907 21.052478 0 29.083385l161.146167 161.146167L321.771471 593.222115c-8.030907 8.030907-8.030907 21.052478 0 29.083385s21.052478 8.030907 29.083385 0l161.146167-161.146167L673.145144 622.305501c8.030907 8.030907 21.052478 8.030907 29.083385 0s8.030907-21.052478 0-29.083385L541.082362 432.075949 702.228529 270.92978200000005z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="chart-screen" unicode="&#58921;" d="M963.930903 179.21903299999997l0 34.824133-37.354769-2.675946L926.576133 694.8538169999999 691.413206 694.8538169999999l0 70.462818L330.260819 765.316635l0-70.462818L95.690386 694.8538169999999l0-480.809627-35.621289 0 0-34.824133 432.583253 0 0-141.228535-90.313935 0 0-35.307134 216.753649 0 0 35.307134-90.313935 0L528.778128 179.21903299999997 963.930903 179.21903299999997zM366.212636 730.008478L655.216819 730.008478l0-35.307134L366.212636 694.7013440000001 366.212636 730.008478zM364.817869 332.73133600000006L222.224244 406.252817l14.295588 27.736715 123.238812-63.523779 173.928285 159.755494 127.5807-92.634794 93.13826 122.414027 12.420891-9.449209 12.420891-9.449209L667.639756 394.365068l-131.636063 95.621824L364.817869 332.73133600000006z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="star" unicode="&#58880;" d="M749.624889-84.152889c-15.672889 0-31.246222 3.882667-45.084444 11.306667l-192.526222 103.637333L319.544889-72.817778c-31.203556-16.64-70.314667-14.392889-99.043556 5.304889-29.511111 20.337778-44.743111 55.921778-38.840889 90.695111l37.703111 225.251556L56.661333 410.908444c-25.002667 24.888889-33.464889 60.984889-22.058667 94.193778 11.349333 32.910222 40.064 56.576 74.965333 61.752889l221.326222 32.896 96.128 199.580444c15.488 32.085333 48.853333 52.807111 84.992 52.807111 36.167111 0 69.518222-20.736 84.963556-52.807111l96.156444-199.580444 221.297778-32.910222c34.872889-5.162667 63.616-28.8 74.979556-61.696 11.392-33.28 2.944-69.361778-22.030222-94.250667L804.622222 248.433778l37.745778-225.28c5.845333-34.773333-9.386667-70.357333-38.812444-90.638222C787.569778-78.392889 768.938667-84.152889 749.624889-84.152889zM512.014222 91.548444c4.636444 0 9.272889-1.137778 13.482667-3.384889l205.937778-110.862222c12.373333-6.641778 28.316444-5.802667 39.936 2.133333 11.392 7.836444 17.123556 21.006222 14.890667 34.304L746.097778 253.496889c-1.507556 9.088 1.450667 18.332444 7.964444 24.832l173.141333 172.842667c9.457778 9.429333 12.686222 23.025778 8.405333 35.484444-4.380444 12.672-15.701333 21.873778-29.525333 23.921778L669.866667 545.706667c-9.315556 1.379556-17.365333 7.296-21.447111 15.786667L545.720889 774.641778c-6.030222 12.529778-19.256889 20.608-33.706667 20.608s-27.690667-8.092444-33.763556-20.622222L375.608889 561.493333c-4.081778-8.490667-12.131556-14.407111-21.447111-15.786667L117.930667 510.577778c-13.624889-2.033778-25.201778-11.434667-29.539556-23.992889-4.266667-12.416-1.024-25.984 8.433778-35.399111L269.937778 278.328889c6.513778-6.499556 9.472-15.744 7.964444-24.832l-40.135111-239.744c-2.247111-13.312 3.484444-26.439111 14.976-34.360889 11.434667-7.836444 27.349333-8.775111 39.950222-2.062222l205.852444 110.833778C502.741333 90.410667 507.377778 91.548444 512.014222 91.548444zM200.32 439.210667c-6.840889 0-12.885333 4.963556-14.023111 11.946667-1.251556 7.751111 4.010667 15.061333 11.761778 16.312889l9.443556 1.536c7.793778 1.336889 15.061333-4.010667 16.312889-11.761778 1.251556-7.751111-4.010667-15.061333-11.761778-16.312889l-9.443556-1.536C201.856 439.267556 201.073778 439.210667 200.32 439.210667zM252.544 447.687111c-6.684444 0-12.643556 4.721778-13.937778 11.534222-1.493333 7.708444 3.555556 15.175111 11.264 16.654222l153.927111 29.696 58.055111 133.148444c3.157333 7.182222 11.548444 10.496 18.716444 7.352889 7.210667-3.143111 10.510222-11.52 7.367111-18.716444l-61.056-140.017778c-1.877333-4.295111-5.745778-7.395556-10.353778-8.277333l-161.28-31.118222C254.336 447.758222 253.44 447.687111 252.544 447.687111z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="circle-dot" unicode="&#58903;" d="M513.133312 830.6731560000001c-247.538793 0-448.208115-200.669322-448.208115-448.207092 0-247.538793 200.670346-448.208115 448.208115-448.208115 247.538793 0 448.208115 200.670346 448.208115 448.208115C961.341427 630.004857 760.673128 830.6731560000001 513.133312 830.6731560000001zM513.132288-6.649187999999981c-214.901465 0-389.113205 174.212764-389.113205 389.114229 0 214.902488 174.21174 389.115252 389.113205 389.115252 214.903511 0 389.115252-174.212764 389.115252-389.115252C902.24754 167.563576 728.0358-6.649187999999981 513.132288-6.649187999999981zM513.133312 382.46504100000004m-344.602456 0a336.754 336.754 0 1 1 689.204911 0 336.754 336.754 0 1 1-689.204911 0Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="chat" unicode="&#58886;" d="M132.682393 414.567179c0 208.287837 166.471452 377.143593 379.317095 377.143593s385.380184-168.855756 385.380184-377.143593c0-177.196725-122.197086-325.812507-290.49821-366.259708l-116.291586-51.04763 0 41.126676C290.570353 52.175568999999996 132.682393 215.31206599999996 132.682393 414.567179zM83.799056 414.567179c0-211.946157 160.764474-387.135154 369.469819-415.152255-3.2623-20.458961-10.036587-65.024969-7.286963-65.024969 2.384303 0 114.89068 47.294143 189.700503 78.865185 176.193885 51.91437 304.518528 211.946157 304.518528 401.312038 0 231.432976-191.70823 419.042865-428.200432 419.042865S83.799056 646.0001560000001 83.799056 414.567179zM340.71952 276.63573699999995c22.935362-41.481763 89.831958-75.102489 170.391738-75.102489 79.650061 0 148.489916 32.909527 172.168198 73.681116-12.701277 5.979178-19.068288 8.02886-28.131711 12.21009-19.894096-31.257911-75.425853-59.661821-142.729725-59.661821-66.969251 0-122.836653 28.40391-143.598512 61.083194L340.71952 276.63573699999995z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="release" unicode="&#58889;" d="M990.78144 828.5388800000001c-3.35872 1.59744-7.04512 2.37568-11.01824 2.37568-14.45888 0-27.60704-10.81344-27.40224-10.81344-8.8064-4.42368-880.59904-443.22816-911.44192-459.44832-17.408-9.13408-27.36128-24.73984-25.92768-40.71424 1.10592-13.14816 9.78944-23.51104 23.10144-27.77088 26.17344-8.27392 290.24256-91.58656 290.24256-91.58656l4.83328-1.47456 16.67072 50.05312-254.32064 79.54432 780.73856 406.28224c-82.82112-93.88032-420.53632-476.32384-436.10112-493.93664-20.11136-22.48704-29.4912-45.09696-29.40928-70.98368l0.28672-153.27232-0.08192 0c0 0 0.08192-53.49376 0.08192-53.6576l0-1.96608 0 0c1.18784-13.5168 12.73856-24.24832 26.54208-24.24832s25.51808 10.73152 26.74688 24.24832l0 0c0 0 0.53248 191.03744 0 205.08672-0.49152 12.4928 5.07904 26.54208 10.69056 33.05472 5.65248 6.38976 390.63552 442.61376 465.75616 527.81056-21.38112-106.41408-126.68928-629.76-128.24576-637.41952-0.8192-4.05504-2.58048-4.05504-3.35872-4.05504-0.6144 0-1.31072 0.12288-2.048 0.36864-7.45472 2.37568-268.82048 81.55136-279.92064 84.91008l-4.7104 1.4336-17.16224-50.50368 5.07904-1.59744c2.58048-0.77824 258.90816-79.09376 284.38528-86.46656 5.07904-1.47456 10.24-2.2528 15.44192-2.2528 26.99264 0 49.5616 19.37408 54.8864 46.98112 2.08896 10.93632 27.0336 134.67648 55.9104 277.99552 39.77216 197.14048 84.7872 420.61824 85.93408 427.6224l0.6144 3.31776C1009.70496 798.96576 1013.26848 817.9712 990.78144 828.5388800000001z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="list" unicode="&#58890;" d="M618.04471 733.97072l-397.175835 0c-16.927531 0-30.699186-13.771655-30.699186-30.699186l0-638.543068c0-16.927531 13.771655-30.699186 30.699186-30.699186l582.261227 0c16.927531 0 30.699186 13.771655 30.699186 30.699186l-0.726547 476.760404L618.04471 733.97072zM803.771715 541.488871 619.537713 541.488871 619.537713 705.552483 803.771715 541.488871zM813.363164 64.728466c0-5.64251-4.590552-10.233062-10.233062-10.233062l-582.261227 0c-5.64251 0-10.233062 4.590552-10.233062 10.233062l0 638.543068c0 5.64251 4.590552 10.233062 10.233062 10.233062l378.202715 0 0-192.481849 214.291574 0L813.363164 64.728466zM298.129516 482.495268l55.258535 0 0-55.258535-55.258535 0 0 55.258535ZM399.777591 468.168981l323.364759 0 0-26.605961-323.364759 0 0 26.605961ZM298.129516 342.044446l55.258535 0 0-55.258535-55.258535 0 0 55.258535ZM399.777591 327.718159l323.364759 0 0-26.605961-323.364759 0 0 26.605961ZM298.129516 199.804884l55.258535 0 0-55.258535-55.258535 0 0 55.258535ZM399.777591 185.478598l323.364759 0 0-26.605961-323.364759 0 0 26.605961ZM881.315812 53.053566"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="chart" unicode="&#58924;" d="M953.440991 315.668729L784.061302 315.668729 681.06451 437.392024c-0.312108 0.373507-0.635473 0.737804-0.969071 1.094938-0.013303 0.014326-0.026606 0.027629-0.039909 0.041956-0.276293 0.293689-0.559748 0.582261-0.851391 0.86367-0.053212 0.051165-0.107447 0.099261-0.160659 0.150426-0.249687 0.237407-0.50142 0.470721-0.76134 0.697895-0.089028 0.078795-0.181125 0.153496-0.272199 0.230244-0.225127 0.191358-0.451278 0.381693-0.683569 0.565888-0.124843 0.099261-0.251733 0.192382-0.3776 0.288572-0.200568 0.153496-0.402159 0.306992-0.607844 0.454348-0.159636 0.11461-0.322341 0.224104-0.485047 0.334621-0.177032 0.12075-0.354064 0.242524-0.535189 0.35918-0.195451 0.12689-0.394996 0.246617-0.593518 0.367367-0.152473 0.092098-0.302899 0.186242-0.457418 0.275269-0.237407 0.137123-0.477884 0.268106-0.718361 0.397043-0.121773 0.065492-0.2415 0.132006-0.364297 0.195451-0.283456 0.146333-0.571005 0.285502-0.859577 0.420579-0.085958 0.040932-0.170892 0.082888-0.257873 0.122797-0.337691 0.154519-0.679475 0.298805-1.022283 0.437975-0.044002 0.017396-0.086981 0.036839-0.130983 0.055259-1.604544 0.638543-3.2623 1.113357-4.948709 1.416256-0.343831 0.062422-0.687662 0.112564-1.031493 0.160659-0.055259 0.008186-0.110517 0.01842-0.165776 0.025583-1.633197 0.216941-3.25923 0.26913-4.861728 0.173962-0.013303-0.001023-0.026606-0.001023-0.040932-0.002047-0.363274-0.022513-0.724501-0.054235-1.085728-0.091074-0.060375-0.00614-0.119727-0.011256-0.180102-0.017396-0.310062-0.034792-0.618077-0.077771-0.926092-0.122797-0.116657-0.017396-0.232291-0.032746-0.348947-0.051165-0.24764-0.040932-0.494257-0.086981-0.740874-0.135076-0.178055-0.033769-0.355087-0.067538-0.532119-0.105401-0.183172-0.039909-0.36532-0.083911-0.547469-0.127913-0.237407-0.056282-0.474814-0.113587-0.710175-0.176009-0.12075-0.032746-0.240477-0.068562-0.360204-0.102331-0.292666-0.082888-0.584308-0.168846-0.874927-0.26299-0.063445-0.020466-0.125867-0.042979-0.188288-0.063445-0.338714-0.112564-0.675382-0.230244-1.010003-0.357134-0.019443-0.007163-0.038886-0.01535-0.058328-0.022513-1.493004-0.571005-2.948145-1.284249-4.340865-2.149966-0.067538-0.041956-0.13303-0.088004-0.200568-0.12996-0.273223-0.172939-0.545422-0.346901-0.813528-0.531096-1.416256-0.971118-2.734274-2.089591-3.936659-3.333932-0.025583-0.026606-0.049119-0.053212-0.074701-0.079818-0.26299-0.275269-0.521886-0.555655-0.773619-0.843204-0.058328-0.066515-0.112564-0.134053-0.169869-0.200568-0.211824-0.246617-0.420579-0.496304-0.62217-0.751107-0.083911-0.106424-0.164752-0.214894-0.246617-0.322341-0.167822-0.218988-0.334621-0.437975-0.49528-0.663102-0.102331-0.14224-0.199545-0.287549-0.298805-0.431835-0.13303-0.194428-0.26606-0.387833-0.393973-0.586354-0.115634-0.179079-0.225127-0.360204-0.335644-0.541329-0.103354-0.168846-0.207731-0.336668-0.306992-0.508583-0.12689-0.220011-0.24764-0.443092-0.36839-0.666172-0.074701-0.138146-0.151449-0.275269-0.223081-0.416486-0.137123-0.265036-0.265036-0.533143-0.39295-0.802272-0.050142-0.105401-0.101307-0.209778-0.150426-0.316202-0.144286-0.317225-0.279363-0.63752-0.410346-0.958838-0.026606-0.064468-0.055259-0.127913-0.080841-0.193405-0.150426-0.378623-0.291642-0.760317-0.423649-1.14508-0.005117-0.016373-0.011256-0.031722-0.017396-0.048095-0.157589-0.463558-0.303922-0.930185-0.434905-1.400906l-97.897657-342.642824L435.093423 811.832042c-0.071631 0.569982-0.165776 1.13587-0.275269 1.696642-0.008186 0.040932-0.017396 0.081864-0.025583 0.12382-0.071631 0.356111-0.148379 0.709151-0.234337 1.061169-0.031722 0.128937-0.065492 0.255827-0.099261 0.38374-0.066515 0.254803-0.135076 0.508583-0.208754 0.760317-0.060375 0.206708-0.124843 0.411369-0.190335 0.615007-0.053212 0.166799-0.107447 0.332575-0.164752 0.49835-0.092098 0.26913-0.190335 0.535189-0.290619 0.800225-0.037862 0.098237-0.074701 0.196475-0.113587 0.293689-0.12382 0.313132-0.25378 0.623193-0.38988 0.930185-0.022513 0.050142-0.044002 0.100284-0.066515 0.150426-0.152473 0.338714-0.311085 0.672312-0.477884 1.00284-0.01228 0.024559-0.024559 0.049119-0.037862 0.074701-0.173962 0.343831-0.356111 0.682545-0.545422 1.017166-0.011256 0.019443-0.022513 0.039909-0.033769 0.059352-0.188288 0.330528-0.382717 0.654916-0.584308 0.975211-0.021489 0.034792-0.044002 0.068562-0.065492 0.103354-0.190335 0.298805-0.385786 0.592494-0.587378 0.88209-0.045025 0.065492-0.091074 0.12996-0.137123 0.194428-0.180102 0.252757-0.363274 0.502443-0.551562 0.74906-0.079818 0.105401-0.162706 0.208754-0.24457 0.312108-0.157589 0.199545-0.317225 0.396019-0.480954 0.590448-0.124843 0.149403-0.252757 0.295735-0.381693 0.442068-0.125867 0.14224-0.251733 0.284479-0.38067 0.424672-0.174985 0.191358-0.355087 0.378623-0.536212 0.563842-0.088004 0.090051-0.176009 0.180102-0.26606 0.26913-0.224104 0.222057-0.452301 0.440022-0.684592 0.653893-0.054235 0.050142-0.10847 0.100284-0.163729 0.150426-0.265036 0.240477-0.535189 0.474814-0.810459 0.704035-0.028653 0.023536-0.056282 0.047072-0.084934 0.070608-0.294712 0.243547-0.595564 0.479931-0.902556 0.711198-0.01535 0.011256-0.029676 0.022513-0.045025 0.033769-0.311085 0.232291-0.627287 0.458441-0.949628 0.677429-0.019443 0.013303-0.037862 0.025583-0.057305 0.038886-0.309038 0.208754-0.623193 0.411369-0.942465 0.606821-0.045025 0.027629-0.090051 0.054235-0.134053 0.081864-0.288572 0.174985-0.581238 0.343831-0.877997 0.50756-0.090051 0.050142-0.181125 0.098237-0.272199 0.147356-0.25071 0.134053-0.502443 0.265036-0.759293 0.391926-0.156566 0.077771-0.314155 0.151449-0.472767 0.226151-0.194428 0.091074-0.38988 0.182149-0.587378 0.268106-0.239454 0.105401-0.481977 0.204661-0.724501 0.302899-0.12382 0.049119-0.246617 0.100284-0.37146 0.148379-0.334621 0.128937-0.673335 0.249687-1.014096 0.36532-0.042979 0.014326-0.085958 0.029676-0.128937 0.044002-1.6158 0.536212-3.296069 0.915859-5.02034 1.119497-0.01535 0.002047-0.029676 0.004093-0.044002 0.00614-0.309038 0.035816-0.620124 0.062422-0.931209 0.086981-0.132006 0.010233-0.265036 0.025583-0.397043 0.033769-0.174985 0.011256-0.349971 0.01535-0.525979 0.022513-0.270153 0.01228-0.539282 0.024559-0.808412 0.027629-0.054235 0.001023-0.10847-0.001023-0.162706-0.001023-1.696642 0.010233-3.371794-0.149403-5.006014-0.466628-0.065492-0.01228-0.12996-0.027629-0.195451-0.039909-0.331551-0.067538-0.662079-0.13917-0.989537-0.218988-0.148379-0.035816-0.295735-0.075725-0.443092-0.11461-0.234337-0.061398-0.468674-0.124843-0.700965-0.192382-0.224104-0.065492-0.445138-0.135076-0.666172-0.206708-0.149403-0.048095-0.297782-0.096191-0.446162-0.147356-0.286526-0.098237-0.568958-0.201591-0.850367-0.309038-0.079818-0.030699-0.160659-0.061398-0.240477-0.093121-0.330528-0.12996-0.655939-0.267083-0.979304-0.410346-0.033769-0.01535-0.067538-0.029676-0.101307-0.045025-0.355087-0.159636-0.705058-0.325411-1.050935-0.500397-0.008186-0.004093-0.016373-0.008186-0.023536-0.01228-0.360204-0.182149-0.714268-0.372483-1.064238-0.569982-0.004093-0.002047-0.008186-0.005117-0.013303-0.007163-0.344854-0.196475-0.684592-0.399089-1.019213-0.610914-0.020466-0.013303-0.040932-0.025583-0.060375-0.038886-0.313132-0.199545-0.621147-0.404206-0.925069-0.61603-0.050142-0.034792-0.099261-0.070608-0.149403-0.105401-0.268106-0.190335-0.532119-0.38374-0.791016-0.583285-0.091074-0.069585-0.181125-0.141216-0.271176-0.212848-0.212848-0.167822-0.422625-0.337691-0.629333-0.512676-0.137123-0.11461-0.271176-0.232291-0.406253-0.349971-0.154519-0.1361-0.308015-0.272199-0.459464-0.412392-0.179079-0.164752-0.354064-0.332575-0.528026-0.502443-0.102331-0.100284-0.204661-0.199545-0.304945-0.301875-0.211824-0.212848-0.418532-0.430812-0.623193-0.651846-0.059352-0.064468-0.119727-0.128937-0.179079-0.194428-0.231267-0.254803-0.456395-0.515746-0.678452-0.780783-0.031722-0.037862-0.063445-0.075725-0.095167-0.11461-0.23536-0.285502-0.465604-0.577145-0.688685-0.874927-0.01842-0.024559-0.036839-0.048095-0.055259-0.072655-0.226151-0.301875-0.445138-0.60989-0.657986-0.923022-0.019443-0.028653-0.038886-0.057305-0.058328-0.084934-0.202615-0.300852-0.400113-0.606821-0.590448-0.916882-0.032746-0.053212-0.064468-0.105401-0.096191-0.158612-0.169869-0.282433-0.335644-0.567935-0.49528-0.857531-0.053212-0.097214-0.105401-0.194428-0.158612-0.292666-0.130983-0.24457-0.258896-0.490164-0.381693-0.73985-0.080841-0.162706-0.157589-0.326435-0.234337-0.491187-0.088004-0.189312-0.177032-0.378623-0.260943-0.571005-0.107447-0.245593-0.209778-0.493234-0.310062-0.741897-0.047072-0.11768-0.095167-0.234337-0.141216-0.354064-0.130983-0.340761-0.25378-0.684592-0.370437-1.030469-0.013303-0.037862-0.026606-0.075725-0.038886-0.113587-0.180102-0.543376-0.345877-1.092891-0.48914-1.650593L244.22942 305.59939599999996 67.355037 305.59939599999996c-14.128789 0-25.582655-11.453866-25.582655-25.582655s11.453866-25.582655 25.582655-25.582655l191.314257 0c0.867764 0 1.725294 0.044002 2.570545 0.128937 0.828878-0.080841 1.656733-0.1361 2.478448-0.1361 11.218506 0 21.512966 7.439436 24.644283 18.779715l113.358791 410.43686 103.412254-723.884758c0.00921-0.072655 0.021489-0.145309 0.030699-0.217964l0.046049-0.320295c0.002047-0.011256 0.005117-0.021489 0.00614-0.032746 0.109494-0.7552 0.25071-1.502213 0.425695-2.238994 0.01535-0.064468 0.031722-0.12689 0.047072-0.191358 0.166799-0.679475 0.358157-1.350764 0.579191-2.01182 0.041956-0.124843 0.088004-0.24764 0.130983-0.37146 0.210801-0.600681 0.437975-1.194198 0.692778-1.77646 0.068562-0.156566 0.144286-0.309038 0.215918-0.464581 0.223081-0.484024 0.460488-0.961908 0.713244-1.431605 0.106424-0.196475 0.213871-0.390903 0.325411-0.584308 0.265036-0.462534 0.545422-0.914836 0.838088-1.359974 0.088004-0.13303 0.170892-0.268106 0.260943-0.399089 0.354064-0.51677 0.732687-1.016143 1.12359-1.506307 0.078795-0.099261 0.156566-0.198521 0.237407-0.296759 0.420579-0.511653 0.864694-1.004887 1.325182-1.482771 0.051165-0.052189 0.101307-0.105401 0.152473-0.157589 0.494257-0.50449 1.010003-0.989537 1.548262-1.454118 0.00921-0.007163 0.017396-0.014326 0.026606-0.022513 1.636267-1.408069 3.466961-2.620687 5.466502-3.592828 0.075725-0.036839 0.151449-0.074701 0.228197-0.11154 0.576121-0.273223 1.165546-0.525979 1.768273-0.75827 0.158612-0.061398 0.319272-0.118704 0.478907-0.177032 0.558725-0.202615 1.124614-0.393973 1.704828-0.559748 0.005117-0.001023 0.010233-0.002047 0.01535-0.004093 0.278339-0.079818 0.562818-0.13917 0.844228-0.209778 0.394996-0.098237 0.789992-0.194428 1.184989-0.274246 0.283456-0.056282 0.568958-0.103354 0.854461-0.149403 0.445138-0.073678 0.889253-0.134053 1.333368-0.183172 0.229221-0.024559 0.456395-0.052189 0.686638-0.071631 0.710175-0.059352 1.418302-0.099261 2.122337-0.099261 0.337691 0 0.671289 0.027629 1.007957 0.040932 0.276293 0.011256 0.550539 0.013303 0.828878 0.033769 0.401136 0.029676 0.799202 0.079818 1.196245 0.127913 0.191358 0.022513 0.38067 0.033769 0.572028 0.061398 0.069585 0.010233 0.1361 0.024559 0.205685 0.034792 0.232291 0.034792 0.462534 0.075725 0.692778 0.116657 0.463558 0.082888 0.921999 0.176009 1.3743 0.283456 0.109494 0.025583 0.218988 0.047072 0.327458 0.074701 0.582261 0.145309 1.152243 0.316202 1.716084 0.499373 0.098237 0.031722 0.196475 0.063445 0.293689 0.097214 1.90335 0.644683 3.694135 1.50119 5.351891 2.540869 0.014326 0.00921 0.028653 0.01842 0.042979 0.027629 1.089821 0.686638 2.121314 1.452071 3.087315 2.287089 0.083911 0.071631 0.167822 0.143263 0.25071 0.215918 0.424672 0.3776 0.837064 0.76748 1.235131 1.170662 0.12382 0.124843 0.243547 0.254803 0.36532 0.382717 0.317225 0.334621 0.626263 0.677429 0.925069 1.028423 0.155543 0.183172 0.308015 0.36839 0.458441 0.556679 0.26606 0.331551 0.523933 0.670266 0.773619 1.01512 0.130983 0.180102 0.261966 0.35918 0.387833 0.543376 0.294712 0.429789 0.575098 0.86981 0.843204 1.316995 0.099261 0.165776 0.195451 0.334621 0.290619 0.503467 0.283456 0.499373 0.555655 1.004887 0.806365 1.52268 0.031722 0.065492 0.060375 0.13303 0.091074 0.199545 0.276293 0.584308 0.530073 1.178849 0.762363 1.784646 0.00614 0.017396 0.014326 0.034792 0.020466 0.051165 0.251733 0.661056 0.472767 1.336438 0.669242 2.020006 0.002047 0.008186 0.00614 0.016373 0.008186 0.024559l0.061398 0.215918c0.029676 0.106424 0.062422 0.210801 0.090051 0.317225l117.579929 411.527704 79.800487-94.308923c0.070608-0.083911 0.146333-0.161682 0.217964-0.243547 0.190335-0.220011 0.38374-0.436952 0.581238-0.649799 0.134053-0.144286 0.26913-0.285502 0.405229-0.425695 0.164752-0.168846 0.331551-0.335644 0.50142-0.500397 0.164752-0.159636 0.329505-0.319272 0.496304-0.473791 0.138146-0.12689 0.279363-0.25071 0.419556-0.37453 0.198521-0.174985 0.397043-0.350994 0.599657-0.518816 0.081864-0.067538 0.166799-0.132006 0.249687-0.198521 0.817622-0.661056 1.667989-1.264806 2.545986-1.811252 0.098237-0.061398 0.195451-0.125867 0.294712-0.185218 0.228197-0.138146 0.459464-0.267083 0.691755-0.398066 0.157589-0.089028 0.315178-0.178055 0.474814-0.264013 0.200568-0.107447 0.403183-0.208754 0.606821-0.311085 0.202615-0.101307 0.406253-0.201591 0.611937-0.297782 0.173962-0.080841 0.348947-0.159636 0.523933-0.237407 0.245593-0.10847 0.494257-0.212848 0.743944-0.313132 0.144286-0.058328 0.289596-0.115634 0.434905-0.171915 0.291642-0.11154 0.586354-0.216941 0.883113-0.317225 0.11154-0.037862 0.223081-0.076748 0.334621-0.113587 0.337691-0.109494 0.677429-0.210801 1.02126-0.305969 0.078795-0.021489 0.157589-0.046049 0.236384-0.066515 0.376577-0.101307 0.757247-0.193405 1.140986-0.277316 0.050142-0.011256 0.100284-0.023536 0.150426-0.034792 0.405229-0.085958 0.813528-0.162706 1.225921-0.229221 0.031722-0.005117 0.063445-0.01228 0.096191-0.017396 0.412392-0.065492 0.828878-0.12075 1.24741-0.165776 0.032746-0.004093 0.064468-0.00921 0.097214-0.01228 0.382717-0.039909 0.768503-0.068562 1.155313-0.092098 0.068562-0.004093 0.1361-0.01228 0.204661-0.01535 0.25992-0.013303 0.521886-0.01535 0.782829-0.020466 0.188288-0.004093 0.376577-0.01535 0.564865-0.01535 0.008186 0 0.01535 0.001023 0.023536 0.001023l181.208085 0c14.129812 0 25.582655 11.453866 25.582655 25.582655S967.56978 315.668729 953.440991 315.668729z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="ok-circle" unicode="&#4101;" d="M516.152065-63.152063c-60.696384 0-119.594819 11.894911-175.056991 35.353183-53.55473 22.651906-101.646028 55.073316-142.936433 96.364745-41.291428 41.291428-73.712839 89.381703-96.363721 142.936433-23.458271 55.462173-35.353183 114.359584-35.353183 175.055968s11.894911 119.594819 35.353183 175.056991c22.651906 53.55473 55.073316 101.646028 96.363721 142.936433 41.290405 41.291428 89.381703 73.712839 142.936433 96.363721 55.462173 23.458271 114.359584 35.353183 175.056991 35.353183s119.594819-11.894911 175.056991-35.353183c53.55473-22.651906 101.645005-55.073316 142.936433-96.363721 41.291428-41.290405 73.711815-89.38068 96.363721-142.936433 23.459295-55.462173 35.353183-114.359584 35.353183-175.056991 0-60.696384-11.893888-119.593795-35.353183-175.055968-22.651906-53.55473-55.072293-101.645005-96.363721-142.936433s-89.381703-73.712839-142.936433-96.364745C635.747907-51.25715200000002 576.849472-63.152063 516.152065-63.152063zM516.152065 774.870222c-214.115566 0-388.311956-174.196391-388.311956-388.311956s174.196391-388.311956 388.311956-388.311956 388.311956 174.196391 388.311956 388.311956S730.268654 774.870222 516.152065 774.870222zM434.74908 132.830517L209.49278 358.08784 289.087583 437.68162 434.74908 292.020122 743.218594 600.488613 822.812373 520.89381Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="layim-theme" unicode="&#58907;" d="M958.830745 538.643056L740.659817 692.753993l-100.539834 0-3.977591-9.332553c-0.37146-0.871857-38.021965-86.8613-124.772748-88.667435-35.691897 0.76441-67.206658 15.500019-93.680613 43.828204-20.658506 22.106484-30.374798 44.584428-30.456662 44.776809l-3.955078 9.393951-100.587929 0L64.518433 538.643056 169.320337 379.756349l89.956801 65.019853-19.016099-368.05254 268.86654 0 4.093225 0 269.866311 0-19.016099 368.051517 89.956801-65.018829L958.830745 538.643056zM730.105437 507.20402l20.655436-399.781172-237.540068 0-4.093225 0L272.587282 107.42284700000005l20.656459 399.781172-115.938546-83.797521-36.3243 55.070246 159.440315 111.641683-19.276019 30.638811L121.066333 508.667348l-14.548344 22.056342 185.921433 131.330094 71.077825 0c5.332449-10.04375 15.433504-26.779923 30.951943-43.580564 32.047904-34.69622 72.256674-53.486168 116.345822-54.411237l0-0.031722c0.203638 0.00307 0.406253 0.01228 0.60989 0.016373 0.203638-0.00307 0.406253-0.013303 0.60989-0.016373l0 0.031722c44.073798 0.925069 84.359316 19.703761 116.566856 54.379515 15.623839 16.821107 25.814945 33.579793 31.188326 43.612287l71.120804 0 185.921433-131.330094-14.548344-22.056342L742.203986 620.7551920000001l-19.276019-30.638811 159.440315-111.641683-36.3243-55.070246L730.105437 507.20402z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="table" unicode="&#58925;" d="M304.738028 343.684806M729.544153 511.153982M595.52788 637.723655M143.806755 686.614156l0-601.704045L881.172549 84.91011100000003l0 601.704045L143.806755 686.614156zM420.318416 299.80441299999995l0 128.936581 184.341448 0 0-128.936581L420.318416 299.80441299999995zM604.659865 256.825552l0-128.936581L420.318416 127.88897099999997l0 128.936581L604.659865 256.825552zM604.659865 600.656435l0-128.936581L420.318416 471.719854l0 128.936581L604.659865 600.656435zM374.232798 600.656435l0-128.936581L189.89135 471.719854l0 128.936581L374.232798 600.656435zM189.89135 428.740994L374.232798 428.740994l0-128.936581L189.89135 299.80441299999995 189.89135 428.740994zM650.745483 428.740994l184.341448 0 0-128.936581L650.745483 299.80441299999995 650.745483 428.740994zM650.745483 471.719854l0 128.936581 184.341448 0 0-128.936581L650.745483 471.719854zM189.89135 256.825552L374.232798 256.825552l0-128.936581L189.89135 127.88897099999997 189.89135 256.825552zM650.745483 127.88897099999997l0 128.936581 184.341448 0 0-128.936581L650.745483 127.88897099999997z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="right" unicode="&#58882;" d="M283.648 721.9189759999999L340.873216 780.926976 740.352 383.99795200000005 340.876288-12.925952000000052 283.648 46.07795199999998 619.52 383.99795200000005Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="left" unicode="&#58883;" d="M740.352 721.9189759999999L683.126784 780.926976 283.648 383.99795200000005 683.123712-12.925952000000052 740.352 46.07795199999998 404.48 383.99795200000005Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="cart-simple" unicode="&#59032;" d="M235.097303 196.866982C247.384597 160.417152 286.382106 132.37606800000003 324.772759 132.37606800000003L861.658537 132.37606800000003 880.429732 132.37606800000003 885.649214 150.54185399999994 1009.08775 580.154957C1021.388907 622.967661 993.187631 660.786325 949.051586 660.786325L424.585365 660.786325C410.791718 660.786325 399.609756 649.5207379999999 399.609756 635.623932 399.609756 621.727125 410.791718 610.461538 424.585365 610.461538L949.051586 610.461538C959.924 610.461538 964.161052 604.779539 961.106394 594.148171L837.667859 164.53506800000002 861.658537 182.70085500000005 324.772759 182.70085500000005C307.742153 182.70085500000005 287.789837 197.04752900000005 282.395194 213.05054900000005L73.600164 832.433664C69.16437 845.592294 54.980454 852.636656 41.919502 848.167687 28.858551 843.698719 21.86648 829.408727 26.302275 816.250097L235.097303 196.866982ZM399.609756-6.017094000000043C399.609756 49.57012899999995 354.881911 94.63247799999999 299.707317 94.63247799999999 244.532723 94.63247799999999 199.804878 49.57012899999995 199.804878-6.017094000000043 199.804878-61.604318000000035 244.532723-106.66666699999996 299.707317-106.66666699999996 354.881911-106.66666699999996 399.609756-61.604318000000035 399.609756-6.017094000000043ZM249.756098-6.017094000000043C249.756098 21.77651800000001 272.120021 44.30769299999997 299.707317 44.30769299999997 327.294613 44.30769299999997 349.658537 21.77651800000001 349.658537-6.017094000000043 349.658537-33.810704999999984 327.294613-56.34187899999995 299.707317-56.34187899999995 272.120021-56.34187899999995 249.756098-33.810704999999984 249.756098-6.017094000000043ZM924.097562-6.017094000000043C924.097562 49.57012899999995 879.369715 94.63247799999999 824.195121 94.63247799999999 769.020529 94.63247799999999 724.292683 49.57012899999995 724.292683-6.017094000000043 724.292683-61.604318000000035 769.020529-106.66666699999996 824.195121-106.66666699999996 879.369715-106.66666699999996 924.097562-61.604318000000035 924.097562-6.017094000000043ZM774.243902-6.017094000000043C774.243902 21.77651800000001 796.607825 44.30769299999997 824.195121 44.30769299999997 851.782419 44.30769299999997 874.146342 21.77651800000001 874.146342-6.017094000000043 874.146342-33.810704999999984 851.782419-56.34187899999995 824.195121-56.34187899999995 796.607825-56.34187899999995 774.243902-33.810704999999984 774.243902-6.017094000000043Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="face-cry" unicode="&#59036;" d="M1024 384C1024 666.769792 794.769792 896 512 896 229.230208 896 0 666.769792 0 384 0 101.23020799999995 229.230208-128 512-128 629.410831-128 740.826187-88.33104600000001 830.768465-16.686661999999956 841.557579-8.092490999999995 843.33693 7.620766000000003 834.742758 18.409879000000046 826.148587 29.198990999999978 810.43533 30.978341999999998 799.646219 22.384173000000033 718.470035-42.277495000000044 618.001779-78.04878099999996 512-78.04878099999996 256.817504-78.04878099999996 49.951219 128.81750399999999 49.951219 384 49.951219 639.182496 256.817504 846.048781 512 846.048781 767.182496 846.048781 974.048781 639.182496 974.048781 384 974.048781 296.507166 949.714859 212.66323599999998 904.470807 140.039307 897.177109 128.33175700000004 900.755245 112.92820300000005 912.462793 105.63450699999999 924.170342 98.34080900000004 939.573897 101.91894200000002 946.867595 113.62649199999998 997.013826 194.11920399999997 1024 287.101621 1024 384ZM337.170731 396.487806C371.654852 396.487806 399.609756 424.442709 399.609756 458.926829 399.609756 493.41095 371.654852 521.365854 337.170731 521.365854 302.686611 521.365854 274.731708 493.41095 274.731708 458.926829 274.731708 424.442709 302.686611 396.487806 337.170731 396.487806ZM711.804879 396.487806C746.288998 396.487806 774.243902 424.442709 774.243902 458.926829 774.243902 493.41095 746.288998 521.365854 711.804879 521.365854 677.320757 521.365854 649.365854 493.41095 649.365854 458.926829 649.365854 424.442709 677.320757 396.487806 711.804879 396.487806ZM352.788105 191.21547499999997C396.165222 225.91716899999994 453.151987 246.639629 524.487806 246.639629 595.823622 246.639629 652.810387 225.91716899999994 696.187505 191.21547499999997 722.700531 170.00505399999997 738.882517 148.42907300000002 746.631548 132.931012 752.800254 120.59359800000004 747.799529 105.59142399999996 735.462114 99.42271600000004 723.124702 93.25401 708.122526 98.25473499999998 701.953818 110.59214899999995 701.03616 112.42746499999998 698.492224 116.61747600000001 694.165854 122.38597100000004 686.602473 132.47047699999996 676.927317 142.654852 664.983226 152.21012499999995 630.311565 179.947456 584.273939 196.68840999999998 524.487806 196.68840999999998 464.70167 196.68840999999998 418.664045 179.947456 383.992384 152.21012499999995 372.048292 142.654852 362.373137 132.47047699999996 354.809756 122.38597100000004 350.483386 116.61747600000001 347.93945 112.42746499999998 347.021792 110.59214899999995 340.853084 98.25473499999998 325.850908 93.25401 313.513495 99.42271600000004 301.176081 105.59142399999996 296.175356 120.59359800000004 302.344062 132.931012 310.093092 148.42907300000002 326.275078 170.00505399999997 352.788105 191.21547499999997Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="face-smile" unicode="&#59055;" d="M1024 384C1024 666.769792 794.769792 896 512 896 229.230208 896 0 666.769792 0 384 0 101.23020799999995 229.230208-128 512-128 629.410831-128 740.826187-88.33104600000001 830.768465-16.686661999999956 841.557579-8.092490999999995 843.33693 7.620766000000003 834.742758 18.409879000000046 826.148587 29.198990999999978 810.43533 30.978341999999998 799.646219 22.384173000000033 718.470035-42.277495000000044 618.001779-78.04878099999996 512-78.04878099999996 256.817504-78.04878099999996 49.951219 128.81750399999999 49.951219 384 49.951219 639.182496 256.817504 846.048781 512 846.048781 767.182496 846.048781 974.048781 639.182496 974.048781 384 974.048781 296.507166 949.714859 212.66323599999998 904.470807 140.039307 897.177109 128.33175700000004 900.755245 112.92820300000005 912.462793 105.63450699999999 924.170342 98.34080900000004 939.573897 101.91894200000002 946.867595 113.62649199999998 997.013826 194.11920399999997 1024 287.101621 1024 384ZM337.170731 396.487806C371.654852 396.487806 399.609756 424.442709 399.609756 458.926829 399.609756 493.41095 371.654852 521.365854 337.170731 521.365854 302.686611 521.365854 274.731708 493.41095 274.731708 458.926829 274.731708 424.442709 302.686611 396.487806 337.170731 396.487806ZM711.804879 396.487806C746.288998 396.487806 774.243902 424.442709 774.243902 458.926829 774.243902 493.41095 746.288998 521.365854 711.804879 521.365854 677.320757 521.365854 649.365854 493.41095 649.365854 458.926829 649.365854 424.442709 677.320757 396.487806 711.804879 396.487806ZM352.788105 127.22903299999996C396.165222 92.52733899999998 453.151987 71.80487900000003 524.487806 71.80487900000003 595.823622 71.80487900000003 652.810387 92.52733899999998 696.187505 127.22903299999996 722.700531 148.43945399999996 738.882517 170.01543500000002 746.631548 185.51349500000003 752.800254 197.850908 747.799529 212.85308399999997 735.462114 219.021792 723.124702 225.19049800000005 708.122526 220.18977299999995 701.953818 207.85235799999998 701.03616 206.01704299999994 698.492224 201.82703100000003 694.165854 196.058537 686.602473 185.97402899999997 676.927317 175.78965500000004 664.983226 166.23438299999998 630.311565 138.49705200000005 584.273939 121.75609799999995 524.487806 121.75609799999995 464.70167 121.75609799999995 418.664045 138.49705200000005 383.992384 166.23438299999998 372.048292 175.78965500000004 362.373137 185.97402899999997 354.809756 196.058537 350.483386 201.82703100000003 347.93945 206.01704299999994 347.021792 207.85235799999998 340.853084 220.18977299999995 325.850908 225.19049800000005 313.513495 219.021792 301.176081 212.85308399999997 296.175356 197.850908 302.344062 185.51349500000003 310.093092 170.01543500000002 326.275078 148.43945399999996 352.788105 127.22903299999996Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="survey" unicode="&#59058;" d="M722.355804 849.454545C761.006291 849.454545 792.380951 818.166023 792.380951 779.627344L792.380951 437.500928 799.081094 453.813218 401.874746 51.22138 418.539682 58.181818 138.070006 58.181818C99.387643 58.181818 68.063492 89.328555 68.063492 127.771428L68.063492 872.727273 44.698413 849.454545 722.355804 849.454545ZM21.333333 896 21.333333 872.727273 21.333333 127.771428C21.333333 63.604277 73.59726 11.636363 138.070006 11.636363L418.539682 11.636363 428.337293 11.636363 435.204619 18.596802 832.410967 421.18864 839.11111 427.979625 839.11111 437.500928 839.11111 779.627344C839.11111 843.859757 786.827324 896 722.355804 896L44.698413 896 21.333333 896ZM775.859347 307.365395 759.337741 290.90909 775.859347 274.452787 869.319663 181.361879 885.841269 164.905574 902.362876 181.361879 972.458114 251.18006 988.979721 267.636363 972.458114 284.092668 878.997796 377.183575 862.47619 393.639878 845.954583 377.183575 775.859347 307.365395ZM845.954583 344.27097 939.414901 251.18006 939.414901 284.092668 869.319663 214.274485 902.362876 214.274485 808.902558 307.365395 808.902558 274.452787 878.997796 344.27097 845.954583 344.27097ZM518.843473 51.365395 513.841133 46.382827 512.453734 39.473248 489.088655-76.890387 482.215251-111.121568 516.58227-104.275332 633.407665-81.002605 640.344663-79.620689 645.347004-74.638121 902.362876 181.361879 918.884482 197.818182 902.362876 214.274485 808.902558 307.365395 792.380951 323.821698 775.859347 307.365395 518.843473 51.365395ZM775.859347 274.452787 869.319663 181.361879 869.319663 214.274485 612.303791-41.725515 624.243127-35.361033 507.41773-58.633758 534.911345-86.018703 558.276425 30.344934 551.886686 18.452787 808.902558 274.452787 775.859347 274.452787ZM426.576706 298.269073C444.201086 298.269073 458.488469 284.053815 458.488469 266.500753L458.488469 258.086116C458.488469 240.540958 444.323959 226.317797 426.576706 226.317797L426.576706 226.317797C408.952326 226.317797 394.664943 240.533054 394.664943 258.086116L394.664943 266.500753C394.664943 284.045911 408.829453 298.269073 426.576706 298.269073L426.576706 298.269073ZM278.349205 552.435127C278.349205 552.435127 280.851125 530.485568 305.477133 530.485568 330.103138 530.485568 331.559155 552.435127 331.559155 552.435127 329.927383 623.508937 362.988497 657.25782 430.67155 653.905282 475.722639 648.839223 499.06407 623.508937 500.624896 577.839917 497.503245 557.501184 480.405116 531.202385 449.969026 499.092521 409.671358 458.489557 389.522524 422.133143 389.522524 390.023279L389.522524 357.093903C389.522524 357.093903 392.614705 337.454532 414.885933 337.454532 437.157161 337.454532 440.249342 357.093903 440.249342 357.093903L440.249342 379.965664C440.249342 406.785969 459.546816 439.044836 498.21271 476.369762 538.652271 513.471183 558.730159 547.369069 558.730159 577.839917 555.395669 662.323878 511.195938 706.353877 425.776235 709.780917 327.515198 711.419936 278.349205 658.971339 278.349205 552.435127Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="tree" unicode="&#58926;" d="M962.691679 258.53447400000005c-8.721639 54.163597-34.298154 97.584526-73.089645 133.8638-44.721551 41.825594-99.282191 65.724911-156.512636 84.432994-26.935466 8.80555-54.079686 16.971533-81.129762 25.427112 41.188074 7.485485 81.495082 10.991332 121.872698 12.269441 39.906895 1.26276 79.885422 0.276293 120.633475 0.276293-30.644951 44.233434-74.588789 71.110571-127.260405 84.384899-53.004191 13.357216-103.742782 9.715269-152.261822-32.081673 18.715247 66.336848 12.464893 120.18936-38.810934 160.830989-32.450063 25.719778-77.127611 31.000038-111.319341 14.916734 58.583257-31.127951 82.051761-84.265172 94.304829-145.102772-44.638663 69.056795-110.067838 96.432283-187.710173 86.487793-56.123228-7.187703-110.723777-26.270317-166.003801-40.048111 15.677051-14.358009 31.136138-24.116257 47.932686-27.839045 51.427276-11.399631 103.405091-20.301372 155.098427-30.524201 37.036521-7.323802 75.163887-12.144598 104.448864-40.879036-78.096682 23.458271-155.928329 30.034037-235.541551 9.092076C186.718589 530.20385 104.838743 479.821369 81.996502 429.437865c46.955428 23.955598 95.807043 18.776645 144.606469 17.139356 37.737486-1.266853 76.089979-3.461845 113.238041 1.594311 52.683896 7.170307 104.513332 20.624736 159.209048 31.909757-91.88164-62.077847-186.516997-122.342396-159.194722-259.889075 58.852386 100.205213 163.392324 150.107763 229.951229 238.105956-16.239869-91.498924 6.980995-169.376619 66.432015-237.83785 41.815361-48.152696 89.979314-92.010577 110.706381-156.013263 12.758582 141.877311-25.823132 270.789333-97.911984 396.334677C755.996107 391.809873 858.199837 325.909977 962.691679 258.53447400000005zM513.476631 320.10169099999996c-27.767414-14.065344-39.008432-35.954887-42.252313-64.998363-6.078439-54.437843-15.162328-108.532879-21.799492-162.916487-3.90903-32.026414-5.519714-64.333214-8.16496-96.53052 30.078039 0 55.507198 0 79.961146 0 9.912767 78.200036 19.732413 154.247037 28.913517 230.369761 0.883113 7.322779-0.756223 15.746636-3.705392 22.591531C536.246217 272.25086999999996 524.967336 295.41135899999995 513.476631 320.10169099999996z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="ie" unicode="&#59323;" d="M734.208 267.1616l236.05248 0c1.82272 16.36352 2.53952 33.09568 2.53952 50.19648 0 80.22016-21.52448 155.46368-59.12576 220.2624 38.87104 103.30112 37.49888 190.99648-14.56128 243.38432-49.50016 49.27488-182.29248 41.28768-332.41088-25.1904-11.10016 0.83968-22.3232 1.26976-33.62816 1.26976-206.04928 0-378.92096-141.80352-426.7008-332.84096 64.63488 82.75968 132.62848 142.7456 223.47776 186.44992-8.25344-7.74144-56.46336-55.64416-64.55296-63.75424-239.55456-239.47264-315.0848-552.30464-233.79968-633.61024 61.78816-61.76768 173.75232-51.34336 302.36672 11.65312 59.8016-30.45376 127.50848-47.63648 199.20896-47.63648 193.1264 0 356.80256 124.3136 416.09216 297.45152l-237.8752 0c-32.72704-60.37504-96.74752-101.4784-170.20928-101.4784s-137.48224 41.10336-170.20928 101.4784c-14.5408 27.27936-22.91712 58.55232-22.91712 91.648l0 0.7168 386.2528 0zM348.30336 383.20128c5.44768 97.11616 86.20032 174.592 184.77056 174.592s179.3024-77.47584 184.77056-174.592l-369.54112 0zM896.96256 732.20096c33.52576-33.87392 32.68608-96.21504 4.01408-174.01856-49.13152 74.91584-120.5248 133.9392-204.8 167.64928 90.112 38.64576 163.40992 43.76576 200.78592 6.38976zM93.4912-71.24992c-42.78272 42.8032-29.88032 132.608 25.23136 240.82432 34.304-96.27648 101.15072-177.09056 187.33056-229.15072-95.4368-43.3152-173.52704-50.66752-212.56192-11.6736z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="upload-circle" unicode="&#58927;" d="M512-128c282.768 0 512 229.216 512 512C1024 666.768 794.768 896 512 896 229.216 896 0 666.768 0 384 0 101.21600000000001 229.216-128 512-128zM512 848c256.272 0 464-207.744 464-464 0-256.272-207.728-464-464-464S48 127.72799999999995 48 384C48 640.256 255.728 848 512 848zM377.728 534.544L480 534.544l0-478c0-17.664 14.336-32 32-32s32 14.336 32 32L544 534.544l102.272 0c17.616 0 23.424 11.568 12.944 25.68l-128.128 172.624c-10.496 14.128-27.664 14.128-38.16 0L364.8 560.24C354.32 546.1120000000001 360.128 534.544 377.728 534.544z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="add-circle" unicode="&#58911;" d="M675.04 412.736l-127.04 0 0 127.264c0 20.064-16.288 36.32-36.32 36.32-20.064 0-36.32-16.192-36.32-36.32l0-127.232-127.072 0c-20.064 0-36.352-16.32-36.352-36.352 0-20.064 16.224-36.352 36.352-36.352l127.072 0 0-127.232c0-20 16.256-36.384 36.32-36.384 20.032 0 36.32 16.256 36.32 36.384l0 127.136 127.04 0c19.968 0 36.352 16.256 36.352 36.384C711.36 396.448 695.136 412.736 675.04 412.736L675.04 412.736zM511.328 830.56c-250.24 0-453.952-203.616-453.952-453.952 0-250.336 203.712-453.952 453.952-453.952 250.336 0 453.984 203.584 453.984 453.952C965.312 626.944 761.696 830.56 511.328 830.56L511.328 830.56zM511.328-20.576000000000022c-219.04 0-397.184 178.176-397.184 397.152 0 219.104 178.144 397.216 397.184 397.216s397.216-178.112 397.216-397.216C908.576 157.63199999999995 730.368-20.576000000000022 511.328-20.576000000000022L511.328-20.576000000000022zM511.328-20.576000000000022"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="download-circle" unicode="&#58881;" d="M510.771521 828.211081c-244.998947 0-443.597097-198.60429-443.597097-443.590957s198.59815-443.591981 443.597097-443.591981c244.986667 0 443.583794 198.60429 443.583794 443.591981S755.758188 828.211081 510.771521 828.211081zM510.771521-30.044013999999947c-229.010811 0-414.664138 185.65435-414.664138 414.664138 0 229.010811 185.653327 414.657998 414.664138 414.657998 228.996484 0 414.652881-185.647187 414.652881-414.657998C925.424402 155.60931300000004 739.768005-30.044013999999947 510.771521-30.044013999999947zM662.749888 352.39518799999996L537.719266 245.82501100000002l0 324.388065c0 14.887059-12.06478 26.953885-26.947745 26.953885-14.894222 0-26.961048-12.066827-26.961048-26.953885l0-325.410348L357.936647 352.39518799999996c-10.56359 10.599406-27.693736 10.599406-38.267559 0-10.56359-10.596336-10.56359-27.777647 0-38.375006l170.181961-161.220868c5.629207-5.652743 13.111622-8.060583 20.49887-7.680936 7.373944-0.379647 14.859429 2.02717 20.488637 7.680936l170.181961 161.220868c10.562567 10.597359 10.562567 27.77867 0 38.375006C690.443623 362.99561700000004 673.313477 362.99561700000004 662.749888 352.39518799999996z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="templeate-1" unicode="&#58928;" d="M320 384L106.666667 384c-35.349333 0-64-28.650667-64-64l0-213.333333c0-35.349333 28.650667-64 64-64l213.333333 0c35.349333 0 64 28.650667 64 64L384 320C384 355.349333 355.349333 384 320 384zM256 341.33333300000004l0-256L170.666667 85.33333300000004 170.666667 341.33333300000004 256 341.33333300000004zM85.333333 106.66666699999996L85.333333 320c0 11.754667 9.578667 21.333333 21.333333 21.333333l42.666667 0 0-256L106.666667 85.33333300000004C94.912 85.33333300000004 85.333333 94.91200000000003 85.333333 106.66666699999996zM341.333333 106.66666699999996c0-11.754667-9.578667-21.333333-21.333333-21.333333l-42.666667 0L277.333333 341.33333300000004l42.666667 0c11.754667 0 21.333333-9.578667 21.333333-21.333333L341.333333 106.66666699999996zM576 554.666667L234.666667 554.666667c-47.061333 0-85.333333-38.272-85.333333-85.333333l0-42.666667 42.666667 0 0 42.666667c0 23.530667 19.136 42.666667 42.666667 42.666667l42.666667 0 0-96 21.333333 0L298.666667 512l213.333333 0 0-426.666667-85.333333 0-21.333333-42.666667 170.666667 0c47.061333 0 85.333333 38.272 85.333333 85.333333L661.333333 469.333333C661.333333 516.394667 623.061333 554.666667 576 554.666667zM618.666667 128c0-23.530667-19.136-42.666667-42.666667-42.666667l-42.666667 0L533.333333 512l42.666667 0c23.530667 0 42.666667-19.136 42.666667-42.666667L618.666667 128zM853.333333 42.66666699999996c47.061333 0 85.333333 38.272 85.333333 85.333333L938.666667 640c0 47.061333-38.272 85.333333-85.333333 85.333333L341.333333 725.333333c-47.061333 0-85.333333-38.272-85.333333-85.333333l0-42.666667 42.666667 0 0 42.666667c0 23.530667 19.136 42.666667 42.666667 42.666667l85.333333 0 0-85.333333 21.333333 0 0 85.333333 298.666667 0 0-597.333333-42.666667 0-21.333333-42.666667L853.333333 42.66666699999996zM896 128c0-23.530667-19.136-42.666667-42.666667-42.666667l-85.333333 0L768 682.666667l85.333333 0c23.530667 0 42.666667-19.136 42.666667-42.666667L896 128z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="util" unicode="&#58929;" d="M282.127566 639.0826059999999c-13.120832-13.221116-30.625508-20.50808-49.278333-20.50808-18.618033 0-36.157501 7.286963-49.311079 20.50808l-32.885991 33.019021 98.623181 99.027387 32.885991-33.019021c13.186324-13.221116 20.473287-30.829146 20.473287-49.548486C302.599829 669.8769589999999 295.347658 652.26893 282.127566 639.0826059999999L282.127566 639.0826059999999zM249.308089 705.0899489999999l-0.032746 0-32.884968-32.987299c4.418636-4.417613 10.252505-6.845918 16.458857-6.845918 6.206352 0 12.041244 2.428306 16.426111 6.813173 4.418636 4.452405 6.845918 10.288321 6.845918 16.493649C256.121262 694.802652 253.693979 700.671313 249.308089 705.0899489999999L249.308089 705.0899489999999zM396.703067 496.343671L249.578242 638.778684l32.278147 33.626865 147.157571-142.468782L396.703067 496.343671 396.703067 496.343671zM751.45979 133.92852400000004L618.131179 274.071332l32.884968 32.985252 133.330658-140.141784L751.45979 133.92852400000004 751.45979 133.92852400000004zM850.184279 67.95597399999997c-22.700001-22.766516-52.481282-34.168194-82.264609-34.168194-29.714765 0-59.395762 11.333116-81.994456 34.033118L538.194592 222.398462l32.884968 33.021068L718.811206 100.806149c27.117614-27.183106 71.269183-27.116591 98.488105 0.169869 27.186176 27.287483 27.117614 71.773673-0.135076 99.196233l-147.426701 154.273642 32.851199 33.021068 147.461493-154.308435C895.447159 187.557956 895.514697 113.421468 850.184279 67.95597399999997L850.184279 67.95597399999997zM801.716404 468.380806c-30.726815-30.860868-71.605851-47.861054-115.082038-47.861054-43.442418 0-84.321454 16.999163-115.082038 47.861054-30.760584 30.861892-47.692209 71.877027-47.692209 115.521037s16.931624 84.691891 47.692209 115.554806l42.497906 42.666752 32.885991-32.986275-42.497906-42.667775c-21.99085-22.090111-34.099632-51.367925-34.065863-82.566484 0-31.163767 12.108782-60.441581 34.065863-82.499969 21.956058-22.058388 51.16531-34.20094 82.196047-34.20094 31.064506 0 60.239989 12.142551 82.196047 34.20094l42.49893 42.665729 32.884968-33.019021L801.716404 468.380806 801.716404 468.380806zM844.214311 511.049604l-49.311079 49.51267-16.45988-16.493649c-17.538445-17.638729-40.879036-27.352975-65.73719-27.352975l-0.032746 0c-24.824385 0-48.198745 9.713222-65.73719 27.352975-17.539468 17.607006-27.252691 41.082674-27.252691 66.007343 0 24.925692 9.679453 48.400337 27.252691 66.040089l16.458857 16.495696-49.344848 49.51267 32.885991 33.021068 82.196047-82.533738-49.311079-49.482995c-8.769734-8.835226-13.626345-20.571525-13.626345-33.051767 0-12.446473 4.856611-24.183795 13.626345-32.987299 8.768711-8.835226 20.439518-13.69286 32.884968-13.69286 12.411681 0 24.082488 4.857635 32.852222 13.69286l49.344848 49.514717 82.196047-82.534761L844.214311 511.049604 844.214311 511.049604zM233.591129 129.139451l0 46.681182 46.512337 0 0-46.681182L233.591129 129.139451 233.591129 129.139451zM538.160823 356.538555l-92.247984 91.572602 32.717146 33.18889 92.214215-91.539856L538.160823 356.538555 538.160823 356.538555zM304.2187 101.04355599999997l173.634596 239.842507 37.641295-27.454282L338.318332 69.23715300000003c-21.923312-22.057365-51.132564-34.20094-82.19707-34.20094-31.028691 0-60.237943 12.143575-82.196047 34.168194-21.958104 22.057365-34.065863 51.335179-34.065863 82.533738 0 31.198559 12.107759 60.476373 34.065863 82.533738l2.765997 2.360767L417.243893 412.054963l27.353998-37.742603L205.596542 200.00340600000004c-12.411681-13.053294-19.224854-30.119995-19.224854-48.26526 0-18.71934 7.252171-36.291554 20.438495-49.513694C232.747925 76.15265599999998 277.775444 75.71263499999998 304.2187 101.04355599999997L304.2187 101.04355599999997z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="face-surprised" unicode="&#58980;" d="M485.656116-128C221.592397-128 6.762016 86.81718000000001 6.762016 350.87649799999997s214.830381 478.867697 478.8941 478.867697c264.041716 0 478.854495-214.812779 478.854495-478.867697S749.697832-128 485.656116-128zM485.656116 798.834741c-247.024795 0-447.975846-200.959852-447.975846-447.962644 0-247.002792 200.951051-447.962644 447.975846-447.962644 247.002792 0 447.953843 200.959852 447.953843 447.962644C933.609959 597.8748889999999 732.658908 798.834741 485.656116 798.834741zM352.033458 447.380528c0-30.469398-24.682677-55.147675-55.143274-55.147675-30.451796 0-55.143274 24.678276-55.143274 55.147675 0 30.460597 24.691478 55.138874 55.143274 55.138874C327.350781 502.519402 352.033458 477.845526 352.033458 447.380528zM674.417647 502.519402c-30.460597 0-55.156476-24.678276-55.156476-55.138874 0-30.469398 24.695879-55.147675 55.156476-55.147675 30.451796 0 55.143274 24.678276 55.143274 55.147675C729.560922 477.845526 704.869444 502.519402 674.417647 502.519402zM562.005634 165.30976499999997c0-59.733046-34.192262-108.165484-76.349518-108.165484-42.166057 0-76.36272 48.432438-76.36272 108.165484 0 59.724245 34.196663 108.152282 76.36272 108.152282C527.813371 273.45764699999995 562.005634 225.03400999999997 562.005634 165.30976499999997zM835.631745 793.712503c0 0 12.871605 56.819883 41.959231 85.925112 29.083226 29.096427 69.915916 15.124685 78.492585-8.801097 9.461179-26.385689-2.033053-50.069442-29.092027-56.164202C899.404495 808.463141 874.880237 826.192952 835.631745 793.712503zM916.698651 757.570797c0 0 35.767659 20.576965 64.877288 19.393218 29.136032-1.174946 41.431165-29.144833 33.109728-45.110024-9.192746-17.588993-27.054573-22.966463-43.217788-11.797871C954.979023 731.44034 952.453108 752.721393 916.698651 757.570797z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="edit" unicode="&#58946;" d="M769.089 516.251l-125.896 125.89 62.974 62.947c20.866 20.838 54.652 20.838 75.517 0l50.353-50.351c20.865-20.865 20.865-54.703 0-75.567L769.089 516.251zM403.349 150.52700000000004L277.453 276.418 619.706 615.982 745.601 490.09ZM176.314 47.283000000000015L252.912 251.87699999999995 377.753 127.01199999999994Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="speaker" unicode="&#58949;" d="M587.182306 754.7203c-6.003737 2.705622-13.043061 1.642406-17.984606-2.721994l-259.223926-229.293243-148.246369 0c-9.253758 0-16.752546-7.498788-16.752546-16.756639l0-267.886213c0-9.249665 7.498788-16.756639 16.752546-16.756639l144.050814 0c9.253758 0 16.752546 7.506974 16.752546 16.756639L322.530764 490.391099c1.774413 0.704035 3.433192 1.719154 4.892427 3.010567l236.127905 208.861912 0-653.332912-160.751171 137.64287c-2.12643 1.824555-90.300632 78.69941-93.927229 76.162634-4.427846-3.097548-15.768125-17.59882-18.419512-22.512736-0.953721-1.768273-2.196015-1.334391 15.413038-16.379039 25.674753-21.936615 73.780377-61.548798 75.144444-62.717414l10.007935-8.570189 178.388876-152.761196c3.093455-2.653433 6.978948-4.028757 10.900258-4.028757 2.369977 0 4.756327 0.503467 7.003508 1.534959 5.939269 2.738367 9.749038 8.677637 9.749038 15.217586L597.060281 739.446431C597.060281 746.034477 593.190137 752.013655 587.182306 754.7203L587.182306 754.7203zM290.453185 254.814756l-115.040083 0L175.413102 489.195877l115.03906 0 0-234.381122L290.453185 254.814756zM747.742119 375.98444300000006c0-51.55212-34.83232-96.658434-84.702124-109.693308-1.415232-0.375553-2.846838-0.551562-4.245697-0.551562-7.438413 0-14.234189 4.992711-16.200984 12.523221-2.338255 8.949836 3.021823 18.104333 11.967566 20.442588 35.136242 9.18929 59.672054 40.96397 59.672054 77.279061 0 36.307927-24.535813 68.090794-59.672054 77.271898-8.945743 2.346441-14.305821 11.492752-11.967566 20.450774 2.342348 8.953929 11.499915 14.305821 20.446681 11.967566C712.909799 472.643899 747.742119 427.530422 747.742119 375.98444300000006L747.742119 375.98444300000006zM864.950588 375.793084c0-88.87619-48.554856-170.44495-126.718053-212.883505-2.537799-1.375324-5.276167-2.02717-7.982812-2.02717-5.939269 0-11.69946 3.166109-14.733563 8.762571-4.417613 8.134261-1.39886 18.303878 6.727215 22.720468 67.350944 36.566824 109.198028 106.851587 109.198028 183.427636 0 76.844156-42.055838 147.272181-109.741403 183.78784-8.154727 4.396123-11.192923 14.557554-6.795776 22.700001 4.38896 8.142447 14.558577 11.184737 22.701025 6.795776C816.151162 546.697499 864.950588 464.976266 864.950588 375.793084L864.950588 375.793084z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="down" unicode="&#58906;" d="M888.306 619.94c15.615 15.617 40.93 15.617 56.545 0v0c15.617-15.615 15.617-40.93 0-56.545l-405.733-405.734c-15.615-15.617-40.928-15.617-56.545 0v0c-15.615 15.615-15.615 40.93 0 56.545l405.733 405.734zM538.619 214.20600000000002c15.617-15.615 15.617-40.93 0-56.545v0c-15.615-15.617-40.928-15.617-56.545 0l-405.734 405.734c-15.615 15.615-15.615 40.93 0 56.545v0c15.617 15.617 40.93 15.617 56.547 0l405.732-405.734zM538.619 214.20600000000002z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="file" unicode="&#58913;" d="M887.443911 598.6304l0-44.578133 0-45.511111 0-477.866667c0-37.705956-30.560711-68.266667-68.266667-68.266667l-614.4 0c-37.705956 0-68.266667 30.560711-68.266667 68.266667l0 705.422222c0 37.6832 30.560711 68.266667 68.266667 68.266667l386.844444 0 45.511111 0 38.024533 0c7.805156 2.594133 16.566044 1.2288 22.778311-5.006222l183.136711-183.159467C885.919289 611.373511 887.876267 604.9564439999999 887.443911 598.6304zM659.888356 531.296711c-12.583822 0-22.755556 10.171733-22.755556 22.755556l0 204.8-45.511111 0-364.088889 0c-25.122133 0-45.511111-20.388978-45.511111-45.511111l0-659.911111c0-25.122133 20.388978-45.511111 45.511111-45.511111l568.888889 0c25.122133 0 45.511111 20.388978 45.511111 45.511111l0 455.111111 0 22.755556L659.888356 531.296711zM682.643911 750.273422l0-173.4656 159.288889 0 0 14.176711L682.643911 750.273422z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="layouts" unicode="&#58930;" d="M917.213-103.239h-810.426c-23.151 0-41.918 18.766-41.918 41.917l0 698.644c0 23.148 18.767 41.917 41.918 41.917h810.426c23.149 0 41.918-18.769 41.918-41.917v-698.643c0-23.151-18.769-41.918-41.918-41.918zM316.38-61.321h600.833v363.294h-600.833v-363.294zM106.787-61.321h167.674v363.294h-167.674v-363.294zM148.705 637.322c-23.151 0-41.918-18.769-41.918-41.92s18.767-41.92 41.918-41.92 41.92 18.768 41.92 41.92-18.769 41.92-41.92 41.92zM274.461 637.322c-23.151 0-41.918-18.769-41.918-41.92s18.767-41.92 41.918-41.92c23.151 0 41.92 18.768 41.92 41.92s-18.77 41.92-41.92 41.92zM400.216 637.322c-23.15 0-41.918-18.769-41.918-41.92s18.769-41.92 41.918-41.92c23.152 0 41.92 18.768 41.92 41.92s-18.768 41.92-41.92 41.92zM875.293 511.566h-768.506v-167.675h810.426l0 167.675h-41.921z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="rate-half" unicode="&#59081;" d="M1012.064 504l-359.552 31.008-140.512 331.04-140.512-331.552-359.552-30.496 273.024-236.544-82.016-351.552 309.056 186.528 309.056-186.528-81.504 351.552 272.544 236.544zM512 195.96799999999996l0 465.056 85.504-202.016 219.04-19.008-166.016-144.032 50.016-214.016-188.512 114.016z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="add-circle-fine" unicode="&#58888;" d="M509.989715-60.972421000000054c-246.734474 0-446.75195 200.023616-446.75195 446.75809 0 246.732427 200.017476 446.75195 446.75195 446.75195 246.733451 0 446.757067-200.019523 446.757067-446.75195C956.746782 139.051195 756.723166-60.972421000000054 509.989715-60.972421000000054L509.989715-60.972421000000054zM509.989715 812.433746c-235.633648 0-426.650123-191.014428-426.650123-426.648077 0-235.639788 191.016475-426.654216 426.650123-426.654216 235.638765 0 426.654216 191.014428 426.654216 426.654216C936.643931 621.419318 745.62848 812.433746 509.989715 812.433746L509.989715 812.433746zM527.863804 153.46957999999995l-35.741016 0L492.122789 367.909533 277.678742 367.909533 277.678742 403.653619l214.443024 0L492.121765 618.0956189999999l35.741016 0L527.862781 403.653619l214.442 0 0-35.744086L527.863804 367.909533 527.863804 153.46957999999995 527.863804 153.46957999999995zM527.863804 153.46957999999995"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="prev-circle" unicode="&#58931;" d="M508.638018 827.97307c-246.403458 0-446.845649-200.463469-446.845649-446.845649 0-246.382179 200.442191-446.845649 446.845649-446.845649 246.382179 0 446.845649 200.463469 446.845649 446.845649C955.483667 627.5096 755.041476 827.97307 508.638018 827.97307zM508.638018-23.16149900000005c-222.933422 0-404.28892 181.355498-404.28892 404.28892 0 222.933422 181.355498 404.28892 404.28892 404.28892 222.912144 0 404.28892-181.355498 404.28892-404.28892C912.926939 158.19399899999996 731.57144-23.16149900000005 508.638018-23.16149900000005zM252.87208 485.1999c8.639016 26.129831-32.470784 37.215859-41.067243 11.32009-27.810822-83.730363-22.321004-168.545923 14.086277-248.573851 11.362646-24.938243 48.025268-3.298146 36.747735 21.491148C230.976644 339.081373 228.806251 412.853462 252.87208 485.1999zM599.262572 247.73335499999996l-127.627629 133.394065 127.47868 133.223838c9.043305 9.064583 9.022026 23.789211-0.021278 32.832516-8.809243 8.830521-24.087108 8.766686-32.832516 0l-148.310199-148.310199c-4.617405-4.638683-6.979303-11.064749-6.553736-17.746156-0.404289-6.702685 1.936331-13.107472 6.575015-17.788712l148.310199-148.28892c4.383343-4.383343 10.213615-6.787798 16.405619-6.787798 6.170726 0 12.000997 2.404455 16.405619 6.787798C608.156928 224.114371 608.156928 238.83899899999994 599.262572 247.73335499999996z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="read" unicode="&#59141;" d="M335.282306 712.495464C399.587328 713.451107 442.778899 696.882717 470.183494 669.3706540000001 479.127332 660.39174 485.691302 650.857363 490.241971 641.442689 492.795622 636.159553 494.049041 632.438701 494.358795 631.0740940000001L493.723712 636.7409230000001 493.723706 196.90019600000005C493.723706 199.018106 495.816045 203.920655 503.591595 207.36436700000002 511.039185 210.66283299999998 515.68422 209.16527399999995 517.176538 207.906613L500.671543 188.33763 521.297207 203.50146800000005C514.140179 213.23636899999997 499.631258 225.71450900000002 476.134074 237.35914000000002 439.577969 255.475456 390.86048 266.10507900000005 328.491925 266.10508200000004 265.860796 266.10508200000004 219.424582 255.71817999999996 186.827162 237.741581 164.977332 225.69198700000004 152.538132 212.28117299999997 147.220271 201.30886999999996L170.257196 190.14374199999997 151.035786 207.05224299999998C152.884078 209.15336100000002 158.307299 211.80336599999998 167.849005 208.050434 177.092077 204.41496099999995 179.2 199.20011699999998 179.2 196.66445199999998L179.2 497.049743 179.2 636.7409230000001 175.817447 624.023021C177.078908 626.226721 180.088681 630.807811 184.828724 636.965629 192.95423 647.521524 202.792594 658.127492 214.297641 668.007961 247.526453 696.544681 287.381649 713.209056 334.514421 712.495571L335.282306 712.495464ZM335.289387 763.689705C274.661039 764.607483 223.081402 743.04085 180.940156 706.850184 156.32698 685.712527 139.975514 664.470237 131.382553 649.4588249999999L128 643.549699 128 636.7409230000001 128 497.049743 128 196.66445199999998C128 159.26104999999995 164.542545 144.88818300000003 189.478606 173.23524099999997L191.776657 175.84764199999995 193.294121 178.978613C194.07832 180.59664399999997 199.156367 186.07133399999998 211.552092 192.907243 236.030601 206.40648099999999 274.024879 214.905082 328.491925 214.905082 383.221547 214.905079 424.163878 205.97190999999998 453.399258 191.483569 469.376966 183.56540600000005 477.614626 176.48075300000005 480.045882 173.17379000000005L481.844905 170.72677999999996 484.166551 168.768644C511.279708 145.90070000000003 544.923706 160.801293 544.923706 196.90019600000005L544.923712 636.740922 544.288627 642.407751C540.427211 659.419023 529.175531 682.697124 506.45814 705.503602 468.987716 743.1209699999999 412.352271 764.846461 334.521502 763.689812L335.289387 763.689705ZM0 506.026694L0 27.856867999999963C0-8.875636999999983 34.793167-23.40043300000002 61.4635 1.2485080000000153L63.46242 3.315859000000046C65.301149 5.444836000000009 69.655573 9.862312999999972 76.498228 15.820363000000043 88.306297 26.101906999999983 102.566352 36.46294 119.251411 46.17438500000003 167.295691 74.13829099999998 224.90855 90.95018200000004 292.337329 90.95018200000004 358.378978 90.95018000000005 409.459345 71.66956600000003 448.125308 39.64774 461.506042 28.56627400000002 472.380655 16.734758000000056 480.912593 4.997000999999955 485.832384-1.7713730000000396 488.762874-6.741985999999997 489.872527-9.02252199999998 496.058545-21.73590200000001 511.379537-27.027375000000006 524.092917-20.84135500000002 536.806298-14.655337000000031 542.097771 0.6656550000000152 535.91175 13.379036000000042 527.471002 30.726293000000055 509.777717 55.06771800000001 480.782336 79.08069999999998 433.134118 118.54132300000003 370.586889 142.15017999999998 292.337329 142.15018199999997 215.474895 142.15018499999996 149.074727 122.77408400000002 93.495781 90.424668 59.761154 70.78961500000003 36.872315 50.859801999999945 24.713677 36.78188399999999L44.088049 20.048869999999965 26.712598 38.84923500000002C28.162783 40.189508000000046 32.877261 41.946117999999956 40.792576 38.64178100000004 49.035365 35.200736000000006 51.2 30.12989200000004 51.2 27.856867999999963L51.2 506.026694C51.2 520.165184 39.73849 531.626694 25.6 531.626694 11.46151 531.626694 0 520.165184 0 506.026694L0 506.026694ZM696.80221 763.689812C618.971441 764.846461 562.335996 743.1209699999999 524.86557 705.503602 502.148181 682.697124 490.896501 659.419023 487.035083 642.407751L486.4 636.740922 486.400004 196.90019600000005C486.400006 160.801293 520.044004 145.90070000000003 547.157161 168.768644L549.478807 170.72677999999996 551.27783 173.17379000000005C553.709086 176.48075300000005 561.946746 183.56540600000005 577.924452 191.483569 607.159834 205.97190999999998 648.102165 214.905079 702.831787 214.905082 757.298833 214.905082 795.293111 206.40648099999999 819.77162 192.907243 832.167345 186.07133399999998 837.245391 180.59664399999997 838.029591 178.978613L839.547055 175.84764199999995 841.845105 173.23524099999997C866.781167 144.88818300000003 903.323712 159.26104999999995 903.323712 196.66445199999998L903.323712 497.049743 903.323712 636.7409230000001 903.323712 643.549699 899.941158 649.4588249999999C891.348196 664.470237 874.996732 685.712527 850.383556 706.850184 808.24231 743.04085 756.662673 764.607483 696.034325 763.689705L696.80221 763.689812ZM696.809291 712.495571C743.942063 713.209056 783.797257 696.544681 817.026071 668.007961 828.531119 658.127492 838.369481 647.521524 846.494989 636.965629 851.235031 630.807811 854.244804 626.226721 855.506263 624.023021L852.123712 636.7409230000001 852.123712 497.049743 852.123712 196.66445199999998C852.123712 199.20011699999998 854.231635 204.41496099999995 863.474707 208.050434 873.016412 211.80336599999998 878.439633 209.15336100000002 880.287925 207.05224299999998L861.066515 190.14374199999997 884.103441 201.30886999999996C878.785579 212.28117299999997 866.346381 225.69198700000004 844.49655 237.741581 811.89913 255.71817999999996 765.462916 266.10508200000004 702.831785 266.10508200000004 640.463232 266.10507900000005 591.745741 255.475456 555.189638 237.35914000000002 531.692454 225.71450900000002 517.183533 213.23636899999997 510.026502 203.50146800000005L530.652166 188.33763 514.147172 207.906613C515.63949 209.16527399999995 520.284527 210.66283299999998 527.732117 207.36436700000002 535.507665 203.920655 537.600004 199.018106 537.600004 196.90019600000005L537.6 636.7409230000001 536.964917 631.0740940000001C537.274671 632.438701 538.52809 636.159553 541.081741 641.442689 545.63241 650.857363 552.196378 660.39174 561.140218 669.3706540000001 588.544813 696.882717 631.736384 713.451107 696.041406 712.495464L696.809291 712.495571ZM972.799998 506.026694L972.799998 27.856867999999963C972.799998 30.12989200000004 974.964631 35.200736000000006 983.207422 38.64178100000004 991.122737 41.946117999999956 995.837214 40.189508000000046 997.287401 38.84923500000002L979.911949 20.048869999999965 999.286321 36.78188399999999C987.127682 50.859801999999945 964.238844 70.78961500000003 930.504218 90.424668 874.925269 122.77408400000002 808.525103 142.15018499999996 731.662669 142.15018199999997 653.132708 142.15017999999998 590.55104 117.26282200000003 543.127755 75.73800100000005 514.370099 50.55719499999998 496.945662 25.10259599999995 488.705389 7.022771000000034 482.841769-5.842485000000011 488.517717-21.02524200000005 501.382974-26.888862000000017 514.248233-32.752481999999986 529.430987-27.07653300000004 535.294607-14.211275 536.420563-11.740835999999945 539.350332-6.450639000000024 544.25735 0.7178109999999833 552.731727 13.097653000000037 563.54464 25.561581000000047 576.856734 37.21792900000003 615.190044 70.78337499999998 665.901421 90.95018000000005 731.662669 90.95018200000004 799.091447 90.95018200000004 856.704307 74.13829099999998 904.748587 46.17438500000003 921.433645 36.46294 935.6937 26.101906999999983 947.501771 15.820363000000043 954.344425 9.862312999999972 958.698848 5.444836000000009 960.537577 3.315859000000046L962.536497 1.2485080000000153C989.206831-23.40043300000002 1023.999998-8.875636999999983 1023.999998 27.856867999999963L1023.999998 506.026694C1023.999998 520.165184 1012.538487 531.626694 998.399998 531.626694 984.261508 531.626694 972.799998 520.165184 972.799998 506.026694L972.799998 506.026694Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="404" unicode="&#58908;" d="M300.197309 299.705317l4.427931 1.803972c1.147982-2.787956 10.167841-7.543882 26.89558-14.267777l5.411915-12.955798c10.659833-24.927611 23.123639-62.483024 37.555413-112.66624 14.431775 5.575913 34.439462 0.983985 60.351057-13.611787l1.803972-4.427931L389.575913 107.828315l18.203716-42.639334c2.459962-5.575913-12.463805-15.579757-44.7713-29.847534-11.151826 7.215887-19.84369 9.675849-26.403587 7.05189l-0.983985 2.131967c-10.823831 25.419603-16.235746 42.311339-16.399744 50.675208l-4.427931-1.803972 6.3959-14.923767-11.151826-4.263933c-41.655349-16.235746-71.830878-18.695708-90.690583-7.871877l-4.427931-1.803972-1.803972 4.263933c-7.05189 16.727739 3.607944 77.406791 32.307495 182.037156 11.479821 4.427931 19.1877 14.923767 22.959641 31.323511C281.337604 290.685458 291.83344 296.425368 300.197309 299.705317L300.197309 299.705317zM216.230621 80.276746c28.371557 19.515695 40.999359 32.799488 38.047406 39.68738-0.983985 2.131967-0.65599 5.575913 0.65599 10.167841l-0.983985 2.131967c-25.5836-21.483664-38.047406-32.963485-37.391416-34.439462C215.246637 88.804612 215.082639 83.064702 216.230621 80.276746L216.230621 80.276746zM216.722614 72.896861l0.983985-2.131967c11.643818 1.147982 21.155669 3.279949 28.699552 6.231903 0.819987 0.327995 7.379885 5.411915 19.84369 15.251762l-0.983985 2.131967c-7.543882-2.951954-12.7918-0.983985-15.743754 6.067905C226.398463 85.032671 215.574632 75.848815 216.722614 72.896861L216.722614 72.896861zM225.90647 143.743754l11.151826 4.263933c-1.147982-2.623959-6.3959-8.691864-15.579757-18.53171-2.295964-10.823831-2.787956-17.547726-1.639974-20.335682 27.715567 20.663677 40.34337 33.783472 37.883408 39.523382l0.819987 10.331839-3.443946-3.935939-9.019859-3.443946-0.983985 2.131967c11.151826 4.263933 17.875721 16.891736 20.49968 37.719411l-0.983985 2.131967C239.35426 172.443306 227.21845 160.307495 227.874439 157.027546L225.90647 143.743754 225.90647 143.743754zM231.646381 173.42729l0.983985-2.131967 2.131967 0.819987c28.371557 23.123639 40.179372 40.179372 35.423447 51.331198 1.475977 0.65599 1.967969 1.639974 1.475977 2.951954l-2.295964-0.819987c-28.863549-21.647662-40.999359-38.047406-36.407431-49.035234C231.482383 175.723254 230.990391 174.73927 231.646381 173.42729L231.646381 173.42729zM240.994234 211.966688l0.983985-2.131967c13.775785 10.331839 35.915439 29.847534 66.418962 58.21909l2.131967 0.819987-6.3959 14.923767 0.491992 5.083921-2.295964-0.819987c-36.571429-32.963485-55.431134-51.82319-56.579116-56.743113L240.994234 211.966688 240.994234 211.966688zM311.67713 107.336323l-35.751441-13.939782c-1.475977-0.491992-6.887892-4.263933-16.235746-11.315823l0.819987-1.967969 12.299808 2.131967 20.007687 7.871877c11.643818 4.591928 32.143498 19.84369 61.171044 46.08328l-6.3959 14.923767-2.131967-0.819987c-24.107623-16.891736-34.439462-29.191544-31.159513-36.899423C315.449071 110.616272 314.629084 108.484305 311.67713 107.336323L311.67713 107.336323zM267.889814 264.773863l0.819987-1.967969c17.875721 16.891736 27.387572 25.419603 28.207559 25.747598l-0.983985 2.131967-8.855862-3.443946C274.941704 282.485586 268.545804 274.941704 267.889814 264.773863L267.889814 264.773863zM275.597694 222.954516c16.071749-37.883408 20.007687-67.894939 11.971813-90.034593l-3.443946-28.863549 26.89558 10.495836c-7.543882 30.011531-18.367713 65.598975-32.471493 106.926329l-0.983985 2.131967L275.597694 222.954516 275.597694 222.954516zM279.369635 231.810378l6.3959-14.923767c13.44779 15.087764 24.435618 24.271621 32.63549 27.55157l-3.607944 8.527867-2.459962 11.643818-2.131967-0.819987C289.045484 247.06214 278.713645 236.566304 279.369635 231.810378L279.369635 231.810378zM292.817425 194.58296c23.943626 17.219731 33.619475 30.995516 29.191544 41.491352l-2.787956 6.3959-2.295964-0.819987c-21.483664-18.859705-30.667521-31.651505-27.879564-38.3754L292.817425 194.58296 292.817425 194.58296zM294.457399 190.483024l2.787956-6.3959 2.295964-11.807816 2.295964 0.819987-0.491992-5.083921 6.3959-14.923767 32.471493 27.387572-6.3959 15.087764c-9.347854-10.331839-16.235746-16.399744-20.827675-18.203716l-2.295964-0.983985c-0.65599 1.639974 6.067905 10.167841 20.335682 25.419603l-3.115951 13.611787-0.983985 2.131967L294.457399 190.483024 294.457399 190.483024zM307.413197 148.171685l2.787956-6.3959 2.295964-11.643818c23.943626 17.219731 35.259449 27.387572 33.94747 30.503523l-5.411915 12.955798C329.224856 165.719411 318.07303 157.191544 307.413197 148.171685L307.413197 148.171685zM355.792441 131.935939c-23.779628-17.711723-34.111467-30.011531-30.995516-37.227418l1.475977-9.347854c25.255605 18.039718 36.899423 29.355541 34.931454 33.783472 24.435618 21.155669 38.703395 32.471493 42.803331 33.94747l-0.819987 1.967969c-1.803972 2.787956-6.723895 4.099936-14.595772 4.427931l-30.831518-31.9795L355.792441 131.935939 355.792441 131.935939zM327.912876 81.26073l4.591928-10.659833-0.491992-5.083921 2.295964 0.819987c23.451634 14.595772 34.275464 23.615631 32.63549 27.55157l-5.411915 12.955798L327.912876 81.26073 327.912876 81.26073zM333.816784 61.253043l5.411915-12.7918c25.747598 13.283792 37.719411 22.139654 35.915439 26.403587l-4.591928 10.659833C348.412556 70.272902 336.112748 62.237028 333.816784 61.253043L333.816784 61.253043zM357.596413 139.971813l1.803972-4.099936c4.919923 1.967969 8.527867 9.839846 10.823831 23.943626l-2.295964-0.819987C364.648302 147.679693 361.204356 141.44779 357.596413 139.971813L357.596413 139.971813zM731.674568 256.081999l3.935939-0.163997c-0.163997-2.459962 4.755926-9.019859 14.759769-19.515695l-0.65599-11.315823c-1.147982-21.975657-5.411915-53.955157-12.955798-95.774504 12.627803-0.65599 25.911595-10.659833 39.68738-30.175529l-0.163997-3.935939-47.887252-10.823831-1.967969-37.719411c-0.327995-4.919923-14.923767-7.379885-43.951313-7.379885-5.575913 9.019859-11.151826 13.775785-16.891736 13.939782l0.163997 1.967969c1.147982 22.467649 3.279949 36.735426 6.231903 42.967329l-3.935939 0.163997-0.65599-13.119795-9.839846 0.491992c-36.571429 1.803972-60.023062 9.839846-70.026906 24.271621l-3.935939 0.163997 0.163997 3.771941c0.819987 14.759769 30.667521 56.087124 89.706598 124.14606 10.167841-0.491992 19.515695 4.755926 28.371557 15.579757C714.290839 255.754004 724.294683 256.573991 731.674568 256.081999L731.674568 256.081999zM587.848815 115.86419l-0.163997-1.967969c9.019859-2.951954 16.891736-4.591928 23.615631-4.919923 0.65599 0 7.379885 1.475977 20.171685 4.755926l0.163997 1.967969c-6.723895 0.327995-9.839846 3.607944-9.511851 9.675849C599.328635 121.6041 588.012812 118.324151 587.848815 115.86419L587.848815 115.86419zM590.144779 121.440102c28.043562 5.083921 42.147341 10.659833 42.475336 16.727739 0.163997 1.803972 1.475977 4.263933 4.099936 7.215887l0.163997 1.967969c-26.731582-7.379885-40.015375-11.807816-40.179372-13.119795C592.440743 128.163997 590.308776 123.900064 590.144779 121.440102L590.144779 121.440102zM620.15631 165.227418l9.839846-0.491992c-1.803972-1.475977-7.871877-4.427931-18.367713-8.527867-5.575913-7.215887-8.527867-12.13581-8.527867-14.595772 28.043562 6.067905 42.147341 11.643818 42.311339 16.727739l4.263933 7.379885-3.935939-1.803972-8.035874 0.327995 0.163997 1.967969c9.839846-0.491992 19.351698 6.559898 28.863549 21.155669l0.163997 1.967969c-26.23959-7.379885-39.68738-12.463805-40.34337-14.923767L620.15631 165.227418 620.15631 165.227418zM670.667521 109.960282l-31.487508 1.475977c-1.31198 0-6.559898-0.983985-16.071749-2.951954l-0.163997-1.803972 9.839846-2.459962 17.711723-0.819987c10.331839-0.491992 30.995516 4.099936 61.991031 13.939782l0.65599 13.119795-1.803972 0.163997c-23.943626-4.591928-36.079436-10.167841-36.407431-16.891736C674.603459 110.944266 673.29148 109.796284 670.667521 109.960282L670.667521 109.960282zM635.244074 185.399103l-0.163997-1.967969 1.803972-0.163997c29.355541 7.70788 44.279308 16.563741 44.7713 26.23959 1.31198 0 2.131967 0.491992 2.131967 1.639974l-1.967969 0.163997c-29.191544-6.3959-44.115311-14.595772-44.607303-24.271621C635.900064 187.039078 635.244074 186.547085 635.244074 185.399103L635.244074 185.399103zM685.755285 207.37476c-1.803972-33.29148-9.675849-56.907111-23.615631-70.682896l-12.955798-20.171685 23.779628-1.147982c5.247918 24.763613 10.167841 54.611147 14.595772 89.870596l0.163997 1.967969L685.755285 207.37476 685.755285 207.37476zM656.071749 210.818706l-0.163997-1.967969c13.939782 3.115951 37.391416 10.167841 70.354901 21.155669l1.803972-0.163997 0.65599 13.119795 2.295964 3.607944-1.967969 0.163997c-39.03139-12.299808-59.859065-20.007687-62.483024-23.287636L656.071749 210.818706 656.071749 210.818706zM670.339526 68.46893l-0.65599-11.315823c23.943626 1.31198 35.915439 3.935939 36.079436 7.70788l0.491992 9.347854C684.443306 70.272902 672.471493 68.304933 670.339526 68.46893L670.339526 68.46893zM673.29148 85.196669l-0.491992-9.347854-2.295964-3.607944 1.967969-0.163997c22.631646 2.951954 33.94747 6.231903 34.111467 9.511851l0.65599 11.315823L673.29148 85.196669 673.29148 85.196669zM712.158873 113.568225c-23.943626-5.247918-36.079436-10.987828-36.407431-17.219731l-2.295964-7.379885c25.255605 5.083921 37.883408 9.511851 38.211403 13.44779 25.747598 7.543882 40.34337 11.151826 43.951313 10.987828l0.163997 1.803972c-0.327995 2.623959-3.443946 5.247918-9.347854 8.035874l-34.439462-13.44779L712.158873 113.568225 712.158873 113.568225zM682.147341 141.611787l-0.327995-5.73991-2.459962-9.347854c23.943626 4.755926 36.079436 8.691864 36.079436 11.479821l0.65599 11.315823C704.778988 147.351698 693.463165 144.727739 682.147341 141.611787L682.147341 141.611787zM688.051249 177.199231l-0.327995-5.73991-2.623959-9.511851 1.967969-0.163997-2.295964-3.607944-0.65599-13.119795 33.94747 9.511851 0.65599 13.283792c-10.659833-4.591928-18.039718-6.723895-21.975657-6.559898l-1.967969 0.163997c0 1.475977 8.199872 5.411915 24.271621 12.13581l2.623959 11.151826 0.163997 1.967969L688.051249 177.199231 688.051249 177.199231zM688.215247 180.807175c23.943626 4.755926 36.243434 11.807816 36.735426 20.991672l0.327995 5.73991-1.967969 0.163997c-22.631646-6.887892-34.275464-13.283792-34.603459-19.1877L688.215247 180.807175 688.215247 180.807175zM691.82319 212.786675l-0.65599-13.119795c15.415759 6.723895 26.89558 10.003844 34.111467 9.511851l0.327995 7.543882 2.459962 9.511851-1.803972 0.163997C704.450993 220.986547 692.971172 216.558616 691.82319 212.786675L691.82319 212.786675zM695.103139 240.994234l-0.163997-1.803972c19.351698 6.559898 29.355541 9.839846 30.339526 9.839846l0.163997 1.967969-7.871877 0.327995C706.746957 251.818065 699.367072 248.374119 695.103139 240.994234L695.103139 240.994234zM716.422806 118.980141l-0.163997-3.607944c4.427931-0.163997 10.003844 4.427931 16.727739 14.10378l-1.967969 0.163997C724.45868 122.26009 719.538757 118.816143 716.422806 118.980141L716.422806 118.980141zM479.118514 382.196028c53.627162 10.167841 89.870596 1.967969 109.222293-24.599616 9.675849-18.695708 15.579757-33.455477 17.875721-44.279308 11.807816-56.743113-5.903908-103.154388-53.299167-138.741832-12.463805-5.083921-22.631646-8.363869-30.339526-10.003844-31.651505-6.067905-63.631006 5.083921-95.938501 33.455477-9.347854 16.399744-15.251762 31.159513-18.039718 44.279308-13.283792 63.795003 1.967969 108.238309 45.919283 133.165919L479.118514 382.196028 479.118514 382.196028zM410.075593 265.429853c6.231903 5.247918 11.479821 8.199872 15.579757 9.019859-9.675849-9.347854-14.431775-15.087764-13.939782-17.219731-0.327995-5.411915-0.163997-10.167841 0.819987-14.267777l2.131967 0.327995c24.271621 15.743754 35.915439 25.5836 35.095452 29.519539l-2.131967 10.003844c-4.099936-3.607944-8.035874-5.73991-11.643818-6.559898l-0.819987 4.099936c10.823831 2.131967 15.251762 11.971813 13.44779 29.519539l-1.967969-0.327995c-22.467649-16.399744-34.603459-27.715567-36.407431-33.94747C409.255605 273.30173 409.255605 269.857783 410.075593 265.429853L410.075593 265.429853zM410.23959 286.257527c33.127482 21.647662 47.887252 40.34337 44.607303 56.251121-29.683536-23.615631-44.443306-36.079436-44.279308-37.555413C409.747598 295.769379 409.5836 289.537476 410.23959 286.257527L410.23959 286.257527zM412.699552 315.777066l0.491992-2.131967c27.059577 20.663677 44.607303 37.227418 52.643177 49.527226 10.331839 1.967969 17.055734 7.379885 20.49968 16.235746l-2.131967-0.491992C447.303011 372.028187 423.523382 350.872518 412.699552 315.777066L412.699552 315.777066zM414.339526 234.926329c2.459962-4.919923 4.263933-9.347854 5.083921-13.44779 18.859705 14.759769 30.339526 22.467649 34.111467 23.123639l-3.771941 18.039718C444.18706 261.493914 432.379244 252.310058 414.339526 234.926329L414.339526 234.926329zM421.883408 220.002562c2.131967-9.839846 5.247918-14.759769 9.675849-14.759769l27.879564 21.975657c-0.327995 1.147982-2.131967 6.231903-5.411915 15.415759C437.299167 228.530429 426.639334 220.986547 421.883408 220.002562L421.883408 220.002562zM432.707239 199.174888c5.083921-5.903908 8.527867-8.691864 10.495836-8.363869l3.935939 0.819987c10.987828 10.495836 19.1877 16.235746 24.599616 17.219731-0.819987 3.935939-3.935939 8.855862-9.511851 14.759769C442.21909 209.014734 432.379244 200.814862 432.707239 199.174888L432.707239 199.174888zM448.450993 185.563101l0.491992-2.131967c2.459962 0.491992 6.3959-0.819987 11.807816-3.771941 18.859705 10.003844 28.207559 16.727739 28.207559 19.84369-6.067905 1.639974-9.511851 4.427931-10.331839 8.363869C466.818706 202.946829 456.814862 195.566944 448.450993 185.563101L448.450993 185.563101zM469.442665 179.331198l0.491992-2.131967 14.923767 0.65599 12.627803 2.459962c2.459962 0.491992 8.199872 3.771941 17.547726 9.839846l-0.491992 2.131967c-6.887892-1.31198-13.611787 0.163997-20.49968 4.263933L469.442665 179.331198 469.442665 179.331198zM476.494555 249.030109l4.591928-21.811659c2.951954-14.431775 12.463805-25.091608 28.535554-31.9795l4.099936 0.819987c24.599616 34.275464 32.143498 73.798847 22.795644 118.570147l-2.459962 11.971813-6.231903 19.515695-6.067905-1.147982c-3.935939-0.819987-14.267777 0-30.831518 2.295964C473.870596 316.597053 469.278668 283.961563 476.494555 249.030109L476.494555 249.030109zM476.494555 363.172325l0.327995-1.967969c10.823831-2.131967 17.547726-3.115951 20.007687-2.623959 13.939782 10.167841 21.647662 17.875721 23.287636 23.287636l-21.319667-1.967969C496.174247 379.408072 488.630365 373.832159 476.494555 363.172325L476.494555 363.172325zM508.966047 363.172325l3.771941 2.787956c1.147982 0.163997 6.231903-2.951954 15.087764-9.675849 10.331839 13.119795 18.203716 20.171685 23.779628 21.155669-0.65599 2.951954-8.199872 4.263933-22.467649 4.099936C515.361947 370.716208 508.638053 364.648302 508.966047 363.172325L508.966047 363.172325zM511.590006 185.235106l0.491992-2.131967 4.099936 0.819987c19.84369 3.771941 35.751441 17.219731 47.723254 40.34337C554.557335 214.754644 537.173607 201.634849 511.590006 185.235106L511.590006 185.235106zM521.921845 197.534914c38.211403 24.271621 56.087124 42.311339 53.79116 53.79116 1.967969 4.919923 2.623959 8.527867 2.295964 10.823831-35.095452-26.567585-51.495195-44.935298-49.363229-54.939142C526.349776 206.71877 524.217809 203.602819 521.921845 197.534914L521.921845 197.534914zM528.64574 352.348495l7.543882-15.251762 2.131967 0.491992c4.263933 5.73991 13.283792 14.431775 27.059577 25.911595l-0.491992 2.131967c-5.411915 5.247918-8.363869 8.855862-8.855862 10.823831l-4.099936-0.819987L528.64574 352.348495 528.64574 352.348495zM536.845612 333.324792l4.263933-9.675849-0.491992-8.363869 4.099936 0.819987c19.515695 17.711723 29.027546 27.059577 28.863549 28.371557l-0.491992 2.131967c-1.967969 9.347854-4.263933 13.611787-7.05189 13.119795C548.817425 342.508648 539.141576 333.652787 536.845612 333.324792L536.845612 333.324792zM539.797566 236.402306c27.715567 19.84369 40.999359 32.63549 39.68738 38.703395 1.31198 7.215887 1.803972 12.13581 1.147982 14.759769l-1.967969-0.327995-35.095452-29.519539C540.78155 245.586163 539.469571 237.714286 539.797566 236.402306L539.797566 236.402306zM542.257527 307.413197l2.459962-11.971813 10.003844 3.935939c-7.05189-7.871877-10.331839-12.627803-10.003844-14.267777-0.65599-10.495836-0.819987-16.727739-0.327995-18.695708 18.695708 13.611787 30.831518 24.927611 36.243434 33.94747l-2.459962 11.971813c-7.05189-7.05189-12.7918-10.987828-16.727739-11.807816 8.035874 11.315823 13.939782 17.383728 17.711723 18.039718l-4.099936 19.84369C554.557335 320.532992 543.733504 310.201153 542.257527 307.413197L542.257527 307.413197zM307.249199 569.153107c-9.675849 0-17.711723-6.887892-19.84369-16.071749-4.263933-12.463805 1.639974-28.863549 29.519539-35.751441 1.31198 35.587444 0 49.527226 0 49.527226C313.809097 568.33312 310.693145 569.153107 307.249199 569.153107L307.249199 569.153107zM709.862908 537.173607c0-1.147982 0-2.131967-0.163997-3.115951 2.131967 3.279949 3.279949 7.215887 3.279949 11.479821 0 11.643818-9.183857 21.155669-20.49968 21.155669-3.443946 0-6.723895-0.819987-9.511851-2.459962C697.891095 563.905189 709.862908 551.933376 709.862908 537.173607L709.862908 537.173607zM531.761691 520.281871c0.65599 15.743754-32.963485 49.199231-32.963485 49.199231 0-18.203716 9.347854-42.803331 12.463805-48.707239-8.035874-11.643818-13.283792-32.307495-13.283792-32.307495S531.105701 504.374119 531.761691 520.281871L531.761691 520.281871zM488.794363 507.326073c2.459962 0 4.427931 1.967969 4.427931 4.427931 0 2.459962-1.967969 4.427931-4.427931 4.427931-2.459962 0-4.427931-1.967969-4.427931-4.427931C484.366432 509.294042 486.334401 507.326073 488.794363 507.326073L488.794363 507.326073zM445.335042 629.668161c-0.819987 8.855862-2.131967 16.235746-2.131967 16.235746s-53.627162 7.05189-63.959001-30.503523C395.151826 632.94811 427.623318 631.144138 445.335042 629.668161L445.335042 629.668161zM620.648302 614.908392c-9.675849 37.719411-63.303011 31.651505-63.303011 31.651505s-1.475977-7.379885-2.459962-16.235746C572.597053 631.636131 605.232543 632.784113 620.648302 614.908392L620.648302 614.908392zM419.587444 518.313901c29.847534 0 53.955157 21.975657 53.955157 49.035234 0 27.059577-24.271621 49.035234-53.955157 49.035234-29.847534 0-53.955157-21.975657-53.955157-49.035234C365.632287 540.289558 389.903908 518.313901 419.587444 518.313901L419.587444 518.313901zM419.587444 613.76041c28.371557 0 51.331198-20.827675 51.331198-46.411275 0-25.5836-22.959641-46.411275-51.331198-46.411275-28.207559 0-51.331198 20.827675-51.331198 46.411275C368.256246 592.932735 391.379885 613.76041 419.587444 613.76041L419.587444 613.76041zM419.587444 534.38565c20.007687 0 36.243434 14.759769 36.243434 32.799488 0 18.203716-16.235746 32.799488-36.243434 32.799488s-36.243434-14.759769-36.243434-32.799488C383.34401 549.14542 399.579757 534.38565 419.587444 534.38565L419.587444 534.38565zM435.331198 552.261371c1.967969 2.131967 4.919923 2.623959 6.559898 1.147982 1.639974-1.475977 1.475977-4.263933-0.491992-6.3959-1.967969-2.131967-4.919923-2.623959-6.559898-1.147982C433.035234 547.341448 433.199231 550.129404 435.331198 552.261371L435.331198 552.261371zM395.971813 585.880846c5.411915 5.73991 13.283792 7.05189 17.875721 3.115951 4.591928-3.935939 3.935939-11.807816-1.475977-17.547726-5.411915-5.73991-13.283792-7.05189-17.875721-3.115951C389.903908 572.433056 390.559898 580.304933 395.971813 585.880846L395.971813 585.880846zM584.240871 518.313901c29.847534 0 53.955157 21.975657 53.955157 49.035234 0 27.059577-24.271621 49.035234-53.955157 49.035234-29.847534 0-53.955157-21.975657-53.955157-49.035234C530.121717 540.289558 554.393338 518.313901 584.240871 518.313901L584.240871 518.313901zM584.240871 613.76041c28.371557 0 51.331198-20.827675 51.331198-46.411275 0-25.5836-22.959641-46.411275-51.331198-46.411275-28.207559 0-51.331198 20.827675-51.331198 46.411275C532.909673 592.932735 555.869315 613.76041 584.240871 613.76041L584.240871 613.76041zM584.240871 534.38565c20.007687 0 36.243434 14.759769 36.243434 32.799488 0 18.203716-16.235746 32.799488-36.243434 32.799488-20.007687 0-36.243434-14.759769-36.243434-32.799488C547.997438 549.14542 564.233184 534.38565 584.240871 534.38565L584.240871 534.38565zM599.820628 552.261371c1.967969 2.131967 4.919923 2.623959 6.559898 1.147982 1.639974-1.475977 1.475977-4.263933-0.491992-6.3959-1.967969-2.131967-4.919923-2.623959-6.559898-1.147982C597.688661 547.341448 597.852659 550.129404 599.820628 552.261371L599.820628 552.261371zM560.62524 585.880846c5.411915 5.73991 13.283792 7.05189 17.875721 3.115951 4.591928-3.935939 3.935939-11.807816-1.475977-17.547726-5.411915-5.73991-13.283792-7.05189-17.875721-3.115951C554.557335 572.433056 555.213325 580.304933 560.62524 585.880846L560.62524 585.880846zM957.171044 381.540038C957.171044 381.540038 957.171044 381.540038 957.171044 381.540038c-0.65599 0.983985-1.31198 1.803972-1.967969 2.951954-0.327995 0.327995-0.491992 0.65599-0.819987 0.983985-0.327995 0.327995-1.967969 0.65599-2.295964 0.983985-11.315823 14.759769-29.355541 40.34337-62.975016 46.247277l0 34.931454c0 4.263933-0.819987 8.691864-5.083921 8.691864L685.919283 476.330557c-0.163997 10.331839-0.327995 18.203716-0.65599 27.879564 24.435618 1.803972 43.295324 19.351698 43.295324 41.491352 0 22.467649-19.84369 40.671365-45.263293 41.819347-1.967969 78.226778-5.903908 143.98975-7.70788 150.549648l-0.491992 0.983985c-1.967969 2.295964-9.511851 5.247918-21.155669 8.363869 0.327995 13.939782-3.279949 29.355541-11.643818 46.08328 3.443946-21.647662-22.795644-36.079436-26.567585-38.047406-0.163997 0-0.327995 0-0.491992 0 0.163997 4.427931 0 57.727098-88.230621 97.90647-1.475977-44.115311-14.10378-70.682896-31.9795-86.754644L494.534273 766.606022l-5.411915-0.327995 0-0.163997 0 0 0 0 0.327995 0 0.327995-0.163997c-0.819987-0.163997-0.983985-0.491992-1.147982-1.147982-10.331839-8.035874-28.043562-18.203716-64.450993-18.203716-13.283792 0-28.207559 1.31198-44.607303 3.935939-4.099936 0.819987-7.70788 1.147982-11.151826 1.147982-5.575913 0-10.003844-0.983985-16.071749-2.295964l-0.327995 0-0.327995-0.163997c-17.547726-4.099936-27.55157-7.70788-30.011531-10.659833l-0.491992-0.983985c-0.491992-2.131967-2.295964-8.363869-5.73991-150.549648-25.255605-0.983985-45.263293-19.351698-45.263293-41.983344 0-22.139654 18.859705-39.523382 43.459321-41.163357-0.163997-9.675849-0.327995-17.547726-0.65599-27.879564L132.099936 476.002562c-4.427931 0-10.495836-4.591928-10.495836-8.691864l0-97.414478c-11.807816-0.65599-19.679693-2.295964-26.731582-4.755926-29.027546-10.495836-35.751441-35.915439-35.587444-60.023062 0-1.475977 0.491992-2.787956 0.983985-3.771941-6.723895-11.643818-6.231903-25.5836-5.083921-35.587444 0.983985-8.035874 2.623959-12.13581 4.427931-13.939782-4.263933-8.855862-0.983985-18.859705 1.967969-26.731582 3.771941-10.167841 12.13581-11.971813 22.139654-10.003844-4.755926-9.019859-2.459962-17.219731 11.643818-28.699552 4.427931-3.607944 14.267777 7.05189 26.075593 16.071749l0-267.151826c0-4.263933 6.067905-6.067905 10.331839-6.067905l751.928251 0c4.427931 0 5.083921 1.803972 5.083921 6.067905L888.784113 248.374119c16.727739 0.983985 29.355541 7.70788 38.539398 19.84369 4.591928 6.231903 7.871877 11.807816 8.691864 16.891736C977.670724 313.153107 982.262652 344.640615 957.171044 381.540038L957.171044 381.540038zM316.433056 508.638053c-22.959641 0.491992-40.835362 16.727739-40.835362 36.735426 0 20.335682 18.859705 36.899423 41.983344 36.899423l0 2.623959 0.163997-0.65599c0-0.819987 0-1.475977 0-2.295964 0.491992 0.163997 0.983985 0.163997 1.475977 0.327995l1.803972 0 0 0.491992c5.247918 1.31198 12.7918 2.951954 19.351698 3.771941 10.003844 35.095452 34.111467 64.122998 34.111467 64.122998s-9.839846 28.863549-13.939782 67.238949c51.167201-85.11467 229.268418-81.178732 280.107623-10.823831-4.591928-32.799488-12.627803-56.415119-12.627803-56.415119s24.107623-28.863549 34.111467-64.122998c6.559898-0.819987 13.939782-1.147982 19.023703-2.295964 0 0.491992 0 2.623959 0 2.623959l0.491992 0c23.123639 0 41.983344-18.695708 41.983344-39.03139 0-9.347854-3.935939-18.695708-10.495836-25.419603-10.167841-6.723895-25.091608-10.331839-40.835362-10.331839 0-6.723895 0.983985-19.351698 1.803972-35.423447L318.401025 476.658552c0.163997 10.331839 0.491992 19.84369 0.65599 30.175529l0 2.131967L316.433056 508.638053 316.433056 508.638053zM126.524023 462.554773c0 4.099936 6.3959 9.183857 10.823831 9.183857l741.432415 0c4.263933 0 5.575913-4.919923 5.575913-9.183857l0-29.027546c0 0.491992-6.723895 1.475977-10.823831 1.147982-22.795644-2.295964-44.443306-3.607944-60.679052-9.183857L176.215247 425.491352l-1.31198-2.787956 0-60.18706c-10.823831 5.903908-25.5836 8.363869-48.215247 7.871877L126.68802 462.554773 126.524023 462.554773zM821.381166-13.693786 180.807175-13.693786 180.807175 282.649584c10.823831 4.263933 15.579757 10.987828 15.087764 21.975657-0.491992 8.363869-4.263933 13.611787-15.087764 16.727739l0 7.379885c5.903908 1.967969 3.935939 4.263933 5.247918 6.723895 5.411915 10.495836 5.575913 18.203716-5.247918 23.779628l0 55.759129 615.318386 0c-2.787956-5.575913-4.755926-7.871877-5.575913-12.299808-1.475977-8.035874-1.639974-18.367713-1.147982-28.207559L697.891095 315.449071c0 0-28.371557-15.251762-16.727739-32.799488 11.643818-17.383728 32.307495-11.479821 50.511211-0.327995 12.13581 7.379885 39.68738 23.287636 63.959001 40.179372 0.163997-0.163997 0.327995-0.163997 0.491992-0.327995-1.803972-1.31198-2.951954-2.295964-2.951954-2.295964-11.151826-7.543882-6.887892-36.899423 15.415759-41.327354 3.115951-0.65599 9.675849 0 9.675849 1.147982l0-293.391416L821.381166-13.693786 821.381166-13.693786zM177.855221 271.169763c0 3.443946-2.131967 6.231903-4.755926 8.035874 1.639974 0.491992 3.771941 0.983985 4.755926 1.475977L177.855221 271.169763 177.855221 271.169763zM177.855221 322.828956c-0.983985 0.163997-1.639974 0.327995-2.459962 0.491992 0.819987 0.491992 1.475977 0.983985 2.459962 1.475977L177.855221 322.828956 177.855221 322.828956zM878.780269-65.516976 137.347854-65.516976c-4.263933 0-10.823831 2.131967-10.823831 6.3959L126.524023 206.882767c5.903908 1.147982 4.919923 2.295964 6.723895 3.279949 19.679693 8.035874 38.047406 25.255605 25.747598 33.127482-0.163997 0-1.475977 0.163997-1.639974 0.163997 9.511851 3.771941 17.547726 9.839846 17.547726 20.663677l0-289.29148 655.169763 2.459962 0 291.915439c9.839846-9.675849 21.647662-14.595772 34.603459-10.331839 3.279949-6.559898 13.611787-9.839846 19.515695-10.331839l0-307.495195C884.192184-63.38501 883.044202-65.516976 878.780269-65.516976L878.780269-65.516976zM878.780269-65.516976"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="carousel" unicode="&#58932;" d="M1002.069333 144.38400000000001L1002.069333 611.6906670000001c0 24.213333-16.917333 49.578667-42.069333 49.578667l-64 0 1.152 6.4c0 31.338667-26.005333 57.6-58.538667 57.6L186.432 725.269333c-31.936 0-58.410667-31.957333-58.410667-64l-0.213333 0.96L67.178667 662.229333c-25.152 0-45.226667-20.288-45.226667-44.501333l0-467.328L21.354667 150.39999999999998c0-24.789333 20.629333-44.693333 45.312-44.693333L127.786667 105.70666700000004l0-5.184C127.786667 69.03466700000001 153.792 42.66666699999996 186.432 42.66666699999996l652.842667 0c31.658667 0 56.277333 10.901333 56.725333 42.602667l64 0c24.661333 0 42.666667 34.325333 42.666667 59.114667L1002.069333 144.38400000000001zM128 149.26933299999996L64 149.26933299999996l0 469.333333 64 0L128 149.26933299999996zM853.333333 106.602667c0-6.421333-14.848-21.333333-21.333333-21.333333l-640 0c-6.485333 0-21.333333 14.848-21.333333 21.333333l0 554.666667c0 6.378667 9.258667 18.56 15.744 18.56l5.589333 2.773333 640 0c6.442667 0 21.333333-14.954667 21.333333-21.333333L853.333333 106.602667zM960 127.93600000000004l-64 0 0 490.666667 60.842667 1.984c4.970667 0 3.157333 2.944 3.157333-1.984l0-469.333333C960 144.29866700000002 965.013333 127.93600000000004 960 127.93600000000004zM412.458667 399.829333c43.925333 0 79.637333 34.773333 79.637333 77.482667 0 42.752-35.712 77.482667-79.637333 77.482667-43.925333 0-79.637333-34.730667-79.637333-77.482667C332.8 434.602667 368.533333 399.829333 412.458667 399.829333zM412.458667 516.0533330000001c21.952 0 39.829333-17.365333 39.829333-38.741333 0-21.333333-17.877333-38.741333-39.829333-38.741333-21.952 0-39.829333 17.408-39.829333 38.741333C372.629333 498.709333 390.506667 516.0533330000001 412.458667 516.0533330000001zM785.92 457.386667c-95.914667-23.338667-137.728-87.765333-168.256-134.805333-24.213333-37.269333-39.082667-58.346667-65.109333-58.346667l-0.042667 0c-35.456 0-57.109333 14.272-80.042667 28.16-24.362667 14.741333-49.536 29.952-88.64 29.952-75.648 0-156.906667-93.269333-165.930667-103.893333L213.333333 167.38133300000004c0-10.709333 8.917333-18.112 19.925333-18.112l557.504 0c10.986667 0 19.904 7.402667 19.904 18.112L810.666667 438.570667c0 5.973333-2.837333 11.626667-7.658667 15.296C798.186667 457.536 791.872 458.858667 785.92 457.386667zM770.858667 188.52266699999996L253.162667 188.52266699999996c24.874667 27.733333 85.290667 95.082667 130.666667 95.082667 27.733333 0 46.229333-11.157333 67.605333-24.128 25.152-15.168 53.632-32.426667 99.712-33.941333l2.944-0.064c47.637333 0 71.722667 37.12 97.237333 76.416 26.645333 41.088 56.469333 79.104 119.530667 102.485333L770.858667 188.52266699999996z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="help" unicode="&#58887;" d="M690.2 741.8C635.2 783.6 573.2 798 494.6 798c-59.6 0-110.6-12.2-151-39.4C284 718 256 649.8 256 542l153.6 0c0 28.8-2.8 59.8 14 86.4 16.8 26.6 40.2 47 80.4 47 40.8 0 61.8-11.8 81.6-36.2 16.8-20.8 23.2-45.6 23.2-72 0-22.8-11.6-43.8-25.4-62.8-7.6-11.2-17.6-21.2-30.2-30.8 0 0-83-49.4-112.2-96.2-21.8-34.8-29.6-78.4-31.4-130.6-0.2-3.8 1.2-11.6 14.4-11.6 13 0 112 0 123.6 0 11.6 0 14 8.8 14.2 12.4 0.8 19 3.2 48.2 6.6 59.2 6.6 20.8 19.4 39 39.4 54.6l41.4 28.6c37.4 29.2 67.2 53 80.4 71.8 22.6 30.8 38.4 68.8 38.4 113.8C768 649 741 703.2 690.2 741.8zM484 155.6c-51.8 1.6-94.6-34.4-96.4-90.6-1.6-56.4 39-93.4 91-95 54-1.6 95.8 33.2 97.4 89.4C577.6 115.6 538 154 484 155.6z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="code-circle" unicode="&#58933;" d="M513.544163 893.525741c-282.101629 0-510.78094-228.679311-510.78094-510.76288 0-282.083569 228.679311-510.76288 510.78094-510.76288s510.76288 228.679311 510.76288 510.76288C1024.325103 664.8464309999999 795.645793 893.525741 513.544163 893.525741zM513.544163-83.46335899999997c-257.503523 0-466.22622 208.740757-466.22622 466.22622S256.0587 848.989082 513.544163 848.989082s466.22622-208.740757 466.22622-466.22622S771.047686-83.46335899999997 513.544163-83.46335899999997zM171.771357 359.77212099999997L414.357086 256.088033 414.357086 300.805295 221.978945 380.50532599999997 414.357086 459.464886 414.357086 504.182148 171.771357 401.76228ZM442.585309 193.38272800000004L478.814238 193.38272800000004 584.737801 572.1429949999999 548.743656 572.1429949999999ZM612.749301 504.182148L612.749301 459.464886 804.874598 380.50532599999997 612.749301 300.805295 612.749301 256.088033 855.33503 359.77212099999997 855.33503 401.76228Z"  horiz-adv-x="1025" />
+
+    
+    <glyph glyph-name="windows" unicode="&#59007;" d="M437 329l0-325.5-341 47 0 278.5 341 0zm0 371.5l0-329.5-341 0 0 282.5zm491-371.5l0-393-453.5 62.5 0 330.5 453.5 0zm0 439l0-397-453.5 0 0 334.5z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="water" unicode="&#58934;" d="M862.315763 33.684211000000005C802.869868 33.684211000000005 754.526289 82.94399999999996 754.526289 143.50371900000005 754.526289 162.33094700000004 759.35885 180.96056099999998 768.520956 197.43438600000002 768.64671 197.79368399999998 768.808394 198.15298199999995 769.006008 198.49431600000003L849.075622 334.542596 849.057657 334.542596 862.315763 357.052632 875.573868 334.542596 875.573868 334.542596 955.140464 199.356632C955.715341 198.67396499999995 956.164464 197.865544 956.380043 196.96729800000003 965.380464 180.60126300000002 970.123201 162.151298 970.105236 143.50371900000005 970.105236 82.94399999999996 921.761657 33.684211000000005 862.315763 33.684211000000005L862.315763 33.684211000000005ZM924.33064 188.57768399999998C924.204885 188.79326300000002 924.115061 189.02680699999996 924.025236 189.27831600000002L862.315763 302.996211 800.606289 189.260351C800.516464 189.02680699999996 800.42664 188.79326300000002 800.300885 188.57768399999998 793.977236 176.505263 790.635763 162.81600000000003 790.635763 148.965053 790.635763 105.29235100000005 822.792956 69.75775399999998 862.333727 69.75775399999998 901.856534 69.75775399999998 933.995763 105.29235100000005 933.995763 148.98301800000002 933.995763 162.81600000000003 930.654289 176.52322800000002 924.33064 188.57768399999998L924.33064 188.57768399999998ZM682.684605 392.982456C593.50678 392.982456 520.982429 469.602807 520.982429 563.8108070000001 520.982429 593.093614 528.240254 622.071018 541.965447 647.706947 542.163061 648.281825 542.396605 648.820772 542.684043 649.341754L662.815412 860.968421 662.797447 860.968421 682.684605 896 702.571763 860.968421 702.535833 860.968421 821.89471 650.689123C822.774991 649.647158 823.439692 648.3716489999999 823.781026 646.970386 837.25471 621.514105 844.368815 592.8241399999999 844.35085 563.8108070000001 844.35085 469.602807 771.844464 392.982456 682.684605 392.982456L682.684605 392.982456ZM791.408254 630.1192980000001C791.21064 630.4965609999999 791.030991 630.891789 790.887271 631.322947L682.684605 823.924772 574.446008 631.287018C574.320254 630.891789 574.140605 630.4965609999999 573.942991 630.1013330000001 562.840675 609.6931930000001 556.912254 596.075789 556.912254 572.631579 556.912254 498.634105 613.375973 428.876351 682.684605 428.876351 751.993236 428.876351 808.367131 489.058807 808.367131 563.056281 808.367131 586.500491 802.492605 609.6931930000001 791.408254 630.1192980000001L791.408254 630.1192980000001ZM538.695833 276.983018C540.115061 275.330246 541.174991 273.33614 541.713938 271.12645599999996 563.433517 231.11859600000003 574.895131 186.02666699999997 574.895131 140.43171900000004 574.895131-7.581192999999985 458.051341-128 314.403903-128 170.738499-128 53.89471-7.581192999999985 53.89471 140.43171900000004 53.89471 186.47578899999996 65.589868 231.998877 87.704675 272.294175 88.010078 273.17445599999996 88.387341 274.01880700000004 88.872394 274.863158L282.408394 607.411649 282.372464 607.411649 314.403903 662.45614 346.453306 607.411649 346.399412 607.411649 538.695833 276.983018 538.695833 276.983018ZM314.403903 590.614456L119.807973 257.79649099999995C119.556464 257.113825 119.251061 256.449123 118.873798 255.78442099999995 98.932745 220.48336800000004 88.387341 180.42161399999998 88.387341 139.91073700000004 88.387341 12.072420999999963 189.799271-91.89052600000002 314.421868-91.89052600000002 439.026499-91.89052600000002 540.420464 12.072420999999963 540.402499 139.91073700000004 540.402499 180.42161399999998 529.857096 220.50133300000005 509.916043 255.78442099999995 509.53878 256.449123 509.233377 257.131789 508.963903 257.86835099999996L314.403903 590.614456 314.403903 590.614456Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="username" unicode="&#58991;" d="M514.594 824.888c-144.11 0-260.979-118.46-260.979-264.558 0-88.783 43.497-166.928 109.711-214.898-135.361-59.354-230.159-195.858-230.159-354.931h0.894c1.541-21.375 18.641-38.377 40.117-38.377s38.575 17.051 40.117 38.377h0.645c0 0.944-0.099 1.79-0.099 2.734 0 0.05 0 0.099 0 0.149 0 0.099-0.05 0.149-0.05 0.199 0.05 159.967 120 291.054 273.009 304.924 8.948-0.944 17.598-2.734 26.844-2.734 144.11 0 260.979 118.46 260.979 264.558s-116.919 264.558-261.029 264.558zM514.594 377.54499999999996c-99.769 0-180.698 81.972-180.698 183.183s80.879 183.183 180.698 183.183c99.719 0 180.647-81.972 180.647-183.183s-80.879-183.183-180.647-183.183zM896.021-6.615000000000009c0 0.348-0.199 0.645-0.199 0.994-1.043 105.038-43.397 200.034-111.35 269.131v0c-7.157 7.357-17.001 11.98-27.986 11.98-21.574 0-39.122-17.747-39.122-39.668 0-11.135 4.573-21.127 11.83-28.334l-0.099-0.05c52.742-55.229 85.302-130.589 85.302-213.853 0-1.043-0.149-1.987-0.149-3.034h0.994c1.491-21.375 18.691-38.377 40.117-38.377 21.475 0 38.575 17.051 40.117 38.377h0.597c0 0.796-0.099 1.491-0.099 2.287-0.05 0.149 0.05 0.348 0.05 0.547z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="find-fill" unicode="&#58992;" d="M512 896C229.236364 896 0 666.763636 0 384c0-282.786909 229.236364-512 512-512s512 229.213091 512 512C1024 666.763636 794.763636 896 512 896zM657.291636 383.976727c0-77.195636-60.392727-139.729455-136.424727-144.407273l-175.732364-151.714909-22.877091 13.242182 58.228364 222.021818c-8.634182 18.548364-13.800727 39.074909-13.800727 60.858182 0 77.195636 60.369455 139.729455 136.378182 144.430545l175.802182 151.714909 22.877091-13.172364-58.251636-222.068364C652.125091 426.309818 657.291636 405.806545 657.291636 383.976727zM512 384m-66.048 0a2.838 2.838 0 1 1 132.096 0 2.838 2.838 0 1 1-132.096 0Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="about" unicode="&#58891;" d="M514.27174 834.607768c-249.516844 0-451.789687-202.272843-451.789687-451.789687s202.272843-451.789687 451.789687-451.789687 451.789687 202.272843 451.789687 451.789687S763.788583 834.607768 514.27174 834.607768zM514.27174-20.12919999999997c-222.541469 0-402.947282 180.405813-402.947282 402.947282s180.405813 402.947282 402.947282 402.947282 402.947282-180.405813 402.947282-402.947282S736.814232-20.12919999999997 514.27174-20.12919999999997zM514.295276 593.979362c-9.44614-10.360975-14.307867-22.951735-14.307867-37.483706 0-11.960403 3.886517-22.396079 11.534707-30.457686 7.783267-8.211009 17.853623-12.450567 29.313629-12.450567 9.312086 0 23.139 2.849908 35.782971 16.900925 9.865695 10.641361 14.866592 23.437805 14.866592 37.693484 0 11.68104-4.031826 21.900799-11.744485 29.832446C562.925856 615.325529 532.358677 613.449809 514.295276 593.979362zM549.461193 293.282882c-12.110829-11.541871-20.589944-18.759249-26.236548-23.316032 2.77009 14.953573 9.976212 44.614104 27.330462 103.023398 17.297968 57.890478 18.799158 67.991534 18.799158 72.955592 0 8.65717-3.63683 16.335037-9.921977 21.642926-14.124695 11.661597-39.035038 9.349949-69.131497-7.677866-16.779152-9.408277-34.595936-24.759917-54.493102-46.576805l-10.377348-11.541871 34.425044-26.548656 8.818853 8.715499c9.573029 9.292644 16.086373 15.35164 20.411889 19.393699-26.294876-86.460164-39.093367-140.190903-39.093367-164.262134 0-10.907421 3.172249-19.970844 9.573029-26.839275 6.460132-7.039323 15.510252-10.736529 25.891693-10.736529 10.146081 0 21.792329 3.926426 35.922141 11.949146 12.741185 7.212262 31.883151 23.029506 58.641585 48.190559l10.837836 10.391674-31.30703 30.475082L549.461193 293.282882z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="location" unicode="&#59157;" d="M451.673935-98.39569900000004C478.883834-129.01914699999998 524.254807-128.8089789999999 551.400292-97.92885100000001 553.755808-95.38790800000004 558.821323-89.79676199999994 565.872444-81.84834999999998 577.572838-68.65901699999995 590.597131-53.62432000000001 604.615947-36.99831500000005 644.662065 10.495494000000008 684.708678 61.282182000000034 722.129538 113.35355300000003 759.658524 165.575381 792.492213 216.29072599999995 819.314991 264.54153799999995 868.685946 353.35368300000005 896 430.456574 896 493.714285 896 715.890551 719.301715 896 501.333333 896 283.364952 896 106.666667 715.890551 106.666667 493.714285 106.666667 430.401284 134.05152 353.19426999999996 183.54613 264.23737800000004 210.371803 216.02347099999997 243.193308 165.34812399999998 280.699364 113.16684599999996 318.155192 61.05544999999995 358.239268 10.22578999999996 398.322835-37.31103099999996 412.354743-53.95207300000004 425.391185-69.00072999999998 437.102468-82.20257900000001 444.160087-90.15846599999998 449.230214-95.75492099999997 451.982775-98.73670600000003L451.673935-98.39569900000004ZM486.822684-65.32134799999994C484.281231-62.568254000000024 479.425084-57.207989 472.585916-49.49835900000005 461.135889-36.591016999999965 448.364015-21.84776099999999 434.602351-5.527214999999956 395.275714 41.11192700000004 355.949587 90.98045200000001 319.289224 141.985137 282.808749 192.739548 250.983685 241.87642200000005 225.158316 288.29247799999996 179.388826 370.55419500000005 154.50505 440.709839 154.50505 493.714285 154.50505 688.960095 309.785362 847.238095 501.333333 847.238095 692.881306 847.238095 848.161617 688.960095 848.161617 493.714285 848.161617 440.753978 823.345286 370.701737 777.693969 288.58074899999997 751.873483 242.13293399999998 720.038415 192.96007499999996 683.537446 142.16873799999996 646.912604 91.20503299999996 607.624538 41.38032599999997 568.335977-5.21503800000005 554.587654-21.52024300000005 541.828177-36.24924999999996 530.389289-49.14379699999995 523.556841-56.84571100000005 518.705521-62.20043499999997 516.166694-64.95052599999997 507.543772-74.74891100000002 495.255793-74.80583000000001 487.131524-65.66235300000005L486.822684-65.32134799999994ZM714.955981 428.971194C723.919106 453.372045 728.565658 479.331002 728.565658 505.904762 728.565658 627.091817 632.184774 725.333333 513.29293 725.333333 394.401086 725.333333 298.020202 627.091817 298.020202 505.904762 298.020202 384.717709 394.401086 286.47619 513.29293 286.47619 549.003859 286.47619 583.510052 295.36805300000003 614.373097 312.125591 626.032316 318.456132 630.449257 333.22218 624.238611 345.10648100000003 618.027966 356.99078199999997 603.541579 361.49299399999995 591.882359 355.16245100000003 567.900883 342.14136099999996 541.111735 335.23809500000004 513.29293 335.23809500000004 420.821495 335.23809500000004 345.858586 411.648164 345.858586 505.904762 345.858586 600.161359 420.821495 676.571428 513.29293 676.571428 605.764365 676.571428 680.727273 600.161359 680.727273 505.904762 680.727273 485.192019 677.117041 465.022684 670.154965 446.069408 665.522846 433.459117 671.796821 419.408892 684.168282 414.687349 696.53974 409.965809 710.323861 416.360905 714.955981 428.971194L714.955981 428.971194Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="up" unicode="&#58905;" d="M513.6 539.2l384-384c12.8-12.8 32-12.8 44.8 0 12.801 12.8 12.801 32 0 44.8l-403.2 403.2C532.8 609.6 520 616 513.6 616c-6.4 0-19.2 0-25.599-6.4L78.399 200c-12.8-12.8-12.8-32 0-44.8s32-12.8 44.8 0L513.6 539.2z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="pause" unicode="&#58961;" d="M512-128c-282.714 0-511.893 229.232-511.893 512 0 282.768 229.179 512 511.893 512 282.714 0 511.893-229.232 511.893-512 0-282.768-229.179-512-511.893-512zM512 863.996c-265.043 0-479.9-214.91-479.9-479.996 0-265.097 214.857-479.996 479.9-479.996 265.043 0 479.9 214.899 479.9 479.996 0 265.086-214.857 479.996-479.9 479.996zM639.973 181.32299999999998h-21.329c-23.558 0-42.658 19.1-42.658 42.658v319.933c0 23.558 19.1 42.658 42.658 42.658h21.329c23.558 0 42.658-19.1 42.658-42.658v-319.933c0-23.558-19.1-42.658-42.658-42.658zM405.356 181.32299999999998h-21.329c-23.558 0-42.658 19.1-42.658 42.658v319.933c0 23.558 19.1 42.658 42.658 42.658h21.329c23.558 0 42.658-19.1 42.658-42.658v-319.933c0-23.558-19.1-42.658-42.658-42.658z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="date" unicode="&#58935;" d="M933.185668 758.3591759999999l-167.054737 0 0 56.506968L732.333174 814.866145l0-56.506968L539.505447 758.3591759999999l0 56.506968-33.796734 0 0-56.506968-216.255299 0 0 56.506968-33.796734 0 0-56.506968L88.005356 758.3591759999999c-12.255115 0-22.224164-9.970072-22.224164-22.224164l0-706.60521c0-12.255115 9.970072-22.225187 22.224164-22.225187l845.179288 0c12.255115 0 22.225187 9.970072 22.225187 22.225187L955.409832 736.135012C955.409832 748.389104 945.43976 758.3591759999999 933.185668 758.3591759999999zM939.036933 29.528778999999986c0-3.226484-2.62478-5.852288-5.852288-5.852288l-845.179288 0c-3.226484 0-5.851265 2.62478-5.851265 5.852288L82.154092 736.135012c0 3.226484 2.62478 5.851265 5.851265 5.851265l167.650301 0 0-55.657624 33.796734 0 0 55.657624 216.255299 0 0-55.657624 33.796734 0 0 55.657624L732.333174 741.986277l0-55.657624 33.796734 0 0 55.657624 167.054737 0c3.226484 0 5.852288-2.62478 5.852288-5.851265L939.036933 29.528778999999986zM206.835765 608.260623l129.098263 0 0-94.008071-129.098263 0 0 94.008071ZM458.879152 608.260623l129.098263 0 0-94.008071-129.098263 0 0 94.008071ZM684.827207 608.260623l129.098263 0 0-94.008071-129.098263 0 0 94.008071ZM206.835765 433.345871l129.098263 0 0-94.008071-129.098263 0 0 94.008071ZM458.879152 433.345871l129.098263 0 0-94.008071-129.098263 0 0 94.008071ZM684.827207 433.345871l129.098263 0 0-94.008071-129.098263 0 0 94.008071ZM206.835765 257.877511l129.098263 0 0-94.008071-129.098263 0 0 94.008071ZM458.879152 257.877511l129.098263 0 0-94.008071-129.098263 0 0 94.008071ZM684.827207 257.877511l129.098263 0 0-94.008071-129.098263 0 0 94.008071Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="layim-uploadfile" unicode="&#58909;" d="M914.7359263333336 663.0359498888887c-20.806884999999987 20.806885000000012-48.471967999999976 32.265868000000026-77.89816099999994 32.265868000000054l-352.221993 2.2737367544323206e-13-120.26099099999992 95.03035300000005-11.157106999999995 8.816806000000007-14.220886 9.769962616701378e-15L197.09333633333344 799.148976888889c-51.69538300000001 2.1316282072803006e-14-93.75224400000005-42.88778599999995-93.75224400000006-95.60442799999993l-1.5631940186722204e-13-255.13888799999998c-1.7763568394002505e-15-2.302439 0.08391099999999785-4.716417999999999 0.24968699999999489-7.196911999999999l-1.9895196601282805e-13-340.692403c-1.9539925233402755e-14-29.426192999999998 11.458982999999954-57.09127599999999 32.26586799999994-77.89816100000002 20.806884999999987-20.806885000000012 48.471967999999976-32.265868000000026 77.89816099999994-32.265868000000054l623.083981-3.410605131648481e-13c29.426192999999998-1.9539925233402755e-14 57.09127599999999 11.458982999999954 77.89816100000002 32.26586799999994 20.806885000000012 20.806884999999987 32.265868000000026 48.471967999999976 32.265868000000054 77.89816099999994L947.0028173333335 585.1377888888885C947.0017943333336 614.5639818888885 935.5428113333334 642.2280418888886 914.7359263333336 663.0359498888887zM197.09333633333372 758.2167298888891l141.88345099999998-8.526512829121202e-14L470.3948853333333 654.369569888889l366.44287999999995-2.2737367544323206e-13c38.236859-2.1316282072803006e-14 69.23178099999997-30.99492100000004 69.23178099999994-69.23178100000004L906.0695463333333 465.9195468888886 144.27334033333327 465.91954688888893 144.2733403333336 703.5445488888892C144.2733403333336 733.7361748888891 167.92296933333355 758.2167298888891 197.09333633333372 758.2167298888891zM836.8377653333331 31.28558888888881L213.75480733333322 31.28558888888915c-38.236859 2.1316282072803006e-14-69.23178099999997 30.99492100000004-69.23178099999994 69.23178100000004L144.52302633333338 424.4776928888892l761.546519-6.252776074688882e-13-2.2737367544323206e-13-323.96134599999993C906.0695463333333 62.28050988888867 875.0746243333334 31.285588888888583 836.8377653333331 31.28558888888881z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="delete" unicode="&#58944;" d="M738.923 24.288h-451.956c-27.2 0-49.327 21.603-49.327 48.157v418.017c0 26.548 22.129 48.147 49.327 48.147h451.956c27.2 0 49.327-21.598 49.327-48.147v-418.017c0-26.555-22.129-48.157-49.327-48.157zM286.966 494.547c-4.447 0-7.168-2.644-7.168-4.084v-418.017c0-1.443 2.722-4.093 7.168-4.093h451.956c4.448 0 7.168 2.651 7.168 4.093v418.017c0 1.44-2.722 4.084-7.168 4.084h-451.956zM832.199 496.302h-640.401c-27.201 0-49.327 20.131-49.327 44.876v61.045c0 24.74 22.128 44.867 49.327 44.867h640.401c27.2 0 49.327-20.127 49.327-44.867v-61.045c0-24.744-22.129-44.876-49.327-44.876zM184.631 541.327c0.387-0.733 2.722-2.866 7.168-2.866h640.401c4.445 0 6.782 2.132 7.168 2.867v60.741c-0.393 0.736-2.733 2.863-7.168 2.863h-640.401c-4.437 0-6.776-2.128-7.168-2.863v-60.742zM600.748 605.354h-174.546c-27.201 0-49.327 20.13-49.327 44.876v10.736c0 24.74 22.128 44.867 49.327 44.867h174.546c27.2 0 49.327-20.126 49.327-44.867v-10.736c0-24.745-22.128-44.876-49.327-44.876zM419.034 650.378c0.387-0.733 2.722-2.865 7.168-2.865h174.546c4.446 0 6.782 2.131 7.168 2.865v10.432c-0.393 0.736-2.734 2.862-7.168 2.862h-174.546c-4.437 0-6.776-2.126-7.168-2.862v-10.432zM404.099 430.833h-30.097c-7.297 0-13.213-5.916-13.213-13.213v-272.34c0-7.297 5.916-13.212 13.213-13.212h30.098c7.297 0 13.212 5.916 13.212 13.212v272.341c0 7.297-5.916 13.213-13.212 13.213zM659.583 430.833h-30.097c-7.298 0-13.213-5.916-13.213-13.213v-272.34c0-7.297 5.917-13.212 13.213-13.212h30.097c7.297 0 13.212 5.916 13.212 13.212v272.341c0 7.297-5.916 13.213-13.212 13.213zM531.841 430.833h-30.098c-7.297 0-13.213-5.916-13.213-13.213v-272.34c0-7.297 5.917-13.212 13.213-13.212h30.098c7.297 0 13.212 5.916 13.212 13.212v272.341c0 7.297-5.916 13.213-13.212 13.213z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="play" unicode="&#58962;" d="M512 896C229.376 896 0 666.624 0 384 0 101.37599999999998 229.376-128 512-128 794.624-128 1024 101.37599999999998 1024 384 1024 666.624 794.624 896 512 896L512 896 512 896zM512-95.23199999999997C245.76-95.23199999999997 32.768 117.75999999999999 32.768 384 32.768 650.24 245.76 863.232 512 863.232S991.232 650.24 991.232 384C991.232 117.75999999999999 778.24-95.23199999999997 512-95.23199999999997L512-95.23199999999997 512-95.23199999999997zM733.184 392.192L393.216 588.8c-4.096 4.096-8.192 4.096-12.288 0C376.832 588.8 372.736 584.704 372.736 580.608l0-393.216c0-4.096 4.096-8.192 4.096-8.192 4.096-4.096 8.192-4.096 12.288 0l344.064 196.608c4.096 4.096 4.096 4.096 4.096 8.192C741.376 388.096 737.28 392.192 733.184 392.192L733.184 392.192 733.184 392.192zM733.184 392.192"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="top" unicode="&#58884;" d="M812 153.4l-300 172.8-300-172.8 300 604L812 153.4zM264.5 209.2l247.5 142.5 247.5-142.5L512 707.5 264.5 209.2zM371.7 138.3l0-126.2-15.9 0 0 126.2-45.9 0L309.9 153l107.4 0 0-14.8L371.7 138.2zM506.6 154.5c26.6 0 43.3-3.9 50-11.7 6.7-7.8 10-27.2 10-58.3 0-33.5-3.2-54.2-9.6-62-6.4-7.8-23.2-11.8-50.4-11.8-27 0-43.8 3.9-50.3 11.7-6.5 7.8-9.8 27.9-9.8 60.3l0 9.9 0.2 13.3c0 18.7 4.2 31.5 12.6 38.4C467.8 151 483.5 154.5 506.6 154.5zM506.5 141c-22.3 0-35.3-2.5-39.1-7.4-3.8-5-5.7-22-5.7-51 0-29.1 1.9-46.1 5.7-51.1 3.8-5 16.8-7.4 39.1-7.4 22.4 0 35.4 2.5 39.2 7.4 3.8 5 5.7 22 5.7 51.1l0 9.2-0.1 13.3c0 15.6-2.6 25.4-7.8 29.6S525.9 141 506.5 141zM608.4 12.1 608.4 153l59.2 0 5.4 0c15.9 0 26.7-3.1 32.5-9.2 5.8-6.1 8.7-17.6 8.7-34.4 0-16.1-3-27.1-9-32.9-6-5.9-17.3-8.8-33.9-8.8l-6.2-0.1-40.7 0 0-55.5L608.4 12.1zM624.3 81.1l37.7 0c15.8 0 25.9 1.6 30.3 4.9 4.4 3.2 6.7 10.7 6.7 22.3 0 13.6-1.5 22.2-4.5 25.9-3 3.6-10.1 5.4-21.3 5.4l-6.1 0.1-42.7 0L624.4 81.1z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="firefox" unicode="&#59014;" d="M516.010667-128q-161.706667 0-288.277333 85.994667t-188.288 227.712q-33.152 74.858667-38.293333 172.010667t14.848 189.994667 63.424 178.282667 102.293333 138.581333l-6.293333-160.576q6.293333 8 38.848 8.853333t40-8.853333q24 46.293333 91.712 78.848t133.994667 33.706667q-30.848-25.706667-68.288-84.864t-33.429333-93.418667q14.293333-4.565333 35.712-7.722667t36.010667-4.288 38.848-2.282667 28.864-1.706667q8.576-2.858667 5.418667-26.005333t-17.429333-43.136q-2.858667-4.010667-9.429333-10.581333t-32.277333-20.288-57.706667-19.434667l8.576-108.010667-79.424 38.293333q-10.282667-24.576-4.288-46.570667t20.565333-37.994667 37.418667-23.722667 46.293333-3.712q29.141333 5.141333 56 19.712t47.722667 25.706667 42.005333 10.005333q34.858667-2.282667 51.136-18.858667t11.136-37.141333q-0.576-1.152-1.429333-3.136t-4.864-7.146667-10.282667-8.853333-18.005333-5.994667-26.581333-0.576q-34.282667-54.293333-82.581333-77.418667t-119.722667-16.853333q42.282667-34.858667 92.864-47.146667t96.277333-3.434667 88.277333 29.717333 73.152 50.005333 45.994667 59.434667q24.576 52.010667 22.293333 109.994667t-21.418667 107.712-44.864 71.424q49.706667-21.717333 78.293333-45.418667t44.010667-64.277333q8.576 97.152-32.853333 196.010667t-119.722667 162.282667q151.424-44.010667 235.434667-159.722667t86.293333-295.722667q1.152-72.576-23.146667-145.706667t-70.570667-136-108.010667-112-141.418667-77.418667-164.864-28.288z"  horiz-adv-x="1025" />
+
+    
+    <glyph glyph-name="friends" unicode="&#58898;" d="M672.02974 765.933689c7.66047-32.266891 8.420787-62.237483 7.713682-95.365998-0.283456-12.778024-7.291057-71.832002-5.3918-89.926102 1.561565-14.936177 5.132904-16.128329 10.759041-28.436656 9.803273-21.422915 6.51846-50.970882 2.76088-72.566736-2.056845-11.816117-6.404873-28.64541-13.017478-38.287001-7.291057-10.645454-21.864984-10.711969-28.319999-23.12365-9.29469-17.848507-4.045129-42.930765-9.903557-62.21497-6.65763-21.883403-23.599488-23.420409-24.877597-52.040237 8.316409-1.243317 16.59598-2.479471 24.877597-3.722788 8.316409-18.498306 23.533996-55.70265 39.08518-66.900689 13.024641-3.728928 26.048259-7.448646 39.07904-11.156084 45.641503-19.593244 96.365768-43.032072 142.108578-63.215764 41.656749-18.381649 91.51325-24.937972 106.575294-70.629617 0-31.026644 2.795673-104.309694 2.025123-144.978952L58.155515-56.631556000000046c-0.757247 40.669258 2.029216 113.952308 2.029216 144.978952 15.065114 45.691645 64.928778 52.247968 106.578364 70.629617 45.74281 20.182668 96.467075 43.62252 142.098345 63.215764 13.027711 3.707438 26.054399 7.427156 39.08211 11.156084 15.554254 11.197016 30.78105 48.402383 39.09439 66.900689l18.492166 4.710278c-4.196579 24.429389-18.658965 26.322505-24.682146 43.62559-2.356674 26.013467-4.729721 52.052516-7.095605 78.079286 0.107447-1.234107-17.006326 3.246951-19.252483 4.716418-24.130583 15.838733-24.618701 80.075757-26.941606 106.793258-1.063215 12.222369 15.163351 22.240537 10.654664 44.62536-26.433022 131.125433 11.437493 219.776496 71.330582 240.123916 41.564651 17.633612 119.167077 50.323129 191.563944 3.716648l17.971303-17.428951 29.061896-5.237281C662.71663 795.172617 672.02974 765.933689 672.02974 765.933689z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="refresh-3" unicode="&#59818;" d="M820.376904 697.14807C740.637816 774.519228 631.884926 822.157201 511.999488 822.157201c-244.621347 0-442.925808-198.305485-442.925808-442.926832 0-244.6193 198.304462-442.925808 442.925808-442.925808 206.075449 0 379.271046 140.739395 428.740738 331.337337L822.859445 267.64189899999997c-45.759183-127.45381-167.656441-218.623229-310.859957-218.623229-182.371584 0-330.210677 147.842163-330.210677 330.210677 0 182.371584 147.840116 330.2117 330.210677 330.2117 88.762603 0 169.32443-35.035958 228.655723-92.015693L557.051567 433.822732l280.641725 0 113.880677 0 3.351328 0L954.925297 831.695438 820.376904 697.14807z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="ok" unicode="&#58885;" d="M960 640L915.2 684.8 371.2 172.79999999999995 108.8 454.4 64 409.6 358.4 83.20000000000005 364.8 89.60000000000002 371.2 83.20000000000005Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="layer" unicode="&#58936;" d="M96.089 724.318l0-684.236 831.822 0L927.911 724.318 96.089 724.318zM884.178 84.457L140.464 84.457 140.464 489.559l743.714 0L884.178 84.457z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="face-smile-fine" unicode="&#58892;" d="M511.558443 852.9315573333333c-246.787686 0-447.597201-200.783932-447.597201-447.598224 0-246.815315 200.783932-447.598224 447.597201-447.598224 246.841921 0 447.64939 200.782909 447.64939 447.598224C959.207833 652.1476253333334 758.400365 852.9315573333333 511.558443 852.9315573333333zM511.558443-4.962310666666667c-226.247884 0-410.295644 184.046736-410.295644 410.295644 0 226.249931 184.072319 410.296667 410.295644 410.296667 226.27449 0 410.346809-184.046736 410.346809-410.296667C921.905252 179.08442633333334 737.832933-4.962310666666667 511.558443-4.962310666666667zM724.38055 303.5726953333334c-9.698896 3.457752-20.366863-1.566682-23.848151-11.264555-28.500101-79.45461-104.372116-132.844587-188.82353-132.844587-84.798315 0-160.770614 53.689806-189.070146 133.590578-3.432169 9.723455-14.075577 14.772448-23.823592 11.364839-9.699919-3.432169-14.797008-14.100136-11.364839-23.823592 33.547047-94.77248 123.668601-158.434405 224.234017-158.434405 100.142791 0 190.140525 63.314001 223.935212 157.564595C739.125369 289.3978573333334 734.102982 300.0903843333334 724.38055 303.5726953333334zM302.49494 515.3479593333334c0-24.653493 19.98517-44.638663 44.638663-44.638663 24.653493 0 44.638663 19.98517 44.638663 44.638663s-19.98517 44.63764-44.638663 44.63764C322.48011 559.9855993333333 302.49494 540.0014523333333 302.49494 515.3479593333334L302.49494 515.3479593333334zM631.398856 515.3479593333334c0-24.653493 19.98517-44.638663 44.63764-44.638663 24.653493 0 44.63764 19.98517 44.63764 44.638663s-19.984147 44.63764-44.63764 44.63764C651.384026 559.9855993333333 631.398856 540.0014523333333 631.398856 515.3479593333334L631.398856 515.3479593333334z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="dollar" unicode="&#58969;" d="M517.565-65.45399999999995c-244.263 0-442.299 198.014-442.299 442.299s198.014 442.299 442.299 442.299c244.263 0 442.299-198.014 442.299-442.299 0-244.263-198.014-442.299-442.299-442.299zM517.565 863.383c-268.751 0-486.564-217.834-486.564-486.564s217.834-486.564 486.564-486.564c268.751 0 486.564 217.834 486.564 486.564 0 268.751-217.834 486.564-486.564 486.564zM497.036 425.349c-18.443 6.957-33.605 16.314-45.238 27.617-11.581 11.306-20.059 23.465-25.468 36.742-5.423 13.177-8.178 26.235-8.178 39.172-0.004 18.194 2.564 34.357 7.846 48.514 5.327 14.231 13.748 25.85 25.468 35.02 11.581 9.167 26.798 15.204 45.482 18.295v-205.52zM534.455 356.13199999999995c16.937-6.756 32.277-14.997 46.035-24.855 13.748-9.678 24.613-21.601 32.929-35.57 8.204-13.909 12.436-30.734 12.622-50.307 0-14.231-1.859-27.907-5.785-40.833-3.858-12.866-9.542-24.531-17.271-34.804-7.691-10.211-17.271-18.443-28.678-24.613-11.328-6.318-24.613-9.678-39.76-10.341v221.377zM534.455 94.18299999999999c29.037 3.318 53.978 11.306 74.785 24.134 20.985 12.866 37.018 30.15 48.281 51.734 11.125 21.535 16.876 46.832 16.937 76.196 0 16.08-1.67 30.377-5.033 42.985-3.318 12.622-8.204 24.15-14.836 34.357-6.739 10.341-14.836 20.189-24.613 29.326-8.853 8.204-19.107 15.957-30.659 23.041-11.328 7.197-22.836 13.706-34.281 19.261-11.581 5.694-21.601 10.516-30.659 14.231v221.377c14.527-3.318 26.662-8.594 36.62-16.192 9.859-7.395 17.766-16.192 23.776-26.384 5.941-10.211 10.341-20.985 12.972-32.345 2.666-11.328 4.026-22.836 3.858-34.097h46.155c0.004 16.314-1.566 32.345-5.327 48.281-3.543 15.957-9.938 30.909-19.107 44.969-8.996 13.909-21.601 26.235-37.684 36.742-16.192 10.521-36.62 18.295-61.318 23.562v49.426h-37.441v-53.316c-23.465-2.624-42.985-8.178-58.595-16.314-15.633-8.204-28.279-18.194-37.684-29.562-9.441-11.328-16.523-23.302-21.226-35.317-4.59-12.062-7.846-23.302-9.316-33.326-1.566-10.211-2.256-18.194-2.115-24.029 0.004-21.601 3.452-40.612 9.863-57.238 6.479-16.523 15.58-30.909 27.178-43.441 11.659-12.436 25.361-23.562 40.833-33.204 15.633-9.678 32.649-18.443 51.098-26.235v-237.329c-18.194 1.984-33.326 7.197-45.094 15.633-11.97 8.369-21.074 19.107-27.714 31.902-6.739 12.972-11.011 27.178-13.363 42.701-2.256 15.58-3.034 31.313-2.115 47.367h-47.803c-1.183-23.776 0.397-46.035 5.033-66.676s12.357-39.03 23.376-55.019c10.892-16.08 25.361-29.037 43.142-39.03 17.847-9.863 39.472-16.08 64.586-18.295v-65.283h37.441v65.283z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="group" unicode="&#58899;" d="M1328.72893437-13.274022189999982L1325.7954575 10.932401249999998 1319.19311938 40.27361905999999 1309.65730438 68.14729219000003 1296.45423969 96.75473719000001 1283.25117594 118.75984405999998 1264.91331781 140.03117906 1244.37414312 156.90310406000003 1215.76669813 173.03964562 1195.22913594 182.57546062999995 1168.08923563 189.17779874999997 1140.94772187 195.77852437 1117.47507031 204.58056750000003 1088.13546594 218.51740312000004 1064.66281438 229.52076375000001 1036.05536844 242.72382749999997 1014.0502625 255.19473187999995 1014.0502625 332.94718406000004 1023.58446406 343.95054469 1032.38811969 358.61954062999996 1038.98884531 373.29014906 1044.12363969 391.62800719 1049.992205 413.63472656 1052.19191 430.50504 1055.370515 429.77126719 1061.727725 430.75016813 1066.61900281 434.662545 1071.99731188 443.46458812 1075.42104594 453.7325625 1077.37723437 466.4469825 1079.82206656 489.43099031 1080.799355 508.991265 1079.82206656 525.61806187 1076.39833344 535.88764969 1069.55247969 539.80002656 1065.64010188 538.82112656 1069.06383594 560.82623344 1071.99731188 587.2339743800001 1072.97621281 611.19526969 1072.48595656 630.26689969 1069.55247969 647.870985 1064.17255719 664.98642656 1056.83805969 680.63432344 1046.56847188 698.24002125 1034.83295281 712.91063063 1021.13963187 724.15750594 1003.53554656 735.40438125 981.53043969 745.67396812 962.94745344 750.56363437 940.45370281 754.47601125 918.4469825 754.964655 895.95323188 751.05227812 874.43676969 743.71777969 855.36513875 735.893025 838.73834188 725.1347934400001 823.33396063 711.44308594 808.66335125 695.30493188 795.4602875 676.23330187 785.9244725 655.69573969 780.05751875 632.22308813 779.32374687 602.14809844 782.25722375 574.27442531 785.9244725 538.3324818799999 777.85620219 538.3324818799999 772.72140875 531.73014375 771.25547656 519.99462469 772.72140875 492.12095156 776.3886575 459.84625688 779.32374687 443.70810375 784.45854031 434.90606063 793.99435531 429.77126719 799.86130906 430.50504 803.53017031 404.83268344 807.19742 389.42830219 813.06598531 372.55637719000003 821.13425656 355.68606375 830.67007156 342.48299999999995 838.00456906 332.94718406000004 837.27079719 253.72718719 845.06329813 250.99690875 855.81346625 248.0392425 867.37158969 243.73981969 878.39107625 239.43878530999996 888.6058325 235.67638781000005 897.74331406 231.10603405999996 908.76441312 226.53729375 920.85956187 219.54952313 932.95471062 212.56014000000005 942.898535 205.30305094000005 955.80002656 195.62693156 966.82112656 185.41378874999998 977.30358781 172.51229719000003 988.32307531 158.26743750000003 1000.01505219 141.87125344000003 1010.0943425 122.51901655999995 1018.69641219 101.55409219 1026.22120719 82.20185436999998 1031.46243781 64.05913219000001 1035.09098281 45.110066250000045 1038.71952688 23.741970000000038 1041.13855625-1.2546703100000514 1041.54172812-18.187877810000032 1040.73538531-33.30681374999995 1037.30842625-44.99879062000002 1030.79156-57.83254968999995 1023.19742-66.36688593999997 1009.28799875-73.42238906 1298.65555719-73.42238906 1311.85862094-66.82005093999999 1322.12820875-56.552076560000046 1328.72893437-45.54871687000002 1330.19647906-31.611880309999947ZM443.23504906 789.36487031L427.10818437 771.62531906 412.59400625 750.66039469 402.11154406 728.08278469 395.66079781 702.27980156 394.854455 669.21972844 398.07982813 638.57868562 402.11154406 599.06786719 393.24176844 599.06786719 387.59736594 591.81077812 385.98467938 578.90928656 387.59736594 548.26824375 391.62908187 512.7891412500001 394.854455 495.04959 400.4988575 485.37347156 410.98131969 479.72906906 417.43206594 480.53541188 421.46378187 452.31339844 425.49549781 435.38019094 431.94624406 416.83429687 440.81601969 398.28840187 451.29848094 383.77422375000003 459.36191375 373.29176156000005 458.55557094 286.20669281000005 444.84773562 277.33691719 412.59400625 262.01639531 379.53393406 247.50221719 352.92460719 234.60072562000005 331.95968281 225.73095 308.57572906 218.47386094 284.3854325 213.63580125 261.00147875 207.99139875000003 236.81118125 197.50893656000005 214.23357031 186.22013156000003 194.07498969 171.70595344000003 171.49737969 149.12834250000003 155.370515 125.74438874999998 143.27536625 103.16677875000005 133.59924781 78.97648125 123.92312844 51.56081156000005 119.08506875 29.789544370000044 115.05335281 11.243650310000021 112.63432344-10.527616869999974 112.63432344-29.879854690000002 115.85969656-49.23209250000002 125.535815-62.133584059999976 140.04999313-71.80970344000002 158.59588719-73.42238906 965.74546437-73.42238906 980.2596425-66.1653 991.5484475-54.87649499999998 998.80553656-42.781346249999956 1000.41822312-27.46082531000002 998.80553656-7.302244689999952 995.58016438 19.30708218999996 988.32307531 51.56081156000005 977.84061313 82.20185436999998 963.326435 113.64924094000003 948.81225688 137.8395375 928.65367531 161.22349125000005 906.07606531 179.76938625000003 874.62867875 197.50893656000005 852.05106875 207.99139875000003 822.21636875 215.24848781000003 792.38166875 222.50557688000004 766.57868562 232.18169624999996 734.32495625 247.50221719 708.52197312 259.59736594000003 677.07458656 274.11154406 652.88429 287.81937937 652.88429 373.29176156000005 663.36675219 385.38691031 673.04287063 401.513775 680.29995969 417.64063969 685.94436219 437.79922031 692.39510844 461.98951781 694.81413781 480.53541188 698.30882938 479.72906906 705.2966 480.80473031 710.67168406 485.10415312 716.585405 494.78027156 720.3478025 506.06907656 722.49912688 520.04623031 725.18586219 545.31218906 726.26152437 566.8141378099999 725.18586219 585.09071344 721.42346469 596.3795184400001 713.89705719 600.68055375 709.59763438 599.6048915599999 713.36003188 623.79518906 716.585405 652.82354531 717.66106719 679.16516625 717.12242937 700.13008969 713.89705719 719.4823275 707.98494781 738.2959275000001 699.92151594 755.49845437 688.63271094 774.85069219 675.73121937 790.97755688 660.67840344 803.34202406 641.32616563 815.70487875 617.13586906 826.99368375 596.7095825 832.37038031 571.98064812 836.66980219 547.79035063 837.20844 523.06302875 832.90740469 499.40975656 824.84397281 478.44483313 816.24351562 460.16825656 804.4160728100001Z"  horiz-adv-x="1449" />
+
+    
+    <glyph glyph-name="layim-download" unicode="&#58910;" d="M186.888458 77.07363199999998l0 581.729108c14.85022-14.450107 35.050284-23.436782 57.359382-23.436782l560.03604 0 0-151.561881 25.029046 0 0 176.591951-585.065086 0c-31.191396 0-57.359382 26.166963-57.359382 57.359382 0 31.191396 26.165939 57.359382 57.359382 57.359382l572.551074 0L816.798914 800.143838 244.24784 800.143838c-45.431725 0-82.388429-36.957727-82.388429-82.388429l0-640.681778c0-41.796942 34.000372-75.789127 75.789127-75.789127l225.950102 0 0 25.029046L237.648538 26.31355099999996C209.661114 26.31355099999996 186.888458 49.078021000000035 186.888458 77.07363199999998zM236.947574 730.269421l560.38601 0 0-25.029046-560.38601 0 0 25.029046ZM686.086897 428.171012c-85.917812 0-164.908864-55.248302-194.553021-135.882783-30.013571-81.641415-4.269233-175.567621 62.624293-230.942813 67.00302-55.465243 164.474982-62.808488 238.931764-17.720593 74.094532 44.868907 113.272833 133.533272 96.080266 218.517829C869.882923 357.47283300000004 783.297916 428.171012 686.086897 428.171012zM686.086897 38.82858599999997c-75.595722 0-145.060817 48.634674-171.092703 119.595842-26.354228 71.839165-3.63069 154.438395 55.287187 203.074092 59.017138 48.718585 144.762011 55.029314 210.191186 15.237029 65.11195-39.59888 99.396801-117.681236 84.064604-192.408171C847.384513 100.72940100000005 771.387655 38.82858599999997 686.086897 38.82858599999997zM698.600909 152.23547199999996L698.600909 311.02496499999995 673.571862 311.02496499999995 673.571862 152.28459099999998 604.675726 221.17254100000002 586.978668 203.47548400000005 686.111456 104.35190499999999 785.185916 203.42738799999995 767.489882 221.123422Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="picture-fine" unicode="&#58893;" d="M958.648085 84.30682933333333L65.772494 84.30682933333333 65.772494 721.9115253333333l892.87559 0L958.648085 84.30682933333333zM97.660762 116.20328333333339l829.099055 0L926.759817 690.0570263333334 97.660762 690.0570263333334 97.660762 116.20328333333339zM648.731616 419.05893933333334l-1.991354 0c-47.801702 0-86.696548 38.900985-86.696548 86.695524l0 1.978051c0 47.809889 38.894845 86.671988 86.696548 86.671988l1.991354 0c47.801702 0 86.698594-38.862099 86.698594-86.671988l0-1.978051C735.43021 457.95992433333333 696.533318 419.05893933333334 648.731616 419.05893933333334zM646.740262 562.5193053333333c-30.224372 0-54.810327-24.582885-54.810327-54.787814l0-1.978051c0-30.230512 24.584931-54.803163 54.810327-54.803163l1.991354 0c30.222325 0 54.810327 24.572652 54.810327 54.803163l0 1.978051c0 30.203906-24.586978 54.787814-54.810327 54.787814L646.740262 562.5193053333333zM91.097276 181.7900473333334l-22.748097 22.338774 274.373974 279.332916 22.750143-22.351054L91.097276 181.7900473333334zM604.886015 215.92242633333342L339.999113 480.74793033333333l22.548552 22.525016L627.433544 238.4638153333334 604.886015 215.92242633333342zM619.007641 202.70744933333333l-22.763446 22.337751 167.989015 171.035398 22.765493-22.350031L619.007641 202.70744933333333zM925.622924 222.7939273333334L758.534418 389.8343373333333l22.548552 22.529109 167.086459-167.044504L925.622924 222.7939273333334z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="link" unicode="&#58956;" d="M262.4-121.60000000000002c-64 0-128 25.6-179.2 76.8-102.4 102.4-102.4 262.4 0 364.8l134.4 134.4 89.6-89.6-134.4-134.4c-51.2-51.2-51.2-128 0-179.2 51.2-51.2 128-51.2 179.2 0l179.2 179.2c25.6 25.6 38.4 57.6 38.4 89.6S556.8 384 537.6 409.6L467.2 473.6l89.6 89.6 70.4-70.4C672 448 697.6 384 697.6 313.6c0-70.4-25.6-134.4-76.8-179.2l-179.2-179.2C396.8-96 326.4-121.60000000000002 262.4-121.60000000000002zM467.2 204.79999999999995L396.8 268.79999999999995c-102.4 102.4-102.4 262.4 0 364.8l179.2 179.2c102.4 102.4 262.4 102.4 364.8 0 102.4-102.4 102.4-262.4 0-364.8l-134.4-134.4-89.6 89.6 134.4 134.4c51.2 51.2 51.2 128 0 179.2-51.2 51.2-134.4 51.2-179.2 0L486.4 544c-51.2-51.2-51.2-128 0-179.2l70.4-70.4L467.2 204.79999999999995z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="diamond" unicode="&#59189;" d="M998.4 526.933333L797.866667 802.133333c-4.266667 6.4-12.8 10.666667-19.2 10.666667L243.2 812.8c0 0-14.933333-2.133333-23.466667-17.066667C194.133333 753.066667 32 512 32 512L21.333333 494.933333l12.8-14.933333L469.333333-27.733333000000016c4.266667-4.266667 6.4-6.4 10.666667-8.533333 6.4-4.266667 32-10.666667 46.933333 0 4.266667 2.133333 6.4 6.4 10.666667 8.533333l409.6 420.266667c10.666667 8.533333 10.666667 25.6 0 34.133333-8.533333 10.666667-23.466667 10.666667-32 0L561.066667 61.86666700000001l153.6 422.4 0 0 251.733333 0c2.133333 0 19.2 0 23.466667 4.266667l2.133333 2.133333C1004.8 497.066667 1006.933333 512 998.4 526.933333zM782.933333 763.733333l-96-226.133333L341.333333 537.6l-85.333333 226.133333L782.933333 763.733333zM221.866667 714.666667l72.533333-179.2-192 0L221.866667 714.666667zM91.733333 488.533333l215.466667 0 138.666667-416L91.733333 488.533333zM503.466667 44.799999999999955l-147.2 443.733333 307.2 0L503.466667 44.799999999999955zM736 535.4666669999999L810.666667 701.866667l119.466667-168.533333L736 533.333333z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="log" unicode="&#58894;" d="M828.01742 700.357158C743.476979 784.899646 631.076002 831.458031 511.516999 831.458031c-119.55798 0-231.959979-46.558385-316.500421-131.09985C110.47716 615.81774 63.918775 503.41574 63.918775 383.85776c0-87.103824 25.045419-171.548074 72.429613-244.204861 9.393951-14.402011 28.685319-18.46249 43.087331-9.071609 14.404058 9.393951 18.46556 28.685319 9.072633 43.089377-40.768519 62.511729-62.317301 135.194098-62.317301 210.187093 0 212.469066 172.85586 385.326972 385.325949 385.326972s385.325949-172.857906 385.325949-385.326972-172.85586-385.326972-385.325949-385.326972c-70.357418 0-139.188062 19.131733-199.052498 55.323003-14.71412 8.900717-33.856086 4.180206-42.753733-10.534937-8.896624-14.71719-4.180206-33.856086 10.534937-42.753733 69.584821-42.070164 149.556201-64.307631 231.271294-64.307631 119.559003 0 231.959979 46.558385 316.500421 131.09985 84.539418 84.539418 131.097804 196.941418 131.097804 316.499397S912.556838 615.81774 828.01742 700.357158zM494.28964 690.216193c-21.782096 0-39.397289-17.658172-39.397289-39.439244l0-283.524378c0-1.360997 0.358157-2.706645 0.493234-4.03285 2.020006-19.886933 18.959817-34.573423 39.379892-34.573423l0 0 0.146333 0.832971 223.590358 0c21.782096 0 39.438221 17.616216 39.438221 39.397289s-17.658172 39.397289-39.439244 39.397289L533.686928 408.273846l0 242.503103C533.686928 672.5580219999999 516.071735 690.216193 494.28964 690.216193z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="key" unicode="&#59011;" d="M819.2 588.8c0-172.8-140.8-307.2-307.2-307.2-172.8 0-307.2 140.8-307.2 307.2C204.8 755.2 339.2 896 512 896S819.2 755.2 819.2 588.8L819.2 588.8zM512 838.4c-140.8 0-249.6-115.2-249.6-249.6 0-134.4 108.8-256 249.6-256s256 115.2 256 249.6S652.8 838.4 512 838.4L512 838.4zM480 300.79999999999995l64 0L544-128l-64 0L480 300.79999999999995 480 300.79999999999995zM512 192l192 0 0-64L512 128 512 192 512 192zM512 64l192 0 0-64L512 0 512 64 512 64z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="rate-solid" unicode="&#59002;" d="M957.111079 492.519576c-3.927449 11.669784-14.447037 19.86442-26.723641 20.816095L647.68068 535.250796 540.183388 811.873997c-4.586458 11.803837-15.951297 19.579941-28.614711 19.579941s-24.02723-7.776104-28.614711-19.579941L375.458719 535.250796l-282.708803-21.915126c-12.276604-0.951675-22.796192-9.146311-26.723641-20.816095-3.927449-11.669784-0.50142-24.557302 8.701173-32.737612l217.547735-193.358823-67.980277-291.298436c-2.848884-12.20702 2.009773-24.919553 12.273535-32.114418 10.264784-7.195889 23.87271-7.42818 34.375925-0.586354l240.624313 156.709111 240.625336-156.709111c5.099135-3.320629 10.92891-4.974291 16.752546-4.974291 6.173606 0 12.342096 1.858324 17.623379 5.561669 10.263761 7.194866 15.122419 19.907399 12.273535 32.114418l-67.980277 291.299459L948.409906 459.781964C957.613522 467.962274 961.037505 480.849792 957.111079 492.519576z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="fonts-del" unicode="&#58959;" d="M928 448l-143.616 0c-3.456 55.616-14.272 106.56-29.504 144.96C725.504 666.816 617.344 768 464.32 768L256 768l0-320L96 448C78.336 448 64 433.664 64 416S78.336 384 96 384L256 384l0-320 229.632 0c156.288 0 240.768 97.856 267.904 167.488C772.736 280.96000000000004 782.272 333.312 784.96 384L928 384C945.664 384 960 398.336 960 416S945.664 448 928 448zM349.376 711.488l63.936 0c35.712 0 251.84 27.968 266.944-263.488l-330.88 0L349.376 711.488zM439.296 120.51199999999994L349.376 120.51199999999994 349.376 382.528 349.376 384l330.88 0C665.344 113.98400000000004 467.968 120.51199999999994 439.296 120.51199999999994z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="unlink" unicode="&#58957;" d="M150.336 767.6800000000001C133.44 762.304 124.16 744.3199999999999 129.472 727.488 131.2 722.1759999999999 134.208 717.44 138.304 713.664l122.624-122.432C270.208 576.192 289.92 571.52 304.96 580.736 320 590.0799999999999 324.672 609.7280000000001 315.456 624.832 312.832 629.056 309.184 632.64 304.96 635.264L182.336 757.696C175.168 765.44 164.672 769.216 154.304 767.6800000000001 152.96 767.808 151.552 767.808 150.336 767.6800000000001L150.336 767.6800000000001zM406.08 831.424c-13.696-4.48-22.72-17.6-22.016-32L384.064 672c0-17.664 14.336-32 32-32s31.872 14.336 31.872 32L447.936 799.424C448.256 817.088 434.304 831.6800000000001 416.64 832 414.464 832.064 412.16 831.808 410.048 831.424 408.704 831.552 407.296 831.552 406.08 831.424L406.08 831.424zM91.392 511.872C73.728 509.12 61.632 492.544 64.384 474.88 67.136 457.28 83.712 445.248 101.376 448L224 448C241.664 448 256 462.208 256 479.872s-14.336 32-32 32L101.376 511.872c-1.984 0.192-3.968 0.192-6.016 0C94.016 512 92.608 512 91.392 511.872L91.392 511.872zM795.456 320c-17.728-2.752-29.824-14.08-27.072-31.744 2.752-17.6 19.328-35.008 36.992-32.256L928 256c17.664 0 32 19.584 32 37.248S945.664 320 928 320l-122.624 0c-1.984 0.192-3.968 0.192-6.016 0-1.344 0.128-2.688 0.128-4.032 0L795.456 320zM598.272 127.42399999999998c-13.76-4.48-22.72-17.6-22.08-32L576.192-32c0-17.664 14.336-32 32-32S640-49.66399999999999 640-32l0 127.424c0.32 17.6-13.568 32.256-31.232 32.576-2.176 0.064-4.352-0.192-6.592-0.576-1.344 0.128-2.688 0.128-4.032 0L598.272 127.42399999999998zM726.272 191.67999999999995c-16.896-5.376-26.24-23.36-20.864-40.192 1.664-5.312 4.736-10.048 8.832-13.824l122.56-122.432c9.28-15.04 28.928-19.776 44.032-10.496 14.976 9.344 19.712 28.992 10.368 44.032-2.624 4.224-6.144 7.808-10.368 10.432l-122.56 122.432c-7.168 7.744-17.6 11.52-28.032 9.984-1.344 0.128-2.688 0.128-4.032 0L726.272 191.61599999999999zM339.968 28.03200000000004c-49.152 0-98.304 18.688-135.744 56.128-74.816 74.88-74.816 196.608 0 271.488l87.744 87.744c12.48 12.48 32.768 12.48 45.248 0s12.48-32.768 0-45.248L249.408 310.46400000000006c-49.92-49.856-49.92-131.136 0-180.992 49.856-49.856 131.136-49.856 180.992 0l87.744 87.744c12.48 12.48 32.768 12.48 45.248 0s12.48-32.768 0-45.248l-87.744-87.744C438.272 46.72000000000003 389.12 28.03200000000004 339.968 28.03200000000004zM702.144 323.712c-8.192 0-16.384 3.136-22.656 9.344-12.48 12.48-12.48 32.768 0 45.248l87.744 87.744c49.856 49.92 49.856 131.072 0 180.992-49.856 49.856-131.136 49.856-180.992 0L498.496 559.296c-12.48-12.48-32.768-12.48-45.248 0s-12.48 32.768 0 45.248l87.744 87.744c74.88 74.88 196.608 74.88 271.488 0 74.88-74.816 74.88-196.672 0-271.488l-87.744-87.744C718.528 326.784 710.336 323.712 702.144 323.712z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="fonts-clear" unicode="&#58937;" d="M944.787709 197.20939699999997L857.081297 197.20939699999997 741.092979-127.73993700000005 815.146059-127.73993700000005 832.440281-65.58476199999996 966.82809-65.58476199999996 984.512408-127.73993700000005 1062.011328-127.73993700000005 944.787709 197.20939699999997 944.787709 197.20939699999997ZM848.04409 1.1865400000000363L898.951519 153.25866699999995 949.923963 1.1865400000000363 848.04409 1.1865400000000363 848.04409 1.1865400000000363ZM210.238376 489.910857L183.386821 513.121524 12.46009 313.522794C-5.874386 292.652698-3.728862 260.989968 17.271265 242.720508 38.401424 224.45104800000001 70.454249 226.66158700000005 88.853741 247.53168300000004L100.361551 260.599873C106.603075 267.55657099999996 117.200662 268.20673 124.287392 262.22527 131.309106 256.048762 132.024281 245.51619000000005 125.912789 238.55949199999998 107.448281 217.62438099999997 98.085995 173.08850800000005 119.216154 154.81904799999995 140.281297 136.614603 183.841932 151.76330199999995 202.371455 172.69841299999996 208.417932 179.525079 219.145551 180.30526999999995 226.167265 174.19377799999995 233.188979 168.14730199999997 233.904154 157.61473 227.792662 150.65803200000005 209.328154 129.85295199999996 199.965868 85.05701599999998 221.096027 66.91758700000003 242.16117 48.648127000000045 285.656789 63.86184100000003 304.186313 84.666921 310.362821 91.62361899999996 321.025424 92.40381000000002 327.982122 86.29231700000003 335.068852 80.18082500000003 335.784027 69.71326999999997 329.672535 62.75657100000001 311.143011 41.82146 301.845741-2.9094599999999673 322.910884-20.983873000000017 344.041043-39.253333 387.601678-24.039619000000016 406.00117-3.234540000000038 412.177678 3.7221590000000333 422.840281 4.437332999999967 429.927011-1.6091430000000173 436.948725-7.720635000000016 437.598884-18.31822199999999 431.487392-25.144889000000035 413.022884-46.08000000000004 403.725614-90.81092100000001 424.790757-109.01536499999997 445.920916-127.15479400000004 477.973741-125.00927000000001 496.373233-104.20419000000004L667.299963 95.52457100000004 658.652852 132.90869799999996 210.238376 489.910857 210.238376 489.910857ZM844.013106 329.516698L680.10809 471.12127 929.639011 715.190857C933.2799 718.376635 936.725741 721.562413 939.976535 725.203302 977.815773 768.048762 973.524725 833.129651 930.28917 870.513778 887.183646 907.702857 821.58263 903.281778 783.808408 860.631365L783.483328 860.761397 564.249805 571.3107299999999 399.824662 713.56546C385.391138 726.113524 363.480789 724.553143 350.867709 710.249651L248.14263 593.871238 225.322059 567.994921 251.393424 545.434413 695.7119 161.25561900000002 726.26936 136.679619 847.328916 281.014857C859.941995 295.318349 858.44663 316.96863499999995 844.013106 329.516698L844.013106 329.516698ZM817.941741 830.724063C839.136916 854.779937 876.000916 857.315556 900.186821 836.250413 924.372725 815.380317 926.908344 778.906413 905.648154 754.85054 884.452979 730.924698 847.588979 728.389079 823.403075 749.3892060000001 799.21717 770.324317 796.811582 806.798222 817.941741 830.724063L817.941741 830.724063ZM765.473932 758.491429C768.919773 741.522286 777.6319 725.593397 791.80536 713.305397 806.043836 701.017397 823.533106 694.580825 841.087392 693.540571L643.634186 494.526984 593.116852 538.2176509999999 765.473932 758.491429 765.473932 758.491429ZM776.006503 299.739429L709.755328 219.314794 307.502122 566.369524 376.809043 645.03873C382.920535 651.865397 393.38809 652.5155560000001 400.409805 646.534095L774.381106 323.01511100000005C781.337805 317.098667 782.117995 306.69612700000005 776.006503 299.739429L776.006503 299.739429Z"  horiz-adv-x="1063" />
+
+    
+    <glyph glyph-name="triangle-r" unicode="&#58915;" d="M293.291 728.256l426.88-355.456-426.88-355.52z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="circle" unicode="&#58943;" d="M511.998 847.999C255.739 847.999 48 640.26 48 383.999c0-256.258 207.739-463.998 463.998-463.998C768.261-79.99900000000002 976 127.74199999999996 976 383.999 976 640.26 768.261 847.999 511.998 847.999zM512.002-16.000999999999976c-220.915 0-400.002 179.088-400.002 400 0 220.917 179.086 400 400.002 400 220.912 0 399.998-179.083 399.998-400C912 163.087 732.914-16.000999999999976 512.002-16.000999999999976z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="radio" unicode="&#58947;" d="M512.5 383.5m-192 0a192 192 0 1 1 384 0 192 192 0 1 1-384 0ZM511.998 847.999C255.739 847.999 48 640.26 48 383.999c0-256.258 207.739-463.998 463.998-463.998C768.261-79.99900000000002 976 127.74199999999996 976 383.999 976 640.26 768.261 847.999 511.998 847.999zM512.002-16.000999999999976c-220.915 0-400.002 179.088-400.002 400 0 220.917 179.086 400 400.002 400 220.912 0 399.998-179.083 399.998-400C912 163.087 732.914-16.000999999999976 512.002-16.000999999999976z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="align-center" unicode="&#58951;" d="M992 448L32 448C14.32 448 0 462.336 0 480 0 497.664 14.32 512 32 512L992 512C1009.68 512 1024 497.664 1024 480 1024 462.336 1009.68 448 992 448ZM800 704C817.664 704 832 689.664 832 672 832 654.336 817.664 640 800 640L224 640C206.32 640 192 654.336 192 672 192 689.664 206.32 704 224 704L800 704ZM992 832L32 832C14.32 832 0 846.336 0 864 0 881.664 14.32 896 32 896L992 896C1009.68 896 1024 881.664 1024 864 1024 846.336 1009.68 832 992 832ZM224 256C206.32 256 192 270.336 192 288 192 305.664 206.32 320 224 320L800 320C817.664 320 832 305.664 832 288 832 270.336 817.664 256 800 256L224 256ZM32 128L992 128C1009.68 128 1024 113.66399999999999 1024 96 1024 78.33600000000001 1009.68 64 992 64L32 64C14.32 64 0 78.33600000000001 0 96 0 113.66399999999999 14.32 128 32 128ZM224-64L800-64C817.664-64 832-78.33600000000001 832-96 832-113.66399999999999 817.664-128 800-128L224-128C206.32-128 192-113.66399999999999 192-96 192-78.33600000000001 206.32-64 224-64Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="align-right" unicode="&#58952;" d="M992 64L32 64C14.32 64 0 78.33600000000001 0 96 0 113.66399999999999 14.32 128 32 128L992 128C1009.68 128 1024 113.66399999999999 1024 96 1024 78.33600000000001 1009.68 64 992 64ZM992 256L288 256C270.32 256 256 270.336 256 288 256 305.664 270.32 320 288 320L992 320C1009.68 320 1024 305.664 1024 288 1024 270.336 1009.68 256 992 256ZM992 448L32 448C14.32 448 0 462.336 0 480 0 497.664 14.32 512 32 512L992 512C1009.68 512 1024 497.664 1024 480 1024 462.336 1009.68 448 992 448ZM992 640L288 640C270.32 640 256 654.336 256 672 256 689.664 270.32 704 288 704L992 704C1009.68 704 1024 689.664 1024 672 1024 654.336 1009.68 640 992 640ZM992 832L32 832C14.32 832 0 846.336 0 864 0 881.664 14.32 896 32 896L992 896C1009.68 896 1024 881.664 1024 864 1024 846.336 1009.68 832 992 832ZM288-64L992-64C1009.68-64 1024-78.33600000000001 1024-96 1024-113.66399999999999 1009.68-128 992-128L288-128C270.32-128 256-113.66399999999999 256-96 256-78.33600000000001 270.32-64 288-64Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="align-left" unicode="&#58953;" d="M992 448L32 448C14.336 448 0 462.336 0 480 0 497.664 14.336 512 32 512L992 512C1009.664 512 1024 497.664 1024 480 1024 462.336 1009.664 448 992 448ZM32 704L736 704C753.68 704 768 689.664 768 672 768 654.336 753.68 640 736 640L32 640C14.336 640 0 654.336 0 672 0 689.664 14.336 704 32 704ZM992 832L32 832C14.336 832 0 846.336 0 864 0 881.664 14.336 896 32 896L992 896C1009.664 896 1024 881.664 1024 864 1024 846.336 1009.664 832 992 832ZM32 320L736 320C753.68 320 768 305.664 768 288 768 270.336 753.68 256 736 256L32 256C14.336 256 0 270.336 0 288 0 305.664 14.336 320 32 320ZM32 128L992 128C1009.664 128 1024 113.66399999999999 1024 96 1024 78.33600000000001 1009.664 64 992 64L32 64C14.336 64 0 78.33600000000001 0 96 0 113.66399999999999 14.336 128 32 128ZM32-64L736-64C753.68-64 768-78.33600000000001 768-96 768-113.66399999999999 753.68-128 736-128L32-128C14.336-128 0-113.66399999999999 0-96 0-78.33600000000001 14.336-64 32-64Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="loading-1" unicode="&#58942;" d="M537.574469 831.696462c-14.123672 0-25.574469-11.447726-25.574469-25.574469 0-14.123672 11.450796-25.574469 25.574469-25.574469 204.495464 0 370.82877-166.358889 370.82877-370.82877 0-14.123672 11.450796-25.574469 25.574469-25.574469 14.123672 0 25.574469 11.450796 25.574469 25.574469C959.551152 642.385838 770.241552 831.696462 537.574469 831.696462z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="return" unicode="&#58972;" d="M927.858848 417.938973L168.863431 417.938973l308.721247 308.86758c11.685133 11.69025 11.435447 30.881334-0.557702 42.868343-11.992125 11.985986-31.18321 12.226462-42.868343 0.536212L75.199191 411.071565c-1.994424-1.662873-3.773953-3.583618-5.294586-5.713119-4.047176-5.373381-6.013971-11.839653-5.9055-18.328437-0.12996-7.794523 2.725064-15.561417 8.595772-21.432125l361.565802-361.744881c11.685133-11.691273 30.876218-11.449773 42.868343 0.535189 11.993149 11.985986 12.242835 31.17707 0.557702 42.868343L168.441828 356.54571799999997l759.417019 0c16.527418 0 29.925566 13.738909 29.925566 30.694069S944.386266 417.938973 927.858848 417.938973z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="fonts-strong" unicode="&#58923;" d="M199.092919 848.487893l355.326704 0c70.335928 0 122.780371-2.942005 157.349701-8.809643 34.568307-5.884011 65.491597-18.131963 92.78522-36.759205 27.27725-18.627243 50.01409-43.427068 68.209498-74.397431 18.195408-30.986735 27.293623-65.699328 27.293623-104.169501 0-41.7161-11.17655-79.977519-33.496905-114.802676s-52.604078-60.951187-90.818425-78.362742c54.075593-15.765055 95.647407-42.626843 124.715443-80.585363s43.602054-82.58388 43.602054-133.877103c0-40.388872-9.417487-79.673597-28.220738-117.839849-18.803251-38.182624-44.482097-68.673056-77.035514-91.489714-32.55444-22.833031-72.702835-36.855396-120.414487-42.09984-29.931706-3.229554-102.122889-5.260817-216.572524-6.060019L199.092919-40.765192999999954 199.092919 848.487893zM378.171504 700.1084940000001l0-205.684546 117.64849 0c69.935816 0 113.410979 1.006933 130.390699 3.038196 30.730908 3.629667 54.891168 14.246469 72.478731 31.850405 17.588587 17.588587 26.381857 40.756239 26.381857 69.473281 0 27.501354-7.594979 49.838082-22.75219 67.042929-15.158235 17.188474-37.702694 27.597545-67.618027 31.242562-17.796318 2.01489-68.945255 3.038196-153.431461 3.038196L378.171504 700.109518zM378.171504 346.04454999999996l0-236.383732 166.622902 0c64.85203 0 106.008382 1.807159 123.43631 5.420453 26.750247 4.828982 48.543599 16.58063 65.363683 35.272341s25.247011 43.714617 25.247011 75.085092c0 26.526143-6.491855 49.03888-19.459191 67.538209-12.983709 18.48398-31.722492 31.961946-56.250118 40.404222s-77.739549 12.663414-159.619394 12.663414L378.171504 346.04454999999996z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="upload" unicode="&#59004;" d="M831.488 478.208C831.488 478.208 831.488 478.208 831.488 478.208c0 143.36-114.688 258.048-253.952 258.048-98.304 0-184.32-57.344-225.28-139.264C327.68 605.184 307.2 609.28 286.72 609.28c-90.112 0-159.744-73.728-159.744-159.744 0-16.384 4.096-28.672 8.192-40.96C57.344 379.904 0 310.27200000000005 0 224.25599999999997c0-106.496 86.016-192.512 192.512-192.512l192.512 0 0 192.512L258.048 224.25599999999997l258.048 258.048 258.048-258.048-126.976 0 0-192.512 192.512 0L839.68 35.84000000000003c106.496 16.384 192.512 110.592 192.512 221.184C1024 371.712 937.984 465.92 831.488 478.208z"  horiz-adv-x="1033" />
+
+    
+    <glyph glyph-name="dialogue" unicode="&#58938;" d="M998.4 500.992C998.4 682.24 811.392 829.696 581.632 829.696c-121.216 0-235.904-41.472-315.264-114.048 37.504 8.192 76.416 13.056 115.456 14.464 59.264 30.592 128.256 46.72 199.808 46.72 198.144 0 359.296-123.776 359.296-275.968 0-31.872-7.04-63.232-20.992-93.056 7.552-28.16 11.264-57.344 11.008-86.528C975.104 374.784 998.4 436.736 998.4 500.992L998.4 500.992zM442.368 398.72c-30.72 0-55.808-23.04-55.808-51.328s25.088-51.328 55.808-51.328 55.808 23.04 55.808 51.328S473.088 398.72 442.368 398.72zM243.328 398.72c-30.72 0-55.808-23.04-55.808-51.328s25.088-51.328 55.808-51.328 55.808 23.04 55.808 51.328C299.264 375.67999999999995 274.176 398.72 243.328 398.72zM641.28 398.72c-30.72 0-55.808-23.04-55.808-51.328s25.088-51.328 55.808-51.328 55.808 23.04 55.808 51.328S672.128 398.72 641.28 398.72zM442.368 677.888C212.608 677.888 25.6 530.432 25.6 349.312c0-179.968 173.696-296.192 332.544-321.664l60.8-78.336c5.632-7.424 14.464-11.008 23.296-11.008 8.832 0 17.792 3.712 23.424 11.008l60.8 78.464C685.312 53.24800000000005 859.008 169.47199999999998 859.008 349.44000000000005 859.136 530.432 672.128 677.888 442.368 677.888zM714.88 173.82399999999996c-52.224-45.184-124.288-77.952-197.376-89.6C503.168 81.91999999999996 490.112 74.24000000000001 481.28 62.72000000000003l-38.784-49.92-38.912 49.92c-8.96 11.52-21.888 19.2-36.224 21.504-73.216 11.776-145.152 44.416-197.376 89.728-39.68 34.304-86.912 92.544-86.912 175.36 0 69.76 35.584 136.192 100.352 187.264 68.736 54.144 160.768 84.096 258.944 84.096 98.304 0 190.336-29.824 259.072-84.096 64.768-51.072 100.352-117.504 100.352-187.264C801.664 266.36800000000005 754.56 208.12800000000004 714.88 173.82399999999996z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="video" unicode="&#59117;" d="M952.523633 599.2477269999999L952.523633 599.2477269999999 952.523633 599.2477269999999zM100.53762400000005 661.054062C100.53762400000005 661.054062 100.53762400000005 661.054062 100.53762400000005 661.054062 100.53762400000005 661.054062 100.53762400000005 661.054062 100.53762400000005 661.054062zM100.74228 720.404517L100.74228 720.404517 100.74228 720.404517zM660.990107 739.9449716666666c8.697911 0 17.498151-0.511642 25.684421-2.353553 12.279404-2.865194 23.22854-8.18627 34.382332-16.679524 15.144599-11.460777 26.196063-29.572899 32.02878-52.187469 3.479165-13.405016 2.967523-28.651944 2.558209-42.05696-0.102328-4.195463-0.204657-8.083941-0.204657-11.665434l0-37.759169 101.407415 70.401919 25.479764 17.60048c0.511642 0.306985 1.330269 1.023284 2.148896 1.637254 4.40012 3.376836 11.051464 8.595583 20.977316 11.051464 3.274508 0.818627 6.549016 1.22794 10.02818 1.22794 9.618867 0 19.44239-3.274508 27.730987999999996-9.311882 18.82842-13.916657999999998 18.726092-35.405616 18.726092-51.061857 0-1.023284 0-2.148896 0-3.172179l0-409.620466c0-15.963226 0.102328-37.963825-19.647047-51.982812-6.753672-4.809433-16.679524-8.390926-27.219346-8.390926-5.01409 0-10.130509 0.818627-15.144599 2.762866-7.162986 2.762866-12.279404 6.856000999999999-16.065554 9.823524-0.920955 0.716299-1.841911 1.432597-2.353553 1.841911l-24.968122 17.395823-101.10043 70.094934 0-37.963825c0-3.581493 0.102328-7.367643 0.204657-11.460777 0.409313-14.735285 0.818627-29.982212-2.865194-43.796542-5.62806-21.488957999999997-16.679524-39.396423-31.107825-50.447886-7.879285-6.037374-18.930748-13.405016-34.075347-16.986509-7.776956-1.841911-16.167882-2.353553-24.45648-2.353553-4.297792 0-8.595583 0.102328-12.688718 0.204657-3.683821 0.102328-7.162986 0.204657-10.232837 0.204657L167.15339300000005 84.94107466666674c-1.944239 0-3.888478 0-5.832717 0-1.944239 0-3.990806 0-5.935045 0-16.577196 0-33.461377 0.61397-47.787349 6.549016-27.935644999999997 11.563106-46.764065 37.759169-53.006096 73.574098l-0.409313 2.251224 0 2.353553c-0.102328 18.930748-0.204657 37.861497-0.306985 56.792245l0 0.511642L53.87588699999998 598.0155226666666c0 4.40012-0.102328 8.902568-0.102328 13.712001999999998-0.306985 27.01469-0.716299 54.950335 9.311882 76.643949 9.823524 21.284300999999996 27.526331999999996 38.066154 48.708304 45.945438 5.730389 2.148896 11.051464 2.762866 15.04227 3.172179 1.023284 0.102328 2.353553 0.306985 3.069851 0.409313l4.093135 1.534926 500.9997 0c3.581493 0 7.572299 0.102328 11.767763 0.306985C651.166583 739.7403146666667 656.078345 739.9449716666666 660.990107 739.9449716666666M304.273409 266.7785886666668L559.889677 394.2797376666667l0 33.973019L304.273409 555.9585626666667 304.273409 266.7785886666668M660.990107 780.8763196666666c-5.62806 0-10.949136-0.204657-15.758569-0.306985-3.888478-0.102328-7.469971-0.204657-10.437494-0.204657L133.79434400000002 780.3646776666667l-7.265314 0-6.446687-2.353553c-5.3210749999999996-0.61397-13.609673-1.841911-22.716898-5.218747-31.210153-11.665434-57.303887-36.121915-71.629859-67.229739-13.814329999999998-30.084541-13.405016-64.159888-12.995703-94.244429 0.102328-4.604777 0.102328-9.004897 0.102328-13.20036l0-371.349655 0-0.102328 0-0.102328 0-0.511642c0.102328-18.930748 0.204657-37.861497 0.306985-56.792245l0-2.251224 0-3.479165 0.61397-3.376836 0.409313-2.251224c4.195463-23.944839 12.791046-45.126811 25.479764-62.727291 13.609673-18.82842 31.107825-32.847407 52.08514-41.545318 21.488957999999997-8.902568 44.001199-9.618867 63.443589-9.618867 2.046567 0 4.093135 0 6.139702 0 1.841911 0 3.78615 0 5.62806 0l473.166384 0c2.558209 0 5.62806-0.102328 9.004897-0.204657 4.195463-0.102328 8.902568-0.306985 13.916657999999998-0.306985 13.302688 0 24.149495 1.125612 33.973019 3.479165 22.819227 5.423404 39.089437 16.474868 49.322274 24.251824 21.693613999999997 16.577196 37.963825 42.363944999999994 45.84311 72.653143 2.251224 8.595583 3.376836 17.088838 3.990806 25.377436l36.838213-25.582093 24.558809-17.088838c0.306985-0.204657 0.61397-0.511642 0.920955-0.716299 4.809433-3.683821 13.609673-10.642149999999999 26.400719-15.656241 9.516538-3.683821 19.647047-5.62806 30.084541-5.62806 18.009793 0 36.53122799999999 5.832717 50.8572 15.963226 16.577196 11.767763 27.730987999999996 27.935644999999997 33.052064 48.094334 3.78615 14.4283 3.78615 27.628659999999996 3.78615 37.34985499999999l0 409.518137c0 0.920955 0 1.739582 0 2.660538l0 0.409313c0 9.41421 0.102328 22.409913-3.479165 36.53122799999999-5.116419 19.749375-15.758569 35.81493-31.721795 47.68502-15.144599 11.153792-33.666034 17.293495-52.08514 17.293495-6.753672 0-13.507345-0.818627-19.954032-2.455881-18.21445-4.604777-30.289198-13.916657999999998-36.019586-18.419107l0 0c-0.204657-0.204657-0.511642-0.409313-0.716299-0.511642l-25.172779-17.293495-0.102328 0-0.102328 0-37.14519799999999-25.786749c-0.511642 7.674628-1.637254 15.553912-3.683821 23.433197-8.18627 31.721795-24.354152 57.508544-46.866394 74.597382-15.758569 11.972419-32.02878 19.851704-49.833916 23.944839C685.8559009999999 779.7507076666667 674.702109 780.8763196666666 660.990107 780.8763196666666L660.990107 780.8763196666666zM345.204757 332.9850436666668L345.204757 489.75210666666663l157.074048-78.48586L345.204757 332.9850436666668 345.204757 332.9850436666668zM347.455981 429.177975L347.455981 308.02118499999995 347.455981 429.177975Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="headset" unicode="&#59132;" d="M356.285031 2.1522690000000466L356.396571 2.1522690000000466 356.396571 285.236626 253.462201 285.236626 253.462201 2.1522690000000466ZM665.076886 285.236626l103.042841 0 0-283.08538-103.042841 0 0 283.08538ZM63.809793 301.950286c0-38.758746-3.195785-112.220874 5.457292-148.208507l65.735144 0c-10.112312 35.644825-7.747451 109.176538-7.747451 148.208507 0 219.937155 172.264389 398.231887 384.763131 398.231887 212.498742 0 384.763131-178.294732 384.763131-398.231887 0-39.031968 2.266623-112.563682-7.845689-148.208507l65.735144 0c8.653077 35.987632 5.555529 109.449761 5.555529 148.208507 0 256.20415-200.670346 463.898469-448.208115 463.898469C264.479115 765.848755 63.809793 558.1544349999999 63.809793 301.950286z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="cellphone-fine" unicode="&#58939;" d="M731.514252 896L292.485748 896C195.323702 896 116.154627 816.830925 116.154627 719.6688790000001l0-671.337759c0-97.162046 79.169075-176.331121 176.331121-176.331121l438.628661 0c97.162046 0 176.331121 79.169075 176.331121 176.331121L907.445529 719.6688790000001C907.845373 816.830925 828.676298 896 731.514252 896zM292.485748 853.216712l438.628661 0c70.772355 0 128.349863-55.178446 133.147989-124.751269L159.737602 728.465443C164.135884 798.038266 222.113237 853.216712 292.485748 853.216712zM865.062085 48.73096399999997c0-73.571261-59.976572-133.547833-133.547833-133.547833L292.485748-84.816868c-73.571261 0-133.547833 59.976572-133.547833 133.547833l0 45.582194 705.724326 0L864.662241 48.73096399999997zM865.062085 137.096447L158.937915 137.096447 158.937915 685.682155l705.724326 0L864.662241 137.096447zM512-54.82858299999998c13.59469 0 26.789535 5.597813 36.385787 15.194065 9.596251 9.596251 15.194065 22.791097 15.194065 36.385787 0 13.59469-5.597813 26.789535-15.194065 36.385787-9.596251 9.596251-22.791097 15.194065-36.385787 15.194065-13.59469 0-26.789535-5.597813-36.385787-15.194065-9.596251-9.596251-15.194065-22.791097-15.194065-36.385787 0-13.59469 5.597813-26.789535 15.194065-36.385787C485.210465-49.23076900000001 498.40531-54.82858299999998 512-54.82858299999998z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="add-1" unicode="&#58964;" d="M566.935 57.63900000000001c0-30.366-24.612-54.972-54.935-54.972v0c-30.384 0-54.996 24.612-54.996 54.972v610.057c0 30.361 24.612 54.972 54.996 54.972v0c30.33 0 54.935-24.612 54.935-54.972v-610.057zM817.004 417.633c30.384 0 54.996-24.606 54.996-54.966v0c0-30.354-24.612-54.966-54.996-54.966h-610.062c-30.33 0-54.942 24.612-54.942 54.966v0c0 30.359 24.612 54.966 54.942 54.966h610.062zM817.004 417.633z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="face-smile-b" unicode="&#58960;" d="M511.931733-128c-136.738133 0-265.284267 53.213867-361.984 149.879467C53.282133 118.51093300000002 0 247.09119999999996 0 384c0 136.738133 53.282133 265.3184 150.050133 362.0864C246.749867 842.683733 375.296 896 512.136533 896s265.4208-53.316267 362.1888-149.9136c199.645867-199.714133 199.543467-524.5952 0-724.206933C777.454933-74.71786699999996 648.772267-128 511.931733-128L511.931733-128 511.931733-128 511.931733-128 511.931733-128 511.931733-128zM512.034133 829.303467c-118.920533 0-230.741333-46.2848-314.914133-130.389333C113.083733 614.8778669999999 66.7648 502.8864 66.7648 384c0-118.9888 46.2848-230.912 130.3552-315.016533 84.0704-84.0704 195.857067-130.321067 314.811733-130.321067 119.022933 0 230.946133 46.318933 315.016533 130.423467 173.704533 173.636267 173.704533 456.157867 0 629.794133C742.877867 782.984533 631.057067 829.303467 512.034133 829.303467L512.034133 829.303467 512.034133 829.303467 512.034133 829.303467 512.034133 829.303467 512.034133 829.303467zM330.103467 244.25813300000004c0 0 59.904-95.9488 181.828267-95.9488s201.8304 95.9488 201.8304 95.9488 45.294933 0.136533 45.192533-47.957333c0 0-78.506667-111.8208-247.022933-111.8208s-223.368533 111.8208-223.368533 111.8208S286.856533 244.25813300000004 330.103467 244.25813300000004L330.103467 244.25813300000004 330.103467 244.25813300000004 330.103467 244.25813300000004 330.103467 244.25813300000004zM363.2128 548.590933c-34.5088 0-62.702933-28.091733-62.702933-62.737067 0-34.679467 28.194133-62.6688 62.702933-62.6688 34.679467 0 62.702933 28.091733 62.702933 62.6688C425.915733 520.4992 397.858133 548.590933 363.2128 548.590933L363.2128 548.590933 363.2128 548.590933 363.2128 548.590933 363.2128 548.590933 363.2128 548.590933zM684.544 548.590933c-34.679467 0-62.702933-28.091733-62.702933-62.737067 0-34.679467 28.023467-62.6688 62.702933-62.6688 34.6112 0 62.600533 28.091733 62.600533 62.6688C747.144533 520.4992 719.121067 548.590933 684.544 548.590933L684.544 548.590933 684.544 548.590933 684.544 548.590933 684.544 548.590933 684.544 548.590933zM684.544 548.590933"  horiz-adv-x="1025" />
+
+    
+    <glyph glyph-name="fonts-html" unicode="&#58955;" d="M194.33 416.235h-101.295v101.28h-46.035v-267.03h46.035v119.7h101.28v-119.7h46.035v267.03h-46.035v-101.28zM277.205 480.69h73.665v-230.205h46.035v230.205h73.665v36.825h-193.365v-36.825zM627.815 335.58000000000004l-46.755 181.935h-73.665v-267.03h46.035v211.785l46.035-211.785h55.245l46.83 213.93-0.795-213.93h46.035v267.03h-73.665l-45.3-181.935zM848.09 287.30999999999995v230.205h-46.035v-267.03h174.945v36.825h-128.91z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="screen-full" unicode="&#58914;" d="M641.750109 511.899972l205.227128 204.519-0.704035-115.89966c-0.282433-9.611915 7.489578-18.09103 17.101493-17.808598l12.297071 0c9.611915 0.283456 17.667382 5.936199 17.808598 15.689331l0.565888 172.57752c0 0.14224 0.282433 9.187243 0.282433 9.187243 0.14224 4.804423-0.99056 9.187243-4.100388 12.297071-3.109828 3.109828-7.347339 5.086855-12.297071 4.946662l-8.763594-0.14224c-0.141216 0-0.278339 0-0.420579-0.14224L697.581696 797.833213c-9.611915-0.283456-17.667382-8.200776-17.808598-17.950837l0-12.297071c1.416256-11.44875 10.458189-18.092054 20.070104-17.808598l112.789832-0.283456-204.66124-203.814965c-9.329483-9.329483-9.329483-24.449855 0-33.778314 9.329483-9.470699 24.452925-9.470699 33.782408 0L641.750109 511.899972zM383.095141 319.11010699999997L177.726797 115.29411900000002l0.707105 115.338888c0.283456 9.607822-7.492648 18.086937-17.104563 17.808598l-13.001105 0c-9.611915-0.283456-17.667382-5.937223-17.808598-15.690354l-0.565888-172.718737c0-0.14224-0.282433-9.187243-0.282433-9.187243-0.14224-4.808516 0.99056-9.187243 4.096295-12.297071 3.109828-3.109828 7.351432-5.086855 12.297071-4.946662l8.762571 0.14224c0.14224 0 0.283456 0 0.425695 0.14224l171.873486-0.708128c9.607822 0.283456 17.667382 8.196683 17.808598 17.950837L344.93503 63.42477399999996c-1.415232 11.44875-10.461259 18.092054-20.074198 17.808598L212.069977 81.51682800000003 416.59 285.32872299999997c9.329483 9.329483 9.329483 24.453948 0 33.782408C407.40685 328.58182999999997 392.424624 328.58182999999997 383.095141 319.11010699999997L383.095141 319.11010699999997zM894.047276 60.03251399999999l-0.424672 172.718737c-0.283456 9.612938-8.200776 15.406898-17.809621 15.690354l-12.296047 0c-9.612938 0.278339-17.243733-8.200776-17.105586-17.808598l0.708128-115.903753L641.750109 319.11010699999997c-9.329483 9.329483-24.452925 9.329483-33.782408 0-9.325389-9.328459-9.325389-24.452925 0-33.782408L812.490795 81.51682800000003l-112.789832-0.283456c-9.611915 0.283456-18.515702-6.502088-20.073174-17.808598l0-12.297071c0.282433-9.611915 8.200776-17.667382 17.808598-17.950837l171.166381 0.708128c0.141216 0 0.282433-0.14224 0.424672-0.14224l8.763594-0.14224c4.803399-0.141216 9.187243 1.694595 12.296047 4.946662 3.109828 3.109828 4.238534 7.488555 4.097318 12.297071 0 0-0.14224 9.046027-0.14224 9.187243L894.047276 60.03149099999996zM212.216309 749.493252l112.789832 0.283456c9.607822-0.283456 18.512632 6.502088 20.070104 17.808598L345.076246 779.883399c-0.283456 9.611915-8.196683 17.667382-17.808598 17.950837l-172.011632-0.708128c-0.14224 0-0.283456 0.14224-0.425695 0.14224l-8.761548 0.14224c-4.808516 0.141216-9.187243-1.694595-12.297071-4.946662-3.109828-3.109828-4.242627-7.488555-4.096295-12.297071 0 0 0.282433-9.046027 0.282433-9.187243l0.420579-172.718737c0.14224-9.608845 8.200776-15.406898 17.808598-15.686261l13.005198 0c9.611915-0.282433 17.242709 8.196683 17.10047 17.808598l-0.564865 115.334795 205.231221-203.958228c9.324366-9.329483 24.448832-9.329483 33.777291 0 9.329483 9.329483 9.329483 24.452925 0 33.782408L212.216309 749.493252 212.216309 749.493252zM212.216309 749.493252"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="form" unicode="&#58940;" d="M314.278111 437.019389l395.439892 0 0-30.297458-395.439892 0L314.278111 437.019389zM314.278111 315.83495200000004l395.439892 0 0-30.297458-395.439892 0L314.278111 315.83495200000004zM314.278111 194.62833l263.626661 0 0-30.297458L314.278111 164.330872 314.278111 194.62833zM609.376235 739.9931730000001c-7.849678 42.966669-48.394988 75.742447-97.378777 75.742447-48.961604 0-89.51311-32.775778-97.380776-75.742447L116.55177 739.9931730000001l0-787.725922 790.893774 0 0 787.725922L609.376235 739.9931730000001zM446.091342 670.440529l0 17.613058 0 36.791056c0 33.410348 29.57295 60.594317 65.906116 60.594317 36.352353 0 65.907115-27.183969 65.907115-60.594317l0-36.791056 0-17.621053 16.672696-8.712493c32.358061-16.929922 57.169039-42.663874 71.406386-73.213161L358.043239 588.50688c14.240345 30.555683 39.051523 56.281241 71.408385 73.213161L446.091342 670.440529zM874.489888-17.436289999999985L149.505227-17.436289999999985 149.505227 709.694715 413.138884 709.694715l0-21.641327c-51.44492-26.923746-88.727643-74.124144-98.86377-129.845165l395.44289 0c-10.102151 55.730615-47.40466 102.921419-98.859773 129.845165l0 21.641327 263.631658 0L874.489888-17.436289999999985z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="cart" unicode="&#58967;" d="M365.920994 84.618469c-39.030945 0-70.78516-31.754215-70.78516-70.78516s31.754215-70.784136 70.78516-70.784136c39.030945 0 70.784136 31.753191 70.784136 70.784136S404.951939 84.618469 365.920994 84.618469zM365.920994-5.784493999999995c-10.818393 0-19.61985 8.801457-19.61985 19.618826 0 10.818393 8.801457 19.61985 19.61985 19.61985s19.618826-8.801457 19.618826-19.61985C385.540843 3.015939000000003 376.739387-5.784493999999995 365.920994-5.784493999999995zM808.821219 84.618469c-39.030945 0-70.784136-31.754215-70.784136-70.78516s31.753191-70.784136 70.784136-70.784136 70.78516 31.753191 70.78516 70.784136S847.852164 84.618469 808.821219 84.618469zM808.821219-5.784493999999995c-10.81737 0-19.618826 8.801457-19.618826 19.618826 0 10.818393 8.801457 19.61985 19.618826 19.61985 10.818393 0 19.61985-8.801457 19.61985-19.61985C828.441069 3.015939000000003 819.640636-5.784493999999995 808.821219-5.784493999999995zM443.99107 305.940157c-14.057157-1.416256-24.305569-13.959943-22.890336-28.0171 1.328251-13.187347 12.446473-23.02132 25.423019-23.02132 0.856507 0 1.723248 0.042979 2.594081 0.130983l439.314561 44.245713c0.088004 0.007163 0.174985 0.01842 0.261966 0.026606l0.180102 0.01842c0.50449 0.051165 1.001817 0.119727 1.496074 0.198521 0.222057 0.035816 0.443092 0.076748 0.663102 0.11768 0.552585 0.103354 1.100054 0.217964 1.638313 0.355087 0.085958 0.022513 0.169869 0.047072 0.254803 0.069585 0.586354 0.156566 1.161453 0.334621 1.728364 0.530073 0.077771 0.026606 0.155543 0.051165 0.233314 0.078795 0.626263 0.222057 1.239224 0.469698 1.840928 0.737804 0.039909 0.017396 0.078795 0.035816 0.118704 0.054235 1.277086 0.577145 2.496867 1.252527 3.647063 2.020006 0.001023 0.001023 0.002047 0.001023 0.00307 0.002047 0.553609 0.369414 1.088798 0.76134 1.609661 1.170662 0.069585 0.054235 0.137123 0.10847 0.205685 0.163729 0.48607 0.38988 0.958838 0.795109 1.413186 1.218758 0.092098 0.084934 0.180102 0.173962 0.270153 0.25992 0.394996 0.378623 0.778736 0.76748 1.14815 1.169639 0.11154 0.121773 0.222057 0.243547 0.331551 0.367367 0.333598 0.3776 0.653893 0.766456 0.964978 1.163499 0.12382 0.158612 0.249687 0.314155 0.370437 0.475837 0.322341 0.432859 0.629333 0.876973 0.925069 1.329275 0.113587 0.173962 0.224104 0.348947 0.333598 0.525979 0.296759 0.479931 0.580215 0.968048 0.845251 1.467421 0.069585 0.130983 0.134053 0.265036 0.201591 0.397043 0.289596 0.568958 0.563842 1.147126 0.811482 1.738597 0.00307 0.007163 0.005117 0.014326 0.008186 0.021489 0.569982 1.369184 1.019213 2.796696 1.345648 4.26514 0 0.001023 0 0.002047 0.001023 0.00307l0.00307 0.013303c0.035816 0.162706 0.075725 0.323365 0.10847 0.487094l56.17951 252.734118c0.895393 4.030803 0.780783 8.04728-0.165776 11.794627 0.50449 2.003634 0.774643 4.101411 0.774643 6.261611 0 14.128789-11.452843 25.582655-25.582655 25.582655L195.47502 616.098125l-52.358485 159.553902c-3.631714 11.067057-14.093996 17.972327-25.177426 17.590634-0.207731 0.005117-0.413416 0.01535-0.62217 0.01535L54.663994 793.258011c-14.128789 0-25.582655-11.453866-25.582655-25.582655s11.453866-25.582655 25.582655-25.582655l45.614897 0 197.955514-603.235934c3.536546-10.776438 13.546527-17.613146 24.303522-17.613146 2.067079 0 4.16281 0.26299 6.245238 0.788969l567.583946 0c14.129812 0 25.582655 11.453866 25.582655 25.582655s-11.452843 25.582655-25.582655 25.582655L340.816223 173.1979 212.265428 564.933839l701.224666 0-48.137347-216.557174L443.99107 305.940157z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="camera-fill" unicode="&#58973;" d="M512 480C436.515555 480 375.111111 419.712 375.111111 345.6 375.111111 271.48800000000006 436.515555 211.20000000000005 512 211.20000000000005 587.484446 211.20000000000005 648.888887 271.48800000000006 648.888887 345.6 648.888887 419.712 587.484446 480 512 480M512 172.79999999999995C414.808889 172.79999999999995 336 250.15679999999998 336 345.6 336 441.0432 414.808889 518.4 512 518.4 609.210667 518.4 688 441.0432 688 345.6 688 250.15679999999998 609.210667 172.79999999999995 512 172.79999999999995M903.111113 691.2L723.767113 691.2C713.383113 691.2 703.448887 695.2512 696.115554 702.4512L640.792887 756.7488C633.459554 763.9488 623.505779 768 613.141333 768L512 768 410.878222 768C400.494222 768 390.56 763.9488 383.226667 756.7488L327.904 702.4512C320.570667 695.2512 310.616889 691.2 300.252445 691.2L120.888889 691.2C77.866667 691.2 42.666667 656.64 42.666667 614.4L42.666667 76.79999999999995C42.666667 34.559999999999945 77.866667 0 120.888889 0L903.111113 0C946.133333 0 981.333333 34.559999999999945 981.333333 76.79999999999995L981.333333 614.4C981.333333 656.64 946.133333 691.2 903.111113 691.2"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="tabs" unicode="&#58922;" d="M310.30303 523.636364L124.121212 523.636364c-17.128727 0-31.030303-13.901576-31.030303-31.030303l0-186.181818c0-17.128727 13.901576-31.030303 31.030303-31.030303l186.181818 0c17.128727 0 31.030303 13.901576 31.030303 31.030303L341.333333 492.606061C341.333333 509.734788 327.431758 523.636364 310.30303 523.636364zM294.787879 306.42424200000005L139.636364 306.42424200000005c-17.128727 0-15.515152-1.613576-15.515152 15.515152L124.121212 477.090909c0 17.128727-1.613576 15.515152 15.515152 15.515152l155.151515 0c17.128727 0 15.515152 1.613576 15.515152-15.515152l0-155.151515C310.30303 304.81066699999997 311.916606 306.42424200000005 294.787879 306.42424200000005zM418.909091 352.969697l480.969697 0 0 31.030303L418.909091 384 418.909091 352.969697zM418.909091 228.84848499999998l480.969697 0 0 31.030303L418.909091 259.878788 418.909091 228.84848499999998zM418.909091 89.21212100000002l480.969697 0 0 31.030303L418.909091 120.24242400000003 418.909091 89.21212100000002zM418.909091 492.606061l480.969697 0 0 31.030303L418.909091 523.636364 418.909091 492.606061zM992.969697 725.333333l-15.515152 0L977.454545 849.454545c0 17.128727-13.901576 31.030303-31.030303 31.030303L775.757576 880.484848c-17.128727 0-31.030303-13.901576-31.030303-31.030303l0-124.121212-139.636364 0L605.090909 849.454545c0 17.128727-13.901576 31.030303-31.030303 31.030303L403.393939 880.484848c-17.128727 0-31.030303-13.901576-31.030303-31.030303l0-124.121212-124.121212 0L248.242424 849.454545c0 17.128727-13.901576 31.030303-31.030303 31.030303L31.030303 880.484848C13.901576 880.484848 0 866.583273 0 849.454545l0-946.424242c0-17.128727 13.901576-31.030303 31.030303-31.030303l961.939394 0c17.128727 0 31.030303 13.901576 31.030303 31.030303L1024 694.30303C1024 711.431758 1010.098424 725.333333 992.969697 725.333333zM992.969697-65.939394c0-17.128727-13.901576-31.030303-31.030303-31.030303L62.060606-96.969697c-17.128727 0-31.030303 13.901576-31.030303 31.030303L31.030303 818.424242c0 17.128727 13.901576 31.030303 31.030303 31.030303l124.121212 0c17.128727 0 31.030303-13.901576 31.030303-31.030303l0-124.121212 744.727273 0c17.128727 0 31.030303-13.901576 31.030303-31.030303L992.969697-65.939394z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="heart-fill" unicode="&#59023;" d="M729.068827 776.44202c-94.686523 0-176.905082-48.314379-217.069851-118.640074-40.163745 70.325695-122.382305 118.640074-217.044268 118.640074-143.767358 0-229.665727-123.660414-229.665727-243.219417 0-283.128359 415.870616-527.841803 433.576883-538.126031 4.062526-2.363837 8.584516-3.538593 13.132088-3.538593 4.547573 0 9.070586 1.174756 13.132088 3.538593 17.706267 10.283204 433.576883 254.997672 433.576883 538.126031C958.708971 652.781606 872.811626 776.44202 729.068827 776.44202z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="fonts-code" unicode="&#58958;" d="M270 626c-12 12-32 12-44 0L9 409c-12-12-12-32 0-44l217-217c6-6 14-9 22-9s16 3 22 9c12 12 12 32 0 44L75 387 270 582C282 595 282 614 270 626zM1015 409L798 626c-12 12-32 12-44 0-12-12-12-32 0-44l195-195L754 192c-12-12-12-32 0-44 6-6 14-9 22-9s16 3 22 9l217 217C1027 377 1027 397 1015 409zM624 696L624 696c-16 6-34-3-40-19L382 119c-6-16 2-34 19-40l0 0c16-6 34 3 40 19l202 558C648 672 640 690 624 696z"  horiz-adv-x="1025" />
+
+    
+    <glyph glyph-name="ios" unicode="&#59008;" d="M821.235026 351.984884c-1.287001 129.729651 105.791442 191.891776 110.553344 194.980577-60.102924 88.030835-153.796561 100.12864-187.258574 101.54434-79.794032 7.979403-155.598362-46.975519-196.010178-46.975519-40.411816 0-102.831341 45.688518-168.983167 44.530218-86.872534-1.287001-167.052666-50.57912-211.840284-128.442651-90.347436-156.756662-23.166009-388.931554 64.864826-515.958505 42.985817-62.162125 94.337137-132.046252 161.647264-129.600951 64.864826 2.574001 89.317835 41.956217 167.696167 41.956217s100.38604-41.956217 169.111867-40.669216c69.755428 1.287001 114.028245 63.449125 156.756662 125.86865 49.42082 72.200729 69.755428 142.084856 70.913728 145.559758C957.14228 145.550002 822.522026 197.030023 821.235026 351.984884L821.235026 351.984884 821.235026 351.984884zM692.277575 732.550935c35.778614 43.371917 59.845524 103.474841 53.281821 163.449065-51.48002-2.059201-113.899545-34.234214-150.83646-77.477431C561.647023 780.041254 532.560811 718.78003 540.411514 660.092806 597.811737 655.588305 656.49896 689.307718 692.277575 732.550935L692.277575 732.550935 692.277575 732.550935z"  horiz-adv-x="1084" />
+
+    
+    <glyph glyph-name="at" unicode="&#59015;" d="M514.162246 831.556269c-246.201331 0-446.51045-200.783932-446.51045-447.571618 0-246.772336 201.037712-447.539896 448.157973-447.539896 50.29857 0 99.615788 8.224312 146.523121 24.436552 18.414395 6.370081 31.060413 12.423961 31.472805 12.630668 7.194866 3.217275 12.614296 9.049097 15.213493 16.401552 2.63092 7.305383 2.155083 15.133675-1.299599 22.043039l-2.883677 5.831822c-7.131421 14.262842-24.974811 20.569478-40.156582 13.850449-0.031722-0.031722-5.8001-3.02694-20.094664-8.082072-41.075511-14.627139-84.21196-22.059412-128.235616-22.059412-210.92592 0-382.487298 171.57775-382.487298 382.487298S305.423131 766.487298 516.349051 766.487298c210.894198 0 382.455575-171.5931 382.455575-382.423853-0.887206-51.868321-13.882172-100.486622-36.606733-136.855948-20.664645-33.104979-46.939055-51.994188-72.199369-51.994188-0.317225 0-0.601704 0-0.887206 0-45.829791 0.792039-75.433016 68.586075-75.433016 172.718737l0 185.269587c0 5.53097-1.426489 9.635451-4.373611 12.550851-4.944616 4.944616-12.360516 4.817726-21.267373 4.864798l-2.472308-0.016373-9.223059 0.016373c-7.701402-0.031722-13.469779 0.063445-17.495466-3.945869-3.645017-3.613294-4.119831-9.096169-4.119831-13.469779l0-31.060413c-45.196365 36.100196-80.440054 59.474556-131.9758 60.378136-1.045819 0.016373-2.059915 0.031722-3.074012 0.031722-108.74368 0-198.470237-99.218746-200.657043-222.779899-2.155083-124.701117 84.845387-227.723491 193.969737-229.625818 1.045819-0.01535 2.059915-0.031722 3.074012-0.031722 63.293535 0 122.276904 34.087353 159.992901 92.103698 24.373107-60.251246 61.519122-91.216491 110.48637-92.071975 0.697895-0.01535 1.394766-0.01535 2.060939-0.01535 33.945113 0 66.716494 14.610766 94.924953 42.328038 47.63695 46.796816 76.066443 124.796284 76.066443 208.643947l0 2.883677C959.595154 630.772336 759.761873 831.556269 514.162246 831.556269zM646.73975 354.651578c0-92.230588-58.475809-167.282934-130.390699-167.282934s-130.390699 75.052347-130.390699 167.282934c0 92.246961 58.475809 167.298284 130.390699 167.298284S646.73975 446.897515 646.73975 354.651578z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="fire" unicode="&#59222;" d="M890.059904 352.19948999999997C845.890699 458.956706 840.554889 548.4951550000001 857.396326 618.42714 859.144623 625.686731 860.991676 631.9776790000001 862.858846 637.425182 863.763607 640.064841 865.906573 645.659889 866.16406 646.532651L880.890349 696.448108 833.062903 675.9309969999999C832.106692 675.5208 830.618069 674.894716 827.426684 673.550492 824.667648 672.380966 822.310677 671.354022 819.868514 670.244809 813.291441 667.2575449999999 807.049466 664.090938 800.697749 660.4128450000001 784.089623 650.795565 768.486253 638.656896 753.86285 623.033596 727.630498 595.007563 706.526618 557.766355 691.78157 509.713231 675.041103 455.157161 671.516484 411.46006 673.004574 347.939834 673.477918 327.73476900000003 673.463923 322.197583 672.83965 318.324215 673.779618 324.156339 684.455526 333.67819899999995 696.104608 329.19567600000005 693.056849 330.36844199999996 685.695898 339.012828 676.314007 361.368339 660.550914 398.92921 646.834249 460.170272 636.817284 549.350468 625.445924 650.588768 630.103925 734.7280519999999 644.646978 801.338628 647.677924 815.221065 650.899934 827.082435 654.086773 836.904609 655.91465 842.538316 657.254607 846.094657 657.880284 847.554385L678.645286 896 628.243642 880.578031C617.409833 877.263087 599.94569 869.52239 578.105438 855.845223 542.547644 833.577626 507.199569 802.385036 474.400401 760.836776 447.596676 726.883228 423.611383 687.30061 403.118547 641.7016189999999 378.907516 587.829195 363.003277 542.798944 353.158029 503.238462 349.274261 487.632585 346.433259 473.323627 344.1945 458.925156 343.334411 453.39353 342.592734 448.063234 341.804612 441.911844 341.502524 439.553997 340.356619 430.329551 340.073506 428.145504 337.596047 409.033293 335.848224 404.35337 329.235273 398.312868 336.081933 404.566848 343.232634 404.098227 346.608002 402.086756 344.852318 403.133013 341.598345 406.493651 337.991853 411.887149 327.030897 428.279226 317.980358 454.883162 313.690598 489.339595 311.250185 508.941598 310.203772 539.08627 310.370048 576.545325 310.480474 601.422138 311.113088 628.122479 312.099068 654.977888 312.481453 665.393013 312.891081 675.105466 313.30045 683.8491750000001 313.545346 689.079919 313.735044 692.813105 313.84201 694.783403L317.55517 763.179488 271.360516 712.604139C270.467691 711.626645 268.852992 709.837042 266.618705 707.326295 262.927895 703.178805 258.823678 698.493751 254.407949 693.3614689999999 241.78797 678.693606 229.164348 663.340425 217.341267 648.004036 211.724185 640.717803 206.411389 633.591345 201.450577 626.6638379999999 176.017063 591.147305 156.617347 555.4025280000001 138.122768 512.155497 90.841957 401.595812 76.97672 299.64870599999995 99.261816 188.13489300000003 126.80821 50.29373899999996 188.553235-37.64422200000001 278.8297-84.690336 344.19104-118.75233700000001 408.837235-128 507.940695-128 525.713007-128 557.977207-125.567138 590.857378-120.46215900000004 641.152493-112.65333099999998 687.496192-99.78932299999997 726.063273-80.59104400000001 738.155853-74.57148800000004 743.07901-59.88870199999997 737.059454-47.79612199999997 731.039898-35.70354299999997 716.357111-30.780384000000026 704.264531-36.79993999999999 670.855859-53.43041900000003 629.092954-65.02289699999994 583.352478-72.12456999999995 552.984316-76.83953499999996 523.228215-79.08327499999996 507.940695-79.08327499999996 416.16215-79.08327499999996 357.934257-70.75375399999996 301.436271-41.310745999999995 224.830174-1.3887230000000272 171.977796 73.88423 147.230072 197.72094500000003 126.99711 298.965952 139.514783 391.004811 183.099329 492.921284 200.282663 533.1021499999999 218.020237 565.784358 241.22153 598.183718 245.831691 604.6215589999999 250.802959 611.289899 256.082244 618.137961 267.31885 632.713596 279.402035 647.409487 291.488864 661.457681 298.732051 669.8762429999999 304.338773 676.1767130000001 307.478705 679.614406L264.997214 697.435142C264.883874 695.347445 264.688038 691.493511 264.43725 686.13688 264.020474 677.234965 263.603959 667.359281 263.215279 656.7726250000001 262.21142 629.430212 261.566827 602.224414 261.453805 576.7624579999999 261.278897 537.3588179999999 262.385015 505.49418 265.148621 483.296209 276.058157 395.668083 322.627019 326.024497 362.226031 362.19561799999997 379.341732 377.829698 384.756649 392.328523 388.584361 421.857186 397.932742 493.974714 407.332926 531.746825 447.736538 621.64966 466.587287 663.594818 488.484326 699.731218 512.795234 730.526996 542.034492 767.565749 573.156162 795.028785 604.068111 814.386984 614.696751 821.043029 624.472062 826.201428 633.124687 830.036563 638.02329 832.207788 641.258688 833.404991 642.556233 833.802016L612.91959 866.825663C608.658554 856.884484 602.686705 838.478616 596.856038 811.772799 581.186705 740.003594 576.231674 650.498985 588.206246 543.890345 607.295279 373.94226100000003 638.819345 298.82556999999997 678.537329 283.542234 701.302332 274.78234499999996 717.731637 289.43566899999996 721.133156 310.5407 722.475759 318.870999 722.489387 324.26340300000004 721.907881 349.08549100000005 720.532565 407.791853 723.691247 446.952173 738.546223 495.36355 751.151827 536.44438 768.544047 567.135763 789.576147 589.605967 809.230566 610.60429 821.725461 617.839716 852.347733 630.9761169999999L842.705318 653.453557 819.246577 660.374464C822.235501 670.505564 813.450321 644.87463 809.839253 629.8801189999999 790.647573 550.1890470000001 796.611315 450.1135 844.8591 333.498332 883.105728 241.056017 874.587669 126.06492400000002 824.002925 61.39712899999995 815.680378 50.75754500000005 817.558709 35.38570000000004 828.198295 27.063153000000057 838.837879 18.740607999999952 854.209724 20.618939999999952 862.532269 31.258523999999966 924.762731 110.81426299999998 934.658528 244.404363 890.059904 352.19948999999997Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="set" unicode="&#59158;" d="M466.496-126.62400000000002l-1.056 0.064c-25.184 2.08-47.456 22.368-51.744 47.232l-17.344 102.4c-0.672 4.064-6.624 11.04-10.56 12.416l-30.336 12.416c-5.44 2.496-15.424 0.8-17.472-0.64l-84.992-60.16c-19.584-14.016-51.456-12.736-70.08 3.168l-64.288 64c-17.952 20.48-19.488 50.592-4.736 71.296l60.416 84.672c2.176 3.072 2.784 11.52 1.024 15.04l0 0c0 0-1.664 3.104-7.264 16.608-6.176 14.848-6.816 17.44-6.816 17.44-0.992 3.04-7.456 8.672-11.36 9.376l-102.56 17.248c-25.152 4.288-45.44 26.624-47.168 52L0 428.288c2.112 27.36 22.496 49.6 47.52 53.728l102.528 17.344c4.128 0.672 11.008 6.56 12.416 10.496l12.608 30.336c2.368 4.992 1.6 14.112-0.8 17.504L113.984 642.24C99.36 662.88 100.704 692.896 117.056 712.192l64.416 64.224c20.672 18.208 51.296 18.784 71.36 4.64l84.992-60.16c1.952-1.376 13.28-2.016 15.04-1.056 0.384 0.192 2.528 1.344 16.704 7.168 14.24 5.92 16.576 6.592 16.576 6.592 3.84 1.184 9.504 7.648 10.144 11.424l17.44 102.4c4.32 25.152 26.752 45.376 52.128 47.104l90.528 0.064c27.328-2.112 49.632-22.368 53.952-47.232l17.344-102.432c0.672-4.064 6.656-11.04 10.624-12.48l30.304-12.352c6.24-2.784 15.456-0.8 17.44 0.608l85.024 60.16c19.52 14.016 51.392 12.704 70.08-3.136l64.288-64.032c17.952-20.48 19.456-50.56 4.736-71.264l-60.416-84.672c-2.208-3.136-2.848-11.616-1.056-15.04 0.16-0.352 1.376-2.56 7.232-16.672 5.856-14.112 6.592-16.512 6.592-16.512 1.248-4.032 7.712-9.6 11.648-10.304l102.56-17.248c25.152-4.224 45.44-26.592 47.168-52l0.096-90.304c-2.112-27.392-22.528-49.6-47.552-53.728l-102.528-17.376c-4.128-0.672-10.944-6.496-12.32-10.432l-12.736-30.432c-2.336-4.928-1.568-14.112 0.832-17.472l60.288-84.512c14.624-20.736 13.216-50.816-3.232-70.048l-64.192-64.096c-11.328-9.92-24.64-14.72-38.784-14.72l0 0c-11.904 0-23.52 3.552-32.704 10.016l-84.992 60.16c-1.952 1.408-13.312 2.016-15.072 1.056-0.288-0.16-2.432-1.312-16.608-7.2-14.08-5.792-16.384-6.496-16.384-6.496-4.16-1.28-9.792-7.776-10.432-11.52l-17.408-102.4c-4.352-25.152-26.72-45.344-52.032-47.104L466.496-126.62400000000002zM347.84 100.60799999999995c10.368 0 20.192-2.112 28.48-6.112l27.648-11.296c20.416-7.072 38.976-28.992 42.848-51.584l17.344-102.336c0.288-1.6 3.136-4.32 5.056-4.832l87.296 0.064c-0.032 0.064 3.04 2.944 3.328 4.672l17.408 102.368c3.872 22.656 23.328 44.832 45.28 51.584 0 0 0 0 0 0-0.096 0 2.976 1.152 12.448 5.056 9.472 3.936 12.384 5.248 13.12 5.568 18.208 9.6 49.44 8.032 67.776-4.96l84.928-60.16c0.192-0.128 1.312-0.64 3.104-0.64l0 0c2.048 0 3.52 0.672 3.872 0.96l61.536 61.408 0 0c-0.16 0 0.064 4.416-0.992 5.952l-60.224 84.448c-13.248 18.624-15.68 47.168-5.792 67.872l11.648 27.84c6.944 19.968 29.408 38.912 51.68 42.496l102.464 17.376c1.824 0.384 4.736 3.648 4.864 5.408L972.8 428.288l0 0c-0.096 0-2.88 3.072-4.576 3.424l-102.72 17.28c-23.168 4.032-44.896 22.976-51.776 45.056l0 0c-0.032 0-1.216 3.04-5.12 12.512-3.968 9.568-5.28 12.512-5.632 13.248-10.24 19.36-8.288 48.736 4.96 67.456L868.448 672c0.96 1.408 0.736 5.6-0.384 6.912l-61.408 61.184c0.704-0.8-0.768-0.192-2.848-0.192-1.728 0-2.784-0.416-3.008-0.576l-85.024-60.16c-17.824-12.8-47.776-15.36-68-5.664l-27.712 11.296c-20.512 7.2-39.04 29.088-42.88 51.584l-17.344 102.336c-0.288 1.76-3.616 4.704-5.504 4.864L467.616 843.52c0-0.064-3.104-2.944-3.392-4.672l-17.408-102.336c-3.84-22.624-23.264-44.8-45.216-51.584 0-0.032-3.008-1.184-12.416-5.088-9.568-3.936-12.512-5.248-13.248-5.568-17.984-9.568-49.344-8.032-67.744 4.992L223.264 739.36c-0.416 0.32-6.176 0.288-6.848-0.224L154.688 677.6320000000001c0 0 0 0 0 0 0.224 0 0.032-4.384 1.056-5.856L216 587.264c13.312-18.752 15.744-47.296 5.76-67.968l-11.52-27.648c-6.976-20.032-29.472-38.944-51.776-42.624L55.968 431.68c-1.824-0.384-4.704-3.648-4.832-5.408l0.096-86.56 0 0c0.096 0 2.912-3.104 4.608-3.424l102.656-17.28c23.04-4 44.704-22.912 51.712-44.928 0.256-0.736 1.44-3.84 5.088-12.64 3.68-8.832 5.024-11.84 5.472-12.736 10.592-20.288 8.672-48.96-4.672-67.904l-60.512-84.768c-0.96-1.408-0.736-5.632 0.384-6.912l61.408-61.184c-0.736 0.8 0.736 0.224 2.816 0.192 1.728 0 2.784 0.416 3.008 0.576l84.992 60.16C318.624 96.32000000000005 333.088 100.60799999999995 347.84 100.60799999999995zM512.032 133.856c-138.336 0-250.848 112.224-250.848 250.176 0 137.92 112.544 250.144 250.848 250.144s250.848-112.224 250.848-250.144C762.88 246.08000000000004 650.336 133.856 512.032 133.856zM512.032 583.136c-110.08 0-199.648-89.312-199.648-199.104s89.568-199.136 199.648-199.136 199.648 89.344 199.648 199.136S622.112 583.136 512.032 583.136z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="fonts-u" unicode="&#58950;" d="M0-49.23076900000001L945.230769-49.23076900000001 945.230769-128 0-128 0-49.23076900000001ZM0 896L407.076943 896 407.076943 834.065644 319.153861 827.872177 299.076923 809.911217 299.076923 365.841959C299.076923 281.19796199999996 317.076716 220.709337 353.076933 184.37435100000005 389.077071 148.03936499999998 448.153442 129.87210800000003 530.307702 129.87210800000003 606.000364 129.87210800000003 660.807522 149.17482299999995 694.730752 187.78072599999996 728.653982 226.38662899999997 745.61536 289.66226700000004 745.61536 377.60953099999995L745.61536 804.956475 724.153817 826.633531 633.461524 834.065644 633.461524 896 955.384596 896 955.384596 834.065644 868.846119 826.633531 849.461563 804.956475 849.461563 364.60331299999996C849.461563 246.92743900000005 819.923338 161.66533900000002 760.846178 108.81441500000005 701.76894 55.96348999999998 606.462188 29.53846199999998 474.923087 29.53846199999998 406.153531 29.53846199999998 345.807951 38.51886300000001 293.884613 56.47990200000004 241.961275 74.44093999999996 201.230887 100.143419 171.692347 133.58820400000002 149.076834 160.01362700000004 133.038474 190.25793999999996 123.57695 224.32200899999998 114.115348 258.386078 109.384625 307.21047599999997 109.384625 370.796702L109.384625 809.911217 89.307687 827.872177 0 834.065644 0 896Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="triangle-d" unicode="&#58917;" d="M773.128299 88.65234199999998M889.696178 575.195553L158.862147 575.195553 524.357446 209.64704300000005 889.696178 575.195553Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="tips" unicode="&#59138;" d="M967.280184 578.537671c-24.915459 58.887178-60.544935 111.76755-105.96745 157.161413-45.393863 45.393863-98.273211 81.051991-157.160389 105.96745-60.988026 25.803689-125.735679 38.853913-192.494129 38.853913-66.729797 0-131.504056-13.0799-192.494129-38.853913-58.887178-24.916483-111.766526-60.544935-157.160389-105.96745-45.393863-45.393863-81.051991-98.274234-105.96745-157.161413-25.803689-60.988026-38.884612-125.734656-38.884612-192.464453s13.0799-131.50508 38.884612-192.464453c24.915459-58.887178 60.544935-111.737874 105.96745-157.161413 45.393863-45.393863 98.273211-81.051991 157.160389-105.96745 60.988026-25.803689 125.735679-38.853913 192.494129-38.853913 66.729797 0 131.504056 13.0799 192.494129 38.853913 58.887178 24.916483 111.766526 60.544935 157.160389 105.96745 45.393863 45.393863 81.051991 98.274234 105.96745 157.161413 25.803689 60.988026 38.853913 125.734656 38.853913 192.464453S993.084896 517.549645 967.280184 578.537671zM511.687892-55.138552000000004c-243.302305 0-441.241446 197.909465-441.241446 441.21177S268.385587 827.284989 511.687892 827.284989c243.273652-0.029676 441.210747-197.938118 441.210747-441.21177S754.990197-55.138552000000004 511.687892-55.138552000000004zM511.657192 573.565427m-45.511543 0a44.475 44.475 0 1 1 91.023086 0 44.475 44.475 0 1 1-91.023086 0ZM542.729885 184.14011300000004c0-17.162892-13.906731-31.071669-31.070646-31.071669l0 0c-17.163915 0-31.070646 13.907755-31.070646 31.071669L480.588593 426.998303c0 17.162892 13.906731 31.071669 31.070646 31.071669l0 0c17.163915 0 31.070646-13.907755 31.070646-31.071669L542.729885 184.14011300000004z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="picture" unicode="&#58954;" d="M765.376 615.424c0 0 103.04 1.024 103.04-100.992 0 0 9.536-98.752-103.04-100.928 0 0-100.864-2.176-99.84 100.928C665.536 514.496 664.448 605.8879999999999 765.376 615.424ZM968.32 770.56c0 0 54.208-4.224 54.208-52.032l0-712.832c0 0-3.2-51.008-54.208-52.096L968.32 770.56ZM1.472 5.631999999999948c0 0 2.176-52.096 52.096-52.096L968.32-46.464000000000055l0 150.848-99.712 0-203.072 206.144-153.024-153.984L304.32 413.568l-205.056-307.072-45.632-1.024L52.48 718.4639999999999 1.472 718.4639999999999 1.472 5.631999999999948ZM968.32 770.56L53.568 770.56c0 0-52.096 1.088-52.096-52.032L968.32 718.528 968.32 770.56Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="more-vertical" unicode="&#58993;" d="M511.998465 623.681848c40.525995 0 73.386404 35.771715 73.386404 79.892585s-32.860409 79.892585-73.386404 79.892585c-40.524972 0-73.384357-35.771715-73.384357-79.892585S471.47247 623.681848 511.998465 623.681848L511.998465 623.681848zM511.998465 463.893608c-40.524972 0-73.384357-35.772738-73.384357-79.893608 0-44.12087 32.859385-79.892585 73.384357-79.892585 40.525995 0 73.386404 35.772738 73.386404 79.892585C585.384869 428.12087 552.52446 463.893608 511.998465 463.893608L511.998465 463.893608zM511.998465 144.320199c-40.524972 0-73.384357-35.733852-73.384357-79.894631 0-44.119847 32.859385-79.893608 73.384357-79.893608 40.525995 0 73.386404 35.772738 73.386404 79.893608C585.383846 108.58634600000005 552.52446 144.320199 511.998465 144.320199L511.998465 144.320199z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="bluetooth" unicode="&#59017;" d="M844.799642 221.19607699999995L538.533306 374.84141l307.696917 177.029926c10.583033 5.006014 17.398252 15.59621 17.569144 27.302833s-6.332219 22.491247-16.764825 27.804253L475.584626 830.045869c-9.517771 4.846378-20.869307 4.39817-29.974685-1.181919-9.105379-5.581112-14.656815-15.493879-14.656815-26.174126l0-288.760636L210.662931 699.284733c-12.974499 10.915607-32.339546 9.248641-43.255153-3.724835-10.915607-12.973476-9.248641-32.339546 3.724835-43.255153L430.953126 433.687656l0-102.83511L171.558307 120.428046c-13.166881-10.68127-15.181771-30.013571-4.500501-43.180452 6.068206-7.480368 14.924921-11.360745 23.859407-11.360745 6.794753 0 13.634532 2.245134 19.322068 6.859221l220.714867 179.046862 0-283.065937c0-10.689457 5.561669-20.61041 14.680351-26.188452 4.903683-2.99931 10.455119-4.510734 16.019859-4.510734 4.78498 0 9.580193 1.118474 13.980409 3.368724l371.449917 224.085638c10.664897 5.456269 17.182334 16.618493 16.691147 28.589129C863.284645 206.04091200000005 855.875908 216.63110800000004 844.799642 221.19607699999995zM763.458055 580.639542L492.351498 420.917818l0 21.60711c0.563842 3.368724 0.558725 6.801916 0 10.153244L492.351498 752.604102 763.458055 580.639542zM492.351498 18.915047999999956L492.351498 311.51001199999996c0.558725 3.347235 0.562818 6.777357 0 10.146081l0 5.809309 267.472797-137.65822L492.351498 18.915047999999956z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="flag" unicode="&#58988;" d="M878.368178 798.272211c-11.363815 4.799306-24.470321 2.360767-33.31578-6.245238-0.36532-0.350994-37.162388-35.304064-95.163383-56.05262-75.462692-26.993794-150.763702-18.409279-223.812415 25.517163-38.347376 23.060205-81.875752 40.665165-129.376603 52.327786-37.582967 9.228175-77.742619 14.777565-119.363552 16.496719-70.805626 2.925632-121.493052-6.224772-123.615389-6.615675-14.56574-2.682086-25.140587-15.380292-25.140587-30.191626L128.58047-31.312913999999978c0-16.954137 13.745049-30.699186 30.699186-30.699186s30.699186 13.745049 30.699186 30.699186L189.978842 266.68306099999995c15.562441 5.250584 47.994084 14.447037 91.40171 17.48728 35.985586 2.51938 72.440869 0.378623 108.35073-6.363941 44.847417-8.420787 89.059362-24.102954 131.409912-46.611597 46.26879-24.591071 93.776803-41.069371 141.203976-48.977481 38.270629-6.380314 76.541257-7.219425 113.740484-2.491751 64.277956 8.16803 103.877859 30.461779 105.532545 31.406291 9.56689 5.464455 15.471366 15.637142 15.471366 26.656103L897.089565 769.958352C897.091612 782.298402 889.73711 793.470859 878.368178 798.272211zM835.69324 257.496841c-14.58416-5.755074-38.82526-13.530155-70.319555-17.225313-30.990828-3.635807-62.940494-2.676969-94.952582 2.851954-40.201607 6.943133-80.731696 21.171182-120.464629 42.289152-48.455595 25.753547-99.208513 43.61945-150.848637 53.101405-29.29214 5.378497-58.896388 8.079002-88.407516 8.079002-12.228509 0-24.443715-0.464581-36.609803-1.39272-34.879392-2.663666-63.618946-8.741082-84.111676-14.355963L189.978842 766.569162c19.971867 2.003634 50.446949 3.910053 86.392626 2.334161 58.186214-2.554172 143.250588-15.041578 218.064504-60.029188 61.32674-36.877909 119.196753-49.491181 169.691797-49.488111 42.293245 0.002047 79.416747 8.854669 109.019972 19.711947 24.269753 8.901741 45.327348 19.747763 62.544475 30.179346L835.692217 257.496841z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="loading" unicode="&#58941;" d="M511.999488 756.654348m-70.608128 0a69 69 0 1 1 141.216255 0 69 69 0 1 1-141.216255 0ZM236.047576 639.997442m-68.561515 0a67 67 0 1 1 137.123031 0 67 67 0 1 1-137.123031 0ZM125.530506 382.12428m-62.421678 0a61 61 0 1 1 124.843356 0 61 61 0 1 1-124.843356 0ZM227.861126 100.71507499999996m-54.235229 0a53 53 0 1 1 108.470457 0 53 53 0 1 1-108.470457 0ZM514.166851-16.84438799999998m-47.192835 0a46.118 46.118 0 1 1 94.385671 0 46.118 46.118 0 1 1-94.385671 0ZM804.730553 91.450061m-33.834596 0a33.064 33.064 0 1 1 67.669192 0 33.064 33.064 0 1 1-67.669192 0ZM935.55411 383.395226m-23.969924 0a23.424 23.424 0 1 1 47.939849 0 23.424 23.424 0 1 1-47.939849 0ZM856.723717 634.80007m-17.135262 0a16.745 16.745 0 1 1 34.270525 0 16.745 16.745 0 1 1-34.270525 0Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="fonts-i" unicode="&#58948;" d="M897.948 834.255l0-64.322-128.65 0L447.674-1.9329999999999927l128.65 0 0-64.32L126.052-66.25300000000004l0 64.32 128.65 0 321.622 771.866-128.65 0L447.674 834.255 897.948 834.255z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="refresh-1" unicode="&#58982;" d="M688.146 736l-192 128v-256l192 128.001zM496.146 767.7090000000001c-231.174-8.416-416-198.479-416-431.709 0-238.587 193.413-432 432-432 233.23 0 423.293 184.826 431.709 416h-64.05c-8.377-195.817-169.778-352-367.658-352-203.241 0-368 164.759-368 368 0 197.88 156.183 359.282 352 367.658v64.051z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="rmb" unicode="&#58974;" d="M511.998465 896C229.23338 896 0.004605 666.769178 0.004605 384.001023c0-282.773272 229.227752-512.001023 511.99386-512.001023 282.769178 0 511.994883 229.227752 511.994883 512.001023C1023.994372 666.769178 794.767644 896 511.998465 896zM511.998465-91.59690499999999c-262.660188 0-475.589742 212.930577-475.589742 475.597929 0 262.663258 212.929554 475.594859 475.589742 475.594859 262.663258 0 475.590765-212.9316 475.590765-475.594859C987.590254 121.33469500000001 774.662747-91.59690499999999 511.998465-91.59690499999999zM738.742652 301.137781L544.432155 301.137781l0 69.780273 194.310497 0c17.835204 0 32.249495 14.43885 32.249495 32.220842 0 17.784038-14.414291 32.19526-32.249495 32.19526L589.7462 435.334155l149.620669 209.579249c8.916067 15.397688 3.63069 35.099403-11.82021 43.988864-15.398712 8.891508-35.097356 3.629667-44.017516-11.793604L512.187777 437.098335 340.84334 677.108664c-8.864902 15.423271-28.617781 20.685111-44.016493 11.793604-15.395642-8.889461-20.685111-28.590152-11.82021-43.988864l149.622716-209.579249L285.628808 435.334155c-17.781992 0-32.245402-14.411221-32.245402-32.19526 0-17.781992 14.46341-32.220842 32.245402-32.220842l194.310497 0 0-69.780273L285.628808 301.137781c-17.781992 0-32.245402-14.413268-32.245402-32.19526s14.46341-32.220842 32.245402-32.220842l194.310497 0 0-132.435265c0-17.780969 14.46341-32.19526 32.248472-32.19526 17.835204 0 32.245402 14.414291 32.245402 32.19526L544.433178 236.72065499999997l194.310497 0c17.835204 0 32.249495 14.43885 32.249495 32.220842S756.577856 301.137781 738.742652 301.137781"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="addition" unicode="&#58916;" d="M544 768L480 768 480 416 128 416 128 352 480 352 480 0 544 0 544 352 895.936 352 895.936 416 544 416Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="home" unicode="&#59022;" d="M824.084343-40.42033900000001H232.898863c-74.604138 0-85.85232 28.334325-85.852321 49.997718l-0.584307 5.314029V447.645552h48.806589v-402.916582c0-25.547863 13.548574-36.343743 37.629015-36.343743h568.020898c25.928532 0 27.978215 6.220678 27.978215 37.84391V447.585177l48.806589 0.118704c0.022513-14.346753 0-382.76666 0-433.098999 0-38.130436-12.726859-54.765301-51.858088-54.765301l-1.76111-0.25992zM1012.470921 493.103884C849.773422 615.120868 687.101505 737.137853 524.404006 859.153814c-6.207375 4.659113-18.433838 4.659113-24.641213 0C337.077573 737.137853 174.393377 615.120868 11.696902 493.103884c-24.856108-18.635429-0.572028-61.044308 24.642236-42.13361A15995638.709915 15995638.709915 0 0 1 512.025071 807.737794c0.988514-0.715291 1.644453-1.144056 2.823302-2.037403 18.040888-13.524015 36.057217-27.036773 54.073546-40.560788 58.291614-43.718711 116.583229-87.437421 174.874843-131.143852 81.33647-61.008492 162.696476-122.015961 244.033969-183.024454 25.212218-18.911722 49.496298 23.497157 24.64019 42.132587z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="time" unicode="&#59021;" d="M511.98464 829.44c-118.97856 0-230.83008-46.35136-314.95168-130.4832C112.90624 614.84032 66.56 502.95808 66.56 384.00512c0-118.9632 46.34624-230.84544 130.47296-314.9568C281.15456-15.093759999999975 393.00608-61.440000000000055 511.98464-61.440000000000055c118.98368 0 230.84032 46.34624 314.9824 130.48832C911.09376 153.15967999999998 957.44 265.02144 957.44 384.00512c0 118.97856-46.34624 230.8352-130.47296 314.95168C742.82496 783.0886399999999 630.96832 829.44 511.98464 829.44z m275.58912-721.02912c-73.61024-73.63584-171.47904-114.18624-275.58912-114.18624s-201.97376 40.5504-275.57888 114.18624c-73.63584 73.61024-114.16064 171.47904-114.16064 275.59424 0 104.11008 40.54528 201.97376 114.18112 275.58912 73.60512 73.63072 171.47392 114.176 275.584 114.176s201.97376-40.54528 275.584-114.176c73.63584-73.61536 114.18112-171.47904 114.18112-275.58912 0-104.1152-40.56576-201.984-114.2016-275.59424zM519.1168 340.20863999999995V628.08064a27.8528 27.8528 0 0 1-27.84256 27.84768 27.8528 27.8528 0 0 1-27.84256-27.84768v-306.23232a27.81184 27.81184 0 0 1 16.88064-25.58976M734.70464 321.84831999999994a31.0784 31.0784 0 0 0-31.07328-31.0784H496.44544a31.08864 31.08864 0 0 0-31.07328 31.0784 31.09376 31.09376 0 0 0 31.07328 31.0784h207.18592a31.08864 31.08864 0 0 0 31.07328-31.0784z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="user" unicode="&#59248;" d="M611.2 342.4c70.4 54.4 115.2 140.8 115.2 230.4 0 156.8-128 288-284.8 288s-284.8-128-284.8-284.8c0-92.8 44.8-182.4 115.2-236.8C108.8 272 0 105.60000000000002 0-80c0-9.6 9.6-19.2 19.2-19.2h848c9.6 0 19.2 9.6 19.2 19.2 0 188.8-112 355.2-275.2 422.4z m-576-396.8C44.8 115.20000000000005 156.8 268.79999999999995 320 320c6.4 3.2 12.8 9.6 12.8 16s-3.2 16-9.6 19.2c-76.8 41.6-128 131.2-128 224 0 134.4 112 246.4 246.4 246.4s246.4-112 246.4-249.6c0-89.6-51.2-176-128-220.8-6.4-3.2-9.6-9.6-9.6-19.2 0-6.4 6.4-12.8 12.8-16 160-51.2 275.2-204.8 281.6-377.6H35.2zM812.8 361.6c54.4 41.6 86.4 108.8 86.4 176 0 89.6-54.4 172.8-134.4 208-9.6 3.2-22.4 0-25.6-9.6-3.2-9.6 0-22.4 9.6-25.6 67.2-28.8 112-99.2 112-172.8 0-67.2-38.4-131.2-96-163.2-6.4-3.2-9.6-9.6-9.6-19.2 0-6.4 6.4-12.8 12.8-16 131.2-41.6 217.6-160 217.6-297.6 0-9.6 9.6-19.2 19.2-19.2s19.2 9.6 19.2 19.2c-3.2 140.8-86.4 262.4-211.2 320z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="notice" unicode="&#58983;" d="M544 798.976V864h-64v-65.024C289.536 786.304 160 658.624 160 416v-288h64V416c0 192 115.456 320 288 320 180.544 0 288-128 288-320v-288h64V416c0 242.88-122.496 370.56-320 382.976zM672 64a160 160 0 1 0-320 0h64a96 96 0 0 1 192 0h64zM64 128h896v-64H64v64z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="chrome" unicode="&#59018;" d="M515.436 583.685H914.285C840.842 730.955 688.748 832.132 513 832.132c-141.284 0-267.274-65.395-349.42-167.546l151.66-262.682c8.535 102.325 95.704 181.781 200.196 181.781zM514.218 550.803c-91.476 0-165.631-74.155-165.631-165.631s74.155-165.631 165.631-165.631c52.7 0 99.615 24.642 129.95 62.999l1.428 2.474 0.355-0.205c21.252 27.852 33.898 62.624 33.898 100.363 0 84.774-63.702 154.626-145.841 164.413l-6.393 0.632c-4.424 0.354-8.882 0.586-13.397 0.586zM929.561 549.585H627.443c52.209-36.066 86.506-96.297 86.506-164.413 0-45.547-18.268-81.598-41.12-121.192L483.898-63.257c9.624-0.617 19.322-0.966 29.102-0.966 247.521 0 448.177 200.656 448.177 448.177 0 58.508-11.225 114.391-31.616 165.631zM514.218 185.441c-83.583 0-144.927 54.804-185.034 124.651l-0.235-0.136-187.482 324.727C93.081 563.124 64.823 476.84 64.823 383.954c0-225.02 165.839-411.288 381.958-443.298l152.278 263.752c-25.769-12.143-54.518-18.967-84.841-18.967z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="edge" unicode="&#59019;" d="M854.794 669.297C797.923 743.783 683.626 823.59 548.62 830.822 136.707 852.889 85.742 435.448 85.742 435.448c55.449 53.038 58.01 97.116 163.936 154.293C673.983 818.768 676.394 476.432 676.394 476.432H346.111c-7.232 65.092 62.681 137.417 62.681 137.417-202.509-98.844-216.974-284.477-216.974-284.477s-28.93-279.655 219.385-364.034 452.029 42.189 452.029 42.189V193.16c-59.065-32.546-102.292-54.405-153.087-63.887-361.623-67.503-364.034 188.044-364.034 188.044h585.83c0 0.001 39.075 199.761-77.147 351.98z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="login-weibo" unicode="&#58997;" d="M411.270737 288.350316c-17.973895 7.504842-41.189053-0.229053-52.264421-17.542737-11.223579-17.394526-5.955368-38.103579 11.870316-46.201263 18.108632-8.232421 42.132211-0.417684 53.342316 17.421474C435.253895 260.05557899999997 429.446737 280.62989500000003 411.270737 288.350316zM455.545263 306.64757899999995c-6.885053 2.721684-15.508211-0.579368-19.550316-7.329684-3.920842-6.790737-1.751579-14.524632 5.146947-17.367579 7.019789-2.883368 16.006737 0.458105 20.048842 7.370105C465.071158 296.259368 462.551579 304.087579 455.545263 306.64757899999995zM427.52 426.684632c-115.968-11.439158-203.924211-82.216421-196.378947-158.073263 7.531789-75.910737 107.654737-128.161684 223.649684-116.749474 115.994947 11.439158 203.924211 82.216421 196.392421 158.140632C643.664842 385.859368 543.541895 438.110316 427.52 426.684632zM529.300211 247.70021099999997c-23.673263-53.355789-91.769263-81.798737-149.530947-63.232-55.754105 17.933474-79.373474 72.811789-54.945684 122.246737 23.956211 48.464842 86.352842 75.870316 141.541053 61.561263C523.506526 353.562947 552.663579 299.85684200000003 529.300211 247.70021099999997zM512 896C229.241263 896 0 666.772211 0 384c0-282.758737 229.241263-512 512-512 282.772211 0 512 229.241263 512 512C1024 666.772211 794.772211 896 512 896zM455.531789 101.02568399999996c-145.354105 0-293.941895 70.197895-293.941895 185.667368 0 60.362105 38.386526 130.182737 104.474947 196.069053 88.252632 87.929263 191.164632 127.986526 229.874526 89.397895 17.084632-17.003789 18.741895-46.457263 7.760842-81.623579-5.726316-17.690947 16.666947-7.895579 16.666947-7.936 71.343158 29.763368 133.564632 31.514947 156.321684-0.862316 12.139789-17.246316 10.954105-41.472-0.215579-69.510737-5.173895-12.921263 1.589895-14.928842 11.466105-17.879579 40.178526-12.422737 84.924632-42.455579 84.924632-95.380211C772.837053 211.36168399999997 646.090105 101.02568399999996 455.531789 101.02568399999996zM718.672842 468.197053c4.715789 14.457263 1.765053 30.962526-9.202526 43.061895-10.954105 12.072421-27.136 16.666947-42.037895 13.527579l0 0.026947c-12.463158-2.694737-24.724211 5.268211-27.392 17.664-2.667789 12.463158 5.281684 24.697263 17.744842 27.338105 30.531368 6.467368 63.595789-2.937263 85.989053-27.715368 22.447158-24.764632 28.456421-58.489263 18.849684-88.064-3.907368-12.099368-16.936421-18.728421-29.062737-14.848-12.139789 3.920842-18.782316 16.922947-14.874947 28.995368L718.672842 468.183579zM853.261474 424.865684c-0.013474-0.013474-0.013474-0.080842-0.013474-0.107789-4.567579-14.026105-19.712-21.706105-33.778526-17.165474-14.133895 4.554105-21.854316 19.590737-17.300211 33.670737l0 0.013474c13.999158 43.169684 5.12 92.429474-27.567158 128.565895-32.714105 36.122947-80.949895 49.92-125.507368 40.488421-14.484211-3.085474-28.752842 6.130526-31.838316 20.574316-3.098947 14.403368 6.144 28.631579 20.641684 31.717053l0.026947 0c62.625684 13.271579 130.519579-6.117053 176.545684-56.966737C860.483368 554.886737 872.892632 485.618526 853.261474 424.865684z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="voice" unicode="&#59016;" d="M463.380164 644.0568969999999v-0.003069c-4.550643 4.549619-10.484795 7.02295-16.913205 7.02295s-12.365632-2.473331-16.915251-7.02295c-4.549619-4.551666-7.020904-10.485819-7.020904-16.914229s2.471284-12.365632 7.020904-16.915251c60.437487-60.438511 93.675496-140.756791 93.675496-226.222301 0-85.464487-33.238009-165.783791-93.675496-226.220255-4.549619-4.551666-7.020904-10.487865-7.020904-16.915252 0-6.429433 2.471284-12.365632 7.020904-16.914228 4.550643-4.549619 10.486842-7.02295 16.915251-7.02295s12.364609 2.473331 16.913205 7.02295c35.114752 35.116799 62.317301 76.06849 80.814584 121.668037 17.904789 44.018539 26.90579 90.608647 26.90579 138.384768s-9.101285 94.26799-26.90579 138.384767c-18.59552 45.697785-45.698808 86.550215-80.814584 121.667013zM781.892405 618.929614v-0.002047c-31.358195 77.452-77.550237 146.990772-137.098471 206.539007-4.550643 4.549619-10.485819 7.02295-16.915252 7.02295-6.42841 0-12.363585-2.473331-16.914228-7.02295-9.29776-9.299807-9.29776-24.531719 0-33.82948 54.997592-54.998615 97.631598-119.195729 126.613676-190.71153 27.993564-69.044516 42.237987-142.045133 42.237987-216.924541s-14.244422-147.882072-42.237987-216.923518c-28.982078-71.517847-71.616084-135.616724-126.613676-190.711529-9.29776-9.298783-9.29776-24.531719 0-33.82948 4.551666-4.551666 10.485819-7.02295 16.914228-7.02295 6.429433 0 12.366655 2.471284 16.915252 7.02295 59.547211 59.547211 105.740276 129.085984 137.098471 206.53696 30.369681 74.78117 45.699832 153.817248 45.699831 234.928591 0 81.111343-15.331173 160.146397-45.699831 234.927567zM299.474141 427.621497c-11.670807 11.573593-27.103288 18.004049-43.522236 18.004049-16.419971 0-31.852452-6.429433-43.52326-18.004049-11.57257-11.57257-18.003026-27.104311-18.003026-43.522236 0-16.420995 6.42841-31.851429 18.003026-43.52326 11.574616-11.57257 27.103288-18.003026 43.52326-18.003025s31.852452 6.429433 43.522236 18.003025c11.573593 11.573593 18.003026 27.104311 18.003025 43.52326 0 16.419971-6.427386 31.852452-18.003025 43.522236z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="upload-drag" unicode="&#59009;" d="M666.931 445.918l-124.245 99.362c-7.221 5.639-16.428 9.042-26.429 9.042-9.963 0-19.136-3.376-26.438-9.047l-124.215-99.391c-9.615-7.772-15.713-19.565-15.713-32.782 0-9.946 3.453-19.084 9.223-26.284 13.828-17.359 41.51-20.465 58.918-6.505l56.252 45.022v-261.12c0-23.177 18.842-41.984 41.95-41.984s41.95 18.842 41.95 41.984v261.12l56.286-45.056c17.545-13.892 45.09-10.718 58.914 6.554 5.754 7.137 9.236 16.316 9.236 26.308 0 13.211-6.086 24.999-15.609 32.716zM235.827 142.95000000000005c-85.026 0-152.542 31.71-188.655 89.839-36.113 58.095-34.406 134.724 4.335 195.174 37.342 58.334 102.366 92.023 178.995 94.549-19.866 130.492 42.667 202.377 84.753 235.008 90.112 69.871 234.257 79.053 335.565 21.367 58.982-33.587 94.037-85.675 100.454-146.978 113.937 18.978 177.562-33.826 206.814-69.905 63.317-78.131 71.27-204.39 18.91-300.203-46.524-85.06-130.389-127.317-229.82-116.497-18.739 2.116-32.222 18.978-30.174 37.683s19.285 32.017 37.683 30.174c96.7-10.718 143.258 46.353 162.406 81.408 39.014 71.373 33.826 167.868-12.049 224.495-38.673 47.684-100.352 60.518-178.483 37.069-2.94-0.916-6.319-1.443-9.822-1.443-18.851 0-34.133 15.282-34.133 34.133 0 1.495 0.096 2.969 0.283 4.414 8.549 68.506-31.114 106.53-65.93 126.362-77.346 44.066-191.522 37.035-259.925-15.974-58.266-45.193-75.947-117.18-51.132-208.179 0.761-2.688 1.198-5.775 1.198-8.963 0-18.851-15.282-34.133-34.133-34.133-1.481 0-2.94 0.094-4.371 0.277-70.759 8.822-128.991-13.535-159.677-61.424-24.61-38.434-26.146-86.46-3.823-122.368 27.716-44.578 86.05-64.375 164.147-55.637 1.132 0.133 2.443 0.209 3.772 0.209 18.853 0 34.138-15.284 34.138-34.138 0-17.525-13.205-31.965-30.208-33.914-14.153-1.653-27.874-2.404-41.118-2.404z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="login-qq" unicode="&#58998;" d="M512 896C229.227789 896 0 666.772211 0 384c0-282.745263 229.227789-512 512-512s512 229.254737 512 512C1024 666.772211 794.772211 896 512 896L512 896zM738.856421 258.93726300000003c0 0-16.208842-44.220632-45.945263-83.941053 0 0 53.126737-18.054737 48.64-64.983579 0 0 1.778526-52.345263-113.461895-48.734316 0 0-81.071158 6.319158-105.377684 40.609684l-21.423158 0c-24.306526-34.304-105.350737-40.609684-105.350737-40.609684-115.280842-3.610947-113.475368 48.734316-113.475368 48.734316-4.500211 46.928842 48.626526 64.983579 48.626526 64.983579-29.709474 39.720421-45.918316 83.941053-45.918316 83.941053-72.057263-116.439579-64.848842 16.249263-64.848842 16.249263 13.527579 78.524632 70.238316 129.967158 70.238316 129.967158-8.111158 71.316211 21.611789 83.941053 21.611789 83.941053C318.410105 709.712842 508.025263 705.859368 512 705.751579c3.988211 0.107789 193.576421 3.961263 199.828211-216.643368 0 0 29.709474-12.638316 21.611789-83.941053 0 0 56.737684-51.442526 70.238316-129.967158l0 0C803.678316 275.18652599999996 810.873263 142.49768400000005 738.856421 258.93726300000003L738.856421 258.93726300000003zM738.856421 258.93726300000003"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="snowflake" unicode="&#59057;" d="M480.695-64h63.725V59.291000000000054l68.854-68.242 44.945 44.546-113.798 112.79v180.02l177.271-102.44 41.67-155.652 60.725 16.284-25.398 94.872 85.259-49.266 31.87 55.246-84.726 48.961 94.497 25.343-16.495 61.622-156.068-41.855-176.934 102.245 177.667 102.667 155.513-41.709 16.274 60.793-94.78 25.418 85.255 49.264-31.869 55.247-84.733-48.965 25.326 94.594-61.557 16.51-41.817-156.206-176.948-102.251V644.461l113.849 113.951-44.459 44.496-69.392-69.454V832h-63.725v-97.935l-69.188 69.249-45.068-45.107 114.256-114.355V438.89l-156.557 90.469L283.45 684.39l-60.188-16.458 24.84-94.632-107.544 62.145-31.868-55.247 106.667-61.639-93.463-25.557 16.074-61.237 154.482 42.243 156.169-90.243-156.138-90.226-154.485 42.243-15.855-60.409 94.289-25.784-107.534-62.14 31.868-55.247 106.672 61.642-24.621-93.801 61.012-16.685 40.69 155.028 156.179 90.25v-180.455l-113.801-112.79 44.338-43.944 69.463 68.845V-64z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="heart" unicode="&#59020;" d="M512 4.100000000000023c-108.9 0-447.3 277.5-447.3 522.2 0 131 106.6 237.6 237.6 237.6 94.9 0 174.8-50.2 209.7-76.1 34.9 25.9 114.8 76.1 209.7 76.1 131 0 237.6-106.6 237.6-237.6 0-244.7-338.4-522.2-447.3-522.2zM302.3 708c-100.2 0-181.7-81.5-181.7-181.7 0-221 326.8-466.3 391.4-466.3s391.4 245.3 391.4 466.3c0 100.2-81.5 181.7-181.7 181.7-103.9 0-190.2-76-191.1-76.8-10.6-9.5-26.7-9.5-37.3 0-0.8 0.8-87.7 76.8-191 76.8z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="logout" unicode="&#59010;" d="M512 832a32 32 0 0 1-32-32v-416a32 32 0 0 1 64 0V800a32 32 0 0 1-32 32zM683.34 798.06a32 32 0 0 1-24.48-59.15C798.07 681.24 896 544.06 896 384c0-212.08-171.92-384-384-384S128 171.91999999999996 128 384c0 160.06 97.93 297.24 237.14 354.91a32 32 0 0 1-24.48 59.15C178.25 730.78 64 570.74 64 384c0-247.42 200.58-448 448-448s448 200.58 448 448c0 186.74-114.25 346.78-276.66 414.06z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="file-b" unicode="&#58965;" d="M790.08 177.91999999999996l-138.112-119.232V177.91999999999996h138.112zM198.848 763.008h627.328v-516.16H617.088a34.56 34.56 0 0 1-34.816-34.432v-206.528H198.848V763.008z m662.208 68.8H164.032a34.56 34.56 0 0 1-34.816-34.432v-825.92a34.56 34.56 0 0 1 34.816-34.432h453.056l278.784 240.896V797.376a34.56 34.56 0 0 1-34.816 34.432z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="template" unicode="&#58979;" d="M734 172.89999999999998v82.8h-59.9v-37l-35.7-9.7 15.7-57.8zM674.1 419.3H734v-81.8h-59.9zM734 600.2l-95.6-26 15.7-57.8 20 5.4v-20.7H734zM866.1 131.29999999999995v-37l-35.7-9.7 7.9-28.9 7.8-28.9 79.9 21.7v82.8h-29.9zM740.9 60.299999999999955L651.4 36l7.9-28.9 7.8-29 89.5 24.4-7.8 28.9zM740.9 781.7l-89.5-24.3 7.9-28.9 7.8-28.9 89.5 24.3-7.8 28.9zM830.4 806l7.9-28.9 7.8-28.9 20 5.5v-20.8H926V832zM866.1 612.6v-120.3H926V612.6h-29.9zM866.1 371.9v-120.3H926V371.9h-29.9zM541.9 665.6l35.7 9.7-7.8 28.9-7.8 28.9-50-13.6L98 832v-783.5l384.1-104.3L512-64l29.9 8.1 35.7 9.7-7.8 28.9-7.8 28.9-20-5.4V120.79999999999995l35.7 9.7-15.7 57.8-20-5.4V486l35.7 9.7-15.7 57.8-20-5.4V665.6z m-59.8-659.4l-324.2 88.1V753.7l324.2-88.1V548l-192 52.2v-427.3l192-52.2v-114.5z m0 360.9V182.79999999999995l-132.2 35.9V521.8l132.2-35.9v-118.8z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="transfer" unicode="&#59025;" d="M320 768H128c-35.2 0-64-28.8-64-64v-640c0-35.2 28.8-64 64-64h192c35.2 0 64 28.8 64 64V704c0 35.2-28.8 64-64 64z m0-672c0-16-16-32-32-32H160c-16 0-32 16-32 32V672c0 16 16 32 32 32h128c16 0 32-16 32-32v-576z m256 544h-64c-19.2 0-32-12.8-32-32s16-32 32-32h64c19.2 0 32 12.8 32 32s-16 32-32 32z m-64-448h-64c-19.2 0-32-12.8-32-32s16-32 32-32h64c19.2 0 32 12.8 32 32s-16 32-32 32z m384 576H704c-35.2 0-64-28.8-64-64v-640c0-35.2 28.8-64 64-64h192c35.2 0 64 28.8 64 64V704c0 35.2-28.8 64-64 64z m0-672c0-16-16-32-32-32H736c-16 0-32 16-32 32V672c0 16 16 32 32 32h128c16 0 32-16 32-32v-576z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="auz" unicode="&#58994;" d="M324.266667 435.2c-17.066667 17.066667-39.822222 17.066667-51.2 0-17.066667-17.066667-17.066667-39.822222 0-51.2l153.6-159.288889c5.688889-5.688889 17.066667-11.377778 28.444444-11.377778s17.066667 5.688889 28.444445 11.377778l295.822222 290.133333c17.066667 17.066667 17.066667 39.822222 0 51.2-17.066667 17.066667-39.822222 17.066667-51.2 0L455.111111 304.355556 324.266667 435.2zM927.288889 753.777778L523.377778 896h-22.755556L96.711111 753.777778c-17.066667-5.688889-28.444444-17.066667-28.444444-34.133334v-432.355555c11.377778-250.311111 409.6-409.6 426.666666-415.288889h22.755556c17.066667 5.688889 415.288889 159.288889 426.666667 415.288889V719.644444c11.377778 17.066667 0 28.444444-17.066667 34.133334z m-45.511111-460.8c-5.688889-182.044444-301.511111-312.888889-369.777778-341.333334-113.777778 45.511111-358.4 182.044444-369.777778 341.333334v398.222222L512 822.044444l369.777778-125.155555v-403.911111z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="console" unicode="&#58981;" d="M30.552 104.72699999999998c4.654-16.29 23.272-23.272 37.236-18.618 16.291 4.655 23.273 23.273 18.618 37.236C16.588 314.182 84.08 521.31 237.68 640c11.636 9.31 23.273 16.29 37.236 25.6 25.6 16.29 53.528 30.255 83.782 39.564 58.182 20.945 118.691 30.254 176.873 27.927h25.6c6.982 0 11.636 0 18.618-2.327 30.255-4.655 58.182-11.637 88.436-23.273 235.055-86.11 356.073-346.764 269.964-581.818-4.654-16.291 2.327-32.582 18.618-37.237 16.291-4.654 32.582 2.328 37.237 18.619 41.89 116.363 39.563 239.709 0 349.09h2.327C921.897 656.2909999999999 738.043 784.2909999999999 537.897 793.6h-48.873c-200.145-9.31-384-137.31-458.472-337.455-39.564-109.381-41.891-232.727 0-351.418z m707.49 386.328a29.498 29.498 0 0 1-41.89 0L521.606 316.509c-4.654 2.327-9.309 2.327-13.963 2.327-32.582 0-58.182-25.6-58.182-58.181s25.6-58.182 58.182-58.182 58.181 25.6 58.181 58.182c0 4.654 0 9.309-2.327 16.29l174.546 174.546c11.636 11.636 11.636 30.254 0 39.564z m228.073-458.473H58.48c-16.29 0-30.255-13.964-30.255-30.255 0-16.29 13.964-30.254 30.255-30.254h907.636c16.291 0 30.255 13.963 30.255 30.254 0 16.291-13.964 30.255-30.255 30.255z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="app" unicode="&#58963;" d="M432.022 818.946h-376.324c-6.627 0-12.078-5.45-12.078-12.078v-376.324c0-6.627 5.45-12.078 12.078-12.078h376.324c6.627 0 12.078 5.45 12.078 12.078v376.473c0 6.627-5.45 11.93-12.078 11.93zM391.517 471.196h-295.169v295.169h295.021v-295.169zM976.847 635.717l-211.95 211.95c-8.837 8.837-23.124 8.837-31.963 0l-211.95-211.95c-8.837-8.837-8.837-23.124 0-31.963l211.95-212.098c8.837-8.837 23.124-8.837 31.963 0l211.95 211.95c8.837 8.987 8.837 23.271 0 32.109zM432.022 313.45000000000005h-376.324c-6.627 0-12.078-5.45-12.078-12.078v-376.324c0-6.627 5.45-12.078 12.078-12.078h376.324c6.627 0 12.078 5.45 12.078 12.078v376.473c0 6.627-5.45 11.93-12.078 11.93zM391.517-34.15499999999997h-295.169v295.021h295.021v-295.021zM932.511 313.45000000000005h-376.324c-6.627 0-12.078-5.45-12.078-12.078v-376.324c0-6.627 5.45-12.078 12.078-12.078h376.324c6.627 0 12.078 5.45 12.078 12.078v376.473c0 6.627-5.45 11.93-12.078 11.93zM891.859-34.15499999999997h-295.021v295.021h295.021v-295.021z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="prev" unicode="&#58970;" d="M62.573 384.103l423.401 423.662c18.985 18.985 49.757 18.985 68.727 0 18.982-18.972 18.985-49.746 0-68.729l-355.058-355.067 356.796-356.796c18.977-18.971 18.976-49.746 0-68.727-18.982-18.976-49.751-18.976-68.727 0l-39.753 39.753 0.269 0.246-385.655 385.661zM451.365 384.103l423.407 423.662c18.985 18.985 49.757 18.985 68.727 0 18.982-18.972 18.985-49.746 0-68.729l-355.058-355.067 356.796-356.796c18.977-18.971 18.976-49.746 0-68.727-18.982-18.976-49.757-18.977-68.727 0l-39.762 39.754 0.273 0.249-385.662 385.661zM451.365 384.103z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="website" unicode="&#59310;" d="M777.073418 147.443038c-30.460759 21.387342-40.83038 40.182278-76.47595 53.792405 25.275949 60.273418 40.182278 83.605063 42.126583 154.896203H887.898734c-3.888608-99.159494-45.367089-143.878481-110.825316-208.688608zM136.101266 356.13164600000005h167.210126c1.944304-71.291139 16.850633-94.622785 42.126583-154.896203-34.997468-13.610127-68.050633-31.756962-98.511393-53.792405C181.468354 212.25316499999997 139.989873 256.97215200000005 136.101266 356.13164600000005z m103.048101 259.888607c29.164557-23.979747 61.56962-42.774684 96.567089-57.681012-19.443038-53.792405-30.460759-90.734177-31.756962-152.951899H136.101266c3.240506 90.734177 46.663291 147.767089 103.048101 210.632911z m309.144304-209.98481V523.989873c47.311392 1.296203 71.291139 10.36962 114.065823 25.27595 18.146835-51.2 28.516456-84.901266 30.460759-143.23038H548.293671z m104.344304-195.078481c-40.182278 12.962025-60.273418 20.091139-104.344304 21.387342V356.13164600000005h144.526582c-1.944304-68.050633-16.202532-88.141772-40.182278-145.174684z m36.941772-57.681013c31.756962-12.313924 39.534177-28.516456 66.75443-47.311392-51.848101-44.718987-114.713924-73.883544-182.116455-84.901266 36.941772 37.589873 90.734177 82.308861 115.362025 132.212658z m-163.321519-137.397468l22.035443 165.913924c40.182278-1.296203 56.38481-7.777215 92.678481-18.794937-27.220253-56.38481-66.106329-106.288608-113.417722-147.118987h-1.296202z m-75.827848 5.18481c-67.402532 11.017722-130.268354 40.83038-182.764557 84.901266 27.868354 19.443038 57.681013 34.997468 88.789873 47.311392 23.331646-48.607595 55.088608-93.326582 93.974684-132.212658z m47.311392 335.068355v-123.787342c-44.070886-1.296203-64.162025-8.425316-104.344304-21.387342-23.979747 57.681013-38.237975 77.124051-40.182278 145.174684h144.526582zM383.675949 549.265823c42.774684-14.906329 66.75443-23.331646 114.065823-25.27595v-117.95443H353.21519c1.944304 58.329114 12.313924 92.03038 30.460759 143.23038z m-37.589873 57.032911c-31.756962 12.962025-60.921519 30.460759-88.141772 51.848101 53.792405 51.848101 115.362025 91.382278 192.486076 104.344304-44.718987-44.718987-80.364557-97.863291-104.344304-156.192405z m151.655696 161.377215v-193.782278c-44.070886 1.296203-64.162025 9.073418-103.696202 22.683544 29.164557 68.698734 49.903797 127.027848 102.4 171.098734h1.296202z m75.827848-4.536708c77.772152-13.610127 149.711392-49.903797 206.744304-104.344304-29.164557-22.035443-46.01519-37.589873-80.364557-51.848102-25.275949 59.625316-82.956962 112.76962-126.379747 156.192406z m-46.01519 4.536708c54.440506-46.01519 97.21519-104.992405 124.435443-171.098734-39.534177-13.610127-59.625316-21.387342-103.696202-22.683544l-22.035443 193.782278h1.296202z m-31.10886-751.149367c-46.663291 38.886076-62.865823 88.789873-91.382279 147.118988 36.293671 11.665823 53.144304 17.498734 93.326582 18.794936v-165.913924h-1.944303zM887.898734 406.035443h-145.174683c-1.296203 61.56962-12.313924 98.511392-31.756962 152.303798 37.589873 15.55443 57.032911 33.053165 88.789873 57.681012 56.38481-62.865823 84.901266-119.898734 88.141772-209.98481z m-375.898734 427.746835c-244.334177 0-442.005063-197.670886-442.005063-442.005063S267.665823-50.227847999999994 512-50.227847999999994s442.005063 197.670886 442.005063 442.005063S756.334177 833.782278 512 833.782278z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="next" unicode="&#58971;" d="M948.066926 382.958838l-411.990051-412.24426c-18.47333-18.47333-48.417689-18.47333-66.875207 0-18.47333 18.461167-18.47333 48.405526 0 66.875207L814.691135 383.088983 467.512212 730.269123c-18.466032 18.458735-18.466032 48.405526 0 66.873991 18.468465 18.464816 48.410391 18.464816 66.872774 0l38.682336-38.682336-0.261507-0.239614 375.259894-375.265975v0.003649m-378.312834 0L157.756743-29.28542200000004c-18.47333-18.47333-48.415256-18.47333-66.872775 0-18.47333 18.461167-18.47333 48.405526 0 66.875207L436.369787 383.088983 89.19208 730.269123c-18.4636 18.458735-18.4636 48.405526 0 66.873991 18.470898 18.464816 48.415256 18.464816 66.872774 0l38.692067-38.682336-0.266372-0.239614 375.267191-375.265975-0.004865 0.003649m0 0z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="component" unicode="&#59479;" d="M917.376 652.544L500.8 891.2a34.304 34.304 0 0 1-34.176 0L50.112 652.48a33.92 33.92 0 0 1-17.088-29.376v-477.44c0-12.16 6.528-23.296 17.088-29.44l416.512-238.72a35.136 35.136 0 0 1 34.176 0l416.576 238.72a33.92 33.92 0 0 1 17.088 29.44v477.44a33.92 33.92 0 0 1-17.088 29.44z m-51.264-487.36l-382.4-219.136-382.336 219.136V603.52l382.336 219.136 382.4-219.136v-438.272zM198.784 535.488a33.792 33.792 0 0 1 12.544-46.4l237.824-136.32V83.20000000000005c0-18.816 15.232-33.92 34.176-33.92a33.92 33.92 0 0 1 34.176 33.92V352.384l238.656 136.832a33.856 33.856 0 0 1 12.544 46.4 34.368 34.368 0 0 1-46.72 12.416L483.712 411.52 245.504 548.0319999999999a34.432 34.432 0 0 1-46.72-12.544z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="android" unicode="&#59012;" d="M391.405714 619.995429a22.308571 22.308571 0 0 1 0 44.544c-11.995429 0-21.723429-10.276571-21.723428-22.272s9.728-22.272 21.723428-22.272z m241.152 0c11.995429 0 21.723429 10.276571 21.723429 22.272s-9.728 22.272-21.723429 22.272a22.308571 22.308571 0 0 1 0-44.544zM168.539429 514.852571a58.514286 58.514286 0 0 0 58.294857-58.294857v-245.723428c0-32.585143-25.709714-58.843429-58.294857-58.843429S109.696 178.285714 109.696 210.834286v245.723428c0 32 26.294857 58.294857 58.843429 58.294857z m605.732571-10.861714v-380.562286c0-34.852571-28.013714-62.866286-62.281143-62.866285h-42.861714v-129.718857c0-32.585143-26.294857-58.843429-58.843429-58.843429s-58.843429 26.294857-58.843428 58.843429v129.718857H472.594286v-129.718857c0-32.585143-26.294857-58.843429-58.843429-58.843429a58.660571 58.660571 0 0 0-58.294857 58.843429l-0.585143 129.718857H312.594286a62.683429 62.683429 0 0 0-62.866286 62.866285V503.990857h524.580571z m-132.571429 231.424c80.018286-41.142857 134.290286-119.990857 134.290286-210.870857H247.424c0 90.843429 54.272 169.728 134.838857 210.870857L341.705143 810.276571a8.338286 8.338286 0 0 0 2.852571 11.446858c3.986286 1.718857 9.142857 0.585143 11.446857-3.437715L397.147429 742.838857c34.852571 15.433143 73.728 23.990857 114.870857 23.990857s80.018286-8.557714 114.870857-23.990857l41.142857 75.446857c2.304 3.986286 7.424 5.156571 11.446857 3.437715a8.338286 8.338286 0 0 0 2.852572-11.446858zM914.267429 456.557714v-245.723428c0-32.585143-26.294857-58.843429-58.843429-58.843429a58.660571 58.660571 0 0 0-58.294857 58.843429v245.723428a58.148571 58.148571 0 0 0 58.294857 58.294857c32.585143 0 58.843429-25.709714 58.843429-58.294857z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="more" unicode="&#58975;" d="M224 288c-52.928 0-96 43.072-96 96s43.072 96 96 96 96-43.072 96-96-43.072-96-96-96z m288 0c-52.928 0-96 43.072-96 96s43.072 96 96 96 96-43.072 96-96-43.072-96-96-96z m288 0c-52.928 0-96 43.072-96 96s43.072 96 96 96 96-43.072 96-96-43.072-96-96-96z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="login-wechat" unicode="&#58999;" d="M516.464646 896C233.714646 896 4.464646 666.75 4.464646 384S233.714646-128 516.464646-128s512 229.25 512 512S799.214646 896 516.464646 896z m-74-523.375c-0.25-0.75-0.5-1.125-0.75-1.875-0.25-0.75-0.5-1.125-0.75-1.875-0.25-0.75-0.5-1.125-0.75-1.875-0.25-0.75-0.5-1.125-0.75-1.875-0.25-0.75-0.5-1.125-0.75-1.875-0.25-0.75-0.5-1.125-0.75-1.875-0.25-0.75-0.5-1.125-0.75-1.875-0.25-0.75-0.5-1.125-0.75-1.875-0.25-0.75-0.5-1.125-0.5-1.875-0.25-0.75-0.5-1.125-0.5-1.875-0.25-0.75-0.5-1.125-0.5-1.875-0.25-0.75-0.25-1.125-0.5-1.875s-0.5-1.125-0.5-1.875c-0.25-0.75-0.25-1.125-0.5-1.875s-0.25-1.125-0.5-1.875-0.25-1.125-0.5-1.875-0.25-1.125-0.5-1.875-0.25-1.125-0.5-1.875-0.25-1.125-0.5-1.875-0.25-1.125-0.5-1.875-0.25-1.125-0.5-1.875c0-0.75-0.25-1.125-0.25-1.875s-0.25-1.125-0.25-1.875-0.25-1.125-0.25-1.875-0.25-1.125-0.25-1.875-0.25-1.125-0.25-1.875-0.25-1.125-0.25-1.875-0.25-1.125-0.25-1.875-0.25-1.125-0.25-1.875-0.25-1.125-0.25-1.875 0-1.125-0.25-1.875c0-0.75-0.25-1.125-0.25-1.875s0-1.125-0.25-1.875c0-0.75 0-1.125-0.25-1.875 0-0.75 0-1.125-0.25-1.875v-22.5c0-0.75 0-1.125 0.25-1.875 0-0.75 0-1.125 0.25-1.875 0-0.75 0-1.125 0.25-1.875 0-0.75 0-1.125 0.25-1.875 0-0.75 0.25-1.125 0.25-1.875s0.25-1.125 0.25-1.875 0.25-1.125 0.25-1.875 0.25-1.125 0.25-1.875 0.25-1.125 0.25-1.875 0.25-1.125 0.25-1.875 0.25-1.125 0.25-1.875 0.25-1.125 0.25-1.875 0.25-1.125 0.25-1.875 0.25-1.125 0.5-1.875 0.25-1.125 0.5-1.875 0.25-1.125 0.5-1.875 0.25-1.125 0.5-1.875 0.25-1.125 0.5-1.875 0.25-1.125 0.5-1.875 0.25-1.125 0.5-1.875 0.25-1.125 0.5-1.875 0.25-1.125 0.5-1.875 0.25-1.125 0.5-1.875l0.25-0.875c-4.25-0.25-8.625-0.75-12.75-0.75-3.75-0.25-7.25-0.25-11-0.25-3.5 0-7 0-10.5 0.25-7.25 0.25-14 0.875-20.75 1.875-4.25 0.5-8.125 1.125-12.375 1.875-3.5 0.5-6.75 1.125-10.25 1.875-3 0.5-6.25 1.125-9.25 1.875-3 0.75-5.875 1.125-8.875 1.875-2.75 0.75-5.875 1.125-8.875 1.875-2.75 0.5-5.625 1.125-8.375 1.625l-3.25-1.625-3.75-1.875-4 1.375-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-2.75-1.375-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-2.5-1.375 0.5 1.375 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.5 1.125c-0.5 0.25-0.75 0.5-1.125 0.75-0.875 0.75-1.625 1.125-2.5 1.875s-1.625 1.125-2.5 1.875-1.625 1.125-2.5 1.875c-0.75 0.75-1.625 1.125-2.375 1.875-0.75 0.75-1.625 1.125-2.375 1.875-0.75 0.75-1.625 1.125-2.375 1.875-0.75 0.75-1.625 1.125-2.375 1.875-0.75 0.75-1.375 1.125-2.375 1.875-0.75 0.75-1.375 1.125-2.125 1.875-0.75 0.75-1.375 1.125-2.125 1.875-0.75 0.75-1.375 1.125-2.125 1.875-0.75 0.75-1.375 1.125-2.125 1.875-0.75 0.75-1.375 1.125-2.125 1.875-0.75 0.75-1.375 1.125-2.125 1.875-0.75 0.75-1.375 1.125-1.875 1.875-0.75 0.75-1.375 1.125-1.875 1.875l-1.875 1.875-1.875 1.875-1.875 1.875-1.875 1.875c-0.75 0.75-1.125 1.125-1.625 1.875s-1.125 1.125-1.625 1.875-1.125 1.125-1.625 1.875-1.125 1.125-1.625 1.875-1.125 1.125-1.625 1.875-1.125 1.125-1.625 1.875-0.875 1.125-1.625 1.875c-0.5 0.75-0.875 1.125-1.625 1.875-0.5 0.75-0.875 1.125-1.375 1.875-0.5 0.75-0.875 1.125-1.375 1.875-0.5 0.75-0.875 1.125-1.375 1.875-0.5 0.75-0.875 1.125-1.375 1.875-0.5 0.75-0.875 1.125-1.375 1.875-0.5 0.75-0.875 1.125-1.375 1.875-0.5 0.75-0.875 1.125-1.375 1.875-0.5 0.75-0.875 1.125-1.375 1.875-0.5 0.75-0.875 1.125-1.125 1.875-0.5 0.75-0.875 1.125-1.125 1.875-0.5 0.75-0.75 1.125-1.125 1.875-0.5 0.75-0.75 1.125-1.125 1.875-0.5 0.75-0.75 1.125-1.125 1.875-0.5 0.75-0.75 1.125-1.125 1.875-0.5 0.75-0.75 1.125-1.125 1.875-0.5 0.75-0.75 1.125-1.125 1.875-0.25 0.75-0.75 1.125-0.875 1.875-0.25 0.75-0.75 1.125-0.875 1.875-0.25 0.75-0.75 1.125-0.875 1.875-0.25 0.75-0.75 1.125-0.875 1.875-0.25 0.75-0.75 1.125-0.875 1.875-0.25 0.75-0.75 1.125-0.875 1.875-0.25 0.75-0.75 1.125-0.875 1.875-0.25 0.75-0.5 1.125-0.875 1.875-0.25 0.75-0.5 1.125-0.875 1.875-0.25 0.75-0.5 1.125-0.875 1.875-0.25 0.75-0.5 1.125-0.75 1.875-0.25 0.75-0.5 1.125-0.75 1.875-0.25 0.75-0.5 1.125-0.75 1.875-0.25 0.75-0.5 1.125-0.75 1.875-0.25 0.75-0.5 1.125-0.75 1.875-0.25 0.75-0.5 1.125-0.75 1.875-0.25 0.75-0.5 1.125-0.75 1.875-0.25 0.75-0.5 1.125-0.75 1.875-0.25 0.75-0.5 1.125-0.75 1.875-0.25 0.75-0.5 1.125-0.75 1.875-0.25 0.75-0.5 1.125-0.5 1.875-0.25 0.75-0.5 1.125-0.5 1.875-0.25 0.75-0.5 1.125-0.5 1.875-0.25 0.75-0.25 1.125-0.5 1.875s-0.25 1.125-0.5 1.875-0.25 1.125-0.5 1.875-0.25 1.125-0.5 1.875-0.25 1.125-0.5 1.875-0.25 1.125-0.5 1.875-0.25 1.125-0.5 1.875-0.25 1.125-0.5 1.875-0.25 1.125-0.25 1.875-0.25 1.125-0.25 1.875-0.25 1.125-0.25 1.875-0.25 1.125-0.25 1.875-0.25 1.125-0.25 1.875-0.25 1.125-0.25 1.875-0.25 1.125-0.25 1.875-0.25 1.125-0.25 1.875-0.25 1.125-0.25 1.875 0 1.125-0.25 1.875c0 0.75 0 1.125-0.25 1.875 0 0.75 0 1.125-0.25 1.875 0 0.75 0 1.125-0.25 1.875V457.25v1.875 1.875 1.875 1.875 1.875 0.875 0.875 1.875 1.875 1.875 1.875 1.875 1.875c0 0.75 0 1.125 0.25 1.875 0 0.75 0 1.125 0.25 1.875 0 0.75 0 1.125 0.25 1.875 0 0.75 0.25 1.125 0.25 1.875s0.25 1.125 0.25 1.875 0.25 1.125 0.25 1.875 0.25 1.125 0.25 1.875 0.25 1.125 0.25 1.875 0.25 1.125 0.25 1.875 0.25 1.125 0.25 1.875 0.25 1.125 0.25 1.875 0.25 1.125 0.25 1.875 0.25 1.125 0.5 1.875c0 0.75 0.25 1.125 0.5 1.875s0.25 1.125 0.5 1.875 0.25 1.125 0.5 1.875 0.25 1.125 0.5 1.875 0.25 1.125 0.5 1.875 0.25 1.125 0.5 1.875 0.25 1.125 0.5 1.875 0.25 1.125 0.5 1.875 0.25 1.125 0.5 1.875 0.25 1.125 0.5 1.875 0.5 1.125 0.5 1.875c0.25 0.75 0.5 1.125 0.5 1.875 0.25 0.75 0.5 1.125 0.5 1.875 0.25 0.75 0.5 1.125 0.75 1.875 0.25 0.75 0.5 1.125 0.75 1.875 0.25 0.75 0.5 1.125 0.75 1.875 0.25 0.75 0.5 1.125 0.75 1.875 0.25 0.75 0.5 1.125 0.75 1.875 0.25 0.75 0.5 1.125 0.75 1.875 0.25 0.75 0.5 1.125 0.75 1.875 0.25 0.75 0.5 1.125 0.75 1.875 0.25 0.75 0.5 1.125 0.75 1.875 0.25 0.75 0.5 1.125 0.75 1.875 0.25 0.75 0.5 1.125 0.75 1.875 0.25 0.75 0.5 1.125 0.875 1.875 0.25 0.75 0.5 1.125 0.875 1.875 0.25 0.75 0.5 1.125 0.875 1.875 0.25 0.75 0.75 1.125 0.875 1.875 0.25 0.75 0.75 1.125 0.875 1.875 0.25 0.75 0.75 1.125 0.875 1.875 0.25 0.75 0.75 1.125 0.875 1.875 0.25 0.75 0.75 1.125 0.875 1.875 0.25 0.75 0.75 1.125 0.875 1.875 0.25 0.75 0.75 1.125 1.125 1.875 0.5 0.75 0.75 1.125 1.125 1.875 0.5 0.75 0.75 1.125 1.125 1.875 0.5 0.75 0.75 1.125 1.125 1.875 0.5 0.75 0.75 1.125 1.125 1.875 0.5 0.75 0.75 1.125 1.125 1.875 0.5 0.75 0.75 1.125 1.125 1.875 0.5 0.75 0.875 1.125 1.125 1.875 0.5 0.75 0.875 1.125 1.125 1.875 0.5 0.75 0.875 1.125 1.125 1.875 0.5 0.75 0.875 1.125 1.375 1.875 0.5 0.75 0.875 1.125 1.375 1.875 0.5 0.75 0.875 1.125 1.375 1.875 0.5 0.75 0.875 1.125 1.375 1.875 0.5 0.75 0.875 1.125 1.375 1.875 0.5 0.75 0.875 1.125 1.375 1.875 0.5 0.75 0.875 1.125 1.375 1.875 0.5 0.75 0.875 1.125 1.625 1.875 0.5 0.75 0.875 1.125 1.625 1.875 0.5 0.75 1.125 1.125 1.625 1.875s1.125 1.125 1.625 1.875 1.125 1.125 1.625 1.875 1.125 1.125 1.625 1.875 1.125 1.125 1.625 1.875l1.875 1.875 1.875 1.875 1.875 1.875 1.875 1.875c0.75 0.75 1.375 1.125 1.875 1.875 0.75 0.75 1.375 1.125 2.125 1.875 0.75 0.75 1.375 1.125 2.125 1.875 0.75 0.75 1.375 1.125 2.125 1.875 0.75 0.75 1.375 1.125 2.125 1.875 0.75 0.75 1.375 1.125 2.125 1.875 0.75 0.75 1.375 1.125 2.375 1.875 0.75 0.75 1.625 1.125 2.375 1.875 0.75 0.75 1.625 1.125 2.375 1.875 0.75 0.75 1.625 1.125 2.375 1.875 0.875 0.75 1.625 1.125 2.5 1.875s1.625 1.125 2.5 1.875 1.875 1.125 2.5 1.875c0.875 0.75 1.875 1.125 2.75 1.875 0.875 0.75 1.875 1.125 2.75 1.875 0.875 0.75 1.875 1.125 2.75 1.875 0.875 0.75 1.875 1.125 3 1.875 0.875 0.75 2.125 1.125 3 1.875s2.125 1.125 3 1.875c1.125 0.75 2.125 1.125 3.25 1.875 1.125 0.75 2.375 1.125 3.25 1.875 1.125 0.75 2.375 1.125 3.5 1.875 1.125 0.75 2.375 1.125 3.75 1.875 1.125 0.75 2.5 1.125 3.75 1.875 1.375 0.75 2.5 1.125 4 1.875 1.375 0.75 2.75 1.125 4.25 1.875 1.375 0.75 2.75 1.125 4.25 1.875 1.375 0.75 3 1.125 4.375 1.875 1.625 0.75 3 1.125 4.625 1.875 1.625 0.75 3.25 1.125 4.875 1.875 1.875 0.75 3.5 1.125 5.375 1.875s3.75 1.125 5.625 1.875c2.125 0.75 4.25 1.125 6 1.875 2.375 0.75 4.375 1.125 6.75 1.875 2.5 0.75 4.875 1.125 7.5 1.875 2.75 0.75 5.625 1.125 8.625 1.875 3.5 0.75 6.75 1.125 10.25 1.875 4.375 0.75 8.875 1.375 13.25 1.875 11 1.125 22.125 1.875 33.25 1.875h2.5c11.125 0 22.375-0.75 33.5-1.875 4.375-0.5 8.875-1.125 13.25-1.875 3.5-0.5 7-1.125 10.25-1.875 2.75-0.5 5.875-1.125 8.625-1.875 2.5-0.5 5.125-1.125 7.625-1.875 2.375-0.5 4.625-1.125 6.75-1.875 2.125-0.5 4.25-1.125 6.25-1.875 1.875-0.75 4-1.125 5.875-1.875s3.75-1.125 5.375-1.875c1.625-0.75 3.5-1.125 5.125-1.875 1.625-0.75 3.25-1.125 4.875-1.875 1.625-0.75 3-1.125 4.625-1.875 1.375-0.75 3-1.125 4.375-1.875s2.75-1.125 4.25-1.875c1.375-0.75 2.75-1.125 4-1.875 1.375-0.75 2.5-1.125 3.75-1.875 1.125-0.75 2.5-1.125 3.75-1.875 1.125-0.75 2.375-1.125 3.5-1.875 1.125-0.75 2.375-1.125 3.5-1.875 1.125-0.75 2.375-1.125 3.25-1.875 1.125-0.75 2.125-1.125 3.25-1.875 1.125-0.75 2.125-1.125 3-1.875s2.125-1.125 3-1.875 1.875-1.125 3-1.875c0.875-0.75 1.875-1.125 2.75-1.875 0.875-0.75 1.875-1.125 2.75-1.875 0.875-0.75 1.875-1.125 2.75-1.875 0.875-0.75 1.875-1.125 2.5-1.875 0.875-0.75 1.625-1.125 2.5-1.875s1.625-1.125 2.5-1.875 1.625-1.125 2.375-1.875c0.75-0.75 1.625-1.125 2.375-1.875 0.75-0.75 1.625-1.125 2.375-1.875 0.75-0.75 1.375-1.125 2.375-1.875 0.75-0.75 1.375-1.125 2.375-1.875 0.75-0.75 1.375-1.125 2.125-1.875 0.75-0.75 1.375-1.125 2.125-1.875 0.75-0.75 1.375-1.125 2.125-1.875 0.75-0.75 1.375-1.125 2.125-1.875 0.75-0.75 1.375-1.125 1.875-1.875 0.75-0.75 1.375-1.125 1.875-1.875l1.875-1.875 1.875-1.875 1.875-1.875 1.875-1.875c0.75-0.75 1.125-1.125 1.625-1.875s1.125-1.125 1.625-1.875 1.125-1.125 1.625-1.875 1.125-1.125 1.625-1.875 1.125-1.125 1.625-1.875 0.875-1.125 1.625-1.875c0.5-0.75 0.875-1.125 1.625-1.875 0.5-0.75 0.875-1.125 1.375-1.875 0.5-0.75 0.875-1.125 1.375-1.875 0.5-0.75 0.875-1.125 1.375-1.875 0.5-0.75 0.875-1.125 1.375-1.875 0.5-0.75 0.875-1.125 1.375-1.875 0.5-0.75 0.875-1.125 1.375-1.875 0.5-0.75 0.875-1.125 1.375-1.875 0.5-0.75 0.875-1.125 1.125-1.875 0.5-0.75 0.875-1.125 1.125-1.875 0.5-0.75 0.875-1.125 1.125-1.875 0.5-0.75 0.75-1.125 1.125-1.875 0.5-0.75 0.75-1.125 1.125-1.875 0.5-0.75 0.75-1.125 1.125-1.875 0.5-0.75 0.75-1.125 1.125-1.875 0.5-0.75 0.75-1.125 1.125-1.875 0.5-0.75 0.75-1.125 1.125-1.875 0.5-0.75 0.75-1.125 0.875-1.875 0.25-0.75 0.75-1.125 0.875-1.875 0.25-0.75 0.75-1.125 0.875-1.875 0.25-0.75 0.75-1.125 0.875-1.875 0.25-0.75 0.75-1.125 0.875-1.875 0.25-0.75 0.75-1.125 0.875-1.875 0.25-0.75 0.75-1.125 0.875-1.875 0.25-0.75 0.75-1.125 0.875-1.875 0.25-0.75 0.5-1.125 0.875-1.875 0.25-0.75 0.5-1.125 0.875-1.875 0.25-0.75 0.5-1.125 0.75-1.875 0.25-0.75 0.5-1.125 0.75-1.875 0.25-0.75 0.5-1.125 0.75-1.875 0.25-0.75 0.5-1.125 0.75-1.875 0.25-0.75 0.5-1.125 0.75-1.875 0.25-0.75 0.5-1.125 0.75-1.875 0.25-0.75 0.5-1.125 0.75-1.875 0.25-0.75 0.5-1.125 0.75-1.875 0.25-0.75 0.5-1.125 0.75-1.875 0.25-0.75 0.5-1.125 0.75-1.875 0.25-0.75 0.5-1.125 0.75-1.875 0.25-0.75 0.5-1.125 0.5-1.875 0.25-0.75 0.5-1.125 0.5-1.875 0.25-0.75 0.25-1.125 0.5-1.875s0.5-1.125 0.5-1.875c0.25-0.75 0.25-1.125 0.5-1.875s0.25-1.125 0.5-1.875 0.25-1.125 0.5-1.875 0.25-1.125 0.5-1.875 0.25-1.125 0.5-1.875c0-0.5 0.25-0.75 0.25-1.125-4.625 0.5-9.25 0.875-14 1.125-3.5 0.25-7 0.25-10.75 0.25-4 0-8.125 0-12.125-0.25-6.75-0.25-13.25-0.875-19.5-1.875-3.75-0.5-7.625-1.125-11.375-1.875-3-0.5-5.875-1.125-8.875-1.875-2.5-0.5-5.125-1.125-7.5-1.875-2.125-0.5-4.375-1.125-6.5-1.875-1.875-0.5-4-1.125-5.875-1.875-1.875-0.5-3.5-1.125-5.375-1.875-1.625-0.75-3.25-1.125-4.875-1.875-1.625-0.75-3-1.125-4.625-1.875-1.375-0.75-3-1.125-4.375-1.875s-2.75-1.125-4.25-1.875c-1.375-0.75-2.5-1.125-4-1.875-1.125-0.75-2.5-1.125-3.75-1.875-1.125-0.75-2.375-1.125-3.5-1.875-1.125-0.75-2.375-1.125-3.5-1.875-1.125-0.75-2.125-1.125-3.25-1.875-0.875-0.75-2.125-1.125-3-1.875s-2.125-1.125-3-1.875-1.875-1.125-3-1.875c-0.875-0.75-1.875-1.125-2.75-1.875-0.875-0.75-1.875-1.125-2.75-1.875-0.875-0.75-1.875-1.125-2.5-1.875-0.875-0.75-1.625-1.125-2.5-1.875s-1.625-1.125-2.5-1.875c-0.75-0.75-1.625-1.125-2.375-1.875-0.75-0.75-1.625-1.125-2.375-1.875-0.75-0.75-1.625-1.125-2.375-1.875-0.75-0.75-1.375-1.125-2.125-1.875-0.75-0.75-1.375-1.125-2.125-1.875-0.75-0.75-1.375-1.125-2.125-1.875-0.75-0.75-1.375-1.125-2.125-1.875-0.75-0.75-1.375-1.125-2.125-1.875-0.75-0.75-1.375-1.125-1.875-1.875l-1.875-1.875-1.875-1.875-1.875-1.875c-0.75-0.75-1.125-1.125-1.625-1.875s-1.125-1.125-1.625-1.875-1.125-1.125-1.625-1.875-1.125-1.125-1.625-1.875-1.125-1.125-1.625-1.875-0.875-1.125-1.625-1.875c-0.5-0.75-0.875-1.125-1.625-1.875-0.5-0.75-0.875-1.125-1.375-1.875-0.5-0.75-0.875-1.125-1.375-1.875-0.5-0.75-0.875-1.125-1.375-1.875-0.5-0.75-0.875-1.125-1.375-1.875-0.5-0.75-0.875-1.125-1.375-1.875-0.5-0.75-0.875-1.125-1.375-1.875-0.5-0.75-0.875-1.125-1.125-1.875-0.5-0.75-0.875-1.125-1.125-1.875-0.5-0.75-0.75-1.125-1.125-1.875-0.5-0.75-0.75-1.125-1.125-1.875-0.5-0.75-0.75-1.125-1.125-1.875-0.5-0.75-0.75-1.125-1.125-1.875-0.5-0.75-0.75-1.125-1.125-1.875-0.5-0.75-0.75-1.125-1.125-1.875-0.5-0.75-0.75-1.125-1.125-1.875-0.25-0.75-0.75-1.125-0.875-1.875-0.25-0.75-0.75-1.125-0.875-1.875-0.25-0.75-0.75-1.125-0.875-1.875-0.25-0.75-0.75-1.125-0.875-1.875-0.25-0.75-0.75-1.125-0.875-1.875-0.25-0.75-0.75-1.125-0.875-1.875-0.25-0.75-0.75-1.125-0.875-1.875-0.25-0.75-0.5-1.125-0.875-1.875-0.25-0.75-0.5-1.125-0.875-1.875-0.25-0.75-0.5-1.125-0.875-1.875-0.25-0.75-0.5-1.125-0.75-1.875-3.125-4.625-3.375-5.125-3.625-5.75z m433.625-71.25v-11.375c0-0.5 0-0.875-0.25-1.625 0-0.5 0-0.875-0.25-1.625 0-0.5 0-0.875-0.25-1.625 0-0.5-0.25-0.875-0.25-1.625 0-0.5-0.25-0.875-0.25-1.625 0-0.5-0.25-0.875-0.25-1.625 0-0.5-0.25-0.875-0.25-1.625 0-0.5-0.25-0.875-0.25-1.625 0-0.5-0.25-0.875-0.25-1.625 0-0.5-0.25-0.875-0.25-1.625 0-0.5-0.25-0.875-0.25-1.625 0-0.5-0.25-0.875-0.25-1.625 0-0.5-0.25-0.875-0.5-1.625-0.25-0.5-0.25-0.875-0.5-1.625-0.25-0.5-0.25-0.875-0.5-1.625-0.25-0.5-0.25-0.875-0.5-1.625-0.25-0.5-0.25-0.875-0.5-1.625-0.25-0.5-0.25-0.875-0.5-1.625-0.25-0.5-0.25-0.875-0.5-1.625-0.25-0.5-0.25-0.875-0.5-1.625-0.25-0.5-0.25-0.875-0.5-1.625-0.25-0.5-0.25-0.875-0.5-1.625-0.25-0.5-0.5-0.875-0.5-1.625-0.25-0.5-0.5-0.875-0.5-1.625-0.25-0.5-0.5-0.875-0.5-1.625-0.25-0.5-0.5-0.875-0.75-1.625-0.25-0.5-0.5-0.875-0.75-1.625-0.25-0.5-0.5-0.875-0.75-1.625-0.25-0.5-0.5-0.875-0.75-1.625-0.25-0.5-0.5-0.875-0.75-1.625-0.25-0.5-0.5-0.875-0.75-1.625-0.25-0.5-0.5-0.875-0.75-1.625-0.25-0.5-0.5-0.875-0.75-1.625-0.25-0.5-0.5-0.875-0.75-1.625-0.25-0.5-0.5-0.875-0.75-1.625-0.25-0.5-0.5-0.875-0.75-1.625-0.25-0.5-0.5-0.875-0.875-1.625-0.25-0.5-0.5-0.875-0.875-1.625-0.25-0.5-0.5-0.875-0.875-1.625-0.25-0.5-0.5-0.875-0.875-1.625-0.25-0.5-0.75-0.875-0.875-1.625-0.25-0.5-0.75-0.875-0.875-1.625-0.25-0.5-0.75-0.875-0.875-1.625-0.25-0.5-0.75-0.875-0.875-1.625-0.25-0.5-0.75-0.875-0.875-1.625-0.25-0.5-0.75-0.875-0.875-1.625-0.25-0.5-0.75-0.875-0.875-1.625-0.25-0.5-0.75-0.875-0.875-1.625-0.5-0.5-0.75-0.875-1.125-1.625-0.5-0.5-0.75-0.875-1.125-1.625-0.5-0.5-0.75-0.875-1.125-1.625-0.5-0.5-0.75-0.875-1.125-1.625-0.5-0.5-0.75-0.875-1.125-1.625-0.5-0.5-0.75-0.875-1.125-1.625-0.5-0.5-0.75-0.875-1.125-1.625-0.5-0.5-0.75-0.875-1.125-1.625-0.5-0.5-0.75-0.875-1.125-1.625-0.5-0.5-0.875-0.875-1.125-1.625-0.5-0.5-0.875-0.875-1.125-1.625-0.5-0.5-0.875-0.875-1.375-1.625-0.5-0.5-0.875-0.875-1.375-1.625-0.5-0.5-0.875-0.875-1.375-1.625-0.5-0.5-0.875-0.875-1.375-1.625-0.5-0.5-0.875-0.875-1.375-1.625-0.5-0.5-0.875-0.875-1.375-1.625-0.5-0.5-0.875-0.875-1.375-1.625-0.5-0.5-0.875-0.875-1.375-1.625-0.5-0.5-0.875-0.875-1.375-1.625-0.5-0.5-0.875-0.875-1.375-1.625l-1.625-1.625-1.625-1.625c-0.5-0.5-1.125-0.875-1.625-1.625-0.5-0.5-1.125-0.875-1.625-1.625-0.5-0.5-1.125-0.875-1.625-1.625-0.5-0.5-1.125-0.875-1.625-1.625-0.5-0.5-1.125-0.875-1.625-1.625-0.5-0.5-1.125-0.875-1.625-1.625-0.5-0.5-1.125-0.875-1.625-1.625-0.75-0.5-1.125-0.875-1.875-1.625-0.75-0.5-1.125-0.875-1.875-1.625-0.75-0.5-1.125-0.875-1.875-1.625-0.75-0.5-1.125-0.875-1.875-1.625-0.75-0.5-1.125-0.875-1.875-1.625-0.75-0.5-1.125-0.875-1.875-1.625-0.75-0.5-1.375-0.875-1.875-1.625-0.75-0.5-1.375-0.875-1.875-1.625-0.75-0.5-1.375-0.875-2.125-1.625-0.75-0.5-1.375-0.875-2.125-1.625l-0.75-0.5 0.25-0.875 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.25-1.125-2.125 1.125-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-0.5 0.25-0.875-0.25c-2.125-0.5-4.25-0.875-6-1.625-2.125-0.5-4.25-0.875-6.25-1.625-2.125-0.5-4.25-0.875-6.5-1.625-2.375-0.5-4.375-0.875-6.75-1.625-2.375-0.5-4.875-1.125-7.25-1.625-2.75-0.5-5.375-1.125-8.125-1.625-3.25-0.5-6.5-1.125-9.75-1.625-5.375-0.75-10.75-1.125-15.875-1.625-2.75-0.25-5.875-0.25-8.625-0.25-3.75 0-7.5 0-11.125 0.25-6.5 0.25-12.75 0.75-19.125 1.625-3.75 0.5-7.5 0.875-11 1.625-2.75 0.5-5.875 0.875-8.625 1.625-2.375 0.5-4.875 0.875-7.25 1.625-2.125 0.5-4.25 0.875-6.25 1.625-1.875 0.5-3.75 0.875-5.625 1.625-1.875 0.5-3.5 0.875-5.125 1.625-1.625 0.5-3.25 0.875-4.875 1.625-1.375 0.5-3 0.875-4.375 1.625-1.375 0.5-2.75 0.875-4.25 1.625-1.375 0.5-2.5 0.875-4 1.625-1.125 0.5-2.5 0.875-3.75 1.625-1.125 0.5-2.375 0.875-3.75 1.625-1.125 0.5-2.375 0.875-3.5 1.625-1.125 0.5-2.125 0.875-3.25 1.625-1.125 0.5-2.125 0.875-3.25 1.625-0.875 0.5-2.125 0.875-3 1.625-0.875 0.5-1.875 0.875-3 1.625-0.875 0.5-1.875 0.875-2.75 1.625-0.875 0.5-1.875 0.875-2.75 1.625-0.875 0.5-1.875 0.875-2.5 1.625-0.875 0.5-1.625 0.875-2.5 1.625-0.875 0.5-1.625 0.875-2.5 1.625-0.75 0.5-1.625 0.875-2.375 1.625-0.75 0.5-1.625 0.875-2.375 1.625-0.75 0.5-1.625 0.875-2.375 1.625-0.75 0.5-1.375 0.875-2.375 1.625-0.75 0.5-1.375 0.875-2.125 1.625-0.75 0.5-1.375 0.875-2.125 1.625-0.75 0.5-1.375 0.875-2.125 1.625-0.75 0.5-1.375 0.875-2.125 1.625-0.75 0.5-1.375 0.875-1.875 1.625-0.75 0.5-1.375 0.875-1.875 1.625-0.75 0.5-1.125 0.875-1.875 1.625-0.75 0.5-1.125 0.875-1.875 1.625-0.75 0.5-1.125 0.875-1.875 1.625-0.75 0.5-1.125 0.875-1.875 1.625-0.5 0.5-1.125 0.875-1.625 1.625-0.5 0.5-1.125 0.875-1.625 1.625-0.5 0.5-1.125 0.875-1.625 1.625-0.5 0.5-1.125 0.875-1.625 1.625l-1.625 1.625-1.625 1.625c-0.5 0.5-0.875 0.875-1.375 1.625-0.5 0.5-0.875 0.875-1.375 1.625-0.5 0.5-0.875 0.875-1.375 1.625-0.5 0.5-0.875 0.875-1.375 1.625-0.5 0.5-0.875 0.875-1.375 1.625-0.5 0.5-0.875 0.875-1.375 1.625-0.5 0.5-0.875 0.875-1.375 1.625-0.5 0.5-0.875 0.875-1.125 1.625-0.5 0.5-0.875 0.875-1.125 1.625-0.5 0.5-0.875 0.875-1.125 1.625-0.5 0.5-0.75 0.875-1.125 1.625-0.5 0.5-0.75 0.875-1.125 1.625-0.5 0.5-0.75 0.875-1.125 1.625-0.5 0.5-0.75 0.875-1.125 1.625-0.5 0.5-0.75 0.875-1.125 1.625-0.5 0.5-0.75 0.875-1.125 1.625-0.5 0.5-0.75 0.875-1.125 1.625-0.25 0.5-0.75 0.875-0.875 1.625-0.25 0.5-0.75 0.875-0.875 1.625-0.25 0.5-0.75 0.875-0.875 1.625-0.25 0.5-0.75 0.875-0.875 1.625-0.25 0.5-0.75 0.875-0.875 1.625-0.25 0.5-0.75 0.875-0.875 1.625-0.25 0.5-0.75 0.875-0.875 1.625-0.25 0.5-0.75 0.875-0.875 1.625-0.25 0.5-0.5 0.875-0.875 1.625-0.25 0.5-0.5 0.875-0.875 1.625-0.25 0.5-0.5 0.875-0.75 1.625-0.25 0.5-0.5 0.875-0.75 1.625-0.25 0.5-0.5 0.875-0.75 1.625-0.25 0.5-0.5 0.875-0.75 1.625-0.25 0.5-0.5 0.875-0.75 1.625-0.25 0.5-0.5 0.875-0.75 1.625-0.25 0.5-0.5 0.875-0.75 1.625-0.25 0.5-0.5 0.875-0.75 1.625-0.25 0.5-0.5 0.875-0.75 1.625-0.25 0.5-0.5 0.875-0.75 1.625-0.25 0.5-0.5 0.875-0.75 1.625-0.25 0.5-0.5 0.875-0.75 1.625-0.25 0.5-0.5 0.875-0.5 1.625-0.25 0.5-0.5 0.875-0.5 1.625-0.25 0.5-0.5 0.875-0.5 1.625-0.25 0.5-0.5 0.875-0.5 1.625-0.25 0.5-0.5 0.875-0.5 1.625-0.25 0.5-0.25 0.875-0.5 1.625-0.25 0.5-0.25 0.875-0.5 1.625-0.25 0.5-0.25 0.875-0.5 1.625-0.25 0.5-0.25 0.875-0.5 1.625-0.25 0.5-0.25 0.875-0.5 1.625-0.25 0.5-0.25 0.875-0.5 1.625-0.25 0.5-0.25 0.875-0.5 1.625-0.25 0.5-0.25 0.875-0.5 1.625-0.25 0.5-0.25 0.875-0.5 1.625-0.25 0.5-0.25 0.875-0.25 1.625 0 0.5-0.25 0.875-0.25 1.625 0 0.5-0.25 0.875-0.25 1.625 0 0.5-0.25 0.875-0.25 1.625 0 0.5-0.25 0.875-0.25 1.625 0 0.5-0.25 0.875-0.25 1.625 0 0.5-0.25 0.875-0.25 1.625 0 0.5-0.25 0.875-0.25 1.625 0 0.5-0.25 0.875-0.25 1.625 0 0.5-0.25 0.875-0.25 1.625 0 0.5-0.25 0.875-0.25 1.625 0 0.5-0.25 0.875-0.25 1.625 0 0.5 0 0.875-0.25 1.625 0 0.5 0 0.875-0.25 1.625 0 0.5 0 0.875-0.25 1.625v1.625 1.625 1.625 3.25 1.625 3.25 1.375 1.625 1.625 1.625 1.625 1.625 1.625 1.625 1.625 1.625c0 0.5 0 0.875 0.25 1.625 0 0.5 0 0.875 0.25 1.625 0 0.5 0 0.875 0.25 1.625 0 0.5 0.25 0.875 0.25 1.625 0 0.5 0.25 0.875 0.25 1.625 0 0.5 0.25 0.875 0.25 1.625 0 0.5 0.25 0.875 0.25 1.625 0 0.5 0.25 0.875 0.25 1.625 0 0.5 0.25 0.875 0.25 1.625 0 0.5 0.25 0.875 0.25 1.625 0 0.5 0.25 0.875 0.25 1.625 0 0.5 0.25 0.875 0.25 1.625 0 0.5 0.25 0.875 0.25 1.625 0 0.5 0.25 0.875 0.25 1.625 0 0.5 0.25 0.875 0.25 1.625 0.25 0.5 0.25 0.875 0.5 1.625 0.25 0.5 0.25 0.875 0.5 1.625 0.25 0.5 0.25 0.875 0.5 1.625 0.25 0.5 0.25 0.875 0.5 1.625 0.25 0.5 0.25 0.875 0.5 1.625 0.25 0.5 0.25 0.875 0.5 1.625 0.25 0.5 0.25 0.875 0.5 1.625 0.25 0.5 0.25 0.875 0.5 1.625 0.25 0.5 0.25 0.875 0.5 1.625 0.25 0.5 0.5 0.875 0.5 1.625 0.25 0.5 0.5 0.875 0.5 1.625 0.25 0.5 0.5 0.875 0.5 1.625 0.25 0.5 0.5 0.875 0.5 1.625 0.25 0.5 0.5 0.875 0.5 1.625 0.25 0.5 0.5 0.875 0.75 1.625 0.25 0.5 0.5 0.875 0.75 1.625 0.25 0.5 0.5 0.875 0.75 1.625 0.25 0.5 0.5 0.875 0.75 1.625 0.25 0.5 0.5 0.875 0.75 1.625 0.25 0.5 0.5 0.875 0.75 1.625 0.25 0.5 0.5 0.875 0.75 1.625 0.25 0.5 0.5 0.875 0.75 1.625 0.25 0.5 0.5 0.875 0.75 1.625 0.25 0.5 0.5 0.875 0.75 1.625 0.25 0.5 0.5 0.875 0.75 1.625 0.25 0.5 0.5 0.875 0.875 1.625 0.25 0.5 0.5 0.875 0.875 1.625 0.25 0.5 0.5 0.875 0.875 1.625 0.25 0.5 0.75 0.875 0.875 1.625 0.25 0.5 0.75 0.875 0.875 1.625 0.25 0.5 0.75 0.875 0.875 1.625 0.25 0.5 0.75 0.875 0.875 1.625 0.25 0.5 0.75 0.875 0.875 1.625 0.25 0.5 0.75 0.875 0.875 1.625 0.25 0.5 0.75 0.875 0.875 1.625 0.25 0.5 0.75 0.875 0.875 1.625 0.25 0.5 0.75 0.875 1.125 1.625 0.5 0.5 0.75 0.875 1.125 1.625 0.5 0.5 0.75 0.875 1.125 1.625 0.5 0.5 0.75 0.875 1.125 1.625 0.5 0.5 0.75 0.875 1.125 1.625 0.5 0.5 0.75 0.875 1.125 1.625 0.5 0.5 0.75 0.875 1.125 1.625 0.5 0.5 0.875 0.875 1.125 1.625 0.5 0.5 0.875 0.875 1.125 1.625 0.5 0.5 0.875 0.875 1.125 1.625 0.5 0.5 0.875 0.875 1.375 1.625 0.5 0.5 0.875 0.875 1.375 1.625 0.5 0.5 0.875 0.875 1.375 1.625 0.5 0.5 0.875 0.875 1.375 1.625 0.5 0.5 0.875 0.875 1.375 1.625 0.5 0.5 0.875 0.875 1.375 1.625 0.5 0.5 0.875 0.875 1.375 1.625l1.625 1.625 1.625 1.625c0.5 0.5 1.125 0.875 1.625 1.625 0.5 0.5 1.125 0.875 1.625 1.625 0.5 0.5 1.125 0.875 1.625 1.625 0.5 0.5 1.125 0.875 1.625 1.625 0.5 0.5 1.125 0.875 1.875 1.625 0.75 0.5 1.125 0.875 1.875 1.625 0.75 0.5 1.125 0.875 1.875 1.625 0.75 0.5 1.125 0.875 1.875 1.625 0.75 0.5 1.375 0.875 1.875 1.625 0.75 0.5 1.375 0.875 1.875 1.625 0.75 0.5 1.375 0.875 2.125 1.625 0.75 0.5 1.375 0.875 2.125 1.625 0.75 0.5 1.375 0.875 2.125 1.625 0.75 0.5 1.375 0.875 2.125 1.625 0.75 0.5 1.375 0.875 2.375 1.625 0.75 0.5 1.625 0.875 2.375 1.625 0.75 0.5 1.625 0.875 2.375 1.625 0.75 0.5 1.625 0.875 2.375 1.625 0.875 0.5 1.625 0.875 2.5 1.625 0.875 0.5 1.625 0.875 2.5 1.625 0.875 0.5 1.875 0.875 2.5 1.625 0.875 0.5 1.875 0.875 2.75 1.625 0.875 0.5 1.875 0.875 2.75 1.625 0.875 0.5 1.875 0.875 3 1.625 0.875 0.5 2.125 0.875 3 1.625 1.125 0.5 2.125 0.875 3.25 1.625 1.125 0.5 2.125 0.875 3.25 1.625 1.125 0.5 2.375 0.875 3.5 1.625 1.125 0.5 2.375 0.875 3.75 1.625 1.125 0.5 2.5 0.875 3.75 1.625 1.375 0.5 2.5 0.875 4 1.625 1.375 0.5 2.75 0.875 4.25 1.625 1.375 0.5 3 0.875 4.375 1.625 1.625 0.5 3.25 0.875 4.875 1.625 1.625 0.5 3.5 0.875 5.125 1.625 1.875 0.5 3.75 0.875 5.875 1.625 2.125 0.5 4.25 1.125 6.25 1.625 2.375 0.5 4.875 1.125 7.25 1.625 2.75 0.5 5.875 1.125 8.625 1.625 3.75 0.75 7.5 1.125 11.125 1.625 9.25 1.125 19.125 1.625 28.875 1.625h1.375c9.25 0 18.375-0.75 27.5-1.625 3.75-0.5 7.25-0.875 10.75-1.625 2.75-0.5 5.625-0.875 8.375-1.625 2.375-0.5 4.625-0.875 7-1.625 2.125-0.5 4.25-0.875 6.25-1.625 1.875-0.5 3.75-0.875 5.625-1.625 1.625-0.5 3.5-0.875 5.125-1.625 1.625-0.5 3.25-0.875 4.625-1.625 1.375-0.5 3-0.875 4.375-1.625 1.375-0.5 2.75-0.875 4.25-1.625 1.375-0.5 2.5-0.875 4-1.625 1.125-0.5 2.5-0.875 3.75-1.625 1.125-0.5 2.375-0.875 3.5-1.625 1.125-0.5 2.375-0.875 3.5-1.625 1.125-0.5 2.125-0.875 3.25-1.625 1.125-0.5 2.125-0.875 3.25-1.625 0.875-0.5 2.125-0.875 3-1.625 0.875-0.5 1.875-0.875 3-1.625 0.875-0.5 1.875-0.875 2.75-1.625 0.875-0.5 1.875-0.875 2.75-1.625 0.875-0.5 1.875-0.875 2.5-1.625 0.875-0.5 1.625-0.875 2.5-1.625 0.875-0.5 1.625-0.875 2.5-1.625 0.875-0.5 1.625-0.875 2.5-1.625 0.75-0.5 1.625-0.875 2.375-1.625 0.75-0.5 1.625-0.875 2.375-1.625 0.75-0.5 1.375-0.875 2.375-1.625 0.75-0.5 1.375-0.875 2.125-1.625 0.75-0.5 1.375-0.875 2.125-1.625 0.75-0.5 1.375-0.875 2.125-1.625 0.75-0.5 1.375-0.875 2.125-1.625 0.75-0.5 1.375-0.875 1.875-1.625 0.75-0.5 1.375-0.875 1.875-1.625 0.75-0.5 1.125-0.875 1.875-1.625 0.75-0.5 1.125-0.875 1.875-1.625 0.75-0.5 1.125-0.875 1.875-1.625 0.75-0.5 1.125-0.875 1.875-1.625 0.5-0.5 1.125-0.875 1.625-1.625 0.5-0.5 1.125-0.875 1.625-1.625 0.5-0.5 1.125-0.875 1.625-1.625 0.5-0.5 1.125-0.875 1.625-1.625 0.5-0.5 1.125-0.875 1.625-1.625l1.625-1.625 1.625-1.625c0.5-0.5 0.875-0.875 1.375-1.625 0.5-0.5 0.875-0.875 1.375-1.625 0.5-0.5 0.875-0.875 1.375-1.625 0.5-0.5 0.875-0.875 1.375-1.625 0.5-0.5 0.875-0.875 1.375-1.625 0.5-0.5 0.875-0.875 1.375-1.625 0.5-0.5 0.875-0.875 1.375-1.625 0.5-0.5 0.875-0.875 1.375-1.625 0.5-0.5 0.875-0.875 1.125-1.625 0.5-0.5 0.75-0.875 1.125-1.625 0.5-0.5 0.875-0.875 1.125-1.625 0.5-0.5 0.75-0.875 1.125-1.625 0.5-0.5 0.75-0.875 1.125-1.625 0.5-0.5 0.75-0.875 1.125-1.625 0.5-0.5 0.75-0.875 1.125-1.625 0.5-0.5 0.75-0.875 1.125-1.625 0.5-0.5 0.75-0.875 1.125-1.625 0.5-0.5 0.75-0.875 0.875-1.625 0.25-0.5 0.75-0.875 0.875-1.625 0.25-0.5 0.75-0.875 0.875-1.625 0.25-0.5 0.75-0.875 0.875-1.625 0.25-0.5 0.75-0.875 0.875-1.625 0.25-0.5 0.75-0.875 0.875-1.625 0.25-0.5 0.75-0.875 0.875-1.625 0.25-0.5 0.5-0.875 0.875-1.625 0.25-0.5 0.75-0.875 0.875-1.625 0.25-0.5 0.5-0.875 0.875-1.625 0.25-0.5 0.5-0.875 0.875-1.625 0.25-0.5 0.5-0.875 0.875-1.625 0.25-0.5 0.5-0.875 0.75-1.625 0.25-0.5 0.5-0.875 0.75-1.625 0.25-0.5 0.5-0.875 0.75-1.625 0.25-0.5 0.5-0.875 0.75-1.625 0.25-0.5 0.5-0.875 0.75-1.625 0.25-0.5 0.5-0.875 0.75-1.625 0.25-0.5 0.5-0.875 0.75-1.625 0.25-0.5 0.5-0.875 0.75-1.625 0.25-0.5 0.5-0.875 0.75-1.625 0.25-0.5 0.5-0.875 0.75-1.625 0.25-0.5 0.5-0.875 0.75-1.625 0.25-0.5 0.5-0.875 0.5-1.625 0.25-0.5 0.5-0.875 0.5-1.625 0.25-0.5 0.5-0.875 0.5-1.625 0.25-0.5 0.25-0.875 0.5-1.625 0.25-0.5 0.25-0.875 0.5-1.625 0.25-0.5 0.25-0.875 0.5-1.625 0.25-0.5 0.25-0.875 0.5-1.625 0.25-0.5 0.25-0.875 0.5-1.625 0.25-0.5 0.25-0.875 0.5-1.625 0.25-0.5 0.25-0.875 0.5-1.625 0.25-0.5 0.25-0.875 0.5-1.625 0.25-0.5 0.25-0.875 0.5-1.625 0.25-0.5 0.25-0.875 0.5-1.625 0.25-0.5 0.25-0.875 0.5-1.625 0.25-0.5 0.25-0.875 0.5-1.625 0-0.5 0.25-0.875 0.25-1.625 0-0.5 0.25-0.875 0.25-1.625 0-0.5 0.25-0.875 0.25-1.625 0-0.5 0.25-0.875 0.25-1.625 0-0.5 0.25-0.875 0.25-1.625 0-0.5 0.25-0.875 0.25-1.625 0-0.5 0.25-0.875 0.25-1.625 0-0.5 0.25-0.875 0.25-1.625 0-0.5 0.25-0.875 0.25-1.625 0-0.5 0-0.875 0.25-1.625 0-0.5 0-0.875 0.25-1.625 0-0.5 0-0.875 0.25-1.625 0-0.5 0-0.875 0.25-1.625 0-0.5 0-0.875 0.25-1.625v-11.375h-3.125zM589.714646 384c-12.625 0-25.375-12.75-25.375-25.375 0-12.75 12.75-25.375 25.375-25.375 19.375 0 31.875 12.625 31.875 25.375-0.125 12.625-12.75 25.375-31.875 25.375zM729.589646 384c-12.625 0-25.375-12.75-25.375-25.375 0-12.75 12.75-25.375 25.375-25.375 19.125 0 31.875 12.625 31.875 25.375 0 12.625-12.75 25.375-31.875 25.375zM328.714646 568.75c-19.125 0-38.375-12.625-38.375-31.625 0-19.125 19.375-31.875 38.375-31.875s31.875 12.75 31.875 31.875-12.875 31.625-31.875 31.625zM506.964646 568.75c-19.125 0-38.125-12.625-38.125-31.625 0-19.125 19.125-31.875 38.125-31.875 19.125 0 31.875 12.75 31.875 31.875s-12.875 31.625-31.875 31.625z"  horiz-adv-x="1059" />
+
+    
+    <glyph glyph-name="shrink-right" unicode="&#58984;" d="M52.294-28.71900000000005h899.793c16.546 0 29.999 13.405 29.999 29.999v59.974c-0.013 16.562-13.436 29.985-29.998 29.999h-899.795c-16.57 0-29.999-13.429-29.999-29.999v-59.974c0-16.617 13.429-29.999 29.999-29.999zM952.087 451.165h-479.884c-16.57 0-29.999-13.405-29.999-29.999v-59.974c0 0 0 0 0 0 0-16.572 13.428-30.01 29.997-30.022h479.885c16.571 0.013 29.999 13.448 29.999 30.022 0 0 0 0 0 0v59.974c0 16.593-13.429 29.999-29.999 29.999zM52.294 691.0840000000001h899.793c16.554 0.013 29.972 13.423 29.999 29.974v59.999c0 16.57-13.429 29.999-29.999 29.999h-899.793c-16.57 0-29.999-13.429-29.999-29.999v-59.997c0-16.546 13.429-29.975 29.999-29.975zM45.183 383.53499999999997l239.919-150.598v301.196l-239.919-150.598z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="spread-left" unicode="&#58987;" d="M942.974 770.924h-843.556c-15.513 0-28.124-12.567-28.124-28.124v-56.226c0.012-15.527 12.596-28.111 28.123-28.124h843.559c15.534 0 28.124 12.59 28.124 28.124v56.226c0 15.578-12.59 28.124-28.124 28.124zM99.418 321.033h449.891c15.534 0 28.124 12.567 28.124 28.124v56.226c0 0 0 0 0 0 0 15.537-12.589 28.134-28.122 28.146h-449.892c-15.534-0.012-28.124-12.608-28.124-28.146 0 0 0 0 0 0v-56.226c0-15.556 12.59-28.124 28.124-28.124zM942.974 96.10900000000004h-843.556c-15.519-0.012-28.099-12.584-28.124-28.101v-56.249c0-15.534 12.59-28.124 28.124-28.124h843.556c15.534 0 28.124 12.59 28.124 28.124v56.248c0 15.513-12.59 28.103-28.124 28.102zM949.641 384.436l-224.924 141.186v-282.37l224.924 141.186z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="camera" unicode="&#58976;" d="M884.3 648.6H704.2L679.5 698l-0.2 0.4c-1.9 3.6-3.6 6.9-5.1 9.9-12 23.4-21.5 41.9-54.1 41.9H416.7c-32.9 0-43.7-21.3-55.1-43.8-1.3-2.6-2.7-5.3-4.2-8.1l-24.8-49.7H152.4c-34 0-61.7-27.7-61.7-61.7v-488c0-34 27.7-61.7 61.7-61.7h731.9c34 0 61.7 27.7 61.7 61.7v488c0 34-27.7 61.7-61.7 61.7zM904 98.89999999999998c0-10.8-8.8-19.7-19.7-19.7H152.4c-10.8 0-19.7 8.8-19.7 19.7v488c0 10.8 8.8 19.7 19.7 19.7h206.1l36.2 72.5c1.5 2.9 2.9 5.7 4.3 8.3 10.6 20.8 11.1 20.8 17.7 20.8H620c4.6 0 5.8-0.6 5.8-0.6 2-1.2 7.2-11.2 10.9-18.5 1.6-3.1 3.3-6.5 5.3-10.1l36.2-72.4h206.1c10.8 0 19.7-8.8 19.7-19.7v-488zM525.5 565.5c-123.5 0-223.6-100.1-223.6-223.6S402 118.20000000000005 525.5 118.20000000000005s223.7 100.1 223.7 223.7c0 123.5-100.2 223.6-223.7 223.6z m0-402.5c-98.8 0-178.9 80.1-178.9 178.9 0 98.8 80.1 178.9 178.9 178.9 98.8 0 178.9-80.1 178.9-178.9 0-98.8-80.1-178.9-178.9-178.9z m246 402.5v-44.7H861v44.7h-89.5z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="note" unicode="&#58990;" d="M987.2 384.36L512.43 859.13a84.75 84.75 0 0 1-65 24.71L111.55 864.09a84.83 84.83 0 0 1-79.65-79.65L12.15 448.57a84.57 84.57 0 0 1 24.69-65l474.8-474.8a84.91 84.91 0 0 1 119.93 0L987.2 264.41999999999996a84.9 84.9 0 0 1 0 119.94z m-39.28-80.66L592.29-51.91999999999996a29.31 29.31 0 0 0-41.37 0L76.1 422.9a29.22 29.22 0 0 0-8.49 22.38l19.74 335.88a29.29 29.29 0 0 0 27.48 27.48l335.9 19.75a29.32 29.32 0 0 0 22.38-8.52l474.8-474.8a29.31 29.31 0 0 0 0.01-41.37zM236.86 659.14c-50.92-50.95-50.92-133.8 0-184.72a130.61 130.61 0 1 1 184.71 184.72c-50.89 50.86-133.77 50.86-184.71 0zM382.29 513.7c-28.38-28.38-77.78-28.38-106.15 0a75.08 75.08 0 1 0 106.15 0z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="refresh" unicode="&#58985;" d="M928 810.666667c-18.133333 0-32-13.866667-32-32v-164.266667C816 747.733333 669.866667 832 512 832 264.533333 832 64 631.4666669999999 64 384s200.533333-448 448-448c230.4 0 422.4 172.8 445.866667 402.133333 2.133333 17.066667-10.666667 33.066667-28.8 35.2-17.066667 2.133333-33.066667-10.666667-35.2-28.8C873.6 148.26666699999998 709.333333 0 512 0c-212.266667 0-384 171.733333-384 384s171.733333 384 384 384c137.6 0 264.533333-74.666667 332.8-192H693.333333c-18.133333 0-32-13.866667-32-32s13.866667-32 32-32h266.666667V778.666667c0 18.133333-14.933333 32-32 32z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="female" unicode="&#58977;" d="M774.4 800c-48 35.2-108.8 51.2-172.8 51.2-105.6 0-208-51.2-268.8-150.4-89.6-134.4-57.6-313.6 60.8-416l-32-51.2-188.8 121.6S128 384 108.8 352c-22.4-35.2 22.4-64 22.4-64l188.8-121.6-105.6-163.2s-19.2-32 16-51.2c38.4-22.4 57.6 12.8 57.6 12.8l102.4 160 185.6-121.6s48-28.8 70.4 6.4c19.2 28.8-25.6 57.6-25.6 57.6L432 192l32 48c44.8-22.4 92.8-32 137.6-32 105.6 0 208 51.2 268.8 150.4 96 147.2 51.2 345.6-96 441.6z m35.2-400c-44.8-67.2-118.4-108.8-201.6-108.8-44.8 0-92.8 12.8-131.2 38.4-112 73.6-147.2 220.8-73.6 332.8 44.8 64 121.6 105.6 201.6 108.8 44.8 0 92.8-12.8 131.2-38.4 112-73.6 147.2-220.8 73.6-332.8z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="male" unicode="&#58978;" d="M889.6 800h-240s-35.2 0-38.4-41.6c0-19.2 16-38.4 38.4-38.4h140.8l-179.2-179.2C556.8 582.4 489.6 608 416 608 240 608 96 464 96 288s144-320 320-320 320 144 320 320c0 73.6-25.6 140.8-67.2 195.2l179.2 179.2v-140.8c0-22.4 19.2-38.4 38.4-38.4 22.4 0 38.4 19.2 38.4 41.6V764.8h3.2C924.8 800 889.6 800 889.6 800zM416 48c-131.2 0-236.8 105.6-236.8 236.8 0 131.2 105.6 236.8 236.8 236.8s236.8-105.6 236.8-236.8c0-131.2-105.6-236.8-236.8-236.8z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="screen-restore" unicode="&#59224;" d="M582.6 454.6v320h50V540l274 274 35.4-35.4-274-274h234.6v-50h-320zM117.4-46l274 274v-234.6h50v320h-320v-50H356l-274-274 35.4-35.4zM132 764h302V814H82v-352h50V764z m760-760H590v-50h352V306h-50v-302z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="password" unicode="&#58995;" d="M519.2 343.29999999999995c-41.1 0-74.4-33.3-74.4-74.4 0-29.7 17.5-55 42.5-67.1v-81.9c0-17.6 14.3-31.9 31.9-31.9 17.6 0 31.9 14.3 31.9 31.9v81.9c25.1 12 42.5 37.4 42.5 66.9 0 41.3-33.2 74.6-74.4 74.6zM827.6-62.10000000000002H189.4c-35.9 0-65.1 29.2-65.1 65.1V428.4c0 35.9 29.2 65.1 65.1 65.1h638.2c17.3 0 33.7-6.7 46-19.1 12.3-12.3 19.1-28.7 19.1-46V3c0-35.9-29.2-65.1-65.1-65.1zM231.9 427.2c-34.8 0-41.3-6.6-41.3-41.3v-340.4c0-34.8 6.6-41.3 41.3-41.3h553.2c34.8 0 41.3 6.6 41.3 41.3V385.9c0 34.8-6.6 41.3-41.3 41.3H231.9zM519.2 86.70000000000005c-18.3 0-33.2 14.8-33.2 33.2V201c-26.3 12.8-42.6 38.8-42.6 67.8 0 41.8 33.9 75.7 75.7 75.7s75.7-33.9 75.7-75.7c0-29-16.3-55-42.5-67.8v-81.1c0.1-18.2-14.9-33.2-33.1-33.2zM519.2 342c-40.4 0-73.2-32.9-73.2-73.2 0-28.3 16.1-53.6 41.9-65.8l0.7-0.4V120c0-17 13.7-30.7 30.7-30.7S550 103.10000000000002 550 120v82.6l0.7 0.4c25.8 12.3 41.9 37.5 41.9 65.8-0.2 40.4-33.1 73.2-73.4 73.2zM207 523.1c-9.1 0-17.6 3.5-23.9 10-6.4 6.4-10 15-10 23.9v2h-0.2l0.2 1.4c0.1 0.5 0.1 0.9 0.2 1.4l0.2 1c0.1 0.6 0.2 1.4 0.4 2 15.3 75.7 57 144.2 117.2 193 29.9 24.2 63.4 43 99.8 56 37.5 13.3 77 20.2 117.5 20.2 61 0 120.8-16.3 173-47.2 50.6-29.9 93-72.8 122.5-123.8 4-5.6 6.1-12.2 6.1-19.2 0-18.3-15-33.3-33.3-33.3-13.2 0-25.1 7.7-30.4 19.8-49.2 84.6-140.4 137.4-238 137.4-128.1 0-238.2-87.1-267.6-211.8v-0.2c-0.7-18.4-15.4-32.6-33.7-32.6z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="senior" unicode="&#58996;" d="M719.9 249.39999999999998L514.7 379.5V485.1C615.6 419 731.5 344 731.5 344s139.2-45.6 139.2 106.5c0 93-172.5 112.1-197.2 11.8l-69.6 47.3s24.2 101.5 162.4 106.5c138.2 4.9 192-94.6 190.9-199.6-1.2-104.7-136-198.3-237.3-167.1zM561 414c-4-19-23-33.7-47.6-33.7l-6.9 4.3-217.3 137.8S171 555.2 160.8 439c-10.2-116.1 147.4-129.5 186.8-23.8l81.7-47.6s-65.1-119.1-198.5-119.1C97.3 248.5 0.6 423.8 114 546.3c113.5 122.4 218.6 64.6 257 35.7 16.4-12.4 85.3-57.9 158.6-105.9l3.1-2.4c28.3-18.2 33.4-35.6 28.3-59.7zM434.1 149.70000000000005h212c16.7 0 30.3-13.6 30.3-30.3v-15.1c0-16.7-13.6-30.3-30.3-30.3h-212c-16.7 0-30.3 13.6-30.3 30.3v15.1c0 16.8 13.6 30.3 30.3 30.3z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="theme" unicode="&#58986;" d="M512 800C229.696 800 0 570.304 0 288c0-90.368 30.304-174.496 85.344-236.896 55.264-62.624 129.152-97.12 208.128-97.12 81.568 0 161.536 36.832 231.264 106.592l2.272 2.496c65.792 81.472 132.896 121.056 205.088 121.056 46.72 0 89.216-15.872 126.688-29.92 30.336-11.328 56.576-21.12 81.216-21.12C1024 133.08799999999997 1024 241.664 1024 288c0 282.304-229.696 512-512 512z m428-602.912c-13.088 0-35.296 8.288-58.784 17.088-40.48 15.136-90.848 33.952-149.12 33.952-92.352 0-175.328-46.944-253.76-143.456-57.184-56.704-121.056-86.688-184.832-86.688-60.352 0-117.216 26.784-160.128 75.456C88.64 144.12800000000004 64 213.216 64 288 64 535.04 264.96 736 512 736s448-200.96 448-448c0-27.328-1.952-90.912-20-90.912zM800.704 379.93600000000004m-64 0a64 64 0 1 1 128 0 64 64 0 1 1-128 0ZM457.024 582.624m-64 0a64 64 0 1 1 128 0 64 64 0 1 1-128 0ZM672.704 555.9359999999999m-64 0a64 64 0 1 1 128 0 64 64 0 1 1-128 0ZM291.392 443.936m-64 0a64 64 0 1 1 128 0 64 64 0 1 1-128 0ZM278.4 197.24800000000005m-96 0a96 96 0 1 1 192 0 96 96 0 1 1-192 0Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="tread" unicode="&#59077;" d="M860.8 172.79999999999995l6.4-57.6-6.4 57.6c12.8 0 25.6 3.2 35.2 12.8 6.4 9.6 6.4 22.4 3.2 32l57.6 12.8-57.6-12.8L800 553.6c-6.4 28.8-25.6 51.2-48 64-9.6 6.4-22.4 9.6-32 9.6H182.4c-22.4 3.2-41.6-6.4-51.2-25.6-6.4-9.6-6.4-19.2-9.6-28.8v-342.4c0-19.2 9.6-38.4 28.8-48 6.4-3.2 12.8-6.4 19.2-6.4h192l19.2-25.6 147.2-188.8c6.4-9.6 19.2-12.8 28.8-9.6 16 3.2 25.6 19.2 22.4 35.2l-9.6 118.4-6.4 67.2h297.6z m-233.6-57.6l9.6-128c3.2-28.8-9.6-54.4-28.8-73.6-35.2-32-92.8-28.8-124.8 6.4l-156.8 195.2H179.2c-19.2 0-38.4 6.4-57.6 16-35.2 19.2-57.6 57.6-57.6 99.2V572.8c0 19.2 6.4 38.4 16 57.6 19.2 38.4 57.6 60.8 99.2 54.4h537.6c67.2-3.2 121.6-48 137.6-112l102.4-339.2c6.4-28.8 3.2-57.6-12.8-80-19.2-22.4-48-38.4-76.8-38.4h-240zM304 627.2v-451.2h57.6V627.2H304z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="praise" unicode="&#59078;" d="M860.8 595.2h-297.6l6.4 67.2 9.6 118.4c3.2 16-6.4 32-22.4 35.2-9.6 3.2-22.4 0-28.8-9.6l-147.2-188.8-19.2-25.6h-192c-6.4 0-12.8-3.2-19.2-6.4-19.2-9.6-28.8-28.8-28.8-48v-342.4c0-9.6 3.2-22.4 9.6-28.8 9.6-19.2 28.8-28.8 48-25.6h537.6c12.8 0 22.4 3.2 32 9.6 25.6 12.8 44.8 35.2 48 64l102.4 336 57.6-12.8-57.6 12.8c3.2 9.6 0 22.4-3.2 32-9.6 6.4-22.4 12.8-35.2 12.8l6.4 57.6-6.4-57.6z m-233.6 57.6h240c28.8 0 57.6-12.8 76.8-38.4 16-22.4 19.2-54.4 12.8-80l-102.4-339.2c-16-64-70.4-108.8-137.6-112H179.2c-41.6-3.2-80 19.2-99.2 54.4-9.6 19.2-16 38.4-16 57.6V537.6c0 41.6 22.4 80 57.6 99.2 19.2 9.6 38.4 12.8 57.6 16h144L480 848c32 35.2 89.6 38.4 124.8 6.4 19.2-19.2 32-44.8 28.8-73.6l-6.4-128z m-323.2-512h57.6V592H304v-451.2z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="star-fill" unicode="&#58968;" d="M752-43.200000000000045c-9.6 0-20.8 3.2-30.4 8l-208 104-209.6-104c-20.8-11.2-48-9.6-67.2 4.8-19.2 14.4-30.4 40-25.6 64l43.2 224L89.6 411.2C72 428.8 65.6 456 72 478.4c8 24 27.2 41.6 52.8 44.8l228.8 41.6 102.4 208c11.2 22.4 33.6 36.8 57.6 36.8s48-14.4 57.6-36.8l102.4-208 228.8-40c24-3.2 44.8-20.8 51.2-44.8 8-24 1.6-49.6-16-67.2L772.8 257.6l41.6-224c4.8-25.6-6.4-49.6-25.6-64-9.6-8-22.4-12.8-36.8-12.8z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="rate" unicode="&#59003;" d="M959.008 489.984l-308 47.008L512 832 372.992 536.992l-308-47.008 223.008-228-52.992-324L512 90.976l276.992-152.992-52.992 324zM512 156L304 39.00800000000004l40 235.008-179.008 182.016 242.016 32 104.992 224 104-224 240.992-34.016L680 273.024l36.992-235.008z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="template-1" unicode="&#58966;" d="M512 384zM43.52 601.6l409.6-176.64c58.88-30.72 110.08 0 110.08 0l414.72 174.08 2.56 2.56c10.24 5.12 15.36 15.36 15.36 28.16 0 15.36-10.24 28.16-23.04 30.72L563.2 837.12c-56.32 23.04-97.28 0-97.28 0L46.08 660.48c-12.8-5.12-20.48-17.92-20.48-30.72s7.68-23.04 17.92-28.16z m0 0M512 222.72000000000003c-2.56 0-7.68 0-10.24 2.56l-486.4 215.04c-12.8 5.12-17.92 20.48-12.8 33.28 5.12 12.8 20.48 17.92 33.28 12.8L512 276.48 988.16 486.4c12.8 5.12 28.16 0 33.28-12.8 5.12-12.8 0-28.16-12.8-33.28l-486.4-215.04c-2.56-2.56-7.68-2.56-10.24-2.56zM512 71.67999999999995c-2.56 0-7.68 0-10.24 2.56l-486.4 215.04c-12.8 5.12-17.92 20.48-12.8 33.28 5.12 10.24 20.48 17.92 33.28 10.24L512 125.44000000000005 988.16 332.79999999999995c12.8 5.12 28.16 0 33.28-12.8 5.12-12.8 0-28.16-12.8-33.28l-486.4-215.04H512zM512-79.36000000000001c-2.56 0-7.68 0-10.24 2.56l-486.4 215.04c-12.8 5.12-17.92 20.48-12.8 33.28 5.12 12.8 20.48 17.92 33.28 12.8L512-25.600000000000023l476.16 209.92c12.8 5.12 28.16 0 33.28-12.8 5.12-12.8 0-28.16-12.8-33.28l-486.4-215.04c-2.56-2.56-7.68-2.56-10.24-2.56z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="vercode" unicode="&#59001;" d="M513.807059-128C351.171765-128 58.428235 126.19294100000002 54.211765 376.16941199999997V662.287059a93.364706 93.364706 0 0 0 81.317647 88.545882 570.428235 570.428235 0 0 1 163.237647 40.357647A393.336471 393.336471 0 0 1 446.945882 872.508235a101.797647 101.797647 0 0 0 120.470589 5.421177A629.458824 629.458824 0 0 1 716.8 792.395294a1255.303529 1255.303529 0 0 1 169.863529-38.550588 98.785882 98.785882 0 0 0 79.510589-90.955294 2911.171765 2911.171765 0 0 0-3.011765-291.538824C924.611765 49.09176500000001 672.828235-128 513.807059-128z m0 963.764706a39.152941 39.152941 0 0 1-24.696471-7.830588A438.512941 438.512941 0 0 0 319.247059 734.569412a608.376471 608.376471 0 0 0-180.705883-43.369412 33.731765 33.731765 0 0 1-24.094117-30.117647v-283.708235C118.663529 155.10588199999995 389.722353-67.76470600000005 513.807059-67.76470600000005s354.183529 148.178824 391.529412 444.536471c9.035294 175.887059 0 281.901176 0 283.105882a38.550588 38.550588 0 0 1-29.515295 33.731765 1287.830588 1287.830588 0 0 0-180.705882 41.562353A676.442353 676.442353 0 0 0 536.094118 829.741176a37.345882 37.345882 0 0 1-24.094118 6.02353zM784.865882 479.171765L487.905882 198.47529399999996a40.357647 40.357647 0 0 0-49.392941-4.818823l-7.830588 6.625882-161.430588 171.068235a40.357647 40.357647 0 1 0 60.235294 55.416471l133.722353-141.552941 267.444706 252.988235a40.357647 40.357647 0 1 0 55.41647-60.235294"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="service" unicode="&#58918;" d="M849.00812012 487.71642715A27.54528398 27.54528398 0 0 1 849.00812012 496.71080566 337.28919434 337.28919434 0 0 1 174.42973145 496.71080566a27.54528398 27.54528398 0 0 1-1e-8-8.99437852 147.28294776 147.28294776 0 0 1-112.42973144-140.53716386V328.06620849a148.40724551 148.40724551 0 0 1 123.67270459-143.34790781A308.6196126 308.6196126 0 0 1 414.4672083-9.222985839999978h5.05933769a84.32229815 84.32229815 0 1 1 0 56.21486573 252.40474688 252.40474688 0 0 0-172.01748955 137.16427235h31.48032481A35.41536562 35.41536562 0 0 1 314.96689531 215.63647705000005V458.48469697a35.41536562 35.41536562 0 0 1-35.97751406 34.29106787H230.64459717A26.42098711 26.42098711 0 0 1 230.64459717 496.71080566a281.07432862 281.07432862 0 0 0 562.14865723 0 26.42098711 26.42098711 0 0 1 0-3.3728915h-48.34478497a35.41536562 35.41536562 0 0 1-35.97751406-34.29106875V215.63647705000005a35.41536562 35.41536562 0 0 1 35.97751406-34.29106787h63.52279893A150.0936917 150.0936917 0 0 1 961.43785156 328.06620849v19.11305479a147.28294776 147.28294776 0 0 1-112.42973144 140.53716386zM498.22735801 46.991879880000056a28.10743242 28.10743242 0 1 0-28.1074333-28.10743242 28.10743242 28.10743242 0 0 0 28.10743329 28.10743242zM258.75202959 240.37101797000003h-43.28544639A93.87882598 93.87882598 0 0 0 118.21486572 328.06620849v19.11305479a93.87882598 93.87882598 0 0 0 97.25171748 89.94378516h43.28544639zM905.22298584 328.06620849a93.87882598 93.87882598 0 0 0-97.25171748-89.94378515h-43.28544727V437.12304844h43.28544727A93.87882598 93.87882598 0 0 0 905.22298584 347.17926328zM633.70518418 705.83010615l-20.7995001 7.30793232a28.10743242 28.10743242 0 0 1-17.42660859-56.21486571l16.30231084-6.18363458a28.10743242 28.10743242 0 1 1 21.92379785 51.71767646zM330.14490928 639.49656503A28.10743242 28.10743242 0 0 1 376.80324805 609.14053711 177.63897568 177.63897568 0 0 0 511.71892578 676.59837597a28.10743242 28.10743242 0 0 1 0 56.21486573 231.60524678 231.60524678 0 0 1-181.57401651-93.31667667z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="cellphone" unicode="&#59000;" d="M785.066667 896H238.933333a102.4 102.4 0 0 1-102.4-102.4v-819.2a102.4 102.4 0 0 1 102.4-102.4h546.133334a102.4 102.4 0 0 1 102.4 102.4V793.6a102.4 102.4 0 0 1-102.4 102.4zM238.933333 827.733333h546.133334a34.133333 34.133333 0 0 0 34.133333-34.133333v-648.533333H204.8V793.6a34.133333 34.133333 0 0 0 34.133333 34.133333z m546.133334-887.466666H238.933333a34.133333 34.133333 0 0 0-34.133333 34.133333v102.4h614.4v-102.4a34.133333 34.133333 0 0 0-34.133333-34.133333zM512 8.53333299999997m-34.133333 0a34.133333 34.133333 0 1 1 68.266666 0 34.133333 34.133333 0 1 1-68.266666 0ZM426.666667 725.333333h170.666666a17.066667 17.066667 0 0 1 0 34.133334h-170.666666a17.066667 17.066667 0 0 1 0-34.133334z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="print" unicode="&#58989;" d="M843.946667 603.733333h-47.36V725.333333a90.026667 90.026667 0 0 1-94.72 85.333334H312.32a81.493333 81.493333 0 0 1-85.333333-85.333334v-121.6H170.666667a81.493333 81.493333 0 0 1-85.333334-85.333333v-325.12a89.173333 89.173333 0 0 1 85.333334-93.866667h56.746666v-52.48a89.6 89.6 0 0 1 89.6-89.6h389.973334a89.6 89.6 0 0 1 89.6 89.6v52.48h47.36a97.706667 97.706667 0 0 1 94.72 93.866667V518.4a90.026667 90.026667 0 0 1-94.72 85.333333zM279.466667 725.333333a30.72 30.72 0 0 0 32.853333 33.706667h389.546667c18.773333 0 42.666667-11.52 42.666666-33.706667v-121.6H279.466667z m465.066666-678.4a37.546667 37.546667 0 0 0-37.546666-37.973333H317.013333a37.546667 37.546667 0 0 0-37.546666 37.973333v170.666667a37.546667 37.546667 0 0 0 37.546666 38.4h389.973334a37.546667 37.546667 0 0 0 37.546666-37.973333z m142.506667 146.346667a45.653333 45.653333 0 0 0-42.666667-42.666667h-47.786666v66.133334a89.6 89.6 0 0 1-89.6 89.6H317.013333a89.6 89.6 0 0 1-89.6-89.6v-65.28H170.666667a37.546667 37.546667 0 0 0-33.28 42.666666v324.266667A31.146667 31.146667 0 0 0 170.666667 552.106667h673.28c19.2 0 42.666667-11.52 42.666666-33.706667z m-640 281.173333h-37.546667a13.226667 13.226667 0 0 0 0 26.026667h38.826667a13.226667 13.226667 0 1 0 0-26.026667z m94.293333 0H298.666667a13.226667 13.226667 0 1 0 0 26.026667h42.666666a13.226667 13.226667 0 0 0 0-26.026667z m426.666667-116.48H248.32a13.226667 13.226667 0 0 0 0 26.026667H768a13.226667 13.226667 0 0 0 0-26.026667z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="cols" unicode="&#58896;" d="M128 448h384V832H128z m64 320h256v-256H192zM576 832v-384h384V832z m320-320H640V768h256zM192 384h64v-384H192zM384 384h64v-384H384zM640 384h64v-384H640zM832 384h64v-384h-64z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="wifi" unicode="&#59360;" d="M723 275.5C666.8 324.4 593.4 354 513 354s-153.8-29.6-210.1-78.6c-3.2-2.8-3.6-7.8-0.8-11.2l36-42.9c2.9-3.4 8-3.8 11.4-0.9C393.1 258.8 450.3 282 513 282s119.9-23.2 163.5-61.5c3.4-2.9 8.5-2.5 11.4 0.9l36 42.9c2.8 3.3 2.4 8.3-0.9 11.2zM840.4 415.6C751.7 489.5 637.6 534 513 534s-238.7-44.5-327.5-118.4c-3.4-2.8-3.8-7.9-1-11.3l36-42.9c2.8-3.4 7.9-3.8 11.2-1C308 423.8 406.1 462 513 462s205-38.2 281.2-101.6c3.4-2.8 8.4-2.4 11.2 1l36 42.9c2.8 3.4 2.4 8.5-1 11.3zM957.1 554.6C835.7 654.2 680.3 714 511 714c-168.2 0-322.6-59-443.7-157.4-3.5-2.8-4-7.9-1.1-11.4l36-42.9c2.8-3.3 7.8-3.8 11.1-1.1C222 589.3 360.3 642 511 642c151.8 0 291-53.5 400-142.7 3.4-2.8 8.4-2.3 11.2 1.1l36 42.9c2.9 3.4 2.4 8.5-1.1 11.3zM512 118m-64 0a64 64 0 1 1 128 0 64 64 0 1 1-128 0Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="export" unicode="&#59005;" d="M896.4374528 479.830016c0 26.673152-21.6236032 48.2967552-48.2967552 48.2967552H630.8069376c-26.673152 0-48.2967552-21.6236032-48.2967552-48.2967552v-83.04831147H384.69522773l-2.71428266 5.36849067c-41.336832 87.44686933-35.95195733 204.128256 150.601728 199.94487467v-108.91537067l172.19037866 164.757504L532.58267307 822.7110912v-106.57245867c-228.64418133 5.70709333-263.651328-183.517184-157.433856-314.01028266l4.6891008-5.34664534h-88.46595414c-26.673152 0-48.2967552-21.6236032-48.2967552-48.2967552v-66.78882986h-98.43616426c-26.673152 0-40.4258816-21.6236032-30.71781547-48.2967552l79.10304427-217.33485227c9.70806613-26.673152 39.20145067-48.2967552 65.87460266-48.2967552h603.70670934c23.75898453 0 37.2506624 17.16169387 33.05745066 39.76178347 0.4980736 2.77108053 0.77441707 5.619712 0.77441707 8.53497173v463.765504z m-60.37067093-306.4528896l-21.8464256 60.02223787c-9.70806613 26.673152-39.20145067 48.2967552-65.87460267 48.2967552H303.44697173v30.56708266c0 13.336576 10.81125547 24.14783147 24.14783147 24.14783147h315.28605013v107.1972352c0 13.336576 10.81125547 24.14783147 24.14783147 24.14783147h144.88917333c13.336576 0 24.14783147-10.81125547 24.14783147-24.14783147v-270.2311424z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="rss" unicode="&#59400;" d="M810.666667 42.624C810.666667 395.562667 523.562667 682.666667 170.666667 682.666667v-85.333334c305.834667 0 554.666667-248.832 554.666666-554.709333h85.333334zM512 42.624h85.333333C597.333333 277.930667 405.930667 469.333333 170.666667 469.333333v-85.333333c188.202667 0 341.333333-153.130667 341.333333-341.376zM256 128m-85.333333 0a85.333333 85.333333 0 1 1 170.666666 0 85.333333 85.333333 0 1 1-170.666666 0Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="slider" unicode="&#59156;" d="M228.7 683.9v-66.7H112v66.7h116.7z m333.2-266.6v-66.7H112v66.7h449.9zM295.4 150.60000000000002V84H112v66.7h183.4v-0.1z m116.6 600c9 0 16.8-3.3 23.5-9.9 6.5-6.5 9.9-14.5 9.9-23.5v-133.3c0-9-3.3-16.8-9.9-23.5-6.5-6.5-14.5-9.9-23.5-9.9H278.8c-9 0-16.8 3.3-23.5 9.9-6.5 6.5-9.9 14.3-9.9 23.5V717.1c0 9 3.3 16.8 9.9 23.5 6.5 6.5 14.3 9.9 23.5 9.9h133.3v0.1h-0.1z m66.7-533.3c9 0 16.8-3.3 23.5-9.9 6.5-6.5 9.9-14.5 9.9-23.5v-133.3c0-9-3.3-16.8-9.9-23.5-6.5-6.5-14.5-9.9-23.5-9.9H345.3c-9 0-16.8 3.3-23.5 9.9-6.5 6.5-9.9 14.5-9.9 23.5V183.89999999999998c0 9 3.3 16.8 9.9 23.5 6.5 6.5 14.3 9.9 23.5 9.9h133.4v0.1zM912 683.9v-66.7H462.1v66.7H912z m0-533.3V84H528.6v66.7h383.3v-0.1h0.1zM745.2 483.9c9 0 16.8-3.3 23.5-9.9 6.5-6.5 9.9-14.5 9.9-23.5v-133.3c0-9-3.3-16.8-9.9-23.5-6.5-6.5-14.5-9.9-23.5-9.9H612c-9 0-16.8 3.3-23.5 9.9-6.5 6.5-9.9 14.3-9.9 23.5V450.6c0 9 3.3 16.8 9.9 23.5 6.5 6.5 14.5 9.9 23.5 9.9l133.2-0.1zM912 417.3v-66.7H795.3v66.7H912z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="email" unicode="&#58904;" d="M834.446 682.553H194.105c-50.176 0-91.022-40.846-91.022-91.022v-423.026c0-50.176 40.846-91.022 91.022-91.022h640.341c50.176 0 91.022 40.846 91.022 91.022V591.531c0 50.176-40.846 91.022-91.022 91.022z m36.409-514.048c0-20.025-16.384-36.409-36.409-36.409H194.105c-20.025 0-36.409 16.384-36.409 36.409V591.531c0 20.025 16.384 36.409 36.409 36.409h640.341c20.025 0 36.409-16.384 36.409-36.409v-423.026zM786.773 537.941L514.275 366.023 241.777 537.941c-12.743 8.078-29.582 4.21-37.661-8.533-8.078-12.743-4.21-29.582 8.533-37.661l286.72-180.907c4.551-2.845 9.557-4.21 14.563-4.21h0.91c5.006 0 10.013 1.365 14.563 4.21l286.72 180.907c12.743 8.078 16.611 24.917 8.533 37.661-8.306 12.857-25.145 16.611-37.888 8.533z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="subtraction" unicode="&#59006;" d="M785 348H239c-19.8 0-36 16.2-36 36s16.2 36 36 36h546c19.8 0 36-16.2 36-36s-16.2-36-36-36z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="mike" unicode="&#59100;" d="M512 256c115.2 0 208 92.8 208 208V624c0 115.2-92.8 208-208 208s-208-92.8-208-208v-160c0-115.2 92.8-208 208-208zM368 624c0 80 64 144 144 144s144-64 144-144v-160c0-80-64-144-144-144s-144 64-144 144V624zM844.8 416c0 17.6-14.4 32-32 32-16 0-30.4-12.8-32-28.8C758.4 289.6 646.4 192 512 192s-246.4 97.6-268.8 227.2c-1.6 16-16 28.8-32 28.8-17.6 0-32-14.4-32-32v-4.8C204.8 260.79999999999995 328 144 480 129.60000000000002V-32c0-17.6 14.4-32 32-32s32 14.4 32 32V129.60000000000002c152 14.4 275.2 131.2 299.2 280 0 1.6 1.6 4.8 1.6 6.4z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="light" unicode="&#59208;" d="M512 72c-172.313 0-312 139.687-312 312s139.687 312 312 312 312-139.687 312-312-139.687-312-312-312z m0 64c136.967 0 248 111.033 248 248 0 136.967-111.033 248-248 248-136.967 0-248-111.033-248-248 0-136.967 111.033-248 248-248z m0 696c17.673 0 32-14.327 32-32v-51c0-17.673-14.327-32-32-32-17.673 0-32 14.327-32 32V800c0 17.673 14.327 32 32 32z m0-785c17.673 0 32-14.327 32-32v-51c0-17.673-14.327-32-32-32-17.673 0-32 14.327-32 32v51c0 17.673 14.327 32 32 32z m325.945 11.055c-12.497-12.496-32.758-12.496-45.255 0l-36.063 36.063c-12.496 12.497-12.496 32.758 0 45.255 12.497 12.496 32.758 12.496 45.255 0l36.063-36.063c12.496-12.497 12.496-32.758 0-45.255z m-568 565c-12.497-12.496-32.758-12.496-45.255 0l-36.063 36.063c-12.496 12.497-12.496 32.758 0 45.255 12.497 12.496 32.758 12.496 45.255 0l36.063-36.063c12.496-12.497 12.496-32.758 0-45.255z m561 81.318c12.496-12.497 12.496-32.758 0-45.255l-36.063-36.063c-12.497-12.496-32.758-12.496-45.255 0-12.496 12.497-12.496 32.758 0 45.255l36.063 36.063c12.497 12.496 32.758 12.496 45.255 0z m-563.572-565c12.496-12.497 12.496-32.758 0-45.255l-36.063-36.063c-12.497-12.496-32.758-12.496-45.255 0-12.496 12.497-12.496 32.758 0 45.255l36.063 36.063c12.497 12.496 32.758 12.496 45.255 0zM960 384c0-17.673-14.327-32-32-32h-51c-17.673 0-32 14.327-32 32 0 17.673 14.327 32 32 32h51c17.673 0 32-14.327 32-32z m-781 0c0-17.673-14.327-32-32-32H96c-17.673 0-32 14.327-32 32 0 17.673 14.327 32 32 32h51c17.673 0 32-14.327 32-32z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="gift" unicode="&#58919;" d="M796.3 600h-6.7c5.1 6.7 9.6 13.4 13.4 20.1 18.3 32.2 20.8 63.1 7 87.1-9.1 15.7-33 41.2-91.9 36-35.4-3.2-76.1-17.2-114.7-39.4-37.9-21.9-68.9-49.3-89-77.5-4.5 6.4-9.5 12.8-15.1 19.1-19.8 22.3-45.4 42.8-74.1 59.4-38.4 22.2-79.3 35.9-115.1 38.5-43.3 3.2-75.8-10-91.4-37-13.8-24-11.3-54.8 7-86.7 3.7-6.5 8.1-13 13.1-19.5H236c-21.3 0-41.6-7.2-57.4-20.2-17.8-14.9-27.6-35.4-27.6-58v-50.8c0-34.4 23-64.6 55-76.6v-283.9c0-23.3 10.9-47.1 30.1-65.3 18.3-17.4 41.4-27.3 63.4-27.3h434.3c22 0 44.9 10 63 27.6 18.7 18.1 29.3 41.8 29.3 65.1V395c11 4.3 19.6 10.9 27.2 19.5 13.3 15.1 20.8 35.2 20.8 56.6v50.8c-0.1 45.3-32.8 78.1-77.8 78.1z m17.7-78.1v-50.8c0-7.7-3.2-20.3-15-22-0.9 0.1-1.7 0.1-2.6 0.1-1.5 0-2.9-0.1-4.3-0.3H543v91h253.3c11.9 0.1 17.7-5.8 17.7-18zM633.4 651.8c30.7 17.7 63.5 29.2 90 31.6 21.5 1.9 32.6-2.8 34.6-6.3 4.2-7.3-6.3-41.2-52.9-77.2H569.8c14 17 35.3 35.6 63.6 51.9z m-362.8 24.4c2.2 3.7 13.3 8.7 35 7.1 26.6-1.9 59.2-13.1 89.5-30.6 27.7-16 49.4-35.1 63.9-52.8H323.5c-20.3 15.6-36.4 32.9-45.8 49.4-8.9 15.6-8.5 24.4-7.1 26.9zM211 521.9c0 11.2 12.9 18.1 24.9 18.1H483v-91H240.1c-1.4 0.2-2.8 0.3-4.3 0.3-0.9 0-1.8 0-2.7-0.1-11.5 1.5-22.1 11.6-22.1 22v50.7z m55-411.3V389h217v-311H299.4c-13.2 0-33.4 17.5-33.4 32.6zM733.7 78H543V389h223v-278.4c0-15.5-19.1-32.6-32.3-32.6z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="mute" unicode="&#59013;" d="M739 294.4l180.2 180.2M735.391 297.9l180.24 180.24 7.07-7.07-180.239-180.24zM631.4-29.700000000000045c-5.1 0-10.1 1.3-14.5 3.7L277.1 162.20000000000005H116.8c-16 0-28.9 13-28.9 28.9v384c0 16 13 28.9 28.9 28.9h160.3l339.7 189.9c4.5 2.5 9.5 3.8 14.6 3.8 5.3 0 10.6-1.4 15.1-4.1 9.1-5.3 14.8-15.2 14.8-25.8v-767.6c0-10.5-5.6-20.4-14.7-25.8-4.6-2.7-9.9-4.1-15.2-4.1zM305.8 551.5v-336.7L601.4 51V716.8L305.8 551.5zM145.7 220.10000000000002h102.2v326H145.7v-326zM913.2 258.9c-9.3 0-18.1 3.6-24.7 10.3l-63.4 63.4-63.4-63.4c-6.6-6.6-15.4-10.3-24.7-10.3s-18.1 3.6-24.7 10.3c-13.6 13.6-13.6 35.9 0 49.5l63.4 63.4-67.4 67.4c-6.6 6.6-10.3 15.4-10.3 24.7 0 9.3 3.6 18.1 10.3 24.7 6.6 6.6 15.4 10.3 24.7 10.3s18.1-3.6 24.7-10.3l67.4-67.4 67.4 67.4c6.6 6.6 15.4 10.3 24.7 10.3s18.1-3.6 24.7-10.3c6.6-6.6 10.3-15.4 10.3-24.7 0-9.3-3.6-18.1-10.3-24.7L874.6 382l63.4-63.4c13.6-13.6 13.6-35.9 0-49.5-6.7-6.6-15.5-10.2-24.8-10.2z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="reduce-circle" unicode="&#58902;" d="M512-65.5c-60.6 0-119.4 11.9-174.8 35.3-53.5 22.6-101.5 55-142.7 96.2-41.2 41.2-73.6 89.2-96.2 142.7C74.9 264.1 63 322.9 63 383.5s11.9 119.4 35.3 174.8c22.6 53.5 55 101.5 96.2 142.7 41.2 41.2 89.2 73.6 142.7 96.2C392.6 820.6 451.4 832.5 512 832.5s119.4-11.9 174.8-35.3c53.5-22.6 101.5-55 142.7-96.2 41.2-41.2 73.6-89.2 96.2-142.7 23.4-55.4 35.3-114.2 35.3-174.8s-11.9-119.4-35.3-174.8c-22.6-53.5-55-101.5-96.2-142.7s-89.2-73.6-142.7-96.2c-55.4-23.4-114.2-35.3-174.8-35.3z m0 848c-220 0-399-179-399-399s179-399 399-399 399 179 399 399-179 399-399 399zM772 359H252c-13.8 0-25 11.2-25 25s11.2 25 25 25h520c13.8 0 25-11.2 25-25s-11.2-25-25-25z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="music" unicode="&#59024;" d="M575.4 832h-74.5v-633.5C385 251.20000000000005 249.3 180.70000000000005 226.8 76c-7.3-34.1 7.9-70.9 21.9-87.8 79.3-94.6 252.2-50.5 331.6 51.3 35.2 45.2 32.3 84.6 32.3 181.3V608.5c48.8-36.3 103.9-70.1 123.7-135 12.2-40.3-4.1-107.3-17-141.5-3.9-10.3-14.7-18.9-9.7-29.2 34.2-25.4 51.1 28.6 60.9 51.2 10.6 24.5 20.8 54.7 24.4 75.6C833.2 653.2 595.5 661.7 575.4 832z"  horiz-adv-x="1024" />
+
+    
+
+
+  </font>
+</defs></svg>
diff --git a/pluss-manage-page/src/main/resources/static/resources/fonts/iconfont.ttf b/pluss-manage-page/src/main/resources/static/resources/fonts/iconfont.ttf
new file mode 100644
index 0000000..06e30f9
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/fonts/iconfont.ttf differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/fonts/iconfont.woff b/pluss-manage-page/src/main/resources/static/resources/fonts/iconfont.woff
new file mode 100644
index 0000000..66a1783
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/fonts/iconfont.woff differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/fonts/iconfont.woff2 b/pluss-manage-page/src/main/resources/static/resources/fonts/iconfont.woff2
new file mode 100644
index 0000000..47e9980
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/fonts/iconfont.woff2 differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/helpVideo/helpVideoDetails.js b/pluss-manage-page/src/main/resources/static/resources/helpVideo/helpVideoDetails.js
new file mode 100644
index 0000000..d416123
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/helpVideo/helpVideoDetails.js
@@ -0,0 +1,126 @@
+/**
+ * create by robot 
+ * date Thu Sep 12 16:16:36 CST 2019 
+ */ 
+
+$(document).ready(function(){
+	//form表单样式
+	layui.use(['layer', 'form'], function() {
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+	//li 切换事件
+	$(".nav-tabs>li").click(function() {
+		var index = $(".nav-tabs>li").index(this);
+		$(this).addClass("active").siblings("li").removeClass("active");
+		
+	})
+	//弹出一个提示层
+	$('.fa-save').on('click', function() {
+		saveHelpVideo();
+	});
+
+	//绑定标签栏事件
+	$(document).on('click','.nav-tabs li',function(){
+
+		var action =$(this).data('action');
+		 switch (action) {
+			case "base"://基本资料
+				goBase();
+				break;  
+			case "functions"://多功能
+				goFunctions();
+				break;
+			case "extends"://扩展    
+				goExtends();         
+				break;           
+		 }
+	})
+
+	//加载第一个标签
+	$('.nav-tabs li').eq(0).click();
+	
+});
+
+
+//跳转基本信息 
+function goBase(){
+	var url=ctx+'/helpVideo/queryHelpVideoBaseInfo?id='+$('#helpVideoId').val();
+	$('.tab-content').load(url);
+	              
+}
+//跳转多功能输入
+function goFunctions(){ 
+	var url=ctx+'/helpVideo/queryHelpVideoFunctionsInfo?id='+$('#helpVideoId').val();
+	$('.tab-content').load(url);  
+	
+}
+//跳转到扩展   
+function goExtends(){
+	
+	var url=ctx+'/helpVideo/queryHelpVideoExtendsInfo?id='+$('#helpVideoId').val();
+	$('.tab-content').load(url);          
+}  
+  
+
+ 
+//保存
+function saveHelpVideo(){
+	var name=$("#name").val();
+	if(StringUtil.isBlank(name)){
+		layer.msg('请输入视频名称');
+		return;
+	}
+	var type=$("#type").val();
+	if(StringUtil.isBlank(type)){
+		layer.msg('请输入视频类型');
+		return;
+	}
+	var videoUrl=$("#videoUrl").val();
+	if(StringUtil.isBlank(videoUrl)){
+		layer.msg('请上传视频');
+		return;
+	}
+	var content=$("#content").val();
+//	var content=UM.getEditor('content').getContent().trim();
+	if(StringUtil.isBlank(content)){
+		layer.msg('请输入视频描述');
+		return;
+	}
+	$(".fa-save").attr("disabled","disabled");
+	$('.fa-save').html('正在保存...');
+	$.ajax({
+		url:ctx+"/helpVideo/saveHelpVideo",
+		type:"POST",
+		dataType:'json',
+		data:$("#data_form").serializeArray(),
+		complete:function(){
+			$(".fa-save").removeAttr("disabled");
+			$('.fa-save').html('保存')
+		},        
+		success:function(service){ 
+		
+			layer.confirm('保存成功,是否前往列表？', {
+				  btn: ['确认','取消'] //按钮
+				}, function(){
+					$('#goback span').trigger('click'); 
+				}, function(){         
+					layer.closeAll();
+			});
+		}
+	});  
+}
+
+//上传视频
+function uploadVideo(){
+	$.videoUpload(function(data){
+		var url=data.url;
+		$('#video').attr('src',url);
+		$('#video').load();
+		$('#video').trigger('play');
+		$('#videoUrl').val(url);
+	})
+}
+ 
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/helpVideo/helpVideoReadDetails.js b/pluss-manage-page/src/main/resources/static/resources/helpVideo/helpVideoReadDetails.js
new file mode 100644
index 0000000..2074aff
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/helpVideo/helpVideoReadDetails.js
@@ -0,0 +1,127 @@
+/**
+ * create by robot 
+ * date Thu Sep 12 16:16:36 CST 2019 
+ */ 
+
+$(document).ready(function(){
+	//form表单样式
+	layui.use(['layer', 'form'], function() {
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+	//li 切换事件
+	$(".nav-tabs>li").click(function() {
+		var index = $(".nav-tabs>li").index(this);
+		$(this).addClass("active").siblings("li").removeClass("active");
+		
+	})
+	//弹出一个提示层
+	$('.fa-save').on('click', function() {
+		saveHelpVideo();
+	});
+
+	//绑定标签栏事件
+	$(document).on('click','.nav-tabs li',function(){
+
+		var action =$(this).data('action');
+		 switch (action) {
+			case "base"://基本资料
+				goBase();
+				break;  
+			case "functions"://多功能
+				goFunctions();
+				break;
+			case "extends"://扩展    
+				goExtends();         
+				break;           
+		 }
+	})
+
+	//加载第一个标签
+	$('.nav-tabs li').eq(0).click();
+	
+});
+
+
+//跳转基本信息 
+function goBase(){
+	var url=ctx+'/helpVideo/queryHelpVideoBaseReadInfo?id='+$('#helpVideoId').val();
+	$('.tab-content').load(url);
+	              
+}
+//跳转多功能输入
+function goFunctions(){ 
+	var url=ctx+'/helpVideo/queryHelpVideoFunctionsInfo?id='+$('#helpVideoId').val();
+	$('.tab-content').load(url);  
+	
+}
+//跳转到扩展   
+function goExtends(){
+	
+	var url=ctx+'/helpVideo/queryHelpVideoExtendsInfo?id='+$('#helpVideoId').val();
+	$('.tab-content').load(url);          
+}  
+  
+
+ 
+//保存
+function saveHelpVideo(){
+	var name=$("#name").val();
+	if(StringUtil.isBlank(name)){
+		layer.msg('请输入视频名称');
+		return;
+	}
+	var type=$("#type").val();
+	if(StringUtil.isBlank(type)){
+		layer.msg('请输入视频类型');
+		return;
+	}
+	var videoUrl=$("#videoUrl").val();
+	if(StringUtil.isBlank(videoUrl)){
+		layer.msg('请上传视频');
+		return;
+	}
+	var content=$("#content").val();
+//	var content=UM.getEditor('content').getContent().trim();
+	if(StringUtil.isBlank(content)){
+		layer.msg('请输入视频描述');
+		return;
+	}
+	$(".fa-save").attr("disabled","disabled");
+	$('.fa-save').html('正在保存...')
+	$.ajax({
+		url:ctx+"/helpVideo/saveHelpVideo",
+		type:"POST",
+		dataType:'json',
+		data:$("#data_form").serializeArray(),
+		complete:function(){
+			$(".fa-save").removeAttr("disabled");
+			$('.fa-save').html('保存')
+		},        
+		success:function(service){ 
+		
+			layer.confirm('保存成功,是否前往列表？', {
+				  btn: ['确认','取消'] //按钮
+				}, function(){
+					$('#goback span').trigger('click'); 
+				}, function(){         
+					layer.closeAll();
+			});  
+			
+		}
+	});  
+}
+
+//上传视频
+function uploadVideo(){
+	$.videoUpload(function(data){
+		var url=data.url;
+		$('#video').attr('src',url);
+		$('#video').load();
+		$('#video').trigger('play');
+		$('#videoUrl').val(url);
+	})
+}
+ 
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/images/1.jpg b/pluss-manage-page/src/main/resources/static/resources/images/1.jpg
new file mode 100644
index 0000000..794d2b5
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/images/1.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/images/2.jpg b/pluss-manage-page/src/main/resources/static/resources/images/2.jpg
new file mode 100644
index 0000000..741a8fb
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/images/2.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/images/3.jpg b/pluss-manage-page/src/main/resources/static/resources/images/3.jpg
new file mode 100644
index 0000000..ceee8b5
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/images/3.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/images/4.jpg b/pluss-manage-page/src/main/resources/static/resources/images/4.jpg
new file mode 100644
index 0000000..c612f86
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/images/4.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/images/add.png b/pluss-manage-page/src/main/resources/static/resources/images/add.png
new file mode 100644
index 0000000..bf6f45d
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/images/add.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/images/angle-down.png b/pluss-manage-page/src/main/resources/static/resources/images/angle-down.png
new file mode 100644
index 0000000..cb141ad
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/images/angle-down.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/images/cube.png b/pluss-manage-page/src/main/resources/static/resources/images/cube.png
new file mode 100644
index 0000000..986218a
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/images/cube.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/images/defaultMemberImg.png b/pluss-manage-page/src/main/resources/static/resources/images/defaultMemberImg.png
new file mode 100644
index 0000000..3071083
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/images/defaultMemberImg.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/images/defaultProdImg.png b/pluss-manage-page/src/main/resources/static/resources/images/defaultProdImg.png
new file mode 100644
index 0000000..222a742
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/images/defaultProdImg.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/images/default_use_image.png b/pluss-manage-page/src/main/resources/static/resources/images/default_use_image.png
new file mode 100644
index 0000000..9a2d220
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/images/default_use_image.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/images/error.jpg b/pluss-manage-page/src/main/resources/static/resources/images/error.jpg
new file mode 100644
index 0000000..f48d9d3
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/images/error.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/images/logo.png b/pluss-manage-page/src/main/resources/static/resources/images/logo.png
new file mode 100644
index 0000000..61c8215
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/images/logo.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/images/member.png b/pluss-manage-page/src/main/resources/static/resources/images/member.png
new file mode 100644
index 0000000..98ea997
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/images/member.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/images/plus.png b/pluss-manage-page/src/main/resources/static/resources/images/plus.png
new file mode 100644
index 0000000..709aea4
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/images/plus.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/images/project.png b/pluss-manage-page/src/main/resources/static/resources/images/project.png
new file mode 100644
index 0000000..986218a
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/images/project.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/images/recharge1.png b/pluss-manage-page/src/main/resources/static/resources/images/recharge1.png
new file mode 100644
index 0000000..8d5b4be
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/images/recharge1.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/images/recharge2.png b/pluss-manage-page/src/main/resources/static/resources/images/recharge2.png
new file mode 100644
index 0000000..7daf455
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/images/recharge2.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/images/recharge3.png b/pluss-manage-page/src/main/resources/static/resources/images/recharge3.png
new file mode 100644
index 0000000..9b77453
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/images/recharge3.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/images/register.png b/pluss-manage-page/src/main/resources/static/resources/images/register.png
new file mode 100644
index 0000000..6caa413
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/images/register.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/images/register_bg.png b/pluss-manage-page/src/main/resources/static/resources/images/register_bg.png
new file mode 100644
index 0000000..9757f26
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/images/register_bg.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/images/regsiter/acount.png b/pluss-manage-page/src/main/resources/static/resources/images/regsiter/acount.png
new file mode 100644
index 0000000..16e896d
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/images/regsiter/acount.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/images/regsiter/password.png b/pluss-manage-page/src/main/resources/static/resources/images/regsiter/password.png
new file mode 100644
index 0000000..f7e4090
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/images/regsiter/password.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/images/regsiter/phone.png b/pluss-manage-page/src/main/resources/static/resources/images/regsiter/phone.png
new file mode 100644
index 0000000..3e389f5
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/images/regsiter/phone.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/images/setting.png b/pluss-manage-page/src/main/resources/static/resources/images/setting.png
new file mode 100644
index 0000000..986218a
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/images/setting.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/images/sprite.png b/pluss-manage-page/src/main/resources/static/resources/images/sprite.png
new file mode 100644
index 0000000..b9f5e79
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/images/sprite.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/images/upload.png b/pluss-manage-page/src/main/resources/static/resources/images/upload.png
new file mode 100644
index 0000000..71ab425
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/images/upload.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/activityRecommend/activityRecommendDetails.js b/pluss-manage-page/src/main/resources/static/resources/js/activityRecommend/activityRecommendDetails.js
new file mode 100644
index 0000000..656c168
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/activityRecommend/activityRecommendDetails.js
@@ -0,0 +1,165 @@
+/**
+ * create by robot 
+ * date Tue Sep 24 14:55:39 CST 2019 
+ */ 
+
+$(document).ready(function(){
+	//form表单样式
+	layui.use(['layer', 'form'], function() {
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+	//li 切换事件
+	$(".nav-tabs>li").click(function() {
+		var index = $(".nav-tabs>li").index(this);
+		$(this).addClass("active").siblings("li").removeClass("active");
+		
+	})
+	//弹出一个提示层
+	$('.fa-save').on('click', function() {
+		saveActivityRecommend();
+	});
+
+	//绑定标签栏事件
+	$(document).on('click','.nav-tabs li',function(){
+
+		var action =$(this).data('action');
+		 switch (action) {
+			case "base"://基本资料
+				goBase();
+				break;  
+			case "functions"://多功能
+				goFunctions();
+				break;
+			case "extends"://扩展    
+				goExtends();         
+				break;           
+		 }
+	})
+
+	//加载第一个标签
+	$('.nav-tabs li').eq(0).click();
+	
+});
+
+
+//跳转基本信息 
+function goBase(){
+	var url=ctx+'/activityRecommend/queryActivityRecommendBaseInfo?id='+$('#activityRecommendId').val();
+	$('.tab-content').load(url);
+	              
+}
+//跳转多功能输入
+function goFunctions(){ 
+	var url=ctx+'/activityRecommend/queryActivityRecommendFunctionsInfo?id='+$('#activityRecommendId').val();
+	$('.tab-content').load(url);  
+	
+}
+//跳转到扩展   
+function goExtends(){
+	
+	var url=ctx+'/activityRecommend/queryActivityRecommendExtendsInfo?id='+$('#activityRecommendId').val();
+	$('.tab-content').load(url);          
+}  
+  
+
+ 
+//保存
+function saveActivityRecommend(){
+	var isAdmin=$("#isAdmin").val();
+	if(isAdmin=='1'){
+		var merchantCode=$("#merchantCode option:selected").val();
+		if(StringUtil.isBlank(merchantCode)){
+			layer.msg('请选择商户');
+			return;
+		}
+	}
+	var storeId=$("#storeId option:selected").val();
+	if(StringUtil.isBlank(storeId)){
+		layer.msg('请选择门店');
+		return;
+	}
+	
+	var name=$("#name").val();
+	var firstMixRechargeMoney=$("#firstMixRechargeMoney").val();
+	var recommendMoney=$("#recommendMoney").val();
+	if(StringUtil.isBlank(name)){
+		layer.msg('请输入活动名称');
+		return;
+	}
+	
+	if(StringUtil.isNotJustIntgerAndDecimals2(firstMixRechargeMoney)){
+		if(StringUtil.isBlank(firstMixRechargeMoney)){
+			layer.msg('请输入首充最低充值金额');
+			return;
+		}
+		layer.msg('请输入正确的首充最低充值金额(正整数或小数(保留两位小数))');
+		return;
+	}
+	
+	if(StringUtil.isNotJustIntgerAndDecimals2(recommendMoney)){
+		if(StringUtil.isBlank(recommendMoney)){
+			layer.msg('请输入推荐人与被推荐人奖励金额');
+			return;
+		}
+		layer.msg('请输入正确的推荐人与被推荐人奖励金额(正整数或小数(保留两位小数))');
+		return;
+	}
+	$(".fa-save").attr("disabled","disabled");
+	$('.fa-save').html('正在保存...')
+	$.ajax({
+		url:ctx+"/activityRecommend/saveActivityRecommend",
+		type:"POST",
+		dataType:'json',
+		data:$("#data_form").serializeArray(),
+		complete:function(){
+			$(".fa-save").removeAttr("disabled");
+			$('.fa-save').html('保存')
+		},        
+		success:function(service){ 
+		
+			layer.confirm('保存成功,是否前往列表？', {
+				  btn: ['确认','取消'] //按钮
+				}, function(){
+					$('#goback span').trigger('click'); 
+				}, function(){         
+					layer.closeAll();
+			});  
+			
+		}
+	});  
+}
+
+//onchange商户
+$(function(){
+	layui.use(['layer', 'form'], function() {
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+		form.on('select(selectMerchantCode)', function(data){
+			var merchantCode=data.value;
+			$.ajax({
+				url:ctx+'/merchantMenber/getStoreByMerchantCode',
+				type:'post',
+				dataType:'json',
+				data:{
+					'merchantCode':merchantCode,
+				},
+				success:function(result){
+					var storeList=result.merchantStoreList;
+					$("#storeId").empty();
+					var data='';
+					data+='<option value="">请选择</option>';
+					for (var i = 0; i < storeList.length; i++) {
+						data+='<option value='+storeList[i].storeId+'>'+storeList[i].storeName+'</option>'
+					}
+					$("#storeId").append(data);
+					form.render("select");
+				}
+			})
+		})
+	});
+});
+ 
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/activityRecommend/activityRecommendList.js b/pluss-manage-page/src/main/resources/static/resources/js/activityRecommend/activityRecommendList.js
new file mode 100644
index 0000000..742c68f
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/activityRecommend/activityRecommendList.js
@@ -0,0 +1,287 @@
+/**
+ * create by robot 
+ * date Tue Sep 24 14:55:39 CST 2019 
+ */ 
+
+var pageIndex=1;
+$(document).ready(function(){
+	//调用查询
+	pageIndex=StringUtil.getQueryString('pageIndex');
+	if(pageIndex==undefined||pageIndex==null){
+		pageIndex=1;
+	}
+	queryActivityRecommend(pageIndex);
+	//绑定hover操作
+	$(document).on('mouseenter','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").show();
+		var width=15;
+		$(this).children('div').find('li').each(function(){
+			//获取li宽度
+			width+=$(this).width();
+		});
+		$(this).children('div').width(width);
+	})
+	$(document).on('mouseleave','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").hide();
+	});
+
+	//日历控件
+	layui.use(['layer', 'laydate'], function() {
+		var layer = layui.layer;
+		laydate = layui.laydate;
+		laydate.render({
+		elem: '#date1' //指定元素
+		});
+		laydate.render({
+			elem: '#date2' //指定元素
+		});
+	});
+
+	//行选中事件
+	$("#allCheck").find("span").click(function() {
+		$(this).toggleClass('checked');
+		if($(this).hasClass('checked')){
+			//所有列选中
+		  $(".checker").find("span").each(function () {
+		         $(this).addClass("checked");
+		    })
+		}else{
+			//所有列取消选中
+			$(".checker").find("span").each(function () {
+				 $(this).removeClass("checked");
+		    })
+		}
+	});
+
+	//单个选中
+	$(document).on('click','.checkeBox span',function() {
+		$(this).toggleClass('checked');
+		//设置头部事件
+		var length=$('.checkeBox span').length;
+		var count=0;
+		$(".checkeBox").find("span").each(function () {
+	        if($(this).hasClass("checked")){
+	        	count++;
+	        }
+	   })
+		//全选
+	   if(count==length){
+		   $("#allCheck").find("span").addClass('checked');
+	   }else{
+		   $("#allCheck").find("span").removeClass('checked');
+	   }
+	})
+	//左右div高度相等
+	var left_content_height = $(".right-content").height();
+	$(".left-content").height(left_content_height+35);
+	var sub_left_height=$(".res-menu").height(left_content_height-60);
+});
+
+//查询
+function queryActivityRecommend(index){
+	if(typeof(index)=='undefined'){
+		index=1;
+	}
+	var url=ctx+'/activityRecommend/queryActivityRecommendByPage';
+	$.ajax({  
+        url:url,  
+        type:"post", 
+        dataType:"json",  
+        data:{  
+        	"currPage":index,
+        	"name":$("#name").val(),
+        },  
+        success:function(result){  
+        	//渲染数据
+        	$('#data_content').empty();
+        	var header='';
+        	$.each(result.activityRecommendList,function(i){
+        		var activityRecommend=result.activityRecommendList[i];
+        		var data='';
+        		data+='<tr class="odd">';
+        		data+='<td class="textc">';
+				data+='		 <div class="checker checkeBox">';        		data+='		 <span class=""  data-id="'+activityRecommend.id+'"><input type="checkbox"  value=""></span>';
+        		data+='		</div>';
+        		data+='</td>';
+        		data+='<td class="textc">'+activityRecommend.id+'</td>';
+        		/*data+='<td class="textc">'+activityRecommend.userId+'</td>';*/
+        		data+='<td class="textc">'+activityRecommend.name+'</td>';
+        		data+='<td class="textc">'+activityRecommend.firstMixRechargeMoney+'</td>';
+        		data+='<td class="textc">'+activityRecommend.recommendMoney+'</td>';
+        		/*data+='<td class="textc">'+activityRecommend.merchantCode+'</td>';*/
+        		var merchantName='';
+        		if(StringUtil.isNotBlank(activityRecommend.merchantName)){
+        			merchantName=activityRecommend.merchantName;
+        		}
+        		data+='<td class="textc">'+merchantName+'</td>';
+        		var storeName='';
+        		if(StringUtil.isNotBlank(activityRecommend.storeName)){
+        			storeName=activityRecommend.storeName;
+        		}
+        		data+='<td class="textc">'+storeName+'</td>';
+        		var createDt='';
+        		if(StringUtil.isNotBlank(activityRecommend.createDt)){
+        			createDt=new Date(activityRecommend.createDt).toYYYYMMDD();
+        		}
+        		data+='<td class="textc">'+createDt+'</td>';
+        	if($("#isAdmin").val()=='1'||$("#merchantCodeSession").val()!=''){
+        		data+='<td class="textc">';
+        			data+='<div class="positionr listOperaters">';
+        			data+='		<a href="javascript:void(0);"  class="icon-large dlblock w16 h16"><img src="'+resourcePath+'/images/angle-down.png"/></a>';
+        			data+='		<div class="ops_box ops_itemDiv positiona clearfix whitebg">';
+        			data+='			<ul>';
+        			data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showActivityRecommendDetails('+activityRecommend.id+')" class="btn btn-primary fa fa-edit ops_more f12">编辑</a></li>';
+        			data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="initDeleteActivityRecommend('+activityRecommend.id+')" class="btn btn-primary fa fa-remove ops_more f12">删除</a></li>';
+        			/*data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showActivityRecommendDetails('+activityRecommend.id+')" class="btn btn-primary fa fa-detail ops_more f12">明细</a></li>';*/
+        			data+='			</ul>';
+        			data+='		</div>';
+        			data+='</div>';
+        	    data+='</td>';
+        		}
+        	    data+='</tr>';
+        	    $('#data_content').append(data);
+        	});
+        	//分页
+        	$('#pageCount').html(result.pageCount);
+      	$('#currPage').html(result.currPage);
+          $('#totalCount').html(result.count);
+           	//设置分页
+           	pageIndex=result.currPage;
+			$('#pagination').pagination({
+				pageCount: result.pageCount,
+				jump: true,
+				coping: true,
+				jump: true,
+				homePage: '首页',
+				endPage: '末页',
+				prevContent: '上页',
+				nextContent: '下页',
+				current:result.currPage,
+				callback:function(api){
+					pageIndex=api.getCurrent();
+					queryActivityRecommend(api.getCurrent());
+				}
+			});
+        } 
+    });  
+	//表头列不选中
+	$("#allCheck").find("span").removeClass('checked');
+}
+
+//初始化新增
+function initAddActivityRecommend(){
+	window.location=ctx+'/activityRecommend/queryActivityRecommendDetails?pageIndex='+pageIndex;
+}
+
+//初始化修改
+function showActivityRecommendDetails(id){
+	window.location=ctx+'/activityRecommend/queryActivityRecommendDetails?id='+id+'&pageIndex='+pageIndex;
+}
+
+//初始化删除
+function initDeleteActivityRecommend(id){
+	
+		layer.open({
+		type: 1,
+		closeBtn: 1,		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r'	, //按钮居中
+		shade: 0.3 ,//不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteActivityRecommend(id,true);
+		}
+	});
+}
+
+//删除
+function deleteActivityRecommend(id,showMsg){
+	$.ajax({
+		url:ctx+'/activityRecommend/deleteActivityRecommend',
+		data:[{
+			name:'id',
+			value:id
+		}],
+		type:'POST',
+		dataType:'json',
+		success:function(){
+			queryActivityRecommend(pageIndex);
+			if(showMsg){
+				layer.msg('删除成功!');	
+			}
+		}
+	});
+}
+//头部编辑
+function initEditActivityRecommend(){
+	var count=0;
+	var id=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+        	 id=$(this).data('id');
+         }
+    })
+    if(count>1){
+    	layer.msg('只能选中一行记录进行操作!');
+    	return ;
+    }
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	 if(id>0){
+	  showActivityRecommendDetails(id);
+	 }
+}
+//头部删除
+function initBatchDeleteActivityRecommend(){
+	var count=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+         }
+    })
+	
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	
+
+	layer.open({
+		type: 1,
+		closeBtn: 1,
+		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r', //按钮居中
+		shade: 0.3, //不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteBatchActivityRecommend();
+		}
+	});
+	
+}
+//批量删除
+function deleteBatchActivityRecommend(){
+	
+	$(".checkeBox").find("span").each(function () {
+        if($(this).hasClass("checked")){
+        	var id=$(this).data('id');
+        	deleteActivityRecommend(id,false);
+        	layer.msg('删除成功!');	
+        }
+   })
+}
+
+function otherActivityRecommendDetails(id){
+	window.location=ctx+'/activityRecommend/otherActivityRecommendDetails?id='+id+'&pageIndex='+pageIndex;
+}
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/agreement/agreementDetails.js b/pluss-manage-page/src/main/resources/static/resources/js/agreement/agreementDetails.js
new file mode 100644
index 0000000..12e3114
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/agreement/agreementDetails.js
@@ -0,0 +1,128 @@
+/**
+ * create by robot 
+ * date Sun Sep 29 17:36:35 CST 2019 
+ */ 
+
+$(document).ready(function(){
+	//form表单样式
+	layui.use(['layer', 'form'], function() {
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+	//li 切换事件
+	$(".nav-tabs>li").click(function() {
+		var index = $(".nav-tabs>li").index(this);
+		$(this).addClass("active").siblings("li").removeClass("active");
+		
+	})
+	//弹出一个提示层
+	$('.fa-save').on('click', function() {
+		saveAgreement();
+	});
+
+	//绑定标签栏事件
+	$(document).on('click','.nav-tabs li',function(){
+
+		var action =$(this).data('action');
+		 switch (action) {
+			case "base"://基本资料
+				goBase();
+				break;  
+			case "functions"://多功能
+				goFunctions();
+				break;
+			case "extends"://扩展    
+				goExtends();         
+				break;           
+		 }
+	})
+
+	//加载第一个标签
+	$('.nav-tabs li').eq(0).click();
+	
+});
+
+
+//跳转基本信息 
+function goBase(){
+	var url=ctx+'/agreement/queryAgreementBaseInfo?id='+$('#agreementId').val();
+	$('.tab-content').load(url);
+	              
+}
+//跳转多功能输入
+function goFunctions(){ 
+	var url=ctx+'/agreement/queryAgreementFunctionsInfo?id='+$('#agreementId').val();
+	$('.tab-content').load(url);  
+	
+}
+//跳转到扩展   
+function goExtends(){
+	
+	var url=ctx+'/agreement/queryAgreementExtendsInfo?id='+$('#agreementId').val();
+	$('.tab-content').load(url);          
+}  
+  
+
+ 
+//保存
+function saveAgreement(){
+	var oldDiscern=$("#oldDiscern").val();
+	
+	var id=$("#id").val();
+	var discern=$("#discern option:selected").val();
+	if(StringUtil.isBlank(discern)){
+		layer.msg('请选择协议');
+		return;
+	}
+	var name=$("#discern option:selected").text();
+	var content=UM.getEditor('content').getContent().trim();
+	if(StringUtil.isBlank(content)){
+		layer.msg('请输入内容');
+		return;
+	}
+	if(discern=='2'){
+		content = content.replace(/(\n)/g, "");    
+		content = content.replace(/(\t)/g, "");    
+		content = content.replace(/(\r)/g, "");    
+		content = content.replace(/<\/?[^>]*>/g, "");    
+		content = content.replace(/\s*/g, ""); 
+	}
+	$(".fa-save").attr("disabled","disabled");
+	$('.fa-save').html('正在保存...')
+	$.ajax({
+		url:ctx+"/agreement/saveAgreement",
+		type:"POST",
+		dataType:'json',
+		data:{
+			"id":id,
+			"discern":discern,
+			"name":name,
+			"content":content,
+			"oldDiscern":oldDiscern,
+		},
+		complete:function(){
+			$(".fa-save").removeAttr("disabled");
+			$('.fa-save').html('保存')
+		},        
+		success:function(service){ 
+		    if(service.code=='0'){
+		    	layer.msg('已拥有该规则，无法重复添加！');
+		    }else{
+		    	layer.confirm('保存成功,是否前往列表？', {
+					  btn: ['确认','取消'] //按钮
+					}, function(){
+						$('#goback span').trigger('click'); 
+					}, function(){         
+						layer.closeAll();
+				});
+		    }
+		},
+		error:function(res){
+			layer.msg('系统繁忙，请稍后再试');
+		}
+		
+	});  
+}
+ 
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/agreement/agreementList.js b/pluss-manage-page/src/main/resources/static/resources/js/agreement/agreementList.js
new file mode 100644
index 0000000..4679351
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/agreement/agreementList.js
@@ -0,0 +1,291 @@
+/**
+ * create by robot 
+ * date Sun Sep 29 17:36:35 CST 2019 
+ */ 
+
+var pageIndex=1;
+$(document).ready(function(){
+	//调用查询
+	pageIndex=StringUtil.getQueryString('pageIndex');
+	if(pageIndex==undefined||pageIndex==null){
+		pageIndex=1;
+	}
+	queryAgreement(pageIndex);
+	//绑定hover操作
+	$(document).on('mouseenter','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").show();
+		var width=15;
+		$(this).children('div').find('li').each(function(){
+			//获取li宽度
+			width+=$(this).width();
+		});
+		$(this).children('div').width(width);
+	})
+	$(document).on('mouseleave','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").hide();
+	});
+
+	//日历控件
+	layui.use(['layer', 'laydate'], function() {
+		var layer = layui.layer;
+		laydate = layui.laydate;
+		laydate.render({
+		elem: '#date1' //指定元素
+		});
+		laydate.render({
+			elem: '#date2' //指定元素
+		});
+	});
+
+
+
+	//行选中事件
+	$("#allCheck").find("span").click(function() {
+		$(this).toggleClass('checked');
+		if($(this).hasClass('checked')){
+			//所有列选中
+		  $(".checker").find("span").each(function () {
+		         $(this).addClass("checked");
+		    })
+		}else{
+			//所有列取消选中
+			$(".checker").find("span").each(function () {
+				 $(this).removeClass("checked");
+		    })
+		}
+	});
+
+	//单个选中
+	$(document).on('click','.checkeBox span',function() {
+		$(this).toggleClass('checked');
+		//设置头部事件
+		var length=$('.checkeBox span').length;
+		var count=0;
+		$(".checkeBox").find("span").each(function () {
+	        if($(this).hasClass("checked")){
+	        	count++;
+	        }
+	   })
+		//全选
+	   if(count==length){
+		   $("#allCheck").find("span").addClass('checked');
+	   }else{
+		   $("#allCheck").find("span").removeClass('checked');
+	   }
+	})
+	//左右div高度相等
+	var left_content_height = $(".right-content").height();
+	$(".left-content").height(left_content_height+35);
+	var sub_left_height=$(".res-menu").height(left_content_height-60);
+});
+
+//查询
+function queryAgreement(index){
+	if(typeof(index)=='undefined'){
+		index=1;
+	}
+	var url=ctx+'/agreement/queryAgreementByPage';
+	$.ajax({  
+        url:url,  
+        type:"post", 
+        dataType:"json",  
+        data:{  
+        	"currPage":index,
+        	"name":$('#name').val()
+        },  
+        success:function(result){  
+        	//渲染数据
+        	$('#data_content').empty();
+        	var header='';
+        	var presentPage=result.currPage;
+        	$.each(result.agreementList,function(i){
+        		var orderNumber=(presentPage-1)*12+i+1;
+        		var agreement=result.agreementList[i];
+        		var data='';
+        		data+='<tr class="odd">';
+        		data+='<td class="textc">';
+				data+='		 <div class="checker checkeBox">';        		data+='		 <span class=""  data-id="'+agreement.id+'"><input type="checkbox"  value=""></span>';
+        		data+='		</div>';
+        		data+='</td>';
+        		data+='<td class="textc">'+orderNumber+'</td>';
+        		data+='<td class="textc">'+agreement.name+'</td>';
+        		var createDt="";
+        		if(StringUtil.isNotBlank(agreement.createDt)){
+        			createDt = dateFtt("yyyy-MM-dd hh:mm:ss",new Date(agreement.createDt));
+        		}
+        		data+='<td class="textc">'+createDt+'</td>';
+        		data+='<td class="textc">'+agreement.createor+'</td>';
+        		data+='<td class="textc">';
+        		data+='<div class="positionr listOperaters">';
+        		data+='		<a href="javascript:void(0);"  class="icon-large dlblock w16 h16"><img src="'+resourcePath+'/images/angle-down.png"/></a>';
+        		data+='		<div class="ops_box ops_itemDiv positiona clearfix whitebg">';
+        		data+='			<ul>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showAgreementDetails('+agreement.id+')" class="layui-btn layui-btn-sm layui-btn-radius fa fa-edit ops_more f12">编辑</a></li>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="initDeleteAgreement('+agreement.id+')" class="layui-btn layui-btn-sm layui-btn-radius layui-btn-danger fa fa-remove ops_more f12">删除</a></li>';
+        	    data+='			</ul>';
+              data+='		</div>';
+        	    data+='</div>';
+        	    data+='</td>';
+        	    data+='</tr>';
+        	    $('#data_content').append(data);
+        	});
+        	//分页
+        	$('#pageCount').html(result.pageCount);
+      	$('#currPage').html(result.currPage);
+          $('#totalCount').html(result.count);
+           	//设置分页
+           	pageIndex=result.currPage;
+			$('#pagination').pagination({
+				pageCount: result.pageCount,
+				jump: true,
+				coping: true,
+				jump: true,
+				homePage: '首页',
+				endPage: '末页',
+				prevContent: '上页',
+				nextContent: '下页',
+				current:result.currPage,
+				callback:function(api){
+					pageIndex=api.getCurrent();
+					queryAgreement(api.getCurrent());
+				}
+			});
+        } 
+    });  
+	//表头列不选中
+	$("#allCheck").find("span").removeClass('checked');
+}
+
+//初始化新增
+function initAddAgreement(){
+	window.location=ctx+'/agreement/queryAgreementDetails?pageIndex='+pageIndex;
+}
+
+//初始化修改
+function showAgreementDetails(id){
+	window.location=ctx+'/agreement/queryAgreementDetails?id='+id+'&pageIndex='+pageIndex;
+}
+
+//初始化删除
+function initDeleteAgreement(id){
+	
+		layer.open({
+		type: 1,
+		closeBtn: 1,		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r'	, //按钮居中
+		shade: 0.3 ,//不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteAgreement(id,true);
+		}
+	});
+}
+
+//删除
+function deleteAgreement(id,showMsg){
+	$.ajax({
+		url:ctx+'/agreement/deleteAgreement',
+		data:[{
+			name:'id',
+			value:id
+		}],
+		type:'POST',
+		dataType:'json',
+		success:function(){
+			queryAgreement(pageIndex);
+			if(showMsg){
+				layer.msg('删除成功!');	
+			}
+		}
+	});
+}
+//头部编辑
+function initEditAgreement(){
+	var count=0;
+	var id=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+        	 id=$(this).data('id');
+         }
+    })
+    if(count>1){
+    	layer.msg('只能选中一行记录进行操作!');
+    	return ;
+    }
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	 if(id>0){
+	  showAgreementDetails(id);
+	 }
+}
+//头部删除
+function initBatchDeleteAgreement(){
+	var count=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+         }
+    })
+	
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	
+
+	layer.open({
+		type: 1,
+		closeBtn: 1,
+		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r', //按钮居中
+		shade: 0.3, //不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteBatchAgreement();
+		}
+	});
+	
+}
+//批量删除
+function deleteBatchAgreement(){
+	
+	$(".checkeBox").find("span").each(function () {
+        if($(this).hasClass("checked")){
+        	var id=$(this).data('id');
+        	deleteAgreement(id,false);
+        	layer.msg('删除成功!');	
+        }
+   })
+}
+
+//时间格式化处理
+function dateFtt(fmt,date)   
+{ //author: meizz   
+  var o = {   
+    "M+" : date.getMonth()+1,                 //月份   
+    "d+" : date.getDate(),                    //日   
+    "h+" : date.getHours(),                   //小时   
+    "m+" : date.getMinutes(),                 //分   
+    "s+" : date.getSeconds(),                 //秒   
+    "q+" : Math.floor((date.getMonth()+3)/3), //季度   
+    "S"  : date.getMilliseconds()             //毫秒   
+  };   
+  if(/(y+)/.test(fmt))   
+    fmt=fmt.replace(RegExp.$1, (date.getFullYear()+"").substr(4 - RegExp.$1.length));   
+  for(var k in o)   
+    if(new RegExp("("+ k +")").test(fmt))   
+  fmt = fmt.replace(RegExp.$1, (RegExp.$1.length==1) ? (o[k]) : (("00"+ o[k]).substr((""+ o[k]).length)));   
+  return fmt;   
+}
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/auth/menu/menu.js b/pluss-manage-page/src/main/resources/static/resources/js/auth/menu/menu.js
new file mode 100644
index 0000000..27d71ad
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/auth/menu/menu.js
@@ -0,0 +1,518 @@
+var menuTree, rMenu;
+$(function() {
+	initMenuTree();
+
+	rendEdit();
+	
+	initUpload();
+
+	initValidate();
+
+	$("#btn_save").click(function() {
+		submit();
+	})
+})
+
+function initUpload(){
+	$("#icon_upload").uploadify({
+		swf : res + "/auth/uploadify/uploadify.swf",
+		uploader : ctx + "/menu!uploadIcon.do",
+		width : 80,
+		height : 80,
+		multi : false,
+		fileTypeExts : '*.jpg;*.jpeg;*.bmp;*.gif;*.png',
+		fileTypeDesc : 'Image(*.jpg;*.bmp;*.gif;*.png)',
+		fileObjName : "file",
+		buttonText : '选择图片',
+		removeTimeout : 0, // 完成时清除队列显示秒数
+		onInit : function() {
+			$(".uploadify-queue").hide();
+			$("#icon_upload-button").remove();
+			$("#icon_upload").css({
+				position : 'absolute',
+				width : '100%',
+				height : '100%',
+				left : 0,
+				top : 0,
+				margin : 0,
+				cursor : 'pointer'
+			}).attr("title", "点击上传");
+		},
+		removeCompleted : true,
+		onUploadStart: function() {
+			$(".uploadify-queue").show();
+		},
+		onUploadComplete: function() {
+			$(".uploadify-queue").hide();
+		},		
+		onUploadSuccess : function(file, data, response) {
+			renderIconUrl(data);
+		},
+		onUploadError : function(file, errorCode, errorMsg, errorString) {
+			alert('文件 ' + file.name + ' 上传失败: ' + errorString);
+		}
+	});
+	
+	$(document).on("mouseover","#icon_upload_wrap",function(){
+		if($("#icon_upload_wrap img").size() > 0) {
+			$("#icon_upload_wrap .clear").show('fast');
+		}
+	})
+	$(document).on("mouseleave","#icon_upload_wrap",function(){
+		$("#icon_upload_wrap .clear").hide('fast');
+	})
+	$("#icon_upload_wrap .clear button").click(function(){
+		$("#icon_upload_wrap img").remove();
+		return false;
+	})
+	
+	
+	$("#icon_upload_wrap").click(function(){
+		$.seocooUpload(function(data){
+			if(data.result==1){
+				renderIconUrl(data.url);
+				
+			}else{
+				alert(data.message);
+			}
+			
+		})
+	})
+	
+	
+}
+
+function renderIconUrl(url) {
+	var $img = $("#icon_upload_wrap img");
+	if($img.size()==0) {
+		$img = $("<img>");
+		$("#icon_upload_wrap").append($img);
+	}
+	$img.attr("src",url);
+}
+
+function initMenuTree() {
+	menuTree = $.fn.zTree.init($("#menu_tree"), {
+		async : {
+			enable : true,
+			url : ctx + "/menu!getSubMenus.do",
+			type : 'post',
+			dataType : 'json',
+			async:false, 
+			autoParam : [ "id=parentId" ],
+			dataFilter : function(treeId, pNode, treeNodes) {
+				for ( var i = 0; i < treeNodes.length; i++) {
+					treeNodes[i] = menu2Node(treeNodes[i]);
+				}
+				return treeNodes;
+			}
+		},
+		data : {
+			keep : {
+				leaf : true,
+				parent : true
+			}
+		},
+		edit : {
+			enable : true,
+			showRemoveBtn : false,
+			showRenameBtn : false,
+			drag : {
+				isCopy : true,
+				isMove : true
+			}
+		},
+		view : {
+			selectedMulti : false
+		},
+		callback : {
+			onRightClick : function(evt, treeId, treeNode) {
+				showMenu(treeNode, evt.pageX, evt.pageY);
+			},
+			beforeDrag : function(treeId, treeNodes) {
+				return true;
+			},
+			beforeDrop : function(treeId, treeNodes, targetNode, moveType) {
+				try {
+					var containerType = 1;
+					if (targetNode) {
+						if (moveType === 'inner') {
+							containerType = targetNode.menuType;
+						} else if (targetNode.getParentNode()) {
+							containerType = targetNode.getParentNode().menuType;
+						}
+					}
+					var treeNode = treeNodes[0];
+					switch (containerType) {
+					case 1://目录接受页面和按键
+						if (treeNode.menuType < 3) {
+							return true;
+						}
+						break;
+					case 2://页面只接受按键
+						if (treeNode.menuType === 3) {
+							return true;
+						}
+						break;
+					case 3://按键不接受
+						return false;
+						break;
+					}
+				} catch (e) {
+					console.log(e);
+				}
+				return false;
+			},
+			onDrop : function(evt, treeId, treeNodes, targetNode, moveType, isCopy) {
+				if (targetNode && moveType) {
+					var containerId = null;
+					if (moveType === 'inner') {
+						containerId = targetNode.id;
+					} else if (targetNode.getParentNode()) {
+						containerId = targetNode.getParentNode().id;
+					}
+					var container = menuTree.getNodeByParam("id",containerId);
+					
+					$.ajax({
+						url : ctx + (isCopy ? '/menu/copy' : '/menu/move'),
+						type : 'post',
+						dataType : 'json',
+						data : [ {
+							name : 'toId',
+							value : containerId
+						}, {
+							name : 'id',
+							value : treeNodes[0].id
+						}, {
+							name : 'order',
+							value : menuTree.getNodeIndex(treeNodes[0]) + 1
+						}],
+						complete : function() {
+							menuTree.reAsyncChildNodes(container, "refresh", false);
+							rendEdit();
+						}
+					})
+				} else {
+					rendEdit();
+				}
+			},
+			onRemove : function(evt, treeId, treeNode) {
+				rendEdit();
+			},
+			onClick : function(evt, treeId, treeNode, clickFlag) {
+				rendEdit();
+			}
+		// callback end
+		}
+	});
+	menuTree.expandAll(true);
+}
+
+function menu2Node(node) {
+	node.isParent = !(node.menuType === 3);
+	switch (node.menuType) {
+	case 1:
+		node.iconSkin = "folder";
+		break;
+	case 2:
+		node.iconSkin = "page";
+		break;
+	case 3:
+		node.iconSkin = "action";
+		break;
+	default:
+		break;
+	}
+	node.parentId = node.parent ? node.parent.id : null;
+	return node;
+}
+
+function showMenu(treeNode, x, y) {
+	$("#rMenu").css({
+		"top" : y + "px",
+		"left" : x + "px",
+		"visibility" : "visible"
+	});
+	var pMenuType = null;
+	if (treeNode) {
+		pMenuType = treeNode.menuType;
+	}
+	switch (pMenuType) {
+	case 1:
+		$("#m_refresh").show();
+		$("#m_add_folder").show();
+		$("#m_add_page").show();
+		$("#m_add_action").hide();
+		$("#m_del").show();
+		break;
+	case 2:
+		$("#m_refresh").show();
+		$("#m_add_folder").hide();
+		$("#m_add_page").hide();
+		$("#m_add_action").show();
+		$("#m_del").show();
+		break;
+	case 3:
+		$("#m_refresh").hide();
+		$("#m_add_folder").hide();
+		$("#m_add_page").hide();
+		$("#m_add_action").hide();
+		$("#m_del").show();
+		break;
+	default:
+		$("#m_refresh").show();
+		$("#m_add_folder").show();
+		$("#m_add_page").show();
+		$("#m_add_action").hide();
+		$("#m_del").hide();
+		break;
+	}
+
+	if (!treeNode) {
+		$("#rMenu").removeData('tId');
+	} else {
+		$("#rMenu").data("tId", treeNode.tId);
+		menuTree.selectNode(treeNode);
+		rendEdit();
+	}
+	$(document).bind("mousedown", onBodyMouseDown);
+}
+
+function hideMenu() {
+	$("#rMenu").css({
+		"visibility" : "hidden"
+	});
+	$(document).unbind("mousedown", onBodyMouseDown);
+}
+
+function onBodyMouseDown(event) {
+	if (!(event.target.id == "rMenu" || $(event.target).parents("#rMenu").length > 0)) {
+		hideMenu();
+	}
+}
+
+function rendEdit() {
+	if (menuTree && menuTree.getSelectedNodes()[0]) {
+		var node = menuTree.getSelectedNodes()[0];
+		var _id = $("#id").val();
+		$("#id").val(node.id);
+		if(node.parentId) {
+			$("#parentId").val(node.parentId);
+			$("#description").removeAttr('placeholder');
+			$(".control-group:has(#description)").hide();
+		}else {//当前菜单是子系统节点
+			$("#parentId").val('');
+			$(".control-group:has(#description)").show();
+			$("#description").attr('placeholder',"此处内容将作为子系统logo展示");
+		}
+		$("#menuOrder").val(menuTree.getNodeIndex(node) + 1);
+		$("#name").val(node.name);
+		$("#link").val(node.link);
+		$("#description").val(node.description);
+		$("#menuType").val(node.menuType);
+		$("#visible").prop({
+			checked : node.visible
+		})
+		if(node.iconUrl){
+			renderIconUrl(node.iconUrl);
+		}else {
+			$("#icon_upload_wrap img").remove();
+		}
+		
+		//当前选中的和之前选中的不是同一个节点
+		if(_id != node.id) {
+			$("#menu_info_block").hide();
+			$("#menu_info_block").show('fast',function(){
+				$("#name").focus().select();
+			});
+		}
+	}else {
+		$("#id").val('');
+		$("#menu_info_block").hide();
+	}
+}
+
+function menu_refreshTreeNode() {
+	hideMenu();
+	var tId = $("#rMenu").data("tId");
+	var node = menuTree.getNodeByTId(tId);
+	menuTree.reAsyncChildNodes(node, "refresh", false);
+	rendEdit();
+}
+
+function menu_addTreeNode(menuType) {
+	hideMenu();
+	var tId = $("#rMenu").data("tId");
+	var node = menuTree.getNodeByTId(tId);
+	if (node && !node.isParent) {
+		return;
+	}
+	var isParent = true;
+	var iconSkin = "page";
+	switch (menuType) {
+	case 1:
+		isParent = true;
+		iconSkin = "folder";
+		break;
+	case 2:
+		isParent = true;
+		iconSkin = "page";
+		break;
+	case 3:
+		isParent = false;
+		iconSkin = "action";
+		break;
+	}
+	var newNodes = menuTree.addNodes(node, [ {
+		id : '',
+		name : '新建菜单',
+		menuType : menuType,
+		isParent : isParent,
+		iconSkin : iconSkin
+	} ], false);
+	var newNode = newNodes[0];
+	var pId = node ? node.id : '';
+	var data = [ {
+		name : 'menu.id',
+		value : ''
+	}, {
+		name : 'menu.name',
+		value : newNode.name
+	}, {
+		name : 'menu.menuOrder',
+		value : menuTree.getNodeIndex(newNode) + 1
+	}, {
+		name : 'menu.menuType',
+		value : newNode.menuType
+	} ];
+	if (pId) {
+		data.push({
+			name : 'menu.parentId',
+			value : pId
+		});
+	}
+	$.ajax({
+		url : ctx + '/menu!saveMenu.do',
+		type : 'post',
+		dataType : 'json',
+		data : data,
+		success : function(menu) {
+			newNode.id = menu.id;
+			newNode.parentId = menu.parentId;
+			menuTree.updateNode(newNode);
+			if(newNode.getParentNode) {
+				menuTree.selectNode(newNode);
+			}
+			rendEdit();
+		},
+		   error:function(XMLHttpRequest,textStatus,errorThrown){
+	            alert(errorThrown);
+	            alert(XMLHttpRequest.status);
+	            alert(XMLHttpRequest.readyState);
+	            alert(textStatus);
+			menuTree.removeNode(newNode, false);
+		}
+	})
+}
+
+function menu_removeTreeNode() {
+	hideMenu();
+	var tId = $("#rMenu").data("tId");
+	var node = menuTree.getNodeByTId(tId);
+	myConfirm('', '确定删除?', function() {
+		$.ajax({
+			url : ctx + '/menu!deleteMenu.do',
+			type : 'post',
+			dataType : 'json',
+			data : [ {
+				name : 'id',
+				value : node.id
+			} ],
+			complete : function(data) {
+				menuTree.reAsyncChildNodes(node.getParentNode(), "refresh", false);
+				rendEdit();
+			}
+		})
+	});
+}
+
+function initValidate() {
+	$("#menu_form").validate({
+		onfocusout : false,
+		onkeyup : false,
+		onclick : false,
+		focusInvalid : true,
+		rules : {
+			name : {
+				required : true,
+				maxlength : 32
+			}
+		},
+		showErrors : function(errorMap, errorList) {
+			$(this.currentForm).find("span.error").remove();
+			if (errorList.length > 0) {
+				var err = errorList[0];
+				var el = $(err.element);
+				var target = el.parentsUntil('form', '.controls');
+				target.append("<span class='error'>{0}</span>".format(err.message));
+			}
+		}
+	});
+}
+
+function submit() {
+	if (!$("#menu_form").valid()) {
+		return;
+	}
+	$("#btn_save").attr("disabled","disabled");
+	var data = [];
+	$.each($("#menu_form").serializeArray(),function(i,a){
+		if(typeof(a.value) == 'string' && !a.value){
+			return;
+		}
+		//on转数值
+		if(a.name=='menu.visible'){
+			if(a.value=='on'){
+				a.value='1';
+			}else{
+				a.value='0';
+			}
+		}
+		data.push(a);
+	});
+	var iconUrl = $("#icon_upload_wrap img").attr("src");
+	if(iconUrl) {
+		data.push({
+			name : 'iconUrl',
+			value : iconUrl
+		})
+	}
+	$.ajax({
+		url : ctx + '/menu!saveMenu.do',
+		type : 'post',
+		dataType : 'json',
+		data : data,
+		success : function(menu) {
+			var node = menuTree.getNodeByParam("id", menu.id);
+			$.extend(node,menu);
+			menuTree.updateNode(node);
+			$("#id").val('');
+			rendEdit();
+		},
+		complete : function(){
+			$("#btn_save").removeAttr("disabled");
+		}
+	})
+}
+
+
+//主线程休眠
+function sleep(numberMillis) { 
+	var now = new Date(); 
+	var exitTime = now.getTime() + numberMillis; 
+	while (true) { 
+	now = new Date(); 
+	if (now.getTime() > exitTime) 
+	return; 
+	} 
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/auth/role/editRole.js b/pluss-manage-page/src/main/resources/static/resources/js/auth/role/editRole.js
new file mode 100644
index 0000000..c4faa94
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/auth/role/editRole.js
@@ -0,0 +1,204 @@
+var menuTree;
+var roleMenuIds = [];
+$(function() {
+
+	//initEdit();
+
+	renderMenuTree();
+
+	initValidate();
+
+	if (readOnly) {
+		$("input").attr("readonly", "readonly");
+		$("input").attr("disabled", "disabled");
+		$("select").attr("disabled", "disabled");
+		$("#btn_save").hide();
+	}
+
+	$("#btn_save").click(function() {
+		submit();
+	})
+
+})
+
+function initValidate() {
+	$("#role_form").validate({
+		onfocusout : false,
+		onkeyup : false,
+		onclick : false,
+		focusInvalid : true,
+		rules : {
+			name : {
+				required : true,
+				maxlength : 32
+			}
+		},
+		showErrors : function(errorMap, errorList) {
+			$(this.currentForm).find("span.error").remove();
+			if (errorList.length > 0) {
+				var err = errorList[0];
+				var el = $(err.element);
+				var target = el.parentsUntil('form', '.controls');
+				target.append("<span class='error'>{0}</span>".format(err.message));
+			}
+		}
+	});
+}
+
+function submit() {
+	if (!$("#role_form").valid()) {
+		return;
+	}
+	var data = $("#role_form").serializeArray();
+	var nodes = menuTree.getCheckedNodes();
+	var menuIds = [];
+	$.each(nodes,function(i,node){
+		menuIds.push(node.id);
+	});
+	data.push({
+		name : 'menuIds',
+		value : menuIds
+	});
+	//console.log(data);
+	$("#btn_save").attr("disabled", "disabled");
+	$.ajax({
+		url : ctx + "/role!save.do",
+		type : "POST",
+		dataType : 'json',
+		data : data,
+		complete : function() {
+			$("#btn_save").removeAttr("disabled");
+		},
+		success : function(role) {
+			$("#id").val(role.id);
+			history.go(-1);
+		}
+	});
+}
+
+function initEdit() {
+	var id = $("#id").val();
+	if (id) {
+		$.ajax({
+			url : ctx + "/role!findById.do",
+			type : "POST",
+			dataType : 'json',
+			async : false,
+			data : [ {
+				name : 'id',
+				value : id
+			} ],
+			success : function(role) {
+				if (role != null) {
+					renderRole(role);
+				}
+			}
+		});
+	}
+}
+
+function renderRole(role) {
+	window.role = role;
+	$.ajax({
+		url : ctx + '/role!roleMenus.do',
+		type : 'post',
+		dataType : 'json',
+		async : false,
+		data : [ {
+			name : 'roleId',
+			value : role.id
+		} ],
+		success : function(menus) {
+			$.each(menus, function(i, menu) {
+				roleMenuIds.push(menu.id);
+			})
+		}
+	})
+	$("#name").val(role.name);
+	$("#createTime").val(new Date(role.createTime).format('yyyy-MM-dd HH:mm:ss'));
+}
+
+function renderMenuTree() {
+	menuTree = $.fn.zTree.init($("#menu_tree"), {
+		async : {
+			enable : true,
+			url : ctx + "/menu!permitSubMenus.do",
+			type : 'post',
+			dataType : 'json',
+			autoParam : [ "id=parentId" ],
+			dataFilter : function(treeId, pNode, treeNodes) {
+				for ( var i = 0; i < treeNodes.length; i++) {
+					var node = treeNodes[i];
+					//alert('id='+node.id+',parentId='+node.parentId+',name='+node.name);
+					if($.inArray(node.id,roleMenuIds)>=0){
+						node.checked = true;
+					}
+					if(readOnly) {
+						node.chkDisabled = true;
+					}
+					node.isParent = !(node.menuType === 3);
+					switch (node.menuType) {
+					case 1:
+						node.iconSkin = "folder";
+						break;
+					case 2:
+						node.iconSkin = "page";
+						break;
+					case 3:
+						node.iconSkin = "action";
+						break;
+					default:
+						break;
+					}
+				}
+				return treeNodes;
+			}
+		},
+		check : {
+			enable : true
+		},
+		data : {
+			keep : {
+				leaf : true,
+				parent : true
+			}
+		},
+		view : {
+			selectedMulti : false
+		},
+		callback : {
+			onAsyncSuccess : function(evt, treeId, treeNode, msg) {
+				if(msg!=null){
+					var children = [];
+					if (treeNode) {
+						children = treeNode.children;
+					} else {
+						children = menuTree.getNodes();
+					}
+				
+					for ( var i = 0; i < children.length; i++) {
+						var child = children[i];
+						menuTree.expandNode(child, true, false, false);
+					}
+				}
+			},
+		onAsyncError : function(event, treeId, treeNode, XMLHttpRequest, textStatus, errorThrown){
+			console.log('treeNode='+treeNode+',XMLHttpRequest='+XMLHttpRequest+',textStatus='+textStatus+',errorThrown='+errorThrown);
+		}
+		// callback end
+		}
+	});
+	menuTree.expandAll(true);
+}
+
+
+//主线程休眠
+function sleep(numberMillis) { 
+	var now = new Date(); 
+	var exitTime = now.getTime() + numberMillis; 
+	while (true) { 
+	now = new Date(); 
+	if (now.getTime() > exitTime) 
+	return; 
+	} 
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/auth/role/role.js b/pluss-manage-page/src/main/resources/static/resources/js/auth/role/role.js
new file mode 100644
index 0000000..7099366
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/auth/role/role.js
@@ -0,0 +1,104 @@
+$(function() {
+
+	initTable();
+
+	$("#query_btn").click(function() {
+		table.fnDraw();
+	});
+})
+
+function initTable() {
+	table = $("#role_table").myDataTable(
+			{
+				"sAjaxSource" : ctx + '/role!queryUsers.do',
+				"paramSelector" : '#name',
+				"aoColumns" : [
+						{
+							// name 0
+							"bSortable" : false,
+							sWidth : 120
+						},{
+							//1 更新人
+							"bSortable" : false,
+							sWidth : 80
+						},{
+							//2 更新时间
+							"bSortable" : true,
+							sName : 'updateTime',
+							fnRender : function(obj){
+								var val = obj.aData[2];
+								if(val) {
+									return new Date(val).format('yyyy-MM-dd hh:mm:ss');
+								}
+								return '';
+							},
+							sWidth : 150
+						},{
+							//3 创建人
+							"bSortable" : false,
+							sWidth : 80
+						},{
+							//4 创建时间
+							"bSortable" : true,
+							sName : 'createTime',
+							fnRender : function(obj) {
+								var val = obj.aData[4];
+								if(val) {
+									return new Date(val).format('yyyy-MM-dd hh:mm:ss');
+								}
+								return '';
+							},
+							sWidth : 150
+						},
+						{
+							// view 5
+							"bSortable" : false,
+							fnRender : function(obj) {
+								var id = obj.aData[5];
+								return "<a href='{1}/role!edit.do?id={0}&readOnly=true'>查看</a>"
+										.format(id, ctx);
+							},
+							sWidth : 60
+						},
+						{
+							// edit 6
+							"bSortable" : false,
+							fnRender : function(obj) {
+								var id = obj.aData[6];
+								return "<a href='{1}/role!edit.do?id={0}'>修改</a>".format(id, ctx);
+							},
+							sWidth : 60
+						},
+						{
+							// del 7
+							"bSortable" : false,
+							fnRender : function(obj) {
+								var id = obj.aData[7];
+								return "<a href='javascript:deleteRole({0});'>删除</a>"
+										.format(id);
+							},
+							sWidth : 60
+						} ]
+			});
+}
+
+function deleteRole(id) {
+	myConfirm('', '确定删除?', function() {
+		$.ajax({
+			url : ctx + '/role!delete.do',
+			type : 'post',
+			dataType : 'json',
+			data : [ {
+				name : 'id',
+				value : id
+			} ],
+			success : function(data) {
+				if(data.error) {
+					myAlert('','删除失败 : ' + data.error);
+					return;
+				}
+				table.fnDraw(false);
+			}
+		})
+	})
+}
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/auth/user/changePwd.js b/pluss-manage-page/src/main/resources/static/resources/js/auth/user/changePwd.js
new file mode 100644
index 0000000..d8b52e6
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/auth/user/changePwd.js
@@ -0,0 +1,71 @@
+$(function() {
+	initValidate();
+	
+	$("input").keypress(function(event){
+		if(event.which == 13){
+			submit();
+		}
+	});
+
+	$("#btn_save").click(function() {
+		submit();
+	});
+});
+
+function submit(){
+	var ok = $("#pwd_form").valid();
+	if (ok) {
+		$("#btn_save").attr("disabled", "disabled");
+		$.ajax({
+			url : ctx + '/user!doChangePwd.do',
+			type : 'POST',
+			dataType : 'json',
+			data : $("#pwd_form").serializeArray(),
+			complete : function() {
+				$("#btn_save").removeAttr("disabled");
+			},
+			success : function(data) {
+				if(data.flag==1){
+					myConfirm('', '修改完成,是否重新登录?', function() {
+						top.location.href = ctx + '/home!logout.do';
+					});
+				}else{
+					
+					alert(data.msg);
+				}
+				
+			}
+		});
+	}
+}
+
+function initValidate() {
+	$("#pwd_form").validate({
+		onfocusout : false,
+		onkeyup : false,
+		onclick : false,
+		focusInvalid : true,
+		rules : {
+			oldPassword : {
+				required : true
+			},
+			newPassword : {
+				required : true,
+				maxlength : 32
+			},
+			confirmPassword : {
+				required : true,
+				equalTo : '#newPassword'
+			}
+		},
+		showErrors : function(errorMap, errorList) {
+			$(this.currentForm).find("span.error").remove();
+			if (errorList.length > 0) {
+				var err = errorList[0];
+				var el = $(err.element);
+				var target = el.parentsUntil('form', '.controls');
+				target.append("<span class='error'>{0}</span>".format(err.message));
+			}
+		}
+	});
+}
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/auth/user/editUser.js b/pluss-manage-page/src/main/resources/static/resources/js/auth/user/editUser.js
new file mode 100644
index 0000000..e21b62d
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/auth/user/editUser.js
@@ -0,0 +1,670 @@
+$(function() {
+	
+	//initEdit();
+	initRoles();
+//	initProvince();
+//	initProducts();
+//	initPlatforms();
+	initValidate();
+	
+	$("#btn_save").click(function() {
+		alert(222);
+		submit();
+	});
+
+	if (readOnly) {
+		$("input").attr("disabled", "disabled");
+		$("select").attr("disabled", "disabled");
+		$('#organType').attr("disabled",false);
+		$("#btn_save").hide();
+	}
+	
+	//选择不同组织类型时存储勾选商户
+	var organType = null;
+	$('#organType').change(function(){
+		var str = "";
+		$('.classOrgan').each(function(){
+			if($(this).attr("checked")=="checked"){
+				str =  $(this).val()+":"+$(this).parent().text()+"/"+str;
+			}
+		})
+		if($('#organType').val()=='order_meal'){
+			$('#OrganIdWifi').val(str);
+		}else{
+			$('#OrganIdMeal').val(str);
+		}
+		var url = ctx + "/user/returnOrganList?organType="+$('#organType').val();
+		$('#modelBody').load(url,function(){
+			$('#dataAuthModal').show();
+			if($('#loginName').val()!=''){
+				$.ajax({
+					url : ctx + "/user/showModelForEdit",
+					type : "POST",
+					dataType : 'json',
+					data : [ {
+						name : 'loginName',
+						value : $('#loginName').val()
+					},{
+						name : 'organType',
+						value : $('#organType').val()
+					} ],
+					success : function(data) {
+						adornToModel(data);
+						if(readOnly){	
+							$("#modelBody :checkbox").attr("disabled","disabled");
+							
+							$("#addDevice").attr("disabled","disabled");
+						}
+					}
+				});
+			}
+		});
+		
+	});
+	
+});
+
+function initProducts(){
+	var p = $('#productIds').multiselect({
+		checkAllText : "全选",
+		uncheckAllText : "全部取消",
+		noneSelectedText : "请选择产品",
+		selectedText : "已选择#项",
+		minWidth: 170,
+		selectedList : 4
+	}).empty();
+	p.multiselect("refresh");
+	$.ajax({
+		url : ctx + "/anon/getPermitProducts",
+		type : 'POST',
+		dataType : 'json',
+		async : false,
+		data : [{
+			name : 'loginName',
+			value : curUserLoginName
+		}],
+		success : function(data) {
+			var userProductIds = $.map(userProducts,function(a){
+				return a.id;
+			})
+			$.each(data,function(i,product){
+				if($.inArray(product.id,userProductIds)<0){
+					p.append("<option value='{1}'>{0}</option>".format(product.cnName,product.id));
+				}else {
+					p.append("<option value='{1}' selected='selected'>{0}</option>".format(product.cnName,product.id));
+				}
+			});
+			p.multiselect("refresh");
+		}
+	})
+	$("#productIds").change(function(){
+		initPlatforms();
+	});
+}
+
+function initPlatforms(){
+	var p = $('#platformIds').multiselect({
+		checkAllText : "全选",
+		uncheckAllText : "全部取消",
+		noneSelectedText : "请选择平台",
+		selectedText : "已选择#项",
+		minWidth: 170,
+		selectedList : 4
+	}).empty();
+	p.multiselect("refresh");
+	var productIds = $("#productIds").val();
+	if(!productIds) return;
+	$.ajax({
+		url : ctx + "/anon/getPermitPlatforms",
+		type : 'POST',
+		dataType : 'json',
+		async : false,
+		data : [{
+			name : 'loginName',
+			value : curUserLoginName
+		},{
+			name : 'productIds',
+			value : productIds
+		}],
+		success : function(data) {
+			var userPlatformIds = $.map(userPlatforms,function(a){
+				return a.id;
+			})
+			$.each(data,function(i,platform){
+				if($.inArray(platform.id,userPlatformIds)<0){
+					p.append("<option value='{1}'>{0}</option>".format(platform.name,platform.id));
+				}else {
+					p.append("<option value='{1}' selected='selected'>{0}</option>".format(platform.name,platform.id));
+				}
+			});
+			p.multiselect("refresh");
+		}
+	})
+}
+
+function initProvince() {
+	var p = $("#province").empty();
+	$.ajax({
+		url : ctx + "/area/permitProvinces",
+		type : 'POST',
+		dataType : 'json',
+		success : function(data) {
+			if (data.length == 1) {
+				p.empty();
+			}
+			var ids = [];
+			$.each(data, function(i, a) {
+				ids.push(a.id);
+				p.append("<option value='{0}'>{1}</option>".format(a.aiid, a.name));
+			});
+			if ($.inArray(userProvinceId, ids) >= 0) {
+				p.val(userProvinceId);
+			}
+			initCity();
+		}
+	});
+	p.change(function() {
+		initCity();
+	});
+}
+
+function initCity() {
+	var c = $("#city").empty();
+	c.append("<option value=''>选择城市</option>");
+	$.ajax({
+		url : ctx + "/area/permitCitys",
+		type : 'POST',
+		dataType : 'json',
+		data : [ {
+			name : 'provinceId',
+			value : $("#province").val()
+		} ],
+		success : function(data) {
+			if (data.length == 1) {
+				c.empty();
+			}
+			var ids = [];
+			$.each(data, function(i, a) {
+				ids.push(a.id);
+				c.append("<option value='{0}'>{1}</option>".format(a.aiid, a.name));
+			});
+			if ($.inArray(userCityId, ids) >= 0) {
+				c.val(userCityId);
+			}
+		}
+	});
+}
+
+function initPasswordValidate() {
+	$("#password_form").validate({
+		onfocusout : false,
+		onkeyup : false,
+		onclick : false,
+		focusInvalid : true,
+		rules : {
+			oldPassword : {
+				required : true,
+				maxlength : 32,
+				minlength : 6
+			},
+			newPassword : {
+				required : true,
+				maxlength : 32,
+				minlength : 6
+			},
+			confirmPassword : {
+				required : true,
+				equalTo : '#newPassword'
+			}
+		},
+		showErrors : function(errorMap, errorList) {
+			$(this.currentForm).find("span.error").remove();
+			if (errorList.length > 0) {
+				var err = errorList[0];
+				var el = $(err.element);
+				var target = el.parentsUntil('form', '.controls');
+				target.append("<span class='error'>{0}</span>".format(err.message));
+			}
+		}
+	});
+}
+
+function showModel(loginName){
+	adornSelect(loginName);
+	organType = $('#organType').val();
+	var url = ctx + "/user/showModel?organType="+organType;
+	$('#modelBody').load(url,function(){
+		$('#dataAuthModal').show();
+		if(loginName!=''){
+			$.ajax({
+				url : ctx + "/user/showModelForEdit",
+				type : "POST",
+				dataType : 'json',
+				data : [ {
+					name : 'loginName',
+					value : loginName
+				},{
+					name : 'organType',
+					value : $('#organType').val()
+				} ],
+				success : function(data) {
+					adornToModel(data);
+					if(readOnly){
+						$("#modelBody :checkbox").attr("disabled","disabled");
+						$("#addDevice").attr("disabled","disabled");
+					}
+				}
+			});
+		}
+	});	
+}
+
+function adornSelect(loginName){
+	var count=$("#organType option").length;
+	if(loginName!=0){
+		$.ajax({
+			url : ctx + "/user/returnOrganType",
+			type : "POST",
+			dataType : 'json',
+			async: false,
+			data : [ {
+				name : 'loginName',
+				value : loginName
+			}],
+			success : function(data) {				
+				for(var i=0;i<count;i++){
+					var organType = $("#organType").get(0).options[i].value;
+					if(organType == data.organType){  
+			            $("#organType").get(0).options[i].selected = true;  			          
+			            break;  
+			        }  
+			    }
+			}
+		});
+	}else{
+		for(var i=0;i<count;i++){
+			if($("#organType").get(0).options[i].value == "order_meal"){  
+	            $("#organType").get(0).options[i].selected = true;  			          
+	            break;  
+	        }  
+	    }
+	}
+
+}
+
+//暂停函数  
+function Pause(obj,iMinSecond){   
+   if (window.eventList==null) window.eventList=new Array();   
+   var ind=-1;   
+   for (var i=0;i<window.eventList.length;i++){   
+       if (window.eventList[i]==null) {   
+         window.eventList[i]=obj;   
+         ind=i;   
+         break;   
+        }   
+    }   
+   if (ind==-1){   
+   ind=window.eventList.length;   
+   window.eventList[ind]=obj;   
+   }   
+  setTimeout("GoOn(" + ind + ")",iMinSecond);   
+}   
+  
+//继续函数  
+function GoOn(ind){   
+  var obj=window.eventList[ind];   
+  window.eventList[ind]=null;   
+  if (obj.NextStep) obj.NextStep();   
+  else obj();   
+}   
+
+
+function adornToModel(data){
+
+	var resList = data.resList;
+	var cityList = new Array();
+	var organList= new Array();
+	for(var i = 0;i<resList.length;i++){
+	
+		var provinceId = resList[i].provinceId;
+		$('#pro_'+provinceId).attr("checked","checked");
+		cityList.push(resList[i].latnList);
+	}
+	for(var i=0;i<cityList.length;i++){
+		var citys = cityList[i];
+		for(var j = 0;j<citys.length; j++){
+			var cityId = citys[j].latnId;
+			$('#city_'+cityId).attr("checked","checked");
+			organList.push(citys[j].organList);
+		}
+	}
+	for(var i=0;i<organList.length;i++){
+		var organs = organList[i];
+		for(var j = 0;j<organs.length;j++){
+			var OrganIdWifi = organs[j].organCode;
+			$('#organ_'+OrganIdWifi).attr("checked","checked");
+		}
+	}
+	
+}
+
+
+function checkBoxProvince(obj,provinceId){
+	if($('#'+obj.id).attr("checked")=="checked"){
+		$('.checkBoxLatn_'+provinceId).attr("checked","checked");
+		$('.checkBoxOrgan_'+provinceId).attr("checked","checked");
+	}else{
+		$('.checkBoxLatn_'+provinceId).attr("checked",false);
+		$('.checkBoxOrgan_'+provinceId).attr("checked",false);
+	}
+}
+
+function checkBoxCity(obj,pro,latnId,index){
+	if($('#'+obj.id).attr("checked")=="checked"){
+		$('.subCheck_'+latnId).attr("checked","checked");
+	}else{
+		$('.subCheck_'+latnId).attr("checked",false);
+		if($('#'+obj.id).parent().parent().siblings().find('input').attr("checked")=="checked"){
+			return;
+		}else{
+			$('#pro_'+pro).attr("checked",false);
+		}
+		
+	}
+}
+
+function addOrgan(){
+	var str = "";
+	$('.classOrgan').each(function(){
+		if($(this).attr("checked")=="checked"){
+			str =  $(this).val()+":"+$(this).parent().text()+"/"+str;
+		}
+	})
+	if($('#organType').val()=='order_meal'){
+		$('#OrganIdMeal').val(str);
+	}else{
+		$('#OrganIdWifi').val(str);
+	}
+	$('#OrganId').val($('#OrganIdMeal').val()+$('#OrganIdWifi').val());
+	$("#dataAuthModal").modal("hide");
+	//alert($('#OrganIdWifi').val());
+}
+
+function generateProvinceList(data){
+	var provinceList = data.provinceList;
+	for(var i=0;i<provinceList.length;i++){
+		$('#modelBody').append(" <li class=\"provinceLi\"><label><input class=\"provinceCheck\" id=province_"+i+" onclick=\"checkBoxClick(this,"+provinceList[i].aiid+")\" name=\"Fruit\" type=\"checkbox\" value="+provinceList[i].aiid+" />"+provinceList[i].name+"</label></li>");
+	}
+}
+
+function checkBoxClick(obj,aiid){
+	
+	if($('#'+obj.id).attr("checked")=="checked"){
+		$.ajax({
+			url : ctx + "/user/showCity",
+			type : "POST",
+			dataType : 'json',
+			data : [ {
+				name : 'province',
+				value : aiid
+			} ],
+			success : function(data) {
+				//generateProvinceList(data);
+				generateCityList(data);
+			}
+		});
+	}else{
+		$('#'+obj.id).parent().parent().children().remove();
+	}
+
+}
+
+function generateCityList(data){
+	var par = data.cityList[0].parentId;
+	$('.provinceCheck').each(function(){
+		if($(this).val()==par){
+			var cityList = data.cityList;
+			for(var i=0;i<cityList.length;i++){
+				$(this).parent().parent().append("<ul class=\"cityUl\"><label><input name=\"Fruit\" onclick=\"cityCheckOnclick(this,"+cityList[i].aiid+")\" class=\"checkBoxCity\" type=\"checkbox\" value="+cityList[i].aiid+" />"+cityList[i].name+"</label></ul>");
+			}
+		}
+	});
+}
+
+function cityCheckOnclick(obj,aiid){
+	if($('#'+obj.id).attr("checked")=="checked"){
+		$.ajax({
+			url : ctx + "/user/showOrgan",
+			type : "POST",
+			dataType : 'json',
+			data : [ {
+				name : 'latnId',
+				value : aiid
+			} ],
+			success : function(data) {
+				//generateProvinceList(data);
+				generateOrganList(data);
+			}
+		});
+	}else{
+		//$('#'+obj.id).remove();
+	}
+}
+
+function generateOrganList(data){
+	var city = data.organList[0].latnId;
+	$('.checkBoxCity').each(function(){
+		if($(this).val()==city){
+			var organList = data.organList;
+			for(var i=0;i<organList.length;i++){
+				$(this).parent().parent().append("<li class=\"shopLi\"><ul class=\"shopUl\" id=\"\"><label><input name=\"Fruit\" type=\"checkbox\" value="+organList[i].organ_code+" />"+organList[i].organ_name+"</label></ul></li>");
+			}
+		}
+	});
+	var organList = data.organList;
+	
+	for(var i=0;i<cityList.length;i++){
+		var flag = cityList[i].aiid;
+		alert(data.flag);
+	}
+}
+
+function initValidate() {
+	$("#user_form").validate({
+		onfocusout : false,
+		onkeyup : false,
+		onclick : false,
+		focusInvalid : true,
+		rules : {
+			loginName : {
+				required : true,
+				maxlength : 32,
+				remote : {
+					url : ctx + '/user/checkLoginName',
+					type : 'POST',
+					dataType : 'json',
+					async : false,
+					data : [ {
+						name : 'id',
+						value : function() {
+							return $("#id").val();
+						}
+					}, {
+						name : 'loginName',
+						value : function() {
+							return $("#loginName").val();
+						}
+					} ]
+				}
+			},
+			trueName : {
+				required : true,
+				maxlength : 32
+			},
+			email : {
+				email : true,
+				remote : {
+					url : ctx + '/user/checkEmail',
+					type : 'POST',
+					dataType : 'json',
+					async : false,
+					data : [ {
+						name : 'id',
+						value : function() {
+							return $("#id").val();
+						}
+					}, {
+						name : 'email',
+						value : function() {
+							return $("#email").val();
+						}
+					} ]
+				}
+			},
+			phone : {
+				digits : true,
+				maxlength : 11,
+				minlength : 11
+			},
+			roleIds : {
+				required : true
+			}
+		},
+		showErrors : function(errorMap, errorList) {
+			$(this.currentForm).find("span.error").remove();
+			if (errorList.length > 0) {
+				var err = errorList[0];
+				var el = $(err.element);
+				var target = el.parentsUntil('form', '.controls');
+				target.append("<span class='error'>{0}</span>".format(err.message));
+			}
+		}
+	});
+}
+
+function submit() {
+	alert(111);
+	if(!$("#user_form").valid()){
+		return;
+	}
+	$("#btn_save").attr("disabled", "disabled");
+	
+	//生成选择角色
+	var str="";
+	$("#roles").find('input').each(function(){ 
+        if($(this).attr("checked")){
+            str += $(this).val()+","
+        }
+    })
+    alert(str);
+	$('#roleIds').val(str);
+	return;
+	$.ajax({
+		url : ctx + "/user/save",
+		type : "POST",
+		dataType : 'json',
+		data : $("#user_form").serializeArray(),
+		complete : function() {
+			$("#btn_save").removeAttr("disabled");
+		},
+		success : function(user) {
+			$("#id").val(user.id);
+			history.go(-1);
+		}
+	});
+
+}
+
+function initEdit() {
+	var id = $("#id").val();
+	if (id) {
+		$.ajax({
+			url : ctx + "/user!findById.do",
+			type : "POST",
+			dataType : 'json',
+			async : false,
+			data : [ {
+				name : 'id',
+				value : id
+			} ],
+			success : function(user) {
+				if(user!=null) {
+					renderUser(user);
+				}
+			}
+		});
+	}
+
+}
+
+function renderUser(user) {
+	window.user = user;
+//	var level = user.area.level;
+//	if (level == 1 || level == 2) {
+//		window.userProvinceId = user.area.id;
+//	}
+//	if (level == 3) {
+//		window.userProvinceId = user.area.parentId;
+//		window.userCityId = user.area.id;
+//	}
+	$.ajax({
+		url : ctx + "/user!findRolesByUser.do",
+		type : "POST",
+		dataType : 'json',
+		async : false,
+		data : [ {
+			name : 'userId',
+			value : user.id
+		} ],
+		success : function(roles) {
+			window.userRoles = roles;
+			$.each(roles, function(i, role) {
+				window.userRoleIds.push(role.id);
+			});
+		}
+	});
+	
+	$("#loginName").val(user.loginName);
+	$("#trueName").val(user.trueName);
+	$("#status").val(user.status);
+	$("input[name='sex'][value='{0}']".format(user.sex)).prop({
+		checked : true
+	});
+	$("#phone").val(user.phone);
+	$("#email").val(user.email);
+	$("#dataAuth").attr("onclick","showModel('"+user.loginName+"');")
+
+}
+
+function initRoles() {
+	var html = $("#roles").html();
+	$("#roles").empty();
+	$.ajax({
+		url : ctx + "/user!permitRoles.do",
+		type : "POST",
+		dataType : 'json',
+		async : false,
+		maskTarget : '#permission_tab',
+		success : function(roles) {
+			var roleIds = $.map(roles,function(role){
+				return role.id;
+			})
+			$.each(userRoles,function(i,a){
+				if($.inArray(a.id,roleIds)<0){
+					var roleEl = $("#roles").append(html.format(a.id,a.name));
+					roleEl.find("input").prop({checked : true}).attr("disabled","disabled");
+				}
+			})
+			
+			$.each(roles, function(i, a) {
+				$("#roles").append(html.format(a.id,a.name));
+				if ($.inArray(a.id, userRoleIds)<0) {
+				}else {
+					$("#roles #role_{0}".format(a.id)).prop({
+						checked : true
+					});
+				}
+			});
+		}
+	});
+}
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/auth/user/user.js b/pluss-manage-page/src/main/resources/static/resources/js/auth/user/user.js
new file mode 100644
index 0000000..104b403
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/auth/user/user.js
@@ -0,0 +1,200 @@
+$(function() {
+//	initProvince();
+	initTable();
+
+	$("#query_btn").click(function() {
+		table.fnDraw();
+	});
+	$("#name,#roleName").keyup(function(e){
+		if(e.keyCode == 13) {
+			table.fnDraw();
+		}
+	});
+
+});
+
+function initTable() {
+	table = $("#user_table").myDataTable({
+		"sAjaxSource" : ctx + '/user/queryUsers',
+		"paramSelector" : '#province,#city,#status,#trueName,#loginName,#roleName',
+		"aoColumns" : [ {
+			// loginName 0
+			"bSortable" : false,
+			sWidth : 60
+		}, {
+			// trueName 1
+			"bSortable" : false,
+			sWidth : 80
+		}, {
+			// area 2
+			"bSortable" : false,
+			sWidth : 60,
+			"fnRender" : function(obj) {
+				var ai = obj.aData[2];
+				if (ai) {
+					return ai.name;
+				}
+				return "";
+			}
+		}, {
+			// role 3
+			"bSortable" : false,
+			sWidth : 100,
+			fnRender : function(obj) {
+				var roles = obj.aData[3];
+				if (roles) {
+					var names = $.map(roles, function(a) {
+						return a.name;
+					});
+					return names.join(', ')
+				}
+				return "";
+			}
+		}, {
+			// status 4
+			"bSortable" : false,
+			sWidth : 50,
+			"fnRender" : function(obj) {
+				var val = obj.aData[4];
+				var text = "";
+				$("#status option").each(function() {
+					if (val && val == $(this).val()) {
+						text = $(this).text();
+						return false;
+					}
+				});
+				return text;
+			}
+		}, {
+			// createTime 5
+			"bSortable" : true,
+			"sName" : 'createTime',
+			"sWidth" : 120,
+			"fnRender" : function(obj) {
+				var val = obj.aData[5];
+				try{
+					return new Date(val).format("yyyy-MM-dd hh:mm:ss");
+				}catch(e){
+					return '';
+				}
+			}
+		}, {
+			// password 6
+			"bSortable" : false,
+			sWidth : 60,
+			fnRender : function(obj) {
+				var id = obj.aData[6];
+				return "<a href='javascript:resetPassword({0});'>初始化</a>".format(id);
+			}
+		}, {
+			// view 7
+			"bSortable" : false,
+			sWidth : 50,
+			fnRender : function(obj) {
+				var id = obj.aData[7];
+				return "<a href='{1}/user!edit.do?id={0}&readOnly=true'>查看</a>".format(id, ctx);
+			}
+		}, {
+			// edit 8
+			"bSortable" : false,
+			sWidth : 50,
+			fnRender : function(obj) {
+				var id = obj.aData[8];
+				return "<a href='{1}/user!edit.do?id={0}'>修改</a>".format(id, ctx);
+			}
+		}, {
+			// del 9
+			"bSortable" : false,
+			sWidth : 50,
+			fnRender : function(obj) {
+				var id = obj.aData[9];
+				var loginName= obj.aData[0];
+     			return "<a href='javascript:deleteUser({0},\"{1}\");'>删除</a>".format(id,loginName);
+				//return '<a href="javascript:deleteUser('+id+',\''+loginName+'\');">删除</a>'
+			}
+		} ]
+	});
+}
+
+function initProvince() {
+	var p = $("#province").empty();
+	p.append("<option value=''>选择省份</option>");
+	$.ajax({
+		url : ctx + "/area/permitProvinces",
+		type : 'POST',
+		dataType : 'json',
+		async : false,
+		success : function(data) {
+			if(data.length == 1) {
+				p.empty();
+			}
+			$.each(data, function(i, a) {
+				p.append("<option value='{0}'>{1}</option>".format(a.aiid, a.name));
+			});
+			initCity();
+		}
+	});
+	p.change(function() {
+		initCity();
+	});
+}
+
+function initCity() {
+	var c = $("#city").empty();
+	c.append("<option value=''>选择城市</option>");
+	$.ajax({
+		url : ctx + "/area/permitCitys",
+		type : 'POST',
+		dataType : 'json',
+		async : false,
+		data : [ {
+			name : 'provinceId',
+			value : $("#province").val()
+		} ],
+		success : function(data) {
+			if(data.length == 1) {
+				c.empty();
+			}
+			$.each(data, function(i, a) {
+				c.append("<option value='{0}'>{1}</option>".format(a.aiid, a.name));
+			});
+		}
+	});
+}
+
+function deleteUser(id,loginName) {
+	myConfirm('', '确定要删除吗?', function() {
+		$.ajax({
+			url : ctx + '/user!delete.do',
+			data : [ {
+				name : 'id',
+				value : id
+			} ,{
+				name : 'loginName',
+				value : loginName
+			}],
+			type : 'POST',
+			dataType : 'json',
+			success : function() {
+				table.fnDraw(false);
+			}
+		});
+	});
+}
+
+function resetPassword(id) {
+	myConfirm('', '确定要初始化密码吗?', function() {
+		$.ajax({
+			url : ctx + '/user!resetPassword.do',
+			data : [ {
+				name : 'id',
+				value : id
+			} ],
+			type : 'POST',
+			dataType : 'json',
+			success : function() {
+				myAlert('','密码初始化完成');
+			}
+		});
+	});
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/banner/bannerDetails.js b/pluss-manage-page/src/main/resources/static/resources/js/banner/bannerDetails.js
new file mode 100644
index 0000000..04f7f83
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/banner/bannerDetails.js
@@ -0,0 +1,96 @@
+/**
+ * create by robot 
+ * date Sat Sep 21 15:27:41 CST 2019 
+ */ 
+
+$(document).ready(function(){
+	//form表单样式
+	layui.use(['layer', 'form'], function() {
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+	//li 切换事件
+	$(".nav-tabs>li").click(function() {
+		var index = $(".nav-tabs>li").index(this);
+		$(this).addClass("active").siblings("li").removeClass("active");
+		
+	})
+	//弹出一个提示层
+	$('.fa-save').on('click', function() {
+		saveBanner();
+	});
+
+	//绑定标签栏事件
+	$(document).on('click','.nav-tabs li',function(){
+
+		var action =$(this).data('action');
+		 switch (action) {
+			case "base"://基本资料
+				goBase();
+				break;  
+			case "functions"://多功能
+				goFunctions();
+				break;
+			case "extends"://扩展    
+				goExtends();         
+				break;           
+		 }
+	})
+
+	//加载第一个标签
+	$('.nav-tabs li').eq(0).click();
+	
+});
+
+
+//跳转基本信息 
+function goBase(){
+	var url=ctx+'/banner/queryBannerBaseInfo?id='+$('#bannerId').val();
+	$('.tab-content').load(url);
+	              
+}
+//跳转多功能输入
+function goFunctions(){ 
+	var url=ctx+'/banner/queryBannerFunctionsInfo?id='+$('#bannerId').val();
+	$('.tab-content').load(url);  
+	
+}
+//跳转到扩展   
+function goExtends(){
+	
+	var url=ctx+'/banner/queryBannerExtendsInfo?id='+$('#bannerId').val();
+	$('.tab-content').load(url);          
+}  
+  
+
+ 
+//保存
+function saveBanner(){
+	 
+	$(".fa-save").attr("disabled","disabled");
+	$('.fa-save').html('正在保存...')
+	$.ajax({
+		url:ctx+"/banner/saveBanner",
+		type:"POST",
+		dataType:'json',
+		data:$("#data_form").serializeArray(),
+		complete:function(){
+			$(".fa-save").removeAttr("disabled");
+			$('.fa-save').html('保存')
+		},        
+		success:function(service){ 
+		
+			layer.confirm('保存成功,是否前往列表？', {
+				  btn: ['确认','取消'] //按钮
+				}, function(){
+					$('#goback span').trigger('click'); 
+				}, function(){         
+					layer.closeAll();
+			});  
+			
+		}
+	});  
+}
+ 
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/banner/bannerList.js b/pluss-manage-page/src/main/resources/static/resources/js/banner/bannerList.js
new file mode 100644
index 0000000..62f0158
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/banner/bannerList.js
@@ -0,0 +1,279 @@
+/**
+ * create by robot 
+ * date Sat Sep 21 15:27:41 CST 2019 
+ */ 
+
+var pageIndex=1;
+$(document).ready(function(){
+	//调用查询
+	pageIndex=StringUtil.getQueryString('pageIndex');
+	if(pageIndex==undefined||pageIndex==null){
+		pageIndex=1;
+	}
+	queryBanner(pageIndex);
+	//绑定hover操作
+	$(document).on('mouseenter','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").show();
+		var width=15;
+		$(this).children('div').find('li').each(function(){
+			//获取li宽度
+			width+=$(this).width();
+		});
+		$(this).children('div').width(width);
+	})
+	$(document).on('mouseleave','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").hide();
+	});
+
+	//日历控件
+	layui.use(['layer', 'laydate'], function() {
+		var layer = layui.layer;
+		laydate = layui.laydate;
+		laydate.render({
+		elem: '#date1' //指定元素
+		});
+		laydate.render({
+			elem: '#date2' //指定元素
+		});
+	});
+
+	//行选中事件
+	$("#allCheck").find("span").click(function() {
+		$(this).toggleClass('checked');
+		if($(this).hasClass('checked')){
+			//所有列选中
+		  $(".checker").find("span").each(function () {
+		         $(this).addClass("checked");
+		    })
+		}else{
+			//所有列取消选中
+			$(".checker").find("span").each(function () {
+				 $(this).removeClass("checked");
+		    })
+		}
+	});
+
+	//单个选中
+	$(document).on('click','.checkeBox span',function() {
+		$(this).toggleClass('checked');
+		//设置头部事件
+		var length=$('.checkeBox span').length;
+		var count=0;
+		$(".checkeBox").find("span").each(function () {
+	        if($(this).hasClass("checked")){
+	        	count++;
+	        }
+	   })
+		//全选
+	   if(count==length){
+		   $("#allCheck").find("span").addClass('checked');
+	   }else{
+		   $("#allCheck").find("span").removeClass('checked');
+	   }
+	})
+	//左右div高度相等
+	var left_content_height = $(".right-content").height();
+	$(".left-content").height(left_content_height+35);
+	var sub_left_height=$(".res-menu").height(left_content_height-60);
+});
+
+//查询
+function queryBanner(index){
+	if(typeof(index)=='undefined'){
+		index=1;
+	}
+	var url=ctx+'/banner/queryBannerByPage';
+	$.ajax({  
+        url:url,  
+        type:"post", 
+        dataType:"json",  
+        data:{  
+        	"currPage":index,
+        	"id":$('#searchId').val(),
+        	"type":$('#type option:selected').val()
+        },  
+        success:function(result){  
+        	
+        	
+        	//渲染数据
+        	$('#data_content').empty();
+        	var header='';
+        	var xuhao=0;
+        	var cishu=0;
+        	$.each(result.bannerList,function(i){
+        		xuhao=result.bannerList.length;
+        		var banner=result.bannerList[i];
+        		console.log(banner.id);
+        		var data='';
+        		var type='';
+        		if("01" == banner.type){
+        			type = "主页";
+        		}else if("02" == banner.type){
+        			type = "推广页";
+        		}
+        		data+='<tr class="odd">';
+        		data+='<td class="textc">';
+				data+='		 <div class="checker checkeBox">';        		data+='		 <span class=""  data-id="'+banner.id+'"><input type="checkbox"  value=""></span>';
+        		data+='		</div>';
+        		data+='</td>';
+        		data+='<td class="textc">'+(xuhao-cishu)+'</td>';
+        		data+='<td class="textc"> <img height="60" wight="120" src="'+banner.picUrl+'" onerror="this.src=/resources/images/upload.png"/></td>';
+        		data+='<td class="textc">'+banner.seq+'</td>';
+        		data+='<td class="textc">'+banner.jumpUrl+'</td>';
+        		data+='<td class="textc">'+type+'</td>';
+        		data+='<td class="textc">';
+        		data+='<div class="positionr listOperaters">';
+        		data+='		<a href="javascript:void(0);"  class="icon-large dlblock w16 h16"><img src="'+resourcePath+'/images/angle-down.png"/></a>';
+        		data+='		<div class="ops_box ops_itemDiv positiona clearfix whitebg">';
+        		data+='			<ul>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showBannerDetails('+banner.id+')" class="btn btn-primary fa fa-edit ops_more f12">编辑</a></li>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="initDeleteBanner('+banner.id+')" class="btn btn-primary fa fa-remove ops_more f12">删除</a></li>';
+        	/*	data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showBannerDetails('+banner.id+')" class="btn btn-primary fa fa-detail ops_more f12">明细</a></li>';*/
+        	    data+='			</ul>';
+              data+='		</div>';
+        	    data+='</div>';
+        	    data+='</td>';
+        	    data+='</tr>';
+        	    $('#data_content').append(data);
+        	    cishu++;
+        	});
+        	//分页
+        	$('#pageCount').html(result.pageCount);
+      	$('#currPage').html(result.currPage);
+          $('#totalCount').html(result.count);
+           	//设置分页
+           	pageIndex=result.currPage;
+			$('#pagination').pagination({
+				pageCount: result.pageCount,
+				jump: true,
+				coping: true,
+				jump: true,
+				homePage: '首页',
+				endPage: '末页',
+				prevContent: '上页',
+				nextContent: '下页',
+				current:result.currPage,
+				callback:function(api){
+					pageIndex=api.getCurrent();
+					queryBanner(api.getCurrent());
+				}
+			});
+        } 
+    });  
+	//表头列不选中
+	$("#allCheck").find("span").removeClass('checked');
+}
+
+//初始化新增
+function initAddBanner(){
+	window.location=ctx+'/banner/queryBannerDetails?pageIndex='+pageIndex;
+}
+
+//初始化修改
+function showBannerDetails(id){
+	window.location=ctx+'/banner/queryBannerDetails?id='+id+'&pageIndex='+pageIndex;
+}
+
+//初始化删除
+function initDeleteBanner(id){
+	
+		layer.open({
+		type: 1,
+		closeBtn: 1,		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r'	, //按钮居中
+		shade: 0.3 ,//不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteBanner(id,true);
+		}
+	});
+}
+
+//删除
+function deleteBanner(id,showMsg){
+	$.ajax({
+		url:ctx+'/banner/deleteBanner',
+		data:[{
+			name:'id',
+			value:id
+		}],
+		type:'POST',
+		dataType:'json',
+		success:function(){
+			queryBanner(pageIndex);
+			if(showMsg){
+				layer.msg('删除成功!');	
+			}
+		}
+	});
+}
+//头部编辑
+function initEditBanner(){
+	var count=0;
+	var id=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+        	 id=$(this).data('id');
+         }
+    })
+    if(count>1){
+    	layer.msg('只能选中一行记录进行操作!');
+    	return ;
+    }
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	 if(id>0){
+	  showBannerDetails(id);
+	 }
+}
+//头部删除
+function initBatchDeleteBanner(){
+	var count=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+         }
+    })
+	
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	
+
+	layer.open({
+		type: 1,
+		closeBtn: 1,
+		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r', //按钮居中
+		shade: 0.3, //不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteBatchBanner();
+		}
+	});
+	
+}
+//批量删除
+function deleteBatchBanner(){
+	
+	$(".checkeBox").find("span").each(function () {
+        if($(this).hasClass("checked")){
+        	var id=$(this).data('id');
+        	deleteBanner(id,false);
+        	layer.msg('删除成功!');	
+        }
+   })
+}
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/bestNewActivity/bestNewActivityDetails.js b/pluss-manage-page/src/main/resources/static/resources/js/bestNewActivity/bestNewActivityDetails.js
new file mode 100644
index 0000000..e45f49a
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/bestNewActivity/bestNewActivityDetails.js
@@ -0,0 +1,119 @@
+/**
+ * create by robot 
+ * date Mon Sep 30 15:41:14 CST 2019 
+ */ 
+
+$(document).ready(function(){
+	//form表单样式
+	layui.use(['layer', 'form'], function() {
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+	//li 切换事件
+	$(".nav-tabs>li").click(function() {
+		var index = $(".nav-tabs>li").index(this);
+		$(this).addClass("active").siblings("li").removeClass("active");
+		
+	})
+	//弹出一个提示层
+	$('.fa-save').on('click', function() {
+		saveBestNewActivity();
+	});
+
+	//绑定标签栏事件
+	$(document).on('click','.nav-tabs li',function(){
+
+		var action =$(this).data('action');
+		 switch (action) {
+			case "base"://基本资料
+				goBase();
+				break;  
+			case "functions"://多功能
+				goFunctions();
+				break;
+			case "extends"://扩展    
+				goExtends();         
+				break;           
+		 }
+	})
+
+	//加载第一个标签
+	$('.nav-tabs li').eq(0).click();
+	
+});
+
+
+//跳转基本信息 
+function goBase(){
+	var url=ctx+'/bestNewActivity/queryBestNewActivityBaseInfo?id='+$('#bestNewActivityId').val();
+	$('.tab-content').load(url);
+	              
+}
+//跳转多功能输入
+function goFunctions(){ 
+	var url=ctx+'/bestNewActivity/queryBestNewActivityFunctionsInfo?id='+$('#bestNewActivityId').val();
+	$('.tab-content').load(url);  
+	
+}
+//跳转到扩展   
+function goExtends(){
+	
+	var url=ctx+'/bestNewActivity/queryBestNewActivityExtendsInfo?id='+$('#bestNewActivityId').val();
+	$('.tab-content').load(url);          
+}  
+  
+
+ 
+//保存
+function saveBestNewActivity(){
+	
+	var title=$("#title").val();
+	if(StringUtil.isBlank(title)){
+		layer.msg('请输入标题');
+		return;
+	}
+	var content=UM.getEditor('content').getContent().trim();
+	if(StringUtil.isBlank(content)){
+		layer.msg('请输入内容');
+		return;
+	}
+	var status=$("#status option:selected").val();
+	if(StringUtil.isBlank(status)){
+		layer.msg('请选择显示状态');
+		return;
+	}
+
+	
+	$(".fa-save").attr("disabled","disabled");
+	$('.fa-save').html('正在保存...')
+	$.ajax({
+		url:ctx+"/bestNewActivity/saveBestNewActivity",
+		type:"POST",
+		dataType:'json',
+		data:{
+			"title":title,
+			"content":content,
+			"id":$("#id").val(),
+			"seq":$("#seq").val(),
+			"status":status,
+		},
+		complete:function(){
+			$(".fa-save").removeAttr("disabled");
+			$('.fa-save').html('保存')
+		},        
+		success:function(service){ 
+		
+			layer.confirm('保存成功,是否前往列表？', {
+				  btn: ['确认','取消'] //按钮
+				}, function(){
+					$('#goback span').trigger('click'); 
+				}, function(){         
+					layer.closeAll();
+			});  
+			
+		}
+	});  
+}
+ 
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/bootstrap.min.js b/pluss-manage-page/src/main/resources/static/resources/js/bootstrap.min.js
new file mode 100644
index 0000000..f936727
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/bootstrap.min.js
@@ -0,0 +1,221 @@
+/*!
+ * Bootstrap v3.3.7 (http://getbootstrap.com)
+ * Copyright 2011-2016 Twitter, Inc.
+ * Licensed under the MIT license
+ */
+if("undefined"==typeof jQuery)throw Error("Bootstrap's JavaScript requires jQuery");+function(t){"use strict"
+var e=t.fn.jquery.split(" ")[0].split(".")
+if(e[0]<2&&e[1]<9||1==e[0]&&9==e[1]&&e[2]<1||e[0]>3)throw Error("Bootstrap's JavaScript requires jQuery version 1.9.1 or higher, but lower than version 4")}(jQuery),+function(t){"use strict"
+function e(){var t=document.createElement("bootstrap"),e={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"}
+for(var i in e)if(void 0!==t.style[i])return{end:e[i]}
+return!1}t.fn.emulateTransitionEnd=function(e){var i=!1,o=this
+t(this).one("bsTransitionEnd",function(){i=!0})
+var n=function(){i||t(o).trigger(t.support.transition.end)}
+return setTimeout(n,e),this},t(function(){t.support.transition=e(),t.support.transition&&(t.event.special.bsTransitionEnd={bindType:t.support.transition.end,delegateType:t.support.transition.end,handle:function(e){return t(e.target).is(this)?e.handleObj.handler.apply(this,arguments):void 0}})})}(jQuery),+function(t){"use strict"
+function e(e){return this.each(function(){var i=t(this),n=i.data("bs.alert")
+n||i.data("bs.alert",n=new o(this)),"string"==typeof e&&n[e].call(i)})}var i='[data-dismiss="alert"]',o=function(e){t(e).on("click",i,this.close)}
+o.VERSION="3.3.7",o.TRANSITION_DURATION=150,o.prototype.close=function(e){function i(){a.detach().trigger("closed.bs.alert").remove()}var n=t(this),s=n.attr("data-target")
+s||(s=n.attr("href"),s=s&&s.replace(/.*(?=#[^\s]*$)/,""))
+var a=t("#"===s?[]:s)
+e&&e.preventDefault(),a.length||(a=n.closest(".alert")),a.trigger(e=t.Event("close.bs.alert")),e.isDefaultPrevented()||(a.removeClass("in"),t.support.transition&&a.hasClass("fade")?a.one("bsTransitionEnd",i).emulateTransitionEnd(o.TRANSITION_DURATION):i())}
+var n=t.fn.alert
+t.fn.alert=e,t.fn.alert.Constructor=o,t.fn.alert.noConflict=function(){return t.fn.alert=n,this},t(document).on("click.bs.alert.data-api",i,o.prototype.close)}(jQuery),+function(t){"use strict"
+function e(e){return this.each(function(){var o=t(this),n=o.data("bs.button"),s="object"==typeof e&&e
+n||o.data("bs.button",n=new i(this,s)),"toggle"==e?n.toggle():e&&n.setState(e)})}var i=function(e,o){this.$element=t(e),this.options=t.extend({},i.DEFAULTS,o),this.isLoading=!1}
+i.VERSION="3.3.7",i.DEFAULTS={loadingText:null},i.prototype.setState=function(e){var i="disabled",o=this.$element,n=o.is("input")?"val":"html",s=o.data()
+e+="Text",null==s.resetText&&o.data("resetText",o[n]()),setTimeout(t.proxy(function(){this.options[e]&&o[n](null==s[e]?this.options[e]:s[e]),"loadingText"==e?(this.isLoading=!0,o.addClass(i).attr(i,i).prop(i,!0)):this.isLoading&&(this.isLoading=!1,o.removeClass(i).removeAttr(i).prop(i,!1))},this),0)},i.prototype.toggle=function(){var t=!0,e=this.$element.closest('[data-toggle="buttons"]')
+if(e.length){var i=this.$element.find("input")
+"radio"==i.prop("type")?(i.prop("checked")&&(t=!1),e.find(".active").removeClass("active"),this.$element.addClass("active")):"checkbox"==i.prop("type")&&(i.prop("checked")!==this.$element.hasClass("active")&&(t=!1),this.$element.toggleClass("active")),i.prop("checked",this.$element.hasClass("active")),t&&i.trigger("change")}else this.$element.attr("aria-pressed",!this.$element.hasClass("active")),this.$element.toggleClass("active")}
+var o=t.fn.button
+t.fn.button=e,t.fn.button.Constructor=i,t.fn.button.noConflict=function(){return t.fn.button=o,this},t(document).on("click.bs.button.data-api",'[data-toggle^="button"]',function(i){var o=t(i.target).closest(".btn")
+e.call(o,"toggle"),t(i.target).is('input[type="radio"], input[type="checkbox"]')||(i.preventDefault(),o.is("input,button")?o.trigger("focus"):o.find("input:visible,button:visible").first().trigger("focus"))}).on("focus.bs.button.data-api blur.bs.button.data-api",'[data-toggle^="button"]',function(e){t(e.target).closest(".btn").toggleClass("focus",/^focus(in)?$/.test(e.type))})}(jQuery),+function(t){"use strict"
+function e(e){return this.each(function(){var o=t(this),n=o.data("bs.carousel"),s=t.extend({},i.DEFAULTS,o.data(),"object"==typeof e&&e),a="string"==typeof e?e:s.slide
+n||o.data("bs.carousel",n=new i(this,s)),"number"==typeof e?n.to(e):a?n[a]():s.interval&&n.pause().cycle()})}var i=function(e,i){this.$element=t(e),this.$indicators=this.$element.find(".carousel-indicators"),this.options=i,this.paused=null,this.sliding=null,this.interval=null,this.$active=null,this.$items=null,this.options.keyboard&&this.$element.on("keydown.bs.carousel",t.proxy(this.keydown,this)),"hover"==this.options.pause&&!("ontouchstart"in document.documentElement)&&this.$element.on("mouseenter.bs.carousel",t.proxy(this.pause,this)).on("mouseleave.bs.carousel",t.proxy(this.cycle,this))}
+i.VERSION="3.3.7",i.TRANSITION_DURATION=600,i.DEFAULTS={interval:5e3,pause:"hover",wrap:!0,keyboard:!0},i.prototype.keydown=function(t){if(!/input|textarea/i.test(t.target.tagName)){switch(t.which){case 37:this.prev()
+break
+case 39:this.next()
+break
+default:return}t.preventDefault()}},i.prototype.cycle=function(e){return e||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(t.proxy(this.next,this),this.options.interval)),this},i.prototype.getItemIndex=function(t){return this.$items=t.parent().children(".item"),this.$items.index(t||this.$active)},i.prototype.getItemForDirection=function(t,e){var i=this.getItemIndex(e),o="prev"==t&&0===i||"next"==t&&i==this.$items.length-1
+if(o&&!this.options.wrap)return e
+var n="prev"==t?-1:1,s=(i+n)%this.$items.length
+return this.$items.eq(s)},i.prototype.to=function(t){var e=this,i=this.getItemIndex(this.$active=this.$element.find(".item.active"))
+return t>this.$items.length-1||0>t?void 0:this.sliding?this.$element.one("slid.bs.carousel",function(){e.to(t)}):i==t?this.pause().cycle():this.slide(t>i?"next":"prev",this.$items.eq(t))},i.prototype.pause=function(e){return e||(this.paused=!0),this.$element.find(".next, .prev").length&&t.support.transition&&(this.$element.trigger(t.support.transition.end),this.cycle(!0)),this.interval=clearInterval(this.interval),this},i.prototype.next=function(){return this.sliding?void 0:this.slide("next")},i.prototype.prev=function(){return this.sliding?void 0:this.slide("prev")},i.prototype.slide=function(e,o){var n=this.$element.find(".item.active"),s=o||this.getItemForDirection(e,n),a=this.interval,r="next"==e?"left":"right",l=this
+if(s.hasClass("active"))return this.sliding=!1
+var h=s[0],d=t.Event("slide.bs.carousel",{relatedTarget:h,direction:r})
+if(this.$element.trigger(d),!d.isDefaultPrevented()){if(this.sliding=!0,a&&this.pause(),this.$indicators.length){this.$indicators.find(".active").removeClass("active")
+var p=t(this.$indicators.children()[this.getItemIndex(s)])
+p&&p.addClass("active")}var c=t.Event("slid.bs.carousel",{relatedTarget:h,direction:r})
+return t.support.transition&&this.$element.hasClass("slide")?(s.addClass(e),s[0].offsetWidth,n.addClass(r),s.addClass(r),n.one("bsTransitionEnd",function(){s.removeClass([e,r].join(" ")).addClass("active"),n.removeClass(["active",r].join(" ")),l.sliding=!1,setTimeout(function(){l.$element.trigger(c)},0)}).emulateTransitionEnd(i.TRANSITION_DURATION)):(n.removeClass("active"),s.addClass("active"),this.sliding=!1,this.$element.trigger(c)),a&&this.cycle(),this}}
+var o=t.fn.carousel
+t.fn.carousel=e,t.fn.carousel.Constructor=i,t.fn.carousel.noConflict=function(){return t.fn.carousel=o,this}
+var n=function(i){var o,n=t(this),s=t(n.attr("data-target")||(o=n.attr("href"))&&o.replace(/.*(?=#[^\s]+$)/,""))
+if(s.hasClass("carousel")){var a=t.extend({},s.data(),n.data()),r=n.attr("data-slide-to")
+r&&(a.interval=!1),e.call(s,a),r&&s.data("bs.carousel").to(r),i.preventDefault()}}
+t(document).on("click.bs.carousel.data-api","[data-slide]",n).on("click.bs.carousel.data-api","[data-slide-to]",n),t(window).on("load",function(){t('[data-ride="carousel"]').each(function(){var i=t(this)
+e.call(i,i.data())})})}(jQuery),+function(t){"use strict"
+function e(e){var i,o=e.attr("data-target")||(i=e.attr("href"))&&i.replace(/.*(?=#[^\s]+$)/,"")
+return t(o)}function i(e){return this.each(function(){var i=t(this),n=i.data("bs.collapse"),s=t.extend({},o.DEFAULTS,i.data(),"object"==typeof e&&e)
+!n&&s.toggle&&/show|hide/.test(e)&&(s.toggle=!1),n||i.data("bs.collapse",n=new o(this,s)),"string"==typeof e&&n[e]()})}var o=function(e,i){this.$element=t(e),this.options=t.extend({},o.DEFAULTS,i),this.$trigger=t('[data-toggle="collapse"][href="#'+e.id+'"],[data-toggle="collapse"][data-target="#'+e.id+'"]'),this.transitioning=null,this.options.parent?this.$parent=this.getParent():this.addAriaAndCollapsedClass(this.$element,this.$trigger),this.options.toggle&&this.toggle()}
+o.VERSION="3.3.7",o.TRANSITION_DURATION=350,o.DEFAULTS={toggle:!0},o.prototype.dimension=function(){var t=this.$element.hasClass("width")
+return t?"width":"height"},o.prototype.show=function(){if(!this.transitioning&&!this.$element.hasClass("in")){var e,n=this.$parent&&this.$parent.children(".panel").children(".in, .collapsing")
+if(!(n&&n.length&&(e=n.data("bs.collapse"),e&&e.transitioning))){var s=t.Event("show.bs.collapse")
+if(this.$element.trigger(s),!s.isDefaultPrevented()){n&&n.length&&(i.call(n,"hide"),e||n.data("bs.collapse",null))
+var a=this.dimension()
+this.$element.removeClass("collapse").addClass("collapsing")[a](0).attr("aria-expanded",!0),this.$trigger.removeClass("collapsed").attr("aria-expanded",!0),this.transitioning=1
+var r=function(){this.$element.removeClass("collapsing").addClass("collapse in")[a](""),this.transitioning=0,this.$element.trigger("shown.bs.collapse")}
+if(!t.support.transition)return r.call(this)
+var l=t.camelCase(["scroll",a].join("-"))
+this.$element.one("bsTransitionEnd",t.proxy(r,this)).emulateTransitionEnd(o.TRANSITION_DURATION)[a](this.$element[0][l])}}}},o.prototype.hide=function(){if(!this.transitioning&&this.$element.hasClass("in")){var e=t.Event("hide.bs.collapse")
+if(this.$element.trigger(e),!e.isDefaultPrevented()){var i=this.dimension()
+this.$element[i](this.$element[i]())[0].offsetHeight,this.$element.addClass("collapsing").removeClass("collapse in").attr("aria-expanded",!1),this.$trigger.addClass("collapsed").attr("aria-expanded",!1),this.transitioning=1
+var n=function(){this.transitioning=0,this.$element.removeClass("collapsing").addClass("collapse").trigger("hidden.bs.collapse")}
+return t.support.transition?void this.$element[i](0).one("bsTransitionEnd",t.proxy(n,this)).emulateTransitionEnd(o.TRANSITION_DURATION):n.call(this)}}},o.prototype.toggle=function(){this[this.$element.hasClass("in")?"hide":"show"]()},o.prototype.getParent=function(){return t(this.options.parent).find('[data-toggle="collapse"][data-parent="'+this.options.parent+'"]').each(t.proxy(function(i,o){var n=t(o)
+this.addAriaAndCollapsedClass(e(n),n)},this)).end()},o.prototype.addAriaAndCollapsedClass=function(t,e){var i=t.hasClass("in")
+t.attr("aria-expanded",i),e.toggleClass("collapsed",!i).attr("aria-expanded",i)}
+var n=t.fn.collapse
+t.fn.collapse=i,t.fn.collapse.Constructor=o,t.fn.collapse.noConflict=function(){return t.fn.collapse=n,this},t(document).on("click.bs.collapse.data-api",'[data-toggle="collapse"]',function(o){var n=t(this)
+n.attr("data-target")||o.preventDefault()
+var s=e(n),a=s.data("bs.collapse"),r=a?"toggle":n.data()
+i.call(s,r)})}(jQuery),+function(t){"use strict"
+function e(e){var i=e.attr("data-target")
+i||(i=e.attr("href"),i=i&&/#[A-Za-z]/.test(i)&&i.replace(/.*(?=#[^\s]*$)/,""))
+var o=i&&t(i)
+return o&&o.length?o:e.parent()}function i(i){i&&3===i.which||(t(n).remove(),t(s).each(function(){var o=t(this),n=e(o),s={relatedTarget:this}
+n.hasClass("open")&&(i&&"click"==i.type&&/input|textarea/i.test(i.target.tagName)&&t.contains(n[0],i.target)||(n.trigger(i=t.Event("hide.bs.dropdown",s)),i.isDefaultPrevented()||(o.attr("aria-expanded","false"),n.removeClass("open").trigger(t.Event("hidden.bs.dropdown",s)))))}))}function o(e){return this.each(function(){var i=t(this),o=i.data("bs.dropdown")
+o||i.data("bs.dropdown",o=new a(this)),"string"==typeof e&&o[e].call(i)})}var n=".dropdown-backdrop",s='[data-toggle="dropdown"]',a=function(e){t(e).on("click.bs.dropdown",this.toggle)}
+a.VERSION="3.3.7",a.prototype.toggle=function(o){var n=t(this)
+if(!n.is(".disabled, :disabled")){var s=e(n),a=s.hasClass("open")
+if(i(),!a){"ontouchstart"in document.documentElement&&!s.closest(".navbar-nav").length&&t(document.createElement("div")).addClass("dropdown-backdrop").insertAfter(t(this)).on("click",i)
+var r={relatedTarget:this}
+if(s.trigger(o=t.Event("show.bs.dropdown",r)),o.isDefaultPrevented())return
+n.trigger("focus").attr("aria-expanded","true"),s.toggleClass("open").trigger(t.Event("shown.bs.dropdown",r))}return!1}},a.prototype.keydown=function(i){if(/(38|40|27|32)/.test(i.which)&&!/input|textarea/i.test(i.target.tagName)){var o=t(this)
+if(i.preventDefault(),i.stopPropagation(),!o.is(".disabled, :disabled")){var n=e(o),a=n.hasClass("open")
+if(!a&&27!=i.which||a&&27==i.which)return 27==i.which&&n.find(s).trigger("focus"),o.trigger("click")
+var r=" li:not(.disabled):visible a",l=n.find(".dropdown-menu"+r)
+if(l.length){var h=l.index(i.target)
+38==i.which&&h>0&&h--,40==i.which&&h<l.length-1&&h++,~h||(h=0),l.eq(h).trigger("focus")}}}}
+var r=t.fn.dropdown
+t.fn.dropdown=o,t.fn.dropdown.Constructor=a,t.fn.dropdown.noConflict=function(){return t.fn.dropdown=r,this},t(document).on("click.bs.dropdown.data-api",i).on("click.bs.dropdown.data-api",".dropdown form",function(t){t.stopPropagation()}).on("click.bs.dropdown.data-api",s,a.prototype.toggle).on("keydown.bs.dropdown.data-api",s,a.prototype.keydown).on("keydown.bs.dropdown.data-api",".dropdown-menu",a.prototype.keydown)}(jQuery),+function(t){"use strict"
+function e(e,o){return this.each(function(){var n=t(this),s=n.data("bs.modal"),a=t.extend({},i.DEFAULTS,n.data(),"object"==typeof e&&e)
+s||n.data("bs.modal",s=new i(this,a)),"string"==typeof e?s[e](o):a.show&&s.show(o)})}var i=function(e,i){this.options=i,this.$body=t(document.body),this.$element=t(e),this.$dialog=this.$element.find(".modal-dialog"),this.$backdrop=null,this.isShown=null,this.originalBodyPad=null,this.scrollbarWidth=0,this.ignoreBackdropClick=!1,this.options.remote&&this.$element.find(".modal-content").load(this.options.remote,t.proxy(function(){this.$element.trigger("loaded.bs.modal")},this))}
+i.VERSION="3.3.7",i.TRANSITION_DURATION=300,i.BACKDROP_TRANSITION_DURATION=150,i.DEFAULTS={backdrop:!0,keyboard:!0,show:!0},i.prototype.toggle=function(t){return this.isShown?this.hide():this.show(t)},i.prototype.show=function(e){var o=this,n=t.Event("show.bs.modal",{relatedTarget:e})
+this.$element.trigger(n),this.isShown||n.isDefaultPrevented()||(this.isShown=!0,this.checkScrollbar(),this.setScrollbar(),this.$body.addClass("modal-open"),this.escape(),this.resize(),this.$element.on("click.dismiss.bs.modal",'[data-dismiss="modal"]',t.proxy(this.hide,this)),this.$dialog.on("mousedown.dismiss.bs.modal",function(){o.$element.one("mouseup.dismiss.bs.modal",function(e){t(e.target).is(o.$element)&&(o.ignoreBackdropClick=!0)})}),this.backdrop(function(){var n=t.support.transition&&o.$element.hasClass("fade")
+o.$element.parent().length||o.$element.appendTo(o.$body),o.$element.show().scrollTop(0),o.adjustDialog(),n&&o.$element[0].offsetWidth,o.$element.addClass("in"),o.enforceFocus()
+var s=t.Event("shown.bs.modal",{relatedTarget:e})
+n?o.$dialog.one("bsTransitionEnd",function(){o.$element.trigger("focus").trigger(s)}).emulateTransitionEnd(i.TRANSITION_DURATION):o.$element.trigger("focus").trigger(s)}))},i.prototype.hide=function(e){e&&e.preventDefault(),e=t.Event("hide.bs.modal"),this.$element.trigger(e),this.isShown&&!e.isDefaultPrevented()&&(this.isShown=!1,this.escape(),this.resize(),t(document).off("focusin.bs.modal"),this.$element.removeClass("in").off("click.dismiss.bs.modal").off("mouseup.dismiss.bs.modal"),this.$dialog.off("mousedown.dismiss.bs.modal"),t.support.transition&&this.$element.hasClass("fade")?this.$element.one("bsTransitionEnd",t.proxy(this.hideModal,this)).emulateTransitionEnd(i.TRANSITION_DURATION):this.hideModal())},i.prototype.enforceFocus=function(){t(document).off("focusin.bs.modal").on("focusin.bs.modal",t.proxy(function(t){document===t.target||this.$element[0]===t.target||this.$element.has(t.target).length||this.$element.trigger("focus")},this))},i.prototype.escape=function(){this.isShown&&this.options.keyboard?this.$element.on("keydown.dismiss.bs.modal",t.proxy(function(t){27==t.which&&this.hide()},this)):this.isShown||this.$element.off("keydown.dismiss.bs.modal")},i.prototype.resize=function(){this.isShown?t(window).on("resize.bs.modal",t.proxy(this.handleUpdate,this)):t(window).off("resize.bs.modal")},i.prototype.hideModal=function(){var t=this
+this.$element.hide(),this.backdrop(function(){t.$body.removeClass("modal-open"),t.resetAdjustments(),t.resetScrollbar(),t.$element.trigger("hidden.bs.modal")})},i.prototype.removeBackdrop=function(){this.$backdrop&&this.$backdrop.remove(),this.$backdrop=null},i.prototype.backdrop=function(e){var o=this,n=this.$element.hasClass("fade")?"fade":""
+if(this.isShown&&this.options.backdrop){var s=t.support.transition&&n
+if(this.$backdrop=t(document.createElement("div")).addClass("modal-backdrop "+n).appendTo(this.$body),this.$element.on("click.dismiss.bs.modal",t.proxy(function(t){return this.ignoreBackdropClick?void(this.ignoreBackdropClick=!1):void(t.target===t.currentTarget&&("static"==this.options.backdrop?this.$element[0].focus():this.hide()))},this)),s&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),!e)return
+s?this.$backdrop.one("bsTransitionEnd",e).emulateTransitionEnd(i.BACKDROP_TRANSITION_DURATION):e()}else if(!this.isShown&&this.$backdrop){this.$backdrop.removeClass("in")
+var a=function(){o.removeBackdrop(),e&&e()}
+t.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one("bsTransitionEnd",a).emulateTransitionEnd(i.BACKDROP_TRANSITION_DURATION):a()}else e&&e()},i.prototype.handleUpdate=function(){this.adjustDialog()},i.prototype.adjustDialog=function(){var t=this.$element[0].scrollHeight>document.documentElement.clientHeight
+this.$element.css({paddingLeft:!this.bodyIsOverflowing&&t?this.scrollbarWidth:"",paddingRight:this.bodyIsOverflowing&&!t?this.scrollbarWidth:""})},i.prototype.resetAdjustments=function(){this.$element.css({paddingLeft:"",paddingRight:""})},i.prototype.checkScrollbar=function(){var t=window.innerWidth
+if(!t){var e=document.documentElement.getBoundingClientRect()
+t=e.right-Math.abs(e.left)}this.bodyIsOverflowing=document.body.clientWidth<t,this.scrollbarWidth=this.measureScrollbar()},i.prototype.setScrollbar=function(){var t=parseInt(this.$body.css("padding-right")||0,10)
+this.originalBodyPad=document.body.style.paddingRight||"",this.bodyIsOverflowing&&this.$body.css("padding-right",t+this.scrollbarWidth)},i.prototype.resetScrollbar=function(){this.$body.css("padding-right",this.originalBodyPad)},i.prototype.measureScrollbar=function(){var t=document.createElement("div")
+t.className="modal-scrollbar-measure",this.$body.append(t)
+var e=t.offsetWidth-t.clientWidth
+return this.$body[0].removeChild(t),e}
+var o=t.fn.modal
+t.fn.modal=e,t.fn.modal.Constructor=i,t.fn.modal.noConflict=function(){return t.fn.modal=o,this},t(document).on("click.bs.modal.data-api",'[data-toggle="modal"]',function(i){var o=t(this),n=o.attr("href"),s=t(o.attr("data-target")||n&&n.replace(/.*(?=#[^\s]+$)/,"")),a=s.data("bs.modal")?"toggle":t.extend({remote:!/#/.test(n)&&n},s.data(),o.data())
+o.is("a")&&i.preventDefault(),s.one("show.bs.modal",function(t){t.isDefaultPrevented()||s.one("hidden.bs.modal",function(){o.is(":visible")&&o.trigger("focus")})}),e.call(s,a,this)})}(jQuery),+function(t){"use strict"
+function e(e){return this.each(function(){var o=t(this),n=o.data("bs.tooltip"),s="object"==typeof e&&e;(n||!/destroy|hide/.test(e))&&(n||o.data("bs.tooltip",n=new i(this,s)),"string"==typeof e&&n[e]())})}var i=function(t,e){this.type=null,this.options=null,this.enabled=null,this.timeout=null,this.hoverState=null,this.$element=null,this.inState=null,this.init("tooltip",t,e)}
+i.VERSION="3.3.7",i.TRANSITION_DURATION=150,i.DEFAULTS={animation:!0,placement:"top",selector:!1,template:'<div class="tooltip" role="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',trigger:"hover focus",title:"",delay:0,html:!1,container:!1,viewport:{selector:"body",padding:0}},i.prototype.init=function(e,i,o){if(this.enabled=!0,this.type=e,this.$element=t(i),this.options=this.getOptions(o),this.$viewport=this.options.viewport&&t(t.isFunction(this.options.viewport)?this.options.viewport.call(this,this.$element):this.options.viewport.selector||this.options.viewport),this.inState={click:!1,hover:!1,focus:!1},this.$element[0]instanceof document.constructor&&!this.options.selector)throw Error("`selector` option must be specified when initializing "+this.type+" on the window.document object!")
+for(var n=this.options.trigger.split(" "),s=n.length;s--;){var a=n[s]
+if("click"==a)this.$element.on("click."+this.type,this.options.selector,t.proxy(this.toggle,this))
+else if("manual"!=a){var r="hover"==a?"mouseenter":"focusin",l="hover"==a?"mouseleave":"focusout"
+this.$element.on(r+"."+this.type,this.options.selector,t.proxy(this.enter,this)),this.$element.on(l+"."+this.type,this.options.selector,t.proxy(this.leave,this))}}this.options.selector?this._options=t.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},i.prototype.getDefaults=function(){return i.DEFAULTS},i.prototype.getOptions=function(e){return e=t.extend({},this.getDefaults(),this.$element.data(),e),e.delay&&"number"==typeof e.delay&&(e.delay={show:e.delay,hide:e.delay}),e},i.prototype.getDelegateOptions=function(){var e={},i=this.getDefaults()
+return this._options&&t.each(this._options,function(t,o){i[t]!=o&&(e[t]=o)}),e},i.prototype.enter=function(e){var i=e instanceof this.constructor?e:t(e.currentTarget).data("bs."+this.type)
+return i||(i=new this.constructor(e.currentTarget,this.getDelegateOptions()),t(e.currentTarget).data("bs."+this.type,i)),e instanceof t.Event&&(i.inState["focusin"==e.type?"focus":"hover"]=!0),i.tip().hasClass("in")||"in"==i.hoverState?void(i.hoverState="in"):(clearTimeout(i.timeout),i.hoverState="in",i.options.delay&&i.options.delay.show?void(i.timeout=setTimeout(function(){"in"==i.hoverState&&i.show()},i.options.delay.show)):i.show())},i.prototype.isInStateTrue=function(){for(var t in this.inState)if(this.inState[t])return!0
+return!1},i.prototype.leave=function(e){var i=e instanceof this.constructor?e:t(e.currentTarget).data("bs."+this.type)
+return i||(i=new this.constructor(e.currentTarget,this.getDelegateOptions()),t(e.currentTarget).data("bs."+this.type,i)),e instanceof t.Event&&(i.inState["focusout"==e.type?"focus":"hover"]=!1),i.isInStateTrue()?void 0:(clearTimeout(i.timeout),i.hoverState="out",i.options.delay&&i.options.delay.hide?void(i.timeout=setTimeout(function(){"out"==i.hoverState&&i.hide()},i.options.delay.hide)):i.hide())},i.prototype.show=function(){var e=t.Event("show.bs."+this.type)
+if(this.hasContent()&&this.enabled){this.$element.trigger(e)
+var o=t.contains(this.$element[0].ownerDocument.documentElement,this.$element[0])
+if(e.isDefaultPrevented()||!o)return
+var n=this,s=this.tip(),a=this.getUID(this.type)
+this.setContent(),s.attr("id",a),this.$element.attr("aria-describedby",a),this.options.animation&&s.addClass("fade")
+var r="function"==typeof this.options.placement?this.options.placement.call(this,s[0],this.$element[0]):this.options.placement,l=/\s?auto?\s?/i,h=l.test(r)
+h&&(r=r.replace(l,"")||"top"),s.detach().css({top:0,left:0,display:"block"}).addClass(r).data("bs."+this.type,this),this.options.container?s.appendTo(this.options.container):s.insertAfter(this.$element),this.$element.trigger("inserted.bs."+this.type)
+var d=this.getPosition(),p=s[0].offsetWidth,c=s[0].offsetHeight
+if(h){var f=r,u=this.getPosition(this.$viewport)
+r="bottom"==r&&d.bottom+c>u.bottom?"top":"top"==r&&d.top-c<u.top?"bottom":"right"==r&&d.right+p>u.width?"left":"left"==r&&d.left-p<u.left?"right":r,s.removeClass(f).addClass(r)}var g=this.getCalculatedOffset(r,d,p,c)
+this.applyPlacement(g,r)
+var m=function(){var t=n.hoverState
+n.$element.trigger("shown.bs."+n.type),n.hoverState=null,"out"==t&&n.leave(n)}
+t.support.transition&&this.$tip.hasClass("fade")?s.one("bsTransitionEnd",m).emulateTransitionEnd(i.TRANSITION_DURATION):m()}},i.prototype.applyPlacement=function(e,i){var o=this.tip(),n=o[0].offsetWidth,s=o[0].offsetHeight,a=parseInt(o.css("margin-top"),10),r=parseInt(o.css("margin-left"),10)
+isNaN(a)&&(a=0),isNaN(r)&&(r=0),e.top+=a,e.left+=r,t.offset.setOffset(o[0],t.extend({using:function(t){o.css({top:Math.round(t.top),left:Math.round(t.left)})}},e),0),o.addClass("in")
+var l=o[0].offsetWidth,h=o[0].offsetHeight
+"top"==i&&h!=s&&(e.top=e.top+s-h)
+var d=this.getViewportAdjustedDelta(i,e,l,h)
+d.left?e.left+=d.left:e.top+=d.top
+var p=/top|bottom/.test(i),c=p?2*d.left-n+l:2*d.top-s+h,f=p?"offsetWidth":"offsetHeight"
+o.offset(e),this.replaceArrow(c,o[0][f],p)},i.prototype.replaceArrow=function(t,e,i){this.arrow().css(i?"left":"top",50*(1-t/e)+"%").css(i?"top":"left","")},i.prototype.setContent=function(){var t=this.tip(),e=this.getTitle()
+t.find(".tooltip-inner")[this.options.html?"html":"text"](e),t.removeClass("fade in top bottom left right")},i.prototype.hide=function(e){function o(){"in"!=n.hoverState&&s.detach(),n.$element&&n.$element.removeAttr("aria-describedby").trigger("hidden.bs."+n.type),e&&e()}var n=this,s=t(this.$tip),a=t.Event("hide.bs."+this.type)
+return this.$element.trigger(a),a.isDefaultPrevented()?void 0:(s.removeClass("in"),t.support.transition&&s.hasClass("fade")?s.one("bsTransitionEnd",o).emulateTransitionEnd(i.TRANSITION_DURATION):o(),this.hoverState=null,this)},i.prototype.fixTitle=function(){var t=this.$element;(t.attr("title")||"string"!=typeof t.attr("data-original-title"))&&t.attr("data-original-title",t.attr("title")||"").attr("title","")},i.prototype.hasContent=function(){return this.getTitle()},i.prototype.getPosition=function(e){e=e||this.$element
+var i=e[0],o="BODY"==i.tagName,n=i.getBoundingClientRect()
+null==n.width&&(n=t.extend({},n,{width:n.right-n.left,height:n.bottom-n.top}))
+var s=window.SVGElement&&i instanceof window.SVGElement,a=o?{top:0,left:0}:s?null:e.offset(),r={scroll:o?document.documentElement.scrollTop||document.body.scrollTop:e.scrollTop()},l=o?{width:t(window).width(),height:t(window).height()}:null
+return t.extend({},n,r,l,a)},i.prototype.getCalculatedOffset=function(t,e,i,o){return"bottom"==t?{top:e.top+e.height,left:e.left+e.width/2-i/2}:"top"==t?{top:e.top-o,left:e.left+e.width/2-i/2}:"left"==t?{top:e.top+e.height/2-o/2,left:e.left-i}:{top:e.top+e.height/2-o/2,left:e.left+e.width}},i.prototype.getViewportAdjustedDelta=function(t,e,i,o){var n={top:0,left:0}
+if(!this.$viewport)return n
+var s=this.options.viewport&&this.options.viewport.padding||0,a=this.getPosition(this.$viewport)
+if(/right|left/.test(t)){var r=e.top-s-a.scroll,l=e.top+s-a.scroll+o
+r<a.top?n.top=a.top-r:l>a.top+a.height&&(n.top=a.top+a.height-l)}else{var h=e.left-s,d=e.left+s+i
+h<a.left?n.left=a.left-h:d>a.right&&(n.left=a.left+a.width-d)}return n},i.prototype.getTitle=function(){var t,e=this.$element,i=this.options
+return t=e.attr("data-original-title")||("function"==typeof i.title?i.title.call(e[0]):i.title)},i.prototype.getUID=function(t){do t+=~~(1e6*Math.random())
+while(document.getElementById(t))
+return t},i.prototype.tip=function(){if(!this.$tip&&(this.$tip=t(this.options.template),1!=this.$tip.length))throw Error(this.type+" `template` option must consist of exactly 1 top-level element!")
+return this.$tip},i.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".tooltip-arrow")},i.prototype.enable=function(){this.enabled=!0},i.prototype.disable=function(){this.enabled=!1},i.prototype.toggleEnabled=function(){this.enabled=!this.enabled},i.prototype.toggle=function(e){var i=this
+e&&(i=t(e.currentTarget).data("bs."+this.type),i||(i=new this.constructor(e.currentTarget,this.getDelegateOptions()),t(e.currentTarget).data("bs."+this.type,i))),e?(i.inState.click=!i.inState.click,i.isInStateTrue()?i.enter(i):i.leave(i)):i.tip().hasClass("in")?i.leave(i):i.enter(i)},i.prototype.destroy=function(){var t=this
+clearTimeout(this.timeout),this.hide(function(){t.$element.off("."+t.type).removeData("bs."+t.type),t.$tip&&t.$tip.detach(),t.$tip=null,t.$arrow=null,t.$viewport=null,t.$element=null})}
+var o=t.fn.tooltip
+t.fn.tooltip=e,t.fn.tooltip.Constructor=i,t.fn.tooltip.noConflict=function(){return t.fn.tooltip=o,this}}(jQuery),+function(t){"use strict"
+function e(e){return this.each(function(){var o=t(this),n=o.data("bs.popover"),s="object"==typeof e&&e;(n||!/destroy|hide/.test(e))&&(n||o.data("bs.popover",n=new i(this,s)),"string"==typeof e&&n[e]())})}var i=function(t,e){this.init("popover",t,e)}
+if(!t.fn.tooltip)throw Error("Popover requires tooltip.js")
+i.VERSION="3.3.7",i.DEFAULTS=t.extend({},t.fn.tooltip.Constructor.DEFAULTS,{placement:"right",trigger:"click",content:"",template:'<div class="popover" role="tooltip"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'}),i.prototype=t.extend({},t.fn.tooltip.Constructor.prototype),i.prototype.constructor=i,i.prototype.getDefaults=function(){return i.DEFAULTS},i.prototype.setContent=function(){var t=this.tip(),e=this.getTitle(),i=this.getContent()
+t.find(".popover-title")[this.options.html?"html":"text"](e),t.find(".popover-content").children().detach().end()[this.options.html?"string"==typeof i?"html":"append":"text"](i),t.removeClass("fade top bottom left right in"),t.find(".popover-title").html()||t.find(".popover-title").hide()},i.prototype.hasContent=function(){return this.getTitle()||this.getContent()},i.prototype.getContent=function(){var t=this.$element,e=this.options
+return t.attr("data-content")||("function"==typeof e.content?e.content.call(t[0]):e.content)},i.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".arrow")}
+var o=t.fn.popover
+t.fn.popover=e,t.fn.popover.Constructor=i,t.fn.popover.noConflict=function(){return t.fn.popover=o,this}}(jQuery),+function(t){"use strict"
+function e(i,o){this.$body=t(document.body),this.$scrollElement=t(t(i).is(document.body)?window:i),this.options=t.extend({},e.DEFAULTS,o),this.selector=(this.options.target||"")+" .nav li > a",this.offsets=[],this.targets=[],this.activeTarget=null,this.scrollHeight=0,this.$scrollElement.on("scroll.bs.scrollspy",t.proxy(this.process,this)),this.refresh(),this.process()}function i(i){return this.each(function(){var o=t(this),n=o.data("bs.scrollspy"),s="object"==typeof i&&i
+n||o.data("bs.scrollspy",n=new e(this,s)),"string"==typeof i&&n[i]()})}e.VERSION="3.3.7",e.DEFAULTS={offset:10},e.prototype.getScrollHeight=function(){return this.$scrollElement[0].scrollHeight||Math.max(this.$body[0].scrollHeight,document.documentElement.scrollHeight)},e.prototype.refresh=function(){var e=this,i="offset",o=0
+this.offsets=[],this.targets=[],this.scrollHeight=this.getScrollHeight(),t.isWindow(this.$scrollElement[0])||(i="position",o=this.$scrollElement.scrollTop()),this.$body.find(this.selector).map(function(){var e=t(this),n=e.data("target")||e.attr("href"),s=/^#./.test(n)&&t(n)
+return s&&s.length&&s.is(":visible")&&[[s[i]().top+o,n]]||null}).sort(function(t,e){return t[0]-e[0]}).each(function(){e.offsets.push(this[0]),e.targets.push(this[1])})},e.prototype.process=function(){var t,e=this.$scrollElement.scrollTop()+this.options.offset,i=this.getScrollHeight(),o=this.options.offset+i-this.$scrollElement.height(),n=this.offsets,s=this.targets,a=this.activeTarget
+if(this.scrollHeight!=i&&this.refresh(),e>=o)return a!=(t=s[s.length-1])&&this.activate(t)
+if(a&&e<n[0])return this.activeTarget=null,this.clear()
+for(t=n.length;t--;)a!=s[t]&&e>=n[t]&&(void 0===n[t+1]||e<n[t+1])&&this.activate(s[t])},e.prototype.activate=function(e){this.activeTarget=e,this.clear()
+var i=this.selector+'[data-target="'+e+'"],'+this.selector+'[href="'+e+'"]',o=t(i).parents("li").addClass("active")
+o.parent(".dropdown-menu").length&&(o=o.closest("li.dropdown").addClass("active")),o.trigger("activate.bs.scrollspy")},e.prototype.clear=function(){t(this.selector).parentsUntil(this.options.target,".active").removeClass("active")}
+var o=t.fn.scrollspy
+t.fn.scrollspy=i,t.fn.scrollspy.Constructor=e,t.fn.scrollspy.noConflict=function(){return t.fn.scrollspy=o,this},t(window).on("load.bs.scrollspy.data-api",function(){t('[data-spy="scroll"]').each(function(){var e=t(this)
+i.call(e,e.data())})})}(jQuery),+function(t){"use strict"
+function e(e){return this.each(function(){var o=t(this),n=o.data("bs.tab")
+n||o.data("bs.tab",n=new i(this)),"string"==typeof e&&n[e]()})}var i=function(e){this.element=t(e)}
+i.VERSION="3.3.7",i.TRANSITION_DURATION=150,i.prototype.show=function(){var e=this.element,i=e.closest("ul:not(.dropdown-menu)"),o=e.data("target")
+if(o||(o=e.attr("href"),o=o&&o.replace(/.*(?=#[^\s]*$)/,"")),!e.parent("li").hasClass("active")){var n=i.find(".active:last a"),s=t.Event("hide.bs.tab",{relatedTarget:e[0]}),a=t.Event("show.bs.tab",{relatedTarget:n[0]})
+if(n.trigger(s),e.trigger(a),!a.isDefaultPrevented()&&!s.isDefaultPrevented()){var r=t(o)
+this.activate(e.closest("li"),i),this.activate(r,r.parent(),function(){n.trigger({type:"hidden.bs.tab",relatedTarget:e[0]}),e.trigger({type:"shown.bs.tab",relatedTarget:n[0]})})}}},i.prototype.activate=function(e,o,n){function s(){a.removeClass("active").find("> .dropdown-menu > .active").removeClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!1),e.addClass("active").find('[data-toggle="tab"]').attr("aria-expanded",!0),r?(e[0].offsetWidth,e.addClass("in")):e.removeClass("fade"),e.parent(".dropdown-menu").length&&e.closest("li.dropdown").addClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!0),n&&n()}var a=o.find("> .active"),r=n&&t.support.transition&&(a.length&&a.hasClass("fade")||!!o.find("> .fade").length)
+a.length&&r?a.one("bsTransitionEnd",s).emulateTransitionEnd(i.TRANSITION_DURATION):s(),a.removeClass("in")}
+var o=t.fn.tab
+t.fn.tab=e,t.fn.tab.Constructor=i,t.fn.tab.noConflict=function(){return t.fn.tab=o,this}
+var n=function(i){i.preventDefault(),e.call(t(this),"show")}
+t(document).on("click.bs.tab.data-api",'[data-toggle="tab"]',n).on("click.bs.tab.data-api",'[data-toggle="pill"]',n)}(jQuery),+function(t){"use strict"
+function e(e){return this.each(function(){var o=t(this),n=o.data("bs.affix"),s="object"==typeof e&&e
+n||o.data("bs.affix",n=new i(this,s)),"string"==typeof e&&n[e]()})}var i=function(e,o){this.options=t.extend({},i.DEFAULTS,o),this.$target=t(this.options.target).on("scroll.bs.affix.data-api",t.proxy(this.checkPosition,this)).on("click.bs.affix.data-api",t.proxy(this.checkPositionWithEventLoop,this)),this.$element=t(e),this.affixed=null,this.unpin=null,this.pinnedOffset=null,this.checkPosition()}
+i.VERSION="3.3.7",i.RESET="affix affix-top affix-bottom",i.DEFAULTS={offset:0,target:window},i.prototype.getState=function(t,e,i,o){var n=this.$target.scrollTop(),s=this.$element.offset(),a=this.$target.height()
+if(null!=i&&"top"==this.affixed)return i>n?"top":!1
+if("bottom"==this.affixed)return null!=i?n+this.unpin<=s.top?!1:"bottom":t-o>=n+a?!1:"bottom"
+var r=null==this.affixed,l=r?n:s.top,h=r?a:e
+return null!=i&&i>=n?"top":null!=o&&l+h>=t-o?"bottom":!1},i.prototype.getPinnedOffset=function(){if(this.pinnedOffset)return this.pinnedOffset
+this.$element.removeClass(i.RESET).addClass("affix")
+var t=this.$target.scrollTop(),e=this.$element.offset()
+return this.pinnedOffset=e.top-t},i.prototype.checkPositionWithEventLoop=function(){setTimeout(t.proxy(this.checkPosition,this),1)},i.prototype.checkPosition=function(){if(this.$element.is(":visible")){var e=this.$element.height(),o=this.options.offset,n=o.top,s=o.bottom,a=Math.max(t(document).height(),t(document.body).height())
+"object"!=typeof o&&(s=n=o),"function"==typeof n&&(n=o.top(this.$element)),"function"==typeof s&&(s=o.bottom(this.$element))
+var r=this.getState(a,e,n,s)
+if(this.affixed!=r){null!=this.unpin&&this.$element.css("top","")
+var l="affix"+(r?"-"+r:""),h=t.Event(l+".bs.affix")
+if(this.$element.trigger(h),h.isDefaultPrevented())return
+this.affixed=r,this.unpin="bottom"==r?this.getPinnedOffset():null,this.$element.removeClass(i.RESET).addClass(l).trigger(l.replace("affix","affixed")+".bs.affix")}"bottom"==r&&this.$element.offset({top:a-e-s})}}
+var o=t.fn.affix
+t.fn.affix=e,t.fn.affix.Constructor=i,t.fn.affix.noConflict=function(){return t.fn.affix=o,this},t(window).on("load",function(){t('[data-spy="affix"]').each(function(){var i=t(this),o=i.data()
+o.offset=o.offset||{},null!=o.offsetBottom&&(o.offset.bottom=o.offsetBottom),null!=o.offsetTop&&(o.offset.top=o.offsetTop),e.call(i,o)})})}(jQuery)
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/deviceMerchantBuy/deviceMerchantBuyDetails.js b/pluss-manage-page/src/main/resources/static/resources/js/deviceMerchantBuy/deviceMerchantBuyDetails.js
new file mode 100644
index 0000000..6fa8f47
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/deviceMerchantBuy/deviceMerchantBuyDetails.js
@@ -0,0 +1,96 @@
+/**
+ * create by robot 
+ * date Mon Dec 16 17:48:28 CST 2019 
+ */ 
+
+$(document).ready(function(){
+	//form表单样式
+	layui.use(['layer', 'form'], function() {
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+	//li 切换事件
+	$(".nav-tabs>li").click(function() {
+		var index = $(".nav-tabs>li").index(this);
+		$(this).addClass("active").siblings("li").removeClass("active");
+		
+	})
+	//弹出一个提示层
+	$('.fa-save').on('click', function() {
+		saveDeviceMerchantBuy();
+	});
+
+	//绑定标签栏事件
+	$(document).on('click','.nav-tabs li',function(){
+
+		var action =$(this).data('action');
+		 switch (action) {
+			case "base"://基本资料
+				goBase();
+				break;  
+			case "functions"://多功能
+				goFunctions();
+				break;
+			case "extends"://扩展    
+				goExtends();         
+				break;           
+		 }
+	})
+
+	//加载第一个标签
+	$('.nav-tabs li').eq(0).click();
+	
+});
+
+
+//跳转基本信息 
+function goBase(){
+	var url=ctx+'/deviceMerchantBuy/querydeviceMerchantBuyInfo?id='+$('#deviceMerchantBuyId').val();
+	$('.tab-content').load(url);
+	              
+}
+//跳转多功能输入
+function goFunctions(){ 
+	var url=ctx+'/deviceMerchantBuy/queryDeviceMerchantBuyFunctionsInfo?id='+$('#deviceMerchantBuyId').val();
+	$('.tab-content').load(url);  
+	
+}
+//跳转到扩展   
+function goExtends(){
+	
+	var url=ctx+'/deviceMerchantBuy/queryDeviceMerchantBuyExtendsInfo?id='+$('#deviceMerchantBuyId').val();
+	$('.tab-content').load(url);          
+}  
+  
+
+ 
+//保存
+function saveDeviceMerchantBuy(){
+	 
+	$(".fa-save").attr("disabled","disabled");
+	$('.fa-save').html('正在保存...')
+	$.ajax({
+		url:ctx+"/deviceMerchantBuy/saveDeviceMerchantBuy",
+		type:"POST",
+		dataType:'json',
+		data:$("#data_form").serializeArray(),
+		complete:function(){
+			$(".fa-save").removeAttr("disabled");
+			$('.fa-save').html('保存')
+		},        
+		success:function(service){ 
+		
+			layer.confirm('保存成功,是否前往列表？', {
+				  btn: ['确认','取消'] //按钮
+				}, function(){
+					$('#goback span').trigger('click'); 
+				}, function(){         
+					layer.closeAll();
+			});  
+			
+		}
+	});  
+}
+ 
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/deviceMerchantBuy/deviceMerchantBuyList.js b/pluss-manage-page/src/main/resources/static/resources/js/deviceMerchantBuy/deviceMerchantBuyList.js
new file mode 100644
index 0000000..941a30c
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/deviceMerchantBuy/deviceMerchantBuyList.js
@@ -0,0 +1,263 @@
+/**
+ * create by robot 
+ * date Mon Dec 16 17:48:28 CST 2019 
+ */ 
+
+var pageIndex=1;
+$(document).ready(function(){
+	//调用查询
+	pageIndex=StringUtil.getQueryString('pageIndex');
+	if(pageIndex==undefined||pageIndex==null){
+		pageIndex=1;
+	}
+	//绑定hover操作
+	$(document).on('mouseenter','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").show();
+		var width=15;
+		$(this).children('div').find('li').each(function(){
+			//获取li宽度
+			width+=$(this).width();
+		});
+		$(this).children('div').width(width);
+	})
+	$(document).on('mouseleave','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").hide();
+	});
+
+	//日历控件
+	layui.use(['layer', 'laydate'], function() {
+		var layer = layui.layer;
+		laydate = layui.laydate;
+		laydate.render({
+			elem: '#date1',
+			format:'yyyy-MM-dd 00:00:00'//指定元素
+		});
+		laydate.render({
+			elem: '#date2',
+			format:'yyyy-MM-dd 23:59:59'//指定元素
+		});
+	});
+
+
+	//行选中事件
+	$("#allCheck").find("span").click(function() {
+		$(this).toggleClass('checked');
+		if($(this).hasClass('checked')){
+			//所有列选中
+		  $(".checker").find("span").each(function () {
+		         $(this).addClass("checked");
+		    })
+		}else{
+			//所有列取消选中
+			$(".checker").find("span").each(function () {
+				 $(this).removeClass("checked");
+		    })
+		}
+	});
+
+	//单个选中
+	$(document).on('click','.checkeBox span',function() {
+		$(this).toggleClass('checked');
+		//设置头部事件
+		var length=$('.checkeBox span').length;
+		var count=0;
+		$(".checkeBox").find("span").each(function () {
+	        if($(this).hasClass("checked")){
+	        	count++;
+	        }
+	   })
+		//全选
+	   if(count==length){
+		   $("#allCheck").find("span").addClass('checked');
+	   }else{
+		   $("#allCheck").find("span").removeClass('checked');
+	   }
+	})
+	//左右div高度相等
+	var left_content_height = $(".right-content").height();
+	$(".left-content").height(left_content_height+35);
+	var sub_left_height=$(".res-menu").height(left_content_height-60);
+});
+
+//初始化新增
+function initAddDeviceMerchantBuy(){
+	window.location=ctx+'/deviceMerchantBuy/queryDeviceMerchantBuyDetails?pageIndex='+pageIndex;
+}
+
+//初始化修改
+function showDeviceMerchantBuyDetails(d){
+	layer.open({
+		type:1,
+		title: '其他信息',
+		area: ['500px', '600px'],
+		content: $("#showDeviceDetail").text(),
+		success:function (){
+			$('#form3>input[name="id"]').val(d.id);
+			$("#quantity").val(d.quantity);
+			$("#orderAmount").val(d.orderAmount);
+			$("#statusDesc").val(d.status === "1" ? '已支付' : '未支付');
+			$("#orderStatus").val(d.status);
+			$('#form3>div>div>textarea[name="addressComposite"]').val(d.linkName + d.linkPhone + d.provinces + d.address)
+			$('#form3>div>div>input[name="linkName"]').val(d.linkName);
+			$('#form3>div>div>input[name="linkPhone"]').val(d.linkPhone);
+			$('#form3>div>div>input[name="provinces"]').val(d.provinces);
+			$('#form3>div>div>textarea[name="address"]').val(d.address);
+		}
+	})
+	//window.location=ctx+'/deviceMerchantBuy/queryDeviceMerchantBuyDetails?id='+id+'&pageIndex='+pageIndex;
+}
+
+//初始化删除
+function initDeleteDeviceMerchantBuy(id){
+	
+		layer.open({
+		type: 1,
+		closeBtn: 1,		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r'	, //按钮居中
+		shade: 0.3 ,//不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteDeviceMerchantBuy(id,true);
+		}
+	});
+}
+
+//删除
+function deleteDeviceMerchantBuy(id,showMsg){
+	$.ajax({
+		url:ctx+'/deviceMerchantBuy/deleteDeviceMerchantBuy',
+		data:[{
+			name:'id',
+			value:id
+		}],
+		type:'POST',
+		dataType:'json',
+		success:function(){
+			queryDeviceMerchantBuy(pageIndex);
+			if(showMsg){
+				layer.msg('删除成功!');	
+			}
+		}
+	});
+}
+//头部编辑
+function initEditDeviceMerchantBuy(){
+	var count=0;
+	var id=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+        	 id=$(this).data('id');
+         }
+    })
+    if(count>1){
+    	layer.msg('只能选中一行记录进行操作!');
+    	return ;
+    }
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	 if(id>0){
+	  showDeviceMerchantBuyDetails(id);
+	 }
+}
+//头部删除
+function initBatchDeleteDeviceMerchantBuy(){
+	var count=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+         }
+    })
+	
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	
+
+	layer.open({
+		type: 1,
+		closeBtn: 1,
+		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r', //按钮居中
+		shade: 0.3, //不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteBatchDeviceMerchantBuy();
+		}
+	});
+	
+}
+//批量删除
+function deleteBatchDeviceMerchantBuy(){
+	
+	$(".checkeBox").find("span").each(function () {
+        if($(this).hasClass("checked")){
+        	var id=$(this).data('id');
+        	deleteDeviceMerchantBuy(id,false);
+        	layer.msg('删除成功!');	
+        }
+   })
+}
+
+function  updateExpressNo(id){
+	var htmlStr = '<div style="margin: 10px;"><label >请输入单号：</label><input id="expressNo"></div>';
+	layer.open({
+		type:1,
+		title:'发货单号',
+		area: '350px;',
+		shade:0.3,
+		maxmin:true,
+		content:htmlStr,
+		btn:['确定','取消'],
+		yes:function(){
+			var expressNo = $("#expressNo").val();
+			ExpressNo(id,expressNo);
+		},
+	})
+}
+
+function ExpressNo(id,expressNo){
+	$.ajax({
+		url:ctx+'/deviceMerchantBuy/expressNo',
+		 type:"post", 
+	        dataType:"json",  
+	        data:{  
+	        	"expressNo":expressNo,
+	        	"id":id,
+	        },  
+	        success:function(result){ 
+	        	queryDeviceMerchantBuy(pageIndex);
+	        	layer.closeAll();
+	        	layer.msg(result.msg);	
+	        }
+	})
+}
+function dateFtt(fmt,date)
+{ //author: meizz
+	var o = {
+		"M+" : date.getMonth()+1,                 //月份
+		"d+" : date.getDate(),                    //日
+		"h+" : date.getHours(),                   //小时
+		"m+" : date.getMinutes(),                 //分
+		"s+" : date.getSeconds(),                 //秒
+		"q+" : Math.floor((date.getMonth()+3)/3), //季度
+		"S"  : date.getMilliseconds()             //毫秒
+	};
+	if(/(y+)/.test(fmt))
+		fmt=fmt.replace(RegExp.$1, (date.getFullYear()+"").substr(4 - RegExp.$1.length));
+	for(var k in o)
+		if(new RegExp("("+ k +")").test(fmt))
+			fmt = fmt.replace(RegExp.$1, (RegExp.$1.length==1) ? (o[k]) : (("00"+ o[k]).substr((""+ o[k]).length)));
+	return fmt;
+}
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/deviceMerchantBuyDetail/deviceMerchantBuyDetailDetails.js b/pluss-manage-page/src/main/resources/static/resources/js/deviceMerchantBuyDetail/deviceMerchantBuyDetailDetails.js
new file mode 100644
index 0000000..b9eceea
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/deviceMerchantBuyDetail/deviceMerchantBuyDetailDetails.js
@@ -0,0 +1,96 @@
+/**
+ * create by robot 
+ * date Tue Dec 17 10:04:20 CST 2019 
+ */ 
+
+$(document).ready(function(){
+	//form表单样式
+	layui.use(['layer', 'form'], function() {
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+	//li 切换事件
+	$(".nav-tabs>li").click(function() {
+		var index = $(".nav-tabs>li").index(this);
+		$(this).addClass("active").siblings("li").removeClass("active");
+		
+	})
+	//弹出一个提示层
+	$('.fa-save').on('click', function() {
+		saveDeviceMerchantBuyDetail();
+	});
+
+	//绑定标签栏事件
+	$(document).on('click','.nav-tabs li',function(){
+
+		var action =$(this).data('action');
+		 switch (action) {
+			case "base"://基本资料
+				goBase();
+				break;  
+			case "functions"://多功能
+				goFunctions();
+				break;
+			case "extends"://扩展    
+				goExtends();         
+				break;           
+		 }
+	})
+
+	//加载第一个标签
+	$('.nav-tabs li').eq(0).click();
+	
+});
+
+
+//跳转基本信息 
+function goBase(){
+	var url=ctx+'/deviceMerchantBuyDetail/queryDeviceMerchantBuyDetailBaseInfo?id='+$('#deviceMerchantBuyDetailId').val();
+	$('.tab-content').load(url);
+	              
+}
+//跳转多功能输入
+function goFunctions(){ 
+	var url=ctx+'/deviceMerchantBuyDetail/queryDeviceMerchantBuyDetailFunctionsInfo?id='+$('#deviceMerchantBuyDetailId').val();
+	$('.tab-content').load(url);  
+	
+}
+//跳转到扩展   
+function goExtends(){
+	
+	var url=ctx+'/deviceMerchantBuyDetail/queryDeviceMerchantBuyDetailExtendsInfo?id='+$('#deviceMerchantBuyDetailId').val();
+	$('.tab-content').load(url);          
+}  
+  
+
+ 
+//保存
+function saveDeviceMerchantBuyDetail(){
+	 
+	$(".fa-save").attr("disabled","disabled");
+	$('.fa-save').html('正在保存...')
+	$.ajax({
+		url:ctx+"/deviceMerchantBuyDetail/saveDeviceMerchantBuyDetail",
+		type:"POST",
+		dataType:'json',
+		data:$("#data_form").serializeArray(),
+		complete:function(){
+			$(".fa-save").removeAttr("disabled");
+			$('.fa-save').html('保存')
+		},        
+		success:function(service){ 
+		
+			layer.confirm('保存成功,是否前往列表？', {
+				  btn: ['确认','取消'] //按钮
+				}, function(){
+					$('#goback span').trigger('click'); 
+				}, function(){         
+					layer.closeAll();
+			});  
+			
+		}
+	});  
+}
+ 
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/deviceMerchantBuyDetail/deviceMerchantBuyDetailList.js b/pluss-manage-page/src/main/resources/static/resources/js/deviceMerchantBuyDetail/deviceMerchantBuyDetailList.js
new file mode 100644
index 0000000..0398497
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/deviceMerchantBuyDetail/deviceMerchantBuyDetailList.js
@@ -0,0 +1,263 @@
+/**
+ * create by robot 
+ * date Tue Dec 17 10:04:20 CST 2019 
+ */ 
+
+var pageIndex=1;
+$(document).ready(function(){
+	//调用查询
+	pageIndex=StringUtil.getQueryString('pageIndex');
+	if(pageIndex==undefined||pageIndex==null){
+		pageIndex=1;
+	}
+	queryDeviceMerchantBuyDetail(pageIndex);
+	//绑定hover操作
+	$(document).on('mouseenter','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").show();
+		var width=15;
+		$(this).children('div').find('li').each(function(){
+			//获取li宽度
+			width+=$(this).width();
+		});
+		$(this).children('div').width(width);
+	})
+	$(document).on('mouseleave','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").hide();
+	});
+
+	//日历控件
+	layui.use(['layer', 'laydate'], function() {
+		var layer = layui.layer;
+		laydate = layui.laydate;
+		laydate.render({
+		elem: '#date1' //指定元素
+		});
+		laydate.render({
+			elem: '#date2' //指定元素
+		});
+	});
+
+	//行选中事件
+	$("#allCheck").find("span").click(function() {
+		$(this).toggleClass('checked');
+		if($(this).hasClass('checked')){
+			//所有列选中
+		  $(".checker").find("span").each(function () {
+		         $(this).addClass("checked");
+		    })
+		}else{
+			//所有列取消选中
+			$(".checker").find("span").each(function () {
+				 $(this).removeClass("checked");
+		    })
+		}
+	});
+
+	//单个选中
+	$(document).on('click','.checkeBox span',function() {
+		$(this).toggleClass('checked');
+		//设置头部事件
+		var length=$('.checkeBox span').length;
+		var count=0;
+		$(".checkeBox").find("span").each(function () {
+	        if($(this).hasClass("checked")){
+	        	count++;
+	        }
+	   })
+		//全选
+	   if(count==length){
+		   $("#allCheck").find("span").addClass('checked');
+	   }else{
+		   $("#allCheck").find("span").removeClass('checked');
+	   }
+	})
+	//左右div高度相等
+	var left_content_height = $(".right-content").height();
+	$(".left-content").height(left_content_height+35);
+	var sub_left_height=$(".res-menu").height(left_content_height-60);
+});
+
+//查询
+function queryDeviceMerchantBuyDetail(index){
+	if(typeof(index)=='undefined'){
+		index=1;
+	}
+	var url=ctx+'/deviceMerchantBuyDetail/queryDeviceMerchantBuyDetailByPage';
+	$.ajax({  
+        url:url,  
+        type:"post", 
+        dataType:"json",  
+        data:{  
+        	"currPage":index,
+        	"id":$('#searchId').val()
+        },  
+        success:function(result){  
+        	//渲染数据
+        	$('#data_content').empty();
+        	var header='';
+        	$.each(result.deviceMerchantBuyDetailList,function(i){
+        		var deviceMerchantBuyDetail=result.deviceMerchantBuyDetailList[i];
+        		var data='';
+        		data+='<tr class="odd">';
+        		data+='<td class="textc">';
+				data+='		 <div class="checker checkeBox">';        		data+='		 <span class=""  data-id="'+deviceMerchantBuyDetail.id+'"><input type="checkbox"  value=""></span>';
+        		data+='		</div>';
+        		data+='</td>';
+        		data+='<td class="textc">'+deviceMerchantBuyDetail.id+'</td>';
+        		data+='<td class="textc">'+deviceMerchantBuyDetail.orderNo+'</td>';
+        		data+='<td class="textc">'+deviceMerchantBuyDetail.soleCode+'</td>';
+        		data+='<td class="textc">';
+        		data+='<div class="positionr listOperaters">';
+        		data+='		<a href="javascript:void(0);"  class="icon-large dlblock w16 h16"><img src="'+resourcePath+'/images/angle-down.png"/></a>';
+        		data+='		<div class="ops_box ops_itemDiv positiona clearfix whitebg">';
+        		data+='			<ul>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showDeviceMerchantBuyDetailDetails('+deviceMerchantBuyDetail.id+')" class="btn btn-primary fa fa-edit ops_more f12">编辑</a></li>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="initDeleteDeviceMerchantBuyDetail('+deviceMerchantBuyDetail.id+')" class="btn btn-primary fa fa-remove ops_more f12">删除</a></li>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showDeviceMerchantBuyDetailDetails('+deviceMerchantBuyDetail.id+')" class="btn btn-primary fa fa-detail ops_more f12">明细</a></li>';
+        	    data+='			</ul>';
+              data+='		</div>';
+        	    data+='</div>';
+        	    data+='</td>';
+        	    data+='</tr>';
+        	    $('#data_content').append(data);
+        	});
+        	//分页
+        	$('#pageCount').html(result.pageCount);
+      	$('#currPage').html(result.currPage);
+          $('#totalCount').html(result.count);
+           	//设置分页
+           	pageIndex=result.currPage;
+			$('#pagination').pagination({
+				pageCount: result.pageCount,
+				jump: true,
+				coping: true,
+				jump: true,
+				homePage: '首页',
+				endPage: '末页',
+				prevContent: '上页',
+				nextContent: '下页',
+				current:result.currPage,
+				callback:function(api){
+					pageIndex=api.getCurrent();
+					queryDeviceMerchantBuyDetail(api.getCurrent());
+				}
+			});
+        } 
+    });  
+	//表头列不选中
+	$("#allCheck").find("span").removeClass('checked');
+}
+
+//初始化新增
+function initAddDeviceMerchantBuyDetail(){
+	window.location=ctx+'/deviceMerchantBuyDetail/queryDeviceMerchantBuyDetailDetails?pageIndex='+pageIndex;
+}
+
+//初始化修改
+function showDeviceMerchantBuyDetailDetails(id){
+	window.location=ctx+'/deviceMerchantBuyDetail/queryDeviceMerchantBuyDetailDetails?id='+id+'&pageIndex='+pageIndex;
+}
+
+//初始化删除
+function initDeleteDeviceMerchantBuyDetail(id){
+	
+		layer.open({
+		type: 1,
+		closeBtn: 1,		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r'	, //按钮居中
+		shade: 0.3 ,//不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteDeviceMerchantBuyDetail(id,true);
+		}
+	});
+}
+
+//删除
+function deleteDeviceMerchantBuyDetail(id,showMsg){
+	$.ajax({
+		url:ctx+'/deviceMerchantBuyDetail/deleteDeviceMerchantBuyDetail',
+		data:[{
+			name:'id',
+			value:id
+		}],
+		type:'POST',
+		dataType:'json',
+		success:function(){
+			queryDeviceMerchantBuyDetail(pageIndex);
+			if(showMsg){
+				layer.msg('删除成功!');	
+			}
+		}
+	});
+}
+//头部编辑
+function initEditDeviceMerchantBuyDetail(){
+	var count=0;
+	var id=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+        	 id=$(this).data('id');
+         }
+    })
+    if(count>1){
+    	layer.msg('只能选中一行记录进行操作!');
+    	return ;
+    }
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	 if(id>0){
+	  showDeviceMerchantBuyDetailDetails(id);
+	 }
+}
+//头部删除
+function initBatchDeleteDeviceMerchantBuyDetail(){
+	var count=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+         }
+    })
+	
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	
+
+	layer.open({
+		type: 1,
+		closeBtn: 1,
+		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r', //按钮居中
+		shade: 0.3, //不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteBatchDeviceMerchantBuyDetail();
+		}
+	});
+	
+}
+//批量删除
+function deleteBatchDeviceMerchantBuyDetail(){
+	
+	$(".checkeBox").find("span").each(function () {
+        if($(this).hasClass("checked")){
+        	var id=$(this).data('id');
+        	deleteDeviceMerchantBuyDetail(id,false);
+        	layer.msg('删除成功!');	
+        }
+   })
+}
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/deviceSignUnbind/deviceSignUnbindDetails.js b/pluss-manage-page/src/main/resources/static/resources/js/deviceSignUnbind/deviceSignUnbindDetails.js
new file mode 100644
index 0000000..7b67d49
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/deviceSignUnbind/deviceSignUnbindDetails.js
@@ -0,0 +1,96 @@
+/**
+ * create by robot 
+ * date Mon Dec 16 17:32:09 CST 2019 
+ */ 
+
+$(document).ready(function(){
+	//form表单样式
+	layui.use(['layer', 'form'], function() {
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+	//li 切换事件
+	$(".nav-tabs>li").click(function() {
+		var index = $(".nav-tabs>li").index(this);
+		$(this).addClass("active").siblings("li").removeClass("active");
+		
+	})
+	//弹出一个提示层
+	$('.fa-save').on('click', function() {
+		saveDeviceSignUnbind();
+	});
+
+	//绑定标签栏事件
+	$(document).on('click','.nav-tabs li',function(){
+
+		var action =$(this).data('action');
+		 switch (action) {
+			case "base"://基本资料
+				goBase();
+				break;  
+			case "functions"://多功能
+				goFunctions();
+				break;
+			case "extends"://扩展    
+				goExtends();         
+				break;           
+		 }
+	})
+
+	//加载第一个标签
+	$('.nav-tabs li').eq(0).click();
+	
+});
+
+
+//跳转基本信息 
+function goBase(){
+	var url=ctx+'/deviceSignUnbind/queryDeviceSignUnbindBaseInfo?id='+$('#deviceSignUnbindId').val();
+	$('.tab-content').load(url);
+	              
+}
+//跳转多功能输入
+function goFunctions(){ 
+	var url=ctx+'/deviceSignUnbind/queryDeviceSignUnbindFunctionsInfo?id='+$('#deviceSignUnbindId').val();
+	$('.tab-content').load(url);  
+	
+}
+//跳转到扩展   
+function goExtends(){
+	
+	var url=ctx+'/deviceSignUnbind/queryDeviceSignUnbindExtendsInfo?id='+$('#deviceSignUnbindId').val();
+	$('.tab-content').load(url);          
+}  
+  
+
+ 
+//保存
+function saveDeviceSignUnbind(){
+	 
+	$(".fa-save").attr("disabled","disabled");
+	$('.fa-save').html('正在保存...')
+	$.ajax({
+		url:ctx+"/deviceSignUnbind/saveDeviceSignUnbind",
+		type:"POST",
+		dataType:'json',
+		data:$("#data_form").serializeArray(),
+		complete:function(){
+			$(".fa-save").removeAttr("disabled");
+			$('.fa-save').html('保存')
+		},        
+		success:function(service){ 
+		
+			layer.confirm('保存成功,是否前往列表？', {
+				  btn: ['确认','取消'] //按钮
+				}, function(){
+					$('#goback span').trigger('click'); 
+				}, function(){         
+					layer.closeAll();
+			});  
+			
+		}
+	});  
+}
+ 
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/deviceSignUnbind/deviceSignUnbindList.js b/pluss-manage-page/src/main/resources/static/resources/js/deviceSignUnbind/deviceSignUnbindList.js
new file mode 100644
index 0000000..7900314
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/deviceSignUnbind/deviceSignUnbindList.js
@@ -0,0 +1,377 @@
+/**
+ * create by robot 
+ * date Mon Dec 16 17:32:09 CST 2019 
+ */ 
+
+var pageIndex=1;
+$(document).ready(function(){
+	//调用查询
+	pageIndex=StringUtil.getQueryString('pageIndex');
+	if(pageIndex==undefined||pageIndex==null){
+		pageIndex=1;
+	}
+	queryDeviceSignUnbind(pageIndex);
+	//绑定hover操作
+	$(document).on('mouseenter','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").show();
+		var width=15;
+		$(this).children('div').find('li').each(function(){
+			//获取li宽度
+			width+=$(this).width();
+		});
+		$(this).children('div').width(width);
+	})
+	$(document).on('mouseleave','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").hide();
+	});
+
+	//日历控件
+	layui.use(['layer', 'laydate'], function() {
+		var layer = layui.layer;
+		laydate = layui.laydate;
+		laydate.render({
+		elem: '#date1' //指定元素
+		});
+		laydate.render({
+			elem: '#date2' //指定元素
+		});
+	});
+
+
+	//行选中事件
+	$("#allCheck").find("span").click(function() {
+		$(this).toggleClass('checked');
+		if($(this).hasClass('checked')){
+			//所有列选中
+		  $(".checker").find("span").each(function () {
+		         $(this).addClass("checked");
+		    })
+		}else{
+			//所有列取消选中
+			$(".checker").find("span").each(function () {
+				 $(this).removeClass("checked");
+		    })
+		}
+	});
+
+	//单个选中
+	$(document).on('click','.checkeBox span',function() {
+		$(this).toggleClass('checked');
+		//设置头部事件
+		var length=$('.checkeBox span').length;
+		var count=0;
+		$(".checkeBox").find("span").each(function () {
+	        if($(this).hasClass("checked")){
+	        	count++;
+	        }
+	   })
+		//全选
+	   if(count==length){
+		   $("#allCheck").find("span").addClass('checked');
+	   }else{
+		   $("#allCheck").find("span").removeClass('checked');
+	   }
+	})
+	//左右div高度相等
+	var left_content_height = $(".right-content").height();
+	$(".left-content").height(left_content_height+35);
+	var sub_left_height=$(".res-menu").height(left_content_height-60);
+});
+
+//查询
+function queryDeviceSignUnbind(index){
+	if(typeof(index)=='undefined'){
+		index=1;
+	}
+	var url=ctx+'/deviceSignUnbind/queryDeviceSignUnbindByPage';
+	$.ajax({  
+        url:url,  
+        type:"post", 
+        dataType:"json",  
+        data:{  
+        	"currPage":index,
+        	"orderNo":$('#orderNo').val(),
+        	"merchantName":$('#merchantName').val(),
+        	"status":$('#status').val(),
+			"userId":$('#userId').val(),
+        /*	"startTime":$('#date1').val(),
+        	"endTime":$('#date2').val(),*/
+        },  
+        success:function(result){  
+        	var presentPage = result.currPage;
+        	//渲染数据
+        	$('#data_content').empty();
+        	var header='';
+        	$.each(result.deviceSignUnbindList,function(i){
+        		var orderNumber = (presentPage-1)*12+i+1;
+        		var deviceSignUnbind=result.deviceSignUnbindList[i];
+        		var data='';
+        		data+='<tr class="odd">';
+        		data+='<td class="textc">';
+				data+='		 <div class="checker checkeBox">';        		data+='		 <span class=""  data-id="'+deviceSignUnbind.id+'"><input type="checkbox"  value=""></span>';
+        		data+='		</div>';
+        		data+='</td>';
+        		data+='<td class="textc">'+orderNumber+'</td>';
+        		data+='<td class="textc">'+deviceSignUnbind.userId+'</td>';
+        		data+='<td class="textc">'+(deviceSignUnbind.orderNo == null ? '' : deviceSignUnbind.orderNo)+'</td>';
+        		data+='<td class="textc">'+deviceSignUnbind.merchantName+'</td>';
+        		data+='<td class="textc">'+(deviceSignUnbind.venderModel == null ? '' : deviceSignUnbind.venderModel)+'</td>';
+        		data+='<td class="textc">'+(deviceSignUnbind.sn == null ? '' : deviceSignUnbind.sn)+'</td>';
+        		var status='';
+        		if(StringUtil.isNotBlank(deviceSignUnbind.status)){
+        			if(deviceSignUnbind.status=='1'){
+        				status='确定激活';
+        			}
+        			if(deviceSignUnbind.status=='2'){
+        				status='已激活';
+        			}
+        			if(deviceSignUnbind.status=='3'){
+        				status='确定解绑';
+        			}
+        			if(deviceSignUnbind.status=='4'){
+        				status='已解绑';
+        			}
+        		}
+        		data+='<td class="textc">'+status+'</td>';
+        		data+='<td class="textc">';
+        		if(deviceSignUnbind.status=='1'){
+        			data+='<a href="javascript:void(0);" onclick="updateStatus('+deviceSignUnbind.id+','+deviceSignUnbind.status+')">确定激活</a>';
+        		}else if(deviceSignUnbind.status=='3'){
+        			data+='<a href="javascript:void(0);" onclick="updateStatus('+deviceSignUnbind.id+','+deviceSignUnbind.status+')">确定解绑</a>';
+        		}else if(deviceSignUnbind.status=='2'){
+        			data+='已绑定';
+        		}else if(deviceSignUnbind.status=='4'){
+        			data+='已解绑';
+        		}else if(deviceSignUnbind.status=='5'){
+        			data+='已拒绝绑定';
+        		}else if(deviceSignUnbind.status=='6'){
+        			data+='已拒绝解绑';
+        		}
+        	    data+='</td>';
+        	    data+='</tr>';
+        	    $('#data_content').append(data);
+        	});
+        	//分页
+        	$('#pageCount').html(result.pageCount);
+      	$('#currPage').html(result.currPage);
+          $('#totalCount').html(result.count);
+           	//设置分页
+           	pageIndex=result.currPage;
+			$('#pagination').pagination({
+				pageCount: result.pageCount,
+				jump: true,
+				coping: true,
+				jump: true,
+				homePage: '首页',
+				endPage: '末页',
+				prevContent: '上页',
+				nextContent: '下页',
+				current:result.currPage,
+				callback:function(api){
+					pageIndex=api.getCurrent();
+					queryDeviceSignUnbind(api.getCurrent());
+				}
+			});
+        } 
+    });  
+	//表头列不选中
+	$("#allCheck").find("span").removeClass('checked');
+}
+
+//初始化新增
+function initAddDeviceSignUnbind(){
+	window.location=ctx+'/deviceSignUnbind/queryDeviceSignUnbindDetails?pageIndex='+pageIndex;
+}
+
+//初始化修改
+function showDeviceSignUnbindDetails(id){
+	window.location=ctx+'/deviceSignUnbind/queryDeviceSignUnbindDetails?id='+id+'&pageIndex='+pageIndex;
+}
+
+//初始化删除
+function initDeleteDeviceSignUnbind(id){
+	
+		layer.open({
+		type: 1,
+		closeBtn: 1,		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r'	, //按钮居中
+		shade: 0.3 ,//不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteDeviceSignUnbind(id,true);
+		}
+	});
+}
+
+//删除
+function deleteDeviceSignUnbind(id,showMsg){
+	$.ajax({
+		url:ctx+'/deviceSignUnbind/deleteDeviceSignUnbind',
+		data:[{
+			name:'id',
+			value:id
+		}],
+		type:'POST',
+		dataType:'json',
+		success:function(){
+			queryDeviceSignUnbind(pageIndex);
+			if(showMsg){
+				layer.msg('删除成功!');	
+			}
+		}
+	});
+}
+//头部编辑
+function initEditDeviceSignUnbind(){
+	var count=0;
+	var id=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+        	 id=$(this).data('id');
+         }
+    })
+    if(count>1){
+    	layer.msg('只能选中一行记录进行操作!');
+    	return ;
+    }
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	 if(id>0){
+	  showDeviceSignUnbindDetails(id);
+	 }
+}
+//头部删除
+function initBatchDeleteDeviceSignUnbind(){
+	var count=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+         }
+    })
+	
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	
+
+	layer.open({
+		type: 1,
+		closeBtn: 1,
+		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r', //按钮居中
+		shade: 0.3, //不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteBatchDeviceSignUnbind();
+		}
+	});
+	
+}
+//批量删除
+function deleteBatchDeviceSignUnbind(){
+	
+	$(".checkeBox").find("span").each(function () {
+        if($(this).hasClass("checked")){
+        	var id=$(this).data('id');
+        	deleteDeviceSignUnbind(id,false);
+        	layer.msg('删除成功!');	
+        }
+   })
+}
+
+
+function toExamine(id){
+	var htmlStr = '<div style="margin: 10px;"><label class="layui-form-label">理由：</label><textarea class="layui-textarea" id="certReason"></textarea></div>';
+	layer.open({
+		type:1,
+		title:'实名认证审核',
+		area: '350px;',
+		shade:1,
+		maxmin:true,
+		content:htmlStr,
+		btn:['通过','不通过'],
+		yes:function(){
+			var certReason = $("#certReason").val();
+			examine(3,id,certReason);
+		},
+		btn2:function(){
+			var certReason = $("#certReason").val();
+			if(StringUtil.isBlank(certReason)){
+				layer.msg('请填写不通过理由');
+				return;
+			}
+			examine(2,id,certReason);
+			//layer.closeAll();
+		}
+	})
+}
+
+
+
+
+
+function updateStatus(id,status){
+		var htmlStr='<div style="margin: 10px;"><label class="layui-form-label">理由：</label><textarea class="layui-textarea" id="certReason"></textarea></div>';
+	layer.open({
+		type:1,
+		title:'实名认证审核',
+		area: '350px;',
+		shade:1,
+		maxmin:true,
+		content:htmlStr,
+		btn:['通过','不通过'],
+		yes:function(){
+			var certReason = $("#certReason").val();
+			if(status=='1'){
+				Status(2,id,certReason);
+			}else if(status=='3'){
+				Status(4,id,certReason);
+			}
+		},
+		btn2:function(){
+			var certReason = $("#certReason").val();
+			if(StringUtil.isBlank(certReason)){
+				layer.msg('请填写不通过理由');
+				return;
+			}
+			if(status=='1'){
+				Status(5,id,certReason);
+			}else if(status=='3'){
+				Status(6,id,certReason);
+			}
+			
+		}
+	})
+}
+
+function Status(status,id,certReason){
+	$.ajax({
+		url:ctx+'/deviceSignUnbind/updateStatus',
+		data:{
+			"id":id,
+			"status":status,
+			"certReason":certReason,
+		},
+		dataType:'json',
+		type:'post',
+		success:function(res){
+			queryDeviceSignUnbind(pageIndex);
+			layer.msg(res.msg);
+			layer.closeAll();
+		}
+	})
+}
+
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/echarts.js b/pluss-manage-page/src/main/resources/static/resources/js/echarts.js
new file mode 100644
index 0000000..d568900
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/echarts.js
@@ -0,0 +1,63208 @@
+(function webpackUniversalModuleDefinition(root, factory) {
+	if(typeof exports === 'object' && typeof module === 'object')
+		module.exports = factory();
+	else if(typeof define === 'function' && define.amd)
+		define([], factory);
+	else if(typeof exports === 'object')
+		exports["echarts"] = factory();
+	else
+		root["echarts"] = factory();
+})(this, function() {
+return /******/ (function(modules) { // webpackBootstrap
+/******/ 	// The module cache
+/******/ 	var installedModules = {};
+
+/******/ 	// The require function
+/******/ 	function __webpack_require__(moduleId) {
+
+/******/ 		// Check if module is in cache
+/******/ 		if(installedModules[moduleId])
+/******/ 			return installedModules[moduleId].exports;
+
+/******/ 		// Create a new module (and put it into the cache)
+/******/ 		var module = installedModules[moduleId] = {
+/******/ 			exports: {},
+/******/ 			id: moduleId,
+/******/ 			loaded: false
+/******/ 		};
+
+/******/ 		// Execute the module function
+/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
+
+/******/ 		// Flag the module as loaded
+/******/ 		module.loaded = true;
+
+/******/ 		// Return the exports of the module
+/******/ 		return module.exports;
+/******/ 	}
+
+
+/******/ 	// expose the modules object (__webpack_modules__)
+/******/ 	__webpack_require__.m = modules;
+
+/******/ 	// expose the module cache
+/******/ 	__webpack_require__.c = installedModules;
+
+/******/ 	// __webpack_public_path__
+/******/ 	__webpack_require__.p = "";
+
+/******/ 	// Load entry module and return exports
+/******/ 	return __webpack_require__(0);
+/******/ })
+/************************************************************************/
+/******/ ([
+/* 0 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * Export echarts as CommonJS module
+	 */
+	module.exports = __webpack_require__(1);
+
+	// Import all charts and components
+	__webpack_require__(99);
+	__webpack_require__(133);
+	__webpack_require__(138);
+	__webpack_require__(147);
+	__webpack_require__(151);
+
+	__webpack_require__(161);
+	__webpack_require__(182);
+	__webpack_require__(194);
+	__webpack_require__(215);
+	__webpack_require__(219);
+	__webpack_require__(223);
+	__webpack_require__(238);
+	__webpack_require__(244);
+	__webpack_require__(251);
+	__webpack_require__(257);
+	__webpack_require__(261);
+	__webpack_require__(269);
+
+	__webpack_require__(112);
+	__webpack_require__(273);
+	__webpack_require__(279);
+	__webpack_require__(283);
+	__webpack_require__(294);
+	__webpack_require__(224);
+	__webpack_require__(297);
+	__webpack_require__(303);
+
+	__webpack_require__(315);
+
+	__webpack_require__(316);
+	__webpack_require__(329);
+
+	__webpack_require__(344);
+	__webpack_require__(350);
+	__webpack_require__(353);
+
+	__webpack_require__(356);
+	__webpack_require__(365);
+
+	__webpack_require__(378);
+
+
+/***/ },
+/* 1 */
+/***/ function(module, exports, __webpack_require__) {
+
+	// Enable DEV mode when using source code without build. which has no __DEV__ variable
+	// In build process 'typeof __DEV__' will be replace with 'boolean'
+	// So this code will be removed or disabled anyway after built.
+	if (false) {
+	    // In browser
+	    if (typeof window !== 'undefined') {
+	        window.__DEV__ = true;
+	    }
+	    // In node
+	    else if (typeof global !== 'undefined') {
+	        global.__DEV__ = true;
+	    }
+	}
+
+	/*!
+	 * ECharts, a javascript interactive chart library.
+	 *
+	 * Copyright (c) 2015, Baidu Inc.
+	 * All rights reserved.
+	 *
+	 * LICENSE
+	 * https://github.com/ecomfe/echarts/blob/master/LICENSE.txt
+	 */
+
+	/**
+	 * @module echarts
+	 */
+
+
+	    var env = __webpack_require__(2);
+
+	    var GlobalModel = __webpack_require__(3);
+	    var ExtensionAPI = __webpack_require__(25);
+	    var CoordinateSystemManager = __webpack_require__(26);
+	    var OptionManager = __webpack_require__(27);
+
+	    var ComponentModel = __webpack_require__(19);
+	    var SeriesModel = __webpack_require__(28);
+
+	    var ComponentView = __webpack_require__(29);
+	    var ChartView = __webpack_require__(42);
+	    var graphic = __webpack_require__(43);
+
+	    var zrender = __webpack_require__(81);
+	    var zrUtil = __webpack_require__(4);
+	    var colorTool = __webpack_require__(39);
+	    var Eventful = __webpack_require__(33);
+	    var timsort = __webpack_require__(85);
+
+	    var each = zrUtil.each;
+
+	    var PRIORITY_PROCESSOR_FILTER = 1000;
+	    var PRIORITY_PROCESSOR_STATISTIC = 5000;
+
+
+	    var PRIORITY_VISUAL_LAYOUT = 1000;
+	    var PRIORITY_VISUAL_GLOBAL = 2000;
+	    var PRIORITY_VISUAL_CHART = 3000;
+	    var PRIORITY_VISUAL_COMPONENT = 4000;
+	    var PRIORITY_VISUAL_BRUSH = 5000;
+
+	    // Main process have three entries: `setOption`, `dispatchAction` and `resize`,
+	    // where they must not be invoked nestedly, except the only case: invoke
+	    // dispatchAction with updateMethod "none" in main process.
+	    // This flag is used to carry out this rule.
+	    // All events will be triggered out side main process (i.e. when !this[IN_MAIN_PROCESS]).
+	    var IN_MAIN_PROCESS = '__flag_in_main_process';
+	    var HAS_GRADIENT_OR_PATTERN_BG = '_hasGradientOrPatternBg';
+
+	    function createRegisterEventWithLowercaseName(method) {
+	        return function (eventName, handler, context) {
+	            // Event name is all lowercase
+	            eventName = eventName && eventName.toLowerCase();
+	            Eventful.prototype[method].call(this, eventName, handler, context);
+	        };
+	    }
+	    /**
+	     * @module echarts~MessageCenter
+	     */
+	    function MessageCenter() {
+	        Eventful.call(this);
+	    }
+	    MessageCenter.prototype.on = createRegisterEventWithLowercaseName('on');
+	    MessageCenter.prototype.off = createRegisterEventWithLowercaseName('off');
+	    MessageCenter.prototype.one = createRegisterEventWithLowercaseName('one');
+	    zrUtil.mixin(MessageCenter, Eventful);
+	    /**
+	     * @module echarts~ECharts
+	     */
+	    function ECharts (dom, theme, opts) {
+	        opts = opts || {};
+
+	        // Get theme by name
+	        if (typeof theme === 'string') {
+	            theme = themeStorage[theme];
+	        }
+
+	        /**
+	         * @type {string}
+	         */
+	        this.id;
+	        /**
+	         * Group id
+	         * @type {string}
+	         */
+	        this.group;
+	        /**
+	         * @type {HTMLDomElement}
+	         * @private
+	         */
+	        this._dom = dom;
+	        /**
+	         * @type {module:zrender/ZRender}
+	         * @private
+	         */
+	        this._zr = zrender.init(dom, {
+	            renderer: opts.renderer || 'canvas',
+	            devicePixelRatio: opts.devicePixelRatio
+	        });
+
+	        /**
+	         * @type {Object}
+	         * @private
+	         */
+	        this._theme = zrUtil.clone(theme);
+
+	        /**
+	         * @type {Array.<module:echarts/view/Chart>}
+	         * @private
+	         */
+	        this._chartsViews = [];
+
+	        /**
+	         * @type {Object.<string, module:echarts/view/Chart>}
+	         * @private
+	         */
+	        this._chartsMap = {};
+
+	        /**
+	         * @type {Array.<module:echarts/view/Component>}
+	         * @private
+	         */
+	        this._componentsViews = [];
+
+	        /**
+	         * @type {Object.<string, module:echarts/view/Component>}
+	         * @private
+	         */
+	        this._componentsMap = {};
+
+	        /**
+	         * @type {module:echarts/ExtensionAPI}
+	         * @private
+	         */
+	        this._api = new ExtensionAPI(this);
+
+	        /**
+	         * @type {module:echarts/CoordinateSystem}
+	         * @private
+	         */
+	        this._coordSysMgr = new CoordinateSystemManager();
+
+	        Eventful.call(this);
+
+	        /**
+	         * @type {module:echarts~MessageCenter}
+	         * @private
+	         */
+	        this._messageCenter = new MessageCenter();
+
+	        // Init mouse events
+	        this._initEvents();
+
+	        // In case some people write `window.onresize = chart.resize`
+	        this.resize = zrUtil.bind(this.resize, this);
+
+	        // Can't dispatch action during rendering procedure
+	        this._pendingActions = [];
+	        // Sort on demand
+	        function prioritySortFunc(a, b) {
+	            return a.prio - b.prio;
+	        }
+	        timsort(visualFuncs, prioritySortFunc);
+	        timsort(dataProcessorFuncs, prioritySortFunc);
+	    }
+
+	    var echartsProto = ECharts.prototype;
+
+	    /**
+	     * @return {HTMLDomElement}
+	     */
+	    echartsProto.getDom = function () {
+	        return this._dom;
+	    };
+
+	    /**
+	     * @return {module:zrender~ZRender}
+	     */
+	    echartsProto.getZr = function () {
+	        return this._zr;
+	    };
+
+	    /**
+	     * @param {Object} option
+	     * @param {boolean} notMerge
+	     * @param {boolean} [notRefreshImmediately=false] Useful when setOption frequently.
+	     */
+	    echartsProto.setOption = function (option, notMerge, notRefreshImmediately) {
+	        if (true) {
+	            zrUtil.assert(!this[IN_MAIN_PROCESS], '`setOption` should not be called during main process.');
+	        }
+
+	        this[IN_MAIN_PROCESS] = true;
+
+	        if (!this._model || notMerge) {
+	            var optionManager = new OptionManager(this._api);
+	            var theme = this._theme;
+	            var ecModel = this._model = new GlobalModel(null, null, theme, optionManager);
+	            ecModel.init(null, null, theme, optionManager);
+	        }
+
+	        this._model.setOption(option, optionPreprocessorFuncs);
+
+	        updateMethods.prepareAndUpdate.call(this);
+
+	        this[IN_MAIN_PROCESS] = false;
+
+	        this._flushPendingActions();
+
+	        !notRefreshImmediately && this._zr.refreshImmediately();
+	    };
+
+	    /**
+	     * @DEPRECATED
+	     */
+	    echartsProto.setTheme = function () {
+	        console.log('ECharts#setTheme() is DEPRECATED in ECharts 3.0');
+	    };
+
+	    /**
+	     * @return {module:echarts/model/Global}
+	     */
+	    echartsProto.getModel = function () {
+	        return this._model;
+	    };
+
+	    /**
+	     * @return {Object}
+	     */
+	    echartsProto.getOption = function () {
+	        return this._model.getOption();
+	    };
+
+	    /**
+	     * @return {number}
+	     */
+	    echartsProto.getWidth = function () {
+	        return this._zr.getWidth();
+	    };
+
+	    /**
+	     * @return {number}
+	     */
+	    echartsProto.getHeight = function () {
+	        return this._zr.getHeight();
+	    };
+
+	    /**
+	     * Get canvas which has all thing rendered
+	     * @param {Object} opts
+	     * @param {string} [opts.backgroundColor]
+	     */
+	    echartsProto.getRenderedCanvas = function (opts) {
+	        if (!env.canvasSupported) {
+	            return;
+	        }
+	        opts = opts || {};
+	        opts.pixelRatio = opts.pixelRatio || 1;
+	        opts.backgroundColor = opts.backgroundColor
+	            || this._model.get('backgroundColor');
+	        var zr = this._zr;
+	        var list = zr.storage.getDisplayList();
+	        // Stop animations
+	        zrUtil.each(list, function (el) {
+	            el.stopAnimation(true);
+	        });
+	        return zr.painter.getRenderedCanvas(opts);
+	    };
+	    /**
+	     * @return {string}
+	     * @param {Object} opts
+	     * @param {string} [opts.type='png']
+	     * @param {string} [opts.pixelRatio=1]
+	     * @param {string} [opts.backgroundColor]
+	     */
+	    echartsProto.getDataURL = function (opts) {
+	        opts = opts || {};
+	        var excludeComponents = opts.excludeComponents;
+	        var ecModel = this._model;
+	        var excludesComponentViews = [];
+	        var self = this;
+
+	        each(excludeComponents, function (componentType) {
+	            ecModel.eachComponent({
+	                mainType: componentType
+	            }, function (component) {
+	                var view = self._componentsMap[component.__viewId];
+	                if (!view.group.ignore) {
+	                    excludesComponentViews.push(view);
+	                    view.group.ignore = true;
+	                }
+	            });
+	        });
+
+	        var url = this.getRenderedCanvas(opts).toDataURL(
+	            'image/' + (opts && opts.type || 'png')
+	        );
+
+	        each(excludesComponentViews, function (view) {
+	            view.group.ignore = false;
+	        });
+	        return url;
+	    };
+
+
+	    /**
+	     * @return {string}
+	     * @param {Object} opts
+	     * @param {string} [opts.type='png']
+	     * @param {string} [opts.pixelRatio=1]
+	     * @param {string} [opts.backgroundColor]
+	     */
+	    echartsProto.getConnectedDataURL = function (opts) {
+	        if (!env.canvasSupported) {
+	            return;
+	        }
+	        var groupId = this.group;
+	        var mathMin = Math.min;
+	        var mathMax = Math.max;
+	        var MAX_NUMBER = Infinity;
+	        if (connectedGroups[groupId]) {
+	            var left = MAX_NUMBER;
+	            var top = MAX_NUMBER;
+	            var right = -MAX_NUMBER;
+	            var bottom = -MAX_NUMBER;
+	            var canvasList = [];
+	            var dpr = (opts && opts.pixelRatio) || 1;
+	            for (var id in instances) {
+	                var chart = instances[id];
+	                if (chart.group === groupId) {
+	                    var canvas = chart.getRenderedCanvas(
+	                        zrUtil.clone(opts)
+	                    );
+	                    var boundingRect = chart.getDom().getBoundingClientRect();
+	                    left = mathMin(boundingRect.left, left);
+	                    top = mathMin(boundingRect.top, top);
+	                    right = mathMax(boundingRect.right, right);
+	                    bottom = mathMax(boundingRect.bottom, bottom);
+	                    canvasList.push({
+	                        dom: canvas,
+	                        left: boundingRect.left,
+	                        top: boundingRect.top
+	                    });
+	                }
+	            }
+
+	            left *= dpr;
+	            top *= dpr;
+	            right *= dpr;
+	            bottom *= dpr;
+	            var width = right - left;
+	            var height = bottom - top;
+	            var targetCanvas = zrUtil.createCanvas();
+	            targetCanvas.width = width;
+	            targetCanvas.height = height;
+	            var zr = zrender.init(targetCanvas);
+
+	            each(canvasList, function (item) {
+	                var img = new graphic.Image({
+	                    style: {
+	                        x: item.left * dpr - left,
+	                        y: item.top * dpr - top,
+	                        image: item.dom
+	                    }
+	                });
+	                zr.add(img);
+	            });
+	            zr.refreshImmediately();
+
+	            return targetCanvas.toDataURL('image/' + (opts && opts.type || 'png'));
+	        }
+	        else {
+	            return this.getDataURL(opts);
+	        }
+	    };
+
+	    var updateMethods = {
+
+
+	        /**
+	         * @param {Object} payload
+	         * @private
+	         */
+	        update: function (payload) {
+	            // console.time && console.time('update');
+
+	            var ecModel = this._model;
+	            var api = this._api;
+	            var coordSysMgr = this._coordSysMgr;
+	            var zr = this._zr;
+	            // update before setOption
+	            if (!ecModel) {
+	                return;
+	            }
+
+	            // Fixme First time update ?
+	            ecModel.restoreData();
+
+	            // TODO
+	            // Save total ecModel here for undo/redo (after restoring data and before processing data).
+	            // Undo (restoration of total ecModel) can be carried out in 'action' or outside API call.
+
+	            // Create new coordinate system each update
+	            // In LineView may save the old coordinate system and use it to get the orignal point
+	            coordSysMgr.create(this._model, this._api);
+
+	            processData.call(this, ecModel, api);
+
+	            stackSeriesData.call(this, ecModel);
+
+	            coordSysMgr.update(ecModel, api);
+
+	            doVisualEncoding.call(this, ecModel, payload);
+
+	            doRender.call(this, ecModel, payload);
+
+	            // Set background
+	            var backgroundColor = ecModel.get('backgroundColor') || 'transparent';
+
+	            var painter = zr.painter;
+	            // TODO all use clearColor ?
+	            if (painter.isSingleCanvas && painter.isSingleCanvas()) {
+	                zr.configLayer(0, {
+	                    clearColor: backgroundColor
+	                });
+	            }
+	            else {
+	                // In IE8
+	                if (!env.canvasSupported) {
+	                    var colorArr = colorTool.parse(backgroundColor);
+	                    backgroundColor = colorTool.stringify(colorArr, 'rgb');
+	                    if (colorArr[3] === 0) {
+	                        backgroundColor = 'transparent';
+	                    }
+	                }
+	                if (backgroundColor.colorStops || backgroundColor.image) {
+	                    // Gradient background
+	                    // FIXME Fixed layer？
+	                    zr.configLayer(0, {
+	                        clearColor: backgroundColor
+	                    });
+	                    this[HAS_GRADIENT_OR_PATTERN_BG] = true;
+
+	                    this._dom.style.background = 'transparent';
+	                }
+	                else {
+	                    if (this[HAS_GRADIENT_OR_PATTERN_BG]) {
+	                        zr.configLayer(0, {
+	                            clearColor: null
+	                        });
+	                    }
+	                    this[HAS_GRADIENT_OR_PATTERN_BG] = false;
+
+	                    this._dom.style.background = backgroundColor;
+	                }
+	            }
+
+	            // console.time && console.timeEnd('update');
+	        },
+
+	        // PENDING
+	        /**
+	         * @param {Object} payload
+	         * @private
+	         */
+	        updateView: function (payload) {
+	            var ecModel = this._model;
+
+	            // update before setOption
+	            if (!ecModel) {
+	                return;
+	            }
+
+	            ecModel.eachSeries(function (seriesModel) {
+	                seriesModel.getData().clearAllVisual();
+	            });
+
+	            doVisualEncoding.call(this, ecModel, payload);
+
+	            invokeUpdateMethod.call(this, 'updateView', ecModel, payload);
+	        },
+
+	        /**
+	         * @param {Object} payload
+	         * @private
+	         */
+	        updateVisual: function (payload) {
+	            var ecModel = this._model;
+
+	            // update before setOption
+	            if (!ecModel) {
+	                return;
+	            }
+
+	            ecModel.eachSeries(function (seriesModel) {
+	                seriesModel.getData().clearAllVisual();
+	            });
+
+	            doVisualEncoding.call(this, ecModel, payload);
+
+	            invokeUpdateMethod.call(this, 'updateVisual', ecModel, payload);
+	        },
+
+	        /**
+	         * @param {Object} payload
+	         * @private
+	         */
+	        updateLayout: function (payload) {
+	            var ecModel = this._model;
+
+	            // update before setOption
+	            if (!ecModel) {
+	                return;
+	            }
+
+	            doLayout.call(this, ecModel, payload);
+
+	            invokeUpdateMethod.call(this, 'updateLayout', ecModel, payload);
+	        },
+
+	        /**
+	         * @param {Object} payload
+	         * @private
+	         */
+	        highlight: function (payload) {
+	            toggleHighlight.call(this, 'highlight', payload);
+	        },
+
+	        /**
+	         * @param {Object} payload
+	         * @private
+	         */
+	        downplay: function (payload) {
+	            toggleHighlight.call(this, 'downplay', payload);
+	        },
+
+	        /**
+	         * @param {Object} payload
+	         * @private
+	         */
+	        prepareAndUpdate: function (payload) {
+	            var ecModel = this._model;
+
+	            prepareView.call(this, 'component', ecModel);
+
+	            prepareView.call(this, 'chart', ecModel);
+
+	            updateMethods.update.call(this, payload);
+	        }
+	    };
+
+	    /**
+	     * @param {Object} payload
+	     * @private
+	     */
+	    function toggleHighlight(method, payload) {
+	        var ecModel = this._model;
+
+	        // dispatchAction before setOption
+	        if (!ecModel) {
+	            return;
+	        }
+
+	        ecModel.eachComponent(
+	            {mainType: 'series', query: payload},
+	            function (seriesModel, index) {
+	                var chartView = this._chartsMap[seriesModel.__viewId];
+	                if (chartView && chartView.__alive) {
+	                    chartView[method](
+	                        seriesModel, ecModel, this._api, payload
+	                    );
+	                }
+	            },
+	            this
+	        );
+	    }
+
+	    /**
+	     * Resize the chart
+	     */
+	    echartsProto.resize = function () {
+	        if (true) {
+	            zrUtil.assert(!this[IN_MAIN_PROCESS], '`resize` should not be called during main process.');
+	        }
+
+	        this[IN_MAIN_PROCESS] = true;
+
+	        this._zr.resize();
+
+	        var optionChanged = this._model && this._model.resetOption('media');
+	        updateMethods[optionChanged ? 'prepareAndUpdate' : 'update'].call(this);
+
+	        // Resize loading effect
+	        this._loadingFX && this._loadingFX.resize();
+
+	        this[IN_MAIN_PROCESS] = false;
+
+	        this._flushPendingActions();
+	    };
+
+	    var defaultLoadingEffect = __webpack_require__(93);
+	    /**
+	     * Show loading effect
+	     * @param  {string} [name='default']
+	     * @param  {Object} [cfg]
+	     */
+	    echartsProto.showLoading = function (name, cfg) {
+	        if (zrUtil.isObject(name)) {
+	            cfg = name;
+	            name = 'default';
+	        }
+	        this.hideLoading();
+	        var el = defaultLoadingEffect(this._api, cfg);
+	        var zr = this._zr;
+	        this._loadingFX = el;
+
+	        zr.add(el);
+	    };
+
+	    /**
+	     * Hide loading effect
+	     */
+	    echartsProto.hideLoading = function () {
+	        this._loadingFX && this._zr.remove(this._loadingFX);
+	        this._loadingFX = null;
+	    };
+
+	    /**
+	     * @param {Object} eventObj
+	     * @return {Object}
+	     */
+	    echartsProto.makeActionFromEvent = function (eventObj) {
+	        var payload = zrUtil.extend({}, eventObj);
+	        payload.type = eventActionMap[eventObj.type];
+	        return payload;
+	    };
+
+	    /**
+	     * @pubilc
+	     * @param {Object} payload
+	     * @param {string} [payload.type] Action type
+	     * @param {boolean} [silent=false] Whether trigger event.
+	     */
+	    echartsProto.dispatchAction = function (payload, silent) {
+	        var actionWrap = actions[payload.type];
+	        if (!actionWrap) {
+	            return;
+	        }
+
+	        var actionInfo = actionWrap.actionInfo;
+	        var updateMethod = actionInfo.update || 'update';
+
+	        // if (__DEV__) {
+	        //     zrUtil.assert(
+	        //         !this[IN_MAIN_PROCESS],
+	        //         '`dispatchAction` should not be called during main process.'
+	        //         + 'unless updateMathod is "none".'
+	        //     );
+	        // }
+
+	        // May dispatchAction in rendering procedure
+	        if (this[IN_MAIN_PROCESS]) {
+	            this._pendingActions.push(payload);
+	            return;
+	        }
+
+	        this[IN_MAIN_PROCESS] = true;
+
+	        var payloads = [payload];
+	        var batched = false;
+	        // Batch action
+	        if (payload.batch) {
+	            batched = true;
+	            payloads = zrUtil.map(payload.batch, function (item) {
+	                item = zrUtil.defaults(zrUtil.extend({}, item), payload);
+	                item.batch = null;
+	                return item;
+	            });
+	        }
+
+	        var eventObjBatch = [];
+	        var eventObj;
+	        var isHighlightOrDownplay = payload.type === 'highlight' || payload.type === 'downplay';
+	        for (var i = 0; i < payloads.length; i++) {
+	            var batchItem = payloads[i];
+	            // Action can specify the event by return it.
+	            eventObj = actionWrap.action(batchItem, this._model);
+	            // Emit event outside
+	            eventObj = eventObj || zrUtil.extend({}, batchItem);
+	            // Convert type to eventType
+	            eventObj.type = actionInfo.event || eventObj.type;
+	            eventObjBatch.push(eventObj);
+
+	            // Highlight and downplay are special.
+	            isHighlightOrDownplay && updateMethods[updateMethod].call(this, batchItem);
+	        }
+
+	        (updateMethod !== 'none' && !isHighlightOrDownplay)
+	            && updateMethods[updateMethod].call(this, payload);
+
+	        // Follow the rule of action batch
+	        if (batched) {
+	            eventObj = {
+	                type: actionInfo.event || payload.type,
+	                batch: eventObjBatch
+	            };
+	        }
+	        else {
+	            eventObj = eventObjBatch[0];
+	        }
+
+	        this[IN_MAIN_PROCESS] = false;
+
+	        !silent && this._messageCenter.trigger(eventObj.type, eventObj);
+
+	        this._flushPendingActions();
+
+	    };
+
+	    echartsProto._flushPendingActions = function () {
+	        var pendingActions = this._pendingActions;
+	        while (pendingActions.length) {
+	            var payload = pendingActions.shift();
+	            this.dispatchAction(payload);
+	        }
+	    };
+
+	    /**
+	     * Register event
+	     * @method
+	     */
+	    echartsProto.on = createRegisterEventWithLowercaseName('on');
+	    echartsProto.off = createRegisterEventWithLowercaseName('off');
+	    echartsProto.one = createRegisterEventWithLowercaseName('one');
+
+	    /**
+	     * @param {string} methodName
+	     * @private
+	     */
+	    function invokeUpdateMethod(methodName, ecModel, payload) {
+	        var api = this._api;
+
+	        // Update all components
+	        each(this._componentsViews, function (component) {
+	            var componentModel = component.__model;
+	            component[methodName](componentModel, ecModel, api, payload);
+
+	            updateZ(componentModel, component);
+	        }, this);
+
+	        // Upate all charts
+	        ecModel.eachSeries(function (seriesModel, idx) {
+	            var chart = this._chartsMap[seriesModel.__viewId];
+	            chart[methodName](seriesModel, ecModel, api, payload);
+
+	            updateZ(seriesModel, chart);
+
+	            updateProgressiveAndBlend(seriesModel, chart);
+	        }, this);
+
+	        // If use hover layer
+	        updateHoverLayerStatus(this._zr, ecModel);
+	    }
+
+	    /**
+	     * Prepare view instances of charts and components
+	     * @param  {module:echarts/model/Global} ecModel
+	     * @private
+	     */
+	    function prepareView(type, ecModel) {
+	        var isComponent = type === 'component';
+	        var viewList = isComponent ? this._componentsViews : this._chartsViews;
+	        var viewMap = isComponent ? this._componentsMap : this._chartsMap;
+	        var zr = this._zr;
+
+	        for (var i = 0; i < viewList.length; i++) {
+	            viewList[i].__alive = false;
+	        }
+
+	        ecModel[isComponent ? 'eachComponent' : 'eachSeries'](function (componentType, model) {
+	            if (isComponent) {
+	                if (componentType === 'series') {
+	                    return;
+	                }
+	            }
+	            else {
+	                model = componentType;
+	            }
+
+	            // Consider: id same and type changed.
+	            var viewId = model.id + '_' + model.type;
+	            var view = viewMap[viewId];
+	            if (!view) {
+	                var classType = ComponentModel.parseClassType(model.type);
+	                var Clazz = isComponent
+	                    ? ComponentView.getClass(classType.main, classType.sub)
+	                    : ChartView.getClass(classType.sub);
+	                if (Clazz) {
+	                    view = new Clazz();
+	                    view.init(ecModel, this._api);
+	                    viewMap[viewId] = view;
+	                    viewList.push(view);
+	                    zr.add(view.group);
+	                }
+	                else {
+	                    // Error
+	                    return;
+	                }
+	            }
+
+	            model.__viewId = viewId;
+	            view.__alive = true;
+	            view.__id = viewId;
+	            view.__model = model;
+	        }, this);
+
+	        for (var i = 0; i < viewList.length;) {
+	            var view = viewList[i];
+	            if (!view.__alive) {
+	                zr.remove(view.group);
+	                view.dispose(ecModel, this._api);
+	                viewList.splice(i, 1);
+	                delete viewMap[view.__id];
+	            }
+	            else {
+	                i++;
+	            }
+	        }
+	    }
+
+	    /**
+	     * Processor data in each series
+	     *
+	     * @param {module:echarts/model/Global} ecModel
+	     * @private
+	     */
+	    function processData(ecModel, api) {
+	        each(dataProcessorFuncs, function (process) {
+	            process.func(ecModel, api);
+	        });
+	    }
+
+	    /**
+	     * @private
+	     */
+	    function stackSeriesData(ecModel) {
+	        var stackedDataMap = {};
+	        ecModel.eachSeries(function (series) {
+	            var stack = series.get('stack');
+	            var data = series.getData();
+	            if (stack && data.type === 'list') {
+	                var previousStack = stackedDataMap[stack];
+	                if (previousStack) {
+	                    data.stackedOn = previousStack;
+	                }
+	                stackedDataMap[stack] = data;
+	            }
+	        });
+	    }
+
+	    /**
+	     * Layout before each chart render there series, special visual encoding stage
+	     *
+	     * @param {module:echarts/model/Global} ecModel
+	     * @private
+	     */
+	    function doLayout(ecModel, payload) {
+	        var api = this._api;
+	        each(visualFuncs, function (visual) {
+	            if (visual.isLayout) {
+	                visual.func(ecModel, api, payload);
+	            }
+	        });
+	    }
+
+	    /**
+	     * Encode visual infomation from data after data processing
+	     *
+	     * @param {module:echarts/model/Global} ecModel
+	     * @private
+	     */
+	    function doVisualEncoding(ecModel, payload) {
+	        var api = this._api;
+	        ecModel.clearColorPalette();
+	        ecModel.eachSeries(function (seriesModel) {
+	            seriesModel.clearColorPalette();
+	        });
+	        each(visualFuncs, function (visual) {
+	            visual.func(ecModel, api, payload);
+	        });
+	    }
+
+	    /**
+	     * Render each chart and component
+	     * @private
+	     */
+	    function doRender(ecModel, payload) {
+	        var api = this._api;
+	        // Render all components
+	        each(this._componentsViews, function (componentView) {
+	            var componentModel = componentView.__model;
+	            componentView.render(componentModel, ecModel, api, payload);
+
+	            updateZ(componentModel, componentView);
+	        }, this);
+
+	        each(this._chartsViews, function (chart) {
+	            chart.__alive = false;
+	        }, this);
+
+	        // Render all charts
+	        ecModel.eachSeries(function (seriesModel, idx) {
+	            var chartView = this._chartsMap[seriesModel.__viewId];
+	            chartView.__alive = true;
+	            chartView.render(seriesModel, ecModel, api, payload);
+
+	            chartView.group.silent = !!seriesModel.get('silent');
+
+	            updateZ(seriesModel, chartView);
+
+	            updateProgressiveAndBlend(seriesModel, chartView);
+
+	        }, this);
+
+	        // If use hover layer
+	        updateHoverLayerStatus(this._zr, ecModel);
+
+	        // Remove groups of unrendered charts
+	        each(this._chartsViews, function (chart) {
+	            if (!chart.__alive) {
+	                chart.remove(ecModel, api);
+	            }
+	        }, this);
+	    }
+
+	    var MOUSE_EVENT_NAMES = [
+	        'click', 'dblclick', 'mouseover', 'mouseout', 'mousedown', 'mouseup', 'globalout'
+	    ];
+	    /**
+	     * @private
+	     */
+	    echartsProto._initEvents = function () {
+	        each(MOUSE_EVENT_NAMES, function (eveName) {
+	            this._zr.on(eveName, function (e) {
+	                var ecModel = this.getModel();
+	                var el = e.target;
+	                if (el && el.dataIndex != null) {
+	                    var dataModel = el.dataModel || ecModel.getSeriesByIndex(el.seriesIndex);
+	                    var params = dataModel && dataModel.getDataParams(el.dataIndex, el.dataType) || {};
+	                    params.event = e;
+	                    params.type = eveName;
+	                    this.trigger(eveName, params);
+	                }
+	                // If element has custom eventData of components
+	                else if (el && el.eventData) {
+	                    this.trigger(eveName, el.eventData);
+	                }
+	            }, this);
+	        }, this);
+
+	        each(eventActionMap, function (actionType, eventType) {
+	            this._messageCenter.on(eventType, function (event) {
+	                this.trigger(eventType, event);
+	            }, this);
+	        }, this);
+	    };
+
+	    /**
+	     * @return {boolean}
+	     */
+	    echartsProto.isDisposed = function () {
+	        return this._disposed;
+	    };
+
+	    /**
+	     * Clear
+	     */
+	    echartsProto.clear = function () {
+	        this.setOption({}, true);
+	    };
+	    /**
+	     * Dispose instance
+	     */
+	    echartsProto.dispose = function () {
+	        if (this._disposed) {
+	            if (true) {
+	                console.warn('Instance ' + this.id + ' has been disposed');
+	            }
+	            return;
+	        }
+	        this._disposed = true;
+
+	        var api = this._api;
+	        var ecModel = this._model;
+
+	        each(this._componentsViews, function (component) {
+	            component.dispose(ecModel, api);
+	        });
+	        each(this._chartsViews, function (chart) {
+	            chart.dispose(ecModel, api);
+	        });
+
+	        // Dispose after all views disposed
+	        this._zr.dispose();
+
+	        delete instances[this.id];
+	    };
+
+	    zrUtil.mixin(ECharts, Eventful);
+
+	    function updateHoverLayerStatus(zr, ecModel) {
+	        var storage = zr.storage;
+	        var elCount = 0;
+	        storage.traverse(function (el) {
+	            if (!el.isGroup) {
+	                elCount++;
+	            }
+	        });
+	        if (elCount > ecModel.get('hoverLayerThreshold') && !env.node) {
+	            storage.traverse(function (el) {
+	                if (!el.isGroup) {
+	                    el.useHoverLayer = true;
+	                }
+	            });
+	        }
+	    }
+	    /**
+	     * Update chart progressive and blend.
+	     * @param {module:echarts/model/Series|module:echarts/model/Component} model
+	     * @param {module:echarts/view/Component|module:echarts/view/Chart} view
+	     */
+	    function updateProgressiveAndBlend(seriesModel, chartView) {
+	        // Progressive configuration
+	        var elCount = 0;
+	        chartView.group.traverse(function (el) {
+	            if (el.type !== 'group' && !el.ignore) {
+	                elCount++;
+	            }
+	        });
+	        var frameDrawNum = +seriesModel.get('progressive');
+	        var needProgressive = elCount > seriesModel.get('progressiveThreshold') && frameDrawNum && !env.node;
+	        if (needProgressive) {
+	            chartView.group.traverse(function (el) {
+	                // FIXME marker and other components
+	                if (!el.isGroup) {
+	                    el.progressive = needProgressive ?
+	                        Math.floor(elCount++ / frameDrawNum) : -1;
+	                    if (needProgressive) {
+	                        el.stopAnimation(true);
+	                    }
+	                }
+	            });
+	        }
+
+	        // Blend configration
+	        var blendMode = seriesModel.get('blendMode') || null;
+	        if (true) {
+	            if (!env.canvasSupported && blendMode && blendMode !== 'source-over') {
+	                console.warn('Only canvas support blendMode');
+	            }
+	        }
+	        chartView.group.traverse(function (el) {
+	            // FIXME marker and other components
+	            if (!el.isGroup) {
+	                el.setStyle('blend', blendMode);
+	            }
+	        });
+	    }
+	    /**
+	     * @param {module:echarts/model/Series|module:echarts/model/Component} model
+	     * @param {module:echarts/view/Component|module:echarts/view/Chart} view
+	     */
+	    function updateZ(model, view) {
+	        var z = model.get('z');
+	        var zlevel = model.get('zlevel');
+	        // Set z and zlevel
+	        view.group.traverse(function (el) {
+	            if (el.type !== 'group') {
+	                z != null && (el.z = z);
+	                zlevel != null && (el.zlevel = zlevel);
+	            }
+	        });
+	    }
+	    /**
+	     * @type {Array.<Function>}
+	     * @inner
+	     */
+	    var actions = [];
+
+	    /**
+	     * Map eventType to actionType
+	     * @type {Object}
+	     */
+	    var eventActionMap = {};
+
+	    /**
+	     * Data processor functions of each stage
+	     * @type {Array.<Object.<string, Function>>}
+	     * @inner
+	     */
+	    var dataProcessorFuncs = [];
+
+	    /**
+	     * @type {Array.<Function>}
+	     * @inner
+	     */
+	    var optionPreprocessorFuncs = [];
+
+	    /**
+	     * Visual encoding functions of each stage
+	     * @type {Array.<Object.<string, Function>>}
+	     * @inner
+	     */
+	    var visualFuncs = [];
+	    /**
+	     * Theme storage
+	     * @type {Object.<key, Object>}
+	     */
+	    var themeStorage = {};
+
+
+	    var instances = {};
+	    var connectedGroups = {};
+
+	    var idBase = new Date() - 0;
+	    var groupIdBase = new Date() - 0;
+	    var DOM_ATTRIBUTE_KEY = '_echarts_instance_';
+	    /**
+	     * @alias module:echarts
+	     */
+	    var echarts = {
+	        /**
+	         * @type {number}
+	         */
+	        version: '3.2.2',
+	        dependencies: {
+	            zrender: '3.1.2'
+	        }
+	    };
+
+	    function enableConnect(chart) {
+
+	        var STATUS_PENDING = 0;
+	        var STATUS_UPDATING = 1;
+	        var STATUS_UPDATED = 2;
+	        var STATUS_KEY = '__connectUpdateStatus';
+	        function updateConnectedChartsStatus(charts, status) {
+	            for (var i = 0; i < charts.length; i++) {
+	                var otherChart = charts[i];
+	                otherChart[STATUS_KEY] = status;
+	            }
+	        }
+	        zrUtil.each(eventActionMap, function (actionType, eventType) {
+	            chart._messageCenter.on(eventType, function (event) {
+	                if (connectedGroups[chart.group] && chart[STATUS_KEY] !== STATUS_PENDING) {
+	                    var action = chart.makeActionFromEvent(event);
+	                    var otherCharts = [];
+	                    for (var id in instances) {
+	                        var otherChart = instances[id];
+	                        if (otherChart !== chart && otherChart.group === chart.group) {
+	                            otherCharts.push(otherChart);
+	                        }
+	                    }
+	                    updateConnectedChartsStatus(otherCharts, STATUS_PENDING);
+	                    each(otherCharts, function (otherChart) {
+	                        if (otherChart[STATUS_KEY] !== STATUS_UPDATING) {
+	                            otherChart.dispatchAction(action);
+	                        }
+	                    });
+	                    updateConnectedChartsStatus(otherCharts, STATUS_UPDATED);
+	                }
+	            });
+	        });
+
+	    }
+	    /**
+	     * @param {HTMLDomElement} dom
+	     * @param {Object} [theme]
+	     * @param {Object} opts
+	     */
+	    echarts.init = function (dom, theme, opts) {
+	        if (true) {
+	            // Check version
+	            if ((zrender.version.replace('.', '') - 0) < (echarts.dependencies.zrender.replace('.', '') - 0)) {
+	                throw new Error(
+	                    'ZRender ' + zrender.version
+	                    + ' is too old for ECharts ' + echarts.version
+	                    + '. Current version need ZRender '
+	                    + echarts.dependencies.zrender + '+'
+	                );
+	            }
+	            if (!dom) {
+	                throw new Error('Initialize failed: invalid dom.');
+	            }
+	            if (zrUtil.isDom(dom) && dom.nodeName.toUpperCase() !== 'CANVAS' && (!dom.clientWidth || !dom.clientHeight)) {
+	                console.warn('Can\'t get dom width or height');
+	            }
+	        }
+
+	        var chart = new ECharts(dom, theme, opts);
+	        chart.id = 'ec_' + idBase++;
+	        instances[chart.id] = chart;
+
+	        dom.setAttribute &&
+	            dom.setAttribute(DOM_ATTRIBUTE_KEY, chart.id);
+
+	        enableConnect(chart);
+
+	        return chart;
+	    };
+
+	    /**
+	     * @return {string|Array.<module:echarts~ECharts>} groupId
+	     */
+	    echarts.connect = function (groupId) {
+	        // Is array of charts
+	        if (zrUtil.isArray(groupId)) {
+	            var charts = groupId;
+	            groupId = null;
+	            // If any chart has group
+	            zrUtil.each(charts, function (chart) {
+	                if (chart.group != null) {
+	                    groupId = chart.group;
+	                }
+	            });
+	            groupId = groupId || ('g_' + groupIdBase++);
+	            zrUtil.each(charts, function (chart) {
+	                chart.group = groupId;
+	            });
+	        }
+	        connectedGroups[groupId] = true;
+	        return groupId;
+	    };
+
+	    /**
+	     * @return {string} groupId
+	     */
+	    echarts.disConnect = function (groupId) {
+	        connectedGroups[groupId] = false;
+	    };
+
+	    /**
+	     * Dispose a chart instance
+	     * @param  {module:echarts~ECharts|HTMLDomElement|string} chart
+	     */
+	    echarts.dispose = function (chart) {
+	        if (zrUtil.isDom(chart)) {
+	            chart = echarts.getInstanceByDom(chart);
+	        }
+	        else if (typeof chart === 'string') {
+	            chart = instances[chart];
+	        }
+	        if ((chart instanceof ECharts) && !chart.isDisposed()) {
+	            chart.dispose();
+	        }
+	    };
+
+	    /**
+	     * @param  {HTMLDomElement} dom
+	     * @return {echarts~ECharts}
+	     */
+	    echarts.getInstanceByDom = function (dom) {
+	        var key = dom.getAttribute(DOM_ATTRIBUTE_KEY);
+	        return instances[key];
+	    };
+	    /**
+	     * @param {string} key
+	     * @return {echarts~ECharts}
+	     */
+	    echarts.getInstanceById = function (key) {
+	        return instances[key];
+	    };
+
+	    /**
+	     * Register theme
+	     */
+	    echarts.registerTheme = function (name, theme) {
+	        themeStorage[name] = theme;
+	    };
+
+	    /**
+	     * Register option preprocessor
+	     * @param {Function} preprocessorFunc
+	     */
+	    echarts.registerPreprocessor = function (preprocessorFunc) {
+	        optionPreprocessorFuncs.push(preprocessorFunc);
+	    };
+
+	    /**
+	     * @param {number} [priority=1000]
+	     * @param {Function} processorFunc
+	     */
+	    echarts.registerProcessor = function (priority, processorFunc) {
+	        if (typeof priority === 'function') {
+	            processorFunc = priority;
+	            priority = PRIORITY_PROCESSOR_FILTER;
+	        }
+	        if (true) {
+	            if (isNaN(priority)) {
+	                throw new Error('Unkown processor priority');
+	            }
+	        }
+	        dataProcessorFuncs.push({
+	            prio: priority,
+	            func: processorFunc
+	        });
+	    };
+
+	    /**
+	     * Usage:
+	     * registerAction('someAction', 'someEvent', function () { ... });
+	     * registerAction('someAction', function () { ... });
+	     * registerAction(
+	     *     {type: 'someAction', event: 'someEvent', update: 'updateView'},
+	     *     function () { ... }
+	     * );
+	     *
+	     * @param {(string|Object)} actionInfo
+	     * @param {string} actionInfo.type
+	     * @param {string} [actionInfo.event]
+	     * @param {string} [actionInfo.update]
+	     * @param {string} [eventName]
+	     * @param {Function} action
+	     */
+	    echarts.registerAction = function (actionInfo, eventName, action) {
+	        if (typeof eventName === 'function') {
+	            action = eventName;
+	            eventName = '';
+	        }
+	        var actionType = zrUtil.isObject(actionInfo)
+	            ? actionInfo.type
+	            : ([actionInfo, actionInfo = {
+	                event: eventName
+	            }][0]);
+
+	        // Event name is all lowercase
+	        actionInfo.event = (actionInfo.event || actionType).toLowerCase();
+	        eventName = actionInfo.event;
+
+	        if (!actions[actionType]) {
+	            actions[actionType] = {action: action, actionInfo: actionInfo};
+	        }
+	        eventActionMap[eventName] = actionType;
+	    };
+
+	    /**
+	     * @param {string} type
+	     * @param {*} CoordinateSystem
+	     */
+	    echarts.registerCoordinateSystem = function (type, CoordinateSystem) {
+	        CoordinateSystemManager.register(type, CoordinateSystem);
+	    };
+
+	    /**
+	     * Layout is a special stage of visual encoding
+	     * Most visual encoding like color are common for different chart
+	     * But each chart has it's own layout algorithm
+	     *
+	     * @param {string} [priority=1000]
+	     * @param {Function} layoutFunc
+	     */
+	    echarts.registerLayout = function (priority, layoutFunc) {
+	        if (typeof priority === 'function') {
+	            layoutFunc = priority;
+	            priority = PRIORITY_VISUAL_LAYOUT;
+	        }
+	        if (true) {
+	            if (isNaN(priority)) {
+	                throw new Error('Unkown layout priority');
+	            }
+	        }
+	        visualFuncs.push({
+	            prio: priority,
+	            func: layoutFunc,
+	            isLayout: true
+	        });
+	    };
+
+	    /**
+	     * @param {string} [priority=3000]
+	     * @param {Function} visualFunc
+	     */
+	    echarts.registerVisual = function (priority, visualFunc) {
+	        if (typeof priority === 'function') {
+	            visualFunc = priority;
+	            priority = PRIORITY_VISUAL_CHART;
+	        }
+	        if (true) {
+	            if (isNaN(priority)) {
+	                throw new Error('Unkown visual priority');
+	            }
+	        }
+	        visualFuncs.push({
+	            prio: priority,
+	            func: visualFunc
+	        });
+	    };
+
+	    var parseClassType = ComponentModel.parseClassType;
+	    /**
+	     * @param {Object} opts
+	     * @param {string} [superClass]
+	     */
+	    echarts.extendComponentModel = function (opts, superClass) {
+	        var Clazz = ComponentModel;
+	        if (superClass) {
+	            var classType = parseClassType(superClass);
+	            Clazz = ComponentModel.getClass(classType.main, classType.sub, true);
+	        }
+	        return Clazz.extend(opts);
+	    };
+
+	    /**
+	     * @param {Object} opts
+	     * @param {string} [superClass]
+	     */
+	    echarts.extendComponentView = function (opts, superClass) {
+	        var Clazz = ComponentView;
+	        if (superClass) {
+	            var classType = parseClassType(superClass);
+	            Clazz = ComponentView.getClass(classType.main, classType.sub, true);
+	        }
+	        return Clazz.extend(opts);
+	    };
+
+	    /**
+	     * @param {Object} opts
+	     * @param {string} [superClass]
+	     */
+	    echarts.extendSeriesModel = function (opts, superClass) {
+	        var Clazz = SeriesModel;
+	        if (superClass) {
+	            superClass = 'series.' + superClass.replace('series.', '');
+	            var classType = parseClassType(superClass);
+	            Clazz = SeriesModel.getClass(classType.main, classType.sub, true);
+	        }
+	        return Clazz.extend(opts);
+	    };
+
+	    /**
+	     * @param {Object} opts
+	     * @param {string} [superClass]
+	     */
+	    echarts.extendChartView = function (opts, superClass) {
+	        var Clazz = ChartView;
+	        if (superClass) {
+	            superClass.replace('series.', '');
+	            var classType = parseClassType(superClass);
+	            Clazz = ChartView.getClass(classType.main, true);
+	        }
+	        return ChartView.extend(opts);
+	    };
+
+	    /**
+	     * ZRender need a canvas context to do measureText.
+	     * But in node environment canvas may be created by node-canvas.
+	     * So we need to specify how to create a canvas instead of using document.createElement('canvas')
+	     *
+	     * Be careful of using it in the browser.
+	     *
+	     * @param {Function} creator
+	     * @example
+	     *     var Canvas = require('canvas');
+	     *     var echarts = require('echarts');
+	     *     echarts.setCanvasCreator(function () {
+	     *         // Small size is enough.
+	     *         return new Canvas(32, 32);
+	     *     });
+	     */
+	    echarts.setCanvasCreator = function (creator) {
+	        zrUtil.createCanvas = creator;
+	    };
+
+	    echarts.registerVisual(PRIORITY_VISUAL_GLOBAL, __webpack_require__(94));
+	    echarts.registerPreprocessor(__webpack_require__(95));
+
+	    // Default action
+	    echarts.registerAction({
+	        type: 'highlight',
+	        event: 'highlight',
+	        update: 'highlight'
+	    }, zrUtil.noop);
+	    echarts.registerAction({
+	        type: 'downplay',
+	        event: 'downplay',
+	        update: 'downplay'
+	    }, zrUtil.noop);
+
+
+	    // --------
+	    // Exports
+	    // --------
+	    //
+	    echarts.List = __webpack_require__(97);
+	    echarts.Model = __webpack_require__(12);
+
+	    echarts.graphic = __webpack_require__(43);
+	    echarts.number = __webpack_require__(7);
+	    echarts.format = __webpack_require__(6);
+	    echarts.matrix = __webpack_require__(11);
+	    echarts.vector = __webpack_require__(10);
+	    echarts.color = __webpack_require__(39);
+
+	    echarts.util = {};
+	    each([
+	            'map', 'each', 'filter', 'indexOf', 'inherits',
+	            'reduce', 'filter', 'bind', 'curry', 'isArray',
+	            'isString', 'isObject', 'isFunction', 'extend', 'defaults'
+	        ],
+	        function (name) {
+	            echarts.util[name] = zrUtil[name];
+	        }
+	    );
+
+	    // PRIORITY
+	    echarts.PRIORITY = {
+	        PROCESSOR: {
+	            FILTER: PRIORITY_PROCESSOR_FILTER,
+	            STATISTIC: PRIORITY_PROCESSOR_STATISTIC
+	        },
+	        VISUAL: {
+	            LAYOUT: PRIORITY_VISUAL_LAYOUT,
+	            GLOBAL: PRIORITY_VISUAL_GLOBAL,
+	            CHART: PRIORITY_VISUAL_CHART,
+	            COMPONENT: PRIORITY_VISUAL_COMPONENT,
+	            BRUSH: PRIORITY_VISUAL_BRUSH
+	        }
+	    };
+
+	    module.exports = echarts;
+
+
+/***/ },
+/* 2 */
+/***/ function(module, exports) {
+
+	/**
+	 * echarts设备环境识别
+	 *
+	 * @desc echarts基于Canvas，纯Javascript图表库，提供直观，生动，可交互，可个性化定制的数据统计图表。
+	 * @author firede[firede@firede.us]
+	 * @desc thanks zepto.
+	 */
+
+	    var env = {};
+	    if (typeof navigator === 'undefined') {
+	        // In node
+	        env = {
+	            browser: {},
+	            os: {},
+	            node: true,
+	            // Assume canvas is supported
+	            canvasSupported: true
+	        };
+	    }
+	    else {
+	        env = detect(navigator.userAgent);
+	    }
+
+	    module.exports = env;
+
+	    // Zepto.js
+	    // (c) 2010-2013 Thomas Fuchs
+	    // Zepto.js may be freely distributed under the MIT license.
+
+	    function detect(ua) {
+	        var os = {};
+	        var browser = {};
+	        // var webkit = ua.match(/Web[kK]it[\/]{0,1}([\d.]+)/);
+	        // var android = ua.match(/(Android);?[\s\/]+([\d.]+)?/);
+	        // var ipad = ua.match(/(iPad).*OS\s([\d_]+)/);
+	        // var ipod = ua.match(/(iPod)(.*OS\s([\d_]+))?/);
+	        // var iphone = !ipad && ua.match(/(iPhone\sOS)\s([\d_]+)/);
+	        // var webos = ua.match(/(webOS|hpwOS)[\s\/]([\d.]+)/);
+	        // var touchpad = webos && ua.match(/TouchPad/);
+	        // var kindle = ua.match(/Kindle\/([\d.]+)/);
+	        // var silk = ua.match(/Silk\/([\d._]+)/);
+	        // var blackberry = ua.match(/(BlackBerry).*Version\/([\d.]+)/);
+	        // var bb10 = ua.match(/(BB10).*Version\/([\d.]+)/);
+	        // var rimtabletos = ua.match(/(RIM\sTablet\sOS)\s([\d.]+)/);
+	        // var playbook = ua.match(/PlayBook/);
+	        // var chrome = ua.match(/Chrome\/([\d.]+)/) || ua.match(/CriOS\/([\d.]+)/);
+	        var firefox = ua.match(/Firefox\/([\d.]+)/);
+	        // var safari = webkit && ua.match(/Mobile\//) && !chrome;
+	        // var webview = ua.match(/(iPhone|iPod|iPad).*AppleWebKit(?!.*Safari)/) && !chrome;
+	        var ie = ua.match(/MSIE\s([\d.]+)/)
+	            // IE 11 Trident/7.0; rv:11.0
+	            || ua.match(/Trident\/.+?rv:(([\d.]+))/);
+	        var edge = ua.match(/Edge\/([\d.]+)/); // IE 12 and 12+
+
+	        // Todo: clean this up with a better OS/browser seperation:
+	        // - discern (more) between multiple browsers on android
+	        // - decide if kindle fire in silk mode is android or not
+	        // - Firefox on Android doesn't specify the Android version
+	        // - possibly devide in os, device and browser hashes
+
+	        // if (browser.webkit = !!webkit) browser.version = webkit[1];
+
+	        // if (android) os.android = true, os.version = android[2];
+	        // if (iphone && !ipod) os.ios = os.iphone = true, os.version = iphone[2].replace(/_/g, '.');
+	        // if (ipad) os.ios = os.ipad = true, os.version = ipad[2].replace(/_/g, '.');
+	        // if (ipod) os.ios = os.ipod = true, os.version = ipod[3] ? ipod[3].replace(/_/g, '.') : null;
+	        // if (webos) os.webos = true, os.version = webos[2];
+	        // if (touchpad) os.touchpad = true;
+	        // if (blackberry) os.blackberry = true, os.version = blackberry[2];
+	        // if (bb10) os.bb10 = true, os.version = bb10[2];
+	        // if (rimtabletos) os.rimtabletos = true, os.version = rimtabletos[2];
+	        // if (playbook) browser.playbook = true;
+	        // if (kindle) os.kindle = true, os.version = kindle[1];
+	        // if (silk) browser.silk = true, browser.version = silk[1];
+	        // if (!silk && os.android && ua.match(/Kindle Fire/)) browser.silk = true;
+	        // if (chrome) browser.chrome = true, browser.version = chrome[1];
+	        if (firefox) browser.firefox = true, browser.version = firefox[1];
+	        // if (safari && (ua.match(/Safari/) || !!os.ios)) browser.safari = true;
+	        // if (webview) browser.webview = true;
+	        if (ie) {
+	            browser.ie = true; browser.version = ie[1];
+	        }
+	        if (ie) {
+	            browser.ie = true;
+	            browser.version = ie[1];
+	        }
+	        if (edge) {
+	            browser.edge = true;
+	            browser.version = edge[1];
+	        }
+
+	        // os.tablet = !!(ipad || playbook || (android && !ua.match(/Mobile/)) ||
+	        //     (firefox && ua.match(/Tablet/)) || (ie && !ua.match(/Phone/) && ua.match(/Touch/)));
+	        // os.phone  = !!(!os.tablet && !os.ipod && (android || iphone || webos ||
+	        //     (chrome && ua.match(/Android/)) || (chrome && ua.match(/CriOS\/([\d.]+)/)) ||
+	        //     (firefox && ua.match(/Mobile/)) || (ie && ua.match(/Touch/))));
+
+	        return {
+	            browser: browser,
+	            os: os,
+	            node: false,
+	            // 原生canvas支持，改极端点了
+	            // canvasSupported : !(browser.ie && parseFloat(browser.version) < 9)
+	            canvasSupported : document.createElement('canvas').getContext ? true : false,
+	            // @see <http://stackoverflow.com/questions/4817029/whats-the-best-way-to-detect-a-touch-screen-device-using-javascript>
+	            // works on most browsers
+	            // IE10/11 does not support touch event, and MS Edge supports them but not by
+	            // default, so we dont check navigator.maxTouchPoints for them here.
+	            touchEventsSupported: 'ontouchstart' in window && !browser.ie && !browser.edge,
+	            // <http://caniuse.com/#search=pointer%20event>.
+	            pointerEventsSupported: 'onpointerdown' in window
+	                // Firefox supports pointer but not by default,
+	                // only MS browsers are reliable on pointer events currently.
+	                && (browser.edge || (browser.ie && browser.version >= 10))
+	        };
+	    }
+
+
+/***/ },
+/* 3 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * ECharts global model
+	 *
+	 * @module {echarts/model/Global}
+	 *
+	 */
+
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var modelUtil = __webpack_require__(5);
+	    var Model = __webpack_require__(12);
+	    var each = zrUtil.each;
+	    var filter = zrUtil.filter;
+	    var map = zrUtil.map;
+	    var isArray = zrUtil.isArray;
+	    var indexOf = zrUtil.indexOf;
+	    var isObject = zrUtil.isObject;
+
+	    var ComponentModel = __webpack_require__(19);
+
+	    var globalDefault = __webpack_require__(23);
+
+	    var OPTION_INNER_KEY = '\0_ec_inner';
+
+	    /**
+	     * @alias module:echarts/model/Global
+	     *
+	     * @param {Object} option
+	     * @param {module:echarts/model/Model} parentModel
+	     * @param {Object} theme
+	     */
+	    var GlobalModel = Model.extend({
+
+	        constructor: GlobalModel,
+
+	        init: function (option, parentModel, theme, optionManager) {
+	            theme = theme || {};
+
+	            this.option = null; // Mark as not initialized.
+
+	            /**
+	             * @type {module:echarts/model/Model}
+	             * @private
+	             */
+	            this._theme = new Model(theme);
+
+	            /**
+	             * @type {module:echarts/model/OptionManager}
+	             */
+	            this._optionManager = optionManager;
+	        },
+
+	        setOption: function (option, optionPreprocessorFuncs) {
+	            zrUtil.assert(
+	                !(OPTION_INNER_KEY in option),
+	                'please use chart.getOption()'
+	            );
+
+	            this._optionManager.setOption(option, optionPreprocessorFuncs);
+
+	            this.resetOption();
+	        },
+
+	        /**
+	         * @param {string} type null/undefined: reset all.
+	         *                      'recreate': force recreate all.
+	         *                      'timeline': only reset timeline option
+	         *                      'media': only reset media query option
+	         * @return {boolean} Whether option changed.
+	         */
+	        resetOption: function (type) {
+	            var optionChanged = false;
+	            var optionManager = this._optionManager;
+
+	            if (!type || type === 'recreate') {
+	                var baseOption = optionManager.mountOption(type === 'recreate');
+
+	                if (!this.option || type === 'recreate') {
+	                    initBase.call(this, baseOption);
+	                }
+	                else {
+	                    this.restoreData();
+	                    this.mergeOption(baseOption);
+	                }
+	                optionChanged = true;
+	            }
+
+	            if (type === 'timeline' || type === 'media') {
+	                this.restoreData();
+	            }
+
+	            if (!type || type === 'recreate' || type === 'timeline') {
+	                var timelineOption = optionManager.getTimelineOption(this);
+	                timelineOption && (this.mergeOption(timelineOption), optionChanged = true);
+	            }
+
+	            if (!type || type === 'recreate' || type === 'media') {
+	                var mediaOptions = optionManager.getMediaOption(this, this._api);
+	                if (mediaOptions.length) {
+	                    each(mediaOptions, function (mediaOption) {
+	                        this.mergeOption(mediaOption, optionChanged = true);
+	                    }, this);
+	                }
+	            }
+
+	            return optionChanged;
+	        },
+
+	        /**
+	         * @protected
+	         */
+	        mergeOption: function (newOption) {
+	            var option = this.option;
+	            var componentsMap = this._componentsMap;
+	            var newCptTypes = [];
+
+	            // 如果不存在对应的 component model 则直接 merge
+	            each(newOption, function (componentOption, mainType) {
+	                if (componentOption == null) {
+	                    return;
+	                }
+
+	                if (!ComponentModel.hasClass(mainType)) {
+	                    option[mainType] = option[mainType] == null
+	                        ? zrUtil.clone(componentOption)
+	                        : zrUtil.merge(option[mainType], componentOption, true);
+	                }
+	                else {
+	                    newCptTypes.push(mainType);
+	                }
+	            });
+
+	            // FIXME OPTION 同步是否要改回原来的
+	            ComponentModel.topologicalTravel(
+	                newCptTypes, ComponentModel.getAllClassMainTypes(), visitComponent, this
+	            );
+
+	            function visitComponent(mainType, dependencies) {
+	                var newCptOptionList = modelUtil.normalizeToArray(newOption[mainType]);
+
+	                var mapResult = modelUtil.mappingToExists(
+	                    componentsMap[mainType], newCptOptionList
+	                );
+
+	                makeKeyInfo(mainType, mapResult);
+
+	                var dependentModels = getComponentsByTypes(
+	                    componentsMap, dependencies
+	                );
+
+	                option[mainType] = [];
+	                componentsMap[mainType] = [];
+
+	                each(mapResult, function (resultItem, index) {
+	                    var componentModel = resultItem.exist;
+	                    var newCptOption = resultItem.option;
+
+	                    zrUtil.assert(
+	                        isObject(newCptOption) || componentModel,
+	                        'Empty component definition'
+	                    );
+
+	                    // Consider where is no new option and should be merged using {},
+	                    // see removeEdgeAndAdd in topologicalTravel and
+	                    // ComponentModel.getAllClassMainTypes.
+	                    if (!newCptOption) {
+	                        componentModel.mergeOption({}, this);
+	                        componentModel.optionUpdated({}, false);
+	                    }
+	                    else {
+	                        var ComponentModelClass = ComponentModel.getClass(
+	                            mainType, resultItem.keyInfo.subType, true
+	                        );
+
+	                        if (componentModel && componentModel instanceof ComponentModelClass) {
+	                            componentModel.mergeOption(newCptOption, this);
+	                            componentModel.optionUpdated(newCptOption, false);
+	                        }
+	                        else {
+	                            // PENDING Global as parent ?
+	                            var extraOpt = zrUtil.extend(
+	                                {
+	                                    dependentModels: dependentModels,
+	                                    componentIndex: index
+	                                },
+	                                resultItem.keyInfo
+	                            );
+	                            componentModel = new ComponentModelClass(
+	                                newCptOption, this, this, extraOpt
+	                            );
+	                            componentModel.init(newCptOption, this, this, extraOpt);
+	                            // Call optionUpdated after init.
+	                            // newCptOption has been used as componentModel.option
+	                            // and may be merged with theme and default, so pass null
+	                            // to avoid confusion.
+	                            componentModel.optionUpdated(null, true);
+	                        }
+	                    }
+
+	                    componentsMap[mainType][index] = componentModel;
+	                    option[mainType][index] = componentModel.option;
+	                }, this);
+
+	                // Backup series for filtering.
+	                if (mainType === 'series') {
+	                    this._seriesIndices = createSeriesIndices(componentsMap.series);
+	                }
+	            }
+	        },
+
+	        /**
+	         * Get option for output (cloned option and inner info removed)
+	         * @public
+	         * @return {Object}
+	         */
+	        getOption: function () {
+	            var option = zrUtil.clone(this.option);
+
+	            each(option, function (opts, mainType) {
+	                if (ComponentModel.hasClass(mainType)) {
+	                    var opts = modelUtil.normalizeToArray(opts);
+	                    for (var i = opts.length - 1; i >= 0; i--) {
+	                        // Remove options with inner id.
+	                        if (modelUtil.isIdInner(opts[i])) {
+	                            opts.splice(i, 1);
+	                        }
+	                    }
+	                    option[mainType] = opts;
+	                }
+	            });
+
+	            delete option[OPTION_INNER_KEY];
+
+	            return option;
+	        },
+
+	        /**
+	         * @return {module:echarts/model/Model}
+	         */
+	        getTheme: function () {
+	            return this._theme;
+	        },
+
+	        /**
+	         * @param {string} mainType
+	         * @param {number} [idx=0]
+	         * @return {module:echarts/model/Component}
+	         */
+	        getComponent: function (mainType, idx) {
+	            var list = this._componentsMap[mainType];
+	            if (list) {
+	                return list[idx || 0];
+	            }
+	        },
+
+	        /**
+	         * @param {Object} condition
+	         * @param {string} condition.mainType
+	         * @param {string} [condition.subType] If ignore, only query by mainType
+	         * @param {number} [condition.index] Either input index or id or name.
+	         * @param {string} [condition.id] Either input index or id or name.
+	         * @param {string} [condition.name] Either input index or id or name.
+	         * @return {Array.<module:echarts/model/Component>}
+	         */
+	        queryComponents: function (condition) {
+	            var mainType = condition.mainType;
+	            if (!mainType) {
+	                return [];
+	            }
+
+	            var index = condition.index;
+	            var id = condition.id;
+	            var name = condition.name;
+
+	            var cpts = this._componentsMap[mainType];
+
+	            if (!cpts || !cpts.length) {
+	                return [];
+	            }
+
+	            var result;
+
+	            if (index != null) {
+	                if (!isArray(index)) {
+	                    index = [index];
+	                }
+	                result = filter(map(index, function (idx) {
+	                    return cpts[idx];
+	                }), function (val) {
+	                    return !!val;
+	                });
+	            }
+	            else if (id != null) {
+	                var isIdArray = isArray(id);
+	                result = filter(cpts, function (cpt) {
+	                    return (isIdArray && indexOf(id, cpt.id) >= 0)
+	                        || (!isIdArray && cpt.id === id);
+	                });
+	            }
+	            else if (name != null) {
+	                var isNameArray = isArray(name);
+	                result = filter(cpts, function (cpt) {
+	                    return (isNameArray && indexOf(name, cpt.name) >= 0)
+	                        || (!isNameArray && cpt.name === name);
+	                });
+	            }
+
+	            return filterBySubType(result, condition);
+	        },
+
+	        /**
+	         * The interface is different from queryComponents,
+	         * which is convenient for inner usage.
+	         *
+	         * @usage
+	         * var result = findComponents(
+	         *     {mainType: 'dataZoom', query: {dataZoomId: 'abc'}}
+	         * );
+	         * var result = findComponents(
+	         *     {mainType: 'series', subType: 'pie', query: {seriesName: 'uio'}}
+	         * );
+	         * var result = findComponents(
+	         *     {mainType: 'series'},
+	         *     function (model, index) {...}
+	         * );
+	         * // result like [component0, componnet1, ...]
+	         *
+	         * @param {Object} condition
+	         * @param {string} condition.mainType Mandatory.
+	         * @param {string} [condition.subType] Optional.
+	         * @param {Object} [condition.query] like {xxxIndex, xxxId, xxxName},
+	         *        where xxx is mainType.
+	         *        If query attribute is null/undefined or has no index/id/name,
+	         *        do not filtering by query conditions, which is convenient for
+	         *        no-payload situations or when target of action is global.
+	         * @param {Function} [condition.filter] parameter: component, return boolean.
+	         * @return {Array.<module:echarts/model/Component>}
+	         */
+	        findComponents: function (condition) {
+	            var query = condition.query;
+	            var mainType = condition.mainType;
+
+	            var queryCond = getQueryCond(query);
+	            var result = queryCond
+	                ? this.queryComponents(queryCond)
+	                : this._componentsMap[mainType];
+
+	            return doFilter(filterBySubType(result, condition));
+
+	            function getQueryCond(q) {
+	                var indexAttr = mainType + 'Index';
+	                var idAttr = mainType + 'Id';
+	                var nameAttr = mainType + 'Name';
+	                return q && (
+	                        q.hasOwnProperty(indexAttr)
+	                        || q.hasOwnProperty(idAttr)
+	                        || q.hasOwnProperty(nameAttr)
+	                    )
+	                    ? {
+	                        mainType: mainType,
+	                        // subType will be filtered finally.
+	                        index: q[indexAttr],
+	                        id: q[idAttr],
+	                        name: q[nameAttr]
+	                    }
+	                    : null;
+	            }
+
+	            function doFilter(res) {
+	                return condition.filter
+	                     ? filter(res, condition.filter)
+	                     : res;
+	            }
+	        },
+
+	        /**
+	         * @usage
+	         * eachComponent('legend', function (legendModel, index) {
+	         *     ...
+	         * });
+	         * eachComponent(function (componentType, model, index) {
+	         *     // componentType does not include subType
+	         *     // (componentType is 'xxx' but not 'xxx.aa')
+	         * });
+	         * eachComponent(
+	         *     {mainType: 'dataZoom', query: {dataZoomId: 'abc'}},
+	         *     function (model, index) {...}
+	         * );
+	         * eachComponent(
+	         *     {mainType: 'series', subType: 'pie', query: {seriesName: 'uio'}},
+	         *     function (model, index) {...}
+	         * );
+	         *
+	         * @param {string|Object=} mainType When mainType is object, the definition
+	         *                                  is the same as the method 'findComponents'.
+	         * @param {Function} cb
+	         * @param {*} context
+	         */
+	        eachComponent: function (mainType, cb, context) {
+	            var componentsMap = this._componentsMap;
+
+	            if (typeof mainType === 'function') {
+	                context = cb;
+	                cb = mainType;
+	                each(componentsMap, function (components, componentType) {
+	                    each(components, function (component, index) {
+	                        cb.call(context, componentType, component, index);
+	                    });
+	                });
+	            }
+	            else if (zrUtil.isString(mainType)) {
+	                each(componentsMap[mainType], cb, context);
+	            }
+	            else if (isObject(mainType)) {
+	                var queryResult = this.findComponents(mainType);
+	                each(queryResult, cb, context);
+	            }
+	        },
+
+	        /**
+	         * @param {string} name
+	         * @return {Array.<module:echarts/model/Series>}
+	         */
+	        getSeriesByName: function (name) {
+	            var series = this._componentsMap.series;
+	            return filter(series, function (oneSeries) {
+	                return oneSeries.name === name;
+	            });
+	        },
+
+	        /**
+	         * @param {number} seriesIndex
+	         * @return {module:echarts/model/Series}
+	         */
+	        getSeriesByIndex: function (seriesIndex) {
+	            return this._componentsMap.series[seriesIndex];
+	        },
+
+	        /**
+	         * @param {string} subType
+	         * @return {Array.<module:echarts/model/Series>}
+	         */
+	        getSeriesByType: function (subType) {
+	            var series = this._componentsMap.series;
+	            return filter(series, function (oneSeries) {
+	                return oneSeries.subType === subType;
+	            });
+	        },
+
+	        /**
+	         * @return {Array.<module:echarts/model/Series>}
+	         */
+	        getSeries: function () {
+	            return this._componentsMap.series.slice();
+	        },
+
+	        /**
+	         * After filtering, series may be different
+	         * frome raw series.
+	         *
+	         * @param {Function} cb
+	         * @param {*} context
+	         */
+	        eachSeries: function (cb, context) {
+	            assertSeriesInitialized(this);
+	            each(this._seriesIndices, function (rawSeriesIndex) {
+	                var series = this._componentsMap.series[rawSeriesIndex];
+	                cb.call(context, series, rawSeriesIndex);
+	            }, this);
+	        },
+
+	        /**
+	         * Iterate raw series before filtered.
+	         *
+	         * @param {Function} cb
+	         * @param {*} context
+	         */
+	        eachRawSeries: function (cb, context) {
+	            each(this._componentsMap.series, cb, context);
+	        },
+
+	        /**
+	         * After filtering, series may be different.
+	         * frome raw series.
+	         *
+	         * @parma {string} subType
+	         * @param {Function} cb
+	         * @param {*} context
+	         */
+	        eachSeriesByType: function (subType, cb, context) {
+	            assertSeriesInitialized(this);
+	            each(this._seriesIndices, function (rawSeriesIndex) {
+	                var series = this._componentsMap.series[rawSeriesIndex];
+	                if (series.subType === subType) {
+	                    cb.call(context, series, rawSeriesIndex);
+	                }
+	            }, this);
+	        },
+
+	        /**
+	         * Iterate raw series before filtered of given type.
+	         *
+	         * @parma {string} subType
+	         * @param {Function} cb
+	         * @param {*} context
+	         */
+	        eachRawSeriesByType: function (subType, cb, context) {
+	            return each(this.getSeriesByType(subType), cb, context);
+	        },
+
+	        /**
+	         * @param {module:echarts/model/Series} seriesModel
+	         */
+	        isSeriesFiltered: function (seriesModel) {
+	            assertSeriesInitialized(this);
+	            return zrUtil.indexOf(this._seriesIndices, seriesModel.componentIndex) < 0;
+	        },
+
+	        /**
+	         * @param {Function} cb
+	         * @param {*} context
+	         */
+	        filterSeries: function (cb, context) {
+	            assertSeriesInitialized(this);
+	            var filteredSeries = filter(
+	                this._componentsMap.series, cb, context
+	            );
+	            this._seriesIndices = createSeriesIndices(filteredSeries);
+	        },
+
+	        restoreData: function () {
+	            var componentsMap = this._componentsMap;
+
+	            this._seriesIndices = createSeriesIndices(componentsMap.series);
+
+	            var componentTypes = [];
+	            each(componentsMap, function (components, componentType) {
+	                componentTypes.push(componentType);
+	            });
+
+	            ComponentModel.topologicalTravel(
+	                componentTypes,
+	                ComponentModel.getAllClassMainTypes(),
+	                function (componentType, dependencies) {
+	                    each(componentsMap[componentType], function (component) {
+	                        component.restoreData();
+	                    });
+	                }
+	            );
+	        }
+
+	    });
+
+	    /**
+	     * @inner
+	     */
+	    function mergeTheme(option, theme) {
+	        for (var name in theme) {
+	            // 如果有 component model 则把具体的 merge 逻辑交给该 model 处理
+	            if (!ComponentModel.hasClass(name)) {
+	                if (typeof theme[name] === 'object') {
+	                    option[name] = !option[name]
+	                        ? zrUtil.clone(theme[name])
+	                        : zrUtil.merge(option[name], theme[name], false);
+	                }
+	                else {
+	                    if (option[name] == null) {
+	                        option[name] = theme[name];
+	                    }
+	                }
+	            }
+	        }
+	    }
+
+	    function initBase(baseOption) {
+	        baseOption = baseOption;
+
+	        // Using OPTION_INNER_KEY to mark that this option can not be used outside,
+	        // i.e. `chart.setOption(chart.getModel().option);` is forbiden.
+	        this.option = {};
+	        this.option[OPTION_INNER_KEY] = 1;
+
+	        /**
+	         * @type {Object.<string, Array.<module:echarts/model/Model>>}
+	         * @private
+	         */
+	        this._componentsMap = {};
+
+	        /**
+	         * Mapping between filtered series list and raw series list.
+	         * key: filtered series indices, value: raw series indices.
+	         * @type {Array.<nubmer>}
+	         * @private
+	         */
+	        this._seriesIndices = null;
+
+	        mergeTheme(baseOption, this._theme.option);
+
+	        // TODO Needs clone when merging to the unexisted property
+	        zrUtil.merge(baseOption, globalDefault, false);
+
+	        this.mergeOption(baseOption);
+	    }
+
+	    /**
+	     * @inner
+	     * @param {Array.<string>|string} types model types
+	     * @return {Object} key: {string} type, value: {Array.<Object>} models
+	     */
+	    function getComponentsByTypes(componentsMap, types) {
+	        if (!zrUtil.isArray(types)) {
+	            types = types ? [types] : [];
+	        }
+
+	        var ret = {};
+	        each(types, function (type) {
+	            ret[type] = (componentsMap[type] || []).slice();
+	        });
+
+	        return ret;
+	    }
+
+	    /**
+	     * @inner
+	     */
+	    function makeKeyInfo(mainType, mapResult) {
+	        // We use this id to hash component models and view instances
+	        // in echarts. id can be specified by user, or auto generated.
+
+	        // The id generation rule ensures new view instance are able
+	        // to mapped to old instance when setOption are called in
+	        // no-merge mode. So we generate model id by name and plus
+	        // type in view id.
+
+	        // name can be duplicated among components, which is convenient
+	        // to specify multi components (like series) by one name.
+
+	        // Ensure that each id is distinct.
+	        var idMap = {};
+
+	        each(mapResult, function (item, index) {
+	            var existCpt = item.exist;
+	            existCpt && (idMap[existCpt.id] = item);
+	        });
+
+	        each(mapResult, function (item, index) {
+	            var opt = item.option;
+
+	            zrUtil.assert(
+	                !opt || opt.id == null || !idMap[opt.id] || idMap[opt.id] === item,
+	                'id duplicates: ' + (opt && opt.id)
+	            );
+
+	            opt && opt.id != null && (idMap[opt.id] = item);
+
+	            // Complete subType
+	            if (isObject(opt)) {
+	                var subType = determineSubType(mainType, opt, item.exist);
+	                item.keyInfo = {mainType: mainType, subType: subType};
+	            }
+	        });
+
+	        // Make name and id.
+	        each(mapResult, function (item, index) {
+	            var existCpt = item.exist;
+	            var opt = item.option;
+	            var keyInfo = item.keyInfo;
+
+	            if (!isObject(opt)) {
+	                return;
+	            }
+
+	            // name can be overwitten. Consider case: axis.name = '20km'.
+	            // But id generated by name will not be changed, which affect
+	            // only in that case: setOption with 'not merge mode' and view
+	            // instance will be recreated, which can be accepted.
+	            keyInfo.name = opt.name != null
+	                ? opt.name + ''
+	                : existCpt
+	                ? existCpt.name
+	                : '\0-';
+
+	            if (existCpt) {
+	                keyInfo.id = existCpt.id;
+	            }
+	            else if (opt.id != null) {
+	                keyInfo.id = opt.id + '';
+	            }
+	            else {
+	                // Consider this situatoin:
+	                //  optionA: [{name: 'a'}, {name: 'a'}, {..}]
+	                //  optionB [{..}, {name: 'a'}, {name: 'a'}]
+	                // Series with the same name between optionA and optionB
+	                // should be mapped.
+	                var idNum = 0;
+	                do {
+	                    keyInfo.id = '\0' + keyInfo.name + '\0' + idNum++;
+	                }
+	                while (idMap[keyInfo.id]);
+	            }
+
+	            idMap[keyInfo.id] = item;
+	        });
+	    }
+
+	    /**
+	     * @inner
+	     */
+	    function determineSubType(mainType, newCptOption, existComponent) {
+	        var subType = newCptOption.type
+	            ? newCptOption.type
+	            : existComponent
+	            ? existComponent.subType
+	            // Use determineSubType only when there is no existComponent.
+	            : ComponentModel.determineSubType(mainType, newCptOption);
+
+	        // tooltip, markline, markpoint may always has no subType
+	        return subType;
+	    }
+
+	    /**
+	     * @inner
+	     */
+	    function createSeriesIndices(seriesModels) {
+	        return map(seriesModels, function (series) {
+	            return series.componentIndex;
+	        }) || [];
+	    }
+
+	    /**
+	     * @inner
+	     */
+	    function filterBySubType(components, condition) {
+	        // Using hasOwnProperty for restrict. Consider
+	        // subType is undefined in user payload.
+	        return condition.hasOwnProperty('subType')
+	            ? filter(components, function (cpt) {
+	                return cpt.subType === condition.subType;
+	            })
+	            : components;
+	    }
+
+	    /**
+	     * @inner
+	     */
+	    function assertSeriesInitialized(ecModel) {
+	        // Components that use _seriesIndices should depends on series component,
+	        // which make sure that their initialization is after series.
+	        if (true) {
+	            if (!ecModel._seriesIndices) {
+	                throw new Error('Series has not been initialized yet.');
+	            }
+	        }
+	    }
+
+	    zrUtil.mixin(GlobalModel, __webpack_require__(24));
+
+	    module.exports = GlobalModel;
+
+
+/***/ },
+/* 4 */
+/***/ function(module, exports) {
+
+	/**
+	 * @module zrender/core/util
+	 */
+
+
+	    // 用于处理merge时无法遍历Date等对象的问题
+	    var BUILTIN_OBJECT = {
+	        '[object Function]': 1,
+	        '[object RegExp]': 1,
+	        '[object Date]': 1,
+	        '[object Error]': 1,
+	        '[object CanvasGradient]': 1,
+	        '[object CanvasPattern]': 1,
+	        // In node-canvas Image can be Canvas.Image
+	        '[object Image]': 1
+	    };
+
+	    var objToString = Object.prototype.toString;
+
+	    var arrayProto = Array.prototype;
+	    var nativeForEach = arrayProto.forEach;
+	    var nativeFilter = arrayProto.filter;
+	    var nativeSlice = arrayProto.slice;
+	    var nativeMap = arrayProto.map;
+	    var nativeReduce = arrayProto.reduce;
+
+	    /**
+	     * @param {*} source
+	     * @return {*} 拷贝后的新对象
+	     */
+	    function clone(source) {
+	        if (typeof source == 'object' && source !== null) {
+	            var result = source;
+	            if (source instanceof Array) {
+	                result = [];
+	                for (var i = 0, len = source.length; i < len; i++) {
+	                    result[i] = clone(source[i]);
+	                }
+	            }
+	            else if (
+	                !isBuildInObject(source)
+	                // 是否为 dom 对象
+	                && !isDom(source)
+	            ) {
+	                result = {};
+	                for (var key in source) {
+	                    if (source.hasOwnProperty(key)) {
+	                        result[key] = clone(source[key]);
+	                    }
+	                }
+	            }
+
+	            return result;
+	        }
+
+	        return source;
+	    }
+
+	    /**
+	     * @memberOf module:zrender/core/util
+	     * @param {*} target
+	     * @param {*} source
+	     * @param {boolean} [overwrite=false]
+	     */
+	    function merge(target, source, overwrite) {
+	        // We should escapse that source is string
+	        // and enter for ... in ...
+	        if (!isObject(source) || !isObject(target)) {
+	            return overwrite ? clone(source) : target;
+	        }
+
+	        for (var key in source) {
+	            if (source.hasOwnProperty(key)) {
+	                var targetProp = target[key];
+	                var sourceProp = source[key];
+
+	                if (isObject(sourceProp)
+	                    && isObject(targetProp)
+	                    && !isArray(sourceProp)
+	                    && !isArray(targetProp)
+	                    && !isDom(sourceProp)
+	                    && !isDom(targetProp)
+	                    && !isBuildInObject(sourceProp)
+	                    && !isBuildInObject(targetProp)
+	                ) {
+	                    // 如果需要递归覆盖，就递归调用merge
+	                    merge(targetProp, sourceProp, overwrite);
+	                }
+	                else if (overwrite || !(key in target)) {
+	                    // 否则只处理overwrite为true，或者在目标对象中没有此属性的情况
+	                    // NOTE，在 target[key] 不存在的时候也是直接覆盖
+	                    target[key] = clone(source[key], true);
+	                }
+	            }
+	        }
+
+	        return target;
+	    }
+
+	    /**
+	     * @param {Array} targetAndSources The first item is target, and the rests are source.
+	     * @param {boolean} [overwrite=false]
+	     * @return {*} target
+	     */
+	    function mergeAll(targetAndSources, overwrite) {
+	        var result = targetAndSources[0];
+	        for (var i = 1, len = targetAndSources.length; i < len; i++) {
+	            result = merge(result, targetAndSources[i], overwrite);
+	        }
+	        return result;
+	    }
+
+	    /**
+	     * @param {*} target
+	     * @param {*} source
+	     * @memberOf module:zrender/core/util
+	     */
+	    function extend(target, source) {
+	        for (var key in source) {
+	            if (source.hasOwnProperty(key)) {
+	                target[key] = source[key];
+	            }
+	        }
+	        return target;
+	    }
+
+	    /**
+	     * @param {*} target
+	     * @param {*} source
+	     * @param {boolen} [overlay=false]
+	     * @memberOf module:zrender/core/util
+	     */
+	    function defaults(target, source, overlay) {
+	        for (var key in source) {
+	            if (source.hasOwnProperty(key)
+	                && (overlay ? source[key] != null : target[key] == null)
+	            ) {
+	                target[key] = source[key];
+	            }
+	        }
+	        return target;
+	    }
+
+	    function createCanvas() {
+	        return document.createElement('canvas');
+	    }
+	    // FIXME
+	    var _ctx;
+	    function getContext() {
+	        if (!_ctx) {
+	            // Use util.createCanvas instead of createCanvas
+	            // because createCanvas may be overwritten in different environment
+	            _ctx = util.createCanvas().getContext('2d');
+	        }
+	        return _ctx;
+	    }
+
+	    /**
+	     * 查询数组中元素的index
+	     * @memberOf module:zrender/core/util
+	     */
+	    function indexOf(array, value) {
+	        if (array) {
+	            if (array.indexOf) {
+	                return array.indexOf(value);
+	            }
+	            for (var i = 0, len = array.length; i < len; i++) {
+	                if (array[i] === value) {
+	                    return i;
+	                }
+	            }
+	        }
+	        return -1;
+	    }
+
+	    /**
+	     * 构造类继承关系
+	     *
+	     * @memberOf module:zrender/core/util
+	     * @param {Function} clazz 源类
+	     * @param {Function} baseClazz 基类
+	     */
+	    function inherits(clazz, baseClazz) {
+	        var clazzPrototype = clazz.prototype;
+	        function F() {}
+	        F.prototype = baseClazz.prototype;
+	        clazz.prototype = new F();
+
+	        for (var prop in clazzPrototype) {
+	            clazz.prototype[prop] = clazzPrototype[prop];
+	        }
+	        clazz.prototype.constructor = clazz;
+	        clazz.superClass = baseClazz;
+	    }
+
+	    /**
+	     * @memberOf module:zrender/core/util
+	     * @param {Object|Function} target
+	     * @param {Object|Function} sorce
+	     * @param {boolean} overlay
+	     */
+	    function mixin(target, source, overlay) {
+	        target = 'prototype' in target ? target.prototype : target;
+	        source = 'prototype' in source ? source.prototype : source;
+
+	        defaults(target, source, overlay);
+	    }
+
+	    /**
+	     * @param {Array|TypedArray} data
+	     */
+	    function isArrayLike(data) {
+	        if (! data) {
+	            return;
+	        }
+	        if (typeof data == 'string') {
+	            return false;
+	        }
+	        return typeof data.length == 'number';
+	    }
+
+	    /**
+	     * 数组或对象遍历
+	     * @memberOf module:zrender/core/util
+	     * @param {Object|Array} obj
+	     * @param {Function} cb
+	     * @param {*} [context]
+	     */
+	    function each(obj, cb, context) {
+	        if (!(obj && cb)) {
+	            return;
+	        }
+	        if (obj.forEach && obj.forEach === nativeForEach) {
+	            obj.forEach(cb, context);
+	        }
+	        else if (obj.length === +obj.length) {
+	            for (var i = 0, len = obj.length; i < len; i++) {
+	                cb.call(context, obj[i], i, obj);
+	            }
+	        }
+	        else {
+	            for (var key in obj) {
+	                if (obj.hasOwnProperty(key)) {
+	                    cb.call(context, obj[key], key, obj);
+	                }
+	            }
+	        }
+	    }
+
+	    /**
+	     * 数组映射
+	     * @memberOf module:zrender/core/util
+	     * @param {Array} obj
+	     * @param {Function} cb
+	     * @param {*} [context]
+	     * @return {Array}
+	     */
+	    function map(obj, cb, context) {
+	        if (!(obj && cb)) {
+	            return;
+	        }
+	        if (obj.map && obj.map === nativeMap) {
+	            return obj.map(cb, context);
+	        }
+	        else {
+	            var result = [];
+	            for (var i = 0, len = obj.length; i < len; i++) {
+	                result.push(cb.call(context, obj[i], i, obj));
+	            }
+	            return result;
+	        }
+	    }
+
+	    /**
+	     * @memberOf module:zrender/core/util
+	     * @param {Array} obj
+	     * @param {Function} cb
+	     * @param {Object} [memo]
+	     * @param {*} [context]
+	     * @return {Array}
+	     */
+	    function reduce(obj, cb, memo, context) {
+	        if (!(obj && cb)) {
+	            return;
+	        }
+	        if (obj.reduce && obj.reduce === nativeReduce) {
+	            return obj.reduce(cb, memo, context);
+	        }
+	        else {
+	            for (var i = 0, len = obj.length; i < len; i++) {
+	                memo = cb.call(context, memo, obj[i], i, obj);
+	            }
+	            return memo;
+	        }
+	    }
+
+	    /**
+	     * 数组过滤
+	     * @memberOf module:zrender/core/util
+	     * @param {Array} obj
+	     * @param {Function} cb
+	     * @param {*} [context]
+	     * @return {Array}
+	     */
+	    function filter(obj, cb, context) {
+	        if (!(obj && cb)) {
+	            return;
+	        }
+	        if (obj.filter && obj.filter === nativeFilter) {
+	            return obj.filter(cb, context);
+	        }
+	        else {
+	            var result = [];
+	            for (var i = 0, len = obj.length; i < len; i++) {
+	                if (cb.call(context, obj[i], i, obj)) {
+	                    result.push(obj[i]);
+	                }
+	            }
+	            return result;
+	        }
+	    }
+
+	    /**
+	     * 数组项查找
+	     * @memberOf module:zrender/core/util
+	     * @param {Array} obj
+	     * @param {Function} cb
+	     * @param {*} [context]
+	     * @return {Array}
+	     */
+	    function find(obj, cb, context) {
+	        if (!(obj && cb)) {
+	            return;
+	        }
+	        for (var i = 0, len = obj.length; i < len; i++) {
+	            if (cb.call(context, obj[i], i, obj)) {
+	                return obj[i];
+	            }
+	        }
+	    }
+
+	    /**
+	     * @memberOf module:zrender/core/util
+	     * @param {Function} func
+	     * @param {*} context
+	     * @return {Function}
+	     */
+	    function bind(func, context) {
+	        var args = nativeSlice.call(arguments, 2);
+	        return function () {
+	            return func.apply(context, args.concat(nativeSlice.call(arguments)));
+	        };
+	    }
+
+	    /**
+	     * @memberOf module:zrender/core/util
+	     * @param {Function} func
+	     * @return {Function}
+	     */
+	    function curry(func) {
+	        var args = nativeSlice.call(arguments, 1);
+	        return function () {
+	            return func.apply(this, args.concat(nativeSlice.call(arguments)));
+	        };
+	    }
+
+	    /**
+	     * @memberOf module:zrender/core/util
+	     * @param {*} value
+	     * @return {boolean}
+	     */
+	    function isArray(value) {
+	        return objToString.call(value) === '[object Array]';
+	    }
+
+	    /**
+	     * @memberOf module:zrender/core/util
+	     * @param {*} value
+	     * @return {boolean}
+	     */
+	    function isFunction(value) {
+	        return typeof value === 'function';
+	    }
+
+	    /**
+	     * @memberOf module:zrender/core/util
+	     * @param {*} value
+	     * @return {boolean}
+	     */
+	    function isString(value) {
+	        return objToString.call(value) === '[object String]';
+	    }
+
+	    /**
+	     * @memberOf module:zrender/core/util
+	     * @param {*} value
+	     * @return {boolean}
+	     */
+	    function isObject(value) {
+	        // Avoid a V8 JIT bug in Chrome 19-20.
+	        // See https://code.google.com/p/v8/issues/detail?id=2291 for more details.
+	        var type = typeof value;
+	        return type === 'function' || (!!value && type == 'object');
+	    }
+
+	    /**
+	     * @memberOf module:zrender/core/util
+	     * @param {*} value
+	     * @return {boolean}
+	     */
+	    function isBuildInObject(value) {
+	        return !!BUILTIN_OBJECT[objToString.call(value)];
+	    }
+
+	    /**
+	     * @memberOf module:zrender/core/util
+	     * @param {*} value
+	     * @return {boolean}
+	     */
+	    function isDom(value) {
+	        return value && value.nodeType === 1
+	               && typeof(value.nodeName) == 'string';
+	    }
+
+	    /**
+	     * If value1 is not null, then return value1, otherwise judget rest of values.
+	     * @memberOf module:zrender/core/util
+	     * @return {*} Final value
+	     */
+	    function retrieve(values) {
+	        for (var i = 0, len = arguments.length; i < len; i++) {
+	            if (arguments[i] != null) {
+	                return arguments[i];
+	            }
+	        }
+	    }
+
+	    /**
+	     * @memberOf module:zrender/core/util
+	     * @param {Array} arr
+	     * @param {number} startIndex
+	     * @param {number} endIndex
+	     * @return {Array}
+	     */
+	    function slice() {
+	        return Function.call.apply(nativeSlice, arguments);
+	    }
+
+	    /**
+	     * @memberOf module:zrender/core/util
+	     * @param {boolean} condition
+	     * @param {string} message
+	     */
+	    function assert(condition, message) {
+	        if (!condition) {
+	            throw new Error(message);
+	        }
+	    }
+
+	    var util = {
+	        inherits: inherits,
+	        mixin: mixin,
+	        clone: clone,
+	        merge: merge,
+	        mergeAll: mergeAll,
+	        extend: extend,
+	        defaults: defaults,
+	        getContext: getContext,
+	        createCanvas: createCanvas,
+	        indexOf: indexOf,
+	        slice: slice,
+	        find: find,
+	        isArrayLike: isArrayLike,
+	        each: each,
+	        map: map,
+	        reduce: reduce,
+	        filter: filter,
+	        bind: bind,
+	        curry: curry,
+	        isArray: isArray,
+	        isString: isString,
+	        isObject: isObject,
+	        isFunction: isFunction,
+	        isBuildInObject: isBuildInObject,
+	        isDom: isDom,
+	        retrieve: retrieve,
+	        assert: assert,
+	        noop: function () {}
+	    };
+	    module.exports = util;
+
+
+
+/***/ },
+/* 5 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var formatUtil = __webpack_require__(6);
+	    var nubmerUtil = __webpack_require__(7);
+	    var Model = __webpack_require__(12);
+	    var zrUtil = __webpack_require__(4);
+
+	    var AXIS_DIMS = ['x', 'y', 'z', 'radius', 'angle'];
+
+	    var modelUtil = {};
+
+	    /**
+	     * Create "each" method to iterate names.
+	     *
+	     * @pubilc
+	     * @param  {Array.<string>} names
+	     * @param  {Array.<string>=} attrs
+	     * @return {Function}
+	     */
+	    modelUtil.createNameEach = function (names, attrs) {
+	        names = names.slice();
+	        var capitalNames = zrUtil.map(names, modelUtil.capitalFirst);
+	        attrs = (attrs || []).slice();
+	        var capitalAttrs = zrUtil.map(attrs, modelUtil.capitalFirst);
+
+	        return function (callback, context) {
+	            zrUtil.each(names, function (name, index) {
+	                var nameObj = {name: name, capital: capitalNames[index]};
+
+	                for (var j = 0; j < attrs.length; j++) {
+	                    nameObj[attrs[j]] = name + capitalAttrs[j];
+	                }
+
+	                callback.call(context, nameObj);
+	            });
+	        };
+	    };
+
+	    /**
+	     * @public
+	     */
+	    modelUtil.capitalFirst = function (str) {
+	        return str ? str.charAt(0).toUpperCase() + str.substr(1) : str;
+	    };
+
+	    /**
+	     * Iterate each dimension name.
+	     *
+	     * @public
+	     * @param {Function} callback The parameter is like:
+	     *                            {
+	     *                                name: 'angle',
+	     *                                capital: 'Angle',
+	     *                                axis: 'angleAxis',
+	     *                                axisIndex: 'angleAixs',
+	     *                                index: 'angleIndex'
+	     *                            }
+	     * @param {Object} context
+	     */
+	    modelUtil.eachAxisDim = modelUtil.createNameEach(AXIS_DIMS, ['axisIndex', 'axis', 'index']);
+
+	    /**
+	     * If value is not array, then translate it to array.
+	     * @param  {*} value
+	     * @return {Array} [value] or value
+	     */
+	    modelUtil.normalizeToArray = function (value) {
+	        return value instanceof Array
+	            ? value
+	            : value == null
+	            ? []
+	            : [value];
+	    };
+
+	    /**
+	     * If tow dataZoomModels has the same axis controlled, we say that they are 'linked'.
+	     * dataZoomModels and 'links' make up one or more graphics.
+	     * This function finds the graphic where the source dataZoomModel is in.
+	     *
+	     * @public
+	     * @param {Function} forEachNode Node iterator.
+	     * @param {Function} forEachEdgeType edgeType iterator
+	     * @param {Function} edgeIdGetter Giving node and edgeType, return an array of edge id.
+	     * @return {Function} Input: sourceNode, Output: Like {nodes: [], dims: {}}
+	     */
+	    modelUtil.createLinkedNodesFinder = function (forEachNode, forEachEdgeType, edgeIdGetter) {
+
+	        return function (sourceNode) {
+	            var result = {
+	                nodes: [],
+	                records: {} // key: edgeType.name, value: Object (key: edge id, value: boolean).
+	            };
+
+	            forEachEdgeType(function (edgeType) {
+	                result.records[edgeType.name] = {};
+	            });
+
+	            if (!sourceNode) {
+	                return result;
+	            }
+
+	            absorb(sourceNode, result);
+
+	            var existsLink;
+	            do {
+	                existsLink = false;
+	                forEachNode(processSingleNode);
+	            }
+	            while (existsLink);
+
+	            function processSingleNode(node) {
+	                if (!isNodeAbsorded(node, result) && isLinked(node, result)) {
+	                    absorb(node, result);
+	                    existsLink = true;
+	                }
+	            }
+
+	            return result;
+	        };
+
+	        function isNodeAbsorded(node, result) {
+	            return zrUtil.indexOf(result.nodes, node) >= 0;
+	        }
+
+	        function isLinked(node, result) {
+	            var hasLink = false;
+	            forEachEdgeType(function (edgeType) {
+	                zrUtil.each(edgeIdGetter(node, edgeType) || [], function (edgeId) {
+	                    result.records[edgeType.name][edgeId] && (hasLink = true);
+	                });
+	            });
+	            return hasLink;
+	        }
+
+	        function absorb(node, result) {
+	            result.nodes.push(node);
+	            forEachEdgeType(function (edgeType) {
+	                zrUtil.each(edgeIdGetter(node, edgeType) || [], function (edgeId) {
+	                    result.records[edgeType.name][edgeId] = true;
+	                });
+	            });
+	        }
+	    };
+
+	    /**
+	     * Sync default option between normal and emphasis like `position` and `show`
+	     * In case some one will write code like
+	     *     label: {
+	     *         normal: {
+	     *             show: false,
+	     *             position: 'outside',
+	     *             textStyle: {
+	     *                 fontSize: 18
+	     *             }
+	     *         },
+	     *         emphasis: {
+	     *             show: true
+	     *         }
+	     *     }
+	     * @param {Object} opt
+	     * @param {Array.<string>} subOpts
+	     */
+	     modelUtil.defaultEmphasis = function (opt, subOpts) {
+	        if (opt) {
+	            var emphasisOpt = opt.emphasis = opt.emphasis || {};
+	            var normalOpt = opt.normal = opt.normal || {};
+
+	            // Default emphasis option from normal
+	            zrUtil.each(subOpts, function (subOptName) {
+	                var val = zrUtil.retrieve(emphasisOpt[subOptName], normalOpt[subOptName]);
+	                if (val != null) {
+	                    emphasisOpt[subOptName] = val;
+	                }
+	            });
+	        }
+	    };
+
+	    modelUtil.LABEL_OPTIONS = ['position', 'show', 'textStyle', 'distance', 'formatter'];
+
+	    /**
+	     * data could be [12, 2323, {value: 223}, [1221, 23], {value: [2, 23]}]
+	     * This helper method retieves value from data.
+	     * @param {string|number|Date|Array|Object} dataItem
+	     * @return {number|string|Date|Array.<number|string|Date>}
+	     */
+	    modelUtil.getDataItemValue = function (dataItem) {
+	        // Performance sensitive.
+	        return dataItem && (dataItem.value == null ? dataItem : dataItem.value);
+	    };
+
+	    /**
+	     * data could be [12, 2323, {value: 223}, [1221, 23], {value: [2, 23]}]
+	     * This helper method determine if dataItem has extra option besides value
+	     * @param {string|number|Date|Array|Object} dataItem
+	     */
+	    modelUtil.isDataItemOption = function (dataItem) {
+	        return zrUtil.isObject(dataItem)
+	            && !(dataItem instanceof Array);
+	            // // markLine data can be array
+	            // && !(dataItem[0] && zrUtil.isObject(dataItem[0]) && !(dataItem[0] instanceof Array));
+	    };
+
+	    /**
+	     * This helper method convert value in data.
+	     * @param {string|number|Date} value
+	     * @param {Object|string} [dimInfo] If string (like 'x'), dimType defaults 'number'.
+	     */
+	    modelUtil.converDataValue = function (value, dimInfo) {
+	        // Performance sensitive.
+	        var dimType = dimInfo && dimInfo.type;
+	        if (dimType === 'ordinal') {
+	            return value;
+	        }
+
+	        if (dimType === 'time' && !isFinite(value) && value != null && value !== '-') {
+	            value = +nubmerUtil.parseDate(value);
+	        }
+
+	        // dimType defaults 'number'.
+	        // If dimType is not ordinal and value is null or undefined or NaN or '-',
+	        // parse to NaN.
+	        return (value == null || value === '')
+	            ? NaN : +value; // If string (like '-'), using '+' parse to NaN
+	    };
+
+	    /**
+	     * Create a model proxy to be used in tooltip for edge data, markLine data, markPoint data.
+	     * @param {module:echarts/data/List} data
+	     * @param {Object} opt
+	     * @param {string} [opt.seriesIndex]
+	     * @param {Object} [opt.name]
+	     * @param {Object} [opt.mainType]
+	     * @param {Object} [opt.subType]
+	     */
+	    modelUtil.createDataFormatModel = function (data, opt) {
+	        var model = new Model();
+	        zrUtil.mixin(model, modelUtil.dataFormatMixin);
+	        model.seriesIndex = opt.seriesIndex;
+	        model.name = opt.name || '';
+	        model.mainType = opt.mainType;
+	        model.subType = opt.subType;
+
+	        model.getData = function () {
+	            return data;
+	        };
+	        return model;
+	    };
+
+	    // PENDING A little ugly
+	    modelUtil.dataFormatMixin = {
+	        /**
+	         * Get params for formatter
+	         * @param {number} dataIndex
+	         * @param {string} [dataType]
+	         * @return {Object}
+	         */
+	        getDataParams: function (dataIndex, dataType) {
+	            var data = this.getData(dataType);
+
+	            var seriesIndex = this.seriesIndex;
+	            var seriesName = this.name;
+
+	            var rawValue = this.getRawValue(dataIndex, dataType);
+	            var rawDataIndex = data.getRawIndex(dataIndex);
+	            var name = data.getName(dataIndex, true);
+	            var itemOpt = data.getRawDataItem(dataIndex);
+
+	            return {
+	                componentType: this.mainType,
+	                componentSubType: this.subType,
+	                seriesType: this.mainType === 'series' ? this.subType : null,
+	                seriesIndex: seriesIndex,
+	                seriesName: seriesName,
+	                name: name,
+	                dataIndex: rawDataIndex,
+	                data: itemOpt,
+	                dataType: dataType,
+	                value: rawValue,
+	                color: data.getItemVisual(dataIndex, 'color'),
+
+	                // Param name list for mapping `a`, `b`, `c`, `d`, `e`
+	                $vars: ['seriesName', 'name', 'value']
+	            };
+	        },
+
+	        /**
+	         * Format label
+	         * @param {number} dataIndex
+	         * @param {string} [status='normal'] 'normal' or 'emphasis'
+	         * @param {string} [dataType]
+	         * @param {number} [dimIndex]
+	         * @return {string}
+	         */
+	        getFormattedLabel: function (dataIndex, status, dataType, dimIndex) {
+	            status = status || 'normal';
+	            var data = this.getData(dataType);
+	            var itemModel = data.getItemModel(dataIndex);
+
+	            var params = this.getDataParams(dataIndex, dataType);
+	            if (dimIndex != null && (params.value instanceof Array)) {
+	                params.value = params.value[dimIndex];
+	            }
+
+	            var formatter = itemModel.get(['label', status, 'formatter']);
+
+	            if (typeof formatter === 'function') {
+	                params.status = status;
+	                return formatter(params);
+	            }
+	            else if (typeof formatter === 'string') {
+	                return formatUtil.formatTpl(formatter, params);
+	            }
+	        },
+
+	        /**
+	         * Get raw value in option
+	         * @param {number} idx
+	         * @param {string} [dataType]
+	         * @return {Object}
+	         */
+	        getRawValue: function (idx, dataType) {
+	            var data = this.getData(dataType);
+	            var dataItem = data.getRawDataItem(idx);
+	            if (dataItem != null) {
+	                return (zrUtil.isObject(dataItem) && !(dataItem instanceof Array))
+	                    ? dataItem.value : dataItem;
+	            }
+	        },
+
+	        /**
+	         * Should be implemented.
+	         * @param {number} dataIndex
+	         * @param {boolean} [multipleSeries=false]
+	         * @param {number} [dataType]
+	         * @return {string} tooltip string
+	         */
+	        formatTooltip: zrUtil.noop
+	    };
+
+	    /**
+	     * Mapping to exists for merge.
+	     *
+	     * @public
+	     * @param {Array.<Object>|Array.<module:echarts/model/Component>} exists
+	     * @param {Object|Array.<Object>} newCptOptions
+	     * @return {Array.<Object>} Result, like [{exist: ..., option: ...}, {}],
+	     *                          which order is the same as exists.
+	     */
+	    modelUtil.mappingToExists = function (exists, newCptOptions) {
+	        // Mapping by the order by original option (but not order of
+	        // new option) in merge mode. Because we should ensure
+	        // some specified index (like xAxisIndex) is consistent with
+	        // original option, which is easy to understand, espatially in
+	        // media query. And in most case, merge option is used to
+	        // update partial option but not be expected to change order.
+	        newCptOptions = (newCptOptions || []).slice();
+
+	        var result = zrUtil.map(exists || [], function (obj, index) {
+	            return {exist: obj};
+	        });
+
+	        // Mapping by id or name if specified.
+	        zrUtil.each(newCptOptions, function (cptOption, index) {
+	            if (!zrUtil.isObject(cptOption)) {
+	                return;
+	            }
+
+	            for (var i = 0; i < result.length; i++) {
+	                var exist = result[i].exist;
+	                if (!result[i].option // Consider name: two map to one.
+	                    && (
+	                        // id has highest priority.
+	                        (cptOption.id != null && exist.id === cptOption.id + '')
+	                        || (cptOption.name != null
+	                            && !modelUtil.isIdInner(cptOption)
+	                            && !modelUtil.isIdInner(exist)
+	                            && exist.name === cptOption.name + ''
+	                        )
+	                    )
+	                ) {
+	                    result[i].option = cptOption;
+	                    newCptOptions[index] = null;
+	                    break;
+	                }
+	            }
+	        });
+
+	        // Otherwise mapping by index.
+	        zrUtil.each(newCptOptions, function (cptOption, index) {
+	            if (!zrUtil.isObject(cptOption)) {
+	                return;
+	            }
+
+	            var i = 0;
+	            for (; i < result.length; i++) {
+	                var exist = result[i].exist;
+	                if (!result[i].option
+	                    && !modelUtil.isIdInner(exist)
+	                    // Caution:
+	                    // Do not overwrite id. But name can be overwritten,
+	                    // because axis use name as 'show label text'.
+	                    // 'exist' always has id and name and we dont
+	                    // need to check it.
+	                    && cptOption.id == null
+	                ) {
+	                    result[i].option = cptOption;
+	                    break;
+	                }
+	            }
+
+	            if (i >= result.length) {
+	                result.push({option: cptOption});
+	            }
+	        });
+
+	        return result;
+	    };
+
+	    /**
+	     * @public
+	     * @param {Object} cptOption
+	     * @return {boolean}
+	     */
+	    modelUtil.isIdInner = function (cptOption) {
+	        return zrUtil.isObject(cptOption)
+	            && cptOption.id
+	            && (cptOption.id + '').indexOf('\0_ec_\0') === 0;
+	    };
+
+	    /**
+	     * A helper for removing duplicate items between batchA and batchB,
+	     * and in themselves, and categorize by series.
+	     *
+	     * @param {Array.<Object>} batchA Like: [{seriesId: 2, dataIndex: [32, 4, 5]}, ...]
+	     * @param {Array.<Object>} batchB Like: [{seriesId: 2, dataIndex: [32, 4, 5]}, ...]
+	     * @return {Array.<Array.<Object>, Array.<Object>>} result: [resultBatchA, resultBatchB]
+	     */
+	    modelUtil.compressBatches = function (batchA, batchB) {
+	        var mapA = {};
+	        var mapB = {};
+
+	        makeMap(batchA || [], mapA);
+	        makeMap(batchB || [], mapB, mapA);
+
+	        return [mapToArray(mapA), mapToArray(mapB)];
+
+	        function makeMap(sourceBatch, map, otherMap) {
+	            for (var i = 0, len = sourceBatch.length; i < len; i++) {
+	                var seriesId = sourceBatch[i].seriesId;
+	                var dataIndices = modelUtil.normalizeToArray(sourceBatch[i].dataIndex);
+	                var otherDataIndices = otherMap && otherMap[seriesId];
+
+	                for (var j = 0, lenj = dataIndices.length; j < lenj; j++) {
+	                    var dataIndex = dataIndices[j];
+
+	                    if (otherDataIndices && otherDataIndices[dataIndex]) {
+	                        otherDataIndices[dataIndex] = null;
+	                    }
+	                    else {
+	                        (map[seriesId] || (map[seriesId] = {}))[dataIndex] = 1;
+	                    }
+	                }
+	            }
+	        }
+
+	        function mapToArray(map, isData) {
+	            var result = [];
+	            for (var i in map) {
+	                if (map.hasOwnProperty(i) && map[i] != null) {
+	                    if (isData) {
+	                        result.push(+i);
+	                    }
+	                    else {
+	                        var dataIndices = mapToArray(map[i], true);
+	                        dataIndices.length && result.push({seriesId: i, dataIndex: dataIndices});
+	                    }
+	                }
+	            }
+	            return result;
+	        }
+	    };
+
+	    module.exports = modelUtil;
+
+
+/***/ },
+/* 6 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+	    var numberUtil = __webpack_require__(7);
+	    var textContain = __webpack_require__(8);
+
+	    /**
+	     * 每三位默认加,格式化
+	     * @type {string|number} x
+	     */
+	    function addCommas(x) {
+	        if (isNaN(x)) {
+	            return '-';
+	        }
+	        x = (x + '').split('.');
+	        return x[0].replace(/(\d{1,3})(?=(?:\d{3})+(?!\d))/g,'$1,')
+	               + (x.length > 1 ? ('.' + x[1]) : '');
+	    }
+
+	    /**
+	     * @param {string} str
+	     * @return {string} str
+	     */
+	    function toCamelCase(str) {
+	        return str.toLowerCase().replace(/-(.)/g, function(match, group1) {
+	            return group1.toUpperCase();
+	        });
+	    }
+
+	    /**
+	     * Normalize css liked array configuration
+	     * e.g.
+	     *  3 => [3, 3, 3, 3]
+	     *  [4, 2] => [4, 2, 4, 2]
+	     *  [4, 3, 2] => [4, 3, 2, 3]
+	     * @param {number|Array.<number>} val
+	     */
+	    function normalizeCssArray(val) {
+	        var len = val.length;
+	        if (typeof (val) === 'number') {
+	            return [val, val, val, val];
+	        }
+	        else if (len === 2) {
+	            // vertical | horizontal
+	            return [val[0], val[1], val[0], val[1]];
+	        }
+	        else if (len === 3) {
+	            // top | horizontal | bottom
+	            return [val[0], val[1], val[2], val[1]];
+	        }
+	        return val;
+	    }
+
+	    function encodeHTML(source) {
+	        return String(source)
+	            .replace(/&/g, '&amp;')
+	            .replace(/</g, '&lt;')
+	            .replace(/>/g, '&gt;')
+	            .replace(/"/g, '&quot;')
+	            .replace(/'/g, '&#39;');
+	    }
+
+	    var TPL_VAR_ALIAS = ['a', 'b', 'c', 'd', 'e', 'f', 'g'];
+
+	    function wrapVar(varName, seriesIdx) {
+	        return '{' + varName + (seriesIdx == null ? '' : seriesIdx) + '}';
+	    }
+	    /**
+	     * Template formatter
+	     * @param  {string} tpl
+	     * @param  {Array.<Object>|Object} paramsList
+	     * @return {string}
+	     */
+	    function formatTpl(tpl, paramsList) {
+	        if (!zrUtil.isArray(paramsList)) {
+	            paramsList = [paramsList];
+	        }
+	        var seriesLen = paramsList.length;
+	        if (!seriesLen) {
+	            return '';
+	        }
+
+	        var $vars = paramsList[0].$vars || [];
+	        for (var i = 0; i < $vars.length; i++) {
+	            var alias = TPL_VAR_ALIAS[i];
+	            tpl = tpl.replace(wrapVar(alias),  wrapVar(alias, 0));
+	        }
+	        for (var seriesIdx = 0; seriesIdx < seriesLen; seriesIdx++) {
+	            for (var k = 0; k < $vars.length; k++) {
+	                tpl = tpl.replace(
+	                    wrapVar(TPL_VAR_ALIAS[k], seriesIdx),
+	                    paramsList[seriesIdx][$vars[k]]
+	                );
+	            }
+	        }
+
+	        return tpl;
+	    }
+
+	    /**
+	     * ISO Date format
+	     * @param {string} tpl
+	     * @param {number} value
+	     * @inner
+	     */
+	    function formatTime(tpl, value) {
+	        if (tpl === 'week'
+	            || tpl === 'month'
+	            || tpl === 'quarter'
+	            || tpl === 'half-year'
+	            || tpl === 'year'
+	        ) {
+	            tpl = 'MM-dd\nyyyy';
+	        }
+
+	        var date = numberUtil.parseDate(value);
+	        var y = date.getFullYear();
+	        var M = date.getMonth() + 1;
+	        var d = date.getDate();
+	        var h = date.getHours();
+	        var m = date.getMinutes();
+	        var s = date.getSeconds();
+
+	        tpl = tpl.replace('MM', s2d(M))
+	            .toLowerCase()
+	            .replace('yyyy', y)
+	            .replace('yy', y % 100)
+	            .replace('dd', s2d(d))
+	            .replace('d', d)
+	            .replace('hh', s2d(h))
+	            .replace('h', h)
+	            .replace('mm', s2d(m))
+	            .replace('m', m)
+	            .replace('ss', s2d(s))
+	            .replace('s', s);
+
+	        return tpl;
+	    }
+
+	    /**
+	     * @param {string} str
+	     * @return {string}
+	     * @inner
+	     */
+	    function s2d(str) {
+	        return str < 10 ? ('0' + str) : str;
+	    }
+
+	    module.exports = {
+
+	        normalizeCssArray: normalizeCssArray,
+
+	        addCommas: addCommas,
+
+	        toCamelCase: toCamelCase,
+
+	        encodeHTML: encodeHTML,
+
+	        formatTpl: formatTpl,
+
+	        formatTime: formatTime,
+
+	        truncateText: textContain.truncateText
+	    };
+
+
+/***/ },
+/* 7 */
+/***/ function(module, exports) {
+
+	/**
+	 * 数值处理模块
+	 * @module echarts/util/number
+	 */
+
+
+
+	    var number = {};
+
+	    var RADIAN_EPSILON = 1e-4;
+
+	    function _trim(str) {
+	        return str.replace(/^\s+/, '').replace(/\s+$/, '');
+	    }
+
+	    /**
+	     * Linear mapping a value from domain to range
+	     * @memberOf module:echarts/util/number
+	     * @param  {(number|Array.<number>)} val
+	     * @param  {Array.<number>} domain Domain extent domain[0] can be bigger than domain[1]
+	     * @param  {Array.<number>} range  Range extent range[0] can be bigger than range[1]
+	     * @param  {boolean} clamp
+	     * @return {(number|Array.<number>}
+	     */
+	    number.linearMap = function (val, domain, range, clamp) {
+	        var subDomain = domain[1] - domain[0];
+	        var subRange = range[1] - range[0];
+
+	        if (subDomain === 0) {
+	            return subRange === 0
+	                ? range[0]
+	                : (range[0] + range[1]) / 2;
+	        }
+
+	        // Avoid accuracy problem in edge, such as
+	        // 146.39 - 62.83 === 83.55999999999999.
+	        // See echarts/test/ut/spec/util/number.js#linearMap#accuracyError
+	        // It is a little verbose for efficiency considering this method
+	        // is a hotspot.
+	        if (clamp) {
+	            if (subDomain > 0) {
+	                if (val <= domain[0]) {
+	                    return range[0];
+	                }
+	                else if (val >= domain[1]) {
+	                    return range[1];
+	                }
+	            }
+	            else {
+	                if (val >= domain[0]) {
+	                    return range[0];
+	                }
+	                else if (val <= domain[1]) {
+	                    return range[1];
+	                }
+	            }
+	        }
+	        else {
+	            if (val === domain[0]) {
+	                return range[0];
+	            }
+	            if (val === domain[1]) {
+	                return range[1];
+	            }
+	        }
+
+	        return (val - domain[0]) / subDomain * subRange + range[0];
+	    };
+
+	    /**
+	     * Convert a percent string to absolute number.
+	     * Returns NaN if percent is not a valid string or number
+	     * @memberOf module:echarts/util/number
+	     * @param {string|number} percent
+	     * @param {number} all
+	     * @return {number}
+	     */
+	    number.parsePercent = function(percent, all) {
+	        switch (percent) {
+	            case 'center':
+	            case 'middle':
+	                percent = '50%';
+	                break;
+	            case 'left':
+	            case 'top':
+	                percent = '0%';
+	                break;
+	            case 'right':
+	            case 'bottom':
+	                percent = '100%';
+	                break;
+	        }
+	        if (typeof percent === 'string') {
+	            if (_trim(percent).match(/%$/)) {
+	                return parseFloat(percent) / 100 * all;
+	            }
+
+	            return parseFloat(percent);
+	        }
+
+	        return percent == null ? NaN : +percent;
+	    };
+
+	    /**
+	     * Fix rounding error of float numbers
+	     * @param {number} x
+	     * @return {number}
+	     */
+	    number.round = function (x) {
+	        // PENDING
+	        return +(+x).toFixed(10);
+	    };
+
+	    number.asc = function (arr) {
+	        arr.sort(function (a, b) {
+	            return a - b;
+	        });
+	        return arr;
+	    };
+
+	    /**
+	     * Get precision
+	     * @param {number} val
+	     */
+	    number.getPrecision = function (val) {
+	        val = +val;
+	        if (isNaN(val)) {
+	            return 0;
+	        }
+	        // It is much faster than methods converting number to string as follows
+	        //      var tmp = val.toString();
+	        //      return tmp.length - 1 - tmp.indexOf('.');
+	        // especially when precision is low
+	        var e = 1;
+	        var count = 0;
+	        while (Math.round(val * e) / e !== val) {
+	            e *= 10;
+	            count++;
+	        }
+	        return count;
+	    };
+
+	    /**
+	     * @param {Array.<number>} dataExtent
+	     * @param {Array.<number>} pixelExtent
+	     * @return {number}  precision
+	     */
+	    number.getPixelPrecision = function (dataExtent, pixelExtent) {
+	        var log = Math.log;
+	        var LN10 = Math.LN10;
+	        var dataQuantity = Math.floor(log(dataExtent[1] - dataExtent[0]) / LN10);
+	        var sizeQuantity = Math.round(log(Math.abs(pixelExtent[1] - pixelExtent[0])) / LN10);
+	        return Math.max(
+	            -dataQuantity + sizeQuantity,
+	            0
+	        );
+	    };
+
+	    // Number.MAX_SAFE_INTEGER, ie do not support.
+	    number.MAX_SAFE_INTEGER = 9007199254740991;
+
+	    /**
+	     * To 0 - 2 * PI, considering negative radian.
+	     * @param {number} radian
+	     * @return {number}
+	     */
+	    number.remRadian = function (radian) {
+	        var pi2 = Math.PI * 2;
+	        return (radian % pi2 + pi2) % pi2;
+	    };
+
+	    /**
+	     * @param {type} radian
+	     * @return {boolean}
+	     */
+	    number.isRadianAroundZero = function (val) {
+	        return val > -RADIAN_EPSILON && val < RADIAN_EPSILON;
+	    };
+
+	    /**
+	     * @param {string|Date|number} value
+	     * @return {number} timestamp
+	     */
+	    number.parseDate = function (value) {
+	        return value instanceof Date
+	            ? value
+	            : new Date(
+	                typeof value === 'string'
+	                    // FIXME Date.parse('1970-01-01') is UTC, Date.parse('1970/01/01') is local
+	                    ? (new Date(value.replace(/-/g, '/')) - new Date('1970/01/01'))
+	                    : Math.round(value)
+	            );
+	    };
+
+	    /**
+	     * Quantity of a number. e.g. 0.1, 1, 10, 100
+	     * @param  {number} val
+	     * @return {number}
+	     */
+	    number.quantity = function (val) {
+	        return Math.pow(10, Math.floor(Math.log(val) / Math.LN10));
+	    };
+
+	    // "Nice Numbers for Graph Labels" of Graphic Gems
+	    /**
+	     * find a “nice” number approximately equal to x. Round the number if round = true, take ceiling if round = false
+	     * The primary observation is that the “nicest” numbers in decimal are 1, 2, and 5, and all power-of-ten multiples of these numbers.
+	     * @param  {number} val
+	     * @param  {boolean} round
+	     * @return {number}
+	     */
+	    number.nice = function (val, round) {
+	        var exp10 = number.quantity(val);
+	        var f = val / exp10; // between 1 and 10
+	        var nf;
+	        if (round) {
+	            if (f < 1.5) { nf = 1; }
+	            else if (f < 2.5) { nf = 2; }
+	            else if (f < 4) { nf = 3; }
+	            else if (f < 7) { nf = 5; }
+	            else { nf = 10; }
+	        }
+	        else {
+	            if (f < 1) { nf = 1; }
+	            else if (f < 2) { nf = 2; }
+	            else if (f < 3) { nf = 3; }
+	            else if (f < 5) { nf = 5; }
+	            else { nf = 10; }
+	        }
+	        return nf * exp10;
+	    };
+
+	    module.exports = number;
+
+
+/***/ },
+/* 8 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var textWidthCache = {};
+	    var textWidthCacheCounter = 0;
+	    var TEXT_CACHE_MAX = 5000;
+
+	    var util = __webpack_require__(4);
+	    var BoundingRect = __webpack_require__(9);
+	    var retrieve = util.retrieve;
+
+	    function getTextWidth(text, textFont) {
+	        var key = text + ':' + textFont;
+	        if (textWidthCache[key]) {
+	            return textWidthCache[key];
+	        }
+
+	        var textLines = (text + '').split('\n');
+	        var width = 0;
+
+	        for (var i = 0, l = textLines.length; i < l; i++) {
+	            // measureText 可以被覆盖以兼容不支持 Canvas 的环境
+	            width = Math.max(textContain.measureText(textLines[i], textFont).width, width);
+	        }
+
+	        if (textWidthCacheCounter > TEXT_CACHE_MAX) {
+	            textWidthCacheCounter = 0;
+	            textWidthCache = {};
+	        }
+	        textWidthCacheCounter++;
+	        textWidthCache[key] = width;
+
+	        return width;
+	    }
+
+	    function getTextRect(text, textFont, textAlign, textBaseline) {
+	        var textLineLen = ((text || '') + '').split('\n').length;
+
+	        var width = getTextWidth(text, textFont);
+	        // FIXME 高度计算比较粗暴
+	        var lineHeight = getTextWidth('国', textFont);
+	        var height = textLineLen * lineHeight;
+
+	        var rect = new BoundingRect(0, 0, width, height);
+	        // Text has a special line height property
+	        rect.lineHeight = lineHeight;
+
+	        switch (textBaseline) {
+	            case 'bottom':
+	            case 'alphabetic':
+	                rect.y -= lineHeight;
+	                break;
+	            case 'middle':
+	                rect.y -= lineHeight / 2;
+	                break;
+	            // case 'hanging':
+	            // case 'top':
+	        }
+
+	        // FIXME Right to left language
+	        switch (textAlign) {
+	            case 'end':
+	            case 'right':
+	                rect.x -= rect.width;
+	                break;
+	            case 'center':
+	                rect.x -= rect.width / 2;
+	                break;
+	            // case 'start':
+	            // case 'left':
+	        }
+
+	        return rect;
+	    }
+
+	    function adjustTextPositionOnRect(textPosition, rect, textRect, distance) {
+
+	        var x = rect.x;
+	        var y = rect.y;
+
+	        var height = rect.height;
+	        var width = rect.width;
+
+	        var textHeight = textRect.height;
+
+	        var halfHeight = height / 2 - textHeight / 2;
+
+	        var textAlign = 'left';
+
+	        switch (textPosition) {
+	            case 'left':
+	                x -= distance;
+	                y += halfHeight;
+	                textAlign = 'right';
+	                break;
+	            case 'right':
+	                x += distance + width;
+	                y += halfHeight;
+	                textAlign = 'left';
+	                break;
+	            case 'top':
+	                x += width / 2;
+	                y -= distance + textHeight;
+	                textAlign = 'center';
+	                break;
+	            case 'bottom':
+	                x += width / 2;
+	                y += height + distance;
+	                textAlign = 'center';
+	                break;
+	            case 'inside':
+	                x += width / 2;
+	                y += halfHeight;
+	                textAlign = 'center';
+	                break;
+	            case 'insideLeft':
+	                x += distance;
+	                y += halfHeight;
+	                textAlign = 'left';
+	                break;
+	            case 'insideRight':
+	                x += width - distance;
+	                y += halfHeight;
+	                textAlign = 'right';
+	                break;
+	            case 'insideTop':
+	                x += width / 2;
+	                y += distance;
+	                textAlign = 'center';
+	                break;
+	            case 'insideBottom':
+	                x += width / 2;
+	                y += height - textHeight - distance;
+	                textAlign = 'center';
+	                break;
+	            case 'insideTopLeft':
+	                x += distance;
+	                y += distance;
+	                textAlign = 'left';
+	                break;
+	            case 'insideTopRight':
+	                x += width - distance;
+	                y += distance;
+	                textAlign = 'right';
+	                break;
+	            case 'insideBottomLeft':
+	                x += distance;
+	                y += height - textHeight - distance;
+	                break;
+	            case 'insideBottomRight':
+	                x += width - distance;
+	                y += height - textHeight - distance;
+	                textAlign = 'right';
+	                break;
+	        }
+
+	        return {
+	            x: x,
+	            y: y,
+	            textAlign: textAlign,
+	            textBaseline: 'top'
+	        };
+	    }
+
+	    /**
+	     * Show ellipsis if overflow.
+	     *
+	     * @param  {string} text
+	     * @param  {string} containerWidth
+	     * @param  {string} textFont
+	     * @param  {number} [ellipsis='...']
+	     * @param  {Object} [options]
+	     * @param  {number} [options.maxIterations=3]
+	     * @param  {number} [options.minChar=0] If truncate result are less
+	     *                  then minChar, ellipsis will not show, which is
+	     *                  better for user hint in some cases.
+	     * @param  {number} [options.placeholder=''] When all truncated, use the placeholder.
+	     * @return {string}
+	     */
+	    function truncateText(text, containerWidth, textFont, ellipsis, options) {
+	        if (!containerWidth) {
+	            return '';
+	        }
+
+	        options = options || {};
+
+	        ellipsis = retrieve(ellipsis, '...');
+	        var maxIterations = retrieve(options.maxIterations, 2);
+	        var minChar = retrieve(options.minChar, 0);
+	        // FIXME
+	        // Other languages?
+	        var cnCharWidth = getTextWidth('国', textFont);
+	        // FIXME
+	        // Consider proportional font?
+	        var ascCharWidth = getTextWidth('a', textFont);
+	        var placeholder = retrieve(options.placeholder, '');
+
+	        // Example 1: minChar: 3, text: 'asdfzxcv', truncate result: 'asdf', but not: 'a...'.
+	        // Example 2: minChar: 3, text: '维度', truncate result: '维', but not: '...'.
+	        var contentWidth = containerWidth = Math.max(0, containerWidth - 1); // Reserve some gap.
+	        for (var i = 0; i < minChar && contentWidth >= ascCharWidth; i++) {
+	            contentWidth -= ascCharWidth;
+	        }
+
+	        var ellipsisWidth = getTextWidth(ellipsis);
+	        if (ellipsisWidth > contentWidth) {
+	            ellipsis = '';
+	            ellipsisWidth = 0;
+	        }
+
+	        contentWidth = containerWidth - ellipsisWidth;
+
+	        var textLines = (text + '').split('\n');
+
+	        for (var i = 0, len = textLines.length; i < len; i++) {
+	            var textLine = textLines[i];
+	            var lineWidth = getTextWidth(textLine, textFont);
+
+	            if (lineWidth <= containerWidth) {
+	                continue;
+	            }
+
+	            for (var j = 0;; j++) {
+	                if (lineWidth <= contentWidth || j >= maxIterations) {
+	                    textLine += ellipsis;
+	                    break;
+	                }
+
+	                var subLength = j === 0
+	                    ? estimateLength(textLine, contentWidth, ascCharWidth, cnCharWidth)
+	                    : lineWidth > 0
+	                    ? Math.floor(textLine.length * contentWidth / lineWidth)
+	                    : 0;
+
+	                textLine = textLine.substr(0, subLength);
+	                lineWidth = getTextWidth(textLine, textFont);
+	            }
+
+	            if (textLine === '') {
+	                textLine = placeholder;
+	            }
+
+	            textLines[i] = textLine;
+	        }
+
+	        return textLines.join('\n');
+	    }
+
+	    function estimateLength(text, contentWidth, ascCharWidth, cnCharWidth) {
+	        var width = 0;
+	        var i = 0;
+	        for (var len = text.length; i < len && width < contentWidth; i++) {
+	            var charCode = text.charCodeAt(i);
+	            width += (0 <= charCode && charCode <= 127) ? ascCharWidth : cnCharWidth;
+	        }
+	        return i;
+	    }
+
+	    var textContain = {
+
+	        getWidth: getTextWidth,
+
+	        getBoundingRect: getTextRect,
+
+	        adjustTextPositionOnRect: adjustTextPositionOnRect,
+
+	        truncateText: truncateText,
+
+	        measureText: function (text, textFont) {
+	            var ctx = util.getContext();
+	            ctx.font = textFont || '12px sans-serif';
+	            return ctx.measureText(text);
+	        }
+	    };
+
+	    module.exports = textContain;
+
+
+/***/ },
+/* 9 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+	/**
+	 * @module echarts/core/BoundingRect
+	 */
+
+
+	    var vec2 = __webpack_require__(10);
+	    var matrix = __webpack_require__(11);
+
+	    var v2ApplyTransform = vec2.applyTransform;
+	    var mathMin = Math.min;
+	    var mathAbs = Math.abs;
+	    var mathMax = Math.max;
+	    /**
+	     * @alias module:echarts/core/BoundingRect
+	     */
+	    function BoundingRect(x, y, width, height) {
+	        /**
+	         * @type {number}
+	         */
+	        this.x = x;
+	        /**
+	         * @type {number}
+	         */
+	        this.y = y;
+	        /**
+	         * @type {number}
+	         */
+	        this.width = width;
+	        /**
+	         * @type {number}
+	         */
+	        this.height = height;
+	    }
+
+	    BoundingRect.prototype = {
+
+	        constructor: BoundingRect,
+
+	        /**
+	         * @param {module:echarts/core/BoundingRect} other
+	         */
+	        union: function (other) {
+	            var x = mathMin(other.x, this.x);
+	            var y = mathMin(other.y, this.y);
+
+	            this.width = mathMax(
+	                    other.x + other.width,
+	                    this.x + this.width
+	                ) - x;
+	            this.height = mathMax(
+	                    other.y + other.height,
+	                    this.y + this.height
+	                ) - y;
+	            this.x = x;
+	            this.y = y;
+	        },
+
+	        /**
+	         * @param {Array.<number>} m
+	         * @methods
+	         */
+	        applyTransform: (function () {
+	            var min = [];
+	            var max = [];
+	            return function (m) {
+	                // In case usage like this
+	                // el.getBoundingRect().applyTransform(el.transform)
+	                // And element has no transform
+	                if (!m) {
+	                    return;
+	                }
+	                min[0] = this.x;
+	                min[1] = this.y;
+	                max[0] = this.x + this.width;
+	                max[1] = this.y + this.height;
+
+	                v2ApplyTransform(min, min, m);
+	                v2ApplyTransform(max, max, m);
+
+	                this.x = mathMin(min[0], max[0]);
+	                this.y = mathMin(min[1], max[1]);
+	                this.width = mathAbs(max[0] - min[0]);
+	                this.height = mathAbs(max[1] - min[1]);
+	            };
+	        })(),
+
+	        /**
+	         * Calculate matrix of transforming from self to target rect
+	         * @param  {module:zrender/core/BoundingRect} b
+	         * @return {Array.<number>}
+	         */
+	        calculateTransform: function (b) {
+	            var a = this;
+	            var sx = b.width / a.width;
+	            var sy = b.height / a.height;
+
+	            var m = matrix.create();
+
+	            // 矩阵右乘
+	            matrix.translate(m, m, [-a.x, -a.y]);
+	            matrix.scale(m, m, [sx, sy]);
+	            matrix.translate(m, m, [b.x, b.y]);
+
+	            return m;
+	        },
+
+	        /**
+	         * @param {(module:echarts/core/BoundingRect|Object)} b
+	         * @return {boolean}
+	         */
+	        intersect: function (b) {
+	            var a = this;
+	            var ax0 = a.x;
+	            var ax1 = a.x + a.width;
+	            var ay0 = a.y;
+	            var ay1 = a.y + a.height;
+
+	            var bx0 = b.x;
+	            var bx1 = b.x + b.width;
+	            var by0 = b.y;
+	            var by1 = b.y + b.height;
+
+	            return ! (ax1 < bx0 || bx1 < ax0 || ay1 < by0 || by1 < ay0);
+	        },
+
+	        contain: function (x, y) {
+	            var rect = this;
+	            return x >= rect.x
+	                && x <= (rect.x + rect.width)
+	                && y >= rect.y
+	                && y <= (rect.y + rect.height);
+	        },
+
+	        /**
+	         * @return {module:echarts/core/BoundingRect}
+	         */
+	        clone: function () {
+	            return new BoundingRect(this.x, this.y, this.width, this.height);
+	        },
+
+	        /**
+	         * Copy from another rect
+	         */
+	        copy: function (other) {
+	            this.x = other.x;
+	            this.y = other.y;
+	            this.width = other.width;
+	            this.height = other.height;
+	        }
+	    };
+
+	    module.exports = BoundingRect;
+
+
+/***/ },
+/* 10 */
+/***/ function(module, exports) {
+
+	
+	    var ArrayCtor = typeof Float32Array === 'undefined'
+	        ? Array
+	        : Float32Array;
+
+	    /**
+	     * @typedef {Float32Array|Array.<number>} Vector2
+	     */
+	    /**
+	     * 二维向量类
+	     * @exports zrender/tool/vector
+	     */
+	    var vector = {
+	        /**
+	         * 创建一个向量
+	         * @param {number} [x=0]
+	         * @param {number} [y=0]
+	         * @return {Vector2}
+	         */
+	        create: function (x, y) {
+	            var out = new ArrayCtor(2);
+	            if (x == null) {
+	                x = 0;
+	            }
+	            if (y == null) {
+	                y = 0;
+	            }
+	            out[0] = x;
+	            out[1] = y;
+	            return out;
+	        },
+
+	        /**
+	         * 复制向量数据
+	         * @param {Vector2} out
+	         * @param {Vector2} v
+	         * @return {Vector2}
+	         */
+	        copy: function (out, v) {
+	            out[0] = v[0];
+	            out[1] = v[1];
+	            return out;
+	        },
+
+	        /**
+	         * 克隆一个向量
+	         * @param {Vector2} v
+	         * @return {Vector2}
+	         */
+	        clone: function (v) {
+	            var out = new ArrayCtor(2);
+	            out[0] = v[0];
+	            out[1] = v[1];
+	            return out;
+	        },
+
+	        /**
+	         * 设置向量的两个项
+	         * @param {Vector2} out
+	         * @param {number} a
+	         * @param {number} b
+	         * @return {Vector2} 结果
+	         */
+	        set: function (out, a, b) {
+	            out[0] = a;
+	            out[1] = b;
+	            return out;
+	        },
+
+	        /**
+	         * 向量相加
+	         * @param {Vector2} out
+	         * @param {Vector2} v1
+	         * @param {Vector2} v2
+	         */
+	        add: function (out, v1, v2) {
+	            out[0] = v1[0] + v2[0];
+	            out[1] = v1[1] + v2[1];
+	            return out;
+	        },
+
+	        /**
+	         * 向量缩放后相加
+	         * @param {Vector2} out
+	         * @param {Vector2} v1
+	         * @param {Vector2} v2
+	         * @param {number} a
+	         */
+	        scaleAndAdd: function (out, v1, v2, a) {
+	            out[0] = v1[0] + v2[0] * a;
+	            out[1] = v1[1] + v2[1] * a;
+	            return out;
+	        },
+
+	        /**
+	         * 向量相减
+	         * @param {Vector2} out
+	         * @param {Vector2} v1
+	         * @param {Vector2} v2
+	         */
+	        sub: function (out, v1, v2) {
+	            out[0] = v1[0] - v2[0];
+	            out[1] = v1[1] - v2[1];
+	            return out;
+	        },
+
+	        /**
+	         * 向量长度
+	         * @param {Vector2} v
+	         * @return {number}
+	         */
+	        len: function (v) {
+	            return Math.sqrt(this.lenSquare(v));
+	        },
+
+	        /**
+	         * 向量长度平方
+	         * @param {Vector2} v
+	         * @return {number}
+	         */
+	        lenSquare: function (v) {
+	            return v[0] * v[0] + v[1] * v[1];
+	        },
+
+	        /**
+	         * 向量乘法
+	         * @param {Vector2} out
+	         * @param {Vector2} v1
+	         * @param {Vector2} v2
+	         */
+	        mul: function (out, v1, v2) {
+	            out[0] = v1[0] * v2[0];
+	            out[1] = v1[1] * v2[1];
+	            return out;
+	        },
+
+	        /**
+	         * 向量除法
+	         * @param {Vector2} out
+	         * @param {Vector2} v1
+	         * @param {Vector2} v2
+	         */
+	        div: function (out, v1, v2) {
+	            out[0] = v1[0] / v2[0];
+	            out[1] = v1[1] / v2[1];
+	            return out;
+	        },
+
+	        /**
+	         * 向量点乘
+	         * @param {Vector2} v1
+	         * @param {Vector2} v2
+	         * @return {number}
+	         */
+	        dot: function (v1, v2) {
+	            return v1[0] * v2[0] + v1[1] * v2[1];
+	        },
+
+	        /**
+	         * 向量缩放
+	         * @param {Vector2} out
+	         * @param {Vector2} v
+	         * @param {number} s
+	         */
+	        scale: function (out, v, s) {
+	            out[0] = v[0] * s;
+	            out[1] = v[1] * s;
+	            return out;
+	        },
+
+	        /**
+	         * 向量归一化
+	         * @param {Vector2} out
+	         * @param {Vector2} v
+	         */
+	        normalize: function (out, v) {
+	            var d = vector.len(v);
+	            if (d === 0) {
+	                out[0] = 0;
+	                out[1] = 0;
+	            }
+	            else {
+	                out[0] = v[0] / d;
+	                out[1] = v[1] / d;
+	            }
+	            return out;
+	        },
+
+	        /**
+	         * 计算向量间距离
+	         * @param {Vector2} v1
+	         * @param {Vector2} v2
+	         * @return {number}
+	         */
+	        distance: function (v1, v2) {
+	            return Math.sqrt(
+	                (v1[0] - v2[0]) * (v1[0] - v2[0])
+	                + (v1[1] - v2[1]) * (v1[1] - v2[1])
+	            );
+	        },
+
+	        /**
+	         * 向量距离平方
+	         * @param {Vector2} v1
+	         * @param {Vector2} v2
+	         * @return {number}
+	         */
+	        distanceSquare: function (v1, v2) {
+	            return (v1[0] - v2[0]) * (v1[0] - v2[0])
+	                + (v1[1] - v2[1]) * (v1[1] - v2[1]);
+	        },
+
+	        /**
+	         * 求负向量
+	         * @param {Vector2} out
+	         * @param {Vector2} v
+	         */
+	        negate: function (out, v) {
+	            out[0] = -v[0];
+	            out[1] = -v[1];
+	            return out;
+	        },
+
+	        /**
+	         * 插值两个点
+	         * @param {Vector2} out
+	         * @param {Vector2} v1
+	         * @param {Vector2} v2
+	         * @param {number} t
+	         */
+	        lerp: function (out, v1, v2, t) {
+	            out[0] = v1[0] + t * (v2[0] - v1[0]);
+	            out[1] = v1[1] + t * (v2[1] - v1[1]);
+	            return out;
+	        },
+
+	        /**
+	         * 矩阵左乘向量
+	         * @param {Vector2} out
+	         * @param {Vector2} v
+	         * @param {Vector2} m
+	         */
+	        applyTransform: function (out, v, m) {
+	            var x = v[0];
+	            var y = v[1];
+	            out[0] = m[0] * x + m[2] * y + m[4];
+	            out[1] = m[1] * x + m[3] * y + m[5];
+	            return out;
+	        },
+	        /**
+	         * 求两个向量最小值
+	         * @param  {Vector2} out
+	         * @param  {Vector2} v1
+	         * @param  {Vector2} v2
+	         */
+	        min: function (out, v1, v2) {
+	            out[0] = Math.min(v1[0], v2[0]);
+	            out[1] = Math.min(v1[1], v2[1]);
+	            return out;
+	        },
+	        /**
+	         * 求两个向量最大值
+	         * @param  {Vector2} out
+	         * @param  {Vector2} v1
+	         * @param  {Vector2} v2
+	         */
+	        max: function (out, v1, v2) {
+	            out[0] = Math.max(v1[0], v2[0]);
+	            out[1] = Math.max(v1[1], v2[1]);
+	            return out;
+	        }
+	    };
+
+	    vector.length = vector.len;
+	    vector.lengthSquare = vector.lenSquare;
+	    vector.dist = vector.distance;
+	    vector.distSquare = vector.distanceSquare;
+
+	    module.exports = vector;
+
+
+
+/***/ },
+/* 11 */
+/***/ function(module, exports) {
+
+	
+	    var ArrayCtor = typeof Float32Array === 'undefined'
+	        ? Array
+	        : Float32Array;
+	    /**
+	     * 3x2矩阵操作类
+	     * @exports zrender/tool/matrix
+	     */
+	    var matrix = {
+	        /**
+	         * 创建一个单位矩阵
+	         * @return {Float32Array|Array.<number>}
+	         */
+	        create : function() {
+	            var out = new ArrayCtor(6);
+	            matrix.identity(out);
+
+	            return out;
+	        },
+	        /**
+	         * 设置矩阵为单位矩阵
+	         * @param {Float32Array|Array.<number>} out
+	         */
+	        identity : function(out) {
+	            out[0] = 1;
+	            out[1] = 0;
+	            out[2] = 0;
+	            out[3] = 1;
+	            out[4] = 0;
+	            out[5] = 0;
+	            return out;
+	        },
+	        /**
+	         * 复制矩阵
+	         * @param {Float32Array|Array.<number>} out
+	         * @param {Float32Array|Array.<number>} m
+	         */
+	        copy: function(out, m) {
+	            out[0] = m[0];
+	            out[1] = m[1];
+	            out[2] = m[2];
+	            out[3] = m[3];
+	            out[4] = m[4];
+	            out[5] = m[5];
+	            return out;
+	        },
+	        /**
+	         * 矩阵相乘
+	         * @param {Float32Array|Array.<number>} out
+	         * @param {Float32Array|Array.<number>} m1
+	         * @param {Float32Array|Array.<number>} m2
+	         */
+	        mul : function (out, m1, m2) {
+	            // Consider matrix.mul(m, m2, m);
+	            // where out is the same as m2.
+	            // So use temp variable to escape error.
+	            var out0 = m1[0] * m2[0] + m1[2] * m2[1];
+	            var out1 = m1[1] * m2[0] + m1[3] * m2[1];
+	            var out2 = m1[0] * m2[2] + m1[2] * m2[3];
+	            var out3 = m1[1] * m2[2] + m1[3] * m2[3];
+	            var out4 = m1[0] * m2[4] + m1[2] * m2[5] + m1[4];
+	            var out5 = m1[1] * m2[4] + m1[3] * m2[5] + m1[5];
+	            out[0] = out0;
+	            out[1] = out1;
+	            out[2] = out2;
+	            out[3] = out3;
+	            out[4] = out4;
+	            out[5] = out5;
+	            return out;
+	        },
+	        /**
+	         * 平移变换
+	         * @param {Float32Array|Array.<number>} out
+	         * @param {Float32Array|Array.<number>} a
+	         * @param {Float32Array|Array.<number>} v
+	         */
+	        translate : function(out, a, v) {
+	            out[0] = a[0];
+	            out[1] = a[1];
+	            out[2] = a[2];
+	            out[3] = a[3];
+	            out[4] = a[4] + v[0];
+	            out[5] = a[5] + v[1];
+	            return out;
+	        },
+	        /**
+	         * 旋转变换
+	         * @param {Float32Array|Array.<number>} out
+	         * @param {Float32Array|Array.<number>} a
+	         * @param {number} rad
+	         */
+	        rotate : function(out, a, rad) {
+	            var aa = a[0];
+	            var ac = a[2];
+	            var atx = a[4];
+	            var ab = a[1];
+	            var ad = a[3];
+	            var aty = a[5];
+	            var st = Math.sin(rad);
+	            var ct = Math.cos(rad);
+
+	            out[0] = aa * ct + ab * st;
+	            out[1] = -aa * st + ab * ct;
+	            out[2] = ac * ct + ad * st;
+	            out[3] = -ac * st + ct * ad;
+	            out[4] = ct * atx + st * aty;
+	            out[5] = ct * aty - st * atx;
+	            return out;
+	        },
+	        /**
+	         * 缩放变换
+	         * @param {Float32Array|Array.<number>} out
+	         * @param {Float32Array|Array.<number>} a
+	         * @param {Float32Array|Array.<number>} v
+	         */
+	        scale : function(out, a, v) {
+	            var vx = v[0];
+	            var vy = v[1];
+	            out[0] = a[0] * vx;
+	            out[1] = a[1] * vy;
+	            out[2] = a[2] * vx;
+	            out[3] = a[3] * vy;
+	            out[4] = a[4] * vx;
+	            out[5] = a[5] * vy;
+	            return out;
+	        },
+	        /**
+	         * 求逆矩阵
+	         * @param {Float32Array|Array.<number>} out
+	         * @param {Float32Array|Array.<number>} a
+	         */
+	        invert : function(out, a) {
+
+	            var aa = a[0];
+	            var ac = a[2];
+	            var atx = a[4];
+	            var ab = a[1];
+	            var ad = a[3];
+	            var aty = a[5];
+
+	            var det = aa * ad - ab * ac;
+	            if (!det) {
+	                return null;
+	            }
+	            det = 1.0 / det;
+
+	            out[0] = ad * det;
+	            out[1] = -ab * det;
+	            out[2] = -ac * det;
+	            out[3] = aa * det;
+	            out[4] = (ac * aty - ad * atx) * det;
+	            out[5] = (ab * atx - aa * aty) * det;
+	            return out;
+	        }
+	    };
+
+	    module.exports = matrix;
+
+
+
+/***/ },
+/* 12 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @module echarts/model/Model
+	 */
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var clazzUtil = __webpack_require__(13);
+
+	    /**
+	     * @alias module:echarts/model/Model
+	     * @constructor
+	     * @param {Object} option
+	     * @param {module:echarts/model/Model} [parentModel]
+	     * @param {module:echarts/model/Global} [ecModel]
+	     */
+	    function Model(option, parentModel, ecModel) {
+	        /**
+	         * @type {module:echarts/model/Model}
+	         * @readOnly
+	         */
+	        this.parentModel = parentModel;
+
+	        /**
+	         * @type {module:echarts/model/Global}
+	         * @readOnly
+	         */
+	        this.ecModel = ecModel;
+
+	        /**
+	         * @type {Object}
+	         * @protected
+	         */
+	        this.option = option;
+
+	        // Simple optimization
+	        // if (this.init) {
+	        //     if (arguments.length <= 4) {
+	        //         this.init(option, parentModel, ecModel, extraOpt);
+	        //     }
+	        //     else {
+	        //         this.init.apply(this, arguments);
+	        //     }
+	        // }
+	    }
+
+	    Model.prototype = {
+
+	        constructor: Model,
+
+	        /**
+	         * Model 的初始化函数
+	         * @param {Object} option
+	         */
+	        init: null,
+
+	        /**
+	         * 从新的 Option merge
+	         */
+	        mergeOption: function (option) {
+	            zrUtil.merge(this.option, option, true);
+	        },
+
+	        /**
+	         * @param {string} path
+	         * @param {boolean} [ignoreParent=false]
+	         * @return {*}
+	         */
+	        get: function (path, ignoreParent) {
+	            if (!path) {
+	                return this.option;
+	            }
+
+	            if (typeof path === 'string') {
+	                path = path.split('.');
+	            }
+
+	            var obj = this.option;
+	            var parentModel = this.parentModel;
+	            for (var i = 0; i < path.length; i++) {
+	                // Ignore empty
+	                if (!path[i]) {
+	                    continue;
+	                }
+	                // obj could be number/string/... (like 0)
+	                obj = (obj && typeof obj === 'object') ? obj[path[i]] : null;
+	                if (obj == null) {
+	                    break;
+	                }
+	            }
+	            if (obj == null && parentModel && !ignoreParent) {
+	                obj = parentModel.get(path);
+	            }
+	            return obj;
+	        },
+
+	        /**
+	         * @param {string} key
+	         * @param {boolean} [ignoreParent=false]
+	         * @return {*}
+	         */
+	        getShallow: function (key, ignoreParent) {
+	            var option = this.option;
+	            var val = option && option[key];
+	            var parentModel = this.parentModel;
+	            if (val == null && parentModel && !ignoreParent) {
+	                val = parentModel.getShallow(key);
+	            }
+	            return val;
+	        },
+
+	        /**
+	         * @param {string} path
+	         * @param {module:echarts/model/Model} [parentModel]
+	         * @return {module:echarts/model/Model}
+	         */
+	        getModel: function (path, parentModel) {
+	            var obj = this.get(path, true);
+	            var thisParentModel = this.parentModel;
+	            var model = new Model(
+	                obj, parentModel || (thisParentModel && thisParentModel.getModel(path)),
+	                this.ecModel
+	            );
+	            return model;
+	        },
+
+	        /**
+	         * If model has option
+	         */
+	        isEmpty: function () {
+	            return this.option == null;
+	        },
+
+	        restoreData: function () {},
+
+	        // Pending
+	        clone: function () {
+	            var Ctor = this.constructor;
+	            return new Ctor(zrUtil.clone(this.option));
+	        },
+
+	        setReadOnly: function (properties) {
+	            clazzUtil.setReadOnly(this, properties);
+	        }
+	    };
+
+	    // Enable Model.extend.
+	    clazzUtil.enableClassExtend(Model);
+
+	    var mixin = zrUtil.mixin;
+	    mixin(Model, __webpack_require__(14));
+	    mixin(Model, __webpack_require__(16));
+	    mixin(Model, __webpack_require__(17));
+	    mixin(Model, __webpack_require__(18));
+
+	    module.exports = Model;
+
+
+/***/ },
+/* 13 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+
+	    var clazz = {};
+
+	    var TYPE_DELIMITER = '.';
+	    var IS_CONTAINER = '___EC__COMPONENT__CONTAINER___';
+	    /**
+	     * @public
+	     */
+	    var parseClassType = clazz.parseClassType = function (componentType) {
+	        var ret = {main: '', sub: ''};
+	        if (componentType) {
+	            componentType = componentType.split(TYPE_DELIMITER);
+	            ret.main = componentType[0] || '';
+	            ret.sub = componentType[1] || '';
+	        }
+	        return ret;
+	    };
+	    /**
+	     * @public
+	     */
+	    clazz.enableClassExtend = function (RootClass) {
+
+	        RootClass.$constructor = RootClass;
+	        RootClass.extend = function (proto) {
+	            var superClass = this;
+	            var ExtendedClass = function () {
+	                if (!proto.$constructor) {
+	                    superClass.apply(this, arguments);
+	                }
+	                else {
+	                    proto.$constructor.apply(this, arguments);
+	                }
+	            };
+
+	            zrUtil.extend(ExtendedClass.prototype, proto);
+
+	            ExtendedClass.extend = this.extend;
+	            ExtendedClass.superCall = superCall;
+	            ExtendedClass.superApply = superApply;
+	            zrUtil.inherits(ExtendedClass, this);
+	            ExtendedClass.superClass = superClass;
+
+	            return ExtendedClass;
+	        };
+	    };
+
+	    // superCall should have class info, which can not be fetch from 'this'.
+	    // Consider this case:
+	    // class A has method f,
+	    // class B inherits class A, overrides method f, f call superApply('f'),
+	    // class C inherits class B, do not overrides method f,
+	    // then when method of class C is called, dead loop occured.
+	    function superCall(context, methodName) {
+	        var args = zrUtil.slice(arguments, 2);
+	        return this.superClass.prototype[methodName].apply(context, args);
+	    }
+
+	    function superApply(context, methodName, args) {
+	        return this.superClass.prototype[methodName].apply(context, args);
+	    }
+
+	    /**
+	     * @param {Object} entity
+	     * @param {Object} options
+	     * @param {boolean} [options.registerWhenExtend]
+	     * @public
+	     */
+	    clazz.enableClassManagement = function (entity, options) {
+	        options = options || {};
+
+	        /**
+	         * Component model classes
+	         * key: componentType,
+	         * value:
+	         *     componentClass, when componentType is 'xxx'
+	         *     or Object.<subKey, componentClass>, when componentType is 'xxx.yy'
+	         * @type {Object}
+	         */
+	        var storage = {};
+
+	        entity.registerClass = function (Clazz, componentType) {
+	            if (componentType) {
+	                componentType = parseClassType(componentType);
+
+	                if (!componentType.sub) {
+	                    if (true) {
+	                        if (storage[componentType.main]) {
+	                            console.warn(componentType.main + ' exists.');
+	                        }
+	                    }
+	                    storage[componentType.main] = Clazz;
+	                }
+	                else if (componentType.sub !== IS_CONTAINER) {
+	                    var container = makeContainer(componentType);
+	                    container[componentType.sub] = Clazz;
+	                }
+	            }
+	            return Clazz;
+	        };
+
+	        entity.getClass = function (componentTypeMain, subType, throwWhenNotFound) {
+	            var Clazz = storage[componentTypeMain];
+
+	            if (Clazz && Clazz[IS_CONTAINER]) {
+	                Clazz = subType ? Clazz[subType] : null;
+	            }
+
+	            if (throwWhenNotFound && !Clazz) {
+	                throw new Error(
+	                    'Component ' + componentTypeMain + '.' + (subType || '') + ' not exists. Load it first.'
+	                );
+	            }
+
+	            return Clazz;
+	        };
+
+	        entity.getClassesByMainType = function (componentType) {
+	            componentType = parseClassType(componentType);
+
+	            var result = [];
+	            var obj = storage[componentType.main];
+
+	            if (obj && obj[IS_CONTAINER]) {
+	                zrUtil.each(obj, function (o, type) {
+	                    type !== IS_CONTAINER && result.push(o);
+	                });
+	            }
+	            else {
+	                result.push(obj);
+	            }
+
+	            return result;
+	        };
+
+	        entity.hasClass = function (componentType) {
+	            // Just consider componentType.main.
+	            componentType = parseClassType(componentType);
+	            return !!storage[componentType.main];
+	        };
+
+	        /**
+	         * @return {Array.<string>} Like ['aa', 'bb'], but can not be ['aa.xx']
+	         */
+	        entity.getAllClassMainTypes = function () {
+	            var types = [];
+	            zrUtil.each(storage, function (obj, type) {
+	                types.push(type);
+	            });
+	            return types;
+	        };
+
+	        /**
+	         * If a main type is container and has sub types
+	         * @param  {string}  mainType
+	         * @return {boolean}
+	         */
+	        entity.hasSubTypes = function (componentType) {
+	            componentType = parseClassType(componentType);
+	            var obj = storage[componentType.main];
+	            return obj && obj[IS_CONTAINER];
+	        };
+
+	        entity.parseClassType = parseClassType;
+
+	        function makeContainer(componentType) {
+	            var container = storage[componentType.main];
+	            if (!container || !container[IS_CONTAINER]) {
+	                container = storage[componentType.main] = {};
+	                container[IS_CONTAINER] = true;
+	            }
+	            return container;
+	        }
+
+	        if (options.registerWhenExtend) {
+	            var originalExtend = entity.extend;
+	            if (originalExtend) {
+	                entity.extend = function (proto) {
+	                    var ExtendedClass = originalExtend.call(this, proto);
+	                    return entity.registerClass(ExtendedClass, proto.type);
+	                };
+	            }
+	        }
+
+	        return entity;
+	    };
+
+	    /**
+	     * @param {string|Array.<string>} properties
+	     */
+	    clazz.setReadOnly = function (obj, properties) {
+	        // FIXME It seems broken in IE8 simulation of IE11
+	        // if (!zrUtil.isArray(properties)) {
+	        //     properties = properties != null ? [properties] : [];
+	        // }
+	        // zrUtil.each(properties, function (prop) {
+	        //     var value = obj[prop];
+
+	        //     Object.defineProperty
+	        //         && Object.defineProperty(obj, prop, {
+	        //             value: value, writable: false
+	        //         });
+	        //     zrUtil.isArray(obj[prop])
+	        //         && Object.freeze
+	        //         && Object.freeze(obj[prop]);
+	        // });
+	    };
+
+	    module.exports = clazz;
+
+
+/***/ },
+/* 14 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+	    var getLineStyle = __webpack_require__(15)(
+	        [
+	            ['lineWidth', 'width'],
+	            ['stroke', 'color'],
+	            ['opacity'],
+	            ['shadowBlur'],
+	            ['shadowOffsetX'],
+	            ['shadowOffsetY'],
+	            ['shadowColor']
+	        ]
+	    );
+	    module.exports = {
+	        getLineStyle: function (excludes) {
+	            var style = getLineStyle.call(this, excludes);
+	            var lineDash = this.getLineDash();
+	            lineDash && (style.lineDash = lineDash);
+	            return style;
+	        },
+
+	        getLineDash: function () {
+	            var lineType = this.get('type');
+	            return (lineType === 'solid' || lineType == null) ? null
+	                : (lineType === 'dashed' ? [5, 5] : [1, 1]);
+	        }
+	    };
+
+
+/***/ },
+/* 15 */
+/***/ function(module, exports, __webpack_require__) {
+
+	// TODO Parse shadow style
+	// TODO Only shallow path support
+
+	    var zrUtil = __webpack_require__(4);
+
+	    module.exports = function (properties) {
+	        // Normalize
+	        for (var i = 0; i < properties.length; i++) {
+	            if (!properties[i][1]) {
+	               properties[i][1] = properties[i][0];
+	            }
+	        }
+	        return function (excludes) {
+	            var style = {};
+	            for (var i = 0; i < properties.length; i++) {
+	                var propName = properties[i][1];
+	                if (excludes && zrUtil.indexOf(excludes, propName) >= 0) {
+	                    continue;
+	                }
+	                var val = this.getShallow(propName);
+	                if (val != null) {
+	                    style[properties[i][0]] = val;
+	                }
+	            }
+	            return style;
+	        };
+	    };
+
+
+/***/ },
+/* 16 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+	    module.exports = {
+	        getAreaStyle: __webpack_require__(15)(
+	            [
+	                ['fill', 'color'],
+	                ['shadowBlur'],
+	                ['shadowOffsetX'],
+	                ['shadowOffsetY'],
+	                ['opacity'],
+	                ['shadowColor']
+	            ]
+	        )
+	    };
+
+
+/***/ },
+/* 17 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var textContain = __webpack_require__(8);
+
+	    function getShallow(model, path) {
+	        return model && model.getShallow(path);
+	    }
+
+	    module.exports = {
+	        /**
+	         * Get color property or get color from option.textStyle.color
+	         * @return {string}
+	         */
+	        getTextColor: function () {
+	            var ecModel = this.ecModel;
+	            return this.getShallow('color')
+	                || (ecModel && ecModel.get('textStyle.color'));
+	        },
+
+	        /**
+	         * Create font string from fontStyle, fontWeight, fontSize, fontFamily
+	         * @return {string}
+	         */
+	        getFont: function () {
+	            var ecModel = this.ecModel;
+	            var gTextStyleModel = ecModel && ecModel.getModel('textStyle');
+	            return [
+	                // FIXME in node-canvas fontWeight is before fontStyle
+	                this.getShallow('fontStyle') || getShallow(gTextStyleModel, 'fontStyle'),
+	                this.getShallow('fontWeight') || getShallow(gTextStyleModel, 'fontWeight'),
+	                (this.getShallow('fontSize') || getShallow(gTextStyleModel, 'fontSize') || 12) + 'px',
+	                this.getShallow('fontFamily') || getShallow(gTextStyleModel, 'fontFamily') || 'sans-serif'
+	            ].join(' ');
+	        },
+
+	        getTextRect: function (text) {
+	            var textStyle = this.get('textStyle') || {};
+	            return textContain.getBoundingRect(
+	                text,
+	                this.getFont(),
+	                textStyle.align,
+	                textStyle.baseline
+	            );
+	        },
+
+	        truncateText: function (text, containerWidth, ellipsis, options) {
+	            return textContain.truncateText(
+	                text, containerWidth, this.getFont(), ellipsis, options
+	            );
+	        }
+	    };
+
+
+/***/ },
+/* 18 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+	    var getItemStyle = __webpack_require__(15)(
+	        [
+	            ['fill', 'color'],
+	            ['stroke', 'borderColor'],
+	            ['lineWidth', 'borderWidth'],
+	            ['opacity'],
+	            ['shadowBlur'],
+	            ['shadowOffsetX'],
+	            ['shadowOffsetY'],
+	            ['shadowColor']
+	        ]
+	    );
+	    module.exports = {
+	        getItemStyle: function (excludes) {
+	            var style = getItemStyle.call(this, excludes);
+	            var lineDash = this.getBorderLineDash();
+	            lineDash && (style.lineDash = lineDash);
+	            return style;
+	        },
+
+	        getBorderLineDash: function () {
+	            var lineType = this.get('borderType');
+	            return (lineType === 'solid' || lineType == null) ? null
+	                : (lineType === 'dashed' ? [5, 5] : [1, 1]);
+	        }
+	    };
+
+
+/***/ },
+/* 19 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * Component model
+	 *
+	 * @module echarts/model/Component
+	 */
+
+
+	    var Model = __webpack_require__(12);
+	    var zrUtil = __webpack_require__(4);
+	    var arrayPush = Array.prototype.push;
+	    var componentUtil = __webpack_require__(20);
+	    var clazzUtil = __webpack_require__(13);
+	    var layout = __webpack_require__(21);
+
+	    /**
+	     * @alias module:echarts/model/Component
+	     * @constructor
+	     * @param {Object} option
+	     * @param {module:echarts/model/Model} parentModel
+	     * @param {module:echarts/model/Model} ecModel
+	     */
+	    var ComponentModel = Model.extend({
+
+	        type: 'component',
+
+	        /**
+	         * @readOnly
+	         * @type {string}
+	         */
+	        id: '',
+
+	        /**
+	         * @readOnly
+	         */
+	        name: '',
+
+	        /**
+	         * @readOnly
+	         * @type {string}
+	         */
+	        mainType: '',
+
+	        /**
+	         * @readOnly
+	         * @type {string}
+	         */
+	        subType: '',
+
+	        /**
+	         * @readOnly
+	         * @type {number}
+	         */
+	        componentIndex: 0,
+
+	        /**
+	         * @type {Object}
+	         * @protected
+	         */
+	        defaultOption: null,
+
+	        /**
+	         * @type {module:echarts/model/Global}
+	         * @readOnly
+	         */
+	        ecModel: null,
+
+	        /**
+	         * key: componentType
+	         * value:  Component model list, can not be null.
+	         * @type {Object.<string, Array.<module:echarts/model/Model>>}
+	         * @readOnly
+	         */
+	        dependentModels: [],
+
+	        /**
+	         * @type {string}
+	         * @readOnly
+	         */
+	        uid: null,
+
+	        /**
+	         * Support merge layout params.
+	         * Only support 'box' now (left/right/top/bottom/width/height).
+	         * @type {string|Object} Object can be {ignoreSize: true}
+	         * @readOnly
+	         */
+	        layoutMode: null,
+
+	        $constructor: function (option, parentModel, ecModel, extraOpt) {
+	            Model.call(this, option, parentModel, ecModel, extraOpt);
+
+	            // Set dependentModels, componentIndex, name, id, mainType, subType.
+	            zrUtil.extend(this, extraOpt);
+
+	            this.uid = componentUtil.getUID('componentModel');
+	        },
+
+
+	        init: function (option, parentModel, ecModel, extraOpt) {
+	            this.mergeDefaultAndTheme(option, ecModel);
+	        },
+
+	        mergeDefaultAndTheme: function (option, ecModel) {
+	            var layoutMode = this.layoutMode;
+	            var inputPositionParams = layoutMode
+	                ? layout.getLayoutParams(option) : {};
+
+	            var themeModel = ecModel.getTheme();
+	            zrUtil.merge(option, themeModel.get(this.mainType));
+	            zrUtil.merge(option, this.getDefaultOption());
+
+	            if (layoutMode) {
+	                layout.mergeLayoutParam(option, inputPositionParams, layoutMode);
+	            }
+	        },
+
+	        mergeOption: function (option) {
+	            zrUtil.merge(this.option, option, true);
+
+	            var layoutMode = this.layoutMode;
+	            if (layoutMode) {
+	                layout.mergeLayoutParam(this.option, option, layoutMode);
+	            }
+	        },
+
+	        // Hooker after init or mergeOption
+	        optionUpdated: function (newCptOption, isInit) {},
+
+	        getDefaultOption: function () {
+	            if (!this.hasOwnProperty('__defaultOption')) {
+	                var optList = [];
+	                var Class = this.constructor;
+	                while (Class) {
+	                    var opt = Class.prototype.defaultOption;
+	                    opt && optList.push(opt);
+	                    Class = Class.superClass;
+	                }
+
+	                var defaultOption = {};
+	                for (var i = optList.length - 1; i >= 0; i--) {
+	                    defaultOption = zrUtil.merge(defaultOption, optList[i], true);
+	                }
+	                this.__defaultOption = defaultOption;
+	            }
+	            return this.__defaultOption;
+	        }
+
+	    });
+
+	    // Reset ComponentModel.extend, add preConstruct.
+	    // clazzUtil.enableClassExtend(
+	    //     ComponentModel,
+	    //     function (option, parentModel, ecModel, extraOpt) {
+	    //         // Set dependentModels, componentIndex, name, id, mainType, subType.
+	    //         zrUtil.extend(this, extraOpt);
+
+	    //         this.uid = componentUtil.getUID('componentModel');
+
+	    //         // this.setReadOnly([
+	    //         //     'type', 'id', 'uid', 'name', 'mainType', 'subType',
+	    //         //     'dependentModels', 'componentIndex'
+	    //         // ]);
+	    //     }
+	    // );
+
+	    // Add capability of registerClass, getClass, hasClass, registerSubTypeDefaulter and so on.
+	    clazzUtil.enableClassManagement(
+	        ComponentModel, {registerWhenExtend: true}
+	    );
+	    componentUtil.enableSubTypeDefaulter(ComponentModel);
+
+	    // Add capability of ComponentModel.topologicalTravel.
+	    componentUtil.enableTopologicalTravel(ComponentModel, getDependencies);
+
+	    function getDependencies(componentType) {
+	        var deps = [];
+	        zrUtil.each(ComponentModel.getClassesByMainType(componentType), function (Clazz) {
+	            arrayPush.apply(deps, Clazz.prototype.dependencies || []);
+	        });
+	        // Ensure main type
+	        return zrUtil.map(deps, function (type) {
+	            return clazzUtil.parseClassType(type).main;
+	        });
+	    }
+
+	    zrUtil.mixin(ComponentModel, __webpack_require__(22));
+
+	    module.exports = ComponentModel;
+
+
+/***/ },
+/* 20 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+	    var clazz = __webpack_require__(13);
+
+	    var parseClassType = clazz.parseClassType;
+
+	    var base = 0;
+
+	    var componentUtil = {};
+
+	    var DELIMITER = '_';
+
+	    /**
+	     * @public
+	     * @param {string} type
+	     * @return {string}
+	     */
+	    componentUtil.getUID = function (type) {
+	        // Considering the case of crossing js context,
+	        // use Math.random to make id as unique as possible.
+	        return [(type || ''), base++, Math.random()].join(DELIMITER);
+	    };
+
+	    /**
+	     * @inner
+	     */
+	    componentUtil.enableSubTypeDefaulter = function (entity) {
+
+	        var subTypeDefaulters = {};
+
+	        entity.registerSubTypeDefaulter = function (componentType, defaulter) {
+	            componentType = parseClassType(componentType);
+	            subTypeDefaulters[componentType.main] = defaulter;
+	        };
+
+	        entity.determineSubType = function (componentType, option) {
+	            var type = option.type;
+	            if (!type) {
+	                var componentTypeMain = parseClassType(componentType).main;
+	                if (entity.hasSubTypes(componentType) && subTypeDefaulters[componentTypeMain]) {
+	                    type = subTypeDefaulters[componentTypeMain](option);
+	                }
+	            }
+	            return type;
+	        };
+
+	        return entity;
+	    };
+
+	    /**
+	     * Topological travel on Activity Network (Activity On Vertices).
+	     * Dependencies is defined in Model.prototype.dependencies, like ['xAxis', 'yAxis'].
+	     *
+	     * If 'xAxis' or 'yAxis' is absent in componentTypeList, just ignore it in topology.
+	     *
+	     * If there is circle dependencey, Error will be thrown.
+	     *
+	     */
+	    componentUtil.enableTopologicalTravel = function (entity, dependencyGetter) {
+
+	        /**
+	         * @public
+	         * @param {Array.<string>} targetNameList Target Component type list.
+	         *                                           Can be ['aa', 'bb', 'aa.xx']
+	         * @param {Array.<string>} fullNameList By which we can build dependency graph.
+	         * @param {Function} callback Params: componentType, dependencies.
+	         * @param {Object} context Scope of callback.
+	         */
+	        entity.topologicalTravel = function (targetNameList, fullNameList, callback, context) {
+	            if (!targetNameList.length) {
+	                return;
+	            }
+
+	            var result = makeDepndencyGraph(fullNameList);
+	            var graph = result.graph;
+	            var stack = result.noEntryList;
+
+	            var targetNameSet = {};
+	            zrUtil.each(targetNameList, function (name) {
+	                targetNameSet[name] = true;
+	            });
+
+	            while (stack.length) {
+	                var currComponentType = stack.pop();
+	                var currVertex = graph[currComponentType];
+	                var isInTargetNameSet = !!targetNameSet[currComponentType];
+	                if (isInTargetNameSet) {
+	                    callback.call(context, currComponentType, currVertex.originalDeps.slice());
+	                    delete targetNameSet[currComponentType];
+	                }
+	                zrUtil.each(
+	                    currVertex.successor,
+	                    isInTargetNameSet ? removeEdgeAndAdd : removeEdge
+	                );
+	            }
+
+	            zrUtil.each(targetNameSet, function () {
+	                throw new Error('Circle dependency may exists');
+	            });
+
+	            function removeEdge(succComponentType) {
+	                graph[succComponentType].entryCount--;
+	                if (graph[succComponentType].entryCount === 0) {
+	                    stack.push(succComponentType);
+	                }
+	            }
+
+	            // Consider this case: legend depends on series, and we call
+	            // chart.setOption({series: [...]}), where only series is in option.
+	            // If we do not have 'removeEdgeAndAdd', legendModel.mergeOption will
+	            // not be called, but only sereis.mergeOption is called. Thus legend
+	            // have no chance to update its local record about series (like which
+	            // name of series is available in legend).
+	            function removeEdgeAndAdd(succComponentType) {
+	                targetNameSet[succComponentType] = true;
+	                removeEdge(succComponentType);
+	            }
+	        };
+
+	        /**
+	         * DepndencyGraph: {Object}
+	         * key: conponentType,
+	         * value: {
+	         *     successor: [conponentTypes...],
+	         *     originalDeps: [conponentTypes...],
+	         *     entryCount: {number}
+	         * }
+	         */
+	        function makeDepndencyGraph(fullNameList) {
+	            var graph = {};
+	            var noEntryList = [];
+
+	            zrUtil.each(fullNameList, function (name) {
+
+	                var thisItem = createDependencyGraphItem(graph, name);
+	                var originalDeps = thisItem.originalDeps = dependencyGetter(name);
+
+	                var availableDeps = getAvailableDependencies(originalDeps, fullNameList);
+	                thisItem.entryCount = availableDeps.length;
+	                if (thisItem.entryCount === 0) {
+	                    noEntryList.push(name);
+	                }
+
+	                zrUtil.each(availableDeps, function (dependentName) {
+	                    if (zrUtil.indexOf(thisItem.predecessor, dependentName) < 0) {
+	                        thisItem.predecessor.push(dependentName);
+	                    }
+	                    var thatItem = createDependencyGraphItem(graph, dependentName);
+	                    if (zrUtil.indexOf(thatItem.successor, dependentName) < 0) {
+	                        thatItem.successor.push(name);
+	                    }
+	                });
+	            });
+
+	            return {graph: graph, noEntryList: noEntryList};
+	        }
+
+	        function createDependencyGraphItem(graph, name) {
+	            if (!graph[name]) {
+	                graph[name] = {predecessor: [], successor: []};
+	            }
+	            return graph[name];
+	        }
+
+	        function getAvailableDependencies(originalDeps, fullNameList) {
+	            var availableDeps = [];
+	            zrUtil.each(originalDeps, function (dep) {
+	                zrUtil.indexOf(fullNameList, dep) >= 0 && availableDeps.push(dep);
+	            });
+	            return availableDeps;
+	        }
+	    };
+
+	    module.exports = componentUtil;
+
+
+/***/ },
+/* 21 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+	// Layout helpers for each component positioning
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var BoundingRect = __webpack_require__(9);
+	    var numberUtil = __webpack_require__(7);
+	    var formatUtil = __webpack_require__(6);
+	    var parsePercent = numberUtil.parsePercent;
+	    var each = zrUtil.each;
+
+	    var layout = {};
+
+	    var LOCATION_PARAMS = ['left', 'right', 'top', 'bottom', 'width', 'height'];
+
+	    function boxLayout(orient, group, gap, maxWidth, maxHeight) {
+	        var x = 0;
+	        var y = 0;
+	        if (maxWidth == null) {
+	            maxWidth = Infinity;
+	        }
+	        if (maxHeight == null) {
+	            maxHeight = Infinity;
+	        }
+	        var currentLineMaxSize = 0;
+	        group.eachChild(function (child, idx) {
+	            var position = child.position;
+	            var rect = child.getBoundingRect();
+	            var nextChild = group.childAt(idx + 1);
+	            var nextChildRect = nextChild && nextChild.getBoundingRect();
+	            var nextX;
+	            var nextY;
+	            if (orient === 'horizontal') {
+	                var moveX = rect.width + (nextChildRect ? (-nextChildRect.x + rect.x) : 0);
+	                nextX = x + moveX;
+	                // Wrap when width exceeds maxWidth or meet a `newline` group
+	                if (nextX > maxWidth || child.newline) {
+	                    x = 0;
+	                    nextX = moveX;
+	                    y += currentLineMaxSize + gap;
+	                    currentLineMaxSize = rect.height;
+	                }
+	                else {
+	                    currentLineMaxSize = Math.max(currentLineMaxSize, rect.height);
+	                }
+	            }
+	            else {
+	                var moveY = rect.height + (nextChildRect ? (-nextChildRect.y + rect.y) : 0);
+	                nextY = y + moveY;
+	                // Wrap when width exceeds maxHeight or meet a `newline` group
+	                if (nextY > maxHeight || child.newline) {
+	                    x += currentLineMaxSize + gap;
+	                    y = 0;
+	                    nextY = moveY;
+	                    currentLineMaxSize = rect.width;
+	                }
+	                else {
+	                    currentLineMaxSize = Math.max(currentLineMaxSize, rect.width);
+	                }
+	            }
+
+	            if (child.newline) {
+	                return;
+	            }
+
+	            position[0] = x;
+	            position[1] = y;
+
+	            orient === 'horizontal'
+	                ? (x = nextX + gap)
+	                : (y = nextY + gap);
+	        });
+	    }
+
+	    /**
+	     * VBox or HBox layouting
+	     * @param {string} orient
+	     * @param {module:zrender/container/Group} group
+	     * @param {number} gap
+	     * @param {number} [width=Infinity]
+	     * @param {number} [height=Infinity]
+	     */
+	    layout.box = boxLayout;
+
+	    /**
+	     * VBox layouting
+	     * @param {module:zrender/container/Group} group
+	     * @param {number} gap
+	     * @param {number} [width=Infinity]
+	     * @param {number} [height=Infinity]
+	     */
+	    layout.vbox = zrUtil.curry(boxLayout, 'vertical');
+
+	    /**
+	     * HBox layouting
+	     * @param {module:zrender/container/Group} group
+	     * @param {number} gap
+	     * @param {number} [width=Infinity]
+	     * @param {number} [height=Infinity]
+	     */
+	    layout.hbox = zrUtil.curry(boxLayout, 'horizontal');
+
+	    /**
+	     * If x or x2 is not specified or 'center' 'left' 'right',
+	     * the width would be as long as possible.
+	     * If y or y2 is not specified or 'middle' 'top' 'bottom',
+	     * the height would be as long as possible.
+	     *
+	     * @param {Object} positionInfo
+	     * @param {number|string} [positionInfo.x]
+	     * @param {number|string} [positionInfo.y]
+	     * @param {number|string} [positionInfo.x2]
+	     * @param {number|string} [positionInfo.y2]
+	     * @param {Object} containerRect
+	     * @param {string|number} margin
+	     * @return {Object} {width, height}
+	     */
+	    layout.getAvailableSize = function (positionInfo, containerRect, margin) {
+	        var containerWidth = containerRect.width;
+	        var containerHeight = containerRect.height;
+
+	        var x = parsePercent(positionInfo.x, containerWidth);
+	        var y = parsePercent(positionInfo.y, containerHeight);
+	        var x2 = parsePercent(positionInfo.x2, containerWidth);
+	        var y2 = parsePercent(positionInfo.y2, containerHeight);
+
+	        (isNaN(x) || isNaN(parseFloat(positionInfo.x))) && (x = 0);
+	        (isNaN(x2) || isNaN(parseFloat(positionInfo.x2))) && (x2 = containerWidth);
+	        (isNaN(y) || isNaN(parseFloat(positionInfo.y))) && (y = 0);
+	        (isNaN(y2) || isNaN(parseFloat(positionInfo.y2))) && (y2 = containerHeight);
+
+	        margin = formatUtil.normalizeCssArray(margin || 0);
+
+	        return {
+	            width: Math.max(x2 - x - margin[1] - margin[3], 0),
+	            height: Math.max(y2 - y - margin[0] - margin[2], 0)
+	        };
+	    };
+
+	    /**
+	     * Parse position info.
+	     *
+	     * @param {Object} positionInfo
+	     * @param {number|string} [positionInfo.left]
+	     * @param {number|string} [positionInfo.top]
+	     * @param {number|string} [positionInfo.right]
+	     * @param {number|string} [positionInfo.bottom]
+	     * @param {number|string} [positionInfo.width]
+	     * @param {number|string} [positionInfo.height]
+	     * @param {number|string} [positionInfo.aspect] Aspect is width / height
+	     * @param {Object} containerRect
+	     * @param {string|number} [margin]
+	     *
+	     * @return {module:zrender/core/BoundingRect}
+	     */
+	    layout.getLayoutRect = function (
+	        positionInfo, containerRect, margin
+	    ) {
+	        margin = formatUtil.normalizeCssArray(margin || 0);
+
+	        var containerWidth = containerRect.width;
+	        var containerHeight = containerRect.height;
+
+	        var left = parsePercent(positionInfo.left, containerWidth);
+	        var top = parsePercent(positionInfo.top, containerHeight);
+	        var right = parsePercent(positionInfo.right, containerWidth);
+	        var bottom = parsePercent(positionInfo.bottom, containerHeight);
+	        var width = parsePercent(positionInfo.width, containerWidth);
+	        var height = parsePercent(positionInfo.height, containerHeight);
+
+	        var verticalMargin = margin[2] + margin[0];
+	        var horizontalMargin = margin[1] + margin[3];
+	        var aspect = positionInfo.aspect;
+
+	        // If width is not specified, calculate width from left and right
+	        if (isNaN(width)) {
+	            width = containerWidth - right - horizontalMargin - left;
+	        }
+	        if (isNaN(height)) {
+	            height = containerHeight - bottom - verticalMargin - top;
+	        }
+
+	        // If width and height are not given
+	        // 1. Graph should not exceeds the container
+	        // 2. Aspect must be keeped
+	        // 3. Graph should take the space as more as possible
+	        if (isNaN(width) && isNaN(height)) {
+	            if (aspect > containerWidth / containerHeight) {
+	                width = containerWidth * 0.8;
+	            }
+	            else {
+	                height = containerHeight * 0.8;
+	            }
+	        }
+
+	        if (aspect != null) {
+	            // Calculate width or height with given aspect
+	            if (isNaN(width)) {
+	                width = aspect * height;
+	            }
+	            if (isNaN(height)) {
+	                height = width / aspect;
+	            }
+	        }
+
+	        // If left is not specified, calculate left from right and width
+	        if (isNaN(left)) {
+	            left = containerWidth - right - width - horizontalMargin;
+	        }
+	        if (isNaN(top)) {
+	            top = containerHeight - bottom - height - verticalMargin;
+	        }
+
+	        // Align left and top
+	        switch (positionInfo.left || positionInfo.right) {
+	            case 'center':
+	                left = containerWidth / 2 - width / 2 - margin[3];
+	                break;
+	            case 'right':
+	                left = containerWidth - width - horizontalMargin;
+	                break;
+	        }
+	        switch (positionInfo.top || positionInfo.bottom) {
+	            case 'middle':
+	            case 'center':
+	                top = containerHeight / 2 - height / 2 - margin[0];
+	                break;
+	            case 'bottom':
+	                top = containerHeight - height - verticalMargin;
+	                break;
+	        }
+	        // If something is wrong and left, top, width, height are calculated as NaN
+	        left = left || 0;
+	        top = top || 0;
+	        if (isNaN(width)) {
+	            // Width may be NaN if only one value is given except width
+	            width = containerWidth - left - (right || 0);
+	        }
+	        if (isNaN(height)) {
+	            // Height may be NaN if only one value is given except height
+	            height = containerHeight - top - (bottom || 0);
+	        }
+
+	        var rect = new BoundingRect(left + margin[3], top + margin[0], width, height);
+	        rect.margin = margin;
+	        return rect;
+	    };
+
+	    /**
+	     * Position group of component in viewport
+	     *  Group position is specified by either
+	     *  {left, top}, {right, bottom}
+	     *  If all properties exists, right and bottom will be igonred.
+	     *
+	     * @param {module:zrender/container/Group} group
+	     * @param {Object} positionInfo
+	     * @param {number|string} [positionInfo.left]
+	     * @param {number|string} [positionInfo.top]
+	     * @param {number|string} [positionInfo.right]
+	     * @param {number|string} [positionInfo.bottom]
+	     * @param {Object} containerRect
+	     * @param {string|number} margin
+	     */
+	    layout.positionGroup = function (
+	        group, positionInfo, containerRect, margin
+	    ) {
+	        var groupRect = group.getBoundingRect();
+
+	        positionInfo = zrUtil.extend(zrUtil.clone(positionInfo), {
+	            width: groupRect.width,
+	            height: groupRect.height
+	        });
+
+	        positionInfo = layout.getLayoutRect(
+	            positionInfo, containerRect, margin
+	        );
+
+	        group.attr('position', [
+	            positionInfo.x - groupRect.x,
+	            positionInfo.y - groupRect.y
+	        ]);
+	    };
+
+	    /**
+	     * Consider Case:
+	     * When defulat option has {left: 0, width: 100}, and we set {right: 0}
+	     * through setOption or media query, using normal zrUtil.merge will cause
+	     * {right: 0} does not take effect.
+	     *
+	     * @example
+	     * ComponentModel.extend({
+	     *     init: function () {
+	     *         ...
+	     *         var inputPositionParams = layout.getLayoutParams(option);
+	     *         this.mergeOption(inputPositionParams);
+	     *     },
+	     *     mergeOption: function (newOption) {
+	     *         newOption && zrUtil.merge(thisOption, newOption, true);
+	     *         layout.mergeLayoutParam(thisOption, newOption);
+	     *     }
+	     * });
+	     *
+	     * @param {Object} targetOption
+	     * @param {Object} newOption
+	     * @param {Object|string} [opt]
+	     * @param {boolean} [opt.ignoreSize=false] Some component must has width and height.
+	     */
+	    layout.mergeLayoutParam = function (targetOption, newOption, opt) {
+	        !zrUtil.isObject(opt) && (opt = {});
+	        var hNames = ['width', 'left', 'right']; // Order by priority.
+	        var vNames = ['height', 'top', 'bottom']; // Order by priority.
+	        var hResult = merge(hNames);
+	        var vResult = merge(vNames);
+
+	        copy(hNames, targetOption, hResult);
+	        copy(vNames, targetOption, vResult);
+
+	        function merge(names) {
+	            var newParams = {};
+	            var newValueCount = 0;
+	            var merged = {};
+	            var mergedValueCount = 0;
+	            var enoughParamNumber = opt.ignoreSize ? 1 : 2;
+
+	            each(names, function (name) {
+	                merged[name] = targetOption[name];
+	            });
+	            each(names, function (name) {
+	                // Consider case: newOption.width is null, which is
+	                // set by user for removing width setting.
+	                hasProp(newOption, name) && (newParams[name] = merged[name] = newOption[name]);
+	                hasValue(newParams, name) && newValueCount++;
+	                hasValue(merged, name) && mergedValueCount++;
+	            });
+
+	            // Case: newOption: {width: ..., right: ...},
+	            // or targetOption: {right: ...} and newOption: {width: ...},
+	            // There is no conflict when merged only has params count
+	            // little than enoughParamNumber.
+	            if (mergedValueCount === enoughParamNumber || !newValueCount) {
+	                return merged;
+	            }
+	            // Case: newOption: {width: ..., right: ...},
+	            // Than we can make sure user only want those two, and ignore
+	            // all origin params in targetOption.
+	            else if (newValueCount >= enoughParamNumber) {
+	                return newParams;
+	            }
+	            else {
+	                // Chose another param from targetOption by priority.
+	                // When 'ignoreSize', enoughParamNumber is 1 and those will not happen.
+	                for (var i = 0; i < names.length; i++) {
+	                    var name = names[i];
+	                    if (!hasProp(newParams, name) && hasProp(targetOption, name)) {
+	                        newParams[name] = targetOption[name];
+	                        break;
+	                    }
+	                }
+	                return newParams;
+	            }
+	        }
+
+	        function hasProp(obj, name) {
+	            return obj.hasOwnProperty(name);
+	        }
+
+	        function hasValue(obj, name) {
+	            return obj[name] != null && obj[name] !== 'auto';
+	        }
+
+	        function copy(names, target, source) {
+	            each(names, function (name) {
+	                target[name] = source[name];
+	            });
+	        }
+	    };
+
+	    /**
+	     * Retrieve 'left', 'right', 'top', 'bottom', 'width', 'height' from object.
+	     * @param {Object} source
+	     * @return {Object} Result contains those props.
+	     */
+	    layout.getLayoutParams = function (source) {
+	        return layout.copyLayoutParams({}, source);
+	    };
+
+	    /**
+	     * Retrieve 'left', 'right', 'top', 'bottom', 'width', 'height' from object.
+	     * @param {Object} source
+	     * @return {Object} Result contains those props.
+	     */
+	    layout.copyLayoutParams = function (target, source) {
+	        source && target && each(LOCATION_PARAMS, function (name) {
+	            source.hasOwnProperty(name) && (target[name] = source[name]);
+	        });
+	        return target;
+	    };
+
+	    module.exports = layout;
+
+
+/***/ },
+/* 22 */
+/***/ function(module, exports) {
+
+	
+
+	    module.exports = {
+	        getBoxLayoutParams: function () {
+	            return {
+	                left: this.get('left'),
+	                top: this.get('top'),
+	                right: this.get('right'),
+	                bottom: this.get('bottom'),
+	                width: this.get('width'),
+	                height: this.get('height')
+	            };
+	        }
+	    };
+
+
+/***/ },
+/* 23 */
+/***/ function(module, exports) {
+
+	
+	    var platform = '';
+	    // Navigator not exists in node
+	    if (typeof navigator !== 'undefined') {
+	        platform = navigator.platform || '';
+	    }
+	    module.exports = {
+	        // 全图默认背景
+	        // backgroundColor: 'rgba(0,0,0,0)',
+
+	        // https://dribbble.com/shots/1065960-Infographic-Pie-chart-visualization
+	        // color: ['#5793f3', '#d14a61', '#fd9c35', '#675bba', '#fec42c', '#dd4444', '#d4df5a', '#cd4870'],
+	        // 浅色
+	        // color: ['#bcd3bb', '#e88f70', '#edc1a5', '#9dc5c8', '#e1e8c8', '#7b7c68', '#e5b5b5', '#f0b489', '#928ea8', '#bda29a'],
+	        // color: ['#cc5664', '#9bd6ec', '#ea946e', '#8acaaa', '#f1ec64', '#ee8686', '#a48dc1', '#5da6bc', '#b9dcae'],
+	        // 深色
+	        color: ['#c23531','#2f4554', '#61a0a8', '#d48265', '#91c7ae','#749f83',  '#ca8622', '#bda29a','#6e7074', '#546570', '#c4ccd3'],
+
+	        // 默认需要 Grid 配置项
+	        grid: {},
+	        // 主题，主题
+	        textStyle: {
+	            // color: '#000',
+	            // decoration: 'none',
+	            // PENDING
+	            fontFamily: platform.match(/^Win/) ? 'Microsoft YaHei' : 'sans-serif',
+	            // fontFamily: 'Arial, Verdana, sans-serif',
+	            fontSize: 12,
+	            fontStyle: 'normal',
+	            fontWeight: 'normal'
+	        },
+
+	        // http://blogs.adobe.com/webplatform/2014/02/24/using-blend-modes-in-html-canvas/
+	        // https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/globalCompositeOperation
+	        // Default is source-over
+	        blendMode: null,
+
+	        animation: true,
+	        animationDuration: 1000,
+	        animationDurationUpdate: 300,
+	        animationEasing: 'exponentialOut',
+	        animationEasingUpdate: 'cubicOut',
+
+	        animationThreshold: 2000,
+	        // Configuration for progressive/incremental rendering
+	        progressiveThreshold: 3000,
+	        progressive: 400,
+
+	        // Threshold of if use single hover layer to optimize.
+	        hoverLayerThreshold: 3000
+	    };
+
+
+/***/ },
+/* 24 */
+/***/ function(module, exports) {
+
+	
+	    module.exports = {
+	        clearColorPalette: function () {
+	            this._colorIdx = 0;
+	            this._colorNameMap = {};
+	        },
+
+	        getColorFromPalette: function (name, scope) {
+	            scope = scope || this;
+	            var colorIdx = scope._colorIdx || 0;
+	            var colorNameMap = scope._colorNameMap || (scope._colorNameMap = {});
+	            if (colorNameMap[name]) {
+	                return colorNameMap[name];
+	            }
+	            var colorPalette = this.get('color', true) || [];
+	            if (!colorPalette.length) {
+	                return;
+	            }
+
+	            var color = colorPalette[colorIdx];
+	            if (name) {
+	                colorNameMap[name] = color;
+	            }
+	            scope._colorIdx = (colorIdx + 1) % colorPalette.length;
+
+	            return color;
+	        }
+	    };
+
+
+/***/ },
+/* 25 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var zrUtil = __webpack_require__(4);
+
+	    var echartsAPIList = [
+	        'getDom', 'getZr', 'getWidth', 'getHeight', 'dispatchAction', 'isDisposed',
+	        'on', 'off', 'getDataURL', 'getConnectedDataURL', 'getModel', 'getOption'
+	    ];
+
+	    function ExtensionAPI(chartInstance) {
+	        zrUtil.each(echartsAPIList, function (name) {
+	            this[name] = zrUtil.bind(chartInstance[name], chartInstance);
+	        }, this);
+	    }
+
+	    module.exports = ExtensionAPI;
+
+
+/***/ },
+/* 26 */
+/***/ function(module, exports) {
+
+	'use strict';
+
+
+	    var coordinateSystemCreators = {};
+
+	    function CoordinateSystemManager() {
+
+	        this._coordinateSystems = [];
+	    }
+
+	    CoordinateSystemManager.prototype = {
+
+	        constructor: CoordinateSystemManager,
+
+	        create: function (ecModel, api) {
+	            var coordinateSystems = [];
+	            for (var type in coordinateSystemCreators) {
+	                var list = coordinateSystemCreators[type].create(ecModel, api);
+	                list && (coordinateSystems = coordinateSystems.concat(list));
+	            }
+
+	            this._coordinateSystems = coordinateSystems;
+	        },
+
+	        update: function (ecModel, api) {
+	            var coordinateSystems = this._coordinateSystems;
+	            for (var i = 0; i < coordinateSystems.length; i++) {
+	                // FIXME MUST have
+	                coordinateSystems[i].update && coordinateSystems[i].update(ecModel, api);
+	            }
+	        }
+	    };
+
+	    CoordinateSystemManager.register = function (type, coordinateSystemCreator) {
+	        coordinateSystemCreators[type] = coordinateSystemCreator;
+	    };
+
+	    CoordinateSystemManager.get = function (type) {
+	        return coordinateSystemCreators[type];
+	    };
+
+	    module.exports = CoordinateSystemManager;
+
+
+/***/ },
+/* 27 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * ECharts option manager
+	 *
+	 * @module {echarts/model/OptionManager}
+	 */
+
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var modelUtil = __webpack_require__(5);
+	    var ComponentModel = __webpack_require__(19);
+	    var each = zrUtil.each;
+	    var clone = zrUtil.clone;
+	    var map = zrUtil.map;
+	    var merge = zrUtil.merge;
+
+	    var QUERY_REG = /^(min|max)?(.+)$/;
+
+	    /**
+	     * TERM EXPLANATIONS:
+	     *
+	     * [option]:
+	     *
+	     *     An object that contains definitions of components. For example:
+	     *     var option = {
+	     *         title: {...},
+	     *         legend: {...},
+	     *         visualMap: {...},
+	     *         series: [
+	     *             {data: [...]},
+	     *             {data: [...]},
+	     *             ...
+	     *         ]
+	     *     };
+	     *
+	     * [rawOption]:
+	     *
+	     *     An object input to echarts.setOption. 'rawOption' may be an
+	     *     'option', or may be an object contains multi-options. For example:
+	     *     var option = {
+	     *         baseOption: {
+	     *             title: {...},
+	     *             legend: {...},
+	     *             series: [
+	     *                 {data: [...]},
+	     *                 {data: [...]},
+	     *                 ...
+	     *             ]
+	     *         },
+	     *         timeline: {...},
+	     *         options: [
+	     *             {title: {...}, series: {data: [...]}},
+	     *             {title: {...}, series: {data: [...]}},
+	     *             ...
+	     *         ],
+	     *         media: [
+	     *             {
+	     *                 query: {maxWidth: 320},
+	     *                 option: {series: {x: 20}, visualMap: {show: false}}
+	     *             },
+	     *             {
+	     *                 query: {minWidth: 320, maxWidth: 720},
+	     *                 option: {series: {x: 500}, visualMap: {show: true}}
+	     *             },
+	     *             {
+	     *                 option: {series: {x: 1200}, visualMap: {show: true}}
+	     *             }
+	     *         ]
+	     *     };
+	     *
+	     * @alias module:echarts/model/OptionManager
+	     * @param {module:echarts/ExtensionAPI} api
+	     */
+	    function OptionManager(api) {
+
+	        /**
+	         * @private
+	         * @type {module:echarts/ExtensionAPI}
+	         */
+	        this._api = api;
+
+	        /**
+	         * @private
+	         * @type {Array.<number>}
+	         */
+	        this._timelineOptions = [];
+
+	        /**
+	         * @private
+	         * @type {Array.<Object>}
+	         */
+	        this._mediaList = [];
+
+	        /**
+	         * @private
+	         * @type {Object}
+	         */
+	        this._mediaDefault;
+
+	        /**
+	         * -1, means default.
+	         * empty means no media.
+	         * @private
+	         * @type {Array.<number>}
+	         */
+	        this._currentMediaIndices = [];
+
+	        /**
+	         * @private
+	         * @type {Object}
+	         */
+	        this._optionBackup;
+
+	        /**
+	         * @private
+	         * @type {Object}
+	         */
+	        this._newBaseOption;
+	    }
+
+	    // timeline.notMerge is not supported in ec3. Firstly there is rearly
+	    // case that notMerge is needed. Secondly supporting 'notMerge' requires
+	    // rawOption cloned and backuped when timeline changed, which does no
+	    // good to performance. What's more, that both timeline and setOption
+	    // method supply 'notMerge' brings complex and some problems.
+	    // Consider this case:
+	    // (step1) chart.setOption({timeline: {notMerge: false}, ...}, false);
+	    // (step2) chart.setOption({timeline: {notMerge: true}, ...}, false);
+
+	    OptionManager.prototype = {
+
+	        constructor: OptionManager,
+
+	        /**
+	         * @public
+	         * @param {Object} rawOption Raw option.
+	         * @param {module:echarts/model/Global} ecModel
+	         * @param {Array.<Function>} optionPreprocessorFuncs
+	         * @return {Object} Init option
+	         */
+	        setOption: function (rawOption, optionPreprocessorFuncs) {
+	            rawOption = clone(rawOption, true);
+
+	            // FIXME
+	            // 如果 timeline options 或者 media 中设置了某个属性，而baseOption中没有设置，则进行警告。
+
+	            var oldOptionBackup = this._optionBackup;
+	            var newParsedOption = parseRawOption.call(
+	                this, rawOption, optionPreprocessorFuncs, !oldOptionBackup
+	            );
+	            this._newBaseOption = newParsedOption.baseOption;
+
+	            // For setOption at second time (using merge mode);
+	            if (oldOptionBackup) {
+	                // Only baseOption can be merged.
+	                mergeOption(oldOptionBackup.baseOption, newParsedOption.baseOption);
+
+	                // For simplicity, timeline options and media options do not support merge,
+	                // that is, if you `setOption` twice and both has timeline options, the latter
+	                // timeline opitons will not be merged to the formers, but just substitude them.
+	                if (newParsedOption.timelineOptions.length) {
+	                    oldOptionBackup.timelineOptions = newParsedOption.timelineOptions;
+	                }
+	                if (newParsedOption.mediaList.length) {
+	                    oldOptionBackup.mediaList = newParsedOption.mediaList;
+	                }
+	                if (newParsedOption.mediaDefault) {
+	                    oldOptionBackup.mediaDefault = newParsedOption.mediaDefault;
+	                }
+	            }
+	            else {
+	                this._optionBackup = newParsedOption;
+	            }
+	        },
+
+	        /**
+	         * @param {boolean} isRecreate
+	         * @return {Object}
+	         */
+	        mountOption: function (isRecreate) {
+	            var optionBackup = this._optionBackup;
+
+	            // TODO
+	            // 如果没有reset功能则不clone。
+
+	            this._timelineOptions = map(optionBackup.timelineOptions, clone);
+	            this._mediaList = map(optionBackup.mediaList, clone);
+	            this._mediaDefault = clone(optionBackup.mediaDefault);
+	            this._currentMediaIndices = [];
+
+	            return clone(isRecreate
+	                // this._optionBackup.baseOption, which is created at the first `setOption`
+	                // called, and is merged into every new option by inner method `mergeOption`
+	                // each time `setOption` called, can be only used in `isRecreate`, because
+	                // its reliability is under suspicion. In other cases option merge is
+	                // proformed by `model.mergeOption`.
+	                ? optionBackup.baseOption : this._newBaseOption
+	            );
+	        },
+
+	        /**
+	         * @param {module:echarts/model/Global} ecModel
+	         * @return {Object}
+	         */
+	        getTimelineOption: function (ecModel) {
+	            var option;
+	            var timelineOptions = this._timelineOptions;
+
+	            if (timelineOptions.length) {
+	                // getTimelineOption can only be called after ecModel inited,
+	                // so we can get currentIndex from timelineModel.
+	                var timelineModel = ecModel.getComponent('timeline');
+	                if (timelineModel) {
+	                    option = clone(
+	                        timelineOptions[timelineModel.getCurrentIndex()],
+	                        true
+	                    );
+	                }
+	            }
+
+	            return option;
+	        },
+
+	        /**
+	         * @param {module:echarts/model/Global} ecModel
+	         * @return {Array.<Object>}
+	         */
+	        getMediaOption: function (ecModel) {
+	            var ecWidth = this._api.getWidth();
+	            var ecHeight = this._api.getHeight();
+	            var mediaList = this._mediaList;
+	            var mediaDefault = this._mediaDefault;
+	            var indices = [];
+	            var result = [];
+
+	            // No media defined.
+	            if (!mediaList.length && !mediaDefault) {
+	                return result;
+	            }
+
+	            // Multi media may be applied, the latter defined media has higher priority.
+	            for (var i = 0, len = mediaList.length; i < len; i++) {
+	                if (applyMediaQuery(mediaList[i].query, ecWidth, ecHeight)) {
+	                    indices.push(i);
+	                }
+	            }
+
+	            // FIXME
+	            // 是否mediaDefault应该强制用户设置，否则可能修改不能回归。
+	            if (!indices.length && mediaDefault) {
+	                indices = [-1];
+	            }
+
+	            if (indices.length && !indicesEquals(indices, this._currentMediaIndices)) {
+	                result = map(indices, function (index) {
+	                    return clone(
+	                        index === -1 ? mediaDefault.option : mediaList[index].option
+	                    );
+	                });
+	            }
+	            // Otherwise return nothing.
+
+	            this._currentMediaIndices = indices;
+
+	            return result;
+	        }
+	    };
+
+	    function parseRawOption(rawOption, optionPreprocessorFuncs, isNew) {
+	        var timelineOptions = [];
+	        var mediaList = [];
+	        var mediaDefault;
+	        var baseOption;
+
+	        // Compatible with ec2.
+	        var timelineOpt = rawOption.timeline;
+
+	        if (rawOption.baseOption) {
+	            baseOption = rawOption.baseOption;
+	        }
+
+	        // For timeline
+	        if (timelineOpt || rawOption.options) {
+	            baseOption = baseOption || {};
+	            timelineOptions = (rawOption.options || []).slice();
+	        }
+
+	        // For media query
+	        if (rawOption.media) {
+	            baseOption = baseOption || {};
+	            var media = rawOption.media;
+	            each(media, function (singleMedia) {
+	                if (singleMedia && singleMedia.option) {
+	                    if (singleMedia.query) {
+	                        mediaList.push(singleMedia);
+	                    }
+	                    else if (!mediaDefault) {
+	                        // Use the first media default.
+	                        mediaDefault = singleMedia;
+	                    }
+	                }
+	            });
+	        }
+
+	        // For normal option
+	        if (!baseOption) {
+	            baseOption = rawOption;
+	        }
+
+	        // Set timelineOpt to baseOption in ec3,
+	        // which is convenient for merge option.
+	        if (!baseOption.timeline) {
+	            baseOption.timeline = timelineOpt;
+	        }
+
+	        // Preprocess.
+	        each([baseOption].concat(timelineOptions)
+	            .concat(zrUtil.map(mediaList, function (media) {
+	                return media.option;
+	            })),
+	            function (option) {
+	                each(optionPreprocessorFuncs, function (preProcess) {
+	                    preProcess(option, isNew);
+	                });
+	            }
+	        );
+
+	        return {
+	            baseOption: baseOption,
+	            timelineOptions: timelineOptions,
+	            mediaDefault: mediaDefault,
+	            mediaList: mediaList
+	        };
+	    }
+
+	    /**
+	     * @see <http://www.w3.org/TR/css3-mediaqueries/#media1>
+	     * Support: width, height, aspectRatio
+	     * Can use max or min as prefix.
+	     */
+	    function applyMediaQuery(query, ecWidth, ecHeight) {
+	        var realMap = {
+	            width: ecWidth,
+	            height: ecHeight,
+	            aspectratio: ecWidth / ecHeight // lowser case for convenientce.
+	        };
+
+	        var applicatable = true;
+
+	        zrUtil.each(query, function (value, attr) {
+	            var matched = attr.match(QUERY_REG);
+
+	            if (!matched || !matched[1] || !matched[2]) {
+	                return;
+	            }
+
+	            var operator = matched[1];
+	            var realAttr = matched[2].toLowerCase();
+
+	            if (!compare(realMap[realAttr], value, operator)) {
+	                applicatable = false;
+	            }
+	        });
+
+	        return applicatable;
+	    }
+
+	    function compare(real, expect, operator) {
+	        if (operator === 'min') {
+	            return real >= expect;
+	        }
+	        else if (operator === 'max') {
+	            return real <= expect;
+	        }
+	        else { // Equals
+	            return real === expect;
+	        }
+	    }
+
+	    function indicesEquals(indices1, indices2) {
+	        // indices is always order by asc and has only finite number.
+	        return indices1.join(',') === indices2.join(',');
+	    }
+
+	    /**
+	     * Consider case:
+	     * `chart.setOption(opt1);`
+	     * Then user do some interaction like dataZoom, dataView changing.
+	     * `chart.setOption(opt2);`
+	     * Then user press 'reset button' in toolbox.
+	     *
+	     * After doing that all of the interaction effects should be reset, the
+	     * chart should be the same as the result of invoke
+	     * `chart.setOption(opt1); chart.setOption(opt2);`.
+	     *
+	     * Although it is not able ensure that
+	     * `chart.setOption(opt1); chart.setOption(opt2);` is equivalents to
+	     * `chart.setOption(merge(opt1, opt2));` exactly,
+	     * this might be the only simple way to implement that feature.
+	     *
+	     * MEMO: We've considered some other approaches:
+	     * 1. Each model handle its self restoration but not uniform treatment.
+	     *     (Too complex in logic and error-prone)
+	     * 2. Use a shadow ecModel. (Performace expensive)
+	     */
+	    function mergeOption(oldOption, newOption) {
+	        newOption = newOption || {};
+
+	        each(newOption, function (newCptOpt, mainType) {
+	            if (newCptOpt == null) {
+	                return;
+	            }
+
+	            var oldCptOpt = oldOption[mainType];
+
+	            if (!ComponentModel.hasClass(mainType)) {
+	                oldOption[mainType] = merge(oldCptOpt, newCptOpt, true);
+	            }
+	            else {
+	                newCptOpt = modelUtil.normalizeToArray(newCptOpt);
+	                oldCptOpt = modelUtil.normalizeToArray(oldCptOpt);
+
+	                var mapResult = modelUtil.mappingToExists(oldCptOpt, newCptOpt);
+
+	                oldOption[mainType] = map(mapResult, function (item) {
+	                    return (item.option && item.exist)
+	                        ? merge(item.exist, item.option, true)
+	                        : (item.exist || item.option);
+	                });
+	            }
+	        });
+	    }
+
+	    module.exports = OptionManager;
+
+
+/***/ },
+/* 28 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var formatUtil = __webpack_require__(6);
+	    var modelUtil = __webpack_require__(5);
+	    var ComponentModel = __webpack_require__(19);
+	    var colorPaletteMixin = __webpack_require__(24);
+	    var env = __webpack_require__(2);
+
+	    var encodeHTML = formatUtil.encodeHTML;
+	    var addCommas = formatUtil.addCommas;
+
+	    var SeriesModel = ComponentModel.extend({
+
+	        type: 'series.__base__',
+
+	        /**
+	         * @readOnly
+	         */
+	        seriesIndex: 0,
+
+	        // coodinateSystem will be injected in the echarts/CoordinateSystem
+	        coordinateSystem: null,
+
+	        /**
+	         * @type {Object}
+	         * @protected
+	         */
+	        defaultOption: null,
+
+	        /**
+	         * Data provided for legend
+	         * @type {Function}
+	         */
+	        // PENDING
+	        legendDataProvider: null,
+
+	        /**
+	         * Access path of color for visual
+	         */
+	        visualColorAccessPath: 'itemStyle.normal.color',
+
+	        init: function (option, parentModel, ecModel, extraOpt) {
+
+	            /**
+	             * @type {number}
+	             * @readOnly
+	             */
+	            this.seriesIndex = this.componentIndex;
+
+	            this.mergeDefaultAndTheme(option, ecModel);
+
+	            /**
+	             * @type {module:echarts/data/List|module:echarts/data/Tree|module:echarts/data/Graph}
+	             * @private
+	             */
+	            this._dataBeforeProcessed = this.getInitialData(option, ecModel);
+
+	            // If we reverse the order (make this._data firstly, and then make
+	            // this._dataBeforeProcessed by cloneShallow), cloneShallow will
+	            // cause this._data.graph.data !== this._data when using
+	            // module:echarts/data/Graph or module:echarts/data/Tree.
+	            // See module:echarts/data/helper/linkList
+	            this._data = this._dataBeforeProcessed.cloneShallow();
+	        },
+
+	        /**
+	         * Util for merge default and theme to option
+	         * @param  {Object} option
+	         * @param  {module:echarts/model/Global} ecModel
+	         */
+	        mergeDefaultAndTheme: function (option, ecModel) {
+	            zrUtil.merge(
+	                option,
+	                ecModel.getTheme().get(this.subType)
+	            );
+	            zrUtil.merge(option, this.getDefaultOption());
+
+	            // Default label emphasis `position` and `show`
+	            // FIXME Set label in mergeOption
+	            modelUtil.defaultEmphasis(option.label, modelUtil.LABEL_OPTIONS);
+
+	            this.fillDataTextStyle(option.data);
+	        },
+
+	        mergeOption: function (newSeriesOption, ecModel) {
+	            newSeriesOption = zrUtil.merge(this.option, newSeriesOption, true);
+	            this.fillDataTextStyle(newSeriesOption.data);
+
+	            var data = this.getInitialData(newSeriesOption, ecModel);
+	            // TODO Merge data?
+	            if (data) {
+	                this._data = data;
+	                this._dataBeforeProcessed = data.cloneShallow();
+	            }
+	        },
+
+	        fillDataTextStyle: function (data) {
+	            // Default data label emphasis `position` and `show`
+	            // FIXME Tree structure data ?
+	            // FIXME Performance ?
+	            if (data) {
+	                for (var i = 0; i < data.length; i++) {
+	                    if (data[i] && data[i].label) {
+	                        modelUtil.defaultEmphasis(data[i].label, modelUtil.LABEL_OPTIONS);
+	                    }
+	                }
+	            }
+	        },
+
+	        /**
+	         * Init a data structure from data related option in series
+	         * Must be overwritten
+	         */
+	        getInitialData: function () {},
+
+	        /**
+	         * @param {string} [dataType]
+	         * @return {module:echarts/data/List}
+	         */
+	        getData: function (dataType) {
+	            return dataType == null ? this._data : this._data.getLinkedData(dataType);
+	        },
+
+	        /**
+	         * @param {module:echarts/data/List} data
+	         */
+	        setData: function (data) {
+	            this._data = data;
+	        },
+
+	        /**
+	         * Get data before processed
+	         * @return {module:echarts/data/List}
+	         */
+	        getRawData: function () {
+	            return this._dataBeforeProcessed;
+	        },
+
+	        /**
+	         * Coord dimension to data dimension.
+	         *
+	         * By default the result is the same as dimensions of series data.
+	         * But in some series data dimensions are different from coord dimensions (i.e.
+	         * candlestick and boxplot). Override this method to handle those cases.
+	         *
+	         * Coord dimension to data dimension can be one-to-many
+	         *
+	         * @param {string} coordDim
+	         * @return {Array.<string>} dimensions on the axis.
+	         */
+	        coordDimToDataDim: function (coordDim) {
+	            return [coordDim];
+	        },
+
+	        /**
+	         * Convert data dimension to coord dimension.
+	         *
+	         * @param {string|number} dataDim
+	         * @return {string}
+	         */
+	        dataDimToCoordDim: function (dataDim) {
+	            return dataDim;
+	        },
+
+	        /**
+	         * Get base axis if has coordinate system and has axis.
+	         * By default use coordSys.getBaseAxis();
+	         * Can be overrided for some chart.
+	         * @return {type} description
+	         */
+	        getBaseAxis: function () {
+	            var coordSys = this.coordinateSystem;
+	            return coordSys && coordSys.getBaseAxis && coordSys.getBaseAxis();
+	        },
+
+	        // FIXME
+	        /**
+	         * Default tooltip formatter
+	         *
+	         * @param {number} dataIndex
+	         * @param {boolean} [multipleSeries=false]
+	         * @param {number} [dataType]
+	         */
+	        formatTooltip: function (dataIndex, multipleSeries, dataType) {
+	            function formatArrayValue(value) {
+	                return zrUtil.map(value, function (val, idx) {
+	                    var dimInfo = data.getDimensionInfo(idx);
+	                    var dimType = dimInfo && dimInfo.type;
+	                    if (dimType === 'ordinal') {
+	                        return val;
+	                    }
+	                    else if (dimType === 'time') {
+	                        return multipleSeries ? '' : formatUtil.formatTime('yyyy/mm/dd hh:mm:ss', val);
+	                    }
+	                    else {
+	                        return addCommas(val);
+	                    }
+	                }).filter(function (val) {
+	                    return !!val;
+	                }).join(', ');
+	            }
+
+	            var data = this._data;
+
+	            var value = this.getRawValue(dataIndex);
+	            var formattedValue = zrUtil.isArray(value)
+	                ? formatArrayValue(value) : addCommas(value);
+	            var name = data.getName(dataIndex);
+	            var color = data.getItemVisual(dataIndex, 'color');
+	            var colorEl = '<span style="display:inline-block;margin-right:5px;'
+	                + 'border-radius:10px;width:9px;height:9px;background-color:' + color + '"></span>';
+
+	            var seriesName = this.name;
+	            // FIXME
+	            if (seriesName === '\0-') {
+	                // Not show '-'
+	                seriesName = '';
+	            }
+	            return !multipleSeries
+	                ? ((seriesName && encodeHTML(seriesName) + '<br />') + colorEl
+	                    + (name
+	                        ? encodeHTML(name) + ' : ' + formattedValue
+	                        : formattedValue)
+	                  )
+	                : (colorEl + encodeHTML(this.name) + ' : ' + formattedValue);
+	        },
+
+	        /**
+	         * @return {boolean}
+	         */
+	        ifEnableAnimation: function () {
+	            if (env.node) {
+	                return false;
+	            }
+
+	            var animationEnabled = this.getShallow('animation');
+	            if (animationEnabled) {
+	                if (this.getData().count() > this.getShallow('animationThreshold')) {
+	                    animationEnabled = false;
+	                }
+	            }
+	            return animationEnabled;
+	        },
+
+	        restoreData: function () {
+	            this._data = this._dataBeforeProcessed.cloneShallow();
+	        },
+
+	        getColorFromPalette: function (name, scope) {
+	            var ecModel = this.ecModel;
+	            // PENDING
+	            var color = colorPaletteMixin.getColorFromPalette.call(this, name, scope);
+	            if (!color) {
+	                color = ecModel.getColorFromPalette(name, scope);
+	            }
+	            return color;
+	        },
+
+	        getAxisTooltipDataIndex: null
+	    });
+
+	    zrUtil.mixin(SeriesModel, modelUtil.dataFormatMixin);
+	    zrUtil.mixin(SeriesModel, colorPaletteMixin);
+
+	    module.exports = SeriesModel;
+
+
+/***/ },
+/* 29 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var Group = __webpack_require__(30);
+	    var componentUtil = __webpack_require__(20);
+	    var clazzUtil = __webpack_require__(13);
+
+	    var Component = function () {
+	        /**
+	         * @type {module:zrender/container/Group}
+	         * @readOnly
+	         */
+	        this.group = new Group();
+
+	        /**
+	         * @type {string}
+	         * @readOnly
+	         */
+	        this.uid = componentUtil.getUID('viewComponent');
+	    };
+
+	    Component.prototype = {
+
+	        constructor: Component,
+
+	        init: function (ecModel, api) {},
+
+	        render: function (componentModel, ecModel, api, payload) {},
+
+	        dispose: function () {}
+	    };
+
+	    var componentProto = Component.prototype;
+	    componentProto.updateView
+	        = componentProto.updateLayout
+	        = componentProto.updateVisual
+	        = function (seriesModel, ecModel, api, payload) {
+	            // Do nothing;
+	        };
+	    // Enable Component.extend.
+	    clazzUtil.enableClassExtend(Component);
+
+	    // Enable capability of registerClass, getClass, hasClass, registerSubTypeDefaulter and so on.
+	    clazzUtil.enableClassManagement(Component, {registerWhenExtend: true});
+
+	    module.exports = Component;
+
+
+/***/ },
+/* 30 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * Group是一个容器，可以插入子节点，Group的变换也会被应用到子节点上
+	 * @module zrender/graphic/Group
+	 * @example
+	 *     var Group = require('zrender/lib/container/Group');
+	 *     var Circle = require('zrender/lib/graphic/shape/Circle');
+	 *     var g = new Group();
+	 *     g.position[0] = 100;
+	 *     g.position[1] = 100;
+	 *     g.add(new Circle({
+	 *         style: {
+	 *             x: 100,
+	 *             y: 100,
+	 *             r: 20,
+	 *         }
+	 *     }));
+	 *     zr.add(g);
+	 */
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var Element = __webpack_require__(31);
+	    var BoundingRect = __webpack_require__(9);
+
+	    /**
+	     * @alias module:zrender/graphic/Group
+	     * @constructor
+	     * @extends module:zrender/mixin/Transformable
+	     * @extends module:zrender/mixin/Eventful
+	     */
+	    var Group = function (opts) {
+
+	        opts = opts || {};
+
+	        Element.call(this, opts);
+
+	        for (var key in opts) {
+	            this[key] = opts[key];
+	        }
+
+	        this._children = [];
+
+	        this.__storage = null;
+
+	        this.__dirty = true;
+	    };
+
+	    Group.prototype = {
+
+	        constructor: Group,
+
+	        isGroup: true,
+
+	        /**
+	         * @type {string}
+	         */
+	        type: 'group',
+
+	        /**
+	         * 所有子孙元素是否响应鼠标事件
+	         * @name module:/zrender/container/Group#silent
+	         * @type {boolean}
+	         * @default false
+	         */
+	        silent: false,
+
+	        /**
+	         * @return {Array.<module:zrender/Element>}
+	         */
+	        children: function () {
+	            return this._children.slice();
+	        },
+
+	        /**
+	         * 获取指定 index 的儿子节点
+	         * @param  {number} idx
+	         * @return {module:zrender/Element}
+	         */
+	        childAt: function (idx) {
+	            return this._children[idx];
+	        },
+
+	        /**
+	         * 获取指定名字的儿子节点
+	         * @param  {string} name
+	         * @return {module:zrender/Element}
+	         */
+	        childOfName: function (name) {
+	            var children = this._children;
+	            for (var i = 0; i < children.length; i++) {
+	                if (children[i].name === name) {
+	                    return children[i];
+	                }
+	             }
+	        },
+
+	        /**
+	         * @return {number}
+	         */
+	        childCount: function () {
+	            return this._children.length;
+	        },
+
+	        /**
+	         * 添加子节点到最后
+	         * @param {module:zrender/Element} child
+	         */
+	        add: function (child) {
+	            if (child && child !== this && child.parent !== this) {
+
+	                this._children.push(child);
+
+	                this._doAdd(child);
+	            }
+
+	            return this;
+	        },
+
+	        /**
+	         * 添加子节点在 nextSibling 之前
+	         * @param {module:zrender/Element} child
+	         * @param {module:zrender/Element} nextSibling
+	         */
+	        addBefore: function (child, nextSibling) {
+	            if (child && child !== this && child.parent !== this
+	                && nextSibling && nextSibling.parent === this) {
+
+	                var children = this._children;
+	                var idx = children.indexOf(nextSibling);
+
+	                if (idx >= 0) {
+	                    children.splice(idx, 0, child);
+	                    this._doAdd(child);
+	                }
+	            }
+
+	            return this;
+	        },
+
+	        _doAdd: function (child) {
+	            if (child.parent) {
+	                child.parent.remove(child);
+	            }
+
+	            child.parent = this;
+
+	            var storage = this.__storage;
+	            var zr = this.__zr;
+	            if (storage && storage !== child.__storage) {
+
+	                storage.addToMap(child);
+
+	                if (child instanceof Group) {
+	                    child.addChildrenToStorage(storage);
+	                }
+	            }
+
+	            zr && zr.refresh();
+	        },
+
+	        /**
+	         * 移除子节点
+	         * @param {module:zrender/Element} child
+	         */
+	        remove: function (child) {
+	            var zr = this.__zr;
+	            var storage = this.__storage;
+	            var children = this._children;
+
+	            var idx = zrUtil.indexOf(children, child);
+	            if (idx < 0) {
+	                return this;
+	            }
+	            children.splice(idx, 1);
+
+	            child.parent = null;
+
+	            if (storage) {
+
+	                storage.delFromMap(child.id);
+
+	                if (child instanceof Group) {
+	                    child.delChildrenFromStorage(storage);
+	                }
+	            }
+
+	            zr && zr.refresh();
+
+	            return this;
+	        },
+
+	        /**
+	         * 移除所有子节点
+	         */
+	        removeAll: function () {
+	            var children = this._children;
+	            var storage = this.__storage;
+	            var child;
+	            var i;
+	            for (i = 0; i < children.length; i++) {
+	                child = children[i];
+	                if (storage) {
+	                    storage.delFromMap(child.id);
+	                    if (child instanceof Group) {
+	                        child.delChildrenFromStorage(storage);
+	                    }
+	                }
+	                child.parent = null;
+	            }
+	            children.length = 0;
+
+	            return this;
+	        },
+
+	        /**
+	         * 遍历所有子节点
+	         * @param  {Function} cb
+	         * @param  {}   context
+	         */
+	        eachChild: function (cb, context) {
+	            var children = this._children;
+	            for (var i = 0; i < children.length; i++) {
+	                var child = children[i];
+	                cb.call(context, child, i);
+	            }
+	            return this;
+	        },
+
+	        /**
+	         * 深度优先遍历所有子孙节点
+	         * @param  {Function} cb
+	         * @param  {}   context
+	         */
+	        traverse: function (cb, context) {
+	            for (var i = 0; i < this._children.length; i++) {
+	                var child = this._children[i];
+	                cb.call(context, child);
+
+	                if (child.type === 'group') {
+	                    child.traverse(cb, context);
+	                }
+	            }
+	            return this;
+	        },
+
+	        addChildrenToStorage: function (storage) {
+	            for (var i = 0; i < this._children.length; i++) {
+	                var child = this._children[i];
+	                storage.addToMap(child);
+	                if (child instanceof Group) {
+	                    child.addChildrenToStorage(storage);
+	                }
+	            }
+	        },
+
+	        delChildrenFromStorage: function (storage) {
+	            for (var i = 0; i < this._children.length; i++) {
+	                var child = this._children[i];
+	                storage.delFromMap(child.id);
+	                if (child instanceof Group) {
+	                    child.delChildrenFromStorage(storage);
+	                }
+	            }
+	        },
+
+	        dirty: function () {
+	            this.__dirty = true;
+	            this.__zr && this.__zr.refresh();
+	            return this;
+	        },
+
+	        /**
+	         * @return {module:zrender/core/BoundingRect}
+	         */
+	        getBoundingRect: function (includeChildren) {
+	            // TODO Caching
+	            // TODO Transform
+	            var rect = null;
+	            var tmpRect = new BoundingRect(0, 0, 0, 0);
+	            var children = includeChildren || this._children;
+	            var tmpMat = [];
+
+	            for (var i = 0; i < children.length; i++) {
+	                var child = children[i];
+	                if (child.ignore || child.invisible) {
+	                    continue;
+	                }
+
+	                var childRect = child.getBoundingRect();
+	                var transform = child.getLocalTransform(tmpMat);
+	                if (transform) {
+	                    tmpRect.copy(childRect);
+	                    tmpRect.applyTransform(transform);
+	                    rect = rect || tmpRect.clone();
+	                    rect.union(tmpRect);
+	                }
+	                else {
+	                    rect = rect || childRect.clone();
+	                    rect.union(childRect);
+	                }
+	            }
+	            return rect || tmpRect;
+	        }
+	    };
+
+	    zrUtil.inherits(Group, Element);
+
+	    module.exports = Group;
+
+
+/***/ },
+/* 31 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+	/**
+	 * @module zrender/Element
+	 */
+
+
+	    var guid = __webpack_require__(32);
+	    var Eventful = __webpack_require__(33);
+	    var Transformable = __webpack_require__(34);
+	    var Animatable = __webpack_require__(35);
+	    var zrUtil = __webpack_require__(4);
+
+	    /**
+	     * @alias module:zrender/Element
+	     * @constructor
+	     * @extends {module:zrender/mixin/Animatable}
+	     * @extends {module:zrender/mixin/Transformable}
+	     * @extends {module:zrender/mixin/Eventful}
+	     */
+	    var Element = function (opts) {
+
+	        Transformable.call(this, opts);
+	        Eventful.call(this, opts);
+	        Animatable.call(this, opts);
+
+	        /**
+	         * 画布元素ID
+	         * @type {string}
+	         */
+	        this.id = opts.id || guid();
+	    };
+
+	    Element.prototype = {
+
+	        /**
+	         * 元素类型
+	         * Element type
+	         * @type {string}
+	         */
+	        type: 'element',
+
+	        /**
+	         * 元素名字
+	         * Element name
+	         * @type {string}
+	         */
+	        name: '',
+
+	        /**
+	         * ZRender 实例对象，会在 element 添加到 zrender 实例中后自动赋值
+	         * ZRender instance will be assigned when element is associated with zrender
+	         * @name module:/zrender/Element#__zr
+	         * @type {module:zrender/ZRender}
+	         */
+	        __zr: null,
+
+	        /**
+	         * 图形是否忽略，为true时忽略图形的绘制以及事件触发
+	         * If ignore drawing and events of the element object
+	         * @name module:/zrender/Element#ignore
+	         * @type {boolean}
+	         * @default false
+	         */
+	        ignore: false,
+
+	        /**
+	         * 用于裁剪的路径(shape)，所有 Group 内的路径在绘制时都会被这个路径裁剪
+	         * 该路径会继承被裁减对象的变换
+	         * @type {module:zrender/graphic/Path}
+	         * @see http://www.w3.org/TR/2dcontext/#clipping-region
+	         * @readOnly
+	         */
+	        clipPath: null,
+
+	        /**
+	         * Drift element
+	         * @param  {number} dx dx on the global space
+	         * @param  {number} dy dy on the global space
+	         */
+	        drift: function (dx, dy) {
+	            switch (this.draggable) {
+	                case 'horizontal':
+	                    dy = 0;
+	                    break;
+	                case 'vertical':
+	                    dx = 0;
+	                    break;
+	            }
+
+	            var m = this.transform;
+	            if (!m) {
+	                m = this.transform = [1, 0, 0, 1, 0, 0];
+	            }
+	            m[4] += dx;
+	            m[5] += dy;
+
+	            this.decomposeTransform();
+	            this.dirty(false);
+	        },
+
+	        /**
+	         * Hook before update
+	         */
+	        beforeUpdate: function () {},
+	        /**
+	         * Hook after update
+	         */
+	        afterUpdate: function () {},
+	        /**
+	         * Update each frame
+	         */
+	        update: function () {
+	            this.updateTransform();
+	        },
+
+	        /**
+	         * @param  {Function} cb
+	         * @param  {}   context
+	         */
+	        traverse: function (cb, context) {},
+
+	        /**
+	         * @protected
+	         */
+	        attrKV: function (key, value) {
+	            if (key === 'position' || key === 'scale' || key === 'origin') {
+	                // Copy the array
+	                if (value) {
+	                    var target = this[key];
+	                    if (!target) {
+	                        target = this[key] = [];
+	                    }
+	                    target[0] = value[0];
+	                    target[1] = value[1];
+	                }
+	            }
+	            else {
+	                this[key] = value;
+	            }
+	        },
+
+	        /**
+	         * Hide the element
+	         */
+	        hide: function () {
+	            this.ignore = true;
+	            this.__zr && this.__zr.refresh();
+	        },
+
+	        /**
+	         * Show the element
+	         */
+	        show: function () {
+	            this.ignore = false;
+	            this.__zr && this.__zr.refresh();
+	        },
+
+	        /**
+	         * @param {string|Object} key
+	         * @param {*} value
+	         */
+	        attr: function (key, value) {
+	            if (typeof key === 'string') {
+	                this.attrKV(key, value);
+	            }
+	            else if (zrUtil.isObject(key)) {
+	                for (var name in key) {
+	                    if (key.hasOwnProperty(name)) {
+	                        this.attrKV(name, key[name]);
+	                    }
+	                }
+	            }
+
+	            this.dirty(false);
+
+	            return this;
+	        },
+
+	        /**
+	         * @param {module:zrender/graphic/Path} clipPath
+	         */
+	        setClipPath: function (clipPath) {
+	            var zr = this.__zr;
+	            if (zr) {
+	                clipPath.addSelfToZr(zr);
+	            }
+
+	            // Remove previous clip path
+	            if (this.clipPath && this.clipPath !== clipPath) {
+	                this.removeClipPath();
+	            }
+
+	            this.clipPath = clipPath;
+	            clipPath.__zr = zr;
+	            clipPath.__clipTarget = this;
+
+	            this.dirty(false);
+	        },
+
+	        /**
+	         */
+	        removeClipPath: function () {
+	            var clipPath = this.clipPath;
+	            if (clipPath) {
+	                if (clipPath.__zr) {
+	                    clipPath.removeSelfFromZr(clipPath.__zr);
+	                }
+
+	                clipPath.__zr = null;
+	                clipPath.__clipTarget = null;
+	                this.clipPath = null;
+
+	                this.dirty(false);
+	            }
+	        },
+
+	        /**
+	         * Add self from zrender instance.
+	         * Not recursively because it will be invoked when element added to storage.
+	         * @param {module:zrender/ZRender} zr
+	         */
+	        addSelfToZr: function (zr) {
+	            this.__zr = zr;
+	            // 添加动画
+	            var animators = this.animators;
+	            if (animators) {
+	                for (var i = 0; i < animators.length; i++) {
+	                    zr.animation.addAnimator(animators[i]);
+	                }
+	            }
+
+	            if (this.clipPath) {
+	                this.clipPath.addSelfToZr(zr);
+	            }
+	        },
+
+	        /**
+	         * Remove self from zrender instance.
+	         * Not recursively because it will be invoked when element added to storage.
+	         * @param {module:zrender/ZRender} zr
+	         */
+	        removeSelfFromZr: function (zr) {
+	            this.__zr = null;
+	            // 移除动画
+	            var animators = this.animators;
+	            if (animators) {
+	                for (var i = 0; i < animators.length; i++) {
+	                    zr.animation.removeAnimator(animators[i]);
+	                }
+	            }
+
+	            if (this.clipPath) {
+	                this.clipPath.removeSelfFromZr(zr);
+	            }
+	        }
+	    };
+
+	    zrUtil.mixin(Element, Animatable);
+	    zrUtil.mixin(Element, Transformable);
+	    zrUtil.mixin(Element, Eventful);
+
+	    module.exports = Element;
+
+
+/***/ },
+/* 32 */
+/***/ function(module, exports) {
+
+	/**
+	 * zrender: 生成唯一id
+	 *
+	 * @author errorrik (errorrik@gmail.com)
+	 */
+
+
+	    var idStart = 0x0907;
+
+	    module.exports = function () {
+	        return idStart++;
+	    };
+
+
+
+/***/ },
+/* 33 */
+/***/ function(module, exports) {
+
+	/**
+	 * 事件扩展
+	 * @module zrender/mixin/Eventful
+	 * @author Kener (@Kener-林峰, kener.linfeng@gmail.com)
+	 *         pissang (https://www.github.com/pissang)
+	 */
+
+
+	    var arrySlice = Array.prototype.slice;
+
+	    /**
+	     * 事件分发器
+	     * @alias module:zrender/mixin/Eventful
+	     * @constructor
+	     */
+	    var Eventful = function () {
+	        this._$handlers = {};
+	    };
+
+	    Eventful.prototype = {
+
+	        constructor: Eventful,
+
+	        /**
+	         * 单次触发绑定，trigger后销毁
+	         *
+	         * @param {string} event 事件名
+	         * @param {Function} handler 响应函数
+	         * @param {Object} context
+	         */
+	        one: function (event, handler, context) {
+	            var _h = this._$handlers;
+
+	            if (!handler || !event) {
+	                return this;
+	            }
+
+	            if (!_h[event]) {
+	                _h[event] = [];
+	            }
+
+	            for (var i = 0; i < _h[event].length; i++) {
+	                if (_h[event][i].h === handler) {
+	                    return this;
+	                }
+	            }
+
+	            _h[event].push({
+	                h: handler,
+	                one: true,
+	                ctx: context || this
+	            });
+
+	            return this;
+	        },
+
+	        /**
+	         * 绑定事件
+	         * @param {string} event 事件名
+	         * @param {Function} handler 事件处理函数
+	         * @param {Object} [context]
+	         */
+	        on: function (event, handler, context) {
+	            var _h = this._$handlers;
+
+	            if (!handler || !event) {
+	                return this;
+	            }
+
+	            if (!_h[event]) {
+	                _h[event] = [];
+	            }
+
+	            for (var i = 0; i < _h[event].length; i++) {
+	                if (_h[event][i].h === handler) {
+	                    return this;
+	                }
+	            }
+
+	            _h[event].push({
+	                h: handler,
+	                one: false,
+	                ctx: context || this
+	            });
+
+	            return this;
+	        },
+
+	        /**
+	         * 是否绑定了事件
+	         * @param  {string}  event
+	         * @return {boolean}
+	         */
+	        isSilent: function (event) {
+	            var _h = this._$handlers;
+	            return _h[event] && _h[event].length;
+	        },
+
+	        /**
+	         * 解绑事件
+	         * @param {string} event 事件名
+	         * @param {Function} [handler] 事件处理函数
+	         */
+	        off: function (event, handler) {
+	            var _h = this._$handlers;
+
+	            if (!event) {
+	                this._$handlers = {};
+	                return this;
+	            }
+
+	            if (handler) {
+	                if (_h[event]) {
+	                    var newList = [];
+	                    for (var i = 0, l = _h[event].length; i < l; i++) {
+	                        if (_h[event][i]['h'] != handler) {
+	                            newList.push(_h[event][i]);
+	                        }
+	                    }
+	                    _h[event] = newList;
+	                }
+
+	                if (_h[event] && _h[event].length === 0) {
+	                    delete _h[event];
+	                }
+	            }
+	            else {
+	                delete _h[event];
+	            }
+
+	            return this;
+	        },
+
+	        /**
+	         * 事件分发
+	         *
+	         * @param {string} type 事件类型
+	         */
+	        trigger: function (type) {
+	            if (this._$handlers[type]) {
+	                var args = arguments;
+	                var argLen = args.length;
+
+	                if (argLen > 3) {
+	                    args = arrySlice.call(args, 1);
+	                }
+
+	                var _h = this._$handlers[type];
+	                var len = _h.length;
+	                for (var i = 0; i < len;) {
+	                    // Optimize advise from backbone
+	                    switch (argLen) {
+	                        case 1:
+	                            _h[i]['h'].call(_h[i]['ctx']);
+	                            break;
+	                        case 2:
+	                            _h[i]['h'].call(_h[i]['ctx'], args[1]);
+	                            break;
+	                        case 3:
+	                            _h[i]['h'].call(_h[i]['ctx'], args[1], args[2]);
+	                            break;
+	                        default:
+	                            // have more than 2 given arguments
+	                            _h[i]['h'].apply(_h[i]['ctx'], args);
+	                            break;
+	                    }
+
+	                    if (_h[i]['one']) {
+	                        _h.splice(i, 1);
+	                        len--;
+	                    }
+	                    else {
+	                        i++;
+	                    }
+	                }
+	            }
+
+	            return this;
+	        },
+
+	        /**
+	         * 带有context的事件分发, 最后一个参数是事件回调的context
+	         * @param {string} type 事件类型
+	         */
+	        triggerWithContext: function (type) {
+	            if (this._$handlers[type]) {
+	                var args = arguments;
+	                var argLen = args.length;
+
+	                if (argLen > 4) {
+	                    args = arrySlice.call(args, 1, args.length - 1);
+	                }
+	                var ctx = args[args.length - 1];
+
+	                var _h = this._$handlers[type];
+	                var len = _h.length;
+	                for (var i = 0; i < len;) {
+	                    // Optimize advise from backbone
+	                    switch (argLen) {
+	                        case 1:
+	                            _h[i]['h'].call(ctx);
+	                            break;
+	                        case 2:
+	                            _h[i]['h'].call(ctx, args[1]);
+	                            break;
+	                        case 3:
+	                            _h[i]['h'].call(ctx, args[1], args[2]);
+	                            break;
+	                        default:
+	                            // have more than 2 given arguments
+	                            _h[i]['h'].apply(ctx, args);
+	                            break;
+	                    }
+
+	                    if (_h[i]['one']) {
+	                        _h.splice(i, 1);
+	                        len--;
+	                    }
+	                    else {
+	                        i++;
+	                    }
+	                }
+	            }
+
+	            return this;
+	        }
+	    };
+
+	    // 对象可以通过 onxxxx 绑定事件
+	    /**
+	     * @event module:zrender/mixin/Eventful#onclick
+	     * @type {Function}
+	     * @default null
+	     */
+	    /**
+	     * @event module:zrender/mixin/Eventful#onmouseover
+	     * @type {Function}
+	     * @default null
+	     */
+	    /**
+	     * @event module:zrender/mixin/Eventful#onmouseout
+	     * @type {Function}
+	     * @default null
+	     */
+	    /**
+	     * @event module:zrender/mixin/Eventful#onmousemove
+	     * @type {Function}
+	     * @default null
+	     */
+	    /**
+	     * @event module:zrender/mixin/Eventful#onmousewheel
+	     * @type {Function}
+	     * @default null
+	     */
+	    /**
+	     * @event module:zrender/mixin/Eventful#onmousedown
+	     * @type {Function}
+	     * @default null
+	     */
+	    /**
+	     * @event module:zrender/mixin/Eventful#onmouseup
+	     * @type {Function}
+	     * @default null
+	     */
+	    /**
+	     * @event module:zrender/mixin/Eventful#ondragstart
+	     * @type {Function}
+	     * @default null
+	     */
+	    /**
+	     * @event module:zrender/mixin/Eventful#ondragend
+	     * @type {Function}
+	     * @default null
+	     */
+	    /**
+	     * @event module:zrender/mixin/Eventful#ondragenter
+	     * @type {Function}
+	     * @default null
+	     */
+	    /**
+	     * @event module:zrender/mixin/Eventful#ondragleave
+	     * @type {Function}
+	     * @default null
+	     */
+	    /**
+	     * @event module:zrender/mixin/Eventful#ondragover
+	     * @type {Function}
+	     * @default null
+	     */
+	    /**
+	     * @event module:zrender/mixin/Eventful#ondrop
+	     * @type {Function}
+	     * @default null
+	     */
+
+	    module.exports = Eventful;
+
+
+
+/***/ },
+/* 34 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+	/**
+	 * 提供变换扩展
+	 * @module zrender/mixin/Transformable
+	 * @author pissang (https://www.github.com/pissang)
+	 */
+
+
+	    var matrix = __webpack_require__(11);
+	    var vector = __webpack_require__(10);
+	    var mIdentity = matrix.identity;
+
+	    var EPSILON = 5e-5;
+
+	    function isNotAroundZero(val) {
+	        return val > EPSILON || val < -EPSILON;
+	    }
+
+	    /**
+	     * @alias module:zrender/mixin/Transformable
+	     * @constructor
+	     */
+	    var Transformable = function (opts) {
+	        opts = opts || {};
+	        // If there are no given position, rotation, scale
+	        if (!opts.position) {
+	            /**
+	             * 平移
+	             * @type {Array.<number>}
+	             * @default [0, 0]
+	             */
+	            this.position = [0, 0];
+	        }
+	        if (opts.rotation == null) {
+	            /**
+	             * 旋转
+	             * @type {Array.<number>}
+	             * @default 0
+	             */
+	            this.rotation = 0;
+	        }
+	        if (!opts.scale) {
+	            /**
+	             * 缩放
+	             * @type {Array.<number>}
+	             * @default [1, 1]
+	             */
+	            this.scale = [1, 1];
+	        }
+	        /**
+	         * 旋转和缩放的原点
+	         * @type {Array.<number>}
+	         * @default null
+	         */
+	        this.origin = this.origin || null;
+	    };
+
+	    var transformableProto = Transformable.prototype;
+	    transformableProto.transform = null;
+
+	    /**
+	     * 判断是否需要有坐标变换
+	     * 如果有坐标变换, 则从position, rotation, scale以及父节点的transform计算出自身的transform矩阵
+	     */
+	    transformableProto.needLocalTransform = function () {
+	        return isNotAroundZero(this.rotation)
+	            || isNotAroundZero(this.position[0])
+	            || isNotAroundZero(this.position[1])
+	            || isNotAroundZero(this.scale[0] - 1)
+	            || isNotAroundZero(this.scale[1] - 1);
+	    };
+
+	    transformableProto.updateTransform = function () {
+	        var parent = this.parent;
+	        var parentHasTransform = parent && parent.transform;
+	        var needLocalTransform = this.needLocalTransform();
+
+	        var m = this.transform;
+	        if (!(needLocalTransform || parentHasTransform)) {
+	            m && mIdentity(m);
+	            return;
+	        }
+
+	        m = m || matrix.create();
+
+	        if (needLocalTransform) {
+	            this.getLocalTransform(m);
+	        }
+	        else {
+	            mIdentity(m);
+	        }
+
+	        // 应用父节点变换
+	        if (parentHasTransform) {
+	            if (needLocalTransform) {
+	                matrix.mul(m, parent.transform, m);
+	            }
+	            else {
+	                matrix.copy(m, parent.transform);
+	            }
+	        }
+	        // 保存这个变换矩阵
+	        this.transform = m;
+
+	        this.invTransform = this.invTransform || matrix.create();
+	        matrix.invert(this.invTransform, m);
+	    };
+
+	    transformableProto.getLocalTransform = function (m) {
+	        m = m || [];
+	        mIdentity(m);
+
+	        var origin = this.origin;
+
+	        var scale = this.scale;
+	        var rotation = this.rotation;
+	        var position = this.position;
+	        if (origin) {
+	            // Translate to origin
+	            m[4] -= origin[0];
+	            m[5] -= origin[1];
+	        }
+	        matrix.scale(m, m, scale);
+	        if (rotation) {
+	            matrix.rotate(m, m, rotation);
+	        }
+	        if (origin) {
+	            // Translate back from origin
+	            m[4] += origin[0];
+	            m[5] += origin[1];
+	        }
+
+	        m[4] += position[0];
+	        m[5] += position[1];
+
+	        return m;
+	    };
+	    /**
+	     * 将自己的transform应用到context上
+	     * @param {Context2D} ctx
+	     */
+	    transformableProto.setTransform = function (ctx) {
+	        var m = this.transform;
+	        if (m) {
+	            ctx.transform(m[0], m[1], m[2], m[3], m[4], m[5]);
+	        }
+	    };
+
+	    transformableProto.restoreTransform = function (ctx) {
+	        var m = this.invTransform;
+	        if (m) {
+	            ctx.transform(m[0], m[1], m[2], m[3], m[4], m[5]);
+	        }
+	    }
+
+	    var tmpTransform = [];
+
+	    /**
+	     * 分解`transform`矩阵到`position`, `rotation`, `scale`
+	     */
+	    transformableProto.decomposeTransform = function () {
+	        if (!this.transform) {
+	            return;
+	        }
+	        var parent = this.parent;
+	        var m = this.transform;
+	        if (parent && parent.transform) {
+	            // Get local transform and decompose them to position, scale, rotation
+	            matrix.mul(tmpTransform, parent.invTransform, m);
+	            m = tmpTransform;
+	        }
+	        var sx = m[0] * m[0] + m[1] * m[1];
+	        var sy = m[2] * m[2] + m[3] * m[3];
+	        var position = this.position;
+	        var scale = this.scale;
+	        if (isNotAroundZero(sx - 1)) {
+	            sx = Math.sqrt(sx);
+	        }
+	        if (isNotAroundZero(sy - 1)) {
+	            sy = Math.sqrt(sy);
+	        }
+	        if (m[0] < 0) {
+	            sx = -sx;
+	        }
+	        if (m[3] < 0) {
+	            sy = -sy;
+	        }
+	        position[0] = m[4];
+	        position[1] = m[5];
+	        scale[0] = sx;
+	        scale[1] = sy;
+	        this.rotation = Math.atan2(-m[1] / sy, m[0] / sx);
+	    };
+
+	    /**
+	     * Get global scale
+	     * @return {Array.<number>}
+	     */
+	    transformableProto.getGlobalScale = function () {
+	        var m = this.transform;
+	        if (!m) {
+	            return [1, 1];
+	        }
+	        var sx = Math.sqrt(m[0] * m[0] + m[1] * m[1]);
+	        var sy = Math.sqrt(m[2] * m[2] + m[3] * m[3]);
+	        if (m[0] < 0) {
+	            sx = -sx;
+	        }
+	        if (m[3] < 0) {
+	            sy = -sy;
+	        }
+	        return [sx, sy];
+	    };
+	    /**
+	     * 变换坐标位置到 shape 的局部坐标空间
+	     * @method
+	     * @param {number} x
+	     * @param {number} y
+	     * @return {Array.<number>}
+	     */
+	    transformableProto.transformCoordToLocal = function (x, y) {
+	        var v2 = [x, y];
+	        var invTransform = this.invTransform;
+	        if (invTransform) {
+	            vector.applyTransform(v2, v2, invTransform);
+	        }
+	        return v2;
+	    };
+
+	    /**
+	     * 变换局部坐标位置到全局坐标空间
+	     * @method
+	     * @param {number} x
+	     * @param {number} y
+	     * @return {Array.<number>}
+	     */
+	    transformableProto.transformCoordToGlobal = function (x, y) {
+	        var v2 = [x, y];
+	        var transform = this.transform;
+	        if (transform) {
+	            vector.applyTransform(v2, v2, transform);
+	        }
+	        return v2;
+	    };
+
+	    module.exports = Transformable;
+
+
+
+/***/ },
+/* 35 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+	/**
+	 * @module zrender/mixin/Animatable
+	 */
+
+
+	    var Animator = __webpack_require__(36);
+	    var util = __webpack_require__(4);
+	    var isString = util.isString;
+	    var isFunction = util.isFunction;
+	    var isObject = util.isObject;
+	    var log = __webpack_require__(40);
+
+	    /**
+	     * @alias modue:zrender/mixin/Animatable
+	     * @constructor
+	     */
+	    var Animatable = function () {
+
+	        /**
+	         * @type {Array.<module:zrender/animation/Animator>}
+	         * @readOnly
+	         */
+	        this.animators = [];
+	    };
+
+	    Animatable.prototype = {
+
+	        constructor: Animatable,
+
+	        /**
+	         * 动画
+	         *
+	         * @param {string} path 需要添加动画的属性获取路径，可以通过a.b.c来获取深层的属性
+	         * @param {boolean} [loop] 动画是否循环
+	         * @return {module:zrender/animation/Animator}
+	         * @example:
+	         *     el.animate('style', false)
+	         *         .when(1000, {x: 10} )
+	         *         .done(function(){ // Animation done })
+	         *         .start()
+	         */
+	        animate: function (path, loop) {
+	            var target;
+	            var animatingShape = false;
+	            var el = this;
+	            var zr = this.__zr;
+	            if (path) {
+	                var pathSplitted = path.split('.');
+	                var prop = el;
+	                // If animating shape
+	                animatingShape = pathSplitted[0] === 'shape';
+	                for (var i = 0, l = pathSplitted.length; i < l; i++) {
+	                    if (!prop) {
+	                        continue;
+	                    }
+	                    prop = prop[pathSplitted[i]];
+	                }
+	                if (prop) {
+	                    target = prop;
+	                }
+	            }
+	            else {
+	                target = el;
+	            }
+
+	            if (!target) {
+	                log(
+	                    'Property "'
+	                    + path
+	                    + '" is not existed in element '
+	                    + el.id
+	                );
+	                return;
+	            }
+
+	            var animators = el.animators;
+
+	            var animator = new Animator(target, loop);
+
+	            animator.during(function (target) {
+	                el.dirty(animatingShape);
+	            })
+	            .done(function () {
+	                // FIXME Animator will not be removed if use `Animator#stop` to stop animation
+	                animators.splice(util.indexOf(animators, animator), 1);
+	            });
+
+	            animators.push(animator);
+
+	            // If animate after added to the zrender
+	            if (zr) {
+	                zr.animation.addAnimator(animator);
+	            }
+
+	            return animator;
+	        },
+
+	        /**
+	         * 停止动画
+	         * @param {boolean} forwardToLast If move to last frame before stop
+	         */
+	        stopAnimation: function (forwardToLast) {
+	            var animators = this.animators;
+	            var len = animators.length;
+	            for (var i = 0; i < len; i++) {
+	                animators[i].stop(forwardToLast);
+	            }
+	            animators.length = 0;
+
+	            return this;
+	        },
+
+	        /**
+	         * @param {Object} target
+	         * @param {number} [time=500] Time in ms
+	         * @param {string} [easing='linear']
+	         * @param {number} [delay=0]
+	         * @param {Function} [callback]
+	         *
+	         * @example
+	         *  // Animate position
+	         *  el.animateTo({
+	         *      position: [10, 10]
+	         *  }, function () { // done })
+	         *
+	         *  // Animate shape, style and position in 100ms, delayed 100ms, with cubicOut easing
+	         *  el.animateTo({
+	         *      shape: {
+	         *          width: 500
+	         *      },
+	         *      style: {
+	         *          fill: 'red'
+	         *      }
+	         *      position: [10, 10]
+	         *  }, 100, 100, 'cubicOut', function () { // done })
+	         */
+	         // TODO Return animation key
+	        animateTo: function (target, time, delay, easing, callback) {
+	            // animateTo(target, time, easing, callback);
+	            if (isString(delay)) {
+	                callback = easing;
+	                easing = delay;
+	                delay = 0;
+	            }
+	            // animateTo(target, time, delay, callback);
+	            else if (isFunction(easing)) {
+	                callback = easing;
+	                easing = 'linear';
+	                delay = 0;
+	            }
+	            // animateTo(target, time, callback);
+	            else if (isFunction(delay)) {
+	                callback = delay;
+	                delay = 0;
+	            }
+	            // animateTo(target, callback)
+	            else if (isFunction(time)) {
+	                callback = time;
+	                time = 500;
+	            }
+	            // animateTo(target)
+	            else if (!time) {
+	                time = 500;
+	            }
+	            // Stop all previous animations
+	            this.stopAnimation();
+	            this._animateToShallow('', this, target, time, delay, easing, callback);
+
+	            // Animators may be removed immediately after start
+	            // if there is nothing to animate
+	            var animators = this.animators.slice();
+	            var count = animators.length;
+	            function done() {
+	                count--;
+	                if (!count) {
+	                    callback && callback();
+	                }
+	            }
+
+	            // No animators. This should be checked before animators[i].start(),
+	            // because 'done' may be executed immediately if no need to animate.
+	            if (!count) {
+	                callback && callback();
+	            }
+	            // Start after all animators created
+	            // Incase any animator is done immediately when all animation properties are not changed
+	            for (var i = 0; i < animators.length; i++) {
+	                animators[i]
+	                    .done(done)
+	                    .start(easing);
+	            }
+	        },
+
+	        /**
+	         * @private
+	         * @param {string} path=''
+	         * @param {Object} source=this
+	         * @param {Object} target
+	         * @param {number} [time=500]
+	         * @param {number} [delay=0]
+	         *
+	         * @example
+	         *  // Animate position
+	         *  el._animateToShallow({
+	         *      position: [10, 10]
+	         *  })
+	         *
+	         *  // Animate shape, style and position in 100ms, delayed 100ms
+	         *  el._animateToShallow({
+	         *      shape: {
+	         *          width: 500
+	         *      },
+	         *      style: {
+	         *          fill: 'red'
+	         *      }
+	         *      position: [10, 10]
+	         *  }, 100, 100)
+	         */
+	        _animateToShallow: function (path, source, target, time, delay) {
+	            var objShallow = {};
+	            var propertyCount = 0;
+	            for (var name in target) {
+	                if (source[name] != null) {
+	                    if (isObject(target[name]) && !util.isArrayLike(target[name])) {
+	                        this._animateToShallow(
+	                            path ? path + '.' + name : name,
+	                            source[name],
+	                            target[name],
+	                            time,
+	                            delay
+	                        );
+	                    }
+	                    else {
+	                        objShallow[name] = target[name];
+	                        propertyCount++;
+	                    }
+	                }
+	                else if (target[name] != null) {
+	                    // Attr directly if not has property
+	                    // FIXME, if some property not needed for element ?
+	                    if (!path) {
+	                        this.attr(name, target[name]);
+	                    }
+	                    else {  // Shape or style
+	                        var props = {};
+	                        props[path] = {};
+	                        props[path][name] = target[name];
+	                        this.attr(props);
+	                    }
+	                }
+	            }
+
+	            if (propertyCount > 0) {
+	                this.animate(path, false)
+	                    .when(time == null ? 500 : time, objShallow)
+	                    .delay(delay || 0);
+	            }
+
+	            return this;
+	        }
+	    };
+
+	    module.exports = Animatable;
+
+
+/***/ },
+/* 36 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @module echarts/animation/Animator
+	 */
+
+
+	    var Clip = __webpack_require__(37);
+	    var color = __webpack_require__(39);
+	    var util = __webpack_require__(4);
+	    var isArrayLike = util.isArrayLike;
+
+	    var arraySlice = Array.prototype.slice;
+
+	    function defaultGetter(target, key) {
+	        return target[key];
+	    }
+
+	    function defaultSetter(target, key, value) {
+	        target[key] = value;
+	    }
+
+	    /**
+	     * @param  {number} p0
+	     * @param  {number} p1
+	     * @param  {number} percent
+	     * @return {number}
+	     */
+	    function interpolateNumber(p0, p1, percent) {
+	        return (p1 - p0) * percent + p0;
+	    }
+
+	    /**
+	     * @param  {string} p0
+	     * @param  {string} p1
+	     * @param  {number} percent
+	     * @return {string}
+	     */
+	    function interpolateString(p0, p1, percent) {
+	        return percent > 0.5 ? p1 : p0;
+	    }
+
+	    /**
+	     * @param  {Array} p0
+	     * @param  {Array} p1
+	     * @param  {number} percent
+	     * @param  {Array} out
+	     * @param  {number} arrDim
+	     */
+	    function interpolateArray(p0, p1, percent, out, arrDim) {
+	        var len = p0.length;
+	        if (arrDim == 1) {
+	            for (var i = 0; i < len; i++) {
+	                out[i] = interpolateNumber(p0[i], p1[i], percent);
+	            }
+	        }
+	        else {
+	            var len2 = p0[0].length;
+	            for (var i = 0; i < len; i++) {
+	                for (var j = 0; j < len2; j++) {
+	                    out[i][j] = interpolateNumber(
+	                        p0[i][j], p1[i][j], percent
+	                    );
+	                }
+	            }
+	        }
+	    }
+
+	    // arr0 is source array, arr1 is target array.
+	    // Do some preprocess to avoid error happened when interpolating from arr0 to arr1
+	    function fillArr(arr0, arr1, arrDim) {
+	        var arr0Len = arr0.length;
+	        var arr1Len = arr1.length;
+	        if (arr0Len !== arr1Len) {
+	            // FIXME Not work for TypedArray
+	            var isPreviousLarger = arr0Len > arr1Len;
+	            if (isPreviousLarger) {
+	                // Cut the previous
+	                arr0.length = arr1Len;
+	            }
+	            else {
+	                // Fill the previous
+	                for (var i = arr0Len; i < arr1Len; i++) {
+	                    arr0.push(
+	                        arrDim === 1 ? arr1[i] : arraySlice.call(arr1[i])
+	                    );
+	                }
+	            }
+	        }
+	        // Handling NaN value
+	        var len2 = arr0[0] && arr0[0].length;
+	        for (var i = 0; i < arr0.length; i++) {
+	            if (arrDim === 1) {
+	                if (isNaN(arr0[i])) {
+	                    arr0[i] = arr1[i];
+	                }
+	            }
+	            else {
+	                for (var j = 0; j < len2; j++) {
+	                    if (isNaN(arr0[i][j])) {
+	                        arr0[i][j] = arr1[i][j];
+	                    }
+	                }
+	            }
+	        }
+	    }
+
+	    /**
+	     * @param  {Array} arr0
+	     * @param  {Array} arr1
+	     * @param  {number} arrDim
+	     * @return {boolean}
+	     */
+	    function isArraySame(arr0, arr1, arrDim) {
+	        if (arr0 === arr1) {
+	            return true;
+	        }
+	        var len = arr0.length;
+	        if (len !== arr1.length) {
+	            return false;
+	        }
+	        if (arrDim === 1) {
+	            for (var i = 0; i < len; i++) {
+	                if (arr0[i] !== arr1[i]) {
+	                    return false;
+	                }
+	            }
+	        }
+	        else {
+	            var len2 = arr0[0].length;
+	            for (var i = 0; i < len; i++) {
+	                for (var j = 0; j < len2; j++) {
+	                    if (arr0[i][j] !== arr1[i][j]) {
+	                        return false;
+	                    }
+	                }
+	            }
+	        }
+	        return true;
+	    }
+
+	    /**
+	     * Catmull Rom interpolate array
+	     * @param  {Array} p0
+	     * @param  {Array} p1
+	     * @param  {Array} p2
+	     * @param  {Array} p3
+	     * @param  {number} t
+	     * @param  {number} t2
+	     * @param  {number} t3
+	     * @param  {Array} out
+	     * @param  {number} arrDim
+	     */
+	    function catmullRomInterpolateArray(
+	        p0, p1, p2, p3, t, t2, t3, out, arrDim
+	    ) {
+	        var len = p0.length;
+	        if (arrDim == 1) {
+	            for (var i = 0; i < len; i++) {
+	                out[i] = catmullRomInterpolate(
+	                    p0[i], p1[i], p2[i], p3[i], t, t2, t3
+	                );
+	            }
+	        }
+	        else {
+	            var len2 = p0[0].length;
+	            for (var i = 0; i < len; i++) {
+	                for (var j = 0; j < len2; j++) {
+	                    out[i][j] = catmullRomInterpolate(
+	                        p0[i][j], p1[i][j], p2[i][j], p3[i][j],
+	                        t, t2, t3
+	                    );
+	                }
+	            }
+	        }
+	    }
+
+	    /**
+	     * Catmull Rom interpolate number
+	     * @param  {number} p0
+	     * @param  {number} p1
+	     * @param  {number} p2
+	     * @param  {number} p3
+	     * @param  {number} t
+	     * @param  {number} t2
+	     * @param  {number} t3
+	     * @return {number}
+	     */
+	    function catmullRomInterpolate(p0, p1, p2, p3, t, t2, t3) {
+	        var v0 = (p2 - p0) * 0.5;
+	        var v1 = (p3 - p1) * 0.5;
+	        return (2 * (p1 - p2) + v0 + v1) * t3
+	                + (-3 * (p1 - p2) - 2 * v0 - v1) * t2
+	                + v0 * t + p1;
+	    }
+
+	    function cloneValue(value) {
+	        if (isArrayLike(value)) {
+	            var len = value.length;
+	            if (isArrayLike(value[0])) {
+	                var ret = [];
+	                for (var i = 0; i < len; i++) {
+	                    ret.push(arraySlice.call(value[i]));
+	                }
+	                return ret;
+	            }
+
+	            return arraySlice.call(value);
+	        }
+
+	        return value;
+	    }
+
+	    function rgba2String(rgba) {
+	        rgba[0] = Math.floor(rgba[0]);
+	        rgba[1] = Math.floor(rgba[1]);
+	        rgba[2] = Math.floor(rgba[2]);
+
+	        return 'rgba(' + rgba.join(',') + ')';
+	    }
+
+	    function createTrackClip (animator, easing, oneTrackDone, keyframes, propName) {
+	        var getter = animator._getter;
+	        var setter = animator._setter;
+	        var useSpline = easing === 'spline';
+
+	        var trackLen = keyframes.length;
+	        if (!trackLen) {
+	            return;
+	        }
+	        // Guess data type
+	        var firstVal = keyframes[0].value;
+	        var isValueArray = isArrayLike(firstVal);
+	        var isValueColor = false;
+	        var isValueString = false;
+
+	        // For vertices morphing
+	        var arrDim = (
+	                isValueArray
+	                && isArrayLike(firstVal[0])
+	            )
+	            ? 2 : 1;
+	        var trackMaxTime;
+	        // Sort keyframe as ascending
+	        keyframes.sort(function(a, b) {
+	            return a.time - b.time;
+	        });
+
+	        trackMaxTime = keyframes[trackLen - 1].time;
+	        // Percents of each keyframe
+	        var kfPercents = [];
+	        // Value of each keyframe
+	        var kfValues = [];
+	        var prevValue = keyframes[0].value;
+	        var isAllValueEqual = true;
+	        for (var i = 0; i < trackLen; i++) {
+	            kfPercents.push(keyframes[i].time / trackMaxTime);
+	            // Assume value is a color when it is a string
+	            var value = keyframes[i].value;
+
+	            // Check if value is equal, deep check if value is array
+	            if (!((isValueArray && isArraySame(value, prevValue, arrDim))
+	                || (!isValueArray && value === prevValue))) {
+	                isAllValueEqual = false;
+	            }
+	            prevValue = value;
+
+	            // Try converting a string to a color array
+	            if (typeof value == 'string') {
+	                var colorArray = color.parse(value);
+	                if (colorArray) {
+	                    value = colorArray;
+	                    isValueColor = true;
+	                }
+	                else {
+	                    isValueString = true;
+	                }
+	            }
+	            kfValues.push(value);
+	        }
+	        if (isAllValueEqual) {
+	            return;
+	        }
+
+	        var lastValue = kfValues[trackLen - 1];
+	        // Polyfill array and NaN value
+	        for (var i = 0; i < trackLen - 1; i++) {
+	            if (isValueArray) {
+	                fillArr(kfValues[i], lastValue, arrDim);
+	            }
+	            else {
+	                if (isNaN(kfValues[i]) && !isNaN(lastValue) && !isValueString && !isValueColor) {
+	                    kfValues[i] = lastValue;
+	                }
+	            }
+	        }
+	        isValueArray && fillArr(getter(animator._target, propName), lastValue, arrDim);
+
+	        // Cache the key of last frame to speed up when
+	        // animation playback is sequency
+	        var lastFrame = 0;
+	        var lastFramePercent = 0;
+	        var start;
+	        var w;
+	        var p0;
+	        var p1;
+	        var p2;
+	        var p3;
+
+	        if (isValueColor) {
+	            var rgba = [0, 0, 0, 0];
+	        }
+
+	        var onframe = function (target, percent) {
+	            // Find the range keyframes
+	            // kf1-----kf2---------current--------kf3
+	            // find kf2 and kf3 and do interpolation
+	            var frame;
+	            if (percent < lastFramePercent) {
+	                // Start from next key
+	                // PENDING start from lastFrame ?
+	                start = Math.min(lastFrame + 1, trackLen - 1);
+	                for (frame = start; frame >= 0; frame--) {
+	                    if (kfPercents[frame] <= percent) {
+	                        break;
+	                    }
+	                }
+	                // PENDING really need to do this ?
+	                frame = Math.min(frame, trackLen - 2);
+	            }
+	            else {
+	                for (frame = lastFrame; frame < trackLen; frame++) {
+	                    if (kfPercents[frame] > percent) {
+	                        break;
+	                    }
+	                }
+	                frame = Math.min(frame - 1, trackLen - 2);
+	            }
+	            lastFrame = frame;
+	            lastFramePercent = percent;
+
+	            var range = (kfPercents[frame + 1] - kfPercents[frame]);
+	            if (range === 0) {
+	                return;
+	            }
+	            else {
+	                w = (percent - kfPercents[frame]) / range;
+	            }
+	            if (useSpline) {
+	                p1 = kfValues[frame];
+	                p0 = kfValues[frame === 0 ? frame : frame - 1];
+	                p2 = kfValues[frame > trackLen - 2 ? trackLen - 1 : frame + 1];
+	                p3 = kfValues[frame > trackLen - 3 ? trackLen - 1 : frame + 2];
+	                if (isValueArray) {
+	                    catmullRomInterpolateArray(
+	                        p0, p1, p2, p3, w, w * w, w * w * w,
+	                        getter(target, propName),
+	                        arrDim
+	                    );
+	                }
+	                else {
+	                    var value;
+	                    if (isValueColor) {
+	                        value = catmullRomInterpolateArray(
+	                            p0, p1, p2, p3, w, w * w, w * w * w,
+	                            rgba, 1
+	                        );
+	                        value = rgba2String(rgba);
+	                    }
+	                    else if (isValueString) {
+	                        // String is step(0.5)
+	                        return interpolateString(p1, p2, w);
+	                    }
+	                    else {
+	                        value = catmullRomInterpolate(
+	                            p0, p1, p2, p3, w, w * w, w * w * w
+	                        );
+	                    }
+	                    setter(
+	                        target,
+	                        propName,
+	                        value
+	                    );
+	                }
+	            }
+	            else {
+	                if (isValueArray) {
+	                    interpolateArray(
+	                        kfValues[frame], kfValues[frame + 1], w,
+	                        getter(target, propName),
+	                        arrDim
+	                    );
+	                }
+	                else {
+	                    var value;
+	                    if (isValueColor) {
+	                        interpolateArray(
+	                            kfValues[frame], kfValues[frame + 1], w,
+	                            rgba, 1
+	                        );
+	                        value = rgba2String(rgba);
+	                    }
+	                    else if (isValueString) {
+	                        // String is step(0.5)
+	                        return interpolateString(kfValues[frame], kfValues[frame + 1], w);
+	                    }
+	                    else {
+	                        value = interpolateNumber(kfValues[frame], kfValues[frame + 1], w);
+	                    }
+	                    setter(
+	                        target,
+	                        propName,
+	                        value
+	                    );
+	                }
+	            }
+	        };
+
+	        var clip = new Clip({
+	            target: animator._target,
+	            life: trackMaxTime,
+	            loop: animator._loop,
+	            delay: animator._delay,
+	            onframe: onframe,
+	            ondestroy: oneTrackDone
+	        });
+
+	        if (easing && easing !== 'spline') {
+	            clip.easing = easing;
+	        }
+
+	        return clip;
+	    }
+
+	    /**
+	     * @alias module:zrender/animation/Animator
+	     * @constructor
+	     * @param {Object} target
+	     * @param {boolean} loop
+	     * @param {Function} getter
+	     * @param {Function} setter
+	     */
+	    var Animator = function(target, loop, getter, setter) {
+	        this._tracks = {};
+	        this._target = target;
+
+	        this._loop = loop || false;
+
+	        this._getter = getter || defaultGetter;
+	        this._setter = setter || defaultSetter;
+
+	        this._clipCount = 0;
+
+	        this._delay = 0;
+
+	        this._doneList = [];
+
+	        this._onframeList = [];
+
+	        this._clipList = [];
+	    };
+
+	    Animator.prototype = {
+	        /**
+	         * 设置动画关键帧
+	         * @param  {number} time 关键帧时间，单位是ms
+	         * @param  {Object} props 关键帧的属性值，key-value表示
+	         * @return {module:zrender/animation/Animator}
+	         */
+	        when: function(time /* ms */, props) {
+	            var tracks = this._tracks;
+	            for (var propName in props) {
+	                if (!tracks[propName]) {
+	                    tracks[propName] = [];
+	                    // Invalid value
+	                    var value = this._getter(this._target, propName);
+	                    if (value == null) {
+	                        // zrLog('Invalid property ' + propName);
+	                        continue;
+	                    }
+	                    // If time is 0
+	                    //  Then props is given initialize value
+	                    // Else
+	                    //  Initialize value from current prop value
+	                    if (time !== 0) {
+	                        tracks[propName].push({
+	                            time: 0,
+	                            value: cloneValue(value)
+	                        });
+	                    }
+	                }
+	                tracks[propName].push({
+	                    time: time,
+	                    value: props[propName]
+	                });
+	            }
+	            return this;
+	        },
+	        /**
+	         * 添加动画每一帧的回调函数
+	         * @param  {Function} callback
+	         * @return {module:zrender/animation/Animator}
+	         */
+	        during: function (callback) {
+	            this._onframeList.push(callback);
+	            return this;
+	        },
+
+	        _doneCallback: function () {
+	            // Clear all tracks
+	            this._tracks = {};
+	            // Clear all clips
+	            this._clipList.length = 0;
+
+	            var doneList = this._doneList;
+	            var len = doneList.length;
+	            for (var i = 0; i < len; i++) {
+	                doneList[i].call(this);
+	            }
+	        },
+	        /**
+	         * 开始执行动画
+	         * @param  {string|Function} easing
+	         *         动画缓动函数，详见{@link module:zrender/animation/easing}
+	         * @return {module:zrender/animation/Animator}
+	         */
+	        start: function (easing) {
+
+	            var self = this;
+	            var clipCount = 0;
+
+	            var oneTrackDone = function() {
+	                clipCount--;
+	                if (!clipCount) {
+	                    self._doneCallback();
+	                }
+	            };
+
+	            var lastClip;
+	            for (var propName in this._tracks) {
+	                var clip = createTrackClip(
+	                    this, easing, oneTrackDone,
+	                    this._tracks[propName], propName
+	                );
+	                if (clip) {
+	                    this._clipList.push(clip);
+	                    clipCount++;
+
+	                    // If start after added to animation
+	                    if (this.animation) {
+	                        this.animation.addClip(clip);
+	                    }
+
+	                    lastClip = clip;
+	                }
+	            }
+
+	            // Add during callback on the last clip
+	            if (lastClip) {
+	                var oldOnFrame = lastClip.onframe;
+	                lastClip.onframe = function (target, percent) {
+	                    oldOnFrame(target, percent);
+
+	                    for (var i = 0; i < self._onframeList.length; i++) {
+	                        self._onframeList[i](target, percent);
+	                    }
+	                };
+	            }
+
+	            if (!clipCount) {
+	                this._doneCallback();
+	            }
+	            return this;
+	        },
+	        /**
+	         * 停止动画
+	         * @param {boolean} forwardToLast If move to last frame before stop
+	         */
+	        stop: function (forwardToLast) {
+	            var clipList = this._clipList;
+	            var animation = this.animation;
+	            for (var i = 0; i < clipList.length; i++) {
+	                var clip = clipList[i];
+	                if (forwardToLast) {
+	                    // Move to last frame before stop
+	                    clip.onframe(this._target, 1);
+	                }
+	                animation && animation.removeClip(clip);
+	            }
+	            clipList.length = 0;
+	        },
+	        /**
+	         * 设置动画延迟开始的时间
+	         * @param  {number} time 单位ms
+	         * @return {module:zrender/animation/Animator}
+	         */
+	        delay: function (time) {
+	            this._delay = time;
+	            return this;
+	        },
+	        /**
+	         * 添加动画结束的回调
+	         * @param  {Function} cb
+	         * @return {module:zrender/animation/Animator}
+	         */
+	        done: function(cb) {
+	            if (cb) {
+	                this._doneList.push(cb);
+	            }
+	            return this;
+	        },
+
+	        /**
+	         * @return {Array.<module:zrender/animation/Clip>}
+	         */
+	        getClips: function () {
+	            return this._clipList;
+	        }
+	    };
+
+	    module.exports = Animator;
+
+
+/***/ },
+/* 37 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * 动画主控制器
+	 * @config target 动画对象，可以是数组，如果是数组的话会批量分发onframe等事件
+	 * @config life(1000) 动画时长
+	 * @config delay(0) 动画延迟时间
+	 * @config loop(true)
+	 * @config gap(0) 循环的间隔时间
+	 * @config onframe
+	 * @config easing(optional)
+	 * @config ondestroy(optional)
+	 * @config onrestart(optional)
+	 *
+	 * TODO pause
+	 */
+
+
+	    var easingFuncs = __webpack_require__(38);
+
+	    function Clip(options) {
+
+	        this._target = options.target;
+
+	        // 生命周期
+	        this._life = options.life || 1000;
+	        // 延时
+	        this._delay = options.delay || 0;
+	        // 开始时间
+	        // this._startTime = new Date().getTime() + this._delay;// 单位毫秒
+	        this._initialized = false;
+
+	        // 是否循环
+	        this.loop = options.loop == null ? false : options.loop;
+
+	        this.gap = options.gap || 0;
+
+	        this.easing = options.easing || 'Linear';
+
+	        this.onframe = options.onframe;
+	        this.ondestroy = options.ondestroy;
+	        this.onrestart = options.onrestart;
+	    }
+
+	    Clip.prototype = {
+
+	        constructor: Clip,
+
+	        step: function (time) {
+	            // Set startTime on first step, or _startTime may has milleseconds different between clips
+	            // PENDING
+	            if (!this._initialized) {
+	                this._startTime = new Date().getTime() + this._delay;
+	                this._initialized = true;
+	            }
+
+	            var percent = (time - this._startTime) / this._life;
+
+	            // 还没开始
+	            if (percent < 0) {
+	                return;
+	            }
+
+	            percent = Math.min(percent, 1);
+
+	            var easing = this.easing;
+	            var easingFunc = typeof easing == 'string' ? easingFuncs[easing] : easing;
+	            var schedule = typeof easingFunc === 'function'
+	                ? easingFunc(percent)
+	                : percent;
+
+	            this.fire('frame', schedule);
+
+	            // 结束
+	            if (percent == 1) {
+	                if (this.loop) {
+	                    this.restart();
+	                    // 重新开始周期
+	                    // 抛出而不是直接调用事件直到 stage.update 后再统一调用这些事件
+	                    return 'restart';
+	                }
+
+	                // 动画完成将这个控制器标识为待删除
+	                // 在Animation.update中进行批量删除
+	                this._needsRemove = true;
+	                return 'destroy';
+	            }
+
+	            return null;
+	        },
+
+	        restart: function() {
+	            var time = new Date().getTime();
+	            var remainder = (time - this._startTime) % this._life;
+	            this._startTime = new Date().getTime() - remainder + this.gap;
+
+	            this._needsRemove = false;
+	        },
+
+	        fire: function(eventType, arg) {
+	            eventType = 'on' + eventType;
+	            if (this[eventType]) {
+	                this[eventType](this._target, arg);
+	            }
+	        }
+	    };
+
+	    module.exports = Clip;
+
+
+
+/***/ },
+/* 38 */
+/***/ function(module, exports) {
+
+	/**
+	 * 缓动代码来自 https://github.com/sole/tween.js/blob/master/src/Tween.js
+	 * @see http://sole.github.io/tween.js/examples/03_graphs.html
+	 * @exports zrender/animation/easing
+	 */
+
+	    var easing = {
+	        /**
+	        * @param {number} k
+	        * @return {number}
+	        */
+	        linear: function (k) {
+	            return k;
+	        },
+
+	        /**
+	        * @param {number} k
+	        * @return {number}
+	        */
+	        quadraticIn: function (k) {
+	            return k * k;
+	        },
+	        /**
+	        * @param {number} k
+	        * @return {number}
+	        */
+	        quadraticOut: function (k) {
+	            return k * (2 - k);
+	        },
+	        /**
+	        * @param {number} k
+	        * @return {number}
+	        */
+	        quadraticInOut: function (k) {
+	            if ((k *= 2) < 1) {
+	                return 0.5 * k * k;
+	            }
+	            return -0.5 * (--k * (k - 2) - 1);
+	        },
+
+	        // 三次方的缓动（t^3）
+	        /**
+	        * @param {number} k
+	        * @return {number}
+	        */
+	        cubicIn: function (k) {
+	            return k * k * k;
+	        },
+	        /**
+	        * @param {number} k
+	        * @return {number}
+	        */
+	        cubicOut: function (k) {
+	            return --k * k * k + 1;
+	        },
+	        /**
+	        * @param {number} k
+	        * @return {number}
+	        */
+	        cubicInOut: function (k) {
+	            if ((k *= 2) < 1) {
+	                return 0.5 * k * k * k;
+	            }
+	            return 0.5 * ((k -= 2) * k * k + 2);
+	        },
+
+	        // 四次方的缓动（t^4）
+	        /**
+	        * @param {number} k
+	        * @return {number}
+	        */
+	        quarticIn: function (k) {
+	            return k * k * k * k;
+	        },
+	        /**
+	        * @param {number} k
+	        * @return {number}
+	        */
+	        quarticOut: function (k) {
+	            return 1 - (--k * k * k * k);
+	        },
+	        /**
+	        * @param {number} k
+	        * @return {number}
+	        */
+	        quarticInOut: function (k) {
+	            if ((k *= 2) < 1) {
+	                return 0.5 * k * k * k * k;
+	            }
+	            return -0.5 * ((k -= 2) * k * k * k - 2);
+	        },
+
+	        // 五次方的缓动（t^5）
+	        /**
+	        * @param {number} k
+	        * @return {number}
+	        */
+	        quinticIn: function (k) {
+	            return k * k * k * k * k;
+	        },
+	        /**
+	        * @param {number} k
+	        * @return {number}
+	        */
+	        quinticOut: function (k) {
+	            return --k * k * k * k * k + 1;
+	        },
+	        /**
+	        * @param {number} k
+	        * @return {number}
+	        */
+	        quinticInOut: function (k) {
+	            if ((k *= 2) < 1) {
+	                return 0.5 * k * k * k * k * k;
+	            }
+	            return 0.5 * ((k -= 2) * k * k * k * k + 2);
+	        },
+
+	        // 正弦曲线的缓动（sin(t)）
+	        /**
+	        * @param {number} k
+	        * @return {number}
+	        */
+	        sinusoidalIn: function (k) {
+	            return 1 - Math.cos(k * Math.PI / 2);
+	        },
+	        /**
+	        * @param {number} k
+	        * @return {number}
+	        */
+	        sinusoidalOut: function (k) {
+	            return Math.sin(k * Math.PI / 2);
+	        },
+	        /**
+	        * @param {number} k
+	        * @return {number}
+	        */
+	        sinusoidalInOut: function (k) {
+	            return 0.5 * (1 - Math.cos(Math.PI * k));
+	        },
+
+	        // 指数曲线的缓动（2^t）
+	        /**
+	        * @param {number} k
+	        * @return {number}
+	        */
+	        exponentialIn: function (k) {
+	            return k === 0 ? 0 : Math.pow(1024, k - 1);
+	        },
+	        /**
+	        * @param {number} k
+	        * @return {number}
+	        */
+	        exponentialOut: function (k) {
+	            return k === 1 ? 1 : 1 - Math.pow(2, -10 * k);
+	        },
+	        /**
+	        * @param {number} k
+	        * @return {number}
+	        */
+	        exponentialInOut: function (k) {
+	            if (k === 0) {
+	                return 0;
+	            }
+	            if (k === 1) {
+	                return 1;
+	            }
+	            if ((k *= 2) < 1) {
+	                return 0.5 * Math.pow(1024, k - 1);
+	            }
+	            return 0.5 * (-Math.pow(2, -10 * (k - 1)) + 2);
+	        },
+
+	        // 圆形曲线的缓动（sqrt(1-t^2)）
+	        /**
+	        * @param {number} k
+	        * @return {number}
+	        */
+	        circularIn: function (k) {
+	            return 1 - Math.sqrt(1 - k * k);
+	        },
+	        /**
+	        * @param {number} k
+	        * @return {number}
+	        */
+	        circularOut: function (k) {
+	            return Math.sqrt(1 - (--k * k));
+	        },
+	        /**
+	        * @param {number} k
+	        * @return {number}
+	        */
+	        circularInOut: function (k) {
+	            if ((k *= 2) < 1) {
+	                return -0.5 * (Math.sqrt(1 - k * k) - 1);
+	            }
+	            return 0.5 * (Math.sqrt(1 - (k -= 2) * k) + 1);
+	        },
+
+	        // 创建类似于弹簧在停止前来回振荡的动画
+	        /**
+	        * @param {number} k
+	        * @return {number}
+	        */
+	        elasticIn: function (k) {
+	            var s;
+	            var a = 0.1;
+	            var p = 0.4;
+	            if (k === 0) {
+	                return 0;
+	            }
+	            if (k === 1) {
+	                return 1;
+	            }
+	            if (!a || a < 1) {
+	                a = 1; s = p / 4;
+	            }
+	            else {
+	                s = p * Math.asin(1 / a) / (2 * Math.PI);
+	            }
+	            return -(a * Math.pow(2, 10 * (k -= 1)) *
+	                        Math.sin((k - s) * (2 * Math.PI) / p));
+	        },
+	        /**
+	        * @param {number} k
+	        * @return {number}
+	        */
+	        elasticOut: function (k) {
+	            var s;
+	            var a = 0.1;
+	            var p = 0.4;
+	            if (k === 0) {
+	                return 0;
+	            }
+	            if (k === 1) {
+	                return 1;
+	            }
+	            if (!a || a < 1) {
+	                a = 1; s = p / 4;
+	            }
+	            else {
+	                s = p * Math.asin(1 / a) / (2 * Math.PI);
+	            }
+	            return (a * Math.pow(2, -10 * k) *
+	                    Math.sin((k - s) * (2 * Math.PI) / p) + 1);
+	        },
+	        /**
+	        * @param {number} k
+	        * @return {number}
+	        */
+	        elasticInOut: function (k) {
+	            var s;
+	            var a = 0.1;
+	            var p = 0.4;
+	            if (k === 0) {
+	                return 0;
+	            }
+	            if (k === 1) {
+	                return 1;
+	            }
+	            if (!a || a < 1) {
+	                a = 1; s = p / 4;
+	            }
+	            else {
+	                s = p * Math.asin(1 / a) / (2 * Math.PI);
+	            }
+	            if ((k *= 2) < 1) {
+	                return -0.5 * (a * Math.pow(2, 10 * (k -= 1))
+	                    * Math.sin((k - s) * (2 * Math.PI) / p));
+	            }
+	            return a * Math.pow(2, -10 * (k -= 1))
+	                    * Math.sin((k - s) * (2 * Math.PI) / p) * 0.5 + 1;
+
+	        },
+
+	        // 在某一动画开始沿指示的路径进行动画处理前稍稍收回该动画的移动
+	        /**
+	        * @param {number} k
+	        * @return {number}
+	        */
+	        backIn: function (k) {
+	            var s = 1.70158;
+	            return k * k * ((s + 1) * k - s);
+	        },
+	        /**
+	        * @param {number} k
+	        * @return {number}
+	        */
+	        backOut: function (k) {
+	            var s = 1.70158;
+	            return --k * k * ((s + 1) * k + s) + 1;
+	        },
+	        /**
+	        * @param {number} k
+	        * @return {number}
+	        */
+	        backInOut: function (k) {
+	            var s = 1.70158 * 1.525;
+	            if ((k *= 2) < 1) {
+	                return 0.5 * (k * k * ((s + 1) * k - s));
+	            }
+	            return 0.5 * ((k -= 2) * k * ((s + 1) * k + s) + 2);
+	        },
+
+	        // 创建弹跳效果
+	        /**
+	        * @param {number} k
+	        * @return {number}
+	        */
+	        bounceIn: function (k) {
+	            return 1 - easing.bounceOut(1 - k);
+	        },
+	        /**
+	        * @param {number} k
+	        * @return {number}
+	        */
+	        bounceOut: function (k) {
+	            if (k < (1 / 2.75)) {
+	                return 7.5625 * k * k;
+	            }
+	            else if (k < (2 / 2.75)) {
+	                return 7.5625 * (k -= (1.5 / 2.75)) * k + 0.75;
+	            }
+	            else if (k < (2.5 / 2.75)) {
+	                return 7.5625 * (k -= (2.25 / 2.75)) * k + 0.9375;
+	            }
+	            else {
+	                return 7.5625 * (k -= (2.625 / 2.75)) * k + 0.984375;
+	            }
+	        },
+	        /**
+	        * @param {number} k
+	        * @return {number}
+	        */
+	        bounceInOut: function (k) {
+	            if (k < 0.5) {
+	                return easing.bounceIn(k * 2) * 0.5;
+	            }
+	            return easing.bounceOut(k * 2 - 1) * 0.5 + 0.5;
+	        }
+	    };
+
+	    module.exports = easing;
+
+
+
+
+/***/ },
+/* 39 */
+/***/ function(module, exports) {
+
+	/**
+	 * @module zrender/tool/color
+	 */
+
+
+	    var kCSSColorTable = {
+	        'transparent': [0,0,0,0], 'aliceblue': [240,248,255,1],
+	        'antiquewhite': [250,235,215,1], 'aqua': [0,255,255,1],
+	        'aquamarine': [127,255,212,1], 'azure': [240,255,255,1],
+	        'beige': [245,245,220,1], 'bisque': [255,228,196,1],
+	        'black': [0,0,0,1], 'blanchedalmond': [255,235,205,1],
+	        'blue': [0,0,255,1], 'blueviolet': [138,43,226,1],
+	        'brown': [165,42,42,1], 'burlywood': [222,184,135,1],
+	        'cadetblue': [95,158,160,1], 'chartreuse': [127,255,0,1],
+	        'chocolate': [210,105,30,1], 'coral': [255,127,80,1],
+	        'cornflowerblue': [100,149,237,1], 'cornsilk': [255,248,220,1],
+	        'crimson': [220,20,60,1], 'cyan': [0,255,255,1],
+	        'darkblue': [0,0,139,1], 'darkcyan': [0,139,139,1],
+	        'darkgoldenrod': [184,134,11,1], 'darkgray': [169,169,169,1],
+	        'darkgreen': [0,100,0,1], 'darkgrey': [169,169,169,1],
+	        'darkkhaki': [189,183,107,1], 'darkmagenta': [139,0,139,1],
+	        'darkolivegreen': [85,107,47,1], 'darkorange': [255,140,0,1],
+	        'darkorchid': [153,50,204,1], 'darkred': [139,0,0,1],
+	        'darksalmon': [233,150,122,1], 'darkseagreen': [143,188,143,1],
+	        'darkslateblue': [72,61,139,1], 'darkslategray': [47,79,79,1],
+	        'darkslategrey': [47,79,79,1], 'darkturquoise': [0,206,209,1],
+	        'darkviolet': [148,0,211,1], 'deeppink': [255,20,147,1],
+	        'deepskyblue': [0,191,255,1], 'dimgray': [105,105,105,1],
+	        'dimgrey': [105,105,105,1], 'dodgerblue': [30,144,255,1],
+	        'firebrick': [178,34,34,1], 'floralwhite': [255,250,240,1],
+	        'forestgreen': [34,139,34,1], 'fuchsia': [255,0,255,1],
+	        'gainsboro': [220,220,220,1], 'ghostwhite': [248,248,255,1],
+	        'gold': [255,215,0,1], 'goldenrod': [218,165,32,1],
+	        'gray': [128,128,128,1], 'green': [0,128,0,1],
+	        'greenyellow': [173,255,47,1], 'grey': [128,128,128,1],
+	        'honeydew': [240,255,240,1], 'hotpink': [255,105,180,1],
+	        'indianred': [205,92,92,1], 'indigo': [75,0,130,1],
+	        'ivory': [255,255,240,1], 'khaki': [240,230,140,1],
+	        'lavender': [230,230,250,1], 'lavenderblush': [255,240,245,1],
+	        'lawngreen': [124,252,0,1], 'lemonchiffon': [255,250,205,1],
+	        'lightblue': [173,216,230,1], 'lightcoral': [240,128,128,1],
+	        'lightcyan': [224,255,255,1], 'lightgoldenrodyellow': [250,250,210,1],
+	        'lightgray': [211,211,211,1], 'lightgreen': [144,238,144,1],
+	        'lightgrey': [211,211,211,1], 'lightpink': [255,182,193,1],
+	        'lightsalmon': [255,160,122,1], 'lightseagreen': [32,178,170,1],
+	        'lightskyblue': [135,206,250,1], 'lightslategray': [119,136,153,1],
+	        'lightslategrey': [119,136,153,1], 'lightsteelblue': [176,196,222,1],
+	        'lightyellow': [255,255,224,1], 'lime': [0,255,0,1],
+	        'limegreen': [50,205,50,1], 'linen': [250,240,230,1],
+	        'magenta': [255,0,255,1], 'maroon': [128,0,0,1],
+	        'mediumaquamarine': [102,205,170,1], 'mediumblue': [0,0,205,1],
+	        'mediumorchid': [186,85,211,1], 'mediumpurple': [147,112,219,1],
+	        'mediumseagreen': [60,179,113,1], 'mediumslateblue': [123,104,238,1],
+	        'mediumspringgreen': [0,250,154,1], 'mediumturquoise': [72,209,204,1],
+	        'mediumvioletred': [199,21,133,1], 'midnightblue': [25,25,112,1],
+	        'mintcream': [245,255,250,1], 'mistyrose': [255,228,225,1],
+	        'moccasin': [255,228,181,1], 'navajowhite': [255,222,173,1],
+	        'navy': [0,0,128,1], 'oldlace': [253,245,230,1],
+	        'olive': [128,128,0,1], 'olivedrab': [107,142,35,1],
+	        'orange': [255,165,0,1], 'orangered': [255,69,0,1],
+	        'orchid': [218,112,214,1], 'palegoldenrod': [238,232,170,1],
+	        'palegreen': [152,251,152,1], 'paleturquoise': [175,238,238,1],
+	        'palevioletred': [219,112,147,1], 'papayawhip': [255,239,213,1],
+	        'peachpuff': [255,218,185,1], 'peru': [205,133,63,1],
+	        'pink': [255,192,203,1], 'plum': [221,160,221,1],
+	        'powderblue': [176,224,230,1], 'purple': [128,0,128,1],
+	        'red': [255,0,0,1], 'rosybrown': [188,143,143,1],
+	        'royalblue': [65,105,225,1], 'saddlebrown': [139,69,19,1],
+	        'salmon': [250,128,114,1], 'sandybrown': [244,164,96,1],
+	        'seagreen': [46,139,87,1], 'seashell': [255,245,238,1],
+	        'sienna': [160,82,45,1], 'silver': [192,192,192,1],
+	        'skyblue': [135,206,235,1], 'slateblue': [106,90,205,1],
+	        'slategray': [112,128,144,1], 'slategrey': [112,128,144,1],
+	        'snow': [255,250,250,1], 'springgreen': [0,255,127,1],
+	        'steelblue': [70,130,180,1], 'tan': [210,180,140,1],
+	        'teal': [0,128,128,1], 'thistle': [216,191,216,1],
+	        'tomato': [255,99,71,1], 'turquoise': [64,224,208,1],
+	        'violet': [238,130,238,1], 'wheat': [245,222,179,1],
+	        'white': [255,255,255,1], 'whitesmoke': [245,245,245,1],
+	        'yellow': [255,255,0,1], 'yellowgreen': [154,205,50,1]
+	    };
+
+	    function clampCssByte(i) {  // Clamp to integer 0 .. 255.
+	        i = Math.round(i);  // Seems to be what Chrome does (vs truncation).
+	        return i < 0 ? 0 : i > 255 ? 255 : i;
+	    }
+
+	    function clampCssAngle(i) {  // Clamp to integer 0 .. 360.
+	        i = Math.round(i);  // Seems to be what Chrome does (vs truncation).
+	        return i < 0 ? 0 : i > 360 ? 360 : i;
+	    }
+
+	    function clampCssFloat(f) {  // Clamp to float 0.0 .. 1.0.
+	        return f < 0 ? 0 : f > 1 ? 1 : f;
+	    }
+
+	    function parseCssInt(str) {  // int or percentage.
+	        if (str.length && str.charAt(str.length - 1) === '%') {
+	            return clampCssByte(parseFloat(str) / 100 * 255);
+	        }
+	        return clampCssByte(parseInt(str, 10));
+	    }
+
+	    function parseCssFloat(str) {  // float or percentage.
+	        if (str.length && str.charAt(str.length - 1) === '%') {
+	            return clampCssFloat(parseFloat(str) / 100);
+	        }
+	        return clampCssFloat(parseFloat(str));
+	    }
+
+	    function cssHueToRgb(m1, m2, h) {
+	        if (h < 0) {
+	            h += 1;
+	        }
+	        else if (h > 1) {
+	            h -= 1;
+	        }
+
+	        if (h * 6 < 1) {
+	            return m1 + (m2 - m1) * h * 6;
+	        }
+	        if (h * 2 < 1) {
+	            return m2;
+	        }
+	        if (h * 3 < 2) {
+	            return m1 + (m2 - m1) * (2/3 - h) * 6;
+	        }
+	        return m1;
+	    }
+
+	    function lerp(a, b, p) {
+	        return a + (b - a) * p;
+	    }
+
+	    /**
+	     * @param {string} colorStr
+	     * @return {Array.<number>}
+	     * @memberOf module:zrender/util/color
+	     */
+	    function parse(colorStr) {
+	        if (!colorStr) {
+	            return;
+	        }
+	        // colorStr may be not string
+	        colorStr = colorStr + '';
+	        // Remove all whitespace, not compliant, but should just be more accepting.
+	        var str = colorStr.replace(/ /g, '').toLowerCase();
+
+	        // Color keywords (and transparent) lookup.
+	        if (str in kCSSColorTable) {
+	            return kCSSColorTable[str].slice();  // dup.
+	        }
+
+	        // #abc and #abc123 syntax.
+	        if (str.charAt(0) === '#') {
+	            if (str.length === 4) {
+	                var iv = parseInt(str.substr(1), 16);  // TODO(deanm): Stricter parsing.
+	                if (!(iv >= 0 && iv <= 0xfff)) {
+	                    return;  // Covers NaN.
+	                }
+	                return [
+	                    ((iv & 0xf00) >> 4) | ((iv & 0xf00) >> 8),
+	                    (iv & 0xf0) | ((iv & 0xf0) >> 4),
+	                    (iv & 0xf) | ((iv & 0xf) << 4),
+	                    1
+	                ];
+	            }
+	            else if (str.length === 7) {
+	                var iv = parseInt(str.substr(1), 16);  // TODO(deanm): Stricter parsing.
+	                if (!(iv >= 0 && iv <= 0xffffff)) {
+	                    return;  // Covers NaN.
+	                }
+	                return [
+	                    (iv & 0xff0000) >> 16,
+	                    (iv & 0xff00) >> 8,
+	                    iv & 0xff,
+	                    1
+	                ];
+	            }
+
+	            return;
+	        }
+	        var op = str.indexOf('('), ep = str.indexOf(')');
+	        if (op !== -1 && ep + 1 === str.length) {
+	            var fname = str.substr(0, op);
+	            var params = str.substr(op + 1, ep - (op + 1)).split(',');
+	            var alpha = 1;  // To allow case fallthrough.
+	            switch (fname) {
+	                case 'rgba':
+	                    if (params.length !== 4) {
+	                        return;
+	                    }
+	                    alpha = parseCssFloat(params.pop()); // jshint ignore:line
+	                // Fall through.
+	                case 'rgb':
+	                    if (params.length !== 3) {
+	                        return;
+	                    }
+	                    return [
+	                        parseCssInt(params[0]),
+	                        parseCssInt(params[1]),
+	                        parseCssInt(params[2]),
+	                        alpha
+	                    ];
+	                case 'hsla':
+	                    if (params.length !== 4) {
+	                        return;
+	                    }
+	                    params[3] = parseCssFloat(params[3]);
+	                    return hsla2rgba(params);
+	                case 'hsl':
+	                    if (params.length !== 3) {
+	                        return;
+	                    }
+	                    return hsla2rgba(params);
+	                default:
+	                    return;
+	            }
+	        }
+
+	        return;
+	    }
+
+	    /**
+	     * @param {Array.<number>} hsla
+	     * @return {Array.<number>} rgba
+	     */
+	    function hsla2rgba(hsla) {
+	        var h = (((parseFloat(hsla[0]) % 360) + 360) % 360) / 360;  // 0 .. 1
+	        // NOTE(deanm): According to the CSS spec s/l should only be
+	        // percentages, but we don't bother and let float or percentage.
+	        var s = parseCssFloat(hsla[1]);
+	        var l = parseCssFloat(hsla[2]);
+	        var m2 = l <= 0.5 ? l * (s + 1) : l + s - l * s;
+	        var m1 = l * 2 - m2;
+
+	        var rgba = [
+	            clampCssByte(cssHueToRgb(m1, m2, h + 1 / 3) * 255),
+	            clampCssByte(cssHueToRgb(m1, m2, h) * 255),
+	            clampCssByte(cssHueToRgb(m1, m2, h - 1 / 3) * 255)
+	        ];
+
+	        if (hsla.length === 4) {
+	            rgba[3] = hsla[3];
+	        }
+
+	        return rgba;
+	    }
+
+	    /**
+	     * @param {Array.<number>} rgba
+	     * @return {Array.<number>} hsla
+	     */
+	    function rgba2hsla(rgba) {
+	        if (!rgba) {
+	            return;
+	        }
+
+	        // RGB from 0 to 255
+	        var R = rgba[0] / 255;
+	        var G = rgba[1] / 255;
+	        var B = rgba[2] / 255;
+
+	        var vMin = Math.min(R, G, B); // Min. value of RGB
+	        var vMax = Math.max(R, G, B); // Max. value of RGB
+	        var delta = vMax - vMin; // Delta RGB value
+
+	        var L = (vMax + vMin) / 2;
+	        var H;
+	        var S;
+	        // HSL results from 0 to 1
+	        if (delta === 0) {
+	            H = 0;
+	            S = 0;
+	        }
+	        else {
+	            if (L < 0.5) {
+	                S = delta / (vMax + vMin);
+	            }
+	            else {
+	                S = delta / (2 - vMax - vMin);
+	            }
+
+	            var deltaR = (((vMax - R) / 6) + (delta / 2)) / delta;
+	            var deltaG = (((vMax - G) / 6) + (delta / 2)) / delta;
+	            var deltaB = (((vMax - B) / 6) + (delta / 2)) / delta;
+
+	            if (R === vMax) {
+	                H = deltaB - deltaG;
+	            }
+	            else if (G === vMax) {
+	                H = (1 / 3) + deltaR - deltaB;
+	            }
+	            else if (B === vMax) {
+	                H = (2 / 3) + deltaG - deltaR;
+	            }
+
+	            if (H < 0) {
+	                H += 1;
+	            }
+
+	            if (H > 1) {
+	                H -= 1;
+	            }
+	        }
+
+	        var hsla = [H * 360, S, L];
+
+	        if (rgba[3] != null) {
+	            hsla.push(rgba[3]);
+	        }
+
+	        return hsla;
+	    }
+
+	    /**
+	     * @param {string} color
+	     * @param {number} level
+	     * @return {string}
+	     * @memberOf module:zrender/util/color
+	     */
+	    function lift(color, level) {
+	        var colorArr = parse(color);
+	        if (colorArr) {
+	            for (var i = 0; i < 3; i++) {
+	                if (level < 0) {
+	                    colorArr[i] = colorArr[i] * (1 - level) | 0;
+	                }
+	                else {
+	                    colorArr[i] = ((255 - colorArr[i]) * level + colorArr[i]) | 0;
+	                }
+	            }
+	            return stringify(colorArr, colorArr.length === 4 ? 'rgba' : 'rgb');
+	        }
+	    }
+
+	    /**
+	     * @param {string} color
+	     * @return {string}
+	     * @memberOf module:zrender/util/color
+	     */
+	    function toHex(color, level) {
+	        var colorArr = parse(color);
+	        if (colorArr) {
+	            return ((1 << 24) + (colorArr[0] << 16) + (colorArr[1] << 8) + (+colorArr[2])).toString(16).slice(1);
+	        }
+	    }
+
+	    /**
+	     * Map value to color. Faster than mapToColor methods because color is represented by rgba array
+	     * @param {number} normalizedValue A float between 0 and 1.
+	     * @param {Array.<Array.<number>>} colors List of rgba color array
+	     * @param {Array.<number>} [out] Mapped gba color array
+	     * @return {Array.<number>}
+	     */
+	    function fastMapToColor(normalizedValue, colors, out) {
+	        if (!(colors && colors.length)
+	            || !(normalizedValue >= 0 && normalizedValue <= 1)
+	        ) {
+	            return;
+	        }
+	        out = out || [0, 0, 0, 0];
+	        var value = normalizedValue * (colors.length - 1);
+	        var leftIndex = Math.floor(value);
+	        var rightIndex = Math.ceil(value);
+	        var leftColor = colors[leftIndex];
+	        var rightColor = colors[rightIndex];
+	        var dv = value - leftIndex;
+	        out[0] = clampCssByte(lerp(leftColor[0], rightColor[0], dv));
+	        out[1] = clampCssByte(lerp(leftColor[1], rightColor[1], dv));
+	        out[2] = clampCssByte(lerp(leftColor[2], rightColor[2], dv));
+	        out[3] = clampCssByte(lerp(leftColor[3], rightColor[3], dv));
+	        return out;
+	    }
+	    /**
+	     * @param {number} normalizedValue A float between 0 and 1.
+	     * @param {Array.<string>} colors Color list.
+	     * @param {boolean=} fullOutput Default false.
+	     * @return {(string|Object)} Result color. If fullOutput,
+	     *                           return {color: ..., leftIndex: ..., rightIndex: ..., value: ...},
+	     * @memberOf module:zrender/util/color
+	     */
+	    function mapToColor(normalizedValue, colors, fullOutput) {
+	        if (!(colors && colors.length)
+	            || !(normalizedValue >= 0 && normalizedValue <= 1)
+	        ) {
+	            return;
+	        }
+
+	        var value = normalizedValue * (colors.length - 1);
+	        var leftIndex = Math.floor(value);
+	        var rightIndex = Math.ceil(value);
+	        var leftColor = parse(colors[leftIndex]);
+	        var rightColor = parse(colors[rightIndex]);
+	        var dv = value - leftIndex;
+
+	        var color = stringify(
+	            [
+	                clampCssByte(lerp(leftColor[0], rightColor[0], dv)),
+	                clampCssByte(lerp(leftColor[1], rightColor[1], dv)),
+	                clampCssByte(lerp(leftColor[2], rightColor[2], dv)),
+	                clampCssFloat(lerp(leftColor[3], rightColor[3], dv))
+	            ],
+	            'rgba'
+	        );
+
+	        return fullOutput
+	            ? {
+	                color: color,
+	                leftIndex: leftIndex,
+	                rightIndex: rightIndex,
+	                value: value
+	            }
+	            : color;
+	    }
+
+	    /**
+	     * @param {string} color
+	     * @param {number=} h 0 ~ 360, ignore when null.
+	     * @param {number=} s 0 ~ 1, ignore when null.
+	     * @param {number=} l 0 ~ 1, ignore when null.
+	     * @return {string} Color string in rgba format.
+	     * @memberOf module:zrender/util/color
+	     */
+	    function modifyHSL(color, h, s, l) {
+	        color = parse(color);
+
+	        if (color) {
+	            color = rgba2hsla(color);
+	            h != null && (color[0] = clampCssAngle(h));
+	            s != null && (color[1] = parseCssFloat(s));
+	            l != null && (color[2] = parseCssFloat(l));
+
+	            return stringify(hsla2rgba(color), 'rgba');
+	        }
+	    }
+
+	    /**
+	     * @param {string} color
+	     * @param {number=} alpha 0 ~ 1
+	     * @return {string} Color string in rgba format.
+	     * @memberOf module:zrender/util/color
+	     */
+	    function modifyAlpha(color, alpha) {
+	        color = parse(color);
+
+	        if (color && alpha != null) {
+	            color[3] = clampCssFloat(alpha);
+	            return stringify(color, 'rgba');
+	        }
+	    }
+
+	    /**
+	     * @param {Array.<string>} colors Color list.
+	     * @param {string} type 'rgba', 'hsva', ...
+	     * @return {string} Result color.
+	     */
+	    function stringify(arrColor, type) {
+	        var colorStr = arrColor[0] + ',' + arrColor[1] + ',' + arrColor[2];
+	        if (type === 'rgba' || type === 'hsva' || type === 'hsla') {
+	            colorStr += ',' + arrColor[3];
+	        }
+	        return type + '(' + colorStr + ')';
+	    }
+
+	    module.exports = {
+	        parse: parse,
+	        lift: lift,
+	        toHex: toHex,
+	        fastMapToColor: fastMapToColor,
+	        mapToColor: mapToColor,
+	        modifyHSL: modifyHSL,
+	        modifyAlpha: modifyAlpha,
+	        stringify: stringify
+	    };
+
+
+
+
+/***/ },
+/* 40 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+	        var config = __webpack_require__(41);
+
+	        /**
+	         * @exports zrender/tool/log
+	         * @author Kener (@Kener-林峰, kener.linfeng@gmail.com)
+	         */
+	        module.exports = function() {
+	            if (config.debugMode === 0) {
+	                return;
+	            }
+	            else if (config.debugMode == 1) {
+	                for (var k in arguments) {
+	                    throw new Error(arguments[k]);
+	                }
+	            }
+	            else if (config.debugMode > 1) {
+	                for (var k in arguments) {
+	                    console.log(arguments[k]);
+	                }
+	            }
+	        };
+
+	        /* for debug
+	        return function(mes) {
+	            document.getElementById('wrong-message').innerHTML =
+	                mes + ' ' + (new Date() - 0)
+	                + '<br/>' 
+	                + document.getElementById('wrong-message').innerHTML;
+	        };
+	        */
+	    
+
+
+/***/ },
+/* 41 */
+/***/ function(module, exports) {
+
+	
+	    var dpr = 1;
+	    // If in browser environment
+	    if (typeof window !== 'undefined') {
+	        dpr = Math.max(window.devicePixelRatio || 1, 1);
+	    }
+	    /**
+	     * config默认配置项
+	     * @exports zrender/config
+	     * @author Kener (@Kener-林峰, kener.linfeng@gmail.com)
+	     */
+	    var config = {
+	        /**
+	         * debug日志选项：catchBrushException为true下有效
+	         * 0 : 不生成debug数据，发布用
+	         * 1 : 异常抛出，调试用
+	         * 2 : 控制台输出，调试用
+	         */
+	        debugMode: 0,
+
+	        // retina 屏幕优化
+	        devicePixelRatio: dpr
+	    };
+	    module.exports = config;
+
+
+
+
+/***/ },
+/* 42 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var Group = __webpack_require__(30);
+	    var componentUtil = __webpack_require__(20);
+	    var clazzUtil = __webpack_require__(13);
+
+	    function Chart() {
+
+	        /**
+	         * @type {module:zrender/container/Group}
+	         * @readOnly
+	         */
+	        this.group = new Group();
+
+	        /**
+	         * @type {string}
+	         * @readOnly
+	         */
+	        this.uid = componentUtil.getUID('viewChart');
+	    }
+
+	    Chart.prototype = {
+
+	        type: 'chart',
+
+	        /**
+	         * Init the chart
+	         * @param  {module:echarts/model/Global} ecModel
+	         * @param  {module:echarts/ExtensionAPI} api
+	         */
+	        init: function (ecModel, api) {},
+
+	        /**
+	         * Render the chart
+	         * @param  {module:echarts/model/Series} seriesModel
+	         * @param  {module:echarts/model/Global} ecModel
+	         * @param  {module:echarts/ExtensionAPI} api
+	         * @param  {Object} payload
+	         */
+	        render: function (seriesModel, ecModel, api, payload) {},
+
+	        /**
+	         * Highlight series or specified data item
+	         * @param  {module:echarts/model/Series} seriesModel
+	         * @param  {module:echarts/model/Global} ecModel
+	         * @param  {module:echarts/ExtensionAPI} api
+	         * @param  {Object} payload
+	         */
+	        highlight: function (seriesModel, ecModel, api, payload) {
+	            toggleHighlight(seriesModel.getData(), payload, 'emphasis');
+	        },
+
+	        /**
+	         * Downplay series or specified data item
+	         * @param  {module:echarts/model/Series} seriesModel
+	         * @param  {module:echarts/model/Global} ecModel
+	         * @param  {module:echarts/ExtensionAPI} api
+	         * @param  {Object} payload
+	         */
+	        downplay: function (seriesModel, ecModel, api, payload) {
+	            toggleHighlight(seriesModel.getData(), payload, 'normal');
+	        },
+
+	        /**
+	         * Remove self
+	         * @param  {module:echarts/model/Global} ecModel
+	         * @param  {module:echarts/ExtensionAPI} api
+	         */
+	        remove: function (ecModel, api) {
+	            this.group.removeAll();
+	        },
+
+	        /**
+	         * Dispose self
+	         * @param  {module:echarts/model/Global} ecModel
+	         * @param  {module:echarts/ExtensionAPI} api
+	         */
+	        dispose: function () {}
+	    };
+
+	    var chartProto = Chart.prototype;
+	    chartProto.updateView
+	        = chartProto.updateLayout
+	        = chartProto.updateVisual
+	        = function (seriesModel, ecModel, api, payload) {
+	            this.render(seriesModel, ecModel, api, payload);
+	        };
+
+	    /**
+	     * Set state of single element
+	     * @param  {module:zrender/Element} el
+	     * @param  {string} state
+	     */
+	    function elSetState(el, state) {
+	        if (el) {
+	            el.trigger(state);
+	            if (el.type === 'group') {
+	                for (var i = 0; i < el.childCount(); i++) {
+	                    elSetState(el.childAt(i), state);
+	                }
+	            }
+	        }
+	    }
+	    /**
+	     * @param  {module:echarts/data/List} data
+	     * @param  {Object} payload
+	     * @param  {string} state 'normal'|'emphasis'
+	     * @inner
+	     */
+	    function toggleHighlight(data, payload, state) {
+	        var dataIndex = payload && payload.dataIndex;
+	        var name = payload && payload.name;
+
+	        if (dataIndex != null) {
+	            var dataIndices = dataIndex instanceof Array ? dataIndex : [dataIndex];
+	            for (var i = 0, len = dataIndices.length; i < len; i++) {
+	                elSetState(data.getItemGraphicEl(dataIndices[i]), state);
+	            }
+	        }
+	        else if (name) {
+	            var names = name instanceof Array ? name : [name];
+	            for (var i = 0, len = names.length; i < len; i++) {
+	                var dataIndex = data.indexOfName(names[i]);
+	                elSetState(data.getItemGraphicEl(dataIndex), state);
+	            }
+	        }
+	        else {
+	            data.eachItemGraphicEl(function (el) {
+	                elSetState(el, state);
+	            });
+	        }
+	    }
+
+	    // Enable Chart.extend.
+	    clazzUtil.enableClassExtend(Chart);
+
+	    // Add capability of registerClass, getClass, hasClass, registerSubTypeDefaulter and so on.
+	    clazzUtil.enableClassManagement(Chart, {registerWhenExtend: true});
+
+	    module.exports = Chart;
+
+
+/***/ },
+/* 43 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var zrUtil = __webpack_require__(4);
+
+	    var pathTool = __webpack_require__(44);
+	    var round = Math.round;
+	    var Path = __webpack_require__(45);
+	    var colorTool = __webpack_require__(39);
+	    var matrix = __webpack_require__(11);
+	    var vector = __webpack_require__(10);
+	    var Gradient = __webpack_require__(61);
+
+	    var graphic = {};
+
+	    graphic.Group = __webpack_require__(30);
+
+	    graphic.Image = __webpack_require__(62);
+
+	    graphic.Text = __webpack_require__(64);
+
+	    graphic.Circle = __webpack_require__(65);
+
+	    graphic.Sector = __webpack_require__(66);
+
+	    graphic.Ring = __webpack_require__(67);
+
+	    graphic.Polygon = __webpack_require__(68);
+
+	    graphic.Polyline = __webpack_require__(72);
+
+	    graphic.Rect = __webpack_require__(73);
+
+	    graphic.Line = __webpack_require__(75);
+
+	    graphic.BezierCurve = __webpack_require__(76);
+
+	    graphic.Arc = __webpack_require__(77);
+
+	    graphic.CompoundPath = __webpack_require__(78);
+
+	    graphic.LinearGradient = __webpack_require__(79);
+
+	    graphic.RadialGradient = __webpack_require__(80);
+
+	    graphic.BoundingRect = __webpack_require__(9);
+
+	    /**
+	     * Extend shape with parameters
+	     */
+	    graphic.extendShape = function (opts) {
+	        return Path.extend(opts);
+	    };
+
+	    /**
+	     * Extend path
+	     */
+	    graphic.extendPath = function (pathData, opts) {
+	        return pathTool.extendFromString(pathData, opts);
+	    };
+
+	    /**
+	     * Create a path element from path data string
+	     * @param {string} pathData
+	     * @param {Object} opts
+	     * @param {module:zrender/core/BoundingRect} rect
+	     * @param {string} [layout=cover] 'center' or 'cover'
+	     */
+	    graphic.makePath = function (pathData, opts, rect, layout) {
+	        var path = pathTool.createFromString(pathData, opts);
+	        var boundingRect = path.getBoundingRect();
+	        if (rect) {
+	            var aspect = boundingRect.width / boundingRect.height;
+
+	            if (layout === 'center') {
+	                // Set rect to center, keep width / height ratio.
+	                var width = rect.height * aspect;
+	                var height;
+	                if (width <= rect.width) {
+	                    height = rect.height;
+	                }
+	                else {
+	                    width = rect.width;
+	                    height = width / aspect;
+	                }
+	                var cx = rect.x + rect.width / 2;
+	                var cy = rect.y + rect.height / 2;
+
+	                rect.x = cx - width / 2;
+	                rect.y = cy - height / 2;
+	                rect.width = width;
+	                rect.height = height;
+	            }
+
+	            this.resizePath(path, rect);
+	        }
+	        return path;
+	    };
+
+	    graphic.mergePath = pathTool.mergePath,
+
+	    /**
+	     * Resize a path to fit the rect
+	     * @param {module:zrender/graphic/Path} path
+	     * @param {Object} rect
+	     */
+	    graphic.resizePath = function (path, rect) {
+	        if (!path.applyTransform) {
+	            return;
+	        }
+
+	        var pathRect = path.getBoundingRect();
+
+	        var m = pathRect.calculateTransform(rect);
+
+	        path.applyTransform(m);
+	    };
+
+	    /**
+	     * Sub pixel optimize line for canvas
+	     *
+	     * @param {Object} param
+	     * @param {Object} [param.shape]
+	     * @param {number} [param.shape.x1]
+	     * @param {number} [param.shape.y1]
+	     * @param {number} [param.shape.x2]
+	     * @param {number} [param.shape.y2]
+	     * @param {Object} [param.style]
+	     * @param {number} [param.style.lineWidth]
+	     * @return {Object} Modified param
+	     */
+	    graphic.subPixelOptimizeLine = function (param) {
+	        var subPixelOptimize = graphic.subPixelOptimize;
+	        var shape = param.shape;
+	        var lineWidth = param.style.lineWidth;
+
+	        if (round(shape.x1 * 2) === round(shape.x2 * 2)) {
+	            shape.x1 = shape.x2 = subPixelOptimize(shape.x1, lineWidth, true);
+	        }
+	        if (round(shape.y1 * 2) === round(shape.y2 * 2)) {
+	            shape.y1 = shape.y2 = subPixelOptimize(shape.y1, lineWidth, true);
+	        }
+	        return param;
+	    };
+
+	    /**
+	     * Sub pixel optimize rect for canvas
+	     *
+	     * @param {Object} param
+	     * @param {Object} [param.shape]
+	     * @param {number} [param.shape.x]
+	     * @param {number} [param.shape.y]
+	     * @param {number} [param.shape.width]
+	     * @param {number} [param.shape.height]
+	     * @param {Object} [param.style]
+	     * @param {number} [param.style.lineWidth]
+	     * @return {Object} Modified param
+	     */
+	    graphic.subPixelOptimizeRect = function (param) {
+	        var subPixelOptimize = graphic.subPixelOptimize;
+	        var shape = param.shape;
+	        var lineWidth = param.style.lineWidth;
+	        var originX = shape.x;
+	        var originY = shape.y;
+	        var originWidth = shape.width;
+	        var originHeight = shape.height;
+	        shape.x = subPixelOptimize(shape.x, lineWidth, true);
+	        shape.y = subPixelOptimize(shape.y, lineWidth, true);
+	        shape.width = Math.max(
+	            subPixelOptimize(originX + originWidth, lineWidth, false) - shape.x,
+	            originWidth === 0 ? 0 : 1
+	        );
+	        shape.height = Math.max(
+	            subPixelOptimize(originY + originHeight, lineWidth, false) - shape.y,
+	            originHeight === 0 ? 0 : 1
+	        );
+	        return param;
+	    };
+
+	    /**
+	     * Sub pixel optimize for canvas
+	     *
+	     * @param {number} position Coordinate, such as x, y
+	     * @param {number} lineWidth Should be nonnegative integer.
+	     * @param {boolean=} positiveOrNegative Default false (negative).
+	     * @return {number} Optimized position.
+	     */
+	    graphic.subPixelOptimize = function (position, lineWidth, positiveOrNegative) {
+	        // Assure that (position + lineWidth / 2) is near integer edge,
+	        // otherwise line will be fuzzy in canvas.
+	        var doubledPosition = round(position * 2);
+	        return (doubledPosition + round(lineWidth)) % 2 === 0
+	            ? doubledPosition / 2
+	            : (doubledPosition + (positiveOrNegative ? 1 : -1)) / 2;
+	    };
+
+	    function hasFillOrStroke(fillOrStroke) {
+	        return fillOrStroke != null && fillOrStroke != 'none';
+	    }
+
+	    function liftColor(color) {
+	        return typeof color === 'string' ? colorTool.lift(color, -0.1) : color;
+	    }
+
+	    /**
+	     * @private
+	     */
+	    function cacheElementStl(el) {
+	        if (el.__hoverStlDirty) {
+	            var stroke = el.style.stroke;
+	            var fill = el.style.fill;
+
+	            // Create hoverStyle on mouseover
+	            var hoverStyle = el.__hoverStl;
+	            hoverStyle.fill = hoverStyle.fill
+	                || (hasFillOrStroke(fill) ? liftColor(fill) : null);
+	            hoverStyle.stroke = hoverStyle.stroke
+	                || (hasFillOrStroke(stroke) ? liftColor(stroke) : null);
+
+	            var normalStyle = {};
+	            for (var name in hoverStyle) {
+	                if (hoverStyle.hasOwnProperty(name)) {
+	                    normalStyle[name] = el.style[name];
+	                }
+	            }
+
+	            el.__normalStl = normalStyle;
+
+	            el.__hoverStlDirty = false;
+	        }
+	    }
+
+	    /**
+	     * @private
+	     */
+	    function doSingleEnterHover(el) {
+	        if (el.__isHover) {
+	            return;
+	        }
+
+	        cacheElementStl(el);
+
+	        if (el.useHoverLayer) {
+	            el.__zr && el.__zr.addHover(el, el.__hoverStl);
+	        }
+	        else {
+	            el.setStyle(el.__hoverStl);
+	            el.z2 += 1;
+	        }
+
+	        el.__isHover = true;
+	    }
+
+	    /**
+	     * @inner
+	     */
+	    function doSingleLeaveHover(el) {
+	        if (!el.__isHover) {
+	            return;
+	        }
+
+	        var normalStl = el.__normalStl;
+	        if (el.useHoverLayer) {
+	            el.__zr && el.__zr.removeHover(el);
+	        }
+	        else {
+	            normalStl && el.setStyle(normalStl);
+	            el.z2 -= 1;
+	        }
+
+	        el.__isHover = false;
+	    }
+
+	    /**
+	     * @inner
+	     */
+	    function doEnterHover(el) {
+	        el.type === 'group'
+	            ? el.traverse(function (child) {
+	                if (child.type !== 'group') {
+	                    doSingleEnterHover(child);
+	                }
+	            })
+	            : doSingleEnterHover(el);
+	    }
+
+	    function doLeaveHover(el) {
+	        el.type === 'group'
+	            ? el.traverse(function (child) {
+	                if (child.type !== 'group') {
+	                    doSingleLeaveHover(child);
+	                }
+	            })
+	            : doSingleLeaveHover(el);
+	    }
+
+	    /**
+	     * @inner
+	     */
+	    function setElementHoverStl(el, hoverStl) {
+	        // If element has sepcified hoverStyle, then use it instead of given hoverStyle
+	        // Often used when item group has a label element and it's hoverStyle is different
+	        el.__hoverStl = el.hoverStyle || hoverStl || {};
+	        el.__hoverStlDirty = true;
+
+	        if (el.__isHover) {
+	            cacheElementStl(el);
+	        }
+	    }
+
+	    /**
+	     * @inner
+	     */
+	    function onElementMouseOver() {
+	        // Only if element is not in emphasis status
+	        !this.__isEmphasis && doEnterHover(this);
+	    }
+
+	    /**
+	     * @inner
+	     */
+	    function onElementMouseOut() {
+	        // Only if element is not in emphasis status
+	        !this.__isEmphasis && doLeaveHover(this);
+	    }
+
+	    /**
+	     * @inner
+	     */
+	    function enterEmphasis() {
+	        this.__isEmphasis = true;
+	        doEnterHover(this);
+	    }
+
+	    /**
+	     * @inner
+	     */
+	    function leaveEmphasis() {
+	        this.__isEmphasis = false;
+	        doLeaveHover(this);
+	    }
+
+	    /**
+	     * Set hover style of element
+	     * @param {module:zrender/Element} el
+	     * @param {Object} [hoverStyle]
+	     */
+	    graphic.setHoverStyle = function (el, hoverStyle) {
+	        el.type === 'group'
+	            ? el.traverse(function (child) {
+	                if (child.type !== 'group') {
+	                    setElementHoverStl(child, hoverStyle);
+	                }
+	            })
+	            : setElementHoverStl(el, hoverStyle);
+	        // Remove previous bound handlers
+	        el.on('mouseover', onElementMouseOver)
+	          .on('mouseout', onElementMouseOut);
+
+	        // Emphasis, normal can be triggered manually
+	        el.on('emphasis', enterEmphasis)
+	          .on('normal', leaveEmphasis);
+	    };
+
+	    /**
+	     * Set text option in the style
+	     * @param {Object} textStyle
+	     * @param {module:echarts/model/Model} labelModel
+	     * @param {string} color
+	     */
+	    graphic.setText = function (textStyle, labelModel, color) {
+	        var labelPosition = labelModel.getShallow('position') || 'inside';
+	        var labelColor = labelPosition.indexOf('inside') >= 0 ? 'white' : color;
+	        var textStyleModel = labelModel.getModel('textStyle');
+	        zrUtil.extend(textStyle, {
+	            textDistance: labelModel.getShallow('distance') || 5,
+	            textFont: textStyleModel.getFont(),
+	            textPosition: labelPosition,
+	            textFill: textStyleModel.getTextColor() || labelColor
+	        });
+	    };
+
+	    function animateOrSetProps(isUpdate, el, props, animatableModel, dataIndex, cb) {
+	        if (typeof dataIndex === 'function') {
+	            cb = dataIndex;
+	            dataIndex = null;
+	        }
+	        var animationEnabled = animatableModel
+	            && (
+	                animatableModel.ifEnableAnimation
+	                ? animatableModel.ifEnableAnimation()
+	                // Directly use animation property
+	                : animatableModel.getShallow('animation')
+	            );
+
+	        if (animationEnabled) {
+	            var postfix = isUpdate ? 'Update' : '';
+	            var duration = animatableModel
+	                && animatableModel.getShallow('animationDuration' + postfix);
+	            var animationEasing = animatableModel
+	                && animatableModel.getShallow('animationEasing' + postfix);
+	            var animationDelay = animatableModel
+	                && animatableModel.getShallow('animationDelay' + postfix);
+	            if (typeof animationDelay === 'function') {
+	                animationDelay = animationDelay(dataIndex);
+	            }
+	            duration > 0
+	                ? el.animateTo(props, duration, animationDelay || 0, animationEasing, cb)
+	                : (el.attr(props), cb && cb());
+	        }
+	        else {
+	            el.attr(props);
+	            cb && cb();
+	        }
+	    }
+	    /**
+	     * Update graphic element properties with or without animation according to the configuration in series
+	     * @param {module:zrender/Element} el
+	     * @param {Object} props
+	     * @param {module:echarts/model/Model} [animatableModel]
+	     * @param {number} [dataIndex]
+	     * @param {Function} [cb]
+	     * @example
+	     *     graphic.updateProps(el, {
+	     *         position: [100, 100]
+	     *     }, seriesModel, dataIndex, function () { console.log('Animation done!'); });
+	     *     // Or
+	     *     graphic.updateProps(el, {
+	     *         position: [100, 100]
+	     *     }, seriesModel, function () { console.log('Animation done!'); });
+	     */
+	    graphic.updateProps = function (el, props, animatableModel, dataIndex, cb) {
+	        animateOrSetProps(true, el, props, animatableModel, dataIndex, cb);
+	    };
+
+	    /**
+	     * Init graphic element properties with or without animation according to the configuration in series
+	     * @param {module:zrender/Element} el
+	     * @param {Object} props
+	     * @param {module:echarts/model/Model} [animatableModel]
+	     * @param {number} [dataIndex]
+	     * @param {Function} cb
+	     */
+	    graphic.initProps = function (el, props, animatableModel, dataIndex, cb) {
+	        animateOrSetProps(false, el, props, animatableModel, dataIndex, cb);
+	    };
+
+	    /**
+	     * Get transform matrix of target (param target),
+	     * in coordinate of its ancestor (param ancestor)
+	     *
+	     * @param {module:zrender/mixin/Transformable} target
+	     * @param {module:zrender/mixin/Transformable} [ancestor]
+	     */
+	    graphic.getTransform = function (target, ancestor) {
+	        var mat = matrix.identity([]);
+
+	        while (target && target !== ancestor) {
+	            matrix.mul(mat, target.getLocalTransform(), mat);
+	            target = target.parent;
+	        }
+
+	        return mat;
+	    };
+
+	    /**
+	     * Apply transform to an vertex.
+	     * @param {Array.<number>} vertex [x, y]
+	     * @param {Array.<number>} transform Transform matrix: like [1, 0, 0, 1, 0, 0]
+	     * @param {boolean=} invert Whether use invert matrix.
+	     * @return {Array.<number>} [x, y]
+	     */
+	    graphic.applyTransform = function (vertex, transform, invert) {
+	        if (invert) {
+	            transform = matrix.invert([], transform);
+	        }
+	        return vector.applyTransform([], vertex, transform);
+	    };
+
+	    /**
+	     * @param {string} direction 'left' 'right' 'top' 'bottom'
+	     * @param {Array.<number>} transform Transform matrix: like [1, 0, 0, 1, 0, 0]
+	     * @param {boolean=} invert Whether use invert matrix.
+	     * @return {string} Transformed direction. 'left' 'right' 'top' 'bottom'
+	     */
+	    graphic.transformDirection = function (direction, transform, invert) {
+
+	        // Pick a base, ensure that transform result will not be (0, 0).
+	        var hBase = (transform[4] === 0 || transform[5] === 0 || transform[0] === 0)
+	            ? 1 : Math.abs(2 * transform[4] / transform[0]);
+	        var vBase = (transform[4] === 0 || transform[5] === 0 || transform[2] === 0)
+	            ? 1 : Math.abs(2 * transform[4] / transform[2]);
+
+	        var vertex = [
+	            direction === 'left' ? -hBase : direction === 'right' ? hBase : 0,
+	            direction === 'top' ? -vBase : direction === 'bottom' ? vBase : 0
+	        ];
+
+	        vertex = graphic.applyTransform(vertex, transform, invert);
+
+	        return Math.abs(vertex[0]) > Math.abs(vertex[1])
+	            ? (vertex[0] > 0 ? 'right' : 'left')
+	            : (vertex[1] > 0 ? 'bottom' : 'top');
+	    };
+
+	    /**
+	     * Apply group transition animation from g1 to g2
+	     */
+	    graphic.groupTransition = function (g1, g2, animatableModel, cb) {
+	        if (!g1 || !g2) {
+	            return;
+	        }
+
+	        function getElMap(g) {
+	            var elMap = {};
+	            g.traverse(function (el) {
+	                if (!el.isGroup && el.anid) {
+	                    elMap[el.anid] = el;
+	                }
+	            });
+	            return elMap;
+	        }
+	        function getAnimatableProps(el) {
+	            var obj = {
+	                position: vector.clone(el.position),
+	                rotation: el.rotation
+	            };
+	            if (el.shape) {
+	                obj.shape = zrUtil.extend({}, el.shape);
+	            }
+	            return obj;
+	        }
+	        var elMap1 = getElMap(g1);
+
+	        g2.traverse(function (el) {
+	            if (!el.isGroup && el.anid) {
+	                var oldEl = elMap1[el.anid];
+	                if (oldEl) {
+	                    var newProp = getAnimatableProps(el);
+	                    el.attr(getAnimatableProps(oldEl));
+	                    graphic.updateProps(el, newProp, animatableModel, el.dataIndex);
+	                }
+	                // else {
+	                //     if (el.previousProps) {
+	                //         graphic.updateProps
+	                //     }
+	                // }
+	            }
+	        });
+	    };
+
+	    module.exports = graphic;
+
+
+/***/ },
+/* 44 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var Path = __webpack_require__(45);
+	    var PathProxy = __webpack_require__(49);
+	    var transformPath = __webpack_require__(60);
+	    var matrix = __webpack_require__(11);
+
+	    // command chars
+	    var cc = [
+	        'm', 'M', 'l', 'L', 'v', 'V', 'h', 'H', 'z', 'Z',
+	        'c', 'C', 'q', 'Q', 't', 'T', 's', 'S', 'a', 'A'
+	    ];
+
+	    var mathSqrt = Math.sqrt;
+	    var mathSin = Math.sin;
+	    var mathCos = Math.cos;
+	    var PI = Math.PI;
+
+	    var vMag = function(v) {
+	        return Math.sqrt(v[0] * v[0] + v[1] * v[1]);
+	    };
+	    var vRatio = function(u, v) {
+	        return (u[0] * v[0] + u[1] * v[1]) / (vMag(u) * vMag(v));
+	    };
+	    var vAngle = function(u, v) {
+	        return (u[0] * v[1] < u[1] * v[0] ? -1 : 1)
+	                * Math.acos(vRatio(u, v));
+	    };
+
+	    function processArc(x1, y1, x2, y2, fa, fs, rx, ry, psiDeg, cmd, path) {
+	        var psi = psiDeg * (PI / 180.0);
+	        var xp = mathCos(psi) * (x1 - x2) / 2.0
+	                 + mathSin(psi) * (y1 - y2) / 2.0;
+	        var yp = -1 * mathSin(psi) * (x1 - x2) / 2.0
+	                 + mathCos(psi) * (y1 - y2) / 2.0;
+
+	        var lambda = (xp * xp) / (rx * rx) + (yp * yp) / (ry * ry);
+
+	        if (lambda > 1) {
+	            rx *= mathSqrt(lambda);
+	            ry *= mathSqrt(lambda);
+	        }
+
+	        var f = (fa === fs ? -1 : 1)
+	            * mathSqrt((((rx * rx) * (ry * ry))
+	                    - ((rx * rx) * (yp * yp))
+	                    - ((ry * ry) * (xp * xp))) / ((rx * rx) * (yp * yp)
+	                    + (ry * ry) * (xp * xp))
+	                ) || 0;
+
+	        var cxp = f * rx * yp / ry;
+	        var cyp = f * -ry * xp / rx;
+
+	        var cx = (x1 + x2) / 2.0
+	                 + mathCos(psi) * cxp
+	                 - mathSin(psi) * cyp;
+	        var cy = (y1 + y2) / 2.0
+	                + mathSin(psi) * cxp
+	                + mathCos(psi) * cyp;
+
+	        var theta = vAngle([ 1, 0 ], [ (xp - cxp) / rx, (yp - cyp) / ry ]);
+	        var u = [ (xp - cxp) / rx, (yp - cyp) / ry ];
+	        var v = [ (-1 * xp - cxp) / rx, (-1 * yp - cyp) / ry ];
+	        var dTheta = vAngle(u, v);
+
+	        if (vRatio(u, v) <= -1) {
+	            dTheta = PI;
+	        }
+	        if (vRatio(u, v) >= 1) {
+	            dTheta = 0;
+	        }
+	        if (fs === 0 && dTheta > 0) {
+	            dTheta = dTheta - 2 * PI;
+	        }
+	        if (fs === 1 && dTheta < 0) {
+	            dTheta = dTheta + 2 * PI;
+	        }
+
+	        path.addData(cmd, cx, cy, rx, ry, theta, dTheta, psi, fs);
+	    }
+
+	    function createPathProxyFromString(data) {
+	        if (!data) {
+	            return [];
+	        }
+
+	        // command string
+	        var cs = data.replace(/-/g, ' -')
+	            .replace(/  /g, ' ')
+	            .replace(/ /g, ',')
+	            .replace(/,,/g, ',');
+
+	        var n;
+	        // create pipes so that we can split the data
+	        for (n = 0; n < cc.length; n++) {
+	            cs = cs.replace(new RegExp(cc[n], 'g'), '|' + cc[n]);
+	        }
+
+	        // create array
+	        var arr = cs.split('|');
+	        // init context point
+	        var cpx = 0;
+	        var cpy = 0;
+
+	        var path = new PathProxy();
+	        var CMD = PathProxy.CMD;
+
+	        var prevCmd;
+	        for (n = 1; n < arr.length; n++) {
+	            var str = arr[n];
+	            var c = str.charAt(0);
+	            var off = 0;
+	            var p = str.slice(1).replace(/e,-/g, 'e-').split(',');
+	            var cmd;
+
+	            if (p.length > 0 && p[0] === '') {
+	                p.shift();
+	            }
+
+	            for (var i = 0; i < p.length; i++) {
+	                p[i] = parseFloat(p[i]);
+	            }
+	            while (off < p.length && !isNaN(p[off])) {
+	                if (isNaN(p[0])) {
+	                    break;
+	                }
+	                var ctlPtx;
+	                var ctlPty;
+
+	                var rx;
+	                var ry;
+	                var psi;
+	                var fa;
+	                var fs;
+
+	                var x1 = cpx;
+	                var y1 = cpy;
+
+	                // convert l, H, h, V, and v to L
+	                switch (c) {
+	                    case 'l':
+	                        cpx += p[off++];
+	                        cpy += p[off++];
+	                        cmd = CMD.L;
+	                        path.addData(cmd, cpx, cpy);
+	                        break;
+	                    case 'L':
+	                        cpx = p[off++];
+	                        cpy = p[off++];
+	                        cmd = CMD.L;
+	                        path.addData(cmd, cpx, cpy);
+	                        break;
+	                    case 'm':
+	                        cpx += p[off++];
+	                        cpy += p[off++];
+	                        cmd = CMD.M;
+	                        path.addData(cmd, cpx, cpy);
+	                        c = 'l';
+	                        break;
+	                    case 'M':
+	                        cpx = p[off++];
+	                        cpy = p[off++];
+	                        cmd = CMD.M;
+	                        path.addData(cmd, cpx, cpy);
+	                        c = 'L';
+	                        break;
+	                    case 'h':
+	                        cpx += p[off++];
+	                        cmd = CMD.L;
+	                        path.addData(cmd, cpx, cpy);
+	                        break;
+	                    case 'H':
+	                        cpx = p[off++];
+	                        cmd = CMD.L;
+	                        path.addData(cmd, cpx, cpy);
+	                        break;
+	                    case 'v':
+	                        cpy += p[off++];
+	                        cmd = CMD.L;
+	                        path.addData(cmd, cpx, cpy);
+	                        break;
+	                    case 'V':
+	                        cpy = p[off++];
+	                        cmd = CMD.L;
+	                        path.addData(cmd, cpx, cpy);
+	                        break;
+	                    case 'C':
+	                        cmd = CMD.C;
+	                        path.addData(
+	                            cmd, p[off++], p[off++], p[off++], p[off++], p[off++], p[off++]
+	                        );
+	                        cpx = p[off - 2];
+	                        cpy = p[off - 1];
+	                        break;
+	                    case 'c':
+	                        cmd = CMD.C;
+	                        path.addData(
+	                            cmd,
+	                            p[off++] + cpx, p[off++] + cpy,
+	                            p[off++] + cpx, p[off++] + cpy,
+	                            p[off++] + cpx, p[off++] + cpy
+	                        );
+	                        cpx += p[off - 2];
+	                        cpy += p[off - 1];
+	                        break;
+	                    case 'S':
+	                        ctlPtx = cpx;
+	                        ctlPty = cpy;
+	                        var len = path.len();
+	                        var pathData = path.data;
+	                        if (prevCmd === CMD.C) {
+	                            ctlPtx += cpx - pathData[len - 4];
+	                            ctlPty += cpy - pathData[len - 3];
+	                        }
+	                        cmd = CMD.C;
+	                        x1 = p[off++];
+	                        y1 = p[off++];
+	                        cpx = p[off++];
+	                        cpy = p[off++];
+	                        path.addData(cmd, ctlPtx, ctlPty, x1, y1, cpx, cpy);
+	                        break;
+	                    case 's':
+	                        ctlPtx = cpx;
+	                        ctlPty = cpy;
+	                        var len = path.len();
+	                        var pathData = path.data;
+	                        if (prevCmd === CMD.C) {
+	                            ctlPtx += cpx - pathData[len - 4];
+	                            ctlPty += cpy - pathData[len - 3];
+	                        }
+	                        cmd = CMD.C;
+	                        x1 = cpx + p[off++];
+	                        y1 = cpy + p[off++];
+	                        cpx += p[off++];
+	                        cpy += p[off++];
+	                        path.addData(cmd, ctlPtx, ctlPty, x1, y1, cpx, cpy);
+	                        break;
+	                    case 'Q':
+	                        x1 = p[off++];
+	                        y1 = p[off++];
+	                        cpx = p[off++];
+	                        cpy = p[off++];
+	                        cmd = CMD.Q;
+	                        path.addData(cmd, x1, y1, cpx, cpy);
+	                        break;
+	                    case 'q':
+	                        x1 = p[off++] + cpx;
+	                        y1 = p[off++] + cpy;
+	                        cpx += p[off++];
+	                        cpy += p[off++];
+	                        cmd = CMD.Q;
+	                        path.addData(cmd, x1, y1, cpx, cpy);
+	                        break;
+	                    case 'T':
+	                        ctlPtx = cpx;
+	                        ctlPty = cpy;
+	                        var len = path.len();
+	                        var pathData = path.data;
+	                        if (prevCmd === CMD.Q) {
+	                            ctlPtx += cpx - pathData[len - 4];
+	                            ctlPty += cpy - pathData[len - 3];
+	                        }
+	                        cpx = p[off++];
+	                        cpy = p[off++];
+	                        cmd = CMD.Q;
+	                        path.addData(cmd, ctlPtx, ctlPty, cpx, cpy);
+	                        break;
+	                    case 't':
+	                        ctlPtx = cpx;
+	                        ctlPty = cpy;
+	                        var len = path.len();
+	                        var pathData = path.data;
+	                        if (prevCmd === CMD.Q) {
+	                            ctlPtx += cpx - pathData[len - 4];
+	                            ctlPty += cpy - pathData[len - 3];
+	                        }
+	                        cpx += p[off++];
+	                        cpy += p[off++];
+	                        cmd = CMD.Q;
+	                        path.addData(cmd, ctlPtx, ctlPty, cpx, cpy);
+	                        break;
+	                    case 'A':
+	                        rx = p[off++];
+	                        ry = p[off++];
+	                        psi = p[off++];
+	                        fa = p[off++];
+	                        fs = p[off++];
+
+	                        x1 = cpx, y1 = cpy;
+	                        cpx = p[off++];
+	                        cpy = p[off++];
+	                        cmd = CMD.A;
+	                        processArc(
+	                            x1, y1, cpx, cpy, fa, fs, rx, ry, psi, cmd, path
+	                        );
+	                        break;
+	                    case 'a':
+	                        rx = p[off++];
+	                        ry = p[off++];
+	                        psi = p[off++];
+	                        fa = p[off++];
+	                        fs = p[off++];
+
+	                        x1 = cpx, y1 = cpy;
+	                        cpx += p[off++];
+	                        cpy += p[off++];
+	                        cmd = CMD.A;
+	                        processArc(
+	                            x1, y1, cpx, cpy, fa, fs, rx, ry, psi, cmd, path
+	                        );
+	                        break;
+	                }
+	            }
+
+	            if (c === 'z' || c === 'Z') {
+	                cmd = CMD.Z;
+	                path.addData(cmd);
+	            }
+
+	            prevCmd = cmd;
+	        }
+
+	        path.toStatic();
+
+	        return path;
+	    }
+
+	    // TODO Optimize double memory cost problem
+	    function createPathOptions(str, opts) {
+	        var pathProxy = createPathProxyFromString(str);
+	        var transform;
+	        opts = opts || {};
+	        opts.buildPath = function (path) {
+	            path.setData(pathProxy.data);
+	            transform && transformPath(path, transform);
+	            // Svg and vml renderer don't have context
+	            var ctx = path.getContext();
+	            if (ctx) {
+	                path.rebuildPath(ctx);
+	            }
+	        };
+
+	        opts.applyTransform = function (m) {
+	            if (!transform) {
+	                transform = matrix.create();
+	            }
+	            matrix.mul(transform, m, transform);
+	        };
+
+	        return opts;
+	    }
+
+	    module.exports = {
+	        /**
+	         * Create a Path object from path string data
+	         * http://www.w3.org/TR/SVG/paths.html#PathData
+	         * @param  {Object} opts Other options
+	         */
+	        createFromString: function (str, opts) {
+	            return new Path(createPathOptions(str, opts));
+	        },
+
+	        /**
+	         * Create a Path class from path string data
+	         * @param  {string} str
+	         * @param  {Object} opts Other options
+	         */
+	        extendFromString: function (str, opts) {
+	            return Path.extend(createPathOptions(str, opts));
+	        },
+
+	        /**
+	         * Merge multiple paths
+	         */
+	        // TODO Apply transform
+	        // TODO stroke dash
+	        // TODO Optimize double memory cost problem
+	        mergePath: function (pathEls, opts) {
+	            var pathList = [];
+	            var len = pathEls.length;
+	            for (var i = 0; i < len; i++) {
+	                var pathEl = pathEls[i];
+	                if (pathEl.__dirty) {
+	                    pathEl.buildPath(pathEl.path, pathEl.shape, true);
+	                }
+	                pathList.push(pathEl.path);
+	            }
+
+	            var pathBundle = new Path(opts);
+	            pathBundle.buildPath = function (path) {
+	                path.appendPath(pathList);
+	                // Svg and vml renderer don't have context
+	                var ctx = path.getContext();
+	                if (ctx) {
+	                    path.rebuildPath(ctx);
+	                }
+	            };
+
+	            return pathBundle;
+	        }
+	    };
+
+
+/***/ },
+/* 45 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * Path element
+	 * @module zrender/graphic/Path
+	 */
+
+
+
+	    var Displayable = __webpack_require__(46);
+	    var zrUtil = __webpack_require__(4);
+	    var PathProxy = __webpack_require__(49);
+	    var pathContain = __webpack_require__(52);
+
+	    var Pattern = __webpack_require__(59);
+	    var getCanvasPattern = Pattern.prototype.getCanvasPattern;
+
+	    var abs = Math.abs;
+
+	    /**
+	     * @alias module:zrender/graphic/Path
+	     * @extends module:zrender/graphic/Displayable
+	     * @constructor
+	     * @param {Object} opts
+	     */
+	    function Path(opts) {
+	        Displayable.call(this, opts);
+
+	        /**
+	         * @type {module:zrender/core/PathProxy}
+	         * @readOnly
+	         */
+	        this.path = new PathProxy();
+	    }
+
+	    Path.prototype = {
+
+	        constructor: Path,
+
+	        type: 'path',
+
+	        __dirtyPath: true,
+
+	        strokeContainThreshold: 5,
+
+	        brush: function (ctx, prevEl) {
+	            var style = this.style;
+	            var path = this.path;
+	            var hasStroke = style.hasStroke();
+	            var hasFill = style.hasFill();
+	            var fill = style.fill;
+	            var stroke = style.stroke;
+	            var hasFillGradient = hasFill && !!(fill.colorStops);
+	            var hasStrokeGradient = hasStroke && !!(stroke.colorStops);
+	            var hasFillPattern = hasFill && !!(fill.image);
+	            var hasStrokePattern = hasStroke && !!(stroke.image);
+
+	            style.bind(ctx, this, prevEl);
+	            this.setTransform(ctx);
+
+	            if (this.__dirty) {
+	                var rect = this.getBoundingRect();
+	                // Update gradient because bounding rect may changed
+	                if (hasFillGradient) {
+	                    this._fillGradient = style.getGradient(ctx, fill, rect);
+	                }
+	                if (hasStrokeGradient) {
+	                    this._strokeGradient = style.getGradient(ctx, stroke, rect);
+	                }
+	            }
+	            // Use the gradient or pattern
+	            if (hasFillGradient) {
+	                // PENDING If may have affect the state
+	                ctx.fillStyle = this._fillGradient;
+	            }
+	            else if (hasFillPattern) {
+	                ctx.fillStyle = getCanvasPattern.call(fill, ctx);
+	            }
+	            if (hasStrokeGradient) {
+	                ctx.strokeStyle = this._strokeGradient;
+	            }
+	            else if (hasStrokePattern) {
+	                ctx.strokeStyle = getCanvasPattern.call(stroke, ctx);
+	            }
+
+	            var lineDash = style.lineDash;
+	            var lineDashOffset = style.lineDashOffset;
+
+	            var ctxLineDash = !!ctx.setLineDash;
+
+	            // Update path sx, sy
+	            var scale = this.getGlobalScale();
+	            path.setScale(scale[0], scale[1]);
+
+	            // Proxy context
+	            // Rebuild path in following 2 cases
+	            // 1. Path is dirty
+	            // 2. Path needs javascript implemented lineDash stroking.
+	            //    In this case, lineDash information will not be saved in PathProxy
+	            if (this.__dirtyPath || (
+	                lineDash && !ctxLineDash && hasStroke
+	            )) {
+	                path = this.path.beginPath(ctx);
+
+	                // Setting line dash before build path
+	                if (lineDash && !ctxLineDash) {
+	                    path.setLineDash(lineDash);
+	                    path.setLineDashOffset(lineDashOffset);
+	                }
+
+	                this.buildPath(path, this.shape, false);
+
+	                // Clear path dirty flag
+	                this.__dirtyPath = false;
+	            }
+	            else {
+	                // Replay path building
+	                ctx.beginPath();
+	                this.path.rebuildPath(ctx);
+	            }
+
+	            hasFill && path.fill(ctx);
+
+	            if (lineDash && ctxLineDash) {
+	                ctx.setLineDash(lineDash);
+	                ctx.lineDashOffset = lineDashOffset;
+	            }
+
+	            hasStroke && path.stroke(ctx);
+
+	            if (lineDash && ctxLineDash) {
+	                // PENDING
+	                // Remove lineDash
+	                ctx.setLineDash([]);
+	            }
+
+
+	            this.restoreTransform(ctx);
+
+	            // Draw rect text
+	            if (style.text || style.text === 0) {
+	                // var rect = this.getBoundingRect();
+	                this.drawRectText(ctx, this.getBoundingRect());
+	            }
+	        },
+
+	        // When bundling path, some shape may decide if use moveTo to begin a new subpath or closePath
+	        // Like in circle
+	        buildPath: function (ctx, shapeCfg, inBundle) {},
+
+	        getBoundingRect: function () {
+	            var rect = this._rect;
+	            var style = this.style;
+	            var needsUpdateRect = !rect;
+	            if (needsUpdateRect) {
+	                var path = this.path;
+	                if (this.__dirtyPath) {
+	                    path.beginPath();
+	                    this.buildPath(path, this.shape, false);
+	                }
+	                rect = path.getBoundingRect();
+	            }
+	            this._rect = rect;
+
+	            if (style.hasStroke()) {
+	                // Needs update rect with stroke lineWidth when
+	                // 1. Element changes scale or lineWidth
+	                // 2. Shape is changed
+	                var rectWithStroke = this._rectWithStroke || (this._rectWithStroke = rect.clone());
+	                if (this.__dirty || needsUpdateRect) {
+	                    rectWithStroke.copy(rect);
+	                    // FIXME Must after updateTransform
+	                    var w = style.lineWidth;
+	                    // PENDING, Min line width is needed when line is horizontal or vertical
+	                    var lineScale = style.strokeNoScale ? this.getLineScale() : 1;
+
+	                    // Only add extra hover lineWidth when there are no fill
+	                    if (!style.hasFill()) {
+	                        w = Math.max(w, this.strokeContainThreshold || 4);
+	                    }
+	                    // Consider line width
+	                    // Line scale can't be 0;
+	                    if (lineScale > 1e-10) {
+	                        rectWithStroke.width += w / lineScale;
+	                        rectWithStroke.height += w / lineScale;
+	                        rectWithStroke.x -= w / lineScale / 2;
+	                        rectWithStroke.y -= w / lineScale / 2;
+	                    }
+	                }
+
+	                // Return rect with stroke
+	                return rectWithStroke;
+	            }
+
+	            return rect;
+	        },
+
+	        contain: function (x, y) {
+	            var localPos = this.transformCoordToLocal(x, y);
+	            var rect = this.getBoundingRect();
+	            var style = this.style;
+	            x = localPos[0];
+	            y = localPos[1];
+
+	            if (rect.contain(x, y)) {
+	                var pathData = this.path.data;
+	                if (style.hasStroke()) {
+	                    var lineWidth = style.lineWidth;
+	                    var lineScale = style.strokeNoScale ? this.getLineScale() : 1;
+	                    // Line scale can't be 0;
+	                    if (lineScale > 1e-10) {
+	                        // Only add extra hover lineWidth when there are no fill
+	                        if (!style.hasFill()) {
+	                            lineWidth = Math.max(lineWidth, this.strokeContainThreshold);
+	                        }
+	                        if (pathContain.containStroke(
+	                            pathData, lineWidth / lineScale, x, y
+	                        )) {
+	                            return true;
+	                        }
+	                    }
+	                }
+	                if (style.hasFill()) {
+	                    return pathContain.contain(pathData, x, y);
+	                }
+	            }
+	            return false;
+	        },
+
+	        /**
+	         * @param  {boolean} dirtyPath
+	         */
+	        dirty: function (dirtyPath) {
+	            if (dirtyPath == null) {
+	                dirtyPath = true;
+	            }
+	            // Only mark dirty, not mark clean
+	            if (dirtyPath) {
+	                this.__dirtyPath = dirtyPath;
+	                this._rect = null;
+	            }
+
+	            this.__dirty = true;
+
+	            this.__zr && this.__zr.refresh();
+
+	            // Used as a clipping path
+	            if (this.__clipTarget) {
+	                this.__clipTarget.dirty();
+	            }
+	        },
+
+	        /**
+	         * Alias for animate('shape')
+	         * @param {boolean} loop
+	         */
+	        animateShape: function (loop) {
+	            return this.animate('shape', loop);
+	        },
+
+	        // Overwrite attrKV
+	        attrKV: function (key, value) {
+	            // FIXME
+	            if (key === 'shape') {
+	                this.setShape(value);
+	                this.__dirtyPath = true;
+	                this._rect = null;
+	            }
+	            else {
+	                Displayable.prototype.attrKV.call(this, key, value);
+	            }
+	        },
+
+	        /**
+	         * @param {Object|string} key
+	         * @param {*} value
+	         */
+	        setShape: function (key, value) {
+	            var shape = this.shape;
+	            // Path from string may not have shape
+	            if (shape) {
+	                if (zrUtil.isObject(key)) {
+	                    for (var name in key) {
+	                        shape[name] = key[name];
+	                    }
+	                }
+	                else {
+	                    shape[key] = value;
+	                }
+	                this.dirty(true);
+	            }
+	            return this;
+	        },
+
+	        getLineScale: function () {
+	            var m = this.transform;
+	            // Get the line scale.
+	            // Determinant of `m` means how much the area is enlarged by the
+	            // transformation. So its square root can be used as a scale factor
+	            // for width.
+	            return m && abs(m[0] - 1) > 1e-10 && abs(m[3] - 1) > 1e-10
+	                ? Math.sqrt(abs(m[0] * m[3] - m[2] * m[1]))
+	                : 1;
+	        }
+	    };
+
+	    /**
+	     * 扩展一个 Path element, 比如星形，圆等。
+	     * Extend a path element
+	     * @param {Object} props
+	     * @param {string} props.type Path type
+	     * @param {Function} props.init Initialize
+	     * @param {Function} props.buildPath Overwrite buildPath method
+	     * @param {Object} [props.style] Extended default style config
+	     * @param {Object} [props.shape] Extended default shape config
+	     */
+	    Path.extend = function (defaults) {
+	        var Sub = function (opts) {
+	            Path.call(this, opts);
+
+	            if (defaults.style) {
+	                // Extend default style
+	                this.style.extendFrom(defaults.style, false);
+	            }
+
+	            // Extend default shape
+	            var defaultShape = defaults.shape;
+	            if (defaultShape) {
+	                this.shape = this.shape || {};
+	                var thisShape = this.shape;
+	                for (var name in defaultShape) {
+	                    if (
+	                        ! thisShape.hasOwnProperty(name)
+	                        && defaultShape.hasOwnProperty(name)
+	                    ) {
+	                        thisShape[name] = defaultShape[name];
+	                    }
+	                }
+	            }
+
+	            defaults.init && defaults.init.call(this, opts);
+	        };
+
+	        zrUtil.inherits(Sub, Path);
+
+	        // FIXME 不能 extend position, rotation 等引用对象
+	        for (var name in defaults) {
+	            // Extending prototype values and methods
+	            if (name !== 'style' && name !== 'shape') {
+	                Sub.prototype[name] = defaults[name];
+	            }
+	        }
+
+	        return Sub;
+	    };
+
+	    zrUtil.inherits(Path, Displayable);
+
+	    module.exports = Path;
+
+
+/***/ },
+/* 46 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * 可绘制的图形基类
+	 * Base class of all displayable graphic objects
+	 * @module zrender/graphic/Displayable
+	 */
+
+
+
+	    var zrUtil = __webpack_require__(4);
+
+	    var Style = __webpack_require__(47);
+
+	    var Element = __webpack_require__(31);
+	    var RectText = __webpack_require__(48);
+	    // var Stateful = require('./mixin/Stateful');
+
+	    /**
+	     * @alias module:zrender/graphic/Displayable
+	     * @extends module:zrender/Element
+	     * @extends module:zrender/graphic/mixin/RectText
+	     */
+	    function Displayable(opts) {
+
+	        opts = opts || {};
+
+	        Element.call(this, opts);
+
+	        // Extend properties
+	        for (var name in opts) {
+	            if (
+	                opts.hasOwnProperty(name) &&
+	                name !== 'style'
+	            ) {
+	                this[name] = opts[name];
+	            }
+	        }
+
+	        /**
+	         * @type {module:zrender/graphic/Style}
+	         */
+	        this.style = new Style(opts.style);
+
+	        this._rect = null;
+	        // Shapes for cascade clipping.
+	        this.__clipPaths = [];
+
+	        // FIXME Stateful must be mixined after style is setted
+	        // Stateful.call(this, opts);
+	    }
+
+	    Displayable.prototype = {
+
+	        constructor: Displayable,
+
+	        type: 'displayable',
+
+	        /**
+	         * Displayable 是否为脏，Painter 中会根据该标记判断是否需要是否需要重新绘制
+	         * Dirty flag. From which painter will determine if this displayable object needs brush
+	         * @name module:zrender/graphic/Displayable#__dirty
+	         * @type {boolean}
+	         */
+	        __dirty: true,
+
+	        /**
+	         * 图形是否可见，为true时不绘制图形，但是仍能触发鼠标事件
+	         * If ignore drawing of the displayable object. Mouse event will still be triggered
+	         * @name module:/zrender/graphic/Displayable#invisible
+	         * @type {boolean}
+	         * @default false
+	         */
+	        invisible: false,
+
+	        /**
+	         * @name module:/zrender/graphic/Displayable#z
+	         * @type {number}
+	         * @default 0
+	         */
+	        z: 0,
+
+	        /**
+	         * @name module:/zrender/graphic/Displayable#z
+	         * @type {number}
+	         * @default 0
+	         */
+	        z2: 0,
+
+	        /**
+	         * z层level，决定绘画在哪层canvas中
+	         * @name module:/zrender/graphic/Displayable#zlevel
+	         * @type {number}
+	         * @default 0
+	         */
+	        zlevel: 0,
+
+	        /**
+	         * 是否可拖拽
+	         * @name module:/zrender/graphic/Displayable#draggable
+	         * @type {boolean}
+	         * @default false
+	         */
+	        draggable: false,
+
+	        /**
+	         * 是否正在拖拽
+	         * @name module:/zrender/graphic/Displayable#draggable
+	         * @type {boolean}
+	         * @default false
+	         */
+	        dragging: false,
+
+	        /**
+	         * 是否相应鼠标事件
+	         * @name module:/zrender/graphic/Displayable#silent
+	         * @type {boolean}
+	         * @default false
+	         */
+	        silent: false,
+
+	        /**
+	         * If enable culling
+	         * @type {boolean}
+	         * @default false
+	         */
+	        culling: false,
+
+	        /**
+	         * Mouse cursor when hovered
+	         * @name module:/zrender/graphic/Displayable#cursor
+	         * @type {string}
+	         */
+	        cursor: 'pointer',
+
+	        /**
+	         * If hover area is bounding rect
+	         * @name module:/zrender/graphic/Displayable#rectHover
+	         * @type {string}
+	         */
+	        rectHover: false,
+
+	        /**
+	         * Render the element progressively when the value >= 0,
+	         * usefull for large data.
+	         * @type {number}
+	         */
+	        progressive: -1,
+
+	        beforeBrush: function (ctx) {},
+
+	        afterBrush: function (ctx) {},
+
+	        /**
+	         * 图形绘制方法
+	         * @param {Canvas2DRenderingContext} ctx
+	         */
+	        // Interface
+	        brush: function (ctx, prevEl) {},
+
+	        /**
+	         * 获取最小包围盒
+	         * @return {module:zrender/core/BoundingRect}
+	         */
+	        // Interface
+	        getBoundingRect: function () {},
+
+	        /**
+	         * 判断坐标 x, y 是否在图形上
+	         * If displayable element contain coord x, y
+	         * @param  {number} x
+	         * @param  {number} y
+	         * @return {boolean}
+	         */
+	        contain: function (x, y) {
+	            return this.rectContain(x, y);
+	        },
+
+	        /**
+	         * @param  {Function} cb
+	         * @param  {}   context
+	         */
+	        traverse: function (cb, context) {
+	            cb.call(context, this);
+	        },
+
+	        /**
+	         * 判断坐标 x, y 是否在图形的包围盒上
+	         * If bounding rect of element contain coord x, y
+	         * @param  {number} x
+	         * @param  {number} y
+	         * @return {boolean}
+	         */
+	        rectContain: function (x, y) {
+	            var coord = this.transformCoordToLocal(x, y);
+	            var rect = this.getBoundingRect();
+	            return rect.contain(coord[0], coord[1]);
+	        },
+
+	        /**
+	         * 标记图形元素为脏，并且在下一帧重绘
+	         * Mark displayable element dirty and refresh next frame
+	         */
+	        dirty: function () {
+	            this.__dirty = true;
+
+	            this._rect = null;
+
+	            this.__zr && this.__zr.refresh();
+	        },
+
+	        /**
+	         * 图形是否会触发事件
+	         * If displayable object binded any event
+	         * @return {boolean}
+	         */
+	        // TODO, 通过 bind 绑定的事件
+	        // isSilent: function () {
+	        //     return !(
+	        //         this.hoverable || this.draggable
+	        //         || this.onmousemove || this.onmouseover || this.onmouseout
+	        //         || this.onmousedown || this.onmouseup || this.onclick
+	        //         || this.ondragenter || this.ondragover || this.ondragleave
+	        //         || this.ondrop
+	        //     );
+	        // },
+	        /**
+	         * Alias for animate('style')
+	         * @param {boolean} loop
+	         */
+	        animateStyle: function (loop) {
+	            return this.animate('style', loop);
+	        },
+
+	        attrKV: function (key, value) {
+	            if (key !== 'style') {
+	                Element.prototype.attrKV.call(this, key, value);
+	            }
+	            else {
+	                this.style.set(value);
+	            }
+	        },
+
+	        /**
+	         * @param {Object|string} key
+	         * @param {*} value
+	         */
+	        setStyle: function (key, value) {
+	            this.style.set(key, value);
+	            this.dirty(false);
+	            return this;
+	        },
+
+	        /**
+	         * Use given style object
+	         * @param  {Object} obj
+	         */
+	        useStyle: function (obj) {
+	            this.style = new Style(obj);
+	            this.dirty(false);
+	            return this;
+	        }
+	    };
+
+	    zrUtil.inherits(Displayable, Element);
+
+	    zrUtil.mixin(Displayable, RectText);
+	    // zrUtil.mixin(Displayable, Stateful);
+
+	    module.exports = Displayable;
+
+
+/***/ },
+/* 47 */
+/***/ function(module, exports) {
+
+	/**
+	 * @module zrender/graphic/Style
+	 */
+
+
+	    var STYLE_COMMON_PROPS = [
+	        ['shadowBlur', 0], ['shadowOffsetX', 0], ['shadowOffsetY', 0], ['shadowColor', '#000'],
+	        ['lineCap', 'butt'], ['lineJoin', 'miter'], ['miterLimit', 10]
+	    ];
+
+	    // var SHADOW_PROPS = STYLE_COMMON_PROPS.slice(0, 4);
+	    // var LINE_PROPS = STYLE_COMMON_PROPS.slice(4);
+
+	    var Style = function (opts) {
+	        this.extendFrom(opts);
+	    };
+
+	    function createLinearGradient(ctx, obj, rect) {
+	        // var size =
+	        var x = obj.x;
+	        var x2 = obj.x2;
+	        var y = obj.y;
+	        var y2 = obj.y2;
+
+	        if (!obj.global) {
+	            x = x * rect.width + rect.x;
+	            x2 = x2 * rect.width + rect.x;
+	            y = y * rect.height + rect.y;
+	            y2 = y2 * rect.height + rect.y;
+	        }
+
+	        var canvasGradient = ctx.createLinearGradient(x, y, x2, y2);
+
+	        return canvasGradient;
+	    }
+
+	    function createRadialGradient(ctx, obj, rect) {
+	        var width = rect.width;
+	        var height = rect.height;
+	        var min = Math.min(width, height);
+
+	        var x = obj.x;
+	        var y = obj.y;
+	        var r = obj.r;
+	        if (!obj.global) {
+	            x = x * width + rect.x;
+	            y = y * height + rect.y;
+	            r = r * min;
+	        }
+
+	        var canvasGradient = ctx.createRadialGradient(x, y, 0, x, y, r);
+
+	        return canvasGradient;
+	    }
+
+
+	    Style.prototype = {
+
+	        constructor: Style,
+
+	        /**
+	         * @type {string}
+	         */
+	        fill: '#000000',
+
+	        /**
+	         * @type {string}
+	         */
+	        stroke: null,
+
+	        /**
+	         * @type {number}
+	         */
+	        opacity: 1,
+
+	        /**
+	         * @type {Array.<number>}
+	         */
+	        lineDash: null,
+
+	        /**
+	         * @type {number}
+	         */
+	        lineDashOffset: 0,
+
+	        /**
+	         * @type {number}
+	         */
+	        shadowBlur: 0,
+
+	        /**
+	         * @type {number}
+	         */
+	        shadowOffsetX: 0,
+
+	        /**
+	         * @type {number}
+	         */
+	        shadowOffsetY: 0,
+
+	        /**
+	         * @type {number}
+	         */
+	        lineWidth: 1,
+
+	        /**
+	         * If stroke ignore scale
+	         * @type {Boolean}
+	         */
+	        strokeNoScale: false,
+
+	        // Bounding rect text configuration
+	        // Not affected by element transform
+	        /**
+	         * @type {string}
+	         */
+	        text: null,
+
+	        /**
+	         * @type {string}
+	         */
+	        textFill: '#000',
+
+	        /**
+	         * @type {string}
+	         */
+	        textStroke: null,
+
+	        /**
+	         * 'inside', 'left', 'right', 'top', 'bottom'
+	         * [x, y]
+	         * @type {string|Array.<number>}
+	         * @default 'inside'
+	         */
+	        textPosition: 'inside',
+
+	        /**
+	         * @type {string}
+	         */
+	        textBaseline: null,
+
+	        /**
+	         * @type {string}
+	         */
+	        textAlign: null,
+
+	        /**
+	         * @type {string}
+	         */
+	        textVerticalAlign: null,
+
+	        /**
+	         * @type {number}
+	         */
+	        textDistance: 5,
+
+	        /**
+	         * @type {number}
+	         */
+	        textShadowBlur: 0,
+
+	        /**
+	         * @type {number}
+	         */
+	        textShadowOffsetX: 0,
+
+	        /**
+	         * @type {number}
+	         */
+	        textShadowOffsetY: 0,
+
+	        /**
+	         * @type {string}
+	         * https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/globalCompositeOperation
+	         */
+	        blend: null,
+
+	        /**
+	         * @param {CanvasRenderingContext2D} ctx
+	         */
+	        bind: function (ctx, el, prevEl) {
+	            var style = this;
+	            var prevStyle = prevEl && prevEl.style;
+	            var firstDraw = !prevStyle;
+
+	            for (var i = 0; i < STYLE_COMMON_PROPS.length; i++) {
+	                var prop = STYLE_COMMON_PROPS[i];
+	                var styleName = prop[0];
+
+	                if (firstDraw || style[styleName] !== prevStyle[styleName]) {
+	                    // FIXME Invalid property value will cause style leak from previous element.
+	                    ctx[styleName] = style[styleName] || prop[1];
+	                }
+	            }
+
+	            if ((firstDraw || style.fill !== prevStyle.fill)) {
+	                ctx.fillStyle = style.fill;
+	            }
+	            if ((firstDraw || style.stroke !== prevStyle.stroke)) {
+	                ctx.strokeStyle = style.stroke;
+	            }
+	            if ((firstDraw || style.opacity !== prevStyle.opacity)) {
+	                ctx.globalAlpha = style.opacity == null ? 1 : style.opacity;
+	            }
+
+	            if ((firstDraw || style.blend !== prevStyle.blend)) {
+	                ctx.globalCompositeOperation = style.blend || 'source-over';
+	            }
+	            if (this.hasStroke()) {
+	                var lineWidth = style.lineWidth;
+	                ctx.lineWidth = lineWidth / (
+	                    (this.strokeNoScale && el && el.getLineScale) ? el.getLineScale() : 1
+	                );
+	            }
+	        },
+
+	        hasFill: function () {
+	            var fill = this.fill;
+	            return fill != null && fill !== 'none';
+	        },
+
+	        hasStroke: function () {
+	            var stroke = this.stroke;
+	            return stroke != null && stroke !== 'none' && this.lineWidth > 0;
+	        },
+
+	        /**
+	         * Extend from other style
+	         * @param {zrender/graphic/Style} otherStyle
+	         * @param {boolean} overwrite
+	         */
+	        extendFrom: function (otherStyle, overwrite) {
+	            if (otherStyle) {
+	                var target = this;
+	                for (var name in otherStyle) {
+	                    if (otherStyle.hasOwnProperty(name)
+	                        && (overwrite || ! target.hasOwnProperty(name))
+	                    ) {
+	                        target[name] = otherStyle[name];
+	                    }
+	                }
+	            }
+	        },
+
+	        /**
+	         * Batch setting style with a given object
+	         * @param {Object|string} obj
+	         * @param {*} [obj]
+	         */
+	        set: function (obj, value) {
+	            if (typeof obj === 'string') {
+	                this[obj] = value;
+	            }
+	            else {
+	                this.extendFrom(obj, true);
+	            }
+	        },
+
+	        /**
+	         * Clone
+	         * @return {zrender/graphic/Style} [description]
+	         */
+	        clone: function () {
+	            var newStyle = new this.constructor();
+	            newStyle.extendFrom(this, true);
+	            return newStyle;
+	        },
+
+	        getGradient: function (ctx, obj, rect) {
+	            var method = obj.type === 'radial' ? createRadialGradient : createLinearGradient;
+	            var canvasGradient = method(ctx, obj, rect);
+	            var colorStops = obj.colorStops;
+	            for (var i = 0; i < colorStops.length; i++) {
+	                canvasGradient.addColorStop(
+	                    colorStops[i].offset, colorStops[i].color
+	                );
+	            }
+	            return canvasGradient;
+	        }
+	    };
+
+	    var styleProto = Style.prototype;
+	    for (var i = 0; i < STYLE_COMMON_PROPS.length; i++) {
+	        var prop = STYLE_COMMON_PROPS[i];
+	        if (!(prop[0] in styleProto)) {
+	            styleProto[prop[0]] = prop[1];
+	        }
+	    }
+
+	    // Provide for others
+	    Style.getGradient = styleProto.getGradient;
+
+	    module.exports = Style;
+
+
+/***/ },
+/* 48 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * Mixin for drawing text in a element bounding rect
+	 * @module zrender/mixin/RectText
+	 */
+
+
+
+	    var textContain = __webpack_require__(8);
+	    var BoundingRect = __webpack_require__(9);
+
+	    var tmpRect = new BoundingRect();
+
+	    var RectText = function () {};
+
+	    function parsePercent(value, maxValue) {
+	        if (typeof value === 'string') {
+	            if (value.lastIndexOf('%') >= 0) {
+	                return parseFloat(value) / 100 * maxValue;
+	            }
+	            return parseFloat(value);
+	        }
+	        return value;
+	    }
+
+	    function setTransform(ctx, m) {
+	        ctx.transform(m[0], m[1], m[2], m[3], m[4], m[5]);
+	    }
+
+	    RectText.prototype = {
+
+	        constructor: RectText,
+
+	        /**
+	         * Draw text in a rect with specified position.
+	         * @param  {CanvasRenderingContext} ctx
+	         * @param  {Object} rect Displayable rect
+	         * @return {Object} textRect Alternative precalculated text bounding rect
+	         */
+	        drawRectText: function (ctx, rect, textRect) {
+	            var style = this.style;
+	            var text = style.text;
+	            // Convert to string
+	            text != null && (text += '');
+	            if (!text) {
+	                return;
+	            }
+
+	            // FIXME
+	            ctx.save();
+
+	            var x;
+	            var y;
+	            var textPosition = style.textPosition;
+	            var distance = style.textDistance;
+	            var align = style.textAlign;
+	            var font = style.textFont || style.font;
+	            var baseline = style.textBaseline;
+	            var verticalAlign = style.textVerticalAlign;
+
+	            textRect = textRect || textContain.getBoundingRect(text, font, align, baseline);
+
+	            // Transform rect to view space
+	            var transform = this.transform;
+	            if (transform) {
+	                tmpRect.copy(rect);
+	                tmpRect.applyTransform(transform);
+	                rect = tmpRect;
+	            }
+
+	            // Text position represented by coord
+	            if (textPosition instanceof Array) {
+	                // Percent
+	                x = rect.x + parsePercent(textPosition[0], rect.width);
+	                y = rect.y + parsePercent(textPosition[1], rect.height);
+	                align = align || 'left';
+	                baseline = baseline || 'top';
+
+	                if (verticalAlign) {
+	                    switch (verticalAlign) {
+	                        case 'middle':
+	                            y -= textRect.height / 2 - textRect.lineHeight / 2;
+	                            break;
+	                        case 'bottom':
+	                            y -= textRect.height - textRect.lineHeight / 2;
+	                            break;
+	                        default:
+	                            y += textRect.lineHeight / 2;
+	                    }
+	                    // Force bseline to be middle
+	                    baseline = 'middle';
+	                }
+	            }
+	            else {
+	                var res = textContain.adjustTextPositionOnRect(
+	                    textPosition, rect, textRect, distance
+	                );
+	                x = res.x;
+	                y = res.y;
+	                // Default align and baseline when has textPosition
+	                align = align || res.textAlign;
+	                baseline = baseline || res.textBaseline;
+	            }
+
+	            // Use canvas default left textAlign. Giving invalid value will cause state not change
+	            ctx.textAlign = align || 'left';
+	            // Use canvas default alphabetic baseline
+	            ctx.textBaseline = baseline || 'alphabetic';
+
+	            var textFill = style.textFill;
+	            var textStroke = style.textStroke;
+	            textFill && (ctx.fillStyle = textFill);
+	            textStroke && (ctx.strokeStyle = textStroke);
+	            ctx.font = font;
+
+	            // Text shadow
+	            // Always set shadowBlur and shadowOffset to avoid leak from displayable
+	            ctx.shadowBlur = style.textShadowBlur;
+	            ctx.shadowColor = style.textShadowColor || 'transparent';
+	            ctx.shadowOffsetX = style.textShadowOffsetX;
+	            ctx.shadowOffsetY = style.textShadowOffsetY;
+
+	            var textLines = text.split('\n');
+	            for (var i = 0; i < textLines.length; i++) {
+	                textFill && ctx.fillText(textLines[i], x, y);
+	                textStroke && ctx.strokeText(textLines[i], x, y);
+	                y += textRect.lineHeight;
+	            }
+
+	            ctx.restore();
+	        }
+	    };
+
+	    module.exports = RectText;
+
+
+/***/ },
+/* 49 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+	/**
+	 * Path 代理，可以在`buildPath`中用于替代`ctx`, 会保存每个path操作的命令到pathCommands属性中
+	 * 可以用于 isInsidePath 判断以及获取boundingRect
+	 *
+	 * @module zrender/core/PathProxy
+	 * @author Yi Shen (http://www.github.com/pissang)
+	 */
+
+	 // TODO getTotalLength, getPointAtLength
+
+
+	    var curve = __webpack_require__(50);
+	    var vec2 = __webpack_require__(10);
+	    var bbox = __webpack_require__(51);
+	    var BoundingRect = __webpack_require__(9);
+	    var dpr = __webpack_require__(41).devicePixelRatio;
+
+	    var CMD = {
+	        M: 1,
+	        L: 2,
+	        C: 3,
+	        Q: 4,
+	        A: 5,
+	        Z: 6,
+	        // Rect
+	        R: 7
+	    };
+
+	    var min = [];
+	    var max = [];
+	    var min2 = [];
+	    var max2 = [];
+	    var mathMin = Math.min;
+	    var mathMax = Math.max;
+	    var mathCos = Math.cos;
+	    var mathSin = Math.sin;
+	    var mathSqrt = Math.sqrt;
+	    var mathAbs = Math.abs;
+
+	    var hasTypedArray = typeof Float32Array != 'undefined';
+
+	    /**
+	     * @alias module:zrender/core/PathProxy
+	     * @constructor
+	     */
+	    var PathProxy = function () {
+
+	        /**
+	         * Path data. Stored as flat array
+	         * @type {Array.<Object>}
+	         */
+	        this.data = [];
+
+	        this._len = 0;
+
+	        this._ctx = null;
+
+	        this._xi = 0;
+	        this._yi = 0;
+
+	        this._x0 = 0;
+	        this._y0 = 0;
+
+	        // Unit x, Unit y. Provide for avoiding drawing that too short line segment
+	        this._ux = 0;
+	        this._uy = 0;
+	    };
+
+	    /**
+	     * 快速计算Path包围盒（并不是最小包围盒）
+	     * @return {Object}
+	     */
+	    PathProxy.prototype = {
+
+	        constructor: PathProxy,
+
+	        _lineDash: null,
+
+	        _dashOffset: 0,
+
+	        _dashIdx: 0,
+
+	        _dashSum: 0,
+
+	        /**
+	         * @readOnly
+	         */
+	        setScale: function (sx, sy) {
+	            this._ux = mathAbs(1 / dpr / sx) || 0;
+	            this._uy = mathAbs(1 / dpr / sy) || 0;
+	        },
+
+	        getContext: function () {
+	            return this._ctx;
+	        },
+
+	        /**
+	         * @param  {CanvasRenderingContext2D} ctx
+	         * @return {module:zrender/core/PathProxy}
+	         */
+	        beginPath: function (ctx) {
+	            this._ctx = ctx;
+
+	            ctx && ctx.beginPath();
+
+	            // Reset
+	            this._len = 0;
+
+	            if (this._lineDash) {
+	                this._lineDash = null;
+
+	                this._dashOffset = 0;
+	            }
+
+	            return this;
+	        },
+
+	        /**
+	         * @param  {number} x
+	         * @param  {number} y
+	         * @return {module:zrender/core/PathProxy}
+	         */
+	        moveTo: function (x, y) {
+	            this.addData(CMD.M, x, y);
+	            this._ctx && this._ctx.moveTo(x, y);
+
+	            // x0, y0, xi, yi 是记录在 _dashedXXXXTo 方法中使用
+	            // xi, yi 记录当前点, x0, y0 在 closePath 的时候回到起始点。
+	            // 有可能在 beginPath 之后直接调用 lineTo，这时候 x0, y0 需要
+	            // 在 lineTo 方法中记录，这里先不考虑这种情况，dashed line 也只在 IE10- 中不支持
+	            this._x0 = x;
+	            this._y0 = y;
+
+	            this._xi = x;
+	            this._yi = y;
+
+	            return this;
+	        },
+
+	        /**
+	         * @param  {number} x
+	         * @param  {number} y
+	         * @return {module:zrender/core/PathProxy}
+	         */
+	        lineTo: function (x, y) {
+	            var exceedUnit = mathAbs(x - this._xi) > this._ux
+	                || mathAbs(y - this._yi) > this._uy
+	                // Force draw the first segment
+	                || this._len < 5;
+
+	            this.addData(CMD.L, x, y);
+
+	            if (this._ctx && exceedUnit) {
+	                this._needsDash() ? this._dashedLineTo(x, y)
+	                    : this._ctx.lineTo(x, y);
+	            }
+	            if (exceedUnit) {
+	                this._xi = x;
+	                this._yi = y;
+	            }
+
+	            return this;
+	        },
+
+	        /**
+	         * @param  {number} x1
+	         * @param  {number} y1
+	         * @param  {number} x2
+	         * @param  {number} y2
+	         * @param  {number} x3
+	         * @param  {number} y3
+	         * @return {module:zrender/core/PathProxy}
+	         */
+	        bezierCurveTo: function (x1, y1, x2, y2, x3, y3) {
+	            this.addData(CMD.C, x1, y1, x2, y2, x3, y3);
+	            if (this._ctx) {
+	                this._needsDash() ? this._dashedBezierTo(x1, y1, x2, y2, x3, y3)
+	                    : this._ctx.bezierCurveTo(x1, y1, x2, y2, x3, y3);
+	            }
+	            this._xi = x3;
+	            this._yi = y3;
+	            return this;
+	        },
+
+	        /**
+	         * @param  {number} x1
+	         * @param  {number} y1
+	         * @param  {number} x2
+	         * @param  {number} y2
+	         * @return {module:zrender/core/PathProxy}
+	         */
+	        quadraticCurveTo: function (x1, y1, x2, y2) {
+	            this.addData(CMD.Q, x1, y1, x2, y2);
+	            if (this._ctx) {
+	                this._needsDash() ? this._dashedQuadraticTo(x1, y1, x2, y2)
+	                    : this._ctx.quadraticCurveTo(x1, y1, x2, y2);
+	            }
+	            this._xi = x2;
+	            this._yi = y2;
+	            return this;
+	        },
+
+	        /**
+	         * @param  {number} cx
+	         * @param  {number} cy
+	         * @param  {number} r
+	         * @param  {number} startAngle
+	         * @param  {number} endAngle
+	         * @param  {boolean} anticlockwise
+	         * @return {module:zrender/core/PathProxy}
+	         */
+	        arc: function (cx, cy, r, startAngle, endAngle, anticlockwise) {
+	            this.addData(
+	                CMD.A, cx, cy, r, r, startAngle, endAngle - startAngle, 0, anticlockwise ? 0 : 1
+	            );
+	            this._ctx && this._ctx.arc(cx, cy, r, startAngle, endAngle, anticlockwise);
+
+	            this._xi = mathCos(endAngle) * r + cx;
+	            this._xi = mathSin(endAngle) * r + cx;
+	            return this;
+	        },
+
+	        // TODO
+	        arcTo: function (x1, y1, x2, y2, radius) {
+	            if (this._ctx) {
+	                this._ctx.arcTo(x1, y1, x2, y2, radius);
+	            }
+	            return this;
+	        },
+
+	        // TODO
+	        rect: function (x, y, w, h) {
+	            this._ctx && this._ctx.rect(x, y, w, h);
+	            this.addData(CMD.R, x, y, w, h);
+	            return this;
+	        },
+
+	        /**
+	         * @return {module:zrender/core/PathProxy}
+	         */
+	        closePath: function () {
+	            this.addData(CMD.Z);
+
+	            var ctx = this._ctx;
+	            var x0 = this._x0;
+	            var y0 = this._y0;
+	            if (ctx) {
+	                this._needsDash() && this._dashedLineTo(x0, y0);
+	                ctx.closePath();
+	            }
+
+	            this._xi = x0;
+	            this._yi = y0;
+	            return this;
+	        },
+
+	        /**
+	         * Context 从外部传入，因为有可能是 rebuildPath 完之后再 fill。
+	         * stroke 同样
+	         * @param {CanvasRenderingContext2D} ctx
+	         * @return {module:zrender/core/PathProxy}
+	         */
+	        fill: function (ctx) {
+	            ctx && ctx.fill();
+	            this.toStatic();
+	        },
+
+	        /**
+	         * @param {CanvasRenderingContext2D} ctx
+	         * @return {module:zrender/core/PathProxy}
+	         */
+	        stroke: function (ctx) {
+	            ctx && ctx.stroke();
+	            this.toStatic();
+	        },
+
+	        /**
+	         * 必须在其它绘制命令前调用
+	         * Must be invoked before all other path drawing methods
+	         * @return {module:zrender/core/PathProxy}
+	         */
+	        setLineDash: function (lineDash) {
+	            if (lineDash instanceof Array) {
+	                this._lineDash = lineDash;
+
+	                this._dashIdx = 0;
+
+	                var lineDashSum = 0;
+	                for (var i = 0; i < lineDash.length; i++) {
+	                    lineDashSum += lineDash[i];
+	                }
+	                this._dashSum = lineDashSum;
+	            }
+	            return this;
+	        },
+
+	        /**
+	         * 必须在其它绘制命令前调用
+	         * Must be invoked before all other path drawing methods
+	         * @return {module:zrender/core/PathProxy}
+	         */
+	        setLineDashOffset: function (offset) {
+	            this._dashOffset = offset;
+	            return this;
+	        },
+
+	        /**
+	         *
+	         * @return {boolean}
+	         */
+	        len: function () {
+	            return this._len;
+	        },
+
+	        /**
+	         * 直接设置 Path 数据
+	         */
+	        setData: function (data) {
+
+	            var len = data.length;
+
+	            if (! (this.data && this.data.length == len) && hasTypedArray) {
+	                this.data = new Float32Array(len);
+	            }
+
+	            for (var i = 0; i < len; i++) {
+	                this.data[i] = data[i];
+	            }
+
+	            this._len = len;
+	        },
+
+	        /**
+	         * 添加子路径
+	         * @param {module:zrender/core/PathProxy|Array.<module:zrender/core/PathProxy>} path
+	         */
+	        appendPath: function (path) {
+	            if (!(path instanceof Array)) {
+	                path = [path];
+	            }
+	            var len = path.length;
+	            var appendSize = 0;
+	            var offset = this._len;
+	            for (var i = 0; i < len; i++) {
+	                appendSize += path[i].len();
+	            }
+	            if (hasTypedArray && (this.data instanceof Float32Array)) {
+	                this.data = new Float32Array(offset + appendSize);
+	            }
+	            for (var i = 0; i < len; i++) {
+	                var appendPathData = path[i].data;
+	                for (var k = 0; k < appendPathData.length; k++) {
+	                    this.data[offset++] = appendPathData[k];
+	                }
+	            }
+	            this._len = offset;
+	        },
+
+	        /**
+	         * 填充 Path 数据。
+	         * 尽量复用而不申明新的数组。大部分图形重绘的指令数据长度都是不变的。
+	         */
+	        addData: function (cmd) {
+	            var data = this.data;
+	            if (this._len + arguments.length > data.length) {
+	                // 因为之前的数组已经转换成静态的 Float32Array
+	                // 所以不够用时需要扩展一个新的动态数组
+	                this._expandData();
+	                data = this.data;
+	            }
+	            for (var i = 0; i < arguments.length; i++) {
+	                data[this._len++] = arguments[i];
+	            }
+
+	            this._prevCmd = cmd;
+	        },
+
+	        _expandData: function () {
+	            // Only if data is Float32Array
+	            if (!(this.data instanceof Array)) {
+	                var newData = [];
+	                for (var i = 0; i < this._len; i++) {
+	                    newData[i] = this.data[i];
+	                }
+	                this.data = newData;
+	            }
+	        },
+
+	        /**
+	         * If needs js implemented dashed line
+	         * @return {boolean}
+	         * @private
+	         */
+	        _needsDash: function () {
+	            return this._lineDash;
+	        },
+
+	        _dashedLineTo: function (x1, y1) {
+	            var dashSum = this._dashSum;
+	            var offset = this._dashOffset;
+	            var lineDash = this._lineDash;
+	            var ctx = this._ctx;
+
+	            var x0 = this._xi;
+	            var y0 = this._yi;
+	            var dx = x1 - x0;
+	            var dy = y1 - y0;
+	            var dist = mathSqrt(dx * dx + dy * dy);
+	            var x = x0;
+	            var y = y0;
+	            var dash;
+	            var nDash = lineDash.length;
+	            var idx;
+	            dx /= dist;
+	            dy /= dist;
+
+	            if (offset < 0) {
+	                // Convert to positive offset
+	                offset = dashSum + offset;
+	            }
+	            offset %= dashSum;
+	            x -= offset * dx;
+	            y -= offset * dy;
+
+	            while ((dx > 0 && x <= x1) || (dx < 0 && x >= x1)
+	            || (dx == 0 && ((dy > 0 && y <= y1) || (dy < 0 && y >= y1)))) {
+	                idx = this._dashIdx;
+	                dash = lineDash[idx];
+	                x += dx * dash;
+	                y += dy * dash;
+	                this._dashIdx = (idx + 1) % nDash;
+	                // Skip positive offset
+	                if ((dx > 0 && x < x0) || (dx < 0 && x > x0) || (dy > 0 && y < y0) || (dy < 0 && y > y0)) {
+	                    continue;
+	                }
+	                ctx[idx % 2 ? 'moveTo' : 'lineTo'](
+	                    dx >= 0 ? mathMin(x, x1) : mathMax(x, x1),
+	                    dy >= 0 ? mathMin(y, y1) : mathMax(y, y1)
+	                );
+	            }
+	            // Offset for next lineTo
+	            dx = x - x1;
+	            dy = y - y1;
+	            this._dashOffset = -mathSqrt(dx * dx + dy * dy);
+	        },
+
+	        // Not accurate dashed line to
+	        _dashedBezierTo: function (x1, y1, x2, y2, x3, y3) {
+	            var dashSum = this._dashSum;
+	            var offset = this._dashOffset;
+	            var lineDash = this._lineDash;
+	            var ctx = this._ctx;
+
+	            var x0 = this._xi;
+	            var y0 = this._yi;
+	            var t;
+	            var dx;
+	            var dy;
+	            var cubicAt = curve.cubicAt;
+	            var bezierLen = 0;
+	            var idx = this._dashIdx;
+	            var nDash = lineDash.length;
+
+	            var x;
+	            var y;
+
+	            var tmpLen = 0;
+
+	            if (offset < 0) {
+	                // Convert to positive offset
+	                offset = dashSum + offset;
+	            }
+	            offset %= dashSum;
+	            // Bezier approx length
+	            for (t = 0; t < 1; t += 0.1) {
+	                dx = cubicAt(x0, x1, x2, x3, t + 0.1)
+	                    - cubicAt(x0, x1, x2, x3, t);
+	                dy = cubicAt(y0, y1, y2, y3, t + 0.1)
+	                    - cubicAt(y0, y1, y2, y3, t);
+	                bezierLen += mathSqrt(dx * dx + dy * dy);
+	            }
+
+	            // Find idx after add offset
+	            for (; idx < nDash; idx++) {
+	                tmpLen += lineDash[idx];
+	                if (tmpLen > offset) {
+	                    break;
+	                }
+	            }
+	            t = (tmpLen - offset) / bezierLen;
+
+	            while (t <= 1) {
+
+	                x = cubicAt(x0, x1, x2, x3, t);
+	                y = cubicAt(y0, y1, y2, y3, t);
+
+	                // Use line to approximate dashed bezier
+	                // Bad result if dash is long
+	                idx % 2 ? ctx.moveTo(x, y)
+	                    : ctx.lineTo(x, y);
+
+	                t += lineDash[idx] / bezierLen;
+
+	                idx = (idx + 1) % nDash;
+	            }
+
+	            // Finish the last segment and calculate the new offset
+	            (idx % 2 !== 0) && ctx.lineTo(x3, y3);
+	            dx = x3 - x;
+	            dy = y3 - y;
+	            this._dashOffset = -mathSqrt(dx * dx + dy * dy);
+	        },
+
+	        _dashedQuadraticTo: function (x1, y1, x2, y2) {
+	            // Convert quadratic to cubic using degree elevation
+	            var x3 = x2;
+	            var y3 = y2;
+	            x2 = (x2 + 2 * x1) / 3;
+	            y2 = (y2 + 2 * y1) / 3;
+	            x1 = (this._xi + 2 * x1) / 3;
+	            y1 = (this._yi + 2 * y1) / 3;
+
+	            this._dashedBezierTo(x1, y1, x2, y2, x3, y3);
+	        },
+
+	        /**
+	         * 转成静态的 Float32Array 减少堆内存占用
+	         * Convert dynamic array to static Float32Array
+	         */
+	        toStatic: function () {
+	            var data = this.data;
+	            if (data instanceof Array) {
+	                data.length = this._len;
+	                if (hasTypedArray) {
+	                    this.data = new Float32Array(data);
+	                }
+	            }
+	        },
+
+	        /**
+	         * @return {module:zrender/core/BoundingRect}
+	         */
+	        getBoundingRect: function () {
+	            min[0] = min[1] = min2[0] = min2[1] = Number.MAX_VALUE;
+	            max[0] = max[1] = max2[0] = max2[1] = -Number.MAX_VALUE;
+
+	            var data = this.data;
+	            var xi = 0;
+	            var yi = 0;
+	            var x0 = 0;
+	            var y0 = 0;
+
+	            for (var i = 0; i < data.length;) {
+	                var cmd = data[i++];
+
+	                if (i == 1) {
+	                    // 如果第一个命令是 L, C, Q
+	                    // 则 previous point 同绘制命令的第一个 point
+	                    //
+	                    // 第一个命令为 Arc 的情况下会在后面特殊处理
+	                    xi = data[i];
+	                    yi = data[i + 1];
+
+	                    x0 = xi;
+	                    y0 = yi;
+	                }
+
+	                switch (cmd) {
+	                    case CMD.M:
+	                        // moveTo 命令重新创建一个新的 subpath, 并且更新新的起点
+	                        // 在 closePath 的时候使用
+	                        x0 = data[i++];
+	                        y0 = data[i++];
+	                        xi = x0;
+	                        yi = y0;
+	                        min2[0] = x0;
+	                        min2[1] = y0;
+	                        max2[0] = x0;
+	                        max2[1] = y0;
+	                        break;
+	                    case CMD.L:
+	                        bbox.fromLine(xi, yi, data[i], data[i + 1], min2, max2);
+	                        xi = data[i++];
+	                        yi = data[i++];
+	                        break;
+	                    case CMD.C:
+	                        bbox.fromCubic(
+	                            xi, yi, data[i++], data[i++], data[i++], data[i++], data[i], data[i + 1],
+	                            min2, max2
+	                        );
+	                        xi = data[i++];
+	                        yi = data[i++];
+	                        break;
+	                    case CMD.Q:
+	                        bbox.fromQuadratic(
+	                            xi, yi, data[i++], data[i++], data[i], data[i + 1],
+	                            min2, max2
+	                        );
+	                        xi = data[i++];
+	                        yi = data[i++];
+	                        break;
+	                    case CMD.A:
+	                        // TODO Arc 判断的开销比较大
+	                        var cx = data[i++];
+	                        var cy = data[i++];
+	                        var rx = data[i++];
+	                        var ry = data[i++];
+	                        var startAngle = data[i++];
+	                        var endAngle = data[i++] + startAngle;
+	                        // TODO Arc 旋转
+	                        var psi = data[i++];
+	                        var anticlockwise = 1 - data[i++];
+
+	                        if (i == 1) {
+	                            // 直接使用 arc 命令
+	                            // 第一个命令起点还未定义
+	                            x0 = mathCos(startAngle) * rx + cx;
+	                            y0 = mathSin(startAngle) * ry + cy;
+	                        }
+
+	                        bbox.fromArc(
+	                            cx, cy, rx, ry, startAngle, endAngle,
+	                            anticlockwise, min2, max2
+	                        );
+
+	                        xi = mathCos(endAngle) * rx + cx;
+	                        yi = mathSin(endAngle) * ry + cy;
+	                        break;
+	                    case CMD.R:
+	                        x0 = xi = data[i++];
+	                        y0 = yi = data[i++];
+	                        var width = data[i++];
+	                        var height = data[i++];
+	                        // Use fromLine
+	                        bbox.fromLine(x0, y0, x0 + width, y0 + height, min2, max2);
+	                        break;
+	                    case CMD.Z:
+	                        xi = x0;
+	                        yi = y0;
+	                        break;
+	                }
+
+	                // Union
+	                vec2.min(min, min, min2);
+	                vec2.max(max, max, max2);
+	            }
+
+	            // No data
+	            if (i === 0) {
+	                min[0] = min[1] = max[0] = max[1] = 0;
+	            }
+
+	            return new BoundingRect(
+	                min[0], min[1], max[0] - min[0], max[1] - min[1]
+	            );
+	        },
+
+	        /**
+	         * Rebuild path from current data
+	         * Rebuild path will not consider javascript implemented line dash.
+	         * @param {CanvasRenderingContext} ctx
+	         */
+	        rebuildPath: function (ctx) {
+	            var d = this.data;
+	            var x0, y0;
+	            var xi, yi;
+	            var x, y;
+	            var ux = this._ux;
+	            var uy = this._uy;
+	            var len = this._len;
+	            for (var i = 0; i < len;) {
+	                var cmd = d[i++];
+
+	                if (i == 1) {
+	                    // 如果第一个命令是 L, C, Q
+	                    // 则 previous point 同绘制命令的第一个 point
+	                    //
+	                    // 第一个命令为 Arc 的情况下会在后面特殊处理
+	                    xi = d[i];
+	                    yi = d[i + 1];
+
+	                    x0 = xi;
+	                    y0 = yi;
+	                }
+	                switch (cmd) {
+	                    case CMD.M:
+	                        x0 = xi = d[i++];
+	                        y0 = yi = d[i++];
+	                        ctx.moveTo(xi, yi);
+	                        break;
+	                    case CMD.L:
+	                        x = d[i++];
+	                        y = d[i++];
+	                        // Not draw too small seg between
+	                        if (mathAbs(x - xi) > ux || mathAbs(y - yi) > uy || i === len - 1) {
+	                            ctx.lineTo(x, y);
+	                            xi = x;
+	                            yi = y;
+	                        }
+	                        break;
+	                    case CMD.C:
+	                        ctx.bezierCurveTo(
+	                            d[i++], d[i++], d[i++], d[i++], d[i++], d[i++]
+	                        );
+	                        xi = d[i - 2];
+	                        yi = d[i - 1];
+	                        break;
+	                    case CMD.Q:
+	                        ctx.quadraticCurveTo(d[i++], d[i++], d[i++], d[i++]);
+	                        xi = d[i - 2];
+	                        yi = d[i - 1];
+	                        break;
+	                    case CMD.A:
+	                        var cx = d[i++];
+	                        var cy = d[i++];
+	                        var rx = d[i++];
+	                        var ry = d[i++];
+	                        var theta = d[i++];
+	                        var dTheta = d[i++];
+	                        var psi = d[i++];
+	                        var fs = d[i++];
+	                        var r = (rx > ry) ? rx : ry;
+	                        var scaleX = (rx > ry) ? 1 : rx / ry;
+	                        var scaleY = (rx > ry) ? ry / rx : 1;
+	                        var isEllipse = Math.abs(rx - ry) > 1e-3;
+	                        var endAngle = theta + dTheta;
+	                        if (isEllipse) {
+	                            ctx.translate(cx, cy);
+	                            ctx.rotate(psi);
+	                            ctx.scale(scaleX, scaleY);
+	                            ctx.arc(0, 0, r, theta, endAngle, 1 - fs);
+	                            ctx.scale(1 / scaleX, 1 / scaleY);
+	                            ctx.rotate(-psi);
+	                            ctx.translate(-cx, -cy);
+	                        }
+	                        else {
+	                            ctx.arc(cx, cy, r, theta, endAngle, 1 - fs);
+	                        }
+
+	                        if (i == 1) {
+	                            // 直接使用 arc 命令
+	                            // 第一个命令起点还未定义
+	                            x0 = mathCos(theta) * rx + cx;
+	                            y0 = mathSin(theta) * ry + cy;
+	                        }
+	                        xi = mathCos(endAngle) * rx + cx;
+	                        yi = mathSin(endAngle) * ry + cy;
+	                        break;
+	                    case CMD.R:
+	                        x0 = xi = d[i];
+	                        y0 = yi = d[i + 1];
+	                        ctx.rect(d[i++], d[i++], d[i++], d[i++]);
+	                        break;
+	                    case CMD.Z:
+	                        ctx.closePath();
+	                        xi = x0;
+	                        yi = y0;
+	                }
+	            }
+	        }
+	    };
+
+	    PathProxy.CMD = CMD;
+
+	    module.exports = PathProxy;
+
+
+/***/ },
+/* 50 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+	/**
+	 * 曲线辅助模块
+	 * @module zrender/core/curve
+	 * @author pissang(https://www.github.com/pissang)
+	 */
+
+
+	    var vec2 = __webpack_require__(10);
+	    var v2Create = vec2.create;
+	    var v2DistSquare = vec2.distSquare;
+	    var mathPow = Math.pow;
+	    var mathSqrt = Math.sqrt;
+
+	    var EPSILON = 1e-8;
+	    var EPSILON_NUMERIC = 1e-4;
+
+	    var THREE_SQRT = mathSqrt(3);
+	    var ONE_THIRD = 1 / 3;
+
+	    // 临时变量
+	    var _v0 = v2Create();
+	    var _v1 = v2Create();
+	    var _v2 = v2Create();
+	    // var _v3 = vec2.create();
+
+	    function isAroundZero(val) {
+	        return val > -EPSILON && val < EPSILON;
+	    }
+	    function isNotAroundZero(val) {
+	        return val > EPSILON || val < -EPSILON;
+	    }
+	    /**
+	     * 计算三次贝塞尔值
+	     * @memberOf module:zrender/core/curve
+	     * @param  {number} p0
+	     * @param  {number} p1
+	     * @param  {number} p2
+	     * @param  {number} p3
+	     * @param  {number} t
+	     * @return {number}
+	     */
+	    function cubicAt(p0, p1, p2, p3, t) {
+	        var onet = 1 - t;
+	        return onet * onet * (onet * p0 + 3 * t * p1)
+	             + t * t * (t * p3 + 3 * onet * p2);
+	    }
+
+	    /**
+	     * 计算三次贝塞尔导数值
+	     * @memberOf module:zrender/core/curve
+	     * @param  {number} p0
+	     * @param  {number} p1
+	     * @param  {number} p2
+	     * @param  {number} p3
+	     * @param  {number} t
+	     * @return {number}
+	     */
+	    function cubicDerivativeAt(p0, p1, p2, p3, t) {
+	        var onet = 1 - t;
+	        return 3 * (
+	            ((p1 - p0) * onet + 2 * (p2 - p1) * t) * onet
+	            + (p3 - p2) * t * t
+	        );
+	    }
+
+	    /**
+	     * 计算三次贝塞尔方程根，使用盛金公式
+	     * @memberOf module:zrender/core/curve
+	     * @param  {number} p0
+	     * @param  {number} p1
+	     * @param  {number} p2
+	     * @param  {number} p3
+	     * @param  {number} val
+	     * @param  {Array.<number>} roots
+	     * @return {number} 有效根数目
+	     */
+	    function cubicRootAt(p0, p1, p2, p3, val, roots) {
+	        // Evaluate roots of cubic functions
+	        var a = p3 + 3 * (p1 - p2) - p0;
+	        var b = 3 * (p2 - p1 * 2 + p0);
+	        var c = 3 * (p1  - p0);
+	        var d = p0 - val;
+
+	        var A = b * b - 3 * a * c;
+	        var B = b * c - 9 * a * d;
+	        var C = c * c - 3 * b * d;
+
+	        var n = 0;
+
+	        if (isAroundZero(A) && isAroundZero(B)) {
+	            if (isAroundZero(b)) {
+	                roots[0] = 0;
+	            }
+	            else {
+	                var t1 = -c / b;  //t1, t2, t3, b is not zero
+	                if (t1 >= 0 && t1 <= 1) {
+	                    roots[n++] = t1;
+	                }
+	            }
+	        }
+	        else {
+	            var disc = B * B - 4 * A * C;
+
+	            if (isAroundZero(disc)) {
+	                var K = B / A;
+	                var t1 = -b / a + K;  // t1, a is not zero
+	                var t2 = -K / 2;  // t2, t3
+	                if (t1 >= 0 && t1 <= 1) {
+	                    roots[n++] = t1;
+	                }
+	                if (t2 >= 0 && t2 <= 1) {
+	                    roots[n++] = t2;
+	                }
+	            }
+	            else if (disc > 0) {
+	                var discSqrt = mathSqrt(disc);
+	                var Y1 = A * b + 1.5 * a * (-B + discSqrt);
+	                var Y2 = A * b + 1.5 * a * (-B - discSqrt);
+	                if (Y1 < 0) {
+	                    Y1 = -mathPow(-Y1, ONE_THIRD);
+	                }
+	                else {
+	                    Y1 = mathPow(Y1, ONE_THIRD);
+	                }
+	                if (Y2 < 0) {
+	                    Y2 = -mathPow(-Y2, ONE_THIRD);
+	                }
+	                else {
+	                    Y2 = mathPow(Y2, ONE_THIRD);
+	                }
+	                var t1 = (-b - (Y1 + Y2)) / (3 * a);
+	                if (t1 >= 0 && t1 <= 1) {
+	                    roots[n++] = t1;
+	                }
+	            }
+	            else {
+	                var T = (2 * A * b - 3 * a * B) / (2 * mathSqrt(A * A * A));
+	                var theta = Math.acos(T) / 3;
+	                var ASqrt = mathSqrt(A);
+	                var tmp = Math.cos(theta);
+
+	                var t1 = (-b - 2 * ASqrt * tmp) / (3 * a);
+	                var t2 = (-b + ASqrt * (tmp + THREE_SQRT * Math.sin(theta))) / (3 * a);
+	                var t3 = (-b + ASqrt * (tmp - THREE_SQRT * Math.sin(theta))) / (3 * a);
+	                if (t1 >= 0 && t1 <= 1) {
+	                    roots[n++] = t1;
+	                }
+	                if (t2 >= 0 && t2 <= 1) {
+	                    roots[n++] = t2;
+	                }
+	                if (t3 >= 0 && t3 <= 1) {
+	                    roots[n++] = t3;
+	                }
+	            }
+	        }
+	        return n;
+	    }
+
+	    /**
+	     * 计算三次贝塞尔方程极限值的位置
+	     * @memberOf module:zrender/core/curve
+	     * @param  {number} p0
+	     * @param  {number} p1
+	     * @param  {number} p2
+	     * @param  {number} p3
+	     * @param  {Array.<number>} extrema
+	     * @return {number} 有效数目
+	     */
+	    function cubicExtrema(p0, p1, p2, p3, extrema) {
+	        var b = 6 * p2 - 12 * p1 + 6 * p0;
+	        var a = 9 * p1 + 3 * p3 - 3 * p0 - 9 * p2;
+	        var c = 3 * p1 - 3 * p0;
+
+	        var n = 0;
+	        if (isAroundZero(a)) {
+	            if (isNotAroundZero(b)) {
+	                var t1 = -c / b;
+	                if (t1 >= 0 && t1 <=1) {
+	                    extrema[n++] = t1;
+	                }
+	            }
+	        }
+	        else {
+	            var disc = b * b - 4 * a * c;
+	            if (isAroundZero(disc)) {
+	                extrema[0] = -b / (2 * a);
+	            }
+	            else if (disc > 0) {
+	                var discSqrt = mathSqrt(disc);
+	                var t1 = (-b + discSqrt) / (2 * a);
+	                var t2 = (-b - discSqrt) / (2 * a);
+	                if (t1 >= 0 && t1 <= 1) {
+	                    extrema[n++] = t1;
+	                }
+	                if (t2 >= 0 && t2 <= 1) {
+	                    extrema[n++] = t2;
+	                }
+	            }
+	        }
+	        return n;
+	    }
+
+	    /**
+	     * 细分三次贝塞尔曲线
+	     * @memberOf module:zrender/core/curve
+	     * @param  {number} p0
+	     * @param  {number} p1
+	     * @param  {number} p2
+	     * @param  {number} p3
+	     * @param  {number} t
+	     * @param  {Array.<number>} out
+	     */
+	    function cubicSubdivide(p0, p1, p2, p3, t, out) {
+	        var p01 = (p1 - p0) * t + p0;
+	        var p12 = (p2 - p1) * t + p1;
+	        var p23 = (p3 - p2) * t + p2;
+
+	        var p012 = (p12 - p01) * t + p01;
+	        var p123 = (p23 - p12) * t + p12;
+
+	        var p0123 = (p123 - p012) * t + p012;
+	        // Seg0
+	        out[0] = p0;
+	        out[1] = p01;
+	        out[2] = p012;
+	        out[3] = p0123;
+	        // Seg1
+	        out[4] = p0123;
+	        out[5] = p123;
+	        out[6] = p23;
+	        out[7] = p3;
+	    }
+
+	    /**
+	     * 投射点到三次贝塞尔曲线上，返回投射距离。
+	     * 投射点有可能会有一个或者多个，这里只返回其中距离最短的一个。
+	     * @param {number} x0
+	     * @param {number} y0
+	     * @param {number} x1
+	     * @param {number} y1
+	     * @param {number} x2
+	     * @param {number} y2
+	     * @param {number} x3
+	     * @param {number} y3
+	     * @param {number} x
+	     * @param {number} y
+	     * @param {Array.<number>} [out] 投射点
+	     * @return {number}
+	     */
+	    function cubicProjectPoint(
+	        x0, y0, x1, y1, x2, y2, x3, y3,
+	        x, y, out
+	    ) {
+	        // http://pomax.github.io/bezierinfo/#projections
+	        var t;
+	        var interval = 0.005;
+	        var d = Infinity;
+	        var prev;
+	        var next;
+	        var d1;
+	        var d2;
+
+	        _v0[0] = x;
+	        _v0[1] = y;
+
+	        // 先粗略估计一下可能的最小距离的 t 值
+	        // PENDING
+	        for (var _t = 0; _t < 1; _t += 0.05) {
+	            _v1[0] = cubicAt(x0, x1, x2, x3, _t);
+	            _v1[1] = cubicAt(y0, y1, y2, y3, _t);
+	            d1 = v2DistSquare(_v0, _v1);
+	            if (d1 < d) {
+	                t = _t;
+	                d = d1;
+	            }
+	        }
+	        d = Infinity;
+
+	        // At most 32 iteration
+	        for (var i = 0; i < 32; i++) {
+	            if (interval < EPSILON_NUMERIC) {
+	                break;
+	            }
+	            prev = t - interval;
+	            next = t + interval;
+	            // t - interval
+	            _v1[0] = cubicAt(x0, x1, x2, x3, prev);
+	            _v1[1] = cubicAt(y0, y1, y2, y3, prev);
+
+	            d1 = v2DistSquare(_v1, _v0);
+
+	            if (prev >= 0 && d1 < d) {
+	                t = prev;
+	                d = d1;
+	            }
+	            else {
+	                // t + interval
+	                _v2[0] = cubicAt(x0, x1, x2, x3, next);
+	                _v2[1] = cubicAt(y0, y1, y2, y3, next);
+	                d2 = v2DistSquare(_v2, _v0);
+
+	                if (next <= 1 && d2 < d) {
+	                    t = next;
+	                    d = d2;
+	                }
+	                else {
+	                    interval *= 0.5;
+	                }
+	            }
+	        }
+	        // t
+	        if (out) {
+	            out[0] = cubicAt(x0, x1, x2, x3, t);
+	            out[1] = cubicAt(y0, y1, y2, y3, t);
+	        }
+	        // console.log(interval, i);
+	        return mathSqrt(d);
+	    }
+
+	    /**
+	     * 计算二次方贝塞尔值
+	     * @param  {number} p0
+	     * @param  {number} p1
+	     * @param  {number} p2
+	     * @param  {number} t
+	     * @return {number}
+	     */
+	    function quadraticAt(p0, p1, p2, t) {
+	        var onet = 1 - t;
+	        return onet * (onet * p0 + 2 * t * p1) + t * t * p2;
+	    }
+
+	    /**
+	     * 计算二次方贝塞尔导数值
+	     * @param  {number} p0
+	     * @param  {number} p1
+	     * @param  {number} p2
+	     * @param  {number} t
+	     * @return {number}
+	     */
+	    function quadraticDerivativeAt(p0, p1, p2, t) {
+	        return 2 * ((1 - t) * (p1 - p0) + t * (p2 - p1));
+	    }
+
+	    /**
+	     * 计算二次方贝塞尔方程根
+	     * @param  {number} p0
+	     * @param  {number} p1
+	     * @param  {number} p2
+	     * @param  {number} t
+	     * @param  {Array.<number>} roots
+	     * @return {number} 有效根数目
+	     */
+	    function quadraticRootAt(p0, p1, p2, val, roots) {
+	        var a = p0 - 2 * p1 + p2;
+	        var b = 2 * (p1 - p0);
+	        var c = p0 - val;
+
+	        var n = 0;
+	        if (isAroundZero(a)) {
+	            if (isNotAroundZero(b)) {
+	                var t1 = -c / b;
+	                if (t1 >= 0 && t1 <= 1) {
+	                    roots[n++] = t1;
+	                }
+	            }
+	        }
+	        else {
+	            var disc = b * b - 4 * a * c;
+	            if (isAroundZero(disc)) {
+	                var t1 = -b / (2 * a);
+	                if (t1 >= 0 && t1 <= 1) {
+	                    roots[n++] = t1;
+	                }
+	            }
+	            else if (disc > 0) {
+	                var discSqrt = mathSqrt(disc);
+	                var t1 = (-b + discSqrt) / (2 * a);
+	                var t2 = (-b - discSqrt) / (2 * a);
+	                if (t1 >= 0 && t1 <= 1) {
+	                    roots[n++] = t1;
+	                }
+	                if (t2 >= 0 && t2 <= 1) {
+	                    roots[n++] = t2;
+	                }
+	            }
+	        }
+	        return n;
+	    }
+
+	    /**
+	     * 计算二次贝塞尔方程极限值
+	     * @memberOf module:zrender/core/curve
+	     * @param  {number} p0
+	     * @param  {number} p1
+	     * @param  {number} p2
+	     * @return {number}
+	     */
+	    function quadraticExtremum(p0, p1, p2) {
+	        var divider = p0 + p2 - 2 * p1;
+	        if (divider === 0) {
+	            // p1 is center of p0 and p2
+	            return 0.5;
+	        }
+	        else {
+	            return (p0 - p1) / divider;
+	        }
+	    }
+
+	    /**
+	     * 细分二次贝塞尔曲线
+	     * @memberOf module:zrender/core/curve
+	     * @param  {number} p0
+	     * @param  {number} p1
+	     * @param  {number} p2
+	     * @param  {number} t
+	     * @param  {Array.<number>} out
+	     */
+	    function quadraticSubdivide(p0, p1, p2, t, out) {
+	        var p01 = (p1 - p0) * t + p0;
+	        var p12 = (p2 - p1) * t + p1;
+	        var p012 = (p12 - p01) * t + p01;
+
+	        // Seg0
+	        out[0] = p0;
+	        out[1] = p01;
+	        out[2] = p012;
+
+	        // Seg1
+	        out[3] = p012;
+	        out[4] = p12;
+	        out[5] = p2;
+	    }
+
+	    /**
+	     * 投射点到二次贝塞尔曲线上，返回投射距离。
+	     * 投射点有可能会有一个或者多个，这里只返回其中距离最短的一个。
+	     * @param {number} x0
+	     * @param {number} y0
+	     * @param {number} x1
+	     * @param {number} y1
+	     * @param {number} x2
+	     * @param {number} y2
+	     * @param {number} x
+	     * @param {number} y
+	     * @param {Array.<number>} out 投射点
+	     * @return {number}
+	     */
+	    function quadraticProjectPoint(
+	        x0, y0, x1, y1, x2, y2,
+	        x, y, out
+	    ) {
+	        // http://pomax.github.io/bezierinfo/#projections
+	        var t;
+	        var interval = 0.005;
+	        var d = Infinity;
+
+	        _v0[0] = x;
+	        _v0[1] = y;
+
+	        // 先粗略估计一下可能的最小距离的 t 值
+	        // PENDING
+	        for (var _t = 0; _t < 1; _t += 0.05) {
+	            _v1[0] = quadraticAt(x0, x1, x2, _t);
+	            _v1[1] = quadraticAt(y0, y1, y2, _t);
+	            var d1 = v2DistSquare(_v0, _v1);
+	            if (d1 < d) {
+	                t = _t;
+	                d = d1;
+	            }
+	        }
+	        d = Infinity;
+
+	        // At most 32 iteration
+	        for (var i = 0; i < 32; i++) {
+	            if (interval < EPSILON_NUMERIC) {
+	                break;
+	            }
+	            var prev = t - interval;
+	            var next = t + interval;
+	            // t - interval
+	            _v1[0] = quadraticAt(x0, x1, x2, prev);
+	            _v1[1] = quadraticAt(y0, y1, y2, prev);
+
+	            var d1 = v2DistSquare(_v1, _v0);
+
+	            if (prev >= 0 && d1 < d) {
+	                t = prev;
+	                d = d1;
+	            }
+	            else {
+	                // t + interval
+	                _v2[0] = quadraticAt(x0, x1, x2, next);
+	                _v2[1] = quadraticAt(y0, y1, y2, next);
+	                var d2 = v2DistSquare(_v2, _v0);
+	                if (next <= 1 && d2 < d) {
+	                    t = next;
+	                    d = d2;
+	                }
+	                else {
+	                    interval *= 0.5;
+	                }
+	            }
+	        }
+	        // t
+	        if (out) {
+	            out[0] = quadraticAt(x0, x1, x2, t);
+	            out[1] = quadraticAt(y0, y1, y2, t);
+	        }
+	        // console.log(interval, i);
+	        return mathSqrt(d);
+	    }
+
+	    module.exports = {
+
+	        cubicAt: cubicAt,
+
+	        cubicDerivativeAt: cubicDerivativeAt,
+
+	        cubicRootAt: cubicRootAt,
+
+	        cubicExtrema: cubicExtrema,
+
+	        cubicSubdivide: cubicSubdivide,
+
+	        cubicProjectPoint: cubicProjectPoint,
+
+	        quadraticAt: quadraticAt,
+
+	        quadraticDerivativeAt: quadraticDerivativeAt,
+
+	        quadraticRootAt: quadraticRootAt,
+
+	        quadraticExtremum: quadraticExtremum,
+
+	        quadraticSubdivide: quadraticSubdivide,
+
+	        quadraticProjectPoint: quadraticProjectPoint
+	    };
+
+
+/***/ },
+/* 51 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @author Yi Shen(https://github.com/pissang)
+	 */
+
+
+	    var vec2 = __webpack_require__(10);
+	    var curve = __webpack_require__(50);
+
+	    var bbox = {};
+	    var mathMin = Math.min;
+	    var mathMax = Math.max;
+	    var mathSin = Math.sin;
+	    var mathCos = Math.cos;
+
+	    var start = vec2.create();
+	    var end = vec2.create();
+	    var extremity = vec2.create();
+
+	    var PI2 = Math.PI * 2;
+	    /**
+	     * 从顶点数组中计算出最小包围盒，写入`min`和`max`中
+	     * @module zrender/core/bbox
+	     * @param {Array<Object>} points 顶点数组
+	     * @param {number} min
+	     * @param {number} max
+	     */
+	    bbox.fromPoints = function(points, min, max) {
+	        if (points.length === 0) {
+	            return;
+	        }
+	        var p = points[0];
+	        var left = p[0];
+	        var right = p[0];
+	        var top = p[1];
+	        var bottom = p[1];
+	        var i;
+
+	        for (i = 1; i < points.length; i++) {
+	            p = points[i];
+	            left = mathMin(left, p[0]);
+	            right = mathMax(right, p[0]);
+	            top = mathMin(top, p[1]);
+	            bottom = mathMax(bottom, p[1]);
+	        }
+
+	        min[0] = left;
+	        min[1] = top;
+	        max[0] = right;
+	        max[1] = bottom;
+	    };
+
+	    /**
+	     * @memberOf module:zrender/core/bbox
+	     * @param {number} x0
+	     * @param {number} y0
+	     * @param {number} x1
+	     * @param {number} y1
+	     * @param {Array.<number>} min
+	     * @param {Array.<number>} max
+	     */
+	    bbox.fromLine = function (x0, y0, x1, y1, min, max) {
+	        min[0] = mathMin(x0, x1);
+	        min[1] = mathMin(y0, y1);
+	        max[0] = mathMax(x0, x1);
+	        max[1] = mathMax(y0, y1);
+	    };
+
+	    var xDim = [];
+	    var yDim = [];
+	    /**
+	     * 从三阶贝塞尔曲线(p0, p1, p2, p3)中计算出最小包围盒，写入`min`和`max`中
+	     * @memberOf module:zrender/core/bbox
+	     * @param {number} x0
+	     * @param {number} y0
+	     * @param {number} x1
+	     * @param {number} y1
+	     * @param {number} x2
+	     * @param {number} y2
+	     * @param {number} x3
+	     * @param {number} y3
+	     * @param {Array.<number>} min
+	     * @param {Array.<number>} max
+	     */
+	    bbox.fromCubic = function(
+	        x0, y0, x1, y1, x2, y2, x3, y3, min, max
+	    ) {
+	        var cubicExtrema = curve.cubicExtrema;
+	        var cubicAt = curve.cubicAt;
+	        var i;
+	        var n = cubicExtrema(x0, x1, x2, x3, xDim);
+	        min[0] = Infinity;
+	        min[1] = Infinity;
+	        max[0] = -Infinity;
+	        max[1] = -Infinity;
+
+	        for (i = 0; i < n; i++) {
+	            var x = cubicAt(x0, x1, x2, x3, xDim[i]);
+	            min[0] = mathMin(x, min[0]);
+	            max[0] = mathMax(x, max[0]);
+	        }
+	        n = cubicExtrema(y0, y1, y2, y3, yDim);
+	        for (i = 0; i < n; i++) {
+	            var y = cubicAt(y0, y1, y2, y3, yDim[i]);
+	            min[1] = mathMin(y, min[1]);
+	            max[1] = mathMax(y, max[1]);
+	        }
+
+	        min[0] = mathMin(x0, min[0]);
+	        max[0] = mathMax(x0, max[0]);
+	        min[0] = mathMin(x3, min[0]);
+	        max[0] = mathMax(x3, max[0]);
+
+	        min[1] = mathMin(y0, min[1]);
+	        max[1] = mathMax(y0, max[1]);
+	        min[1] = mathMin(y3, min[1]);
+	        max[1] = mathMax(y3, max[1]);
+	    };
+
+	    /**
+	     * 从二阶贝塞尔曲线(p0, p1, p2)中计算出最小包围盒，写入`min`和`max`中
+	     * @memberOf module:zrender/core/bbox
+	     * @param {number} x0
+	     * @param {number} y0
+	     * @param {number} x1
+	     * @param {number} y1
+	     * @param {number} x2
+	     * @param {number} y2
+	     * @param {Array.<number>} min
+	     * @param {Array.<number>} max
+	     */
+	    bbox.fromQuadratic = function(x0, y0, x1, y1, x2, y2, min, max) {
+	        var quadraticExtremum = curve.quadraticExtremum;
+	        var quadraticAt = curve.quadraticAt;
+	        // Find extremities, where derivative in x dim or y dim is zero
+	        var tx =
+	            mathMax(
+	                mathMin(quadraticExtremum(x0, x1, x2), 1), 0
+	            );
+	        var ty =
+	            mathMax(
+	                mathMin(quadraticExtremum(y0, y1, y2), 1), 0
+	            );
+
+	        var x = quadraticAt(x0, x1, x2, tx);
+	        var y = quadraticAt(y0, y1, y2, ty);
+
+	        min[0] = mathMin(x0, x2, x);
+	        min[1] = mathMin(y0, y2, y);
+	        max[0] = mathMax(x0, x2, x);
+	        max[1] = mathMax(y0, y2, y);
+	    };
+
+	    /**
+	     * 从圆弧中计算出最小包围盒，写入`min`和`max`中
+	     * @method
+	     * @memberOf module:zrender/core/bbox
+	     * @param {number} x
+	     * @param {number} y
+	     * @param {number} rx
+	     * @param {number} ry
+	     * @param {number} startAngle
+	     * @param {number} endAngle
+	     * @param {number} anticlockwise
+	     * @param {Array.<number>} min
+	     * @param {Array.<number>} max
+	     */
+	    bbox.fromArc = function (
+	        x, y, rx, ry, startAngle, endAngle, anticlockwise, min, max
+	    ) {
+	        var vec2Min = vec2.min;
+	        var vec2Max = vec2.max;
+
+	        var diff = Math.abs(startAngle - endAngle);
+
+
+	        if (diff % PI2 < 1e-4 && diff > 1e-4) {
+	            // Is a circle
+	            min[0] = x - rx;
+	            min[1] = y - ry;
+	            max[0] = x + rx;
+	            max[1] = y + ry;
+	            return;
+	        }
+
+	        start[0] = mathCos(startAngle) * rx + x;
+	        start[1] = mathSin(startAngle) * ry + y;
+
+	        end[0] = mathCos(endAngle) * rx + x;
+	        end[1] = mathSin(endAngle) * ry + y;
+
+	        vec2Min(min, start, end);
+	        vec2Max(max, start, end);
+
+	        // Thresh to [0, Math.PI * 2]
+	        startAngle = startAngle % (PI2);
+	        if (startAngle < 0) {
+	            startAngle = startAngle + PI2;
+	        }
+	        endAngle = endAngle % (PI2);
+	        if (endAngle < 0) {
+	            endAngle = endAngle + PI2;
+	        }
+
+	        if (startAngle > endAngle && !anticlockwise) {
+	            endAngle += PI2;
+	        }
+	        else if (startAngle < endAngle && anticlockwise) {
+	            startAngle += PI2;
+	        }
+	        if (anticlockwise) {
+	            var tmp = endAngle;
+	            endAngle = startAngle;
+	            startAngle = tmp;
+	        }
+
+	        // var number = 0;
+	        // var step = (anticlockwise ? -Math.PI : Math.PI) / 2;
+	        for (var angle = 0; angle < endAngle; angle += Math.PI / 2) {
+	            if (angle > startAngle) {
+	                extremity[0] = mathCos(angle) * rx + x;
+	                extremity[1] = mathSin(angle) * ry + y;
+
+	                vec2Min(min, extremity, min);
+	                vec2Max(max, extremity, max);
+	            }
+	        }
+	    };
+
+	    module.exports = bbox;
+
+
+
+/***/ },
+/* 52 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var CMD = __webpack_require__(49).CMD;
+	    var line = __webpack_require__(53);
+	    var cubic = __webpack_require__(54);
+	    var quadratic = __webpack_require__(55);
+	    var arc = __webpack_require__(56);
+	    var normalizeRadian = __webpack_require__(57).normalizeRadian;
+	    var curve = __webpack_require__(50);
+
+	    var windingLine = __webpack_require__(58);
+
+	    var containStroke = line.containStroke;
+
+	    var PI2 = Math.PI * 2;
+
+	    var EPSILON = 1e-4;
+
+	    function isAroundEqual(a, b) {
+	        return Math.abs(a - b) < EPSILON;
+	    }
+
+	    // 临时数组
+	    var roots = [-1, -1, -1];
+	    var extrema = [-1, -1];
+
+	    function swapExtrema() {
+	        var tmp = extrema[0];
+	        extrema[0] = extrema[1];
+	        extrema[1] = tmp;
+	    }
+
+	    function windingCubic(x0, y0, x1, y1, x2, y2, x3, y3, x, y) {
+	        // Quick reject
+	        if (
+	            (y > y0 && y > y1 && y > y2 && y > y3)
+	            || (y < y0 && y < y1 && y < y2 && y < y3)
+	        ) {
+	            return 0;
+	        }
+	        var nRoots = curve.cubicRootAt(y0, y1, y2, y3, y, roots);
+	        if (nRoots === 0) {
+	            return 0;
+	        }
+	        else {
+	            var w = 0;
+	            var nExtrema = -1;
+	            var y0_, y1_;
+	            for (var i = 0; i < nRoots; i++) {
+	                var t = roots[i];
+
+	                // Avoid winding error when intersection point is the connect point of two line of polygon
+	                var unit = (t === 0 || t === 1) ? 0.5 : 1;
+
+	                var x_ = curve.cubicAt(x0, x1, x2, x3, t);
+	                if (x_ < x) { // Quick reject
+	                    continue;
+	                }
+	                if (nExtrema < 0) {
+	                    nExtrema = curve.cubicExtrema(y0, y1, y2, y3, extrema);
+	                    if (extrema[1] < extrema[0] && nExtrema > 1) {
+	                        swapExtrema();
+	                    }
+	                    y0_ = curve.cubicAt(y0, y1, y2, y3, extrema[0]);
+	                    if (nExtrema > 1) {
+	                        y1_ = curve.cubicAt(y0, y1, y2, y3, extrema[1]);
+	                    }
+	                }
+	                if (nExtrema == 2) {
+	                    // 分成三段单调函数
+	                    if (t < extrema[0]) {
+	                        w += y0_ < y0 ? unit : -unit;
+	                    }
+	                    else if (t < extrema[1]) {
+	                        w += y1_ < y0_ ? unit : -unit;
+	                    }
+	                    else {
+	                        w += y3 < y1_ ? unit : -unit;
+	                    }
+	                }
+	                else {
+	                    // 分成两段单调函数
+	                    if (t < extrema[0]) {
+	                        w += y0_ < y0 ? unit : -unit;
+	                    }
+	                    else {
+	                        w += y3 < y0_ ? unit : -unit;
+	                    }
+	                }
+	            }
+	            return w;
+	        }
+	    }
+
+	    function windingQuadratic(x0, y0, x1, y1, x2, y2, x, y) {
+	        // Quick reject
+	        if (
+	            (y > y0 && y > y1 && y > y2)
+	            || (y < y0 && y < y1 && y < y2)
+	        ) {
+	            return 0;
+	        }
+	        var nRoots = curve.quadraticRootAt(y0, y1, y2, y, roots);
+	        if (nRoots === 0) {
+	            return 0;
+	        }
+	        else {
+	            var t = curve.quadraticExtremum(y0, y1, y2);
+	            if (t >= 0 && t <= 1) {
+	                var w = 0;
+	                var y_ = curve.quadraticAt(y0, y1, y2, t);
+	                for (var i = 0; i < nRoots; i++) {
+	                    // Remove one endpoint.
+	                    var unit = (roots[i] === 0 || roots[i] === 1) ? 0.5 : 1;
+
+	                    var x_ = curve.quadraticAt(x0, x1, x2, roots[i]);
+	                    if (x_ < x) {   // Quick reject
+	                        continue;
+	                    }
+	                    if (roots[i] < t) {
+	                        w += y_ < y0 ? unit : -unit;
+	                    }
+	                    else {
+	                        w += y2 < y_ ? unit : -unit;
+	                    }
+	                }
+	                return w;
+	            }
+	            else {
+	                // Remove one endpoint.
+	                var unit = (roots[0] === 0 || roots[0] === 1) ? 0.5 : 1;
+
+	                var x_ = curve.quadraticAt(x0, x1, x2, roots[0]);
+	                if (x_ < x) {   // Quick reject
+	                    return 0;
+	                }
+	                return y2 < y0 ? unit : -unit;
+	            }
+	        }
+	    }
+
+	    // TODO
+	    // Arc 旋转
+	    function windingArc(
+	        cx, cy, r, startAngle, endAngle, anticlockwise, x, y
+	    ) {
+	        y -= cy;
+	        if (y > r || y < -r) {
+	            return 0;
+	        }
+	        var tmp = Math.sqrt(r * r - y * y);
+	        roots[0] = -tmp;
+	        roots[1] = tmp;
+
+	        var diff = Math.abs(startAngle - endAngle);
+	        if (diff < 1e-4) {
+	            return 0;
+	        }
+	        if (diff % PI2 < 1e-4) {
+	            // Is a circle
+	            startAngle = 0;
+	            endAngle = PI2;
+	            var dir = anticlockwise ? 1 : -1;
+	            if (x >= roots[0] + cx && x <= roots[1] + cx) {
+	                return dir;
+	            } else {
+	                return 0;
+	            }
+	        }
+
+	        if (anticlockwise) {
+	            var tmp = startAngle;
+	            startAngle = normalizeRadian(endAngle);
+	            endAngle = normalizeRadian(tmp);
+	        }
+	        else {
+	            startAngle = normalizeRadian(startAngle);
+	            endAngle = normalizeRadian(endAngle);
+	        }
+	        if (startAngle > endAngle) {
+	            endAngle += PI2;
+	        }
+
+	        var w = 0;
+	        for (var i = 0; i < 2; i++) {
+	            var x_ = roots[i];
+	            if (x_ + cx > x) {
+	                var angle = Math.atan2(y, x_);
+	                var dir = anticlockwise ? 1 : -1;
+	                if (angle < 0) {
+	                    angle = PI2 + angle;
+	                }
+	                if (
+	                    (angle >= startAngle && angle <= endAngle)
+	                    || (angle + PI2 >= startAngle && angle + PI2 <= endAngle)
+	                ) {
+	                    if (angle > Math.PI / 2 && angle < Math.PI * 1.5) {
+	                        dir = -dir;
+	                    }
+	                    w += dir;
+	                }
+	            }
+	        }
+	        return w;
+	    }
+
+	    function containPath(data, lineWidth, isStroke, x, y) {
+	        var w = 0;
+	        var xi = 0;
+	        var yi = 0;
+	        var x0 = 0;
+	        var y0 = 0;
+
+	        for (var i = 0; i < data.length;) {
+	            var cmd = data[i++];
+	            // Begin a new subpath
+	            if (cmd === CMD.M && i > 1) {
+	                // Close previous subpath
+	                if (!isStroke) {
+	                    w += windingLine(xi, yi, x0, y0, x, y);
+	                }
+	                // 如果被任何一个 subpath 包含
+	                // if (w !== 0) {
+	                //     return true;
+	                // }
+	            }
+
+	            if (i == 1) {
+	                // 如果第一个命令是 L, C, Q
+	                // 则 previous point 同绘制命令的第一个 point
+	                //
+	                // 第一个命令为 Arc 的情况下会在后面特殊处理
+	                xi = data[i];
+	                yi = data[i + 1];
+
+	                x0 = xi;
+	                y0 = yi;
+	            }
+
+	            switch (cmd) {
+	                case CMD.M:
+	                    // moveTo 命令重新创建一个新的 subpath, 并且更新新的起点
+	                    // 在 closePath 的时候使用
+	                    x0 = data[i++];
+	                    y0 = data[i++];
+	                    xi = x0;
+	                    yi = y0;
+	                    break;
+	                case CMD.L:
+	                    if (isStroke) {
+	                        if (containStroke(xi, yi, data[i], data[i + 1], lineWidth, x, y)) {
+	                            return true;
+	                        }
+	                    }
+	                    else {
+	                        // NOTE 在第一个命令为 L, C, Q 的时候会计算出 NaN
+	                        w += windingLine(xi, yi, data[i], data[i + 1], x, y) || 0;
+	                    }
+	                    xi = data[i++];
+	                    yi = data[i++];
+	                    break;
+	                case CMD.C:
+	                    if (isStroke) {
+	                        if (cubic.containStroke(xi, yi,
+	                            data[i++], data[i++], data[i++], data[i++], data[i], data[i + 1],
+	                            lineWidth, x, y
+	                        )) {
+	                            return true;
+	                        }
+	                    }
+	                    else {
+	                        w += windingCubic(
+	                            xi, yi,
+	                            data[i++], data[i++], data[i++], data[i++], data[i], data[i + 1],
+	                            x, y
+	                        ) || 0;
+	                    }
+	                    xi = data[i++];
+	                    yi = data[i++];
+	                    break;
+	                case CMD.Q:
+	                    if (isStroke) {
+	                        if (quadratic.containStroke(xi, yi,
+	                            data[i++], data[i++], data[i], data[i + 1],
+	                            lineWidth, x, y
+	                        )) {
+	                            return true;
+	                        }
+	                    }
+	                    else {
+	                        w += windingQuadratic(
+	                            xi, yi,
+	                            data[i++], data[i++], data[i], data[i + 1],
+	                            x, y
+	                        ) || 0;
+	                    }
+	                    xi = data[i++];
+	                    yi = data[i++];
+	                    break;
+	                case CMD.A:
+	                    // TODO Arc 判断的开销比较大
+	                    var cx = data[i++];
+	                    var cy = data[i++];
+	                    var rx = data[i++];
+	                    var ry = data[i++];
+	                    var theta = data[i++];
+	                    var dTheta = data[i++];
+	                    // TODO Arc 旋转
+	                    var psi = data[i++];
+	                    var anticlockwise = 1 - data[i++];
+	                    var x1 = Math.cos(theta) * rx + cx;
+	                    var y1 = Math.sin(theta) * ry + cy;
+	                    // 不是直接使用 arc 命令
+	                    if (i > 1) {
+	                        w += windingLine(xi, yi, x1, y1, x, y);
+	                    }
+	                    else {
+	                        // 第一个命令起点还未定义
+	                        x0 = x1;
+	                        y0 = y1;
+	                    }
+	                    // zr 使用scale来模拟椭圆, 这里也对x做一定的缩放
+	                    var _x = (x - cx) * ry / rx + cx;
+	                    if (isStroke) {
+	                        if (arc.containStroke(
+	                            cx, cy, ry, theta, theta + dTheta, anticlockwise,
+	                            lineWidth, _x, y
+	                        )) {
+	                            return true;
+	                        }
+	                    }
+	                    else {
+	                        w += windingArc(
+	                            cx, cy, ry, theta, theta + dTheta, anticlockwise,
+	                            _x, y
+	                        );
+	                    }
+	                    xi = Math.cos(theta + dTheta) * rx + cx;
+	                    yi = Math.sin(theta + dTheta) * ry + cy;
+	                    break;
+	                case CMD.R:
+	                    x0 = xi = data[i++];
+	                    y0 = yi = data[i++];
+	                    var width = data[i++];
+	                    var height = data[i++];
+	                    var x1 = x0 + width;
+	                    var y1 = y0 + height;
+	                    if (isStroke) {
+	                        if (containStroke(x0, y0, x1, y0, lineWidth, x, y)
+	                          || containStroke(x1, y0, x1, y1, lineWidth, x, y)
+	                          || containStroke(x1, y1, x0, y1, lineWidth, x, y)
+	                          || containStroke(x0, y1, x0, y0, lineWidth, x, y)
+	                        ) {
+	                            return true;
+	                        }
+	                    }
+	                    else {
+	                        // FIXME Clockwise ?
+	                        w += windingLine(x1, y0, x1, y1, x, y);
+	                        w += windingLine(x0, y1, x0, y0, x, y);
+	                    }
+	                    break;
+	                case CMD.Z:
+	                    if (isStroke) {
+	                        if (containStroke(
+	                            xi, yi, x0, y0, lineWidth, x, y
+	                        )) {
+	                            return true;
+	                        }
+	                    }
+	                    else {
+	                        // Close a subpath
+	                        w += windingLine(xi, yi, x0, y0, x, y);
+	                        // 如果被任何一个 subpath 包含
+	                        // FIXME subpaths may overlap
+	                        // if (w !== 0) {
+	                        //     return true;
+	                        // }
+	                    }
+	                    xi = x0;
+	                    yi = y0;
+	                    break;
+	            }
+	        }
+	        if (!isStroke && !isAroundEqual(yi, y0)) {
+	            w += windingLine(xi, yi, x0, y0, x, y) || 0;
+	        }
+	        return w !== 0;
+	    }
+
+	    module.exports = {
+	        contain: function (pathData, x, y) {
+	            return containPath(pathData, 0, false, x, y);
+	        },
+
+	        containStroke: function (pathData, lineWidth, x, y) {
+	            return containPath(pathData, lineWidth, true, x, y);
+	        }
+	    };
+
+
+/***/ },
+/* 53 */
+/***/ function(module, exports) {
+
+	
+	    module.exports = {
+	        /**
+	         * 线段包含判断
+	         * @param  {number}  x0
+	         * @param  {number}  y0
+	         * @param  {number}  x1
+	         * @param  {number}  y1
+	         * @param  {number}  lineWidth
+	         * @param  {number}  x
+	         * @param  {number}  y
+	         * @return {boolean}
+	         */
+	        containStroke: function (x0, y0, x1, y1, lineWidth, x, y) {
+	            if (lineWidth === 0) {
+	                return false;
+	            }
+	            var _l = lineWidth;
+	            var _a = 0;
+	            var _b = x0;
+	            // Quick reject
+	            if (
+	                (y > y0 + _l && y > y1 + _l)
+	                || (y < y0 - _l && y < y1 - _l)
+	                || (x > x0 + _l && x > x1 + _l)
+	                || (x < x0 - _l && x < x1 - _l)
+	            ) {
+	                return false;
+	            }
+
+	            if (x0 !== x1) {
+	                _a = (y0 - y1) / (x0 - x1);
+	                _b = (x0 * y1 - x1 * y0) / (x0 - x1) ;
+	            }
+	            else {
+	                return Math.abs(x - x0) <= _l / 2;
+	            }
+	            var tmp = _a * x - y + _b;
+	            var _s = tmp * tmp / (_a * _a + 1);
+	            return _s <= _l / 2 * _l / 2;
+	        }
+	    };
+
+
+/***/ },
+/* 54 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var curve = __webpack_require__(50);
+
+	    module.exports = {
+	        /**
+	         * 三次贝塞尔曲线描边包含判断
+	         * @param  {number}  x0
+	         * @param  {number}  y0
+	         * @param  {number}  x1
+	         * @param  {number}  y1
+	         * @param  {number}  x2
+	         * @param  {number}  y2
+	         * @param  {number}  x3
+	         * @param  {number}  y3
+	         * @param  {number}  lineWidth
+	         * @param  {number}  x
+	         * @param  {number}  y
+	         * @return {boolean}
+	         */
+	        containStroke: function(x0, y0, x1, y1, x2, y2, x3, y3, lineWidth, x, y) {
+	            if (lineWidth === 0) {
+	                return false;
+	            }
+	            var _l = lineWidth;
+	            // Quick reject
+	            if (
+	                (y > y0 + _l && y > y1 + _l && y > y2 + _l && y > y3 + _l)
+	                || (y < y0 - _l && y < y1 - _l && y < y2 - _l && y < y3 - _l)
+	                || (x > x0 + _l && x > x1 + _l && x > x2 + _l && x > x3 + _l)
+	                || (x < x0 - _l && x < x1 - _l && x < x2 - _l && x < x3 - _l)
+	            ) {
+	                return false;
+	            }
+	            var d = curve.cubicProjectPoint(
+	                x0, y0, x1, y1, x2, y2, x3, y3,
+	                x, y, null
+	            );
+	            return d <= _l / 2;
+	        }
+	    };
+
+
+/***/ },
+/* 55 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var curve = __webpack_require__(50);
+
+	    module.exports = {
+	        /**
+	         * 二次贝塞尔曲线描边包含判断
+	         * @param  {number}  x0
+	         * @param  {number}  y0
+	         * @param  {number}  x1
+	         * @param  {number}  y1
+	         * @param  {number}  x2
+	         * @param  {number}  y2
+	         * @param  {number}  lineWidth
+	         * @param  {number}  x
+	         * @param  {number}  y
+	         * @return {boolean}
+	         */
+	        containStroke: function (x0, y0, x1, y1, x2, y2, lineWidth, x, y) {
+	            if (lineWidth === 0) {
+	                return false;
+	            }
+	            var _l = lineWidth;
+	            // Quick reject
+	            if (
+	                (y > y0 + _l && y > y1 + _l && y > y2 + _l)
+	                || (y < y0 - _l && y < y1 - _l && y < y2 - _l)
+	                || (x > x0 + _l && x > x1 + _l && x > x2 + _l)
+	                || (x < x0 - _l && x < x1 - _l && x < x2 - _l)
+	            ) {
+	                return false;
+	            }
+	            var d = curve.quadraticProjectPoint(
+	                x0, y0, x1, y1, x2, y2,
+	                x, y, null
+	            );
+	            return d <= _l / 2;
+	        }
+	    };
+
+
+/***/ },
+/* 56 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var normalizeRadian = __webpack_require__(57).normalizeRadian;
+	    var PI2 = Math.PI * 2;
+
+	    module.exports = {
+	        /**
+	         * 圆弧描边包含判断
+	         * @param  {number}  cx
+	         * @param  {number}  cy
+	         * @param  {number}  r
+	         * @param  {number}  startAngle
+	         * @param  {number}  endAngle
+	         * @param  {boolean}  anticlockwise
+	         * @param  {number} lineWidth
+	         * @param  {number}  x
+	         * @param  {number}  y
+	         * @return {Boolean}
+	         */
+	        containStroke: function (
+	            cx, cy, r, startAngle, endAngle, anticlockwise,
+	            lineWidth, x, y
+	        ) {
+
+	            if (lineWidth === 0) {
+	                return false;
+	            }
+	            var _l = lineWidth;
+
+	            x -= cx;
+	            y -= cy;
+	            var d = Math.sqrt(x * x + y * y);
+
+	            if ((d - _l > r) || (d + _l < r)) {
+	                return false;
+	            }
+	            if (Math.abs(startAngle - endAngle) % PI2 < 1e-4) {
+	                // Is a circle
+	                return true;
+	            }
+	            if (anticlockwise) {
+	                var tmp = startAngle;
+	                startAngle = normalizeRadian(endAngle);
+	                endAngle = normalizeRadian(tmp);
+	            } else {
+	                startAngle = normalizeRadian(startAngle);
+	                endAngle = normalizeRadian(endAngle);
+	            }
+	            if (startAngle > endAngle) {
+	                endAngle += PI2;
+	            }
+
+	            var angle = Math.atan2(y, x);
+	            if (angle < 0) {
+	                angle += PI2;
+	            }
+	            return (angle >= startAngle && angle <= endAngle)
+	                || (angle + PI2 >= startAngle && angle + PI2 <= endAngle);
+	        }
+	    };
+
+
+/***/ },
+/* 57 */
+/***/ function(module, exports) {
+
+	
+
+	    var PI2 = Math.PI * 2;
+	    module.exports = {
+	        normalizeRadian: function(angle) {
+	            angle %= PI2;
+	            if (angle < 0) {
+	                angle += PI2;
+	            }
+	            return angle;
+	        }
+	    };
+
+
+/***/ },
+/* 58 */
+/***/ function(module, exports) {
+
+	
+	    module.exports = function windingLine(x0, y0, x1, y1, x, y) {
+	        if ((y > y0 && y > y1) || (y < y0 && y < y1)) {
+	            return 0;
+	        }
+	        // Ignore horizontal line
+	        if (y1 === y0) {
+	            return 0;
+	        }
+	        var dir = y1 < y0 ? 1 : -1;
+	        var t = (y - y0) / (y1 - y0);
+
+	        // Avoid winding error when intersection point is the connect point of two line of polygon
+	        if (t === 1 || t === 0) {
+	            dir = y1 < y0 ? 0.5 : -0.5;
+	        }
+
+	        var x_ = t * (x1 - x0) + x0;
+
+	        return x_ > x ? dir : 0;
+	    };
+
+
+/***/ },
+/* 59 */
+/***/ function(module, exports) {
+
+	
+
+	    var Pattern = function (image, repeat) {
+	        this.image = image;
+	        this.repeat = repeat;
+
+	        // Can be cloned
+	        this.type = 'pattern';
+	    };
+
+	    Pattern.prototype.getCanvasPattern = function (ctx) {
+
+	        return this._canvasPattern
+	            || (this._canvasPattern = ctx.createPattern(this.image, this.repeat));
+	    };
+
+	    module.exports = Pattern;
+
+
+/***/ },
+/* 60 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var CMD = __webpack_require__(49).CMD;
+	    var vec2 = __webpack_require__(10);
+	    var v2ApplyTransform = vec2.applyTransform;
+
+	    var points = [[], [], []];
+	    var mathSqrt = Math.sqrt;
+	    var mathAtan2 = Math.atan2;
+	    function transformPath(path, m) {
+	        var data = path.data;
+	        var cmd;
+	        var nPoint;
+	        var i;
+	        var j;
+	        var k;
+	        var p;
+
+	        var M = CMD.M;
+	        var C = CMD.C;
+	        var L = CMD.L;
+	        var R = CMD.R;
+	        var A = CMD.A;
+	        var Q = CMD.Q;
+
+	        for (i = 0, j = 0; i < data.length;) {
+	            cmd = data[i++];
+	            j = i;
+	            nPoint = 0;
+
+	            switch (cmd) {
+	                case M:
+	                    nPoint = 1;
+	                    break;
+	                case L:
+	                    nPoint = 1;
+	                    break;
+	                case C:
+	                    nPoint = 3;
+	                    break;
+	                case Q:
+	                    nPoint = 2;
+	                    break;
+	                case A:
+	                    var x = m[4];
+	                    var y = m[5];
+	                    var sx = mathSqrt(m[0] * m[0] + m[1] * m[1]);
+	                    var sy = mathSqrt(m[2] * m[2] + m[3] * m[3]);
+	                    var angle = mathAtan2(-m[1] / sy, m[0] / sx);
+	                    // cx
+	                    data[i++] += x;
+	                    // cy
+	                    data[i++] += y;
+	                    // Scale rx and ry
+	                    // FIXME Assume psi is 0 here
+	                    data[i++] *= sx;
+	                    data[i++] *= sy;
+
+	                    // Start angle
+	                    data[i++] += angle;
+	                    // end angle
+	                    data[i++] += angle;
+	                    // FIXME psi
+	                    i += 2;
+	                    j = i;
+	                    break;
+	                case R:
+	                    // x0, y0
+	                    p[0] = data[i++];
+	                    p[1] = data[i++];
+	                    v2ApplyTransform(p, p, m);
+	                    data[j++] = p[0];
+	                    data[j++] = p[1];
+	                    // x1, y1
+	                    p[0] += data[i++];
+	                    p[1] += data[i++];
+	                    v2ApplyTransform(p, p, m);
+	                    data[j++] = p[0];
+	                    data[j++] = p[1];
+	            }
+
+	            for (k = 0; k < nPoint; k++) {
+	                var p = points[k];
+	                p[0] = data[i++];
+	                p[1] = data[i++];
+
+	                v2ApplyTransform(p, p, m);
+	                // Write back
+	                data[j++] = p[0];
+	                data[j++] = p[1];
+	            }
+	        }
+	    }
+
+	    module.exports = transformPath;
+
+
+/***/ },
+/* 61 */
+/***/ function(module, exports) {
+
+	
+
+	    /**
+	     * @param {Array.<Object>} colorStops
+	     */
+	    var Gradient = function (colorStops) {
+
+	        this.colorStops = colorStops || [];
+	    };
+
+	    Gradient.prototype = {
+
+	        constructor: Gradient,
+
+	        addColorStop: function (offset, color) {
+	            this.colorStops.push({
+
+	                offset: offset,
+
+	                color: color
+	            });
+	        }
+	    };
+
+	    module.exports = Gradient;
+
+
+/***/ },
+/* 62 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * Image element
+	 * @module zrender/graphic/Image
+	 */
+
+
+
+	    var Displayable = __webpack_require__(46);
+	    var BoundingRect = __webpack_require__(9);
+	    var zrUtil = __webpack_require__(4);
+
+	    var LRU = __webpack_require__(63);
+	    var globalImageCache = new LRU(50);
+	    /**
+	     * @alias zrender/graphic/Image
+	     * @extends module:zrender/graphic/Displayable
+	     * @constructor
+	     * @param {Object} opts
+	     */
+	    function ZImage(opts) {
+	        Displayable.call(this, opts);
+	    }
+
+	    ZImage.prototype = {
+
+	        constructor: ZImage,
+
+	        type: 'image',
+
+	        brush: function (ctx, prevEl) {
+	            var style = this.style;
+	            var src = style.image;
+	            var image;
+
+	            // Must bind each time
+	            style.bind(ctx, this, prevEl);
+
+	            // style.image is a url string
+	            if (typeof src === 'string') {
+	                image = this._image;
+	            }
+	            // style.image is an HTMLImageElement or HTMLCanvasElement or Canvas
+	            else {
+	                image = src;
+	            }
+	            // FIXME Case create many images with src
+	            if (!image && src) {
+	                // Try get from global image cache
+	                var cachedImgObj = globalImageCache.get(src);
+	                if (!cachedImgObj) {
+	                    // Create a new image
+	                    image = new Image();
+	                    image.onload = function () {
+	                        image.onload = null;
+	                        for (var i = 0; i < cachedImgObj.pending.length; i++) {
+	                            cachedImgObj.pending[i].dirty();
+	                        }
+	                    };
+	                    cachedImgObj = {
+	                        image: image,
+	                        pending: [this]
+	                    };
+	                    image.src = src;
+	                    globalImageCache.put(src, cachedImgObj);
+	                    this._image = image;
+	                    return;
+	                }
+	                else {
+	                    image = cachedImgObj.image;
+	                    this._image = image;
+	                    // Image is not complete finish, add to pending list
+	                    if (!image.width || !image.height) {
+	                        cachedImgObj.pending.push(this);
+	                        return;
+	                    }
+	                }
+	            }
+
+	            if (image) {
+	                // 图片已经加载完成
+	                // if (image.nodeName.toUpperCase() == 'IMG') {
+	                //     if (!image.complete) {
+	                //         return;
+	                //     }
+	                // }
+	                // Else is canvas
+
+	                var width = style.width || image.width;
+	                var height = style.height || image.height;
+	                var x = style.x || 0;
+	                var y = style.y || 0;
+	                // 图片加载失败
+	                if (!image.width || !image.height) {
+	                    return;
+	                }
+
+	                // 设置transform
+	                this.setTransform(ctx);
+
+
+	                if (style.sWidth && style.sHeight) {
+	                    var sx = style.sx || 0;
+	                    var sy = style.sy || 0;
+	                    ctx.drawImage(
+	                        image,
+	                        sx, sy, style.sWidth, style.sHeight,
+	                        x, y, width, height
+	                    );
+	                }
+	                else if (style.sx && style.sy) {
+	                    var sx = style.sx;
+	                    var sy = style.sy;
+	                    var sWidth = width - sx;
+	                    var sHeight = height - sy;
+	                    ctx.drawImage(
+	                        image,
+	                        sx, sy, sWidth, sHeight,
+	                        x, y, width, height
+	                    );
+	                }
+	                else {
+	                    ctx.drawImage(image, x, y, width, height);
+	                }
+
+	                // 如果没设置宽和高的话自动根据图片宽高设置
+	                if (style.width == null) {
+	                    style.width = width;
+	                }
+	                if (style.height == null) {
+	                    style.height = height;
+	                }
+
+	                this.restoreTransform(ctx);
+
+	                // Draw rect text
+	                if (style.text != null) {
+	                    this.drawRectText(ctx, this.getBoundingRect());
+	                }
+
+	            }
+	        },
+
+	        getBoundingRect: function () {
+	            var style = this.style;
+	            if (! this._rect) {
+	                this._rect = new BoundingRect(
+	                    style.x || 0, style.y || 0, style.width || 0, style.height || 0
+	                );
+	            }
+	            return this._rect;
+	        }
+	    };
+
+	    zrUtil.inherits(ZImage, Displayable);
+
+	    module.exports = ZImage;
+
+
+/***/ },
+/* 63 */
+/***/ function(module, exports) {
+
+	// Simple LRU cache use doubly linked list
+	// @module zrender/core/LRU
+
+
+	    /**
+	     * Simple double linked list. Compared with array, it has O(1) remove operation.
+	     * @constructor
+	     */
+	    var LinkedList = function() {
+
+	        /**
+	         * @type {module:zrender/core/LRU~Entry}
+	         */
+	        this.head = null;
+
+	        /**
+	         * @type {module:zrender/core/LRU~Entry}
+	         */
+	        this.tail = null;
+
+	        this._len = 0;
+	    };
+
+	    var linkedListProto = LinkedList.prototype;
+	    /**
+	     * Insert a new value at the tail
+	     * @param  {} val
+	     * @return {module:zrender/core/LRU~Entry}
+	     */
+	    linkedListProto.insert = function(val) {
+	        var entry = new Entry(val);
+	        this.insertEntry(entry);
+	        return entry;
+	    };
+
+	    /**
+	     * Insert an entry at the tail
+	     * @param  {module:zrender/core/LRU~Entry} entry
+	     */
+	    linkedListProto.insertEntry = function(entry) {
+	        if (!this.head) {
+	            this.head = this.tail = entry;
+	        }
+	        else {
+	            this.tail.next = entry;
+	            entry.prev = this.tail;
+	            this.tail = entry;
+	        }
+	        this._len++;
+	    };
+
+	    /**
+	     * Remove entry.
+	     * @param  {module:zrender/core/LRU~Entry} entry
+	     */
+	    linkedListProto.remove = function(entry) {
+	        var prev = entry.prev;
+	        var next = entry.next;
+	        if (prev) {
+	            prev.next = next;
+	        }
+	        else {
+	            // Is head
+	            this.head = next;
+	        }
+	        if (next) {
+	            next.prev = prev;
+	        }
+	        else {
+	            // Is tail
+	            this.tail = prev;
+	        }
+	        entry.next = entry.prev = null;
+	        this._len--;
+	    };
+
+	    /**
+	     * @return {number}
+	     */
+	    linkedListProto.len = function() {
+	        return this._len;
+	    };
+
+	    /**
+	     * @constructor
+	     * @param {} val
+	     */
+	    var Entry = function(val) {
+	        /**
+	         * @type {}
+	         */
+	        this.value = val;
+
+	        /**
+	         * @type {module:zrender/core/LRU~Entry}
+	         */
+	        this.next;
+
+	        /**
+	         * @type {module:zrender/core/LRU~Entry}
+	         */
+	        this.prev;
+	    };
+
+	    /**
+	     * LRU Cache
+	     * @constructor
+	     * @alias module:zrender/core/LRU
+	     */
+	    var LRU = function(maxSize) {
+
+	        this._list = new LinkedList();
+
+	        this._map = {};
+
+	        this._maxSize = maxSize || 10;
+	    };
+
+	    var LRUProto = LRU.prototype;
+
+	    /**
+	     * @param  {string} key
+	     * @param  {} value
+	     */
+	    LRUProto.put = function(key, value) {
+	        var list = this._list;
+	        var map = this._map;
+	        if (map[key] == null) {
+	            var len = list.len();
+	            if (len >= this._maxSize && len > 0) {
+	                // Remove the least recently used
+	                var leastUsedEntry = list.head;
+	                list.remove(leastUsedEntry);
+	                delete map[leastUsedEntry.key];
+	            }
+
+	            var entry = list.insert(value);
+	            entry.key = key;
+	            map[key] = entry;
+	        }
+	    };
+
+	    /**
+	     * @param  {string} key
+	     * @return {}
+	     */
+	    LRUProto.get = function(key) {
+	        var entry = this._map[key];
+	        var list = this._list;
+	        if (entry != null) {
+	            // Put the latest used entry in the tail
+	            if (entry !== list.tail) {
+	                list.remove(entry);
+	                list.insertEntry(entry);
+	            }
+
+	            return entry.value;
+	        }
+	    };
+
+	    /**
+	     * Clear the cache
+	     */
+	    LRUProto.clear = function() {
+	        this._list.clear();
+	        this._map = {};
+	    };
+
+	    module.exports = LRU;
+
+
+/***/ },
+/* 64 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * Text element
+	 * @module zrender/graphic/Text
+	 *
+	 * TODO Wrapping
+	 *
+	 * Text not support gradient
+	 */
+
+
+
+	    var Displayable = __webpack_require__(46);
+	    var zrUtil = __webpack_require__(4);
+	    var textContain = __webpack_require__(8);
+
+	    /**
+	     * @alias zrender/graphic/Text
+	     * @extends module:zrender/graphic/Displayable
+	     * @constructor
+	     * @param {Object} opts
+	     */
+	    var Text = function (opts) {
+	        Displayable.call(this, opts);
+	    };
+
+	    Text.prototype = {
+
+	        constructor: Text,
+
+	        type: 'text',
+
+	        brush: function (ctx, prevEl) {
+	            var style = this.style;
+	            var x = style.x || 0;
+	            var y = style.y || 0;
+	            // Convert to string
+	            var text = style.text;
+
+	            // Convert to string
+	            text != null && (text += '');
+
+	            // Always bind style
+	            style.bind(ctx, this, prevEl);
+
+	            if (text) {
+
+	                this.setTransform(ctx);
+
+	                var textBaseline;
+	                var textAlign = style.textAlign;
+	                var font = style.textFont || style.font;
+	                if (style.textVerticalAlign) {
+	                    var rect = textContain.getBoundingRect(
+	                        text, font, style.textAlign, 'top'
+	                    );
+	                    // Ignore textBaseline
+	                    textBaseline = 'middle';
+	                    switch (style.textVerticalAlign) {
+	                        case 'middle':
+	                            y -= rect.height / 2 - rect.lineHeight / 2;
+	                            break;
+	                        case 'bottom':
+	                            y -= rect.height - rect.lineHeight / 2;
+	                            break;
+	                        default:
+	                            y += rect.lineHeight / 2;
+	                    }
+	                }
+	                else {
+	                    textBaseline = style.textBaseline;
+	                }
+
+	                ctx.font = font;
+	                ctx.textAlign = textAlign || 'left';
+	                // Use canvas default left textAlign. Giving invalid value will cause state not change
+	                if (ctx.textAlign !== textAlign) {
+	                    ctx.textAlign = 'left';
+	                }
+	                ctx.textBaseline = textBaseline || 'alphabetic';
+	                // Use canvas default alphabetic baseline
+	                if (ctx.textBaseline !== textBaseline) {
+	                    ctx.textBaseline = 'alphabetic';
+	                }
+
+	                var lineHeight = textContain.measureText('国', ctx.font).width;
+
+	                var textLines = text.split('\n');
+	                for (var i = 0; i < textLines.length; i++) {
+	                    style.hasFill() && ctx.fillText(textLines[i], x, y);
+	                    style.hasStroke() && ctx.strokeText(textLines[i], x, y);
+	                    y += lineHeight;
+	                }
+
+	                this.restoreTransform(ctx);
+	            }
+	        },
+
+	        getBoundingRect: function () {
+	            if (!this._rect) {
+	                var style = this.style;
+	                var textVerticalAlign = style.textVerticalAlign;
+	                var rect = textContain.getBoundingRect(
+	                    style.text + '', style.textFont || style.font, style.textAlign,
+	                    textVerticalAlign ? 'top' : style.textBaseline
+	                );
+	                switch (textVerticalAlign) {
+	                    case 'middle':
+	                        rect.y -= rect.height / 2;
+	                        break;
+	                    case 'bottom':
+	                        rect.y -= rect.height;
+	                        break;
+	                }
+	                rect.x += style.x || 0;
+	                rect.y += style.y || 0;
+	                this._rect = rect;
+	            }
+	            return this._rect;
+	        }
+	    };
+
+	    zrUtil.inherits(Text, Displayable);
+
+	    module.exports = Text;
+
+
+/***/ },
+/* 65 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+	/**
+	 * 圆形
+	 * @module zrender/shape/Circle
+	 */
+
+
+
+	    module.exports = __webpack_require__(45).extend({
+
+	        type: 'circle',
+
+	        shape: {
+	            cx: 0,
+	            cy: 0,
+	            r: 0
+	        },
+
+
+	        buildPath : function (ctx, shape, inBundle) {
+	            // Better stroking in ShapeBundle
+	            // Always do it may have performence issue ( fill may be 2x more cost)
+	            if (inBundle) {
+	                ctx.moveTo(shape.cx + shape.r, shape.cy);
+	            }
+	            // Better stroking in ShapeBundle
+	            // ctx.moveTo(shape.cx + shape.r, shape.cy);
+	            ctx.arc(shape.cx, shape.cy, shape.r, 0, Math.PI * 2, true);
+	        }
+	    });
+
+
+
+/***/ },
+/* 66 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * 扇形
+	 * @module zrender/graphic/shape/Sector
+	 */
+
+	// FIXME clockwise seems wrong
+
+
+	    module.exports = __webpack_require__(45).extend({
+
+	        type: 'sector',
+
+	        shape: {
+
+	            cx: 0,
+
+	            cy: 0,
+
+	            r0: 0,
+
+	            r: 0,
+
+	            startAngle: 0,
+
+	            endAngle: Math.PI * 2,
+
+	            clockwise: true
+	        },
+
+	        buildPath: function (ctx, shape) {
+
+	            var x = shape.cx;
+	            var y = shape.cy;
+	            var r0 = Math.max(shape.r0 || 0, 0);
+	            var r = Math.max(shape.r, 0);
+	            var startAngle = shape.startAngle;
+	            var endAngle = shape.endAngle;
+	            var clockwise = shape.clockwise;
+
+	            var unitX = Math.cos(startAngle);
+	            var unitY = Math.sin(startAngle);
+
+	            ctx.moveTo(unitX * r0 + x, unitY * r0 + y);
+
+	            ctx.lineTo(unitX * r + x, unitY * r + y);
+
+	            ctx.arc(x, y, r, startAngle, endAngle, !clockwise);
+
+	            ctx.lineTo(
+	                Math.cos(endAngle) * r0 + x,
+	                Math.sin(endAngle) * r0 + y
+	            );
+
+	            if (r0 !== 0) {
+	                ctx.arc(x, y, r0, endAngle, startAngle, clockwise);
+	            }
+
+	            ctx.closePath();
+	        }
+	    });
+
+
+
+/***/ },
+/* 67 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * 圆环
+	 * @module zrender/graphic/shape/Ring
+	 */
+
+
+	    module.exports = __webpack_require__(45).extend({
+
+	        type: 'ring',
+
+	        shape: {
+	            cx: 0,
+	            cy: 0,
+	            r: 0,
+	            r0: 0
+	        },
+
+	        buildPath: function (ctx, shape) {
+	            var x = shape.cx;
+	            var y = shape.cy;
+	            var PI2 = Math.PI * 2;
+	            ctx.moveTo(x + shape.r, y);
+	            ctx.arc(x, y, shape.r, 0, PI2, false);
+	            ctx.moveTo(x + shape.r0, y);
+	            ctx.arc(x, y, shape.r0, 0, PI2, true);
+	        }
+	    });
+
+
+
+/***/ },
+/* 68 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * 多边形
+	 * @module zrender/shape/Polygon
+	 */
+
+
+	    var polyHelper = __webpack_require__(69);
+
+	    module.exports = __webpack_require__(45).extend({
+	        
+	        type: 'polygon',
+
+	        shape: {
+	            points: null,
+
+	            smooth: false,
+
+	            smoothConstraint: null
+	        },
+
+	        buildPath: function (ctx, shape) {
+	            polyHelper.buildPath(ctx, shape, true);
+	        }
+	    });
+
+
+/***/ },
+/* 69 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var smoothSpline = __webpack_require__(70);
+	    var smoothBezier = __webpack_require__(71);
+
+	    module.exports = {
+	        buildPath: function (ctx, shape, closePath) {
+	            var points = shape.points;
+	            var smooth = shape.smooth;
+	            if (points && points.length >= 2) {
+	                if (smooth && smooth !== 'spline') {
+	                    var controlPoints = smoothBezier(
+	                        points, smooth, closePath, shape.smoothConstraint
+	                    );
+
+	                    ctx.moveTo(points[0][0], points[0][1]);
+	                    var len = points.length;
+	                    for (var i = 0; i < (closePath ? len : len - 1); i++) {
+	                        var cp1 = controlPoints[i * 2];
+	                        var cp2 = controlPoints[i * 2 + 1];
+	                        var p = points[(i + 1) % len];
+	                        ctx.bezierCurveTo(
+	                            cp1[0], cp1[1], cp2[0], cp2[1], p[0], p[1]
+	                        );
+	                    }
+	                }
+	                else {
+	                    if (smooth === 'spline') {
+	                        points = smoothSpline(points, closePath);
+	                    }
+
+	                    ctx.moveTo(points[0][0], points[0][1]);
+	                    for (var i = 1, l = points.length; i < l; i++) {
+	                        ctx.lineTo(points[i][0], points[i][1]);
+	                    }
+	                }
+
+	                closePath && ctx.closePath();
+	            }
+	        }
+	    };
+
+
+/***/ },
+/* 70 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * Catmull-Rom spline 插值折线
+	 * @module zrender/shape/util/smoothSpline
+	 * @author pissang (https://www.github.com/pissang)
+	 *         Kener (@Kener-林峰, kener.linfeng@gmail.com)
+	 *         errorrik (errorrik@gmail.com)
+	 */
+
+	    var vec2 = __webpack_require__(10);
+
+	    /**
+	     * @inner
+	     */
+	    function interpolate(p0, p1, p2, p3, t, t2, t3) {
+	        var v0 = (p2 - p0) * 0.5;
+	        var v1 = (p3 - p1) * 0.5;
+	        return (2 * (p1 - p2) + v0 + v1) * t3
+	                + (-3 * (p1 - p2) - 2 * v0 - v1) * t2
+	                + v0 * t + p1;
+	    }
+
+	    /**
+	     * @alias module:zrender/shape/util/smoothSpline
+	     * @param {Array} points 线段顶点数组
+	     * @param {boolean} isLoop
+	     * @return {Array}
+	     */
+	    module.exports = function (points, isLoop) {
+	        var len = points.length;
+	        var ret = [];
+
+	        var distance = 0;
+	        for (var i = 1; i < len; i++) {
+	            distance += vec2.distance(points[i - 1], points[i]);
+	        }
+
+	        var segs = distance / 2;
+	        segs = segs < len ? len : segs;
+	        for (var i = 0; i < segs; i++) {
+	            var pos = i / (segs - 1) * (isLoop ? len : len - 1);
+	            var idx = Math.floor(pos);
+
+	            var w = pos - idx;
+
+	            var p0;
+	            var p1 = points[idx % len];
+	            var p2;
+	            var p3;
+	            if (!isLoop) {
+	                p0 = points[idx === 0 ? idx : idx - 1];
+	                p2 = points[idx > len - 2 ? len - 1 : idx + 1];
+	                p3 = points[idx > len - 3 ? len - 1 : idx + 2];
+	            }
+	            else {
+	                p0 = points[(idx - 1 + len) % len];
+	                p2 = points[(idx + 1) % len];
+	                p3 = points[(idx + 2) % len];
+	            }
+
+	            var w2 = w * w;
+	            var w3 = w * w2;
+
+	            ret.push([
+	                interpolate(p0[0], p1[0], p2[0], p3[0], w, w2, w3),
+	                interpolate(p0[1], p1[1], p2[1], p3[1], w, w2, w3)
+	            ]);
+	        }
+	        return ret;
+	    };
+
+
+
+/***/ },
+/* 71 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * 贝塞尔平滑曲线
+	 * @module zrender/shape/util/smoothBezier
+	 * @author pissang (https://www.github.com/pissang)
+	 *         Kener (@Kener-林峰, kener.linfeng@gmail.com)
+	 *         errorrik (errorrik@gmail.com)
+	 */
+
+
+	    var vec2 = __webpack_require__(10);
+	    var v2Min = vec2.min;
+	    var v2Max = vec2.max;
+	    var v2Scale = vec2.scale;
+	    var v2Distance = vec2.distance;
+	    var v2Add = vec2.add;
+
+	    /**
+	     * 贝塞尔平滑曲线
+	     * @alias module:zrender/shape/util/smoothBezier
+	     * @param {Array} points 线段顶点数组
+	     * @param {number} smooth 平滑等级, 0-1
+	     * @param {boolean} isLoop
+	     * @param {Array} constraint 将计算出来的控制点约束在一个包围盒内
+	     *                           比如 [[0, 0], [100, 100]], 这个包围盒会与
+	     *                           整个折线的包围盒做一个并集用来约束控制点。
+	     * @param {Array} 计算出来的控制点数组
+	     */
+	    module.exports = function (points, smooth, isLoop, constraint) {
+	        var cps = [];
+
+	        var v = [];
+	        var v1 = [];
+	        var v2 = [];
+	        var prevPoint;
+	        var nextPoint;
+
+	        var min, max;
+	        if (constraint) {
+	            min = [Infinity, Infinity];
+	            max = [-Infinity, -Infinity];
+	            for (var i = 0, len = points.length; i < len; i++) {
+	                v2Min(min, min, points[i]);
+	                v2Max(max, max, points[i]);
+	            }
+	            // 与指定的包围盒做并集
+	            v2Min(min, min, constraint[0]);
+	            v2Max(max, max, constraint[1]);
+	        }
+
+	        for (var i = 0, len = points.length; i < len; i++) {
+	            var point = points[i];
+
+	            if (isLoop) {
+	                prevPoint = points[i ? i - 1 : len - 1];
+	                nextPoint = points[(i + 1) % len];
+	            }
+	            else {
+	                if (i === 0 || i === len - 1) {
+	                    cps.push(vec2.clone(points[i]));
+	                    continue;
+	                }
+	                else {
+	                    prevPoint = points[i - 1];
+	                    nextPoint = points[i + 1];
+	                }
+	            }
+
+	            vec2.sub(v, nextPoint, prevPoint);
+
+	            // use degree to scale the handle length
+	            v2Scale(v, v, smooth);
+
+	            var d0 = v2Distance(point, prevPoint);
+	            var d1 = v2Distance(point, nextPoint);
+	            var sum = d0 + d1;
+	            if (sum !== 0) {
+	                d0 /= sum;
+	                d1 /= sum;
+	            }
+
+	            v2Scale(v1, v, -d0);
+	            v2Scale(v2, v, d1);
+	            var cp0 = v2Add([], point, v1);
+	            var cp1 = v2Add([], point, v2);
+	            if (constraint) {
+	                v2Max(cp0, cp0, min);
+	                v2Min(cp0, cp0, max);
+	                v2Max(cp1, cp1, min);
+	                v2Min(cp1, cp1, max);
+	            }
+	            cps.push(cp0);
+	            cps.push(cp1);
+	        }
+
+	        if (isLoop) {
+	            cps.push(cps.shift());
+	        }
+
+	        return cps;
+	    };
+
+
+
+/***/ },
+/* 72 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @module zrender/graphic/shape/Polyline
+	 */
+
+
+	    var polyHelper = __webpack_require__(69);
+
+	    module.exports = __webpack_require__(45).extend({
+	        
+	        type: 'polyline',
+
+	        shape: {
+	            points: null,
+
+	            smooth: false,
+
+	            smoothConstraint: null
+	        },
+
+	        style: {
+	            stroke: '#000',
+
+	            fill: null
+	        },
+
+	        buildPath: function (ctx, shape) {
+	            polyHelper.buildPath(ctx, shape, false);
+	        }
+	    });
+
+
+/***/ },
+/* 73 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * 矩形
+	 * @module zrender/graphic/shape/Rect
+	 */
+
+
+	    var roundRectHelper = __webpack_require__(74);
+
+	    module.exports = __webpack_require__(45).extend({
+
+	        type: 'rect',
+
+	        shape: {
+	            // 左上、右上、右下、左下角的半径依次为r1、r2、r3、r4
+	            // r缩写为1         相当于 [1, 1, 1, 1]
+	            // r缩写为[1]       相当于 [1, 1, 1, 1]
+	            // r缩写为[1, 2]    相当于 [1, 2, 1, 2]
+	            // r缩写为[1, 2, 3] 相当于 [1, 2, 3, 2]
+	            r: 0,
+
+	            x: 0,
+	            y: 0,
+	            width: 0,
+	            height: 0
+	        },
+
+	        buildPath: function (ctx, shape) {
+	            var x = shape.x;
+	            var y = shape.y;
+	            var width = shape.width;
+	            var height = shape.height;
+	            if (!shape.r) {
+	                ctx.rect(x, y, width, height);
+	            }
+	            else {
+	                roundRectHelper.buildPath(ctx, shape);
+	            }
+	            ctx.closePath();
+	            return;
+	        }
+	    });
+
+
+
+/***/ },
+/* 74 */
+/***/ function(module, exports) {
+
+	
+
+	    module.exports = {
+	        buildPath: function (ctx, shape) {
+	            var x = shape.x;
+	            var y = shape.y;
+	            var width = shape.width;
+	            var height = shape.height;
+	            var r = shape.r;
+	            var r1;
+	            var r2;
+	            var r3;
+	            var r4;
+
+	            // Convert width and height to positive for better borderRadius
+	            if (width < 0) {
+	                x = x + width;
+	                width = -width;
+	            }
+	            if (height < 0) {
+	                y = y + height;
+	                height = -height;
+	            }
+
+	            if (typeof r === 'number') {
+	                r1 = r2 = r3 = r4 = r;
+	            }
+	            else if (r instanceof Array) {
+	                if (r.length === 1) {
+	                    r1 = r2 = r3 = r4 = r[0];
+	                }
+	                else if (r.length === 2) {
+	                    r1 = r3 = r[0];
+	                    r2 = r4 = r[1];
+	                }
+	                else if (r.length === 3) {
+	                    r1 = r[0];
+	                    r2 = r4 = r[1];
+	                    r3 = r[2];
+	                }
+	                else {
+	                    r1 = r[0];
+	                    r2 = r[1];
+	                    r3 = r[2];
+	                    r4 = r[3];
+	                }
+	            }
+	            else {
+	                r1 = r2 = r3 = r4 = 0;
+	            }
+
+	            var total;
+	            if (r1 + r2 > width) {
+	                total = r1 + r2;
+	                r1 *= width / total;
+	                r2 *= width / total;
+	            }
+	            if (r3 + r4 > width) {
+	                total = r3 + r4;
+	                r3 *= width / total;
+	                r4 *= width / total;
+	            }
+	            if (r2 + r3 > height) {
+	                total = r2 + r3;
+	                r2 *= height / total;
+	                r3 *= height / total;
+	            }
+	            if (r1 + r4 > height) {
+	                total = r1 + r4;
+	                r1 *= height / total;
+	                r4 *= height / total;
+	            }
+	            ctx.moveTo(x + r1, y);
+	            ctx.lineTo(x + width - r2, y);
+	            r2 !== 0 && ctx.quadraticCurveTo(
+	                x + width, y, x + width, y + r2
+	            );
+	            ctx.lineTo(x + width, y + height - r3);
+	            r3 !== 0 && ctx.quadraticCurveTo(
+	                x + width, y + height, x + width - r3, y + height
+	            );
+	            ctx.lineTo(x + r4, y + height);
+	            r4 !== 0 && ctx.quadraticCurveTo(
+	                x, y + height, x, y + height - r4
+	            );
+	            ctx.lineTo(x, y + r1);
+	            r1 !== 0 && ctx.quadraticCurveTo(x, y, x + r1, y);
+	        }
+	    };
+
+
+/***/ },
+/* 75 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * 直线
+	 * @module zrender/graphic/shape/Line
+	 */
+
+	    module.exports = __webpack_require__(45).extend({
+
+	        type: 'line',
+
+	        shape: {
+	            // Start point
+	            x1: 0,
+	            y1: 0,
+	            // End point
+	            x2: 0,
+	            y2: 0,
+
+	            percent: 1
+	        },
+
+	        style: {
+	            stroke: '#000',
+	            fill: null
+	        },
+
+	        buildPath: function (ctx, shape) {
+	            var x1 = shape.x1;
+	            var y1 = shape.y1;
+	            var x2 = shape.x2;
+	            var y2 = shape.y2;
+	            var percent = shape.percent;
+
+	            if (percent === 0) {
+	                return;
+	            }
+
+	            ctx.moveTo(x1, y1);
+
+	            if (percent < 1) {
+	                x2 = x1 * (1 - percent) + x2 * percent;
+	                y2 = y1 * (1 - percent) + y2 * percent;
+	            }
+	            ctx.lineTo(x2, y2);
+	        },
+
+	        /**
+	         * Get point at percent
+	         * @param  {number} percent
+	         * @return {Array.<number>}
+	         */
+	        pointAt: function (p) {
+	            var shape = this.shape;
+	            return [
+	                shape.x1 * (1 - p) + shape.x2 * p,
+	                shape.y1 * (1 - p) + shape.y2 * p
+	            ];
+	        }
+	    });
+
+
+
+/***/ },
+/* 76 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+	/**
+	 * 贝塞尔曲线
+	 * @module zrender/shape/BezierCurve
+	 */
+
+
+	    var curveTool = __webpack_require__(50);
+	    var vec2 = __webpack_require__(10);
+	    var quadraticSubdivide = curveTool.quadraticSubdivide;
+	    var cubicSubdivide = curveTool.cubicSubdivide;
+	    var quadraticAt = curveTool.quadraticAt;
+	    var cubicAt = curveTool.cubicAt;
+	    var quadraticDerivativeAt = curveTool.quadraticDerivativeAt;
+	    var cubicDerivativeAt = curveTool.cubicDerivativeAt;
+
+	    var out = [];
+
+	    function someVectorAt(shape, t, isTangent) {
+	        var cpx2 = shape.cpx2;
+	        var cpy2 = shape.cpy2;
+	        if (cpx2 === null || cpy2 === null) {
+	            return [
+	                (isTangent ? cubicDerivativeAt : cubicAt)(shape.x1, shape.cpx1, shape.cpx2, shape.x2, t),
+	                (isTangent ? cubicDerivativeAt : cubicAt)(shape.y1, shape.cpy1, shape.cpy2, shape.y2, t)
+	            ];
+	        }
+	        else {
+	            return [
+	                (isTangent ? quadraticDerivativeAt : quadraticAt)(shape.x1, shape.cpx1, shape.x2, t),
+	                (isTangent ? quadraticDerivativeAt : quadraticAt)(shape.y1, shape.cpy1, shape.y2, t)
+	            ];
+	        }
+	    }
+	    module.exports = __webpack_require__(45).extend({
+
+	        type: 'bezier-curve',
+
+	        shape: {
+	            x1: 0,
+	            y1: 0,
+	            x2: 0,
+	            y2: 0,
+	            cpx1: 0,
+	            cpy1: 0,
+	            // cpx2: 0,
+	            // cpy2: 0
+
+	            // Curve show percent, for animating
+	            percent: 1
+	        },
+
+	        style: {
+	            stroke: '#000',
+	            fill: null
+	        },
+
+	        buildPath: function (ctx, shape) {
+	            var x1 = shape.x1;
+	            var y1 = shape.y1;
+	            var x2 = shape.x2;
+	            var y2 = shape.y2;
+	            var cpx1 = shape.cpx1;
+	            var cpy1 = shape.cpy1;
+	            var cpx2 = shape.cpx2;
+	            var cpy2 = shape.cpy2;
+	            var percent = shape.percent;
+	            if (percent === 0) {
+	                return;
+	            }
+
+	            ctx.moveTo(x1, y1);
+
+	            if (cpx2 == null || cpy2 == null) {
+	                if (percent < 1) {
+	                    quadraticSubdivide(
+	                        x1, cpx1, x2, percent, out
+	                    );
+	                    cpx1 = out[1];
+	                    x2 = out[2];
+	                    quadraticSubdivide(
+	                        y1, cpy1, y2, percent, out
+	                    );
+	                    cpy1 = out[1];
+	                    y2 = out[2];
+	                }
+
+	                ctx.quadraticCurveTo(
+	                    cpx1, cpy1,
+	                    x2, y2
+	                );
+	            }
+	            else {
+	                if (percent < 1) {
+	                    cubicSubdivide(
+	                        x1, cpx1, cpx2, x2, percent, out
+	                    );
+	                    cpx1 = out[1];
+	                    cpx2 = out[2];
+	                    x2 = out[3];
+	                    cubicSubdivide(
+	                        y1, cpy1, cpy2, y2, percent, out
+	                    );
+	                    cpy1 = out[1];
+	                    cpy2 = out[2];
+	                    y2 = out[3];
+	                }
+	                ctx.bezierCurveTo(
+	                    cpx1, cpy1,
+	                    cpx2, cpy2,
+	                    x2, y2
+	                );
+	            }
+	        },
+
+	        /**
+	         * Get point at percent
+	         * @param  {number} t
+	         * @return {Array.<number>}
+	         */
+	        pointAt: function (t) {
+	            return someVectorAt(this.shape, t, false);
+	        },
+
+	        /**
+	         * Get tangent at percent
+	         * @param  {number} t
+	         * @return {Array.<number>}
+	         */
+	        tangentAt: function (t) {
+	            var p = someVectorAt(this.shape, t, true);
+	            return vec2.normalize(p, p);
+	        }
+	    });
+
+
+
+/***/ },
+/* 77 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * 圆弧
+	 * @module zrender/graphic/shape/Arc
+	 */
+	 
+
+	    module.exports = __webpack_require__(45).extend({
+
+	        type: 'arc',
+
+	        shape: {
+
+	            cx: 0,
+
+	            cy: 0,
+
+	            r: 0,
+
+	            startAngle: 0,
+
+	            endAngle: Math.PI * 2,
+
+	            clockwise: true
+	        },
+
+	        style: {
+
+	            stroke: '#000',
+
+	            fill: null
+	        },
+
+	        buildPath: function (ctx, shape) {
+
+	            var x = shape.cx;
+	            var y = shape.cy;
+	            var r = Math.max(shape.r, 0);
+	            var startAngle = shape.startAngle;
+	            var endAngle = shape.endAngle;
+	            var clockwise = shape.clockwise;
+
+	            var unitX = Math.cos(startAngle);
+	            var unitY = Math.sin(startAngle);
+
+	            ctx.moveTo(unitX * r + x, unitY * r + y);
+	            ctx.arc(x, y, r, startAngle, endAngle, !clockwise);
+	        }
+	    });
+
+
+/***/ },
+/* 78 */
+/***/ function(module, exports, __webpack_require__) {
+
+	// CompoundPath to improve performance
+
+
+	    var Path = __webpack_require__(45);
+	    module.exports = Path.extend({
+
+	        type: 'compound',
+
+	        shape: {
+
+	            paths: null
+	        },
+
+	        _updatePathDirty: function () {
+	            var dirtyPath = this.__dirtyPath;
+	            var paths = this.shape.paths;
+	            for (var i = 0; i < paths.length; i++) {
+	                // Mark as dirty if any subpath is dirty
+	                dirtyPath = dirtyPath || paths[i].__dirtyPath;
+	            }
+	            this.__dirtyPath = dirtyPath;
+	            this.__dirty = this.__dirty || dirtyPath;
+	        },
+
+	        beforeBrush: function () {
+	            this._updatePathDirty();
+	            var paths = this.shape.paths || [];
+	            var scale = this.getGlobalScale();
+	            // Update path scale
+	            for (var i = 0; i < paths.length; i++) {
+	                paths[i].path.setScale(scale[0], scale[1]);
+	            }
+	        },
+
+	        buildPath: function (ctx, shape) {
+	            var paths = shape.paths || [];
+	            for (var i = 0; i < paths.length; i++) {
+	                paths[i].buildPath(ctx, paths[i].shape, true);
+	            }
+	        },
+
+	        afterBrush: function () {
+	            var paths = this.shape.paths;
+	            for (var i = 0; i < paths.length; i++) {
+	                paths[i].__dirtyPath = false;
+	            }
+	        },
+
+	        getBoundingRect: function () {
+	            this._updatePathDirty();
+	            return Path.prototype.getBoundingRect.call(this);
+	        }
+	    });
+
+
+/***/ },
+/* 79 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var zrUtil = __webpack_require__(4);
+
+	    var Gradient = __webpack_require__(61);
+
+	    /**
+	     * x, y, x2, y2 are all percent from 0 to 1
+	     * @param {number} [x=0]
+	     * @param {number} [y=0]
+	     * @param {number} [x2=1]
+	     * @param {number} [y2=0]
+	     * @param {Array.<Object>} colorStops
+	     * @param {boolean} [globalCoord=false]
+	     */
+	    var LinearGradient = function (x, y, x2, y2, colorStops, globalCoord) {
+	        this.x = x == null ? 0 : x;
+
+	        this.y = y == null ? 0 : y;
+
+	        this.x2 = x2 == null ? 1 : x2;
+
+	        this.y2 = y2 == null ? 0 : y2;
+
+	        // Can be cloned
+	        this.type = 'linear';
+
+	        // If use global coord
+	        this.global = globalCoord || false;
+
+	        Gradient.call(this, colorStops);
+	    };
+
+	    LinearGradient.prototype = {
+
+	        constructor: LinearGradient
+	    };
+
+	    zrUtil.inherits(LinearGradient, Gradient);
+
+	    module.exports = LinearGradient;
+
+
+/***/ },
+/* 80 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var zrUtil = __webpack_require__(4);
+
+	    var Gradient = __webpack_require__(61);
+
+	    /**
+	     * x, y, r are all percent from 0 to 1
+	     * @param {number} [x=0.5]
+	     * @param {number} [y=0.5]
+	     * @param {number} [r=0.5]
+	     * @param {Array.<Object>} [colorStops]
+	     * @param {boolean} [globalCoord=false]
+	     */
+	    var RadialGradient = function (x, y, r, colorStops, globalCoord) {
+	        this.x = x == null ? 0.5 : x;
+
+	        this.y = y == null ? 0.5 : y;
+
+	        this.r = r == null ? 0.5 : r;
+
+	        // Can be cloned
+	        this.type = 'radial';
+
+	        // If use global coord
+	        this.global = globalCoord || false;
+
+	        Gradient.call(this, colorStops);
+	    };
+
+	    RadialGradient.prototype = {
+
+	        constructor: RadialGradient
+	    };
+
+	    zrUtil.inherits(RadialGradient, Gradient);
+
+	    module.exports = RadialGradient;
+
+
+/***/ },
+/* 81 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/*!
+	 * ZRender, a high performance 2d drawing library.
+	 *
+	 * Copyright (c) 2013, Baidu Inc.
+	 * All rights reserved.
+	 *
+	 * LICENSE
+	 * https://github.com/ecomfe/zrender/blob/master/LICENSE.txt
+	 */
+	// Global defines
+
+	    var guid = __webpack_require__(32);
+	    var env = __webpack_require__(2);
+
+	    var Handler = __webpack_require__(82);
+	    var Storage = __webpack_require__(84);
+	    var Animation = __webpack_require__(86);
+	    var HandlerProxy = __webpack_require__(89);
+
+	    var useVML = !env.canvasSupported;
+
+	    var painterCtors = {
+	        canvas: __webpack_require__(91)
+	    };
+
+	    var instances = {};    // ZRender实例map索引
+
+	    var zrender = {};
+	    /**
+	     * @type {string}
+	     */
+	    zrender.version = '3.1.2';
+
+	    /**
+	     * Initializing a zrender instance
+	     * @param {HTMLElement} dom
+	     * @param {Object} opts
+	     * @param {string} [opts.renderer='canvas'] 'canvas' or 'svg'
+	     * @param {number} [opts.devicePixelRatio]
+	     * @return {module:zrender/ZRender}
+	     */
+	    zrender.init = function(dom, opts) {
+	        var zr = new ZRender(guid(), dom, opts);
+	        instances[zr.id] = zr;
+	        return zr;
+	    };
+
+	    /**
+	     * Dispose zrender instance
+	     * @param {module:zrender/ZRender} zr
+	     */
+	    zrender.dispose = function (zr) {
+	        if (zr) {
+	            zr.dispose();
+	        }
+	        else {
+	            for (var key in instances) {
+	                instances[key].dispose();
+	            }
+	            instances = {};
+	        }
+
+	        return zrender;
+	    };
+
+	    /**
+	     * Get zrender instance by id
+	     * @param {string} id zrender instance id
+	     * @return {module:zrender/ZRender}
+	     */
+	    zrender.getInstance = function (id) {
+	        return instances[id];
+	    };
+
+	    zrender.registerPainter = function (name, Ctor) {
+	        painterCtors[name] = Ctor;
+	    };
+
+	    function delInstance(id) {
+	        delete instances[id];
+	    }
+
+	    /**
+	     * @module zrender/ZRender
+	     */
+	    /**
+	     * @constructor
+	     * @alias module:zrender/ZRender
+	     * @param {string} id
+	     * @param {HTMLDomElement} dom
+	     * @param {Object} opts
+	     * @param {string} [opts.renderer='canvas'] 'canvas' or 'svg'
+	     * @param {number} [opts.devicePixelRatio]
+	     */
+	    var ZRender = function(id, dom, opts) {
+
+	        opts = opts || {};
+
+	        /**
+	         * @type {HTMLDomElement}
+	         */
+	        this.dom = dom;
+
+	        /**
+	         * @type {string}
+	         */
+	        this.id = id;
+
+	        var self = this;
+	        var storage = new Storage();
+
+	        var rendererType = opts.renderer;
+	        if (useVML) {
+	            if (!painterCtors.vml) {
+	                throw new Error('You need to require \'zrender/vml/vml\' to support IE8');
+	            }
+	            rendererType = 'vml';
+	        }
+	        else if (!rendererType || !painterCtors[rendererType]) {
+	            rendererType = 'canvas';
+	        }
+	        var painter = new painterCtors[rendererType](dom, storage, opts);
+
+	        this.storage = storage;
+	        this.painter = painter;
+
+	        var handerProxy = !env.node ? new HandlerProxy(painter.getViewportRoot()) : null;
+	        this.handler = new Handler(storage, painter, handerProxy);
+
+	        /**
+	         * @type {module:zrender/animation/Animation}
+	         */
+	        this.animation = new Animation({
+	            stage: {
+	                update: function () {
+	                    if (self._needsRefresh) {
+	                        self.refreshImmediately();
+	                    }
+	                    if (self._needsRefreshHover) {
+	                        self.refreshHoverImmediately();
+	                    }
+	                }
+	            }
+	        });
+	        this.animation.start();
+
+	        /**
+	         * @type {boolean}
+	         * @private
+	         */
+	        this._needsRefresh;
+
+	        // 修改 storage.delFromMap, 每次删除元素之前删除动画
+	        // FIXME 有点ugly
+	        var oldDelFromMap = storage.delFromMap;
+	        var oldAddToMap = storage.addToMap;
+
+	        storage.delFromMap = function (elId) {
+	            var el = storage.get(elId);
+
+	            oldDelFromMap.call(storage, elId);
+
+	            el && el.removeSelfFromZr(self);
+	        };
+
+	        storage.addToMap = function (el) {
+	            oldAddToMap.call(storage, el);
+
+	            el.addSelfToZr(self);
+	        };
+	    };
+
+	    ZRender.prototype = {
+
+	        constructor: ZRender,
+	        /**
+	         * 获取实例唯一标识
+	         * @return {string}
+	         */
+	        getId: function () {
+	            return this.id;
+	        },
+
+	        /**
+	         * 添加元素
+	         * @param  {module:zrender/Element} el
+	         */
+	        add: function (el) {
+	            this.storage.addRoot(el);
+	            this._needsRefresh = true;
+	        },
+
+	        /**
+	         * 删除元素
+	         * @param  {module:zrender/Element} el
+	         */
+	        remove: function (el) {
+	            this.storage.delRoot(el);
+	            this._needsRefresh = true;
+	        },
+
+	        /**
+	         * Change configuration of layer
+	         * @param {string} zLevel
+	         * @param {Object} config
+	         * @param {string} [config.clearColor=0] Clear color
+	         * @param {string} [config.motionBlur=false] If enable motion blur
+	         * @param {number} [config.lastFrameAlpha=0.7] Motion blur factor. Larger value cause longer trailer
+	        */
+	        configLayer: function (zLevel, config) {
+	            this.painter.configLayer(zLevel, config);
+	            this._needsRefresh = true;
+	        },
+
+	        /**
+	         * Repaint the canvas immediately
+	         */
+	        refreshImmediately: function () {
+	            // Clear needsRefresh ahead to avoid something wrong happens in refresh
+	            // Or it will cause zrender refreshes again and again.
+	            this._needsRefresh = false;
+	            this.painter.refresh();
+	            /**
+	             * Avoid trigger zr.refresh in Element#beforeUpdate hook
+	             */
+	            this._needsRefresh = false;
+	        },
+
+	        /**
+	         * Mark and repaint the canvas in the next frame of browser
+	         */
+	        refresh: function() {
+	            this._needsRefresh = true;
+	        },
+
+	        /**
+	         * Add element to hover layer
+	         * @param  {module:zrender/Element} el
+	         * @param {Object} style
+	         */
+	        addHover: function (el, style) {
+	            if (this.painter.addHover) {
+	                this.painter.addHover(el, style);
+	                this.refreshHover();
+	            }
+	        },
+
+	        /**
+	         * Add element from hover layer
+	         * @param  {module:zrender/Element} el
+	         */
+	        removeHover: function (el) {
+	            if (this.painter.removeHover) {
+	                this.painter.removeHover(el);
+	                this.refreshHover();
+	            }
+	        },
+
+	        /**
+	         * Clear all hover elements in hover layer
+	         * @param  {module:zrender/Element} el
+	         */
+	        clearHover: function () {
+	            if (this.painter.clearHover) {
+	                this.painter.clearHover();
+	                this.refreshHover();
+	            }
+	        },
+
+	        /**
+	         * Refresh hover in next frame
+	         */
+	        refreshHover: function () {
+	            this._needsRefreshHover = true;
+	        },
+
+	        /**
+	         * Refresh hover immediately
+	         */
+	        refreshHoverImmediately: function () {
+	            this._needsRefreshHover = false;
+	            this.painter.refreshHover && this.painter.refreshHover();
+	        },
+
+	        /**
+	         * Resize the canvas.
+	         * Should be invoked when container size is changed
+	         */
+	        resize: function() {
+	            this.painter.resize();
+	            this.handler.resize();
+	        },
+
+	        /**
+	         * Stop and clear all animation immediately
+	         */
+	        clearAnimation: function () {
+	            this.animation.clear();
+	        },
+
+	        /**
+	         * Get container width
+	         */
+	        getWidth: function() {
+	            return this.painter.getWidth();
+	        },
+
+	        /**
+	         * Get container height
+	         */
+	        getHeight: function() {
+	            return this.painter.getHeight();
+	        },
+
+	        /**
+	         * Export the canvas as Base64 URL
+	         * @param {string} type
+	         * @param {string} [backgroundColor='#fff']
+	         * @return {string} Base64 URL
+	         */
+	        // toDataURL: function(type, backgroundColor) {
+	        //     return this.painter.getRenderedCanvas({
+	        //         backgroundColor: backgroundColor
+	        //     }).toDataURL(type);
+	        // },
+
+	        /**
+	         * Converting a path to image.
+	         * It has much better performance of drawing image rather than drawing a vector path.
+	         * @param {module:zrender/graphic/Path} e
+	         * @param {number} width
+	         * @param {number} height
+	         */
+	        pathToImage: function(e, width, height) {
+	            var id = guid();
+	            return this.painter.pathToImage(id, e, width, height);
+	        },
+
+	        /**
+	         * Set default cursor
+	         * @param {string} [cursorStyle='default'] 例如 crosshair
+	         */
+	        setCursorStyle: function (cursorStyle) {
+	            this.handler.setCursorStyle(cursorStyle);
+	        },
+
+	        /**
+	         * Bind event
+	         *
+	         * @param {string} eventName Event name
+	         * @param {Function} eventHandler Handler function
+	         * @param {Object} [context] Context object
+	         */
+	        on: function(eventName, eventHandler, context) {
+	            this.handler.on(eventName, eventHandler, context);
+	        },
+
+	        /**
+	         * Unbind event
+	         * @param {string} eventName Event name
+	         * @param {Function} [eventHandler] Handler function
+	         */
+	        off: function(eventName, eventHandler) {
+	            this.handler.off(eventName, eventHandler);
+	        },
+
+	        /**
+	         * Trigger event manually
+	         *
+	         * @param {string} eventName Event name
+	         * @param {event=} event Event object
+	         */
+	        trigger: function (eventName, event) {
+	            this.handler.trigger(eventName, event);
+	        },
+
+
+	        /**
+	         * Clear all objects and the canvas.
+	         */
+	        clear: function () {
+	            this.storage.delRoot();
+	            this.painter.clear();
+	        },
+
+	        /**
+	         * Dispose self.
+	         */
+	        dispose: function () {
+	            this.animation.stop();
+
+	            this.clear();
+	            this.storage.dispose();
+	            this.painter.dispose();
+	            this.handler.dispose();
+
+	            this.animation =
+	            this.storage =
+	            this.painter =
+	            this.handler = null;
+
+	            delInstance(this.id);
+	        }
+	    };
+
+	    module.exports = zrender;
+
+
+
+/***/ },
+/* 82 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+	/**
+	 * Handler
+	 * @module zrender/Handler
+	 * @author Kener (@Kener-林峰, kener.linfeng@gmail.com)
+	 *         errorrik (errorrik@gmail.com)
+	 *         pissang (shenyi.914@gmail.com)
+	 */
+
+
+	    var util = __webpack_require__(4);
+	    var Draggable = __webpack_require__(83);
+
+	    var Eventful = __webpack_require__(33);
+
+	    function makeEventPacket(eveType, target, event) {
+	        return {
+	            type: eveType,
+	            event: event,
+	            target: target,
+	            cancelBubble: false,
+	            offsetX: event.zrX,
+	            offsetY: event.zrY,
+	            gestureEvent: event.gestureEvent,
+	            pinchX: event.pinchX,
+	            pinchY: event.pinchY,
+	            pinchScale: event.pinchScale,
+	            wheelDelta: event.zrDelta
+	        };
+	    }
+
+	    function EmptyProxy () {}
+	    EmptyProxy.prototype.dispose = function () {};
+
+	    var handlerNames = [
+	        'click', 'dblclick', 'mousewheel', 'mouseout',
+	        'mouseup', 'mousedown', 'mousemove'
+	    ];
+	    /**
+	     * @alias module:zrender/Handler
+	     * @constructor
+	     * @extends module:zrender/mixin/Eventful
+	     * @param {HTMLElement} root Main HTML element for painting.
+	     * @param {module:zrender/Storage} storage Storage instance.
+	     * @param {module:zrender/Painter} painter Painter instance.
+	     */
+	    var Handler = function(storage, painter, proxy) {
+	        Eventful.call(this);
+
+	        this.storage = storage;
+
+	        this.painter = painter;
+
+	        proxy = proxy || new EmptyProxy();
+	        /**
+	         * Proxy of event. can be Dom, WebGLSurface, etc.
+	         */
+	        this.proxy = proxy;
+
+	        // Attach handler
+	        proxy.handler = this;
+
+	        /**
+	         * @private
+	         * @type {boolean}
+	         */
+	        this._hovered;
+
+	        /**
+	         * @private
+	         * @type {Date}
+	         */
+	        this._lastTouchMoment;
+
+	        /**
+	         * @private
+	         * @type {number}
+	         */
+	        this._lastX;
+
+	        /**
+	         * @private
+	         * @type {number}
+	         */
+	        this._lastY;
+
+
+	        Draggable.call(this);
+
+	        util.each(handlerNames, function (name) {
+	            proxy.on && proxy.on(name, this[name], this);
+	        }, this);
+	    };
+
+	    Handler.prototype = {
+
+	        constructor: Handler,
+
+	        mousemove: function (event) {
+	            var x = event.zrX;
+	            var y = event.zrY;
+
+	            var hovered = this.findHover(x, y, null);
+	            var lastHovered = this._hovered;
+	            var proxy = this.proxy;
+
+	            this._hovered = hovered;
+
+	            proxy.setCursor && proxy.setCursor(hovered ? hovered.cursor : 'default');
+
+	            // Mouse out on previous hovered element
+	            if (lastHovered && hovered !== lastHovered && lastHovered.__zr) {
+	                this.dispatchToElement(lastHovered, 'mouseout', event);
+	            }
+
+	            // Mouse moving on one element
+	            this.dispatchToElement(hovered, 'mousemove', event);
+
+	            // Mouse over on a new element
+	            if (hovered && hovered !== lastHovered) {
+	                this.dispatchToElement(hovered, 'mouseover', event);
+	            }
+	        },
+
+	        mouseout: function (event) {
+	            this.dispatchToElement(this._hovered, 'mouseout', event);
+
+	            this.trigger('globalout', {
+	                event: event
+	            });
+	        },
+
+	        /**
+	         * Resize
+	         */
+	        resize: function (event) {
+	            this._hovered = null;
+	        },
+
+	        /**
+	         * Dispatch event
+	         * @param {string} eventName
+	         * @param {event=} eventArgs
+	         */
+	        dispatch: function (eventName, eventArgs) {
+	            var handler = this[eventName];
+	            handler && handler.call(this, eventArgs);
+	        },
+
+	        /**
+	         * Dispose
+	         */
+	        dispose: function () {
+
+	            this.proxy.dispose();
+
+	            this.storage =
+	            this.proxy =
+	            this.painter = null;
+	        },
+
+	        /**
+	         * 设置默认的cursor style
+	         * @param {string} [cursorStyle='default'] 例如 crosshair
+	         */
+	        setCursorStyle: function (cursorStyle) {
+	            var proxy = this.proxy;
+	            proxy.setCursor && proxy.setCursor(cursorStyle);
+	        },
+
+	        /**
+	         * 事件分发代理
+	         *
+	         * @private
+	         * @param {Object} targetEl 目标图形元素
+	         * @param {string} eventName 事件名称
+	         * @param {Object} event 事件对象
+	         */
+	        dispatchToElement: function (targetEl, eventName, event) {
+	            var eventHandler = 'on' + eventName;
+	            var eventPacket = makeEventPacket(eventName, targetEl, event);
+
+	            var el = targetEl;
+
+	            while (el) {
+	                el[eventHandler]
+	                    && (eventPacket.cancelBubble = el[eventHandler].call(el, eventPacket));
+
+	                el.trigger(eventName, eventPacket);
+
+	                el = el.parent;
+
+	                if (eventPacket.cancelBubble) {
+	                    break;
+	                }
+	            }
+
+	            if (!eventPacket.cancelBubble) {
+	                // 冒泡到顶级 zrender 对象
+	                this.trigger(eventName, eventPacket);
+	                // 分发事件到用户自定义层
+	                // 用户有可能在全局 click 事件中 dispose，所以需要判断下 painter 是否存在
+	                this.painter && this.painter.eachOtherLayer(function (layer) {
+	                    if (typeof(layer[eventHandler]) == 'function') {
+	                        layer[eventHandler].call(layer, eventPacket);
+	                    }
+	                    if (layer.trigger) {
+	                        layer.trigger(eventName, eventPacket);
+	                    }
+	                });
+	            }
+	        },
+
+	        /**
+	         * @private
+	         * @param {number} x
+	         * @param {number} y
+	         * @param {module:zrender/graphic/Displayable} exclude
+	         * @method
+	         */
+	        findHover: function(x, y, exclude) {
+	            var list = this.storage.getDisplayList();
+	            for (var i = list.length - 1; i >= 0 ; i--) {
+	                if (!list[i].silent
+	                 && list[i] !== exclude
+	                 // getDisplayList may include ignored item in VML mode
+	                 && !list[i].ignore
+	                 && isHover(list[i], x, y)) {
+	                    return list[i];
+	                }
+	            }
+	        }
+	    };
+
+	    // Common handlers
+	    util.each(['click', 'mousedown', 'mouseup', 'mousewheel', 'dblclick'], function (name) {
+	        Handler.prototype[name] = function (event) {
+	            // Find hover again to avoid click event is dispatched manually. Or click is triggered without mouseover
+	            var hovered = this.findHover(event.zrX, event.zrY, null);
+
+	            if (name === 'mousedown') {
+	                this._downel = hovered;
+	                // In case click triggered before mouseup
+	                this._upel = hovered;
+	            }
+	            else if (name === 'mosueup') {
+	                this._upel = hovered;
+	            }
+	            else if (name === 'click') {
+	                if (this._downel !== this._upel) {
+	                    return;
+	                }
+	            }
+
+	            this.dispatchToElement(hovered, name, event);
+	        };
+	    });
+
+	    function isHover(displayable, x, y) {
+	        if (displayable[displayable.rectHover ? 'rectContain' : 'contain'](x, y)) {
+	            var el = displayable;
+	            while (el) {
+	                // If ancestor is silent or clipped by ancestor
+	                if (el.silent || (el.clipPath && !el.clipPath.contain(x, y)))  {
+	                    return false;
+	                }
+	                el = el.parent;
+	            }
+	            return true;
+	        }
+
+	        return false;
+	    }
+
+	    util.mixin(Handler, Eventful);
+	    util.mixin(Handler, Draggable);
+
+	    module.exports = Handler;
+
+
+/***/ },
+/* 83 */
+/***/ function(module, exports) {
+
+	// TODO Draggable for group
+	// FIXME Draggable on element which has parent rotation or scale
+
+	    function Draggable() {
+
+	        this.on('mousedown', this._dragStart, this);
+	        this.on('mousemove', this._drag, this);
+	        this.on('mouseup', this._dragEnd, this);
+	        this.on('globalout', this._dragEnd, this);
+	        // this._dropTarget = null;
+	        // this._draggingTarget = null;
+
+	        // this._x = 0;
+	        // this._y = 0;
+	    }
+
+	    Draggable.prototype = {
+
+	        constructor: Draggable,
+
+	        _dragStart: function (e) {
+	            var draggingTarget = e.target;
+	            if (draggingTarget && draggingTarget.draggable) {
+	                this._draggingTarget = draggingTarget;
+	                draggingTarget.dragging = true;
+	                this._x = e.offsetX;
+	                this._y = e.offsetY;
+
+	                this.dispatchToElement(draggingTarget, 'dragstart', e.event);
+	            }
+	        },
+
+	        _drag: function (e) {
+	            var draggingTarget = this._draggingTarget;
+	            if (draggingTarget) {
+
+	                var x = e.offsetX;
+	                var y = e.offsetY;
+
+	                var dx = x - this._x;
+	                var dy = y - this._y;
+	                this._x = x;
+	                this._y = y;
+
+	                draggingTarget.drift(dx, dy, e);
+	                this.dispatchToElement(draggingTarget, 'drag', e.event);
+
+	                var dropTarget = this.findHover(x, y, draggingTarget);
+	                var lastDropTarget = this._dropTarget;
+	                this._dropTarget = dropTarget;
+
+	                if (draggingTarget !== dropTarget) {
+	                    if (lastDropTarget && dropTarget !== lastDropTarget) {
+	                        this.dispatchToElement(lastDropTarget, 'dragleave', e.event);
+	                    }
+	                    if (dropTarget && dropTarget !== lastDropTarget) {
+	                        this.dispatchToElement(dropTarget, 'dragenter', e.event);
+	                    }
+	                }
+	            }
+	        },
+
+	        _dragEnd: function (e) {
+	            var draggingTarget = this._draggingTarget;
+
+	            if (draggingTarget) {
+	                draggingTarget.dragging = false;
+	            }
+
+	            this.dispatchToElement(draggingTarget, 'dragend', e.event);
+
+	            if (this._dropTarget) {
+	                this.dispatchToElement(this._dropTarget, 'drop', e.event);
+	            }
+
+	            this._draggingTarget = null;
+	            this._dropTarget = null;
+	        }
+
+	    };
+
+	    module.exports = Draggable;
+
+
+/***/ },
+/* 84 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+	/**
+	 * Storage内容仓库模块
+	 * @module zrender/Storage
+	 * @author Kener (@Kener-林峰, kener.linfeng@gmail.com)
+	 * @author errorrik (errorrik@gmail.com)
+	 * @author pissang (https://github.com/pissang/)
+	 */
+
+
+	    var util = __webpack_require__(4);
+	    var env = __webpack_require__(2);
+
+	    var Group = __webpack_require__(30);
+
+	    // Use timsort because in most case elements are partially sorted
+	    // https://jsfiddle.net/pissang/jr4x7mdm/8/
+	    var timsort = __webpack_require__(85);
+
+	    function shapeCompareFunc(a, b) {
+	        if (a.zlevel === b.zlevel) {
+	            if (a.z === b.z) {
+	                // if (a.z2 === b.z2) {
+	                //     // FIXME Slow has renderidx compare
+	                //     // http://stackoverflow.com/questions/20883421/sorting-in-javascript-should-every-compare-function-have-a-return-0-statement
+	                //     // https://github.com/v8/v8/blob/47cce544a31ed5577ffe2963f67acb4144ee0232/src/js/array.js#L1012
+	                //     return a.__renderidx - b.__renderidx;
+	                // }
+	                return a.z2 - b.z2;
+	            }
+	            return a.z - b.z;
+	        }
+	        return a.zlevel - b.zlevel;
+	    }
+	    /**
+	     * 内容仓库 (M)
+	     * @alias module:zrender/Storage
+	     * @constructor
+	     */
+	    var Storage = function () {
+	        // 所有常规形状，id索引的map
+	        this._elements = {};
+
+	        this._roots = [];
+
+	        this._displayList = [];
+
+	        this._displayListLen = 0;
+	    };
+
+	    Storage.prototype = {
+
+	        constructor: Storage,
+
+	        /**
+	         * @param  {Function} cb
+	         *
+	         */
+	        traverse: function (cb, context) {
+	            for (var i = 0; i < this._roots.length; i++) {
+	                this._roots[i].traverse(cb, context);
+	            }
+	        },
+
+	        /**
+	         * 返回所有图形的绘制队列
+	         * @param {boolean} [update=false] 是否在返回前更新该数组
+	         * @param {boolean} [includeIgnore=false] 是否包含 ignore 的数组, 在 update 为 true 的时候有效
+	         *
+	         * 详见{@link module:zrender/graphic/Displayable.prototype.updateDisplayList}
+	         * @return {Array.<module:zrender/graphic/Displayable>}
+	         */
+	        getDisplayList: function (update, includeIgnore) {
+	            includeIgnore = includeIgnore || false;
+	            if (update) {
+	                this.updateDisplayList(includeIgnore);
+	            }
+	            return this._displayList;
+	        },
+
+	        /**
+	         * 更新图形的绘制队列。
+	         * 每次绘制前都会调用，该方法会先深度优先遍历整个树，更新所有Group和Shape的变换并且把所有可见的Shape保存到数组中，
+	         * 最后根据绘制的优先级（zlevel > z > 插入顺序）排序得到绘制队列
+	         * @param {boolean} [includeIgnore=false] 是否包含 ignore 的数组
+	         */
+	        updateDisplayList: function (includeIgnore) {
+	            this._displayListLen = 0;
+	            var roots = this._roots;
+	            var displayList = this._displayList;
+	            for (var i = 0, len = roots.length; i < len; i++) {
+	                this._updateAndAddDisplayable(roots[i], null, includeIgnore);
+	            }
+	            displayList.length = this._displayListLen;
+
+	            // for (var i = 0, len = displayList.length; i < len; i++) {
+	            //     displayList[i].__renderidx = i;
+	            // }
+
+	            // displayList.sort(shapeCompareFunc);
+	            env.canvasSupported && timsort(displayList, shapeCompareFunc);
+	        },
+
+	        _updateAndAddDisplayable: function (el, clipPaths, includeIgnore) {
+
+	            if (el.ignore && !includeIgnore) {
+	                return;
+	            }
+
+	            el.beforeUpdate();
+
+	            if (el.__dirty) {
+
+	                el.update();
+
+	            }
+
+	            el.afterUpdate();
+
+	            var clipPath = el.clipPath;
+	            if (clipPath) {
+	                // clipPath 的变换是基于 group 的变换
+	                clipPath.parent = el;
+	                clipPath.updateTransform();
+
+	                // FIXME 效率影响
+	                if (clipPaths) {
+	                    clipPaths = clipPaths.slice();
+	                    clipPaths.push(clipPath);
+	                }
+	                else {
+	                    clipPaths = [clipPath];
+	                }
+	            }
+
+	            if (el.isGroup) {
+	                var children = el._children;
+
+	                for (var i = 0; i < children.length; i++) {
+	                    var child = children[i];
+
+	                    // Force to mark as dirty if group is dirty
+	                    // FIXME __dirtyPath ?
+	                    if (el.__dirty) {
+	                        child.__dirty = true;
+	                    }
+
+	                    this._updateAndAddDisplayable(child, clipPaths, includeIgnore);
+	                }
+
+	                // Mark group clean here
+	                el.__dirty = false;
+
+	            }
+	            else {
+	                el.__clipPaths = clipPaths;
+
+	                this._displayList[this._displayListLen++] = el;
+	            }
+	        },
+
+	        /**
+	         * 添加图形(Shape)或者组(Group)到根节点
+	         * @param {module:zrender/Element} el
+	         */
+	        addRoot: function (el) {
+	            // Element has been added
+	            if (this._elements[el.id]) {
+	                return;
+	            }
+
+	            if (el instanceof Group) {
+	                el.addChildrenToStorage(this);
+	            }
+
+	            this.addToMap(el);
+	            this._roots.push(el);
+	        },
+
+	        /**
+	         * 删除指定的图形(Shape)或者组(Group)
+	         * @param {string|Array.<string>} [elId] 如果为空清空整个Storage
+	         */
+	        delRoot: function (elId) {
+	            if (elId == null) {
+	                // 不指定elId清空
+	                for (var i = 0; i < this._roots.length; i++) {
+	                    var root = this._roots[i];
+	                    if (root instanceof Group) {
+	                        root.delChildrenFromStorage(this);
+	                    }
+	                }
+
+	                this._elements = {};
+	                this._roots = [];
+	                this._displayList = [];
+	                this._displayListLen = 0;
+
+	                return;
+	            }
+
+	            if (elId instanceof Array) {
+	                for (var i = 0, l = elId.length; i < l; i++) {
+	                    this.delRoot(elId[i]);
+	                }
+	                return;
+	            }
+
+	            var el;
+	            if (typeof(elId) == 'string') {
+	                el = this._elements[elId];
+	            }
+	            else {
+	                el = elId;
+	            }
+
+	            var idx = util.indexOf(this._roots, el);
+	            if (idx >= 0) {
+	                this.delFromMap(el.id);
+	                this._roots.splice(idx, 1);
+	                if (el instanceof Group) {
+	                    el.delChildrenFromStorage(this);
+	                }
+	            }
+	        },
+
+	        addToMap: function (el) {
+	            if (el instanceof Group) {
+	                el.__storage = this;
+	            }
+	            el.dirty();
+
+	            this._elements[el.id] = el;
+
+	            return this;
+	        },
+
+	        get: function (elId) {
+	            return this._elements[elId];
+	        },
+
+	        delFromMap: function (elId) {
+	            var elements = this._elements;
+	            var el = elements[elId];
+	            if (el) {
+	                delete elements[elId];
+	                if (el instanceof Group) {
+	                    el.__storage = null;
+	                }
+	            }
+
+	            return this;
+	        },
+
+	        /**
+	         * 清空并且释放Storage
+	         */
+	        dispose: function () {
+	            this._elements =
+	            this._renderList =
+	            this._roots = null;
+	        },
+
+	        displayableSortFunc: shapeCompareFunc
+	    };
+
+	    module.exports = Storage;
+
+
+
+/***/ },
+/* 85 */
+/***/ function(module, exports) {
+
+	// https://github.com/mziccard/node-timsort
+
+	    var DEFAULT_MIN_MERGE = 32;
+
+	    var DEFAULT_MIN_GALLOPING = 7;
+
+	    var DEFAULT_TMP_STORAGE_LENGTH = 256;
+
+	    function minRunLength(n) {
+	        var r = 0;
+
+	        while (n >= DEFAULT_MIN_MERGE) {
+	            r |= n & 1;
+	            n >>= 1;
+	        }
+
+	        return n + r;
+	    }
+
+	    function makeAscendingRun(array, lo, hi, compare) {
+	        var runHi = lo + 1;
+
+	        if (runHi === hi) {
+	            return 1;
+	        }
+
+	        if (compare(array[runHi++], array[lo]) < 0) {
+	            while (runHi < hi && compare(array[runHi], array[runHi - 1]) < 0) {
+	                runHi++;
+	            }
+
+	            reverseRun(array, lo, runHi);
+	        }
+	        else {
+	            while (runHi < hi && compare(array[runHi], array[runHi - 1]) >= 0) {
+	                runHi++;
+	            }
+	        }
+
+	        return runHi - lo;
+	    }
+
+	    function reverseRun(array, lo, hi) {
+	        hi--;
+
+	        while (lo < hi) {
+	            var t = array[lo];
+	            array[lo++] = array[hi];
+	            array[hi--] = t;
+	        }
+	    }
+
+	    function binaryInsertionSort(array, lo, hi, start, compare) {
+	        if (start === lo) {
+	            start++;
+	        }
+
+	        for (; start < hi; start++) {
+	            var pivot = array[start];
+
+	            var left = lo;
+	            var right = start;
+	            var mid;
+
+	            while (left < right) {
+	                mid = left + right >>> 1;
+
+	                if (compare(pivot, array[mid]) < 0) {
+	                    right = mid;
+	                }
+	                else {
+	                    left = mid + 1;
+	                }
+	            }
+
+	            var n = start - left;
+
+	            switch (n) {
+	                case 3:
+	                    array[left + 3] = array[left + 2];
+
+	                case 2:
+	                    array[left + 2] = array[left + 1];
+
+	                case 1:
+	                    array[left + 1] = array[left];
+	                    break;
+	                default:
+	                    while (n > 0) {
+	                        array[left + n] = array[left + n - 1];
+	                        n--;
+	                    }
+	            }
+
+	            array[left] = pivot;
+	        }
+	    }
+
+	    function gallopLeft(value, array, start, length, hint, compare) {
+	        var lastOffset = 0;
+	        var maxOffset = 0;
+	        var offset = 1;
+
+	        if (compare(value, array[start + hint]) > 0) {
+	            maxOffset = length - hint;
+
+	            while (offset < maxOffset && compare(value, array[start + hint + offset]) > 0) {
+	                lastOffset = offset;
+	                offset = (offset << 1) + 1;
+
+	                if (offset <= 0) {
+	                    offset = maxOffset;
+	                }
+	            }
+
+	            if (offset > maxOffset) {
+	                offset = maxOffset;
+	            }
+
+	            lastOffset += hint;
+	            offset += hint;
+	        }
+	        else {
+	            maxOffset = hint + 1;
+	            while (offset < maxOffset && compare(value, array[start + hint - offset]) <= 0) {
+	                lastOffset = offset;
+	                offset = (offset << 1) + 1;
+
+	                if (offset <= 0) {
+	                    offset = maxOffset;
+	                }
+	            }
+	            if (offset > maxOffset) {
+	                offset = maxOffset;
+	            }
+
+	            var tmp = lastOffset;
+	            lastOffset = hint - offset;
+	            offset = hint - tmp;
+	        }
+
+	        lastOffset++;
+	        while (lastOffset < offset) {
+	            var m = lastOffset + (offset - lastOffset >>> 1);
+
+	            if (compare(value, array[start + m]) > 0) {
+	                lastOffset = m + 1;
+	            }
+	            else {
+	                offset = m;
+	            }
+	        }
+	        return offset;
+	    }
+
+	    function gallopRight(value, array, start, length, hint, compare) {
+	        var lastOffset = 0;
+	        var maxOffset = 0;
+	        var offset = 1;
+
+	        if (compare(value, array[start + hint]) < 0) {
+	            maxOffset = hint + 1;
+
+	            while (offset < maxOffset && compare(value, array[start + hint - offset]) < 0) {
+	                lastOffset = offset;
+	                offset = (offset << 1) + 1;
+
+	                if (offset <= 0) {
+	                    offset = maxOffset;
+	                }
+	            }
+
+	            if (offset > maxOffset) {
+	                offset = maxOffset;
+	            }
+
+	            var tmp = lastOffset;
+	            lastOffset = hint - offset;
+	            offset = hint - tmp;
+	        }
+	        else {
+	            maxOffset = length - hint;
+
+	            while (offset < maxOffset && compare(value, array[start + hint + offset]) >= 0) {
+	                lastOffset = offset;
+	                offset = (offset << 1) + 1;
+
+	                if (offset <= 0) {
+	                    offset = maxOffset;
+	                }
+	            }
+
+	            if (offset > maxOffset) {
+	                offset = maxOffset;
+	            }
+
+	            lastOffset += hint;
+	            offset += hint;
+	        }
+
+	        lastOffset++;
+
+	        while (lastOffset < offset) {
+	            var m = lastOffset + (offset - lastOffset >>> 1);
+
+	            if (compare(value, array[start + m]) < 0) {
+	                offset = m;
+	            }
+	            else {
+	                lastOffset = m + 1;
+	            }
+	        }
+
+	        return offset;
+	    }
+
+	    function TimSort(array, compare) {
+	        var minGallop = DEFAULT_MIN_GALLOPING;
+	        var length = 0;
+	        var tmpStorageLength = DEFAULT_TMP_STORAGE_LENGTH;
+	        var stackLength = 0;
+	        var runStart;
+	        var runLength;
+	        var stackSize = 0;
+
+	        length = array.length;
+
+	        if (length < 2 * DEFAULT_TMP_STORAGE_LENGTH) {
+	            tmpStorageLength = length >>> 1;
+	        }
+
+	        var tmp = [];
+
+	        stackLength = length < 120 ? 5 : length < 1542 ? 10 : length < 119151 ? 19 : 40;
+
+	        runStart = [];
+	        runLength = [];
+
+	        function pushRun(_runStart, _runLength) {
+	            runStart[stackSize] = _runStart;
+	            runLength[stackSize] = _runLength;
+	            stackSize += 1;
+	        }
+
+	        function mergeRuns() {
+	            while (stackSize > 1) {
+	                var n = stackSize - 2;
+
+	                if (n >= 1 && runLength[n - 1] <= runLength[n] + runLength[n + 1] || n >= 2 && runLength[n - 2] <= runLength[n] + runLength[n - 1]) {
+	                    if (runLength[n - 1] < runLength[n + 1]) {
+	                        n--;
+	                    }
+	                }
+	                else if (runLength[n] > runLength[n + 1]) {
+	                    break;
+	                }
+	                mergeAt(n);
+	            }
+	        }
+
+	        function forceMergeRuns() {
+	            while (stackSize > 1) {
+	                var n = stackSize - 2;
+
+	                if (n > 0 && runLength[n - 1] < runLength[n + 1]) {
+	                    n--;
+	                }
+
+	                mergeAt(n);
+	            }
+	        }
+
+	        function mergeAt(i) {
+	            var start1 = runStart[i];
+	            var length1 = runLength[i];
+	            var start2 = runStart[i + 1];
+	            var length2 = runLength[i + 1];
+
+	            runLength[i] = length1 + length2;
+
+	            if (i === stackSize - 3) {
+	                runStart[i + 1] = runStart[i + 2];
+	                runLength[i + 1] = runLength[i + 2];
+	            }
+
+	            stackSize--;
+
+	            var k = gallopRight(array[start2], array, start1, length1, 0, compare);
+	            start1 += k;
+	            length1 -= k;
+
+	            if (length1 === 0) {
+	                return;
+	            }
+
+	            length2 = gallopLeft(array[start1 + length1 - 1], array, start2, length2, length2 - 1, compare);
+
+	            if (length2 === 0) {
+	                return;
+	            }
+
+	            if (length1 <= length2) {
+	                mergeLow(start1, length1, start2, length2);
+	            }
+	            else {
+	                mergeHigh(start1, length1, start2, length2);
+	            }
+	        }
+
+	        function mergeLow(start1, length1, start2, length2) {
+	            var i = 0;
+
+	            for (i = 0; i < length1; i++) {
+	                tmp[i] = array[start1 + i];
+	            }
+
+	            var cursor1 = 0;
+	            var cursor2 = start2;
+	            var dest = start1;
+
+	            array[dest++] = array[cursor2++];
+
+	            if (--length2 === 0) {
+	                for (i = 0; i < length1; i++) {
+	                    array[dest + i] = tmp[cursor1 + i];
+	                }
+	                return;
+	            }
+
+	            if (length1 === 1) {
+	                for (i = 0; i < length2; i++) {
+	                    array[dest + i] = array[cursor2 + i];
+	                }
+	                array[dest + length2] = tmp[cursor1];
+	                return;
+	            }
+
+	            var _minGallop = minGallop;
+	            var count1, count2, exit;
+
+	            while (1) {
+	                count1 = 0;
+	                count2 = 0;
+	                exit = false;
+
+	                do {
+	                    if (compare(array[cursor2], tmp[cursor1]) < 0) {
+	                        array[dest++] = array[cursor2++];
+	                        count2++;
+	                        count1 = 0;
+
+	                        if (--length2 === 0) {
+	                            exit = true;
+	                            break;
+	                        }
+	                    }
+	                    else {
+	                        array[dest++] = tmp[cursor1++];
+	                        count1++;
+	                        count2 = 0;
+	                        if (--length1 === 1) {
+	                            exit = true;
+	                            break;
+	                        }
+	                    }
+	                } while ((count1 | count2) < _minGallop);
+
+	                if (exit) {
+	                    break;
+	                }
+
+	                do {
+	                    count1 = gallopRight(array[cursor2], tmp, cursor1, length1, 0, compare);
+
+	                    if (count1 !== 0) {
+	                        for (i = 0; i < count1; i++) {
+	                            array[dest + i] = tmp[cursor1 + i];
+	                        }
+
+	                        dest += count1;
+	                        cursor1 += count1;
+	                        length1 -= count1;
+	                        if (length1 <= 1) {
+	                            exit = true;
+	                            break;
+	                        }
+	                    }
+
+	                    array[dest++] = array[cursor2++];
+
+	                    if (--length2 === 0) {
+	                        exit = true;
+	                        break;
+	                    }
+
+	                    count2 = gallopLeft(tmp[cursor1], array, cursor2, length2, 0, compare);
+
+	                    if (count2 !== 0) {
+	                        for (i = 0; i < count2; i++) {
+	                            array[dest + i] = array[cursor2 + i];
+	                        }
+
+	                        dest += count2;
+	                        cursor2 += count2;
+	                        length2 -= count2;
+
+	                        if (length2 === 0) {
+	                            exit = true;
+	                            break;
+	                        }
+	                    }
+	                    array[dest++] = tmp[cursor1++];
+
+	                    if (--length1 === 1) {
+	                        exit = true;
+	                        break;
+	                    }
+
+	                    _minGallop--;
+	                } while (count1 >= DEFAULT_MIN_GALLOPING || count2 >= DEFAULT_MIN_GALLOPING);
+
+	                if (exit) {
+	                    break;
+	                }
+
+	                if (_minGallop < 0) {
+	                    _minGallop = 0;
+	                }
+
+	                _minGallop += 2;
+	            }
+
+	            minGallop = _minGallop;
+
+	            minGallop < 1 && (minGallop = 1);
+
+	            if (length1 === 1) {
+	                for (i = 0; i < length2; i++) {
+	                    array[dest + i] = array[cursor2 + i];
+	                }
+	                array[dest + length2] = tmp[cursor1];
+	            }
+	            else if (length1 === 0) {
+	                throw new Error();
+	                // throw new Error('mergeLow preconditions were not respected');
+	            }
+	            else {
+	                for (i = 0; i < length1; i++) {
+	                    array[dest + i] = tmp[cursor1 + i];
+	                }
+	            }
+	        }
+
+	        function mergeHigh (start1, length1, start2, length2) {
+	            var i = 0;
+
+	            for (i = 0; i < length2; i++) {
+	                tmp[i] = array[start2 + i];
+	            }
+
+	            var cursor1 = start1 + length1 - 1;
+	            var cursor2 = length2 - 1;
+	            var dest = start2 + length2 - 1;
+	            var customCursor = 0;
+	            var customDest = 0;
+
+	            array[dest--] = array[cursor1--];
+
+	            if (--length1 === 0) {
+	                customCursor = dest - (length2 - 1);
+
+	                for (i = 0; i < length2; i++) {
+	                    array[customCursor + i] = tmp[i];
+	                }
+
+	                return;
+	            }
+
+	            if (length2 === 1) {
+	                dest -= length1;
+	                cursor1 -= length1;
+	                customDest = dest + 1;
+	                customCursor = cursor1 + 1;
+
+	                for (i = length1 - 1; i >= 0; i--) {
+	                    array[customDest + i] = array[customCursor + i];
+	                }
+
+	                array[dest] = tmp[cursor2];
+	                return;
+	            }
+
+	            var _minGallop = minGallop;
+
+	            while (true) {
+	                var count1 = 0;
+	                var count2 = 0;
+	                var exit = false;
+
+	                do {
+	                    if (compare(tmp[cursor2], array[cursor1]) < 0) {
+	                        array[dest--] = array[cursor1--];
+	                        count1++;
+	                        count2 = 0;
+	                        if (--length1 === 0) {
+	                            exit = true;
+	                            break;
+	                        }
+	                    }
+	                    else {
+	                        array[dest--] = tmp[cursor2--];
+	                        count2++;
+	                        count1 = 0;
+	                        if (--length2 === 1) {
+	                            exit = true;
+	                            break;
+	                        }
+	                    }
+	                } while ((count1 | count2) < _minGallop);
+
+	                if (exit) {
+	                    break;
+	                }
+
+	                do {
+	                    count1 = length1 - gallopRight(tmp[cursor2], array, start1, length1, length1 - 1, compare);
+
+	                    if (count1 !== 0) {
+	                        dest -= count1;
+	                        cursor1 -= count1;
+	                        length1 -= count1;
+	                        customDest = dest + 1;
+	                        customCursor = cursor1 + 1;
+
+	                        for (i = count1 - 1; i >= 0; i--) {
+	                            array[customDest + i] = array[customCursor + i];
+	                        }
+
+	                        if (length1 === 0) {
+	                            exit = true;
+	                            break;
+	                        }
+	                    }
+
+	                    array[dest--] = tmp[cursor2--];
+
+	                    if (--length2 === 1) {
+	                        exit = true;
+	                        break;
+	                    }
+
+	                    count2 = length2 - gallopLeft(array[cursor1], tmp, 0, length2, length2 - 1, compare);
+
+	                    if (count2 !== 0) {
+	                        dest -= count2;
+	                        cursor2 -= count2;
+	                        length2 -= count2;
+	                        customDest = dest + 1;
+	                        customCursor = cursor2 + 1;
+
+	                        for (i = 0; i < count2; i++) {
+	                            array[customDest + i] = tmp[customCursor + i];
+	                        }
+
+	                        if (length2 <= 1) {
+	                            exit = true;
+	                            break;
+	                        }
+	                    }
+
+	                    array[dest--] = array[cursor1--];
+
+	                    if (--length1 === 0) {
+	                        exit = true;
+	                        break;
+	                    }
+
+	                    _minGallop--;
+	                } while (count1 >= DEFAULT_MIN_GALLOPING || count2 >= DEFAULT_MIN_GALLOPING);
+
+	                if (exit) {
+	                    break;
+	                }
+
+	                if (_minGallop < 0) {
+	                    _minGallop = 0;
+	                }
+
+	                _minGallop += 2;
+	            }
+
+	            minGallop = _minGallop;
+
+	            if (minGallop < 1) {
+	                minGallop = 1;
+	            }
+
+	            if (length2 === 1) {
+	                dest -= length1;
+	                cursor1 -= length1;
+	                customDest = dest + 1;
+	                customCursor = cursor1 + 1;
+
+	                for (i = length1 - 1; i >= 0; i--) {
+	                    array[customDest + i] = array[customCursor + i];
+	                }
+
+	                array[dest] = tmp[cursor2];
+	            }
+	            else if (length2 === 0) {
+	                throw new Error();
+	                // throw new Error('mergeHigh preconditions were not respected');
+	            }
+	            else {
+	                customCursor = dest - (length2 - 1);
+	                for (i = 0; i < length2; i++) {
+	                    array[customCursor + i] = tmp[i];
+	                }
+	            }
+	        }
+
+	        this.mergeRuns = mergeRuns;
+	        this.forceMergeRuns = forceMergeRuns;
+	        this.pushRun = pushRun;
+	    }
+
+	    function sort(array, compare, lo, hi) {
+	        if (!lo) {
+	            lo = 0;
+	        }
+	        if (!hi) {
+	            hi = array.length;
+	        }
+
+	        var remaining = hi - lo;
+
+	        if (remaining < 2) {
+	            return;
+	        }
+
+	        var runLength = 0;
+
+	        if (remaining < DEFAULT_MIN_MERGE) {
+	            runLength = makeAscendingRun(array, lo, hi, compare);
+	            binaryInsertionSort(array, lo, hi, lo + runLength, compare);
+	            return;
+	        }
+
+	        var ts = new TimSort(array, compare);
+
+	        var minRun = minRunLength(remaining);
+
+	        do {
+	            runLength = makeAscendingRun(array, lo, hi, compare);
+	            if (runLength < minRun) {
+	                var force = remaining;
+	                if (force > minRun) {
+	                    force = minRun;
+	                }
+
+	                binaryInsertionSort(array, lo, lo + force, lo + runLength, compare);
+	                runLength = force;
+	            }
+
+	            ts.pushRun(lo, runLength);
+	            ts.mergeRuns();
+
+	            remaining -= runLength;
+	            lo += runLength;
+	        } while (remaining !== 0);
+
+	        ts.forceMergeRuns();
+	    }
+
+	    module.exports = sort;
+
+
+/***/ },
+/* 86 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+	/**
+	 * 动画主类, 调度和管理所有动画控制器
+	 *
+	 * @module zrender/animation/Animation
+	 * @author pissang(https://github.com/pissang)
+	 */
+	// TODO Additive animation
+	// http://iosoteric.com/additive-animations-animatewithduration-in-ios-8/
+	// https://developer.apple.com/videos/wwdc2014/#236
+
+
+	    var util = __webpack_require__(4);
+	    var Dispatcher = __webpack_require__(87).Dispatcher;
+
+	    var requestAnimationFrame = __webpack_require__(88);
+
+	    var Animator = __webpack_require__(36);
+	    /**
+	     * @typedef {Object} IZRenderStage
+	     * @property {Function} update
+	     */
+
+	    /**
+	     * @alias module:zrender/animation/Animation
+	     * @constructor
+	     * @param {Object} [options]
+	     * @param {Function} [options.onframe]
+	     * @param {IZRenderStage} [options.stage]
+	     * @example
+	     *     var animation = new Animation();
+	     *     var obj = {
+	     *         x: 100,
+	     *         y: 100
+	     *     };
+	     *     animation.animate(node.position)
+	     *         .when(1000, {
+	     *             x: 500,
+	     *             y: 500
+	     *         })
+	     *         .when(2000, {
+	     *             x: 100,
+	     *             y: 100
+	     *         })
+	     *         .start('spline');
+	     */
+	    var Animation = function (options) {
+
+	        options = options || {};
+
+	        this.stage = options.stage || {};
+
+	        this.onframe = options.onframe || function() {};
+
+	        // private properties
+	        this._clips = [];
+
+	        this._running = false;
+
+	        this._time = 0;
+
+	        Dispatcher.call(this);
+	    };
+
+	    Animation.prototype = {
+
+	        constructor: Animation,
+	        /**
+	         * 添加 clip
+	         * @param {module:zrender/animation/Clip} clip
+	         */
+	        addClip: function (clip) {
+	            this._clips.push(clip);
+	        },
+	        /**
+	         * 添加 animator
+	         * @param {module:zrender/animation/Animator} animator
+	         */
+	        addAnimator: function (animator) {
+	            animator.animation = this;
+	            var clips = animator.getClips();
+	            for (var i = 0; i < clips.length; i++) {
+	                this.addClip(clips[i]);
+	            }
+	        },
+	        /**
+	         * 删除动画片段
+	         * @param {module:zrender/animation/Clip} clip
+	         */
+	        removeClip: function(clip) {
+	            var idx = util.indexOf(this._clips, clip);
+	            if (idx >= 0) {
+	                this._clips.splice(idx, 1);
+	            }
+	        },
+
+	        /**
+	         * 删除动画片段
+	         * @param {module:zrender/animation/Animator} animator
+	         */
+	        removeAnimator: function (animator) {
+	            var clips = animator.getClips();
+	            for (var i = 0; i < clips.length; i++) {
+	                this.removeClip(clips[i]);
+	            }
+	            animator.animation = null;
+	        },
+
+	        _update: function() {
+
+	            var time = new Date().getTime();
+	            var delta = time - this._time;
+	            var clips = this._clips;
+	            var len = clips.length;
+
+	            var deferredEvents = [];
+	            var deferredClips = [];
+	            for (var i = 0; i < len; i++) {
+	                var clip = clips[i];
+	                var e = clip.step(time);
+	                // Throw out the events need to be called after
+	                // stage.update, like destroy
+	                if (e) {
+	                    deferredEvents.push(e);
+	                    deferredClips.push(clip);
+	                }
+	            }
+
+	            // Remove the finished clip
+	            for (var i = 0; i < len;) {
+	                if (clips[i]._needsRemove) {
+	                    clips[i] = clips[len - 1];
+	                    clips.pop();
+	                    len--;
+	                }
+	                else {
+	                    i++;
+	                }
+	            }
+
+	            len = deferredEvents.length;
+	            for (var i = 0; i < len; i++) {
+	                deferredClips[i].fire(deferredEvents[i]);
+	            }
+
+	            this._time = time;
+
+	            this.onframe(delta);
+
+	            this.trigger('frame', delta);
+
+	            if (this.stage.update) {
+	                this.stage.update();
+	            }
+	        },
+	        /**
+	         * 开始运行动画
+	         */
+	        start: function () {
+	            var self = this;
+
+	            this._running = true;
+
+	            function step() {
+	                if (self._running) {
+
+	                    requestAnimationFrame(step);
+
+	                    self._update();
+	                }
+	            }
+
+	            this._time = new Date().getTime();
+	            requestAnimationFrame(step);
+	        },
+	        /**
+	         * 停止运行动画
+	         */
+	        stop: function () {
+	            this._running = false;
+	        },
+	        /**
+	         * 清除所有动画片段
+	         */
+	        clear: function () {
+	            this._clips = [];
+	        },
+	        /**
+	         * 对一个目标创建一个animator对象，可以指定目标中的属性使用动画
+	         * @param  {Object} target
+	         * @param  {Object} options
+	         * @param  {boolean} [options.loop=false] 是否循环播放动画
+	         * @param  {Function} [options.getter=null]
+	         *         如果指定getter函数，会通过getter函数取属性值
+	         * @param  {Function} [options.setter=null]
+	         *         如果指定setter函数，会通过setter函数设置属性值
+	         * @return {module:zrender/animation/Animation~Animator}
+	         */
+	        animate: function (target, options) {
+	            options = options || {};
+	            var animator = new Animator(
+	                target,
+	                options.loop,
+	                options.getter,
+	                options.setter
+	            );
+
+	            return animator;
+	        }
+	    };
+
+	    util.mixin(Animation, Dispatcher);
+
+	    module.exports = Animation;
+
+
+
+/***/ },
+/* 87 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+	/**
+	 * 事件辅助类
+	 * @module zrender/core/event
+	 * @author Kener (@Kener-林峰, kener.linfeng@gmail.com)
+	 */
+
+
+	    var Eventful = __webpack_require__(33);
+
+	    var isDomLevel2 = (typeof window !== 'undefined') && !!window.addEventListener;
+
+	    function getBoundingClientRect(el) {
+	        // BlackBerry 5, iOS 3 (original iPhone) don't have getBoundingRect
+	        return el.getBoundingClientRect ? el.getBoundingClientRect() : {left: 0, top: 0};
+	    }
+
+	    function clientToLocal(el, e, out) {
+	        // clientX/clientY is according to view port.
+	        var box = getBoundingClientRect(el);
+	        out = out || {};
+	        out.zrX = e.clientX - box.left;
+	        out.zrY = e.clientY - box.top;
+	        return out;
+	    }
+
+	    /**
+	     * 如果存在第三方嵌入的一些dom触发的事件，或touch事件，需要转换一下事件坐标
+	     */
+	    function normalizeEvent(el, e) {
+
+	        e = e || window.event;
+
+	        if (e.zrX != null) {
+	            return e;
+	        }
+
+	        var eventType = e.type;
+	        var isTouch = eventType && eventType.indexOf('touch') >= 0;
+
+	        if (!isTouch) {
+	            clientToLocal(el, e, e);
+	            e.zrDelta = (e.wheelDelta) ? e.wheelDelta / 120 : -(e.detail || 0) / 3;
+	        }
+	        else {
+	            var touch = eventType != 'touchend'
+	                ? e.targetTouches[0]
+	                : e.changedTouches[0];
+	            touch && clientToLocal(el, touch, e);
+	        }
+
+	        return e;
+	    }
+
+	    function addEventListener(el, name, handler) {
+	        if (isDomLevel2) {
+	            el.addEventListener(name, handler);
+	        }
+	        else {
+	            el.attachEvent('on' + name, handler);
+	        }
+	    }
+
+	    function removeEventListener(el, name, handler) {
+	        if (isDomLevel2) {
+	            el.removeEventListener(name, handler);
+	        }
+	        else {
+	            el.detachEvent('on' + name, handler);
+	        }
+	    }
+
+	    /**
+	     * 停止冒泡和阻止默认行为
+	     * @memberOf module:zrender/core/event
+	     * @method
+	     * @param {Event} e : event对象
+	     */
+	    var stop = isDomLevel2
+	        ? function (e) {
+	            e.preventDefault();
+	            e.stopPropagation();
+	            e.cancelBubble = true;
+	        }
+	        : function (e) {
+	            e.returnValue = false;
+	            e.cancelBubble = true;
+	        };
+
+	    module.exports = {
+	        clientToLocal: clientToLocal,
+	        normalizeEvent: normalizeEvent,
+	        addEventListener: addEventListener,
+	        removeEventListener: removeEventListener,
+
+	        stop: stop,
+	        // 做向上兼容
+	        Dispatcher: Eventful
+	    };
+
+
+
+/***/ },
+/* 88 */
+/***/ function(module, exports) {
+
+	
+
+	    module.exports = (typeof window !== 'undefined' &&
+	                                    (window.requestAnimationFrame
+	                                    || window.msRequestAnimationFrame
+	                                    || window.mozRequestAnimationFrame
+	                                    || window.webkitRequestAnimationFrame))
+	                                || function (func) {
+	                                    setTimeout(func, 16);
+	                                };
+
+
+
+/***/ },
+/* 89 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var eventTool = __webpack_require__(87);
+	    var zrUtil = __webpack_require__(4);
+	    var Eventful = __webpack_require__(33);
+	    var env = __webpack_require__(2);
+	    var GestureMgr = __webpack_require__(90);
+
+	    var addEventListener = eventTool.addEventListener;
+	    var removeEventListener = eventTool.removeEventListener;
+	    var normalizeEvent = eventTool.normalizeEvent;
+
+	    var TOUCH_CLICK_DELAY = 300;
+
+	    var mouseHandlerNames = [
+	        'click', 'dblclick', 'mousewheel', 'mouseout',
+	        'mouseup', 'mousedown', 'mousemove'
+	    ];
+
+	    var touchHandlerNames = [
+	        'touchstart', 'touchend', 'touchmove'
+	    ];
+
+	    function eventNameFix(name) {
+	        return (name === 'mousewheel' && env.browser.firefox) ? 'DOMMouseScroll' : name;
+	    }
+
+	    function processGesture(proxy, event, stage) {
+	        var gestureMgr = proxy._gestureMgr;
+
+	        stage === 'start' && gestureMgr.clear();
+
+	        var gestureInfo = gestureMgr.recognize(
+	            event,
+	            proxy.handler.findHover(event.zrX, event.zrY, null),
+	            proxy.dom
+	        );
+
+	        stage === 'end' && gestureMgr.clear();
+
+	        if (gestureInfo) {
+	            // eventTool.stop(event);
+	            var type = gestureInfo.type;
+	            event.gestureEvent = type;
+
+	            proxy.handler.dispatchToElement(gestureInfo.target, type, gestureInfo.event);
+	        }
+	    }
+
+	    /**
+	     * Prevent mouse event from being dispatched after Touch Events action
+	     * @see <https://github.com/deltakosh/handjs/blob/master/src/hand.base.js>
+	     * 1. Mobile browsers dispatch mouse events 300ms after touchend.
+	     * 2. Chrome for Android dispatch mousedown for long-touch about 650ms
+	     * Result: Blocking Mouse Events for 700ms.
+	     */
+	    function setTouchTimer(instance) {
+	        instance._touching = true;
+	        clearTimeout(instance._touchTimer);
+	        instance._touchTimer = setTimeout(function () {
+	            instance._touching = false;
+	        }, 700);
+	    }
+
+	    function useTouchEvent() {
+	        return env.touchEventsSupported;
+	    }
+
+	    var domHandlers = {
+	        /**
+	         * Mouse move handler
+	         * @inner
+	         * @param {Event} event
+	         */
+	        mousemove: function (event) {
+	            event = normalizeEvent(this.dom, event);
+
+	            this.trigger('mousemove', event);
+	        },
+
+	        /**
+	         * Mouse out handler
+	         * @inner
+	         * @param {Event} event
+	         */
+	        mouseout: function (event) {
+	            event = normalizeEvent(this.dom, event);
+
+	            var element = event.toElement || event.relatedTarget;
+	            if (element != this.dom) {
+	                while (element && element.nodeType != 9) {
+	                    // 忽略包含在root中的dom引起的mouseOut
+	                    if (element === this.dom) {
+	                        return;
+	                    }
+
+	                    element = element.parentNode;
+	                }
+	            }
+
+	            this.trigger('mouseout', event);
+	        },
+
+	        /**
+	         * Touch开始响应函数
+	         * @inner
+	         * @param {Event} event
+	         */
+	        touchstart: function (event) {
+	            // Default mouse behaviour should not be disabled here.
+	            // For example, page may needs to be slided.
+
+	            event = normalizeEvent(this.dom, event);
+
+	            this._lastTouchMoment = new Date();
+
+	            processGesture(this, event, 'start');
+
+	            // 平板补充一次findHover
+	            // this._mobileFindFixed(event);
+	            // Trigger mousemove and mousedown
+	            domHandlers.mousemove.call(this, event);
+
+	            domHandlers.mousedown.call(this, event);
+
+	            setTouchTimer(this);
+	        },
+
+	        /**
+	         * Touch移动响应函数
+	         * @inner
+	         * @param {Event} event
+	         */
+	        touchmove: function (event) {
+
+	            event = normalizeEvent(this.dom, event);
+
+	            processGesture(this, event, 'change');
+
+	            // Mouse move should always be triggered no matter whether
+	            // there is gestrue event, because mouse move and pinch may
+	            // be used at the same time.
+	            domHandlers.mousemove.call(this, event);
+
+	            setTouchTimer(this);
+	        },
+
+	        /**
+	         * Touch结束响应函数
+	         * @inner
+	         * @param {Event} event
+	         */
+	        touchend: function (event) {
+
+	            event = normalizeEvent(this.dom, event);
+
+	            processGesture(this, event, 'end');
+
+	            domHandlers.mouseup.call(this, event);
+
+	            // click event should always be triggered no matter whether
+	            // there is gestrue event. System click can not be prevented.
+	            if (+new Date() - this._lastTouchMoment < TOUCH_CLICK_DELAY) {
+	                domHandlers.click.call(this, event);
+	            }
+
+	            setTouchTimer(this);
+	        }
+	    };
+
+	    // Common handlers
+	    zrUtil.each(['click', 'mousedown', 'mouseup', 'mousewheel', 'dblclick'], function (name) {
+	        domHandlers[name] = function (event) {
+	            event = normalizeEvent(this.dom, event);
+	            this.trigger(name, event);
+	        };
+	    });
+
+	    /**
+	     * 为控制类实例初始化dom 事件处理函数
+	     *
+	     * @inner
+	     * @param {module:zrender/Handler} instance 控制类实例
+	     */
+	    function initDomHandler(instance) {
+	        for (var i = 0; i < touchHandlerNames.length; i++) {
+	            var name = touchHandlerNames[i];
+	            instance._handlers[name] = zrUtil.bind(domHandlers[name], instance);
+	        }
+
+	        for (var i = 0; i < mouseHandlerNames.length; i++) {
+	            var name = mouseHandlerNames[i];
+	            instance._handlers[name] = makeMouseHandler(domHandlers[name], instance);
+	        }
+
+	        function makeMouseHandler(fn, instance) {
+	            return function () {
+	                if (instance._touching) {
+	                    return;
+	                }
+	                return fn.apply(instance, arguments);
+	            };
+	        }
+	    }
+
+
+	    function HandlerDomProxy(dom) {
+	        Eventful.call(this);
+
+	        this.dom = dom;
+
+	        /**
+	         * @private
+	         * @type {boolean}
+	         */
+	        this._touching = false;
+
+	        /**
+	         * @private
+	         * @type {number}
+	         */
+	        this._touchTimer;
+
+	        /**
+	         * @private
+	         * @type {module:zrender/core/GestureMgr}
+	         */
+	        this._gestureMgr = new GestureMgr();
+
+	        this._handlers = {};
+
+	        initDomHandler(this);
+
+	        if (useTouchEvent()) {
+	            mountHandlers(touchHandlerNames, this);
+
+	            // Handler of 'mouseout' event is needed in touch mode, which will be mounted below.
+	            // addEventListener(root, 'mouseout', this._mouseoutHandler);
+	        }
+
+	        // Considering some devices that both enable touch and mouse event (like MS Surface
+	        // and lenovo X240, @see #2350), we make mouse event be always listened, otherwise
+	        // mouse event can not be handle in those devices.
+	        mountHandlers(mouseHandlerNames, this);
+
+	        function mountHandlers(handlerNames, instance) {
+	            zrUtil.each(handlerNames, function (name) {
+	                addEventListener(dom, eventNameFix(name), instance._handlers[name]);
+	            }, instance);
+	        }
+	    }
+
+	    var handlerDomProxyProto = HandlerDomProxy.prototype;
+	    handlerDomProxyProto.dispose = function () {
+	        var handlerNames = mouseHandlerNames.concat(touchHandlerNames);
+
+	        for (var i = 0; i < handlerNames.length; i++) {
+	            var name = handlerNames[i];
+	            removeEventListener(this.dom, eventNameFix(name), this._handlers[name]);
+	        }
+	    };
+
+	    handlerDomProxyProto.setCursor = function (cursorStyle) {
+	        this.dom.style.cursor = cursorStyle || 'default';
+	    };
+
+	    zrUtil.mixin(HandlerDomProxy, Eventful);
+
+	    module.exports = HandlerDomProxy;
+
+
+/***/ },
+/* 90 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+	/**
+	 * Only implements needed gestures for mobile.
+	 */
+
+
+	    var eventUtil = __webpack_require__(87);
+
+	    var GestureMgr = function () {
+
+	        /**
+	         * @private
+	         * @type {Array.<Object>}
+	         */
+	        this._track = [];
+	    };
+
+	    GestureMgr.prototype = {
+
+	        constructor: GestureMgr,
+
+	        recognize: function (event, target, root) {
+	            this._doTrack(event, target, root);
+	            return this._recognize(event);
+	        },
+
+	        clear: function () {
+	            this._track.length = 0;
+	            return this;
+	        },
+
+	        _doTrack: function (event, target, root) {
+	            var touches = event.touches;
+
+	            if (!touches) {
+	                return;
+	            }
+
+	            var trackItem = {
+	                points: [],
+	                touches: [],
+	                target: target,
+	                event: event
+	            };
+
+	            for (var i = 0, len = touches.length; i < len; i++) {
+	                var touch = touches[i];
+	                var pos = eventUtil.clientToLocal(root, touch);
+	                trackItem.points.push([pos.zrX, pos.zrY]);
+	                trackItem.touches.push(touch);
+	            }
+
+	            this._track.push(trackItem);
+	        },
+
+	        _recognize: function (event) {
+	            for (var eventName in recognizers) {
+	                if (recognizers.hasOwnProperty(eventName)) {
+	                    var gestureInfo = recognizers[eventName](this._track, event);
+	                    if (gestureInfo) {
+	                        return gestureInfo;
+	                    }
+	                }
+	            }
+	        }
+	    };
+
+	    function dist(pointPair) {
+	        var dx = pointPair[1][0] - pointPair[0][0];
+	        var dy = pointPair[1][1] - pointPair[0][1];
+
+	        return Math.sqrt(dx * dx + dy * dy);
+	    }
+
+	    function center(pointPair) {
+	        return [
+	            (pointPair[0][0] + pointPair[1][0]) / 2,
+	            (pointPair[0][1] + pointPair[1][1]) / 2
+	        ];
+	    }
+
+	    var recognizers = {
+
+	        pinch: function (track, event) {
+	            var trackLen = track.length;
+
+	            if (!trackLen) {
+	                return;
+	            }
+
+	            var pinchEnd = (track[trackLen - 1] || {}).points;
+	            var pinchPre = (track[trackLen - 2] || {}).points || pinchEnd;
+
+	            if (pinchPre
+	                && pinchPre.length > 1
+	                && pinchEnd
+	                && pinchEnd.length > 1
+	            ) {
+	                var pinchScale = dist(pinchEnd) / dist(pinchPre);
+	                !isFinite(pinchScale) && (pinchScale = 1);
+
+	                event.pinchScale = pinchScale;
+
+	                var pinchCenter = center(pinchEnd);
+	                event.pinchX = pinchCenter[0];
+	                event.pinchY = pinchCenter[1];
+
+	                return {
+	                    type: 'pinch',
+	                    target: track[0].target,
+	                    event: event
+	                };
+	            }
+	        }
+
+	        // Only pinch currently.
+	    };
+
+	    module.exports = GestureMgr;
+
+
+
+/***/ },
+/* 91 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+	/**
+	 * Default canvas painter
+	 * @module zrender/Painter
+	 * @author Kener (@Kener-林峰, kener.linfeng@gmail.com)
+	 *         errorrik (errorrik@gmail.com)
+	 *         pissang (https://www.github.com/pissang)
+	 */
+	 
+
+	    var config = __webpack_require__(41);
+	    var util = __webpack_require__(4);
+	    var log = __webpack_require__(40);
+	    var BoundingRect = __webpack_require__(9);
+	    var timsort = __webpack_require__(85);
+
+	    var Layer = __webpack_require__(92);
+
+	    var requestAnimationFrame = __webpack_require__(88);
+
+	    // PENDIGN
+	    // Layer exceeds MAX_PROGRESSIVE_LAYER_NUMBER may have some problem when flush directly second time.
+	    //
+	    // Maximum progressive layer. When exceeding this number. All elements will be drawed in the last layer.
+	    var MAX_PROGRESSIVE_LAYER_NUMBER = 5;
+
+	    function parseInt10(val) {
+	        return parseInt(val, 10);
+	    }
+
+	    function isLayerValid(layer) {
+	        if (!layer) {
+	            return false;
+	        }
+
+	        if (layer.isBuildin) {
+	            return true;
+	        }
+
+	        if (typeof(layer.resize) !== 'function'
+	            || typeof(layer.refresh) !== 'function'
+	        ) {
+	            return false;
+	        }
+
+	        return true;
+	    }
+
+	    function preProcessLayer(layer) {
+	        layer.__unusedCount++;
+	    }
+
+	    function postProcessLayer(layer) {
+	        if (layer.__unusedCount == 1) {
+	            layer.clear();
+	        }
+	    }
+
+	    var tmpRect = new BoundingRect(0, 0, 0, 0);
+	    var viewRect = new BoundingRect(0, 0, 0, 0);
+	    function isDisplayableCulled(el, width, height) {
+	        tmpRect.copy(el.getBoundingRect());
+	        if (el.transform) {
+	            tmpRect.applyTransform(el.transform);
+	        }
+	        viewRect.width = width;
+	        viewRect.height = height;
+	        return !tmpRect.intersect(viewRect);
+	    }
+
+	    function isClipPathChanged(clipPaths, prevClipPaths) {
+	        if (clipPaths == prevClipPaths) { // Can both be null or undefined
+	            return false;
+	        }
+
+	        if (!clipPaths || !prevClipPaths || (clipPaths.length !== prevClipPaths.length)) {
+	            return true;
+	        }
+	        for (var i = 0; i < clipPaths.length; i++) {
+	            if (clipPaths[i] !== prevClipPaths[i]) {
+	                return true;
+	            }
+	        }
+	    }
+
+	    function doClip(clipPaths, ctx) {
+	        for (var i = 0; i < clipPaths.length; i++) {
+	            var clipPath = clipPaths[i];
+	            var m;
+	            if (clipPath.transform) {
+	                m = clipPath.transform;
+	                ctx.transform(
+	                    m[0], m[1],
+	                    m[2], m[3],
+	                    m[4], m[5]
+	                );
+	            }
+	            var path = clipPath.path;
+	            path.beginPath(ctx);
+	            clipPath.buildPath(path, clipPath.shape);
+	            ctx.clip();
+	            // Transform back
+	            if (clipPath.transform) {
+	                m = clipPath.invTransform;
+	                ctx.transform(
+	                    m[0], m[1],
+	                    m[2], m[3],
+	                    m[4], m[5]
+	                );
+	            }
+	        }
+	    }
+
+	    function createRoot(width, height) {
+	        var domRoot = document.createElement('div');
+	        var domRootStyle = domRoot.style;
+
+	        // domRoot.onselectstart = returnFalse; // 避免页面选中的尴尬
+	        domRootStyle.position = 'relative';
+	        domRootStyle.overflow = 'hidden';
+	        domRootStyle.width = width + 'px';
+	        domRootStyle.height = height + 'px';
+	        return domRoot;
+	    }
+
+	    /**
+	     * @alias module:zrender/Painter
+	     * @constructor
+	     * @param {HTMLElement} root 绘图容器
+	     * @param {module:zrender/Storage} storage
+	     * @param {Ojbect} opts
+	     */
+	    var Painter = function (root, storage, opts) {
+	        // In node environment using node-canvas
+	        var singleCanvas = !root.nodeName // In node ?
+	            || root.nodeName.toUpperCase() === 'CANVAS';
+
+	        opts = opts || {};
+
+	        /**
+	         * @type {number}
+	         */
+	        this.dpr = opts.devicePixelRatio || config.devicePixelRatio;
+	        /**
+	         * @type {boolean}
+	         * @private
+	         */
+	        this._singleCanvas = singleCanvas;
+	        /**
+	         * 绘图容器
+	         * @type {HTMLElement}
+	         */
+	        this.root = root;
+
+	        var rootStyle = root.style;
+
+	        if (rootStyle) {
+	            rootStyle['-webkit-tap-highlight-color'] = 'transparent';
+	            rootStyle['-webkit-user-select'] =
+	            rootStyle['user-select'] =
+	            rootStyle['-webkit-touch-callout'] = 'none';
+
+	            root.innerHTML = '';
+	        }
+
+	        /**
+	         * @type {module:zrender/Storage}
+	         */
+	        this.storage = storage;
+
+	        /**
+	         * @type {Array.<number>}
+	         * @private
+	         */
+	        var zlevelList = this._zlevelList = [];
+
+	        /**
+	         * @type {Object.<string, module:zrender/Layer>}
+	         * @private
+	         */
+	        var layers = this._layers = {};
+
+	        /**
+	         * @type {Object.<string, Object>}
+	         * @type {private}
+	         */
+	        this._layerConfig = {};
+
+	        if (!singleCanvas) {
+	            this._width = this._getWidth();
+	            this._height = this._getHeight();
+
+	            var domRoot = this._domRoot = createRoot(
+	                this._width, this._height
+	            );
+	            root.appendChild(domRoot);
+	        }
+	        else {
+	            // Use canvas width and height directly
+	            var width = root.width;
+	            var height = root.height;
+	            this._width = width;
+	            this._height = height;
+
+	            // Create layer if only one given canvas
+	            // Device pixel ratio is fixed to 1 because given canvas has its specified width and height
+	            var mainLayer = new Layer(root, this, 1);
+	            mainLayer.initContext();
+	            // FIXME Use canvas width and height
+	            // mainLayer.resize(width, height);
+	            layers[0] = mainLayer;
+	            zlevelList.push(0);
+	        }
+
+	        this.pathToImage = this._createPathToImage();
+
+	        // Layers for progressive rendering
+	        this._progressiveLayers = [];
+
+	        /**
+	         * @type {module:zrender/Layer}
+	         * @private
+	         */
+	        this._hoverlayer;
+
+	        this._hoverElements = [];
+	    };
+
+	    Painter.prototype = {
+
+	        constructor: Painter,
+
+	        /**
+	         * If painter use a single canvas
+	         * @return {boolean}
+	         */
+	        isSingleCanvas: function () {
+	            return this._singleCanvas;
+	        },
+	        /**
+	         * @return {HTMLDivElement}
+	         */
+	        getViewportRoot: function () {
+	            return this._singleCanvas ? this._layers[0].dom : this._domRoot;
+	        },
+
+	        /**
+	         * 刷新
+	         * @param {boolean} [paintAll=false] 强制绘制所有displayable
+	         */
+	        refresh: function (paintAll) {
+
+	            var list = this.storage.getDisplayList(true);
+
+	            var zlevelList = this._zlevelList;
+
+	            this._paintList(list, paintAll);
+
+	            // Paint custum layers
+	            for (var i = 0; i < zlevelList.length; i++) {
+	                var z = zlevelList[i];
+	                var layer = this._layers[z];
+	                if (!layer.isBuildin && layer.refresh) {
+	                    layer.refresh();
+	                }
+	            }
+
+	            this.refreshHover();
+
+	            if (this._progressiveLayers.length) {
+	                this._startProgessive();
+	            }
+
+	            return this;
+	        },
+
+	        addHover: function (el, hoverStyle) {
+	            if (el.__hoverMir) {
+	                return;
+	            }
+	            var elMirror = new el.constructor({
+	                style: el.style,
+	                shape: el.shape
+	            });
+	            elMirror.__from = el;
+	            el.__hoverMir = elMirror;
+	            elMirror.setStyle(hoverStyle);
+	            this._hoverElements.push(elMirror);
+	        },
+
+	        removeHover: function (el) {
+	            var elMirror = el.__hoverMir;
+	            var hoverElements = this._hoverElements;
+	            var idx = util.indexOf(hoverElements, elMirror);
+	            if (idx >= 0) {
+	                hoverElements.splice(idx, 1);
+	            }
+	            el.__hoverMir = null;
+	        },
+
+	        clearHover: function (el) {
+	            var hoverElements = this._hoverElements;
+	            for (var i = 0; i < hoverElements.length; i++) {
+	                var from = hoverElements[i].__from;
+	                if (from) {
+	                    from.__hoverMir = null;
+	                }
+	            }
+	            hoverElements.length = 0;
+	        },
+
+	        refreshHover: function () {
+	            var hoverElements = this._hoverElements;
+	            var len = hoverElements.length;
+	            var hoverLayer = this._hoverlayer;
+	            hoverLayer && hoverLayer.clear();
+
+	            if (!len) {
+	                return;
+	            }
+	            timsort(hoverElements, this.storage.displayableSortFunc);
+
+	            // Use a extream large zlevel
+	            // FIXME?
+	            if (!hoverLayer) {
+	                hoverLayer = this._hoverlayer = this.getLayer(1e5);
+	            }
+
+	            var scope = {};
+	            hoverLayer.ctx.save();
+	            for (var i = 0; i < len;) {
+	                var el = hoverElements[i];
+	                var originalEl = el.__from;
+	                // Original el is removed
+	                // PENDING
+	                if (!(originalEl && originalEl.__zr)) {
+	                    hoverElements.splice(i, 1);
+	                    originalEl.__hoverMir = null;
+	                    len--;
+	                    continue;
+	                }
+	                i++;
+
+	                // Use transform
+	                // FIXME style and shape ?
+	                if (!originalEl.invisible) {
+	                    el.transform = originalEl.transform;
+	                    el.invTransform = originalEl.invTransform;
+	                    el.__clipPaths = originalEl.__clipPaths;
+	                    // el.
+	                    this._doPaintEl(el, hoverLayer, true, scope);
+	                }
+	            }
+	            hoverLayer.ctx.restore();
+	        },
+
+	        _startProgessive: function () {
+	            var self = this;
+
+	            if (!self._furtherProgressive) {
+	                return;
+	            }
+
+	            // Use a token to stop progress steps triggered by
+	            // previous zr.refresh calling.
+	            var token = self._progressiveToken = +new Date();
+
+	            self._progress++;
+	            requestAnimationFrame(step);
+
+	            function step() {
+	                // In case refreshed or disposed
+	                if (token === self._progressiveToken && self.storage) {
+
+	                    self._doPaintList(self.storage.getDisplayList());
+
+	                    if (self._furtherProgressive) {
+	                        self._progress++;
+	                        requestAnimationFrame(step);
+	                    }
+	                    else {
+	                        self._progressiveToken = -1;
+	                    }
+	                }
+	            }
+	        },
+
+	        _clearProgressive: function () {
+	            this._progressiveToken = -1;
+	            this._progress = 0;
+	            util.each(this._progressiveLayers, function (layer) {
+	                layer.__dirty && layer.clear();
+	            });
+	        },
+
+	        _paintList: function (list, paintAll) {
+
+	            if (paintAll == null) {
+	                paintAll = false;
+	            }
+
+	            this._updateLayerStatus(list);
+
+	            this._clearProgressive();
+
+	            this.eachBuildinLayer(preProcessLayer);
+
+	            this._doPaintList(list, paintAll);
+
+	            this.eachBuildinLayer(postProcessLayer);
+	        },
+
+	        _doPaintList: function (list, paintAll) {
+	            var currentLayer;
+	            var currentZLevel;
+	            var ctx;
+
+	            // var invTransform = [];
+	            var scope;
+
+	            var progressiveLayerIdx = 0;
+	            var currentProgressiveLayer;
+
+	            var width = this._width;
+	            var height = this._height;
+	            var layerProgress;
+	            var frame = this._progress;
+	            function flushProgressiveLayer(layer) {
+	                ctx.save();
+	                ctx.globalAlpha = 1;
+	                ctx.shadowBlur = 0;
+	                // Avoid layer don't clear in next progressive frame
+	                currentLayer.__dirty = true;
+	                ctx.drawImage(layer.dom, 0, 0, width, height);
+	                ctx.restore();
+
+	                currentLayer.ctx.restore();
+	            }
+
+	            for (var i = 0, l = list.length; i < l; i++) {
+	                var el = list[i];
+	                var elZLevel = this._singleCanvas ? 0 : el.zlevel;
+
+	                var elFrame = el.__frame;
+
+	                // Flush at current context
+	                // PENDING
+	                if (elFrame < 0 && currentProgressiveLayer) {
+	                    flushProgressiveLayer(currentProgressiveLayer);
+	                    currentProgressiveLayer = null;
+	                }
+
+	                // Change draw layer
+	                if (currentZLevel !== elZLevel) {
+	                    if (ctx) {
+	                        ctx.restore();
+	                    }
+
+	                    // Reset scope
+	                    scope = {};
+
+	                    // Only 0 zlevel if only has one canvas
+	                    currentZLevel = elZLevel;
+	                    currentLayer = this.getLayer(currentZLevel);
+
+	                    if (!currentLayer.isBuildin) {
+	                        log(
+	                            'ZLevel ' + currentZLevel
+	                            + ' has been used by unkown layer ' + currentLayer.id
+	                        );
+	                    }
+
+	                    ctx = currentLayer.ctx;
+	                    ctx.save();
+
+	                    // Reset the count
+	                    currentLayer.__unusedCount = 0;
+
+	                    if (currentLayer.__dirty || paintAll) {
+	                        currentLayer.clear();
+	                    }
+	                }
+
+	                if (!(currentLayer.__dirty || paintAll)) {
+	                    continue;
+	                }
+	                if (elFrame >= 0) {
+	                    // Progressive layer changed
+	                    if (!currentProgressiveLayer) {
+	                        currentProgressiveLayer = this._progressiveLayers[
+	                            Math.min(progressiveLayerIdx++, MAX_PROGRESSIVE_LAYER_NUMBER - 1)
+	                        ];
+
+	                        currentProgressiveLayer.ctx.save();
+	                        currentProgressiveLayer.renderScope = {};
+
+	                        if (currentProgressiveLayer
+	                            && (currentProgressiveLayer.__progress > currentProgressiveLayer.__maxProgress)
+	                        ) {
+	                            // flushProgressiveLayer(currentProgressiveLayer);
+	                            // Quick jump all progressive elements
+	                            // All progressive element are not dirty, jump over and flush directly
+	                            i = currentProgressiveLayer.__nextIdxNotProg - 1;
+	                            // currentProgressiveLayer = null;
+	                            continue;
+	                        }
+
+	                        layerProgress = currentProgressiveLayer.__progress;
+
+	                        if (!currentProgressiveLayer.__dirty) {
+	                            // Keep rendering
+	                            frame = layerProgress;
+	                        }
+
+	                        currentProgressiveLayer.__progress = frame + 1;
+	                    }
+
+	                    if (elFrame === frame) {
+	                        this._doPaintEl(el, currentProgressiveLayer, true, currentProgressiveLayer.renderScope);
+	                    }
+	                }
+	                else {
+	                    this._doPaintEl(el, currentLayer, paintAll, scope);
+	                }
+
+	                el.__dirty = false;
+	            }
+
+	            if (currentProgressiveLayer) {
+	                flushProgressiveLayer(currentProgressiveLayer);
+	            }
+
+	            // Restore the lastLayer ctx
+	            ctx && ctx.restore();
+	            // If still has clipping state
+	            // if (scope.prevElClipPaths) {
+	            //     ctx.restore();
+	            // }
+
+	            this._furtherProgressive = false;
+	            util.each(this._progressiveLayers, function (layer) {
+	                if (layer.__maxProgress >= layer.__progress) {
+	                    this._furtherProgressive = true;
+	                }
+	            }, this);
+	        },
+
+	        _doPaintEl: function (el, currentLayer, forcePaint, scope) {
+	            var ctx = currentLayer.ctx;
+
+	            if (
+	                (currentLayer.__dirty || forcePaint)
+	                // Ignore invisible element
+	                && !el.invisible
+	                // Ignore transparent element
+	                && el.style.opacity !== 0
+	                // Ignore scale 0 element, in some environment like node-canvas
+	                // Draw a scale 0 element can cause all following draw wrong
+	                && el.scale[0] && el.scale[1]
+	                // Ignore culled element
+	                && !(el.culling && isDisplayableCulled(el, this._width, this._height))
+	            ) {
+
+	                var clipPaths = el.__clipPaths;
+
+	                // Optimize when clipping on group with several elements
+	                if (scope.prevClipLayer !== currentLayer
+	                    || isClipPathChanged(clipPaths, scope.prevElClipPaths)
+	                ) {
+	                    // If has previous clipping state, restore from it
+	                    if (scope.prevElClipPaths) {
+	                        scope.prevClipLayer.ctx.restore();
+	                        scope.prevClipLayer = scope.prevElClipPaths = null;
+
+	                        // Reset prevEl since context has been restored
+	                        scope.prevEl = null;
+	                    }
+	                    // New clipping state
+	                    if (clipPaths) {
+	                        ctx.save();
+	                        doClip(clipPaths, ctx);
+	                        scope.prevClipLayer = currentLayer;
+	                        scope.prevElClipPaths = clipPaths;
+	                    }
+	                }
+	                el.beforeBrush && el.beforeBrush(ctx);
+
+	                el.brush(ctx, scope.prevEl || null);
+	                scope.prevEl = el;
+
+	                el.afterBrush && el.afterBrush(ctx);
+	            }
+	        },
+
+	        /**
+	         * 获取 zlevel 所在层，如果不存在则会创建一个新的层
+	         * @param {number} zlevel
+	         * @return {module:zrender/Layer}
+	         */
+	        getLayer: function (zlevel) {
+	            if (this._singleCanvas) {
+	                return this._layers[0];
+	            }
+
+	            var layer = this._layers[zlevel];
+	            if (!layer) {
+	                // Create a new layer
+	                layer = new Layer('zr_' + zlevel, this, this.dpr);
+	                layer.isBuildin = true;
+
+	                if (this._layerConfig[zlevel]) {
+	                    util.merge(layer, this._layerConfig[zlevel], true);
+	                }
+
+	                this.insertLayer(zlevel, layer);
+
+	                // Context is created after dom inserted to document
+	                // Or excanvas will get 0px clientWidth and clientHeight
+	                layer.initContext();
+	            }
+
+	            return layer;
+	        },
+
+	        insertLayer: function (zlevel, layer) {
+
+	            var layersMap = this._layers;
+	            var zlevelList = this._zlevelList;
+	            var len = zlevelList.length;
+	            var prevLayer = null;
+	            var i = -1;
+	            var domRoot = this._domRoot;
+
+	            if (layersMap[zlevel]) {
+	                log('ZLevel ' + zlevel + ' has been used already');
+	                return;
+	            }
+	            // Check if is a valid layer
+	            if (!isLayerValid(layer)) {
+	                log('Layer of zlevel ' + zlevel + ' is not valid');
+	                return;
+	            }
+
+	            if (len > 0 && zlevel > zlevelList[0]) {
+	                for (i = 0; i < len - 1; i++) {
+	                    if (
+	                        zlevelList[i] < zlevel
+	                        && zlevelList[i + 1] > zlevel
+	                    ) {
+	                        break;
+	                    }
+	                }
+	                prevLayer = layersMap[zlevelList[i]];
+	            }
+	            zlevelList.splice(i + 1, 0, zlevel);
+
+	            if (prevLayer) {
+	                var prevDom = prevLayer.dom;
+	                if (prevDom.nextSibling) {
+	                    domRoot.insertBefore(
+	                        layer.dom,
+	                        prevDom.nextSibling
+	                    );
+	                }
+	                else {
+	                    domRoot.appendChild(layer.dom);
+	                }
+	            }
+	            else {
+	                if (domRoot.firstChild) {
+	                    domRoot.insertBefore(layer.dom, domRoot.firstChild);
+	                }
+	                else {
+	                    domRoot.appendChild(layer.dom);
+	                }
+	            }
+
+	            layersMap[zlevel] = layer;
+	        },
+
+	        // Iterate each layer
+	        eachLayer: function (cb, context) {
+	            var zlevelList = this._zlevelList;
+	            var z;
+	            var i;
+	            for (i = 0; i < zlevelList.length; i++) {
+	                z = zlevelList[i];
+	                cb.call(context, this._layers[z], z);
+	            }
+	        },
+
+	        // Iterate each buildin layer
+	        eachBuildinLayer: function (cb, context) {
+	            var zlevelList = this._zlevelList;
+	            var layer;
+	            var z;
+	            var i;
+	            for (i = 0; i < zlevelList.length; i++) {
+	                z = zlevelList[i];
+	                layer = this._layers[z];
+	                if (layer.isBuildin) {
+	                    cb.call(context, layer, z);
+	                }
+	            }
+	        },
+
+	        // Iterate each other layer except buildin layer
+	        eachOtherLayer: function (cb, context) {
+	            var zlevelList = this._zlevelList;
+	            var layer;
+	            var z;
+	            var i;
+	            for (i = 0; i < zlevelList.length; i++) {
+	                z = zlevelList[i];
+	                layer = this._layers[z];
+	                if (! layer.isBuildin) {
+	                    cb.call(context, layer, z);
+	                }
+	            }
+	        },
+
+	        /**
+	         * 获取所有已创建的层
+	         * @param {Array.<module:zrender/Layer>} [prevLayer]
+	         */
+	        getLayers: function () {
+	            return this._layers;
+	        },
+
+	        _updateLayerStatus: function (list) {
+
+	            var layers = this._layers;
+	            var progressiveLayers = this._progressiveLayers;
+
+	            var elCountsLastFrame = {};
+	            var progressiveElCountsLastFrame = {};
+
+	            this.eachBuildinLayer(function (layer, z) {
+	                elCountsLastFrame[z] = layer.elCount;
+	                layer.elCount = 0;
+	                layer.__dirty = false;
+	            });
+
+	            util.each(progressiveLayers, function (layer, idx) {
+	                progressiveElCountsLastFrame[idx] = layer.elCount;
+	                layer.elCount = 0;
+	                layer.__dirty = false;
+	            });
+
+	            var progressiveLayerCount = 0;
+	            var currentProgressiveLayer;
+	            var lastProgressiveKey;
+	            var frameCount = 0;
+	            for (var i = 0, l = list.length; i < l; i++) {
+	                var el = list[i];
+	                var zlevel = this._singleCanvas ? 0 : el.zlevel;
+	                var layer = layers[zlevel];
+	                var elProgress = el.progressive;
+	                if (layer) {
+	                    layer.elCount++;
+	                    layer.__dirty = layer.__dirty || el.__dirty;
+	                }
+
+	                /////// Update progressive
+	                if (elProgress >= 0) {
+	                    // Fix wrong progressive sequence problem.
+	                    if (lastProgressiveKey !== elProgress) {
+	                        lastProgressiveKey = elProgress;
+	                        frameCount++;
+	                    }
+	                    var elFrame = el.__frame = frameCount - 1;
+	                    if (!currentProgressiveLayer) {
+	                        var idx = Math.min(progressiveLayerCount, MAX_PROGRESSIVE_LAYER_NUMBER - 1);
+	                        currentProgressiveLayer = progressiveLayers[idx];
+	                        if (!currentProgressiveLayer) {
+	                            currentProgressiveLayer = progressiveLayers[idx] = new Layer(
+	                                'progressive', this, this.dpr
+	                            );
+	                            currentProgressiveLayer.initContext();
+	                        }
+	                        currentProgressiveLayer.__maxProgress = 0;
+	                    }
+	                    currentProgressiveLayer.__dirty = currentProgressiveLayer.__dirty || el.__dirty;
+	                    currentProgressiveLayer.elCount++;
+
+	                    currentProgressiveLayer.__maxProgress = Math.max(
+	                        currentProgressiveLayer.__maxProgress, elFrame
+	                    );
+
+	                    if (currentProgressiveLayer.__maxProgress >= currentProgressiveLayer.__progress) {
+	                        // Should keep rendering this  layer because progressive rendering is not finished yet
+	                        layer.__dirty = true;
+	                    }
+	                }
+	                else {
+	                    el.__frame = -1;
+
+	                    if (currentProgressiveLayer) {
+	                        currentProgressiveLayer.__nextIdxNotProg = i;
+	                        progressiveLayerCount++;
+	                        currentProgressiveLayer = null;
+	                    }
+	                }
+	            }
+
+	            if (currentProgressiveLayer) {
+	                progressiveLayerCount++;
+	                currentProgressiveLayer.__nextIdxNotProg = i;
+	            }
+
+	            // 层中的元素数量有发生变化
+	            this.eachBuildinLayer(function (layer, z) {
+	                if (elCountsLastFrame[z] !== layer.elCount) {
+	                    layer.__dirty = true;
+	                }
+	            });
+
+	            progressiveLayers.length = Math.min(progressiveLayerCount, MAX_PROGRESSIVE_LAYER_NUMBER);
+	            util.each(progressiveLayers, function (layer, idx) {
+	                if (progressiveElCountsLastFrame[idx] !== layer.elCount) {
+	                    el.__dirty = true;
+	                }
+	                if (layer.__dirty) {
+	                    layer.__progress = 0;
+	                }
+	            });
+	        },
+
+	        /**
+	         * 清除hover层外所有内容
+	         */
+	        clear: function () {
+	            this.eachBuildinLayer(this._clearLayer);
+	            return this;
+	        },
+
+	        _clearLayer: function (layer) {
+	            layer.clear();
+	        },
+
+	        /**
+	         * 修改指定zlevel的绘制参数
+	         *
+	         * @param {string} zlevel
+	         * @param {Object} config 配置对象
+	         * @param {string} [config.clearColor=0] 每次清空画布的颜色
+	         * @param {string} [config.motionBlur=false] 是否开启动态模糊
+	         * @param {number} [config.lastFrameAlpha=0.7]
+	         *                 在开启动态模糊的时候使用，与上一帧混合的alpha值，值越大尾迹越明显
+	         */
+	        configLayer: function (zlevel, config) {
+	            if (config) {
+	                var layerConfig = this._layerConfig;
+	                if (!layerConfig[zlevel]) {
+	                    layerConfig[zlevel] = config;
+	                }
+	                else {
+	                    util.merge(layerConfig[zlevel], config, true);
+	                }
+
+	                var layer = this._layers[zlevel];
+
+	                if (layer) {
+	                    util.merge(layer, layerConfig[zlevel], true);
+	                }
+	            }
+	        },
+
+	        /**
+	         * 删除指定层
+	         * @param {number} zlevel 层所在的zlevel
+	         */
+	        delLayer: function (zlevel) {
+	            var layers = this._layers;
+	            var zlevelList = this._zlevelList;
+	            var layer = layers[zlevel];
+	            if (!layer) {
+	                return;
+	            }
+	            layer.dom.parentNode.removeChild(layer.dom);
+	            delete layers[zlevel];
+
+	            zlevelList.splice(util.indexOf(zlevelList, zlevel), 1);
+	        },
+
+	        /**
+	         * 区域大小变化后重绘
+	         */
+	        resize: function (width, height) {
+	            var domRoot = this._domRoot;
+	            // FIXME Why ?
+	            domRoot.style.display = 'none';
+
+	            width = width || this._getWidth();
+	            height = height || this._getHeight();
+
+	            domRoot.style.display = '';
+
+	            // 优化没有实际改变的resize
+	            if (this._width != width || height != this._height) {
+	                domRoot.style.width = width + 'px';
+	                domRoot.style.height = height + 'px';
+
+	                for (var id in this._layers) {
+	                    this._layers[id].resize(width, height);
+	                }
+
+	                this.refresh(true);
+	            }
+
+	            this._width = width;
+	            this._height = height;
+
+	            return this;
+	        },
+
+	        /**
+	         * 清除单独的一个层
+	         * @param {number} zlevel
+	         */
+	        clearLayer: function (zlevel) {
+	            var layer = this._layers[zlevel];
+	            if (layer) {
+	                layer.clear();
+	            }
+	        },
+
+	        /**
+	         * 释放
+	         */
+	        dispose: function () {
+	            this.root.innerHTML = '';
+
+	            this.root =
+	            this.storage =
+
+	            this._domRoot =
+	            this._layers = null;
+	        },
+
+	        /**
+	         * Get canvas which has all thing rendered
+	         * @param {Object} opts
+	         * @param {string} [opts.backgroundColor]
+	         */
+	        getRenderedCanvas: function (opts) {
+	            opts = opts || {};
+	            if (this._singleCanvas) {
+	                return this._layers[0].dom;
+	            }
+
+	            var imageLayer = new Layer('image', this, opts.pixelRatio || this.dpr);
+	            imageLayer.initContext();
+
+	            imageLayer.clearColor = opts.backgroundColor;
+	            imageLayer.clear();
+
+	            var displayList = this.storage.getDisplayList(true);
+
+	            var scope = {};
+	            for (var i = 0; i < displayList.length; i++) {
+	                var el = displayList[i];
+	                this._doPaintEl(el, imageLayer, true, scope);
+	            }
+
+	            return imageLayer.dom;
+	        },
+	        /**
+	         * 获取绘图区域宽度
+	         */
+	        getWidth: function () {
+	            return this._width;
+	        },
+
+	        /**
+	         * 获取绘图区域高度
+	         */
+	        getHeight: function () {
+	            return this._height;
+	        },
+
+	        _getWidth: function () {
+	            var root = this.root;
+	            var stl = document.defaultView.getComputedStyle(root);
+
+	            // FIXME Better way to get the width and height when element has not been append to the document
+	            return ((root.clientWidth || parseInt10(stl.width) || parseInt10(root.style.width))
+	                    - (parseInt10(stl.paddingLeft) || 0)
+	                    - (parseInt10(stl.paddingRight) || 0)) | 0;
+	        },
+
+	        _getHeight: function () {
+	            var root = this.root;
+	            var stl = document.defaultView.getComputedStyle(root);
+
+	            return ((root.clientHeight || parseInt10(stl.height) || parseInt10(root.style.height))
+	                    - (parseInt10(stl.paddingTop) || 0)
+	                    - (parseInt10(stl.paddingBottom) || 0)) | 0;
+	        },
+
+	        _pathToImage: function (id, path, width, height, dpr) {
+	            var canvas = document.createElement('canvas');
+	            var ctx = canvas.getContext('2d');
+
+	            canvas.width = width * dpr;
+	            canvas.height = height * dpr;
+
+	            ctx.clearRect(0, 0, width * dpr, height * dpr);
+
+	            var pathTransform = {
+	                position: path.position,
+	                rotation: path.rotation,
+	                scale: path.scale
+	            };
+	            path.position = [0, 0, 0];
+	            path.rotation = 0;
+	            path.scale = [1, 1];
+	            if (path) {
+	                path.brush(ctx);
+	            }
+
+	            var ImageShape = __webpack_require__(62);
+	            var imgShape = new ImageShape({
+	                id: id,
+	                style: {
+	                    x: 0,
+	                    y: 0,
+	                    image: canvas
+	                }
+	            });
+
+	            if (pathTransform.position != null) {
+	                imgShape.position = path.position = pathTransform.position;
+	            }
+
+	            if (pathTransform.rotation != null) {
+	                imgShape.rotation = path.rotation = pathTransform.rotation;
+	            }
+
+	            if (pathTransform.scale != null) {
+	                imgShape.scale = path.scale = pathTransform.scale;
+	            }
+
+	            return imgShape;
+	        },
+
+	        _createPathToImage: function () {
+	            var me = this;
+
+	            return function (id, e, width, height) {
+	                return me._pathToImage(
+	                    id, e, width, height, me.dpr
+	                );
+	            };
+	        }
+	    };
+
+	    module.exports = Painter;
+
+
+
+/***/ },
+/* 92 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @module zrender/Layer
+	 * @author pissang(https://www.github.com/pissang)
+	 */
+
+
+	    var util = __webpack_require__(4);
+	    var config = __webpack_require__(41);
+	    var Style = __webpack_require__(47);
+	    var Pattern = __webpack_require__(59);
+
+	    function returnFalse() {
+	        return false;
+	    }
+
+	    /**
+	     * 创建dom
+	     *
+	     * @inner
+	     * @param {string} id dom id 待用
+	     * @param {string} type dom type，such as canvas, div etc.
+	     * @param {Painter} painter painter instance
+	     * @param {number} number
+	     */
+	    function createDom(id, type, painter, dpr) {
+	        var newDom = document.createElement(type);
+	        var width = painter.getWidth();
+	        var height = painter.getHeight();
+
+	        var newDomStyle = newDom.style;
+	        // 没append呢，请原谅我这样写，清晰~
+	        newDomStyle.position = 'absolute';
+	        newDomStyle.left = 0;
+	        newDomStyle.top = 0;
+	        newDomStyle.width = width + 'px';
+	        newDomStyle.height = height + 'px';
+	        newDom.width = width * dpr;
+	        newDom.height = height * dpr;
+
+	        // id不作为索引用，避免可能造成的重名，定义为私有属性
+	        newDom.setAttribute('data-zr-dom-id', id);
+	        return newDom;
+	    }
+
+	    /**
+	     * @alias module:zrender/Layer
+	     * @constructor
+	     * @extends module:zrender/mixin/Transformable
+	     * @param {string} id
+	     * @param {module:zrender/Painter} painter
+	     * @param {number} [dpr]
+	     */
+	    var Layer = function(id, painter, dpr) {
+	        var dom;
+	        dpr = dpr || config.devicePixelRatio;
+	        if (typeof id === 'string') {
+	            dom = createDom(id, 'canvas', painter, dpr);
+	        }
+	        // Not using isDom because in node it will return false
+	        else if (util.isObject(id)) {
+	            dom = id;
+	            id = dom.id;
+	        }
+	        this.id = id;
+	        this.dom = dom;
+
+	        var domStyle = dom.style;
+	        if (domStyle) { // Not in node
+	            dom.onselectstart = returnFalse; // 避免页面选中的尴尬
+	            domStyle['-webkit-user-select'] = 'none';
+	            domStyle['user-select'] = 'none';
+	            domStyle['-webkit-touch-callout'] = 'none';
+	            domStyle['-webkit-tap-highlight-color'] = 'rgba(0,0,0,0)';
+	        }
+
+	        this.domBack = null;
+	        this.ctxBack = null;
+
+	        this.painter = painter;
+
+	        this.config = null;
+
+	        // Configs
+	        /**
+	         * 每次清空画布的颜色
+	         * @type {string}
+	         * @default 0
+	         */
+	        this.clearColor = 0;
+	        /**
+	         * 是否开启动态模糊
+	         * @type {boolean}
+	         * @default false
+	         */
+	        this.motionBlur = false;
+	        /**
+	         * 在开启动态模糊的时候使用，与上一帧混合的alpha值，值越大尾迹越明显
+	         * @type {number}
+	         * @default 0.7
+	         */
+	        this.lastFrameAlpha = 0.7;
+
+	        /**
+	         * Layer dpr
+	         * @type {number}
+	         */
+	        this.dpr = dpr;
+	    };
+
+	    Layer.prototype = {
+
+	        constructor: Layer,
+
+	        elCount: 0,
+
+	        __dirty: true,
+
+	        initContext: function () {
+	            this.ctx = this.dom.getContext('2d');
+
+	            var dpr = this.dpr;
+	            if (dpr != 1) {
+	                this.ctx.scale(dpr, dpr);
+	            }
+	        },
+
+	        createBackBuffer: function () {
+	            var dpr = this.dpr;
+
+	            this.domBack = createDom('back-' + this.id, 'canvas', this.painter, dpr);
+	            this.ctxBack = this.domBack.getContext('2d');
+
+	            if (dpr != 1) {
+	                this.ctxBack.scale(dpr, dpr);
+	            }
+	        },
+
+	        /**
+	         * @param  {number} width
+	         * @param  {number} height
+	         */
+	        resize: function (width, height) {
+	            var dpr = this.dpr;
+
+	            var dom = this.dom;
+	            var domStyle = dom.style;
+	            var domBack = this.domBack;
+
+	            domStyle.width = width + 'px';
+	            domStyle.height = height + 'px';
+
+	            dom.width = width * dpr;
+	            dom.height = height * dpr;
+
+	            if (dpr != 1) {
+	                this.ctx.scale(dpr, dpr);
+	            }
+
+	            if (domBack) {
+	                domBack.width = width * dpr;
+	                domBack.height = height * dpr;
+
+	                if (dpr != 1) {
+	                    this.ctxBack.scale(dpr, dpr);
+	                }
+	            }
+	        },
+
+	        /**
+	         * 清空该层画布
+	         * @param {boolean} clearAll Clear all with out motion blur
+	         */
+	        clear: function (clearAll) {
+	            var dom = this.dom;
+	            var ctx = this.ctx;
+	            var width = dom.width;
+	            var height = dom.height;
+
+	            var clearColor = this.clearColor;
+	            var haveMotionBLur = this.motionBlur && !clearAll;
+	            var lastFrameAlpha = this.lastFrameAlpha;
+
+	            var dpr = this.dpr;
+
+	            if (haveMotionBLur) {
+	                if (!this.domBack) {
+	                    this.createBackBuffer();
+	                }
+
+	                this.ctxBack.globalCompositeOperation = 'copy';
+	                this.ctxBack.drawImage(
+	                    dom, 0, 0,
+	                    width / dpr,
+	                    height / dpr
+	                );
+	            }
+
+	            ctx.clearRect(0, 0, width / dpr, height / dpr);
+	            if (clearColor) {
+	                var clearColorGradientOrPattern;
+	                // Gradient
+	                if (clearColor.colorStops) {
+	                    // Cache canvas gradient
+	                    clearColorGradientOrPattern = clearColor.__canvasGradient || Style.getGradient(ctx, clearColor, {
+	                        x: 0,
+	                        y: 0,
+	                        width: width / dpr,
+	                        height: height / dpr
+	                    });
+
+	                    clearColor.__canvasGradient = clearColorGradientOrPattern;
+	                }
+	                // Pattern
+	                else if (clearColor.image) {
+	                    clearColorGradientOrPattern = Pattern.prototype.getCanvasPattern.call(clearColor, ctx);
+	                }
+	                ctx.save();
+	                ctx.fillStyle = clearColorGradientOrPattern || clearColor;
+	                ctx.fillRect(0, 0, width / dpr, height / dpr);
+	                ctx.restore();
+	            }
+
+	            if (haveMotionBLur) {
+	                var domBack = this.domBack;
+	                ctx.save();
+	                ctx.globalAlpha = lastFrameAlpha;
+	                ctx.drawImage(domBack, 0, 0, width / dpr, height / dpr);
+	                ctx.restore();
+	            }
+	        }
+	    };
+
+	    module.exports = Layer;
+
+
+/***/ },
+/* 93 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var graphic = __webpack_require__(43);
+	    var zrUtil = __webpack_require__(4);
+	    var PI = Math.PI;
+	    /**
+	     * @param {module:echarts/ExtensionAPI} api
+	     * @param {Object} [opts]
+	     * @param {string} [opts.text]
+	     * @param {string} [opts.color]
+	     * @param {string} [opts.textColor]
+	     * @return {module:zrender/Element}
+	     */
+	    module.exports = function (api, opts) {
+	        opts = opts || {};
+	        zrUtil.defaults(opts, {
+	            text: 'loading',
+	            color: '#c23531',
+	            textColor: '#000',
+	            maskColor: 'rgba(255, 255, 255, 0.8)',
+	            zlevel: 0
+	        });
+	        var mask = new graphic.Rect({
+	            style: {
+	                fill: opts.maskColor
+	            },
+	            zlevel: opts.zlevel,
+	            z: 10000
+	        });
+	        var arc = new graphic.Arc({
+	            shape: {
+	                startAngle: -PI / 2,
+	                endAngle: -PI / 2 + 0.1,
+	                r: 10
+	            },
+	            style: {
+	                stroke: opts.color,
+	                lineCap: 'round',
+	                lineWidth: 5
+	            },
+	            zlevel: opts.zlevel,
+	            z: 10001
+	        });
+	        var labelRect = new graphic.Rect({
+	            style: {
+	                fill: 'none',
+	                text: opts.text,
+	                textPosition: 'right',
+	                textDistance: 10,
+	                textFill: opts.textColor
+	            },
+	            zlevel: opts.zlevel,
+	            z: 10001
+	        });
+
+	        arc.animateShape(true)
+	            .when(1000, {
+	                endAngle: PI * 3 / 2
+	            })
+	            .start('circularInOut');
+	        arc.animateShape(true)
+	            .when(1000, {
+	                startAngle: PI * 3 / 2
+	            })
+	            .delay(300)
+	            .start('circularInOut');
+
+	        var group = new graphic.Group();
+	        group.add(arc);
+	        group.add(labelRect);
+	        group.add(mask);
+	        // Inject resize
+	        group.resize = function () {
+	            var cx = api.getWidth() / 2;
+	            var cy = api.getHeight() / 2;
+	            arc.setShape({
+	                cx: cx,
+	                cy: cy
+	            });
+	            var r = arc.shape.r;
+	            labelRect.setShape({
+	                x: cx - r,
+	                y: cy - r,
+	                width: r * 2,
+	                height: r * 2
+	            });
+
+	            mask.setShape({
+	                x: 0,
+	                y: 0,
+	                width: api.getWidth(),
+	                height: api.getHeight()
+	            });
+	        };
+	        group.resize();
+	        return group;
+	    };
+
+
+/***/ },
+/* 94 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+	    var Gradient = __webpack_require__(61);
+	    module.exports = function (ecModel) {
+	        function encodeColor(seriesModel) {
+	            var colorAccessPath = (seriesModel.visualColorAccessPath || 'itemStyle.normal.color').split('.');
+	            var data = seriesModel.getData();
+	            var color = seriesModel.get(colorAccessPath) // Set in itemStyle
+	                || seriesModel.getColorFromPalette(seriesModel.get('name'));  // Default color
+
+	            // FIXME Set color function or use the platte color
+	            data.setVisual('color', color);
+
+	            // Only visible series has each data be visual encoded
+	            if (!ecModel.isSeriesFiltered(seriesModel)) {
+	                if (typeof color === 'function' && !(color instanceof Gradient)) {
+	                    data.each(function (idx) {
+	                        data.setItemVisual(
+	                            idx, 'color', color(seriesModel.getDataParams(idx))
+	                        );
+	                    });
+	                }
+
+	                // itemStyle in each data item
+	                data.each(function (idx) {
+	                    var itemModel = data.getItemModel(idx);
+	                    var color = itemModel.get(colorAccessPath, true);
+	                    if (color != null) {
+	                        data.setItemVisual(idx, 'color', color);
+	                    }
+	                });
+	            }
+	        }
+	        ecModel.eachRawSeries(encodeColor);
+	    };
+
+
+/***/ },
+/* 95 */
+/***/ function(module, exports, __webpack_require__) {
+
+	// Compatitable with 2.0
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var compatStyle = __webpack_require__(96);
+
+	    function get(opt, path) {
+	        path = path.split(',');
+	        var obj = opt;
+	        for (var i = 0; i < path.length; i++) {
+	            obj = obj && obj[path[i]];
+	            if (obj == null) {
+	                break;
+	            }
+	        }
+	        return obj;
+	    }
+
+	    function set(opt, path, val, overwrite) {
+	        path = path.split(',');
+	        var obj = opt;
+	        var key;
+	        for (var i = 0; i < path.length - 1; i++) {
+	            key = path[i];
+	            if (obj[key] == null) {
+	                obj[key] = {};
+	            }
+	            obj = obj[key];
+	        }
+	        if (overwrite || obj[path[i]] == null) {
+	            obj[path[i]] = val;
+	        }
+	    }
+
+	    function compatLayoutProperties(option) {
+	        each(LAYOUT_PROPERTIES, function (prop) {
+	            if (prop[0] in option && !(prop[1] in option)) {
+	                option[prop[1]] = option[prop[0]];
+	            }
+	        });
+	    }
+
+	    var LAYOUT_PROPERTIES = [
+	        ['x', 'left'], ['y', 'top'], ['x2', 'right'], ['y2', 'bottom']
+	    ];
+
+	    var COMPATITABLE_COMPONENTS = [
+	        'grid', 'geo', 'parallel', 'legend', 'toolbox', 'title', 'visualMap', 'dataZoom', 'timeline'
+	    ];
+
+	    var COMPATITABLE_SERIES = [
+	        'bar', 'boxplot', 'candlestick', 'chord', 'effectScatter',
+	        'funnel', 'gauge', 'lines', 'graph', 'heatmap', 'line', 'map', 'parallel',
+	        'pie', 'radar', 'sankey', 'scatter', 'treemap'
+	    ];
+
+	    var each = zrUtil.each;
+
+	    module.exports = function (option) {
+	        each(option.series, function (seriesOpt) {
+	            if (!zrUtil.isObject(seriesOpt)) {
+	                return;
+	            }
+
+	            var seriesType = seriesOpt.type;
+
+	            compatStyle(seriesOpt);
+
+	            if (seriesType === 'pie' || seriesType === 'gauge') {
+	                if (seriesOpt.clockWise != null) {
+	                    seriesOpt.clockwise = seriesOpt.clockWise;
+	                }
+	            }
+	            if (seriesType === 'gauge') {
+	                var pointerColor = get(seriesOpt, 'pointer.color');
+	                pointerColor != null
+	                    && set(seriesOpt, 'itemStyle.normal.color', pointerColor);
+	            }
+
+	            for (var i = 0; i < COMPATITABLE_SERIES.length; i++) {
+	                if (COMPATITABLE_SERIES[i] === seriesOpt.type) {
+	                    compatLayoutProperties(seriesOpt);
+	                    break;
+	                }
+	            }
+	        });
+
+	        // dataRange has changed to visualMap
+	        if (option.dataRange) {
+	            option.visualMap = option.dataRange;
+	        }
+
+	        each(COMPATITABLE_COMPONENTS, function (componentName) {
+	            var options = option[componentName];
+	            if (options) {
+	                if (!zrUtil.isArray(options)) {
+	                    options = [options];
+	                }
+	                each(options, function (option) {
+	                    compatLayoutProperties(option);
+	                });
+	            }
+	        });
+	    };
+
+
+/***/ },
+/* 96 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+
+	    var POSSIBLE_STYLES = [
+	        'areaStyle', 'lineStyle', 'nodeStyle', 'linkStyle',
+	        'chordStyle', 'label', 'labelLine'
+	    ];
+
+	    function compatItemStyle(opt) {
+	        var itemStyleOpt = opt && opt.itemStyle;
+	        if (itemStyleOpt) {
+	            zrUtil.each(POSSIBLE_STYLES, function (styleName) {
+	                var normalItemStyleOpt = itemStyleOpt.normal;
+	                var emphasisItemStyleOpt = itemStyleOpt.emphasis;
+	                if (normalItemStyleOpt && normalItemStyleOpt[styleName]) {
+	                    opt[styleName] = opt[styleName] || {};
+	                    if (!opt[styleName].normal) {
+	                        opt[styleName].normal = normalItemStyleOpt[styleName];
+	                    }
+	                    else {
+	                        zrUtil.merge(opt[styleName].normal, normalItemStyleOpt[styleName]);
+	                    }
+	                    normalItemStyleOpt[styleName] = null;
+	                }
+	                if (emphasisItemStyleOpt && emphasisItemStyleOpt[styleName]) {
+	                    opt[styleName] = opt[styleName] || {};
+	                    if (!opt[styleName].emphasis) {
+	                        opt[styleName].emphasis = emphasisItemStyleOpt[styleName];
+	                    }
+	                    else {
+	                        zrUtil.merge(opt[styleName].emphasis, emphasisItemStyleOpt[styleName]);
+	                    }
+	                    emphasisItemStyleOpt[styleName] = null;
+	                }
+	            });
+	        }
+	    }
+
+	    module.exports = function (seriesOpt) {
+	        if (!seriesOpt) {
+	            return;
+	        }
+	        compatItemStyle(seriesOpt);
+	        compatItemStyle(seriesOpt.markPoint);
+	        compatItemStyle(seriesOpt.markLine);
+	        var data = seriesOpt.data;
+	        if (data) {
+	            for (var i = 0; i < data.length; i++) {
+	                compatItemStyle(data[i]);
+	            }
+	            // mark point data
+	            var markPoint = seriesOpt.markPoint;
+	            if (markPoint && markPoint.data) {
+	                var mpData = markPoint.data;
+	                for (var i = 0; i < mpData.length; i++) {
+	                    compatItemStyle(mpData[i]);
+	                }
+	            }
+	            // mark line data
+	            var markLine = seriesOpt.markLine;
+	            if (markLine && markLine.data) {
+	                var mlData = markLine.data;
+	                for (var i = 0; i < mlData.length; i++) {
+	                    if (zrUtil.isArray(mlData[i])) {
+	                        compatItemStyle(mlData[i][0]);
+	                        compatItemStyle(mlData[i][1]);
+	                    }
+	                    else {
+	                        compatItemStyle(mlData[i]);
+	                    }
+	                }
+	            }
+	        }
+	    };
+
+
+/***/ },
+/* 97 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/* WEBPACK VAR INJECTION */(function(global) {/**
+	 * List for data storage
+	 * @module echarts/data/List
+	 */
+
+
+	    var UNDEFINED = 'undefined';
+	    var globalObj = typeof window === 'undefined' ? global : window;
+	    var Float64Array = typeof globalObj.Float64Array === UNDEFINED
+	        ? Array : globalObj.Float64Array;
+	    var Int32Array = typeof globalObj.Int32Array === UNDEFINED
+	        ? Array : globalObj.Int32Array;
+
+	    var dataCtors = {
+	        'float': Float64Array,
+	        'int': Int32Array,
+	        // Ordinal data type can be string or int
+	        'ordinal': Array,
+	        'number': Array,
+	        'time': Array
+	    };
+
+	    var Model = __webpack_require__(12);
+	    var DataDiffer = __webpack_require__(98);
+
+	    var zrUtil = __webpack_require__(4);
+	    var modelUtil = __webpack_require__(5);
+	    var isObject = zrUtil.isObject;
+
+	    var TRANSFERABLE_PROPERTIES = [
+	        'stackedOn', 'hasItemOption', '_nameList', '_idList', '_rawData'
+	    ];
+
+	    var transferProperties = function (a, b) {
+	        zrUtil.each(TRANSFERABLE_PROPERTIES.concat(b.__wrappedMethods || []), function (propName) {
+	            if (b.hasOwnProperty(propName)) {
+	                a[propName] = b[propName];
+	            }
+	        });
+
+	        a.__wrappedMethods = b.__wrappedMethods;
+	    };
+
+	    /**
+	     * @constructor
+	     * @alias module:echarts/data/List
+	     *
+	     * @param {Array.<string>} dimensions
+	     *        Dimensions should be concrete names like x, y, z, lng, lat, angle, radius
+	     * @param {module:echarts/model/Model} hostModel
+	     */
+	    var List = function (dimensions, hostModel) {
+
+	        dimensions = dimensions || ['x', 'y'];
+
+	        var dimensionInfos = {};
+	        var dimensionNames = [];
+	        for (var i = 0; i < dimensions.length; i++) {
+	            var dimensionName;
+	            var dimensionInfo = {};
+	            if (typeof dimensions[i] === 'string') {
+	                dimensionName = dimensions[i];
+	                dimensionInfo = {
+	                    name: dimensionName,
+	                    stackable: false,
+	                    // Type can be 'float', 'int', 'number'
+	                    // Default is number, Precision of float may not enough
+	                    type: 'number'
+	                };
+	            }
+	            else {
+	                dimensionInfo = dimensions[i];
+	                dimensionName = dimensionInfo.name;
+	                dimensionInfo.type = dimensionInfo.type || 'number';
+	            }
+	            dimensionNames.push(dimensionName);
+	            dimensionInfos[dimensionName] = dimensionInfo;
+	        }
+	        /**
+	         * @readOnly
+	         * @type {Array.<string>}
+	         */
+	        this.dimensions = dimensionNames;
+
+	        /**
+	         * Infomation of each data dimension, like data type.
+	         * @type {Object}
+	         */
+	        this._dimensionInfos = dimensionInfos;
+
+	        /**
+	         * @type {module:echarts/model/Model}
+	         */
+	        this.hostModel = hostModel;
+
+	        /**
+	         * @type {module:echarts/model/Model}
+	         */
+	        this.dataType;
+
+	        /**
+	         * Indices stores the indices of data subset after filtered.
+	         * This data subset will be used in chart.
+	         * @type {Array.<number>}
+	         * @readOnly
+	         */
+	        this.indices = [];
+
+	        /**
+	         * Data storage
+	         * @type {Object.<key, TypedArray|Array>}
+	         * @private
+	         */
+	        this._storage = {};
+
+	        /**
+	         * @type {Array.<string>}
+	         */
+	        this._nameList = [];
+	        /**
+	         * @type {Array.<string>}
+	         */
+	        this._idList = [];
+	        /**
+	         * Models of data option is stored sparse for optimizing memory cost
+	         * @type {Array.<module:echarts/model/Model>}
+	         * @private
+	         */
+	        this._optionModels = [];
+
+	        /**
+	         * @param {module:echarts/data/List}
+	         */
+	        this.stackedOn = null;
+
+	        /**
+	         * Global visual properties after visual coding
+	         * @type {Object}
+	         * @private
+	         */
+	        this._visual = {};
+
+	        /**
+	         * Globel layout properties.
+	         * @type {Object}
+	         * @private
+	         */
+	        this._layout = {};
+
+	        /**
+	         * Item visual properties after visual coding
+	         * @type {Array.<Object>}
+	         * @private
+	         */
+	        this._itemVisuals = [];
+
+	        /**
+	         * Item layout properties after layout
+	         * @type {Array.<Object>}
+	         * @private
+	         */
+	        this._itemLayouts = [];
+
+	        /**
+	         * Graphic elemnents
+	         * @type {Array.<module:zrender/Element>}
+	         * @private
+	         */
+	        this._graphicEls = [];
+
+	        /**
+	         * @type {Array.<Array|Object>}
+	         * @private
+	         */
+	        this._rawData;
+
+	        /**
+	         * @type {Object}
+	         * @private
+	         */
+	        this._extent;
+	    };
+
+	    var listProto = List.prototype;
+
+	    listProto.type = 'list';
+	    /**
+	     * If each data item has it's own option
+	     * @type {boolean}
+	     */
+	    listProto.hasItemOption = true;
+
+	    /**
+	     * Get dimension name
+	     * @param {string|number} dim
+	     *        Dimension can be concrete names like x, y, z, lng, lat, angle, radius
+	     *        Or a ordinal number. For example getDimensionInfo(0) will return 'x' or 'lng' or 'radius'
+	     * @return {string} Concrete dim name.
+	     */
+	    listProto.getDimension = function (dim) {
+	        if (!isNaN(dim)) {
+	            dim = this.dimensions[dim] || dim;
+	        }
+	        return dim;
+	    };
+	    /**
+	     * Get type and stackable info of particular dimension
+	     * @param {string|number} dim
+	     *        Dimension can be concrete names like x, y, z, lng, lat, angle, radius
+	     *        Or a ordinal number. For example getDimensionInfo(0) will return 'x' or 'lng' or 'radius'
+	     */
+	    listProto.getDimensionInfo = function (dim) {
+	        return zrUtil.clone(this._dimensionInfos[this.getDimension(dim)]);
+	    };
+
+	    /**
+	     * Initialize from data
+	     * @param {Array.<Object|number|Array>} data
+	     * @param {Array.<string>} [nameList]
+	     * @param {Function} [dimValueGetter] (dataItem, dimName, dataIndex, dimIndex) => number
+	     */
+	    listProto.initData = function (data, nameList, dimValueGetter) {
+	        data = data || [];
+
+	        if (true) {
+	            if (!zrUtil.isArray(data)) {
+	                throw new Error('Invalid data.');
+	            }
+	        }
+
+	        this._rawData = data;
+
+	        // Clear
+	        var storage = this._storage = {};
+	        var indices = this.indices = [];
+
+	        var dimensions = this.dimensions;
+	        var size = data.length;
+	        var dimensionInfoMap = this._dimensionInfos;
+
+	        var idList = [];
+	        var nameRepeatCount = {};
+
+	        nameList = nameList || [];
+
+	        // Init storage
+	        for (var i = 0; i < dimensions.length; i++) {
+	            var dimInfo = dimensionInfoMap[dimensions[i]];
+	            var DataCtor = dataCtors[dimInfo.type];
+	            storage[dimensions[i]] = new DataCtor(size);
+	        }
+
+	        var self = this;
+	        if (!dimValueGetter) {
+	            self.hasItemOption = false;
+	        }
+	        // Default dim value getter
+	        dimValueGetter = dimValueGetter || function (dataItem, dimName, dataIndex, dimIndex) {
+	            var value = modelUtil.getDataItemValue(dataItem);
+	            // If any dataItem is like { value: 10 }
+	            if (modelUtil.isDataItemOption(dataItem)) {
+	                self.hasItemOption = true;
+	            }
+	            return modelUtil.converDataValue(
+	                (value instanceof Array)
+	                    ? value[dimIndex]
+	                    // If value is a single number or something else not array.
+	                    : value,
+	                dimensionInfoMap[dimName]
+	            );
+	        };
+
+	        for (var idx = 0; idx < data.length; idx++) {
+	            var dataItem = data[idx];
+	            // Each data item is value
+	            // [1, 2]
+	            // 2
+	            // Bar chart, line chart which uses category axis
+	            // only gives the 'y' value. 'x' value is the indices of cateogry
+	            // Use a tempValue to normalize the value to be a (x, y) value
+
+	            // Store the data by dimensions
+	            for (var k = 0; k < dimensions.length; k++) {
+	                var dim = dimensions[k];
+	                var dimStorage = storage[dim];
+	                // PENDING NULL is empty or zero
+	                dimStorage[idx] = dimValueGetter(dataItem, dim, idx, k);
+	            }
+
+	            indices.push(idx);
+	        }
+
+	        // Use the name in option and create id
+	        for (var i = 0; i < data.length; i++) {
+	            if (!nameList[i]) {
+	                if (data[i] && data[i].name != null) {
+	                    nameList[i] = data[i].name;
+	                }
+	            }
+	            var name = nameList[i] || '';
+	            // Try using the id in option
+	            var id = data[i] && data[i].id;
+
+	            if (!id && name) {
+	                // Use name as id and add counter to avoid same name
+	                nameRepeatCount[name] = nameRepeatCount[name] || 0;
+	                id = name;
+	                if (nameRepeatCount[name] > 0) {
+	                    id += '__ec__' + nameRepeatCount[name];
+	                }
+	                nameRepeatCount[name]++;
+	            }
+	            id && (idList[i] = id);
+	        }
+
+	        this._nameList = nameList;
+	        this._idList = idList;
+	    };
+
+	    /**
+	     * @return {number}
+	     */
+	    listProto.count = function () {
+	        return this.indices.length;
+	    };
+
+	    /**
+	     * Get value. Return NaN if idx is out of range.
+	     * @param {string} dim Dim must be concrete name.
+	     * @param {number} idx
+	     * @param {boolean} stack
+	     * @return {number}
+	     */
+	    listProto.get = function (dim, idx, stack) {
+	        var storage = this._storage;
+	        var dataIndex = this.indices[idx];
+
+	        // If value not exists
+	        if (dataIndex == null) {
+	            return NaN;
+	        }
+
+	        var value = storage[dim] && storage[dim][dataIndex];
+	        // FIXME ordinal data type is not stackable
+	        if (stack) {
+	            var dimensionInfo = this._dimensionInfos[dim];
+	            if (dimensionInfo && dimensionInfo.stackable) {
+	                var stackedOn = this.stackedOn;
+	                while (stackedOn) {
+	                    // Get no stacked data of stacked on
+	                    var stackedValue = stackedOn.get(dim, idx);
+	                    // Considering positive stack, negative stack and empty data
+	                    if ((value >= 0 && stackedValue > 0)  // Positive stack
+	                        || (value <= 0 && stackedValue < 0) // Negative stack
+	                    ) {
+	                        value += stackedValue;
+	                    }
+	                    stackedOn = stackedOn.stackedOn;
+	                }
+	            }
+	        }
+	        return value;
+	    };
+
+	    /**
+	     * Get value for multi dimensions.
+	     * @param {Array.<string>} [dimensions] If ignored, using all dimensions.
+	     * @param {number} idx
+	     * @param {boolean} stack
+	     * @return {number}
+	     */
+	    listProto.getValues = function (dimensions, idx, stack) {
+	        var values = [];
+
+	        if (!zrUtil.isArray(dimensions)) {
+	            stack = idx;
+	            idx = dimensions;
+	            dimensions = this.dimensions;
+	        }
+
+	        for (var i = 0, len = dimensions.length; i < len; i++) {
+	            values.push(this.get(dimensions[i], idx, stack));
+	        }
+
+	        return values;
+	    };
+
+	    /**
+	     * If value is NaN. Inlcuding '-'
+	     * @param {string} dim
+	     * @param {number} idx
+	     * @return {number}
+	     */
+	    listProto.hasValue = function (idx) {
+	        var dimensions = this.dimensions;
+	        var dimensionInfos = this._dimensionInfos;
+	        for (var i = 0, len = dimensions.length; i < len; i++) {
+	            if (
+	                // Ordinal type can be string or number
+	                dimensionInfos[dimensions[i]].type !== 'ordinal'
+	                && isNaN(this.get(dimensions[i], idx))
+	            ) {
+	                return false;
+	            }
+	        }
+	        return true;
+	    };
+
+	    /**
+	     * Get extent of data in one dimension
+	     * @param {string} dim
+	     * @param {boolean} stack
+	     */
+	    listProto.getDataExtent = function (dim, stack) {
+	        dim = this.getDimension(dim);
+	        var dimData = this._storage[dim];
+	        var dimInfo = this.getDimensionInfo(dim);
+	        stack = (dimInfo && dimInfo.stackable) && stack;
+	        var dimExtent = (this._extent || (this._extent = {}))[dim + (!!stack)];
+	        var value;
+	        if (dimExtent) {
+	            return dimExtent;
+	        }
+	        // var dimInfo = this._dimensionInfos[dim];
+	        if (dimData) {
+	            var min = Infinity;
+	            var max = -Infinity;
+	            // var isOrdinal = dimInfo.type === 'ordinal';
+	            for (var i = 0, len = this.count(); i < len; i++) {
+	                value = this.get(dim, i, stack);
+	                // FIXME
+	                // if (isOrdinal && typeof value === 'string') {
+	                //     value = zrUtil.indexOf(dimData, value);
+	                // }
+	                value < min && (min = value);
+	                value > max && (max = value);
+	            }
+	            return (this._extent[dim + !!stack] = [min, max]);
+	        }
+	        else {
+	            return [Infinity, -Infinity];
+	        }
+	    };
+
+	    /**
+	     * Get sum of data in one dimension
+	     * @param {string} dim
+	     * @param {boolean} stack
+	     */
+	    listProto.getSum = function (dim, stack) {
+	        var dimData = this._storage[dim];
+	        var sum = 0;
+	        if (dimData) {
+	            for (var i = 0, len = this.count(); i < len; i++) {
+	                var value = this.get(dim, i, stack);
+	                if (!isNaN(value)) {
+	                    sum += value;
+	                }
+	            }
+	        }
+	        return sum;
+	    };
+
+	    /**
+	     * Retreive the index with given value
+	     * @param {number} idx
+	     * @param {number} value
+	     * @return {number}
+	     */
+	    // FIXME Precision of float value
+	    listProto.indexOf = function (dim, value) {
+	        var storage = this._storage;
+	        var dimData = storage[dim];
+	        var indices = this.indices;
+
+	        if (dimData) {
+	            for (var i = 0, len = indices.length; i < len; i++) {
+	                var rawIndex = indices[i];
+	                if (dimData[rawIndex] === value) {
+	                    return i;
+	                }
+	            }
+	        }
+	        return -1;
+	    };
+
+	    /**
+	     * Retreive the index with given name
+	     * @param {number} idx
+	     * @param {number} name
+	     * @return {number}
+	     */
+	    listProto.indexOfName = function (name) {
+	        var indices = this.indices;
+	        var nameList = this._nameList;
+
+	        for (var i = 0, len = indices.length; i < len; i++) {
+	            var rawIndex = indices[i];
+	            if (nameList[rawIndex] === name) {
+	                return i;
+	            }
+	        }
+
+	        return -1;
+	    };
+
+	    /**
+	     * Retreive the index with given raw data index
+	     * @param {number} idx
+	     * @param {number} name
+	     * @return {number}
+	     */
+	    listProto.indexOfRawIndex = function (rawIndex) {
+	        // Indices are ascending
+	        var indices = this.indices;
+	        var left = 0;
+	        var right = indices.length - 1;
+	        while (left <= right) {
+	            var mid = (left + right) / 2 | 0;
+	            if (indices[mid] < rawIndex) {
+	                left = mid + 1;
+	            }
+	            else if (indices[mid] > rawIndex) {
+	                right = mid - 1;
+	            }
+	            else {
+	                return mid;
+	            }
+	        }
+	        return -1;
+	    };
+
+	    /**
+	     * Retreive the index of nearest value
+	     * @param {string} dim
+	     * @param {number} value
+	     * @param {boolean} stack If given value is after stacked
+	     * @param {number} [maxDistance=Infinity]
+	     * @return {number}
+	     */
+	    listProto.indexOfNearest = function (dim, value, stack, maxDistance) {
+	        var storage = this._storage;
+	        var dimData = storage[dim];
+
+	        if (maxDistance == null) {
+	            maxDistance = Infinity;
+	        }
+
+	        var nearestIdx = -1;
+	        if (dimData) {
+	            var minDist = Number.MAX_VALUE;
+	            for (var i = 0, len = this.count(); i < len; i++) {
+	                var diff = value - this.get(dim, i, stack);
+	                var dist = Math.abs(diff);
+	                if (
+	                    diff <= maxDistance
+	                    && (dist < minDist
+	                        // For the case of two data are same on xAxis, which has sequence data.
+	                        // Show the nearest index
+	                        // https://github.com/ecomfe/echarts/issues/2869
+	                        || (dist === minDist && diff > 0)
+	                    )
+	                ) {
+	                    minDist = dist;
+	                    nearestIdx = i;
+	                }
+	            }
+	        }
+	        return nearestIdx;
+	    };
+
+	    /**
+	     * Get raw data index
+	     * @param {number} idx
+	     * @return {number}
+	     */
+	    listProto.getRawIndex = function (idx) {
+	        var rawIdx = this.indices[idx];
+	        return rawIdx == null ? -1 : rawIdx;
+	    };
+
+	    /**
+	     * Get raw data item
+	     * @param {number} idx
+	     * @return {number}
+	     */
+	    listProto.getRawDataItem = function (idx) {
+	        return this._rawData[this.getRawIndex(idx)];
+	    };
+
+	    /**
+	     * @param {number} idx
+	     * @param {boolean} [notDefaultIdx=false]
+	     * @return {string}
+	     */
+	    listProto.getName = function (idx) {
+	        return this._nameList[this.indices[idx]] || '';
+	    };
+
+	    /**
+	     * @param {number} idx
+	     * @param {boolean} [notDefaultIdx=false]
+	     * @return {string}
+	     */
+	    listProto.getId = function (idx) {
+	        return this._idList[this.indices[idx]] || (this.getRawIndex(idx) + '');
+	    };
+
+
+	    function normalizeDimensions(dimensions) {
+	        if (!zrUtil.isArray(dimensions)) {
+	            dimensions = [dimensions];
+	        }
+	        return dimensions;
+	    }
+
+	    /**
+	     * Data iteration
+	     * @param {string|Array.<string>}
+	     * @param {Function} cb
+	     * @param {boolean} [stack=false]
+	     * @param {*} [context=this]
+	     *
+	     * @example
+	     *  list.each('x', function (x, idx) {});
+	     *  list.each(['x', 'y'], function (x, y, idx) {});
+	     *  list.each(function (idx) {})
+	     */
+	    listProto.each = function (dims, cb, stack, context) {
+	        if (typeof dims === 'function') {
+	            context = stack;
+	            stack = cb;
+	            cb = dims;
+	            dims = [];
+	        }
+
+	        dims = zrUtil.map(normalizeDimensions(dims), this.getDimension, this);
+
+	        var value = [];
+	        var dimSize = dims.length;
+	        var indices = this.indices;
+
+	        context = context || this;
+
+	        for (var i = 0; i < indices.length; i++) {
+	            // Simple optimization
+	            switch (dimSize) {
+	                case 0:
+	                    cb.call(context, i);
+	                    break;
+	                case 1:
+	                    cb.call(context, this.get(dims[0], i, stack), i);
+	                    break;
+	                case 2:
+	                    cb.call(context, this.get(dims[0], i, stack), this.get(dims[1], i, stack), i);
+	                    break;
+	                default:
+	                    for (var k = 0; k < dimSize; k++) {
+	                        value[k] = this.get(dims[k], i, stack);
+	                    }
+	                    // Index
+	                    value[k] = i;
+	                    cb.apply(context, value);
+	            }
+	        }
+	    };
+
+	    /**
+	     * Data filter
+	     * @param {string|Array.<string>}
+	     * @param {Function} cb
+	     * @param {boolean} [stack=false]
+	     * @param {*} [context=this]
+	     */
+	    listProto.filterSelf = function (dimensions, cb, stack, context) {
+	        if (typeof dimensions === 'function') {
+	            context = stack;
+	            stack = cb;
+	            cb = dimensions;
+	            dimensions = [];
+	        }
+
+	        dimensions = zrUtil.map(
+	            normalizeDimensions(dimensions), this.getDimension, this
+	        );
+
+	        var newIndices = [];
+	        var value = [];
+	        var dimSize = dimensions.length;
+	        var indices = this.indices;
+
+	        context = context || this;
+
+	        for (var i = 0; i < indices.length; i++) {
+	            var keep;
+	            // Simple optimization
+	            if (dimSize === 1) {
+	                keep = cb.call(
+	                    context, this.get(dimensions[0], i, stack), i
+	                );
+	            }
+	            else {
+	                for (var k = 0; k < dimSize; k++) {
+	                    value[k] = this.get(dimensions[k], i, stack);
+	                }
+	                value[k] = i;
+	                keep = cb.apply(context, value);
+	            }
+	            if (keep) {
+	                newIndices.push(indices[i]);
+	            }
+	        }
+
+	        this.indices = newIndices;
+
+	        // Reset data extent
+	        this._extent = {};
+
+	        return this;
+	    };
+
+	    /**
+	     * Data mapping to a plain array
+	     * @param {string|Array.<string>} [dimensions]
+	     * @param {Function} cb
+	     * @param {boolean} [stack=false]
+	     * @param {*} [context=this]
+	     * @return {Array}
+	     */
+	    listProto.mapArray = function (dimensions, cb, stack, context) {
+	        if (typeof dimensions === 'function') {
+	            context = stack;
+	            stack = cb;
+	            cb = dimensions;
+	            dimensions = [];
+	        }
+
+	        var result = [];
+	        this.each(dimensions, function () {
+	            result.push(cb && cb.apply(this, arguments));
+	        }, stack, context);
+	        return result;
+	    };
+
+	    function cloneListForMapAndSample(original, excludeDimensions) {
+	        var allDimensions = original.dimensions;
+	        var list = new List(
+	            zrUtil.map(allDimensions, original.getDimensionInfo, original),
+	            original.hostModel
+	        );
+	        // FIXME If needs stackedOn, value may already been stacked
+	        transferProperties(list, original);
+
+	        var storage = list._storage = {};
+	        var originalStorage = original._storage;
+	        // Init storage
+	        for (var i = 0; i < allDimensions.length; i++) {
+	            var dim = allDimensions[i];
+	            var dimStore = originalStorage[dim];
+	            if (zrUtil.indexOf(excludeDimensions, dim) >= 0) {
+	                storage[dim] = new dimStore.constructor(
+	                    originalStorage[dim].length
+	                );
+	            }
+	            else {
+	                // Direct reference for other dimensions
+	                storage[dim] = originalStorage[dim];
+	            }
+	        }
+	        return list;
+	    }
+
+	    /**
+	     * Data mapping to a new List with given dimensions
+	     * @param {string|Array.<string>} dimensions
+	     * @param {Function} cb
+	     * @param {boolean} [stack=false]
+	     * @param {*} [context=this]
+	     * @return {Array}
+	     */
+	    listProto.map = function (dimensions, cb, stack, context) {
+	        dimensions = zrUtil.map(
+	            normalizeDimensions(dimensions), this.getDimension, this
+	        );
+
+	        var list = cloneListForMapAndSample(this, dimensions);
+	        // Following properties are all immutable.
+	        // So we can reference to the same value
+	        var indices = list.indices = this.indices;
+
+	        var storage = list._storage;
+
+	        var tmpRetValue = [];
+	        this.each(dimensions, function () {
+	            var idx = arguments[arguments.length - 1];
+	            var retValue = cb && cb.apply(this, arguments);
+	            if (retValue != null) {
+	                // a number
+	                if (typeof retValue === 'number') {
+	                    tmpRetValue[0] = retValue;
+	                    retValue = tmpRetValue;
+	                }
+	                for (var i = 0; i < retValue.length; i++) {
+	                    var dim = dimensions[i];
+	                    var dimStore = storage[dim];
+	                    var rawIdx = indices[idx];
+	                    if (dimStore) {
+	                        dimStore[rawIdx] = retValue[i];
+	                    }
+	                }
+	            }
+	        }, stack, context);
+
+	        return list;
+	    };
+
+	    /**
+	     * Large data down sampling on given dimension
+	     * @param {string} dimension
+	     * @param {number} rate
+	     * @param {Function} sampleValue
+	     * @param {Function} sampleIndex Sample index for name and id
+	     */
+	    listProto.downSample = function (dimension, rate, sampleValue, sampleIndex) {
+	        var list = cloneListForMapAndSample(this, [dimension]);
+	        var storage = this._storage;
+	        var targetStorage = list._storage;
+
+	        var originalIndices = this.indices;
+	        var indices = list.indices = [];
+
+	        var frameValues = [];
+	        var frameIndices = [];
+	        var frameSize = Math.floor(1 / rate);
+
+	        var dimStore = targetStorage[dimension];
+	        var len = this.count();
+	        // Copy data from original data
+	        for (var i = 0; i < storage[dimension].length; i++) {
+	            targetStorage[dimension][i] = storage[dimension][i];
+	        }
+	        for (var i = 0; i < len; i += frameSize) {
+	            // Last frame
+	            if (frameSize > len - i) {
+	                frameSize = len - i;
+	                frameValues.length = frameSize;
+	            }
+	            for (var k = 0; k < frameSize; k++) {
+	                var idx = originalIndices[i + k];
+	                frameValues[k] = dimStore[idx];
+	                frameIndices[k] = idx;
+	            }
+	            var value = sampleValue(frameValues);
+	            var idx = frameIndices[sampleIndex(frameValues, value) || 0];
+	            // Only write value on the filtered data
+	            dimStore[idx] = value;
+	            indices.push(idx);
+	        }
+
+	        return list;
+	    };
+
+	    /**
+	     * Get model of one data item.
+	     *
+	     * @param {number} idx
+	     */
+	    // FIXME Model proxy ?
+	    listProto.getItemModel = function (idx) {
+	        var hostModel = this.hostModel;
+	        idx = this.indices[idx];
+	        return new Model(this._rawData[idx], hostModel, hostModel && hostModel.ecModel);
+	    };
+
+	    /**
+	     * Create a data differ
+	     * @param {module:echarts/data/List} otherList
+	     * @return {module:echarts/data/DataDiffer}
+	     */
+	    listProto.diff = function (otherList) {
+	        var idList = this._idList;
+	        var otherIdList = otherList && otherList._idList;
+	        return new DataDiffer(
+	            otherList ? otherList.indices : [], this.indices, function (idx) {
+	                return otherIdList[idx] || (idx + '');
+	            }, function (idx) {
+	                return idList[idx] || (idx + '');
+	            }
+	        );
+	    };
+	    /**
+	     * Get visual property.
+	     * @param {string} key
+	     */
+	    listProto.getVisual = function (key) {
+	        var visual = this._visual;
+	        return visual && visual[key];
+	    };
+
+	    /**
+	     * Set visual property
+	     * @param {string|Object} key
+	     * @param {*} [value]
+	     *
+	     * @example
+	     *  setVisual('color', color);
+	     *  setVisual({
+	     *      'color': color
+	     *  });
+	     */
+	    listProto.setVisual = function (key, val) {
+	        if (isObject(key)) {
+	            for (var name in key) {
+	                if (key.hasOwnProperty(name)) {
+	                    this.setVisual(name, key[name]);
+	                }
+	            }
+	            return;
+	        }
+	        this._visual = this._visual || {};
+	        this._visual[key] = val;
+	    };
+
+	    /**
+	     * Set layout property.
+	     * @param {string} key
+	     * @param {*} [val]
+	     */
+	    listProto.setLayout = function (key, val) {
+	        if (isObject(key)) {
+	            for (var name in key) {
+	                if (key.hasOwnProperty(name)) {
+	                    this.setLayout(name, key[name]);
+	                }
+	            }
+	            return;
+	        }
+	        this._layout[key] = val;
+	    };
+
+	    /**
+	     * Get layout property.
+	     * @param  {string} key.
+	     * @return {*}
+	     */
+	    listProto.getLayout = function (key) {
+	        return this._layout[key];
+	    };
+
+	    /**
+	     * Get layout of single data item
+	     * @param {number} idx
+	     */
+	    listProto.getItemLayout = function (idx) {
+	        return this._itemLayouts[idx];
+	    };
+
+	    /**
+	     * Set layout of single data item
+	     * @param {number} idx
+	     * @param {Object} layout
+	     * @param {boolean=} [merge=false]
+	     */
+	    listProto.setItemLayout = function (idx, layout, merge) {
+	        this._itemLayouts[idx] = merge
+	            ? zrUtil.extend(this._itemLayouts[idx] || {}, layout)
+	            : layout;
+	    };
+
+	    /**
+	     * Clear all layout of single data item
+	     */
+	    listProto.clearItemLayouts = function () {
+	        this._itemLayouts.length = 0;
+	    };
+
+	    /**
+	     * Get visual property of single data item
+	     * @param {number} idx
+	     * @param {string} key
+	     * @param {boolean} ignoreParent
+	     */
+	    listProto.getItemVisual = function (idx, key, ignoreParent) {
+	        var itemVisual = this._itemVisuals[idx];
+	        var val = itemVisual && itemVisual[key];
+	        if (val == null && !ignoreParent) {
+	            // Use global visual property
+	            return this.getVisual(key);
+	        }
+	        return val;
+	    };
+
+	    /**
+	     * Set visual property of single data item
+	     *
+	     * @param {number} idx
+	     * @param {string|Object} key
+	     * @param {*} [value]
+	     *
+	     * @example
+	     *  setItemVisual(0, 'color', color);
+	     *  setItemVisual(0, {
+	     *      'color': color
+	     *  });
+	     */
+	    listProto.setItemVisual = function (idx, key, value) {
+	        var itemVisual = this._itemVisuals[idx] || {};
+	        this._itemVisuals[idx] = itemVisual;
+
+	        if (isObject(key)) {
+	            for (var name in key) {
+	                if (key.hasOwnProperty(name)) {
+	                    itemVisual[name] = key[name];
+	                }
+	            }
+	            return;
+	        }
+	        itemVisual[key] = value;
+	    };
+
+	    /**
+	     * Clear itemVisuals and list visual.
+	     */
+	    listProto.clearAllVisual = function () {
+	        this._visual = {};
+	        this._itemVisuals = [];
+	    };
+
+	    var setItemDataAndSeriesIndex = function (child) {
+	        child.seriesIndex = this.seriesIndex;
+	        child.dataIndex = this.dataIndex;
+	        child.dataType = this.dataType;
+	    };
+	    /**
+	     * Set graphic element relative to data. It can be set as null
+	     * @param {number} idx
+	     * @param {module:zrender/Element} [el]
+	     */
+	    listProto.setItemGraphicEl = function (idx, el) {
+	        var hostModel = this.hostModel;
+
+	        if (el) {
+	            // Add data index and series index for indexing the data by element
+	            // Useful in tooltip
+	            el.dataIndex = idx;
+	            el.dataType = this.dataType;
+	            el.seriesIndex = hostModel && hostModel.seriesIndex;
+	            if (el.type === 'group') {
+	                el.traverse(setItemDataAndSeriesIndex, el);
+	            }
+	        }
+
+	        this._graphicEls[idx] = el;
+	    };
+
+	    /**
+	     * @param {number} idx
+	     * @return {module:zrender/Element}
+	     */
+	    listProto.getItemGraphicEl = function (idx) {
+	        return this._graphicEls[idx];
+	    };
+
+	    /**
+	     * @param {Function} cb
+	     * @param {*} context
+	     */
+	    listProto.eachItemGraphicEl = function (cb, context) {
+	        zrUtil.each(this._graphicEls, function (el, idx) {
+	            if (el) {
+	                cb && cb.call(context, el, idx);
+	            }
+	        });
+	    };
+
+	    /**
+	     * Shallow clone a new list except visual and layout properties, and graph elements.
+	     * New list only change the indices.
+	     */
+	    listProto.cloneShallow = function () {
+	        var dimensionInfoList = zrUtil.map(this.dimensions, this.getDimensionInfo, this);
+	        var list = new List(dimensionInfoList, this.hostModel);
+
+	        // FIXME
+	        list._storage = this._storage;
+
+	        transferProperties(list, this);
+
+
+	        // Clone will not change the data extent and indices
+	        list.indices = this.indices.slice();
+
+	        if (this._extent) {
+	            list._extent = zrUtil.extend({}, this._extent);
+	        }
+
+	        return list;
+	    };
+
+	    /**
+	     * Wrap some method to add more feature
+	     * @param {string} methodName
+	     * @param {Function} injectFunction
+	     */
+	    listProto.wrapMethod = function (methodName, injectFunction) {
+	        var originalMethod = this[methodName];
+	        if (typeof originalMethod !== 'function') {
+	            return;
+	        }
+	        this.__wrappedMethods = this.__wrappedMethods || [];
+	        this.__wrappedMethods.push(methodName);
+	        this[methodName] = function () {
+	            var res = originalMethod.apply(this, arguments);
+	            return injectFunction.apply(this, [res].concat(zrUtil.slice(arguments)));
+	        };
+	    };
+
+	    // Methods that create a new list based on this list should be listed here.
+	    // Notice that those method should `RETURN` the new list.
+	    listProto.TRANSFERABLE_METHODS = ['cloneShallow', 'downSample', 'map'];
+	    // Methods that change indices of this list should be listed here.
+	    listProto.CHANGABLE_METHODS = ['filterSelf'];
+
+	    module.exports = List;
+
+	/* WEBPACK VAR INJECTION */}.call(exports, (function() { return this; }())))
+
+/***/ },
+/* 98 */
+/***/ function(module, exports) {
+
+	'use strict';
+
+
+	    function defaultKeyGetter(item) {
+	        return item;
+	    }
+
+	    function DataDiffer(oldArr, newArr, oldKeyGetter, newKeyGetter) {
+	        this._old = oldArr;
+	        this._new = newArr;
+
+	        this._oldKeyGetter = oldKeyGetter || defaultKeyGetter;
+	        this._newKeyGetter = newKeyGetter || defaultKeyGetter;
+	    }
+
+	    DataDiffer.prototype = {
+
+	        constructor: DataDiffer,
+
+	        /**
+	         * Callback function when add a data
+	         */
+	        add: function (func) {
+	            this._add = func;
+	            return this;
+	        },
+
+	        /**
+	         * Callback function when update a data
+	         */
+	        update: function (func) {
+	            this._update = func;
+	            return this;
+	        },
+
+	        /**
+	         * Callback function when remove a data
+	         */
+	        remove: function (func) {
+	            this._remove = func;
+	            return this;
+	        },
+
+	        execute: function () {
+	            var oldArr = this._old;
+	            var newArr = this._new;
+	            var oldKeyGetter = this._oldKeyGetter;
+	            var newKeyGetter = this._newKeyGetter;
+
+	            var oldDataIndexMap = {};
+	            var newDataIndexMap = {};
+	            var oldDataKeyArr = [];
+	            var newDataKeyArr = [];
+	            var i;
+
+	            initIndexMap(oldArr, oldDataIndexMap, oldDataKeyArr, oldKeyGetter);
+	            initIndexMap(newArr, newDataIndexMap, newDataKeyArr, newKeyGetter);
+
+	            // Travel by inverted order to make sure order consistency
+	            // when duplicate keys exists (consider newDataIndex.pop() below).
+	            // For performance consideration, these code below do not look neat.
+	            for (i = 0; i < oldArr.length; i++) {
+	                var key = oldDataKeyArr[i];
+	                var idx = newDataIndexMap[key];
+
+	                // idx can never be empty array here. see 'set null' logic below.
+	                if (idx != null) {
+	                    // Consider there is duplicate key (for example, use dataItem.name as key).
+	                    // We should make sure every item in newArr and oldArr can be visited.
+	                    var len = idx.length;
+	                    if (len) {
+	                        len === 1 && (newDataIndexMap[key] = null);
+	                        idx = idx.unshift();
+	                    }
+	                    else {
+	                        newDataIndexMap[key] = null;
+	                    }
+	                    this._update && this._update(idx, i);
+	                }
+	                else {
+	                    this._remove && this._remove(i);
+	                }
+	            }
+
+	            for (var i = 0; i < newDataKeyArr.length; i++) {
+	                var key = newDataKeyArr[i];
+	                if (newDataIndexMap.hasOwnProperty(key)) {
+	                    var idx = newDataIndexMap[key];
+	                    if (idx == null) {
+	                        continue;
+	                    }
+	                    // idx can never be empty array here. see 'set null' logic above.
+	                    if (!idx.length) {
+	                        this._add && this._add(idx);
+	                    }
+	                    else {
+	                        for (var j = 0, len = idx.length; j < len; j++) {
+	                            this._add && this._add(idx[j]);
+	                        }
+	                    }
+	                }
+	            }
+	        }
+	    };
+
+	    function initIndexMap(arr, map, keyArr, keyGetter) {
+	        for (var i = 0; i < arr.length; i++) {
+	            var key = keyGetter(arr[i], i);
+	            var existence = map[key];
+	            if (existence == null) {
+	                keyArr.push(key);
+	                map[key] = i;
+	            }
+	            else {
+	                if (!existence.length) {
+	                    map[key] = existence = [existence];
+	                }
+	                existence.push(i);
+	            }
+	        }
+	    }
+
+	    module.exports = DataDiffer;
+
+
+/***/ },
+/* 99 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+	    var echarts = __webpack_require__(1);
+	    var PRIORITY = echarts.PRIORITY;
+
+	    __webpack_require__(100);
+	    __webpack_require__(103);
+
+	    echarts.registerVisual(zrUtil.curry(
+	        __webpack_require__(109), 'line', 'circle', 'line'
+	    ));
+	    echarts.registerLayout(zrUtil.curry(
+	        __webpack_require__(110), 'line'
+	    ));
+
+	    // Down sample after filter
+	    echarts.registerProcessor(PRIORITY.PROCESSOR.STATISTIC, zrUtil.curry(
+	        __webpack_require__(111), 'line'
+	    ));
+
+	    // In case developer forget to include grid component
+	    __webpack_require__(112);
+
+
+/***/ },
+/* 100 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var createListFromArray = __webpack_require__(101);
+	    var SeriesModel = __webpack_require__(28);
+
+	    module.exports = SeriesModel.extend({
+
+	        type: 'series.line',
+
+	        dependencies: ['grid', 'polar'],
+
+	        getInitialData: function (option, ecModel) {
+	            if (true) {
+	                var coordSys = option.coordinateSystem;
+	                if (coordSys !== 'polar' && coordSys !== 'cartesian2d') {
+	                    throw new Error('Line not support coordinateSystem besides cartesian and polar');
+	                }
+	            }
+	            return createListFromArray(option.data, this, ecModel);
+	        },
+
+	        defaultOption: {
+	            zlevel: 0,                  // 一级层叠
+	            z: 2,                       // 二级层叠
+	            coordinateSystem: 'cartesian2d',
+	            legendHoverLink: true,
+
+	            hoverAnimation: true,
+	            // stack: null
+	            xAxisIndex: 0,
+	            yAxisIndex: 0,
+
+	            polarIndex: 0,
+
+	            // If clip the overflow value
+	            clipOverflow: true,
+
+	            label: {
+	                normal: {
+	                    position: 'top'
+	                }
+	            },
+	            // itemStyle: {
+	            //     normal: {},
+	            //     emphasis: {}
+	            // },
+	            lineStyle: {
+	                normal: {
+	                    width: 2,
+	                    type: 'solid'
+	                }
+	            },
+	            // areaStyle: {},
+	            // false, 'start', 'end', 'middle'
+	            step: false,
+
+	            // Disabled if step is true
+	            smooth: false,
+	            smoothMonotone: null,
+	            // 拐点图形类型
+	            symbol: 'emptyCircle',
+	            // 拐点图形大小
+	            symbolSize: 4,
+	            // 拐点图形旋转控制
+	            symbolRotate: null,
+
+	            // 是否显示 symbol, 只有在 tooltip hover 的时候显示
+	            showSymbol: true,
+	            // 标志图形默认只有主轴显示（随主轴标签间隔隐藏策略）
+	            showAllSymbol: false,
+
+	            // 是否连接断点
+	            connectNulls: false,
+
+	            // 数据过滤，'average', 'max', 'min', 'sum'
+	            sampling: 'none',
+
+	            animationEasing: 'linear',
+
+	            // Disable progressive
+	            progressive: 0,
+	            hoverLayerThreshold: Infinity
+	        }
+	    });
+
+
+/***/ },
+/* 101 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var List = __webpack_require__(97);
+	    var completeDimensions = __webpack_require__(102);
+	    var zrUtil = __webpack_require__(4);
+	    var modelUtil = __webpack_require__(5);
+	    var CoordinateSystem = __webpack_require__(26);
+	    var getDataItemValue = modelUtil.getDataItemValue;
+	    var converDataValue = modelUtil.converDataValue;
+
+	    function firstDataNotNull(data) {
+	        var i = 0;
+	        while (i < data.length && data[i] == null) {
+	            i++;
+	        }
+	        return data[i];
+	    }
+	    function ifNeedCompleteOrdinalData(data) {
+	        var sampleItem = firstDataNotNull(data);
+	        return sampleItem != null
+	            && !zrUtil.isArray(getDataItemValue(sampleItem));
+	    }
+
+	    /**
+	     * Helper function to create a list from option data
+	     */
+	    function createListFromArray(data, seriesModel, ecModel) {
+	        // If data is undefined
+	        data = data || [];
+
+	        if (true) {
+	            if (!zrUtil.isArray(data)) {
+	                throw new Error('Invalid data.');
+	            }
+	        }
+
+	        var coordSysName = seriesModel.get('coordinateSystem');
+	        var creator = creators[coordSysName];
+	        var registeredCoordSys = CoordinateSystem.get(coordSysName);
+	        // FIXME
+	        var axesInfo = creator && creator(data, seriesModel, ecModel);
+	        var dimensions = axesInfo && axesInfo.dimensions;
+	        if (!dimensions) {
+	            // Get dimensions from registered coordinate system
+	            dimensions = (registeredCoordSys && registeredCoordSys.dimensions) || ['x', 'y'];
+	            dimensions = completeDimensions(dimensions, data, dimensions.concat(['value']));
+	        }
+	        var categoryIndex = axesInfo ? axesInfo.categoryIndex : -1;
+
+	        var list = new List(dimensions, seriesModel);
+
+	        var nameList = createNameList(axesInfo, data);
+
+	        var categories = {};
+	        var dimValueGetter = (categoryIndex >= 0 && ifNeedCompleteOrdinalData(data))
+	            ? function (itemOpt, dimName, dataIndex, dimIndex) {
+	                // If any dataItem is like { value: 10 }
+	                if (modelUtil.isDataItemOption(itemOpt)) {
+	                    list.hasItemOption = true;
+	                }
+
+	                // Use dataIndex as ordinal value in categoryAxis
+	                return dimIndex === categoryIndex
+	                    ? dataIndex
+	                    : converDataValue(getDataItemValue(itemOpt), dimensions[dimIndex]);
+	            }
+	            : function (itemOpt, dimName, dataIndex, dimIndex) {
+	                var value = getDataItemValue(itemOpt);
+	                var val = converDataValue(value && value[dimIndex], dimensions[dimIndex]);
+	                // If any dataItem is like { value: 10 }
+	                if (modelUtil.isDataItemOption(itemOpt)) {
+	                    list.hasItemOption = true;
+	                }
+
+	                var categoryAxesModels = axesInfo && axesInfo.categoryAxesModels;
+	                if (categoryAxesModels && categoryAxesModels[dimName]) {
+	                    // If given value is a category string
+	                    if (typeof val === 'string') {
+	                        // Lazy get categories
+	                        categories[dimName] = categories[dimName]
+	                            || categoryAxesModels[dimName].getCategories();
+	                        val = zrUtil.indexOf(categories[dimName], val);
+	                        if (val < 0 && !isNaN(val)) {
+	                            // In case some one write '1', '2' istead of 1, 2
+	                            val = +val;
+	                        }
+	                    }
+	                }
+	                return val;
+	            };
+
+	        list.hasItemOption = false;
+	        list.initData(data, nameList, dimValueGetter);
+
+	        return list;
+	    }
+
+	    function isStackable(axisType) {
+	        return axisType !== 'category' && axisType !== 'time';
+	    }
+
+	    function getDimTypeByAxis(axisType) {
+	        return axisType === 'category'
+	            ? 'ordinal'
+	            : axisType === 'time'
+	            ? 'time'
+	            : 'float';
+	    }
+
+	    /**
+	     * Creaters for each coord system.
+	     */
+	    var creators = {
+
+	        cartesian2d: function (data, seriesModel, ecModel) {
+	            var xAxisModel = ecModel.getComponent('xAxis', seriesModel.get('xAxisIndex'));
+	            var yAxisModel = ecModel.getComponent('yAxis', seriesModel.get('yAxisIndex'));
+
+	            if (true) {
+	                if (!xAxisModel) {
+	                    throw new Error('xAxis "' + seriesModel.get('xAxisIndex') + '" not found');
+	                }
+	                if (!yAxisModel) {
+	                    throw new Error('yAxis "' + seriesModel.get('yAxisIndex') + '" not found');
+	                }
+	            }
+
+	            var xAxisType = xAxisModel.get('type');
+	            var yAxisType = yAxisModel.get('type');
+
+	            var dimensions = [
+	                {
+	                    name: 'x',
+	                    type: getDimTypeByAxis(xAxisType),
+	                    stackable: isStackable(xAxisType)
+	                },
+	                {
+	                    name: 'y',
+	                    // If two category axes
+	                    type: getDimTypeByAxis(yAxisType),
+	                    stackable: isStackable(yAxisType)
+	                }
+	            ];
+
+	            var isXAxisCateogry = xAxisType === 'category';
+	            var isYAxisCategory = yAxisType === 'category';
+
+	            completeDimensions(dimensions, data, ['x', 'y', 'z']);
+
+	            var categoryAxesModels = {};
+	            if (isXAxisCateogry) {
+	                categoryAxesModels.x = xAxisModel;
+	            }
+	            if (isYAxisCategory) {
+	                categoryAxesModels.y = yAxisModel;
+	            }
+	            return {
+	                dimensions: dimensions,
+	                categoryIndex: isXAxisCateogry ? 0 : (isYAxisCategory ? 1 : -1),
+	                categoryAxesModels: categoryAxesModels
+	            };
+	        },
+
+	        polar: function (data, seriesModel, ecModel) {
+	            var polarIndex = seriesModel.get('polarIndex') || 0;
+
+	            var axisFinder = function (axisModel) {
+	                return axisModel.get('polarIndex') === polarIndex;
+	            };
+
+	            var angleAxisModel = ecModel.findComponents({
+	                mainType: 'angleAxis', filter: axisFinder
+	            })[0];
+	            var radiusAxisModel = ecModel.findComponents({
+	                mainType: 'radiusAxis', filter: axisFinder
+	            })[0];
+
+	            if (true) {
+	                if (!angleAxisModel) {
+	                    throw new Error('angleAxis option not found');
+	                }
+	                if (!radiusAxisModel) {
+	                    throw new Error('radiusAxis option not found');
+	                }
+	            }
+
+	            var radiusAxisType = radiusAxisModel.get('type');
+	            var angleAxisType = angleAxisModel.get('type');
+
+	            var dimensions = [
+	                {
+	                    name: 'radius',
+	                    type: getDimTypeByAxis(radiusAxisType),
+	                    stackable: isStackable(radiusAxisType)
+	                },
+	                {
+	                    name: 'angle',
+	                    type: getDimTypeByAxis(angleAxisType),
+	                    stackable: isStackable(angleAxisType)
+	                }
+	            ];
+	            var isAngleAxisCateogry = angleAxisType === 'category';
+	            var isRadiusAxisCateogry = radiusAxisType === 'category';
+
+	            completeDimensions(dimensions, data, ['radius', 'angle', 'value']);
+
+	            var categoryAxesModels = {};
+	            if (isRadiusAxisCateogry) {
+	                categoryAxesModels.radius = radiusAxisModel;
+	            }
+	            if (isAngleAxisCateogry) {
+	                categoryAxesModels.angle = angleAxisModel;
+	            }
+	            return {
+	                dimensions: dimensions,
+	                categoryIndex: isAngleAxisCateogry ? 1 : (isRadiusAxisCateogry ? 0 : -1),
+	                categoryAxesModels: categoryAxesModels
+	            };
+	        },
+
+	        geo: function (data, seriesModel, ecModel) {
+	            // TODO Region
+	            // 多个散点图系列在同一个地区的时候
+	            return {
+	                dimensions: completeDimensions([
+	                    {name: 'lng'},
+	                    {name: 'lat'}
+	                ], data, ['lng', 'lat', 'value'])
+	            };
+	        }
+	    };
+
+	    function createNameList(result, data) {
+	        var nameList = [];
+
+	        var categoryDim = result && result.dimensions[result.categoryIndex];
+	        var categoryAxisModel;
+	        if (categoryDim) {
+	            categoryAxisModel = result.categoryAxesModels[categoryDim.name];
+	        }
+
+	        if (categoryAxisModel) {
+	            // FIXME Two category axis
+	            var categories = categoryAxisModel.getCategories();
+	            if (categories) {
+	                var dataLen = data.length;
+	                // Ordered data is given explicitly like
+	                // [[3, 0.2], [1, 0.3], [2, 0.15]]
+	                // or given scatter data,
+	                // pick the category
+	                if (zrUtil.isArray(data[0]) && data[0].length > 1) {
+	                    nameList = [];
+	                    for (var i = 0; i < dataLen; i++) {
+	                        nameList[i] = categories[data[i][result.categoryIndex || 0]];
+	                    }
+	                }
+	                else {
+	                    nameList = categories.slice(0);
+	                }
+	            }
+	        }
+
+	        return nameList;
+	    }
+
+	    module.exports = createListFromArray;
+
+
+
+/***/ },
+/* 102 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * Complete dimensions by data (guess dimension).
+	 */
+
+
+	    var zrUtil = __webpack_require__(4);
+
+	    /**
+	     * Complete the dimensions array guessed from the data structure.
+	     * @param  {Array.<string>} dimensions      Necessary dimensions, like ['x', 'y']
+	     * @param  {Array} data                     Data list. [[1, 2, 3], [2, 3, 4]]
+	     * @param  {Array.<string>} defaultNames    Default names to fill not necessary dimensions, like ['value']
+	     * @param  {string} extraPrefix             Prefix of name when filling the left dimensions.
+	     * @return {Array.<string>}
+	     */
+	    function completeDimensions(dimensions, data, defaultNames, extraPrefix) {
+	        if (!data) {
+	            return dimensions;
+	        }
+
+	        var value0 = retrieveValue(data[0]);
+	        var dimSize = zrUtil.isArray(value0) && value0.length || 1;
+
+	        defaultNames = defaultNames || [];
+	        extraPrefix = extraPrefix || 'extra';
+	        for (var i = 0; i < dimSize; i++) {
+	            if (!dimensions[i]) {
+	                var name = defaultNames[i] || (extraPrefix + (i - defaultNames.length));
+	                dimensions[i] = guessOrdinal(data, i)
+	                    ? {type: 'ordinal', name: name}
+	                    : name;
+	            }
+	        }
+
+	        return dimensions;
+	    }
+
+	    // The rule should not be complex, otherwise user might not
+	    // be able to known where the data is wrong.
+	    var guessOrdinal = completeDimensions.guessOrdinal = function (data, dimIndex) {
+	        for (var i = 0, len = data.length; i < len; i++) {
+	            var value = retrieveValue(data[i]);
+
+	            if (!zrUtil.isArray(value)) {
+	                return false;
+	            }
+
+	            var value = value[dimIndex];
+	            if (value != null && isFinite(value)) {
+	                return false;
+	            }
+	            else if (zrUtil.isString(value) && value !== '-') {
+	                return true;
+	            }
+	        }
+	        return false;
+	    };
+
+	    function retrieveValue(o) {
+	        return zrUtil.isArray(o) ? o : zrUtil.isObject(o) ? o.value: o;
+	    }
+
+	    module.exports = completeDimensions;
+
+
+
+/***/ },
+/* 103 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+	// FIXME step not support polar
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var SymbolDraw = __webpack_require__(104);
+	    var Symbol = __webpack_require__(105);
+	    var lineAnimationDiff = __webpack_require__(107);
+	    var graphic = __webpack_require__(43);
+
+	    var polyHelper = __webpack_require__(108);
+
+	    var ChartView = __webpack_require__(42);
+
+	    function isPointsSame(points1, points2) {
+	        if (points1.length !== points2.length) {
+	            return;
+	        }
+	        for (var i = 0; i < points1.length; i++) {
+	            var p1 = points1[i];
+	            var p2 = points2[i];
+	            if (p1[0] !== p2[0] || p1[1] !== p2[1]) {
+	                return;
+	            }
+	        }
+	        return true;
+	    }
+
+	    function getSmooth(smooth) {
+	        return typeof (smooth) === 'number' ? smooth : (smooth ? 0.3 : 0);
+	    }
+
+	    function getAxisExtentWithGap(axis) {
+	        var extent = axis.getGlobalExtent();
+	        if (axis.onBand) {
+	            // Remove extra 1px to avoid line miter in clipped edge
+	            var halfBandWidth = axis.getBandWidth() / 2 - 1;
+	            var dir = extent[1] > extent[0] ? 1 : -1;
+	            extent[0] += dir * halfBandWidth;
+	            extent[1] -= dir * halfBandWidth;
+	        }
+	        return extent;
+	    }
+
+	    function sign(val) {
+	        return val >= 0 ? 1 : -1;
+	    }
+	    /**
+	     * @param {module:echarts/coord/cartesian/Cartesian2D|module:echarts/coord/polar/Polar} coordSys
+	     * @param {module:echarts/data/List} data
+	     * @param {Array.<Array.<number>>} points
+	     * @private
+	     */
+	    function getStackedOnPoints(coordSys, data) {
+	        var baseAxis = coordSys.getBaseAxis();
+	        var valueAxis = coordSys.getOtherAxis(baseAxis);
+	        var valueStart = baseAxis.onZero
+	            ? 0 : valueAxis.scale.getExtent()[0];
+
+	        var valueDim = valueAxis.dim;
+
+	        var baseDataOffset = valueDim === 'x' || valueDim === 'radius' ? 1 : 0;
+
+	        return data.mapArray([valueDim], function (val, idx) {
+	            var stackedOnSameSign;
+	            var stackedOn = data.stackedOn;
+	            // Find first stacked value with same sign
+	            while (stackedOn &&
+	                sign(stackedOn.get(valueDim, idx)) === sign(val)
+	            ) {
+	                stackedOnSameSign = stackedOn;
+	                break;
+	            }
+	            var stackedData = [];
+	            stackedData[baseDataOffset] = data.get(baseAxis.dim, idx);
+	            stackedData[1 - baseDataOffset] = stackedOnSameSign
+	                ? stackedOnSameSign.get(valueDim, idx, true) : valueStart;
+
+	            return coordSys.dataToPoint(stackedData);
+	        }, true);
+	    }
+
+	    function queryDataIndex(data, payload) {
+	        if (payload.dataIndex != null) {
+	            return payload.dataIndex;
+	        }
+	        else if (payload.name != null) {
+	            return data.indexOfName(payload.name);
+	        }
+	    }
+
+	    function createGridClipShape(cartesian, hasAnimation, seriesModel) {
+	        var xExtent = getAxisExtentWithGap(cartesian.getAxis('x'));
+	        var yExtent = getAxisExtentWithGap(cartesian.getAxis('y'));
+	        var isHorizontal = cartesian.getBaseAxis().isHorizontal();
+
+	        var x = Math.min(xExtent[0], xExtent[1]);
+	        var y = Math.min(yExtent[0], yExtent[1]);
+	        var width = Math.max(xExtent[0], xExtent[1]) - x;
+	        var height = Math.max(yExtent[0], yExtent[1]) - y;
+	        var lineWidth = seriesModel.get('lineStyle.normal.width') || 2;
+	        // Expand clip shape to avoid clipping when line value exceeds axis
+	        var expandSize = seriesModel.get('clipOverflow') ? lineWidth / 2 : Math.max(width, height);
+	        if (isHorizontal) {
+	            y -= expandSize;
+	            height += expandSize * 2;
+	        }
+	        else {
+	            x -= expandSize;
+	            width += expandSize * 2;
+	        }
+
+	        var clipPath = new graphic.Rect({
+	            shape: {
+	                x: x,
+	                y: y,
+	                width: width,
+	                height: height
+	            }
+	        });
+
+	        if (hasAnimation) {
+	            clipPath.shape[isHorizontal ? 'width' : 'height'] = 0;
+	            graphic.initProps(clipPath, {
+	                shape: {
+	                    width: width,
+	                    height: height
+	                }
+	            }, seriesModel);
+	        }
+
+	        return clipPath;
+	    }
+
+	    function createPolarClipShape(polar, hasAnimation, seriesModel) {
+	        var angleAxis = polar.getAngleAxis();
+	        var radiusAxis = polar.getRadiusAxis();
+
+	        var radiusExtent = radiusAxis.getExtent();
+	        var angleExtent = angleAxis.getExtent();
+
+	        var RADIAN = Math.PI / 180;
+
+	        var clipPath = new graphic.Sector({
+	            shape: {
+	                cx: polar.cx,
+	                cy: polar.cy,
+	                r0: radiusExtent[0],
+	                r: radiusExtent[1],
+	                startAngle: -angleExtent[0] * RADIAN,
+	                endAngle: -angleExtent[1] * RADIAN,
+	                clockwise: angleAxis.inverse
+	            }
+	        });
+
+	        if (hasAnimation) {
+	            clipPath.shape.endAngle = -angleExtent[0] * RADIAN;
+	            graphic.initProps(clipPath, {
+	                shape: {
+	                    endAngle: -angleExtent[1] * RADIAN
+	                }
+	            }, seriesModel);
+	        }
+
+	        return clipPath;
+	    }
+
+	    function createClipShape(coordSys, hasAnimation, seriesModel) {
+	        return coordSys.type === 'polar'
+	            ? createPolarClipShape(coordSys, hasAnimation, seriesModel)
+	            : createGridClipShape(coordSys, hasAnimation, seriesModel);
+	    }
+
+	    function turnPointsIntoStep(points, coordSys, stepTurnAt) {
+	        var baseAxis = coordSys.getBaseAxis();
+	        var baseIndex = baseAxis.dim === 'x' || baseAxis.dim === 'radius' ? 0 : 1;
+
+	        var stepPoints = [];
+	        for (var i = 0; i < points.length - 1; i++) {
+	            var nextPt = points[i + 1];
+	            var pt = points[i];
+	            stepPoints.push(pt);
+
+	            var stepPt = [];
+	            switch (stepTurnAt) {
+	                case 'end':
+	                    stepPt[baseIndex] = nextPt[baseIndex];
+	                    stepPt[1 - baseIndex] = pt[1 - baseIndex];
+	                    // default is start
+	                    stepPoints.push(stepPt);
+	                    break;
+	                case 'middle':
+	                    // default is start
+	                    var middle = (pt[baseIndex] + nextPt[baseIndex]) / 2;
+	                    var stepPt2 = [];
+	                    stepPt[baseIndex] = stepPt2[baseIndex] = middle;
+	                    stepPt[1 - baseIndex] = pt[1 - baseIndex];
+	                    stepPt2[1 - baseIndex] = nextPt[1 - baseIndex];
+	                    stepPoints.push(stepPt);
+	                    stepPoints.push(stepPt2);
+	                    break;
+	                default:
+	                    stepPt[baseIndex] = pt[baseIndex];
+	                    stepPt[1 - baseIndex] = nextPt[1 - baseIndex];
+	                    // default is start
+	                    stepPoints.push(stepPt);
+	            }
+	        }
+	        // Last points
+	        points[i] && stepPoints.push(points[i]);
+	        return stepPoints;
+	    }
+
+	    function clamp(number, extent) {
+	        return Math.max(Math.min(number, extent[1]), extent[0]);
+	    }
+
+	    function getVisualGradient(data, coordSys) {
+	        var visualMetaList = data.getVisual('visualMeta');
+	        if (!visualMetaList || !visualMetaList.length) {
+	            return;
+	        }
+
+	        var visualMeta;
+	        for (var i = visualMetaList.length - 1; i >= 0; i--) {
+	            // Can only be x or y
+	            if (visualMetaList[i].dimension < 2) {
+	                visualMeta = visualMetaList[i];
+	                break;
+	            }
+	        }
+	        if (!visualMeta || coordSys.type !== 'cartesian2d') {
+	            if (true) {
+	                console.warn('Visual map on line style only support x or y dimension.');
+	            }
+	            return;
+	        }
+	        var dimension = visualMeta.dimension;
+	        var dimName = data.dimensions[dimension];
+	        var dataExtent = data.getDataExtent(dimName);
+
+	        var stops = visualMeta.stops;
+
+	        var colorStops = [];
+	        if (stops[0].interval) {
+	            stops.sort(function (a, b) {
+	                return a.interval[0] - b.interval[0];
+	            });
+	        }
+
+	        var firstStop = stops[0];
+	        var lastStop = stops[stops.length - 1];
+	        // Interval can be infinity in piecewise case
+	        var min = firstStop.interval ? clamp(firstStop.interval[0], dataExtent) : firstStop.value;
+	        var max = lastStop.interval ? clamp(lastStop.interval[1], dataExtent) : lastStop.value;
+	        var stopsSpan = max - min;
+
+	        // In the piecewise case data out of visual range
+	        // ----dataMin----dataMax-----visualMin----visualMax
+	        if (stopsSpan === 0) {
+	            return data.getItemVisual(0, 'color');
+	        }
+	        for (var i = 0; i < stops.length; i++) {
+	            // Piecewise
+	            if (stops[i].interval) {
+	                if (stops[i].interval[1] === stops[i].interval[0]) {
+	                    continue;
+	                }
+	                colorStops.push({
+	                    // Make sure offset is between 0 and 1
+	                    offset: (clamp(stops[i].interval[0], dataExtent) - min) / stopsSpan,
+	                    color: stops[i].color
+	                }, {
+	                    offset: (clamp(stops[i].interval[1], dataExtent) - min) / stopsSpan,
+	                    color: stops[i].color
+	                });
+	            }
+	            // Continous
+	            else {
+	                // if (i > 0 && stops[i].value === stops[i - 1].value) {
+	                //     continue;
+	                // }
+	                colorStops.push({
+	                    offset: (stops[i].value - min) / stopsSpan,
+	                    color: stops[i].color
+	                });
+	            }
+	        }
+	        var gradient = new graphic.LinearGradient(
+	            0, 0, 0, 0, colorStops, true
+	        );
+	        var axis = coordSys.getAxis(dimName);
+
+	        var start = Math.round(axis.toGlobalCoord(axis.dataToCoord(min)));
+	        var end = Math.round(axis.toGlobalCoord(axis.dataToCoord(max)));
+	        // zrUtil.each(colorStops, function (colorStop) {
+	        //     // Make sure each offset has rounded px to avoid not sharp edge
+	        //     colorStop.offset = (Math.round(colorStop.offset * (end - start) + start) - start) / (end - start);
+	        // });
+
+	        gradient[dimName] = start;
+	        gradient[dimName + '2'] = end;
+
+	        return gradient;
+	    }
+
+	    module.exports = ChartView.extend({
+
+	        type: 'line',
+
+	        init: function () {
+	            var lineGroup = new graphic.Group();
+
+	            var symbolDraw = new SymbolDraw();
+	            this.group.add(symbolDraw.group);
+
+	            this._symbolDraw = symbolDraw;
+	            this._lineGroup = lineGroup;
+	        },
+
+	        render: function (seriesModel, ecModel, api) {
+	            var coordSys = seriesModel.coordinateSystem;
+	            var group = this.group;
+	            var data = seriesModel.getData();
+	            var lineStyleModel = seriesModel.getModel('lineStyle.normal');
+	            var areaStyleModel = seriesModel.getModel('areaStyle.normal');
+
+	            var points = data.mapArray(data.getItemLayout, true);
+
+	            var isCoordSysPolar = coordSys.type === 'polar';
+	            var prevCoordSys = this._coordSys;
+
+	            var symbolDraw = this._symbolDraw;
+	            var polyline = this._polyline;
+	            var polygon = this._polygon;
+
+	            var lineGroup = this._lineGroup;
+
+	            var hasAnimation = seriesModel.get('animation');
+
+	            var isAreaChart = !areaStyleModel.isEmpty();
+	            var stackedOnPoints = getStackedOnPoints(coordSys, data);
+
+	            var showSymbol = seriesModel.get('showSymbol');
+
+	            var isSymbolIgnore = showSymbol && !isCoordSysPolar && !seriesModel.get('showAllSymbol')
+	                && this._getSymbolIgnoreFunc(data, coordSys);
+
+	            // Remove temporary symbols
+	            var oldData = this._data;
+	            oldData && oldData.eachItemGraphicEl(function (el, idx) {
+	                if (el.__temp) {
+	                    group.remove(el);
+	                    oldData.setItemGraphicEl(idx, null);
+	                }
+	            });
+
+	            // Remove previous created symbols if showSymbol changed to false
+	            if (!showSymbol) {
+	                symbolDraw.remove();
+	            }
+
+	            group.add(lineGroup);
+
+	            // FIXME step not support polar
+	            var step = !isCoordSysPolar && seriesModel.get('step');
+	            // Initialization animation or coordinate system changed
+	            if (
+	                !(polyline && prevCoordSys.type === coordSys.type && step === this._step)
+	            ) {
+	                showSymbol && symbolDraw.updateData(data, isSymbolIgnore);
+
+	                if (step) {
+	                    // TODO If stacked series is not step
+	                    points = turnPointsIntoStep(points, coordSys, step);
+	                    stackedOnPoints = turnPointsIntoStep(stackedOnPoints, coordSys, step);
+	                }
+
+	                polyline = this._newPolyline(points, coordSys, hasAnimation);
+	                if (isAreaChart) {
+	                    polygon = this._newPolygon(
+	                        points, stackedOnPoints,
+	                        coordSys, hasAnimation
+	                    );
+	                }
+	                lineGroup.setClipPath(createClipShape(coordSys, true, seriesModel));
+	            }
+	            else {
+	                if (isAreaChart && !polygon) {
+	                    // If areaStyle is added
+	                    polygon = this._newPolygon(
+	                        points, stackedOnPoints,
+	                        coordSys, hasAnimation
+	                    );
+	                }
+	                else if (polygon && !isAreaChart) {
+	                    // If areaStyle is removed
+	                    lineGroup.remove(polygon);
+	                    polygon = this._polygon = null;
+	                }
+
+	                // Update clipPath
+	                lineGroup.setClipPath(createClipShape(coordSys, false, seriesModel));
+
+	                // Always update, or it is wrong in the case turning on legend
+	                // because points are not changed
+	                showSymbol && symbolDraw.updateData(data, isSymbolIgnore);
+
+	                // Stop symbol animation and sync with line points
+	                // FIXME performance?
+	                data.eachItemGraphicEl(function (el) {
+	                    el.stopAnimation(true);
+	                });
+
+	                // In the case data zoom triggerred refreshing frequently
+	                // Data may not change if line has a category axis. So it should animate nothing
+	                if (!isPointsSame(this._stackedOnPoints, stackedOnPoints)
+	                    || !isPointsSame(this._points, points)
+	                ) {
+	                    if (hasAnimation) {
+	                        this._updateAnimation(
+	                            data, stackedOnPoints, coordSys, api, step
+	                        );
+	                    }
+	                    else {
+	                        polyline.setShape({
+	                            points: points
+	                        });
+	                        polygon && polygon.setShape({
+	                            points: points,
+	                            stackedOnPoints: stackedOnPoints
+	                        });
+	                    }
+	                }
+	            }
+
+	            var visualColor = getVisualGradient(data, coordSys) || data.getVisual('color');
+	            polyline.useStyle(zrUtil.defaults(
+	                // Use color in lineStyle first
+	                lineStyleModel.getLineStyle(),
+	                {
+	                    fill: 'none',
+	                    stroke: visualColor,
+	                    lineJoin: 'bevel'
+	                }
+	            ));
+
+	            var smooth = seriesModel.get('smooth');
+	            smooth = getSmooth(seriesModel.get('smooth'));
+	            polyline.setShape({
+	                smooth: smooth,
+	                smoothMonotone: seriesModel.get('smoothMonotone'),
+	                connectNulls: seriesModel.get('connectNulls')
+	            });
+
+	            if (polygon) {
+	                var stackedOn = data.stackedOn;
+	                var stackedOnSmooth = 0;
+
+	                polygon.useStyle(zrUtil.defaults(
+	                    areaStyleModel.getAreaStyle(),
+	                    {
+	                        fill: visualColor,
+	                        opacity: 0.7,
+	                        lineJoin: 'bevel'
+	                    }
+	                ));
+
+	                if (stackedOn) {
+	                    var stackedOnSeries = stackedOn.hostModel;
+	                    stackedOnSmooth = getSmooth(stackedOnSeries.get('smooth'));
+	                }
+
+	                polygon.setShape({
+	                    smooth: smooth,
+	                    stackedOnSmooth: stackedOnSmooth,
+	                    smoothMonotone: seriesModel.get('smoothMonotone'),
+	                    connectNulls: seriesModel.get('connectNulls')
+	                });
+	            }
+
+	            this._data = data;
+	            // Save the coordinate system for transition animation when data changed
+	            this._coordSys = coordSys;
+	            this._stackedOnPoints = stackedOnPoints;
+	            this._points = points;
+	            this._step = step;
+	        },
+
+	        highlight: function (seriesModel, ecModel, api, payload) {
+	            var data = seriesModel.getData();
+	            var dataIndex = queryDataIndex(data, payload);
+
+	            if (!(dataIndex instanceof Array) && dataIndex != null && dataIndex >= 0) {
+	                var symbol = data.getItemGraphicEl(dataIndex);
+	                if (!symbol) {
+	                    // Create a temporary symbol if it is not exists
+	                    var pt = data.getItemLayout(dataIndex);
+	                    symbol = new Symbol(data, dataIndex);
+	                    symbol.position = pt;
+	                    symbol.setZ(
+	                        seriesModel.get('zlevel'),
+	                        seriesModel.get('z')
+	                    );
+	                    symbol.ignore = isNaN(pt[0]) || isNaN(pt[1]);
+	                    symbol.__temp = true;
+	                    data.setItemGraphicEl(dataIndex, symbol);
+
+	                    // Stop scale animation
+	                    symbol.stopSymbolAnimation(true);
+
+	                    this.group.add(symbol);
+	                }
+	                symbol.highlight();
+	            }
+	            else {
+	                // Highlight whole series
+	                ChartView.prototype.highlight.call(
+	                    this, seriesModel, ecModel, api, payload
+	                );
+	            }
+	        },
+
+	        downplay: function (seriesModel, ecModel, api, payload) {
+	            var data = seriesModel.getData();
+	            var dataIndex = queryDataIndex(data, payload);
+	            if (dataIndex != null && dataIndex >= 0) {
+	                var symbol = data.getItemGraphicEl(dataIndex);
+	                if (symbol) {
+	                    if (symbol.__temp) {
+	                        data.setItemGraphicEl(dataIndex, null);
+	                        this.group.remove(symbol);
+	                    }
+	                    else {
+	                        symbol.downplay();
+	                    }
+	                }
+	            }
+	            else {
+	                // Downplay whole series
+	                ChartView.prototype.downplay.call(
+	                    this, seriesModel, ecModel, api, payload
+	                );
+	            }
+	        },
+
+	        /**
+	         * @param {module:zrender/container/Group} group
+	         * @param {Array.<Array.<number>>} points
+	         * @private
+	         */
+	        _newPolyline: function (points) {
+	            var polyline = this._polyline;
+	            // Remove previous created polyline
+	            if (polyline) {
+	                this._lineGroup.remove(polyline);
+	            }
+
+	            polyline = new polyHelper.Polyline({
+	                shape: {
+	                    points: points
+	                },
+	                silent: true,
+	                z2: 10
+	            });
+
+	            this._lineGroup.add(polyline);
+
+	            this._polyline = polyline;
+
+	            return polyline;
+	        },
+
+	        /**
+	         * @param {module:zrender/container/Group} group
+	         * @param {Array.<Array.<number>>} stackedOnPoints
+	         * @param {Array.<Array.<number>>} points
+	         * @private
+	         */
+	        _newPolygon: function (points, stackedOnPoints) {
+	            var polygon = this._polygon;
+	            // Remove previous created polygon
+	            if (polygon) {
+	                this._lineGroup.remove(polygon);
+	            }
+
+	            polygon = new polyHelper.Polygon({
+	                shape: {
+	                    points: points,
+	                    stackedOnPoints: stackedOnPoints
+	                },
+	                silent: true
+	            });
+
+	            this._lineGroup.add(polygon);
+
+	            this._polygon = polygon;
+	            return polygon;
+	        },
+	        /**
+	         * @private
+	         */
+	        _getSymbolIgnoreFunc: function (data, coordSys) {
+	            var categoryAxis = coordSys.getAxesByScale('ordinal')[0];
+	            // `getLabelInterval` is provided by echarts/component/axis
+	            if (categoryAxis && categoryAxis.isLabelIgnored) {
+	                return zrUtil.bind(categoryAxis.isLabelIgnored, categoryAxis);
+	            }
+	        },
+
+	        /**
+	         * @private
+	         */
+	        // FIXME Two value axis
+	        _updateAnimation: function (data, stackedOnPoints, coordSys, api, step) {
+	            var polyline = this._polyline;
+	            var polygon = this._polygon;
+	            var seriesModel = data.hostModel;
+
+	            var diff = lineAnimationDiff(
+	                this._data, data,
+	                this._stackedOnPoints, stackedOnPoints,
+	                this._coordSys, coordSys
+	            );
+
+	            var current = diff.current;
+	            var stackedOnCurrent = diff.stackedOnCurrent;
+	            var next = diff.next;
+	            var stackedOnNext = diff.stackedOnNext;
+	            if (step) {
+	                // TODO If stacked series is not step
+	                current = turnPointsIntoStep(diff.current, coordSys, step);
+	                stackedOnCurrent = turnPointsIntoStep(diff.stackedOnCurrent, coordSys, step);
+	                next = turnPointsIntoStep(diff.next, coordSys, step);
+	                stackedOnNext = turnPointsIntoStep(diff.stackedOnNext, coordSys, step);
+	            }
+	            polyline.shape.__points = diff.current;
+	            polyline.shape.points = current;
+
+	            graphic.updateProps(polyline, {
+	                shape: {
+	                    points: next
+	                }
+	            }, seriesModel);
+
+	            if (polygon) {
+	                polygon.setShape({
+	                    points: current,
+	                    stackedOnPoints: stackedOnCurrent
+	                });
+	                graphic.updateProps(polygon, {
+	                    shape: {
+	                        points: next,
+	                        stackedOnPoints: stackedOnNext,
+	                        __points: diff.next
+	                    }
+	                }, seriesModel);
+	            }
+
+	            var updatedDataInfo = [];
+	            var diffStatus = diff.status;
+
+	            for (var i = 0; i < diffStatus.length; i++) {
+	                var cmd = diffStatus[i].cmd;
+	                if (cmd === '=') {
+	                    var el = data.getItemGraphicEl(diffStatus[i].idx1);
+	                    if (el) {
+	                        updatedDataInfo.push({
+	                            el: el,
+	                            ptIdx: i    // Index of points
+	                        });
+	                    }
+	                }
+	            }
+
+	            if (polyline.animators && polyline.animators.length) {
+	                polyline.animators[0].during(function () {
+	                    for (var i = 0; i < updatedDataInfo.length; i++) {
+	                        var el = updatedDataInfo[i].el;
+	                        el.attr('position', polyline.shape.__points[updatedDataInfo[i].ptIdx]);
+	                    }
+	                });
+	            }
+	        },
+
+	        remove: function (ecModel) {
+	            var group = this.group;
+	            var oldData = this._data;
+	            this._lineGroup.removeAll();
+	            this._symbolDraw.remove(true);
+	            // Remove temporary created elements when highlighting
+	            oldData && oldData.eachItemGraphicEl(function (el, idx) {
+	                if (el.__temp) {
+	                    group.remove(el);
+	                    oldData.setItemGraphicEl(idx, null);
+	                }
+	            });
+
+	            this._polyline =
+	            this._polygon =
+	            this._coordSys =
+	            this._points =
+	            this._stackedOnPoints =
+	            this._data = null;
+	        }
+	    });
+
+
+/***/ },
+/* 104 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @module echarts/chart/helper/SymbolDraw
+	 */
+
+
+	    var graphic = __webpack_require__(43);
+	    var Symbol = __webpack_require__(105);
+
+	    /**
+	     * @constructor
+	     * @alias module:echarts/chart/helper/SymbolDraw
+	     * @param {module:zrender/graphic/Group} [symbolCtor]
+	     */
+	    function SymbolDraw(symbolCtor) {
+	        this.group = new graphic.Group();
+
+	        this._symbolCtor = symbolCtor || Symbol;
+	    }
+
+	    var symbolDrawProto = SymbolDraw.prototype;
+
+	    function symbolNeedsDraw(data, idx, isIgnore) {
+	        var point = data.getItemLayout(idx);
+	        return point && !isNaN(point[0]) && !isNaN(point[1]) && !(isIgnore && isIgnore(idx))
+	                    && data.getItemVisual(idx, 'symbol') !== 'none';
+	    }
+	    /**
+	     * Update symbols draw by new data
+	     * @param {module:echarts/data/List} data
+	     * @param {Array.<boolean>} [isIgnore]
+	     */
+	    symbolDrawProto.updateData = function (data, isIgnore) {
+	        var group = this.group;
+	        var seriesModel = data.hostModel;
+	        var oldData = this._data;
+
+	        var SymbolCtor = this._symbolCtor;
+
+	        var seriesScope = {
+	            itemStyle: seriesModel.getModel('itemStyle.normal').getItemStyle(['color']),
+	            hoverItemStyle: seriesModel.getModel('itemStyle.emphasis').getItemStyle(),
+	            symbolRotate: seriesModel.get('symbolRotate'),
+	            symbolOffset: seriesModel.get('symbolOffset'),
+	            hoverAnimation: seriesModel.get('hoverAnimation'),
+
+	            labelModel: seriesModel.getModel('label.normal'),
+	            hoverLabelModel: seriesModel.getModel('label.emphasis')
+	        };
+
+	        data.diff(oldData)
+	            .add(function (newIdx) {
+	                var point = data.getItemLayout(newIdx);
+	                if (symbolNeedsDraw(data, newIdx, isIgnore)) {
+	                    var symbolEl = new SymbolCtor(data, newIdx, seriesScope);
+	                    symbolEl.attr('position', point);
+	                    data.setItemGraphicEl(newIdx, symbolEl);
+	                    group.add(symbolEl);
+	                }
+	            })
+	            .update(function (newIdx, oldIdx) {
+	                var symbolEl = oldData.getItemGraphicEl(oldIdx);
+	                var point = data.getItemLayout(newIdx);
+	                if (!symbolNeedsDraw(data, newIdx, isIgnore)) {
+	                    group.remove(symbolEl);
+	                    return;
+	                }
+	                if (!symbolEl) {
+	                    symbolEl = new SymbolCtor(data, newIdx);
+	                    symbolEl.attr('position', point);
+	                }
+	                else {
+	                    symbolEl.updateData(data, newIdx, seriesScope);
+	                    graphic.updateProps(symbolEl, {
+	                        position: point
+	                    }, seriesModel);
+	                }
+
+	                // Add back
+	                group.add(symbolEl);
+
+	                data.setItemGraphicEl(newIdx, symbolEl);
+	            })
+	            .remove(function (oldIdx) {
+	                var el = oldData.getItemGraphicEl(oldIdx);
+	                el && el.fadeOut(function () {
+	                    group.remove(el);
+	                });
+	            })
+	            .execute();
+
+	        this._data = data;
+	    };
+
+	    symbolDrawProto.updateLayout = function () {
+	        var data = this._data;
+	        if (data) {
+	            // Not use animation
+	            data.eachItemGraphicEl(function (el, idx) {
+	                var point = data.getItemLayout(idx);
+	                el.attr('position', point);
+	            });
+	        }
+	    };
+
+	    symbolDrawProto.remove = function (enableAnimation) {
+	        var group = this.group;
+	        var data = this._data;
+	        if (data) {
+	            if (enableAnimation) {
+	                data.eachItemGraphicEl(function (el) {
+	                    el.fadeOut(function () {
+	                        group.remove(el);
+	                    });
+	                });
+	            }
+	            else {
+	                group.removeAll();
+	            }
+	        }
+	    };
+
+	    module.exports = SymbolDraw;
+
+
+/***/ },
+/* 105 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @module echarts/chart/helper/Symbol
+	 */
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var symbolUtil = __webpack_require__(106);
+	    var graphic = __webpack_require__(43);
+	    var numberUtil = __webpack_require__(7);
+
+	    function normalizeSymbolSize(symbolSize) {
+	        if (!(symbolSize instanceof Array)) {
+	            symbolSize = [+symbolSize, +symbolSize];
+	        }
+	        return symbolSize;
+	    }
+
+	    /**
+	     * @constructor
+	     * @alias {module:echarts/chart/helper/Symbol}
+	     * @param {module:echarts/data/List} data
+	     * @param {number} idx
+	     * @extends {module:zrender/graphic/Group}
+	     */
+	    function Symbol(data, idx, seriesScope) {
+	        graphic.Group.call(this);
+
+	        this.updateData(data, idx, seriesScope);
+	    }
+
+	    var symbolProto = Symbol.prototype;
+
+	    function driftSymbol(dx, dy) {
+	        this.parent.drift(dx, dy);
+	    }
+
+	    symbolProto._createSymbol = function (symbolType, data, idx) {
+	        // Remove paths created before
+	        this.removeAll();
+
+	        var seriesModel = data.hostModel;
+	        var color = data.getItemVisual(idx, 'color');
+
+	        var symbolPath = symbolUtil.createSymbol(
+	            symbolType, -0.5, -0.5, 1, 1, color
+	        );
+
+	        symbolPath.attr({
+	            z2: 100,
+	            culling: true,
+	            scale: [0, 0]
+	        });
+	        // Rewrite drift method
+	        symbolPath.drift = driftSymbol;
+
+	        var size = normalizeSymbolSize(data.getItemVisual(idx, 'symbolSize'));
+
+	        graphic.initProps(symbolPath, {
+	            scale: size
+	        }, seriesModel, idx);
+
+	        this._symbolType = symbolType;
+
+	        this.add(symbolPath);
+	    };
+
+	    /**
+	     * Stop animation
+	     * @param {boolean} toLastFrame
+	     */
+	    symbolProto.stopSymbolAnimation = function (toLastFrame) {
+	        this.childAt(0).stopAnimation(toLastFrame);
+	    };
+
+	    /**
+	     * Get scale(aka, current symbol size).
+	     * Including the change caused by animation
+	     */
+	    symbolProto.getScale = function () {
+	        return this.childAt(0).scale;
+	    };
+
+	    /**
+	     * Highlight symbol
+	     */
+	    symbolProto.highlight = function () {
+	        this.childAt(0).trigger('emphasis');
+	    };
+
+	    /**
+	     * Downplay symbol
+	     */
+	    symbolProto.downplay = function () {
+	        this.childAt(0).trigger('normal');
+	    };
+
+	    /**
+	     * @param {number} zlevel
+	     * @param {number} z
+	     */
+	    symbolProto.setZ = function (zlevel, z) {
+	        var symbolPath = this.childAt(0);
+	        symbolPath.zlevel = zlevel;
+	        symbolPath.z = z;
+	    };
+
+	    symbolProto.setDraggable = function (draggable) {
+	        var symbolPath = this.childAt(0);
+	        symbolPath.draggable = draggable;
+	        symbolPath.cursor = draggable ? 'move' : 'pointer';
+	    };
+
+	    /**
+	     * Update symbol properties
+	     * @param  {module:echarts/data/List} data
+	     * @param  {number} idx
+	     */
+	    symbolProto.updateData = function (data, idx, seriesScope) {
+	        this.silent = false;
+
+	        var symbolType = data.getItemVisual(idx, 'symbol') || 'circle';
+	        var seriesModel = data.hostModel;
+	        var symbolSize = normalizeSymbolSize(data.getItemVisual(idx, 'symbolSize'));
+	        if (symbolType !== this._symbolType) {
+	            this._createSymbol(symbolType, data, idx);
+	        }
+	        else {
+	            var symbolPath = this.childAt(0);
+	            graphic.updateProps(symbolPath, {
+	                scale: symbolSize
+	            }, seriesModel, idx);
+	        }
+	        this._updateCommon(data, idx, symbolSize, seriesScope);
+
+	        this._seriesModel = seriesModel;
+	    };
+
+	    // Update common properties
+	    var normalStyleAccessPath = ['itemStyle', 'normal'];
+	    var emphasisStyleAccessPath = ['itemStyle', 'emphasis'];
+	    var normalLabelAccessPath = ['label', 'normal'];
+	    var emphasisLabelAccessPath = ['label', 'emphasis'];
+
+	    symbolProto._updateCommon = function (data, idx, symbolSize, seriesScope) {
+	        var symbolPath = this.childAt(0);
+	        var seriesModel = data.hostModel;
+	        var color = data.getItemVisual(idx, 'color');
+
+	        // Reset style
+	        if (symbolPath.type !== 'image') {
+	            symbolPath.useStyle({
+	                strokeNoScale: true
+	            });
+	        }
+
+	        seriesScope = seriesScope || null;
+
+	        var itemStyle = seriesScope && seriesScope.itemStyle;
+	        var hoverItemStyle = seriesScope && seriesScope.hoverItemStyle;
+	        var symbolRotate = seriesScope && seriesScope.symbolRotate;
+	        var symbolOffset = seriesScope && seriesScope.symbolOffset;
+	        var labelModel = seriesScope && seriesScope.labelModel;
+	        var hoverLabelModel = seriesScope && seriesScope.hoverLabelModel;
+	        var hoverAnimation = seriesScope && seriesScope.hoverAnimation;
+
+	        if (!seriesScope || data.hasItemOption) {
+	            var itemModel = data.getItemModel(idx);
+
+	            // Color must be excluded.
+	            // Because symbol provide setColor individually to set fill and stroke
+	            itemStyle = itemModel.getModel(normalStyleAccessPath).getItemStyle(['color']);
+	            hoverItemStyle = itemModel.getModel(emphasisStyleAccessPath).getItemStyle();
+
+	            symbolRotate = itemModel.getShallow('symbolRotate');
+	            symbolOffset = itemModel.getShallow('symbolOffset');
+
+	            labelModel = itemModel.getModel(normalLabelAccessPath);
+	            hoverLabelModel = itemModel.getModel(emphasisLabelAccessPath);
+	            hoverAnimation = itemModel.getShallow('hoverAnimation');
+	        }
+	        else {
+	            hoverItemStyle = zrUtil.extend({}, hoverItemStyle);
+	        }
+
+	        var elStyle = symbolPath.style;
+
+	        symbolPath.rotation = (symbolRotate || 0) * Math.PI / 180 || 0;
+
+	        if (symbolOffset) {
+	            symbolPath.attr('position', [
+	                numberUtil.parsePercent(symbolOffset[0], symbolSize[0]),
+	                numberUtil.parsePercent(symbolOffset[1], symbolSize[1])
+	            ]);
+	        }
+
+	        // PENDING setColor before setStyle!!!
+	        symbolPath.setColor(color);
+
+	        symbolPath.setStyle(itemStyle);
+
+	        var opacity = data.getItemVisual(idx, 'opacity');
+	        if (opacity != null) {
+	            elStyle.opacity = opacity;
+	        }
+
+	        // Get last value dim
+	        var dimensions = data.dimensions.slice();
+	        var valueDim;
+	        var dataType;
+	        while (dimensions.length && (
+	            valueDim = dimensions.pop(),
+	            dataType = data.getDimensionInfo(valueDim).type,
+	            dataType === 'ordinal' || dataType === 'time'
+	        )) {} // jshint ignore:line
+
+	        if (valueDim != null && labelModel.getShallow('show')) {
+	            graphic.setText(elStyle, labelModel, color);
+	            elStyle.text = zrUtil.retrieve(
+	                seriesModel.getFormattedLabel(idx, 'normal'),
+	                data.get(valueDim, idx)
+	            );
+	        }
+	        else {
+	            elStyle.text = '';
+	        }
+
+	        if (valueDim != null && hoverLabelModel.getShallow('show')) {
+	            graphic.setText(hoverItemStyle, hoverLabelModel, color);
+	            hoverItemStyle.text = zrUtil.retrieve(
+	                seriesModel.getFormattedLabel(idx, 'emphasis'),
+	                data.get(valueDim, idx)
+	            );
+	        }
+	        else {
+	            hoverItemStyle.text = '';
+	        }
+
+	        var size = normalizeSymbolSize(data.getItemVisual(idx, 'symbolSize'));
+
+	        symbolPath.off('mouseover')
+	            .off('mouseout')
+	            .off('emphasis')
+	            .off('normal');
+
+	        graphic.setHoverStyle(symbolPath, hoverItemStyle);
+
+	        if (hoverAnimation && seriesModel.ifEnableAnimation()) {
+	            var onEmphasis = function() {
+	                var ratio = size[1] / size[0];
+	                this.animateTo({
+	                    scale: [
+	                        Math.max(size[0] * 1.1, size[0] + 3),
+	                        Math.max(size[1] * 1.1, size[1] + 3 * ratio)
+	                    ]
+	                }, 400, 'elasticOut');
+	            };
+	            var onNormal = function() {
+	                this.animateTo({
+	                    scale: size
+	                }, 400, 'elasticOut');
+	            };
+	            symbolPath.on('mouseover', onEmphasis)
+	                .on('mouseout', onNormal)
+	                .on('emphasis', onEmphasis)
+	                .on('normal', onNormal);
+	        }
+	    };
+
+	    symbolProto.fadeOut = function (cb) {
+	        var symbolPath = this.childAt(0);
+	        // Avoid mistaken hover when fading out
+	        this.silent = true;
+	        // Not show text when animating
+	        symbolPath.style.text = '';
+	        graphic.updateProps(symbolPath, {
+	            scale: [0, 0]
+	        }, this._seriesModel, this.dataIndex, cb);
+	    };
+
+	    zrUtil.inherits(Symbol, graphic.Group);
+
+	    module.exports = Symbol;
+
+
+/***/ },
+/* 106 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+	// Symbol factory
+
+
+	    var graphic = __webpack_require__(43);
+	    var BoundingRect = __webpack_require__(9);
+
+	    /**
+	     * Triangle shape
+	     * @inner
+	     */
+	    var Triangle = graphic.extendShape({
+	        type: 'triangle',
+	        shape: {
+	            cx: 0,
+	            cy: 0,
+	            width: 0,
+	            height: 0
+	        },
+	        buildPath: function (path, shape) {
+	            var cx = shape.cx;
+	            var cy = shape.cy;
+	            var width = shape.width / 2;
+	            var height = shape.height / 2;
+	            path.moveTo(cx, cy - height);
+	            path.lineTo(cx + width, cy + height);
+	            path.lineTo(cx - width, cy + height);
+	            path.closePath();
+	        }
+	    });
+	    /**
+	     * Diamond shape
+	     * @inner
+	     */
+	    var Diamond = graphic.extendShape({
+	        type: 'diamond',
+	        shape: {
+	            cx: 0,
+	            cy: 0,
+	            width: 0,
+	            height: 0
+	        },
+	        buildPath: function (path, shape) {
+	            var cx = shape.cx;
+	            var cy = shape.cy;
+	            var width = shape.width / 2;
+	            var height = shape.height / 2;
+	            path.moveTo(cx, cy - height);
+	            path.lineTo(cx + width, cy);
+	            path.lineTo(cx, cy + height);
+	            path.lineTo(cx - width, cy);
+	            path.closePath();
+	        }
+	    });
+
+	    /**
+	     * Pin shape
+	     * @inner
+	     */
+	    var Pin = graphic.extendShape({
+	        type: 'pin',
+	        shape: {
+	            // x, y on the cusp
+	            x: 0,
+	            y: 0,
+	            width: 0,
+	            height: 0
+	        },
+
+	        buildPath: function (path, shape) {
+	            var x = shape.x;
+	            var y = shape.y;
+	            var w = shape.width / 5 * 3;
+	            // Height must be larger than width
+	            var h = Math.max(w, shape.height);
+	            var r = w / 2;
+
+	            // Dist on y with tangent point and circle center
+	            var dy = r * r / (h - r);
+	            var cy = y - h + r + dy;
+	            var angle = Math.asin(dy / r);
+	            // Dist on x with tangent point and circle center
+	            var dx = Math.cos(angle) * r;
+
+	            var tanX = Math.sin(angle);
+	            var tanY = Math.cos(angle);
+
+	            path.arc(
+	                x, cy, r,
+	                Math.PI - angle,
+	                Math.PI * 2 + angle
+	            );
+
+	            var cpLen = r * 0.6;
+	            var cpLen2 = r * 0.7;
+	            path.bezierCurveTo(
+	                x + dx - tanX * cpLen, cy + dy + tanY * cpLen,
+	                x, y - cpLen2,
+	                x, y
+	            );
+	            path.bezierCurveTo(
+	                x, y - cpLen2,
+	                x - dx + tanX * cpLen, cy + dy + tanY * cpLen,
+	                x - dx, cy + dy
+	            );
+	            path.closePath();
+	        }
+	    });
+
+	    /**
+	     * Arrow shape
+	     * @inner
+	     */
+	    var Arrow = graphic.extendShape({
+
+	        type: 'arrow',
+
+	        shape: {
+	            x: 0,
+	            y: 0,
+	            width: 0,
+	            height: 0
+	        },
+
+	        buildPath: function (ctx, shape) {
+	            var height = shape.height;
+	            var width = shape.width;
+	            var x = shape.x;
+	            var y = shape.y;
+	            var dx = width / 3 * 2;
+	            ctx.moveTo(x, y);
+	            ctx.lineTo(x + dx, y + height);
+	            ctx.lineTo(x, y + height / 4 * 3);
+	            ctx.lineTo(x - dx, y + height);
+	            ctx.lineTo(x, y);
+	            ctx.closePath();
+	        }
+	    });
+
+	    /**
+	     * Map of path contructors
+	     * @type {Object.<string, module:zrender/graphic/Path>}
+	     */
+	    var symbolCtors = {
+	        line: graphic.Line,
+
+	        rect: graphic.Rect,
+
+	        roundRect: graphic.Rect,
+
+	        square: graphic.Rect,
+
+	        circle: graphic.Circle,
+
+	        diamond: Diamond,
+
+	        pin: Pin,
+
+	        arrow: Arrow,
+
+	        triangle: Triangle
+	    };
+
+	    var symbolShapeMakers = {
+
+	        line: function (x, y, w, h, shape) {
+	            // FIXME
+	            shape.x1 = x;
+	            shape.y1 = y + h / 2;
+	            shape.x2 = x + w;
+	            shape.y2 = y + h / 2;
+	        },
+
+	        rect: function (x, y, w, h, shape) {
+	            shape.x = x;
+	            shape.y = y;
+	            shape.width = w;
+	            shape.height = h;
+	        },
+
+	        roundRect: function (x, y, w, h, shape) {
+	            shape.x = x;
+	            shape.y = y;
+	            shape.width = w;
+	            shape.height = h;
+	            shape.r = Math.min(w, h) / 4;
+	        },
+
+	        square: function (x, y, w, h, shape) {
+	            var size = Math.min(w, h);
+	            shape.x = x;
+	            shape.y = y;
+	            shape.width = size;
+	            shape.height = size;
+	        },
+
+	        circle: function (x, y, w, h, shape) {
+	            // Put circle in the center of square
+	            shape.cx = x + w / 2;
+	            shape.cy = y + h / 2;
+	            shape.r = Math.min(w, h) / 2;
+	        },
+
+	        diamond: function (x, y, w, h, shape) {
+	            shape.cx = x + w / 2;
+	            shape.cy = y + h / 2;
+	            shape.width = w;
+	            shape.height = h;
+	        },
+
+	        pin: function (x, y, w, h, shape) {
+	            shape.x = x + w / 2;
+	            shape.y = y + h / 2;
+	            shape.width = w;
+	            shape.height = h;
+	        },
+
+	        arrow: function (x, y, w, h, shape) {
+	            shape.x = x + w / 2;
+	            shape.y = y + h / 2;
+	            shape.width = w;
+	            shape.height = h;
+	        },
+
+	        triangle: function (x, y, w, h, shape) {
+	            shape.cx = x + w / 2;
+	            shape.cy = y + h / 2;
+	            shape.width = w;
+	            shape.height = h;
+	        }
+	    };
+
+	    var symbolBuildProxies = {};
+	    for (var name in symbolCtors) {
+	        symbolBuildProxies[name] = new symbolCtors[name]();
+	    }
+
+	    var Symbol = graphic.extendShape({
+
+	        type: 'symbol',
+
+	        shape: {
+	            symbolType: '',
+	            x: 0,
+	            y: 0,
+	            width: 0,
+	            height: 0
+	        },
+
+	        beforeBrush: function () {
+	            var style = this.style;
+	            var shape = this.shape;
+	            // FIXME
+	            if (shape.symbolType === 'pin' && style.textPosition === 'inside') {
+	                style.textPosition = ['50%', '40%'];
+	                style.textAlign = 'center';
+	                style.textVerticalAlign = 'middle';
+	            }
+	        },
+
+	        buildPath: function (ctx, shape, inBundle) {
+	            var symbolType = shape.symbolType;
+	            var proxySymbol = symbolBuildProxies[symbolType];
+	            if (shape.symbolType !== 'none') {
+	                if (!proxySymbol) {
+	                    // Default rect
+	                    symbolType = 'rect';
+	                    proxySymbol = symbolBuildProxies[symbolType];
+	                }
+	                symbolShapeMakers[symbolType](
+	                    shape.x, shape.y, shape.width, shape.height, proxySymbol.shape
+	                );
+	                proxySymbol.buildPath(ctx, proxySymbol.shape, inBundle);
+	            }
+	        }
+	    });
+
+	    // Provide setColor helper method to avoid determine if set the fill or stroke outside
+	    var symbolPathSetColor = function (color) {
+	        if (this.type !== 'image') {
+	            var symbolStyle = this.style;
+	            var symbolShape = this.shape;
+	            if (symbolShape && symbolShape.symbolType === 'line') {
+	                symbolStyle.stroke = color;
+	            }
+	            else if (this.__isEmptyBrush) {
+	                symbolStyle.stroke = color;
+	                symbolStyle.fill = '#fff';
+	            }
+	            else {
+	                // FIXME 判断图形默认是填充还是描边，使用 onlyStroke ?
+	                symbolStyle.fill && (symbolStyle.fill = color);
+	                symbolStyle.stroke && (symbolStyle.stroke = color);
+	            }
+	            this.dirty(false);
+	        }
+	    };
+
+	    var symbolUtil = {
+	        /**
+	         * Create a symbol element with given symbol configuration: shape, x, y, width, height, color
+	         * @param {string} symbolType
+	         * @param {number} x
+	         * @param {number} y
+	         * @param {number} w
+	         * @param {number} h
+	         * @param {string} color
+	         */
+	        createSymbol: function (symbolType, x, y, w, h, color) {
+	            var isEmpty = symbolType.indexOf('empty') === 0;
+	            if (isEmpty) {
+	                symbolType = symbolType.substr(5, 1).toLowerCase() + symbolType.substr(6);
+	            }
+	            var symbolPath;
+
+	            if (symbolType.indexOf('image://') === 0) {
+	                symbolPath = new graphic.Image({
+	                    style: {
+	                        image: symbolType.slice(8),
+	                        x: x,
+	                        y: y,
+	                        width: w,
+	                        height: h
+	                    }
+	                });
+	            }
+	            else if (symbolType.indexOf('path://') === 0) {
+	                symbolPath = graphic.makePath(symbolType.slice(7), {}, new BoundingRect(x, y, w, h));
+	            }
+	            else {
+	                symbolPath = new Symbol({
+	                    shape: {
+	                        symbolType: symbolType,
+	                        x: x,
+	                        y: y,
+	                        width: w,
+	                        height: h
+	                    }
+	                });
+	            }
+
+	            symbolPath.__isEmptyBrush = isEmpty;
+
+	            symbolPath.setColor = symbolPathSetColor;
+
+	            symbolPath.setColor(color);
+
+	            return symbolPath;
+	        }
+	    };
+
+	    module.exports = symbolUtil;
+
+
+/***/ },
+/* 107 */
+/***/ function(module, exports) {
+
+	
+
+	    // var arrayDiff = require('zrender/lib/core/arrayDiff');
+	    // 'zrender/core/arrayDiff' has been used before, but it did
+	    // not do well in performance when roam with fixed dataZoom window.
+
+	    function sign(val) {
+	        return val >= 0 ? 1 : -1;
+	    }
+
+	    function getStackedOnPoint(coordSys, data, idx) {
+	        var baseAxis = coordSys.getBaseAxis();
+	        var valueAxis = coordSys.getOtherAxis(baseAxis);
+	        var valueStart = baseAxis.onZero
+	            ? 0 : valueAxis.scale.getExtent()[0];
+
+	        var valueDim = valueAxis.dim;
+	        var baseDataOffset = valueDim === 'x' || valueDim === 'radius' ? 1 : 0;
+
+	        var stackedOnSameSign;
+	        var stackedOn = data.stackedOn;
+	        var val = data.get(valueDim, idx);
+	        // Find first stacked value with same sign
+	        while (stackedOn &&
+	            sign(stackedOn.get(valueDim, idx)) === sign(val)
+	        ) {
+	            stackedOnSameSign = stackedOn;
+	            break;
+	        }
+	        var stackedData = [];
+	        stackedData[baseDataOffset] = data.get(baseAxis.dim, idx);
+	        stackedData[1 - baseDataOffset] = stackedOnSameSign
+	            ? stackedOnSameSign.get(valueDim, idx, true) : valueStart;
+
+	        return coordSys.dataToPoint(stackedData);
+	    }
+
+	    // function convertToIntId(newIdList, oldIdList) {
+	    //     // Generate int id instead of string id.
+	    //     // Compare string maybe slow in score function of arrDiff
+
+	    //     // Assume id in idList are all unique
+	    //     var idIndicesMap = {};
+	    //     var idx = 0;
+	    //     for (var i = 0; i < newIdList.length; i++) {
+	    //         idIndicesMap[newIdList[i]] = idx;
+	    //         newIdList[i] = idx++;
+	    //     }
+	    //     for (var i = 0; i < oldIdList.length; i++) {
+	    //         var oldId = oldIdList[i];
+	    //         // Same with newIdList
+	    //         if (idIndicesMap[oldId]) {
+	    //             oldIdList[i] = idIndicesMap[oldId];
+	    //         }
+	    //         else {
+	    //             oldIdList[i] = idx++;
+	    //         }
+	    //     }
+	    // }
+
+	    function diffData(oldData, newData) {
+	        var diffResult = [];
+
+	        newData.diff(oldData)
+	            .add(function (idx) {
+	                diffResult.push({cmd: '+', idx: idx});
+	            })
+	            .update(function (newIdx, oldIdx) {
+	                diffResult.push({cmd: '=', idx: oldIdx, idx1: newIdx});
+	            })
+	            .remove(function (idx) {
+	                diffResult.push({cmd: '-', idx: idx});
+	            })
+	            .execute();
+
+	        return diffResult;
+	    }
+
+	    module.exports = function (
+	        oldData, newData,
+	        oldStackedOnPoints, newStackedOnPoints,
+	        oldCoordSys, newCoordSys
+	    ) {
+	        var diff = diffData(oldData, newData);
+
+	        // var newIdList = newData.mapArray(newData.getId);
+	        // var oldIdList = oldData.mapArray(oldData.getId);
+
+	        // convertToIntId(newIdList, oldIdList);
+
+	        // // FIXME One data ?
+	        // diff = arrayDiff(oldIdList, newIdList);
+
+	        var currPoints = [];
+	        var nextPoints = [];
+	        // Points for stacking base line
+	        var currStackedPoints = [];
+	        var nextStackedPoints = [];
+
+	        var status = [];
+	        var sortedIndices = [];
+	        var rawIndices = [];
+	        var dims = newCoordSys.dimensions;
+	        for (var i = 0; i < diff.length; i++) {
+	            var diffItem = diff[i];
+	            var pointAdded = true;
+
+	            // FIXME, animation is not so perfect when dataZoom window moves fast
+	            // Which is in case remvoing or add more than one data in the tail or head
+	            switch (diffItem.cmd) {
+	                case '=':
+	                    var currentPt = oldData.getItemLayout(diffItem.idx);
+	                    var nextPt = newData.getItemLayout(diffItem.idx1);
+	                    // If previous data is NaN, use next point directly
+	                    if (isNaN(currentPt[0]) || isNaN(currentPt[1])) {
+	                        currentPt = nextPt.slice();
+	                    }
+	                    currPoints.push(currentPt);
+	                    nextPoints.push(nextPt);
+
+	                    currStackedPoints.push(oldStackedOnPoints[diffItem.idx]);
+	                    nextStackedPoints.push(newStackedOnPoints[diffItem.idx1]);
+
+	                    rawIndices.push(newData.getRawIndex(diffItem.idx1));
+	                    break;
+	                case '+':
+	                    var idx = diffItem.idx;
+	                    currPoints.push(
+	                        oldCoordSys.dataToPoint([
+	                            newData.get(dims[0], idx, true), newData.get(dims[1], idx, true)
+	                        ])
+	                    );
+
+	                    nextPoints.push(newData.getItemLayout(idx).slice());
+
+	                    currStackedPoints.push(
+	                        getStackedOnPoint(oldCoordSys, newData, idx)
+	                    );
+	                    nextStackedPoints.push(newStackedOnPoints[idx]);
+
+	                    rawIndices.push(newData.getRawIndex(idx));
+	                    break;
+	                case '-':
+	                    var idx = diffItem.idx;
+	                    var rawIndex = oldData.getRawIndex(idx);
+	                    // Data is replaced. In the case of dynamic data queue
+	                    // FIXME FIXME FIXME
+	                    if (rawIndex !== idx) {
+	                        currPoints.push(oldData.getItemLayout(idx));
+	                        nextPoints.push(newCoordSys.dataToPoint([
+	                            oldData.get(dims[0], idx, true), oldData.get(dims[1], idx, true)
+	                        ]));
+
+	                        currStackedPoints.push(oldStackedOnPoints[idx]);
+	                        nextStackedPoints.push(
+	                            getStackedOnPoint(
+	                                newCoordSys, oldData, idx
+	                            )
+	                        );
+
+	                        rawIndices.push(rawIndex);
+	                    }
+	                    else {
+	                        pointAdded = false;
+	                    }
+	            }
+
+	            // Original indices
+	            if (pointAdded) {
+	                status.push(diffItem);
+	                sortedIndices.push(sortedIndices.length);
+	            }
+	        }
+
+	        // Diff result may be crossed if all items are changed
+	        // Sort by data index
+	        sortedIndices.sort(function (a, b) {
+	            return rawIndices[a] - rawIndices[b];
+	        });
+
+	        var sortedCurrPoints = [];
+	        var sortedNextPoints = [];
+
+	        var sortedCurrStackedPoints = [];
+	        var sortedNextStackedPoints = [];
+
+	        var sortedStatus = [];
+	        for (var i = 0; i < sortedIndices.length; i++) {
+	            var idx = sortedIndices[i];
+	            sortedCurrPoints[i] = currPoints[idx];
+	            sortedNextPoints[i] = nextPoints[idx];
+
+	            sortedCurrStackedPoints[i] = currStackedPoints[idx];
+	            sortedNextStackedPoints[i] = nextStackedPoints[idx];
+
+	            sortedStatus[i] = status[idx];
+	        }
+
+	        return {
+	            current: sortedCurrPoints,
+	            next: sortedNextPoints,
+
+	            stackedOnCurrent: sortedCurrStackedPoints,
+	            stackedOnNext: sortedNextStackedPoints,
+
+	            status: sortedStatus
+	        };
+	    };
+
+
+/***/ },
+/* 108 */
+/***/ function(module, exports, __webpack_require__) {
+
+	// Poly path support NaN point
+
+
+	    var Path = __webpack_require__(45);
+	    var vec2 = __webpack_require__(10);
+
+	    var vec2Min = vec2.min;
+	    var vec2Max = vec2.max;
+
+	    var scaleAndAdd = vec2.scaleAndAdd;
+	    var v2Copy = vec2.copy;
+
+	    // Temporary variable
+	    var v = [];
+	    var cp0 = [];
+	    var cp1 = [];
+
+	    function isPointNull(p) {
+	        return isNaN(p[0]) || isNaN(p[1]);
+	    }
+
+	    function drawSegment(
+	        ctx, points, start, segLen, allLen,
+	        dir, smoothMin, smoothMax, smooth, smoothMonotone, connectNulls
+	    ) {
+	        var prevIdx = 0;
+	        var idx = start;
+	        for (var k = 0; k < segLen; k++) {
+	            var p = points[idx];
+	            if (idx >= allLen || idx < 0) {
+	                break;
+	            }
+	            if (isPointNull(p)) {
+	                if (connectNulls) {
+	                    idx += dir;
+	                    continue;
+	                }
+	                break;
+	            }
+
+	            if (idx === start) {
+	                ctx[dir > 0 ? 'moveTo' : 'lineTo'](p[0], p[1]);
+	                v2Copy(cp0, p);
+	            }
+	            else {
+	                if (smooth > 0) {
+	                    var nextIdx = idx + dir;
+	                    var nextP = points[nextIdx];
+	                    if (connectNulls) {
+	                        // Find next point not null
+	                        while (nextP && isPointNull(points[nextIdx])) {
+	                            nextIdx += dir;
+	                            nextP = points[nextIdx];
+	                        }
+	                    }
+
+	                    var ratioNextSeg = 0.5;
+	                    var prevP = points[prevIdx];
+	                    var nextP = points[nextIdx];
+	                    // Last point
+	                    if (!nextP || isPointNull(nextP)) {
+	                        v2Copy(cp1, p);
+	                    }
+	                    else {
+	                        // If next data is null in not connect case
+	                        if (isPointNull(nextP) && !connectNulls) {
+	                            nextP = p;
+	                        }
+
+	                        vec2.sub(v, nextP, prevP);
+
+	                        var lenPrevSeg;
+	                        var lenNextSeg;
+	                        if (smoothMonotone === 'x' || smoothMonotone === 'y') {
+	                            var dim = smoothMonotone === 'x' ? 0 : 1;
+	                            lenPrevSeg = Math.abs(p[dim] - prevP[dim]);
+	                            lenNextSeg = Math.abs(p[dim] - nextP[dim]);
+	                        }
+	                        else {
+	                            lenPrevSeg = vec2.dist(p, prevP);
+	                            lenNextSeg = vec2.dist(p, nextP);
+	                        }
+
+	                        // Use ratio of seg length
+	                        ratioNextSeg = lenNextSeg / (lenNextSeg + lenPrevSeg);
+
+	                        scaleAndAdd(cp1, p, v, -smooth * (1 - ratioNextSeg));
+	                    }
+	                    // Smooth constraint
+	                    vec2Min(cp0, cp0, smoothMax);
+	                    vec2Max(cp0, cp0, smoothMin);
+	                    vec2Min(cp1, cp1, smoothMax);
+	                    vec2Max(cp1, cp1, smoothMin);
+
+	                    ctx.bezierCurveTo(
+	                        cp0[0], cp0[1],
+	                        cp1[0], cp1[1],
+	                        p[0], p[1]
+	                    );
+	                    // cp0 of next segment
+	                    scaleAndAdd(cp0, p, v, smooth * ratioNextSeg);
+	                }
+	                else {
+	                    ctx.lineTo(p[0], p[1]);
+	                }
+	            }
+
+	            prevIdx = idx;
+	            idx += dir;
+	        }
+
+	        return k;
+	    }
+
+	    function getBoundingBox(points, smoothConstraint) {
+	        var ptMin = [Infinity, Infinity];
+	        var ptMax = [-Infinity, -Infinity];
+	        if (smoothConstraint) {
+	            for (var i = 0; i < points.length; i++) {
+	                var pt = points[i];
+	                if (pt[0] < ptMin[0]) { ptMin[0] = pt[0]; }
+	                if (pt[1] < ptMin[1]) { ptMin[1] = pt[1]; }
+	                if (pt[0] > ptMax[0]) { ptMax[0] = pt[0]; }
+	                if (pt[1] > ptMax[1]) { ptMax[1] = pt[1]; }
+	            }
+	        }
+	        return {
+	            min: smoothConstraint ? ptMin : ptMax,
+	            max: smoothConstraint ? ptMax : ptMin
+	        };
+	    }
+
+	    module.exports = {
+
+	        Polyline: Path.extend({
+
+	            type: 'ec-polyline',
+
+	            shape: {
+	                points: [],
+
+	                smooth: 0,
+
+	                smoothConstraint: true,
+
+	                smoothMonotone: null,
+
+	                connectNulls: false
+	            },
+
+	            style: {
+	                fill: null,
+
+	                stroke: '#000'
+	            },
+
+	            buildPath: function (ctx, shape) {
+	                var points = shape.points;
+
+	                var i = 0;
+	                var len = points.length;
+
+	                var result = getBoundingBox(points, shape.smoothConstraint);
+
+	                if (shape.connectNulls) {
+	                    // Must remove first and last null values avoid draw error in polygon
+	                    for (; len > 0; len--) {
+	                        if (!isPointNull(points[len - 1])) {
+	                            break;
+	                        }
+	                    }
+	                    for (; i < len; i++) {
+	                        if (!isPointNull(points[i])) {
+	                            break;
+	                        }
+	                    }
+	                }
+	                while (i < len) {
+	                    i += drawSegment(
+	                        ctx, points, i, len, len,
+	                        1, result.min, result.max, shape.smooth,
+	                        shape.smoothMonotone, shape.connectNulls
+	                    ) + 1;
+	                }
+	            }
+	        }),
+
+	        Polygon: Path.extend({
+
+	            type: 'ec-polygon',
+
+	            shape: {
+	                points: [],
+
+	                // Offset between stacked base points and points
+	                stackedOnPoints: [],
+
+	                smooth: 0,
+
+	                stackedOnSmooth: 0,
+
+	                smoothConstraint: true,
+
+	                smoothMonotone: null,
+
+	                connectNulls: false
+	            },
+
+	            buildPath: function (ctx, shape) {
+	                var points = shape.points;
+	                var stackedOnPoints = shape.stackedOnPoints;
+
+	                var i = 0;
+	                var len = points.length;
+	                var smoothMonotone = shape.smoothMonotone;
+	                var bbox = getBoundingBox(points, shape.smoothConstraint);
+	                var stackedOnBBox = getBoundingBox(stackedOnPoints, shape.smoothConstraint);
+
+	                if (shape.connectNulls) {
+	                    // Must remove first and last null values avoid draw error in polygon
+	                    for (; len > 0; len--) {
+	                        if (!isPointNull(points[len - 1])) {
+	                            break;
+	                        }
+	                    }
+	                    for (; i < len; i++) {
+	                        if (!isPointNull(points[i])) {
+	                            break;
+	                        }
+	                    }
+	                }
+	                while (i < len) {
+	                    var k = drawSegment(
+	                        ctx, points, i, len, len,
+	                        1, bbox.min, bbox.max, shape.smooth,
+	                        smoothMonotone, shape.connectNulls
+	                    );
+	                    drawSegment(
+	                        ctx, stackedOnPoints, i + k - 1, k, len,
+	                        -1, stackedOnBBox.min, stackedOnBBox.max, shape.stackedOnSmooth,
+	                        smoothMonotone, shape.connectNulls
+	                    );
+	                    i += k + 1;
+
+	                    ctx.closePath();
+	                }
+	            }
+	        })
+	    };
+
+
+/***/ },
+/* 109 */
+/***/ function(module, exports) {
+
+	
+
+	    module.exports = function (seriesType, defaultSymbolType, legendSymbol, ecModel, api) {
+
+	        // Encoding visual for all series include which is filtered for legend drawing
+	        ecModel.eachRawSeriesByType(seriesType, function (seriesModel) {
+	            var data = seriesModel.getData();
+
+	            var symbolType = seriesModel.get('symbol') || defaultSymbolType;
+	            var symbolSize = seriesModel.get('symbolSize');
+
+	            data.setVisual({
+	                legendSymbol: legendSymbol || symbolType,
+	                symbol: symbolType,
+	                symbolSize: symbolSize
+	            });
+
+	            // Only visible series has each data be visual encoded
+	            if (!ecModel.isSeriesFiltered(seriesModel)) {
+	                if (typeof symbolSize === 'function') {
+	                    data.each(function (idx) {
+	                        var rawValue = seriesModel.getRawValue(idx);
+	                        // FIXME
+	                        var params = seriesModel.getDataParams(idx);
+	                        data.setItemVisual(idx, 'symbolSize', symbolSize(rawValue, params));
+	                    });
+	                }
+	                data.each(function (idx) {
+	                    var itemModel = data.getItemModel(idx);
+	                    var itemSymbolType = itemModel.getShallow('symbol', true);
+	                    var itemSymbolSize = itemModel.getShallow('symbolSize', true);
+	                    // If has item symbol
+	                    if (itemSymbolType != null) {
+	                        data.setItemVisual(idx, 'symbol', itemSymbolType);
+	                    }
+	                    if (itemSymbolSize != null) {
+	                        // PENDING Transform symbolSize ?
+	                        data.setItemVisual(idx, 'symbolSize', itemSymbolSize);
+	                    }
+	                });
+	            }
+	        });
+	    };
+
+
+/***/ },
+/* 110 */
+/***/ function(module, exports) {
+
+	
+
+	    module.exports = function (seriesType, ecModel) {
+	        ecModel.eachSeriesByType(seriesType, function (seriesModel) {
+	            var data = seriesModel.getData();
+	            var coordSys = seriesModel.coordinateSystem;
+
+	            if (coordSys) {
+	                var dims = coordSys.dimensions;
+
+	                if (coordSys.type === 'singleAxis') {
+	                    data.each(dims[0], function (x, idx) {
+	                        // Also {Array.<number>}, not undefined to avoid if...else... statement
+	                        data.setItemLayout(idx, isNaN(x) ? [NaN, NaN] : coordSys.dataToPoint(x));
+	                    });
+	                }
+	                else {
+	                    data.each(dims, function (x, y, idx) {
+	                        // Also {Array.<number>}, not undefined to avoid if...else... statement
+	                        data.setItemLayout(
+	                            idx, (isNaN(x) || isNaN(y)) ? [NaN, NaN] : coordSys.dataToPoint([x, y])
+	                        );
+	                    }, true);
+	                }
+	            }
+	        });
+	    };
+
+
+/***/ },
+/* 111 */
+/***/ function(module, exports) {
+
+	
+	    var samplers = {
+	        average: function (frame) {
+	            var sum = 0;
+	            var count = 0;
+	            for (var i = 0; i < frame.length; i++) {
+	                if (!isNaN(frame[i])) {
+	                    sum += frame[i];
+	                    count++;
+	                }
+	            }
+	            // Return NaN if count is 0
+	            return count === 0 ? NaN : sum / count;
+	        },
+	        sum: function (frame) {
+	            var sum = 0;
+	            for (var i = 0; i < frame.length; i++) {
+	                // Ignore NaN
+	                sum += frame[i] || 0;
+	            }
+	            return sum;
+	        },
+	        max: function (frame) {
+	            var max = -Infinity;
+	            for (var i = 0; i < frame.length; i++) {
+	                frame[i] > max && (max = frame[i]);
+	            }
+	            return max;
+	        },
+	        min: function (frame) {
+	            var min = Infinity;
+	            for (var i = 0; i < frame.length; i++) {
+	                frame[i] < min && (min = frame[i]);
+	            }
+	            return min;
+	        },
+	        // TODO
+	        // Median
+	        nearest: function (frame) {
+	            return frame[0];
+	        }
+	    };
+
+	    var indexSampler = function (frame, value) {
+	        return Math.round(frame.length / 2);
+	    };
+	    module.exports = function (seriesType, ecModel, api) {
+	        ecModel.eachSeriesByType(seriesType, function (seriesModel) {
+	            var data = seriesModel.getData();
+	            var sampling = seriesModel.get('sampling');
+	            var coordSys = seriesModel.coordinateSystem;
+	            // Only cartesian2d support down sampling
+	            if (coordSys.type === 'cartesian2d' && sampling) {
+	                var baseAxis = coordSys.getBaseAxis();
+	                var valueAxis = coordSys.getOtherAxis(baseAxis);
+	                var extent = baseAxis.getExtent();
+	                // Coordinste system has been resized
+	                var size = extent[1] - extent[0];
+	                var rate = Math.round(data.count() / size);
+	                if (rate > 1) {
+	                    var sampler;
+	                    if (typeof sampling === 'string') {
+	                        sampler = samplers[sampling];
+	                    }
+	                    else if (typeof sampling === 'function') {
+	                        sampler = sampling;
+	                    }
+	                    if (sampler) {
+	                        data = data.downSample(
+	                            valueAxis.dim, 1 / rate, sampler, indexSampler
+	                        );
+	                        seriesModel.setData(data);
+	                    }
+	                }
+	            }
+	        }, this);
+	    };
+
+
+/***/ },
+/* 112 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var graphic = __webpack_require__(43);
+	    var zrUtil = __webpack_require__(4);
+
+	    __webpack_require__(113);
+
+	    __webpack_require__(130);
+
+	    // Grid view
+	    __webpack_require__(1).extendComponentView({
+
+	        type: 'grid',
+
+	        render: function (gridModel, ecModel) {
+	            this.group.removeAll();
+	            if (gridModel.get('show')) {
+	                this.group.add(new graphic.Rect({
+	                    shape:gridModel.coordinateSystem.getRect(),
+	                    style: zrUtil.defaults({
+	                        fill: gridModel.get('backgroundColor')
+	                    }, gridModel.getItemStyle()),
+	                    silent: true
+	                }));
+	            }
+	        }
+	    });
+
+
+/***/ },
+/* 113 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * Grid is a region which contains at most 4 cartesian systems
+	 *
+	 * TODO Default cartesian
+	 */
+	var factory = exports;
+
+	    var layout = __webpack_require__(21);
+	    var axisHelper = __webpack_require__(114);
+
+	    var zrUtil = __webpack_require__(4);
+	    var Cartesian2D = __webpack_require__(120);
+	    var Axis2D = __webpack_require__(122);
+
+	    var each = zrUtil.each;
+
+	    var ifAxisCrossZero = axisHelper.ifAxisCrossZero;
+	    var niceScaleExtent = axisHelper.niceScaleExtent;
+
+	    // 依赖 GridModel, AxisModel 做预处理
+	    __webpack_require__(125);
+
+	    /**
+	     * Check if the axis is used in the specified grid
+	     * @inner
+	     */
+	    function isAxisUsedInTheGrid(axisModel, gridModel, ecModel) {
+	        return ecModel.getComponent('grid', axisModel.get('gridIndex')) === gridModel;
+	    }
+
+	    function getLabelUnionRect(axis) {
+	        var axisModel = axis.model;
+	        var labels = axisModel.getFormattedLabels();
+	        var rect;
+	        var step = 1;
+	        var labelCount = labels.length;
+	        if (labelCount > 40) {
+	            // Simple optimization for large amount of labels
+	            step = Math.ceil(labelCount / 40);
+	        }
+	        for (var i = 0; i < labelCount; i += step) {
+	            if (!axis.isLabelIgnored(i)) {
+	                var singleRect = axisModel.getTextRect(labels[i]);
+	                // FIXME consider label rotate
+	                rect ? rect.union(singleRect) : (rect = singleRect);
+	            }
+	        }
+	        return rect;
+	    }
+
+	    function Grid(gridModel, ecModel, api) {
+	        /**
+	         * @type {Object.<string, module:echarts/coord/cartesian/Cartesian2D>}
+	         * @private
+	         */
+	        this._coordsMap = {};
+
+	        /**
+	         * @type {Array.<module:echarts/coord/cartesian/Cartesian>}
+	         * @private
+	         */
+	        this._coordsList = [];
+
+	        /**
+	         * @type {Object.<string, module:echarts/coord/cartesian/Axis2D>}
+	         * @private
+	         */
+	        this._axesMap = {};
+
+	        /**
+	         * @type {Array.<module:echarts/coord/cartesian/Axis2D>}
+	         * @private
+	         */
+	        this._axesList = [];
+
+	        this._initCartesian(gridModel, ecModel, api);
+
+	        this._model = gridModel;
+	    }
+
+	    var gridProto = Grid.prototype;
+
+	    gridProto.type = 'grid';
+
+	    gridProto.getRect = function () {
+	        return this._rect;
+	    };
+
+	    gridProto.update = function (ecModel, api) {
+
+	        var axesMap = this._axesMap;
+
+	        this._updateScale(ecModel, this._model);
+
+	        function ifAxisCanNotOnZero(otherAxisDim) {
+	            var axes = axesMap[otherAxisDim];
+	            for (var idx in axes) {
+	                var axis = axes[idx];
+	                if (axis && (axis.type === 'category' || !ifAxisCrossZero(axis))) {
+	                    return true;
+	                }
+	            }
+	            return false;
+	        }
+
+	        each(axesMap.x, function (xAxis) {
+	            niceScaleExtent(xAxis, xAxis.model);
+	        });
+	        each(axesMap.y, function (yAxis) {
+	            niceScaleExtent(yAxis, yAxis.model);
+	        });
+	        // Fix configuration
+	        each(axesMap.x, function (xAxis) {
+	            // onZero can not be enabled in these two situations
+	            // 1. When any other axis is a category axis
+	            // 2. When any other axis not across 0 point
+	            if (ifAxisCanNotOnZero('y')) {
+	                xAxis.onZero = false;
+	            }
+	        });
+	        each(axesMap.y, function (yAxis) {
+	            if (ifAxisCanNotOnZero('x')) {
+	                yAxis.onZero = false;
+	            }
+	        });
+
+	        // Resize again if containLabel is enabled
+	        // FIXME It may cause getting wrong grid size in data processing stage
+	        this.resize(this._model, api);
+	    };
+
+	    /**
+	     * Resize the grid
+	     * @param {module:echarts/coord/cartesian/GridModel} gridModel
+	     * @param {module:echarts/ExtensionAPI} api
+	     */
+	    gridProto.resize = function (gridModel, api) {
+
+	        var gridRect = layout.getLayoutRect(
+	            gridModel.getBoxLayoutParams(), {
+	                width: api.getWidth(),
+	                height: api.getHeight()
+	            });
+
+	        this._rect = gridRect;
+
+	        var axesList = this._axesList;
+
+	        adjustAxes();
+
+	        // Minus label size
+	        if (gridModel.get('containLabel')) {
+	            each(axesList, function (axis) {
+	                if (!axis.model.get('axisLabel.inside')) {
+	                    var labelUnionRect = getLabelUnionRect(axis);
+	                    if (labelUnionRect) {
+	                        var dim = axis.isHorizontal() ? 'height' : 'width';
+	                        var margin = axis.model.get('axisLabel.margin');
+	                        gridRect[dim] -= labelUnionRect[dim] + margin;
+	                        if (axis.position === 'top') {
+	                            gridRect.y += labelUnionRect.height + margin;
+	                        }
+	                        else if (axis.position === 'left')  {
+	                            gridRect.x += labelUnionRect.width + margin;
+	                        }
+	                    }
+	                }
+	            });
+
+	            adjustAxes();
+	        }
+
+	        function adjustAxes() {
+	            each(axesList, function (axis) {
+	                var isHorizontal = axis.isHorizontal();
+	                var extent = isHorizontal ? [0, gridRect.width] : [0, gridRect.height];
+	                var idx = axis.inverse ? 1 : 0;
+	                axis.setExtent(extent[idx], extent[1 - idx]);
+	                updateAxisTransfrom(axis, isHorizontal ? gridRect.x : gridRect.y);
+	            });
+	        }
+	    };
+
+	    /**
+	     * @param {string} axisType
+	     * @param {ndumber} [axisIndex]
+	     */
+	    gridProto.getAxis = function (axisType, axisIndex) {
+	        var axesMapOnDim = this._axesMap[axisType];
+	        if (axesMapOnDim != null) {
+	            if (axisIndex == null) {
+	                // Find first axis
+	                for (var name in axesMapOnDim) {
+	                    return axesMapOnDim[name];
+	                }
+	            }
+	            return axesMapOnDim[axisIndex];
+	        }
+	    };
+
+	    gridProto.getCartesian = function (xAxisIndex, yAxisIndex) {
+	        if (xAxisIndex != null && yAxisIndex != null) {
+	            var key = 'x' + xAxisIndex + 'y' + yAxisIndex;
+	            return this._coordsMap[key];
+	        }
+	        else {
+	            // When only xAxisIndex or yAxisIndex given, find its first cartesian.
+	            for (var i = 0, coordList = this._coordsList; i < coordList.length; i++) {
+	                if (coordList[i].getAxis('x').index === xAxisIndex
+	                    || coordList[i].getAxis('y').index === yAxisIndex
+	                ) {
+	                    return coordList[i];
+	                }
+	            }
+	        }
+	    };
+
+	    /**
+	     * Initialize cartesian coordinate systems
+	     * @private
+	     */
+	    gridProto._initCartesian = function (gridModel, ecModel, api) {
+	        var axisPositionUsed = {
+	            left: false,
+	            right: false,
+	            top: false,
+	            bottom: false
+	        };
+
+	        var axesMap = {
+	            x: {},
+	            y: {}
+	        };
+	        var axesCount = {
+	            x: 0,
+	            y: 0
+	        };
+
+	        /// Create axis
+	        ecModel.eachComponent('xAxis', createAxisCreator('x'), this);
+	        ecModel.eachComponent('yAxis', createAxisCreator('y'), this);
+
+	        if (!axesCount.x || !axesCount.y) {
+	            // Roll back when there no either x or y axis
+	            this._axesMap = {};
+	            this._axesList = [];
+	            return;
+	        }
+
+	        this._axesMap = axesMap;
+
+	        /// Create cartesian2d
+	        each(axesMap.x, function (xAxis, xAxisIndex) {
+	            each(axesMap.y, function (yAxis, yAxisIndex) {
+	                var key = 'x' + xAxisIndex + 'y' + yAxisIndex;
+	                var cartesian = new Cartesian2D(key);
+
+	                cartesian.grid = this;
+
+	                this._coordsMap[key] = cartesian;
+	                this._coordsList.push(cartesian);
+
+	                cartesian.addAxis(xAxis);
+	                cartesian.addAxis(yAxis);
+	            }, this);
+	        }, this);
+
+	        function createAxisCreator(axisType) {
+	            return function (axisModel, idx) {
+	                if (!isAxisUsedInTheGrid(axisModel, gridModel, ecModel)) {
+	                    return;
+	                }
+
+	                var axisPosition = axisModel.get('position');
+	                if (axisType === 'x') {
+	                    // Fix position
+	                    if (axisPosition !== 'top' && axisPosition !== 'bottom') {
+	                        // Default bottom of X
+	                        axisPosition = 'bottom';
+	                        if (axisPositionUsed[axisPosition]) {
+	                            axisPosition = axisPosition === 'top' ? 'bottom' : 'top';
+	                        }
+	                    }
+	                }
+	                else {
+	                    // Fix position
+	                    if (axisPosition !== 'left' && axisPosition !== 'right') {
+	                        // Default left of Y
+	                        axisPosition = 'left';
+	                        if (axisPositionUsed[axisPosition]) {
+	                            axisPosition = axisPosition === 'left' ? 'right' : 'left';
+	                        }
+	                    }
+	                }
+	                axisPositionUsed[axisPosition] = true;
+
+	                var axis = new Axis2D(
+	                    axisType, axisHelper.createScaleByModel(axisModel),
+	                    [0, 0],
+	                    axisModel.get('type'),
+	                    axisPosition
+	                );
+
+	                var isCategory = axis.type === 'category';
+	                axis.onBand = isCategory && axisModel.get('boundaryGap');
+	                axis.inverse = axisModel.get('inverse');
+
+	                axis.onZero = axisModel.get('axisLine.onZero');
+
+	                // Inject axis into axisModel
+	                axisModel.axis = axis;
+
+	                // Inject axisModel into axis
+	                axis.model = axisModel;
+
+	                // Inject grid info axis
+	                axis.grid = this;
+
+	                // Index of axis, can be used as key
+	                axis.index = idx;
+
+	                this._axesList.push(axis);
+
+	                axesMap[axisType][idx] = axis;
+	                axesCount[axisType]++;
+	            };
+	        }
+	    };
+
+	    /**
+	     * Update cartesian properties from series
+	     * @param  {module:echarts/model/Option} option
+	     * @private
+	     */
+	    gridProto._updateScale = function (ecModel, gridModel) {
+	        // Reset scale
+	        zrUtil.each(this._axesList, function (axis) {
+	            axis.scale.setExtent(Infinity, -Infinity);
+	        });
+	        ecModel.eachSeries(function (seriesModel) {
+	            if (seriesModel.get('coordinateSystem') === 'cartesian2d') {
+	                var xAxisIndex = seriesModel.get('xAxisIndex');
+	                var yAxisIndex = seriesModel.get('yAxisIndex');
+
+	                var xAxisModel = ecModel.getComponent('xAxis', xAxisIndex);
+	                var yAxisModel = ecModel.getComponent('yAxis', yAxisIndex);
+
+	                if (!isAxisUsedInTheGrid(xAxisModel, gridModel, ecModel)
+	                    || !isAxisUsedInTheGrid(yAxisModel, gridModel, ecModel)
+	                 ) {
+	                    return;
+	                }
+
+	                var cartesian = this.getCartesian(xAxisIndex, yAxisIndex);
+	                var data = seriesModel.getData();
+	                var xAxis = cartesian.getAxis('x');
+	                var yAxis = cartesian.getAxis('y');
+
+	                if (data.type === 'list') {
+	                    unionExtent(data, xAxis, seriesModel);
+	                    unionExtent(data, yAxis, seriesModel);
+	                }
+	            }
+	        }, this);
+
+	        function unionExtent(data, axis, seriesModel) {
+	            each(seriesModel.coordDimToDataDim(axis.dim), function (dim) {
+	                axis.scale.unionExtent(data.getDataExtent(
+	                    dim, axis.scale.type !== 'ordinal'
+	                ));
+	            });
+	        }
+	    };
+
+	    /**
+	     * @inner
+	     */
+	    function updateAxisTransfrom(axis, coordBase) {
+	        var axisExtent = axis.getExtent();
+	        var axisExtentSum = axisExtent[0] + axisExtent[1];
+
+	        // Fast transform
+	        axis.toGlobalCoord = axis.dim === 'x'
+	            ? function (coord) {
+	                return coord + coordBase;
+	            }
+	            : function (coord) {
+	                return axisExtentSum - coord + coordBase;
+	            };
+	        axis.toLocalCoord = axis.dim === 'x'
+	            ? function (coord) {
+	                return coord - coordBase;
+	            }
+	            : function (coord) {
+	                return axisExtentSum - coord + coordBase;
+	            };
+	    }
+
+	    Grid.create = function (ecModel, api) {
+	        var grids = [];
+	        ecModel.eachComponent('grid', function (gridModel, idx) {
+	            var grid = new Grid(gridModel, ecModel, api);
+	            grid.name = 'grid_' + idx;
+	            grid.resize(gridModel, api);
+
+	            gridModel.coordinateSystem = grid;
+
+	            grids.push(grid);
+	        });
+
+	        // Inject the coordinateSystems into seriesModel
+	        ecModel.eachSeries(function (seriesModel) {
+	            if (seriesModel.get('coordinateSystem') !== 'cartesian2d') {
+	                return;
+	            }
+	            var xAxisIndex = seriesModel.get('xAxisIndex');
+	            var yAxisIndex = seriesModel.get('yAxisIndex');
+	            var xAxisModel = ecModel.getComponent('xAxis', xAxisIndex);
+
+	            if (true) {
+	                var yAxisModel = ecModel.getComponent('yAxis', yAxisIndex);
+	                if (xAxisModel.get('gridIndex') !== yAxisModel.get('gridIndex')) {
+	                    throw new Error('xAxis and yAxis must use the same grid');
+	                }
+	            }
+	            var grid = grids[xAxisModel.get('gridIndex')];
+	            seriesModel.coordinateSystem = grid.getCartesian(xAxisIndex, yAxisIndex);
+	        });
+
+	        return grids;
+	    };
+
+	    // For deciding which dimensions to use when creating list data
+	    Grid.dimensions = Cartesian2D.prototype.dimensions;
+
+	    __webpack_require__(26).register('cartesian2d', Grid);
+
+	    module.exports = Grid;
+
+
+/***/ },
+/* 114 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var OrdinalScale = __webpack_require__(115);
+	    var IntervalScale = __webpack_require__(117);
+	    __webpack_require__(118);
+	    __webpack_require__(119);
+	    var Scale = __webpack_require__(116);
+
+	    var numberUtil = __webpack_require__(7);
+	    var zrUtil = __webpack_require__(4);
+	    var textContain = __webpack_require__(8);
+	    var axisHelper = {};
+
+	    /**
+	     * Get axis scale extent before niced.
+	     */
+	    axisHelper.getScaleExtent = function (axis, model) {
+	        var scale = axis.scale;
+	        var originalExtent = scale.getExtent();
+	        var span = originalExtent[1] - originalExtent[0];
+	        if (scale.type === 'ordinal') {
+	            // If series has no data, scale extent may be wrong
+	            if (!isFinite(span)) {
+	                return [0, 0];
+	            }
+	            else {
+	                return originalExtent;
+	            }
+	        }
+	        var min = model.getMin ? model.getMin() : model.get('min');
+	        var max = model.getMax ? model.getMax() : model.get('max');
+	        var crossZero = model.getNeedCrossZero
+	            ? model.getNeedCrossZero() : !model.get('scale');
+	        var boundaryGap = model.get('boundaryGap');
+	        if (!zrUtil.isArray(boundaryGap)) {
+	            boundaryGap = [boundaryGap || 0, boundaryGap || 0];
+	        }
+	        boundaryGap[0] = numberUtil.parsePercent(boundaryGap[0], 1);
+	        boundaryGap[1] = numberUtil.parsePercent(boundaryGap[1], 1);
+	        var fixMin = true;
+	        var fixMax = true;
+	        // Add boundary gap
+	        if (min == null) {
+	            min = originalExtent[0] - boundaryGap[0] * span;
+	            fixMin = false;
+	        }
+	        if (max == null) {
+	            max = originalExtent[1] + boundaryGap[1] * span;
+	            fixMax = false;
+	        }
+	        if (min === 'dataMin') {
+	            min = originalExtent[0];
+	        }
+	        if (max === 'dataMax') {
+	            max = originalExtent[1];
+	        }
+	        // Evaluate if axis needs cross zero
+	        if (crossZero) {
+	            // Axis is over zero and min is not set
+	            if (min > 0 && max > 0 && !fixMin) {
+	                min = 0;
+	            }
+	            // Axis is under zero and max is not set
+	            if (min < 0 && max < 0 && !fixMax) {
+	                max = 0;
+	            }
+	        }
+	        return [min, max];
+	    };
+
+	    axisHelper.niceScaleExtent = function (axis, model) {
+	        var scale = axis.scale;
+	        var extent = axisHelper.getScaleExtent(axis, model);
+	        var fixMin = (model.getMin ? model.getMin() : model.get('min')) != null;
+	        var fixMax = (model.getMax ? model.getMax() : model.get('max')) != null;
+	        var splitNumber = model.get('splitNumber');
+	        scale.setExtent(extent[0], extent[1]);
+	        scale.niceExtent(splitNumber, fixMin, fixMax);
+
+	        // Use minInterval to constraint the calculated interval.
+	        // If calculated interval is less than minInterval. increase the interval quantity until
+	        // it is larger than minInterval.
+	        // For example:
+	        //  minInterval is 1, calculated interval is 0.2, so increase it to be 1. In this way we can get
+	        //  an integer axis.
+	        var minInterval = model.get('minInterval');
+	        if (isFinite(minInterval) && !fixMin && !fixMax && scale.type === 'interval') {
+	            var interval = scale.getInterval();
+	            var intervalScale = Math.max(Math.abs(interval), minInterval) / interval;
+	            // while (interval < minInterval) {
+	            //     var quantity = numberUtil.quantity(interval);
+	            //     interval = quantity * 10;
+	            //     scaleQuantity *= 10;
+	            // }
+	            extent = scale.getExtent();
+	            scale.setExtent(intervalScale * extent[0], extent[1] * intervalScale);
+	            scale.niceExtent(splitNumber);
+	        }
+
+	        // If some one specified the min, max. And the default calculated interval
+	        // is not good enough. He can specify the interval. It is often appeared
+	        // in angle axis with angle 0 - 360. Interval calculated in interval scale is hard
+	        // to be 60.
+	        // FIXME
+	        var interval = model.get('interval');
+	        if (interval != null) {
+	            scale.setInterval && scale.setInterval(interval);
+	        }
+	    };
+
+	    /**
+	     * @param {module:echarts/model/Model} model
+	     * @param {string} [axisType] Default retrieve from model.type
+	     * @return {module:echarts/scale/*}
+	     */
+	    axisHelper.createScaleByModel = function(model, axisType) {
+	        axisType = axisType || model.get('type');
+	        if (axisType) {
+	            switch (axisType) {
+	                // Buildin scale
+	                case 'category':
+	                    return new OrdinalScale(
+	                        model.getCategories(), [Infinity, -Infinity]
+	                    );
+	                case 'value':
+	                    return new IntervalScale();
+	                // Extended scale, like time and log
+	                default:
+	                    return (Scale.getClass(axisType) || IntervalScale).create(model);
+	            }
+	        }
+	    };
+
+	    /**
+	     * Check if the axis corss 0
+	     */
+	    axisHelper.ifAxisCrossZero = function (axis) {
+	        var dataExtent = axis.scale.getExtent();
+	        var min = dataExtent[0];
+	        var max = dataExtent[1];
+	        return !((min > 0 && max > 0) || (min < 0 && max < 0));
+	    };
+
+	    /**
+	     * @param {Array.<number>} tickCoords In axis self coordinate.
+	     * @param {Array.<string>} labels
+	     * @param {string} font
+	     * @param {boolean} isAxisHorizontal
+	     * @return {number}
+	     */
+	    axisHelper.getAxisLabelInterval = function (tickCoords, labels, font, isAxisHorizontal) {
+	        // FIXME
+	        // 不同角的axis和label，不只是horizontal和vertical.
+
+	        var textSpaceTakenRect;
+	        var autoLabelInterval = 0;
+	        var accumulatedLabelInterval = 0;
+
+	        var step = 1;
+	        if (labels.length > 40) {
+	            // Simple optimization for large amount of labels
+	            step = Math.floor(labels.length / 40);
+	        }
+
+	        for (var i = 0; i < tickCoords.length; i += step) {
+	            var tickCoord = tickCoords[i];
+	            var rect = textContain.getBoundingRect(
+	                labels[i], font, 'center', 'top'
+	            );
+	            rect[isAxisHorizontal ? 'x' : 'y'] += tickCoord;
+	            // FIXME Magic number 1.5
+	            rect[isAxisHorizontal ? 'width' : 'height'] *= 1.3;
+	            if (!textSpaceTakenRect) {
+	                textSpaceTakenRect = rect.clone();
+	            }
+	            // There is no space for current label;
+	            else if (textSpaceTakenRect.intersect(rect)) {
+	                accumulatedLabelInterval++;
+	                autoLabelInterval = Math.max(autoLabelInterval, accumulatedLabelInterval);
+	            }
+	            else {
+	                textSpaceTakenRect.union(rect);
+	                // Reset
+	                accumulatedLabelInterval = 0;
+	            }
+	        }
+	        if (autoLabelInterval === 0 && step > 1) {
+	            return step;
+	        }
+	        return (autoLabelInterval + 1) * step - 1;
+	    };
+
+	    /**
+	     * @param {Object} axis
+	     * @param {Function} labelFormatter
+	     * @return {Array.<string>}
+	     */
+	    axisHelper.getFormattedLabels = function (axis, labelFormatter) {
+	        var scale = axis.scale;
+	        var labels = scale.getTicksLabels();
+	        var ticks = scale.getTicks();
+	        if (typeof labelFormatter === 'string') {
+	            labelFormatter = (function (tpl) {
+	                return function (val) {
+	                    return tpl.replace('{value}', val);
+	                };
+	            })(labelFormatter);
+	            return zrUtil.map(labels, labelFormatter);
+	        }
+	        else if (typeof labelFormatter === 'function') {
+	            return zrUtil.map(ticks, function (tick, idx) {
+	                return labelFormatter(
+	                    axis.type === 'category' ? scale.getLabel(tick) : tick,
+	                    idx
+	                );
+	            }, this);
+	        }
+	        else {
+	            return labels;
+	        }
+	    };
+
+	    module.exports = axisHelper;
+
+
+/***/ },
+/* 115 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * Linear continuous scale
+	 * @module echarts/coord/scale/Ordinal
+	 *
+	 * http://en.wikipedia.org/wiki/Level_of_measurement
+	 */
+
+	// FIXME only one data
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var Scale = __webpack_require__(116);
+
+	    var scaleProto = Scale.prototype;
+
+	    var OrdinalScale = Scale.extend({
+
+	        type: 'ordinal',
+
+	        init: function (data, extent) {
+	            this._data = data;
+	            this._extent = extent || [0, data.length - 1];
+	        },
+
+	        parse: function (val) {
+	            return typeof val === 'string'
+	                ? zrUtil.indexOf(this._data, val)
+	                // val might be float.
+	                : Math.round(val);
+	        },
+
+	        contain: function (rank) {
+	            rank = this.parse(rank);
+	            return scaleProto.contain.call(this, rank)
+	                && this._data[rank] != null;
+	        },
+
+	        /**
+	         * Normalize given rank or name to linear [0, 1]
+	         * @param {number|string} [val]
+	         * @return {number}
+	         */
+	        normalize: function (val) {
+	            return scaleProto.normalize.call(this, this.parse(val));
+	        },
+
+	        scale: function (val) {
+	            return Math.round(scaleProto.scale.call(this, val));
+	        },
+
+	        /**
+	         * @return {Array}
+	         */
+	        getTicks: function () {
+	            var ticks = [];
+	            var extent = this._extent;
+	            var rank = extent[0];
+
+	            while (rank <= extent[1]) {
+	                ticks.push(rank);
+	                rank++;
+	            }
+
+	            return ticks;
+	        },
+
+	        /**
+	         * Get item on rank n
+	         * @param {number} n
+	         * @return {string}
+	         */
+	        getLabel: function (n) {
+	            return this._data[n];
+	        },
+
+	        /**
+	         * @return {number}
+	         */
+	        count: function () {
+	            return this._extent[1] - this._extent[0] + 1;
+	        },
+
+	        niceTicks: zrUtil.noop,
+	        niceExtent: zrUtil.noop
+	    });
+
+	    /**
+	     * @return {module:echarts/scale/Time}
+	     */
+	    OrdinalScale.create = function () {
+	        return new OrdinalScale();
+	    };
+
+	    module.exports = OrdinalScale;
+
+
+/***/ },
+/* 116 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * // Scale class management
+	 * @module echarts/scale/Scale
+	 */
+
+
+	    var clazzUtil = __webpack_require__(13);
+
+	    function Scale() {
+	        /**
+	         * Extent
+	         * @type {Array.<number>}
+	         * @protected
+	         */
+	        this._extent = [Infinity, -Infinity];
+
+	        /**
+	         * Step is calculated in adjustExtent
+	         * @type {Array.<number>}
+	         * @protected
+	         */
+	        this._interval = 0;
+
+	        this.init && this.init.apply(this, arguments);
+	    }
+
+	    var scaleProto = Scale.prototype;
+
+	    /**
+	     * Parse input val to valid inner number.
+	     * @param {*} val
+	     * @return {number}
+	     */
+	    scaleProto.parse = function (val) {
+	        // Notice: This would be a trap here, If the implementation
+	        // of this method depends on extent, and this method is used
+	        // before extent set (like in dataZoom), it would be wrong.
+	        // Nevertheless, parse does not depend on extent generally.
+	        return val;
+	    };
+
+	    scaleProto.contain = function (val) {
+	        var extent = this._extent;
+	        return val >= extent[0] && val <= extent[1];
+	    };
+
+	    /**
+	     * Normalize value to linear [0, 1], return 0.5 if extent span is 0
+	     * @param {number} val
+	     * @return {number}
+	     */
+	    scaleProto.normalize = function (val) {
+	        var extent = this._extent;
+	        if (extent[1] === extent[0]) {
+	            return 0.5;
+	        }
+	        return (val - extent[0]) / (extent[1] - extent[0]);
+	    };
+
+	    /**
+	     * Scale normalized value
+	     * @param {number} val
+	     * @return {number}
+	     */
+	    scaleProto.scale = function (val) {
+	        var extent = this._extent;
+	        return val * (extent[1] - extent[0]) + extent[0];
+	    };
+
+	    /**
+	     * Set extent from data
+	     * @param {Array.<number>} other
+	     */
+	    scaleProto.unionExtent = function (other) {
+	        var extent = this._extent;
+	        other[0] < extent[0] && (extent[0] = other[0]);
+	        other[1] > extent[1] && (extent[1] = other[1]);
+	        // not setExtent because in log axis it may transformed to power
+	        // this.setExtent(extent[0], extent[1]);
+	    };
+
+	    /**
+	     * Get extent
+	     * @return {Array.<number>}
+	     */
+	    scaleProto.getExtent = function () {
+	        return this._extent.slice();
+	    };
+
+	    /**
+	     * Set extent
+	     * @param {number} start
+	     * @param {number} end
+	     */
+	    scaleProto.setExtent = function (start, end) {
+	        var thisExtent = this._extent;
+	        if (!isNaN(start)) {
+	            thisExtent[0] = start;
+	        }
+	        if (!isNaN(end)) {
+	            thisExtent[1] = end;
+	        }
+	    };
+
+	    /**
+	     * @return {Array.<string>}
+	     */
+	    scaleProto.getTicksLabels = function () {
+	        var labels = [];
+	        var ticks = this.getTicks();
+	        for (var i = 0; i < ticks.length; i++) {
+	            labels.push(this.getLabel(ticks[i]));
+	        }
+	        return labels;
+	    };
+
+	    clazzUtil.enableClassExtend(Scale);
+	    clazzUtil.enableClassManagement(Scale, {
+	        registerWhenExtend: true
+	    });
+
+	    module.exports = Scale;
+
+
+/***/ },
+/* 117 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * Interval scale
+	 * @module echarts/scale/Interval
+	 */
+
+
+
+	    var numberUtil = __webpack_require__(7);
+	    var formatUtil = __webpack_require__(6);
+	    var Scale = __webpack_require__(116);
+
+	    var mathFloor = Math.floor;
+	    var mathCeil = Math.ceil;
+	    /**
+	     * @alias module:echarts/coord/scale/Interval
+	     * @constructor
+	     */
+	    var IntervalScale = Scale.extend({
+
+	        type: 'interval',
+
+	        _interval: 0,
+
+	        setExtent: function (start, end) {
+	            var thisExtent = this._extent;
+	            //start,end may be a Number like '25',so...
+	            if (!isNaN(start)) {
+	                thisExtent[0] = parseFloat(start);
+	            }
+	            if (!isNaN(end)) {
+	                thisExtent[1] = parseFloat(end);
+	            }
+	        },
+
+	        unionExtent: function (other) {
+	            var extent = this._extent;
+	            other[0] < extent[0] && (extent[0] = other[0]);
+	            other[1] > extent[1] && (extent[1] = other[1]);
+
+	            // unionExtent may called by it's sub classes
+	            IntervalScale.prototype.setExtent.call(this, extent[0], extent[1]);
+	        },
+	        /**
+	         * Get interval
+	         */
+	        getInterval: function () {
+	            if (!this._interval) {
+	                this.niceTicks();
+	            }
+	            return this._interval;
+	        },
+
+	        /**
+	         * Set interval
+	         */
+	        setInterval: function (interval) {
+	            this._interval = interval;
+	            // Dropped auto calculated niceExtent and use user setted extent
+	            // We assume user wan't to set both interval, min, max to get a better result
+	            this._niceExtent = this._extent.slice();
+	        },
+
+	        /**
+	         * @return {Array.<number>}
+	         */
+	        getTicks: function () {
+	            if (!this._interval) {
+	                this.niceTicks();
+	            }
+	            var interval = this._interval;
+	            var extent = this._extent;
+	            var ticks = [];
+
+	            // Consider this case: using dataZoom toolbox, zoom and zoom.
+	            var safeLimit = 10000;
+
+	            if (interval) {
+	                var niceExtent = this._niceExtent;
+	                if (extent[0] < niceExtent[0]) {
+	                    ticks.push(extent[0]);
+	                }
+	                var tick = niceExtent[0];
+	                while (tick <= niceExtent[1]) {
+	                    ticks.push(tick);
+	                    // Avoid rounding error
+	                    tick = numberUtil.round(tick + interval);
+	                    if (ticks.length > safeLimit) {
+	                        return [];
+	                    }
+	                }
+	                if (extent[1] > niceExtent[1]) {
+	                    ticks.push(extent[1]);
+	                }
+	            }
+
+	            return ticks;
+	        },
+
+	        /**
+	         * @return {Array.<string>}
+	         */
+	        getTicksLabels: function () {
+	            var labels = [];
+	            var ticks = this.getTicks();
+	            for (var i = 0; i < ticks.length; i++) {
+	                labels.push(this.getLabel(ticks[i]));
+	            }
+	            return labels;
+	        },
+
+	        /**
+	         * @param {number} n
+	         * @return {number}
+	         */
+	        getLabel: function (data) {
+	            return formatUtil.addCommas(data);
+	        },
+
+	        /**
+	         * Update interval and extent of intervals for nice ticks
+	         *
+	         * @param {number} [splitNumber = 5] Desired number of ticks
+	         */
+	        niceTicks: function (splitNumber) {
+	            splitNumber = splitNumber || 5;
+	            var extent = this._extent;
+	            var span = extent[1] - extent[0];
+	            if (!isFinite(span)) {
+	                return;
+	            }
+	            // User may set axis min 0 and data are all negative
+	            // FIXME If it needs to reverse ?
+	            if (span < 0) {
+	                span = -span;
+	                extent.reverse();
+	            }
+
+	            // From "Nice Numbers for Graph Labels" of Graphic Gems
+	            // var niceSpan = numberUtil.nice(span, false);
+	            var step = numberUtil.nice(span / splitNumber, true);
+
+	            // Niced extent inside original extent
+	            var niceExtent = [
+	                numberUtil.round(mathCeil(extent[0] / step) * step),
+	                numberUtil.round(mathFloor(extent[1] / step) * step)
+	            ];
+
+	            this._interval = step;
+	            this._niceExtent = niceExtent;
+	        },
+
+	        /**
+	         * Nice extent.
+	         * @param {number} [splitNumber = 5] Given approx tick number
+	         * @param {boolean} [fixMin=false]
+	         * @param {boolean} [fixMax=false]
+	         */
+	        niceExtent: function (splitNumber, fixMin, fixMax) {
+	            var extent = this._extent;
+	            // If extent start and end are same, expand them
+	            if (extent[0] === extent[1]) {
+	                if (extent[0] !== 0) {
+	                    // Expand extent
+	                    var expandSize = extent[0];
+	                    // In the fowllowing case
+	                    //      Axis has been fixed max 100
+	                    //      Plus data are all 100 and axis extent are [100, 100].
+	                    // Extend to the both side will cause expanded max is larger than fixed max.
+	                    // So only expand to the smaller side.
+	                    if (!fixMax) {
+	                        extent[1] += expandSize / 2;
+	                        extent[0] -= expandSize / 2;
+	                    }
+	                    else {
+	                        extent[0] -= expandSize / 2;
+	                    }
+	                }
+	                else {
+	                    extent[1] = 1;
+	                }
+	            }
+	            var span = extent[1] - extent[0];
+	            // If there are no data and extent are [Infinity, -Infinity]
+	            if (!isFinite(span)) {
+	                extent[0] = 0;
+	                extent[1] = 1;
+	            }
+
+	            this.niceTicks(splitNumber);
+
+	            // var extent = this._extent;
+	            var interval = this._interval;
+
+	            if (!fixMin) {
+	                extent[0] = numberUtil.round(mathFloor(extent[0] / interval) * interval);
+	            }
+	            if (!fixMax) {
+	                extent[1] = numberUtil.round(mathCeil(extent[1] / interval) * interval);
+	            }
+	        }
+	    });
+
+	    /**
+	     * @return {module:echarts/scale/Time}
+	     */
+	    IntervalScale.create = function () {
+	        return new IntervalScale();
+	    };
+
+	    module.exports = IntervalScale;
+
+
+
+/***/ },
+/* 118 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * Interval scale
+	 * @module echarts/coord/scale/Time
+	 */
+
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var numberUtil = __webpack_require__(7);
+	    var formatUtil = __webpack_require__(6);
+
+	    var IntervalScale = __webpack_require__(117);
+
+	    var intervalScaleProto = IntervalScale.prototype;
+
+	    var mathCeil = Math.ceil;
+	    var mathFloor = Math.floor;
+	    var ONE_SECOND = 1000;
+	    var ONE_MINUTE = ONE_SECOND * 60;
+	    var ONE_HOUR = ONE_MINUTE * 60;
+	    var ONE_DAY = ONE_HOUR * 24;
+
+	    // FIXME 公用？
+	    var bisect = function (a, x, lo, hi) {
+	        while (lo < hi) {
+	            var mid = lo + hi >>> 1;
+	            if (a[mid][2] < x) {
+	                lo = mid + 1;
+	            }
+	            else {
+	                hi  = mid;
+	            }
+	        }
+	        return lo;
+	    };
+
+	    /**
+	     * @alias module:echarts/coord/scale/Time
+	     * @constructor
+	     */
+	    var TimeScale = IntervalScale.extend({
+	        type: 'time',
+
+	        // Overwrite
+	        getLabel: function (val) {
+	            var stepLvl = this._stepLvl;
+
+	            var date = new Date(val);
+
+	            return formatUtil.formatTime(stepLvl[0], date);
+	        },
+
+	        // Overwrite
+	        niceExtent: function (approxTickNum, fixMin, fixMax) {
+	            var extent = this._extent;
+	            // If extent start and end are same, expand them
+	            if (extent[0] === extent[1]) {
+	                // Expand extent
+	                extent[0] -= ONE_DAY;
+	                extent[1] += ONE_DAY;
+	            }
+	            // If there are no data and extent are [Infinity, -Infinity]
+	            if (extent[1] === -Infinity && extent[0] === Infinity) {
+	                var d = new Date();
+	                extent[1] = new Date(d.getFullYear(), d.getMonth(), d.getDate());
+	                extent[0] = extent[1] - ONE_DAY;
+	            }
+
+	            this.niceTicks(approxTickNum);
+
+	            // var extent = this._extent;
+	            var interval = this._interval;
+
+	            if (!fixMin) {
+	                extent[0] = numberUtil.round(mathFloor(extent[0] / interval) * interval);
+	            }
+	            if (!fixMax) {
+	                extent[1] = numberUtil.round(mathCeil(extent[1] / interval) * interval);
+	            }
+	        },
+
+	        // Overwrite
+	        niceTicks: function (approxTickNum) {
+	            approxTickNum = approxTickNum || 10;
+
+	            var extent = this._extent;
+	            var span = extent[1] - extent[0];
+	            var approxInterval = span / approxTickNum;
+	            var scaleLevelsLen = scaleLevels.length;
+	            var idx = bisect(scaleLevels, approxInterval, 0, scaleLevelsLen);
+
+	            var level = scaleLevels[Math.min(idx, scaleLevelsLen - 1)];
+	            var interval = level[2];
+	            // Same with interval scale if span is much larger than 1 year
+	            if (level[0] === 'year') {
+	                var yearSpan = span / interval;
+
+	                // From "Nice Numbers for Graph Labels" of Graphic Gems
+	                // var niceYearSpan = numberUtil.nice(yearSpan, false);
+	                var yearStep = numberUtil.nice(yearSpan / approxTickNum, true);
+
+	                interval *= yearStep;
+	            }
+
+	            var niceExtent = [
+	                mathCeil(extent[0] / interval) * interval,
+	                mathFloor(extent[1] / interval) * interval
+	            ];
+
+	            this._stepLvl = level;
+	            // Interval will be used in getTicks
+	            this._interval = interval;
+	            this._niceExtent = niceExtent;
+	        },
+
+	        parse: function (val) {
+	            // val might be float.
+	            return +numberUtil.parseDate(val);
+	        }
+	    });
+
+	    zrUtil.each(['contain', 'normalize'], function (methodName) {
+	        TimeScale.prototype[methodName] = function (val) {
+	            return intervalScaleProto[methodName].call(this, this.parse(val));
+	        };
+	    });
+
+	    // Steps from d3
+	    var scaleLevels = [
+	        // Format       step    interval
+	        ['hh:mm:ss',    1,      ONE_SECOND],           // 1s
+	        ['hh:mm:ss',    5,      ONE_SECOND * 5],       // 5s
+	        ['hh:mm:ss',    10,     ONE_SECOND * 10],      // 10s
+	        ['hh:mm:ss',    15,     ONE_SECOND * 15],      // 15s
+	        ['hh:mm:ss',    30,     ONE_SECOND * 30],      // 30s
+	        ['hh:mm\nMM-dd',1,      ONE_MINUTE],          // 1m
+	        ['hh:mm\nMM-dd',5,      ONE_MINUTE * 5],      // 5m
+	        ['hh:mm\nMM-dd',10,     ONE_MINUTE * 10],     // 10m
+	        ['hh:mm\nMM-dd',15,     ONE_MINUTE * 15],     // 15m
+	        ['hh:mm\nMM-dd',30,     ONE_MINUTE * 30],     // 30m
+	        ['hh:mm\nMM-dd',1,      ONE_HOUR],        // 1h
+	        ['hh:mm\nMM-dd',2,      ONE_HOUR * 2],    // 2h
+	        ['hh:mm\nMM-dd',6,      ONE_HOUR * 6],    // 6h
+	        ['hh:mm\nMM-dd',12,     ONE_HOUR * 12],   // 12h
+	        ['MM-dd\nyyyy', 1,      ONE_DAY],   // 1d
+	        ['week',        7,      ONE_DAY * 7],        // 7d
+	        ['month',       1,      ONE_DAY * 31],       // 1M
+	        ['quarter',     3,      ONE_DAY * 380 / 4],  // 3M
+	        ['half-year',   6,      ONE_DAY * 380 / 2],  // 6M
+	        ['year',        1,      ONE_DAY * 380]       // 1Y
+	    ];
+
+	    /**
+	     * @return {module:echarts/scale/Time}
+	     */
+	    TimeScale.create = function () {
+	        return new TimeScale();
+	    };
+
+	    module.exports = TimeScale;
+
+
+/***/ },
+/* 119 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * Log scale
+	 * @module echarts/scale/Log
+	 */
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var Scale = __webpack_require__(116);
+	    var numberUtil = __webpack_require__(7);
+
+	    // Use some method of IntervalScale
+	    var IntervalScale = __webpack_require__(117);
+
+	    var scaleProto = Scale.prototype;
+	    var intervalScaleProto = IntervalScale.prototype;
+
+	    var mathFloor = Math.floor;
+	    var mathCeil = Math.ceil;
+	    var mathPow = Math.pow;
+
+	    var LOG_BASE = 10;
+	    var mathLog = Math.log;
+
+	    var LogScale = Scale.extend({
+
+	        type: 'log',
+
+	        /**
+	         * @return {Array.<number>}
+	         */
+	        getTicks: function () {
+	            return zrUtil.map(intervalScaleProto.getTicks.call(this), function (val) {
+	                return numberUtil.round(mathPow(LOG_BASE, val));
+	            });
+	        },
+
+	        /**
+	         * @param {number} val
+	         * @return {string}
+	         */
+	        getLabel: intervalScaleProto.getLabel,
+
+	        /**
+	         * @param  {number} val
+	         * @return {number}
+	         */
+	        scale: function (val) {
+	            val = scaleProto.scale.call(this, val);
+	            return mathPow(LOG_BASE, val);
+	        },
+
+	        /**
+	         * @param {number} start
+	         * @param {number} end
+	         */
+	        setExtent: function (start, end) {
+	            start = mathLog(start) / mathLog(LOG_BASE);
+	            end = mathLog(end) / mathLog(LOG_BASE);
+	            intervalScaleProto.setExtent.call(this, start, end);
+	        },
+
+	        /**
+	         * @return {number} end
+	         */
+	        getExtent: function () {
+	            var extent = scaleProto.getExtent.call(this);
+	            extent[0] = mathPow(LOG_BASE, extent[0]);
+	            extent[1] = mathPow(LOG_BASE, extent[1]);
+	            return extent;
+	        },
+
+	        /**
+	         * @param  {Array.<number>} extent
+	         */
+	        unionExtent: function (extent) {
+	            extent[0] = mathLog(extent[0]) / mathLog(LOG_BASE);
+	            extent[1] = mathLog(extent[1]) / mathLog(LOG_BASE);
+	            scaleProto.unionExtent.call(this, extent);
+	        },
+
+	        /**
+	         * Update interval and extent of intervals for nice ticks
+	         * @param  {number} [approxTickNum = 10] Given approx tick number
+	         */
+	        niceTicks: function (approxTickNum) {
+	            approxTickNum = approxTickNum || 10;
+	            var extent = this._extent;
+	            var span = extent[1] - extent[0];
+	            if (span === Infinity || span <= 0) {
+	                return;
+	            }
+
+	            var interval = mathPow(10, mathFloor(mathLog(span / approxTickNum) / Math.LN10));
+	            var err = approxTickNum / span * interval;
+
+	            // Filter ticks to get closer to the desired count.
+	            if (err <= 0.5) {
+	                interval *= 10;
+	            }
+	            var niceExtent = [
+	                numberUtil.round(mathCeil(extent[0] / interval) * interval),
+	                numberUtil.round(mathFloor(extent[1] / interval) * interval)
+	            ];
+
+	            this._interval = interval;
+	            this._niceExtent = niceExtent;
+	        },
+
+	        /**
+	         * Nice extent.
+	         * @param {number} [approxTickNum = 10] Given approx tick number
+	         * @param {boolean} [fixMin=false]
+	         * @param {boolean} [fixMax=false]
+	         */
+	        niceExtent: intervalScaleProto.niceExtent
+	    });
+
+	    zrUtil.each(['contain', 'normalize'], function (methodName) {
+	        LogScale.prototype[methodName] = function (val) {
+	            val = mathLog(val) / mathLog(LOG_BASE);
+	            return scaleProto[methodName].call(this, val);
+	        };
+	    });
+
+	    LogScale.create = function () {
+	        return new LogScale();
+	    };
+
+	    module.exports = LogScale;
+
+
+/***/ },
+/* 120 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var Cartesian = __webpack_require__(121);
+
+	    function Cartesian2D(name) {
+
+	        Cartesian.call(this, name);
+	    }
+
+	    Cartesian2D.prototype = {
+
+	        constructor: Cartesian2D,
+
+	        type: 'cartesian2d',
+
+	        /**
+	         * @type {Array.<string>}
+	         * @readOnly
+	         */
+	        dimensions: ['x', 'y'],
+
+	        /**
+	         * Base axis will be used on stacking.
+	         *
+	         * @return {module:echarts/coord/cartesian/Axis2D}
+	         */
+	        getBaseAxis: function () {
+	            return this.getAxesByScale('ordinal')[0]
+	                || this.getAxesByScale('time')[0]
+	                || this.getAxis('x');
+	        },
+
+	        /**
+	         * If contain point
+	         * @param {Array.<number>} point
+	         * @return {boolean}
+	         */
+	        containPoint: function (point) {
+	            var axisX = this.getAxis('x');
+	            var axisY = this.getAxis('y');
+	            return axisX.contain(axisX.toLocalCoord(point[0]))
+	                && axisY.contain(axisY.toLocalCoord(point[1]));
+	        },
+
+	        /**
+	         * If contain data
+	         * @param {Array.<number>} data
+	         * @return {boolean}
+	         */
+	        containData: function (data) {
+	            return this.getAxis('x').containData(data[0])
+	                && this.getAxis('y').containData(data[1]);
+	        },
+
+	        /**
+	         * Convert series data to an array of points
+	         * @param {module:echarts/data/List} data
+	         * @param {boolean} stack
+	         * @return {Array}
+	         *  Return array of points. For example:
+	         *  `[[10, 10], [20, 20], [30, 30]]`
+	         */
+	        dataToPoints: function (data, stack) {
+	            return data.mapArray(['x', 'y'], function (x, y) {
+	                return this.dataToPoint([x, y]);
+	            }, stack, this);
+	        },
+
+	        /**
+	         * @param {Array.<number>} data
+	         * @param {boolean} [clamp=false]
+	         * @return {Array.<number>}
+	         */
+	        dataToPoint: function (data, clamp) {
+	            var xAxis = this.getAxis('x');
+	            var yAxis = this.getAxis('y');
+	            return [
+	                xAxis.toGlobalCoord(xAxis.dataToCoord(data[0], clamp)),
+	                yAxis.toGlobalCoord(yAxis.dataToCoord(data[1], clamp))
+	            ];
+	        },
+
+	        /**
+	         * @param {Array.<number>} point
+	         * @param {boolean} [clamp=false]
+	         * @return {Array.<number>}
+	         */
+	        pointToData: function (point, clamp) {
+	            var xAxis = this.getAxis('x');
+	            var yAxis = this.getAxis('y');
+	            return [
+	                xAxis.coordToData(xAxis.toLocalCoord(point[0]), clamp),
+	                yAxis.coordToData(yAxis.toLocalCoord(point[1]), clamp)
+	            ];
+	        },
+
+	        /**
+	         * Get other axis
+	         * @param {module:echarts/coord/cartesian/Axis2D} axis
+	         */
+	        getOtherAxis: function (axis) {
+	            return this.getAxis(axis.dim === 'x' ? 'y' : 'x');
+	        }
+	    };
+
+	    zrUtil.inherits(Cartesian2D, Cartesian);
+
+	    module.exports = Cartesian2D;
+
+
+/***/ },
+/* 121 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+	/**
+	 * Cartesian coordinate system
+	 * @module  echarts/coord/Cartesian
+	 *
+	 */
+
+
+	    var zrUtil = __webpack_require__(4);
+
+	    function dimAxisMapper(dim) {
+	        return this._axes[dim];
+	    }
+
+	    /**
+	     * @alias module:echarts/coord/Cartesian
+	     * @constructor
+	     */
+	    var Cartesian = function (name) {
+	        this._axes = {};
+
+	        this._dimList = [];
+
+	        /**
+	         * @type {string}
+	         */
+	        this.name = name || '';
+	    };
+
+	    Cartesian.prototype = {
+
+	        constructor: Cartesian,
+
+	        type: 'cartesian',
+
+	        /**
+	         * Get axis
+	         * @param  {number|string} dim
+	         * @return {module:echarts/coord/Cartesian~Axis}
+	         */
+	        getAxis: function (dim) {
+	            return this._axes[dim];
+	        },
+
+	        /**
+	         * Get axes list
+	         * @return {Array.<module:echarts/coord/Cartesian~Axis>}
+	         */
+	        getAxes: function () {
+	            return zrUtil.map(this._dimList, dimAxisMapper, this);
+	        },
+
+	        /**
+	         * Get axes list by given scale type
+	         */
+	        getAxesByScale: function (scaleType) {
+	            scaleType = scaleType.toLowerCase();
+	            return zrUtil.filter(
+	                this.getAxes(),
+	                function (axis) {
+	                    return axis.scale.type === scaleType;
+	                }
+	            );
+	        },
+
+	        /**
+	         * Add axis
+	         * @param {module:echarts/coord/Cartesian.Axis}
+	         */
+	        addAxis: function (axis) {
+	            var dim = axis.dim;
+
+	            this._axes[dim] = axis;
+
+	            this._dimList.push(dim);
+	        },
+
+	        /**
+	         * Convert data to coord in nd space
+	         * @param {Array.<number>|Object.<string, number>} val
+	         * @return {Array.<number>|Object.<string, number>}
+	         */
+	        dataToCoord: function (val) {
+	            return this._dataCoordConvert(val, 'dataToCoord');
+	        },
+
+	        /**
+	         * Convert coord in nd space to data
+	         * @param  {Array.<number>|Object.<string, number>} val
+	         * @return {Array.<number>|Object.<string, number>}
+	         */
+	        coordToData: function (val) {
+	            return this._dataCoordConvert(val, 'coordToData');
+	        },
+
+	        _dataCoordConvert: function (input, method) {
+	            var dimList = this._dimList;
+
+	            var output = input instanceof Array ? [] : {};
+
+	            for (var i = 0; i < dimList.length; i++) {
+	                var dim = dimList[i];
+	                var axis = this._axes[dim];
+
+	                output[dim] = axis[method](input[dim]);
+	            }
+
+	            return output;
+	        }
+	    };
+
+	    module.exports = Cartesian;
+
+
+/***/ },
+/* 122 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+	    var Axis = __webpack_require__(123);
+	    var axisLabelInterval = __webpack_require__(124);
+
+	    /**
+	     * Extend axis 2d
+	     * @constructor module:echarts/coord/cartesian/Axis2D
+	     * @extends {module:echarts/coord/cartesian/Axis}
+	     * @param {string} dim
+	     * @param {*} scale
+	     * @param {Array.<number>} coordExtent
+	     * @param {string} axisType
+	     * @param {string} position
+	     */
+	    var Axis2D = function (dim, scale, coordExtent, axisType, position) {
+	        Axis.call(this, dim, scale, coordExtent);
+	        /**
+	         * Axis type
+	         *  - 'category'
+	         *  - 'value'
+	         *  - 'time'
+	         *  - 'log'
+	         * @type {string}
+	         */
+	        this.type = axisType || 'value';
+
+	        /**
+	         * Axis position
+	         *  - 'top'
+	         *  - 'bottom'
+	         *  - 'left'
+	         *  - 'right'
+	         */
+	        this.position = position || 'bottom';
+	    };
+
+	    Axis2D.prototype = {
+
+	        constructor: Axis2D,
+
+	        /**
+	         * Index of axis, can be used as key
+	         */
+	        index: 0,
+	        /**
+	         * If axis is on the zero position of the other axis
+	         * @type {boolean}
+	         */
+	        onZero: false,
+
+	        /**
+	         * Axis model
+	         * @param {module:echarts/coord/cartesian/AxisModel}
+	         */
+	        model: null,
+
+	        isHorizontal: function () {
+	            var position = this.position;
+	            return position === 'top' || position === 'bottom';
+	        },
+
+	        getGlobalExtent: function () {
+	            var ret = this.getExtent();
+	            ret[0] = this.toGlobalCoord(ret[0]);
+	            ret[1] = this.toGlobalCoord(ret[1]);
+	            return ret;
+	        },
+
+	        /**
+	         * @return {number}
+	         */
+	        getLabelInterval: function () {
+	            var labelInterval = this._labelInterval;
+	            if (!labelInterval) {
+	                labelInterval = this._labelInterval = axisLabelInterval(this);
+	            }
+	            return labelInterval;
+	        },
+
+	        /**
+	         * If label is ignored.
+	         * Automatically used when axis is category and label can not be all shown
+	         * @param  {number}  idx
+	         * @return {boolean}
+	         */
+	        isLabelIgnored: function (idx) {
+	            if (this.type === 'category') {
+	                var labelInterval = this.getLabelInterval();
+	                return ((typeof labelInterval === 'function')
+	                    && !labelInterval(idx, this.scale.getLabel(idx)))
+	                    || idx % (labelInterval + 1);
+	            }
+	        },
+
+	        /**
+	         * Transform global coord to local coord,
+	         * i.e. var localCoord = axis.toLocalCoord(80);
+	         * designate by module:echarts/coord/cartesian/Grid.
+	         * @type {Function}
+	         */
+	        toLocalCoord: null,
+
+	        /**
+	         * Transform global coord to local coord,
+	         * i.e. var globalCoord = axis.toLocalCoord(40);
+	         * designate by module:echarts/coord/cartesian/Grid.
+	         * @type {Function}
+	         */
+	        toGlobalCoord: null
+
+	    };
+	    zrUtil.inherits(Axis2D, Axis);
+
+	    module.exports = Axis2D;
+
+
+/***/ },
+/* 123 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var numberUtil = __webpack_require__(7);
+	    var linearMap = numberUtil.linearMap;
+	    var zrUtil = __webpack_require__(4);
+
+	    function fixExtentWithBands(extent, nTick) {
+	        var size = extent[1] - extent[0];
+	        var len = nTick;
+	        var margin = size / len / 2;
+	        extent[0] += margin;
+	        extent[1] -= margin;
+	    }
+
+	    var normalizedExtent = [0, 1];
+	    /**
+	     * @name module:echarts/coord/CartesianAxis
+	     * @constructor
+	     */
+	    var Axis = function (dim, scale, extent) {
+
+	        /**
+	         * Axis dimension. Such as 'x', 'y', 'z', 'angle', 'radius'
+	         * @type {string}
+	         */
+	        this.dim = dim;
+
+	        /**
+	         * Axis scale
+	         * @type {module:echarts/coord/scale/*}
+	         */
+	        this.scale = scale;
+
+	        /**
+	         * @type {Array.<number>}
+	         * @private
+	         */
+	        this._extent = extent || [0, 0];
+
+	        /**
+	         * @type {boolean}
+	         */
+	        this.inverse = false;
+
+	        /**
+	         * Usually true when axis has a ordinal scale
+	         * @type {boolean}
+	         */
+	        this.onBand = false;
+	    };
+
+	    Axis.prototype = {
+
+	        constructor: Axis,
+
+	        /**
+	         * If axis extent contain given coord
+	         * @param {number} coord
+	         * @return {boolean}
+	         */
+	        contain: function (coord) {
+	            var extent = this._extent;
+	            var min = Math.min(extent[0], extent[1]);
+	            var max = Math.max(extent[0], extent[1]);
+	            return coord >= min && coord <= max;
+	        },
+
+	        /**
+	         * If axis extent contain given data
+	         * @param {number} data
+	         * @return {boolean}
+	         */
+	        containData: function (data) {
+	            return this.contain(this.dataToCoord(data));
+	        },
+
+	        /**
+	         * Get coord extent.
+	         * @return {Array.<number>}
+	         */
+	        getExtent: function () {
+	            var ret = this._extent.slice();
+	            return ret;
+	        },
+
+	        /**
+	         * Get precision used for formatting
+	         * @param {Array.<number>} [dataExtent]
+	         * @return {number}
+	         */
+	        getPixelPrecision: function (dataExtent) {
+	            return numberUtil.getPixelPrecision(
+	                dataExtent || this.scale.getExtent(),
+	                this._extent
+	            );
+	        },
+
+	        /**
+	         * Set coord extent
+	         * @param {number} start
+	         * @param {number} end
+	         */
+	        setExtent: function (start, end) {
+	            var extent = this._extent;
+	            extent[0] = start;
+	            extent[1] = end;
+	        },
+
+	        /**
+	         * Convert data to coord. Data is the rank if it has a ordinal scale
+	         * @param {number} data
+	         * @param  {boolean} clamp
+	         * @return {number}
+	         */
+	        dataToCoord: function (data, clamp) {
+	            var extent = this._extent;
+	            var scale = this.scale;
+	            data = scale.normalize(data);
+
+	            if (this.onBand && scale.type === 'ordinal') {
+	                extent = extent.slice();
+	                fixExtentWithBands(extent, scale.count());
+	            }
+
+	            return linearMap(data, normalizedExtent, extent, clamp);
+	        },
+
+	        /**
+	         * Convert coord to data. Data is the rank if it has a ordinal scale
+	         * @param {number} coord
+	         * @param  {boolean} clamp
+	         * @return {number}
+	         */
+	        coordToData: function (coord, clamp) {
+	            var extent = this._extent;
+	            var scale = this.scale;
+
+	            if (this.onBand && scale.type === 'ordinal') {
+	                extent = extent.slice();
+	                fixExtentWithBands(extent, scale.count());
+	            }
+
+	            var t = linearMap(coord, extent, normalizedExtent, clamp);
+
+	            return this.scale.scale(t);
+	        },
+	        /**
+	         * @return {Array.<number>}
+	         */
+	        getTicksCoords: function (alignWithLabel) {
+	            if (this.onBand && !alignWithLabel) {
+	                var bands = this.getBands();
+	                var coords = [];
+	                for (var i = 0; i < bands.length; i++) {
+	                    coords.push(bands[i][0]);
+	                }
+	                if (bands[i - 1]) {
+	                    coords.push(bands[i - 1][1]);
+	                }
+	                return coords;
+	            }
+	            else {
+	                return zrUtil.map(this.scale.getTicks(), this.dataToCoord, this);
+	            }
+	        },
+
+	        /**
+	         * Coords of labels are on the ticks or on the middle of bands
+	         * @return {Array.<number>}
+	         */
+	        getLabelsCoords: function () {
+	            return zrUtil.map(this.scale.getTicks(), this.dataToCoord, this);
+	        },
+
+	        /**
+	         * Get bands.
+	         *
+	         * If axis has labels [1, 2, 3, 4]. Bands on the axis are
+	         * |---1---|---2---|---3---|---4---|.
+	         *
+	         * @return {Array}
+	         */
+	         // FIXME Situation when labels is on ticks
+	        getBands: function () {
+	            var extent = this.getExtent();
+	            var bands = [];
+	            var len = this.scale.count();
+	            var start = extent[0];
+	            var end = extent[1];
+	            var span = end - start;
+
+	            for (var i = 0; i < len; i++) {
+	                bands.push([
+	                    span * i / len + start,
+	                    span * (i + 1) / len + start
+	                ]);
+	            }
+	            return bands;
+	        },
+
+	        /**
+	         * Get width of band
+	         * @return {number}
+	         */
+	        getBandWidth: function () {
+	            var axisExtent = this._extent;
+	            var dataExtent = this.scale.getExtent();
+
+	            var len = dataExtent[1] - dataExtent[0] + (this.onBand ? 1 : 0);
+	            // Fix #2728, avoid NaN when only one data.
+	            len === 0 && (len = 1);
+
+	            var size = Math.abs(axisExtent[1] - axisExtent[0]);
+
+	            return Math.abs(size) / len;
+	        }
+	    };
+
+	    module.exports = Axis;
+
+
+/***/ },
+/* 124 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+	/**
+	 * Helper function for axisLabelInterval calculation
+	 */
+
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var axisHelper = __webpack_require__(114);
+
+	    module.exports = function (axis) {
+	        var axisModel = axis.model;
+	        var labelModel = axisModel.getModel('axisLabel');
+	        var labelInterval = labelModel.get('interval');
+	        if (!(axis.type === 'category' && labelInterval === 'auto')) {
+	            return labelInterval === 'auto' ? 0 : labelInterval;
+	        }
+
+	        return axisHelper.getAxisLabelInterval(
+	            zrUtil.map(axis.scale.getTicks(), axis.dataToCoord, axis),
+	            axisModel.getFormattedLabels(),
+	            labelModel.getModel('textStyle').getFont(),
+	            axis.isHorizontal()
+	        );
+	    };
+
+
+/***/ },
+/* 125 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+	// Grid 是在有直角坐标系的时候必须要存在的
+	// 所以这里也要被 Cartesian2D 依赖
+
+
+	    __webpack_require__(126);
+	    var ComponentModel = __webpack_require__(19);
+
+	    module.exports = ComponentModel.extend({
+
+	        type: 'grid',
+
+	        dependencies: ['xAxis', 'yAxis'],
+
+	        layoutMode: 'box',
+
+	        /**
+	         * @type {module:echarts/coord/cartesian/Grid}
+	         */
+	        coordinateSystem: null,
+
+	        defaultOption: {
+	            show: false,
+	            zlevel: 0,
+	            z: 0,
+	            left: '10%',
+	            top: 60,
+	            right: '10%',
+	            bottom: 60,
+	            // If grid size contain label
+	            containLabel: false,
+	            // width: {totalWidth} - left - right,
+	            // height: {totalHeight} - top - bottom,
+	            backgroundColor: 'rgba(0,0,0,0)',
+	            borderWidth: 1,
+	            borderColor: '#ccc'
+	        }
+	    });
+
+
+/***/ },
+/* 126 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var ComponentModel = __webpack_require__(19);
+	    var zrUtil = __webpack_require__(4);
+	    var axisModelCreator = __webpack_require__(127);
+
+	    var AxisModel = ComponentModel.extend({
+
+	        type: 'cartesian2dAxis',
+
+	        /**
+	         * @type {module:echarts/coord/cartesian/Axis2D}
+	         */
+	        axis: null,
+
+	        /**
+	         * @override
+	         */
+	        init: function () {
+	            AxisModel.superApply(this, 'init', arguments);
+	            this._resetRange();
+	        },
+
+	        /**
+	         * @override
+	         */
+	        mergeOption: function () {
+	            AxisModel.superApply(this, 'mergeOption', arguments);
+	            this._resetRange();
+	        },
+
+	        /**
+	         * @override
+	         */
+	        restoreData: function () {
+	            AxisModel.superApply(this, 'restoreData', arguments);
+	            this._resetRange();
+	        },
+
+	        /**
+	         * @public
+	         * @param {number} rangeStart
+	         * @param {number} rangeEnd
+	         */
+	        setRange: function (rangeStart, rangeEnd) {
+	            this.option.rangeStart = rangeStart;
+	            this.option.rangeEnd = rangeEnd;
+	        },
+
+	        /**
+	         * @public
+	         * @return {Array.<number|string|Date>}
+	         */
+	        getMin: function () {
+	            var option = this.option;
+	            return option.rangeStart != null ? option.rangeStart : option.min;
+	        },
+
+	        /**
+	         * @public
+	         * @return {Array.<number|string|Date>}
+	         */
+	        getMax: function () {
+	            var option = this.option;
+	            return option.rangeEnd != null ? option.rangeEnd : option.max;
+	        },
+
+	        /**
+	         * @public
+	         * @return {boolean}
+	         */
+	        getNeedCrossZero: function () {
+	            var option = this.option;
+	            return (option.rangeStart != null || option.rangeEnd != null)
+	                ? false : !option.scale;
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _resetRange: function () {
+	            // rangeStart and rangeEnd is readonly.
+	            this.option.rangeStart = this.option.rangeEnd = null;
+	        }
+
+	    });
+
+	    function getAxisType(axisDim, option) {
+	        // Default axis with data is category axis
+	        return option.type || (option.data ? 'category' : 'value');
+	    }
+
+	    zrUtil.merge(AxisModel.prototype, __webpack_require__(129));
+
+	    var extraOption = {
+	        gridIndex: 0,
+
+	        // Offset is for multiple axis on the same position
+	        offset: 0
+	    };
+
+	    axisModelCreator('x', AxisModel, getAxisType, extraOption);
+	    axisModelCreator('y', AxisModel, getAxisType, extraOption);
+
+	    module.exports = AxisModel;
+
+
+/***/ },
+/* 127 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var axisDefault = __webpack_require__(128);
+	    var zrUtil = __webpack_require__(4);
+	    var ComponentModel = __webpack_require__(19);
+	    var layout = __webpack_require__(21);
+
+	    // FIXME axisType is fixed ?
+	    var AXIS_TYPES = ['value', 'category', 'time', 'log'];
+
+	    /**
+	     * Generate sub axis model class
+	     * @param {string} axisName 'x' 'y' 'radius' 'angle' 'parallel'
+	     * @param {module:echarts/model/Component} BaseAxisModelClass
+	     * @param {Function} axisTypeDefaulter
+	     * @param {Object} [extraDefaultOption]
+	     */
+	    module.exports = function (axisName, BaseAxisModelClass, axisTypeDefaulter, extraDefaultOption) {
+
+	        zrUtil.each(AXIS_TYPES, function (axisType) {
+
+	            BaseAxisModelClass.extend({
+
+	                type: axisName + 'Axis.' + axisType,
+
+	                mergeDefaultAndTheme: function (option, ecModel) {
+	                    var layoutMode = this.layoutMode;
+	                    var inputPositionParams = layoutMode
+	                        ? layout.getLayoutParams(option) : {};
+
+	                    var themeModel = ecModel.getTheme();
+	                    zrUtil.merge(option, themeModel.get(axisType + 'Axis'));
+	                    zrUtil.merge(option, this.getDefaultOption());
+
+	                    option.type = axisTypeDefaulter(axisName, option);
+
+	                    if (layoutMode) {
+	                        layout.mergeLayoutParam(option, inputPositionParams, layoutMode);
+	                    }
+	                },
+
+	                defaultOption: zrUtil.mergeAll(
+	                    [
+	                        {},
+	                        axisDefault[axisType + 'Axis'],
+	                        extraDefaultOption
+	                    ],
+	                    true
+	                )
+	            });
+	        });
+
+	        ComponentModel.registerSubTypeDefaulter(
+	            axisName + 'Axis',
+	            zrUtil.curry(axisTypeDefaulter, axisName)
+	        );
+	    };
+
+
+/***/ },
+/* 128 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+
+	    var defaultOption = {
+	        show: true,
+	        zlevel: 0,                  // 一级层叠
+	        z: 0,                       // 二级层叠
+	        // 反向坐标轴
+	        inverse: false,
+
+	        // 坐标轴名字，默认为空
+	        name: '',
+	        // 坐标轴名字位置，支持'start' | 'middle' | 'end'
+	        nameLocation: 'end',
+	        // 坐标轴名字旋转，degree。
+	        nameRotate: null, // Adapt to axis rotate, when nameLocation is 'middle'.
+	        nameTruncate: {
+	            maxWidth: null,
+	            ellipsis: '...',
+	            placeholder: '.'
+	        },
+	        // 坐标轴文字样式，默认取全局样式
+	        nameTextStyle: {},
+	        // 文字与轴线距离
+	        nameGap: 15,
+
+	        silent: false, // Default false to support tooltip.
+	        triggerEvent: false, // Default false to avoid legacy user event listener fail.
+
+	        tooltip: {
+	            show: false
+	        },
+
+	        // 坐标轴线
+	        axisLine: {
+	            // 默认显示，属性show控制显示与否
+	            show: true,
+	            onZero: true,
+	            // 属性lineStyle控制线条样式
+	            lineStyle: {
+	                color: '#333',
+	                width: 1,
+	                type: 'solid'
+	            }
+	        },
+	        // 坐标轴小标记
+	        axisTick: {
+	            // 属性show控制显示与否，默认显示
+	            show: true,
+	            // 控制小标记是否在grid里
+	            inside: false,
+	            // 属性length控制线长
+	            length: 5,
+	            // 属性lineStyle控制线条样式
+	            lineStyle: {
+	                width: 1
+	            }
+	        },
+	        // 坐标轴文本标签，详见axis.axisLabel
+	        axisLabel: {
+	            show: true,
+	            // 控制文本标签是否在grid里
+	            inside: false,
+	            rotate: 0,
+	            margin: 8,
+	            // formatter: null,
+	            // 其余属性默认使用全局文本样式，详见TEXTSTYLE
+	            textStyle: {
+	                fontSize: 12
+	            }
+	        },
+	        // 分隔线
+	        splitLine: {
+	            // 默认显示，属性show控制显示与否
+	            show: true,
+	            // 属性lineStyle（详见lineStyle）控制线条样式
+	            lineStyle: {
+	                color: ['#ccc'],
+	                width: 1,
+	                type: 'solid'
+	            }
+	        },
+	        // 分隔区域
+	        splitArea: {
+	            // 默认不显示，属性show控制显示与否
+	            show: false,
+	            // 属性areaStyle（详见areaStyle）控制区域样式
+	            areaStyle: {
+	                color: ['rgba(250,250,250,0.3)','rgba(200,200,200,0.3)']
+	            }
+	        }
+	    };
+
+	    var categoryAxis = zrUtil.merge({
+	        // 类目起始和结束两端空白策略
+	        boundaryGap: true,
+	        // splitArea: {
+	            // show: false
+	        // },
+	        splitLine: {
+	            show: false
+	        },
+	        // 坐标轴小标记
+	        axisTick: {
+	            // If tick is align with label when boundaryGap is true
+	            // Default with axisTick
+	            alignWithLabel: false,
+	            interval: 'auto'
+	        },
+	        // 坐标轴文本标签，详见axis.axisLabel
+	        axisLabel: {
+	            interval: 'auto'
+	        }
+	    }, defaultOption);
+
+	    var valueAxis = zrUtil.merge({
+	        // 数值起始和结束两端空白策略
+	        boundaryGap: [0, 0],
+	        // 最小值, 设置成 'dataMin' 则从数据中计算最小值
+	        // min: null,
+	        // 最大值，设置成 'dataMax' 则从数据中计算最大值
+	        // max: null,
+	        // Readonly prop, specifies start value of the range when using data zoom.
+	        // rangeStart: null
+	        // Readonly prop, specifies end value of the range when using data zoom.
+	        // rangeEnd: null
+	        // 脱离0值比例，放大聚焦到最终_min，_max区间
+	        // scale: false,
+	        // 分割段数，默认为5
+	        splitNumber: 5
+	        // Minimum interval
+	        // minInterval: null
+	    }, defaultOption);
+
+	    // FIXME
+	    var timeAxis = zrUtil.defaults({
+	        scale: true,
+	        min: 'dataMin',
+	        max: 'dataMax'
+	    }, valueAxis);
+	    var logAxis = zrUtil.defaults({}, valueAxis);
+	    logAxis.scale = true;
+
+	    module.exports = {
+	        categoryAxis: categoryAxis,
+	        valueAxis: valueAxis,
+	        timeAxis: timeAxis,
+	        logAxis: logAxis
+	    };
+
+
+/***/ },
+/* 129 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+	    var axisHelper = __webpack_require__(114);
+
+	    function getName(obj) {
+	        if (zrUtil.isObject(obj) && obj.value != null) {
+	            return obj.value;
+	        }
+	        else {
+	            return obj;
+	        }
+	    }
+	    /**
+	     * Get categories
+	     */
+	    function getCategories() {
+	        return this.get('type') === 'category'
+	            && zrUtil.map(this.get('data'), getName);
+	    }
+
+	    /**
+	     * Format labels
+	     * @return {Array.<string>}
+	     */
+	    function getFormattedLabels() {
+	        return axisHelper.getFormattedLabels(
+	            this.axis,
+	            this.get('axisLabel.formatter')
+	        );
+	    }
+
+	    module.exports = {
+
+	        getFormattedLabels: getFormattedLabels,
+
+	        getCategories: getCategories
+	    };
+
+
+/***/ },
+/* 130 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+	// TODO boundaryGap
+
+
+	    __webpack_require__(126);
+
+	    __webpack_require__(131);
+
+
+/***/ },
+/* 131 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+	    var graphic = __webpack_require__(43);
+	    var AxisBuilder = __webpack_require__(132);
+	    var ifIgnoreOnTick = AxisBuilder.ifIgnoreOnTick;
+	    var getInterval = AxisBuilder.getInterval;
+
+	    var axisBuilderAttrs = [
+	        'axisLine', 'axisLabel', 'axisTick', 'axisName'
+	    ];
+	    var selfBuilderAttrs = [
+	        'splitArea', 'splitLine'
+	    ];
+
+	    // function getAlignWithLabel(model, axisModel) {
+	    //     var alignWithLabel = model.get('alignWithLabel');
+	    //     if (alignWithLabel === 'auto') {
+	    //         alignWithLabel = axisModel.get('axisTick.alignWithLabel');
+	    //     }
+	    //     return alignWithLabel;
+	    // }
+
+	    var AxisView = __webpack_require__(1).extendComponentView({
+
+	        type: 'axis',
+
+	        render: function (axisModel, ecModel) {
+
+	            this.group.removeAll();
+
+	            var oldAxisGroup = this._axisGroup;
+	            this._axisGroup = new graphic.Group();
+
+	            this.group.add(this._axisGroup);
+
+	            if (!axisModel.get('show')) {
+	                return;
+	            }
+
+	            var gridModel = ecModel.getComponent('grid', axisModel.get('gridIndex'));
+
+	            var layout = layoutAxis(gridModel, axisModel);
+
+	            var axisBuilder = new AxisBuilder(axisModel, layout);
+
+	            zrUtil.each(axisBuilderAttrs, axisBuilder.add, axisBuilder);
+
+	            this._axisGroup.add(axisBuilder.getGroup());
+
+	            zrUtil.each(selfBuilderAttrs, function (name) {
+	                if (axisModel.get(name + '.show')) {
+	                    this['_' + name](axisModel, gridModel, layout.labelInterval);
+	                }
+	            }, this);
+
+	            graphic.groupTransition(oldAxisGroup, this._axisGroup, axisModel);
+	        },
+
+	        /**
+	         * @param {module:echarts/coord/cartesian/AxisModel} axisModel
+	         * @param {module:echarts/coord/cartesian/GridModel} gridModel
+	         * @param {number|Function} labelInterval
+	         * @private
+	         */
+	        _splitLine: function (axisModel, gridModel, labelInterval) {
+	            var axis = axisModel.axis;
+
+	            var splitLineModel = axisModel.getModel('splitLine');
+	            var lineStyleModel = splitLineModel.getModel('lineStyle');
+	            var lineColors = lineStyleModel.get('color');
+
+	            var lineInterval = getInterval(splitLineModel, labelInterval);
+
+	            lineColors = zrUtil.isArray(lineColors) ? lineColors : [lineColors];
+
+	            var gridRect = gridModel.coordinateSystem.getRect();
+	            var isHorizontal = axis.isHorizontal();
+
+	            var lineCount = 0;
+
+	            var ticksCoords = axis.getTicksCoords(
+	                // splitLineModel.get('alignWithLabel')
+	            );
+	            var ticks = axis.scale.getTicks();
+
+	            var p1 = [];
+	            var p2 = [];
+	            // Simple optimization
+	            // Batching the lines if color are the same
+	            var lineStyle = lineStyleModel.getLineStyle();
+	            for (var i = 0; i < ticksCoords.length; i++) {
+	                if (ifIgnoreOnTick(axis, i, lineInterval)) {
+	                    continue;
+	                }
+
+	                var tickCoord = axis.toGlobalCoord(ticksCoords[i]);
+
+	                if (isHorizontal) {
+	                    p1[0] = tickCoord;
+	                    p1[1] = gridRect.y;
+	                    p2[0] = tickCoord;
+	                    p2[1] = gridRect.y + gridRect.height;
+	                }
+	                else {
+	                    p1[0] = gridRect.x;
+	                    p1[1] = tickCoord;
+	                    p2[0] = gridRect.x + gridRect.width;
+	                    p2[1] = tickCoord;
+	                }
+
+	                var colorIndex = (lineCount++) % lineColors.length;
+	                this._axisGroup.add(new graphic.Line(graphic.subPixelOptimizeLine({
+	                    anid: 'line_' + ticks[i],
+
+	                    shape: {
+	                        x1: p1[0],
+	                        y1: p1[1],
+	                        x2: p2[0],
+	                        y2: p2[1]
+	                    },
+	                    style: zrUtil.defaults({
+	                        stroke: lineColors[colorIndex]
+	                    }, lineStyle),
+	                    silent: true
+	                })));
+	            }
+	        },
+
+	        /**
+	         * @param {module:echarts/coord/cartesian/AxisModel} axisModel
+	         * @param {module:echarts/coord/cartesian/GridModel} gridModel
+	         * @param {number|Function} labelInterval
+	         * @private
+	         */
+	        _splitArea: function (axisModel, gridModel, labelInterval) {
+	            var axis = axisModel.axis;
+
+	            var splitAreaModel = axisModel.getModel('splitArea');
+	            var areaStyleModel = splitAreaModel.getModel('areaStyle');
+	            var areaColors = areaStyleModel.get('color');
+
+	            var gridRect = gridModel.coordinateSystem.getRect();
+
+	            var ticksCoords = axis.getTicksCoords(
+	                // splitAreaModel.get('alignWithLabel')
+	            );
+	            var ticks = axis.scale.getTicks();
+
+	            var prevX = axis.toGlobalCoord(ticksCoords[0]);
+	            var prevY = axis.toGlobalCoord(ticksCoords[0]);
+
+	            var count = 0;
+
+	            var areaInterval = getInterval(splitAreaModel, labelInterval);
+
+	            var areaStyle = areaStyleModel.getAreaStyle();
+	            areaColors = zrUtil.isArray(areaColors) ? areaColors : [areaColors];
+
+	            for (var i = 1; i < ticksCoords.length; i++) {
+	                if (ifIgnoreOnTick(axis, i, areaInterval)) {
+	                    continue;
+	                }
+
+	                var tickCoord = axis.toGlobalCoord(ticksCoords[i]);
+
+	                var x;
+	                var y;
+	                var width;
+	                var height;
+	                if (axis.isHorizontal()) {
+	                    x = prevX;
+	                    y = gridRect.y;
+	                    width = tickCoord - x;
+	                    height = gridRect.height;
+	                }
+	                else {
+	                    x = gridRect.x;
+	                    y = prevY;
+	                    width = gridRect.width;
+	                    height = tickCoord - y;
+	                }
+
+	                var colorIndex = (count++) % areaColors.length;
+	                this._axisGroup.add(new graphic.Rect({
+	                    anid: 'area_' + ticks[i],
+
+	                    shape: {
+	                        x: x,
+	                        y: y,
+	                        width: width,
+	                        height: height
+	                    },
+	                    style: zrUtil.defaults({
+	                        fill: areaColors[colorIndex]
+	                    }, areaStyle),
+	                    silent: true
+	                }));
+
+	                prevX = x + width;
+	                prevY = y + height;
+	            }
+	        }
+	    });
+
+	    AxisView.extend({
+	        type: 'xAxis'
+	    });
+	    AxisView.extend({
+	        type: 'yAxis'
+	    });
+
+	    /**
+	     * @inner
+	     */
+	    function layoutAxis(gridModel, axisModel) {
+	        var grid = gridModel.coordinateSystem;
+	        var axis = axisModel.axis;
+	        var layout = {};
+
+	        var rawAxisPosition = axis.position;
+	        var axisPosition = axis.onZero ? 'onZero' : rawAxisPosition;
+	        var axisDim = axis.dim;
+
+	        // [left, right, top, bottom]
+	        var rect = grid.getRect();
+	        var rectBound = [rect.x, rect.x + rect.width, rect.y, rect.y + rect.height];
+
+	        var axisOffset = axisModel.get('offset') || 0;
+
+	        var posMap = {
+	            x: { top: rectBound[2] - axisOffset, bottom: rectBound[3] + axisOffset },
+	            y: { left: rectBound[0] - axisOffset, right: rectBound[1] + axisOffset }
+	        };
+
+	        posMap.x.onZero = Math.max(Math.min(getZero('y'), posMap.x.bottom), posMap.x.top);
+	        posMap.y.onZero = Math.max(Math.min(getZero('x'), posMap.y.right), posMap.y.left);
+
+	        function getZero(dim, val) {
+	            var theAxis = grid.getAxis(dim);
+	            return theAxis.toGlobalCoord(theAxis.dataToCoord(0));
+	        }
+
+	        // Axis position
+	        layout.position = [
+	            axisDim === 'y' ? posMap.y[axisPosition] : rectBound[0],
+	            axisDim === 'x' ? posMap.x[axisPosition] : rectBound[3]
+	        ];
+
+	        // Axis rotation
+	        layout.rotation = Math.PI / 2 * (axisDim === 'x' ? 0 : 1);
+
+	        // Tick and label direction, x y is axisDim
+	        var dirMap = {top: -1, bottom: 1, left: -1, right: 1};
+
+	        layout.labelDirection = layout.tickDirection = layout.nameDirection = dirMap[rawAxisPosition];
+	        if (axis.onZero) {
+	            layout.labelOffset = posMap[axisDim][rawAxisPosition] - posMap[axisDim].onZero;
+	        }
+
+	        if (axisModel.getModel('axisTick').get('inside')) {
+	            layout.tickDirection = -layout.tickDirection;
+	        }
+	        if (axisModel.getModel('axisLabel').get('inside')) {
+	            layout.labelDirection = -layout.labelDirection;
+	        }
+
+	        // Special label rotation
+	        var labelRotation = axisModel.getModel('axisLabel').get('rotate');
+	        layout.labelRotation = axisPosition === 'top' ? -labelRotation : labelRotation;
+
+	        // label interval when auto mode.
+	        layout.labelInterval = axis.getLabelInterval();
+
+	        // Over splitLine and splitArea
+	        layout.z2 = 1;
+
+	        return layout;
+	    }
+
+
+/***/ },
+/* 132 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+	    var formatUtil = __webpack_require__(6);
+	    var graphic = __webpack_require__(43);
+	    var Model = __webpack_require__(12);
+	    var numberUtil = __webpack_require__(7);
+	    var remRadian = numberUtil.remRadian;
+	    var isRadianAroundZero = numberUtil.isRadianAroundZero;
+	    var vec2 = __webpack_require__(10);
+	    var v2ApplyTransform = vec2.applyTransform;
+	    var retrieve = zrUtil.retrieve;
+
+	    var PI = Math.PI;
+
+	    function makeAxisEventDataBase(axisModel) {
+	        var eventData = {
+	            componentType: axisModel.mainType
+	        };
+	        eventData[axisModel.mainType + 'Index'] = axisModel.componentIndex;
+	        return eventData;
+	    }
+
+	    /**
+	     * A final axis is translated and rotated from a "standard axis".
+	     * So opt.position and opt.rotation is required.
+	     *
+	     * A standard axis is and axis from [0, 0] to [0, axisExtent[1]],
+	     * for example: (0, 0) ------------> (0, 50)
+	     *
+	     * nameDirection or tickDirection or labelDirection is 1 means tick
+	     * or label is below the standard axis, whereas is -1 means above
+	     * the standard axis. labelOffset means offset between label and axis,
+	     * which is useful when 'onZero', where axisLabel is in the grid and
+	     * label in outside grid.
+	     *
+	     * Tips: like always,
+	     * positive rotation represents anticlockwise, and negative rotation
+	     * represents clockwise.
+	     * The direction of position coordinate is the same as the direction
+	     * of screen coordinate.
+	     *
+	     * Do not need to consider axis 'inverse', which is auto processed by
+	     * axis extent.
+	     *
+	     * @param {module:zrender/container/Group} group
+	     * @param {Object} axisModel
+	     * @param {Object} opt Standard axis parameters.
+	     * @param {Array.<number>} opt.position [x, y]
+	     * @param {number} opt.rotation by radian
+	     * @param {number} [opt.nameDirection=1] 1 or -1 Used when nameLocation is 'middle'.
+	     * @param {number} [opt.tickDirection=1] 1 or -1
+	     * @param {number} [opt.labelDirection=1] 1 or -1
+	     * @param {number} [opt.labelOffset=0] Usefull when onZero.
+	     * @param {string} [opt.axisLabelShow] default get from axisModel.
+	     * @param {string} [opt.axisName] default get from axisModel.
+	     * @param {number} [opt.axisNameAvailableWidth]
+	     * @param {number} [opt.labelRotation] by degree, default get from axisModel.
+	     * @param {number} [opt.labelInterval] Default label interval when label
+	     *                                     interval from model is null or 'auto'.
+	     * @param {number} [opt.strokeContainThreshold] Default label interval when label
+	     */
+	    var AxisBuilder = function (axisModel, opt) {
+
+	        /**
+	         * @readOnly
+	         */
+	        this.opt = opt;
+
+	        /**
+	         * @readOnly
+	         */
+	        this.axisModel = axisModel;
+
+	        // Default value
+	        zrUtil.defaults(
+	            opt,
+	            {
+	                labelOffset: 0,
+	                nameDirection: 1,
+	                tickDirection: 1,
+	                labelDirection: 1,
+	                silent: true
+	            }
+	        );
+
+	        /**
+	         * @readOnly
+	         */
+	        this.group = new graphic.Group();
+
+	        // FIXME Not use a seperate text group?
+	        var dumbGroup = new graphic.Group({
+	            position: opt.position.slice(),
+	            rotation: opt.rotation
+	        });
+
+	        // this.group.add(dumbGroup);
+	        // this._dumbGroup = dumbGroup;
+
+	        dumbGroup.updateTransform();
+	        this._transform = dumbGroup.transform;
+
+	        this._dumbGroup = dumbGroup;
+	    };
+
+	    AxisBuilder.prototype = {
+
+	        constructor: AxisBuilder,
+
+	        hasBuilder: function (name) {
+	            return !!builders[name];
+	        },
+
+	        add: function (name) {
+	            builders[name].call(this);
+	        },
+
+	        getGroup: function () {
+	            return this.group;
+	        }
+
+	    };
+
+	    var builders = {
+
+	        /**
+	         * @private
+	         */
+	        axisLine: function () {
+	            var opt = this.opt;
+	            var axisModel = this.axisModel;
+
+	            if (!axisModel.get('axisLine.show')) {
+	                return;
+	            }
+
+	            var extent = this.axisModel.axis.getExtent();
+
+	            var matrix = this._transform;
+	            var pt1 = [extent[0], 0];
+	            var pt2 = [extent[1], 0];
+	            if (matrix) {
+	                v2ApplyTransform(pt1, pt1, matrix);
+	                v2ApplyTransform(pt2, pt2, matrix);
+	            }
+
+	            this.group.add(new graphic.Line(graphic.subPixelOptimizeLine({
+
+	                // Id for animation
+	                anid: 'line',
+
+	                shape: {
+	                    x1: pt1[0],
+	                    y1: pt1[1],
+	                    x2: pt2[0],
+	                    y2: pt2[1]
+	                },
+	                style: zrUtil.extend(
+	                    {lineCap: 'round'},
+	                    axisModel.getModel('axisLine.lineStyle').getLineStyle()
+	                ),
+	                strokeContainThreshold: opt.strokeContainThreshold || 5,
+	                silent: true,
+	                z2: 1
+	            })));
+	        },
+
+	        /**
+	         * @private
+	         */
+	        axisTick: function () {
+	            var axisModel = this.axisModel;
+
+	            if (!axisModel.get('axisTick.show')) {
+	                return;
+	            }
+
+	            var axis = axisModel.axis;
+	            var tickModel = axisModel.getModel('axisTick');
+	            var opt = this.opt;
+
+	            var lineStyleModel = tickModel.getModel('lineStyle');
+	            var tickLen = tickModel.get('length');
+
+	            var tickInterval = getInterval(tickModel, opt.labelInterval);
+	            var ticksCoords = axis.getTicksCoords(tickModel.get('alignWithLabel'));
+	            var ticks = axis.scale.getTicks();
+
+	            var pt1 = [];
+	            var pt2 = [];
+	            var matrix = this._transform;
+
+	            for (var i = 0; i < ticksCoords.length; i++) {
+	                // Only ordinal scale support tick interval
+	                if (ifIgnoreOnTick(axis, i, tickInterval)) {
+	                     continue;
+	                }
+
+	                var tickCoord = ticksCoords[i];
+
+	                pt1[0] = tickCoord;
+	                pt1[1] = 0;
+	                pt2[0] = tickCoord;
+	                pt2[1] = opt.tickDirection * tickLen;
+
+	                if (matrix) {
+	                    v2ApplyTransform(pt1, pt1, matrix);
+	                    v2ApplyTransform(pt2, pt2, matrix);
+	                }
+	                // Tick line, Not use group transform to have better line draw
+	                this.group.add(new graphic.Line(graphic.subPixelOptimizeLine({
+
+	                    // Id for animation
+	                    anid: 'tick_' + ticks[i],
+
+	                    shape: {
+	                        x1: pt1[0],
+	                        y1: pt1[1],
+	                        x2: pt2[0],
+	                        y2: pt2[1]
+	                    },
+	                    style: zrUtil.defaults(
+	                        lineStyleModel.getLineStyle(),
+	                        {
+	                            stroke: axisModel.get('axisLine.lineStyle.color')
+	                        }
+	                    ),
+	                    z2: 2,
+	                    silent: true
+	                })));
+	            }
+	        },
+
+	        /**
+	         * @param {module:echarts/coord/cartesian/AxisModel} axisModel
+	         * @param {module:echarts/coord/cartesian/GridModel} gridModel
+	         * @private
+	         */
+	        axisLabel: function () {
+	            var opt = this.opt;
+	            var axisModel = this.axisModel;
+	            var show = retrieve(opt.axisLabelShow, axisModel.get('axisLabel.show'));
+
+	            if (!show) {
+	                return;
+	            }
+
+	            var axis = axisModel.axis;
+	            var labelModel = axisModel.getModel('axisLabel');
+	            var textStyleModel = labelModel.getModel('textStyle');
+	            var labelMargin = labelModel.get('margin');
+	            var ticks = axis.scale.getTicks();
+	            var labels = axisModel.getFormattedLabels();
+
+	            // Special label rotate.
+	            var labelRotation = retrieve(opt.labelRotation, labelModel.get('rotate')) || 0;
+	            // To radian.
+	            labelRotation = labelRotation * PI / 180;
+
+	            var labelLayout = innerTextLayout(opt, labelRotation, opt.labelDirection);
+	            var categoryData = axisModel.get('data');
+
+	            var textEls = [];
+	            var silent = isSilent(axisModel);
+	            var triggerEvent = axisModel.get('triggerEvent');
+
+	            for (var i = 0; i < ticks.length; i++) {
+	                if (ifIgnoreOnTick(axis, i, opt.labelInterval)) {
+	                     continue;
+	                }
+
+	                var itemTextStyleModel = textStyleModel;
+	                if (categoryData && categoryData[i] && categoryData[i].textStyle) {
+	                    itemTextStyleModel = new Model(
+	                        categoryData[i].textStyle, textStyleModel, axisModel.ecModel
+	                    );
+	                }
+	                var textColor = itemTextStyleModel.getTextColor()
+	                    || axisModel.get('axisLine.lineStyle.color');
+
+	                var tickCoord = axis.dataToCoord(ticks[i]);
+	                var pos = [
+	                    tickCoord,
+	                    opt.labelOffset + opt.labelDirection * labelMargin
+	                ];
+	                var labelBeforeFormat = axis.scale.getLabel(ticks[i]);
+
+	                var textEl = new graphic.Text({
+
+	                    // Id for animation
+	                    anid: 'label_' + ticks[i],
+
+	                    style: {
+	                        text: labels[i],
+	                        textAlign: itemTextStyleModel.get('align', true) || labelLayout.textAlign,
+	                        textVerticalAlign: itemTextStyleModel.get('baseline', true) || labelLayout.verticalAlign,
+	                        textFont: itemTextStyleModel.getFont(),
+	                        fill: typeof textColor === 'function' ? textColor(labelBeforeFormat) : textColor
+	                    },
+	                    position: pos,
+	                    rotation: labelLayout.rotation,
+	                    silent: silent,
+	                    z2: 10
+	                });
+
+	                // Pack data for mouse event
+	                if (triggerEvent) {
+	                    textEl.eventData = makeAxisEventDataBase(axisModel);
+	                    textEl.eventData.targetType = 'axisLabel';
+	                    textEl.eventData.value = labelBeforeFormat;
+	                }
+
+
+	                // FIXME
+	                this._dumbGroup.add(textEl);
+	                textEl.updateTransform();
+
+	                textEls.push(textEl);
+	                this.group.add(textEl);
+
+	                textEl.decomposeTransform();
+	            }
+
+	            function isTwoLabelOverlapped(current, next) {
+	                var firstRect = current && current.getBoundingRect().clone();
+	                var nextRect = next && next.getBoundingRect().clone();
+	                if (firstRect && nextRect) {
+	                    firstRect.applyTransform(current.getLocalTransform());
+	                    nextRect.applyTransform(next.getLocalTransform());
+	                    return firstRect.intersect(nextRect);
+	                }
+	            }
+	            if (axis.type !== 'category') {
+	                // If min or max are user set, we need to check
+	                // If the tick on min(max) are overlap on their neighbour tick
+	                // If they are overlapped, we need to hide the min(max) tick label
+	                if (axisModel.getMin ? axisModel.getMin() : axisModel.get('min')) {
+	                    var firstLabel = textEls[0];
+	                    var nextLabel = textEls[1];
+	                    if (isTwoLabelOverlapped(firstLabel, nextLabel)) {
+	                        firstLabel.ignore = true;
+	                    }
+	                }
+	                if (axisModel.getMax ? axisModel.getMax() : axisModel.get('max')) {
+	                    var lastLabel = textEls[textEls.length - 1];
+	                    var prevLabel = textEls[textEls.length - 2];
+	                    if (isTwoLabelOverlapped(prevLabel, lastLabel)) {
+	                        lastLabel.ignore = true;
+	                    }
+	                }
+	            }
+	        },
+
+	        /**
+	         * @private
+	         */
+	        axisName: function () {
+	            var opt = this.opt;
+	            var axisModel = this.axisModel;
+	            var name = retrieve(opt.axisName, axisModel.get('name'));
+
+	            if (!name) {
+	                return;
+	            }
+
+	            var nameLocation = axisModel.get('nameLocation');
+	            var nameDirection = opt.nameDirection;
+	            var textStyleModel = axisModel.getModel('nameTextStyle');
+	            var gap = axisModel.get('nameGap') || 0;
+
+	            var extent = this.axisModel.axis.getExtent();
+	            var gapSignal = extent[0] > extent[1] ? -1 : 1;
+	            var pos = [
+	                nameLocation === 'start'
+	                    ? extent[0] - gapSignal * gap
+	                    : nameLocation === 'end'
+	                    ? extent[1] + gapSignal * gap
+	                    : (extent[0] + extent[1]) / 2, // 'middle'
+	                // Reuse labelOffset.
+	                nameLocation === 'middle' ? opt.labelOffset + nameDirection * gap : 0
+	            ];
+
+	            var labelLayout;
+
+	            var nameRotation = axisModel.get('nameRotate');
+	            if (nameRotation != null) {
+	                nameRotation = nameRotation * PI / 180; // To radian.
+	            }
+
+	            var axisNameAvailableWidth;
+
+	            if (nameLocation === 'middle') {
+	                labelLayout = innerTextLayout(
+	                    opt,
+	                    nameRotation != null ? nameRotation : opt.rotation, // Adapt to axis.
+	                    nameDirection
+	                );
+	            }
+	            else {
+	                labelLayout = endTextLayout(
+	                    opt, nameLocation, nameRotation || 0, extent
+	                );
+
+	                axisNameAvailableWidth = opt.axisNameAvailableWidth;
+	                if (axisNameAvailableWidth != null) {
+	                    axisNameAvailableWidth = Math.abs(
+	                        axisNameAvailableWidth / Math.sin(labelLayout.rotation)
+	                    );
+	                    !isFinite(axisNameAvailableWidth) && (axisNameAvailableWidth = null);
+	                }
+	            }
+
+	            var textFont = textStyleModel.getFont();
+
+	            var truncateOpt = axisModel.get('nameTruncate', true) || {};
+	            var ellipsis = truncateOpt.ellipsis;
+	            var maxWidth = retrieve(truncateOpt.maxWidth, axisNameAvailableWidth);
+	            var truncatedText = (ellipsis != null && maxWidth != null)
+	                ? formatUtil.truncateText(
+	                    name, maxWidth, textFont, ellipsis,
+	                    {minChar: 2, placeholder: truncateOpt.placeholder}
+	                )
+	                : name;
+
+	            var tooltipOpt = axisModel.get('tooltip', true);
+
+	            var mainType = axisModel.mainType;
+	            var formatterParams = {
+	                componentType: mainType,
+	                name: name,
+	                $vars: ['name']
+	            };
+	            formatterParams[mainType + 'Index'] = axisModel.componentIndex;
+
+	            var textEl = new graphic.Text({
+
+	                // Id for animation
+	                anid: 'name',
+
+	                __fullText: name,
+	                __truncatedText: truncatedText,
+
+	                style: {
+	                    text: truncatedText,
+	                    textFont: textFont,
+	                    fill: textStyleModel.getTextColor()
+	                        || axisModel.get('axisLine.lineStyle.color'),
+	                    textAlign: labelLayout.textAlign,
+	                    textVerticalAlign: labelLayout.verticalAlign
+	                },
+	                position: pos,
+	                rotation: labelLayout.rotation,
+	                silent: isSilent(axisModel),
+	                z2: 1,
+	                tooltip: (tooltipOpt && tooltipOpt.show)
+	                    ? zrUtil.extend({
+	                        content: name,
+	                        formatter: function () {
+	                            return name;
+	                        },
+	                        formatterParams: formatterParams
+	                    }, tooltipOpt)
+	                    : null
+	            });
+
+	            if (axisModel.get('triggerEvent')) {
+	                textEl.eventData = makeAxisEventDataBase(axisModel);
+	                textEl.eventData.targetType = 'axisName';
+	                textEl.eventData.name = name;
+	            }
+
+	            // FIXME
+	            this._dumbGroup.add(textEl);
+	            textEl.updateTransform();
+
+	            this.group.add(textEl);
+
+	            textEl.decomposeTransform();
+	        }
+
+	    };
+
+	    /**
+	     * @inner
+	     */
+	    function innerTextLayout(opt, textRotation, direction) {
+	        var rotationDiff = remRadian(textRotation - opt.rotation);
+	        var textAlign;
+	        var verticalAlign;
+
+	        if (isRadianAroundZero(rotationDiff)) { // Label is parallel with axis line.
+	            verticalAlign = direction > 0 ? 'top' : 'bottom';
+	            textAlign = 'center';
+	        }
+	        else if (isRadianAroundZero(rotationDiff - PI)) { // Label is inverse parallel with axis line.
+	            verticalAlign = direction > 0 ? 'bottom' : 'top';
+	            textAlign = 'center';
+	        }
+	        else {
+	            verticalAlign = 'middle';
+
+	            if (rotationDiff > 0 && rotationDiff < PI) {
+	                textAlign = direction > 0 ? 'right' : 'left';
+	            }
+	            else {
+	                textAlign = direction > 0 ? 'left' : 'right';
+	            }
+	        }
+
+	        return {
+	            rotation: rotationDiff,
+	            textAlign: textAlign,
+	            verticalAlign: verticalAlign
+	        };
+	    }
+
+	    /**
+	     * @inner
+	     */
+	    function endTextLayout(opt, textPosition, textRotate, extent) {
+	        var rotationDiff = remRadian(textRotate - opt.rotation);
+	        var textAlign;
+	        var verticalAlign;
+	        var inverse = extent[0] > extent[1];
+	        var onLeft = (textPosition === 'start' && !inverse)
+	            || (textPosition !== 'start' && inverse);
+
+	        if (isRadianAroundZero(rotationDiff - PI / 2)) {
+	            verticalAlign = onLeft ? 'bottom' : 'top';
+	            textAlign = 'center';
+	        }
+	        else if (isRadianAroundZero(rotationDiff - PI * 1.5)) {
+	            verticalAlign = onLeft ? 'top' : 'bottom';
+	            textAlign = 'center';
+	        }
+	        else {
+	            verticalAlign = 'middle';
+	            if (rotationDiff < PI * 1.5 && rotationDiff > PI / 2) {
+	                textAlign = onLeft ? 'left' : 'right';
+	            }
+	            else {
+	                textAlign = onLeft ? 'right' : 'left';
+	            }
+	        }
+
+	        return {
+	            rotation: rotationDiff,
+	            textAlign: textAlign,
+	            verticalAlign: verticalAlign
+	        };
+	    }
+
+	    /**
+	     * @inner
+	     */
+	    function isSilent(axisModel) {
+	        var tooltipOpt = axisModel.get('tooltip');
+	        return axisModel.get('silent')
+	            // Consider mouse cursor, add these restrictions.
+	            || !(
+	                axisModel.get('triggerEvent') || (tooltipOpt && tooltipOpt.show)
+	            );
+	    }
+
+	    /**
+	     * @static
+	     */
+	    var ifIgnoreOnTick = AxisBuilder.ifIgnoreOnTick = function (axis, i, interval) {
+	        var rawTick;
+	        var scale = axis.scale;
+	        return scale.type === 'ordinal'
+	            && (
+	                typeof interval === 'function'
+	                    ? (
+	                        rawTick = scale.getTicks()[i],
+	                        !interval(rawTick, scale.getLabel(rawTick))
+	                    )
+	                    : i % (interval + 1)
+	            );
+	    };
+
+	    /**
+	     * @static
+	     */
+	    var getInterval = AxisBuilder.getInterval = function (model, labelInterval) {
+	        var interval = model.get('interval');
+	        if (interval == null || interval == 'auto') {
+	            interval = labelInterval;
+	        }
+	        return interval;
+	    };
+
+	    module.exports = AxisBuilder;
+
+
+
+/***/ },
+/* 133 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+
+	    __webpack_require__(113);
+
+	    __webpack_require__(134);
+	    __webpack_require__(135);
+
+	    var barLayoutGrid = __webpack_require__(137);
+	    var echarts = __webpack_require__(1);
+
+	    echarts.registerLayout(zrUtil.curry(barLayoutGrid, 'bar'));
+	    // Visual coding for legend
+	    echarts.registerVisual(function (ecModel) {
+	        ecModel.eachSeriesByType('bar', function (seriesModel) {
+	            var data = seriesModel.getData();
+	            data.setVisual('legendSymbol', 'roundRect');
+	        });
+	    });
+
+	    // In case developer forget to include grid component
+	    __webpack_require__(112);
+
+
+/***/ },
+/* 134 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var SeriesModel = __webpack_require__(28);
+	    var createListFromArray = __webpack_require__(101);
+
+	    module.exports = SeriesModel.extend({
+
+	        type: 'series.bar',
+
+	        dependencies: ['grid', 'polar'],
+
+	        getInitialData: function (option, ecModel) {
+	            if (true) {
+	                var coordSys = option.coordinateSystem;
+	                if (coordSys !== 'cartesian2d') {
+	                    throw new Error('Bar only support cartesian2d coordinateSystem');
+	                }
+	            }
+	            return createListFromArray(option.data, this, ecModel);
+	        },
+
+	        getMarkerPosition: function (value) {
+	            var coordSys = this.coordinateSystem;
+	            if (coordSys) {
+	                // PENDING if clamp ?
+	                var pt = coordSys.dataToPoint(value, true);
+	                var data = this.getData();
+	                var offset = data.getLayout('offset');
+	                var size = data.getLayout('size');
+	                var offsetIndex = coordSys.getBaseAxis().isHorizontal() ? 0 : 1;
+	                pt[offsetIndex] += offset + size / 2;
+	                return pt;
+	            }
+	            return [NaN, NaN];
+	        },
+
+	        brushSelector: 'rect',
+
+	        defaultOption: {
+	            zlevel: 0,                  // 一级层叠
+	            z: 2,                       // 二级层叠
+	            coordinateSystem: 'cartesian2d',
+	            legendHoverLink: true,
+	            // stack: null
+
+	            // Cartesian coordinate system
+	            xAxisIndex: 0,
+	            yAxisIndex: 0,
+
+	            // 最小高度改为0
+	            barMinHeight: 0,
+
+	            // barMaxWidth: null,
+	            // 默认自适应
+	            // barWidth: null,
+	            // 柱间距离，默认为柱形宽度的30%，可设固定值
+	            // barGap: '30%',
+	            // 类目间柱形距离，默认为类目间距的20%，可设固定值
+	            // barCategoryGap: '20%',
+	            // label: {
+	            //     normal: {
+	            //         show: false
+	            //     }
+	            // },
+	            itemStyle: {
+	                normal: {
+	                    // color: '各异'
+	                },
+	                emphasis: {}
+	            }
+	        }
+	    });
+
+
+/***/ },
+/* 135 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var graphic = __webpack_require__(43);
+
+	    zrUtil.extend(__webpack_require__(12).prototype, __webpack_require__(136));
+
+	    function fixLayoutWithLineWidth(layout, lineWidth) {
+	        var signX = layout.width > 0 ? 1 : -1;
+	        var signY = layout.height > 0 ? 1 : -1;
+	        // In case width or height are too small.
+	        lineWidth = Math.min(lineWidth, Math.abs(layout.width), Math.abs(layout.height));
+	        layout.x += signX * lineWidth / 2;
+	        layout.y += signY * lineWidth / 2;
+	        layout.width -= signX * lineWidth;
+	        layout.height -= signY * lineWidth;
+	    }
+
+	    module.exports = __webpack_require__(1).extendChartView({
+
+	        type: 'bar',
+
+	        render: function (seriesModel, ecModel, api) {
+	            var coordinateSystemType = seriesModel.get('coordinateSystem');
+
+	            if (coordinateSystemType === 'cartesian2d') {
+	                this._renderOnCartesian(seriesModel, ecModel, api);
+	            }
+
+	            return this.group;
+	        },
+
+	        _renderOnCartesian: function (seriesModel, ecModel, api) {
+	            var group = this.group;
+	            var data = seriesModel.getData();
+	            var oldData = this._data;
+
+	            var cartesian = seriesModel.coordinateSystem;
+	            var baseAxis = cartesian.getBaseAxis();
+	            var isHorizontal = baseAxis.isHorizontal();
+
+	            var enableAnimation = seriesModel.get('animation');
+
+	            var barBorderWidthQuery = ['itemStyle', 'normal', 'barBorderWidth'];
+
+	            function createRect(dataIndex, isUpdate) {
+	                var layout = data.getItemLayout(dataIndex);
+	                var lineWidth = data.getItemModel(dataIndex).get(barBorderWidthQuery) || 0;
+	                fixLayoutWithLineWidth(layout, lineWidth);
+
+	                var rect = new graphic.Rect({
+	                    shape: zrUtil.extend({}, layout)
+	                });
+	                // Animation
+	                if (enableAnimation) {
+	                    var rectShape = rect.shape;
+	                    var animateProperty = isHorizontal ? 'height' : 'width';
+	                    var animateTarget = {};
+	                    rectShape[animateProperty] = 0;
+	                    animateTarget[animateProperty] = layout[animateProperty];
+	                    graphic[isUpdate? 'updateProps' : 'initProps'](rect, {
+	                        shape: animateTarget
+	                    }, seriesModel, dataIndex);
+	                }
+	                return rect;
+	            }
+	            data.diff(oldData)
+	                .add(function (dataIndex) {
+	                    // 空数据
+	                    if (!data.hasValue(dataIndex)) {
+	                        return;
+	                    }
+
+	                    var rect = createRect(dataIndex);
+
+	                    data.setItemGraphicEl(dataIndex, rect);
+
+	                    group.add(rect);
+
+	                })
+	                .update(function (newIndex, oldIndex) {
+	                    var rect = oldData.getItemGraphicEl(oldIndex);
+	                    // 空数据
+	                    if (!data.hasValue(newIndex)) {
+	                        group.remove(rect);
+	                        return;
+	                    }
+	                    if (!rect) {
+	                        rect = createRect(newIndex, true);
+	                    }
+
+	                    var layout = data.getItemLayout(newIndex);
+	                    var lineWidth = data.getItemModel(newIndex).get(barBorderWidthQuery) || 0;
+	                    fixLayoutWithLineWidth(layout, lineWidth);
+
+	                    graphic.updateProps(rect, {
+	                        shape: layout
+	                    }, seriesModel, newIndex);
+
+	                    data.setItemGraphicEl(newIndex, rect);
+
+	                    // Add back
+	                    group.add(rect);
+	                })
+	                .remove(function (idx) {
+	                    var rect = oldData.getItemGraphicEl(idx);
+	                    if (rect) {
+	                        // Not show text when animating
+	                        rect.style.text = '';
+	                        graphic.updateProps(rect, {
+	                            shape: {
+	                                width: 0
+	                            }
+	                        }, seriesModel, idx, function () {
+	                            group.remove(rect);
+	                        });
+	                    }
+	                })
+	                .execute();
+
+	            this._updateStyle(seriesModel, data, isHorizontal);
+
+	            this._data = data;
+	        },
+
+	        _updateStyle: function (seriesModel, data, isHorizontal) {
+	            function setLabel(style, model, color, labelText, labelPositionOutside) {
+	                graphic.setText(style, model, color);
+	                style.text = labelText;
+	                if (style.textPosition === 'outside') {
+	                    style.textPosition = labelPositionOutside;
+	                }
+	            }
+
+	            data.eachItemGraphicEl(function (rect, idx) {
+	                var itemModel = data.getItemModel(idx);
+	                var color = data.getItemVisual(idx, 'color');
+	                var opacity = data.getItemVisual(idx, 'opacity');
+	                var layout = data.getItemLayout(idx);
+	                var itemStyleModel = itemModel.getModel('itemStyle.normal');
+
+	                var hoverStyle = itemModel.getModel('itemStyle.emphasis').getBarItemStyle();
+
+	                rect.setShape('r', itemStyleModel.get('barBorderRadius') || 0);
+
+	                rect.useStyle(zrUtil.defaults(
+	                    {
+	                        fill: color,
+	                        opacity: opacity
+	                    },
+	                    itemStyleModel.getBarItemStyle()
+	                ));
+
+	                var labelPositionOutside = isHorizontal
+	                    ? (layout.height > 0 ? 'bottom' : 'top')
+	                    : (layout.width > 0 ? 'left' : 'right');
+
+	                var labelModel = itemModel.getModel('label.normal');
+	                var hoverLabelModel = itemModel.getModel('label.emphasis');
+	                var rectStyle = rect.style;
+	                if (labelModel.get('show')) {
+	                    setLabel(
+	                        rectStyle, labelModel, color,
+	                        zrUtil.retrieve(
+	                            seriesModel.getFormattedLabel(idx, 'normal'),
+	                            seriesModel.getRawValue(idx)
+	                        ),
+	                        labelPositionOutside
+	                    );
+	                }
+	                else {
+	                    rectStyle.text = '';
+	                }
+	                if (hoverLabelModel.get('show')) {
+	                    setLabel(
+	                        hoverStyle, hoverLabelModel, color,
+	                        zrUtil.retrieve(
+	                            seriesModel.getFormattedLabel(idx, 'emphasis'),
+	                            seriesModel.getRawValue(idx)
+	                        ),
+	                        labelPositionOutside
+	                    );
+	                }
+	                else {
+	                    hoverStyle.text = '';
+	                }
+	                graphic.setHoverStyle(rect, hoverStyle);
+	            });
+	        },
+
+	        remove: function (ecModel, api) {
+	            var group = this.group;
+	            if (ecModel.get('animation')) {
+	                if (this._data) {
+	                    this._data.eachItemGraphicEl(function (el) {
+	                        // Not show text when animating
+	                        el.style.text = '';
+	                        graphic.updateProps(el, {
+	                            shape: {
+	                                width: 0
+	                            }
+	                        }, ecModel, el.dataIndex, function () {
+	                            group.remove(el);
+	                        });
+	                    });
+	                }
+	            }
+	            else {
+	                group.removeAll();
+	            }
+	        }
+	    });
+
+
+/***/ },
+/* 136 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+
+	    var getBarItemStyle = __webpack_require__(15)(
+	        [
+	            ['fill', 'color'],
+	            ['stroke', 'borderColor'],
+	            ['lineWidth', 'borderWidth'],
+	            // Compatitable with 2
+	            ['stroke', 'barBorderColor'],
+	            ['lineWidth', 'barBorderWidth'],
+	            ['opacity'],
+	            ['shadowBlur'],
+	            ['shadowOffsetX'],
+	            ['shadowOffsetY'],
+	            ['shadowColor']
+	        ]
+	    );
+	    module.exports = {
+	        getBarItemStyle: function (excludes) {
+	            var style = getBarItemStyle.call(this, excludes);
+	            if (this.getBorderLineDash) {
+	                var lineDash = this.getBorderLineDash();
+	                lineDash && (style.lineDash = lineDash);
+	            }
+	            return style;
+	        }
+	    };
+
+
+/***/ },
+/* 137 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var numberUtil = __webpack_require__(7);
+	    var parsePercent = numberUtil.parsePercent;
+
+	    function getSeriesStackId(seriesModel) {
+	        return seriesModel.get('stack') || '__ec_stack_' + seriesModel.seriesIndex;
+	    }
+
+	    function getAxisKey(axis) {
+	        return axis.dim + axis.index;
+	    }
+
+	    function calBarWidthAndOffset(barSeries, api) {
+	        // Columns info on each category axis. Key is cartesian name
+	        var columnsMap = {};
+
+	        zrUtil.each(barSeries, function (seriesModel, idx) {
+	            var data = seriesModel.getData();
+	            var cartesian = seriesModel.coordinateSystem;
+
+	            var baseAxis = cartesian.getBaseAxis();
+	            var axisExtent = baseAxis.getExtent();
+	            var bandWidth = baseAxis.type === 'category'
+	                ? baseAxis.getBandWidth()
+	                : (Math.abs(axisExtent[1] - axisExtent[0]) / data.count());
+
+	            var columnsOnAxis = columnsMap[getAxisKey(baseAxis)] || {
+	                bandWidth: bandWidth,
+	                remainedWidth: bandWidth,
+	                autoWidthCount: 0,
+	                categoryGap: '20%',
+	                gap: '30%',
+	                stacks: {}
+	            };
+	            var stacks = columnsOnAxis.stacks;
+	            columnsMap[getAxisKey(baseAxis)] = columnsOnAxis;
+
+	            var stackId = getSeriesStackId(seriesModel);
+
+	            if (!stacks[stackId]) {
+	                columnsOnAxis.autoWidthCount++;
+	            }
+	            stacks[stackId] = stacks[stackId] || {
+	                width: 0,
+	                maxWidth: 0
+	            };
+
+	            var barWidth = parsePercent(
+	                seriesModel.get('barWidth'), bandWidth
+	            );
+	            var barMaxWidth = parsePercent(
+	                seriesModel.get('barMaxWidth'), bandWidth
+	            );
+	            var barGap = seriesModel.get('barGap');
+	            var barCategoryGap = seriesModel.get('barCategoryGap');
+	            // TODO
+	            if (barWidth && !stacks[stackId].width) {
+	                barWidth = Math.min(columnsOnAxis.remainedWidth, barWidth);
+	                stacks[stackId].width = barWidth;
+	                columnsOnAxis.remainedWidth -= barWidth;
+	            }
+
+	            barMaxWidth && (stacks[stackId].maxWidth = barMaxWidth);
+	            (barGap != null) && (columnsOnAxis.gap = barGap);
+	            (barCategoryGap != null) && (columnsOnAxis.categoryGap = barCategoryGap);
+	        });
+
+	        var result = {};
+
+	        zrUtil.each(columnsMap, function (columnsOnAxis, coordSysName) {
+
+	            result[coordSysName] = {};
+
+	            var stacks = columnsOnAxis.stacks;
+	            var bandWidth = columnsOnAxis.bandWidth;
+	            var categoryGap = parsePercent(columnsOnAxis.categoryGap, bandWidth);
+	            var barGapPercent = parsePercent(columnsOnAxis.gap, 1);
+
+	            var remainedWidth = columnsOnAxis.remainedWidth;
+	            var autoWidthCount = columnsOnAxis.autoWidthCount;
+	            var autoWidth = (remainedWidth - categoryGap)
+	                / (autoWidthCount + (autoWidthCount - 1) * barGapPercent);
+	            autoWidth = Math.max(autoWidth, 0);
+
+	            // Find if any auto calculated bar exceeded maxBarWidth
+	            zrUtil.each(stacks, function (column, stack) {
+	                var maxWidth = column.maxWidth;
+	                if (!column.width && maxWidth && maxWidth < autoWidth) {
+	                    maxWidth = Math.min(maxWidth, remainedWidth);
+	                    remainedWidth -= maxWidth;
+	                    column.width = maxWidth;
+	                    autoWidthCount--;
+	                }
+	            });
+
+	            // Recalculate width again
+	            autoWidth = (remainedWidth - categoryGap)
+	                / (autoWidthCount + (autoWidthCount - 1) * barGapPercent);
+	            autoWidth = Math.max(autoWidth, 0);
+
+	            var widthSum = 0;
+	            var lastColumn;
+	            zrUtil.each(stacks, function (column, idx) {
+	                if (!column.width) {
+	                    column.width = autoWidth;
+	                }
+	                lastColumn = column;
+	                widthSum += column.width * (1 + barGapPercent);
+	            });
+	            if (lastColumn) {
+	                widthSum -= lastColumn.width * barGapPercent;
+	            }
+
+	            var offset = -widthSum / 2;
+	            zrUtil.each(stacks, function (column, stackId) {
+	                result[coordSysName][stackId] = result[coordSysName][stackId] || {
+	                    offset: offset,
+	                    width: column.width
+	                };
+
+	                offset += column.width * (1 + barGapPercent);
+	            });
+	        });
+
+	        return result;
+	    }
+
+	    /**
+	     * @param {string} seriesType
+	     * @param {module:echarts/model/Global} ecModel
+	     * @param {module:echarts/ExtensionAPI} api
+	     */
+	    function barLayoutGrid(seriesType, ecModel, api) {
+
+	        var barWidthAndOffset = calBarWidthAndOffset(
+	            zrUtil.filter(
+	                ecModel.getSeriesByType(seriesType),
+	                function (seriesModel) {
+	                    return !ecModel.isSeriesFiltered(seriesModel)
+	                        && seriesModel.coordinateSystem
+	                        && seriesModel.coordinateSystem.type === 'cartesian2d';
+	                }
+	            )
+	        );
+
+	        var lastStackCoords = {};
+
+	        ecModel.eachSeriesByType(seriesType, function (seriesModel) {
+
+	            var data = seriesModel.getData();
+	            var cartesian = seriesModel.coordinateSystem;
+	            var baseAxis = cartesian.getBaseAxis();
+
+	            var stackId = getSeriesStackId(seriesModel);
+	            var columnLayoutInfo = barWidthAndOffset[getAxisKey(baseAxis)][stackId];
+	            var columnOffset = columnLayoutInfo.offset;
+	            var columnWidth = columnLayoutInfo.width;
+	            var valueAxis = cartesian.getOtherAxis(baseAxis);
+
+	            var barMinHeight = seriesModel.get('barMinHeight') || 0;
+
+	            var valueAxisStart = baseAxis.onZero
+	                ? valueAxis.toGlobalCoord(valueAxis.dataToCoord(0))
+	                : valueAxis.getGlobalExtent()[0];
+
+	            var coords = cartesian.dataToPoints(data, true);
+	            lastStackCoords[stackId] = lastStackCoords[stackId] || [];
+
+	            data.setLayout({
+	                offset: columnOffset,
+	                size: columnWidth
+	            });
+	            data.each(valueAxis.dim, function (value, idx) {
+	                // 空数据
+	                if (isNaN(value)) {
+	                    return;
+	                }
+	                if (!lastStackCoords[stackId][idx]) {
+	                    lastStackCoords[stackId][idx] = {
+	                        // Positive stack
+	                        p: valueAxisStart,
+	                        // Negative stack
+	                        n: valueAxisStart
+	                    };
+	                }
+	                var sign = value >= 0 ? 'p' : 'n';
+	                var coord = coords[idx];
+	                var lastCoord = lastStackCoords[stackId][idx][sign];
+	                var x, y, width, height;
+	                if (valueAxis.isHorizontal()) {
+	                    x = lastCoord;
+	                    y = coord[1] + columnOffset;
+	                    width = coord[0] - lastCoord;
+	                    height = columnWidth;
+
+	                    if (Math.abs(width) < barMinHeight) {
+	                        width = (width < 0 ? -1 : 1) * barMinHeight;
+	                    }
+	                    lastStackCoords[stackId][idx][sign] += width;
+	                }
+	                else {
+	                    x = coord[0] + columnOffset;
+	                    y = lastCoord;
+	                    width = columnWidth;
+	                    height = coord[1] - lastCoord;
+	                    if (Math.abs(height) < barMinHeight) {
+	                        // Include zero to has a positive bar
+	                        height = (height <= 0 ? -1 : 1) * barMinHeight;
+	                    }
+	                    lastStackCoords[stackId][idx][sign] += height;
+	                }
+
+	                data.setItemLayout(idx, {
+	                    x: x,
+	                    y: y,
+	                    width: width,
+	                    height: height
+	                });
+	            }, true);
+
+	        }, this);
+	    }
+
+	    module.exports = barLayoutGrid;
+
+
+/***/ },
+/* 138 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+	    var echarts = __webpack_require__(1);
+
+	    __webpack_require__(139);
+	    __webpack_require__(141);
+
+	    __webpack_require__(142)('pie', [{
+	        type: 'pieToggleSelect',
+	        event: 'pieselectchanged',
+	        method: 'toggleSelected'
+	    }, {
+	        type: 'pieSelect',
+	        event: 'pieselected',
+	        method: 'select'
+	    }, {
+	        type: 'pieUnSelect',
+	        event: 'pieunselected',
+	        method: 'unSelect'
+	    }]);
+
+	    echarts.registerVisual(zrUtil.curry(__webpack_require__(143), 'pie'));
+
+	    echarts.registerLayout(zrUtil.curry(
+	        __webpack_require__(144), 'pie'
+	    ));
+
+	    echarts.registerProcessor(zrUtil.curry(__webpack_require__(146), 'pie'));
+
+
+/***/ },
+/* 139 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var List = __webpack_require__(97);
+	    var zrUtil = __webpack_require__(4);
+	    var modelUtil = __webpack_require__(5);
+	    var completeDimensions = __webpack_require__(102);
+
+	    var dataSelectableMixin = __webpack_require__(140);
+
+	    var PieSeries = __webpack_require__(1).extendSeriesModel({
+
+	        type: 'series.pie',
+
+	        // Overwrite
+	        init: function (option) {
+	            PieSeries.superApply(this, 'init', arguments);
+
+	            // Enable legend selection for each data item
+	            // Use a function instead of direct access because data reference may changed
+	            this.legendDataProvider = function () {
+	                return this._dataBeforeProcessed;
+	            };
+
+	            this.updateSelectedMap(option.data);
+
+	            this._defaultLabelLine(option);
+	        },
+
+	        // Overwrite
+	        mergeOption: function (newOption) {
+	            PieSeries.superCall(this, 'mergeOption', newOption);
+	            this.updateSelectedMap(this.option.data);
+	        },
+
+	        getInitialData: function (option, ecModel) {
+	            var dimensions = completeDimensions(['value'], option.data);
+	            var list = new List(dimensions, this);
+	            list.initData(option.data);
+	            return list;
+	        },
+
+	        // Overwrite
+	        getDataParams: function (dataIndex) {
+	            var data = this._data;
+	            var params = PieSeries.superCall(this, 'getDataParams', dataIndex);
+	            var sum = data.getSum('value');
+	            // FIXME toFixed?
+	            //
+	            // Percent is 0 if sum is 0
+	            params.percent = !sum ? 0 : +(data.get('value', dataIndex) / sum * 100).toFixed(2);
+
+	            params.$vars.push('percent');
+	            return params;
+	        },
+
+	        _defaultLabelLine: function (option) {
+	            // Extend labelLine emphasis
+	            modelUtil.defaultEmphasis(option.labelLine, ['show']);
+
+	            var labelLineNormalOpt = option.labelLine.normal;
+	            var labelLineEmphasisOpt = option.labelLine.emphasis;
+	            // Not show label line if `label.normal.show = false`
+	            labelLineNormalOpt.show = labelLineNormalOpt.show
+	                && option.label.normal.show;
+	            labelLineEmphasisOpt.show = labelLineEmphasisOpt.show
+	                && option.label.emphasis.show;
+	        },
+
+	        defaultOption: {
+	            zlevel: 0,
+	            z: 2,
+	            legendHoverLink: true,
+
+	            hoverAnimation: true,
+	            // 默认全局居中
+	            center: ['50%', '50%'],
+	            radius: [0, '75%'],
+	            // 默认顺时针
+	            clockwise: true,
+	            startAngle: 90,
+	            // 最小角度改为0
+	            minAngle: 0,
+	            // 选中是扇区偏移量
+	            selectedOffset: 10,
+
+	            // If use strategy to avoid label overlapping
+	            avoidLabelOverlap: true,
+	            // 选择模式，默认关闭，可选single，multiple
+	            // selectedMode: false,
+	            // 南丁格尔玫瑰图模式，'radius'（半径） | 'area'（面积）
+	            // roseType: null,
+
+	            label: {
+	                normal: {
+	                    // If rotate around circle
+	                    rotate: false,
+	                    show: true,
+	                    // 'outer', 'inside', 'center'
+	                    position: 'outer'
+	                    // formatter: 标签文本格式器，同Tooltip.formatter，不支持异步回调
+	                    // textStyle: null      // 默认使用全局文本样式，详见TEXTSTYLE
+	                    // distance: 当position为inner时有效，为label位置到圆心的距离与圆半径(环状图为内外半径和)的比例系数
+	                },
+	                emphasis: {}
+	            },
+	            // Enabled when label.normal.position is 'outer'
+	            labelLine: {
+	                normal: {
+	                    show: true,
+	                    // 引导线两段中的第一段长度
+	                    length: 15,
+	                    // 引导线两段中的第二段长度
+	                    length2: 15,
+	                    smooth: false,
+	                    lineStyle: {
+	                        // color: 各异,
+	                        width: 1,
+	                        type: 'solid'
+	                    }
+	                }
+	            },
+	            itemStyle: {
+	                normal: {
+	                    borderWidth: 1
+	                },
+	                emphasis: {}
+	            },
+
+	            animationEasing: 'cubicOut',
+
+	            data: []
+	        }
+	    });
+
+	    zrUtil.mixin(PieSeries, dataSelectableMixin);
+
+	    module.exports = PieSeries;
+
+
+/***/ },
+/* 140 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * Data selectable mixin for chart series.
+	 * To eanble data select, option of series must have `selectedMode`.
+	 * And each data item will use `selected` to toggle itself selected status
+	 *
+	 * @module echarts/chart/helper/DataSelectable
+	 */
+
+
+	    var zrUtil = __webpack_require__(4);
+
+	    module.exports = {
+
+	        updateSelectedMap: function (targetList) {
+	            this._selectTargetMap = zrUtil.reduce(targetList || [], function (targetMap, target) {
+	                targetMap[target.name] = target;
+	                return targetMap;
+	            }, {});
+	        },
+	        /**
+	         * @param {string} name
+	         */
+	        // PENGING If selectedMode is null ?
+	        select: function (name) {
+	            var targetMap = this._selectTargetMap;
+	            var target = targetMap[name];
+	            var selectedMode = this.get('selectedMode');
+	            if (selectedMode === 'single') {
+	                zrUtil.each(targetMap, function (target) {
+	                    target.selected = false;
+	                });
+	            }
+	            target && (target.selected = true);
+	        },
+
+	        /**
+	         * @param {string} name
+	         */
+	        unSelect: function (name) {
+	            var target = this._selectTargetMap[name];
+	            // var selectedMode = this.get('selectedMode');
+	            // selectedMode !== 'single' && target && (target.selected = false);
+	            target && (target.selected = false);
+	        },
+
+	        /**
+	         * @param {string} name
+	         */
+	        toggleSelected: function (name) {
+	            var target = this._selectTargetMap[name];
+	            if (target != null) {
+	                this[target.selected ? 'unSelect' : 'select'](name);
+	                return target.selected;
+	            }
+	        },
+
+	        /**
+	         * @param {string} name
+	         */
+	        isSelected: function (name) {
+	            var target = this._selectTargetMap[name];
+	            return target && target.selected;
+	        }
+	    };
+
+
+/***/ },
+/* 141 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var graphic = __webpack_require__(43);
+	    var zrUtil = __webpack_require__(4);
+
+	    /**
+	     * @param {module:echarts/model/Series} seriesModel
+	     * @param {boolean} hasAnimation
+	     * @inner
+	     */
+	    function updateDataSelected(uid, seriesModel, hasAnimation, api) {
+	        var data = seriesModel.getData();
+	        var dataIndex = this.dataIndex;
+	        var name = data.getName(dataIndex);
+	        var selectedOffset = seriesModel.get('selectedOffset');
+
+	        api.dispatchAction({
+	            type: 'pieToggleSelect',
+	            from: uid,
+	            name: name,
+	            seriesId: seriesModel.id
+	        });
+
+	        data.each(function (idx) {
+	            toggleItemSelected(
+	                data.getItemGraphicEl(idx),
+	                data.getItemLayout(idx),
+	                seriesModel.isSelected(data.getName(idx)),
+	                selectedOffset,
+	                hasAnimation
+	            );
+	        });
+	    }
+
+	    /**
+	     * @param {module:zrender/graphic/Sector} el
+	     * @param {Object} layout
+	     * @param {boolean} isSelected
+	     * @param {number} selectedOffset
+	     * @param {boolean} hasAnimation
+	     * @inner
+	     */
+	    function toggleItemSelected(el, layout, isSelected, selectedOffset, hasAnimation) {
+	        var midAngle = (layout.startAngle + layout.endAngle) / 2;
+
+	        var dx = Math.cos(midAngle);
+	        var dy = Math.sin(midAngle);
+
+	        var offset = isSelected ? selectedOffset : 0;
+	        var position = [dx * offset, dy * offset];
+
+	        hasAnimation
+	            // animateTo will stop revious animation like update transition
+	            ? el.animate()
+	                .when(200, {
+	                    position: position
+	                })
+	                .start('bounceOut')
+	            : el.attr('position', position);
+	    }
+
+	    /**
+	     * Piece of pie including Sector, Label, LabelLine
+	     * @constructor
+	     * @extends {module:zrender/graphic/Group}
+	     */
+	    function PiePiece(data, idx) {
+
+	        graphic.Group.call(this);
+
+	        var sector = new graphic.Sector({
+	            z2: 2
+	        });
+	        var polyline = new graphic.Polyline();
+	        var text = new graphic.Text();
+	        this.add(sector);
+	        this.add(polyline);
+	        this.add(text);
+
+	        this.updateData(data, idx, true);
+
+	        // Hover to change label and labelLine
+	        function onEmphasis() {
+	            polyline.ignore = polyline.hoverIgnore;
+	            text.ignore = text.hoverIgnore;
+	        }
+	        function onNormal() {
+	            polyline.ignore = polyline.normalIgnore;
+	            text.ignore = text.normalIgnore;
+	        }
+	        this.on('emphasis', onEmphasis)
+	            .on('normal', onNormal)
+	            .on('mouseover', onEmphasis)
+	            .on('mouseout', onNormal);
+	    }
+
+	    var piePieceProto = PiePiece.prototype;
+
+	    function getLabelStyle(data, idx, state, labelModel, labelPosition) {
+	        var textStyleModel = labelModel.getModel('textStyle');
+	        var isLabelInside = labelPosition === 'inside' || labelPosition === 'inner';
+	        return {
+	            fill: textStyleModel.getTextColor()
+	                || (isLabelInside ? '#fff' : data.getItemVisual(idx, 'color')),
+	            opacity: data.getItemVisual(idx, 'opacity'),
+	            textFont: textStyleModel.getFont(),
+	            text: zrUtil.retrieve(
+	                data.hostModel.getFormattedLabel(idx, state), data.getName(idx)
+	            )
+	        };
+	    }
+
+	    piePieceProto.updateData = function (data, idx, firstCreate) {
+
+	        var sector = this.childAt(0);
+
+	        var seriesModel = data.hostModel;
+	        var itemModel = data.getItemModel(idx);
+	        var layout = data.getItemLayout(idx);
+	        var sectorShape = zrUtil.extend({}, layout);
+	        sectorShape.label = null;
+	        if (firstCreate) {
+	            sector.setShape(sectorShape);
+	            sector.shape.endAngle = layout.startAngle;
+	            graphic.updateProps(sector, {
+	                shape: {
+	                    endAngle: layout.endAngle
+	                }
+	            }, seriesModel, idx);
+	        }
+	        else {
+	            graphic.updateProps(sector, {
+	                shape: sectorShape
+	            }, seriesModel, idx);
+	        }
+
+	        // Update common style
+	        var itemStyleModel = itemModel.getModel('itemStyle');
+	        var visualColor = data.getItemVisual(idx, 'color');
+
+	        sector.useStyle(
+	            zrUtil.defaults(
+	                {
+	                    lineJoin: 'bevel',
+	                    fill: visualColor
+	                },
+	                itemStyleModel.getModel('normal').getItemStyle()
+	            )
+	        );
+	        sector.hoverStyle = itemStyleModel.getModel('emphasis').getItemStyle();
+
+	        // Toggle selected
+	        toggleItemSelected(
+	            this,
+	            data.getItemLayout(idx),
+	            itemModel.get('selected'),
+	            seriesModel.get('selectedOffset'),
+	            seriesModel.get('animation')
+	        );
+
+	        function onEmphasis() {
+	            // Sector may has animation of updating data. Force to move to the last frame
+	            // Or it may stopped on the wrong shape
+	            sector.stopAnimation(true);
+	            sector.animateTo({
+	                shape: {
+	                    r: layout.r + 10
+	                }
+	            }, 300, 'elasticOut');
+	        }
+	        function onNormal() {
+	            sector.stopAnimation(true);
+	            sector.animateTo({
+	                shape: {
+	                    r: layout.r
+	                }
+	            }, 300, 'elasticOut');
+	        }
+	        sector.off('mouseover').off('mouseout').off('emphasis').off('normal');
+	        if (itemModel.get('hoverAnimation') && seriesModel.ifEnableAnimation()) {
+	            sector
+	                .on('mouseover', onEmphasis)
+	                .on('mouseout', onNormal)
+	                .on('emphasis', onEmphasis)
+	                .on('normal', onNormal);
+	        }
+
+	        this._updateLabel(data, idx);
+
+	        graphic.setHoverStyle(this);
+	    };
+
+	    piePieceProto._updateLabel = function (data, idx) {
+
+	        var labelLine = this.childAt(1);
+	        var labelText = this.childAt(2);
+
+	        var seriesModel = data.hostModel;
+	        var itemModel = data.getItemModel(idx);
+	        var layout = data.getItemLayout(idx);
+	        var labelLayout = layout.label;
+	        var visualColor = data.getItemVisual(idx, 'color');
+
+	        graphic.updateProps(labelLine, {
+	            shape: {
+	                points: labelLayout.linePoints || [
+	                    [labelLayout.x, labelLayout.y], [labelLayout.x, labelLayout.y], [labelLayout.x, labelLayout.y]
+	                ]
+	            }
+	        }, seriesModel, idx);
+
+	        graphic.updateProps(labelText, {
+	            style: {
+	                x: labelLayout.x,
+	                y: labelLayout.y
+	            }
+	        }, seriesModel, idx);
+	        labelText.attr({
+	            style: {
+	                textVerticalAlign: labelLayout.verticalAlign,
+	                textAlign: labelLayout.textAlign,
+	                textFont: labelLayout.font
+	            },
+	            rotation: labelLayout.rotation,
+	            origin: [labelLayout.x, labelLayout.y],
+	            z2: 10
+	        });
+
+	        var labelModel = itemModel.getModel('label.normal');
+	        var labelHoverModel = itemModel.getModel('label.emphasis');
+	        var labelLineModel = itemModel.getModel('labelLine.normal');
+	        var labelLineHoverModel = itemModel.getModel('labelLine.emphasis');
+	        var labelPosition = labelModel.get('position') || labelHoverModel.get('position');
+
+	        labelText.setStyle(getLabelStyle(data, idx, 'normal', labelModel, labelPosition));
+
+	        labelText.ignore = labelText.normalIgnore = !labelModel.get('show');
+	        labelText.hoverIgnore = !labelHoverModel.get('show');
+
+	        labelLine.ignore = labelLine.normalIgnore = !labelLineModel.get('show');
+	        labelLine.hoverIgnore = !labelLineHoverModel.get('show');
+
+	        // Default use item visual color
+	        labelLine.setStyle({
+	            stroke: visualColor,
+	            opacity: data.getItemVisual(idx, 'opacity')
+	        });
+	        labelLine.setStyle(labelLineModel.getModel('lineStyle').getLineStyle());
+
+	        labelText.hoverStyle = getLabelStyle(data, idx, 'emphasis', labelHoverModel, labelPosition);
+	        labelLine.hoverStyle = labelLineHoverModel.getModel('lineStyle').getLineStyle();
+
+	        var smooth = labelLineModel.get('smooth');
+	        if (smooth && smooth === true) {
+	            smooth = 0.4;
+	        }
+	        labelLine.setShape({
+	            smooth: smooth
+	        });
+	    };
+
+	    zrUtil.inherits(PiePiece, graphic.Group);
+
+
+	    // Pie view
+	    var Pie = __webpack_require__(42).extend({
+
+	        type: 'pie',
+
+	        init: function () {
+	            var sectorGroup = new graphic.Group();
+	            this._sectorGroup = sectorGroup;
+	        },
+
+	        render: function (seriesModel, ecModel, api, payload) {
+	            if (payload && (payload.from === this.uid)) {
+	                return;
+	            }
+
+	            var data = seriesModel.getData();
+	            var oldData = this._data;
+	            var group = this.group;
+
+	            var hasAnimation = ecModel.get('animation');
+	            var isFirstRender = !oldData;
+
+	            var onSectorClick = zrUtil.curry(
+	                updateDataSelected, this.uid, seriesModel, hasAnimation, api
+	            );
+
+	            var selectedMode = seriesModel.get('selectedMode');
+
+	            data.diff(oldData)
+	                .add(function (idx) {
+	                    var piePiece = new PiePiece(data, idx);
+	                    if (isFirstRender) {
+	                        piePiece.eachChild(function (child) {
+	                            child.stopAnimation(true);
+	                        });
+	                    }
+
+	                    selectedMode && piePiece.on('click', onSectorClick);
+
+	                    data.setItemGraphicEl(idx, piePiece);
+
+	                    group.add(piePiece);
+	                })
+	                .update(function (newIdx, oldIdx) {
+	                    var piePiece = oldData.getItemGraphicEl(oldIdx);
+
+	                    piePiece.updateData(data, newIdx);
+
+	                    piePiece.off('click');
+	                    selectedMode && piePiece.on('click', onSectorClick);
+	                    group.add(piePiece);
+	                    data.setItemGraphicEl(newIdx, piePiece);
+	                })
+	                .remove(function (idx) {
+	                    var piePiece = oldData.getItemGraphicEl(idx);
+	                    group.remove(piePiece);
+	                })
+	                .execute();
+
+	            if (hasAnimation && isFirstRender && data.count() > 0) {
+	                var shape = data.getItemLayout(0);
+	                var r = Math.max(api.getWidth(), api.getHeight()) / 2;
+
+	                var removeClipPath = zrUtil.bind(group.removeClipPath, group);
+	                group.setClipPath(this._createClipPath(
+	                    shape.cx, shape.cy, r, shape.startAngle, shape.clockwise, removeClipPath, seriesModel
+	                ));
+	            }
+
+	            this._data = data;
+	        },
+
+	        _createClipPath: function (
+	            cx, cy, r, startAngle, clockwise, cb, seriesModel
+	        ) {
+	            var clipPath = new graphic.Sector({
+	                shape: {
+	                    cx: cx,
+	                    cy: cy,
+	                    r0: 0,
+	                    r: r,
+	                    startAngle: startAngle,
+	                    endAngle: startAngle,
+	                    clockwise: clockwise
+	                }
+	            });
+
+	            graphic.initProps(clipPath, {
+	                shape: {
+	                    endAngle: startAngle + (clockwise ? 1 : -1) * Math.PI * 2
+	                }
+	            }, seriesModel, cb);
+
+	            return clipPath;
+	        }
+	    });
+
+	    module.exports = Pie;
+
+
+/***/ },
+/* 142 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+	    var echarts = __webpack_require__(1);
+	    var zrUtil = __webpack_require__(4);
+	    module.exports = function (seriesType, actionInfos) {
+	        zrUtil.each(actionInfos, function (actionInfo) {
+	            actionInfo.update = 'updateView';
+	            /**
+	             * @payload
+	             * @property {string} seriesName
+	             * @property {string} name
+	             */
+	            echarts.registerAction(actionInfo, function (payload, ecModel) {
+	                var selected = {};
+	                ecModel.eachComponent(
+	                    {mainType: 'series', subType: seriesType, query: payload},
+	                    function (seriesModel) {
+	                        if (seriesModel[actionInfo.method]) {
+	                            seriesModel[actionInfo.method](payload.name);
+	                        }
+	                        var data = seriesModel.getData();
+	                        // Create selected map
+	                        data.each(function (idx) {
+	                            var name = data.getName(idx);
+	                            selected[name] = seriesModel.isSelected(name) || false;
+	                        });
+	                    }
+	                );
+	                return {
+	                    name: payload.name,
+	                    selected: selected
+	                };
+	            });
+	        });
+	    };
+
+
+/***/ },
+/* 143 */
+/***/ function(module, exports) {
+
+	// Pick color from palette for each data item
+
+
+	    module.exports = function (seriesType, ecModel) {
+	        // Pie and funnel may use diferrent scope
+	        var paletteScope = {};
+	        ecModel.eachRawSeriesByType(seriesType, function (seriesModel) {
+	            var dataAll = seriesModel.getRawData();
+	            var idxMap = {};
+	            if (!ecModel.isSeriesFiltered(seriesModel)) {
+	                var data = seriesModel.getData();
+	                data.each(function (idx) {
+	                    var rawIdx = data.getRawIndex(idx);
+	                    idxMap[rawIdx] = idx;
+	                });
+	                dataAll.each(function (rawIdx) {
+	                    // FIXME Performance
+	                    var itemModel = dataAll.getItemModel(rawIdx);
+	                    var filteredIdx = idxMap[rawIdx];
+	                    // If series.itemStyle.normal.color is a function. itemVisual may be encoded
+	                    var singleDataColor = data.getItemVisual(filteredIdx, 'color', true);
+
+	                    if (!singleDataColor) {
+	                        var color = itemModel.get('itemStyle.normal.color')
+	                            || seriesModel.getColorFromPalette(dataAll.getName(rawIdx), paletteScope);
+	                        // Legend may use the visual info in data before processed
+	                        dataAll.setItemVisual(rawIdx, 'color', color);
+	                        data.setItemVisual(filteredIdx, 'color', color);
+	                    }
+	                    else {
+	                        // Set data all color for legend
+	                        dataAll.setItemVisual(rawIdx, 'color', singleDataColor);
+	                    }
+	                });
+	            }
+	        });
+	    };
+
+
+/***/ },
+/* 144 */
+/***/ function(module, exports, __webpack_require__) {
+
+	// TODO minAngle
+
+
+
+	    var numberUtil = __webpack_require__(7);
+	    var parsePercent = numberUtil.parsePercent;
+	    var labelLayout = __webpack_require__(145);
+	    var zrUtil = __webpack_require__(4);
+
+	    var PI2 = Math.PI * 2;
+	    var RADIAN = Math.PI / 180;
+
+	    module.exports = function (seriesType, ecModel, api, payload) {
+	        ecModel.eachSeriesByType(seriesType, function (seriesModel) {
+	            var center = seriesModel.get('center');
+	            var radius = seriesModel.get('radius');
+
+	            if (!zrUtil.isArray(radius)) {
+	                radius = [0, radius];
+	            }
+	            if (!zrUtil.isArray(center)) {
+	                center = [center, center];
+	            }
+
+	            var width = api.getWidth();
+	            var height = api.getHeight();
+	            var size = Math.min(width, height);
+	            var cx = parsePercent(center[0], width);
+	            var cy = parsePercent(center[1], height);
+	            var r0 = parsePercent(radius[0], size / 2);
+	            var r = parsePercent(radius[1], size / 2);
+
+	            var data = seriesModel.getData();
+
+	            var startAngle = -seriesModel.get('startAngle') * RADIAN;
+
+	            var minAngle = seriesModel.get('minAngle') * RADIAN;
+
+	            var sum = data.getSum('value');
+	            // Sum may be 0
+	            var unitRadian = Math.PI / (sum || data.count()) * 2;
+
+	            var clockwise = seriesModel.get('clockwise');
+
+	            var roseType = seriesModel.get('roseType');
+
+	            // [0...max]
+	            var extent = data.getDataExtent('value');
+	            extent[0] = 0;
+
+	            // In the case some sector angle is smaller than minAngle
+	            var restAngle = PI2;
+	            var valueSumLargerThanMinAngle = 0;
+
+	            var currentAngle = startAngle;
+
+	            var dir = clockwise ? 1 : -1;
+	            data.each('value', function (value, idx) {
+	                var angle;
+	                // FIXME 兼容 2.0 但是 roseType 是 area 的时候才是这样？
+	                if (roseType !== 'area') {
+	                    angle = sum === 0 ? unitRadian : (value * unitRadian);
+	                }
+	                else {
+	                    angle = PI2 / (data.count() || 1);
+	                }
+
+	                if (angle < minAngle) {
+	                    angle = minAngle;
+	                    restAngle -= minAngle;
+	                }
+	                else {
+	                    valueSumLargerThanMinAngle += value;
+	                }
+
+	                var endAngle = currentAngle + dir * angle;
+	                data.setItemLayout(idx, {
+	                    angle: angle,
+	                    startAngle: currentAngle,
+	                    endAngle: endAngle,
+	                    clockwise: clockwise,
+	                    cx: cx,
+	                    cy: cy,
+	                    r0: r0,
+	                    r: roseType
+	                        ? numberUtil.linearMap(value, extent, [r0, r])
+	                        : r
+	                });
+
+	                currentAngle = endAngle;
+	            }, true);
+
+	            // Some sector is constrained by minAngle
+	            // Rest sectors needs recalculate angle
+	            if (restAngle < PI2) {
+	                // Average the angle if rest angle is not enough after all angles is
+	                // Constrained by minAngle
+	                if (restAngle <= 1e-3) {
+	                    var angle = PI2 / data.count();
+	                    data.each(function (idx) {
+	                        var layout = data.getItemLayout(idx);
+	                        layout.startAngle = startAngle + dir * idx * angle;
+	                        layout.endAngle = startAngle + dir * (idx + 1) * angle;
+	                    });
+	                }
+	                else {
+	                    unitRadian = restAngle / valueSumLargerThanMinAngle;
+	                    currentAngle = startAngle;
+	                    data.each('value', function (value, idx) {
+	                        var layout = data.getItemLayout(idx);
+	                        var angle = layout.angle === minAngle
+	                            ? minAngle : value * unitRadian;
+	                        layout.startAngle = currentAngle;
+	                        layout.endAngle = currentAngle + dir * angle;
+	                        currentAngle += angle;
+	                    });
+	                }
+	            }
+
+	            labelLayout(seriesModel, r, width, height);
+	        });
+	    };
+
+
+/***/ },
+/* 145 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+	// FIXME emphasis label position is not same with normal label position
+
+
+	    var textContain = __webpack_require__(8);
+
+	    function adjustSingleSide(list, cx, cy, r, dir, viewWidth, viewHeight) {
+	        list.sort(function (a, b) {
+	            return a.y - b.y;
+	        });
+
+	        // 压
+	        function shiftDown(start, end, delta, dir) {
+	            for (var j = start; j < end; j++) {
+	                list[j].y += delta;
+	                if (j > start
+	                    && j + 1 < end
+	                    && list[j + 1].y > list[j].y + list[j].height
+	                ) {
+	                    shiftUp(j, delta / 2);
+	                    return;
+	                }
+	            }
+
+	            shiftUp(end - 1, delta / 2);
+	        }
+
+	        // 弹
+	        function shiftUp(end, delta) {
+	            for (var j = end; j >= 0; j--) {
+	                list[j].y -= delta;
+	                if (j > 0
+	                    && list[j].y > list[j - 1].y + list[j - 1].height
+	                ) {
+	                    break;
+	                }
+	            }
+	        }
+
+	        function changeX(list, isDownList, cx, cy, r, dir) {
+	            var lastDeltaX = dir > 0
+	                ? isDownList                // 右侧
+	                    ? Number.MAX_VALUE      // 下
+	                    : 0                     // 上
+	                : isDownList                // 左侧
+	                    ? Number.MAX_VALUE      // 下
+	                    : 0;                    // 上
+
+	            for (var i = 0, l = list.length; i < l; i++) {
+	                // Not change x for center label
+	                if (list[i].position === 'center') {
+	                    continue;
+	                }
+	                var deltaY = Math.abs(list[i].y - cy);
+	                var length = list[i].len;
+	                var length2 = list[i].len2;
+	                var deltaX = (deltaY < r + length)
+	                    ? Math.sqrt(
+	                          (r + length + length2) * (r + length + length2)
+	                          - deltaY * deltaY
+	                      )
+	                    : Math.abs(list[i].x - cx);
+	                if (isDownList && deltaX >= lastDeltaX) {
+	                    // 右下，左下
+	                    deltaX = lastDeltaX - 10;
+	                }
+	                if (!isDownList && deltaX <= lastDeltaX) {
+	                    // 右上，左上
+	                    deltaX = lastDeltaX + 10;
+	                }
+
+	                list[i].x = cx + deltaX * dir;
+	                lastDeltaX = deltaX;
+	            }
+	        }
+
+	        var lastY = 0;
+	        var delta;
+	        var len = list.length;
+	        var upList = [];
+	        var downList = [];
+	        for (var i = 0; i < len; i++) {
+	            delta = list[i].y - lastY;
+	            if (delta < 0) {
+	                shiftDown(i, len, -delta, dir);
+	            }
+	            lastY = list[i].y + list[i].height;
+	        }
+	        if (viewHeight - lastY < 0) {
+	            shiftUp(len - 1, lastY - viewHeight);
+	        }
+	        for (var i = 0; i < len; i++) {
+	            if (list[i].y >= cy) {
+	                downList.push(list[i]);
+	            }
+	            else {
+	                upList.push(list[i]);
+	            }
+	        }
+	        changeX(upList, false, cx, cy, r, dir);
+	        changeX(downList, true, cx, cy, r, dir);
+	    }
+
+	    function avoidOverlap(labelLayoutList, cx, cy, r, viewWidth, viewHeight) {
+	        var leftList = [];
+	        var rightList = [];
+	        for (var i = 0; i < labelLayoutList.length; i++) {
+	            if (labelLayoutList[i].x < cx) {
+	                leftList.push(labelLayoutList[i]);
+	            }
+	            else {
+	                rightList.push(labelLayoutList[i]);
+	            }
+	        }
+
+	        adjustSingleSide(rightList, cx, cy, r, 1, viewWidth, viewHeight);
+	        adjustSingleSide(leftList, cx, cy, r, -1, viewWidth, viewHeight);
+
+	        for (var i = 0; i < labelLayoutList.length; i++) {
+	            var linePoints = labelLayoutList[i].linePoints;
+	            if (linePoints) {
+	                var dist = linePoints[1][0] - linePoints[2][0];
+	                if (labelLayoutList[i].x < cx) {
+	                    linePoints[2][0] = labelLayoutList[i].x + 3;
+	                }
+	                else {
+	                    linePoints[2][0] = labelLayoutList[i].x - 3;
+	                }
+	                linePoints[1][1] = linePoints[2][1] = labelLayoutList[i].y;
+	                linePoints[1][0] = linePoints[2][0] + dist;
+	            }
+	        }
+	    }
+
+	    module.exports = function (seriesModel, r, viewWidth, viewHeight) {
+	        var data = seriesModel.getData();
+	        var labelLayoutList = [];
+	        var cx;
+	        var cy;
+	        var hasLabelRotate = false;
+
+	        data.each(function (idx) {
+	            var layout = data.getItemLayout(idx);
+
+	            var itemModel = data.getItemModel(idx);
+	            var labelModel = itemModel.getModel('label.normal');
+	            // Use position in normal or emphasis
+	            var labelPosition = labelModel.get('position') || itemModel.get('label.emphasis.position');
+
+	            var labelLineModel = itemModel.getModel('labelLine.normal');
+	            var labelLineLen = labelLineModel.get('length');
+	            var labelLineLen2 = labelLineModel.get('length2');
+
+	            var midAngle = (layout.startAngle + layout.endAngle) / 2;
+	            var dx = Math.cos(midAngle);
+	            var dy = Math.sin(midAngle);
+
+	            var textX;
+	            var textY;
+	            var linePoints;
+	            var textAlign;
+
+	            cx = layout.cx;
+	            cy = layout.cy;
+
+	            var isLabelInside = labelPosition === 'inside' || labelPosition === 'inner';
+	            if (labelPosition === 'center') {
+	                textX = layout.cx;
+	                textY = layout.cy;
+	                textAlign = 'center';
+	            }
+	            else {
+	                var x1 = (isLabelInside ? (layout.r + layout.r0) / 2 * dx : layout.r * dx) + cx;
+	                var y1 = (isLabelInside ? (layout.r + layout.r0) / 2 * dy : layout.r * dy) + cy;
+
+	                textX = x1 + dx * 3;
+	                textY = y1 + dy * 3;
+
+	                if (!isLabelInside) {
+	                    // For roseType
+	                    var x2 = x1 + dx * (labelLineLen + r - layout.r);
+	                    var y2 = y1 + dy * (labelLineLen + r - layout.r);
+	                    var x3 = x2 + ((dx < 0 ? -1 : 1) * labelLineLen2);
+	                    var y3 = y2;
+
+	                    textX = x3 + (dx < 0 ? -5 : 5);
+	                    textY = y3;
+	                    linePoints = [[x1, y1], [x2, y2], [x3, y3]];
+	                }
+
+	                textAlign = isLabelInside ? 'center' : (dx > 0 ? 'left' : 'right');
+	            }
+	            var font = labelModel.getModel('textStyle').getFont();
+
+	            var labelRotate = labelModel.get('rotate')
+	                ? (dx < 0 ? -midAngle + Math.PI : -midAngle) : 0;
+	            var text = seriesModel.getFormattedLabel(idx, 'normal')
+	                        || data.getName(idx);
+	            var textRect = textContain.getBoundingRect(
+	                text, font, textAlign, 'top'
+	            );
+	            hasLabelRotate = !!labelRotate;
+	            layout.label = {
+	                x: textX,
+	                y: textY,
+	                position: labelPosition,
+	                height: textRect.height,
+	                len: labelLineLen,
+	                len2: labelLineLen2,
+	                linePoints: linePoints,
+	                textAlign: textAlign,
+	                verticalAlign: 'middle',
+	                font: font,
+	                rotation: labelRotate
+	            };
+
+	            // Not layout the inside label
+	            if (!isLabelInside) {
+	                labelLayoutList.push(layout.label);
+	            }
+	        });
+	        if (!hasLabelRotate && seriesModel.get('avoidLabelOverlap')) {
+	            avoidOverlap(labelLayoutList, cx, cy, r, viewWidth, viewHeight);
+	        }
+	    };
+
+
+/***/ },
+/* 146 */
+/***/ function(module, exports) {
+
+	
+	    module.exports = function (seriesType, ecModel) {
+	        var legendModels = ecModel.findComponents({
+	            mainType: 'legend'
+	        });
+	        if (!legendModels || !legendModels.length) {
+	            return;
+	        }
+	        ecModel.eachSeriesByType(seriesType, function (series) {
+	            var data = series.getData();
+	            data.filterSelf(function (idx) {
+	                var name = data.getName(idx);
+	                // If in any legend component the status is not selected.
+	                for (var i = 0; i < legendModels.length; i++) {
+	                    if (!legendModels[i].isSelected(name)) {
+	                        return false;
+	                    }
+	                }
+	                return true;
+	            }, this);
+	        }, this);
+	    };
+
+
+/***/ },
+/* 147 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+	    var echarts = __webpack_require__(1);
+
+	    __webpack_require__(148);
+	    __webpack_require__(149);
+
+	    echarts.registerVisual(zrUtil.curry(
+	        __webpack_require__(109), 'scatter', 'circle', null
+	    ));
+	    echarts.registerLayout(zrUtil.curry(
+	        __webpack_require__(110), 'scatter'
+	    ));
+
+	    // In case developer forget to include grid component
+	    __webpack_require__(112);
+
+
+/***/ },
+/* 148 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var createListFromArray = __webpack_require__(101);
+	    var SeriesModel = __webpack_require__(28);
+
+	    module.exports = SeriesModel.extend({
+
+	        type: 'series.scatter',
+
+	        dependencies: ['grid', 'polar'],
+
+	        getInitialData: function (option, ecModel) {
+	            var list = createListFromArray(option.data, this, ecModel);
+	            return list;
+	        },
+
+	        brushSelector: 'point',
+
+	        defaultOption: {
+	            coordinateSystem: 'cartesian2d',
+	            zlevel: 0,
+	            z: 2,
+	            legendHoverLink: true,
+
+	            hoverAnimation: true,
+	            // Cartesian coordinate system
+	            xAxisIndex: 0,
+	            yAxisIndex: 0,
+
+	            // Polar coordinate system
+	            polarIndex: 0,
+
+	            // Geo coordinate system
+	            geoIndex: 0,
+
+	            // symbol: null,        // 图形类型
+	            symbolSize: 10,          // 图形大小，半宽（半径）参数，当图形为方向或菱形则总宽度为symbolSize * 2
+	            // symbolRotate: null,  // 图形旋转控制
+
+	            large: false,
+	            // Available when large is true
+	            largeThreshold: 2000,
+
+	            // label: {
+	                // normal: {
+	                    // show: false
+	                    // distance: 5,
+	                    // formatter: 标签文本格式器，同Tooltip.formatter，不支持异步回调
+	                    // position: 默认自适应，水平布局为'top'，垂直布局为'right'，可选为
+	                    //           'inside'|'left'|'right'|'top'|'bottom'
+	                    // textStyle: null      // 默认使用全局文本样式，详见TEXTSTYLE
+	            //     }
+	            // },
+	            itemStyle: {
+	                normal: {
+	                    opacity: 0.8
+	                    // color: 各异
+	                }
+	            }
+	        }
+
+	    });
+
+
+/***/ },
+/* 149 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var SymbolDraw = __webpack_require__(104);
+	    var LargeSymbolDraw = __webpack_require__(150);
+
+	    __webpack_require__(1).extendChartView({
+
+	        type: 'scatter',
+
+	        init: function () {
+	            this._normalSymbolDraw = new SymbolDraw();
+	            this._largeSymbolDraw = new LargeSymbolDraw();
+	        },
+
+	        render: function (seriesModel, ecModel, api) {
+	            var data = seriesModel.getData();
+	            var largeSymbolDraw = this._largeSymbolDraw;
+	            var normalSymbolDraw = this._normalSymbolDraw;
+	            var group = this.group;
+
+	            var symbolDraw = seriesModel.get('large') && data.count() > seriesModel.get('largeThreshold')
+	                ? largeSymbolDraw : normalSymbolDraw;
+
+	            this._symbolDraw = symbolDraw;
+	            symbolDraw.updateData(data);
+	            group.add(symbolDraw.group);
+
+	            group.remove(
+	                symbolDraw === largeSymbolDraw
+	                ? normalSymbolDraw.group : largeSymbolDraw.group
+	            );
+	        },
+
+	        updateLayout: function (seriesModel) {
+	            this._symbolDraw.updateLayout(seriesModel);
+	        },
+
+	        remove: function (ecModel, api) {
+	            this._symbolDraw && this._symbolDraw.remove(api, true);
+	        }
+	    });
+
+
+/***/ },
+/* 150 */
+/***/ function(module, exports, __webpack_require__) {
+
+	// TODO Batch by color
+
+
+
+	    var graphic = __webpack_require__(43);
+	    var symbolUtil = __webpack_require__(106);
+
+	    var LargeSymbolPath = graphic.extendShape({
+
+	        shape: {
+	            points: null,
+	            sizes: null
+	        },
+
+	        symbolProxy: null,
+
+	        buildPath: function (path, shape) {
+	            var points = shape.points;
+	            var sizes = shape.sizes;
+
+	            var symbolProxy = this.symbolProxy;
+	            var symbolProxyShape = symbolProxy.shape;
+	            for (var i = 0; i < points.length; i++) {
+	                var pt = points[i];
+	                var size = sizes[i];
+	                if (size[0] < 4) {
+	                    // Optimize for small symbol
+	                    path.rect(
+	                        pt[0] - size[0] / 2, pt[1] - size[1] / 2,
+	                        size[0], size[1]
+	                    );
+	                }
+	                else {
+	                    symbolProxyShape.x = pt[0] - size[0] / 2;
+	                    symbolProxyShape.y = pt[1] - size[1] / 2;
+	                    symbolProxyShape.width = size[0];
+	                    symbolProxyShape.height = size[1];
+
+	                    symbolProxy.buildPath(path, symbolProxyShape, true);
+	                }
+	            }
+	        },
+
+	        findDataIndex: function (x, y) {
+	            var shape = this.shape;
+	            var points = shape.points;
+	            var sizes = shape.sizes;
+
+	            // Not consider transform
+	            // Treat each element as a rect
+	            // top down traverse
+	            for (var i = points.length - 1; i >= 0; i--) {
+	                var pt = points[i];
+	                var size = sizes[i];
+	                var x0 = pt[0] - size[0] / 2;
+	                var y0 = pt[1] - size[1] / 2;
+	                if (x >= x0 && y >= y0 && x <= x0 + size[0] && y <= y0 + size[1]) {
+	                    // i is dataIndex
+	                    return i;
+	                }
+	            }
+
+	            return -1;
+	        }
+	    });
+
+	    function LargeSymbolDraw() {
+	        this.group = new graphic.Group();
+
+	        this._symbolEl = new LargeSymbolPath({
+	            // rectHover: true,
+	            // cursor: 'default'
+	        });
+	    }
+
+	    var largeSymbolProto = LargeSymbolDraw.prototype;
+
+	    /**
+	     * Update symbols draw by new data
+	     * @param {module:echarts/data/List} data
+	     */
+	    largeSymbolProto.updateData = function (data) {
+	        this.group.removeAll();
+
+	        var symbolEl = this._symbolEl;
+
+	        var seriesModel = data.hostModel;
+
+	        symbolEl.setShape({
+	            points: data.mapArray(data.getItemLayout),
+	            sizes: data.mapArray(
+	                function (idx) {
+	                    var size = data.getItemVisual(idx, 'symbolSize');
+	                    if (!(size instanceof Array)) {
+	                        size = [size, size];
+	                    }
+	                    return size;
+	                }
+	            )
+	        });
+
+	        // Create symbolProxy to build path for each data
+	        symbolEl.symbolProxy = symbolUtil.createSymbol(
+	            data.getVisual('symbol'), 0, 0, 0, 0
+	        );
+	        // Use symbolProxy setColor method
+	        symbolEl.setColor = symbolEl.symbolProxy.setColor;
+
+	        symbolEl.useStyle(
+	            seriesModel.getModel('itemStyle.normal').getItemStyle(['color'])
+	        );
+
+	        var visualColor = data.getVisual('color');
+	        if (visualColor) {
+	            symbolEl.setColor(visualColor);
+	        }
+
+	        // Enable tooltip
+	        // PENDING May have performance issue when path is extremely large
+	        symbolEl.seriesIndex = seriesModel.seriesIndex;
+	        symbolEl.on('mousemove', function (e) {
+	            symbolEl.dataIndex = null;
+	            var dataIndex = symbolEl.findDataIndex(e.offsetX, e.offsetY);
+	            if (dataIndex > 0) {
+	                // Provide dataIndex for tooltip
+	                symbolEl.dataIndex = dataIndex;
+	            }
+	        });
+
+	        // Add back
+	        this.group.add(symbolEl);
+	    };
+
+	    largeSymbolProto.updateLayout = function (seriesModel) {
+	        var data = seriesModel.getData();
+	        this._symbolEl.setShape({
+	            points: data.mapArray(data.getItemLayout)
+	        });
+	    };
+
+	    largeSymbolProto.remove = function () {
+	        this.group.removeAll();
+	    };
+
+	    module.exports = LargeSymbolDraw;
+
+
+/***/ },
+/* 151 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+	    var echarts = __webpack_require__(1);
+
+	    // Must use radar component
+	    __webpack_require__(152);
+
+	    __webpack_require__(157);
+	    __webpack_require__(158);
+
+	    echarts.registerVisual(zrUtil.curry(__webpack_require__(143), 'radar'));
+	    echarts.registerVisual(zrUtil.curry(
+	        __webpack_require__(109), 'radar', 'circle', null
+	    ));
+	    echarts.registerLayout(__webpack_require__(159));
+
+	    echarts.registerProcessor(
+	        zrUtil.curry(__webpack_require__(146), 'radar')
+	    );
+
+	    echarts.registerPreprocessor(__webpack_require__(160));
+
+
+/***/ },
+/* 152 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    __webpack_require__(153);
+	    __webpack_require__(155);
+
+	    __webpack_require__(156);
+
+
+/***/ },
+/* 153 */
+/***/ function(module, exports, __webpack_require__) {
+
+	// TODO clockwise
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var IndicatorAxis = __webpack_require__(154);
+	    var IntervalScale = __webpack_require__(117);
+	    var numberUtil = __webpack_require__(7);
+	    var axisHelper = __webpack_require__(114);
+
+	    function Radar(radarModel, ecModel, api) {
+
+	        this._model = radarModel;
+	        /**
+	         * Radar dimensions
+	         * @type {Array.<string>}
+	         */
+	        this.dimensions = [];
+
+	        this._indicatorAxes = zrUtil.map(radarModel.getIndicatorModels(), function (indicatorModel, idx) {
+	            var dim = 'indicator_' + idx;
+	            var indicatorAxis = new IndicatorAxis(dim, new IntervalScale());
+	            indicatorAxis.name = indicatorModel.get('name');
+	            // Inject model and axis
+	            indicatorAxis.model = indicatorModel;
+	            indicatorModel.axis = indicatorAxis;
+	            this.dimensions.push(dim);
+	            return indicatorAxis;
+	        }, this);
+
+	        this.resize(radarModel, api);
+
+	        /**
+	         * @type {number}
+	         * @readOnly
+	         */
+	        this.cx;
+	        /**
+	         * @type {number}
+	         * @readOnly
+	         */
+	        this.cy;
+	        /**
+	         * @type {number}
+	         * @readOnly
+	         */
+	        this.r;
+	        /**
+	         * @type {number}
+	         * @readOnly
+	         */
+	        this.startAngle;
+	    }
+
+	    Radar.prototype.getIndicatorAxes = function () {
+	        return this._indicatorAxes;
+	    };
+
+	    Radar.prototype.dataToPoint = function (value, indicatorIndex) {
+	        var indicatorAxis = this._indicatorAxes[indicatorIndex];
+
+	        return this.coordToPoint(indicatorAxis.dataToCoord(value), indicatorIndex);
+	    };
+
+	    Radar.prototype.coordToPoint = function (coord, indicatorIndex) {
+	        var indicatorAxis = this._indicatorAxes[indicatorIndex];
+	        var angle = indicatorAxis.angle;
+	        var x = this.cx + coord * Math.cos(angle);
+	        var y = this.cy - coord * Math.sin(angle);
+	        return [x, y];
+	    };
+
+	    Radar.prototype.pointToData = function (pt) {
+	        var dx = pt[0] - this.cx;
+	        var dy = pt[1] - this.cy;
+	        var radius = Math.sqrt(dx * dx + dy * dy);
+	        dx /= radius;
+	        dy /= radius;
+
+	        var radian = Math.atan2(-dy, dx);
+
+	        // Find the closest angle
+	        // FIXME index can calculated directly
+	        var minRadianDiff = Infinity;
+	        var closestAxis;
+	        var closestAxisIdx = -1;
+	        for (var i = 0; i < this._indicatorAxes.length; i++) {
+	            var indicatorAxis = this._indicatorAxes[i];
+	            var diff = Math.abs(radian - indicatorAxis.angle);
+	            if (diff < minRadianDiff) {
+	                closestAxis = indicatorAxis;
+	                closestAxisIdx = i;
+	                minRadianDiff = diff;
+	            }
+	        }
+
+	        return [closestAxisIdx, +(closestAxis && closestAxis.coodToData(radius))];
+	    };
+
+	    Radar.prototype.resize = function (radarModel, api) {
+	        var center = radarModel.get('center');
+	        var viewWidth = api.getWidth();
+	        var viewHeight = api.getHeight();
+	        var viewSize = Math.min(viewWidth, viewHeight) / 2;
+	        this.cx = numberUtil.parsePercent(center[0], viewWidth);
+	        this.cy = numberUtil.parsePercent(center[1], viewHeight);
+
+	        this.startAngle = radarModel.get('startAngle') * Math.PI / 180;
+
+	        this.r = numberUtil.parsePercent(radarModel.get('radius'), viewSize);
+
+	        zrUtil.each(this._indicatorAxes, function (indicatorAxis, idx) {
+	            indicatorAxis.setExtent(0, this.r);
+	            var angle = (this.startAngle + idx * Math.PI * 2 / this._indicatorAxes.length);
+	            // Normalize to [-PI, PI]
+	            angle = Math.atan2(Math.sin(angle), Math.cos(angle));
+	            indicatorAxis.angle = angle;
+	        }, this);
+	    };
+
+	    Radar.prototype.update = function (ecModel, api) {
+	        var indicatorAxes = this._indicatorAxes;
+	        var radarModel = this._model;
+	        zrUtil.each(indicatorAxes, function (indicatorAxis) {
+	            indicatorAxis.scale.setExtent(Infinity, -Infinity);
+	        });
+	        ecModel.eachSeriesByType('radar', function (radarSeries, idx) {
+	            if (radarSeries.get('coordinateSystem') !== 'radar'
+	                || ecModel.getComponent('radar', radarSeries.get('radarIndex')) !== radarModel
+	            ) {
+	                return;
+	            }
+	            var data = radarSeries.getData();
+	            zrUtil.each(indicatorAxes, function (indicatorAxis) {
+	                indicatorAxis.scale.unionExtent(data.getDataExtent(indicatorAxis.dim));
+	            });
+	        }, this);
+
+	        var splitNumber = radarModel.get('splitNumber');
+
+	        function increaseInterval(interval) {
+	            var exp10 = Math.pow(10, Math.floor(Math.log(interval) / Math.LN10));
+	            // Increase interval
+	            var f = interval / exp10;
+	            if (f === 2) {
+	                f = 5;
+	            }
+	            else { // f is 2 or 5
+	                f *= 2;
+	            }
+	            return f * exp10;
+	        }
+	        // Force all the axis fixing the maxSplitNumber.
+	        zrUtil.each(indicatorAxes, function (indicatorAxis, idx) {
+	            var rawExtent = axisHelper.getScaleExtent(indicatorAxis, indicatorAxis.model);
+	            axisHelper.niceScaleExtent(indicatorAxis, indicatorAxis.model);
+
+	            var axisModel = indicatorAxis.model;
+	            var scale = indicatorAxis.scale;
+	            var fixedMin = axisModel.get('min');
+	            var fixedMax = axisModel.get('max');
+	            var interval = scale.getInterval();
+
+	            if (fixedMin != null && fixedMax != null) {
+	                // User set min, max, divide to get new interval
+	                // FIXME precision
+	                scale.setInterval(
+	                    (fixedMax - fixedMin) / splitNumber
+	                );
+	            }
+	            else if (fixedMin != null) {
+	                var max;
+	                // User set min, expand extent on the other side
+	                do {
+	                    max = fixedMin + interval * splitNumber;
+	                    scale.setExtent(+fixedMin, max);
+	                    // Interval must been set after extent
+	                    // FIXME
+	                    scale.setInterval(interval);
+
+	                    interval = increaseInterval(interval);
+	                } while (max < rawExtent[1] && isFinite(max) && isFinite(rawExtent[1]));
+	            }
+	            else if (fixedMax != null) {
+	                var min;
+	                // User set min, expand extent on the other side
+	                do {
+	                    min = fixedMax - interval * splitNumber;
+	                    scale.setExtent(min, +fixedMax);
+	                    scale.setInterval(interval);
+	                    interval = increaseInterval(interval);
+	                } while (min > rawExtent[0] && isFinite(min) && isFinite(rawExtent[0]));
+	            }
+	            else {
+	                var nicedSplitNumber = scale.getTicks().length - 1;
+	                if (nicedSplitNumber > splitNumber) {
+	                    interval = increaseInterval(interval);
+	                }
+	                // PENDING
+	                var center = Math.round((rawExtent[0] + rawExtent[1]) / 2 / interval) * interval;
+	                var halfSplitNumber = Math.round(splitNumber / 2);
+	                scale.setExtent(
+	                    numberUtil.round(center - halfSplitNumber * interval),
+	                    numberUtil.round(center + (splitNumber - halfSplitNumber) * interval)
+	                );
+	                scale.setInterval(interval);
+	            }
+	        });
+	    };
+
+	    /**
+	     * Radar dimensions is based on the data
+	     * @type {Array}
+	     */
+	    Radar.dimensions = [];
+
+	    Radar.create = function (ecModel, api) {
+	        var radarList = [];
+	        ecModel.eachComponent('radar', function (radarModel) {
+	            var radar = new Radar(radarModel, ecModel, api);
+	            radarList.push(radar);
+	            radarModel.coordinateSystem = radar;
+	        });
+	        ecModel.eachSeriesByType('radar', function (radarSeries) {
+	            if (radarSeries.get('coordinateSystem') === 'radar') {
+	                // Inject coordinate system
+	                radarSeries.coordinateSystem = radarList[radarSeries.get('radarIndex') || 0];
+	            }
+	        });
+	        return radarList;
+	    };
+
+	    __webpack_require__(26).register('radar', Radar);
+	    module.exports = Radar;
+
+
+/***/ },
+/* 154 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+	    var Axis = __webpack_require__(123);
+
+	    function IndicatorAxis(dim, scale, radiusExtent) {
+	        Axis.call(this, dim, scale, radiusExtent);
+
+	        /**
+	         * Axis type
+	         *  - 'category'
+	         *  - 'value'
+	         *  - 'time'
+	         *  - 'log'
+	         * @type {string}
+	         */
+	        this.type = 'value';
+
+	        this.angle = 0;
+
+	        /**
+	         * Indicator name
+	         * @type {string}
+	         */
+	        this.name = '';
+	        /**
+	         * @type {module:echarts/model/Model}
+	         */
+	        this.model;
+	    }
+
+	    zrUtil.inherits(IndicatorAxis, Axis);
+
+	    module.exports = IndicatorAxis;
+
+
+/***/ },
+/* 155 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+
+	    var axisDefault = __webpack_require__(128);
+	    var valueAxisDefault = axisDefault.valueAxis;
+	    var Model = __webpack_require__(12);
+	    var zrUtil = __webpack_require__(4);
+
+	    var axisModelCommonMixin = __webpack_require__(129);
+
+	    function defaultsShow(opt, show) {
+	        return zrUtil.defaults({
+	            show: show
+	        }, opt);
+	    }
+
+	    var RadarModel = __webpack_require__(1).extendComponentModel({
+
+	        type: 'radar',
+
+	        optionUpdated: function () {
+	            var boundaryGap = this.get('boundaryGap');
+	            var splitNumber = this.get('splitNumber');
+	            var scale = this.get('scale');
+	            var axisLine = this.get('axisLine');
+	            var axisTick = this.get('axisTick');
+	            var axisLabel = this.get('axisLabel');
+	            var nameTextStyle = this.get('name.textStyle');
+	            var showName = this.get('name.show');
+	            var nameFormatter = this.get('name.formatter');
+	            var nameGap = this.get('nameGap');
+	            var indicatorModels = zrUtil.map(this.get('indicator') || [], function (indicatorOpt) {
+	                // PENDING
+	                if (indicatorOpt.max != null && indicatorOpt.max > 0) {
+	                    indicatorOpt.min = 0;
+	                }
+	                else if (indicatorOpt.min != null && indicatorOpt.min < 0) {
+	                    indicatorOpt.max = 0;
+	                }
+	                // Use same configuration
+	                indicatorOpt = zrUtil.merge(zrUtil.clone(indicatorOpt), {
+	                    boundaryGap: boundaryGap,
+	                    splitNumber: splitNumber,
+	                    scale: scale,
+	                    axisLine: axisLine,
+	                    axisTick: axisTick,
+	                    axisLabel: axisLabel,
+	                    // Competitable with 2 and use text
+	                    name: indicatorOpt.text,
+	                    nameLocation: 'end',
+	                    nameGap: nameGap,
+	                    // min: 0,
+	                    nameTextStyle: nameTextStyle
+	                }, false);
+	                if (!showName) {
+	                    indicatorOpt.name = '';
+	                }
+	                if (typeof nameFormatter === 'string') {
+	                    indicatorOpt.name = nameFormatter.replace('{value}', indicatorOpt.name);
+	                }
+	                else if (typeof nameFormatter === 'function') {
+	                    indicatorOpt.name = nameFormatter(
+	                        indicatorOpt.name, indicatorOpt
+	                    );
+	                }
+	                return zrUtil.extend(
+	                    new Model(indicatorOpt, null, this.ecModel),
+	                    axisModelCommonMixin
+	                );
+	            }, this);
+	            this.getIndicatorModels = function () {
+	                return indicatorModels;
+	            };
+	        },
+
+	        defaultOption: {
+
+	            zlevel: 0,
+
+	            z: 0,
+
+	            center: ['50%', '50%'],
+
+	            radius: '75%',
+
+	            startAngle: 90,
+
+	            name: {
+	                show: true
+	                // formatter: null
+	                // textStyle: {}
+	            },
+
+	            boundaryGap: [0, 0],
+
+	            splitNumber: 5,
+
+	            nameGap: 15,
+
+	            scale: false,
+
+	            // Polygon or circle
+	            shape: 'polygon',
+
+	            axisLine: zrUtil.merge(
+	                {
+	                    lineStyle: {
+	                        color: '#bbb'
+	                    }
+	                },
+	                valueAxisDefault.axisLine
+	            ),
+	            axisLabel: defaultsShow(valueAxisDefault.axisLabel, false),
+	            axisTick: defaultsShow(valueAxisDefault.axisTick, false),
+	            splitLine: defaultsShow(valueAxisDefault.splitLine, true),
+	            splitArea: defaultsShow(valueAxisDefault.splitArea, true),
+
+	            // {text, min, max}
+	            indicator: []
+	        }
+	    });
+
+	    module.exports = RadarModel;
+
+
+/***/ },
+/* 156 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var AxisBuilder = __webpack_require__(132);
+	    var zrUtil = __webpack_require__(4);
+	    var graphic = __webpack_require__(43);
+
+	    var axisBuilderAttrs = [
+	        'axisLine', 'axisLabel', 'axisTick', 'axisName'
+	    ];
+
+	    module.exports = __webpack_require__(1).extendComponentView({
+
+	        type: 'radar',
+
+	        render: function (radarModel, ecModel, api) {
+	            var group = this.group;
+	            group.removeAll();
+
+	            this._buildAxes(radarModel);
+	            this._buildSplitLineAndArea(radarModel);
+	        },
+
+	        _buildAxes: function (radarModel) {
+	            var radar = radarModel.coordinateSystem;
+	            var indicatorAxes = radar.getIndicatorAxes();
+	            var axisBuilders = zrUtil.map(indicatorAxes, function (indicatorAxis) {
+	                var axisBuilder = new AxisBuilder(indicatorAxis.model, {
+	                    position: [radar.cx, radar.cy],
+	                    rotation: indicatorAxis.angle,
+	                    labelDirection: -1,
+	                    tickDirection: -1,
+	                    nameDirection: 1
+	                });
+	                return axisBuilder;
+	            });
+
+	            zrUtil.each(axisBuilders, function (axisBuilder) {
+	                zrUtil.each(axisBuilderAttrs, axisBuilder.add, axisBuilder);
+	                this.group.add(axisBuilder.getGroup());
+	            }, this);
+	        },
+
+	        _buildSplitLineAndArea: function (radarModel) {
+	            var radar = radarModel.coordinateSystem;
+	            var splitNumber = radarModel.get('splitNumber');
+	            var indicatorAxes = radar.getIndicatorAxes();
+	            if (!indicatorAxes.length) {
+	                return;
+	            }
+	            var shape = radarModel.get('shape');
+	            var splitLineModel = radarModel.getModel('splitLine');
+	            var splitAreaModel = radarModel.getModel('splitArea');
+	            var lineStyleModel = splitLineModel.getModel('lineStyle');
+	            var areaStyleModel = splitAreaModel.getModel('areaStyle');
+
+	            var showSplitLine = splitLineModel.get('show');
+	            var showSplitArea = splitAreaModel.get('show');
+	            var splitLineColors = lineStyleModel.get('color');
+	            var splitAreaColors = areaStyleModel.get('color');
+
+	            splitLineColors = zrUtil.isArray(splitLineColors) ? splitLineColors : [splitLineColors];
+	            splitAreaColors = zrUtil.isArray(splitAreaColors) ? splitAreaColors : [splitAreaColors];
+
+	            var splitLines = [];
+	            var splitAreas = [];
+
+	            function getColorIndex(areaOrLine, areaOrLineColorList, idx) {
+	                var colorIndex = idx % areaOrLineColorList.length;
+	                areaOrLine[colorIndex] = areaOrLine[colorIndex] || [];
+	                return colorIndex;
+	            }
+
+	            if (shape === 'circle') {
+	                var ticksRadius = indicatorAxes[0].getTicksCoords();
+	                var cx = radar.cx;
+	                var cy = radar.cy;
+	                for (var i = 0; i < ticksRadius.length; i++) {
+	                    if (showSplitLine) {
+	                        var colorIndex = getColorIndex(splitLines, splitLineColors, i);
+	                        splitLines[colorIndex].push(new graphic.Circle({
+	                            shape: {
+	                                cx: cx,
+	                                cy: cy,
+	                                r: ticksRadius[i]
+	                            }
+	                        }));
+	                    }
+	                    if (showSplitArea && i < ticksRadius.length - 1) {
+	                        var colorIndex = getColorIndex(splitAreas, splitAreaColors, i);
+	                        splitAreas[colorIndex].push(new graphic.Ring({
+	                            shape: {
+	                                cx: cx,
+	                                cy: cy,
+	                                r0: ticksRadius[i],
+	                                r: ticksRadius[i + 1]
+	                            }
+	                        }));
+	                    }
+	                }
+	            }
+	            // Polyyon
+	            else {
+	                var axesTicksPoints = zrUtil.map(indicatorAxes, function (indicatorAxis, idx) {
+	                    var ticksCoords = indicatorAxis.getTicksCoords();
+	                    return zrUtil.map(ticksCoords, function (tickCoord) {
+	                        return radar.coordToPoint(tickCoord, idx);
+	                    });
+	                });
+
+	                var prevPoints = [];
+	                for (var i = 0; i <= splitNumber; i++) {
+	                    var points = [];
+	                    for (var j = 0; j < indicatorAxes.length; j++) {
+	                        points.push(axesTicksPoints[j][i]);
+	                    }
+	                    // Close
+	                    points.push(points[0].slice());
+	                    if (showSplitLine) {
+	                        var colorIndex = getColorIndex(splitLines, splitLineColors, i);
+	                        splitLines[colorIndex].push(new graphic.Polyline({
+	                            shape: {
+	                                points: points
+	                            }
+	                        }));
+	                    }
+	                    if (showSplitArea && prevPoints) {
+	                        var colorIndex = getColorIndex(splitAreas, splitAreaColors, i - 1);
+	                        splitAreas[colorIndex].push(new graphic.Polygon({
+	                            shape: {
+	                                points: points.concat(prevPoints)
+	                            }
+	                        }));
+	                    }
+	                    prevPoints = points.slice().reverse();
+	                }
+	            }
+
+	            var lineStyle = lineStyleModel.getLineStyle();
+	            var areaStyle = areaStyleModel.getAreaStyle();
+	            // Add splitArea before splitLine
+	            zrUtil.each(splitAreas, function (splitAreas, idx) {
+	                this.group.add(graphic.mergePath(
+	                    splitAreas, {
+	                        style: zrUtil.defaults({
+	                            stroke: 'none',
+	                            fill: splitAreaColors[idx % splitAreaColors.length]
+	                        }, areaStyle),
+	                        silent: true
+	                    }
+	                ));
+	            }, this);
+
+	            zrUtil.each(splitLines, function (splitLines, idx) {
+	                this.group.add(graphic.mergePath(
+	                    splitLines, {
+	                        style: zrUtil.defaults({
+	                            fill: 'none',
+	                            stroke: splitLineColors[idx % splitLineColors.length]
+	                        }, lineStyle),
+	                        silent: true
+	                    }
+	                ));
+	            }, this);
+
+	        }
+	    });
+
+
+/***/ },
+/* 157 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var SeriesModel = __webpack_require__(28);
+	    var List = __webpack_require__(97);
+	    var completeDimensions = __webpack_require__(102);
+	    var zrUtil = __webpack_require__(4);
+
+	    var RadarSeries = SeriesModel.extend({
+
+	        type: 'series.radar',
+
+	        dependencies: ['radar'],
+
+
+	        // Overwrite
+	        init: function (option) {
+	            RadarSeries.superApply(this, 'init', arguments);
+
+	            // Enable legend selection for each data item
+	            // Use a function instead of direct access because data reference may changed
+	            this.legendDataProvider = function () {
+	                return this._dataBeforeProcessed;
+	            };
+	        },
+
+	        getInitialData: function (option, ecModel) {
+	            var data = option.data || [];
+	            var dimensions = completeDimensions(
+	                [], data, [], 'indicator_'
+	            );
+	            var list = new List(dimensions, this);
+	            list.initData(data);
+	            return list;
+	        },
+
+	        formatTooltip: function (dataIndex) {
+	            var value = this.getRawValue(dataIndex);
+	            var coordSys = this.coordinateSystem;
+	            var indicatorAxes = coordSys.getIndicatorAxes();
+	            return (this._data.getName(dataIndex) == '' ? this.name : this._data.getName(dataIndex)) + '<br/>'
+	                + zrUtil.map(indicatorAxes, function (axis, idx) {
+	                    return axis.name + ' : ' + value[idx];
+	                }).join('<br />');
+	        },
+
+	        defaultOption: {
+	            zlevel: 0,
+	            z: 2,
+	            coordinateSystem: 'radar',
+	            legendHoverLink: true,
+	            radarIndex: 0,
+	            lineStyle: {
+	                normal: {
+	                    width: 2,
+	                    type: 'solid'
+	                }
+	            },
+	            label: {
+	                normal: {
+	                    position: 'top'
+	                }
+	            },
+	            // areaStyle: {
+	            // },
+	            // itemStyle: {}
+	            symbol: 'emptyCircle',
+	            symbolSize: 4
+	            // symbolRotate: null
+	        }
+	    });
+
+	    module.exports = RadarSeries;
+
+
+/***/ },
+/* 158 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var graphic = __webpack_require__(43);
+	    var zrUtil = __webpack_require__(4);
+	    var symbolUtil = __webpack_require__(106);
+
+	    function normalizeSymbolSize(symbolSize) {
+	        if (!zrUtil.isArray(symbolSize)) {
+	            symbolSize = [+symbolSize, +symbolSize];
+	        }
+	        return symbolSize;
+	    }
+	    module.exports = __webpack_require__(1).extendChartView({
+	        type: 'radar',
+
+	        render: function (seriesModel, ecModel, api) {
+	            var polar = seriesModel.coordinateSystem;
+	            var group = this.group;
+
+	            var data = seriesModel.getData();
+	            var oldData = this._data;
+
+	            function createSymbol(data, idx) {
+	                var symbolType = data.getItemVisual(idx, 'symbol') || 'circle';
+	                var color = data.getItemVisual(idx, 'color');
+	                if (symbolType === 'none') {
+	                    return;
+	                }
+	                var symbolPath = symbolUtil.createSymbol(
+	                    symbolType, -0.5, -0.5, 1, 1, color
+	                );
+	                symbolPath.attr({
+	                    style: {
+	                        strokeNoScale: true
+	                    },
+	                    z2: 100,
+	                    scale: normalizeSymbolSize(data.getItemVisual(idx, 'symbolSize'))
+	                });
+	                return symbolPath;
+	            }
+
+	            function updateSymbols(oldPoints, newPoints, symbolGroup, data, idx, isInit) {
+	                // Simply rerender all
+	                symbolGroup.removeAll();
+	                for (var i = 0; i < newPoints.length - 1; i++) {
+	                    var symbolPath = createSymbol(data, idx);
+	                    if (symbolPath) {
+	                        symbolPath.__dimIdx = i;
+	                        if (oldPoints[i]) {
+	                            symbolPath.attr('position', oldPoints[i]);
+	                            graphic[isInit ? 'initProps' : 'updateProps'](
+	                                symbolPath, {
+	                                    position: newPoints[i]
+	                                }, seriesModel, idx
+	                            );
+	                        }
+	                        else {
+	                            symbolPath.attr('position', newPoints[i]);
+	                        }
+	                        symbolGroup.add(symbolPath);
+	                    }
+	                }
+	            }
+
+	            function getInitialPoints(points) {
+	                return zrUtil.map(points, function (pt) {
+	                    return [polar.cx, polar.cy];
+	                });
+	            }
+	            data.diff(oldData)
+	                .add(function (idx) {
+	                    var points = data.getItemLayout(idx);
+	                    if (!points) {
+	                        return;
+	                    }
+	                    var polygon = new graphic.Polygon();
+	                    var polyline = new graphic.Polyline();
+	                    var target = {
+	                        shape: {
+	                            points: points
+	                        }
+	                    };
+	                    polygon.shape.points = getInitialPoints(points);
+	                    polyline.shape.points = getInitialPoints(points);
+	                    graphic.initProps(polygon, target, seriesModel, idx);
+	                    graphic.initProps(polyline, target, seriesModel, idx);
+
+	                    var itemGroup = new graphic.Group();
+	                    var symbolGroup = new graphic.Group();
+	                    itemGroup.add(polyline);
+	                    itemGroup.add(polygon);
+	                    itemGroup.add(symbolGroup);
+
+	                    updateSymbols(
+	                        polyline.shape.points, points, symbolGroup, data, idx, true
+	                    );
+
+	                    data.setItemGraphicEl(idx, itemGroup);
+	                })
+	                .update(function (newIdx, oldIdx) {
+	                    var itemGroup = oldData.getItemGraphicEl(oldIdx);
+	                    var polyline = itemGroup.childAt(0);
+	                    var polygon = itemGroup.childAt(1);
+	                    var symbolGroup = itemGroup.childAt(2);
+	                    var target = {
+	                        shape: {
+	                            points: data.getItemLayout(newIdx)
+	                        }
+	                    };
+	                    if (!target.shape.points) {
+	                        return;
+	                    }
+	                    updateSymbols(
+	                        polyline.shape.points, target.shape.points, symbolGroup, data, newIdx, false
+	                    );
+
+	                    graphic.updateProps(polyline, target, seriesModel);
+	                    graphic.updateProps(polygon, target, seriesModel);
+
+	                    data.setItemGraphicEl(newIdx, itemGroup);
+	                })
+	                .remove(function (idx) {
+	                    group.remove(oldData.getItemGraphicEl(idx));
+	                })
+	                .execute();
+
+	            data.eachItemGraphicEl(function (itemGroup, idx) {
+	                var itemModel = data.getItemModel(idx);
+	                var polyline = itemGroup.childAt(0);
+	                var polygon = itemGroup.childAt(1);
+	                var symbolGroup = itemGroup.childAt(2);
+	                var color = data.getItemVisual(idx, 'color');
+
+	                group.add(itemGroup);
+
+	                polyline.useStyle(
+	                    zrUtil.defaults(
+	                        itemModel.getModel('lineStyle.normal').getLineStyle(),
+	                        {
+	                            fill: 'none',
+	                            stroke: color
+	                        }
+	                    )
+	                );
+	                polyline.hoverStyle = itemModel.getModel('lineStyle.emphasis').getLineStyle();
+
+	                var areaStyleModel = itemModel.getModel('areaStyle.normal');
+	                var hoverAreaStyleModel = itemModel.getModel('areaStyle.emphasis');
+	                var polygonIgnore = areaStyleModel.isEmpty() && areaStyleModel.parentModel.isEmpty();
+	                var hoverPolygonIgnore = hoverAreaStyleModel.isEmpty() && hoverAreaStyleModel.parentModel.isEmpty();
+
+	                hoverPolygonIgnore = hoverPolygonIgnore && polygonIgnore;
+	                polygon.ignore = polygonIgnore;
+
+	                polygon.useStyle(
+	                    zrUtil.defaults(
+	                        areaStyleModel.getAreaStyle(),
+	                        {
+	                            fill: color,
+	                            opacity: 0.7
+	                        }
+	                    )
+	                );
+	                polygon.hoverStyle = hoverAreaStyleModel.getAreaStyle();
+
+	                var itemStyle = itemModel.getModel('itemStyle.normal').getItemStyle(['color']);
+	                var itemHoverStyle = itemModel.getModel('itemStyle.emphasis').getItemStyle();
+	                var labelModel = itemModel.getModel('label.normal');
+	                var labelHoverModel = itemModel.getModel('label.emphasis');
+	                symbolGroup.eachChild(function (symbolPath) {
+	                    symbolPath.setStyle(itemStyle);
+	                    symbolPath.hoverStyle = zrUtil.clone(itemHoverStyle);
+
+	                    var defaultText = data.get(data.dimensions[symbolPath.__dimIdx], idx);
+	                    graphic.setText(symbolPath.style, labelModel, color);
+	                    symbolPath.setStyle({
+	                        text: labelModel.get('show') ? zrUtil.retrieve(
+	                            seriesModel.getFormattedLabel(
+	                                idx, 'normal', null, symbolPath.__dimIdx
+	                            ),
+	                            defaultText
+	                        ) : ''
+	                    });
+
+	                    graphic.setText(symbolPath.hoverStyle, labelHoverModel, color);
+	                    symbolPath.hoverStyle.text = labelHoverModel.get('show') ? zrUtil.retrieve(
+	                        seriesModel.getFormattedLabel(
+	                            idx, 'emphasis', null, symbolPath.__dimIdx
+	                        ),
+	                        defaultText
+	                    ) : '';
+	                });
+
+	                function onEmphasis() {
+	                    polygon.attr('ignore', hoverPolygonIgnore);
+	                }
+
+	                function onNormal() {
+	                    polygon.attr('ignore', polygonIgnore);
+	                }
+
+	                itemGroup.off('mouseover').off('mouseout').off('normal').off('emphasis');
+	                itemGroup.on('emphasis', onEmphasis)
+	                    .on('mouseover', onEmphasis)
+	                    .on('normal', onNormal)
+	                    .on('mouseout', onNormal);
+
+	                graphic.setHoverStyle(itemGroup);
+	            });
+
+	            this._data = data;
+	        },
+
+	        remove: function () {
+	            this.group.removeAll();
+	            this._data = null;
+	        }
+	    });
+
+
+/***/ },
+/* 159 */
+/***/ function(module, exports) {
+
+	
+
+	    module.exports = function (ecModel) {
+	        ecModel.eachSeriesByType('radar', function (seriesModel) {
+	            var data = seriesModel.getData();
+	            var points = [];
+	            var coordSys = seriesModel.coordinateSystem;
+	            if (!coordSys) {
+	                return;
+	            }
+
+	            function pointsConverter(val, idx) {
+	                points[idx] = points[idx] || [];
+	                points[idx][i] = coordSys.dataToPoint(val, i);
+	            }
+	            for (var i = 0; i < coordSys.getIndicatorAxes().length; i++) {
+	                var dim = data.dimensions[i];
+	                data.each(dim, pointsConverter);
+	            }
+
+	            data.each(function (idx) {
+	                // Close polygon
+	                points[idx][0] && points[idx].push(points[idx][0].slice());
+	                data.setItemLayout(idx, points[idx]);
+	            });
+	        });
+	    };
+
+
+/***/ },
+/* 160 */
+/***/ function(module, exports, __webpack_require__) {
+
+	// Backward compat for radar chart in 2
+
+
+	    var zrUtil = __webpack_require__(4);
+
+	    module.exports = function (option) {
+	        var polarOptArr = option.polar;
+	        if (polarOptArr) {
+	            if (!zrUtil.isArray(polarOptArr)) {
+	                polarOptArr = [polarOptArr];
+	            }
+	            var polarNotRadar = [];
+	            zrUtil.each(polarOptArr, function (polarOpt, idx) {
+	                if (polarOpt.indicator) {
+	                    if (polarOpt.type && !polarOpt.shape) {
+	                        polarOpt.shape = polarOpt.type;
+	                    }
+	                    option.radar = option.radar || [];
+	                    if (!zrUtil.isArray(option.radar)) {
+	                        option.radar = [option.radar];
+	                    }
+	                    option.radar.push(polarOpt);
+	                }
+	                else {
+	                    polarNotRadar.push(polarOpt);
+	                }
+	            });
+	            option.polar = polarNotRadar;
+	        }
+	        zrUtil.each(option.series, function (seriesOpt) {
+	            if (seriesOpt.type === 'radar' && seriesOpt.polarIndex) {
+	                seriesOpt.radarIndex = seriesOpt.polarIndex;
+	            }
+	        });
+	    };
+
+
+/***/ },
+/* 161 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var echarts = __webpack_require__(1);
+	    var PRIORITY = echarts.PRIORITY;
+
+	    __webpack_require__(162);
+
+	    __webpack_require__(172);
+
+	    __webpack_require__(176);
+
+	    __webpack_require__(163);
+
+	    echarts.registerLayout(__webpack_require__(178));
+
+	    echarts.registerVisual(__webpack_require__(179));
+
+	    echarts.registerProcessor(PRIORITY.PROCESSOR.STATISTIC, __webpack_require__(180));
+
+	    echarts.registerPreprocessor(__webpack_require__(181));
+
+	    __webpack_require__(142)('map', [{
+	        type: 'mapToggleSelect',
+	        event: 'mapselectchanged',
+	        method: 'toggleSelected'
+	    }, {
+	        type: 'mapSelect',
+	        event: 'mapselected',
+	        method: 'select'
+	    }, {
+	        type: 'mapUnSelect',
+	        event: 'mapunselected',
+	        method: 'unSelect'
+	    }]);
+
+
+/***/ },
+/* 162 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var List = __webpack_require__(97);
+	    var SeriesModel = __webpack_require__(28);
+	    var zrUtil = __webpack_require__(4);
+	    var completeDimensions = __webpack_require__(102);
+
+	    var formatUtil = __webpack_require__(6);
+	    var encodeHTML = formatUtil.encodeHTML;
+	    var addCommas = formatUtil.addCommas;
+
+	    var dataSelectableMixin = __webpack_require__(140);
+
+	    var geoCreator = __webpack_require__(163);
+
+	    var MapSeries = SeriesModel.extend({
+
+	        type: 'series.map',
+
+	        layoutMode: 'box',
+
+	        /**
+	         * Only first map series of same mapType will drawMap
+	         * @type {boolean}
+	         */
+	        needsDrawMap: false,
+
+	        /**
+	         * Group of all map series with same mapType
+	         * @type {boolean}
+	         */
+	        seriesGroup: [],
+
+	        init: function (option) {
+
+	            option = this._fillOption(option, option.map);
+	            this.option = option;
+
+	            MapSeries.superApply(this, 'init', arguments);
+
+	            this.updateSelectedMap(option.data);
+	        },
+
+	        getInitialData: function (option) {
+	            var dimensions = completeDimensions(['value'], option.data || []);
+
+	            var list = new List(dimensions, this);
+
+	            list.initData(option.data);
+
+	            return list;
+	        },
+
+	        mergeOption: function (newOption) {
+	            if (newOption.data) {
+	                newOption = this._fillOption(newOption, this.option.map);
+	            }
+
+	            MapSeries.superCall(this, 'mergeOption', newOption);
+
+	            this.updateSelectedMap(this.option.data);
+	        },
+
+	        _fillOption: function (option, mapName) {
+	            // Shallow clone
+	            option = zrUtil.extend({}, option);
+
+	            option.data = geoCreator.getFilledRegions(option.data, mapName);
+
+	            return option;
+	        },
+
+	        getRawValue: function (dataIndex) {
+	            // Use value stored in data instead because it is calculated from multiple series
+	            // FIXME Provide all value of multiple series ?
+	            return this._data.get('value', dataIndex);
+	        },
+
+	        /**
+	         * Get model of region
+	         * @param  {string} name
+	         * @return {module:echarts/model/Model}
+	         */
+	        getRegionModel: function (regionName) {
+	            var data = this.getData();
+	            return data.getItemModel(data.indexOfName(regionName));
+	        },
+
+	        /**
+	         * Map tooltip formatter
+	         *
+	         * @param {number} dataIndex
+	         */
+	        formatTooltip: function (dataIndex) {
+	            // FIXME orignalData and data is a bit confusing
+	            var data = this.getData();
+	            var formattedValue = addCommas(this.getRawValue(dataIndex));
+	            var name = data.getName(dataIndex);
+
+	            var seriesGroup = this.seriesGroup;
+	            var seriesNames = [];
+	            for (var i = 0; i < seriesGroup.length; i++) {
+	                var otherIndex = seriesGroup[i].originalData.indexOfName(name);
+	                if (!isNaN(seriesGroup[i].originalData.get('value', otherIndex))) {
+	                    seriesNames.push(
+	                        encodeHTML(seriesGroup[i].name)
+	                    );
+	                }
+	            }
+
+	            return seriesNames.join(', ') + '<br />'
+	                + name + ' : ' + formattedValue;
+	        },
+
+	        defaultOption: {
+	            // 一级层叠
+	            zlevel: 0,
+	            // 二级层叠
+	            z: 2,
+	            coordinateSystem: 'geo',
+	            // 各省的 map 暂时都用中文
+	            map: 'china',
+
+	            // 'center' | 'left' | 'right' | 'x%' | {number}
+	            left: 'center',
+	            // 'center' | 'top' | 'bottom' | 'x%' | {number}
+	            top: 'center',
+	            // right
+	            // bottom
+	            // width:
+	            // height
+
+	            // Aspect is width / height. Inited to be geoJson bbox aspect
+	            // This parameter is used for scale this aspect
+	            aspectScale: 0.75,
+
+	            ///// Layout with center and size
+	            // If you wan't to put map in a fixed size box with right aspect ratio
+	            // This two properties may more conveninet
+	            // layoutCenter: [50%, 50%]
+	            // layoutSize: 100
+
+
+	            // 数值合并方式，默认加和，可选为：
+	            // 'sum' | 'average' | 'max' | 'min'
+	            // mapValueCalculation: 'sum',
+	            // 地图数值计算结果小数精度
+	            // mapValuePrecision: 0,
+
+
+	            // 显示图例颜色标识（系列标识的小圆点），图例开启时有效
+	            showLegendSymbol: true,
+	            // 选择模式，默认关闭，可选single，multiple
+	            // selectedMode: false,
+	            dataRangeHoverLink: true,
+	            // 是否开启缩放及漫游模式
+	            // roam: false,
+
+	            // Default on center of map
+	            center: null,
+
+	            zoom: 1,
+
+	            scaleLimit: null,
+
+	            label: {
+	                normal: {
+	                    show: false,
+	                    textStyle: {
+	                        color: '#000'
+	                    }
+	                },
+	                emphasis: {
+	                    show: true,
+	                    textStyle: {
+	                        color: 'rgb(100,0,0)'
+	                    }
+	                }
+	            },
+	            // scaleLimit: null,
+	            itemStyle: {
+	                normal: {
+	                    // color: 各异,
+	                    borderWidth: 0.5,
+	                    borderColor: '#444',
+	                    areaColor: '#eee'
+	                },
+	                // 也是选中样式
+	                emphasis: {
+	                    areaColor: 'rgba(255,215,0,0.8)'
+	                }
+	            }
+	        },
+
+	        setZoom: function (zoom) {
+	            this.option.zoom = zoom;
+	        },
+
+	        setCenter: function (center) {
+	            this.option.center = center;
+	        }
+	    });
+
+	    zrUtil.mixin(MapSeries, dataSelectableMixin);
+
+	    module.exports = MapSeries;
+
+
+/***/ },
+/* 163 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var Geo = __webpack_require__(164);
+
+	    var layout = __webpack_require__(21);
+	    var zrUtil = __webpack_require__(4);
+	    var numberUtil = __webpack_require__(7);
+
+	    var mapDataStores = {};
+
+	    /**
+	     * Resize method bound to the geo
+	     * @param {module:echarts/coord/geo/GeoModel|module:echarts/chart/map/MapModel} geoModel
+	     * @param {module:echarts/ExtensionAPI} api
+	     */
+	    function resizeGeo (geoModel, api) {
+	        var rect = this.getBoundingRect();
+
+	        var boxLayoutOption;
+
+	        var center = geoModel.get('layoutCenter');
+	        var size = geoModel.get('layoutSize');
+
+	        var viewWidth = api.getWidth();
+	        var viewHeight = api.getHeight();
+
+	        var aspectScale = geoModel.get('aspectScale') || 0.75;
+	        var aspect = rect.width / rect.height * aspectScale;
+
+	        var useCenterAndSize = false;
+	        if (center && size) {
+	            center = [
+	                numberUtil.parsePercent(center[0], viewWidth),
+	                numberUtil.parsePercent(center[1], viewHeight)
+	            ];
+	            size = numberUtil.parsePercent(size, Math.min(viewWidth, viewHeight));
+
+	            if (!isNaN(center[0]) && !isNaN(center[1]) && !isNaN(size)) {
+	                useCenterAndSize = true;
+	            }
+	            else {
+	                if (true) {
+	                    console.warn('Given layoutCenter or layoutSize data are invalid. Use left/top/width/height instead.');
+	                }
+	            }
+	        }
+
+	        var viewRect;
+	        if (useCenterAndSize) {
+	            var viewRect = {};
+	            if (aspect > 1) {
+	                // Width is same with size
+	                viewRect.width = size;
+	                viewRect.height = size / aspect;
+	            }
+	            else {
+	                viewRect.height = size;
+	                viewRect.width = size * aspect;
+	            }
+	            viewRect.y = center[1] - viewRect.height / 2;
+	            viewRect.x = center[0] - viewRect.width / 2;
+	        }
+	        else {
+	            // Use left/top/width/height
+	            boxLayoutOption = geoModel.getBoxLayoutParams();
+
+	            // 0.75 rate
+	            boxLayoutOption.aspect = aspect;
+
+	            viewRect = layout.getLayoutRect(boxLayoutOption, {
+	                width: viewWidth,
+	                height: viewHeight
+	            });
+	        }
+
+	        this.setViewRect(viewRect.x, viewRect.y, viewRect.width, viewRect.height);
+
+	        this.setCenter(geoModel.get('center'));
+	        this.setZoom(geoModel.get('zoom'));
+	    }
+
+	    /**
+	     * @param {module:echarts/coord/Geo} geo
+	     * @param {module:echarts/model/Model} model
+	     * @inner
+	     */
+	    function setGeoCoords(geo, model) {
+	        zrUtil.each(model.get('geoCoord'), function (geoCoord, name) {
+	            geo.addGeoCoord(name, geoCoord);
+	        });
+	    }
+
+	    if (true) {
+	        var mapNotExistsError = function (name) {
+	            console.error('Map ' + name + ' not exists. You can download map file on http://echarts.baidu.com/download-map.html');
+	        };
+	    }
+
+	    var geoCreator = {
+
+	        // For deciding which dimensions to use when creating list data
+	        dimensions: Geo.prototype.dimensions,
+
+	        create: function (ecModel, api) {
+	            var geoList = [];
+
+	            // FIXME Create each time may be slow
+	            ecModel.eachComponent('geo', function (geoModel, idx) {
+	                var name = geoModel.get('map');
+	                var mapData = mapDataStores[name];
+	                if (true) {
+	                    if (!mapData) {
+	                        mapNotExistsError(name);
+	                    }
+	                }
+	                var geo = new Geo(
+	                    name + idx, name,
+	                    mapData && mapData.geoJson, mapData && mapData.specialAreas,
+	                    geoModel.get('nameMap')
+	                );
+	                geo.zoomLimit = geoModel.get('scaleLimit');
+	                geoList.push(geo);
+
+	                setGeoCoords(geo, geoModel);
+
+	                geoModel.coordinateSystem = geo;
+	                geo.model = geoModel;
+
+	                // Inject resize method
+	                geo.resize = resizeGeo;
+
+	                geo.resize(geoModel, api);
+	            });
+
+	            ecModel.eachSeries(function (seriesModel) {
+	                var coordSys = seriesModel.get('coordinateSystem');
+	                if (coordSys === 'geo') {
+	                    var geoIndex = seriesModel.get('geoIndex') || 0;
+	                    seriesModel.coordinateSystem = geoList[geoIndex];
+	                }
+	            });
+
+	            // If has map series
+	            var mapModelGroupBySeries = {};
+
+	            ecModel.eachSeriesByType('map', function (seriesModel) {
+	                var mapType = seriesModel.get('map');
+
+	                mapModelGroupBySeries[mapType] = mapModelGroupBySeries[mapType] || [];
+
+	                mapModelGroupBySeries[mapType].push(seriesModel);
+	            });
+
+	            zrUtil.each(mapModelGroupBySeries, function (mapSeries, mapType) {
+	                var mapData = mapDataStores[mapType];
+	                if (true) {
+	                    if (!mapData) {
+	                        mapNotExistsError(mapSeries[0].get('map'));
+	                    }
+	                }
+
+	                var nameMapList = zrUtil.map(mapSeries, function (singleMapSeries) {
+	                    return singleMapSeries.get('nameMap');
+	                });
+	                var geo = new Geo(
+	                    mapType, mapType,
+	                    mapData && mapData.geoJson, mapData && mapData.specialAreas,
+	                    zrUtil.mergeAll(nameMapList)
+	                );
+	                geo.zoomLimit = zrUtil.retrieve.apply(null, zrUtil.map(mapSeries, function (singleMapSeries) {
+	                    return singleMapSeries.get('scaleLimit');
+	                }));
+	                geoList.push(geo);
+
+	                // Inject resize method
+	                geo.resize = resizeGeo;
+
+	                geo.resize(mapSeries[0], api);
+
+	                zrUtil.each(mapSeries, function (singleMapSeries) {
+	                    singleMapSeries.coordinateSystem = geo;
+
+	                    setGeoCoords(geo, singleMapSeries);
+	                });
+	            });
+
+	            return geoList;
+	        },
+
+	        /**
+	         * @param {string} mapName
+	         * @param {Object|string} geoJson
+	         * @param {Object} [specialAreas]
+	         *
+	         * @example
+	         *     $.get('USA.json', function (geoJson) {
+	         *         echarts.registerMap('USA', geoJson);
+	         *         // Or
+	         *         echarts.registerMap('USA', {
+	         *             geoJson: geoJson,
+	         *             specialAreas: {}
+	         *         })
+	         *     });
+	         */
+	        registerMap: function (mapName, geoJson, specialAreas) {
+	            if (geoJson.geoJson && !geoJson.features) {
+	                specialAreas = geoJson.specialAreas;
+	                geoJson = geoJson.geoJson;
+	            }
+	            if (typeof geoJson === 'string') {
+	                geoJson = (typeof JSON !== 'undefined' && JSON.parse)
+	                    ? JSON.parse(geoJson) : (new Function('return (' + geoJson + ');'))();
+	            }
+	            mapDataStores[mapName] = {
+	                geoJson: geoJson,
+	                specialAreas: specialAreas
+	            };
+	        },
+
+	        /**
+	         * @param {string} mapName
+	         * @return {Object}
+	         */
+	        getMap: function (mapName) {
+	            return mapDataStores[mapName];
+	        },
+
+	        /**
+	         * Fill given regions array
+	         * @param  {Array.<Object>} originRegionArr
+	         * @param  {string} mapName
+	         * @return {Array}
+	         */
+	        getFilledRegions: function (originRegionArr, mapName) {
+	            // Not use the original
+	            var regionsArr = (originRegionArr || []).slice();
+
+	            var map = geoCreator.getMap(mapName);
+	            var geoJson = map && map.geoJson;
+	            if (!geoJson) {
+	                if (true) {
+	                    mapNotExistsError(mapName);
+	                }
+	                return originRegionArr;
+	            }
+
+	            var dataNameMap = {};
+	            var features = geoJson.features;
+	            for (var i = 0; i < regionsArr.length; i++) {
+	                dataNameMap[regionsArr[i].name] = regionsArr[i];
+	            }
+
+	            for (var i = 0; i < features.length; i++) {
+	                var name = features[i].properties.name;
+	                if (!dataNameMap[name]) {
+	                    regionsArr.push({
+	                        name: name
+	                    });
+	                }
+	            }
+	            return regionsArr;
+	        }
+	    };
+
+	    // Inject methods into echarts
+	    var echarts = __webpack_require__(1);
+
+	    echarts.registerMap = geoCreator.registerMap;
+
+	    echarts.getMap = geoCreator.getMap;
+
+	    // TODO
+	    echarts.loadMap = function () {};
+
+	    echarts.registerCoordinateSystem('geo', geoCreator);
+
+	    module.exports = geoCreator;
+
+
+/***/ },
+/* 164 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var parseGeoJson = __webpack_require__(165);
+
+	    var zrUtil = __webpack_require__(4);
+
+	    var BoundingRect = __webpack_require__(9);
+
+	    var View = __webpack_require__(168);
+
+
+	    // Geo fix functions
+	    var geoFixFuncs = [
+	        __webpack_require__(169),
+	        __webpack_require__(170),
+	        __webpack_require__(171)
+	    ];
+
+	    /**
+	     * [Geo description]
+	     * @param {string} name Geo name
+	     * @param {string} map Map type
+	     * @param {Object} geoJson
+	     * @param {Object} [specialAreas]
+	     *        Specify the positioned areas by left, top, width, height
+	     * @param {Object.<string, string>} [nameMap]
+	     *        Specify name alias
+	     */
+	    function Geo(name, map, geoJson, specialAreas, nameMap) {
+
+	        View.call(this, name);
+
+	        /**
+	         * Map type
+	         * @type {string}
+	         */
+	        this.map = map;
+
+	        this._nameCoordMap = {};
+
+	        this.loadGeoJson(geoJson, specialAreas, nameMap);
+	    }
+
+	    Geo.prototype = {
+
+	        constructor: Geo,
+
+	        type: 'geo',
+
+	        /**
+	         * @param {Array.<string>}
+	         * @readOnly
+	         */
+	        dimensions: ['lng', 'lat'],
+
+	        /**
+	         * If contain given lng,lat coord
+	         * @param {Array.<number>}
+	         * @readOnly
+	         */
+	        containCoord: function (coord) {
+	            var regions = this.regions;
+	            for (var i = 0; i < regions.length; i++) {
+	                if (regions[i].contain(coord)) {
+	                    return true;
+	                }
+	            }
+	            return false;
+	        },
+	        /**
+	         * @param {Object} geoJson
+	         * @param {Object} [specialAreas]
+	         *        Specify the positioned areas by left, top, width, height
+	         * @param {Object.<string, string>} [nameMap]
+	         *        Specify name alias
+	         */
+	        loadGeoJson: function (geoJson, specialAreas, nameMap) {
+	            // https://jsperf.com/try-catch-performance-overhead
+	            try {
+	                this.regions = geoJson ? parseGeoJson(geoJson) : [];
+	            }
+	            catch (e) {
+	                throw 'Invalid geoJson format\n' + e;
+	            }
+	            specialAreas = specialAreas || {};
+	            nameMap = nameMap || {};
+	            var regions = this.regions;
+	            var regionsMap = {};
+	            for (var i = 0; i < regions.length; i++) {
+	                var regionName = regions[i].name;
+	                // Try use the alias in nameMap
+	                regionName = nameMap[regionName] || regionName;
+	                regions[i].name = regionName;
+
+	                regionsMap[regionName] = regions[i];
+	                // Add geoJson
+	                this.addGeoCoord(regionName, regions[i].center);
+
+	                // Some area like Alaska in USA map needs to be tansformed
+	                // to look better
+	                var specialArea = specialAreas[regionName];
+	                if (specialArea) {
+	                    regions[i].transformTo(
+	                        specialArea.left, specialArea.top, specialArea.width, specialArea.height
+	                    );
+	                }
+	            }
+
+	            this._regionsMap = regionsMap;
+
+	            this._rect = null;
+
+	            zrUtil.each(geoFixFuncs, function (fixFunc) {
+	                fixFunc(this);
+	            }, this);
+	        },
+
+	        // Overwrite
+	        transformTo: function (x, y, width, height) {
+	            var rect = this.getBoundingRect();
+
+	            rect = rect.clone();
+	            // Longitute is inverted
+	            rect.y = -rect.y - rect.height;
+
+	            var viewTransform = this._viewTransform;
+
+	            viewTransform.transform = rect.calculateTransform(
+	                new BoundingRect(x, y, width, height)
+	            );
+
+	            viewTransform.decomposeTransform();
+
+	            var scale = viewTransform.scale;
+	            scale[1] = -scale[1];
+
+	            viewTransform.updateTransform();
+
+	            this._updateTransform();
+	        },
+
+	        /**
+	         * @param {string} name
+	         * @return {module:echarts/coord/geo/Region}
+	         */
+	        getRegion: function (name) {
+	            return this._regionsMap[name];
+	        },
+
+	        getRegionByCoord: function (coord) {
+	            var regions = this.regions;
+	            for (var i = 0; i < regions.length; i++) {
+	                if (regions[i].contain(coord)) {
+	                    return regions[i];
+	                }
+	            }
+	        },
+
+	        /**
+	         * Add geoCoord for indexing by name
+	         * @param {string} name
+	         * @param {Array.<number>} geoCoord
+	         */
+	        addGeoCoord: function (name, geoCoord) {
+	            this._nameCoordMap[name] = geoCoord;
+	        },
+
+	        /**
+	         * Get geoCoord by name
+	         * @param {string} name
+	         * @return {Array.<number>}
+	         */
+	        getGeoCoord: function (name) {
+	            return this._nameCoordMap[name];
+	        },
+
+	        // Overwrite
+	        getBoundingRect: function () {
+	            if (this._rect) {
+	                return this._rect;
+	            }
+	            var rect;
+
+	            var regions = this.regions;
+	            for (var i = 0; i < regions.length; i++) {
+	                var regionRect = regions[i].getBoundingRect();
+	                rect = rect || regionRect.clone();
+	                rect.union(regionRect);
+	            }
+	            // FIXME Always return new ?
+	            return (this._rect = rect || new BoundingRect(0, 0, 0, 0));
+	        },
+
+	        /**
+	         * Convert series data to a list of points
+	         * @param {module:echarts/data/List} data
+	         * @param {boolean} stack
+	         * @return {Array}
+	         *  Return list of points. For example:
+	         *  `[[10, 10], [20, 20], [30, 30]]`
+	         */
+	        dataToPoints: function (data) {
+	            var item = [];
+	            return data.mapArray(['lng', 'lat'], function (lon, lat) {
+	                item[0] = lon;
+	                item[1] = lat;
+	                return this.dataToPoint(item);
+	            }, this);
+	        },
+
+	        // Overwrite
+	        /**
+	         * @param {string|Array.<number>} data
+	         * @return {Array.<number>}
+	         */
+	        dataToPoint: function (data) {
+	            if (typeof data === 'string') {
+	                // Map area name to geoCoord
+	                data = this.getGeoCoord(data);
+	            }
+	            if (data) {
+	                return View.prototype.dataToPoint.call(this, data);
+	            }
+	        }
+	    };
+
+	    zrUtil.mixin(Geo, View);
+
+	    module.exports = Geo;
+
+
+/***/ },
+/* 165 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * Parse and decode geo json
+	 * @module echarts/coord/geo/parseGeoJson
+	 */
+
+
+	    var zrUtil = __webpack_require__(4);
+
+	    var Region = __webpack_require__(166);
+
+	    function decode(json) {
+	        if (!json.UTF8Encoding) {
+	            return json;
+	        }
+	        var features = json.features;
+
+	        for (var f = 0; f < features.length; f++) {
+	            var feature = features[f];
+	            var geometry = feature.geometry;
+	            var coordinates = geometry.coordinates;
+	            var encodeOffsets = geometry.encodeOffsets;
+
+	            for (var c = 0; c < coordinates.length; c++) {
+	                var coordinate = coordinates[c];
+
+	                if (geometry.type === 'Polygon') {
+	                    coordinates[c] = decodePolygon(
+	                        coordinate,
+	                        encodeOffsets[c]
+	                    );
+	                }
+	                else if (geometry.type === 'MultiPolygon') {
+	                    for (var c2 = 0; c2 < coordinate.length; c2++) {
+	                        var polygon = coordinate[c2];
+	                        coordinate[c2] = decodePolygon(
+	                            polygon,
+	                            encodeOffsets[c][c2]
+	                        );
+	                    }
+	                }
+	            }
+	        }
+	        // Has been decoded
+	        json.UTF8Encoding = false;
+	        return json;
+	    }
+
+	    function decodePolygon(coordinate, encodeOffsets) {
+	        var result = [];
+	        var prevX = encodeOffsets[0];
+	        var prevY = encodeOffsets[1];
+
+	        for (var i = 0; i < coordinate.length; i += 2) {
+	            var x = coordinate.charCodeAt(i) - 64;
+	            var y = coordinate.charCodeAt(i + 1) - 64;
+	            // ZigZag decoding
+	            x = (x >> 1) ^ (-(x & 1));
+	            y = (y >> 1) ^ (-(y & 1));
+	            // Delta deocding
+	            x += prevX;
+	            y += prevY;
+
+	            prevX = x;
+	            prevY = y;
+	            // Dequantize
+	            result.push([x / 1024, y / 1024]);
+	        }
+
+	        return result;
+	    }
+
+	    /**
+	     * @inner
+	     */
+	    function flattern2D(array) {
+	        var ret = [];
+	        for (var i = 0; i < array.length; i++) {
+	            for (var k = 0; k < array[i].length; k++) {
+	                ret.push(array[i][k]);
+	            }
+	        }
+	        return ret;
+	    }
+
+	    /**
+	     * @alias module:echarts/coord/geo/parseGeoJson
+	     * @param {Object} geoJson
+	     * @return {module:zrender/container/Group}
+	     */
+	    module.exports = function (geoJson) {
+
+	        decode(geoJson);
+
+	        return zrUtil.map(zrUtil.filter(geoJson.features, function (featureObj) {
+	            // Output of mapshaper may have geometry null
+	            return featureObj.geometry && featureObj.properties;
+	        }), function (featureObj) {
+	            var properties = featureObj.properties;
+	            var geometry = featureObj.geometry;
+
+	            var coordinates = geometry.coordinates;
+
+	            if (geometry.type === 'MultiPolygon') {
+	                coordinates = flattern2D(coordinates);
+	            }
+
+	            return new Region(
+	                properties.name,
+	                coordinates,
+	                properties.cp
+	            );
+	        });
+	    };
+
+
+/***/ },
+/* 166 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @module echarts/coord/geo/Region
+	 */
+
+
+	    var polygonContain = __webpack_require__(167);
+
+	    var BoundingRect = __webpack_require__(9);
+
+	    var bbox = __webpack_require__(51);
+	    var vec2 = __webpack_require__(10);
+
+	    /**
+	     * @param {string} name
+	     * @param {Array} contours
+	     * @param {Array.<number>} cp
+	     */
+	    function Region(name, contours, cp) {
+
+	        /**
+	         * @type {string}
+	         * @readOnly
+	         */
+	        this.name = name;
+
+	        /**
+	         * @type {Array.<Array>}
+	         * @readOnly
+	         */
+	        this.contours = contours;
+
+	        if (!cp) {
+	            var rect = this.getBoundingRect();
+	            cp = [
+	                rect.x + rect.width / 2,
+	                rect.y + rect.height / 2
+	            ];
+	        }
+	        else {
+	            cp = [cp[0], cp[1]];
+	        }
+	        /**
+	         * @type {Array.<number>}
+	         */
+	        this.center = cp;
+	    }
+
+	    Region.prototype = {
+
+	        constructor: Region,
+
+	        /**
+	         * @return {module:zrender/core/BoundingRect}
+	         */
+	        getBoundingRect: function () {
+	            var rect = this._rect;
+	            if (rect) {
+	                return rect;
+	            }
+
+	            var MAX_NUMBER = Number.MAX_VALUE;
+	            var min = [MAX_NUMBER, MAX_NUMBER];
+	            var max = [-MAX_NUMBER, -MAX_NUMBER];
+	            var min2 = [];
+	            var max2 = [];
+	            var contours = this.contours;
+	            for (var i = 0; i < contours.length; i++) {
+	                bbox.fromPoints(contours[i], min2, max2);
+	                vec2.min(min, min, min2);
+	                vec2.max(max, max, max2);
+	            }
+	            // No data
+	            if (i === 0) {
+	                min[0] = min[1] = max[0] = max[1] = 0;
+	            }
+
+	            return (this._rect = new BoundingRect(
+	                min[0], min[1], max[0] - min[0], max[1] - min[1]
+	            ));
+	        },
+
+	        /**
+	         * @param {<Array.<number>} coord
+	         * @return {boolean}
+	         */
+	        contain: function (coord) {
+	            var rect = this.getBoundingRect();
+	            var contours = this.contours;
+	            if (rect.contain(coord[0], coord[1])) {
+	                for (var i = 0, len = contours.length; i < len; i++) {
+	                    if (polygonContain.contain(contours[i], coord[0], coord[1])) {
+	                        return true;
+	                    }
+	                }
+	            }
+	            return false;
+	        },
+
+	        transformTo: function (x, y, width, height) {
+	            var rect = this.getBoundingRect();
+	            var aspect = rect.width / rect.height;
+	            if (!width) {
+	                width = aspect * height;
+	            }
+	            else if (!height) {
+	                height = width / aspect ;
+	            }
+	            var target = new BoundingRect(x, y, width, height);
+	            var transform = rect.calculateTransform(target);
+	            var contours = this.contours;
+	            for (var i = 0; i < contours.length; i++) {
+	                for (var p = 0; p < contours[i].length; p++) {
+	                    vec2.applyTransform(contours[i][p], contours[i][p], transform);
+	                }
+	            }
+	            rect = this._rect;
+	            rect.copy(target);
+	            // Update center
+	            this.center = [
+	                rect.x + rect.width / 2,
+	                rect.y + rect.height / 2
+	            ];
+	        }
+	    };
+
+	    module.exports = Region;
+
+
+/***/ },
+/* 167 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var windingLine = __webpack_require__(58);
+
+	    var EPSILON = 1e-8;
+
+	    function isAroundEqual(a, b) {
+	        return Math.abs(a - b) < EPSILON;
+	    }
+
+	    function contain(points, x, y) {
+	        var w = 0;
+	        var p = points[0];
+
+	        if (!p) {
+	            return false;
+	        }
+
+	        for (var i = 1; i < points.length; i++) {
+	            var p2 = points[i];
+	            w += windingLine(p[0], p[1], p2[0], p2[1], x, y);
+	            p = p2;
+	        }
+
+	        // Close polygon
+	        var p0 = points[0];
+	        if (!isAroundEqual(p[0], p0[0]) || !isAroundEqual(p[1], p0[1])) {
+	            w += windingLine(p[0], p[1], p0[0], p0[1], x, y);
+	        }
+
+	        return w !== 0;
+	    }
+
+
+	    module.exports = {
+	        contain: contain
+	    };
+
+
+/***/ },
+/* 168 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * Simple view coordinate system
+	 * Mapping given x, y to transformd view x, y
+	 */
+
+
+	    var vector = __webpack_require__(10);
+	    var matrix = __webpack_require__(11);
+
+	    var Transformable = __webpack_require__(34);
+	    var zrUtil = __webpack_require__(4);
+
+	    var BoundingRect = __webpack_require__(9);
+
+	    var v2ApplyTransform = vector.applyTransform;
+
+	    // Dummy transform node
+	    function TransformDummy() {
+	        Transformable.call(this);
+	    }
+	    zrUtil.mixin(TransformDummy, Transformable);
+
+	    function View(name) {
+	        /**
+	         * @type {string}
+	         */
+	        this.name = name;
+
+	        /**
+	         * @type {Object}
+	         */
+	        this.zoomLimit;
+
+	        Transformable.call(this);
+
+	        this._roamTransform = new TransformDummy();
+
+	        this._viewTransform = new TransformDummy();
+
+	        this._center;
+	        this._zoom;
+	    }
+
+	    View.prototype = {
+
+	        constructor: View,
+
+	        type: 'view',
+
+	        /**
+	         * @param {Array.<string>}
+	         * @readOnly
+	         */
+	        dimensions: ['x', 'y'],
+
+	        /**
+	         * Set bounding rect
+	         * @param {number} x
+	         * @param {number} y
+	         * @param {number} width
+	         * @param {number} height
+	         */
+
+	        // PENDING to getRect
+	        setBoundingRect: function (x, y, width, height) {
+	            this._rect = new BoundingRect(x, y, width, height);
+	            return this._rect;
+	        },
+
+	        /**
+	         * @return {module:zrender/core/BoundingRect}
+	         */
+	        // PENDING to getRect
+	        getBoundingRect: function () {
+	            return this._rect;
+	        },
+
+	        /**
+	         * @param {number} x
+	         * @param {number} y
+	         * @param {number} width
+	         * @param {number} height
+	         */
+	        setViewRect: function (x, y, width, height) {
+	            width = width;
+	            height = height;
+	            this.transformTo(x, y, width, height);
+	            this._viewRect = new BoundingRect(x, y, width, height);
+	        },
+
+	        /**
+	         * Transformed to particular position and size
+	         * @param {number} x
+	         * @param {number} y
+	         * @param {number} width
+	         * @param {number} height
+	         */
+	        transformTo: function (x, y, width, height) {
+	            var rect = this.getBoundingRect();
+	            var viewTransform = this._viewTransform;
+
+	            viewTransform.transform = rect.calculateTransform(
+	                new BoundingRect(x, y, width, height)
+	            );
+
+	            viewTransform.decomposeTransform();
+
+	            this._updateTransform();
+	        },
+
+	        /**
+	         * Set center of view
+	         * @param {Array.<number>} [centerCoord]
+	         */
+	        setCenter: function (centerCoord) {
+	            if (!centerCoord) {
+	                return;
+	            }
+	            this._center = centerCoord;
+
+	            this._updateCenterAndZoom();
+	        },
+
+	        /**
+	         * @param {number} zoom
+	         */
+	        setZoom: function (zoom) {
+	            zoom = zoom || 1;
+
+	            var zoomLimit = this.zoomLimit;
+	            if (zoomLimit) {
+	                if (zoomLimit.max != null) {
+	                    zoom = Math.min(zoomLimit.max, zoom);
+	                }
+	                if (zoomLimit.min != null) {
+	                    zoom = Math.max(zoomLimit.min, zoom);
+	                }
+	            }
+	            this._zoom = zoom;
+
+	            this._updateCenterAndZoom();
+	        },
+
+	        /**
+	         * Get default center without roam
+	         */
+	        getDefaultCenter: function () {
+	            // Rect before any transform
+	            var rawRect = this.getBoundingRect();
+	            var cx = rawRect.x + rawRect.width / 2;
+	            var cy = rawRect.y + rawRect.height / 2;
+
+	            return [cx, cy];
+	        },
+
+	        getCenter: function () {
+	            return this._center || this.getDefaultCenter();
+	        },
+
+	        getZoom: function () {
+	            return this._zoom || 1;
+	        },
+
+	        /**
+	         * @return {Array.<number}
+	         */
+	        getRoamTransform: function () {
+	            return this._roamTransform;
+	        },
+
+	        _updateCenterAndZoom: function () {
+	            // Must update after view transform updated
+	            var viewTransformMatrix = this._viewTransform.getLocalTransform();
+	            var roamTransform = this._roamTransform;
+	            var defaultCenter = this.getDefaultCenter();
+	            var center = this.getCenter();
+	            var zoom = this.getZoom();
+
+	            center = vector.applyTransform([], center, viewTransformMatrix);
+	            defaultCenter = vector.applyTransform([], defaultCenter, viewTransformMatrix);
+
+	            roamTransform.origin = center;
+	            roamTransform.position = [
+	                defaultCenter[0] - center[0],
+	                defaultCenter[1] - center[1]
+	            ];
+	            roamTransform.scale = [zoom, zoom];
+
+	            this._updateTransform();
+	        },
+
+	        /**
+	         * Update transform from roam and mapLocation
+	         * @private
+	         */
+	        _updateTransform: function () {
+	            var roamTransform = this._roamTransform;
+	            var viewTransform = this._viewTransform;
+
+	            viewTransform.parent = roamTransform;
+	            roamTransform.updateTransform();
+	            viewTransform.updateTransform();
+
+	            viewTransform.transform
+	                && matrix.copy(this.transform || (this.transform = []), viewTransform.transform);
+
+	            if (this.transform) {
+	                this.invTransform = this.invTransform || [];
+	                matrix.invert(this.invTransform, this.transform);
+	            }
+	            else {
+	                this.invTransform = null;
+	            }
+	            this.decomposeTransform();
+	        },
+
+	        /**
+	         * @return {module:zrender/core/BoundingRect}
+	         */
+	        getViewRect: function () {
+	            return this._viewRect;
+	        },
+
+	        /**
+	         * Get view rect after roam transform
+	         * @return {module:zrender/core/BoundingRect}
+	         */
+	        getViewRectAfterRoam: function () {
+	            var rect = this.getBoundingRect().clone();
+	            rect.applyTransform(this.transform);
+	            return rect;
+	        },
+
+	        /**
+	         * Convert a single (lon, lat) data item to (x, y) point.
+	         * @param {Array.<number>} data
+	         * @return {Array.<number>}
+	         */
+	        dataToPoint: function (data) {
+	            var transform = this.transform;
+	            return transform
+	                ? v2ApplyTransform([], data, transform)
+	                : [data[0], data[1]];
+	        },
+
+	        /**
+	         * Convert a (x, y) point to (lon, lat) data
+	         * @param {Array.<number>} point
+	         * @return {Array.<number>}
+	         */
+	        pointToData: function (point) {
+	            var invTransform = this.invTransform;
+	            return invTransform
+	                ? v2ApplyTransform([], point, invTransform)
+	                : [point[0], point[1]];
+	        }
+
+	        /**
+	         * @return {number}
+	         */
+	        // getScalarScale: function () {
+	        //     // Use determinant square root of transform to mutiply scalar
+	        //     var m = this.transform;
+	        //     var det = Math.sqrt(Math.abs(m[0] * m[3] - m[2] * m[1]));
+	        //     return det;
+	        // }
+	    };
+
+	    zrUtil.mixin(View, Transformable);
+
+	    module.exports = View;
+
+
+/***/ },
+/* 169 */
+/***/ function(module, exports, __webpack_require__) {
+
+	// Fix for 南海诸岛
+
+
+	    var Region = __webpack_require__(166);
+
+	    var geoCoord = [126, 25];
+
+	    var points = [
+	        [[0,3.5],[7,11.2],[15,11.9],[30,7],[42,0.7],[52,0.7],
+	         [56,7.7],[59,0.7],[64,0.7],[64,0],[5,0],[0,3.5]],
+	        [[13,16.1],[19,14.7],[16,21.7],[11,23.1],[13,16.1]],
+	        [[12,32.2],[14,38.5],[15,38.5],[13,32.2],[12,32.2]],
+	        [[16,47.6],[12,53.2],[13,53.2],[18,47.6],[16,47.6]],
+	        [[6,64.4],[8,70],[9,70],[8,64.4],[6,64.4]],
+	        [[23,82.6],[29,79.8],[30,79.8],[25,82.6],[23,82.6]],
+	        [[37,70.7],[43,62.3],[44,62.3],[39,70.7],[37,70.7]],
+	        [[48,51.1],[51,45.5],[53,45.5],[50,51.1],[48,51.1]],
+	        [[51,35],[51,28.7],[53,28.7],[53,35],[51,35]],
+	        [[52,22.4],[55,17.5],[56,17.5],[53,22.4],[52,22.4]],
+	        [[58,12.6],[62,7],[63,7],[60,12.6],[58,12.6]],
+	        [[0,3.5],[0,93.1],[64,93.1],[64,0],[63,0],[63,92.4],
+	         [1,92.4],[1,3.5],[0,3.5]]
+	    ];
+	    for (var i = 0; i < points.length; i++) {
+	        for (var k = 0; k < points[i].length; k++) {
+	            points[i][k][0] /= 10.5;
+	            points[i][k][1] /= -10.5 / 0.75;
+
+	            points[i][k][0] += geoCoord[0];
+	            points[i][k][1] += geoCoord[1];
+	        }
+	    }
+	    module.exports = function (geo) {
+	        if (geo.map === 'china') {
+	            geo.regions.push(new Region(
+	                '南海诸岛', points, geoCoord
+	            ));
+	        }
+	    };
+
+
+/***/ },
+/* 170 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+
+	    var coordsOffsetMap = {
+	        '南海诸岛' : [32, 80],
+	        // 全国
+	        '广东': [0, -10],
+	        '香港': [10, 5],
+	        '澳门': [-10, 10],
+	        //'北京': [-10, 0],
+	        '天津': [5, 5]
+	    };
+
+	    module.exports = function (geo) {
+	        zrUtil.each(geo.regions, function (region) {
+	            var coordFix = coordsOffsetMap[region.name];
+	            if (coordFix) {
+	                var cp = region.center;
+	                cp[0] += coordFix[0] / 10.5;
+	                cp[1] += -coordFix[1] / (10.5 / 0.75);
+	            }
+	        });
+	    };
+
+
+/***/ },
+/* 171 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+
+	    var geoCoordMap = {
+	        'Russia': [100, 60],
+	        'United States of America': [-99, 38]
+	    };
+
+	    module.exports = function (geo) {
+	        zrUtil.each(geo.regions, function (region) {
+	            var geoCoord = geoCoordMap[region.name];
+	            if (geoCoord) {
+	                var cp = region.center;
+	                cp[0] = geoCoord[0];
+	                cp[1] = geoCoord[1];
+	            }
+	        });
+	    };
+
+
+/***/ },
+/* 172 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    // var zrUtil = require('zrender/lib/core/util');
+	    var graphic = __webpack_require__(43);
+
+	    var MapDraw = __webpack_require__(173);
+
+	    __webpack_require__(1).extendChartView({
+
+	        type: 'map',
+
+	        render: function (mapModel, ecModel, api, payload) {
+	            // Not render if it is an toggleSelect action from self
+	            if (payload && payload.type === 'mapToggleSelect'
+	                && payload.from === this.uid
+	            ) {
+	                return;
+	            }
+
+	            var group = this.group;
+	            group.removeAll();
+	            // Not update map if it is an roam action from self
+	            if (!(payload && payload.type === 'geoRoam'
+	                && payload.component === 'series'
+	                && payload.name === mapModel.name)) {
+
+	                if (mapModel.needsDrawMap) {
+	                    var mapDraw = this._mapDraw || new MapDraw(api, true);
+	                    group.add(mapDraw.group);
+
+	                    mapDraw.draw(mapModel, ecModel, api, this, payload);
+
+	                    this._mapDraw = mapDraw;
+	                }
+	                else {
+	                    // Remove drawed map
+	                    this._mapDraw && this._mapDraw.remove();
+	                    this._mapDraw = null;
+	                }
+	            }
+	            else {
+	                var mapDraw = this._mapDraw;
+	                mapDraw && group.add(mapDraw.group);
+	            }
+
+	            mapModel.get('showLegendSymbol') && ecModel.getComponent('legend')
+	                && this._renderSymbols(mapModel, ecModel, api);
+	        },
+
+	        remove: function () {
+	            this._mapDraw && this._mapDraw.remove();
+	            this._mapDraw = null;
+	            this.group.removeAll();
+	        },
+
+	        _renderSymbols: function (mapModel, ecModel, api) {
+	            var originalData = mapModel.originalData;
+	            var group = this.group;
+
+	            originalData.each('value', function (value, idx) {
+	                if (isNaN(value)) {
+	                    return;
+	                }
+
+	                var layout = originalData.getItemLayout(idx);
+
+	                if (!layout || !layout.point) {
+	                    // Not exists in map
+	                    return;
+	                }
+
+	                var point = layout.point;
+	                var offset = layout.offset;
+
+	                var circle = new graphic.Circle({
+	                    style: {
+	                        // Because the special of map draw.
+	                        // Which needs statistic of multiple series and draw on one map.
+	                        // And each series also need a symbol with legend color
+	                        //
+	                        // Layout and visual are put one the different data
+	                        fill: mapModel.getData().getVisual('color')
+	                    },
+	                    shape: {
+	                        cx: point[0] + offset * 9,
+	                        cy: point[1],
+	                        r: 3
+	                    },
+	                    silent: true,
+	                    z2: 10
+	                });
+
+	                // First data on the same region
+	                if (!offset) {
+	                    var fullData = mapModel.mainSeries.getData();
+	                    var name = originalData.getName(idx);
+	                    var labelText = name;
+	                    var fullIndex = fullData.indexOfName(name);
+
+	                    var itemModel = originalData.getItemModel(idx);
+	                    var labelModel = itemModel.getModel('label.normal');
+	                    var hoverLabelModel = itemModel.getModel('label.emphasis');
+
+	                    var textStyleModel = labelModel.getModel('textStyle');
+	                    var hoverTextStyleModel = hoverLabelModel.getModel('textStyle');
+
+	                    var polygonGroups = fullData.getItemGraphicEl(fullIndex);
+	                    circle.setStyle({
+	                        textPosition: 'bottom'
+	                    });
+
+	                    var onEmphasis = function () {
+	                        circle.setStyle({
+	                            text: hoverLabelModel.get('show') ? labelText : '',
+	                            textFill: hoverTextStyleModel.getTextColor(),
+	                            textFont: hoverTextStyleModel.getFont()
+	                        });
+	                    };
+
+	                    var onNormal = function () {
+	                        circle.setStyle({
+	                            text: labelModel.get('show') ? labelText : '',
+	                            textFill: textStyleModel.getTextColor(),
+	                            textFont: textStyleModel.getFont()
+	                        });
+	                    };
+
+	                    polygonGroups.on('mouseover', onEmphasis)
+	                        .on('mouseout', onNormal)
+	                        .on('emphasis', onEmphasis)
+	                        .on('normal', onNormal);
+
+	                    onNormal();
+	                }
+
+	                group.add(circle);
+	            });
+	        }
+	    });
+
+
+/***/ },
+/* 173 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @module echarts/component/helper/MapDraw
+	 */
+
+
+	    var RoamController = __webpack_require__(174);
+	    var graphic = __webpack_require__(43);
+	    var zrUtil = __webpack_require__(4);
+
+	    function getFixedItemStyle(model, scale) {
+	        var itemStyle = model.getItemStyle();
+	        var areaColor = model.get('areaColor');
+	        if (areaColor) {
+	            itemStyle.fill = areaColor;
+	        }
+
+	        return itemStyle;
+	    }
+
+	    function updateMapSelectHandler(mapOrGeoModel, group, api, fromView) {
+	        group.off('click');
+	        mapOrGeoModel.get('selectedMode')
+	            && group.on('click', function (e) {
+	                var el = e.target;
+	                while (!el.__region) {
+	                    el = el.parent;
+	                }
+	                if (!el) {
+	                    return;
+	                }
+
+	                var region = el.__region;
+	                var action = {
+	                    type: (mapOrGeoModel.mainType === 'geo' ? 'geo' : 'map') + 'ToggleSelect',
+	                    name: region.name,
+	                    from: fromView.uid
+	                };
+	                action[mapOrGeoModel.mainType + 'Id'] = mapOrGeoModel.id;
+
+	                api.dispatchAction(action);
+
+	                updateMapSelected(mapOrGeoModel, group);
+	            });
+	    }
+
+	    function updateMapSelected(mapOrGeoModel, group) {
+	        // FIXME
+	        group.eachChild(function (otherRegionEl) {
+	            if (otherRegionEl.__region) {
+	                otherRegionEl.trigger(mapOrGeoModel.isSelected(otherRegionEl.__region.name) ? 'emphasis' : 'normal');
+	            }
+	        });
+	    }
+
+	    /**
+	     * @alias module:echarts/component/helper/MapDraw
+	     * @param {module:echarts/ExtensionAPI} api
+	     * @param {boolean} updateGroup
+	     */
+	    function MapDraw(api, updateGroup) {
+
+	        var group = new graphic.Group();
+
+	        /**
+	         * @type {module:echarts/component/helper/RoamController}
+	         * @private
+	         */
+	        this._controller = new RoamController(
+	            api.getZr(), updateGroup ? group : null, null
+	        );
+
+	        /**
+	         * @type {module:zrender/container/Group}
+	         * @readOnly
+	         */
+	        this.group = group;
+
+	        /**
+	         * @type {boolean}
+	         * @private
+	         */
+	        this._updateGroup = updateGroup;
+	    }
+
+	    MapDraw.prototype = {
+
+	        constructor: MapDraw,
+
+	        draw: function (mapOrGeoModel, ecModel, api, fromView, payload) {
+
+	            // geoModel has no data
+	            var data = mapOrGeoModel.getData && mapOrGeoModel.getData();
+
+	            var geo = mapOrGeoModel.coordinateSystem;
+
+	            var group = this.group;
+
+	            var scale = geo.scale;
+	            var groupNewProp = {
+	                position: geo.position,
+	                scale: scale
+	            };
+
+	            // No animation when first draw or in action
+	            if (!group.childAt(0) || payload) {
+	                group.attr(groupNewProp);
+	            }
+	            else {
+	                graphic.updateProps(group, groupNewProp, mapOrGeoModel);
+	            }
+
+	            group.removeAll();
+
+	            var itemStyleAccessPath = ['itemStyle', 'normal'];
+	            var hoverItemStyleAccessPath = ['itemStyle', 'emphasis'];
+	            var labelAccessPath = ['label', 'normal'];
+	            var hoverLabelAccessPath = ['label', 'emphasis'];
+
+	            zrUtil.each(geo.regions, function (region) {
+
+	                var regionGroup = new graphic.Group();
+	                var compoundPath = new graphic.CompoundPath({
+	                    shape: {
+	                        paths: []
+	                    }
+	                });
+	                regionGroup.add(compoundPath);
+
+	                var regionModel = mapOrGeoModel.getRegionModel(region.name) || mapOrGeoModel;
+
+	                var itemStyleModel = regionModel.getModel(itemStyleAccessPath);
+	                var hoverItemStyleModel = regionModel.getModel(hoverItemStyleAccessPath);
+	                var itemStyle = getFixedItemStyle(itemStyleModel, scale);
+	                var hoverItemStyle = getFixedItemStyle(hoverItemStyleModel, scale);
+
+	                var labelModel = regionModel.getModel(labelAccessPath);
+	                var hoverLabelModel = regionModel.getModel(hoverLabelAccessPath);
+
+	                var dataIdx;
+	                // Use the itemStyle in data if has data
+	                if (data) {
+	                    dataIdx = data.indexOfName(region.name);
+	                    // Only visual color of each item will be used. It can be encoded by dataRange
+	                    // But visual color of series is used in symbol drawing
+	                    //
+	                    // Visual color for each series is for the symbol draw
+	                    var visualColor = data.getItemVisual(dataIdx, 'color', true);
+	                    if (visualColor) {
+	                        itemStyle.fill = visualColor;
+	                    }
+	                }
+
+	                var textStyleModel = labelModel.getModel('textStyle');
+	                var hoverTextStyleModel = hoverLabelModel.getModel('textStyle');
+
+	                zrUtil.each(region.contours, function (contour) {
+
+	                    var polygon = new graphic.Polygon({
+	                        shape: {
+	                            points: contour
+	                        }
+	                    });
+
+	                    compoundPath.shape.paths.push(polygon);
+	                });
+
+	                compoundPath.setStyle(itemStyle);
+	                compoundPath.style.strokeNoScale = true;
+	                compoundPath.culling = true;
+	                // Label
+	                var showLabel = labelModel.get('show');
+	                var hoverShowLabel = hoverLabelModel.get('show');
+
+	                var isDataNaN = data && isNaN(data.get('value', dataIdx));
+	                var itemLayout = data && data.getItemLayout(dataIdx);
+	                // In the following cases label will be drawn
+	                // 1. In map series and data value is NaN
+	                // 2. In geo component
+	                // 4. Region has no series legendSymbol, which will be add a showLabel flag in mapSymbolLayout
+	                if (
+	                    (!data || isDataNaN && (showLabel || hoverShowLabel))
+	                 || (itemLayout && itemLayout.showLabel)
+	                 ) {
+	                    var query = data ? dataIdx : region.name;
+	                    var formattedStr = mapOrGeoModel.getFormattedLabel(query, 'normal');
+	                    var hoverFormattedStr = mapOrGeoModel.getFormattedLabel(query, 'emphasis');
+	                    var text = new graphic.Text({
+	                        style: {
+	                            text: showLabel ? (formattedStr || region.name) : '',
+	                            fill: textStyleModel.getTextColor(),
+	                            textFont: textStyleModel.getFont(),
+	                            textAlign: 'center',
+	                            textVerticalAlign: 'middle'
+	                        },
+	                        hoverStyle: {
+	                            text: hoverShowLabel ? (hoverFormattedStr || region.name) : '',
+	                            fill: hoverTextStyleModel.getTextColor(),
+	                            textFont: hoverTextStyleModel.getFont()
+	                        },
+	                        position: region.center.slice(),
+	                        scale: [1 / scale[0], 1 / scale[1]],
+	                        z2: 10,
+	                        silent: true
+	                    });
+
+	                    regionGroup.add(text);
+	                }
+
+	                // setItemGraphicEl, setHoverStyle after all polygons and labels
+	                // are added to the rigionGroup
+	                if (data) {
+	                    data.setItemGraphicEl(dataIdx, regionGroup);
+	                }
+	                else {
+	                    var regionModel = mapOrGeoModel.getRegionModel(region.name);
+	                    // Package custom mouse event for geo component
+	                    compoundPath.eventData = {
+	                        componentType: 'geo',
+	                        geoIndex: mapOrGeoModel.componentIndex,
+	                        name: region.name,
+	                        region: (regionModel && regionModel.option) || {}
+	                    };
+	                }
+
+	                regionGroup.__region = region;
+
+	                graphic.setHoverStyle(regionGroup, hoverItemStyle);
+
+	                group.add(regionGroup);
+	            });
+
+	            this._updateController(mapOrGeoModel, ecModel, api);
+
+	            updateMapSelectHandler(mapOrGeoModel, group, api, fromView);
+
+	            updateMapSelected(mapOrGeoModel, group);
+	        },
+
+	        remove: function () {
+	            this.group.removeAll();
+	            this._controller.dispose();
+	        },
+
+	        _updateController: function (mapOrGeoModel, ecModel, api) {
+	            var geo = mapOrGeoModel.coordinateSystem;
+	            var controller = this._controller;
+	            controller.zoomLimit = mapOrGeoModel.get('scaleLimit');
+	            // Update zoom from model
+	            controller.zoom = geo.getZoom();
+	            // roamType is will be set default true if it is null
+	            controller.enable(mapOrGeoModel.get('roam') || false);
+	            var mainType = mapOrGeoModel.mainType;
+
+	            function makeActionBase() {
+	                var action = {
+	                    type: 'geoRoam',
+	                    componentType: mainType
+	                };
+	                action[mainType + 'Id'] = mapOrGeoModel.id;
+	                return action;
+	            }
+	            controller.off('pan')
+	                .on('pan', function (dx, dy) {
+	                    api.dispatchAction(zrUtil.extend(makeActionBase(), {
+	                        dx: dx,
+	                        dy: dy
+	                    }));
+	                });
+	            controller.off('zoom')
+	                .on('zoom', function (zoom, mouseX, mouseY) {
+	                    api.dispatchAction(zrUtil.extend(makeActionBase(), {
+	                        zoom: zoom,
+	                        originX: mouseX,
+	                        originY: mouseY
+	                    }));
+
+	                    if (this._updateGroup) {
+	                        var group = this.group;
+	                        var scale = group.scale;
+	                        group.traverse(function (el) {
+	                            if (el.type === 'text') {
+	                                el.attr('scale', [1 / scale[0], 1 / scale[1]]);
+	                            }
+	                        });
+	                    }
+	                }, this);
+
+	            controller.rectProvider = function () {
+	                return geo.getViewRectAfterRoam();
+	            };
+	        }
+	    };
+
+	    module.exports = MapDraw;
+
+
+/***/ },
+/* 174 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @module echarts/component/helper/RoamController
+	 */
+
+
+
+	    var Eventful = __webpack_require__(33);
+	    var zrUtil = __webpack_require__(4);
+	    var eventTool = __webpack_require__(87);
+	    var interactionMutex = __webpack_require__(175);
+
+	    function mousedown(e) {
+	        if (e.target && e.target.draggable) {
+	            return;
+	        }
+
+	        var x = e.offsetX;
+	        var y = e.offsetY;
+	        var rect = this.rectProvider && this.rectProvider();
+	        if (rect && rect.contain(x, y)) {
+	            this._x = x;
+	            this._y = y;
+	            this._dragging = true;
+	        }
+	    }
+
+	    function mousemove(e) {
+	        if (!this._dragging) {
+	            return;
+	        }
+
+	        eventTool.stop(e.event);
+
+	        if (e.gestureEvent !== 'pinch') {
+
+	            if (interactionMutex.isTaken(this._zr, 'globalPan')) {
+	                return;
+	            }
+
+	            var x = e.offsetX;
+	            var y = e.offsetY;
+
+	            var dx = x - this._x;
+	            var dy = y - this._y;
+
+	            this._x = x;
+	            this._y = y;
+
+	            var target = this.target;
+
+	            if (target) {
+	                var pos = target.position;
+	                pos[0] += dx;
+	                pos[1] += dy;
+	                target.dirty();
+	            }
+
+	            eventTool.stop(e.event);
+	            this.trigger('pan', dx, dy);
+	        }
+	    }
+
+	    function mouseup(e) {
+	        this._dragging = false;
+	    }
+
+	    function mousewheel(e) {
+	        // Convenience:
+	        // Mac and VM Windows on Mac: scroll up: zoom out.
+	        // Windows: scroll up: zoom in.
+	        var zoomDelta = e.wheelDelta > 0 ? 1.1 : 1 / 1.1;
+	        zoom.call(this, e, zoomDelta, e.offsetX, e.offsetY);
+	    }
+
+	    function pinch(e) {
+	        if (interactionMutex.isTaken(this._zr, 'globalPan')) {
+	            return;
+	        }
+	        var zoomDelta = e.pinchScale > 1 ? 1.1 : 1 / 1.1;
+	        zoom.call(this, e, zoomDelta, e.pinchX, e.pinchY);
+	    }
+
+	    function zoom(e, zoomDelta, zoomX, zoomY) {
+	        var rect = this.rectProvider && this.rectProvider();
+
+	        if (rect && rect.contain(zoomX, zoomY)) {
+	            // When mouse is out of roamController rect,
+	            // default befavoius should be be disabled, otherwise
+	            // page sliding is disabled, contrary to expectation.
+	            eventTool.stop(e.event);
+
+	            var target = this.target;
+	            var zoomLimit = this.zoomLimit;
+
+	            if (target) {
+	                var pos = target.position;
+	                var scale = target.scale;
+
+	                var newZoom = this.zoom = this.zoom || 1;
+	                newZoom *= zoomDelta;
+	                if (zoomLimit) {
+	                    var zoomMin = zoomLimit.min || 0;
+	                    var zoomMax = zoomLimit.max || Infinity;
+	                    newZoom = Math.max(
+	                        Math.min(zoomMax, newZoom),
+	                        zoomMin
+	                    );
+	                }
+	                var zoomScale = newZoom / this.zoom;
+	                this.zoom = newZoom;
+	                // Keep the mouse center when scaling
+	                pos[0] -= (zoomX - pos[0]) * (zoomScale - 1);
+	                pos[1] -= (zoomY - pos[1]) * (zoomScale - 1);
+	                scale[0] *= zoomScale;
+	                scale[1] *= zoomScale;
+
+	                target.dirty();
+	            }
+
+	            this.trigger('zoom', zoomDelta, zoomX, zoomY);
+	        }
+	    }
+
+	    /**
+	     * @alias module:echarts/component/helper/RoamController
+	     * @constructor
+	     * @mixin {module:zrender/mixin/Eventful}
+	     *
+	     * @param {module:zrender/zrender~ZRender} zr
+	     * @param {module:zrender/Element} target
+	     * @param {Function} [rectProvider]
+	     */
+	    function RoamController(zr, target, rectProvider) {
+
+	        /**
+	         * @type {module:zrender/Element}
+	         */
+	        this.target = target;
+
+	        /**
+	         * @type {Function}
+	         */
+	        this.rectProvider = rectProvider;
+
+	        /**
+	         * { min: 1, max: 2 }
+	         * @type {Object}
+	         */
+	        this.zoomLimit;
+
+	        /**
+	         * @type {number}
+	         */
+	        this.zoom;
+	        /**
+	         * @type {module:zrender}
+	         */
+	        this._zr = zr;
+
+	        // Avoid two roamController bind the same handler
+	        var bind = zrUtil.bind;
+	        var mousedownHandler = bind(mousedown, this);
+	        var mousemoveHandler = bind(mousemove, this);
+	        var mouseupHandler = bind(mouseup, this);
+	        var mousewheelHandler = bind(mousewheel, this);
+	        var pinchHandler = bind(pinch, this);
+
+	        Eventful.call(this);
+
+	        /**
+	         * Notice: only enable needed types. For example, if 'zoom'
+	         * is not needed, 'zoom' should not be enabled, otherwise
+	         * default mousewheel behaviour (scroll page) will be disabled.
+	         *
+	         * @param  {boolean|string} [controlType=true] Specify the control type,
+	         *                          which can be null/undefined or true/false
+	         *                          or 'pan/move' or 'zoom'/'scale'
+	         */
+	        this.enable = function (controlType) {
+	            // Disable previous first
+	            this.disable();
+
+	            if (controlType == null) {
+	                controlType = true;
+	            }
+
+	            if (controlType === true || (controlType === 'move' || controlType === 'pan')) {
+	                zr.on('mousedown', mousedownHandler);
+	                zr.on('mousemove', mousemoveHandler);
+	                zr.on('mouseup', mouseupHandler);
+	            }
+	            if (controlType === true || (controlType === 'scale' || controlType === 'zoom')) {
+	                zr.on('mousewheel', mousewheelHandler);
+	                zr.on('pinch', pinchHandler);
+	            }
+	        };
+
+	        this.disable = function () {
+	            zr.off('mousedown', mousedownHandler);
+	            zr.off('mousemove', mousemoveHandler);
+	            zr.off('mouseup', mouseupHandler);
+	            zr.off('mousewheel', mousewheelHandler);
+	            zr.off('pinch', pinchHandler);
+	        };
+
+	        this.dispose = this.disable;
+
+	        this.isDragging = function () {
+	            return this._dragging;
+	        };
+
+	        this.isPinching = function () {
+	            return this._pinching;
+	        };
+	    }
+
+	    zrUtil.mixin(RoamController, Eventful);
+
+	    module.exports = RoamController;
+
+
+/***/ },
+/* 175 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var ATTR = '\0_ec_interaction_mutex';
+
+	    var interactionMutex = {
+
+	        take: function (zr, resourceKey, userKey) {
+	            var store = getStore(zr);
+	            store[resourceKey] = userKey;
+	        },
+
+	        release: function (zr, resourceKey, userKey) {
+	            var store = getStore(zr);
+	            var uKey = store[resourceKey];
+
+	            if (uKey === userKey) {
+	                store[resourceKey] = null;
+	            }
+	        },
+
+	        isTaken: function (zr, resourceKey) {
+	            return !!getStore(zr)[resourceKey];
+	        }
+	    };
+
+	    function getStore(zr) {
+	        return zr[ATTR] || (zr[ATTR] = {});
+	    }
+
+	    /**
+	     * payload: {
+	     *     type: 'takeGlobalCursor',
+	     *     key: 'dataZoomSelect', or 'brush', or ...,
+	     *         If no userKey, release global cursor.
+	     * }
+	     */
+	    __webpack_require__(1).registerAction(
+	        {type: 'takeGlobalCursor', event: 'globalCursorTaken', update: 'update'},
+	        function () {}
+	    );
+
+	    module.exports = interactionMutex;
+
+
+/***/ },
+/* 176 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+	    var roamHelper = __webpack_require__(177);
+
+	    var echarts = __webpack_require__(1);
+
+	    /**
+	     * @payload
+	     * @property {string} [componentType=series]
+	     * @property {number} [dx]
+	     * @property {number} [dy]
+	     * @property {number} [zoom]
+	     * @property {number} [originX]
+	     * @property {number} [originY]
+	     */
+	    echarts.registerAction({
+	        type: 'geoRoam',
+	        event: 'geoRoam',
+	        update: 'updateLayout'
+	    }, function (payload, ecModel) {
+	        var componentType = payload.componentType || 'series';
+
+	        ecModel.eachComponent(
+	            { mainType: componentType, query: payload },
+	            function (componentModel) {
+	                var geo = componentModel.coordinateSystem;
+	                if (geo.type !== 'geo') {
+	                    return;
+	                }
+
+	                var res = roamHelper.updateCenterAndZoom(
+	                    geo, payload, componentModel.get('scaleLimit')
+	                );
+
+	                componentModel.setCenter
+	                    && componentModel.setCenter(res.center);
+
+	                componentModel.setZoom
+	                    && componentModel.setZoom(res.zoom);
+
+	                // All map series with same `map` use the same geo coordinate system
+	                // So the center and zoom must be in sync. Include the series not selected by legend
+	                if (componentType === 'series') {
+	                    zrUtil.each(componentModel.seriesGroup, function (seriesModel) {
+	                        seriesModel.setCenter(res.center);
+	                        seriesModel.setZoom(res.zoom);
+	                    });
+	                }
+	            }
+	        );
+	    });
+
+
+/***/ },
+/* 177 */
+/***/ function(module, exports) {
+
+	
+
+	    var roamHelper = {};
+
+	    /**
+	     * @param {module:echarts/coord/View} view
+	     * @param {Object} payload
+	     * @param {Object} [zoomLimit]
+	     */
+	    roamHelper.updateCenterAndZoom = function (
+	        view, payload, zoomLimit
+	    ) {
+	        var previousZoom = view.getZoom();
+	        var center = view.getCenter();
+	        var zoom = payload.zoom;
+
+	        var point = view.dataToPoint(center);
+
+	        if (payload.dx != null && payload.dy != null) {
+	            point[0] -= payload.dx;
+	            point[1] -= payload.dy;
+
+	            var center = view.pointToData(point);
+	            view.setCenter(center);
+	        }
+	        if (zoom != null) {
+	            if (zoomLimit) {
+	                var zoomMin = zoomLimit.min || 0;
+	                var zoomMax = zoomLimit.max || Infinity;
+	                zoom = Math.max(
+	                    Math.min(previousZoom * zoom, zoomMax),
+	                    zoomMin
+	                ) / previousZoom;
+	            }
+
+	            // Zoom on given point(originX, originY)
+	            view.scale[0] *= zoom;
+	            view.scale[1] *= zoom;
+	            var position = view.position;
+	            var fixX = (payload.originX - position[0]) * (zoom - 1);
+	            var fixY = (payload.originY - position[1]) * (zoom - 1);
+
+	            position[0] -= fixX;
+	            position[1] -= fixY;
+
+	            view.updateTransform();
+	            // Get the new center
+	            var center = view.pointToData(point);
+	            view.setCenter(center);
+	            view.setZoom(zoom * previousZoom);
+	        }
+
+	        return {
+	            center: view.getCenter(),
+	            zoom: view.getZoom()
+	        };
+	    };
+
+	    module.exports = roamHelper;
+
+
+/***/ },
+/* 178 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+
+	    module.exports = function (ecModel) {
+
+	        var processedMapType = {};
+
+	        ecModel.eachSeriesByType('map', function (mapSeries) {
+	            var mapType = mapSeries.get('map');
+	            if (processedMapType[mapType]) {
+	                return;
+	            }
+
+	            var mapSymbolOffsets = {};
+
+	            zrUtil.each(mapSeries.seriesGroup, function (subMapSeries) {
+	                var geo = subMapSeries.coordinateSystem;
+	                var data = subMapSeries.originalData;
+	                if (subMapSeries.get('showLegendSymbol') && ecModel.getComponent('legend')) {
+	                    data.each('value', function (value, idx) {
+	                        var name = data.getName(idx);
+	                        var region = geo.getRegion(name);
+
+	                        // No region or no value
+	                        // In MapSeries data regions will be filled with NaN
+	                        // If they are not in the series.data array.
+	                        // So here must validate if value is NaN
+	                        if (!region || isNaN(value)) {
+	                            return;
+	                        }
+
+	                        var offset = mapSymbolOffsets[name] || 0;
+
+	                        var point = geo.dataToPoint(region.center);
+
+	                        mapSymbolOffsets[name] = offset + 1;
+
+	                        data.setItemLayout(idx, {
+	                            point: point,
+	                            offset: offset
+	                        });
+	                    });
+	                }
+	            });
+
+	            // Show label of those region not has legendSymbol(which is offset 0)
+	            var data = mapSeries.getData();
+	            data.each(function (idx) {
+	                var name = data.getName(idx);
+	                var layout = data.getItemLayout(idx) || {};
+	                layout.showLabel = !mapSymbolOffsets[name];
+	                data.setItemLayout(idx, layout);
+	            });
+
+	            processedMapType[mapType] = true;
+	        });
+	    };
+
+
+/***/ },
+/* 179 */
+/***/ function(module, exports) {
+
+	
+	    module.exports = function (ecModel) {
+	        ecModel.eachSeriesByType('map', function (seriesModel) {
+	            var colorList = seriesModel.get('color');
+	            var itemStyleModel = seriesModel.getModel('itemStyle.normal');
+
+	            var areaColor = itemStyleModel.get('areaColor');
+	            var color = itemStyleModel.get('color')
+	                || colorList[seriesModel.seriesIndex % colorList.length];
+
+	            seriesModel.getData().setVisual({
+	                'areaColor': areaColor,
+	                'color': color
+	            });
+	        });
+	    };
+
+
+/***/ },
+/* 180 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+
+	    // FIXME 公用？
+	    /**
+	     * @param {Array.<module:echarts/data/List>} datas
+	     * @param {string} statisticType 'average' 'sum'
+	     * @inner
+	     */
+	    function dataStatistics(datas, statisticType) {
+	        var dataNameMap = {};
+	        var dims = ['value'];
+
+	        for (var i = 0; i < datas.length; i++) {
+	            datas[i].each(dims, function (value, idx) {
+	                var name = datas[i].getName(idx);
+	                dataNameMap[name] = dataNameMap[name] || [];
+	                if (!isNaN(value)) {
+	                    dataNameMap[name].push(value);
+	                }
+	            });
+	        }
+
+	        return datas[0].map(dims, function (value, idx) {
+	            var name = datas[0].getName(idx);
+	            var sum = 0;
+	            var min = Infinity;
+	            var max = -Infinity;
+	            var len = dataNameMap[name].length;
+	            for (var i = 0; i < len; i++) {
+	                min = Math.min(min, dataNameMap[name][i]);
+	                max = Math.max(max, dataNameMap[name][i]);
+	                sum += dataNameMap[name][i];
+	            }
+	            var result;
+	            if (statisticType === 'min') {
+	                result = min;
+	            }
+	            else if (statisticType === 'max') {
+	                result = max;
+	            }
+	            else if (statisticType === 'average') {
+	                result = sum / len;
+	            }
+	            else {
+	                result = sum;
+	            }
+	            return len === 0 ? NaN : result;
+	        });
+	    }
+
+	    module.exports = function (ecModel) {
+	        var seriesGroupByMapType = {};
+	        ecModel.eachSeriesByType('map', function (seriesModel) {
+	            var mapType = seriesModel.get('map');
+	            seriesGroupByMapType[mapType] = seriesGroupByMapType[mapType] || [];
+	            seriesGroupByMapType[mapType].push(seriesModel);
+	        });
+
+	        zrUtil.each(seriesGroupByMapType, function (seriesList, mapType) {
+	            var data = dataStatistics(
+	                zrUtil.map(seriesList, function (seriesModel) {
+	                    return seriesModel.getData();
+	                }),
+	                seriesList[0].get('mapValueCalculation')
+	            );
+
+	            for (var i = 0; i < seriesList.length; i++) {
+	                seriesList[i].originalData = seriesList[i].getData();
+	            }
+
+	            // FIXME Put where?
+	            for (var i = 0; i < seriesList.length; i++) {
+	                seriesList[i].seriesGroup = seriesList;
+	                seriesList[i].needsDrawMap = i === 0;
+
+	                seriesList[i].setData(data.cloneShallow());
+	                seriesList[i].mainSeries = seriesList[0];
+	            }
+	        });
+	    };
+
+
+/***/ },
+/* 181 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+
+	    module.exports = function (option) {
+	        // Save geoCoord
+	        var mapSeries = [];
+	        zrUtil.each(option.series, function (seriesOpt) {
+	            if (seriesOpt.type === 'map') {
+	                mapSeries.push(seriesOpt);
+	            }
+	        });
+
+	        zrUtil.each(mapSeries, function (seriesOpt) {
+	            seriesOpt.map = seriesOpt.map || seriesOpt.mapType;
+	            // Put x, y, width, height, x2, y2 in the top level
+	            zrUtil.defaults(seriesOpt, seriesOpt.mapLocation);
+	        });
+	    };
+
+
+/***/ },
+/* 182 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var echarts = __webpack_require__(1);
+
+	    __webpack_require__(183);
+	    __webpack_require__(186);
+	    __webpack_require__(190);
+
+	    echarts.registerVisual(__webpack_require__(191));
+
+	    echarts.registerLayout(__webpack_require__(193));
+
+
+/***/ },
+/* 183 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var SeriesModel = __webpack_require__(28);
+	    var Tree = __webpack_require__(184);
+	    var zrUtil = __webpack_require__(4);
+	    var Model = __webpack_require__(12);
+	    var formatUtil = __webpack_require__(6);
+	    var encodeHTML = formatUtil.encodeHTML;
+	    var addCommas = formatUtil.addCommas;
+
+
+	    module.exports = SeriesModel.extend({
+
+	        type: 'series.treemap',
+
+	        dependencies: ['grid', 'polar'],
+
+	        /**
+	         * @type {module:echarts/data/Tree~Node}
+	         */
+	        _viewRoot: null,
+
+	        defaultOption: {
+	            // Disable progressive rendering
+	            progressive: 0,
+	            hoverLayerThreshold: Infinity,
+	            // center: ['50%', '50%'],          // not supported in ec3.
+	            // size: ['80%', '80%'],            // deprecated, compatible with ec2.
+	            left: 'center',
+	            top: 'middle',
+	            right: null,
+	            bottom: null,
+	            width: '80%',
+	            height: '80%',
+	            sort: true,                         // Can be null or false or true
+	                                                // (order by desc default, asc not supported yet (strange effect))
+	            clipWindow: 'origin',               // Size of clipped window when zooming. 'origin' or 'fullscreen'
+	            squareRatio: 0.5 * (1 + Math.sqrt(5)), // golden ratio
+	            leafDepth: null,                    // Nodes on depth from root are regarded as leaves.
+	                                                // Count from zero (zero represents only view root).
+	            drillDownIcon: '▶',                 // Use html character temporarily because it is complicated
+	                                                // to align specialized icon. ▷▶❒❐▼✚
+	            visualDimension: 0,                 // Can be 0, 1, 2, 3.
+	            zoomToNodeRatio: 0.32 * 0.32,       // Be effective when using zoomToNode. Specify the proportion of the
+	                                                // target node area in the view area.
+	            roam: true,                         // true, false, 'scale' or 'zoom', 'move'.
+	            nodeClick: 'zoomToNode',            // Leaf node click behaviour: 'zoomToNode', 'link', false.
+	                                                // If leafDepth is set and clicking a node which has children but
+	                                                // be on left depth, the behaviour would be changing root. Otherwise
+	                                                // use behavious defined above.
+	            animation: true,
+	            animationDurationUpdate: 900,
+	            animationEasing: 'quinticInOut',
+	            breadcrumb: {
+	                show: true,
+	                height: 22,
+	                left: 'center',
+	                top: 'bottom',
+	                // right
+	                // bottom
+	                emptyItemWidth: 25,             // Width of empty node.
+	                itemStyle: {
+	                    normal: {
+	                        color: 'rgba(0,0,0,0.7)', //'#5793f3',
+	                        borderColor: 'rgba(255,255,255,0.7)',
+	                        borderWidth: 1,
+	                        shadowColor: 'rgba(150,150,150,1)',
+	                        shadowBlur: 3,
+	                        shadowOffsetX: 0,
+	                        shadowOffsetY: 0,
+	                        textStyle: {
+	                            color: '#fff'
+	                        }
+	                    },
+	                    emphasis: {
+	                        textStyle: {}
+	                    }
+	                }
+	            },
+	            label: {
+	                normal: {
+	                    show: true,
+	                    position: 'inside', // Can be [5, '5%'] or position stirng like 'insideTopLeft', ...
+	                    textStyle: {
+	                        color: '#fff',
+	                        ellipsis: true
+	                    }
+	                }
+	            },
+	            itemStyle: {
+	                normal: {
+	                    color: null,            // Can be 'none' if not necessary.
+	                    colorAlpha: null,       // Can be 'none' if not necessary.
+	                    colorSaturation: null,  // Can be 'none' if not necessary.
+	                    borderWidth: 0,
+	                    gapWidth: 0,
+	                    borderColor: '#fff',
+	                    borderColorSaturation: null // If specified, borderColor will be ineffective, and the
+	                                                // border color is evaluated by color of current node and
+	                                                // borderColorSaturation.
+	                },
+	                emphasis: {
+
+	                }
+	            },
+	            color: [],                  // + treemapSeries.color should not be modified. Please only modified
+	                                        // level[n].color (if necessary).
+	                                        // + Specify color list of each level. level[0].color would be global
+	                                        // color list if not specified. (see method `setDefault`).
+	                                        // + But set as a empty array to forbid fetch color from global palette
+	                                        // when using nodeModel.get('color'), otherwise nodes on deep level
+	                                        // will always has color palette set and are not able to inherit color
+	                                        // from parent node.
+	                                        // + TreemapSeries.color can not be set as 'none', otherwise effect
+	                                        // legend color fetching (see seriesColor.js).
+	            colorAlpha: null,           // Array. Specify color alpha range of each level, like [0.2, 0.8]
+	            colorSaturation: null,      // Array. Specify color saturation of each level, like [0.2, 0.5]
+	            colorMappingBy: 'index',    // 'value' or 'index' or 'id'.
+	            visibleMin: 10,             // If area less than this threshold (unit: pixel^2), node will not
+	                                        // be rendered. Only works when sort is 'asc' or 'desc'.
+	            childrenVisibleMin: null,   // If area of a node less than this threshold (unit: pixel^2),
+	                                        // grandchildren will not show.
+	                                        // Why grandchildren? If not grandchildren but children,
+	                                        // some siblings show children and some not,
+	                                        // the appearance may be mess and not consistent,
+	            levels: []                  // Each item: {
+	                                        //     visibleMin, itemStyle, visualDimension, label
+	                                        // }
+	            // data: {
+	            //      value: [],
+	            //      children: [],
+	            //      link: 'http://xxx.xxx.xxx',
+	            //      target: 'blank' or 'self'
+	            // }
+	        },
+
+	        /**
+	         * @override
+	         */
+	        getInitialData: function (option, ecModel) {
+	            var data = option.data || [];
+	            var rootName = option.name;
+	            rootName == null && (rootName = option.name);
+
+	            // Create a virtual root.
+	            var root = {name: rootName, children: option.data};
+	            var value0 = (data[0] || {}).value;
+
+	            completeTreeValue(root, zrUtil.isArray(value0) ? value0.length : -1);
+
+	            // FIXME
+	            // sereis.mergeOption 的 getInitData是否放在merge后，从而能直接获取merege后的结果而非手动判断。
+	            var levels = option.levels || [];
+
+	            levels = option.levels = setDefault(levels, ecModel);
+
+	            // Make sure always a new tree is created when setOption,
+	            // in TreemapView, we check whether oldTree === newTree
+	            // to choose mappings approach among old shapes and new shapes.
+	            return Tree.createTree(root, this, levels).data;
+	        },
+
+	        optionUpdated: function () {
+	            this.resetViewRoot();
+	        },
+
+	        /**
+	         * @override
+	         * @param {number} dataIndex
+	         * @param {boolean} [mutipleSeries=false]
+	         */
+	        formatTooltip: function (dataIndex) {
+	            var data = this.getData();
+	            var value = this.getRawValue(dataIndex);
+	            var formattedValue = zrUtil.isArray(value)
+	                ? addCommas(value[0]) : addCommas(value);
+	            var name = data.getName(dataIndex);
+
+	            return encodeHTML(name) + ': ' + formattedValue;
+	        },
+
+	        /**
+	         * Add tree path to tooltip param
+	         *
+	         * @override
+	         * @param {number} dataIndex
+	         * @return {Object}
+	         */
+	        getDataParams: function (dataIndex) {
+	            var params = SeriesModel.prototype.getDataParams.apply(this, arguments);
+
+	            var data = this.getData();
+	            var node = data.tree.getNodeByDataIndex(dataIndex);
+	            var treePathInfo = params.treePathInfo = [];
+
+	            while (node) {
+	                var nodeDataIndex = node.dataIndex;
+	                treePathInfo.push({
+	                    name: node.name,
+	                    dataIndex: nodeDataIndex,
+	                    value: this.getRawValue(nodeDataIndex)
+	                });
+	                node = node.parentNode;
+	            }
+
+	            treePathInfo.reverse();
+
+	            return params;
+	        },
+
+	        /**
+	         * @public
+	         * @param {Object} layoutInfo {
+	         *                                x: containerGroup x
+	         *                                y: containerGroup y
+	         *                                width: containerGroup width
+	         *                                height: containerGroup height
+	         *                            }
+	         */
+	        setLayoutInfo: function (layoutInfo) {
+	            /**
+	             * @readOnly
+	             * @type {Object}
+	             */
+	            this.layoutInfo = this.layoutInfo || {};
+	            zrUtil.extend(this.layoutInfo, layoutInfo);
+	        },
+
+	        /**
+	         * @param  {string} id
+	         * @return {number} index
+	         */
+	        mapIdToIndex: function (id) {
+	            // A feature is implemented:
+	            // index is monotone increasing with the sequence of
+	            // input id at the first time.
+	            // This feature can make sure that each data item and its
+	            // mapped color have the same index between data list and
+	            // color list at the beginning, which is useful for user
+	            // to adjust data-color mapping.
+
+	            /**
+	             * @private
+	             * @type {Object}
+	             */
+	            var idIndexMap = this._idIndexMap;
+
+	            if (!idIndexMap) {
+	                idIndexMap = this._idIndexMap = {};
+	                /**
+	                 * @private
+	                 * @type {number}
+	                 */
+	                this._idIndexMapCount = 0;
+	            }
+
+	            var index = idIndexMap[id];
+	            if (index == null) {
+	                idIndexMap[id] = index = this._idIndexMapCount++;
+	            }
+
+	            return index;
+	        },
+
+	        getViewRoot: function () {
+	            return this._viewRoot;
+	        },
+
+	        /**
+	         * @param {module:echarts/data/Tree~Node} [viewRoot]
+	         */
+	        resetViewRoot: function (viewRoot) {
+	            viewRoot
+	                ? (this._viewRoot = viewRoot)
+	                : (viewRoot = this._viewRoot);
+
+	            var root = this.getData().tree.root;
+
+	            if (!viewRoot
+	                || (viewRoot !== root && !root.contains(viewRoot))
+	            ) {
+	                this._viewRoot = root;
+	            }
+	        }
+	    });
+
+	    /**
+	     * @param {Object} dataNode
+	     */
+	    function completeTreeValue(dataNode, arrValueLength) {
+	        // Postorder travel tree.
+	        // If value of none-leaf node is not set,
+	        // calculate it by suming up the value of all children.
+	        var sum = 0;
+
+	        zrUtil.each(dataNode.children, function (child) {
+
+	            completeTreeValue(child, arrValueLength);
+
+	            var childValue = child.value;
+	            zrUtil.isArray(childValue) && (childValue = childValue[0]);
+
+	            sum += childValue;
+	        });
+
+	        var thisValue = dataNode.value;
+
+	        if (arrValueLength >= 0) {
+	            if (!zrUtil.isArray(thisValue)) {
+	                dataNode.value = new Array(arrValueLength);
+	            }
+	            else {
+	                thisValue = thisValue[0];
+	            }
+	        }
+
+	        if (thisValue == null || isNaN(thisValue)) {
+	            thisValue = sum;
+	        }
+	        // Value should not less than 0.
+	        if (thisValue < 0) {
+	            thisValue = 0;
+	        }
+
+	        arrValueLength >= 0
+	            ? (dataNode.value[0] = thisValue)
+	            : (dataNode.value = thisValue);
+	    }
+
+	    /**
+	     * set default to level configuration
+	     */
+	    function setDefault(levels, ecModel) {
+	        var globalColorList = ecModel.get('color');
+
+	        if (!globalColorList) {
+	            return;
+	        }
+
+	        levels = levels || [];
+	        var hasColorDefine;
+	        zrUtil.each(levels, function (levelDefine) {
+	            var model = new Model(levelDefine);
+	            var modelColor = model.get('color');
+
+	            if (model.get('itemStyle.normal.color')
+	                || (modelColor && modelColor !== 'none')
+	            ) {
+	                hasColorDefine = true;
+	            }
+	        });
+
+	        if (!hasColorDefine) {
+	            var level0 = levels[0] || (levels[0] = {});
+	            level0.color = globalColorList.slice();
+	        }
+
+	        return levels;
+	    }
+
+
+
+/***/ },
+/* 184 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * Tree data structure
+	 *
+	 * @module echarts/data/Tree
+	 */
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var Model = __webpack_require__(12);
+	    var List = __webpack_require__(97);
+	    var linkList = __webpack_require__(185);
+	    var completeDimensions = __webpack_require__(102);
+
+	    /**
+	     * @constructor module:echarts/data/Tree~TreeNode
+	     * @param {string} name
+	     * @param {module:echarts/data/Tree} hostTree
+	     */
+	    var TreeNode = function (name, hostTree) {
+	        /**
+	         * @type {string}
+	         */
+	        this.name = name || '';
+
+	        /**
+	         * Depth of node
+	         *
+	         * @type {number}
+	         * @readOnly
+	         */
+	        this.depth = 0;
+
+	        /**
+	         * Height of the subtree rooted at this node.
+	         * @type {number}
+	         * @readOnly
+	         */
+	        this.height = 0;
+
+	        /**
+	         * @type {module:echarts/data/Tree~TreeNode}
+	         * @readOnly
+	         */
+	        this.parentNode = null;
+
+	        /**
+	         * Reference to list item.
+	         * Do not persistent dataIndex outside,
+	         * besause it may be changed by list.
+	         * If dataIndex -1,
+	         * this node is logical deleted (filtered) in list.
+	         *
+	         * @type {Object}
+	         * @readOnly
+	         */
+	        this.dataIndex = -1;
+
+	        /**
+	         * @type {Array.<module:echarts/data/Tree~TreeNode>}
+	         * @readOnly
+	         */
+	        this.children = [];
+
+	        /**
+	         * @type {Array.<module:echarts/data/Tree~TreeNode>}
+	         * @pubilc
+	         */
+	        this.viewChildren = [];
+
+	        /**
+	         * @type {moduel:echarts/data/Tree}
+	         * @readOnly
+	         */
+	        this.hostTree = hostTree;
+	    };
+
+	    TreeNode.prototype = {
+
+	        constructor: TreeNode,
+
+	        /**
+	         * The node is removed.
+	         * @return {boolean} is removed.
+	         */
+	        isRemoved: function () {
+	            return this.dataIndex < 0;
+	        },
+
+	        /**
+	         * Travel this subtree (include this node).
+	         * Usage:
+	         *    node.eachNode(function () { ... }); // preorder
+	         *    node.eachNode('preorder', function () { ... }); // preorder
+	         *    node.eachNode('postorder', function () { ... }); // postorder
+	         *    node.eachNode(
+	         *        {order: 'postorder', attr: 'viewChildren'},
+	         *        function () { ... }
+	         *    ); // postorder
+	         *
+	         * @param {(Object|string)} options If string, means order.
+	         * @param {string=} options.order 'preorder' or 'postorder'
+	         * @param {string=} options.attr 'children' or 'viewChildren'
+	         * @param {Function} cb If in preorder and return false,
+	         *                      its subtree will not be visited.
+	         * @param {Object} [context]
+	         */
+	        eachNode: function (options, cb, context) {
+	            if (typeof options === 'function') {
+	                context = cb;
+	                cb = options;
+	                options = null;
+	            }
+
+	            options = options || {};
+	            if (zrUtil.isString(options)) {
+	                options = {order: options};
+	            }
+
+	            var order = options.order || 'preorder';
+	            var children = this[options.attr || 'children'];
+
+	            var suppressVisitSub;
+	            order === 'preorder' && (suppressVisitSub = cb.call(context, this));
+
+	            for (var i = 0; !suppressVisitSub && i < children.length; i++) {
+	                children[i].eachNode(options, cb, context);
+	            }
+
+	            order === 'postorder' && cb.call(context, this);
+	        },
+
+	        /**
+	         * Update depth and height of this subtree.
+	         *
+	         * @param  {number} depth
+	         */
+	        updateDepthAndHeight: function (depth) {
+	            var height = 0;
+	            this.depth = depth;
+	            for (var i = 0; i < this.children.length; i++) {
+	                var child = this.children[i];
+	                child.updateDepthAndHeight(depth + 1);
+	                if (child.height > height) {
+	                    height = child.height;
+	                }
+	            }
+	            this.height = height + 1;
+	        },
+
+	        /**
+	         * @param  {string} id
+	         * @return {module:echarts/data/Tree~TreeNode}
+	         */
+	        getNodeById: function (id) {
+	            if (this.getId() === id) {
+	                return this;
+	            }
+	            for (var i = 0, children = this.children, len = children.length; i < len; i++) {
+	                var res = children[i].getNodeById(id);
+	                if (res) {
+	                    return res;
+	                }
+	            }
+	        },
+
+	        /**
+	         * @param {module:echarts/data/Tree~TreeNode} node
+	         * @return {boolean}
+	         */
+	        contains: function (node) {
+	            if (node === this) {
+	                return true;
+	            }
+	            for (var i = 0, children = this.children, len = children.length; i < len; i++) {
+	                var res = children[i].contains(node);
+	                if (res) {
+	                    return res;
+	                }
+	            }
+	        },
+
+	        /**
+	         * @param {boolean} includeSelf Default false.
+	         * @return {Array.<module:echarts/data/Tree~TreeNode>} order: [root, child, grandchild, ...]
+	         */
+	        getAncestors: function (includeSelf) {
+	            var ancestors = [];
+	            var node = includeSelf ? this : this.parentNode;
+	            while (node) {
+	                ancestors.push(node);
+	                node = node.parentNode;
+	            }
+	            ancestors.reverse();
+	            return ancestors;
+	        },
+
+	        /**
+	         * @param {string|Array=} [dimension='value'] Default 'value'. can be 0, 1, 2, 3
+	         * @return {number} Value.
+	         */
+	        getValue: function (dimension) {
+	            var data = this.hostTree.data;
+	            return data.get(data.getDimension(dimension || 'value'), this.dataIndex);
+	        },
+
+	        /**
+	         * @param {Object} layout
+	         * @param {boolean=} [merge=false]
+	         */
+	        setLayout: function (layout, merge) {
+	            this.dataIndex >= 0
+	                && this.hostTree.data.setItemLayout(this.dataIndex, layout, merge);
+	        },
+
+	        /**
+	         * @return {Object} layout
+	         */
+	        getLayout: function () {
+	            return this.hostTree.data.getItemLayout(this.dataIndex);
+	        },
+
+	        /**
+	         * @param {string} path
+	         * @return {module:echarts/model/Model}
+	         */
+	        getModel: function (path) {
+	            if (this.dataIndex < 0) {
+	                return;
+	            }
+	            var hostTree = this.hostTree;
+	            var itemModel = hostTree.data.getItemModel(this.dataIndex);
+	            var levelModel = this.getLevelModel();
+
+	            return itemModel.getModel(path, (levelModel || hostTree.hostModel).getModel(path));
+	        },
+
+	        /**
+	         * @return {module:echarts/model/Model}
+	         */
+	        getLevelModel: function () {
+	            return (this.hostTree.levelModels || [])[this.depth];
+	        },
+
+	        /**
+	         * @example
+	         *  setItemVisual('color', color);
+	         *  setItemVisual({
+	         *      'color': color
+	         *  });
+	         */
+	        setVisual: function (key, value) {
+	            this.dataIndex >= 0
+	                && this.hostTree.data.setItemVisual(this.dataIndex, key, value);
+	        },
+
+	        /**
+	         * Get item visual
+	         */
+	        getVisual: function (key, ignoreParent) {
+	            return this.hostTree.data.getItemVisual(this.dataIndex, key, ignoreParent);
+	        },
+
+	        /**
+	         * @public
+	         * @return {number}
+	         */
+	        getRawIndex: function () {
+	            return this.hostTree.data.getRawIndex(this.dataIndex);
+	        },
+
+	        /**
+	         * @public
+	         * @return {string}
+	         */
+	        getId: function () {
+	            return this.hostTree.data.getId(this.dataIndex);
+	        }
+	    };
+
+	    /**
+	     * @constructor
+	     * @alias module:echarts/data/Tree
+	     * @param {module:echarts/model/Model} hostModel
+	     * @param {Array.<Object>} levelOptions
+	     */
+	    function Tree(hostModel, levelOptions) {
+	        /**
+	         * @type {module:echarts/data/Tree~TreeNode}
+	         * @readOnly
+	         */
+	        this.root;
+
+	        /**
+	         * @type {module:echarts/data/List}
+	         * @readOnly
+	         */
+	        this.data;
+
+	        /**
+	         * Index of each item is the same as the raw index of coresponding list item.
+	         * @private
+	         * @type {Array.<module:echarts/data/Tree~TreeNode}
+	         */
+	        this._nodes = [];
+
+	        /**
+	         * @private
+	         * @readOnly
+	         * @type {module:echarts/model/Model}
+	         */
+	        this.hostModel = hostModel;
+
+	        /**
+	         * @private
+	         * @readOnly
+	         * @type {Array.<module:echarts/model/Model}
+	         */
+	        this.levelModels = zrUtil.map(levelOptions || [], function (levelDefine) {
+	            return new Model(levelDefine, hostModel, hostModel.ecModel);
+	        });
+	    }
+
+	    Tree.prototype = {
+
+	        constructor: Tree,
+
+	        type: 'tree',
+
+	        /**
+	         * Travel this subtree (include this node).
+	         * Usage:
+	         *    node.eachNode(function () { ... }); // preorder
+	         *    node.eachNode('preorder', function () { ... }); // preorder
+	         *    node.eachNode('postorder', function () { ... }); // postorder
+	         *    node.eachNode(
+	         *        {order: 'postorder', attr: 'viewChildren'},
+	         *        function () { ... }
+	         *    ); // postorder
+	         *
+	         * @param {(Object|string)} options If string, means order.
+	         * @param {string=} options.order 'preorder' or 'postorder'
+	         * @param {string=} options.attr 'children' or 'viewChildren'
+	         * @param {Function} cb
+	         * @param {Object}   [context]
+	         */
+	        eachNode: function(options, cb, context) {
+	            this.root.eachNode(options, cb, context);
+	        },
+
+	        /**
+	         * @param {number} dataIndex
+	         * @return {module:echarts/data/Tree~TreeNode}
+	         */
+	        getNodeByDataIndex: function (dataIndex) {
+	            var rawIndex = this.data.getRawIndex(dataIndex);
+	            return this._nodes[rawIndex];
+	        },
+
+	        /**
+	         * @param {string} name
+	         * @return {module:echarts/data/Tree~TreeNode}
+	         */
+	        getNodeByName: function (name) {
+	            return this.root.getNodeByName(name);
+	        },
+
+	        /**
+	         * Update item available by list,
+	         * when list has been performed options like 'filterSelf' or 'map'.
+	         */
+	        update: function () {
+	            var data = this.data;
+	            var nodes = this._nodes;
+
+	            for (var i = 0, len = nodes.length; i < len; i++) {
+	                nodes[i].dataIndex = -1;
+	            }
+
+	            for (var i = 0, len = data.count(); i < len; i++) {
+	                nodes[data.getRawIndex(i)].dataIndex = i;
+	            }
+	        },
+
+	        /**
+	         * Clear all layouts
+	         */
+	        clearLayouts: function () {
+	            this.data.clearItemLayouts();
+	        }
+	    };
+
+	    /**
+	     * data node format:
+	     * {
+	     *     name: ...
+	     *     value: ...
+	     *     children: [
+	     *         {
+	     *             name: ...
+	     *             value: ...
+	     *             children: ...
+	     *         },
+	     *         ...
+	     *     ]
+	     * }
+	     *
+	     * @static
+	     * @param {Objec} dataRoot Root node.
+	     * @param {module:echarts/model/Model} hostModel
+	     * @param {Array.<Object>} levelOptions
+	     * @return module:echarts/data/Tree
+	     */
+	    Tree.createTree = function (dataRoot, hostModel, levelOptions) {
+
+	        var tree = new Tree(hostModel, levelOptions);
+	        var listData = [];
+
+	        buildHierarchy(dataRoot);
+
+	        function buildHierarchy(dataNode, parentNode) {
+	            listData.push(dataNode);
+
+	            var node = new TreeNode(dataNode.name, tree);
+	            parentNode
+	                ? addChild(node, parentNode)
+	                : (tree.root = node);
+
+	            tree._nodes.push(node);
+
+	            var children = dataNode.children;
+	            if (children) {
+	                for (var i = 0; i < children.length; i++) {
+	                    buildHierarchy(children[i], node);
+	                }
+	            }
+	        }
+
+	        tree.root.updateDepthAndHeight(0);
+
+	        var dimensions = completeDimensions([{name: 'value'}], listData);
+	        var list = new List(dimensions, hostModel);
+	        list.initData(listData);
+
+	        linkList({
+	            mainData: list,
+	            struct: tree,
+	            structAttr: 'tree'
+	        });
+
+	        tree.update();
+
+	        return tree;
+	    };
+
+	    /**
+	     * It is needed to consider the mess of 'list', 'hostModel' when creating a TreeNote,
+	     * so this function is not ready and not necessary to be public.
+	     *
+	     * @param {(module:echarts/data/Tree~TreeNode|Object)} child
+	     */
+	    function addChild(child, node) {
+	        var children = node.children;
+	        if (child.parentNode === node) {
+	            return;
+	        }
+
+	        children.push(child);
+	        child.parentNode = node;
+	    }
+
+	    module.exports = Tree;
+
+
+/***/ },
+/* 185 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * Link lists and struct (graph or tree)
+	 */
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var each = zrUtil.each;
+
+	    var DATAS = '\0__link_datas';
+	    var MAIN_DATA = '\0__link_mainData';
+
+	    // Caution:
+	    // In most case, either list or its shallow clones (see list.cloneShallow)
+	    // is active in echarts process. So considering heap memory consumption,
+	    // we do not clone tree or graph, but share them among list and its shallow clones.
+	    // But in some rare case, we have to keep old list (like do animation in chart). So
+	    // please take care that both the old list and the new list share the same tree/graph.
+
+	    /**
+	     * @param {Object} opt
+	     * @param {module:echarts/data/List} opt.mainData
+	     * @param {Object} [opt.struct] For example, instance of Graph or Tree.
+	     * @param {string} [opt.structAttr] designation: list[structAttr] = struct;
+	     * @param {Object} [opt.datas] {dataType: data},
+	     *                 like: {node: nodeList, edge: edgeList}.
+	     *                 Should contain mainData.
+	     * @param {Object} [opt.datasAttr] {dataType: attr},
+	     *                 designation: struct[datasAttr[dataType]] = list;
+	     */
+	    function linkList(opt) {
+	        var mainData = opt.mainData;
+	        var datas = opt.datas;
+
+	        if (!datas) {
+	            datas = {main: mainData};
+	            opt.datasAttr = {main: 'data'};
+	        }
+	        opt.datas = opt.mainData = null;
+
+	        linkAll(mainData, datas, opt);
+
+	        // Porxy data original methods.
+	        each(datas, function (data) {
+	            each(mainData.TRANSFERABLE_METHODS, function (methodName) {
+	                data.wrapMethod(methodName, zrUtil.curry(transferInjection, opt));
+	            });
+
+	        });
+
+	        // Beyond transfer, additional features should be added to `cloneShallow`.
+	        mainData.wrapMethod('cloneShallow', zrUtil.curry(cloneShallowInjection, opt));
+
+	        // Only mainData trigger change, because struct.update may trigger
+	        // another changable methods, which may bring about dead lock.
+	        each(mainData.CHANGABLE_METHODS, function (methodName) {
+	            mainData.wrapMethod(methodName, zrUtil.curry(changeInjection, opt));
+	        });
+
+	        // Make sure datas contains mainData.
+	        zrUtil.assert(datas[mainData.dataType] === mainData);
+	    }
+
+	    function transferInjection(opt, res) {
+	        if (isMainData(this)) {
+	            // Transfer datas to new main data.
+	            var datas = zrUtil.extend({}, this[DATAS]);
+	            datas[this.dataType] = res;
+	            linkAll(res, datas, opt);
+	        }
+	        else {
+	            // Modify the reference in main data to point newData.
+	            linkSingle(res, this.dataType, this[MAIN_DATA], opt);
+	        }
+	        return res;
+	    }
+
+	    function changeInjection(opt, res) {
+	        opt.struct && opt.struct.update(this);
+	        return res;
+	    }
+
+	    function cloneShallowInjection(opt, res) {
+	        // cloneShallow, which brings about some fragilities, may be inappropriate
+	        // to be exposed as an API. So for implementation simplicity we can make
+	        // the restriction that cloneShallow of not-mainData should not be invoked
+	        // outside, but only be invoked here.
+	        each(res[DATAS], function (data, dataType) {
+	            data !== res && linkSingle(data.cloneShallow(), dataType, res, opt);
+	        });
+	        return res;
+	    }
+
+	    /**
+	     * Supplement method to List.
+	     *
+	     * @public
+	     * @param {string} [dataType] If not specified, return mainData.
+	     * @return {module:echarts/data/List}
+	     */
+	    function getLinkedData(dataType) {
+	        var mainData = this[MAIN_DATA];
+	        return (dataType == null || mainData == null)
+	            ? mainData
+	            : mainData[DATAS][dataType];
+	    }
+
+	    function isMainData(data) {
+	        return data[MAIN_DATA] === data;
+	    }
+
+	    function linkAll(mainData, datas, opt) {
+	        mainData[DATAS] = {};
+	        each(datas, function (data, dataType) {
+	            linkSingle(data, dataType, mainData, opt);
+	        });
+	    }
+
+	    function linkSingle(data, dataType, mainData, opt) {
+	        mainData[DATAS][dataType] = data;
+	        data[MAIN_DATA] = mainData;
+	        data.dataType = dataType;
+
+	        if (opt.struct) {
+	            data[opt.structAttr] = opt.struct;
+	            opt.struct[opt.datasAttr[dataType]] = data;
+	        }
+
+	        // Supplement method.
+	        data.getLinkedData = getLinkedData;
+	    }
+
+	    module.exports = linkList;
+
+
+/***/ },
+/* 186 */
+/***/ function(module, exports, __webpack_require__) {
+
+	 
+
+	    var zrUtil = __webpack_require__(4);
+	    var graphic = __webpack_require__(43);
+	    var DataDiffer = __webpack_require__(98);
+	    var helper = __webpack_require__(187);
+	    var Breadcrumb = __webpack_require__(188);
+	    var RoamController = __webpack_require__(174);
+	    var BoundingRect = __webpack_require__(9);
+	    var matrix = __webpack_require__(11);
+	    var animationUtil = __webpack_require__(189);
+	    var bind = zrUtil.bind;
+	    var Group = graphic.Group;
+	    var Rect = graphic.Rect;
+	    var each = zrUtil.each;
+
+	    var DRAG_THRESHOLD = 3;
+	    var PATH_LABEL_NORMAL = ['label', 'normal'];
+	    var PATH_LABEL_EMPHASIS = ['label', 'emphasis'];
+	    var Z_BASE = 10; // Should bigger than every z.
+	    var Z_BG = 1;
+	    var Z_CONTENT = 2;
+
+	    module.exports = __webpack_require__(1).extendChartView({
+
+	        type: 'treemap',
+
+	        /**
+	         * @override
+	         */
+	        init: function (o, api) {
+
+	            /**
+	             * @private
+	             * @type {module:zrender/container/Group}
+	             */
+	            this._containerGroup;
+
+	            /**
+	             * @private
+	             * @type {Object.<string, Array.<module:zrender/container/Group>>}
+	             */
+	            this._storage = createStorage();
+
+	            /**
+	             * @private
+	             * @type {module:echarts/data/Tree}
+	             */
+	            this._oldTree;
+
+	            /**
+	             * @private
+	             * @type {module:echarts/chart/treemap/Breadcrumb}
+	             */
+	            this._breadcrumb;
+
+	            /**
+	             * @private
+	             * @type {module:echarts/component/helper/RoamController}
+	             */
+	            this._controller;
+
+	            /**
+	             * 'ready', 'animating'
+	             * @private
+	             */
+	            this._state = 'ready';
+
+	            /**
+	             * @private
+	             * @type {boolean}
+	             */
+	            this._mayClick;
+	        },
+
+	        /**
+	         * @override
+	         */
+	        render: function (seriesModel, ecModel, api, payload) {
+
+	            var models = ecModel.findComponents({
+	                mainType: 'series', subType: 'treemap', query: payload
+	            });
+	            if (zrUtil.indexOf(models, seriesModel) < 0) {
+	                return;
+	            }
+
+	            this.seriesModel = seriesModel;
+	            this.api = api;
+	            this.ecModel = ecModel;
+
+	            var targetInfo = helper.retrieveTargetInfo(payload, seriesModel);
+	            var payloadType = payload && payload.type;
+	            var layoutInfo = seriesModel.layoutInfo;
+	            var isInit = !this._oldTree;
+	            var thisStorage = this._storage;
+
+	            // Mark new root when action is treemapRootToNode.
+	            var reRoot = (payloadType === 'treemapRootToNode' && targetInfo && thisStorage)
+	                ? {
+	                    rootNodeGroup: thisStorage.nodeGroup[targetInfo.node.getRawIndex()],
+	                    direction: payload.direction
+	                }
+	                : null;
+
+	            var containerGroup = this._giveContainerGroup(layoutInfo);
+
+	            var renderResult = this._doRender(containerGroup, seriesModel, reRoot);
+	            (
+	                !isInit && (
+	                    !payloadType
+	                    || payloadType === 'treemapZoomToNode'
+	                    || payloadType === 'treemapRootToNode'
+	                )
+	            )
+	                ? this._doAnimation(containerGroup, renderResult, seriesModel, reRoot)
+	                : renderResult.renderFinally();
+
+	            this._resetController(api);
+
+	            this._renderBreadcrumb(seriesModel, api, targetInfo);
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _giveContainerGroup: function (layoutInfo) {
+	            var containerGroup = this._containerGroup;
+	            if (!containerGroup) {
+	                // FIXME
+	                // 加一层containerGroup是为了clip，但是现在clip功能并没有实现。
+	                containerGroup = this._containerGroup = new Group();
+	                this._initEvents(containerGroup);
+	                this.group.add(containerGroup);
+	            }
+	            containerGroup.attr('position', [layoutInfo.x, layoutInfo.y]);
+
+	            return containerGroup;
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _doRender: function (containerGroup, seriesModel, reRoot) {
+	            var thisTree = seriesModel.getData().tree;
+	            var oldTree = this._oldTree;
+
+	            // Clear last shape records.
+	            var lastsForAnimation = createStorage();
+	            var thisStorage = createStorage();
+	            var oldStorage = this._storage;
+	            var willInvisibleEls = [];
+	            var doRenderNode = zrUtil.curry(
+	                renderNode, seriesModel,
+	                thisStorage, oldStorage, reRoot,
+	                lastsForAnimation, willInvisibleEls
+	            );
+
+	            // Notice: when thisTree and oldTree are the same tree (see list.cloneShadow),
+	            // the oldTree is actually losted, so we can not find all of the old graphic
+	            // elements from tree. So we use this stragegy: make element storage, move
+	            // from old storage to new storage, clear old storage.
+
+	            dualTravel(
+	                thisTree.root ? [thisTree.root] : [],
+	                (oldTree && oldTree.root) ? [oldTree.root] : [],
+	                containerGroup,
+	                thisTree === oldTree || !oldTree,
+	                0
+	            );
+
+	            // Process all removing.
+	            var willDeleteEls = clearStorage(oldStorage);
+
+	            this._oldTree = thisTree;
+	            this._storage = thisStorage;
+
+	            return {
+	                lastsForAnimation: lastsForAnimation,
+	                willDeleteEls: willDeleteEls,
+	                renderFinally: renderFinally
+	            };
+
+	            function dualTravel(thisViewChildren, oldViewChildren, parentGroup, sameTree, depth) {
+	                // When 'render' is triggered by action,
+	                // 'this' and 'old' may be the same tree,
+	                // we use rawIndex in that case.
+	                if (sameTree) {
+	                    oldViewChildren = thisViewChildren;
+	                    each(thisViewChildren, function (child, index) {
+	                        !child.isRemoved() && processNode(index, index);
+	                    });
+	                }
+	                // Diff hierarchically (diff only in each subtree, but not whole).
+	                // because, consistency of view is important.
+	                else {
+	                    (new DataDiffer(oldViewChildren, thisViewChildren, getKey, getKey))
+	                        .add(processNode)
+	                        .update(processNode)
+	                        .remove(zrUtil.curry(processNode, null))
+	                        .execute();
+	                }
+
+	                function getKey(node) {
+	                    // Identify by name or raw index.
+	                    return node.getId();
+	                }
+
+	                function processNode(newIndex, oldIndex) {
+	                    var thisNode = newIndex != null ? thisViewChildren[newIndex] : null;
+	                    var oldNode = oldIndex != null ? oldViewChildren[oldIndex] : null;
+
+	                    var group = doRenderNode(thisNode, oldNode, parentGroup, depth);
+
+	                    group && dualTravel(
+	                        thisNode && thisNode.viewChildren || [],
+	                        oldNode && oldNode.viewChildren || [],
+	                        group,
+	                        sameTree,
+	                        depth + 1
+	                    );
+	                }
+	            }
+
+	            function clearStorage(storage) {
+	                var willDeleteEls = createStorage();
+	                storage && each(storage, function (store, storageName) {
+	                    var delEls = willDeleteEls[storageName];
+	                    each(store, function (el) {
+	                        el && (delEls.push(el), el.__tmWillDelete = 1);
+	                    });
+	                });
+	                return willDeleteEls;
+	            }
+
+	            function renderFinally() {
+	                each(willDeleteEls, function (els) {
+	                    each(els, function (el) {
+	                        el.parent && el.parent.remove(el);
+	                    });
+	                });
+	                each(willInvisibleEls, function (el) {
+	                    el.invisible = true;
+	                    // Setting invisible is for optimizing, so no need to set dirty,
+	                    // just mark as invisible.
+	                    el.dirty();
+	                });
+	            }
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _doAnimation: function (containerGroup, renderResult, seriesModel, reRoot) {
+	            if (!seriesModel.get('animation')) {
+	                return;
+	            }
+
+	            var duration = seriesModel.get('animationDurationUpdate');
+	            var easing = seriesModel.get('animationEasing');
+	            var animationWrap = animationUtil.createWrap();
+
+	            // Make delete animations.
+	            each(renderResult.willDeleteEls, function (store, storageName) {
+	                each(store, function (el, rawIndex) {
+	                    if (el.invisible) {
+	                        return;
+	                    }
+
+	                    var parent = el.parent; // Always has parent, and parent is nodeGroup.
+	                    var target;
+
+	                    if (reRoot && reRoot.direction === 'drillDown') {
+	                        target = parent === reRoot.rootNodeGroup
+	                            // This is the content element of view root.
+	                            // Only `content` will enter this branch, because
+	                            // `background` and `nodeGroup` will not be deleted.
+	                            ? {
+	                                shape: {
+	                                    x: 0,
+	                                    y: 0,
+	                                    width: parent.__tmNodeWidth,
+	                                    height: parent.__tmNodeHeight
+	                                },
+	                                style: {
+	                                    opacity: 0
+	                                }
+	                            }
+	                            // Others.
+	                            : {style: {opacity: 0}};
+	                    }
+	                    else {
+	                        var targetX = 0;
+	                        var targetY = 0;
+
+	                        if (!parent.__tmWillDelete) {
+	                            // Let node animate to right-bottom corner, cooperating with fadeout,
+	                            // which is appropriate for user understanding.
+	                            // Divided by 2 for reRoot rolling up effect.
+	                            targetX = parent.__tmNodeWidth / 2;
+	                            targetY = parent.__tmNodeHeight / 2;
+	                        }
+
+	                        target = storageName === 'nodeGroup'
+	                            ? {position: [targetX, targetY], style: {opacity: 0}}
+	                            : {
+	                                shape: {x: targetX, y: targetY, width: 0, height: 0},
+	                                style: {opacity: 0}
+	                            };
+	                    }
+
+	                    target && animationWrap.add(el, target, duration, easing);
+	                });
+	            });
+
+	            // Make other animations
+	            each(this._storage, function (store, storageName) {
+	                each(store, function (el, rawIndex) {
+	                    var last = renderResult.lastsForAnimation[storageName][rawIndex];
+	                    var target = {};
+
+	                    if (!last) {
+	                        return;
+	                    }
+
+	                    if (storageName === 'nodeGroup') {
+	                        if (last.old) {
+	                            target.position = el.position.slice();
+	                            el.attr('position', last.old);
+	                        }
+	                    }
+	                    else {
+	                        if (last.old) {
+	                            target.shape = zrUtil.extend({}, el.shape);
+	                            el.setShape(last.old);
+	                        }
+
+	                        if (last.fadein) {
+	                            el.setStyle('opacity', 0);
+	                            target.style = {opacity: 1};
+	                        }
+	                        // When animation is stopped for succedent animation starting,
+	                        // el.style.opacity might not be 1
+	                        else if (el.style.opacity !== 1) {
+	                            target.style = {opacity: 1};
+	                        }
+	                    }
+
+	                    animationWrap.add(el, target, duration, easing);
+	                });
+	            }, this);
+
+	            this._state = 'animating';
+
+	            animationWrap
+	                .done(bind(function () {
+	                    this._state = 'ready';
+	                    renderResult.renderFinally();
+	                }, this))
+	                .start();
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _resetController: function (api) {
+	            var controller = this._controller;
+
+	            // Init controller.
+	            if (!controller) {
+	                controller = this._controller = new RoamController(api.getZr());
+	                controller.enable(this.seriesModel.get('roam'));
+	                controller.on('pan', bind(this._onPan, this));
+	                controller.on('zoom', bind(this._onZoom, this));
+	            }
+
+	            var rect = new BoundingRect(0, 0, api.getWidth(), api.getHeight());
+	            controller.rectProvider = function () {
+	                return rect;
+	            };
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _clearController: function () {
+	            var controller = this._controller;
+	            if (controller) {
+	                controller.off('pan').off('zoom');
+	                controller = null;
+	            }
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _onPan: function (dx, dy) {
+	            this._mayClick = false;
+
+	            if (this._state !== 'animating'
+	                && (Math.abs(dx) > DRAG_THRESHOLD || Math.abs(dy) > DRAG_THRESHOLD)
+	            ) {
+	                // These param must not be cached.
+	                var root = this.seriesModel.getData().tree.root;
+
+	                if (!root) {
+	                    return;
+	                }
+
+	                var rootLayout = root.getLayout();
+
+	                if (!rootLayout) {
+	                    return;
+	                }
+
+	                this.api.dispatchAction({
+	                    type: 'treemapMove',
+	                    from: this.uid,
+	                    seriesId: this.seriesModel.id,
+	                    rootRect: {
+	                        x: rootLayout.x + dx, y: rootLayout.y + dy,
+	                        width: rootLayout.width, height: rootLayout.height
+	                    }
+	                });
+	            }
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _onZoom: function (scale, mouseX, mouseY) {
+	            this._mayClick = false;
+
+	            if (this._state !== 'animating') {
+	                // These param must not be cached.
+	                var root = this.seriesModel.getData().tree.root;
+
+	                if (!root) {
+	                    return;
+	                }
+
+	                var rootLayout = root.getLayout();
+
+	                if (!rootLayout) {
+	                    return;
+	                }
+
+	                var rect = new BoundingRect(
+	                    rootLayout.x, rootLayout.y, rootLayout.width, rootLayout.height
+	                );
+	                var layoutInfo = this.seriesModel.layoutInfo;
+
+	                // Transform mouse coord from global to containerGroup.
+	                mouseX -= layoutInfo.x;
+	                mouseY -= layoutInfo.y;
+
+	                // Scale root bounding rect.
+	                var m = matrix.create();
+	                matrix.translate(m, m, [-mouseX, -mouseY]);
+	                matrix.scale(m, m, [scale, scale]);
+	                matrix.translate(m, m, [mouseX, mouseY]);
+
+	                rect.applyTransform(m);
+
+	                this.api.dispatchAction({
+	                    type: 'treemapRender',
+	                    from: this.uid,
+	                    seriesId: this.seriesModel.id,
+	                    rootRect: {
+	                        x: rect.x, y: rect.y,
+	                        width: rect.width, height: rect.height
+	                    }
+	                });
+	            }
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _initEvents: function (containerGroup) {
+	            // FIXME
+	            // 不用click以及silent的原因是，animate时视图设置silent true来避免click生效，
+	            // 但是animate中，按下鼠标，animate结束后（silent设回为false）松开鼠标，
+	            // 还是会触发click，期望是不触发。
+
+	            // Mousedown occurs when drag start, and mouseup occurs when drag end,
+	            // click event should not be triggered in that case.
+
+	            containerGroup.on('mousedown', function (e) {
+	                this._state === 'ready' && (this._mayClick = true);
+	            }, this);
+	            containerGroup.on('mouseup', function (e) {
+	                if (this._mayClick) {
+	                    this._mayClick = false;
+	                    this._state === 'ready' && onClick.call(this, e);
+	                }
+	            }, this);
+
+	            function onClick(e) {
+	                var nodeClick = this.seriesModel.get('nodeClick', true);
+
+	                if (!nodeClick) {
+	                    return;
+	                }
+
+	                var targetInfo = this.findTarget(e.offsetX, e.offsetY);
+
+	                if (!targetInfo) {
+	                    return;
+	                }
+
+	                var node = targetInfo.node;
+	                if (node.getLayout().isLeafRoot) {
+	                    this._rootToNode(targetInfo);
+	                }
+	                else {
+	                    if (nodeClick === 'zoomToNode') {
+	                        this._zoomToNode(targetInfo);
+	                    }
+	                    else if (nodeClick === 'link') {
+	                        var itemModel = node.hostTree.data.getItemModel(node.dataIndex);
+	                        var link = itemModel.get('link', true);
+	                        var linkTarget = itemModel.get('target', true) || 'blank';
+	                        link && window.open(link, linkTarget);
+	                    }
+	                }
+	            }
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _renderBreadcrumb: function (seriesModel, api, targetInfo) {
+	            if (!targetInfo) {
+	                // Find breadcrumb tail on center of containerGroup.
+	                targetInfo = this.findTarget(api.getWidth() / 2, api.getHeight() / 2);
+
+	                if (!targetInfo) {
+	                    targetInfo = {node: seriesModel.getData().tree.root};
+	                }
+	            }
+
+	            (this._breadcrumb || (this._breadcrumb = new Breadcrumb(this.group, bind(onSelect, this))))
+	                .render(seriesModel, api, targetInfo.node);
+
+	            function onSelect(node) {
+	                if (this._state !== 'animating') {
+	                    helper.aboveViewRoot(seriesModel.getViewRoot(), node)
+	                        ? this._rootToNode({node: node})
+	                        : this._zoomToNode({node: node});
+	                }
+	            }
+	        },
+
+	        /**
+	         * @override
+	         */
+	        remove: function () {
+	            this._clearController();
+	            this._containerGroup && this._containerGroup.removeAll();
+	            this._storage = createStorage();
+	            this._state = 'ready';
+	            this._breadcrumb && this._breadcrumb.remove();
+	        },
+
+	        dispose: function () {
+	            this._clearController();
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _zoomToNode: function (targetInfo) {
+	            this.api.dispatchAction({
+	                type: 'treemapZoomToNode',
+	                from: this.uid,
+	                seriesId: this.seriesModel.id,
+	                targetNode: targetInfo.node
+	            });
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _rootToNode: function (targetInfo) {
+	            this.api.dispatchAction({
+	                type: 'treemapRootToNode',
+	                from: this.uid,
+	                seriesId: this.seriesModel.id,
+	                targetNode: targetInfo.node
+	            });
+	        },
+
+	        /**
+	         * @public
+	         * @param {number} x Global coord x.
+	         * @param {number} y Global coord y.
+	         * @return {Object} info If not found, return undefined;
+	         * @return {number} info.node Target node.
+	         * @return {number} info.offsetX x refer to target node.
+	         * @return {number} info.offsetY y refer to target node.
+	         */
+	        findTarget: function (x, y) {
+	            var targetInfo;
+	            var viewRoot = this.seriesModel.getViewRoot();
+
+	            viewRoot.eachNode({attr: 'viewChildren', order: 'preorder'}, function (node) {
+	                var bgEl = this._storage.background[node.getRawIndex()];
+	                // If invisible, there might be no element.
+	                if (bgEl) {
+	                    var point = bgEl.transformCoordToLocal(x, y);
+	                    var shape = bgEl.shape;
+
+	                    // For performance consideration, dont use 'getBoundingRect'.
+	                    if (shape.x <= point[0]
+	                        && point[0] <= shape.x + shape.width
+	                        && shape.y <= point[1]
+	                        && point[1] <= shape.y + shape.height
+	                    ) {
+	                        targetInfo = {node: node, offsetX: point[0], offsetY: point[1]};
+	                    }
+	                    else {
+	                        return false; // Suppress visit subtree.
+	                    }
+	                }
+	            }, this);
+
+	            return targetInfo;
+	        }
+
+	    });
+
+	    /**
+	     * @inner
+	     */
+	    function createStorage() {
+	        return {nodeGroup: [], background: [], content: []};
+	    }
+
+	    /**
+	     * @inner
+	     * @return Return undefined means do not travel further.
+	     */
+	    function renderNode(
+	        seriesModel, thisStorage, oldStorage, reRoot,
+	        lastsForAnimation, willInvisibleEls,
+	        thisNode, oldNode, parentGroup, depth
+	    ) {
+	        // Whether under viewRoot.
+	        if (!thisNode) {
+	            // Deleting nodes will be performed finally. This method just find
+	            // element from old storage, or create new element, set them to new
+	            // storage, and set styles.
+	            return;
+	        }
+
+	        var thisLayout = thisNode.getLayout();
+
+	        if (!thisLayout || !thisLayout.isInView) {
+	            return;
+	        }
+
+	        var thisWidth = thisLayout.width;
+	        var thisHeight = thisLayout.height;
+	        var thisInvisible = thisLayout.invisible;
+
+	        var thisRawIndex = thisNode.getRawIndex();
+	        var oldRawIndex = oldNode && oldNode.getRawIndex();
+
+	        // Node group
+	        var group = giveGraphic('nodeGroup', Group);
+
+	        if (!group) {
+	            return;
+	        }
+
+	        parentGroup.add(group);
+	        // x,y are not set when el is above view root.
+	        group.attr('position', [thisLayout.x || 0, thisLayout.y || 0]);
+	        group.__tmNodeWidth = thisWidth;
+	        group.__tmNodeHeight = thisHeight;
+
+	        if (thisLayout.isAboveViewRoot) {
+	            return group;
+	        }
+
+	        // Background
+	        var bg = giveGraphic('background', Rect, depth, Z_BG);
+	        if (bg) {
+	            bg.setShape({x: 0, y: 0, width: thisWidth, height: thisHeight});
+	            updateStyle(bg, function () {
+	                bg.setStyle('fill', thisNode.getVisual('borderColor', true));
+	            });
+	            group.add(bg);
+	        }
+
+	        var thisViewChildren = thisNode.viewChildren;
+
+	        // No children, render content.
+	        if (!thisViewChildren || !thisViewChildren.length) {
+	            var content = giveGraphic('content', Rect, depth, Z_CONTENT);
+	            content && renderContent(group);
+	        }
+
+	        return group;
+
+	        // ----------------------------
+	        // | Procedures in renderNode |
+	        // ----------------------------
+
+	        function renderContent(group) {
+	            // For tooltip.
+	            content.dataIndex = thisNode.dataIndex;
+	            content.seriesIndex = seriesModel.seriesIndex;
+
+	            var borderWidth = thisLayout.borderWidth;
+	            var contentWidth = Math.max(thisWidth - 2 * borderWidth, 0);
+	            var contentHeight = Math.max(thisHeight - 2 * borderWidth, 0);
+
+	            content.culling = true;
+	            content.setShape({
+	                x: borderWidth,
+	                y: borderWidth,
+	                width: contentWidth,
+	                height: contentHeight
+	            });
+
+	            var visualColor = thisNode.getVisual('color', true);
+	            updateStyle(content, function () {
+	                var normalStyle = {fill: visualColor};
+	                var emphasisStyle = thisNode.getModel('itemStyle.emphasis').getItemStyle();
+
+	                prepareText(normalStyle, emphasisStyle, visualColor, contentWidth, contentHeight);
+
+	                content.setStyle(normalStyle);
+	                graphic.setHoverStyle(content, emphasisStyle);
+	            });
+
+	            group.add(content);
+	        }
+
+	        function updateStyle(element, cb) {
+	            if (!thisInvisible) {
+	                // If invisible, do not set visual, otherwise the element will
+	                // change immediately before animation. We think it is OK to
+	                // remain its origin color when moving out of the view window.
+	                cb();
+
+	                if (!element.__tmWillVisible) {
+	                    element.invisible = false;
+	                }
+	            }
+	            else {
+	                // Delay invisible setting utill animation finished,
+	                // avoid element vanish suddenly before animation.
+	                !element.invisible && willInvisibleEls.push(element);
+	            }
+	        }
+
+	        function prepareText(normalStyle, emphasisStyle, visualColor, contentWidth, contentHeight) {
+	            var nodeModel = thisNode.getModel();
+	            var text = nodeModel.get('name');
+	            if (thisLayout.isLeafRoot) {
+	                var iconChar = seriesModel.get('drillDownIcon', true);
+	                text = iconChar ? iconChar + ' ' + text : test;
+	            }
+
+	            setText(
+	                text, normalStyle, nodeModel, PATH_LABEL_NORMAL,
+	                visualColor, contentWidth, contentHeight
+	            );
+	            setText(
+	                text, emphasisStyle, nodeModel, PATH_LABEL_EMPHASIS,
+	                visualColor, contentWidth, contentHeight
+	            );
+	        }
+
+	        function setText(text, style, nodeModel, labelPath, visualColor, contentWidth, contentHeight) {
+	            var labelModel = nodeModel.getModel(labelPath);
+	            var labelTextStyleModel = labelModel.getModel('textStyle');
+
+	            graphic.setText(style, labelModel, visualColor);
+
+	            // text.align and text.baseline is not included by graphic.setText,
+	            // because in most cases the two attributes are not exposed to user,
+	            // except in treemap.
+	            style.textAlign = labelTextStyleModel.get('align');
+	            style.textVerticalAlign = labelTextStyleModel.get('baseline');
+
+	            var textRect = labelTextStyleModel.getTextRect(text);
+	            if (!labelModel.getShallow('show') || textRect.height > contentHeight) {
+	                style.text = '';
+	            }
+	            else if (textRect.width > contentWidth) {
+	                style.text = labelTextStyleModel.get('ellipsis')
+	                    ? labelTextStyleModel.truncateText(
+	                        text, contentWidth, null, {minChar: 2}
+	                    )
+	                    : '';
+	            }
+	            else {
+	                style.text = text;
+	            }
+	        }
+
+	        function giveGraphic(storageName, Ctor, depth, z) {
+	            var element = oldRawIndex != null && oldStorage[storageName][oldRawIndex];
+	            var lasts = lastsForAnimation[storageName];
+
+	            if (element) {
+	                // Remove from oldStorage
+	                oldStorage[storageName][oldRawIndex] = null;
+	                prepareAnimationWhenHasOld(lasts, element, storageName);
+	            }
+	            // If invisible and no old element, do not create new element (for optimizing).
+	            else if (!thisInvisible) {
+	                element = new Ctor({z: calculateZ(depth, z)});
+	                element.__tmDepth = depth;
+	                element.__tmStorageName = storageName;
+	                prepareAnimationWhenNoOld(lasts, element, storageName);
+	            }
+
+	            // Set to thisStorage
+	            return (thisStorage[storageName][thisRawIndex] = element);
+	        }
+
+	        function prepareAnimationWhenHasOld(lasts, element, storageName) {
+	            var lastCfg = lasts[thisRawIndex] = {};
+	            lastCfg.old = storageName === 'nodeGroup'
+	                ? element.position.slice()
+	                : zrUtil.extend({}, element.shape);
+	        }
+
+	        // If a element is new, we need to find the animation start point carefully,
+	        // otherwise it will looks strange when 'zoomToNode'.
+	        function prepareAnimationWhenNoOld(lasts, element, storageName) {
+	            var lastCfg = lasts[thisRawIndex] = {};
+	            var parentNode = thisNode.parentNode;
+
+	            if (parentNode && (!reRoot || reRoot.direction === 'drillDown')) {
+	                var parentOldX = 0;
+	                var parentOldY = 0;
+
+	                // New nodes appear from right-bottom corner in 'zoomToNode' animation.
+	                // For convenience, get old bounding rect from background.
+	                var parentOldBg = lastsForAnimation.background[parentNode.getRawIndex()];
+	                if (!reRoot && parentOldBg && parentOldBg.old) {
+	                    parentOldX = parentOldBg.old.width;
+	                    parentOldY = parentOldBg.old.height;
+	                }
+
+	                // When no parent old shape found, its parent is new too,
+	                // so we can just use {x:0, y:0}.
+	                lastCfg.old = storageName === 'nodeGroup'
+	                    ? [0, parentOldY]
+	                    : {x: parentOldX, y: parentOldY, width: 0, height: 0};
+	            }
+
+	            // Fade in, user can be aware that these nodes are new.
+	            lastCfg.fadein = storageName !== 'nodeGroup';
+	        }
+	    }
+
+	    // We can not set all backgroud with the same z, Because the behaviour of
+	    // drill down and roll up differ background creation sequence from tree
+	    // hierarchy sequence, which cause that lowser background element overlap
+	    // upper ones. So we calculate z based on depth.
+	    // Moreover, we try to shrink down z interval to [0, 1] to avoid that
+	    // treemap with large z overlaps other components.
+	    function calculateZ(depth, zInLevel) {
+	        var zb = depth * Z_BASE + zInLevel;
+	        return (zb - 1) / zb;
+	    }
+
+
+
+/***/ },
+/* 187 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+
+	    var helper = {
+
+	        retrieveTargetInfo: function (payload, seriesModel) {
+	            if (payload
+	                && (
+	                    payload.type === 'treemapZoomToNode'
+	                    || payload.type === 'treemapRootToNode'
+	                )
+	            ) {
+	                var root = seriesModel.getData().tree.root;
+	                var targetNode = payload.targetNode;
+	                if (targetNode && root.contains(targetNode)) {
+	                    return {node: targetNode};
+	                }
+
+	                var targetNodeId = payload.targetNodeId;
+	                if (targetNodeId != null && (targetNode = root.getNodeById(targetNodeId))) {
+	                    return {node: targetNode};
+	                }
+	            }
+	        },
+
+	        // Not includes the given node at the last item.
+	        getPathToRoot: function (node) {
+	            var path = [];
+	            while (node) {
+	                node = node.parentNode;
+	                node && path.push(node);
+	            }
+	            return path.reverse();
+	        },
+
+	        aboveViewRoot: function (viewRoot, node) {
+	            var viewPath = helper.getPathToRoot(viewRoot);
+	            return zrUtil.indexOf(viewPath, node) >= 0;
+	        }
+	    };
+
+	    module.exports = helper;
+
+
+/***/ },
+/* 188 */
+/***/ function(module, exports, __webpack_require__) {
+
+	 
+
+	    var graphic = __webpack_require__(43);
+	    var layout = __webpack_require__(21);
+	    var zrUtil = __webpack_require__(4);
+
+	    var TEXT_PADDING = 8;
+	    var ITEM_GAP = 8;
+	    var ARRAY_LENGTH = 5;
+
+	    function Breadcrumb(containerGroup, onSelect) {
+	        /**
+	         * @private
+	         * @type {module:zrender/container/Group}
+	         */
+	        this.group = new graphic.Group();
+
+	        containerGroup.add(this.group);
+
+	        /**
+	         * @private
+	         * @type {Function}
+	         */
+	        this._onSelect = onSelect || zrUtil.noop;
+	    }
+
+	    Breadcrumb.prototype = {
+
+	        constructor: Breadcrumb,
+
+	        render: function (seriesModel, api, targetNode) {
+	            var model = seriesModel.getModel('breadcrumb');
+	            var thisGroup = this.group;
+
+	            thisGroup.removeAll();
+
+	            if (!model.get('show') || !targetNode) {
+	                return;
+	            }
+
+	            var normalStyleModel = model.getModel('itemStyle.normal');
+	            // var emphasisStyleModel = model.getModel('itemStyle.emphasis');
+	            var textStyleModel = normalStyleModel.getModel('textStyle');
+
+	            var layoutParam = {
+	                pos: {
+	                    left: model.get('left'),
+	                    right: model.get('right'),
+	                    top: model.get('top'),
+	                    bottom: model.get('bottom')
+	                },
+	                box: {
+	                    width: api.getWidth(),
+	                    height: api.getHeight()
+	                },
+	                emptyItemWidth: model.get('emptyItemWidth'),
+	                totalWidth: 0,
+	                renderList: []
+	            };
+
+	            this._prepare(
+	                model, targetNode, layoutParam, textStyleModel
+	            );
+	            this._renderContent(
+	                model, targetNode, layoutParam, normalStyleModel, textStyleModel
+	            );
+
+	            layout.positionGroup(thisGroup, layoutParam.pos, layoutParam.box);
+	        },
+
+	        /**
+	         * Prepare render list and total width
+	         * @private
+	         */
+	        _prepare: function (model, targetNode, layoutParam, textStyleModel) {
+	            for (var node = targetNode; node; node = node.parentNode) {
+	                var text = node.getModel().get('name');
+	                var textRect = textStyleModel.getTextRect(text);
+	                var itemWidth = Math.max(
+	                    textRect.width + TEXT_PADDING * 2,
+	                    layoutParam.emptyItemWidth
+	                );
+	                layoutParam.totalWidth += itemWidth + ITEM_GAP;
+	                layoutParam.renderList.push({node: node, text: text, width: itemWidth});
+	            }
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _renderContent: function (
+	            model, targetNode, layoutParam, normalStyleModel, textStyleModel
+	        ) {
+	            // Start rendering.
+	            var lastX = 0;
+	            var emptyItemWidth = layoutParam.emptyItemWidth;
+	            var height = model.get('height');
+	            var availableSize = layout.getAvailableSize(layoutParam.pos, layoutParam.box);
+	            var totalWidth = layoutParam.totalWidth;
+	            var renderList = layoutParam.renderList;
+
+	            for (var i = renderList.length - 1; i >= 0; i--) {
+	                var item = renderList[i];
+	                var itemWidth = item.width;
+	                var text = item.text;
+
+	                // Hdie text and shorten width if necessary.
+	                if (totalWidth > availableSize.width) {
+	                    totalWidth -= itemWidth - emptyItemWidth;
+	                    itemWidth = emptyItemWidth;
+	                    text = '';
+	                }
+
+	                this.group.add(new graphic.Polygon({
+	                    shape: {
+	                        points: makeItemPoints(
+	                            lastX, 0, itemWidth, height,
+	                            i === renderList.length - 1, i === 0
+	                        )
+	                    },
+	                    style: zrUtil.defaults(
+	                        normalStyleModel.getItemStyle(),
+	                        {
+	                            lineJoin: 'bevel',
+	                            text: text,
+	                            textFill: textStyleModel.getTextColor(),
+	                            textFont: textStyleModel.getFont()
+	                        }
+	                    ),
+	                    z: 10,
+	                    onclick: zrUtil.bind(this._onSelect, this, item.node)
+	                }));
+
+	                lastX += itemWidth + ITEM_GAP;
+	            }
+	        },
+
+	        /**
+	         * @override
+	         */
+	        remove: function () {
+	            this.group.removeAll();
+	        }
+	    };
+
+	    function makeItemPoints(x, y, itemWidth, itemHeight, head, tail) {
+	        var points = [
+	            [head ? x : x - ARRAY_LENGTH, y],
+	            [x + itemWidth, y],
+	            [x + itemWidth, y + itemHeight],
+	            [head ? x : x - ARRAY_LENGTH, y + itemHeight]
+	        ];
+	        !tail && points.splice(2, 0, [x + itemWidth + ARRAY_LENGTH, y + itemHeight / 2]);
+	        !head && points.push([x, y + itemHeight / 2]);
+	        return points;
+	    }
+
+	    module.exports = Breadcrumb;
+
+
+/***/ },
+/* 189 */
+/***/ function(module, exports, __webpack_require__) {
+
+	 
+
+	    var zrUtil = __webpack_require__(4);
+
+	    /**
+	     * @param {number} [time=500] Time in ms
+	     * @param {string} [easing='linear']
+	     * @param {number} [delay=0]
+	     * @param {Function} [callback]
+	     *
+	     * @example
+	     *  // Animate position
+	     *  animation
+	     *      .createWrap()
+	     *      .add(el1, {position: [10, 10]})
+	     *      .add(el2, {shape: {width: 500}, style: {fill: 'red'}}, 400)
+	     *      .done(function () { // done })
+	     *      .start('cubicOut');
+	     */
+	    function createWrap() {
+
+	        var storage = [];
+	        var elExistsMap = {};
+	        var doneCallback;
+
+	        return {
+
+	            /**
+	             * Caution: a el can only be added once, otherwise 'done'
+	             * might not be called. This method checks this (by el.id),
+	             * suppresses adding and returns false when existing el found.
+	             *
+	             * @param {modele:zrender/Element} el
+	             * @param {Object} target
+	             * @param {number} [time=500]
+	             * @param {number} [delay=0]
+	             * @param {string} [easing='linear']
+	             * @return {boolean} Whether adding succeeded.
+	             *
+	             * @example
+	             *     add(el, target, time, delay, easing);
+	             *     add(el, target, time, easing);
+	             *     add(el, target, time);
+	             *     add(el, target);
+	             */
+	            add: function (el, target, time, delay, easing) {
+	                if (zrUtil.isString(delay)) {
+	                    easing = delay;
+	                    delay = 0;
+	                }
+
+	                if (elExistsMap[el.id]) {
+	                    return false;
+	                }
+	                elExistsMap[el.id] = 1;
+
+	                storage.push(
+	                    {el: el, target: target, time: time, delay: delay, easing: easing}
+	                );
+
+	                return true;
+	            },
+
+	            /**
+	             * Only execute when animation finished. Will not execute when any
+	             * of 'stop' or 'stopAnimation' called.
+	             *
+	             * @param {Function} callback
+	             */
+	            done: function (callback) {
+	                doneCallback = callback;
+	                return this;
+	            },
+
+	            /**
+	             * Will stop exist animation firstly.
+	             */
+	            start: function () {
+	                var count = storage.length;
+
+	                for (var i = 0, len = storage.length; i < len; i++) {
+	                    var item = storage[i];
+	                    item.el.animateTo(item.target, item.time, item.delay, item.easing, done);
+	                }
+
+	                return this;
+
+	                function done() {
+	                    count--;
+	                    if (!count) {
+	                        storage.length = 0;
+	                        elExistsMap = {};
+	                        doneCallback && doneCallback();
+	                    }
+	                }
+	            }
+	        };
+	    }
+
+	    module.exports = {createWrap: createWrap};
+
+
+/***/ },
+/* 190 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @file Treemap action
+	 */
+
+
+	    var echarts = __webpack_require__(1);
+	    var helper = __webpack_require__(187);
+
+	    var noop = function () {};
+
+	    var actionTypes = [
+	        'treemapZoomToNode',
+	        'treemapRender',
+	        'treemapMove'
+	    ];
+
+	    for (var i = 0; i < actionTypes.length; i++) {
+	        echarts.registerAction({type: actionTypes[i], update: 'updateView'}, noop);
+	    }
+
+	    echarts.registerAction(
+	        {type: 'treemapRootToNode', update: 'updateView'},
+	        function (payload, ecModel) {
+
+	            ecModel.eachComponent(
+	                {mainType: 'series', subType: 'treemap', query: payload},
+	                handleRootToNode
+	            );
+
+	            function handleRootToNode(model, index) {
+	                var targetInfo = helper.retrieveTargetInfo(payload, model);
+
+	                if (targetInfo) {
+	                    var originViewRoot = model.getViewRoot();
+	                    if (originViewRoot) {
+	                        payload.direction = helper.aboveViewRoot(originViewRoot, targetInfo.node)
+	                            ? 'rollUp' : 'drillDown';
+	                    }
+	                    model.resetViewRoot(targetInfo.node);
+	                }
+	            }
+	        }
+	    );
+
+
+
+/***/ },
+/* 191 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var VisualMapping = __webpack_require__(192);
+	    var zrColor = __webpack_require__(39);
+	    var zrUtil = __webpack_require__(4);
+	    var isArray = zrUtil.isArray;
+
+	    var ITEM_STYLE_NORMAL = 'itemStyle.normal';
+
+	    module.exports = function (ecModel, api, payload) {
+
+	        var condition = {mainType: 'series', subType: 'treemap', query: payload};
+	        ecModel.eachComponent(condition, function (seriesModel) {
+
+	            var tree = seriesModel.getData().tree;
+	            var root = tree.root;
+	            var seriesItemStyleModel = seriesModel.getModel(ITEM_STYLE_NORMAL);
+
+	            if (root.isRemoved()) {
+	                return;
+	            }
+
+	            var levelItemStyles = zrUtil.map(tree.levelModels, function (levelModel) {
+	                return levelModel ? levelModel.get(ITEM_STYLE_NORMAL) : null;
+	            });
+
+	            travelTree(
+	                root, // Visual should calculate from tree root but not view root.
+	                {},
+	                levelItemStyles,
+	                seriesItemStyleModel,
+	                seriesModel.getViewRoot().getAncestors(),
+	                seriesModel
+	            );
+	        });
+	    };
+
+	    function travelTree(
+	        node, designatedVisual, levelItemStyles, seriesItemStyleModel,
+	        viewRootAncestors, seriesModel
+	    ) {
+	        var nodeModel = node.getModel();
+	        var nodeLayout = node.getLayout();
+
+	        // Optimize
+	        if (!nodeLayout || nodeLayout.invisible || !nodeLayout.isInView) {
+	            return;
+	        }
+
+	        var nodeItemStyleModel = node.getModel(ITEM_STYLE_NORMAL);
+	        var levelItemStyle = levelItemStyles[node.depth];
+	        var visuals = buildVisuals(
+	            nodeItemStyleModel, designatedVisual, levelItemStyle, seriesItemStyleModel
+	        );
+
+	        // calculate border color
+	        var borderColor = nodeItemStyleModel.get('borderColor');
+	        var borderColorSaturation = nodeItemStyleModel.get('borderColorSaturation');
+	        var thisNodeColor;
+	        if (borderColorSaturation != null) {
+	            // For performance, do not always execute 'calculateColor'.
+	            thisNodeColor = calculateColor(visuals, node);
+	            borderColor = calculateBorderColor(borderColorSaturation, thisNodeColor);
+	        }
+	        node.setVisual('borderColor', borderColor);
+
+	        var viewChildren = node.viewChildren;
+	        if (!viewChildren || !viewChildren.length) {
+	            thisNodeColor = calculateColor(visuals, node);
+	            // Apply visual to this node.
+	            node.setVisual('color', thisNodeColor);
+	        }
+	        else {
+	            var mapping = buildVisualMapping(
+	                node, nodeModel, nodeLayout, nodeItemStyleModel, visuals, viewChildren
+	            );
+	            // Designate visual to children.
+	            zrUtil.each(viewChildren, function (child, index) {
+	                // If higher than viewRoot, only ancestors of viewRoot is needed to visit.
+	                if (child.depth >= viewRootAncestors.length
+	                    || child === viewRootAncestors[child.depth]
+	                ) {
+	                    var childVisual = mapVisual(
+	                        nodeModel, visuals, child, index, mapping, seriesModel
+	                    );
+	                    travelTree(
+	                        child, childVisual, levelItemStyles, seriesItemStyleModel,
+	                        viewRootAncestors, seriesModel
+	                    );
+	                }
+	            });
+	        }
+	    }
+
+	    function buildVisuals(
+	        nodeItemStyleModel, designatedVisual, levelItemStyle, seriesItemStyleModel
+	    ) {
+	        var visuals = zrUtil.extend({}, designatedVisual);
+
+	        zrUtil.each(['color', 'colorAlpha', 'colorSaturation'], function (visualName) {
+	            // Priority: thisNode > thisLevel > parentNodeDesignated > seriesModel
+	            var val = nodeItemStyleModel.get(visualName, true); // Ignore parent
+	            val == null && levelItemStyle && (val = levelItemStyle[visualName]);
+	            val == null && (val = designatedVisual[visualName]);
+	            val == null && (val = seriesItemStyleModel.get(visualName));
+
+	            val != null && (visuals[visualName] = val);
+	        });
+
+	        return visuals;
+	    }
+
+	    function calculateColor(visuals) {
+	        var color = getValueVisualDefine(visuals, 'color');
+
+	        if (color) {
+	            var colorAlpha = getValueVisualDefine(visuals, 'colorAlpha');
+	            var colorSaturation = getValueVisualDefine(visuals, 'colorSaturation');
+	            if (colorSaturation) {
+	                color = zrColor.modifyHSL(color, null, null, colorSaturation);
+	            }
+	            if (colorAlpha) {
+	                color = zrColor.modifyAlpha(color, colorAlpha);
+	            }
+
+	            return color;
+	        }
+	    }
+
+	    function calculateBorderColor(borderColorSaturation, thisNodeColor) {
+	        return thisNodeColor != null
+	             ? zrColor.modifyHSL(thisNodeColor, null, null, borderColorSaturation)
+	             : null;
+	    }
+
+	    function getValueVisualDefine(visuals, name) {
+	        var value = visuals[name];
+	        if (value != null && value !== 'none') {
+	            return value;
+	        }
+	    }
+
+	    function buildVisualMapping(
+	        node, nodeModel, nodeLayout, nodeItemStyleModel, visuals, viewChildren
+	    ) {
+	        if (!viewChildren || !viewChildren.length) {
+	            return;
+	        }
+
+	        var rangeVisual = getRangeVisual(nodeModel, 'color')
+	            || (
+	                visuals.color != null
+	                && visuals.color !== 'none'
+	                && (
+	                    getRangeVisual(nodeModel, 'colorAlpha')
+	                    || getRangeVisual(nodeModel, 'colorSaturation')
+	                )
+	            );
+
+	        if (!rangeVisual) {
+	            return;
+	        }
+
+	        var colorMappingBy = nodeModel.get('colorMappingBy');
+	        var opt = {
+	            type: rangeVisual.name,
+	            dataExtent: nodeLayout.dataExtent,
+	            visual: rangeVisual.range
+	        };
+	        if (opt.type === 'color'
+	            && (colorMappingBy === 'index' || colorMappingBy === 'id')
+	        ) {
+	            opt.mappingMethod = 'category';
+	            opt.loop = true;
+	            // categories is ordinal, so do not set opt.categories.
+	        }
+	        else {
+	            opt.mappingMethod = 'linear';
+	        }
+
+	        var mapping = new VisualMapping(opt);
+	        mapping.__drColorMappingBy = colorMappingBy;
+
+	        return mapping;
+	    }
+
+	    // Notice: If we dont have the attribute 'colorRange', but only use
+	    // attribute 'color' to represent both concepts of 'colorRange' and 'color',
+	    // (It means 'colorRange' when 'color' is Array, means 'color' when not array),
+	    // this problem will be encountered:
+	    // If a level-1 node dont have children, and its siblings has children,
+	    // and colorRange is set on level-1, then the node can not be colored.
+	    // So we separate 'colorRange' and 'color' to different attributes.
+	    function getRangeVisual(nodeModel, name) {
+	        // 'colorRange', 'colorARange', 'colorSRange'.
+	        // If not exsits on this node, fetch from levels and series.
+	        var range = nodeModel.get(name);
+	        return (isArray(range) && range.length) ? {name: name, range: range} : null;
+	    }
+
+	    function mapVisual(nodeModel, visuals, child, index, mapping, seriesModel) {
+	        var childVisuals = zrUtil.extend({}, visuals);
+
+	        if (mapping) {
+	            var mappingType = mapping.type;
+	            var colorMappingBy = mappingType === 'color' && mapping.__drColorMappingBy;
+	            var value =
+	                colorMappingBy === 'index'
+	                ? index
+	                : colorMappingBy === 'id'
+	                ? seriesModel.mapIdToIndex(child.getId())
+	                : child.getValue(nodeModel.get('visualDimension'));
+
+	            childVisuals[mappingType] = mapping.mapValueToVisual(value);
+	        }
+
+	        return childVisuals;
+	    }
+
+
+
+/***/ },
+/* 192 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @file Visual mapping.
+	 */
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var zrColor = __webpack_require__(39);
+	    var linearMap = __webpack_require__(7).linearMap;
+	    var each = zrUtil.each;
+	    var isObject = zrUtil.isObject;
+
+	    var CATEGORY_DEFAULT_VISUAL_INDEX = -1;
+
+	    /**
+	     * @param {Object} option
+	     * @param {string} [option.type] See visualHandlers.
+	     * @param {string} [option.mappingMethod] 'linear' or 'piecewise' or 'category' or 'fixed'
+	     * @param {Array.<number>=} [option.dataExtent] [minExtent, maxExtent],
+	     *                                              required when mappingMethod is 'linear'
+	     * @param {Array.<Object>=} [option.pieceList] [
+	     *                                             {value: someValue},
+	     *                                             {interval: [min1, max1], visual: {...}},
+	     *                                             {interval: [min2, max2]}
+	     *                                             ],
+	     *                                            required when mappingMethod is 'piecewise'.
+	     *                                            Visual for only each piece can be specified.
+	     * @param {Array.<string|Object>=} [option.categories] ['cate1', 'cate2']
+	     *                                            required when mappingMethod is 'category'.
+	     *                                            If no option.categories, categories is set
+	     *                                            as [0, 1, 2, ...].
+	     * @param {boolean} [option.loop=false] Whether loop mapping when mappingMethod is 'category'.
+	     * @param {(Array|Object|*)} [option.visual]  Visual data.
+	     *                                            when mappingMethod is 'category',
+	     *                                            visual data can be array or object
+	     *                                            (like: {cate1: '#222', none: '#fff'})
+	     *                                            or primary types (which represents
+	     *                                            defualt category visual), otherwise visual
+	     *                                            can be array or primary (which will be
+	     *                                            normalized to array).
+	     *
+	     */
+	    var VisualMapping = function (option) {
+	        var mappingMethod = option.mappingMethod;
+	        var visualType = option.type;
+
+	        /**
+	         * @readOnly
+	         * @type {Object}
+	         */
+	        var thisOption = this.option = zrUtil.clone(option);
+
+	        /**
+	         * @readOnly
+	         * @type {string}
+	         */
+	        this.type = visualType;
+
+	        /**
+	         * @readOnly
+	         * @type {string}
+	         */
+	        this.mappingMethod = mappingMethod;
+
+	        /**
+	         * @private
+	         * @type {Function}
+	         */
+	        this._normalizeData = normalizers[mappingMethod];
+
+	        var visualHandler = visualHandlers[visualType];
+
+	        /**
+	         * @public
+	         * @type {Function}
+	         */
+	        this.applyVisual = visualHandler.applyVisual;
+
+	        /**
+	         * @public
+	         * @type {Function}
+	         */
+	        this.getColorMapper = visualHandler.getColorMapper;
+
+	        /**
+	         * @private
+	         * @type {Function}
+	         */
+	        this._doMap = visualHandler._doMap[mappingMethod];
+
+	        if (mappingMethod === 'piecewise') {
+	            normalizeVisualRange(thisOption);
+	            preprocessForPiecewise(thisOption);
+	        }
+	        else if (mappingMethod === 'category') {
+	            thisOption.categories
+	                ? preprocessForSpecifiedCategory(thisOption)
+	                // categories is ordinal when thisOption.categories not specified,
+	                // which need no more preprocess except normalize visual.
+	                : normalizeVisualRange(thisOption, true);
+	        }
+	        else { // mappingMethod === 'linear' or 'fixed'
+	            zrUtil.assert(mappingMethod !== 'linear' || thisOption.dataExtent);
+	            normalizeVisualRange(thisOption);
+	        }
+	    };
+
+	    VisualMapping.prototype = {
+
+	        constructor: VisualMapping,
+
+	        mapValueToVisual: function (value) {
+	            var normalized = this._normalizeData(value);
+	            return this._doMap(normalized, value);
+	        },
+
+	        getNormalizer: function () {
+	            return zrUtil.bind(this._normalizeData, this);
+	        }
+	    };
+
+	    var visualHandlers = VisualMapping.visualHandlers = {
+
+	        color: {
+
+	            applyVisual: makeApplyVisual('color'),
+
+	            /**
+	             * Create a mapper function
+	             * @return {Function}
+	             */
+	            getColorMapper: function () {
+	                var thisOption = this.option;
+	                var parsedVisual = zrUtil.map(thisOption.visual, zrColor.parse);
+
+	                return zrUtil.bind(
+	                    thisOption.mappingMethod === 'category'
+	                        ? function (value, isNormalized) {
+	                            !isNormalized && (value = this._normalizeData(value));
+	                            return doMapCategory(this, value);
+	                        }
+	                        : function (value, isNormalized, out) {
+	                            // If output rgb array
+	                            // which will be much faster and useful in pixel manipulation
+	                            var returnRGBArray = !!out;
+	                            !isNormalized && (value = this._normalizeData(value));
+	                            out = zrColor.fastMapToColor(value, parsedVisual, out);
+	                            return returnRGBArray ? out : zrUtil.stringify(out, 'rgba');
+	                        },
+	                    this
+	                );
+	            },
+
+	            _doMap: {
+	                linear: function (normalized) {
+	                    return zrColor.mapToColor(normalized, this.option.visual);
+	                },
+	                category: doMapCategory,
+	                piecewise: function (normalized, value) {
+	                    var result = getSpecifiedVisual.call(this, value);
+	                    if (result == null) {
+	                        result = zrColor.mapToColor(normalized, this.option.visual);
+	                    }
+	                    return result;
+	                },
+	                fixed: doMapFixed
+	            }
+	        },
+
+	        colorHue: makePartialColorVisualHandler(function (color, value) {
+	            return zrColor.modifyHSL(color, value);
+	        }),
+
+	        colorSaturation: makePartialColorVisualHandler(function (color, value) {
+	            return zrColor.modifyHSL(color, null, value);
+	        }),
+
+	        colorLightness: makePartialColorVisualHandler(function (color, value) {
+	            return zrColor.modifyHSL(color, null, null, value);
+	        }),
+
+	        colorAlpha: makePartialColorVisualHandler(function (color, value) {
+	            return zrColor.modifyAlpha(color, value);
+	        }),
+
+	        opacity: {
+	            applyVisual: makeApplyVisual('opacity'),
+	            _doMap: makeDoMap([0, 1])
+	        },
+
+	        symbol: {
+	            applyVisual: function (value, getter, setter) {
+	                var symbolCfg = this.mapValueToVisual(value);
+	                if (zrUtil.isString(symbolCfg)) {
+	                    setter('symbol', symbolCfg);
+	                }
+	                else if (isObject(symbolCfg)) {
+	                    for (var name in symbolCfg) {
+	                        if (symbolCfg.hasOwnProperty(name)) {
+	                            setter(name, symbolCfg[name]);
+	                        }
+	                    }
+	                }
+	            },
+	            _doMap: {
+	                linear: doMapToArray,
+	                category: doMapCategory,
+	                piecewise: function (normalized, value) {
+	                    var result = getSpecifiedVisual.call(this, value);
+	                    if (result == null) {
+	                        result = doMapToArray.call(this, normalized);
+	                    }
+	                    return result;
+	                },
+	                fixed: doMapFixed
+	            }
+	        },
+
+	        symbolSize: {
+	            applyVisual: makeApplyVisual('symbolSize'),
+	            _doMap: makeDoMap([0, 1])
+	        }
+	    };
+
+
+	    function preprocessForPiecewise(thisOption) {
+	        var pieceList = thisOption.pieceList;
+	        thisOption.hasSpecialVisual = false;
+
+	        zrUtil.each(pieceList, function (piece, index) {
+	            piece.originIndex = index;
+	            // piece.visual is "result visual value" but not
+	            // a visual range, so it does not need to be normalized.
+	            if (piece.visual != null) {
+	                thisOption.hasSpecialVisual = true;
+	            }
+	        });
+	    }
+
+	    function preprocessForSpecifiedCategory(thisOption) {
+	        // Hash categories.
+	        var categories = thisOption.categories;
+	        var visual = thisOption.visual;
+
+	        var categoryMap = thisOption.categoryMap = {};
+	        each(categories, function (cate, index) {
+	            categoryMap[cate] = index;
+	        });
+
+	        // Process visual map input.
+	        if (!zrUtil.isArray(visual)) {
+	            var visualArr = [];
+
+	            if (zrUtil.isObject(visual)) {
+	                each(visual, function (v, cate) {
+	                    var index = categoryMap[cate];
+	                    visualArr[index != null ? index : CATEGORY_DEFAULT_VISUAL_INDEX] = v;
+	                });
+	            }
+	            else { // Is primary type, represents default visual.
+	                visualArr[CATEGORY_DEFAULT_VISUAL_INDEX] = visual;
+	            }
+
+	            visual = thisOption.visual = visualArr;
+	        }
+
+	        // Remove categories that has no visual,
+	        // then we can mapping them to CATEGORY_DEFAULT_VISUAL_INDEX.
+	        for (var i = categories.length - 1; i >= 0; i--) {
+	            if (visual[i] == null) {
+	                delete categoryMap[categories[i]];
+	                categories.pop();
+	            }
+	        }
+	    }
+
+	    function normalizeVisualRange(thisOption, isCategory) {
+	        var visual = thisOption.visual;
+	        var visualArr = [];
+
+	        if (zrUtil.isObject(visual)) {
+	            each(visual, function (v) {
+	                visualArr.push(v);
+	            });
+	        }
+	        else if (visual != null) {
+	            visualArr.push(visual);
+	        }
+
+	        var doNotNeedPair = {color: 1, symbol: 1};
+
+	        if (!isCategory
+	            && visualArr.length === 1
+	            && !(thisOption.type in doNotNeedPair)
+	        ) {
+	            // Do not care visualArr.length === 0, which is illegal.
+	            visualArr[1] = visualArr[0];
+	        }
+
+	        thisOption.visual = visualArr;
+	    }
+
+	    function makePartialColorVisualHandler(applyValue) {
+	        return {
+	            applyVisual: function (value, getter, setter) {
+	                value = this.mapValueToVisual(value);
+	                // Must not be array value
+	                setter('color', applyValue(getter('color'), value));
+	            },
+	            _doMap: makeDoMap([0, 1])
+	        };
+	    }
+
+	    function doMapToArray(arr, normalized) {
+	        var visual = this.option.visual;
+	        return visual[
+	            Math.round(linearMap(normalized, [0, 1], [0, visual.length - 1], true))
+	        ] || {};
+	    }
+
+	    function makeApplyVisual(visualType) {
+	        return function (value, getter, setter) {
+	            setter(visualType, this.mapValueToVisual(value));
+	        };
+	    }
+
+	    function doMapCategory(normalized) {
+	        var visual = this.option.visual;
+	        return visual[
+	            (this.option.loop && normalized !== CATEGORY_DEFAULT_VISUAL_INDEX)
+	                ? normalized % visual.length
+	                : normalized
+	        ];
+	    }
+
+	    function doMapFixed() {
+	        return this.option.visual[0];
+	    }
+
+	    function makeDoMap(sourceExtent) {
+	        return {
+	            linear: function (normalized) {
+	                return linearMap(normalized, sourceExtent, this.option.visual, true);
+	            },
+	            category: doMapCategory,
+	            piecewise: function (normalized, value) {
+	                var result = getSpecifiedVisual.call(this, value);
+	                if (result == null) {
+	                    result = linearMap(normalized, sourceExtent, this.option.visual, true);
+	                }
+	                return result;
+	            },
+	            fixed: doMapFixed
+	        };
+	    }
+
+	    function getSpecifiedVisual(value) {
+	        var thisOption = this.option;
+	        var pieceList = thisOption.pieceList;
+	        if (thisOption.hasSpecialVisual) {
+	            var pieceIndex = VisualMapping.findPieceIndex(value, pieceList);
+	            var piece = pieceList[pieceIndex];
+	            if (piece && piece.visual) {
+	                return piece.visual[this.type];
+	            }
+	        }
+	    }
+
+
+	    /**
+	     * Normalizers by mapping methods.
+	     */
+	    var normalizers = {
+
+	        linear: function (value) {
+	            return linearMap(value, this.option.dataExtent, [0, 1], true);
+	        },
+
+	        piecewise: function (value) {
+	            var pieceList = this.option.pieceList;
+	            var pieceIndex = VisualMapping.findPieceIndex(value, pieceList, true);
+	            if (pieceIndex != null) {
+	                return linearMap(pieceIndex, [0, pieceList.length - 1], [0, 1], true);
+	            }
+	        },
+
+	        category: function (value) {
+	            var index = this.option.categories
+	                ? this.option.categoryMap[value]
+	                : value; // ordinal
+	            return index == null ? CATEGORY_DEFAULT_VISUAL_INDEX : index;
+	        },
+
+	        fixed: zrUtil.noop
+	    };
+
+
+
+	    /**
+	     * @public
+	     */
+	    VisualMapping.addVisualHandler = function (name, handler) {
+	        visualHandlers[name] = handler;
+	    };
+
+	    /**
+	     * @public
+	     */
+	    VisualMapping.isValidType = function (visualType) {
+	        return visualHandlers.hasOwnProperty(visualType);
+	    };
+
+	    /**
+	     * Convinent method.
+	     * Visual can be Object or Array or primary type.
+	     *
+	     * @public
+	     */
+	    VisualMapping.eachVisual = function (visual, callback, context) {
+	        if (zrUtil.isObject(visual)) {
+	            zrUtil.each(visual, callback, context);
+	        }
+	        else {
+	            callback.call(context, visual);
+	        }
+	    };
+
+	    VisualMapping.mapVisual = function (visual, callback, context) {
+	        var isPrimary;
+	        var newVisual = zrUtil.isArray(visual)
+	            ? []
+	            : zrUtil.isObject(visual)
+	            ? {}
+	            : (isPrimary = true, null);
+
+	        VisualMapping.eachVisual(visual, function (v, key) {
+	            var newVal = callback.call(context, v, key);
+	            isPrimary ? (newVisual = newVal) : (newVisual[key] = newVal);
+	        });
+	        return newVisual;
+	    };
+
+	    /**
+	     * @public
+	     * @param {Object} obj
+	     * @return {Oject} new object containers visual values.
+	     *                 If no visuals, return null.
+	     */
+	    VisualMapping.retrieveVisuals = function (obj) {
+	        var ret = {};
+	        var hasVisual;
+
+	        obj && each(visualHandlers, function (h, visualType) {
+	            if (obj.hasOwnProperty(visualType)) {
+	                ret[visualType] = obj[visualType];
+	                hasVisual = true;
+	            }
+	        });
+
+	        return hasVisual ? ret : null;
+	    };
+
+	    /**
+	     * Give order to visual types, considering colorSaturation, colorAlpha depends on color.
+	     *
+	     * @public
+	     * @param {(Object|Array)} visualTypes If Object, like: {color: ..., colorSaturation: ...}
+	     *                                     IF Array, like: ['color', 'symbol', 'colorSaturation']
+	     * @return {Array.<string>} Sorted visual types.
+	     */
+	    VisualMapping.prepareVisualTypes = function (visualTypes) {
+	        if (isObject(visualTypes)) {
+	            var types = [];
+	            each(visualTypes, function (item, type) {
+	                types.push(type);
+	            });
+	            visualTypes = types;
+	        }
+	        else if (zrUtil.isArray(visualTypes)) {
+	            visualTypes = visualTypes.slice();
+	        }
+	        else {
+	            return [];
+	        }
+
+	        visualTypes.sort(function (type1, type2) {
+	            // color should be front of colorSaturation, colorAlpha, ...
+	            // symbol and symbolSize do not matter.
+	            return (type2 === 'color' && type1 !== 'color' && type1.indexOf('color') === 0)
+	                ? 1 : -1;
+	        });
+
+	        return visualTypes;
+	    };
+
+	    /**
+	     * 'color', 'colorSaturation', 'colorAlpha', ... are depends on 'color'.
+	     * Other visuals are only depends on themself.
+	     *
+	     * @public
+	     * @param {string} visualType1
+	     * @param {string} visualType2
+	     * @return {boolean}
+	     */
+	    VisualMapping.dependsOn = function (visualType1, visualType2) {
+	        return visualType2 === 'color'
+	            ? !!(visualType1 && visualType1.indexOf(visualType2) === 0)
+	            : visualType1 === visualType2;
+	    };
+
+	    /**
+	     * @param {number} value
+	     * @param {Array.<Object>} pieceList [{value: ..., interval: [min, max]}, ...]
+	     *                         Always from small to big.
+	     * @param {boolean} [findClosestWhenOutside=false]
+	     * @return {number} index
+	     */
+	    VisualMapping.findPieceIndex = function (value, pieceList, findClosestWhenOutside) {
+	        var possibleI;
+	        var abs = Infinity;
+
+	        // value has the higher priority.
+	        for (var i = 0, len = pieceList.length; i < len; i++) {
+	            var pieceValue = pieceList[i].value;
+	            if (pieceValue != null) {
+	                if (pieceValue === value) {
+	                    return i;
+	                }
+	                findClosestWhenOutside && updatePossible(pieceValue, i);
+	            }
+	        }
+
+	        for (var i = 0, len = pieceList.length; i < len; i++) {
+	            var piece = pieceList[i];
+	            var interval = piece.interval;
+	            var close = piece.close;
+
+	            if (interval) {
+	                if (interval[0] === -Infinity) {
+	                    if (littleThan(close[1], value, interval[1])) {
+	                        return i;
+	                    }
+	                }
+	                else if (interval[1] === Infinity) {
+	                    if (littleThan(close[0], interval[0], value)) {
+	                        return i;
+	                    }
+	                }
+	                else if (
+	                    littleThan(close[0], interval[0], value)
+	                    && littleThan(close[1], value, interval[1])
+	                ) {
+	                    return i;
+	                }
+	                findClosestWhenOutside && updatePossible(interval[0], i);
+	                findClosestWhenOutside && updatePossible(interval[1], i);
+	            }
+	        }
+
+	        if (findClosestWhenOutside) {
+	            return value === Infinity
+	                ? pieceList.length - 1
+	                : value === -Infinity
+	                ? 0
+	                : possibleI;
+	        }
+
+	        function updatePossible(val, index) {
+	            var newAbs = Math.abs(val - value);
+	            if (newAbs < abs) {
+	                abs = newAbs;
+	                possibleI = index;
+	            }
+	        }
+
+	    };
+
+	    function littleThan(close, a, b) {
+	        return close ? a <= b : a < b;
+	    }
+
+	    module.exports = VisualMapping;
+
+
+
+/***/ },
+/* 193 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+	    var numberUtil = __webpack_require__(7);
+	    var layout = __webpack_require__(21);
+	    var helper = __webpack_require__(187);
+	    var BoundingRect = __webpack_require__(9);
+	    var helper = __webpack_require__(187);
+
+	    var mathMax = Math.max;
+	    var mathMin = Math.min;
+	    var parsePercent = numberUtil.parsePercent;
+	    var retrieveValue = zrUtil.retrieve;
+	    var each = zrUtil.each;
+
+	    /**
+	     * @public
+	     */
+	    function update(ecModel, api, payload) {
+	        // Layout result in each node:
+	        // {x, y, width, height, area, borderWidth}
+	        var condition = {mainType: 'series', subType: 'treemap', query: payload};
+	        ecModel.eachComponent(condition, function (seriesModel) {
+
+	            var ecWidth = api.getWidth();
+	            var ecHeight = api.getHeight();
+	            var seriesOption = seriesModel.option;
+
+	            var size = seriesOption.size || []; // Compatible with ec2.
+	            var containerWidth = parsePercent(
+	                retrieveValue(seriesOption.width, size[0]),
+	                ecWidth
+	            );
+	            var containerHeight = parsePercent(
+	                retrieveValue(seriesOption.height, size[1]),
+	                ecHeight
+	            );
+
+	            var layoutInfo = layout.getLayoutRect(
+	                seriesModel.getBoxLayoutParams(),
+	                {
+	                    width: api.getWidth(),
+	                    height: api.getHeight()
+	                }
+	            );
+
+	            // Fetch payload info.
+	            var payloadType = payload && payload.type;
+	            var targetInfo = helper.retrieveTargetInfo(payload, seriesModel);
+	            var rootRect = (payloadType === 'treemapRender' || payloadType === 'treemapMove')
+	                ? payload.rootRect : null;
+	            var viewRoot = seriesModel.getViewRoot();
+	            var viewAbovePath = helper.getPathToRoot(viewRoot);
+
+	            if (payloadType !== 'treemapMove') {
+	                var rootSize = payloadType === 'treemapZoomToNode'
+	                    ? estimateRootSize(
+	                        seriesModel, targetInfo, viewRoot, containerWidth, containerHeight
+	                    )
+	                    : rootRect
+	                    ? [rootRect.width, rootRect.height]
+	                    : [containerWidth, containerHeight];
+
+	                var sort = seriesOption.sort;
+	                if (sort && sort !== 'asc' && sort !== 'desc') {
+	                    sort = 'desc';
+	                }
+	                var options = {
+	                    squareRatio: seriesOption.squareRatio,
+	                    sort: sort,
+	                    leafDepth: seriesOption.leafDepth
+	                };
+
+	                // layout should be cleared because using updateView but not update.
+	                viewRoot.hostTree.clearLayouts();
+
+	                // TODO
+	                // optimize: if out of view clip, do not layout.
+	                // But take care that if do not render node out of view clip,
+	                // how to calculate start po
+
+	                var viewRootLayout = {
+	                    x: 0, y: 0,
+	                    width: rootSize[0], height: rootSize[1],
+	                    area: rootSize[0] * rootSize[1]
+	                };
+	                viewRoot.setLayout(viewRootLayout);
+
+	                squarify(viewRoot, options, false, 0);
+	                // Supplement layout.
+	                var viewRootLayout = viewRoot.getLayout();
+	                each(viewAbovePath, function (node, index) {
+	                    var childValue = (viewAbovePath[index + 1] || viewRoot).getValue();
+	                    node.setLayout(zrUtil.extend(
+	                        {dataExtent: [childValue, childValue], borderWidth: 0},
+	                        viewRootLayout
+	                    ));
+	                });
+	            }
+
+	            var treeRoot = seriesModel.getData().tree.root;
+
+	            treeRoot.setLayout(
+	                calculateRootPosition(layoutInfo, rootRect, targetInfo),
+	                true
+	            );
+
+	            seriesModel.setLayoutInfo(layoutInfo);
+
+	            // FIXME
+	            // 现在没有clip功能，暂时取ec高宽。
+	            prunning(
+	                treeRoot,
+	                // Transform to base element coordinate system.
+	                new BoundingRect(-layoutInfo.x, -layoutInfo.y, ecWidth, ecHeight),
+	                viewAbovePath,
+	                viewRoot,
+	                0
+	            );
+	        });
+	    }
+
+	    /**
+	     * Layout treemap with squarify algorithm.
+	     * @see https://graphics.ethz.ch/teaching/scivis_common/Literature/squarifiedTreeMaps.pdf
+	     * @see https://github.com/mbostock/d3/blob/master/src/layout/treemap.js
+	     *
+	     * @protected
+	     * @param {module:echarts/data/Tree~TreeNode} node
+	     * @param {Object} options
+	     * @param {string} options.sort 'asc' or 'desc'
+	     * @param {number} options.squareRatio
+	     * @param {boolean} hideChildren
+	     * @param {number} depth
+	     */
+	    function squarify(node, options, hideChildren, depth) {
+	        var width;
+	        var height;
+
+	        if (node.isRemoved()) {
+	            return;
+	        }
+
+	        var thisLayout = node.getLayout();
+	        width = thisLayout.width;
+	        height = thisLayout.height;
+
+	        // Considering border and gap
+	        var itemStyleModel = node.getModel('itemStyle.normal');
+	        var borderWidth = itemStyleModel.get('borderWidth');
+	        var halfGapWidth = itemStyleModel.get('gapWidth') / 2;
+	        var layoutOffset = borderWidth - halfGapWidth;
+	        var nodeModel = node.getModel();
+
+	        node.setLayout({borderWidth: borderWidth}, true);
+
+	        width = mathMax(width - 2 * layoutOffset, 0);
+	        height = mathMax(height - 2 * layoutOffset, 0);
+
+	        var totalArea = width * height;
+	        var viewChildren = initChildren(
+	            node, nodeModel, totalArea, options, hideChildren, depth
+	        );
+
+	        if (!viewChildren.length) {
+	            return;
+	        }
+
+	        var rect = {x: layoutOffset, y: layoutOffset, width: width, height: height};
+	        var rowFixedLength = mathMin(width, height);
+	        var best = Infinity; // the best row score so far
+	        var row = [];
+	        row.area = 0;
+
+	        for (var i = 0, len = viewChildren.length; i < len;) {
+	            var child = viewChildren[i];
+
+	            row.push(child);
+	            row.area += child.getLayout().area;
+	            var score = worst(row, rowFixedLength, options.squareRatio);
+
+	            // continue with this orientation
+	            if (score <= best) {
+	                i++;
+	                best = score;
+	            }
+	            // abort, and try a different orientation
+	            else {
+	                row.area -= row.pop().getLayout().area;
+	                position(row, rowFixedLength, rect, halfGapWidth, false);
+	                rowFixedLength = mathMin(rect.width, rect.height);
+	                row.length = row.area = 0;
+	                best = Infinity;
+	            }
+	        }
+
+	        if (row.length) {
+	            position(row, rowFixedLength, rect, halfGapWidth, true);
+	        }
+
+	        if (!hideChildren) {
+	            var childrenVisibleMin = nodeModel.get('childrenVisibleMin');
+	            if (childrenVisibleMin != null && totalArea < childrenVisibleMin) {
+	                hideChildren = true;
+	            }
+	        }
+
+	        for (var i = 0, len = viewChildren.length; i < len; i++) {
+	            squarify(viewChildren[i], options, hideChildren, depth + 1);
+	        }
+	    }
+
+	    /**
+	     * Set area to each child, and calculate data extent for visual coding.
+	     */
+	    function initChildren(node, nodeModel, totalArea, options, hideChildren, depth) {
+	        var viewChildren = node.children || [];
+	        var orderBy = options.sort;
+	        orderBy !== 'asc' && orderBy !== 'desc' && (orderBy = null);
+
+	        var overLeafDepth = options.leafDepth != null && options.leafDepth <= depth;
+
+	        // leafDepth has higher priority.
+	        if (hideChildren && !overLeafDepth) {
+	            return (node.viewChildren = []);
+	        }
+
+	        // Sort children, order by desc.
+	        viewChildren = zrUtil.filter(viewChildren, function (child) {
+	            return !child.isRemoved();
+	        });
+
+	        sort(viewChildren, orderBy);
+
+	        var info = statistic(nodeModel, viewChildren, orderBy);
+
+	        if (info.sum === 0) {
+	            return (node.viewChildren = []);
+	        }
+
+	        info.sum = filterByThreshold(nodeModel, totalArea, info.sum, orderBy, viewChildren);
+
+	        if (info.sum === 0) {
+	            return (node.viewChildren = []);
+	        }
+
+	        // Set area to each child.
+	        for (var i = 0, len = viewChildren.length; i < len; i++) {
+	            var area = viewChildren[i].getValue() / info.sum * totalArea;
+	            // Do not use setLayout({...}, true), because it is needed to clear last layout.
+	            viewChildren[i].setLayout({area: area});
+	        }
+
+	        if (overLeafDepth) {
+	            viewChildren.length && node.setLayout({isLeafRoot: true}, true);
+	            viewChildren.length = 0;
+	        }
+
+	        node.viewChildren = viewChildren;
+	        node.setLayout({dataExtent: info.dataExtent}, true);
+
+	        return viewChildren;
+	    }
+
+	    /**
+	     * Consider 'visibleMin'. Modify viewChildren and get new sum.
+	     */
+	    function filterByThreshold(nodeModel, totalArea, sum, orderBy, orderedChildren) {
+
+	        // visibleMin is not supported yet when no option.sort.
+	        if (!orderBy) {
+	            return sum;
+	        }
+
+	        var visibleMin = nodeModel.get('visibleMin');
+	        var len = orderedChildren.length;
+	        var deletePoint = len;
+
+	        // Always travel from little value to big value.
+	        for (var i = len - 1; i >= 0; i--) {
+	            var value = orderedChildren[
+	                orderBy === 'asc' ? len - i - 1 : i
+	            ].getValue();
+
+	            if (value / sum * totalArea < visibleMin) {
+	                deletePoint = i;
+	                sum -= value;
+	            }
+	        }
+
+	        orderBy === 'asc'
+	            ? orderedChildren.splice(0, len - deletePoint)
+	            : orderedChildren.splice(deletePoint, len - deletePoint);
+
+	        return sum;
+	    }
+
+	    /**
+	     * Sort
+	     */
+	    function sort(viewChildren, orderBy) {
+	        if (orderBy) {
+	            viewChildren.sort(function (a, b) {
+	                return orderBy === 'asc'
+	                    ?  a.getValue() - b.getValue() : b.getValue() - a.getValue();
+	            });
+	        }
+	        return viewChildren;
+	    }
+
+	    /**
+	     * Statistic
+	     */
+	    function statistic(nodeModel, children, orderBy) {
+	        // Calculate sum.
+	        var sum = 0;
+	        for (var i = 0, len = children.length; i < len; i++) {
+	            sum += children[i].getValue();
+	        }
+
+	        // Statistic data extent for latter visual coding.
+	        // Notice: data extent should be calculate based on raw children
+	        // but not filtered view children, otherwise visual mapping will not
+	        // be stable when zoom (where children is filtered by visibleMin).
+
+	        var dimension = nodeModel.get('visualDimension');
+	        var dataExtent;
+
+	        // The same as area dimension.
+	        if (!children || !children.length) {
+	            dataExtent = [NaN, NaN];
+	        }
+	        else if (dimension === 'value' && orderBy) {
+	            dataExtent = [
+	                children[children.length - 1].getValue(),
+	                children[0].getValue()
+	            ];
+	            orderBy === 'asc' && dataExtent.reverse();
+	        }
+	        // Other dimension.
+	        else {
+	            var dataExtent = [Infinity, -Infinity];
+	            each(children, function (child) {
+	                var value = child.getValue(dimension);
+	                value < dataExtent[0] && (dataExtent[0] = value);
+	                value > dataExtent[1] && (dataExtent[1] = value);
+	            });
+	        }
+
+	        return {sum: sum, dataExtent: dataExtent};
+	    }
+
+	    /**
+	     * Computes the score for the specified row,
+	     * as the worst aspect ratio.
+	     */
+	    function worst(row, rowFixedLength, ratio) {
+	        var areaMax = 0;
+	        var areaMin = Infinity;
+
+	        for (var i = 0, area, len = row.length; i < len; i++) {
+	            area = row[i].getLayout().area;
+	            if (area) {
+	                area < areaMin && (areaMin = area);
+	                area > areaMax && (areaMax = area);
+	            }
+	        }
+
+	        var squareArea = row.area * row.area;
+	        var f = rowFixedLength * rowFixedLength * ratio;
+
+	        return squareArea
+	            ? mathMax(
+	                (f * areaMax) / squareArea,
+	                squareArea / (f * areaMin)
+	            )
+	            : Infinity;
+	    }
+
+	    /**
+	     * Positions the specified row of nodes. Modifies `rect`.
+	     */
+	    function position(row, rowFixedLength, rect, halfGapWidth, flush) {
+	        // When rowFixedLength === rect.width,
+	        // it is horizontal subdivision,
+	        // rowFixedLength is the width of the subdivision,
+	        // rowOtherLength is the height of the subdivision,
+	        // and nodes will be positioned from left to right.
+
+	        // wh[idx0WhenH] means: when horizontal,
+	        //      wh[idx0WhenH] => wh[0] => 'width'.
+	        //      xy[idx1WhenH] => xy[1] => 'y'.
+	        var idx0WhenH = rowFixedLength === rect.width ? 0 : 1;
+	        var idx1WhenH = 1 - idx0WhenH;
+	        var xy = ['x', 'y'];
+	        var wh = ['width', 'height'];
+
+	        var last = rect[xy[idx0WhenH]];
+	        var rowOtherLength = rowFixedLength
+	            ? row.area / rowFixedLength : 0;
+
+	        if (flush || rowOtherLength > rect[wh[idx1WhenH]]) {
+	            rowOtherLength = rect[wh[idx1WhenH]]; // over+underflow
+	        }
+	        for (var i = 0, rowLen = row.length; i < rowLen; i++) {
+	            var node = row[i];
+	            var nodeLayout = {};
+	            var step = rowOtherLength
+	                ? node.getLayout().area / rowOtherLength : 0;
+
+	            var wh1 = nodeLayout[wh[idx1WhenH]] = mathMax(rowOtherLength - 2 * halfGapWidth, 0);
+
+	            // We use Math.max/min to avoid negative width/height when considering gap width.
+	            var remain = rect[xy[idx0WhenH]] + rect[wh[idx0WhenH]] - last;
+	            var modWH = (i === rowLen - 1 || remain < step) ? remain : step;
+	            var wh0 = nodeLayout[wh[idx0WhenH]] = mathMax(modWH - 2 * halfGapWidth, 0);
+
+	            nodeLayout[xy[idx1WhenH]] = rect[xy[idx1WhenH]] + mathMin(halfGapWidth, wh1 / 2);
+	            nodeLayout[xy[idx0WhenH]] = last + mathMin(halfGapWidth, wh0 / 2);
+
+	            last += modWH;
+	            node.setLayout(nodeLayout, true);
+	        }
+
+	        rect[xy[idx1WhenH]] += rowOtherLength;
+	        rect[wh[idx1WhenH]] -= rowOtherLength;
+	    }
+
+	    // Return [containerWidth, containerHeight] as defualt.
+	    function estimateRootSize(seriesModel, targetInfo, viewRoot, containerWidth, containerHeight) {
+	        // If targetInfo.node exists, we zoom to the node,
+	        // so estimate whold width and heigth by target node.
+	        var currNode = (targetInfo || {}).node;
+	        var defaultSize = [containerWidth, containerHeight];
+
+	        if (!currNode || currNode === viewRoot) {
+	            return defaultSize;
+	        }
+
+	        var parent;
+	        var viewArea = containerWidth * containerHeight;
+	        var area = viewArea * seriesModel.option.zoomToNodeRatio;
+
+	        while (parent = currNode.parentNode) { // jshint ignore:line
+	            var sum = 0;
+	            var siblings = parent.children;
+
+	            for (var i = 0, len = siblings.length; i < len; i++) {
+	                sum += siblings[i].getValue();
+	            }
+	            var currNodeValue = currNode.getValue();
+	            if (currNodeValue === 0) {
+	                return defaultSize;
+	            }
+	            area *= sum / currNodeValue;
+
+	            var borderWidth = parent.getModel('itemStyle.normal').get('borderWidth');
+
+	            if (isFinite(borderWidth)) {
+	                // Considering border, suppose aspect ratio is 1.
+	                area += 4 * borderWidth * borderWidth + 4 * borderWidth * Math.pow(area, 0.5);
+	            }
+
+	            area > numberUtil.MAX_SAFE_INTEGER && (area = numberUtil.MAX_SAFE_INTEGER);
+
+	            currNode = parent;
+	        }
+
+	        area < viewArea && (area = viewArea);
+	        var scale = Math.pow(area / viewArea, 0.5);
+
+	        return [containerWidth * scale, containerHeight * scale];
+	    }
+
+	    // Root postion base on coord of containerGroup
+	    function calculateRootPosition(layoutInfo, rootRect, targetInfo) {
+	        if (rootRect) {
+	            return {x: rootRect.x, y: rootRect.y};
+	        }
+
+	        var defaultPosition = {x: 0, y: 0};
+	        if (!targetInfo) {
+	            return defaultPosition;
+	        }
+
+	        // If targetInfo is fetched by 'retrieveTargetInfo',
+	        // old tree and new tree are the same tree,
+	        // so the node still exists and we can visit it.
+
+	        var targetNode = targetInfo.node;
+	        var layout = targetNode.getLayout();
+
+	        if (!layout) {
+	            return defaultPosition;
+	        }
+
+	        // Transform coord from local to container.
+	        var targetCenter = [layout.width / 2, layout.height / 2];
+	        var node = targetNode;
+	        while (node) {
+	            var nodeLayout = node.getLayout();
+	            targetCenter[0] += nodeLayout.x;
+	            targetCenter[1] += nodeLayout.y;
+	            node = node.parentNode;
+	        }
+
+	        return {
+	            x: layoutInfo.width / 2 - targetCenter[0],
+	            y: layoutInfo.height / 2 - targetCenter[1]
+	        };
+	    }
+
+	    // Mark nodes visible for prunning when visual coding and rendering.
+	    // Prunning depends on layout and root position, so we have to do it after layout.
+	    function prunning(node, clipRect, viewAbovePath, viewRoot, depth) {
+	        var nodeLayout = node.getLayout();
+	        var nodeInViewAbovePath = viewAbovePath[depth];
+	        var isAboveViewRoot = nodeInViewAbovePath && nodeInViewAbovePath === node;
+
+	        if (
+	            (nodeInViewAbovePath && !isAboveViewRoot)
+	            || (depth === viewAbovePath.length && node !== viewRoot)
+	        ) {
+	            return;
+	        }
+
+	        node.setLayout({
+	            // isInView means: viewRoot sub tree + viewAbovePath
+	            isInView: true,
+	            // invisible only means: outside view clip so that the node can not
+	            // see but still layout for animation preparation but not render.
+	            invisible: !isAboveViewRoot && !clipRect.intersect(nodeLayout),
+	            isAboveViewRoot: isAboveViewRoot
+	        }, true);
+
+	        // Transform to child coordinate.
+	        var childClipRect = new BoundingRect(
+	            clipRect.x - nodeLayout.x,
+	            clipRect.y - nodeLayout.y,
+	            clipRect.width,
+	            clipRect.height
+	        );
+
+	        each(node.viewChildren || [], function (child) {
+	            prunning(child, childClipRect, viewAbovePath, viewRoot, depth + 1);
+	        });
+	    }
+
+	    module.exports = update;
+
+
+/***/ },
+/* 194 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var echarts = __webpack_require__(1);
+	    var zrUtil = __webpack_require__(4);
+
+	    __webpack_require__(195);
+	    __webpack_require__(198);
+
+	    __webpack_require__(203);
+
+	    echarts.registerProcessor(__webpack_require__(204));
+
+	    echarts.registerVisual(zrUtil.curry(
+	        __webpack_require__(109), 'graph', 'circle', null
+	    ));
+	    echarts.registerVisual(__webpack_require__(205));
+	    echarts.registerVisual(__webpack_require__(206));
+
+	    echarts.registerLayout(__webpack_require__(207));
+	    echarts.registerLayout(__webpack_require__(210));
+	    echarts.registerLayout(__webpack_require__(212));
+
+	    // Graph view coordinate system
+	    echarts.registerCoordinateSystem('graphView', {
+	        create: __webpack_require__(214)
+	    });
+
+
+/***/ },
+/* 195 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var List = __webpack_require__(97);
+	    var zrUtil = __webpack_require__(4);
+	    var modelUtil = __webpack_require__(5);
+	    var Model = __webpack_require__(12);
+
+	    var createGraphFromNodeEdge = __webpack_require__(196);
+
+	    var GraphSeries = __webpack_require__(1).extendSeriesModel({
+
+	        type: 'series.graph',
+
+	        init: function (option) {
+	            GraphSeries.superApply(this, 'init', arguments);
+
+	            // Provide data for legend select
+	            this.legendDataProvider = function () {
+	                return this._categoriesData;
+	            };
+
+	            this.fillDataTextStyle(option.edges || option.links);
+
+	            this._updateCategoriesData();
+	        },
+
+	        mergeOption: function (option) {
+	            GraphSeries.superApply(this, 'mergeOption', arguments);
+
+	            this.fillDataTextStyle(option.edges || option.links);
+
+	            this._updateCategoriesData();
+	        },
+
+	        mergeDefaultAndTheme: function (option) {
+	            GraphSeries.superApply(this, 'mergeDefaultAndTheme', arguments);
+	            modelUtil.defaultEmphasis(option.edgeLabel, modelUtil.LABEL_OPTIONS);
+	        },
+
+	        getInitialData: function (option, ecModel) {
+	            var edges = option.edges || option.links || [];
+	            var nodes = option.data || option.nodes || [];
+	            var self = this;
+
+	            if (nodes && edges) {
+	                return createGraphFromNodeEdge(nodes, edges, this, true, beforeLink).data;
+	            }
+
+	            function beforeLink(nodeData, edgeData) {
+	                // Overwrite nodeData.getItemModel to
+	                nodeData.wrapMethod('getItemModel', function (model) {
+	                    var categoriesModels = self._categoriesModels;
+	                    var categoryIdx = model.getShallow('category');
+	                    var categoryModel = categoriesModels[categoryIdx];
+	                    if (categoryModel) {
+	                        categoryModel.parentModel = model.parentModel;
+	                        model.parentModel = categoryModel;
+	                    }
+	                    return model;
+	                });
+
+	                var edgeLabelModel = self.getModel('edgeLabel');
+	                var wrappedGetEdgeModel = function (path, parentModel) {
+	                    var pathArr = (path || '').split('.');
+	                    if (pathArr[0] === 'label') {
+	                        parentModel = parentModel
+	                            || edgeLabelModel.getModel(pathArr.slice(1));
+	                    }
+	                    var model = Model.prototype.getModel.call(this, pathArr, parentModel);
+	                    model.getModel = wrappedGetEdgeModel;
+	                    return model;
+	                };
+	                edgeData.wrapMethod('getItemModel', function (model) {
+	                    // FIXME Wrap get method ?
+	                    model.getModel = wrappedGetEdgeModel;
+	                    return model;
+	                });
+	            }
+	        },
+
+	        /**
+	         * @return {module:echarts/data/Graph}
+	         */
+	        getGraph: function () {
+	            return this.getData().graph;
+	        },
+
+	        /**
+	         * @return {module:echarts/data/List}
+	         */
+	        getEdgeData: function () {
+	            return this.getGraph().edgeData;
+	        },
+
+	        /**
+	         * @return {module:echarts/data/List}
+	         */
+	        getCategoriesData: function () {
+	            return this._categoriesData;
+	        },
+
+	        /**
+	         * @override
+	         */
+	        formatTooltip: function (dataIndex, multipleSeries, dataType) {
+	            if (dataType === 'edge') {
+	                var nodeData = this.getData();
+	                var params = this.getDataParams(dataIndex, dataType);
+	                var edge = nodeData.graph.getEdgeByIndex(dataIndex);
+	                var sourceName = nodeData.getName(edge.node1.dataIndex);
+	                var targetName = nodeData.getName(edge.node2.dataIndex);
+	                var html = sourceName + ' > ' + targetName;
+	                if (params.value) {
+	                    html += ' : ' + params.value;
+	                }
+	                return html;
+	            }
+	            else { // dataType === 'node' or empty
+	                return GraphSeries.superApply(this, 'formatTooltip', arguments);
+	            }
+	        },
+
+	        _updateCategoriesData: function () {
+	            var categories = zrUtil.map(this.option.categories || [], function (category) {
+	                // Data must has value
+	                return category.value != null ? category : zrUtil.extend({
+	                    value: 0
+	                }, category);
+	            });
+	            var categoriesData = new List(['value'], this);
+	            categoriesData.initData(categories);
+
+	            this._categoriesData = categoriesData;
+
+	            this._categoriesModels = categoriesData.mapArray(function (idx) {
+	                return categoriesData.getItemModel(idx, true);
+	            });
+	        },
+
+	        setZoom: function (zoom) {
+	            this.option.zoom = zoom;
+	        },
+
+	        setCenter: function (center) {
+	            this.option.center = center;
+	        },
+
+	        defaultOption: {
+	            zlevel: 0,
+	            z: 2,
+
+	            coordinateSystem: 'view',
+
+	            // Default option for all coordinate systems
+	            xAxisIndex: 0,
+	            yAxisIndex: 0,
+	            polarIndex: 0,
+	            geoIndex: 0,
+
+	            legendHoverLink: true,
+
+	            hoverAnimation: true,
+
+	            layout: null,
+
+	            focusNodeAdjacency: false,
+
+	            // Configuration of force
+	            force: {
+	                initLayout: null,
+	                repulsion: 50,
+	                gravity: 0.1,
+	                edgeLength: 30,
+
+	                layoutAnimation: true
+	            },
+
+	            left: 'center',
+	            top: 'center',
+	            // right: null,
+	            // bottom: null,
+	            // width: '80%',
+	            // height: '80%',
+
+	            symbol: 'circle',
+	            symbolSize: 10,
+
+	            edgeSymbol: ['none', 'none'],
+	            edgeSymbolSize: 10,
+	            edgeLabel: {
+	                normal: {
+	                    position: 'middle'
+	                },
+	                emphasis: {}
+	            },
+
+	            draggable: false,
+
+	            roam: false,
+
+	            // Default on center of graph
+	            center: null,
+
+	            zoom: 1,
+	            // Symbol size scale ratio in roam
+	            nodeScaleRatio: 0.6,
+
+	            // categories: [],
+
+	            // data: []
+	            // Or
+	            // nodes: []
+	            //
+	            // links: []
+	            // Or
+	            // edges: []
+
+	            label: {
+	                normal: {
+	                    show: false,
+	                    formatter: '{b}'
+	                },
+	                emphasis: {
+	                    show: true
+	                }
+	            },
+
+	            itemStyle: {
+	                normal: {},
+	                emphasis: {}
+	            },
+
+	            lineStyle: {
+	                normal: {
+	                    color: '#aaa',
+	                    width: 1,
+	                    curveness: 0,
+	                    opacity: 0.5
+	                },
+	                emphasis: {}
+	            }
+	        }
+	    });
+
+	    module.exports = GraphSeries;
+
+
+/***/ },
+/* 196 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var List = __webpack_require__(97);
+	    var Graph = __webpack_require__(197);
+	    var linkList = __webpack_require__(185);
+	    var completeDimensions = __webpack_require__(102);
+	    var CoordinateSystem = __webpack_require__(26);
+	    var zrUtil = __webpack_require__(4);
+	    var createListFromArray = __webpack_require__(101);
+
+	    module.exports = function (nodes, edges, hostModel, directed, beforeLink) {
+	        var graph = new Graph(directed);
+	        for (var i = 0; i < nodes.length; i++) {
+	            graph.addNode(zrUtil.retrieve(
+	                // Id, name, dataIndex
+	                nodes[i].id, nodes[i].name, i
+	            ), i);
+	        }
+
+	        var linkNameList = [];
+	        var validEdges = [];
+	        for (var i = 0; i < edges.length; i++) {
+	            var link = edges[i];
+	            var source = link.source;
+	            var target = link.target;
+	            // addEdge may fail when source or target not exists
+	            if (graph.addEdge(source, target, i)) {
+	                validEdges.push(link);
+	                linkNameList.push(zrUtil.retrieve(link.id, source + ' > ' + target));
+	            }
+	        }
+
+	        var coordSys = hostModel.get('coordinateSystem');
+	        var nodeData;
+	        if (coordSys === 'cartesian2d' || coordSys === 'polar') {
+	            nodeData = createListFromArray(nodes, hostModel, hostModel.ecModel);
+	        }
+	        else {
+	            // FIXME
+	            var coordSysCtor = CoordinateSystem.get(coordSys);
+	            // FIXME
+	            var dimensionNames = completeDimensions(
+	                ((coordSysCtor && coordSysCtor.type !== 'view') ? (coordSysCtor.dimensions || []) : []).concat(['value']),
+	                nodes
+	            );
+	            nodeData = new List(dimensionNames, hostModel);
+	            nodeData.initData(nodes);
+	        }
+
+	        var edgeData = new List(['value'], hostModel);
+	        edgeData.initData(validEdges, linkNameList);
+
+	        beforeLink && beforeLink(nodeData, edgeData);
+
+	        linkList({
+	            mainData: nodeData,
+	            struct: graph,
+	            structAttr: 'graph',
+	            datas: {node: nodeData, edge: edgeData},
+	            datasAttr: {node: 'data', edge: 'edgeData'}
+	        });
+
+	        // Update dataIndex of nodes and edges because invalid edge may be removed
+	        graph.update();
+
+	        return graph;
+	    };
+
+
+/***/ },
+/* 197 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+	/**
+	 * Graph data structure
+	 *
+	 * @module echarts/data/Graph
+	 * @author Yi Shen(https://www.github.com/pissang)
+	 */
+
+
+	    var zrUtil = __webpack_require__(4);
+
+	    /**
+	     * @alias module:echarts/data/Graph
+	     * @constructor
+	     * @param {boolean} directed
+	     */
+	    var Graph = function(directed) {
+	        /**
+	         * 是否是有向图
+	         * @type {boolean}
+	         * @private
+	         */
+	        this._directed = directed || false;
+
+	        /**
+	         * @type {Array.<module:echarts/data/Graph.Node>}
+	         * @readOnly
+	         */
+	        this.nodes = [];
+
+	        /**
+	         * @type {Array.<module:echarts/data/Graph.Edge>}
+	         * @readOnly
+	         */
+	        this.edges = [];
+
+	        /**
+	         * @type {Object.<string, module:echarts/data/Graph.Node>}
+	         * @private
+	         */
+	        this._nodesMap = {};
+	        /**
+	         * @type {Object.<string, module:echarts/data/Graph.Edge>}
+	         * @private
+	         */
+	        this._edgesMap = {};
+
+	        /**
+	         * @type {module:echarts/data/List}
+	         * @readOnly
+	         */
+	        this.data;
+
+	        /**
+	         * @type {module:echarts/data/List}
+	         * @readOnly
+	         */
+	        this.edgeData;
+	    };
+
+	    var graphProto = Graph.prototype;
+	    /**
+	     * @type {string}
+	     */
+	    graphProto.type = 'graph';
+
+	    /**
+	     * If is directed graph
+	     * @return {boolean}
+	     */
+	    graphProto.isDirected = function () {
+	        return this._directed;
+	    };
+
+	    /**
+	     * Add a new node
+	     * @param {string} id
+	     * @param {number} [dataIndex]
+	     */
+	    graphProto.addNode = function (id, dataIndex) {
+	        id = id || ('' + dataIndex);
+
+	        var nodesMap = this._nodesMap;
+
+	        if (nodesMap[id]) {
+	            return;
+	        }
+
+	        var node = new Node(id, dataIndex);
+	        node.hostGraph = this;
+
+	        this.nodes.push(node);
+
+	        nodesMap[id] = node;
+	        return node;
+	    };
+
+	    /**
+	     * Get node by data index
+	     * @param  {number} dataIndex
+	     * @return {module:echarts/data/Graph~Node}
+	     */
+	    graphProto.getNodeByIndex = function (dataIndex) {
+	        var rawIdx = this.data.getRawIndex(dataIndex);
+	        return this.nodes[rawIdx];
+	    };
+	    /**
+	     * Get node by id
+	     * @param  {string} id
+	     * @return {module:echarts/data/Graph.Node}
+	     */
+	    graphProto.getNodeById = function (id) {
+	        return this._nodesMap[id];
+	    };
+
+	    /**
+	     * Add a new edge
+	     * @param {number|string|module:echarts/data/Graph.Node} n1
+	     * @param {number|string|module:echarts/data/Graph.Node} n2
+	     * @param {number} [dataIndex=-1]
+	     * @return {module:echarts/data/Graph.Edge}
+	     */
+	    graphProto.addEdge = function (n1, n2, dataIndex) {
+	        var nodesMap = this._nodesMap;
+	        var edgesMap = this._edgesMap;
+
+	        // PNEDING
+	        if (typeof n1 === 'number') {
+	            n1 = this.nodes[n1];
+	        }
+	        if (typeof n2 === 'number') {
+	            n2 = this.nodes[n2];
+	        }
+
+	        if (!(n1 instanceof Node)) {
+	            n1 = nodesMap[n1];
+	        }
+	        if (!(n2 instanceof Node)) {
+	            n2 = nodesMap[n2];
+	        }
+	        if (!n1 || !n2) {
+	            return;
+	        }
+
+	        var key = n1.id + '-' + n2.id;
+	        // PENDING
+	        if (edgesMap[key]) {
+	            return;
+	        }
+
+	        var edge = new Edge(n1, n2, dataIndex);
+	        edge.hostGraph = this;
+
+	        if (this._directed) {
+	            n1.outEdges.push(edge);
+	            n2.inEdges.push(edge);
+	        }
+	        n1.edges.push(edge);
+	        if (n1 !== n2) {
+	            n2.edges.push(edge);
+	        }
+
+	        this.edges.push(edge);
+	        edgesMap[key] = edge;
+
+	        return edge;
+	    };
+
+	    /**
+	     * Get edge by data index
+	     * @param  {number} dataIndex
+	     * @return {module:echarts/data/Graph~Node}
+	     */
+	    graphProto.getEdgeByIndex = function (dataIndex) {
+	        var rawIdx = this.edgeData.getRawIndex(dataIndex);
+	        return this.edges[rawIdx];
+	    };
+	    /**
+	     * Get edge by two linked nodes
+	     * @param  {module:echarts/data/Graph.Node|string} n1
+	     * @param  {module:echarts/data/Graph.Node|string} n2
+	     * @return {module:echarts/data/Graph.Edge}
+	     */
+	    graphProto.getEdge = function (n1, n2) {
+	        if (n1 instanceof Node) {
+	            n1 = n1.id;
+	        }
+	        if (n2 instanceof Node) {
+	            n2 = n2.id;
+	        }
+
+	        var edgesMap = this._edgesMap;
+
+	        if (this._directed) {
+	            return edgesMap[n1 + '-' + n2];
+	        } else {
+	            return edgesMap[n1 + '-' + n2]
+	                || edgesMap[n2 + '-' + n1];
+	        }
+	    };
+
+	    /**
+	     * Iterate all nodes
+	     * @param  {Function} cb
+	     * @param  {*} [context]
+	     */
+	    graphProto.eachNode = function (cb, context) {
+	        var nodes = this.nodes;
+	        var len = nodes.length;
+	        for (var i = 0; i < len; i++) {
+	            if (nodes[i].dataIndex >= 0) {
+	                cb.call(context, nodes[i], i);
+	            }
+	        }
+	    };
+
+	    /**
+	     * Iterate all edges
+	     * @param  {Function} cb
+	     * @param  {*} [context]
+	     */
+	    graphProto.eachEdge = function (cb, context) {
+	        var edges = this.edges;
+	        var len = edges.length;
+	        for (var i = 0; i < len; i++) {
+	            if (edges[i].dataIndex >= 0
+	                && edges[i].node1.dataIndex >= 0
+	                && edges[i].node2.dataIndex >= 0
+	            ) {
+	                cb.call(context, edges[i], i);
+	            }
+	        }
+	    };
+
+	    /**
+	     * Breadth first traverse
+	     * @param {Function} cb
+	     * @param {module:echarts/data/Graph.Node} startNode
+	     * @param {string} [direction='none'] 'none'|'in'|'out'
+	     * @param {*} [context]
+	     */
+	    graphProto.breadthFirstTraverse = function (
+	        cb, startNode, direction, context
+	    ) {
+	        if (!(startNode instanceof Node)) {
+	            startNode = this._nodesMap[startNode];
+	        }
+	        if (!startNode) {
+	            return;
+	        }
+
+	        var edgeType = direction === 'out'
+	            ? 'outEdges' : (direction === 'in' ? 'inEdges' : 'edges');
+
+	        for (var i = 0; i < this.nodes.length; i++) {
+	            this.nodes[i].__visited = false;
+	        }
+
+	        if (cb.call(context, startNode, null)) {
+	            return;
+	        }
+
+	        var queue = [startNode];
+	        while (queue.length) {
+	            var currentNode = queue.shift();
+	            var edges = currentNode[edgeType];
+
+	            for (var i = 0; i < edges.length; i++) {
+	                var e = edges[i];
+	                var otherNode = e.node1 === currentNode
+	                    ? e.node2 : e.node1;
+	                if (!otherNode.__visited) {
+	                    if (cb.call(otherNode, otherNode, currentNode)) {
+	                        // Stop traversing
+	                        return;
+	                    }
+	                    queue.push(otherNode);
+	                    otherNode.__visited = true;
+	                }
+	            }
+	        }
+	    };
+
+	    // TODO
+	    // graphProto.depthFirstTraverse = function (
+	    //     cb, startNode, direction, context
+	    // ) {
+
+	    // };
+
+	    // Filter update
+	    graphProto.update = function () {
+	        var data = this.data;
+	        var edgeData = this.edgeData;
+	        var nodes = this.nodes;
+	        var edges = this.edges;
+
+	        for (var i = 0, len = nodes.length; i < len; i++) {
+	            nodes[i].dataIndex = -1;
+	        }
+	        for (var i = 0, len = data.count(); i < len; i++) {
+	            nodes[data.getRawIndex(i)].dataIndex = i;
+	        }
+
+	        edgeData.filterSelf(function (idx) {
+	            var edge = edges[edgeData.getRawIndex(idx)];
+	            return edge.node1.dataIndex >= 0 && edge.node2.dataIndex >= 0;
+	        });
+
+	        // Update edge
+	        for (var i = 0, len = edges.length; i < len; i++) {
+	            edges[i].dataIndex = -1;
+	        }
+	        for (var i = 0, len = edgeData.count(); i < len; i++) {
+	            edges[edgeData.getRawIndex(i)].dataIndex = i;
+	        }
+	    };
+
+	    /**
+	     * @return {module:echarts/data/Graph}
+	     */
+	    graphProto.clone = function () {
+	        var graph = new Graph(this._directed);
+	        var nodes = this.nodes;
+	        var edges = this.edges;
+	        for (var i = 0; i < nodes.length; i++) {
+	            graph.addNode(nodes[i].id, nodes[i].dataIndex);
+	        }
+	        for (var i = 0; i < edges.length; i++) {
+	            var e = edges[i];
+	            graph.addEdge(e.node1.id, e.node2.id, e.dataIndex);
+	        }
+	        return graph;
+	    };
+
+
+	    /**
+	     * @alias module:echarts/data/Graph.Node
+	     */
+	    function Node(id, dataIndex) {
+	        /**
+	        * @type {string}
+	        */
+	        this.id = id == null ? '' : id;
+
+	        /**
+	        * @type {Array.<module:echarts/data/Graph.Edge>}
+	        */
+	        this.inEdges = [];
+	        /**
+	        * @type {Array.<module:echarts/data/Graph.Edge>}
+	        */
+	        this.outEdges = [];
+	        /**
+	        * @type {Array.<module:echarts/data/Graph.Edge>}
+	        */
+	        this.edges = [];
+	        /**
+	         * @type {module:echarts/data/Graph}
+	         */
+	        this.hostGraph;
+
+	        /**
+	         * @type {number}
+	         */
+	        this.dataIndex = dataIndex == null ? -1 : dataIndex;
+	    }
+
+	    Node.prototype = {
+
+	        constructor: Node,
+
+	        /**
+	         * @return {number}
+	         */
+	        degree: function () {
+	            return this.edges.length;
+	        },
+
+	        /**
+	         * @return {number}
+	         */
+	        inDegree: function () {
+	            return this.inEdges.length;
+	        },
+
+	        /**
+	        * @return {number}
+	        */
+	        outDegree: function () {
+	            return this.outEdges.length;
+	        },
+
+	        /**
+	         * @param {string} [path]
+	         * @return {module:echarts/model/Model}
+	         */
+	        getModel: function (path) {
+	            if (this.dataIndex < 0) {
+	                return;
+	            }
+	            var graph = this.hostGraph;
+	            var itemModel = graph.data.getItemModel(this.dataIndex);
+
+	            return itemModel.getModel(path);
+	        }
+	    };
+
+	    /**
+	     * 图边
+	     * @alias module:echarts/data/Graph.Edge
+	     * @param {module:echarts/data/Graph.Node} n1
+	     * @param {module:echarts/data/Graph.Node} n2
+	     * @param {number} [dataIndex=-1]
+	     */
+	    function Edge(n1, n2, dataIndex) {
+
+	        /**
+	         * 节点1，如果是有向图则为源节点
+	         * @type {module:echarts/data/Graph.Node}
+	         */
+	        this.node1 = n1;
+
+	        /**
+	         * 节点2，如果是有向图则为目标节点
+	         * @type {module:echarts/data/Graph.Node}
+	         */
+	        this.node2 = n2;
+
+	        this.dataIndex = dataIndex == null ? -1 : dataIndex;
+	    }
+
+	    /**
+	     * @param {string} [path]
+	     * @return {module:echarts/model/Model}
+	     */
+	     Edge.prototype.getModel = function (path) {
+	        if (this.dataIndex < 0) {
+	            return;
+	        }
+	        var graph = this.hostGraph;
+	        var itemModel = graph.edgeData.getItemModel(this.dataIndex);
+
+	        return itemModel.getModel(path);
+	    };
+
+	    var createGraphDataProxyMixin = function (hostName, dataName) {
+	        return {
+	            /**
+	             * @param {string=} [dimension='value'] Default 'value'. can be 'a', 'b', 'c', 'd', 'e'.
+	             * @return {number}
+	             */
+	            getValue: function (dimension) {
+	                var data = this[hostName][dataName];
+	                return data.get(data.getDimension(dimension || 'value'), this.dataIndex);
+	            },
+
+	            /**
+	             * @param {Object|string} key
+	             * @param {*} [value]
+	             */
+	            setVisual: function (key, value) {
+	                this.dataIndex >= 0
+	                    && this[hostName][dataName].setItemVisual(this.dataIndex, key, value);
+	            },
+
+	            /**
+	             * @param {string} key
+	             * @return {boolean}
+	             */
+	            getVisual: function (key, ignoreParent) {
+	                return this[hostName][dataName].getItemVisual(this.dataIndex, key, ignoreParent);
+	            },
+
+	            /**
+	             * @param {Object} layout
+	             * @return {boolean} [merge=false]
+	             */
+	            setLayout: function (layout, merge) {
+	                this.dataIndex >= 0
+	                    && this[hostName][dataName].setItemLayout(this.dataIndex, layout, merge);
+	            },
+
+	            /**
+	             * @return {Object}
+	             */
+	            getLayout: function () {
+	                return this[hostName][dataName].getItemLayout(this.dataIndex);
+	            },
+
+	            /**
+	             * @return {module:zrender/Element}
+	             */
+	            getGraphicEl: function () {
+	                return this[hostName][dataName].getItemGraphicEl(this.dataIndex);
+	            },
+
+	            /**
+	             * @return {number}
+	             */
+	            getRawIndex: function () {
+	                return this[hostName][dataName].getRawIndex(this.dataIndex);
+	            }
+	        };
+	    };
+
+	    zrUtil.mixin(Node, createGraphDataProxyMixin('hostGraph', 'data'));
+	    zrUtil.mixin(Edge, createGraphDataProxyMixin('hostGraph', 'edgeData'));
+
+	    Graph.Node = Node;
+	    Graph.Edge = Edge;
+
+	    module.exports = Graph;
+
+
+/***/ },
+/* 198 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+
+	    var SymbolDraw = __webpack_require__(104);
+	    var LineDraw = __webpack_require__(199);
+	    var RoamController = __webpack_require__(174);
+
+	    var graphic = __webpack_require__(43);
+	    var adjustEdge = __webpack_require__(202);
+	    var zrUtil = __webpack_require__(4);
+
+	    var nodeOpacityPath = ['itemStyle', 'normal', 'opacity'];
+	    var lineOpacityPath = ['lineStyle', 'normal', 'opacity'];
+
+	    function getItemOpacity(item, opacityPath) {
+	        return item.getVisual('opacity') || item.getModel().get(opacityPath);
+	    }
+
+	    __webpack_require__(1).extendChartView({
+
+	        type: 'graph',
+
+	        init: function (ecModel, api) {
+	            var symbolDraw = new SymbolDraw();
+	            var lineDraw = new LineDraw();
+	            var group = this.group;
+
+	            var controller = new RoamController(api.getZr(), group);
+
+	            group.add(symbolDraw.group);
+	            group.add(lineDraw.group);
+
+	            this._symbolDraw = symbolDraw;
+	            this._lineDraw = lineDraw;
+	            this._controller = controller;
+
+	            this._firstRender = true;
+	        },
+
+	        render: function (seriesModel, ecModel, api) {
+	            var coordSys = seriesModel.coordinateSystem;
+
+	            this._model = seriesModel;
+	            this._nodeScaleRatio = seriesModel.get('nodeScaleRatio');
+
+	            var symbolDraw = this._symbolDraw;
+	            var lineDraw = this._lineDraw;
+
+	            var group = this.group;
+
+	            if (coordSys.type === 'view') {
+	                var groupNewProp = {
+	                    position: coordSys.position,
+	                    scale: coordSys.scale
+	                };
+	                if (this._firstRender) {
+	                    group.attr(groupNewProp);
+	                }
+	                else {
+	                    graphic.updateProps(group, groupNewProp, seriesModel);
+	                }
+	            }
+	            // Fix edge contact point with node
+	            adjustEdge(seriesModel.getGraph(), this._getNodeGlobalScale(seriesModel));
+
+	            var data = seriesModel.getData();
+	            symbolDraw.updateData(data);
+
+	            var edgeData = seriesModel.getEdgeData();
+	            lineDraw.updateData(edgeData);
+
+	            this._updateNodeAndLinkScale();
+
+	            this._updateController(seriesModel, api);
+
+	            clearTimeout(this._layoutTimeout);
+	            var forceLayout = seriesModel.forceLayout;
+	            var layoutAnimation = seriesModel.get('force.layoutAnimation');
+	            if (forceLayout) {
+	                this._startForceLayoutIteration(forceLayout, layoutAnimation);
+	            }
+	            data.eachItemGraphicEl(function (el, idx) {
+	                var itemModel = data.getItemModel(idx);
+	                // Update draggable
+	                el.off('drag').off('dragend');
+	                var draggable = data.getItemModel(idx).get('draggable');
+	                if (draggable) {
+	                    el.on('drag', function () {
+	                        if (forceLayout) {
+	                            forceLayout.warmUp();
+	                            !this._layouting
+	                                && this._startForceLayoutIteration(forceLayout, layoutAnimation);
+	                            forceLayout.setFixed(idx);
+	                            // Write position back to layout
+	                            data.setItemLayout(idx, el.position);
+	                        }
+	                    }, this).on('dragend', function () {
+	                        if (forceLayout) {
+	                            forceLayout.setUnfixed(idx);
+	                        }
+	                    }, this);
+	                }
+	                el.setDraggable(draggable && forceLayout);
+
+	                el.off('mouseover', this._focusNodeAdjacency);
+	                el.off('mouseout', this._unfocusAll);
+	                if (itemModel.get('focusNodeAdjacency')) {
+	                    el.on('mouseover', this._focusNodeAdjacency, this);
+	                    el.on('mouseout', this._unfocusAll, this);
+	                }
+	            }, this);
+
+	            this._firstRender = false;
+	        },
+
+	        _focusNodeAdjacency: function (e) {
+	            var data = this._model.getData();
+	            var graph = data.graph;
+	            var el = e.target;
+	            var dataIndex = el.dataIndex;
+	            var dataType = el.dataType;
+
+	            function fadeOutItem(item, opacityPath) {
+	                var opacity = getItemOpacity(item, opacityPath);
+	                var el = item.getGraphicEl();
+	                if (opacity == null) {
+	                    opacity = 1;
+	                }
+
+	                el.traverse(function (child) {
+	                    child.trigger('normal');
+	                    if (child.type !== 'group') {
+	                        child.setStyle('opacity', opacity * 0.1);
+	                    }
+	                });
+	            }
+
+	            function fadeInItem(item, opacityPath) {
+	                var opacity = getItemOpacity(item, opacityPath);
+	                var el = item.getGraphicEl();
+
+	                el.traverse(function (child) {
+	                    child.trigger('emphasis');
+	                    if (child.type !== 'group') {
+	                        child.setStyle('opacity', opacity);
+	                    }
+	                });
+	            }
+	            if (dataIndex !== null && dataType !== 'edge') {
+	                graph.eachNode(function (node) {
+	                    fadeOutItem(node, nodeOpacityPath);
+	                });
+	                graph.eachEdge(function (edge) {
+	                    fadeOutItem(edge, lineOpacityPath);
+	                });
+
+	                var node = graph.getNodeByIndex(dataIndex);
+	                fadeInItem(node, nodeOpacityPath);
+	                zrUtil.each(node.edges, function (edge) {
+	                    if (edge.dataIndex < 0) {
+	                        return;
+	                    }
+	                    fadeInItem(edge, lineOpacityPath);
+	                    fadeInItem(edge.node1, nodeOpacityPath);
+	                    fadeInItem(edge.node2, nodeOpacityPath);
+	                });
+	            }
+	        },
+
+	        _unfocusAll: function () {
+	            var data = this._model.getData();
+	            var graph = data.graph;
+	            graph.eachNode(function (node) {
+	                var opacity = getItemOpacity(node, nodeOpacityPath);
+	                node.getGraphicEl().traverse(function (child) {
+	                    child.trigger('normal');
+	                    if (child.type !== 'group') {
+	                        child.setStyle('opacity', opacity);
+	                    }
+	                });
+	            });
+	            graph.eachEdge(function (edge) {
+	                var opacity = getItemOpacity(edge, lineOpacityPath);
+	                edge.getGraphicEl().traverse(function (child) {
+	                    child.trigger('normal');
+	                    if (child.type !== 'group') {
+	                        child.setStyle('opacity', opacity);
+	                    }
+	                });
+	            });
+	        },
+
+	        _startForceLayoutIteration: function (forceLayout, layoutAnimation) {
+	            var self = this;
+	            (function step() {
+	                forceLayout.step(function (stopped) {
+	                    self.updateLayout(self._model);
+	                    (self._layouting = !stopped) && (
+	                        layoutAnimation
+	                            ? (self._layoutTimeout = setTimeout(step, 16))
+	                            : step()
+	                    );
+	                });
+	            })();
+	        },
+
+	        _updateController: function (seriesModel, api) {
+	            var controller = this._controller;
+	            var group = this.group;
+	            controller.rectProvider = function () {
+	                var rect = group.getBoundingRect();
+	                rect.applyTransform(group.transform);
+	                return rect;
+	            };
+	            if (seriesModel.coordinateSystem.type !== 'view') {
+	                controller.disable();
+	                return;
+	            }
+	            controller.enable(seriesModel.get('roam'));
+	            controller.zoomLimit = seriesModel.get('scaleLimit');
+	            // Update zoom from model
+	            controller.zoom = seriesModel.coordinateSystem.getZoom();
+
+	            controller
+	                .off('pan')
+	                .off('zoom')
+	                .on('pan', function (dx, dy) {
+	                    api.dispatchAction({
+	                        seriesId: seriesModel.id,
+	                        type: 'graphRoam',
+	                        dx: dx,
+	                        dy: dy
+	                    });
+	                })
+	                .on('zoom', function (zoom, mouseX, mouseY) {
+	                    api.dispatchAction({
+	                        seriesId: seriesModel.id,
+	                        type: 'graphRoam',
+	                        zoom:  zoom,
+	                        originX: mouseX,
+	                        originY: mouseY
+	                    });
+	                    this._updateNodeAndLinkScale();
+	                    adjustEdge(seriesModel.getGraph(), this._getNodeGlobalScale(seriesModel));
+	                    this._lineDraw.updateLayout();
+	                }, this);
+	        },
+
+	        _updateNodeAndLinkScale: function () {
+	            var seriesModel = this._model;
+	            var data = seriesModel.getData();
+
+	            var nodeScale = this._getNodeGlobalScale(seriesModel);
+	            var invScale = [nodeScale, nodeScale];
+
+	            data.eachItemGraphicEl(function (el, idx) {
+	                el.attr('scale', invScale);
+	            });
+	        },
+
+	        _getNodeGlobalScale: function (seriesModel) {
+	            var coordSys = seriesModel.coordinateSystem;
+	            if (coordSys.type !== 'view') {
+	                return 1;
+	            }
+
+	            var nodeScaleRatio = this._nodeScaleRatio;
+
+	            var groupScale = coordSys.scale;
+	            var groupZoom = (groupScale && groupScale[0]) || 1;
+	            // Scale node when zoom changes
+	            var roamZoom = coordSys.getZoom();
+	            var nodeScale = (roamZoom - 1) * nodeScaleRatio + 1;
+
+	            return nodeScale / groupZoom;
+	        },
+
+	        updateLayout: function (seriesModel) {
+	            adjustEdge(seriesModel.getGraph(), this._getNodeGlobalScale(seriesModel));
+
+	            this._symbolDraw.updateLayout();
+	            this._lineDraw.updateLayout();
+	        },
+
+	        remove: function (ecModel, api) {
+	            this._symbolDraw && this._symbolDraw.remove();
+	            this._lineDraw && this._lineDraw.remove();
+	        }
+	    });
+
+
+/***/ },
+/* 199 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @module echarts/chart/helper/LineDraw
+	 */
+
+
+	    var graphic = __webpack_require__(43);
+	    var LineGroup = __webpack_require__(200);
+
+
+	    function isPointNaN(pt) {
+	        return isNaN(pt[0]) || isNaN(pt[1]);
+	    }
+	    function lineNeedsDraw(pts) {
+	        return !isPointNaN(pts[0]) && !isPointNaN(pts[1]);
+	    }
+	    /**
+	     * @alias module:echarts/component/marker/LineDraw
+	     * @constructor
+	     */
+	    function LineDraw(ctor) {
+	        this._ctor = ctor || LineGroup;
+	        this.group = new graphic.Group();
+	    }
+
+	    var lineDrawProto = LineDraw.prototype;
+
+	    /**
+	     * @param {module:echarts/data/List} lineData
+	     */
+	    lineDrawProto.updateData = function (lineData) {
+
+	        var oldLineData = this._lineData;
+	        var group = this.group;
+	        var LineCtor = this._ctor;
+
+	        var hostModel = lineData.hostModel;
+
+	        var seriesScope = {
+	            lineStyle: hostModel.getModel('lineStyle.normal').getLineStyle(),
+	            hoverLineStyle: hostModel.getModel('lineStyle.emphasis').getLineStyle(),
+	            labelModel: hostModel.getModel('label.normal'),
+	            hoverLabelModel: hostModel.getModel('label.emphasis')
+	        };
+
+	        lineData.diff(oldLineData)
+	            .add(function (idx) {
+	                if (!lineNeedsDraw(lineData.getItemLayout(idx))) {
+	                    return;
+	                }
+	                var lineGroup = new LineCtor(lineData, idx, seriesScope);
+
+	                lineData.setItemGraphicEl(idx, lineGroup);
+
+	                group.add(lineGroup);
+	            })
+	            .update(function (newIdx, oldIdx) {
+	                var lineGroup = oldLineData.getItemGraphicEl(oldIdx);
+	                if (!lineNeedsDraw(lineData.getItemLayout(newIdx))) {
+	                    group.remove(lineGroup);
+	                    return;
+	                }
+
+	                if (!lineGroup) {
+	                    lineGroup = new LineCtor(lineData, newIdx, seriesScope);
+	                }
+	                else {
+	                    lineGroup.updateData(lineData, newIdx, seriesScope);
+	                }
+
+	                lineData.setItemGraphicEl(newIdx, lineGroup);
+
+	                group.add(lineGroup);
+	            })
+	            .remove(function (idx) {
+	                group.remove(oldLineData.getItemGraphicEl(idx));
+	            })
+	            .execute();
+
+	        this._lineData = lineData;
+	    };
+
+	    lineDrawProto.updateLayout = function () {
+	        var lineData = this._lineData;
+	        lineData.eachItemGraphicEl(function (el, idx) {
+	            el.updateLayout(lineData, idx);
+	        }, this);
+	    };
+
+	    lineDrawProto.remove = function () {
+	        this.group.removeAll();
+	    };
+
+	    module.exports = LineDraw;
+
+
+/***/ },
+/* 200 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @module echarts/chart/helper/Line
+	 */
+
+
+	    var symbolUtil = __webpack_require__(106);
+	    var vector = __webpack_require__(10);
+	    // var matrix = require('zrender/lib/core/matrix');
+	    var LinePath = __webpack_require__(201);
+	    var graphic = __webpack_require__(43);
+	    var zrUtil = __webpack_require__(4);
+	    var numberUtil = __webpack_require__(7);
+
+	    var SYMBOL_CATEGORIES = ['fromSymbol', 'toSymbol'];
+	    function makeSymbolTypeKey(symbolCategory) {
+	        return '_' + symbolCategory + 'Type';
+	    }
+	    /**
+	     * @inner
+	     */
+	    function createSymbol(name, lineData, idx) {
+	        var color = lineData.getItemVisual(idx, 'color');
+	        var symbolType = lineData.getItemVisual(idx, name);
+	        var symbolSize = lineData.getItemVisual(idx, name + 'Size');
+
+	        if (!symbolType || symbolType === 'none') {
+	            return;
+	        }
+
+	        if (!zrUtil.isArray(symbolSize)) {
+	            symbolSize = [symbolSize, symbolSize];
+	        }
+	        var symbolPath = symbolUtil.createSymbol(
+	            symbolType, -symbolSize[0] / 2, -symbolSize[1] / 2,
+	            symbolSize[0], symbolSize[1], color
+	        );
+	        symbolPath.name = name;
+
+	        return symbolPath;
+	    }
+
+	    function createLine(points) {
+	        var line = new LinePath({
+	            name: 'line'
+	        });
+	        setLinePoints(line.shape, points);
+	        return line;
+	    }
+
+	    function setLinePoints(targetShape, points) {
+	        var p1 = points[0];
+	        var p2 = points[1];
+	        var cp1 = points[2];
+	        targetShape.x1 = p1[0];
+	        targetShape.y1 = p1[1];
+	        targetShape.x2 = p2[0];
+	        targetShape.y2 = p2[1];
+	        targetShape.percent = 1;
+
+	        if (cp1) {
+	            targetShape.cpx1 = cp1[0];
+	            targetShape.cpy1 = cp1[1];
+	        }
+	    }
+
+	    function updateSymbolAndLabelBeforeLineUpdate () {
+	        var lineGroup = this;
+	        var symbolFrom = lineGroup.childOfName('fromSymbol');
+	        var symbolTo = lineGroup.childOfName('toSymbol');
+	        var label = lineGroup.childOfName('label');
+	        // Quick reject
+	        if (!symbolFrom && !symbolTo && label.ignore) {
+	            return;
+	        }
+
+	        var invScale = 1;
+	        var parentNode = this.parent;
+	        while (parentNode) {
+	            if (parentNode.scale) {
+	                invScale /= parentNode.scale[0];
+	            }
+	            parentNode = parentNode.parent;
+	        }
+
+	        var line = lineGroup.childOfName('line');
+	        // If line not changed
+	        // FIXME Parent scale changed
+	        if (!this.__dirty && !line.__dirty) {
+	            return;
+	        }
+
+	        var percent = line.shape.percent;
+	        var fromPos = line.pointAt(0);
+	        var toPos = line.pointAt(percent);
+
+	        var d = vector.sub([], toPos, fromPos);
+	        vector.normalize(d, d);
+
+	        if (symbolFrom) {
+	            symbolFrom.attr('position', fromPos);
+	            var tangent = line.tangentAt(0);
+	            symbolFrom.attr('rotation', Math.PI / 2 - Math.atan2(
+	                tangent[1], tangent[0]
+	            ));
+	            symbolFrom.attr('scale', [invScale * percent, invScale * percent]);
+	        }
+	        if (symbolTo) {
+	            symbolTo.attr('position', toPos);
+	            var tangent = line.tangentAt(1);
+	            symbolTo.attr('rotation', -Math.PI / 2 - Math.atan2(
+	                tangent[1], tangent[0]
+	            ));
+	            symbolTo.attr('scale', [invScale * percent, invScale * percent]);
+	        }
+
+	        if (!label.ignore) {
+	            label.attr('position', toPos);
+
+	            var textPosition;
+	            var textAlign;
+	            var textVerticalAlign;
+
+	            var distance = 5 * invScale;
+	            // End
+	            if (label.__position === 'end') {
+	                textPosition = [d[0] * distance + toPos[0], d[1] * distance + toPos[1]];
+	                textAlign = d[0] > 0.8 ? 'left' : (d[0] < -0.8 ? 'right' : 'center');
+	                textVerticalAlign = d[1] > 0.8 ? 'top' : (d[1] < -0.8 ? 'bottom' : 'middle');
+	            }
+	            // Middle
+	            else if (label.__position === 'middle') {
+	                var halfPercent = percent / 2;
+	                var tangent = line.tangentAt(halfPercent);
+	                var n = [tangent[1], -tangent[0]];
+	                var cp = line.pointAt(halfPercent);
+	                if (n[1] > 0) {
+	                    n[0] = -n[0];
+	                    n[1] = -n[1];
+	                }
+	                textPosition = [cp[0] + n[0] * distance, cp[1] + n[1] * distance];
+	                textAlign = 'center';
+	                textVerticalAlign = 'bottom';
+	                var rotation = -Math.atan2(tangent[1], tangent[0]);
+	                if (toPos[0] < fromPos[0]) {
+	                    rotation = Math.PI + rotation;
+	                }
+	                label.attr('rotation', rotation);
+	            }
+	            // Start
+	            else {
+	                textPosition = [-d[0] * distance + fromPos[0], -d[1] * distance + fromPos[1]];
+	                textAlign = d[0] > 0.8 ? 'right' : (d[0] < -0.8 ? 'left' : 'center');
+	                textVerticalAlign = d[1] > 0.8 ? 'bottom' : (d[1] < -0.8 ? 'top' : 'middle');
+	            }
+	            label.attr({
+	                style: {
+	                    // Use the user specified text align and baseline first
+	                    textVerticalAlign: label.__verticalAlign || textVerticalAlign,
+	                    textAlign: label.__textAlign || textAlign
+	                },
+	                position: textPosition,
+	                scale: [invScale, invScale]
+	            });
+	        }
+	    }
+
+	    /**
+	     * @constructor
+	     * @extends {module:zrender/graphic/Group}
+	     * @alias {module:echarts/chart/helper/Line}
+	     */
+	    function Line(lineData, idx, seriesScope) {
+	        graphic.Group.call(this);
+
+	        this._createLine(lineData, idx, seriesScope);
+	    }
+
+	    var lineProto = Line.prototype;
+
+	    // Update symbol position and rotation
+	    lineProto.beforeUpdate = updateSymbolAndLabelBeforeLineUpdate;
+
+	    lineProto._createLine = function (lineData, idx, seriesScope) {
+	        var seriesModel = lineData.hostModel;
+	        var linePoints = lineData.getItemLayout(idx);
+
+	        var line = createLine(linePoints);
+	        line.shape.percent = 0;
+	        graphic.initProps(line, {
+	            shape: {
+	                percent: 1
+	            }
+	        }, seriesModel, idx);
+
+	        this.add(line);
+
+	        var label = new graphic.Text({
+	            name: 'label'
+	        });
+	        this.add(label);
+
+	        zrUtil.each(SYMBOL_CATEGORIES, function (symbolCategory) {
+	            var symbol = createSymbol(symbolCategory, lineData, idx);
+	            // symbols must added after line to make sure
+	            // it will be updated after line#update.
+	            // Or symbol position and rotation update in line#beforeUpdate will be one frame slow
+	            this.add(symbol);
+	            this[makeSymbolTypeKey(symbolCategory)] = lineData.getItemVisual(idx, symbolCategory);
+	        }, this);
+
+	        this._updateCommonStl(lineData, idx, seriesScope);
+	    };
+
+	    lineProto.updateData = function (lineData, idx, seriesScope) {
+	        var seriesModel = lineData.hostModel;
+
+	        var line = this.childOfName('line');
+	        var linePoints = lineData.getItemLayout(idx);
+	        var target = {
+	            shape: {}
+	        };
+	        setLinePoints(target.shape, linePoints);
+	        graphic.updateProps(line, target, seriesModel, idx);
+
+	        zrUtil.each(SYMBOL_CATEGORIES, function (symbolCategory) {
+	            var symbolType = lineData.getItemVisual(idx, symbolCategory);
+	            var key = makeSymbolTypeKey(symbolCategory);
+	            // Symbol changed
+	            if (this[key] !== symbolType) {
+	                this.remove(this.childOfName(symbolCategory));
+	                var symbol = createSymbol(symbolCategory, lineData, idx);
+	                this.add(symbol);
+	            }
+	            this[key] = symbolType;
+	        }, this);
+
+	        this._updateCommonStl(lineData, idx, seriesScope);
+	    };
+
+	    lineProto._updateCommonStl = function (lineData, idx, seriesScope) {
+	        var seriesModel = lineData.hostModel;
+
+	        var line = this.childOfName('line');
+
+	        var lineStyle = seriesScope && seriesScope.lineStyle;
+	        var hoverLineStyle = seriesScope && seriesScope.hoverLineStyle;
+	        var labelModel = seriesScope && seriesScope.labelModel;
+	        var hoverLabelModel = seriesScope && seriesScope.hoverLabelModel;
+
+	        // Optimization for large dataset
+	        if (!seriesScope || lineData.hasItemOption) {
+	            var itemModel = lineData.getItemModel(idx);
+
+	            lineStyle = itemModel.getModel('lineStyle.normal').getLineStyle();
+	            hoverLineStyle = itemModel.getModel('lineStyle.emphasis').getLineStyle();
+
+	            labelModel = itemModel.getModel('label.normal');
+	            hoverLabelModel = itemModel.getModel('label.emphasis');
+	        }
+
+	        var visualColor = lineData.getItemVisual(idx, 'color');
+	        if (isNaN(defaultText)) {
+	            // Use name
+	            defaultText = lineData.getName(idx);
+	        }
+	        line.useStyle(zrUtil.defaults(
+	            {
+	                strokeNoScale: true,
+	                fill: 'none',
+	                stroke: visualColor
+	            },
+	            lineStyle
+	        ));
+	        line.hoverStyle = hoverLineStyle;
+
+	        var showLabel = labelModel.getShallow('show');
+	        var hoverShowLabel = hoverLabelModel.getShallow('show');
+	        var defaultText;
+	        var label = this.childOfName('label');
+	        var defaultLabelColor;
+	        if (showLabel || hoverShowLabel) {
+	            defaultText = numberUtil.round(seriesModel.getRawValue(idx));
+	            defaultLabelColor = visualColor || '#000';
+	        }
+	        // label.afterUpdate = lineAfterUpdate;
+	        if (showLabel) {
+	            var textStyleModel = labelModel.getModel('textStyle');
+	            label.setStyle({
+	                text: zrUtil.retrieve(
+	                        seriesModel.getFormattedLabel(idx, 'normal', lineData.dataType),
+	                        defaultText
+	                    ),
+	                textFont: textStyleModel.getFont(),
+	                fill: textStyleModel.getTextColor() || defaultLabelColor
+	            });
+
+	            label.__textAlign = textStyleModel.get('align');
+	            label.__verticalAlign = textStyleModel.get('baseline');
+	            label.__position = labelModel.get('position');
+	        }
+	        else {
+	            label.setStyle('text', '');
+	        }
+	        if (hoverShowLabel) {
+	            var textStyleHoverModel = hoverLabelModel.getModel('textStyle');
+
+	            label.hoverStyle = {
+	                text: zrUtil.retrieve(
+	                        seriesModel.getFormattedLabel(idx, 'emphasis', lineData.dataType),
+	                        defaultText
+	                    ),
+	                textFont: textStyleHoverModel.getFont(),
+	                fill: textStyleHoverModel.getTextColor() || defaultLabelColor
+	            };
+	        }
+	        else {
+	            label.hoverStyle = {
+	                text: ''
+	            };
+	        }
+
+	        label.ignore = !showLabel && !hoverShowLabel;
+
+	        graphic.setHoverStyle(this);
+	    };
+
+	    lineProto.updateLayout = function (lineData, idx) {
+	        this.setLinePoints(lineData.getItemLayout(idx));
+	    };
+
+	    lineProto.setLinePoints = function (points) {
+	        var linePath = this.childOfName('line');
+	        setLinePoints(linePath.shape, points);
+	        linePath.dirty();
+	    };
+
+	    zrUtil.inherits(Line, graphic.Group);
+
+	    module.exports = Line;
+
+
+/***/ },
+/* 201 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * Line path for bezier and straight line draw
+	 */
+
+	    var graphic = __webpack_require__(43);
+	    var vec2 = __webpack_require__(10);
+
+	    var straightLineProto = graphic.Line.prototype;
+	    var bezierCurveProto = graphic.BezierCurve.prototype;
+
+	    function isLine(shape) {
+	        return shape.cpx1 == null || shape.cpy1 == null;
+	    }
+
+	    module.exports = graphic.extendShape({
+
+	        type: 'ec-line',
+
+	        style: {
+	            stroke: '#000',
+	            fill: null
+	        },
+
+	        shape: {
+	            x1: 0,
+	            y1: 0,
+	            x2: 0,
+	            y2: 0,
+	            percent: 1,
+	            cpx1: null,
+	            cpy1: null
+	        },
+
+	        buildPath: function (ctx, shape) {
+	            (isLine(shape) ? straightLineProto : bezierCurveProto).buildPath(ctx, shape);
+	        },
+
+	        pointAt: function (t) {
+	            return isLine(this.shape)
+	                ? straightLineProto.pointAt.call(this, t)
+	                : bezierCurveProto.pointAt.call(this, t);
+	        },
+
+	        tangentAt: function (t) {
+	            var shape = this.shape;
+	            var p = isLine(shape)
+	                ? [shape.x2 - shape.x1, shape.y2 - shape.y1]
+	                : bezierCurveProto.tangentAt.call(this, t);
+	            return vec2.normalize(p, p);
+	        }
+	    });
+
+
+/***/ },
+/* 202 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var curveTool = __webpack_require__(50);
+	    var vec2 = __webpack_require__(10);
+
+	    var v1 = [];
+	    var v2 = [];
+	    var v3 = [];
+	    var quadraticAt = curveTool.quadraticAt;
+	    var v2DistSquare = vec2.distSquare;
+	    var mathAbs = Math.abs;
+	    function intersectCurveCircle(curvePoints, center, radius) {
+	        var p0 = curvePoints[0];
+	        var p1 = curvePoints[1];
+	        var p2 = curvePoints[2];
+
+	        var d = Infinity;
+	        var t;
+	        var radiusSquare = radius * radius;
+	        var interval = 0.1;
+
+	        for (var _t = 0.1; _t <= 0.9; _t += 0.1) {
+	            v1[0] = quadraticAt(p0[0], p1[0], p2[0], _t);
+	            v1[1] = quadraticAt(p0[1], p1[1], p2[1], _t);
+	            var diff = mathAbs(v2DistSquare(v1, center) - radiusSquare);
+	            if (diff < d) {
+	                d = diff;
+	                t = _t;
+	            }
+	        }
+
+	        // Assume the segment is monotone，Find root through Bisection method
+	        // At most 32 iteration
+	        for (var i = 0; i < 32; i++) {
+	            // var prev = t - interval;
+	            var next = t + interval;
+	            // v1[0] = quadraticAt(p0[0], p1[0], p2[0], prev);
+	            // v1[1] = quadraticAt(p0[1], p1[1], p2[1], prev);
+	            v2[0] = quadraticAt(p0[0], p1[0], p2[0], t);
+	            v2[1] = quadraticAt(p0[1], p1[1], p2[1], t);
+	            v3[0] = quadraticAt(p0[0], p1[0], p2[0], next);
+	            v3[1] = quadraticAt(p0[1], p1[1], p2[1], next);
+
+	            var diff = v2DistSquare(v2, center) - radiusSquare;
+	            if (mathAbs(diff) < 1e-2) {
+	                break;
+	            }
+
+	            // var prevDiff = v2DistSquare(v1, center) - radiusSquare;
+	            var nextDiff = v2DistSquare(v3, center) - radiusSquare;
+
+	            interval /= 2;
+	            if (diff < 0) {
+	                if (nextDiff >= 0) {
+	                    t = t + interval;
+	                }
+	                else {
+	                    t = t - interval;
+	                }
+	            }
+	            else {
+	                if (nextDiff >= 0) {
+	                    t = t - interval;
+	                }
+	                else {
+	                    t = t + interval;
+	                }
+	            }
+	        }
+
+	        return t;
+	    }
+	    // Adjust edge to avoid
+	    module.exports = function (graph, scale) {
+	        var tmp0 = [];
+	        var quadraticSubdivide = curveTool.quadraticSubdivide;
+	        var pts = [[], [], []];
+	        var pts2 = [[], []];
+	        var v = [];
+	        scale /= 2;
+
+	        graph.eachEdge(function (edge, idx) {
+	            var linePoints = edge.getLayout();
+	            var fromSymbol = edge.getVisual('fromSymbol');
+	            var toSymbol = edge.getVisual('toSymbol');
+
+	            if (!linePoints.__original) {
+	                linePoints.__original = [
+	                    vec2.clone(linePoints[0]),
+	                    vec2.clone(linePoints[1])
+	                ];
+	                if (linePoints[2]) {
+	                    linePoints.__original.push(vec2.clone(linePoints[2]));
+	                }
+	            }
+	            var originalPoints = linePoints.__original;
+	            // Quadratic curve
+	            if (linePoints[2] != null) {
+	                vec2.copy(pts[0], originalPoints[0]);
+	                vec2.copy(pts[1], originalPoints[2]);
+	                vec2.copy(pts[2], originalPoints[1]);
+	                if (fromSymbol && fromSymbol != 'none') {
+	                    var symbolSize = edge.node1.getVisual('symbolSize');
+	                    if (symbolSize instanceof Array) {
+	                        symbolSize = (symbolSize[0] + symbolSize[1]) / 2;
+	                    }
+	                    var t = intersectCurveCircle(pts, originalPoints[0], symbolSize * scale);
+	                    // Subdivide and get the second
+	                    quadraticSubdivide(pts[0][0], pts[1][0], pts[2][0], t, tmp0);
+	                    pts[0][0] = tmp0[3];
+	                    pts[1][0] = tmp0[4];
+	                    quadraticSubdivide(pts[0][1], pts[1][1], pts[2][1], t, tmp0);
+	                    pts[0][1] = tmp0[3];
+	                    pts[1][1] = tmp0[4];
+	                }
+	                if (toSymbol && toSymbol != 'none') {
+	                    var symbolSize = edge.node1.getVisual('symbolSize');
+	                    if (symbolSize instanceof Array) {
+	                        symbolSize = (symbolSize[0] + symbolSize[1]) / 2;
+	                    }
+	                    var t = intersectCurveCircle(pts, originalPoints[1], symbolSize * scale);
+	                    // Subdivide and get the first
+	                    quadraticSubdivide(pts[0][0], pts[1][0], pts[2][0], t, tmp0);
+	                    pts[1][0] = tmp0[1];
+	                    pts[2][0] = tmp0[2];
+	                    quadraticSubdivide(pts[0][1], pts[1][1], pts[2][1], t, tmp0);
+	                    pts[1][1] = tmp0[1];
+	                    pts[2][1] = tmp0[2];
+	                }
+	                // Copy back to layout
+	                vec2.copy(linePoints[0], pts[0]);
+	                vec2.copy(linePoints[1], pts[2]);
+	                vec2.copy(linePoints[2], pts[1]);
+	            }
+	            // Line
+	            else {
+	                vec2.copy(pts2[0], originalPoints[0]);
+	                vec2.copy(pts2[1], originalPoints[1]);
+
+	                vec2.sub(v, pts2[1], pts2[0]);
+	                vec2.normalize(v, v);
+	                if (fromSymbol && fromSymbol != 'none') {
+	                    vec2.scaleAndAdd(pts2[0], pts2[0], v, edge.node1.getVisual('symbolSize') * scale);
+	                }
+	                if (toSymbol && toSymbol != 'none') {
+	                    vec2.scaleAndAdd(pts2[1], pts2[1], v, -edge.node2.getVisual('symbolSize') * scale);
+	                }
+	                vec2.copy(linePoints[0], pts2[0]);
+	                vec2.copy(linePoints[1], pts2[1]);
+	            }
+	        });
+	    };
+
+
+/***/ },
+/* 203 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var echarts = __webpack_require__(1);
+	    var roamHelper = __webpack_require__(177);
+
+	    var actionInfo = {
+	        type: 'graphRoam',
+	        event: 'graphRoam',
+	        update: 'none'
+	    };
+
+	    /**
+	     * @payload
+	     * @property {string} name Series name
+	     * @property {number} [dx]
+	     * @property {number} [dy]
+	     * @property {number} [zoom]
+	     * @property {number} [originX]
+	     * @property {number} [originY]
+	     */
+
+	    echarts.registerAction(actionInfo, function (payload, ecModel) {
+	        ecModel.eachComponent({mainType: 'series', query: payload}, function (seriesModel) {
+	            var coordSys = seriesModel.coordinateSystem;
+
+	            var res = roamHelper.updateCenterAndZoom(coordSys, payload);
+
+	            seriesModel.setCenter
+	                && seriesModel.setCenter(res.center);
+
+	            seriesModel.setZoom
+	                && seriesModel.setZoom(res.zoom);
+	        });
+	    });
+
+
+/***/ },
+/* 204 */
+/***/ function(module, exports) {
+
+	
+
+	    module.exports = function (ecModel) {
+	        var legendModels = ecModel.findComponents({
+	            mainType: 'legend'
+	        });
+	        if (!legendModels || !legendModels.length) {
+	            return;
+	        }
+	        ecModel.eachSeriesByType('graph', function (graphSeries) {
+	            var categoriesData = graphSeries.getCategoriesData();
+	            var graph = graphSeries.getGraph();
+	            var data = graph.data;
+
+	            var categoryNames = categoriesData.mapArray(categoriesData.getName);
+
+	            data.filterSelf(function (idx) {
+	                var model = data.getItemModel(idx);
+	                var category = model.getShallow('category');
+	                if (category != null) {
+	                    if (typeof category === 'number') {
+	                        category = categoryNames[category];
+	                    }
+	                    // If in any legend component the status is not selected.
+	                    for (var i = 0; i < legendModels.length; i++) {
+	                        if (!legendModels[i].isSelected(category)) {
+	                            return false;
+	                        }
+	                    }
+	                }
+	                return true;
+	            });
+	        }, this);
+	    };
+
+
+/***/ },
+/* 205 */
+/***/ function(module, exports) {
+
+	
+
+	    module.exports = function (ecModel) {
+	        ecModel.eachSeriesByType('graph', function (seriesModel) {
+	            var categoriesData = seriesModel.getCategoriesData();
+	            var data = seriesModel.getData();
+
+	            var categoryNameIdxMap = {};
+
+	            categoriesData.each(function (idx) {
+	                var name = categoriesData.getName(idx);
+	                categoryNameIdxMap[name] = idx;
+
+	                var itemModel = categoriesData.getItemModel(idx);
+	                var color = itemModel.get('itemStyle.normal.color')
+	                    || seriesModel.getColorFromPalette(name);
+	                categoriesData.setItemVisual(idx, 'color', color);
+	            });
+
+	            // Assign category color to visual
+	            if (categoriesData.count()) {
+	                data.each(function (idx) {
+	                    var model = data.getItemModel(idx);
+	                    var category = model.getShallow('category');
+	                    if (category != null) {
+	                        if (typeof category === 'string') {
+	                            category = categoryNameIdxMap[category];
+	                        }
+	                        if (!data.getItemVisual(idx, 'color', true)) {
+	                            data.setItemVisual(
+	                                idx, 'color',
+	                                categoriesData.getItemVisual(category, 'color')
+	                            );
+	                        }
+	                    }
+	                });
+	            }
+	        });
+	    };
+
+
+/***/ },
+/* 206 */
+/***/ function(module, exports) {
+
+	
+
+	    function normalize(a) {
+	        if (!(a instanceof Array)) {
+	            a = [a, a];
+	        }
+	        return a;
+	    }
+	    module.exports = function (ecModel) {
+	        ecModel.eachSeriesByType('graph', function (seriesModel) {
+	            var graph = seriesModel.getGraph();
+	            var edgeData = seriesModel.getEdgeData();
+	            var symbolType = normalize(seriesModel.get('edgeSymbol'));
+	            var symbolSize = normalize(seriesModel.get('edgeSymbolSize'));
+
+	            edgeData.setVisual('fromSymbol', symbolType && symbolType[0]);
+	            edgeData.setVisual('toSymbol', symbolType && symbolType[1]);
+	            edgeData.setVisual('fromSymbolSize', symbolSize && symbolSize[0]);
+	            edgeData.setVisual('toSymbolSize', symbolSize && symbolSize[1]);
+	            edgeData.setVisual('color', seriesModel.get('lineStyle.normal.color'));
+
+	            edgeData.each(function (idx) {
+	                var itemModel = edgeData.getItemModel(idx);
+	                var edge = graph.getEdgeByIndex(idx);
+	                var symbolType = normalize(itemModel.getShallow('symbol', true));
+	                var symbolSize = normalize(itemModel.getShallow('symbolSize', true));
+	                // Edge visual must after node visual
+	                var color = itemModel.get('lineStyle.normal.color');
+	                switch (color) {
+	                    case 'source':
+	                        color = edge.node1.getVisual('color');
+	                        break;
+	                    case 'target':
+	                        color = edge.node2.getVisual('color');
+	                        break;
+	                }
+
+	                symbolType[0] && edge.setVisual('fromSymbol', symbolType[0]);
+	                symbolType[1] && edge.setVisual('toSymbol', symbolType[1]);
+	                symbolSize[0] && edge.setVisual('fromSymbolSize', symbolSize[0]);
+	                symbolSize[1] && edge.setVisual('toSymbolSize', symbolSize[1]);
+
+	                edge.setVisual('color', color);
+	            });
+	        });
+	    };
+
+
+/***/ },
+/* 207 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var simpleLayoutHelper = __webpack_require__(208);
+	    var simpleLayoutEdge = __webpack_require__(209);
+	    module.exports = function (ecModel, api) {
+	        ecModel.eachSeriesByType('graph', function (seriesModel) {
+	            var layout = seriesModel.get('layout');
+	            var coordSys = seriesModel.coordinateSystem;
+	            if (coordSys && coordSys.type !== 'view') {
+	                var data = seriesModel.getData();
+	                data.each(coordSys.dimensions, function (x, y, idx) {
+	                    if (!isNaN(x) && !isNaN(y)) {
+	                        data.setItemLayout(idx, coordSys.dataToPoint([x, y]));
+	                    }
+	                    else {
+	                        // Also {Array.<number>}, not undefined to avoid if...else... statement
+	                        data.setItemLayout(idx, [NaN, NaN]);
+	                    }
+	                });
+
+	                simpleLayoutEdge(data.graph);
+	            }
+	            else if (!layout || layout === 'none') {
+	                simpleLayoutHelper(seriesModel);
+	            }
+	        });
+	    };
+
+
+/***/ },
+/* 208 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var simpleLayoutEdge = __webpack_require__(209);
+
+	    module.exports = function (seriesModel) {
+	        var coordSys = seriesModel.coordinateSystem;
+	        if (coordSys && coordSys.type !== 'view') {
+	            return;
+	        }
+	        var graph = seriesModel.getGraph();
+
+	        graph.eachNode(function (node) {
+	            var model = node.getModel();
+	            node.setLayout([+model.get('x'), +model.get('y')]);
+	        });
+
+	        simpleLayoutEdge(graph);
+	    };
+
+
+/***/ },
+/* 209 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+	    var vec2 = __webpack_require__(10);
+	    module.exports = function (graph) {
+	        graph.eachEdge(function (edge) {
+	            var curveness = edge.getModel().get('lineStyle.normal.curveness') || 0;
+	            var p1 = vec2.clone(edge.node1.getLayout());
+	            var p2 = vec2.clone(edge.node2.getLayout());
+	            var points = [p1, p2];
+	            if (curveness > 0) {
+	                points.push([
+	                    (p1[0] + p2[0]) / 2 - (p1[1] - p2[1]) * curveness,
+	                    (p1[1] + p2[1]) / 2 - (p2[0] - p1[0]) * curveness
+	                ]);
+	            }
+	            edge.setLayout(points);
+	        });
+	    };
+
+
+/***/ },
+/* 210 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+	    var circularLayoutHelper = __webpack_require__(211);
+	    module.exports = function (ecModel) {
+	        ecModel.eachSeriesByType('graph', function (seriesModel) {
+	            if (seriesModel.get('layout') === 'circular') {
+	                circularLayoutHelper(seriesModel);
+	            }
+	        });
+	    };
+
+
+/***/ },
+/* 211 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+	    var vec2 = __webpack_require__(10);
+	    module.exports = function (seriesModel) {
+	        var coordSys = seriesModel.coordinateSystem;
+	        if (coordSys && coordSys.type !== 'view') {
+	            return;
+	        }
+
+	        var rect = coordSys.getBoundingRect();
+
+	        var nodeData = seriesModel.getData();
+	        var graph = nodeData.graph;
+
+	        var angle = 0;
+	        var sum = nodeData.getSum('value');
+	        var unitAngle = Math.PI * 2 / (sum || nodeData.count());
+
+	        var cx = rect.width / 2 + rect.x;
+	        var cy = rect.height / 2 + rect.y;
+
+	        var r = Math.min(rect.width, rect.height) / 2;
+
+	        graph.eachNode(function (node) {
+	            var value = node.getValue('value');
+
+	            angle += unitAngle * (sum ? value : 2) / 2;
+
+	            node.setLayout([
+	                r * Math.cos(angle) + cx,
+	                r * Math.sin(angle) + cy
+	            ]);
+
+	            angle += unitAngle * (sum ? value : 2) / 2;
+	        });
+
+	        graph.eachEdge(function (edge) {
+	            var curveness = edge.getModel().get('lineStyle.normal.curveness') || 0;
+	            var p1 = vec2.clone(edge.node1.getLayout());
+	            var p2 = vec2.clone(edge.node2.getLayout());
+	            var cp1;
+	            var x12 = (p1[0] + p2[0]) / 2;
+	            var y12 = (p1[1] + p2[1]) / 2;
+	            if (curveness > 0) {
+	                curveness *= 3;
+	                cp1 = [
+	                    cx * curveness + x12 * (1 - curveness),
+	                    cy * curveness + y12 * (1 - curveness)
+	                ];
+	            }
+	            edge.setLayout([p1, p2, cp1]);
+	        });
+	    };
+
+
+/***/ },
+/* 212 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var forceHelper = __webpack_require__(213);
+	    var numberUtil = __webpack_require__(7);
+	    var simpleLayoutHelper = __webpack_require__(208);
+	    var circularLayoutHelper = __webpack_require__(211);
+	    var vec2 = __webpack_require__(10);
+
+	    module.exports = function (ecModel) {
+	        ecModel.eachSeriesByType('graph', function (graphSeries) {
+	            var coordSys = graphSeries.coordinateSystem;
+	            if (coordSys && coordSys.type !== 'view') {
+	                return;
+	            }
+	            if (graphSeries.get('layout') === 'force') {
+	                var preservedPoints = graphSeries.preservedPoints || {};
+	                var graph = graphSeries.getGraph();
+	                var nodeData = graph.data;
+	                var edgeData = graph.edgeData;
+	                var forceModel = graphSeries.getModel('force');
+	                var initLayout = forceModel.get('initLayout');
+	                if (graphSeries.preservedPoints) {
+	                    nodeData.each(function (idx) {
+	                        var id = nodeData.getId(idx);
+	                        nodeData.setItemLayout(idx, preservedPoints[id] || [NaN, NaN]);
+	                    });
+	                }
+	                else if (!initLayout || initLayout === 'none') {
+	                    simpleLayoutHelper(graphSeries);
+	                }
+	                else if (initLayout === 'circular') {
+	                    circularLayoutHelper(graphSeries);
+	                }
+
+	                var nodeDataExtent = nodeData.getDataExtent('value');
+	                // var edgeDataExtent = edgeData.getDataExtent('value');
+	                var repulsion = forceModel.get('repulsion');
+	                var edgeLength = forceModel.get('edgeLength');
+	                var nodes = nodeData.mapArray('value', function (value, idx) {
+	                    var point = nodeData.getItemLayout(idx);
+	                    // var w = numberUtil.linearMap(value, nodeDataExtent, [0, 50]);
+	                    var rep = numberUtil.linearMap(value, nodeDataExtent, [0, repulsion]) || (repulsion / 2);
+	                    return {
+	                        w: rep,
+	                        rep: rep,
+	                        p: (!point || isNaN(point[0]) || isNaN(point[1])) ? null : point
+	                    };
+	                });
+	                var edges = edgeData.mapArray('value', function (value, idx) {
+	                    var edge = graph.getEdgeByIndex(idx);
+	                    // var w = numberUtil.linearMap(value, edgeDataExtent, [0, 100]);
+	                    return {
+	                        n1: nodes[edge.node1.dataIndex],
+	                        n2: nodes[edge.node2.dataIndex],
+	                        d: edgeLength,
+	                        curveness: edge.getModel().get('lineStyle.normal.curveness') || 0
+	                    };
+	                });
+
+	                var coordSys = graphSeries.coordinateSystem;
+	                var rect = coordSys.getBoundingRect();
+	                var forceInstance = forceHelper(nodes, edges, {
+	                    rect: rect,
+	                    gravity: forceModel.get('gravity')
+	                });
+	                var oldStep = forceInstance.step;
+	                forceInstance.step = function (cb) {
+	                    for (var i = 0, l = nodes.length; i < l; i++) {
+	                        if (nodes[i].fixed) {
+	                            // Write back to layout instance
+	                            vec2.copy(nodes[i].p, graph.getNodeByIndex(i).getLayout());
+	                        }
+	                    }
+	                    oldStep(function (nodes, edges, stopped) {
+	                        for (var i = 0, l = nodes.length; i < l; i++) {
+	                            if (!nodes[i].fixed) {
+	                                graph.getNodeByIndex(i).setLayout(nodes[i].p);
+	                            }
+	                            preservedPoints[nodeData.getId(i)] = nodes[i].p;
+	                        }
+	                        for (var i = 0, l = edges.length; i < l; i++) {
+	                            var e = edges[i];
+	                            var edge = graph.getEdgeByIndex(i);
+	                            var p1 = e.n1.p;
+	                            var p2 = e.n2.p;
+	                            var points = edge.getLayout();
+	                            points = points ? points.slice() : [];
+	                            points[0] = points[0] || [];
+	                            points[1] = points[1] || [];
+	                            vec2.copy(points[0], p1);
+	                            vec2.copy(points[1], p2);
+	                            if (e.curveness > 0) {
+	                                points[2] = [
+	                                    (p1[0] + p2[0]) / 2 - (p1[1] - p2[1]) * e.curveness,
+	                                    (p1[1] + p2[1]) / 2 - (p2[0] - p1[0]) * e.curveness
+	                                ];
+	                            }
+	                            edge.setLayout(points);
+	                        }
+	                        // Update layout
+
+	                        cb && cb(stopped);
+	                    });
+	                };
+	                graphSeries.forceLayout = forceInstance;
+	                graphSeries.preservedPoints = preservedPoints;
+
+	                // Step to get the layout
+	                forceInstance.step();
+	            }
+	            else {
+	                // Remove prev injected forceLayout instance
+	                graphSeries.forceLayout = null;
+	            }
+	        });
+	    };
+
+
+/***/ },
+/* 213 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var vec2 = __webpack_require__(10);
+	    var scaleAndAdd = vec2.scaleAndAdd;
+
+	    // function adjacentNode(n, e) {
+	    //     return e.n1 === n ? e.n2 : e.n1;
+	    // }
+
+	    module.exports = function (nodes, edges, opts) {
+	        var rect = opts.rect;
+	        var width = rect.width;
+	        var height = rect.height;
+	        var center = [rect.x + width / 2, rect.y + height / 2];
+	        // var scale = opts.scale || 1;
+	        var gravity = opts.gravity == null ? 0.1 : opts.gravity;
+
+	        // for (var i = 0; i < edges.length; i++) {
+	        //     var e = edges[i];
+	        //     var n1 = e.n1;
+	        //     var n2 = e.n2;
+	        //     n1.edges = n1.edges || [];
+	        //     n2.edges = n2.edges || [];
+	        //     n1.edges.push(e);
+	        //     n2.edges.push(e);
+	        // }
+	        // Init position
+	        for (var i = 0; i < nodes.length; i++) {
+	            var n = nodes[i];
+	            if (!n.p) {
+	                // Use the position from first adjecent node with defined position
+	                // Or use a random position
+	                // From d3
+	                // if (n.edges) {
+	                //     var j = -1;
+	                //     while (++j < n.edges.length) {
+	                //         var e = n.edges[j];
+	                //         var other = adjacentNode(n, e);
+	                //         if (other.p) {
+	                //             n.p = vec2.clone(other.p);
+	                //             break;
+	                //         }
+	                //     }
+	                // }
+	                // if (!n.p) {
+	                    n.p = vec2.create(
+	                        width * (Math.random() - 0.5) + center[0],
+	                        height * (Math.random() - 0.5) + center[1]
+	                    );
+	                // }
+	            }
+	            n.pp = vec2.clone(n.p);
+	            n.edges = null;
+	        }
+
+	        // Formula in 'Graph Drawing by Force-directed Placement'
+	        // var k = scale * Math.sqrt(width * height / nodes.length);
+	        // var k2 = k * k;
+
+	        var friction = 0.6;
+
+	        return {
+	            warmUp: function () {
+	                friction = 0.5;
+	            },
+
+	            setFixed: function (idx) {
+	                nodes[idx].fixed = true;
+	            },
+
+	            setUnfixed: function (idx) {
+	                nodes[idx].fixed = false;
+	            },
+
+	            step: function (cb) {
+	                var v12 = [];
+	                var nLen = nodes.length;
+	                for (var i = 0; i < edges.length; i++) {
+	                    var e = edges[i];
+	                    var n1 = e.n1;
+	                    var n2 = e.n2;
+
+	                    vec2.sub(v12, n2.p, n1.p);
+	                    var d = vec2.len(v12) - e.d;
+	                    var w = n2.w / (n1.w + n2.w);
+	                    vec2.normalize(v12, v12);
+
+	                    !n1.fixed && scaleAndAdd(n1.p, n1.p, v12, w * d * friction);
+	                    !n2.fixed && scaleAndAdd(n2.p, n2.p, v12, -(1 - w) * d * friction);
+	                }
+	                // Gravity
+	                for (var i = 0; i < nLen; i++) {
+	                    var n = nodes[i];
+	                    if (!n.fixed) {
+	                        vec2.sub(v12, center, n.p);
+	                        // var d = vec2.len(v12);
+	                        // vec2.scale(v12, v12, 1 / d);
+	                        // var gravityFactor = gravity;
+	                        vec2.scaleAndAdd(n.p, n.p, v12, gravity * friction);
+	                    }
+	                }
+
+	                // Repulsive
+	                // PENDING
+	                for (var i = 0; i < nLen; i++) {
+	                    var n1 = nodes[i];
+	                    for (var j = i + 1; j < nLen; j++) {
+	                        var n2 = nodes[j];
+	                        vec2.sub(v12, n2.p, n1.p);
+	                        var d = vec2.len(v12);
+	                        if (d === 0) {
+	                            // Random repulse
+	                            vec2.set(v12, Math.random() - 0.5, Math.random() - 0.5);
+	                            d = 1;
+	                        }
+	                        var repFact = (n1.rep + n2.rep) / d / d;
+	                        !n1.fixed && scaleAndAdd(n1.pp, n1.pp, v12, repFact);
+	                        !n2.fixed && scaleAndAdd(n2.pp, n2.pp, v12, -repFact);
+	                    }
+	                }
+	                var v = [];
+	                for (var i = 0; i < nLen; i++) {
+	                    var n = nodes[i];
+	                    if (!n.fixed) {
+	                        vec2.sub(v, n.p, n.pp);
+	                        vec2.scaleAndAdd(n.p, n.p, v, friction);
+	                        vec2.copy(n.pp, n.p);
+	                    }
+	                }
+
+	                friction = friction * 0.992;
+
+	                cb && cb(nodes, edges, friction < 0.01);
+	            }
+	        };
+	    };
+
+
+/***/ },
+/* 214 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+	    // FIXME Where to create the simple view coordinate system
+	    var View = __webpack_require__(168);
+	    var layout = __webpack_require__(21);
+	    var bbox = __webpack_require__(51);
+
+	    function getViewRect(seriesModel, api, aspect) {
+	        var option = seriesModel.getBoxLayoutParams();
+	        option.aspect = aspect;
+	        return layout.getLayoutRect(option, {
+	            width: api.getWidth(),
+	            height: api.getHeight()
+	        });
+	    }
+
+	    module.exports = function (ecModel, api) {
+	        var viewList = [];
+	        ecModel.eachSeriesByType('graph', function (seriesModel) {
+	            var coordSysType = seriesModel.get('coordinateSystem');
+	            if (!coordSysType || coordSysType === 'view') {
+	                var viewCoordSys = new View();
+	                viewList.push(viewCoordSys);
+
+	                var data = seriesModel.getData();
+	                var positions = data.mapArray(function (idx) {
+	                    var itemModel = data.getItemModel(idx);
+	                    return [+itemModel.get('x'), +itemModel.get('y')];
+	                });
+
+	                var min = [];
+	                var max = [];
+
+	                bbox.fromPoints(positions, min, max);
+
+	                // If width or height is 0
+	                if (max[0] - min[0] === 0) {
+	                    max[0] += 1;
+	                    min[0] -= 1;
+	                }
+	                if (max[1] - min[1] === 0) {
+	                    max[1] += 1;
+	                    min[1] -= 1;
+	                }
+	                var aspect = (max[0] - min[0]) / (max[1] - min[1]);
+	                // FIXME If get view rect after data processed?
+	                var viewRect = getViewRect(seriesModel, api, aspect);
+	                // Position may be NaN, use view rect instead
+	                if (isNaN(aspect)) {
+	                    min = [viewRect.x, viewRect.y];
+	                    max = [viewRect.x + viewRect.width, viewRect.y + viewRect.height];
+	                }
+
+	                var bbWidth = max[0] - min[0];
+	                var bbHeight = max[1] - min[1];
+
+	                var viewWidth = viewRect.width;
+	                var viewHeight = viewRect.height;
+
+	                viewCoordSys = seriesModel.coordinateSystem = new View();
+	                viewCoordSys.zoomLimit = seriesModel.get('scaleLimit');
+
+	                viewCoordSys.setBoundingRect(
+	                    min[0], min[1], bbWidth, bbHeight
+	                );
+	                viewCoordSys.setViewRect(
+	                    viewRect.x, viewRect.y, viewWidth, viewHeight
+	                );
+
+	                // Update roam info
+	                viewCoordSys.setCenter(seriesModel.get('center'));
+	                viewCoordSys.setZoom(seriesModel.get('zoom'));
+	            }
+	        });
+	        return viewList;
+	    };
+
+
+/***/ },
+/* 215 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+	    __webpack_require__(216);
+	    __webpack_require__(217);
+
+
+/***/ },
+/* 216 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var List = __webpack_require__(97);
+	    var SeriesModel = __webpack_require__(28);
+	    var zrUtil = __webpack_require__(4);
+
+	    var GaugeSeries = SeriesModel.extend({
+
+	        type: 'series.gauge',
+
+	        getInitialData: function (option, ecModel) {
+	            var list = new List(['value'], this);
+	            var dataOpt = option.data || [];
+	            if (!zrUtil.isArray(dataOpt)) {
+	                dataOpt = [dataOpt];
+	            }
+	            // Only use the first data item
+	            list.initData(dataOpt);
+	            return list;
+	        },
+
+	        defaultOption: {
+	            zlevel: 0,
+	            z: 2,
+	            // 默认全局居中
+	            center: ['50%', '50%'],
+	            legendHoverLink: true,
+	            radius: '75%',
+	            startAngle: 225,
+	            endAngle: -45,
+	            clockwise: true,
+	            // 最小值
+	            min: 0,
+	            // 最大值
+	            max: 100,
+	            // 分割段数，默认为10
+	            splitNumber: 10,
+	            // 坐标轴线
+	            axisLine: {
+	                // 默认显示，属性show控制显示与否
+	                show: true,
+	                lineStyle: {       // 属性lineStyle控制线条样式
+	                    color: [[0.2, '#91c7ae'], [0.8, '#63869e'], [1, '#c23531']],
+	                    width: 30
+	                }
+	            },
+	            // 分隔线
+	            splitLine: {
+	                // 默认显示，属性show控制显示与否
+	                show: true,
+	                // 属性length控制线长
+	                length: 30,
+	                // 属性lineStyle（详见lineStyle）控制线条样式
+	                lineStyle: {
+	                    color: '#eee',
+	                    width: 2,
+	                    type: 'solid'
+	                }
+	            },
+	            // 坐标轴小标记
+	            axisTick: {
+	                // 属性show控制显示与否，默认不显示
+	                show: true,
+	                // 每份split细分多少段
+	                splitNumber: 5,
+	                // 属性length控制线长
+	                length: 8,
+	                // 属性lineStyle控制线条样式
+	                lineStyle: {
+	                    color: '#eee',
+	                    width: 1,
+	                    type: 'solid'
+	                }
+	            },
+	            axisLabel: {
+	                show: true,
+	                distance: 5,
+	                // formatter: null,
+	                textStyle: {       // 其余属性默认使用全局文本样式，详见TEXTSTYLE
+	                    color: 'auto'
+	                }
+	            },
+	            pointer: {
+	                show: true,
+	                length: '80%',
+	                width: 8
+	            },
+	            itemStyle: {
+	                normal: {
+	                    color: 'auto'
+	                }
+	            },
+	            title: {
+	                show: true,
+	                // x, y，单位px
+	                offsetCenter: [0, '-40%'],
+	                // 其余属性默认使用全局文本样式，详见TEXTSTYLE
+	                textStyle: {
+	                    color: '#333',
+	                    fontSize: 15
+	                }
+	            },
+	            detail: {
+	                show: true,
+	                backgroundColor: 'rgba(0,0,0,0)',
+	                borderWidth: 0,
+	                borderColor: '#ccc',
+	                width: 100,
+	                height: 40,
+	                // x, y，单位px
+	                offsetCenter: [0, '40%'],
+	                // formatter: null,
+	                // 其余属性默认使用全局文本样式，详见TEXTSTYLE
+	                textStyle: {
+	                    color: 'auto',
+	                    fontSize: 30
+	                }
+	            }
+	        }
+	    });
+
+	    module.exports = GaugeSeries;
+
+
+/***/ },
+/* 217 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var PointerPath = __webpack_require__(218);
+
+	    var graphic = __webpack_require__(43);
+	    var numberUtil = __webpack_require__(7);
+	    var parsePercent = numberUtil.parsePercent;
+
+	    function parsePosition(seriesModel, api) {
+	        var center = seriesModel.get('center');
+	        var width = api.getWidth();
+	        var height = api.getHeight();
+	        var size = Math.min(width, height);
+	        var cx = parsePercent(center[0], api.getWidth());
+	        var cy = parsePercent(center[1], api.getHeight());
+	        var r = parsePercent(seriesModel.get('radius'), size / 2);
+
+	        return {
+	            cx: cx,
+	            cy: cy,
+	            r: r
+	        };
+	    }
+
+	    function formatLabel(label, labelFormatter) {
+	        if (labelFormatter) {
+	            if (typeof labelFormatter === 'string') {
+	                label = labelFormatter.replace('{value}', label);
+	            }
+	            else if (typeof labelFormatter === 'function') {
+	                label = labelFormatter(label);
+	            }
+	        }
+
+	        return label;
+	    }
+
+	    var PI2 = Math.PI * 2;
+
+	    var GaugeView = __webpack_require__(42).extend({
+
+	        type: 'gauge',
+
+	        render: function (seriesModel, ecModel, api) {
+
+	            this.group.removeAll();
+
+	            var colorList = seriesModel.get('axisLine.lineStyle.color');
+	            var posInfo = parsePosition(seriesModel, api);
+
+	            this._renderMain(
+	                seriesModel, ecModel, api, colorList, posInfo
+	            );
+	        },
+
+	        _renderMain: function (seriesModel, ecModel, api, colorList, posInfo) {
+	            var group = this.group;
+
+	            var axisLineModel = seriesModel.getModel('axisLine');
+	            var lineStyleModel = axisLineModel.getModel('lineStyle');
+
+	            var clockwise = seriesModel.get('clockwise');
+	            var startAngle = -seriesModel.get('startAngle') / 180 * Math.PI;
+	            var endAngle = -seriesModel.get('endAngle') / 180 * Math.PI;
+
+	            var angleRangeSpan = (endAngle - startAngle) % PI2;
+
+	            var prevEndAngle = startAngle;
+	            var axisLineWidth = lineStyleModel.get('width');
+
+	            for (var i = 0; i < colorList.length; i++) {
+	                // Clamp
+	                var percent = Math.min(Math.max(colorList[i][0], 0), 1);
+	                var endAngle = startAngle + angleRangeSpan * percent;
+	                var sector = new graphic.Sector({
+	                    shape: {
+	                        startAngle: prevEndAngle,
+	                        endAngle: endAngle,
+	                        cx: posInfo.cx,
+	                        cy: posInfo.cy,
+	                        clockwise: clockwise,
+	                        r0: posInfo.r - axisLineWidth,
+	                        r: posInfo.r
+	                    },
+	                    silent: true
+	                });
+
+	                sector.setStyle({
+	                    fill: colorList[i][1]
+	                });
+
+	                sector.setStyle(lineStyleModel.getLineStyle(
+	                    // Because we use sector to simulate arc
+	                    // so the properties for stroking are useless
+	                    ['color', 'borderWidth', 'borderColor']
+	                ));
+
+	                group.add(sector);
+
+	                prevEndAngle = endAngle;
+	            }
+
+	            var getColor = function (percent) {
+	                // Less than 0
+	                if (percent <= 0) {
+	                    return colorList[0][1];
+	                }
+	                for (var i = 0; i < colorList.length; i++) {
+	                    if (colorList[i][0] >= percent
+	                        && (i === 0 ? 0 : colorList[i - 1][0]) < percent
+	                    ) {
+	                        return colorList[i][1];
+	                    }
+	                }
+	                // More than 1
+	                return colorList[i - 1][1];
+	            };
+
+	            if (!clockwise) {
+	                var tmp = startAngle;
+	                startAngle = endAngle;
+	                endAngle = tmp;
+	            }
+
+	            this._renderTicks(
+	                seriesModel, ecModel, api, getColor, posInfo,
+	                startAngle, endAngle, clockwise
+	            );
+
+	            this._renderPointer(
+	                seriesModel, ecModel, api, getColor, posInfo,
+	                startAngle, endAngle, clockwise
+	            );
+
+	            this._renderTitle(
+	                seriesModel, ecModel, api, getColor, posInfo
+	            );
+	            this._renderDetail(
+	                seriesModel, ecModel, api, getColor, posInfo
+	            );
+	        },
+
+	        _renderTicks: function (
+	            seriesModel, ecModel, api, getColor, posInfo,
+	            startAngle, endAngle, clockwise
+	        ) {
+	            var group = this.group;
+	            var cx = posInfo.cx;
+	            var cy = posInfo.cy;
+	            var r = posInfo.r;
+
+	            var minVal = seriesModel.get('min');
+	            var maxVal = seriesModel.get('max');
+
+	            var splitLineModel = seriesModel.getModel('splitLine');
+	            var tickModel = seriesModel.getModel('axisTick');
+	            var labelModel = seriesModel.getModel('axisLabel');
+
+	            var splitNumber = seriesModel.get('splitNumber');
+	            var subSplitNumber = tickModel.get('splitNumber');
+
+	            var splitLineLen = parsePercent(
+	                splitLineModel.get('length'), r
+	            );
+	            var tickLen = parsePercent(
+	                tickModel.get('length'), r
+	            );
+
+	            var angle = startAngle;
+	            var step = (endAngle - startAngle) / splitNumber;
+	            var subStep = step / subSplitNumber;
+
+	            var splitLineStyle = splitLineModel.getModel('lineStyle').getLineStyle();
+	            var tickLineStyle = tickModel.getModel('lineStyle').getLineStyle();
+	            var textStyleModel = labelModel.getModel('textStyle');
+
+	            for (var i = 0; i <= splitNumber; i++) {
+	                var unitX = Math.cos(angle);
+	                var unitY = Math.sin(angle);
+	                // Split line
+	                if (splitLineModel.get('show')) {
+	                    var splitLine = new graphic.Line({
+	                        shape: {
+	                            x1: unitX * r + cx,
+	                            y1: unitY * r + cy,
+	                            x2: unitX * (r - splitLineLen) + cx,
+	                            y2: unitY * (r - splitLineLen) + cy
+	                        },
+	                        style: splitLineStyle,
+	                        silent: true
+	                    });
+	                    if (splitLineStyle.stroke === 'auto') {
+	                        splitLine.setStyle({
+	                            stroke: getColor(i / splitNumber)
+	                        });
+	                    }
+
+	                    group.add(splitLine);
+	                }
+
+	                // Label
+	                if (labelModel.get('show')) {
+	                    var label = formatLabel(
+	                        numberUtil.round(i / splitNumber * (maxVal - minVal) + minVal),
+	                        labelModel.get('formatter')
+	                    );
+	                    var distance = labelModel.get('distance');
+
+	                    var text = new graphic.Text({
+	                        style: {
+	                            text: label,
+	                            x: unitX * (r - splitLineLen - distance) + cx,
+	                            y: unitY * (r - splitLineLen - distance) + cy,
+	                            fill: textStyleModel.getTextColor(),
+	                            textFont: textStyleModel.getFont(),
+	                            textVerticalAlign: unitY < -0.4 ? 'top' : (unitY > 0.4 ? 'bottom' : 'middle'),
+	                            textAlign: unitX < -0.4 ? 'left' : (unitX > 0.4 ? 'right' : 'center')
+	                        },
+	                        silent: true
+	                    });
+	                    if (text.style.fill === 'auto') {
+	                        text.setStyle({
+	                            fill: getColor(i / splitNumber)
+	                        });
+	                    }
+
+	                    group.add(text);
+	                }
+
+	                // Axis tick
+	                if (tickModel.get('show') && i !== splitNumber) {
+	                    for (var j = 0; j <= subSplitNumber; j++) {
+	                        var unitX = Math.cos(angle);
+	                        var unitY = Math.sin(angle);
+	                        var tickLine = new graphic.Line({
+	                            shape: {
+	                                x1: unitX * r + cx,
+	                                y1: unitY * r + cy,
+	                                x2: unitX * (r - tickLen) + cx,
+	                                y2: unitY * (r - tickLen) + cy
+	                            },
+	                            silent: true,
+	                            style: tickLineStyle
+	                        });
+
+	                        if (tickLineStyle.stroke === 'auto') {
+	                            tickLine.setStyle({
+	                                stroke: getColor((i + j / subSplitNumber) / splitNumber)
+	                            });
+	                        }
+
+	                        group.add(tickLine);
+	                        angle += subStep;
+	                    }
+	                    angle -= subStep;
+	                }
+	                else {
+	                    angle += step;
+	                }
+	            }
+	        },
+
+	        _renderPointer: function (
+	            seriesModel, ecModel, api, getColor, posInfo,
+	            startAngle, endAngle, clockwise
+	        ) {
+	            var valueExtent = [+seriesModel.get('min'), +seriesModel.get('max')];
+	            var angleExtent = [startAngle, endAngle];
+
+	            if (!clockwise) {
+	                angleExtent = angleExtent.reverse();
+	            }
+
+	            var data = seriesModel.getData();
+	            var oldData = this._data;
+
+	            var group = this.group;
+
+	            data.diff(oldData)
+	                .add(function (idx) {
+	                    var pointer = new PointerPath({
+	                        shape: {
+	                            angle: startAngle
+	                        }
+	                    });
+
+	                    graphic.updateProps(pointer, {
+	                        shape: {
+	                            angle: numberUtil.linearMap(data.get('value', idx), valueExtent, angleExtent, true)
+	                        }
+	                    }, seriesModel);
+
+	                    group.add(pointer);
+	                    data.setItemGraphicEl(idx, pointer);
+	                })
+	                .update(function (newIdx, oldIdx) {
+	                    var pointer = oldData.getItemGraphicEl(oldIdx);
+
+	                    graphic.updateProps(pointer, {
+	                        shape: {
+	                            angle: numberUtil.linearMap(data.get('value', newIdx), valueExtent, angleExtent, true)
+	                        }
+	                    }, seriesModel);
+
+	                    group.add(pointer);
+	                    data.setItemGraphicEl(newIdx, pointer);
+	                })
+	                .remove(function (idx) {
+	                    var pointer = oldData.getItemGraphicEl(idx);
+	                    group.remove(pointer);
+	                })
+	                .execute();
+
+	            data.eachItemGraphicEl(function (pointer, idx) {
+	                var itemModel = data.getItemModel(idx);
+	                var pointerModel = itemModel.getModel('pointer');
+
+	                pointer.setShape({
+	                    x: posInfo.cx,
+	                    y: posInfo.cy,
+	                    width: parsePercent(
+	                        pointerModel.get('width'), posInfo.r
+	                    ),
+	                    r: parsePercent(pointerModel.get('length'), posInfo.r)
+	                });
+
+	                pointer.useStyle(itemModel.getModel('itemStyle.normal').getItemStyle());
+
+	                if (pointer.style.fill === 'auto') {
+	                    pointer.setStyle('fill', getColor(
+	                        (data.get('value', idx) - valueExtent[0]) / (valueExtent[1] - valueExtent[0])
+	                    ));
+	                }
+
+	                graphic.setHoverStyle(
+	                    pointer, itemModel.getModel('itemStyle.emphasis').getItemStyle()
+	                );
+	            });
+
+	            this._data = data;
+	        },
+
+	        _renderTitle: function (
+	            seriesModel, ecModel, api, getColor, posInfo
+	        ) {
+	            var titleModel = seriesModel.getModel('title');
+	            if (titleModel.get('show')) {
+	                var textStyleModel = titleModel.getModel('textStyle');
+	                var offsetCenter = titleModel.get('offsetCenter');
+	                var x = posInfo.cx + parsePercent(offsetCenter[0], posInfo.r);
+	                var y = posInfo.cy + parsePercent(offsetCenter[1], posInfo.r);
+	                var text = new graphic.Text({
+	                    style: {
+	                        x: x,
+	                        y: y,
+	                        // FIXME First data name ?
+	                        text: seriesModel.getData().getName(0),
+	                        fill: textStyleModel.getTextColor(),
+	                        textFont: textStyleModel.getFont(),
+	                        textAlign: 'center',
+	                        textVerticalAlign: 'middle'
+	                    }
+	                });
+	                this.group.add(text);
+	            }
+	        },
+
+	        _renderDetail: function (
+	            seriesModel, ecModel, api, getColor, posInfo
+	        ) {
+	            var detailModel = seriesModel.getModel('detail');
+	            var minVal = seriesModel.get('min');
+	            var maxVal = seriesModel.get('max');
+	            if (detailModel.get('show')) {
+	                var textStyleModel = detailModel.getModel('textStyle');
+	                var offsetCenter = detailModel.get('offsetCenter');
+	                var x = posInfo.cx + parsePercent(offsetCenter[0], posInfo.r);
+	                var y = posInfo.cy + parsePercent(offsetCenter[1], posInfo.r);
+	                var width = parsePercent(detailModel.get('width'), posInfo.r);
+	                var height = parsePercent(detailModel.get('height'), posInfo.r);
+	                var value = seriesModel.getData().get('value', 0);
+	                var rect = new graphic.Rect({
+	                    shape: {
+	                        x: x - width / 2,
+	                        y: y - height / 2,
+	                        width: width,
+	                        height: height
+	                    },
+	                    style: {
+	                        text: formatLabel(
+	                            // FIXME First data name ?
+	                            value, detailModel.get('formatter')
+	                        ),
+	                        fill: detailModel.get('backgroundColor'),
+	                        textFill: textStyleModel.getTextColor(),
+	                        textFont: textStyleModel.getFont()
+	                    }
+	                });
+	                if (rect.style.textFill === 'auto') {
+	                    rect.setStyle('textFill', getColor(
+	                        numberUtil.linearMap(value, [minVal, maxVal], [0, 1], true)
+	                    ));
+	                }
+	                rect.setStyle(detailModel.getItemStyle(['color']));
+	                this.group.add(rect);
+	            }
+	        }
+	    });
+
+	    module.exports = GaugeView;
+
+
+/***/ },
+/* 218 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    module.exports = __webpack_require__(45).extend({
+
+	        type: 'echartsGaugePointer',
+
+	        shape: {
+	            angle: 0,
+
+	            width: 10,
+
+	            r: 10,
+
+	            x: 0,
+
+	            y: 0
+	        },
+
+	        buildPath: function (ctx, shape) {
+	            var mathCos = Math.cos;
+	            var mathSin = Math.sin;
+
+	            var r = shape.r;
+	            var width = shape.width;
+	            var angle = shape.angle;
+	            var x = shape.x - mathCos(angle) * width * (width >= r / 3 ? 1 : 2);
+	            var y = shape.y - mathSin(angle) * width * (width >= r / 3 ? 1 : 2);
+
+	            angle = shape.angle - Math.PI / 2;
+	            ctx.moveTo(x, y);
+	            ctx.lineTo(
+	                shape.x + mathCos(angle) * width,
+	                shape.y + mathSin(angle) * width
+	            );
+	            ctx.lineTo(
+	                shape.x + mathCos(shape.angle) * r,
+	                shape.y + mathSin(shape.angle) * r
+	            );
+	            ctx.lineTo(
+	                shape.x - mathCos(angle) * width,
+	                shape.y - mathSin(angle) * width
+	            );
+	            ctx.lineTo(x, y);
+	            return;
+	        }
+	    });
+
+
+/***/ },
+/* 219 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+	    var echarts = __webpack_require__(1);
+
+	    __webpack_require__(220);
+	    __webpack_require__(221);
+
+	    echarts.registerVisual(zrUtil.curry(__webpack_require__(143), 'funnel'));
+	    echarts.registerLayout(__webpack_require__(222));
+
+	    echarts.registerProcessor(zrUtil.curry(__webpack_require__(146), 'funnel'));
+
+
+/***/ },
+/* 220 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var List = __webpack_require__(97);
+	    var modelUtil = __webpack_require__(5);
+	    var completeDimensions = __webpack_require__(102);
+
+	    var FunnelSeries = __webpack_require__(1).extendSeriesModel({
+
+	        type: 'series.funnel',
+
+	        init: function (option) {
+	            FunnelSeries.superApply(this, 'init', arguments);
+
+	            // Enable legend selection for each data item
+	            // Use a function instead of direct access because data reference may changed
+	            this.legendDataProvider = function () {
+	                return this._dataBeforeProcessed;
+	            };
+	            // Extend labelLine emphasis
+	            this._defaultLabelLine(option);
+	        },
+
+	        getInitialData: function (option, ecModel) {
+	            var dimensions = completeDimensions(['value'], option.data);
+	            var list = new List(dimensions, this);
+	            list.initData(option.data);
+	            return list;
+	        },
+
+	        _defaultLabelLine: function (option) {
+	            // Extend labelLine emphasis
+	            modelUtil.defaultEmphasis(option.labelLine, ['show']);
+
+	            var labelLineNormalOpt = option.labelLine.normal;
+	            var labelLineEmphasisOpt = option.labelLine.emphasis;
+	            // Not show label line if `label.normal.show = false`
+	            labelLineNormalOpt.show = labelLineNormalOpt.show
+	                && option.label.normal.show;
+	            labelLineEmphasisOpt.show = labelLineEmphasisOpt.show
+	                && option.label.emphasis.show;
+	        },
+
+	        defaultOption: {
+	            zlevel: 0,                  // 一级层叠
+	            z: 2,                       // 二级层叠
+	            legendHoverLink: true,
+	            left: 80,
+	            top: 60,
+	            right: 80,
+	            bottom: 60,
+	            // width: {totalWidth} - left - right,
+	            // height: {totalHeight} - top - bottom,
+
+	            // 默认取数据最小最大值
+	            // min: 0,
+	            // max: 100,
+	            minSize: '0%',
+	            maxSize: '100%',
+	            sort: 'descending', // 'ascending', 'descending'
+	            gap: 0,
+	            funnelAlign: 'center',
+	            label: {
+	                normal: {
+	                    show: true,
+	                    position: 'outer'
+	                    // formatter: 标签文本格式器，同Tooltip.formatter，不支持异步回调
+	                    // textStyle: null      // 默认使用全局文本样式，详见TEXTSTYLE
+	                },
+	                emphasis: {
+	                    show: true
+	                }
+	            },
+	            labelLine: {
+	                normal: {
+	                    show: true,
+	                    length: 20,
+	                    lineStyle: {
+	                        // color: 各异,
+	                        width: 1,
+	                        type: 'solid'
+	                    }
+	                },
+	                emphasis: {}
+	            },
+	            itemStyle: {
+	                normal: {
+	                    // color: 各异,
+	                    borderColor: '#fff',
+	                    borderWidth: 1
+	                },
+	                emphasis: {
+	                    // color: 各异,
+	                }
+	            }
+	        }
+	    });
+
+	    module.exports = FunnelSeries;
+
+
+/***/ },
+/* 221 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var graphic = __webpack_require__(43);
+	    var zrUtil = __webpack_require__(4);
+
+	    /**
+	     * Piece of pie including Sector, Label, LabelLine
+	     * @constructor
+	     * @extends {module:zrender/graphic/Group}
+	     */
+	    function FunnelPiece(data, idx) {
+
+	        graphic.Group.call(this);
+
+	        var polygon = new graphic.Polygon();
+	        var labelLine = new graphic.Polyline();
+	        var text = new graphic.Text();
+	        this.add(polygon);
+	        this.add(labelLine);
+	        this.add(text);
+
+	        this.updateData(data, idx, true);
+
+	        // Hover to change label and labelLine
+	        function onEmphasis() {
+	            labelLine.ignore = labelLine.hoverIgnore;
+	            text.ignore = text.hoverIgnore;
+	        }
+	        function onNormal() {
+	            labelLine.ignore = labelLine.normalIgnore;
+	            text.ignore = text.normalIgnore;
+	        }
+	        this.on('emphasis', onEmphasis)
+	            .on('normal', onNormal)
+	            .on('mouseover', onEmphasis)
+	            .on('mouseout', onNormal);
+	    }
+
+	    var funnelPieceProto = FunnelPiece.prototype;
+
+	    function getLabelStyle(data, idx, state, labelModel) {
+	        var textStyleModel = labelModel.getModel('textStyle');
+	        var position = labelModel.get('position');
+	        var isLabelInside = position === 'inside' || position === 'inner' || position === 'center';
+	        return {
+	            fill: textStyleModel.getTextColor()
+	                || (isLabelInside ? '#fff' : data.getItemVisual(idx, 'color')),
+	            textFont: textStyleModel.getFont(),
+	            text: zrUtil.retrieve(
+	                data.hostModel.getFormattedLabel(idx, state),
+	                data.getName(idx)
+	            )
+	        };
+	    }
+
+	    var opacityAccessPath = ['itemStyle', 'normal', 'opacity'];
+	    funnelPieceProto.updateData = function (data, idx, firstCreate) {
+
+	        var polygon = this.childAt(0);
+
+	        var seriesModel = data.hostModel;
+	        var itemModel = data.getItemModel(idx);
+	        var layout = data.getItemLayout(idx);
+	        var opacity = data.getItemModel(idx).get(opacityAccessPath);
+	        opacity = opacity == null ? 1 : opacity;
+
+	        // Reset style
+	        polygon.useStyle({});
+
+	        if (firstCreate) {
+	            polygon.setShape({
+	                points: layout.points
+	            });
+	            polygon.setStyle({ opacity : 0 });
+	            graphic.initProps(polygon, {
+	                style: {
+	                    opacity: opacity
+	                }
+	            }, seriesModel, idx);
+	        }
+	        else {
+	            graphic.updateProps(polygon, {
+	                style: {
+	                    opacity: opacity
+	                },
+	                shape: {
+	                    points: layout.points
+	                }
+	            }, seriesModel, idx);
+	        }
+
+	        // Update common style
+	        var itemStyleModel = itemModel.getModel('itemStyle');
+	        var visualColor = data.getItemVisual(idx, 'color');
+
+	        polygon.setStyle(
+	            zrUtil.defaults(
+	                {
+	                    lineJoin: 'round',
+	                    fill: visualColor
+	                },
+	                itemStyleModel.getModel('normal').getItemStyle(['opacity'])
+	            )
+	        );
+	        polygon.hoverStyle = itemStyleModel.getModel('emphasis').getItemStyle();
+
+	        this._updateLabel(data, idx);
+
+	        graphic.setHoverStyle(this);
+	    };
+
+	    funnelPieceProto._updateLabel = function (data, idx) {
+
+	        var labelLine = this.childAt(1);
+	        var labelText = this.childAt(2);
+
+	        var seriesModel = data.hostModel;
+	        var itemModel = data.getItemModel(idx);
+	        var layout = data.getItemLayout(idx);
+	        var labelLayout = layout.label;
+	        var visualColor = data.getItemVisual(idx, 'color');
+
+	        graphic.updateProps(labelLine, {
+	            shape: {
+	                points: labelLayout.linePoints || labelLayout.linePoints
+	            }
+	        }, seriesModel, idx);
+
+	        graphic.updateProps(labelText, {
+	            style: {
+	                x: labelLayout.x,
+	                y: labelLayout.y
+	            }
+	        }, seriesModel, idx);
+	        labelText.attr({
+	            style: {
+	                textAlign: labelLayout.textAlign,
+	                textVerticalAlign: labelLayout.verticalAlign,
+	                textFont: labelLayout.font
+	            },
+	            rotation: labelLayout.rotation,
+	            origin: [labelLayout.x, labelLayout.y],
+	            z2: 10
+	        });
+
+	        var labelModel = itemModel.getModel('label.normal');
+	        var labelHoverModel = itemModel.getModel('label.emphasis');
+	        var labelLineModel = itemModel.getModel('labelLine.normal');
+	        var labelLineHoverModel = itemModel.getModel('labelLine.emphasis');
+
+	        labelText.setStyle(getLabelStyle(data, idx, 'normal', labelModel));
+
+	        labelText.ignore = labelText.normalIgnore = !labelModel.get('show');
+	        labelText.hoverIgnore = !labelHoverModel.get('show');
+
+	        labelLine.ignore = labelLine.normalIgnore = !labelLineModel.get('show');
+	        labelLine.hoverIgnore = !labelLineHoverModel.get('show');
+
+	        // Default use item visual color
+	        labelLine.setStyle({
+	            stroke: visualColor
+	        });
+	        labelLine.setStyle(labelLineModel.getModel('lineStyle').getLineStyle());
+
+	        labelText.hoverStyle = getLabelStyle(data, idx, 'emphasis', labelHoverModel);
+	        labelLine.hoverStyle = labelLineHoverModel.getModel('lineStyle').getLineStyle();
+	    };
+
+	    zrUtil.inherits(FunnelPiece, graphic.Group);
+
+
+	    var Funnel = __webpack_require__(42).extend({
+
+	        type: 'funnel',
+
+	        render: function (seriesModel, ecModel, api) {
+	            var data = seriesModel.getData();
+	            var oldData = this._data;
+
+	            var group = this.group;
+
+	            data.diff(oldData)
+	                .add(function (idx) {
+	                    var funnelPiece = new FunnelPiece(data, idx);
+
+	                    data.setItemGraphicEl(idx, funnelPiece);
+
+	                    group.add(funnelPiece);
+	                })
+	                .update(function (newIdx, oldIdx) {
+	                    var piePiece = oldData.getItemGraphicEl(oldIdx);
+
+	                    piePiece.updateData(data, newIdx);
+
+	                    group.add(piePiece);
+	                    data.setItemGraphicEl(newIdx, piePiece);
+	                })
+	                .remove(function (idx) {
+	                    var piePiece = oldData.getItemGraphicEl(idx);
+	                    group.remove(piePiece);
+	                })
+	                .execute();
+
+	            this._data = data;
+	        },
+
+	        remove: function () {
+	            this.group.removeAll();
+	            this._data = null;
+	        }
+	    });
+
+	    module.exports = Funnel;
+
+
+/***/ },
+/* 222 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var layout = __webpack_require__(21);
+	    var number = __webpack_require__(7);
+
+	    var parsePercent = number.parsePercent;
+
+	    function getViewRect(seriesModel, api) {
+	        return layout.getLayoutRect(
+	            seriesModel.getBoxLayoutParams(), {
+	                width: api.getWidth(),
+	                height: api.getHeight()
+	            }
+	        );
+	    }
+
+	    function getSortedIndices(data, sort) {
+	        var valueArr = data.mapArray('value', function (val) {
+	            return val;
+	        });
+	        var indices = [];
+	        var isAscending = sort === 'ascending';
+	        for (var i = 0, len = data.count(); i < len; i++) {
+	            indices[i] = i;
+	        }
+	        indices.sort(function (a, b) {
+	            return isAscending ? valueArr[a] - valueArr[b] : valueArr[b] - valueArr[a];
+	        });
+	        return indices;
+	    }
+
+	    function labelLayout (data) {
+	        data.each(function (idx) {
+	            var itemModel = data.getItemModel(idx);
+	            var labelModel = itemModel.getModel('label.normal');
+	            var labelPosition = labelModel.get('position');
+
+	            var labelLineModel = itemModel.getModel('labelLine.normal');
+
+	            var layout = data.getItemLayout(idx);
+	            var points = layout.points;
+
+	            var isLabelInside = labelPosition === 'inner'
+	                || labelPosition === 'inside' || labelPosition === 'center';
+
+	            var textAlign;
+	            var textX;
+	            var textY;
+	            var linePoints;
+
+	            if (isLabelInside) {
+	                textX = (points[0][0] + points[1][0] + points[2][0] + points[3][0]) / 4;
+	                textY = (points[0][1] + points[1][1] + points[2][1] + points[3][1]) / 4;
+	                textAlign = 'center';
+	                linePoints = [
+	                    [textX, textY], [textX, textY]
+	                ];
+	            }
+	            else {
+	                var x1;
+	                var y1;
+	                var x2;
+	                var labelLineLen = labelLineModel.get('length');
+	                if (labelPosition === 'left') {
+	                    // Left side
+	                    x1 = (points[3][0] + points[0][0]) / 2;
+	                    y1 = (points[3][1] + points[0][1]) / 2;
+	                    x2 = x1 - labelLineLen;
+	                    textX = x2 - 5;
+	                    textAlign = 'right';
+	                }
+	                else {
+	                    // Right side
+	                    x1 = (points[1][0] + points[2][0]) / 2;
+	                    y1 = (points[1][1] + points[2][1]) / 2;
+	                    x2 = x1 + labelLineLen;
+	                    textX = x2 + 5;
+	                    textAlign = 'left';
+	                }
+	                var y2 = y1;
+
+	                linePoints = [[x1, y1], [x2, y2]];
+	                textY = y2;
+	            }
+
+	            layout.label = {
+	                linePoints: linePoints,
+	                x: textX,
+	                y: textY,
+	                verticalAlign: 'middle',
+	                textAlign: textAlign,
+	                inside: isLabelInside
+	            };
+	        });
+	    }
+
+	    module.exports = function (ecModel, api, payload) {
+	        ecModel.eachSeriesByType('funnel', function (seriesModel) {
+	            var data = seriesModel.getData();
+	            var sort = seriesModel.get('sort');
+	            var viewRect = getViewRect(seriesModel, api);
+	            var indices = getSortedIndices(data, sort);
+
+	            var sizeExtent = [
+	                parsePercent(seriesModel.get('minSize'), viewRect.width),
+	                parsePercent(seriesModel.get('maxSize'), viewRect.width)
+	            ];
+	            var dataExtent = data.getDataExtent('value');
+	            var min = seriesModel.get('min');
+	            var max = seriesModel.get('max');
+	            if (min == null) {
+	                min = Math.min(dataExtent[0], 0);
+	            }
+	            if (max == null) {
+	                max = dataExtent[1];
+	            }
+
+	            var funnelAlign = seriesModel.get('funnelAlign');
+	            var gap = seriesModel.get('gap');
+	            var itemHeight = (viewRect.height - gap * (data.count() - 1)) / data.count();
+
+	            var y = viewRect.y;
+
+	            var getLinePoints = function (idx, offY) {
+	                // End point index is data.count() and we assign it 0
+	                var val = data.get('value', idx) || 0;
+	                var itemWidth = number.linearMap(val, [min, max], sizeExtent, true);
+	                var x0;
+	                switch (funnelAlign) {
+	                    case 'left':
+	                        x0 = viewRect.x;
+	                        break;
+	                    case 'center':
+	                        x0 = viewRect.x + (viewRect.width - itemWidth) / 2;
+	                        break;
+	                    case 'right':
+	                        x0 = viewRect.x + viewRect.width - itemWidth;
+	                        break;
+	                }
+	                return [
+	                    [x0, offY],
+	                    [x0 + itemWidth, offY]
+	                ];
+	            };
+
+	            if (sort === 'ascending') {
+	                // From bottom to top
+	                itemHeight = -itemHeight;
+	                gap = -gap;
+	                y += viewRect.height;
+	                indices = indices.reverse();
+	            }
+
+	            for (var i = 0; i < indices.length; i++) {
+	                var idx = indices[i];
+	                var nextIdx = indices[i + 1];
+	                var start = getLinePoints(idx, y);
+	                var end = getLinePoints(nextIdx, y + itemHeight);
+
+	                y += itemHeight + gap;
+
+	                data.setItemLayout(idx, {
+	                    points: start.concat(end.slice().reverse())
+	                });
+	            }
+
+	            labelLayout(data);
+	        });
+	    };
+
+
+/***/ },
+/* 223 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var echarts = __webpack_require__(1);
+
+	    __webpack_require__(224);
+
+	    __webpack_require__(235);
+	    __webpack_require__(236);
+
+	    echarts.registerVisual(__webpack_require__(237));
+
+
+
+/***/ },
+/* 224 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    __webpack_require__(225);
+	    __webpack_require__(228);
+	    __webpack_require__(230);
+
+	    var echarts = __webpack_require__(1);
+	    var zrUtil = __webpack_require__(4);
+
+	    var CLICK_THRESHOLD = 5; // > 4
+
+	    // Parallel view
+	    echarts.extendComponentView({
+	        type: 'parallel',
+
+	        render: function (parallelModel, ecModel, api) {
+	            var zr = api.getZr();
+
+	            if (!this.__onMouseDown) {
+	                // FIXME
+	                // click: mousemove check. otherwise confilct with drag brush.
+	                var mousedownPoint;
+	                zr.on('mousedown', this.__onMouseDown = function (e) {
+	                    mousedownPoint = [e.offsetX, e.offsetY];
+	                });
+	                zr.on('mouseup', this.__onMouseUp = function (e) {
+	                    var point = [e.offsetX, e.offsetY];
+	                    var dist = Math.pow(mousedownPoint[0] - point[0], 2)
+	                        + Math.pow(mousedownPoint[1] - point[1], 2);
+
+	                    if (!parallelModel.get('axisExpandable') || dist > CLICK_THRESHOLD) {
+	                        return;
+	                    }
+
+	                    var coordSys = parallelModel.coordinateSystem;
+	                    var closestDim = coordSys.findClosestAxisDim(point);
+	                    if (closestDim) {
+	                        var axisIndex = zrUtil.indexOf(coordSys.dimensions, closestDim);
+	                        api.dispatchAction({
+	                            type: 'parallelAxisExpand',
+	                            axisExpandCenter: axisIndex
+	                        });
+	                    }
+	                });
+	            }
+	        },
+
+	        dispose: function (ecModel, api) {
+	            api.getZr().off(this.__onMouseDown);
+	            api.getZr().off(this.__onMouseUp);
+	        }
+	    });
+
+	    echarts.registerPreprocessor(
+	        __webpack_require__(234)
+	    );
+
+
+
+/***/ },
+/* 225 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * Parallel coordinate system creater.
+	 */
+
+
+	    var Parallel = __webpack_require__(226);
+
+	    function create(ecModel, api) {
+	        var coordSysList = [];
+
+	        ecModel.eachComponent('parallel', function (parallelModel, idx) {
+	            var coordSys = new Parallel(parallelModel, ecModel, api);
+
+	            coordSys.name = 'parallel_' + idx;
+	            coordSys.resize(parallelModel, api);
+
+	            parallelModel.coordinateSystem = coordSys;
+	            coordSys.model = parallelModel;
+
+	            coordSysList.push(coordSys);
+	        });
+
+	        // Inject the coordinateSystems into seriesModel
+	        ecModel.eachSeries(function (seriesModel) {
+	            if (seriesModel.get('coordinateSystem') === 'parallel') {
+	                var parallelIndex = seriesModel.get('parallelIndex');
+	                seriesModel.coordinateSystem = coordSysList[parallelIndex];
+	            }
+	        });
+
+	        return coordSysList;
+	    }
+
+	    __webpack_require__(26).register('parallel', {create: create});
+
+
+
+/***/ },
+/* 226 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * Parallel Coordinates
+	 * <https://en.wikipedia.org/wiki/Parallel_coordinates>
+	 */
+
+
+	    var layout = __webpack_require__(21);
+	    var axisHelper = __webpack_require__(114);
+	    var zrUtil = __webpack_require__(4);
+	    var ParallelAxis = __webpack_require__(227);
+	    var graphic = __webpack_require__(43);
+	    var matrix = __webpack_require__(11);
+
+	    var each = zrUtil.each;
+
+	    var PI = Math.PI;
+
+	    function Parallel(parallelModel, ecModel, api) {
+
+	        /**
+	         * key: dimension
+	         * @type {Object.<string, module:echarts/coord/parallel/Axis>}
+	         * @private
+	         */
+	        this._axesMap = {};
+
+	        /**
+	         * key: dimension
+	         * value: {position: [], rotation, }
+	         * @type {Object.<string, Object>}
+	         * @private
+	         */
+	        this._axesLayout = {};
+
+	        /**
+	         * Always follow axis order.
+	         * @type {Array.<string>}
+	         * @readOnly
+	         */
+	        this.dimensions = parallelModel.dimensions;
+
+	        /**
+	         * @type {module:zrender/core/BoundingRect}
+	         */
+	        this._rect;
+
+	        /**
+	         * @type {module:echarts/coord/parallel/ParallelModel}
+	         */
+	        this._model = parallelModel;
+
+	        this._init(parallelModel, ecModel, api);
+	    }
+
+	    Parallel.prototype = {
+
+	        type: 'parallel',
+
+	        constructor: Parallel,
+
+	        /**
+	         * Initialize cartesian coordinate systems
+	         * @private
+	         */
+	        _init: function (parallelModel, ecModel, api) {
+
+	            var dimensions = parallelModel.dimensions;
+	            var parallelAxisIndex = parallelModel.parallelAxisIndex;
+
+	            each(dimensions, function (dim, idx) {
+
+	                var axisIndex = parallelAxisIndex[idx];
+	                var axisModel = ecModel.getComponent('parallelAxis', axisIndex);
+
+	                var axis = this._axesMap[dim] = new ParallelAxis(
+	                    dim,
+	                    axisHelper.createScaleByModel(axisModel),
+	                    [0, 0],
+	                    axisModel.get('type'),
+	                    axisIndex
+	                );
+
+	                var isCategory = axis.type === 'category';
+	                axis.onBand = isCategory && axisModel.get('boundaryGap');
+	                axis.inverse = axisModel.get('inverse');
+
+	                // Inject axis into axisModel
+	                axisModel.axis = axis;
+
+	                // Inject axisModel into axis
+	                axis.model = axisModel;
+	            }, this);
+	        },
+
+	        /**
+	         * Update axis scale after data processed
+	         * @param  {module:echarts/model/Global} ecModel
+	         * @param  {module:echarts/ExtensionAPI} api
+	         */
+	        update: function (ecModel, api) {
+	            this._updateAxesFromSeries(this._model, ecModel);
+	        },
+
+	        /**
+	         * Update properties from series
+	         * @private
+	         */
+	        _updateAxesFromSeries: function (parallelModel, ecModel) {
+	            ecModel.eachSeries(function (seriesModel) {
+
+	                if (!parallelModel.contains(seriesModel, ecModel)) {
+	                    return;
+	                }
+
+	                var data = seriesModel.getData();
+
+	                each(this.dimensions, function (dim) {
+	                    var axis = this._axesMap[dim];
+	                    axis.scale.unionExtent(data.getDataExtent(dim));
+	                    axisHelper.niceScaleExtent(axis, axis.model);
+	                }, this);
+	            }, this);
+	        },
+
+	        /**
+	         * Resize the parallel coordinate system.
+	         * @param {module:echarts/coord/parallel/ParallelModel} parallelModel
+	         * @param {module:echarts/ExtensionAPI} api
+	         */
+	        resize: function (parallelModel, api) {
+	            this._rect = layout.getLayoutRect(
+	                parallelModel.getBoxLayoutParams(),
+	                {
+	                    width: api.getWidth(),
+	                    height: api.getHeight()
+	                }
+	            );
+
+	            this._layoutAxes(parallelModel);
+	        },
+
+	        /**
+	         * @return {module:zrender/core/BoundingRect}
+	         */
+	        getRect: function () {
+	            return this._rect;
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _layoutAxes: function (parallelModel) {
+	            var rect = this._rect;
+	            var layout = parallelModel.get('layout');
+	            var axes = this._axesMap;
+	            var dimensions = this.dimensions;
+
+	            var size = [rect.width, rect.height];
+	            var sizeIdx = layout === 'horizontal' ? 0 : 1;
+	            var layoutLength = size[sizeIdx];
+	            var axisLength = size[1 - sizeIdx];
+	            var axisExtent = [0, axisLength];
+
+	            each(axes, function (axis) {
+	                var idx = axis.inverse ? 1 : 0;
+	                axis.setExtent(axisExtent[idx], axisExtent[1 - idx]);
+	            });
+
+	            var axisExpandable = parallelModel.get('axisExpandable');
+	            var axisExpandWidth = parallelModel.get('axisExpandWidth');
+	            var axisExpandCenter = parallelModel.get('axisExpandCenter');
+	            var axisExpandCount = parallelModel.get('axisExpandCount') || 0;
+	            var axisExpandWindow;
+
+	            if (axisExpandCenter != null) {
+	                // Clamp
+	                var left = Math.max(0, Math.floor(axisExpandCenter - (axisExpandCount - 1) / 2));
+	                var right = left + axisExpandCount - 1;
+	                if (right >= dimensions.length) {
+	                    right = dimensions.length - 1;
+	                    left = Math.max(0, Math.floor(right - axisExpandCount + 1));
+	                }
+	                axisExpandWindow = [left, right];
+	            }
+
+	            var calcPos = (axisExpandable && axisExpandWindow && axisExpandWidth)
+	                ? function (axisIndex, layoutLength, axisCount) {
+	                    var peekIntervalCount = axisExpandWindow[1] - axisExpandWindow[0];
+	                    var otherWidth = (
+	                        layoutLength - axisExpandWidth * peekIntervalCount
+	                    ) / (axisCount - 1 - peekIntervalCount);
+
+	                    var position;
+
+	                    if (axisIndex < axisExpandWindow[0]) {
+	                        position = (axisIndex - 1) * otherWidth;
+	                    }
+	                    else if (axisIndex <= axisExpandWindow[1]) {
+	                        position = axisExpandWindow[0] * otherWidth
+	                            + (axisIndex - axisExpandWindow[0]) * axisExpandWidth;
+	                    }
+	                    else if (axisIndex === axisCount - 1) {
+	                        position = layoutLength;
+	                    }
+	                    else {
+	                        position = axisExpandWindow[0] * otherWidth
+	                            + peekIntervalCount * axisExpandWidth
+	                            + (axisIndex - axisExpandWindow[1]) * otherWidth;
+	                    }
+
+	                    return {
+	                        position: position,
+	                        axisNameAvailableWidth: (
+	                            axisExpandWindow[0] < axisIndex && axisIndex < axisExpandWindow[1]
+	                        ) ? axisExpandWidth : otherWidth
+	                    };
+	                }
+	                : function (axisIndex, layoutLength, axisCount) {
+	                    var step = layoutLength / (axisCount - 1);
+	                    return {
+	                        position: step * axisIndex,
+	                        axisNameAvailableWidth: step
+	                    };
+	                };
+
+	            each(dimensions, function (dim, idx) {
+	                var posInfo = calcPos(idx, layoutLength, dimensions.length);
+
+	                var positionTable = {
+	                    horizontal: {
+	                        x: posInfo.position,
+	                        y: axisLength
+	                    },
+	                    vertical: {
+	                        x: 0,
+	                        y: posInfo.position
+	                    }
+	                };
+	                var rotationTable = {
+	                    horizontal: PI / 2,
+	                    vertical: 0
+	                };
+
+	                var position = [
+	                    positionTable[layout].x + rect.x,
+	                    positionTable[layout].y + rect.y
+	                ];
+
+	                var rotation = rotationTable[layout];
+	                var transform = matrix.create();
+	                matrix.rotate(transform, transform, rotation);
+	                matrix.translate(transform, transform, position);
+
+	                // TODO
+	                // tick等排布信息。
+
+	                // TODO
+	                // 根据axis order 更新 dimensions顺序。
+
+	                this._axesLayout[dim] = {
+	                    position: position,
+	                    rotation: rotation,
+	                    transform: transform,
+	                    axisNameAvailableWidth: posInfo.axisNameAvailableWidth,
+	                    tickDirection: 1,
+	                    labelDirection: 1,
+	                    axisExpandWindow: axisExpandWindow
+	                };
+	            }, this);
+	        },
+
+	        /**
+	         * Get axis by dim.
+	         * @param {string} dim
+	         * @return {module:echarts/coord/parallel/ParallelAxis} [description]
+	         */
+	        getAxis: function (dim) {
+	            return this._axesMap[dim];
+	        },
+
+	        /**
+	         * Convert a dim value of a single item of series data to Point.
+	         * @param {*} value
+	         * @param {string} dim
+	         * @return {Array}
+	         */
+	        dataToPoint: function (value, dim) {
+	            return this.axisCoordToPoint(
+	                this._axesMap[dim].dataToCoord(value),
+	                dim
+	            );
+	        },
+
+	        /**
+	         * Travel data for one time, get activeState of each data item.
+	         * @param {module:echarts/data/List} data
+	         * @param {Functio} cb param: {string} activeState 'active' or 'inactive' or 'normal'
+	         *                            {number} dataIndex
+	         * @param {Object} context
+	         */
+	        eachActiveState: function (data, callback, context) {
+	            var dimensions = this.dimensions;
+	            var axesMap = this._axesMap;
+	            var hasActiveSet = this.hasAxisbrushed();
+
+	            for (var i = 0, len = data.count(); i < len; i++) {
+	                var values = data.getValues(dimensions, i);
+	                var activeState;
+
+	                if (!hasActiveSet) {
+	                    activeState = 'normal';
+	                }
+	                else {
+	                    activeState = 'active';
+	                    for (var j = 0, lenj = dimensions.length; j < lenj; j++) {
+	                        var dimName = dimensions[j];
+	                        var state = axesMap[dimName].model.getActiveState(values[j], j);
+
+	                        if (state === 'inactive') {
+	                            activeState = 'inactive';
+	                            break;
+	                        }
+	                    }
+	                }
+
+	                callback.call(context, activeState, i);
+	            }
+	        },
+
+	        /**
+	         * Whether has any activeSet.
+	         * @return {boolean}
+	         */
+	        hasAxisbrushed: function () {
+	            var dimensions = this.dimensions;
+	            var axesMap = this._axesMap;
+	            var hasActiveSet = false;
+
+	            for (var j = 0, lenj = dimensions.length; j < lenj; j++) {
+	                if (axesMap[dimensions[j]].model.getActiveState() !== 'normal') {
+	                    hasActiveSet = true;
+	                }
+	            }
+
+	            return hasActiveSet;
+	        },
+
+	        /**
+	         * Convert coords of each axis to Point.
+	         *  Return point. For example: [10, 20]
+	         * @param {Array.<number>} coords
+	         * @param {string} dim
+	         * @return {Array.<number>}
+	         */
+	        axisCoordToPoint: function (coord, dim) {
+	            var axisLayout = this._axesLayout[dim];
+	            return graphic.applyTransform([coord, 0], axisLayout.transform);
+	        },
+
+	        /**
+	         * Get axis layout.
+	         */
+	        getAxisLayout: function (dim) {
+	            return zrUtil.clone(this._axesLayout[dim]);
+	        },
+
+	        findClosestAxisDim: function (point) {
+	            var axisDim;
+	            var minDist = Infinity;
+
+	            zrUtil.each(this._axesLayout, function (axisLayout, dim) {
+	                var localPoint = graphic.applyTransform(point, axisLayout.transform, true);
+	                var extent = this._axesMap[dim].getExtent();
+
+	                if (localPoint[0] < extent[0] || localPoint[0] > extent[1]) {
+	                    return;
+	                }
+
+	                var dist = Math.abs(localPoint[1]);
+	                if (dist < minDist) {
+	                    minDist = dist;
+	                    axisDim = dim;
+	                }
+	            }, this);
+
+	            return axisDim;
+	        }
+
+	    };
+
+	    module.exports = Parallel;
+
+
+/***/ },
+/* 227 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+	    var Axis = __webpack_require__(123);
+
+	    /**
+	     * @constructor module:echarts/coord/parallel/ParallelAxis
+	     * @extends {module:echarts/coord/Axis}
+	     * @param {string} dim
+	     * @param {*} scale
+	     * @param {Array.<number>} coordExtent
+	     * @param {string} axisType
+	     */
+	    var ParallelAxis = function (dim, scale, coordExtent, axisType, axisIndex) {
+
+	        Axis.call(this, dim, scale, coordExtent);
+
+	        /**
+	         * Axis type
+	         *  - 'category'
+	         *  - 'value'
+	         *  - 'time'
+	         *  - 'log'
+	         * @type {string}
+	         */
+	        this.type = axisType || 'value';
+
+	        /**
+	         * @type {number}
+	         * @readOnly
+	         */
+	        this.axisIndex = axisIndex;
+	    };
+
+	    ParallelAxis.prototype = {
+
+	        constructor: ParallelAxis,
+
+	        /**
+	         * Axis model
+	         * @param {module:echarts/coord/parallel/AxisModel}
+	         */
+	        model: null
+
+	    };
+
+	    zrUtil.inherits(ParallelAxis, Axis);
+
+	    module.exports = ParallelAxis;
+
+
+/***/ },
+/* 228 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+	    var Component = __webpack_require__(19);
+
+	    __webpack_require__(229);
+
+	    Component.extend({
+
+	        type: 'parallel',
+
+	        dependencies: ['parallelAxis'],
+
+	        /**
+	         * @type {module:echarts/coord/parallel/Parallel}
+	         */
+	        coordinateSystem: null,
+
+	        /**
+	         * Each item like: 'dim0', 'dim1', 'dim2', ...
+	         * @type {Array.<string>}
+	         * @readOnly
+	         */
+	        dimensions: null,
+
+	        /**
+	         * Coresponding to dimensions.
+	         * @type {Array.<number>}
+	         * @readOnly
+	         */
+	        parallelAxisIndex: null,
+
+	        layoutMode: 'box',
+
+	        defaultOption: {
+	            zlevel: 0,
+	            z: 0,
+	            left: 80,
+	            top: 60,
+	            right: 80,
+	            bottom: 60,
+	            // width: {totalWidth} - left - right,
+	            // height: {totalHeight} - top - bottom,
+
+	            layout: 'horizontal',      // 'horizontal' or 'vertical'
+
+	            // FIXME
+	            // naming?
+	            axisExpandable: false,
+	            axisExpandCenter: null,
+	            axisExpandCount: 0,
+	            axisExpandWidth: 50,      // FIXME '10%' ?
+
+	            parallelAxisDefault: null
+	        },
+
+	        /**
+	         * @override
+	         */
+	        init: function () {
+	            Component.prototype.init.apply(this, arguments);
+
+	            this.mergeOption({});
+	        },
+
+	        /**
+	         * @override
+	         */
+	        mergeOption: function (newOption) {
+	            var thisOption = this.option;
+
+	            newOption && zrUtil.merge(thisOption, newOption, true);
+
+	            this._initDimensions();
+	        },
+
+	        /**
+	         * Whether series or axis is in this coordinate system.
+	         * @param {module:echarts/model/Series|module:echarts/coord/parallel/AxisModel} model
+	         * @param {module:echarts/model/Global} ecModel
+	         */
+	        contains: function (model, ecModel) {
+	            var parallelIndex = model.get('parallelIndex');
+	            return parallelIndex != null
+	                && ecModel.getComponent('parallel', parallelIndex) === this;
+	        },
+
+	        setAxisExpand: function (opt) {
+	            zrUtil.each(
+	                ['axisExpandable', 'axisExpandCenter', 'axisExpandCount', 'axisExpandWidth'],
+	                function (name) {
+	                    if (opt.hasOwnProperty(name)) {
+	                        this.option[name] = opt[name];
+	                    }
+	                },
+	                this
+	            );
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _initDimensions: function () {
+	            var dimensions = this.dimensions = [];
+	            var parallelAxisIndex = this.parallelAxisIndex = [];
+
+	            var axisModels = zrUtil.filter(this.dependentModels.parallelAxis, function (axisModel) {
+	                // Can not use this.contains here, because
+	                // initialization has not been completed yet.
+	                return axisModel.get('parallelIndex') === this.componentIndex;
+	            });
+
+	            zrUtil.each(axisModels, function (axisModel) {
+	                dimensions.push('dim' + axisModel.get('dim'));
+	                parallelAxisIndex.push(axisModel.componentIndex);
+	            });
+	        }
+
+	    });
+
+
+
+/***/ },
+/* 229 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var ComponentModel = __webpack_require__(19);
+	    var zrUtil = __webpack_require__(4);
+	    var makeStyleMapper = __webpack_require__(15);
+	    var axisModelCreator = __webpack_require__(127);
+	    var numberUtil = __webpack_require__(7);
+
+	    var AxisModel = ComponentModel.extend({
+
+	        type: 'baseParallelAxis',
+
+	        /**
+	         * @type {module:echarts/coord/parallel/Axis}
+	         */
+	        axis: null,
+
+	        /**
+	         * @type {Array.<Array.<number>}
+	         * @readOnly
+	         */
+	        activeIntervals: [],
+
+	        /**
+	         * @return {Object}
+	         */
+	        getAreaSelectStyle: function () {
+	            return makeStyleMapper(
+	                [
+	                    ['fill', 'color'],
+	                    ['lineWidth', 'borderWidth'],
+	                    ['stroke', 'borderColor'],
+	                    ['width', 'width'],
+	                    ['opacity', 'opacity']
+	                ]
+	            ).call(this.getModel('areaSelectStyle'));
+	        },
+
+	        /**
+	         * The code of this feature is put on AxisModel but not ParallelAxis,
+	         * because axisModel can be alive after echarts updating but instance of
+	         * ParallelAxis having been disposed. this._activeInterval should be kept
+	         * when action dispatched (i.e. legend click).
+	         *
+	         * @param {Array.<Array<number>>} intervals interval.length === 0
+	         *                                          means set all active.
+	         * @public
+	         */
+	        setActiveIntervals: function (intervals) {
+	            var activeIntervals = this.activeIntervals = zrUtil.clone(intervals);
+
+	            // Normalize
+	            if (activeIntervals) {
+	                for (var i = activeIntervals.length - 1; i >= 0; i--) {
+	                    numberUtil.asc(activeIntervals[i]);
+	                }
+	            }
+	        },
+
+	        /**
+	         * @param {number|string} [value] When attempting to detect 'no activeIntervals set',
+	         *                         value can not be input.
+	         * @return {string} 'normal': no activeIntervals set,
+	         *                  'active',
+	         *                  'inactive'.
+	         * @public
+	         */
+	        getActiveState: function (value) {
+	            var activeIntervals = this.activeIntervals;
+
+	            if (!activeIntervals.length) {
+	                return 'normal';
+	            }
+
+	            if (value == null) {
+	                return 'inactive';
+	            }
+
+	            for (var i = 0, len = activeIntervals.length; i < len; i++) {
+	                if (activeIntervals[i][0] <= value && value <= activeIntervals[i][1]) {
+	                    return 'active';
+	                }
+	            }
+	            return 'inactive';
+	        }
+
+	    });
+
+	    var defaultOption = {
+
+	        type: 'value',
+
+	        /**
+	         * @type {Array.<number>}
+	         */
+	        dim: null, // 0, 1, 2, ...
+
+	        parallelIndex: null,
+
+	        areaSelectStyle: {
+	            width: 20,
+	            borderWidth: 1,
+	            borderColor: 'rgba(160,197,232)',
+	            color: 'rgba(160,197,232)',
+	            opacity: 0.3
+	        },
+
+	        realtime: true, // Whether realtime update view when select.
+
+	        z: 10
+	    };
+
+	    zrUtil.merge(AxisModel.prototype, __webpack_require__(129));
+
+	    function getAxisType(axisName, option) {
+	        return option.type || (option.data ? 'category' : 'value');
+	    }
+
+	    axisModelCreator('parallel', AxisModel, getAxisType, defaultOption);
+
+	    module.exports = AxisModel;
+
+
+/***/ },
+/* 230 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    __webpack_require__(225);
+	    __webpack_require__(231);
+	    __webpack_require__(232);
+
+
+
+/***/ },
+/* 231 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var echarts = __webpack_require__(1);
+
+	    /**
+	     * @payload
+	     * @property {string} parallelAxisId
+	     * @property {Array.<Array.<number>>} intervals
+	     */
+	    var actionInfo = {
+	        type: 'axisAreaSelect',
+	        event: 'axisAreaSelected',
+	        update: 'updateVisual'
+	    };
+	    echarts.registerAction(actionInfo, function (payload, ecModel) {
+	        ecModel.eachComponent(
+	            {mainType: 'parallelAxis', query: payload},
+	            function (parallelAxisModel) {
+	                parallelAxisModel.axis.model.setActiveIntervals(payload.intervals);
+	            }
+	        );
+	    });
+
+	    /**
+	     * @payload
+	     */
+	    echarts.registerAction('parallelAxisExpand', function (payload, ecModel) {
+	        ecModel.eachComponent(
+	            {mainType: 'parallel', query: payload},
+	            function (parallelModel) {
+	                parallelModel.setAxisExpand(payload);
+	            }
+	        );
+
+	    });
+
+
+/***/ },
+/* 232 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+	    var AxisBuilder = __webpack_require__(132);
+	    var BrushController = __webpack_require__(233);
+	    var graphic = __webpack_require__(43);
+
+	    var elementList = ['axisLine', 'axisLabel', 'axisTick', 'axisName'];
+
+	    var AxisView = __webpack_require__(1).extendComponentView({
+
+	        type: 'parallelAxis',
+
+	        /**
+	         * @override
+	         */
+	        init: function (ecModel, api) {
+	            AxisView.superApply(this, 'init', arguments);
+
+	            /**
+	             * @type {module:echarts/component/helper/BrushController}
+	             */
+	            (this._brushController = new BrushController(api.getZr()))
+	                .on('brush', zrUtil.bind(this._onBrush, this));
+	        },
+
+	        /**
+	         * @override
+	         */
+	        render: function (axisModel, ecModel, api, payload) {
+	            if (fromAxisAreaSelect(axisModel, ecModel, payload)) {
+	                return;
+	            }
+
+	            this.axisModel = axisModel;
+	            this.api = api;
+
+	            this.group.removeAll();
+
+	            var oldAxisGroup = this._axisGroup;
+	            this._axisGroup = new graphic.Group();
+	            this.group.add(this._axisGroup);
+
+	            if (!axisModel.get('show')) {
+	                return;
+	            }
+
+	            var coordSys = ecModel.getComponent(
+	                'parallel', axisModel.get('parallelIndex')
+	            ).coordinateSystem;
+
+	            var areaSelectStyle = axisModel.getAreaSelectStyle();
+	            var areaWidth = areaSelectStyle.width;
+
+	            var dim = axisModel.axis.dim;
+	            var axisLayout = coordSys.getAxisLayout(dim);
+
+	            // Fetch from axisModel by default.
+	            var axisLabelShow;
+	            var axisIndex = zrUtil.indexOf(coordSys.dimensions, dim);
+
+	            var axisExpandWindow = axisLayout.axisExpandWindow;
+	            if (axisExpandWindow
+	                && (axisIndex <= axisExpandWindow[0] || axisIndex >= axisExpandWindow[1])
+	            ) {
+	                axisLabelShow = false;
+	            }
+
+	            var builderOpt = zrUtil.extend(
+	                {
+	                    axisLabelShow: axisLabelShow,
+	                    strokeContainThreshold: areaWidth
+	                },
+	                axisLayout
+	            );
+
+	            var axisBuilder = new AxisBuilder(axisModel, builderOpt);
+
+	            zrUtil.each(elementList, axisBuilder.add, axisBuilder);
+
+	            this._axisGroup.add(axisBuilder.getGroup());
+
+	            this._refreshBrushController(builderOpt, areaSelectStyle, axisModel, areaWidth);
+
+	            graphic.groupTransition(oldAxisGroup, this._axisGroup, axisModel);
+	        },
+
+	        _refreshBrushController: function (builderOpt, areaSelectStyle, axisModel, areaWidth) {
+	            // After filtering, axis may change, select area needs to be update.
+	            var axis = axisModel.axis;
+	            var coverInfoList = zrUtil.map(axisModel.activeIntervals, function (interval) {
+	                return {
+	                    brushType: 'lineX',
+	                    panelId: 'pl',
+	                    range: [
+	                        axis.dataToCoord(interval[0], true),
+	                        axis.dataToCoord(interval[1], true)
+	                    ]
+	                };
+	            });
+
+	            var extent = axis.getExtent();
+	            var extra = 30; // Arbitrary value.
+	            var rect = {
+	                x: extent[0] - extra,
+	                y: -areaWidth / 2,
+	                width: extent[1] - extent[0] + 2 * extra,
+	                height: areaWidth
+	            };
+
+	            this._brushController
+	                .mount({
+	                    enableGlobalPan: true,
+	                    rotation: builderOpt.rotation,
+	                    position: builderOpt.position
+	                })
+	                .setPanels([{
+	                    panelId: 'pl',
+	                    rect: rect
+	                }])
+	                .enableBrush({
+	                    brushType: 'lineX',
+	                    brushStyle: areaSelectStyle,
+	                    removeOnClick: true
+	                })
+	                .updateCovers(coverInfoList);
+	        },
+
+	        _onBrush: function (coverInfoList, opt) {
+	            // Do not cache these object, because the mey be changed.
+	            var axisModel = this.axisModel;
+	            var axis = axisModel.axis;
+
+	            var intervals = zrUtil.map(coverInfoList, function (coverInfo) {
+	                return [
+	                    axis.coordToData(coverInfo.range[0], true),
+	                    axis.coordToData(coverInfo.range[1], true)
+	                ];
+	            });
+
+	            // If realtime is true, action is not dispatched on drag end, because
+	            // the drag end emits the same params with the last drag move event,
+	            // and may have some delay when using touch pad.
+	            if (!axisModel.option.realtime === opt.isEnd || opt.removeOnClick) { // jshint ignore:line
+	                this.api.dispatchAction({
+	                    type: 'axisAreaSelect',
+	                    parallelAxisId: axisModel.id,
+	                    intervals: intervals
+	                });
+	            }
+	        },
+
+	        /**
+	         * @override
+	         */
+	        dispose: function () {
+	            this._brushController.dispose();
+	        }
+	    });
+
+	    function fromAxisAreaSelect(axisModel, ecModel, payload) {
+	        return payload
+	            && payload.type === 'axisAreaSelect'
+	            && ecModel.findComponents(
+	                {mainType: 'parallelAxis', query: payload}
+	            )[0] === axisModel;
+	    }
+
+	    module.exports = AxisView;
+
+
+/***/ },
+/* 233 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * Box selection tool.
+	 *
+	 * @module echarts/component/helper/BrushController
+	 */
+
+
+
+	    var Eventful = __webpack_require__(33);
+	    var zrUtil = __webpack_require__(4);
+	    var graphic = __webpack_require__(43);
+	    var interactionMutex = __webpack_require__(175);
+	    var DataDiffer = __webpack_require__(98);
+
+	    var curry = zrUtil.curry;
+	    var each = zrUtil.each;
+	    var map = zrUtil.map;
+	    var mathMin = Math.min;
+	    var mathMax = Math.max;
+	    var mathPow = Math.pow;
+
+	    var COVER_Z = 10000;
+	    var UNSELECT_THRESHOLD = 6;
+	    var MIN_RESIZE_LINE_WIDTH = 6;
+	    var MUTEX_RESOURCE_KEY = 'globalPan';
+
+	    var DIRECTION_MAP = {
+	        w: [0, 0],
+	        e: [0, 1],
+	        n: [1, 0],
+	        s: [1, 1]
+	    };
+	    var CURSOR_MAP = {
+	        w: 'ew',
+	        e: 'ew',
+	        n: 'ns',
+	        s: 'ns',
+	        ne: 'nesw',
+	        sw: 'nesw',
+	        nw: 'nwse',
+	        se: 'nwse'
+	    };
+	    var DEFAULT_BRUSH_OPT = {
+	        brushStyle: {
+	            lineWidth: 2,
+	            stroke: 'rgba(0,0,0,0.3)',
+	            fill: 'rgba(0,0,0,0.1)'
+	        },
+	        transformable: true,
+	        brushMode: 'single',
+	        removeOnClick: false
+	    };
+
+	    var baseUID = 0;
+
+	    /**
+	     * @alias module:echarts/component/helper/BrushController
+	     * @constructor
+	     * @mixin {module:zrender/mixin/Eventful}
+	     * @event module:echarts/component/helper/BrushController#brush
+	     *        params:
+	     *            areas: Array.<Array>, coord relates to container group,
+	     *                                    If no container specified, to global.
+	     *            opt {
+	     *                isEnd: boolean,
+	     *                removeOnClick: boolean
+	     *            }
+	     *
+	     * @param {module:zrender/zrender~ZRender} zr
+	     */
+	    function BrushController(zr) {
+
+	        if (true) {
+	            zrUtil.assert(zr);
+	        }
+
+	        Eventful.call(this);
+
+	        /**
+	         * @type {module:zrender/zrender~ZRender}
+	         * @private
+	         */
+	        this._zr = zr;
+
+	        /**
+	         * @type {module:zrender/container/Group}
+	         * @readOnly
+	         */
+	        this.group = new graphic.Group();
+
+	        /**
+	         * Only for drawing (after enabledBrush).
+	         * @private
+	         * @type {string}
+	         */
+	        this._brushType;
+
+	        /**
+	         * Only for drawing (after enabledBrush).
+	         * @private
+	         * @type {Object}
+	         */
+	        this._brushOption;
+
+	        /**
+	         * @private
+	         * @type {Object}
+	         */
+	        this._panels;
+
+	        /**
+	         * @private
+	         * @type {Array.<nubmer>}
+	         */
+	        this._track = [];
+
+	        /**
+	         * @private
+	         * @type {boolean}
+	         */
+	        this._dragging;
+
+	        /**
+	         * @private
+	         * @type {Array}
+	         */
+	        this._covers = [];
+
+	        /**
+	         * @private
+	         * @type {moudule:zrender/container/Group}
+	         */
+	        this._creatingCover;
+
+	        /**
+	         * true means global panel
+	         * @private
+	         * @type {module:zrender/container/Group|boolean}
+	         */
+	        this._creatingPanel;
+
+	        /**
+	         * @private
+	         * @type {boolean}
+	         */
+	        this._enableGlobalPan;
+
+	        /**
+	         * @private
+	         * @type {boolean}
+	         */
+	        if (true) {
+	            this._mounted;
+	        }
+
+	        /**
+	         * @private
+	         * @type {string}
+	         */
+	        this._uid = 'brushController_' + baseUID++;
+
+	        /**
+	         * @private
+	         * @type {Object}
+	         */
+	        this._handlers = {};
+	        each(mouseHandlers, function (handler, eventName) {
+	            this._handlers[eventName] = zrUtil.bind(handler, this);
+	        }, this);
+	    }
+
+	    BrushController.prototype = {
+
+	        constructor: BrushController,
+
+	        /**
+	         * If set to null/undefined/false, select disabled.
+	         * @param {Object} brushOption
+	         * @param {string|boolean} brushOption.brushType 'line', 'rect', 'polygon' or false
+	         *                          If pass false/null/undefined, disable brush.
+	         * @param {number} [brushOption.brushMode='single'] 'single' or 'multiple'
+	         * @param {boolean} [brushOption.transformable=true]
+	         * @param {boolean} [brushOption.removeOnClick=false]
+	         * @param {Object} [brushOption.brushStyle]
+	         * @param {number} [brushOption.brushStyle.width]
+	         * @param {number} [brushOption.brushStyle.lineWidth]
+	         * @param {string} [brushOption.brushStyle.stroke]
+	         * @param {string} [brushOption.brushStyle.fill]
+	         */
+	        enableBrush: function (brushOption) {
+	            if (true) {
+	                zrUtil.assert(this._mounted);
+	            }
+
+	            this._brushType && doDisableBrush(this);
+	            brushOption.brushType && doEnableBrush(this, brushOption);
+
+	            return this;
+	        },
+
+	        /**
+	         * @param {Array.<Object>} panelOpts If not pass, it is global brush.
+	         *        Each items: {panelId, rect}
+	         */
+	        setPanels: function (panelOpts) {
+	            var oldPanels = this._panels || {};
+	            var newPanels = this._panels = panelOpts && panelOpts.length && {};
+	            var thisGroup = this.group;
+
+	            newPanels && each(panelOpts, function (panelOpt) {
+	                var panelId = panelOpt.panelId;
+	                var panel = oldPanels[panelId];
+	                if (!panel) {
+	                    panel = new graphic.Rect({
+	                        silent: true,
+	                        invisible: true
+	                    });
+	                    thisGroup.add(panel);
+	                }
+	                panel.attr('shape', panelOpt.rect);
+	                panel.__brushPanelId = panelId;
+	                newPanels[panelId] = panel;
+	                oldPanels[panelId] = null;
+	            });
+
+	            each(oldPanels, function (panel) {
+	                panel && thisGroup.remove(panel);
+	            });
+
+	            return this;
+	        },
+
+	        /**
+	         * @param {Object} [opt]
+	         * @return {boolean} [opt.enableGlobalPan=false]
+	         * @return {boolean} [opt.position=[0, 0]]
+	         * @return {boolean} [opt.rotation=0]
+	         * @return {boolean} [opt.scale=[1, 1]]
+	         */
+	        mount: function (opt) {
+	            opt = opt || {};
+
+	            if (true) {
+	                this._mounted = true; // should be at first.
+	            }
+
+	            this._enableGlobalPan = opt.enableGlobalPan;
+
+	            var thisGroup = this.group;
+	            this._zr.add(thisGroup);
+
+	            thisGroup.attr({
+	                position: opt.position || [0, 0],
+	                rotation: opt.rotation || 0,
+	                scale: opt.scale || [1, 1]
+	            });
+
+	            return this;
+	        },
+
+	        eachCover: function (cb, context) {
+	            each(this._covers, cb, context);
+	        },
+
+	        /**
+	         * Update covers.
+	         * @param {Array.<Object>} brushOptionList Like:
+	         *        [
+	         *            {id: 'xx', brushType: 'line', range: [23, 44], brushStyle, transformable},
+	         *            {id: 'yy', brushType: 'rect', range: [[23, 44], [23, 54]]},
+	         *            ...
+	         *        ]
+	         *        `brushType` is required in each cover info.
+	         *        `id` is not mandatory.
+	         *        `brushStyle`, `transformable` is not mandatory, use DEFAULT_BRUSH_OPT by default.
+	         *        If brushOptionList is null/undefined, all covers removed.
+	         */
+	        updateCovers: function (brushOptionList) {
+	            if (true) {
+	                zrUtil.assert(this._mounted);
+	            }
+
+	            brushOptionList = zrUtil.map(brushOptionList, function (brushOption) {
+	                return zrUtil.merge(zrUtil.clone(DEFAULT_BRUSH_OPT), brushOption, true);
+	            });
+
+	            var tmpIdPrefix = '\0-brush-index-';
+	            var oldCovers = this._covers;
+	            var newCovers = this._covers = [];
+	            var controller = this;
+	            var creatingCover = this._creatingCover;
+
+	            (new DataDiffer(oldCovers, brushOptionList, oldGetKey, getKey))
+	                .add(addOrUpdate)
+	                .update(addOrUpdate)
+	                .remove(remove)
+	                .execute();
+
+	            return this;
+
+	            function getKey(brushOption, index) {
+	                return (brushOption.id != null ? brushOption.id : tmpIdPrefix + index)
+	                    + '-' + brushOption.brushType;
+	            }
+
+	            function oldGetKey(cover, index) {
+	                return getKey(cover.__brushOption, index);
+	            }
+
+	            function addOrUpdate(newIndex, oldIndex) {
+	                var newBrushOption = brushOptionList[newIndex];
+	                // Consider setOption in event listener of brushSelect,
+	                // where updating cover when creating should be forbiden.
+	                if (oldIndex != null && oldCovers[oldIndex] === creatingCover) {
+	                    newCovers[newIndex] = oldCovers[oldIndex];
+	                }
+	                else {
+	                    var cover = newCovers[newIndex] = oldIndex != null
+	                        ? (
+	                            oldCovers[oldIndex].__brushOption = newBrushOption,
+	                            oldCovers[oldIndex]
+	                        )
+	                        : endCreating(controller, createCover(controller, newBrushOption));
+	                    updateCoverAfterCreation(controller, cover);
+	                }
+	            }
+
+	            function remove(oldIndex) {
+	                if (oldCovers[oldIndex] !== creatingCover) {
+	                    controller.group.remove(oldCovers[oldIndex]);
+	                }
+	            }
+	        },
+
+	        unmount: function () {
+	            this.enableBrush(false);
+
+	            // container may 'removeAll' outside.
+	            clearCovers(this);
+	            this._zr.remove(this.group);
+
+	            if (true) {
+	                this._mounted = false; // should be at last.
+	            }
+
+	            return this;
+	        },
+
+	        dispose: function () {
+	            this.unmount();
+	            this.off();
+	        }
+	    };
+
+	    zrUtil.mixin(BrushController, Eventful);
+
+
+	    function doEnableBrush(controller, brushOption) {
+	        var zr = controller._zr;
+
+	        // Consider roam, which takes globalPan too.
+	        if (!controller._enableGlobalPan) {
+	            interactionMutex.take(zr, MUTEX_RESOURCE_KEY, controller._uid);
+	        }
+
+	        each(controller._handlers, function (handler, eventName) {
+	            zr.on(eventName, handler);
+	        });
+
+	        controller._brushType = brushOption.brushType;
+	        controller._brushOption = zrUtil.merge(zrUtil.clone(DEFAULT_BRUSH_OPT), brushOption, true);
+	    }
+
+	    function doDisableBrush(controller) {
+	        var zr = controller._zr;
+
+	        interactionMutex.release(zr, MUTEX_RESOURCE_KEY, controller._uid);
+
+	        each(controller._handlers, function (handler, eventName) {
+	            zr.off(eventName, handler);
+	        });
+
+	        controller._brushType = controller._brushOption = null;
+	    }
+
+	    function createCover(controller, brushOption) {
+	        var cover = coverRenderers[brushOption.brushType].createCover(controller, brushOption);
+	        updateZ(cover);
+	        cover.__brushOption = brushOption;
+	        controller.group.add(cover);
+	        return cover;
+	    }
+
+	    function endCreating(controller, creatingCover) {
+	        var coverRenderer = getCoverRenderer(creatingCover);
+	        if (coverRenderer.endCreating) {
+	            coverRenderer.endCreating(controller, creatingCover);
+	            updateZ(creatingCover);
+	        }
+	        return creatingCover;
+	    }
+
+	    function updateCoverShape(controller, cover) {
+	        var brushOption = cover.__brushOption;
+	        getCoverRenderer(cover).updateCoverShape(
+	            controller, cover, brushOption.range, brushOption
+	        );
+	    }
+
+	    function updateZ(group) {
+	        group.traverse(function (el) {
+	            el.z = COVER_Z;
+	            el.z2 = COVER_Z; // Consider in given container.
+	        });
+	    }
+
+	    function updateCoverAfterCreation(controller, cover) {
+	        getCoverRenderer(cover).updateCommon(controller, cover);
+	        updateCoverShape(controller, cover);
+	    }
+
+	    function getCoverRenderer(cover) {
+	        return coverRenderers[cover.__brushOption.brushType];
+	    }
+
+	    function getPanelByPoint(controller, x, y) {
+	        var panels = controller._panels;
+	        if (!panels) {
+	            return true; // Global panel
+	        }
+	        var panel;
+	        each(panels, function (pn) {
+	            pn.contain(x, y) && (panel = pn);
+	        });
+	        return panel;
+	    }
+
+	    function getPanelByCover(controller, cover) {
+	        var panels = controller._panels;
+	        if (!panels) {
+	            return true; // Global panel
+	        }
+	        var panelId = cover.__brushOption.panelId;
+	        // User may give cover without coord sys info,
+	        // which is then treated as global panel.
+	        return panelId != null ? panels[panelId] : true;
+	    }
+
+	    function clearCovers(controller) {
+	        var covers = controller._covers;
+	        var originalLength = covers.length;
+	        each(covers, function (cover) {
+	            controller.group.remove(cover);
+	        }, controller);
+	        covers.length = 0;
+
+	        return !!originalLength;
+	    }
+
+	    function trigger(controller, opt) {
+	        var areas = map(controller._covers, function (cover) {
+	            var brushOption = cover.__brushOption;
+	            var range = zrUtil.clone(brushOption.range);
+
+	            return {
+	                brushType: brushOption.brushType,
+	                panelId: brushOption.panelId,
+	                range: range
+	            };
+	        });
+
+	        controller.trigger('brush', areas, {
+	            isEnd: !!opt.isEnd,
+	            removeOnClick: !!opt.removeOnClick
+	        });
+	    }
+
+	    function shouldShowCover(controller) {
+	        var track = controller._track;
+
+	        if (!track.length) {
+	            return false;
+	        }
+
+	        var p2 = track[track.length - 1];
+	        var p1 = track[0];
+	        var dx = p2[0] - p1[0];
+	        var dy = p2[1] - p1[1];
+	        var dist = mathPow(dx * dx + dy * dy, 0.5);
+
+	        return dist > UNSELECT_THRESHOLD;
+	    }
+
+	    function getTrackEnds(track) {
+	        var tail = track.length - 1;
+	        tail < 0 && (tail = 0);
+	        return [track[0], track[tail]];
+	    }
+
+	    function createBaseRectCover(doDrift, controller, brushOption, edgeNames) {
+	        var cover = new graphic.Group();
+
+	        cover.add(new graphic.Rect({
+	            name: 'main',
+	            style: makeStyle(brushOption),
+	            silent: true,
+	            draggable: true,
+	            cursor: 'move',
+	            drift: curry(doDrift, controller, cover, 'nswe'),
+	            ondragend: curry(trigger, controller, {isEnd: true})
+	        }));
+
+	        each(
+	            edgeNames,
+	            function (name) {
+	                cover.add(new graphic.Rect({
+	                    name: name,
+	                    style: {opacity: 0},
+	                    draggable: true,
+	                    silent: true,
+	                    invisible: true,
+	                    drift: curry(doDrift, controller, cover, name),
+	                    ondragend: curry(trigger, controller, {isEnd: true})
+	                }));
+	            }
+	        );
+
+	        return cover;
+	    }
+
+	    function updateBaseRect(controller, cover, localRange, brushOption) {
+	        var lineWidth = brushOption.brushStyle.lineWidth || 0;
+	        var handleSize = mathMax(lineWidth, MIN_RESIZE_LINE_WIDTH);
+	        var x = localRange[0][0];
+	        var y = localRange[1][0];
+	        var xa = x - lineWidth / 2;
+	        var ya = y - lineWidth / 2;
+	        var x2 = localRange[0][1];
+	        var y2 = localRange[1][1];
+	        var x2a = x2 - handleSize + lineWidth / 2;
+	        var y2a = y2 - handleSize + lineWidth / 2;
+	        var width = x2 - x;
+	        var height = y2 - y;
+	        var widtha = width + lineWidth;
+	        var heighta = height + lineWidth;
+
+	        updateRectShape(controller, cover, 'main', x, y, width, height);
+
+	        if (brushOption.transformable) {
+	            updateRectShape(controller, cover, 'w', xa, ya, handleSize, heighta);
+	            updateRectShape(controller, cover, 'e', x2a, ya, handleSize, heighta);
+	            updateRectShape(controller, cover, 'n', xa, ya, widtha, handleSize);
+	            updateRectShape(controller, cover, 's', xa, y2a, widtha, handleSize);
+
+	            updateRectShape(controller, cover, 'nw', xa, ya, handleSize, handleSize);
+	            updateRectShape(controller, cover, 'ne', x2a, ya, handleSize, handleSize);
+	            updateRectShape(controller, cover, 'sw', xa, y2a, handleSize, handleSize);
+	            updateRectShape(controller, cover, 'se', x2a, y2a, handleSize, handleSize);
+	        }
+	    }
+
+	    function updateCommon(controller, cover) {
+	        var brushOption = cover.__brushOption;
+	        var transformable = brushOption.transformable;
+
+	        var mainEl = cover.childAt(0);
+	        mainEl.useStyle(makeStyle(brushOption));
+	        mainEl.attr({
+	            silent: !transformable,
+	            cursor: transformable ? 'move' : 'default'
+	        });
+
+	        each(
+	            ['w', 'e', 'n', 's', 'se', 'sw', 'ne', 'nw'],
+	            function (name) {
+	                var el = cover.childOfName(name);
+	                var globalDir = getGlobalDirection(controller, name);
+
+	                el && el.attr({
+	                    silent: !transformable,
+	                    invisible: !transformable,
+	                    cursor: transformable ? CURSOR_MAP[globalDir] + '-resize' : null
+	                });
+	            }
+	        );
+	    }
+
+	    function updateRectShape(controller, cover, name, x, y, w, h) {
+	        var el = cover.childOfName(name);
+	        el && el.setShape(pointsToRect(
+	            clipByPanel(controller, cover, [[x, y], [x + w, y + h]])
+	        ));
+	    }
+
+	    function makeStyle(brushOption) {
+	        return zrUtil.defaults({strokeNoScale: true}, brushOption.brushStyle);
+	    }
+
+	    function formatRectRange(x, y, x2, y2) {
+	        var min = [mathMin(x, x2), mathMin(y, y2)];
+	        var max = [mathMax(x, x2), mathMax(y, y2)];
+
+	        return [
+	            [min[0], max[0]], // x range
+	            [min[1], max[1]] // y range
+	        ];
+	    }
+
+	    function getTransform(controller) {
+	        return graphic.getTransform(controller.group);
+	    }
+
+	    function getGlobalDirection(controller, localDirection) {
+	        if (localDirection.length > 1) {
+	            localDirection = localDirection.split('');
+	            var globalDir = [
+	                getGlobalDirection(controller, localDirection[0]),
+	                getGlobalDirection(controller, localDirection[1])
+	            ];
+	            (globalDir[0] === 'e' || globalDir[0] === 'w') && globalDir.reverse();
+	            return globalDir.join('');
+	        }
+	        else {
+	            var map = {w: 'left', e: 'right', n: 'top', s: 'bottom'};
+	            var inverseMap = {left: 'w', right: 'e', top: 'n', bottom: 's'};
+	            var globalDir = graphic.transformDirection(
+	                map[localDirection], getTransform(controller)
+	            );
+	            return inverseMap[globalDir];
+	        }
+	    }
+
+	    function driftRect(toRectRange, fromRectRange, controller, cover, name, dx, dy, e) {
+	        var brushOption = cover.__brushOption;
+	        var rectRange = toRectRange(brushOption.range);
+	        var localDelta = toLocalDelta(controller, dx, dy);
+
+	        each(name.split(''), function (namePart) {
+	            var ind = DIRECTION_MAP[namePart];
+	            rectRange[ind[0]][ind[1]] += localDelta[ind[0]];
+	        });
+
+	        brushOption.range = fromRectRange(formatRectRange(
+	            rectRange[0][0], rectRange[1][0], rectRange[0][1], rectRange[1][1]
+	        ));
+
+	        updateCoverAfterCreation(controller, cover);
+	        trigger(controller, {isEnd: false});
+	    }
+
+	    function driftPolygon(controller, cover, dx, dy, e) {
+	        var range = cover.__brushOption.range;
+	        var localDelta = toLocalDelta(controller, dx, dy);
+
+	        each(range, function (point) {
+	            point[0] += localDelta[0];
+	            point[1] += localDelta[1];
+	        });
+
+	        updateCoverAfterCreation(controller, cover);
+	        trigger(controller, {isEnd: false});
+	    }
+
+	    function toLocalDelta(controller, dx, dy) {
+	        var thisGroup = controller.group;
+	        var localD = thisGroup.transformCoordToLocal(dx, dy);
+	        var localZero = thisGroup.transformCoordToLocal(0, 0);
+
+	        return [localD[0] - localZero[0], localD[1] - localZero[1]];
+	    }
+
+	    function clipByPanel(controller, cover, data) {
+	        var panel = getPanelByCover(controller, cover);
+	        if (panel === true) { // Global panel
+	            return zrUtil.clone(data);
+	        }
+
+	        var panelRect = panel.getBoundingRect();
+
+	        return zrUtil.map(data, function (point) {
+	            var x = point[0];
+	            x = mathMax(x, panelRect.x);
+	            x = mathMin(x, panelRect.x + panelRect.width);
+	            var y = point[1];
+	            y = mathMax(y, panelRect.y);
+	            y = mathMin(y, panelRect.y + panelRect.height);
+	            return [x, y];
+	        });
+	    }
+
+	    function pointsToRect(points) {
+	        var xmin = mathMin(points[0][0], points[1][0]);
+	        var ymin = mathMin(points[0][1], points[1][1]);
+	        var xmax = mathMax(points[0][0], points[1][0]);
+	        var ymax = mathMax(points[0][1], points[1][1]);
+
+	        return {
+	            x: xmin,
+	            y: ymin,
+	            width: xmax - xmin,
+	            height: ymax - ymin
+	        };
+	    }
+
+	    function resetCursor(controller, e) {
+	        var x = e.offsetX;
+	        var y = e.offsetY;
+	        var zr = controller._zr;
+
+	        if (controller._brushType) { // If active
+	            var panels = controller._panels;
+	            var covers = controller._covers;
+	            var inCover;
+
+	            for (var i = 0; i < covers.length; i++) {
+	                if (coverRenderers[covers[i].__brushOption.brushType].contain(covers[i], x, y)) {
+	                    inCover = true;
+	                    break;
+	                }
+	            }
+
+	            if (!inCover) {
+	                if (panels) { // Brush on panels
+	                    each(panels, function (panel) {
+	                        panel.contain(x, y) && zr.setCursorStyle('crosshair');
+	                    });
+	                }
+	                else { // Global brush
+	                    zr.setCursorStyle('crosshair');
+	                }
+	            }
+	        }
+	    }
+
+	    function preventDefault(e) {
+	        var rawE = e.event;
+	        rawE.preventDefault && rawE.preventDefault();
+	    }
+
+	    function mainShapeContain(cover, x, y) {
+	        return cover.childOfName('main').contain(x, y);
+	    }
+
+	    function updateCoverByMouse(controller, e, isEnd) {
+	        var x = e.offsetX;
+	        var y = e.offsetY;
+	        var creatingCover = controller._creatingCover;
+	        var panel = controller._creatingPanel;
+	        var thisBrushOption = controller._brushOption;
+	        var eventParams;
+
+	        controller._track.push(controller.group.transformCoordToLocal(x, y));
+
+	        if (shouldShowCover(controller) || creatingCover) {
+
+	            if (panel && !creatingCover) {
+	                thisBrushOption.brushMode === 'single' && clearCovers(controller);
+	                var brushOption = zrUtil.clone(thisBrushOption);
+	                brushOption.panelId = panel === true ? null : panel.__brushPanelId;
+	                creatingCover = controller._creatingCover = createCover(controller, brushOption);
+	                controller._covers.push(creatingCover);
+	            }
+
+	            if (creatingCover) {
+	                var coverRenderer = coverRenderers[controller._brushType];
+	                var coverBrushOption = creatingCover.__brushOption;
+
+	                coverBrushOption.range = coverRenderer.getCreatingRange(
+	                    clipByPanel(controller, creatingCover, controller._track)
+	                );
+
+	                if (isEnd) {
+	                    endCreating(controller, creatingCover);
+	                    coverRenderer.updateCommon(controller, creatingCover);
+	                }
+
+	                updateCoverShape(controller, creatingCover);
+
+	                eventParams = {isEnd: isEnd};
+	            }
+	        }
+	        else if (
+	            isEnd
+	            && thisBrushOption.brushMode === 'single'
+	            && thisBrushOption.removeOnClick
+	        ) {
+	            // Help user to remove covers easily, only by a tiny drag, in 'single' mode.
+	            // But a single click do not clear covers, because user may have casual
+	            // clicks (for example, click on other component and do not expect covers
+	            // disappear).
+	            // Only some cover removed, trigger action, but not every click trigger action.
+	            if (getPanelByPoint(controller, x, y) && clearCovers(controller)) {
+	                eventParams = {isEnd: isEnd, removeOnClick: true};
+	            }
+	        }
+
+	        return eventParams;
+	    }
+
+	    var mouseHandlers = {
+
+	        mousedown: function (e) {
+	            if (this._dragging) {
+	                // In case some browser do not support globalOut,
+	                // and release mose out side the browser.
+	                handleDragEnd.call(this, e);
+	            }
+	            else if (!e.target || !e.target.draggable) {
+
+	                preventDefault(e);
+
+	                var x = e.offsetX;
+	                var y = e.offsetY;
+
+	                this._creatingCover = null;
+	                var panel = this._creatingPanel = getPanelByPoint(this, x, y);
+
+	                if (panel) {
+	                    this._dragging = true;
+	                    this._track = [this.group.transformCoordToLocal(x, y)];
+	                }
+	            }
+	        },
+
+	        mousemove: function (e) {
+	            // set Cursor
+	            resetCursor(this, e);
+
+	            if (this._dragging) {
+
+	                preventDefault(e);
+
+	                var eventParams = updateCoverByMouse(this, e, false);
+
+	                eventParams && trigger(this, eventParams);
+	            }
+	        },
+
+	        mouseup: handleDragEnd //,
+
+	        // FIXME
+	        // in tooltip, globalout should not be triggered.
+	        // globalout: handleDragEnd
+	    };
+
+	    function handleDragEnd(e) {
+	        if (this._dragging) {
+
+	            preventDefault(e);
+
+	            var eventParams = updateCoverByMouse(this, e, true);
+
+	            this._dragging = false;
+	            this._track = [];
+	            this._creatingCover = null;
+
+	            // trigger event shoule be at final, after procedure will be nested.
+	            eventParams && trigger(this, eventParams);
+	        }
+	    }
+
+	    /**
+	     * key: brushType
+	     * @type {Object}
+	     */
+	    var coverRenderers = {
+
+	        lineX: getLineRenderer(0),
+
+	        lineY: getLineRenderer(1),
+
+	        rect: {
+	            createCover: function (controller, brushOption) {
+	                return createBaseRectCover(
+	                    curry(
+	                        driftRect,
+	                        function (range) {
+	                            return range;
+	                        },
+	                        function (range) {
+	                            return range;
+	                        }
+	                    ),
+	                    controller,
+	                    brushOption,
+	                    ['w', 'e', 'n', 's', 'se', 'sw', 'ne', 'nw']
+	                );
+	            },
+	            getCreatingRange: function (localTrack) {
+	                var ends = getTrackEnds(localTrack);
+	                return formatRectRange(ends[1][0], ends[1][1], ends[0][0], ends[0][1]);
+	            },
+	            updateCoverShape: function (controller, cover, localRange, brushOption) {
+	                updateBaseRect(controller, cover, localRange, brushOption);
+	            },
+	            updateCommon: updateCommon,
+	            contain: mainShapeContain
+	        },
+
+	        polygon: {
+	            createCover: function (controller, brushOption) {
+	                var cover = new graphic.Group();
+
+	                // Do not use graphic.Polygon because graphic.Polyline do not close the
+	                // border of the shape when drawing, which is a better experience for user.
+	                cover.add(new graphic.Polyline({
+	                    name: 'main',
+	                    style: makeStyle(brushOption),
+	                    silent: true
+	                }));
+
+	                return cover;
+	            },
+	            getCreatingRange: function (localTrack) {
+	                return localTrack;
+	            },
+	            endCreating: function (controller, cover) {
+	                cover.remove(cover.childAt(0));
+	                // Use graphic.Polygon close the shape.
+	                cover.add(new graphic.Polygon({
+	                    name: 'main',
+	                    draggable: true,
+	                    drift: curry(driftPolygon, controller, cover),
+	                    ondragend: curry(trigger, controller, {isEnd: true})
+	                }));
+	            },
+	            updateCoverShape: function (controller, cover, localRange, brushOption) {
+	                cover.childAt(0).setShape({
+	                    points: clipByPanel(controller, cover, localRange)
+	                });
+	            },
+	            updateCommon: updateCommon,
+	            contain: mainShapeContain
+	        }
+	    };
+
+	    function getLineRenderer(xyIndex) {
+	        return {
+	            createCover: function (controller, brushOption) {
+	                return createBaseRectCover(
+	                    curry(
+	                        driftRect,
+	                        function (range) {
+	                            var rectRange = [range, [0, 100]];
+	                            xyIndex && rectRange.reverse();
+	                            return rectRange;
+	                        },
+	                        function (rectRange) {
+	                            return rectRange[xyIndex];
+	                        }
+	                    ),
+	                    controller,
+	                    brushOption,
+	                    [['w', 'e'], ['n', 's']][xyIndex]
+	                );
+	            },
+	            getCreatingRange: function (localTrack) {
+	                var ends = getTrackEnds(localTrack);
+	                var min = mathMin(ends[0][xyIndex], ends[1][xyIndex]);
+	                var max = mathMax(ends[0][xyIndex], ends[1][xyIndex]);
+
+	                return [min, max];
+	            },
+	            updateCoverShape: function (controller, cover, localRange, brushOption) {
+	                var brushWidth = brushOption.brushStyle.width;
+	                var otherExtent;
+	                // If brushWidth not specified, fit the panel.
+	                if (brushWidth == null) {
+	                    var panel = getPanelByCover(controller, cover);
+	                    var base = 0;
+	                    if (panel !== true) {
+	                        var rect = panel.getBoundingRect();
+	                        brushWidth = xyIndex ? rect.width : rect.height;
+	                        base = xyIndex ? rect.x : rect.y;
+	                    }
+	                    // FIXME
+	                    // do not support global panel yet.
+	                    otherExtent = [base, base + (brushWidth || 0)];
+	                }
+	                else {
+	                    otherExtent = [-brushWidth / 2, brushWidth / 2];
+	                }
+	                var rectRange = [localRange, otherExtent];
+	                xyIndex && rectRange.reverse();
+
+	                updateBaseRect(controller, cover, rectRange, brushOption);
+	            },
+	            updateCommon: updateCommon,
+	            contain: mainShapeContain
+	        };
+	    }
+
+	    module.exports = BrushController;
+
+
+/***/ },
+/* 234 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+	    var modelUtil = __webpack_require__(5);
+
+	    module.exports = function (option) {
+	        createParallelIfNeeded(option);
+	        mergeAxisOptionFromParallel(option);
+	    };
+
+	    /**
+	     * Create a parallel coordinate if not exists.
+	     * @inner
+	     */
+	    function createParallelIfNeeded(option) {
+	        if (option.parallel) {
+	            return;
+	        }
+
+	        var hasParallelSeries = false;
+
+	        zrUtil.each(option.series, function (seriesOpt) {
+	            if (seriesOpt && seriesOpt.type === 'parallel') {
+	                hasParallelSeries = true;
+	            }
+	        });
+
+	        if (hasParallelSeries) {
+	            option.parallel = [{}];
+	        }
+	    }
+
+	    /**
+	     * Merge aixs definition from parallel option (if exists) to axis option.
+	     * @inner
+	     */
+	    function mergeAxisOptionFromParallel(option) {
+	        var axes = modelUtil.normalizeToArray(option.parallelAxis);
+
+	        zrUtil.each(axes, function (axisOption) {
+	            if (!zrUtil.isObject(axisOption)) {
+	                return;
+	            }
+
+	            var parallelIndex = axisOption.parallelIndex || 0;
+	            var parallelOption = modelUtil.normalizeToArray(option.parallel)[parallelIndex];
+
+	            if (parallelOption && parallelOption.parallelAxisDefault) {
+	                zrUtil.merge(axisOption, parallelOption.parallelAxisDefault, false);
+	            }
+	        });
+	    }
+
+
+
+/***/ },
+/* 235 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var List = __webpack_require__(97);
+	    var zrUtil = __webpack_require__(4);
+	    var SeriesModel = __webpack_require__(28);
+	    var completeDimensions = __webpack_require__(102);
+
+	    module.exports = SeriesModel.extend({
+
+	        type: 'series.parallel',
+
+	        dependencies: ['parallel'],
+
+	        getInitialData: function (option, ecModel) {
+	            var parallelModel = ecModel.getComponent(
+	                'parallel', this.get('parallelIndex')
+	            );
+	            var parallelAxisIndices = parallelModel.parallelAxisIndex;
+
+	            var rawData = option.data;
+	            var modelDims = parallelModel.dimensions;
+
+	            var dataDims = generateDataDims(modelDims, rawData);
+
+	            var dataDimsInfo = zrUtil.map(dataDims, function (dim, dimIndex) {
+
+	                var modelDimsIndex = zrUtil.indexOf(modelDims, dim);
+	                var axisModel = modelDimsIndex >= 0 && ecModel.getComponent(
+	                    'parallelAxis', parallelAxisIndices[modelDimsIndex]
+	                );
+
+	                if (axisModel && axisModel.get('type') === 'category') {
+	                    translateCategoryValue(axisModel, dim, rawData);
+	                    return {name: dim, type: 'ordinal'};
+	                }
+	                else if (modelDimsIndex < 0) {
+	                    return completeDimensions.guessOrdinal(rawData, dimIndex)
+	                        ? {name: dim, type: 'ordinal'}
+	                        : dim;
+	                }
+	                else {
+	                    return dim;
+	                }
+	            });
+
+	            var list = new List(dataDimsInfo, this);
+	            list.initData(rawData);
+
+	            // Anication is forbiden in progressive data mode.
+	            if (this.option.progressive) {
+	                this.option.animation = false;
+	            }
+
+	            return list;
+	        },
+
+	        /**
+	         * User can get data raw indices on 'axisAreaSelected' event received.
+	         *
+	         * @public
+	         * @param {string} activeState 'active' or 'inactive' or 'normal'
+	         * @return {Array.<number>} Raw indices
+	         */
+	        getRawIndicesByActiveState: function (activeState) {
+	            var coordSys = this.coordinateSystem;
+	            var data = this.getData();
+	            var indices = [];
+
+	            coordSys.eachActiveState(data, function (theActiveState, dataIndex) {
+	                if (activeState === theActiveState) {
+	                    indices.push(data.getRawIndex(dataIndex));
+	                }
+	            });
+
+	            return indices;
+	        },
+
+	        defaultOption: {
+	            zlevel: 0,                  // 一级层叠
+	            z: 2,                       // 二级层叠
+
+	            coordinateSystem: 'parallel',
+	            parallelIndex: 0,
+
+	            label: {
+	                normal: {
+	                    show: false
+	                },
+	                emphasis: {
+	                    show: false
+	                }
+	            },
+
+	            inactiveOpacity: 0.05,
+	            activeOpacity: 1,
+
+	            lineStyle: {
+	                normal: {
+	                    width: 1,
+	                    opacity: 0.45,
+	                    type: 'solid'
+	                }
+	            },
+	            progressive: false, // 100
+	            smooth: false,
+
+	            animationEasing: 'linear'
+	        }
+	    });
+
+	    function translateCategoryValue(axisModel, dim, rawData) {
+	        var axisData = axisModel.get('data');
+	        var numberDim = convertDimNameToNumber(dim);
+
+	        if (axisData && axisData.length) {
+	            zrUtil.each(rawData, function (dataItem) {
+	                if (!dataItem) {
+	                    return;
+	                }
+	                // FIXME
+	                // time consuming, should use hash?
+	                var index = zrUtil.indexOf(axisData, dataItem[numberDim]);
+	                dataItem[numberDim] = index >= 0 ? index : NaN;
+	            });
+	        }
+	        // FIXME
+	        // 如果没有设置axis data, 应自动算出，或者提示。
+	    }
+
+	    function convertDimNameToNumber(dimName) {
+	        return +dimName.replace('dim', '');
+	    }
+
+	    function generateDataDims(modelDims, rawData) {
+	        // parallelModel.dimension should not be regarded as data
+	        // dimensions. Consider dimensions = ['dim4', 'dim2', 'dim6'];
+
+	        // We detect max dim by parallelModel.dimensions and fist
+	        // item in rawData arbitrarily.
+	        var maxDimNum = 0;
+	        zrUtil.each(modelDims, function (dimName) {
+	            var numberDim = convertDimNameToNumber(dimName);
+	            numberDim > maxDimNum && (maxDimNum = numberDim);
+	        });
+
+	        var firstItem = rawData[0];
+	        if (firstItem && firstItem.length - 1 > maxDimNum) {
+	            maxDimNum = firstItem.length - 1;
+	        }
+
+	        var dataDims = [];
+	        for (var i = 0; i <= maxDimNum; i++) {
+	            dataDims.push('dim' + i);
+	        }
+
+	        return dataDims;
+	    }
+
+
+/***/ },
+/* 236 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var graphic = __webpack_require__(43);
+	    var zrUtil = __webpack_require__(4);
+
+	    var SMOOTH = 0.3;
+
+	    var ParallelView = __webpack_require__(42).extend({
+
+	        type: 'parallel',
+
+	        init: function () {
+
+	            /**
+	             * @type {module:zrender/container/Group}
+	             * @private
+	             */
+	            this._dataGroup = new graphic.Group();
+
+	            this.group.add(this._dataGroup);
+
+	            /**
+	             * @type {module:echarts/data/List}
+	             */
+	            this._data;
+	        },
+
+	        /**
+	         * @override
+	         */
+	        render: function (seriesModel, ecModel, api, payload) {
+	            this._renderForNormal(seriesModel);
+	            // this[
+	            //     seriesModel.option.progressive
+	            //         ? '_renderForProgressive'
+	            //         : '_renderForNormal'
+	            // ](seriesModel);
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _renderForNormal: function (seriesModel) {
+	            var dataGroup = this._dataGroup;
+	            var data = seriesModel.getData();
+	            var oldData = this._data;
+	            var coordSys = seriesModel.coordinateSystem;
+	            var dimensions = coordSys.dimensions;
+	            var option = seriesModel.option;
+	            var smooth = option.smooth ? SMOOTH : null;
+
+	            // Consider switch between progressive and not.
+	            // oldData && oldData.__plProgressive && dataGroup.removeAll();
+
+	            data.diff(oldData)
+	                .add(add)
+	                .update(update)
+	                .remove(remove)
+	                .execute();
+
+	            // Update style
+	            updateElCommon(data, smooth);
+
+	            // First create
+	            if (!this._data) {
+	                var clipPath = createGridClipShape(
+	                    coordSys, seriesModel, function () {
+	                        // Callback will be invoked immediately if there is no animation
+	                        setTimeout(function () {
+	                            dataGroup.removeClipPath();
+	                        });
+	                    }
+	                );
+	                dataGroup.setClipPath(clipPath);
+	            }
+
+	            this._data = data;
+
+	            function add(newDataIndex) {
+	                addEl(data, dataGroup, newDataIndex, dimensions, coordSys, null, smooth);
+	            }
+
+	            function update(newDataIndex, oldDataIndex) {
+	                var line = oldData.getItemGraphicEl(oldDataIndex);
+	                var points = createLinePoints(data, newDataIndex, dimensions, coordSys);
+	                data.setItemGraphicEl(newDataIndex, line);
+	                graphic.updateProps(line, {shape: {points: points}}, seriesModel, newDataIndex);
+	            }
+
+	            function remove(oldDataIndex) {
+	                var line = oldData.getItemGraphicEl(oldDataIndex);
+	                dataGroup.remove(line);
+	            }
+
+	        },
+
+	        /**
+	         * @private
+	         */
+	        // _renderForProgressive: function (seriesModel) {
+	        //     var dataGroup = this._dataGroup;
+	        //     var data = seriesModel.getData();
+	        //     var oldData = this._data;
+	        //     var coordSys = seriesModel.coordinateSystem;
+	        //     var dimensions = coordSys.dimensions;
+	        //     var option = seriesModel.option;
+	        //     var progressive = option.progressive;
+	        //     var smooth = option.smooth ? SMOOTH : null;
+
+	        //     // In progressive animation is disabled, so use simple data diff,
+	        //     // which effects performance less.
+	        //     // (Typically performance for data with length 7000+ like:
+	        //     // simpleDiff: 60ms, addEl: 184ms,
+	        //     // in RMBP 2.4GHz intel i7, OSX 10.9 chrome 50.0.2661.102 (64-bit))
+	        //     if (simpleDiff(oldData, data, dimensions)) {
+	        //         dataGroup.removeAll();
+	        //         data.each(function (dataIndex) {
+	        //             addEl(data, dataGroup, dataIndex, dimensions, coordSys);
+	        //         });
+	        //     }
+
+	        //     updateElCommon(data, progressive, smooth);
+
+	        //     // Consider switch between progressive and not.
+	        //     data.__plProgressive = true;
+	        //     this._data = data;
+	        // },
+
+	        /**
+	         * @override
+	         */
+	        remove: function () {
+	            this._dataGroup && this._dataGroup.removeAll();
+	            this._data = null;
+	        }
+	    });
+
+	    function createGridClipShape(coordSys, seriesModel, cb) {
+	        var parallelModel = coordSys.model;
+	        var rect = coordSys.getRect();
+	        var rectEl = new graphic.Rect({
+	            shape: {
+	                x: rect.x,
+	                y: rect.y,
+	                width: rect.width,
+	                height: rect.height
+	            }
+	        });
+
+	        var dim = parallelModel.get('layout') === 'horizontal' ? 'width' : 'height';
+	        rectEl.setShape(dim, 0);
+	        graphic.initProps(rectEl, {
+	            shape: {
+	                width: rect.width,
+	                height: rect.height
+	            }
+	        }, seriesModel, cb);
+	        return rectEl;
+	    }
+
+	    function createLinePoints(data, dataIndex, dimensions, coordSys) {
+	        var points = [];
+	        for (var i = 0; i < dimensions.length; i++) {
+	            var dimName = dimensions[i];
+	            var value = data.get(dimName, dataIndex);
+	            if (!isEmptyValue(value, coordSys.getAxis(dimName).type)) {
+	                points.push(coordSys.dataToPoint(value, dimName));
+	            }
+	        }
+	        return points;
+	    }
+
+	    function addEl(data, dataGroup, dataIndex, dimensions, coordSys) {
+	        var points = createLinePoints(data, dataIndex, dimensions, coordSys);
+	        var line = new graphic.Polyline({
+	            shape: {points: points},
+	            silent: true,
+	            z2: 10
+	        });
+	        dataGroup.add(line);
+	        data.setItemGraphicEl(dataIndex, line);
+	    }
+
+	    function updateElCommon(data, smooth) {
+	        var seriesStyleModel = data.hostModel.getModel('lineStyle.normal');
+	        var lineStyle = seriesStyleModel.getLineStyle();
+	        data.eachItemGraphicEl(function (line, dataIndex) {
+	            if (data.hasItemOption) {
+	                var itemModel = data.getItemModel(dataIndex);
+	                var lineStyleModel = itemModel.getModel('lineStyle.normal', seriesStyleModel);
+	                lineStyle = lineStyleModel.getLineStyle();
+	            }
+
+	            line.useStyle(zrUtil.extend(
+	                lineStyle,
+	                {
+	                    fill: null,
+	                    stroke: data.getItemVisual(dataIndex, 'color'),
+	                    opacity: data.getItemVisual(dataIndex, 'opacity')
+	                }
+	            ));
+	            line.shape.smooth = smooth;
+	        });
+	    }
+
+	    // function simpleDiff(oldData, newData, dimensions) {
+	    //     var oldLen;
+	    //     if (!oldData
+	    //         || !oldData.__plProgressive
+	    //         || (oldLen = oldData.count()) !== newData.count()
+	    //     ) {
+	    //         return true;
+	    //     }
+
+	    //     var dimLen = dimensions.length;
+	    //     for (var i = 0; i < oldLen; i++) {
+	    //         for (var j = 0; j < dimLen; j++) {
+	    //             if (oldData.get(dimensions[j], i) !== newData.get(dimensions[j], i)) {
+	    //                 return true;
+	    //             }
+	    //         }
+	    //     }
+
+	    //     return false;
+	    // }
+
+	    // FIXME
+	    // 公用方法?
+	    function isEmptyValue(val, axisType) {
+	        return axisType === 'category'
+	            ? val == null
+	            : (val == null || isNaN(val)); // axisType === 'value'
+	    }
+
+	    module.exports = ParallelView;
+
+
+/***/ },
+/* 237 */
+/***/ function(module, exports) {
+
+	
+
+	    module.exports = function (ecModel) {
+
+	        ecModel.eachSeriesByType('parallel', function (seriesModel) {
+
+	            var itemStyleModel = seriesModel.getModel('itemStyle.normal');
+	            var lineStyleModel = seriesModel.getModel('lineStyle.normal');
+	            var globalColors = ecModel.get('color');
+
+	            var color = lineStyleModel.get('color')
+	                || itemStyleModel.get('color')
+	                || globalColors[seriesModel.seriesIndex % globalColors.length];
+	            var inactiveOpacity = seriesModel.get('inactiveOpacity');
+	            var activeOpacity = seriesModel.get('activeOpacity');
+	            var lineStyle = seriesModel.getModel('lineStyle.normal').getLineStyle();
+
+	            var coordSys = seriesModel.coordinateSystem;
+	            var data = seriesModel.getData();
+
+	            var opacityMap = {
+	                normal: lineStyle.opacity,
+	                active: activeOpacity,
+	                inactive: inactiveOpacity
+	            };
+
+	            coordSys.eachActiveState(data, function (activeState, dataIndex) {
+	                data.setItemVisual(dataIndex, 'opacity', opacityMap[activeState]);
+	            });
+
+	            data.setVisual('color', color);
+	        });
+	    };
+
+
+/***/ },
+/* 238 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var echarts = __webpack_require__(1);
+
+	    __webpack_require__(239);
+	    __webpack_require__(240);
+	    echarts.registerLayout(__webpack_require__(241));
+	    echarts.registerVisual(__webpack_require__(243));
+
+
+/***/ },
+/* 239 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var SeriesModel = __webpack_require__(28);
+	    var createGraphFromNodeEdge = __webpack_require__(196);
+
+	    var SankeySeries = SeriesModel.extend({
+
+	        type: 'series.sankey',
+
+	        layoutInfo: null,
+
+	        getInitialData: function (option, ecModel) {
+	            var links = option.edges || option.links;
+	            var nodes = option.data || option.nodes;
+	            if (nodes && links) {
+	                var graph = createGraphFromNodeEdge(nodes, links, this, true);
+	                return graph.data;
+	            }
+	        },
+
+	        /**
+	         * @return {module:echarts/data/Graph}
+	         */
+	        getGraph: function () {
+	            return this.getData().graph;
+	        },
+
+	        /**
+	         * return {module:echarts/data/List}
+	         */
+	        getEdgeData: function() {
+	            return this.getGraph().edgeData;
+	        },
+
+	        /**
+	         * @override
+	         */
+	        formatTooltip: function (dataIndex, multipleSeries, dataType) {
+	            if (dataType === 'edge') {
+	                var params = this.getDataParams(dataIndex, dataType);
+	                var rawDataOpt = params.data;
+	                var html = rawDataOpt.source + ' -- ' + rawDataOpt.target;
+	                if (params.value) {
+	                    html += ' : ' + params.value;
+	                }
+	                return html;
+	            }
+	            else {
+	                return SankeySeries.superCall(this, 'formatTooltip', dataIndex, multipleSeries);
+	            }
+	            // dataType === 'node' or empty do not show tooltip by default.
+	        },
+
+	        defaultOption: {
+	            zlevel: 0,
+	            z: 2,
+
+	            coordinateSystem: 'view',
+
+	            layout : null,
+
+	            // the position of the whole view
+	            left: '5%',
+	            top: '5%',
+	            right: '20%',
+	            bottom: '5%',
+
+	            // the dx of the node
+	            nodeWidth: 20,
+
+	            // the distance between two nodes
+	            nodeGap: 8,
+
+	            // the number of iterations to change the position of the node
+	            layoutIterations: 32,
+
+	            label: {
+	                normal: {
+	                    show: true,
+	                    position: 'right',
+	                    textStyle: {
+	                        color: '#000',
+	                        fontSize: 12
+	                    }
+	                },
+	                emphasis: {
+	                    show: true
+	                }
+	            },
+
+	            itemStyle: {
+	                normal: {
+	                    borderWidth: 1,
+	                    borderColor: '#333'
+	                }
+	            },
+
+	            lineStyle: {
+	                normal: {
+	                    color: '#314656',
+	                    opacity: 0.2,
+	                    curveness: 0.5
+	                },
+	                emphasis: {
+	                    opacity: 0.6
+	                }
+	            },
+
+	            animationEasing: 'linear',
+
+	            animationDuration: 1000
+	        }
+
+	    });
+
+	    module.exports = SankeySeries;
+
+
+/***/ },
+/* 240 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var graphic = __webpack_require__(43);
+	    var zrUtil = __webpack_require__(4);
+
+	    var SankeyShape = graphic.extendShape({
+	        shape: {
+	            x1: 0, y1: 0,
+	            x2: 0, y2: 0,
+	            cpx1: 0, cpy1: 0,
+	            cpx2: 0, cpy2: 0,
+
+	            extent: 0
+	        },
+
+	        buildPath: function (ctx, shape) {
+	            var halfExtent = shape.extent / 2;
+	            ctx.moveTo(shape.x1, shape.y1 - halfExtent);
+	            ctx.bezierCurveTo(
+	                shape.cpx1, shape.cpy1 - halfExtent,
+	                shape.cpx2, shape.cpy2 - halfExtent,
+	                shape.x2, shape.y2 - halfExtent
+	            );
+	            ctx.lineTo(shape.x2, shape.y2 + halfExtent);
+	            ctx.bezierCurveTo(
+	                shape.cpx2, shape.cpy2 + halfExtent,
+	                shape.cpx1, shape.cpy1 + halfExtent,
+	                shape.x1, shape.y1 + halfExtent
+	            );
+	            ctx.closePath();
+	        }
+	    });
+
+	    module.exports = __webpack_require__(1).extendChartView({
+
+	        type: 'sankey',
+
+	        /**
+	         * @private
+	         * @type {module:echarts/chart/sankey/SankeySeries}
+	         */
+	        _model: null,
+
+	        render: function(seriesModel, ecModel, api) {
+	            var graph = seriesModel.getGraph();
+	            var group = this.group;
+	            var layoutInfo = seriesModel.layoutInfo;
+	            var nodeData = seriesModel.getData();
+	            var edgeData = seriesModel.getData('edge');
+
+	            this._model = seriesModel;
+
+	            group.removeAll();
+
+	            group.position = [layoutInfo.x, layoutInfo.y];
+
+	            // generate a rect  for each node
+	            graph.eachNode(function (node) {
+	                var layout = node.getLayout();
+	                var itemModel = node.getModel();
+	                var labelModel = itemModel.getModel('label.normal');
+	                var textStyleModel = labelModel.getModel('textStyle');
+	                var labelHoverModel = itemModel.getModel('label.emphasis');
+	                var textStyleHoverModel = labelHoverModel.getModel('textStyle');
+
+	                var rect = new graphic.Rect({
+	                    shape: {
+	                        x: layout.x,
+	                        y: layout.y,
+	                        width: node.getLayout().dx,
+	                        height: node.getLayout().dy
+	                    },
+	                    style: {
+	                        // Get formatted label in label.normal option. Use node id if it is not specified
+	                        text: labelModel.get('show')
+	                            ? seriesModel.getFormattedLabel(node.dataIndex, 'normal') || node.id
+	                            // Use empty string to hide the label
+	                            : '',
+	                        textFont: textStyleModel.getFont(),
+	                        textFill: textStyleModel.getTextColor(),
+	                        textPosition: labelModel.get('position')
+	                    }
+	                });
+
+	                rect.setStyle(zrUtil.defaults(
+	                    {
+	                        fill: node.getVisual('color')
+	                    },
+	                    itemModel.getModel('itemStyle.normal').getItemStyle()
+	                ));
+
+	                graphic.setHoverStyle(rect, zrUtil.extend(
+	                    node.getModel('itemStyle.emphasis'),
+	                    {
+	                        text: labelHoverModel.get('show')
+	                            ? seriesModel.getFormattedLabel(node.dataIndex, 'emphasis') || node.id
+	                            : '',
+	                        textFont: textStyleHoverModel.getFont(),
+	                        textFill: textStyleHoverModel.getTextColor(),
+	                        textPosition: labelHoverModel.get('position')
+	                    }
+	                ));
+
+	                group.add(rect);
+
+	                nodeData.setItemGraphicEl(node.dataIndex, rect);
+
+	                rect.dataType = 'node';
+	            });
+
+	            // generate a bezire Curve for each edge
+	            graph.eachEdge(function (edge) {
+	                var curve = new SankeyShape();
+
+	                curve.dataIndex = edge.dataIndex;
+	                curve.seriesIndex = seriesModel.seriesIndex;
+	                curve.dataType = 'edge';
+
+	                var lineStyleModel = edge.getModel('lineStyle.normal');
+	                var curvature = lineStyleModel.get('curveness');
+	                var n1Layout = edge.node1.getLayout();
+	                var n2Layout = edge.node2.getLayout();
+	                var edgeLayout = edge.getLayout();
+
+	                curve.shape.extent = Math.max(1, edgeLayout.dy);
+
+	                var x1 = n1Layout.x + n1Layout.dx;
+	                var y1 = n1Layout.y + edgeLayout.sy + edgeLayout.dy / 2;
+	                var x2 = n2Layout.x;
+	                var y2 = n2Layout.y + edgeLayout.ty + edgeLayout.dy / 2;
+	                var cpx1 = x1 * (1 - curvature) + x2 * curvature;
+	                var cpy1 = y1;
+	                var cpx2 = x1 * curvature + x2 * (1 - curvature);
+	                var cpy2 = y2;
+
+	                curve.setShape({
+	                    x1: x1,
+	                    y1: y1,
+	                    x2: x2,
+	                    y2: y2,
+	                    cpx1: cpx1,
+	                    cpy1: cpy1,
+	                    cpx2: cpx2,
+	                    cpy2: cpy2
+	                });
+
+	                curve.setStyle(lineStyleModel.getItemStyle());
+	                // Special color, use source node color or target node color
+	                switch (curve.style.fill) {
+	                    case 'source':
+	                        curve.style.fill = edge.node1.getVisual('color');
+	                        break;
+	                    case 'target':
+	                        curve.style.fill = edge.node2.getVisual('color');
+	                        break;
+	                    default:
+	                }
+
+	                graphic.setHoverStyle(curve, edge.getModel('lineStyle.emphasis').getItemStyle());
+
+	                group.add(curve);
+
+	                edgeData.setItemGraphicEl(edge.dataIndex, curve);
+	            });
+	            if (!this._data && seriesModel.get('animation')) {
+	                group.setClipPath(createGridClipShape(group.getBoundingRect(), seriesModel, function () {
+	                    group.removeClipPath();
+	                }));
+	            }
+	            this._data = seriesModel.getData();
+	        }
+	    });
+
+	    //add animation to the view
+	    function createGridClipShape(rect, seriesModel, cb) {
+	        var rectEl = new graphic.Rect({
+	            shape: {
+	                x: rect.x - 10,
+	                y: rect.y - 10,
+	                width: 0,
+	                height: rect.height + 20
+	            }
+	        });
+	        graphic.initProps(rectEl, {
+	            shape: {
+	                width: rect.width + 20,
+	                height: rect.height + 20
+	            }
+	        }, seriesModel, cb);
+
+	        return rectEl;
+	    }
+
+
+/***/ },
+/* 241 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var layout = __webpack_require__(21);
+	    var nest = __webpack_require__(242);
+	    var zrUtil = __webpack_require__(4);
+
+	    module.exports = function (ecModel, api, payload) {
+
+	        ecModel.eachSeriesByType('sankey', function (seriesModel) {
+
+	            var nodeWidth = seriesModel.get('nodeWidth');
+	            var nodeGap = seriesModel.get('nodeGap');
+
+	            var layoutInfo = getViewRect(seriesModel, api);
+
+	            seriesModel.layoutInfo = layoutInfo;
+
+	            var width = layoutInfo.width;
+	            var height = layoutInfo.height;
+
+	            var graph = seriesModel.getGraph();
+
+	            var nodes = graph.nodes;
+	            var edges = graph.edges;
+
+	            computeNodeValues(nodes);
+
+	            var filteredNodes = nodes.filter(function (node) {
+	                return node.getLayout().value === 0;
+	            });
+
+	            var iterations = filteredNodes.length !== 0
+	                ? 0 : seriesModel.get('layoutIterations');
+
+	            layoutSankey(nodes, edges, nodeWidth, nodeGap, width, height, iterations);
+	        });
+	    };
+
+	    /**
+	     * get the layout position of the whole view.
+	     */
+	    function getViewRect(seriesModel, api) {
+	        return layout.getLayoutRect(
+	            seriesModel.getBoxLayoutParams(), {
+	                width: api.getWidth(),
+	                height: api.getHeight()
+	            }
+	        );
+	    }
+
+	    function layoutSankey(nodes, edges, nodeWidth, nodeGap, width, height, iterations) {
+	        computeNodeBreadths(nodes, nodeWidth, width);
+	        computeNodeDepths(nodes, edges, height, nodeGap, iterations);
+	        computeEdgeDepths(nodes);
+	    }
+
+	    /**
+	     * compute the value of each node by summing the associated edge's value.
+	     * @param {module:echarts/data/Graph~Node} nodes
+	     */
+	    function computeNodeValues(nodes) {
+	        zrUtil.each(nodes, function (node) {
+	            var value1 = sum(node.outEdges, getEdgeValue);
+	            var value2 = sum(node.inEdges, getEdgeValue);
+	            var value = Math.max(value1, value2);
+	            node.setLayout({value: value}, true);
+	        });
+	    }
+
+	    /**
+	     * compute the x-position for each node.
+	     * @param {module:echarts/data/Graph~Node} nodes
+	     * @param  {number} nodeWidth
+	     * @param  {number} width
+	     */
+	    function computeNodeBreadths(nodes, nodeWidth, width) {
+	        var remainNodes = nodes;
+	        var nextNode = null;
+	        var x = 0;
+	        var kx = 0;
+
+	        while (remainNodes.length) {
+	            nextNode = [];
+
+	            for (var i = 0, len = remainNodes.length; i < len; i++) {
+	                var node = remainNodes[i];
+	                node.setLayout({x: x}, true);
+	                node.setLayout({dx: nodeWidth}, true);
+
+	                for (var j = 0, lenj = node.outEdges.length; j < lenj; j++) {
+	                    nextNode.push(node.outEdges[j].node2);
+	                }
+	            }
+	            remainNodes = nextNode;
+	            ++x;
+	        }
+
+	        moveSinksRight(nodes, x);
+	        kx = (width - nodeWidth) / (x - 1);
+
+	        scaleNodeBreadths(nodes, kx);
+	    }
+
+	    /**
+	     * all the node without outEgdes are assigned maximum breadth and
+	     * be aligned in the last column.
+	     * @param {module:echarts/data/Graph~Node} nodes
+	     * @param {number} x
+	     */
+	    function moveSinksRight(nodes, x) {
+	        zrUtil.each(nodes, function (node) {
+	            if(!node.outEdges.length) {
+	                node.setLayout({x: x-1}, true);
+	            }
+	        });
+	    }
+
+	    /**
+	     * scale node x-position to the width.
+	     * @param {module:echarts/data/Graph~Node} nodes
+	     * @param {number} kx
+	     */
+	    function scaleNodeBreadths(nodes, kx) {
+	        zrUtil.each(nodes, function(node) {
+	            var nodeX = node.getLayout().x * kx;
+	            node.setLayout({x: nodeX}, true);
+	        });
+	    }
+
+	    /**
+	     * using Gauss-Seidel iterations method to compute the node depth(y-position).
+	     * @param {module:echarts/data/Graph~Node} nodes
+	     * @param {module:echarts/data/Graph~Edge} edges
+	     * @param {number} height
+	     * @param {numbber} nodeGap
+	     * @param {number} iterations
+	     */
+	    function computeNodeDepths(nodes, edges, height, nodeGap, iterations) {
+	        var nodesByBreadth = nest()
+	            .key(function (d) {
+	                return d.getLayout().x;
+	            })
+	            .sortKeys(ascending)
+	            .entries(nodes)
+	            .map(function (d) {
+	                return d.values;
+	            });
+
+	        initializeNodeDepth(nodes, nodesByBreadth, edges, height, nodeGap);
+	        resolveCollisions(nodesByBreadth, nodeGap, height);
+
+	        for (var alpha = 1; iterations > 0; iterations--) {
+	            alpha *= 0.99;
+	            relaxRightToLeft(nodesByBreadth, alpha);
+	            resolveCollisions(nodesByBreadth, nodeGap, height);
+	            relaxLeftToRight(nodesByBreadth, alpha);
+	            resolveCollisions(nodesByBreadth, nodeGap, height);
+	        }
+	    }
+
+	    /**
+	     * compute the original y-position for each node.
+	     * @param {module:echarts/data/Graph~Node} nodes
+	     * @param {Array.<Array.<module:echarts/data/Graph~Node>>} nodesByBreadth
+	     * @param {module:echarts/data/Graph~Edge} edges
+	     * @param {number} height
+	     * @param {number} nodeGap
+	     */
+	    function initializeNodeDepth(nodes, nodesByBreadth, edges, height, nodeGap) {
+	        var kyArray = [];
+	        zrUtil.each(nodesByBreadth, function (nodes) {
+	            var n = nodes.length;
+	            var sum = 0;
+	            zrUtil.each(nodes, function (node) {
+	                sum += node.getLayout().value;
+	            });
+	            var ky = (height - (n-1) * nodeGap) / sum;
+	            kyArray.push(ky);
+	        });
+	        kyArray.sort(function (a, b) {
+	            return a - b;
+	        });
+	        var ky0 = kyArray[0];
+
+	        zrUtil.each(nodesByBreadth, function (nodes) {
+	            zrUtil.each(nodes, function (node, i) {
+	                node.setLayout({y: i}, true);
+	                var nodeDy = node.getLayout().value * ky0;
+	                node.setLayout({dy: nodeDy}, true);
+	            });
+	        });
+
+	        zrUtil.each(edges, function (edge) {
+	            var edgeDy = +edge.getValue() * ky0;
+	            edge.setLayout({dy: edgeDy}, true);
+	        });
+	    }
+
+	    /**
+	     * resolve the collision of initialized depth.
+	     * @param {Array.<Array.<module:echarts/data/Graph~Node>>} nodesByBreadth
+	     * @param {number} nodeGap
+	     * @param {number} height
+	     */
+	    function resolveCollisions(nodesByBreadth, nodeGap, height) {
+	        zrUtil.each(nodesByBreadth, function (nodes) {
+	            var node;
+	            var dy;
+	            var y0 = 0;
+	            var n = nodes.length;
+	            var i;
+
+	            nodes.sort(ascendingDepth);
+
+	            for (i = 0; i < n; i++) {
+	                node = nodes[i];
+	                dy = y0 - node.getLayout().y;
+	                if(dy > 0) {
+	                    var nodeY = node.getLayout().y + dy;
+	                    node.setLayout({y: nodeY}, true);
+	                }
+	                y0 = node.getLayout().y + node.getLayout().dy + nodeGap;
+	            }
+
+	            // if the bottommost node goes outside the biunds, push it back up
+	            dy = y0 - nodeGap - height;
+	            if (dy > 0) {
+	                var nodeY = node.getLayout().y -dy;
+	                node.setLayout({y: nodeY}, true);
+	                y0 = node.getLayout().y;
+	                for (i = n - 2; i >= 0; --i) {
+	                    node = nodes[i];
+	                    dy = node.getLayout().y + node.getLayout().dy + nodeGap - y0;
+	                    if (dy > 0) {
+	                        nodeY = node.getLayout().y - dy;
+	                        node.setLayout({y: nodeY}, true);
+	                    }
+	                    y0 = node.getLayout().y;
+	                }
+	            }
+	        });
+	    }
+
+	    /**
+	     * change the y-position of the nodes, except most the right side nodes.
+	     * @param {Array.<Array.<module:echarts/data/Graph~Node>>} nodesByBreadth
+	     * @param {number} alpha
+	     */
+	    function relaxRightToLeft(nodesByBreadth, alpha) {
+	        zrUtil.each(nodesByBreadth.slice().reverse(), function (nodes) {
+	            zrUtil.each(nodes, function (node) {
+	                if (node.outEdges.length) {
+	                    var y = sum(node.outEdges, weightedTarget) / sum(node.outEdges, getEdgeValue);
+	                    var nodeY = node.getLayout().y + (y - center(node)) * alpha;
+	                    node.setLayout({y: nodeY}, true);
+	                }
+	            });
+	        });
+	    }
+
+	    function weightedTarget(edge) {
+	        return center(edge.node2) * edge.getValue();
+	    }
+
+	    /**
+	     * change the y-position of the nodes, except most the left side nodes.
+	     * @param {Array.<Array.<module:echarts/data/Graph~Node>>} nodesByBreadth
+	     * @param {number} alpha
+	     */
+	    function relaxLeftToRight(nodesByBreadth, alpha) {
+	        zrUtil.each(nodesByBreadth, function (nodes) {
+	            zrUtil.each(nodes, function (node) {
+	                if (node.inEdges.length) {
+	                    var y = sum(node.inEdges, weightedSource) / sum(node.inEdges, getEdgeValue);
+	                    var nodeY = node.getLayout().y + (y - center(node)) * alpha;
+	                    node.setLayout({y: nodeY}, true);
+	                }
+	            });
+	        });
+	    }
+
+	    function weightedSource(edge) {
+	        return center(edge.node1) * edge.getValue();
+	    }
+
+	    /**
+	     * compute the depth(y-position) of each edge.
+	     * @param {module:echarts/data/Graph~Node} nodes
+	     */
+	    function computeEdgeDepths(nodes) {
+	        zrUtil.each(nodes, function (node) {
+	            node.outEdges.sort(ascendingTargetDepth);
+	            node.inEdges.sort(ascendingSourceDepth);
+	        });
+	        zrUtil.each(nodes, function (node) {
+	            var sy = 0;
+	            var ty = 0;
+	            zrUtil.each(node.outEdges, function (edge) {
+	                edge.setLayout({sy: sy}, true);
+	                sy += edge.getLayout().dy;
+	            });
+	            zrUtil.each(node.inEdges, function (edge) {
+	                edge.setLayout({ty: ty}, true);
+	                ty += edge.getLayout().dy;
+	            });
+	        });
+	    }
+
+	    function ascendingTargetDepth(a, b) {
+	        return a.node2.getLayout().y - b.node2.getLayout().y;
+	    }
+
+	    function ascendingSourceDepth(a, b) {
+	        return a.node1.getLayout().y - b.node1.getLayout().y;
+	    }
+
+	    function sum(array, f) {
+	        var s = 0;
+	        var n = array.length;
+	        var a;
+	        var i = -1;
+	        if (arguments.length === 1) {
+	            while (++i < n) {
+	                a = +array[i];
+	                if (!isNaN(a)) {
+	                    s += a;
+	                }
+	            }
+	        }
+	        else {
+	            while (++i < n) {
+	                a = +f.call(array, array[i], i);
+	                if(!isNaN(a)) {
+	                    s += a;
+	                }
+	            }
+	        }
+	        return s;
+	    }
+
+	    function center(node) {
+	        return node.getLayout().y + node.getLayout().dy / 2;
+	    }
+
+	    function ascendingDepth(a, b) {
+	        return a.getLayout().y - b.getLayout().y;
+	    }
+
+	    function ascending(a, b) {
+	        return a < b ? -1 : a > b ? 1 : a == b ? 0 : NaN;
+	    }
+
+	    function getEdgeValue(edge) {
+	        return edge.getValue();
+	    }
+
+
+
+/***/ },
+/* 242 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+
+	    /**
+	     * nest helper used to group by the array.
+	     * can specified the keys and sort the keys.
+	     */
+	    function nest() {
+
+	        var keysFunction = [];
+	        var sortKeysFunction = [];
+
+	        /**
+	         * map an Array into the mapObject.
+	         * @param {Array} array
+	         * @param {number} depth
+	         */
+	        function map(array, depth) {
+	            if (depth >= keysFunction.length) {
+	                return array;
+	            }
+	            var i = -1;
+	            var n = array.length;
+	            var keyFunction = keysFunction[depth++];
+	            var mapObject = {};
+	            var valuesByKey = {};
+
+	            while (++i < n) {
+	                var keyValue = keyFunction(array[i]);
+	                var values = valuesByKey[keyValue];
+
+	                if (values) {
+	                    values.push(array[i]);
+	                }
+	                else {
+	                    valuesByKey[keyValue] = [array[i]];
+	                }
+	            }
+
+	            zrUtil.each(valuesByKey, function (value, key) {
+	                mapObject[key] = map(value, depth);
+	            });
+
+	            return mapObject;
+	        }
+
+	        /**
+	         * transform the Map Object to multidimensional Array
+	         * @param {Object} map
+	         * @param {number} depth
+	         */
+	        function entriesMap(mapObject, depth) {
+	            if (depth >= keysFunction.length) {
+	                return mapObject;
+	            }
+	            var array = [];
+	            var sortKeyFunction = sortKeysFunction[depth++];
+
+	            zrUtil.each(mapObject, function (value, key) {
+	                array.push({
+	                    key: key, values: entriesMap(value, depth)
+	                });
+	            });
+
+	            if (sortKeyFunction) {
+	                return array.sort(function (a, b) {
+	                    return sortKeyFunction(a.key, b.key);
+	                });
+	            }
+	            else {
+	                return array;
+	            }
+	        }
+
+	        return {
+	            /**
+	             * specified the key to groupby the arrays.
+	             * users can specified one more keys.
+	             * @param {Function} d
+	             */
+	            key: function (d) {
+	                keysFunction.push(d);
+	                return this;
+	            },
+
+	            /**
+	             * specified the comparator to sort the keys
+	             * @param {Function} order
+	             */
+	            sortKeys: function (order) {
+	                sortKeysFunction[keysFunction.length - 1] = order;
+	                return this;
+	            },
+
+	            /**
+	             * the array to be grouped by.
+	             * @param {Array} array
+	             */
+	            entries: function (array) {
+	                return entriesMap(map(array, 0), 0);
+	            }
+	        };
+	    }
+	    module.exports = nest;
+
+
+/***/ },
+/* 243 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var VisualMapping = __webpack_require__(192);
+
+	    module.exports = function (ecModel, payload) {
+	        ecModel.eachSeriesByType('sankey', function (seriesModel) {
+	            var graph = seriesModel.getGraph();
+	            var nodes = graph.nodes;
+
+	            nodes.sort(function (a, b) {
+	                return a.getLayout().value - b.getLayout().value;
+	            });
+
+	            var minValue = nodes[0].getLayout().value;
+	            var maxValue = nodes[nodes.length - 1].getLayout().value;
+
+	            nodes.forEach(function (node) {
+	                var mapping = new VisualMapping({
+	                    type: 'color',
+	                    mappingMethod: 'linear',
+	                    dataExtent: [minValue, maxValue],
+	                    visual: seriesModel.get('color')
+	                });
+
+	                var mapValueToColor = mapping.mapValueToVisual(node.getLayout().value);
+	                node.setVisual('color', mapValueToColor);
+	                // If set itemStyle.normal.color
+	                var itemModel = node.getModel();
+	                var customColor = itemModel.get('itemStyle.normal.color');
+	                if (customColor != null) {
+	                    node.setVisual('color', customColor);
+	                }
+	            });
+
+	        }) ;
+	    };
+
+
+/***/ },
+/* 244 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var echarts = __webpack_require__(1);
+
+	    __webpack_require__(245);
+	    __webpack_require__(248);
+
+	    echarts.registerVisual(__webpack_require__(249));
+	    echarts.registerLayout(__webpack_require__(250));
+
+
+
+/***/ },
+/* 245 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var SeriesModel = __webpack_require__(28);
+	    var whiskerBoxCommon = __webpack_require__(246);
+
+	    var BoxplotSeries = SeriesModel.extend({
+
+	        type: 'series.boxplot',
+
+	        dependencies: ['xAxis', 'yAxis', 'grid'],
+
+	        // TODO
+	        // box width represents group size, so dimension should have 'size'.
+
+	        /**
+	         * @see <https://en.wikipedia.org/wiki/Box_plot>
+	         * The meanings of 'min' and 'max' depend on user,
+	         * and echarts do not need to know it.
+	         * @readOnly
+	         */
+	        valueDimensions: ['min', 'Q1', 'median', 'Q3', 'max'],
+
+	        /**
+	         * @type {Array.<string>}
+	         * @readOnly
+	         */
+	        dimensions: null,
+
+	        /**
+	         * @override
+	         */
+	        defaultOption: {
+	            zlevel: 0,                  // 一级层叠
+	            z: 2,                       // 二级层叠
+	            coordinateSystem: 'cartesian2d',
+	            legendHoverLink: true,
+
+	            hoverAnimation: true,
+
+	            xAxisIndex: 0,
+	            yAxisIndex: 0,
+
+	            layout: null,               // 'horizontal' or 'vertical'
+	            boxWidth: [7, 50],       // [min, max] can be percent of band width.
+
+	            itemStyle: {
+	                normal: {
+	                    color: '#fff',
+	                    borderWidth: 1
+	                },
+	                emphasis: {
+	                    borderWidth: 2,
+	                    shadowBlur: 5,
+	                    shadowOffsetX: 2,
+	                    shadowOffsetY: 2,
+	                    shadowColor: 'rgba(0,0,0,0.4)'
+	                }
+	            },
+
+	            animationEasing: 'elasticOut',
+	            animationDuration: 800
+	        }
+	    });
+
+	    zrUtil.mixin(BoxplotSeries, whiskerBoxCommon.seriesModelMixin, true);
+
+	    module.exports = BoxplotSeries;
+
+
+
+/***/ },
+/* 246 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var List = __webpack_require__(97);
+	    var completeDimensions = __webpack_require__(102);
+	    var WhiskerBoxDraw = __webpack_require__(247);
+	    var zrUtil = __webpack_require__(4);
+
+	    function getItemValue(item) {
+	        return item.value == null ? item : item.value;
+	    }
+
+	    var seriesModelMixin = {
+
+	        /**
+	         * @private
+	         * @type {string}
+	         */
+	        _baseAxisDim: null,
+
+	        /**
+	         * @override
+	         */
+	        getInitialData: function (option, ecModel) {
+	            // When both types of xAxis and yAxis are 'value', layout is
+	            // needed to be specified by user. Otherwise, layout can be
+	            // judged by which axis is category.
+
+	            var categories;
+
+	            var xAxisModel = ecModel.getComponent('xAxis', this.get('xAxisIndex'));
+	            var yAxisModel = ecModel.getComponent('yAxis', this.get('yAxisIndex'));
+	            var xAxisType = xAxisModel.get('type');
+	            var yAxisType = yAxisModel.get('type');
+	            var addOrdinal;
+
+	            // FIXME
+	            // 考虑时间轴
+
+	            if (xAxisType === 'category') {
+	                option.layout = 'horizontal';
+	                categories = xAxisModel.getCategories();
+	                addOrdinal = true;
+	            }
+	            else if (yAxisType  === 'category') {
+	                option.layout = 'vertical';
+	                categories = yAxisModel.getCategories();
+	                addOrdinal = true;
+	            }
+	            else {
+	                option.layout = option.layout || 'horizontal';
+	            }
+
+	            this._baseAxisDim = option.layout === 'horizontal' ? 'x' : 'y';
+
+	            var data = option.data;
+	            var dimensions = this.dimensions = ['base'].concat(this.valueDimensions);
+	            completeDimensions(dimensions, data);
+
+	            var list = new List(dimensions, this);
+	            list.initData(data, categories ? categories.slice() : null, function (dataItem, dimName, idx, dimIdx) {
+	                var value = getItemValue(dataItem);
+	                return addOrdinal ? (dimName === 'base' ? idx : value[dimIdx - 1]) : value[dimIdx];
+	            });
+
+	            return list;
+	        },
+
+	        /**
+	         * Used by Gird.
+	         * @param {string} axisDim 'x' or 'y'
+	         * @return {Array.<string>} dimensions on the axis.
+	         */
+	        coordDimToDataDim: function (axisDim) {
+	            var dims = this.valueDimensions.slice();
+	            var baseDim = ['base'];
+	            var map = {
+	                horizontal: {x: baseDim, y: dims},
+	                vertical: {x: dims, y: baseDim}
+	            };
+	            return map[this.get('layout')][axisDim];
+	        },
+
+	        /**
+	         * @override
+	         * @param {string|number} dataDim
+	         * @return {string} coord dimension
+	         */
+	        dataDimToCoordDim: function (dataDim) {
+	            var dim;
+
+	            zrUtil.each(['x', 'y'], function (coordDim, index) {
+	                var dataDims = this.coordDimToDataDim(coordDim);
+	                if (zrUtil.indexOf(dataDims, dataDim) >= 0) {
+	                    dim = coordDim;
+	                }
+	            }, this);
+
+	            return dim;
+	        },
+
+	        /**
+	         * If horizontal, base axis is x, otherwise y.
+	         * @override
+	         */
+	        getBaseAxis: function () {
+	            var dim = this._baseAxisDim;
+	            return this.ecModel.getComponent(dim + 'Axis', this.get(dim + 'AxisIndex')).axis;
+	        }
+	    };
+
+	    var viewMixin = {
+
+	        init: function () {
+	            /**
+	             * Old data.
+	             * @private
+	             * @type {module:echarts/chart/helper/WhiskerBoxDraw}
+	             */
+	            var whiskerBoxDraw = this._whiskerBoxDraw = new WhiskerBoxDraw(
+	                this.getStyleUpdater()
+	            );
+	            this.group.add(whiskerBoxDraw.group);
+	        },
+
+	        render: function (seriesModel, ecModel, api) {
+	            this._whiskerBoxDraw.updateData(seriesModel.getData());
+	        },
+
+	        remove: function (ecModel) {
+	            this._whiskerBoxDraw.remove();
+	        }
+	    };
+
+	    module.exports = {
+	        seriesModelMixin: seriesModelMixin,
+	        viewMixin: viewMixin
+	    };
+
+
+/***/ },
+/* 247 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @module echarts/chart/helper/Symbol
+	 */
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var graphic = __webpack_require__(43);
+	    var Path = __webpack_require__(45);
+
+	    var WhiskerPath = Path.extend({
+
+	        type: 'whiskerInBox',
+
+	        shape: {},
+
+	        buildPath: function (ctx, shape) {
+	            for (var i in shape) {
+	                if (i.indexOf('ends') === 0) {
+	                    var pts = shape[i];
+	                    ctx.moveTo(pts[0][0], pts[0][1]);
+	                    ctx.lineTo(pts[1][0], pts[1][1]);
+	                }
+	            }
+	        }
+	    });
+
+	    /**
+	     * @constructor
+	     * @alias {module:echarts/chart/helper/WhiskerBox}
+	     * @param {module:echarts/data/List} data
+	     * @param {number} idx
+	     * @param {Function} styleUpdater
+	     * @param {boolean} isInit
+	     * @extends {module:zrender/graphic/Group}
+	     */
+	    function WhiskerBox(data, idx, styleUpdater, isInit) {
+	        graphic.Group.call(this);
+
+	        /**
+	         * @type {number}
+	         * @readOnly
+	         */
+	        this.bodyIndex;
+
+	        /**
+	         * @type {number}
+	         * @readOnly
+	         */
+	        this.whiskerIndex;
+
+	        /**
+	         * @type {Function}
+	         */
+	        this.styleUpdater = styleUpdater;
+
+	        this._createContent(data, idx, isInit);
+
+	        this.updateData(data, idx, isInit);
+
+	        /**
+	         * Last series model.
+	         * @type {module:echarts/model/Series}
+	         */
+	        this._seriesModel;
+	    }
+
+	    var whiskerBoxProto = WhiskerBox.prototype;
+
+	    whiskerBoxProto._createContent = function (data, idx, isInit) {
+	        var itemLayout = data.getItemLayout(idx);
+	        var constDim = itemLayout.chartLayout === 'horizontal' ? 1 : 0;
+	        var count = 0;
+
+	        // Whisker element.
+	        this.add(new graphic.Polygon({
+	            shape: {
+	                points: isInit
+	                    ? transInit(itemLayout.bodyEnds, constDim, itemLayout)
+	                    : itemLayout.bodyEnds
+	            },
+	            style: {strokeNoScale: true},
+	            z2: 100
+	        }));
+	        this.bodyIndex = count++;
+
+	        // Box element.
+	        var whiskerEnds = zrUtil.map(itemLayout.whiskerEnds, function (ends) {
+	            return isInit ? transInit(ends, constDim, itemLayout) : ends;
+	        });
+	        this.add(new WhiskerPath({
+	            shape: makeWhiskerEndsShape(whiskerEnds),
+	            style: {strokeNoScale: true},
+	            z2: 100
+	        }));
+	        this.whiskerIndex = count++;
+	    };
+
+	    function transInit(points, dim, itemLayout) {
+	        return zrUtil.map(points, function (point) {
+	            point = point.slice();
+	            point[dim] = itemLayout.initBaseline;
+	            return point;
+	        });
+	    }
+
+	    function makeWhiskerEndsShape(whiskerEnds) {
+	        // zr animation only support 2-dim array.
+	        var shape = {};
+	        zrUtil.each(whiskerEnds, function (ends, i) {
+	            shape['ends' + i] = ends;
+	        });
+	        return shape;
+	    }
+
+	    /**
+	     * Update symbol properties
+	     * @param  {module:echarts/data/List} data
+	     * @param  {number} idx
+	     */
+	    whiskerBoxProto.updateData = function (data, idx, isInit) {
+	        var seriesModel = this._seriesModel = data.hostModel;
+	        var itemLayout = data.getItemLayout(idx);
+	        var updateMethod = graphic[isInit ? 'initProps' : 'updateProps'];
+	        // this.childAt(this.bodyIndex).stopAnimation(true);
+	        // this.childAt(this.whiskerIndex).stopAnimation(true);
+	        updateMethod(
+	            this.childAt(this.bodyIndex),
+	            {shape: {points: itemLayout.bodyEnds}},
+	            seriesModel, idx
+	        );
+	        updateMethod(
+	            this.childAt(this.whiskerIndex),
+	            {shape: makeWhiskerEndsShape(itemLayout.whiskerEnds)},
+	            seriesModel, idx
+	        );
+
+	        this.styleUpdater.call(null, this, data, idx);
+	    };
+
+	    zrUtil.inherits(WhiskerBox, graphic.Group);
+
+
+	    /**
+	     * @constructor
+	     * @alias module:echarts/chart/helper/WhiskerBoxDraw
+	     */
+	    function WhiskerBoxDraw(styleUpdater) {
+	        this.group = new graphic.Group();
+	        this.styleUpdater = styleUpdater;
+	    }
+
+	    var whiskerBoxDrawProto = WhiskerBoxDraw.prototype;
+
+	    /**
+	     * Update symbols draw by new data
+	     * @param {module:echarts/data/List} data
+	     */
+	    whiskerBoxDrawProto.updateData = function (data) {
+	        var group = this.group;
+	        var oldData = this._data;
+	        var styleUpdater = this.styleUpdater;
+
+	        data.diff(oldData)
+	            .add(function (newIdx) {
+	                if (data.hasValue(newIdx)) {
+	                    var symbolEl = new WhiskerBox(data, newIdx, styleUpdater, true);
+	                    data.setItemGraphicEl(newIdx, symbolEl);
+	                    group.add(symbolEl);
+	                }
+	            })
+	            .update(function (newIdx, oldIdx) {
+	                var symbolEl = oldData.getItemGraphicEl(oldIdx);
+
+	                // Empty data
+	                if (!data.hasValue(newIdx)) {
+	                    group.remove(symbolEl);
+	                    return;
+	                }
+
+	                if (!symbolEl) {
+	                    symbolEl = new WhiskerBox(data, newIdx, styleUpdater);
+	                }
+	                else {
+	                    symbolEl.updateData(data, newIdx);
+	                }
+
+	                // Add back
+	                group.add(symbolEl);
+
+	                data.setItemGraphicEl(newIdx, symbolEl);
+	            })
+	            .remove(function (oldIdx) {
+	                var el = oldData.getItemGraphicEl(oldIdx);
+	                el && group.remove(el);
+	            })
+	            .execute();
+
+	        this._data = data;
+	    };
+
+	    /**
+	     * Remove symbols.
+	     * @param {module:echarts/data/List} data
+	     */
+	    whiskerBoxDrawProto.remove = function () {
+	        var group = this.group;
+	        var data = this._data;
+	        this._data = null;
+	        data && data.eachItemGraphicEl(function (el) {
+	            el && group.remove(el);
+	        });
+	    };
+
+	    module.exports = WhiskerBoxDraw;
+
+
+/***/ },
+/* 248 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var ChartView = __webpack_require__(42);
+	    var graphic = __webpack_require__(43);
+	    var whiskerBoxCommon = __webpack_require__(246);
+
+	    var BoxplotView = ChartView.extend({
+
+	        type: 'boxplot',
+
+	        getStyleUpdater: function () {
+	            return updateStyle;
+	        }
+	    });
+
+	    zrUtil.mixin(BoxplotView, whiskerBoxCommon.viewMixin, true);
+
+	    // Update common properties
+	    var normalStyleAccessPath = ['itemStyle', 'normal'];
+	    var emphasisStyleAccessPath = ['itemStyle', 'emphasis'];
+
+	    function updateStyle(itemGroup, data, idx) {
+	        var itemModel = data.getItemModel(idx);
+	        var normalItemStyleModel = itemModel.getModel(normalStyleAccessPath);
+	        var borderColor = data.getItemVisual(idx, 'color');
+
+	        // Exclude borderColor.
+	        var itemStyle = normalItemStyleModel.getItemStyle(['borderColor']);
+
+	        var whiskerEl = itemGroup.childAt(itemGroup.whiskerIndex);
+	        whiskerEl.style.set(itemStyle);
+	        whiskerEl.style.stroke = borderColor;
+	        whiskerEl.dirty();
+
+	        var bodyEl = itemGroup.childAt(itemGroup.bodyIndex);
+	        bodyEl.style.set(itemStyle);
+	        bodyEl.style.stroke = borderColor;
+	        bodyEl.dirty();
+
+	        var hoverStyle = itemModel.getModel(emphasisStyleAccessPath).getItemStyle();
+	        graphic.setHoverStyle(itemGroup, hoverStyle);
+	    }
+
+	    module.exports = BoxplotView;
+
+
+
+/***/ },
+/* 249 */
+/***/ function(module, exports) {
+
+	
+
+	    var borderColorQuery = ['itemStyle', 'normal', 'borderColor'];
+
+	    module.exports = function (ecModel, api) {
+
+	        var globalColors = ecModel.get('color');
+
+	        ecModel.eachRawSeriesByType('boxplot', function (seriesModel) {
+
+	            var defaulColor = globalColors[seriesModel.seriesIndex % globalColors.length];
+	            var data = seriesModel.getData();
+
+	            data.setVisual({
+	                legendSymbol: 'roundRect',
+	                // Use name 'color' but not 'borderColor' for legend usage and
+	                // visual coding from other component like dataRange.
+	                color: seriesModel.get(borderColorQuery) || defaulColor
+	            });
+
+	            // Only visible series has each data be visual encoded
+	            if (!ecModel.isSeriesFiltered(seriesModel)) {
+	                data.each(function (idx) {
+	                    var itemModel = data.getItemModel(idx);
+	                    data.setItemVisual(
+	                        idx,
+	                        {color: itemModel.get(borderColorQuery, true)}
+	                    );
+	                });
+	            }
+	        });
+
+	    };
+
+
+/***/ },
+/* 250 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+	    var numberUtil = __webpack_require__(7);
+	    var parsePercent = numberUtil.parsePercent;
+	    var each = zrUtil.each;
+
+	    module.exports = function (ecModel) {
+
+	        var groupResult = groupSeriesByAxis(ecModel);
+
+	        each(groupResult, function (groupItem) {
+	            var seriesModels = groupItem.seriesModels;
+
+	            if (!seriesModels.length) {
+	                return;
+	            }
+
+	            calculateBase(groupItem);
+
+	            each(seriesModels, function (seriesModel, idx) {
+	                layoutSingleSeries(
+	                    seriesModel,
+	                    groupItem.boxOffsetList[idx],
+	                    groupItem.boxWidthList[idx]
+	                );
+	            });
+	        });
+	    };
+
+	    /**
+	     * Group series by axis.
+	     */
+	    function groupSeriesByAxis(ecModel) {
+	        var result = [];
+	        var axisList = [];
+
+	        ecModel.eachSeriesByType('boxplot', function (seriesModel) {
+	            var baseAxis = seriesModel.getBaseAxis();
+	            var idx = zrUtil.indexOf(axisList, baseAxis);
+
+	            if (idx < 0) {
+	                idx = axisList.length;
+	                axisList[idx] = baseAxis;
+	                result[idx] = {axis: baseAxis, seriesModels: []};
+	            }
+
+	            result[idx].seriesModels.push(seriesModel);
+	        });
+
+	        return result;
+	    }
+
+	    /**
+	     * Calculate offset and box width for each series.
+	     */
+	    function calculateBase(groupItem) {
+	        var extent;
+	        var baseAxis = groupItem.axis;
+	        var seriesModels = groupItem.seriesModels;
+	        var seriesCount = seriesModels.length;
+
+	        var boxWidthList = groupItem.boxWidthList = [];
+	        var boxOffsetList = groupItem.boxOffsetList = [];
+	        var boundList = [];
+
+	        var bandWidth;
+	        if (baseAxis.type === 'category') {
+	            bandWidth = baseAxis.getBandWidth();
+	        }
+	        else {
+	            var maxDataCount = 0;
+	            each(seriesModels, function (seriesModel) {
+	                maxDataCount = Math.max(maxDataCount, seriesModel.getData().count());
+	            });
+	            extent = baseAxis.getExtent(),
+	            Math.abs(extent[1] - extent[0]) / maxDataCount;
+	        }
+
+	        each(seriesModels, function (seriesModel) {
+	            var boxWidthBound = seriesModel.get('boxWidth');
+	            if (!zrUtil.isArray(boxWidthBound)) {
+	                boxWidthBound = [boxWidthBound, boxWidthBound];
+	            }
+	            boundList.push([
+	                parsePercent(boxWidthBound[0], bandWidth) || 0,
+	                parsePercent(boxWidthBound[1], bandWidth) || 0
+	            ]);
+	        });
+
+	        var availableWidth = bandWidth * 0.8 - 2;
+	        var boxGap = availableWidth / seriesCount * 0.3;
+	        var boxWidth = (availableWidth - boxGap * (seriesCount - 1)) / seriesCount;
+	        var base = boxWidth / 2 - availableWidth / 2;
+
+	        each(seriesModels, function (seriesModel, idx) {
+	            boxOffsetList.push(base);
+	            base += boxGap + boxWidth;
+
+	            boxWidthList.push(
+	                Math.min(Math.max(boxWidth, boundList[idx][0]), boundList[idx][1])
+	            );
+	        });
+	    }
+
+	    /**
+	     * Calculate points location for each series.
+	     */
+	    function layoutSingleSeries(seriesModel, offset, boxWidth) {
+	        var coordSys = seriesModel.coordinateSystem;
+	        var data = seriesModel.getData();
+	        var dimensions = seriesModel.dimensions;
+	        var chartLayout = seriesModel.get('layout');
+	        var halfWidth = boxWidth / 2;
+
+	        data.each(dimensions, function () {
+	            var args = arguments;
+	            var dimLen = dimensions.length;
+	            var axisDimVal = args[0];
+	            var idx = args[dimLen];
+	            var variableDim = chartLayout === 'horizontal' ? 0 : 1;
+	            var constDim = 1 - variableDim;
+
+	            var median = getPoint(args[3]);
+	            var end1 = getPoint(args[1]);
+	            var end5 = getPoint(args[5]);
+	            var whiskerEnds = [
+	                [end1, getPoint(args[2])],
+	                [end5, getPoint(args[4])]
+	            ];
+	            layEndLine(end1);
+	            layEndLine(end5);
+	            layEndLine(median);
+
+	            var bodyEnds = [];
+	            addBodyEnd(whiskerEnds[0][1], 0);
+	            addBodyEnd(whiskerEnds[1][1], 1);
+
+	            data.setItemLayout(idx, {
+	                chartLayout: chartLayout,
+	                initBaseline: median[constDim],
+	                median: median,
+	                bodyEnds: bodyEnds,
+	                whiskerEnds: whiskerEnds
+	            });
+
+	            function getPoint(val) {
+	                var p = [];
+	                p[variableDim] = axisDimVal;
+	                p[constDim] = val;
+	                var point;
+	                if (isNaN(axisDimVal) || isNaN(val)) {
+	                    point = [NaN, NaN];
+	                }
+	                else {
+	                    point = coordSys.dataToPoint(p);
+	                    point[variableDim] += offset;
+	                }
+	                return point;
+	            }
+
+	            function addBodyEnd(point, start) {
+	                var point1 = point.slice();
+	                var point2 = point.slice();
+	                point1[variableDim] += halfWidth;
+	                point2[variableDim] -= halfWidth;
+	                start
+	                    ? bodyEnds.push(point1, point2)
+	                    : bodyEnds.push(point2, point1);
+	            }
+
+	            function layEndLine(endCenter) {
+	                var line = [endCenter.slice(), endCenter.slice()];
+	                line[0][variableDim] -= halfWidth;
+	                line[1][variableDim] += halfWidth;
+	                whiskerEnds.push(line);
+	            }
+	        });
+	    }
+
+
+
+/***/ },
+/* 251 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var echarts = __webpack_require__(1);
+
+	    __webpack_require__(252);
+	    __webpack_require__(253);
+
+	    echarts.registerPreprocessor(
+	        __webpack_require__(254)
+	    );
+
+	    echarts.registerVisual(__webpack_require__(255));
+	    echarts.registerLayout(__webpack_require__(256));
+
+
+
+/***/ },
+/* 252 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var SeriesModel = __webpack_require__(28);
+	    var whiskerBoxCommon = __webpack_require__(246);
+	    var formatUtil = __webpack_require__(6);
+	    var encodeHTML = formatUtil.encodeHTML;
+	    var addCommas = formatUtil.addCommas;
+
+	    var CandlestickSeries = SeriesModel.extend({
+
+	        type: 'series.candlestick',
+
+	        dependencies: ['xAxis', 'yAxis', 'grid'],
+
+	        /**
+	         * @readOnly
+	         */
+	        valueDimensions: ['open', 'close', 'lowest', 'highest'],
+
+	        /**
+	         * @type {Array.<string>}
+	         * @readOnly
+	         */
+	        dimensions: null,
+
+	        /**
+	         * @override
+	         */
+	        defaultOption: {
+	            zlevel: 0,                  // 一级层叠
+	            z: 2,                       // 二级层叠
+	            coordinateSystem: 'cartesian2d',
+	            legendHoverLink: true,
+
+	            hoverAnimation: true,
+
+	            xAxisIndex: 0,
+	            yAxisIndex: 0,
+
+	            layout: null, // 'horizontal' or 'vertical'
+
+	            itemStyle: {
+	                normal: {
+	                    color: '#c23531', // 阳线 positive
+	                    color0: '#314656', // 阴线 negative     '#c23531', '#314656'
+	                    borderWidth: 1,
+	                    // FIXME
+	                    // ec2中使用的是lineStyle.color 和 lineStyle.color0
+	                    borderColor: '#c23531',
+	                    borderColor0: '#314656'
+	                },
+	                emphasis: {
+	                    borderWidth: 2
+	                }
+	            },
+
+	            animationUpdate: false,
+	            animationEasing: 'linear',
+	            animationDuration: 300
+	        },
+
+	        /**
+	         * Get dimension for shadow in dataZoom
+	         * @return {string} dimension name
+	         */
+	        getShadowDim: function () {
+	            return 'open';
+	        },
+
+	        /**
+	         * @override
+	         */
+	        formatTooltip: function (dataIndex, mutipleSeries) {
+	            // It rearly use mutiple candlestick series in one cartesian,
+	            // so only consider one series in this default tooltip.
+	            var valueHTMLArr = zrUtil.map(this.valueDimensions, function (dim) {
+	                return dim + ': ' + addCommas(this._data.get(dim, dataIndex));
+	            }, this);
+
+	            return encodeHTML(this.name) + '<br />' + valueHTMLArr.join('<br />');
+	        },
+
+	        brushSelector: function (itemLayout, selectors) {
+	            return selectors.rect(itemLayout.brushRect);
+	        }
+
+	    });
+
+	    zrUtil.mixin(CandlestickSeries, whiskerBoxCommon.seriesModelMixin, true);
+
+	    module.exports = CandlestickSeries;
+
+
+
+/***/ },
+/* 253 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var ChartView = __webpack_require__(42);
+	    var graphic = __webpack_require__(43);
+	    var whiskerBoxCommon = __webpack_require__(246);
+
+	    var CandlestickView = ChartView.extend({
+
+	        type: 'candlestick',
+
+	        getStyleUpdater: function () {
+	            return updateStyle;
+	        }
+
+	    });
+
+	    zrUtil.mixin(CandlestickView, whiskerBoxCommon.viewMixin, true);
+
+	    // Update common properties
+	    var normalStyleAccessPath = ['itemStyle', 'normal'];
+	    var emphasisStyleAccessPath = ['itemStyle', 'emphasis'];
+
+	    function updateStyle(itemGroup, data, idx) {
+	        var itemModel = data.getItemModel(idx);
+	        var normalItemStyleModel = itemModel.getModel(normalStyleAccessPath);
+	        var color = data.getItemVisual(idx, 'color');
+	        var borderColor = data.getItemVisual(idx, 'borderColor') || color;
+
+	        // Color must be excluded.
+	        // Because symbol provide setColor individually to set fill and stroke
+	        var itemStyle = normalItemStyleModel.getItemStyle(
+	            ['color', 'color0', 'borderColor', 'borderColor0']
+	        );
+
+	        var whiskerEl = itemGroup.childAt(itemGroup.whiskerIndex);
+	        whiskerEl.useStyle(itemStyle);
+	        whiskerEl.style.stroke = borderColor;
+
+	        var bodyEl = itemGroup.childAt(itemGroup.bodyIndex);
+	        bodyEl.useStyle(itemStyle);
+	        bodyEl.style.fill = color;
+	        bodyEl.style.stroke = borderColor;
+
+	        var hoverStyle = itemModel.getModel(emphasisStyleAccessPath).getItemStyle();
+	        graphic.setHoverStyle(itemGroup, hoverStyle);
+	    }
+
+
+	    module.exports = CandlestickView;
+
+
+
+/***/ },
+/* 254 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+
+	    module.exports = function (option) {
+	        if (!option || !zrUtil.isArray(option.series)) {
+	            return;
+	        }
+
+	        // Translate 'k' to 'candlestick'.
+	        zrUtil.each(option.series, function (seriesItem) {
+	            if (zrUtil.isObject(seriesItem) && seriesItem.type === 'k') {
+	                seriesItem.type = 'candlestick';
+	            }
+	        });
+	    };
+
+
+
+/***/ },
+/* 255 */
+/***/ function(module, exports) {
+
+	
+
+	    var positiveBorderColorQuery = ['itemStyle', 'normal', 'borderColor'];
+	    var negativeBorderColorQuery = ['itemStyle', 'normal', 'borderColor0'];
+	    var positiveColorQuery = ['itemStyle', 'normal', 'color'];
+	    var negativeColorQuery = ['itemStyle', 'normal', 'color0'];
+
+	    module.exports = function (ecModel, api) {
+
+	        ecModel.eachRawSeriesByType('candlestick', function (seriesModel) {
+
+	            var data = seriesModel.getData();
+
+	            data.setVisual({
+	                legendSymbol: 'roundRect'
+	            });
+
+	            // Only visible series has each data be visual encoded
+	            if (!ecModel.isSeriesFiltered(seriesModel)) {
+	                data.each(function (idx) {
+	                    var itemModel = data.getItemModel(idx);
+	                    var sign = data.getItemLayout(idx).sign;
+
+	                    data.setItemVisual(
+	                        idx,
+	                        {
+	                            color: itemModel.get(
+	                                sign > 0 ? positiveColorQuery : negativeColorQuery
+	                            ),
+	                            borderColor: itemModel.get(
+	                                sign > 0 ? positiveBorderColorQuery : negativeBorderColorQuery
+	                            )
+	                        }
+	                    );
+	                });
+	            }
+	        });
+
+	    };
+
+
+/***/ },
+/* 256 */
+/***/ function(module, exports) {
+
+	
+
+	    var CANDLE_MIN_WIDTH = 2;
+	    var CANDLE_MIN_NICE_WIDTH = 5;
+	    var GPA_MIN = 4;
+
+	    module.exports = function (ecModel) {
+
+	        ecModel.eachSeriesByType('candlestick', function (seriesModel) {
+
+	            var coordSys = seriesModel.coordinateSystem;
+	            var data = seriesModel.getData();
+	            var dimensions = seriesModel.dimensions;
+	            var chartLayout = seriesModel.get('layout');
+
+	            var candleWidth = calculateCandleWidth(seriesModel, data);
+
+	            data.each(dimensions, function () {
+	                var args = arguments;
+	                var dimLen = dimensions.length;
+	                var axisDimVal = args[0];
+	                var idx = args[dimLen];
+	                var variableDim = chartLayout === 'horizontal' ? 0 : 1;
+	                var constDim = 1 - variableDim;
+
+	                var openVal = args[1];
+	                var closeVal = args[2];
+	                var lowestVal = args[3];
+	                var highestVal = args[4];
+
+	                var ocLow = Math.min(openVal, closeVal);
+	                var ocHigh = Math.max(openVal, closeVal);
+
+	                var ocLowPoint = getPoint(ocLow);
+	                var ocHighPoint = getPoint(ocHigh);
+	                var lowestPoint = getPoint(lowestVal);
+	                var highestPoint = getPoint(highestVal);
+
+	                var whiskerEnds = [
+	                    [highestPoint, ocHighPoint],
+	                    [lowestPoint, ocLowPoint]
+	                ];
+
+	                var bodyEnds = [];
+	                addBodyEnd(ocHighPoint, 0);
+	                addBodyEnd(ocLowPoint, 1);
+
+	                data.setItemLayout(idx, {
+	                    chartLayout: chartLayout,
+	                    sign: openVal > closeVal ? -1 : openVal < closeVal ? 1 : 0,
+	                    initBaseline: openVal > closeVal
+	                        ? ocHighPoint[constDim] : ocLowPoint[constDim], // open point.
+	                    bodyEnds: bodyEnds,
+	                    whiskerEnds: whiskerEnds,
+	                    brushRect: makeBrushRect()
+	                });
+
+	                function getPoint(val) {
+	                    var p = [];
+	                    p[variableDim] = axisDimVal;
+	                    p[constDim] = val;
+	                    return (isNaN(axisDimVal) || isNaN(val))
+	                        ? [NaN, NaN]
+	                        : coordSys.dataToPoint(p);
+	                }
+
+	                function addBodyEnd(point, start) {
+	                    var point1 = point.slice();
+	                    var point2 = point.slice();
+	                    point1[variableDim] += candleWidth / 2;
+	                    point2[variableDim] -= candleWidth / 2;
+	                    start
+	                        ? bodyEnds.push(point1, point2)
+	                        : bodyEnds.push(point2, point1);
+	                }
+
+	                function makeBrushRect() {
+	                    var pmin = getPoint(Math.min(openVal, closeVal, lowestVal, highestVal));
+	                    var pmax = getPoint(Math.max(openVal, closeVal, lowestVal, highestVal));
+
+	                    pmin[variableDim] -= candleWidth / 2;
+	                    pmax[variableDim] -= candleWidth / 2;
+
+	                    return {
+	                        x: pmin[0],
+	                        y: pmin[1],
+	                        width: constDim ? candleWidth : pmax[0] - pmin[0],
+	                        height: constDim ? pmax[1] - pmin[1] : candleWidth
+	                    };
+	                }
+
+	            }, true);
+	        });
+	    };
+
+	    function calculateCandleWidth(seriesModel, data) {
+	        var baseAxis = seriesModel.getBaseAxis();
+	        var extent;
+
+	        var bandWidth = baseAxis.type === 'category'
+	            ? baseAxis.getBandWidth()
+	            : (
+	                extent = baseAxis.getExtent(),
+	                Math.abs(extent[1] - extent[0]) / data.count()
+	            );
+
+	        // Half band width is perfect when space is enouph, otherwise
+	        // try not to be smaller than CANDLE_MIN_NICE_WIDTH (and only
+	        // gap is compressed), otherwise ensure not to be smaller than
+	        // CANDLE_MIN_WIDTH in spite of overlap.
+
+	        return bandWidth / 2 - 2 > CANDLE_MIN_NICE_WIDTH // "- 2" is minus border width
+	            ? bandWidth / 2 - 2
+	            : bandWidth - CANDLE_MIN_NICE_WIDTH > GPA_MIN
+	            ? CANDLE_MIN_NICE_WIDTH
+	            : Math.max(bandWidth - GPA_MIN, CANDLE_MIN_WIDTH);
+	    }
+
+
+
+/***/ },
+/* 257 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+	    var echarts = __webpack_require__(1);
+
+	    __webpack_require__(258);
+	    __webpack_require__(259);
+
+	    echarts.registerVisual(zrUtil.curry(
+	        __webpack_require__(109), 'effectScatter', 'circle', null
+	    ));
+	    echarts.registerLayout(zrUtil.curry(
+	        __webpack_require__(110), 'effectScatter'
+	    ));
+
+
+/***/ },
+/* 258 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var createListFromArray = __webpack_require__(101);
+	    var SeriesModel = __webpack_require__(28);
+
+	    module.exports = SeriesModel.extend({
+
+	        type: 'series.effectScatter',
+
+	        dependencies: ['grid', 'polar'],
+
+	        getInitialData: function (option, ecModel) {
+	            var list = createListFromArray(option.data, this, ecModel);
+	            return list;
+	        },
+
+	        brushSelector: 'point',
+
+	        defaultOption: {
+	            coordinateSystem: 'cartesian2d',
+	            zlevel: 0,
+	            z: 2,
+	            legendHoverLink: true,
+
+	            effectType: 'ripple',
+
+	            // When to show the effect, option: 'render'|'emphasis'
+	            showEffectOn: 'render',
+
+	            // Ripple effect config
+	            rippleEffect: {
+	                period: 4,
+	                // Scale of ripple
+	                scale: 2.5,
+	                // Brush type can be fill or stroke
+	                brushType: 'fill'
+	            },
+
+	            // Cartesian coordinate system
+	            xAxisIndex: 0,
+	            yAxisIndex: 0,
+
+	            // Polar coordinate system
+	            polarIndex: 0,
+
+	            // Geo coordinate system
+	            geoIndex: 0,
+
+	            // symbol: null,        // 图形类型
+	            symbolSize: 10          // 图形大小，半宽（半径）参数，当图形为方向或菱形则总宽度为symbolSize * 2
+	            // symbolRotate: null,  // 图形旋转控制
+
+	            // large: false,
+	            // Available when large is true
+	            // largeThreshold: 2000,
+
+	            // itemStyle: {
+	            //     normal: {
+	            //         opacity: 1
+	            //     }
+	            // }
+	        }
+
+	    });
+
+
+/***/ },
+/* 259 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var SymbolDraw = __webpack_require__(104);
+	    var EffectSymbol = __webpack_require__(260);
+
+	    __webpack_require__(1).extendChartView({
+
+	        type: 'effectScatter',
+
+	        init: function () {
+	            this._symbolDraw = new SymbolDraw(EffectSymbol);
+	        },
+
+	        render: function (seriesModel, ecModel, api) {
+	            var data = seriesModel.getData();
+	            var effectSymbolDraw = this._symbolDraw;
+	            effectSymbolDraw.updateData(data);
+	            this.group.add(effectSymbolDraw.group);
+	        },
+
+	        updateLayout: function () {
+	            this._symbolDraw.updateLayout();
+	        },
+
+	        remove: function (ecModel, api) {
+	            this._symbolDraw && this._symbolDraw.remove(api);
+	        }
+	    });
+
+
+/***/ },
+/* 260 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * Symbol with ripple effect
+	 * @module echarts/chart/helper/EffectSymbol
+	 */
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var symbolUtil = __webpack_require__(106);
+	    var graphic = __webpack_require__(43);
+	    var numberUtil = __webpack_require__(7);
+	    var Symbol = __webpack_require__(105);
+	    var Group = graphic.Group;
+
+	    var EFFECT_RIPPLE_NUMBER = 3;
+
+	    function normalizeSymbolSize(symbolSize) {
+	        if (!zrUtil.isArray(symbolSize)) {
+	            symbolSize = [+symbolSize, +symbolSize];
+	        }
+	        return symbolSize;
+	    }
+
+	    function updateRipplePath(rippleGroup, effectCfg) {
+	        rippleGroup.eachChild(function (ripplePath) {
+	            ripplePath.attr({
+	                z: effectCfg.z,
+	                zlevel: effectCfg.zlevel,
+	                style: {
+	                    stroke: effectCfg.brushType === 'stroke' ? effectCfg.color : null,
+	                    fill: effectCfg.brushType === 'fill' ? effectCfg.color : null
+	                }
+	            });
+	        });
+	    }
+	    /**
+	     * @constructor
+	     * @param {module:echarts/data/List} data
+	     * @param {number} idx
+	     * @extends {module:zrender/graphic/Group}
+	     */
+	    function EffectSymbol(data, idx) {
+	        Group.call(this);
+
+	        var symbol = new Symbol(data, idx);
+	        var rippleGroup = new Group();
+	        this.add(symbol);
+	        this.add(rippleGroup);
+
+	        rippleGroup.beforeUpdate = function () {
+	            this.attr(symbol.getScale());
+	        };
+	        this.updateData(data, idx);
+	    }
+
+	    var effectSymbolProto = EffectSymbol.prototype;
+
+	    effectSymbolProto.stopEffectAnimation = function () {
+	        this.childAt(1).removeAll();
+	    };
+
+	    effectSymbolProto.startEffectAnimation = function (effectCfg) {
+	        var symbolType = effectCfg.symbolType;
+	        var color = effectCfg.color;
+	        var rippleGroup = this.childAt(1);
+
+	        for (var i = 0; i < EFFECT_RIPPLE_NUMBER; i++) {
+	            var ripplePath = symbolUtil.createSymbol(
+	                symbolType, -0.5, -0.5, 1, 1, color
+	            );
+	            ripplePath.attr({
+	                style: {
+	                    strokeNoScale: true
+	                },
+	                z2: 99,
+	                silent: true,
+	                scale: [1, 1]
+	            });
+
+	            var delay = -i / EFFECT_RIPPLE_NUMBER * effectCfg.period + effectCfg.effectOffset;
+	            // TODO Configurable effectCfg.period
+	            ripplePath.animate('', true)
+	                .when(effectCfg.period, {
+	                    scale: [effectCfg.rippleScale, effectCfg.rippleScale]
+	                })
+	                .delay(delay)
+	                .start();
+	            ripplePath.animateStyle(true)
+	                .when(effectCfg.period, {
+	                    opacity: 0
+	                })
+	                .delay(delay)
+	                .start();
+
+	            rippleGroup.add(ripplePath);
+	        }
+
+	        updateRipplePath(rippleGroup, effectCfg);
+	    };
+
+	    /**
+	     * Update effect symbol
+	     */
+	    effectSymbolProto.updateEffectAnimation = function (effectCfg) {
+	        var oldEffectCfg = this._effectCfg;
+	        var rippleGroup = this.childAt(1);
+
+	        // Must reinitialize effect if following configuration changed
+	        var DIFFICULT_PROPS = ['symbolType', 'period', 'rippleScale'];
+	        for (var i = 0; i < DIFFICULT_PROPS; i++) {
+	            var propName = DIFFICULT_PROPS[i];
+	            if (oldEffectCfg[propName] !== effectCfg[propName]) {
+	                this.stopEffectAnimation();
+	                this.startEffectAnimation(effectCfg);
+	                return;
+	            }
+	        }
+
+	        updateRipplePath(rippleGroup, effectCfg);
+	    };
+
+	    /**
+	     * Highlight symbol
+	     */
+	    effectSymbolProto.highlight = function () {
+	        this.trigger('emphasis');
+	    };
+
+	    /**
+	     * Downplay symbol
+	     */
+	    effectSymbolProto.downplay = function () {
+	        this.trigger('normal');
+	    };
+
+	    /**
+	     * Update symbol properties
+	     * @param  {module:echarts/data/List} data
+	     * @param  {number} idx
+	     */
+	    effectSymbolProto.updateData = function (data, idx) {
+	        var seriesModel = data.hostModel;
+
+	        this.childAt(0).updateData(data, idx);
+
+	        var rippleGroup = this.childAt(1);
+	        var itemModel = data.getItemModel(idx);
+	        var symbolType = data.getItemVisual(idx, 'symbol');
+	        var symbolSize = normalizeSymbolSize(data.getItemVisual(idx, 'symbolSize'));
+	        var color = data.getItemVisual(idx, 'color');
+
+	        rippleGroup.attr('scale', symbolSize);
+
+	        rippleGroup.traverse(function (ripplePath) {
+	            ripplePath.attr({
+	                fill: color
+	            });
+	        });
+
+	        var symbolOffset = itemModel.getShallow('symbolOffset');
+	        if (symbolOffset) {
+	            var pos = rippleGroup.position;
+	            pos[0] = numberUtil.parsePercent(symbolOffset[0], symbolSize[0]);
+	            pos[1] = numberUtil.parsePercent(symbolOffset[1], symbolSize[1]);
+	        }
+	        rippleGroup.rotation = (itemModel.getShallow('symbolRotate') || 0) * Math.PI / 180 || 0;
+
+	        var effectCfg = {};
+
+	        effectCfg.showEffectOn = seriesModel.get('showEffectOn');
+	        effectCfg.rippleScale = itemModel.get('rippleEffect.scale');
+	        effectCfg.brushType = itemModel.get('rippleEffect.brushType');
+	        effectCfg.period = itemModel.get('rippleEffect.period') * 1000;
+	        effectCfg.effectOffset = idx / data.count();
+	        effectCfg.z = itemModel.getShallow('z') || 0;
+	        effectCfg.zlevel = itemModel.getShallow('zlevel') || 0;
+	        effectCfg.symbolType = symbolType;
+	        effectCfg.color = color;
+
+	        this.off('mouseover').off('mouseout').off('emphasis').off('normal');
+
+	        if (effectCfg.showEffectOn === 'render') {
+	            this._effectCfg
+	                ? this.updateEffectAnimation(effectCfg)
+	                : this.startEffectAnimation(effectCfg);
+
+	            this._effectCfg = effectCfg;
+	        }
+	        else {
+	            // Not keep old effect config
+	            this._effectCfg = null;
+
+	            this.stopEffectAnimation();
+	            var symbol = this.childAt(0);
+	            var onEmphasis = function () {
+	                symbol.trigger('emphasis');
+	                if (effectCfg.showEffectOn !== 'render') {
+	                    this.startEffectAnimation(effectCfg);
+	                }
+	            };
+	            var onNormal = function () {
+	                symbol.trigger('normal');
+	                if (effectCfg.showEffectOn !== 'render') {
+	                    this.stopEffectAnimation();
+	                }
+	            };
+	            this.on('mouseover', onEmphasis, this)
+	                .on('mouseout', onNormal, this)
+	                .on('emphasis', onEmphasis, this)
+	                .on('normal', onNormal, this);
+	        }
+
+	        this._effectCfg = effectCfg;
+	    };
+
+	    effectSymbolProto.fadeOut = function (cb) {
+	        this.off('mouseover').off('mouseout').off('emphasis').off('normal');
+	        cb && cb();
+	    };
+
+	    zrUtil.inherits(EffectSymbol, Group);
+
+	    module.exports = EffectSymbol;
+
+
+/***/ },
+/* 261 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    __webpack_require__(262);
+	    __webpack_require__(263);
+
+	    var echarts = __webpack_require__(1);
+	    echarts.registerLayout(
+	        __webpack_require__(268)
+	    );
+
+
+/***/ },
+/* 262 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var SeriesModel = __webpack_require__(28);
+	    var List = __webpack_require__(97);
+	    var zrUtil = __webpack_require__(4);
+	    var CoordinateSystem = __webpack_require__(26);
+
+	    // Convert [ [{coord: []}, {coord: []}] ]
+	    // to [ { coords: [[]] } ]
+	    function preprocessOption (seriesOpt) {
+	        var data = seriesOpt.data;
+	        if (data && data[0] && data[0][0] && data[0][0].coord) {
+	            if (true) {
+	                console.warn('Lines data configuration has been changed to'
+	                    + ' { coords:[[1,2],[2,3]] }');
+	            }
+	            seriesOpt.data = zrUtil.map(data, function (itemOpt) {
+	                var coords = [
+	                    itemOpt[0].coord, itemOpt[1].coord
+	                ];
+	                var target = {
+	                    coords: coords
+	                };
+	                if (itemOpt[0].name) {
+	                    target.fromName = itemOpt[0].name;
+	                }
+	                if (itemOpt[1].name) {
+	                    target.toName = itemOpt[1].name;
+	                }
+	                return zrUtil.mergeAll([target, itemOpt[0], itemOpt[1]]);
+	            });
+	        }
+	    }
+
+	    var LinesSeries = SeriesModel.extend({
+
+	        type: 'series.lines',
+
+	        dependencies: ['grid', 'polar'],
+
+	        visualColorAccessPath: 'lineStyle.normal.color',
+
+	        init: function (option) {
+	            // Not using preprocessor because mergeOption may not have series.type
+	            preprocessOption(option);
+
+	            LinesSeries.superApply(this, 'init', arguments);
+	        },
+
+	        mergeOption: function (option) {
+	            preprocessOption(option);
+
+	            LinesSeries.superApply(this, 'mergeOption', arguments);
+	        },
+
+	        getInitialData: function (option, ecModel) {
+	            if (true) {
+	                var CoordSys = CoordinateSystem.get(option.coordinateSystem);
+	                if (!CoordSys) {
+	                    throw new Error('Unkown coordinate system ' + option.coordinateSystem);
+	                }
+	            }
+
+	            var lineData = new List(['value'], this);
+	            lineData.hasItemOption = false;
+	            lineData.initData(option.data, [], function (dataItem, dimName, dataIndex, dimIndex) {
+	                // dataItem is simply coords
+	                if (dataItem instanceof Array) {
+	                    return NaN;
+	                }
+	                else {
+	                    lineData.hasItemOption = true;
+	                    var value = dataItem.value;
+	                    if (value) {
+	                        return value instanceof Array ? value[dimIndex] : value;
+	                    }
+	                }
+	            });
+
+	            return lineData;
+	        },
+
+	        formatTooltip: function (dataIndex) {
+	            var data = this.getData();
+	            var itemModel = data.getItemModel(dataIndex);
+	            var name = itemModel.get('name');
+	            if (name) {
+	                return name;
+	            }
+	            var fromName = itemModel.get('fromName');
+	            var toName = itemModel.get('toName');
+	            return fromName + ' > ' + toName;
+	        },
+
+	        defaultOption: {
+	            coordinateSystem: 'geo',
+	            zlevel: 0,
+	            z: 2,
+	            legendHoverLink: true,
+
+	            hoverAnimation: true,
+	            // Cartesian coordinate system
+	            xAxisIndex: 0,
+	            yAxisIndex: 0,
+
+	            // Geo coordinate system
+	            geoIndex: 0,
+
+	            effect: {
+	                show: false,
+	                period: 4,
+	                // Animation delay. support callback
+	                // delay: 0,
+	                // If move with constant speed px/sec
+	                // period will be ignored if this property is > 0,
+	                constantSpeed: 0,
+	                symbol: 'circle',
+	                symbolSize: 3,
+	                loop: true,
+	                // Length of trail, 0 - 1
+	                trailLength: 0.2
+	                // Same with lineStyle.normal.color
+	                // color
+	            },
+
+	            large: false,
+	            // Available when large is true
+	            largeThreshold: 2000,
+
+	            // If lines are polyline
+	            // polyline not support curveness, label, animation
+	            polyline: false,
+
+	            label: {
+	                normal: {
+	                    show: false,
+	                    position: 'end'
+	                    // distance: 5,
+	                    // formatter: 标签文本格式器，同Tooltip.formatter，不支持异步回调
+	                }
+	            },
+
+	            lineStyle: {
+	                normal: {
+	                    opacity: 0.5
+	                }
+	            }
+	        }
+	    });
+
+
+/***/ },
+/* 263 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var LineDraw = __webpack_require__(199);
+	    var EffectLine = __webpack_require__(264);
+	    var Line = __webpack_require__(200);
+	    var Polyline = __webpack_require__(265);
+	    var EffectPolyline = __webpack_require__(266);
+	    var LargeLineDraw = __webpack_require__(267);
+
+	    __webpack_require__(1).extendChartView({
+
+	        type: 'lines',
+
+	        init: function () {},
+
+	        render: function (seriesModel, ecModel, api) {
+	            var data = seriesModel.getData();
+	            var lineDraw = this._lineDraw;
+
+	            var hasEffect = seriesModel.get('effect.show');
+	            var isPolyline = seriesModel.get('polyline');
+	            var isLarge = seriesModel.get('large') && data.count() >= seriesModel.get('largeThreshold');
+
+	            if (true) {
+	                if (hasEffect && isLarge) {
+	                    console.warn('Large lines not support effect');
+	                }
+	            }
+	            if (hasEffect !== this._hasEffet || isPolyline !== this._isPolyline || isLarge !== this._isLarge) {
+	                if (lineDraw) {
+	                    lineDraw.remove();
+	                }
+	                lineDraw = this._lineDraw = isLarge
+	                    ? new LargeLineDraw()
+	                    : new LineDraw(
+	                        isPolyline
+	                            ? (hasEffect ? EffectPolyline : Polyline)
+	                            : (hasEffect ? EffectLine : Line)
+	                    );
+	                this._hasEffet = hasEffect;
+	                this._isPolyline = isPolyline;
+	                this._isLarge = isLarge;
+	            }
+
+	            var zlevel = seriesModel.get('zlevel');
+	            var trailLength = seriesModel.get('effect.trailLength');
+
+	            var zr = api.getZr();
+	            // Avoid the drag cause ghost shadow
+	            // FIXME Better way ?
+	            zr.painter.getLayer(zlevel).clear(true);
+	            // Config layer with motion blur
+	            if (this._lastZlevel != null) {
+	                zr.configLayer(this._lastZlevel, {
+	                    motionBlur: false
+	                });
+	            }
+	            if (hasEffect && trailLength) {
+	                if (true) {
+	                    var notInIndividual = false;
+	                    ecModel.eachSeries(function (otherSeriesModel) {
+	                        if (otherSeriesModel !== seriesModel && otherSeriesModel.get('zlevel') === zlevel) {
+	                            notInIndividual = true;
+	                        }
+	                    });
+	                    notInIndividual && console.warn('Lines with trail effect should have an individual zlevel');
+	                }
+
+	                zr.configLayer(zlevel, {
+	                    motionBlur: true,
+	                    lastFrameAlpha: Math.max(Math.min(trailLength / 10 + 0.9, 1), 0)
+	                });
+	            }
+
+	            this.group.add(lineDraw.group);
+
+	            lineDraw.updateData(data);
+
+	            this._lastZlevel = zlevel;
+	        },
+
+	        updateLayout: function (seriesModel, ecModel, api) {
+	            this._lineDraw.updateLayout(seriesModel);
+	            // Not use motion when dragging or zooming
+	            var zr = api.getZr();
+	            zr.painter.getLayer(this._lastZlevel).clear(true);
+	        },
+
+	        remove: function (ecModel, api) {
+	            this._lineDraw && this._lineDraw.remove(api, true);
+	        }
+	    });
+
+
+/***/ },
+/* 264 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * Provide effect for line
+	 * @module echarts/chart/helper/EffectLine
+	 */
+
+
+	    var graphic = __webpack_require__(43);
+	    var Line = __webpack_require__(200);
+	    var zrUtil = __webpack_require__(4);
+	    var symbolUtil = __webpack_require__(106);
+	    var vec2 = __webpack_require__(10);
+
+	    var curveUtil = __webpack_require__(50);
+
+	    /**
+	     * @constructor
+	     * @extends {module:zrender/graphic/Group}
+	     * @alias {module:echarts/chart/helper/Line}
+	     */
+	    function EffectLine(lineData, idx, seriesScope) {
+	        graphic.Group.call(this);
+
+	        this.add(this.createLine(lineData, idx, seriesScope));
+
+	        this._updateEffectSymbol(lineData, idx);
+	    }
+
+	    var effectLineProto = EffectLine.prototype;
+
+	    effectLineProto.createLine = function (lineData, idx, seriesScope) {
+	        return new Line(lineData, idx, seriesScope);
+	    };
+
+	    effectLineProto._updateEffectSymbol = function (lineData, idx) {
+	        var itemModel = lineData.getItemModel(idx);
+	        var effectModel = itemModel.getModel('effect');
+	        var size = effectModel.get('symbolSize');
+	        var symbolType = effectModel.get('symbol');
+	        if (!zrUtil.isArray(size)) {
+	            size = [size, size];
+	        }
+	        var color = effectModel.get('color') || lineData.getItemVisual(idx, 'color');
+	        var symbol = this.childAt(1);
+
+	        if (this._symbolType !== symbolType) {
+	            // Remove previous
+	            this.remove(symbol);
+
+	            symbol = symbolUtil.createSymbol(
+	                symbolType, -0.5, -0.5, 1, 1, color
+	            );
+	            symbol.z2 = 100;
+	            symbol.culling = true;
+
+	            this.add(symbol);
+	        }
+
+	        // Symbol may be removed if loop is false
+	        if (!symbol) {
+	            return;
+	        }
+
+	        // Shadow color is same with color in default
+	        symbol.setStyle('shadowColor', color);
+	        symbol.setStyle(effectModel.getItemStyle(['color']));
+
+	        symbol.attr('scale', size);
+
+	        symbol.setColor(color);
+	        symbol.attr('scale', size);
+
+	        this._symbolType = symbolType;
+
+	        this._updateEffectAnimation(lineData, effectModel, idx);
+	    };
+
+	    effectLineProto._updateEffectAnimation = function (lineData, effectModel, idx) {
+
+	        var symbol = this.childAt(1);
+	        if (!symbol) {
+	            return;
+	        }
+
+	        var self = this;
+
+	        var points = lineData.getItemLayout(idx);
+
+	        var period = effectModel.get('period') * 1000;
+	        var loop = effectModel.get('loop');
+	        var constantSpeed = effectModel.get('constantSpeed');
+	        var delayExpr = effectModel.get('delay') || function (idx) {
+	            return idx / lineData.count() * period / 3;
+	        };
+	        var isDelayFunc = typeof delayExpr === 'function';
+
+	        // Ignore when updating
+	        symbol.ignore = true;
+
+	        this.updateAnimationPoints(symbol, points);
+
+	        if (constantSpeed > 0) {
+	            period = this.getLineLength(symbol) / constantSpeed * 1000;
+	        }
+
+	        if (period !== this._period || loop !== this._loop) {
+
+	            symbol.stopAnimation();
+
+	            var delay = delayExpr;
+	            if (isDelayFunc) {
+	                delay = delayExpr(idx);
+	            }
+	            if (symbol.__t > 0) {
+	                delay = -period * symbol.__t;
+	            }
+	            symbol.__t = 0;
+	            var animator = symbol.animate('', loop)
+	                .when(period, {
+	                    __t: 1
+	                })
+	                .delay(delay)
+	                .during(function () {
+	                    self.updateSymbolPosition(symbol);
+	                });
+	            if (!loop) {
+	                animator.done(function () {
+	                    self.remove(symbol);
+	                });
+	            }
+	            animator.start();
+	        }
+
+	        this._period = period;
+	        this._loop = loop;
+	    };
+
+	    effectLineProto.getLineLength = function (symbol) {
+	        // Not so accurate
+	        return (vec2.dist(symbol.__p1, symbol.__cp1)
+	            + vec2.dist(symbol.__cp1, symbol.__p2));
+	    };
+
+	    effectLineProto.updateAnimationPoints = function (symbol, points) {
+	        symbol.__p1 = points[0];
+	        symbol.__p2 = points[1];
+	        symbol.__cp1 = points[2] || [
+	            (points[0][0] + points[1][0]) / 2,
+	            (points[0][1] + points[1][1]) / 2
+	        ];
+	    };
+
+	    effectLineProto.updateData = function (lineData, idx, seriesScope) {
+	        this.childAt(0).updateData(lineData, idx, seriesScope);
+	        this._updateEffectSymbol(lineData, idx);
+	    };
+
+	    effectLineProto.updateSymbolPosition = function (symbol) {
+	        var p1 = symbol.__p1;
+	        var p2 = symbol.__p2;
+	        var cp1 = symbol.__cp1;
+	        var t = symbol.__t;
+	        var pos = symbol.position;
+	        var quadraticAt = curveUtil.quadraticAt;
+	        var quadraticDerivativeAt = curveUtil.quadraticDerivativeAt;
+	        pos[0] = quadraticAt(p1[0], cp1[0], p2[0], t);
+	        pos[1] = quadraticAt(p1[1], cp1[1], p2[1], t);
+
+	        // Tangent
+	        var tx = quadraticDerivativeAt(p1[0], cp1[0], p2[0], t);
+	        var ty = quadraticDerivativeAt(p1[1], cp1[1], p2[1], t);
+
+	        symbol.rotation = -Math.atan2(ty, tx) - Math.PI / 2;
+
+	        symbol.ignore = false;
+	    };
+
+
+	    effectLineProto.updateLayout = function (lineData, idx) {
+	        this.childAt(0).updateLayout(lineData, idx);
+
+	        var effectModel = lineData.getItemModel(idx).getModel('effect');
+	        this._updateEffectAnimation(lineData, effectModel, idx);
+	    };
+
+	    zrUtil.inherits(EffectLine, graphic.Group);
+
+	    module.exports = EffectLine;
+
+
+/***/ },
+/* 265 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @module echarts/chart/helper/Line
+	 */
+
+
+	    var graphic = __webpack_require__(43);
+	    var zrUtil = __webpack_require__(4);
+
+	    /**
+	     * @constructor
+	     * @extends {module:zrender/graphic/Group}
+	     * @alias {module:echarts/chart/helper/Polyline}
+	     */
+	    function Polyline(lineData, idx, seriesScope) {
+	        graphic.Group.call(this);
+
+	        this._createPolyline(lineData, idx, seriesScope);
+	    }
+
+	    var polylineProto = Polyline.prototype;
+
+	    polylineProto._createPolyline = function (lineData, idx, seriesScope) {
+	        // var seriesModel = lineData.hostModel;
+	        var points = lineData.getItemLayout(idx);
+
+	        var line = new graphic.Polyline({
+	            shape: {
+	                points: points
+	            }
+	        });
+
+	        this.add(line);
+
+	        this._updateCommonStl(lineData, idx, seriesScope);
+	    };
+
+	    polylineProto.updateData = function (lineData, idx, seriesScope) {
+	        var seriesModel = lineData.hostModel;
+
+	        var line = this.childAt(0);
+	        var target = {
+	            shape: {
+	                points: lineData.getItemLayout(idx)
+	            }
+	        };
+	        graphic.updateProps(line, target, seriesModel, idx);
+
+	        this._updateCommonStl(lineData, idx, seriesScope);
+	    };
+
+	    polylineProto._updateCommonStl = function (lineData, idx, seriesScope) {
+	        var line = this.childAt(0);
+	        var itemModel = lineData.getItemModel(idx);
+
+	        var visualColor = lineData.getItemVisual(idx, 'color');
+
+	        var lineStyle = seriesScope && seriesScope.lineStyle;
+	        var hoverLineStyle = seriesScope && seriesScope.hoverLineStyle;
+
+	        if (!seriesScope || lineData.hasItemOption) {
+	            lineStyle = itemModel.getModel('lineStyle.normal').getLineStyle();
+	            hoverLineStyle = itemModel.getModel('lineStyle.emphasis').getLineStyle();
+	        }
+	        line.useStyle(zrUtil.defaults(
+	            {
+	                strokeNoScale: true,
+	                fill: 'none',
+	                stroke: visualColor
+	            },
+	            lineStyle
+	        ));
+	        line.hoverStyle = hoverLineStyle;
+
+	        graphic.setHoverStyle(this);
+	    };
+
+	    polylineProto.updateLayout = function (lineData, idx) {
+	        var polyline = this.childAt(0);
+	        polyline.setShape('points', lineData.getItemLayout(idx));
+	    };
+
+	    zrUtil.inherits(Polyline, graphic.Group);
+
+	    module.exports = Polyline;
+
+
+/***/ },
+/* 266 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * Provide effect for line
+	 * @module echarts/chart/helper/EffectLine
+	 */
+
+
+	    var Polyline = __webpack_require__(265);
+	    var zrUtil = __webpack_require__(4);
+	    var EffectLine = __webpack_require__(264);
+	    var vec2 = __webpack_require__(10);
+
+	    /**
+	     * @constructor
+	     * @extends {module:echarts/chart/helper/EffectLine}
+	     * @alias {module:echarts/chart/helper/Polyline}
+	     */
+	    function EffectPolyline(lineData, idx, seriesScope) {
+	        EffectLine.call(this, lineData, idx, seriesScope);
+	        this._lastFrame = 0;
+	        this._lastFramePercent = 0;
+	    }
+
+	    var effectPolylineProto = EffectPolyline.prototype;
+
+	    // Overwrite
+	    effectPolylineProto.createLine = function (lineData, idx, seriesScope) {
+	        return new Polyline(lineData, idx, seriesScope);
+	    };
+
+	    // Overwrite
+	    effectPolylineProto.updateAnimationPoints = function (symbol, points) {
+	        this._points = points;
+	        var accLenArr = [0];
+	        var len = 0;
+	        for (var i = 1; i < points.length; i++) {
+	            var p1 = points[i - 1];
+	            var p2 = points[i];
+	            len += vec2.dist(p1, p2);
+	            accLenArr.push(len);
+	        }
+	        if (len === 0) {
+	            return;
+	        }
+
+	        for (var i = 0; i < accLenArr.length; i++) {
+	            accLenArr[i] /= len;
+	        }
+	        this._offsets = accLenArr;
+	        this._length = len;
+	    };
+
+	    // Overwrite
+	    effectPolylineProto.getLineLength = function (symbol) {
+	        return this._length;
+	    };
+
+	    // Overwrite
+	    effectPolylineProto.updateSymbolPosition = function (symbol) {
+	        var t = symbol.__t;
+	        var points = this._points;
+	        var offsets = this._offsets;
+	        var len = points.length;
+
+	        if (!offsets) {
+	            // Has length 0
+	            return;
+	        }
+
+	        var lastFrame = this._lastFrame;
+	        var frame;
+
+	        if (t < this._lastFramePercent) {
+	            // Start from the next frame
+	            // PENDING start from lastFrame ?
+	            var start = Math.min(lastFrame + 1, len - 1);
+	            for (frame = start; frame >= 0; frame--) {
+	                if (offsets[frame] <= t) {
+	                    break;
+	                }
+	            }
+	            // PENDING really need to do this ?
+	            frame = Math.min(frame, len - 2);
+	        }
+	        else {
+	            for (var frame = lastFrame; frame < len; frame++) {
+	                if (offsets[frame] > t) {
+	                    break;
+	                }
+	            }
+	            frame = Math.min(frame - 1, len - 2);
+	        }
+
+	        vec2.lerp(
+	            symbol.position, points[frame], points[frame + 1],
+	            (t - offsets[frame]) / (offsets[frame + 1] - offsets[frame])
+	        );
+
+	        this._lastFrame = frame;
+	        this._lastFramePercent = t;
+
+	        symbol.ignore = false;
+	    };
+
+	    zrUtil.inherits(EffectPolyline, EffectLine);
+
+	    module.exports = EffectPolyline;
+
+
+/***/ },
+/* 267 */
+/***/ function(module, exports, __webpack_require__) {
+
+	// TODO Batch by color
+
+
+
+	    var graphic = __webpack_require__(43);
+
+	    var quadraticContain = __webpack_require__(55);
+	    var lineContain = __webpack_require__(53);
+
+	    var LargeLineShape = graphic.extendShape({
+	        shape: {
+	            polyline: false,
+
+	            segs: []
+	        },
+
+	        buildPath: function (path, shape) {
+	            var segs = shape.segs;
+	            var isPolyline = shape.polyline;
+
+	            for (var i = 0; i < segs.length; i++) {
+	                var seg = segs[i];
+	                if (isPolyline) {
+	                    path.moveTo(seg[0][0], seg[0][1]);
+	                    for (var j = 1; j < seg.length; j++) {
+	                        path.lineTo(seg[j][0], seg[j][1]);
+	                    }
+	                }
+	                else {
+	                    path.moveTo(seg[0][0], seg[0][1]);
+	                    if (seg.length > 2) {
+	                        path.quadraticCurveTo(seg[2][0], seg[2][1], seg[1][0], seg[1][1]);
+	                    }
+	                    else {
+	                        path.lineTo(seg[1][0], seg[1][1]);
+	                    }
+	                }
+	            }
+	        },
+
+	        findDataIndex: function (x, y) {
+	            var shape = this.shape;
+	            var segs = shape.segs;
+	            var isPolyline = shape.polyline;
+	            var lineWidth = Math.max(this.style.lineWidth, 1);
+
+	            // Not consider transform
+	            for (var i = 0; i < segs.length; i++) {
+	                var seg = segs[i];
+	                if (isPolyline) {
+	                    for (var j = 1; j < seg.length; j++) {
+	                        if (lineContain.containStroke(
+	                            seg[j - 1][0], seg[j - 1][1], seg[j][0], seg[j][1], lineWidth, x, y
+	                        )) {
+	                            return i;
+	                        }
+	                    }
+	                }
+	                else {
+	                    if (seg.length > 2) {
+	                        if (quadraticContain.containStroke(
+	                            seg[0][0], seg[0][1], seg[2][0], seg[2][1], seg[1][0], seg[1][1], lineWidth, x, y
+	                        )) {
+	                            return i;
+	                        }
+	                    }
+	                    else {
+	                        if (lineContain.containStroke(
+	                            seg[0][0], seg[0][1], seg[1][0], seg[1][1], lineWidth, x, y
+	                        )) {
+	                            return i;
+	                        }
+	                    }
+	                }
+	            }
+
+	            return -1;
+	        }
+	    });
+
+	    function LargeLineDraw() {
+	        this.group = new graphic.Group();
+
+	        this._lineEl = new LargeLineShape();
+	    }
+
+	    var largeLineProto = LargeLineDraw.prototype;
+
+	    /**
+	     * Update symbols draw by new data
+	     * @param {module:echarts/data/List} data
+	     */
+	    largeLineProto.updateData = function (data) {
+	        this.group.removeAll();
+
+	        var lineEl = this._lineEl;
+
+	        var seriesModel = data.hostModel;
+
+	        lineEl.setShape({
+	            segs: data.mapArray(data.getItemLayout),
+	            polyline: seriesModel.get('polyline')
+	        });
+
+	        lineEl.useStyle(
+	            seriesModel.getModel('lineStyle.normal').getLineStyle()
+	        );
+
+	        var visualColor = data.getVisual('color');
+	        if (visualColor) {
+	            lineEl.setStyle('stroke', visualColor);
+	        }
+	        lineEl.setStyle('fill');
+
+	        // Enable tooltip
+	        // PENDING May have performance issue when path is extremely large
+	        lineEl.seriesIndex = seriesModel.seriesIndex;
+	        lineEl.on('mousemove', function (e) {
+	            lineEl.dataIndex = null;
+	            var dataIndex = lineEl.findDataIndex(e.offsetX, e.offsetY);
+	            if (dataIndex > 0) {
+	                // Provide dataIndex for tooltip
+	                lineEl.dataIndex = dataIndex;
+	            }
+	        });
+
+	        // Add back
+	        this.group.add(lineEl);
+	    };
+
+	    largeLineProto.updateLayout = function (seriesModel) {
+	        var data = seriesModel.getData();
+	        this._lineEl.setShape({
+	            segs: data.mapArray(data.getItemLayout)
+	        });
+	    };
+
+	    largeLineProto.remove = function () {
+	        this.group.removeAll();
+	    };
+
+	    module.exports = LargeLineDraw;
+
+
+/***/ },
+/* 268 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    module.exports = function (ecModel) {
+	        ecModel.eachSeriesByType('lines', function (seriesModel) {
+	            var coordSys = seriesModel.coordinateSystem;
+	            var lineData = seriesModel.getData();
+
+	            // FIXME Use data dimensions ?
+	            lineData.each(function (idx) {
+	                var itemModel = lineData.getItemModel(idx);
+	                // TODO Support pure array
+	                var coords = (itemModel.option instanceof Array) ?
+	                    itemModel.option : itemModel.get('coords');
+
+	                if (true) {
+	                    if (!(coords instanceof Array && coords.length > 0 && coords[0] instanceof Array)) {
+	                        throw new Error('Invalid coords ' + JSON.stringify(coords) + '. Lines must have 2d coords array in data item.');
+	                    }
+	                }
+	                var pts = [];
+
+	                if (seriesModel.get('polyline')) {
+	                    for (var i = 0; i < coords.length; i++) {
+	                        pts.push(coordSys.dataToPoint(coords[i]));
+	                    }
+	                }
+	                else {
+	                    pts[0] = coordSys.dataToPoint(coords[0]);
+	                    pts[1] = coordSys.dataToPoint(coords[1]);
+
+	                    var curveness = itemModel.get('lineStyle.normal.curveness');
+	                    if (curveness > 0) {
+	                        pts[2] = [
+	                            (pts[0][0] + pts[1][0]) / 2 - (pts[0][1] - pts[1][1]) * curveness,
+	                            (pts[0][1] + pts[1][1]) / 2 - (pts[1][0] - pts[0][0]) * curveness
+	                        ];
+	                    }
+	                }
+	                lineData.setItemLayout(idx, pts);
+	            });
+	        });
+	    };
+
+
+/***/ },
+/* 269 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    __webpack_require__(270);
+	    __webpack_require__(271);
+
+
+/***/ },
+/* 270 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var SeriesModel = __webpack_require__(28);
+	    var createListFromArray = __webpack_require__(101);
+
+	    module.exports = SeriesModel.extend({
+	        type: 'series.heatmap',
+
+	        getInitialData: function (option, ecModel) {
+	            return createListFromArray(option.data, this, ecModel);
+	        },
+
+	        defaultOption: {
+
+	            // Cartesian2D or geo
+	            coordinateSystem: 'cartesian2d',
+
+	            zlevel: 0,
+
+	            z: 2,
+
+	            // Cartesian coordinate system
+	            xAxisIndex: 0,
+	            yAxisIndex: 0,
+
+	            // Geo coordinate system
+	            geoIndex: 0,
+
+	            blurSize: 30,
+
+	            pointSize: 20,
+
+	            maxOpacity: 1,
+
+	            minOpacity: 0
+	        }
+	    });
+
+
+/***/ },
+/* 271 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var graphic = __webpack_require__(43);
+	    var HeatmapLayer = __webpack_require__(272);
+	    var zrUtil = __webpack_require__(4);
+
+	    function getIsInPiecewiseRange(dataExtent, pieceList, selected) {
+	        var dataSpan = dataExtent[1] - dataExtent[0];
+	        pieceList = zrUtil.map(pieceList, function (piece) {
+	            return {
+	                interval: [
+	                    (piece.interval[0] - dataExtent[0]) / dataSpan,
+	                    (piece.interval[1] - dataExtent[0]) / dataSpan
+	                ]
+	            };
+	        });
+	        var len = pieceList.length;
+	        var lastIndex = 0;
+	        return function (val) {
+	            // Try to find in the location of the last found
+	            for (var i = lastIndex; i < len; i++) {
+	                var interval = pieceList[i].interval;
+	                if (interval[0] <= val && val <= interval[1]) {
+	                    lastIndex = i;
+	                    break;
+	                }
+	            }
+	            if (i === len) { // Not found, back interation
+	                for (var i = lastIndex - 1; i >= 0; i--) {
+	                    var interval = pieceList[i].interval;
+	                    if (interval[0] <= val && val <= interval[1]) {
+	                        lastIndex = i;
+	                        break;
+	                    }
+	                }
+	            }
+	            return i >= 0 && i < len && selected[i];
+	        };
+	    }
+
+	    function getIsInContinuousRange(dataExtent, range) {
+	        var dataSpan = dataExtent[1] - dataExtent[0];
+	        range = [
+	            (range[0] - dataExtent[0]) / dataSpan,
+	            (range[1] - dataExtent[0]) / dataSpan
+	        ];
+	        return function (val) {
+	            return val >= range[0] && val <= range[1];
+	        };
+	    }
+
+	    function isGeoCoordSys(coordSys) {
+	        var dimensions = coordSys.dimensions;
+	        // Not use coorSys.type === 'geo' because coordSys maybe extended
+	        return dimensions[0] === 'lng' && dimensions[1] === 'lat';
+	    }
+
+	    module.exports = __webpack_require__(1).extendChartView({
+
+	        type: 'heatmap',
+
+	        render: function (seriesModel, ecModel, api) {
+	            var visualMapOfThisSeries;
+	            ecModel.eachComponent('visualMap', function (visualMap) {
+	                visualMap.eachTargetSeries(function (targetSeries) {
+	                    if (targetSeries === seriesModel) {
+	                        visualMapOfThisSeries = visualMap;
+	                    }
+	                });
+	            });
+
+	            if (true) {
+	                if (!visualMapOfThisSeries) {
+	                    throw new Error('Heatmap must use with visualMap');
+	                }
+	            }
+
+	            this.group.removeAll();
+	            var coordSys = seriesModel.coordinateSystem;
+	            if (coordSys.type === 'cartesian2d') {
+	                this._renderOnCartesian(coordSys, seriesModel, api);
+	            }
+	            else if (isGeoCoordSys(coordSys)) {
+	                this._renderOnGeo(
+	                    coordSys, seriesModel, visualMapOfThisSeries, api
+	                );
+	            }
+	        },
+
+	        _renderOnCartesian: function (cartesian, seriesModel, api) {
+	            var xAxis = cartesian.getAxis('x');
+	            var yAxis = cartesian.getAxis('y');
+	            var group = this.group;
+
+	            if (true) {
+	                if (!(xAxis.type === 'category' && yAxis.type === 'category')) {
+	                    throw new Error('Heatmap on cartesian must have two category axes');
+	                }
+	                if (!(xAxis.onBand && yAxis.onBand)) {
+	                    throw new Error('Heatmap on cartesian must have two axes with boundaryGap true');
+	                }
+	            }
+
+	            var width = xAxis.getBandWidth();
+	            var height = yAxis.getBandWidth();
+
+	            var data = seriesModel.getData();
+
+	            var itemStyleQuery = 'itemStyle.normal';
+	            var hoverItemStyleQuery = 'itemStyle.emphasis';
+	            var labelQuery = 'label.normal';
+	            var hoverLabelQuery = 'label.emphasis';
+	            var style = seriesModel.getModel(itemStyleQuery).getItemStyle(['color']);
+	            var hoverStl = seriesModel.getModel(hoverItemStyleQuery).getItemStyle();
+	            var labelModel = seriesModel.getModel('label.normal');
+	            var hoverLabelModel = seriesModel.getModel('label.emphasis');
+
+	            data.each(['x', 'y', 'z'], function (x, y, z, idx) {
+	                var itemModel = data.getItemModel(idx);
+	                var point = cartesian.dataToPoint([x, y]);
+	                // Ignore empty data
+	                if (isNaN(z)) {
+	                    return;
+	                }
+	                var rect = new graphic.Rect({
+	                    shape: {
+	                        x: point[0] - width / 2,
+	                        y: point[1] - height / 2,
+	                        width: width,
+	                        height: height
+	                    },
+	                    style: {
+	                        fill: data.getItemVisual(idx, 'color'),
+	                        opacity: data.getItemVisual(idx, 'opacity')
+	                    }
+	                });
+	                // Optimization for large datset
+	                if (data.hasItemOption) {
+	                    style = itemModel.getModel(itemStyleQuery).getItemStyle(['color']);
+	                    hoverStl = itemModel.getModel(hoverItemStyleQuery).getItemStyle();
+	                    labelModel = itemModel.getModel(labelQuery);
+	                    hoverLabelModel = itemModel.getModel(hoverLabelQuery);
+	                }
+
+	                var rawValue = seriesModel.getRawValue(idx);
+	                var defaultText = '-';
+	                if (rawValue && rawValue[2] != null) {
+	                    defaultText = rawValue[2];
+	                }
+	                if (labelModel.getShallow('show')) {
+	                    graphic.setText(style, labelModel);
+	                    style.text = seriesModel.getFormattedLabel(idx, 'normal') || defaultText;
+	                }
+	                if (hoverLabelModel.getShallow('show')) {
+	                    graphic.setText(hoverStl, hoverLabelModel);
+	                    hoverStl.text = seriesModel.getFormattedLabel(idx, 'emphasis') || defaultText;
+	                }
+
+	                rect.setStyle(style);
+
+	                graphic.setHoverStyle(rect, data.hasItemOption ? hoverStl : zrUtil.extend({}, hoverStl));
+
+	                group.add(rect);
+	                data.setItemGraphicEl(idx, rect);
+	            });
+	        },
+
+	        _renderOnGeo: function (geo, seriesModel, visualMapModel, api) {
+	            var inRangeVisuals = visualMapModel.targetVisuals.inRange;
+	            var outOfRangeVisuals = visualMapModel.targetVisuals.outOfRange;
+	            // if (!visualMapping) {
+	            //     throw new Error('Data range must have color visuals');
+	            // }
+
+	            var data = seriesModel.getData();
+	            var hmLayer = this._hmLayer || (this._hmLayer || new HeatmapLayer());
+	            hmLayer.blurSize = seriesModel.get('blurSize');
+	            hmLayer.pointSize = seriesModel.get('pointSize');
+	            hmLayer.minOpacity = seriesModel.get('minOpacity');
+	            hmLayer.maxOpacity = seriesModel.get('maxOpacity');
+
+	            var rect = geo.getViewRect().clone();
+	            var roamTransform = geo.getRoamTransform().transform;
+	            rect.applyTransform(roamTransform);
+
+	            // Clamp on viewport
+	            var x = Math.max(rect.x, 0);
+	            var y = Math.max(rect.y, 0);
+	            var x2 = Math.min(rect.width + rect.x, api.getWidth());
+	            var y2 = Math.min(rect.height + rect.y, api.getHeight());
+	            var width = x2 - x;
+	            var height = y2 - y;
+
+	            var points = data.mapArray(['lng', 'lat', 'value'], function (lng, lat, value) {
+	                var pt = geo.dataToPoint([lng, lat]);
+	                pt[0] -= x;
+	                pt[1] -= y;
+	                pt.push(value);
+	                return pt;
+	            });
+
+	            var dataExtent = visualMapModel.getExtent();
+	            var isInRange = visualMapModel.type === 'visualMap.continuous'
+	                ? getIsInContinuousRange(dataExtent, visualMapModel.option.range)
+	                : getIsInPiecewiseRange(
+	                    dataExtent, visualMapModel.getPieceList(), visualMapModel.option.selected
+	                );
+
+	            hmLayer.update(
+	                points, width, height,
+	                inRangeVisuals.color.getNormalizer(),
+	                {
+	                    inRange: inRangeVisuals.color.getColorMapper(),
+	                    outOfRange: outOfRangeVisuals.color.getColorMapper()
+	                },
+	                isInRange
+	            );
+	            var img = new graphic.Image({
+	                style: {
+	                    width: width,
+	                    height: height,
+	                    x: x,
+	                    y: y,
+	                    image: hmLayer.canvas
+	                },
+	                silent: true
+	            });
+	            this.group.add(img);
+	        }
+	    });
+
+
+/***/ },
+/* 272 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @file defines echarts Heatmap Chart
+	 * @author Ovilia (me@zhangwenli.com)
+	 * Inspired by https://github.com/mourner/simpleheat
+	 *
+	 * @module
+	 */
+
+
+	    var GRADIENT_LEVELS = 256;
+	    var zrUtil = __webpack_require__(4);
+
+	    /**
+	     * Heatmap Chart
+	     *
+	     * @class
+	     */
+	    function Heatmap() {
+	        var canvas = zrUtil.createCanvas();
+	        this.canvas = canvas;
+
+	        this.blurSize = 30;
+	        this.pointSize = 20;
+
+	        this.maxOpacity = 1;
+	        this.minOpacity = 0;
+
+	        this._gradientPixels = {};
+	    }
+
+	    Heatmap.prototype = {
+	        /**
+	         * Renders Heatmap and returns the rendered canvas
+	         * @param {Array} data array of data, each has x, y, value
+	         * @param {number} width canvas width
+	         * @param {number} height canvas height
+	         */
+	        update: function(data, width, height, normalize, colorFunc, isInRange) {
+	            var brush = this._getBrush();
+	            var gradientInRange = this._getGradient(data, colorFunc, 'inRange');
+	            var gradientOutOfRange = this._getGradient(data, colorFunc, 'outOfRange');
+	            var r = this.pointSize + this.blurSize;
+
+	            var canvas = this.canvas;
+	            var ctx = canvas.getContext('2d');
+	            var len = data.length;
+	            canvas.width = width;
+	            canvas.height = height;
+	            for (var i = 0; i < len; ++i) {
+	                var p = data[i];
+	                var x = p[0];
+	                var y = p[1];
+	                var value = p[2];
+
+	                // calculate alpha using value
+	                var alpha = normalize(value);
+
+	                // draw with the circle brush with alpha
+	                ctx.globalAlpha = alpha;
+	                ctx.drawImage(brush, x - r, y - r);
+	            }
+
+	            // colorize the canvas using alpha value and set with gradient
+	            var imageData = ctx.getImageData(0, 0, canvas.width, canvas.height);
+	            var pixels = imageData.data;
+	            var offset = 0;
+	            var pixelLen = pixels.length;
+	            var minOpacity = this.minOpacity;
+	            var maxOpacity = this.maxOpacity;
+	            var diffOpacity = maxOpacity - minOpacity;
+
+	            while(offset < pixelLen) {
+	                var alpha = pixels[offset + 3] / 256;
+	                var gradientOffset = Math.floor(alpha * (GRADIENT_LEVELS - 1)) * 4;
+	                // Simple optimize to ignore the empty data
+	                if (alpha > 0) {
+	                    var gradient = isInRange(alpha) ? gradientInRange : gradientOutOfRange;
+	                    // Any alpha > 0 will be mapped to [minOpacity, maxOpacity]
+	                    alpha > 0 && (alpha = alpha * diffOpacity + minOpacity);
+	                    pixels[offset++] = gradient[gradientOffset];
+	                    pixels[offset++] = gradient[gradientOffset + 1];
+	                    pixels[offset++] = gradient[gradientOffset + 2];
+	                    pixels[offset++] = gradient[gradientOffset + 3] * alpha * 256;
+	                }
+	                else {
+	                    offset += 4;
+	                }
+	            }
+	            ctx.putImageData(imageData, 0, 0);
+
+	            return canvas;
+	        },
+
+	        /**
+	         * get canvas of a black circle brush used for canvas to draw later
+	         * @private
+	         * @returns {Object} circle brush canvas
+	         */
+	        _getBrush: function() {
+	            var brushCanvas = this._brushCanvas || (this._brushCanvas = zrUtil.createCanvas());
+	            // set brush size
+	            var r = this.pointSize + this.blurSize;
+	            var d = r * 2;
+	            brushCanvas.width = d;
+	            brushCanvas.height = d;
+
+	            var ctx = brushCanvas.getContext('2d');
+	            ctx.clearRect(0, 0, d, d);
+
+	            // in order to render shadow without the distinct circle,
+	            // draw the distinct circle in an invisible place,
+	            // and use shadowOffset to draw shadow in the center of the canvas
+	            ctx.shadowOffsetX = d;
+	            ctx.shadowBlur = this.blurSize;
+	            // draw the shadow in black, and use alpha and shadow blur to generate
+	            // color in color map
+	            ctx.shadowColor = '#000';
+
+	            // draw circle in the left to the canvas
+	            ctx.beginPath();
+	            ctx.arc(-r, r, this.pointSize, 0, Math.PI * 2, true);
+	            ctx.closePath();
+	            ctx.fill();
+	            return brushCanvas;
+	        },
+
+	        /**
+	         * get gradient color map
+	         * @private
+	         */
+	        _getGradient: function (data, colorFunc, state) {
+	            var gradientPixels = this._gradientPixels;
+	            var pixelsSingleState = gradientPixels[state] || (gradientPixels[state] = new Uint8ClampedArray(256 * 4));
+	            var color = [];
+	            var off = 0;
+	            for (var i = 0; i < 256; i++) {
+	                colorFunc[state](i / 255, true, color);
+	                pixelsSingleState[off++] = color[0];
+	                pixelsSingleState[off++] = color[1];
+	                pixelsSingleState[off++] = color[2];
+	                pixelsSingleState[off++] = color[3];
+	            }
+	            return pixelsSingleState;
+	        }
+	    };
+
+	    module.exports = Heatmap;
+
+
+
+/***/ },
+/* 273 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * Legend component entry file8
+	 */
+
+
+	    __webpack_require__(274);
+	    __webpack_require__(275);
+	    __webpack_require__(276);
+
+	    var echarts = __webpack_require__(1);
+	    // Series Filter
+	    echarts.registerProcessor(__webpack_require__(278));
+
+
+/***/ },
+/* 274 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var Model = __webpack_require__(12);
+
+	    var LegendModel = __webpack_require__(1).extendComponentModel({
+
+	        type: 'legend',
+
+	        dependencies: ['series'],
+
+	        layoutMode: {
+	            type: 'box',
+	            ignoreSize: true
+	        },
+
+	        init: function (option, parentModel, ecModel) {
+	            this.mergeDefaultAndTheme(option, ecModel);
+
+	            option.selected = option.selected || {};
+	        },
+
+	        mergeOption: function (option) {
+	            LegendModel.superCall(this, 'mergeOption', option);
+	        },
+
+	        optionUpdated: function () {
+	            this._updateData(this.ecModel);
+
+	            var legendData = this._data;
+
+	            // If selectedMode is single, try to select one
+	            if (legendData[0] && this.get('selectedMode') === 'single') {
+	                var hasSelected = false;
+	                // If has any selected in option.selected
+	                for (var i = 0; i < legendData.length; i++) {
+	                    var name = legendData[i].get('name');
+	                    if (this.isSelected(name)) {
+	                        // Force to unselect others
+	                        this.select(name);
+	                        hasSelected = true;
+	                        break;
+	                    }
+	                }
+	                // Try select the first if selectedMode is single
+	                !hasSelected && this.select(legendData[0].get('name'));
+	            }
+	        },
+
+	        _updateData: function (ecModel) {
+	            var legendData = zrUtil.map(this.get('data') || [], function (dataItem) {
+	                // Can be string or number
+	                if (typeof dataItem === 'string' || typeof dataItem === 'number') {
+	                    dataItem = {
+	                        name: dataItem
+	                    };
+	                }
+	                return new Model(dataItem, this, this.ecModel);
+	            }, this);
+	            this._data = legendData;
+
+	            var availableNames = zrUtil.map(ecModel.getSeries(), function (series) {
+	                return series.name;
+	            });
+	            ecModel.eachSeries(function (seriesModel) {
+	                if (seriesModel.legendDataProvider) {
+	                    var data = seriesModel.legendDataProvider();
+	                    availableNames = availableNames.concat(data.mapArray(data.getName));
+	                }
+	            });
+	            /**
+	             * @type {Array.<string>}
+	             * @private
+	             */
+	            this._availableNames = availableNames;
+	        },
+
+	        /**
+	         * @return {Array.<module:echarts/model/Model>}
+	         */
+	        getData: function () {
+	            return this._data;
+	        },
+
+	        /**
+	         * @param {string} name
+	         */
+	        select: function (name) {
+	            var selected = this.option.selected;
+	            var selectedMode = this.get('selectedMode');
+	            if (selectedMode === 'single') {
+	                var data = this._data;
+	                zrUtil.each(data, function (dataItem) {
+	                    selected[dataItem.get('name')] = false;
+	                });
+	            }
+	            selected[name] = true;
+	        },
+
+	        /**
+	         * @param {string} name
+	         */
+	        unSelect: function (name) {
+	            if (this.get('selectedMode') !== 'single') {
+	                this.option.selected[name] = false;
+	            }
+	        },
+
+	        /**
+	         * @param {string} name
+	         */
+	        toggleSelected: function (name) {
+	            var selected = this.option.selected;
+	            // Default is true
+	            if (!(name in selected)) {
+	                selected[name] = true;
+	            }
+	            this[selected[name] ? 'unSelect' : 'select'](name);
+	        },
+
+	        /**
+	         * @param {string} name
+	         */
+	        isSelected: function (name) {
+	            var selected = this.option.selected;
+	            return !((name in selected) && !selected[name])
+	                && zrUtil.indexOf(this._availableNames, name) >= 0;
+	        },
+
+	        defaultOption: {
+	            // 一级层叠
+	            zlevel: 0,
+	            // 二级层叠
+	            z: 4,
+	            show: true,
+
+	            // 布局方式，默认为水平布局，可选为：
+	            // 'horizontal' | 'vertical'
+	            orient: 'horizontal',
+
+	            left: 'center',
+	            // right: 'center',
+
+	            top: 'top',
+	            // bottom: 'top',
+
+	            // 水平对齐
+	            // 'auto' | 'left' | 'right'
+	            // 默认为 'auto', 根据 x 的位置判断是左对齐还是右对齐
+	            align: 'auto',
+
+	            backgroundColor: 'rgba(0,0,0,0)',
+	            // 图例边框颜色
+	            borderColor: '#ccc',
+	            // 图例边框线宽，单位px，默认为0（无边框）
+	            borderWidth: 0,
+	            // 图例内边距，单位px，默认各方向内边距为5，
+	            // 接受数组分别设定上右下左边距，同css
+	            padding: 5,
+	            // 各个item之间的间隔，单位px，默认为10，
+	            // 横向布局时为水平间隔，纵向布局时为纵向间隔
+	            itemGap: 10,
+	            // 图例图形宽度
+	            itemWidth: 25,
+	            // 图例图形高度
+	            itemHeight: 14,
+
+	            // 图例关闭时候的颜色
+	            inactiveColor: '#ccc',
+
+	            textStyle: {
+	                // 图例文字颜色
+	                color: '#333'
+	            },
+	            // formatter: '',
+	            // 选择模式，默认开启图例开关
+	            selectedMode: true,
+	            // 配置默认选中状态，可配合LEGEND.SELECTED事件做动态数据载入
+	            // selected: null,
+	            // 图例内容（详见legend.data，数组中每一项代表一个item
+	            // data: [],
+
+	            // Tooltip 相关配置
+	            tooltip: {
+	                show: false
+	            }
+	        }
+	    });
+
+	    module.exports = LegendModel;
+
+
+/***/ },
+/* 275 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @file Legend action
+	 */
+
+
+	    var echarts = __webpack_require__(1);
+	    var zrUtil = __webpack_require__(4);
+
+	    function legendSelectActionHandler(methodName, payload, ecModel) {
+	        var selectedMap = {};
+	        var isToggleSelect = methodName === 'toggleSelected';
+	        var isSelected;
+	        // Update all legend components
+	        ecModel.eachComponent('legend', function (legendModel) {
+	            if (isToggleSelect && isSelected != null) {
+	                // Force other legend has same selected status
+	                // Or the first is toggled to true and other are toggled to false
+	                // In the case one legend has some item unSelected in option. And if other legend
+	                // doesn't has the item, they will assume it is selected.
+	                legendModel[isSelected ? 'select' : 'unSelect'](payload.name);
+	            }
+	            else {
+	                legendModel[methodName](payload.name);
+	                isSelected = legendModel.isSelected(payload.name);
+	            }
+	            var legendData = legendModel.getData();
+	            zrUtil.each(legendData, function (model) {
+	                var name = model.get('name');
+	                // Wrap element
+	                if (name === '\n' || name === '') {
+	                    return;
+	                }
+	                var isItemSelected = legendModel.isSelected(name);
+	                if (name in selectedMap) {
+	                    // Unselected if any legend is unselected
+	                    selectedMap[name] = selectedMap[name] && isItemSelected;
+	                }
+	                else {
+	                    selectedMap[name] = isItemSelected;
+	                }
+	            });
+	        });
+	        // Return the event explicitly
+	        return {
+	            name: payload.name,
+	            selected: selectedMap
+	        };
+	    }
+	    /**
+	     * @event legendToggleSelect
+	     * @type {Object}
+	     * @property {string} type 'legendToggleSelect'
+	     * @property {string} [from]
+	     * @property {string} name Series name or data item name
+	     */
+	    echarts.registerAction(
+	        'legendToggleSelect', 'legendselectchanged',
+	        zrUtil.curry(legendSelectActionHandler, 'toggleSelected')
+	    );
+
+	    /**
+	     * @event legendSelect
+	     * @type {Object}
+	     * @property {string} type 'legendSelect'
+	     * @property {string} name Series name or data item name
+	     */
+	    echarts.registerAction(
+	        'legendSelect', 'legendselected',
+	        zrUtil.curry(legendSelectActionHandler, 'select')
+	    );
+
+	    /**
+	     * @event legendUnSelect
+	     * @type {Object}
+	     * @property {string} type 'legendUnSelect'
+	     * @property {string} name Series name or data item name
+	     */
+	    echarts.registerAction(
+	        'legendUnSelect', 'legendunselected',
+	        zrUtil.curry(legendSelectActionHandler, 'unSelect')
+	    );
+
+
+/***/ },
+/* 276 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+	    var symbolCreator = __webpack_require__(106);
+	    var graphic = __webpack_require__(43);
+	    var listComponentHelper = __webpack_require__(277);
+
+	    var curry = zrUtil.curry;
+
+	    function dispatchSelectAction(name, api) {
+	        api.dispatchAction({
+	            type: 'legendToggleSelect',
+	            name: name
+	        });
+	    }
+
+	    function dispatchHighlightAction(seriesModel, dataName, api) {
+	        // If element hover will move to a hoverLayer.
+	        var el = api.getZr().storage.getDisplayList()[0];
+	        if (!(el && el.useHoverLayer)) {
+	            seriesModel.get('legendHoverLink') && api.dispatchAction({
+	                type: 'highlight',
+	                seriesName: seriesModel.name,
+	                name: dataName
+	            });
+	        }
+	    }
+
+	    function dispatchDownplayAction(seriesModel, dataName, api) {
+	        // If element hover will move to a hoverLayer.
+	        var el = api.getZr().storage.getDisplayList()[0];
+	        if (!(el && el.useHoverLayer)) {
+	            seriesModel.get('legendHoverLink') && api.dispatchAction({
+	                type: 'downplay',
+	                seriesName: seriesModel.name,
+	                name: dataName
+	            });
+	        }
+	    }
+
+	    module.exports = __webpack_require__(1).extendComponentView({
+
+	        type: 'legend',
+
+	        init: function () {
+	            this._symbolTypeStore = {};
+	        },
+
+	        render: function (legendModel, ecModel, api) {
+	            var group = this.group;
+	            group.removeAll();
+
+	            if (!legendModel.get('show')) {
+	                return;
+	            }
+
+	            var selectMode = legendModel.get('selectedMode');
+	            var itemAlign = legendModel.get('align');
+
+	            if (itemAlign === 'auto') {
+	                itemAlign = (legendModel.get('left') === 'right'
+	                    && legendModel.get('orient') === 'vertical')
+	                    ? 'right' : 'left';
+	            }
+
+	            var legendDrawedMap = {};
+
+	            zrUtil.each(legendModel.getData(), function (itemModel) {
+	                var name = itemModel.get('name');
+
+	                // Use empty string or \n as a newline string
+	                if (name === '' || name === '\n') {
+	                    group.add(new graphic.Group({
+	                        newline: true
+	                    }));
+	                    return;
+	                }
+
+	                var seriesModel = ecModel.getSeriesByName(name)[0];
+
+	                if (legendDrawedMap[name]) {
+	                    // Have been drawed
+	                    return;
+	                }
+
+	                // Series legend
+	                if (seriesModel) {
+	                    var data = seriesModel.getData();
+	                    var color = data.getVisual('color');
+
+	                    // If color is a callback function
+	                    if (typeof color === 'function') {
+	                        // Use the first data
+	                        color = color(seriesModel.getDataParams(0));
+	                    }
+
+	                    // Using rect symbol defaultly
+	                    var legendSymbolType = data.getVisual('legendSymbol') || 'roundRect';
+	                    var symbolType = data.getVisual('symbol');
+
+	                    var itemGroup = this._createItem(
+	                        name, itemModel, legendModel,
+	                        legendSymbolType, symbolType,
+	                        itemAlign, color,
+	                        selectMode
+	                    );
+
+	                    itemGroup.on('click', curry(dispatchSelectAction, name, api))
+	                        .on('mouseover', curry(dispatchHighlightAction, seriesModel, '', api))
+	                        .on('mouseout', curry(dispatchDownplayAction, seriesModel, '', api));
+
+	                    legendDrawedMap[name] = true;
+	                }
+	                else {
+	                    // Data legend of pie, funnel
+	                    ecModel.eachRawSeries(function (seriesModel) {
+	                        // In case multiple series has same data name
+	                        if (legendDrawedMap[name]) {
+	                            return;
+	                        }
+	                        if (seriesModel.legendDataProvider) {
+	                            var data = seriesModel.legendDataProvider();
+	                            var idx = data.indexOfName(name);
+	                            if (idx < 0) {
+	                                return;
+	                            }
+
+	                            var color = data.getItemVisual(idx, 'color');
+
+	                            var legendSymbolType = 'roundRect';
+
+	                            var itemGroup = this._createItem(
+	                                name, itemModel, legendModel,
+	                                legendSymbolType, null,
+	                                itemAlign, color,
+	                                selectMode
+	                            );
+
+	                            itemGroup.on('click', curry(dispatchSelectAction, name, api))
+	                                // FIXME Should not specify the series name
+	                                .on('mouseover', curry(dispatchHighlightAction, seriesModel, name, api))
+	                                .on('mouseout', curry(dispatchDownplayAction, seriesModel, name, api));
+
+	                            legendDrawedMap[name] = true;
+	                        }
+	                    }, this);
+	                }
+
+	                if (true) {
+	                    if (!legendDrawedMap[name]) {
+	                        console.warn(name + ' series not exists. Legend data should be same with series name or data name.');
+	                    }
+	                }
+	            }, this);
+
+	            listComponentHelper.layout(group, legendModel, api);
+	            // Render background after group is layout
+	            // FIXME
+	            listComponentHelper.addBackground(group, legendModel);
+	        },
+
+	        _createItem: function (
+	            name, itemModel, legendModel,
+	            legendSymbolType, symbolType,
+	            itemAlign, color, selectMode
+	        ) {
+	            var itemWidth = legendModel.get('itemWidth');
+	            var itemHeight = legendModel.get('itemHeight');
+	            var inactiveColor = legendModel.get('inactiveColor');
+
+	            var isSelected = legendModel.isSelected(name);
+	            var itemGroup = new graphic.Group();
+
+	            var textStyleModel = itemModel.getModel('textStyle');
+
+	            var itemIcon = itemModel.get('icon');
+
+	            var tooltipModel = itemModel.getModel('tooltip');
+
+	            // Use user given icon first
+	            legendSymbolType = itemIcon || legendSymbolType;
+	            itemGroup.add(symbolCreator.createSymbol(
+	                legendSymbolType, 0, 0, itemWidth, itemHeight, isSelected ? color : inactiveColor
+	            ));
+
+	            // Compose symbols
+	            // PENDING
+	            if (!itemIcon && symbolType
+	                // At least show one symbol, can't be all none
+	                && ((symbolType !== legendSymbolType) || symbolType == 'none')
+	            ) {
+	                var size = itemHeight * 0.8;
+	                if (symbolType === 'none') {
+	                    symbolType = 'circle';
+	                }
+	                // Put symbol in the center
+	                itemGroup.add(symbolCreator.createSymbol(
+	                    symbolType, (itemWidth - size) / 2, (itemHeight - size) / 2, size, size,
+	                    isSelected ? color : inactiveColor
+	                ));
+	            }
+
+	            // Text
+	            var textX = itemAlign === 'left' ? itemWidth + 5 : -5;
+	            var textAlign = itemAlign;
+
+	            var formatter = legendModel.get('formatter');
+	            var content = name;
+	            if (typeof formatter === 'string' && formatter) {
+	                content = formatter.replace('{name}', name);
+	            }
+	            else if (typeof formatter === 'function') {
+	                content = formatter(name);
+	            }
+
+	            var text = new graphic.Text({
+	                style: {
+	                    text: content,
+	                    x: textX,
+	                    y: itemHeight / 2,
+	                    fill: isSelected ? textStyleModel.getTextColor() : inactiveColor,
+	                    textFont: textStyleModel.getFont(),
+	                    textAlign: textAlign,
+	                    textVerticalAlign: 'middle'
+	                }
+	            });
+	            itemGroup.add(text);
+
+	            // Add a invisible rect to increase the area of mouse hover
+	            var hitRect = new graphic.Rect({
+	                shape: itemGroup.getBoundingRect(),
+	                invisible: true,
+	                tooltip: tooltipModel.get('show') ? zrUtil.extend({
+	                    content: name,
+	                    // Defaul formatter
+	                    formatter: function () {
+	                        return name;
+	                    },
+	                    formatterParams: {
+	                        componentType: 'legend',
+	                        legendIndex: legendModel.componentIndex,
+	                        name: name,
+	                        $vars: ['name']
+	                    }
+	                }, tooltipModel.option) : null
+	            });
+	            itemGroup.add(hitRect);
+
+	            itemGroup.eachChild(function (child) {
+	                child.silent = true;
+	            });
+
+	            hitRect.silent = !selectMode;
+
+
+
+	            this.group.add(itemGroup);
+
+	            graphic.setHoverStyle(itemGroup);
+
+	            return itemGroup;
+	        }
+	    });
+
+
+/***/ },
+/* 277 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+	    // List layout
+	    var layout = __webpack_require__(21);
+	    var formatUtil = __webpack_require__(6);
+	    var graphic = __webpack_require__(43);
+
+	    function positionGroup(group, model, api) {
+	        layout.positionGroup(
+	            group, model.getBoxLayoutParams(),
+	            {
+	                width: api.getWidth(),
+	                height: api.getHeight()
+	            },
+	            model.get('padding')
+	        );
+	    }
+
+	    module.exports = {
+	        /**
+	         * Layout list like component.
+	         * It will box layout each items in group of component and then position the whole group in the viewport
+	         * @param {module:zrender/group/Group} group
+	         * @param {module:echarts/model/Component} componentModel
+	         * @param {module:echarts/ExtensionAPI}
+	         */
+	        layout: function (group, componentModel, api) {
+	            var rect = layout.getLayoutRect(componentModel.getBoxLayoutParams(), {
+	                width: api.getWidth(),
+	                height: api.getHeight()
+	            }, componentModel.get('padding'));
+	            layout.box(
+	                componentModel.get('orient'),
+	                group,
+	                componentModel.get('itemGap'),
+	                rect.width,
+	                rect.height
+	            );
+
+	            positionGroup(group, componentModel, api);
+	        },
+
+	        addBackground: function (group, componentModel) {
+	            var padding = formatUtil.normalizeCssArray(
+	                componentModel.get('padding')
+	            );
+	            var boundingRect = group.getBoundingRect();
+	            var style = componentModel.getItemStyle(['color', 'opacity']);
+	            style.fill = componentModel.get('backgroundColor');
+	            var rect = new graphic.Rect({
+	                shape: {
+	                    x: boundingRect.x - padding[3],
+	                    y: boundingRect.y - padding[0],
+	                    width: boundingRect.width + padding[1] + padding[3],
+	                    height: boundingRect.height + padding[0] + padding[2]
+	                },
+	                style: style,
+	                silent: true,
+	                z2: -1
+	            });
+	            graphic.subPixelOptimizeRect(rect);
+
+	            group.add(rect);
+	        }
+	    };
+
+
+/***/ },
+/* 278 */
+/***/ function(module, exports) {
+
+	
+	   module.exports = function (ecModel) {
+	        var legendModels = ecModel.findComponents({
+	            mainType: 'legend'
+	        });
+	        if (legendModels && legendModels.length) {
+	            ecModel.filterSeries(function (series) {
+	                // If in any legend component the status is not selected.
+	                // Because in legend series is assumed selected when it is not in the legend data.
+	                for (var i = 0; i < legendModels.length; i++) {
+	                    if (!legendModels[i].isSelected(series.name)) {
+	                        return false;
+	                    }
+	                }
+	                return true;
+	            });
+	        }
+	    };
+
+
+/***/ },
+/* 279 */
+/***/ function(module, exports, __webpack_require__) {
+
+	// FIXME Better way to pack data in graphic element
+
+
+	    __webpack_require__(280);
+
+	    __webpack_require__(281);
+
+	    // Show tip action
+	    /**
+	     * @action
+	     * @property {string} type
+	     * @property {number} seriesIndex
+	     * @property {number} dataIndex
+	     * @property {number} [x]
+	     * @property {number} [y]
+	     */
+	    __webpack_require__(1).registerAction(
+	        {
+	            type: 'showTip',
+	            event: 'showTip',
+	            update: 'none'
+	        },
+	        // noop
+	        function () {}
+	    );
+	    // Hide tip action
+	    __webpack_require__(1).registerAction(
+	        {
+	            type: 'hideTip',
+	            event: 'hideTip',
+	            update: 'none'
+	        },
+	        // noop
+	        function () {}
+	    );
+
+
+/***/ },
+/* 280 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    __webpack_require__(1).extendComponentModel({
+
+	        type: 'tooltip',
+
+	        defaultOption: {
+	            zlevel: 0,
+
+	            z: 8,
+
+	            show: true,
+
+	            // tooltip主体内容
+	            showContent: true,
+
+	            // 触发类型，默认数据触发，见下图，可选为：'item' ¦ 'axis'
+	            trigger: 'item',
+
+	            // 触发条件，支持 'click' | 'mousemove'
+	            triggerOn: 'mousemove',
+
+	            // 是否永远显示 content
+	            alwaysShowContent: false,
+
+	            // 位置 {Array} | {Function}
+	            // position: null
+
+	            // 内容格式器：{string}（Template） ¦ {Function}
+	            // formatter: null
+
+	            showDelay: 0,
+
+	            // 隐藏延迟，单位ms
+	            hideDelay: 100,
+
+	            // 动画变换时间，单位s
+	            transitionDuration: 0.4,
+
+	            enterable: false,
+
+	            // 提示背景颜色，默认为透明度为0.7的黑色
+	            backgroundColor: 'rgba(50,50,50,0.7)',
+
+	            // 提示边框颜色
+	            borderColor: '#333',
+
+	            // 提示边框圆角，单位px，默认为4
+	            borderRadius: 4,
+
+	            // 提示边框线宽，单位px，默认为0（无边框）
+	            borderWidth: 0,
+
+	            // 提示内边距，单位px，默认各方向内边距为5，
+	            // 接受数组分别设定上右下左边距，同css
+	            padding: 5,
+
+	            // Extra css text
+	            extraCssText: '',
+
+	            // 坐标轴指示器，坐标轴触发有效
+	            axisPointer: {
+	                // 默认为直线
+	                // 可选为：'line' | 'shadow' | 'cross'
+	                type: 'line',
+
+	                // type 为 line 的时候有效，指定 tooltip line 所在的轴，可选
+	                // 可选 'x' | 'y' | 'angle' | 'radius' | 'auto'
+	                // 默认 'auto'，会选择类型为 cateogry 的轴，对于双数值轴，笛卡尔坐标系会默认选择 x 轴
+	                // 极坐标系会默认选择 angle 轴
+	                axis: 'auto',
+
+	                animation: true,
+	                animationDurationUpdate: 200,
+	                animationEasingUpdate: 'exponentialOut',
+
+	                // 直线指示器样式设置
+	                lineStyle: {
+	                    color: '#555',
+	                    width: 1,
+	                    type: 'solid'
+	                },
+
+	                crossStyle: {
+	                    color: '#555',
+	                    width: 1,
+	                    type: 'dashed',
+
+	                    // TODO formatter
+	                    textStyle: {}
+	                },
+
+	                // 阴影指示器样式设置
+	                shadowStyle: {
+	                    color: 'rgba(150,150,150,0.3)'
+	                }
+	            },
+	            textStyle: {
+	                color: '#fff',
+	                fontSize: 14
+	            }
+	        }
+	    });
+
+
+/***/ },
+/* 281 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var TooltipContent = __webpack_require__(282);
+	    var graphic = __webpack_require__(43);
+	    var zrUtil = __webpack_require__(4);
+	    var formatUtil = __webpack_require__(6);
+	    var numberUtil = __webpack_require__(7);
+	    var parsePercent = numberUtil.parsePercent;
+	    var env = __webpack_require__(2);
+	    var Model = __webpack_require__(12);
+
+	    function dataEqual(a, b) {
+	        if (!a || !b) {
+	            return false;
+	        }
+	        var round = numberUtil.round;
+	        return round(a[0]) === round(b[0])
+	            && round(a[1]) === round(b[1]);
+	    }
+	    /**
+	     * @inner
+	     */
+	    function makeLineShape(x1, y1, x2, y2) {
+	        return {
+	            x1: x1,
+	            y1: y1,
+	            x2: x2,
+	            y2: y2
+	        };
+	    }
+
+	    /**
+	     * @inner
+	     */
+	    function makeRectShape(x, y, width, height) {
+	        return {
+	            x: x,
+	            y: y,
+	            width: width,
+	            height: height
+	        };
+	    }
+
+	    /**
+	     * @inner
+	     */
+	    function makeSectorShape(cx, cy, r0, r, startAngle, endAngle) {
+	        return {
+	            cx: cx,
+	            cy: cy,
+	            r0: r0,
+	            r: r,
+	            startAngle: startAngle,
+	            endAngle: endAngle,
+	            clockwise: true
+	        };
+	    }
+
+	    function refixTooltipPosition(x, y, el, viewWidth, viewHeight) {
+	        var width = el.clientWidth;
+	        var height = el.clientHeight;
+	        var gap = 20;
+
+	        if (x + width + gap > viewWidth) {
+	            x -= width + gap;
+	        }
+	        else {
+	            x += gap;
+	        }
+	        if (y + height + gap > viewHeight) {
+	            y -= height + gap;
+	        }
+	        else {
+	            y += gap;
+	        }
+	        return [x, y];
+	    }
+
+	    function calcTooltipPosition(position, rect, dom) {
+	        var domWidth = dom.clientWidth;
+	        var domHeight = dom.clientHeight;
+	        var gap = 5;
+	        var x = 0;
+	        var y = 0;
+	        var rectWidth = rect.width;
+	        var rectHeight = rect.height;
+	        switch (position) {
+	            case 'inside':
+	                x = rect.x + rectWidth / 2 - domWidth / 2;
+	                y = rect.y + rectHeight / 2 - domHeight / 2;
+	                break;
+	            case 'top':
+	                x = rect.x + rectWidth / 2 - domWidth / 2;
+	                y = rect.y - domHeight - gap;
+	                break;
+	            case 'bottom':
+	                x = rect.x + rectWidth / 2 - domWidth / 2;
+	                y = rect.y + rectHeight + gap;
+	                break;
+	            case 'left':
+	                x = rect.x - domWidth - gap;
+	                y = rect.y + rectHeight / 2 - domHeight / 2;
+	                break;
+	            case 'right':
+	                x = rect.x + rectWidth + gap;
+	                y = rect.y + rectHeight / 2 - domHeight / 2;
+	        }
+	        return [x, y];
+	    }
+
+	    /**
+	     * @param  {string|Function|Array.<number>} positionExpr
+	     * @param  {number} x Mouse x
+	     * @param  {number} y Mouse y
+	     * @param  {module:echarts/component/tooltip/TooltipContent} content
+	     * @param  {Object|<Array.<Object>} params
+	     * @param  {module:zrender/Element} el target element
+	     * @param  {module:echarts/ExtensionAPI} api
+	     * @return {Array.<number>}
+	     */
+	    function updatePosition(positionExpr, x, y, content, params, el, api) {
+	        var viewWidth = api.getWidth();
+	        var viewHeight = api.getHeight();
+
+	        var rect = el && el.getBoundingRect().clone();
+	        el && rect.applyTransform(el.transform);
+	        if (typeof positionExpr === 'function') {
+	            // Callback of position can be an array or a string specify the position
+	            positionExpr = positionExpr([x, y], params, content.el, rect);
+	        }
+
+	        if (zrUtil.isArray(positionExpr)) {
+	            x = parsePercent(positionExpr[0], viewWidth);
+	            y = parsePercent(positionExpr[1], viewHeight);
+	        }
+	        // Specify tooltip position by string 'top' 'bottom' 'left' 'right' around graphic element
+	        else if (typeof positionExpr === 'string' && el) {
+	            var pos = calcTooltipPosition(
+	                positionExpr, rect, content.el
+	            );
+	            x = pos[0];
+	            y = pos[1];
+	        }
+	        else {
+	            var pos = refixTooltipPosition(
+	                x, y, content.el, viewWidth, viewHeight
+	            );
+	            x = pos[0];
+	            y = pos[1];
+	        }
+
+	        content.moveTo(x, y);
+	    }
+
+	    function ifSeriesSupportAxisTrigger(seriesModel) {
+	        var coordSys = seriesModel.coordinateSystem;
+	        var trigger = seriesModel.get('tooltip.trigger', true);
+	        // Ignore series use item tooltip trigger and series coordinate system is not cartesian or
+	        return !(!coordSys
+	            || (coordSys.type !== 'cartesian2d' && coordSys.type !== 'polar' && coordSys.type !== 'singleAxis')
+	            || trigger === 'item');
+	    }
+
+	    __webpack_require__(1).extendComponentView({
+
+	        type: 'tooltip',
+
+	        _axisPointers: {},
+
+	        init: function (ecModel, api) {
+	            if (env.node) {
+	                return;
+	            }
+	            var tooltipContent = new TooltipContent(api.getDom(), api);
+	            this._tooltipContent = tooltipContent;
+
+	            api.on('showTip', this._manuallyShowTip, this);
+	            api.on('hideTip', this._manuallyHideTip, this);
+	        },
+
+	        render: function (tooltipModel, ecModel, api) {
+	            if (env.node) {
+	                return;
+	            }
+
+	            // Reset
+	            this.group.removeAll();
+
+	            /**
+	             * @type {Object}
+	             * @private
+	             */
+	            this._axisPointers = {};
+
+	            /**
+	             * @private
+	             * @type {module:echarts/component/tooltip/TooltipModel}
+	             */
+	            this._tooltipModel = tooltipModel;
+
+	            /**
+	             * @private
+	             * @type {module:echarts/model/Global}
+	             */
+	            this._ecModel = ecModel;
+
+	            /**
+	             * @private
+	             * @type {module:echarts/ExtensionAPI}
+	             */
+	            this._api = api;
+
+	            /**
+	             * @type {Object}
+	             * @private
+	             */
+	            this._lastHover = {
+	                // data
+	                // payloadBatch
+	            };
+
+	            var tooltipContent = this._tooltipContent;
+	            tooltipContent.update();
+	            tooltipContent.enterable = tooltipModel.get('enterable');
+	            this._alwaysShowContent = tooltipModel.get('alwaysShowContent');
+
+	            /**
+	             * @type {Object.<string, Array>}
+	             */
+	            this._seriesGroupByAxis = this._prepareAxisTriggerData(
+	                tooltipModel, ecModel
+	            );
+
+	            var crossText = this._crossText;
+	            if (crossText) {
+	                this.group.add(crossText);
+	            }
+
+	            // Try to keep the tooltip show when refreshing
+	            if (this._lastX != null && this._lastY != null) {
+	                var self = this;
+	                clearTimeout(this._refreshUpdateTimeout);
+	                this._refreshUpdateTimeout = setTimeout(function () {
+	                    // Show tip next tick after other charts are rendered
+	                    // In case highlight action has wrong result
+	                    // FIXME
+	                    self._manuallyShowTip({
+	                        x: self._lastX,
+	                        y: self._lastY
+	                    });
+	                });
+	            }
+
+	            var zr = this._api.getZr();
+	            zr.off('click', this._tryShow);
+	            zr.off('mousemove', this._mousemove);
+	            zr.off('mouseout', this._hide);
+	            zr.off('globalout', this._hide);
+	            if (tooltipModel.get('triggerOn') === 'click') {
+	                zr.on('click', this._tryShow, this);
+	            }
+	            else {
+	                zr.on('mousemove', this._mousemove, this);
+	                zr.on('mouseout', this._hide, this);
+	                zr.on('globalout', this._hide, this);
+	            }
+	        },
+
+	        _mousemove: function (e) {
+	            var showDelay = this._tooltipModel.get('showDelay');
+	            var self = this;
+	            clearTimeout(this._showTimeout);
+	            if (showDelay > 0) {
+	                this._showTimeout = setTimeout(function () {
+	                    self._tryShow(e);
+	                }, showDelay);
+	            }
+	            else {
+	                this._tryShow(e);
+	            }
+	        },
+
+	        /**
+	         * Show tip manually by
+	         *  dispatchAction({
+	         *      type: 'showTip',
+	         *      x: 10,
+	         *      y: 10
+	         *  });
+	         * Or
+	         *  dispatchAction({
+	         *      type: 'showTip',
+	         *      seriesIndex: 0,
+	         *      dataIndex: 1
+	         *  });
+	         *
+	         *  TODO Batch
+	         */
+	        _manuallyShowTip: function (event) {
+	            // From self
+	            if (event.from === this.uid) {
+	                return;
+	            }
+
+	            var ecModel = this._ecModel;
+	            var seriesIndex = event.seriesIndex;
+	            var dataIndex = event.dataIndex;
+	            var seriesModel = ecModel.getSeriesByIndex(seriesIndex);
+	            var api = this._api;
+
+	            if (event.x == null || event.y == null) {
+	                if (!seriesModel) {
+	                    // Find the first series can use axis trigger
+	                    ecModel.eachSeries(function (_series) {
+	                        if (ifSeriesSupportAxisTrigger(_series) && !seriesModel) {
+	                            seriesModel = _series;
+	                        }
+	                    });
+	                }
+	                if (seriesModel) {
+	                    var data = seriesModel.getData();
+	                    if (dataIndex == null) {
+	                        dataIndex = data.indexOfName(event.name);
+	                    }
+	                    var el = data.getItemGraphicEl(dataIndex);
+	                    var cx, cy;
+	                    // Try to get the point in coordinate system
+	                    var coordSys = seriesModel.coordinateSystem;
+	                    if (coordSys && coordSys.dataToPoint) {
+	                        var point = coordSys.dataToPoint(
+	                            data.getValues(
+	                                zrUtil.map(coordSys.dimensions, function (dim) {
+	                                    return seriesModel.coordDimToDataDim(dim)[0];
+	                                }), dataIndex, true
+	                            )
+	                        );
+	                        cx = point && point[0];
+	                        cy = point && point[1];
+	                    }
+	                    else if (el) {
+	                        // Use graphic bounding rect
+	                        var rect = el.getBoundingRect().clone();
+	                        rect.applyTransform(el.transform);
+	                        cx = rect.x + rect.width / 2;
+	                        cy = rect.y + rect.height / 2;
+	                    }
+	                    if (cx != null && cy != null) {
+	                        this._tryShow({
+	                            offsetX: cx,
+	                            offsetY: cy,
+	                            target: el,
+	                            event: {}
+	                        });
+	                    }
+	                }
+	            }
+	            else {
+	                var el = api.getZr().handler.findHover(event.x, event.y);
+	                this._tryShow({
+	                    offsetX: event.x,
+	                    offsetY: event.y,
+	                    target: el,
+	                    event: {}
+	                });
+	            }
+	        },
+
+	        _manuallyHideTip: function (e) {
+	            if (e.from === this.uid) {
+	                return;
+	            }
+
+	            this._hide();
+	        },
+
+	        _prepareAxisTriggerData: function (tooltipModel, ecModel) {
+	            // Prepare data for axis trigger
+	            var seriesGroupByAxis = {};
+	            ecModel.eachSeries(function (seriesModel) {
+	                if (ifSeriesSupportAxisTrigger(seriesModel)) {
+	                    var coordSys = seriesModel.coordinateSystem;
+	                    var baseAxis;
+	                    var key;
+
+	                    // Only cartesian2d, polar and single support axis trigger
+	                    if (coordSys.type === 'cartesian2d') {
+	                        // FIXME `axisPointer.axis` is not baseAxis
+	                        baseAxis = coordSys.getBaseAxis();
+	                        key = baseAxis.dim + baseAxis.index;
+	                    }
+	                    else if (coordSys.type === 'singleAxis') {
+	                        baseAxis = coordSys.getAxis();
+	                        key = baseAxis.dim + baseAxis.type;
+	                    }
+	                    else {
+	                        baseAxis = coordSys.getBaseAxis();
+	                        key = baseAxis.dim + coordSys.name;
+	                    }
+
+	                    seriesGroupByAxis[key] = seriesGroupByAxis[key] || {
+	                        coordSys: [],
+	                        series: []
+	                    };
+	                    seriesGroupByAxis[key].coordSys.push(coordSys);
+	                    seriesGroupByAxis[key].series.push(seriesModel);
+	                }
+	            }, this);
+
+	            return seriesGroupByAxis;
+	        },
+
+	        /**
+	         * mousemove handler
+	         * @param {Object} e
+	         * @private
+	         */
+	        _tryShow: function (e) {
+	            var el = e.target;
+	            var tooltipModel = this._tooltipModel;
+	            var globalTrigger = tooltipModel.get('trigger');
+	            var ecModel = this._ecModel;
+	            var api = this._api;
+
+	            if (!tooltipModel) {
+	                return;
+	            }
+
+	            // Save mouse x, mouse y. So we can try to keep showing the tip if chart is refreshed
+	            this._lastX = e.offsetX;
+	            this._lastY = e.offsetY;
+
+	            // Always show item tooltip if mouse is on the element with dataIndex
+	            if (el && el.dataIndex != null) {
+	                // Use dataModel in element if possible
+	                // Used when mouseover on a element like markPoint or edge
+	                // In which case, the data is not main data in series.
+	                var dataModel = el.dataModel || ecModel.getSeriesByIndex(el.seriesIndex);
+	                var dataIndex = el.dataIndex;
+	                var itemModel = dataModel.getData().getItemModel(dataIndex);
+	                // Series or single data may use item trigger when global is axis trigger
+	                if ((itemModel.get('tooltip.trigger') || globalTrigger) === 'axis') {
+	                    this._showAxisTooltip(tooltipModel, ecModel, e);
+	                }
+	                else {
+	                    // Reset ticket
+	                    this._ticket = '';
+	                    // If either single data or series use item trigger
+	                    this._hideAxisPointer();
+	                    // Reset last hover and dispatch downplay action
+	                    this._resetLastHover();
+
+	                    this._showItemTooltipContent(dataModel, dataIndex, el.dataType, e);
+	                }
+
+	                api.dispatchAction({
+	                    type: 'showTip',
+	                    from: this.uid,
+	                    dataIndex: el.dataIndex,
+	                    seriesIndex: el.seriesIndex
+	                });
+	            }
+	            // Tooltip provided directly. Like legend
+	            else if (el && el.tooltip) {
+	                var tooltipOpt = el.tooltip;
+	                if (typeof tooltipOpt === 'string') {
+	                    var content = tooltipOpt;
+	                    tooltipOpt = {
+	                        content: content,
+	                        // Fixed formatter
+	                        formatter: content
+	                    };
+	                }
+	                var subTooltipModel = new Model(tooltipOpt, tooltipModel);
+	                var defaultHtml = subTooltipModel.get('content');
+	                var asyncTicket = Math.random();
+	                this._showTooltipContent(
+	                    // TODO params
+	                    subTooltipModel, defaultHtml, subTooltipModel.get('formatterParams') || {},
+	                    asyncTicket, e.offsetX, e.offsetY, el, api
+	                );
+	            }
+	            else {
+	                if (globalTrigger === 'item') {
+	                    this._hide();
+	                }
+	                else {
+	                    // Try show axis tooltip
+	                    this._showAxisTooltip(tooltipModel, ecModel, e);
+	                }
+
+	                // Action of cross pointer
+	                // other pointer types will trigger action in _dispatchAndShowSeriesTooltipContent method
+	                if (tooltipModel.get('axisPointer.type') === 'cross') {
+	                    api.dispatchAction({
+	                        type: 'showTip',
+	                        from: this.uid,
+	                        x: e.offsetX,
+	                        y: e.offsetY
+	                    });
+	                }
+	            }
+	        },
+
+	        /**
+	         * Show tooltip on axis
+	         * @param {module:echarts/component/tooltip/TooltipModel} tooltipModel
+	         * @param {module:echarts/model/Global} ecModel
+	         * @param {Object} e
+	         * @private
+	         */
+	        _showAxisTooltip: function (tooltipModel, ecModel, e) {
+	            var axisPointerModel = tooltipModel.getModel('axisPointer');
+	            var axisPointerType = axisPointerModel.get('type');
+
+	            if (axisPointerType === 'cross') {
+	                var el = e.target;
+	                if (el && el.dataIndex != null) {
+	                    var seriesModel = ecModel.getSeriesByIndex(el.seriesIndex);
+	                    var dataIndex = el.dataIndex;
+	                    this._showItemTooltipContent(seriesModel, dataIndex, el.dataType, e);
+	                }
+	            }
+
+	            this._showAxisPointer();
+	            var allNotShow = true;
+	            zrUtil.each(this._seriesGroupByAxis, function (seriesCoordSysSameAxis) {
+	                // Try show the axis pointer
+	                var allCoordSys = seriesCoordSysSameAxis.coordSys;
+	                var coordSys = allCoordSys[0];
+
+	                // If mouse position is not in the grid or polar
+	                var point = [e.offsetX, e.offsetY];
+
+	                if (!coordSys.containPoint(point)) {
+	                    // Hide axis pointer
+	                    this._hideAxisPointer(coordSys.name);
+	                    return;
+	                }
+
+	                allNotShow = false;
+	                // Make sure point is discrete on cateogry axis
+	                var dimensions = coordSys.dimensions;
+	                var value = coordSys.pointToData(point, true);
+	                point = coordSys.dataToPoint(value);
+	                var baseAxis = coordSys.getBaseAxis();
+	                var axisType = axisPointerModel.get('axis');
+	                if (axisType === 'auto') {
+	                    axisType = baseAxis.dim;
+	                }
+
+	                var contentNotChange = false;
+	                var lastHover = this._lastHover;
+	                if (axisPointerType === 'cross') {
+	                    // If hover data not changed
+	                    // Possible when two axes are all category
+	                    if (dataEqual(lastHover.data, value)) {
+	                        contentNotChange = true;
+	                    }
+	                    lastHover.data = value;
+	                }
+	                else {
+	                    var valIndex = zrUtil.indexOf(dimensions, axisType);
+
+	                    // If hover data not changed on the axis dimension
+	                    if (lastHover.data === value[valIndex]) {
+	                        contentNotChange = true;
+	                    }
+	                    lastHover.data = value[valIndex];
+	                }
+
+	                if (coordSys.type === 'cartesian2d' && !contentNotChange) {
+	                    this._showCartesianPointer(
+	                        axisPointerModel, coordSys, axisType, point
+	                    );
+	                }
+	                else if (coordSys.type === 'polar' && !contentNotChange) {
+	                    this._showPolarPointer(
+	                        axisPointerModel, coordSys, axisType, point
+	                    );
+	                }
+	                else if (coordSys.type === 'singleAxis' && !contentNotChange) {
+	                    this._showSinglePointer(
+	                        axisPointerModel, coordSys, axisType, point
+	                    );
+	                }
+
+	                if (axisPointerType !== 'cross') {
+	                    this._dispatchAndShowSeriesTooltipContent(
+	                        coordSys, seriesCoordSysSameAxis.series, point, value, contentNotChange
+	                    );
+	                }
+	            }, this);
+
+	            if (!this._tooltipModel.get('show')) {
+	                this._hideAxisPointer();
+	            }
+
+	            if (allNotShow) {
+	                this._hide();
+	            }
+	        },
+
+	        /**
+	         * Show tooltip on axis of cartesian coordinate
+	         * @param {module:echarts/model/Model} axisPointerModel
+	         * @param {module:echarts/coord/cartesian/Cartesian2D} cartesians
+	         * @param {string} axisType
+	         * @param {Array.<number>} point
+	         * @private
+	         */
+	        _showCartesianPointer: function (axisPointerModel, cartesian, axisType, point) {
+	            var self = this;
+
+	            var axisPointerType = axisPointerModel.get('type');
+	            var baseAxis = cartesian.getBaseAxis();
+	            var moveAnimation = axisPointerType !== 'cross'
+	                && baseAxis.type === 'category'
+	                && baseAxis.getBandWidth() > 20;
+
+	            if (axisPointerType === 'cross') {
+	                moveGridLine('x', point, cartesian.getAxis('y').getGlobalExtent());
+	                moveGridLine('y', point, cartesian.getAxis('x').getGlobalExtent());
+
+	                this._updateCrossText(cartesian, point, axisPointerModel);
+	            }
+	            else {
+	                var otherAxis = cartesian.getAxis(axisType === 'x' ? 'y' : 'x');
+	                var otherExtent = otherAxis.getGlobalExtent();
+
+	                if (cartesian.type === 'cartesian2d') {
+	                    (axisPointerType === 'line' ? moveGridLine : moveGridShadow)(
+	                        axisType, point, otherExtent
+	                    );
+	                }
+	            }
+
+	            /**
+	             * @inner
+	             */
+	            function moveGridLine(axisType, point, otherExtent) {
+	                var targetShape = axisType === 'x'
+	                    ? makeLineShape(point[0], otherExtent[0], point[0], otherExtent[1])
+	                    : makeLineShape(otherExtent[0], point[1], otherExtent[1], point[1]);
+
+	                var pointerEl = self._getPointerElement(
+	                    cartesian, axisPointerModel, axisType, targetShape
+	                );
+	                graphic.subPixelOptimizeLine({
+	                    shape: targetShape,
+	                    style: pointerEl.style
+	                });
+
+	                moveAnimation
+	                    ? graphic.updateProps(pointerEl, {
+	                        shape: targetShape
+	                    }, axisPointerModel)
+	                    :  pointerEl.attr({
+	                        shape: targetShape
+	                    });
+	            }
+
+	            /**
+	             * @inner
+	             */
+	            function moveGridShadow(axisType, point, otherExtent) {
+	                var axis = cartesian.getAxis(axisType);
+	                var bandWidth = axis.getBandWidth();
+	                var span = otherExtent[1] - otherExtent[0];
+	                var targetShape = axisType === 'x'
+	                    ? makeRectShape(point[0] - bandWidth / 2, otherExtent[0], bandWidth, span)
+	                    : makeRectShape(otherExtent[0], point[1] - bandWidth / 2, span, bandWidth);
+
+	                var pointerEl = self._getPointerElement(
+	                    cartesian, axisPointerModel, axisType, targetShape
+	                );
+	                moveAnimation
+	                    ? graphic.updateProps(pointerEl, {
+	                        shape: targetShape
+	                    }, axisPointerModel)
+	                    :  pointerEl.attr({
+	                        shape: targetShape
+	                    });
+	            }
+	        },
+
+	        _showSinglePointer: function (axisPointerModel, single, axisType, point) {
+	            var self = this;
+	            var axisPointerType = axisPointerModel.get('type');
+	            var moveAnimation = axisPointerType !== 'cross' && single.getBaseAxis().type === 'category';
+	            var rect = single.getRect();
+	            var otherExtent = [rect.y, rect.y + rect.height];
+
+	            moveSingleLine(axisType, point, otherExtent);
+
+	            /**
+	             * @inner
+	             */
+	            function moveSingleLine(axisType, point, otherExtent) {
+	                var axis = single.getAxis();
+	                var orient = axis.orient;
+
+	                var targetShape = orient === 'horizontal'
+	                    ? makeLineShape(point[0], otherExtent[0], point[0], otherExtent[1])
+	                    : makeLineShape(otherExtent[0], point[1], otherExtent[1], point[1]);
+
+	                var pointerEl = self._getPointerElement(
+	                    single, axisPointerModel, axisType, targetShape
+	                );
+	                moveAnimation
+	                    ? graphic.updateProps(pointerEl, {
+	                        shape: targetShape
+	                    }, axisPointerModel)
+	                    :  pointerEl.attr({
+	                        shape: targetShape
+	                    });
+	            }
+
+	        },
+
+	        /**
+	         * Show tooltip on axis of polar coordinate
+	         * @param {module:echarts/model/Model} axisPointerModel
+	         * @param {Array.<module:echarts/coord/polar/Polar>} polar
+	         * @param {string} axisType
+	         * @param {Array.<number>} point
+	         */
+	        _showPolarPointer: function (axisPointerModel, polar, axisType, point) {
+	            var self = this;
+
+	            var axisPointerType = axisPointerModel.get('type');
+
+	            var angleAxis = polar.getAngleAxis();
+	            var radiusAxis = polar.getRadiusAxis();
+
+	            var moveAnimation = axisPointerType !== 'cross'
+	                && polar.getBaseAxis().type === 'category';
+
+	            if (axisPointerType === 'cross') {
+	                movePolarLine('angle', point, radiusAxis.getExtent());
+	                movePolarLine('radius', point, angleAxis.getExtent());
+
+	                this._updateCrossText(polar, point, axisPointerModel);
+	            }
+	            else {
+	                var otherAxis = polar.getAxis(axisType === 'radius' ? 'angle' : 'radius');
+	                var otherExtent = otherAxis.getExtent();
+
+	                (axisPointerType === 'line' ? movePolarLine : movePolarShadow)(
+	                    axisType, point, otherExtent
+	                );
+	            }
+	            /**
+	             * @inner
+	             */
+	            function movePolarLine(axisType, point, otherExtent) {
+	                var mouseCoord = polar.pointToCoord(point);
+
+	                var targetShape;
+
+	                if (axisType === 'angle') {
+	                    var p1 = polar.coordToPoint([otherExtent[0], mouseCoord[1]]);
+	                    var p2 = polar.coordToPoint([otherExtent[1], mouseCoord[1]]);
+	                    targetShape = makeLineShape(p1[0], p1[1], p2[0], p2[1]);
+	                }
+	                else {
+	                    targetShape = {
+	                        cx: polar.cx,
+	                        cy: polar.cy,
+	                        r: mouseCoord[0]
+	                    };
+	                }
+
+	                var pointerEl = self._getPointerElement(
+	                    polar, axisPointerModel, axisType, targetShape
+	                );
+
+	                moveAnimation
+	                    ? graphic.updateProps(pointerEl, {
+	                        shape: targetShape
+	                    }, axisPointerModel)
+	                    :  pointerEl.attr({
+	                        shape: targetShape
+	                    });
+	            }
+
+	            /**
+	             * @inner
+	             */
+	            function movePolarShadow(axisType, point, otherExtent) {
+	                var axis = polar.getAxis(axisType);
+	                var bandWidth = axis.getBandWidth();
+
+	                var mouseCoord = polar.pointToCoord(point);
+
+	                var targetShape;
+
+	                var radian = Math.PI / 180;
+
+	                if (axisType === 'angle') {
+	                    targetShape = makeSectorShape(
+	                        polar.cx, polar.cy,
+	                        otherExtent[0], otherExtent[1],
+	                        // In ECharts y is negative if angle is positive
+	                        (-mouseCoord[1] - bandWidth / 2) * radian,
+	                        (-mouseCoord[1] + bandWidth / 2) * radian
+	                    );
+	                }
+	                else {
+	                    targetShape = makeSectorShape(
+	                        polar.cx, polar.cy,
+	                        mouseCoord[0] - bandWidth / 2,
+	                        mouseCoord[0] + bandWidth / 2,
+	                        0, Math.PI * 2
+	                    );
+	                }
+
+	                var pointerEl = self._getPointerElement(
+	                    polar, axisPointerModel, axisType, targetShape
+	                );
+	                moveAnimation
+	                    ? graphic.updateProps(pointerEl, {
+	                        shape: targetShape
+	                    }, axisPointerModel)
+	                    :  pointerEl.attr({
+	                        shape: targetShape
+	                    });
+	            }
+	        },
+
+	        _updateCrossText: function (coordSys, point, axisPointerModel) {
+	            var crossStyleModel = axisPointerModel.getModel('crossStyle');
+	            var textStyleModel = crossStyleModel.getModel('textStyle');
+
+	            var tooltipModel = this._tooltipModel;
+
+	            var text = this._crossText;
+	            if (!text) {
+	                text = this._crossText = new graphic.Text({
+	                    style: {
+	                        textAlign: 'left',
+	                        textVerticalAlign: 'bottom'
+	                    }
+	                });
+	                this.group.add(text);
+	            }
+
+	            var value = coordSys.pointToData(point);
+
+	            var dims = coordSys.dimensions;
+	            value = zrUtil.map(value, function (val, idx) {
+	                var axis = coordSys.getAxis(dims[idx]);
+	                if (axis.type === 'category' || axis.type === 'time') {
+	                    val = axis.scale.getLabel(val);
+	                }
+	                else {
+	                    val = formatUtil.addCommas(
+	                        val.toFixed(axis.getPixelPrecision())
+	                    );
+	                }
+	                return val;
+	            });
+
+	            text.setStyle({
+	                fill: textStyleModel.getTextColor() || crossStyleModel.get('color'),
+	                textFont: textStyleModel.getFont(),
+	                text: value.join(', '),
+	                x: point[0] + 5,
+	                y: point[1] - 5
+	            });
+	            text.z = tooltipModel.get('z');
+	            text.zlevel = tooltipModel.get('zlevel');
+	        },
+
+	        _getPointerElement: function (coordSys, pointerModel, axisType, initShape) {
+	            var tooltipModel = this._tooltipModel;
+	            var z = tooltipModel.get('z');
+	            var zlevel = tooltipModel.get('zlevel');
+	            var axisPointers = this._axisPointers;
+	            var coordSysName = coordSys.name;
+	            axisPointers[coordSysName] = axisPointers[coordSysName] || {};
+	            if (axisPointers[coordSysName][axisType]) {
+	                return axisPointers[coordSysName][axisType];
+	            }
+
+	            // Create if not exists
+	            var pointerType = pointerModel.get('type');
+	            var styleModel = pointerModel.getModel(pointerType + 'Style');
+	            var isShadow = pointerType === 'shadow';
+	            var style = styleModel[isShadow ? 'getAreaStyle' : 'getLineStyle']();
+
+	            var elementType = coordSys.type === 'polar'
+	                ? (isShadow ? 'Sector' : (axisType === 'radius' ? 'Circle' : 'Line'))
+	                : (isShadow ? 'Rect' : 'Line');
+
+	            isShadow ? (style.stroke = null) : (style.fill = null);
+
+	            var el = axisPointers[coordSysName][axisType] = new graphic[elementType]({
+	                style: style,
+	                z: z,
+	                zlevel: zlevel,
+	                silent: true,
+	                shape: initShape
+	            });
+
+	            this.group.add(el);
+	            return el;
+	        },
+
+	        /**
+	         * Dispatch actions and show tooltip on series
+	         * @param {Array.<module:echarts/model/Series>} seriesList
+	         * @param {Array.<number>} point
+	         * @param {Array.<number>} value
+	         * @param {boolean} contentNotChange
+	         * @param {Object} e
+	         */
+	        _dispatchAndShowSeriesTooltipContent: function (
+	            coordSys, seriesList, point, value, contentNotChange
+	        ) {
+
+	            var rootTooltipModel = this._tooltipModel;
+
+	            var baseAxis = coordSys.getBaseAxis();
+	            var baseDimIndex = baseAxis.dim === 'x' || baseAxis.dim === 'radius' ? 0 : 1;
+
+	            var payloadBatch = zrUtil.map(seriesList, function (series) {
+	                return {
+	                    seriesIndex: series.seriesIndex,
+	                    dataIndex: series.getAxisTooltipDataIndex
+	                        ? series.getAxisTooltipDataIndex(series.coordDimToDataDim(baseAxis.dim), value, baseAxis)
+	                        : series.getData().indexOfNearest(
+	                            series.coordDimToDataDim(baseAxis.dim)[0],
+	                            value[baseDimIndex],
+	                            // Add a threshold to avoid find the wrong dataIndex when data length is not same
+	                            false, baseAxis.type === 'category' ? 0.5 : null
+	                        )
+	                };
+	            });
+
+	            var lastHover = this._lastHover;
+	            var api = this._api;
+	            // Dispatch downplay action
+	            if (lastHover.payloadBatch && !contentNotChange) {
+	                api.dispatchAction({
+	                    type: 'downplay',
+	                    batch: lastHover.payloadBatch
+	                });
+	            }
+	            // Dispatch highlight action
+	            if (!contentNotChange) {
+	                api.dispatchAction({
+	                    type: 'highlight',
+	                    batch: payloadBatch
+	                });
+	                lastHover.payloadBatch = payloadBatch;
+	            }
+	            // Dispatch showTip action
+	            api.dispatchAction({
+	                type: 'showTip',
+	                dataIndex: payloadBatch[0].dataIndex,
+	                seriesIndex: payloadBatch[0].seriesIndex,
+	                from: this.uid
+	            });
+
+	            if (baseAxis && rootTooltipModel.get('showContent') && rootTooltipModel.get('show')) {
+	                var paramsList = zrUtil.map(seriesList, function (series, index) {
+	                    return series.getDataParams(payloadBatch[index].dataIndex);
+	                });
+
+	                if (!contentNotChange) {
+	                    // Update html content
+	                    var firstDataIndex = payloadBatch[0].dataIndex;
+
+	                    // Default tooltip content
+	                    // FIXME
+	                    // (1) shold be the first data which has name?
+	                    // (2) themeRiver, firstDataIndex is array, and first line is unnecessary.
+	                    var firstLine = baseAxis.type === 'time'
+	                        ? baseAxis.scale.getLabel(value[baseDimIndex])
+	                        : seriesList[0].getData().getName(firstDataIndex);
+	                    var defaultHtml = (firstLine ? firstLine + '<br />' : '')
+	                        + zrUtil.map(seriesList, function (series, index) {
+	                            return series.formatTooltip(payloadBatch[index].dataIndex, true);
+	                        }).join('<br />');
+
+	                    var asyncTicket = 'axis_' + coordSys.name + '_' + firstDataIndex;
+
+	                    this._showTooltipContent(
+	                        rootTooltipModel, defaultHtml, paramsList, asyncTicket,
+	                        point[0], point[1], null, api
+	                    );
+	                }
+	                else {
+	                    updatePosition(
+	                        rootTooltipModel.get('position'), point[0], point[1],
+	                        this._tooltipContent, paramsList, null, api
+	                    );
+	                }
+	            }
+	        },
+
+	        /**
+	         * Show tooltip on item
+	         * @param {module:echarts/model/Series} seriesModel
+	         * @param {number} dataIndex
+	         * @param {string} dataType
+	         * @param {Object} e
+	         */
+	        _showItemTooltipContent: function (seriesModel, dataIndex, dataType, e) {
+	            // FIXME Graph data
+	            var api = this._api;
+	            var data = seriesModel.getData(dataType);
+	            var itemModel = data.getItemModel(dataIndex);
+
+	            var tooltipOpt = itemModel.get('tooltip', true);
+	            if (typeof tooltipOpt === 'string') {
+	                // In each data item tooltip can be simply write:
+	                // {
+	                //  value: 10,
+	                //  tooltip: 'Something you need to know'
+	                // }
+	                var tooltipContent = tooltipOpt;
+	                tooltipOpt = {
+	                    formatter: tooltipContent
+	                };
+	            }
+	            var rootTooltipModel = this._tooltipModel;
+	            var seriesTooltipModel = seriesModel.getModel(
+	                'tooltip', rootTooltipModel
+	            );
+	            var tooltipModel = new Model(tooltipOpt, seriesTooltipModel, seriesTooltipModel.ecModel);
+
+	            var params = seriesModel.getDataParams(dataIndex, dataType);
+	            var defaultHtml = seriesModel.formatTooltip(dataIndex, false, dataType);
+
+	            var asyncTicket = 'item_' + seriesModel.name + '_' + dataIndex;
+
+	            this._showTooltipContent(
+	                tooltipModel, defaultHtml, params, asyncTicket,
+	                e.offsetX, e.offsetY, e.target, api
+	            );
+	        },
+
+	        _showTooltipContent: function (
+	            tooltipModel, defaultHtml, params, asyncTicket, x, y, target, api
+	        ) {
+	            // Reset ticket
+	            this._ticket = '';
+
+	            if (tooltipModel.get('showContent') && tooltipModel.get('show')) {
+	                var tooltipContent = this._tooltipContent;
+
+	                var formatter = tooltipModel.get('formatter');
+	                var positionExpr = tooltipModel.get('position');
+	                var html = defaultHtml;
+
+	                if (formatter) {
+	                    if (typeof formatter === 'string') {
+	                        html = formatUtil.formatTpl(formatter, params);
+	                    }
+	                    else if (typeof formatter === 'function') {
+	                        var self = this;
+	                        var ticket = asyncTicket;
+	                        var callback = function (cbTicket, html) {
+	                            if (cbTicket === self._ticket) {
+	                                tooltipContent.setContent(html);
+
+	                                updatePosition(
+	                                    positionExpr, x, y,
+	                                    tooltipContent, params, target, api
+	                                );
+	                            }
+	                        };
+	                        self._ticket = ticket;
+	                        html = formatter(params, ticket, callback);
+	                    }
+	                }
+
+	                tooltipContent.show(tooltipModel);
+	                tooltipContent.setContent(html);
+
+	                updatePosition(
+	                    positionExpr, x, y,
+	                    tooltipContent, params, target, api
+	                );
+	            }
+	        },
+
+	        /**
+	         * Show axis pointer
+	         * @param {string} [coordSysName]
+	         */
+	        _showAxisPointer: function (coordSysName) {
+	            if (coordSysName) {
+	                var axisPointers = this._axisPointers[coordSysName];
+	                axisPointers && zrUtil.each(axisPointers, function (el) {
+	                    el.show();
+	                });
+	            }
+	            else {
+	                this.group.eachChild(function (child) {
+	                    child.show();
+	                });
+	                this.group.show();
+	            }
+	        },
+
+	        _resetLastHover: function () {
+	            var lastHover = this._lastHover;
+	            if (lastHover.payloadBatch) {
+	                this._api.dispatchAction({
+	                    type: 'downplay',
+	                    batch: lastHover.payloadBatch
+	                });
+	            }
+	            // Reset lastHover
+	            this._lastHover = {};
+	        },
+	        /**
+	         * Hide axis pointer
+	         * @param {string} [coordSysName]
+	         */
+	        _hideAxisPointer: function (coordSysName) {
+	            if (coordSysName) {
+	                var axisPointers = this._axisPointers[coordSysName];
+	                axisPointers && zrUtil.each(axisPointers, function (el) {
+	                    el.hide();
+	                });
+	            }
+	            else {
+	                if (this.group.children().length) {
+	                    this.group.hide();
+	                }
+	            }
+	        },
+
+	        _hide: function () {
+	            clearTimeout(this._showTimeout);
+
+	            this._hideAxisPointer();
+	            this._resetLastHover();
+	            if (!this._alwaysShowContent) {
+	                this._tooltipContent.hideLater(this._tooltipModel.get('hideDelay'));
+	            }
+
+	            this._api.dispatchAction({
+	                type: 'hideTip',
+	                from: this.uid
+	            });
+
+	            this._lastX = this._lastY = null;
+	        },
+
+	        dispose: function (ecModel, api) {
+	            if (env.node) {
+	                return;
+	            }
+	            var zr = api.getZr();
+	            this._tooltipContent.hide();
+
+	            zr.off('click', this._tryShow);
+	            zr.off('mousemove', this._mousemove);
+	            zr.off('mouseout', this._hide);
+	            zr.off('globalout', this._hide);
+
+	            api.off('showTip', this._manuallyShowTip);
+	            api.off('hideTip', this._manuallyHideTip);
+	        }
+	    });
+
+
+/***/ },
+/* 282 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @module echarts/component/tooltip/TooltipContent
+	 */
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var zrColor = __webpack_require__(39);
+	    var eventUtil = __webpack_require__(87);
+	    var formatUtil = __webpack_require__(6);
+	    var each = zrUtil.each;
+	    var toCamelCase = formatUtil.toCamelCase;
+	    var env = __webpack_require__(2);
+
+	    var vendors = ['', '-webkit-', '-moz-', '-o-'];
+
+	    var gCssText = 'position:absolute;display:block;border-style:solid;white-space:nowrap;z-index:9999999;';
+
+	    /**
+	     * @param {number} duration
+	     * @return {string}
+	     * @inner
+	     */
+	    function assembleTransition(duration) {
+	        var transitionCurve = 'cubic-bezier(0.23, 1, 0.32, 1)';
+	        var transitionText = 'left ' + duration + 's ' + transitionCurve + ','
+	                            + 'top ' + duration + 's ' + transitionCurve;
+	        return zrUtil.map(vendors, function (vendorPrefix) {
+	            return vendorPrefix + 'transition:' + transitionText;
+	        }).join(';');
+	    }
+
+	    /**
+	     * @param {Object} textStyle
+	     * @return {string}
+	     * @inner
+	     */
+	    function assembleFont(textStyleModel) {
+	        var cssText = [];
+
+	        var fontSize = textStyleModel.get('fontSize');
+	        var color = textStyleModel.getTextColor();
+
+	        color && cssText.push('color:' + color);
+
+	        cssText.push('font:' + textStyleModel.getFont());
+
+	        fontSize &&
+	            cssText.push('line-height:' + Math.round(fontSize * 3 / 2) + 'px');
+
+	        each(['decoration', 'align'], function (name) {
+	            var val = textStyleModel.get(name);
+	            val && cssText.push('text-' + name + ':' + val);
+	        });
+
+	        return cssText.join(';');
+	    }
+
+	    /**
+	     * @param {Object} tooltipModel
+	     * @return {string}
+	     * @inner
+	     */
+	    function assembleCssText(tooltipModel) {
+
+	        tooltipModel = tooltipModel;
+
+	        var cssText = [];
+
+	        var transitionDuration = tooltipModel.get('transitionDuration');
+	        var backgroundColor = tooltipModel.get('backgroundColor');
+	        var textStyleModel = tooltipModel.getModel('textStyle');
+	        var padding = tooltipModel.get('padding');
+
+	        // Animation transition
+	        transitionDuration &&
+	            cssText.push(assembleTransition(transitionDuration));
+
+	        if (backgroundColor) {
+	            if (env.canvasSupported) {
+	                cssText.push('background-Color:' + backgroundColor);
+	            }
+	            else {
+	                // for ie
+	                cssText.push(
+	                    'background-Color:#' + zrColor.toHex(backgroundColor)
+	                );
+	                cssText.push('filter:alpha(opacity=70)');
+	            }
+	        }
+
+	        // Border style
+	        each(['width', 'color', 'radius'], function (name) {
+	            var borderName = 'border-' + name;
+	            var camelCase = toCamelCase(borderName);
+	            var val = tooltipModel.get(camelCase);
+	            val != null &&
+	                cssText.push(borderName + ':' + val + (name === 'color' ? '' : 'px'));
+	        });
+
+	        // Text style
+	        cssText.push(assembleFont(textStyleModel));
+
+	        // Padding
+	        if (padding != null) {
+	            cssText.push('padding:' + formatUtil.normalizeCssArray(padding).join('px ') + 'px');
+	        }
+
+	        return cssText.join(';') + ';';
+	    }
+
+	    /**
+	     * @alias module:echarts/component/tooltip/TooltipContent
+	     * @constructor
+	     */
+	    function TooltipContent(container, api) {
+	        var el = document.createElement('div');
+	        var zr = api.getZr();
+
+	        this.el = el;
+
+	        this._x = api.getWidth() / 2;
+	        this._y = api.getHeight() / 2;
+
+	        container.appendChild(el);
+
+	        this._container = container;
+
+	        this._show = false;
+
+	        /**
+	         * @private
+	         */
+	        this._hideTimeout;
+
+	        var self = this;
+	        el.onmouseenter = function () {
+	            // clear the timeout in hideLater and keep showing tooltip
+	            if (self.enterable) {
+	                clearTimeout(self._hideTimeout);
+	                self._show = true;
+	            }
+	            self._inContent = true;
+	        };
+	        el.onmousemove = function (e) {
+	            if (!self.enterable) {
+	                // Try trigger zrender event to avoid mouse
+	                // in and out shape too frequently
+	                var handler = zr.handler;
+	                eventUtil.normalizeEvent(container, e);
+	                handler.dispatch('mousemove', e);
+	            }
+	        };
+	        el.onmouseleave = function () {
+	            if (self.enterable) {
+	                if (self._show) {
+	                    self.hideLater(self._hideDelay);
+	                }
+	            }
+	            self._inContent = false;
+	        };
+
+	        compromiseMobile(el, container);
+	    }
+
+	    function compromiseMobile(tooltipContentEl, container) {
+	        // Prevent default behavior on mobile. For example,
+	        // default pinch gesture will cause browser zoom.
+	        // We do not preventing event on tooltip contnet el,
+	        // because user may need customization in tooltip el.
+	        eventUtil.addEventListener(container, 'touchstart', preventDefault);
+	        eventUtil.addEventListener(container, 'touchmove', preventDefault);
+	        eventUtil.addEventListener(container, 'touchend', preventDefault);
+
+	        function preventDefault(e) {
+	            if (contains(e.target)) {
+	                e.preventDefault();
+	            }
+	        }
+
+	        function contains(targetEl) {
+	            while (targetEl && targetEl !== container) {
+	                if (targetEl === tooltipContentEl) {
+	                    return true;
+	                }
+	                targetEl = targetEl.parentNode;
+	            }
+	        }
+	    }
+
+	    TooltipContent.prototype = {
+
+	        constructor: TooltipContent,
+
+	        enterable: true,
+
+	        /**
+	         * Update when tooltip is rendered
+	         */
+	        update: function () {
+	            var container = this._container;
+	            var stl = container.currentStyle
+	                || document.defaultView.getComputedStyle(container);
+	            var domStyle = container.style;
+	            if (domStyle.position !== 'absolute' && stl.position !== 'absolute') {
+	                domStyle.position = 'relative';
+	            }
+	            // Hide the tooltip
+	            // PENDING
+	            // this.hide();
+	        },
+
+	        show: function (tooltipModel) {
+	            clearTimeout(this._hideTimeout);
+	            var el = this.el;
+
+	            el.style.cssText = gCssText + assembleCssText(tooltipModel)
+	                // http://stackoverflow.com/questions/21125587/css3-transition-not-working-in-chrome-anymore
+	                + ';left:' + this._x + 'px;top:' + this._y + 'px;'
+	                + (tooltipModel.get('extraCssText') || '');
+
+	            el.style.display = el.innerHTML ?  'block' : 'none';
+
+	            this._show = true;
+	        },
+
+	        setContent: function (content) {
+	            var el = this.el;
+	            el.innerHTML = content;
+	            el.style.display = content ? 'block' : 'none';
+	        },
+
+	        moveTo: function (x, y) {
+	            var style = this.el.style;
+	            style.left = x + 'px';
+	            style.top = y + 'px';
+
+	            this._x = x;
+	            this._y = y;
+	        },
+
+	        hide: function () {
+	            this.el.style.display = 'none';
+	            this._show = false;
+	        },
+
+	        // showLater: function ()
+
+	        hideLater: function (time) {
+	            if (this._show && !(this._inContent && this.enterable)) {
+	                if (time) {
+	                    this._hideDelay = time;
+	                    // Set show false to avoid invoke hideLater mutiple times
+	                    this._show = false;
+	                    this._hideTimeout = setTimeout(zrUtil.bind(this.hide, this), time);
+	                }
+	                else {
+	                    this.hide();
+	                }
+	            }
+	        },
+
+	        isShow: function () {
+	            return this._show;
+	        }
+	    };
+
+	    module.exports = TooltipContent;
+
+
+/***/ },
+/* 283 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    __webpack_require__(284);
+	    __webpack_require__(290);
+	    __webpack_require__(292);
+
+	    // Polar view
+	    __webpack_require__(1).extendComponentView({
+	        type: 'polar'
+	    });
+
+
+/***/ },
+/* 284 */
+/***/ function(module, exports, __webpack_require__) {
+
+	// TODO Axis scale
+
+
+	    var Polar = __webpack_require__(285);
+	    var numberUtil = __webpack_require__(7);
+
+	    var axisHelper = __webpack_require__(114);
+	    var niceScaleExtent = axisHelper.niceScaleExtent;
+
+	    // 依赖 PolarModel 做预处理
+	    __webpack_require__(288);
+
+	    /**
+	     * Resize method bound to the polar
+	     * @param {module:echarts/coord/polar/PolarModel} polarModel
+	     * @param {module:echarts/ExtensionAPI} api
+	     */
+	    function resizePolar(polarModel, api) {
+	        var center = polarModel.get('center');
+	        var radius = polarModel.get('radius');
+	        var width = api.getWidth();
+	        var height = api.getHeight();
+	        var parsePercent = numberUtil.parsePercent;
+
+	        this.cx = parsePercent(center[0], width);
+	        this.cy = parsePercent(center[1], height);
+
+	        var radiusAxis = this.getRadiusAxis();
+	        var size = Math.min(width, height) / 2;
+	        // var idx = radiusAxis.inverse ? 1 : 0;
+	        radiusAxis.setExtent(0, parsePercent(radius, size));
+	    }
+
+	    /**
+	     * Update polar
+	     */
+	    function updatePolarScale(ecModel, api) {
+	        var polar = this;
+	        var angleAxis = polar.getAngleAxis();
+	        var radiusAxis = polar.getRadiusAxis();
+	        // Reset scale
+	        angleAxis.scale.setExtent(Infinity, -Infinity);
+	        radiusAxis.scale.setExtent(Infinity, -Infinity);
+
+	        ecModel.eachSeries(function (seriesModel) {
+	            if (seriesModel.coordinateSystem === polar) {
+	                var data = seriesModel.getData();
+	                radiusAxis.scale.unionExtent(
+	                    data.getDataExtent('radius', radiusAxis.type !== 'category')
+	                );
+	                angleAxis.scale.unionExtent(
+	                    data.getDataExtent('angle', angleAxis.type !== 'category')
+	                );
+	            }
+	        });
+
+	        niceScaleExtent(angleAxis, angleAxis.model);
+	        niceScaleExtent(radiusAxis, radiusAxis.model);
+
+	        // Fix extent of category angle axis
+	        if (angleAxis.type === 'category' && !angleAxis.onBand) {
+	            var extent = angleAxis.getExtent();
+	            var diff = 360 / angleAxis.scale.count();
+	            angleAxis.inverse ? (extent[1] += diff) : (extent[1] -= diff);
+	            angleAxis.setExtent(extent[0], extent[1]);
+	        }
+	    }
+
+	    /**
+	     * Set common axis properties
+	     * @param {module:echarts/coord/polar/AngleAxis|module:echarts/coord/polar/RadiusAxis}
+	     * @param {module:echarts/coord/polar/AxisModel}
+	     * @inner
+	     */
+	    function setAxis(axis, axisModel) {
+	        axis.type = axisModel.get('type');
+	        axis.scale = axisHelper.createScaleByModel(axisModel);
+	        axis.onBand = axisModel.get('boundaryGap') && axis.type === 'category';
+
+	        // FIXME Radius axis not support inverse axis
+	        if (axisModel.mainType === 'angleAxis') {
+	            var startAngle = axisModel.get('startAngle');
+	            axis.inverse = axisModel.get('inverse') ^ axisModel.get('clockwise');
+	            axis.setExtent(startAngle, startAngle + (axis.inverse ? -360 : 360));
+	        }
+
+	        // Inject axis instance
+	        axisModel.axis = axis;
+	        axis.model = axisModel;
+	    }
+
+
+	    var polarCreator = {
+
+	        dimensions: Polar.prototype.dimensions,
+
+	        create: function (ecModel, api) {
+	            var polarList = [];
+	            ecModel.eachComponent('polar', function (polarModel, idx) {
+	                var polar = new Polar(idx);
+	                // Inject resize and update method
+	                polar.resize = resizePolar;
+	                polar.update = updatePolarScale;
+
+	                var radiusAxis = polar.getRadiusAxis();
+	                var angleAxis = polar.getAngleAxis();
+
+	                var radiusAxisModel = polarModel.findAxisModel('radiusAxis');
+	                var angleAxisModel = polarModel.findAxisModel('angleAxis');
+
+	                setAxis(radiusAxis, radiusAxisModel);
+	                setAxis(angleAxis, angleAxisModel);
+
+	                polar.resize(polarModel, api);
+	                polarList.push(polar);
+
+	                polarModel.coordinateSystem = polar;
+	            });
+	            // Inject coordinateSystem to series
+	            ecModel.eachSeries(function (seriesModel) {
+	                if (seriesModel.get('coordinateSystem') === 'polar') {
+	                    seriesModel.coordinateSystem = polarList[seriesModel.get('polarIndex')];
+	                }
+	            });
+
+	            return polarList;
+	        }
+	    };
+
+	    __webpack_require__(26).register('polar', polarCreator);
+
+
+/***/ },
+/* 285 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+	/**
+	 * @module echarts/coord/polar/Polar
+	 */
+
+
+	    var RadiusAxis = __webpack_require__(286);
+	    var AngleAxis = __webpack_require__(287);
+
+	    /**
+	     * @alias {module:echarts/coord/polar/Polar}
+	     * @constructor
+	     * @param {string} name
+	     */
+	    var Polar = function (name) {
+
+	        /**
+	         * @type {string}
+	         */
+	        this.name = name || '';
+
+	        /**
+	         * x of polar center
+	         * @type {number}
+	         */
+	        this.cx = 0;
+
+	        /**
+	         * y of polar center
+	         * @type {number}
+	         */
+	        this.cy = 0;
+
+	        /**
+	         * @type {module:echarts/coord/polar/RadiusAxis}
+	         * @private
+	         */
+	        this._radiusAxis = new RadiusAxis();
+
+	        /**
+	         * @type {module:echarts/coord/polar/AngleAxis}
+	         * @private
+	         */
+	        this._angleAxis = new AngleAxis();
+	    };
+
+	    Polar.prototype = {
+
+	        constructor: Polar,
+
+	        type: 'polar',
+
+	        /**
+	         * @param {Array.<string>}
+	         * @readOnly
+	         */
+	        dimensions: ['radius', 'angle'],
+
+	        /**
+	         * If contain coord
+	         * @param {Array.<number>} point
+	         * @return {boolean}
+	         */
+	        containPoint: function (point) {
+	            var coord = this.pointToCoord(point);
+	            return this._radiusAxis.contain(coord[0])
+	                && this._angleAxis.contain(coord[1]);
+	        },
+
+	        /**
+	         * If contain data
+	         * @param {Array.<number>} data
+	         * @return {boolean}
+	         */
+	        containData: function (data) {
+	            return this._radiusAxis.containData(data[0])
+	                && this._angleAxis.containData(data[1]);
+	        },
+
+	        /**
+	         * @param {string} axisType
+	         * @return {module:echarts/coord/polar/AngleAxis|module:echarts/coord/polar/RadiusAxis}
+	         */
+	        getAxis: function (axisType) {
+	            return this['_' + axisType + 'Axis'];
+	        },
+
+	        /**
+	         * Get axes by type of scale
+	         * @param {string} scaleType
+	         * @return {module:echarts/coord/polar/AngleAxis|module:echarts/coord/polar/RadiusAxis}
+	         */
+	        getAxesByScale: function (scaleType) {
+	            var axes = [];
+	            var angleAxis = this._angleAxis;
+	            var radiusAxis = this._radiusAxis;
+	            angleAxis.scale.type === scaleType && axes.push(angleAxis);
+	            radiusAxis.scale.type === scaleType && axes.push(radiusAxis);
+
+	            return axes;
+	        },
+
+	        /**
+	         * @return {module:echarts/coord/polar/AngleAxis}
+	         */
+	        getAngleAxis: function () {
+	            return this._angleAxis;
+	        },
+
+	        /**
+	         * @return {module:echarts/coord/polar/RadiusAxis}
+	         */
+	        getRadiusAxis: function () {
+	            return this._radiusAxis;
+	        },
+
+	        /**
+	         * @param {module:echarts/coord/polar/Axis}
+	         * @return {module:echarts/coord/polar/Axis}
+	         */
+	        getOtherAxis: function (axis) {
+	            var angleAxis = this._angleAxis;
+	            return axis === angleAxis ? this._radiusAxis : angleAxis;
+	        },
+
+	        /**
+	         * Base axis will be used on stacking.
+	         *
+	         * @return {module:echarts/coord/polar/Axis}
+	         */
+	        getBaseAxis: function () {
+	            return this.getAxesByScale('ordinal')[0]
+	                || this.getAxesByScale('time')[0]
+	                || this.getAngleAxis();
+	        },
+
+	        /**
+	         * Convert series data to a list of (x, y) points
+	         * @param {module:echarts/data/List} data
+	         * @return {Array}
+	         *  Return list of coordinates. For example:
+	         *  `[[10, 10], [20, 20], [30, 30]]`
+	         */
+	        dataToPoints: function (data) {
+	            return data.mapArray(this.dimensions, function (radius, angle) {
+	                return this.dataToPoint([radius, angle]);
+	            }, this);
+	        },
+
+	        /**
+	         * Convert a single data item to (x, y) point.
+	         * Parameter data is an array which the first element is radius and the second is angle
+	         * @param {Array.<number>} data
+	         * @param {boolean} [clamp=false]
+	         * @return {Array.<number>}
+	         */
+	        dataToPoint: function (data, clamp) {
+	            return this.coordToPoint([
+	                this._radiusAxis.dataToRadius(data[0], clamp),
+	                this._angleAxis.dataToAngle(data[1], clamp)
+	            ]);
+	        },
+
+	        /**
+	         * Convert a (x, y) point to data
+	         * @param {Array.<number>} point
+	         * @param {boolean} [clamp=false]
+	         * @return {Array.<number>}
+	         */
+	        pointToData: function (point, clamp) {
+	            var coord = this.pointToCoord(point);
+	            return [
+	                this._radiusAxis.radiusToData(coord[0], clamp),
+	                this._angleAxis.angleToData(coord[1], clamp)
+	            ];
+	        },
+
+	        /**
+	         * Convert a (x, y) point to (radius, angle) coord
+	         * @param {Array.<number>} point
+	         * @return {Array.<number>}
+	         */
+	        pointToCoord: function (point) {
+	            var dx = point[0] - this.cx;
+	            var dy = point[1] - this.cy;
+	            var angleAxis = this.getAngleAxis();
+	            var extent = angleAxis.getExtent();
+	            var minAngle = Math.min(extent[0], extent[1]);
+	            var maxAngle = Math.max(extent[0], extent[1]);
+	            // Fix fixed extent in polarCreator
+	            // FIXME
+	            angleAxis.inverse
+	                ? (minAngle = maxAngle - 360)
+	                : (maxAngle = minAngle + 360);
+
+	            var radius = Math.sqrt(dx * dx + dy * dy);
+	            dx /= radius;
+	            dy /= radius;
+
+	            var radian = Math.atan2(-dy, dx) / Math.PI * 180;
+
+	            // move to angleExtent
+	            var dir = radian < minAngle ? 1 : -1;
+	            while (radian < minAngle || radian > maxAngle) {
+	                radian += dir * 360;
+	            }
+
+	            return [radius, radian];
+	        },
+
+	        /**
+	         * Convert a (radius, angle) coord to (x, y) point
+	         * @param {Array.<number>} coord
+	         * @return {Array.<number>}
+	         */
+	        coordToPoint: function (coord) {
+	            var radius = coord[0];
+	            var radian = coord[1] / 180 * Math.PI;
+	            var x = Math.cos(radian) * radius + this.cx;
+	            // Inverse the y
+	            var y = -Math.sin(radian) * radius + this.cy;
+
+	            return [x, y];
+	        }
+	    };
+
+	    module.exports = Polar;
+
+
+/***/ },
+/* 286 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var Axis = __webpack_require__(123);
+
+	    function RadiusAxis(scale, radiusExtent) {
+
+	        Axis.call(this, 'radius', scale, radiusExtent);
+
+	        /**
+	         * Axis type
+	         *  - 'category'
+	         *  - 'value'
+	         *  - 'time'
+	         *  - 'log'
+	         * @type {string}
+	         */
+	        this.type = 'category';
+	    }
+
+	    RadiusAxis.prototype = {
+
+	        constructor: RadiusAxis,
+
+	        dataToRadius: Axis.prototype.dataToCoord,
+
+	        radiusToData: Axis.prototype.coordToData
+	    };
+
+	    zrUtil.inherits(RadiusAxis, Axis);
+
+	    module.exports = RadiusAxis;
+
+
+/***/ },
+/* 287 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var Axis = __webpack_require__(123);
+
+	    function AngleAxis(scale, angleExtent) {
+
+	        angleExtent = angleExtent || [0, 360];
+
+	        Axis.call(this, 'angle', scale, angleExtent);
+
+	        /**
+	         * Axis type
+	         *  - 'category'
+	         *  - 'value'
+	         *  - 'time'
+	         *  - 'log'
+	         * @type {string}
+	         */
+	        this.type = 'category';
+	    }
+
+	    AngleAxis.prototype = {
+
+	        constructor: AngleAxis,
+
+	        dataToAngle: Axis.prototype.dataToCoord,
+
+	        angleToData: Axis.prototype.coordToData
+	    };
+
+	    zrUtil.inherits(AngleAxis, Axis);
+
+	    module.exports = AngleAxis;
+
+
+/***/ },
+/* 288 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    __webpack_require__(289);
+
+	    __webpack_require__(1).extendComponentModel({
+
+	        type: 'polar',
+
+	        dependencies: ['polarAxis', 'angleAxis'],
+
+	        /**
+	         * @type {module:echarts/coord/polar/Polar}
+	         */
+	        coordinateSystem: null,
+
+	        /**
+	         * @param {string} axisType
+	         * @return {module:echarts/coord/polar/AxisModel}
+	         */
+	        findAxisModel: function (axisType) {
+	            var angleAxisModel;
+	            var ecModel = this.ecModel;
+	            ecModel.eachComponent(axisType, function (axisModel) {
+	                if (ecModel.getComponent(
+	                        'polar', axisModel.getShallow('polarIndex')
+	                    ) === this) {
+	                    angleAxisModel = axisModel;
+	                }
+	            }, this);
+	            return angleAxisModel;
+	        },
+
+	        defaultOption: {
+
+	            zlevel: 0,
+
+	            z: 0,
+
+	            center: ['50%', '50%'],
+
+	            radius: '80%'
+	        }
+	    });
+
+
+/***/ },
+/* 289 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var ComponentModel = __webpack_require__(19);
+	    var axisModelCreator = __webpack_require__(127);
+
+	    var PolarAxisModel = ComponentModel.extend({
+	        type: 'polarAxis',
+	        /**
+	         * @type {module:echarts/coord/polar/AngleAxis|module:echarts/coord/polar/RadiusAxis}
+	         */
+	        axis: null
+	    });
+
+	    zrUtil.merge(PolarAxisModel.prototype, __webpack_require__(129));
+
+	    var polarAxisDefaultExtendedOption = {
+	        angle: {
+	            polarIndex: 0,
+
+	            startAngle: 90,
+
+	            clockwise: true,
+
+	            splitNumber: 12,
+
+	            axisLabel: {
+	                rotate: false
+	            }
+	        },
+	        radius: {
+	            polarIndex: 0,
+
+	            splitNumber: 5
+	        }
+	    };
+
+	    function getAxisType(axisDim, option) {
+	        // Default axis with data is category axis
+	        return option.type || (option.data ? 'category' : 'value');
+	    }
+
+	    axisModelCreator('angle', PolarAxisModel, getAxisType, polarAxisDefaultExtendedOption.angle);
+	    axisModelCreator('radius', PolarAxisModel, getAxisType, polarAxisDefaultExtendedOption.radius);
+
+
+
+/***/ },
+/* 290 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    __webpack_require__(284);
+
+	    __webpack_require__(291);
+
+
+/***/ },
+/* 291 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var graphic = __webpack_require__(43);
+	    var Model = __webpack_require__(12);
+
+	    var elementList = ['axisLine', 'axisLabel', 'axisTick', 'splitLine', 'splitArea'];
+
+	    function getAxisLineShape(polar, r0, r, angle) {
+	        var start = polar.coordToPoint([r0, angle]);
+	        var end = polar.coordToPoint([r, angle]);
+
+	        return {
+	            x1: start[0],
+	            y1: start[1],
+	            x2: end[0],
+	            y2: end[1]
+	        };
+	    }
+	    __webpack_require__(1).extendComponentView({
+
+	        type: 'angleAxis',
+
+	        render: function (angleAxisModel, ecModel) {
+	            this.group.removeAll();
+	            if (!angleAxisModel.get('show')) {
+	                return;
+	            }
+
+	            var polarModel = ecModel.getComponent('polar', angleAxisModel.get('polarIndex'));
+	            var angleAxis = angleAxisModel.axis;
+	            var polar = polarModel.coordinateSystem;
+	            var radiusExtent = polar.getRadiusAxis().getExtent();
+	            var ticksAngles = angleAxis.getTicksCoords();
+
+	            if (angleAxis.type !== 'category') {
+	                // Remove the last tick which will overlap the first tick
+	                ticksAngles.pop();
+	            }
+
+	            zrUtil.each(elementList, function (name) {
+	                if (angleAxisModel.get(name +'.show')) {
+	                    this['_' + name](angleAxisModel, polar, ticksAngles, radiusExtent);
+	                }
+	            }, this);
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _axisLine: function (angleAxisModel, polar, ticksAngles, radiusExtent) {
+	            var lineStyleModel = angleAxisModel.getModel('axisLine.lineStyle');
+
+	            var circle = new graphic.Circle({
+	                shape: {
+	                    cx: polar.cx,
+	                    cy: polar.cy,
+	                    r: radiusExtent[1]
+	                },
+	                style: lineStyleModel.getLineStyle(),
+	                z2: 1,
+	                silent: true
+	            });
+	            circle.style.fill = null;
+
+	            this.group.add(circle);
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _axisTick: function (angleAxisModel, polar, ticksAngles, radiusExtent) {
+	            var tickModel = angleAxisModel.getModel('axisTick');
+
+	            var tickLen = (tickModel.get('inside') ? -1 : 1) * tickModel.get('length');
+
+	            var lines = zrUtil.map(ticksAngles, function (tickAngle) {
+	                return new graphic.Line({
+	                    shape: getAxisLineShape(polar, radiusExtent[1], radiusExtent[1] + tickLen, tickAngle)
+	                });
+	            });
+	            this.group.add(graphic.mergePath(
+	                lines, {
+	                    style: zrUtil.defaults(
+	                        tickModel.getModel('lineStyle').getLineStyle(),
+	                        {
+	                            stroke: angleAxisModel.get('axisLine.lineStyle.color')
+	                        }
+	                    )
+	                }
+	            ));
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _axisLabel: function (angleAxisModel, polar, ticksAngles, radiusExtent) {
+	            var axis = angleAxisModel.axis;
+
+	            var categoryData = angleAxisModel.get('data');
+
+	            var labelModel = angleAxisModel.getModel('axisLabel');
+	            var axisTextStyleModel = labelModel.getModel('textStyle');
+
+	            var labels = angleAxisModel.getFormattedLabels();
+
+	            var labelMargin = labelModel.get('margin');
+	            var labelsAngles = axis.getLabelsCoords();
+
+	            // Use length of ticksAngles because it may remove the last tick to avoid overlapping
+	            for (var i = 0; i < ticksAngles.length; i++) {
+	                var r = radiusExtent[1];
+	                var p = polar.coordToPoint([r + labelMargin, labelsAngles[i]]);
+	                var cx = polar.cx;
+	                var cy = polar.cy;
+
+	                var labelTextAlign = Math.abs(p[0] - cx) / r < 0.3
+	                    ? 'center' : (p[0] > cx ? 'left' : 'right');
+	                var labelTextBaseline = Math.abs(p[1] - cy) / r < 0.3
+	                    ? 'middle' : (p[1] > cy ? 'top' : 'bottom');
+
+	                var textStyleModel = axisTextStyleModel;
+	                if (categoryData && categoryData[i] && categoryData[i].textStyle) {
+	                    textStyleModel = new Model(
+	                        categoryData[i].textStyle, axisTextStyleModel
+	                    );
+	                }
+	                this.group.add(new graphic.Text({
+	                    style: {
+	                        x: p[0],
+	                        y: p[1],
+	                        fill: textStyleModel.getTextColor() || angleAxisModel.get('axisLine.lineStyle.color'),
+	                        text: labels[i],
+	                        textAlign: labelTextAlign,
+	                        textVerticalAlign: labelTextBaseline,
+	                        textFont: textStyleModel.getFont()
+	                    },
+	                    silent: true
+	                }));
+	            }
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _splitLine: function (angleAxisModel, polar, ticksAngles, radiusExtent) {
+	            var splitLineModel = angleAxisModel.getModel('splitLine');
+	            var lineStyleModel = splitLineModel.getModel('lineStyle');
+	            var lineColors = lineStyleModel.get('color');
+	            var lineCount = 0;
+
+	            lineColors = lineColors instanceof Array ? lineColors : [lineColors];
+
+	            var splitLines = [];
+
+	            for (var i = 0; i < ticksAngles.length; i++) {
+	                var colorIndex = (lineCount++) % lineColors.length;
+	                splitLines[colorIndex] = splitLines[colorIndex] || [];
+	                splitLines[colorIndex].push(new graphic.Line({
+	                    shape: getAxisLineShape(polar, radiusExtent[0], radiusExtent[1], ticksAngles[i])
+	                }));
+	            }
+
+	            // Simple optimization
+	            // Batching the lines if color are the same
+	            for (var i = 0; i < splitLines.length; i++) {
+	                this.group.add(graphic.mergePath(splitLines[i], {
+	                    style: zrUtil.defaults({
+	                        stroke: lineColors[i % lineColors.length]
+	                    }, lineStyleModel.getLineStyle()),
+	                    silent: true,
+	                    z: angleAxisModel.get('z')
+	                }));
+	            }
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _splitArea: function (angleAxisModel, polar, ticksAngles, radiusExtent) {
+
+	            var splitAreaModel = angleAxisModel.getModel('splitArea');
+	            var areaStyleModel = splitAreaModel.getModel('areaStyle');
+	            var areaColors = areaStyleModel.get('color');
+	            var lineCount = 0;
+
+	            areaColors = areaColors instanceof Array ? areaColors : [areaColors];
+
+	            var splitAreas = [];
+
+	            var RADIAN = Math.PI / 180;
+	            var prevAngle = -ticksAngles[0] * RADIAN;
+	            var r0 = Math.min(radiusExtent[0], radiusExtent[1]);
+	            var r1 = Math.max(radiusExtent[0], radiusExtent[1]);
+
+	            var clockwise = angleAxisModel.get('clockwise');
+
+	            for (var i = 1; i < ticksAngles.length; i++) {
+	                var colorIndex = (lineCount++) % areaColors.length;
+	                splitAreas[colorIndex] = splitAreas[colorIndex] || [];
+	                splitAreas[colorIndex].push(new graphic.Sector({
+	                    shape: {
+	                        cx: polar.cx,
+	                        cy: polar.cy,
+	                        r0: r0,
+	                        r: r1,
+	                        startAngle: prevAngle,
+	                        endAngle: -ticksAngles[i] * RADIAN,
+	                        clockwise: clockwise
+	                    },
+	                    silent: true
+	                }));
+	                prevAngle = -ticksAngles[i] * RADIAN;
+	            }
+
+	            // Simple optimization
+	            // Batching the lines if color are the same
+	            for (var i = 0; i < splitAreas.length; i++) {
+	                this.group.add(graphic.mergePath(splitAreas[i], {
+	                    style: zrUtil.defaults({
+	                        fill: areaColors[i % areaColors.length]
+	                    }, areaStyleModel.getAreaStyle()),
+	                    silent: true
+	                }));
+	            }
+	        }
+	    });
+
+
+/***/ },
+/* 292 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    __webpack_require__(284);
+
+	    __webpack_require__(293);
+
+
+/***/ },
+/* 293 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var graphic = __webpack_require__(43);
+	    var AxisBuilder = __webpack_require__(132);
+
+	    var axisBuilderAttrs = [
+	        'axisLine', 'axisLabel', 'axisTick', 'axisName'
+	    ];
+	    var selfBuilderAttrs = [
+	        'splitLine', 'splitArea'
+	    ];
+
+	    __webpack_require__(1).extendComponentView({
+
+	        type: 'radiusAxis',
+
+	        render: function (radiusAxisModel, ecModel) {
+	            this.group.removeAll();
+	            if (!radiusAxisModel.get('show')) {
+	                return;
+	            }
+	            var polarModel = ecModel.getComponent('polar', radiusAxisModel.get('polarIndex'));
+	            var angleAxis = polarModel.coordinateSystem.getAngleAxis();
+	            var radiusAxis = radiusAxisModel.axis;
+	            var polar = polarModel.coordinateSystem;
+	            var ticksCoords = radiusAxis.getTicksCoords();
+	            var axisAngle = angleAxis.getExtent()[0];
+	            var radiusExtent = radiusAxis.getExtent();
+
+	            var layout = layoutAxis(polar, radiusAxisModel, axisAngle);
+	            var axisBuilder = new AxisBuilder(radiusAxisModel, layout);
+	            zrUtil.each(axisBuilderAttrs, axisBuilder.add, axisBuilder);
+	            this.group.add(axisBuilder.getGroup());
+
+	            zrUtil.each(selfBuilderAttrs, function (name) {
+	                if (radiusAxisModel.get(name +'.show')) {
+	                    this['_' + name](radiusAxisModel, polar, axisAngle, radiusExtent, ticksCoords);
+	                }
+	            }, this);
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _splitLine: function (radiusAxisModel, polar, axisAngle, radiusExtent, ticksCoords) {
+	            var splitLineModel = radiusAxisModel.getModel('splitLine');
+	            var lineStyleModel = splitLineModel.getModel('lineStyle');
+	            var lineColors = lineStyleModel.get('color');
+	            var lineCount = 0;
+
+	            lineColors = lineColors instanceof Array ? lineColors : [lineColors];
+
+	            var splitLines = [];
+
+	            for (var i = 0; i < ticksCoords.length; i++) {
+	                var colorIndex = (lineCount++) % lineColors.length;
+	                splitLines[colorIndex] = splitLines[colorIndex] || [];
+	                splitLines[colorIndex].push(new graphic.Circle({
+	                    shape: {
+	                        cx: polar.cx,
+	                        cy: polar.cy,
+	                        r: ticksCoords[i]
+	                    },
+	                    silent: true
+	                }));
+	            }
+
+	            // Simple optimization
+	            // Batching the lines if color are the same
+	            for (var i = 0; i < splitLines.length; i++) {
+	                this.group.add(graphic.mergePath(splitLines[i], {
+	                    style: zrUtil.defaults({
+	                        stroke: lineColors[i % lineColors.length],
+	                        fill: null
+	                    }, lineStyleModel.getLineStyle()),
+	                    silent: true
+	                }));
+	            }
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _splitArea: function (radiusAxisModel, polar, axisAngle, radiusExtent, ticksCoords) {
+
+	            var splitAreaModel = radiusAxisModel.getModel('splitArea');
+	            var areaStyleModel = splitAreaModel.getModel('areaStyle');
+	            var areaColors = areaStyleModel.get('color');
+	            var lineCount = 0;
+
+	            areaColors = areaColors instanceof Array ? areaColors : [areaColors];
+
+	            var splitAreas = [];
+
+	            var prevRadius = ticksCoords[0];
+	            for (var i = 1; i < ticksCoords.length; i++) {
+	                var colorIndex = (lineCount++) % areaColors.length;
+	                splitAreas[colorIndex] = splitAreas[colorIndex] || [];
+	                splitAreas[colorIndex].push(new graphic.Sector({
+	                    shape: {
+	                        cx: polar.cx,
+	                        cy: polar.cy,
+	                        r0: prevRadius,
+	                        r: ticksCoords[i],
+	                        startAngle: 0,
+	                        endAngle: Math.PI * 2
+	                    },
+	                    silent: true
+	                }));
+	                prevRadius = ticksCoords[i];
+	            }
+
+	            // Simple optimization
+	            // Batching the lines if color are the same
+	            for (var i = 0; i < splitAreas.length; i++) {
+	                this.group.add(graphic.mergePath(splitAreas[i], {
+	                    style: zrUtil.defaults({
+	                        fill: areaColors[i % areaColors.length]
+	                    }, areaStyleModel.getAreaStyle()),
+	                    silent: true
+	                }));
+	            }
+	        }
+	    });
+
+	    /**
+	     * @inner
+	     */
+	    function layoutAxis(polar, radiusAxisModel, axisAngle) {
+	        return {
+	            position: [polar.cx, polar.cy],
+	            rotation: axisAngle / 180 * Math.PI,
+	            labelDirection: -1,
+	            tickDirection: -1,
+	            nameDirection: 1,
+	            labelRotation: radiusAxisModel.getModel('axisLabel').get('rotate'),
+	            // Over splitLine and splitArea
+	            z2: 1
+	        };
+	    }
+
+
+/***/ },
+/* 294 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    __webpack_require__(295);
+
+	    __webpack_require__(163);
+
+	    __webpack_require__(296);
+
+	    __webpack_require__(176);
+
+	    var echarts = __webpack_require__(1);
+	    var zrUtil = __webpack_require__(4);
+
+	    function makeAction(method, actionInfo) {
+	        actionInfo.update = 'updateView';
+	        echarts.registerAction(actionInfo, function (payload, ecModel) {
+	            var selected = {};
+
+	            ecModel.eachComponent(
+	                { mainType: 'geo', query: payload},
+	                function (geoModel) {
+	                    geoModel[method](payload.name);
+	                    var geo = geoModel.coordinateSystem;
+	                    zrUtil.each(geo.regions, function (region) {
+	                        selected[region.name] = geoModel.isSelected(region.name) || false;
+	                    });
+	                }
+	            );
+
+	            return {
+	                selected: selected,
+	                name: payload.name
+	            }
+	        });
+	    }
+
+	    makeAction('toggleSelected', {
+	        type: 'geoToggleSelect',
+	        event: 'geoselectchanged'
+	    });
+	    makeAction('select', {
+	        type: 'geoSelect',
+	        event: 'geoselected'
+	    });
+	    makeAction('unSelect', {
+	        type: 'geoUnSelect',
+	        event: 'geounselected'
+	    });
+
+
+/***/ },
+/* 295 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	    var modelUtil = __webpack_require__(5);
+	    var ComponentModel = __webpack_require__(19);
+	    var Model = __webpack_require__(12);
+	    var zrUtil = __webpack_require__(4);
+
+	    var selectableMixin = __webpack_require__(140);
+
+	    var geoCreator = __webpack_require__(163);
+
+	    var GeoModel = ComponentModel.extend({
+
+	        type: 'geo',
+
+	        /**
+	         * @type {module:echarts/coord/geo/Geo}
+	         */
+	        coordinateSystem: null,
+
+	        layoutMode: 'box',
+
+	        init: function (option) {
+	            ComponentModel.prototype.init.apply(this, arguments);
+
+	            // Default label emphasis `position` and `show`
+	            modelUtil.defaultEmphasis(
+	                option.label, ['position', 'show', 'textStyle', 'distance', 'formatter']
+	            );
+	        },
+
+	        optionUpdated: function () {
+	            var option = this.option;
+	            var self = this;
+
+	            option.regions = geoCreator.getFilledRegions(option.regions, option.map);
+
+	            this._optionModelMap = zrUtil.reduce(option.regions || [], function (obj, regionOpt) {
+	                if (regionOpt.name) {
+	                    obj[regionOpt.name] = new Model(regionOpt, self);
+	                }
+	                return obj;
+	            }, {});
+
+	            this.updateSelectedMap(option.regions);
+	        },
+
+	        defaultOption: {
+
+	            zlevel: 0,
+
+	            z: 0,
+
+	            show: true,
+
+	            left: 'center',
+
+	            top: 'center',
+
+
+	            // width:,
+	            // height:,
+	            // right
+	            // bottom
+
+	            // Aspect is width / height. Inited to be geoJson bbox aspect
+	            // This parameter is used for scale this aspect
+	            aspectScale: 0.75,
+
+	            ///// Layout with center and size
+	            // If you wan't to put map in a fixed size box with right aspect ratio
+	            // This two properties may more conveninet
+	            // layoutCenter: [50%, 50%]
+	            // layoutSize: 100
+
+
+	            silent: false,
+
+	            // Map type
+	            map: '',
+
+	            // Default on center of map
+	            center: null,
+
+	            zoom: 1,
+
+	            scaleLimit: null,
+
+	            // selectedMode: false
+
+	            label: {
+	                normal: {
+	                    show: false,
+	                    textStyle: {
+	                        color: '#000'
+	                    }
+	                },
+	                emphasis: {
+	                    show: true,
+	                    textStyle: {
+	                        color: 'rgb(100,0,0)'
+	                    }
+	                }
+	            },
+
+	            itemStyle: {
+	                normal: {
+	                    // color: 各异,
+	                    borderWidth: 0.5,
+	                    borderColor: '#444',
+	                    color: '#eee'
+	                },
+	                emphasis: {                 // 也是选中样式
+	                    color: 'rgba(255,215,0,0.8)'
+	                }
+	            },
+
+	            regions: []
+	        },
+
+	        /**
+	         * Get model of region
+	         * @param  {string} name
+	         * @return {module:echarts/model/Model}
+	         */
+	        getRegionModel: function (name) {
+	            return this._optionModelMap[name];
+	        },
+
+	        /**
+	         * Format label
+	         * @param {string} name Region name
+	         * @param {string} [status='normal'] 'normal' or 'emphasis'
+	         * @return {string}
+	         */
+	        getFormattedLabel: function (name, status) {
+	            var formatter = this.get('label.' + status + '.formatter');
+	            var params = {
+	                name: name
+	            };
+	            if (typeof formatter === 'function') {
+	                params.status = status;
+	                return formatter(params);
+	            }
+	            else if (typeof formatter === 'string') {
+	                return formatter.replace('{a}', params.seriesName);
+	            }
+	        },
+
+	        setZoom: function (zoom) {
+	            this.option.zoom = zoom;
+	        },
+
+	        setCenter: function (center) {
+	            this.option.center = center;
+	        }
+	    });
+
+	    zrUtil.mixin(GeoModel, selectableMixin);
+
+	    module.exports = GeoModel;
+
+
+/***/ },
+/* 296 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var MapDraw = __webpack_require__(173);
+
+	    module.exports = __webpack_require__(1).extendComponentView({
+
+	        type: 'geo',
+
+	        init: function (ecModel, api) {
+	            var mapDraw = new MapDraw(api, true);
+	            this._mapDraw = mapDraw;
+
+	            this.group.add(mapDraw.group);
+	        },
+
+	        render: function (geoModel, ecModel, api, payload) {
+	            // Not render if it is an toggleSelect action from self
+	            if (payload && payload.type === 'geoToggleSelect'
+	                && payload.from === this.uid
+	            ) {
+	                return;
+	            }
+
+	            var mapDraw = this._mapDraw;
+	            if (geoModel.get('show')) {
+	                mapDraw.draw(geoModel, ecModel, api, this, payload);
+	            }
+	            else {
+	                this._mapDraw.group.removeAll();
+	            }
+
+	            this.group.silent = geoModel.get('silent');
+	        }
+	    });
+
+
+/***/ },
+/* 297 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    __webpack_require__(298);
+	    __webpack_require__(301);
+	    __webpack_require__(302);
+
+	    var echarts = __webpack_require__(1);
+
+	    echarts.extendComponentView({
+	        type: 'single'
+	    });
+
+
+
+/***/ },
+/* 298 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * Single coordinate system creator.
+	 */
+
+
+	    var Single = __webpack_require__(299);
+
+	    /**
+	     * Create single coordinate system and inject it into seriesModel.
+	     *
+	     * @param {module:echarts/model/Global} ecModel
+	     * @param {module:echarts/ExtensionAPI} api
+	     * @return {Array.<module:echarts/coord/single/Single>}
+	     */
+	    function create(ecModel, api) {
+	        var singles = [];
+
+	        ecModel.eachComponent('singleAxis', function(axisModel, idx) {
+
+	            var single = new Single(axisModel, ecModel, api);
+	            single.name = 'single_' + idx;
+	            single.resize(axisModel, api);
+	            axisModel.coordinateSystem = single;
+	            singles.push(single);
+
+	        });
+
+	        ecModel.eachSeries(function (seriesModel) {
+	            if (seriesModel.get('coordinateSystem') === 'singleAxis') {
+	                var singleAxisIndex = seriesModel.get('singleAxisIndex') || 0;
+	                var axisModel = ecModel.getComponent('singleAxis', singleAxisIndex);
+	                seriesModel.coordinateSystem = axisModel.coordinateSystem;
+	            }
+	        });
+
+	        return singles;
+	    }
+
+	    __webpack_require__(26).register('single', {
+	        create: create,
+	        dimensions: Single.prototype.dimensions
+	    });
+
+
+/***/ },
+/* 299 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * Single coordinates system.
+	 */
+
+
+	    var SingleAxis = __webpack_require__(300);
+	    var axisHelper = __webpack_require__(114);
+	    var layout = __webpack_require__(21);
+
+	    /**
+	     * Create a single coordinates system.
+	     *
+	     * @param {module:echarts/coord/single/AxisModel} axisModel
+	     * @param {module:echarts/model/Global} ecModel
+	     * @param {module:echarts/ExtensionAPI} api
+	     */
+	    function Single(axisModel, ecModel, api) {
+
+	        /**
+	         * @type {string}
+	         * @readOnly
+	         */
+	        this.dimension = 'x';
+
+	        /**
+	         * Add it just for draw tooltip.
+	         *
+	         * @type {Array.<string>}
+	         * @readOnly
+	         */
+	        this.dimensions = ['x'];
+
+	        /**
+	         * @private
+	         * @type {module:echarts/coord/single/SingleAxis}.
+	         */
+	        this._axis = null;
+
+	        /**
+	         * @private
+	         * @type {module:zrender/core/BoundingRect}
+	         */
+	        this._rect;
+
+	        this._init(axisModel, ecModel, api);
+
+	        /**
+	         * @type {module:echarts/coord/single/AxisModel}
+	         */
+	        this._model = axisModel;
+	    }
+
+	    Single.prototype = {
+
+	        type: 'singleAxis',
+
+	        constructor: Single,
+
+	        /**
+	         * Initialize single coordinate system.
+	         *
+	         * @param  {module:echarts/coord/single/AxisModel} axisModel
+	         * @param  {module:echarts/model/Global} ecModel
+	         * @param  {module:echarts/ExtensionAPI} api
+	         * @private
+	         */
+	        _init: function (axisModel, ecModel, api) {
+
+	            var dim = this.dimension;
+
+	            var axis = new SingleAxis(
+	                dim,
+	                axisHelper.createScaleByModel(axisModel),
+	                [0, 0],
+	                axisModel.get('type'),
+	                axisModel.get('position')
+	            );
+
+	            var isCategory = axis.type === 'category';
+	            axis.onBand = isCategory && axisModel.get('boundaryGap');
+	            axis.inverse = axisModel.get('inverse');
+	            axis.orient = axisModel.get('orient');
+
+	            axisModel.axis = axis;
+	            axis.model = axisModel;
+	            this._axis = axis;
+	        },
+
+	        /**
+	         * Update axis scale after data processed
+	         * @param  {module:echarts/model/Global} ecModel
+	         * @param  {module:echarts/ExtensionAPI} api
+	         */
+	        update: function (ecModel, api) {
+	            this._updateAxisFromSeries(ecModel);
+	        },
+
+	        /**
+	         * Update the axis extent from series.
+	         *
+	         * @param  {module:echarts/model/Global} ecModel
+	         * @private
+	         */
+	        _updateAxisFromSeries: function (ecModel) {
+
+	            ecModel.eachSeries(function (seriesModel) {
+
+	                var data = seriesModel.getData();
+	                var dim = this.dimension;
+	                this._axis.scale.unionExtent(
+	                    data.getDataExtent(seriesModel.coordDimToDataDim(dim))
+	                );
+	                axisHelper.niceScaleExtent(this._axis, this._axis.model);
+	            }, this);
+	        },
+
+	        /**
+	         * Resize the single coordinate system.
+	         *
+	         * @param  {module:echarts/coord/single/AxisModel} axisModel
+	         * @param  {module:echarts/ExtensionAPI} api
+	         */
+	        resize: function (axisModel, api) {
+	            this._rect = layout.getLayoutRect(
+	                {
+	                    left: axisModel.get('left'),
+	                    top: axisModel.get('top'),
+	                    right: axisModel.get('right'),
+	                    bottom: axisModel.get('bottom'),
+	                    width: axisModel.get('width'),
+	                    height: axisModel.get('height')
+	                },
+	                {
+	                    width: api.getWidth(),
+	                    height: api.getHeight()
+	                }
+	            );
+
+	            this._adjustAxis();
+	        },
+
+	        /**
+	         * @return {module:zrender/core/BoundingRect}
+	         */
+	        getRect: function () {
+	            return this._rect;
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _adjustAxis: function () {
+
+	            var rect = this._rect;
+	            var axis = this._axis;
+
+	            var isHorizontal = axis.isHorizontal();
+	            var extent = isHorizontal ? [0, rect.width] : [0, rect.height];
+	            var idx =  axis.reverse ? 1 : 0;
+
+	            axis.setExtent(extent[idx], extent[1 - idx]);
+
+	            this._updateAxisTransform(axis, isHorizontal ? rect.x : rect.y);
+
+	        },
+
+	        /**
+	         * @param  {module:echarts/coord/single/SingleAxis} axis
+	         * @param  {number} coordBase
+	         */
+	        _updateAxisTransform: function (axis, coordBase) {
+
+	            var axisExtent = axis.getExtent();
+	            var extentSum = axisExtent[0] + axisExtent[1];
+	            var isHorizontal = axis.isHorizontal();
+
+	            axis.toGlobalCoord = isHorizontal ?
+	                function (coord) {
+	                    return coord + coordBase;
+	                } :
+	                function (coord) {
+	                    return extentSum - coord + coordBase;
+	                };
+
+	            axis.toLocalCoord = isHorizontal ?
+	                function (coord) {
+	                    return coord - coordBase;
+	                } :
+	                function (coord) {
+	                    return extentSum - coord + coordBase;
+	                };
+	        },
+
+	        /**
+	         * Get axis.
+	         *
+	         * @return {module:echarts/coord/single/SingleAxis}
+	         */
+	        getAxis: function () {
+	            return this._axis;
+	        },
+
+	        /**
+	         * Get axis, add it just for draw tooltip.
+	         *
+	         * @return {[type]} [description]
+	         */
+	        getBaseAxis: function () {
+	            return this._axis;
+	        },
+
+	        /**
+	         * If contain point.
+	         *
+	         * @param  {Array.<number>} point
+	         * @return {boolean}
+	         */
+	        containPoint: function (point) {
+	            var rect = this.getRect();
+	            var axis = this.getAxis();
+	            var orient = axis.orient;
+	            if (orient === 'horizontal') {
+	                return axis.contain(axis.toLocalCoord(point[0]))
+	                && (point[1] >= rect.y && point[1] <= (rect.y + rect.height));
+	            }
+	            else {
+	                return axis.contain(axis.toLocalCoord(point[1]))
+	                && (point[0] >= rect.y && point[0] <= (rect.y + rect.height));
+	            }
+	        },
+
+	        /**
+	         * @param {Array.<number>} point
+	         * @return {Array.<number>}
+	         */
+	        pointToData: function (point) {
+	            var axis = this.getAxis();
+	            return [axis.coordToData(axis.toLocalCoord(
+	                point[axis.orient === 'horizontal' ? 0 : 1]
+	            ))];
+	        },
+
+	        /**
+	         * Convert the series data to concrete point.
+	         *
+	         * @param  {number|Array.<number>} val
+	         * @return {Array.<number>}
+	         */
+	        dataToPoint: function (val) {
+	            var axis = this.getAxis();
+	            var rect = this.getRect();
+	            var pt = [];
+	            var idx = axis.orient === 'horizontal' ? 0 : 1;
+	            pt[idx] = axis.toGlobalCoord(axis.dataToCoord(+val));
+	            pt[1 - idx] = idx === 0 ? (rect.y + rect.height / 2) : (rect.x + rect.width / 2);
+	            return pt;
+	        }
+	    };
+
+	    module.exports = Single;
+
+
+
+/***/ },
+/* 300 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+	    var Axis = __webpack_require__(123);
+	    var axisHelper = __webpack_require__(114);
+
+	    /**
+	     * @constructor  module:echarts/coord/single/SingleAxis
+	     * @extends {module:echarts/coord/Axis}
+	     * @param {string} dim
+	     * @param {*} scale
+	     * @param {Array.<number>} coordExtent
+	     * @param {string} axisType
+	     * @param {string} position
+	     */
+	    var SingleAxis = function (dim, scale, coordExtent, axisType, position) {
+
+	        Axis.call(this, dim, scale, coordExtent);
+
+	        /**
+	         * Axis type
+	         * - 'category'
+	         * - 'value'
+	         * - 'time'
+	         * - 'log'
+	         * @type {string}
+	         */
+	        this.type = axisType || 'value';
+
+	        /**
+	         * Axis position
+	         *  - 'top'
+	         *  - 'bottom'
+	         *  - 'left'
+	         *  - 'right'
+	         *  @type {string}
+	         */
+	        this.position = position || 'bottom';
+
+	        /**
+	         * Axis orient
+	         *  - 'horizontal'
+	         *  - 'vertical'
+	         * @type {[type]}
+	         */
+	        this.orient = null;
+
+	        /**
+	         * @type {number}
+	         */
+	        this._labelInterval = null;
+
+	    };
+
+	    SingleAxis.prototype = {
+
+	        constructor: SingleAxis,
+
+	        /**
+	         * Axis model
+	         * @type {module:echarts/coord/single/AxisModel}
+	         */
+	        model: null,
+
+	        /**
+	         * Judge the orient of the axis.
+	         * @return {boolean}
+	         */
+	        isHorizontal: function () {
+	            var position = this.position;
+	            return position === 'top' || position === 'bottom';
+
+	        },
+
+	        /**
+	         * Get interval of the axis label.
+	         * @return {number}
+	         */
+	        getLabelInterval: function () {
+	            var labelInterval = this._labelInterval;
+	            if (!labelInterval) {
+	                var axisModel = this.model;
+	                var labelModel = axisModel.getModel('axisLabel');
+	                var interval = labelModel.get('interval');
+	                if (!(this.type === 'category' && interval === 'auto')) {
+
+	                    labelInterval = this._labelInterval = interval === 'auto' ? 0 : interval;
+	                    return labelInterval;
+	                }
+	                labelInterval = this._labelInterval =
+	                    axisHelper.getAxisLabelInterval(
+	                        zrUtil.map(this.scale.getTicks(), this.dataToCoord, this),
+	                        axisModel.getFormattedLabels(),
+	                        labelModel.getModel('textStyle').getFont(),
+	                        this.isHorizontal()
+	                    );
+	            }
+	            return labelInterval;
+	        },
+
+	        /**
+	         * Convert the local coord(processed by dataToCoord())
+	         * to global coord(concrete pixel coord).
+	         * designated by module:echarts/coord/single/Single.
+	         * @type {Function}
+	         */
+	        toGlobalCoord: null,
+
+	        /**
+	         * Convert the global coord to local coord.
+	         * designated by module:echarts/coord/single/Single.
+	         * @type {Function}
+	         */
+	        toLocalCoord: null
+
+	    };
+
+	    zrUtil.inherits(SingleAxis, Axis);
+
+	    module.exports = SingleAxis;
+
+
+/***/ },
+/* 301 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var AxisBuilder = __webpack_require__(132);
+	    var zrUtil =  __webpack_require__(4);
+	    var graphic = __webpack_require__(43);
+	    var getInterval = AxisBuilder.getInterval;
+	    var ifIgnoreOnTick = AxisBuilder.ifIgnoreOnTick;
+
+	    var axisBuilderAttrs = [
+	        'axisLine', 'axisLabel', 'axisTick', 'axisName'
+	    ];
+
+	    var selfBuilderAttr = 'splitLine'; 
+
+	    var AxisView = __webpack_require__(1).extendComponentView({
+
+	        type: 'singleAxis',
+
+	        render: function (axisModel, ecModel) {
+
+	            var group = this.group;
+
+	            group.removeAll();
+
+	            var layout =  axisLayout(axisModel);
+
+	            var axisBuilder = new AxisBuilder(axisModel, layout);
+
+	            zrUtil.each(axisBuilderAttrs, axisBuilder.add, axisBuilder);
+
+	            group.add(axisBuilder.getGroup());
+
+	            if (axisModel.get(selfBuilderAttr + '.show')) {
+	                this['_' + selfBuilderAttr](axisModel, layout.labelInterval);
+	            }
+	        },
+
+	        _splitLine: function(axisModel, labelInterval) {
+	            var axis = axisModel.axis;
+	            var splitLineModel = axisModel.getModel('splitLine');
+	            var lineStyleModel = splitLineModel.getModel('lineStyle');
+	            var lineWidth = lineStyleModel.get('width');
+	            var lineColors = lineStyleModel.get('color');
+	            var lineInterval = getInterval(splitLineModel, labelInterval);
+
+	            lineColors = lineColors instanceof Array ? lineColors : [lineColors];
+
+	            var gridRect = axisModel.coordinateSystem.getRect();
+	            var isHorizontal = axis.isHorizontal();
+
+	            var splitLines = [];
+	            var lineCount = 0;
+
+	            var ticksCoords = axis.getTicksCoords();
+
+	            var p1 = [];
+	            var p2 = [];
+
+	            for (var i = 0; i < ticksCoords.length; ++i) {
+	                if (ifIgnoreOnTick(axis, i, lineInterval)) {
+	                    continue;
+	                }
+	                var tickCoord = axis.toGlobalCoord(ticksCoords[i]);
+	                if (isHorizontal) {
+	                    p1[0] = tickCoord;
+	                    p1[1] = gridRect.y;
+	                    p2[0] = tickCoord;
+	                    p2[1] = gridRect.y + gridRect.height;
+	                }
+	                else {
+	                    p1[0] = gridRect.x;
+	                    p1[1] = tickCoord;
+	                    p2[0] = gridRect.x + gridRect.width;
+	                    p2[1] = tickCoord;
+	                }
+	                var colorIndex = (lineCount++) % lineColors.length;
+	                splitLines[colorIndex] = splitLines[colorIndex] || [];
+	                splitLines[colorIndex].push(new graphic.Line(
+	                    graphic.subPixelOptimizeLine({
+	                        shape: {
+	                            x1: p1[0],
+	                            y1: p1[1],
+	                            x2: p2[0],
+	                            y2: p2[1]
+	                        },
+	                        style: {
+	                            lineWidth: lineWidth
+	                        },
+	                        silent: true
+	                    })));
+	            }
+
+	            for (var i = 0; i < splitLines.length; ++i) {
+	                this.group.add(graphic.mergePath(splitLines[i], {
+	                    style: {
+	                        stroke: lineColors[i % lineColors.length],
+	                        lineDash: lineStyleModel.getLineDash(),
+	                        lineWidth: lineWidth
+	                    },
+	                    silent: true
+	                }));
+	            }
+	        }
+	    });
+
+	    function axisLayout(axisModel) {
+
+	        var single = axisModel.coordinateSystem;
+	        var axis = axisModel.axis;
+	        var layout = {};
+
+	        var axisPosition = axis.position;
+	        var orient = axis.orient;
+
+	        var rect = single.getRect();
+	        var rectBound = [rect.x, rect.x + rect.width, rect.y, rect.y + rect.height];
+
+	        var positionMap = {
+	            horizontal: {top: rectBound[2], bottom: rectBound[3]},
+	            vertical: {left: rectBound[0], right: rectBound[1]}
+	        };
+
+	        layout.position = [
+	            orient === 'vertical' 
+	                ? positionMap.vertical[axisPosition] 
+	                : rectBound[0],
+	            orient === 'horizontal' 
+	                ? positionMap.horizontal[axisPosition] 
+	                : rectBound[3]
+	        ];
+
+	        var r = {horizontal: 0, vertical: 1};
+	        layout.rotation = Math.PI / 2 * r[orient];
+
+	        var directionMap = {top: -1, bottom: 1, right: 1, left: -1};
+
+	        layout.labelDirection = layout.tickDirection  
+	            = layout.nameDirection 
+	            = directionMap[axisPosition];
+
+	        if (axisModel.getModel('axisTick').get('inside')) {
+	            layout.tickDirection = -layout.tickDirection;
+	        }
+
+	        if (axisModel.getModel('axisLabel').get('inside')) {
+	            layout.labelDirection = -layout.labelDirection;
+	        }
+
+	        var labelRotation = axisModel.getModel('axisLabel').get('rotate');
+	        layout.labelRotation = axisPosition === 'top' ? -labelRotation : labelRotation;
+
+	        layout.labelInterval = axis.getLabelInterval();
+
+	        layout.z2 = 1;
+
+	        return layout;
+	    }
+
+	    module.exports = AxisView;
+	    
+
+
+/***/ },
+/* 302 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var ComponentModel = __webpack_require__(19);
+	    var axisModelCreator = __webpack_require__(127);
+	    var zrUtil =  __webpack_require__(4);
+
+	    var AxisModel = ComponentModel.extend({
+
+	        type: 'singleAxis',
+
+	        layoutMode: 'box',
+
+	        /**
+	         * @type {module:echarts/coord/single/SingleAxis}
+	         */
+	        axis: null,
+
+	        /**
+	         * @type {module:echarts/coord/single/Single}
+	         */
+	        coordinateSystem: null
+
+	    });
+
+	    var defaultOption = {
+
+	        left: '5%',
+	        top: '5%',
+	        right: '5%',
+	        bottom: '5%',
+
+	        type: 'value',
+
+	        position: 'bottom',
+
+	        orient: 'horizontal',
+
+	        axisLine: {
+	            show: true,
+	            lineStyle: {
+	                width: 2,
+	                type: 'solid'
+	            }
+	        },
+
+	        axisTick: {
+	            show: true,
+	            length: 6,
+	            lineStyle: {
+	                width: 2
+	            }
+	        },
+
+	        axisLabel: {
+	            show: true,
+	            interval: 'auto'
+	        },
+
+	        splitLine: {
+	            show: true,
+	            lineStyle: {
+	                type: 'dashed',
+	                opacity: 0.2
+	            }
+	        }
+	    };
+
+	    function getAxisType(axisName, option) {
+	        return option.type || (option.data ? 'category' : 'value');
+	    }
+
+	    zrUtil.merge(AxisModel.prototype, __webpack_require__(129));
+
+	    axisModelCreator('single', AxisModel, getAxisType, defaultOption);
+
+	    module.exports = AxisModel;
+
+
+/***/ },
+/* 303 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * Brush component entry
+	 */
+
+
+	    __webpack_require__(1).registerPreprocessor(
+	        __webpack_require__(304)
+	    );
+
+	    __webpack_require__(305);
+	    __webpack_require__(310);
+	    __webpack_require__(311);
+	    __webpack_require__(312);
+
+	    __webpack_require__(313);
+
+
+
+/***/ },
+/* 304 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @file brush preprocessor
+	 */
+
+
+	    var zrUtil = __webpack_require__(4);
+
+	    var DEFAULT_TOOLBOX_BTNS = ['rect', 'polygon', 'keep', 'clear'];
+
+	    module.exports = function (option, isNew) {
+	        var brushComponents = option && option.brush;
+	        if (!zrUtil.isArray(brushComponents)) {
+	            brushComponents = brushComponents ? [brushComponents] : [];
+	        }
+
+	        if (!brushComponents.length) {
+	            return;
+	        }
+
+	        var brushComponentSpecifiedBtns = [];
+
+	        zrUtil.each(brushComponents, function (brushOpt) {
+	            var tbs = brushOpt.hasOwnProperty('toolbox')
+	                ? brushOpt.toolbox : [];
+
+	            if (tbs instanceof Array) {
+	                brushComponentSpecifiedBtns = brushComponentSpecifiedBtns.concat(tbs);
+	            }
+	        });
+
+	        var toolbox = option && option.toolbox;
+
+	        if (zrUtil.isArray(toolbox)) {
+	            toolbox = toolbox[0];
+	        }
+	        if (!toolbox) {
+	            toolbox = {feature: {}};
+	            option.toolbox = [toolbox];
+	        }
+
+	        var toolboxFeature = (toolbox.feature || (toolbox.feature = {}));
+	        var toolboxBrush = toolboxFeature.brush || (toolboxFeature.brush = {});
+	        var brushTypes = toolboxBrush.type || (toolboxBrush.type = []);
+
+	        brushTypes.push.apply(brushTypes, brushComponentSpecifiedBtns);
+
+	        removeDuplicate(brushTypes);
+
+	        if (isNew && !brushTypes.length) {
+	            brushTypes.push.apply(brushTypes, DEFAULT_TOOLBOX_BTNS);
+	        }
+	    };
+
+	    function removeDuplicate(arr) {
+	        var map = {};
+	        zrUtil.each(arr, function (val) {
+	            map[val] = 1;
+	        });
+	        arr.length = 0;
+	        zrUtil.each(map, function (flag, val) {
+	            arr.push(val);
+	        });
+	    }
+
+
+
+/***/ },
+/* 305 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @file Brush visual coding.
+	 */
+
+
+	    var echarts = __webpack_require__(1);
+	    var visualSolution = __webpack_require__(306);
+	    var zrUtil = __webpack_require__(4);
+	    var BoundingRect = __webpack_require__(9);
+	    var selector = __webpack_require__(307);
+	    var throttle = __webpack_require__(308);
+	    var brushHelper = __webpack_require__(309);
+
+	    var STATE_LIST = ['inBrush', 'outOfBrush'];
+	    var DISPATCH_METHOD = '__ecBrushSelect';
+	    var DISPATCH_FLAG = '__ecInBrushSelectEvent';
+	    var PRIORITY_BRUSH = echarts.PRIORITY.VISUAL.BRUSH;
+
+	    /**
+	     * Layout for visual, the priority higher than other layout, and before brush visual.
+	     */
+	    echarts.registerLayout(PRIORITY_BRUSH, function (ecModel, api, payload) {
+	        ecModel.eachComponent({mainType: 'brush'}, function (brushModel) {
+
+	            payload && payload.type === 'takeGlobalCursor' && brushModel.setBrushOption(
+	                payload.key === 'brush' ? payload.brushOption : {brushType: false}
+	            );
+
+	            brushModel.coordInfoList = brushHelper.makeCoordInfoList(brushModel.option, ecModel);
+
+	            brushHelper.parseInputRanges(brushModel, ecModel);
+	        });
+	    });
+
+	    /**
+	     * Register the visual encoding if this modules required.
+	     */
+	    echarts.registerVisual(PRIORITY_BRUSH, function (ecModel, api, payload) {
+
+	        var brushSelected = [];
+	        var throttleType;
+	        var throttleDelay;
+
+	        ecModel.eachComponent({mainType: 'brush'}, function (brushModel, brushIndex) {
+
+	            var thisBrushSelected = {
+	                brushId: brushModel.id,
+	                brushIndex: brushIndex,
+	                brushName: brushModel.name,
+	                areas: zrUtil.clone(brushModel.areas),
+	                selected: []
+	            };
+	            // Every brush component exists in event params, convenient
+	            // for user to find by index.
+	            brushSelected.push(thisBrushSelected);
+
+	            var brushOption = brushModel.option;
+	            var brushLink = brushOption.brushLink;
+	            var linkedSeriesMap = [];
+	            var selectedDataIndexForLink = [];
+	            var rangeInfoBySeries = [];
+	            var hasBrushExists = 0;
+
+	            if (!brushIndex) { // Only the first throttle setting works.
+	                throttleType = brushOption.throttleType;
+	                throttleDelay = brushOption.throttleDelay;
+	            }
+
+	            // Add boundingRect and selectors to range.
+	            var areas = zrUtil.map(brushModel.areas, function (area) {
+	                return bindSelector(
+	                    zrUtil.defaults(
+	                        {boundingRect: boundingRectBuilders[area.brushType](area)},
+	                        area
+	                    )
+	                );
+	            });
+
+	            var visualMappings = visualSolution.createVisualMappings(
+	                brushModel.option, STATE_LIST, function (mappingOption) {
+	                    mappingOption.mappingMethod = 'fixed';
+	                }
+	            );
+
+	            zrUtil.isArray(brushLink) && zrUtil.each(brushLink, function (seriesIndex) {
+	                linkedSeriesMap[seriesIndex] = 1;
+	            });
+
+	            function linkOthers(seriesIndex) {
+	                return brushLink === 'all' || linkedSeriesMap[seriesIndex];
+	            }
+
+	            // If no supported brush or no brush on the series,
+	            // all visuals should be in original state.
+	            function brushed(rangeInfoList) {
+	                return !!rangeInfoList.length;
+	            }
+
+	            /**
+	             * Logic for each series: (If the logic has to be modified one day, do it carefully!)
+	             *
+	             * ( brushed ┬ && ┬hasBrushExist ┬ && linkOthers  ) => StepA: ┬record, ┬ StepB: ┬visualByRecord.
+	             *   !brushed┘    ├hasBrushExist ┤                            └nothing,┘        ├visualByRecord.
+	             *                └!hasBrushExist┘                                              └nothing.
+	             * ( !brushed  && ┬hasBrushExist ┬ && linkOthers  ) => StepA:  nothing,  StepB: ┬visualByRecord.
+	             *                └!hasBrushExist┘                                              └nothing.
+	             * ( brushed ┬ &&                     !linkOthers ) => StepA:  nothing,  StepB: ┬visualByCheck.
+	             *   !brushed┘                                                                  └nothing.
+	             * ( !brushed  &&                     !linkOthers ) => StepA:  nothing,  StepB:  nothing.
+	             */
+
+	            // Step A
+	            ecModel.eachSeries(function (seriesModel, seriesIndex) {
+	                var rangeInfoList = rangeInfoBySeries[seriesIndex] = [];
+
+	                seriesModel.subType === 'parallel'
+	                    ? stepAParallel(seriesModel, seriesIndex, rangeInfoList)
+	                    : stepAOthers(seriesModel, seriesIndex, rangeInfoList);
+	            });
+
+	            function stepAParallel(seriesModel, seriesIndex) {
+	                var coordSys = seriesModel.coordinateSystem;
+	                hasBrushExists |= coordSys.hasAxisbrushed();
+
+	                linkOthers(seriesIndex) && coordSys.eachActiveState(
+	                    seriesModel.getData(),
+	                    function (activeState, dataIndex) {
+	                        activeState === 'active' && (selectedDataIndexForLink[dataIndex] = 1);
+	                    }
+	                );
+	            }
+
+	            function stepAOthers(seriesModel, seriesIndex, rangeInfoList) {
+	                var selectorsByBrushType = getSelectorsByBrushType(seriesModel);
+	                if (!selectorsByBrushType || brushModelNotControll(brushModel, seriesIndex)) {
+	                    return;
+	                }
+
+	                zrUtil.each(areas, function (area) {
+	                    selectorsByBrushType[area.brushType]
+	                        && brushHelper.controlSeries(area, brushModel, seriesModel)
+	                        && rangeInfoList.push(area);
+	                    hasBrushExists |= brushed(rangeInfoList);
+	                });
+
+	                if (linkOthers(seriesIndex) && brushed(rangeInfoList)) {
+	                    var data = seriesModel.getData();
+	                    data.each(function (dataIndex) {
+	                        if (checkInRange(selectorsByBrushType, rangeInfoList, data, dataIndex)) {
+	                            selectedDataIndexForLink[dataIndex] = 1;
+	                        }
+	                    });
+	                }
+	            }
+
+	            // Step B
+	            ecModel.eachSeries(function (seriesModel, seriesIndex) {
+	                var seriesBrushSelected = {
+	                    seriesId: seriesModel.id,
+	                    seriesIndex: seriesIndex,
+	                    seriesName: seriesModel.name,
+	                    dataIndex: []
+	                };
+	                // Every series exists in event params, convenient
+	                // for user to find series by seriesIndex.
+	                thisBrushSelected.selected.push(seriesBrushSelected);
+
+	                var selectorsByBrushType = getSelectorsByBrushType(seriesModel);
+	                var rangeInfoList = rangeInfoBySeries[seriesIndex];
+
+	                var data = seriesModel.getData();
+	                var getValueState = linkOthers(seriesIndex)
+	                    ? function (dataIndex) {
+	                        return selectedDataIndexForLink[dataIndex]
+	                            ? (seriesBrushSelected.dataIndex.push(data.getRawIndex(dataIndex)), 'inBrush')
+	                            : 'outOfBrush';
+	                    }
+	                    : function (dataIndex) {
+	                        return checkInRange(selectorsByBrushType, rangeInfoList, data, dataIndex)
+	                            ? (seriesBrushSelected.dataIndex.push(data.getRawIndex(dataIndex)), 'inBrush')
+	                            : 'outOfBrush';
+	                    };
+
+	                // If no supported brush or no brush, all visuals are in original state.
+	                (linkOthers(seriesIndex) ? hasBrushExists : brushed(rangeInfoList))
+	                    && visualSolution.applyVisual(
+	                        STATE_LIST, visualMappings, data, getValueState
+	                    );
+	            });
+
+	        });
+
+	        dispatchAction(api, throttleType, throttleDelay, brushSelected, payload);
+	    });
+
+	    function dispatchAction(api, throttleType, throttleDelay, brushSelected, payload) {
+	        // This event will not be triggered when `setOpion`, otherwise dead lock may
+	        // triggered when do `setOption` in event listener, which we do not find
+	        // satisfactory way to solve yet. Some considered resolutions:
+	        // (a) Diff with prevoius selected data ant only trigger event when changed.
+	        // But store previous data and diff precisely (i.e., not only by dataIndex, but
+	        // also detect value changes in selected data) might bring complexity or fragility.
+	        // (b) Use spectial param like `silent` to suppress event triggering.
+	        // But such kind of volatile param may be weird in `setOption`.
+	        if (!payload) {
+	            return;
+	        }
+
+	        var zr = api.getZr();
+	        if (zr[DISPATCH_FLAG]) {
+	            return;
+	        }
+
+	        if (!zr[DISPATCH_METHOD]) {
+	            zr[DISPATCH_METHOD] = doDispatch;
+	        }
+
+	        var fn = throttle.createOrUpdate(zr, DISPATCH_METHOD, throttleDelay, throttleType);
+
+	        fn(api, brushSelected);
+	    }
+
+	    function doDispatch(api, brushSelected) {
+	        if (!api.isDisposed()) {
+	            var zr = api.getZr();
+	            zr[DISPATCH_FLAG] = true;
+	            api.dispatchAction({
+	                type: 'brushSelect',
+	                batch: brushSelected
+	            });
+	            zr[DISPATCH_FLAG] = false;
+	        }
+	    }
+
+	    function checkInRange(selectorsByBrushType, rangeInfoList, data, dataIndex) {
+	        var itemLayout = data.getItemLayout(dataIndex);
+	        for (var i = 0, len = rangeInfoList.length; i < len; i++) {
+	            var area = rangeInfoList[i];
+	            if (selectorsByBrushType[area.brushType](
+	                itemLayout, area.selectors, area
+	            )) {
+	                return true;
+	            }
+	        }
+	    }
+
+	    function getSelectorsByBrushType(seriesModel) {
+	        var brushSelector = seriesModel.brushSelector;
+	        if (zrUtil.isString(brushSelector)) {
+	            var sels = [];
+	            zrUtil.each(selector, function (selectorsByElementType, brushType) {
+	                sels[brushType] = selectorsByElementType[brushSelector];
+	            });
+	            return sels;
+	        }
+	        else if (zrUtil.isFunction(brushSelector)) {
+	            var bSelector = {};
+	            zrUtil.each(selector, function (sel, brushType) {
+	                bSelector[brushType] = brushSelector;
+	            });
+	            return bSelector;
+	        }
+	        return brushSelector;
+	    }
+
+	    function brushModelNotControll(brushModel, seriesIndex) {
+	        var seriesIndices = brushModel.option.seriesIndex;
+	        return seriesIndices != null
+	            && seriesIndices !== 'all'
+	            && (
+	                zrUtil.isArray(seriesIndices)
+	                ? zrUtil.indexOf(seriesIndices, seriesIndex) < 0
+	                : seriesIndex !== seriesIndices
+	            );
+	    }
+
+	    function bindSelector(area) {
+	        var selectors = area.selectors = {};
+	        zrUtil.each(selector[area.brushType], function (selFn, elType) {
+	            // Do not use function binding or curry for performance.
+	            selectors[elType] = function (itemLayout) {
+	                return selFn(itemLayout, selectors, area);
+	            };
+	        });
+	        return area;
+	    }
+
+	    var boundingRectBuilders = {
+
+	        lineX: zrUtil.noop,
+
+	        lineY: zrUtil.noop,
+
+	        rect: function (area) {
+	            return getBoundingRectFromMinMax(area.range);
+	        },
+
+	        polygon: function (area) {
+	            var minMax;
+	            var range = area.range;
+
+	            for (var i = 0, len = range.length; i < len; i++) {
+	                minMax = minMax || [[Infinity, -Infinity], [Infinity, -Infinity]];
+	                var rg = range[i];
+	                rg[0] < minMax[0][0] && (minMax[0][0] = rg[0]);
+	                rg[0] > minMax[0][1] && (minMax[0][1] = rg[0]);
+	                rg[1] < minMax[1][0] && (minMax[1][0] = rg[1]);
+	                rg[1] > minMax[1][1] && (minMax[1][1] = rg[1]);
+	            }
+
+	            return minMax && getBoundingRectFromMinMax(minMax);
+	        }
+	    };
+
+	    function getBoundingRectFromMinMax(minMax) {
+	        return new BoundingRect(
+	            minMax[0][0],
+	            minMax[1][0],
+	            minMax[0][1] - minMax[0][0],
+	            minMax[1][1] - minMax[1][0]
+	        );
+	    }
+
+
+
+/***/ },
+/* 306 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @file Visual solution, for consistent option specification.
+	 */
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var VisualMapping = __webpack_require__(192);
+	    var each = zrUtil.each;
+
+	    function hasKeys(obj) {
+	        if (obj) {
+	            for (var name in obj){
+	                if (obj.hasOwnProperty(name)) {
+	                    return true;
+	                }
+	            }
+	        }
+	    }
+
+	    var visualSolution = {
+
+	        /**
+	         * @param {Object} option
+	         * @param {Array.<string>} stateList
+	         * @param {Function} [supplementVisualOption]
+	         * @return {Object} visualMappings <state, <visualType, module:echarts/visual/VisualMapping>>
+	         */
+	        createVisualMappings: function (option, stateList, supplementVisualOption) {
+	            var visualMappings = {};
+
+	            each(stateList, function (state) {
+	                var mappings = visualMappings[state] = createMappings();
+
+	                each(option[state], function (visualData, visualType) {
+	                    if (!VisualMapping.isValidType(visualType)) {
+	                        return;
+	                    }
+	                    var mappingOption = {
+	                        type: visualType,
+	                        visual: visualData
+	                    };
+	                    supplementVisualOption && supplementVisualOption(mappingOption, state);
+	                    mappings[visualType] = new VisualMapping(mappingOption);
+
+	                    // Prepare a alpha for opacity, for some case that opacity
+	                    // is not supported, such as rendering using gradient color.
+	                    if (visualType === 'opacity') {
+	                        mappingOption = zrUtil.clone(mappingOption);
+	                        mappingOption.type = 'colorAlpha';
+	                        mappings.__hidden.__alphaForOpacity = new VisualMapping(mappingOption);
+	                    }
+	                });
+	            });
+
+	            return visualMappings;
+
+	            function createMappings() {
+	                var Creater = function () {};
+	                // Make sure hidden fields will not be visited by
+	                // object iteration (with hasOwnProperty checking).
+	                Creater.prototype.__hidden = Creater.prototype;
+	                var obj = new Creater();
+	                return obj;
+	            }
+	        },
+
+	        /**
+	         * @param {Object} thisOption
+	         * @param {Object} newOption
+	         * @param {Array.<string>} keys
+	         */
+	        replaceVisualOption: function (thisOption, newOption, keys) {
+	            // Visual attributes merge is not supported, otherwise it
+	            // brings overcomplicated merge logic. See #2853. So if
+	            // newOption has anyone of these keys, all of these keys
+	            // will be reset. Otherwise, all keys remain.
+	            var has;
+	            zrUtil.each(keys, function (key) {
+	                if (newOption.hasOwnProperty(key) && hasKeys(newOption[key])) {
+	                    has = true;
+	                }
+	            });
+	            has && zrUtil.each(keys, function (key) {
+	                if (newOption.hasOwnProperty(key) && hasKeys(newOption[key])) {
+	                    thisOption[key] = zrUtil.clone(newOption[key]);
+	                }
+	                else {
+	                    delete thisOption[key];
+	                }
+	            });
+	        },
+
+	        /**
+	         * @param {Array.<string>} stateList
+	         * @param {Object} visualMappings <state, Object.<visualType, module:echarts/visual/VisualMapping>>
+	         * @param {module:echarts/data/List} list
+	         * @param {Function} getValueState param: valueOrIndex, return: state.
+	         * @param {object} [scope] Scope for getValueState
+	         * @param {string} [dimension] Concrete dimension, if used.
+	         */
+	        applyVisual: function (stateList, visualMappings, data, getValueState, scope, dimension) {
+	            var visualTypesMap = {};
+	            zrUtil.each(stateList, function (state) {
+	                var visualTypes = VisualMapping.prepareVisualTypes(visualMappings[state]);
+	                visualTypesMap[state] = visualTypes;
+	            });
+
+	            var dataIndex;
+
+	            function getVisual(key) {
+	                return data.getItemVisual(dataIndex, key);
+	            }
+
+	            function setVisual(key, value) {
+	                data.setItemVisual(dataIndex, key, value);
+	            }
+
+	            if (dimension == null) {
+	                data.each(eachItem, true);
+	            }
+	            else {
+	                data.each([dimension], eachItem, true);
+	            }
+
+	            function eachItem(valueOrIndex, index) {
+	                dataIndex = dimension == null ? valueOrIndex : index;
+	                var valueState = getValueState.call(scope, valueOrIndex);
+	                var mappings = visualMappings[valueState];
+	                var visualTypes = visualTypesMap[valueState];
+
+	                for (var i = 0, len = visualTypes.length; i < len; i++) {
+	                    var type = visualTypes[i];
+	                    mappings[type] && mappings[type].applyVisual(
+	                        valueOrIndex, getVisual, setVisual
+	                    );
+	                }
+	            }
+	        }
+	    };
+
+	    module.exports = visualSolution;
+
+
+
+/***/ },
+/* 307 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var polygonContain = __webpack_require__(167).contain;
+	    var BoundingRect = __webpack_require__(9);
+
+	    // Key of the first level is brushType: `line`, `rect`, `polygon`.
+	    // Key of the second level is chart element type: `point`, `rect`.
+	    // See moudule:echarts/component/helper/BrushController
+	    // function param:
+	    //      {Object} itemLayout fetch from data.getItemLayout(dataIndex)
+	    //      {Object} selectors {point: selector, rect: selector, ...}
+	    //      {Object} area {range: [[], [], ..], boudingRect}
+	    // function return:
+	    //      {boolean} Whether in the given brush.
+	    var selector = {
+	        lineX: getLineSelectors(0),
+	        lineY: getLineSelectors(1),
+	        rect: {
+	            point: function (itemLayout, selectors, area) {
+	                return area.boundingRect.contain(itemLayout[0], itemLayout[1]);
+	            },
+	            rect: function (itemLayout, selectors, area) {
+	                return area.boundingRect.intersect(makeBoundingRect(itemLayout));
+	            }
+	        },
+	        polygon: {
+	            point: function (itemLayout, selectors, area) {
+	                return area.boundingRect.contain(itemLayout[0], itemLayout[1])
+	                    && polygonContain(area.range, itemLayout[0], itemLayout[1]);
+	            },
+	            rect: function (itemLayout, selectors, area) {
+	                // FIXME
+	                // 随意写的，没有考察过效率。
+	                var points = area.range;
+
+	                if (points.length <= 1) {
+	                    return false;
+	                }
+
+	                var x = itemLayout.x;
+	                var y = itemLayout.y;
+	                var width = itemLayout.width;
+	                var height = itemLayout.height;
+	                var p = points[0];
+
+	                if (polygonContain(points, x, y)
+	                    || polygonContain(points, x + width, y)
+	                    || polygonContain(points, x, y + height)
+	                    || polygonContain(points, x + width, y + height)
+	                    || makeBoundingRect(itemLayout).contain(p[0], p[1])
+	                    || lineIntersectPolygon(x, y, x + width, y, points)
+	                    || lineIntersectPolygon(x, y, x, y + height, points)
+	                    || lineIntersectPolygon(x + width, y, x + width, y + height, points)
+	                    || lineIntersectPolygon(x, y + height, x + width, y + height, points)
+	                ) {
+	                    return true;
+	                }
+	            }
+	        }
+	    };
+
+	    function getLineSelectors(xyIndex) {
+	        var xy = ['x', 'y'];
+	        var wh = ['width', 'height'];
+
+	        return {
+	            point: function (itemLayout, selectors, area) {
+	                var range = area.range;
+	                var p = itemLayout[xyIndex];
+	                return inLineRange(p, range);
+	            },
+	            rect: function (itemLayout, selectors, area) {
+	                var range = area.range;
+	                return inLineRange(itemLayout[xy[xyIndex]], range)
+	                    || inLineRange(itemLayout[xy[xyIndex]] + itemLayout[wh[xyIndex]], range);
+	            }
+	        };
+	    }
+
+	    function inLineRange(p, range) {
+	        return range[0] <= p && p <= range[1];
+	    }
+
+	    // FIXME
+	    // 随意写的，没考察过效率。
+	    function lineIntersectPolygon(lx, ly, l2x, l2y, points) {
+	        for (var i = 0, p2 = points[points.length - 1]; i < points.length; i++) {
+	            var p = points[i];
+	            if (lineIntersect(lx, ly, l2x, l2y, p[0], p[1], p2[0], p2[1])) {
+	                return true;
+	            }
+	            p2 = p;
+	        }
+	    }
+
+	    // Code from <http://blog.csdn.net/rickliuxiao/article/details/6259322> with some fix.
+	    // See <https://en.wikipedia.org/wiki/Line%E2%80%93line_intersection>
+	    function lineIntersect(a1x, a1y, a2x, a2y, b1x, b1y, b2x, b2y) {
+	        var delta = determinant(a2x - a1x, b1x - b2x, a2y - a1y, b1y - b2y);
+	        if (nearZero(delta)) { // parallel
+	            return false;
+	        }
+	        var namenda = determinant(b1x - a1x, b1x - b2x, b1y - a1y, b1y - b2y) / delta;
+	        if (namenda < 0 || namenda > 1) {
+	            return false;
+	        }
+	        var miu = determinant(a2x - a1x, b1x - a1x, a2y - a1y, b1y - a1y) / delta;
+	        if (miu < 0 || miu > 1) {
+	            return false;
+	        }
+	        return true;
+	    }
+
+	    function nearZero(val) {
+	        return val <= (1e-6) && val >= -(1e-6);
+	    }
+
+	    function determinant(v1, v2, v3, v4) {
+	        return v1 * v4 - v2 * v3;
+	    }
+
+	    function makeBoundingRect(itemLayout) {
+	        var x = itemLayout.x;
+	        var y = itemLayout.y;
+	        var width = itemLayout.width;
+	        var height = itemLayout.height;
+
+	        // width and height might be negative.
+	        if (width < 0) {
+	            x = x + width;
+	            width = -width;
+	        }
+	        if (height < 0) {
+	            y = y + height;
+	            height = -height;
+	        }
+	        return new BoundingRect(x, y, width, height);
+	    }
+
+	    module.exports = selector;
+
+
+
+/***/ },
+/* 308 */
+/***/ function(module, exports) {
+
+	
+
+	    var lib = {};
+
+	    var ORIGIN_METHOD = '\0__throttleOriginMethod';
+	    var RATE = '\0__throttleRate';
+	    var THROTTLE_TYPE = '\0__throttleType';
+
+	    /**
+	     * @public
+	     * @param {(Function)} fn
+	     * @param {number} [delay=0] Unit: ms.
+	     * @param {boolean} [debounce=false]
+	     *        true: If call interval less than `delay`, only the last call works.
+	     *        false: If call interval less than `delay, call works on fixed rate.
+	     * @return {(Function)} throttled fn.
+	     */
+	    lib.throttle = function (fn, delay, debounce) {
+
+	        var currCall;
+	        var lastCall = 0;
+	        var lastExec = 0;
+	        var timer = null;
+	        var diff;
+	        var scope;
+	        var args;
+
+	        delay = delay || 0;
+
+	        function exec() {
+	            lastExec = (new Date()).getTime();
+	            timer = null;
+	            fn.apply(scope, args || []);
+	        }
+
+	        var cb = function () {
+	            currCall = (new Date()).getTime();
+	            scope = this;
+	            args = arguments;
+	            diff = currCall - (debounce ? lastCall : lastExec) - delay;
+
+	            clearTimeout(timer);
+
+	            if (debounce) {
+	                timer = setTimeout(exec, delay);
+	            }
+	            else {
+	                if (diff >= 0) {
+	                    exec();
+	                }
+	                else {
+	                    timer = setTimeout(exec, -diff);
+	                }
+	            }
+
+	            lastCall = currCall;
+	        };
+
+	        /**
+	         * Clear throttle.
+	         * @public
+	         */
+	        cb.clear = function () {
+	            if (timer) {
+	                clearTimeout(timer);
+	                timer = null;
+	            }
+	        };
+
+	        return cb;
+	    };
+
+	    /**
+	     * Create throttle method or update throttle rate.
+	     *
+	     * @example
+	     * ComponentView.prototype.render = function () {
+	     *     ...
+	     *     throttle.createOrUpdate(
+	     *         this,
+	     *         '_dispatchAction',
+	     *         this.model.get('throttle'),
+	     *         'fixRate'
+	     *     );
+	     * };
+	     * ComponentView.prototype.remove = function () {
+	     *     throttle.clear(this, '_dispatchAction');
+	     * };
+	     * ComponentView.prototype.dispose = function () {
+	     *     throttle.clear(this, '_dispatchAction');
+	     * };
+	     *
+	     * @public
+	     * @param {Object} obj
+	     * @param {string} fnAttr
+	     * @param {number} [rate]
+	     * @param {string} [throttleType='fixRate'] 'fixRate' or 'debounce'
+	     * @return {Function} throttled function.
+	     */
+	    lib.createOrUpdate = function (obj, fnAttr, rate, throttleType) {
+	        var fn = obj[fnAttr];
+
+	        if (!fn) {
+	            return;
+	        }
+
+	        var originFn = fn[ORIGIN_METHOD] || fn;
+	        var lastThrottleType = fn[THROTTLE_TYPE];
+	        var lastRate = fn[RATE];
+
+	        if (lastRate !== rate || lastThrottleType !== throttleType) {
+	            if (rate == null || !throttleType) {
+	                return (obj[fnAttr] = originFn);
+	            }
+
+	            fn = obj[fnAttr] = lib.throttle(
+	                originFn, rate, throttleType === 'debounce'
+	            );
+	            fn[ORIGIN_METHOD] = originFn;
+	            fn[THROTTLE_TYPE] = throttleType;
+	            fn[RATE] = rate;
+	        }
+
+	        return fn;
+	    };
+
+	    /**
+	     * Clear throttle. Example see throttle.createOrUpdate.
+	     *
+	     * @public
+	     * @param {Object} obj
+	     * @param {string} fnAttr
+	     */
+	    lib.clear = function (obj, fnAttr) {
+	        var fn = obj[fnAttr];
+	        if (fn && fn[ORIGIN_METHOD]) {
+	            obj[fnAttr] = fn[ORIGIN_METHOD];
+	        }
+	    };
+
+	    module.exports = lib;
+
+
+
+/***/ },
+/* 309 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+	    var graphic = __webpack_require__(43);
+
+	    var each = zrUtil.each;
+
+	    var helper = {};
+
+	    var COMPONENT_NAMES = ['geo', 'xAxis', 'yAxis'];
+	    var PANEL_ID_SPLIT = '--';
+	    var COORD_CONVERTS = ['dataToPoint', 'pointToData'];
+
+	    helper.parseOutputRanges = function (areas, coordInfoList, ecModel, rangesCoordInfo) {
+	        each(areas, function (area, index) {
+	            var panelId = area.panelId;
+
+	            if (panelId) {
+	                panelId = panelId.split(PANEL_ID_SPLIT);
+
+	                area[panelId[0] + 'Index'] = +panelId[1];
+
+	                var coordInfo = findCoordInfo(area, coordInfoList);
+	                area.coordRange = coordConvert[area.brushType](
+	                    1, coordInfo, area.range
+	                );
+	                rangesCoordInfo && (rangesCoordInfo[index] = coordInfo);
+	            }
+	        });
+	    };
+
+	    helper.parseInputRanges = function (brushModel, ecModel) {
+	        each(brushModel.areas, function (area) {
+	            var coordInfo = findCoordInfo(area, brushModel.coordInfoList);
+
+	            if (true) {
+	                zrUtil.assert(
+	                    !coordInfo || coordInfo === true || area.coordRange,
+	                    'coordRange must be specified when coord index specified.'
+	                );
+	                zrUtil.assert(
+	                    !coordInfo || coordInfo !== true || area.range,
+	                    'range must be specified.'
+	                );
+	            }
+
+	            area.range = area.range || [];
+
+	            // convert coordRange to global range and set panelId.
+	            if (coordInfo && coordInfo !== true) {
+	                area.range = coordConvert[area.brushType](
+	                    0, coordInfo, area.coordRange
+	                );
+	                area.panelId = coordInfo.panelId;
+	            }
+	        });
+	    };
+
+	    helper.makePanelOpts = function (coordInfoList) {
+	        var panelOpts = [];
+
+	        each(coordInfoList, function (coordInfo) {
+	            var coordSys = coordInfo.coordSys;
+	            var rect;
+
+	            if (coordInfo.geoIndex >= 0) {
+	                rect = coordSys.getBoundingRect().clone();
+	                // geo roam and zoom transform
+	                rect.applyTransform(graphic.getTransform(coordSys));
+	            }
+	            else { // xAxis or yAxis
+	                // grid is not Transformable.
+	                rect = coordSys.grid.getRect().clone();
+	            }
+
+	            panelOpts.push({panelId: coordInfo.panelId, rect: rect});
+	        });
+
+	        return panelOpts;
+	    };
+
+	    /**
+	     * @param {Object} option {xAxisIndex, yAxisIndex, geoIndex}
+	     * @param {module:echarts/model/Global} ecModel
+	     * @return {Array.<Obejct>} coordInfoList
+	     */
+	    helper.makeCoordInfoList = function (option, ecModel) {
+	        var coordInfoList = [];
+
+	        each(COMPONENT_NAMES, function (componentName) {
+	            var componentIndices = option[componentName + 'Index'];
+	            if (componentIndices == null || componentIndices === 'none') {
+	                return;
+	            }
+	            if (componentIndices !== 'all' && !zrUtil.isArray(componentIndices)) {
+	                componentIndices = [componentIndices];
+	            }
+
+	            ecModel.eachComponent({mainType: componentName}, function (componentModel, index) {
+	                if (componentIndices !== 'all' && zrUtil.indexOf(componentIndices, index) < 0) {
+	                    return;
+	                }
+
+	                var grid;
+	                var coordSys;
+
+	                (componentName === 'xAxis' || componentName === 'yAxis')
+	                    ? (grid = componentModel.axis.grid)
+	                    : (coordSys = componentModel.coordinateSystem); // geo
+
+	                var coordInfo;
+
+	                // Check duplicate and find cartesian when tranval to yAxis.
+	                for (var i = 0, len = coordInfoList.length; i < len; i++) {
+	                    var cInfo = coordInfoList[i];
+	                    if (true) {
+	                        zrUtil.assert(
+	                            cInfo[componentName + 'Index'] != index,
+	                            'Coord should not be defined duplicately: ' + componentName + index
+	                        );
+	                    }
+	                    // CoordSys is always required for `rect brush` or `polygon brush`.
+	                    // If both xAxisIndex and yAxisIndex specified, fetch cartesian by them.
+	                    if (componentName === 'yAxis' && !cInfo.yAxis && cInfo.xAxis) {
+	                        var aCoordSys = grid.getCartesian(cInfo.xAxisIndex, index);
+	                        if (aCoordSys) { // The yAxis and xAxis are in the same cartesian.
+	                            coordSys = aCoordSys;
+	                            coordInfo = cInfo;
+	                            break;
+	                        }
+	                    }
+	                }
+
+	                !coordInfo && coordInfoList.push(coordInfo = {});
+
+	                coordInfo[componentName] = componentModel;
+	                coordInfo[componentName + 'Index'] = index;
+	                // If both xAxisIndex and yAxisIndex specified, panelId only use yAxisIndex,
+	                // which is enough to index panel.
+	                coordInfo.panelId = componentName + PANEL_ID_SPLIT + index;
+	                coordInfo.coordSys = coordSys
+	                    // If only xAxisIndex or only yAxisIndex specified, find its first cartesian.
+	                    || grid.getCartesian(coordInfo.xAxisIndex, coordInfo.yAxisIndex);
+
+	                coordInfo.coordSys
+	                    ? (coordInfoList[componentName + 'Has'] = true)
+	                    : coordInfoList.pop(); // If a coordInfo exists originally, existance of coordSys is ensured.
+	            });
+	        });
+
+	        return coordInfoList;
+	    };
+
+	    helper.controlSeries = function (area, brushModel, seriesModel) {
+	        // Check whether area is bound in coord, and series do not belong to that coord.
+	        // If do not do this check, some brush (like lineX) will controll all axes.
+	        var coordInfo = findCoordInfo(area, brushModel.coordInfoList);
+	        return coordInfo === true || (coordInfo && coordInfo.coordSys === seriesModel.coordinateSystem);
+	    };
+
+	    function formatMinMax(minMax) {
+	        minMax[0] > minMax[1] && minMax.reverse();
+	        return minMax;
+	    }
+
+	    /**
+	     * If return Object, a coord found.
+	     * If reutrn true, global found.
+	     * Otherwise nothing found.
+	     *
+	     * @param {Object} area {<componentName>Index}
+	     * @param {Array} coordInfoList
+	     * @return {Obejct|boolean}
+	     */
+	    function findCoordInfo(area, coordInfoList) {
+	        var isGlobal = true;
+	        for (var j = 0; j < COMPONENT_NAMES.length; j++) {
+	            var indexAttr = COMPONENT_NAMES[j] + 'Index';
+	            if (area[indexAttr] >= 0) {
+	                isGlobal = false;
+	                for (var i = 0; i < coordInfoList.length; i++) {
+	                    if (coordInfoList[i][indexAttr] === area[indexAttr]) {
+	                        return coordInfoList[i];
+	                    }
+	                }
+	            }
+	        }
+	        return isGlobal;
+	    }
+
+	    function axisConvert(axisName, to, coordInfo, coordRange) {
+	        var axis = coordInfo.coordSys.getAxis(axisName);
+
+	        if (true) {
+	            zrUtil.assert(axis, 'line brush is only available in cartesian (grid).');
+	        }
+
+	        return formatMinMax(zrUtil.map([0, 1], function (i) {
+	            return to
+	                ? axis.coordToData(axis.toLocalCoord(coordRange[i]))
+	                : axis.toGlobalCoord(axis.dataToCoord(coordRange[i]));
+	        }));
+	    }
+
+	    var coordConvert = {
+
+	        lineX: zrUtil.curry(axisConvert, 'x'),
+
+	        lineY: zrUtil.curry(axisConvert, 'y'),
+
+	        rect: function (to, coordInfo, coordRange) {
+	            var coordSys = coordInfo.coordSys;
+	            var xminymin = coordSys[COORD_CONVERTS[to]]([coordRange[0][0], coordRange[1][0]]);
+	            var xmaxymax = coordSys[COORD_CONVERTS[to]]([coordRange[0][1], coordRange[1][1]]);
+	            return [
+	                formatMinMax([xminymin[0], xmaxymax[0]]),
+	                formatMinMax([xminymin[1], xmaxymax[1]])
+	            ];
+	        },
+
+	        polygon: function (to, coordInfo, coordRange) {
+	            var coordSys = coordInfo.coordSys;
+	            return zrUtil.map(coordRange, coordSys[COORD_CONVERTS[to]], coordSys);
+	        }
+	    };
+
+	    module.exports = helper;
+
+
+
+/***/ },
+/* 310 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @file Brush model
+	 */
+
+
+	    var echarts = __webpack_require__(1);
+	    var zrUtil = __webpack_require__(4);
+	    var visualSolution = __webpack_require__(306);
+	    var Model = __webpack_require__(12);
+
+	    var DEFAULT_OUT_OF_BRUSH_COLOR = ['#ddd'];
+
+	    var BrushModel = echarts.extendComponentModel({
+
+	        type: 'brush',
+
+	        dependencies: ['geo', 'grid', 'xAxis', 'yAxis', 'parallel', 'series'],
+
+	        /**
+	         * @protected
+	         */
+	        defaultOption: {
+	            // inBrush: null,
+	            // outOfBrush: null,
+	            toolbox: null,          // Default value see preprocessor.
+	            brushLink: null,        // Series indices array, broadcast using dataIndex.
+	                                    // or 'all', which means all series. 'none' or null means no series.
+	            seriesIndex: 'all',     // seriesIndex array, specify series controlled by this brush component.
+	            geoIndex: null,         //
+	            xAxisIndex: null,
+	            yAxisIndex: null,
+
+	            brushType: 'rect',      // Default brushType, see BrushController.
+	            brushMode: 'single',    // Default brushMode, 'single' or 'multiple'
+	            transformable: true,    // Default transformable.
+	            brushStyle: {           // Default brushStyle
+	                borderWidth: 1,
+	                color: 'rgba(120,140,180,0.3)',
+	                borderColor: 'rgba(120,140,180,0.8)',
+	                width: null         // do not use bursh width in line brush, but fetch from grid.
+	            },
+
+	            throttleType: 'fixRate',// Throttle in brushSelected event. 'fixRate' or 'debounce'.
+	                                    // If null, no throttle. Valid only in the first brush component
+	            throttleDelay: 0,       // Unit: ms, 0 means every event will be triggered.
+
+	            // FIXME
+	            // 试验效果
+	            removeOnClick: true
+	        },
+
+	        /**
+	         * @readOnly
+	         * @type {Array.<Object>}
+	         */
+	        areas: [],
+
+	        /**
+	         * Current activated brush type.
+	         * If null, brush is inactived.
+	         * see module:echarts/component/helper/BrushController
+	         * @readOnly
+	         * @type {string}
+	         */
+	        brushType: null,
+
+	        /**
+	         * Current brush opt.
+	         * see module:echarts/component/helper/BrushController
+	         * @readOnly
+	         * @type {Object}
+	         */
+	        brushOption: {},
+
+	        /**
+	         * @readOnly
+	         * @type {Array.<Object>}
+	         */
+	        coordInfoList: [],
+
+	        optionUpdated: function (newOption, isInit) {
+	            var thisOption = this.option;
+
+	            !isInit && visualSolution.replaceVisualOption(
+	                thisOption, newOption, ['inBrush', 'outOfBrush']
+	            );
+
+	            thisOption.inBrush = thisOption.inBrush || {};
+	            // Always give default visual, consider setOption at the second time.
+	            thisOption.outOfBrush = thisOption.outOfBrush || {color: DEFAULT_OUT_OF_BRUSH_COLOR};
+	        },
+
+	        /**
+	         * If ranges is null/undefined, range state remain.
+	         *
+	         * @param {Array.<Object>} [ranges]
+	         */
+	        setAreas: function (areas) {
+	            if (true) {
+	                zrUtil.assert(zrUtil.isArray(areas));
+	                zrUtil.each(areas, function (area) {
+	                    zrUtil.assert(area.brushType, 'Illegal areas');
+	                });
+	            }
+
+	            // If ranges is null/undefined, range state remain.
+	            // This helps user to dispatchAction({type: 'brush'}) with no areas
+	            // set but just want to get the current brush select info from a `brush` event.
+	            if (!areas) {
+	                return;
+	            }
+
+	            this.areas = zrUtil.map(areas, function (area) {
+	                return this._mergeBrushOption(area);
+	            }, this);
+	        },
+
+	        /**
+	         * see module:echarts/component/helper/BrushController
+	         * @param {Object} brushOption
+	         */
+	        setBrushOption: function (brushOption) {
+	            this.brushOption = this._mergeBrushOption(brushOption);
+	            this.brushType = this.brushOption.brushType;
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _mergeBrushOption: function (brushOption) {
+	            var option = this.option;
+	            return zrUtil.merge(
+	                {
+	                    brushType: option.brushType,
+	                    brushMode: option.brushMode,
+	                    transformable: option.transformable,
+	                    brushStyle: new Model(option.brushStyle).getItemStyle(),
+	                    removeOnClick: option.removeOnClick
+	                },
+	                brushOption,
+	                true
+	            );
+	        }
+
+	    });
+
+	    module.exports = BrushModel;
+
+
+
+/***/ },
+/* 311 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+	    var BrushController = __webpack_require__(233);
+	    var echarts = __webpack_require__(1);
+	    var brushHelper = __webpack_require__(309);
+
+	    module.exports = echarts.extendComponentView({
+
+	        type: 'brush',
+
+	        init: function (ecModel, api) {
+
+	            /**
+	             * @readOnly
+	             * @type {module:echarts/model/Global}
+	             */
+	            this.ecModel = ecModel;
+
+	            /**
+	             * @readOnly
+	             * @type {module:echarts/ExtensionAPI}
+	             */
+	            this.api = api;
+
+	            /**
+	             * @readOnly
+	             * @type {module:echarts/component/brush/BrushModel}
+	             */
+	            this.model;
+
+	            /**
+	             * @private
+	             * @type {module:echarts/component/helper/BrushController}
+	             */
+	            (this._brushController = new BrushController(api.getZr()))
+	                .on('brush', zrUtil.bind(this._onBrush, this))
+	                .mount();
+	        },
+
+	        /**
+	         * @override
+	         */
+	        render: function (brushModel) {
+	            this.model = brushModel;
+	            return updateController.apply(this, arguments);
+	        },
+
+	        /**
+	         * @override
+	         */
+	        updateView: updateController,
+
+	        /**
+	         * @override
+	         */
+	        updateLayout: updateController,
+
+	        /**
+	         * @override
+	         */
+	        updateVisual: updateController,
+
+	        /**
+	         * @override
+	         */
+	        dispose: function () {
+	            this._brushController.dispose();
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _onBrush: function (areas, opt) {
+	            var modelId = this.model.id;
+
+	            brushHelper.parseOutputRanges(areas, this.model.coordInfoList, this.ecModel);
+
+	            // Action is not dispatched on drag end, because the drag end
+	            // emits the same params with the last drag move event, and
+	            // may have some delay when using touch pad, which makes
+	            // animation not smooth (when using debounce).
+	            (!opt.isEnd || opt.removeOnClick) && this.api.dispatchAction({
+	                type: 'brush',
+	                brushId: modelId,
+	                areas: zrUtil.clone(areas),
+	                $from: modelId
+	            });
+	        }
+
+	    });
+
+	    function updateController(brushModel, ecModel, api, payload) {
+	        // Do not update controller when drawing.
+	        (!payload || payload.$from !== brushModel.id) && this._brushController
+	            .setPanels(brushHelper.makePanelOpts(brushModel.coordInfoList))
+	            .enableBrush(brushModel.brushOption)
+	            .updateCovers(brushModel.areas.slice());
+	    }
+
+
+
+/***/ },
+/* 312 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @file Brush action
+	 */
+
+
+	    var echarts = __webpack_require__(1);
+
+	    /**
+	     * payload: {
+	     *      brushIndex: number, or,
+	     *      brushId: string, or,
+	     *      brushName: string,
+	     *      globalRanges: Array
+	     * }
+	     */
+	    echarts.registerAction(
+	         {type: 'brush', event: 'brush', update: 'updateView'},
+	        function (payload, ecModel) {
+	            ecModel.eachComponent({mainType: 'brush', query: payload}, function (brushModel) {
+	                brushModel.setAreas(payload.areas);
+	            });
+	        }
+	    );
+
+	    /**
+	     * payload: {
+	     *      brushComponents: [
+	     *          {
+	     *              brushId,
+	     *              brushIndex,
+	     *              brushName,
+	     *              series: [
+	     *                  {
+	     *                      seriesId,
+	     *                      seriesIndex,
+	     *                      seriesName,
+	     *                      rawIndices: [21, 34, ...]
+	     *                  },
+	     *                  ...
+	     *              ]
+	     *          },
+	     *          ...
+	     *      ]
+	     * }
+	     */
+	    echarts.registerAction(
+	         {type: 'brushSelect', event: 'brushSelected', update: 'none'},
+	        function () {}
+	    );
+
+
+/***/ },
+/* 313 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var featureManager = __webpack_require__(314);
+	    var zrUtil = __webpack_require__(4);
+
+	    function Brush(model, ecModel, api) {
+	        this.model = model;
+	        this.ecModel = ecModel;
+	        this.api = api;
+
+	        /**
+	         * @private
+	         * @type {string}
+	         */
+	        this._brushType;
+
+	        /**
+	         * @private
+	         * @type {string}
+	         */
+	        this._brushMode;
+	    }
+
+	    Brush.defaultOption = {
+	        show: true,
+	        type: ['rect', 'polygon', 'lineX', 'lineY', 'keep', 'clear'],
+	        icon: {
+	            rect: 'M7.3,34.7 M0.4,10V-0.2h9.8 M89.6,10V-0.2h-9.8 M0.4,60v10.2h9.8 M89.6,60v10.2h-9.8 M12.3,22.4V10.5h13.1 M33.6,10.5h7.8 M49.1,10.5h7.8 M77.5,22.4V10.5h-13 M12.3,31.1v8.2 M77.7,31.1v8.2 M12.3,47.6v11.9h13.1 M33.6,59.5h7.6 M49.1,59.5 h7.7 M77.5,47.6v11.9h-13', // jshint ignore:line
+	            polygon: 'M55.2,34.9c1.7,0,3.1,1.4,3.1,3.1s-1.4,3.1-3.1,3.1 s-3.1-1.4-3.1-3.1S53.5,34.9,55.2,34.9z M50.4,51c1.7,0,3.1,1.4,3.1,3.1c0,1.7-1.4,3.1-3.1,3.1c-1.7,0-3.1-1.4-3.1-3.1 C47.3,52.4,48.7,51,50.4,51z M55.6,37.1l1.5-7.8 M60.1,13.5l1.6-8.7l-7.8,4 M59,19l-1,5.3 M24,16.1l6.4,4.9l6.4-3.3 M48.5,11.6 l-5.9,3.1 M19.1,12.8L9.7,5.1l1.1,7.7 M13.4,29.8l1,7.3l6.6,1.6 M11.6,18.4l1,6.1 M32.8,41.9 M26.6,40.4 M27.3,40.2l6.1,1.6 M49.9,52.1l-5.6-7.6l-4.9-1.2', // jshint ignore:line
+	            lineX: 'M15.2,30 M19.7,15.6V1.9H29 M34.8,1.9H40.4 M55.3,15.6V1.9H45.9 M19.7,44.4V58.1H29 M34.8,58.1H40.4 M55.3,44.4 V58.1H45.9 M12.5,20.3l-9.4,9.6l9.6,9.8 M3.1,29.9h16.5 M62.5,20.3l9.4,9.6L62.3,39.7 M71.9,29.9H55.4', // jshint ignore:line
+	            lineY: 'M38.8,7.7 M52.7,12h13.2v9 M65.9,26.6V32 M52.7,46.3h13.2v-9 M24.9,12H11.8v9 M11.8,26.6V32 M24.9,46.3H11.8v-9 M48.2,5.1l-9.3-9l-9.4,9.2 M38.9-3.9V12 M48.2,53.3l-9.3,9l-9.4-9.2 M38.9,62.3V46.4', // jshint ignore:line
+	            keep: 'M4,10.5V1h10.3 M20.7,1h6.1 M33,1h6.1 M55.4,10.5V1H45.2 M4,17.3v6.6 M55.6,17.3v6.6 M4,30.5V40h10.3 M20.7,40 h6.1 M33,40h6.1 M55.4,30.5V40H45.2 M21,18.9h62.9v48.6H21V18.9z', // jshint ignore:line
+	            clear: 'M22,14.7l30.9,31 M52.9,14.7L22,45.7 M4.7,16.8V4.2h13.1 M26,4.2h7.8 M41.6,4.2h7.8 M70.3,16.8V4.2H57.2 M4.7,25.9v8.6 M70.3,25.9v8.6 M4.7,43.2v12.6h13.1 M26,55.8h7.8 M41.6,55.8h7.8 M70.3,43.2v12.6H57.2' // jshint ignore:line
+	        },
+	        title: {
+	            rect: '矩形选择',
+	            polygon: '圈选',
+	            lineX: '横向选择',
+	            lineY: '纵向选择',
+	            keep: '保持选择',
+	            clear: '清除选择'
+	        }
+	    };
+
+	    var proto = Brush.prototype;
+
+	    proto.render =
+	    proto.updateView =
+	    proto.updateLayout = function (featureModel, ecModel, api) {
+	        var brushType;
+	        var brushMode;
+	        var isBrushed;
+
+	        ecModel.eachComponent({mainType: 'brush'}, function (brushModel) {
+	            brushType = brushModel.brushType;
+	            brushMode = brushModel.brushOption.brushMode || 'single';
+	            isBrushed |= brushModel.areas.length;
+	        });
+	        this._brushType = brushType;
+	        this._brushMode = brushMode;
+
+	        zrUtil.each(featureModel.get('type', true), function (type) {
+	            featureModel.setIconStatus(
+	                type,
+	                (
+	                    type === 'keep'
+	                    ? brushMode === 'multiple'
+	                    : type === 'clear'
+	                    ? isBrushed
+	                    : type === brushType
+	                ) ? 'emphasis' : 'normal'
+	            );
+	        });
+	    };
+
+	    proto.getIcons = function () {
+	        var model = this.model;
+	        var availableIcons = model.get('icon', true);
+	        var icons = {};
+	        zrUtil.each(model.get('type', true), function (type) {
+	            if (availableIcons[type]) {
+	                icons[type] = availableIcons[type];
+	            }
+	        });
+	        return icons;
+	    };
+
+	    proto.onclick = function (ecModel, api, type) {
+	        var api = this.api;
+	        var brushType = this._brushType;
+	        var brushMode = this._brushMode;
+
+	        if (type === 'clear') {
+	            api.dispatchAction({
+	                type: 'brush',
+	                // Clear all areas of all brush components.
+	                areas: []
+	            });
+	        }
+	        else {
+	            api.dispatchAction({
+	                type: 'takeGlobalCursor',
+	                key: 'brush',
+	                brushOption: {
+	                    brushType: type === 'keep'
+	                        ? brushType
+	                        : (brushType === type ? false : type),
+	                    brushMode: type === 'keep'
+	                        ? (brushMode === 'multiple' ? 'single' : 'multiple')
+	                        : brushMode
+	                }
+	            });
+	        }
+	    };
+
+	    featureManager.register('brush', Brush);
+
+	    module.exports = Brush;
+
+
+/***/ },
+/* 314 */
+/***/ function(module, exports) {
+
+	'use strict';
+
+
+	    var features = {};
+
+	    module.exports = {
+	        register: function (name, ctor) {
+	            features[name] = ctor;
+	        },
+
+	        get: function (name) {
+	            return features[name];
+	        }
+	    };
+
+
+/***/ },
+/* 315 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var echarts = __webpack_require__(1);
+	    var graphic = __webpack_require__(43);
+	    var layout = __webpack_require__(21);
+
+	    // Model
+	    echarts.extendComponentModel({
+
+	        type: 'title',
+
+	        layoutMode: {type: 'box', ignoreSize: true},
+
+	        defaultOption: {
+	            // 一级层叠
+	            zlevel: 0,
+	            // 二级层叠
+	            z: 6,
+	            show: true,
+
+	            text: '',
+	            // 超链接跳转
+	            // link: null,
+	            // 仅支持self | blank
+	            target: 'blank',
+	            subtext: '',
+
+	            // 超链接跳转
+	            // sublink: null,
+	            // 仅支持self | blank
+	            subtarget: 'blank',
+
+	            // 'center' ¦ 'left' ¦ 'right'
+	            // ¦ {number}（x坐标，单位px）
+	            left: 0,
+	            // 'top' ¦ 'bottom' ¦ 'center'
+	            // ¦ {number}（y坐标，单位px）
+	            top: 0,
+
+	            // 水平对齐
+	            // 'auto' | 'left' | 'right' | 'center'
+	            // 默认根据 left 的位置判断是左对齐还是右对齐
+	            // textAlign: null
+	            //
+	            // 垂直对齐
+	            // 'auto' | 'top' | 'bottom' | 'middle'
+	            // 默认根据 top 位置判断是上对齐还是下对齐
+	            // textBaseline: null
+
+	            backgroundColor: 'rgba(0,0,0,0)',
+
+	            // 标题边框颜色
+	            borderColor: '#ccc',
+
+	            // 标题边框线宽，单位px，默认为0（无边框）
+	            borderWidth: 0,
+
+	            // 标题内边距，单位px，默认各方向内边距为5，
+	            // 接受数组分别设定上右下左边距，同css
+	            padding: 5,
+
+	            // 主副标题纵向间隔，单位px，默认为10，
+	            itemGap: 10,
+	            textStyle: {
+	                fontSize: 18,
+	                fontWeight: 'bolder',
+	                color: '#333'
+	            },
+	            subtextStyle: {
+	                color: '#aaa'
+	            }
+	        }
+	    });
+
+	    // View
+	    echarts.extendComponentView({
+
+	        type: 'title',
+
+	        render: function (titleModel, ecModel, api) {
+	            this.group.removeAll();
+
+	            if (!titleModel.get('show')) {
+	                return;
+	            }
+
+	            var group = this.group;
+
+	            var textStyleModel = titleModel.getModel('textStyle');
+	            var subtextStyleModel = titleModel.getModel('subtextStyle');
+
+	            var textAlign = titleModel.get('textAlign');
+	            var textBaseline = titleModel.get('textBaseline');
+
+	            var textEl = new graphic.Text({
+	                style: {
+	                    text: titleModel.get('text'),
+	                    textFont: textStyleModel.getFont(),
+	                    fill: textStyleModel.getTextColor()
+	                },
+	                z2: 10
+	            });
+
+	            var textRect = textEl.getBoundingRect();
+
+	            var subText = titleModel.get('subtext');
+	            var subTextEl = new graphic.Text({
+	                style: {
+	                    text: subText,
+	                    textFont: subtextStyleModel.getFont(),
+	                    fill: subtextStyleModel.getTextColor(),
+	                    y: textRect.height + titleModel.get('itemGap'),
+	                    textBaseline: 'top'
+	                },
+	                z2: 10
+	            });
+
+	            var link = titleModel.get('link');
+	            var sublink = titleModel.get('sublink');
+
+	            textEl.silent = !link;
+	            subTextEl.silent = !sublink;
+
+	            if (link) {
+	                textEl.on('click', function () {
+	                    window.open(link, '_' + titleModel.get('target'));
+	                });
+	            }
+	            if (sublink) {
+	                subTextEl.on('click', function () {
+	                    window.open(sublink, '_' + titleModel.get('subtarget'));
+	                });
+	            }
+
+	            group.add(textEl);
+	            subText && group.add(subTextEl);
+	            // If no subText, but add subTextEl, there will be an empty line.
+
+	            var groupRect = group.getBoundingRect();
+	            var layoutOption = titleModel.getBoxLayoutParams();
+	            layoutOption.width = groupRect.width;
+	            layoutOption.height = groupRect.height;
+	            var layoutRect = layout.getLayoutRect(
+	                layoutOption, {
+	                    width: api.getWidth(),
+	                    height: api.getHeight()
+	                }, titleModel.get('padding')
+	            );
+	            // Adjust text align based on position
+	            if (!textAlign) {
+	                // Align left if title is on the left. center and right is same
+	                textAlign = titleModel.get('left') || titleModel.get('right');
+	                if (textAlign === 'middle') {
+	                    textAlign = 'center';
+	                }
+	                // Adjust layout by text align
+	                if (textAlign === 'right') {
+	                    layoutRect.x += layoutRect.width;
+	                }
+	                else if (textAlign === 'center') {
+	                    layoutRect.x += layoutRect.width / 2;
+	                }
+	            }
+	            if (!textBaseline) {
+	                textBaseline = titleModel.get('top') || titleModel.get('bottom');
+	                if (textBaseline === 'center') {
+	                    textBaseline = 'middle';
+	                }
+	                if (textBaseline === 'bottom') {
+	                    layoutRect.y += layoutRect.height;
+	                }
+	                else if (textBaseline === 'middle') {
+	                    layoutRect.y += layoutRect.height / 2;
+	                }
+
+	                textBaseline = textBaseline || 'top';
+	            }
+
+	            group.attr('position', [layoutRect.x, layoutRect.y]);
+	            var alignStyle = {
+	                textAlign: textAlign,
+	                textVerticalAlign: textBaseline
+	            };
+	            textEl.setStyle(alignStyle);
+	            subTextEl.setStyle(alignStyle);
+
+	            // Render background
+	            // Get groupRect again because textAlign has been changed
+	            groupRect = group.getBoundingRect();
+	            var padding = layoutRect.margin;
+	            var style = titleModel.getItemStyle(['color', 'opacity']);
+	            style.fill = titleModel.get('backgroundColor');
+	            var rect = new graphic.Rect({
+	                shape: {
+	                    x: groupRect.x - padding[3],
+	                    y: groupRect.y - padding[0],
+	                    width: groupRect.width + padding[1] + padding[3],
+	                    height: groupRect.height + padding[0] + padding[2]
+	                },
+	                style: style,
+	                silent: true
+	            });
+	            graphic.subPixelOptimizeRect(rect);
+
+	            group.add(rect);
+	        }
+	    });
+
+
+/***/ },
+/* 316 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * DataZoom component entry
+	 */
+
+
+	    __webpack_require__(317);
+
+	    __webpack_require__(318);
+	    __webpack_require__(320);
+
+	    __webpack_require__(321);
+	    __webpack_require__(322);
+
+	    __webpack_require__(324);
+	    __webpack_require__(325);
+
+	    __webpack_require__(327);
+	    __webpack_require__(328);
+
+
+
+/***/ },
+/* 317 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    __webpack_require__(19).registerSubTypeDefaulter('dataZoom', function (option) {
+	        // Default 'slider' when no type specified.
+	        return 'slider';
+	    });
+
+
+
+/***/ },
+/* 318 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @file Data zoom model
+	 */
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var env = __webpack_require__(2);
+	    var echarts = __webpack_require__(1);
+	    var modelUtil = __webpack_require__(5);
+	    var AxisProxy = __webpack_require__(319);
+	    var each = zrUtil.each;
+	    var eachAxisDim = modelUtil.eachAxisDim;
+
+	    var DataZoomModel = echarts.extendComponentModel({
+
+	        type: 'dataZoom',
+
+	        dependencies: [
+	            'xAxis', 'yAxis', 'zAxis', 'radiusAxis', 'angleAxis', 'series'
+	        ],
+
+	        /**
+	         * @protected
+	         */
+	        defaultOption: {
+	            zlevel: 0,
+	            z: 4,                   // Higher than normal component (z: 2).
+	            orient: null,           // Default auto by axisIndex. Possible value: 'horizontal', 'vertical'.
+	            xAxisIndex: null,       // Default the first horizontal category axis.
+	            yAxisIndex: null,       // Default the first vertical category axis.
+	            angleAxisIndex: null,
+	            radiusAxisIndex: null,
+	            filterMode: 'filter',   // Possible values: 'filter' or 'empty'.
+	                                    // 'filter': data items which are out of window will be removed.
+	                                    //           This option is applicable when filtering outliers.
+	                                    // 'empty': data items which are out of window will be set to empty.
+	                                    //          This option is applicable when user should not neglect
+	                                    //          that there are some data items out of window.
+	                                    // Taking line chart as an example, line will be broken in
+	                                    // the filtered points when filterModel is set to 'empty', but
+	                                    // be connected when set to 'filter'.
+
+	            throttle: null,         // Dispatch action by the fixed rate, avoid frequency.
+	                                    // default 100. Do not throttle when use null/undefined.
+	                                    // If animation === true and animationDurationUpdate > 0,
+	                                    // default value is 100, otherwise 20.
+	            start: 0,               // Start percent. 0 ~ 100
+	            end: 100,               // End percent. 0 ~ 100
+	            startValue: null,       // Start value. If startValue specified, start is ignored.
+	            endValue: null          // End value. If endValue specified, end is ignored.
+	        },
+
+	        /**
+	         * @override
+	         */
+	        init: function (option, parentModel, ecModel) {
+
+	            /**
+	             * key like x_0, y_1
+	             * @private
+	             * @type {Object}
+	             */
+	            this._dataIntervalByAxis = {};
+
+	            /**
+	             * @private
+	             */
+	            this._dataInfo = {};
+
+	            /**
+	             * key like x_0, y_1
+	             * @private
+	             */
+	            this._axisProxies = {};
+
+	            /**
+	             * @readOnly
+	             */
+	            this.textStyleModel;
+
+	            /**
+	             * @private
+	             */
+	            this._autoThrottle = true;
+
+	            var rawOption = retrieveRaw(option);
+
+	            this.mergeDefaultAndTheme(option, ecModel);
+
+	            this.doInit(rawOption);
+	        },
+
+	        /**
+	         * @override
+	         */
+	        mergeOption: function (newOption) {
+	            var rawOption = retrieveRaw(newOption);
+
+	            //FIX #2591
+	            zrUtil.merge(this.option, newOption, true);
+
+	            this.doInit(rawOption);
+	        },
+
+	        /**
+	         * @protected
+	         */
+	        doInit: function (rawOption) {
+	            var thisOption = this.option;
+
+	            // Disable realtime view update if canvas is not supported.
+	            if (!env.canvasSupported) {
+	                thisOption.realtime = false;
+	            }
+
+	            this._setDefaultThrottle(rawOption);
+
+	            processRangeProp('start', 'startValue', rawOption, thisOption);
+	            processRangeProp('end', 'endValue', rawOption, thisOption);
+
+	            this.textStyleModel = this.getModel('textStyle');
+
+	            this._resetTarget();
+
+	            this._giveAxisProxies();
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _giveAxisProxies: function () {
+	            var axisProxies = this._axisProxies;
+
+	            this.eachTargetAxis(function (dimNames, axisIndex, dataZoomModel, ecModel) {
+	                var axisModel = this.dependentModels[dimNames.axis][axisIndex];
+
+	                // If exists, share axisProxy with other dataZoomModels.
+	                var axisProxy = axisModel.__dzAxisProxy || (
+	                    // Use the first dataZoomModel as the main model of axisProxy.
+	                    axisModel.__dzAxisProxy = new AxisProxy(
+	                        dimNames.name, axisIndex, this, ecModel
+	                    )
+	                );
+	                // FIXME
+	                // dispose __dzAxisProxy
+
+	                axisProxies[dimNames.name + '_' + axisIndex] = axisProxy;
+	            }, this);
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _resetTarget: function () {
+	            var thisOption = this.option;
+
+	            var autoMode = this._judgeAutoMode();
+
+	            eachAxisDim(function (dimNames) {
+	                var axisIndexName = dimNames.axisIndex;
+	                thisOption[axisIndexName] = modelUtil.normalizeToArray(
+	                    thisOption[axisIndexName]
+	                );
+	            }, this);
+
+	            if (autoMode === 'axisIndex') {
+	                this._autoSetAxisIndex();
+	            }
+	            else if (autoMode === 'orient') {
+	                this._autoSetOrient();
+	            }
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _judgeAutoMode: function () {
+	            // Auto set only works for setOption at the first time.
+	            // The following is user's reponsibility. So using merged
+	            // option is OK.
+	            var thisOption = this.option;
+
+	            var hasIndexSpecified = false;
+	            eachAxisDim(function (dimNames) {
+	                // When user set axisIndex as a empty array, we think that user specify axisIndex
+	                // but do not want use auto mode. Because empty array may be encountered when
+	                // some error occured.
+	                if (thisOption[dimNames.axisIndex] != null) {
+	                    hasIndexSpecified = true;
+	                }
+	            }, this);
+
+	            var orient = thisOption.orient;
+
+	            if (orient == null && hasIndexSpecified) {
+	                return 'orient';
+	            }
+	            else if (!hasIndexSpecified) {
+	                if (orient == null) {
+	                    thisOption.orient = 'horizontal';
+	                }
+	                return 'axisIndex';
+	            }
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _autoSetAxisIndex: function () {
+	            var autoAxisIndex = true;
+	            var orient = this.get('orient', true);
+	            var thisOption = this.option;
+
+	            if (autoAxisIndex) {
+	                // Find axis that parallel to dataZoom as default.
+	                var dimNames = orient === 'vertical'
+	                    ? {dim: 'y', axisIndex: 'yAxisIndex', axis: 'yAxis'}
+	                    : {dim: 'x', axisIndex: 'xAxisIndex', axis: 'xAxis'};
+
+	                if (this.dependentModels[dimNames.axis].length) {
+	                    thisOption[dimNames.axisIndex] = [0];
+	                    autoAxisIndex = false;
+	                }
+	            }
+
+	            if (autoAxisIndex) {
+	                // Find the first category axis as default. (consider polar)
+	                eachAxisDim(function (dimNames) {
+	                    if (!autoAxisIndex) {
+	                        return;
+	                    }
+	                    var axisIndices = [];
+	                    var axisModels = this.dependentModels[dimNames.axis];
+	                    if (axisModels.length && !axisIndices.length) {
+	                        for (var i = 0, len = axisModels.length; i < len; i++) {
+	                            if (axisModels[i].get('type') === 'category') {
+	                                axisIndices.push(i);
+	                            }
+	                        }
+	                    }
+	                    thisOption[dimNames.axisIndex] = axisIndices;
+	                    if (axisIndices.length) {
+	                        autoAxisIndex = false;
+	                    }
+	                }, this);
+	            }
+
+	            if (autoAxisIndex) {
+	                // FIXME
+	                // 这里是兼容ec2的写法（没指定xAxisIndex和yAxisIndex时把scatter和双数值轴折柱纳入dataZoom控制），
+	                // 但是实际是否需要Grid.js#getScaleByOption来判断（考虑time，log等axis type）？
+
+	                // If both dataZoom.xAxisIndex and dataZoom.yAxisIndex is not specified,
+	                // dataZoom component auto adopts series that reference to
+	                // both xAxis and yAxis which type is 'value'.
+	                this.ecModel.eachSeries(function (seriesModel) {
+	                    if (this._isSeriesHasAllAxesTypeOf(seriesModel, 'value')) {
+	                        eachAxisDim(function (dimNames) {
+	                            var axisIndices = thisOption[dimNames.axisIndex];
+	                            var axisIndex = seriesModel.get(dimNames.axisIndex);
+	                            if (zrUtil.indexOf(axisIndices, axisIndex) < 0) {
+	                                axisIndices.push(axisIndex);
+	                            }
+	                        });
+	                    }
+	                }, this);
+	            }
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _autoSetOrient: function () {
+	            var dim;
+
+	            // Find the first axis
+	            this.eachTargetAxis(function (dimNames) {
+	                !dim && (dim = dimNames.name);
+	            }, this);
+
+	            this.option.orient = dim === 'y' ? 'vertical' : 'horizontal';
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _isSeriesHasAllAxesTypeOf: function (seriesModel, axisType) {
+	            // FIXME
+	            // 需要series的xAxisIndex和yAxisIndex都首先自动设置上。
+	            // 例如series.type === scatter时。
+
+	            var is = true;
+	            eachAxisDim(function (dimNames) {
+	                var seriesAxisIndex = seriesModel.get(dimNames.axisIndex);
+	                var axisModel = this.dependentModels[dimNames.axis][seriesAxisIndex];
+
+	                if (!axisModel || axisModel.get('type') !== axisType) {
+	                    is = false;
+	                }
+	            }, this);
+	            return is;
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _setDefaultThrottle: function (rawOption) {
+	            // When first time user set throttle, auto throttle ends.
+	            if (rawOption.hasOwnProperty('throttle')) {
+	                this._autoThrottle = false;
+	            }
+	            if (this._autoThrottle) {
+	                var globalOption = this.ecModel.option;
+	                this.option.throttle =
+	                    (globalOption.animation && globalOption.animationDurationUpdate > 0)
+	                    ? 100 : 20;
+	            }
+	        },
+
+	        /**
+	         * @public
+	         */
+	        getFirstTargetAxisModel: function () {
+	            var firstAxisModel;
+	            eachAxisDim(function (dimNames) {
+	                if (firstAxisModel == null) {
+	                    var indices = this.get(dimNames.axisIndex);
+	                    if (indices.length) {
+	                        firstAxisModel = this.dependentModels[dimNames.axis][indices[0]];
+	                    }
+	                }
+	            }, this);
+
+	            return firstAxisModel;
+	        },
+
+	        /**
+	         * @public
+	         * @param {Function} callback param: axisModel, dimNames, axisIndex, dataZoomModel, ecModel
+	         */
+	        eachTargetAxis: function (callback, context) {
+	            var ecModel = this.ecModel;
+	            eachAxisDim(function (dimNames) {
+	                each(
+	                    this.get(dimNames.axisIndex),
+	                    function (axisIndex) {
+	                        callback.call(context, dimNames, axisIndex, this, ecModel);
+	                    },
+	                    this
+	                );
+	            }, this);
+	        },
+
+	        getAxisProxy: function (dimName, axisIndex) {
+	            return this._axisProxies[dimName + '_' + axisIndex];
+	        },
+
+	        /**
+	         * If not specified, set to undefined.
+	         *
+	         * @public
+	         * @param {Object} opt
+	         * @param {number} [opt.start]
+	         * @param {number} [opt.end]
+	         * @param {number} [opt.startValue]
+	         * @param {number} [opt.endValue]
+	         */
+	        setRawRange: function (opt) {
+	            each(['start', 'end', 'startValue', 'endValue'], function (name) {
+	                // If any of those prop is null/undefined, we should alos set
+	                // them, because only one pair between start/end and
+	                // startValue/endValue can work.
+	                this.option[name] = opt[name];
+	            }, this);
+	        },
+
+	        /**
+	         * @public
+	         * @return {Array.<number>} [startPercent, endPercent]
+	         */
+	        getPercentRange: function () {
+	            var axisProxy = this.findRepresentativeAxisProxy();
+	            if (axisProxy) {
+	                return axisProxy.getDataPercentWindow();
+	            }
+	        },
+
+	        /**
+	         * @public
+	         * For example, chart.getModel().getComponent('dataZoom').getValueRange('y', 0);
+	         *
+	         * @param {string} [axisDimName]
+	         * @param {number} [axisIndex]
+	         * @return {Array.<number>} [startValue, endValue]
+	         */
+	        getValueRange: function (axisDimName, axisIndex) {
+	            if (axisDimName == null && axisIndex == null) {
+	                var axisProxy = this.findRepresentativeAxisProxy();
+	                if (axisProxy) {
+	                    return axisProxy.getDataValueWindow();
+	                }
+	            }
+	            else {
+	                return this.getAxisProxy(axisDimName, axisIndex).getDataValueWindow();
+	            }
+	        },
+
+	        /**
+	         * @public
+	         * @return {module:echarts/component/dataZoom/AxisProxy}
+	         */
+	        findRepresentativeAxisProxy: function () {
+	            // Find the first hosted axisProxy
+	            var axisProxies = this._axisProxies;
+	            for (var key in axisProxies) {
+	                if (axisProxies.hasOwnProperty(key) && axisProxies[key].hostedBy(this)) {
+	                    return axisProxies[key];
+	                }
+	            }
+
+	            // If no hosted axis find not hosted axisProxy.
+	            // Consider this case: dataZoomModel1 and dataZoomModel2 control the same axis,
+	            // and the option.start or option.end settings are different. The percentRange
+	            // should follow axisProxy.
+	            // (We encounter this problem in toolbox data zoom.)
+	            for (var key in axisProxies) {
+	                if (axisProxies.hasOwnProperty(key) && !axisProxies[key].hostedBy(this)) {
+	                    return axisProxies[key];
+	                }
+	            }
+	        }
+
+	    });
+
+	    function retrieveRaw(option) {
+	        var ret = {};
+	        each(
+	            ['start', 'end', 'startValue', 'endValue', 'throttle'],
+	            function (name) {
+	                option.hasOwnProperty(name) && (ret[name] = option[name]);
+	            }
+	        );
+	        return ret;
+	    }
+
+	    function processRangeProp(percentProp, valueProp, rawOption, thisOption) {
+	        // start/end has higher priority over startValue/endValue,
+	        // but we should make chart.setOption({endValue: 1000}) effective,
+	        // rather than chart.setOption({endValue: 1000, end: null}).
+	        if (rawOption[valueProp] != null && rawOption[percentProp] == null) {
+	            thisOption[percentProp] = null;
+	        }
+	        // Otherwise do nothing and use the merge result.
+	    }
+
+	    module.exports = DataZoomModel;
+
+
+
+/***/ },
+/* 319 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @file Axis operator
+	 */
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var numberUtil = __webpack_require__(7);
+	    var each = zrUtil.each;
+	    var asc = numberUtil.asc;
+
+	    /**
+	     * Operate single axis.
+	     * One axis can only operated by one axis operator.
+	     * Different dataZoomModels may be defined to operate the same axis.
+	     * (i.e. 'inside' data zoom and 'slider' data zoom components)
+	     * So dataZoomModels share one axisProxy in that case.
+	     *
+	     * @class
+	     */
+	    var AxisProxy = function (dimName, axisIndex, dataZoomModel, ecModel) {
+
+	        /**
+	         * @private
+	         * @type {string}
+	         */
+	        this._dimName = dimName;
+
+	        /**
+	         * @private
+	         */
+	        this._axisIndex = axisIndex;
+
+	        /**
+	         * @private
+	         * @type {Array.<number>}
+	         */
+	        this._valueWindow;
+
+	        /**
+	         * @private
+	         * @type {Array.<number>}
+	         */
+	        this._percentWindow;
+
+	        /**
+	         * @private
+	         * @type {Array.<number>}
+	         */
+	        this._dataExtent;
+
+	        /**
+	         * @readOnly
+	         * @type {module: echarts/model/Global}
+	         */
+	        this.ecModel = ecModel;
+
+	        /**
+	         * @private
+	         * @type {module: echarts/component/dataZoom/DataZoomModel}
+	         */
+	        this._dataZoomModel = dataZoomModel;
+	    };
+
+	    AxisProxy.prototype = {
+
+	        constructor: AxisProxy,
+
+	        /**
+	         * Whether the axisProxy is hosted by dataZoomModel.
+	         *
+	         * @public
+	         * @param {module: echarts/component/dataZoom/DataZoomModel} dataZoomModel
+	         * @return {boolean}
+	         */
+	        hostedBy: function (dataZoomModel) {
+	            return this._dataZoomModel === dataZoomModel;
+	        },
+
+	        /**
+	         * @return {Array.<number>}
+	         */
+	        getDataExtent: function () {
+	            return this._dataExtent.slice();
+	        },
+
+	        /**
+	         * @return {Array.<number>}
+	         */
+	        getDataValueWindow: function () {
+	            return this._valueWindow.slice();
+	        },
+
+	        /**
+	         * @return {Array.<number>}
+	         */
+	        getDataPercentWindow: function () {
+	            return this._percentWindow.slice();
+	        },
+
+	        /**
+	         * @public
+	         * @param {number} axisIndex
+	         * @return {Array} seriesModels
+	         */
+	        getTargetSeriesModels: function () {
+	            var seriesModels = [];
+
+	            this.ecModel.eachSeries(function (seriesModel) {
+	                // Legacy problem: some one wrote xAxisIndex as [0] following the wrong way in example.
+	                if (this._axisIndex === +seriesModel.get(this._dimName + 'AxisIndex')) {
+	                    seriesModels.push(seriesModel);
+	                }
+	            }, this);
+
+	            return seriesModels;
+	        },
+
+	        getAxisModel: function () {
+	            return this.ecModel.getComponent(this._dimName + 'Axis', this._axisIndex);
+	        },
+
+	        getOtherAxisModel: function () {
+	            var axisDim = this._dimName;
+	            var ecModel = this.ecModel;
+	            var axisModel = this.getAxisModel();
+	            var isCartesian = axisDim === 'x' || axisDim === 'y';
+	            var otherAxisDim;
+	            var coordSysIndexName;
+	            if (isCartesian) {
+	                coordSysIndexName = 'gridIndex';
+	                otherAxisDim = axisDim === 'x' ? 'y' : 'x';
+	            }
+	            else {
+	                coordSysIndexName = 'polarIndex';
+	                otherAxisDim = axisDim === 'angle' ? 'radius' : 'angle';
+	            }
+	            var foundOtherAxisModel;
+	            ecModel.eachComponent(otherAxisDim + 'Axis', function (otherAxisModel) {
+	                if ((otherAxisModel.get(coordSysIndexName) || 0)
+	                    === (axisModel.get(coordSysIndexName) || 0)
+	                ) {
+	                    foundOtherAxisModel = otherAxisModel;
+	                }
+	            });
+	            return foundOtherAxisModel;
+	        },
+
+	        /**
+	         * Notice: reset should not be called before series.restoreData() called,
+	         * so it is recommanded to be called in "process stage" but not "model init
+	         * stage".
+	         *
+	         * @param {module: echarts/component/dataZoom/DataZoomModel} dataZoomModel
+	         */
+	        reset: function (dataZoomModel) {
+	            if (dataZoomModel !== this._dataZoomModel) {
+	                return;
+	            }
+
+	            // Culculate data window and data extent, and record them.
+	            var dataExtent = this._dataExtent = calculateDataExtent(
+	                this._dimName, this.getTargetSeriesModels()
+	            );
+	            var dataWindow = calculateDataWindow(
+	                dataZoomModel.option, dataExtent, this
+	            );
+	            this._valueWindow = dataWindow.valueWindow;
+	            this._percentWindow = dataWindow.percentWindow;
+
+	            // Update axis setting then.
+	            setAxisModel(this);
+	        },
+
+	        /**
+	         * @param {module: echarts/component/dataZoom/DataZoomModel} dataZoomModel
+	         */
+	        restore: function (dataZoomModel) {
+	            if (dataZoomModel !== this._dataZoomModel) {
+	                return;
+	            }
+
+	            this._valueWindow = this._percentWindow = null;
+	            setAxisModel(this, true);
+	        },
+
+	        /**
+	         * @param {module: echarts/component/dataZoom/DataZoomModel} dataZoomModel
+	         */
+	        filterData: function (dataZoomModel) {
+	            if (dataZoomModel !== this._dataZoomModel) {
+	                return;
+	            }
+
+	            var axisDim = this._dimName;
+	            var seriesModels = this.getTargetSeriesModels();
+	            var filterMode = dataZoomModel.get('filterMode');
+	            var valueWindow = this._valueWindow;
+
+	            // FIXME
+	            // Toolbox may has dataZoom injected. And if there are stacked bar chart
+	            // with NaN data, NaN will be filtered and stack will be wrong.
+	            // So we need to force the mode to be set empty.
+	            // In fect, it is not a big deal that do not support filterMode-'filter'
+	            // when using toolbox#dataZoom, utill tooltip#dataZoom support "single axis
+	            // selection" some day, which might need "adapt to data extent on the
+	            // otherAxis", which is disabled by filterMode-'empty'.
+	            var otherAxisModel = this.getOtherAxisModel();
+	            if (dataZoomModel.get('$fromToolbox')
+	                && otherAxisModel
+	                && otherAxisModel.get('type') === 'category'
+	            ) {
+	                filterMode = 'empty';
+	            }
+
+	            // Process series data
+	            each(seriesModels, function (seriesModel) {
+	                var seriesData = seriesModel.getData();
+
+	                seriesData && each(seriesModel.coordDimToDataDim(axisDim), function (dim) {
+	                    if (filterMode === 'empty') {
+	                        seriesModel.setData(
+	                            seriesData.map(dim, function (value) {
+	                                return !isInWindow(value) ? NaN : value;
+	                            })
+	                        );
+	                    }
+	                    else {
+	                        seriesData.filterSelf(dim, isInWindow);
+	                    }
+	                });
+	            });
+
+	            function isInWindow(value) {
+	                return value >= valueWindow[0] && value <= valueWindow[1];
+	            }
+	        }
+	    };
+
+	    function calculateDataExtent(axisDim, seriesModels) {
+	        var dataExtent = [Infinity, -Infinity];
+
+	        each(seriesModels, function (seriesModel) {
+	            var seriesData = seriesModel.getData();
+	            if (seriesData) {
+	                each(seriesModel.coordDimToDataDim(axisDim), function (dim) {
+	                    var seriesExtent = seriesData.getDataExtent(dim);
+	                    seriesExtent[0] < dataExtent[0] && (dataExtent[0] = seriesExtent[0]);
+	                    seriesExtent[1] > dataExtent[1] && (dataExtent[1] = seriesExtent[1]);
+	                });
+	            }
+	        }, this);
+
+	        return dataExtent;
+	    }
+
+	    function calculateDataWindow(opt, dataExtent, axisProxy) {
+	        var axisModel = axisProxy.getAxisModel();
+	        var scale = axisModel.axis.scale;
+	        var percentExtent = [0, 100];
+	        var percentWindow = [
+	            opt.start,
+	            opt.end
+	        ];
+	        var valueWindow = [];
+
+	        // In percent range is used and axis min/max/scale is set,
+	        // window should be based on min/max/0, but should not be
+	        // based on the extent of filtered data.
+	        dataExtent = dataExtent.slice();
+	        fixExtendByAxis(dataExtent, axisModel, scale);
+
+	        each(['startValue', 'endValue'], function (prop) {
+	            valueWindow.push(
+	                opt[prop] != null
+	                    ? scale.parse(opt[prop])
+	                    : null
+	            );
+	        });
+
+	        // Normalize bound.
+	        each([0, 1], function (idx) {
+	            var boundValue = valueWindow[idx];
+	            var boundPercent = percentWindow[idx];
+
+	            // start/end has higher priority over startValue/endValue,
+	            // because start/end can be consistent among different type
+	            // of axis but startValue/endValue not.
+
+	            if (boundPercent != null || boundValue == null) {
+	                if (boundPercent == null) {
+	                    boundPercent = percentExtent[idx];
+	                }
+	                // Use scale.parse to math round for category or time axis.
+	                boundValue = scale.parse(numberUtil.linearMap(
+	                    boundPercent, percentExtent, dataExtent, true
+	                ));
+	            }
+	            else { // boundPercent == null && boundValue != null
+	                boundPercent = numberUtil.linearMap(
+	                    boundValue, dataExtent, percentExtent, true
+	                );
+	            }
+	            // valueWindow[idx] = round(boundValue);
+	            // percentWindow[idx] = round(boundPercent);
+	            valueWindow[idx] = boundValue;
+	            percentWindow[idx] = boundPercent;
+	        });
+
+	        return {
+	            valueWindow: asc(valueWindow),
+	            percentWindow: asc(percentWindow)
+	        };
+	    }
+
+	    function fixExtendByAxis(dataExtent, axisModel, scale) {
+	        each(['min', 'max'], function (minMax, index) {
+	            var axisMax = axisModel.get(minMax, true);
+	            // Consider 'dataMin', 'dataMax'
+	            if (axisMax != null && (axisMax + '').toLowerCase() !== 'data' + minMax) {
+	                dataExtent[index] = scale.parse(axisMax);
+	            }
+	        });
+
+	        if (!axisModel.get('scale', true)) {
+	            dataExtent[0] > 0 && (dataExtent[0] = 0);
+	            dataExtent[1] < 0 && (dataExtent[1] = 0);
+	        }
+
+	        return dataExtent;
+	    }
+
+	    function setAxisModel(axisProxy, isRestore) {
+	        var axisModel = axisProxy.getAxisModel();
+
+	        var percentWindow = axisProxy._percentWindow;
+	        var valueWindow = axisProxy._valueWindow;
+
+	        if (!percentWindow) {
+	            return;
+	        }
+
+	        var isFull = isRestore || (percentWindow[0] === 0 && percentWindow[1] === 100);
+	        // [0, 500]: arbitrary value, guess axis extent.
+	        var precision = !isRestore && numberUtil.getPixelPrecision(valueWindow, [0, 500]);
+	        // toFixed() digits argument must be between 0 and 20
+	        var invalidPrecision = !isRestore && !(precision < 20 && precision >= 0);
+
+	        var useOrigin = isRestore || isFull || invalidPrecision;
+
+	        axisModel.setRange && axisModel.setRange(
+	            useOrigin ? null : +valueWindow[0].toFixed(precision),
+	            useOrigin ? null : +valueWindow[1].toFixed(precision)
+	        );
+	    }
+
+	    module.exports = AxisProxy;
+
+
+
+/***/ },
+/* 320 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var ComponentView = __webpack_require__(29);
+
+	    module.exports = ComponentView.extend({
+
+	        type: 'dataZoom',
+
+	        render: function (dataZoomModel, ecModel, api, payload) {
+	            this.dataZoomModel = dataZoomModel;
+	            this.ecModel = ecModel;
+	            this.api = api;
+	        },
+
+	        /**
+	         * Find the first target coordinate system.
+	         *
+	         * @protected
+	         * @return {Object} {
+	         *                   cartesians: [
+	         *                       {model: coord0, axisModels: [axis1, axis3], coordIndex: 1},
+	         *                       {model: coord1, axisModels: [axis0, axis2], coordIndex: 0},
+	         *                       ...
+	         *                   ],  // cartesians must not be null/undefined.
+	         *                   polars: [
+	         *                       {model: coord0, axisModels: [axis4], coordIndex: 0},
+	         *                       ...
+	         *                   ],  // polars must not be null/undefined.
+	         *                   axisModels: [axis0, axis1, axis2, axis3, axis4]
+	         *                       // axisModels must not be null/undefined.
+	         *                  }
+	         */
+	        getTargetInfo: function () {
+	            var dataZoomModel = this.dataZoomModel;
+	            var ecModel = this.ecModel;
+	            var cartesians = [];
+	            var polars = [];
+	            var axisModels = [];
+
+	            dataZoomModel.eachTargetAxis(function (dimNames, axisIndex) {
+	                var axisModel = ecModel.getComponent(dimNames.axis, axisIndex);
+	                if (axisModel) {
+	                    axisModels.push(axisModel);
+
+	                    var gridIndex = axisModel.get('gridIndex');
+	                    var polarIndex = axisModel.get('polarIndex');
+
+	                    if (gridIndex != null) {
+	                        var coordModel = ecModel.getComponent('grid', gridIndex);
+	                        save(coordModel, axisModel, cartesians, gridIndex);
+	                    }
+	                    else if (polarIndex != null) {
+	                        var coordModel = ecModel.getComponent('polar', polarIndex);
+	                        save(coordModel, axisModel, polars, polarIndex);
+	                    }
+	                }
+	            }, this);
+
+	            function save(coordModel, axisModel, store, coordIndex) {
+	                var item;
+	                for (var i = 0; i < store.length; i++) {
+	                    if (store[i].model === coordModel) {
+	                        item = store[i];
+	                        break;
+	                    }
+	                }
+	                if (!item) {
+	                    store.push(item = {
+	                        model: coordModel, axisModels: [], coordIndex: coordIndex
+	                    });
+	                }
+	                item.axisModels.push(axisModel);
+	            }
+
+	            return {
+	                cartesians: cartesians,
+	                polars: polars,
+	                axisModels: axisModels
+	            };
+	        }
+
+	    });
+
+
+
+/***/ },
+/* 321 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @file Data zoom model
+	 */
+
+
+	    var DataZoomModel = __webpack_require__(318);
+
+	    var SliderZoomModel = DataZoomModel.extend({
+
+	        type: 'dataZoom.slider',
+
+	        layoutMode: 'box',
+
+	        /**
+	         * @protected
+	         */
+	        defaultOption: {
+	            show: true,
+
+	            // ph => placeholder. Using placehoder here because
+	            // deault value can only be drived in view stage.
+	            right: 'ph',  // Default align to grid rect.
+	            top: 'ph',    // Default align to grid rect.
+	            width: 'ph',  // Default align to grid rect.
+	            height: 'ph', // Default align to grid rect.
+	            left: null,   // Default align to grid rect.
+	            bottom: null, // Default align to grid rect.
+
+	            backgroundColor: 'rgba(47,69,84,0)',    // Background of slider zoom component.
+	            // dataBackgroundColor: '#ddd',         // Background coor of data shadow and border of box,
+	                                                    // highest priority, remain for compatibility of
+	                                                    // previous version, but not recommended any more.
+	            dataBackground: {
+	                lineStyle: {
+	                    color: '#2f4554',
+	                    width: 0.5,
+	                    opacity: 0.3
+	                },
+	                areaStyle: {
+	                    color: 'rgba(47,69,84,0.3)',
+	                    opacity: 0.3
+	                }
+	            },
+	            borderColor: '#ddd',                    // border color of the box. For compatibility,
+	                                                    // if dataBackgroundColor is set, borderColor
+	                                                    // is ignored.
+
+	            fillerColor: 'rgba(167,183,204,0.4)',     // Color of selected area.
+	            // handleColor: 'rgba(89,170,216,0.95)',     // Color of handle.
+	            // handleIcon: 'path://M4.9,17.8c0-1.4,4.5-10.5,5.5-12.4c0-0.1,0.6-1.1,0.9-1.1c0.4,0,0.9,1,0.9,1.1c1.1,2.2,5.4,11,5.4,12.4v17.8c0,1.5-0.6,2.1-1.3,2.1H6.1c-0.7,0-1.3-0.6-1.3-2.1V17.8z',
+	            handleIcon: 'M8.2,13.6V3.9H6.3v9.7H3.1v14.9h3.3v9.7h1.8v-9.7h3.3V13.6H8.2z M9.7,24.4H4.8v-1.4h4.9V24.4z M9.7,19.1H4.8v-1.4h4.9V19.1z',
+	            // Percent of the slider height
+	            handleSize: '100%',
+
+	            handleStyle: {
+	                color: '#a7b7cc'
+	            },
+
+	            labelPrecision: null,
+	            labelFormatter: null,
+	            showDetail: true,
+	            showDataShadow: 'auto',                 // Default auto decision.
+	            realtime: true,
+	            zoomLock: false,                        // Whether disable zoom.
+	            textStyle: {
+	                color: '#333'
+	            }
+	        }
+
+	    });
+
+	    module.exports = SliderZoomModel;
+
+
+
+/***/ },
+/* 322 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+	    var graphic = __webpack_require__(43);
+	    var throttle = __webpack_require__(308);
+	    var DataZoomView = __webpack_require__(320);
+	    var Rect = graphic.Rect;
+	    var numberUtil = __webpack_require__(7);
+	    var linearMap = numberUtil.linearMap;
+	    var layout = __webpack_require__(21);
+	    var sliderMove = __webpack_require__(323);
+	    var asc = numberUtil.asc;
+	    var bind = zrUtil.bind;
+	    // var mathMax = Math.max;
+	    var each = zrUtil.each;
+
+	    // Constants
+	    var DEFAULT_LOCATION_EDGE_GAP = 7;
+	    var DEFAULT_FRAME_BORDER_WIDTH = 1;
+	    var DEFAULT_FILLER_SIZE = 30;
+	    var HORIZONTAL = 'horizontal';
+	    var VERTICAL = 'vertical';
+	    var LABEL_GAP = 5;
+	    var SHOW_DATA_SHADOW_SERIES_TYPE = ['line', 'bar', 'candlestick', 'scatter'];
+
+	    var SliderZoomView = DataZoomView.extend({
+
+	        type: 'dataZoom.slider',
+
+	        init: function (ecModel, api) {
+
+	            /**
+	             * @private
+	             * @type {Object}
+	             */
+	            this._displayables = {};
+
+	            /**
+	             * @private
+	             * @type {string}
+	             */
+	            this._orient;
+
+	            /**
+	             * [0, 100]
+	             * @private
+	             */
+	            this._range;
+
+	            /**
+	             * [coord of the first handle, coord of the second handle]
+	             * @private
+	             */
+	            this._handleEnds;
+
+	            /**
+	             * [length, thick]
+	             * @private
+	             * @type {Array.<number>}
+	             */
+	            this._size;
+
+	            /**
+	             * @private
+	             * @type {number}
+	             */
+	            this._handleWidth;
+
+	            /**
+	             * @private
+	             * @type {number}
+	             */
+	            this._handleHeight;
+
+	            /**
+	             * @private
+	             */
+	            this._location;
+
+	            /**
+	             * @private
+	             */
+	            this._dragging;
+
+	            /**
+	             * @private
+	             */
+	            this._dataShadowInfo;
+
+	            this.api = api;
+	        },
+
+	        /**
+	         * @override
+	         */
+	        render: function (dataZoomModel, ecModel, api, payload) {
+	            SliderZoomView.superApply(this, 'render', arguments);
+
+	            throttle.createOrUpdate(
+	                this,
+	                '_dispatchZoomAction',
+	                this.dataZoomModel.get('throttle'),
+	                'fixRate'
+	            );
+
+	            this._orient = dataZoomModel.get('orient');
+
+	            if (this.dataZoomModel.get('show') === false) {
+	                this.group.removeAll();
+	                return;
+	            }
+
+	            // Notice: this._resetInterval() should not be executed when payload.type
+	            // is 'dataZoom', origin this._range should be maintained, otherwise 'pan'
+	            // or 'zoom' info will be missed because of 'throttle' of this.dispatchAction,
+	            if (!payload || payload.type !== 'dataZoom' || payload.from !== this.uid) {
+	                this._buildView();
+	            }
+
+	            this._updateView();
+	        },
+
+	        /**
+	         * @override
+	         */
+	        remove: function () {
+	            SliderZoomView.superApply(this, 'remove', arguments);
+	            throttle.clear(this, '_dispatchZoomAction');
+	        },
+
+	        /**
+	         * @override
+	         */
+	        dispose: function () {
+	            SliderZoomView.superApply(this, 'dispose', arguments);
+	            throttle.clear(this, '_dispatchZoomAction');
+	        },
+
+	        _buildView: function () {
+	            var thisGroup = this.group;
+
+	            thisGroup.removeAll();
+
+	            this._resetLocation();
+	            this._resetInterval();
+
+	            var barGroup = this._displayables.barGroup = new graphic.Group();
+
+	            this._renderBackground();
+
+	            this._renderHandle();
+
+	            this._renderDataShadow();
+
+	            thisGroup.add(barGroup);
+
+	            this._positionGroup();
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _resetLocation: function () {
+	            var dataZoomModel = this.dataZoomModel;
+	            var api = this.api;
+
+	            // If some of x/y/width/height are not specified,
+	            // auto-adapt according to target grid.
+	            var coordRect = this._findCoordRect();
+	            var ecSize = {width: api.getWidth(), height: api.getHeight()};
+	            // Default align by coordinate system rect.
+	            var positionInfo = this._orient === HORIZONTAL
+	                ? {
+	                    // Why using 'right', because right should be used in vertical,
+	                    // and it is better to be consistent for dealing with position param merge.
+	                    right: ecSize.width - coordRect.x - coordRect.width,
+	                    top: (ecSize.height - DEFAULT_FILLER_SIZE - DEFAULT_LOCATION_EDGE_GAP),
+	                    width: coordRect.width,
+	                    height: DEFAULT_FILLER_SIZE
+	                }
+	                : { // vertical
+	                    right: DEFAULT_LOCATION_EDGE_GAP,
+	                    top: coordRect.y,
+	                    width: DEFAULT_FILLER_SIZE,
+	                    height: coordRect.height
+	                };
+
+	            // Do not write back to option and replace value 'ph', because
+	            // the 'ph' value should be recalculated when resize.
+	            var layoutParams = layout.getLayoutParams(dataZoomModel.option);
+
+	            // Replace the placeholder value.
+	            zrUtil.each(['right', 'top', 'width', 'height'], function (name) {
+	                if (layoutParams[name] === 'ph') {
+	                    layoutParams[name] = positionInfo[name];
+	                }
+	            });
+
+	            var layoutRect = layout.getLayoutRect(
+	                layoutParams,
+	                ecSize,
+	                dataZoomModel.padding
+	            );
+
+	            this._location = {x: layoutRect.x, y: layoutRect.y};
+	            this._size = [layoutRect.width, layoutRect.height];
+	            this._orient === VERTICAL && this._size.reverse();
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _positionGroup: function () {
+	            var thisGroup = this.group;
+	            var location = this._location;
+	            var orient = this._orient;
+
+	            // Just use the first axis to determine mapping.
+	            var targetAxisModel = this.dataZoomModel.getFirstTargetAxisModel();
+	            var inverse = targetAxisModel && targetAxisModel.get('inverse');
+
+	            var barGroup = this._displayables.barGroup;
+	            var otherAxisInverse = (this._dataShadowInfo || {}).otherAxisInverse;
+
+	            // Transform barGroup.
+	            barGroup.attr(
+	                (orient === HORIZONTAL && !inverse)
+	                ? {scale: otherAxisInverse ? [1, 1] : [1, -1]}
+	                : (orient === HORIZONTAL && inverse)
+	                ? {scale: otherAxisInverse ? [-1, 1] : [-1, -1]}
+	                : (orient === VERTICAL && !inverse)
+	                ? {scale: otherAxisInverse ? [1, -1] : [1, 1], rotation: Math.PI / 2}
+	                // Dont use Math.PI, considering shadow direction.
+	                : {scale: otherAxisInverse ? [-1, -1] : [-1, 1], rotation: Math.PI / 2}
+	            );
+
+	            // Position barGroup
+	            var rect = thisGroup.getBoundingRect([barGroup]);
+	            thisGroup.attr('position', [location.x - rect.x, location.y - rect.y]);
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _getViewExtent: function () {
+	            return [0, this._size[0]];
+	        },
+
+	        _renderBackground : function () {
+	            var dataZoomModel = this.dataZoomModel;
+	            var size = this._size;
+
+	            this._displayables.barGroup.add(new Rect({
+	                silent: true,
+	                shape: {
+	                    x: 0, y: 0, width: size[0], height: size[1]
+	                },
+	                style: {
+	                    fill: dataZoomModel.get('backgroundColor')
+	                },
+	                z2: -40
+	            }));
+	        },
+
+	        _renderDataShadow: function () {
+	            var info = this._dataShadowInfo = this._prepareDataShadowInfo();
+
+	            if (!info) {
+	                return;
+	            }
+
+	            var size = this._size;
+	            var seriesModel = info.series;
+	            var data = seriesModel.getRawData();
+	            var otherDim = seriesModel.getShadowDim
+	                ? seriesModel.getShadowDim() // @see candlestick
+	                : info.otherDim;
+
+	            var otherDataExtent = data.getDataExtent(otherDim);
+	            // Nice extent.
+	            var otherOffset = (otherDataExtent[1] - otherDataExtent[0]) * 0.3;
+	            otherDataExtent = [
+	                otherDataExtent[0] - otherOffset,
+	                otherDataExtent[1] + otherOffset
+	            ];
+	            var otherShadowExtent = [0, size[1]];
+
+	            var thisShadowExtent = [0, size[0]];
+
+	            var areaPoints = [[size[0], 0], [0, 0]];
+	            var linePoints = [];
+	            var step = thisShadowExtent[1] / (data.count() - 1);
+	            var thisCoord = 0;
+
+	            // Optimize for large data shadow
+	            var stride = Math.round(data.count() / size[0]);
+	            data.each([otherDim], function (value, index) {
+	                if (stride > 0 && (index % stride)) {
+	                    thisCoord += step;
+	                    return;
+	                }
+	                // FIXME
+	                // 应该使用统计的空判断？还是在list里进行空判断？
+	                var otherCoord = (value == null || isNaN(value) || value === '')
+	                    ? null
+	                    : linearMap(value, otherDataExtent, otherShadowExtent, true);
+	                if (otherCoord != null) {
+	                    areaPoints.push([thisCoord, otherCoord]);
+	                    linePoints.push([thisCoord, otherCoord]);
+	                }
+
+	                thisCoord += step;
+	            });
+
+	            var dataZoomModel = this.dataZoomModel;
+	            // var dataBackgroundModel = dataZoomModel.getModel('dataBackground');
+	            this._displayables.barGroup.add(new graphic.Polygon({
+	                shape: {points: areaPoints},
+	                style: zrUtil.defaults(
+	                    {fill: dataZoomModel.get('dataBackgroundColor')},
+	                    dataZoomModel.getModel('dataBackground.areaStyle').getAreaStyle()
+	                ),
+	                silent: true,
+	                z2: -20
+	            }));
+	            this._displayables.barGroup.add(new graphic.Polyline({
+	                shape: {points: linePoints},
+	                style: dataZoomModel.getModel('dataBackground.lineStyle').getLineStyle(),
+	                silent: true,
+	                z2: -19
+	            }));
+	        },
+
+	        _prepareDataShadowInfo: function () {
+	            var dataZoomModel = this.dataZoomModel;
+	            var showDataShadow = dataZoomModel.get('showDataShadow');
+
+	            if (showDataShadow === false) {
+	                return;
+	            }
+
+	            // Find a representative series.
+	            var result;
+	            var ecModel = this.ecModel;
+
+	            dataZoomModel.eachTargetAxis(function (dimNames, axisIndex) {
+	                var seriesModels = dataZoomModel
+	                    .getAxisProxy(dimNames.name, axisIndex)
+	                    .getTargetSeriesModels();
+
+	                zrUtil.each(seriesModels, function (seriesModel) {
+	                    if (result) {
+	                        return;
+	                    }
+
+	                    if (showDataShadow !== true && zrUtil.indexOf(
+	                            SHOW_DATA_SHADOW_SERIES_TYPE, seriesModel.get('type')
+	                        ) < 0
+	                    ) {
+	                        return;
+	                    }
+
+	                    var otherDim = getOtherDim(dimNames.name);
+
+	                    var thisAxis = ecModel.getComponent(dimNames.axis, axisIndex).axis;
+
+	                    result = {
+	                        thisAxis: thisAxis,
+	                        series: seriesModel,
+	                        thisDim: dimNames.name,
+	                        otherDim: otherDim,
+	                        otherAxisInverse: seriesModel
+	                            .coordinateSystem.getOtherAxis(thisAxis).inverse
+	                    };
+
+	                }, this);
+
+	            }, this);
+
+	            return result;
+	        },
+
+	        _renderHandle: function () {
+	            var displaybles = this._displayables;
+	            var handles = displaybles.handles = [];
+	            var handleLabels = displaybles.handleLabels = [];
+	            var barGroup = this._displayables.barGroup;
+	            var size = this._size;
+	            var dataZoomModel = this.dataZoomModel;
+
+	            barGroup.add(displaybles.filler = new Rect({
+	                draggable: true,
+	                cursor: 'move',
+	                drift: bind(this._onDragMove, this, 'all'),
+	                ondragstart: bind(this._showDataInfo, this, true),
+	                ondragend: bind(this._onDragEnd, this),
+	                onmouseover: bind(this._showDataInfo, this, true),
+	                onmouseout: bind(this._showDataInfo, this, false),
+	                style: {
+	                    fill: dataZoomModel.get('fillerColor'),
+	                    textPosition : 'inside'
+	                }
+	            }));
+
+	            // Frame border.
+	            barGroup.add(new Rect(graphic.subPixelOptimizeRect({
+	                silent: true,
+	                shape: {
+	                    x: 0,
+	                    y: 0,
+	                    width: size[0],
+	                    height: size[1]
+	                },
+	                style: {
+	                    stroke: dataZoomModel.get('dataBackgroundColor')
+	                        || dataZoomModel.get('borderColor'),
+	                    lineWidth: DEFAULT_FRAME_BORDER_WIDTH,
+	                    fill: 'rgba(0,0,0,0)'
+	                }
+	            })));
+
+	            var iconStr = dataZoomModel.get('handleIcon');
+	            each([0, 1], function (handleIndex) {
+	                var path = graphic.makePath(iconStr, {
+	                    style: {
+	                        strokeNoScale: true
+	                    },
+	                    rectHover: true,
+	                    cursor: this._orient === 'vertical' ? 'ns-resize' : 'ew-resize',
+	                    draggable: true,
+	                    drift: bind(this._onDragMove, this, handleIndex),
+	                    ondragend: bind(this._onDragEnd, this),
+	                    onmouseover: bind(this._showDataInfo, this, true),
+	                    onmouseout: bind(this._showDataInfo, this, false)
+	                }, {
+	                    x: -0.5,
+	                    y: 0,
+	                    width: 1,
+	                    height: 1
+	                }, 'center');
+
+	                var bRect = path.getBoundingRect();
+	                this._handleHeight = numberUtil.parsePercent(dataZoomModel.get('handleSize'), this._size[1]);
+	                this._handleWidth = bRect.width / bRect.height * this._handleHeight;
+
+	                path.setStyle(dataZoomModel.getModel('handleStyle').getItemStyle());
+	                var handleColor = dataZoomModel.get('handleColor');
+	                // Compatitable with previous version
+	                if (handleColor != null) {
+	                    path.style.fill = handleColor;
+	                }
+
+	                barGroup.add(handles[handleIndex] = path);
+
+	                var textStyleModel = dataZoomModel.textStyleModel;
+
+	                this.group.add(
+	                    handleLabels[handleIndex] = new graphic.Text({
+	                    silent: true,
+	                    invisible: true,
+	                    style: {
+	                        x: 0, y: 0, text: '',
+	                        textVerticalAlign: 'middle',
+	                        textAlign: 'center',
+	                        fill: textStyleModel.getTextColor(),
+	                        textFont: textStyleModel.getFont()
+	                    },
+	                    z2: 10
+	                }));
+
+	            }, this);
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _resetInterval: function () {
+	            var range = this._range = this.dataZoomModel.getPercentRange();
+	            var viewExtent = this._getViewExtent();
+
+	            this._handleEnds = [
+	                linearMap(range[0], [0, 100], viewExtent, true),
+	                linearMap(range[1], [0, 100], viewExtent, true)
+	            ];
+	        },
+
+	        /**
+	         * @private
+	         * @param {(number|string)} handleIndex 0 or 1 or 'all'
+	         * @param {number} dx
+	         * @param {number} dy
+	         */
+	        _updateInterval: function (handleIndex, delta) {
+	            var handleEnds = this._handleEnds;
+	            var viewExtend = this._getViewExtent();
+
+	            sliderMove(
+	                delta,
+	                handleEnds,
+	                viewExtend,
+	                (handleIndex === 'all' || this.dataZoomModel.get('zoomLock'))
+	                    ? 'rigid' : 'cross',
+	                handleIndex
+	            );
+
+	            this._range = asc([
+	                linearMap(handleEnds[0], viewExtend, [0, 100], true),
+	                linearMap(handleEnds[1], viewExtend, [0, 100], true)
+	            ]);
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _updateView: function () {
+	            var displaybles = this._displayables;
+	            var handleEnds = this._handleEnds;
+	            var handleInterval = asc(handleEnds.slice());
+	            var size = this._size;
+
+	            each([0, 1], function (handleIndex) {
+	                // Handles
+	                var handle = displaybles.handles[handleIndex];
+	                var handleHeight = this._handleHeight;
+	                handle.attr({
+	                    scale: [handleHeight, handleHeight],
+	                    position: [handleEnds[handleIndex], size[1] / 2 - handleHeight / 2]
+	                });
+	            }, this);
+
+	            // Filler
+	            displaybles.filler.setShape({
+	                x: handleInterval[0],
+	                y: 0,
+	                width: handleInterval[1] - handleInterval[0],
+	                height: size[1]
+	            });
+
+	            this._updateDataInfo();
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _updateDataInfo: function () {
+	            var dataZoomModel = this.dataZoomModel;
+	            var displaybles = this._displayables;
+	            var handleLabels = displaybles.handleLabels;
+	            var orient = this._orient;
+	            var labelTexts = ['', ''];
+
+	            // FIXME
+	            // date型，支持formatter，autoformatter（ec2 date.getAutoFormatter）
+	            if (dataZoomModel.get('showDetail')) {
+	                var dataInterval;
+	                var axis;
+	                dataZoomModel.eachTargetAxis(function (dimNames, axisIndex) {
+	                    // Using dataInterval of the first axis.
+	                    if (!dataInterval) {
+	                        dataInterval = dataZoomModel
+	                            .getAxisProxy(dimNames.name, axisIndex)
+	                            .getDataValueWindow();
+	                        axis = this.ecModel.getComponent(dimNames.axis, axisIndex).axis;
+	                    }
+	                }, this);
+
+	                if (dataInterval) {
+	                    labelTexts = [
+	                        this._formatLabel(dataInterval[0], axis),
+	                        this._formatLabel(dataInterval[1], axis)
+	                    ];
+	                }
+	            }
+
+	            var orderedHandleEnds = asc(this._handleEnds.slice());
+
+	            setLabel.call(this, 0);
+	            setLabel.call(this, 1);
+
+	            function setLabel(handleIndex) {
+	                // Label
+	                // Text should not transform by barGroup.
+	                // Ignore handlers transform
+	                var barTransform = graphic.getTransform(
+	                    displaybles.handles[handleIndex].parent, this.group
+	                );
+	                var direction = graphic.transformDirection(
+	                    handleIndex === 0 ? 'right' : 'left', barTransform
+	                );
+	                var offset = this._handleWidth / 2 + LABEL_GAP;
+	                var textPoint = graphic.applyTransform(
+	                    [
+	                        orderedHandleEnds[handleIndex] + (handleIndex === 0 ? -offset : offset),
+	                        this._size[1] / 2
+	                    ],
+	                    barTransform
+	                );
+	                handleLabels[handleIndex].setStyle({
+	                    x: textPoint[0],
+	                    y: textPoint[1],
+	                    textVerticalAlign: orient === HORIZONTAL ? 'middle' : direction,
+	                    textAlign: orient === HORIZONTAL ? direction : 'center',
+	                    text: labelTexts[handleIndex]
+	                });
+	            }
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _formatLabel: function (value, axis) {
+	            var dataZoomModel = this.dataZoomModel;
+	            var labelFormatter = dataZoomModel.get('labelFormatter');
+	            if (zrUtil.isFunction(labelFormatter)) {
+	                return labelFormatter(value);
+	            }
+
+	            var labelPrecision = dataZoomModel.get('labelPrecision');
+	            if (labelPrecision == null || labelPrecision === 'auto') {
+	                labelPrecision = axis.getPixelPrecision();
+	            }
+
+	            value = (value == null && isNaN(value))
+	                ? ''
+	                // FIXME Glue code
+	                : (axis.type === 'category' || axis.type === 'time')
+	                    ? axis.scale.getLabel(Math.round(value))
+	                    // param of toFixed should less then 20.
+	                    : value.toFixed(Math.min(labelPrecision, 20));
+
+	            if (zrUtil.isString(labelFormatter)) {
+	                value = labelFormatter.replace('{value}', value);
+	            }
+
+	            return value;
+	        },
+
+	        /**
+	         * @private
+	         * @param {boolean} showOrHide true: show, false: hide
+	         */
+	        _showDataInfo: function (showOrHide) {
+	            // Always show when drgging.
+	            showOrHide = this._dragging || showOrHide;
+
+	            var handleLabels = this._displayables.handleLabels;
+	            handleLabels[0].attr('invisible', !showOrHide);
+	            handleLabels[1].attr('invisible', !showOrHide);
+	        },
+
+	        _onDragMove: function (handleIndex, dx, dy) {
+	            this._dragging = true;
+
+	            // Transform dx, dy to bar coordination.
+	            var vertex = this._applyBarTransform([dx, dy], true);
+
+	            this._updateInterval(handleIndex, vertex[0]);
+	            this._updateView();
+
+	            if (this.dataZoomModel.get('realtime')) {
+	                this._dispatchZoomAction();
+	            }
+	        },
+
+	        _onDragEnd: function () {
+	            this._dragging = false;
+	            this._showDataInfo(false);
+	            this._dispatchZoomAction();
+	        },
+
+	        /**
+	         * This action will be throttled.
+	         * @private
+	         */
+	        _dispatchZoomAction: function () {
+	            var range = this._range;
+
+	            this.api.dispatchAction({
+	                type: 'dataZoom',
+	                from: this.uid,
+	                dataZoomId: this.dataZoomModel.id,
+	                start: range[0],
+	                end: range[1]
+	            });
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _applyBarTransform: function (vertex, inverse) {
+	            var barTransform = this._displayables.barGroup.getLocalTransform();
+	            return graphic.applyTransform(vertex, barTransform, inverse);
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _findCoordRect: function () {
+	            // Find the grid coresponding to the first axis referred by dataZoom.
+	            var targetInfo = this.getTargetInfo();
+
+	            // FIXME
+	            // 判断是catesian还是polar
+	            var rect;
+	            if (targetInfo.cartesians.length) {
+	                rect = targetInfo.cartesians[0].model.coordinateSystem.getRect();
+	            }
+	            else { // Polar
+	                // FIXME
+	                // 暂时随便写的
+	                var width = this.api.getWidth();
+	                var height = this.api.getHeight();
+	                rect = {
+	                    x: width * 0.2,
+	                    y: height * 0.2,
+	                    width: width * 0.6,
+	                    height: height * 0.6
+	                };
+	            }
+
+	            return rect;
+	        }
+
+	    });
+
+	    function getOtherDim(thisDim) {
+	        // FIXME
+	        // 这个逻辑和getOtherAxis里一致，但是写在这里是否不好
+	        return thisDim === 'x' ? 'y' : 'x';
+	    }
+
+	    module.exports = SliderZoomView;
+
+
+
+/***/ },
+/* 323 */
+/***/ function(module, exports) {
+
+	
+
+	    /**
+	     * Calculate slider move result.
+	     *
+	     * @param {number} delta Move length.
+	     * @param {Array.<number>} handleEnds handleEnds[0] and be bigger then handleEnds[1].
+	     *                                    handleEnds will be modified in this method.
+	     * @param {Array.<number>} extent handleEnds is restricted by extent.
+	     *                                extent[0] should less or equals than extent[1].
+	     * @param {string} mode 'rigid': Math.abs(handleEnds[0] - handleEnds[1]) remain unchanged,
+	     *                      'cross' handleEnds[0] can be bigger then handleEnds[1],
+	     *                      'push' handleEnds[0] can not be bigger then handleEnds[1],
+	     *                              when they touch, one push other.
+	     * @param {number} handleIndex If mode is 'rigid', handleIndex is not required.
+	     * @param {Array.<number>} The input handleEnds.
+	     */
+	    module.exports = function (delta, handleEnds, extent, mode, handleIndex) {
+	        if (!delta) {
+	            return handleEnds;
+	        }
+
+	        if (mode === 'rigid') {
+	            delta = getRealDelta(delta, handleEnds, extent);
+	            handleEnds[0] += delta;
+	            handleEnds[1] += delta;
+	        }
+	        else {
+	            delta = getRealDelta(delta, handleEnds[handleIndex], extent);
+	            handleEnds[handleIndex] += delta;
+
+	            if (mode === 'push' && handleEnds[0] > handleEnds[1]) {
+	                handleEnds[1 - handleIndex] = handleEnds[handleIndex];
+	            }
+	        }
+
+	        return handleEnds;
+
+	        function getRealDelta(delta, handleEnds, extent) {
+	            var handleMinMax = !handleEnds.length
+	                ? [handleEnds, handleEnds]
+	                : handleEnds.slice();
+	            handleEnds[0] > handleEnds[1] && handleMinMax.reverse();
+
+	            if (delta < 0 && handleMinMax[0] + delta < extent[0]) {
+	                delta = extent[0] - handleMinMax[0];
+	            }
+	            if (delta > 0 && handleMinMax[1] + delta > extent[1]) {
+	                delta = extent[1] - handleMinMax[1];
+	            }
+	            return delta;
+	        }
+	    };
+
+
+/***/ },
+/* 324 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @file Data zoom model
+	 */
+
+
+	    module.exports = __webpack_require__(318).extend({
+
+	        type: 'dataZoom.inside',
+
+	        /**
+	         * @protected
+	         */
+	        defaultOption: {
+	            zoomLock: false // Whether disable zoom but only pan.
+	        }
+	    });
+
+
+/***/ },
+/* 325 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var DataZoomView = __webpack_require__(320);
+	    var zrUtil = __webpack_require__(4);
+	    var sliderMove = __webpack_require__(323);
+	    var roams = __webpack_require__(326);
+	    var bind = zrUtil.bind;
+
+	    var InsideZoomView = DataZoomView.extend({
+
+	        type: 'dataZoom.inside',
+
+	        /**
+	         * @override
+	         */
+	        init: function (ecModel, api) {
+	            /**
+	             * 'throttle' is used in this.dispatchAction, so we save range
+	             * to avoid missing some 'pan' info.
+	             * @private
+	             * @type {Array.<number>}
+	             */
+	            this._range;
+	        },
+
+	        /**
+	         * @override
+	         */
+	        render: function (dataZoomModel, ecModel, api, payload) {
+	            InsideZoomView.superApply(this, 'render', arguments);
+
+	            // Notice: origin this._range should be maintained, and should not be re-fetched
+	            // from dataZoomModel when payload.type is 'dataZoom', otherwise 'pan' or 'zoom'
+	            // info will be missed because of 'throttle' of this.dispatchAction.
+	            if (roams.shouldRecordRange(payload, dataZoomModel.id)) {
+	                this._range = dataZoomModel.getPercentRange();
+	            }
+
+	            // Reset controllers.
+	            var coordInfoList = this.getTargetInfo().cartesians;
+	            var allCoordIds = zrUtil.map(coordInfoList, function (coordInfo) {
+	                return roams.generateCoordId(coordInfo.model);
+	            });
+
+	            zrUtil.each(coordInfoList, function (coordInfo) {
+	                var coordModel = coordInfo.model;
+	                roams.register(
+	                    api,
+	                    {
+	                        coordId: roams.generateCoordId(coordModel),
+	                        allCoordIds: allCoordIds,
+	                        coordinateSystem: coordModel.coordinateSystem,
+	                        dataZoomId: dataZoomModel.id,
+	                        throttleRate: dataZoomModel.get('throttle', true),
+	                        panGetRange: bind(this._onPan, this, coordInfo),
+	                        zoomGetRange: bind(this._onZoom, this, coordInfo)
+	                    }
+	                );
+	            }, this);
+
+	            // TODO
+	            // polar支持
+	        },
+
+	        /**
+	         * @override
+	         */
+	        dispose: function () {
+	            roams.unregister(this.api, this.dataZoomModel.id);
+	            InsideZoomView.superApply(this, 'dispose', arguments);
+	            this._range = null;
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _onPan: function (coordInfo, controller, dx, dy) {
+	            return (
+	                this._range = panCartesian(
+	                    [dx, dy], this._range, controller, coordInfo
+	                )
+	            );
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _onZoom: function (coordInfo, controller, scale, mouseX, mouseY) {
+	            var dataZoomModel = this.dataZoomModel;
+
+	            if (dataZoomModel.option.zoomLock) {
+	                return this._range;
+	            }
+
+	            return (
+	                this._range = scaleCartesian(
+	                    1 / scale, [mouseX, mouseY], this._range,
+	                    controller, coordInfo, dataZoomModel
+	                )
+	            );
+	        }
+
+	    });
+
+	    function panCartesian(pixelDeltas, range, controller, coordInfo) {
+	        range = range.slice();
+
+	        // Calculate transform by the first axis.
+	        var axisModel = coordInfo.axisModels[0];
+	        if (!axisModel) {
+	            return;
+	        }
+
+	        var directionInfo = getDirectionInfo(pixelDeltas, axisModel, controller);
+
+	        var percentDelta = directionInfo.signal
+	            * (range[1] - range[0])
+	            * directionInfo.pixel / directionInfo.pixelLength;
+
+	        sliderMove(
+	            percentDelta,
+	            range,
+	            [0, 100],
+	            'rigid'
+	        );
+
+	        return range;
+	    }
+
+	    function scaleCartesian(scale, mousePoint, range, controller, coordInfo, dataZoomModel) {
+	        range = range.slice();
+
+	        // Calculate transform by the first axis.
+	        var axisModel = coordInfo.axisModels[0];
+	        if (!axisModel) {
+	            return;
+	        }
+
+	        var directionInfo = getDirectionInfo(mousePoint, axisModel, controller);
+
+	        var mouse = directionInfo.pixel - directionInfo.pixelStart;
+	        var percentPoint = mouse / directionInfo.pixelLength * (range[1] - range[0]) + range[0];
+
+	        scale = Math.max(scale, 0);
+	        range[0] = (range[0] - percentPoint) * scale + percentPoint;
+	        range[1] = (range[1] - percentPoint) * scale + percentPoint;
+
+	        return fixRange(range);
+	    }
+
+	    function getDirectionInfo(xy, axisModel, controller) {
+	        var axis = axisModel.axis;
+	        var rect = controller.rectProvider();
+	        var ret = {};
+
+	        if (axis.dim === 'x') {
+	            ret.pixel = xy[0];
+	            ret.pixelLength = rect.width;
+	            ret.pixelStart = rect.x;
+	            ret.signal = axis.inverse ? 1 : -1;
+	        }
+	        else { // axis.dim === 'y'
+	            ret.pixel = xy[1];
+	            ret.pixelLength = rect.height;
+	            ret.pixelStart = rect.y;
+	            ret.signal = axis.inverse ? -1 : 1;
+	        }
+
+	        return ret;
+	    }
+
+	    function fixRange(range) {
+	        // Clamp, using !(<= or >=) to handle NaN.
+	        // jshint ignore:start
+	        var bound = [0, 100];
+	        !(range[0] <= bound[1]) && (range[0] = bound[1]);
+	        !(range[1] <= bound[1]) && (range[1] = bound[1]);
+	        !(range[0] >= bound[0]) && (range[0] = bound[0]);
+	        !(range[1] >= bound[0]) && (range[1] = bound[0]);
+	        // jshint ignore:end
+
+	        return range;
+	    }
+
+	    module.exports = InsideZoomView;
+
+
+/***/ },
+/* 326 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @file Roam controller manager.
+	 */
+
+
+	    // Only create one roam controller for each coordinate system.
+	    // one roam controller might be refered by two inside data zoom
+	    // components (for example, one for x and one for y). When user
+	    // pan or zoom, only dispatch one action for those data zoom
+	    // components.
+
+	    var zrUtil = __webpack_require__(4);
+	    var RoamController = __webpack_require__(174);
+	    var throttle = __webpack_require__(308);
+	    var curry = zrUtil.curry;
+
+	    var ATTR = '\0_ec_dataZoom_roams';
+
+	    var roams = {
+
+	        /**
+	         * @public
+	         * @param {module:echarts/ExtensionAPI} api
+	         * @param {Object} dataZoomInfo
+	         * @param {string} dataZoomInfo.coordId
+	         * @param {Object} dataZoomInfo.coordinateSystem
+	         * @param {Array.<string>} dataZoomInfo.allCoordIds
+	         * @param {string} dataZoomInfo.dataZoomId
+	         * @param {number} dataZoomInfo.throttleRate
+	         * @param {Function} dataZoomInfo.panGetRange
+	         * @param {Function} dataZoomInfo.zoomGetRange
+	         */
+	        register: function (api, dataZoomInfo) {
+	            var store = giveStore(api);
+	            var theDataZoomId = dataZoomInfo.dataZoomId;
+	            var theCoordId = dataZoomInfo.coordId;
+
+	            // Do clean when a dataZoom changes its target coordnate system.
+	            zrUtil.each(store, function (record, coordId) {
+	                var dataZoomInfos = record.dataZoomInfos;
+	                if (dataZoomInfos[theDataZoomId]
+	                    && zrUtil.indexOf(dataZoomInfo.allCoordIds, theCoordId) < 0
+	                ) {
+	                    delete dataZoomInfos[theDataZoomId];
+	                    record.count--;
+	                }
+	            });
+
+	            cleanStore(store);
+
+	            var record = store[theCoordId];
+
+	            // Create if needed.
+	            if (!record) {
+	                record = store[theCoordId] = {
+	                    coordId: theCoordId,
+	                    dataZoomInfos: {},
+	                    count: 0
+	                };
+	                record.controller = createController(api, dataZoomInfo, record);
+	                record.dispatchAction = zrUtil.curry(dispatchAction, api);
+	            }
+
+	            // Consider resize, area should be always updated.
+	            var rect = dataZoomInfo.coordinateSystem.getRect().clone();
+	            record.controller.rectProvider = function () {
+	                return rect;
+	            };
+
+	            // Update throttle.
+	            throttle.createOrUpdate(
+	                record,
+	                'dispatchAction',
+	                dataZoomInfo.throttleRate,
+	                'fixRate'
+	            );
+
+	            // Update reference of dataZoom.
+	            !(record.dataZoomInfos[theDataZoomId]) && record.count++;
+	            record.dataZoomInfos[theDataZoomId] = dataZoomInfo;
+	        },
+
+	        /**
+	         * @public
+	         * @param {module:echarts/ExtensionAPI} api
+	         * @param {string} dataZoomId
+	         */
+	        unregister: function (api, dataZoomId) {
+	            var store = giveStore(api);
+
+	            zrUtil.each(store, function (record) {
+	                var dataZoomInfos = record.dataZoomInfos;
+	                if (dataZoomInfos[dataZoomId]) {
+	                    delete dataZoomInfos[dataZoomId];
+	                    record.count--;
+	                }
+	            });
+
+	            cleanStore(store);
+	        },
+
+	        /**
+	         * @public
+	         */
+	        shouldRecordRange: function (payload, dataZoomId) {
+	            if (payload && payload.type === 'dataZoom' && payload.batch) {
+	                for (var i = 0, len = payload.batch.length; i < len; i++) {
+	                    if (payload.batch[i].dataZoomId === dataZoomId) {
+	                        return false;
+	                    }
+	                }
+	            }
+	            return true;
+	        },
+
+	        /**
+	         * @public
+	         */
+	        generateCoordId: function (coordModel) {
+	            return coordModel.type + '\0_' + coordModel.id;
+	        }
+	    };
+
+	    /**
+	     * Key: coordId, value: {dataZoomInfos: [], count, controller}
+	     * @type {Array.<Object>}
+	     */
+	    function giveStore(api) {
+	        // Mount store on zrender instance, so that we do not
+	        // need to worry about dispose.
+	        var zr = api.getZr();
+	        return zr[ATTR] || (zr[ATTR] = {});
+	    }
+
+	    function createController(api, dataZoomInfo, newRecord) {
+	        var controller = new RoamController(api.getZr());
+	        controller.enable();
+	        controller.on('pan', curry(onPan, newRecord));
+	        controller.on('zoom', curry(onZoom, newRecord));
+
+	        return controller;
+	    }
+
+	    function cleanStore(store) {
+	        zrUtil.each(store, function (record, coordId) {
+	            if (!record.count) {
+	                record.controller.off('pan').off('zoom');
+	                delete store[coordId];
+	            }
+	        });
+	    }
+
+	    function onPan(record, dx, dy) {
+	        wrapAndDispatch(record, function (info) {
+	            return info.panGetRange(record.controller, dx, dy);
+	        });
+	    }
+
+	    function onZoom(record, scale, mouseX, mouseY) {
+	        wrapAndDispatch(record, function (info) {
+	            return info.zoomGetRange(record.controller, scale, mouseX, mouseY);
+	        });
+	    }
+
+	    function wrapAndDispatch(record, getRange) {
+	        var batch = [];
+
+	        zrUtil.each(record.dataZoomInfos, function (info) {
+	            var range = getRange(info);
+	            range && batch.push({
+	                dataZoomId: info.dataZoomId,
+	                start: range[0],
+	                end: range[1]
+	            });
+	        });
+
+	        record.dispatchAction(batch);
+	    }
+
+	    /**
+	     * This action will be throttled.
+	     */
+	    function dispatchAction(api, batch) {
+	        api.dispatchAction({
+	            type: 'dataZoom',
+	            batch: batch
+	        });
+	    }
+
+	    module.exports = roams;
+
+
+
+/***/ },
+/* 327 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @file Data zoom processor
+	 */
+
+
+	    var echarts = __webpack_require__(1);
+
+	    echarts.registerProcessor(function (ecModel, api) {
+
+	        ecModel.eachComponent('dataZoom', function (dataZoomModel) {
+	            // We calculate window and reset axis here but not in model
+	            // init stage and not after action dispatch handler, because
+	            // reset should be called after seriesData.restoreData.
+	            dataZoomModel.eachTargetAxis(resetSingleAxis);
+
+	            // Caution: data zoom filtering is order sensitive when using
+	            // percent range and no min/max/scale set on axis.
+	            // For example, we have dataZoom definition:
+	            // [
+	            //      {xAxisIndex: 0, start: 30, end: 70},
+	            //      {yAxisIndex: 0, start: 20, end: 80}
+	            // ]
+	            // In this case, [20, 80] of y-dataZoom should be based on data
+	            // that have filtered by x-dataZoom using range of [30, 70],
+	            // but should not be based on full raw data. Thus sliding
+	            // x-dataZoom will change both ranges of xAxis and yAxis,
+	            // while sliding y-dataZoom will only change the range of yAxis.
+	            // So we should filter x-axis after reset x-axis immediately,
+	            // and then reset y-axis and filter y-axis.
+	            dataZoomModel.eachTargetAxis(filterSingleAxis);
+	        });
+
+	        ecModel.eachComponent('dataZoom', function (dataZoomModel) {
+	            // Fullfill all of the range props so that user
+	            // is able to get them from chart.getOption().
+	            var axisProxy = dataZoomModel.findRepresentativeAxisProxy();
+	            var percentRange = axisProxy.getDataPercentWindow();
+	            var valueRange = axisProxy.getDataValueWindow();
+
+	            dataZoomModel.setRawRange({
+	                start: percentRange[0],
+	                end: percentRange[1],
+	                startValue: valueRange[0],
+	                endValue: valueRange[1]
+	            });
+	        });
+	    });
+
+	    function resetSingleAxis(dimNames, axisIndex, dataZoomModel) {
+	        dataZoomModel.getAxisProxy(dimNames.name, axisIndex).reset(dataZoomModel);
+	    }
+
+	    function filterSingleAxis(dimNames, axisIndex, dataZoomModel) {
+	        dataZoomModel.getAxisProxy(dimNames.name, axisIndex).filterData(dataZoomModel);
+	    }
+
+
+
+
+/***/ },
+/* 328 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @file Data zoom action
+	 */
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var modelUtil = __webpack_require__(5);
+	    var echarts = __webpack_require__(1);
+
+
+	    echarts.registerAction('dataZoom', function (payload, ecModel) {
+
+	        var linkedNodesFinder = modelUtil.createLinkedNodesFinder(
+	            zrUtil.bind(ecModel.eachComponent, ecModel, 'dataZoom'),
+	            modelUtil.eachAxisDim,
+	            function (model, dimNames) {
+	                return model.get(dimNames.axisIndex);
+	            }
+	        );
+
+	        var effectedModels = [];
+
+	        ecModel.eachComponent(
+	            {mainType: 'dataZoom', query: payload},
+	            function (model, index) {
+	                effectedModels.push.apply(
+	                    effectedModels, linkedNodesFinder(model).nodes
+	                );
+	            }
+	        );
+
+	        zrUtil.each(effectedModels, function (dataZoomModel, index) {
+	            dataZoomModel.setRawRange({
+	                start: payload.start,
+	                end: payload.end,
+	                startValue: payload.startValue,
+	                endValue: payload.endValue
+	            });
+	        });
+
+	    });
+
+
+
+/***/ },
+/* 329 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * visualMap component entry
+	 */
+
+
+	    __webpack_require__(330);
+	    __webpack_require__(341);
+
+
+
+/***/ },
+/* 330 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * DataZoom component entry
+	 */
+
+
+	    __webpack_require__(1).registerPreprocessor(
+	        __webpack_require__(331)
+	    );
+
+	    __webpack_require__(332);
+	    __webpack_require__(333);
+	    __webpack_require__(334);
+	    __webpack_require__(337);
+	    __webpack_require__(340);
+
+
+
+/***/ },
+/* 331 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @file VisualMap preprocessor
+	 */
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var each = zrUtil.each;
+
+	    module.exports = function (option) {
+	        var visualMap = option && option.visualMap;
+
+	        if (!zrUtil.isArray(visualMap)) {
+	            visualMap = visualMap ? [visualMap] : [];
+	        }
+
+	        each(visualMap, function (opt) {
+	            if (!opt) {
+	                return;
+	            }
+
+	            // rename splitList to pieces
+	            if (has(opt, 'splitList') && !has(opt, 'pieces')) {
+	                opt.pieces = opt.splitList;
+	                delete opt.splitList;
+	            }
+
+	            var pieces = opt.pieces;
+	            if (pieces && zrUtil.isArray(pieces)) {
+	                each(pieces, function (piece) {
+	                    if (zrUtil.isObject(piece)) {
+	                        if (has(piece, 'start') && !has(piece, 'min')) {
+	                            piece.min = piece.start;
+	                        }
+	                        if (has(piece, 'end') && !has(piece, 'max')) {
+	                            piece.max = piece.end;
+	                        }
+	                    }
+	                });
+	            }
+	        });
+	    };
+
+	    function has(obj, name) {
+	        return obj && obj.hasOwnProperty && obj.hasOwnProperty(name);
+	    }
+
+
+
+/***/ },
+/* 332 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    __webpack_require__(19).registerSubTypeDefaulter('visualMap', function (option) {
+	        // Compatible with ec2, when splitNumber === 0, continuous visualMap will be used.
+	        return (
+	                !option.categories
+	                && (
+	                    !(
+	                        option.pieces
+	                            ? option.pieces.length > 0
+	                            : option.splitNumber > 0
+	                    )
+	                    || option.calculable
+	                )
+	            )
+	            ? 'continuous' : 'piecewise';
+	    });
+
+
+
+/***/ },
+/* 333 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @file Data range visual coding.
+	 */
+
+
+	    var echarts = __webpack_require__(1);
+	    var visualSolution = __webpack_require__(306);
+	    var VisualMapping = __webpack_require__(192);
+
+	    echarts.registerVisual(echarts.PRIORITY.VISUAL.COMPONENT, function (ecModel) {
+	        ecModel.eachComponent('visualMap', function (visualMapModel) {
+	            processSingleVisualMap(visualMapModel, ecModel);
+	        });
+
+	        prepareVisualMeta(ecModel);
+	    });
+
+	    function processSingleVisualMap(visualMapModel, ecModel) {
+	        visualMapModel.eachTargetSeries(function (seriesModel) {
+	            var data = seriesModel.getData();
+
+	            visualSolution.applyVisual(
+	                visualMapModel.stateList,
+	                visualMapModel.targetVisuals,
+	                data,
+	                visualMapModel.getValueState,
+	                visualMapModel,
+	                visualMapModel.getDataDimension(data)
+	            );
+	        });
+	    }
+
+	    // Only support color.
+	    function prepareVisualMeta(ecModel) {
+	        ecModel.eachSeries(function (seriesModel) {
+	            var data = seriesModel.getData();
+	            var visualMetaList = [];
+
+	            ecModel.eachComponent('visualMap', function (visualMapModel) {
+	                if (visualMapModel.isTargetSeries(seriesModel)) {
+	                    var visualMeta = {};
+	                    visualMetaList.push(visualMeta);
+	                    visualMeta.stops = visualMapModel.getStops(seriesModel, getColorVisual);
+	                    visualMeta.dimension = visualMapModel.getDataDimension(data);
+	                }
+	            });
+
+	            // console.log(JSON.stringify(visualMetaList.map(a => a.stops)));
+	            seriesModel.getData().setVisual('visualMeta', visualMetaList);
+	        });
+	    }
+
+	    // FIXME
+	    // performance and export for heatmap?
+	    function getColorVisual(visualMapModel, value, valueState) {
+	        var mappings = visualMapModel.targetVisuals[valueState];
+	        var visualTypes = VisualMapping.prepareVisualTypes(mappings);
+	        var resultVisual = {};
+
+	        for (var i = 0, len = visualTypes.length; i < len; i++) {
+	            var type = visualTypes[i];
+	            var mapping = mappings[
+	                type === 'colorAlpha' ? '__alphaForOpacity' : type
+	            ];
+	            mapping && mapping.applyVisual(value, getVisual, setVisual);
+	        }
+
+	        return resultVisual.color;
+
+	        function getVisual(key) {
+	            return resultVisual[key];
+	        }
+
+	        function setVisual(key, value) {
+	            resultVisual[key] = value;
+	        }
+	    }
+
+
+
+
+/***/ },
+/* 334 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @file Data zoom model
+	 */
+
+
+	    var VisualMapModel = __webpack_require__(335);
+	    var zrUtil = __webpack_require__(4);
+	    var numberUtil = __webpack_require__(7);
+
+	    // Constant
+	    var DEFAULT_BAR_BOUND = [20, 140];
+
+	    var ContinuousModel = VisualMapModel.extend({
+
+	        type: 'visualMap.continuous',
+
+	        /**
+	         * @protected
+	         */
+	        defaultOption: {
+	            align: 'auto',          // 'auto', 'left', 'right', 'top', 'bottom'
+	            calculable: false,      // This prop effect default component type determine,
+	                                    // See echarts/component/visualMap/typeDefaulter.
+	            range: null,            // selected range. In default case `range` is [min, max]
+	                                    // and can auto change along with modification of min max,
+	                                    // util use specifid a range.
+	            realtime: true,         // Whether realtime update.
+	            itemHeight: null,       // The length of the range control edge.
+	            itemWidth: null,        // The length of the other side.
+	            hoverLink: true,        // Enable hover highlight.
+	            hoverLinkDataSize: null,// The size of hovered data.
+	            hoverLinkOnHandle: true // Whether trigger hoverLink when hover handle.
+	        },
+
+	        /**
+	         * @override
+	         */
+	        optionUpdated: function (newOption, isInit) {
+	            ContinuousModel.superApply(this, 'optionUpdated', arguments);
+
+	            this.resetTargetSeries();
+	            this.resetExtent();
+
+	            this.resetVisual(function (mappingOption) {
+	                mappingOption.mappingMethod = 'linear';
+	                mappingOption.dataExtent = this.getExtent();
+	            });
+
+	            this._resetRange();
+	        },
+
+	        /**
+	         * @protected
+	         * @override
+	         */
+	        resetItemSize: function () {
+	            ContinuousModel.superApply(this, 'resetItemSize', arguments);
+
+	            var itemSize = this.itemSize;
+
+	            this._orient === 'horizontal' && itemSize.reverse();
+
+	            (itemSize[0] == null || isNaN(itemSize[0])) && (itemSize[0] = DEFAULT_BAR_BOUND[0]);
+	            (itemSize[1] == null || isNaN(itemSize[1])) && (itemSize[1] = DEFAULT_BAR_BOUND[1]);
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _resetRange: function () {
+	            var dataExtent = this.getExtent();
+	            var range = this.option.range;
+
+	            if (!range || range.auto) {
+	                // `range` should always be array (so we dont use other
+	                // value like 'auto') for user-friend. (consider getOption).
+	                dataExtent.auto = 1;
+	                this.option.range = dataExtent;
+	            }
+	            else if (zrUtil.isArray(range)) {
+	                if (range[0] > range[1]) {
+	                    range.reverse();
+	                }
+	                range[0] = Math.max(range[0], dataExtent[0]);
+	                range[1] = Math.min(range[1], dataExtent[1]);
+	            }
+	        },
+
+	        /**
+	         * @protected
+	         * @override
+	         */
+	        completeVisualOption: function () {
+	            VisualMapModel.prototype.completeVisualOption.apply(this, arguments);
+
+	            zrUtil.each(this.stateList, function (state) {
+	                var symbolSize = this.option.controller[state].symbolSize;
+	                if (symbolSize && symbolSize[0] !== symbolSize[1]) {
+	                    symbolSize[0] = 0; // For good looking.
+	                }
+	            }, this);
+	        },
+
+	        /**
+	         * @override
+	         */
+	        setSelected: function (selected) {
+	            this.option.range = selected.slice();
+	            this._resetRange();
+	        },
+
+	        /**
+	         * @public
+	         */
+	        getSelected: function () {
+	            var dataExtent = this.getExtent();
+
+	            var dataInterval = numberUtil.asc(
+	                (this.get('range') || []).slice()
+	            );
+
+	            // Clamp
+	            dataInterval[0] > dataExtent[1] && (dataInterval[0] = dataExtent[1]);
+	            dataInterval[1] > dataExtent[1] && (dataInterval[1] = dataExtent[1]);
+	            dataInterval[0] < dataExtent[0] && (dataInterval[0] = dataExtent[0]);
+	            dataInterval[1] < dataExtent[0] && (dataInterval[1] = dataExtent[0]);
+
+	            return dataInterval;
+	        },
+
+	        /**
+	         * @override
+	         */
+	        getValueState: function (value) {
+	            var range = this.option.range;
+	            var dataExtent = this.getExtent();
+
+	            // When range[0] === dataExtent[0], any value larger than dataExtent[0] maps to 'inRange'.
+	            // range[1] is processed likewise.
+	            return (
+	                (range[0] <= dataExtent[0] || range[0] <= value)
+	                && (range[1] >= dataExtent[1] || value <= range[1])
+	            ) ? 'inRange' : 'outOfRange';
+	        },
+
+	        /**
+	         * @params {Array.<number>} range target value: range[0] <= value && value <= range[1]
+	         * @return {Array.<Object>} [{seriesId, dataIndices: <Array.<number>>}, ...]
+	         */
+	        findTargetDataIndices: function (range) {
+	            var result = [];
+
+	            this.eachTargetSeries(function (seriesModel) {
+	                var dataIndices = [];
+	                var data = seriesModel.getData();
+
+	                data.each(this.getDataDimension(data), function (value, dataIndex) {
+	                    range[0] <= value && value <= range[1] && dataIndices.push(dataIndex);
+	                }, true, this);
+
+	                result.push({seriesId: seriesModel.id, dataIndex: dataIndices});
+	            }, this);
+
+	            return result;
+	        },
+
+	        getStops: function (seriesModel, getColorVisual) {
+	            var result = [];
+	            insertStopList(this, 'outOfRange', this.getExtent(), result);
+	            insertStopList(this, 'inRange', this.option.range.slice(), result);
+
+	            zrUtil.each(result, function (item) {
+	                item.color = getColorVisual(this, item.value, item.valueState);
+	            }, this);
+
+	            return result;
+	        }
+
+	    });
+
+	    function getColorStopValues(visualMapModel, valueState, dataExtent) {
+	        var mapping = visualMapModel.targetVisuals[valueState].color;
+
+	        if (!mapping) {
+	            return dataExtent.slice();
+	        }
+
+	        var count = mapping.option.visual.length;
+
+	        if (count <= 1 || dataExtent[0] === dataExtent[1]) {
+	            return dataExtent.slice();
+	        }
+
+	        // We only use linear mappping for color, so we can do inverse mapping:
+	        var step = (dataExtent[1] - dataExtent[0]) / (count - 1);
+	        var value = dataExtent[0];
+	        var stopValues = [];
+	        for (var i = 0; i < count && value < dataExtent[1]; i++) {
+	            stopValues.push(value);
+	            value += step;
+	        }
+	        stopValues.push(dataExtent[1]);
+
+	        return stopValues;
+	    }
+
+	    function insertStopList(visualMapModel, valueState, dataExtent, result) {
+	        var stops = getColorStopValues(visualMapModel, valueState, dataExtent);
+
+	        zrUtil.each(stops, function (val) {
+	            var stop = {value: val, valueState: valueState};
+	            var inRange = 0;
+	            for (var i = 0; i < result.length; i++) {
+	                // Format to: outOfRange -- inRange -- outOfRange.
+	                inRange |= result[i].valueState === 'inRange';
+	                if (val < result[i].value) {
+	                    result.splice(i, 0, stop);
+	                    return;
+	                }
+	                inRange && (result[i].valueState = 'inRange');
+	            }
+	            result.push(stop);
+	        });
+	    }
+
+	    module.exports = ContinuousModel;
+
+
+
+/***/ },
+/* 335 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @file Controller visual map model
+	 */
+
+
+	    var echarts = __webpack_require__(1);
+	    var zrUtil = __webpack_require__(4);
+	    var env = __webpack_require__(2);
+	    var visualDefault = __webpack_require__(336);
+	    var VisualMapping = __webpack_require__(192);
+	    var visualSolution = __webpack_require__(306);
+	    var mapVisual = VisualMapping.mapVisual;
+	    var modelUtil = __webpack_require__(5);
+	    var eachVisual = VisualMapping.eachVisual;
+	    var numberUtil = __webpack_require__(7);
+	    var isArray = zrUtil.isArray;
+	    var each = zrUtil.each;
+	    var asc = numberUtil.asc;
+	    var linearMap = numberUtil.linearMap;
+	    var noop = zrUtil.noop;
+
+	    var DEFAULT_COLOR = ['#f6efa6', '#d88273', '#bf444c'];
+
+	    var VisualMapModel = echarts.extendComponentModel({
+
+	        type: 'visualMap',
+
+	        dependencies: ['series'],
+
+	        /**
+	         * @readOnly
+	         * @type {Array.<string>}
+	         */
+	        stateList: ['inRange', 'outOfRange'],
+
+	        /**
+	         * @readOnly
+	         * @type {Array.<string>}
+	         */
+	        replacableOptionKeys: [
+	            'inRange', 'outOfRange', 'target', 'controller', 'color'
+	        ],
+
+	        /**
+	         * [lowerBound, upperBound]
+	         *
+	         * @readOnly
+	         * @type {Array.<number>}
+	         */
+	        dataBound: [-Infinity, Infinity],
+
+	        /**
+	         * @readOnly
+	         * @type {string|Object}
+	         */
+	        layoutMode: {type: 'box', ignoreSize: true},
+
+	        /**
+	         * @protected
+	         */
+	        defaultOption: {
+	            show: true,
+
+	            zlevel: 0,
+	            z: 4,
+
+	            seriesIndex: null,       // 所控制的series indices，默认所有有value的series.
+
+	                                    // set min: 0, max: 200, only for campatible with ec2.
+	                                    // In fact min max should not have default value.
+	            min: 0,                 // min value, must specified if pieces is not specified.
+	            max: 200,               // max value, must specified if pieces is not specified.
+
+	            dimension: null,
+	            inRange: null,          // 'color', 'colorHue', 'colorSaturation', 'colorLightness', 'colorAlpha',
+	                                    // 'symbol', 'symbolSize'
+	            outOfRange: null,       // 'color', 'colorHue', 'colorSaturation',
+	                                    // 'colorLightness', 'colorAlpha',
+	                                    // 'symbol', 'symbolSize'
+
+	            left: 0,                // 'center' ¦ 'left' ¦ 'right' ¦ {number} (px)
+	            right: null,            // The same as left.
+	            top: null,              // 'top' ¦ 'bottom' ¦ 'center' ¦ {number} (px)
+	            bottom: 0,              // The same as top.
+
+	            itemWidth: null,
+	            itemHeight: null,
+	            inverse: false,
+	            orient: 'vertical',        // 'horizontal' ¦ 'vertical'
+
+	            backgroundColor: 'rgba(0,0,0,0)',
+	            borderColor: '#ccc',       // 值域边框颜色
+	            contentColor: '#5793f3',
+	            inactiveColor: '#aaa',
+	            borderWidth: 0,            // 值域边框线宽，单位px，默认为0（无边框）
+	            padding: 5,                // 值域内边距，单位px，默认各方向内边距为5，
+	                                       // 接受数组分别设定上右下左边距，同css
+	            textGap: 10,               //
+	            precision: 0,              // 小数精度，默认为0，无小数点
+	            color: null,               //颜色（deprecated，兼容ec2，顺序同pieces，不同于inRange/outOfRange）
+
+	            formatter: null,
+	            text: null,                // 文本，如['高', '低']，兼容ec2，text[0]对应高值，text[1]对应低值
+	            textStyle: {
+	                color: '#333'          // 值域文字颜色
+	            }
+	        },
+
+	        /**
+	         * @protected
+	         */
+	        init: function (option, parentModel, ecModel) {
+
+	            /**
+	             * @private
+	             * @type {Array.<number>}
+	             */
+	            this._dataExtent;
+
+	            /**
+	             * @readOnly
+	             */
+	            this.targetVisuals = {};
+
+	            /**
+	             * @readOnly
+	             */
+	            this.controllerVisuals = {};
+
+	            /**
+	             * @readOnly
+	             */
+	            this.textStyleModel;
+
+	            /**
+	             * [width, height]
+	             * @readOnly
+	             * @type {Array.<number>}
+	             */
+	            this.itemSize;
+
+	            this.mergeDefaultAndTheme(option, ecModel);
+	        },
+
+	        /**
+	         * @protected
+	         */
+	        optionUpdated: function (newOption, isInit) {
+	            var thisOption = this.option;
+
+	            // FIXME
+	            // necessary?
+	            // Disable realtime view update if canvas is not supported.
+	            if (!env.canvasSupported) {
+	                thisOption.realtime = false;
+	            }
+
+	            !isInit && visualSolution.replaceVisualOption(
+	                thisOption, newOption, this.replacableOptionKeys
+	            );
+
+	            this.textStyleModel = this.getModel('textStyle');
+
+	            this.resetItemSize();
+
+	            this.completeVisualOption();
+	        },
+
+	        /**
+	         * @protected
+	         */
+	        resetVisual: function (supplementVisualOption) {
+	            var stateList = this.stateList;
+	            supplementVisualOption = zrUtil.bind(supplementVisualOption, this);
+
+	            this.controllerVisuals = visualSolution.createVisualMappings(
+	                this.option.controller, stateList, supplementVisualOption
+	            );
+	            this.targetVisuals = visualSolution.createVisualMappings(
+	                this.option.target, stateList, supplementVisualOption
+	            );
+	        },
+
+
+	        /**
+	         * @protected
+	         */
+	        resetTargetSeries: function () {
+	            var thisOption = this.option;
+	            var allSeriesIndex = thisOption.seriesIndex == null;
+	            thisOption.seriesIndex = allSeriesIndex
+	                ? [] : modelUtil.normalizeToArray(thisOption.seriesIndex);
+
+	            allSeriesIndex && this.ecModel.eachSeries(function (seriesModel, index) {
+	                thisOption.seriesIndex.push(index);
+	            });
+	        },
+
+	        /**
+	         * @public
+	         */
+	        eachTargetSeries: function (callback, context) {
+	            zrUtil.each(this.option.seriesIndex, function (seriesIndex) {
+	                callback.call(context, this.ecModel.getSeriesByIndex(seriesIndex));
+	            }, this);
+	        },
+
+	        /**
+	         * @pubilc
+	         */
+	        isTargetSeries: function (seriesModel) {
+	            var is = false;
+	            this.eachTargetSeries(function (model) {
+	                model === seriesModel && (is = true);
+	            });
+	            return is;
+	        },
+
+	        /**
+	         * @example
+	         * this.formatValueText(someVal); // format single numeric value to text.
+	         * this.formatValueText(someVal, true); // format single category value to text.
+	         * this.formatValueText([min, max]); // format numeric min-max to text.
+	         * this.formatValueText([this.dataBound[0], max]); // using data lower bound.
+	         * this.formatValueText([min, this.dataBound[1]]); // using data upper bound.
+	         *
+	         * @param {number|Array.<number>} value Real value, or this.dataBound[0 or 1].
+	         * @param {boolean} [isCategory=false] Only available when value is number.
+	         * @param {Array.<string>} edgeSymbols Open-close symbol when value is interval.
+	         * @return {string}
+	         * @protected
+	         */
+	        formatValueText: function(value, isCategory, edgeSymbols) {
+	            var option = this.option;
+	            var precision = option.precision;
+	            var dataBound = this.dataBound;
+	            var formatter = option.formatter;
+	            var isMinMax;
+	            var textValue;
+	            edgeSymbols = edgeSymbols || ['<', '>'];
+
+	            if (zrUtil.isArray(value)) {
+	                value = value.slice();
+	                isMinMax = true;
+	            }
+
+	            textValue = isCategory
+	                ? value
+	                : (isMinMax
+	                    ? [toFixed(value[0]), toFixed(value[1])]
+	                    : toFixed(value)
+	                );
+
+	            if (zrUtil.isString(formatter)) {
+	                return formatter
+	                    .replace('{value}', isMinMax ? textValue[0] : textValue)
+	                    .replace('{value2}', isMinMax ? textValue[1] : textValue);
+	            }
+	            else if (zrUtil.isFunction(formatter)) {
+	                return isMinMax
+	                    ? formatter(value[0], value[1])
+	                    : formatter(value);
+	            }
+
+	            if (isMinMax) {
+	                if (value[0] === dataBound[0]) {
+	                    return edgeSymbols[0] + ' ' + textValue[1];
+	                }
+	                else if (value[1] === dataBound[1]) {
+	                    return edgeSymbols[1] + ' ' + textValue[0];
+	                }
+	                else {
+	                    return textValue[0] + ' - ' + textValue[1];
+	                }
+	            }
+	            else { // Format single value (includes category case).
+	                return textValue;
+	            }
+
+	            function toFixed(val) {
+	                return val === dataBound[0]
+	                    ? 'min'
+	                    : val === dataBound[1]
+	                    ? 'max'
+	                    : (+val).toFixed(precision);
+	            }
+	        },
+
+	        /**
+	         * @protected
+	         */
+	        resetExtent: function () {
+	            var thisOption = this.option;
+
+	            // Can not calculate data extent by data here.
+	            // Because series and data may be modified in processing stage.
+	            // So we do not support the feature "auto min/max".
+
+	            var extent = asc([thisOption.min, thisOption.max]);
+
+	            this._dataExtent = extent;
+	        },
+
+	        /**
+	         * @public
+	         * @param {module:echarts/data/List} list
+	         * @return {string} Concrete dimention. If return null/undefined,
+	         *                  no dimension used.
+	         */
+	        getDataDimension: function (list) {
+	            var optDim = this.option.dimension;
+	            return optDim != null
+	                ? optDim : list.dimensions.length - 1;
+	        },
+
+	        /**
+	         * @public
+	         * @override
+	         */
+	        getExtent: function () {
+	            return this._dataExtent.slice();
+	        },
+
+	        /**
+	         * @protected
+	         */
+	        completeVisualOption: function () {
+	            var thisOption = this.option;
+	            var base = {inRange: thisOption.inRange, outOfRange: thisOption.outOfRange};
+
+	            var target = thisOption.target || (thisOption.target = {});
+	            var controller = thisOption.controller || (thisOption.controller = {});
+
+	            zrUtil.merge(target, base); // Do not override
+	            zrUtil.merge(controller, base); // Do not override
+
+	            var isCategory = this.isCategory();
+
+	            completeSingle.call(this, target);
+	            completeSingle.call(this, controller);
+	            completeInactive.call(this, target, 'inRange', 'outOfRange');
+	            // completeInactive.call(this, target, 'outOfRange', 'inRange');
+	            completeController.call(this, controller);
+
+	            function completeSingle(base) {
+	                // Compatible with ec2 dataRange.color.
+	                // The mapping order of dataRange.color is: [high value, ..., low value]
+	                // whereas inRange.color and outOfRange.color is [low value, ..., high value]
+	                // Notice: ec2 has no inverse.
+	                if (isArray(thisOption.color)
+	                    // If there has been inRange: {symbol: ...}, adding color is a mistake.
+	                    // So adding color only when no inRange defined.
+	                    && !base.inRange
+	                ) {
+	                    base.inRange = {color: thisOption.color.slice().reverse()};
+	                }
+
+	                // Compatible with previous logic, always give a defautl color, otherwise
+	                // simple config with no inRange and outOfRange will not work.
+	                // Originally we use visualMap.color as the default color, but setOption at
+	                // the second time the default color will be erased. So we change to use
+	                // constant DEFAULT_COLOR.
+	                // If user do not want the defualt color, set inRange: {color: null}.
+	                base.inRange = base.inRange || {color: DEFAULT_COLOR};
+
+	                // If using shortcut like: {inRange: 'symbol'}, complete default value.
+	                each(this.stateList, function (state) {
+	                    var visualType = base[state];
+
+	                    if (zrUtil.isString(visualType)) {
+	                        var defa = visualDefault.get(visualType, 'active', isCategory);
+	                        if (defa) {
+	                            base[state] = {};
+	                            base[state][visualType] = defa;
+	                        }
+	                        else {
+	                            // Mark as not specified.
+	                            delete base[state];
+	                        }
+	                    }
+	                }, this);
+	            }
+
+	            function completeInactive(base, stateExist, stateAbsent) {
+	                var optExist = base[stateExist];
+	                var optAbsent = base[stateAbsent];
+
+	                if (optExist && !optAbsent) {
+	                    optAbsent = base[stateAbsent] = {};
+	                    each(optExist, function (visualData, visualType) {
+	                        if (!VisualMapping.isValidType(visualType)) {
+	                            return;
+	                        }
+
+	                        var defa = visualDefault.get(visualType, 'inactive', isCategory);
+
+	                        if (defa != null) {
+	                            optAbsent[visualType] = defa;
+
+	                            // Compatibable with ec2:
+	                            // Only inactive color to rgba(0,0,0,0) can not
+	                            // make label transparent, so use opacity also.
+	                            if (visualType === 'color'
+	                                && !optAbsent.hasOwnProperty('opacity')
+	                                && !optAbsent.hasOwnProperty('colorAlpha')
+	                            ) {
+	                                optAbsent.opacity = [0, 0];
+	                            }
+	                        }
+	                    });
+	                }
+	            }
+
+	            function completeController(controller) {
+	                var symbolExists = (controller.inRange || {}).symbol
+	                    || (controller.outOfRange || {}).symbol;
+	                var symbolSizeExists = (controller.inRange || {}).symbolSize
+	                    || (controller.outOfRange || {}).symbolSize;
+	                var inactiveColor = this.get('inactiveColor');
+
+	                each(this.stateList, function (state) {
+
+	                    var itemSize = this.itemSize;
+	                    var visuals = controller[state];
+
+	                    // Set inactive color for controller if no other color
+	                    // attr (like colorAlpha) specified.
+	                    if (!visuals) {
+	                        visuals = controller[state] = {
+	                            color: isCategory ? inactiveColor : [inactiveColor]
+	                        };
+	                    }
+
+	                    // Consistent symbol and symbolSize if not specified.
+	                    if (visuals.symbol == null) {
+	                        visuals.symbol = symbolExists
+	                            && zrUtil.clone(symbolExists)
+	                            || (isCategory ? 'roundRect' : ['roundRect']);
+	                    }
+	                    if (visuals.symbolSize == null) {
+	                        visuals.symbolSize = symbolSizeExists
+	                            && zrUtil.clone(symbolSizeExists)
+	                            || (isCategory ? itemSize[0] : [itemSize[0], itemSize[0]]);
+	                    }
+
+	                    // Filter square and none.
+	                    visuals.symbol = mapVisual(visuals.symbol, function (symbol) {
+	                        return (symbol === 'none' || symbol === 'square') ? 'roundRect' : symbol;
+	                    });
+
+	                    // Normalize symbolSize
+	                    var symbolSize = visuals.symbolSize;
+
+	                    if (symbolSize != null) {
+	                        var max = -Infinity;
+	                        // symbolSize can be object when categories defined.
+	                        eachVisual(symbolSize, function (value) {
+	                            value > max && (max = value);
+	                        });
+	                        visuals.symbolSize = mapVisual(symbolSize, function (value) {
+	                            return linearMap(value, [0, max], [0, itemSize[0]], true);
+	                        });
+	                    }
+
+	                }, this);
+	            }
+	        },
+
+	        /**
+	         * @protected
+	         */
+	        resetItemSize: function () {
+	            this.itemSize = [
+	                parseFloat(this.get('itemWidth')),
+	                parseFloat(this.get('itemHeight'))
+	            ];
+	        },
+
+	        /**
+	         * @public
+	         */
+	        isCategory: function () {
+	            return !!this.option.categories;
+	        },
+
+	        /**
+	         * @public
+	         * @abstract
+	         */
+	        setSelected: noop,
+
+	        /**
+	         * @public
+	         * @abstract
+	         * @param {*|module:echarts/data/List} valueOrData
+	         * @param {number} dataIndex
+	         * @return {string} state See this.stateList
+	         */
+	        getValueState: noop
+
+	    });
+
+	    module.exports = VisualMapModel;
+
+
+
+/***/ },
+/* 336 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @file Visual mapping.
+	 */
+
+
+	    var zrUtil = __webpack_require__(4);
+
+	    var visualDefault = {
+
+	        /**
+	         * @public
+	         */
+	        get: function (visualType, key, isCategory) {
+	            var value = zrUtil.clone(
+	                (defaultOption[visualType] || {})[key]
+	            );
+
+	            return isCategory
+	                ? (zrUtil.isArray(value) ? value[value.length - 1] : value)
+	                : value;
+	        }
+
+	    };
+
+	    var defaultOption = {
+
+	        color: {
+	            active: ['#006edd', '#e0ffff'],
+	            inactive: ['rgba(0,0,0,0)']
+	        },
+
+	        colorHue: {
+	            active: [0, 360],
+	            inactive: [0, 0]
+	        },
+
+	        colorSaturation: {
+	            active: [0.3, 1],
+	            inactive: [0, 0]
+	        },
+
+	        colorLightness: {
+	            active: [0.9, 0.5],
+	            inactive: [0, 0]
+	        },
+
+	        colorAlpha: {
+	            active: [0.3, 1],
+	            inactive: [0, 0]
+	        },
+
+	        opacity: {
+	            active: [0.3, 1],
+	            inactive: [0, 0]
+	        },
+
+	        symbol: {
+	            active: ['circle', 'roundRect', 'diamond'],
+	            inactive: ['none']
+	        },
+
+	        symbolSize: {
+	            active: [10, 50],
+	            inactive: [0, 0]
+	        }
+	    };
+
+	    module.exports = visualDefault;
+
+
+
+
+/***/ },
+/* 337 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var VisualMapView = __webpack_require__(338);
+	    var graphic = __webpack_require__(43);
+	    var zrUtil = __webpack_require__(4);
+	    var numberUtil = __webpack_require__(7);
+	    var sliderMove = __webpack_require__(323);
+	    var LinearGradient = __webpack_require__(79);
+	    var helper = __webpack_require__(339);
+	    var modelUtil = __webpack_require__(5);
+
+	    var linearMap = numberUtil.linearMap;
+	    var each = zrUtil.each;
+	    var mathMin = Math.min;
+	    var mathMax = Math.max;
+
+	    // Arbitrary value
+	    var HOVER_LINK_SIZE = 12;
+	    var HOVER_LINK_OUT = 6;
+
+	    // Notice:
+	    // Any "interval" should be by the order of [low, high].
+	    // "handle0" (handleIndex === 0) maps to
+	    // low data value: this._dataInterval[0] and has low coord.
+	    // "handle1" (handleIndex === 1) maps to
+	    // high data value: this._dataInterval[1] and has high coord.
+	    // The logic of transform is implemented in this._createBarGroup.
+
+	    var ContinuousView = VisualMapView.extend({
+
+	        type: 'visualMap.continuous',
+
+	        /**
+	         * @override
+	         */
+	        init: function () {
+
+	            ContinuousView.superApply(this, 'init', arguments);
+
+	            /**
+	             * @private
+	             */
+	            this._shapes = {};
+
+	            /**
+	             * @private
+	             */
+	            this._dataInterval = [];
+
+	            /**
+	             * @private
+	             */
+	            this._handleEnds = [];
+
+	            /**
+	             * @private
+	             */
+	            this._orient;
+
+	            /**
+	             * @private
+	             */
+	            this._useHandle;
+
+	            /**
+	             * @private
+	             */
+	            this._hoverLinkDataIndices = [];
+
+	            /**
+	             * @private
+	             */
+	            this._dragging;
+
+	            /**
+	             * @private
+	             */
+	            this._hovering;
+	        },
+
+	        /**
+	         * @protected
+	         * @override
+	         */
+	        doRender: function (visualMapModel, ecModel, api, payload) {
+	            if (!payload || payload.type !== 'selectDataRange' || payload.from !== this.uid) {
+	                this._buildView();
+	            }
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _buildView: function () {
+	            this.group.removeAll();
+
+	            var visualMapModel = this.visualMapModel;
+	            var thisGroup = this.group;
+
+	            this._orient = visualMapModel.get('orient');
+	            this._useHandle = visualMapModel.get('calculable');
+
+	            this._resetInterval();
+
+	            this._renderBar(thisGroup);
+
+	            var dataRangeText = visualMapModel.get('text');
+	            this._renderEndsText(thisGroup, dataRangeText, 0);
+	            this._renderEndsText(thisGroup, dataRangeText, 1);
+
+	            // Do this for background size calculation.
+	            this._updateView(true);
+
+	            // After updating view, inner shapes is built completely,
+	            // and then background can be rendered.
+	            this.renderBackground(thisGroup);
+
+	            // Real update view
+	            this._updateView();
+
+	            this._enableHoverLinkToSeries();
+	            this._enableHoverLinkFromSeries();
+
+	            this.positionGroup(thisGroup);
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _renderEndsText: function (group, dataRangeText, endsIndex) {
+	            if (!dataRangeText) {
+	                return;
+	            }
+
+	            // Compatible with ec2, text[0] map to high value, text[1] map low value.
+	            var text = dataRangeText[1 - endsIndex];
+	            text = text != null ? text + '' : '';
+
+	            var visualMapModel = this.visualMapModel;
+	            var textGap = visualMapModel.get('textGap');
+	            var itemSize = visualMapModel.itemSize;
+
+	            var barGroup = this._shapes.barGroup;
+	            var position = this._applyTransform(
+	                [
+	                    itemSize[0] / 2,
+	                    endsIndex === 0 ? -textGap : itemSize[1] + textGap
+	                ],
+	                barGroup
+	            );
+	            var align = this._applyTransform(
+	                endsIndex === 0 ? 'bottom' : 'top',
+	                barGroup
+	            );
+	            var orient = this._orient;
+	            var textStyleModel = this.visualMapModel.textStyleModel;
+
+	            this.group.add(new graphic.Text({
+	                style: {
+	                    x: position[0],
+	                    y: position[1],
+	                    textVerticalAlign: orient === 'horizontal' ? 'middle' : align,
+	                    textAlign: orient === 'horizontal' ? align : 'center',
+	                    text: text,
+	                    textFont: textStyleModel.getFont(),
+	                    fill: textStyleModel.getTextColor()
+	                }
+	            }));
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _renderBar: function (targetGroup) {
+	            var visualMapModel = this.visualMapModel;
+	            var shapes = this._shapes;
+	            var itemSize = visualMapModel.itemSize;
+	            var orient = this._orient;
+	            var useHandle = this._useHandle;
+	            var itemAlign = helper.getItemAlign(visualMapModel, this.api, itemSize);
+	            var barGroup = shapes.barGroup = this._createBarGroup(itemAlign);
+
+	            // Bar
+	            barGroup.add(shapes.outOfRange = createPolygon());
+	            barGroup.add(shapes.inRange = createPolygon(
+	                null,
+	                useHandle ? 'move' : null,
+	                zrUtil.bind(this._dragHandle, this, 'all', false),
+	                zrUtil.bind(this._dragHandle, this, 'all', true)
+	            ));
+
+	            var textRect = visualMapModel.textStyleModel.getTextRect('国');
+	            var textSize = mathMax(textRect.width, textRect.height);
+
+	            // Handle
+	            if (useHandle) {
+	                shapes.handleThumbs = [];
+	                shapes.handleLabels = [];
+	                shapes.handleLabelPoints = [];
+
+	                this._createHandle(barGroup, 0, itemSize, textSize, orient, itemAlign);
+	                this._createHandle(barGroup, 1, itemSize, textSize, orient, itemAlign);
+	            }
+
+	            this._createIndicator(barGroup, itemSize, textSize, orient);
+
+	            targetGroup.add(barGroup);
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _createHandle: function (barGroup, handleIndex, itemSize, textSize, orient) {
+	            var onDrift = zrUtil.bind(this._dragHandle, this, handleIndex, false);
+	            var onDragEnd = zrUtil.bind(this._dragHandle, this, handleIndex, true);
+	            var handleThumb = createPolygon(
+	                createHandlePoints(handleIndex, textSize),
+	                'move',
+	                onDrift,
+	                onDragEnd
+	            );
+	            handleThumb.position[0] = itemSize[0];
+	            barGroup.add(handleThumb);
+
+	            // Text is always horizontal layout but should not be effected by
+	            // transform (orient/inverse). So label is built separately but not
+	            // use zrender/graphic/helper/RectText, and is located based on view
+	            // group (according to handleLabelPoint) but not barGroup.
+	            var textStyleModel = this.visualMapModel.textStyleModel;
+	            var handleLabel = new graphic.Text({
+	                draggable: true,
+	                drift: onDrift,
+	                ondragend: onDragEnd,
+	                style: {
+	                    x: 0, y: 0, text: '',
+	                    textFont: textStyleModel.getFont(),
+	                    fill: textStyleModel.getTextColor()
+	                }
+	            });
+	            this.group.add(handleLabel);
+
+	            var handleLabelPoint = [
+	                orient === 'horizontal'
+	                    ? textSize / 2
+	                    : textSize * 1.5,
+	                orient === 'horizontal'
+	                    ? (handleIndex === 0 ? -(textSize * 1.5) : (textSize * 1.5))
+	                    : (handleIndex === 0 ? -textSize / 2 : textSize / 2)
+	            ];
+
+	            var shapes = this._shapes;
+	            shapes.handleThumbs[handleIndex] = handleThumb;
+	            shapes.handleLabelPoints[handleIndex] = handleLabelPoint;
+	            shapes.handleLabels[handleIndex] = handleLabel;
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _createIndicator: function (barGroup, itemSize, textSize, orient) {
+	            var indicator = createPolygon([[0, 0]], 'move');
+	            indicator.position[0] = itemSize[0];
+	            indicator.attr({invisible: true, silent: true});
+	            barGroup.add(indicator);
+
+	            var textStyleModel = this.visualMapModel.textStyleModel;
+	            var indicatorLabel = new graphic.Text({
+	                silent: true,
+	                invisible: true,
+	                style: {
+	                    x: 0, y: 0, text: '',
+	                    textFont: textStyleModel.getFont(),
+	                    fill: textStyleModel.getTextColor()
+	                }
+	            });
+	            this.group.add(indicatorLabel);
+
+	            var indicatorLabelPoint = [
+	                orient === 'horizontal' ? textSize / 2 : HOVER_LINK_OUT + 3,
+	                0
+	            ];
+
+	            var shapes = this._shapes;
+	            shapes.indicator = indicator;
+	            shapes.indicatorLabel = indicatorLabel;
+	            shapes.indicatorLabelPoint = indicatorLabelPoint;
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _dragHandle: function (handleIndex, isEnd, dx, dy) {
+	            if (!this._useHandle) {
+	                return;
+	            }
+
+	            this._dragging = !isEnd;
+
+	            if (!isEnd) {
+	                // Transform dx, dy to bar coordination.
+	                var vertex = this._applyTransform([dx, dy], this._shapes.barGroup, true);
+	                this._updateInterval(handleIndex, vertex[1]);
+
+	                // Considering realtime, update view should be executed
+	                // before dispatch action.
+	                this._updateView();
+	            }
+
+	            // dragEnd do not dispatch action when realtime.
+	            if (isEnd === !this.visualMapModel.get('realtime')) { // jshint ignore:line
+	                this.api.dispatchAction({
+	                    type: 'selectDataRange',
+	                    from: this.uid,
+	                    visualMapId: this.visualMapModel.id,
+	                    selected: this._dataInterval.slice()
+	                });
+	            }
+
+	            if (isEnd) {
+	                !this._hovering && this._clearHoverLinkToSeries();
+	            }
+	            else if (useHoverLinkOnHandle(this.visualMapModel)) {
+	                this._doHoverLinkToSeries(this._handleEnds[handleIndex], false);
+	            }
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _resetInterval: function () {
+	            var visualMapModel = this.visualMapModel;
+
+	            var dataInterval = this._dataInterval = visualMapModel.getSelected();
+	            var dataExtent = visualMapModel.getExtent();
+	            var sizeExtent = [0, visualMapModel.itemSize[1]];
+
+	            this._handleEnds = [
+	                linearMap(dataInterval[0], dataExtent, sizeExtent, true),
+	                linearMap(dataInterval[1], dataExtent, sizeExtent, true)
+	            ];
+	        },
+
+	        /**
+	         * @private
+	         * @param {(number|string)} handleIndex 0 or 1 or 'all'
+	         * @param {number} dx
+	         * @param {number} dy
+	         */
+	        _updateInterval: function (handleIndex, delta) {
+	            delta = delta || 0;
+	            var visualMapModel = this.visualMapModel;
+	            var handleEnds = this._handleEnds;
+
+	            sliderMove(
+	                delta,
+	                handleEnds,
+	                [0, visualMapModel.itemSize[1]],
+	                handleIndex === 'all' ? 'rigid' : 'push',
+	                handleIndex
+	            );
+	            var dataExtent = visualMapModel.getExtent();
+	            var sizeExtent = [0, visualMapModel.itemSize[1]];
+	            // Update data interval.
+	            this._dataInterval = [
+	                linearMap(handleEnds[0], sizeExtent, dataExtent, true),
+	                linearMap(handleEnds[1], sizeExtent, dataExtent, true)
+	            ];
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _updateView: function (forSketch) {
+	            var visualMapModel = this.visualMapModel;
+	            var dataExtent = visualMapModel.getExtent();
+	            var shapes = this._shapes;
+
+	            var outOfRangeHandleEnds = [0, visualMapModel.itemSize[1]];
+	            var inRangeHandleEnds = forSketch ? outOfRangeHandleEnds : this._handleEnds;
+
+	            var visualInRange = this._createBarVisual(
+	                this._dataInterval, dataExtent, inRangeHandleEnds, 'inRange'
+	            );
+	            var visualOutOfRange = this._createBarVisual(
+	                dataExtent, dataExtent, outOfRangeHandleEnds, 'outOfRange'
+	            );
+
+	            shapes.inRange
+	                .setStyle({
+	                    fill: visualInRange.barColor,
+	                    opacity: visualInRange.opacity
+	                })
+	                .setShape('points', visualInRange.barPoints);
+	            shapes.outOfRange
+	                .setStyle({
+	                    fill: visualOutOfRange.barColor,
+	                    opacity: visualOutOfRange.opacity
+	                })
+	                .setShape('points', visualOutOfRange.barPoints);
+
+	            this._updateHandle(inRangeHandleEnds, visualInRange);
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _createBarVisual: function (dataInterval, dataExtent, handleEnds, forceState) {
+	            var opts = {
+	                forceState: forceState,
+	                convertOpacityToAlpha: true
+	            };
+	            var colorStops = this._makeColorGradient(dataInterval, opts);
+
+	            var symbolSizes = [
+	                this.getControllerVisual(dataInterval[0], 'symbolSize', opts),
+	                this.getControllerVisual(dataInterval[1], 'symbolSize', opts)
+	            ];
+	            var barPoints = this._createBarPoints(handleEnds, symbolSizes);
+
+	            return {
+	                barColor: new LinearGradient(0, 0, 1, 1, colorStops),
+	                barPoints: barPoints,
+	                handlesColor: [
+	                    colorStops[0].color,
+	                    colorStops[colorStops.length - 1].color
+	                ]
+	            };
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _makeColorGradient: function (dataInterval, opts) {
+	            // Considering colorHue, which is not linear, so we have to sample
+	            // to calculate gradient color stops, but not only caculate head
+	            // and tail.
+	            var sampleNumber = 100; // Arbitrary value.
+	            var colorStops = [];
+	            var step = (dataInterval[1] - dataInterval[0]) / sampleNumber;
+
+	            colorStops.push({
+	                color: this.getControllerVisual(dataInterval[0], 'color', opts),
+	                offset: 0
+	            });
+
+	            for (var i = 1; i < sampleNumber; i++) {
+	                var currValue = dataInterval[0] + step * i;
+	                if (currValue > dataInterval[1]) {
+	                    break;
+	                }
+	                colorStops.push({
+	                    color: this.getControllerVisual(currValue, 'color', opts),
+	                    offset: i / sampleNumber
+	                });
+	            }
+
+	            colorStops.push({
+	                color: this.getControllerVisual(dataInterval[1], 'color', opts),
+	                offset: 1
+	            });
+
+	            return colorStops;
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _createBarPoints: function (handleEnds, symbolSizes) {
+	            var itemSize = this.visualMapModel.itemSize;
+
+	            return [
+	                [itemSize[0] - symbolSizes[0], handleEnds[0]],
+	                [itemSize[0], handleEnds[0]],
+	                [itemSize[0], handleEnds[1]],
+	                [itemSize[0] - symbolSizes[1], handleEnds[1]]
+	            ];
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _createBarGroup: function (itemAlign) {
+	            var orient = this._orient;
+	            var inverse = this.visualMapModel.get('inverse');
+
+	            return new graphic.Group(
+	                (orient === 'horizontal' && !inverse)
+	                ? {scale: itemAlign === 'bottom' ? [1, 1] : [-1, 1], rotation: Math.PI / 2}
+	                : (orient === 'horizontal' && inverse)
+	                ? {scale: itemAlign === 'bottom' ? [-1, 1] : [1, 1], rotation: -Math.PI / 2}
+	                : (orient === 'vertical' && !inverse)
+	                ? {scale: itemAlign === 'left' ? [1, -1] : [-1, -1]}
+	                : {scale: itemAlign === 'left' ? [1, 1] : [-1, 1]}
+	            );
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _updateHandle: function (handleEnds, visualInRange) {
+	            if (!this._useHandle) {
+	                return;
+	            }
+
+	            var shapes = this._shapes;
+	            var visualMapModel = this.visualMapModel;
+	            var handleThumbs = shapes.handleThumbs;
+	            var handleLabels = shapes.handleLabels;
+
+	            each([0, 1], function (handleIndex) {
+	                var handleThumb = handleThumbs[handleIndex];
+	                handleThumb.setStyle('fill', visualInRange.handlesColor[handleIndex]);
+	                handleThumb.position[1] = handleEnds[handleIndex];
+
+	                // Update handle label position.
+	                var textPoint = graphic.applyTransform(
+	                    shapes.handleLabelPoints[handleIndex],
+	                    graphic.getTransform(handleThumb, this.group)
+	                );
+	                handleLabels[handleIndex].setStyle({
+	                    x: textPoint[0],
+	                    y: textPoint[1],
+	                    text: visualMapModel.formatValueText(this._dataInterval[handleIndex]),
+	                    textVerticalAlign: 'middle',
+	                    textAlign: this._applyTransform(
+	                        this._orient === 'horizontal'
+	                            ? (handleIndex === 0 ? 'bottom' : 'top')
+	                            : 'left',
+	                        shapes.barGroup
+	                    )
+	                });
+	            }, this);
+	        },
+
+	        /**
+	         * @private
+	         * @param {number} cursorValue
+	         * @param {number} textValue
+	         * @param {string} [rangeSymbol]
+	         * @param {number} [halfHoverLinkSize]
+	         */
+	        _showIndicator: function (cursorValue, textValue, rangeSymbol, halfHoverLinkSize) {
+	            var visualMapModel = this.visualMapModel;
+	            var dataExtent = visualMapModel.getExtent();
+	            var itemSize = visualMapModel.itemSize;
+	            var sizeExtent = [0, itemSize[1]];
+	            var pos = linearMap(cursorValue, dataExtent, sizeExtent, true);
+
+	            var shapes = this._shapes;
+	            var indicator = shapes.indicator;
+	            if (!indicator) {
+	                return;
+	            }
+
+	            indicator.position[1] = pos;
+	            indicator.attr('invisible', false);
+	            indicator.setShape('points', createIndicatorPoints(
+	                !!rangeSymbol, halfHoverLinkSize, pos, itemSize[1]
+	            ));
+
+	            var opts = {convertOpacityToAlpha: true};
+	            var color = this.getControllerVisual(cursorValue, 'color', opts);
+	            indicator.setStyle('fill', color);
+
+	            // Update handle label position.
+	            var textPoint = graphic.applyTransform(
+	                shapes.indicatorLabelPoint,
+	                graphic.getTransform(indicator, this.group)
+	            );
+
+	            var indicatorLabel = shapes.indicatorLabel;
+	            indicatorLabel.attr('invisible', false);
+	            var align = this._applyTransform('left', shapes.barGroup);
+	            var orient = this._orient;
+	            indicatorLabel.setStyle({
+	                text: (rangeSymbol ? rangeSymbol : '') + visualMapModel.formatValueText(textValue),
+	                textVerticalAlign: orient === 'horizontal' ? align : 'middle',
+	                textAlign: orient === 'horizontal' ? 'center' : align,
+	                x: textPoint[0],
+	                y: textPoint[1]
+	            });
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _enableHoverLinkToSeries: function () {
+	            var self = this;
+	            this._shapes.barGroup
+
+	                .on('mousemove', function (e) {
+	                    self._hovering = true;
+
+	                    if (!self._dragging) {
+	                        var itemSize = self.visualMapModel.itemSize;
+	                        var pos = self._applyTransform(
+	                            [e.offsetX, e.offsetY], self._shapes.barGroup, true, true
+	                        );
+	                        // For hover link show when hover handle, which might be
+	                        // below or upper than sizeExtent.
+	                        pos[1] = mathMin(mathMax(0, pos[1]), itemSize[1]);
+
+	                        self._doHoverLinkToSeries(
+	                            pos[1],
+	                            0 <= pos[0] && pos[0] <= itemSize[0]
+	                        );
+	                    }
+	                })
+
+	                .on('mouseout', function () {
+	                    // When mouse is out of handle, hoverLink still need
+	                    // to be displayed when realtime is set as false.
+	                    self._hovering = false;
+	                    !self._dragging && self._clearHoverLinkToSeries();
+	                });
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _enableHoverLinkFromSeries: function () {
+	            var zr = this.api.getZr();
+
+	            if (this.visualMapModel.option.hoverLink) {
+	                zr.on('mouseover', this._hoverLinkFromSeriesMouseOver, this);
+	                zr.on('mouseout', this._hideIndicator, this);
+	            }
+	            else {
+	                this._clearHoverLinkFromSeries();
+	            }
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _doHoverLinkToSeries: function (cursorPos, hoverOnBar) {
+	            var visualMapModel = this.visualMapModel;
+	            var itemSize = visualMapModel.itemSize;
+
+	            if (!visualMapModel.option.hoverLink) {
+	                return;
+	            }
+
+	            var sizeExtent = [0, itemSize[1]];
+	            var dataExtent = visualMapModel.getExtent();
+
+	            // For hover link show when hover handle, which might be below or upper than sizeExtent.
+	            cursorPos = mathMin(mathMax(sizeExtent[0], cursorPos), sizeExtent[1]);
+
+	            var halfHoverLinkSize = getHalfHoverLinkSize(visualMapModel, dataExtent, sizeExtent);
+	            var hoverRange = [cursorPos - halfHoverLinkSize, cursorPos + halfHoverLinkSize];
+	            var cursorValue = linearMap(cursorPos, sizeExtent, dataExtent, true);
+	            var valueRange = [
+	                linearMap(hoverRange[0], sizeExtent, dataExtent, true),
+	                linearMap(hoverRange[1], sizeExtent, dataExtent, true)
+	            ];
+	            // Consider data range is out of visualMap range, see test/visualMap-continuous.html,
+	            // where china and india has very large population.
+	            hoverRange[0] < sizeExtent[0] && (valueRange[0] = -Infinity);
+	            hoverRange[1] > sizeExtent[1] && (valueRange[1] = Infinity);
+
+	            // Do not show indicator when mouse is over handle,
+	            // otherwise labels overlap, especially when dragging.
+	            if (hoverOnBar) {
+	                if (valueRange[0] === -Infinity) {
+	                    this._showIndicator(cursorValue, valueRange[1], '< ', halfHoverLinkSize);
+	                }
+	                else if (valueRange[1] === Infinity) {
+	                    this._showIndicator(cursorValue, valueRange[0], '> ', halfHoverLinkSize);
+	                }
+	                else {
+	                    this._showIndicator(cursorValue, cursorValue, '≈ ', halfHoverLinkSize);
+	                }
+	            }
+
+	            // When realtime is set as false, handles, which are in barGroup,
+	            // also trigger hoverLink, which help user to realize where they
+	            // focus on when dragging. (see test/heatmap-large.html)
+	            // When realtime is set as true, highlight will not show when hover
+	            // handle, because the label on handle, which displays a exact value
+	            // but not range, might mislead users.
+	            var oldBatch = this._hoverLinkDataIndices;
+	            var newBatch = [];
+	            if (hoverOnBar || useHoverLinkOnHandle(visualMapModel)) {
+	                newBatch = this._hoverLinkDataIndices = visualMapModel.findTargetDataIndices(valueRange);
+	            }
+
+	            var resultBatches = modelUtil.compressBatches(oldBatch, newBatch);
+	            this._dispatchHighDown('downplay', resultBatches[0]);
+	            this._dispatchHighDown('highlight', resultBatches[1]);
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _hoverLinkFromSeriesMouseOver: function (e) {
+	            var el = e.target;
+
+	            if (!el || el.dataIndex == null) {
+	                return;
+	            }
+
+	            var dataModel = el.dataModel || this.ecModel.getSeriesByIndex(el.seriesIndex);
+	            var data = dataModel.getData(el.dataType);
+	            var dim = data.getDimension(this.visualMapModel.getDataDimension(data));
+	            var value = data.get(dim, el.dataIndex, true);
+
+	            if (!isNaN(value)) {
+	                this._showIndicator(value, value);
+	            }
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _hideIndicator: function () {
+	            var shapes = this._shapes;
+	            shapes.indicator && shapes.indicator.attr('invisible', true);
+	            shapes.indicatorLabel && shapes.indicatorLabel.attr('invisible', true);
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _clearHoverLinkToSeries: function () {
+	            this._hideIndicator();
+
+	            var indices = this._hoverLinkDataIndices;
+
+	            this._dispatchHighDown('downplay', indices);
+
+	            indices.length = 0;
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _clearHoverLinkFromSeries: function () {
+	            this._hideIndicator();
+
+	            var zr = this.api.getZr();
+	            zr.off('mouseover', this._hoverLinkFromSeriesMouseOver);
+	            zr.off('mouseout', this._hideIndicator);
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _applyTransform: function (vertex, element, inverse, global) {
+	            var transform = graphic.getTransform(element, global ? null : this.group);
+
+	            return graphic[
+	                zrUtil.isArray(vertex) ? 'applyTransform' : 'transformDirection'
+	            ](vertex, transform, inverse);
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _dispatchHighDown: function (type, batch) {
+	            batch && batch.length && this.api.dispatchAction({
+	                type: type,
+	                batch: batch
+	            });
+	        },
+
+	        /**
+	         * @override
+	         */
+	        dispose: function () {
+	            this._clearHoverLinkFromSeries();
+	            this._clearHoverLinkToSeries();
+	        },
+
+	        /**
+	         * @override
+	         */
+	        remove: function () {
+	            this._clearHoverLinkFromSeries();
+	            this._clearHoverLinkToSeries();
+	        }
+
+	    });
+
+	    function createPolygon(points, cursor, onDrift, onDragEnd) {
+	        return new graphic.Polygon({
+	            shape: {points: points},
+	            draggable: !!onDrift,
+	            cursor: cursor,
+	            drift: onDrift,
+	            ondragend: onDragEnd
+	        });
+	    }
+
+	    function createHandlePoints(handleIndex, textSize) {
+	        return handleIndex === 0
+	            ? [[0, 0], [textSize, 0], [textSize, -textSize]]
+	            : [[0, 0], [textSize, 0], [textSize, textSize]];
+	    }
+
+	    function createIndicatorPoints(isRange, halfHoverLinkSize, pos, extentMax) {
+	        return isRange
+	            ? [ // indicate range
+	                [0, -mathMin(halfHoverLinkSize, mathMax(pos, 0))],
+	                [HOVER_LINK_OUT, 0],
+	                [0, mathMin(halfHoverLinkSize, mathMax(extentMax - pos, 0))]
+	            ]
+	            : [ // indicate single value
+	                [0, 0], [5, -5], [5, 5]
+	            ];
+	    }
+
+	    function getHalfHoverLinkSize(visualMapModel, dataExtent, sizeExtent) {
+	        var halfHoverLinkSize = HOVER_LINK_SIZE / 2;
+	        var hoverLinkDataSize = visualMapModel.get('hoverLinkDataSize');
+	        if (hoverLinkDataSize) {
+	            halfHoverLinkSize = linearMap(hoverLinkDataSize, dataExtent, sizeExtent, true) / 2;
+	        }
+	        return halfHoverLinkSize;
+	    }
+
+	    function useHoverLinkOnHandle(visualMapModel) {
+	        return !visualMapModel.get('realtime') && visualMapModel.get('hoverLinkOnHandle');
+	    }
+
+	    module.exports = ContinuousView;
+
+
+
+/***/ },
+/* 338 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+	    var graphic = __webpack_require__(43);
+	    var formatUtil = __webpack_require__(6);
+	    var layout = __webpack_require__(21);
+	    var echarts = __webpack_require__(1);
+	    var VisualMapping = __webpack_require__(192);
+
+	    module.exports = echarts.extendComponentView({
+
+	        type: 'visualMap',
+
+	        /**
+	         * @readOnly
+	         * @type {Object}
+	         */
+	        autoPositionValues: {left: 1, right: 1, top: 1, bottom: 1},
+
+	        init: function (ecModel, api) {
+	            /**
+	             * @readOnly
+	             * @type {module:echarts/model/Global}
+	             */
+	            this.ecModel = ecModel;
+
+	            /**
+	             * @readOnly
+	             * @type {module:echarts/ExtensionAPI}
+	             */
+	            this.api = api;
+
+	            /**
+	             * @readOnly
+	             * @type {module:echarts/component/visualMap/visualMapModel}
+	             */
+	            this.visualMapModel;
+	        },
+
+	        /**
+	         * @protected
+	         */
+	        render: function (visualMapModel, ecModel, api, payload) {
+	            this.visualMapModel = visualMapModel;
+
+	            if (visualMapModel.get('show') === false) {
+	                this.group.removeAll();
+	                return;
+	            }
+
+	            this.doRender.apply(this, arguments);
+	        },
+
+	        /**
+	         * @protected
+	         */
+	        renderBackground: function (group) {
+	            var visualMapModel = this.visualMapModel;
+	            var padding = formatUtil.normalizeCssArray(visualMapModel.get('padding') || 0);
+	            var rect = group.getBoundingRect();
+
+	            group.add(new graphic.Rect({
+	                z2: -1, // Lay background rect on the lowest layer.
+	                silent: true,
+	                shape: {
+	                    x: rect.x - padding[3],
+	                    y: rect.y - padding[0],
+	                    width: rect.width + padding[3] + padding[1],
+	                    height: rect.height + padding[0] + padding[2]
+	                },
+	                style: {
+	                    fill: visualMapModel.get('backgroundColor'),
+	                    stroke: visualMapModel.get('borderColor'),
+	                    lineWidth: visualMapModel.get('borderWidth')
+	                }
+	            }));
+	        },
+
+	        /**
+	         * @protected
+	         * @param {number} targetValue
+	         * @param {string=} visualCluster Only can be 'color' 'opacity' 'symbol' 'symbolSize'
+	         * @param {Object} [opts]
+	         * @param {string=} [opts.forceState] Specify state, instead of using getValueState method.
+	         * @param {string=} [opts.convertOpacityToAlpha=false] For color gradient in controller widget.
+	         * @return {*} Visual value.
+	         */
+	        getControllerVisual: function (targetValue, visualCluster, opts) {
+	            opts = opts || {};
+
+	            var forceState = opts.forceState;
+	            var visualMapModel = this.visualMapModel;
+	            var visualObj = {};
+
+	            // Default values.
+	            if (visualCluster === 'symbol') {
+	                visualObj.symbol = visualMapModel.get('itemSymbol');
+	            }
+	            if (visualCluster === 'color') {
+	                var defaultColor = visualMapModel.get('contentColor');
+	                visualObj.color = defaultColor;
+	            }
+
+	            function getter(key) {
+	                return visualObj[key];
+	            }
+
+	            function setter(key, value) {
+	                visualObj[key] = value;
+	            }
+
+	            var mappings = visualMapModel.controllerVisuals[
+	                forceState || visualMapModel.getValueState(targetValue)
+	            ];
+	            var visualTypes = VisualMapping.prepareVisualTypes(mappings);
+
+	            zrUtil.each(visualTypes, function (type) {
+	                var visualMapping = mappings[type];
+	                if (opts.convertOpacityToAlpha && type === 'opacity') {
+	                    type = 'colorAlpha';
+	                    visualMapping = mappings.__alphaForOpacity;
+	                }
+	                if (VisualMapping.dependsOn(type, visualCluster)) {
+	                    visualMapping && visualMapping.applyVisual(
+	                        targetValue, getter, setter
+	                    );
+	                }
+	            });
+
+	            return visualObj[visualCluster];
+	        },
+
+	        /**
+	         * @protected
+	         */
+	        positionGroup: function (group) {
+	            var model = this.visualMapModel;
+	            var api = this.api;
+
+	            layout.positionGroup(
+	                group,
+	                model.getBoxLayoutParams(),
+	                {width: api.getWidth(), height: api.getHeight()}
+	            );
+	        },
+
+	        /**
+	         * @protected
+	         * @abstract
+	         */
+	        doRender: zrUtil.noop
+
+	    });
+
+
+
+/***/ },
+/* 339 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var layout = __webpack_require__(21);
+
+	    var helper = {
+
+	        /**
+	         * @param {module:echarts/component/visualMap/VisualMapModel} visualMapModel\
+	         * @param {module:echarts/ExtensionAPI} api
+	         * @param {Array.<number>} itemSize always [short, long]
+	         * @return {string} 'left' or 'right' or 'top' or 'bottom'
+	         */
+	        getItemAlign: function (visualMapModel, api, itemSize) {
+	            var modelOption = visualMapModel.option;
+	            var itemAlign = modelOption.align;
+
+	            if (itemAlign != null && itemAlign !== 'auto') {
+	                return itemAlign;
+	            }
+
+	            // Auto decision align.
+	            var ecSize = {width: api.getWidth(), height: api.getHeight()};
+	            var realIndex = modelOption.orient === 'horizontal' ? 1 : 0;
+
+	            var paramsSet = [
+	                ['left', 'right', 'width'],
+	                ['top', 'bottom', 'height']
+	            ];
+	            var reals = paramsSet[realIndex];
+	            var fakeValue = [0, null, 10];
+
+	            var layoutInput = {};
+	            for (var i = 0; i < 3; i++) {
+	                layoutInput[paramsSet[1 - realIndex][i]] = fakeValue[i];
+	                layoutInput[reals[i]] = i === 2 ? itemSize[0] : modelOption[reals[i]];
+	            }
+
+	            var rParam = [['x', 'width', 3], ['y', 'height', 0]][realIndex];
+	            var rect = layout.getLayoutRect(layoutInput, ecSize, modelOption.padding);
+
+	            return reals[
+	                (rect.margin[rParam[2]] || 0) + rect[rParam[0]] + rect[rParam[1]] * 0.5
+	                    < ecSize[rParam[1]] * 0.5 ? 0 : 1
+	            ];
+	        }
+
+	    };
+
+
+	    module.exports = helper;
+
+
+
+/***/ },
+/* 340 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @file Data range action
+	 */
+
+
+	    var echarts = __webpack_require__(1);
+
+	    var actionInfo = {
+	        type: 'selectDataRange',
+	        event: 'dataRangeSelected',
+	        // FIXME use updateView appears wrong
+	        update: 'update'
+	    };
+
+	    echarts.registerAction(actionInfo, function (payload, ecModel) {
+
+	        ecModel.eachComponent({mainType: 'visualMap', query: payload}, function (model) {
+	            model.setSelected(payload.selected);
+	        });
+
+	    });
+
+
+
+/***/ },
+/* 341 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * DataZoom component entry
+	 */
+
+
+	    __webpack_require__(1).registerPreprocessor(
+	        __webpack_require__(331)
+	    );
+
+	    __webpack_require__(332);
+	    __webpack_require__(333);
+	    __webpack_require__(342);
+	    __webpack_require__(343);
+	    __webpack_require__(340);
+
+
+
+/***/ },
+/* 342 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var VisualMapModel = __webpack_require__(335);
+	    var zrUtil = __webpack_require__(4);
+	    var VisualMapping = __webpack_require__(192);
+
+	    var PiecewiseModel = VisualMapModel.extend({
+
+	        type: 'visualMap.piecewise',
+
+	        /**
+	         * Order Rule:
+	         *
+	         * option.categories / option.pieces / option.text / option.selected:
+	         *     If !option.inverse,
+	         *     Order when vertical: ['top', ..., 'bottom'].
+	         *     Order when horizontal: ['left', ..., 'right'].
+	         *     If option.inverse, the meaning of
+	         *     the order should be reversed.
+	         *
+	         * this._pieceList:
+	         *     The order is always [low, ..., high].
+	         *
+	         * Mapping from location to low-high:
+	         *     If !option.inverse
+	         *     When vertical, top is high.
+	         *     When horizontal, right is high.
+	         *     If option.inverse, reverse.
+	         */
+
+	        /**
+	         * @protected
+	         */
+	        defaultOption: {
+	            selected: null,             // Object. If not specified, means selected.
+	                                        // When pieces and splitNumber: {'0': true, '5': true}
+	                                        // When categories: {'cate1': false, 'cate3': true}
+	                                        // When selected === false, means all unselected.
+	            align: 'auto',              // 'auto', 'left', 'right'
+	            itemWidth: 20,              // When put the controller vertically, it is the length of
+	                                        // horizontal side of each item. Otherwise, vertical side.
+	            itemHeight: 14,             // When put the controller vertically, it is the length of
+	                                        // vertical side of each item. Otherwise, horizontal side.
+	            itemSymbol: 'roundRect',
+	            pieceList: null,            // Each item is Object, with some of those attrs:
+	                                        // {min, max, lt, gt, lte, gte, value,
+	                                        // color, colorSaturation, colorAlpha, opacity,
+	                                        // symbol, symbolSize}, which customize the range or visual
+	                                        // coding of the certain piece. Besides, see "Order Rule".
+	            categories: null,           // category names, like: ['some1', 'some2', 'some3'].
+	                                        // Attr min/max are ignored when categories set. See "Order Rule"
+	            splitNumber: 5,             // If set to 5, auto split five pieces equally.
+	                                        // If set to 0 and component type not set, component type will be
+	                                        // determined as "continuous". (It is less reasonable but for ec2
+	                                        // compatibility, see echarts/component/visualMap/typeDefaulter)
+	            selectedMode: 'multiple',   // Can be 'multiple' or 'single'.
+	            itemGap: 10,                // The gap between two items, in px.
+	            hoverLink: true             // Enable hover highlight.
+	        },
+
+	        /**
+	         * @override
+	         */
+	        optionUpdated: function (newOption, isInit) {
+	            PiecewiseModel.superApply(this, 'optionUpdated', arguments);
+
+	            /**
+	             * The order is always [low, ..., high].
+	             * [{text: string, interval: Array.<number>}, ...]
+	             * @private
+	             * @type {Array.<Object>}
+	             */
+	            this._pieceList = [];
+
+	            this.resetTargetSeries();
+	            this.resetExtent();
+
+	            /**
+	             * 'pieces', 'categories', 'splitNumber'
+	             * @type {string}
+	             */
+	            var mode = this._mode = this._determineMode();
+
+	            resetMethods[this._mode].call(this);
+
+	            this._resetSelected(newOption, isInit);
+
+	            var categories = this.option.categories;
+
+	            this.resetVisual(function (mappingOption, state) {
+	                if (mode === 'categories') {
+	                    mappingOption.mappingMethod = 'category';
+	                    mappingOption.categories = zrUtil.clone(categories);
+	                }
+	                else {
+	                    mappingOption.dataExtent = this.getExtent();
+	                    mappingOption.mappingMethod = 'piecewise';
+	                    mappingOption.pieceList = zrUtil.map(this._pieceList, function (piece) {
+	                        var piece = zrUtil.clone(piece);
+	                        if (state !== 'inRange') {
+	                            piece.visual = null;
+	                        }
+	                        return piece;
+	                    });
+	                }
+	            });
+	        },
+
+	        _resetSelected: function (newOption, isInit) {
+	            var thisOption = this.option;
+	            var pieceList = this._pieceList;
+
+	            // Selected do not merge but all override.
+	            var selected = (isInit ? thisOption : newOption).selected || {};
+	            thisOption.selected = selected;
+
+	            // Consider 'not specified' means true.
+	            zrUtil.each(pieceList, function (piece, index) {
+	                var key = this.getSelectedMapKey(piece);
+	                if (!(key in selected)) {
+	                    selected[key] = true;
+	                }
+	            }, this);
+
+	            if (thisOption.selectedMode === 'single') {
+	                // Ensure there is only one selected.
+	                var hasSel = false;
+
+	                zrUtil.each(pieceList, function (piece, index) {
+	                    var key = this.getSelectedMapKey(piece);
+	                    if (selected[key]) {
+	                        hasSel
+	                            ? (selected[key] = false)
+	                            : (hasSel = true);
+	                    }
+	                }, this);
+	            }
+	            // thisOption.selectedMode === 'multiple', default: all selected.
+	        },
+
+	        /**
+	         * @public
+	         */
+	        getSelectedMapKey: function (piece) {
+	            return this._mode === 'categories'
+	                ? piece.value + '' : piece.index + '';
+	        },
+
+	        /**
+	         * @public
+	         */
+	        getPieceList: function () {
+	            return this._pieceList;
+	        },
+
+	        /**
+	         * @private
+	         * @return {string}
+	         */
+	        _determineMode: function () {
+	            var option = this.option;
+
+	            return option.pieces && option.pieces.length > 0
+	                ? 'pieces'
+	                : this.option.categories
+	                ? 'categories'
+	                : 'splitNumber';
+	        },
+
+	        /**
+	         * @public
+	         * @override
+	         */
+	        setSelected: function (selected) {
+	            this.option.selected = zrUtil.clone(selected);
+	        },
+
+	        /**
+	         * @public
+	         * @override
+	         */
+	        getValueState: function (value) {
+	            var index = VisualMapping.findPieceIndex(value, this._pieceList);
+
+	            return index != null
+	                ? (this.option.selected[this.getSelectedMapKey(this._pieceList[index])]
+	                    ? 'inRange' : 'outOfRange'
+	                )
+	                : 'outOfRange';
+	        },
+
+	        /**
+	         * @public
+	         * @params {number} pieceIndex piece index in visualMapModel.getPieceList()
+	         * @return {Array.<Object>} [{seriesId, dataIndices: <Array.<number>>}, ...]
+	         */
+	        findTargetDataIndices: function (pieceIndex) {
+	            var result = [];
+
+	            this.eachTargetSeries(function (seriesModel) {
+	                var dataIndices = [];
+	                var data = seriesModel.getData();
+
+	                data.each(this.getDataDimension(data), function (value, dataIndex) {
+	                    // Should always base on model pieceList, because it is order sensitive.
+	                    var pIdx = VisualMapping.findPieceIndex(value, this._pieceList);
+	                    pIdx === pieceIndex && dataIndices.push(dataIndex);
+	                }, true, this);
+
+	                result.push({seriesId: seriesModel.id, dataIndex: dataIndices});
+	            }, this);
+
+	            return result;
+	        },
+
+	        /**
+	         * @private
+	         */
+	        getRepresentValue: function (piece) {
+	            var representValue;
+	            if (this.isCategory()) {
+	                representValue = piece.value;
+	            }
+	            else {
+	                if (piece.value != null) {
+	                    representValue = piece.value;
+	                }
+	                else {
+	                    var pieceInterval = piece.interval || [];
+	                    representValue = (pieceInterval[0] + pieceInterval[1]) / 2;
+	                }
+	            }
+	            return representValue;
+	        },
+
+	        getStops: function (seriesModel, getColorVisual) {
+	            var result = [];
+	            var model = this;
+
+	            var curr = -Infinity;
+	            zrUtil.each(this._pieceList, function (piece) {
+	                // Do not support category yet.
+	                var interval = piece.interval;
+	                if (interval) {
+	                    interval[0] > curr && setPiece({
+	                        interval: [curr, interval[0]],
+	                        valueState: 'outOfRange'
+	                    });
+	                    setPiece({
+	                        interval: interval.slice(),
+	                        valueState: this.getValueState((interval[0] + interval[1]) / 2)
+	                    });
+	                    curr = interval[1];
+	                }
+	            }, this);
+
+	            return result;
+
+	            function setPiece(piece) {
+	                result.push(piece);
+	                piece.color = getColorVisual(
+	                    model, model.getRepresentValue(piece), piece.valueState
+	                );
+	            }
+	        }
+
+	    });
+
+	    /**
+	     * Key is this._mode
+	     * @type {Object}
+	     * @this {module:echarts/component/viusalMap/PiecewiseMode}
+	     */
+	    var resetMethods = {
+
+	        splitNumber: function () {
+	            var thisOption = this.option;
+	            var pieceList = this._pieceList;
+	            var precision = thisOption.precision;
+	            var dataExtent = this.getExtent();
+	            var splitNumber = thisOption.splitNumber;
+	            splitNumber = Math.max(parseInt(splitNumber, 10), 1);
+	            thisOption.splitNumber = splitNumber;
+
+	            var splitStep = (dataExtent[1] - dataExtent[0]) / splitNumber;
+	            // Precision auto-adaption
+	            while (+splitStep.toFixed(precision) !== splitStep && precision < 5) {
+	                precision++;
+	            }
+	            thisOption.precision = precision;
+	            splitStep = +splitStep.toFixed(precision);
+
+	            for (var i = 0, curr = dataExtent[0]; i < splitNumber; i++, curr += splitStep) {
+	                var max = i === splitNumber - 1 ? dataExtent[1] : (curr + splitStep);
+
+	                pieceList.push({
+	                    index: i,
+	                    interval: [curr, max],
+	                    close: [1, 1]
+	                });
+	            }
+
+	            normalizePieces(pieceList);
+
+	            zrUtil.each(pieceList, function (piece) {
+	                piece.text = this.formatValueText(piece.interval);
+	            }, this);
+	        },
+
+	        categories: function () {
+	            var thisOption = this.option;
+	            zrUtil.each(thisOption.categories, function (cate) {
+	                // FIXME category模式也使用pieceList，但在visualMapping中不是使用pieceList。
+	                // 是否改一致。
+	                this._pieceList.push({
+	                    text: this.formatValueText(cate, true),
+	                    value: cate
+	                });
+	            }, this);
+
+	            // See "Order Rule".
+	            normalizeReverse(thisOption, this._pieceList);
+	        },
+
+	        pieces: function () {
+	            var thisOption = this.option;
+	            var pieceList = this._pieceList;
+
+	            zrUtil.each(thisOption.pieces, function (pieceListItem, index) {
+
+	                if (!zrUtil.isObject(pieceListItem)) {
+	                    pieceListItem = {value: pieceListItem};
+	                }
+
+	                var item = {text: '', index: index};
+
+	                if (pieceListItem.label != null) {
+	                    item.text = pieceListItem.label;
+	                }
+
+	                if (pieceListItem.hasOwnProperty('value')) {
+	                    var value = item.value = pieceListItem.value;
+	                    item.interval = [value, value];
+	                    item.close = [1, 1];
+	                }
+	                else {
+	                    // `min` `max` is legacy option.
+	                    // `lt` `gt` `lte` `gte` is recommanded.
+	                    var interval = item.interval = [];
+	                    var close = item.close = [0, 0];
+
+	                    var closeList = [1, 0, 1];
+	                    var infinityList = [-Infinity, Infinity];
+
+	                    var useMinMax = [];
+	                    for (var lg = 0; lg < 2; lg++) {
+	                        var names = [['gte', 'gt', 'min'], ['lte', 'lt', 'max']][lg];
+	                        for (var i = 0; i < 3 && interval[lg] == null; i++) {
+	                            interval[lg] = pieceListItem[names[i]];
+	                            close[lg] = closeList[i];
+	                            useMinMax[lg] = i === 2;
+	                        }
+	                        interval[lg] == null && (interval[lg] = infinityList[lg]);
+	                    }
+	                    useMinMax[0] && interval[1] === Infinity && (close[0] = 0);
+	                    useMinMax[1] && interval[0] === -Infinity && (close[1] = 0);
+
+	                    if (true) {
+	                        if (interval[0] > interval[1]) {
+	                            console.warn(
+	                                'Piece ' + index + 'is illegal: ' + interval
+	                                + ' lower bound should not greater then uppper bound.'
+	                            );
+	                        }
+	                    }
+
+	                    if (interval[0] === interval[1] && close[0] && close[1]) {
+	                        // Consider: [{min: 5, max: 5, visual: {...}}, {min: 0, max: 5}],
+	                        // we use value to lift the priority when min === max
+	                        item.value = interval[0];
+	                    }
+	                }
+
+	                item.visual = VisualMapping.retrieveVisuals(pieceListItem);
+
+	                pieceList.push(item);
+
+	            }, this);
+
+	            // See "Order Rule".
+	            normalizeReverse(thisOption, pieceList);
+	            // Only pieces
+	            normalizePieces(pieceList);
+
+	            zrUtil.each(pieceList, function (piece) {
+	                var close = piece.close;
+	                var edgeSymbols = [['<', '≤'][close[1]], ['>', '≥'][close[0]]];
+	                piece.text = piece.text || this.formatValueText(
+	                    piece.value != null ? piece.value : piece.interval,
+	                    false,
+	                    edgeSymbols
+	                );
+	            }, this);
+	        }
+	    };
+
+	    function normalizeReverse(thisOption, pieceList) {
+	        var inverse = thisOption.inverse;
+	        if (thisOption.orient === 'vertical' ? !inverse : inverse) {
+	             pieceList.reverse();
+	        }
+	    }
+
+	    // Reorder, remove duplicate, which are needed when using gradient.
+	    // Not applicable for categories.
+	    function normalizePieces(pieceList) {
+	        pieceList.sort(function (a, b) {
+	            return littleThan(a, b) ? -1 : 1;
+	        });
+
+	        var curr = -Infinity;
+	        for (var i = 0; i < pieceList.length; i++) {
+	            var interval = pieceList[i].interval;
+	            var close = pieceList[i].close;
+	            for (var lg = 0; lg < 2; lg++) {
+	                if (interval[lg] < curr) {
+	                    interval[lg] = curr;
+	                    close[lg] = 1 - lg;
+	                }
+	                curr = interval[lg];
+	            }
+	        }
+	        // console.log(JSON.stringify(pieceList.map(a => a.interval)));
+
+	        function littleThan(piece, standard, lg) {
+	            lg = lg || 0;
+	            return piece.interval[lg] < standard.interval[lg]
+	                || (
+	                    piece.interval[lg] === standard.interval[lg]
+	                    && (
+	                        +piece.close[lg] > standard.close[lg]
+	                        || littleThan(piece, standard, 1)
+	                    )
+	                );
+	        }
+	    }
+
+	    module.exports = PiecewiseModel;
+
+
+/***/ },
+/* 343 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var VisualMapView = __webpack_require__(338);
+	    var zrUtil = __webpack_require__(4);
+	    var graphic = __webpack_require__(43);
+	    var symbolCreators = __webpack_require__(106);
+	    var layout = __webpack_require__(21);
+	    var helper = __webpack_require__(339);
+
+	    var PiecewiseVisualMapView = VisualMapView.extend({
+
+	        type: 'visualMap.piecewise',
+
+	        /**
+	         * @protected
+	         * @override
+	         */
+	        doRender: function () {
+	            var thisGroup = this.group;
+
+	            thisGroup.removeAll();
+
+	            var visualMapModel = this.visualMapModel;
+	            var textGap = visualMapModel.get('textGap');
+	            var textStyleModel = visualMapModel.textStyleModel;
+	            var textFont = textStyleModel.getFont();
+	            var textFill = textStyleModel.getTextColor();
+	            var itemAlign = this._getItemAlign();
+	            var itemSize = visualMapModel.itemSize;
+
+	            var viewData = this._getViewData();
+	            var showLabel = !viewData.endsText;
+	            var showEndsText = !showLabel;
+
+	            showEndsText && this._renderEndsText(thisGroup, viewData.endsText[0], itemSize);
+
+	            zrUtil.each(viewData.viewPieceList, renderItem, this);
+
+	            showEndsText && this._renderEndsText(thisGroup, viewData.endsText[1], itemSize);
+
+	            layout.box(
+	                visualMapModel.get('orient'), thisGroup, visualMapModel.get('itemGap')
+	            );
+
+	            this.renderBackground(thisGroup);
+
+	            this.positionGroup(thisGroup);
+
+	            function renderItem(item) {
+	                var piece = item.piece;
+
+	                var itemGroup = new graphic.Group();
+	                itemGroup.onclick = zrUtil.bind(this._onItemClick, this, piece);
+
+	                this._enableHoverLink(itemGroup, item.indexInModelPieceList);
+
+	                var representValue = visualMapModel.getRepresentValue(piece);
+
+	                this._createItemSymbol(
+	                    itemGroup, representValue, [0, 0, itemSize[0], itemSize[1]]
+	                );
+
+	                if (showLabel) {
+	                    var visualState = this.visualMapModel.getValueState(representValue);
+
+	                    itemGroup.add(new graphic.Text({
+	                        style: {
+	                            x: itemAlign === 'right' ? -textGap : itemSize[0] + textGap,
+	                            y: itemSize[1] / 2,
+	                            text: piece.text,
+	                            textVerticalAlign: 'middle',
+	                            textAlign: itemAlign,
+	                            textFont: textFont,
+	                            fill: textFill,
+	                            opacity: visualState === 'outOfRange' ? 0.5 : 1
+	                        }
+	                    }));
+	                }
+
+	                thisGroup.add(itemGroup);
+	            }
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _enableHoverLink: function (itemGroup, pieceIndex) {
+	            itemGroup
+	                .on('mouseover', zrUtil.bind(onHoverLink, this, 'highlight'))
+	                .on('mouseout', zrUtil.bind(onHoverLink, this, 'downplay'));
+
+	            function onHoverLink(method) {
+	                var visualMapModel = this.visualMapModel;
+
+	                visualMapModel.option.hoverLink && this.api.dispatchAction({
+	                    type: method,
+	                    batch: visualMapModel.findTargetDataIndices(pieceIndex)
+	                });
+	            }
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _getItemAlign: function () {
+	            var visualMapModel = this.visualMapModel;
+	            var modelOption = visualMapModel.option;
+
+	            if (modelOption.orient === 'vertical') {
+	                return helper.getItemAlign(
+	                    visualMapModel, this.api, visualMapModel.itemSize
+	                );
+	            }
+	            else { // horizontal, most case left unless specifying right.
+	                var align = modelOption.align;
+	                if (!align || align === 'auto') {
+	                    align = 'left';
+	                }
+	                return align;
+	            }
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _renderEndsText: function (group, text, itemSize) {
+	            if (!text) {
+	                return;
+	            }
+
+	            var itemGroup = new graphic.Group();
+	            var textStyleModel = this.visualMapModel.textStyleModel;
+
+	            itemGroup.add(new graphic.Text({
+	                style: {
+	                    x: itemSize[0] / 2,
+	                    y: itemSize[1] / 2,
+	                    textVerticalAlign: 'middle',
+	                    textAlign: 'center',
+	                    text: text,
+	                    textFont: textStyleModel.getFont(),
+	                    fill: textStyleModel.getTextColor()
+	                }
+	            }));
+
+	            group.add(itemGroup);
+	        },
+
+	        /**
+	         * @private
+	         * @return {Object} {peiceList, endsText} The order is the same as screen pixel order.
+	         */
+	        _getViewData: function () {
+	            var visualMapModel = this.visualMapModel;
+
+	            var viewPieceList = zrUtil.map(visualMapModel.getPieceList(), function (piece, index) {
+	                return {piece: piece, indexInModelPieceList: index};
+	            });
+	            var endsText = visualMapModel.get('text');
+
+	            // Consider orient and inverse.
+	            var orient = visualMapModel.get('orient');
+	            var inverse = visualMapModel.get('inverse');
+
+	            // Order of model pieceList is always [low, ..., high]
+	            if (orient === 'horizontal' ? inverse : !inverse) {
+	                viewPieceList.reverse();
+	            }
+	            // Origin order of endsText is [high, low]
+	            else if (endsText) {
+	                endsText = endsText.slice().reverse();
+	            }
+
+	            return {viewPieceList: viewPieceList, endsText: endsText};
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _createItemSymbol: function (group, representValue, shapeParam) {
+	            group.add(symbolCreators.createSymbol(
+	                this.getControllerVisual(representValue, 'symbol'),
+	                shapeParam[0], shapeParam[1], shapeParam[2], shapeParam[3],
+	                this.getControllerVisual(representValue, 'color')
+	            ));
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _onItemClick: function (piece) {
+	            var visualMapModel = this.visualMapModel;
+	            var option = visualMapModel.option;
+	            var selected = zrUtil.clone(option.selected);
+	            var newKey = visualMapModel.getSelectedMapKey(piece);
+
+	            if (option.selectedMode === 'single') {
+	                selected[newKey] = true;
+	                zrUtil.each(selected, function (o, key) {
+	                    selected[key] = key === newKey;
+	                });
+	            }
+	            else {
+	                selected[newKey] = !selected[newKey];
+	            }
+
+	            this.api.dispatchAction({
+	                type: 'selectDataRange',
+	                from: this.uid,
+	                visualMapId: this.visualMapModel.id,
+	                selected: selected
+	            });
+	        }
+	    });
+
+	    module.exports = PiecewiseVisualMapView;
+
+
+
+/***/ },
+/* 344 */
+/***/ function(module, exports, __webpack_require__) {
+
+	// HINT Markpoint can't be used too much
+
+
+	    __webpack_require__(345);
+	    __webpack_require__(347);
+
+	    __webpack_require__(1).registerPreprocessor(function (opt) {
+	        // Make sure markPoint component is enabled
+	        opt.markPoint = opt.markPoint || {};
+	    });
+
+
+/***/ },
+/* 345 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    module.exports = __webpack_require__(346).extend({
+
+	        type: 'markPoint',
+
+	        defaultOption: {
+	            zlevel: 0,
+	            z: 5,
+	            symbol: 'pin',
+	            symbolSize: 50,
+	            //symbolRotate: 0,
+	            //symbolOffset: [0, 0]
+	            tooltip: {
+	                trigger: 'item'
+	            },
+	            label: {
+	                normal: {
+	                    show: true,
+	                    position: 'inside'
+	                },
+	                emphasis: {
+	                    show: true
+	                }
+	            },
+	            itemStyle: {
+	                normal: {
+	                    borderWidth: 2
+	                }
+	            }
+	        }
+	    });
+
+
+/***/ },
+/* 346 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var modelUtil = __webpack_require__(5);
+	    var zrUtil = __webpack_require__(4);
+	    var env = __webpack_require__(2);
+
+	    var formatUtil = __webpack_require__(6);
+	    var addCommas = formatUtil.addCommas;
+	    var encodeHTML = formatUtil.encodeHTML;
+
+	    function fillLabel(opt) {
+	        modelUtil.defaultEmphasis(
+	            opt.label,
+	            modelUtil.LABEL_OPTIONS
+	        );
+	    }
+	    var MarkerModel = __webpack_require__(1).extendComponentModel({
+
+	        type: 'marker',
+
+	        dependencies: ['series', 'grid', 'polar', 'geo'],
+	        /**
+	         * @overrite
+	         */
+	        init: function (option, parentModel, ecModel, extraOpt) {
+
+	            if (true) {
+	                if (this.type === 'marker') {
+	                    throw new Error('Marker component is abstract component. Use markLine, markPoint, markArea instead.');
+	                }
+	            }
+	            this.mergeDefaultAndTheme(option, ecModel);
+	            this.mergeOption(option, ecModel, extraOpt.createdBySelf, true);
+	        },
+
+	        /**
+	         * @return {boolean}
+	         */
+	        ifEnableAnimation: function () {
+	            if (env.node) {
+	                return false;
+	            }
+
+	            var hostSeries = this.__hostSeries;
+	            return this.getShallow('animation') && hostSeries && hostSeries.ifEnableAnimation();
+	        },
+
+	        mergeOption: function (newOpt, ecModel, createdBySelf, isInit) {
+	            var MarkerModel = this.constructor;
+	            var modelPropName = this.mainType + 'Model';
+	            if (!createdBySelf) {
+	                ecModel.eachSeries(function (seriesModel) {
+
+	                    var markerOpt = seriesModel.get(this.mainType);
+
+	                    var markerModel = seriesModel[modelPropName];
+	                    if (!markerOpt || !markerOpt.data) {
+	                        seriesModel[modelPropName] = null;
+	                        return;
+	                    }
+	                    if (!markerModel) {
+	                        if (isInit) {
+	                            // Default label emphasis `position` and `show`
+	                            fillLabel(markerOpt);
+	                        }
+	                        zrUtil.each(markerOpt.data, function (item) {
+	                            // FIXME Overwrite fillLabel method ?
+	                            if (item instanceof Array) {
+	                                fillLabel(item[0]);
+	                                fillLabel(item[1]);
+	                            }
+	                            else {
+	                                fillLabel(item);
+	                            }
+	                        });
+	                        var opt = {
+	                            mainType: this.mainType,
+	                            // Use the same series index and name
+	                            seriesIndex: seriesModel.seriesIndex,
+	                            name: seriesModel.name,
+	                            createdBySelf: true
+	                        };
+	                        markerModel = new MarkerModel(
+	                            markerOpt, this, ecModel, opt
+	                        );
+	                        markerModel.__hostSeries = seriesModel;
+	                    }
+	                    else {
+	                        markerModel.mergeOption(markerOpt, ecModel, true);
+	                    }
+	                    seriesModel[modelPropName] = markerModel;
+	                }, this);
+	            }
+	        },
+
+	        formatTooltip: function (dataIndex) {
+	            var data = this.getData();
+	            var value = this.getRawValue(dataIndex);
+	            var formattedValue = zrUtil.isArray(value)
+	                ? zrUtil.map(value, addCommas).join(', ') : addCommas(value);
+	            var name = data.getName(dataIndex);
+	            var html = this.name;
+	            if (value != null || name) {
+	                html += '<br />';
+	            }
+	            if (name) {
+	                html += encodeHTML(name);
+	                if (value != null) {
+	                    html += ' : ';
+	                }
+	            }
+	            if (value != null) {
+	                html += formattedValue;
+	            }
+	            return html;
+	        },
+
+	        getData: function () {
+	            return this._data;
+	        },
+
+	        setData: function (data) {
+	            this._data = data;
+	        }
+	    });
+
+	    zrUtil.mixin(MarkerModel, modelUtil.dataFormatMixin);
+
+	    module.exports = MarkerModel;
+
+
+/***/ },
+/* 347 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var SymbolDraw = __webpack_require__(104);
+	    var zrUtil = __webpack_require__(4);
+	    var numberUtil = __webpack_require__(7);
+
+	    var List = __webpack_require__(97);
+
+	    var markerHelper = __webpack_require__(348);
+
+	    function updateMarkerLayout(mpData, seriesModel, api) {
+	        var coordSys = seriesModel.coordinateSystem;
+	        mpData.each(function (idx) {
+	            var itemModel = mpData.getItemModel(idx);
+	            var point;
+	            var xPx = numberUtil.parsePercent(itemModel.get('x'), api.getWidth());
+	            var yPx = numberUtil.parsePercent(itemModel.get('y'), api.getHeight());
+	            if (!isNaN(xPx) && !isNaN(yPx)) {
+	                point = [xPx, yPx];
+	            }
+	            // Chart like bar may have there own marker positioning logic
+	            else if (seriesModel.getMarkerPosition) {
+	                // Use the getMarkerPoisition
+	                point = seriesModel.getMarkerPosition(
+	                    mpData.getValues(mpData.dimensions, idx)
+	                );
+	            }
+	            else if (coordSys) {
+	                var x = mpData.get(coordSys.dimensions[0], idx);
+	                var y = mpData.get(coordSys.dimensions[1], idx);
+	                point = coordSys.dataToPoint([x, y]);
+
+	            }
+
+	            // Use x, y if has any
+	            if (!isNaN(xPx)) {
+	                point[0] = xPx;
+	            }
+	            if (!isNaN(yPx)) {
+	                point[1] = yPx;
+	            }
+
+	            mpData.setItemLayout(idx, point);
+	        });
+	    }
+
+	    __webpack_require__(349).extend({
+
+	        type: 'markPoint',
+
+	        updateLayout: function (markPointModel, ecModel, api) {
+	            ecModel.eachSeries(function (seriesModel) {
+	                var mpModel = seriesModel.markPointModel;
+	                if (mpModel) {
+	                    updateMarkerLayout(mpModel.getData(), seriesModel, api);
+	                    this.markerGroupMap[seriesModel.name].updateLayout(mpModel);
+	                }
+	            }, this);
+	        },
+
+	        renderSeries: function (seriesModel, mpModel, ecModel, api) {
+	            var coordSys = seriesModel.coordinateSystem;
+	            var seriesName = seriesModel.name;
+	            var seriesData = seriesModel.getData();
+
+	            var symbolDrawMap = this.markerGroupMap;
+	            var symbolDraw = symbolDrawMap[seriesName];
+	            if (!symbolDraw) {
+	                symbolDraw = symbolDrawMap[seriesName] = new SymbolDraw();
+	            }
+
+	            var mpData = createList(coordSys, seriesModel, mpModel);
+
+	            // FIXME
+	            mpModel.setData(mpData);
+
+	            updateMarkerLayout(mpModel.getData(), seriesModel, api);
+
+	            mpData.each(function (idx) {
+	                var itemModel = mpData.getItemModel(idx);
+	                var symbolSize = itemModel.getShallow('symbolSize');
+	                if (typeof symbolSize === 'function') {
+	                    // FIXME 这里不兼容 ECharts 2.x，2.x 貌似参数是整个数据？
+	                    symbolSize = symbolSize(
+	                        mpModel.getRawValue(idx), mpModel.getDataParams(idx)
+	                    );
+	                }
+	                mpData.setItemVisual(idx, {
+	                    symbolSize: symbolSize,
+	                    color: itemModel.get('itemStyle.normal.color')
+	                        || seriesData.getVisual('color'),
+	                    symbol: itemModel.getShallow('symbol')
+	                });
+	            });
+
+	            // TODO Text are wrong
+	            symbolDraw.updateData(mpData);
+	            this.group.add(symbolDraw.group);
+
+	            // Set host model for tooltip
+	            // FIXME
+	            mpData.eachItemGraphicEl(function (el) {
+	                el.traverse(function (child) {
+	                    child.dataModel = mpModel;
+	                });
+	            });
+
+	            symbolDraw.__keep = true;
+
+	            symbolDraw.group.silent = mpModel.get('silent') || seriesModel.get('silent');
+	        }
+	    });
+
+	    /**
+	     * @inner
+	     * @param {module:echarts/coord/*} [coordSys]
+	     * @param {module:echarts/model/Series} seriesModel
+	     * @param {module:echarts/model/Model} mpModel
+	     */
+	    function createList(coordSys, seriesModel, mpModel) {
+	        var coordDimsInfos;
+	        if (coordSys) {
+	            coordDimsInfos = zrUtil.map(coordSys && coordSys.dimensions, function (coordDim) {
+	                var info = seriesModel.getData().getDimensionInfo(
+	                    seriesModel.coordDimToDataDim(coordDim)[0]
+	                ) || {}; // In map series data don't have lng and lat dimension. Fallback to same with coordSys
+	                info.name = coordDim;
+	                return info;
+	            });
+	        }
+	        else {
+	            coordDimsInfos =[{
+	                name: 'value',
+	                type: 'float'
+	            }];
+	        }
+
+	        var mpData = new List(coordDimsInfos, mpModel);
+	        var dataOpt = zrUtil.map(mpModel.get('data'), zrUtil.curry(
+	                markerHelper.dataTransform, seriesModel
+	            ));
+	        if (coordSys) {
+	            dataOpt = zrUtil.filter(
+	                dataOpt, zrUtil.curry(markerHelper.dataFilter, coordSys)
+	            );
+	        }
+
+	        mpData.initData(dataOpt, null,
+	            coordSys ? markerHelper.dimValueGetter : function (item) {
+	                return item.value;
+	            }
+	        );
+	        return mpData;
+	    }
+
+
+
+/***/ },
+/* 348 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+	    var numberUtil = __webpack_require__(7);
+	    var indexOf = zrUtil.indexOf;
+
+	    function hasXOrY(item) {
+	        return !(isNaN(parseFloat(item.x)) && isNaN(parseFloat(item.y)));
+	    }
+
+	    function hasXAndY(item) {
+	        return !isNaN(parseFloat(item.x)) && !isNaN(parseFloat(item.y));
+	    }
+
+	    function getPrecision(data, valueAxisDim, dataIndex) {
+	        var precision = -1;
+	        do {
+	            precision = Math.max(
+	                numberUtil.getPrecision(data.get(
+	                    valueAxisDim, dataIndex
+	                )),
+	                precision
+	            );
+	            data = data.stackedOn;
+	        } while (data);
+
+	        return precision;
+	    }
+
+	    function markerTypeCalculatorWithExtent(
+	        mlType, data, otherDataDim, targetDataDim, otherCoordIndex, targetCoordIndex
+	    ) {
+	        var coordArr = [];
+	        var value = numCalculate(data, targetDataDim, mlType);
+
+	        var dataIndex = data.indexOfNearest(targetDataDim, value, true);
+	        coordArr[otherCoordIndex] = data.get(otherDataDim, dataIndex, true);
+	        coordArr[targetCoordIndex] = data.get(targetDataDim, dataIndex, true);
+
+	        var precision = getPrecision(data, targetDataDim, dataIndex);
+	        if (precision >= 0) {
+	            coordArr[targetCoordIndex] = +coordArr[targetCoordIndex].toFixed(precision);
+	        }
+
+	        return coordArr;
+	    }
+
+	    var curry = zrUtil.curry;
+	    // TODO Specified percent
+	    var markerTypeCalculator = {
+	        /**
+	         * @method
+	         * @param {module:echarts/data/List} data
+	         * @param {string} baseAxisDim
+	         * @param {string} valueAxisDim
+	         */
+	        min: curry(markerTypeCalculatorWithExtent, 'min'),
+	        /**
+	         * @method
+	         * @param {module:echarts/data/List} data
+	         * @param {string} baseAxisDim
+	         * @param {string} valueAxisDim
+	         */
+	        max: curry(markerTypeCalculatorWithExtent, 'max'),
+
+	        /**
+	         * @method
+	         * @param {module:echarts/data/List} data
+	         * @param {string} baseAxisDim
+	         * @param {string} valueAxisDim
+	         */
+	        average: curry(markerTypeCalculatorWithExtent, 'average')
+	    };
+
+	    /**
+	     * Transform markPoint data item to format used in List by do the following
+	     * 1. Calculate statistic like `max`, `min`, `average`
+	     * 2. Convert `item.xAxis`, `item.yAxis` to `item.coord` array
+	     * @param  {module:echarts/model/Series} seriesModel
+	     * @param  {module:echarts/coord/*} [coordSys]
+	     * @param  {Object} item
+	     * @return {Object}
+	     */
+	    var dataTransform = function (seriesModel, item) {
+	        var data = seriesModel.getData();
+	        var coordSys = seriesModel.coordinateSystem;
+
+	        // 1. If not specify the position with pixel directly
+	        // 2. If `coord` is not a data array. Which uses `xAxis`,
+	        // `yAxis` to specify the coord on each dimension
+
+	        // parseFloat first because item.x and item.y can be percent string like '20%'
+	        if (item && !hasXAndY(item) && !zrUtil.isArray(item.coord) && coordSys) {
+	            var dims = coordSys.dimensions;
+	            var axisInfo = getAxisInfo(item, data, coordSys, seriesModel);
+
+	            // Clone the option
+	            // Transform the properties xAxis, yAxis, radiusAxis, angleAxis, geoCoord to value
+	            item = zrUtil.clone(item);
+
+	            if (item.type
+	                && markerTypeCalculator[item.type]
+	                && axisInfo.baseAxis && axisInfo.valueAxis
+	            ) {
+	                var otherCoordIndex = indexOf(dims, axisInfo.baseAxis.dim);
+	                var targetCoordIndex = indexOf(dims, axisInfo.valueAxis.dim);
+
+	                item.coord = markerTypeCalculator[item.type](
+	                    data, axisInfo.baseDataDim, axisInfo.valueDataDim,
+	                    otherCoordIndex, targetCoordIndex
+	                );
+	                // Force to use the value of calculated value.
+	                item.value = item.coord[targetCoordIndex];
+	            }
+	            else {
+	                // FIXME Only has one of xAxis and yAxis.
+	                var coord = [
+	                    item.xAxis != null ? item.xAxis : item.radiusAxis,
+	                    item.yAxis != null ? item.yAxis : item.angleAxis
+	                ];
+	                // Each coord support max, min, average
+	                for (var i = 0; i < 2; i++) {
+	                    if (markerTypeCalculator[coord[i]]) {
+	                        var dataDim = seriesModel.coordDimToDataDim(dims[i])[0];
+	                        coord[i] = numCalculate(data, dataDim, coord[i]);
+	                    }
+	                }
+	                item.coord = coord;
+	            }
+	        }
+	        return item;
+	    };
+
+	    var getAxisInfo = function (item, data, coordSys, seriesModel) {
+	        var ret = {};
+
+	        if (item.valueIndex != null || item.valueDim != null) {
+	            ret.valueDataDim = item.valueIndex != null
+	                ? data.getDimension(item.valueIndex) : item.valueDim;
+	            ret.valueAxis = coordSys.getAxis(seriesModel.dataDimToCoordDim(ret.valueDataDim));
+	            ret.baseAxis = coordSys.getOtherAxis(ret.valueAxis);
+	            ret.baseDataDim = seriesModel.coordDimToDataDim(ret.baseAxis.dim)[0];
+	        }
+	        else {
+	            ret.baseAxis = seriesModel.getBaseAxis();
+	            ret.valueAxis = coordSys.getOtherAxis(ret.baseAxis);
+	            ret.baseDataDim = seriesModel.coordDimToDataDim(ret.baseAxis.dim)[0];
+	            ret.valueDataDim = seriesModel.coordDimToDataDim(ret.valueAxis.dim)[0];
+	        }
+
+	        return ret;
+	    };
+
+	    /**
+	     * Filter data which is out of coordinateSystem range
+	     * [dataFilter description]
+	     * @param  {module:echarts/coord/*} [coordSys]
+	     * @param  {Object} item
+	     * @return {boolean}
+	     */
+	    var dataFilter = function (coordSys, item) {
+	        // Alwalys return true if there is no coordSys
+	        return (coordSys && coordSys.containData && item.coord && !hasXOrY(item))
+	            ? coordSys.containData(item.coord) : true;
+	    };
+
+	    var dimValueGetter = function (item, dimName, dataIndex, dimIndex) {
+	        // x, y, radius, angle
+	        if (dimIndex < 2) {
+	            return item.coord && item.coord[dimIndex];
+	        }
+	        return item.value;
+	    };
+
+	    var numCalculate = function (data, valueDataDim, type) {
+	        if (type === 'average') {
+	            var sum = 0;
+	            var count = 0;
+	            data.each(valueDataDim, function (val, idx) {
+	                if (!isNaN(val)) {
+	                    sum += val;
+	                    count++;
+	                }
+	            }, true);
+	            return sum / count;
+	        }
+	        else {
+	            return data.getDataExtent(valueDataDim, true)[type === 'max' ? 1 : 0];
+	        }
+	    };
+
+	    module.exports = {
+	        dataTransform: dataTransform,
+	        dataFilter: dataFilter,
+	        dimValueGetter: dimValueGetter,
+	        getAxisInfo: getAxisInfo,
+	        numCalculate: numCalculate
+	    };
+
+
+/***/ },
+/* 349 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    module.exports = __webpack_require__(1).extendComponentView({
+
+	        type: 'marker',
+
+	        init: function () {
+	            /**
+	             * Markline grouped by series
+	             * @private
+	             * @type {Object}
+	             */
+	            this.markerGroupMap = {};
+	        },
+
+	        render: function (markerModel, ecModel, api) {
+	            var markerGroupMap = this.markerGroupMap;
+	            for (var name in markerGroupMap) {
+	                markerGroupMap[name].__keep = false;
+	            }
+
+	            var markerModelKey = this.type + 'Model';
+	            ecModel.eachSeries(function (seriesModel) {
+	                var markerModel = seriesModel[markerModelKey];
+	                markerModel && this.renderSeries(seriesModel, markerModel, ecModel, api);
+	            }, this);
+
+	            for (var name in markerGroupMap) {
+	                if (!markerGroupMap[name].__keep) {
+	                    this.group.remove(markerGroupMap[name].group);
+	                }
+	            }
+	        },
+
+	        renderSeries: function () {}
+	    });
+
+
+/***/ },
+/* 350 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    __webpack_require__(351);
+	    __webpack_require__(352);
+
+	    __webpack_require__(1).registerPreprocessor(function (opt) {
+	        // Make sure markLine component is enabled
+	        opt.markLine = opt.markLine || {};
+	    });
+
+
+/***/ },
+/* 351 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    module.exports = __webpack_require__(346).extend({
+
+	        type: 'markLine',
+
+	        defaultOption: {
+	            zlevel: 0,
+	            z: 5,
+
+	            symbol: ['circle', 'arrow'],
+	            symbolSize: [8, 16],
+
+	            //symbolRotate: 0,
+
+	            precision: 2,
+	            tooltip: {
+	                trigger: 'item'
+	            },
+	            label: {
+	                normal: {
+	                    show: true,
+	                    position: 'end'
+	                },
+	                emphasis: {
+	                    show: true
+	                }
+	            },
+	            lineStyle: {
+	                normal: {
+	                    type: 'dashed'
+	                },
+	                emphasis: {
+	                    width: 3
+	                }
+	            },
+	            animationEasing: 'linear'
+	        }
+	    });
+
+
+/***/ },
+/* 352 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+	    var List = __webpack_require__(97);
+	    var numberUtil = __webpack_require__(7);
+
+	    var markerHelper = __webpack_require__(348);
+
+	    var LineDraw = __webpack_require__(199);
+
+	    var markLineTransform = function (seriesModel, coordSys, mlModel, item) {
+	        var data = seriesModel.getData();
+	        // Special type markLine like 'min', 'max', 'average'
+	        var mlType = item.type;
+
+	        if (!zrUtil.isArray(item)
+	            && (
+	                mlType === 'min' || mlType === 'max' || mlType === 'average'
+	                // In case
+	                // data: [{
+	                //   yAxis: 10
+	                // }]
+	                || (item.xAxis != null || item.yAxis != null)
+	            )
+	        ) {
+	            var valueAxis;
+	            var valueDataDim;
+	            var value;
+
+	            if (item.yAxis != null || item.xAxis != null) {
+	                valueDataDim = item.yAxis != null ? 'y' : 'x';
+	                valueAxis = coordSys.getAxis(valueDataDim);
+
+	                value = zrUtil.retrieve(item.yAxis, item.xAxis);
+	            }
+	            else {
+	                var axisInfo = markerHelper.getAxisInfo(item, data, coordSys, seriesModel);
+	                valueDataDim = axisInfo.valueDataDim;
+	                valueAxis = axisInfo.valueAxis;
+	                value = markerHelper.numCalculate(data, valueDataDim, mlType);
+	            }
+	            var valueIndex = valueDataDim === 'x' ? 0 : 1;
+	            var baseIndex = 1 - valueIndex;
+
+	            var mlFrom = zrUtil.clone(item);
+	            var mlTo = {};
+
+	            mlFrom.type = null;
+
+	            mlFrom.coord = [];
+	            mlTo.coord = [];
+	            mlFrom.coord[baseIndex] = -Infinity;
+	            mlTo.coord[baseIndex] = Infinity;
+
+	            var precision = mlModel.get('precision');
+	            if (precision >= 0) {
+	                value = +value.toFixed(precision);
+	            }
+
+	            mlFrom.coord[valueIndex] = mlTo.coord[valueIndex] = value;
+
+	            item = [mlFrom, mlTo, { // Extra option for tooltip and label
+	                type: mlType,
+	                valueIndex: item.valueIndex,
+	                // Force to use the value of calculated value.
+	                value: value
+	            }];
+	        }
+
+	        item = [
+	            markerHelper.dataTransform(seriesModel, item[0]),
+	            markerHelper.dataTransform(seriesModel, item[1]),
+	            zrUtil.extend({}, item[2])
+	        ];
+
+	        // Avoid line data type is extended by from(to) data type
+	        item[2].type = item[2].type || '';
+
+	        // Merge from option and to option into line option
+	        zrUtil.merge(item[2], item[0]);
+	        zrUtil.merge(item[2], item[1]);
+
+	        return item;
+	    };
+
+	    function isInifinity(val) {
+	        return !isNaN(val) && !isFinite(val);
+	    }
+
+	    // If a markLine has one dim
+	    function ifMarkLineHasOnlyDim(dimIndex, fromCoord, toCoord, coordSys) {
+	        var otherDimIndex = 1 - dimIndex;
+	        var dimName = coordSys.dimensions[dimIndex];
+	        return isInifinity(fromCoord[otherDimIndex]) && isInifinity(toCoord[otherDimIndex])
+	            && fromCoord[dimIndex] === toCoord[dimIndex] && coordSys.getAxis(dimName).containData(fromCoord[dimIndex]);
+	    }
+
+	    function markLineFilter(coordSys, item) {
+	        if (coordSys.type === 'cartesian2d') {
+	            var fromCoord = item[0].coord;
+	            var toCoord = item[1].coord;
+	            // In case
+	            // {
+	            //  markLine: {
+	            //    data: [{ yAxis: 2 }]
+	            //  }
+	            // }
+	            if (
+	                fromCoord && toCoord &&
+	                (ifMarkLineHasOnlyDim(1, fromCoord, toCoord, coordSys)
+	                || ifMarkLineHasOnlyDim(0, fromCoord, toCoord, coordSys))
+	            ) {
+	                return true;
+	            }
+	        }
+	        return markerHelper.dataFilter(coordSys, item[0])
+	            && markerHelper.dataFilter(coordSys, item[1]);
+	    }
+
+	    function updateSingleMarkerEndLayout(
+	        data, idx, isFrom, seriesModel, api
+	    ) {
+	        var coordSys = seriesModel.coordinateSystem;
+	        var itemModel = data.getItemModel(idx);
+
+	        var point;
+	        var xPx = numberUtil.parsePercent(itemModel.get('x'), api.getWidth());
+	        var yPx = numberUtil.parsePercent(itemModel.get('y'), api.getHeight());
+	        if (!isNaN(xPx) && !isNaN(yPx)) {
+	            point = [xPx, yPx];
+	        }
+	        else {
+	            // Chart like bar may have there own marker positioning logic
+	            if (seriesModel.getMarkerPosition) {
+	                // Use the getMarkerPoisition
+	                point = seriesModel.getMarkerPosition(
+	                    data.getValues(data.dimensions, idx)
+	                );
+	            }
+	            else {
+	                var dims = coordSys.dimensions;
+	                var x = data.get(dims[0], idx);
+	                var y = data.get(dims[1], idx);
+	                point = coordSys.dataToPoint([x, y]);
+	            }
+	            // Expand line to the edge of grid if value on one axis is Inifnity
+	            // In case
+	            //  markLine: {
+	            //    data: [{
+	            //      yAxis: 2
+	            //      // or
+	            //      type: 'average'
+	            //    }]
+	            //  }
+	            if (coordSys.type === 'cartesian2d') {
+	                var xAxis = coordSys.getAxis('x');
+	                var yAxis = coordSys.getAxis('y');
+	                var dims = coordSys.dimensions;
+	                if (isInifinity(data.get(dims[0], idx))) {
+	                    point[0] = xAxis.toGlobalCoord(xAxis.getExtent()[isFrom ? 0 : 1]);
+	                }
+	                else if (isInifinity(data.get(dims[1], idx))) {
+	                    point[1] = yAxis.toGlobalCoord(yAxis.getExtent()[isFrom ? 0 : 1]);
+	                }
+	            }
+
+	            // Use x, y if has any
+	            if (!isNaN(xPx)) {
+	                point[0] = xPx;
+	            }
+	            if (!isNaN(yPx)) {
+	                point[1] = yPx;
+	            }
+	        }
+
+	        data.setItemLayout(idx, point);
+	    }
+
+	    __webpack_require__(349).extend({
+
+	        type: 'markLine',
+
+	        updateLayout: function (markLineModel, ecModel, api) {
+	            ecModel.eachSeries(function (seriesModel) {
+	                var mlModel = seriesModel.markLineModel;
+	                if (mlModel) {
+	                    var mlData = mlModel.getData();
+	                    var fromData = mlModel.__from;
+	                    var toData = mlModel.__to;
+	                    // Update visual and layout of from symbol and to symbol
+	                    fromData.each(function (idx) {
+	                        updateSingleMarkerEndLayout(fromData, idx, true, seriesModel, api);
+	                        updateSingleMarkerEndLayout(toData, idx, false, seriesModel, api);
+	                    });
+	                    // Update layout of line
+	                    mlData.each(function (idx) {
+	                        mlData.setItemLayout(idx, [
+	                            fromData.getItemLayout(idx),
+	                            toData.getItemLayout(idx)
+	                        ]);
+	                    });
+
+	                    this.markerGroupMap[seriesModel.name].updateLayout();
+
+	                }
+	            }, this);
+	        },
+
+	        renderSeries: function (seriesModel, mlModel, ecModel, api) {
+	            var coordSys = seriesModel.coordinateSystem;
+	            var seriesName = seriesModel.name;
+	            var seriesData = seriesModel.getData();
+
+	            var lineDrawMap = this.markerGroupMap;
+	            var lineDraw = lineDrawMap[seriesName];
+	            if (!lineDraw) {
+	                lineDraw = lineDrawMap[seriesName] = new LineDraw();
+	            }
+	            this.group.add(lineDraw.group);
+
+	            var mlData = createList(coordSys, seriesModel, mlModel);
+
+	            var fromData = mlData.from;
+	            var toData = mlData.to;
+	            var lineData = mlData.line;
+
+	            mlModel.__from = fromData;
+	            mlModel.__to = toData;
+	            // Line data for tooltip and formatter
+	            mlModel.setData(lineData);
+
+	            var symbolType = mlModel.get('symbol');
+	            var symbolSize = mlModel.get('symbolSize');
+	            if (!zrUtil.isArray(symbolType)) {
+	                symbolType = [symbolType, symbolType];
+	            }
+	            if (typeof symbolSize === 'number') {
+	                symbolSize = [symbolSize, symbolSize];
+	            }
+
+	            // Update visual and layout of from symbol and to symbol
+	            mlData.from.each(function (idx) {
+	                updateDataVisualAndLayout(fromData, idx, true);
+	                updateDataVisualAndLayout(toData, idx, false);
+	            });
+
+	            // Update visual and layout of line
+	            lineData.each(function (idx) {
+	                var lineColor = lineData.getItemModel(idx).get('lineStyle.normal.color');
+	                lineData.setItemVisual(idx, {
+	                    color: lineColor || fromData.getItemVisual(idx, 'color')
+	                });
+	                lineData.setItemLayout(idx, [
+	                    fromData.getItemLayout(idx),
+	                    toData.getItemLayout(idx)
+	                ]);
+
+	                lineData.setItemVisual(idx, {
+	                    'fromSymbolSize': fromData.getItemVisual(idx, 'symbolSize'),
+	                    'fromSymbol': fromData.getItemVisual(idx, 'symbol'),
+	                    'toSymbolSize': toData.getItemVisual(idx, 'symbolSize'),
+	                    'toSymbol': toData.getItemVisual(idx, 'symbol')
+	                });
+	            });
+
+	            lineDraw.updateData(lineData);
+
+	            // Set host model for tooltip
+	            // FIXME
+	            mlData.line.eachItemGraphicEl(function (el, idx) {
+	                el.traverse(function (child) {
+	                    child.dataModel = mlModel;
+	                });
+	            });
+
+	            function updateDataVisualAndLayout(data, idx, isFrom) {
+	                var itemModel = data.getItemModel(idx);
+
+	                updateSingleMarkerEndLayout(
+	                    data, idx, isFrom, seriesModel, api
+	                );
+
+	                data.setItemVisual(idx, {
+	                    symbolSize: itemModel.get('symbolSize') || symbolSize[isFrom ? 0 : 1],
+	                    symbol: itemModel.get('symbol', true) || symbolType[isFrom ? 0 : 1],
+	                    color: itemModel.get('itemStyle.normal.color') || seriesData.getVisual('color')
+	                });
+	            }
+
+	            lineDraw.__keep = true;
+
+	            lineDraw.group.silent = mlModel.get('silent') || seriesModel.get('silent');
+	        }
+	    });
+
+	    /**
+	     * @inner
+	     * @param {module:echarts/coord/*} coordSys
+	     * @param {module:echarts/model/Series} seriesModel
+	     * @param {module:echarts/model/Model} mpModel
+	     */
+	    function createList(coordSys, seriesModel, mlModel) {
+
+	        var coordDimsInfos;
+	        if (coordSys) {
+	            coordDimsInfos = zrUtil.map(coordSys && coordSys.dimensions, function (coordDim) {
+	                var info = seriesModel.getData().getDimensionInfo(
+	                    seriesModel.coordDimToDataDim(coordDim)[0]
+	                ) || {}; // In map series data don't have lng and lat dimension. Fallback to same with coordSys
+	                info.name = coordDim;
+	                return info;
+	            });
+	        }
+	        else {
+	            coordDimsInfos =[{
+	                name: 'value',
+	                type: 'float'
+	            }];
+	        }
+
+	        var fromData = new List(coordDimsInfos, mlModel);
+	        var toData = new List(coordDimsInfos, mlModel);
+	        // No dimensions
+	        var lineData = new List([], mlModel);
+
+	        var optData = zrUtil.map(mlModel.get('data'), zrUtil.curry(
+	            markLineTransform, seriesModel, coordSys, mlModel
+	        ));
+	        if (coordSys) {
+	            optData = zrUtil.filter(
+	                optData, zrUtil.curry(markLineFilter, coordSys)
+	            );
+	        }
+	        var dimValueGetter = coordSys ? markerHelper.dimValueGetter : function (item) {
+	            return item.value;
+	        };
+	        fromData.initData(
+	            zrUtil.map(optData, function (item) { return item[0]; }),
+	            null, dimValueGetter
+	        );
+	        toData.initData(
+	            zrUtil.map(optData, function (item) { return item[1]; }),
+	            null, dimValueGetter
+	        );
+	        lineData.initData(
+	            zrUtil.map(optData, function (item) { return item[2]; })
+	        );
+	        lineData.hasItemOption = true;
+	        return {
+	            from: fromData,
+	            to: toData,
+	            line: lineData
+	        };
+	    }
+
+
+/***/ },
+/* 353 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    __webpack_require__(354);
+	    __webpack_require__(355);
+
+	    __webpack_require__(1).registerPreprocessor(function (opt) {
+	        // Make sure markArea component is enabled
+	        opt.markArea = opt.markArea || {};
+	    });
+
+
+/***/ },
+/* 354 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    module.exports = __webpack_require__(346).extend({
+
+	        type: 'markArea',
+
+	        defaultOption: {
+	            zlevel: 0,
+	            // PENDING
+	            z: 1,
+	            tooltip: {
+	                trigger: 'item'
+	            },
+	            // markArea should fixed on the coordinate system
+	            animation: false,
+	            label: {
+	                normal: {
+	                    show: true,
+	                    position: 'top'
+	                },
+	                emphasis: {
+	                    show: true,
+	                    position: 'top'
+	                }
+	            },
+	            itemStyle: {
+	                normal: {
+	                    // color and borderColor default to use color from series
+	                    // color: 'auto'
+	                    // borderColor: 'auto'
+	                    borderWidth: 0
+	                }
+	            }
+	        }
+	    });
+
+
+/***/ },
+/* 355 */
+/***/ function(module, exports, __webpack_require__) {
+
+	// TODO Better on polar
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var List = __webpack_require__(97);
+	    var numberUtil = __webpack_require__(7);
+	    var graphic = __webpack_require__(43);
+	    var colorUtil = __webpack_require__(39);
+
+	    var markerHelper = __webpack_require__(348);
+
+	    var markAreaTransform = function (seriesModel, coordSys, maModel, item) {
+	        var lt = markerHelper.dataTransform(seriesModel, item[0]);
+	        var rb = markerHelper.dataTransform(seriesModel, item[1]);
+	        var retrieve = zrUtil.retrieve;
+
+	        // FIXME make sure lt is less than rb
+	        var ltCoord = lt.coord;
+	        var rbCoord = rb.coord;
+	        ltCoord[0] = retrieve(ltCoord[0], -Infinity);
+	        ltCoord[1] = retrieve(ltCoord[1], -Infinity);
+
+	        rbCoord[0] = retrieve(rbCoord[0], Infinity);
+	        rbCoord[1] = retrieve(rbCoord[1], Infinity);
+
+	        // Merge option into one
+	        var result = zrUtil.mergeAll([{}, lt, rb]);
+
+	        result.coord = [
+	            lt.coord, rb.coord
+	        ];
+	        result.x0 = lt.x;
+	        result.y0 = lt.y;
+	        result.x1 = rb.x;
+	        result.y1 = rb.y;
+	        return result;
+	    };
+
+	    function isInifinity(val) {
+	        return !isNaN(val) && !isFinite(val);
+	    }
+
+	    // If a markArea has one dim
+	    function ifMarkLineHasOnlyDim(dimIndex, fromCoord, toCoord, coordSys) {
+	        var otherDimIndex = 1 - dimIndex;
+	        return isInifinity(fromCoord[otherDimIndex]) && isInifinity(toCoord[otherDimIndex]);
+	    }
+
+	    function markAreaFilter(coordSys, item) {
+	        var fromCoord = item.coord[0];
+	        var toCoord = item.coord[1];
+	        if (coordSys.type === 'cartesian2d') {
+	            // In case
+	            // {
+	            //  markArea: {
+	            //    data: [{ yAxis: 2 }]
+	            //  }
+	            // }
+	            if (
+	                fromCoord && toCoord &&
+	                (ifMarkLineHasOnlyDim(1, fromCoord, toCoord, coordSys)
+	                || ifMarkLineHasOnlyDim(0, fromCoord, toCoord, coordSys))
+	            ) {
+	                return true;
+	            }
+	        }
+	        return markerHelper.dataFilter(coordSys, {
+	                coord: fromCoord,
+	                x: item.x0,
+	                y: item.y0
+	            })
+	            || markerHelper.dataFilter(coordSys, {
+	                coord: toCoord,
+	                x: item.x1,
+	                y: item.y1
+	            });
+	    }
+
+	    // dims can be ['x0', 'y0'], ['x1', 'y1'], ['x0', 'y1'], ['x1', 'y0']
+	    function getSingleMarkerEndPoint(data, idx, dims, seriesModel, api) {
+	        var coordSys = seriesModel.coordinateSystem;
+	        var itemModel = data.getItemModel(idx);
+
+	        var point;
+	        var xPx = numberUtil.parsePercent(itemModel.get(dims[0]), api.getWidth());
+	        var yPx = numberUtil.parsePercent(itemModel.get(dims[1]), api.getHeight());
+	        if (!isNaN(xPx) && !isNaN(yPx)) {
+	            point = [xPx, yPx];
+	        }
+	        else {
+	            // Chart like bar may have there own marker positioning logic
+	            if (seriesModel.getMarkerPosition) {
+	                // Use the getMarkerPoisition
+	                point = seriesModel.getMarkerPosition(
+	                    data.getValues(dims, idx)
+	                );
+	            }
+	            else {
+	                var x = data.get(dims[0], idx);
+	                var y = data.get(dims[1], idx);
+	                point = coordSys.dataToPoint([x, y], true);
+	            }
+	            if (coordSys.type === 'cartesian2d') {
+	                var xAxis = coordSys.getAxis('x');
+	                var yAxis = coordSys.getAxis('y');
+	                var x = data.get(dims[0], idx);
+	                var y = data.get(dims[1], idx);
+	                if (isInifinity(x)) {
+	                    point[0] = xAxis.toGlobalCoord(xAxis.getExtent()[dims[0] === 'x0' ? 0 : 1]);
+	                }
+	                else if (isInifinity(y)) {
+	                    point[1] = yAxis.toGlobalCoord(yAxis.getExtent()[dims[1] === 'y0' ? 0 : 1]);
+	                }
+	            }
+
+	            // Use x, y if has any
+	            if (!isNaN(xPx)) {
+	                point[0] = xPx;
+	            }
+	            if (!isNaN(yPx)) {
+	                point[1] = yPx;
+	            }
+	        }
+
+	        return point;
+	    }
+
+	    var dimPermutations = [['x0', 'y0'], ['x1', 'y0'], ['x1', 'y1'], ['x0', 'y1']];
+
+	    __webpack_require__(349).extend({
+
+	        type: 'markArea',
+
+	        updateLayout: function (markAreaModel, ecModel, api) {
+	            ecModel.eachSeries(function (seriesModel) {
+	                var maModel = seriesModel.markAreaModel;
+	                if (maModel) {
+	                    var areaData = maModel.getData();
+	                    areaData.each(function (idx) {
+	                        var points = zrUtil.map(dimPermutations, function (dim) {
+	                            return getSingleMarkerEndPoint(areaData, idx, dim, seriesModel, api);
+	                        });
+	                        // Layout
+	                        areaData.setItemLayout(idx, points);
+	                        var el = areaData.getItemGraphicEl(idx);
+	                        el.setShape('points', points);
+	                    });
+	                }
+	            }, this);
+	        },
+
+	        renderSeries: function (seriesModel, maModel, ecModel, api) {
+	            var coordSys = seriesModel.coordinateSystem;
+	            var seriesName = seriesModel.name;
+	            var seriesData = seriesModel.getData();
+
+	            var areaGroupMap = this.markerGroupMap;
+	            var polygonGroup = areaGroupMap[seriesName];
+	            if (!polygonGroup) {
+	                polygonGroup = areaGroupMap[seriesName] = {
+	                    group: new graphic.Group()
+	                };
+	            }
+	            this.group.add(polygonGroup.group);
+	            polygonGroup.__keep = true;
+
+	            var areaData = createList(coordSys, seriesModel, maModel);
+
+	            // Line data for tooltip and formatter
+	            maModel.setData(areaData);
+
+	            // Update visual and layout of line
+	            areaData.each(function (idx) {
+	                // Layout
+	                areaData.setItemLayout(idx, zrUtil.map(dimPermutations, function (dim) {
+	                    return getSingleMarkerEndPoint(areaData, idx, dim, seriesModel, api);
+	                }));
+
+	                // Visual
+	                areaData.setItemVisual(idx, {
+	                    color: seriesData.getVisual('color')
+	                });
+	            });
+
+
+	            areaData.diff(polygonGroup.__data)
+	                .add(function (idx) {
+	                    var polygon = new graphic.Polygon({
+	                        shape: {
+	                            points: areaData.getItemLayout(idx)
+	                        }
+	                    });
+	                    areaData.setItemGraphicEl(idx, polygon);
+	                    polygonGroup.group.add(polygon);
+	                })
+	                .update(function (newIdx, oldIdx) {
+	                    var polygon = polygonGroup.__data.getItemGraphicEl(oldIdx);
+	                    graphic.updateProps(polygon, {
+	                        shape: {
+	                            points: areaData.getItemLayout(newIdx)
+	                        }
+	                    }, maModel, newIdx);
+	                    polygonGroup.group.add(polygon);
+	                    areaData.setItemGraphicEl(newIdx, polygon);
+	                })
+	                .remove(function (idx) {
+	                    var polygon = polygonGroup.__data.getItemGraphicEl(idx);
+	                    polygonGroup.group.remove(polygon);
+	                })
+	                .execute();
+
+	            areaData.eachItemGraphicEl(function (polygon, idx) {
+	                var itemModel = areaData.getItemModel(idx);
+	                var labelModel = itemModel.getModel('label.normal');
+	                var labelHoverModel = itemModel.getModel('label.emphasis');
+	                var color = areaData.getItemVisual(idx, 'color');
+	                polygon.useStyle(
+	                    zrUtil.defaults(
+	                        itemModel.getModel('itemStyle.normal').getItemStyle(),
+	                        {
+	                            fill: colorUtil.modifyAlpha(color, 0.4),
+	                            stroke: color
+	                        }
+	                    )
+	                );
+
+	                polygon.hoverStyle = itemModel.getModel('itemStyle.normal').getItemStyle();
+
+	                var defaultValue = areaData.getName(idx) || '';
+	                var textColor = color || polygon.style.fill;
+	                graphic.setText(polygon.style, labelModel, textColor);
+	                polygon.style.text = zrUtil.retrieve(
+	                    maModel.getFormattedLabel(idx, 'normal'),
+	                    defaultValue
+	                );
+
+	                graphic.setText(polygon.hoverStyle, labelHoverModel, textColor);
+	                polygon.hoverStyle.text = zrUtil.retrieve(
+	                    maModel.getFormattedLabel(idx, 'emphasis'),
+	                    defaultValue
+	                );
+
+	                graphic.setHoverStyle(polygon, {});
+
+	                polygon.dataModel = maModel;
+	            });
+
+	            polygonGroup.__data = areaData;
+
+	            polygonGroup.group.silent = maModel.get('silent') || seriesModel.get('silent');
+	        }
+	    });
+
+	    /**
+	     * @inner
+	     * @param {module:echarts/coord/*} coordSys
+	     * @param {module:echarts/model/Series} seriesModel
+	     * @param {module:echarts/model/Model} mpModel
+	     */
+	    function createList(coordSys, seriesModel, maModel) {
+
+	        var coordDimsInfos;
+	        var areaData;
+	        var dims = ['x0', 'y0', 'x1', 'y1'];
+	        if (coordSys) {
+	            coordDimsInfos = zrUtil.map(coordSys && coordSys.dimensions, function (coordDim) {
+	                var info = seriesModel.getData().getDimensionInfo(
+	                    seriesModel.coordDimToDataDim(coordDim)[0]
+	                ) || {}; // In map series data don't have lng and lat dimension. Fallback to same with coordSys
+	                info.name = coordDim;
+	                return info;
+	            });
+	            areaData = new List(zrUtil.map(dims, function (dim, idx) {
+	                return {
+	                    name: dim,
+	                    type: coordDimsInfos[idx % 2].type
+	                };
+	            }), maModel);
+	        }
+	        else {
+	            coordDimsInfos =[{
+	                name: 'value',
+	                type: 'float'
+	            }];
+	            areaData = new List(coordDimsInfos, maModel);
+	        }
+
+	        var optData = zrUtil.map(maModel.get('data'), zrUtil.curry(
+	            markAreaTransform, seriesModel, coordSys, maModel
+	        ));
+	        if (coordSys) {
+	            optData = zrUtil.filter(
+	                optData, zrUtil.curry(markAreaFilter, coordSys)
+	            );
+	        }
+
+	        var dimValueGetter = coordSys ? function (item, dimName, dataIndex, dimIndex) {
+	            return item.coord[Math.floor(dimIndex / 2)][dimIndex % 2];
+	        } : function (item) {
+	            return item.value;
+	        };
+	        areaData.initData(optData, null, dimValueGetter);
+	        areaData.hasItemOption = true;
+	        return areaData;
+	    }
+
+
+/***/ },
+/* 356 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * DataZoom component entry
+	 */
+
+
+	    var echarts = __webpack_require__(1);
+
+	    echarts.registerPreprocessor(__webpack_require__(357));
+
+	    __webpack_require__(358);
+	    __webpack_require__(359);
+	    __webpack_require__(360);
+	    __webpack_require__(362);
+
+
+
+/***/ },
+/* 357 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @file Timeline preprocessor
+	 */
+
+
+	    var zrUtil = __webpack_require__(4);
+
+	    module.exports = function (option) {
+	        var timelineOpt = option && option.timeline;
+
+	        if (!zrUtil.isArray(timelineOpt)) {
+	            timelineOpt = timelineOpt ? [timelineOpt] : [];
+	        }
+
+	        zrUtil.each(timelineOpt, function (opt) {
+	            if (!opt) {
+	                return;
+	            }
+
+	            compatibleEC2(opt);
+	        });
+	    };
+
+	    function compatibleEC2(opt) {
+	        var type = opt.type;
+
+	        var ec2Types = {'number': 'value', 'time': 'time'};
+
+	        // Compatible with ec2
+	        if (ec2Types[type]) {
+	            opt.axisType = ec2Types[type];
+	            delete opt.type;
+	        }
+
+	        transferItem(opt);
+
+	        if (has(opt, 'controlPosition')) {
+	            var controlStyle = opt.controlStyle || (opt.controlStyle = {});
+	            if (!has(controlStyle, 'position')) {
+	                controlStyle.position = opt.controlPosition;
+	            }
+	            if (controlStyle.position === 'none' && !has(controlStyle, 'show')) {
+	                controlStyle.show = false;
+	                delete controlStyle.position;
+	            }
+	            delete opt.controlPosition;
+	        }
+
+	        zrUtil.each(opt.data || [], function (dataItem) {
+	            if (zrUtil.isObject(dataItem) && !zrUtil.isArray(dataItem)) {
+	                if (!has(dataItem, 'value') && has(dataItem, 'name')) {
+	                    // In ec2, using name as value.
+	                    dataItem.value = dataItem.name;
+	                }
+	                transferItem(dataItem);
+	            }
+	        });
+	    }
+
+	    function transferItem(opt) {
+	        var itemStyle = opt.itemStyle || (opt.itemStyle = {});
+
+	        var itemStyleEmphasis = itemStyle.emphasis || (itemStyle.emphasis = {});
+
+	        // Transfer label out
+	        var label = opt.label || (opt.label || {});
+	        var labelNormal = label.normal || (label.normal = {});
+	        var excludeLabelAttr = {normal: 1, emphasis: 1};
+
+	        zrUtil.each(label, function (value, name) {
+	            if (!excludeLabelAttr[name] && !has(labelNormal, name)) {
+	                labelNormal[name] = value;
+	            }
+	        });
+
+	        if (itemStyleEmphasis.label && !has(label, 'emphasis')) {
+	            label.emphasis = itemStyleEmphasis.label;
+	            delete itemStyleEmphasis.label;
+	        }
+	    }
+
+	    function has(obj, attr) {
+	        return obj.hasOwnProperty(attr);
+	    }
+
+
+
+/***/ },
+/* 358 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    __webpack_require__(19).registerSubTypeDefaulter('timeline', function () {
+	        // Only slider now.
+	        return 'slider';
+	    });
+
+
+
+/***/ },
+/* 359 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @file Timeilne action
+	 */
+
+
+	    var echarts = __webpack_require__(1);
+
+	    echarts.registerAction(
+
+	        {type: 'timelineChange', event: 'timelineChanged', update: 'prepareAndUpdate'},
+
+	        function (payload, ecModel) {
+
+	            var timelineModel = ecModel.getComponent('timeline');
+	            if (timelineModel && payload.currentIndex != null) {
+	                timelineModel.setCurrentIndex(payload.currentIndex);
+
+	                if (!timelineModel.get('loop', true) && timelineModel.isIndexMax()) {
+	                    timelineModel.setPlayState(false);
+	                }
+	            }
+
+	            ecModel.resetOption('timeline');
+	        }
+	    );
+
+	    echarts.registerAction(
+
+	        {type: 'timelinePlayChange', event: 'timelinePlayChanged', update: 'update'},
+
+	        function (payload, ecModel) {
+	            var timelineModel = ecModel.getComponent('timeline');
+	            if (timelineModel && payload.playState != null) {
+	                timelineModel.setPlayState(payload.playState);
+	            }
+	        }
+	    );
+
+
+
+/***/ },
+/* 360 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @file Silder timeline model
+	 */
+
+
+	    var TimelineModel = __webpack_require__(361);
+	    var zrUtil = __webpack_require__(4);
+	    var modelUtil = __webpack_require__(5);
+
+	    var SliderTimelineModel = TimelineModel.extend({
+
+	        type: 'timeline.slider',
+
+	        /**
+	         * @protected
+	         */
+	        defaultOption: {
+
+	            backgroundColor: 'rgba(0,0,0,0)',   // 时间轴背景颜色
+	            borderColor: '#ccc',               // 时间轴边框颜色
+	            borderWidth: 0,                    // 时间轴边框线宽，单位px，默认为0（无边框）
+
+	            orient: 'horizontal',              // 'vertical'
+	            inverse: false,
+
+	            tooltip: {                          // boolean or Object
+	                trigger: 'item'                 // data item may also have tootip attr.
+	            },
+
+	            symbol: 'emptyCircle',
+	            symbolSize: 10,
+
+	            lineStyle: {
+	                show: true,
+	                width: 2,
+	                color: '#304654'
+	            },
+	            label: {                            // 文本标签
+	                position: 'auto',           // auto left right top bottom
+	                                            // When using number, label position is not
+	                                            // restricted by viewRect.
+	                                            // positive: right/bottom, negative: left/top
+	                normal: {
+	                    show: true,
+	                    interval: 'auto',
+	                    rotate: 0,
+	                    // formatter: null,
+	                    textStyle: {                // 其余属性默认使用全局文本样式，详见TEXTSTYLE
+	                        color: '#304654'
+	                    }
+	                },
+	                emphasis: {
+	                    show: true,
+	                    textStyle: {                // 其余属性默认使用全局文本样式，详见TEXTSTYLE
+	                        color: '#c23531'
+	                    }
+	                }
+	            },
+	            itemStyle: {
+	                normal: {
+	                    color: '#304654',
+	                    borderWidth: 1
+	                },
+	                emphasis: {
+	                    color: '#c23531'
+	                }
+	            },
+
+	            checkpointStyle: {
+	                symbol: 'circle',
+	                symbolSize: 13,
+	                color: '#c23531',
+	                borderWidth: 5,
+	                borderColor: 'rgba(194,53,49, 0.5)',
+	                animation: true,
+	                animationDuration: 300,
+	                animationEasing: 'quinticInOut'
+	            },
+
+	            controlStyle: {
+	                show: true,
+	                showPlayBtn: true,
+	                showPrevBtn: true,
+	                showNextBtn: true,
+	                itemSize: 22,
+	                itemGap: 12,
+	                position: 'left',  // 'left' 'right' 'top' 'bottom'
+	                playIcon: 'path://M31.6,53C17.5,53,6,41.5,6,27.4S17.5,1.8,31.6,1.8C45.7,1.8,57.2,13.3,57.2,27.4S45.7,53,31.6,53z M31.6,3.3 C18.4,3.3,7.5,14.1,7.5,27.4c0,13.3,10.8,24.1,24.1,24.1C44.9,51.5,55.7,40.7,55.7,27.4C55.7,14.1,44.9,3.3,31.6,3.3z M24.9,21.3 c0-2.2,1.6-3.1,3.5-2l10.5,6.1c1.899,1.1,1.899,2.9,0,4l-10.5,6.1c-1.9,1.1-3.5,0.2-3.5-2V21.3z', // jshint ignore:line
+	                stopIcon: 'path://M30.9,53.2C16.8,53.2,5.3,41.7,5.3,27.6S16.8,2,30.9,2C45,2,56.4,13.5,56.4,27.6S45,53.2,30.9,53.2z M30.9,3.5C17.6,3.5,6.8,14.4,6.8,27.6c0,13.3,10.8,24.1,24.101,24.1C44.2,51.7,55,40.9,55,27.6C54.9,14.4,44.1,3.5,30.9,3.5z M36.9,35.8c0,0.601-0.4,1-0.9,1h-1.3c-0.5,0-0.9-0.399-0.9-1V19.5c0-0.6,0.4-1,0.9-1H36c0.5,0,0.9,0.4,0.9,1V35.8z M27.8,35.8 c0,0.601-0.4,1-0.9,1h-1.3c-0.5,0-0.9-0.399-0.9-1V19.5c0-0.6,0.4-1,0.9-1H27c0.5,0,0.9,0.4,0.9,1L27.8,35.8L27.8,35.8z', // jshint ignore:line
+	                nextIcon: 'path://M18.6,50.8l22.5-22.5c0.2-0.2,0.3-0.4,0.3-0.7c0-0.3-0.1-0.5-0.3-0.7L18.7,4.4c-0.1-0.1-0.2-0.3-0.2-0.5 c0-0.4,0.3-0.8,0.8-0.8c0.2,0,0.5,0.1,0.6,0.3l23.5,23.5l0,0c0.2,0.2,0.3,0.4,0.3,0.7c0,0.3-0.1,0.5-0.3,0.7l-0.1,0.1L19.7,52 c-0.1,0.1-0.3,0.2-0.5,0.2c-0.4,0-0.8-0.3-0.8-0.8C18.4,51.2,18.5,51,18.6,50.8z', // jshint ignore:line
+	                prevIcon: 'path://M43,52.8L20.4,30.3c-0.2-0.2-0.3-0.4-0.3-0.7c0-0.3,0.1-0.5,0.3-0.7L42.9,6.4c0.1-0.1,0.2-0.3,0.2-0.5 c0-0.4-0.3-0.8-0.8-0.8c-0.2,0-0.5,0.1-0.6,0.3L18.3,28.8l0,0c-0.2,0.2-0.3,0.4-0.3,0.7c0,0.3,0.1,0.5,0.3,0.7l0.1,0.1L41.9,54 c0.1,0.1,0.3,0.2,0.5,0.2c0.4,0,0.8-0.3,0.8-0.8C43.2,53.2,43.1,53,43,52.8z', // jshint ignore:line
+	                normal: {
+	                    color: '#304654',
+	                    borderColor: '#304654',
+	                    borderWidth: 1
+	                },
+	                emphasis: {
+	                    color: '#c23531',
+	                    borderColor: '#c23531',
+	                    borderWidth: 2
+	                }
+	            },
+	            data: []
+	        }
+
+	    });
+
+	    zrUtil.mixin(SliderTimelineModel, modelUtil.dataFormatMixin);
+
+	    module.exports = SliderTimelineModel;
+
+
+/***/ },
+/* 361 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @file Timeline model
+	 */
+
+
+	    var ComponentModel = __webpack_require__(19);
+	    var List = __webpack_require__(97);
+	    var zrUtil = __webpack_require__(4);
+	    var modelUtil = __webpack_require__(5);
+
+	    var TimelineModel = ComponentModel.extend({
+
+	        type: 'timeline',
+
+	        layoutMode: 'box',
+
+	        /**
+	         * @protected
+	         */
+	        defaultOption: {
+
+	            zlevel: 0,                  // 一级层叠
+	            z: 4,                       // 二级层叠
+	            show: true,
+
+	            axisType: 'time',  // 模式是时间类型，支持 value, category
+
+	            realtime: true,
+
+	            left: '20%',
+	            top: null,
+	            right: '20%',
+	            bottom: 0,
+	            width: null,
+	            height: 40,
+	            padding: 5,
+
+	            controlPosition: 'left',           // 'left' 'right' 'top' 'bottom' 'none'
+	            autoPlay: false,
+	            rewind: false,                     // 反向播放
+	            loop: true,
+	            playInterval: 2000,                // 播放时间间隔，单位ms
+
+	            currentIndex: 0,
+
+	            itemStyle: {
+	                normal: {},
+	                emphasis: {}
+	            },
+	            label: {
+	                normal: {
+	                    textStyle: {
+	                        color: '#000'
+	                    }
+	                },
+	                emphasis: {}
+	            },
+
+	            data: []
+	        },
+
+	        /**
+	         * @override
+	         */
+	        init: function (option, parentModel, ecModel) {
+
+	            /**
+	             * @private
+	             * @type {module:echarts/data/List}
+	             */
+	            this._data;
+
+	            /**
+	             * @private
+	             * @type {Array.<string>}
+	             */
+	            this._names;
+
+	            this.mergeDefaultAndTheme(option, ecModel);
+	            this._initData();
+	        },
+
+	        /**
+	         * @override
+	         */
+	        mergeOption: function (option) {
+	            TimelineModel.superApply(this, 'mergeOption', arguments);
+	            this._initData();
+	        },
+
+	        /**
+	         * @param {number} [currentIndex]
+	         */
+	        setCurrentIndex: function (currentIndex) {
+	            if (currentIndex == null) {
+	                currentIndex = this.option.currentIndex;
+	            }
+	            var count = this._data.count();
+
+	            if (this.option.loop) {
+	                currentIndex = (currentIndex % count + count) % count;
+	            }
+	            else {
+	                currentIndex >= count && (currentIndex = count - 1);
+	                currentIndex < 0 && (currentIndex = 0);
+	            }
+
+	            this.option.currentIndex = currentIndex;
+	        },
+
+	        /**
+	         * @return {number} currentIndex
+	         */
+	        getCurrentIndex: function () {
+	            return this.option.currentIndex;
+	        },
+
+	        /**
+	         * @return {boolean}
+	         */
+	        isIndexMax: function () {
+	            return this.getCurrentIndex() >= this._data.count() - 1;
+	        },
+
+	        /**
+	         * @param {boolean} state true: play, false: stop
+	         */
+	        setPlayState: function (state) {
+	            this.option.autoPlay = !!state;
+	        },
+
+	        /**
+	         * @return {boolean} true: play, false: stop
+	         */
+	        getPlayState: function () {
+	            return !!this.option.autoPlay;
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _initData: function () {
+	            var thisOption = this.option;
+	            var dataArr = thisOption.data || [];
+	            var axisType = thisOption.axisType;
+	            var names = this._names = [];
+
+	            if (axisType === 'category') {
+	                var idxArr = [];
+	                zrUtil.each(dataArr, function (item, index) {
+	                    var value = modelUtil.getDataItemValue(item);
+	                    var newItem;
+
+	                    if (zrUtil.isObject(item)) {
+	                        newItem = zrUtil.clone(item);
+	                        newItem.value = index;
+	                    }
+	                    else {
+	                        newItem = index;
+	                    }
+
+	                    idxArr.push(newItem);
+
+	                    if (!zrUtil.isString(value) && (value == null || isNaN(value))) {
+	                        value = '';
+	                    }
+
+	                    names.push(value + '');
+	                });
+	                dataArr = idxArr;
+	            }
+
+	            var dimType = ({category: 'ordinal', time: 'time'})[axisType] || 'number';
+
+	            var data = this._data = new List([{name: 'value', type: dimType}], this);
+
+	            data.initData(dataArr, names);
+	        },
+
+	        getData: function () {
+	            return this._data;
+	        },
+
+	        /**
+	         * @public
+	         * @return {Array.<string>} categoreis
+	         */
+	        getCategories: function () {
+	            if (this.get('axisType') === 'category') {
+	                return this._names.slice();
+	            }
+	        }
+
+	    });
+
+	    module.exports = TimelineModel;
+
+
+/***/ },
+/* 362 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @file Silder timeline view
+	 */
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var graphic = __webpack_require__(43);
+	    var layout = __webpack_require__(21);
+	    var TimelineView = __webpack_require__(363);
+	    var TimelineAxis = __webpack_require__(364);
+	    var symbolUtil = __webpack_require__(106);
+	    var axisHelper = __webpack_require__(114);
+	    var BoundingRect = __webpack_require__(9);
+	    var matrix = __webpack_require__(11);
+	    var numberUtil = __webpack_require__(7);
+	    var formatUtil = __webpack_require__(6);
+	    var encodeHTML = formatUtil.encodeHTML;
+
+	    var bind = zrUtil.bind;
+	    var each = zrUtil.each;
+
+	    var PI = Math.PI;
+
+	    module.exports = TimelineView.extend({
+
+	        type: 'timeline.slider',
+
+	        init: function (ecModel, api) {
+
+	            this.api = api;
+
+	            /**
+	             * @private
+	             * @type {module:echarts/component/timeline/TimelineAxis}
+	             */
+	            this._axis;
+
+	            /**
+	             * @private
+	             * @type {module:zrender/core/BoundingRect}
+	             */
+	            this._viewRect;
+
+	            /**
+	             * @type {number}
+	             */
+	            this._timer;
+
+	            /**
+	             * @type {module:zrende/Element}
+	             */
+	            this._currentPointer;
+
+	            /**
+	             * @type {module:zrender/container/Group}
+	             */
+	            this._mainGroup;
+
+	            /**
+	             * @type {module:zrender/container/Group}
+	             */
+	            this._labelGroup;
+	        },
+
+	        /**
+	         * @override
+	         */
+	        render: function (timelineModel, ecModel, api, payload) {
+	            this.model = timelineModel;
+	            this.api = api;
+	            this.ecModel = ecModel;
+
+	            this.group.removeAll();
+
+	            if (timelineModel.get('show', true)) {
+
+	                var layoutInfo = this._layout(timelineModel, api);
+	                var mainGroup = this._createGroup('mainGroup');
+	                var labelGroup = this._createGroup('labelGroup');
+
+	                /**
+	                 * @private
+	                 * @type {module:echarts/component/timeline/TimelineAxis}
+	                 */
+	                var axis = this._axis = this._createAxis(layoutInfo, timelineModel);
+
+	                timelineModel.formatTooltip = function (dataIndex) {
+	                    return encodeHTML(axis.scale.getLabel(dataIndex));
+	                };
+
+	                each(
+	                    ['AxisLine', 'AxisTick', 'Control', 'CurrentPointer'],
+	                    function (name) {
+	                        this['_render' + name](layoutInfo, mainGroup, axis, timelineModel);
+	                    },
+	                    this
+	                );
+
+	                this._renderAxisLabel(layoutInfo, labelGroup, axis, timelineModel);
+
+	                this._position(layoutInfo, timelineModel);
+	            }
+
+	            this._doPlayStop();
+	        },
+
+	        /**
+	         * @override
+	         */
+	        remove: function () {
+	            this._clearTimer();
+	            this.group.removeAll();
+	        },
+
+	        /**
+	         * @override
+	         */
+	        dispose: function () {
+	            this._clearTimer();
+	        },
+
+	        _layout: function (timelineModel, api) {
+	            var labelPosOpt = timelineModel.get('label.normal.position');
+	            var orient = timelineModel.get('orient');
+	            var viewRect = getViewRect(timelineModel, api);
+	            // Auto label offset.
+	            if (labelPosOpt == null || labelPosOpt === 'auto') {
+	                labelPosOpt = orient === 'horizontal'
+	                    ? ((viewRect.y + viewRect.height / 2) < api.getHeight() / 2 ? '-' : '+')
+	                    : ((viewRect.x + viewRect.width / 2) < api.getWidth() / 2 ? '+' : '-');
+	            }
+	            else if (isNaN(labelPosOpt)) {
+	                labelPosOpt = ({
+	                    horizontal: {top: '-', bottom: '+'},
+	                    vertical: {left: '-', right: '+'}
+	                })[orient][labelPosOpt];
+	            }
+
+	            // FIXME
+	            // 暂没有实现用户传入
+	            // var labelAlign = timelineModel.get('label.normal.textStyle.align');
+	            // var labelBaseline = timelineModel.get('label.normal.textStyle.baseline');
+	            var labelAlignMap = {
+	                horizontal: 'center',
+	                vertical: (labelPosOpt >= 0 || labelPosOpt === '+') ? 'left' : 'right'
+	            };
+
+	            var labelBaselineMap = {
+	                horizontal: (labelPosOpt >= 0 || labelPosOpt === '+') ? 'top' : 'bottom',
+	                vertical: 'middle'
+	            };
+	            var rotationMap = {
+	                horizontal: 0,
+	                vertical: PI / 2
+	            };
+
+	            // Position
+	            var mainLength = orient === 'vertical' ? viewRect.height : viewRect.width;
+
+	            var controlModel = timelineModel.getModel('controlStyle');
+	            var showControl = controlModel.get('show');
+	            var controlSize = showControl ? controlModel.get('itemSize') : 0;
+	            var controlGap = showControl ? controlModel.get('itemGap') : 0;
+	            var sizePlusGap = controlSize + controlGap;
+
+	            // Special label rotate.
+	            var labelRotation = timelineModel.get('label.normal.rotate') || 0;
+	            labelRotation = labelRotation * PI / 180; // To radian.
+
+	            var playPosition;
+	            var prevBtnPosition;
+	            var nextBtnPosition;
+	            var axisExtent;
+	            var controlPosition = controlModel.get('position', true);
+	            var showControl = controlModel.get('show', true);
+	            var showPlayBtn = showControl && controlModel.get('showPlayBtn', true);
+	            var showPrevBtn = showControl && controlModel.get('showPrevBtn', true);
+	            var showNextBtn = showControl && controlModel.get('showNextBtn', true);
+	            var xLeft = 0;
+	            var xRight = mainLength;
+
+	            // position[0] means left, position[1] means middle.
+	            if (controlPosition === 'left' || controlPosition === 'bottom') {
+	                showPlayBtn && (playPosition = [0, 0], xLeft += sizePlusGap);
+	                showPrevBtn && (prevBtnPosition = [xLeft, 0], xLeft += sizePlusGap);
+	                showNextBtn && (nextBtnPosition = [xRight - controlSize, 0], xRight -= sizePlusGap);
+	            }
+	            else { // 'top' 'right'
+	                showPlayBtn && (playPosition = [xRight - controlSize, 0], xRight -= sizePlusGap);
+	                showPrevBtn && (prevBtnPosition = [0, 0], xLeft += sizePlusGap);
+	                showNextBtn && (nextBtnPosition = [xRight - controlSize, 0], xRight -= sizePlusGap);
+	            }
+	            axisExtent = [xLeft, xRight];
+
+	            if (timelineModel.get('inverse')) {
+	                axisExtent.reverse();
+	            }
+
+	            return {
+	                viewRect: viewRect,
+	                mainLength: mainLength,
+	                orient: orient,
+
+	                rotation: rotationMap[orient],
+	                labelRotation: labelRotation,
+	                labelPosOpt: labelPosOpt,
+	                labelAlign: labelAlignMap[orient],
+	                labelBaseline: labelBaselineMap[orient],
+
+	                // Based on mainGroup.
+	                playPosition: playPosition,
+	                prevBtnPosition: prevBtnPosition,
+	                nextBtnPosition: nextBtnPosition,
+	                axisExtent: axisExtent,
+
+	                controlSize: controlSize,
+	                controlGap: controlGap
+	            };
+	        },
+
+	        _position: function (layoutInfo, timelineModel) {
+	            // Position is be called finally, because bounding rect is needed for
+	            // adapt content to fill viewRect (auto adapt offset).
+
+	            // Timeline may be not all in the viewRect when 'offset' is specified
+	            // as a number, because it is more appropriate that label aligns at
+	            // 'offset' but not the other edge defined by viewRect.
+
+	            var mainGroup = this._mainGroup;
+	            var labelGroup = this._labelGroup;
+
+	            var viewRect = layoutInfo.viewRect;
+	            if (layoutInfo.orient === 'vertical') {
+	                // transfrom to horizontal, inverse rotate by left-top point.
+	                var m = matrix.create();
+	                var rotateOriginX = viewRect.x;
+	                var rotateOriginY = viewRect.y + viewRect.height;
+	                matrix.translate(m, m, [-rotateOriginX, -rotateOriginY]);
+	                matrix.rotate(m, m, -PI / 2);
+	                matrix.translate(m, m, [rotateOriginX, rotateOriginY]);
+	                viewRect = viewRect.clone();
+	                viewRect.applyTransform(m);
+	            }
+
+	            var viewBound = getBound(viewRect);
+	            var mainBound = getBound(mainGroup.getBoundingRect());
+	            var labelBound = getBound(labelGroup.getBoundingRect());
+
+	            var mainPosition = mainGroup.position;
+	            var labelsPosition = labelGroup.position;
+
+	            labelsPosition[0] = mainPosition[0] = viewBound[0][0];
+
+	            var labelPosOpt = layoutInfo.labelPosOpt;
+
+	            if (isNaN(labelPosOpt)) { // '+' or '-'
+	                var mainBoundIdx = labelPosOpt === '+' ? 0 : 1;
+	                toBound(mainPosition, mainBound, viewBound, 1, mainBoundIdx);
+	                toBound(labelsPosition, labelBound, viewBound, 1, 1 - mainBoundIdx);
+	            }
+	            else {
+	                var mainBoundIdx = labelPosOpt >= 0 ? 0 : 1;
+	                toBound(mainPosition, mainBound, viewBound, 1, mainBoundIdx);
+	                labelsPosition[1] = mainPosition[1] + labelPosOpt;
+	            }
+
+	            mainGroup.attr('position', mainPosition);
+	            labelGroup.attr('position', labelsPosition);
+	            mainGroup.rotation = labelGroup.rotation = layoutInfo.rotation;
+
+	            setOrigin(mainGroup);
+	            setOrigin(labelGroup);
+
+	            function setOrigin(targetGroup) {
+	                var pos = targetGroup.position;
+	                targetGroup.origin = [
+	                    viewBound[0][0] - pos[0],
+	                    viewBound[1][0] - pos[1]
+	                ];
+	            }
+
+	            function getBound(rect) {
+	                // [[xmin, xmax], [ymin, ymax]]
+	                return [
+	                    [rect.x, rect.x + rect.width],
+	                    [rect.y, rect.y + rect.height]
+	                ];
+	            }
+
+	            function toBound(fromPos, from, to, dimIdx, boundIdx) {
+	                fromPos[dimIdx] += to[dimIdx][boundIdx] - from[dimIdx][boundIdx];
+	            }
+	        },
+
+	        _createAxis: function (layoutInfo, timelineModel) {
+	            var data = timelineModel.getData();
+	            var axisType = timelineModel.get('axisType');
+
+	            var scale = axisHelper.createScaleByModel(timelineModel, axisType);
+	            var dataExtent = data.getDataExtent('value');
+	            scale.setExtent(dataExtent[0], dataExtent[1]);
+	            this._customizeScale(scale, data);
+	            scale.niceTicks();
+
+	            var axis = new TimelineAxis('value', scale, layoutInfo.axisExtent, axisType);
+	            axis.model = timelineModel;
+
+	            return axis;
+	        },
+
+	        _customizeScale: function (scale, data) {
+
+	            scale.getTicks = function () {
+	                return data.mapArray(['value'], function (value) {
+	                    return value;
+	                });
+	            };
+
+	            scale.getTicksLabels = function () {
+	                return zrUtil.map(this.getTicks(), scale.getLabel, scale);
+	            };
+	        },
+
+	        _createGroup: function (name) {
+	            var newGroup = this['_' + name] = new graphic.Group();
+	            this.group.add(newGroup);
+	            return newGroup;
+	        },
+
+	        _renderAxisLine: function (layoutInfo, group, axis, timelineModel) {
+	            var axisExtent = axis.getExtent();
+
+	            if (!timelineModel.get('lineStyle.show')) {
+	                return;
+	            }
+
+	            group.add(new graphic.Line({
+	                shape: {
+	                    x1: axisExtent[0], y1: 0,
+	                    x2: axisExtent[1], y2: 0
+	                },
+	                style: zrUtil.extend(
+	                    {lineCap: 'round'},
+	                    timelineModel.getModel('lineStyle').getLineStyle()
+	                ),
+	                silent: true,
+	                z2: 1
+	            }));
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _renderAxisTick: function (layoutInfo, group, axis, timelineModel) {
+	            var data = timelineModel.getData();
+	            var ticks = axis.scale.getTicks();
+
+	            each(ticks, function (value, dataIndex) {
+
+	                var tickCoord = axis.dataToCoord(value);
+	                var itemModel = data.getItemModel(dataIndex);
+	                var itemStyleModel = itemModel.getModel('itemStyle.normal');
+	                var hoverStyleModel = itemModel.getModel('itemStyle.emphasis');
+	                var symbolOpt = {
+	                    position: [tickCoord, 0],
+	                    onclick: bind(this._changeTimeline, this, dataIndex)
+	                };
+	                var el = giveSymbol(itemModel, itemStyleModel, group, symbolOpt);
+	                graphic.setHoverStyle(el, hoverStyleModel.getItemStyle());
+
+	                if (itemModel.get('tooltip')) {
+	                    el.dataIndex = dataIndex;
+	                    el.dataModel = timelineModel;
+	                }
+	                else {
+	                    el.dataIndex = el.dataModel = null;
+	                }
+
+	            }, this);
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _renderAxisLabel: function (layoutInfo, group, axis, timelineModel) {
+	            var labelModel = timelineModel.getModel('label.normal');
+
+	            if (!labelModel.get('show')) {
+	                return;
+	            }
+
+	            var data = timelineModel.getData();
+	            var ticks = axis.scale.getTicks();
+	            var labels = axisHelper.getFormattedLabels(
+	                axis, labelModel.get('formatter')
+	            );
+	            var labelInterval = axis.getLabelInterval();
+
+	            each(ticks, function (tick, dataIndex) {
+	                if (axis.isLabelIgnored(dataIndex, labelInterval)) {
+	                    return;
+	                }
+
+	                var itemModel = data.getItemModel(dataIndex);
+	                var itemTextStyleModel = itemModel.getModel('label.normal.textStyle');
+	                var hoverTextStyleModel = itemModel.getModel('label.emphasis.textStyle');
+	                var tickCoord = axis.dataToCoord(tick);
+	                var textEl = new graphic.Text({
+	                    style: {
+	                        text: labels[dataIndex],
+	                        textAlign: layoutInfo.labelAlign,
+	                        textVerticalAlign: layoutInfo.labelBaseline,
+	                        textFont: itemTextStyleModel.getFont(),
+	                        fill: itemTextStyleModel.getTextColor()
+	                    },
+	                    position: [tickCoord, 0],
+	                    rotation: layoutInfo.labelRotation - layoutInfo.rotation,
+	                    onclick: bind(this._changeTimeline, this, dataIndex),
+	                    silent: false
+	                });
+
+	                group.add(textEl);
+	                graphic.setHoverStyle(textEl, hoverTextStyleModel.getItemStyle());
+
+	            }, this);
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _renderControl: function (layoutInfo, group, axis, timelineModel) {
+	            var controlSize = layoutInfo.controlSize;
+	            var rotation = layoutInfo.rotation;
+
+	            var itemStyle = timelineModel.getModel('controlStyle.normal').getItemStyle();
+	            var hoverStyle = timelineModel.getModel('controlStyle.emphasis').getItemStyle();
+	            var rect = [0, -controlSize / 2, controlSize, controlSize];
+	            var playState = timelineModel.getPlayState();
+	            var inverse = timelineModel.get('inverse', true);
+
+	            makeBtn(
+	                layoutInfo.nextBtnPosition,
+	                'controlStyle.nextIcon',
+	                bind(this._changeTimeline, this, inverse ? '-' : '+')
+	            );
+	            makeBtn(
+	                layoutInfo.prevBtnPosition,
+	                'controlStyle.prevIcon',
+	                bind(this._changeTimeline, this, inverse ? '+' : '-')
+	            );
+	            makeBtn(
+	                layoutInfo.playPosition,
+	                'controlStyle.' + (playState ? 'stopIcon' : 'playIcon'),
+	                bind(this._handlePlayClick, this, !playState),
+	                true
+	            );
+
+	            function makeBtn(position, iconPath, onclick, willRotate) {
+	                if (!position) {
+	                    return;
+	                }
+	                var opt = {
+	                    position: position,
+	                    origin: [controlSize / 2, 0],
+	                    rotation: willRotate ? -rotation : 0,
+	                    rectHover: true,
+	                    style: itemStyle,
+	                    onclick: onclick
+	                };
+	                var btn = makeIcon(timelineModel, iconPath, rect, opt);
+	                group.add(btn);
+	                graphic.setHoverStyle(btn, hoverStyle);
+	            }
+	        },
+
+	        _renderCurrentPointer: function (layoutInfo, group, axis, timelineModel) {
+	            var data = timelineModel.getData();
+	            var currentIndex = timelineModel.getCurrentIndex();
+	            var pointerModel = data.getItemModel(currentIndex).getModel('checkpointStyle');
+	            var me = this;
+
+	            var callback = {
+	                onCreate: function (pointer) {
+	                    pointer.draggable = true;
+	                    pointer.drift = bind(me._handlePointerDrag, me);
+	                    pointer.ondragend = bind(me._handlePointerDragend, me);
+	                    pointerMoveTo(pointer, currentIndex, axis, timelineModel, true);
+	                },
+	                onUpdate: function (pointer) {
+	                    pointerMoveTo(pointer, currentIndex, axis, timelineModel);
+	                }
+	            };
+
+	            // Reuse when exists, for animation and drag.
+	            this._currentPointer = giveSymbol(
+	                pointerModel, pointerModel, this._mainGroup, {}, this._currentPointer, callback
+	            );
+	        },
+
+	        _handlePlayClick: function (nextState) {
+	            this._clearTimer();
+	            this.api.dispatchAction({
+	                type: 'timelinePlayChange',
+	                playState: nextState,
+	                from: this.uid
+	            });
+	        },
+
+	        _handlePointerDrag: function (dx, dy, e) {
+	            this._clearTimer();
+	            this._pointerChangeTimeline([e.offsetX, e.offsetY]);
+	        },
+
+	        _handlePointerDragend: function (e) {
+	            this._pointerChangeTimeline([e.offsetX, e.offsetY], true);
+	        },
+
+	        _pointerChangeTimeline: function (mousePos, trigger) {
+	            var toCoord = this._toAxisCoord(mousePos)[0];
+
+	            var axis = this._axis;
+	            var axisExtent = numberUtil.asc(axis.getExtent().slice());
+
+	            toCoord > axisExtent[1] && (toCoord = axisExtent[1]);
+	            toCoord < axisExtent[0] && (toCoord = axisExtent[0]);
+
+	            this._currentPointer.position[0] = toCoord;
+	            this._currentPointer.dirty();
+
+	            var targetDataIndex = this._findNearestTick(toCoord);
+	            var timelineModel = this.model;
+
+	            if (trigger || (
+	                targetDataIndex !== timelineModel.getCurrentIndex()
+	                && timelineModel.get('realtime')
+	            )) {
+	                this._changeTimeline(targetDataIndex);
+	            }
+	        },
+
+	        _doPlayStop: function () {
+	            this._clearTimer();
+
+	            if (this.model.getPlayState()) {
+	                this._timer = setTimeout(
+	                    bind(handleFrame, this),
+	                    this.model.get('playInterval')
+	                );
+	            }
+
+	            function handleFrame() {
+	                // Do not cache
+	                var timelineModel = this.model;
+	                this._changeTimeline(
+	                    timelineModel.getCurrentIndex()
+	                    + (timelineModel.get('rewind', true) ? -1 : 1)
+	                );
+	            }
+	        },
+
+	        _toAxisCoord: function (vertex) {
+	            var trans = this._mainGroup.getLocalTransform();
+	            return graphic.applyTransform(vertex, trans, true);
+	        },
+
+	        _findNearestTick: function (axisCoord) {
+	            var data = this.model.getData();
+	            var dist = Infinity;
+	            var targetDataIndex;
+	            var axis = this._axis;
+
+	            data.each(['value'], function (value, dataIndex) {
+	                var coord = axis.dataToCoord(value);
+	                var d = Math.abs(coord - axisCoord);
+	                if (d < dist) {
+	                    dist = d;
+	                    targetDataIndex = dataIndex;
+	                }
+	            });
+
+	            return targetDataIndex;
+	        },
+
+	        _clearTimer: function () {
+	            if (this._timer) {
+	                clearTimeout(this._timer);
+	                this._timer = null;
+	            }
+	        },
+
+	        _changeTimeline: function (nextIndex) {
+	            var currentIndex = this.model.getCurrentIndex();
+
+	            if (nextIndex === '+') {
+	                nextIndex = currentIndex + 1;
+	            }
+	            else if (nextIndex === '-') {
+	                nextIndex = currentIndex - 1;
+	            }
+
+	            this.api.dispatchAction({
+	                type: 'timelineChange',
+	                currentIndex: nextIndex,
+	                from: this.uid
+	            });
+	        }
+
+	    });
+
+	    function getViewRect(model, api) {
+	        return layout.getLayoutRect(
+	            model.getBoxLayoutParams(),
+	            {
+	                width: api.getWidth(),
+	                height: api.getHeight()
+	            },
+	            model.get('padding')
+	        );
+	    }
+
+	    function makeIcon(timelineModel, objPath, rect, opts) {
+	        var icon = graphic.makePath(
+	            timelineModel.get(objPath).replace(/^path:\/\//, ''),
+	            zrUtil.clone(opts || {}),
+	            new BoundingRect(rect[0], rect[1], rect[2], rect[3]),
+	            'center'
+	        );
+
+	        return icon;
+	    }
+
+	    /**
+	     * Create symbol or update symbol
+	     */
+	    function giveSymbol(hostModel, itemStyleModel, group, opt, symbol, callback) {
+	        var symbolType = hostModel.get('symbol');
+	        var color = itemStyleModel.get('color');
+	        var symbolSize = hostModel.get('symbolSize');
+	        var halfSymbolSize = symbolSize / 2;
+	        var itemStyle = itemStyleModel.getItemStyle(['color', 'symbol', 'symbolSize']);
+
+	        if (!symbol) {
+	            symbol = symbolUtil.createSymbol(
+	                symbolType, -halfSymbolSize, -halfSymbolSize, symbolSize, symbolSize, color
+	            );
+	            group.add(symbol);
+	            callback && callback.onCreate(symbol);
+	        }
+	        else {
+	            symbol.setStyle(itemStyle);
+	            symbol.setColor(color);
+	            group.add(symbol); // Group may be new, also need to add.
+	            callback && callback.onUpdate(symbol);
+	        }
+
+	        opt = zrUtil.merge({
+	            rectHover: true,
+	            style: itemStyle,
+	            z2: 100
+	        }, opt, true);
+
+	        symbol.attr(opt);
+
+	        return symbol;
+	    }
+
+	    function pointerMoveTo(pointer, dataIndex, axis, timelineModel, noAnimation) {
+	        if (pointer.dragging) {
+	            return;
+	        }
+
+	        var pointerModel = timelineModel.getModel('checkpointStyle');
+	        var toCoord = axis.dataToCoord(timelineModel.getData().get(['value'], dataIndex));
+
+	        if (noAnimation || !pointerModel.get('animation', true)) {
+	            pointer.attr({position: [toCoord, 0]});
+	        }
+	        else {
+	            pointer.stopAnimation(true);
+	            pointer.animateTo(
+	                {position: [toCoord, 0]},
+	                pointerModel.get('animationDuration', true),
+	                pointerModel.get('animationEasing', true)
+	            );
+	        }
+	    }
+
+
+
+/***/ },
+/* 363 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @file Timeline view
+	 */
+
+
+	    // var zrUtil = require('zrender/lib/core/util');
+	    // var graphic = require('../../util/graphic');
+	    var ComponentView = __webpack_require__(29);
+
+	    module.exports = ComponentView.extend({
+
+	        type: 'timeline'
+	    });
+
+
+
+/***/ },
+/* 364 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+	    var Axis = __webpack_require__(123);
+	    var axisHelper = __webpack_require__(114);
+
+	    /**
+	     * Extend axis 2d
+	     * @constructor module:echarts/coord/cartesian/Axis2D
+	     * @extends {module:echarts/coord/cartesian/Axis}
+	     * @param {string} dim
+	     * @param {*} scale
+	     * @param {Array.<number>} coordExtent
+	     * @param {string} axisType
+	     * @param {string} position
+	     */
+	    var TimelineAxis = function (dim, scale, coordExtent, axisType) {
+
+	        Axis.call(this, dim, scale, coordExtent);
+
+	        /**
+	         * Axis type
+	         *  - 'category'
+	         *  - 'value'
+	         *  - 'time'
+	         *  - 'log'
+	         * @type {string}
+	         */
+	        this.type = axisType || 'value';
+
+	        /**
+	         * @private
+	         * @type {number}
+	         */
+	        this._autoLabelInterval;
+
+	        /**
+	         * Axis model
+	         * @param {module:echarts/component/TimelineModel}
+	         */
+	        this.model = null;
+	    };
+
+	    TimelineAxis.prototype = {
+
+	        constructor: TimelineAxis,
+
+	        /**
+	         * @public
+	         * @return {number}
+	         */
+	        getLabelInterval: function () {
+	            var timelineModel = this.model;
+	            var labelModel = timelineModel.getModel('label.normal');
+	            var labelInterval = labelModel.get('interval');
+
+	            if (labelInterval != null && labelInterval != 'auto') {
+	                return labelInterval;
+	            }
+
+	            var labelInterval = this._autoLabelInterval;
+
+	            if (!labelInterval) {
+	                labelInterval = this._autoLabelInterval = axisHelper.getAxisLabelInterval(
+	                    zrUtil.map(this.scale.getTicks(), this.dataToCoord, this),
+	                    axisHelper.getFormattedLabels(this, labelModel.get('formatter')),
+	                    labelModel.getModel('textStyle').getFont(),
+	                    timelineModel.get('orient') === 'horizontal'
+	                );
+	            }
+
+	            return labelInterval;
+	        },
+
+	        /**
+	         * If label is ignored.
+	         * Automatically used when axis is category and label can not be all shown
+	         * @public
+	         * @param  {number} idx
+	         * @return {boolean}
+	         */
+	        isLabelIgnored: function (idx) {
+	            if (this.type === 'category') {
+	                var labelInterval = this.getLabelInterval();
+	                return ((typeof labelInterval === 'function')
+	                    && !labelInterval(idx, this.scale.getLabel(idx)))
+	                    || idx % (labelInterval + 1);
+	            }
+	        }
+
+	    };
+
+	    zrUtil.inherits(TimelineAxis, Axis);
+
+	    module.exports = TimelineAxis;
+
+
+/***/ },
+/* 365 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    __webpack_require__(366);
+	    __webpack_require__(367);
+
+	    __webpack_require__(369);
+	    __webpack_require__(370);
+	    __webpack_require__(371);
+	    __webpack_require__(372);
+	    __webpack_require__(377);
+
+
+/***/ },
+/* 366 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var featureManager = __webpack_require__(314);
+	    var zrUtil = __webpack_require__(4);
+
+	    var ToolboxModel = __webpack_require__(1).extendComponentModel({
+
+	        type: 'toolbox',
+
+	        layoutMode: {
+	            type: 'box',
+	            ignoreSize: true
+	        },
+
+	        mergeDefaultAndTheme: function (option) {
+	            ToolboxModel.superApply(this, 'mergeDefaultAndTheme', arguments);
+
+	            zrUtil.each(this.option.feature, function (featureOpt, featureName) {
+	                var Feature = featureManager.get(featureName);
+	                Feature && zrUtil.merge(featureOpt, Feature.defaultOption);
+	            });
+	        },
+
+	        defaultOption: {
+
+	            show: true,
+
+	            z: 6,
+
+	            zlevel: 0,
+
+	            orient: 'horizontal',
+
+	            left: 'right',
+
+	            top: 'top',
+
+	            // right
+	            // bottom
+
+	            backgroundColor: 'transparent',
+
+	            borderColor: '#ccc',
+
+	            borderWidth: 0,
+
+	            padding: 5,
+
+	            itemSize: 15,
+
+	            itemGap: 8,
+
+	            showTitle: true,
+
+	            iconStyle: {
+	                normal: {
+	                    borderColor: '#666',
+	                    color: 'none'
+	                },
+	                emphasis: {
+	                    borderColor: '#3E98C5'
+	                }
+	            }
+	            // textStyle: {},
+
+	            // feature
+	        }
+	    });
+
+	    module.exports = ToolboxModel;
+
+
+/***/ },
+/* 367 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/* WEBPACK VAR INJECTION */(function(process) {
+
+	    var featureManager = __webpack_require__(314);
+	    var zrUtil = __webpack_require__(4);
+	    var graphic = __webpack_require__(43);
+	    var Model = __webpack_require__(12);
+	    var DataDiffer = __webpack_require__(98);
+	    var listComponentHelper = __webpack_require__(277);
+	    var textContain = __webpack_require__(8);
+
+	    module.exports = __webpack_require__(1).extendComponentView({
+
+	        type: 'toolbox',
+
+	        render: function (toolboxModel, ecModel, api, payload) {
+	            var group = this.group;
+	            group.removeAll();
+
+	            if (!toolboxModel.get('show')) {
+	                return;
+	            }
+
+	            var itemSize = +toolboxModel.get('itemSize');
+	            var featureOpts = toolboxModel.get('feature') || {};
+	            var features = this._features || (this._features = {});
+
+	            var featureNames = [];
+	            zrUtil.each(featureOpts, function (opt, name) {
+	                featureNames.push(name);
+	            });
+
+	            (new DataDiffer(this._featureNames || [], featureNames))
+	                .add(process)
+	                .update(process)
+	                .remove(zrUtil.curry(process, null))
+	                .execute();
+
+	            // Keep for diff.
+	            this._featureNames = featureNames;
+
+	            function process(newIndex, oldIndex) {
+	                var featureName = featureNames[newIndex];
+	                var oldName = featureNames[oldIndex];
+	                var featureOpt = featureOpts[featureName];
+	                var featureModel = new Model(featureOpt, toolboxModel, toolboxModel.ecModel);
+	                var feature;
+
+	                if (featureName && !oldName) { // Create
+	                    if (isUserFeatureName(featureName)) {
+	                        feature = {
+	                            model: featureModel,
+	                            onclick: featureModel.option.onclick,
+	                            featureName: featureName
+	                        };
+	                    }
+	                    else {
+	                        var Feature = featureManager.get(featureName);
+	                        if (!Feature) {
+	                            return;
+	                        }
+	                        feature = new Feature(featureModel, ecModel, api);
+	                    }
+	                    features[featureName] = feature;
+	                }
+	                else {
+	                    feature = features[oldName];
+	                    // If feature does not exsit.
+	                    if (!feature) {
+	                        return;
+	                    }
+	                    feature.model = featureModel;
+	                    feature.ecModel = ecModel;
+	                    feature.api = api;
+	                }
+
+	                if (!featureName && oldName) {
+	                    feature.dispose && feature.dispose(ecModel, api);
+	                    return;
+	                }
+
+	                if (!featureModel.get('show') || feature.unusable) {
+	                    feature.remove && feature.remove(ecModel, api);
+	                    return;
+	                }
+
+	                createIconPaths(featureModel, feature, featureName);
+
+	                featureModel.setIconStatus = function (iconName, status) {
+	                    var option = this.option;
+	                    var iconPaths = this.iconPaths;
+	                    option.iconStatus = option.iconStatus || {};
+	                    option.iconStatus[iconName] = status;
+	                    // FIXME
+	                    iconPaths[iconName] && iconPaths[iconName].trigger(status);
+	                };
+
+	                if (feature.render) {
+	                    feature.render(featureModel, ecModel, api, payload);
+	                }
+	            }
+
+	            function createIconPaths(featureModel, feature, featureName) {
+	                var iconStyleModel = featureModel.getModel('iconStyle');
+
+	                // If one feature has mutiple icon. they are orginaized as
+	                // {
+	                //     icon: {
+	                //         foo: '',
+	                //         bar: ''
+	                //     },
+	                //     title: {
+	                //         foo: '',
+	                //         bar: ''
+	                //     }
+	                // }
+	                var icons = feature.getIcons ? feature.getIcons() : featureModel.get('icon');
+	                var titles = featureModel.get('title') || {};
+	                if (typeof icons === 'string') {
+	                    var icon = icons;
+	                    var title = titles;
+	                    icons = {};
+	                    titles = {};
+	                    icons[featureName] = icon;
+	                    titles[featureName] = title;
+	                }
+	                var iconPaths = featureModel.iconPaths = {};
+	                zrUtil.each(icons, function (icon, iconName) {
+	                    var normalStyle = iconStyleModel.getModel('normal').getItemStyle();
+	                    var hoverStyle = iconStyleModel.getModel('emphasis').getItemStyle();
+
+	                    var style = {
+	                        x: -itemSize / 2,
+	                        y: -itemSize / 2,
+	                        width: itemSize,
+	                        height: itemSize
+	                    };
+	                    var path = icon.indexOf('image://') === 0
+	                        ? (
+	                            style.image = icon.slice(8),
+	                            new graphic.Image({style: style})
+	                        )
+	                        : graphic.makePath(
+	                            icon.replace('path://', ''),
+	                            {
+	                                style: normalStyle,
+	                                hoverStyle: hoverStyle,
+	                                rectHover: true
+	                            },
+	                            style,
+	                            'center'
+	                        );
+
+	                    graphic.setHoverStyle(path);
+
+	                    if (toolboxModel.get('showTitle')) {
+	                        path.__title = titles[iconName];
+	                        path.on('mouseover', function () {
+	                                path.setStyle({
+	                                    text: titles[iconName],
+	                                    textPosition: hoverStyle.textPosition || 'bottom',
+	                                    textFill: hoverStyle.fill || hoverStyle.stroke || '#000',
+	                                    textAlign: hoverStyle.textAlign || 'center'
+	                                });
+	                            })
+	                            .on('mouseout', function () {
+	                                path.setStyle({
+	                                    textFill: null
+	                                });
+	                            });
+	                    }
+	                    path.trigger(featureModel.get('iconStatus.' + iconName) || 'normal');
+
+	                    group.add(path);
+	                    path.on('click', zrUtil.bind(
+	                        feature.onclick, feature, ecModel, api, iconName
+	                    ));
+
+	                    iconPaths[iconName] = path;
+	                });
+	            }
+
+	            listComponentHelper.layout(group, toolboxModel, api);
+	            // Render background after group is layout
+	            // FIXME
+	            listComponentHelper.addBackground(group, toolboxModel);
+
+	            // Adjust icon title positions to avoid them out of screen
+	            group.eachChild(function (icon) {
+	                var titleText = icon.__title;
+	                var hoverStyle = icon.hoverStyle;
+	                // May be background element
+	                if (hoverStyle && titleText) {
+	                    var rect = textContain.getBoundingRect(
+	                        titleText, hoverStyle.font
+	                    );
+	                    var offsetX = icon.position[0] + group.position[0];
+	                    var offsetY = icon.position[1] + group.position[1] + itemSize;
+
+	                    var needPutOnTop = false;
+	                    if (offsetY + rect.height > api.getHeight()) {
+	                        hoverStyle.textPosition = 'top';
+	                        needPutOnTop = true;
+	                    }
+	                    var topOffset = needPutOnTop ? (-5 - rect.height) : (itemSize + 8);
+	                    if (offsetX + rect.width /  2 > api.getWidth()) {
+	                        hoverStyle.textPosition = ['100%', topOffset];
+	                        hoverStyle.textAlign = 'right';
+	                    }
+	                    else if (offsetX - rect.width / 2 < 0) {
+	                        hoverStyle.textPosition = [0, topOffset];
+	                        hoverStyle.textAlign = 'left';
+	                    }
+	                }
+	            });
+	        },
+
+	        updateView: function (toolboxModel, ecModel, api, payload) {
+	            zrUtil.each(this._features, function (feature) {
+	                feature.updateView && feature.updateView(feature.model, ecModel, api, payload);
+	            });
+	        },
+
+	        updateLayout: function (toolboxModel, ecModel, api, payload) {
+	            zrUtil.each(this._features, function (feature) {
+	                feature.updateLayout && feature.updateLayout(feature.model, ecModel, api, payload);
+	            });
+	        },
+
+	        remove: function (ecModel, api) {
+	            zrUtil.each(this._features, function (feature) {
+	                feature.remove && feature.remove(ecModel, api);
+	            });
+	            this.group.removeAll();
+	        },
+
+	        dispose: function (ecModel, api) {
+	            zrUtil.each(this._features, function (feature) {
+	                feature.dispose && feature.dispose(ecModel, api);
+	            });
+	        }
+	    });
+
+	    function isUserFeatureName(featureName) {
+	        return featureName.indexOf('my') === 0;
+	    }
+
+
+	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(368)))
+
+/***/ },
+/* 368 */
+/***/ function(module, exports) {
+
+	// shim for using process in browser
+
+	var process = module.exports = {};
+	var queue = [];
+	var draining = false;
+	var currentQueue;
+	var queueIndex = -1;
+
+	function cleanUpNextTick() {
+	    draining = false;
+	    if (currentQueue.length) {
+	        queue = currentQueue.concat(queue);
+	    } else {
+	        queueIndex = -1;
+	    }
+	    if (queue.length) {
+	        drainQueue();
+	    }
+	}
+
+	function drainQueue() {
+	    if (draining) {
+	        return;
+	    }
+	    var timeout = setTimeout(cleanUpNextTick);
+	    draining = true;
+
+	    var len = queue.length;
+	    while(len) {
+	        currentQueue = queue;
+	        queue = [];
+	        while (++queueIndex < len) {
+	            if (currentQueue) {
+	                currentQueue[queueIndex].run();
+	            }
+	        }
+	        queueIndex = -1;
+	        len = queue.length;
+	    }
+	    currentQueue = null;
+	    draining = false;
+	    clearTimeout(timeout);
+	}
+
+	process.nextTick = function (fun) {
+	    var args = new Array(arguments.length - 1);
+	    if (arguments.length > 1) {
+	        for (var i = 1; i < arguments.length; i++) {
+	            args[i - 1] = arguments[i];
+	        }
+	    }
+	    queue.push(new Item(fun, args));
+	    if (queue.length === 1 && !draining) {
+	        setTimeout(drainQueue, 0);
+	    }
+	};
+
+	// v8 likes predictible objects
+	function Item(fun, array) {
+	    this.fun = fun;
+	    this.array = array;
+	}
+	Item.prototype.run = function () {
+	    this.fun.apply(null, this.array);
+	};
+	process.title = 'browser';
+	process.browser = true;
+	process.env = {};
+	process.argv = [];
+	process.version = ''; // empty string to avoid regexp issues
+	process.versions = {};
+
+	function noop() {}
+
+	process.on = noop;
+	process.addListener = noop;
+	process.once = noop;
+	process.off = noop;
+	process.removeListener = noop;
+	process.removeAllListeners = noop;
+	process.emit = noop;
+
+	process.binding = function (name) {
+	    throw new Error('process.binding is not supported');
+	};
+
+	process.cwd = function () { return '/' };
+	process.chdir = function (dir) {
+	    throw new Error('process.chdir is not supported');
+	};
+	process.umask = function() { return 0; };
+
+
+/***/ },
+/* 369 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var env = __webpack_require__(2);
+
+	    function SaveAsImage (model) {
+	        this.model = model;
+	    }
+
+	    SaveAsImage.defaultOption = {
+	        show: true,
+	        icon: 'M4.7,22.9L29.3,45.5L54.7,23.4M4.6,43.6L4.6,58L53.8,58L53.8,43.6M29.2,45.1L29.2,0',
+	        title: '保存为图片',
+	        type: 'png',
+	        // Default use option.backgroundColor
+	        // backgroundColor: '#fff',
+	        name: '',
+	        excludeComponents: ['toolbox'],
+	        pixelRatio: 1,
+	        lang: ['右键另存为图片']
+	    };
+
+	    SaveAsImage.prototype.unusable = !env.canvasSupported;
+
+	    var proto = SaveAsImage.prototype;
+
+	    proto.onclick = function (ecModel, api) {
+	        var model = this.model;
+	        var title = model.get('name') || ecModel.get('title.0.text') || 'echarts';
+	        var $a = document.createElement('a');
+	        var type = model.get('type', true) || 'png';
+	        $a.download = title + '.' + type;
+	        $a.target = '_blank';
+	        var url = api.getConnectedDataURL({
+	            type: type,
+	            backgroundColor: model.get('backgroundColor', true)
+	                || ecModel.get('backgroundColor') || '#fff',
+	            excludeComponents: model.get('excludeComponents'),
+	            pixelRatio: model.get('pixelRatio')
+	        });
+	        $a.href = url;
+	        // Chrome and Firefox
+	        if (typeof MouseEvent === 'function') {
+	            var evt = new MouseEvent('click', {
+	                view: window,
+	                bubbles: true,
+	                cancelable: false
+	            });
+	            $a.dispatchEvent(evt);
+	        }
+	        // IE
+	        else {
+	            var lang = model.get('lang');
+	            var html = ''
+	                + '<body style="margin:0;">'
+	                + '<img src="' + url + '" style="max-width:100%;" title="' + ((lang && lang[0]) || '') + '" />'
+	                + '</body>';
+	            var tab = window.open();
+	            tab.document.write(html);
+	        }
+	    };
+
+	    __webpack_require__(314).register(
+	        'saveAsImage', SaveAsImage
+	    );
+
+	    module.exports = SaveAsImage;
+
+
+/***/ },
+/* 370 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var zrUtil = __webpack_require__(4);
+
+	    function MagicType(model) {
+	        this.model = model;
+	    }
+
+	    MagicType.defaultOption = {
+	        show: true,
+	        type: [],
+	        // Icon group
+	        icon: {
+	            line: 'M4.1,28.9h7.1l9.3-22l7.4,38l9.7-19.7l3,12.8h14.9M4.1,58h51.4',
+	            bar: 'M6.7,22.9h10V48h-10V22.9zM24.9,13h10v35h-10V13zM43.2,2h10v46h-10V2zM3.1,58h53.7',
+	            stack: 'M8.2,38.4l-8.4,4.1l30.6,15.3L60,42.5l-8.1-4.1l-21.5,11L8.2,38.4z M51.9,30l-8.1,4.2l-13.4,6.9l-13.9-6.9L8.2,30l-8.4,4.2l8.4,4.2l22.2,11l21.5-11l8.1-4.2L51.9,30z M51.9,21.7l-8.1,4.2L35.7,30l-5.3,2.8L24.9,30l-8.4-4.1l-8.3-4.2l-8.4,4.2L8.2,30l8.3,4.2l13.9,6.9l13.4-6.9l8.1-4.2l8.1-4.1L51.9,21.7zM30.4,2.2L-0.2,17.5l8.4,4.1l8.3,4.2l8.4,4.2l5.5,2.7l5.3-2.7l8.1-4.2l8.1-4.2l8.1-4.1L30.4,2.2z', // jshint ignore:line
+	            tiled: 'M2.3,2.2h22.8V25H2.3V2.2z M35,2.2h22.8V25H35V2.2zM2.3,35h22.8v22.8H2.3V35z M35,35h22.8v22.8H35V35z'
+	        },
+	        title: {
+	            line: '切换为折线图',
+	            bar: '切换为柱状图',
+	            stack: '切换为堆叠',
+	            tiled: '切换为平铺'
+	        },
+	        option: {},
+	        seriesIndex: {}
+	    };
+
+	    var proto = MagicType.prototype;
+
+	    proto.getIcons = function () {
+	        var model = this.model;
+	        var availableIcons = model.get('icon');
+	        var icons = {};
+	        zrUtil.each(model.get('type'), function (type) {
+	            if (availableIcons[type]) {
+	                icons[type] = availableIcons[type];
+	            }
+	        });
+	        return icons;
+	    };
+
+	    var seriesOptGenreator = {
+	        'line': function (seriesType, seriesId, seriesModel, model) {
+	            if (seriesType === 'bar') {
+	                return zrUtil.merge({
+	                    id: seriesId,
+	                    type: 'line',
+	                    // Preserve data related option
+	                    data: seriesModel.get('data'),
+	                    stack: seriesModel.get('stack'),
+	                    markPoint: seriesModel.get('markPoint'),
+	                    markLine: seriesModel.get('markLine')
+	                }, model.get('option.line') || {}, true);
+	            }
+	        },
+	        'bar': function (seriesType, seriesId, seriesModel, model) {
+	            if (seriesType === 'line') {
+	                return zrUtil.merge({
+	                    id: seriesId,
+	                    type: 'bar',
+	                    // Preserve data related option
+	                    data: seriesModel.get('data'),
+	                    stack: seriesModel.get('stack'),
+	                    markPoint: seriesModel.get('markPoint'),
+	                    markLine: seriesModel.get('markLine')
+	                }, model.get('option.bar') || {}, true);
+	            }
+	        },
+	        'stack': function (seriesType, seriesId, seriesModel, model) {
+	            if (seriesType === 'line' || seriesType === 'bar') {
+	                return zrUtil.merge({
+	                    id: seriesId,
+	                    stack: '__ec_magicType_stack__'
+	                }, model.get('option.stack') || {}, true);
+	            }
+	        },
+	        'tiled': function (seriesType, seriesId, seriesModel, model) {
+	            if (seriesType === 'line' || seriesType === 'bar') {
+	                return zrUtil.merge({
+	                    id: seriesId,
+	                    stack: ''
+	                }, model.get('option.tiled') || {}, true);
+	            }
+	        }
+	    };
+
+	    var radioTypes = [
+	        ['line', 'bar'],
+	        ['stack', 'tiled']
+	    ];
+
+	    proto.onclick = function (ecModel, api, type) {
+	        var model = this.model;
+	        var seriesIndex = model.get('seriesIndex.' + type);
+	        // Not supported magicType
+	        if (!seriesOptGenreator[type]) {
+	            return;
+	        }
+	        var newOption = {
+	            series: []
+	        };
+	        var generateNewSeriesTypes = function (seriesModel) {
+	            var seriesType = seriesModel.subType;
+	            var seriesId = seriesModel.id;
+	            var newSeriesOpt = seriesOptGenreator[type](
+	                seriesType, seriesId, seriesModel, model
+	            );
+	            if (newSeriesOpt) {
+	                // PENDING If merge original option?
+	                zrUtil.defaults(newSeriesOpt, seriesModel.option);
+	                newOption.series.push(newSeriesOpt);
+	            }
+	            // Modify boundaryGap
+	            var coordSys = seriesModel.coordinateSystem;
+	            if (coordSys && coordSys.type === 'cartesian2d' && (type === 'line' || type === 'bar')) {
+	                var categoryAxis = coordSys.getAxesByScale('ordinal')[0];
+	                if (categoryAxis) {
+	                    var axisDim = categoryAxis.dim;
+	                    var axisIndex = seriesModel.get(axisDim + 'AxisIndex');
+	                    var axisKey = axisDim + 'Axis';
+	                    newOption[axisKey] = newOption[axisKey] || [];
+	                    for (var i = 0; i <= axisIndex; i++) {
+	                        newOption[axisKey][axisIndex] = newOption[axisKey][axisIndex] || {};
+	                    }
+	                    newOption[axisKey][axisIndex].boundaryGap = type === 'bar' ? true : false;
+	                }
+	            }
+	        };
+
+	        zrUtil.each(radioTypes, function (radio) {
+	            if (zrUtil.indexOf(radio, type) >= 0) {
+	                zrUtil.each(radio, function (item) {
+	                    model.setIconStatus(item, 'normal');
+	                });
+	            }
+	        });
+
+	        model.setIconStatus(type, 'emphasis');
+
+	        ecModel.eachComponent(
+	            {
+	                mainType: 'series',
+	                query: seriesIndex == null ? null : {
+	                    seriesIndex: seriesIndex
+	                }
+	            }, generateNewSeriesTypes
+	        );
+	        api.dispatchAction({
+	            type: 'changeMagicType',
+	            currentType: type,
+	            newOption: newOption
+	        });
+	    };
+
+	    var echarts = __webpack_require__(1);
+	    echarts.registerAction({
+	        type: 'changeMagicType',
+	        event: 'magicTypeChanged',
+	        update: 'prepareAndUpdate'
+	    }, function (payload, ecModel) {
+	        ecModel.mergeOption(payload.newOption);
+	    });
+
+	    __webpack_require__(314).register('magicType', MagicType);
+
+	    module.exports = MagicType;
+
+
+/***/ },
+/* 371 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @module echarts/component/toolbox/feature/DataView
+	 */
+
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var eventTool = __webpack_require__(87);
+
+
+	    var BLOCK_SPLITER = new Array(60).join('-');
+	    var ITEM_SPLITER = '\t';
+	    /**
+	     * Group series into two types
+	     *  1. on category axis, like line, bar
+	     *  2. others, like scatter, pie
+	     * @param {module:echarts/model/Global} ecModel
+	     * @return {Object}
+	     * @inner
+	     */
+	    function groupSeries(ecModel) {
+	        var seriesGroupByCategoryAxis = {};
+	        var otherSeries = [];
+	        var meta = [];
+	        ecModel.eachRawSeries(function (seriesModel) {
+	            var coordSys = seriesModel.coordinateSystem;
+
+	            if (coordSys && (coordSys.type === 'cartesian2d' || coordSys.type === 'polar')) {
+	                var baseAxis = coordSys.getBaseAxis();
+	                if (baseAxis.type === 'category') {
+	                    var key = baseAxis.dim + '_' + baseAxis.index;
+	                    if (!seriesGroupByCategoryAxis[key]) {
+	                        seriesGroupByCategoryAxis[key] = {
+	                            categoryAxis: baseAxis,
+	                            valueAxis: coordSys.getOtherAxis(baseAxis),
+	                            series: []
+	                        };
+	                        meta.push({
+	                            axisDim: baseAxis.dim,
+	                            axisIndex: baseAxis.index
+	                        });
+	                    }
+	                    seriesGroupByCategoryAxis[key].series.push(seriesModel);
+	                }
+	                else {
+	                    otherSeries.push(seriesModel);
+	                }
+	            }
+	            else {
+	                otherSeries.push(seriesModel);
+	            }
+	        });
+
+	        return {
+	            seriesGroupByCategoryAxis: seriesGroupByCategoryAxis,
+	            other: otherSeries,
+	            meta: meta
+	        };
+	    }
+
+	    /**
+	     * Assemble content of series on cateogory axis
+	     * @param {Array.<module:echarts/model/Series>} series
+	     * @return {string}
+	     * @inner
+	     */
+	    function assembleSeriesWithCategoryAxis(series) {
+	        var tables = [];
+	        zrUtil.each(series, function (group, key) {
+	            var categoryAxis = group.categoryAxis;
+	            var valueAxis = group.valueAxis;
+	            var valueAxisDim = valueAxis.dim;
+
+	            var headers = [' '].concat(zrUtil.map(group.series, function (series) {
+	                return series.name;
+	            }));
+	            var columns = [categoryAxis.model.getCategories()];
+	            zrUtil.each(group.series, function (series) {
+	                columns.push(series.getRawData().mapArray(valueAxisDim, function (val) {
+	                    return val;
+	                }));
+	            });
+	            // Assemble table content
+	            var lines = [headers.join(ITEM_SPLITER)];
+	            for (var i = 0; i < columns[0].length; i++) {
+	                var items = [];
+	                for (var j = 0; j < columns.length; j++) {
+	                    items.push(columns[j][i]);
+	                }
+	                lines.push(items.join(ITEM_SPLITER));
+	            }
+	            tables.push(lines.join('\n'));
+	        });
+	        return tables.join('\n\n' +  BLOCK_SPLITER + '\n\n');
+	    }
+
+	    /**
+	     * Assemble content of other series
+	     * @param {Array.<module:echarts/model/Series>} series
+	     * @return {string}
+	     * @inner
+	     */
+	    function assembleOtherSeries(series) {
+	        return zrUtil.map(series, function (series) {
+	            var data = series.getRawData();
+	            var lines = [series.name];
+	            var vals = [];
+	            data.each(data.dimensions, function () {
+	                var argLen = arguments.length;
+	                var dataIndex = arguments[argLen - 1];
+	                var name = data.getName(dataIndex);
+	                for (var i = 0; i < argLen - 1; i++) {
+	                    vals[i] = arguments[i];
+	                }
+	                lines.push((name ? (name + ITEM_SPLITER) : '') + vals.join(ITEM_SPLITER));
+	            });
+	            return lines.join('\n');
+	        }).join('\n\n' + BLOCK_SPLITER + '\n\n');
+	    }
+
+	    /**
+	     * @param {module:echarts/model/Global}
+	     * @return {string}
+	     * @inner
+	     */
+	    function getContentFromModel(ecModel) {
+
+	        var result = groupSeries(ecModel);
+
+	        return {
+	            value: zrUtil.filter([
+	                    assembleSeriesWithCategoryAxis(result.seriesGroupByCategoryAxis),
+	                    assembleOtherSeries(result.other)
+	                ], function (str) {
+	                    return str.replace(/[\n\t\s]/g, '');
+	                }).join('\n\n' + BLOCK_SPLITER + '\n\n'),
+
+	            meta: result.meta
+	        };
+	    }
+
+
+	    function trim(str) {
+	        return str.replace(/^\s\s*/, '').replace(/\s\s*$/, '');
+	    }
+	    /**
+	     * If a block is tsv format
+	     */
+	    function isTSVFormat(block) {
+	        // Simple method to find out if a block is tsv format
+	        var firstLine = block.slice(0, block.indexOf('\n'));
+	        if (firstLine.indexOf(ITEM_SPLITER) >= 0) {
+	            return true;
+	        }
+	    }
+
+	    var itemSplitRegex = new RegExp('[' + ITEM_SPLITER + ']+', 'g');
+	    /**
+	     * @param {string} tsv
+	     * @return {Array.<Object>}
+	     */
+	    function parseTSVContents(tsv) {
+	        var tsvLines = tsv.split(/\n+/g);
+	        var headers = trim(tsvLines.shift()).split(itemSplitRegex);
+
+	        var categories = [];
+	        var series = zrUtil.map(headers, function (header) {
+	            return {
+	                name: header,
+	                data: []
+	            };
+	        });
+	        for (var i = 0; i < tsvLines.length; i++) {
+	            var items = trim(tsvLines[i]).split(itemSplitRegex);
+	            categories.push(items.shift());
+	            for (var j = 0; j < items.length; j++) {
+	                series[j] && (series[j].data[i] = items[j]);
+	            }
+	        }
+	        return {
+	            series: series,
+	            categories: categories
+	        };
+	    }
+
+	    /**
+	     * @param {string} str
+	     * @return {Array.<Object>}
+	     * @inner
+	     */
+	    function parseListContents(str) {
+	        var lines = str.split(/\n+/g);
+	        var seriesName = trim(lines.shift());
+
+	        var data = [];
+	        for (var i = 0; i < lines.length; i++) {
+	            var items = trim(lines[i]).split(itemSplitRegex);
+	            var name = '';
+	            var value;
+	            var hasName = false;
+	            if (isNaN(items[0])) { // First item is name
+	                hasName = true;
+	                name = items[0];
+	                items = items.slice(1);
+	                data[i] = {
+	                    name: name,
+	                    value: []
+	                };
+	                value = data[i].value;
+	            }
+	            else {
+	                value = data[i] = [];
+	            }
+	            for (var j = 0; j < items.length; j++) {
+	                value.push(+items[j]);
+	            }
+	            if (value.length === 1) {
+	                hasName ? (data[i].value = value[0]) : (data[i] = value[0]);
+	            }
+	        }
+
+	        return {
+	            name: seriesName,
+	            data: data
+	        };
+	    }
+
+	    /**
+	     * @param {string} str
+	     * @param {Array.<Object>} blockMetaList
+	     * @return {Object}
+	     * @inner
+	     */
+	    function parseContents(str, blockMetaList) {
+	        var blocks = str.split(new RegExp('\n*' + BLOCK_SPLITER + '\n*', 'g'));
+	        var newOption = {
+	            series: []
+	        };
+	        zrUtil.each(blocks, function (block, idx) {
+	            if (isTSVFormat(block)) {
+	                var result = parseTSVContents(block);
+	                var blockMeta = blockMetaList[idx];
+	                var axisKey = blockMeta.axisDim + 'Axis';
+
+	                if (blockMeta) {
+	                    newOption[axisKey] = newOption[axisKey] || [];
+	                    newOption[axisKey][blockMeta.axisIndex] = {
+	                        data: result.categories
+	                    };
+	                    newOption.series = newOption.series.concat(result.series);
+	                }
+	            }
+	            else {
+	                var result = parseListContents(block);
+	                newOption.series.push(result);
+	            }
+	        });
+	        return newOption;
+	    }
+
+	    /**
+	     * @alias {module:echarts/component/toolbox/feature/DataView}
+	     * @constructor
+	     * @param {module:echarts/model/Model} model
+	     */
+	    function DataView(model) {
+
+	        this._dom = null;
+
+	        this.model = model;
+	    }
+
+	    DataView.defaultOption = {
+	        show: true,
+	        readOnly: false,
+	        optionToContent: null,
+	        contentToOption: null,
+
+	        icon: 'M17.5,17.3H33 M17.5,17.3H33 M45.4,29.5h-28 M11.5,2v56H51V14.8L38.4,2H11.5z M38.4,2.2v12.7H51 M45.4,41.7h-28',
+	        title: '数据视图',
+	        lang: ['数据视图', '关闭', '刷新'],
+	        backgroundColor: '#fff',
+	        textColor: '#000',
+	        textareaColor: '#fff',
+	        textareaBorderColor: '#333',
+	        buttonColor: '#c23531',
+	        buttonTextColor: '#fff'
+	    };
+
+	    DataView.prototype.onclick = function (ecModel, api) {
+	        var container = api.getDom();
+	        var model = this.model;
+	        if (this._dom) {
+	            container.removeChild(this._dom);
+	        }
+	        var root = document.createElement('div');
+	        root.style.cssText = 'position:absolute;left:5px;top:5px;bottom:5px;right:5px;';
+	        root.style.backgroundColor = model.get('backgroundColor') || '#fff';
+
+	        // Create elements
+	        var header = document.createElement('h4');
+	        var lang = model.get('lang') || [];
+	        header.innerHTML = lang[0] || model.get('title');
+	        header.style.cssText = 'margin: 10px 20px;';
+	        header.style.color = model.get('textColor');
+
+	        var viewMain = document.createElement('div');
+	        var textarea = document.createElement('textarea');
+	        viewMain.style.cssText = 'display:block;width:100%;overflow:hidden;';
+
+	        var optionToContent = model.get('optionToContent');
+	        var contentToOption = model.get('contentToOption');
+	        var result = getContentFromModel(ecModel);
+	        if (typeof optionToContent === 'function') {
+	            var htmlOrDom = optionToContent(api.getOption());
+	            if (typeof htmlOrDom === 'string') {
+	                viewMain.innerHTML = htmlOrDom;
+	            }
+	            else if (zrUtil.isDom(htmlOrDom)) {
+	                viewMain.appendChild(htmlOrDom);
+	            }
+	        }
+	        else {
+	            // Use default textarea
+	            viewMain.appendChild(textarea);
+	            textarea.readOnly = model.get('readOnly');
+	            textarea.style.cssText = 'width:100%;height:100%;font-family:monospace;font-size:14px;line-height:1.6rem;';
+	            textarea.style.color = model.get('textColor');
+	            textarea.style.borderColor = model.get('textareaBorderColor');
+	            textarea.style.backgroundColor = model.get('textareaColor');
+	            textarea.value = result.value;
+	        }
+
+	        var blockMetaList = result.meta;
+
+	        var buttonContainer = document.createElement('div');
+	        buttonContainer.style.cssText = 'position:absolute;bottom:0;left:0;right:0;';
+
+	        var buttonStyle = 'float:right;margin-right:20px;border:none;'
+	            + 'cursor:pointer;padding:2px 5px;font-size:12px;border-radius:3px';
+	        var closeButton = document.createElement('div');
+	        var refreshButton = document.createElement('div');
+
+	        buttonStyle += ';background-color:' + model.get('buttonColor');
+	        buttonStyle += ';color:' + model.get('buttonTextColor');
+
+	        var self = this;
+
+	        function close() {
+	            container.removeChild(root);
+	            self._dom = null;
+	        }
+	        eventTool.addEventListener(closeButton, 'click', close);
+
+	        eventTool.addEventListener(refreshButton, 'click', function () {
+	            var newOption;
+	            try {
+	                if (typeof contentToOption === 'function') {
+	                    newOption = contentToOption(viewMain, api.getOption());
+	                }
+	                else {
+	                    newOption = parseContents(textarea.value, blockMetaList);
+	                }
+	            }
+	            catch (e) {
+	                close();
+	                throw new Error('Data view format error ' + e);
+	            }
+	            if (newOption) {
+	                api.dispatchAction({
+	                    type: 'changeDataView',
+	                    newOption: newOption
+	                });
+	            }
+
+	            close();
+	        });
+
+	        closeButton.innerHTML = lang[1];
+	        refreshButton.innerHTML = lang[2];
+	        refreshButton.style.cssText = buttonStyle;
+	        closeButton.style.cssText = buttonStyle;
+
+	        !model.get('readOnly') && buttonContainer.appendChild(refreshButton);
+	        buttonContainer.appendChild(closeButton);
+
+	        // http://stackoverflow.com/questions/6637341/use-tab-to-indent-in-textarea
+	        eventTool.addEventListener(textarea, 'keydown', function (e) {
+	            if ((e.keyCode || e.which) === 9) {
+	                // get caret position/selection
+	                var val = this.value;
+	                var start = this.selectionStart;
+	                var end = this.selectionEnd;
+
+	                // set textarea value to: text before caret + tab + text after caret
+	                this.value = val.substring(0, start) + ITEM_SPLITER + val.substring(end);
+
+	                // put caret at right position again
+	                this.selectionStart = this.selectionEnd = start + 1;
+
+	                // prevent the focus lose
+	                eventTool.stop(e);
+	            }
+	        });
+
+	        root.appendChild(header);
+	        root.appendChild(viewMain);
+	        root.appendChild(buttonContainer);
+
+	        viewMain.style.height = (container.clientHeight - 80) + 'px';
+
+	        container.appendChild(root);
+	        this._dom = root;
+	    };
+
+	    DataView.prototype.remove = function (ecModel, api) {
+	        this._dom && api.getDom().removeChild(this._dom);
+	    };
+
+	    DataView.prototype.dispose = function (ecModel, api) {
+	        this.remove(ecModel, api);
+	    };
+
+	    /**
+	     * @inner
+	     */
+	    function tryMergeDataOption(newData, originalData) {
+	        return zrUtil.map(newData, function (newVal, idx) {
+	            var original = originalData && originalData[idx];
+	            if (zrUtil.isObject(original) && !zrUtil.isArray(original)) {
+	                if (zrUtil.isObject(newVal) && !zrUtil.isArray(newVal)) {
+	                    newVal = newVal.value;
+	                }
+	                // Original data has option
+	                return zrUtil.defaults({
+	                    value: newVal
+	                }, original);
+	            }
+	            else {
+	                return newVal;
+	            }
+	        });
+	    }
+
+	    __webpack_require__(314).register('dataView', DataView);
+
+	    __webpack_require__(1).registerAction({
+	        type: 'changeDataView',
+	        event: 'dataViewChanged',
+	        update: 'prepareAndUpdate'
+	    }, function (payload, ecModel) {
+	        var newSeriesOptList = [];
+	        zrUtil.each(payload.newOption.series, function (seriesOpt) {
+	            var seriesModel = ecModel.getSeriesByName(seriesOpt.name)[0];
+	            if (!seriesModel) {
+	                // New created series
+	                // Geuss the series type
+	                newSeriesOptList.push(zrUtil.extend({
+	                    // Default is scatter
+	                    type: 'scatter'
+	                }, seriesOpt));
+	            }
+	            else {
+	                var originalData = seriesModel.get('data');
+	                newSeriesOptList.push({
+	                    name: seriesOpt.name,
+	                    data: tryMergeDataOption(seriesOpt.data, originalData)
+	                });
+	            }
+	        });
+
+	        ecModel.mergeOption(zrUtil.defaults({
+	            series: newSeriesOptList
+	        }, payload.newOption));
+	    });
+
+	    module.exports = DataView;
+
+
+/***/ },
+/* 372 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var BrushController = __webpack_require__(233);
+	    var brushHelper = __webpack_require__(309);
+	    var history = __webpack_require__(373);
+
+	    var each = zrUtil.each;
+
+	    // Use dataZoomSelect
+	    __webpack_require__(374);
+
+	    // Spectial component id start with \0ec\0, see echarts/model/Global.js~hasInnerId
+	    var DATA_ZOOM_ID_BASE = '\0_ec_\0toolbox-dataZoom_';
+
+	    function DataZoom(model, ecModel, api) {
+
+	        /**
+	         * @private
+	         * @type {module:echarts/component/helper/BrushController}
+	         */
+	        (this._brushController = new BrushController(api.getZr()))
+	            .on('brush', zrUtil.bind(this._onBrush, this))
+	            .mount();
+
+	        /**
+	         * @private
+	         * @type {boolean}
+	         */
+	        this._isZoomActive;
+	    }
+
+	    DataZoom.defaultOption = {
+	        show: true,
+	        // Icon group
+	        icon: {
+	            zoom: 'M0,13.5h26.9 M13.5,26.9V0 M32.1,13.5H58V58H13.5 V32.1',
+	            back: 'M22,1.4L9.9,13.5l12.3,12.3 M10.3,13.5H54.9v44.6 H10.3v-26'
+	        },
+	        title: {
+	            zoom: '区域缩放',
+	            back: '区域缩放还原'
+	        }
+	    };
+
+	    var proto = DataZoom.prototype;
+
+	    proto.render = function (featureModel, ecModel, api, payload) {
+	        this.model = featureModel;
+	        this.ecModel = ecModel;
+	        this.api = api;
+
+	        updateZoomBtnStatus(featureModel, ecModel, this, payload);
+	        updateBackBtnStatus(featureModel, ecModel);
+	    };
+
+	    proto.onclick = function (ecModel, api, type) {
+	        handlers[type].call(this);
+	    };
+
+	    proto.remove = function (ecModel, api) {
+	        this._brushController.unmount();
+	    };
+
+	    proto.dispose = function (ecModel, api) {
+	        this._brushController.dispose();
+	    };
+
+	    /**
+	     * @private
+	     */
+	    var handlers = {
+
+	        zoom: function () {
+	            var nextActive = !this._isZoomActive;
+
+	            this.api.dispatchAction({
+	                type: 'takeGlobalCursor',
+	                key: 'dataZoomSelect',
+	                dataZoomSelectActive: nextActive
+	            });
+	        },
+
+	        back: function () {
+	            this._dispatchZoomAction(history.pop(this.ecModel));
+	        }
+	    };
+
+	    /**
+	     * @private
+	     */
+	    proto._onBrush = function (areas, opt) {
+	        if (!opt.isEnd || !areas.length) {
+	            return;
+	        }
+	        var snapshot = {};
+	        var ecModel = this.ecModel;
+
+	        this._brushController.updateCovers([]); // remove cover
+
+	        var coordInfoList = brushHelper.makeCoordInfoList(
+	            retrieveAxisSetting(this.model.option), ecModel
+	        );
+	        var rangesCoordInfoList = [];
+	        brushHelper.parseOutputRanges(areas, coordInfoList, ecModel, rangesCoordInfoList);
+
+	        var area = areas[0]; // dataZoom can not multiple area.
+	        var coordInfo = rangesCoordInfoList[0];
+	        var coordRange = area.coordRange;
+	        var brushType = area.brushType;
+
+	        if (coordInfo && coordRange) {
+	            if (brushType === 'rect') {
+	                setBatch('xAxis', coordRange[0], coordInfo);
+	                setBatch('yAxis', coordRange[1], coordInfo);
+	            }
+	            else {
+	                var axisNames = {lineX: 'xAxis', lineY: 'yAxis'};
+	                setBatch(axisNames[brushType], coordRange, coordInfo);
+	            }
+	        }
+
+	        history.push(ecModel, snapshot);
+
+	        this._dispatchZoomAction(snapshot);
+
+	        function setBatch(axisName, minMax, coordInfo) {
+	            var dataZoomModel = findDataZoom(axisName, coordInfo[axisName], ecModel);
+	            if (dataZoomModel) {
+	                snapshot[dataZoomModel.id] = {
+	                    dataZoomId: dataZoomModel.id,
+	                    startValue: minMax[0],
+	                    endValue: minMax[1]
+	                };
+	            }
+	        }
+
+	        function findDataZoom(axisName, axisModel, ecModel) {
+	            var dataZoomModel;
+	            ecModel.eachComponent(
+	                {mainType: 'dataZoom', subType: 'select'},
+	                function (dzModel, dataZoomIndex) {
+	                    var axisIndex = dzModel.get(axisName + 'Index');
+	                    if (axisIndex != null
+	                        && ecModel.getComponent(axisName, axisIndex) === axisModel
+	                    ) {
+	                        dataZoomModel = dzModel;
+	                    }
+	                }
+	            );
+	            return dataZoomModel;
+	        }
+	    };
+
+	    /**
+	     * @private
+	     */
+	    proto._dispatchZoomAction = function (snapshot) {
+	        var batch = [];
+
+	        // Convert from hash map to array.
+	        each(snapshot, function (batchItem, dataZoomId) {
+	            batch.push(zrUtil.clone(batchItem));
+	        });
+
+	        batch.length && this.api.dispatchAction({
+	            type: 'dataZoom',
+	            from: this.uid,
+	            batch: batch
+	        });
+	    };
+
+	    function retrieveAxisSetting(option) {
+	        var setting = {};
+	        // Compatible with previous setting: null => all axis, false => no axis.
+	        zrUtil.each(['xAxisIndex', 'yAxisIndex'], function (name) {
+	            setting[name] = option[name];
+	            setting[name] == null && (setting[name] = 'all');
+	            (setting[name] === false || setting[name] === 'none') && (setting[name] = []);
+	        });
+	        return setting;
+	    }
+
+	    function updateBackBtnStatus(featureModel, ecModel) {
+	        featureModel.setIconStatus(
+	            'back',
+	            history.count(ecModel) > 1 ? 'emphasis' : 'normal'
+	        );
+	    }
+
+	    function updateZoomBtnStatus(featureModel, ecModel, view, payload) {
+	        var zoomActive = view._isZoomActive;
+
+	        if (payload && payload.type === 'takeGlobalCursor') {
+	            zoomActive = payload.key === 'dataZoomSelect'
+	                ? payload.dataZoomSelectActive : false;
+	        }
+
+	        view._isZoomActive = zoomActive;
+
+	        featureModel.setIconStatus('zoom', zoomActive ? 'emphasis' : 'normal');
+
+	        var coordInfoList = brushHelper.makeCoordInfoList(
+	            retrieveAxisSetting(featureModel.option), ecModel
+	        );
+	        var brushType = (coordInfoList.xAxisHas && !coordInfoList.yAxisHas)
+	            ? 'lineX'
+	            : (!coordInfoList.xAxisHas && coordInfoList.yAxisHas)
+	            ? 'lineY'
+	            : 'rect';
+
+	        view._brushController
+	            .setPanels(brushHelper.makePanelOpts(coordInfoList))
+	            .enableBrush(
+	                zoomActive
+	                ? {
+	                    brushType: brushType,
+	                    brushStyle: { // FIXME user customized?
+	                        lineWidth: 0,
+	                        // stroke: '#333',
+	                        fill: 'rgba(0,0,0,0.2)'
+	                    }
+	                }
+	                : false
+	            );
+	    }
+
+
+	    __webpack_require__(314).register('dataZoom', DataZoom);
+
+
+	    // Create special dataZoom option for select
+	    __webpack_require__(1).registerPreprocessor(function (option) {
+	        if (!option) {
+	            return;
+	        }
+
+	        var dataZoomOpts = option.dataZoom || (option.dataZoom = []);
+	        if (!zrUtil.isArray(dataZoomOpts)) {
+	            option.dataZoom = dataZoomOpts = [dataZoomOpts];
+	        }
+
+	        var toolboxOpt = option.toolbox;
+	        if (toolboxOpt) {
+	            // Assume there is only one toolbox
+	            if (zrUtil.isArray(toolboxOpt)) {
+	                toolboxOpt = toolboxOpt[0];
+	            }
+
+	            if (toolboxOpt && toolboxOpt.feature) {
+	                var dataZoomOpt = toolboxOpt.feature.dataZoom;
+	                addForAxis('xAxis', dataZoomOpt);
+	                addForAxis('yAxis', dataZoomOpt);
+	            }
+	        }
+
+	        function addForAxis(axisName, dataZoomOpt) {
+	            if (!dataZoomOpt) {
+	                return;
+	            }
+
+	            // Try not to modify model, because it is not merged yet.
+	            var axisIndicesName = axisName + 'Index';
+	            var givenAxisIndices = dataZoomOpt[axisIndicesName];
+	            if (givenAxisIndices != null
+	                && givenAxisIndices != 'all'
+	                && !zrUtil.isArray(givenAxisIndices)
+	            ) {
+	                givenAxisIndices = (givenAxisIndices === false || givenAxisIndices === 'none') ? [] : [givenAxisIndices];
+	            }
+
+	            forEachComponent(axisName, function (axisOpt, axisIndex) {
+	                if (givenAxisIndices != null
+	                    && givenAxisIndices != 'all'
+	                    && zrUtil.indexOf(givenAxisIndices, axisIndex) === -1
+	                ) {
+	                    return;
+	                }
+	                var newOpt = {
+	                    type: 'select',
+	                    $fromToolbox: true,
+	                    // Id for merge mapping.
+	                    id: DATA_ZOOM_ID_BASE + axisName + axisIndex
+	                };
+	                // FIXME
+	                // Only support one axis now.
+	                newOpt[axisIndicesName] = axisIndex;
+	                dataZoomOpts.push(newOpt);
+	            });
+	        }
+
+	        function forEachComponent(mainType, cb) {
+	            var opts = option[mainType];
+	            if (!zrUtil.isArray(opts)) {
+	                opts = opts ? [opts] : [];
+	            }
+	            each(opts, cb);
+	        }
+	    });
+
+	    module.exports = DataZoom;
+
+
+/***/ },
+/* 373 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @file History manager.
+	 */
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var each = zrUtil.each;
+
+	    var ATTR = '\0_ec_hist_store';
+
+	    var history = {
+
+	        /**
+	         * @public
+	         * @param {module:echarts/model/Global} ecModel
+	         * @param {Object} newSnapshot {dataZoomId, batch: [payloadInfo, ...]}
+	         */
+	        push: function (ecModel, newSnapshot) {
+	            var store = giveStore(ecModel);
+
+	            // If previous dataZoom can not be found,
+	            // complete an range with current range.
+	            each(newSnapshot, function (batchItem, dataZoomId) {
+	                var i = store.length - 1;
+	                for (; i >= 0; i--) {
+	                    var snapshot = store[i];
+	                    if (snapshot[dataZoomId]) {
+	                        break;
+	                    }
+	                }
+	                if (i < 0) {
+	                    // No origin range set, create one by current range.
+	                    var dataZoomModel = ecModel.queryComponents(
+	                        {mainType: 'dataZoom', subType: 'select', id: dataZoomId}
+	                    )[0];
+	                    if (dataZoomModel) {
+	                        var percentRange = dataZoomModel.getPercentRange();
+	                        store[0][dataZoomId] = {
+	                            dataZoomId: dataZoomId,
+	                            start: percentRange[0],
+	                            end: percentRange[1]
+	                        };
+	                    }
+	                }
+	            });
+
+	            store.push(newSnapshot);
+	        },
+
+	        /**
+	         * @public
+	         * @param {module:echarts/model/Global} ecModel
+	         * @return {Object} snapshot
+	         */
+	        pop: function (ecModel) {
+	            var store = giveStore(ecModel);
+	            var head = store[store.length - 1];
+	            store.length > 1 && store.pop();
+
+	            // Find top for all dataZoom.
+	            var snapshot = {};
+	            each(head, function (batchItem, dataZoomId) {
+	                for (var i = store.length - 1; i >= 0; i--) {
+	                    var batchItem = store[i][dataZoomId];
+	                    if (batchItem) {
+	                        snapshot[dataZoomId] = batchItem;
+	                        break;
+	                    }
+	                }
+	            });
+
+	            return snapshot;
+	        },
+
+	        /**
+	         * @public
+	         */
+	        clear: function (ecModel) {
+	            ecModel[ATTR] = null;
+	        },
+
+	        /**
+	         * @public
+	         * @param {module:echarts/model/Global} ecModel
+	         * @return {number} records. always >= 1.
+	         */
+	        count: function (ecModel) {
+	            return giveStore(ecModel).length;
+	        }
+
+	    };
+
+	    /**
+	     * [{key: dataZoomId, value: {dataZoomId, range}}, ...]
+	     * History length of each dataZoom may be different.
+	     * this._history[0] is used to store origin range.
+	     * @type {Array.<Object>}
+	     */
+	    function giveStore(ecModel) {
+	        var store = ecModel[ATTR];
+	        if (!store) {
+	            store = ecModel[ATTR] = [{}];
+	        }
+	        return store;
+	    }
+
+	    module.exports = history;
+
+
+
+/***/ },
+/* 374 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * DataZoom component entry
+	 */
+
+
+	    __webpack_require__(317);
+
+	    __webpack_require__(318);
+	    __webpack_require__(320);
+
+	    __webpack_require__(375);
+	    __webpack_require__(376);
+
+	    __webpack_require__(327);
+	    __webpack_require__(328);
+
+
+
+/***/ },
+/* 375 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @file Data zoom model
+	 */
+
+
+	    var DataZoomModel = __webpack_require__(318);
+
+	    module.exports = DataZoomModel.extend({
+
+	        type: 'dataZoom.select'
+
+	    });
+
+
+
+/***/ },
+/* 376 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    module.exports = __webpack_require__(320).extend({
+
+	        type: 'dataZoom.select'
+
+	    });
+
+
+
+/***/ },
+/* 377 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var history = __webpack_require__(373);
+
+	    function Restore(model) {
+	        this.model = model;
+	    }
+
+	    Restore.defaultOption = {
+	        show: true,
+	        icon: 'M3.8,33.4 M47,18.9h9.8V8.7 M56.3,20.1 C52.1,9,40.5,0.6,26.8,2.1C12.6,3.7,1.6,16.2,2.1,30.6 M13,41.1H3.1v10.2 M3.7,39.9c4.2,11.1,15.8,19.5,29.5,18 c14.2-1.6,25.2-14.1,24.7-28.5',
+	        title: '还原'
+	    };
+
+	    var proto = Restore.prototype;
+
+	    proto.onclick = function (ecModel, api, type) {
+	        history.clear(ecModel);
+
+	        api.dispatchAction({
+	            type: 'restore',
+	            from: this.uid
+	        });
+	    };
+
+
+	    __webpack_require__(314).register('restore', Restore);
+
+
+	    __webpack_require__(1).registerAction(
+	        {type: 'restore', event: 'restore', update: 'prepareAndUpdate'},
+	        function (payload, ecModel) {
+	            ecModel.resetOption('recreate');
+	        }
+	    );
+
+	    module.exports = Restore;
+
+
+/***/ },
+/* 378 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+	    __webpack_require__(379);
+	    __webpack_require__(81).registerPainter('vml', __webpack_require__(381));
+
+
+/***/ },
+/* 379 */
+/***/ function(module, exports, __webpack_require__) {
+
+	// http://www.w3.org/TR/NOTE-VML
+	// TODO Use proxy like svg instead of overwrite brush methods
+
+
+	if (!__webpack_require__(2).canvasSupported) {
+	    var vec2 = __webpack_require__(10);
+	    var BoundingRect = __webpack_require__(9);
+	    var CMD = __webpack_require__(49).CMD;
+	    var colorTool = __webpack_require__(39);
+	    var textContain = __webpack_require__(8);
+	    var RectText = __webpack_require__(48);
+	    var Displayable = __webpack_require__(46);
+	    var ZImage = __webpack_require__(62);
+	    var Text = __webpack_require__(64);
+	    var Path = __webpack_require__(45);
+
+	    var Gradient = __webpack_require__(61);
+
+	    var vmlCore = __webpack_require__(380);
+
+	    var round = Math.round;
+	    var sqrt = Math.sqrt;
+	    var abs = Math.abs;
+	    var cos = Math.cos;
+	    var sin = Math.sin;
+	    var mathMax = Math.max;
+
+	    var applyTransform = vec2.applyTransform;
+
+	    var comma = ',';
+	    var imageTransformPrefix = 'progid:DXImageTransform.Microsoft';
+
+	    var Z = 21600;
+	    var Z2 = Z / 2;
+
+	    var ZLEVEL_BASE = 100000;
+	    var Z_BASE = 1000;
+
+	    var initRootElStyle = function (el) {
+	        el.style.cssText = 'position:absolute;left:0;top:0;width:1px;height:1px;';
+	        el.coordsize = Z + ','  + Z;
+	        el.coordorigin = '0,0';
+	    };
+
+	    var encodeHtmlAttribute = function (s) {
+	        return String(s).replace(/&/g, '&amp;').replace(/"/g, '&quot;');
+	    };
+
+	    var rgb2Str = function (r, g, b) {
+	        return 'rgb(' + [r, g, b].join(',') + ')';
+	    };
+
+	    var append = function (parent, child) {
+	        if (child && parent && child.parentNode !== parent) {
+	            parent.appendChild(child);
+	        }
+	    };
+
+	    var remove = function (parent, child) {
+	        if (child && parent && child.parentNode === parent) {
+	            parent.removeChild(child);
+	        }
+	    };
+
+	    var getZIndex = function (zlevel, z, z2) {
+	        // z 的取值范围为 [0, 1000]
+	        return (parseFloat(zlevel) || 0) * ZLEVEL_BASE + (parseFloat(z) || 0) * Z_BASE + z2;
+	    };
+
+	    var parsePercent = function (value, maxValue) {
+	        if (typeof value === 'string') {
+	            if (value.lastIndexOf('%') >= 0) {
+	                return parseFloat(value) / 100 * maxValue;
+	            }
+	            return parseFloat(value);
+	        }
+	        return value;
+	    };
+
+	    /***************************************************
+	     * PATH
+	     **************************************************/
+
+	    var setColorAndOpacity = function (el, color, opacity) {
+	        var colorArr = colorTool.parse(color);
+	        opacity = +opacity;
+	        if (isNaN(opacity)) {
+	            opacity = 1;
+	        }
+	        if (colorArr) {
+	            el.color = rgb2Str(colorArr[0], colorArr[1], colorArr[2]);
+	            el.opacity = opacity * colorArr[3];
+	        }
+	    };
+
+	    var getColorAndAlpha = function (color) {
+	        var colorArr = colorTool.parse(color);
+	        return [
+	            rgb2Str(colorArr[0], colorArr[1], colorArr[2]),
+	            colorArr[3]
+	        ];
+	    };
+
+	    var updateFillNode = function (el, style, zrEl) {
+	        // TODO pattern
+	        var fill = style.fill;
+	        if (fill != null) {
+	            // Modified from excanvas
+	            if (fill instanceof Gradient) {
+	                var gradientType;
+	                var angle = 0;
+	                var focus = [0, 0];
+	                // additional offset
+	                var shift = 0;
+	                // scale factor for offset
+	                var expansion = 1;
+	                var rect = zrEl.getBoundingRect();
+	                var rectWidth = rect.width;
+	                var rectHeight = rect.height;
+	                if (fill.type === 'linear') {
+	                    gradientType = 'gradient';
+	                    var transform = zrEl.transform;
+	                    var p0 = [fill.x * rectWidth, fill.y * rectHeight];
+	                    var p1 = [fill.x2 * rectWidth, fill.y2 * rectHeight];
+	                    if (transform) {
+	                        applyTransform(p0, p0, transform);
+	                        applyTransform(p1, p1, transform);
+	                    }
+	                    var dx = p1[0] - p0[0];
+	                    var dy = p1[1] - p0[1];
+	                    angle = Math.atan2(dx, dy) * 180 / Math.PI;
+	                    // The angle should be a non-negative number.
+	                    if (angle < 0) {
+	                        angle += 360;
+	                    }
+
+	                    // Very small angles produce an unexpected result because they are
+	                    // converted to a scientific notation string.
+	                    if (angle < 1e-6) {
+	                        angle = 0;
+	                    }
+	                }
+	                else {
+	                    gradientType = 'gradientradial';
+	                    var p0 = [fill.x * rectWidth, fill.y * rectHeight];
+	                    var transform = zrEl.transform;
+	                    var scale = zrEl.scale;
+	                    var width = rectWidth;
+	                    var height = rectHeight;
+	                    focus = [
+	                        // Percent in bounding rect
+	                        (p0[0] - rect.x) / width,
+	                        (p0[1] - rect.y) / height
+	                    ];
+	                    if (transform) {
+	                        applyTransform(p0, p0, transform);
+	                    }
+
+	                    width /= scale[0] * Z;
+	                    height /= scale[1] * Z;
+	                    var dimension = mathMax(width, height);
+	                    shift = 2 * 0 / dimension;
+	                    expansion = 2 * fill.r / dimension - shift;
+	                }
+
+	                // We need to sort the color stops in ascending order by offset,
+	                // otherwise IE won't interpret it correctly.
+	                var stops = fill.colorStops.slice();
+	                stops.sort(function(cs1, cs2) {
+	                    return cs1.offset - cs2.offset;
+	                });
+
+	                var length = stops.length;
+	                // Color and alpha list of first and last stop
+	                var colorAndAlphaList = [];
+	                var colors = [];
+	                for (var i = 0; i < length; i++) {
+	                    var stop = stops[i];
+	                    var colorAndAlpha = getColorAndAlpha(stop.color);
+	                    colors.push(stop.offset * expansion + shift + ' ' + colorAndAlpha[0]);
+	                    if (i === 0 || i === length - 1) {
+	                        colorAndAlphaList.push(colorAndAlpha);
+	                    }
+	                }
+
+	                if (length >= 2) {
+	                    var color1 = colorAndAlphaList[0][0];
+	                    var color2 = colorAndAlphaList[1][0];
+	                    var opacity1 = colorAndAlphaList[0][1] * style.opacity;
+	                    var opacity2 = colorAndAlphaList[1][1] * style.opacity;
+
+	                    el.type = gradientType;
+	                    el.method = 'none';
+	                    el.focus = '100%';
+	                    el.angle = angle;
+	                    el.color = color1;
+	                    el.color2 = color2;
+	                    el.colors = colors.join(',');
+	                    // When colors attribute is used, the meanings of opacity and o:opacity2
+	                    // are reversed.
+	                    el.opacity = opacity2;
+	                    // FIXME g_o_:opacity ?
+	                    el.opacity2 = opacity1;
+	                }
+	                if (gradientType === 'radial') {
+	                    el.focusposition = focus.join(',');
+	                }
+	            }
+	            else {
+	                // FIXME Change from Gradient fill to color fill
+	                setColorAndOpacity(el, fill, style.opacity);
+	            }
+	        }
+	    };
+
+	    var updateStrokeNode = function (el, style) {
+	        // if (style.lineJoin != null) {
+	        //     el.joinstyle = style.lineJoin;
+	        // }
+	        // if (style.miterLimit != null) {
+	        //     el.miterlimit = style.miterLimit * Z;
+	        // }
+	        // if (style.lineCap != null) {
+	        //     el.endcap = style.lineCap;
+	        // }
+	        if (style.lineDash != null) {
+	            el.dashstyle = style.lineDash.join(' ');
+	        }
+	        if (style.stroke != null && !(style.stroke instanceof Gradient)) {
+	            setColorAndOpacity(el, style.stroke, style.opacity);
+	        }
+	    };
+
+	    var updateFillAndStroke = function (vmlEl, type, style, zrEl) {
+	        var isFill = type == 'fill';
+	        var el = vmlEl.getElementsByTagName(type)[0];
+	        // Stroke must have lineWidth
+	        if (style[type] != null && style[type] !== 'none' && (isFill || (!isFill && style.lineWidth))) {
+	            vmlEl[isFill ? 'filled' : 'stroked'] = 'true';
+	            // FIXME Remove before updating, or set `colors` will throw error
+	            if (style[type] instanceof Gradient) {
+	                remove(vmlEl, el);
+	            }
+	            if (!el) {
+	                el = vmlCore.createNode(type);
+	            }
+
+	            isFill ? updateFillNode(el, style, zrEl) : updateStrokeNode(el, style);
+	            append(vmlEl, el);
+	        }
+	        else {
+	            vmlEl[isFill ? 'filled' : 'stroked'] = 'false';
+	            remove(vmlEl, el);
+	        }
+	    };
+
+	    var points = [[], [], []];
+	    var pathDataToString = function (data, m) {
+	        var M = CMD.M;
+	        var C = CMD.C;
+	        var L = CMD.L;
+	        var A = CMD.A;
+	        var Q = CMD.Q;
+
+	        var str = [];
+	        var nPoint;
+	        var cmdStr;
+	        var cmd;
+	        var i;
+	        var xi;
+	        var yi;
+	        for (i = 0; i < data.length;) {
+	            cmd = data[i++];
+	            cmdStr = '';
+	            nPoint = 0;
+	            switch (cmd) {
+	                case M:
+	                    cmdStr = ' m ';
+	                    nPoint = 1;
+	                    xi = data[i++];
+	                    yi = data[i++];
+	                    points[0][0] = xi;
+	                    points[0][1] = yi;
+	                    break;
+	                case L:
+	                    cmdStr = ' l ';
+	                    nPoint = 1;
+	                    xi = data[i++];
+	                    yi = data[i++];
+	                    points[0][0] = xi;
+	                    points[0][1] = yi;
+	                    break;
+	                case Q:
+	                case C:
+	                    cmdStr = ' c ';
+	                    nPoint = 3;
+	                    var x1 = data[i++];
+	                    var y1 = data[i++];
+	                    var x2 = data[i++];
+	                    var y2 = data[i++];
+	                    var x3;
+	                    var y3;
+	                    if (cmd === Q) {
+	                        // Convert quadratic to cubic using degree elevation
+	                        x3 = x2;
+	                        y3 = y2;
+	                        x2 = (x2 + 2 * x1) / 3;
+	                        y2 = (y2 + 2 * y1) / 3;
+	                        x1 = (xi + 2 * x1) / 3;
+	                        y1 = (yi + 2 * y1) / 3;
+	                    }
+	                    else {
+	                        x3 = data[i++];
+	                        y3 = data[i++];
+	                    }
+	                    points[0][0] = x1;
+	                    points[0][1] = y1;
+	                    points[1][0] = x2;
+	                    points[1][1] = y2;
+	                    points[2][0] = x3;
+	                    points[2][1] = y3;
+
+	                    xi = x3;
+	                    yi = y3;
+	                    break;
+	                case A:
+	                    var x = 0;
+	                    var y = 0;
+	                    var sx = 1;
+	                    var sy = 1;
+	                    var angle = 0;
+	                    if (m) {
+	                        // Extract SRT from matrix
+	                        x = m[4];
+	                        y = m[5];
+	                        sx = sqrt(m[0] * m[0] + m[1] * m[1]);
+	                        sy = sqrt(m[2] * m[2] + m[3] * m[3]);
+	                        angle = Math.atan2(-m[1] / sy, m[0] / sx);
+	                    }
+
+	                    var cx = data[i++];
+	                    var cy = data[i++];
+	                    var rx = data[i++];
+	                    var ry = data[i++];
+	                    var startAngle = data[i++] + angle;
+	                    var endAngle = data[i++] + startAngle + angle;
+	                    // FIXME
+	                    // var psi = data[i++];
+	                    i++;
+	                    var clockwise = data[i++];
+
+	                    var x0 = cx + cos(startAngle) * rx;
+	                    var y0 = cy + sin(startAngle) * ry;
+
+	                    var x1 = cx + cos(endAngle) * rx;
+	                    var y1 = cy + sin(endAngle) * ry;
+
+	                    var type = clockwise ? ' wa ' : ' at ';
+	                    if (Math.abs(x0 - x1) < 1e-10) {
+	                        // IE won't render arches drawn counter clockwise if x0 == x1.
+	                        if (Math.abs(endAngle - startAngle) > 1e-2) {
+	                            // Offset x0 by 1/80 of a pixel. Use something
+	                            // that can be represented in binary
+	                            if (clockwise) {
+	                                x0 += 270 / Z;
+	                            }
+	                        }
+	                        else {
+	                            // Avoid case draw full circle
+	                            if (Math.abs(y0 - cy) < 1e-10) {
+	                                if ((clockwise && x0 < cx) || (!clockwise && x0 > cx)) {
+	                                    y1 -= 270 / Z;
+	                                }
+	                                else {
+	                                    y1 += 270 / Z;
+	                                }
+	                            }
+	                            else if ((clockwise && y0 < cy) || (!clockwise && y0 > cy)) {
+	                                x1 += 270 / Z;
+	                            }
+	                            else {
+	                                x1 -= 270 / Z;
+	                            }
+	                        }
+	                    }
+	                    str.push(
+	                        type,
+	                        round(((cx - rx) * sx + x) * Z - Z2), comma,
+	                        round(((cy - ry) * sy + y) * Z - Z2), comma,
+	                        round(((cx + rx) * sx + x) * Z - Z2), comma,
+	                        round(((cy + ry) * sy + y) * Z - Z2), comma,
+	                        round((x0 * sx + x) * Z - Z2), comma,
+	                        round((y0 * sy + y) * Z - Z2), comma,
+	                        round((x1 * sx + x) * Z - Z2), comma,
+	                        round((y1 * sy + y) * Z - Z2)
+	                    );
+
+	                    xi = x1;
+	                    yi = y1;
+	                    break;
+	                case CMD.R:
+	                    var p0 = points[0];
+	                    var p1 = points[1];
+	                    // x0, y0
+	                    p0[0] = data[i++];
+	                    p0[1] = data[i++];
+	                    // x1, y1
+	                    p1[0] = p0[0] + data[i++];
+	                    p1[1] = p0[1] + data[i++];
+
+	                    if (m) {
+	                        applyTransform(p0, p0, m);
+	                        applyTransform(p1, p1, m);
+	                    }
+
+	                    p0[0] = round(p0[0] * Z - Z2);
+	                    p1[0] = round(p1[0] * Z - Z2);
+	                    p0[1] = round(p0[1] * Z - Z2);
+	                    p1[1] = round(p1[1] * Z - Z2);
+	                    str.push(
+	                        // x0, y0
+	                        ' m ', p0[0], comma, p0[1],
+	                        // x1, y0
+	                        ' l ', p1[0], comma, p0[1],
+	                        // x1, y1
+	                        ' l ', p1[0], comma, p1[1],
+	                        // x0, y1
+	                        ' l ', p0[0], comma, p1[1]
+	                    );
+	                    break;
+	                case CMD.Z:
+	                    // FIXME Update xi, yi
+	                    str.push(' x ');
+	            }
+
+	            if (nPoint > 0) {
+	                str.push(cmdStr);
+	                for (var k = 0; k < nPoint; k++) {
+	                    var p = points[k];
+
+	                    m && applyTransform(p, p, m);
+	                    // 不 round 会非常慢
+	                    str.push(
+	                        round(p[0] * Z - Z2), comma, round(p[1] * Z - Z2),
+	                        k < nPoint - 1 ? comma : ''
+	                    );
+	                }
+	            }
+	        }
+
+	        return str.join('');
+	    };
+
+	    // Rewrite the original path method
+	    Path.prototype.brushVML = function (vmlRoot) {
+	        var style = this.style;
+
+	        var vmlEl = this._vmlEl;
+	        if (!vmlEl) {
+	            vmlEl = vmlCore.createNode('shape');
+	            initRootElStyle(vmlEl);
+
+	            this._vmlEl = vmlEl;
+	        }
+
+	        updateFillAndStroke(vmlEl, 'fill', style, this);
+	        updateFillAndStroke(vmlEl, 'stroke', style, this);
+
+	        var m = this.transform;
+	        var needTransform = m != null;
+	        var strokeEl = vmlEl.getElementsByTagName('stroke')[0];
+	        if (strokeEl) {
+	            var lineWidth = style.lineWidth;
+	            // Get the line scale.
+	            // Determinant of this.m_ means how much the area is enlarged by the
+	            // transformation. So its square root can be used as a scale factor
+	            // for width.
+	            if (needTransform && !style.strokeNoScale) {
+	                var det = m[0] * m[3] - m[1] * m[2];
+	                lineWidth *= sqrt(abs(det));
+	            }
+	            strokeEl.weight = lineWidth + 'px';
+	        }
+
+	        var path = this.path;
+	        if (this.__dirtyPath) {
+	            path.beginPath();
+	            this.buildPath(path, this.shape);
+	            path.toStatic();
+	            this.__dirtyPath = false;
+	        }
+
+	        vmlEl.path = pathDataToString(path.data, this.transform);
+
+	        vmlEl.style.zIndex = getZIndex(this.zlevel, this.z, this.z2);
+
+	        // Append to root
+	        append(vmlRoot, vmlEl);
+
+	        // Text
+	        if (style.text) {
+	            this.drawRectText(vmlRoot, this.getBoundingRect());
+	        }
+	        else {
+	            this.removeRectText(vmlRoot);
+	        }
+	    };
+
+	    Path.prototype.onRemove = function (vmlRoot) {
+	        remove(vmlRoot, this._vmlEl);
+	        this.removeRectText(vmlRoot);
+	    };
+
+	    Path.prototype.onAdd = function (vmlRoot) {
+	        append(vmlRoot, this._vmlEl);
+	        this.appendRectText(vmlRoot);
+	    };
+
+	    /***************************************************
+	     * IMAGE
+	     **************************************************/
+	    var isImage = function (img) {
+	        // FIXME img instanceof Image 如果 img 是一个字符串的时候，IE8 下会报错
+	        return (typeof img === 'object') && img.tagName && img.tagName.toUpperCase() === 'IMG';
+	        // return img instanceof Image;
+	    };
+
+	    // Rewrite the original path method
+	    ZImage.prototype.brushVML = function (vmlRoot) {
+	        var style = this.style;
+	        var image = style.image;
+
+	        // Image original width, height
+	        var ow;
+	        var oh;
+
+	        if (isImage(image)) {
+	            var src = image.src;
+	            if (src === this._imageSrc) {
+	                ow = this._imageWidth;
+	                oh = this._imageHeight;
+	            }
+	            else {
+	                var imageRuntimeStyle = image.runtimeStyle;
+	                var oldRuntimeWidth = imageRuntimeStyle.width;
+	                var oldRuntimeHeight = imageRuntimeStyle.height;
+	                imageRuntimeStyle.width = 'auto';
+	                imageRuntimeStyle.height = 'auto';
+
+	                // get the original size
+	                ow = image.width;
+	                oh = image.height;
+
+	                // and remove overides
+	                imageRuntimeStyle.width = oldRuntimeWidth;
+	                imageRuntimeStyle.height = oldRuntimeHeight;
+
+	                // Caching image original width, height and src
+	                this._imageSrc = src;
+	                this._imageWidth = ow;
+	                this._imageHeight = oh;
+	            }
+	            image = src;
+	        }
+	        else {
+	            if (image === this._imageSrc) {
+	                ow = this._imageWidth;
+	                oh = this._imageHeight;
+	            }
+	        }
+	        if (!image) {
+	            return;
+	        }
+
+	        var x = style.x || 0;
+	        var y = style.y || 0;
+
+	        var dw = style.width;
+	        var dh = style.height;
+
+	        var sw = style.sWidth;
+	        var sh = style.sHeight;
+	        var sx = style.sx || 0;
+	        var sy = style.sy || 0;
+
+	        var hasCrop = sw && sh;
+
+	        var vmlEl = this._vmlEl;
+	        if (!vmlEl) {
+	            // FIXME 使用 group 在 left, top 都不是 0 的时候就无法显示了。
+	            // vmlEl = vmlCore.createNode('group');
+	            vmlEl = vmlCore.doc.createElement('div');
+	            initRootElStyle(vmlEl);
+
+	            this._vmlEl = vmlEl;
+	        }
+
+	        var vmlElStyle = vmlEl.style;
+	        var hasRotation = false;
+	        var m;
+	        var scaleX = 1;
+	        var scaleY = 1;
+	        if (this.transform) {
+	            m = this.transform;
+	            scaleX = sqrt(m[0] * m[0] + m[1] * m[1]);
+	            scaleY = sqrt(m[2] * m[2] + m[3] * m[3]);
+
+	            hasRotation = m[1] || m[2];
+	        }
+	        if (hasRotation) {
+	            // If filters are necessary (rotation exists), create them
+	            // filters are bog-slow, so only create them if abbsolutely necessary
+	            // The following check doesn't account for skews (which don't exist
+	            // in the canvas spec (yet) anyway.
+	            // From excanvas
+	            var p0 = [x, y];
+	            var p1 = [x + dw, y];
+	            var p2 = [x, y + dh];
+	            var p3 = [x + dw, y + dh];
+	            applyTransform(p0, p0, m);
+	            applyTransform(p1, p1, m);
+	            applyTransform(p2, p2, m);
+	            applyTransform(p3, p3, m);
+
+	            var maxX = mathMax(p0[0], p1[0], p2[0], p3[0]);
+	            var maxY = mathMax(p0[1], p1[1], p2[1], p3[1]);
+
+	            var transformFilter = [];
+	            transformFilter.push('M11=', m[0] / scaleX, comma,
+	                        'M12=', m[2] / scaleY, comma,
+	                        'M21=', m[1] / scaleX, comma,
+	                        'M22=', m[3] / scaleY, comma,
+	                        'Dx=', round(x * scaleX + m[4]), comma,
+	                        'Dy=', round(y * scaleY + m[5]));
+
+	            vmlElStyle.padding = '0 ' + round(maxX) + 'px ' + round(maxY) + 'px 0';
+	            // FIXME DXImageTransform 在 IE11 的兼容模式下不起作用
+	            vmlElStyle.filter = imageTransformPrefix + '.Matrix('
+	                + transformFilter.join('') + ', SizingMethod=clip)';
+
+	        }
+	        else {
+	            if (m) {
+	                x = x * scaleX + m[4];
+	                y = y * scaleY + m[5];
+	            }
+	            vmlElStyle.filter = '';
+	            vmlElStyle.left = round(x) + 'px';
+	            vmlElStyle.top = round(y) + 'px';
+	        }
+
+	        var imageEl = this._imageEl;
+	        var cropEl = this._cropEl;
+
+	        if (!imageEl) {
+	            imageEl = vmlCore.doc.createElement('div');
+	            this._imageEl = imageEl;
+	        }
+	        var imageELStyle = imageEl.style;
+	        if (hasCrop) {
+	            // Needs know image original width and height
+	            if (! (ow && oh)) {
+	                var tmpImage = new Image();
+	                var self = this;
+	                tmpImage.onload = function () {
+	                    tmpImage.onload = null;
+	                    ow = tmpImage.width;
+	                    oh = tmpImage.height;
+	                    // Adjust image width and height to fit the ratio destinationSize / sourceSize
+	                    imageELStyle.width = round(scaleX * ow * dw / sw) + 'px';
+	                    imageELStyle.height = round(scaleY * oh * dh / sh) + 'px';
+
+	                    // Caching image original width, height and src
+	                    self._imageWidth = ow;
+	                    self._imageHeight = oh;
+	                    self._imageSrc = image;
+	                };
+	                tmpImage.src = image;
+	            }
+	            else {
+	                imageELStyle.width = round(scaleX * ow * dw / sw) + 'px';
+	                imageELStyle.height = round(scaleY * oh * dh / sh) + 'px';
+	            }
+
+	            if (! cropEl) {
+	                cropEl = vmlCore.doc.createElement('div');
+	                cropEl.style.overflow = 'hidden';
+	                this._cropEl = cropEl;
+	            }
+	            var cropElStyle = cropEl.style;
+	            cropElStyle.width = round((dw + sx * dw / sw) * scaleX);
+	            cropElStyle.height = round((dh + sy * dh / sh) * scaleY);
+	            cropElStyle.filter = imageTransformPrefix + '.Matrix(Dx='
+	                    + (-sx * dw / sw * scaleX) + ',Dy=' + (-sy * dh / sh * scaleY) + ')';
+
+	            if (! cropEl.parentNode) {
+	                vmlEl.appendChild(cropEl);
+	            }
+	            if (imageEl.parentNode != cropEl) {
+	                cropEl.appendChild(imageEl);
+	            }
+	        }
+	        else {
+	            imageELStyle.width = round(scaleX * dw) + 'px';
+	            imageELStyle.height = round(scaleY * dh) + 'px';
+
+	            vmlEl.appendChild(imageEl);
+
+	            if (cropEl && cropEl.parentNode) {
+	                vmlEl.removeChild(cropEl);
+	                this._cropEl = null;
+	            }
+	        }
+
+	        var filterStr = '';
+	        var alpha = style.opacity;
+	        if (alpha < 1) {
+	            filterStr += '.Alpha(opacity=' + round(alpha * 100) + ') ';
+	        }
+	        filterStr += imageTransformPrefix + '.AlphaImageLoader(src=' + image + ', SizingMethod=scale)';
+
+	        imageELStyle.filter = filterStr;
+
+	        vmlEl.style.zIndex = getZIndex(this.zlevel, this.z, this.z2);
+
+	        // Append to root
+	        append(vmlRoot, vmlEl);
+
+	        // Text
+	        if (style.text) {
+	            this.drawRectText(vmlRoot, this.getBoundingRect());
+	        }
+	    };
+
+	    ZImage.prototype.onRemove = function (vmlRoot) {
+	        remove(vmlRoot, this._vmlEl);
+
+	        this._vmlEl = null;
+	        this._cropEl = null;
+	        this._imageEl = null;
+
+	        this.removeRectText(vmlRoot);
+	    };
+
+	    ZImage.prototype.onAdd = function (vmlRoot) {
+	        append(vmlRoot, this._vmlEl);
+	        this.appendRectText(vmlRoot);
+	    };
+
+
+	    /***************************************************
+	     * TEXT
+	     **************************************************/
+
+	    var DEFAULT_STYLE_NORMAL = 'normal';
+
+	    var fontStyleCache = {};
+	    var fontStyleCacheCount = 0;
+	    var MAX_FONT_CACHE_SIZE = 100;
+	    var fontEl = document.createElement('div');
+
+	    var getFontStyle = function (fontString) {
+	        var fontStyle = fontStyleCache[fontString];
+	        if (!fontStyle) {
+	            // Clear cache
+	            if (fontStyleCacheCount > MAX_FONT_CACHE_SIZE) {
+	                fontStyleCacheCount = 0;
+	                fontStyleCache = {};
+	            }
+
+	            var style = fontEl.style;
+	            var fontFamily;
+	            try {
+	                style.font = fontString;
+	                fontFamily = style.fontFamily.split(',')[0];
+	            }
+	            catch (e) {
+	            }
+
+	            fontStyle = {
+	                style: style.fontStyle || DEFAULT_STYLE_NORMAL,
+	                variant: style.fontVariant || DEFAULT_STYLE_NORMAL,
+	                weight: style.fontWeight || DEFAULT_STYLE_NORMAL,
+	                size: parseFloat(style.fontSize || 12) | 0,
+	                family: fontFamily || 'Microsoft YaHei'
+	            };
+
+	            fontStyleCache[fontString] = fontStyle;
+	            fontStyleCacheCount++;
+	        }
+	        return fontStyle;
+	    };
+
+	    var textMeasureEl;
+	    // Overwrite measure text method
+	    textContain.measureText = function (text, textFont) {
+	        var doc = vmlCore.doc;
+	        if (!textMeasureEl) {
+	            textMeasureEl = doc.createElement('div');
+	            textMeasureEl.style.cssText = 'position:absolute;top:-20000px;left:0;'
+	                + 'padding:0;margin:0;border:none;white-space:pre;';
+	            vmlCore.doc.body.appendChild(textMeasureEl);
+	        }
+
+	        try {
+	            textMeasureEl.style.font = textFont;
+	        } catch (ex) {
+	            // Ignore failures to set to invalid font.
+	        }
+	        textMeasureEl.innerHTML = '';
+	        // Don't use innerHTML or innerText because they allow markup/whitespace.
+	        textMeasureEl.appendChild(doc.createTextNode(text));
+	        return {
+	            width: textMeasureEl.offsetWidth
+	        };
+	    };
+
+	    var tmpRect = new BoundingRect();
+
+	    var drawRectText = function (vmlRoot, rect, textRect, fromTextEl) {
+
+	        var style = this.style;
+	        var text = style.text;
+	        if (!text) {
+	            return;
+	        }
+
+	        var x;
+	        var y;
+	        var align = style.textAlign;
+	        var fontStyle = getFontStyle(style.textFont);
+	        // FIXME encodeHtmlAttribute ?
+	        var font = fontStyle.style + ' ' + fontStyle.variant + ' ' + fontStyle.weight + ' '
+	            + fontStyle.size + 'px "' + fontStyle.family + '"';
+
+	        var baseline = style.textBaseline;
+	        var verticalAlign = style.textVerticalAlign;
+
+	        textRect = textRect || textContain.getBoundingRect(text, font, align, baseline);
+
+	        // Transform rect to view space
+	        var m = this.transform;
+	        // Ignore transform for text in other element
+	        if (m && !fromTextEl) {
+	            tmpRect.copy(rect);
+	            tmpRect.applyTransform(m);
+	            rect = tmpRect;
+	        }
+
+	        if (!fromTextEl) {
+	            var textPosition = style.textPosition;
+	            var distance = style.textDistance;
+	            // Text position represented by coord
+	            if (textPosition instanceof Array) {
+	                x = rect.x + parsePercent(textPosition[0], rect.width);
+	                y = rect.y + parsePercent(textPosition[1], rect.height);
+
+	                align = align || 'left';
+	                baseline = baseline || 'top';
+	            }
+	            else {
+	                var res = textContain.adjustTextPositionOnRect(
+	                    textPosition, rect, textRect, distance
+	                );
+	                x = res.x;
+	                y = res.y;
+
+	                // Default align and baseline when has textPosition
+	                align = align || res.textAlign;
+	                baseline = baseline || res.textBaseline;
+	            }
+	        }
+	        else {
+	            x = rect.x;
+	            y = rect.y;
+	        }
+	        if (verticalAlign) {
+	            switch (verticalAlign) {
+	                case 'middle':
+	                    y -= textRect.height / 2;
+	                    break;
+	                case 'bottom':
+	                    y -= textRect.height;
+	                    break;
+	                // 'top'
+	            }
+	            // Ignore baseline
+	            baseline = 'top';
+	        }
+
+	        var fontSize = fontStyle.size;
+	        // 1.75 is an arbitrary number, as there is no info about the text baseline
+	        switch (baseline) {
+	            case 'hanging':
+	            case 'top':
+	                y += fontSize / 1.75;
+	                break;
+	            case 'middle':
+	                break;
+	            default:
+	            // case null:
+	            // case 'alphabetic':
+	            // case 'ideographic':
+	            // case 'bottom':
+	                y -= fontSize / 2.25;
+	                break;
+	        }
+	        switch (align) {
+	            case 'left':
+	                break;
+	            case 'center':
+	                x -= textRect.width / 2;
+	                break;
+	            case 'right':
+	                x -= textRect.width;
+	                break;
+	            // case 'end':
+	                // align = elementStyle.direction == 'ltr' ? 'right' : 'left';
+	                // break;
+	            // case 'start':
+	                // align = elementStyle.direction == 'rtl' ? 'right' : 'left';
+	                // break;
+	            // default:
+	            //     align = 'left';
+	        }
+
+	        var createNode = vmlCore.createNode;
+
+	        var textVmlEl = this._textVmlEl;
+	        var pathEl;
+	        var textPathEl;
+	        var skewEl;
+	        if (!textVmlEl) {
+	            textVmlEl = createNode('line');
+	            pathEl = createNode('path');
+	            textPathEl = createNode('textpath');
+	            skewEl = createNode('skew');
+
+	            // FIXME Why here is not cammel case
+	            // Align 'center' seems wrong
+	            textPathEl.style['v-text-align'] = 'left';
+
+	            initRootElStyle(textVmlEl);
+
+	            pathEl.textpathok = true;
+	            textPathEl.on = true;
+
+	            textVmlEl.from = '0 0';
+	            textVmlEl.to = '1000 0.05';
+
+	            append(textVmlEl, skewEl);
+	            append(textVmlEl, pathEl);
+	            append(textVmlEl, textPathEl);
+
+	            this._textVmlEl = textVmlEl;
+	        }
+	        else {
+	            // 这里是在前面 appendChild 保证顺序的前提下
+	            skewEl = textVmlEl.firstChild;
+	            pathEl = skewEl.nextSibling;
+	            textPathEl = pathEl.nextSibling;
+	        }
+
+	        var coords = [x, y];
+	        var textVmlElStyle = textVmlEl.style;
+	        // Ignore transform for text in other element
+	        if (m && fromTextEl) {
+	            applyTransform(coords, coords, m);
+
+	            skewEl.on = true;
+
+	            skewEl.matrix = m[0].toFixed(3) + comma + m[2].toFixed(3) + comma +
+	            m[1].toFixed(3) + comma + m[3].toFixed(3) + ',0,0';
+
+	            // Text position
+	            skewEl.offset = (round(coords[0]) || 0) + ',' + (round(coords[1]) || 0);
+	            // Left top point as origin
+	            skewEl.origin = '0 0';
+
+	            textVmlElStyle.left = '0px';
+	            textVmlElStyle.top = '0px';
+	        }
+	        else {
+	            skewEl.on = false;
+	            textVmlElStyle.left = round(x) + 'px';
+	            textVmlElStyle.top = round(y) + 'px';
+	        }
+
+	        textPathEl.string = encodeHtmlAttribute(text);
+	        // TODO
+	        try {
+	            textPathEl.style.font = font;
+	        }
+	        // Error font format
+	        catch (e) {}
+
+	        updateFillAndStroke(textVmlEl, 'fill', {
+	            fill: fromTextEl ? style.fill : style.textFill,
+	            opacity: style.opacity
+	        }, this);
+	        updateFillAndStroke(textVmlEl, 'stroke', {
+	            stroke: fromTextEl ? style.stroke : style.textStroke,
+	            opacity: style.opacity,
+	            lineDash: style.lineDash
+	        }, this);
+
+	        textVmlEl.style.zIndex = getZIndex(this.zlevel, this.z, this.z2);
+
+	        // Attached to root
+	        append(vmlRoot, textVmlEl);
+	    };
+
+	    var removeRectText = function (vmlRoot) {
+	        remove(vmlRoot, this._textVmlEl);
+	        this._textVmlEl = null;
+	    };
+
+	    var appendRectText = function (vmlRoot) {
+	        append(vmlRoot, this._textVmlEl);
+	    };
+
+	    var list = [RectText, Displayable, ZImage, Path, Text];
+
+	    // In case Displayable has been mixed in RectText
+	    for (var i = 0; i < list.length; i++) {
+	        var proto = list[i].prototype;
+	        proto.drawRectText = drawRectText;
+	        proto.removeRectText = removeRectText;
+	        proto.appendRectText = appendRectText;
+	    }
+
+	    Text.prototype.brushVML = function (vmlRoot) {
+	        var style = this.style;
+	        if (style.text) {
+	            this.drawRectText(vmlRoot, {
+	                x: style.x || 0, y: style.y || 0,
+	                width: 0, height: 0
+	            }, this.getBoundingRect(), true);
+	        }
+	        else {
+	            this.removeRectText(vmlRoot);
+	        }
+	    };
+
+	    Text.prototype.onRemove = function (vmlRoot) {
+	        this.removeRectText(vmlRoot);
+	    };
+
+	    Text.prototype.onAdd = function (vmlRoot) {
+	        this.appendRectText(vmlRoot);
+	    };
+	}
+
+
+/***/ },
+/* 380 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	if (!__webpack_require__(2).canvasSupported) {
+	    var urn = 'urn:schemas-microsoft-com:vml';
+
+	    var createNode;
+	    var win = window;
+	    var doc = win.document;
+
+	    var vmlInited = false;
+
+	    try {
+	        !doc.namespaces.zrvml && doc.namespaces.add('zrvml', urn);
+	        createNode = function (tagName) {
+	            return doc.createElement('<zrvml:' + tagName + ' class="zrvml">');
+	        };
+	    }
+	    catch (e) {
+	        createNode = function (tagName) {
+	            return doc.createElement('<' + tagName + ' xmlns="' + urn + '" class="zrvml">');
+	        };
+	    }
+
+	    // From raphael
+	    var initVML = function () {
+	        if (vmlInited) {
+	            return;
+	        }
+	        vmlInited = true;
+
+	        var styleSheets = doc.styleSheets;
+	        if (styleSheets.length < 31) {
+	            doc.createStyleSheet().addRule('.zrvml', 'behavior:url(#default#VML)');
+	        }
+	        else {
+	            // http://msdn.microsoft.com/en-us/library/ms531194%28VS.85%29.aspx
+	            styleSheets[0].addRule('.zrvml', 'behavior:url(#default#VML)');
+	        }
+	    };
+
+	    // Not useing return to avoid error when converting to CommonJS module
+	    module.exports = {
+	        doc: doc,
+	        initVML: initVML,
+	        createNode: createNode
+	    };
+	}
+
+
+/***/ },
+/* 381 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * VML Painter.
+	 *
+	 * @module zrender/vml/Painter
+	 */
+
+
+
+	    var zrLog = __webpack_require__(40);
+	    var vmlCore = __webpack_require__(380);
+
+	    function parseInt10(val) {
+	        return parseInt(val, 10);
+	    }
+
+	    /**
+	     * @alias module:zrender/vml/Painter
+	     */
+	    function VMLPainter(root, storage) {
+
+	        vmlCore.initVML();
+
+	        this.root = root;
+
+	        this.storage = storage;
+
+	        var vmlViewport = document.createElement('div');
+
+	        var vmlRoot = document.createElement('div');
+
+	        vmlViewport.style.cssText = 'display:inline-block;overflow:hidden;position:relative;width:300px;height:150px;';
+
+	        vmlRoot.style.cssText = 'position:absolute;left:0;top:0;';
+
+	        root.appendChild(vmlViewport);
+
+	        this._vmlRoot = vmlRoot;
+	        this._vmlViewport = vmlViewport;
+
+	        this.resize();
+
+	        // Modify storage
+	        var oldDelFromMap = storage.delFromMap;
+	        var oldAddToMap = storage.addToMap;
+	        storage.delFromMap = function (elId) {
+	            var el = storage.get(elId);
+
+	            oldDelFromMap.call(storage, elId);
+
+	            if (el) {
+	                el.onRemove && el.onRemove(vmlRoot);
+	            }
+	        };
+
+	        storage.addToMap = function (el) {
+	            // Displayable already has a vml node
+	            el.onAdd && el.onAdd(vmlRoot);
+
+	            oldAddToMap.call(storage, el);
+	        };
+
+	        this._firstPaint = true;
+	    }
+
+	    VMLPainter.prototype = {
+
+	        constructor: VMLPainter,
+
+	        /**
+	         * @return {HTMLDivElement}
+	         */
+	        getViewportRoot: function () {
+	            return this._vmlViewport;
+	        },
+
+	        /**
+	         * 刷新
+	         */
+	        refresh: function () {
+
+	            var list = this.storage.getDisplayList(true, true);
+
+	            this._paintList(list);
+	        },
+
+	        _paintList: function (list) {
+	            var vmlRoot = this._vmlRoot;
+	            for (var i = 0; i < list.length; i++) {
+	                var el = list[i];
+	                if (el.invisible || el.ignore) {
+	                    if (!el.__alreadyNotVisible) {
+	                        el.onRemove(vmlRoot);
+	                    }
+	                    // Set as already invisible
+	                    el.__alreadyNotVisible = true;
+	                }
+	                else {
+	                    if (el.__alreadyNotVisible) {
+	                        el.onAdd(vmlRoot);
+	                    }
+	                    el.__alreadyNotVisible = false;
+	                    if (el.__dirty) {
+	                        el.beforeBrush && el.beforeBrush();
+	                        (el.brushVML || el.brush).call(el, vmlRoot);
+	                        el.afterBrush && el.afterBrush();
+	                    }
+	                }
+	                el.__dirty = false;
+	            }
+
+	            if (this._firstPaint) {
+	                // Detached from document at first time
+	                // to avoid page refreshing too many times
+
+	                // FIXME 如果每次都先 removeChild 可能会导致一些填充和描边的效果改变
+	                this._vmlViewport.appendChild(vmlRoot);
+	                this._firstPaint = false;
+	            }
+	        },
+
+	        resize: function () {
+	            var width = this._getWidth();
+	            var height = this._getHeight();
+
+	            if (this._width != width && this._height != height) {
+	                this._width = width;
+	                this._height = height;
+
+	                var vmlViewportStyle = this._vmlViewport.style;
+	                vmlViewportStyle.width = width + 'px';
+	                vmlViewportStyle.height = height + 'px';
+	            }
+	        },
+
+	        dispose: function () {
+	            this.root.innerHTML = '';
+
+	            this._vmlRoot =
+	            this._vmlViewport =
+	            this.storage = null;
+	        },
+
+	        getWidth: function () {
+	            return this._width;
+	        },
+
+	        getHeight: function () {
+	            return this._height;
+	        },
+
+	        clear: function () {
+	            this.root.removeChild(this.vmlViewport);
+	        },
+
+	        _getWidth: function () {
+	            var root = this.root;
+	            var stl = root.currentStyle;
+
+	            return ((root.clientWidth || parseInt10(stl.width))
+	                    - parseInt10(stl.paddingLeft)
+	                    - parseInt10(stl.paddingRight)) | 0;
+	        },
+
+	        _getHeight: function () {
+	            var root = this.root;
+	            var stl = root.currentStyle;
+
+	            return ((root.clientHeight || parseInt10(stl.height))
+	                    - parseInt10(stl.paddingTop)
+	                    - parseInt10(stl.paddingBottom)) | 0;
+	        }
+	    };
+
+	    // Not supported methods
+	    function createMethodNotSupport(method) {
+	        return function () {
+	            zrLog('In IE8.0 VML mode painter not support method "' + method + '"');
+	        };
+	    }
+
+	    var notSupportedMethods = [
+	        'getLayer', 'insertLayer', 'eachLayer', 'eachBuildinLayer', 'eachOtherLayer', 'getLayers',
+	        'modLayer', 'delLayer', 'clearLayer', 'toDataURL', 'pathToImage'
+	    ];
+
+	    for (var i = 0; i < notSupportedMethods.length; i++) {
+	        var name = notSupportedMethods[i];
+	        VMLPainter.prototype[name] = createMethodNotSupport(name);
+	    }
+
+	    module.exports = VMLPainter;
+
+
+/***/ }
+/******/ ])
+});
+;
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/fans/fansDetails.js b/pluss-manage-page/src/main/resources/static/resources/js/fans/fansDetails.js
new file mode 100644
index 0000000..b4140d2
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/fans/fansDetails.js
@@ -0,0 +1,96 @@
+/**
+ * create by robot 
+ * date Tue Sep 24 08:52:27 CST 2019 
+ */ 
+
+$(document).ready(function(){
+	//form表单样式
+	layui.use(['layer', 'form'], function() {
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+	//li 切换事件
+	$(".nav-tabs>li").click(function() {
+		var index = $(".nav-tabs>li").index(this);
+		$(this).addClass("active").siblings("li").removeClass("active");
+		
+	})
+	//弹出一个提示层
+	$('.fa-save').on('click', function() {
+		saveFans();
+	});
+
+	//绑定标签栏事件
+	$(document).on('click','.nav-tabs li',function(){
+
+		var action =$(this).data('action');
+		 switch (action) {
+			case "base"://基本资料
+				goBase();
+				break;  
+			case "functions"://多功能
+				goFunctions();
+				break;
+			case "extends"://扩展    
+				goExtends();         
+				break;           
+		 }
+	})
+
+	//加载第一个标签
+	$('.nav-tabs li').eq(0).click();
+	
+});
+
+
+//跳转基本信息 
+function goBase(){
+	var url=ctx+'/fans/queryFansBaseInfo?id='+$('#fansId').val();
+	$('.tab-content').load(url);
+	              
+}
+//跳转多功能输入
+function goFunctions(){ 
+	var url=ctx+'/fans/queryFansFunctionsInfo?id='+$('#fansId').val();
+	$('.tab-content').load(url);  
+	
+}
+//跳转到扩展   
+function goExtends(){
+	
+	var url=ctx+'/fans/queryFansExtendsInfo?id='+$('#fansId').val();
+	$('.tab-content').load(url);          
+}  
+  
+
+ 
+//保存
+function saveFans(){
+	 
+	$(".fa-save").attr("disabled","disabled");
+	$('.fa-save').html('正在保存...')
+	$.ajax({
+		url:ctx+"/fans/saveFans",
+		type:"POST",
+		dataType:'json',
+		data:$("#data_form").serializeArray(),
+		complete:function(){
+			$(".fa-save").removeAttr("disabled");
+			$('.fa-save').html('保存')
+		},        
+		success:function(service){ 
+		
+			layer.confirm('保存成功,是否前往列表？', {
+				  btn: ['确认','取消'] //按钮
+				}, function(){
+					$('#goback span').trigger('click'); 
+				}, function(){         
+					layer.closeAll();
+			});  
+			
+		}
+	});  
+}
+ 
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/fans/fansList.js b/pluss-manage-page/src/main/resources/static/resources/js/fans/fansList.js
new file mode 100644
index 0000000..7bd593c
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/fans/fansList.js
@@ -0,0 +1,344 @@
+/**
+ * create by robot 
+ * date Tue Sep 24 08:52:27 CST 2019 
+ */ 
+
+var pageIndex=1;
+$(document).ready(function(){
+	//调用查询
+	pageIndex=StringUtil.getQueryString('pageIndex');
+	if(pageIndex==undefined||pageIndex==null){
+		pageIndex=1;
+	}
+	queryFans(pageIndex);
+	//绑定hover操作
+	$(document).on('mouseenter','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").show();
+		var width=15;
+		$(this).children('div').find('li').each(function(){
+			//获取li宽度
+			width+=$(this).width();
+		});
+		$(this).children('div').width(width);
+	})
+	$(document).on('mouseleave','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").hide();
+	});
+
+	//日历控件
+	layui.use(['layer', 'laydate'], function() {
+		var layer = layui.layer;
+		laydate = layui.laydate;
+		laydate.render({
+			elem: '#date1', //指定元素
+			format:'yyyy-MM-dd 00:00:00'
+		});
+		laydate.render({
+			elem: '#date2', //指定元素
+			format:'yyyy-MM-dd 23:59:59'
+		});
+	});
+
+	//行选中事件
+	$("#allCheck").find("span").click(function() {
+		$(this).toggleClass('checked');
+		if($(this).hasClass('checked')){
+			//所有列选中
+		  $(".checker").find("span").each(function () {
+		         $(this).addClass("checked");
+		    })
+		}else{
+			//所有列取消选中
+			$(".checker").find("span").each(function () {
+				 $(this).removeClass("checked");
+		    })
+		}
+	});
+
+	//单个选中
+	$(document).on('click','.checkeBox span',function() {
+		$(this).toggleClass('checked');
+		//设置头部事件
+		var length=$('.checkeBox span').length;
+		var count=0;
+		$(".checkeBox").find("span").each(function () {
+	        if($(this).hasClass("checked")){
+	        	count++;
+	        }
+	   })
+		//全选
+	   if(count==length){
+		   $("#allCheck").find("span").addClass('checked');
+	   }else{
+		   $("#allCheck").find("span").removeClass('checked');
+	   }
+	})
+	//左右div高度相等
+	var left_content_height = $(".right-content").height();
+	$(".left-content").height(left_content_height+35);
+	var sub_left_height=$(".res-menu").height(left_content_height-60);
+});
+
+//查询
+function queryFans(index){
+	if(typeof(index)=='undefined'){
+		index=1;
+	}
+	
+	var url=ctx+'/fans/queryFansByPage';
+	$.ajax({  
+        url:ctx+'/fans/queryFansByPage',  
+        type:"post", 
+        dataType:"json",  
+        data:{  
+        	"currPage":index,
+        	"startTime":$('#date1').val(),
+        	"nickName":$('#nickName').val(),
+        	"endTime":$('#date2').val(),
+        	"merchantName":$("#merchantName").val(),
+        	"lastMerchantName":$("#lastMerchantName").val(),
+        	"orderNumber":$("#orderNumber").val(),
+        	"lastOrderNumber":$("#lastOrderNumber").val(),
+        },  
+        success:function(result){  
+        	var presentPage = result.currPage;
+        	//渲染数据
+        	$('#data_content').empty();
+        	var header='';
+        	$.each(result.fansList,function(i){
+        		var orderNumber = (presentPage-1)*12+i+1;
+        		var fans=result.fansList[i];
+        		var data='';
+        		data+='<tr class="odd">';
+        		data+='<td class="textc">';
+				data+='		 <div class="checker checkeBox">';        		data+='		 <span class=""  data-id="'+fans.id+'"><input type="checkbox"  value=""></span>';
+        		data+='		</div>';
+        		data+='</td>';
+        		data+='<td class="textc">'+orderNumber+'</td>';
+        		/*data+='<td class="textc">'+fans.userId+'</td>';*/
+        		data+='<td class="textc"><img alt="" src="'+fans.logo+'" onerror="javascript:this.src=\'https://www.shouyinbei.net/resources/images/error.jpg\'"  style="width:60px;height:30px"></td>';
+        		var nickName='';
+        		if(StringUtil.isNotBlank(fans.nickName)){
+        			nickName=fans.nickName;
+        		}
+        		data+='<td class="textc">'+nickName+'</td>';
+        		var consumMoney='';
+        		if(StringUtil.isNotBlank(fans.consumMoney)){
+        			consumMoney=fans.consumMoney;
+        		}
+        		data+='<td class="textc">'+consumMoney+'</td>';
+        		var merchantName='';
+        		if(StringUtil.isNotBlank(fans.merchantName)){
+        			merchantName=fans.merchantName;
+        		}
+        		data+='<td class="textc">'+merchantName+'</td>';
+        		
+        		var lastMerchantName='';
+        		if(StringUtil.isNotBlank(fans.lastMerchantName)){
+        			lastMerchantName=fans.lastMerchantName;
+        		}
+        		
+        		var shareMoney='';
+        		if(StringUtil.isNotBlank(fans.shareMoney)){
+        			shareMoney=fans.shareMoney;
+        		}
+        		
+        		var consumTime='';
+        		if(StringUtil.isNotBlank(fans.consumTime)){
+					consumTime= dateFtt("yyyy-MM-dd hh:mm:ss",new Date(fans.consumTime));
+        		}
+        		data+='<td class="textc">'+consumTime+'</td>';
+//        		var lastconsumTime='';
+//        		if(StringUtil.isNotBlank(fans.lastconsumTime)){
+//        			lastconsumTime=new Date(fans.lastconsumTime).toYYYYMMDDHHMMSS();
+//        		}
+//        		data+='<td class="textc">'+lastconsumTime+'</td>';
+        		var orderNumber='';
+        		if(StringUtil.isNotBlank(fans.orderNumber)){
+        			orderNumber=fans.orderNumber;
+        		}
+        		data+='<td class="textc">'+orderNumber+'</td>';
+        		
+        		var lastOrderNumber='';
+        		if(StringUtil.isNotBlank(fans.lastOrderNumber)){
+        			lastOrderNumber=fans.lastOrderNumber;
+        		}
+        		if (result.admin){
+        			data+='<td class="textc">'+lastMerchantName+'</td>';
+        			data+='<td class="textc">'+lastOrderNumber+'</td>';
+				}
+				data+='<td class="textc">'+shareMoney+'</td>';
+        		/*data+='<td class="textc">';
+        		data+='<div class="positionr listOperaters">';
+        		data+='		<a href="javascript:void(0);"  class="icon-large dlblock w16 h16"><img src="'+resourcePath+'/images/angle-down.png"/></a>';
+        		data+='		<div class="ops_box ops_itemDiv positiona clearfix whitebg">';
+        		data+='			<ul>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showFansDetails('+fans.id+')" class="btn btn-primary fa fa-edit ops_more f12">编辑</a></li>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="initDeleteFans('+fans.id+')" class="btn btn-primary fa fa-remove ops_more f12">删除</a></li>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showFansDetails('+fans.id+')" class="btn btn-primary fa fa-detail ops_more f12">明细</a></li>';
+        	    data+='			</ul>';
+              data+='		</div>';
+        	    data+='</div>';
+        	    data+='</td>';*/
+        	    data+='</tr>';
+        	    $('#data_content').append(data);
+        	});
+        	//分页
+        	$('#pageCount').html(result.pageCount);
+        	
+      	$('#currPage').html(result.currPage);
+          $('#totalCount').html(result.count);
+           	//设置分页
+           	pageIndex=result.currPage;
+			$('#pagination').pagination({
+				pageCount: result.pageCount,
+				jump: true,
+				coping: true,
+				jump: true,
+				homePage: '首页',
+				endPage: '末页',
+				prevContent: '上页',
+				nextContent: '下页',
+				current:result.currPage,
+				callback:function(api){
+					pageIndex=api.getCurrent();
+					queryFans(api.getCurrent());
+				}
+			});
+        } 
+    });  
+	//表头列不选中
+	$("#allCheck").find("span").removeClass('checked');
+}
+
+//初始化新增
+function initAddFans(){
+	window.location=ctx+'/fans/queryFansDetails?pageIndex='+pageIndex;
+}
+
+//初始化修改
+function showFansDetails(id){
+	window.location=ctx+'/fans/queryFansDetails?id='+id+'&pageIndex='+pageIndex;
+}
+
+//初始化删除
+function initDeleteFans(id){
+	
+		layer.open({
+		type: 1,
+		closeBtn: 1,		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r'	, //按钮居中
+		shade: 0.3 ,//不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteFans(id,true);
+		}
+	});
+}
+
+//删除
+function deleteFans(id,showMsg){
+	$.ajax({
+		url:ctx+'/fans/deleteFans',
+		data:[{
+			name:'id',
+			value:id
+		}],
+		type:'POST',
+		dataType:'json',
+		success:function(){
+			queryFans(pageIndex);
+			if(showMsg){
+				layer.msg('删除成功!');	
+			}
+		}
+	});
+}
+//头部编辑
+function initEditFans(){
+	var count=0;
+	var id=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+        	 id=$(this).data('id');
+         }
+    })
+    if(count>1){
+    	layer.msg('只能选中一行记录进行操作!');
+    	return ;
+    }
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	 if(id>0){
+	  showFansDetails(id);
+	 }
+}
+//头部删除
+function initBatchDeleteFans(){
+	var count=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+         }
+    })
+	
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	
+
+	layer.open({
+		type: 1,
+		closeBtn: 1,
+		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r', //按钮居中
+		shade: 0.3, //不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteBatchFans();
+		}
+	});
+	
+}
+//批量删除
+function deleteBatchFans(){
+	
+	$(".checkeBox").find("span").each(function () {
+        if($(this).hasClass("checked")){
+        	var id=$(this).data('id');
+        	deleteFans(id,false);
+        	layer.msg('删除成功!');	
+        }
+   })
+}
+//时间格式化处理
+function dateFtt(fmt,date)
+{ //author: meizz
+	var o = {
+		"M+" : date.getMonth()+1,                 //月份
+		"d+" : date.getDate(),                    //日
+		"h+" : date.getHours(),                   //小时
+		"m+" : date.getMinutes(),                 //分
+		"s+" : date.getSeconds(),                 //秒
+		"q+" : Math.floor((date.getMonth()+3)/3), //季度
+		"S"  : date.getMilliseconds()             //毫秒
+	};
+	if(/(y+)/.test(fmt))
+		fmt=fmt.replace(RegExp.$1, (date.getFullYear()+"").substr(4 - RegExp.$1.length));
+	for(var k in o)
+		if(new RegExp("("+ k +")").test(fmt))
+			fmt = fmt.replace(RegExp.$1, (RegExp.$1.length==1) ? (o[k]) : (("00"+ o[k]).substr((""+ o[k]).length)));
+	return fmt;
+}
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/fansConsumReturn/fansConsumReturnDetails.js b/pluss-manage-page/src/main/resources/static/resources/js/fansConsumReturn/fansConsumReturnDetails.js
new file mode 100644
index 0000000..ec1cab0
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/fansConsumReturn/fansConsumReturnDetails.js
@@ -0,0 +1,96 @@
+/**
+ * create by robot 
+ * date Tue Sep 24 08:52:27 CST 2019 
+ */ 
+
+$(document).ready(function(){
+	//form表单样式
+	layui.use(['layer', 'form'], function() {
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+	//li 切换事件
+	$(".nav-tabs>li").click(function() {
+		var index = $(".nav-tabs>li").index(this);
+		$(this).addClass("active").siblings("li").removeClass("active");
+		
+	})
+	//弹出一个提示层
+	$('.fa-save').on('click', function() {
+		saveFansConsumReturn();
+	});
+
+	//绑定标签栏事件
+	$(document).on('click','.nav-tabs li',function(){
+
+		var action =$(this).data('action');
+		 switch (action) {
+			case "base"://基本资料
+				goBase();
+				break;  
+			case "functions"://多功能
+				goFunctions();
+				break;
+			case "extends"://扩展    
+				goExtends();         
+				break;           
+		 }
+	})
+
+	//加载第一个标签
+	$('.nav-tabs li').eq(0).click();
+	
+});
+
+
+//跳转基本信息 
+function goBase(){
+	var url=ctx+'/fansConsumReturn/queryFansConsumReturnBaseInfo?id='+$('#fansConsumReturnId').val();
+	$('.tab-content').load(url);
+	              
+}
+//跳转多功能输入
+function goFunctions(){ 
+	var url=ctx+'/fansConsumReturn/queryFansConsumReturnFunctionsInfo?id='+$('#fansConsumReturnId').val();
+	$('.tab-content').load(url);  
+	
+}
+//跳转到扩展   
+function goExtends(){
+	
+	var url=ctx+'/fansConsumReturn/queryFansConsumReturnExtendsInfo?id='+$('#fansConsumReturnId').val();
+	$('.tab-content').load(url);          
+}  
+  
+
+ 
+//保存
+function saveFansConsumReturn(){
+	 
+	$(".fa-save").attr("disabled","disabled");
+	$('.fa-save').html('正在保存...')
+	$.ajax({
+		url:ctx+"/fansConsumReturn/saveFansConsumReturn",
+		type:"POST",
+		dataType:'json',
+		data:$("#data_form").serializeArray(),
+		complete:function(){
+			$(".fa-save").removeAttr("disabled");
+			$('.fa-save').html('保存')
+		},        
+		success:function(service){ 
+		
+			layer.confirm('保存成功,是否前往列表？', {
+				  btn: ['确认','取消'] //按钮
+				}, function(){
+					$('#goback span').trigger('click'); 
+				}, function(){         
+					layer.closeAll();
+			});  
+			
+		}
+	});  
+}
+ 
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/fansConsumReturn/fansConsumReturnList.js b/pluss-manage-page/src/main/resources/static/resources/js/fansConsumReturn/fansConsumReturnList.js
new file mode 100644
index 0000000..e49837d
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/fansConsumReturn/fansConsumReturnList.js
@@ -0,0 +1,289 @@
+/**
+ * create by robot 
+ * date Tue Sep 24 08:52:27 CST 2019 
+ */ 
+
+var pageIndex=1;
+$(document).ready(function(){
+	//调用查询
+	pageIndex=StringUtil.getQueryString('pageIndex');
+	if(pageIndex==undefined||pageIndex==null){
+		pageIndex=1;
+	}
+	queryFansConsumReturn(pageIndex);
+	//绑定hover操作
+	$(document).on('mouseenter','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").show();
+		var width=15;
+		$(this).children('div').find('li').each(function(){
+			//获取li宽度
+			width+=$(this).width();
+		});
+		$(this).children('div').width(width);
+	})
+	$(document).on('mouseleave','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").hide();
+	});
+
+	//日历控件
+	layui.use(['layer', 'laydate'], function() {
+		var layer = layui.layer;
+		laydate = layui.laydate;
+		laydate.render({
+		elem: '#date1' //指定元素
+		});
+		laydate.render({
+			elem: '#date2' //指定元素
+		});
+	});
+
+
+	//行选中事件
+	$("#allCheck").find("span").click(function() {
+		$(this).toggleClass('checked');
+		if($(this).hasClass('checked')){
+			//所有列选中
+		  $(".checker").find("span").each(function () {
+		         $(this).addClass("checked");
+		    })
+		}else{
+			//所有列取消选中
+			$(".checker").find("span").each(function () {
+				 $(this).removeClass("checked");
+		    })
+		}
+	});
+
+	//单个选中
+	$(document).on('click','.checkeBox span',function() {
+		$(this).toggleClass('checked');
+		//设置头部事件
+		var length=$('.checkeBox span').length;
+		var count=0;
+		$(".checkeBox").find("span").each(function () {
+	        if($(this).hasClass("checked")){
+	        	count++;
+	        }
+	   })
+		//全选
+	   if(count==length){
+		   $("#allCheck").find("span").addClass('checked');
+	   }else{
+		   $("#allCheck").find("span").removeClass('checked');
+	   }
+	})
+	//左右div高度相等
+	var left_content_height = $(".right-content").height();
+	$(".left-content").height(left_content_height+35);
+	var sub_left_height=$(".res-menu").height(left_content_height-60);
+});
+
+//查询
+function queryFansConsumReturn(index){
+	if(typeof(index)=='undefined'){
+		index=1;
+	}
+	var url=ctx+'/fansConsumReturn/queryFansConsumReturnByPage';
+	$.ajax({  
+        url:url,  
+        type:"post", 
+        dataType:"json",  
+        data:{  
+        	"currPage":index,
+        	"nickName":$("#nickName").val(),
+        },  
+        success:function(result){  
+        	//渲染数据
+        	$('#data_content').empty();
+        	var header='';
+        	$.each(result.fansConsumReturnList,function(i){
+        		var fansConsumReturn=result.fansConsumReturnList[i];
+        		var data='';
+        		data+='<tr class="odd">';
+        		data+='<td class="textc">';
+				data+='		 <div class="checker checkeBox">';        		data+='		 <span class=""  data-id="'+fansConsumReturn.id+'"><input type="checkbox"  value=""></span>';
+        		data+='		</div>';
+        		data+='</td>';
+        		data+='<td class="textc">'+fansConsumReturn.id+'</td>';
+        		var nickName='';
+        		if(StringUtil.isNotBlank(fansConsumReturn.nickName)){
+        			nickName=fansConsumReturn.nickName;
+        		}
+        		data+='<td class="textc">'+nickName+'</td>';
+        		data+='<td class="textc"><img alt="" src="'+fansConsumReturn.logo+'" style="width:60px;height:30px"></td>'
+        		var consumMony='';
+        		if(StringUtil.isNotBlank(fansConsumReturn.consumMony)){
+        			consumMony=fansConsumReturn.consumMony;
+        		}
+        		data+='<td class="textc">'+consumMony+'</td>';
+        		/*data+='<td class="textc">'+fansConsumReturn.merchantCode+'</td>';*/
+        		var merchantName='';
+        		if(StringUtil.isNotBlank(fansConsumReturn.merchantName)){
+        			merchantName=fansConsumReturn.merchantName;
+        		}
+        		data+='<td class="textc">'+merchantName+'</td>';
+        		var returnMoney='';
+        		if(StringUtil.isNotBlank(fansConsumReturn.returnMoney)){
+        			returnMoney=fansConsumReturn.returnMoney;
+        		}
+        		data+='<td class="textc">'+returnMoney+'</td>';
+        		var createDt='';
+        		if(StringUtil.isNotBlank(fansConsumReturn.createDt)){
+        			createDt=new Date(fansConsumReturn.createDt).toYYYYMMDDHHMMSS();
+        		}
+        		data+='<td class="textc">'+createDt+'</td>';
+        		/*data+='<td class="textc">';
+        		data+='<div class="positionr listOperaters">';
+        		data+='		<a href="javascript:void(0);"  class="icon-large dlblock w16 h16"><img src="'+resourcePath+'/images/angle-down.png"/></a>';
+        		data+='		<div class="ops_box ops_itemDiv positiona clearfix whitebg">';
+        		data+='			<ul>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showFansConsumReturnDetails('+fansConsumReturn.id+')" class="btn btn-primary fa fa-edit ops_more f12">编辑</a></li>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="initDeleteFansConsumReturn('+fansConsumReturn.id+')" class="btn btn-primary fa fa-remove ops_more f12">删除</a></li>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showFansConsumReturnDetails('+fansConsumReturn.id+')" class="btn btn-primary fa fa-detail ops_more f12">明细</a></li>';
+        	    data+='			</ul>';
+              data+='		</div>';
+        	    data+='</div>';
+        	    data+='</td>';*/
+        	    data+='</tr>';
+        	    $('#data_content').append(data);
+        	});
+        	//分页
+        	$('#pageCount').html(result.pageCount);
+      	$('#currPage').html(result.currPage);
+          $('#totalCount').html(result.count);
+           	//设置分页
+           	pageIndex=result.currPage;
+			$('#pagination').pagination({
+				pageCount: result.pageCount,
+				jump: true,
+				coping: true,
+				jump: true,
+				homePage: '首页',
+				endPage: '末页',
+				prevContent: '上页',
+				nextContent: '下页',
+				current:result.currPage,
+				callback:function(api){
+					pageIndex=api.getCurrent();
+					queryFansConsumReturn(api.getCurrent());
+				}
+			});
+        } 
+    });  
+	//表头列不选中
+	$("#allCheck").find("span").removeClass('checked');
+}
+
+//初始化新增
+function initAddFansConsumReturn(){
+	window.location=ctx+'/fansConsumReturn/queryFansConsumReturnDetails?pageIndex='+pageIndex;
+}
+
+//初始化修改
+function showFansConsumReturnDetails(id){
+	window.location=ctx+'/fansConsumReturn/queryFansConsumReturnDetails?id='+id+'&pageIndex='+pageIndex;
+}
+
+//初始化删除
+function initDeleteFansConsumReturn(id){
+	
+		layer.open({
+		type: 1,
+		closeBtn: 1,		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r'	, //按钮居中
+		shade: 0.3 ,//不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteFansConsumReturn(id,true);
+		}
+	});
+}
+
+//删除
+function deleteFansConsumReturn(id,showMsg){
+	$.ajax({
+		url:ctx+'/fansConsumReturn/deleteFansConsumReturn',
+		data:[{
+			name:'id',
+			value:id
+		}],
+		type:'POST',
+		dataType:'json',
+		success:function(){
+			queryFansConsumReturn(pageIndex);
+			if(showMsg){
+				layer.msg('删除成功!');	
+			}
+		}
+	});
+}
+//头部编辑
+function initEditFansConsumReturn(){
+	var count=0;
+	var id=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+        	 id=$(this).data('id');
+         }
+    })
+    if(count>1){
+    	layer.msg('只能选中一行记录进行操作!');
+    	return ;
+    }
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	 if(id>0){
+	  showFansConsumReturnDetails(id);
+	 }
+}
+//头部删除
+function initBatchDeleteFansConsumReturn(){
+	var count=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+         }
+    })
+	
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	
+
+	layer.open({
+		type: 1,
+		closeBtn: 1,
+		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r', //按钮居中
+		shade: 0.3, //不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteBatchFansConsumReturn();
+		}
+	});
+	
+}
+//批量删除
+function deleteBatchFansConsumReturn(){
+	
+	$(".checkeBox").find("span").each(function () {
+        if($(this).hasClass("checked")){
+        	var id=$(this).data('id');
+        	deleteFansConsumReturn(id,false);
+        	layer.msg('删除成功!');	
+        }
+   })
+}
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/global.js b/pluss-manage-page/src/main/resources/static/resources/js/global.js
new file mode 100644
index 0000000..77c3546
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/global.js
@@ -0,0 +1,17 @@
+/**
+ * 加了版本号码的js引用
+ * url js的url
+ */
+function require(url) {
+    document.writeln('<script type="text/javascript" src="' + resourcePath + '/' + url + '" charset="utf-8"><\/script>');
+}
+
+/**
+ * 加了版本号码的css引用
+ * url css的url3
+ */
+function requireCss(url) {
+    document.writeln('<link type="text/css" rel="stylesheet" href="' + resourcePath + '/' + url + '" />');
+}
+
+require("js/jquery-3.6.0.min.js");	//jquery.js
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/index/first.js b/pluss-manage-page/src/main/resources/static/resources/js/index/first.js
new file mode 100644
index 0000000..3e99413
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/index/first.js
@@ -0,0 +1,346 @@
+var myChart = echarts.init(document.getElementById("orderFee_date"));
+var myChart2 = echarts.init(document.getElementById("orderFee_payType"));
+let toDayTransCount = 0.00;
+let yestDayNowTransAmt = 0.00;
+let scale = "0.00%";
+let subtract = 0.00;
+let oTypeName = "上升";
+$(function() {
+	var newTimes=[];
+	var orderFees = [];
+	var channelNames=[];
+	var channelNameAmts = [];
+	var payTransNum = [];
+	var channelNums = [];
+	showAdmin();
+	
+	$.ajax({
+		url : ctx + "/platform/firstData",
+		type : "POST",
+		success : function(data) {
+			data = data.data;
+			// var platformSum=data.platformSum;
+			//粉丝总数量
+			$("#fansCount").html(data.fansCountNum);
+			//商户数量
+			$("#merchantCount").html(data.mercCountNum);
+			//交易总额
+			$("#transCount").html('￥'+data.transCount);
+			//交易总笔数
+			$("#transNum").html(data.transNum);
+			//会员数量
+			$("#memberCount").html(data.memberCountNum);
+			//推广员数量
+			$("#promoterCount").html(data.promCountNum);
+			//推广分润总额
+			$("#shareMoneySum").html('￥'+data.profitCountAmt);
+			//粉丝奖励总额
+			$("#fansShareMoneySum").html('￥'+data.fansCountAmt);
+			//收益总计
+			$("#earnings").html('￥'+data.profitCountAmt);
+			//今日收款总额
+			$("#toDayTransSum").html('￥'+data.toDayTransCount);
+			//今日支付宝收款
+			$("#toDayTransZfbSum").html('￥'+data.toDayTransAliCount);
+			//今日微信收款
+			$("#toDayTransWxSum").html('￥'+data.toDayTransWxCount);
+			//今日云闪付支付
+			$("#toDayTransYsfSum").html('￥'+data.toDayTransUnionCount);
+			//今日收款笔数
+			$("#toDayTransCount").html(data.toDayTransNum);
+			//今日支付宝收款笔数
+			$("#toDayTransZfbCount").html(data.toDayTransAliNum);
+			//今日微信收款笔数
+			$("#toDayTransWxCount").html(data.toDayTransWxNum);
+			//今日云闪付收款笔数
+			$("#toDayTransYsfCount").html(data.toDayTransUnionNum);
+			//今日退款金额
+			$("#toDayRefundSum").html('￥'+data.toDayRefundCount);
+			//今日支付宝退款金额
+			$("#toDayRefundZfbSum").html('￥'+data.toDayRefundAliCount);
+			//今日微信退款金额
+			$("#toDayRefundWxSum").html('￥'+data.toDayRefundWxCount);
+			//今日云闪付退款金额
+			$("#toDayRefundYsfSum").html('￥'+data.toDayRefundUnionCount);
+			//今日新增门店
+			$("#toDayStoreCount").html(data.addToDayStoreNum);
+			//今日新增会员
+			$("#toDayMemberCount").html(data.addToDayMemberNum);
+			//今日新增推广员
+			$("#toDayPromoterCount").html(data.addToDayPromoterNum);
+			//新增总数
+			var md = data.addToDayStoreNum == null ? 0 : data.addToDayStoreNum;
+			var hy = data.addToDayMemberNum == null ? 0 : data.addToDayMemberNum;
+			var tgy = data.addToDayPromoterNum == null ? 0 : data.addToDayPromoterNum;
+			$("#toDayAddCount").html(parseInt(md)+parseInt(hy)+parseInt(tgy));
+			// //今日推广分润
+			$("#toDayShareoneySum").html('￥'+data.toDayShareCount.toFixed(2));
+			// //今日粉丝奖励
+			$("#toDayFansShareMoneySum").html('￥'+data.toDayFansCount.toFixed(2));
+			//
+			// //今日收益
+			let sjtoDayDayEarnings = parseFloat(data.toDayProfitCount) - parseFloat(data.toDayShareCount) - parseFloat(data.toDayFansCount)
+			//今日收益
+			$("#toDayEarnings").html('￥'+sjtoDayDayEarnings.toFixed(2));
+
+			$("#toDayAddMoneyCount").html("￥"+data.toDayProfitCount.toFixed(2));
+			let yesterDay = data.yesterDay;
+			// //昨日收款总额
+			$("#yesterDayTransSum").html('￥'+yesterDay.transAmt);
+			// //昨日支付宝收款
+			$("#yesterDayTransZfbSum").html('￥'+yesterDay.aliAmt);
+			// //昨日微信收款
+			$("#yesterDayTransWxSum").html('￥'+yesterDay.wxAmt);
+			// //昨日云闪付收款
+			$("#yesterDayTransYsfSum").html('￥'+yesterDay.ysfAmt);
+			// //昨日收款笔数
+			$("#yesterDayTransCount").html(yesterDay.transNum);
+			// //昨日支付宝收款笔数
+			$("#yesterDayTransZfbCount").html(yesterDay.aliNum);
+			// //昨日微信收款笔数
+			$("#yesterDayTransWxCount").html(yesterDay.wxNum);
+			// //昨日云闪付收款笔数
+			$("#yesterDayTransYsfCount").html(yesterDay.ysfNum);
+			// //昨日退款金额
+			$("#yesterDayRefundSum").html('￥'+yesterDay.refundAmt);
+			// //昨日支付宝退款金额
+			$("#yesterDayRefundZfbSum").html(yesterDay.aliRefundAmt);
+			// //昨日微信退款金额
+			$("#yesterDayRefundWxSum").html(yesterDay.wxRefundAmt);
+			// //昨日云闪付退款金额
+			$("#yesterDayRefundYsfSum").html(yesterDay.ysfRefundAmt);
+			// //昨日新增会员
+			$("#yesterDayMemberCount").html(yesterDay.memberNum);
+			// //昨日新增门店
+			$("#yesterDayStoreCount").html(yesterDay.storeNum);
+			// //昨日新增推广员
+			$("#yesterDayPromoterCount").html(yesterDay.promoterNum);
+
+			var ysYh = yesterDay.memberNum == null ? 0 : yesterDay.memberNum;
+			var ysMd = yesterDay.storeNum == null ? 0 : yesterDay.storeNum;
+			var ysTgy = yesterDay.promoterNum == null ? 0 : yesterDay.promoterNum;
+			// //昨日新增总数
+			var yesterDayAddCount = parseInt(ysYh)+parseInt(ysMd)+parseInt(ysTgy);
+            $("#yesterDayAddCount").html(yesterDayAddCount);
+
+			// //昨日推广分润
+			$("#yesterDayShareoneySum").html('￥'+yesterDay.shareAmt);
+			// //昨日粉丝奖励
+			$("#yesterDayFansShareMoneySum").html('￥'+yesterDay.fansAmt);
+			// //昨日收益
+			let sjYesterDayEarnings = parseFloat(yesterDay.profitAmt) - parseFloat(yesterDay.shareAmt) - parseFloat(yesterDay.fansAmt)
+			$("#yesterDayEarnings").html('￥'+sjYesterDayEarnings.toFixed(2));
+			//昨日累计收益
+            $("#yesterDayAddMoneyCount").html("￥"+yesterDay.profitAmt);
+
+			toDayTransCount = data.toDayTransCount;
+
+			yestDayNowTransAmt = data.yestDayNowTransAmt;
+
+			scale = data.scale;
+
+			subtract = data.subtract;
+
+			oTypeName = data.oTypeName;
+
+            newTimes = data.timeList;
+			orderFees = data.payAmtList;
+			channelNames = data.channelList;
+			channelNameAmts = data.channelAmtList;
+			payTransNum = data.payNumList;
+			channelNums = data.channelNumList;
+			lineChart('交易金额',newTimes,orderFees);
+			pieChart('交易金额',channelNames,channelNameAmts);
+		}
+	});
+	
+	$("#date_order .btn").click(function(){
+		var index=$("#date_order .btn").index(this);
+		if(index==1){
+			lineChart('交易笔数',newTimes,payTransNum);
+		}else{
+			lineChart('交易金额',newTimes,orderFees);
+		}
+	});
+	
+	$("#type_order .btn").click(function(){
+		var index=$("#type_order .btn").index(this);
+		if(index==1){
+			pieChart('交易笔数',channelNames,channelNums);
+		}else{
+			pieChart('交易金额',channelNames,channelNameAmts);
+		}
+	});
+})
+
+function lineChart(title,xValue,yValue){
+	var option = {
+    		tooltip: {
+    	        trigger: 'axis'
+    	    },
+    	    xAxis: [{
+    	        type: 'category',
+    	        data: xValue,
+                nameTextStyle:{
+                	color:'#C6D0D8',
+        			fontSize:'14px',
+        			fontFamily:'Adobe Heiti Std'
+                },
+    	        axisLine: {
+    	            lineStyle: {
+    	                color: "#999"
+    	            }
+    	        }
+    	    }],
+    	    yAxis: [{
+    	        type: 'value',
+    	        nameTextStyle:{
+                	color:'#C6D0D8',
+        			fontSize:'14px',
+        			fontFamily:'Adobe Heiti Std'
+                },
+    	        splitLine: {
+    	            lineStyle: {
+    	                type: 'dashed',
+    	                color: '#DDD'
+    	            }
+    	        },
+    	        axisLine: {
+    	            show: false,
+    	            lineStyle: {
+    	                color: "#333"
+    	            },
+    	        },
+    	        splitArea: {
+    	            show: false
+    	        }
+    	    }],
+    	    grid: {
+	            left: '8%',
+	            right: '8%',
+	            top: '8%',
+	            containLabel: true
+	           },
+    	    series: [{
+    	        name: title,
+    	        type: 'line',
+    	        data: yValue,
+    	        lineStyle: {
+    	            normal: {
+    	                width: 5,
+    	                color: '#47B3FF',
+                        shadowColor: '#47B3FF',
+    	                shadowBlur: 10,
+    	                shadowOffsetY: 20
+    	            }
+    	        },
+    	        itemStyle: {
+    	            normal: {
+    	                color: '#fff',
+    	                borderWidth: 10,
+    	                /*shadowColor: 'rgba(72,216,191, 0.3)',
+    	                shadowBlur: 100,*/
+    	                borderColor: "#fff"
+    	            }
+    	        },
+    	        smooth: true
+        }]
+    };
+	
+	myChart.setOption(option);
+}
+
+
+function showAdmin(){
+
+	$.ajax({
+		url : ctx + "/platform/showAdmin",
+		type : "POST",
+		success : function(data) {
+            var loginName=data.loginName;
+			if(loginName!="admin"){
+				$(".menuHide").css({"display":"none"});
+			}
+			else{
+				$(".new_fans").css({"display":"none"});
+			}
+		
+		}
+	});
+}
+let index;
+function showTips(obj){
+	index = layer.tips('<div>' +
+		'<p>同时段交易环比</p>' +
+		'<p>今日交易金额：'+toDayTransCount+'元</p>' +
+		'<p>昨日交易金额：'+yestDayNowTransAmt+'元</p>' +
+		'<p>'+oTypeName+':'+subtract+'元</p>' +
+		'<p>环比：'+scale+'</p>' +
+		'</div>', obj,{time: 0, area: ['13%', '13%']});
+}
+
+function closeTips(){
+	layer.close(index);
+}
+
+function pieChart(title,xValue,yValue){
+	let data = [];
+	for (let i=0; i<xValue.length; i++) {
+		data.push({name: xValue[i], value: yValue[i]})
+	}
+	var option = {
+			tooltip: {
+				trigger: 'item',
+				formatter: "{a} <br/>{b}: {c} ({d}%)"
+			},
+			color: ['#0eb8a2', '#2668e2', '#f08b28'],
+			legend: {
+				orient: 'vertical',
+				data: xValue,
+				top:'20%',
+				right:'10%',
+				textStyle:{
+                	color:'#4A5A7F',
+        			fontSize:'16',
+        			fontFamily:'Adobe Heiti Std'
+                }
+				
+			},
+			grid: {
+	            left: '8%',
+	            right: '8%',
+	            top: '8%',
+	            containLabel: true
+	        },
+			series: [{
+				name: title,
+				type: 'pie',
+				radius: ['50%', '70%'],
+				avoidLabelOverlap: false,
+				label: {
+					normal: {
+						show: true,
+						position: 'outside',
+						formatter: "{b}\n{c}\t({d}%)"
+					},
+					emphasis: {
+						show: true,
+						position: 'center',
+						textStyle: {
+							fontSize: '16',
+							fontWeight: 'bold'
+						},
+						formatter: "{b}\n{c}\t({d}%)"
+					}
+				},
+				labelLine: {
+					normal: {
+						show: true
+					}
+				},
+				data: data
+			}]
+		};
+	myChart2.setOption(option);
+}
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/jquery-3.6.0.min.js b/pluss-manage-page/src/main/resources/static/resources/js/jquery-3.6.0.min.js
new file mode 100644
index 0000000..c4c6022
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/jquery-3.6.0.min.js
@@ -0,0 +1,2 @@
+/*! jQuery v3.6.0 | (c) OpenJS Foundation and other contributors | jquery.org/license */
+!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use strict";var t=[],r=Object.getPrototypeOf,s=t.slice,g=t.flat?function(e){return t.flat.call(e)}:function(e){return t.concat.apply([],e)},u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l=a.call(Object),y={},m=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType&&"function"!=typeof e.item},x=function(e){return null!=e&&e===e.window},E=C.document,c={type:!0,src:!0,nonce:!0,noModule:!0};function b(e,t,n){var r,i,o=(n=n||E).createElement("script");if(o.text=e,t)for(r in c)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function w(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[o.call(e)]||"object":typeof e}var f="3.6.0",S=function(e,t){return new S.fn.init(e,t)};function p(e){var t=!!e&&"length"in e&&e.length,n=w(e);return!m(e)&&!x(e)&&("array"===n||0===t||"number"==typeof t&&0<t&&t-1 in e)}S.fn=S.prototype={jquery:f,constructor:S,length:0,toArray:function(){return s.call(this)},get:function(e){return null==e?s.call(this):e<0?this[e+this.length]:this[e]},pushStack:function(e){var t=S.merge(this.constructor(),e);return t.prevObject=this,t},each:function(e){return S.each(this,e)},map:function(n){return this.pushStack(S.map(this,function(e,t){return n.call(e,t,e)}))},slice:function(){return this.pushStack(s.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},even:function(){return this.pushStack(S.grep(this,function(e,t){return(t+1)%2}))},odd:function(){return this.pushStack(S.grep(this,function(e,t){return t%2}))},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(0<=n&&n<t?[this[n]]:[])},end:function(){return this.prevObject||this.constructor()},push:u,sort:t.sort,splice:t.splice},S.extend=S.fn.extend=function(){var e,t,n,r,i,o,a=arguments[0]||{},s=1,u=arguments.length,l=!1;for("boolean"==typeof a&&(l=a,a=arguments[s]||{},s++),"object"==typeof a||m(a)||(a={}),s===u&&(a=this,s--);s<u;s++)if(null!=(e=arguments[s]))for(t in e)r=e[t],"__proto__"!==t&&a!==r&&(l&&r&&(S.isPlainObject(r)||(i=Array.isArray(r)))?(n=a[t],o=i&&!Array.isArray(n)?[]:i||S.isPlainObject(n)?n:{},i=!1,a[t]=S.extend(l,o,r)):void 0!==r&&(a[t]=r));return a},S.extend({expando:"jQuery"+(f+Math.random()).replace(/\D/g,""),isReady:!0,error:function(e){throw new Error(e)},noop:function(){},isPlainObject:function(e){var t,n;return!(!e||"[object Object]"!==o.call(e))&&(!(t=r(e))||"function"==typeof(n=v.call(t,"constructor")&&t.constructor)&&a.call(n)===l)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},globalEval:function(e,t,n){b(e,{nonce:t&&t.nonce},n)},each:function(e,t){var n,r=0;if(p(e)){for(n=e.length;r<n;r++)if(!1===t.call(e[r],r,e[r]))break}else for(r in e)if(!1===t.call(e[r],r,e[r]))break;return e},makeArray:function(e,t){var n=t||[];return null!=e&&(p(Object(e))?S.merge(n,"string"==typeof e?[e]:e):u.call(n,e)),n},inArray:function(e,t,n){return null==t?-1:i.call(t,e,n)},merge:function(e,t){for(var n=+t.length,r=0,i=e.length;r<n;r++)e[i++]=t[r];return e.length=i,e},grep:function(e,t,n){for(var r=[],i=0,o=e.length,a=!n;i<o;i++)!t(e[i],i)!==a&&r.push(e[i]);return r},map:function(e,t,n){var r,i,o=0,a=[];if(p(e))for(r=e.length;o<r;o++)null!=(i=t(e[o],o,n))&&a.push(i);else for(o in e)null!=(i=t(e[o],o,n))&&a.push(i);return g(a)},guid:1,support:y}),"function"==typeof Symbol&&(S.fn[Symbol.iterator]=t[Symbol.iterator]),S.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(e,t){n["[object "+t+"]"]=t.toLowerCase()});var d=function(n){var e,d,b,o,i,h,f,g,w,u,l,T,C,a,E,v,s,c,y,S="sizzle"+1*new Date,p=n.document,k=0,r=0,m=ue(),x=ue(),A=ue(),N=ue(),j=function(e,t){return e===t&&(l=!0),0},D={}.hasOwnProperty,t=[],q=t.pop,L=t.push,H=t.push,O=t.slice,P=function(e,t){for(var n=0,r=e.length;n<r;n++)if(e[n]===t)return n;return-1},R="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",I="(?:\\\\[\\da-fA-F]{1,6}"+M+"?|\\\\[^\\r\\n\\f]|[\\w-]|[^\0-\\x7f])+",W="\\["+M+"*("+I+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+I+"))|)"+M+"*\\]",F=":("+I+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+W+")*)|.*)\\)|)",B=new RegExp(M+"+","g"),$=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),_=new RegExp("^"+M+"*,"+M+"*"),z=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=new RegExp(M+"|>"),X=new RegExp(F),V=new RegExp("^"+I+"$"),G={ID:new RegExp("^#("+I+")"),CLASS:new RegExp("^\\.("+I+")"),TAG:new RegExp("^("+I+"|[*])"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+F),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+R+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/HTML$/i,Q=/^(?:input|select|textarea|button)$/i,J=/^h\d$/i,K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new RegExp("\\\\[\\da-fA-F]{1,6}"+M+"?|\\\\([^\\r\\n\\f])","g"),ne=function(e,t){var n="0x"+e.slice(1)-65536;return t||(n<0?String.fromCharCode(n+65536):String.fromCharCode(n>>10|55296,1023&n|56320))},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ie=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},oe=function(){T()},ae=be(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{H.apply(t=O.call(p.childNodes),p.childNodes),t[p.childNodes.length].nodeType}catch(e){H={apply:t.length?function(e,t){L.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function se(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&(T(e),e=e||C,E)){if(11!==p&&(u=Z.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(f&&(a=f.getElementById(i))&&y(e,a)&&a.id===i)return n.push(a),n}else{if(u[2])return H.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&d.getElementsByClassName&&e.getElementsByClassName)return H.apply(n,e.getElementsByClassName(i)),n}if(d.qsa&&!N[t+" "]&&(!v||!v.test(t))&&(1!==p||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===p&&(U.test(t)||z.test(t))){(f=ee.test(t)&&ye(e.parentNode)||e)===e&&d.scope||((s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=S)),o=(l=h(t)).length;while(o--)l[o]=(s?"#"+s:":scope")+" "+xe(l[o]);c=l.join(",")}try{return H.apply(n,f.querySelectorAll(c)),n}catch(e){N(t,!0)}finally{s===S&&e.removeAttribute("id")}}}return g(t.replace($,"$1"),e,n,r)}function ue(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function le(e){return e[S]=!0,e}function ce(e){var t=C.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function fe(e,t){var n=e.split("|"),r=n.length;while(r--)b.attrHandle[n[r]]=t}function pe(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function de(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function he(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function ge(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&ae(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ve(a){return le(function(o){return o=+o,le(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function ye(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}for(e in d=se.support={},i=se.isXML=function(e){var t=e&&e.namespaceURI,n=e&&(e.ownerDocument||e).documentElement;return!Y.test(t||n&&n.nodeName||"HTML")},T=se.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:p;return r!=C&&9===r.nodeType&&r.documentElement&&(a=(C=r).documentElement,E=!i(C),p!=C&&(n=C.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",oe,!1):n.attachEvent&&n.attachEvent("onunload",oe)),d.scope=ce(function(e){return a.appendChild(e).appendChild(C.createElement("div")),"undefined"!=typeof e.querySelectorAll&&!e.querySelectorAll(":scope fieldset div").length}),d.attributes=ce(function(e){return e.className="i",!e.getAttribute("className")}),d.getElementsByTagName=ce(function(e){return e.appendChild(C.createComment("")),!e.getElementsByTagName("*").length}),d.getElementsByClassName=K.test(C.getElementsByClassName),d.getById=ce(function(e){return a.appendChild(e).id=S,!C.getElementsByName||!C.getElementsByName(S).length}),d.getById?(b.filter.ID=function(e){var t=e.replace(te,ne);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(te,ne);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=d.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):d.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},b.find.CLASS=d.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&E)return t.getElementsByClassName(e)},s=[],v=[],(d.qsa=K.test(C.querySelectorAll))&&(ce(function(e){var t;a.appendChild(e).innerHTML="<a id='"+S+"'></a><select id='"+S+"-\r\\' msallowcapture=''><option selected=''></option></select>",e.querySelectorAll("[msallowcapture^='']").length&&v.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||v.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll("[id~="+S+"-]").length||v.push("~="),(t=C.createElement("input")).setAttribute("name",""),e.appendChild(t),e.querySelectorAll("[name='']").length||v.push("\\["+M+"*name"+M+"*="+M+"*(?:''|\"\")"),e.querySelectorAll(":checked").length||v.push(":checked"),e.querySelectorAll("a#"+S+"+*").length||v.push(".#.+[+~]"),e.querySelectorAll("\\\f"),v.push("[\\r\\n\\f]")}),ce(function(e){e.innerHTML="<a href='' disabled='disabled'></a><select disabled='disabled'><option/></select>";var t=C.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&v.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&v.push(":enabled",":disabled"),a.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&v.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),v.push(",.*:")})),(d.matchesSelector=K.test(c=a.matches||a.webkitMatchesSelector||a.mozMatchesSelector||a.oMatchesSelector||a.msMatchesSelector))&&ce(function(e){d.disconnectedMatch=c.call(e,"*"),c.call(e,"[s!='']:x"),s.push("!=",F)}),v=v.length&&new RegExp(v.join("|")),s=s.length&&new RegExp(s.join("|")),t=K.test(a.compareDocumentPosition),y=t||K.test(a.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},j=t?function(e,t){if(e===t)return l=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)==(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!d.sortDetached&&t.compareDocumentPosition(e)===n?e==C||e.ownerDocument==p&&y(p,e)?-1:t==C||t.ownerDocument==p&&y(p,t)?1:u?P(u,e)-P(u,t):0:4&n?-1:1)}:function(e,t){if(e===t)return l=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e==C?-1:t==C?1:i?-1:o?1:u?P(u,e)-P(u,t):0;if(i===o)return pe(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?pe(a[r],s[r]):a[r]==p?-1:s[r]==p?1:0}),C},se.matches=function(e,t){return se(e,null,null,t)},se.matchesSelector=function(e,t){if(T(e),d.matchesSelector&&E&&!N[t+" "]&&(!s||!s.test(t))&&(!v||!v.test(t)))try{var n=c.call(e,t);if(n||d.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){N(t,!0)}return 0<se(t,C,null,[e]).length},se.contains=function(e,t){return(e.ownerDocument||e)!=C&&T(e),y(e,t)},se.attr=function(e,t){(e.ownerDocument||e)!=C&&T(e);var n=b.attrHandle[t.toLowerCase()],r=n&&D.call(b.attrHandle,t.toLowerCase())?n(e,t,!E):void 0;return void 0!==r?r:d.attributes||!E?e.getAttribute(t):(r=e.getAttributeNode(t))&&r.specified?r.value:null},se.escape=function(e){return(e+"").replace(re,ie)},se.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},se.uniqueSort=function(e){var t,n=[],r=0,i=0;if(l=!d.detectDuplicates,u=!d.sortStable&&e.slice(0),e.sort(j),l){while(t=e[i++])t===e[i]&&(r=n.push(i));while(r--)e.splice(n[r],1)}return u=null,e},o=se.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=o(e)}else if(3===i||4===i)return e.nodeValue}else while(t=e[r++])n+=o(t);return n},(b=se.selectors={cacheLength:50,createPseudo:le,match:G,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(te,ne),e[3]=(e[3]||e[4]||e[5]||"").replace(te,ne),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||se.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&se.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return G.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=h(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(te,ne).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=m[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&m(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=se.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1<t.indexOf(i):"$="===r?i&&t.slice(-i.length)===i:"~="===r?-1<(" "+t.replace(B," ")+" ").indexOf(i):"|="===r&&(t===i||t.slice(0,i.length+1)===i+"-"))}},CHILD:function(h,e,t,g,v){var y="nth"!==h.slice(0,3),m="last"!==h.slice(-4),x="of-type"===e;return 1===g&&0===v?function(e){return!!e.parentNode}:function(e,t,n){var r,i,o,a,s,u,l=y!==m?"nextSibling":"previousSibling",c=e.parentNode,f=x&&e.nodeName.toLowerCase(),p=!n&&!x,d=!1;if(c){if(y){while(l){a=e;while(a=a[l])if(x?a.nodeName.toLowerCase()===f:1===a.nodeType)return!1;u=l="only"===h&&!u&&"nextSibling"}return!0}if(u=[m?c.firstChild:c.lastChild],m&&p){d=(s=(r=(i=(o=(a=c)[S]||(a[S]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===k&&r[1])&&r[2],a=s&&c.childNodes[s];while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if(1===a.nodeType&&++d&&a===e){i[h]=[k,s,d];break}}else if(p&&(d=s=(r=(i=(o=(a=e)[S]||(a[S]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===k&&r[1]),!1===d)while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if((x?a.nodeName.toLowerCase()===f:1===a.nodeType)&&++d&&(p&&((i=(o=a[S]||(a[S]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]=[k,d]),a===e))break;return(d-=v)===g||d%g==0&&0<=d/g}}},PSEUDO:function(e,o){var t,a=b.pseudos[e]||b.setFilters[e.toLowerCase()]||se.error("unsupported pseudo: "+e);return a[S]?a(o):1<a.length?(t=[e,e,"",o],b.setFilters.hasOwnProperty(e.toLowerCase())?le(function(e,t){var n,r=a(e,o),i=r.length;while(i--)e[n=P(e,r[i])]=!(t[n]=r[i])}):function(e){return a(e,0,t)}):a}},pseudos:{not:le(function(e){var r=[],i=[],s=f(e.replace($,"$1"));return s[S]?le(function(e,t,n,r){var i,o=s(e,null,r,[]),a=e.length;while(a--)(i=o[a])&&(e[a]=!(t[a]=i))}):function(e,t,n){return r[0]=e,s(r,null,n,i),r[0]=null,!i.pop()}}),has:le(function(t){return function(e){return 0<se(t,e).length}}),contains:le(function(t){return t=t.replace(te,ne),function(e){return-1<(e.textContent||o(e)).indexOf(t)}}),lang:le(function(n){return V.test(n||"")||se.error("unsupported lang: "+n),n=n.replace(te,ne).toLowerCase(),function(e){var t;do{if(t=E?e.lang:e.getAttribute("xml:lang")||e.getAttribute("lang"))return(t=t.toLowerCase())===n||0===t.indexOf(n+"-")}while((e=e.parentNode)&&1===e.nodeType);return!1}}),target:function(e){var t=n.location&&n.location.hash;return t&&t.slice(1)===e.id},root:function(e){return e===a},focus:function(e){return e===C.activeElement&&(!C.hasFocus||C.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:ge(!1),disabled:ge(!0),checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,!0===e.selected},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!b.pseudos.empty(e)},header:function(e){return J.test(e.nodeName)},input:function(e){return Q.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:ve(function(){return[0]}),last:ve(function(e,t){return[t-1]}),eq:ve(function(e,t,n){return[n<0?n+t:n]}),even:ve(function(e,t){for(var n=0;n<t;n+=2)e.push(n);return e}),odd:ve(function(e,t){for(var n=1;n<t;n+=2)e.push(n);return e}),lt:ve(function(e,t,n){for(var r=n<0?n+t:t<n?t:n;0<=--r;)e.push(r);return e}),gt:ve(function(e,t,n){for(var r=n<0?n+t:n;++r<t;)e.push(r);return e})}}).pseudos.nth=b.pseudos.eq,{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})b.pseudos[e]=de(e);for(e in{submit:!0,reset:!0})b.pseudos[e]=he(e);function me(){}function xe(e){for(var t=0,n=e.length,r="";t<n;t++)r+=e[t].value;return r}function be(s,e,t){var u=e.dir,l=e.next,c=l||u,f=t&&"parentNode"===c,p=r++;return e.first?function(e,t,n){while(e=e[u])if(1===e.nodeType||f)return s(e,t,n);return!1}:function(e,t,n){var r,i,o,a=[k,p];if(n){while(e=e[u])if((1===e.nodeType||f)&&s(e,t,n))return!0}else while(e=e[u])if(1===e.nodeType||f)if(i=(o=e[S]||(e[S]={}))[e.uniqueID]||(o[e.uniqueID]={}),l&&l===e.nodeName.toLowerCase())e=e[u]||e;else{if((r=i[c])&&r[0]===k&&r[1]===p)return a[2]=r[2];if((i[c]=a)[2]=s(e,t,n))return!0}return!1}}function we(i){return 1<i.length?function(e,t,n){var r=i.length;while(r--)if(!i[r](e,t,n))return!1;return!0}:i[0]}function Te(e,t,n,r,i){for(var o,a=[],s=0,u=e.length,l=null!=t;s<u;s++)(o=e[s])&&(n&&!n(o,r,i)||(a.push(o),l&&t.push(s)));return a}function Ce(d,h,g,v,y,e){return v&&!v[S]&&(v=Ce(v)),y&&!y[S]&&(y=Ce(y,e)),le(function(e,t,n,r){var i,o,a,s=[],u=[],l=t.length,c=e||function(e,t,n){for(var r=0,i=t.length;r<i;r++)se(e,t[r],n);return n}(h||"*",n.nodeType?[n]:n,[]),f=!d||!e&&h?c:Te(c,s,d,n,r),p=g?y||(e?d:l||v)?[]:t:f;if(g&&g(f,p,n,r),v){i=Te(p,u),v(i,[],n,r),o=i.length;while(o--)(a=i[o])&&(p[u[o]]=!(f[u[o]]=a))}if(e){if(y||d){if(y){i=[],o=p.length;while(o--)(a=p[o])&&i.push(f[o]=a);y(null,p=[],i,r)}o=p.length;while(o--)(a=p[o])&&-1<(i=y?P(e,a):s[o])&&(e[i]=!(t[i]=a))}}else p=Te(p===t?p.splice(l,p.length):p),y?y(null,t,p,r):H.apply(t,p)})}function Ee(e){for(var i,t,n,r=e.length,o=b.relative[e[0].type],a=o||b.relative[" "],s=o?1:0,u=be(function(e){return e===i},a,!0),l=be(function(e){return-1<P(i,e)},a,!0),c=[function(e,t,n){var r=!o&&(n||t!==w)||((i=t).nodeType?u(e,t,n):l(e,t,n));return i=null,r}];s<r;s++)if(t=b.relative[e[s].type])c=[be(we(c),t)];else{if((t=b.filter[e[s].type].apply(null,e[s].matches))[S]){for(n=++s;n<r;n++)if(b.relative[e[n].type])break;return Ce(1<s&&we(c),1<s&&xe(e.slice(0,s-1).concat({value:" "===e[s-2].type?"*":""})).replace($,"$1"),t,s<n&&Ee(e.slice(s,n)),n<r&&Ee(e=e.slice(n)),n<r&&xe(e))}c.push(t)}return we(c)}return me.prototype=b.filters=b.pseudos,b.setFilters=new me,h=se.tokenize=function(e,t){var n,r,i,o,a,s,u,l=x[e+" "];if(l)return t?0:l.slice(0);a=e,s=[],u=b.preFilter;while(a){for(o in n&&!(r=_.exec(a))||(r&&(a=a.slice(r[0].length)||a),s.push(i=[])),n=!1,(r=z.exec(a))&&(n=r.shift(),i.push({value:n,type:r[0].replace($," ")}),a=a.slice(n.length)),b.filter)!(r=G[o].exec(a))||u[o]&&!(r=u[o](r))||(n=r.shift(),i.push({value:n,type:o,matches:r}),a=a.slice(n.length));if(!n)break}return t?a.length:a?se.error(e):x(e,s).slice(0)},f=se.compile=function(e,t){var n,v,y,m,x,r,i=[],o=[],a=A[e+" "];if(!a){t||(t=h(e)),n=t.length;while(n--)(a=Ee(t[n]))[S]?i.push(a):o.push(a);(a=A(e,(v=o,m=0<(y=i).length,x=0<v.length,r=function(e,t,n,r,i){var o,a,s,u=0,l="0",c=e&&[],f=[],p=w,d=e||x&&b.find.TAG("*",i),h=k+=null==p?1:Math.random()||.1,g=d.length;for(i&&(w=t==C||t||i);l!==g&&null!=(o=d[l]);l++){if(x&&o){a=0,t||o.ownerDocument==C||(T(o),n=!E);while(s=v[a++])if(s(o,t||C,n)){r.push(o);break}i&&(k=h)}m&&((o=!s&&o)&&u--,e&&c.push(o))}if(u+=l,m&&l!==u){a=0;while(s=y[a++])s(c,f,t,n);if(e){if(0<u)while(l--)c[l]||f[l]||(f[l]=q.call(r));f=Te(f)}H.apply(r,f),i&&!e&&0<f.length&&1<u+y.length&&se.uniqueSort(r)}return i&&(k=h,w=p),c},m?le(r):r))).selector=e}return a},g=se.select=function(e,t,n,r){var i,o,a,s,u,l="function"==typeof e&&e,c=!r&&h(e=l.selector||e);if(n=n||[],1===c.length){if(2<(o=c[0]=c[0].slice(0)).length&&"ID"===(a=o[0]).type&&9===t.nodeType&&E&&b.relative[o[1].type]){if(!(t=(b.find.ID(a.matches[0].replace(te,ne),t)||[])[0]))return n;l&&(t=t.parentNode),e=e.slice(o.shift().value.length)}i=G.needsContext.test(e)?0:o.length;while(i--){if(a=o[i],b.relative[s=a.type])break;if((u=b.find[s])&&(r=u(a.matches[0].replace(te,ne),ee.test(o[0].type)&&ye(t.parentNode)||t))){if(o.splice(i,1),!(e=r.length&&xe(o)))return H.apply(n,r),n;break}}}return(l||f(e,c))(r,t,!E,n,!t||ee.test(e)&&ye(t.parentNode)||t),n},d.sortStable=S.split("").sort(j).join("")===S,d.detectDuplicates=!!l,T(),d.sortDetached=ce(function(e){return 1&e.compareDocumentPosition(C.createElement("fieldset"))}),ce(function(e){return e.innerHTML="<a href='#'></a>","#"===e.firstChild.getAttribute("href")})||fe("type|href|height|width",function(e,t,n){if(!n)return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),d.attributes&&ce(function(e){return e.innerHTML="<input/>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||fe("value",function(e,t,n){if(!n&&"input"===e.nodeName.toLowerCase())return e.defaultValue}),ce(function(e){return null==e.getAttribute("disabled")})||fe(R,function(e,t,n){var r;if(!n)return!0===e[t]?t.toLowerCase():(r=e.getAttributeNode(t))&&r.specified?r.value:null}),se}(C);S.find=d,S.expr=d.selectors,S.expr[":"]=S.expr.pseudos,S.uniqueSort=S.unique=d.uniqueSort,S.text=d.getText,S.isXMLDoc=d.isXML,S.contains=d.contains,S.escapeSelector=d.escape;var h=function(e,t,n){var r=[],i=void 0!==n;while((e=e[t])&&9!==e.nodeType)if(1===e.nodeType){if(i&&S(e).is(n))break;r.push(e)}return r},T=function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},k=S.expr.match.needsContext;function A(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()}var N=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function j(e,n,r){return m(n)?S.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?S.grep(e,function(e){return e===n!==r}):"string"!=typeof n?S.grep(e,function(e){return-1<i.call(n,e)!==r}):S.filter(n,e,r)}S.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?S.find.matchesSelector(r,e)?[r]:[]:S.find.matches(e,S.grep(t,function(e){return 1===e.nodeType}))},S.fn.extend({find:function(e){var t,n,r=this.length,i=this;if("string"!=typeof e)return this.pushStack(S(e).filter(function(){for(t=0;t<r;t++)if(S.contains(i[t],this))return!0}));for(n=this.pushStack([]),t=0;t<r;t++)S.find(e,i[t],n);return 1<r?S.uniqueSort(n):n},filter:function(e){return this.pushStack(j(this,e||[],!1))},not:function(e){return this.pushStack(j(this,e||[],!0))},is:function(e){return!!j(this,"string"==typeof e&&k.test(e)?S(e):e||[],!1).length}});var D,q=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/;(S.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||D,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:q.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof S?t[0]:t,S.merge(this,S.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:E,!0)),N.test(r[1])&&S.isPlainObject(t))for(r in t)m(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=E.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):m(e)?void 0!==n.ready?n.ready(e):e(S):S.makeArray(e,this)}).prototype=S.fn,D=S(E);var L=/^(?:parents|prev(?:Until|All))/,H={children:!0,contents:!0,next:!0,prev:!0};function O(e,t){while((e=e[t])&&1!==e.nodeType);return e}S.fn.extend({has:function(e){var t=S(e,this),n=t.length;return this.filter(function(){for(var e=0;e<n;e++)if(S.contains(this,t[e]))return!0})},closest:function(e,t){var n,r=0,i=this.length,o=[],a="string"!=typeof e&&S(e);if(!k.test(e))for(;r<i;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(n.nodeType<11&&(a?-1<a.index(n):1===n.nodeType&&S.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(1<o.length?S.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?i.call(S(e),this[0]):i.call(this,e.jquery?e[0]:e):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(S.uniqueSort(S.merge(this.get(),S(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),S.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return h(e,"parentNode")},parentsUntil:function(e,t,n){return h(e,"parentNode",n)},next:function(e){return O(e,"nextSibling")},prev:function(e){return O(e,"previousSibling")},nextAll:function(e){return h(e,"nextSibling")},prevAll:function(e){return h(e,"previousSibling")},nextUntil:function(e,t,n){return h(e,"nextSibling",n)},prevUntil:function(e,t,n){return h(e,"previousSibling",n)},siblings:function(e){return T((e.parentNode||{}).firstChild,e)},children:function(e){return T(e.firstChild)},contents:function(e){return null!=e.contentDocument&&r(e.contentDocument)?e.contentDocument:(A(e,"template")&&(e=e.content||e),S.merge([],e.childNodes))}},function(r,i){S.fn[r]=function(e,t){var n=S.map(this,i,e);return"Until"!==r.slice(-5)&&(t=e),t&&"string"==typeof t&&(n=S.filter(t,n)),1<this.length&&(H[r]||S.uniqueSort(n),L.test(r)&&n.reverse()),this.pushStack(n)}});var P=/[^\x20\t\r\n\f]+/g;function R(e){return e}function M(e){throw e}function I(e,t,n,r){var i;try{e&&m(i=e.promise)?i.call(e).done(t).fail(n):e&&m(i=e.then)?i.call(e,t,n):t.apply(void 0,[e].slice(r))}catch(e){n.apply(void 0,[e])}}S.Callbacks=function(r){var e,n;r="string"==typeof r?(e=r,n={},S.each(e.match(P)||[],function(e,t){n[t]=!0}),n):S.extend({},r);var i,t,o,a,s=[],u=[],l=-1,c=function(){for(a=a||r.once,o=i=!0;u.length;l=-1){t=u.shift();while(++l<s.length)!1===s[l].apply(t[0],t[1])&&r.stopOnFalse&&(l=s.length,t=!1)}r.memory||(t=!1),i=!1,a&&(s=t?[]:"")},f={add:function(){return s&&(t&&!i&&(l=s.length-1,u.push(t)),function n(e){S.each(e,function(e,t){m(t)?r.unique&&f.has(t)||s.push(t):t&&t.length&&"string"!==w(t)&&n(t)})}(arguments),t&&!i&&c()),this},remove:function(){return S.each(arguments,function(e,t){var n;while(-1<(n=S.inArray(t,s,n)))s.splice(n,1),n<=l&&l--}),this},has:function(e){return e?-1<S.inArray(e,s):0<s.length},empty:function(){return s&&(s=[]),this},disable:function(){return a=u=[],s=t="",this},disabled:function(){return!s},lock:function(){return a=u=[],t||i||(s=t=""),this},locked:function(){return!!a},fireWith:function(e,t){return a||(t=[e,(t=t||[]).slice?t.slice():t],u.push(t),i||c()),this},fire:function(){return f.fireWith(this,arguments),this},fired:function(){return!!o}};return f},S.extend({Deferred:function(e){var o=[["notify","progress",S.Callbacks("memory"),S.Callbacks("memory"),2],["resolve","done",S.Callbacks("once memory"),S.Callbacks("once memory"),0,"resolved"],["reject","fail",S.Callbacks("once memory"),S.Callbacks("once memory"),1,"rejected"]],i="pending",a={state:function(){return i},always:function(){return s.done(arguments).fail(arguments),this},"catch":function(e){return a.then(null,e)},pipe:function(){var i=arguments;return S.Deferred(function(r){S.each(o,function(e,t){var n=m(i[t[4]])&&i[t[4]];s[t[1]](function(){var e=n&&n.apply(this,arguments);e&&m(e.promise)?e.promise().progress(r.notify).done(r.resolve).fail(r.reject):r[t[0]+"With"](this,n?[e]:arguments)})}),i=null}).promise()},then:function(t,n,r){var u=0;function l(i,o,a,s){return function(){var n=this,r=arguments,e=function(){var e,t;if(!(i<u)){if((e=a.apply(n,r))===o.promise())throw new TypeError("Thenable self-resolution");t=e&&("object"==typeof e||"function"==typeof e)&&e.then,m(t)?s?t.call(e,l(u,o,R,s),l(u,o,M,s)):(u++,t.call(e,l(u,o,R,s),l(u,o,M,s),l(u,o,R,o.notifyWith))):(a!==R&&(n=void 0,r=[e]),(s||o.resolveWith)(n,r))}},t=s?e:function(){try{e()}catch(e){S.Deferred.exceptionHook&&S.Deferred.exceptionHook(e,t.stackTrace),u<=i+1&&(a!==M&&(n=void 0,r=[e]),o.rejectWith(n,r))}};i?t():(S.Deferred.getStackHook&&(t.stackTrace=S.Deferred.getStackHook()),C.setTimeout(t))}}return S.Deferred(function(e){o[0][3].add(l(0,e,m(r)?r:R,e.notifyWith)),o[1][3].add(l(0,e,m(t)?t:R)),o[2][3].add(l(0,e,m(n)?n:M))}).promise()},promise:function(e){return null!=e?S.extend(e,a):a}},s={};return S.each(o,function(e,t){var n=t[2],r=t[5];a[t[1]]=n.add,r&&n.add(function(){i=r},o[3-e][2].disable,o[3-e][3].disable,o[0][2].lock,o[0][3].lock),n.add(t[3].fire),s[t[0]]=function(){return s[t[0]+"With"](this===s?void 0:this,arguments),this},s[t[0]+"With"]=n.fireWith}),a.promise(s),e&&e.call(s,s),s},when:function(e){var n=arguments.length,t=n,r=Array(t),i=s.call(arguments),o=S.Deferred(),a=function(t){return function(e){r[t]=this,i[t]=1<arguments.length?s.call(arguments):e,--n||o.resolveWith(r,i)}};if(n<=1&&(I(e,o.done(a(t)).resolve,o.reject,!n),"pending"===o.state()||m(i[t]&&i[t].then)))return o.then();while(t--)I(i[t],a(t),o.reject);return o.promise()}});var W=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;S.Deferred.exceptionHook=function(e,t){C.console&&C.console.warn&&e&&W.test(e.name)&&C.console.warn("jQuery.Deferred exception: "+e.message,e.stack,t)},S.readyException=function(e){C.setTimeout(function(){throw e})};var F=S.Deferred();function B(){E.removeEventListener("DOMContentLoaded",B),C.removeEventListener("load",B),S.ready()}S.fn.ready=function(e){return F.then(e)["catch"](function(e){S.readyException(e)}),this},S.extend({isReady:!1,readyWait:1,ready:function(e){(!0===e?--S.readyWait:S.isReady)||(S.isReady=!0)!==e&&0<--S.readyWait||F.resolveWith(E,[S])}}),S.ready.then=F.then,"complete"===E.readyState||"loading"!==E.readyState&&!E.documentElement.doScroll?C.setTimeout(S.ready):(E.addEventListener("DOMContentLoaded",B),C.addEventListener("load",B));var $=function(e,t,n,r,i,o,a){var s=0,u=e.length,l=null==n;if("object"===w(n))for(s in i=!0,n)$(e,t,s,n[s],!0,o,a);else if(void 0!==r&&(i=!0,m(r)||(a=!0),l&&(a?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(S(e),n)})),t))for(;s<u;s++)t(e[s],n,a?r:r.call(e[s],s,t(e[s],n)));return i?e:l?t.call(e):u?t(e[0],n):o},_=/^-ms-/,z=/-([a-z])/g;function U(e,t){return t.toUpperCase()}function X(e){return e.replace(_,"ms-").replace(z,U)}var V=function(e){return 1===e.nodeType||9===e.nodeType||!+e.nodeType};function G(){this.expando=S.expando+G.uid++}G.uid=1,G.prototype={cache:function(e){var t=e[this.expando];return t||(t={},V(e)&&(e.nodeType?e[this.expando]=t:Object.defineProperty(e,this.expando,{value:t,configurable:!0}))),t},set:function(e,t,n){var r,i=this.cache(e);if("string"==typeof t)i[X(t)]=n;else for(r in t)i[X(r)]=t[r];return i},get:function(e,t){return void 0===t?this.cache(e):e[this.expando]&&e[this.expando][X(t)]},access:function(e,t,n){return void 0===t||t&&"string"==typeof t&&void 0===n?this.get(e,t):(this.set(e,t,n),void 0!==n?n:t)},remove:function(e,t){var n,r=e[this.expando];if(void 0!==r){if(void 0!==t){n=(t=Array.isArray(t)?t.map(X):(t=X(t))in r?[t]:t.match(P)||[]).length;while(n--)delete r[t[n]]}(void 0===t||S.isEmptyObject(r))&&(e.nodeType?e[this.expando]=void 0:delete e[this.expando])}},hasData:function(e){var t=e[this.expando];return void 0!==t&&!S.isEmptyObject(t)}};var Y=new G,Q=new G,J=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,K=/[A-Z]/g;function Z(e,t,n){var r,i;if(void 0===n&&1===e.nodeType)if(r="data-"+t.replace(K,"-$&").toLowerCase(),"string"==typeof(n=e.getAttribute(r))){try{n="true"===(i=n)||"false"!==i&&("null"===i?null:i===+i+""?+i:J.test(i)?JSON.parse(i):i)}catch(e){}Q.set(e,t,n)}else n=void 0;return n}S.extend({hasData:function(e){return Q.hasData(e)||Y.hasData(e)},data:function(e,t,n){return Q.access(e,t,n)},removeData:function(e,t){Q.remove(e,t)},_data:function(e,t,n){return Y.access(e,t,n)},_removeData:function(e,t){Y.remove(e,t)}}),S.fn.extend({data:function(n,e){var t,r,i,o=this[0],a=o&&o.attributes;if(void 0===n){if(this.length&&(i=Q.get(o),1===o.nodeType&&!Y.get(o,"hasDataAttrs"))){t=a.length;while(t--)a[t]&&0===(r=a[t].name).indexOf("data-")&&(r=X(r.slice(5)),Z(o,r,i[r]));Y.set(o,"hasDataAttrs",!0)}return i}return"object"==typeof n?this.each(function(){Q.set(this,n)}):$(this,function(e){var t;if(o&&void 0===e)return void 0!==(t=Q.get(o,n))?t:void 0!==(t=Z(o,n))?t:void 0;this.each(function(){Q.set(this,n,e)})},null,e,1<arguments.length,null,!0)},removeData:function(e){return this.each(function(){Q.remove(this,e)})}}),S.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=Y.get(e,t),n&&(!r||Array.isArray(n)?r=Y.access(e,t,S.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=S.queue(e,t),r=n.length,i=n.shift(),o=S._queueHooks(e,t);"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,function(){S.dequeue(e,t)},o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return Y.get(e,n)||Y.access(e,n,{empty:S.Callbacks("once memory").add(function(){Y.remove(e,[t+"queue",n])})})}}),S.fn.extend({queue:function(t,n){var e=2;return"string"!=typeof t&&(n=t,t="fx",e--),arguments.length<e?S.queue(this[0],t):void 0===n?this:this.each(function(){var e=S.queue(this,t,n);S._queueHooks(this,t),"fx"===t&&"inprogress"!==e[0]&&S.dequeue(this,t)})},dequeue:function(e){return this.each(function(){S.dequeue(this,e)})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,t){var n,r=1,i=S.Deferred(),o=this,a=this.length,s=function(){--r||i.resolveWith(o,[o])};"string"!=typeof e&&(t=e,e=void 0),e=e||"fx";while(a--)(n=Y.get(o[a],e+"queueHooks"))&&n.empty&&(r++,n.empty.add(s));return s(),i.promise(t)}});var ee=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,te=new RegExp("^(?:([+-])=|)("+ee+")([a-z%]*)$","i"),ne=["Top","Right","Bottom","Left"],re=E.documentElement,ie=function(e){return S.contains(e.ownerDocument,e)},oe={composed:!0};re.getRootNode&&(ie=function(e){return S.contains(e.ownerDocument,e)||e.getRootNode(oe)===e.ownerDocument});var ae=function(e,t){return"none"===(e=t||e).style.display||""===e.style.display&&ie(e)&&"none"===S.css(e,"display")};function se(e,t,n,r){var i,o,a=20,s=r?function(){return r.cur()}:function(){return S.css(e,t,"")},u=s(),l=n&&n[3]||(S.cssNumber[t]?"":"px"),c=e.nodeType&&(S.cssNumber[t]||"px"!==l&&+u)&&te.exec(S.css(e,t));if(c&&c[3]!==l){u/=2,l=l||c[3],c=+u||1;while(a--)S.style(e,t,c+l),(1-o)*(1-(o=s()/u||.5))<=0&&(a=0),c/=o;c*=2,S.style(e,t,c+l),n=n||[]}return n&&(c=+c||+u||0,i=n[1]?c+(n[1]+1)*n[2]:+n[2],r&&(r.unit=l,r.start=c,r.end=i)),i}var ue={};function le(e,t){for(var n,r,i,o,a,s,u,l=[],c=0,f=e.length;c<f;c++)(r=e[c]).style&&(n=r.style.display,t?("none"===n&&(l[c]=Y.get(r,"display")||null,l[c]||(r.style.display="")),""===r.style.display&&ae(r)&&(l[c]=(u=a=o=void 0,a=(i=r).ownerDocument,s=i.nodeName,(u=ue[s])||(o=a.body.appendChild(a.createElement(s)),u=S.css(o,"display"),o.parentNode.removeChild(o),"none"===u&&(u="block"),ue[s]=u)))):"none"!==n&&(l[c]="none",Y.set(r,"display",n)));for(c=0;c<f;c++)null!=l[c]&&(e[c].style.display=l[c]);return e}S.fn.extend({show:function(){return le(this,!0)},hide:function(){return le(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){ae(this)?S(this).show():S(this).hide()})}});var ce,fe,pe=/^(?:checkbox|radio)$/i,de=/<([a-z][^\/\0>\x20\t\r\n\f]*)/i,he=/^$|^module$|\/(?:java|ecma)script/i;ce=E.createDocumentFragment().appendChild(E.createElement("div")),(fe=E.createElement("input")).setAttribute("type","radio"),fe.setAttribute("checked","checked"),fe.setAttribute("name","t"),ce.appendChild(fe),y.checkClone=ce.cloneNode(!0).cloneNode(!0).lastChild.checked,ce.innerHTML="<textarea>x</textarea>",y.noCloneChecked=!!ce.cloneNode(!0).lastChild.defaultValue,ce.innerHTML="<option></option>",y.option=!!ce.lastChild;var ge={thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};function ve(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&A(e,t)?S.merge([e],n):n}function ye(e,t){for(var n=0,r=e.length;n<r;n++)Y.set(e[n],"globalEval",!t||Y.get(t[n],"globalEval"))}ge.tbody=ge.tfoot=ge.colgroup=ge.caption=ge.thead,ge.th=ge.td,y.option||(ge.optgroup=ge.option=[1,"<select multiple='multiple'>","</select>"]);var me=/<|&#?\w+;/;function xe(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d<h;d++)if((o=e[d])||0===o)if("object"===w(o))S.merge(p,o.nodeType?[o]:o);else if(me.test(o)){a=a||f.appendChild(t.createElement("div")),s=(de.exec(o)||["",""])[1].toLowerCase(),u=ge[s]||ge._default,a.innerHTML=u[1]+S.htmlPrefilter(o)+u[2],c=u[0];while(c--)a=a.lastChild;S.merge(p,a.childNodes),(a=f.firstChild).textContent=""}else p.push(t.createTextNode(o));f.textContent="",d=0;while(o=p[d++])if(r&&-1<S.inArray(o,r))i&&i.push(o);else if(l=ie(o),a=ve(f.appendChild(o),"script"),l&&ye(a),n){c=0;while(o=a[c++])he.test(o.type||"")&&n.push(o)}return f}var be=/^([^.]*)(?:\.(.+)|)/;function we(){return!0}function Te(){return!1}function Ce(e,t){return e===function(){try{return E.activeElement}catch(e){}}()==("focus"===t)}function Ee(e,t,n,r,i,o){var a,s;if("object"==typeof t){for(s in"string"!=typeof n&&(r=r||n,n=void 0),t)Ee(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),!1===i)i=Te;else if(!i)return e;return 1===o&&(a=i,(i=function(e){return S().off(e),a.apply(this,arguments)}).guid=a.guid||(a.guid=S.guid++)),e.each(function(){S.event.add(this,t,i,r,n)})}function Se(e,i,o){o?(Y.set(e,i,!1),S.event.add(e,i,{namespace:!1,handler:function(e){var t,n,r=Y.get(this,i);if(1&e.isTrigger&&this[i]){if(r.length)(S.event.special[i]||{}).delegateType&&e.stopPropagation();else if(r=s.call(arguments),Y.set(this,i,r),t=o(this,i),this[i](),r!==(n=Y.get(this,i))||t?Y.set(this,i,!1):n={},r!==n)return e.stopImmediatePropagation(),e.preventDefault(),n&&n.value}else r.length&&(Y.set(this,i,{value:S.event.trigger(S.extend(r[0],S.Event.prototype),r.slice(1),this)}),e.stopImmediatePropagation())}})):void 0===Y.get(e,i)&&S.event.add(e,i,we)}S.event={global:{},add:function(t,e,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Y.get(t);if(V(t)){n.handler&&(n=(o=n).handler,i=o.selector),i&&S.find.matchesSelector(re,i),n.guid||(n.guid=S.guid++),(u=v.events)||(u=v.events=Object.create(null)),(a=v.handle)||(a=v.handle=function(e){return"undefined"!=typeof S&&S.event.triggered!==e.type?S.event.dispatch.apply(t,arguments):void 0}),l=(e=(e||"").match(P)||[""]).length;while(l--)d=g=(s=be.exec(e[l])||[])[1],h=(s[2]||"").split(".").sort(),d&&(f=S.event.special[d]||{},d=(i?f.delegateType:f.bindType)||d,f=S.event.special[d]||{},c=S.extend({type:d,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&S.expr.match.needsContext.test(i),namespace:h.join(".")},o),(p=u[d])||((p=u[d]=[]).delegateCount=0,f.setup&&!1!==f.setup.call(t,r,h,a)||t.addEventListener&&t.addEventListener(d,a)),f.add&&(f.add.call(t,c),c.handler.guid||(c.handler.guid=n.guid)),i?p.splice(p.delegateCount++,0,c):p.push(c),S.event.global[d]=!0)}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Y.hasData(e)&&Y.get(e);if(v&&(u=v.events)){l=(t=(t||"").match(P)||[""]).length;while(l--)if(d=g=(s=be.exec(t[l])||[])[1],h=(s[2]||"").split(".").sort(),d){f=S.event.special[d]||{},p=u[d=(r?f.delegateType:f.bindType)||d]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=p.length;while(o--)c=p[o],!i&&g!==c.origType||n&&n.guid!==c.guid||s&&!s.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(p.splice(o,1),c.selector&&p.delegateCount--,f.remove&&f.remove.call(e,c));a&&!p.length&&(f.teardown&&!1!==f.teardown.call(e,h,v.handle)||S.removeEvent(e,d,v.handle),delete u[d])}else for(d in u)S.event.remove(e,d+t[l],n,r,!0);S.isEmptyObject(u)&&Y.remove(e,"handle events")}},dispatch:function(e){var t,n,r,i,o,a,s=new Array(arguments.length),u=S.event.fix(e),l=(Y.get(this,"events")||Object.create(null))[u.type]||[],c=S.event.special[u.type]||{};for(s[0]=u,t=1;t<arguments.length;t++)s[t]=arguments[t];if(u.delegateTarget=this,!c.preDispatch||!1!==c.preDispatch.call(this,u)){a=S.event.handlers.call(this,u,l),t=0;while((i=a[t++])&&!u.isPropagationStopped()){u.currentTarget=i.elem,n=0;while((o=i.handlers[n++])&&!u.isImmediatePropagationStopped())u.rnamespace&&!1!==o.namespace&&!u.rnamespace.test(o.namespace)||(u.handleObj=o,u.data=o.data,void 0!==(r=((S.event.special[o.origType]||{}).handle||o.handler).apply(i.elem,s))&&!1===(u.result=r)&&(u.preventDefault(),u.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,u),u.result}},handlers:function(e,t){var n,r,i,o,a,s=[],u=t.delegateCount,l=e.target;if(u&&l.nodeType&&!("click"===e.type&&1<=e.button))for(;l!==this;l=l.parentNode||this)if(1===l.nodeType&&("click"!==e.type||!0!==l.disabled)){for(o=[],a={},n=0;n<u;n++)void 0===a[i=(r=t[n]).selector+" "]&&(a[i]=r.needsContext?-1<S(i,this).index(l):S.find(i,this,null,[l]).length),a[i]&&o.push(r);o.length&&s.push({elem:l,handlers:o})}return l=this,u<t.length&&s.push({elem:l,handlers:t.slice(u)}),s},addProp:function(t,e){Object.defineProperty(S.Event.prototype,t,{enumerable:!0,configurable:!0,get:m(e)?function(){if(this.originalEvent)return e(this.originalEvent)}:function(){if(this.originalEvent)return this.originalEvent[t]},set:function(e){Object.defineProperty(this,t,{enumerable:!0,configurable:!0,writable:!0,value:e})}})},fix:function(e){return e[S.expando]?e:new S.Event(e)},special:{load:{noBubble:!0},click:{setup:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&Se(t,"click",we),!1},trigger:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&Se(t,"click"),!0},_default:function(e){var t=e.target;return pe.test(t.type)&&t.click&&A(t,"input")&&Y.get(t,"click")||A(t,"a")}},beforeunload:{postDispatch:function(e){void 0!==e.result&&e.originalEvent&&(e.originalEvent.returnValue=e.result)}}}},S.removeEvent=function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n)},S.Event=function(e,t){if(!(this instanceof S.Event))return new S.Event(e,t);e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||void 0===e.defaultPrevented&&!1===e.returnValue?we:Te,this.target=e.target&&3===e.target.nodeType?e.target.parentNode:e.target,this.currentTarget=e.currentTarget,this.relatedTarget=e.relatedTarget):this.type=e,t&&S.extend(this,t),this.timeStamp=e&&e.timeStamp||Date.now(),this[S.expando]=!0},S.Event.prototype={constructor:S.Event,isDefaultPrevented:Te,isPropagationStopped:Te,isImmediatePropagationStopped:Te,isSimulated:!1,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=we,e&&!this.isSimulated&&e.preventDefault()},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=we,e&&!this.isSimulated&&e.stopPropagation()},stopImmediatePropagation:function(){var e=this.originalEvent;this.isImmediatePropagationStopped=we,e&&!this.isSimulated&&e.stopImmediatePropagation(),this.stopPropagation()}},S.each({altKey:!0,bubbles:!0,cancelable:!0,changedTouches:!0,ctrlKey:!0,detail:!0,eventPhase:!0,metaKey:!0,pageX:!0,pageY:!0,shiftKey:!0,view:!0,"char":!0,code:!0,charCode:!0,key:!0,keyCode:!0,button:!0,buttons:!0,clientX:!0,clientY:!0,offsetX:!0,offsetY:!0,pointerId:!0,pointerType:!0,screenX:!0,screenY:!0,targetTouches:!0,toElement:!0,touches:!0,which:!0},S.event.addProp),S.each({focus:"focusin",blur:"focusout"},function(e,t){S.event.special[e]={setup:function(){return Se(this,e,Ce),!1},trigger:function(){return Se(this,e),!0},_default:function(){return!0},delegateType:t}}),S.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(e,i){S.event.special[e]={delegateType:i,bindType:i,handle:function(e){var t,n=e.relatedTarget,r=e.handleObj;return n&&(n===this||S.contains(this,n))||(e.type=r.origType,t=r.handler.apply(this,arguments),e.type=i),t}}}),S.fn.extend({on:function(e,t,n,r){return Ee(this,e,t,n,r)},one:function(e,t,n,r){return Ee(this,e,t,n,r,1)},off:function(e,t,n){var r,i;if(e&&e.preventDefault&&e.handleObj)return r=e.handleObj,S(e.delegateTarget).off(r.namespace?r.origType+"."+r.namespace:r.origType,r.selector,r.handler),this;if("object"==typeof e){for(i in e)this.off(i,t,e[i]);return this}return!1!==t&&"function"!=typeof t||(n=t,t=void 0),!1===n&&(n=Te),this.each(function(){S.event.remove(this,e,n,t)})}});var ke=/<script|<style|<link/i,Ae=/checked\s*(?:[^=]|=\s*.checked.)/i,Ne=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;function je(e,t){return A(e,"table")&&A(11!==t.nodeType?t:t.firstChild,"tr")&&S(e).children("tbody")[0]||e}function De(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function qe(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Le(e,t){var n,r,i,o,a,s;if(1===t.nodeType){if(Y.hasData(e)&&(s=Y.get(e).events))for(i in Y.remove(t,"handle events"),s)for(n=0,r=s[i].length;n<r;n++)S.event.add(t,i,s[i][n]);Q.hasData(e)&&(o=Q.access(e),a=S.extend({},o),Q.set(t,a))}}function He(n,r,i,o){r=g(r);var e,t,a,s,u,l,c=0,f=n.length,p=f-1,d=r[0],h=m(d);if(h||1<f&&"string"==typeof d&&!y.checkClone&&Ae.test(d))return n.each(function(e){var t=n.eq(e);h&&(r[0]=d.call(this,e,t.html())),He(t,r,i,o)});if(f&&(t=(e=xe(r,n[0].ownerDocument,!1,n,o)).firstChild,1===e.childNodes.length&&(e=t),t||o)){for(s=(a=S.map(ve(e,"script"),De)).length;c<f;c++)u=e,c!==p&&(u=S.clone(u,!0,!0),s&&S.merge(a,ve(u,"script"))),i.call(n[c],u,c);if(s)for(l=a[a.length-1].ownerDocument,S.map(a,qe),c=0;c<s;c++)u=a[c],he.test(u.type||"")&&!Y.access(u,"globalEval")&&S.contains(l,u)&&(u.src&&"module"!==(u.type||"").toLowerCase()?S._evalUrl&&!u.noModule&&S._evalUrl(u.src,{nonce:u.nonce||u.getAttribute("nonce")},l):b(u.textContent.replace(Ne,""),u,l))}return n}function Oe(e,t,n){for(var r,i=t?S.filter(t,e):e,o=0;null!=(r=i[o]);o++)n||1!==r.nodeType||S.cleanData(ve(r)),r.parentNode&&(n&&ie(r)&&ye(ve(r,"script")),r.parentNode.removeChild(r));return e}S.extend({htmlPrefilter:function(e){return e},clone:function(e,t,n){var r,i,o,a,s,u,l,c=e.cloneNode(!0),f=ie(e);if(!(y.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||S.isXMLDoc(e)))for(a=ve(c),r=0,i=(o=ve(e)).length;r<i;r++)s=o[r],u=a[r],void 0,"input"===(l=u.nodeName.toLowerCase())&&pe.test(s.type)?u.checked=s.checked:"input"!==l&&"textarea"!==l||(u.defaultValue=s.defaultValue);if(t)if(n)for(o=o||ve(e),a=a||ve(c),r=0,i=o.length;r<i;r++)Le(o[r],a[r]);else Le(e,c);return 0<(a=ve(c,"script")).length&&ye(a,!f&&ve(e,"script")),c},cleanData:function(e){for(var t,n,r,i=S.event.special,o=0;void 0!==(n=e[o]);o++)if(V(n)){if(t=n[Y.expando]){if(t.events)for(r in t.events)i[r]?S.event.remove(n,r):S.removeEvent(n,r,t.handle);n[Y.expando]=void 0}n[Q.expando]&&(n[Q.expando]=void 0)}}}),S.fn.extend({detach:function(e){return Oe(this,e,!0)},remove:function(e){return Oe(this,e)},text:function(e){return $(this,function(e){return void 0===e?S.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=e)})},null,e,arguments.length)},append:function(){return He(this,arguments,function(e){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||je(this,e).appendChild(e)})},prepend:function(){return He(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=je(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return He(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return He(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},empty:function(){for(var e,t=0;null!=(e=this[t]);t++)1===e.nodeType&&(S.cleanData(ve(e,!1)),e.textContent="");return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map(function(){return S.clone(this,e,t)})},html:function(e){return $(this,function(e){var t=this[0]||{},n=0,r=this.length;if(void 0===e&&1===t.nodeType)return t.innerHTML;if("string"==typeof e&&!ke.test(e)&&!ge[(de.exec(e)||["",""])[1].toLowerCase()]){e=S.htmlPrefilter(e);try{for(;n<r;n++)1===(t=this[n]||{}).nodeType&&(S.cleanData(ve(t,!1)),t.innerHTML=e);t=0}catch(e){}}t&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var n=[];return He(this,arguments,function(e){var t=this.parentNode;S.inArray(this,n)<0&&(S.cleanData(ve(this)),t&&t.replaceChild(e,this))},n)}}),S.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,a){S.fn[e]=function(e){for(var t,n=[],r=S(e),i=r.length-1,o=0;o<=i;o++)t=o===i?this:this.clone(!0),S(r[o])[a](t),u.apply(n,t.get());return this.pushStack(n)}});var Pe=new RegExp("^("+ee+")(?!px)[a-z%]+$","i"),Re=function(e){var t=e.ownerDocument.defaultView;return t&&t.opener||(t=C),t.getComputedStyle(e)},Me=function(e,t,n){var r,i,o={};for(i in t)o[i]=e.style[i],e.style[i]=t[i];for(i in r=n.call(e),t)e.style[i]=o[i];return r},Ie=new RegExp(ne.join("|"),"i");function We(e,t,n){var r,i,o,a,s=e.style;return(n=n||Re(e))&&(""!==(a=n.getPropertyValue(t)||n[t])||ie(e)||(a=S.style(e,t)),!y.pixelBoxStyles()&&Pe.test(a)&&Ie.test(t)&&(r=s.width,i=s.minWidth,o=s.maxWidth,s.minWidth=s.maxWidth=s.width=a,a=n.width,s.width=r,s.minWidth=i,s.maxWidth=o)),void 0!==a?a+"":a}function Fe(e,t){return{get:function(){if(!e())return(this.get=t).apply(this,arguments);delete this.get}}}!function(){function e(){if(l){u.style.cssText="position:absolute;left:-11111px;width:60px;margin-top:1px;padding:0;border:0",l.style.cssText="position:relative;display:block;box-sizing:border-box;overflow:scroll;margin:auto;border:1px;padding:1px;width:60%;top:1%",re.appendChild(u).appendChild(l);var e=C.getComputedStyle(l);n="1%"!==e.top,s=12===t(e.marginLeft),l.style.right="60%",o=36===t(e.right),r=36===t(e.width),l.style.position="absolute",i=12===t(l.offsetWidth/3),re.removeChild(u),l=null}}function t(e){return Math.round(parseFloat(e))}var n,r,i,o,a,s,u=E.createElement("div"),l=E.createElement("div");l.style&&(l.style.backgroundClip="content-box",l.cloneNode(!0).style.backgroundClip="",y.clearCloneStyle="content-box"===l.style.backgroundClip,S.extend(y,{boxSizingReliable:function(){return e(),r},pixelBoxStyles:function(){return e(),o},pixelPosition:function(){return e(),n},reliableMarginLeft:function(){return e(),s},scrollboxSize:function(){return e(),i},reliableTrDimensions:function(){var e,t,n,r;return null==a&&(e=E.createElement("table"),t=E.createElement("tr"),n=E.createElement("div"),e.style.cssText="position:absolute;left:-11111px;border-collapse:separate",t.style.cssText="border:1px solid",t.style.height="1px",n.style.height="9px",n.style.display="block",re.appendChild(e).appendChild(t).appendChild(n),r=C.getComputedStyle(t),a=parseInt(r.height,10)+parseInt(r.borderTopWidth,10)+parseInt(r.borderBottomWidth,10)===t.offsetHeight,re.removeChild(e)),a}}))}();var Be=["Webkit","Moz","ms"],$e=E.createElement("div").style,_e={};function ze(e){var t=S.cssProps[e]||_e[e];return t||(e in $e?e:_e[e]=function(e){var t=e[0].toUpperCase()+e.slice(1),n=Be.length;while(n--)if((e=Be[n]+t)in $e)return e}(e)||e)}var Ue=/^(none|table(?!-c[ea]).+)/,Xe=/^--/,Ve={position:"absolute",visibility:"hidden",display:"block"},Ge={letterSpacing:"0",fontWeight:"400"};function Ye(e,t,n){var r=te.exec(t);return r?Math.max(0,r[2]-(n||0))+(r[3]||"px"):t}function Qe(e,t,n,r,i,o){var a="width"===t?1:0,s=0,u=0;if(n===(r?"border":"content"))return 0;for(;a<4;a+=2)"margin"===n&&(u+=S.css(e,n+ne[a],!0,i)),r?("content"===n&&(u-=S.css(e,"padding"+ne[a],!0,i)),"margin"!==n&&(u-=S.css(e,"border"+ne[a]+"Width",!0,i))):(u+=S.css(e,"padding"+ne[a],!0,i),"padding"!==n?u+=S.css(e,"border"+ne[a]+"Width",!0,i):s+=S.css(e,"border"+ne[a]+"Width",!0,i));return!r&&0<=o&&(u+=Math.max(0,Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-o-u-s-.5))||0),u}function Je(e,t,n){var r=Re(e),i=(!y.boxSizingReliable()||n)&&"border-box"===S.css(e,"boxSizing",!1,r),o=i,a=We(e,t,r),s="offset"+t[0].toUpperCase()+t.slice(1);if(Pe.test(a)){if(!n)return a;a="auto"}return(!y.boxSizingReliable()&&i||!y.reliableTrDimensions()&&A(e,"tr")||"auto"===a||!parseFloat(a)&&"inline"===S.css(e,"display",!1,r))&&e.getClientRects().length&&(i="border-box"===S.css(e,"boxSizing",!1,r),(o=s in e)&&(a=e[s])),(a=parseFloat(a)||0)+Qe(e,t,n||(i?"border":"content"),o,r,a)+"px"}function Ke(e,t,n,r,i){return new Ke.prototype.init(e,t,n,r,i)}S.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=We(e,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,gridArea:!0,gridColumn:!0,gridColumnEnd:!0,gridColumnStart:!0,gridRow:!0,gridRowEnd:!0,gridRowStart:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,a,s=X(t),u=Xe.test(t),l=e.style;if(u||(t=ze(s)),a=S.cssHooks[t]||S.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(e,!1,r))?i:l[t];"string"===(o=typeof n)&&(i=te.exec(n))&&i[1]&&(n=se(e,t,i),o="number"),null!=n&&n==n&&("number"!==o||u||(n+=i&&i[3]||(S.cssNumber[s]?"":"px")),y.clearCloneStyle||""!==n||0!==t.indexOf("background")||(l[t]="inherit"),a&&"set"in a&&void 0===(n=a.set(e,n,r))||(u?l.setProperty(t,n):l[t]=n))}},css:function(e,t,n,r){var i,o,a,s=X(t);return Xe.test(t)||(t=ze(s)),(a=S.cssHooks[t]||S.cssHooks[s])&&"get"in a&&(i=a.get(e,!0,n)),void 0===i&&(i=We(e,t,r)),"normal"===i&&t in Ge&&(i=Ge[t]),""===n||n?(o=parseFloat(i),!0===n||isFinite(o)?o||0:i):i}}),S.each(["height","width"],function(e,u){S.cssHooks[u]={get:function(e,t,n){if(t)return!Ue.test(S.css(e,"display"))||e.getClientRects().length&&e.getBoundingClientRect().width?Je(e,u,n):Me(e,Ve,function(){return Je(e,u,n)})},set:function(e,t,n){var r,i=Re(e),o=!y.scrollboxSize()&&"absolute"===i.position,a=(o||n)&&"border-box"===S.css(e,"boxSizing",!1,i),s=n?Qe(e,u,n,a,i):0;return a&&o&&(s-=Math.ceil(e["offset"+u[0].toUpperCase()+u.slice(1)]-parseFloat(i[u])-Qe(e,u,"border",!1,i)-.5)),s&&(r=te.exec(t))&&"px"!==(r[3]||"px")&&(e.style[u]=t,t=S.css(e,u)),Ye(0,t,s)}}}),S.cssHooks.marginLeft=Fe(y.reliableMarginLeft,function(e,t){if(t)return(parseFloat(We(e,"marginLeft"))||e.getBoundingClientRect().left-Me(e,{marginLeft:0},function(){return e.getBoundingClientRect().left}))+"px"}),S.each({margin:"",padding:"",border:"Width"},function(i,o){S.cssHooks[i+o]={expand:function(e){for(var t=0,n={},r="string"==typeof e?e.split(" "):[e];t<4;t++)n[i+ne[t]+o]=r[t]||r[t-2]||r[0];return n}},"margin"!==i&&(S.cssHooks[i+o].set=Ye)}),S.fn.extend({css:function(e,t){return $(this,function(e,t,n){var r,i,o={},a=0;if(Array.isArray(t)){for(r=Re(e),i=t.length;a<i;a++)o[t[a]]=S.css(e,t[a],!1,r);return o}return void 0!==n?S.style(e,t,n):S.css(e,t)},e,t,1<arguments.length)}}),((S.Tween=Ke).prototype={constructor:Ke,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||S.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(S.cssNumber[n]?"":"px")},cur:function(){var e=Ke.propHooks[this.prop];return e&&e.get?e.get(this):Ke.propHooks._default.get(this)},run:function(e){var t,n=Ke.propHooks[this.prop];return this.options.duration?this.pos=t=S.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):Ke.propHooks._default.set(this),this}}).init.prototype=Ke.prototype,(Ke.propHooks={_default:{get:function(e){var t;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(t=S.css(e.elem,e.prop,""))&&"auto"!==t?t:0},set:function(e){S.fx.step[e.prop]?S.fx.step[e.prop](e):1!==e.elem.nodeType||!S.cssHooks[e.prop]&&null==e.elem.style[ze(e.prop)]?e.elem[e.prop]=e.now:S.style(e.elem,e.prop,e.now+e.unit)}}}).scrollTop=Ke.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},S.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},S.fx=Ke.prototype.init,S.fx.step={};var Ze,et,tt,nt,rt=/^(?:toggle|show|hide)$/,it=/queueHooks$/;function ot(){et&&(!1===E.hidden&&C.requestAnimationFrame?C.requestAnimationFrame(ot):C.setTimeout(ot,S.fx.interval),S.fx.tick())}function at(){return C.setTimeout(function(){Ze=void 0}),Ze=Date.now()}function st(e,t){var n,r=0,i={height:e};for(t=t?1:0;r<4;r+=2-t)i["margin"+(n=ne[r])]=i["padding"+n]=e;return t&&(i.opacity=i.width=e),i}function ut(e,t,n){for(var r,i=(lt.tweeners[t]||[]).concat(lt.tweeners["*"]),o=0,a=i.length;o<a;o++)if(r=i[o].call(n,t,e))return r}function lt(o,e,t){var n,a,r=0,i=lt.prefilters.length,s=S.Deferred().always(function(){delete u.elem}),u=function(){if(a)return!1;for(var e=Ze||at(),t=Math.max(0,l.startTime+l.duration-e),n=1-(t/l.duration||0),r=0,i=l.tweens.length;r<i;r++)l.tweens[r].run(n);return s.notifyWith(o,[l,n,t]),n<1&&i?t:(i||s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l]),!1)},l=s.promise({elem:o,props:S.extend({},e),opts:S.extend(!0,{specialEasing:{},easing:S.easing._default},t),originalProperties:e,originalOptions:t,startTime:Ze||at(),duration:t.duration,tweens:[],createTween:function(e,t){var n=S.Tween(o,l.opts,e,t,l.opts.specialEasing[e]||l.opts.easing);return l.tweens.push(n),n},stop:function(e){var t=0,n=e?l.tweens.length:0;if(a)return this;for(a=!0;t<n;t++)l.tweens[t].run(1);return e?(s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l,e])):s.rejectWith(o,[l,e]),this}}),c=l.props;for(!function(e,t){var n,r,i,o,a;for(n in e)if(i=t[r=X(n)],o=e[n],Array.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),(a=S.cssHooks[r])&&"expand"in a)for(n in o=a.expand(o),delete e[r],o)n in e||(e[n]=o[n],t[n]=i);else t[r]=i}(c,l.opts.specialEasing);r<i;r++)if(n=lt.prefilters[r].call(l,o,c,l.opts))return m(n.stop)&&(S._queueHooks(l.elem,l.opts.queue).stop=n.stop.bind(n)),n;return S.map(c,ut,l),m(l.opts.start)&&l.opts.start.call(o,l),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always),S.fx.timer(S.extend(u,{elem:o,anim:l,queue:l.opts.queue})),l}S.Animation=S.extend(lt,{tweeners:{"*":[function(e,t){var n=this.createTween(e,t);return se(n.elem,e,te.exec(t),n),n}]},tweener:function(e,t){m(e)?(t=e,e=["*"]):e=e.match(P);for(var n,r=0,i=e.length;r<i;r++)n=e[r],lt.tweeners[n]=lt.tweeners[n]||[],lt.tweeners[n].unshift(t)},prefilters:[function(e,t,n){var r,i,o,a,s,u,l,c,f="width"in t||"height"in t,p=this,d={},h=e.style,g=e.nodeType&&ae(e),v=Y.get(e,"fxshow");for(r in n.queue||(null==(a=S._queueHooks(e,"fx")).unqueued&&(a.unqueued=0,s=a.empty.fire,a.empty.fire=function(){a.unqueued||s()}),a.unqueued++,p.always(function(){p.always(function(){a.unqueued--,S.queue(e,"fx").length||a.empty.fire()})})),t)if(i=t[r],rt.test(i)){if(delete t[r],o=o||"toggle"===i,i===(g?"hide":"show")){if("show"!==i||!v||void 0===v[r])continue;g=!0}d[r]=v&&v[r]||S.style(e,r)}if((u=!S.isEmptyObject(t))||!S.isEmptyObject(d))for(r in f&&1===e.nodeType&&(n.overflow=[h.overflow,h.overflowX,h.overflowY],null==(l=v&&v.display)&&(l=Y.get(e,"display")),"none"===(c=S.css(e,"display"))&&(l?c=l:(le([e],!0),l=e.style.display||l,c=S.css(e,"display"),le([e]))),("inline"===c||"inline-block"===c&&null!=l)&&"none"===S.css(e,"float")&&(u||(p.done(function(){h.display=l}),null==l&&(c=h.display,l="none"===c?"":c)),h.display="inline-block")),n.overflow&&(h.overflow="hidden",p.always(function(){h.overflow=n.overflow[0],h.overflowX=n.overflow[1],h.overflowY=n.overflow[2]})),u=!1,d)u||(v?"hidden"in v&&(g=v.hidden):v=Y.access(e,"fxshow",{display:l}),o&&(v.hidden=!g),g&&le([e],!0),p.done(function(){for(r in g||le([e]),Y.remove(e,"fxshow"),d)S.style(e,r,d[r])})),u=ut(g?v[r]:0,r,p),r in v||(v[r]=u.start,g&&(u.end=u.start,u.start=0))}],prefilter:function(e,t){t?lt.prefilters.unshift(e):lt.prefilters.push(e)}}),S.speed=function(e,t,n){var r=e&&"object"==typeof e?S.extend({},e):{complete:n||!n&&t||m(e)&&e,duration:e,easing:n&&t||t&&!m(t)&&t};return S.fx.off?r.duration=0:"number"!=typeof r.duration&&(r.duration in S.fx.speeds?r.duration=S.fx.speeds[r.duration]:r.duration=S.fx.speeds._default),null!=r.queue&&!0!==r.queue||(r.queue="fx"),r.old=r.complete,r.complete=function(){m(r.old)&&r.old.call(this),r.queue&&S.dequeue(this,r.queue)},r},S.fn.extend({fadeTo:function(e,t,n,r){return this.filter(ae).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(t,e,n,r){var i=S.isEmptyObject(t),o=S.speed(e,n,r),a=function(){var e=lt(this,S.extend({},t),o);(i||Y.get(this,"finish"))&&e.stop(!0)};return a.finish=a,i||!1===o.queue?this.each(a):this.queue(o.queue,a)},stop:function(i,e,o){var a=function(e){var t=e.stop;delete e.stop,t(o)};return"string"!=typeof i&&(o=e,e=i,i=void 0),e&&this.queue(i||"fx",[]),this.each(function(){var e=!0,t=null!=i&&i+"queueHooks",n=S.timers,r=Y.get(this);if(t)r[t]&&r[t].stop&&a(r[t]);else for(t in r)r[t]&&r[t].stop&&it.test(t)&&a(r[t]);for(t=n.length;t--;)n[t].elem!==this||null!=i&&n[t].queue!==i||(n[t].anim.stop(o),e=!1,n.splice(t,1));!e&&o||S.dequeue(this,i)})},finish:function(a){return!1!==a&&(a=a||"fx"),this.each(function(){var e,t=Y.get(this),n=t[a+"queue"],r=t[a+"queueHooks"],i=S.timers,o=n?n.length:0;for(t.finish=!0,S.queue(this,a,[]),r&&r.stop&&r.stop.call(this,!0),e=i.length;e--;)i[e].elem===this&&i[e].queue===a&&(i[e].anim.stop(!0),i.splice(e,1));for(e=0;e<o;e++)n[e]&&n[e].finish&&n[e].finish.call(this);delete t.finish})}}),S.each(["toggle","show","hide"],function(e,r){var i=S.fn[r];S.fn[r]=function(e,t,n){return null==e||"boolean"==typeof e?i.apply(this,arguments):this.animate(st(r,!0),e,t,n)}}),S.each({slideDown:st("show"),slideUp:st("hide"),slideToggle:st("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,r){S.fn[e]=function(e,t,n){return this.animate(r,e,t,n)}}),S.timers=[],S.fx.tick=function(){var e,t=0,n=S.timers;for(Ze=Date.now();t<n.length;t++)(e=n[t])()||n[t]!==e||n.splice(t--,1);n.length||S.fx.stop(),Ze=void 0},S.fx.timer=function(e){S.timers.push(e),S.fx.start()},S.fx.interval=13,S.fx.start=function(){et||(et=!0,ot())},S.fx.stop=function(){et=null},S.fx.speeds={slow:600,fast:200,_default:400},S.fn.delay=function(r,e){return r=S.fx&&S.fx.speeds[r]||r,e=e||"fx",this.queue(e,function(e,t){var n=C.setTimeout(e,r);t.stop=function(){C.clearTimeout(n)}})},tt=E.createElement("input"),nt=E.createElement("select").appendChild(E.createElement("option")),tt.type="checkbox",y.checkOn=""!==tt.value,y.optSelected=nt.selected,(tt=E.createElement("input")).value="t",tt.type="radio",y.radioValue="t"===tt.value;var ct,ft=S.expr.attrHandle;S.fn.extend({attr:function(e,t){return $(this,S.attr,e,t,1<arguments.length)},removeAttr:function(e){return this.each(function(){S.removeAttr(this,e)})}}),S.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return"undefined"==typeof e.getAttribute?S.prop(e,t,n):(1===o&&S.isXMLDoc(e)||(i=S.attrHooks[t.toLowerCase()]||(S.expr.match.bool.test(t)?ct:void 0)),void 0!==n?null===n?void S.removeAttr(e,t):i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:(e.setAttribute(t,n+""),n):i&&"get"in i&&null!==(r=i.get(e,t))?r:null==(r=S.find.attr(e,t))?void 0:r)},attrHooks:{type:{set:function(e,t){if(!y.radioValue&&"radio"===t&&A(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,r=0,i=t&&t.match(P);if(i&&1===e.nodeType)while(n=i[r++])e.removeAttribute(n)}}),ct={set:function(e,t,n){return!1===t?S.removeAttr(e,n):e.setAttribute(n,n),n}},S.each(S.expr.match.bool.source.match(/\w+/g),function(e,t){var a=ft[t]||S.find.attr;ft[t]=function(e,t,n){var r,i,o=t.toLowerCase();return n||(i=ft[o],ft[o]=r,r=null!=a(e,t,n)?o:null,ft[o]=i),r}});var pt=/^(?:input|select|textarea|button)$/i,dt=/^(?:a|area)$/i;function ht(e){return(e.match(P)||[]).join(" ")}function gt(e){return e.getAttribute&&e.getAttribute("class")||""}function vt(e){return Array.isArray(e)?e:"string"==typeof e&&e.match(P)||[]}S.fn.extend({prop:function(e,t){return $(this,S.prop,e,t,1<arguments.length)},removeProp:function(e){return this.each(function(){delete this[S.propFix[e]||e]})}}),S.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&S.isXMLDoc(e)||(t=S.propFix[t]||t,i=S.propHooks[t]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=S.find.attr(e,"tabindex");return t?parseInt(t,10):pt.test(e.nodeName)||dt.test(e.nodeName)&&e.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),y.optSelected||(S.propHooks.selected={get:function(e){var t=e.parentNode;return t&&t.parentNode&&t.parentNode.selectedIndex,null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),S.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){S.propFix[this.toLowerCase()]=this}),S.fn.extend({addClass:function(t){var e,n,r,i,o,a,s,u=0;if(m(t))return this.each(function(e){S(this).addClass(t.call(this,e,gt(this)))});if((e=vt(t)).length)while(n=this[u++])if(i=gt(n),r=1===n.nodeType&&" "+ht(i)+" "){a=0;while(o=e[a++])r.indexOf(" "+o+" ")<0&&(r+=o+" ");i!==(s=ht(r))&&n.setAttribute("class",s)}return this},removeClass:function(t){var e,n,r,i,o,a,s,u=0;if(m(t))return this.each(function(e){S(this).removeClass(t.call(this,e,gt(this)))});if(!arguments.length)return this.attr("class","");if((e=vt(t)).length)while(n=this[u++])if(i=gt(n),r=1===n.nodeType&&" "+ht(i)+" "){a=0;while(o=e[a++])while(-1<r.indexOf(" "+o+" "))r=r.replace(" "+o+" "," ");i!==(s=ht(r))&&n.setAttribute("class",s)}return this},toggleClass:function(i,t){var o=typeof i,a="string"===o||Array.isArray(i);return"boolean"==typeof t&&a?t?this.addClass(i):this.removeClass(i):m(i)?this.each(function(e){S(this).toggleClass(i.call(this,e,gt(this),t),t)}):this.each(function(){var e,t,n,r;if(a){t=0,n=S(this),r=vt(i);while(e=r[t++])n.hasClass(e)?n.removeClass(e):n.addClass(e)}else void 0!==i&&"boolean"!==o||((e=gt(this))&&Y.set(this,"__className__",e),this.setAttribute&&this.setAttribute("class",e||!1===i?"":Y.get(this,"__className__")||""))})},hasClass:function(e){var t,n,r=0;t=" "+e+" ";while(n=this[r++])if(1===n.nodeType&&-1<(" "+ht(gt(n))+" ").indexOf(t))return!0;return!1}});var yt=/\r/g;S.fn.extend({val:function(n){var r,e,i,t=this[0];return arguments.length?(i=m(n),this.each(function(e){var t;1===this.nodeType&&(null==(t=i?n.call(this,e,S(this).val()):n)?t="":"number"==typeof t?t+="":Array.isArray(t)&&(t=S.map(t,function(e){return null==e?"":e+""})),(r=S.valHooks[this.type]||S.valHooks[this.nodeName.toLowerCase()])&&"set"in r&&void 0!==r.set(this,t,"value")||(this.value=t))})):t?(r=S.valHooks[t.type]||S.valHooks[t.nodeName.toLowerCase()])&&"get"in r&&void 0!==(e=r.get(t,"value"))?e:"string"==typeof(e=t.value)?e.replace(yt,""):null==e?"":e:void 0}}),S.extend({valHooks:{option:{get:function(e){var t=S.find.attr(e,"value");return null!=t?t:ht(S.text(e))}},select:{get:function(e){var t,n,r,i=e.options,o=e.selectedIndex,a="select-one"===e.type,s=a?null:[],u=a?o+1:i.length;for(r=o<0?u:a?o:0;r<u;r++)if(((n=i[r]).selected||r===o)&&!n.disabled&&(!n.parentNode.disabled||!A(n.parentNode,"optgroup"))){if(t=S(n).val(),a)return t;s.push(t)}return s},set:function(e,t){var n,r,i=e.options,o=S.makeArray(t),a=i.length;while(a--)((r=i[a]).selected=-1<S.inArray(S.valHooks.option.get(r),o))&&(n=!0);return n||(e.selectedIndex=-1),o}}}}),S.each(["radio","checkbox"],function(){S.valHooks[this]={set:function(e,t){if(Array.isArray(t))return e.checked=-1<S.inArray(S(e).val(),t)}},y.checkOn||(S.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})}),y.focusin="onfocusin"in C;var mt=/^(?:focusinfocus|focusoutblur)$/,xt=function(e){e.stopPropagation()};S.extend(S.event,{trigger:function(e,t,n,r){var i,o,a,s,u,l,c,f,p=[n||E],d=v.call(e,"type")?e.type:e,h=v.call(e,"namespace")?e.namespace.split("."):[];if(o=f=a=n=n||E,3!==n.nodeType&&8!==n.nodeType&&!mt.test(d+S.event.triggered)&&(-1<d.indexOf(".")&&(d=(h=d.split(".")).shift(),h.sort()),u=d.indexOf(":")<0&&"on"+d,(e=e[S.expando]?e:new S.Event(d,"object"==typeof e&&e)).isTrigger=r?2:3,e.namespace=h.join("."),e.rnamespace=e.namespace?new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,e.result=void 0,e.target||(e.target=n),t=null==t?[e]:S.makeArray(t,[e]),c=S.event.special[d]||{},r||!c.trigger||!1!==c.trigger.apply(n,t))){if(!r&&!c.noBubble&&!x(n)){for(s=c.delegateType||d,mt.test(s+d)||(o=o.parentNode);o;o=o.parentNode)p.push(o),a=o;a===(n.ownerDocument||E)&&p.push(a.defaultView||a.parentWindow||C)}i=0;while((o=p[i++])&&!e.isPropagationStopped())f=o,e.type=1<i?s:c.bindType||d,(l=(Y.get(o,"events")||Object.create(null))[e.type]&&Y.get(o,"handle"))&&l.apply(o,t),(l=u&&o[u])&&l.apply&&V(o)&&(e.result=l.apply(o,t),!1===e.result&&e.preventDefault());return e.type=d,r||e.isDefaultPrevented()||c._default&&!1!==c._default.apply(p.pop(),t)||!V(n)||u&&m(n[d])&&!x(n)&&((a=n[u])&&(n[u]=null),S.event.triggered=d,e.isPropagationStopped()&&f.addEventListener(d,xt),n[d](),e.isPropagationStopped()&&f.removeEventListener(d,xt),S.event.triggered=void 0,a&&(n[u]=a)),e.result}},simulate:function(e,t,n){var r=S.extend(new S.Event,n,{type:e,isSimulated:!0});S.event.trigger(r,null,t)}}),S.fn.extend({trigger:function(e,t){return this.each(function(){S.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];if(n)return S.event.trigger(e,t,n,!0)}}),y.focusin||S.each({focus:"focusin",blur:"focusout"},function(n,r){var i=function(e){S.event.simulate(r,e.target,S.event.fix(e))};S.event.special[r]={setup:function(){var e=this.ownerDocument||this.document||this,t=Y.access(e,r);t||e.addEventListener(n,i,!0),Y.access(e,r,(t||0)+1)},teardown:function(){var e=this.ownerDocument||this.document||this,t=Y.access(e,r)-1;t?Y.access(e,r,t):(e.removeEventListener(n,i,!0),Y.remove(e,r))}}});var bt=C.location,wt={guid:Date.now()},Tt=/\?/;S.parseXML=function(e){var t,n;if(!e||"string"!=typeof e)return null;try{t=(new C.DOMParser).parseFromString(e,"text/xml")}catch(e){}return n=t&&t.getElementsByTagName("parsererror")[0],t&&!n||S.error("Invalid XML: "+(n?S.map(n.childNodes,function(e){return e.textContent}).join("\n"):e)),t};var Ct=/\[\]$/,Et=/\r?\n/g,St=/^(?:submit|button|image|reset|file)$/i,kt=/^(?:input|select|textarea|keygen)/i;function At(n,e,r,i){var t;if(Array.isArray(e))S.each(e,function(e,t){r||Ct.test(n)?i(n,t):At(n+"["+("object"==typeof t&&null!=t?e:"")+"]",t,r,i)});else if(r||"object"!==w(e))i(n,e);else for(t in e)At(n+"["+t+"]",e[t],r,i)}S.param=function(e,t){var n,r=[],i=function(e,t){var n=m(t)?t():t;r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(null==n?"":n)};if(null==e)return"";if(Array.isArray(e)||e.jquery&&!S.isPlainObject(e))S.each(e,function(){i(this.name,this.value)});else for(n in e)At(n,e[n],t,i);return r.join("&")},S.fn.extend({serialize:function(){return S.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=S.prop(this,"elements");return e?S.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!S(this).is(":disabled")&&kt.test(this.nodeName)&&!St.test(e)&&(this.checked||!pe.test(e))}).map(function(e,t){var n=S(this).val();return null==n?null:Array.isArray(n)?S.map(n,function(e){return{name:t.name,value:e.replace(Et,"\r\n")}}):{name:t.name,value:n.replace(Et,"\r\n")}}).get()}});var Nt=/%20/g,jt=/#.*$/,Dt=/([?&])_=[^&]*/,qt=/^(.*?):[ \t]*([^\r\n]*)$/gm,Lt=/^(?:GET|HEAD)$/,Ht=/^\/\//,Ot={},Pt={},Rt="*/".concat("*"),Mt=E.createElement("a");function It(o){return function(e,t){"string"!=typeof e&&(t=e,e="*");var n,r=0,i=e.toLowerCase().match(P)||[];if(m(t))while(n=i[r++])"+"===n[0]?(n=n.slice(1)||"*",(o[n]=o[n]||[]).unshift(t)):(o[n]=o[n]||[]).push(t)}}function Wt(t,i,o,a){var s={},u=t===Pt;function l(e){var r;return s[e]=!0,S.each(t[e]||[],function(e,t){var n=t(i,o,a);return"string"!=typeof n||u||s[n]?u?!(r=n):void 0:(i.dataTypes.unshift(n),l(n),!1)}),r}return l(i.dataTypes[0])||!s["*"]&&l("*")}function Ft(e,t){var n,r,i=S.ajaxSettings.flatOptions||{};for(n in t)void 0!==t[n]&&((i[n]?e:r||(r={}))[n]=t[n]);return r&&S.extend(!0,e,r),e}Mt.href=bt.href,S.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:bt.href,type:"GET",isLocal:/^(?:about|app|app-storage|.+-extension|file|res|widget):$/.test(bt.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Rt,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":S.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?Ft(Ft(e,S.ajaxSettings),t):Ft(S.ajaxSettings,e)},ajaxPrefilter:It(Ot),ajaxTransport:It(Pt),ajax:function(e,t){"object"==typeof e&&(t=e,e=void 0),t=t||{};var c,f,p,n,d,r,h,g,i,o,v=S.ajaxSetup({},t),y=v.context||v,m=v.context&&(y.nodeType||y.jquery)?S(y):S.event,x=S.Deferred(),b=S.Callbacks("once memory"),w=v.statusCode||{},a={},s={},u="canceled",T={readyState:0,getResponseHeader:function(e){var t;if(h){if(!n){n={};while(t=qt.exec(p))n[t[1].toLowerCase()+" "]=(n[t[1].toLowerCase()+" "]||[]).concat(t[2])}t=n[e.toLowerCase()+" "]}return null==t?null:t.join(", ")},getAllResponseHeaders:function(){return h?p:null},setRequestHeader:function(e,t){return null==h&&(e=s[e.toLowerCase()]=s[e.toLowerCase()]||e,a[e]=t),this},overrideMimeType:function(e){return null==h&&(v.mimeType=e),this},statusCode:function(e){var t;if(e)if(h)T.always(e[T.status]);else for(t in e)w[t]=[w[t],e[t]];return this},abort:function(e){var t=e||u;return c&&c.abort(t),l(0,t),this}};if(x.promise(T),v.url=((e||v.url||bt.href)+"").replace(Ht,bt.protocol+"//"),v.type=t.method||t.type||v.method||v.type,v.dataTypes=(v.dataType||"*").toLowerCase().match(P)||[""],null==v.crossDomain){r=E.createElement("a");try{r.href=v.url,r.href=r.href,v.crossDomain=Mt.protocol+"//"+Mt.host!=r.protocol+"//"+r.host}catch(e){v.crossDomain=!0}}if(v.data&&v.processData&&"string"!=typeof v.data&&(v.data=S.param(v.data,v.traditional)),Wt(Ot,v,t,T),h)return T;for(i in(g=S.event&&v.global)&&0==S.active++&&S.event.trigger("ajaxStart"),v.type=v.type.toUpperCase(),v.hasContent=!Lt.test(v.type),f=v.url.replace(jt,""),v.hasContent?v.data&&v.processData&&0===(v.contentType||"").indexOf("application/x-www-form-urlencoded")&&(v.data=v.data.replace(Nt,"+")):(o=v.url.slice(f.length),v.data&&(v.processData||"string"==typeof v.data)&&(f+=(Tt.test(f)?"&":"?")+v.data,delete v.data),!1===v.cache&&(f=f.replace(Dt,"$1"),o=(Tt.test(f)?"&":"?")+"_="+wt.guid+++o),v.url=f+o),v.ifModified&&(S.lastModified[f]&&T.setRequestHeader("If-Modified-Since",S.lastModified[f]),S.etag[f]&&T.setRequestHeader("If-None-Match",S.etag[f])),(v.data&&v.hasContent&&!1!==v.contentType||t.contentType)&&T.setRequestHeader("Content-Type",v.contentType),T.setRequestHeader("Accept",v.dataTypes[0]&&v.accepts[v.dataTypes[0]]?v.accepts[v.dataTypes[0]]+("*"!==v.dataTypes[0]?", "+Rt+"; q=0.01":""):v.accepts["*"]),v.headers)T.setRequestHeader(i,v.headers[i]);if(v.beforeSend&&(!1===v.beforeSend.call(y,T,v)||h))return T.abort();if(u="abort",b.add(v.complete),T.done(v.success),T.fail(v.error),c=Wt(Pt,v,t,T)){if(T.readyState=1,g&&m.trigger("ajaxSend",[T,v]),h)return T;v.async&&0<v.timeout&&(d=C.setTimeout(function(){T.abort("timeout")},v.timeout));try{h=!1,c.send(a,l)}catch(e){if(h)throw e;l(-1,e)}}else l(-1,"No Transport");function l(e,t,n,r){var i,o,a,s,u,l=t;h||(h=!0,d&&C.clearTimeout(d),c=void 0,p=r||"",T.readyState=0<e?4:0,i=200<=e&&e<300||304===e,n&&(s=function(e,t,n){var r,i,o,a,s=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),void 0===r&&(r=e.mimeType||t.getResponseHeader("Content-Type"));if(r)for(i in s)if(s[i]&&s[i].test(r)){u.unshift(i);break}if(u[0]in n)o=u[0];else{for(i in n){if(!u[0]||e.converters[i+" "+u[0]]){o=i;break}a||(a=i)}o=o||a}if(o)return o!==u[0]&&u.unshift(o),n[o]}(v,T,n)),!i&&-1<S.inArray("script",v.dataTypes)&&S.inArray("json",v.dataTypes)<0&&(v.converters["text script"]=function(){}),s=function(e,t,n,r){var i,o,a,s,u,l={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)l[a.toLowerCase()]=e.converters[a];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!u&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u=o,o=c.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(!(a=l[u+" "+o]||l["* "+o]))for(i in l)if((s=i.split(" "))[1]===o&&(a=l[u+" "+s[0]]||l["* "+s[0]])){!0===a?a=l[i]:!0!==l[i]&&(o=s[0],c.unshift(s[1]));break}if(!0!==a)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(e){return{state:"parsererror",error:a?e:"No conversion from "+u+" to "+o}}}return{state:"success",data:t}}(v,s,T,i),i?(v.ifModified&&((u=T.getResponseHeader("Last-Modified"))&&(S.lastModified[f]=u),(u=T.getResponseHeader("etag"))&&(S.etag[f]=u)),204===e||"HEAD"===v.type?l="nocontent":304===e?l="notmodified":(l=s.state,o=s.data,i=!(a=s.error))):(a=l,!e&&l||(l="error",e<0&&(e=0))),T.status=e,T.statusText=(t||l)+"",i?x.resolveWith(y,[o,l,T]):x.rejectWith(y,[T,l,a]),T.statusCode(w),w=void 0,g&&m.trigger(i?"ajaxSuccess":"ajaxError",[T,v,i?o:a]),b.fireWith(y,[T,l]),g&&(m.trigger("ajaxComplete",[T,v]),--S.active||S.event.trigger("ajaxStop")))}return T},getJSON:function(e,t,n){return S.get(e,t,n,"json")},getScript:function(e,t){return S.get(e,void 0,t,"script")}}),S.each(["get","post"],function(e,i){S[i]=function(e,t,n,r){return m(t)&&(r=r||n,n=t,t=void 0),S.ajax(S.extend({url:e,type:i,dataType:r,data:t,success:n},S.isPlainObject(e)&&e))}}),S.ajaxPrefilter(function(e){var t;for(t in e.headers)"content-type"===t.toLowerCase()&&(e.contentType=e.headers[t]||"")}),S._evalUrl=function(e,t,n){return S.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,converters:{"text script":function(){}},dataFilter:function(e){S.globalEval(e,t,n)}})},S.fn.extend({wrapAll:function(e){var t;return this[0]&&(m(e)&&(e=e.call(this[0])),t=S(e,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstElementChild)e=e.firstElementChild;return e}).append(this)),this},wrapInner:function(n){return m(n)?this.each(function(e){S(this).wrapInner(n.call(this,e))}):this.each(function(){var e=S(this),t=e.contents();t.length?t.wrapAll(n):e.append(n)})},wrap:function(t){var n=m(t);return this.each(function(e){S(this).wrapAll(n?t.call(this,e):t)})},unwrap:function(e){return this.parent(e).not("body").each(function(){S(this).replaceWith(this.childNodes)}),this}}),S.expr.pseudos.hidden=function(e){return!S.expr.pseudos.visible(e)},S.expr.pseudos.visible=function(e){return!!(e.offsetWidth||e.offsetHeight||e.getClientRects().length)},S.ajaxSettings.xhr=function(){try{return new C.XMLHttpRequest}catch(e){}};var Bt={0:200,1223:204},$t=S.ajaxSettings.xhr();y.cors=!!$t&&"withCredentials"in $t,y.ajax=$t=!!$t,S.ajaxTransport(function(i){var o,a;if(y.cors||$t&&!i.crossDomain)return{send:function(e,t){var n,r=i.xhr();if(r.open(i.type,i.url,i.async,i.username,i.password),i.xhrFields)for(n in i.xhrFields)r[n]=i.xhrFields[n];for(n in i.mimeType&&r.overrideMimeType&&r.overrideMimeType(i.mimeType),i.crossDomain||e["X-Requested-With"]||(e["X-Requested-With"]="XMLHttpRequest"),e)r.setRequestHeader(n,e[n]);o=function(e){return function(){o&&(o=a=r.onload=r.onerror=r.onabort=r.ontimeout=r.onreadystatechange=null,"abort"===e?r.abort():"error"===e?"number"!=typeof r.status?t(0,"error"):t(r.status,r.statusText):t(Bt[r.status]||r.status,r.statusText,"text"!==(r.responseType||"text")||"string"!=typeof r.responseText?{binary:r.response}:{text:r.responseText},r.getAllResponseHeaders()))}},r.onload=o(),a=r.onerror=r.ontimeout=o("error"),void 0!==r.onabort?r.onabort=a:r.onreadystatechange=function(){4===r.readyState&&C.setTimeout(function(){o&&a()})},o=o("abort");try{r.send(i.hasContent&&i.data||null)}catch(e){if(o)throw e}},abort:function(){o&&o()}}}),S.ajaxPrefilter(function(e){e.crossDomain&&(e.contents.script=!1)}),S.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return S.globalEval(e),e}}}),S.ajaxPrefilter("script",function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET")}),S.ajaxTransport("script",function(n){var r,i;if(n.crossDomain||n.scriptAttrs)return{send:function(e,t){r=S("<script>").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),E.head.appendChild(r[0])},abort:function(){i&&i()}}});var _t,zt=[],Ut=/(=)\?(?=&|$)|\?\?/;S.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=zt.pop()||S.expando+"_"+wt.guid++;return this[e]=!0,e}}),S.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Ut.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Ut.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=m(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Ut,"$1"+r):!1!==e.jsonp&&(e.url+=(Tt.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||S.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=C[r],C[r]=function(){o=arguments},n.always(function(){void 0===i?S(C).removeProp(r):C[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,zt.push(r)),o&&m(i)&&i(o[0]),o=i=void 0}),"script"}),y.createHTMLDocument=((_t=E.implementation.createHTMLDocument("").body).innerHTML="<form></form><form></form>",2===_t.childNodes.length),S.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(y.createHTMLDocument?((r=(t=E.implementation.createHTMLDocument("")).createElement("base")).href=E.location.href,t.head.appendChild(r)):t=E),o=!n&&[],(i=N.exec(e))?[t.createElement(i[1])]:(i=xe([e],t,o),o&&o.length&&S(o).remove(),S.merge([],i.childNodes)));var r,i,o},S.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1<s&&(r=ht(e.slice(s)),e=e.slice(0,s)),m(t)?(n=t,t=void 0):t&&"object"==typeof t&&(i="POST"),0<a.length&&S.ajax({url:e,type:i||"GET",dataType:"html",data:t}).done(function(e){o=arguments,a.html(r?S("<div>").append(S.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},S.expr.pseudos.animated=function(t){return S.grep(S.timers,function(e){return t===e.elem}).length},S.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=S.css(e,"position"),c=S(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=S.css(e,"top"),u=S.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),m(t)&&(t=t.call(e,n,S.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):c.css(f)}},S.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){S.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===S.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===S.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=S(e).offset()).top+=S.css(e,"borderTopWidth",!0),i.left+=S.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-S.css(r,"marginTop",!0),left:t.left-i.left-S.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===S.css(e,"position"))e=e.offsetParent;return e||re})}}),S.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;S.fn[t]=function(e){return $(this,function(e,t,n){var r;if(x(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),S.each(["top","left"],function(e,n){S.cssHooks[n]=Fe(y.pixelPosition,function(e,t){if(t)return t=We(e,n),Pe.test(t)?S(e).position()[n]+"px":t})}),S.each({Height:"height",Width:"width"},function(a,s){S.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){S.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return $(this,function(e,t,n){var r;return x(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?S.css(e,t,i):S.style(e,t,n,i)},s,n?e:void 0,n)}})}),S.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){S.fn[t]=function(e){return this.on(t,e)}}),S.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),S.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){S.fn[n]=function(e,t){return 0<arguments.length?this.on(n,null,e,t):this.trigger(n)}});var Xt=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;S.proxy=function(e,t){var n,r,i;if("string"==typeof t&&(n=e[t],t=e,e=n),m(e))return r=s.call(arguments,2),(i=function(){return e.apply(t||this,r.concat(s.call(arguments)))}).guid=e.guid=e.guid||S.guid++,i},S.holdReady=function(e){e?S.readyWait++:S.ready(!0)},S.isArray=Array.isArray,S.parseJSON=JSON.parse,S.nodeName=A,S.isFunction=m,S.isWindow=x,S.camelCase=X,S.type=w,S.now=Date.now,S.isNumeric=function(e){var t=S.type(e);return("number"===t||"string"===t)&&!isNaN(e-parseFloat(e))},S.trim=function(e){return null==e?"":(e+"").replace(Xt,"")},"function"==typeof define&&define.amd&&define("jquery",[],function(){return S});var Vt=C.jQuery,Gt=C.$;return S.noConflict=function(e){return C.$===S&&(C.$=Gt),e&&C.jQuery===S&&(C.jQuery=Vt),S},"undefined"==typeof e&&(C.jQuery=C.$=S),S});
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/jquery.form.js b/pluss-manage-page/src/main/resources/static/resources/js/jquery.form.js
new file mode 100644
index 0000000..a8075ee
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/jquery.form.js
@@ -0,0 +1,911 @@
+/*!
+ * jQuery Form Plugin
+ * version: 2.83 (11-JUL-2011)
+ * @requires jQuery v1.3.2 or later
+ *
+ * Examples and documentation at: http://malsup.com/jquery/form/
+ * Dual licensed under the MIT and GPL licenses:
+ *   http://www.opensource.org/licenses/mit-license.php
+ *   http://www.gnu.org/licenses/gpl.html
+ */
+;(function($) {
+
+/*
+	Usage Note:
+	-----------
+	Do not use both ajaxSubmit and ajaxForm on the same form.  These
+	functions are intended to be exclusive.  Use ajaxSubmit if you want
+	to bind your own submit handler to the form.  For example,
+
+	$(document).ready(function() {
+		$('#myForm').bind('submit', function(e) {
+			e.preventDefault(); // <-- important
+			$(this).ajaxSubmit({
+				target: '#output'
+			});
+		});
+	});
+
+	Use ajaxForm when you want the plugin to manage all the event binding
+	for you.  For example,
+
+	$(document).ready(function() {
+		$('#myForm').ajaxForm({
+			target: '#output'
+		});
+	});
+
+	When using ajaxForm, the ajaxSubmit function will be invoked for you
+	at the appropriate time.
+*/
+
+/**
+ * ajaxSubmit() provides a mechanism for immediately submitting
+ * an HTML form using AJAX.
+ */
+$.fn.ajaxSubmit = function(options) {
+	// fast fail if nothing selected (http://dev.jquery.com/ticket/2752)
+	if (!this.length) {
+		log('ajaxSubmit: skipping submit process - no element selected');
+		return this;
+	}
+	
+	var method, action, url, $form = this;
+
+	if (typeof options == 'function') {
+		options = { success: options };
+	}
+
+	method = this.attr('method');
+	action = this.attr('action');
+	url = (typeof action === 'string') ? $.trim(action) : '';
+	url = url || window.location.href || '';
+	if (url) {
+		// clean url (don't include hash vaue)
+		url = (url.match(/^([^#]+)/)||[])[1];
+	}
+
+	options = $.extend(true, {
+		url:  url,
+		success: $.ajaxSettings.success,
+		type: method || 'GET',
+		iframeSrc: /^https/i.test(window.location.href || '') ? 'javascript:false' : 'about:blank'
+	}, options);
+
+	// hook for manipulating the form data before it is extracted;
+	// convenient for use with rich editors like tinyMCE or FCKEditor
+	var veto = {};
+	this.trigger('form-pre-serialize', [this, options, veto]);
+	if (veto.veto) {
+		log('ajaxSubmit: submit vetoed via form-pre-serialize trigger');
+		return this;
+	}
+
+	// provide opportunity to alter form data before it is serialized
+	if (options.beforeSerialize && options.beforeSerialize(this, options) === false) {
+		log('ajaxSubmit: submit aborted via beforeSerialize callback');
+		return this;
+	}
+
+	var n,v,a = this.formToArray(options.semantic);
+	if (options.data) {
+		options.extraData = options.data;
+		for (n in options.data) {
+			if(options.data[n] instanceof Array) {
+				for (var k in options.data[n]) {
+					a.push( { name: n, value: options.data[n][k] } );
+				}
+			}
+			else {
+				v = options.data[n];
+				v = $.isFunction(v) ? v() : v; // if value is fn, invoke it
+				a.push( { name: n, value: v } );
+			}
+		}
+	}
+
+	// give pre-submit callback an opportunity to abort the submit
+	if (options.beforeSubmit && options.beforeSubmit(a, this, options) === false) {
+		log('ajaxSubmit: submit aborted via beforeSubmit callback');
+		return this;
+	}
+
+	// fire vetoable 'validate' event
+	this.trigger('form-submit-validate', [a, this, options, veto]);
+	if (veto.veto) {
+		log('ajaxSubmit: submit vetoed via form-submit-validate trigger');
+		return this;
+	}
+
+	var q = $.param(a);
+
+	if (options.type.toUpperCase() == 'GET') {
+		options.url += (options.url.indexOf('?') >= 0 ? '&' : '?') + q;
+		options.data = null;  // data is null for 'get'
+	}
+	else {
+		options.data = q; // data is the query string for 'post'
+	}
+
+	var callbacks = [];
+	if (options.resetForm) {
+		callbacks.push(function() { $form.resetForm(); });
+	}
+	if (options.clearForm) {
+		callbacks.push(function() { $form.clearForm(); });
+	}
+
+	// perform a load on the target only if dataType is not provided
+	if (!options.dataType && options.target) {
+		var oldSuccess = options.success || function(){};
+		callbacks.push(function(data) {
+			var fn = options.replaceTarget ? 'replaceWith' : 'html';
+			$(options.target)[fn](data).each(oldSuccess, arguments);
+		});
+	}
+	else if (options.success) {
+		callbacks.push(options.success);
+	}
+
+	options.success = function(data, status, xhr) { // jQuery 1.4+ passes xhr as 3rd arg
+		var context = options.context || options;   // jQuery 1.4+ supports scope context 
+		for (var i=0, max=callbacks.length; i < max; i++) {
+			callbacks[i].apply(context, [data, status, xhr || $form, $form]);
+		}
+	};
+
+	// are there files to upload?
+	var fileInputs = $('input:file', this).length > 0;
+	var mp = 'multipart/form-data';
+	var multipart = ($form.attr('enctype') == mp || $form.attr('encoding') == mp);
+
+	// options.iframe allows user to force iframe mode
+	// 06-NOV-09: now defaulting to iframe mode if file input is detected
+   if (options.iframe !== false && (fileInputs || options.iframe || multipart)) {
+	   // hack to fix Safari hang (thanks to Tim Molendijk for this)
+	   // see:  http://groups.google.com/group/jquery-dev/browse_thread/thread/36395b7ab510dd5d
+	   if (options.closeKeepAlive) {
+		   $.get(options.closeKeepAlive, function() { fileUpload(a); });
+		}
+	   else {
+		   fileUpload(a);
+		}
+   }
+   else {
+		// IE7 massage (see issue 57)
+		if ($.browser.msie && method == 'get') { 
+			var ieMeth = $form[0].getAttribute('method');
+			if (typeof ieMeth === 'string')
+				options.type = ieMeth;
+		}
+		$.ajax(options);
+   }
+
+	// fire 'notify' event
+	this.trigger('form-submit-notify', [this, options]);
+	return this;
+
+
+	// private function for handling file uploads (hat tip to YAHOO!)
+	function fileUpload(a) {
+		var form = $form[0], el, i, s, g, id, $io, io, xhr, sub, n, timedOut, timeoutHandle;
+        var useProp = !!$.fn.prop;
+
+        if (a) {
+        	// ensure that every serialized input is still enabled
+          	for (i=0; i < a.length; i++) {
+                el = $(form[a[i].name]);
+                el[ useProp ? 'prop' : 'attr' ]('disabled', false);
+          	}
+        }
+
+		if ($(':input[name=submit],:input[id=submit]', form).length) {
+			// if there is an input with a name or id of 'submit' then we won't be
+			// able to invoke the submit fn on the form (at least not x-browser)
+			alert('Error: Form elements must not have name or id of "submit".');
+			return;
+		}
+		
+		s = $.extend(true, {}, $.ajaxSettings, options);
+		s.context = s.context || s;
+		id = 'jqFormIO' + (new Date().getTime());
+		if (s.iframeTarget) {
+			$io = $(s.iframeTarget);
+			n = $io.attr('name');
+			if (n == null)
+			 	$io.attr('name', id);
+			else
+				id = n;
+		}
+		else {
+			$io = $('<iframe name="' + id + '" src="'+ s.iframeSrc +'" />');
+			$io.css({ position: 'absolute', top: '-1000px', left: '-1000px' });
+		}
+		io = $io[0];
+
+
+		xhr = { // mock object
+			aborted: 0,
+			responseText: null,
+			responseXML: null,
+			status: 0,
+			statusText: 'n/a',
+			getAllResponseHeaders: function() {},
+			getResponseHeader: function() {},
+			setRequestHeader: function() {},
+			abort: function(status) {
+				var e = (status === 'timeout' ? 'timeout' : 'aborted');
+				log('aborting upload... ' + e);
+				this.aborted = 1;
+				$io.attr('src', s.iframeSrc); // abort op in progress
+				xhr.error = e;
+				s.error && s.error.call(s.context, xhr, e, status);
+				g && $.event.trigger("ajaxError", [xhr, s, e]);
+				s.complete && s.complete.call(s.context, xhr, e);
+			}
+		};
+
+		g = s.global;
+		// trigger ajax global events so that activity/block indicators work like normal
+		if (g && ! $.active++) {
+			$.event.trigger("ajaxStart");
+		}
+		if (g) {
+			$.event.trigger("ajaxSend", [xhr, s]);
+		}
+
+		if (s.beforeSend && s.beforeSend.call(s.context, xhr, s) === false) {
+			if (s.global) {
+				$.active--;
+			}
+			return;
+		}
+		if (xhr.aborted) {
+			return;
+		}
+
+		// add submitting element to data if we know it
+		sub = form.clk;
+		if (sub) {
+			n = sub.name;
+			if (n && !sub.disabled) {
+				s.extraData = s.extraData || {};
+				s.extraData[n] = sub.value;
+				if (sub.type == "image") {
+					s.extraData[n+'.x'] = form.clk_x;
+					s.extraData[n+'.y'] = form.clk_y;
+				}
+			}
+		}
+		
+		var CLIENT_TIMEOUT_ABORT = 1;
+		var SERVER_ABORT = 2;
+
+		function getDoc(frame) {
+			var doc = frame.contentWindow ? frame.contentWindow.document : frame.contentDocument ? frame.contentDocument : frame.document;
+			return doc;
+		}
+		
+		// take a breath so that pending repaints get some cpu time before the upload starts
+		function doSubmit() {
+			// make sure form attrs are set
+			var t = $form.attr('target'), a = $form.attr('action');
+
+			// update form attrs in IE friendly way
+			form.setAttribute('target',id);
+			if (!method) {
+				form.setAttribute('method', 'POST');
+			}
+			if (a != s.url) {
+				form.setAttribute('action', s.url);
+			}
+
+			// ie borks in some cases when setting encoding
+			if (! s.skipEncodingOverride && (!method || /post/i.test(method))) {
+				$form.attr({
+					encoding: 'multipart/form-data',
+					enctype:  'multipart/form-data'
+				});
+			}
+
+			// support timout
+			if (s.timeout) {
+				timeoutHandle = setTimeout(function() { timedOut = true; cb(CLIENT_TIMEOUT_ABORT); }, s.timeout);
+			}
+			
+			// look for server aborts
+			function checkState() {
+				try {
+					var state = getDoc(io).readyState;
+					log('state = ' + state);
+					if (state.toLowerCase() == 'uninitialized')
+						setTimeout(checkState,50);
+				}
+				catch(e) {
+					log('Server abort: ' , e, ' (', e.name, ')');
+					cb(SERVER_ABORT);
+					timeoutHandle && clearTimeout(timeoutHandle);
+					timeoutHandle = undefined;
+				}
+			}
+
+			// add "extra" data to form if provided in options
+			var extraInputs = [];
+			try {
+				if (s.extraData) {
+					for (var n in s.extraData) {
+						extraInputs.push(
+							$('<input type="hidden" name="'+n+'" />').attr('value',s.extraData[n])
+								.appendTo(form)[0]);
+					}
+				}
+
+				if (!s.iframeTarget) {
+					// add iframe to doc and submit the form
+					$io.appendTo('body');
+	                io.attachEvent ? io.attachEvent('onload', cb) : io.addEventListener('load', cb, false);
+				}
+				setTimeout(checkState,15);
+				form.submit();
+			}
+			finally {
+				// reset attrs and remove "extra" input elements
+				form.setAttribute('action',a);
+				if(t) {
+					form.setAttribute('target', t);
+				} else {
+					$form.removeAttr('target');
+				}
+				$(extraInputs).remove();
+			}
+		}
+
+		if (s.forceSync) {
+			doSubmit();
+		}
+		else {
+			setTimeout(doSubmit, 10); // this lets dom updates render
+		}
+
+		var data, doc, domCheckCount = 50, callbackProcessed;
+
+		function cb(e) {
+			if (xhr.aborted || callbackProcessed) {
+				return;
+			}
+			try {
+				doc = getDoc(io);
+			}
+			catch(ex) {
+				log('cannot access response document: ', ex);
+				e = SERVER_ABORT;
+			}
+			if (e === CLIENT_TIMEOUT_ABORT && xhr) {
+				xhr.abort('timeout');
+				return;
+			}
+			else if (e == SERVER_ABORT && xhr) {
+				xhr.abort('server abort');
+				return;
+			}
+
+			if (!doc || doc.location.href == s.iframeSrc) {
+				// response not received yet
+				if (!timedOut)
+					return;
+			}
+            io.detachEvent ? io.detachEvent('onload', cb) : io.removeEventListener('load', cb, false);
+
+			var status = 'success', errMsg;
+			try {
+				if (timedOut) {
+					throw 'timeout';
+				}
+
+				var isXml = s.dataType == 'xml' || doc.XMLDocument || $.isXMLDoc(doc);
+				log('isXml='+isXml);
+				if (!isXml && window.opera && (doc.body == null || doc.body.innerHTML == '')) {
+					if (--domCheckCount) {
+						// in some browsers (Opera) the iframe DOM is not always traversable when
+						// the onload callback fires, so we loop a bit to accommodate
+						log('requeing onLoad callback, DOM not available');
+						setTimeout(cb, 250);
+						return;
+					}
+					// let this fall through because server response could be an empty document
+					//log('Could not access iframe DOM after mutiple tries.');
+					//throw 'DOMException: not available';
+				}
+
+				//log('response detected');
+                var docRoot = doc.body ? doc.body : doc.documentElement;
+                xhr.responseText = docRoot ? docRoot.innerHTML : null;
+				xhr.responseXML = doc.XMLDocument ? doc.XMLDocument : doc;
+				if (isXml)
+					s.dataType = 'xml';
+				xhr.getResponseHeader = function(header){
+					var headers = {'content-type': s.dataType};
+					return headers[header];
+				};
+                // support for XHR 'status' & 'statusText' emulation :
+                if (docRoot) {
+                    xhr.status = Number( docRoot.getAttribute('status') ) || xhr.status;
+                    xhr.statusText = docRoot.getAttribute('statusText') || xhr.statusText;
+                }
+
+				var dt = s.dataType || '';
+				var scr = /(json|script|text)/.test(dt.toLowerCase());
+				if (scr || s.textarea) {
+					// see if user embedded response in textarea
+					var ta = doc.getElementsByTagName('textarea')[0];
+					if (ta) {
+						xhr.responseText = ta.value;
+                        // support for XHR 'status' & 'statusText' emulation :
+                        xhr.status = Number( ta.getAttribute('status') ) || xhr.status;
+                        xhr.statusText = ta.getAttribute('statusText') || xhr.statusText;
+					}
+					else if (scr) {
+						// account for browsers injecting pre around json response
+						var pre = doc.getElementsByTagName('pre')[0];
+						var b = doc.getElementsByTagName('body')[0];
+						if (pre) {
+							xhr.responseText = pre.textContent ? pre.textContent : pre.innerHTML;
+						}
+						else if (b) {
+							xhr.responseText = b.innerHTML;
+						}
+					}
+				}
+				else if (s.dataType == 'xml' && !xhr.responseXML && xhr.responseText != null) {
+					xhr.responseXML = toXml(xhr.responseText);
+				}
+
+                try {
+                    data = httpData(xhr, s.dataType, s);
+                }
+                catch (e) {
+                    status = 'parsererror';
+                    xhr.error = errMsg = (e || status);
+                }
+			}
+			catch (e) {
+				log('error caught: ',e);
+				status = 'error';
+                xhr.error = errMsg = (e || status);
+			}
+
+			if (xhr.aborted) {
+				log('upload aborted');
+				status = null;
+			}
+
+            if (xhr.status) { // we've set xhr.status
+                status = (xhr.status >= 200 && xhr.status < 300 || xhr.status === 304) ? 'success' : 'error';
+            }
+
+			// ordering of these callbacks/triggers is odd, but that's how $.ajax does it
+			if (status === 'success') {
+				s.success && s.success.call(s.context, data, 'success', xhr);
+				g && $.event.trigger("ajaxSuccess", [xhr, s]);
+			}
+            else if (status) {
+				if (errMsg == undefined)
+					errMsg = xhr.statusText;
+				s.error && s.error.call(s.context, xhr, status, errMsg);
+				g && $.event.trigger("ajaxError", [xhr, s, errMsg]);
+            }
+
+			g && $.event.trigger("ajaxComplete", [xhr, s]);
+
+			if (g && ! --$.active) {
+				$.event.trigger("ajaxStop");
+			}
+
+			s.complete && s.complete.call(s.context, xhr, status);
+
+			callbackProcessed = true;
+			if (s.timeout)
+				clearTimeout(timeoutHandle);
+
+			// clean up
+			setTimeout(function() {
+				if (!s.iframeTarget)
+					$io.remove();
+				xhr.responseXML = null;
+			}, 100);
+		}
+
+		var toXml = $.parseXML || function(s, doc) { // use parseXML if available (jQuery 1.5+)
+			if (window.ActiveXObject) {
+				doc = new ActiveXObject('Microsoft.XMLDOM');
+				doc.async = 'false';
+				doc.loadXML(s);
+			}
+			else {
+				doc = (new DOMParser()).parseFromString(s, 'text/xml');
+			}
+			return (doc && doc.documentElement && doc.documentElement.nodeName != 'parsererror') ? doc : null;
+		};
+		var parseJSON = $.parseJSON || function(s) {
+			return window['eval']('(' + s + ')');
+		};
+
+		var httpData = function( xhr, type, s ) { // mostly lifted from jq1.4.4
+
+			var ct = xhr.getResponseHeader('content-type') || '',
+				xml = type === 'xml' || !type && ct.indexOf('xml') >= 0,
+				data = xml ? xhr.responseXML : xhr.responseText;
+
+			if (xml && data.documentElement.nodeName === 'parsererror') {
+				$.error && $.error('parsererror');
+			}
+			if (s && s.dataFilter) {
+				data = s.dataFilter(data, type);
+			}
+			if (typeof data === 'string') {
+				if (type === 'json' || !type && ct.indexOf('json') >= 0) {
+					data = parseJSON(data);
+				} else if (type === "script" || !type && ct.indexOf("javascript") >= 0) {
+					$.globalEval(data);
+				}
+			}
+			return data;
+		};
+	}
+};
+
+/**
+ * ajaxForm() provides a mechanism for fully automating form submission.
+ *
+ * The advantages of using this method instead of ajaxSubmit() are:
+ *
+ * 1: This method will include coordinates for <input type="image" /> elements (if the element
+ *	is used to submit the form).
+ * 2. This method will include the submit element's name/value data (for the element that was
+ *	used to submit the form).
+ * 3. This method binds the submit() method to the form for you.
+ *
+ * The options argument for ajaxForm works exactly as it does for ajaxSubmit.  ajaxForm merely
+ * passes the options argument along after properly binding events for submit elements and
+ * the form itself.
+ */
+$.fn.ajaxForm = function(options) {
+	// in jQuery 1.3+ we can fix mistakes with the ready state
+	if (this.length === 0) {
+		var o = { s: this.selector, c: this.context };
+		if (!$.isReady && o.s) {
+			log('DOM not ready, queuing ajaxForm');
+			$(function() {
+				$(o.s,o.c).ajaxForm(options);
+			});
+			return this;
+		}
+		// is your DOM ready?  http://docs.jquery.com/Tutorials:Introducing_$(document).ready()
+		log('terminating; zero elements found by selector' + ($.isReady ? '' : ' (DOM not ready)'));
+		return this;
+	}
+
+	return this.ajaxFormUnbind().bind('submit.form-plugin', function(e) {
+		if (!e.isDefaultPrevented()) { // if event has been canceled, don't proceed
+			e.preventDefault();
+			$(this).ajaxSubmit(options);
+		}
+	}).bind('click.form-plugin', function(e) {
+		var target = e.target;
+		var $el = $(target);
+		if (!($el.is(":submit,input:image"))) {
+			// is this a child element of the submit el?  (ex: a span within a button)
+			var t = $el.closest(':submit');
+			if (t.length == 0) {
+				return;
+			}
+			target = t[0];
+		}
+		var form = this;
+		form.clk = target;
+		if (target.type == 'image') {
+			if (e.offsetX != undefined) {
+				form.clk_x = e.offsetX;
+				form.clk_y = e.offsetY;
+			} else if (typeof $.fn.offset == 'function') { // try to use dimensions plugin
+				var offset = $el.offset();
+				form.clk_x = e.pageX - offset.left;
+				form.clk_y = e.pageY - offset.top;
+			} else {
+				form.clk_x = e.pageX - target.offsetLeft;
+				form.clk_y = e.pageY - target.offsetTop;
+			}
+		}
+		// clear form vars
+		setTimeout(function() { form.clk = form.clk_x = form.clk_y = null; }, 100);
+	});
+};
+
+// ajaxFormUnbind unbinds the event handlers that were bound by ajaxForm
+$.fn.ajaxFormUnbind = function() {
+	return this.unbind('submit.form-plugin click.form-plugin');
+};
+
+/**
+ * formToArray() gathers form element data into an array of objects that can
+ * be passed to any of the following ajax functions: $.get, $.post, or load.
+ * Each object in the array has both a 'name' and 'value' property.  An example of
+ * an array for a simple login form might be:
+ *
+ * [ { name: 'username', value: 'jresig' }, { name: 'password', value: 'secret' } ]
+ *
+ * It is this array that is passed to pre-submit callback functions provided to the
+ * ajaxSubmit() and ajaxForm() methods.
+ */
+$.fn.formToArray = function(semantic) {
+	var a = [];
+	if (this.length === 0) {
+		return a;
+	}
+
+	var form = this[0];
+	var els = semantic ? form.getElementsByTagName('*') : form.elements;
+	if (!els) {
+		return a;
+	}
+
+	var i,j,n,v,el,max,jmax;
+	for(i=0, max=els.length; i < max; i++) {
+		el = els[i];
+		n = el.name;
+		if (!n) {
+			continue;
+		}
+
+		if (semantic && form.clk && el.type == "image") {
+			// handle image inputs on the fly when semantic == true
+			if(!el.disabled && form.clk == el) {
+				a.push({name: n, value: $(el).val()});
+				a.push({name: n+'.x', value: form.clk_x}, {name: n+'.y', value: form.clk_y});
+			}
+			continue;
+		}
+
+		v = $.fieldValue(el, true);
+		if (v && v.constructor == Array) {
+			for(j=0, jmax=v.length; j < jmax; j++) {
+				a.push({name: n, value: v[j]});
+			}
+		}
+		else if (v !== null && typeof v != 'undefined') {
+			a.push({name: n, value: v});
+		}
+	}
+
+	if (!semantic && form.clk) {
+		// input type=='image' are not found in elements array! handle it here
+		var $input = $(form.clk), input = $input[0];
+		n = input.name;
+		if (n && !input.disabled && input.type == 'image') {
+			a.push({name: n, value: $input.val()});
+			a.push({name: n+'.x', value: form.clk_x}, {name: n+'.y', value: form.clk_y});
+		}
+	}
+	return a;
+};
+
+/**
+ * Serializes form data into a 'submittable' string. This method will return a string
+ * in the format: name1=value1&amp;name2=value2
+ */
+$.fn.formSerialize = function(semantic) {
+	//hand off to jQuery.param for proper encoding
+	return $.param(this.formToArray(semantic));
+};
+
+/**
+ * Serializes all field elements in the jQuery object into a query string.
+ * This method will return a string in the format: name1=value1&amp;name2=value2
+ */
+$.fn.fieldSerialize = function(successful) {
+	var a = [];
+	this.each(function() {
+		var n = this.name;
+		if (!n) {
+			return;
+		}
+		var v = $.fieldValue(this, successful);
+		if (v && v.constructor == Array) {
+			for (var i=0,max=v.length; i < max; i++) {
+				a.push({name: n, value: v[i]});
+			}
+		}
+		else if (v !== null && typeof v != 'undefined') {
+			a.push({name: this.name, value: v});
+		}
+	});
+	//hand off to jQuery.param for proper encoding
+	return $.param(a);
+};
+
+/**
+ * Returns the value(s) of the element in the matched set.  For example, consider the following form:
+ *
+ *  <form><fieldset>
+ *	  <input name="A" type="text" />
+ *	  <input name="A" type="text" />
+ *	  <input name="B" type="checkbox" value="B1" />
+ *	  <input name="B" type="checkbox" value="B2"/>
+ *	  <input name="C" type="radio" value="C1" />
+ *	  <input name="C" type="radio" value="C2" />
+ *  </fieldset></form>
+ *
+ *  var v = $(':text').fieldValue();
+ *  // if no values are entered into the text inputs
+ *  v == ['','']
+ *  // if values entered into the text inputs are 'foo' and 'bar'
+ *  v == ['foo','bar']
+ *
+ *  var v = $(':checkbox').fieldValue();
+ *  // if neither checkbox is checked
+ *  v === undefined
+ *  // if both checkboxes are checked
+ *  v == ['B1', 'B2']
+ *
+ *  var v = $(':radio').fieldValue();
+ *  // if neither radio is checked
+ *  v === undefined
+ *  // if first radio is checked
+ *  v == ['C1']
+ *
+ * The successful argument controls whether or not the field element must be 'successful'
+ * (per http://www.w3.org/TR/html4/interact/forms.html#successful-controls).
+ * The default value of the successful argument is true.  If this value is false the value(s)
+ * for each element is returned.
+ *
+ * Note: This method *always* returns an array.  If no valid value can be determined the
+ *	   array will be empty, otherwise it will contain one or more values.
+ */
+$.fn.fieldValue = function(successful) {
+	for (var val=[], i=0, max=this.length; i < max; i++) {
+		var el = this[i];
+		var v = $.fieldValue(el, successful);
+		if (v === null || typeof v == 'undefined' || (v.constructor == Array && !v.length)) {
+			continue;
+		}
+		v.constructor == Array ? $.merge(val, v) : val.push(v);
+	}
+	return val;
+};
+
+/**
+ * Returns the value of the field element.
+ */
+$.fieldValue = function(el, successful) {
+	var n = el.name, t = el.type, tag = el.tagName.toLowerCase();
+	if (successful === undefined) {
+		successful = true;
+	}
+
+	if (successful && (!n || el.disabled || t == 'reset' || t == 'button' ||
+		(t == 'checkbox' || t == 'radio') && !el.checked ||
+		(t == 'submit' || t == 'image') && el.form && el.form.clk != el ||
+		tag == 'select' && el.selectedIndex == -1)) {
+			return null;
+	}
+
+	if (tag == 'select') {
+		var index = el.selectedIndex;
+		if (index < 0) {
+			return null;
+		}
+		var a = [], ops = el.options;
+		var one = (t == 'select-one');
+		var max = (one ? index+1 : ops.length);
+		for(var i=(one ? index : 0); i < max; i++) {
+			var op = ops[i];
+			if (op.selected) {
+				var v = op.value;
+				if (!v) { // extra pain for IE...
+					v = (op.attributes && op.attributes['value'] && !(op.attributes['value'].specified)) ? op.text : op.value;
+				}
+				if (one) {
+					return v;
+				}
+				a.push(v);
+			}
+		}
+		return a;
+	}
+	return $(el).val();
+};
+
+/**
+ * Clears the form data.  Takes the following actions on the form's input fields:
+ *  - input text fields will have their 'value' property set to the empty string
+ *  - select elements will have their 'selectedIndex' property set to -1
+ *  - checkbox and radio inputs will have their 'checked' property set to false
+ *  - inputs of type submit, button, reset, and hidden will *not* be effected
+ *  - button elements will *not* be effected
+ */
+$.fn.clearForm = function() {
+	return this.each(function() {
+		$('input,select,textarea', this).clearFields();
+	});
+};
+
+/**
+ * Clears the selected form elements.
+ */
+$.fn.clearFields = $.fn.clearInputs = function() {
+	var re = /^(?:color|date|datetime|email|month|number|password|range|search|tel|text|time|url|week)$/i; // 'hidden' is not in this list
+	return this.each(function() {
+		var t = this.type, tag = this.tagName.toLowerCase();
+		if (re.test(t) || tag == 'textarea') {
+			this.value = '';
+		}
+		else if (t == 'checkbox' || t == 'radio') {
+			this.checked = false;
+		}
+		else if (tag == 'select') {
+			this.selectedIndex = -1;
+		}
+	});
+};
+
+/**
+ * Resets the form data.  Causes all form elements to be reset to their original value.
+ */
+$.fn.resetForm = function() {
+	return this.each(function() {
+		// guard against an input with the name of 'reset'
+		// note that IE reports the reset function as an 'object'
+		if (typeof this.reset == 'function' || (typeof this.reset == 'object' && !this.reset.nodeType)) {
+			this.reset();
+		}
+	});
+};
+
+/**
+ * Enables or disables any matching elements.
+ */
+$.fn.enable = function(b) {
+	if (b === undefined) {
+		b = true;
+	}
+	return this.each(function() {
+		this.disabled = !b;
+	});
+};
+
+/**
+ * Checks/unchecks any matching checkboxes or radio buttons and
+ * selects/deselects and matching option elements.
+ */
+$.fn.selected = function(select) {
+	if (select === undefined) {
+		select = true;
+	}
+	return this.each(function() {
+		var t = this.type;
+		if (t == 'checkbox' || t == 'radio') {
+			this.checked = select;
+		}
+		else if (this.tagName.toLowerCase() == 'option') {
+			var $sel = $(this).parent('select');
+			if (select && $sel[0] && $sel[0].type == 'select-one') {
+				// deselect all other options
+				$sel.find('option').selected(false);
+			}
+			this.selected = select;
+		}
+	});
+};
+
+// helper fn for console logging
+function log() {
+	var msg = '[jquery.form] ' + Array.prototype.join.call(arguments,'');
+	if (window.console && window.console.log) {
+		window.console.log(msg);
+	}
+	else if (window.opera && window.opera.postError) {
+		window.opera.postError(msg);
+	}
+};
+
+})(jQuery);
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/jquery.mCustomScrollbar.concat.min.js b/pluss-manage-page/src/main/resources/static/resources/js/jquery.mCustomScrollbar.concat.min.js
new file mode 100644
index 0000000..f23925a
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/jquery.mCustomScrollbar.concat.min.js
@@ -0,0 +1,4 @@
+/*mousewheel*/
+(function(a){function d(b){var c=b||window.event,d=[].slice.call(arguments,1),e=0,f=!0,g=0,h=0;return b=a.event.fix(c),b.type="mousewheel",c.wheelDelta&&(e=c.wheelDelta/120),c.detail&&(e=-c.detail/3),h=e,c.axis!==undefined&&c.axis===c.HORIZONTAL_AXIS&&(h=0,g=-1*e),c.wheelDeltaY!==undefined&&(h=c.wheelDeltaY/120),c.wheelDeltaX!==undefined&&(g=-1*c.wheelDeltaX/120),d.unshift(b,e,g,h),(a.event.dispatch||a.event.handle).apply(this,d)}var b=["DOMMouseScroll","mousewheel"];if(a.event.fixHooks)for(var c=b.length;c;)a.event.fixHooks[b[--c]]=a.event.mouseHooks;a.event.special.mousewheel={setup:function(){if(this.addEventListener)for(var a=b.length;a;)this.addEventListener(b[--a],d,!1);else this.onmousewheel=d},teardown:function(){if(this.removeEventListener)for(var a=b.length;a;)this.removeEventListener(b[--a],d,!1);else this.onmousewheel=null}},a.fn.extend({mousewheel:function(a){return a?this.bind("mousewheel",a):this.trigger("mousewheel")},unmousewheel:function(a){return this.unbind("mousewheel",a)}})})(jQuery);
+/*custom scrollbar*/
+(function(c){var b={init:function(e){var f={set_width:false,set_height:false,horizontalScroll:false,scrollInertia:950,mouseWheel:true,mouseWheelPixels:"auto",autoDraggerLength:true,autoHideScrollbar:false,snapAmount:null,snapOffset:0,scrollButtons:{enable:false,scrollType:"continuous",scrollSpeed:"auto",scrollAmount:40},advanced:{updateOnBrowserResize:true,updateOnContentResize:false,autoExpandHorizontalScroll:false,autoScrollOnFocus:true,normalizeMouseWheelDelta:false},contentTouchScroll:true,callbacks:{onScrollStart:function(){},onScroll:function(){},onTotalScroll:function(){},onTotalScrollBack:function(){},onTotalScrollOffset:0,onTotalScrollBackOffset:0,whileScrolling:function(){}},theme:"light"},e=c.extend(true,f,e);return this.each(function(){var m=c(this);if(e.set_width){m.css("width",e.set_width)}if(e.set_height){m.css("height",e.set_height)}if(!c(document).data("mCustomScrollbar-index")){c(document).data("mCustomScrollbar-index","1")}else{var t=parseInt(c(document).data("mCustomScrollbar-index"));c(document).data("mCustomScrollbar-index",t+1)}m.wrapInner("<div class='mCustomScrollBox mCS-"+e.theme+"' id='mCSB_"+c(document).data("mCustomScrollbar-index")+"' style='position:relative; height:100%;max-width:100%;' />").addClass("mCustomScrollbar _mCS_"+c(document).data("mCustomScrollbar-index"));var g=m.children(".mCustomScrollBox");if(e.horizontalScroll){g.addClass("mCSB_horizontal").wrapInner("<div class='mCSB_h_wrapper' style='position:relative; left:0; width:999999px;' />");var k=g.children(".mCSB_h_wrapper");k.wrapInner("<div class='mCSB_container' style='position:absolute; left:0;' />").children(".mCSB_container").css({width:k.children().outerWidth(),position:"relative"}).unwrap()}else{g.wrapInner("<div class='mCSB_container' style='position:relative; top:0;' />")}var o=g.children(".mCSB_container");if(c.support.touch){o.addClass("mCS_touch")}o.after("<div class='mCSB_scrollTools' style='position:absolute;'><div class='mCSB_draggerContainer'><div class='mCSB_dragger' style='position:absolute;' oncontextmenu='return false;'><div class='mCSB_dragger_bar' style='position:relative;'></div></div><div class='mCSB_draggerRail'></div></div></div>");var l=g.children(".mCSB_scrollTools"),h=l.children(".mCSB_draggerContainer"),q=h.children(".mCSB_dragger");if(e.horizontalScroll){q.data("minDraggerWidth",q.width())}else{q.data("minDraggerHeight",q.height())}if(e.scrollButtons.enable){if(e.horizontalScroll){l.prepend("<a class='mCSB_buttonLeft' oncontextmenu='return false;'></a>").append("<a class='mCSB_buttonRight' oncontextmenu='return false;'></a>")}else{l.prepend("<a class='mCSB_buttonUp' oncontextmenu='return false;'></a>").append("<a class='mCSB_buttonDown' oncontextmenu='return false;'></a>")}}g.bind("scroll",function(){if(!m.is(".mCS_disabled")){g.scrollTop(0).scrollLeft(0)}});m.data({mCS_Init:true,mCustomScrollbarIndex:c(document).data("mCustomScrollbar-index"),horizontalScroll:e.horizontalScroll,scrollInertia:e.scrollInertia,scrollEasing:"mcsEaseOut",mouseWheel:e.mouseWheel,mouseWheelPixels:e.mouseWheelPixels,autoDraggerLength:e.autoDraggerLength,autoHideScrollbar:e.autoHideScrollbar,snapAmount:e.snapAmount,snapOffset:e.snapOffset,scrollButtons_enable:e.scrollButtons.enable,scrollButtons_scrollType:e.scrollButtons.scrollType,scrollButtons_scrollSpeed:e.scrollButtons.scrollSpeed,scrollButtons_scrollAmount:e.scrollButtons.scrollAmount,autoExpandHorizontalScroll:e.advanced.autoExpandHorizontalScroll,autoScrollOnFocus:e.advanced.autoScrollOnFocus,normalizeMouseWheelDelta:e.advanced.normalizeMouseWheelDelta,contentTouchScroll:e.contentTouchScroll,onScrollStart_Callback:e.callbacks.onScrollStart,onScroll_Callback:e.callbacks.onScroll,onTotalScroll_Callback:e.callbacks.onTotalScroll,onTotalScrollBack_Callback:e.callbacks.onTotalScrollBack,onTotalScroll_Offset:e.callbacks.onTotalScrollOffset,onTotalScrollBack_Offset:e.callbacks.onTotalScrollBackOffset,whileScrolling_Callback:e.callbacks.whileScrolling,bindEvent_scrollbar_drag:false,bindEvent_content_touch:false,bindEvent_scrollbar_click:false,bindEvent_mousewheel:false,bindEvent_buttonsContinuous_y:false,bindEvent_buttonsContinuous_x:false,bindEvent_buttonsPixels_y:false,bindEvent_buttonsPixels_x:false,bindEvent_focusin:false,bindEvent_autoHideScrollbar:false,mCSB_buttonScrollRight:false,mCSB_buttonScrollLeft:false,mCSB_buttonScrollDown:false,mCSB_buttonScrollUp:false});if(e.horizontalScroll){if(m.css("max-width")!=="none"){if(!e.advanced.updateOnContentResize){e.advanced.updateOnContentResize=true}}}else{if(m.css("max-height")!=="none"){var s=false,r=parseInt(m.css("max-height"));if(m.css("max-height").indexOf("%")>=0){s=r,r=m.parent().height()*s/100}m.css("overflow","hidden");g.css("max-height",r)}}m.mCustomScrollbar("update");if(e.advanced.updateOnBrowserResize){var i,j=c(window).width(),u=c(window).height();c(window).bind("resize."+m.data("mCustomScrollbarIndex"),function(){if(i){clearTimeout(i)}i=setTimeout(function(){if(!m.is(".mCS_disabled")&&!m.is(".mCS_destroyed")){var w=c(window).width(),v=c(window).height();if(j!==w||u!==v){if(m.css("max-height")!=="none"&&s){g.css("max-height",m.parent().height()*s/100)}m.mCustomScrollbar("update");j=w;u=v}}},150)})}if(e.advanced.updateOnContentResize){var p;if(e.horizontalScroll){var n=o.outerWidth()}else{var n=o.outerHeight()}p=setInterval(function(){if(e.horizontalScroll){if(e.advanced.autoExpandHorizontalScroll){o.css({position:"absolute",width:"auto"}).wrap("<div class='mCSB_h_wrapper' style='position:relative; left:0; width:999999px;' />").css({width:o.outerWidth(),position:"relative"}).unwrap()}var v=o.outerWidth()}else{var v=o.outerHeight()}if(v!=n){m.mCustomScrollbar("update");n=v}},300)}})},update:function(){var n=c(this),k=n.children(".mCustomScrollBox"),q=k.children(".mCSB_container");q.removeClass("mCS_no_scrollbar");n.removeClass("mCS_disabled mCS_destroyed");k.scrollTop(0).scrollLeft(0);var y=k.children(".mCSB_scrollTools"),o=y.children(".mCSB_draggerContainer"),m=o.children(".mCSB_dragger");if(n.data("horizontalScroll")){var A=y.children(".mCSB_buttonLeft"),t=y.children(".mCSB_buttonRight"),f=k.width();if(n.data("autoExpandHorizontalScroll")){q.css({position:"absolute",width:"auto"}).wrap("<div class='mCSB_h_wrapper' style='position:relative; left:0; width:999999px;' />").css({width:q.outerWidth(),position:"relative"}).unwrap()}var z=q.outerWidth()}else{var w=y.children(".mCSB_buttonUp"),g=y.children(".mCSB_buttonDown"),r=k.height(),i=q.outerHeight()}if(i>r&&!n.data("horizontalScroll")){y.css("display","block");var s=o.height();if(n.data("autoDraggerLength")){var u=Math.round(r/i*s),l=m.data("minDraggerHeight");if(u<=l){m.css({height:l})}else{if(u>=s-10){var p=s-10;m.css({height:p})}else{m.css({height:u})}}m.children(".mCSB_dragger_bar").css({"line-height":m.height()+"px"})}var B=m.height(),x=(i-r)/(s-B);n.data("scrollAmount",x).mCustomScrollbar("scrolling",k,q,o,m,w,g,A,t);var D=Math.abs(q.position().top);n.mCustomScrollbar("scrollTo",D,{scrollInertia:0,trigger:"internal"})}else{if(z>f&&n.data("horizontalScroll")){y.css("display","block");var h=o.width();if(n.data("autoDraggerLength")){var j=Math.round(f/z*h),C=m.data("minDraggerWidth");if(j<=C){m.css({width:C})}else{if(j>=h-10){var e=h-10;m.css({width:e})}else{m.css({width:j})}}}var v=m.width(),x=(z-f)/(h-v);n.data("scrollAmount",x).mCustomScrollbar("scrolling",k,q,o,m,w,g,A,t);var D=Math.abs(q.position().left);n.mCustomScrollbar("scrollTo",D,{scrollInertia:0,trigger:"internal"})}else{k.unbind("mousewheel focusin");if(n.data("horizontalScroll")){m.add(q).css("left",0)}else{m.add(q).css("top",0)}y.css("display","none");q.addClass("mCS_no_scrollbar");n.data({bindEvent_mousewheel:false,bindEvent_focusin:false})}}},scrolling:function(h,p,m,j,w,e,A,v){var k=c(this);if(!k.data("bindEvent_scrollbar_drag")){var n,o;if(c.support.msPointer){j.bind("MSPointerDown",function(H){H.preventDefault();k.data({on_drag:true});j.addClass("mCSB_dragger_onDrag");var G=c(this),J=G.offset(),F=H.originalEvent.pageX-J.left,I=H.originalEvent.pageY-J.top;if(F<G.width()&&F>0&&I<G.height()&&I>0){n=I;o=F}});c(document).bind("MSPointerMove."+k.data("mCustomScrollbarIndex"),function(H){H.preventDefault();if(k.data("on_drag")){var G=j,J=G.offset(),F=H.originalEvent.pageX-J.left,I=H.originalEvent.pageY-J.top;D(n,o,I,F)}}).bind("MSPointerUp."+k.data("mCustomScrollbarIndex"),function(x){k.data({on_drag:false});j.removeClass("mCSB_dragger_onDrag")})}else{j.bind("mousedown touchstart",function(H){H.preventDefault();H.stopImmediatePropagation();var G=c(this),K=G.offset(),F,J;if(H.type==="touchstart"){var I=H.originalEvent.touches[0]||H.originalEvent.changedTouches[0];F=I.pageX-K.left;J=I.pageY-K.top}else{k.data({on_drag:true});j.addClass("mCSB_dragger_onDrag");F=H.pageX-K.left;J=H.pageY-K.top}if(F<G.width()&&F>0&&J<G.height()&&J>0){n=J;o=F}}).bind("touchmove",function(H){H.preventDefault();H.stopImmediatePropagation();var K=H.originalEvent.touches[0]||H.originalEvent.changedTouches[0],G=c(this),J=G.offset(),F=K.pageX-J.left,I=K.pageY-J.top;D(n,o,I,F)});c(document).bind("mousemove."+k.data("mCustomScrollbarIndex"),function(H){if(k.data("on_drag")){var G=j,J=G.offset(),F=H.pageX-J.left,I=H.pageY-J.top;D(n,o,I,F)}}).bind("mouseup."+k.data("mCustomScrollbarIndex"),function(x){k.data({on_drag:false});j.removeClass("mCSB_dragger_onDrag")})}k.data({bindEvent_scrollbar_drag:true})}function D(G,H,I,F){if(k.data("horizontalScroll")){k.mCustomScrollbar("scrollTo",(j.position().left-(H))+F,{moveDragger:true,trigger:"internal"})}else{k.mCustomScrollbar("scrollTo",(j.position().top-(G))+I,{moveDragger:true,trigger:"internal"})}}if(c.support.touch&&k.data("contentTouchScroll")){if(!k.data("bindEvent_content_touch")){var l,B,r,s,u,C,E;p.bind("touchstart",function(x){x.stopImmediatePropagation();l=x.originalEvent.touches[0]||x.originalEvent.changedTouches[0];B=c(this);r=B.offset();u=l.pageX-r.left;s=l.pageY-r.top;C=s;E=u});p.bind("touchmove",function(x){x.preventDefault();x.stopImmediatePropagation();l=x.originalEvent.touches[0]||x.originalEvent.changedTouches[0];B=c(this).parent();r=B.offset();u=l.pageX-r.left;s=l.pageY-r.top;if(k.data("horizontalScroll")){k.mCustomScrollbar("scrollTo",E-u,{trigger:"internal"})}else{k.mCustomScrollbar("scrollTo",C-s,{trigger:"internal"})}})}}if(!k.data("bindEvent_scrollbar_click")){m.bind("click",function(F){var x=(F.pageY-m.offset().top)*k.data("scrollAmount"),y=c(F.target);if(k.data("horizontalScroll")){x=(F.pageX-m.offset().left)*k.data("scrollAmount")}if(y.hasClass("mCSB_draggerContainer")||y.hasClass("mCSB_draggerRail")){k.mCustomScrollbar("scrollTo",x,{trigger:"internal",scrollEasing:"draggerRailEase"})}});k.data({bindEvent_scrollbar_click:true})}if(k.data("mouseWheel")){if(!k.data("bindEvent_mousewheel")){h.bind("mousewheel",function(H,J){var G,F=k.data("mouseWheelPixels"),x=Math.abs(p.position().top),I=j.position().top,y=m.height()-j.height();if(k.data("normalizeMouseWheelDelta")){if(J<0){J=-1}else{J=1}}if(F==="auto"){F=100+Math.round(k.data("scrollAmount")/2)}if(k.data("horizontalScroll")){I=j.position().left;y=m.width()-j.width();x=Math.abs(p.position().left)}if((J>0&&I!==0)||(J<0&&I!==y)){H.preventDefault();H.stopImmediatePropagation()}G=x-(J*F);k.mCustomScrollbar("scrollTo",G,{trigger:"internal"})});k.data({bindEvent_mousewheel:true})}}if(k.data("scrollButtons_enable")){if(k.data("scrollButtons_scrollType")==="pixels"){if(k.data("horizontalScroll")){v.add(A).unbind("mousedown touchstart MSPointerDown mouseup MSPointerUp mouseout MSPointerOut touchend",i,g);k.data({bindEvent_buttonsContinuous_x:false});if(!k.data("bindEvent_buttonsPixels_x")){v.bind("click",function(x){x.preventDefault();q(Math.abs(p.position().left)+k.data("scrollButtons_scrollAmount"))});A.bind("click",function(x){x.preventDefault();q(Math.abs(p.position().left)-k.data("scrollButtons_scrollAmount"))});k.data({bindEvent_buttonsPixels_x:true})}}else{e.add(w).unbind("mousedown touchstart MSPointerDown mouseup MSPointerUp mouseout MSPointerOut touchend",i,g);k.data({bindEvent_buttonsContinuous_y:false});if(!k.data("bindEvent_buttonsPixels_y")){e.bind("click",function(x){x.preventDefault();q(Math.abs(p.position().top)+k.data("scrollButtons_scrollAmount"))});w.bind("click",function(x){x.preventDefault();q(Math.abs(p.position().top)-k.data("scrollButtons_scrollAmount"))});k.data({bindEvent_buttonsPixels_y:true})}}function q(x){if(!j.data("preventAction")){j.data("preventAction",true);k.mCustomScrollbar("scrollTo",x,{trigger:"internal"})}}}else{if(k.data("horizontalScroll")){v.add(A).unbind("click");k.data({bindEvent_buttonsPixels_x:false});if(!k.data("bindEvent_buttonsContinuous_x")){v.bind("mousedown touchstart MSPointerDown",function(y){y.preventDefault();var x=z();k.data({mCSB_buttonScrollRight:setInterval(function(){k.mCustomScrollbar("scrollTo",Math.abs(p.position().left)+x,{trigger:"internal",scrollEasing:"easeOutCirc"})},17)})});var i=function(x){x.preventDefault();clearInterval(k.data("mCSB_buttonScrollRight"))};v.bind("mouseup touchend MSPointerUp mouseout MSPointerOut",i);A.bind("mousedown touchstart MSPointerDown",function(y){y.preventDefault();var x=z();k.data({mCSB_buttonScrollLeft:setInterval(function(){k.mCustomScrollbar("scrollTo",Math.abs(p.position().left)-x,{trigger:"internal",scrollEasing:"easeOutCirc"})},17)})});var g=function(x){x.preventDefault();clearInterval(k.data("mCSB_buttonScrollLeft"))};A.bind("mouseup touchend MSPointerUp mouseout MSPointerOut",g);k.data({bindEvent_buttonsContinuous_x:true})}}else{e.add(w).unbind("click");k.data({bindEvent_buttonsPixels_y:false});if(!k.data("bindEvent_buttonsContinuous_y")){e.bind("mousedown touchstart MSPointerDown",function(y){y.preventDefault();var x=z();k.data({mCSB_buttonScrollDown:setInterval(function(){k.mCustomScrollbar("scrollTo",Math.abs(p.position().top)+x,{trigger:"internal",scrollEasing:"easeOutCirc"})},17)})});var t=function(x){x.preventDefault();clearInterval(k.data("mCSB_buttonScrollDown"))};e.bind("mouseup touchend MSPointerUp mouseout MSPointerOut",t);w.bind("mousedown touchstart MSPointerDown",function(y){y.preventDefault();var x=z();k.data({mCSB_buttonScrollUp:setInterval(function(){k.mCustomScrollbar("scrollTo",Math.abs(p.position().top)-x,{trigger:"internal",scrollEasing:"easeOutCirc"})},17)})});var f=function(x){x.preventDefault();clearInterval(k.data("mCSB_buttonScrollUp"))};w.bind("mouseup touchend MSPointerUp mouseout MSPointerOut",f);k.data({bindEvent_buttonsContinuous_y:true})}}function z(){var x=k.data("scrollButtons_scrollSpeed");if(k.data("scrollButtons_scrollSpeed")==="auto"){x=Math.round((k.data("scrollInertia")+100)/40)}return x}}}if(k.data("autoScrollOnFocus")){if(!k.data("bindEvent_focusin")){h.bind("focusin",function(){h.scrollTop(0).scrollLeft(0);var x=c(document.activeElement);if(x.is("input,textarea,select,button,a[tabindex],area,object")){var G=p.position().top,y=x.position().top,F=h.height()-x.outerHeight();if(k.data("horizontalScroll")){G=p.position().left;y=x.position().left;F=h.width()-x.outerWidth()}if(G+y<0||G+y>F){k.mCustomScrollbar("scrollTo",y,{trigger:"internal"})}}});k.data({bindEvent_focusin:true})}}if(k.data("autoHideScrollbar")){if(!k.data("bindEvent_autoHideScrollbar")){h.bind("mouseenter",function(x){h.addClass("mCS-mouse-over");d.showScrollbar.call(h.children(".mCSB_scrollTools"))}).bind("mouseleave touchend",function(x){h.removeClass("mCS-mouse-over");if(x.type==="mouseleave"){d.hideScrollbar.call(h.children(".mCSB_scrollTools"))}});k.data({bindEvent_autoHideScrollbar:true})}}},scrollTo:function(e,f){var i=c(this),o={moveDragger:false,trigger:"external",callbacks:true,scrollInertia:i.data("scrollInertia"),scrollEasing:i.data("scrollEasing")},f=c.extend(o,f),p,g=i.children(".mCustomScrollBox"),k=g.children(".mCSB_container"),r=g.children(".mCSB_scrollTools"),j=r.children(".mCSB_draggerContainer"),h=j.children(".mCSB_dragger"),t=draggerSpeed=f.scrollInertia,q,s,m,l;if(!k.hasClass("mCS_no_scrollbar")){i.data({mCS_trigger:f.trigger});if(i.data("mCS_Init")){f.callbacks=false}if(e||e===0){if(typeof(e)==="number"){if(f.moveDragger){p=e;if(i.data("horizontalScroll")){e=h.position().left*i.data("scrollAmount")}else{e=h.position().top*i.data("scrollAmount")}draggerSpeed=0}else{p=e/i.data("scrollAmount")}}else{if(typeof(e)==="string"){var v;if(e==="top"){v=0}else{if(e==="bottom"&&!i.data("horizontalScroll")){v=k.outerHeight()-g.height()}else{if(e==="left"){v=0}else{if(e==="right"&&i.data("horizontalScroll")){v=k.outerWidth()-g.width()}else{if(e==="first"){v=i.find(".mCSB_container").find(":first")}else{if(e==="last"){v=i.find(".mCSB_container").find(":last")}else{v=i.find(e)}}}}}}if(v.length===1){if(i.data("horizontalScroll")){e=v.position().left}else{e=v.position().top}p=e/i.data("scrollAmount")}else{p=e=v}}}if(i.data("horizontalScroll")){if(i.data("onTotalScrollBack_Offset")){s=-i.data("onTotalScrollBack_Offset")}if(i.data("onTotalScroll_Offset")){l=g.width()-k.outerWidth()+i.data("onTotalScroll_Offset")}if(p<0){p=e=0;clearInterval(i.data("mCSB_buttonScrollLeft"));if(!s){q=true}}else{if(p>=j.width()-h.width()){p=j.width()-h.width();e=g.width()-k.outerWidth();clearInterval(i.data("mCSB_buttonScrollRight"));if(!l){m=true}}else{e=-e}}var n=i.data("snapAmount");if(n){e=Math.round(e/n)*n-i.data("snapOffset")}d.mTweenAxis.call(this,h[0],"left",Math.round(p),draggerSpeed,f.scrollEasing);d.mTweenAxis.call(this,k[0],"left",Math.round(e),t,f.scrollEasing,{onStart:function(){if(f.callbacks&&!i.data("mCS_tweenRunning")){u("onScrollStart")}if(i.data("autoHideScrollbar")){d.showScrollbar.call(r)}},onUpdate:function(){if(f.callbacks){u("whileScrolling")}},onComplete:function(){if(f.callbacks){u("onScroll");if(q||(s&&k.position().left>=s)){u("onTotalScrollBack")}if(m||(l&&k.position().left<=l)){u("onTotalScroll")}}h.data("preventAction",false);i.data("mCS_tweenRunning",false);if(i.data("autoHideScrollbar")){if(!g.hasClass("mCS-mouse-over")){d.hideScrollbar.call(r)}}}})}else{if(i.data("onTotalScrollBack_Offset")){s=-i.data("onTotalScrollBack_Offset")}if(i.data("onTotalScroll_Offset")){l=g.height()-k.outerHeight()+i.data("onTotalScroll_Offset")}if(p<0){p=e=0;clearInterval(i.data("mCSB_buttonScrollUp"));if(!s){q=true}}else{if(p>=j.height()-h.height()){p=j.height()-h.height();e=g.height()-k.outerHeight();clearInterval(i.data("mCSB_buttonScrollDown"));if(!l){m=true}}else{e=-e}}var n=i.data("snapAmount");if(n){e=Math.round(e/n)*n-i.data("snapOffset")}d.mTweenAxis.call(this,h[0],"top",Math.round(p),draggerSpeed,f.scrollEasing);d.mTweenAxis.call(this,k[0],"top",Math.round(e),t,f.scrollEasing,{onStart:function(){if(f.callbacks&&!i.data("mCS_tweenRunning")){u("onScrollStart")}if(i.data("autoHideScrollbar")){d.showScrollbar.call(r)}},onUpdate:function(){if(f.callbacks){u("whileScrolling")}},onComplete:function(){if(f.callbacks){u("onScroll");if(q||(s&&k.position().top>=s)){u("onTotalScrollBack")}if(m||(l&&k.position().top<=l)){u("onTotalScroll")}}h.data("preventAction",false);i.data("mCS_tweenRunning",false);if(i.data("autoHideScrollbar")){if(!g.hasClass("mCS-mouse-over")){d.hideScrollbar.call(r)}}}})}if(i.data("mCS_Init")){i.data({mCS_Init:false})}}}function u(w){this.mcs={top:k.position().top,left:k.position().left,draggerTop:h.position().top,draggerLeft:h.position().left,topPct:Math.round((100*Math.abs(k.position().top))/Math.abs(k.outerHeight()-g.height())),leftPct:Math.round((100*Math.abs(k.position().left))/Math.abs(k.outerWidth()-g.width()))};switch(w){case"onScrollStart":i.data("mCS_tweenRunning",true).data("onScrollStart_Callback").call(i,this.mcs);break;case"whileScrolling":i.data("whileScrolling_Callback").call(i,this.mcs);break;case"onScroll":i.data("onScroll_Callback").call(i,this.mcs);break;case"onTotalScrollBack":i.data("onTotalScrollBack_Callback").call(i,this.mcs);break;case"onTotalScroll":i.data("onTotalScroll_Callback").call(i,this.mcs);break}}},stop:function(){var g=c(this),e=g.children().children(".mCSB_container"),f=g.children().children().children().children(".mCSB_dragger");d.mTweenAxisStop.call(this,e[0]);d.mTweenAxisStop.call(this,f[0])},disable:function(e){var j=c(this),f=j.children(".mCustomScrollBox"),h=f.children(".mCSB_container"),g=f.children(".mCSB_scrollTools"),i=g.children().children(".mCSB_dragger");f.unbind("mousewheel focusin mouseenter mouseleave touchend");h.unbind("touchstart touchmove");if(e){if(j.data("horizontalScroll")){i.add(h).css("left",0)}else{i.add(h).css("top",0)}}g.css("display","none");h.addClass("mCS_no_scrollbar");j.data({bindEvent_mousewheel:false,bindEvent_focusin:false,bindEvent_content_touch:false,bindEvent_autoHideScrollbar:false}).addClass("mCS_disabled")},destroy:function(){var e=c(this);e.removeClass("mCustomScrollbar _mCS_"+e.data("mCustomScrollbarIndex")).addClass("mCS_destroyed").children().children(".mCSB_container").unwrap().children().unwrap().siblings(".mCSB_scrollTools").remove();c(document).unbind("mousemove."+e.data("mCustomScrollbarIndex")+" mouseup."+e.data("mCustomScrollbarIndex")+" MSPointerMove."+e.data("mCustomScrollbarIndex")+" MSPointerUp."+e.data("mCustomScrollbarIndex"));c(window).unbind("resize."+e.data("mCustomScrollbarIndex"))}},d={showScrollbar:function(){this.stop().animate({opacity:1},"fast")},hideScrollbar:function(){this.stop().animate({opacity:0},"fast")},mTweenAxis:function(g,i,h,f,o,y){var y=y||{},v=y.onStart||function(){},p=y.onUpdate||function(){},w=y.onComplete||function(){};var n=t(),l,j=0,r=g.offsetTop,s=g.style;if(i==="left"){r=g.offsetLeft}var m=h-r;q();e();function t(){if(window.performance&&window.performance.now){return window.performance.now()}else{if(window.performance&&window.performance.webkitNow){return window.performance.webkitNow()}else{if(Date.now){return Date.now()}else{return new Date().getTime()}}}}function x(){if(!j){v.call()}j=t()-n;u();if(j>=g._time){g._time=(j>g._time)?j+l-(j-g._time):j+l-1;if(g._time<j+1){g._time=j+1}}if(g._time<f){g._id=_request(x)}else{w.call()}}function u(){if(f>0){g.currVal=k(g._time,r,m,f,o);s[i]=Math.round(g.currVal)+"px"}else{s[i]=h+"px"}p.call()}function e(){l=1000/60;g._time=j+l;_request=(!window.requestAnimationFrame)?function(z){u();return setTimeout(z,0.01)}:window.requestAnimationFrame;g._id=_request(x)}function q(){if(g._id==null){return}if(!window.requestAnimationFrame){clearTimeout(g._id)}else{window.cancelAnimationFrame(g._id)}g._id=null}function k(B,A,F,E,C){switch(C){case"linear":return F*B/E+A;break;case"easeOutQuad":B/=E;return -F*B*(B-2)+A;break;case"easeInOutQuad":B/=E/2;if(B<1){return F/2*B*B+A}B--;return -F/2*(B*(B-2)-1)+A;break;case"easeOutCubic":B/=E;B--;return F*(B*B*B+1)+A;break;case"easeOutQuart":B/=E;B--;return -F*(B*B*B*B-1)+A;break;case"easeOutQuint":B/=E;B--;return F*(B*B*B*B*B+1)+A;break;case"easeOutCirc":B/=E;B--;return F*Math.sqrt(1-B*B)+A;break;case"easeOutSine":return F*Math.sin(B/E*(Math.PI/2))+A;break;case"easeOutExpo":return F*(-Math.pow(2,-10*B/E)+1)+A;break;case"mcsEaseOut":var D=(B/=E)*B,z=D*B;return A+F*(0.499999999999997*z*D+-2.5*D*D+5.5*z+-6.5*D+4*B);break;case"draggerRailEase":B/=E/2;if(B<1){return F/2*B*B*B+A}B-=2;return F/2*(B*B*B+2)+A;break}}},mTweenAxisStop:function(e){if(e._id==null){return}if(!window.requestAnimationFrame){clearTimeout(e._id)}else{window.cancelAnimationFrame(e._id)}e._id=null},rafPolyfill:function(){var f=["ms","moz","webkit","o"],e=f.length;while(--e>-1&&!window.requestAnimationFrame){window.requestAnimationFrame=window[f[e]+"RequestAnimationFrame"];window.cancelAnimationFrame=window[f[e]+"CancelAnimationFrame"]||window[f[e]+"CancelRequestAnimationFrame"]}}};d.rafPolyfill.call();c.support.touch=!!("ontouchstart" in window);c.support.msPointer=window.navigator.msPointerEnabled;var a=("https:"==document.location.protocol)?"https:":"http:";c.event.special.mousewheel||document.write('<script src="'+a+'//cdnjs.cloudflare.com/ajax/libs/jquery-mousewheel/3.0.6/jquery.mousewheel.min.js"><\/script>');c.fn.mCustomScrollbar=function(e){if(b[e]){return b[e].apply(this,Array.prototype.slice.call(arguments,1))}else{if(typeof e==="object"||!e){return b.init.apply(this,arguments)}else{c.error("Method "+e+" does not exist")}}}})(jQuery);
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/jquery.nicescroll.min.js b/pluss-manage-page/src/main/resources/static/resources/js/jquery.nicescroll.min.js
new file mode 100644
index 0000000..1174962
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/jquery.nicescroll.min.js
@@ -0,0 +1,120 @@
+/* jquery.nicescroll 3.6.8 InuYaksa*2015 MIT http://nicescroll.areaaperta.com */(function(f){"function"===typeof define&&define.amd?define(["jquery"],f):"object"===typeof exports?module.exports=f(require("jquery")):f(jQuery)})(function(f){var B=!1,F=!1,O=0,P=2E3,A=0,J=["webkit","ms","moz","o"],v=window.requestAnimationFrame||!1,w=window.cancelAnimationFrame||!1;if(!v)for(var Q in J){var G=J[Q];if(v=window[G+"RequestAnimationFrame"]){w=window[G+"CancelAnimationFrame"]||window[G+"CancelRequestAnimationFrame"];break}}var x=window.MutationObserver||window.WebKitMutationObserver||
+!1,K={zindex:"auto",cursoropacitymin:1,cursoropacitymax:1,cursorcolor:"#424242",cursorwidth:"6px",cursorborder:"1px solid #fff",cursorborderradius:"5px",scrollspeed:60,mousescrollstep:24,touchbehavior:!1,hwacceleration:!0,usetransition:!0,boxzoom:!1,dblclickzoom:!0,gesturezoom:!0,grabcursorenabled:!0,autohidemode:!0,background:"",iframeautoresize:!0,cursorminheight:32,preservenativescrolling:!0,railoffset:!1,railhoffset:!1,bouncescroll:!0,spacebarenabled:!0,railpadding:{top:0,right:0,left:0,bottom:0},
+disableoutline:!0,horizrailenabled:!0,railalign:"right",railvalign:"bottom",enabletranslate3d:!0,enablemousewheel:!0,enablekeyboard:!0,smoothscroll:!0,sensitiverail:!0,enablemouselockapi:!0,cursorfixedheight:!1,directionlockdeadzone:6,hidecursordelay:400,nativeparentscrolling:!0,enablescrollonselection:!0,overflowx:!0,overflowy:!0,cursordragspeed:.3,rtlmode:"auto",cursordragontouch:!1,oneaxismousemode:"auto",scriptpath:function(){var f=document.getElementsByTagName("script"),f=f.length?f[f.length-
+1].src.split("?")[0]:"";return 0<f.split("/").length?f.split("/").slice(0,-1).join("/")+"/":""}(),preventmultitouchscrolling:!0,disablemutationobserver:!1},H=!1,R=function(){if(H)return H;var f=document.createElement("DIV"),c=f.style,k=navigator.userAgent,l=navigator.platform,d={haspointerlock:"pointerLockElement"in document||"webkitPointerLockElement"in document||"mozPointerLockElement"in document};d.isopera="opera"in window;d.isopera12=d.isopera&&"getUserMedia"in navigator;d.isoperamini="[object OperaMini]"===
+Object.prototype.toString.call(window.operamini);d.isie="all"in document&&"attachEvent"in f&&!d.isopera;d.isieold=d.isie&&!("msInterpolationMode"in c);d.isie7=d.isie&&!d.isieold&&(!("documentMode"in document)||7==document.documentMode);d.isie8=d.isie&&"documentMode"in document&&8==document.documentMode;d.isie9=d.isie&&"performance"in window&&9==document.documentMode;d.isie10=d.isie&&"performance"in window&&10==document.documentMode;d.isie11="msRequestFullscreen"in f&&11<=document.documentMode;d.isieedge12=
+navigator.userAgent.match(/Edge\/12\./);d.isieedge="msOverflowStyle"in f;d.ismodernie=d.isie11||d.isieedge;d.isie9mobile=/iemobile.9/i.test(k);d.isie9mobile&&(d.isie9=!1);d.isie7mobile=!d.isie9mobile&&d.isie7&&/iemobile/i.test(k);d.ismozilla="MozAppearance"in c;d.iswebkit="WebkitAppearance"in c;d.ischrome="chrome"in window;d.ischrome38=d.ischrome&&"touchAction"in c;d.ischrome22=!d.ischrome38&&d.ischrome&&d.haspointerlock;d.ischrome26=!d.ischrome38&&d.ischrome&&"transition"in c;d.cantouch="ontouchstart"in
+document.documentElement||"ontouchstart"in window;d.hasw3ctouch=(window.PointerEvent||!1)&&(0<navigator.MaxTouchPoints||0<navigator.msMaxTouchPoints);d.hasmstouch=!d.hasw3ctouch&&(window.MSPointerEvent||!1);d.ismac=/^mac$/i.test(l);d.isios=d.cantouch&&/iphone|ipad|ipod/i.test(l);d.isios4=d.isios&&!("seal"in Object);d.isios7=d.isios&&"webkitHidden"in document;d.isios8=d.isios&&"hidden"in document;d.isandroid=/android/i.test(k);d.haseventlistener="addEventListener"in f;d.trstyle=!1;d.hastransform=!1;
+d.hastranslate3d=!1;d.transitionstyle=!1;d.hastransition=!1;d.transitionend=!1;l=["transform","msTransform","webkitTransform","MozTransform","OTransform"];for(k=0;k<l.length;k++)if(void 0!==c[l[k]]){d.trstyle=l[k];break}d.hastransform=!!d.trstyle;d.hastransform&&(c[d.trstyle]="translate3d(1px,2px,3px)",d.hastranslate3d=/translate3d/.test(c[d.trstyle]));d.transitionstyle=!1;d.prefixstyle="";d.transitionend=!1;for(var l="transition webkitTransition msTransition MozTransition OTransition OTransition KhtmlTransition".split(" "),
+q=" -webkit- -ms- -moz- -o- -o -khtml-".split(" "),t="transitionend webkitTransitionEnd msTransitionEnd transitionend otransitionend oTransitionEnd KhtmlTransitionEnd".split(" "),k=0;k<l.length;k++)if(l[k]in c){d.transitionstyle=l[k];d.prefixstyle=q[k];d.transitionend=t[k];break}d.ischrome26&&(d.prefixstyle=q[1]);d.hastransition=d.transitionstyle;a:{k=["grab","-webkit-grab","-moz-grab"];if(d.ischrome&&!d.ischrome38||d.isie)k=[];for(l=0;l<k.length;l++)if(q=k[l],c.cursor=q,c.cursor==q){c=q;break a}c=
+"url(//patriciaportfolio.googlecode.com/files/openhand.cur),n-resize"}d.cursorgrabvalue=c;d.hasmousecapture="setCapture"in f;d.hasMutationObserver=!1!==x;return H=d},S=function(h,c){function k(){var b=a.doc.css(e.trstyle);return b&&"matrix"==b.substr(0,6)?b.replace(/^.*\((.*)\)$/g,"$1").replace(/px/g,"").split(/, +/):!1}function l(){var b=a.win;if("zIndex"in b)return b.zIndex();for(;0<b.length&&9!=b[0].nodeType;){var g=b.css("zIndex");if(!isNaN(g)&&0!=g)return parseInt(g);b=b.parent()}return!1}function d(b,
+g,u){g=b.css(g);b=parseFloat(g);return isNaN(b)?(b=z[g]||0,u=3==b?u?a.win.outerHeight()-a.win.innerHeight():a.win.outerWidth()-a.win.innerWidth():1,a.isie8&&b&&(b+=1),u?b:0):b}function q(b,g,u,c){a._bind(b,g,function(a){a=a?a:window.event;var c={original:a,target:a.target||a.srcElement,type:"wheel",deltaMode:"MozMousePixelScroll"==a.type?0:1,deltaX:0,deltaZ:0,preventDefault:function(){a.preventDefault?a.preventDefault():a.returnValue=!1;return!1},stopImmediatePropagation:function(){a.stopImmediatePropagation?
+a.stopImmediatePropagation():a.cancelBubble=!0}};"mousewheel"==g?(a.wheelDeltaX&&(c.deltaX=-.025*a.wheelDeltaX),a.wheelDeltaY&&(c.deltaY=-.025*a.wheelDeltaY),c.deltaY||c.deltaX||(c.deltaY=-.025*a.wheelDelta)):c.deltaY=a.detail;return u.call(b,c)},c)}function t(b,g,c){var d,e;0==b.deltaMode?(d=-Math.floor(a.opt.mousescrollstep/54*b.deltaX),e=-Math.floor(a.opt.mousescrollstep/54*b.deltaY)):1==b.deltaMode&&(d=-Math.floor(b.deltaX*a.opt.mousescrollstep),e=-Math.floor(b.deltaY*a.opt.mousescrollstep));
+g&&a.opt.oneaxismousemode&&0==d&&e&&(d=e,e=0,c&&(0>d?a.getScrollLeft()>=a.page.maxw:0>=a.getScrollLeft())&&(e=d,d=0));a.isrtlmode&&(d=-d);d&&(a.scrollmom&&a.scrollmom.stop(),a.lastdeltax+=d,a.debounced("mousewheelx",function(){var b=a.lastdeltax;a.lastdeltax=0;a.rail.drag||a.doScrollLeftBy(b)},15));if(e){if(a.opt.nativeparentscrolling&&c&&!a.ispage&&!a.zoomactive)if(0>e){if(a.getScrollTop()>=a.page.maxh)return!0}else if(0>=a.getScrollTop())return!0;a.scrollmom&&a.scrollmom.stop();a.lastdeltay+=e;
+a.synched("mousewheely",function(){var b=a.lastdeltay;a.lastdeltay=0;a.rail.drag||a.doScrollBy(b)},15)}b.stopImmediatePropagation();return b.preventDefault()}var a=this;this.version="3.6.8";this.name="nicescroll";this.me=c;this.opt={doc:f("body"),win:!1};f.extend(this.opt,K);this.opt.snapbackspeed=80;if(h)for(var r in a.opt)void 0!==h[r]&&(a.opt[r]=h[r]);a.opt.disablemutationobserver&&(x=!1);this.iddoc=(this.doc=a.opt.doc)&&this.doc[0]?this.doc[0].id||"":"";this.ispage=/^BODY|HTML/.test(a.opt.win?
+a.opt.win[0].nodeName:this.doc[0].nodeName);this.haswrapper=!1!==a.opt.win;this.win=a.opt.win||(this.ispage?f(window):this.doc);this.docscroll=this.ispage&&!this.haswrapper?f(window):this.win;this.body=f("body");this.iframe=this.isfixed=this.viewport=!1;this.isiframe="IFRAME"==this.doc[0].nodeName&&"IFRAME"==this.win[0].nodeName;this.istextarea="TEXTAREA"==this.win[0].nodeName;this.forcescreen=!1;this.canshowonmouseevent="scroll"!=a.opt.autohidemode;this.page=this.view=this.onzoomout=this.onzoomin=
+this.onscrollcancel=this.onscrollend=this.onscrollstart=this.onclick=this.ongesturezoom=this.onkeypress=this.onmousewheel=this.onmousemove=this.onmouseup=this.onmousedown=!1;this.scroll={x:0,y:0};this.scrollratio={x:0,y:0};this.cursorheight=20;this.scrollvaluemax=0;if("auto"==this.opt.rtlmode){r=this.win[0]==window?this.body:this.win;var p=r.css("writing-mode")||r.css("-webkit-writing-mode")||r.css("-ms-writing-mode")||r.css("-moz-writing-mode");"horizontal-tb"==p||"lr-tb"==p||""==p?(this.isrtlmode=
+"rtl"==r.css("direction"),this.isvertical=!1):(this.isrtlmode="vertical-rl"==p||"tb"==p||"tb-rl"==p||"rl-tb"==p,this.isvertical="vertical-rl"==p||"tb"==p||"tb-rl"==p)}else this.isrtlmode=!0===this.opt.rtlmode,this.isvertical=!1;this.observerbody=this.observerremover=this.observer=this.scrollmom=this.scrollrunning=!1;do this.id="ascrail"+P++;while(document.getElementById(this.id));this.hasmousefocus=this.hasfocus=this.zoomactive=this.zoom=this.selectiondrag=this.cursorfreezed=this.cursor=this.rail=
+!1;this.visibility=!0;this.hidden=this.locked=this.railslocked=!1;this.cursoractive=!0;this.wheelprevented=!1;this.overflowx=a.opt.overflowx;this.overflowy=a.opt.overflowy;this.nativescrollingarea=!1;this.checkarea=0;this.events=[];this.saved={};this.delaylist={};this.synclist={};this.lastdeltay=this.lastdeltax=0;this.detected=R();var e=f.extend({},this.detected);this.ishwscroll=(this.canhwscroll=e.hastransform&&a.opt.hwacceleration)&&a.haswrapper;this.hasreversehr=this.isrtlmode?this.isvertical?
+!(e.iswebkit||e.isie||e.isie11):!(e.iswebkit||e.isie&&!e.isie10&&!e.isie11):!1;this.istouchcapable=!1;e.cantouch||!e.hasw3ctouch&&!e.hasmstouch?!e.cantouch||e.isios||e.isandroid||!e.iswebkit&&!e.ismozilla||(this.istouchcapable=!0):this.istouchcapable=!0;a.opt.enablemouselockapi||(e.hasmousecapture=!1,e.haspointerlock=!1);this.debounced=function(b,g,c){a&&(a.delaylist[b]||(g.call(a),a.delaylist[b]={h:v(function(){a.delaylist[b].fn.call(a);a.delaylist[b]=!1},c)}),a.delaylist[b].fn=g)};var I=!1;this.synched=
+function(b,g){a.synclist[b]=g;(function(){I||(v(function(){if(a){I=!1;for(var b in a.synclist){var g=a.synclist[b];g&&g.call(a);a.synclist[b]=!1}}}),I=!0)})();return b};this.unsynched=function(b){a.synclist[b]&&(a.synclist[b]=!1)};this.css=function(b,g){for(var c in g)a.saved.css.push([b,c,b.css(c)]),b.css(c,g[c])};this.scrollTop=function(b){return void 0===b?a.getScrollTop():a.setScrollTop(b)};this.scrollLeft=function(b){return void 0===b?a.getScrollLeft():a.setScrollLeft(b)};var D=function(a,g,
+c,d,e,f,k){this.st=a;this.ed=g;this.spd=c;this.p1=d||0;this.p2=e||1;this.p3=f||0;this.p4=k||1;this.ts=(new Date).getTime();this.df=this.ed-this.st};D.prototype={B2:function(a){return 3*a*a*(1-a)},B3:function(a){return 3*a*(1-a)*(1-a)},B4:function(a){return(1-a)*(1-a)*(1-a)},getNow:function(){var a=1-((new Date).getTime()-this.ts)/this.spd,g=this.B2(a)+this.B3(a)+this.B4(a);return 0>a?this.ed:this.st+Math.round(this.df*g)},update:function(a,g){this.st=this.getNow();this.ed=a;this.spd=g;this.ts=(new Date).getTime();
+this.df=this.ed-this.st;return this}};if(this.ishwscroll){this.doc.translate={x:0,y:0,tx:"0px",ty:"0px"};e.hastranslate3d&&e.isios&&this.doc.css("-webkit-backface-visibility","hidden");this.getScrollTop=function(b){if(!b){if(b=k())return 16==b.length?-b[13]:-b[5];if(a.timerscroll&&a.timerscroll.bz)return a.timerscroll.bz.getNow()}return a.doc.translate.y};this.getScrollLeft=function(b){if(!b){if(b=k())return 16==b.length?-b[12]:-b[4];if(a.timerscroll&&a.timerscroll.bh)return a.timerscroll.bh.getNow()}return a.doc.translate.x};
+this.notifyScrollEvent=function(a){var g=document.createEvent("UIEvents");g.initUIEvent("scroll",!1,!0,window,1);g.niceevent=!0;a.dispatchEvent(g)};var y=this.isrtlmode?1:-1;e.hastranslate3d&&a.opt.enabletranslate3d?(this.setScrollTop=function(b,g){a.doc.translate.y=b;a.doc.translate.ty=-1*b+"px";a.doc.css(e.trstyle,"translate3d("+a.doc.translate.tx+","+a.doc.translate.ty+",0px)");g||a.notifyScrollEvent(a.win[0])},this.setScrollLeft=function(b,g){a.doc.translate.x=b;a.doc.translate.tx=b*y+"px";a.doc.css(e.trstyle,
+"translate3d("+a.doc.translate.tx+","+a.doc.translate.ty+",0px)");g||a.notifyScrollEvent(a.win[0])}):(this.setScrollTop=function(b,g){a.doc.translate.y=b;a.doc.translate.ty=-1*b+"px";a.doc.css(e.trstyle,"translate("+a.doc.translate.tx+","+a.doc.translate.ty+")");g||a.notifyScrollEvent(a.win[0])},this.setScrollLeft=function(b,g){a.doc.translate.x=b;a.doc.translate.tx=b*y+"px";a.doc.css(e.trstyle,"translate("+a.doc.translate.tx+","+a.doc.translate.ty+")");g||a.notifyScrollEvent(a.win[0])})}else this.getScrollTop=
+function(){return a.docscroll.scrollTop()},this.setScrollTop=function(b){return setTimeout(function(){a&&a.docscroll.scrollTop(b)},1)},this.getScrollLeft=function(){return a.hasreversehr?a.detected.ismozilla?a.page.maxw-Math.abs(a.docscroll.scrollLeft()):a.page.maxw-a.docscroll.scrollLeft():a.docscroll.scrollLeft()},this.setScrollLeft=function(b){return setTimeout(function(){if(a)return a.hasreversehr&&(b=a.detected.ismozilla?-(a.page.maxw-b):a.page.maxw-b),a.docscroll.scrollLeft(b)},1)};this.getTarget=
+function(a){return a?a.target?a.target:a.srcElement?a.srcElement:!1:!1};this.hasParent=function(a,g){if(!a)return!1;for(var c=a.target||a.srcElement||a||!1;c&&c.id!=g;)c=c.parentNode||!1;return!1!==c};var z={thin:1,medium:3,thick:5};this.getDocumentScrollOffset=function(){return{top:window.pageYOffset||document.documentElement.scrollTop,left:window.pageXOffset||document.documentElement.scrollLeft}};this.getOffset=function(){if(a.isfixed){var b=a.win.offset(),g=a.getDocumentScrollOffset();b.top-=g.top;
+b.left-=g.left;return b}b=a.win.offset();if(!a.viewport)return b;g=a.viewport.offset();return{top:b.top-g.top,left:b.left-g.left}};this.updateScrollBar=function(b){var g,c,e;if(a.ishwscroll)a.rail.css({height:a.win.innerHeight()-(a.opt.railpadding.top+a.opt.railpadding.bottom)}),a.railh&&a.railh.css({width:a.win.innerWidth()-(a.opt.railpadding.left+a.opt.railpadding.right)});else{var f=a.getOffset();g=f.top;c=f.left-(a.opt.railpadding.left+a.opt.railpadding.right);g+=d(a.win,"border-top-width",!0);
+c+=a.rail.align?a.win.outerWidth()-d(a.win,"border-right-width")-a.rail.width:d(a.win,"border-left-width");if(e=a.opt.railoffset)e.top&&(g+=e.top),e.left&&(c+=e.left);a.railslocked||a.rail.css({top:g,left:c,height:(b?b.h:a.win.innerHeight())-(a.opt.railpadding.top+a.opt.railpadding.bottom)});a.zoom&&a.zoom.css({top:g+1,left:1==a.rail.align?c-20:c+a.rail.width+4});if(a.railh&&!a.railslocked){g=f.top;c=f.left;if(e=a.opt.railhoffset)e.top&&(g+=e.top),e.left&&(c+=e.left);b=a.railh.align?g+d(a.win,"border-top-width",
+!0)+a.win.innerHeight()-a.railh.height:g+d(a.win,"border-top-width",!0);c+=d(a.win,"border-left-width");a.railh.css({top:b-(a.opt.railpadding.top+a.opt.railpadding.bottom),left:c,width:a.railh.width})}}};this.doRailClick=function(b,g,c){var d;a.railslocked||(a.cancelEvent(b),g?(g=c?a.doScrollLeft:a.doScrollTop,d=c?(b.pageX-a.railh.offset().left-a.cursorwidth/2)*a.scrollratio.x:(b.pageY-a.rail.offset().top-a.cursorheight/2)*a.scrollratio.y,g(d)):(g=c?a.doScrollLeftBy:a.doScrollBy,d=c?a.scroll.x:a.scroll.y,
+b=c?b.pageX-a.railh.offset().left:b.pageY-a.rail.offset().top,c=c?a.view.w:a.view.h,g(d>=b?c:-c)))};a.hasanimationframe=v;a.hascancelanimationframe=w;a.hasanimationframe?a.hascancelanimationframe||(w=function(){a.cancelAnimationFrame=!0}):(v=function(a){return setTimeout(a,15-Math.floor(+new Date/1E3)%16)},w=clearTimeout);this.init=function(){a.saved.css=[];if(e.isie7mobile||e.isoperamini)return!0;e.hasmstouch&&a.css(a.ispage?f("html"):a.win,{_touchaction:"none"});var b=e.ismodernie||e.isie10?{"-ms-overflow-style":"none"}:
+{"overflow-y":"hidden"};a.zindex="auto";a.zindex=a.ispage||"auto"!=a.opt.zindex?a.opt.zindex:l()||"auto";!a.ispage&&"auto"!=a.zindex&&a.zindex>A&&(A=a.zindex);a.isie&&0==a.zindex&&"auto"==a.opt.zindex&&(a.zindex="auto");if(!a.ispage||!e.cantouch&&!e.isieold&&!e.isie9mobile){var c=a.docscroll;a.ispage&&(c=a.haswrapper?a.win:a.doc);e.isie9mobile||a.css(c,b);a.ispage&&e.isie7&&("BODY"==a.doc[0].nodeName?a.css(f("html"),{"overflow-y":"hidden"}):"HTML"==a.doc[0].nodeName&&a.css(f("body"),b));!e.isios||
+a.ispage||a.haswrapper||a.css(f("body"),{"-webkit-overflow-scrolling":"touch"});var d=f(document.createElement("div"));d.css({position:"relative",top:0,"float":"right",width:a.opt.cursorwidth,height:0,"background-color":a.opt.cursorcolor,border:a.opt.cursorborder,"background-clip":"padding-box","-webkit-border-radius":a.opt.cursorborderradius,"-moz-border-radius":a.opt.cursorborderradius,"border-radius":a.opt.cursorborderradius});d.hborder=parseFloat(d.outerHeight()-d.innerHeight());d.addClass("nicescroll-cursors");
+a.cursor=d;var m=f(document.createElement("div"));m.attr("id",a.id);m.addClass("nicescroll-rails nicescroll-rails-vr");var k,h,p=["left","right","top","bottom"],L;for(L in p)h=p[L],(k=a.opt.railpadding[h])?m.css("padding-"+h,k+"px"):a.opt.railpadding[h]=0;m.append(d);m.width=Math.max(parseFloat(a.opt.cursorwidth),d.outerWidth());m.css({width:m.width+"px",zIndex:a.zindex,background:a.opt.background,cursor:"default"});m.visibility=!0;m.scrollable=!0;m.align="left"==a.opt.railalign?0:1;a.rail=m;d=a.rail.drag=
+!1;!a.opt.boxzoom||a.ispage||e.isieold||(d=document.createElement("div"),a.bind(d,"click",a.doZoom),a.bind(d,"mouseenter",function(){a.zoom.css("opacity",a.opt.cursoropacitymax)}),a.bind(d,"mouseleave",function(){a.zoom.css("opacity",a.opt.cursoropacitymin)}),a.zoom=f(d),a.zoom.css({cursor:"pointer",zIndex:a.zindex,backgroundImage:"url("+a.opt.scriptpath+"zoomico.png)",height:18,width:18,backgroundPosition:"0px 0px"}),a.opt.dblclickzoom&&a.bind(a.win,"dblclick",a.doZoom),e.cantouch&&a.opt.gesturezoom&&
+(a.ongesturezoom=function(b){1.5<b.scale&&a.doZoomIn(b);.8>b.scale&&a.doZoomOut(b);return a.cancelEvent(b)},a.bind(a.win,"gestureend",a.ongesturezoom)));a.railh=!1;var n;a.opt.horizrailenabled&&(a.css(c,{overflowX:"hidden"}),d=f(document.createElement("div")),d.css({position:"absolute",top:0,height:a.opt.cursorwidth,width:0,backgroundColor:a.opt.cursorcolor,border:a.opt.cursorborder,backgroundClip:"padding-box","-webkit-border-radius":a.opt.cursorborderradius,"-moz-border-radius":a.opt.cursorborderradius,
+"border-radius":a.opt.cursorborderradius}),e.isieold&&d.css("overflow","hidden"),d.wborder=parseFloat(d.outerWidth()-d.innerWidth()),d.addClass("nicescroll-cursors"),a.cursorh=d,n=f(document.createElement("div")),n.attr("id",a.id+"-hr"),n.addClass("nicescroll-rails nicescroll-rails-hr"),n.height=Math.max(parseFloat(a.opt.cursorwidth),d.outerHeight()),n.css({height:n.height+"px",zIndex:a.zindex,background:a.opt.background}),n.append(d),n.visibility=!0,n.scrollable=!0,n.align="top"==a.opt.railvalign?
+0:1,a.railh=n,a.railh.drag=!1);a.ispage?(m.css({position:"fixed",top:0,height:"100%"}),m.align?m.css({right:0}):m.css({left:0}),a.body.append(m),a.railh&&(n.css({position:"fixed",left:0,width:"100%"}),n.align?n.css({bottom:0}):n.css({top:0}),a.body.append(n))):(a.ishwscroll?("static"==a.win.css("position")&&a.css(a.win,{position:"relative"}),c="HTML"==a.win[0].nodeName?a.body:a.win,f(c).scrollTop(0).scrollLeft(0),a.zoom&&(a.zoom.css({position:"absolute",top:1,right:0,"margin-right":m.width+4}),c.append(a.zoom)),
+m.css({position:"absolute",top:0}),m.align?m.css({right:0}):m.css({left:0}),c.append(m),n&&(n.css({position:"absolute",left:0,bottom:0}),n.align?n.css({bottom:0}):n.css({top:0}),c.append(n))):(a.isfixed="fixed"==a.win.css("position"),c=a.isfixed?"fixed":"absolute",a.isfixed||(a.viewport=a.getViewport(a.win[0])),a.viewport&&(a.body=a.viewport,0==/fixed|absolute/.test(a.viewport.css("position"))&&a.css(a.viewport,{position:"relative"})),m.css({position:c}),a.zoom&&a.zoom.css({position:c}),a.updateScrollBar(),
+a.body.append(m),a.zoom&&a.body.append(a.zoom),a.railh&&(n.css({position:c}),a.body.append(n))),e.isios&&a.css(a.win,{"-webkit-tap-highlight-color":"rgba(0,0,0,0)","-webkit-touch-callout":"none"}),e.isie&&a.opt.disableoutline&&a.win.attr("hideFocus","true"),e.iswebkit&&a.opt.disableoutline&&a.win.css("outline","none"));!1===a.opt.autohidemode?(a.autohidedom=!1,a.rail.css({opacity:a.opt.cursoropacitymax}),a.railh&&a.railh.css({opacity:a.opt.cursoropacitymax})):!0===a.opt.autohidemode||"leave"===a.opt.autohidemode?
+(a.autohidedom=f().add(a.rail),e.isie8&&(a.autohidedom=a.autohidedom.add(a.cursor)),a.railh&&(a.autohidedom=a.autohidedom.add(a.railh)),a.railh&&e.isie8&&(a.autohidedom=a.autohidedom.add(a.cursorh))):"scroll"==a.opt.autohidemode?(a.autohidedom=f().add(a.rail),a.railh&&(a.autohidedom=a.autohidedom.add(a.railh))):"cursor"==a.opt.autohidemode?(a.autohidedom=f().add(a.cursor),a.railh&&(a.autohidedom=a.autohidedom.add(a.cursorh))):"hidden"==a.opt.autohidemode&&(a.autohidedom=!1,a.hide(),a.railslocked=
+!1);if(e.isie9mobile)a.scrollmom=new M(a),a.onmangotouch=function(){var b=a.getScrollTop(),c=a.getScrollLeft();if(b==a.scrollmom.lastscrolly&&c==a.scrollmom.lastscrollx)return!0;var g=b-a.mangotouch.sy,d=c-a.mangotouch.sx;if(0!=Math.round(Math.sqrt(Math.pow(d,2)+Math.pow(g,2)))){var e=0>g?-1:1,f=0>d?-1:1,u=+new Date;a.mangotouch.lazy&&clearTimeout(a.mangotouch.lazy);80<u-a.mangotouch.tm||a.mangotouch.dry!=e||a.mangotouch.drx!=f?(a.scrollmom.stop(),a.scrollmom.reset(c,b),a.mangotouch.sy=b,a.mangotouch.ly=
+b,a.mangotouch.sx=c,a.mangotouch.lx=c,a.mangotouch.dry=e,a.mangotouch.drx=f,a.mangotouch.tm=u):(a.scrollmom.stop(),a.scrollmom.update(a.mangotouch.sx-d,a.mangotouch.sy-g),a.mangotouch.tm=u,g=Math.max(Math.abs(a.mangotouch.ly-b),Math.abs(a.mangotouch.lx-c)),a.mangotouch.ly=b,a.mangotouch.lx=c,2<g&&(a.mangotouch.lazy=setTimeout(function(){a.mangotouch.lazy=!1;a.mangotouch.dry=0;a.mangotouch.drx=0;a.mangotouch.tm=0;a.scrollmom.doMomentum(30)},100)))}},m=a.getScrollTop(),n=a.getScrollLeft(),a.mangotouch=
+{sy:m,ly:m,dry:0,sx:n,lx:n,drx:0,lazy:!1,tm:0},a.bind(a.docscroll,"scroll",a.onmangotouch);else{if(e.cantouch||a.istouchcapable||a.opt.touchbehavior||e.hasmstouch){a.scrollmom=new M(a);a.ontouchstart=function(b){if(b.pointerType&&2!=b.pointerType&&"touch"!=b.pointerType)return!1;a.hasmoving=!1;if(!a.railslocked){var c;if(e.hasmstouch)for(c=b.target?b.target:!1;c;){var g=f(c).getNiceScroll();if(0<g.length&&g[0].me==a.me)break;if(0<g.length)return!1;if("DIV"==c.nodeName&&c.id==a.id)break;c=c.parentNode?
+c.parentNode:!1}a.cancelScroll();if((c=a.getTarget(b))&&/INPUT/i.test(c.nodeName)&&/range/i.test(c.type))return a.stopPropagation(b);!("clientX"in b)&&"changedTouches"in b&&(b.clientX=b.changedTouches[0].clientX,b.clientY=b.changedTouches[0].clientY);a.forcescreen&&(g=b,b={original:b.original?b.original:b},b.clientX=g.screenX,b.clientY=g.screenY);a.rail.drag={x:b.clientX,y:b.clientY,sx:a.scroll.x,sy:a.scroll.y,st:a.getScrollTop(),sl:a.getScrollLeft(),pt:2,dl:!1};if(a.ispage||!a.opt.directionlockdeadzone)a.rail.drag.dl=
+"f";else{var g=f(window).width(),d=f(window).height(),d=Math.max(0,Math.max(document.body.scrollHeight,document.documentElement.scrollHeight)-d),g=Math.max(0,Math.max(document.body.scrollWidth,document.documentElement.scrollWidth)-g);a.rail.drag.ck=!a.rail.scrollable&&a.railh.scrollable?0<d?"v":!1:a.rail.scrollable&&!a.railh.scrollable?0<g?"h":!1:!1;a.rail.drag.ck||(a.rail.drag.dl="f")}a.opt.touchbehavior&&a.isiframe&&e.isie&&(g=a.win.position(),a.rail.drag.x+=g.left,a.rail.drag.y+=g.top);a.hasmoving=
+!1;a.lastmouseup=!1;a.scrollmom.reset(b.clientX,b.clientY);if(!e.cantouch&&!this.istouchcapable&&!b.pointerType){if(!c||!/INPUT|SELECT|TEXTAREA/i.test(c.nodeName))return!a.ispage&&e.hasmousecapture&&c.setCapture(),a.opt.touchbehavior?(c.onclick&&!c._onclick&&(c._onclick=c.onclick,c.onclick=function(b){if(a.hasmoving)return!1;c._onclick.call(this,b)}),a.cancelEvent(b)):a.stopPropagation(b);/SUBMIT|CANCEL|BUTTON/i.test(f(c).attr("type"))&&(pc={tg:c,click:!1},a.preventclick=pc)}}};a.ontouchend=function(b){if(!a.rail.drag)return!0;
+if(2==a.rail.drag.pt){if(b.pointerType&&2!=b.pointerType&&"touch"!=b.pointerType)return!1;a.scrollmom.doMomentum();a.rail.drag=!1;if(a.hasmoving&&(a.lastmouseup=!0,a.hideCursor(),e.hasmousecapture&&document.releaseCapture(),!e.cantouch))return a.cancelEvent(b)}else if(1==a.rail.drag.pt)return a.onmouseup(b)};var q=a.opt.touchbehavior&&a.isiframe&&!e.hasmousecapture;a.ontouchmove=function(b,c){if(!a.rail.drag||b.targetTouches&&a.opt.preventmultitouchscrolling&&1<b.targetTouches.length||b.pointerType&&
+2!=b.pointerType&&"touch"!=b.pointerType)return!1;if(2==a.rail.drag.pt){if(e.cantouch&&e.isios&&void 0===b.original)return!0;a.hasmoving=!0;a.preventclick&&!a.preventclick.click&&(a.preventclick.click=a.preventclick.tg.onclick||!1,a.preventclick.tg.onclick=a.onpreventclick);b=f.extend({original:b},b);"changedTouches"in b&&(b.clientX=b.changedTouches[0].clientX,b.clientY=b.changedTouches[0].clientY);if(a.forcescreen){var g=b;b={original:b.original?b.original:b};b.clientX=g.screenX;b.clientY=g.screenY}var d,
+g=d=0;q&&!c&&(d=a.win.position(),g=-d.left,d=-d.top);var u=b.clientY+d;d=u-a.rail.drag.y;var m=b.clientX+g,k=m-a.rail.drag.x,h=a.rail.drag.st-d;a.ishwscroll&&a.opt.bouncescroll?0>h?h=Math.round(h/2):h>a.page.maxh&&(h=a.page.maxh+Math.round((h-a.page.maxh)/2)):(0>h&&(u=h=0),h>a.page.maxh&&(h=a.page.maxh,u=0));var l;a.railh&&a.railh.scrollable&&(l=a.isrtlmode?k-a.rail.drag.sl:a.rail.drag.sl-k,a.ishwscroll&&a.opt.bouncescroll?0>l?l=Math.round(l/2):l>a.page.maxw&&(l=a.page.maxw+Math.round((l-a.page.maxw)/
+2)):(0>l&&(m=l=0),l>a.page.maxw&&(l=a.page.maxw,m=0)));g=!1;if(a.rail.drag.dl)g=!0,"v"==a.rail.drag.dl?l=a.rail.drag.sl:"h"==a.rail.drag.dl&&(h=a.rail.drag.st);else{d=Math.abs(d);var k=Math.abs(k),C=a.opt.directionlockdeadzone;if("v"==a.rail.drag.ck){if(d>C&&k<=.3*d)return a.rail.drag=!1,!0;k>C&&(a.rail.drag.dl="f",f("body").scrollTop(f("body").scrollTop()))}else if("h"==a.rail.drag.ck){if(k>C&&d<=.3*k)return a.rail.drag=!1,!0;d>C&&(a.rail.drag.dl="f",f("body").scrollLeft(f("body").scrollLeft()))}}a.synched("touchmove",
+function(){a.rail.drag&&2==a.rail.drag.pt&&(a.prepareTransition&&a.prepareTransition(0),a.rail.scrollable&&a.setScrollTop(h),a.scrollmom.update(m,u),a.railh&&a.railh.scrollable?(a.setScrollLeft(l),a.showCursor(h,l)):a.showCursor(h),e.isie10&&document.selection.clear())});e.ischrome&&a.istouchcapable&&(g=!1);if(g)return a.cancelEvent(b)}else if(1==a.rail.drag.pt)return a.onmousemove(b)}}a.onmousedown=function(b,c){if(!a.rail.drag||1==a.rail.drag.pt){if(a.railslocked)return a.cancelEvent(b);a.cancelScroll();
+a.rail.drag={x:b.clientX,y:b.clientY,sx:a.scroll.x,sy:a.scroll.y,pt:1,hr:!!c};var g=a.getTarget(b);!a.ispage&&e.hasmousecapture&&g.setCapture();a.isiframe&&!e.hasmousecapture&&(a.saved.csspointerevents=a.doc.css("pointer-events"),a.css(a.doc,{"pointer-events":"none"}));a.hasmoving=!1;return a.cancelEvent(b)}};a.onmouseup=function(b){if(a.rail.drag){if(1!=a.rail.drag.pt)return!0;e.hasmousecapture&&document.releaseCapture();a.isiframe&&!e.hasmousecapture&&a.doc.css("pointer-events",a.saved.csspointerevents);
+a.rail.drag=!1;a.hasmoving&&a.triggerScrollEnd();return a.cancelEvent(b)}};a.onmousemove=function(b){if(a.rail.drag){if(1==a.rail.drag.pt){if(e.ischrome&&0==b.which)return a.onmouseup(b);a.cursorfreezed=!0;a.hasmoving=!0;if(a.rail.drag.hr){a.scroll.x=a.rail.drag.sx+(b.clientX-a.rail.drag.x);0>a.scroll.x&&(a.scroll.x=0);var c=a.scrollvaluemaxw;a.scroll.x>c&&(a.scroll.x=c)}else a.scroll.y=a.rail.drag.sy+(b.clientY-a.rail.drag.y),0>a.scroll.y&&(a.scroll.y=0),c=a.scrollvaluemax,a.scroll.y>c&&(a.scroll.y=
+c);a.synched("mousemove",function(){a.rail.drag&&1==a.rail.drag.pt&&(a.showCursor(),a.rail.drag.hr?a.hasreversehr?a.doScrollLeft(a.scrollvaluemaxw-Math.round(a.scroll.x*a.scrollratio.x),a.opt.cursordragspeed):a.doScrollLeft(Math.round(a.scroll.x*a.scrollratio.x),a.opt.cursordragspeed):a.doScrollTop(Math.round(a.scroll.y*a.scrollratio.y),a.opt.cursordragspeed))});return a.cancelEvent(b)}}else a.checkarea=0};if(e.cantouch||a.opt.touchbehavior)a.onpreventclick=function(b){if(a.preventclick)return a.preventclick.tg.onclick=
+a.preventclick.click,a.preventclick=!1,a.cancelEvent(b)},a.bind(a.win,"mousedown",a.ontouchstart),a.onclick=e.isios?!1:function(b){return a.lastmouseup?(a.lastmouseup=!1,a.cancelEvent(b)):!0},a.opt.grabcursorenabled&&e.cursorgrabvalue&&(a.css(a.ispage?a.doc:a.win,{cursor:e.cursorgrabvalue}),a.css(a.rail,{cursor:e.cursorgrabvalue}));else{var r=function(b){if(a.selectiondrag){if(b){var c=a.win.outerHeight();b=b.pageY-a.selectiondrag.top;0<b&&b<c&&(b=0);b>=c&&(b-=c);a.selectiondrag.df=b}0!=a.selectiondrag.df&&
+(a.doScrollBy(2*-Math.floor(a.selectiondrag.df/6)),a.debounced("doselectionscroll",function(){r()},50))}};a.hasTextSelected="getSelection"in document?function(){return 0<document.getSelection().rangeCount}:"selection"in document?function(){return"None"!=document.selection.type}:function(){return!1};a.onselectionstart=function(b){a.ispage||(a.selectiondrag=a.win.offset())};a.onselectionend=function(b){a.selectiondrag=!1};a.onselectiondrag=function(b){a.selectiondrag&&a.hasTextSelected()&&a.debounced("selectionscroll",
+function(){r(b)},250)}}e.hasw3ctouch?(a.css(a.rail,{"touch-action":"none"}),a.css(a.cursor,{"touch-action":"none"}),a.bind(a.win,"pointerdown",a.ontouchstart),a.bind(document,"pointerup",a.ontouchend),a.bind(document,"pointermove",a.ontouchmove)):e.hasmstouch?(a.css(a.rail,{"-ms-touch-action":"none"}),a.css(a.cursor,{"-ms-touch-action":"none"}),a.bind(a.win,"MSPointerDown",a.ontouchstart),a.bind(document,"MSPointerUp",a.ontouchend),a.bind(document,"MSPointerMove",a.ontouchmove),a.bind(a.cursor,"MSGestureHold",
+function(a){a.preventDefault()}),a.bind(a.cursor,"contextmenu",function(a){a.preventDefault()})):this.istouchcapable&&(a.bind(a.win,"touchstart",a.ontouchstart),a.bind(document,"touchend",a.ontouchend),a.bind(document,"touchcancel",a.ontouchend),a.bind(document,"touchmove",a.ontouchmove));if(a.opt.cursordragontouch||!e.cantouch&&!a.opt.touchbehavior)a.rail.css({cursor:"default"}),a.railh&&a.railh.css({cursor:"default"}),a.jqbind(a.rail,"mouseenter",function(){if(!a.ispage&&!a.win.is(":visible"))return!1;
+a.canshowonmouseevent&&a.showCursor();a.rail.active=!0}),a.jqbind(a.rail,"mouseleave",function(){a.rail.active=!1;a.rail.drag||a.hideCursor()}),a.opt.sensitiverail&&(a.bind(a.rail,"click",function(b){a.doRailClick(b,!1,!1)}),a.bind(a.rail,"dblclick",function(b){a.doRailClick(b,!0,!1)}),a.bind(a.cursor,"click",function(b){a.cancelEvent(b)}),a.bind(a.cursor,"dblclick",function(b){a.cancelEvent(b)})),a.railh&&(a.jqbind(a.railh,"mouseenter",function(){if(!a.ispage&&!a.win.is(":visible"))return!1;a.canshowonmouseevent&&
+a.showCursor();a.rail.active=!0}),a.jqbind(a.railh,"mouseleave",function(){a.rail.active=!1;a.rail.drag||a.hideCursor()}),a.opt.sensitiverail&&(a.bind(a.railh,"click",function(b){a.doRailClick(b,!1,!0)}),a.bind(a.railh,"dblclick",function(b){a.doRailClick(b,!0,!0)}),a.bind(a.cursorh,"click",function(b){a.cancelEvent(b)}),a.bind(a.cursorh,"dblclick",function(b){a.cancelEvent(b)})));e.cantouch||a.opt.touchbehavior?(a.bind(e.hasmousecapture?a.win:document,"mouseup",a.ontouchend),a.bind(document,"mousemove",
+a.ontouchmove),a.onclick&&a.bind(document,"click",a.onclick),a.opt.cursordragontouch?(a.bind(a.cursor,"mousedown",a.onmousedown),a.bind(a.cursor,"mouseup",a.onmouseup),a.cursorh&&a.bind(a.cursorh,"mousedown",function(b){a.onmousedown(b,!0)}),a.cursorh&&a.bind(a.cursorh,"mouseup",a.onmouseup)):(a.bind(a.rail,"mousedown",function(a){a.preventDefault()}),a.railh&&a.bind(a.railh,"mousedown",function(a){a.preventDefault()}))):(a.bind(e.hasmousecapture?a.win:document,"mouseup",a.onmouseup),a.bind(document,
+"mousemove",a.onmousemove),a.onclick&&a.bind(document,"click",a.onclick),a.bind(a.cursor,"mousedown",a.onmousedown),a.bind(a.cursor,"mouseup",a.onmouseup),a.railh&&(a.bind(a.cursorh,"mousedown",function(b){a.onmousedown(b,!0)}),a.bind(a.cursorh,"mouseup",a.onmouseup)),!a.ispage&&a.opt.enablescrollonselection&&(a.bind(a.win[0],"mousedown",a.onselectionstart),a.bind(document,"mouseup",a.onselectionend),a.bind(a.cursor,"mouseup",a.onselectionend),a.cursorh&&a.bind(a.cursorh,"mouseup",a.onselectionend),
+a.bind(document,"mousemove",a.onselectiondrag)),a.zoom&&(a.jqbind(a.zoom,"mouseenter",function(){a.canshowonmouseevent&&a.showCursor();a.rail.active=!0}),a.jqbind(a.zoom,"mouseleave",function(){a.rail.active=!1;a.rail.drag||a.hideCursor()})));a.opt.enablemousewheel&&(a.isiframe||a.mousewheel(e.isie&&a.ispage?document:a.win,a.onmousewheel),a.mousewheel(a.rail,a.onmousewheel),a.railh&&a.mousewheel(a.railh,a.onmousewheelhr));a.ispage||e.cantouch||/HTML|^BODY/.test(a.win[0].nodeName)||(a.win.attr("tabindex")||
+a.win.attr({tabindex:O++}),a.jqbind(a.win,"focus",function(b){B=a.getTarget(b).id||!0;a.hasfocus=!0;a.canshowonmouseevent&&a.noticeCursor()}),a.jqbind(a.win,"blur",function(b){B=!1;a.hasfocus=!1}),a.jqbind(a.win,"mouseenter",function(b){F=a.getTarget(b).id||!0;a.hasmousefocus=!0;a.canshowonmouseevent&&a.noticeCursor()}),a.jqbind(a.win,"mouseleave",function(){F=!1;a.hasmousefocus=!1;a.rail.drag||a.hideCursor()}))}a.onkeypress=function(b){if(a.railslocked&&0==a.page.maxh)return!0;b=b?b:window.e;var c=
+a.getTarget(b);if(c&&/INPUT|TEXTAREA|SELECT|OPTION/.test(c.nodeName)&&(!c.getAttribute("type")&&!c.type||!/submit|button|cancel/i.tp)||f(c).attr("contenteditable"))return!0;if(a.hasfocus||a.hasmousefocus&&!B||a.ispage&&!B&&!F){c=b.keyCode;if(a.railslocked&&27!=c)return a.cancelEvent(b);var g=b.ctrlKey||!1,d=b.shiftKey||!1,e=!1;switch(c){case 38:case 63233:a.doScrollBy(72);e=!0;break;case 40:case 63235:a.doScrollBy(-72);e=!0;break;case 37:case 63232:a.railh&&(g?a.doScrollLeft(0):a.doScrollLeftBy(72),
+e=!0);break;case 39:case 63234:a.railh&&(g?a.doScrollLeft(a.page.maxw):a.doScrollLeftBy(-72),e=!0);break;case 33:case 63276:a.doScrollBy(a.view.h);e=!0;break;case 34:case 63277:a.doScrollBy(-a.view.h);e=!0;break;case 36:case 63273:a.railh&&g?a.doScrollPos(0,0):a.doScrollTo(0);e=!0;break;case 35:case 63275:a.railh&&g?a.doScrollPos(a.page.maxw,a.page.maxh):a.doScrollTo(a.page.maxh);e=!0;break;case 32:a.opt.spacebarenabled&&(d?a.doScrollBy(a.view.h):a.doScrollBy(-a.view.h),e=!0);break;case 27:a.zoomactive&&
+(a.doZoom(),e=!0)}if(e)return a.cancelEvent(b)}};a.opt.enablekeyboard&&a.bind(document,e.isopera&&!e.isopera12?"keypress":"keydown",a.onkeypress);a.bind(document,"keydown",function(b){b.ctrlKey&&(a.wheelprevented=!0)});a.bind(document,"keyup",function(b){b.ctrlKey||(a.wheelprevented=!1)});a.bind(window,"blur",function(b){a.wheelprevented=!1});a.bind(window,"resize",a.lazyResize);a.bind(window,"orientationchange",a.lazyResize);a.bind(window,"load",a.lazyResize);if(e.ischrome&&!a.ispage&&!a.haswrapper){var t=
+a.win.attr("style"),m=parseFloat(a.win.css("width"))+1;a.win.css("width",m);a.synched("chromefix",function(){a.win.attr("style",t)})}a.onAttributeChange=function(b){a.lazyResize(a.isieold?250:30)};a.isie11||!1===x||(a.observerbody=new x(function(b){b.forEach(function(b){if("attributes"==b.type)return f("body").hasClass("modal-open")&&f("body").hasClass("modal-dialog")&&!f.contains(f(".modal-dialog")[0],a.doc[0])?a.hide():a.show()});if(document.body.scrollHeight!=a.page.maxh)return a.lazyResize(30)}),
+a.observerbody.observe(document.body,{childList:!0,subtree:!0,characterData:!1,attributes:!0,attributeFilter:["class"]}));a.ispage||a.haswrapper||(!1!==x?(a.observer=new x(function(b){b.forEach(a.onAttributeChange)}),a.observer.observe(a.win[0],{childList:!0,characterData:!1,attributes:!0,subtree:!1}),a.observerremover=new x(function(b){b.forEach(function(b){if(0<b.removedNodes.length)for(var c in b.removedNodes)if(a&&b.removedNodes[c]==a.win[0])return a.remove()})}),a.observerremover.observe(a.win[0].parentNode,
+{childList:!0,characterData:!1,attributes:!1,subtree:!1})):(a.bind(a.win,e.isie&&!e.isie9?"propertychange":"DOMAttrModified",a.onAttributeChange),e.isie9&&a.win[0].attachEvent("onpropertychange",a.onAttributeChange),a.bind(a.win,"DOMNodeRemoved",function(b){b.target==a.win[0]&&a.remove()})));!a.ispage&&a.opt.boxzoom&&a.bind(window,"resize",a.resizeZoom);a.istextarea&&(a.bind(a.win,"keydown",a.lazyResize),a.bind(a.win,"mouseup",a.lazyResize));a.lazyResize(30)}if("IFRAME"==this.doc[0].nodeName){var N=
+function(){a.iframexd=!1;var c;try{c="contentDocument"in this?this.contentDocument:this.contentWindow.document}catch(g){a.iframexd=!0,c=!1}if(a.iframexd)return"console"in window&&console.log("NiceScroll error: policy restriced iframe"),!0;a.forcescreen=!0;a.isiframe&&(a.iframe={doc:f(c),html:a.doc.contents().find("html")[0],body:a.doc.contents().find("body")[0]},a.getContentSize=function(){return{w:Math.max(a.iframe.html.scrollWidth,a.iframe.body.scrollWidth),h:Math.max(a.iframe.html.scrollHeight,
+a.iframe.body.scrollHeight)}},a.docscroll=f(a.iframe.body));if(!e.isios&&a.opt.iframeautoresize&&!a.isiframe){a.win.scrollTop(0);a.doc.height("");var d=Math.max(c.getElementsByTagName("html")[0].scrollHeight,c.body.scrollHeight);a.doc.height(d)}a.lazyResize(30);e.isie7&&a.css(f(a.iframe.html),b);a.css(f(a.iframe.body),b);e.isios&&a.haswrapper&&a.css(f(c.body),{"-webkit-transform":"translate3d(0,0,0)"});"contentWindow"in this?a.bind(this.contentWindow,"scroll",a.onscroll):a.bind(c,"scroll",a.onscroll);
+a.opt.enablemousewheel&&a.mousewheel(c,a.onmousewheel);a.opt.enablekeyboard&&a.bind(c,e.isopera?"keypress":"keydown",a.onkeypress);if(e.cantouch||a.opt.touchbehavior)a.bind(c,"mousedown",a.ontouchstart),a.bind(c,"mousemove",function(b){return a.ontouchmove(b,!0)}),a.opt.grabcursorenabled&&e.cursorgrabvalue&&a.css(f(c.body),{cursor:e.cursorgrabvalue});a.bind(c,"mouseup",a.ontouchend);a.zoom&&(a.opt.dblclickzoom&&a.bind(c,"dblclick",a.doZoom),a.ongesturezoom&&a.bind(c,"gestureend",a.ongesturezoom))};
+this.doc[0].readyState&&"complete"==this.doc[0].readyState&&setTimeout(function(){N.call(a.doc[0],!1)},500);a.bind(this.doc,"load",N)}};this.showCursor=function(b,c){a.cursortimeout&&(clearTimeout(a.cursortimeout),a.cursortimeout=0);if(a.rail){a.autohidedom&&(a.autohidedom.stop().css({opacity:a.opt.cursoropacitymax}),a.cursoractive=!0);a.rail.drag&&1==a.rail.drag.pt||(void 0!==b&&!1!==b&&(a.scroll.y=Math.round(1*b/a.scrollratio.y)),void 0!==c&&(a.scroll.x=Math.round(1*c/a.scrollratio.x)));a.cursor.css({height:a.cursorheight,
+top:a.scroll.y});if(a.cursorh){var d=a.hasreversehr?a.scrollvaluemaxw-a.scroll.x:a.scroll.x;!a.rail.align&&a.rail.visibility?a.cursorh.css({width:a.cursorwidth,left:d+a.rail.width}):a.cursorh.css({width:a.cursorwidth,left:d});a.cursoractive=!0}a.zoom&&a.zoom.stop().css({opacity:a.opt.cursoropacitymax})}};this.hideCursor=function(b){a.cursortimeout||!a.rail||!a.autohidedom||a.hasmousefocus&&"leave"==a.opt.autohidemode||(a.cursortimeout=setTimeout(function(){a.rail.active&&a.showonmouseevent||(a.autohidedom.stop().animate({opacity:a.opt.cursoropacitymin}),
+a.zoom&&a.zoom.stop().animate({opacity:a.opt.cursoropacitymin}),a.cursoractive=!1);a.cursortimeout=0},b||a.opt.hidecursordelay))};this.noticeCursor=function(b,c,d){a.showCursor(c,d);a.rail.active||a.hideCursor(b)};this.getContentSize=a.ispage?function(){return{w:Math.max(document.body.scrollWidth,document.documentElement.scrollWidth),h:Math.max(document.body.scrollHeight,document.documentElement.scrollHeight)}}:a.haswrapper?function(){return{w:a.doc.outerWidth()+parseInt(a.win.css("paddingLeft"))+
+parseInt(a.win.css("paddingRight")),h:a.doc.outerHeight()+parseInt(a.win.css("paddingTop"))+parseInt(a.win.css("paddingBottom"))}}:function(){return{w:a.docscroll[0].scrollWidth,h:a.docscroll[0].scrollHeight}};this.onResize=function(b,c){if(!a||!a.win)return!1;if(!a.haswrapper&&!a.ispage){if("none"==a.win.css("display"))return a.visibility&&a.hideRail().hideRailHr(),!1;a.hidden||a.visibility||a.showRail().showRailHr()}var d=a.page.maxh,e=a.page.maxw,f=a.view.h,k=a.view.w;a.view={w:a.ispage?a.win.width():
+parseInt(a.win[0].clientWidth),h:a.ispage?a.win.height():parseInt(a.win[0].clientHeight)};a.page=c?c:a.getContentSize();a.page.maxh=Math.max(0,a.page.h-a.view.h);a.page.maxw=Math.max(0,a.page.w-a.view.w);if(a.page.maxh==d&&a.page.maxw==e&&a.view.w==k&&a.view.h==f){if(a.ispage)return a;d=a.win.offset();if(a.lastposition&&(e=a.lastposition,e.top==d.top&&e.left==d.left))return a;a.lastposition=d}0==a.page.maxh?(a.hideRail(),a.scrollvaluemax=0,a.scroll.y=0,a.scrollratio.y=0,a.cursorheight=0,a.setScrollTop(0),
+a.rail&&(a.rail.scrollable=!1)):(a.page.maxh-=a.opt.railpadding.top+a.opt.railpadding.bottom,a.rail.scrollable=!0);0==a.page.maxw?(a.hideRailHr(),a.scrollvaluemaxw=0,a.scroll.x=0,a.scrollratio.x=0,a.cursorwidth=0,a.setScrollLeft(0),a.railh&&(a.railh.scrollable=!1)):(a.page.maxw-=a.opt.railpadding.left+a.opt.railpadding.right,a.railh&&(a.railh.scrollable=a.opt.horizrailenabled));a.railslocked=a.locked||0==a.page.maxh&&0==a.page.maxw;if(a.railslocked)return a.ispage||a.updateScrollBar(a.view),!1;a.hidden||
+a.visibility?!a.railh||a.hidden||a.railh.visibility||a.showRailHr():a.showRail().showRailHr();a.istextarea&&a.win.css("resize")&&"none"!=a.win.css("resize")&&(a.view.h-=20);a.cursorheight=Math.min(a.view.h,Math.round(a.view.h/a.page.h*a.view.h));a.cursorheight=a.opt.cursorfixedheight?a.opt.cursorfixedheight:Math.max(a.opt.cursorminheight,a.cursorheight);a.cursorwidth=Math.min(a.view.w,Math.round(a.view.w/a.page.w*a.view.w));a.cursorwidth=a.opt.cursorfixedheight?a.opt.cursorfixedheight:Math.max(a.opt.cursorminheight,
+a.cursorwidth);a.scrollvaluemax=a.view.h-a.cursorheight-a.cursor.hborder-(a.opt.railpadding.top+a.opt.railpadding.bottom);a.railh&&(a.railh.width=0<a.page.maxh?a.view.w-a.rail.width:a.view.w,a.scrollvaluemaxw=a.railh.width-a.cursorwidth-a.cursorh.wborder-(a.opt.railpadding.left+a.opt.railpadding.right));a.ispage||a.updateScrollBar(a.view);a.scrollratio={x:a.page.maxw/a.scrollvaluemaxw,y:a.page.maxh/a.scrollvaluemax};a.getScrollTop()>a.page.maxh?a.doScrollTop(a.page.maxh):(a.scroll.y=Math.round(a.getScrollTop()*
+(1/a.scrollratio.y)),a.scroll.x=Math.round(a.getScrollLeft()*(1/a.scrollratio.x)),a.cursoractive&&a.noticeCursor());a.scroll.y&&0==a.getScrollTop()&&a.doScrollTo(Math.floor(a.scroll.y*a.scrollratio.y));return a};this.resize=a.onResize;this.hlazyresize=0;this.lazyResize=function(b){a.haswrapper||a.hide();a.hlazyresize&&clearTimeout(a.hlazyresize);a.hlazyresize=setTimeout(function(){a&&a.show().resize()},240);return a};this.jqbind=function(b,c,d){a.events.push({e:b,n:c,f:d,q:!0});f(b).bind(c,d)};this.mousewheel=
+function(b,c,d){b="jquery"in b?b[0]:b;if("onwheel"in document.createElement("div"))a._bind(b,"wheel",c,d||!1);else{var e=void 0!==document.onmousewheel?"mousewheel":"DOMMouseScroll";q(b,e,c,d||!1);"DOMMouseScroll"==e&&q(b,"MozMousePixelScroll",c,d||!1)}};e.haseventlistener?(this.bind=function(b,c,d,e){a._bind("jquery"in b?b[0]:b,c,d,e||!1)},this._bind=function(b,c,d,e){a.events.push({e:b,n:c,f:d,b:e,q:!1});b.addEventListener(c,d,e||!1)},this.cancelEvent=function(a){if(!a)return!1;a=a.original?a.original:
+a;a.cancelable&&a.preventDefault();a.stopPropagation();a.preventManipulation&&a.preventManipulation();return!1},this.stopPropagation=function(a){if(!a)return!1;a=a.original?a.original:a;a.stopPropagation();return!1},this._unbind=function(a,c,d,e){a.removeEventListener(c,d,e)}):(this.bind=function(b,c,d,e){var f="jquery"in b?b[0]:b;a._bind(f,c,function(b){(b=b||window.event||!1)&&b.srcElement&&(b.target=b.srcElement);"pageY"in b||(b.pageX=b.clientX+document.documentElement.scrollLeft,b.pageY=b.clientY+
+document.documentElement.scrollTop);return!1===d.call(f,b)||!1===e?a.cancelEvent(b):!0})},this._bind=function(b,c,d,e){a.events.push({e:b,n:c,f:d,b:e,q:!1});b.attachEvent?b.attachEvent("on"+c,d):b["on"+c]=d},this.cancelEvent=function(a){a=window.event||!1;if(!a)return!1;a.cancelBubble=!0;a.cancel=!0;return a.returnValue=!1},this.stopPropagation=function(a){a=window.event||!1;if(!a)return!1;a.cancelBubble=!0;return!1},this._unbind=function(a,c,d,e){a.detachEvent?a.detachEvent("on"+c,d):a["on"+c]=!1});
+this.unbindAll=function(){for(var b=0;b<a.events.length;b++){var c=a.events[b];c.q?c.e.unbind(c.n,c.f):a._unbind(c.e,c.n,c.f,c.b)}};this.showRail=function(){0==a.page.maxh||!a.ispage&&"none"==a.win.css("display")||(a.visibility=!0,a.rail.visibility=!0,a.rail.css("display","block"));return a};this.showRailHr=function(){if(!a.railh)return a;0==a.page.maxw||!a.ispage&&"none"==a.win.css("display")||(a.railh.visibility=!0,a.railh.css("display","block"));return a};this.hideRail=function(){a.visibility=
+!1;a.rail.visibility=!1;a.rail.css("display","none");return a};this.hideRailHr=function(){if(!a.railh)return a;a.railh.visibility=!1;a.railh.css("display","none");return a};this.show=function(){a.hidden=!1;a.railslocked=!1;return a.showRail().showRailHr()};this.hide=function(){a.hidden=!0;a.railslocked=!0;return a.hideRail().hideRailHr()};this.toggle=function(){return a.hidden?a.show():a.hide()};this.remove=function(){a.stop();a.cursortimeout&&clearTimeout(a.cursortimeout);for(var b in a.delaylist)a.delaylist[b]&&
+w(a.delaylist[b].h);a.doZoomOut();a.unbindAll();e.isie9&&a.win[0].detachEvent("onpropertychange",a.onAttributeChange);!1!==a.observer&&a.observer.disconnect();!1!==a.observerremover&&a.observerremover.disconnect();!1!==a.observerbody&&a.observerbody.disconnect();a.events=null;a.cursor&&a.cursor.remove();a.cursorh&&a.cursorh.remove();a.rail&&a.rail.remove();a.railh&&a.railh.remove();a.zoom&&a.zoom.remove();for(b=0;b<a.saved.css.length;b++){var c=a.saved.css[b];c[0].css(c[1],void 0===c[2]?"":c[2])}a.saved=
+!1;a.me.data("__nicescroll","");var d=f.nicescroll;d.each(function(b){if(this&&this.id===a.id){delete d[b];for(var c=++b;c<d.length;c++,b++)d[b]=d[c];d.length--;d.length&&delete d[d.length]}});for(var k in a)a[k]=null,delete a[k];a=null};this.scrollstart=function(b){this.onscrollstart=b;return a};this.scrollend=function(b){this.onscrollend=b;return a};this.scrollcancel=function(b){this.onscrollcancel=b;return a};this.zoomin=function(b){this.onzoomin=b;return a};this.zoomout=function(b){this.onzoomout=
+b;return a};this.isScrollable=function(a){a=a.target?a.target:a;if("OPTION"==a.nodeName)return!0;for(;a&&1==a.nodeType&&!/^BODY|HTML/.test(a.nodeName);){var c=f(a),c=c.css("overflowY")||c.css("overflowX")||c.css("overflow")||"";if(/scroll|auto/.test(c))return a.clientHeight!=a.scrollHeight;a=a.parentNode?a.parentNode:!1}return!1};this.getViewport=function(a){for(a=a&&a.parentNode?a.parentNode:!1;a&&1==a.nodeType&&!/^BODY|HTML/.test(a.nodeName);){var c=f(a);if(/fixed|absolute/.test(c.css("position")))return c;
+var d=c.css("overflowY")||c.css("overflowX")||c.css("overflow")||"";if(/scroll|auto/.test(d)&&a.clientHeight!=a.scrollHeight||0<c.getNiceScroll().length)return c;a=a.parentNode?a.parentNode:!1}return!1};this.triggerScrollEnd=function(){if(a.onscrollend){var b=a.getScrollLeft(),c=a.getScrollTop();a.onscrollend.call(a,{type:"scrollend",current:{x:b,y:c},end:{x:b,y:c}})}};this.onmousewheel=function(b){if(!a.wheelprevented){if(a.railslocked)return a.debounced("checkunlock",a.resize,250),!0;if(a.rail.drag)return a.cancelEvent(b);
+"auto"==a.opt.oneaxismousemode&&0!=b.deltaX&&(a.opt.oneaxismousemode=!1);if(a.opt.oneaxismousemode&&0==b.deltaX&&!a.rail.scrollable)return a.railh&&a.railh.scrollable?a.onmousewheelhr(b):!0;var c=+new Date,d=!1;a.opt.preservenativescrolling&&a.checkarea+600<c&&(a.nativescrollingarea=a.isScrollable(b),d=!0);a.checkarea=c;if(a.nativescrollingarea)return!0;if(b=t(b,!1,d))a.checkarea=0;return b}};this.onmousewheelhr=function(b){if(!a.wheelprevented){if(a.railslocked||!a.railh.scrollable)return!0;if(a.rail.drag)return a.cancelEvent(b);
+var c=+new Date,d=!1;a.opt.preservenativescrolling&&a.checkarea+600<c&&(a.nativescrollingarea=a.isScrollable(b),d=!0);a.checkarea=c;return a.nativescrollingarea?!0:a.railslocked?a.cancelEvent(b):t(b,!0,d)}};this.stop=function(){a.cancelScroll();a.scrollmon&&a.scrollmon.stop();a.cursorfreezed=!1;a.scroll.y=Math.round(a.getScrollTop()*(1/a.scrollratio.y));a.noticeCursor();return a};this.getTransitionSpeed=function(b){b=Math.min(Math.round(10*a.opt.scrollspeed),Math.round(b/20*a.opt.scrollspeed));return 20<
+b?b:0};a.opt.smoothscroll?a.ishwscroll&&e.hastransition&&a.opt.usetransition&&a.opt.smoothscroll?(this.prepareTransition=function(b,c){var d=c?20<b?b:0:a.getTransitionSpeed(b),f=d?e.prefixstyle+"transform "+d+"ms ease-out":"";a.lasttransitionstyle&&a.lasttransitionstyle==f||(a.lasttransitionstyle=f,a.doc.css(e.transitionstyle,f));return d},this.doScrollLeft=function(b,c){var d=a.scrollrunning?a.newscrolly:a.getScrollTop();a.doScrollPos(b,d,c)},this.doScrollTop=function(b,c){var d=a.scrollrunning?
+a.newscrollx:a.getScrollLeft();a.doScrollPos(d,b,c)},this.doScrollPos=function(b,c,d){var f=a.getScrollTop(),k=a.getScrollLeft();(0>(a.newscrolly-f)*(c-f)||0>(a.newscrollx-k)*(b-k))&&a.cancelScroll();0==a.opt.bouncescroll&&(0>c?c=0:c>a.page.maxh&&(c=a.page.maxh),0>b?b=0:b>a.page.maxw&&(b=a.page.maxw));if(a.scrollrunning&&b==a.newscrollx&&c==a.newscrolly)return!1;a.newscrolly=c;a.newscrollx=b;a.newscrollspeed=d||!1;if(a.timer)return!1;a.timer=setTimeout(function(){var d=a.getScrollTop(),f=a.getScrollLeft(),
+k=Math.round(Math.sqrt(Math.pow(b-f,2)+Math.pow(c-d,2))),k=a.newscrollspeed&&1<a.newscrollspeed?a.newscrollspeed:a.getTransitionSpeed(k);a.newscrollspeed&&1>=a.newscrollspeed&&(k*=a.newscrollspeed);a.prepareTransition(k,!0);a.timerscroll&&a.timerscroll.tm&&clearInterval(a.timerscroll.tm);0<k&&(!a.scrollrunning&&a.onscrollstart&&a.onscrollstart.call(a,{type:"scrollstart",current:{x:f,y:d},request:{x:b,y:c},end:{x:a.newscrollx,y:a.newscrolly},speed:k}),e.transitionend?a.scrollendtrapped||(a.scrollendtrapped=
+!0,a.bind(a.doc,e.transitionend,a.onScrollTransitionEnd,!1)):(a.scrollendtrapped&&clearTimeout(a.scrollendtrapped),a.scrollendtrapped=setTimeout(a.onScrollTransitionEnd,k)),a.timerscroll={bz:new D(d,a.newscrolly,k,0,0,.58,1),bh:new D(f,a.newscrollx,k,0,0,.58,1)},a.cursorfreezed||(a.timerscroll.tm=setInterval(function(){a.showCursor(a.getScrollTop(),a.getScrollLeft())},60)));a.synched("doScroll-set",function(){a.timer=0;a.scrollendtrapped&&(a.scrollrunning=!0);a.setScrollTop(a.newscrolly);a.setScrollLeft(a.newscrollx);
+if(!a.scrollendtrapped)a.onScrollTransitionEnd()})},50)},this.cancelScroll=function(){if(!a.scrollendtrapped)return!0;var b=a.getScrollTop(),c=a.getScrollLeft();a.scrollrunning=!1;e.transitionend||clearTimeout(e.transitionend);a.scrollendtrapped=!1;a._unbind(a.doc[0],e.transitionend,a.onScrollTransitionEnd);a.prepareTransition(0);a.setScrollTop(b);a.railh&&a.setScrollLeft(c);a.timerscroll&&a.timerscroll.tm&&clearInterval(a.timerscroll.tm);a.timerscroll=!1;a.cursorfreezed=!1;a.showCursor(b,c);return a},
+this.onScrollTransitionEnd=function(){a.scrollendtrapped&&a._unbind(a.doc[0],e.transitionend,a.onScrollTransitionEnd);a.scrollendtrapped=!1;a.prepareTransition(0);a.timerscroll&&a.timerscroll.tm&&clearInterval(a.timerscroll.tm);a.timerscroll=!1;var b=a.getScrollTop(),c=a.getScrollLeft();a.setScrollTop(b);a.railh&&a.setScrollLeft(c);a.noticeCursor(!1,b,c);a.cursorfreezed=!1;0>b?b=0:b>a.page.maxh&&(b=a.page.maxh);0>c?c=0:c>a.page.maxw&&(c=a.page.maxw);if(b!=a.newscrolly||c!=a.newscrollx)return a.doScrollPos(c,
+b,a.opt.snapbackspeed);a.onscrollend&&a.scrollrunning&&a.triggerScrollEnd();a.scrollrunning=!1}):(this.doScrollLeft=function(b,c){var d=a.scrollrunning?a.newscrolly:a.getScrollTop();a.doScrollPos(b,d,c)},this.doScrollTop=function(b,c){var d=a.scrollrunning?a.newscrollx:a.getScrollLeft();a.doScrollPos(d,b,c)},this.doScrollPos=function(b,c,d){function e(){if(a.cancelAnimationFrame)return!0;a.scrollrunning=!0;if(p=1-p)return a.timer=v(e)||1;var b=0,c,d,f=d=a.getScrollTop();if(a.dst.ay){f=a.bzscroll?
+a.dst.py+a.bzscroll.getNow()*a.dst.ay:a.newscrolly;c=f-d;if(0>c&&f<a.newscrolly||0<c&&f>a.newscrolly)f=a.newscrolly;a.setScrollTop(f);f==a.newscrolly&&(b=1)}else b=1;d=c=a.getScrollLeft();if(a.dst.ax){d=a.bzscroll?a.dst.px+a.bzscroll.getNow()*a.dst.ax:a.newscrollx;c=d-c;if(0>c&&d<a.newscrollx||0<c&&d>a.newscrollx)d=a.newscrollx;a.setScrollLeft(d);d==a.newscrollx&&(b+=1)}else b+=1;2==b?(a.timer=0,a.cursorfreezed=!1,a.bzscroll=!1,a.scrollrunning=!1,0>f?f=0:f>a.page.maxh&&(f=Math.max(0,a.page.maxh)),
+0>d?d=0:d>a.page.maxw&&(d=a.page.maxw),d!=a.newscrollx||f!=a.newscrolly?a.doScrollPos(d,f):a.onscrollend&&a.triggerScrollEnd()):a.timer=v(e)||1}c=void 0===c||!1===c?a.getScrollTop(!0):c;if(a.timer&&a.newscrolly==c&&a.newscrollx==b)return!0;a.timer&&w(a.timer);a.timer=0;var f=a.getScrollTop(),k=a.getScrollLeft();(0>(a.newscrolly-f)*(c-f)||0>(a.newscrollx-k)*(b-k))&&a.cancelScroll();a.newscrolly=c;a.newscrollx=b;a.bouncescroll&&a.rail.visibility||(0>a.newscrolly?a.newscrolly=0:a.newscrolly>a.page.maxh&&
+(a.newscrolly=a.page.maxh));a.bouncescroll&&a.railh.visibility||(0>a.newscrollx?a.newscrollx=0:a.newscrollx>a.page.maxw&&(a.newscrollx=a.page.maxw));a.dst={};a.dst.x=b-k;a.dst.y=c-f;a.dst.px=k;a.dst.py=f;var h=Math.round(Math.sqrt(Math.pow(a.dst.x,2)+Math.pow(a.dst.y,2)));a.dst.ax=a.dst.x/h;a.dst.ay=a.dst.y/h;var l=0,n=h;0==a.dst.x?(l=f,n=c,a.dst.ay=1,a.dst.py=0):0==a.dst.y&&(l=k,n=b,a.dst.ax=1,a.dst.px=0);h=a.getTransitionSpeed(h);d&&1>=d&&(h*=d);a.bzscroll=0<h?a.bzscroll?a.bzscroll.update(n,h):
+new D(l,n,h,0,1,0,1):!1;if(!a.timer){(f==a.page.maxh&&c>=a.page.maxh||k==a.page.maxw&&b>=a.page.maxw)&&a.checkContentSize();var p=1;a.cancelAnimationFrame=!1;a.timer=1;a.onscrollstart&&!a.scrollrunning&&a.onscrollstart.call(a,{type:"scrollstart",current:{x:k,y:f},request:{x:b,y:c},end:{x:a.newscrollx,y:a.newscrolly},speed:h});e();(f==a.page.maxh&&c>=f||k==a.page.maxw&&b>=k)&&a.checkContentSize();a.noticeCursor()}},this.cancelScroll=function(){a.timer&&w(a.timer);a.timer=0;a.bzscroll=!1;a.scrollrunning=
+!1;return a}):(this.doScrollLeft=function(b,c){var d=a.getScrollTop();a.doScrollPos(b,d,c)},this.doScrollTop=function(b,c){var d=a.getScrollLeft();a.doScrollPos(d,b,c)},this.doScrollPos=function(b,c,d){var e=b>a.page.maxw?a.page.maxw:b;0>e&&(e=0);var f=c>a.page.maxh?a.page.maxh:c;0>f&&(f=0);a.synched("scroll",function(){a.setScrollTop(f);a.setScrollLeft(e)})},this.cancelScroll=function(){});this.doScrollBy=function(b,c){var d=0,d=c?Math.floor((a.scroll.y-b)*a.scrollratio.y):(a.timer?a.newscrolly:
+a.getScrollTop(!0))-b;if(a.bouncescroll){var e=Math.round(a.view.h/2);d<-e?d=-e:d>a.page.maxh+e&&(d=a.page.maxh+e)}a.cursorfreezed=!1;e=a.getScrollTop(!0);if(0>d&&0>=e)return a.noticeCursor();if(d>a.page.maxh&&e>=a.page.maxh)return a.checkContentSize(),a.noticeCursor();a.doScrollTop(d)};this.doScrollLeftBy=function(b,c){var d=0,d=c?Math.floor((a.scroll.x-b)*a.scrollratio.x):(a.timer?a.newscrollx:a.getScrollLeft(!0))-b;if(a.bouncescroll){var e=Math.round(a.view.w/2);d<-e?d=-e:d>a.page.maxw+e&&(d=a.page.maxw+
+e)}a.cursorfreezed=!1;e=a.getScrollLeft(!0);if(0>d&&0>=e||d>a.page.maxw&&e>=a.page.maxw)return a.noticeCursor();a.doScrollLeft(d)};this.doScrollTo=function(b,c){a.cursorfreezed=!1;a.doScrollTop(b)};this.checkContentSize=function(){var b=a.getContentSize();b.h==a.page.h&&b.w==a.page.w||a.resize(!1,b)};a.onscroll=function(b){a.rail.drag||a.cursorfreezed||a.synched("scroll",function(){a.scroll.y=Math.round(a.getScrollTop()*(1/a.scrollratio.y));a.railh&&(a.scroll.x=Math.round(a.getScrollLeft()*(1/a.scrollratio.x)));
+a.noticeCursor()})};a.bind(a.docscroll,"scroll",a.onscroll);this.doZoomIn=function(b){if(!a.zoomactive){a.zoomactive=!0;a.zoomrestore={style:{}};var c="position top left zIndex backgroundColor marginTop marginBottom marginLeft marginRight".split(" "),d=a.win[0].style,k;for(k in c){var h=c[k];a.zoomrestore.style[h]=void 0!==d[h]?d[h]:""}a.zoomrestore.style.width=a.win.css("width");a.zoomrestore.style.height=a.win.css("height");a.zoomrestore.padding={w:a.win.outerWidth()-a.win.width(),h:a.win.outerHeight()-
+a.win.height()};e.isios4&&(a.zoomrestore.scrollTop=f(window).scrollTop(),f(window).scrollTop(0));a.win.css({position:e.isios4?"absolute":"fixed",top:0,left:0,zIndex:A+100,margin:0});c=a.win.css("backgroundColor");(""==c||/transparent|rgba\(0, 0, 0, 0\)|rgba\(0,0,0,0\)/.test(c))&&a.win.css("backgroundColor","#fff");a.rail.css({zIndex:A+101});a.zoom.css({zIndex:A+102});a.zoom.css("backgroundPosition","0px -18px");a.resizeZoom();a.onzoomin&&a.onzoomin.call(a);return a.cancelEvent(b)}};this.doZoomOut=
+function(b){if(a.zoomactive)return a.zoomactive=!1,a.win.css("margin",""),a.win.css(a.zoomrestore.style),e.isios4&&f(window).scrollTop(a.zoomrestore.scrollTop),a.rail.css({"z-index":a.zindex}),a.zoom.css({"z-index":a.zindex}),a.zoomrestore=!1,a.zoom.css("backgroundPosition","0px 0px"),a.onResize(),a.onzoomout&&a.onzoomout.call(a),a.cancelEvent(b)};this.doZoom=function(b){return a.zoomactive?a.doZoomOut(b):a.doZoomIn(b)};this.resizeZoom=function(){if(a.zoomactive){var b=a.getScrollTop();a.win.css({width:f(window).width()-
+a.zoomrestore.padding.w+"px",height:f(window).height()-a.zoomrestore.padding.h+"px"});a.onResize();a.setScrollTop(Math.min(a.page.maxh,b))}};this.init();f.nicescroll.push(this)},M=function(f){var c=this;this.nc=f;this.steptime=this.lasttime=this.speedy=this.speedx=this.lasty=this.lastx=0;this.snapy=this.snapx=!1;this.demuly=this.demulx=0;this.lastscrolly=this.lastscrollx=-1;this.timer=this.chky=this.chkx=0;this.time=function(){return+new Date};this.reset=function(f,h){c.stop();var d=c.time();c.steptime=
+0;c.lasttime=d;c.speedx=0;c.speedy=0;c.lastx=f;c.lasty=h;c.lastscrollx=-1;c.lastscrolly=-1};this.update=function(f,h){var d=c.time();c.steptime=d-c.lasttime;c.lasttime=d;var d=h-c.lasty,q=f-c.lastx,t=c.nc.getScrollTop(),a=c.nc.getScrollLeft(),t=t+d,a=a+q;c.snapx=0>a||a>c.nc.page.maxw;c.snapy=0>t||t>c.nc.page.maxh;c.speedx=q;c.speedy=d;c.lastx=f;c.lasty=h};this.stop=function(){c.nc.unsynched("domomentum2d");c.timer&&clearTimeout(c.timer);c.timer=0;c.lastscrollx=-1;c.lastscrolly=-1};this.doSnapy=function(f,
+h){var d=!1;0>h?(h=0,d=!0):h>c.nc.page.maxh&&(h=c.nc.page.maxh,d=!0);0>f?(f=0,d=!0):f>c.nc.page.maxw&&(f=c.nc.page.maxw,d=!0);d?c.nc.doScrollPos(f,h,c.nc.opt.snapbackspeed):c.nc.triggerScrollEnd()};this.doMomentum=function(f){var h=c.time(),d=f?h+f:c.lasttime;f=c.nc.getScrollLeft();var q=c.nc.getScrollTop(),t=c.nc.page.maxh,a=c.nc.page.maxw;c.speedx=0<a?Math.min(60,c.speedx):0;c.speedy=0<t?Math.min(60,c.speedy):0;d=d&&60>=h-d;if(0>q||q>t||0>f||f>a)d=!1;f=c.speedx&&d?c.speedx:!1;if(c.speedy&&d&&c.speedy||
+f){var r=Math.max(16,c.steptime);50<r&&(f=r/50,c.speedx*=f,c.speedy*=f,r=50);c.demulxy=0;c.lastscrollx=c.nc.getScrollLeft();c.chkx=c.lastscrollx;c.lastscrolly=c.nc.getScrollTop();c.chky=c.lastscrolly;var p=c.lastscrollx,e=c.lastscrolly,v=function(){var d=600<c.time()-h?.04:.02;c.speedx&&(p=Math.floor(c.lastscrollx-c.speedx*(1-c.demulxy)),c.lastscrollx=p,0>p||p>a)&&(d=.1);c.speedy&&(e=Math.floor(c.lastscrolly-c.speedy*(1-c.demulxy)),c.lastscrolly=e,0>e||e>t)&&(d=.1);c.demulxy=Math.min(1,c.demulxy+
+d);c.nc.synched("domomentum2d",function(){c.speedx&&(c.nc.getScrollLeft(),c.chkx=p,c.nc.setScrollLeft(p));c.speedy&&(c.nc.getScrollTop(),c.chky=e,c.nc.setScrollTop(e));c.timer||(c.nc.hideCursor(),c.doSnapy(p,e))});1>c.demulxy?c.timer=setTimeout(v,r):(c.stop(),c.nc.hideCursor(),c.doSnapy(p,e))};v()}else c.doSnapy(c.nc.getScrollLeft(),c.nc.getScrollTop())}},y=f.fn.scrollTop;f.cssHooks.pageYOffset={get:function(h,c,k){return(c=f.data(h,"__nicescroll")||!1)&&c.ishwscroll?c.getScrollTop():y.call(h)},set:function(h,
+c){var k=f.data(h,"__nicescroll")||!1;k&&k.ishwscroll?k.setScrollTop(parseInt(c)):y.call(h,c);return this}};f.fn.scrollTop=function(h){if(void 0===h){var c=this[0]?f.data(this[0],"__nicescroll")||!1:!1;return c&&c.ishwscroll?c.getScrollTop():y.call(this)}return this.each(function(){var c=f.data(this,"__nicescroll")||!1;c&&c.ishwscroll?c.setScrollTop(parseInt(h)):y.call(f(this),h)})};var z=f.fn.scrollLeft;f.cssHooks.pageXOffset={get:function(h,c,k){return(c=f.data(h,"__nicescroll")||!1)&&c.ishwscroll?
+c.getScrollLeft():z.call(h)},set:function(h,c){var k=f.data(h,"__nicescroll")||!1;k&&k.ishwscroll?k.setScrollLeft(parseInt(c)):z.call(h,c);return this}};f.fn.scrollLeft=function(h){if(void 0===h){var c=this[0]?f.data(this[0],"__nicescroll")||!1:!1;return c&&c.ishwscroll?c.getScrollLeft():z.call(this)}return this.each(function(){var c=f.data(this,"__nicescroll")||!1;c&&c.ishwscroll?c.setScrollLeft(parseInt(h)):z.call(f(this),h)})};var E=function(h){var c=this;this.length=0;this.name="nicescrollarray";
+this.each=function(d){f.each(c,d);return c};this.push=function(d){c[c.length]=d;c.length++};this.eq=function(d){return c[d]};if(h)for(var k=0;k<h.length;k++){var l=f.data(h[k],"__nicescroll")||!1;l&&(this[this.length]=l,this.length++)}return this};(function(f,c,k){for(var l=0;l<c.length;l++)k(f,c[l])})(E.prototype,"show hide toggle onResize resize remove stop doScrollPos".split(" "),function(f,c){f[c]=function(){var f=arguments;return this.each(function(){this[c].apply(this,f)})}});f.fn.getNiceScroll=
+function(h){return void 0===h?new E(this):this[h]&&f.data(this[h],"__nicescroll")||!1};f.expr[":"].nicescroll=function(h){return void 0!==f.data(h,"__nicescroll")};f.fn.niceScroll=function(h,c){void 0!==c||"object"!=typeof h||"jquery"in h||(c=h,h=!1);c=f.extend({},c);var k=new E;void 0===c&&(c={});h&&(c.doc=f(h),c.win=f(this));var l=!("doc"in c);l||"win"in c||(c.win=f(this));this.each(function(){var d=f(this).data("__nicescroll")||!1;d||(c.doc=l?f(this):c.doc,d=new S(c,f(this)),f(this).data("__nicescroll",
+d));k.push(d)});return 1==k.length?k[0]:k};window.NiceScroll={getjQuery:function(){return f}};f.nicescroll||(f.nicescroll=new E,f.nicescroll.options=K)});
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/jquery.pagination.js b/pluss-manage-page/src/main/resources/static/resources/js/jquery.pagination.js
new file mode 100644
index 0000000..642e933
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/jquery.pagination.js
@@ -0,0 +1,256 @@
+/**
+ * pagination.js 1.5.1
+ * A jQuery plugin to provide simple yet fully customisable pagination.
+ * @version 1.5.1
+ * @author mss
+ * @url https://github.com/Maxiaoxiang/jQuery-plugins
+ *
+ * @调用方法
+ * $(selector).pagination(option, callback);
+ * -此处callback是初始化调用，option里的callback是点击页码后调用
+ * 
+ * -- example --
+ * $(selector).pagination({
+ *     ... // 配置参数
+ *     callback: function(api) {
+ *         console.log('点击页码调用该回调'); //切换页码时执行一次回调
+ *     }
+ * }, function(){
+ *     console.log('初始化'); //插件初始化时调用该方法，比如请求第一次接口来初始化分页配置
+ * });
+ */
+;
+(function (factory) {
+    if (typeof define === "function" && (define.amd || define.cmd) && !jQuery) {
+        // AMD或CMD
+        define(["jquery"], factory);
+    } else if (typeof module === 'object' && module.exports) {
+        // Node/CommonJS
+        module.exports = function (root, jQuery) {
+            if (jQuery === undefined) {
+                if (typeof window !== 'undefined') {
+                    jQuery = require('jquery');
+                } else {
+                    jQuery = require('jquery')(root);
+                }
+            }
+            factory(jQuery);
+            return jQuery;
+        };
+    } else {
+        //Browser globals
+        factory(jQuery);
+    }
+}(function ($) {
+
+    //配置参数
+    var defaults = {
+        totalData: 0, //数据总条数
+        showData: 0, //每页显示的条数
+        pageCount: 9, //总页数,默认为9
+        current: 1, //当前第几页
+        prevCls: 'prev', //上一页class
+        nextCls: 'next', //下一页class
+        prevContent: '<', //上一页内容
+        nextContent: '>', //下一页内容
+        activeCls: 'active', //当前页选中状态
+        coping: false, //首页和尾页
+        isHide: false, //当前页数为0页或者1页时不显示分页
+        homePage: '', //首页节点内容
+        endPage: '', //尾页节点内容
+        keepShowPN: false, //是否一直显示上一页下一页
+        mode: 'unfixed', //分页模式，unfixed：不固定页码数量，fixed：固定页码数量
+        count: 4, //mode为unfixed时显示当前选中页前后页数，mode为fixed显示页码总数
+        jump: false, //跳转到指定页数
+        jumpIptCls: 'jump-ipt', //文本框内容
+        jumpBtnCls: 'jump-btn', //跳转按钮
+        jumpBtn: '跳转', //跳转按钮文本
+        callback: function () {} //回调
+    };
+
+    var Pagination = function (element, options) {
+        //全局变量
+        var opts = options, //配置
+            current, //当前页
+            $document = $(document),
+            $obj = $(element); //容器
+
+        /**
+         * 设置总页数
+         * @param {int} page 页码
+         * @return opts.pageCount 总页数配置
+         */
+        this.setPageCount = function (page) {
+            return opts.pageCount = page;
+        };
+
+        /**
+         * 获取总页数
+         * 如果配置了总条数和每页显示条数，将会自动计算总页数并略过总页数配置，反之
+         * @return {int} 总页数
+         */
+        this.getPageCount = function () {
+            return opts.totalData && opts.showData ? Math.ceil(parseInt(opts.totalData) / opts.showData) : opts.pageCount;
+        };
+
+        /**
+         * 获取当前页
+         * @return {int} 当前页码
+         */
+        this.getCurrent = function () {
+            return current;
+        };
+
+        /**
+         * 填充数据
+         * @param {int} 页码
+         */
+        this.filling = function (index) {
+            var html = '';
+            current = parseInt(index) || parseInt(opts.current); //当前页码
+            var pageCount = this.getPageCount(); //获取的总页数
+            switch (opts.mode) { //配置模式
+                case 'fixed': //固定按钮模式
+                    html += '<a href="javascript:;" class="' + opts.prevCls + '">' + opts.prevContent + '</a>';
+                    if (opts.coping) {
+                        var home = opts.coping && opts.homePage ? opts.homePage : '1';
+                        html += '<a href="javascript:;" data-page="1">' + home + '</a>';
+                    }
+                    var start = current > opts.count - 1 ? current + opts.count - 1 > pageCount ? current - (opts.count - (pageCount - current)) : current - 2 : 1;
+                    var end = current + opts.count - 1 > pageCount ? pageCount : start + opts.count;
+                    for (; start <= end; start++) {
+                        if (start != current) {
+                            html += '<a href="javascript:;" data-page="' + start + '">' + start + '</a>';
+                        } else {
+                            html += '<span class="' + opts.activeCls + '">' + start + '</span>';
+                        }
+                    }
+                    if (opts.coping) {
+                        var _end = opts.coping && opts.endPage ? opts.endPage : pageCount;
+                        html += '<a href="javascript:;" data-page="' + pageCount + '">' + _end + '</a>';
+                    }
+                    html += '<a href="javascript:;" class="' + opts.nextCls + '">' + opts.nextContent + '</a>';
+                    break;
+                case 'unfixed': //不固定按钮模式
+                    if (opts.keepShowPN || current > 1) { //上一页
+                        html += '<a href="javascript:;" class="' + opts.prevCls + '">' + opts.prevContent + '</a>';
+                    } else {
+                        if (opts.keepShowPN == false) {
+                            $obj.find('.' + opts.prevCls) && $obj.find('.' + opts.prevCls).remove();
+                        }
+                    }
+                    if (current >= opts.count + 2 && current != 1 && pageCount != opts.count) {
+                        var home = opts.coping && opts.homePage ? opts.homePage : '1';
+                        html += opts.coping ? '<a href="javascript:;" data-page="1">' + home + '</a><span>...</span>' : '';
+                    }
+                    var start = (current - opts.count) <= 1 ? 1 : (current - opts.count);
+                    var end = (current + opts.count) >= pageCount ? pageCount : (current + opts.count);
+                    for (; start <= end; start++) {
+                        if (start <= pageCount && start >= 1) {
+                            if (start != current) {
+                                html += '<a href="javascript:;" data-page="' + start + '">' + start + '</a>';
+                            } else {
+                                html += '<span class="' + opts.activeCls + '">' + start + '</span>';
+                            }
+                        }
+                    }
+                    if (current + opts.count < pageCount && current >= 1 && pageCount > opts.count) {
+                        var end = opts.coping && opts.endPage ? opts.endPage : pageCount;
+                        html += opts.coping ? '<span>...</span><a href="javascript:;" data-page="' + pageCount + '">' + end + '</a>' : '';
+                    }
+                    if (opts.keepShowPN || current < pageCount) { //下一页
+                        html += '<a href="javascript:;" class="' + opts.nextCls + '">' + opts.nextContent + '</a>';
+                    } else {
+                        if (opts.keepShowPN == false) {
+                            $obj.find('.' + opts.nextCls) && $obj.find('.' + opts.nextCls).remove();
+                        }
+                    }
+                    break;
+                case 'easy': //简单模式
+                    break;
+                default:
+            }
+            html += opts.jump ? '<span>到第</span><input type="text" class="' + opts.jumpIptCls + '"><span>页</span><a href="javascript:;" class="' + opts.jumpBtnCls + '">' + opts.jumpBtn + '</a>' : '';
+            $obj.empty().html(html);
+        };
+
+        //绑定事件
+        this.eventBind = function () {
+            var that = this;
+            var pageCount = that.getPageCount(); //总页数
+            var index = 1;
+            $obj.off().on('click', 'a', function () {
+                if ($(this).hasClass(opts.nextCls)) {
+                    if ($obj.find('.' + opts.activeCls).text() >= pageCount) {
+                        $(this).addClass('disabled');
+                        return false;
+                    } else {
+                        index = parseInt($obj.find('.' + opts.activeCls).text()) + 1;
+                    }
+                } else if ($(this).hasClass(opts.prevCls)) {
+                    if ($obj.find('.' + opts.activeCls).text() <= 1) {
+                        $(this).addClass('disabled');
+                        return false;
+                    } else {
+                        index = parseInt($obj.find('.' + opts.activeCls).text()) - 1;
+                    }
+                } else if ($(this).hasClass(opts.jumpBtnCls)) {
+                    if ($obj.find('.' + opts.jumpIptCls).val() !== '') {
+                        index = parseInt($obj.find('.' + opts.jumpIptCls).val());
+                    } else {
+                        return;
+                    }
+                } else {
+                    index = parseInt($(this).data('page'));
+                }
+                that.filling(index);
+                typeof opts.callback === 'function' && opts.callback(that);
+            });
+            //输入跳转的页码
+            $obj.on('input propertychange', '.' + opts.jumpIptCls, function () {
+                var $this = $(this);
+                var val = $this.val();
+                var reg = /[^\d]/g;
+                if (reg.test(val)) $this.val(val.replace(reg, ''));
+                (parseInt(val) > pageCount) && $this.val(pageCount);
+                if (parseInt(val) === 0) $this.val(1); //最小值为1
+            });
+            //回车跳转指定页码
+            $document.keydown(function (e) {
+                if (e.keyCode == 13 && $obj.find('.' + opts.jumpIptCls).val()) {
+                    var index = parseInt($obj.find('.' + opts.jumpIptCls).val());
+                    that.filling(index);
+                    typeof opts.callback === 'function' && opts.callback(that);
+                }
+            });
+        };
+
+        //初始化
+        this.init = function () {
+            this.filling(opts.current);
+            this.eventBind();
+            if (opts.isHide && this.getPageCount() == '1' || this.getPageCount() == '0') {
+                $obj.hide();
+            } else {
+                $obj.show();
+            }
+        };
+        this.init();
+    };
+
+    $.fn.pagination = function (parameter, callback) {
+        if (typeof parameter == 'function') { //重载
+            callback = parameter;
+            parameter = {};
+        } else {
+            parameter = parameter || {};
+            callback = callback || function () {};
+        }
+        var options = $.extend({}, defaults, parameter);
+        return this.each(function () {
+            var pagination = new Pagination(this, options);
+            callback(pagination);
+        });
+    };
+
+}));
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/jquery.qrcode.min.js b/pluss-manage-page/src/main/resources/static/resources/js/jquery.qrcode.min.js
new file mode 100644
index 0000000..fe9680e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/jquery.qrcode.min.js
@@ -0,0 +1,28 @@
+(function(r){r.fn.qrcode=function(h){var s;function u(a){this.mode=s;this.data=a}function o(a,c){this.typeNumber=a;this.errorCorrectLevel=c;this.modules=null;this.moduleCount=0;this.dataCache=null;this.dataList=[]}function q(a,c){if(void 0==a.length)throw Error(a.length+"/"+c);for(var d=0;d<a.length&&0==a[d];)d++;this.num=Array(a.length-d+c);for(var b=0;b<a.length-d;b++)this.num[b]=a[b+d]}function p(a,c){this.totalCount=a;this.dataCount=c}function t(){this.buffer=[];this.length=0}u.prototype={getLength:function(){return this.data.length},
+write:function(a){for(var c=0;c<this.data.length;c++)a.put(this.data.charCodeAt(c),8)}};o.prototype={addData:function(a){this.dataList.push(new u(a));this.dataCache=null},isDark:function(a,c){if(0>a||this.moduleCount<=a||0>c||this.moduleCount<=c)throw Error(a+","+c);return this.modules[a][c]},getModuleCount:function(){return this.moduleCount},make:function(){if(1>this.typeNumber){for(var a=1,a=1;40>a;a++){for(var c=p.getRSBlocks(a,this.errorCorrectLevel),d=new t,b=0,e=0;e<c.length;e++)b+=c[e].dataCount;
+for(e=0;e<this.dataList.length;e++)c=this.dataList[e],d.put(c.mode,4),d.put(c.getLength(),j.getLengthInBits(c.mode,a)),c.write(d);if(d.getLengthInBits()<=8*b)break}this.typeNumber=a}this.makeImpl(!1,this.getBestMaskPattern())},makeImpl:function(a,c){this.moduleCount=4*this.typeNumber+17;this.modules=Array(this.moduleCount);for(var d=0;d<this.moduleCount;d++){this.modules[d]=Array(this.moduleCount);for(var b=0;b<this.moduleCount;b++)this.modules[d][b]=null}this.setupPositionProbePattern(0,0);this.setupPositionProbePattern(this.moduleCount-
+7,0);this.setupPositionProbePattern(0,this.moduleCount-7);this.setupPositionAdjustPattern();this.setupTimingPattern();this.setupTypeInfo(a,c);7<=this.typeNumber&&this.setupTypeNumber(a);null==this.dataCache&&(this.dataCache=o.createData(this.typeNumber,this.errorCorrectLevel,this.dataList));this.mapData(this.dataCache,c)},setupPositionProbePattern:function(a,c){for(var d=-1;7>=d;d++)if(!(-1>=a+d||this.moduleCount<=a+d))for(var b=-1;7>=b;b++)-1>=c+b||this.moduleCount<=c+b||(this.modules[a+d][c+b]=
+0<=d&&6>=d&&(0==b||6==b)||0<=b&&6>=b&&(0==d||6==d)||2<=d&&4>=d&&2<=b&&4>=b?!0:!1)},getBestMaskPattern:function(){for(var a=0,c=0,d=0;8>d;d++){this.makeImpl(!0,d);var b=j.getLostPoint(this);if(0==d||a>b)a=b,c=d}return c},createMovieClip:function(a,c,d){a=a.createEmptyMovieClip(c,d);this.make();for(c=0;c<this.modules.length;c++)for(var d=1*c,b=0;b<this.modules[c].length;b++){var e=1*b;this.modules[c][b]&&(a.beginFill(0,100),a.moveTo(e,d),a.lineTo(e+1,d),a.lineTo(e+1,d+1),a.lineTo(e,d+1),a.endFill())}return a},
+setupTimingPattern:function(){for(var a=8;a<this.moduleCount-8;a++)null==this.modules[a][6]&&(this.modules[a][6]=0==a%2);for(a=8;a<this.moduleCount-8;a++)null==this.modules[6][a]&&(this.modules[6][a]=0==a%2)},setupPositionAdjustPattern:function(){for(var a=j.getPatternPosition(this.typeNumber),c=0;c<a.length;c++)for(var d=0;d<a.length;d++){var b=a[c],e=a[d];if(null==this.modules[b][e])for(var f=-2;2>=f;f++)for(var i=-2;2>=i;i++)this.modules[b+f][e+i]=-2==f||2==f||-2==i||2==i||0==f&&0==i?!0:!1}},setupTypeNumber:function(a){for(var c=
+j.getBCHTypeNumber(this.typeNumber),d=0;18>d;d++){var b=!a&&1==(c>>d&1);this.modules[Math.floor(d/3)][d%3+this.moduleCount-8-3]=b}for(d=0;18>d;d++)b=!a&&1==(c>>d&1),this.modules[d%3+this.moduleCount-8-3][Math.floor(d/3)]=b},setupTypeInfo:function(a,c){for(var d=j.getBCHTypeInfo(this.errorCorrectLevel<<3|c),b=0;15>b;b++){var e=!a&&1==(d>>b&1);6>b?this.modules[b][8]=e:8>b?this.modules[b+1][8]=e:this.modules[this.moduleCount-15+b][8]=e}for(b=0;15>b;b++)e=!a&&1==(d>>b&1),8>b?this.modules[8][this.moduleCount-
+b-1]=e:9>b?this.modules[8][15-b-1+1]=e:this.modules[8][15-b-1]=e;this.modules[this.moduleCount-8][8]=!a},mapData:function(a,c){for(var d=-1,b=this.moduleCount-1,e=7,f=0,i=this.moduleCount-1;0<i;i-=2)for(6==i&&i--;;){for(var g=0;2>g;g++)if(null==this.modules[b][i-g]){var n=!1;f<a.length&&(n=1==(a[f]>>>e&1));j.getMask(c,b,i-g)&&(n=!n);this.modules[b][i-g]=n;e--; -1==e&&(f++,e=7)}b+=d;if(0>b||this.moduleCount<=b){b-=d;d=-d;break}}}};o.PAD0=236;o.PAD1=17;o.createData=function(a,c,d){for(var c=p.getRSBlocks(a,
+c),b=new t,e=0;e<d.length;e++){var f=d[e];b.put(f.mode,4);b.put(f.getLength(),j.getLengthInBits(f.mode,a));f.write(b)}for(e=a=0;e<c.length;e++)a+=c[e].dataCount;if(b.getLengthInBits()>8*a)throw Error("code length overflow. ("+b.getLengthInBits()+">"+8*a+")");for(b.getLengthInBits()+4<=8*a&&b.put(0,4);0!=b.getLengthInBits()%8;)b.putBit(!1);for(;!(b.getLengthInBits()>=8*a);){b.put(o.PAD0,8);if(b.getLengthInBits()>=8*a)break;b.put(o.PAD1,8)}return o.createBytes(b,c)};o.createBytes=function(a,c){for(var d=
+0,b=0,e=0,f=Array(c.length),i=Array(c.length),g=0;g<c.length;g++){var n=c[g].dataCount,h=c[g].totalCount-n,b=Math.max(b,n),e=Math.max(e,h);f[g]=Array(n);for(var k=0;k<f[g].length;k++)f[g][k]=255&a.buffer[k+d];d+=n;k=j.getErrorCorrectPolynomial(h);n=(new q(f[g],k.getLength()-1)).mod(k);i[g]=Array(k.getLength()-1);for(k=0;k<i[g].length;k++)h=k+n.getLength()-i[g].length,i[g][k]=0<=h?n.get(h):0}for(k=g=0;k<c.length;k++)g+=c[k].totalCount;d=Array(g);for(k=n=0;k<b;k++)for(g=0;g<c.length;g++)k<f[g].length&&
+(d[n++]=f[g][k]);for(k=0;k<e;k++)for(g=0;g<c.length;g++)k<i[g].length&&(d[n++]=i[g][k]);return d};s=4;for(var j={PATTERN_POSITION_TABLE:[[],[6,18],[6,22],[6,26],[6,30],[6,34],[6,22,38],[6,24,42],[6,26,46],[6,28,50],[6,30,54],[6,32,58],[6,34,62],[6,26,46,66],[6,26,48,70],[6,26,50,74],[6,30,54,78],[6,30,56,82],[6,30,58,86],[6,34,62,90],[6,28,50,72,94],[6,26,50,74,98],[6,30,54,78,102],[6,28,54,80,106],[6,32,58,84,110],[6,30,58,86,114],[6,34,62,90,118],[6,26,50,74,98,122],[6,30,54,78,102,126],[6,26,52,
+78,104,130],[6,30,56,82,108,134],[6,34,60,86,112,138],[6,30,58,86,114,142],[6,34,62,90,118,146],[6,30,54,78,102,126,150],[6,24,50,76,102,128,154],[6,28,54,80,106,132,158],[6,32,58,84,110,136,162],[6,26,54,82,110,138,166],[6,30,58,86,114,142,170]],G15:1335,G18:7973,G15_MASK:21522,getBCHTypeInfo:function(a){for(var c=a<<10;0<=j.getBCHDigit(c)-j.getBCHDigit(j.G15);)c^=j.G15<<j.getBCHDigit(c)-j.getBCHDigit(j.G15);return(a<<10|c)^j.G15_MASK},getBCHTypeNumber:function(a){for(var c=a<<12;0<=j.getBCHDigit(c)-
+j.getBCHDigit(j.G18);)c^=j.G18<<j.getBCHDigit(c)-j.getBCHDigit(j.G18);return a<<12|c},getBCHDigit:function(a){for(var c=0;0!=a;)c++,a>>>=1;return c},getPatternPosition:function(a){return j.PATTERN_POSITION_TABLE[a-1]},getMask:function(a,c,d){switch(a){case 0:return 0==(c+d)%2;case 1:return 0==c%2;case 2:return 0==d%3;case 3:return 0==(c+d)%3;case 4:return 0==(Math.floor(c/2)+Math.floor(d/3))%2;case 5:return 0==c*d%2+c*d%3;case 6:return 0==(c*d%2+c*d%3)%2;case 7:return 0==(c*d%3+(c+d)%2)%2;default:throw Error("bad maskPattern:"+
+a);}},getErrorCorrectPolynomial:function(a){for(var c=new q([1],0),d=0;d<a;d++)c=c.multiply(new q([1,l.gexp(d)],0));return c},getLengthInBits:function(a,c){if(1<=c&&10>c)switch(a){case 1:return 10;case 2:return 9;case s:return 8;case 8:return 8;default:throw Error("mode:"+a);}else if(27>c)switch(a){case 1:return 12;case 2:return 11;case s:return 16;case 8:return 10;default:throw Error("mode:"+a);}else if(41>c)switch(a){case 1:return 14;case 2:return 13;case s:return 16;case 8:return 12;default:throw Error("mode:"+
+a);}else throw Error("type:"+c);},getLostPoint:function(a){for(var c=a.getModuleCount(),d=0,b=0;b<c;b++)for(var e=0;e<c;e++){for(var f=0,i=a.isDark(b,e),g=-1;1>=g;g++)if(!(0>b+g||c<=b+g))for(var h=-1;1>=h;h++)0>e+h||c<=e+h||0==g&&0==h||i==a.isDark(b+g,e+h)&&f++;5<f&&(d+=3+f-5)}for(b=0;b<c-1;b++)for(e=0;e<c-1;e++)if(f=0,a.isDark(b,e)&&f++,a.isDark(b+1,e)&&f++,a.isDark(b,e+1)&&f++,a.isDark(b+1,e+1)&&f++,0==f||4==f)d+=3;for(b=0;b<c;b++)for(e=0;e<c-6;e++)a.isDark(b,e)&&!a.isDark(b,e+1)&&a.isDark(b,e+
+2)&&a.isDark(b,e+3)&&a.isDark(b,e+4)&&!a.isDark(b,e+5)&&a.isDark(b,e+6)&&(d+=40);for(e=0;e<c;e++)for(b=0;b<c-6;b++)a.isDark(b,e)&&!a.isDark(b+1,e)&&a.isDark(b+2,e)&&a.isDark(b+3,e)&&a.isDark(b+4,e)&&!a.isDark(b+5,e)&&a.isDark(b+6,e)&&(d+=40);for(e=f=0;e<c;e++)for(b=0;b<c;b++)a.isDark(b,e)&&f++;a=Math.abs(100*f/c/c-50)/5;return d+10*a}},l={glog:function(a){if(1>a)throw Error("glog("+a+")");return l.LOG_TABLE[a]},gexp:function(a){for(;0>a;)a+=255;for(;256<=a;)a-=255;return l.EXP_TABLE[a]},EXP_TABLE:Array(256),
+LOG_TABLE:Array(256)},m=0;8>m;m++)l.EXP_TABLE[m]=1<<m;for(m=8;256>m;m++)l.EXP_TABLE[m]=l.EXP_TABLE[m-4]^l.EXP_TABLE[m-5]^l.EXP_TABLE[m-6]^l.EXP_TABLE[m-8];for(m=0;255>m;m++)l.LOG_TABLE[l.EXP_TABLE[m]]=m;q.prototype={get:function(a){return this.num[a]},getLength:function(){return this.num.length},multiply:function(a){for(var c=Array(this.getLength()+a.getLength()-1),d=0;d<this.getLength();d++)for(var b=0;b<a.getLength();b++)c[d+b]^=l.gexp(l.glog(this.get(d))+l.glog(a.get(b)));return new q(c,0)},mod:function(a){if(0>
+this.getLength()-a.getLength())return this;for(var c=l.glog(this.get(0))-l.glog(a.get(0)),d=Array(this.getLength()),b=0;b<this.getLength();b++)d[b]=this.get(b);for(b=0;b<a.getLength();b++)d[b]^=l.gexp(l.glog(a.get(b))+c);return(new q(d,0)).mod(a)}};p.RS_BLOCK_TABLE=[[1,26,19],[1,26,16],[1,26,13],[1,26,9],[1,44,34],[1,44,28],[1,44,22],[1,44,16],[1,70,55],[1,70,44],[2,35,17],[2,35,13],[1,100,80],[2,50,32],[2,50,24],[4,25,9],[1,134,108],[2,67,43],[2,33,15,2,34,16],[2,33,11,2,34,12],[2,86,68],[4,43,27],
+[4,43,19],[4,43,15],[2,98,78],[4,49,31],[2,32,14,4,33,15],[4,39,13,1,40,14],[2,121,97],[2,60,38,2,61,39],[4,40,18,2,41,19],[4,40,14,2,41,15],[2,146,116],[3,58,36,2,59,37],[4,36,16,4,37,17],[4,36,12,4,37,13],[2,86,68,2,87,69],[4,69,43,1,70,44],[6,43,19,2,44,20],[6,43,15,2,44,16],[4,101,81],[1,80,50,4,81,51],[4,50,22,4,51,23],[3,36,12,8,37,13],[2,116,92,2,117,93],[6,58,36,2,59,37],[4,46,20,6,47,21],[7,42,14,4,43,15],[4,133,107],[8,59,37,1,60,38],[8,44,20,4,45,21],[12,33,11,4,34,12],[3,145,115,1,146,
+116],[4,64,40,5,65,41],[11,36,16,5,37,17],[11,36,12,5,37,13],[5,109,87,1,110,88],[5,65,41,5,66,42],[5,54,24,7,55,25],[11,36,12],[5,122,98,1,123,99],[7,73,45,3,74,46],[15,43,19,2,44,20],[3,45,15,13,46,16],[1,135,107,5,136,108],[10,74,46,1,75,47],[1,50,22,15,51,23],[2,42,14,17,43,15],[5,150,120,1,151,121],[9,69,43,4,70,44],[17,50,22,1,51,23],[2,42,14,19,43,15],[3,141,113,4,142,114],[3,70,44,11,71,45],[17,47,21,4,48,22],[9,39,13,16,40,14],[3,135,107,5,136,108],[3,67,41,13,68,42],[15,54,24,5,55,25],[15,
+43,15,10,44,16],[4,144,116,4,145,117],[17,68,42],[17,50,22,6,51,23],[19,46,16,6,47,17],[2,139,111,7,140,112],[17,74,46],[7,54,24,16,55,25],[34,37,13],[4,151,121,5,152,122],[4,75,47,14,76,48],[11,54,24,14,55,25],[16,45,15,14,46,16],[6,147,117,4,148,118],[6,73,45,14,74,46],[11,54,24,16,55,25],[30,46,16,2,47,17],[8,132,106,4,133,107],[8,75,47,13,76,48],[7,54,24,22,55,25],[22,45,15,13,46,16],[10,142,114,2,143,115],[19,74,46,4,75,47],[28,50,22,6,51,23],[33,46,16,4,47,17],[8,152,122,4,153,123],[22,73,45,
+3,74,46],[8,53,23,26,54,24],[12,45,15,28,46,16],[3,147,117,10,148,118],[3,73,45,23,74,46],[4,54,24,31,55,25],[11,45,15,31,46,16],[7,146,116,7,147,117],[21,73,45,7,74,46],[1,53,23,37,54,24],[19,45,15,26,46,16],[5,145,115,10,146,116],[19,75,47,10,76,48],[15,54,24,25,55,25],[23,45,15,25,46,16],[13,145,115,3,146,116],[2,74,46,29,75,47],[42,54,24,1,55,25],[23,45,15,28,46,16],[17,145,115],[10,74,46,23,75,47],[10,54,24,35,55,25],[19,45,15,35,46,16],[17,145,115,1,146,116],[14,74,46,21,75,47],[29,54,24,19,
+55,25],[11,45,15,46,46,16],[13,145,115,6,146,116],[14,74,46,23,75,47],[44,54,24,7,55,25],[59,46,16,1,47,17],[12,151,121,7,152,122],[12,75,47,26,76,48],[39,54,24,14,55,25],[22,45,15,41,46,16],[6,151,121,14,152,122],[6,75,47,34,76,48],[46,54,24,10,55,25],[2,45,15,64,46,16],[17,152,122,4,153,123],[29,74,46,14,75,47],[49,54,24,10,55,25],[24,45,15,46,46,16],[4,152,122,18,153,123],[13,74,46,32,75,47],[48,54,24,14,55,25],[42,45,15,32,46,16],[20,147,117,4,148,118],[40,75,47,7,76,48],[43,54,24,22,55,25],[10,
+45,15,67,46,16],[19,148,118,6,149,119],[18,75,47,31,76,48],[34,54,24,34,55,25],[20,45,15,61,46,16]];p.getRSBlocks=function(a,c){var d=p.getRsBlockTable(a,c);if(void 0==d)throw Error("bad rs block @ typeNumber:"+a+"/errorCorrectLevel:"+c);for(var b=d.length/3,e=[],f=0;f<b;f++)for(var h=d[3*f+0],g=d[3*f+1],j=d[3*f+2],l=0;l<h;l++)e.push(new p(g,j));return e};p.getRsBlockTable=function(a,c){switch(c){case 1:return p.RS_BLOCK_TABLE[4*(a-1)+0];case 0:return p.RS_BLOCK_TABLE[4*(a-1)+1];case 3:return p.RS_BLOCK_TABLE[4*
+(a-1)+2];case 2:return p.RS_BLOCK_TABLE[4*(a-1)+3]}};t.prototype={get:function(a){return 1==(this.buffer[Math.floor(a/8)]>>>7-a%8&1)},put:function(a,c){for(var d=0;d<c;d++)this.putBit(1==(a>>>c-d-1&1))},getLengthInBits:function(){return this.length},putBit:function(a){var c=Math.floor(this.length/8);this.buffer.length<=c&&this.buffer.push(0);a&&(this.buffer[c]|=128>>>this.length%8);this.length++}};"string"===typeof h&&(h={text:h});h=r.extend({},{render:"canvas",width:256,height:256,typeNumber:-1,
+correctLevel:2,background:"#ffffff",foreground:"#000000"},h);return this.each(function(){var a;if("canvas"==h.render){a=new o(h.typeNumber,h.correctLevel);a.addData(h.text);a.make();var c=document.createElement("canvas");c.width=h.width;c.height=h.height;for(var d=c.getContext("2d"),b=h.width/a.getModuleCount(),e=h.height/a.getModuleCount(),f=0;f<a.getModuleCount();f++)for(var i=0;i<a.getModuleCount();i++){d.fillStyle=a.isDark(f,i)?h.foreground:h.background;var g=Math.ceil((i+1)*b)-Math.floor(i*b),
+j=Math.ceil((f+1)*b)-Math.floor(f*b);d.fillRect(Math.round(i*b),Math.round(f*e),g,j)}}else{a=new o(h.typeNumber,h.correctLevel);a.addData(h.text);a.make();c=r("<table></table>").css("width",h.width+"px").css("height",h.height+"px").css("border","0px").css("border-collapse","collapse").css("background-color",h.background);d=h.width/a.getModuleCount();b=h.height/a.getModuleCount();for(e=0;e<a.getModuleCount();e++){f=r("<tr></tr>").css("height",b+"px").appendTo(c);for(i=0;i<a.getModuleCount();i++)r("<td></td>").css("width",
+d+"px").css("background-color",a.isDark(e,i)?h.foreground:h.background).appendTo(f)}}a=c;jQuery(a).appendTo(this)})}})(jQuery);
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/jquery.serializejson.min.js b/pluss-manage-page/src/main/resources/static/resources/js/jquery.serializejson.min.js
new file mode 100644
index 0000000..c226484
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/jquery.serializejson.min.js
@@ -0,0 +1,10 @@
+/*!
+  SerializeJSON jQuery plugin.
+  https://github.com/marioizquierdo/jquery.serializeJSON
+  version 2.3.1 (Oct, 2014)
+
+  Copyright (c) 2014 Mario Izquierdo
+  Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php)
+  and GPL (http://www.opensource.org/licenses/gpl-license.php) licenses.
+*/
+(function(a){a.fn.serializeJSON=function(c){var d,b,g,i,h,e;h=a.serializeJSON;e=h.optsWithDefaults(c);b=this.serializeArray();h.readCheckboxUncheckedValues(b,this,e);d={};a.each(b,function(j,f){g=h.splitInputNameIntoKeysArray(f.name);i=h.parseValue(f.value,e);if(e.parseWithFunction){i=e.parseWithFunction(i)}h.deepSet(d,g,i,e)});return d};a.serializeJSON={defaultOptions:{parseNumbers:false,parseBooleans:false,parseNulls:false,parseAll:false,parseWithFunction:null,checkboxUncheckedValue:undefined,useIntKeysAsArrayIndex:false},optsWithDefaults:function(c){var d,b;if(c==null){c={}}d=a.serializeJSON;b=d.optWithDefaults("parseAll",c);return{parseNumbers:b||d.optWithDefaults("parseNumbers",c),parseBooleans:b||d.optWithDefaults("parseBooleans",c),parseNulls:b||d.optWithDefaults("parseNulls",c),parseWithFunction:d.optWithDefaults("parseWithFunction",c),checkboxUncheckedValue:d.optWithDefaults("checkboxUncheckedValue",c),useIntKeysAsArrayIndex:d.optWithDefaults("useIntKeysAsArrayIndex",c)}},optWithDefaults:function(c,b){return(b[c]!==false)&&(b[c]!=="")&&(b[c]||a.serializeJSON.defaultOptions[c])},parseValue:function(e,b){var d,c;c=a.serializeJSON;if(b.parseNumbers&&c.isNumeric(e)){return Number(e)}if(b.parseBooleans&&(e==="true"||e==="false")){return e==="true"}if(b.parseNulls&&e=="null"){return null}return e},isObject:function(b){return b===Object(b)},isUndefined:function(b){return b===void 0},isValidArrayIndex:function(b){return/^[0-9]+$/.test(String(b))},isNumeric:function(b){return b-parseFloat(b)>=0},splitInputNameIntoKeysArray:function(b){var d,c,e;e=a.serializeJSON;if(e.isUndefined(b)){throw new Error("ArgumentError: param 'name' expected to be a string, found undefined")}d=a.map(b.split("["),function(f){c=f[f.length-1];return c==="]"?f.substring(0,f.length-1):f});if(d[0]===""){d.shift()}return d},deepSet:function(c,l,j,b){var k,h,g,i,d,e;if(b==null){b={}}e=a.serializeJSON;if(e.isUndefined(c)){throw new Error("ArgumentError: param 'o' expected to be an object or array, found undefined")}if(!l||l.length===0){throw new Error("ArgumentError: param 'keys' expected to be an array with least one element")}k=l[0];if(l.length===1){if(k===""){c.push(j)}else{c[k]=j}}else{h=l[1];if(k===""){i=c.length-1;d=c[i];if(e.isObject(d)&&(e.isUndefined(d[h])||l.length>2)){k=i}else{k=i+1}}if(e.isUndefined(c[k])){if(h===""){c[k]=[]}else{if(b.useIntKeysAsArrayIndex&&e.isValidArrayIndex(h)){c[k]=[]}else{c[k]={}}}}g=l.slice(1);e.deepSet(c[k],g,j,b)}},readCheckboxUncheckedValues:function(e,d,i){var b,h,g,c,j;if(i==null){i={}}j=a.serializeJSON;b="input[type=checkbox][name]:not(:checked)";h=d.find(b).add(d.filter(b));h.each(function(f,k){g=a(k);c=g.attr("data-unchecked-value");if(c){e.push({name:k.name,value:c})}else{if(!j.isUndefined(i.checkboxUncheckedValue)){e.push({name:k.name,value:i.checkboxUncheckedValue})}}})}}}(window.jQuery||window.Zepto||window.$));
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/jquery.slimscroll.min.js b/pluss-manage-page/src/main/resources/static/resources/js/jquery.slimscroll.min.js
new file mode 100644
index 0000000..26220d6
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/jquery.slimscroll.min.js
@@ -0,0 +1,16 @@
+/*! Copyright (c) 2011 Piotr Rochala (http://rocha.la)
+ * Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php)
+ * and GPL (http://www.opensource.org/licenses/gpl-license.php) licenses.
+ *
+ * Version: 1.3.0
+ *
+ */
+(function(f){jQuery.fn.extend({slimScroll:function(h){var a=f.extend({width:"auto",height:"250px",size:"7px",color:"#000",position:"right",distance:"1px",start:"top",opacity:0.4,alwaysVisible:!1,disableFadeOut:!1,railVisible:!1,railColor:"#333",railOpacity:0.2,railDraggable:!0,railClass:"slimScrollRail",barClass:"slimScrollBar",wrapperClass:"slimScrollDiv",allowPageScroll:!1,wheelStep:20,touchScrollStep:200,borderRadius:"7px",railBorderRadius:"7px"},h);this.each(function(){function r(d){if(s){d=d||
+window.event;var c=0;d.wheelDelta&&(c=-d.wheelDelta/120);d.detail&&(c=d.detail/3);f(d.target||d.srcTarget||d.srcElement).closest("."+a.wrapperClass).is(b.parent())&&m(c,!0);d.preventDefault&&!k&&d.preventDefault();k||(d.returnValue=!1)}}function m(d,f,h){k=!1;var e=d,g=b.outerHeight()-c.outerHeight();f&&(e=parseInt(c.css("top"))+d*parseInt(a.wheelStep)/100*c.outerHeight(),e=Math.min(Math.max(e,0),g),e=0<d?Math.ceil(e):Math.floor(e),c.css({top:e+"px"}));l=parseInt(c.css("top"))/(b.outerHeight()-c.outerHeight());
+e=l*(b[0].scrollHeight-b.outerHeight());h&&(e=d,d=e/b[0].scrollHeight*b.outerHeight(),d=Math.min(Math.max(d,0),g),c.css({top:d+"px"}));b.scrollTop(e);b.trigger("slimscrolling",~~e);v();p()}function C(){window.addEventListener?(this.addEventListener("DOMMouseScroll",r,!1),this.addEventListener("mousewheel",r,!1),this.addEventListener("MozMousePixelScroll",r,!1)):document.attachEvent("onmousewheel",r)}function w(){u=Math.max(b.outerHeight()/b[0].scrollHeight*b.outerHeight(),D);c.css({height:u+"px"});
+var a=u==b.outerHeight()?"none":"block";c.css({display:a})}function v(){w();clearTimeout(A);l==~~l?(k=a.allowPageScroll,B!=l&&b.trigger("slimscroll",0==~~l?"top":"bottom")):k=!1;B=l;u>=b.outerHeight()?k=!0:(c.stop(!0,!0).fadeIn("fast"),a.railVisible&&g.stop(!0,!0).fadeIn("fast"))}function p(){a.alwaysVisible||(A=setTimeout(function(){a.disableFadeOut&&s||(x||y)||(c.fadeOut("slow"),g.fadeOut("slow"))},1E3))}var s,x,y,A,z,u,l,B,D=30,k=!1,b=f(this);if(b.parent().hasClass(a.wrapperClass)){var n=b.scrollTop(),
+c=b.parent().find("."+a.barClass),g=b.parent().find("."+a.railClass);w();if(f.isPlainObject(h)){if("height"in h&&"auto"==h.height){b.parent().css("height","auto");b.css("height","auto");var q=b.parent().parent().height();b.parent().css("height",q);b.css("height",q)}if("scrollTo"in h)n=parseInt(a.scrollTo);else if("scrollBy"in h)n+=parseInt(a.scrollBy);else if("destroy"in h){c.remove();g.remove();b.unwrap();return}m(n,!1,!0)}}else{a.height="auto"==a.height?b.parent().height():a.height;n=f("<div></div>").addClass(a.wrapperClass).css({position:"relative",
+overflow:"hidden",width:a.width,height:a.height});b.css({overflow:"hidden",width:a.width,height:a.height});var g=f("<div></div>").addClass(a.railClass).css({width:a.size,height:"100%",position:"absolute",top:0,display:a.alwaysVisible&&a.railVisible?"block":"none","border-radius":a.railBorderRadius,background:a.railColor,opacity:a.railOpacity,zIndex:90}),c=f("<div></div>").addClass(a.barClass).css({background:a.color,width:a.size,position:"absolute",top:0,opacity:a.opacity,display:a.alwaysVisible?
+"block":"none","border-radius":a.borderRadius,BorderRadius:a.borderRadius,MozBorderRadius:a.borderRadius,WebkitBorderRadius:a.borderRadius,zIndex:99}),q="right"==a.position?{right:a.distance}:{left:a.distance};g.css(q);c.css(q);b.wrap(n);b.parent().append(c);b.parent().append(g);a.railDraggable&&c.bind("mousedown",function(a){var b=f(document);y=!0;t=parseFloat(c.css("top"));pageY=a.pageY;b.bind("mousemove.slimscroll",function(a){currTop=t+a.pageY-pageY;c.css("top",currTop);m(0,c.position().top,!1)});
+b.bind("mouseup.slimscroll",function(a){y=!1;p();b.unbind(".slimscroll")});return!1}).bind("selectstart.slimscroll",function(a){a.stopPropagation();a.preventDefault();return!1});g.hover(function(){v()},function(){p()});c.hover(function(){x=!0},function(){x=!1});b.hover(function(){s=!0;v();p()},function(){s=!1;p()});b.bind("touchstart",function(a,b){a.originalEvent.touches.length&&(z=a.originalEvent.touches[0].pageY)});b.bind("touchmove",function(b){k||b.originalEvent.preventDefault();b.originalEvent.touches.length&&
+(m((z-b.originalEvent.touches[0].pageY)/a.touchScrollStep,!0),z=b.originalEvent.touches[0].pageY)});w();"bottom"===a.start?(c.css({top:b.outerHeight()-c.outerHeight()}),m(0,!0)):"top"!==a.start&&(m(f(a.start).position().top,null,!0),a.alwaysVisible||c.hide());C()}});return this}});jQuery.fn.extend({slimscroll:jQuery.fn.slimScroll})})(jQuery);
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/jquery.table2excel.js b/pluss-manage-page/src/main/resources/static/resources/js/jquery.table2excel.js
new file mode 100644
index 0000000..cc3062a
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/jquery.table2excel.js
@@ -0,0 +1,267 @@
+/*
+ *  jQuery table2excel - v1.1.2
+ *  jQuery plugin to export an .xls file in browser from an HTML table
+ *  https://github.com/rainabba/jquery-table2excel
+ *
+ *  Made by rainabba
+ *  Under MIT License
+ */
+//table2excel.js
+(function ( $, window, document, undefined ) {
+    var pluginName = "table2excel",
+
+    defaults = {
+        exclude: ".noExl",
+        name: "Table2Excel",
+        filename: "table2excel",
+        fileext: ".xls",
+        exclude_img: true,
+        exclude_links: true,
+        exclude_inputs: true,
+        preserveColors: false
+    };
+
+    // The actual plugin constructor
+    function Plugin ( element, options ) {
+            this.element = element;
+            // jQuery has an extend method which merges the contents of two or
+            // more objects, storing the result in the first object. The first object
+            // is generally empty as we don't want to alter the default options for
+            // future instances of the plugin
+            //
+            this.settings = $.extend( {}, defaults, options );
+            this._defaults = defaults;
+            this._name = pluginName;
+            this.init();
+    }
+
+    Plugin.prototype = {
+        init: function () {
+            var e = this;
+
+            var utf8Heading = "<meta http-equiv=\"content-type\" content=\"application/vnd.ms-excel; charset=UTF-8\">";
+            e.template = {
+                head: "<html xmlns:o=\"urn:schemas-microsoft-com:office:office\" xmlns:x=\"urn:schemas-microsoft-com:office:excel\" xmlns=\"http://www.w3.org/TR/REC-html40\">" + utf8Heading + "<head><!--[if gte mso 9]><xml><x:ExcelWorkbook><x:ExcelWorksheets>",
+                sheet: {
+                    head: "<x:ExcelWorksheet><x:Name>",
+                    tail: "</x:Name><x:WorksheetOptions><x:DisplayGridlines/></x:WorksheetOptions></x:ExcelWorksheet>"
+                },
+                mid: "</x:ExcelWorksheets></x:ExcelWorkbook></xml><![endif]--></head><body>",
+                table: {
+                    head: "<table>",
+                    tail: "</table>"
+                },
+                foot: "</body></html>"
+            };
+
+            e.tableRows = [];
+	
+			// Styling variables
+			var additionalStyles = "";
+			var compStyle = null;
+
+            // get contents of table except for exclude
+            $(e.element).each( function(i,o) {
+                var tempRows = "";
+                $(o).find("tr").not(e.settings.exclude).each(function (i,p) {
+					
+					// Reset for this row
+					additionalStyles = "";
+					
+					// Preserve background and text colors on the row
+					if(e.settings.preserveColors){
+						compStyle = getComputedStyle(p);
+						additionalStyles += (compStyle && compStyle.backgroundColor ? "background-color: " + compStyle.backgroundColor + ";" : "");
+						additionalStyles += (compStyle && compStyle.color ? "color: " + compStyle.color + ";" : "");
+					}
+
+					// Create HTML for Row
+                    tempRows += "<tr style='" + additionalStyles + "'>";
+                    
+                    // Loop through each TH and TD
+                    $(p).find("td,th").not(e.settings.exclude).each(function (i,q) { // p did not exist, I corrected
+						
+						// Reset for this column
+						additionalStyles = "";
+						
+						// Preserve background and text colors on the row
+						if(e.settings.preserveColors){
+							compStyle = getComputedStyle(q);
+							additionalStyles += (compStyle && compStyle.backgroundColor ? "background-color: " + compStyle.backgroundColor + ";" : "");
+							additionalStyles += (compStyle && compStyle.color ? "color: " + compStyle.color + ";" : "");
+						}
+
+                        var rc = {
+                            rows: $(this).attr("rowspan"),
+                            cols: $(this).attr("colspan"),
+                            flag: $(q).find(e.settings.exclude)
+                        };
+
+                        if( rc.flag.length > 0 ) {
+                            tempRows += "<td> </td>"; // exclude it!!
+                        } else {
+                            tempRows += "<td";
+                            if( rc.rows > 0) {
+                                tempRows += " rowspan='" + rc.rows + "' ";
+                            }
+                            if( rc.cols > 0) {
+                                tempRows += " colspan='" + rc.cols + "' ";
+                            }
+                            if(additionalStyles){
+								tempRows += " style='" + additionalStyles + "'";
+							}
+                            tempRows += ">" + $(q).html() + "</td>";
+                        }
+                    });
+
+                    tempRows += "</tr>";
+
+                });
+                // exclude img tags
+                if(e.settings.exclude_img) {
+                    tempRows = exclude_img(tempRows);
+                }
+
+                // exclude link tags
+                if(e.settings.exclude_links) {
+                    tempRows = exclude_links(tempRows);
+                }
+
+                // exclude input tags
+                if(e.settings.exclude_inputs) {
+                    tempRows = exclude_inputs(tempRows);
+                }
+                e.tableRows.push(tempRows);
+            });
+
+            e.tableToExcel(e.tableRows, e.settings.name, e.settings.sheetName);
+        },
+
+        tableToExcel: function (table, name, sheetName) {
+            var e = this, fullTemplate="", i, link, a;
+
+            e.format = function (s, c) {
+                return s.replace(/{(\w+)}/g, function (m, p) {
+                    return c[p];
+                });
+            };
+
+            sheetName = typeof sheetName === "undefined" ? "Sheet" : sheetName;
+
+            e.ctx = {
+                worksheet: name || "Worksheet",
+                table: table,
+                sheetName: sheetName
+            };
+
+            fullTemplate= e.template.head;
+
+            if ( $.isArray(table) ) {
+                 Object.keys(table).forEach(function(i){
+                      //fullTemplate += e.template.sheet.head + "{worksheet" + i + "}" + e.template.sheet.tail;
+                      fullTemplate += e.template.sheet.head + sheetName + i + e.template.sheet.tail;
+                });
+            }
+
+            fullTemplate += e.template.mid;
+
+            if ( $.isArray(table) ) {
+                 Object.keys(table).forEach(function(i){
+                    fullTemplate += e.template.table.head + "{table" + i + "}" + e.template.table.tail;
+                });
+            }
+
+            fullTemplate += e.template.foot;
+
+            for (i in table) {
+                e.ctx["table" + i] = table[i];
+            }
+            delete e.ctx.table;
+
+            var isIE = navigator.appVersion.indexOf("MSIE 10") !== -1 || (navigator.userAgent.indexOf("Trident") !== -1 && navigator.userAgent.indexOf("rv:11") !== -1); // this works with IE10 and IE11 both :)
+            //if (typeof msie !== "undefined" && msie > 0 || !!navigator.userAgent.match(/Trident.*rv\:11\./))      // this works ONLY with IE 11!!!
+            if (isIE) {
+                if (typeof Blob !== "undefined") {
+                    //use blobs if we can
+                    fullTemplate = e.format(fullTemplate, e.ctx); // with this, works with IE
+                    fullTemplate = [fullTemplate];
+                    //convert to array
+                    var blob1 = new Blob(fullTemplate, { type: "text/html" });
+                    window.navigator.msSaveBlob(blob1, getFileName(e.settings) );
+                } else {
+                    //otherwise use the iframe and save
+                    //requires a blank iframe on page called txtArea1
+                    txtArea1.document.open("text/html", "replace");
+                    txtArea1.document.write(e.format(fullTemplate, e.ctx));
+                    txtArea1.document.close();
+                    txtArea1.focus();
+                    sa = txtArea1.document.execCommand("SaveAs", true, getFileName(e.settings) );
+                }
+
+            } else {
+                var blob = new Blob([e.format(fullTemplate, e.ctx)], {type: "application/vnd.ms-excel"});
+                window.URL = window.URL || window.webkitURL;
+                link = window.URL.createObjectURL(blob);
+                a = document.createElement("a");
+                a.download = getFileName(e.settings);
+                a.href = link;
+
+                document.body.appendChild(a);
+
+                a.click();
+
+                document.body.removeChild(a);
+            }
+
+            return true;
+        }
+    };
+
+    function getFileName(settings) {
+        return ( settings.filename ? settings.filename : "table2excel" );
+    }
+
+    // Removes all img tags
+    function exclude_img(string) {
+        var _patt = /(\s+alt\s*=\s*"([^"]*)"|\s+alt\s*=\s*'([^']*)')/i;
+        return string.replace(/<img[^>]*>/gi, function myFunction(x){
+            var res = _patt.exec(x);
+            if (res !== null && res.length >=2) {
+                return res[2];
+            } else {
+                return "";
+            }
+        });
+    }
+
+    // Removes all link tags
+    function exclude_links(string) {
+        return string.replace(/<a[^>]*>|<\/a>/gi, "");
+    }
+
+    // Removes input params
+    function exclude_inputs(string) {
+        var _patt = /(\s+value\s*=\s*"([^"]*)"|\s+value\s*=\s*'([^']*)')/i;
+        return string.replace(/<input[^>]*>|<\/input>/gi, function myFunction(x){
+            var res = _patt.exec(x);
+            if (res !== null && res.length >=2) {
+                return res[2];
+            } else {
+                return "";
+            }
+        });
+    }
+
+    $.fn[ pluginName ] = function ( options ) {
+        var e = this;
+            e.each(function() {
+                if ( !$.data( e, "plugin_" + pluginName ) ) {
+                    $.data( e, "plugin_" + pluginName, new Plugin( this, options ) );
+                }
+            });
+
+        // chain jQuery functions
+        return e;
+    };
+
+})( jQuery, window, document );
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/layui.js b/pluss-manage-page/src/main/resources/static/resources/js/layui.js
new file mode 100644
index 0000000..1c6062a
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/layui.js
@@ -0,0 +1,5 @@
+/*! MIT Licensed */;!function(t){"use strict";var e=t.document,r={modules:{},status:{},timeout:10,event:{}},n=function(){this.v="2.6.7"},o=t.LAYUI_GLOBAL||{},a=function(){var t=e.currentScript?e.currentScript.src:function(){for(var t,r=e.scripts,n=r.length-1,o=n;o>0;o--)if("interactive"===r[o].readyState){t=r[o].src;break}return t||r[n].src}();return r.dir=o.dir||t.substring(0,t.lastIndexOf("/")+1)}(),i=function(e,r){r=r||"log",t.console&&console[r]&&console[r]("layui error hint: "+e)},u="undefined"!=typeof opera&&"[object Opera]"===opera.toString(),l=r.builtin={lay:"lay",layer:"layer",laydate:"laydate",laypage:"laypage",laytpl:"laytpl",layedit:"layedit",form:"form",upload:"upload",dropdown:"dropdown",transfer:"transfer",tree:"tree",table:"table",element:"element",rate:"rate",colorpicker:"colorpicker",slider:"slider",carousel:"carousel",flow:"flow",util:"util",code:"code",jquery:"jquery",all:"all","layui.all":"layui.all"};n.prototype.cache=r,n.prototype.define=function(t,e){var n=this,o="function"==typeof t,a=function(){var t=function(t,e){layui[t]=e,r.status[t]=!0};return"function"==typeof e&&e(function(n,o){t(n,o),r.callback[n]=function(){e(t)}}),this};return o&&(e=t,t=[]),n.use(t,a,null,"define"),n},n.prototype.use=function(n,o,c,s){function p(t,e){var n="PLaySTATION 3"===navigator.platform?/^complete$/:/^(complete|loaded)$/;("load"===t.type||n.test((t.currentTarget||t.srcElement).readyState))&&(r.modules[h]=e,v.removeChild(b),function o(){return++m>1e3*r.timeout/4?i(h+" is not a valid module","error"):void(r.status[h]?f():setTimeout(o,4))}())}function f(){c.push(layui[h]),n.length>1?y.use(n.slice(1),o,c,s):"function"==typeof o&&function(){return layui.jquery&&"function"==typeof layui.jquery&&"define"!==s?layui.jquery(function(){o.apply(layui,c)}):void o.apply(layui,c)}()}var y=this,d=r.dir=r.dir?r.dir:a,v=e.getElementsByTagName("head")[0];n=function(){return"string"==typeof n?[n]:"function"==typeof n?(o=n,["all"]):n}(),t.jQuery&&jQuery.fn.on&&(y.each(n,function(t,e){"jquery"===e&&n.splice(t,1)}),layui.jquery=layui.$=jQuery);var h=n[0],m=0;if(c=c||[],r.host=r.host||(d.match(/\/\/([\s\S]+?)\//)||["//"+location.host+"/"])[0],0===n.length||layui["layui.all"]&&l[h])return f(),y;var g=(l[h]?d+"modules/":/^\{\/\}/.test(y.modules[h])?"":r.base||"")+(y.modules[h]||h)+".js";if(g=g.replace(/^\{\/\}/,""),!r.modules[h]&&layui[h]&&(r.modules[h]=g),r.modules[h])!function S(){return++m>1e3*r.timeout/4?i(h+" is not a valid module","error"):void("string"==typeof r.modules[h]&&r.status[h]?f():setTimeout(S,4))}();else{var b=e.createElement("script");b.async=!0,b.charset="utf-8",b.src=g+function(){var t=r.version===!0?r.v||(new Date).getTime():r.version||"";return t?"?v="+t:""}(),v.appendChild(b),!b.attachEvent||b.attachEvent.toString&&b.attachEvent.toString().indexOf("[native code")<0||u?b.addEventListener("load",function(t){p(t,g)},!1):b.attachEvent("onreadystatechange",function(t){p(t,g)}),r.modules[h]=g}return y},n.prototype.getStyle=function(e,r){var n=e.currentStyle?e.currentStyle:t.getComputedStyle(e,null);return n[n.getPropertyValue?"getPropertyValue":"getAttribute"](r)},n.prototype.link=function(t,n,o){var a=this,u=e.getElementsByTagName("head")[0],l=e.createElement("link");"string"==typeof n&&(o=n);var c=(o||t).replace(/\.|\//g,""),s=l.id="layuicss-"+c,p="creating",f=0;return l.rel="stylesheet",l.href=t+(r.debug?"?v="+(new Date).getTime():""),l.media="all",e.getElementById(s)||u.appendChild(l),"function"!=typeof n?a:(function y(o){var u=100,l=e.getElementById(s);return++f>1e3*r.timeout/u?i(t+" timeout"):void(1989===parseInt(a.getStyle(l,"width"))?(o===p&&l.removeAttribute("lay-status"),l.getAttribute("lay-status")===p?setTimeout(y,u):n()):(l.setAttribute("lay-status",p),setTimeout(function(){y(p)},u)))}(),a)},n.prototype.addcss=function(t,e,n){return layui.link(r.dir+"css/"+t,e,n)},r.callback={},n.prototype.factory=function(t){if(layui[t])return"function"==typeof r.callback[t]?r.callback[t]:null},n.prototype.img=function(t,e,r){var n=new Image;return n.src=t,n.complete?e(n):(n.onload=function(){n.onload=null,"function"==typeof e&&e(n)},void(n.onerror=function(t){n.onerror=null,"function"==typeof r&&r(t)}))},n.prototype.config=function(t){t=t||{};for(var e in t)r[e]=t[e];return this},n.prototype.modules=function(){var t={};for(var e in l)t[e]=l[e];return t}(),n.prototype.extend=function(t){var e=this;t=t||{};for(var r in t)e[r]||e.modules[r]?i(r+" Module already exists","error"):e.modules[r]=t[r];return e},n.prototype.router=function(t){var e=this,t=t||location.hash,r={path:[],search:{},hash:(t.match(/[^#](#.*$)/)||[])[1]||""};return/^#\//.test(t)?(t=t.replace(/^#\//,""),r.href="/"+t,t=t.replace(/([^#])(#.*$)/,"$1").split("/")||[],e.each(t,function(t,e){/^\w+=/.test(e)?function(){e=e.split("="),r.search[e[0]]=e[1]}():r.path.push(e)}),r):r},n.prototype.url=function(t){var e=this,r={pathname:function(){var e=t?function(){var e=(t.match(/\.[^.]+?\/.+/)||[])[0]||"";return e.replace(/^[^\/]+/,"").replace(/\?.+/,"")}():location.pathname;return e.replace(/^\//,"").split("/")}(),search:function(){var r={},n=(t?function(){var e=(t.match(/\?.+/)||[])[0]||"";return e.replace(/\#.+/,"")}():location.search).replace(/^\?+/,"").split("&");return e.each(n,function(t,e){var n=e.indexOf("="),o=function(){return n<0?e.substr(0,e.length):0!==n&&e.substr(0,n)}();o&&(r[o]=n>0?e.substr(n+1):null)}),r}(),hash:e.router(function(){return t?(t.match(/#.+/)||[])[0]||"/":location.hash}())};return r},n.prototype.data=function(e,r,n){if(e=e||"layui",n=n||localStorage,t.JSON&&t.JSON.parse){if(null===r)return delete n[e];r="object"==typeof r?r:{key:r};try{var o=JSON.parse(n[e])}catch(a){var o={}}return"value"in r&&(o[r.key]=r.value),r.remove&&delete o[r.key],n[e]=JSON.stringify(o),r.key?o[r.key]:o}},n.prototype.sessionData=function(t,e){return this.data(t,e,sessionStorage)},n.prototype.device=function(e){var r=navigator.userAgent.toLowerCase(),n=function(t){var e=new RegExp(t+"/([^\\s\\_\\-]+)");return t=(r.match(e)||[])[1],t||!1},o={os:function(){return/windows/.test(r)?"windows":/linux/.test(r)?"linux":/iphone|ipod|ipad|ios/.test(r)?"ios":/mac/.test(r)?"mac":void 0}(),ie:function(){return!!(t.ActiveXObject||"ActiveXObject"in t)&&((r.match(/msie\s(\d+)/)||[])[1]||"11")}(),weixin:n("micromessenger")};return e&&!o[e]&&(o[e]=n(e)),o.android=/android/.test(r),o.ios="ios"===o.os,o.mobile=!(!o.android&&!o.ios),o},n.prototype.hint=function(){return{error:i}},n.prototype._typeof=function(t){return null===t?String(t):"object"==typeof t||"function"==typeof t?function(){var e=Object.prototype.toString.call(t).match(/\s(.+)\]$/)||[],r="Function|Array|Date|RegExp|Object|Error|Symbol";return e=e[1]||"Object",new RegExp("\\b("+r+")\\b").test(e)?e.toLowerCase():"object"}():typeof t},n.prototype._isArray=function(e){var r,n=this,o=n._typeof(e);return!(!e||"object"!=typeof e||e===t)&&(r="length"in e&&e.length,"array"===o||0===r||"number"==typeof r&&r>0&&r-1 in e)},n.prototype.each=function(t,e){var r,n=this,o=function(t,r){return e.call(r[t],t,r[t])};if("function"!=typeof e)return n;if(t=t||[],n._isArray(t))for(r=0;r<t.length&&!o(r,t);r++);else for(r in t)if(o(r,t))break;return n},n.prototype.sort=function(t,e,r){var n=JSON.parse(JSON.stringify(t||[]));return e?(n.sort(function(t,r){var n=/^-?\d+$/,o=t[e],a=r[e];return n.test(o)&&(o=parseFloat(o)),n.test(a)&&(a=parseFloat(a)),o-a}),r&&n.reverse(),n):n},n.prototype.stope=function(e){e=e||t.event;try{e.stopPropagation()}catch(r){e.cancelBubble=!0}};var c="LAYUI-EVENT-REMOVE";n.prototype.onevent=function(t,e,r){return"string"!=typeof t||"function"!=typeof r?this:n.event(t,e,null,r)},n.prototype.event=n.event=function(t,e,n,o){var a=this,i=null,u=(e||"").match(/\((.*)\)$/)||[],l=(t+"."+e).replace(u[0],""),s=u[1]||"",p=function(t,e){var r=e&&e.call(a,n);r===!1&&null===i&&(i=!1)};return n===c?(delete(a.cache.event[l]||{})[s],a):o?(r.event[l]=r.event[l]||{},r.event[l][s]=[o],this):(layui.each(r.event[l],function(t,e){return"{*}"===s?void layui.each(e,p):(""===t&&layui.each(e,p),void(s&&t===s&&layui.each(e,p)))}),i)},n.prototype.on=function(t,e,r){var n=this;return n.onevent.call(n,e,t,r)},n.prototype.off=function(t,e){var r=this;return r.event.call(r,e,t,c)},t.layui=new n}(window);layui.define(function(a){var i=layui.cache;layui.config({dir:i.dir.replace(/lay\/dest\/$/,"")}),a("layui.all",layui.v)});!function(t){"use strict";var e="lay",n=t.document,r=function(t){return new o(t)},o=function(t){for(var e=0,r="object"==typeof t?[t]:(this.selector=t,n.querySelectorAll(t||null));e<r.length;e++)this.push(r[e])};o.prototype=[],o.prototype.constructor=o,r.extend=function(){var t=1,e=arguments,n=function(t,e){t=t||(e.constructor===Array?[]:{});for(var r in e)t[r]=e[r]&&e[r].constructor===Object?n(t[r],e[r]):e[r];return t};for(e[0]="object"==typeof e[0]?e[0]:{};t<e.length;t++)"object"==typeof e[t]&&n(e[0],e[t]);return e[0]},r.v="1.0.7",r.ie=function(){var e=navigator.userAgent.toLowerCase();return!!(t.ActiveXObject||"ActiveXObject"in t)&&((e.match(/msie\s(\d+)/)||[])[1]||"11")}(),r.layui=layui,r.getPath=layui.cache.dir,r.stope=layui.stope,r.each=function(){return layui.each.apply(layui,arguments),this},r.digit=function(t,e,n){var r="";t=String(t),e=e||2;for(var o=t.length;o<e;o++)r+="0";return t<Math.pow(10,e)?r+(0|t):t},r.elem=function(t,e){var o=n.createElement(t);return r.each(e||{},function(t,e){o.setAttribute(t,e)}),o},r.hasScrollbar=function(){return n.body.scrollHeight>(t.innerHeight||n.documentElement.clientHeight)},r.position=function(e,o,i){if(o){i=i||{},e!==n&&e!==r("body")[0]||(i.clickType="right");var c="right"===i.clickType?function(){var e=i.e||t.event||{};return{left:e.clientX,top:e.clientY,right:e.clientX,bottom:e.clientY}}():e.getBoundingClientRect(),u=o.offsetWidth,a=o.offsetHeight,s=function(t){return t=t?"scrollLeft":"scrollTop",n.body[t]|n.documentElement[t]},f=function(t){return n.documentElement[t?"clientWidth":"clientHeight"]},l=5,h=c.left,p=c.bottom;h+u+l>f("width")&&(h=f("width")-u-l),p+a+l>f()&&(c.top>a+l?p=c.top-a-2*l:"right"===i.clickType&&(p=f()-a-2*l,p<0&&(p=0)));var y=i.position;if(y&&(o.style.position=y),o.style.left=h+("fixed"===y?0:s(1))+"px",o.style.top=p+("fixed"===y?0:s())+"px",!r.hasScrollbar()){var d=o.getBoundingClientRect();!i.SYSTEM_RELOAD&&d.bottom+l>f()&&(i.SYSTEM_RELOAD=!0,setTimeout(function(){r.position(e,o,i)},50))}}},r.options=function(t,e){var n=r(t),o=e||"lay-options";try{return new Function("return "+(n.attr(o)||"{}"))()}catch(i){return hint.error("parseerror\uff1a"+i,"error"),{}}},r.isTopElem=function(t){var e=[n,r("body")[0]],o=!1;return r.each(e,function(e,n){if(n===t)return o=!0}),o},o.addStr=function(t,e){return t=t.replace(/\s+/," "),e=e.replace(/\s+/," ").split(" "),r.each(e,function(e,n){new RegExp("\\b"+n+"\\b").test(t)||(t=t+" "+n)}),t.replace(/^\s|\s$/,"")},o.removeStr=function(t,e){return t=t.replace(/\s+/," "),e=e.replace(/\s+/," ").split(" "),r.each(e,function(e,n){var r=new RegExp("\\b"+n+"\\b");r.test(t)&&(t=t.replace(r,""))}),t.replace(/\s+/," ").replace(/^\s|\s$/,"")},o.prototype.find=function(t){var e=this,n=0,o=[],i="object"==typeof t;return this.each(function(r,c){for(var u=i?c.contains(t):c.querySelectorAll(t||null);n<u.length;n++)o.push(u[n]);e.shift()}),i||(e.selector=(e.selector?e.selector+" ":"")+t),r.each(o,function(t,n){e.push(n)}),e},o.prototype.each=function(t){return r.each.call(this,this,t)},o.prototype.addClass=function(t,e){return this.each(function(n,r){r.className=o[e?"removeStr":"addStr"](r.className,t)})},o.prototype.removeClass=function(t){return this.addClass(t,!0)},o.prototype.hasClass=function(t){var e=!1;return this.each(function(n,r){new RegExp("\\b"+t+"\\b").test(r.className)&&(e=!0)}),e},o.prototype.css=function(t,e){var n=this,o=function(t){return isNaN(t)?t:t+"px"};return"string"==typeof t&&void 0===e?function(){if(n.length>0)return n[0].style[t]}():n.each(function(n,i){"object"==typeof t?r.each(t,function(t,e){i.style[t]=o(e)}):i.style[t]=o(e)})},o.prototype.width=function(t){var e=this;return void 0===t?function(){if(e.length>0)return e[0].offsetWidth}():e.each(function(n,r){e.css("width",t)})},o.prototype.height=function(t){var e=this;return void 0===t?function(){if(e.length>0)return e[0].offsetHeight}():e.each(function(n,r){e.css("height",t)})},o.prototype.attr=function(t,e){var n=this;return void 0===e?function(){if(n.length>0)return n[0].getAttribute(t)}():n.each(function(n,r){r.setAttribute(t,e)})},o.prototype.removeAttr=function(t){return this.each(function(e,n){n.removeAttribute(t)})},o.prototype.html=function(t){var e=this;return void 0===t?function(){if(e.length>0)return e[0].innerHTML}():this.each(function(e,n){n.innerHTML=t})},o.prototype.val=function(t){var e=this;return void 0===t?function(){if(e.length>0)return e[0].value}():this.each(function(e,n){n.value=t})},o.prototype.append=function(t){return this.each(function(e,n){"object"==typeof t?n.appendChild(t):n.innerHTML=n.innerHTML+t})},o.prototype.remove=function(t){return this.each(function(e,n){t?n.removeChild(t):n.parentNode.removeChild(n)})},o.prototype.on=function(t,e){return this.each(function(n,r){r.attachEvent?r.attachEvent("on"+t,function(t){t.target=t.srcElement,e.call(r,t)}):r.addEventListener(t,e,!1)})},o.prototype.off=function(t,e){return this.each(function(n,r){r.detachEvent?r.detachEvent("on"+t,e):r.removeEventListener(t,e,!1)})},t.lay=r,t.layui&&layui.define&&layui.define(function(t){t(e,r)})}(window,window.document);layui.define(function(e){"use strict";var r={open:"{{",close:"}}"},c={exp:function(e){return new RegExp(e,"g")},query:function(e,c,t){var o=["#([\\s\\S])+?","([^{#}])*?"][e||0];return n((c||"")+r.open+o+r.close+(t||""))},escape:function(e){return String(e||"").replace(/&(?!#?[a-zA-Z0-9]+;)/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/'/g,"&#39;").replace(/"/g,"&quot;")},error:function(e,r){var c="Laytpl Error: ";return"object"==typeof console&&console.error(c+e+"\n"+(r||"")),c+e}},n=c.exp,t=function(e){this.tpl=e};t.pt=t.prototype,window.errors=0,t.pt.parse=function(e,t){var o=this,p=e,a=n("^"+r.open+"#",""),l=n(r.close+"$","");e=e.replace(/\s+|\r|\t|\n/g," ").replace(n(r.open+"#"),r.open+"# ").replace(n(r.close+"}"),"} "+r.close).replace(/\\/g,"\\\\").replace(n(r.open+"!(.+?)!"+r.close),function(e){return e=e.replace(n("^"+r.open+"!"),"").replace(n("!"+r.close),"").replace(n(r.open+"|"+r.close),function(e){return e.replace(/(.)/g,"\\$1")})}).replace(/(?="|')/g,"\\").replace(c.query(),function(e){return e=e.replace(a,"").replace(l,""),'";'+e.replace(/\\(.)/g,"$1")+';view+="'}).replace(c.query(1),function(e){var c='"+(';return e.replace(/\s/g,"")===r.open+r.close?"":(e=e.replace(n(r.open+"|"+r.close),""),/^=/.test(e)&&(e=e.replace(/^=/,""),c='"+_escape_('),c+e.replace(/\\(.)/g,"$1")+')+"')}),e='"use strict";var view = "'+e+'";return view;';try{return o.cache=e=new Function("d, _escape_",e),e(t,c.escape)}catch(u){return delete o.cache,c.error(u,p)}},t.pt.render=function(e,r){var n,t=this;return e?(n=t.cache?t.cache(e,c.escape):t.parse(t.tpl,e),r?void r(n):n):c.error("no data")};var o=function(e){return"string"!=typeof e?c.error("Template not found"):new t(e)};o.config=function(e){e=e||{};for(var c in e)r[c]=e[c]},o.v="1.2.0",e("laytpl",o)});layui.define(function(e){"use strict";var a=document,t="getElementById",n="getElementsByTagName",i="laypage",r="layui-disabled",u=function(e){var a=this;a.config=e||{},a.config.index=++s.index,a.render(!0)};u.prototype.type=function(){var e=this.config;if("object"==typeof e.elem)return void 0===e.elem.length?2:3},u.prototype.view=function(){var e=this,a=e.config,t=a.groups="groups"in a?0|a.groups:5;a.layout="object"==typeof a.layout?a.layout:["prev","page","next"],a.count=0|a.count,a.curr=0|a.curr||1,a.limits="object"==typeof a.limits?a.limits:[10,20,30,40,50],a.limit=0|a.limit||10,a.pages=Math.ceil(a.count/a.limit)||1,a.curr>a.pages&&(a.curr=a.pages),t<0?t=1:t>a.pages&&(t=a.pages),a.prev="prev"in a?a.prev:"&#x4E0A;&#x4E00;&#x9875;",a.next="next"in a?a.next:"&#x4E0B;&#x4E00;&#x9875;";var n=a.pages>t?Math.ceil((a.curr+(t>1?1:0))/(t>0?t:1)):1,i={prev:function(){return a.prev?'<a href="javascript:;" class="layui-laypage-prev'+(1==a.curr?" "+r:"")+'" data-page="'+(a.curr-1)+'">'+a.prev+"</a>":""}(),page:function(){var e=[];if(a.count<1)return"";n>1&&a.first!==!1&&0!==t&&e.push('<a href="javascript:;" class="layui-laypage-first" data-page="1"  title="&#x9996;&#x9875;">'+(a.first||1)+"</a>");var i=Math.floor((t-1)/2),r=n>1?a.curr-i:1,u=n>1?function(){var e=a.curr+(t-i-1);return e>a.pages?a.pages:e}():t;for(u-r<t-1&&(r=u-t+1),a.first!==!1&&r>2&&e.push('<span class="layui-laypage-spr">&#x2026;</span>');r<=u;r++)r===a.curr?e.push('<span class="layui-laypage-curr"><em class="layui-laypage-em" '+(/^#/.test(a.theme)?'style="background-color:'+a.theme+';"':"")+"></em><em>"+r+"</em></span>"):e.push('<a href="javascript:;" data-page="'+r+'">'+r+"</a>");return a.pages>t&&a.pages>u&&a.last!==!1&&(u+1<a.pages&&e.push('<span class="layui-laypage-spr">&#x2026;</span>'),0!==t&&e.push('<a href="javascript:;" class="layui-laypage-last" title="&#x5C3E;&#x9875;"  data-page="'+a.pages+'">'+(a.last||a.pages)+"</a>")),e.join("")}(),next:function(){return a.next?'<a href="javascript:;" class="layui-laypage-next'+(a.curr==a.pages?" "+r:"")+'" data-page="'+(a.curr+1)+'">'+a.next+"</a>":""}(),count:'<span class="layui-laypage-count">\u5171 '+a.count+" \u6761</span>",limit:function(){var e=['<span class="layui-laypage-limits"><select lay-ignore>'];return layui.each(a.limits,function(t,n){e.push('<option value="'+n+'"'+(n===a.limit?"selected":"")+">"+n+" \u6761/\u9875</option>")}),e.join("")+"</select></span>"}(),refresh:['<a href="javascript:;" data-page="'+a.curr+'" class="layui-laypage-refresh">','<i class="layui-icon layui-icon-refresh"></i>',"</a>"].join(""),skip:function(){return['<span class="layui-laypage-skip">&#x5230;&#x7B2C;','<input type="text" min="1" value="'+a.curr+'" class="layui-input">','&#x9875;<button type="button" class="layui-laypage-btn">&#x786e;&#x5b9a;</button>',"</span>"].join("")}()};return['<div class="layui-box layui-laypage layui-laypage-'+(a.theme?/^#/.test(a.theme)?"molv":a.theme:"default")+'" id="layui-laypage-'+a.index+'">',function(){var e=[];return layui.each(a.layout,function(a,t){i[t]&&e.push(i[t])}),e.join("")}(),"</div>"].join("")},u.prototype.jump=function(e,a){if(e){var t=this,i=t.config,r=e.children,u=e[n]("button")[0],l=e[n]("input")[0],p=e[n]("select")[0],c=function(){var e=0|l.value.replace(/\s|\D/g,"");e&&(i.curr=e,t.render())};if(a)return c();for(var o=0,y=r.length;o<y;o++)"a"===r[o].nodeName.toLowerCase()&&s.on(r[o],"click",function(){var e=0|this.getAttribute("data-page");e<1||e>i.pages||(i.curr=e,t.render())});p&&s.on(p,"change",function(){var e=this.value;i.curr*e>i.count&&(i.curr=Math.ceil(i.count/e)),i.limit=e,t.render()}),u&&s.on(u,"click",function(){c()})}},u.prototype.skip=function(e){if(e){var a=this,t=e[n]("input")[0];t&&s.on(t,"keyup",function(t){var n=this.value,i=t.keyCode;/^(37|38|39|40)$/.test(i)||(/\D/.test(n)&&(this.value=n.replace(/\D/,"")),13===i&&a.jump(e,!0))})}},u.prototype.render=function(e){var n=this,i=n.config,r=n.type(),u=n.view();2===r?i.elem&&(i.elem.innerHTML=u):3===r?i.elem.html(u):a[t](i.elem)&&(a[t](i.elem).innerHTML=u),i.jump&&i.jump(i,e);var s=a[t]("layui-laypage-"+i.index);n.jump(s),i.hash&&!e&&(location.hash="!"+i.hash+"="+i.curr),n.skip(s)};var s={render:function(e){var a=new u(e);return a.index},index:layui.laypage?layui.laypage.index+1e4:0,on:function(e,a,t){return e.attachEvent?e.attachEvent("on"+a,function(a){a.target=a.srcElement,t.call(e,a)}):e.addEventListener(a,t,!1),this}};e(i,s)});!function(e,t){"use strict";var a=e.layui&&layui.define,n={getPath:e.lay&&lay.getPath?lay.getPath:"",link:function(t,a,n){l.path&&e.lay&&lay.layui&&lay.layui.link(l.path+t,a,n)}},i=e.LAYUI_GLOBAL||{},l={v:"5.3.1",config:{},index:e.laydate&&e.laydate.v?1e5:0,path:i.laydate_dir||n.getPath,set:function(e){var t=this;return t.config=lay.extend({},t.config,e),t},ready:function(e){var t="laydate",i="",r=(a?"modules/laydate/":"theme/")+"default/laydate.css?v="+l.v+i;return a?layui.addcss(r,e,t):n.link(r,e,t),this}},r=function(){var e=this,t=e.config,a=t.id;return r.that[a]=e,{hint:function(t){e.hint.call(e,t)},config:e.config}},o="laydate",s=".layui-laydate",y="layui-this",d="laydate-disabled",m=[100,2e5],c="layui-laydate-static",u="layui-laydate-list",h="layui-laydate-hint",f="layui-laydate-footer",p=".laydate-btns-confirm",g="laydate-time-text",v="laydate-btns-time",T="layui-laydate-preview",D=function(e){var t=this;t.index=++l.index,t.config=lay.extend({},t.config,l.config,e),e=t.config,e.id="id"in e?e.id:t.index,l.ready(function(){t.init()})},w="yyyy|y|MM|M|dd|d|HH|H|mm|m|ss|s";r.formatArr=function(e){return(e||"").match(new RegExp(w+"|.","g"))||[]},D.isLeapYear=function(e){return e%4===0&&e%100!==0||e%400===0},D.prototype.config={type:"date",range:!1,format:"yyyy-MM-dd",value:null,isInitValue:!0,min:"1900-1-1",max:"2099-12-31",trigger:"click",show:!1,showBottom:!0,isPreview:!0,btns:["clear","now","confirm"],lang:"cn",theme:"default",position:null,calendar:!1,mark:{},zIndex:null,done:null,change:null},D.prototype.lang=function(){var e=this,t=e.config,a={cn:{weeks:["\u65e5","\u4e00","\u4e8c","\u4e09","\u56db","\u4e94","\u516d"],time:["\u65f6","\u5206","\u79d2"],timeTips:"\u9009\u62e9\u65f6\u95f4",startTime:"\u5f00\u59cb\u65f6\u95f4",endTime:"\u7ed3\u675f\u65f6\u95f4",dateTips:"\u8fd4\u56de\u65e5\u671f",month:["\u4e00","\u4e8c","\u4e09","\u56db","\u4e94","\u516d","\u4e03","\u516b","\u4e5d","\u5341","\u5341\u4e00","\u5341\u4e8c"],tools:{confirm:"\u786e\u5b9a",clear:"\u6e05\u7a7a",now:"\u73b0\u5728"},timeout:"\u7ed3\u675f\u65f6\u95f4\u4e0d\u80fd\u65e9\u4e8e\u5f00\u59cb\u65f6\u95f4<br>\u8bf7\u91cd\u65b0\u9009\u62e9",invalidDate:"\u4e0d\u5728\u6709\u6548\u65e5\u671f\u6216\u65f6\u95f4\u8303\u56f4\u5185",formatError:["\u65e5\u671f\u683c\u5f0f\u4e0d\u5408\u6cd5<br>\u5fc5\u987b\u9075\u5faa\u4e0b\u8ff0\u683c\u5f0f\uff1a<br>","<br>\u5df2\u4e3a\u4f60\u91cd\u7f6e"],preview:"\u5f53\u524d\u9009\u4e2d\u7684\u7ed3\u679c"},en:{weeks:["Su","Mo","Tu","We","Th","Fr","Sa"],time:["Hours","Minutes","Seconds"],timeTips:"Select Time",startTime:"Start Time",endTime:"End Time",dateTips:"Select Date",month:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],tools:{confirm:"Confirm",clear:"Clear",now:"Now"},timeout:"End time cannot be less than start Time<br>Please re-select",invalidDate:"Invalid date",formatError:["The date format error<br>Must be followed\uff1a<br>","<br>It has been reset"],preview:"The selected result"}};return a[t.lang]||a.cn},D.prototype.init=function(){var t=this,a=t.config,n="static"===a.position,i={year:"yyyy",month:"yyyy-MM",date:"yyyy-MM-dd",time:"HH:mm:ss",datetime:"yyyy-MM-dd HH:mm:ss"};a.elem=lay(a.elem),a.eventElem=lay(a.eventElem),a.elem[0]&&(t.rangeStr=a.range?"string"==typeof a.range?a.range:"-":"",a.range&&a.range.constructor===Array&&(t.rangeElem=[lay(a.range[0]),lay(a.range[1])]),i[a.type]||(e.console&&console.error&&console.error("laydate type error:'"+a.type+"' is not supported"),a.type="date"),a.format===i.date&&(a.format=i[a.type]||i.date),t.format=r.formatArr(a.format),t.EXP_IF="",t.EXP_SPLIT="",lay.each(t.format,function(e,a){var n=new RegExp(w).test(a)?"\\d{"+function(){return new RegExp(w).test(t.format[0===e?e+1:e-1]||"")?/^yyyy|y$/.test(a)?4:a.length:/^yyyy$/.test(a)?"1,4":/^y$/.test(a)?"1,308":"1,2"}()+"}":"\\"+a;t.EXP_IF=t.EXP_IF+n,t.EXP_SPLIT=t.EXP_SPLIT+"("+n+")"}),t.EXP_IF_ONE=new RegExp("^"+t.EXP_IF+"$"),t.EXP_IF=new RegExp("^"+(a.range?t.EXP_IF+"\\s\\"+t.rangeStr+"\\s"+t.EXP_IF:t.EXP_IF)+"$"),t.EXP_SPLIT=new RegExp("^"+t.EXP_SPLIT+"$",""),t.isInput(a.elem[0])||"focus"===a.trigger&&(a.trigger="click"),a.elem.attr("lay-key")||(a.elem.attr("lay-key",t.index),a.eventElem.attr("lay-key",t.index)),a.mark=lay.extend({},a.calendar&&"cn"===a.lang?{"0-1-1":"\u5143\u65e6","0-2-14":"\u60c5\u4eba","0-3-8":"\u5987\u5973","0-3-12":"\u690d\u6811","0-4-1":"\u611a\u4eba","0-5-1":"\u52b3\u52a8","0-5-4":"\u9752\u5e74","0-6-1":"\u513f\u7ae5","0-9-10":"\u6559\u5e08","0-9-18":"\u56fd\u803b","0-10-1":"\u56fd\u5e86","0-12-25":"\u5723\u8bde"}:{},a.mark),lay.each(["min","max"],function(e,t){var n=[],i=[];if("number"==typeof a[t]){var l=a[t],r=(new Date).getTime(),o=864e5,s=new Date(l?l<o?r+l*o:l:r);n=[s.getFullYear(),s.getMonth()+1,s.getDate()],l<o||(i=[s.getHours(),s.getMinutes(),s.getSeconds()])}else n=(a[t].match(/\d+-\d+-\d+/)||[""])[0].split("-"),i=(a[t].match(/\d+:\d+:\d+/)||[""])[0].split(":");a[t]={year:0|n[0]||(new Date).getFullYear(),month:n[1]?(0|n[1])-1:(new Date).getMonth(),date:0|n[2]||(new Date).getDate(),hours:0|i[0],minutes:0|i[1],seconds:0|i[2]}}),t.elemID="layui-laydate"+a.elem.attr("lay-key"),(a.show||n)&&t.render(),n||t.events(),a.value&&a.isInitValue&&(a.value.constructor===Date?t.setValue(t.parse(0,t.systemDate(a.value))):t.setValue(a.value)))},D.prototype.render=function(){var e=this,a=e.config,n=e.lang(),i="static"===a.position,r=e.elem=lay.elem("div",{id:e.elemID,"class":["layui-laydate",a.range?" layui-laydate-range":"",i?" "+c:"",a.theme&&"default"!==a.theme&&!/^#/.test(a.theme)?" laydate-theme-"+a.theme:""].join("")}),o=e.elemMain=[],s=e.elemHeader=[],y=e.elemCont=[],d=e.table=[],m=e.footer=lay.elem("div",{"class":f});if(a.zIndex&&(r.style.zIndex=a.zIndex),lay.each(new Array(2),function(e){if(!a.range&&e>0)return!0;var t=lay.elem("div",{"class":"layui-laydate-header"}),i=[function(){var e=lay.elem("i",{"class":"layui-icon laydate-icon laydate-prev-y"});return e.innerHTML="&#xe65a;",e}(),function(){var e=lay.elem("i",{"class":"layui-icon laydate-icon laydate-prev-m"});return e.innerHTML="&#xe603;",e}(),function(){var e=lay.elem("div",{"class":"laydate-set-ym"}),t=lay.elem("span"),a=lay.elem("span");return e.appendChild(t),e.appendChild(a),e}(),function(){var e=lay.elem("i",{"class":"layui-icon laydate-icon laydate-next-m"});return e.innerHTML="&#xe602;",e}(),function(){var e=lay.elem("i",{"class":"layui-icon laydate-icon laydate-next-y"});return e.innerHTML="&#xe65b;",e}()],l=lay.elem("div",{"class":"layui-laydate-content"}),r=lay.elem("table"),m=lay.elem("thead"),c=lay.elem("tr");lay.each(i,function(e,a){t.appendChild(a)}),m.appendChild(c),lay.each(new Array(6),function(e){var t=r.insertRow(0);lay.each(new Array(7),function(a){if(0===e){var i=lay.elem("th");i.innerHTML=n.weeks[a],c.appendChild(i)}t.insertCell(a)})}),r.insertBefore(m,r.children[0]),l.appendChild(r),o[e]=lay.elem("div",{"class":"layui-laydate-main laydate-main-list-"+e}),o[e].appendChild(t),o[e].appendChild(l),s.push(i),y.push(l),d.push(r)}),lay(m).html(function(){var e=[],t=[];return"datetime"===a.type&&e.push('<span lay-type="datetime" class="'+v+'">'+n.timeTips+"</span>"),(a.range||"datetime"!==a.type)&&e.push('<span class="'+T+'" title="'+n.preview+'"></span>'),lay.each(a.btns,function(e,l){var r=n.tools[l]||"btn";a.range&&"now"===l||(i&&"clear"===l&&(r="cn"===a.lang?"\u91cd\u7f6e":"Reset"),t.push('<span lay-type="'+l+'" class="laydate-btns-'+l+'">'+r+"</span>"))}),e.push('<div class="laydate-footer-btns">'+t.join("")+"</div>"),e.join("")}()),lay.each(o,function(e,t){r.appendChild(t)}),a.showBottom&&r.appendChild(m),/^#/.test(a.theme)){var u=lay.elem("style"),h=["#{{id}} .layui-laydate-header{background-color:{{theme}};}","#{{id}} .layui-this{background-color:{{theme}} !important;}"].join("").replace(/{{id}}/g,e.elemID).replace(/{{theme}}/g,a.theme);"styleSheet"in u?(u.setAttribute("type","text/css"),u.styleSheet.cssText=h):u.innerHTML=h,lay(r).addClass("laydate-theme-molv"),r.appendChild(u)}l.thisId=a.id,e.remove(D.thisElemDate),i?a.elem.append(r):(t.body.appendChild(r),e.position()),e.checkDate().calendar(null,0,"init"),e.changeEvent(),D.thisElemDate=e.elemID,"function"==typeof a.ready&&a.ready(lay.extend({},a.dateTime,{month:a.dateTime.month+1})),e.preview()},D.prototype.remove=function(e){var t=this,a=(t.config,lay("#"+(e||t.elemID)));return a[0]?(a.hasClass(c)||t.checkDate(function(){a.remove()}),t):t},D.prototype.position=function(){var e=this,t=e.config;return lay.position(e.bindElem||t.elem[0],e.elem,{position:t.position}),e},D.prototype.hint=function(e){var t=this,a=(t.config,lay.elem("div",{"class":h}));t.elem&&(a.innerHTML=e||"",lay(t.elem).find("."+h).remove(),t.elem.appendChild(a),clearTimeout(t.hinTimer),t.hinTimer=setTimeout(function(){lay(t.elem).find("."+h).remove()},3e3))},D.prototype.getAsYM=function(e,t,a){return a?t--:t++,t<0&&(t=11,e--),t>11&&(t=0,e++),[e,t]},D.prototype.systemDate=function(e){var t=e||new Date;return{year:t.getFullYear(),month:t.getMonth(),date:t.getDate(),hours:e?e.getHours():0,minutes:e?e.getMinutes():0,seconds:e?e.getSeconds():0}},D.prototype.checkDate=function(e){var t,a,n=this,i=(new Date,n.config),r=n.lang(),o=i.dateTime=i.dateTime||n.systemDate(),s=n.bindElem||i.elem[0],y=(n.isInput(s)?"val":"html",function(){if(n.rangeElem){var e=[n.rangeElem[0].val(),n.rangeElem[1].val()];if(e[0]&&e[1])return e.join(" "+n.rangeStr+" ")}return n.isInput(s)?s.value:"static"===i.position?"":lay(s).attr("lay-date")}()),d=function(e){e.year>m[1]&&(e.year=m[1],a=!0),e.month>11&&(e.month=11,a=!0),e.hours>23&&(e.hours=0,a=!0),e.minutes>59&&(e.minutes=0,e.hours++,a=!0),e.seconds>59&&(e.seconds=0,e.minutes++,a=!0),t=l.getEndDate(e.month+1,e.year),e.date>t&&(e.date=t,a=!0)},c=function(e,t,l){var r=["startTime","endTime"];t=(t.match(n.EXP_SPLIT)||[]).slice(1),l=l||0,i.range&&(n[r[l]]=n[r[l]]||{}),lay.each(n.format,function(o,s){var y=parseFloat(t[o]);t[o].length<s.length&&(a=!0),/yyyy|y/.test(s)?(y<m[0]&&(y=m[0],a=!0),e.year=y):/MM|M/.test(s)?(y<1&&(y=1,a=!0),e.month=y-1):/dd|d/.test(s)?(y<1&&(y=1,a=!0),e.date=y):/HH|H/.test(s)?(y<1&&(y=0,a=!0),e.hours=y,i.range&&(n[r[l]].hours=y)):/mm|m/.test(s)?(y<1&&(y=0,a=!0),e.minutes=y,i.range&&(n[r[l]].minutes=y)):/ss|s/.test(s)&&(y<1&&(y=0,a=!0),e.seconds=y,i.range&&(n[r[l]].seconds=y))}),d(e)};if("limit"===e)return d(o),n;y=y||i.value,"string"==typeof y&&(y=y.replace(/\s+/g," ").replace(/^\s|\s$/g,""));var u=function(){i.range&&(n.endDate=n.endDate||lay.extend({},i.dateTime,function(){var e={},t=i.dateTime,a=n.getAsYM(t.year,t.month);return"year"===i.type?e.year=t.year+1:"time"!==i.type&&(e.year=a[0],e.month=a[1]),"datetime"!==i.type&&"time"!==i.type||(e.hours=23,e.minutes=e.seconds=59),e}()))};u(),"string"==typeof y&&y?n.EXP_IF.test(y)?i.range?(y=y.split(" "+n.rangeStr+" "),lay.each([i.dateTime,n.endDate],function(e,t){c(t,y[e],e)})):c(o,y):(n.hint(r.formatError[0]+(i.range?i.format+" "+n.rangeStr+" "+i.format:i.format)+r.formatError[1]),a=!0):y&&y.constructor===Date?i.dateTime=n.systemDate(y):(i.dateTime=n.systemDate(),delete n.startTime,delete n.endDate,u(),delete n.endTime),function(){if(n.rangeElem){var e=[n.rangeElem[0].val(),n.rangeElem[1].val()],t=[i.dateTime,n.endDate];lay.each(e,function(e,a){n.EXP_IF_ONE.test(a)&&c(t[e],a,e)})}}(),d(o),i.range&&d(n.endDate),a&&y&&n.setValue(i.range?n.endDate?n.parse():"":n.parse());var h=function(e){return n.newDate(e).getTime()};return(h(o)>h(i.max)||h(o)<h(i.min))&&(o=i.dateTime=lay.extend({},i.min)),i.range&&(h(n.endDate)<h(i.min)||h(n.endDate)>h(i.max))&&(n.endDate=lay.extend({},i.max)),e&&e(),n},D.prototype.mark=function(e,t){var a,n=this,i=n.config;return lay.each(i.mark,function(e,n){var i=e.split("-");i[0]!=t[0]&&0!=i[0]||i[1]!=t[1]&&0!=i[1]||i[2]!=t[2]||(a=n||t[2])}),a&&e.html('<span class="laydate-day-mark">'+a+"</span>"),n},D.prototype.limit=function(e,t,a,n){var i,l=this,r=l.config,o={},s=r[a>41?"endDate":"dateTime"],y=lay.extend({},s,t||{});return lay.each({now:y,min:r.min,max:r.max},function(e,t){o[e]=l.newDate(lay.extend({year:t.year,month:t.month,date:t.date},function(){var e={};return lay.each(n,function(a,n){e[n]=t[n]}),e}())).getTime()}),i=o.now<o.min||o.now>o.max,e&&e[i?"addClass":"removeClass"](d),i},D.prototype.thisDateTime=function(e){var t=this,a=t.config;return e?t.endDate:a.dateTime},D.prototype.calendar=function(e,t,a){var n,i,r,o=this,s=o.config,t=t?1:0,d=e||o.thisDateTime(t),c=new Date,u=o.lang(),h="date"!==s.type&&"datetime"!==s.type,f=lay(o.table[t]).find("td"),g=lay(o.elemHeader[t][2]).find("span");return d.year<m[0]&&(d.year=m[0],o.hint(u.invalidDate)),d.year>m[1]&&(d.year=m[1],o.hint(u.invalidDate)),o.firstDate||(o.firstDate=lay.extend({},d)),c.setFullYear(d.year,d.month,1),n=c.getDay(),i=l.getEndDate(d.month||12,d.year),r=l.getEndDate(d.month+1,d.year),lay.each(f,function(e,t){var a=[d.year,d.month],l=0;t=lay(t),t.removeAttr("class"),e<n?(l=i-n+e,t.addClass("laydate-day-prev"),a=o.getAsYM(d.year,d.month,"sub")):e>=n&&e<r+n?(l=e-n,l+1===d.date&&t.addClass(y)):(l=e-r-n,t.addClass("laydate-day-next"),a=o.getAsYM(d.year,d.month)),a[1]++,a[2]=l+1,t.attr("lay-ymd",a.join("-")).html(a[2]),o.mark(t,a).limit(t,{year:a[0],month:a[1]-1,date:a[2]},e)}),lay(g[0]).attr("lay-ym",d.year+"-"+(d.month+1)),lay(g[1]).attr("lay-ym",d.year+"-"+(d.month+1)),"cn"===s.lang?(lay(g[0]).attr("lay-type","year").html(d.year+" \u5e74"),lay(g[1]).attr("lay-type","month").html(d.month+1+" \u6708")):(lay(g[0]).attr("lay-type","month").html(u.month[d.month]),lay(g[1]).attr("lay-type","year").html(d.year)),h&&(s.range?e&&(o.listYM=[[s.dateTime.year,s.dateTime.month+1],[o.endDate.year,o.endDate.month+1]],o.list(s.type,0).list(s.type,1),"time"===s.type?o.setBtnStatus("\u65f6\u95f4",lay.extend({},o.systemDate(),o.startTime),lay.extend({},o.systemDate(),o.endTime)):o.setBtnStatus(!0)):(o.listYM=[[d.year,d.month+1]],o.list(s.type,0))),s.range&&"init"===a&&!e&&o.calendar(o.endDate,1),s.range||o.limit(lay(o.footer).find(p),null,0,["hours","minutes","seconds"]),o.setBtnStatus(),o},D.prototype.list=function(e,t){var a=this,n=a.config,i=n.dateTime,l=a.lang(),r=n.range&&"date"!==n.type&&"datetime"!==n.type,o=lay.elem("ul",{"class":u+" "+{year:"laydate-year-list",month:"laydate-month-list",time:"laydate-time-list"}[e]}),s=a.elemHeader[t],m=lay(s[2]).find("span"),c=a.elemCont[t||0],h=lay(c).find("."+u)[0],f="cn"===n.lang,T=f?"\u5e74":"",D=a.listYM[t]||{},w=["hours","minutes","seconds"],x=["startTime","endTime"][t];if(D[0]<1&&(D[0]=1),"year"===e){var M,E=M=D[0]-7;E<1&&(E=M=1),lay.each(new Array(15),function(e){var i=lay.elem("li",{"lay-ym":M}),l={year:M};M==D[0]&&lay(i).addClass(y),i.innerHTML=M+T,o.appendChild(i),M<a.firstDate.year?(l.month=n.min.month,l.date=n.min.date):M>=a.firstDate.year&&(l.month=n.max.month,l.date=n.max.date),a.limit(lay(i),l,t),M++}),lay(m[f?0:1]).attr("lay-ym",M-8+"-"+D[1]).html(E+T+" - "+(M-1+T))}else if("month"===e)lay.each(new Array(12),function(e){var i=lay.elem("li",{"lay-ym":e}),r={year:D[0],month:e};e+1==D[1]&&lay(i).addClass(y),i.innerHTML=l.month[e]+(f?"\u6708":""),o.appendChild(i),D[0]<a.firstDate.year?r.date=n.min.date:D[0]>=a.firstDate.year&&(r.date=n.max.date),a.limit(lay(i),r,t)}),lay(m[f?0:1]).attr("lay-ym",D[0]+"-"+D[1]).html(D[0]+T);else if("time"===e){var C=function(){lay(o).find("ol").each(function(e,n){lay(n).find("li").each(function(n,i){a.limit(lay(i),[{hours:n},{hours:a[x].hours,minutes:n},{hours:a[x].hours,minutes:a[x].minutes,seconds:n}][e],t,[["hours"],["hours","minutes"],["hours","minutes","seconds"]][e])})}),n.range||a.limit(lay(a.footer).find(p),a[x],0,["hours","minutes","seconds"])};n.range?a[x]||(a[x]="startTime"===x?i:a.endDate):a[x]=i,lay.each([24,60,60],function(e,t){var n=lay.elem("li"),i=["<p>"+l.time[e]+"</p><ol>"];lay.each(new Array(t),function(t){i.push("<li"+(a[x][w[e]]===t?' class="'+y+'"':"")+">"+lay.digit(t,2)+"</li>")}),n.innerHTML=i.join("")+"</ol>",o.appendChild(n)}),C()}if(h&&c.removeChild(h),c.appendChild(o),"year"===e||"month"===e)lay(a.elemMain[t]).addClass("laydate-ym-show"),lay(o).find("li").on("click",function(){var l=0|lay(this).attr("lay-ym");if(!lay(this).hasClass(d)){0===t?(i[e]=l,a.limit(lay(a.footer).find(p),null,0)):a.endDate[e]=l;var s="year"===n.type||"month"===n.type;s?(lay(o).find("."+y).removeClass(y),lay(this).addClass(y),"month"===n.type&&"year"===e&&(a.listYM[t][0]=l,r&&((t?a.endDate:i).year=l),a.list("month",t))):(a.checkDate("limit").calendar(null,t),a.closeList()),a.setBtnStatus(),n.range||("month"===n.type&&"month"===e||"year"===n.type&&"year"===e)&&a.setValue(a.parse()).remove().done(),a.done(null,"change"),lay(a.footer).find("."+v).removeClass(d)}});else{var I=lay.elem("span",{"class":g}),k=function(){lay(o).find("ol").each(function(e){var t=this,n=lay(t).find("li");t.scrollTop=30*(a[x][w[e]]-2),t.scrollTop<=0&&n.each(function(e,a){if(!lay(this).hasClass(d))return t.scrollTop=30*(e-2),!0})})},b=lay(s[2]).find("."+g);k(),I.innerHTML=n.range?[l.startTime,l.endTime][t]:l.timeTips,lay(a.elemMain[t]).addClass("laydate-time-show"),b[0]&&b.remove(),s[2].appendChild(I),lay(o).find("ol").each(function(e){var t=this;lay(t).find("li").on("click",function(){var l=0|this.innerHTML;lay(this).hasClass(d)||(n.range?a[x][w[e]]=l:i[w[e]]=l,lay(t).find("."+y).removeClass(y),lay(this).addClass(y),C(),k(),(a.endDate||"time"===n.type)&&a.done(null,"change"),a.setBtnStatus())})})}return a},D.prototype.listYM=[],D.prototype.closeList=function(){var e=this;e.config;lay.each(e.elemCont,function(t,a){lay(this).find("."+u).remove(),lay(e.elemMain[t]).removeClass("laydate-ym-show laydate-time-show")}),lay(e.elem).find("."+g).remove()},D.prototype.setBtnStatus=function(e,t,a){var n,i=this,l=i.config,r=i.lang(),o=lay(i.footer).find(p);l.range&&"time"!==l.type&&(t=t||l.dateTime,a=a||i.endDate,n=i.newDate(t).getTime()>i.newDate(a).getTime(),i.limit(null,t)||i.limit(null,a)?o.addClass(d):o[n?"addClass":"removeClass"](d),e&&n&&i.hint("string"==typeof e?r.timeout.replace(/\u65e5\u671f/g,e):r.timeout))},D.prototype.parse=function(e,t){var a=this,n=a.config,i=t||("end"==e?lay.extend({},a.endDate,a.endTime):n.range?lay.extend({},n.dateTime,a.startTime):n.dateTime),r=l.parse(i,a.format,1);return n.range&&void 0===e?r+" "+a.rangeStr+" "+a.parse("end"):r},D.prototype.newDate=function(e){return e=e||{},new Date(e.year||1,e.month||0,e.date||1,e.hours||0,e.minutes||0,e.seconds||0)},D.prototype.setValue=function(e){var t=this,a=t.config,n=t.bindElem||a.elem[0];return"static"===a.position?t:(e=e||"",t.isInput(n)?lay(n).val(e):t.rangeElem?(t.rangeElem[0].val(e?t.parse("start"):""),t.rangeElem[1].val(e?t.parse("end"):"")):(0===lay(n).find("*").length&&lay(n).html(e),lay(n).attr("lay-date",e)),t)},D.prototype.preview=function(){var e=this,t=e.config;if(t.isPreview){var a=lay(e.elem).find("."+T),n=t.range?e.endDate?e.parse():"":e.parse();a.html(n).css({color:"#5FB878","font-size":"14px;"}),setTimeout(function(){a.css({color:"#666","font-size":"12px;"})},300)}},D.prototype.done=function(e,t){var a=this,n=a.config,i=lay.extend({},lay.extend(n.dateTime,a.startTime)),l=lay.extend({},lay.extend(a.endDate,a.endTime));return lay.each([i,l],function(e,t){"month"in t&&lay.extend(t,{month:t.month+1})}),a.preview(),e=e||[a.parse(),i,l],"function"==typeof n[t||"done"]&&n[t||"done"].apply(n,e),a},D.prototype.choose=function(e,t){var a=this,n=a.config,i=a.thisDateTime(t),l=(lay(a.elem).find("td"),e.attr("lay-ymd").split("-"));l={year:0|l[0],month:(0|l[1])-1,date:0|l[2]},e.hasClass(d)||(lay.extend(i,l),n.range?(lay.each(["startTime","endTime"],function(e,t){a[t]=a[t]||{hours:0,minutes:0,seconds:0}}),a.calendar(null,t).done(null,"change")):"static"===n.position?a.calendar().done().done(null,"change"):"date"===n.type?a.setValue(a.parse()).remove().done():"datetime"===n.type&&a.calendar().done(null,"change"))},D.prototype.tool=function(e,t){var a=this,n=a.config,i=a.lang(),l=n.dateTime,r="static"===n.position,o={datetime:function(){lay(e).hasClass(d)||(a.list("time",0),n.range&&a.list("time",1),lay(e).attr("lay-type","date").html(a.lang().dateTips))},date:function(){a.closeList(),lay(e).attr("lay-type","datetime").html(a.lang().timeTips)},clear:function(){r&&(lay.extend(l,a.firstDate),a.calendar()),n.range&&(delete n.dateTime,delete a.endDate,delete a.startTime,delete a.endTime),a.setValue("").remove(),a.done(["",{},{}])},now:function(){var e=new Date;lay.extend(l,a.systemDate(),{hours:e.getHours(),minutes:e.getMinutes(),seconds:e.getSeconds()}),a.setValue(a.parse()).remove(),r&&a.calendar(),a.done()},confirm:function(){if(n.range){if(lay(e).hasClass(d))return a.hint("time"===n.type?i.timeout.replace(/\u65e5\u671f/g,"\u65f6\u95f4"):i.timeout)}else if(lay(e).hasClass(d))return a.hint(i.invalidDate);a.done(),a.setValue(a.parse()).remove()}};o[t]&&o[t]()},D.prototype.change=function(e){var t=this,a=t.config,n=t.thisDateTime(e),i=a.range&&("year"===a.type||"month"===a.type),l=t.elemCont[e||0],r=t.listYM[e],o=function(o){var s=lay(l).find(".laydate-year-list")[0],y=lay(l).find(".laydate-month-list")[0];return s&&(r[0]=o?r[0]-15:r[0]+15,t.list("year",e)),y&&(o?r[0]--:r[0]++,t.list("month",e)),(s||y)&&(lay.extend(n,{year:r[0]}),i&&(n.year=r[0]),a.range||t.done(null,"change"),a.range||t.limit(lay(t.footer).find(p),{year:r[0]})),t.setBtnStatus(),s||y};return{prevYear:function(){o("sub")||(n.year--,t.checkDate("limit").calendar(null,e),t.done(null,"change"))},prevMonth:function(){var a=t.getAsYM(n.year,n.month,"sub");lay.extend(n,{year:a[0],month:a[1]}),t.checkDate("limit").calendar(null,e),t.done(null,"change")},nextMonth:function(){var a=t.getAsYM(n.year,n.month);lay.extend(n,{year:a[0],month:a[1]}),t.checkDate("limit").calendar(null,e),t.done(null,"change")},nextYear:function(){o()||(n.year++,t.checkDate("limit").calendar(null,e),t.done(null,"change"))}}},D.prototype.changeEvent=function(){var e=this;e.config;lay(e.elem).on("click",function(e){lay.stope(e)}).on("mousedown",function(e){lay.stope(e)}),lay.each(e.elemHeader,function(t,a){lay(a[0]).on("click",function(a){e.change(t).prevYear()}),lay(a[1]).on("click",function(a){e.change(t).prevMonth()}),lay(a[2]).find("span").on("click",function(a){var n=lay(this),i=n.attr("lay-ym"),l=n.attr("lay-type");i&&(i=i.split("-"),e.listYM[t]=[0|i[0],0|i[1]],e.list(l,t),lay(e.footer).find("."+v).addClass(d))}),lay(a[3]).on("click",function(a){e.change(t).nextMonth()}),lay(a[4]).on("click",function(a){e.change(t).nextYear()})}),lay.each(e.table,function(t,a){var n=lay(a).find("td");n.on("click",function(){e.choose(lay(this),t)})}),lay(e.footer).find("span").on("click",function(){var t=lay(this).attr("lay-type");e.tool(this,t)})},D.prototype.isInput=function(e){return/input|textarea/.test(e.tagName.toLocaleLowerCase())},D.prototype.events=function(){var e=this,t=e.config,a=function(a,n){a.on(t.trigger,function(){n&&(e.bindElem=this),e.render()})};t.elem[0]&&!t.elem[0].eventHandler&&(a(t.elem,"bind"),a(t.eventElem),t.elem[0].eventHandler=!0)},r.that={},r.getThis=function(e){var t=r.that[e];return t||hint.error(e?o+" instance with ID '"+e+"' not found":"ID argument required"),t},n.run=function(a){a(t).on("mousedown",function(e){if(l.thisId){var t=r.getThis(l.thisId);if(t){var n=t.config;e.target!==n.elem[0]&&e.target!==n.eventElem[0]&&e.target!==a(n.closeStop)[0]&&t.remove()}}}).on("keydown",function(e){if(l.thisId){var t=r.getThis(l.thisId);t&&13===e.keyCode&&a("#"+t.elemID)[0]&&t.elemID===D.thisElemDate&&(e.preventDefault(),a(t.footer).find(p)[0].click())}}),a(e).on("resize",function(){if(l.thisId){var e=r.getThis(l.thisId);if(e)return!(!e.elem||!a(s)[0])&&void e.position()}})},l.render=function(e){var t=new D(e);return r.call(t)},l.parse=function(e,t,a){return e=e||{},"string"==typeof t&&(t=r.formatArr(t)),t=(t||[]).concat(),lay.each(t,function(n,i){/yyyy|y/.test(i)?t[n]=lay.digit(e.year,i.length):/MM|M/.test(i)?t[n]=lay.digit(e.month+(a||0),i.length):/dd|d/.test(i)?t[n]=lay.digit(e.date,i.length):/HH|H/.test(i)?t[n]=lay.digit(e.hours,i.length):/mm|m/.test(i)?t[n]=lay.digit(e.minutes,i.length):/ss|s/.test(i)&&(t[n]=lay.digit(e.seconds,i.length))}),t.join("")},l.getEndDate=function(e,t){var a=new Date;return a.setFullYear(t||a.getFullYear(),e||a.getMonth()+1,1),new Date(a.getTime()-864e5).getDate()},a?(l.ready(),layui.define("lay",function(e){l.path=layui.cache.dir,n.run(lay),e(o,l)})):"function"==typeof define&&define.amd?define(function(){return n.run(lay),l}):function(){l.ready(),n.run(e.lay),e.laydate=l}()}(window,window.document);!function(e,t){"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(e,t){function n(e){var t=!!e&&"length"in e&&e.length,n=pe.type(e);return"function"!==n&&!pe.isWindow(e)&&("array"===n||0===t||"number"==typeof t&&t>0&&t-1 in e)}function r(e,t,n){if(pe.isFunction(t))return pe.grep(e,function(e,r){return!!t.call(e,r,e)!==n});if(t.nodeType)return pe.grep(e,function(e){return e===t!==n});if("string"==typeof t){if(Ce.test(t))return pe.filter(t,e,n);t=pe.filter(t,e)}return pe.grep(e,function(e){return pe.inArray(e,t)>-1!==n})}function i(e,t){do e=e[t];while(e&&1!==e.nodeType);return e}function o(e){var t={};return pe.each(e.match(De)||[],function(e,n){t[n]=!0}),t}function a(){re.addEventListener?(re.removeEventListener("DOMContentLoaded",s),e.removeEventListener("load",s)):(re.detachEvent("onreadystatechange",s),e.detachEvent("onload",s))}function s(){(re.addEventListener||"load"===e.event.type||"complete"===re.readyState)&&(a(),pe.ready())}function u(e,t,n){if(void 0===n&&1===e.nodeType){var r="data-"+t.replace(_e,"-$1").toLowerCase();if(n=e.getAttribute(r),"string"==typeof n){try{n="true"===n||"false"!==n&&("null"===n?null:+n+""===n?+n:qe.test(n)?pe.parseJSON(n):n)}catch(i){}pe.data(e,t,n)}else n=void 0}return n}function l(e){var t;for(t in e)if(("data"!==t||!pe.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}function c(e,t,n,r){if(He(e)){var i,o,a=pe.expando,s=e.nodeType,u=s?pe.cache:e,l=s?e[a]:e[a]&&a;if(l&&u[l]&&(r||u[l].data)||void 0!==n||"string"!=typeof t)return l||(l=s?e[a]=ne.pop()||pe.guid++:a),u[l]||(u[l]=s?{}:{toJSON:pe.noop}),"object"!=typeof t&&"function"!=typeof t||(r?u[l]=pe.extend(u[l],t):u[l].data=pe.extend(u[l].data,t)),o=u[l],r||(o.data||(o.data={}),o=o.data),void 0!==n&&(o[pe.camelCase(t)]=n),"string"==typeof t?(i=o[t],null==i&&(i=o[pe.camelCase(t)])):i=o,i}}function f(e,t,n){if(He(e)){var r,i,o=e.nodeType,a=o?pe.cache:e,s=o?e[pe.expando]:pe.expando;if(a[s]){if(t&&(r=n?a[s]:a[s].data)){pe.isArray(t)?t=t.concat(pe.map(t,pe.camelCase)):t in r?t=[t]:(t=pe.camelCase(t),t=t in r?[t]:t.split(" ")),i=t.length;for(;i--;)delete r[t[i]];if(n?!l(r):!pe.isEmptyObject(r))return}(n||(delete a[s].data,l(a[s])))&&(o?pe.cleanData([e],!0):fe.deleteExpando||a!=a.window?delete a[s]:a[s]=void 0)}}}function d(e,t,n,r){var i,o=1,a=20,s=r?function(){return r.cur()}:function(){return pe.css(e,t,"")},u=s(),l=n&&n[3]||(pe.cssNumber[t]?"":"px"),c=(pe.cssNumber[t]||"px"!==l&&+u)&&Me.exec(pe.css(e,t));if(c&&c[3]!==l){l=l||c[3],n=n||[],c=+u||1;do o=o||".5",c/=o,pe.style(e,t,c+l);while(o!==(o=s()/u)&&1!==o&&--a)}return n&&(c=+c||+u||0,i=n[1]?c+(n[1]+1)*n[2]:+n[2],r&&(r.unit=l,r.start=c,r.end=i)),i}function p(e){var t=ze.split("|"),n=e.createDocumentFragment();if(n.createElement)for(;t.length;)n.createElement(t.pop());return n}function h(e,t){var n,r,i=0,o="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):void 0;if(!o)for(o=[],n=e.childNodes||e;null!=(r=n[i]);i++)!t||pe.nodeName(r,t)?o.push(r):pe.merge(o,h(r,t));return void 0===t||t&&pe.nodeName(e,t)?pe.merge([e],o):o}function g(e,t){for(var n,r=0;null!=(n=e[r]);r++)pe._data(n,"globalEval",!t||pe._data(t[r],"globalEval"))}function m(e){Be.test(e.type)&&(e.defaultChecked=e.checked)}function y(e,t,n,r,i){for(var o,a,s,u,l,c,f,d=e.length,y=p(t),v=[],x=0;x<d;x++)if(a=e[x],a||0===a)if("object"===pe.type(a))pe.merge(v,a.nodeType?[a]:a);else if(Ue.test(a)){for(u=u||y.appendChild(t.createElement("div")),l=(We.exec(a)||["",""])[1].toLowerCase(),f=Xe[l]||Xe._default,u.innerHTML=f[1]+pe.htmlPrefilter(a)+f[2],o=f[0];o--;)u=u.lastChild;if(!fe.leadingWhitespace&&$e.test(a)&&v.push(t.createTextNode($e.exec(a)[0])),!fe.tbody)for(a="table"!==l||Ve.test(a)?"<table>"!==f[1]||Ve.test(a)?0:u:u.firstChild,o=a&&a.childNodes.length;o--;)pe.nodeName(c=a.childNodes[o],"tbody")&&!c.childNodes.length&&a.removeChild(c);for(pe.merge(v,u.childNodes),u.textContent="";u.firstChild;)u.removeChild(u.firstChild);u=y.lastChild}else v.push(t.createTextNode(a));for(u&&y.removeChild(u),fe.appendChecked||pe.grep(h(v,"input"),m),x=0;a=v[x++];)if(r&&pe.inArray(a,r)>-1)i&&i.push(a);else if(s=pe.contains(a.ownerDocument,a),u=h(y.appendChild(a),"script"),s&&g(u),n)for(o=0;a=u[o++];)Ie.test(a.type||"")&&n.push(a);return u=null,y}function v(){return!0}function x(){return!1}function b(){try{return re.activeElement}catch(e){}}function w(e,t,n,r,i,o){var a,s;if("object"==typeof t){"string"!=typeof n&&(r=r||n,n=void 0);for(s in t)w(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),i===!1)i=x;else if(!i)return e;return 1===o&&(a=i,i=function(e){return pe().off(e),a.apply(this,arguments)},i.guid=a.guid||(a.guid=pe.guid++)),e.each(function(){pe.event.add(this,t,i,r,n)})}function T(e,t){return pe.nodeName(e,"table")&&pe.nodeName(11!==t.nodeType?t:t.firstChild,"tr")?e.getElementsByTagName("tbody")[0]||e.appendChild(e.ownerDocument.createElement("tbody")):e}function C(e){return e.type=(null!==pe.find.attr(e,"type"))+"/"+e.type,e}function E(e){var t=it.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function N(e,t){if(1===t.nodeType&&pe.hasData(e)){var n,r,i,o=pe._data(e),a=pe._data(t,o),s=o.events;if(s){delete a.handle,a.events={};for(n in s)for(r=0,i=s[n].length;r<i;r++)pe.event.add(t,n,s[n][r])}a.data&&(a.data=pe.extend({},a.data))}}function k(e,t){var n,r,i;if(1===t.nodeType){if(n=t.nodeName.toLowerCase(),!fe.noCloneEvent&&t[pe.expando]){i=pe._data(t);for(r in i.events)pe.removeEvent(t,r,i.handle);t.removeAttribute(pe.expando)}"script"===n&&t.text!==e.text?(C(t).text=e.text,E(t)):"object"===n?(t.parentNode&&(t.outerHTML=e.outerHTML),fe.html5Clone&&e.innerHTML&&!pe.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):"input"===n&&Be.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):"option"===n?t.defaultSelected=t.selected=e.defaultSelected:"input"!==n&&"textarea"!==n||(t.defaultValue=e.defaultValue)}}function S(e,t,n,r){t=oe.apply([],t);var i,o,a,s,u,l,c=0,f=e.length,d=f-1,p=t[0],g=pe.isFunction(p);if(g||f>1&&"string"==typeof p&&!fe.checkClone&&rt.test(p))return e.each(function(i){var o=e.eq(i);g&&(t[0]=p.call(this,i,o.html())),S(o,t,n,r)});if(f&&(l=y(t,e[0].ownerDocument,!1,e,r),i=l.firstChild,1===l.childNodes.length&&(l=i),i||r)){for(s=pe.map(h(l,"script"),C),a=s.length;c<f;c++)o=l,c!==d&&(o=pe.clone(o,!0,!0),a&&pe.merge(s,h(o,"script"))),n.call(e[c],o,c);if(a)for(u=s[s.length-1].ownerDocument,pe.map(s,E),c=0;c<a;c++)o=s[c],Ie.test(o.type||"")&&!pe._data(o,"globalEval")&&pe.contains(u,o)&&(o.src?pe._evalUrl&&pe._evalUrl(o.src):pe.globalEval((o.text||o.textContent||o.innerHTML||"").replace(ot,"")));l=i=null}return e}function A(e,t,n){for(var r,i=t?pe.filter(t,e):e,o=0;null!=(r=i[o]);o++)n||1!==r.nodeType||pe.cleanData(h(r)),r.parentNode&&(n&&pe.contains(r.ownerDocument,r)&&g(h(r,"script")),r.parentNode.removeChild(r));return e}function D(e,t){var n=pe(t.createElement(e)).appendTo(t.body),r=pe.css(n[0],"display");return n.detach(),r}function j(e){var t=re,n=lt[e];return n||(n=D(e,t),"none"!==n&&n||(ut=(ut||pe("<iframe frameborder='0' width='0' height='0'/>")).appendTo(t.documentElement),t=(ut[0].contentWindow||ut[0].contentDocument).document,t.write(),t.close(),n=D(e,t),ut.detach()),lt[e]=n),n}function L(e,t){return{get:function(){return e()?void delete this.get:(this.get=t).apply(this,arguments)}}}function H(e){if(e in Et)return e;for(var t=e.charAt(0).toUpperCase()+e.slice(1),n=Ct.length;n--;)if(e=Ct[n]+t,e in Et)return e}function q(e,t){for(var n,r,i,o=[],a=0,s=e.length;a<s;a++)r=e[a],r.style&&(o[a]=pe._data(r,"olddisplay"),n=r.style.display,t?(o[a]||"none"!==n||(r.style.display=""),""===r.style.display&&Re(r)&&(o[a]=pe._data(r,"olddisplay",j(r.nodeName)))):(i=Re(r),(n&&"none"!==n||!i)&&pe._data(r,"olddisplay",i?n:pe.css(r,"display"))));for(a=0;a<s;a++)r=e[a],r.style&&(t&&"none"!==r.style.display&&""!==r.style.display||(r.style.display=t?o[a]||"":"none"));return e}function _(e,t,n){var r=bt.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function F(e,t,n,r,i){for(var o=n===(r?"border":"content")?4:"width"===t?1:0,a=0;o<4;o+=2)"margin"===n&&(a+=pe.css(e,n+Oe[o],!0,i)),r?("content"===n&&(a-=pe.css(e,"padding"+Oe[o],!0,i)),"margin"!==n&&(a-=pe.css(e,"border"+Oe[o]+"Width",!0,i))):(a+=pe.css(e,"padding"+Oe[o],!0,i),"padding"!==n&&(a+=pe.css(e,"border"+Oe[o]+"Width",!0,i)));return a}function M(e,t,n){var r=!0,i="width"===t?e.offsetWidth:e.offsetHeight,o=ht(e),a=fe.boxSizing&&"border-box"===pe.css(e,"boxSizing",!1,o);if(i<=0||null==i){if(i=gt(e,t,o),(i<0||null==i)&&(i=e.style[t]),ft.test(i))return i;r=a&&(fe.boxSizingReliable()||i===e.style[t]),i=parseFloat(i)||0}return i+F(e,t,n||(a?"border":"content"),r,o)+"px"}function O(e,t,n,r,i){return new O.prototype.init(e,t,n,r,i)}function R(){return e.setTimeout(function(){Nt=void 0}),Nt=pe.now()}function P(e,t){var n,r={height:e},i=0;for(t=t?1:0;i<4;i+=2-t)n=Oe[i],r["margin"+n]=r["padding"+n]=e;return t&&(r.opacity=r.width=e),r}function B(e,t,n){for(var r,i=($.tweeners[t]||[]).concat($.tweeners["*"]),o=0,a=i.length;o<a;o++)if(r=i[o].call(n,t,e))return r}function W(e,t,n){var r,i,o,a,s,u,l,c,f=this,d={},p=e.style,h=e.nodeType&&Re(e),g=pe._data(e,"fxshow");n.queue||(s=pe._queueHooks(e,"fx"),null==s.unqueued&&(s.unqueued=0,u=s.empty.fire,s.empty.fire=function(){s.unqueued||u()}),s.unqueued++,f.always(function(){f.always(function(){s.unqueued--,pe.queue(e,"fx").length||s.empty.fire()})})),1===e.nodeType&&("height"in t||"width"in t)&&(n.overflow=[p.overflow,p.overflowX,p.overflowY],l=pe.css(e,"display"),c="none"===l?pe._data(e,"olddisplay")||j(e.nodeName):l,"inline"===c&&"none"===pe.css(e,"float")&&(fe.inlineBlockNeedsLayout&&"inline"!==j(e.nodeName)?p.zoom=1:p.display="inline-block")),n.overflow&&(p.overflow="hidden",fe.shrinkWrapBlocks()||f.always(function(){p.overflow=n.overflow[0],p.overflowX=n.overflow[1],p.overflowY=n.overflow[2]}));for(r in t)if(i=t[r],St.exec(i)){if(delete t[r],o=o||"toggle"===i,i===(h?"hide":"show")){if("show"!==i||!g||void 0===g[r])continue;h=!0}d[r]=g&&g[r]||pe.style(e,r)}else l=void 0;if(pe.isEmptyObject(d))"inline"===("none"===l?j(e.nodeName):l)&&(p.display=l);else{g?"hidden"in g&&(h=g.hidden):g=pe._data(e,"fxshow",{}),o&&(g.hidden=!h),h?pe(e).show():f.done(function(){pe(e).hide()}),f.done(function(){var t;pe._removeData(e,"fxshow");for(t in d)pe.style(e,t,d[t])});for(r in d)a=B(h?g[r]:0,r,f),r in g||(g[r]=a.start,h&&(a.end=a.start,a.start="width"===r||"height"===r?1:0))}}function I(e,t){var n,r,i,o,a;for(n in e)if(r=pe.camelCase(n),i=t[r],o=e[n],pe.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),a=pe.cssHooks[r],a&&"expand"in a){o=a.expand(o),delete e[r];for(n in o)n in e||(e[n]=o[n],t[n]=i)}else t[r]=i}function $(e,t,n){var r,i,o=0,a=$.prefilters.length,s=pe.Deferred().always(function(){delete u.elem}),u=function(){if(i)return!1;for(var t=Nt||R(),n=Math.max(0,l.startTime+l.duration-t),r=n/l.duration||0,o=1-r,a=0,u=l.tweens.length;a<u;a++)l.tweens[a].run(o);return s.notifyWith(e,[l,o,n]),o<1&&u?n:(s.resolveWith(e,[l]),!1)},l=s.promise({elem:e,props:pe.extend({},t),opts:pe.extend(!0,{specialEasing:{},easing:pe.easing._default},n),originalProperties:t,originalOptions:n,startTime:Nt||R(),duration:n.duration,tweens:[],createTween:function(t,n){var r=pe.Tween(e,l.opts,t,n,l.opts.specialEasing[t]||l.opts.easing);return l.tweens.push(r),r},stop:function(t){var n=0,r=t?l.tweens.length:0;if(i)return this;for(i=!0;n<r;n++)l.tweens[n].run(1);return t?(s.notifyWith(e,[l,1,0]),s.resolveWith(e,[l,t])):s.rejectWith(e,[l,t]),this}}),c=l.props;for(I(c,l.opts.specialEasing);o<a;o++)if(r=$.prefilters[o].call(l,e,c,l.opts))return pe.isFunction(r.stop)&&(pe._queueHooks(l.elem,l.opts.queue).stop=pe.proxy(r.stop,r)),r;return pe.map(c,B,l),pe.isFunction(l.opts.start)&&l.opts.start.call(e,l),pe.fx.timer(pe.extend(u,{elem:e,anim:l,queue:l.opts.queue})),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always)}function z(e){return pe.attr(e,"class")||""}function X(e){return function(t,n){"string"!=typeof t&&(n=t,t="*");var r,i=0,o=t.toLowerCase().match(De)||[];if(pe.isFunction(n))for(;r=o[i++];)"+"===r.charAt(0)?(r=r.slice(1)||"*",(e[r]=e[r]||[]).unshift(n)):(e[r]=e[r]||[]).push(n)}}function U(e,t,n,r){function i(s){var u;return o[s]=!0,pe.each(e[s]||[],function(e,s){var l=s(t,n,r);return"string"!=typeof l||a||o[l]?a?!(u=l):void 0:(t.dataTypes.unshift(l),i(l),!1)}),u}var o={},a=e===Qt;return i(t.dataTypes[0])||!o["*"]&&i("*")}function V(e,t){var n,r,i=pe.ajaxSettings.flatOptions||{};for(r in t)void 0!==t[r]&&((i[r]?e:n||(n={}))[r]=t[r]);return n&&pe.extend(!0,e,n),e}function Y(e,t,n){for(var r,i,o,a,s=e.contents,u=e.dataTypes;"*"===u[0];)u.shift(),void 0===i&&(i=e.mimeType||t.getResponseHeader("Content-Type"));if(i)for(a in s)if(s[a]&&s[a].test(i)){u.unshift(a);break}if(u[0]in n)o=u[0];else{for(a in n){if(!u[0]||e.converters[a+" "+u[0]]){o=a;break}r||(r=a)}o=o||r}if(o)return o!==u[0]&&u.unshift(o),n[o]}function J(e,t,n,r){var i,o,a,s,u,l={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)l[a.toLowerCase()]=e.converters[a];for(o=c.shift();o;)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!u&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u=o,o=c.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(a=l[u+" "+o]||l["* "+o],!a)for(i in l)if(s=i.split(" "),s[1]===o&&(a=l[u+" "+s[0]]||l["* "+s[0]])){a===!0?a=l[i]:l[i]!==!0&&(o=s[0],c.unshift(s[1]));break}if(a!==!0)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(f){return{state:"parsererror",error:a?f:"No conversion from "+u+" to "+o}}}return{state:"success",data:t}}function G(e){return e.style&&e.style.display||pe.css(e,"display")}function K(e){if(!pe.contains(e.ownerDocument||re,e))return!0;for(;e&&1===e.nodeType;){if("none"===G(e)||"hidden"===e.type)return!0;e=e.parentNode}return!1}function Q(e,t,n,r){var i;if(pe.isArray(t))pe.each(t,function(t,i){n||rn.test(e)?r(e,i):Q(e+"["+("object"==typeof i&&null!=i?t:"")+"]",i,n,r)});else if(n||"object"!==pe.type(t))r(e,t);else for(i in t)Q(e+"["+i+"]",t[i],n,r)}function Z(){try{return new e.XMLHttpRequest}catch(t){}}function ee(){try{return new e.ActiveXObject("Microsoft.XMLHTTP")}catch(t){}}function te(e){return pe.isWindow(e)?e:9===e.nodeType&&(e.defaultView||e.parentWindow)}var ne=[],re=e.document,ie=ne.slice,oe=ne.concat,ae=ne.push,se=ne.indexOf,ue={},le=ue.toString,ce=ue.hasOwnProperty,fe={},de="1.12.4",pe=function(e,t){return new pe.fn.init(e,t)},he=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,ge=/^-ms-/,me=/-([\da-z])/gi,ye=function(e,t){return t.toUpperCase()};pe.fn=pe.prototype={jquery:de,constructor:pe,selector:"",length:0,toArray:function(){return ie.call(this)},get:function(e){return null!=e?e<0?this[e+this.length]:this[e]:ie.call(this)},pushStack:function(e){var t=pe.merge(this.constructor(),e);return t.prevObject=this,t.context=this.context,t},each:function(e){return pe.each(this,e)},map:function(e){return this.pushStack(pe.map(this,function(t,n){return e.call(t,n,t)}))},slice:function(){return this.pushStack(ie.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(n>=0&&n<t?[this[n]]:[])},end:function(){return this.prevObject||this.constructor()},push:ae,sort:ne.sort,splice:ne.splice},pe.extend=pe.fn.extend=function(){var e,t,n,r,i,o,a=arguments[0]||{},s=1,u=arguments.length,l=!1;for("boolean"==typeof a&&(l=a,a=arguments[s]||{},s++),"object"==typeof a||pe.isFunction(a)||(a={}),s===u&&(a=this,s--);s<u;s++)if(null!=(i=arguments[s]))for(r in i)e=a[r],n=i[r],a!==n&&(l&&n&&(pe.isPlainObject(n)||(t=pe.isArray(n)))?(t?(t=!1,o=e&&pe.isArray(e)?e:[]):o=e&&pe.isPlainObject(e)?e:{},a[r]=pe.extend(l,o,n)):void 0!==n&&(a[r]=n));return a},pe.extend({expando:"jQuery"+(de+Math.random()).replace(/\D/g,""),isReady:!0,error:function(e){throw new Error(e)},noop:function(){},isFunction:function(e){return"function"===pe.type(e)},isArray:Array.isArray||function(e){return"array"===pe.type(e)},isWindow:function(e){return null!=e&&e==e.window},isNumeric:function(e){var t=e&&e.toString();return!pe.isArray(e)&&t-parseFloat(t)+1>=0},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},isPlainObject:function(e){var t;if(!e||"object"!==pe.type(e)||e.nodeType||pe.isWindow(e))return!1;try{if(e.constructor&&!ce.call(e,"constructor")&&!ce.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(n){return!1}if(!fe.ownFirst)for(t in e)return ce.call(e,t);for(t in e);return void 0===t||ce.call(e,t)},type:function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?ue[le.call(e)]||"object":typeof e},globalEval:function(t){t&&pe.trim(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(ge,"ms-").replace(me,ye)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t){var r,i=0;if(n(e))for(r=e.length;i<r&&t.call(e[i],i,e[i])!==!1;i++);else for(i in e)if(t.call(e[i],i,e[i])===!1)break;return e},trim:function(e){return null==e?"":(e+"").replace(he,"")},makeArray:function(e,t){var r=t||[];return null!=e&&(n(Object(e))?pe.merge(r,"string"==typeof e?[e]:e):ae.call(r,e)),r},inArray:function(e,t,n){var r;if(t){if(se)return se.call(t,e,n);for(r=t.length,n=n?n<0?Math.max(0,r+n):n:0;n<r;n++)if(n in t&&t[n]===e)return n}return-1},merge:function(e,t){for(var n=+t.length,r=0,i=e.length;r<n;)e[i++]=t[r++];if(n!==n)for(;void 0!==t[r];)e[i++]=t[r++];return e.length=i,e},grep:function(e,t,n){for(var r,i=[],o=0,a=e.length,s=!n;o<a;o++)r=!t(e[o],o),r!==s&&i.push(e[o]);return i},map:function(e,t,r){var i,o,a=0,s=[];if(n(e))for(i=e.length;a<i;a++)o=t(e[a],a,r),null!=o&&s.push(o);else for(a in e)o=t(e[a],a,r),null!=o&&s.push(o);return oe.apply([],s)},guid:1,proxy:function(e,t){var n,r,i;if("string"==typeof t&&(i=e[t],t=e,e=i),pe.isFunction(e))return n=ie.call(arguments,2),r=function(){return e.apply(t||this,n.concat(ie.call(arguments)))},r.guid=e.guid=e.guid||pe.guid++,r},now:function(){return+new Date},support:fe}),"function"==typeof Symbol&&(pe.fn[Symbol.iterator]=ne[Symbol.iterator]),pe.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(e,t){ue["[object "+t+"]"]=t.toLowerCase()});var ve=function(e){function t(e,t,n,r){var i,o,a,s,u,l,f,p,h=t&&t.ownerDocument,g=t?t.nodeType:9;if(n=n||[],"string"!=typeof e||!e||1!==g&&9!==g&&11!==g)return n;if(!r&&((t?t.ownerDocument||t:B)!==H&&L(t),t=t||H,_)){if(11!==g&&(l=ye.exec(e)))if(i=l[1]){if(9===g){if(!(a=t.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(h&&(a=h.getElementById(i))&&R(t,a)&&a.id===i)return n.push(a),n}else{if(l[2])return Q.apply(n,t.getElementsByTagName(e)),n;if((i=l[3])&&w.getElementsByClassName&&t.getElementsByClassName)return Q.apply(n,t.getElementsByClassName(i)),n}if(w.qsa&&!X[e+" "]&&(!F||!F.test(e))){if(1!==g)h=t,p=e;else if("object"!==t.nodeName.toLowerCase()){for((s=t.getAttribute("id"))?s=s.replace(xe,"\\$&"):t.setAttribute("id",s=P),f=N(e),o=f.length,u=de.test(s)?"#"+s:"[id='"+s+"']";o--;)f[o]=u+" "+d(f[o]);p=f.join(","),h=ve.test(e)&&c(t.parentNode)||t}if(p)try{return Q.apply(n,h.querySelectorAll(p)),n}catch(m){}finally{s===P&&t.removeAttribute("id")}}}return S(e.replace(se,"$1"),t,n,r)}function n(){function e(n,r){return t.push(n+" ")>T.cacheLength&&delete e[t.shift()],e[n+" "]=r}var t=[];return e}function r(e){return e[P]=!0,e}function i(e){var t=H.createElement("div");try{return!!e(t)}catch(n){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function o(e,t){for(var n=e.split("|"),r=n.length;r--;)T.attrHandle[n[r]]=t}function a(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&(~t.sourceIndex||V)-(~e.sourceIndex||V);if(r)return r;if(n)for(;n=n.nextSibling;)if(n===t)return-1;return e?1:-1}function s(e){return function(t){var n=t.nodeName.toLowerCase();return"input"===n&&t.type===e}}function u(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function l(e){return r(function(t){return t=+t,r(function(n,r){for(var i,o=e([],n.length,t),a=o.length;a--;)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}function c(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}function f(){}function d(e){for(var t=0,n=e.length,r="";t<n;t++)r+=e[t].value;return r}function p(e,t,n){var r=t.dir,i=n&&"parentNode"===r,o=I++;return t.first?function(t,n,o){for(;t=t[r];)if(1===t.nodeType||i)return e(t,n,o)}:function(t,n,a){var s,u,l,c=[W,o];if(a){for(;t=t[r];)if((1===t.nodeType||i)&&e(t,n,a))return!0}else for(;t=t[r];)if(1===t.nodeType||i){if(l=t[P]||(t[P]={}),u=l[t.uniqueID]||(l[t.uniqueID]={}),(s=u[r])&&s[0]===W&&s[1]===o)return c[2]=s[2];if(u[r]=c,c[2]=e(t,n,a))return!0}}}function h(e){return e.length>1?function(t,n,r){for(var i=e.length;i--;)if(!e[i](t,n,r))return!1;return!0}:e[0]}function g(e,n,r){for(var i=0,o=n.length;i<o;i++)t(e,n[i],r);return r}function m(e,t,n,r,i){for(var o,a=[],s=0,u=e.length,l=null!=t;s<u;s++)(o=e[s])&&(n&&!n(o,r,i)||(a.push(o),l&&t.push(s)));return a}function y(e,t,n,i,o,a){return i&&!i[P]&&(i=y(i)),o&&!o[P]&&(o=y(o,a)),r(function(r,a,s,u){var l,c,f,d=[],p=[],h=a.length,y=r||g(t||"*",s.nodeType?[s]:s,[]),v=!e||!r&&t?y:m(y,d,e,s,u),x=n?o||(r?e:h||i)?[]:a:v;if(n&&n(v,x,s,u),i)for(l=m(x,p),i(l,[],s,u),c=l.length;c--;)(f=l[c])&&(x[p[c]]=!(v[p[c]]=f));if(r){if(o||e){if(o){for(l=[],c=x.length;c--;)(f=x[c])&&l.push(v[c]=f);o(null,x=[],l,u)}for(c=x.length;c--;)(f=x[c])&&(l=o?ee(r,f):d[c])>-1&&(r[l]=!(a[l]=f))}}else x=m(x===a?x.splice(h,x.length):x),o?o(null,a,x,u):Q.apply(a,x)})}function v(e){for(var t,n,r,i=e.length,o=T.relative[e[0].type],a=o||T.relative[" "],s=o?1:0,u=p(function(e){return e===t},a,!0),l=p(function(e){return ee(t,e)>-1},a,!0),c=[function(e,n,r){var i=!o&&(r||n!==A)||((t=n).nodeType?u(e,n,r):l(e,n,r));return t=null,i}];s<i;s++)if(n=T.relative[e[s].type])c=[p(h(c),n)];else{if(n=T.filter[e[s].type].apply(null,e[s].matches),n[P]){for(r=++s;r<i&&!T.relative[e[r].type];r++);return y(s>1&&h(c),s>1&&d(e.slice(0,s-1).concat({value:" "===e[s-2].type?"*":""})).replace(se,"$1"),n,s<r&&v(e.slice(s,r)),r<i&&v(e=e.slice(r)),r<i&&d(e))}c.push(n)}return h(c)}function x(e,n){var i=n.length>0,o=e.length>0,a=function(r,a,s,u,l){var c,f,d,p=0,h="0",g=r&&[],y=[],v=A,x=r||o&&T.find.TAG("*",l),b=W+=null==v?1:Math.random()||.1,w=x.length;for(l&&(A=a===H||a||l);h!==w&&null!=(c=x[h]);h++){if(o&&c){for(f=0,a||c.ownerDocument===H||(L(c),s=!_);d=e[f++];)if(d(c,a||H,s)){u.push(c);break}l&&(W=b)}i&&((c=!d&&c)&&p--,r&&g.push(c))}if(p+=h,i&&h!==p){for(f=0;d=n[f++];)d(g,y,a,s);if(r){if(p>0)for(;h--;)g[h]||y[h]||(y[h]=G.call(u));y=m(y)}Q.apply(u,y),l&&!r&&y.length>0&&p+n.length>1&&t.uniqueSort(u)}return l&&(W=b,A=v),g};return i?r(a):a}var b,w,T,C,E,N,k,S,A,D,j,L,H,q,_,F,M,O,R,P="sizzle"+1*new Date,B=e.document,W=0,I=0,$=n(),z=n(),X=n(),U=function(e,t){return e===t&&(j=!0),0},V=1<<31,Y={}.hasOwnProperty,J=[],G=J.pop,K=J.push,Q=J.push,Z=J.slice,ee=function(e,t){for(var n=0,r=e.length;n<r;n++)if(e[n]===t)return n;return-1},te="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",ne="[\\x20\\t\\r\\n\\f]",re="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",ie="\\["+ne+"*("+re+")(?:"+ne+"*([*^$|!~]?=)"+ne+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+re+"))|)"+ne+"*\\]",oe=":("+re+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+ie+")*)|.*)\\)|)",ae=new RegExp(ne+"+","g"),se=new RegExp("^"+ne+"+|((?:^|[^\\\\])(?:\\\\.)*)"+ne+"+$","g"),ue=new RegExp("^"+ne+"*,"+ne+"*"),le=new RegExp("^"+ne+"*([>+~]|"+ne+")"+ne+"*"),ce=new RegExp("="+ne+"*([^\\]'\"]*?)"+ne+"*\\]","g"),fe=new RegExp(oe),de=new RegExp("^"+re+"$"),pe={ID:new RegExp("^#("+re+")"),CLASS:new RegExp("^\\.("+re+")"),TAG:new RegExp("^("+re+"|[*])"),ATTR:new RegExp("^"+ie),PSEUDO:new RegExp("^"+oe),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+ne+"*(even|odd|(([+-]|)(\\d*)n|)"+ne+"*(?:([+-]|)"+ne+"*(\\d+)|))"+ne+"*\\)|)","i"),bool:new RegExp("^(?:"+te+")$","i"),needsContext:new RegExp("^"+ne+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+ne+"*((?:-\\d)?\\d*)"+ne+"*\\)|)(?=[^-]|$)","i")},he=/^(?:input|select|textarea|button)$/i,ge=/^h\d$/i,me=/^[^{]+\{\s*\[native \w/,ye=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ve=/[+~]/,xe=/'|\\/g,be=new RegExp("\\\\([\\da-f]{1,6}"+ne+"?|("+ne+")|.)","ig"),we=function(e,t,n){var r="0x"+t-65536;return r!==r||n?t:r<0?String.fromCharCode(r+65536):String.fromCharCode(r>>10|55296,1023&r|56320)},Te=function(){L()};try{Q.apply(J=Z.call(B.childNodes),B.childNodes),J[B.childNodes.length].nodeType}catch(Ce){Q={apply:J.length?function(e,t){K.apply(e,Z.call(t))}:function(e,t){for(var n=e.length,r=0;e[n++]=t[r++];);e.length=n-1}}}w=t.support={},E=t.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return!!t&&"HTML"!==t.nodeName},L=t.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:B;return r!==H&&9===r.nodeType&&r.documentElement?(H=r,q=H.documentElement,_=!E(H),(n=H.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",Te,!1):n.attachEvent&&n.attachEvent("onunload",Te)),w.attributes=i(function(e){return e.className="i",!e.getAttribute("className")}),w.getElementsByTagName=i(function(e){return e.appendChild(H.createComment("")),!e.getElementsByTagName("*").length}),w.getElementsByClassName=me.test(H.getElementsByClassName),w.getById=i(function(e){return q.appendChild(e).id=P,!H.getElementsByName||!H.getElementsByName(P).length}),w.getById?(T.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&_){var n=t.getElementById(e);return n?[n]:[]}},T.filter.ID=function(e){var t=e.replace(be,we);return function(e){return e.getAttribute("id")===t}}):(delete T.find.ID,T.filter.ID=function(e){var t=e.replace(be,we);return function(e){var n="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return n&&n.value===t}}),T.find.TAG=w.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):w.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){for(;n=o[i++];)1===n.nodeType&&r.push(n);return r}return o},T.find.CLASS=w.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&_)return t.getElementsByClassName(e)},M=[],F=[],(w.qsa=me.test(H.querySelectorAll))&&(i(function(e){q.appendChild(e).innerHTML="<a id='"+P+"'></a><select id='"+P+"-\r\\' msallowcapture=''><option selected=''></option></select>",e.querySelectorAll("[msallowcapture^='']").length&&F.push("[*^$]="+ne+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||F.push("\\["+ne+"*(?:value|"+te+")"),e.querySelectorAll("[id~="+P+"-]").length||F.push("~="),e.querySelectorAll(":checked").length||F.push(":checked"),e.querySelectorAll("a#"+P+"+*").length||F.push(".#.+[+~]")}),i(function(e){var t=H.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&F.push("name"+ne+"*[*^$|!~]?="),e.querySelectorAll(":enabled").length||F.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),F.push(",.*:")})),(w.matchesSelector=me.test(O=q.matches||q.webkitMatchesSelector||q.mozMatchesSelector||q.oMatchesSelector||q.msMatchesSelector))&&i(function(e){w.disconnectedMatch=O.call(e,"div"),O.call(e,"[s!='']:x"),M.push("!=",oe)}),F=F.length&&new RegExp(F.join("|")),M=M.length&&new RegExp(M.join("|")),t=me.test(q.compareDocumentPosition),R=t||me.test(q.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)for(;t=t.parentNode;)if(t===e)return!0;return!1},U=t?function(e,t){if(e===t)return j=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n?n:(n=(e.ownerDocument||e)===(t.ownerDocument||t)?e.compareDocumentPosition(t):1,1&n||!w.sortDetached&&t.compareDocumentPosition(e)===n?e===H||e.ownerDocument===B&&R(B,e)?-1:t===H||t.ownerDocument===B&&R(B,t)?1:D?ee(D,e)-ee(D,t):0:4&n?-1:1)}:function(e,t){if(e===t)return j=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,s=[e],u=[t];if(!i||!o)return e===H?-1:t===H?1:i?-1:o?1:D?ee(D,e)-ee(D,t):0;if(i===o)return a(e,t);for(n=e;n=n.parentNode;)s.unshift(n);for(n=t;n=n.parentNode;)u.unshift(n);for(;s[r]===u[r];)r++;return r?a(s[r],u[r]):s[r]===B?-1:u[r]===B?1:0},H):H},t.matches=function(e,n){return t(e,null,null,n)},t.matchesSelector=function(e,n){if((e.ownerDocument||e)!==H&&L(e),n=n.replace(ce,"='$1']"),w.matchesSelector&&_&&!X[n+" "]&&(!M||!M.test(n))&&(!F||!F.test(n)))try{var r=O.call(e,n);if(r||w.disconnectedMatch||e.document&&11!==e.document.nodeType)return r}catch(i){}return t(n,H,null,[e]).length>0},t.contains=function(e,t){return(e.ownerDocument||e)!==H&&L(e),R(e,t)},t.attr=function(e,t){(e.ownerDocument||e)!==H&&L(e);var n=T.attrHandle[t.toLowerCase()],r=n&&Y.call(T.attrHandle,t.toLowerCase())?n(e,t,!_):void 0;return void 0!==r?r:w.attributes||!_?e.getAttribute(t):(r=e.getAttributeNode(t))&&r.specified?r.value:null},t.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},t.uniqueSort=function(e){var t,n=[],r=0,i=0;if(j=!w.detectDuplicates,D=!w.sortStable&&e.slice(0),e.sort(U),j){for(;t=e[i++];)t===e[i]&&(r=n.push(i));for(;r--;)e.splice(n[r],1)}return D=null,e},C=t.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=C(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r++];)n+=C(t);return n},T=t.selectors={cacheLength:50,createPseudo:r,match:pe,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(be,we),e[3]=(e[3]||e[4]||e[5]||"").replace(be,we),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||t.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&t.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return pe.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&fe.test(n)&&(t=N(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(be,we).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=$[e+" "];return t||(t=new RegExp("(^|"+ne+")"+e+"("+ne+"|$)"))&&$(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(e,n,r){return function(i){var o=t.attr(i,e);return null==o?"!="===n:!n||(o+="","="===n?o===r:"!="===n?o!==r:"^="===n?r&&0===o.indexOf(r):"*="===n?r&&o.indexOf(r)>-1:"$="===n?r&&o.slice(-r.length)===r:"~="===n?(" "+o.replace(ae," ")+" ").indexOf(r)>-1:"|="===n&&(o===r||o.slice(0,r.length+1)===r+"-"))}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,u){var l,c,f,d,p,h,g=o!==a?"nextSibling":"previousSibling",m=t.parentNode,y=s&&t.nodeName.toLowerCase(),v=!u&&!s,x=!1;if(m){if(o){for(;g;){for(d=t;d=d[g];)if(s?d.nodeName.toLowerCase()===y:1===d.nodeType)return!1;h=g="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?m.firstChild:m.lastChild],a&&v){for(d=m,f=d[P]||(d[P]={}),c=f[d.uniqueID]||(f[d.uniqueID]={}),l=c[e]||[],p=l[0]===W&&l[1],x=p&&l[2],
+d=p&&m.childNodes[p];d=++p&&d&&d[g]||(x=p=0)||h.pop();)if(1===d.nodeType&&++x&&d===t){c[e]=[W,p,x];break}}else if(v&&(d=t,f=d[P]||(d[P]={}),c=f[d.uniqueID]||(f[d.uniqueID]={}),l=c[e]||[],p=l[0]===W&&l[1],x=p),x===!1)for(;(d=++p&&d&&d[g]||(x=p=0)||h.pop())&&((s?d.nodeName.toLowerCase()!==y:1!==d.nodeType)||!++x||(v&&(f=d[P]||(d[P]={}),c=f[d.uniqueID]||(f[d.uniqueID]={}),c[e]=[W,x]),d!==t)););return x-=i,x===r||x%r===0&&x/r>=0}}},PSEUDO:function(e,n){var i,o=T.pseudos[e]||T.setFilters[e.toLowerCase()]||t.error("unsupported pseudo: "+e);return o[P]?o(n):o.length>1?(i=[e,e,"",n],T.setFilters.hasOwnProperty(e.toLowerCase())?r(function(e,t){for(var r,i=o(e,n),a=i.length;a--;)r=ee(e,i[a]),e[r]=!(t[r]=i[a])}):function(e){return o(e,0,i)}):o}},pseudos:{not:r(function(e){var t=[],n=[],i=k(e.replace(se,"$1"));return i[P]?r(function(e,t,n,r){for(var o,a=i(e,null,r,[]),s=e.length;s--;)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,r,o){return t[0]=e,i(t,null,o,n),t[0]=null,!n.pop()}}),has:r(function(e){return function(n){return t(e,n).length>0}}),contains:r(function(e){return e=e.replace(be,we),function(t){return(t.textContent||t.innerText||C(t)).indexOf(e)>-1}}),lang:r(function(e){return de.test(e||"")||t.error("unsupported lang: "+e),e=e.replace(be,we).toLowerCase(),function(t){var n;do if(n=_?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang"))return n=n.toLowerCase(),n===e||0===n.indexOf(e+"-");while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===q},focus:function(e){return e===H.activeElement&&(!H.hasFocus||H.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!T.pseudos.empty(e)},header:function(e){return ge.test(e.nodeName)},input:function(e){return he.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:l(function(){return[0]}),last:l(function(e,t){return[t-1]}),eq:l(function(e,t,n){return[n<0?n+t:n]}),even:l(function(e,t){for(var n=0;n<t;n+=2)e.push(n);return e}),odd:l(function(e,t){for(var n=1;n<t;n+=2)e.push(n);return e}),lt:l(function(e,t,n){for(var r=n<0?n+t:n;--r>=0;)e.push(r);return e}),gt:l(function(e,t,n){for(var r=n<0?n+t:n;++r<t;)e.push(r);return e})}},T.pseudos.nth=T.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})T.pseudos[b]=s(b);for(b in{submit:!0,reset:!0})T.pseudos[b]=u(b);return f.prototype=T.filters=T.pseudos,T.setFilters=new f,N=t.tokenize=function(e,n){var r,i,o,a,s,u,l,c=z[e+" "];if(c)return n?0:c.slice(0);for(s=e,u=[],l=T.preFilter;s;){r&&!(i=ue.exec(s))||(i&&(s=s.slice(i[0].length)||s),u.push(o=[])),r=!1,(i=le.exec(s))&&(r=i.shift(),o.push({value:r,type:i[0].replace(se," ")}),s=s.slice(r.length));for(a in T.filter)!(i=pe[a].exec(s))||l[a]&&!(i=l[a](i))||(r=i.shift(),o.push({value:r,type:a,matches:i}),s=s.slice(r.length));if(!r)break}return n?s.length:s?t.error(e):z(e,u).slice(0)},k=t.compile=function(e,t){var n,r=[],i=[],o=X[e+" "];if(!o){for(t||(t=N(e)),n=t.length;n--;)o=v(t[n]),o[P]?r.push(o):i.push(o);o=X(e,x(i,r)),o.selector=e}return o},S=t.select=function(e,t,n,r){var i,o,a,s,u,l="function"==typeof e&&e,f=!r&&N(e=l.selector||e);if(n=n||[],1===f.length){if(o=f[0]=f[0].slice(0),o.length>2&&"ID"===(a=o[0]).type&&w.getById&&9===t.nodeType&&_&&T.relative[o[1].type]){if(t=(T.find.ID(a.matches[0].replace(be,we),t)||[])[0],!t)return n;l&&(t=t.parentNode),e=e.slice(o.shift().value.length)}for(i=pe.needsContext.test(e)?0:o.length;i--&&(a=o[i],!T.relative[s=a.type]);)if((u=T.find[s])&&(r=u(a.matches[0].replace(be,we),ve.test(o[0].type)&&c(t.parentNode)||t))){if(o.splice(i,1),e=r.length&&d(o),!e)return Q.apply(n,r),n;break}}return(l||k(e,f))(r,t,!_,n,!t||ve.test(e)&&c(t.parentNode)||t),n},w.sortStable=P.split("").sort(U).join("")===P,w.detectDuplicates=!!j,L(),w.sortDetached=i(function(e){return 1&e.compareDocumentPosition(H.createElement("div"))}),i(function(e){return e.innerHTML="<a href='#'></a>","#"===e.firstChild.getAttribute("href")})||o("type|href|height|width",function(e,t,n){if(!n)return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),w.attributes&&i(function(e){return e.innerHTML="<input/>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||o("value",function(e,t,n){if(!n&&"input"===e.nodeName.toLowerCase())return e.defaultValue}),i(function(e){return null==e.getAttribute("disabled")})||o(te,function(e,t,n){var r;if(!n)return e[t]===!0?t.toLowerCase():(r=e.getAttributeNode(t))&&r.specified?r.value:null}),t}(e);pe.find=ve,pe.expr=ve.selectors,pe.expr[":"]=pe.expr.pseudos,pe.uniqueSort=pe.unique=ve.uniqueSort,pe.text=ve.getText,pe.isXMLDoc=ve.isXML,pe.contains=ve.contains;var xe=function(e,t,n){for(var r=[],i=void 0!==n;(e=e[t])&&9!==e.nodeType;)if(1===e.nodeType){if(i&&pe(e).is(n))break;r.push(e)}return r},be=function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},we=pe.expr.match.needsContext,Te=/^<([\w-]+)\s*\/?>(?:<\/\1>|)$/,Ce=/^.[^:#\[\.,]*$/;pe.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?pe.find.matchesSelector(r,e)?[r]:[]:pe.find.matches(e,pe.grep(t,function(e){return 1===e.nodeType}))},pe.fn.extend({find:function(e){var t,n=[],r=this,i=r.length;if("string"!=typeof e)return this.pushStack(pe(e).filter(function(){for(t=0;t<i;t++)if(pe.contains(r[t],this))return!0}));for(t=0;t<i;t++)pe.find(e,r[t],n);return n=this.pushStack(i>1?pe.unique(n):n),n.selector=this.selector?this.selector+" "+e:e,n},filter:function(e){return this.pushStack(r(this,e||[],!1))},not:function(e){return this.pushStack(r(this,e||[],!0))},is:function(e){return!!r(this,"string"==typeof e&&we.test(e)?pe(e):e||[],!1).length}});var Ee,Ne=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,ke=pe.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||Ee,"string"==typeof e){if(r="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:Ne.exec(e),!r||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof pe?t[0]:t,pe.merge(this,pe.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:re,!0)),Te.test(r[1])&&pe.isPlainObject(t))for(r in t)pe.isFunction(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}if(i=re.getElementById(r[2]),i&&i.parentNode){if(i.id!==r[2])return Ee.find(e);this.length=1,this[0]=i}return this.context=re,this.selector=e,this}return e.nodeType?(this.context=this[0]=e,this.length=1,this):pe.isFunction(e)?"undefined"!=typeof n.ready?n.ready(e):e(pe):(void 0!==e.selector&&(this.selector=e.selector,this.context=e.context),pe.makeArray(e,this))};ke.prototype=pe.fn,Ee=pe(re);var Se=/^(?:parents|prev(?:Until|All))/,Ae={children:!0,contents:!0,next:!0,prev:!0};pe.fn.extend({has:function(e){var t,n=pe(e,this),r=n.length;return this.filter(function(){for(t=0;t<r;t++)if(pe.contains(this,n[t]))return!0})},closest:function(e,t){for(var n,r=0,i=this.length,o=[],a=we.test(e)||"string"!=typeof e?pe(e,t||this.context):0;r<i;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(n.nodeType<11&&(a?a.index(n)>-1:1===n.nodeType&&pe.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(o.length>1?pe.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?pe.inArray(this[0],pe(e)):pe.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(pe.uniqueSort(pe.merge(this.get(),pe(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),pe.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return xe(e,"parentNode")},parentsUntil:function(e,t,n){return xe(e,"parentNode",n)},next:function(e){return i(e,"nextSibling")},prev:function(e){return i(e,"previousSibling")},nextAll:function(e){return xe(e,"nextSibling")},prevAll:function(e){return xe(e,"previousSibling")},nextUntil:function(e,t,n){return xe(e,"nextSibling",n)},prevUntil:function(e,t,n){return xe(e,"previousSibling",n)},siblings:function(e){return be((e.parentNode||{}).firstChild,e)},children:function(e){return be(e.firstChild)},contents:function(e){return pe.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:pe.merge([],e.childNodes)}},function(e,t){pe.fn[e]=function(n,r){var i=pe.map(this,t,n);return"Until"!==e.slice(-5)&&(r=n),r&&"string"==typeof r&&(i=pe.filter(r,i)),this.length>1&&(Ae[e]||(i=pe.uniqueSort(i)),Se.test(e)&&(i=i.reverse())),this.pushStack(i)}});var De=/\S+/g;pe.Callbacks=function(e){e="string"==typeof e?o(e):pe.extend({},e);var t,n,r,i,a=[],s=[],u=-1,l=function(){for(i=e.once,r=t=!0;s.length;u=-1)for(n=s.shift();++u<a.length;)a[u].apply(n[0],n[1])===!1&&e.stopOnFalse&&(u=a.length,n=!1);e.memory||(n=!1),t=!1,i&&(a=n?[]:"")},c={add:function(){return a&&(n&&!t&&(u=a.length-1,s.push(n)),function r(t){pe.each(t,function(t,n){pe.isFunction(n)?e.unique&&c.has(n)||a.push(n):n&&n.length&&"string"!==pe.type(n)&&r(n)})}(arguments),n&&!t&&l()),this},remove:function(){return pe.each(arguments,function(e,t){for(var n;(n=pe.inArray(t,a,n))>-1;)a.splice(n,1),n<=u&&u--}),this},has:function(e){return e?pe.inArray(e,a)>-1:a.length>0},empty:function(){return a&&(a=[]),this},disable:function(){return i=s=[],a=n="",this},disabled:function(){return!a},lock:function(){return i=!0,n||c.disable(),this},locked:function(){return!!i},fireWith:function(e,n){return i||(n=n||[],n=[e,n.slice?n.slice():n],s.push(n),t||l()),this},fire:function(){return c.fireWith(this,arguments),this},fired:function(){return!!r}};return c},pe.extend({Deferred:function(e){var t=[["resolve","done",pe.Callbacks("once memory"),"resolved"],["reject","fail",pe.Callbacks("once memory"),"rejected"],["notify","progress",pe.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return pe.Deferred(function(n){pe.each(t,function(t,o){var a=pe.isFunction(e[t])&&e[t];i[o[1]](function(){var e=a&&a.apply(this,arguments);e&&pe.isFunction(e.promise)?e.promise().progress(n.notify).done(n.resolve).fail(n.reject):n[o[0]+"With"](this===r?n.promise():this,a?[e]:arguments)})}),e=null}).promise()},promise:function(e){return null!=e?pe.extend(e,r):r}},i={};return r.pipe=r.then,pe.each(t,function(e,o){var a=o[2],s=o[3];r[o[1]]=a.add,s&&a.add(function(){n=s},t[1^e][2].disable,t[2][2].lock),i[o[0]]=function(){return i[o[0]+"With"](this===i?r:this,arguments),this},i[o[0]+"With"]=a.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t,n,r,i=0,o=ie.call(arguments),a=o.length,s=1!==a||e&&pe.isFunction(e.promise)?a:0,u=1===s?e:pe.Deferred(),l=function(e,n,r){return function(i){n[e]=this,r[e]=arguments.length>1?ie.call(arguments):i,r===t?u.notifyWith(n,r):--s||u.resolveWith(n,r)}};if(a>1)for(t=new Array(a),n=new Array(a),r=new Array(a);i<a;i++)o[i]&&pe.isFunction(o[i].promise)?o[i].promise().progress(l(i,n,t)).done(l(i,r,o)).fail(u.reject):--s;return s||u.resolveWith(r,o),u.promise()}});var je;pe.fn.ready=function(e){return pe.ready.promise().done(e),this},pe.extend({isReady:!1,readyWait:1,holdReady:function(e){e?pe.readyWait++:pe.ready(!0)},ready:function(e){(e===!0?--pe.readyWait:pe.isReady)||(pe.isReady=!0,e!==!0&&--pe.readyWait>0||(je.resolveWith(re,[pe]),pe.fn.triggerHandler&&(pe(re).triggerHandler("ready"),pe(re).off("ready"))))}}),pe.ready.promise=function(t){if(!je)if(je=pe.Deferred(),"complete"===re.readyState||"loading"!==re.readyState&&!re.documentElement.doScroll)e.setTimeout(pe.ready);else if(re.addEventListener)re.addEventListener("DOMContentLoaded",s),e.addEventListener("load",s);else{re.attachEvent("onreadystatechange",s),e.attachEvent("onload",s);var n=!1;try{n=null==e.frameElement&&re.documentElement}catch(r){}n&&n.doScroll&&!function i(){if(!pe.isReady){try{n.doScroll("left")}catch(t){return e.setTimeout(i,50)}a(),pe.ready()}}()}return je.promise(t)},pe.ready.promise();var Le;for(Le in pe(fe))break;fe.ownFirst="0"===Le,fe.inlineBlockNeedsLayout=!1,pe(function(){var e,t,n,r;n=re.getElementsByTagName("body")[0],n&&n.style&&(t=re.createElement("div"),r=re.createElement("div"),r.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",n.appendChild(r).appendChild(t),"undefined"!=typeof t.style.zoom&&(t.style.cssText="display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1",fe.inlineBlockNeedsLayout=e=3===t.offsetWidth,e&&(n.style.zoom=1)),n.removeChild(r))}),function(){var e=re.createElement("div");fe.deleteExpando=!0;try{delete e.test}catch(t){fe.deleteExpando=!1}e=null}();var He=function(e){var t=pe.noData[(e.nodeName+" ").toLowerCase()],n=+e.nodeType||1;return(1===n||9===n)&&(!t||t!==!0&&e.getAttribute("classid")===t)},qe=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,_e=/([A-Z])/g;pe.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(e){return e=e.nodeType?pe.cache[e[pe.expando]]:e[pe.expando],!!e&&!l(e)},data:function(e,t,n){return c(e,t,n)},removeData:function(e,t){return f(e,t)},_data:function(e,t,n){return c(e,t,n,!0)},_removeData:function(e,t){return f(e,t,!0)}}),pe.fn.extend({data:function(e,t){var n,r,i,o=this[0],a=o&&o.attributes;if(void 0===e){if(this.length&&(i=pe.data(o),1===o.nodeType&&!pe._data(o,"parsedAttrs"))){for(n=a.length;n--;)a[n]&&(r=a[n].name,0===r.indexOf("data-")&&(r=pe.camelCase(r.slice(5)),u(o,r,i[r])));pe._data(o,"parsedAttrs",!0)}return i}return"object"==typeof e?this.each(function(){pe.data(this,e)}):arguments.length>1?this.each(function(){pe.data(this,e,t)}):o?u(o,e,pe.data(o,e)):void 0},removeData:function(e){return this.each(function(){pe.removeData(this,e)})}}),pe.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=pe._data(e,t),n&&(!r||pe.isArray(n)?r=pe._data(e,t,pe.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=pe.queue(e,t),r=n.length,i=n.shift(),o=pe._queueHooks(e,t),a=function(){pe.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,a,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return pe._data(e,n)||pe._data(e,n,{empty:pe.Callbacks("once memory").add(function(){pe._removeData(e,t+"queue"),pe._removeData(e,n)})})}}),pe.fn.extend({queue:function(e,t){var n=2;return"string"!=typeof e&&(t=e,e="fx",n--),arguments.length<n?pe.queue(this[0],e):void 0===t?this:this.each(function(){var n=pe.queue(this,e,t);pe._queueHooks(this,e),"fx"===e&&"inprogress"!==n[0]&&pe.dequeue(this,e)})},dequeue:function(e){return this.each(function(){pe.dequeue(this,e)})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,t){var n,r=1,i=pe.Deferred(),o=this,a=this.length,s=function(){--r||i.resolveWith(o,[o])};for("string"!=typeof e&&(t=e,e=void 0),e=e||"fx";a--;)n=pe._data(o[a],e+"queueHooks"),n&&n.empty&&(r++,n.empty.add(s));return s(),i.promise(t)}}),function(){var e;fe.shrinkWrapBlocks=function(){if(null!=e)return e;e=!1;var t,n,r;return n=re.getElementsByTagName("body")[0],n&&n.style?(t=re.createElement("div"),r=re.createElement("div"),r.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",n.appendChild(r).appendChild(t),"undefined"!=typeof t.style.zoom&&(t.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:1px;width:1px;zoom:1",t.appendChild(re.createElement("div")).style.width="5px",e=3!==t.offsetWidth),n.removeChild(r),e):void 0}}();var Fe=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,Me=new RegExp("^(?:([+-])=|)("+Fe+")([a-z%]*)$","i"),Oe=["Top","Right","Bottom","Left"],Re=function(e,t){return e=t||e,"none"===pe.css(e,"display")||!pe.contains(e.ownerDocument,e)},Pe=function(e,t,n,r,i,o,a){var s=0,u=e.length,l=null==n;if("object"===pe.type(n)){i=!0;for(s in n)Pe(e,t,s,n[s],!0,o,a)}else if(void 0!==r&&(i=!0,pe.isFunction(r)||(a=!0),l&&(a?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(pe(e),n)})),t))for(;s<u;s++)t(e[s],n,a?r:r.call(e[s],s,t(e[s],n)));return i?e:l?t.call(e):u?t(e[0],n):o},Be=/^(?:checkbox|radio)$/i,We=/<([\w:-]+)/,Ie=/^$|\/(?:java|ecma)script/i,$e=/^\s+/,ze="abbr|article|aside|audio|bdi|canvas|data|datalist|details|dialog|figcaption|figure|footer|header|hgroup|main|mark|meter|nav|output|picture|progress|section|summary|template|time|video";!function(){var e=re.createElement("div"),t=re.createDocumentFragment(),n=re.createElement("input");e.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",fe.leadingWhitespace=3===e.firstChild.nodeType,fe.tbody=!e.getElementsByTagName("tbody").length,fe.htmlSerialize=!!e.getElementsByTagName("link").length,fe.html5Clone="<:nav></:nav>"!==re.createElement("nav").cloneNode(!0).outerHTML,n.type="checkbox",n.checked=!0,t.appendChild(n),fe.appendChecked=n.checked,e.innerHTML="<textarea>x</textarea>",fe.noCloneChecked=!!e.cloneNode(!0).lastChild.defaultValue,t.appendChild(e),n=re.createElement("input"),n.setAttribute("type","radio"),n.setAttribute("checked","checked"),n.setAttribute("name","t"),e.appendChild(n),fe.checkClone=e.cloneNode(!0).cloneNode(!0).lastChild.checked,fe.noCloneEvent=!!e.addEventListener,e[pe.expando]=1,fe.attributes=!e.getAttribute(pe.expando)}();var Xe={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:fe.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]};Xe.optgroup=Xe.option,Xe.tbody=Xe.tfoot=Xe.colgroup=Xe.caption=Xe.thead,Xe.th=Xe.td;var Ue=/<|&#?\w+;/,Ve=/<tbody/i;!function(){var t,n,r=re.createElement("div");for(t in{submit:!0,change:!0,focusin:!0})n="on"+t,(fe[t]=n in e)||(r.setAttribute(n,"t"),fe[t]=r.attributes[n].expando===!1);r=null}();var Ye=/^(?:input|select|textarea)$/i,Je=/^key/,Ge=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,Ke=/^(?:focusinfocus|focusoutblur)$/,Qe=/^([^.]*)(?:\.(.+)|)/;pe.event={global:{},add:function(e,t,n,r,i){var o,a,s,u,l,c,f,d,p,h,g,m=pe._data(e);if(m){for(n.handler&&(u=n,n=u.handler,i=u.selector),n.guid||(n.guid=pe.guid++),(a=m.events)||(a=m.events={}),(c=m.handle)||(c=m.handle=function(e){return"undefined"==typeof pe||e&&pe.event.triggered===e.type?void 0:pe.event.dispatch.apply(c.elem,arguments)},c.elem=e),t=(t||"").match(De)||[""],s=t.length;s--;)o=Qe.exec(t[s])||[],p=g=o[1],h=(o[2]||"").split(".").sort(),p&&(l=pe.event.special[p]||{},p=(i?l.delegateType:l.bindType)||p,l=pe.event.special[p]||{},f=pe.extend({type:p,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&pe.expr.match.needsContext.test(i),namespace:h.join(".")},u),(d=a[p])||(d=a[p]=[],d.delegateCount=0,l.setup&&l.setup.call(e,r,h,c)!==!1||(e.addEventListener?e.addEventListener(p,c,!1):e.attachEvent&&e.attachEvent("on"+p,c))),l.add&&(l.add.call(e,f),f.handler.guid||(f.handler.guid=n.guid)),i?d.splice(d.delegateCount++,0,f):d.push(f),pe.event.global[p]=!0);e=null}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,d,p,h,g,m=pe.hasData(e)&&pe._data(e);if(m&&(c=m.events)){for(t=(t||"").match(De)||[""],l=t.length;l--;)if(s=Qe.exec(t[l])||[],p=g=s[1],h=(s[2]||"").split(".").sort(),p){for(f=pe.event.special[p]||{},p=(r?f.delegateType:f.bindType)||p,d=c[p]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),u=o=d.length;o--;)a=d[o],!i&&g!==a.origType||n&&n.guid!==a.guid||s&&!s.test(a.namespace)||r&&r!==a.selector&&("**"!==r||!a.selector)||(d.splice(o,1),a.selector&&d.delegateCount--,f.remove&&f.remove.call(e,a));u&&!d.length&&(f.teardown&&f.teardown.call(e,h,m.handle)!==!1||pe.removeEvent(e,p,m.handle),delete c[p])}else for(p in c)pe.event.remove(e,p+t[l],n,r,!0);pe.isEmptyObject(c)&&(delete m.handle,pe._removeData(e,"events"))}},trigger:function(t,n,r,i){var o,a,s,u,l,c,f,d=[r||re],p=ce.call(t,"type")?t.type:t,h=ce.call(t,"namespace")?t.namespace.split("."):[];if(s=c=r=r||re,3!==r.nodeType&&8!==r.nodeType&&!Ke.test(p+pe.event.triggered)&&(p.indexOf(".")>-1&&(h=p.split("."),p=h.shift(),h.sort()),a=p.indexOf(":")<0&&"on"+p,t=t[pe.expando]?t:new pe.Event(p,"object"==typeof t&&t),t.isTrigger=i?2:3,t.namespace=h.join("."),t.rnamespace=t.namespace?new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,t.result=void 0,t.target||(t.target=r),n=null==n?[t]:pe.makeArray(n,[t]),l=pe.event.special[p]||{},i||!l.trigger||l.trigger.apply(r,n)!==!1)){if(!i&&!l.noBubble&&!pe.isWindow(r)){for(u=l.delegateType||p,Ke.test(u+p)||(s=s.parentNode);s;s=s.parentNode)d.push(s),c=s;c===(r.ownerDocument||re)&&d.push(c.defaultView||c.parentWindow||e)}for(f=0;(s=d[f++])&&!t.isPropagationStopped();)t.type=f>1?u:l.bindType||p,o=(pe._data(s,"events")||{})[t.type]&&pe._data(s,"handle"),o&&o.apply(s,n),o=a&&s[a],o&&o.apply&&He(s)&&(t.result=o.apply(s,n),t.result===!1&&t.preventDefault());if(t.type=p,!i&&!t.isDefaultPrevented()&&(!l._default||l._default.apply(d.pop(),n)===!1)&&He(r)&&a&&r[p]&&!pe.isWindow(r)){c=r[a],c&&(r[a]=null),pe.event.triggered=p;try{r[p]()}catch(g){}pe.event.triggered=void 0,c&&(r[a]=c)}return t.result}},dispatch:function(e){e=pe.event.fix(e);var t,n,r,i,o,a=[],s=ie.call(arguments),u=(pe._data(this,"events")||{})[e.type]||[],l=pe.event.special[e.type]||{};if(s[0]=e,e.delegateTarget=this,!l.preDispatch||l.preDispatch.call(this,e)!==!1){for(a=pe.event.handlers.call(this,e,u),t=0;(i=a[t++])&&!e.isPropagationStopped();)for(e.currentTarget=i.elem,n=0;(o=i.handlers[n++])&&!e.isImmediatePropagationStopped();)e.rnamespace&&!e.rnamespace.test(o.namespace)||(e.handleObj=o,e.data=o.data,r=((pe.event.special[o.origType]||{}).handle||o.handler).apply(i.elem,s),void 0!==r&&(e.result=r)===!1&&(e.preventDefault(),e.stopPropagation()));return l.postDispatch&&l.postDispatch.call(this,e),e.result}},handlers:function(e,t){var n,r,i,o,a=[],s=t.delegateCount,u=e.target;if(s&&u.nodeType&&("click"!==e.type||isNaN(e.button)||e.button<1))for(;u!=this;u=u.parentNode||this)if(1===u.nodeType&&(u.disabled!==!0||"click"!==e.type)){for(r=[],n=0;n<s;n++)o=t[n],i=o.selector+" ",void 0===r[i]&&(r[i]=o.needsContext?pe(i,this).index(u)>-1:pe.find(i,this,null,[u]).length),r[i]&&r.push(o);r.length&&a.push({elem:u,handlers:r})}return s<t.length&&a.push({elem:this,handlers:t.slice(s)}),a},fix:function(e){if(e[pe.expando])return e;var t,n,r,i=e.type,o=e,a=this.fixHooks[i];for(a||(this.fixHooks[i]=a=Ge.test(i)?this.mouseHooks:Je.test(i)?this.keyHooks:{}),r=a.props?this.props.concat(a.props):this.props,e=new pe.Event(o),t=r.length;t--;)n=r[t],e[n]=o[n];return e.target||(e.target=o.srcElement||re),3===e.target.nodeType&&(e.target=e.target.parentNode),e.metaKey=!!e.metaKey,a.filter?a.filter(e,o):e},props:"altKey bubbles cancelable ctrlKey currentTarget detail eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return null==e.which&&(e.which=null!=t.charCode?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,t){var n,r,i,o=t.button,a=t.fromElement;return null==e.pageX&&null!=t.clientX&&(r=e.target.ownerDocument||re,i=r.documentElement,n=r.body,e.pageX=t.clientX+(i&&i.scrollLeft||n&&n.scrollLeft||0)-(i&&i.clientLeft||n&&n.clientLeft||0),e.pageY=t.clientY+(i&&i.scrollTop||n&&n.scrollTop||0)-(i&&i.clientTop||n&&n.clientTop||0)),!e.relatedTarget&&a&&(e.relatedTarget=a===e.target?t.toElement:a),e.which||void 0===o||(e.which=1&o?1:2&o?3:4&o?2:0),e}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==b()&&this.focus)try{return this.focus(),!1}catch(e){}},delegateType:"focusin"},blur:{trigger:function(){if(this===b()&&this.blur)return this.blur(),!1},delegateType:"focusout"},click:{trigger:function(){if(pe.nodeName(this,"input")&&"checkbox"===this.type&&this.click)return this.click(),!1},_default:function(e){return pe.nodeName(e.target,"a")}},beforeunload:{postDispatch:function(e){void 0!==e.result&&e.originalEvent&&(e.originalEvent.returnValue=e.result)}}},simulate:function(e,t,n){var r=pe.extend(new pe.Event,n,{type:e,isSimulated:!0});pe.event.trigger(r,null,t),r.isDefaultPrevented()&&n.preventDefault()}},pe.removeEvent=re.removeEventListener?function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n)}:function(e,t,n){var r="on"+t;e.detachEvent&&("undefined"==typeof e[r]&&(e[r]=null),e.detachEvent(r,n))},pe.Event=function(e,t){return this instanceof pe.Event?(e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||void 0===e.defaultPrevented&&e.returnValue===!1?v:x):this.type=e,t&&pe.extend(this,t),this.timeStamp=e&&e.timeStamp||pe.now(),void(this[pe.expando]=!0)):new pe.Event(e,t)},pe.Event.prototype={constructor:pe.Event,isDefaultPrevented:x,isPropagationStopped:x,isImmediatePropagationStopped:x,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=v,e&&(e.preventDefault?e.preventDefault():e.returnValue=!1)},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=v,e&&!this.isSimulated&&(e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0)},stopImmediatePropagation:function(){var e=this.originalEvent;this.isImmediatePropagationStopped=v,e&&e.stopImmediatePropagation&&e.stopImmediatePropagation(),this.stopPropagation()}},pe.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(e,t){pe.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,o=e.handleObj;return i&&(i===r||pe.contains(r,i))||(e.type=o.origType,n=o.handler.apply(this,arguments),e.type=t),n}}}),fe.submit||(pe.event.special.submit={setup:function(){return!pe.nodeName(this,"form")&&void pe.event.add(this,"click._submit keypress._submit",function(e){var t=e.target,n=pe.nodeName(t,"input")||pe.nodeName(t,"button")?pe.prop(t,"form"):void 0;n&&!pe._data(n,"submit")&&(pe.event.add(n,"submit._submit",function(e){e._submitBubble=!0}),pe._data(n,"submit",!0))})},postDispatch:function(e){e._submitBubble&&(delete e._submitBubble,this.parentNode&&!e.isTrigger&&pe.event.simulate("submit",this.parentNode,e))},teardown:function(){return!pe.nodeName(this,"form")&&void pe.event.remove(this,"._submit")}}),fe.change||(pe.event.special.change={setup:function(){return Ye.test(this.nodeName)?("checkbox"!==this.type&&"radio"!==this.type||(pe.event.add(this,"propertychange._change",function(e){"checked"===e.originalEvent.propertyName&&(this._justChanged=!0)}),pe.event.add(this,"click._change",function(e){this._justChanged&&!e.isTrigger&&(this._justChanged=!1),pe.event.simulate("change",this,e)})),!1):void pe.event.add(this,"beforeactivate._change",function(e){var t=e.target;Ye.test(t.nodeName)&&!pe._data(t,"change")&&(pe.event.add(t,"change._change",function(e){!this.parentNode||e.isSimulated||e.isTrigger||pe.event.simulate("change",this.parentNode,e)}),pe._data(t,"change",!0))})},handle:function(e){var t=e.target;if(this!==t||e.isSimulated||e.isTrigger||"radio"!==t.type&&"checkbox"!==t.type)return e.handleObj.handler.apply(this,arguments)},teardown:function(){return pe.event.remove(this,"._change"),!Ye.test(this.nodeName)}}),fe.focusin||pe.each({focus:"focusin",blur:"focusout"},function(e,t){var n=function(e){pe.event.simulate(t,e.target,pe.event.fix(e))};pe.event.special[t]={setup:function(){var r=this.ownerDocument||this,i=pe._data(r,t);i||r.addEventListener(e,n,!0),pe._data(r,t,(i||0)+1)},teardown:function(){var r=this.ownerDocument||this,i=pe._data(r,t)-1;i?pe._data(r,t,i):(r.removeEventListener(e,n,!0),pe._removeData(r,t))}}}),pe.fn.extend({on:function(e,t,n,r){return w(this,e,t,n,r)},one:function(e,t,n,r){return w(this,e,t,n,r,1)},off:function(e,t,n){var r,i;if(e&&e.preventDefault&&e.handleObj)return r=e.handleObj,pe(e.delegateTarget).off(r.namespace?r.origType+"."+r.namespace:r.origType,r.selector,r.handler),this;if("object"==typeof e){for(i in e)this.off(i,t,e[i]);return this}return t!==!1&&"function"!=typeof t||(n=t,t=void 0),n===!1&&(n=x),this.each(function(){pe.event.remove(this,e,n,t)})},trigger:function(e,t){return this.each(function(){pe.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];if(n)return pe.event.trigger(e,t,n,!0)}});var Ze=/ jQuery\d+="(?:null|\d+)"/g,et=new RegExp("<(?:"+ze+")[\\s/>]","i"),tt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi,nt=/<script|<style|<link/i,rt=/checked\s*(?:[^=]|=\s*.checked.)/i,it=/^true\/(.*)/,ot=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,at=p(re),st=at.appendChild(re.createElement("div"));pe.extend({htmlPrefilter:function(e){return e.replace(tt,"<$1></$2>")},clone:function(e,t,n){var r,i,o,a,s,u=pe.contains(e.ownerDocument,e);if(fe.html5Clone||pe.isXMLDoc(e)||!et.test("<"+e.nodeName+">")?o=e.cloneNode(!0):(st.innerHTML=e.outerHTML,st.removeChild(o=st.firstChild)),!(fe.noCloneEvent&&fe.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||pe.isXMLDoc(e)))for(r=h(o),s=h(e),a=0;null!=(i=s[a]);++a)r[a]&&k(i,r[a]);if(t)if(n)for(s=s||h(e),r=r||h(o),a=0;null!=(i=s[a]);a++)N(i,r[a]);else N(e,o);return r=h(o,"script"),r.length>0&&g(r,!u&&h(e,"script")),r=s=i=null,o},cleanData:function(e,t){for(var n,r,i,o,a=0,s=pe.expando,u=pe.cache,l=fe.attributes,c=pe.event.special;null!=(n=e[a]);a++)if((t||He(n))&&(i=n[s],o=i&&u[i])){if(o.events)for(r in o.events)c[r]?pe.event.remove(n,r):pe.removeEvent(n,r,o.handle);u[i]&&(delete u[i],l||"undefined"==typeof n.removeAttribute?n[s]=void 0:n.removeAttribute(s),ne.push(i))}}}),pe.fn.extend({domManip:S,detach:function(e){return A(this,e,!0)},remove:function(e){return A(this,e)},text:function(e){return Pe(this,function(e){return void 0===e?pe.text(this):this.empty().append((this[0]&&this[0].ownerDocument||re).createTextNode(e))},null,e,arguments.length)},append:function(){return S(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=T(this,e);t.appendChild(e)}})},prepend:function(){return S(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=T(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return S(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return S(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},empty:function(){for(var e,t=0;null!=(e=this[t]);t++){for(1===e.nodeType&&pe.cleanData(h(e,!1));e.firstChild;)e.removeChild(e.firstChild);e.options&&pe.nodeName(e,"select")&&(e.options.length=0)}return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map(function(){return pe.clone(this,e,t)})},html:function(e){return Pe(this,function(e){var t=this[0]||{},n=0,r=this.length;if(void 0===e)return 1===t.nodeType?t.innerHTML.replace(Ze,""):void 0;if("string"==typeof e&&!nt.test(e)&&(fe.htmlSerialize||!et.test(e))&&(fe.leadingWhitespace||!$e.test(e))&&!Xe[(We.exec(e)||["",""])[1].toLowerCase()]){e=pe.htmlPrefilter(e);try{for(;n<r;n++)t=this[n]||{},1===t.nodeType&&(pe.cleanData(h(t,!1)),t.innerHTML=e);t=0}catch(i){}}t&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var e=[];return S(this,arguments,function(t){var n=this.parentNode;pe.inArray(this,e)<0&&(pe.cleanData(h(this)),n&&n.replaceChild(t,this));
+},e)}}),pe.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){pe.fn[e]=function(e){for(var n,r=0,i=[],o=pe(e),a=o.length-1;r<=a;r++)n=r===a?this:this.clone(!0),pe(o[r])[t](n),ae.apply(i,n.get());return this.pushStack(i)}});var ut,lt={HTML:"block",BODY:"block"},ct=/^margin/,ft=new RegExp("^("+Fe+")(?!px)[a-z%]+$","i"),dt=function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];i=n.apply(e,r||[]);for(o in t)e.style[o]=a[o];return i},pt=re.documentElement;!function(){function t(){var t,c,f=re.documentElement;f.appendChild(u),l.style.cssText="-webkit-box-sizing:border-box;box-sizing:border-box;position:relative;display:block;margin:auto;border:1px;padding:1px;top:1%;width:50%",n=i=s=!1,r=a=!0,e.getComputedStyle&&(c=e.getComputedStyle(l),n="1%"!==(c||{}).top,s="2px"===(c||{}).marginLeft,i="4px"===(c||{width:"4px"}).width,l.style.marginRight="50%",r="4px"===(c||{marginRight:"4px"}).marginRight,t=l.appendChild(re.createElement("div")),t.style.cssText=l.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:0",t.style.marginRight=t.style.width="0",l.style.width="1px",a=!parseFloat((e.getComputedStyle(t)||{}).marginRight),l.removeChild(t)),l.style.display="none",o=0===l.getClientRects().length,o&&(l.style.display="",l.innerHTML="<table><tr><td></td><td>t</td></tr></table>",l.childNodes[0].style.borderCollapse="separate",t=l.getElementsByTagName("td"),t[0].style.cssText="margin:0;border:0;padding:0;display:none",o=0===t[0].offsetHeight,o&&(t[0].style.display="",t[1].style.display="none",o=0===t[0].offsetHeight)),f.removeChild(u)}var n,r,i,o,a,s,u=re.createElement("div"),l=re.createElement("div");l.style&&(l.style.cssText="float:left;opacity:.5",fe.opacity="0.5"===l.style.opacity,fe.cssFloat=!!l.style.cssFloat,l.style.backgroundClip="content-box",l.cloneNode(!0).style.backgroundClip="",fe.clearCloneStyle="content-box"===l.style.backgroundClip,u=re.createElement("div"),u.style.cssText="border:0;width:8px;height:0;top:0;left:-9999px;padding:0;margin-top:1px;position:absolute",l.innerHTML="",u.appendChild(l),fe.boxSizing=""===l.style.boxSizing||""===l.style.MozBoxSizing||""===l.style.WebkitBoxSizing,pe.extend(fe,{reliableHiddenOffsets:function(){return null==n&&t(),o},boxSizingReliable:function(){return null==n&&t(),i},pixelMarginRight:function(){return null==n&&t(),r},pixelPosition:function(){return null==n&&t(),n},reliableMarginRight:function(){return null==n&&t(),a},reliableMarginLeft:function(){return null==n&&t(),s}}))}();var ht,gt,mt=/^(top|right|bottom|left)$/;e.getComputedStyle?(ht=function(t){var n=t.ownerDocument.defaultView;return n&&n.opener||(n=e),n.getComputedStyle(t)},gt=function(e,t,n){var r,i,o,a,s=e.style;return n=n||ht(e),a=n?n.getPropertyValue(t)||n[t]:void 0,""!==a&&void 0!==a||pe.contains(e.ownerDocument,e)||(a=pe.style(e,t)),n&&!fe.pixelMarginRight()&&ft.test(a)&&ct.test(t)&&(r=s.width,i=s.minWidth,o=s.maxWidth,s.minWidth=s.maxWidth=s.width=a,a=n.width,s.width=r,s.minWidth=i,s.maxWidth=o),void 0===a?a:a+""}):pt.currentStyle&&(ht=function(e){return e.currentStyle},gt=function(e,t,n){var r,i,o,a,s=e.style;return n=n||ht(e),a=n?n[t]:void 0,null==a&&s&&s[t]&&(a=s[t]),ft.test(a)&&!mt.test(t)&&(r=s.left,i=e.runtimeStyle,o=i&&i.left,o&&(i.left=e.currentStyle.left),s.left="fontSize"===t?"1em":a,a=s.pixelLeft+"px",s.left=r,o&&(i.left=o)),void 0===a?a:a+""||"auto"});var yt=/alpha\([^)]*\)/i,vt=/opacity\s*=\s*([^)]*)/i,xt=/^(none|table(?!-c[ea]).+)/,bt=new RegExp("^("+Fe+")(.*)$","i"),wt={position:"absolute",visibility:"hidden",display:"block"},Tt={letterSpacing:"0",fontWeight:"400"},Ct=["Webkit","O","Moz","ms"],Et=re.createElement("div").style;pe.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=gt(e,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":fe.cssFloat?"cssFloat":"styleFloat"},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,a,s=pe.camelCase(t),u=e.style;if(t=pe.cssProps[s]||(pe.cssProps[s]=H(s)||s),a=pe.cssHooks[t]||pe.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(e,!1,r))?i:u[t];if(o=typeof n,"string"===o&&(i=Me.exec(n))&&i[1]&&(n=d(e,t,i),o="number"),null!=n&&n===n&&("number"===o&&(n+=i&&i[3]||(pe.cssNumber[s]?"":"px")),fe.clearCloneStyle||""!==n||0!==t.indexOf("background")||(u[t]="inherit"),!(a&&"set"in a&&void 0===(n=a.set(e,n,r)))))try{u[t]=n}catch(l){}}},css:function(e,t,n,r){var i,o,a,s=pe.camelCase(t);return t=pe.cssProps[s]||(pe.cssProps[s]=H(s)||s),a=pe.cssHooks[t]||pe.cssHooks[s],a&&"get"in a&&(o=a.get(e,!0,n)),void 0===o&&(o=gt(e,t,r)),"normal"===o&&t in Tt&&(o=Tt[t]),""===n||n?(i=parseFloat(o),n===!0||isFinite(i)?i||0:o):o}}),pe.each(["height","width"],function(e,t){pe.cssHooks[t]={get:function(e,n,r){if(n)return xt.test(pe.css(e,"display"))&&0===e.offsetWidth?dt(e,wt,function(){return M(e,t,r)}):M(e,t,r)},set:function(e,n,r){var i=r&&ht(e);return _(e,n,r?F(e,t,r,fe.boxSizing&&"border-box"===pe.css(e,"boxSizing",!1,i),i):0)}}}),fe.opacity||(pe.cssHooks.opacity={get:function(e,t){return vt.test((t&&e.currentStyle?e.currentStyle.filter:e.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":t?"1":""},set:function(e,t){var n=e.style,r=e.currentStyle,i=pe.isNumeric(t)?"alpha(opacity="+100*t+")":"",o=r&&r.filter||n.filter||"";n.zoom=1,(t>=1||""===t)&&""===pe.trim(o.replace(yt,""))&&n.removeAttribute&&(n.removeAttribute("filter"),""===t||r&&!r.filter)||(n.filter=yt.test(o)?o.replace(yt,i):o+" "+i)}}),pe.cssHooks.marginRight=L(fe.reliableMarginRight,function(e,t){if(t)return dt(e,{display:"inline-block"},gt,[e,"marginRight"])}),pe.cssHooks.marginLeft=L(fe.reliableMarginLeft,function(e,t){if(t)return(parseFloat(gt(e,"marginLeft"))||(pe.contains(e.ownerDocument,e)?e.getBoundingClientRect().left-dt(e,{marginLeft:0},function(){return e.getBoundingClientRect().left}):0))+"px"}),pe.each({margin:"",padding:"",border:"Width"},function(e,t){pe.cssHooks[e+t]={expand:function(n){for(var r=0,i={},o="string"==typeof n?n.split(" "):[n];r<4;r++)i[e+Oe[r]+t]=o[r]||o[r-2]||o[0];return i}},ct.test(e)||(pe.cssHooks[e+t].set=_)}),pe.fn.extend({css:function(e,t){return Pe(this,function(e,t,n){var r,i,o={},a=0;if(pe.isArray(t)){for(r=ht(e),i=t.length;a<i;a++)o[t[a]]=pe.css(e,t[a],!1,r);return o}return void 0!==n?pe.style(e,t,n):pe.css(e,t)},e,t,arguments.length>1)},show:function(){return q(this,!0)},hide:function(){return q(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){Re(this)?pe(this).show():pe(this).hide()})}}),pe.Tween=O,O.prototype={constructor:O,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||pe.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(pe.cssNumber[n]?"":"px")},cur:function(){var e=O.propHooks[this.prop];return e&&e.get?e.get(this):O.propHooks._default.get(this)},run:function(e){var t,n=O.propHooks[this.prop];return this.options.duration?this.pos=t=pe.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):O.propHooks._default.set(this),this}},O.prototype.init.prototype=O.prototype,O.propHooks={_default:{get:function(e){var t;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(t=pe.css(e.elem,e.prop,""),t&&"auto"!==t?t:0)},set:function(e){pe.fx.step[e.prop]?pe.fx.step[e.prop](e):1!==e.elem.nodeType||null==e.elem.style[pe.cssProps[e.prop]]&&!pe.cssHooks[e.prop]?e.elem[e.prop]=e.now:pe.style(e.elem,e.prop,e.now+e.unit)}}},O.propHooks.scrollTop=O.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},pe.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},pe.fx=O.prototype.init,pe.fx.step={};var Nt,kt,St=/^(?:toggle|show|hide)$/,At=/queueHooks$/;pe.Animation=pe.extend($,{tweeners:{"*":[function(e,t){var n=this.createTween(e,t);return d(n.elem,e,Me.exec(t),n),n}]},tweener:function(e,t){pe.isFunction(e)?(t=e,e=["*"]):e=e.match(De);for(var n,r=0,i=e.length;r<i;r++)n=e[r],$.tweeners[n]=$.tweeners[n]||[],$.tweeners[n].unshift(t)},prefilters:[W],prefilter:function(e,t){t?$.prefilters.unshift(e):$.prefilters.push(e)}}),pe.speed=function(e,t,n){var r=e&&"object"==typeof e?pe.extend({},e):{complete:n||!n&&t||pe.isFunction(e)&&e,duration:e,easing:n&&t||t&&!pe.isFunction(t)&&t};return r.duration=pe.fx.off?0:"number"==typeof r.duration?r.duration:r.duration in pe.fx.speeds?pe.fx.speeds[r.duration]:pe.fx.speeds._default,null!=r.queue&&r.queue!==!0||(r.queue="fx"),r.old=r.complete,r.complete=function(){pe.isFunction(r.old)&&r.old.call(this),r.queue&&pe.dequeue(this,r.queue)},r},pe.fn.extend({fadeTo:function(e,t,n,r){return this.filter(Re).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(e,t,n,r){var i=pe.isEmptyObject(e),o=pe.speed(t,n,r),a=function(){var t=$(this,pe.extend({},e),o);(i||pe._data(this,"finish"))&&t.stop(!0)};return a.finish=a,i||o.queue===!1?this.each(a):this.queue(o.queue,a)},stop:function(e,t,n){var r=function(e){var t=e.stop;delete e.stop,t(n)};return"string"!=typeof e&&(n=t,t=e,e=void 0),t&&e!==!1&&this.queue(e||"fx",[]),this.each(function(){var t=!0,i=null!=e&&e+"queueHooks",o=pe.timers,a=pe._data(this);if(i)a[i]&&a[i].stop&&r(a[i]);else for(i in a)a[i]&&a[i].stop&&At.test(i)&&r(a[i]);for(i=o.length;i--;)o[i].elem!==this||null!=e&&o[i].queue!==e||(o[i].anim.stop(n),t=!1,o.splice(i,1));!t&&n||pe.dequeue(this,e)})},finish:function(e){return e!==!1&&(e=e||"fx"),this.each(function(){var t,n=pe._data(this),r=n[e+"queue"],i=n[e+"queueHooks"],o=pe.timers,a=r?r.length:0;for(n.finish=!0,pe.queue(this,e,[]),i&&i.stop&&i.stop.call(this,!0),t=o.length;t--;)o[t].elem===this&&o[t].queue===e&&(o[t].anim.stop(!0),o.splice(t,1));for(t=0;t<a;t++)r[t]&&r[t].finish&&r[t].finish.call(this);delete n.finish})}}),pe.each(["toggle","show","hide"],function(e,t){var n=pe.fn[t];pe.fn[t]=function(e,r,i){return null==e||"boolean"==typeof e?n.apply(this,arguments):this.animate(P(t,!0),e,r,i)}}),pe.each({slideDown:P("show"),slideUp:P("hide"),slideToggle:P("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,t){pe.fn[e]=function(e,n,r){return this.animate(t,e,n,r)}}),pe.timers=[],pe.fx.tick=function(){var e,t=pe.timers,n=0;for(Nt=pe.now();n<t.length;n++)e=t[n],e()||t[n]!==e||t.splice(n--,1);t.length||pe.fx.stop(),Nt=void 0},pe.fx.timer=function(e){pe.timers.push(e),e()?pe.fx.start():pe.timers.pop()},pe.fx.interval=13,pe.fx.start=function(){kt||(kt=e.setInterval(pe.fx.tick,pe.fx.interval))},pe.fx.stop=function(){e.clearInterval(kt),kt=null},pe.fx.speeds={slow:600,fast:200,_default:400},pe.fn.delay=function(t,n){return t=pe.fx?pe.fx.speeds[t]||t:t,n=n||"fx",this.queue(n,function(n,r){var i=e.setTimeout(n,t);r.stop=function(){e.clearTimeout(i)}})},function(){var e,t=re.createElement("input"),n=re.createElement("div"),r=re.createElement("select"),i=r.appendChild(re.createElement("option"));n=re.createElement("div"),n.setAttribute("className","t"),n.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",e=n.getElementsByTagName("a")[0],t.setAttribute("type","checkbox"),n.appendChild(t),e=n.getElementsByTagName("a")[0],e.style.cssText="top:1px",fe.getSetAttribute="t"!==n.className,fe.style=/top/.test(e.getAttribute("style")),fe.hrefNormalized="/a"===e.getAttribute("href"),fe.checkOn=!!t.value,fe.optSelected=i.selected,fe.enctype=!!re.createElement("form").enctype,r.disabled=!0,fe.optDisabled=!i.disabled,t=re.createElement("input"),t.setAttribute("value",""),fe.input=""===t.getAttribute("value"),t.value="t",t.setAttribute("type","radio"),fe.radioValue="t"===t.value}();var Dt=/\r/g,jt=/[\x20\t\r\n\f]+/g;pe.fn.extend({val:function(e){var t,n,r,i=this[0];{if(arguments.length)return r=pe.isFunction(e),this.each(function(n){var i;1===this.nodeType&&(i=r?e.call(this,n,pe(this).val()):e,null==i?i="":"number"==typeof i?i+="":pe.isArray(i)&&(i=pe.map(i,function(e){return null==e?"":e+""})),t=pe.valHooks[this.type]||pe.valHooks[this.nodeName.toLowerCase()],t&&"set"in t&&void 0!==t.set(this,i,"value")||(this.value=i))});if(i)return t=pe.valHooks[i.type]||pe.valHooks[i.nodeName.toLowerCase()],t&&"get"in t&&void 0!==(n=t.get(i,"value"))?n:(n=i.value,"string"==typeof n?n.replace(Dt,""):null==n?"":n)}}}),pe.extend({valHooks:{option:{get:function(e){var t=pe.find.attr(e,"value");return null!=t?t:pe.trim(pe.text(e)).replace(jt," ")}},select:{get:function(e){for(var t,n,r=e.options,i=e.selectedIndex,o="select-one"===e.type||i<0,a=o?null:[],s=o?i+1:r.length,u=i<0?s:o?i:0;u<s;u++)if(n=r[u],(n.selected||u===i)&&(fe.optDisabled?!n.disabled:null===n.getAttribute("disabled"))&&(!n.parentNode.disabled||!pe.nodeName(n.parentNode,"optgroup"))){if(t=pe(n).val(),o)return t;a.push(t)}return a},set:function(e,t){for(var n,r,i=e.options,o=pe.makeArray(t),a=i.length;a--;)if(r=i[a],pe.inArray(pe.valHooks.option.get(r),o)>-1)try{r.selected=n=!0}catch(s){r.scrollHeight}else r.selected=!1;return n||(e.selectedIndex=-1),i}}}}),pe.each(["radio","checkbox"],function(){pe.valHooks[this]={set:function(e,t){if(pe.isArray(t))return e.checked=pe.inArray(pe(e).val(),t)>-1}},fe.checkOn||(pe.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})});var Lt,Ht,qt=pe.expr.attrHandle,_t=/^(?:checked|selected)$/i,Ft=fe.getSetAttribute,Mt=fe.input;pe.fn.extend({attr:function(e,t){return Pe(this,pe.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){pe.removeAttr(this,e)})}}),pe.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return"undefined"==typeof e.getAttribute?pe.prop(e,t,n):(1===o&&pe.isXMLDoc(e)||(t=t.toLowerCase(),i=pe.attrHooks[t]||(pe.expr.match.bool.test(t)?Ht:Lt)),void 0!==n?null===n?void pe.removeAttr(e,t):i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:(e.setAttribute(t,n+""),n):i&&"get"in i&&null!==(r=i.get(e,t))?r:(r=pe.find.attr(e,t),null==r?void 0:r))},attrHooks:{type:{set:function(e,t){if(!fe.radioValue&&"radio"===t&&pe.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,r,i=0,o=t&&t.match(De);if(o&&1===e.nodeType)for(;n=o[i++];)r=pe.propFix[n]||n,pe.expr.match.bool.test(n)?Mt&&Ft||!_t.test(n)?e[r]=!1:e[pe.camelCase("default-"+n)]=e[r]=!1:pe.attr(e,n,""),e.removeAttribute(Ft?n:r)}}),Ht={set:function(e,t,n){return t===!1?pe.removeAttr(e,n):Mt&&Ft||!_t.test(n)?e.setAttribute(!Ft&&pe.propFix[n]||n,n):e[pe.camelCase("default-"+n)]=e[n]=!0,n}},pe.each(pe.expr.match.bool.source.match(/\w+/g),function(e,t){var n=qt[t]||pe.find.attr;Mt&&Ft||!_t.test(t)?qt[t]=function(e,t,r){var i,o;return r||(o=qt[t],qt[t]=i,i=null!=n(e,t,r)?t.toLowerCase():null,qt[t]=o),i}:qt[t]=function(e,t,n){if(!n)return e[pe.camelCase("default-"+t)]?t.toLowerCase():null}}),Mt&&Ft||(pe.attrHooks.value={set:function(e,t,n){return pe.nodeName(e,"input")?void(e.defaultValue=t):Lt&&Lt.set(e,t,n)}}),Ft||(Lt={set:function(e,t,n){var r=e.getAttributeNode(n);if(r||e.setAttributeNode(r=e.ownerDocument.createAttribute(n)),r.value=t+="","value"===n||t===e.getAttribute(n))return t}},qt.id=qt.name=qt.coords=function(e,t,n){var r;if(!n)return(r=e.getAttributeNode(t))&&""!==r.value?r.value:null},pe.valHooks.button={get:function(e,t){var n=e.getAttributeNode(t);if(n&&n.specified)return n.value},set:Lt.set},pe.attrHooks.contenteditable={set:function(e,t,n){Lt.set(e,""!==t&&t,n)}},pe.each(["width","height"],function(e,t){pe.attrHooks[t]={set:function(e,n){if(""===n)return e.setAttribute(t,"auto"),n}}})),fe.style||(pe.attrHooks.style={get:function(e){return e.style.cssText||void 0},set:function(e,t){return e.style.cssText=t+""}});var Ot=/^(?:input|select|textarea|button|object)$/i,Rt=/^(?:a|area)$/i;pe.fn.extend({prop:function(e,t){return Pe(this,pe.prop,e,t,arguments.length>1)},removeProp:function(e){return e=pe.propFix[e]||e,this.each(function(){try{this[e]=void 0,delete this[e]}catch(t){}})}}),pe.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&pe.isXMLDoc(e)||(t=pe.propFix[t]||t,i=pe.propHooks[t]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=pe.find.attr(e,"tabindex");return t?parseInt(t,10):Ot.test(e.nodeName)||Rt.test(e.nodeName)&&e.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),fe.hrefNormalized||pe.each(["href","src"],function(e,t){pe.propHooks[t]={get:function(e){return e.getAttribute(t,4)}}}),fe.optSelected||(pe.propHooks.selected={get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),pe.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){pe.propFix[this.toLowerCase()]=this}),fe.enctype||(pe.propFix.enctype="encoding");var Pt=/[\t\r\n\f]/g;pe.fn.extend({addClass:function(e){var t,n,r,i,o,a,s,u=0;if(pe.isFunction(e))return this.each(function(t){pe(this).addClass(e.call(this,t,z(this)))});if("string"==typeof e&&e)for(t=e.match(De)||[];n=this[u++];)if(i=z(n),r=1===n.nodeType&&(" "+i+" ").replace(Pt," ")){for(a=0;o=t[a++];)r.indexOf(" "+o+" ")<0&&(r+=o+" ");s=pe.trim(r),i!==s&&pe.attr(n,"class",s)}return this},removeClass:function(e){var t,n,r,i,o,a,s,u=0;if(pe.isFunction(e))return this.each(function(t){pe(this).removeClass(e.call(this,t,z(this)))});if(!arguments.length)return this.attr("class","");if("string"==typeof e&&e)for(t=e.match(De)||[];n=this[u++];)if(i=z(n),r=1===n.nodeType&&(" "+i+" ").replace(Pt," ")){for(a=0;o=t[a++];)for(;r.indexOf(" "+o+" ")>-1;)r=r.replace(" "+o+" "," ");s=pe.trim(r),i!==s&&pe.attr(n,"class",s)}return this},toggleClass:function(e,t){var n=typeof e;return"boolean"==typeof t&&"string"===n?t?this.addClass(e):this.removeClass(e):pe.isFunction(e)?this.each(function(n){pe(this).toggleClass(e.call(this,n,z(this),t),t)}):this.each(function(){var t,r,i,o;if("string"===n)for(r=0,i=pe(this),o=e.match(De)||[];t=o[r++];)i.hasClass(t)?i.removeClass(t):i.addClass(t);else void 0!==e&&"boolean"!==n||(t=z(this),t&&pe._data(this,"__className__",t),pe.attr(this,"class",t||e===!1?"":pe._data(this,"__className__")||""))})},hasClass:function(e){var t,n,r=0;for(t=" "+e+" ";n=this[r++];)if(1===n.nodeType&&(" "+z(n)+" ").replace(Pt," ").indexOf(t)>-1)return!0;return!1}}),pe.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(e,t){pe.fn[t]=function(e,n){return arguments.length>0?this.on(t,null,e,n):this.trigger(t)}}),pe.fn.extend({hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}});var Bt=e.location,Wt=pe.now(),It=/\?/,$t=/(,)|(\[|{)|(}|])|"(?:[^"\\\r\n]|\\["\\\/bfnrt]|\\u[\da-fA-F]{4})*"\s*:?|true|false|null|-?(?!0\d)\d+(?:\.\d+|)(?:[eE][+-]?\d+|)/g;pe.parseJSON=function(t){if(e.JSON&&e.JSON.parse)return e.JSON.parse(t+"");var n,r=null,i=pe.trim(t+"");return i&&!pe.trim(i.replace($t,function(e,t,i,o){return n&&t&&(r=0),0===r?e:(n=i||t,r+=!o-!i,"")}))?Function("return "+i)():pe.error("Invalid JSON: "+t)},pe.parseXML=function(t){var n,r;if(!t||"string"!=typeof t)return null;try{e.DOMParser?(r=new e.DOMParser,n=r.parseFromString(t,"text/xml")):(n=new e.ActiveXObject("Microsoft.XMLDOM"),n.async="false",n.loadXML(t))}catch(i){n=void 0}return n&&n.documentElement&&!n.getElementsByTagName("parsererror").length||pe.error("Invalid XML: "+t),n};var zt=/#.*$/,Xt=/([?&])_=[^&]*/,Ut=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Vt=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Yt=/^(?:GET|HEAD)$/,Jt=/^\/\//,Gt=/^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,Kt={},Qt={},Zt="*/".concat("*"),en=Bt.href,tn=Gt.exec(en.toLowerCase())||[];pe.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:en,type:"GET",isLocal:Vt.test(tn[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Zt,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":pe.parseJSON,"text xml":pe.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?V(V(e,pe.ajaxSettings),t):V(pe.ajaxSettings,e)},ajaxPrefilter:X(Kt),ajaxTransport:X(Qt),ajax:function(t,n){function r(t,n,r,i){var o,f,v,x,w,C=n;2!==b&&(b=2,u&&e.clearTimeout(u),c=void 0,s=i||"",T.readyState=t>0?4:0,o=t>=200&&t<300||304===t,r&&(x=Y(d,T,r)),x=J(d,x,T,o),o?(d.ifModified&&(w=T.getResponseHeader("Last-Modified"),w&&(pe.lastModified[a]=w),w=T.getResponseHeader("etag"),w&&(pe.etag[a]=w)),204===t||"HEAD"===d.type?C="nocontent":304===t?C="notmodified":(C=x.state,f=x.data,v=x.error,o=!v)):(v=C,!t&&C||(C="error",t<0&&(t=0))),T.status=t,T.statusText=(n||C)+"",o?g.resolveWith(p,[f,C,T]):g.rejectWith(p,[T,C,v]),T.statusCode(y),y=void 0,l&&h.trigger(o?"ajaxSuccess":"ajaxError",[T,d,o?f:v]),m.fireWith(p,[T,C]),l&&(h.trigger("ajaxComplete",[T,d]),--pe.active||pe.event.trigger("ajaxStop")))}"object"==typeof t&&(n=t,t=void 0),n=n||{};var i,o,a,s,u,l,c,f,d=pe.ajaxSetup({},n),p=d.context||d,h=d.context&&(p.nodeType||p.jquery)?pe(p):pe.event,g=pe.Deferred(),m=pe.Callbacks("once memory"),y=d.statusCode||{},v={},x={},b=0,w="canceled",T={readyState:0,getResponseHeader:function(e){var t;if(2===b){if(!f)for(f={};t=Ut.exec(s);)f[t[1].toLowerCase()]=t[2];t=f[e.toLowerCase()]}return null==t?null:t},getAllResponseHeaders:function(){return 2===b?s:null},setRequestHeader:function(e,t){var n=e.toLowerCase();return b||(e=x[n]=x[n]||e,v[e]=t),this},overrideMimeType:function(e){return b||(d.mimeType=e),this},statusCode:function(e){var t;if(e)if(b<2)for(t in e)y[t]=[y[t],e[t]];else T.always(e[T.status]);return this},abort:function(e){var t=e||w;return c&&c.abort(t),r(0,t),this}};if(g.promise(T).complete=m.add,T.success=T.done,T.error=T.fail,d.url=((t||d.url||en)+"").replace(zt,"").replace(Jt,tn[1]+"//"),d.type=n.method||n.type||d.method||d.type,d.dataTypes=pe.trim(d.dataType||"*").toLowerCase().match(De)||[""],null==d.crossDomain&&(i=Gt.exec(d.url.toLowerCase()),d.crossDomain=!(!i||i[1]===tn[1]&&i[2]===tn[2]&&(i[3]||("http:"===i[1]?"80":"443"))===(tn[3]||("http:"===tn[1]?"80":"443")))),d.data&&d.processData&&"string"!=typeof d.data&&(d.data=pe.param(d.data,d.traditional)),U(Kt,d,n,T),2===b)return T;l=pe.event&&d.global,l&&0===pe.active++&&pe.event.trigger("ajaxStart"),d.type=d.type.toUpperCase(),d.hasContent=!Yt.test(d.type),a=d.url,d.hasContent||(d.data&&(a=d.url+=(It.test(a)?"&":"?")+d.data,delete d.data),d.cache===!1&&(d.url=Xt.test(a)?a.replace(Xt,"$1_="+Wt++):a+(It.test(a)?"&":"?")+"_="+Wt++)),d.ifModified&&(pe.lastModified[a]&&T.setRequestHeader("If-Modified-Since",pe.lastModified[a]),pe.etag[a]&&T.setRequestHeader("If-None-Match",pe.etag[a])),(d.data&&d.hasContent&&d.contentType!==!1||n.contentType)&&T.setRequestHeader("Content-Type",d.contentType),T.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+("*"!==d.dataTypes[0]?", "+Zt+"; q=0.01":""):d.accepts["*"]);for(o in d.headers)T.setRequestHeader(o,d.headers[o]);if(d.beforeSend&&(d.beforeSend.call(p,T,d)===!1||2===b))return T.abort();w="abort";for(o in{success:1,error:1,complete:1})T[o](d[o]);if(c=U(Qt,d,n,T)){if(T.readyState=1,l&&h.trigger("ajaxSend",[T,d]),2===b)return T;d.async&&d.timeout>0&&(u=e.setTimeout(function(){T.abort("timeout")},d.timeout));try{b=1,c.send(v,r)}catch(C){if(!(b<2))throw C;r(-1,C)}}else r(-1,"No Transport");return T},getJSON:function(e,t,n){return pe.get(e,t,n,"json")},getScript:function(e,t){return pe.get(e,void 0,t,"script")}}),pe.each(["get","post"],function(e,t){pe[t]=function(e,n,r,i){return pe.isFunction(n)&&(i=i||r,r=n,n=void 0),pe.ajax(pe.extend({url:e,type:t,dataType:i,data:n,success:r},pe.isPlainObject(e)&&e))}}),pe._evalUrl=function(e){return pe.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,"throws":!0})},pe.fn.extend({wrapAll:function(e){if(pe.isFunction(e))return this.each(function(t){pe(this).wrapAll(e.call(this,t))});if(this[0]){var t=pe(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){for(var e=this;e.firstChild&&1===e.firstChild.nodeType;)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return pe.isFunction(e)?this.each(function(t){pe(this).wrapInner(e.call(this,t))}):this.each(function(){var t=pe(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=pe.isFunction(e);return this.each(function(n){pe(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){pe.nodeName(this,"body")||pe(this).replaceWith(this.childNodes)}).end()}}),pe.expr.filters.hidden=function(e){return fe.reliableHiddenOffsets()?e.offsetWidth<=0&&e.offsetHeight<=0&&!e.getClientRects().length:K(e)},pe.expr.filters.visible=function(e){return!pe.expr.filters.hidden(e)};var nn=/%20/g,rn=/\[\]$/,on=/\r?\n/g,an=/^(?:submit|button|image|reset|file)$/i,sn=/^(?:input|select|textarea|keygen)/i;pe.param=function(e,t){var n,r=[],i=function(e,t){t=pe.isFunction(t)?t():null==t?"":t,r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};if(void 0===t&&(t=pe.ajaxSettings&&pe.ajaxSettings.traditional),pe.isArray(e)||e.jquery&&!pe.isPlainObject(e))pe.each(e,function(){i(this.name,this.value)});else for(n in e)Q(n,e[n],t,i);return r.join("&").replace(nn,"+")},pe.fn.extend({serialize:function(){return pe.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=pe.prop(this,"elements");return e?pe.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!pe(this).is(":disabled")&&sn.test(this.nodeName)&&!an.test(e)&&(this.checked||!Be.test(e))}).map(function(e,t){var n=pe(this).val();return null==n?null:pe.isArray(n)?pe.map(n,function(e){return{name:t.name,value:e.replace(on,"\r\n")}}):{name:t.name,value:n.replace(on,"\r\n")}}).get()}}),pe.ajaxSettings.xhr=void 0!==e.ActiveXObject?function(){return this.isLocal?ee():re.documentMode>8?Z():/^(get|post|head|put|delete|options)$/i.test(this.type)&&Z()||ee()}:Z;var un=0,ln={},cn=pe.ajaxSettings.xhr();e.attachEvent&&e.attachEvent("onunload",function(){for(var e in ln)ln[e](void 0,!0)}),fe.cors=!!cn&&"withCredentials"in cn,cn=fe.ajax=!!cn,cn&&pe.ajaxTransport(function(t){if(!t.crossDomain||fe.cors){var n;return{send:function(r,i){var o,a=t.xhr(),s=++un;if(a.open(t.type,t.url,t.async,t.username,t.password),t.xhrFields)for(o in t.xhrFields)a[o]=t.xhrFields[o];t.mimeType&&a.overrideMimeType&&a.overrideMimeType(t.mimeType),t.crossDomain||r["X-Requested-With"]||(r["X-Requested-With"]="XMLHttpRequest");for(o in r)void 0!==r[o]&&a.setRequestHeader(o,r[o]+"");a.send(t.hasContent&&t.data||null),n=function(e,r){var o,u,l;if(n&&(r||4===a.readyState))if(delete ln[s],n=void 0,a.onreadystatechange=pe.noop,r)4!==a.readyState&&a.abort();else{l={},o=a.status,"string"==typeof a.responseText&&(l.text=a.responseText);try{u=a.statusText}catch(c){u=""}o||!t.isLocal||t.crossDomain?1223===o&&(o=204):o=l.text?200:404}l&&i(o,u,l,a.getAllResponseHeaders())},t.async?4===a.readyState?e.setTimeout(n):a.onreadystatechange=ln[s]=n:n()},abort:function(){n&&n(void 0,!0)}}}}),pe.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return pe.globalEval(e),e}}}),pe.ajaxPrefilter("script",function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET",e.global=!1)}),pe.ajaxTransport("script",function(e){if(e.crossDomain){var t,n=re.head||pe("head")[0]||re.documentElement;return{send:function(r,i){t=re.createElement("script"),t.async=!0,e.scriptCharset&&(t.charset=e.scriptCharset),t.src=e.url,t.onload=t.onreadystatechange=function(e,n){(n||!t.readyState||/loaded|complete/.test(t.readyState))&&(t.onload=t.onreadystatechange=null,t.parentNode&&t.parentNode.removeChild(t),t=null,n||i(200,"success"))},n.insertBefore(t,n.firstChild)},abort:function(){t&&t.onload(void 0,!0)}}}});var fn=[],dn=/(=)\?(?=&|$)|\?\?/;pe.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=fn.pop()||pe.expando+"_"+Wt++;return this[e]=!0,e}}),pe.ajaxPrefilter("json jsonp",function(t,n,r){var i,o,a,s=t.jsonp!==!1&&(dn.test(t.url)?"url":"string"==typeof t.data&&0===(t.contentType||"").indexOf("application/x-www-form-urlencoded")&&dn.test(t.data)&&"data");if(s||"jsonp"===t.dataTypes[0])return i=t.jsonpCallback=pe.isFunction(t.jsonpCallback)?t.jsonpCallback():t.jsonpCallback,s?t[s]=t[s].replace(dn,"$1"+i):t.jsonp!==!1&&(t.url+=(It.test(t.url)?"&":"?")+t.jsonp+"="+i),t.converters["script json"]=function(){return a||pe.error(i+" was not called"),a[0]},t.dataTypes[0]="json",o=e[i],e[i]=function(){a=arguments},r.always(function(){void 0===o?pe(e).removeProp(i):e[i]=o,t[i]&&(t.jsonpCallback=n.jsonpCallback,fn.push(i)),a&&pe.isFunction(o)&&o(a[0]),a=o=void 0}),"script"}),pe.parseHTML=function(e,t,n){if(!e||"string"!=typeof e)return null;"boolean"==typeof t&&(n=t,t=!1),t=t||re;var r=Te.exec(e),i=!n&&[];return r?[t.createElement(r[1])]:(r=y([e],t,i),i&&i.length&&pe(i).remove(),pe.merge([],r.childNodes))};var pn=pe.fn.load;return pe.fn.load=function(e,t,n){if("string"!=typeof e&&pn)return pn.apply(this,arguments);var r,i,o,a=this,s=e.indexOf(" ");return s>-1&&(r=pe.trim(e.slice(s,e.length)),e=e.slice(0,s)),pe.isFunction(t)?(n=t,t=void 0):t&&"object"==typeof t&&(i="POST"),a.length>0&&pe.ajax({url:e,type:i||"GET",dataType:"html",data:t}).done(function(e){o=arguments,a.html(r?pe("<div>").append(pe.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},pe.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){pe.fn[t]=function(e){return this.on(t,e)}}),pe.expr.filters.animated=function(e){return pe.grep(pe.timers,function(t){return e===t.elem}).length},pe.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l,c=pe.css(e,"position"),f=pe(e),d={};"static"===c&&(e.style.position="relative"),s=f.offset(),o=pe.css(e,"top"),u=pe.css(e,"left"),l=("absolute"===c||"fixed"===c)&&pe.inArray("auto",[o,u])>-1,l?(r=f.position(),a=r.top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),pe.isFunction(t)&&(t=t.call(e,n,pe.extend({},s))),null!=t.top&&(d.top=t.top-s.top+a),null!=t.left&&(d.left=t.left-s.left+i),"using"in t?t.using.call(e,d):f.css(d)}},pe.fn.extend({offset:function(e){if(arguments.length)return void 0===e?this:this.each(function(t){pe.offset.setOffset(this,e,t)});var t,n,r={top:0,left:0},i=this[0],o=i&&i.ownerDocument;if(o)return t=o.documentElement,pe.contains(t,i)?("undefined"!=typeof i.getBoundingClientRect&&(r=i.getBoundingClientRect()),n=te(o),{top:r.top+(n.pageYOffset||t.scrollTop)-(t.clientTop||0),left:r.left+(n.pageXOffset||t.scrollLeft)-(t.clientLeft||0)}):r},position:function(){if(this[0]){var e,t,n={top:0,left:0},r=this[0];return"fixed"===pe.css(r,"position")?t=r.getBoundingClientRect():(e=this.offsetParent(),t=this.offset(),pe.nodeName(e[0],"html")||(n=e.offset()),n.top+=pe.css(e[0],"borderTopWidth",!0),n.left+=pe.css(e[0],"borderLeftWidth",!0)),{top:t.top-n.top-pe.css(r,"marginTop",!0),left:t.left-n.left-pe.css(r,"marginLeft",!0)}}},offsetParent:function(){
+return this.map(function(){for(var e=this.offsetParent;e&&!pe.nodeName(e,"html")&&"static"===pe.css(e,"position");)e=e.offsetParent;return e||pt})}}),pe.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,t){var n=/Y/.test(t);pe.fn[e]=function(r){return Pe(this,function(e,r,i){var o=te(e);return void 0===i?o?t in o?o[t]:o.document.documentElement[r]:e[r]:void(o?o.scrollTo(n?pe(o).scrollLeft():i,n?i:pe(o).scrollTop()):e[r]=i)},e,r,arguments.length,null)}}),pe.each(["top","left"],function(e,t){pe.cssHooks[t]=L(fe.pixelPosition,function(e,n){if(n)return n=gt(e,t),ft.test(n)?pe(e).position()[t]+"px":n})}),pe.each({Height:"height",Width:"width"},function(e,t){pe.each({padding:"inner"+e,content:t,"":"outer"+e},function(n,r){pe.fn[r]=function(r,i){var o=arguments.length&&(n||"boolean"!=typeof r),a=n||(r===!0||i===!0?"margin":"border");return Pe(this,function(t,n,r){var i;return pe.isWindow(t)?t.document.documentElement["client"+e]:9===t.nodeType?(i=t.documentElement,Math.max(t.body["scroll"+e],i["scroll"+e],t.body["offset"+e],i["offset"+e],i["client"+e])):void 0===r?pe.css(t,n,a):pe.style(t,n,r,a)},t,o?r:void 0,o,null)}})}),pe.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)}}),pe.fn.size=function(){return this.length},pe.fn.andSelf=pe.fn.addBack,layui.define(function(e){layui.$=pe,e("jquery",pe)}),pe});!function(e,t){"use strict";var i,n,a=e.layui&&layui.define,o={getPath:function(){var t=document.currentScript?document.currentScript.src:function(){for(var e,t=document.scripts,i=t.length-1,n=i;n>0;n--)if("interactive"===t[n].readyState){e=t[n].src;break}return e||t[i].src}(),i=e.LAYUI_GLOBAL||{};return i.layer_dir||t.substring(0,t.lastIndexOf("/")+1)}(),config:{},end:{},minIndex:0,minLeft:[],btn:["&#x786E;&#x5B9A;","&#x53D6;&#x6D88;"],type:["dialog","page","iframe","loading","tips"],getStyle:function(t,i){var n=t.currentStyle?t.currentStyle:e.getComputedStyle(t,null);return n[n.getPropertyValue?"getPropertyValue":"getAttribute"](i)},link:function(t,i,n){if(r.path){var a=document.getElementsByTagName("head")[0],s=document.createElement("link");"string"==typeof i&&(n=i);var l=(n||t).replace(/\.|\//g,""),f="layuicss-"+l,c="creating",u=0;s.rel="stylesheet",s.href=r.path+t,s.id=f,document.getElementById(f)||a.appendChild(s),"function"==typeof i&&!function d(t){var n=100,a=document.getElementById(f);return++u>1e4/n?e.console&&console.error(l+".css: Invalid"):void(1989===parseInt(o.getStyle(a,"width"))?(t===c&&a.removeAttribute("lay-status"),a.getAttribute("lay-status")===c?setTimeout(d,n):i()):(a.setAttribute("lay-status",c),setTimeout(function(){d(c)},n)))}()}}},r={v:"3.5.1",ie:function(){var t=navigator.userAgent.toLowerCase();return!!(e.ActiveXObject||"ActiveXObject"in e)&&((t.match(/msie\s(\d+)/)||[])[1]||"11")}(),index:e.layer&&e.layer.v?1e5:0,path:o.getPath,config:function(e,t){return e=e||{},r.cache=o.config=i.extend({},o.config,e),r.path=o.config.path||r.path,"string"==typeof e.extend&&(e.extend=[e.extend]),o.config.path&&r.ready(),e.extend?(a?layui.addcss("modules/layer/"+e.extend):o.link("theme/"+e.extend),this):this},ready:function(e){var t="layer",i="",n=(a?"modules/layer/":"theme/")+"default/layer.css?v="+r.v+i;return a?layui.addcss(n,e,t):o.link(n,e,t),this},alert:function(e,t,n){var a="function"==typeof t;return a&&(n=t),r.open(i.extend({content:e,yes:n},a?{}:t))},confirm:function(e,t,n,a){var s="function"==typeof t;return s&&(a=n,n=t),r.open(i.extend({content:e,btn:o.btn,yes:n,btn2:a},s?{}:t))},msg:function(e,n,a){var s="function"==typeof n,f=o.config.skin,c=(f?f+" "+f+"-msg":"")||"layui-layer-msg",u=l.anim.length-1;return s&&(a=n),r.open(i.extend({content:e,time:3e3,shade:!1,skin:c,title:!1,closeBtn:!1,btn:!1,resize:!1,end:a},s&&!o.config.skin?{skin:c+" layui-layer-hui",anim:u}:function(){return n=n||{},(n.icon===-1||n.icon===t&&!o.config.skin)&&(n.skin=c+" "+(n.skin||"layui-layer-hui")),n}()))},load:function(e,t){return r.open(i.extend({type:3,icon:e||0,resize:!1,shade:.01},t))},tips:function(e,t,n){return r.open(i.extend({type:4,content:[e,t],closeBtn:!1,time:3e3,shade:!1,resize:!1,fixed:!1,maxWidth:260},n))}},s=function(e){var t=this,a=function(){t.creat()};t.index=++r.index,t.config.maxWidth=i(n).width()-30,t.config=i.extend({},t.config,o.config,e),document.body?a():setTimeout(function(){a()},30)};s.pt=s.prototype;var l=["layui-layer",".layui-layer-title",".layui-layer-main",".layui-layer-dialog","layui-layer-iframe","layui-layer-content","layui-layer-btn","layui-layer-close"];l.anim=["layer-anim-00","layer-anim-01","layer-anim-02","layer-anim-03","layer-anim-04","layer-anim-05","layer-anim-06"],l.SHADE="layui-layer-shade",l.MOVE="layui-layer-move",s.pt.config={type:0,shade:.3,fixed:!0,move:l[1],title:"&#x4FE1;&#x606F;",offset:"auto",area:"auto",closeBtn:1,time:0,zIndex:19891014,maxWidth:360,anim:0,isOutAnim:!0,minStack:!0,icon:-1,moveType:1,resize:!0,scrollbar:!0,tips:2},s.pt.vessel=function(e,t){var n=this,a=n.index,r=n.config,s=r.zIndex+a,f="object"==typeof r.title,c=r.maxmin&&(1===r.type||2===r.type),u=r.title?'<div class="layui-layer-title" style="'+(f?r.title[1]:"")+'">'+(f?r.title[0]:r.title)+"</div>":"";return r.zIndex=s,t([r.shade?'<div class="'+l.SHADE+'" id="'+l.SHADE+a+'" times="'+a+'" style="'+("z-index:"+(s-1)+"; ")+'"></div>':"",'<div class="'+l[0]+(" layui-layer-"+o.type[r.type])+(0!=r.type&&2!=r.type||r.shade?"":" layui-layer-border")+" "+(r.skin||"")+'" id="'+l[0]+a+'" type="'+o.type[r.type]+'" times="'+a+'" showtime="'+r.time+'" conType="'+(e?"object":"string")+'" style="z-index: '+s+"; width:"+r.area[0]+";height:"+r.area[1]+";position:"+(r.fixed?"fixed;":"absolute;")+'">'+(e&&2!=r.type?"":u)+'<div id="'+(r.id||"")+'" class="layui-layer-content'+(0==r.type&&r.icon!==-1?" layui-layer-padding":"")+(3==r.type?" layui-layer-loading"+r.icon:"")+'">'+(0==r.type&&r.icon!==-1?'<i class="layui-layer-ico layui-layer-ico'+r.icon+'"></i>':"")+(1==r.type&&e?"":r.content||"")+'</div><span class="layui-layer-setwin">'+function(){var e=c?'<a class="layui-layer-min" href="javascript:;"><cite></cite></a><a class="layui-layer-ico layui-layer-max" href="javascript:;"></a>':"";return r.closeBtn&&(e+='<a class="layui-layer-ico '+l[7]+" "+l[7]+(r.title?r.closeBtn:4==r.type?"1":"2")+'" href="javascript:;"></a>'),e}()+"</span>"+(r.btn?function(){var e="";"string"==typeof r.btn&&(r.btn=[r.btn]);for(var t=0,i=r.btn.length;t<i;t++)e+='<a class="'+l[6]+t+'">'+r.btn[t]+"</a>";return'<div class="'+l[6]+" layui-layer-btn-"+(r.btnAlign||"")+'">'+e+"</div>"}():"")+(r.resize?'<span class="layui-layer-resize"></span>':"")+"</div>"],u,i('<div class="'+l.MOVE+'" id="'+l.MOVE+'"></div>')),n},s.pt.creat=function(){var e=this,t=e.config,a=e.index,s=t.content,f="object"==typeof s,c=i("body");if(!t.id||!i("#"+t.id)[0]){switch("string"==typeof t.area&&(t.area="auto"===t.area?["",""]:[t.area,""]),t.shift&&(t.anim=t.shift),6==r.ie&&(t.fixed=!1),t.type){case 0:t.btn="btn"in t?t.btn:o.btn[0],r.closeAll("dialog");break;case 2:var s=t.content=f?t.content:[t.content||"","auto"];t.content='<iframe scrolling="'+(t.content[1]||"auto")+'" allowtransparency="true" id="'+l[4]+a+'" name="'+l[4]+a+'" onload="this.className=\'\';" class="layui-layer-load" frameborder="0" src="'+t.content[0]+'"></iframe>';break;case 3:delete t.title,delete t.closeBtn,t.icon===-1&&0===t.icon,r.closeAll("loading");break;case 4:f||(t.content=[t.content,"body"]),t.follow=t.content[1],t.content=t.content[0]+'<i class="layui-layer-TipsG"></i>',delete t.title,t.tips="object"==typeof t.tips?t.tips:[t.tips,!0],t.tipsMore||r.closeAll("tips")}if(e.vessel(f,function(n,r,u){c.append(n[0]),f?function(){2==t.type||4==t.type?function(){i("body").append(n[1])}():function(){s.parents("."+l[0])[0]||(s.data("display",s.css("display")).show().addClass("layui-layer-wrap").wrap(n[1]),i("#"+l[0]+a).find("."+l[5]).before(r))}()}():c.append(n[1]),i("#"+l.MOVE)[0]||c.append(o.moveElem=u),e.layero=i("#"+l[0]+a),e.shadeo=i("#"+l.SHADE+a),t.scrollbar||l.html.css("overflow","hidden").attr("layer-full",a)}).auto(a),e.shadeo.css({"background-color":t.shade[1]||"#000",opacity:t.shade[0]||t.shade}),2==t.type&&6==r.ie&&e.layero.find("iframe").attr("src",s[0]),4==t.type?e.tips():function(){e.offset(),parseInt(o.getStyle(document.getElementById(l.MOVE),"z-index"))||function(){e.layero.css("visibility","hidden"),r.ready(function(){e.offset(),e.layero.css("visibility","visible")})}()}(),t.fixed&&n.on("resize",function(){e.offset(),(/^\d+%$/.test(t.area[0])||/^\d+%$/.test(t.area[1]))&&e.auto(a),4==t.type&&e.tips()}),t.time<=0||setTimeout(function(){r.close(e.index)},t.time),e.move().callback(),l.anim[t.anim]){var u="layer-anim "+l.anim[t.anim];e.layero.addClass(u).one("webkitAnimationEnd mozAnimationEnd MSAnimationEnd oanimationend animationend",function(){i(this).removeClass(u)})}t.isOutAnim&&e.layero.data("isOutAnim",!0)}},s.pt.auto=function(e){var t=this,a=t.config,o=i("#"+l[0]+e);""===a.area[0]&&a.maxWidth>0&&(r.ie&&r.ie<8&&a.btn&&o.width(o.innerWidth()),o.outerWidth()>a.maxWidth&&o.width(a.maxWidth));var s=[o.innerWidth(),o.innerHeight()],f=o.find(l[1]).outerHeight()||0,c=o.find("."+l[6]).outerHeight()||0,u=function(e){e=o.find(e),e.height(s[1]-f-c-2*(0|parseFloat(e.css("padding-top"))))};switch(a.type){case 2:u("iframe");break;default:""===a.area[1]?a.maxHeight>0&&o.outerHeight()>a.maxHeight?(s[1]=a.maxHeight,u("."+l[5])):a.fixed&&s[1]>=n.height()&&(s[1]=n.height(),u("."+l[5])):u("."+l[5])}return t},s.pt.offset=function(){var e=this,t=e.config,i=e.layero,a=[i.outerWidth(),i.outerHeight()],o="object"==typeof t.offset;e.offsetTop=(n.height()-a[1])/2,e.offsetLeft=(n.width()-a[0])/2,o?(e.offsetTop=t.offset[0],e.offsetLeft=t.offset[1]||e.offsetLeft):"auto"!==t.offset&&("t"===t.offset?e.offsetTop=0:"r"===t.offset?e.offsetLeft=n.width()-a[0]:"b"===t.offset?e.offsetTop=n.height()-a[1]:"l"===t.offset?e.offsetLeft=0:"lt"===t.offset?(e.offsetTop=0,e.offsetLeft=0):"lb"===t.offset?(e.offsetTop=n.height()-a[1],e.offsetLeft=0):"rt"===t.offset?(e.offsetTop=0,e.offsetLeft=n.width()-a[0]):"rb"===t.offset?(e.offsetTop=n.height()-a[1],e.offsetLeft=n.width()-a[0]):e.offsetTop=t.offset),t.fixed||(e.offsetTop=/%$/.test(e.offsetTop)?n.height()*parseFloat(e.offsetTop)/100:parseFloat(e.offsetTop),e.offsetLeft=/%$/.test(e.offsetLeft)?n.width()*parseFloat(e.offsetLeft)/100:parseFloat(e.offsetLeft),e.offsetTop+=n.scrollTop(),e.offsetLeft+=n.scrollLeft()),i.attr("minLeft")&&(e.offsetTop=n.height()-(i.find(l[1]).outerHeight()||0),e.offsetLeft=i.css("left")),i.css({top:e.offsetTop,left:e.offsetLeft})},s.pt.tips=function(){var e=this,t=e.config,a=e.layero,o=[a.outerWidth(),a.outerHeight()],r=i(t.follow);r[0]||(r=i("body"));var s={width:r.outerWidth(),height:r.outerHeight(),top:r.offset().top,left:r.offset().left},f=a.find(".layui-layer-TipsG"),c=t.tips[0];t.tips[1]||f.remove(),s.autoLeft=function(){s.left+o[0]-n.width()>0?(s.tipLeft=s.left+s.width-o[0],f.css({right:12,left:"auto"})):s.tipLeft=s.left},s.where=[function(){s.autoLeft(),s.tipTop=s.top-o[1]-10,f.removeClass("layui-layer-TipsB").addClass("layui-layer-TipsT").css("border-right-color",t.tips[1])},function(){s.tipLeft=s.left+s.width+10,s.tipTop=s.top,f.removeClass("layui-layer-TipsL").addClass("layui-layer-TipsR").css("border-bottom-color",t.tips[1])},function(){s.autoLeft(),s.tipTop=s.top+s.height+10,f.removeClass("layui-layer-TipsT").addClass("layui-layer-TipsB").css("border-right-color",t.tips[1])},function(){s.tipLeft=s.left-o[0]-10,s.tipTop=s.top,f.removeClass("layui-layer-TipsR").addClass("layui-layer-TipsL").css("border-bottom-color",t.tips[1])}],s.where[c-1](),1===c?s.top-(n.scrollTop()+o[1]+16)<0&&s.where[2]():2===c?n.width()-(s.left+s.width+o[0]+16)>0||s.where[3]():3===c?s.top-n.scrollTop()+s.height+o[1]+16-n.height()>0&&s.where[0]():4===c&&o[0]+16-s.left>0&&s.where[1](),a.find("."+l[5]).css({"background-color":t.tips[1],"padding-right":t.closeBtn?"30px":""}),a.css({left:s.tipLeft-(t.fixed?n.scrollLeft():0),top:s.tipTop-(t.fixed?n.scrollTop():0)})},s.pt.move=function(){var e=this,t=e.config,a=i(document),s=e.layero,l=s.find(t.move),f=s.find(".layui-layer-resize"),c={};return t.move&&l.css("cursor","move"),l.on("mousedown",function(e){e.preventDefault(),t.move&&(c.moveStart=!0,c.offset=[e.clientX-parseFloat(s.css("left")),e.clientY-parseFloat(s.css("top"))],o.moveElem.css("cursor","move").show())}),f.on("mousedown",function(e){e.preventDefault(),c.resizeStart=!0,c.offset=[e.clientX,e.clientY],c.area=[s.outerWidth(),s.outerHeight()],o.moveElem.css("cursor","se-resize").show()}),a.on("mousemove",function(i){if(c.moveStart){var a=i.clientX-c.offset[0],o=i.clientY-c.offset[1],l="fixed"===s.css("position");if(i.preventDefault(),c.stX=l?0:n.scrollLeft(),c.stY=l?0:n.scrollTop(),!t.moveOut){var f=n.width()-s.outerWidth()+c.stX,u=n.height()-s.outerHeight()+c.stY;a<c.stX&&(a=c.stX),a>f&&(a=f),o<c.stY&&(o=c.stY),o>u&&(o=u)}s.css({left:a,top:o})}if(t.resize&&c.resizeStart){var a=i.clientX-c.offset[0],o=i.clientY-c.offset[1];i.preventDefault(),r.style(e.index,{width:c.area[0]+a,height:c.area[1]+o}),c.isResize=!0,t.resizing&&t.resizing(s)}}).on("mouseup",function(e){c.moveStart&&(delete c.moveStart,o.moveElem.hide(),t.moveEnd&&t.moveEnd(s)),c.resizeStart&&(delete c.resizeStart,o.moveElem.hide())}),e},s.pt.callback=function(){function e(){var e=a.cancel&&a.cancel(t.index,n);e===!1||r.close(t.index)}var t=this,n=t.layero,a=t.config;t.openLayer(),a.success&&(2==a.type?n.find("iframe").on("load",function(){a.success(n,t.index)}):a.success(n,t.index)),6==r.ie&&t.IE6(n),n.find("."+l[6]).children("a").on("click",function(){var e=i(this).index();if(0===e)a.yes?a.yes(t.index,n):a.btn1?a.btn1(t.index,n):r.close(t.index);else{var o=a["btn"+(e+1)]&&a["btn"+(e+1)](t.index,n);o===!1||r.close(t.index)}}),n.find("."+l[7]).on("click",e),a.shadeClose&&t.shadeo.on("click",function(){r.close(t.index)}),n.find(".layui-layer-min").on("click",function(){var e=a.min&&a.min(n,t.index);e===!1||r.min(t.index,a)}),n.find(".layui-layer-max").on("click",function(){i(this).hasClass("layui-layer-maxmin")?(r.restore(t.index),a.restore&&a.restore(n,t.index)):(r.full(t.index,a),setTimeout(function(){a.full&&a.full(n,t.index)},100))}),a.end&&(o.end[t.index]=a.end)},o.reselect=function(){i.each(i("select"),function(e,t){var n=i(this);n.parents("."+l[0])[0]||1==n.attr("layer")&&i("."+l[0]).length<1&&n.removeAttr("layer").show(),n=null})},s.pt.IE6=function(e){i("select").each(function(e,t){var n=i(this);n.parents("."+l[0])[0]||"none"===n.css("display")||n.attr({layer:"1"}).hide(),n=null})},s.pt.openLayer=function(){var e=this;r.zIndex=e.config.zIndex,r.setTop=function(e){var t=function(){r.zIndex++,e.css("z-index",r.zIndex+1)};return r.zIndex=parseInt(e[0].style.zIndex),e.on("mousedown",t),r.zIndex}},o.record=function(e){var t=[e.width(),e.height(),e.position().top,e.position().left+parseFloat(e.css("margin-left"))];e.find(".layui-layer-max").addClass("layui-layer-maxmin"),e.attr({area:t})},o.rescollbar=function(e){l.html.attr("layer-full")==e&&(l.html[0].style.removeProperty?l.html[0].style.removeProperty("overflow"):l.html[0].style.removeAttribute("overflow"),l.html.removeAttr("layer-full"))},e.layer=r,r.getChildFrame=function(e,t){return t=t||i("."+l[4]).attr("times"),i("#"+l[0]+t).find("iframe").contents().find(e)},r.getFrameIndex=function(e){return i("#"+e).parents("."+l[4]).attr("times")},r.iframeAuto=function(e){if(e){var t=r.getChildFrame("html",e).outerHeight(),n=i("#"+l[0]+e),a=n.find(l[1]).outerHeight()||0,o=n.find("."+l[6]).outerHeight()||0;n.css({height:t+a+o}),n.find("iframe").css({height:t})}},r.iframeSrc=function(e,t){i("#"+l[0]+e).find("iframe").attr("src",t)},r.style=function(e,t,n){var a=i("#"+l[0]+e),r=a.find(".layui-layer-content"),s=a.attr("type"),f=a.find(l[1]).outerHeight()||0,c=a.find("."+l[6]).outerHeight()||0;a.attr("minLeft");s!==o.type[3]&&s!==o.type[4]&&(n||(parseFloat(t.width)<=260&&(t.width=260),parseFloat(t.height)-f-c<=64&&(t.height=64+f+c)),a.css(t),c=a.find("."+l[6]).outerHeight(),s===o.type[2]?a.find("iframe").css({height:parseFloat(t.height)-f-c}):r.css({height:parseFloat(t.height)-f-c-parseFloat(r.css("padding-top"))-parseFloat(r.css("padding-bottom"))}))},r.min=function(e,t){t=t||{};var a=i("#"+l[0]+e),s=i("#"+l.SHADE+e),f=a.find(l[1]).outerHeight()||0,c=a.attr("minLeft")||181*o.minIndex+"px",u=a.css("position"),d={width:180,height:f,position:"fixed",overflow:"hidden"};o.record(a),o.minLeft[0]&&(c=o.minLeft[0],o.minLeft.shift()),t.minStack&&(d.left=c,d.top=n.height()-f,a.attr("minLeft")||o.minIndex++,a.attr("minLeft",c)),a.attr("position",u),r.style(e,d,!0),a.find(".layui-layer-min").hide(),"page"===a.attr("type")&&a.find(l[4]).hide(),o.rescollbar(e),s.hide()},r.restore=function(e){var t=i("#"+l[0]+e),n=i("#"+l.SHADE+e),a=t.attr("area").split(",");t.attr("type");r.style(e,{width:parseFloat(a[0]),height:parseFloat(a[1]),top:parseFloat(a[2]),left:parseFloat(a[3]),position:t.attr("position"),overflow:"visible"},!0),t.find(".layui-layer-max").removeClass("layui-layer-maxmin"),t.find(".layui-layer-min").show(),"page"===t.attr("type")&&t.find(l[4]).show(),o.rescollbar(e),n.show()},r.full=function(e){var t,a=i("#"+l[0]+e);o.record(a),l.html.attr("layer-full")||l.html.css("overflow","hidden").attr("layer-full",e),clearTimeout(t),t=setTimeout(function(){var t="fixed"===a.css("position");r.style(e,{top:t?0:n.scrollTop(),left:t?0:n.scrollLeft(),width:n.width(),height:n.height()},!0),a.find(".layui-layer-min").hide()},100)},r.title=function(e,t){var n=i("#"+l[0]+(t||r.index)).find(l[1]);n.html(e)},r.close=function(e,t){var n=i("#"+l[0]+e),a=n.attr("type"),s="layer-anim-close";if(n[0]){var f="layui-layer-wrap",c=function(){if(a===o.type[1]&&"object"===n.attr("conType")){n.children(":not(."+l[5]+")").remove();for(var r=n.find("."+f),s=0;s<2;s++)r.unwrap();r.css("display",r.data("display")).removeClass(f)}else{if(a===o.type[2])try{var c=i("#"+l[4]+e)[0];c.contentWindow.document.write(""),c.contentWindow.close(),n.find("."+l[5])[0].removeChild(c)}catch(u){}n[0].innerHTML="",n.remove()}"function"==typeof o.end[e]&&o.end[e](),delete o.end[e],"function"==typeof t&&t()};n.data("isOutAnim")&&n.addClass("layer-anim "+s),i("#layui-layer-moves, #"+l.SHADE+e).remove(),6==r.ie&&o.reselect(),o.rescollbar(e),n.attr("minLeft")&&(o.minIndex--,o.minLeft.push(n.attr("minLeft"))),r.ie&&r.ie<10||!n.data("isOutAnim")?c():setTimeout(function(){c()},200)}},r.closeAll=function(e,t){"function"==typeof e&&(t=e,e=null);var n=i("."+l[0]);i.each(n,function(a){var o=i(this),s=e?o.attr("type")===e:1;s&&r.close(o.attr("times"),a===n.length-1?t:null),s=null}),0===n.length&&"function"==typeof t&&t()};var f=r.cache||{},c=function(e){return f.skin?" "+f.skin+" "+f.skin+"-"+e:""};r.prompt=function(e,t){var a="";if(e=e||{},"function"==typeof e&&(t=e),e.area){var o=e.area;a='style="width: '+o[0]+"; height: "+o[1]+';"',delete e.area}var s,l=2==e.formType?'<textarea class="layui-layer-input"'+a+"></textarea>":function(){return'<input type="'+(1==e.formType?"password":"text")+'" class="layui-layer-input">'}(),f=e.success;return delete e.success,r.open(i.extend({type:1,btn:["&#x786E;&#x5B9A;","&#x53D6;&#x6D88;"],content:l,skin:"layui-layer-prompt"+c("prompt"),maxWidth:n.width(),success:function(t){s=t.find(".layui-layer-input"),s.val(e.value||"").focus(),"function"==typeof f&&f(t)},resize:!1,yes:function(i){var n=s.val();""===n?s.focus():n.length>(e.maxlength||500)?r.tips("&#x6700;&#x591A;&#x8F93;&#x5165;"+(e.maxlength||500)+"&#x4E2A;&#x5B57;&#x6570;",s,{tips:1}):t&&t(n,i,s)}},e))},r.tab=function(e){e=e||{};var t=e.tab||{},n="layui-this",a=e.success;return delete e.success,r.open(i.extend({type:1,skin:"layui-layer-tab"+c("tab"),resize:!1,title:function(){var e=t.length,i=1,a="";if(e>0)for(a='<span class="'+n+'">'+t[0].title+"</span>";i<e;i++)a+="<span>"+t[i].title+"</span>";return a}(),content:'<ul class="layui-layer-tabmain">'+function(){var e=t.length,i=1,a="";if(e>0)for(a='<li class="layui-layer-tabli '+n+'">'+(t[0].content||"no content")+"</li>";i<e;i++)a+='<li class="layui-layer-tabli">'+(t[i].content||"no  content")+"</li>";return a}()+"</ul>",success:function(t){var o=t.find(".layui-layer-title").children(),r=t.find(".layui-layer-tabmain").children();o.on("mousedown",function(t){t.stopPropagation?t.stopPropagation():t.cancelBubble=!0;var a=i(this),o=a.index();a.addClass(n).siblings().removeClass(n),r.eq(o).show().siblings().hide(),"function"==typeof e.change&&e.change(o)}),"function"==typeof a&&a(t)}},e))},r.photos=function(t,n,a){function o(e,t,i){var n=new Image;return n.src=e,n.complete?t(n):(n.onload=function(){n.onload=null,t(n)},void(n.onerror=function(e){n.onerror=null,i(e)}))}var s={};if(t=t||{},t.photos){var l=!("string"==typeof t.photos||t.photos instanceof i),f=l?t.photos:{},u=f.data||[],d=f.start||0;s.imgIndex=(0|d)+1,t.img=t.img||"img";var y=t.success;if(delete t.success,l){if(0===u.length)return r.msg("&#x6CA1;&#x6709;&#x56FE;&#x7247;")}else{var p=i(t.photos),h=function(){u=[],p.find(t.img).each(function(e){var t=i(this);t.attr("layer-index",e),u.push({alt:t.attr("alt"),pid:t.attr("layer-pid"),src:t.attr("layer-src")||t.attr("src"),thumb:t.attr("src")})})};if(h(),0===u.length)return;if(n||p.on("click",t.img,function(){h();var e=i(this),n=e.attr("layer-index");r.photos(i.extend(t,{photos:{start:n,data:u,tab:t.tab},full:t.full}),!0)}),!n)return}s.imgprev=function(e){s.imgIndex--,s.imgIndex<1&&(s.imgIndex=u.length),s.tabimg(e)},s.imgnext=function(e,t){s.imgIndex++,s.imgIndex>u.length&&(s.imgIndex=1,t)||s.tabimg(e)},s.keyup=function(e){if(!s.end){var t=e.keyCode;e.preventDefault(),37===t?s.imgprev(!0):39===t?s.imgnext(!0):27===t&&r.close(s.index)}},s.tabimg=function(e){if(!(u.length<=1))return f.start=s.imgIndex-1,r.close(s.index),r.photos(t,!0,e)},s.event=function(){s.bigimg.find(".layui-layer-imgprev").on("click",function(e){e.preventDefault(),s.imgprev(!0)}),s.bigimg.find(".layui-layer-imgnext").on("click",function(e){e.preventDefault(),s.imgnext(!0)}),i(document).on("keyup",s.keyup)},s.loadi=r.load(1,{shade:!("shade"in t)&&.9,scrollbar:!1}),o(u[d].src,function(n){r.close(s.loadi),a&&(t.anim=-1),s.index=r.open(i.extend({type:1,id:"layui-layer-photos",area:function(){var a=[n.width,n.height],o=[i(e).width()-100,i(e).height()-100];if(!t.full&&(a[0]>o[0]||a[1]>o[1])){var r=[a[0]/o[0],a[1]/o[1]];r[0]>r[1]?(a[0]=a[0]/r[0],a[1]=a[1]/r[0]):r[0]<r[1]&&(a[0]=a[0]/r[1],a[1]=a[1]/r[1])}return[a[0]+"px",a[1]+"px"]}(),title:!1,shade:.9,shadeClose:!0,closeBtn:!1,move:".layui-layer-phimg img",moveType:1,scrollbar:!1,moveOut:!0,anim:5,isOutAnim:!1,skin:"layui-layer-photos"+c("photos"),content:'<div class="layui-layer-phimg"><img src="'+u[d].src+'" alt="'+(u[d].alt||"")+'" layer-pid="'+u[d].pid+'">'+function(){return u.length>1?'<div class="layui-layer-imgsee"><span class="layui-layer-imguide"><a href="javascript:;" class="layui-layer-iconext layui-layer-imgprev"></a><a href="javascript:;" class="layui-layer-iconext layui-layer-imgnext"></a></span><div class="layui-layer-imgbar" style="display:'+(a?"block":"")+'"><span class="layui-layer-imgtit"><a href="javascript:;">'+(u[d].alt||"")+"</a><em>"+s.imgIndex+" / "+u.length+"</em></span></div></div>":""}()+"</div>",success:function(e,i){s.bigimg=e.find(".layui-layer-phimg"),s.imgsee=e.find(".layui-layer-imgbar"),s.event(e),t.tab&&t.tab(u[d],e),"function"==typeof y&&y(e)},end:function(){s.end=!0,i(document).off("keyup",s.keyup)}},t))},function(){r.close(s.loadi),r.msg("&#x5F53;&#x524D;&#x56FE;&#x7247;&#x5730;&#x5740;&#x5F02;&#x5E38;<br>&#x662F;&#x5426;&#x7EE7;&#x7EED;&#x67E5;&#x770B;&#x4E0B;&#x4E00;&#x5F20;&#xFF1F;",{time:3e4,btn:["&#x4E0B;&#x4E00;&#x5F20;","&#x4E0D;&#x770B;&#x4E86;"],yes:function(){u.length>1&&s.imgnext(!0,!0)}})})}},o.run=function(t){i=t,n=i(e),l.html=i("html"),r.open=function(e){var t=new s(e);return t.index}},e.layui&&layui.define?(r.ready(),layui.define("jquery",function(t){r.path=layui.cache.dir,o.run(layui.$),e.layer=r,t("layer",r)})):"function"==typeof define&&define.amd?define(["jquery"],function(){return o.run(e.jQuery),r}):function(){r.ready(),o.run(e.jQuery)}()}(window);layui.define("jquery",function(e){"use strict";var t=layui.$,i=layui.hint(),n={fixbar:function(e){var i,n,r="layui-fixbar",a="layui-fixbar-top",o=t(document),l=t("body");e=t.extend({showHeight:200},e),e.bar1=e.bar1===!0?"&#xe606;":e.bar1,e.bar2=e.bar2===!0?"&#xe607;":e.bar2,e.bgcolor=e.bgcolor?"background-color:"+e.bgcolor:"";var c=[e.bar1,e.bar2,"&#xe604;"],g=t(['<ul class="'+r+'">',e.bar1?'<li class="layui-icon" lay-type="bar1" style="'+e.bgcolor+'">'+c[0]+"</li>":"",e.bar2?'<li class="layui-icon" lay-type="bar2" style="'+e.bgcolor+'">'+c[1]+"</li>":"",'<li class="layui-icon '+a+'" lay-type="top" style="'+e.bgcolor+'">'+c[2]+"</li>","</ul>"].join("")),u=g.find("."+a),s=function(){var t=o.scrollTop();t>=e.showHeight?i||(u.show(),i=1):i&&(u.hide(),i=0)};t("."+r)[0]||("object"==typeof e.css&&g.css(e.css),l.append(g),s(),g.find("li").on("click",function(){var i=t(this),n=i.attr("lay-type");"top"===n&&t("html,body").animate({scrollTop:0},200),e.click&&e.click.call(this,n)}),o.on("scroll",function(){clearTimeout(n),n=setTimeout(function(){s()},100)}))},countdown:function(e,t,i){var n=this,r="function"==typeof t,a=new Date(e).getTime(),o=new Date(!t||r?(new Date).getTime():t).getTime(),l=a-o,c=[Math.floor(l/864e5),Math.floor(l/36e5)%24,Math.floor(l/6e4)%60,Math.floor(l/1e3)%60];r&&(i=t);var g=setTimeout(function(){n.countdown(e,o+1e3,i)},1e3);return i&&i(l>0?c:[0,0,0,0],t,g),l<=0&&clearTimeout(g),g},timeAgo:function(e,t){var i=this,n=[[],[]],r=(new Date).getTime()-new Date(e).getTime();return r>26784e5?(r=new Date(e),n[0][0]=i.digit(r.getFullYear(),4),n[0][1]=i.digit(r.getMonth()+1),n[0][2]=i.digit(r.getDate()),t||(n[1][0]=i.digit(r.getHours()),n[1][1]=i.digit(r.getMinutes()),n[1][2]=i.digit(r.getSeconds())),n[0].join("-")+" "+n[1].join(":")):r>=864e5?(r/1e3/60/60/24|0)+"\u5929\u524d":r>=36e5?(r/1e3/60/60|0)+"\u5c0f\u65f6\u524d":r>=18e4?(r/1e3/60|0)+"\u5206\u949f\u524d":r<0?"\u672a\u6765":"\u521a\u521a"},digit:function(e,t){var i="";e=String(e),t=t||2;for(var n=e.length;n<t;n++)i+="0";return e<Math.pow(10,t)?i+(0|e):e},toDateString:function(e,t){if(null===e||""===e)return"";var n=this,r=new Date(function(){if(e)return isNaN(e)?e:"string"==typeof e?parseInt(e):e}()||new Date),a=[n.digit(r.getFullYear(),4),n.digit(r.getMonth()+1),n.digit(r.getDate())],o=[n.digit(r.getHours()),n.digit(r.getMinutes()),n.digit(r.getSeconds())];return r.getDate()?(t=t||"yyyy-MM-dd HH:mm:ss",t.replace(/yyyy/g,a[0]).replace(/MM/g,a[1]).replace(/dd/g,a[2]).replace(/HH/g,o[0]).replace(/mm/g,o[1]).replace(/ss/g,o[2])):(i.error('Invalid Msec for "util.toDateString(Msec)"'),"")},escape:function(e){return String(e||"").replace(/&(?!#?[a-zA-Z0-9]+;)/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/'/g,"&#39;").replace(/"/g,"&quot;")},unescape:function(e){return String(e||"").replace(/\&amp;/g,"&").replace(/\&lt;/g,"<").replace(/\&gt;/g,">").replace(/\&#39;/,"'").replace(/\&quot;/,'"')},toVisibleArea:function(e){if(e=t.extend({margin:160,duration:200,type:"y"},e),e.scrollElem[0]&&e.thisElem[0]){var i=e.scrollElem,n=e.thisElem,r="y"===e.type,a=r?"scrollTop":"scrollLeft",o=r?"top":"left",l=i[a](),c=i[r?"height":"width"](),g=i.offset()[o],u=n.offset()[o]-g,s={};(u>c-e.margin||u<e.margin)&&(s[a]=u-c/2+l,i.animate(s,e.duration))}},event:function(e,i,r){var a=t("body");return r=r||"click",i=n.event[e]=t.extend(!0,n.event[e],i)||{},n.event.UTIL_EVENT_CALLBACK=n.event.UTIL_EVENT_CALLBACK||{},a.off(r,"*["+e+"]",n.event.UTIL_EVENT_CALLBACK[e]),n.event.UTIL_EVENT_CALLBACK[e]=function(){var n=t(this),r=n.attr(e);"function"==typeof i[r]&&i[r].call(this,n)},a.on(r,"*["+e+"]",n.event.UTIL_EVENT_CALLBACK[e]),i}};e("util",n)});layui.define("jquery",function(t){"use strict";var i=layui.$,a=(layui.hint(),layui.device()),e="element",l="layui-this",n="layui-show",s=function(){this.config={}};s.prototype.set=function(t){var a=this;return i.extend(!0,a.config,t),a},s.prototype.on=function(t,i){return layui.onevent.call(this,e,t,i)},s.prototype.tabAdd=function(t,a){var e=".layui-tab-title",l=i(".layui-tab[lay-filter="+t+"]"),n=l.children(e),s=n.children(".layui-tab-bar"),o=l.children(".layui-tab-content"),r="<li"+function(){var t=[];return layui.each(a,function(i,a){/^(title|content)$/.test(i)||t.push("lay-"+i+'="'+a+'"')}),t.length>0&&t.unshift(""),t.join(" ")}()+">"+(a.title||"unnaming")+"</li>";return s[0]?s.before(r):n.append(r),o.append('<div class="layui-tab-item">'+(a.content||"")+"</div>"),b.hideTabMore(!0),b.tabAuto(),this},s.prototype.tabDelete=function(t,a){var e=".layui-tab-title",l=i(".layui-tab[lay-filter="+t+"]"),n=l.children(e),s=n.find('>li[lay-id="'+a+'"]');return b.tabDelete(null,s),this},s.prototype.tabChange=function(t,a){var e=".layui-tab-title",l=i(".layui-tab[lay-filter="+t+"]"),n=l.children(e),s=n.find('>li[lay-id="'+a+'"]');return b.tabClick.call(s[0],null,null,s),this},s.prototype.tab=function(t){t=t||{},m.on("click",t.headerElem,function(a){var e=i(this).index();b.tabClick.call(this,a,e,null,t)})},s.prototype.progress=function(t,a){var e="layui-progress",l=i("."+e+"[lay-filter="+t+"]"),n=l.find("."+e+"-bar"),s=n.find("."+e+"-text");return n.css("width",a).attr("lay-percent",a),s.text(a),this};var o=".layui-nav",r="layui-nav-item",c="layui-nav-bar",u="layui-nav-tree",y="layui-nav-child",d="layui-nav-child-c",f="layui-nav-more",h="layui-icon-down",p="layui-anim layui-anim-upbit",b={tabClick:function(t,a,s,o){o=o||{};var r=s||i(this),a=a||r.parent().children("li").index(r),c=o.headerElem?r.parent():r.parents(".layui-tab").eq(0),u=o.bodyElem?i(o.bodyElem):c.children(".layui-tab-content").children(".layui-tab-item"),y=r.find("a"),d="javascript:;"!==y.attr("href")&&"_blank"===y.attr("target"),f="string"==typeof r.attr("lay-unselect"),h=c.attr("lay-filter");d||f||(r.addClass(l).siblings().removeClass(l),u.eq(a).addClass(n).siblings().removeClass(n)),layui.event.call(this,e,"tab("+h+")",{elem:c,index:a})},tabDelete:function(t,a){var n=a||i(this).parent(),s=n.index(),o=n.parents(".layui-tab").eq(0),r=o.children(".layui-tab-content").children(".layui-tab-item"),c=o.attr("lay-filter");n.hasClass(l)&&(n.next()[0]?b.tabClick.call(n.next()[0],null,s+1):n.prev()[0]&&b.tabClick.call(n.prev()[0],null,s-1)),n.remove(),r.eq(s).remove(),setTimeout(function(){b.tabAuto()},50),layui.event.call(this,e,"tabDelete("+c+")",{elem:o,index:s})},tabAuto:function(){var t="layui-tab-more",e="layui-tab-bar",l="layui-tab-close",n=this;i(".layui-tab").each(function(){var s=i(this),o=s.children(".layui-tab-title"),r=(s.children(".layui-tab-content").children(".layui-tab-item"),'lay-stope="tabmore"'),c=i('<span class="layui-unselect layui-tab-bar" '+r+"><i "+r+' class="layui-icon">&#xe61a;</i></span>');if(n===window&&8!=a.ie&&b.hideTabMore(!0),s.attr("lay-allowClose")&&o.find("li").each(function(){var t=i(this);if(!t.find("."+l)[0]){var a=i('<i class="layui-icon layui-icon-close layui-unselect '+l+'"></i>');a.on("click",b.tabDelete),t.append(a)}}),"string"!=typeof s.attr("lay-unauto"))if(o.prop("scrollWidth")>o.outerWidth()+1){if(o.find("."+e)[0])return;o.append(c),s.attr("overflow",""),c.on("click",function(i){o[this.title?"removeClass":"addClass"](t),this.title=this.title?"":"\u6536\u7f29"})}else o.find("."+e).remove(),s.removeAttr("overflow")})},hideTabMore:function(t){var a=i(".layui-tab-title");t!==!0&&"tabmore"===i(t.target).attr("lay-stope")||(a.removeClass("layui-tab-more"),a.find(".layui-tab-bar").attr("title",""))},clickThis:function(){var t=i(this),a=t.parents(o),n=a.attr("lay-filter"),s=t.parent(),c=t.siblings("."+y),d="string"==typeof s.attr("lay-unselect");"javascript:;"!==t.attr("href")&&"_blank"===t.attr("target")||d||c[0]||(a.find("."+l).removeClass(l),s.addClass(l)),a.hasClass(u)&&(c.removeClass(p),c[0]&&(s["none"===c.css("display")?"addClass":"removeClass"](r+"ed"),"all"===a.attr("lay-shrink")&&s.siblings().removeClass(r+"ed"))),layui.event.call(this,e,"nav("+n+")",t)},collapse:function(){var t=i(this),a=t.find(".layui-colla-icon"),l=t.siblings(".layui-colla-content"),s=t.parents(".layui-collapse").eq(0),o=s.attr("lay-filter"),r="none"===l.css("display");if("string"==typeof s.attr("lay-accordion")){var c=s.children(".layui-colla-item").children("."+n);c.siblings(".layui-colla-title").children(".layui-colla-icon").html("&#xe602;"),c.removeClass(n)}l[r?"addClass":"removeClass"](n),a.html(r?"&#xe61a;":"&#xe602;"),layui.event.call(this,e,"collapse("+o+")",{title:t,content:l,show:r})}};s.prototype.init=function(t,e){var l=function(){return e?'[lay-filter="'+e+'"]':""}(),s={tab:function(){b.tabAuto.call({})},nav:function(){var t=200,e={},s={},v={},m="layui-nav-title",C=function(l,o,r){var c=i(this),h=c.find("."+y);if(o.hasClass(u)){if(!h[0]){var b=c.children("."+m);l.css({top:c.offset().top-o.offset().top,height:(b[0]?b:c).outerHeight(),opacity:1})}}else h.addClass(p),h.hasClass(d)&&h.css({left:-(h.outerWidth()-c.width())/2}),h[0]?l.css({left:l.position().left+l.width()/2,width:0,opacity:0}):l.css({left:c.position().left+parseFloat(c.css("marginLeft")),top:c.position().top+c.height()-l.height()}),e[r]=setTimeout(function(){l.css({width:h[0]?0:c.width(),opacity:h[0]?0:1})},a.ie&&a.ie<10?0:t),clearTimeout(v[r]),"block"===h.css("display")&&clearTimeout(s[r]),s[r]=setTimeout(function(){h.addClass(n),c.find("."+f).addClass(f+"d")},300)};i(o+l).each(function(a){var l=i(this),o=i('<span class="'+c+'"></span>'),d=l.find("."+r);l.find("."+c)[0]||(l.append(o),(l.hasClass(u)?d.find("dd,>."+m):d).on("mouseenter",function(){C.call(this,o,l,a)}).on("mouseleave",function(){l.hasClass(u)?o.css({height:0,opacity:0}):(clearTimeout(s[a]),s[a]=setTimeout(function(){l.find("."+y).removeClass(n),l.find("."+f).removeClass(f+"d")},300))}),l.on("mouseleave",function(){clearTimeout(e[a]),v[a]=setTimeout(function(){l.hasClass(u)||o.css({width:0,left:o.position().left+o.width()/2,opacity:0})},t)})),d.find("a").each(function(){var t=i(this),a=(t.parent(),t.siblings("."+y));a[0]&&!t.children("."+f)[0]&&t.append('<i class="layui-icon '+h+" "+f+'"></i>'),t.off("click",b.clickThis).on("click",b.clickThis)})})},breadcrumb:function(){var t=".layui-breadcrumb";i(t+l).each(function(){var t=i(this),a="lay-separator",e=t.attr(a)||"/",l=t.find("a");l.next("span["+a+"]")[0]||(l.each(function(t){t!==l.length-1&&i(this).after("<span "+a+">"+e+"</span>")}),t.css("visibility","visible"))})},progress:function(){var t="layui-progress";i("."+t+l).each(function(){var a=i(this),e=a.find(".layui-progress-bar"),l=e.attr("lay-percent");e.css("width",function(){return/^.+\/.+$/.test(l)?100*new Function("return "+l)()+"%":l}()),a.attr("lay-showPercent")&&setTimeout(function(){e.html('<span class="'+t+'-text">'+l+"</span>")},350)})},collapse:function(){var t="layui-collapse";i("."+t+l).each(function(){var t=i(this).find(".layui-colla-item");t.each(function(){var t=i(this),a=t.find(".layui-colla-title"),e=t.find(".layui-colla-content"),l="none"===e.css("display");a.find(".layui-colla-icon").remove(),a.append('<i class="layui-icon layui-colla-icon">'+(l?"&#xe602;":"&#xe61a;")+"</i>"),a.off("click",b.collapse).on("click",b.collapse)})})}};return s[t]?s[t]():layui.each(s,function(t,i){i()})},s.prototype.render=s.prototype.init;var v=new s,m=i(document);i(function(){v.render()});var C=".layui-tab-title li";m.on("click",C,b.tabClick),m.on("click",b.hideTabMore),i(window).on("resize",b.tabAuto),t(e,v)});layui.define("layer",function(e){"use strict";var t=layui.$,i=layui.layer,n=layui.hint(),o=layui.device(),a={config:{},set:function(e){var i=this;return i.config=t.extend({},i.config,e),i},on:function(e,t){return layui.onevent.call(this,r,e,t)}},l=function(){var e=this;return{upload:function(t){e.upload.call(e,t)},reload:function(t){e.reload.call(e,t)},config:e.config}},r="upload",u="layui-upload-file",c="layui-upload-form",f="layui-upload-iframe",s="layui-upload-choose",p=function(e){var i=this;i.config=t.extend({},i.config,a.config,e),i.render()};p.prototype.config={accept:"images",exts:"",auto:!0,bindAction:"",url:"",field:"file",acceptMime:"",method:"post",data:{},drag:!0,size:0,number:0,multiple:!1},p.prototype.render=function(e){var i=this,e=i.config;e.elem=t(e.elem),e.bindAction=t(e.bindAction),i.file(),i.events()},p.prototype.file=function(){var e=this,i=e.config,n=e.elemFile=t(['<input class="'+u+'" type="file" accept="'+i.acceptMime+'" name="'+i.field+'"',i.multiple?" multiple":"",">"].join("")),a=i.elem.next();(a.hasClass(u)||a.hasClass(c))&&a.remove(),o.ie&&o.ie<10&&i.elem.wrap('<div class="layui-upload-wrap"></div>'),e.isFile()?(e.elemFile=i.elem,i.field=i.elem[0].name):i.elem.after(n),o.ie&&o.ie<10&&e.initIE()},p.prototype.initIE=function(){var e=this,i=e.config,n=t('<iframe id="'+f+'" class="'+f+'" name="'+f+'" frameborder="0"></iframe>'),o=t(['<form target="'+f+'" class="'+c+'" method="post" key="set-mine" enctype="multipart/form-data" action="'+i.url+'">',"</form>"].join(""));t("#"+f)[0]||t("body").append(n),i.elem.next().hasClass(c)||(e.elemFile.wrap(o),i.elem.next("."+c).append(function(){var e=[];return layui.each(i.data,function(t,i){i="function"==typeof i?i():i,e.push('<input type="hidden" name="'+t+'" value="'+i+'">')}),e.join("")}()))},p.prototype.msg=function(e){return i.msg(e,{icon:2,shift:6})},p.prototype.isFile=function(){var e=this.config.elem[0];if(e)return"input"===e.tagName.toLocaleLowerCase()&&"file"===e.type},p.prototype.preview=function(e){var t=this;window.FileReader&&layui.each(t.chooseFiles,function(t,i){var n=new FileReader;n.readAsDataURL(i),n.onload=function(){e&&e(t,i,this.result)}})},p.prototype.upload=function(e,i){var n,a=this,l=a.config,r=a.elemFile[0],u=function(){var i=0,n=0,o=e||a.files||a.chooseFiles||r.files,u=function(){l.multiple&&i+n===a.fileLength&&"function"==typeof l.allDone&&l.allDone({total:a.fileLength,successful:i,aborted:n})};layui.each(o,function(e,o){var r=new FormData;r.append(l.field,o),layui.each(l.data,function(e,t){t="function"==typeof t?t():t,r.append(e,t)});var c={url:l.url,type:"post",data:r,contentType:!1,processData:!1,dataType:"json",headers:l.headers||{},success:function(t){i++,d(e,t),u()},error:function(){n++,a.msg("\u8bf7\u6c42\u4e0a\u4f20\u63a5\u53e3\u51fa\u73b0\u5f02\u5e38"),m(e),u()}};"function"==typeof l.progress&&(c.xhr=function(){var i=t.ajaxSettings.xhr();return i.upload.addEventListener("progress",function(t){if(t.lengthComputable){var i=Math.floor(t.loaded/t.total*100);l.progress(i,l.item?l.item[0]:l.elem[0],t,e)}}),i}),t.ajax(c)})},c=function(){var e=t("#"+f);a.elemFile.parent().submit(),clearInterval(p.timer),p.timer=setInterval(function(){var t,i=e.contents().find("body");try{t=i.text()}catch(n){a.msg("\u83b7\u53d6\u4e0a\u4f20\u540e\u7684\u54cd\u5e94\u4fe1\u606f\u51fa\u73b0\u5f02\u5e38"),clearInterval(p.timer),m()}t&&(clearInterval(p.timer),i.html(""),d(0,t))},30)},d=function(e,t){if(a.elemFile.next("."+s).remove(),r.value="","object"!=typeof t)try{t=JSON.parse(t)}catch(i){return t={},a.msg("\u8bf7\u5bf9\u4e0a\u4f20\u63a5\u53e3\u8fd4\u56de\u6709\u6548JSON")}"function"==typeof l.done&&l.done(t,e||0,function(e){a.upload(e)})},m=function(e){l.auto&&(r.value=""),"function"==typeof l.error&&l.error(e||0,function(e){a.upload(e)})},h=l.exts,v=function(){var t=[];return layui.each(e||a.chooseFiles,function(e,i){t.push(i.name)}),t}(),g={preview:function(e){a.preview(e)},upload:function(e,t){var i={};i[e]=t,a.upload(i)},pushFile:function(){return a.files=a.files||{},layui.each(a.chooseFiles,function(e,t){a.files[e]=t}),a.files},resetFile:function(e,t,i){var n=new File([t],i);a.files=a.files||{},a.files[e]=n}},y=function(){if(!(("choose"===i||l.auto)&&(l.choose&&l.choose(g),"choose"===i)||l.before&&l.before(g)===!1))return o.ie?o.ie>9?u():c():void u()};if(v=0===v.length?r.value.match(/[^\/\\]+\..+/g)||[]||"":v,0!==v.length){switch(l.accept){case"file":if(h&&!RegExp("\\w\\.("+h+")$","i").test(escape(v)))return a.msg("\u9009\u62e9\u7684\u6587\u4ef6\u4e2d\u5305\u542b\u4e0d\u652f\u6301\u7684\u683c\u5f0f"),r.value="";break;case"video":if(!RegExp("\\w\\.("+(h||"avi|mp4|wma|rmvb|rm|flash|3gp|flv")+")$","i").test(escape(v)))return a.msg("\u9009\u62e9\u7684\u89c6\u9891\u4e2d\u5305\u542b\u4e0d\u652f\u6301\u7684\u683c\u5f0f"),r.value="";break;case"audio":if(!RegExp("\\w\\.("+(h||"mp3|wav|mid")+")$","i").test(escape(v)))return a.msg("\u9009\u62e9\u7684\u97f3\u9891\u4e2d\u5305\u542b\u4e0d\u652f\u6301\u7684\u683c\u5f0f"),r.value="";break;default:if(layui.each(v,function(e,t){RegExp("\\w\\.("+(h||"jpg|png|gif|bmp|jpeg$")+")","i").test(escape(t))||(n=!0)}),n)return a.msg("\u9009\u62e9\u7684\u56fe\u7247\u4e2d\u5305\u542b\u4e0d\u652f\u6301\u7684\u683c\u5f0f"),r.value=""}if(a.fileLength=function(){var t=0,i=e||a.files||a.chooseFiles||r.files;return layui.each(i,function(){t++}),t}(),l.number&&a.fileLength>l.number)return a.msg("\u540c\u65f6\u6700\u591a\u53ea\u80fd\u4e0a\u4f20\u7684\u6570\u91cf\u4e3a\uff1a"+l.number);if(l.size>0&&!(o.ie&&o.ie<10)){var F;if(layui.each(a.chooseFiles,function(e,t){if(t.size>1024*l.size){var i=l.size/1024;i=i>=1?i.toFixed(2)+"MB":l.size+"KB",r.value="",F=i}}),F)return a.msg("\u6587\u4ef6\u4e0d\u80fd\u8d85\u8fc7"+F)}y()}},p.prototype.reload=function(e){e=e||{},delete e.elem,delete e.bindAction;var i=this,e=i.config=t.extend({},i.config,a.config,e),n=e.elem.next();n.attr({name:e.name,accept:e.acceptMime,multiple:e.multiple})},p.prototype.events=function(){var e=this,i=e.config,a=function(t){e.chooseFiles={},layui.each(t,function(t,i){var n=(new Date).getTime();e.chooseFiles[n+"-"+t]=i})},l=function(t,n){var o=e.elemFile,a=(i.item?i.item:i.elem,t.length>1?t.length+"\u4e2a\u6587\u4ef6":(t[0]||{}).name||o[0].value.match(/[^\/\\]+\..+/g)||[]||"");o.next().hasClass(s)&&o.next().remove(),e.upload(null,"choose"),e.isFile()||i.choose||o.after('<span class="layui-inline '+s+'">'+a+"</span>")};i.elem.off("upload.start").on("upload.start",function(){var o=t(this),a=o.attr("lay-data");if(a)try{a=new Function("return "+a)(),e.config=t.extend({},i,a)}catch(l){n.error("Upload element property lay-data configuration item has a syntax error: "+a)}e.config.item=o,e.elemFile[0].click()}),o.ie&&o.ie<10||i.elem.off("upload.over").on("upload.over",function(){var e=t(this);e.attr("lay-over","")}).off("upload.leave").on("upload.leave",function(){var e=t(this);e.removeAttr("lay-over")}).off("upload.drop").on("upload.drop",function(n,o){var r=t(this),u=o.originalEvent.dataTransfer.files||[];r.removeAttr("lay-over"),a(u),i.auto?e.upload(u):l(u)}),e.elemFile.off("upload.change").on("upload.change",function(){var t=this.files||[];a(t),i.auto?e.upload():l(t)}),i.bindAction.off("upload.action").on("upload.action",function(){e.upload()}),i.elem.data("haveEvents")||(e.elemFile.on("change",function(){t(this).trigger("upload.change")}),i.elem.on("click",function(){e.isFile()||t(this).trigger("upload.start")}),i.drag&&i.elem.on("dragover",function(e){e.preventDefault(),t(this).trigger("upload.over")}).on("dragleave",function(e){t(this).trigger("upload.leave")}).on("drop",function(e){e.preventDefault(),t(this).trigger("upload.drop",e)}),i.bindAction.on("click",function(){t(this).trigger("upload.action")}),i.elem.data("haveEvents",!0))},a.render=function(e){var t=new p(e);return l.call(t)},e(r,a)});layui.define(["jquery","laytpl","lay"],function(e){"use strict";var i=layui.$,n=layui.laytpl,t=layui.hint(),a=layui.device(),l=a.mobile?"click":"mousedown",r="dropdown",o="layui_"+r+"_index",u={config:{},index:layui[r]?layui[r].index+1e4:0,set:function(e){var n=this;return n.config=i.extend({},n.config,e),n},on:function(e,i){return layui.onevent.call(this,r,e,i)}},d=function(){var e=this,i=e.config,n=i.id;return d.that[n]=e,{config:i,reload:function(i){e.reload.call(e,i)}}},s="layui-dropdown",m="layui-menu-item-up",c="layui-menu-item-down",p="layui-menu-body-title",y="layui-menu-item-group",f="layui-menu-item-parent",v="layui-menu-item-divider",g="layui-menu-item-checked",h="layui-menu-item-checked2",w="layui-menu-body-panel",C="layui-menu-body-panel-left",V="."+y+">."+p,k=function(e){var n=this;n.index=++u.index,n.config=i.extend({},n.config,u.config,e),n.init()};k.prototype.config={trigger:"click",content:"",className:"",style:"",show:!1,isAllowSpread:!0,isSpreadItem:!0,data:[],delay:300},k.prototype.reload=function(e){var n=this;n.config=i.extend({},n.config,e),n.init(!0)},k.prototype.init=function(e){var n=this,t=n.config,a=t.elem=i(t.elem);if(a.length>1)return layui.each(a,function(){u.render(i.extend({},t,{elem:this}))}),n;if(!e&&a[0]&&a.data(o)){var l=d.getThis(a.data(o));if(!l)return;return l.reload(t)}t.id="id"in t?t.id:n.index,t.show&&n.render(e),n.events()},k.prototype.render=function(e){var t=this,a=t.config,r=i("body"),s=function(){var e=i('<ul class="layui-menu layui-dropdown-menu"></ul>');return a.data.length>0?m(e,a.data):e.html('<li class="layui-menu-item-none">no menu</li>'),e},m=function(e,t){return layui.each(t,function(t,l){var r=l.child&&l.child.length>0,o="isSpreadItem"in l?l.isSpreadItem:a.isSpreadItem,u=l.templet?n(l.templet).render(l):a.templet?n(a.templet).render(l):l.title,d=function(){return r&&(l.type=l.type||"parent"),l.type?{group:"group",parent:"parent","-":"-"}[l.type]||"parent":""}();if("-"===d||l.title||l.id||r){var s=i(["<li"+function(){var e={group:"layui-menu-item-group"+(a.isAllowSpread?o?" layui-menu-item-down":" layui-menu-item-up":""),parent:f,"-":"layui-menu-item-divider"};return r||d?' class="'+e[d]+'"':""}()+">",function(){var e="href"in l?'<a href="'+l.href+'" target="'+(l.target||"_self")+'">'+u+"</a>":u;return r?'<div class="'+p+'">'+e+function(){return"parent"===d?'<i class="layui-icon layui-icon-right"></i>':"group"===d&&a.isAllowSpread?'<i class="layui-icon layui-icon-'+(o?"up":"down")+'"></i>':""}()+"</div>":'<div class="'+p+'">'+e+"</div>"}(),"</li>"].join(""));if(s.data("item",l),r){var c=i('<div class="layui-panel layui-menu-body-panel"></div>'),y=i("<ul></ul>");"parent"===d?(c.append(m(y,l.child)),s.append(c)):s.append(m(y,l.child))}e.append(s)}}),e},c=['<div class="layui-dropdown layui-border-box layui-panel layui-anim layui-anim-downbit">',"</div>"].join("");("contextmenu"===a.trigger||lay.isTopElem(a.elem[0]))&&(e=!0),!e&&a.elem.data(o+"_opened")||(t.elemView=i(c),t.elemView.append(a.content||s()),a.className&&t.elemView.addClass(a.className),a.style&&t.elemView.attr("style",a.style),u.thisId=a.id,t.remove(),r.append(t.elemView),a.elem.data(o+"_opened",!0),t.position(),d.prevElem=t.elemView,d.prevElem.data("prevElem",a.elem),t.elemView.find(".layui-menu").on(l,function(e){layui.stope(e)}),t.elemView.find(".layui-menu li").on("click",function(e){var n=i(this),l=n.data("item")||{},r=l.child&&l.child.length>0;r||"-"===l.type||(t.remove(),"function"==typeof a.click&&a.click(l,n))}),t.elemView.find(V).on("click",function(e){var n=i(this),t=n.parent(),l=t.data("item")||{};"group"===l.type&&a.isAllowSpread&&d.spread(t)}),"mouseenter"===a.trigger&&t.elemView.on("mouseenter",function(){clearTimeout(d.timer)}).on("mouseleave",function(){t.delayRemove()}))},k.prototype.position=function(e){var i=this,n=i.config;lay.position(n.elem[0],i.elemView[0],{position:n.position,e:i.e,clickType:"contextmenu"===n.trigger?"right":null})},k.prototype.remove=function(){var e=this,i=(e.config,d.prevElem);i&&(i.data("prevElem")&&i.data("prevElem").data(o+"_opened",!1),i.remove())},k.prototype.delayRemove=function(){var e=this,i=e.config;clearTimeout(d.timer),d.timer=setTimeout(function(){e.remove()},i.delay)},k.prototype.events=function(){var e=this,i=e.config;"hover"===i.trigger&&(i.trigger="mouseenter"),e.prevElem&&e.prevElem.off(i.trigger,e.prevElemCallback),e.prevElem=i.elem,e.prevElemCallback=function(n){clearTimeout(d.timer),e.e=n,e.render(),n.preventDefault(),"function"==typeof i.ready&&i.ready(e.elemView,i.elem,e.e.target)},i.elem.on(i.trigger,e.prevElemCallback),"mouseenter"===i.trigger&&i.elem.on("mouseleave",function(){e.delayRemove()})},d.that={},d.getThis=function(e){var i=d.that[e];return i||t.error(e?r+" instance with ID '"+e+"' not found":"ID argument required"),i},d.spread=function(e){var i=e.children("."+p).find(".layui-icon");e.hasClass(m)?(e.removeClass(m).addClass(c),i.removeClass("layui-icon-down").addClass("layui-icon-up")):(e.removeClass(c).addClass(m),i.removeClass("layui-icon-up").addClass("layui-icon-down"))},!function(){var e=i(window),n=i(document);e.on("resize",function(){if(u.thisId){var e=d.getThis(u.thisId);if(e){if(!e.elemView[0]||!i("."+s)[0])return!1;var n=e.config;"contextmenu"===n.trigger?e.remove():e.position()}}}),n.on(l,function(e){if(u.thisId){var i=d.getThis(u.thisId);if(i){var n=i.config;!lay.isTopElem(n.elem[0])&&"contextmenu"!==n.trigger&&(e.target===n.elem[0]||n.elem.find(e.target)[0]||e.target===i.elemView[0]||i.elemView&&i.elemView.find(e.target)[0])||i.remove()}}});var t=".layui-menu:not(.layui-dropdown-menu) li";n.on("click",t,function(e){var n=i(this),t=n.parents(".layui-menu").eq(0),a=n.hasClass(y)||n.hasClass(f),l=t.attr("lay-filter")||t.attr("id"),o=lay.options(this);n.hasClass(v)||a||(t.find("."+g).removeClass(g),t.find("."+h).removeClass(h),n.addClass(g),n.parents("."+f).addClass(h),layui.event.call(this,r,"click("+l+")",o))}),n.on("click",t+V,function(e){var n=i(this),t=n.parents("."+y+":eq(0)"),a=lay.options(t[0]);"isAllowSpread"in a&&!a.isAllowSpread||d.spread(t)});var a=".layui-menu ."+f;n.on("mouseenter",a,function(n){var t=i(this),a=t.find("."+w);if(a[0]){var l=a[0].getBoundingClientRect();l.right>e.width()&&(a.addClass(C),l=a[0].getBoundingClientRect(),l.left<0&&a.removeClass(C)),l.bottom>e.height()&&a.eq(0).css("margin-top",-(l.bottom-e.height()))}}).on("mouseleave",a,function(e){var n=i(this),t=n.children("."+w);t.removeClass(C),t.css("margin-top",0)})}(),u.reload=function(e,i){var n=d.getThis(e);return n?(n.reload(i),d.call(n)):this},u.render=function(e){var i=new k(e);return d.call(i)},e(r,u)});layui.define("jquery",function(e){"use strict";var i=layui.jquery,t={config:{},index:layui.slider?layui.slider.index+1e4:0,set:function(e){var t=this;return t.config=i.extend({},t.config,e),t},on:function(e,i){return layui.onevent.call(this,n,e,i)}},a=function(){var e=this,i=e.config;return{setValue:function(t,a){return i.value=t,e.slide("set",t,a||0)},config:i}},n="slider",l="layui-disabled",s="layui-slider",r="layui-slider-bar",o="layui-slider-wrap",u="layui-slider-wrap-btn",d="layui-slider-tips",v="layui-slider-input",c="layui-slider-input-txt",p="layui-slider-input-btn",m="layui-slider-hover",f=function(e){var a=this;a.index=++t.index,a.config=i.extend({},a.config,t.config,e),a.render()};f.prototype.config={type:"default",min:0,max:100,value:0,step:1,showstep:!1,tips:!0,input:!1,range:!1,height:200,disabled:!1,theme:"#009688"},f.prototype.render=function(){var e=this,t=e.config;if(t.step<1&&(t.step=1),t.max<t.min&&(t.max=t.min+t.step),t.range){t.value="object"==typeof t.value?t.value:[t.min,t.value];var a=Math.min(t.value[0],t.value[1]),n=Math.max(t.value[0],t.value[1]);t.value[0]=a>t.min?a:t.min,t.value[1]=n>t.min?n:t.min,t.value[0]=t.value[0]>t.max?t.max:t.value[0],t.value[1]=t.value[1]>t.max?t.max:t.value[1];var r=Math.floor((t.value[0]-t.min)/(t.max-t.min)*100),v=Math.floor((t.value[1]-t.min)/(t.max-t.min)*100),p=v-r+"%";r+="%",v+="%"}else{"object"==typeof t.value&&(t.value=Math.min.apply(null,t.value)),t.value<t.min&&(t.value=t.min),t.value>t.max&&(t.value=t.max);var p=Math.floor((t.value-t.min)/(t.max-t.min)*100)+"%"}var m=t.disabled?"#c2c2c2":t.theme,f='<div class="layui-slider '+("vertical"===t.type?"layui-slider-vertical":"")+'">'+(t.tips?'<div class="layui-slider-tips"></div>':"")+'<div class="layui-slider-bar" style="background:'+m+"; "+("vertical"===t.type?"height":"width")+":"+p+";"+("vertical"===t.type?"bottom":"left")+":"+(r||0)+';"></div><div class="layui-slider-wrap" style="'+("vertical"===t.type?"bottom":"left")+":"+(r||p)+';"><div class="layui-slider-wrap-btn" style="border: 2px solid '+m+';"></div></div>'+(t.range?'<div class="layui-slider-wrap" style="'+("vertical"===t.type?"bottom":"left")+":"+v+';"><div class="layui-slider-wrap-btn" style="border: 2px solid '+m+';"></div></div>':"")+"</div>",h=i(t.elem),y=h.next("."+s);if(y[0]&&y.remove(),e.elemTemp=i(f),t.range?(e.elemTemp.find("."+o).eq(0).data("value",t.value[0]),e.elemTemp.find("."+o).eq(1).data("value",t.value[1])):e.elemTemp.find("."+o).data("value",t.value),h.html(e.elemTemp),"vertical"===t.type&&e.elemTemp.height(t.height+"px"),t.showstep){for(var g=(t.max-t.min)/t.step,b="",x=1;x<g+1;x++){var T=100*x/g;T<100&&(b+='<div class="layui-slider-step" style="'+("vertical"===t.type?"bottom":"left")+":"+T+'%"></div>')}e.elemTemp.append(b)}if(t.input&&!t.range){var w=i('<div class="layui-slider-input layui-input"><div class="layui-slider-input-txt"><input type="text" class="layui-input"></div><div class="layui-slider-input-btn"><i class="layui-icon layui-icon-up"></i><i class="layui-icon layui-icon-down"></i></div></div>');h.css("position","relative"),h.append(w),h.find("."+c).children("input").val(t.value),"vertical"===t.type?w.css({left:0,top:-48}):e.elemTemp.css("margin-right",w.outerWidth()+15)}t.disabled?(e.elemTemp.addClass(l),e.elemTemp.find("."+u).addClass(l)):e.slide(),e.elemTemp.find("."+u).on("mouseover",function(){var a="vertical"===t.type?t.height:e.elemTemp[0].offsetWidth,n=e.elemTemp.find("."+o),l="vertical"===t.type?a-i(this).parent()[0].offsetTop-n.height():i(this).parent()[0].offsetLeft,s=l/a*100,r=i(this).parent().data("value"),u=t.setTips?t.setTips(r):r;e.elemTemp.find("."+d).html(u),"vertical"===t.type?e.elemTemp.find("."+d).css({bottom:s+"%","margin-bottom":"20px",display:"inline-block"}):e.elemTemp.find("."+d).css({left:s+"%",display:"inline-block"})}).on("mouseout",function(){e.elemTemp.find("."+d).css("display","none")})},f.prototype.slide=function(e,t,a){var n=this,l=n.config,s=n.elemTemp,f=function(){return"vertical"===l.type?l.height:s[0].offsetWidth},h=s.find("."+o),y=s.next("."+v),g=y.children("."+c).children("input").val(),b=100/((l.max-l.min)/Math.ceil(l.step)),x=function(e,i){e=Math.ceil(e)*b>100?Math.ceil(e)*b:Math.round(e)*b,e=e>100?100:e,h.eq(i).css("vertical"===l.type?"bottom":"left",e+"%");var t=T(h[0].offsetLeft),a=l.range?T(h[1].offsetLeft):0;"vertical"===l.type?(s.find("."+d).css({bottom:e+"%","margin-bottom":"20px"}),t=T(f()-h[0].offsetTop-h.height()),a=l.range?T(f()-h[1].offsetTop-h.height()):0):s.find("."+d).css("left",e+"%"),t=t>100?100:t,a=a>100?100:a;var n=Math.min(t,a),o=Math.abs(t-a);"vertical"===l.type?s.find("."+r).css({height:o+"%",bottom:n+"%"}):s.find("."+r).css({width:o+"%",left:n+"%"});var u=l.min+Math.round((l.max-l.min)*e/100);if(g=u,y.children("."+c).children("input").val(g),h.eq(i).data("value",u),s.find("."+d).html(l.setTips?l.setTips(u):u),l.range){var v=[h.eq(0).data("value"),h.eq(1).data("value")];v[0]>v[1]&&v.reverse()}l.change&&l.change(l.range?v:u)},T=function(e){var i=e/f()*100/b,t=Math.round(i)*b;return e==f()&&(t=Math.ceil(i)*b),t},w=i(['<div class="layui-auxiliar-moving" id="LAY-slider-moving"></div'].join("")),M=function(e,t){var a=function(){t&&t(),w.remove()};i("#LAY-slider-moving")[0]||i("body").append(w),w.on("mousemove",e),w.on("mouseup",a).on("mouseleave",a)};if("set"===e)return x(t,a);s.find("."+u).each(function(e){var t=i(this);t.on("mousedown",function(i){i=i||window.event;var a=t.parent()[0].offsetLeft,n=i.clientX;"vertical"===l.type&&(a=f()-t.parent()[0].offsetTop-h.height(),n=i.clientY);var r=function(i){i=i||window.event;var r=a+("vertical"===l.type?n-i.clientY:i.clientX-n);r<0&&(r=0),r>f()&&(r=f());var o=r/f()*100/b;x(o,e),t.addClass(m),s.find("."+d).show(),i.preventDefault()},o=function(){t.removeClass(m),s.find("."+d).hide()};M(r,o)})}),s.on("click",function(e){var t=i("."+u);if(!t.is(event.target)&&0===t.has(event.target).length&&t.length){var a,n="vertical"===l.type?f()-e.clientY+i(this).offset().top:e.clientX-i(this).offset().left;n<0&&(n=0),n>f()&&(n=f());var s=n/f()*100/b;a=l.range?"vertical"===l.type?Math.abs(n-parseInt(i(h[0]).css("bottom")))>Math.abs(n-parseInt(i(h[1]).css("bottom")))?1:0:Math.abs(n-h[0].offsetLeft)>Math.abs(n-h[1].offsetLeft)?1:0:0,x(s,a),e.preventDefault()}}),y.children("."+p).children("i").each(function(e){i(this).on("click",function(){g=y.children("."+c).children("input").val(),g=1==e?g-l.step<l.min?l.min:Number(g)-l.step:Number(g)+l.step>l.max?l.max:Number(g)+l.step;var i=(g-l.min)/(l.max-l.min)*100/b;x(i,0)})});var q=function(){var e=this.value;e=isNaN(e)?0:e,e=e<l.min?l.min:e,e=e>l.max?l.max:e,this.value=e;var i=(e-l.min)/(l.max-l.min)*100/b;x(i,0)};y.children("."+c).children("input").on("keydown",function(e){13===e.keyCode&&(e.preventDefault(),q.call(this))}).on("change",q)},f.prototype.events=function(){var e=this;e.config},t.render=function(e){var i=new f(e);return a.call(i)},e(n,t)});layui.define("jquery",function(e){"use strict";var i=layui.jquery,o={config:{},index:layui.colorpicker?layui.colorpicker.index+1e4:0,set:function(e){var o=this;return o.config=i.extend({},o.config,e),o},on:function(e,i){return layui.onevent.call(this,"colorpicker",e,i)}},r=function(){var e=this,i=e.config;return{config:i}},t="colorpicker",n="layui-show",l="layui-colorpicker",c=".layui-colorpicker-main",a="layui-icon-down",s="layui-icon-close",f="layui-colorpicker-trigger-span",d="layui-colorpicker-trigger-i",u="layui-colorpicker-side",p="layui-colorpicker-side-slider",g="layui-colorpicker-basis",v="layui-colorpicker-alpha-bgcolor",h="layui-colorpicker-alpha-slider",m="layui-colorpicker-basis-cursor",b="layui-colorpicker-main-input",k=function(e){var i={h:0,s:0,b:0},o=Math.min(e.r,e.g,e.b),r=Math.max(e.r,e.g,e.b),t=r-o;return i.b=r,i.s=0!=r?255*t/r:0,0!=i.s?e.r==r?i.h=(e.g-e.b)/t:e.g==r?i.h=2+(e.b-e.r)/t:i.h=4+(e.r-e.g)/t:i.h=-1,r==o&&(i.h=0),i.h*=60,i.h<0&&(i.h+=360),i.s*=100/255,i.b*=100/255,i},y=function(e){var e=e.indexOf("#")>-1?e.substring(1):e;if(3==e.length){var i=e.split("");e=i[0]+i[0]+i[1]+i[1]+i[2]+i[2]}e=parseInt(e,16);var o={r:e>>16,g:(65280&e)>>8,b:255&e};return k(o)},x=function(e){var i={},o=e.h,r=255*e.s/100,t=255*e.b/100;if(0==r)i.r=i.g=i.b=t;else{var n=t,l=(255-r)*t/255,c=(n-l)*(o%60)/60;360==o&&(o=0),o<60?(i.r=n,i.b=l,i.g=l+c):o<120?(i.g=n,i.b=l,i.r=n-c):o<180?(i.g=n,i.r=l,i.b=l+c):o<240?(i.b=n,i.r=l,i.g=n-c):o<300?(i.b=n,i.g=l,i.r=l+c):o<360?(i.r=n,i.g=l,i.b=n-c):(i.r=0,i.g=0,i.b=0)}return{r:Math.round(i.r),g:Math.round(i.g),b:Math.round(i.b)}},C=function(e){var o=x(e),r=[o.r.toString(16),o.g.toString(16),o.b.toString(16)];return i.each(r,function(e,i){1==i.length&&(r[e]="0"+i)}),r.join("")},P=function(e){var i=/[0-9]{1,3}/g,o=e.match(i)||[];return{r:o[0],g:o[1],b:o[2]}},B=i(window),w=i(document),D=function(e){var r=this;r.index=++o.index,r.config=i.extend({},r.config,o.config,e),r.render()};D.prototype.config={color:"",size:null,alpha:!1,format:"hex",predefine:!1,colors:["#009688","#5FB878","#1E9FFF","#FF5722","#FFB800","#01AAED","#999","#c00","#ff8c00","#ffd700","#90ee90","#00ced1","#1e90ff","#c71585","rgb(0, 186, 189)","rgb(255, 120, 0)","rgb(250, 212, 0)","#393D49","rgba(0,0,0,.5)","rgba(255, 69, 0, 0.68)","rgba(144, 240, 144, 0.5)","rgba(31, 147, 255, 0.73)"]},D.prototype.render=function(){var e=this,o=e.config,r=i(['<div class="layui-unselect layui-colorpicker">',"<span "+("rgb"==o.format&&o.alpha?'class="layui-colorpicker-trigger-bgcolor"':"")+">",'<span class="layui-colorpicker-trigger-span" ','lay-type="'+("rgb"==o.format?o.alpha?"rgba":"torgb":"")+'" ','style="'+function(){var e="";return o.color?(e=o.color,(o.color.match(/[0-9]{1,3}/g)||[]).length>3&&(o.alpha&&"rgb"==o.format||(e="#"+C(k(P(o.color))))),"background: "+e):e}()+'">','<i class="layui-icon layui-colorpicker-trigger-i '+(o.color?a:s)+'"></i>',"</span>","</span>","</div>"].join("")),t=i(o.elem);o.size&&r.addClass("layui-colorpicker-"+o.size),t.addClass("layui-inline").html(e.elemColorBox=r),e.color=e.elemColorBox.find("."+f)[0].style.background,e.events()},D.prototype.renderPicker=function(){var e=this,o=e.config,r=e.elemColorBox[0],t=e.elemPicker=i(['<div id="layui-colorpicker'+e.index+'" data-index="'+e.index+'" class="layui-anim layui-anim-upbit layui-colorpicker-main">','<div class="layui-colorpicker-main-wrapper">','<div class="layui-colorpicker-basis">','<div class="layui-colorpicker-basis-white"></div>','<div class="layui-colorpicker-basis-black"></div>','<div class="layui-colorpicker-basis-cursor"></div>',"</div>",'<div class="layui-colorpicker-side">','<div class="layui-colorpicker-side-slider"></div>',"</div>","</div>",'<div class="layui-colorpicker-main-alpha '+(o.alpha?n:"")+'">','<div class="layui-colorpicker-alpha-bgcolor">','<div class="layui-colorpicker-alpha-slider"></div>',"</div>","</div>",function(){if(o.predefine){var e=['<div class="layui-colorpicker-main-pre">'];return layui.each(o.colors,function(i,o){e.push(['<div class="layui-colorpicker-pre'+((o.match(/[0-9]{1,3}/g)||[]).length>3?" layui-colorpicker-pre-isalpha":"")+'">','<div style="background:'+o+'"></div>',"</div>"].join(""))}),e.push("</div>"),e.join("")}return""}(),'<div class="layui-colorpicker-main-input">','<div class="layui-inline">','<input type="text" class="layui-input">',"</div>",'<div class="layui-btn-container">','<button class="layui-btn layui-btn-primary layui-btn-sm" colorpicker-events="clear">\u6e05\u7a7a</button>','<button class="layui-btn layui-btn-sm" colorpicker-events="confirm">\u786e\u5b9a</button>',"</div","</div>","</div>"].join(""));e.elemColorBox.find("."+f)[0];i(c)[0]&&i(c).data("index")==e.index?e.removePicker(D.thisElemInd):(e.removePicker(D.thisElemInd),i("body").append(t)),D.thisElemInd=e.index,D.thisColor=r.style.background,e.position(),e.pickerEvents()},D.prototype.removePicker=function(e){var o=this;o.config;return i("#layui-colorpicker"+(e||o.index)).remove(),o},D.prototype.position=function(){var e=this,i=e.config,o=e.bindElem||e.elemColorBox[0],r=e.elemPicker[0],t=o.getBoundingClientRect(),n=r.offsetWidth,l=r.offsetHeight,c=function(e){return e=e?"scrollLeft":"scrollTop",document.body[e]|document.documentElement[e]},a=function(e){return document.documentElement[e?"clientWidth":"clientHeight"]},s=5,f=t.left,d=t.bottom;f-=(n-o.offsetWidth)/2,d+=s,f+n+s>a("width")?f=a("width")-n-s:f<s&&(f=s),d+l+s>a()&&(d=t.top>l?t.top-l:a()-l,d-=2*s),i.position&&(r.style.position=i.position),r.style.left=f+("fixed"===i.position?0:c(1))+"px",r.style.top=d+("fixed"===i.position?0:c())+"px"},D.prototype.val=function(){var e=this,i=(e.config,e.elemColorBox.find("."+f)),o=e.elemPicker.find("."+b),r=i[0],t=r.style.backgroundColor;if(t){var n=k(P(t)),l=i.attr("lay-type");if(e.select(n.h,n.s,n.b),"torgb"===l&&o.find("input").val(t),"rgba"===l){var c=P(t);if(3==(t.match(/[0-9]{1,3}/g)||[]).length)o.find("input").val("rgba("+c.r+", "+c.g+", "+c.b+", 1)"),e.elemPicker.find("."+h).css("left",280);else{o.find("input").val(t);var a=280*t.slice(t.lastIndexOf(",")+1,t.length-1);e.elemPicker.find("."+h).css("left",a)}e.elemPicker.find("."+v)[0].style.background="linear-gradient(to right, rgba("+c.r+", "+c.g+", "+c.b+", 0), rgb("+c.r+", "+c.g+", "+c.b+"))"}}else e.select(0,100,100),o.find("input").val(""),e.elemPicker.find("."+v)[0].style.background="",e.elemPicker.find("."+h).css("left",280)},D.prototype.side=function(){var e=this,o=e.config,r=e.elemColorBox.find("."+f),t=r.attr("lay-type"),n=e.elemPicker.find("."+u),l=e.elemPicker.find("."+p),c=e.elemPicker.find("."+g),y=e.elemPicker.find("."+m),C=e.elemPicker.find("."+v),w=e.elemPicker.find("."+h),D=l[0].offsetTop/180*360,E=100-(y[0].offsetTop+3)/180*100,H=(y[0].offsetLeft+3)/260*100,W=Math.round(w[0].offsetLeft/280*100)/100,j=e.elemColorBox.find("."+d),F=e.elemPicker.find(".layui-colorpicker-pre").children("div"),L=function(i,n,l,c){e.select(i,n,l);var f=x({h:i,s:n,b:l});if(j.addClass(a).removeClass(s),r[0].style.background="rgb("+f.r+", "+f.g+", "+f.b+")","torgb"===t&&e.elemPicker.find("."+b).find("input").val("rgb("+f.r+", "+f.g+", "+f.b+")"),"rgba"===t){var d=0;d=280*c,w.css("left",d),e.elemPicker.find("."+b).find("input").val("rgba("+f.r+", "+f.g+", "+f.b+", "+c+")"),r[0].style.background="rgba("+f.r+", "+f.g+", "+f.b+", "+c+")",C[0].style.background="linear-gradient(to right, rgba("+f.r+", "+f.g+", "+f.b+", 0), rgb("+f.r+", "+f.g+", "+f.b+"))"}o.change&&o.change(e.elemPicker.find("."+b).find("input").val())},M=i(['<div class="layui-auxiliar-moving" id="LAY-colorpicker-moving"></div'].join("")),Y=function(e){i("#LAY-colorpicker-moving")[0]||i("body").append(M),M.on("mousemove",e),M.on("mouseup",function(){M.remove()}).on("mouseleave",function(){M.remove()})};l.on("mousedown",function(e){var i=this.offsetTop,o=e.clientY,r=function(e){var r=i+(e.clientY-o),t=n[0].offsetHeight;r<0&&(r=0),r>t&&(r=t);var l=r/180*360;D=l,L(l,H,E,W),e.preventDefault()};Y(r),e.preventDefault()}),n.on("click",function(e){var o=e.clientY-i(this).offset().top;o<0&&(o=0),o>this.offsetHeight&&(o=this.offsetHeight);var r=o/180*360;D=r,L(r,H,E,W),e.preventDefault()}),y.on("mousedown",function(e){var i=this.offsetTop,o=this.offsetLeft,r=e.clientY,t=e.clientX,n=function(e){var n=i+(e.clientY-r),l=o+(e.clientX-t),a=c[0].offsetHeight-3,s=c[0].offsetWidth-3;n<-3&&(n=-3),n>a&&(n=a),l<-3&&(l=-3),l>s&&(l=s);var f=(l+3)/260*100,d=100-(n+3)/180*100;E=d,H=f,L(D,f,d,W),e.preventDefault()};layui.stope(e),Y(n),e.preventDefault()}),c.on("mousedown",function(e){var o=e.clientY-i(this).offset().top-3+B.scrollTop(),r=e.clientX-i(this).offset().left-3+B.scrollLeft();o<-3&&(o=-3),o>this.offsetHeight-3&&(o=this.offsetHeight-3),r<-3&&(r=-3),r>this.offsetWidth-3&&(r=this.offsetWidth-3);var t=(r+3)/260*100,n=100-(o+3)/180*100;E=n,H=t,L(D,t,n,W),e.preventDefault(),y.trigger(e,"mousedown")}),w.on("mousedown",function(e){var i=this.offsetLeft,o=e.clientX,r=function(e){var r=i+(e.clientX-o),t=C[0].offsetWidth;r<0&&(r=0),r>t&&(r=t);var n=Math.round(r/280*100)/100;W=n,L(D,H,E,n),e.preventDefault()};Y(r),e.preventDefault()}),C.on("click",function(e){var o=e.clientX-i(this).offset().left;o<0&&(o=0),o>this.offsetWidth&&(o=this.offsetWidth);var r=Math.round(o/280*100)/100;W=r,L(D,H,E,r),e.preventDefault()}),F.each(function(){i(this).on("click",function(){i(this).parent(".layui-colorpicker-pre").addClass("selected").siblings().removeClass("selected");var e,o=this.style.backgroundColor,r=k(P(o)),t=o.slice(o.lastIndexOf(",")+1,o.length-1);D=r.h,H=r.s,E=r.b,3==(o.match(/[0-9]{1,3}/g)||[]).length&&(t=1),W=t,e=280*t,L(r.h,r.s,r.b,t)})})},D.prototype.select=function(e,i,o,r){var t=this,n=(t.config,C({h:e,s:100,b:100})),l=C({h:e,s:i,b:o}),c=e/360*180,a=180-o/100*180-3,s=i/100*260-3;t.elemPicker.find("."+p).css("top",c),t.elemPicker.find("."+g)[0].style.background="#"+n,t.elemPicker.find("."+m).css({top:a,left:s}),"change"!==r&&t.elemPicker.find("."+b).find("input").val("#"+l)},D.prototype.pickerEvents=function(){var e=this,o=e.config,r=e.elemColorBox.find("."+f),t=e.elemPicker.find("."+b+" input"),n={clear:function(i){r[0].style.background="",e.elemColorBox.find("."+d).removeClass(a).addClass(s),e.color="",o.done&&o.done(""),e.removePicker()},confirm:function(i,n){var l=t.val(),c=l,f={};if(l.indexOf(",")>-1){if(f=k(P(l)),e.select(f.h,f.s,f.b),r[0].style.background=c="#"+C(f),(l.match(/[0-9]{1,3}/g)||[]).length>3&&"rgba"===r.attr("lay-type")){var u=280*l.slice(l.lastIndexOf(",")+1,l.length-1);e.elemPicker.find("."+h).css("left",u),r[0].style.background=l,c=l}}else f=y(l),r[0].style.background=c="#"+C(f),e.elemColorBox.find("."+d).removeClass(s).addClass(a);return"change"===n?(e.select(f.h,f.s,f.b,n),void(o.change&&o.change(c))):(e.color=l,o.done&&o.done(l),void e.removePicker())}};e.elemPicker.on("click","*[colorpicker-events]",function(){var e=i(this),o=e.attr("colorpicker-events");n[o]&&n[o].call(this,e)}),t.on("keyup",function(e){var o=i(this);n.confirm.call(this,o,13===e.keyCode?null:"change")})},D.prototype.events=function(){var e=this,o=e.config,r=e.elemColorBox.find("."+f);e.elemColorBox.on("click",function(){e.renderPicker(),i(c)[0]&&(e.val(),e.side())}),o.elem[0]&&!e.elemColorBox[0].eventHandler&&(w.on("click",function(o){if(!i(o.target).hasClass(l)&&!i(o.target).parents("."+l)[0]&&!i(o.target).hasClass(c.replace(/\./g,""))&&!i(o.target).parents(c)[0]&&e.elemPicker){if(e.color){var t=k(P(e.color));e.select(t.h,t.s,t.b)}else e.elemColorBox.find("."+d).removeClass(a).addClass(s);r[0].style.background=e.color||"",e.removePicker()}}),B.on("resize",function(){return!(!e.elemPicker||!i(c)[0])&&void e.position()}),e.elemColorBox[0].eventHandler=!0)},o.render=function(e){var i=new D(e);return r.call(i)},e(t,o)});layui.define("layer",function(e){"use strict";var t=layui.$,i=layui.layer,a=layui.hint(),n=layui.device(),l="form",r=".layui-form",s="layui-this",o="layui-hide",c="layui-disabled",u=function(){this.config={verify:{required:[/[\S]+/,"\u5fc5\u586b\u9879\u4e0d\u80fd\u4e3a\u7a7a"],phone:[/^1\d{10}$/,"\u8bf7\u8f93\u5165\u6b63\u786e\u7684\u624b\u673a\u53f7"],email:[/^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/,"\u90ae\u7bb1\u683c\u5f0f\u4e0d\u6b63\u786e"],url:[/^(#|(http(s?)):\/\/|\/\/)[^\s]+\.[^\s]+$/,"\u94fe\u63a5\u683c\u5f0f\u4e0d\u6b63\u786e"],number:function(e){if(!e||isNaN(e))return"\u53ea\u80fd\u586b\u5199\u6570\u5b57"},date:[/^(\d{4})[-\/](\d{1}|0\d{1}|1[0-2])([-\/](\d{1}|0\d{1}|[1-2][0-9]|3[0-1]))*$/,"\u65e5\u671f\u683c\u5f0f\u4e0d\u6b63\u786e"],identity:[/(^\d{15}$)|(^\d{17}(x|X|\d)$)/,"\u8bf7\u8f93\u5165\u6b63\u786e\u7684\u8eab\u4efd\u8bc1\u53f7"]}}};u.prototype.set=function(e){var i=this;return t.extend(!0,i.config,e),i},u.prototype.verify=function(e){var i=this;return t.extend(!0,i.config.verify,e),i},u.prototype.on=function(e,t){return layui.onevent.call(this,l,e,t)},u.prototype.val=function(e,i){var a=this,n=t(r+'[lay-filter="'+e+'"]');return n.each(function(e,a){var n=t(this);layui.each(i,function(e,t){var i,a=n.find('[name="'+e+'"]');a[0]&&(i=a[0].type,"checkbox"===i?a[0].checked=t:"radio"===i?a.each(function(){this.value==t&&(this.checked=!0)}):a.val(t))})}),f.render(null,e),a.getValue(e)},u.prototype.getValue=function(e,i){i=i||t(r+'[lay-filter="'+e+'"]').eq(0);var a={},n={},l=i.find("input,select,textarea");return layui.each(l,function(e,i){var l;t(this);if(i.name=(i.name||"").replace(/^\s*|\s*&/,""),i.name){if(/^.*\[\]$/.test(i.name)){var r=i.name.match(/^(.*)\[\]$/g)[0];a[r]=0|a[r],l=i.name.replace(/^(.*)\[\]$/,"$1["+a[r]++ +"]")}/^checkbox|radio$/.test(i.type)&&!i.checked||(n[l||i.name]=i.value)}}),n},u.prototype.render=function(e,i){var n=this,u=t(r+function(){return i?'[lay-filter="'+i+'"]':""}()),d={select:function(){var e,i="\u8bf7\u9009\u62e9",a="layui-form-select",n="layui-select-title",r="layui-select-none",d="",f=u.find("select"),v=function(i,l){t(i.target).parent().hasClass(n)&&!l||(t("."+a).removeClass(a+"ed "+a+"up"),e&&d&&e.val(d)),e=null},y=function(i,u,f){var y,p=t(this),m=i.find("."+n),k=m.find("input"),g=i.find("dl"),x=g.children("dd"),b=this.selectedIndex;if(!u){var C=function(){var e=i.offset().top+i.outerHeight()+5-h.scrollTop(),t=g.outerHeight();b=p[0].selectedIndex,i.addClass(a+"ed"),x.removeClass(o),y=null,x.eq(b).addClass(s).siblings().removeClass(s),e+t>h.height()&&e>=t&&i.addClass(a+"up"),$()},w=function(e){i.removeClass(a+"ed "+a+"up"),k.blur(),y=null,e||T(k.val(),function(e){var i=p[0].selectedIndex;e&&(d=t(p[0].options[i]).html(),0===i&&d===k.attr("placeholder")&&(d=""),k.val(d||""))})},$=function(){var e=g.children("dd."+s);if(e[0]){var t=e.position().top,i=g.height(),a=e.height();t>i&&g.scrollTop(t+g.scrollTop()-i+a-5),t<0&&g.scrollTop(t+g.scrollTop()-5)}};m.on("click",function(e){i.hasClass(a+"ed")?w():(v(e,!0),C()),g.find("."+r).remove()}),m.find(".layui-edge").on("click",function(){k.focus()}),k.on("keyup",function(e){var t=e.keyCode;9===t&&C()}).on("keydown",function(e){var t=e.keyCode;9===t&&w();var i=function(t,a){var n,l;e.preventDefault();var r=function(){var e=g.children("dd."+s);if(g.children("dd."+o)[0]&&"next"===t){var i=g.children("dd:not(."+o+",."+c+")"),n=i.eq(0).index();if(n>=0&&n<e.index()&&!i.hasClass(s))return i.eq(0).prev()[0]?i.eq(0).prev():g.children(":last")}return a&&a[0]?a:y&&y[0]?y:e}();return l=r[t](),n=r[t]("dd:not(."+o+")"),l[0]?(y=r[t](),n[0]&&!n.hasClass(c)||!y[0]?(n.addClass(s).siblings().removeClass(s),void $()):i(t,y)):y=null};38===t&&i("prev"),40===t&&i("next"),13===t&&(e.preventDefault(),g.children("dd."+s).trigger("click"))});var T=function(e,i,a){var n=0;layui.each(x,function(){var i=t(this),l=i.text(),r=l.indexOf(e)===-1;(""===e||"blur"===a?e!==l:r)&&n++,"keyup"===a&&i[r?"addClass":"removeClass"](o)});var l=n===x.length;return i(l),l},q=function(e){var t=this.value,i=e.keyCode;return 9!==i&&13!==i&&37!==i&&38!==i&&39!==i&&40!==i&&(T(t,function(e){e?g.find("."+r)[0]||g.append('<p class="'+r+'">\u65e0\u5339\u914d\u9879</p>'):g.find("."+r).remove()},"keyup"),""===t&&g.find("."+r).remove(),void $())};f&&k.on("keyup",q).on("blur",function(i){var a=p[0].selectedIndex;e=k,d=t(p[0].options[a]).html(),0===a&&d===k.attr("placeholder")&&(d=""),setTimeout(function(){T(k.val(),function(e){d||k.val("")},"blur")},200)}),x.on("click",function(){var e=t(this),a=e.attr("lay-value"),n=p.attr("lay-filter");return!e.hasClass(c)&&(e.hasClass("layui-select-tips")?k.val(""):(k.val(e.text()),e.addClass(s)),e.siblings().removeClass(s),p.val(a).removeClass("layui-form-danger"),layui.event.call(this,l,"select("+n+")",{elem:p[0],value:a,othis:i}),w(!0),!1)}),i.find("dl>dt").on("click",function(e){return!1}),t(document).off("click",v).on("click",v)}};f.each(function(e,l){var r=t(this),o=r.next("."+a),u=this.disabled,d=l.value,f=t(l.options[l.selectedIndex]),v=l.options[0];if("string"==typeof r.attr("lay-ignore"))return r.show();var h="string"==typeof r.attr("lay-search"),p=v?v.value?i:v.innerHTML||i:i,m=t(['<div class="'+(h?"":"layui-unselect ")+a,(u?" layui-select-disabled":"")+'">','<div class="'+n+'">','<input type="text" placeholder="'+p+'" '+('value="'+(d?f.html():"")+'"')+(!u&&h?"":" readonly")+' class="layui-input'+(h?"":" layui-unselect")+(u?" "+c:"")+'">','<i class="layui-edge"></i></div>','<dl class="layui-anim layui-anim-upbit'+(r.find("optgroup")[0]?" layui-select-group":"")+'">',function(e){var t=[];return layui.each(e,function(e,a){0!==e||a.value?"optgroup"===a.tagName.toLowerCase()?t.push("<dt>"+a.label+"</dt>"):t.push('<dd lay-value="'+a.value+'" class="'+(d===a.value?s:"")+(a.disabled?" "+c:"")+'">'+a.innerHTML+"</dd>"):t.push('<dd lay-value="" class="layui-select-tips">'+(a.innerHTML||i)+"</dd>")}),0===t.length&&t.push('<dd lay-value="" class="'+c+'">\u6ca1\u6709\u9009\u9879</dd>'),t.join("")}(r.find("*"))+"</dl>","</div>"].join(""));o[0]&&o.remove(),r.after(m),y.call(this,m,u,h)})},checkbox:function(){var e={checkbox:["layui-form-checkbox","layui-form-checked","checkbox"],_switch:["layui-form-switch","layui-form-onswitch","switch"]},i=u.find("input[type=checkbox]"),a=function(e,i){var a=t(this);e.on("click",function(){var t=a.attr("lay-filter"),n=(a.attr("lay-text")||"").split("|");a[0].disabled||(a[0].checked?(a[0].checked=!1,e.removeClass(i[1]).find("em").text(n[1])):(a[0].checked=!0,e.addClass(i[1]).find("em").text(n[0])),layui.event.call(a[0],l,i[2]+"("+t+")",{elem:a[0],value:a[0].value,othis:e}))})};i.each(function(i,n){var l=t(this),r=l.attr("lay-skin"),s=(l.attr("lay-text")||"").split("|"),o=this.disabled;"switch"===r&&(r="_"+r);var u=e[r]||e.checkbox;if("string"==typeof l.attr("lay-ignore"))return l.show();var d=l.next("."+u[0]),f=t(['<div class="layui-unselect '+u[0],n.checked?" "+u[1]:"",o?" layui-checkbox-disbaled "+c:"",'"',r?' lay-skin="'+r+'"':"",">",function(){var e=n.title.replace(/\s/g,""),t={checkbox:[e?"<span>"+n.title+"</span>":"",'<i class="layui-icon layui-icon-ok"></i>'].join(""),_switch:"<em>"+((n.checked?s[0]:s[1])||"")+"</em><i></i>"};return t[r]||t.checkbox}(),"</div>"].join(""));d[0]&&d.remove(),l.after(f),a.call(this,f,u)})},radio:function(){var e="layui-form-radio",i=["&#xe643;","&#xe63f;"],a=u.find("input[type=radio]"),n=function(a){var n=t(this),s="layui-anim-scaleSpring";a.on("click",function(){var o=n[0].name,c=n.parents(r),u=n.attr("lay-filter"),d=c.find("input[name="+o.replace(/(\.|#|\[|\])/g,"\\$1")+"]");n[0].disabled||(layui.each(d,function(){var a=t(this).next("."+e);this.checked=!1,a.removeClass(e+"ed"),a.find(".layui-icon").removeClass(s).html(i[1])}),n[0].checked=!0,a.addClass(e+"ed"),a.find(".layui-icon").addClass(s).html(i[0]),layui.event.call(n[0],l,"radio("+u+")",{elem:n[0],value:n[0].value,othis:a}))})};a.each(function(a,l){var r=t(this),s=r.next("."+e),o=this.disabled;if("string"==typeof r.attr("lay-ignore"))return r.show();s[0]&&s.remove();var u=t(['<div class="layui-unselect '+e,l.checked?" "+e+"ed":"",(o?" layui-radio-disbaled "+c:"")+'">','<i class="layui-anim layui-icon">'+i[l.checked?0:1]+"</i>","<div>"+function(){var e=l.title||"";return"string"==typeof r.next().attr("lay-radio")&&(e=r.next().html()),e}()+"</div>","</div>"].join(""));r.after(u),n.call(this,u)})}};return e?d[e]?d[e]():a.error("\u4e0d\u652f\u6301\u7684"+e+"\u8868\u5355\u6e32\u67d3"):layui.each(d,function(e,t){t()}),n};var d=function(){var e=null,a=f.config.verify,s="layui-form-danger",o={},c=t(this),u=c.parents(r).eq(0),d=u.find("*[lay-verify]"),v=c.parents("form")[0],h=c.attr("lay-filter");return layui.each(d,function(l,r){var o=t(this),c=o.attr("lay-verify").split("|"),u=o.attr("lay-verType"),d=o.val();if(o.removeClass(s),layui.each(c,function(t,l){var c,f="",v="function"==typeof a[l];if(a[l]){var c=v?f=a[l](d,r):!a[l][0].test(d);if(f=f||a[l][1],"required"===l&&(f=o.attr("lay-reqText")||f),c)return"tips"===u?i.tips(f,function(){return"string"==typeof o.attr("lay-ignore")||"select"!==r.tagName.toLowerCase()&&!/^checkbox|radio$/.test(r.type)?o:o.next()}(),{tips:1}):"alert"===u?i.alert(f,{title:"\u63d0\u793a",shadeClose:!0}):/\bstring|number\b/.test(typeof f)&&i.msg(f,{icon:5,shift:6}),n.android||n.ios||setTimeout(function(){r.focus()},7),o.addClass(s),e=!0}}),e)return e}),!e&&(o=f.getValue(null,u),layui.event.call(this,l,"submit("+h+")",{elem:this,form:v,field:o}))},f=new u,v=t(document),h=t(window);t(function(){f.render()}),v.on("reset",r,function(){var e=t(this).attr("lay-filter");setTimeout(function(){f.render(null,e)},50)}),v.on("submit",r,d).on("click","*[lay-submit]",d),e(l,f)});layui.define("form",function(e){"use strict";var i=layui.$,a=layui.form,n=layui.layer,t="tree",r={config:{},index:layui[t]?layui[t].index+1e4:0,set:function(e){var a=this;return a.config=i.extend({},a.config,e),a},on:function(e,i){return layui.onevent.call(this,t,e,i)}},l=function(){var e=this,i=e.config,a=i.id||e.index;return l.that[a]=e,l.config[a]=i,{config:i,reload:function(i){e.reload.call(e,i)},getChecked:function(){return e.getChecked.call(e)},setChecked:function(i){return e.setChecked.call(e,i)}}},c="layui-hide",d="layui-disabled",s="layui-tree-set",o="layui-tree-iconClick",h="layui-icon-addition",u="layui-icon-subtraction",p="layui-tree-entry",f="layui-tree-main",y="layui-tree-txt",v="layui-tree-pack",C="layui-tree-spread",k="layui-tree-setLineShort",m="layui-tree-showLine",x="layui-tree-lineExtend",b=function(e){var a=this;a.index=++r.index,a.config=i.extend({},a.config,r.config,e),a.render()};b.prototype.config={data:[],showCheckbox:!1,showLine:!0,accordion:!1,onlyIconControl:!1,isJump:!1,edit:!1,text:{defaultNodeName:"\u672a\u547d\u540d",none:"\u65e0\u6570\u636e"}},b.prototype.reload=function(e){var a=this;layui.each(e,function(e,i){i.constructor===Array&&delete a.config[e]}),a.config=i.extend(!0,{},a.config,e),a.render()},b.prototype.render=function(){var e=this,a=e.config;e.checkids=[];var n=i('<div class="layui-tree'+(a.showCheckbox?" layui-form":"")+(a.showLine?" layui-tree-line":"")+'" lay-filter="LAY-tree-'+e.index+'"></div>');e.tree(n);var t=a.elem=i(a.elem);if(t[0]){if(e.key=a.id||e.index,e.elem=n,e.elemNone=i('<div class="layui-tree-emptyText">'+a.text.none+"</div>"),t.html(e.elem),0==e.elem.find(".layui-tree-set").length)return e.elem.append(e.elemNone);a.showCheckbox&&e.renderForm("checkbox"),e.elem.find(".layui-tree-set").each(function(){var e=i(this);e.parent(".layui-tree-pack")[0]||e.addClass("layui-tree-setHide"),!e.next()[0]&&e.parents(".layui-tree-pack").eq(1).hasClass("layui-tree-lineExtend")&&e.addClass(k),e.next()[0]||e.parents(".layui-tree-set").eq(0).next()[0]||e.addClass(k)}),e.events()}},b.prototype.renderForm=function(e){a.render(e,"LAY-tree-"+this.index)},b.prototype.tree=function(e,a){var n=this,t=n.config,r=a||t.data;layui.each(r,function(a,r){var l=r.children&&r.children.length>0,o=i('<div class="layui-tree-pack" '+(r.spread?'style="display: block;"':"")+"></div>"),h=i(['<div data-id="'+r.id+'" class="layui-tree-set'+(r.spread?" layui-tree-spread":"")+(r.checked?" layui-tree-checkedFirst":"")+'">','<div class="layui-tree-entry">','<div class="layui-tree-main">',function(){return t.showLine?l?'<span class="layui-tree-iconClick layui-tree-icon"><i class="layui-icon '+(r.spread?"layui-icon-subtraction":"layui-icon-addition")+'"></i></span>':'<span class="layui-tree-iconClick"><i class="layui-icon layui-icon-file"></i></span>':'<span class="layui-tree-iconClick"><i class="layui-tree-iconArrow '+(l?"":c)+'"></i></span>'}(),function(){return t.showCheckbox?'<input type="checkbox" name="'+(r.field||"layuiTreeCheck_"+r.id)+'" same="layuiTreeCheck" lay-skin="primary" '+(r.disabled?"disabled":"")+' value="'+r.id+'">':""}(),function(){return t.isJump&&r.href?'<a href="'+r.href+'" target="_blank" class="'+y+'">'+(r.title||r.label||t.text.defaultNodeName)+"</a>":'<span class="'+y+(r.disabled?" "+d:"")+'">'+(r.title||r.label||t.text.defaultNodeName)+"</span>"}(),"</div>",function(){if(!t.edit)return"";var e={add:'<i class="layui-icon layui-icon-add-1"  data-type="add"></i>',update:'<i class="layui-icon layui-icon-edit" data-type="update"></i>',del:'<i class="layui-icon layui-icon-delete" data-type="del"></i>'},i=['<div class="layui-btn-group layui-tree-btnGroup">'];return t.edit===!0&&(t.edit=["update","del"]),"object"==typeof t.edit?(layui.each(t.edit,function(a,n){i.push(e[n]||"")}),i.join("")+"</div>"):void 0}(),"</div></div>"].join(""));l&&(h.append(o),n.tree(o,r.children)),e.append(h),h.prev("."+s)[0]&&h.prev().children(".layui-tree-pack").addClass("layui-tree-showLine"),l||h.parent(".layui-tree-pack").addClass("layui-tree-lineExtend"),n.spread(h,r),t.showCheckbox&&(r.checked&&n.checkids.push(r.id),n.checkClick(h,r)),t.edit&&n.operate(h,r)})},b.prototype.spread=function(e,a){var n=this,t=n.config,r=e.children("."+p),l=r.children("."+f),c=r.find("."+o),k=r.find("."+y),m=t.onlyIconControl?c:l,x="";m.on("click",function(i){var a=e.children("."+v),n=m.children(".layui-icon")[0]?m.children(".layui-icon"):m.find(".layui-tree-icon").children(".layui-icon");if(a[0]){if(e.hasClass(C))e.removeClass(C),a.slideUp(200),n.removeClass(u).addClass(h);else if(e.addClass(C),a.slideDown(200),n.addClass(u).removeClass(h),t.accordion){var r=e.siblings("."+s);r.removeClass(C),r.children("."+v).slideUp(200),r.find(".layui-tree-icon").children(".layui-icon").removeClass(u).addClass(h)}}else x="normal"}),k.on("click",function(){var n=i(this);n.hasClass(d)||(x=e.hasClass(C)?t.onlyIconControl?"open":"close":t.onlyIconControl?"close":"open",t.click&&t.click({elem:e,state:x,data:a}))})},b.prototype.setCheckbox=function(e,i,a){var n=this,t=(n.config,a.prop("checked"));if(!a.prop("disabled")){if("object"==typeof i.children||e.find("."+v)[0]){var r=e.find("."+v).find('input[same="layuiTreeCheck"]');r.each(function(){this.disabled||(this.checked=t)})}var l=function(e){if(e.parents("."+s)[0]){var i,a=e.parent("."+v),n=a.parent(),r=a.prev().find('input[same="layuiTreeCheck"]');t?r.prop("checked",t):(a.find('input[same="layuiTreeCheck"]').each(function(){this.checked&&(i=!0)}),i||r.prop("checked",!1)),l(n)}};l(e),n.renderForm("checkbox")}},b.prototype.checkClick=function(e,a){var n=this,t=n.config,r=e.children("."+p),l=r.children("."+f);l.on("click",'input[same="layuiTreeCheck"]+',function(r){layui.stope(r);var l=i(this).prev(),c=l.prop("checked");l.prop("disabled")||(n.setCheckbox(e,a,l),t.oncheck&&t.oncheck({elem:e,checked:c,data:a}))})},b.prototype.operate=function(e,a){var t=this,r=t.config,l=e.children("."+p),d=l.children("."+f);l.children(".layui-tree-btnGroup").on("click",".layui-icon",function(l){layui.stope(l);var f=i(this).data("type"),b=e.children("."+v),g={data:a,type:f,elem:e};if("add"==f){b[0]||(r.showLine?(d.find("."+o).addClass("layui-tree-icon"),d.find("."+o).children(".layui-icon").addClass(h).removeClass("layui-icon-file")):d.find(".layui-tree-iconArrow").removeClass(c),e.append('<div class="layui-tree-pack"></div>'));var w=r.operate&&r.operate(g),N={};if(N.title=r.text.defaultNodeName,N.id=w,t.tree(e.children("."+v),[N]),r.showLine)if(b[0])b.hasClass(x)||b.addClass(x),e.find("."+v).each(function(){i(this).children("."+s).last().addClass(k)}),b.children("."+s).last().prev().hasClass(k)?b.children("."+s).last().prev().removeClass(k):b.children("."+s).last().removeClass(k),!e.parent("."+v)[0]&&e.next()[0]&&b.children("."+s).last().removeClass(k);else{var T=e.siblings("."+s),L=1,A=e.parent("."+v);layui.each(T,function(e,a){i(a).children("."+v)[0]||(L=0)}),1==L?(T.children("."+v).addClass(m),T.children("."+v).children("."+s).removeClass(k),e.children("."+v).addClass(m),A.removeClass(x),A.children("."+s).last().children("."+v).children("."+s).last().addClass(k)):e.children("."+v).children("."+s).addClass(k)}if(!r.showCheckbox)return;if(d.find('input[same="layuiTreeCheck"]')[0].checked){var I=e.children("."+v).children("."+s).last();I.find('input[same="layuiTreeCheck"]')[0].checked=!0}t.renderForm("checkbox")}else if("update"==f){var F=d.children("."+y).html();d.children("."+y).html(""),d.append('<input type="text" class="layui-tree-editInput">'),d.children(".layui-tree-editInput").val(F).focus();var j=function(e){var i=e.val().trim();i=i?i:r.text.defaultNodeName,e.remove(),d.children("."+y).html(i),g.data.title=i,r.operate&&r.operate(g)};d.children(".layui-tree-editInput").blur(function(){j(i(this))}),d.children(".layui-tree-editInput").on("keydown",function(e){13===e.keyCode&&(e.preventDefault(),j(i(this)))})}else n.confirm('\u786e\u8ba4\u5220\u9664\u8be5\u8282\u70b9 "<span style="color: #999;">'+(a.title||"")+'</span>" \u5417\uff1f',function(a){if(r.operate&&r.operate(g),g.status="remove",n.close(a),!e.prev("."+s)[0]&&!e.next("."+s)[0]&&!e.parent("."+v)[0])return e.remove(),void t.elem.append(t.elemNone);if(e.siblings("."+s).children("."+p)[0]){if(r.showCheckbox){var l=function(e){if(e.parents("."+s)[0]){var a=e.siblings("."+s).children("."+p),n=e.parent("."+v).prev(),r=n.find('input[same="layuiTreeCheck"]')[0],c=1,d=0;0==r.checked&&(a.each(function(e,a){var n=i(a).find('input[same="layuiTreeCheck"]')[0];0!=n.checked||n.disabled||(c=0),n.disabled||(d=1)}),1==c&&1==d&&(r.checked=!0,t.renderForm("checkbox"),l(n.parent("."+s))))}};l(e)}if(r.showLine){var d=e.siblings("."+s),h=1,f=e.parent("."+v);layui.each(d,function(e,a){i(a).children("."+v)[0]||(h=0)}),1==h?(b[0]||(f.removeClass(x),d.children("."+v).addClass(m),d.children("."+v).children("."+s).removeClass(k)),e.next()[0]?f.children("."+s).last().children("."+v).children("."+s).last().addClass(k):e.prev().children("."+v).children("."+s).last().addClass(k),e.next()[0]||e.parents("."+s)[1]||e.parents("."+s).eq(0).next()[0]||e.prev("."+s).addClass(k)):!e.next()[0]&&e.hasClass(k)&&e.prev().addClass(k)}}else{var y=e.parent("."+v).prev();if(r.showLine){y.find("."+o).removeClass("layui-tree-icon"),y.find("."+o).children(".layui-icon").removeClass(u).addClass("layui-icon-file");var w=y.parents("."+v).eq(0);w.addClass(x),w.children("."+s).each(function(){i(this).children("."+v).children("."+s).last().addClass(k)})}else y.find(".layui-tree-iconArrow").addClass(c);e.parents("."+s).eq(0).removeClass(C),e.parent("."+v).remove()}e.remove()})})},b.prototype.events=function(){var e=this,a=e.config;e.elem.find(".layui-tree-checkedFirst");e.setChecked(e.checkids),e.elem.find(".layui-tree-search").on("keyup",function(){var n=i(this),t=n.val(),r=n.nextAll(),l=[];r.find("."+y).each(function(){var e=i(this).parents("."+p);if(i(this).html().indexOf(t)!=-1){l.push(i(this).parent());var a=function(e){e.addClass("layui-tree-searchShow"),e.parent("."+v)[0]&&a(e.parent("."+v).parent("."+s))};a(e.parent("."+s))}}),r.find("."+p).each(function(){var e=i(this).parent("."+s);e.hasClass("layui-tree-searchShow")||e.addClass(c)}),0==r.find(".layui-tree-searchShow").length&&e.elem.append(e.elemNone),a.onsearch&&a.onsearch({elem:l})}),e.elem.find(".layui-tree-search").on("keydown",function(){i(this).nextAll().find("."+p).each(function(){var e=i(this).parent("."+s);e.removeClass("layui-tree-searchShow "+c)}),i(".layui-tree-emptyText")[0]&&i(".layui-tree-emptyText").remove()})},b.prototype.getChecked=function(){var e=this,a=e.config,n=[],t=[];e.elem.find(".layui-form-checked").each(function(){n.push(i(this).prev()[0].value)});var r=function(e,a){layui.each(e,function(e,t){layui.each(n,function(e,n){if(t.id==n){var l=i.extend({},t);return delete l.children,a.push(l),t.children&&(l.children=[],r(t.children,l.children)),!0}})})};return r(i.extend({},a.data),t),t},b.prototype.setChecked=function(e){var a=this;a.config;a.elem.find("."+s).each(function(a,n){var t=i(this).data("id"),r=i(n).children("."+p).find('input[same="layuiTreeCheck"]'),l=r.next();if("number"==typeof e){if(t==e)return r[0].checked||l.click(),!1}else"object"==typeof e&&layui.each(e,function(e,i){if(i==t&&!r[0].checked)return l.click(),!0})})},l.that={},l.config={},r.reload=function(e,i){var a=l.that[e];return a.reload(i),l.call(a)},r.getChecked=function(e){var i=l.that[e];return i.getChecked()},r.setChecked=function(e,i){var a=l.that[e];return a.setChecked(i)},r.render=function(e){var i=new b(e);return l.call(i)},e(t,r)});layui.define(["laytpl","form"],function(e){"use strict";var a=layui.$,t=layui.laytpl,i=layui.form,n="transfer",l={config:{},index:layui[n]?layui[n].index+1e4:0,set:function(e){var t=this;return t.config=a.extend({},t.config,e),t},on:function(e,a){return layui.onevent.call(this,n,e,a)}},r=function(){var e=this,a=e.config,t=a.id||e.index;return r.that[t]=e,r.config[t]=a,{config:a,reload:function(a){e.reload.call(e,a)},getData:function(){return e.getData.call(e)}}},c="layui-hide",o="layui-btn-disabled",d="layui-none",s="layui-transfer-box",u="layui-transfer-header",h="layui-transfer-search",f="layui-transfer-active",y="layui-transfer-data",p=function(e){return e=e||{},['<div class="layui-transfer-box" data-index="'+e.index+'">','<div class="layui-transfer-header">','<input type="checkbox" name="'+e.checkAllName+'" lay-filter="layTransferCheckbox" lay-type="all" lay-skin="primary" title="{{ d.data.title['+e.index+"] || 'list"+(e.index+1)+"' }}\">","</div>","{{# if(d.data.showSearch){ }}",'<div class="layui-transfer-search">','<i class="layui-icon layui-icon-search"></i>','<input type="input" class="layui-input" placeholder="\u5173\u952e\u8bcd\u641c\u7d22">',"</div>","{{# } }}",'<ul class="layui-transfer-data"></ul>',"</div>"].join("")},v=['<div class="layui-transfer layui-form layui-border-box" lay-filter="LAY-transfer-{{ d.index }}">',p({index:0,checkAllName:"layTransferLeftCheckAll"}),'<div class="layui-transfer-active">','<button type="button" class="layui-btn layui-btn-sm layui-btn-primary layui-btn-disabled" data-index="0">','<i class="layui-icon layui-icon-next"></i>',"</button>",'<button type="button" class="layui-btn layui-btn-sm layui-btn-primary layui-btn-disabled" data-index="1">','<i class="layui-icon layui-icon-prev"></i>',"</button>","</div>",p({index:1,checkAllName:"layTransferRightCheckAll"}),"</div>"].join(""),x=function(e){var t=this;t.index=++l.index,t.config=a.extend({},t.config,l.config,e),t.render()};x.prototype.config={title:["\u5217\u8868\u4e00","\u5217\u8868\u4e8c"],width:200,height:360,data:[],value:[],showSearch:!1,id:"",text:{none:"\u65e0\u6570\u636e",searchNone:"\u65e0\u5339\u914d\u6570\u636e"}},x.prototype.reload=function(e){var t=this;t.config=a.extend({},t.config,e),t.render()},x.prototype.render=function(){var e=this,i=e.config,n=e.elem=a(t(v).render({data:i,index:e.index})),l=i.elem=a(i.elem);l[0]&&(i.data=i.data||[],i.value=i.value||[],e.key=i.id||e.index,l.html(e.elem),e.layBox=e.elem.find("."+s),e.layHeader=e.elem.find("."+u),e.laySearch=e.elem.find("."+h),e.layData=n.find("."+y),e.layBtn=n.find("."+f+" .layui-btn"),e.layBox.css({width:i.width,height:i.height}),e.layData.css({height:function(){return i.height-e.layHeader.outerHeight()-e.laySearch.outerHeight()-2}()}),e.renderData(),e.events())},x.prototype.renderData=function(){var e=this,a=(e.config,[{checkName:"layTransferLeftCheck",views:[]},{checkName:"layTransferRightCheck",views:[]}]);e.parseData(function(e){var t=e.selected?1:0,i=["<li>",'<input type="checkbox" name="'+a[t].checkName+'" lay-skin="primary" lay-filter="layTransferCheckbox" title="'+e.title+'"'+(e.disabled?" disabled":"")+(e.checked?" checked":"")+' value="'+e.value+'">',"</li>"].join("");a[t].views.push(i),delete e.selected}),e.layData.eq(0).html(a[0].views.join("")),e.layData.eq(1).html(a[1].views.join("")),e.renderCheckBtn()},x.prototype.renderForm=function(e){i.render(e,"LAY-transfer-"+this.index)},x.prototype.renderCheckBtn=function(e){var t=this,i=t.config;e=e||{},t.layBox.each(function(n){var l=a(this),r=l.find("."+y),d=l.find("."+u).find('input[type="checkbox"]'),s=r.find('input[type="checkbox"]'),h=0,f=!1;if(s.each(function(){var e=a(this).data("hide");(this.checked||this.disabled||e)&&h++,this.checked&&!e&&(f=!0)}),d.prop("checked",f&&h===s.length),t.layBtn.eq(n)[f?"removeClass":"addClass"](o),!e.stopNone){var p=r.children("li:not(."+c+")").length;t.noneView(r,p?"":i.text.none)}}),t.renderForm("checkbox")},x.prototype.noneView=function(e,t){var i=a('<p class="layui-none">'+(t||"")+"</p>");e.find("."+d)[0]&&e.find("."+d).remove(),t.replace(/\s/g,"")&&e.append(i)},x.prototype.setValue=function(){var e=this,t=e.config,i=[];return e.layBox.eq(1).find("."+y+' input[type="checkbox"]').each(function(){var e=a(this).data("hide");e||i.push(this.value)}),t.value=i,e},x.prototype.parseData=function(e){var t=this,i=t.config,n=[];return layui.each(i.data,function(t,l){l=("function"==typeof i.parseData?i.parseData(l):l)||l,n.push(l=a.extend({},l)),layui.each(i.value,function(e,a){a==l.value&&(l.selected=!0)}),e&&e(l)}),i.data=n,t},x.prototype.getData=function(e){var a=this,t=a.config,i=[];return a.setValue(),layui.each(e||t.value,function(e,a){layui.each(t.data,function(e,t){delete t.selected,a==t.value&&i.push(t)})}),i},x.prototype.events=function(){var e=this,t=e.config;e.elem.on("click",'input[lay-filter="layTransferCheckbox"]+',function(){var t=a(this).prev(),i=t[0].checked,n=t.parents("."+s).eq(0).find("."+y);t[0].disabled||("all"===t.attr("lay-type")&&n.find('input[type="checkbox"]').each(function(){this.disabled||(this.checked=i)}),e.renderCheckBtn({stopNone:!0}))}),e.layBtn.on("click",function(){var i=a(this),n=i.data("index"),l=e.layBox.eq(n),r=[];if(!i.hasClass(o)){e.layBox.eq(n).each(function(t){var i=a(this),n=i.find("."+y);n.children("li").each(function(){var t=a(this),i=t.find('input[type="checkbox"]'),n=i.data("hide");i[0].checked&&!n&&(i[0].checked=!1,l.siblings("."+s).find("."+y).append(t.clone()),t.remove(),r.push(i[0].value)),e.setValue()})}),e.renderCheckBtn();var c=l.siblings("."+s).find("."+h+" input");""===c.val()||c.trigger("keyup"),t.onchange&&t.onchange(e.getData(r),n)}}),e.laySearch.find("input").on("keyup",function(){var i=this.value,n=a(this).parents("."+h).eq(0).siblings("."+y),l=n.children("li");l.each(function(){var e=a(this),t=e.find('input[type="checkbox"]'),n=t[0].title.indexOf(i)!==-1;e[n?"removeClass":"addClass"](c),t.data("hide",!n)}),e.renderCheckBtn();var r=l.length===n.children("li."+c).length;e.noneView(n,r?t.text.searchNone:"")})},r.that={},r.config={},l.reload=function(e,a){var t=r.that[e];return t.reload(a),r.call(t)},l.getData=function(e){var a=r.that[e];return a.getData()},l.render=function(e){var a=new x(e);return r.call(a)},e(n,l)});layui.define(["laytpl","laypage","layer","form","util"],function(e){"use strict";var t=layui.$,i=layui.laytpl,a=layui.laypage,l=layui.layer,n=layui.form,o=(layui.util,layui.hint()),r=layui.device(),c={config:{checkName:"LAY_CHECKED",indexName:"LAY_TABLE_INDEX"},cache:{},index:layui.table?layui.table.index+1e4:0,set:function(e){var i=this;return i.config=t.extend({},i.config,e),i},on:function(e,t){return layui.onevent.call(this,y,e,t)}},d=function(){var e=this,t=e.config,i=t.id||t.index;return i&&(d.that[i]=e,d.config[i]=t),{config:t,reload:function(t,i){e.reload.call(e,t,i)},setColsWidth:function(){e.setColsWidth.call(e)},resize:function(){e.resize.call(e)}}},s=function(e){var t=d.config[e];return t||o.error(e?"The table instance with ID '"+e+"' not found":"ID argument required"),t||null},u=function(e,a,l,n){var o=e.templet?function(){return"function"==typeof e.templet?e.templet(l):i(t(e.templet).html()||String(a)).render(l)}():a;return n?t("<div>"+o+"</div>").text():o},y="table",h=".layui-table",f="layui-hide",p="layui-none",v="layui-table-view",m=".layui-table-tool",g=".layui-table-box",b=".layui-table-init",x=".layui-table-header",k=".layui-table-body",C=".layui-table-main",w=".layui-table-fixed",T=".layui-table-fixed-l",N=".layui-table-fixed-r",A=".layui-table-total",L=".layui-table-page",S=".layui-table-sort",R="layui-table-edit",_="layui-table-hover",W=function(e){var t='{{#if(item2.colspan){}} colspan="{{item2.colspan}}"{{#} if(item2.rowspan){}} rowspan="{{item2.rowspan}}"{{#}}}';return e=e||{},['<table cellspacing="0" cellpadding="0" border="0" class="layui-table" ','{{# if(d.data.skin){ }}lay-skin="{{d.data.skin}}"{{# } }} {{# if(d.data.size){ }}lay-size="{{d.data.size}}"{{# } }} {{# if(d.data.even){ }}lay-even{{# } }}>',"<thead>","{{# layui.each(d.data.cols, function(i1, item1){ }}","<tr>","{{# layui.each(item1, function(i2, item2){ }}",'{{# if(item2.fixed && item2.fixed !== "right"){ left = true; } }}','{{# if(item2.fixed === "right"){ right = true; } }}',function(){return e.fixed&&"right"!==e.fixed?'{{# if(item2.fixed && item2.fixed !== "right"){ }}':"right"===e.fixed?'{{# if(item2.fixed === "right"){ }}':""}(),"{{# var isSort = !(item2.colGroup) && item2.sort; }}",'<th data-field="{{ item2.field||i2 }}" data-key="{{d.index}}-{{i1}}-{{i2}}" {{# if( item2.parentKey){ }}data-parentkey="{{ item2.parentKey }}"{{# } }} {{# if(item2.minWidth){ }}data-minwidth="{{item2.minWidth}}"{{# } }} '+t+' {{# if(item2.unresize || item2.colGroup){ }}data-unresize="true"{{# } }} class="{{# if(item2.hide){ }}layui-hide{{# } }}{{# if(isSort){ }} layui-unselect{{# } }}{{# if(!item2.field){ }} layui-table-col-special{{# } }}">','<div class="layui-table-cell laytable-cell-',"{{# if(item2.colGroup){ }}","group","{{# } else { }}","{{d.index}}-{{i1}}-{{i2}}",'{{# if(item2.type !== "normal"){ }}'," laytable-cell-{{ item2.type }}","{{# } }}","{{# } }}",'" {{#if(item2.align){}}align="{{item2.align}}"{{#}}}>','{{# if(item2.type === "checkbox"){ }}','<input type="checkbox" name="layTableCheckbox" lay-skin="primary" lay-filter="layTableAllChoose" {{# if(item2[d.data.checkName]){ }}checked{{# }; }}>',"{{# } else { }}",'<span>{{item2.title||""}}</span>',"{{# if(isSort){ }}",'<span class="layui-table-sort layui-inline"><i class="layui-edge layui-table-sort-asc" title="\u5347\u5e8f"></i><i class="layui-edge layui-table-sort-desc" title="\u964d\u5e8f"></i></span>',"{{# } }}","{{# } }}","</div>","</th>",e.fixed?"{{# }; }}":"","{{# }); }}","</tr>","{{# }); }}","</thead>","</table>"].join("")},z=['<table cellspacing="0" cellpadding="0" border="0" class="layui-table" ','{{# if(d.data.skin){ }}lay-skin="{{d.data.skin}}"{{# } }} {{# if(d.data.size){ }}lay-size="{{d.data.size}}"{{# } }} {{# if(d.data.even){ }}lay-even{{# } }}>',"<tbody></tbody>","</table>"].join(""),E=['<div class="layui-form layui-border-box {{d.VIEW_CLASS}}{{# if(d.data.className){ }} {{ d.data.className }}{{# } }}" lay-filter="LAY-table-{{d.index}}" lay-id="{{ d.data.id }}" style="{{# if(d.data.width){ }}width:{{d.data.width}}px;{{# } }} {{# if(d.data.height){ }}height:{{d.data.height}}px;{{# } }}">',"{{# if(d.data.toolbar){ }}",'<div class="layui-table-tool">','<div class="layui-table-tool-temp"></div>','<div class="layui-table-tool-self"></div>',"</div>","{{# } }}",'<div class="layui-table-box">',"{{# if(d.data.loading){ }}",'<div class="layui-table-init" style="background-color: #fff;">','<i class="layui-icon layui-icon-loading layui-anim layui-anim-rotate layui-anim-loop"></i>',"</div>","{{# } }}","{{# var left, right; }}",'<div class="layui-table-header">',W(),"</div>",'<div class="layui-table-body layui-table-main">',z,"</div>","{{# if(left){ }}",'<div class="layui-table-fixed layui-table-fixed-l">','<div class="layui-table-header">',W({fixed:!0}),"</div>",'<div class="layui-table-body">',z,"</div>","</div>","{{# }; }}","{{# if(right){ }}",'<div class="layui-table-fixed layui-table-fixed-r">','<div class="layui-table-header">',W({fixed:"right"}),'<div class="layui-table-mend"></div>',"</div>",'<div class="layui-table-body">',z,"</div>","</div>","{{# }; }}","</div>","{{# if(d.data.totalRow){ }}",'<div class="layui-table-total">','<table cellspacing="0" cellpadding="0" border="0" class="layui-table" ','{{# if(d.data.skin){ }}lay-skin="{{d.data.skin}}"{{# } }} {{# if(d.data.size){ }}lay-size="{{d.data.size}}"{{# } }} {{# if(d.data.even){ }}lay-even{{# } }}>','<tbody><tr><td><div class="layui-table-cell" style="visibility: hidden;">Total</div></td></tr></tbody>',"</table>","</div>","{{# } }}","{{# if(d.data.page){ }}",'<div class="layui-table-page">','<div id="layui-table-page{{d.index}}"></div>',"</div>","{{# } }}","<style>","{{# layui.each(d.data.cols, function(i1, item1){","layui.each(item1, function(i2, item2){ }}",".laytable-cell-{{d.index}}-{{i1}}-{{i2}}{ ","{{# if(item2.width){ }}","width: {{item2.width}}px;","{{# } }}"," }","{{# });","}); }}","</style>","</div>"].join(""),j=t(window),F=t(document),I=function(e){var i=this;i.index=++c.index,i.config=t.extend({},i.config,c.config,e),i.render()};I.prototype.config={limit:10,loading:!0,cellMinWidth:60,defaultToolbar:["filter","exports","print"],autoSort:!0,text:{none:"\u65e0\u6570\u636e"}},I.prototype.render=function(){var e=this,a=e.config;if(a.elem=t(a.elem),a.where=a.where||{},a.id=a.id||a.elem.attr("id")||e.index,a.request=t.extend({pageName:"page",limitName:"limit"},a.request),a.response=t.extend({statusName:"code",statusCode:0,msgName:"msg",dataName:"data",totalRowName:"totalRow",countName:"count"},a.response),"object"==typeof a.page&&(a.limit=a.page.limit||a.limit,a.limits=a.page.limits||a.limits,e.page=a.page.curr=a.page.curr||1,delete a.page.elem,delete a.page.jump),!a.elem[0])return e;a.height&&/^full-\d+$/.test(a.height)&&(e.fullHeightGap=a.height.split("-")[1],a.height=j.height()-e.fullHeightGap),e.setInit();var l=a.elem,n=l.next("."+v),o=e.elem=t(i(E).render({VIEW_CLASS:v,data:a,index:e.index}));if(a.index=e.index,e.key=a.id||a.index,n[0]&&n.remove(),l.after(o),e.layTool=o.find(m),e.layBox=o.find(g),e.layHeader=o.find(x),e.layMain=o.find(C),e.layBody=o.find(k),e.layFixed=o.find(w),e.layFixLeft=o.find(T),e.layFixRight=o.find(N),e.layTotal=o.find(A),e.layPage=o.find(L),e.renderToolbar(),e.fullSize(),a.cols.length>1){var r=e.layFixed.find(x).find("th");r.height(e.layHeader.height()-1-parseFloat(r.css("padding-top"))-parseFloat(r.css("padding-bottom")))}e.pullData(e.page),e.events()},I.prototype.initOpts=function(e){var t=this,i=(t.config,{checkbox:48,radio:48,space:15,numbers:40});e.checkbox&&(e.type="checkbox"),e.space&&(e.type="space"),e.type||(e.type="normal"),"normal"!==e.type&&(e.unresize=!0,e.width=e.width||i[e.type])},I.prototype.setInit=function(e){var t=this,i=t.config;return i.clientWidth=i.width||function(){var e=function(t){var a,l;t=t||i.elem.parent(),a=t.width();try{l="none"===t.css("display")}catch(n){}return!t[0]||a&&!l?a:e(t.parent())};return e()}(),"width"===e?i.clientWidth:void layui.each(i.cols,function(e,a){layui.each(a,function(l,n){if(!n)return void a.splice(l,1);if(n.key=e+"-"+l,n.hide=n.hide||!1,n.colGroup||n.colspan>1){var o=0;layui.each(i.cols[e+1],function(t,i){i.HAS_PARENT||o>1&&o==n.colspan||(i.HAS_PARENT=!0,i.parentKey=e+"-"+l,o+=parseInt(i.colspan>1?i.colspan:1))}),n.colGroup=!0}t.initOpts(n)})})},I.prototype.renderToolbar=function(){var e=this,a=e.config,l=['<div class="layui-inline" lay-event="add"><i class="layui-icon layui-icon-add-1"></i></div>','<div class="layui-inline" lay-event="update"><i class="layui-icon layui-icon-edit"></i></div>','<div class="layui-inline" lay-event="delete"><i class="layui-icon layui-icon-delete"></i></div>'].join(""),n=e.layTool.find(".layui-table-tool-temp");if("default"===a.toolbar)n.html(l);else if("string"==typeof a.toolbar){var o=t(a.toolbar).html()||"";o&&n.html(i(o).render(a))}var r={filter:{title:"\u7b5b\u9009\u5217",layEvent:"LAYTABLE_COLS",icon:"layui-icon-cols"},exports:{title:"\u5bfc\u51fa",layEvent:"LAYTABLE_EXPORT",icon:"layui-icon-export"},print:{title:"\u6253\u5370",layEvent:"LAYTABLE_PRINT",icon:"layui-icon-print"}},c=[];"object"==typeof a.defaultToolbar&&layui.each(a.defaultToolbar,function(e,t){var i="string"==typeof t?r[t]:t;i&&c.push('<div class="layui-inline" title="'+i.title+'" lay-event="'+i.layEvent+'"><i class="layui-icon '+i.icon+'"></i></div>')}),e.layTool.find(".layui-table-tool-self").html(c.join(""))},I.prototype.setParentCol=function(e,t){var i=this,a=i.config,l=i.layHeader.find('th[data-key="'+a.index+"-"+t+'"]'),n=parseInt(l.attr("colspan"))||0;if(l[0]){var o=t.split("-"),r=a.cols[o[0]][o[1]];e?n--:n++,l.attr("colspan",n),l[n<1?"addClass":"removeClass"](f),r.colspan=n,r.hide=n<1;var c=l.data("parentkey");c&&i.setParentCol(e,c)}},I.prototype.setColsPatch=function(){var e=this,t=e.config;layui.each(t.cols,function(t,i){layui.each(i,function(t,i){i.hide&&e.setParentCol(i.hide,i.parentKey)})})},I.prototype.setColsWidth=function(){var e=this,t=e.config,i=0,a=0,l=0,n=0,o=e.setInit("width");e.eachCols(function(e,t){t.hide||i++}),o=o-function(){return"line"===t.skin||"nob"===t.skin?2:i+1}()-e.getScrollWidth(e.layMain[0])-1;var r=function(e){layui.each(t.cols,function(i,r){layui.each(r,function(i,c){var d=0,s=c.minWidth||t.cellMinWidth;return c?void(c.colGroup||c.hide||(e?l&&l<s&&(a--,d=s):(d=c.width||0,/\d+%$/.test(d)?(d=Math.floor(parseFloat(d)/100*o),d<s&&(d=s)):d||(c.width=d=0,a++)),c.hide&&(d=0),n+=d)):void r.splice(i,1)})}),o>n&&a&&(l=(o-n)/a)};r(),r(!0),e.autoColNums=a,e.eachCols(function(i,a){var n=a.minWidth||t.cellMinWidth;a.colGroup||a.hide||(0===a.width?e.getCssRule(t.index+"-"+a.key,function(e){e.style.width=Math.floor(l>=n?l:n)+"px"}):/\d+%$/.test(a.width)&&e.getCssRule(t.index+"-"+a.key,function(e){e.style.width=Math.floor(parseFloat(a.width)/100*o)+"px"}))});var c=e.layMain.width()-e.getScrollWidth(e.layMain[0])-e.layMain.children("table").outerWidth();if(e.autoColNums&&c>=-i&&c<=i){var d=function(t){var i;return t=t||e.layHeader.eq(0).find("thead th:last-child"),i=t.data("field"),!i&&t.prev()[0]?d(t.prev()):t},s=d(),u=s.data("key");e.getCssRule(u,function(t){var i=t.style.width||s.outerWidth();t.style.width=parseFloat(i)+c+"px",e.layMain.height()-e.layMain.prop("clientHeight")>0&&(t.style.width=parseFloat(t.style.width)-1+"px")})}e.loading(!0)},I.prototype.resize=function(){var e=this;e.fullSize(),e.setColsWidth(),e.scrollPatch()},I.prototype.reload=function(e,i){var a=this;e=e||{},delete a.haveInit,layui.each(e,function(e,t){"array"===layui._typeof(t)&&delete a.config[e]}),a.config=t.extend(i,{},a.config,e),a.render()},I.prototype.errorView=function(e){var i=this,a=i.layMain.find("."+p),l=t('<div class="'+p+'">'+(e||"Error")+"</div>");a[0]&&(i.layNone.remove(),a.remove()),i.layFixed.addClass(f),i.layMain.find("tbody").html(""),i.layMain.append(i.layNone=l),c.cache[i.key]=[]},I.prototype.page=1,I.prototype.pullData=function(e){var i=this,a=i.config,l=a.request,n=a.response,o=function(){"object"==typeof a.initSort&&i.sort(a.initSort.field,a.initSort.type)};if(i.startTime=(new Date).getTime(),a.url){var r={};r[l.pageName]=e,r[l.limitName]=a.limit;var c=t.extend(r,a.where);a.contentType&&0==a.contentType.indexOf("application/json")&&(c=JSON.stringify(c)),i.loading(),t.ajax({type:a.method||"get",url:a.url,contentType:a.contentType,data:c,dataType:"json",headers:a.headers||{},success:function(t){"function"==typeof a.parseData&&(t=a.parseData(t)||t),t[n.statusName]!=n.statusCode?(i.renderForm(),i.errorView(t[n.msgName]||'\u8fd4\u56de\u7684\u6570\u636e\u4e0d\u7b26\u5408\u89c4\u8303\uff0c\u6b63\u786e\u7684\u6210\u529f\u72b6\u6001\u7801\u5e94\u4e3a\uff1a"'+n.statusName+'": '+n.statusCode)):(i.renderData(t,e,t[n.countName]),o(),a.time=(new Date).getTime()-i.startTime+" ms"),i.setColsWidth(),"function"==typeof a.done&&a.done(t,e,t[n.countName])},error:function(e,t){i.errorView("\u8bf7\u6c42\u5f02\u5e38\uff0c\u9519\u8bef\u63d0\u793a\uff1a"+t),i.renderForm(),i.setColsWidth(),"function"==typeof a.error&&a.error(e,t)}})}else if(a.data&&a.data.constructor===Array){var d={},s=e*a.limit-a.limit;d[n.dataName]=a.data.concat().splice(s,a.limit),d[n.countName]=a.data.length,"object"==typeof a.totalRow&&(d[n.totalRowName]=t.extend({},a.totalRow)),i.renderData(d,e,d[n.countName]),o(),i.setColsWidth(),"function"==typeof a.done&&a.done(d,e,d[n.countName])}},I.prototype.eachCols=function(e){var t=this;return c.eachCols(null,e,t.config.cols),t},I.prototype.renderData=function(e,n,o,r){var d=this,s=d.config,y=e[s.response.dataName]||[],h=e[s.response.totalRowName],v=[],m=[],g=[],b=function(){var e;return!r&&d.sortKey?d.sort(d.sortKey.field,d.sortKey.sort,!0):(layui.each(y,function(a,l){var o=[],y=[],h=[],p=a+s.limit*(n-1)+1;"array"===layui._typeof(l)&&0===l.length||(r||(l[c.config.indexName]=a),d.eachCols(function(n,r){var d=r.field||n,v=s.index+"-"+r.key,m=l[d];if(void 0!==m&&null!==m||(m=""),!r.colGroup){var g=['<td data-field="'+d+'" data-key="'+v+'" '+function(){var e=[];return r.edit&&e.push('data-edit="'+r.edit+'"'),r.align&&e.push('align="'+r.align+'"'),r.templet&&e.push('data-content="'+m+'"'),r.toolbar&&e.push('data-off="true"'),r.event&&e.push('lay-event="'+r.event+'"'),r.style&&e.push('style="'+r.style+'"'),r.minWidth&&e.push('data-minwidth="'+r.minWidth+'"'),e.join(" ")}()+' class="'+function(){var e=[];return r.hide&&e.push(f),r.field||e.push("layui-table-col-special"),e.join(" ")}()+'">','<div class="layui-table-cell laytable-cell-'+function(){return"normal"===r.type?v:v+" laytable-cell-"+r.type}()+'">'+function(){var n=t.extend(!0,{LAY_INDEX:p},l),o=c.config.checkName;switch(r.type){case"checkbox":return'<input type="checkbox" name="layTableCheckbox" lay-skin="primary" '+function(){return r[o]?(l[o]=r[o],r[o]?"checked":""):n[o]?"checked":""}()+">";case"radio":return n[o]&&(e=a),'<input type="radio" name="layTableRadio_'+s.index+'" '+(n[o]?"checked":"")+' lay-type="layTableRadio">';case"numbers":return p}return r.toolbar?i(t(r.toolbar).html()||"").render(n):u(r,m,n)}(),"</div></td>"].join("");o.push(g),r.fixed&&"right"!==r.fixed&&y.push(g),"right"===r.fixed&&h.push(g)}}),v.push('<tr data-index="'+a+'">'+o.join("")+"</tr>"),m.push('<tr data-index="'+a+'">'+y.join("")+"</tr>"),g.push('<tr data-index="'+a+'">'+h.join("")+"</tr>"))}),d.layBody.scrollTop(0),d.layMain.find("."+p).remove(),d.layMain.find("tbody").html(v.join("")),d.layFixLeft.find("tbody").html(m.join("")),d.layFixRight.find("tbody").html(g.join("")),d.renderForm(),"number"==typeof e&&d.setThisRowChecked(e),d.syncCheckAll(),d.haveInit?d.scrollPatch():setTimeout(function(){d.scrollPatch()},50),d.haveInit=!0,l.close(d.tipsIndex),s.HAS_SET_COLS_PATCH||d.setColsPatch(),void(s.HAS_SET_COLS_PATCH=!0))};return c.cache[d.key]=y,d.layPage[0==o||0===y.length&&1==n?"addClass":"removeClass"](f),0===y.length?(d.renderForm(),d.errorView(s.text.none)):(d.layFixed.removeClass(f),r?b():(b(),d.renderTotal(y,h),void(s.page&&(s.page=t.extend({elem:"layui-table-page"+s.index,count:o,limit:s.limit,limits:s.limits||[10,20,30,40,50,60,70,80,90],groups:3,layout:["prev","page","next","skip","count","limit"],prev:'<i class="layui-icon">&#xe603;</i>',next:'<i class="layui-icon">&#xe602;</i>',jump:function(e,t){t||(d.page=e.curr,s.limit=e.limit,d.pullData(e.curr))}},s.page),s.page.count=o,a.render(s.page)))))},I.prototype.renderTotal=function(e,a){var l=this,n=l.config,o={};if(n.totalRow){layui.each(e,function(e,t){0!==t.length&&l.eachCols(function(e,i){var a=i.field||e,l=t[a];i.totalRow&&(o[a]=(o[a]||0)+(parseFloat(l)||0))})}),l.dataTotal={};var r=[];l.eachCols(function(e,c){var d=c.field||e,s=function(){var e,t=c.totalRowText||"",i=parseFloat(o[d]).toFixed(2),l={};return l[d]=i,e=c.totalRow?u(c,i,l)||t:t,a?a[c.field]||e:e}(),y=['<td data-field="'+d+'" data-key="'+n.index+"-"+c.key+'" '+function(){var e=[];return c.align&&e.push('align="'+c.align+'"'),c.style&&e.push('style="'+c.style+'"'),c.minWidth&&e.push('data-minwidth="'+c.minWidth+'"'),e.join(" ")}()+' class="'+function(){var e=[];return c.hide&&e.push(f),c.field||e.push("layui-table-col-special"),e.join(" ")}()+'">','<div class="layui-table-cell laytable-cell-'+function(){var e=n.index+"-"+c.key;return"normal"===c.type?e:e+" laytable-cell-"+c.type}()+'">'+function(){var e=c.totalRow||n.totalRow;return"string"==typeof e?i(e).render(t.extend({TOTAL_NUMS:s},c)):s}(),"</div></td>"].join("");c.field&&(l.dataTotal[d]=s),r.push(y)}),l.layTotal.find("tbody").html("<tr>"+r.join("")+"</tr>")}},I.prototype.getColElem=function(e,t){var i=this,a=i.config;return e.eq(0).find(".laytable-cell-"+(a.index+"-"+t)+":eq(0)")},I.prototype.renderForm=function(e){n.render(e,"LAY-table-"+this.index)},I.prototype.setThisRowChecked=function(e){var t=this,i=(t.config,"layui-table-click"),a=t.layBody.find('tr[data-index="'+e+'"]');a.addClass(i).siblings("tr").removeClass(i)},I.prototype.sort=function(e,i,a,l){var n,r,d=this,s={},u=d.config,h=u.elem.attr("lay-filter"),f=c.cache[d.key];"string"==typeof e&&(n=e,d.layHeader.find("th").each(function(i,a){var l=t(this),o=l.data("field");if(o===e)return e=l,n=o,!1}));try{var n=n||e.data("field"),p=e.data("key");if(d.sortKey&&!a&&n===d.sortKey.field&&i===d.sortKey.sort)return;var v=d.layHeader.find("th .laytable-cell-"+p).find(S);d.layHeader.find("th").find(S).removeAttr("lay-sort"),v.attr("lay-sort",i||null),d.layFixed.find("th")}catch(m){o.error("Table modules: sort field '"+n+"' not matched")}d.sortKey={field:n,sort:i},u.autoSort&&("asc"===i?r=layui.sort(f,n):"desc"===i?r=layui.sort(f,n,!0):(r=layui.sort(f,c.config.indexName),delete d.sortKey)),s[u.response.dataName]=r||f,d.renderData(s,d.page,d.count,!0),l&&layui.event.call(e,y,"sort("+h+")",{field:n,type:i})},I.prototype.loading=function(e){var i=this,a=i.config;a.loading&&(e?(i.layInit&&i.layInit.remove(),delete i.layInit,i.layBox.find(b).remove()):(i.layInit=t(['<div class="layui-table-init">','<i class="layui-icon layui-icon-loading layui-anim layui-anim-rotate layui-anim-loop"></i>',"</div>"].join("")),i.layBox.append(i.layInit)))},I.prototype.setCheckData=function(e,t){var i=this,a=i.config,l=c.cache[i.key];l[e]&&l[e].constructor!==Array&&(l[e][a.checkName]=t)},I.prototype.syncCheckAll=function(){var e=this,t=e.config,i=e.layHeader.find('input[name="layTableCheckbox"]'),a=function(i){return e.eachCols(function(e,a){"checkbox"===a.type&&(a[t.checkName]=i)}),i};i[0]&&(c.checkStatus(e.key).isAll?(i[0].checked||(i.prop("checked",!0),e.renderForm("checkbox")),a(!0)):(i[0].checked&&(i.prop("checked",!1),e.renderForm("checkbox")),a(!1)))},I.prototype.getCssRule=function(e,t){var i=this,a=i.elem.find("style")[0],l=a.sheet||a.styleSheet||{},n=l.cssRules||l.rules;layui.each(n,function(i,a){if(a.selectorText===".laytable-cell-"+e)return t(a),!0})},I.prototype.fullSize=function(){var e,t=this,i=t.config,a=i.height;t.fullHeightGap&&(a=j.height()-t.fullHeightGap,a<135&&(a=135),t.elem.css("height",a)),a&&(e=parseFloat(a)-(t.layHeader.outerHeight()||38),i.toolbar&&(e-=t.layTool.outerHeight()||50),i.totalRow&&(e-=t.layTotal.outerHeight()||40),i.page&&(e-=t.layPage.outerHeight()||41),t.layMain.css("height",e-2))},I.prototype.getScrollWidth=function(e){var t=0;return e?t=e.offsetWidth-e.clientWidth:(e=document.createElement("div"),e.style.width="100px",e.style.height="100px",e.style.overflowY="scroll",document.body.appendChild(e),t=e.offsetWidth-e.clientWidth,document.body.removeChild(e)),t},I.prototype.scrollPatch=function(){var e=this,i=e.layMain.children("table"),a=e.layMain.width()-e.layMain.prop("clientWidth"),l=e.layMain.height()-e.layMain.prop("clientHeight"),n=(e.getScrollWidth(e.layMain[0]),i.outerWidth()-e.layMain.width()),o=function(e){if(a&&l){if(e=e.eq(0),!e.find(".layui-table-patch")[0]){var i=t('<th class="layui-table-patch"><div class="layui-table-cell"></div></th>');i.find("div").css({width:a}),e.find("tr").append(i)}}else e.find(".layui-table-patch").remove()};o(e.layHeader),o(e.layTotal);var r=e.layMain.height(),c=r-l;e.layFixed.find(k).css("height",i.height()>=c?c:"auto"),e.layFixRight[n>0?"removeClass":"addClass"](f),e.layFixRight.css("right",a-1)},I.prototype.events=function(){var e,i=this,a=i.config,o=t("body"),d={},s=i.layHeader.find("th"),h=".layui-table-cell",p=a.elem.attr("lay-filter");i.layTool.on("click","*[lay-event]",function(e){var o=t(this),d=o.attr("lay-event"),s=function(e){var l=t(e.list),n=t('<ul class="layui-table-tool-panel"></ul>');n.html(l),a.height&&n.css("max-height",a.height-(i.layTool.outerHeight()||50)),o.find(".layui-table-tool-panel")[0]||o.append(n),i.renderForm(),n.on("click",function(e){layui.stope(e)}),e.done&&e.done(n,l)};switch(layui.stope(e),F.trigger("table.tool.panel.remove"),l.close(i.tipsIndex),d){case"LAYTABLE_COLS":s({list:function(){var e=[];return i.eachCols(function(t,i){i.field&&"normal"==i.type&&e.push('<li><input type="checkbox" name="'+i.field+'" data-key="'+i.key+'" data-parentkey="'+(i.parentKey||"")+'" lay-skin="primary" '+(i.hide?"":"checked")+' title="'+(i.title||i.field)+'" lay-filter="LAY_TABLE_TOOL_COLS"></li>')}),e.join("")}(),done:function(){n.on("checkbox(LAY_TABLE_TOOL_COLS)",function(e){var l=t(e.elem),n=this.checked,o=l.data("key"),r=l.data("parentkey");layui.each(a.cols,function(e,t){layui.each(t,function(t,l){if(e+"-"+t===o){var c=l.hide;l.hide=!n,i.elem.find('*[data-key="'+a.index+"-"+o+'"]')[n?"removeClass":"addClass"](f),c!=l.hide&&i.setParentCol(!n,r),i.resize()}})})})}});break;case"LAYTABLE_EXPORT":r.ie?l.tips("\u5bfc\u51fa\u529f\u80fd\u4e0d\u652f\u6301 IE\uff0c\u8bf7\u7528 Chrome \u7b49\u9ad8\u7ea7\u6d4f\u89c8\u5668\u5bfc\u51fa",this,{tips:3}):s({list:function(){return['<li data-type="csv">\u5bfc\u51fa\u5230 Csv \u6587\u4ef6</li>','<li data-type="xls">\u5bfc\u51fa\u5230 Excel \u6587\u4ef6</li>'].join("")}(),done:function(e,l){l.on("click",function(){var e=t(this).data("type");c.exportFile.call(i,a.id,null,e)})}});break;case"LAYTABLE_PRINT":var u=window.open("\u6253\u5370\u7a97\u53e3","_blank"),h=["<style>","body{font-size: 12px; color: #666;}","table{width: 100%; border-collapse: collapse; border-spacing: 0;}","th,td{line-height: 20px; padding: 9px 15px; border: 1px solid #ccc; text-align: left; font-size: 12px; color: #666;}","a{color: #666; text-decoration:none;}","*.layui-hide{display: none}","</style>"].join(""),v=t(i.layHeader.html());v.append(i.layMain.find("table").html()),v.append(i.layTotal.find("table").html()),v.find("th.layui-table-patch").remove(),v.find(".layui-table-col-special").remove(),u.document.write(h+v.prop("outerHTML")),u.document.close(),u.print(),u.close()}layui.event.call(this,y,"toolbar("+p+")",t.extend({event:d,config:a},{}))}),s.on("mousemove",function(e){var i=t(this),a=i.offset().left,l=e.clientX-a;i.data("unresize")||d.resizeStart||(d.allowResize=i.width()-l<=10,o.css("cursor",d.allowResize?"col-resize":""))}).on("mouseleave",function(){t(this);d.resizeStart||o.css("cursor","")}).on("mousedown",function(e){var l=t(this);if(d.allowResize){var n=l.data("key");e.preventDefault(),d.resizeStart=!0,d.offset=[e.clientX,e.clientY],i.getCssRule(n,function(e){var t=e.style.width||l.outerWidth();d.rule=e,d.ruleWidth=parseFloat(t),d.minWidth=l.data("minwidth")||a.cellMinWidth})}}),F.on("mousemove",function(t){if(d.resizeStart){if(t.preventDefault(),d.rule){var a=d.ruleWidth+t.clientX-d.offset[0];a<d.minWidth&&(a=d.minWidth),d.rule.style.width=a+"px",l.close(i.tipsIndex)}e=1}}).on("mouseup",function(t){d.resizeStart&&(d={},o.css("cursor",""),i.scrollPatch()),2===e&&(e=null)}),s.on("click",function(a){var l,n=t(this),o=n.find(S),r=o.attr("lay-sort");return o[0]&&1!==e?(l="asc"===r?"desc":"desc"===r?null:"asc",void i.sort(n,l,null,!0)):e=2}).find(S+" .layui-edge ").on("click",function(e){var a=t(this),l=a.index(),n=a.parents("th").eq(0).data("field");layui.stope(e),0===l?i.sort(n,"asc",null,!0):i.sort(n,"desc",null,!0)});var v=function(e){var a=t(this),l=a.parents("tr").eq(0).data("index"),n=i.layBody.find('tr[data-index="'+l+'"]'),o=c.cache[i.key]||[];return o=o[l]||{},t.extend({tr:n,data:c.clearCacheKey(o),del:function(){c.cache[i.key][l]=[],n.remove(),i.scrollPatch()},update:function(e){e=e||{},layui.each(e,function(e,t){if(e in o){var a,l=n.children('td[data-field="'+e+'"]');o[e]=t,i.eachCols(function(t,i){i.field==e&&i.templet&&(a=i.templet)}),l.children(h).html(u({templet:a},t,o)),l.data("content",t)}})}},e)};i.elem.on("click",'input[name="layTableCheckbox"]+',function(){var e=t(this).prev(),a=i.layBody.find('input[name="layTableCheckbox"]'),l=e.parents("tr").eq(0).data("index"),n=e[0].checked,o="layTableAllChoose"===e.attr("lay-filter");o?(a.each(function(e,t){t.checked=n,i.setCheckData(e,n)}),i.syncCheckAll(),i.renderForm("checkbox")):(i.setCheckData(l,n),i.syncCheckAll()),layui.event.call(e[0],y,"checkbox("+p+")",v.call(e[0],{checked:n,type:o?"all":"one"}))}),i.elem.on("click",'input[lay-type="layTableRadio"]+',function(){var e=t(this).prev(),l=e[0].checked,n=c.cache[i.key],o=e.parents("tr").eq(0).data("index");layui.each(n,function(e,t){o===e?t[a.checkName]=!0:delete t[a.checkName]}),i.setThisRowChecked(o),layui.event.call(this,y,"radio("+p+")",v.call(this,{checked:l}))}),i.layBody.on("mouseenter","tr",function(){var e=t(this),a=e.index();e.data("off")||i.layBody.find("tr:eq("+a+")").addClass(_)}).on("mouseleave","tr",function(){var e=t(this),a=e.index();e.data("off")||i.layBody.find("tr:eq("+a+")").removeClass(_)}).on("click","tr",function(){m.call(this,"row")}).on("dblclick","tr",function(){m.call(this,"rowDouble")});var m=function(e){var i=t(this);i.data("off")||layui.event.call(this,y,e+"("+p+")",v.call(i.children("td")[0]))};i.layBody.on("change","."+R,function(){var e=t(this),a=this.value,l=e.parent().data("field"),n=e.parents("tr").eq(0).data("index"),o=c.cache[i.key][n];o[l]=a,layui.event.call(this,y,"edit("+p+")",v.call(this,{value:a,field:l}))}).on("blur","."+R,function(){var e,a=t(this),l=this,n=a.parent().data("field"),o=a.parents("tr").eq(0).data("index"),r=c.cache[i.key][o];i.eachCols(function(t,i){i.field==n&&i.templet&&(e=i.templet)}),a.siblings(h).html(function(t){return u({templet:e},t,r)}(l.value)),a.parent().data("content",l.value),a.remove()}),i.layBody.on("click","td",function(e){var i=t(this),a=(i.data("field"),i.data("edit")),l=i.children(h);if(!i.data("off")&&a){var n=t('<input class="layui-input '+R+'">');return n[0].value=i.data("content")||l.text(),i.find("."+R)[0]||i.append(n),n.focus(),void layui.stope(e)}}).on("mouseenter","td",function(){b.call(this)}).on("mouseleave","td",function(){b.call(this,"hide")});var g="layui-table-grid-down",b=function(e){var i=t(this),a=i.children(h);if(!i.data("off"))if(e)i.find(".layui-table-grid-down").remove();else if(a.prop("scrollWidth")>a.outerWidth()){if(a.find("."+g)[0])return;i.append('<div class="'+g+'"><i class="layui-icon layui-icon-down"></i></div>')}};i.layBody.on("click","."+g,function(e){var n=t(this),o=n.parent(),c=o.children(h);i.tipsIndex=l.tips(['<div class="layui-table-tips-main" style="margin-top: -'+(c.height()+16)+"px;"+function(){return"sm"===a.size?"padding: 4px 15px; font-size: 12px;":"lg"===a.size?"padding: 14px 15px;":""}()+'">',c.html(),"</div>",'<i class="layui-icon layui-table-tips-c layui-icon-close"></i>'].join(""),c[0],{tips:[3,""],time:-1,anim:-1,maxWidth:r.ios||r.android?300:i.elem.width()/2,isOutAnim:!1,skin:"layui-table-tips",success:function(e,t){e.find(".layui-table-tips-c").on("click",function(){l.close(t)})}}),layui.stope(e)}),i.layBody.on("click","*[lay-event]",function(){var e=t(this),a=e.parents("tr").eq(0).data("index");layui.event.call(this,y,"tool("+p+")",v.call(this,{event:e.attr("lay-event")})),i.setThisRowChecked(a)}),i.layMain.on("scroll",function(){var e=t(this),a=e.scrollLeft(),n=e.scrollTop();i.layHeader.scrollLeft(a),i.layTotal.scrollLeft(a),i.layFixed.find(k).scrollTop(n),l.close(i.tipsIndex)}),j.on("resize",function(){i.resize()})},function(){F.on("click",function(){F.trigger("table.remove.tool.panel")}),F.on("table.remove.tool.panel",function(){t(".layui-table-tool-panel").remove()})}(),c.init=function(e,i){i=i||{};var a=this,l=t(e?'table[lay-filter="'+e+'"]':h+"[lay-data]"),n="Table element property lay-data configuration item has a syntax error: ";return l.each(function(){var a=t(this),l=a.attr("lay-data");try{l=new Function("return "+l)()}catch(r){o.error(n+l,"error")}var d=[],s=t.extend({elem:this,cols:[],data:[],skin:a.attr("lay-skin"),size:a.attr("lay-size"),even:"string"==typeof a.attr("lay-even")},c.config,i,l);e&&a.hide(),a.find("thead>tr").each(function(e){s.cols[e]=[],t(this).children().each(function(i){var a=t(this),l=a.attr("lay-data");try{l=new Function("return "+l)()}catch(r){return o.error(n+l)}var c=t.extend({title:a.text(),colspan:a.attr("colspan")||0,rowspan:a.attr("rowspan")||0},l);c.colspan<2&&d.push(c),s.cols[e].push(c)})}),a.find("tbody>tr").each(function(e){var i=t(this),a={};i.children("td").each(function(e,i){var l=t(this),n=l.data("field");if(n)return a[n]=l.html()}),layui.each(d,function(e,t){var l=i.children("td").eq(e);a[t.field]=l.html()}),s.data[e]=a}),c.render(s)}),a},d.that={},d.config={},c.eachCols=function(e,i,a){var l=d.config[e]||{},n=[],o=0;a=t.extend(!0,[],a||l.cols),layui.each(a,function(e,t){layui.each(t,function(t,i){if(i.colGroup){var l=0;o++,i.CHILD_COLS=[],layui.each(a[e+1],function(e,t){t.PARENT_COL_INDEX||l>1&&l==i.colspan||(t.PARENT_COL_INDEX=o,i.CHILD_COLS.push(t),l+=parseInt(t.colspan>1?t.colspan:1))})}i.PARENT_COL_INDEX||n.push(i)})});var r=function(e){layui.each(e||n,function(e,t){return t.CHILD_COLS?r(t.CHILD_COLS):void("function"==typeof i&&i(e,t))})};r()},c.checkStatus=function(e){var t=0,i=0,a=[],l=c.cache[e]||[];return layui.each(l,function(e,l){return l.constructor===Array?void i++:void(l[c.config.checkName]&&(t++,a.push(c.clearCacheKey(l))))}),{data:a,isAll:!!l.length&&t===l.length-i}},c.getData=function(e){var t=[],i=c.cache[e]||[];return layui.each(i,function(e,i){i.constructor!==Array&&t.push(c.clearCacheKey(i))}),t},c.exportFile=function(e,t,i){var a=this;t=t||c.clearCacheKey(c.cache[e]),i=i||"csv";var l=d.config[e]||{},n={csv:"text/csv",xls:"application/vnd.ms-excel"}[i],s=document.createElement("a");return r.ie?o.error("IE_NOT_SUPPORT_EXPORTS"):(s.href="data:"+n+";charset=utf-8,\ufeff"+encodeURIComponent(function(){var i=[],l=[],n=[];return layui.each(t,function(t,a){var n=[];"object"==typeof e?(layui.each(e,function(e,a){0==t&&i.push(a||"")}),layui.each(c.clearCacheKey(a),function(e,t){n.push('"'+(t||"")+'"')})):c.eachCols(e,function(e,l){if(l.field&&"normal"==l.type&&!l.hide){var o=a[l.field];void 0!==o&&null!==o||(o=""),0==t&&i.push(l.title||""),n.push('"'+u(l,o,a,"text")+'"')}}),l.push(n.join(","))}),layui.each(a.dataTotal,function(e,t){n.push(t)}),i.join(",")+"\r\n"+l.join("\r\n")+"\r\n"+n.join(",")}()),s.download=(l.title||"table_"+(l.index||""))+"."+i,document.body.appendChild(s),s.click(),void document.body.removeChild(s))},c.resize=function(e){if(e){var t=s(e);if(!t)return;d.that[e].resize()}else layui.each(d.that,function(){this.resize()})},c.reload=function(e,t,i){var a=s(e);if(a){var l=d.that[e];return l.reload(t,i),d.call(l)}},c.render=function(e){
+var t=new I(e);return d.call(t)},c.clearCacheKey=function(e){return e=t.extend({},e),delete e[c.config.checkName],delete e[c.config.indexName],e},t(function(){c.init()}),e(y,c)});layui.define("jquery",function(e){"use strict";var i=layui.$,n=(layui.hint(),layui.device(),{config:{},set:function(e){var n=this;return n.config=i.extend({},n.config,e),n},on:function(e,i){return layui.onevent.call(this,t,e,i)}}),t="carousel",a="layui-this",l=">*[carousel-item]>*",o="layui-carousel-left",r="layui-carousel-right",d="layui-carousel-prev",s="layui-carousel-next",u="layui-carousel-arrow",c="layui-carousel-ind",m=function(e){var t=this;t.config=i.extend({},t.config,n.config,e),t.render()};m.prototype.config={width:"600px",height:"280px",full:!1,arrow:"hover",indicator:"inside",autoplay:!0,interval:3e3,anim:"",trigger:"click",index:0},m.prototype.render=function(){var e=this,n=e.config;n.elem=i(n.elem),n.elem[0]&&(e.elemItem=n.elem.find(l),n.index<0&&(n.index=0),n.index>=e.elemItem.length&&(n.index=e.elemItem.length-1),n.interval<800&&(n.interval=800),n.full?n.elem.css({position:"fixed",width:"100%",height:"100%",zIndex:9999}):n.elem.css({width:n.width,height:n.height}),n.elem.attr("lay-anim",n.anim),e.elemItem.eq(n.index).addClass(a),e.elemItem.length<=1||(e.indicator(),e.arrow(),e.autoplay(),e.events()))},m.prototype.reload=function(e){var n=this;clearInterval(n.timer),n.config=i.extend({},n.config,e),n.render()},m.prototype.prevIndex=function(){var e=this,i=e.config,n=i.index-1;return n<0&&(n=e.elemItem.length-1),n},m.prototype.nextIndex=function(){var e=this,i=e.config,n=i.index+1;return n>=e.elemItem.length&&(n=0),n},m.prototype.addIndex=function(e){var i=this,n=i.config;e=e||1,n.index=n.index+e,n.index>=i.elemItem.length&&(n.index=0)},m.prototype.subIndex=function(e){var i=this,n=i.config;e=e||1,n.index=n.index-e,n.index<0&&(n.index=i.elemItem.length-1)},m.prototype.autoplay=function(){var e=this,i=e.config;i.autoplay&&(clearInterval(e.timer),e.timer=setInterval(function(){e.slide()},i.interval))},m.prototype.arrow=function(){var e=this,n=e.config,t=i(['<button class="layui-icon '+u+'" lay-type="sub">'+("updown"===n.anim?"&#xe619;":"&#xe603;")+"</button>",'<button class="layui-icon '+u+'" lay-type="add">'+("updown"===n.anim?"&#xe61a;":"&#xe602;")+"</button>"].join(""));n.elem.attr("lay-arrow",n.arrow),n.elem.find("."+u)[0]&&n.elem.find("."+u).remove(),n.elem.append(t),t.on("click",function(){var n=i(this),t=n.attr("lay-type");e.slide(t)})},m.prototype.indicator=function(){var e=this,n=e.config,t=e.elemInd=i(['<div class="'+c+'"><ul>',function(){var i=[];return layui.each(e.elemItem,function(e){i.push("<li"+(n.index===e?' class="layui-this"':"")+"></li>")}),i.join("")}(),"</ul></div>"].join(""));n.elem.attr("lay-indicator",n.indicator),n.elem.find("."+c)[0]&&n.elem.find("."+c).remove(),n.elem.append(t),"updown"===n.anim&&t.css("margin-top",-(t.height()/2)),t.find("li").on("hover"===n.trigger?"mouseover":n.trigger,function(){var t=i(this),a=t.index();a>n.index?e.slide("add",a-n.index):a<n.index&&e.slide("sub",n.index-a)})},m.prototype.slide=function(e,i){var n=this,l=n.elemItem,u=n.config,c=u.index,m=u.elem.attr("lay-filter");n.haveSlide||("sub"===e?(n.subIndex(i),l.eq(u.index).addClass(d),setTimeout(function(){l.eq(c).addClass(r),l.eq(u.index).addClass(r)},50)):(n.addIndex(i),l.eq(u.index).addClass(s),setTimeout(function(){l.eq(c).addClass(o),l.eq(u.index).addClass(o)},50)),setTimeout(function(){l.removeClass(a+" "+d+" "+s+" "+o+" "+r),l.eq(u.index).addClass(a),n.haveSlide=!1},300),n.elemInd.find("li").eq(u.index).addClass(a).siblings().removeClass(a),n.haveSlide=!0,layui.event.call(this,t,"change("+m+")",{index:u.index,prevIndex:c,item:l.eq(u.index)}))},m.prototype.events=function(){var e=this,i=e.config;i.elem.data("haveEvents")||(i.elem.on("mouseenter",function(){clearInterval(e.timer)}).on("mouseleave",function(){e.autoplay()}),i.elem.data("haveEvents",!0))},n.render=function(e){var i=new m(e);return i},e(t,n)});layui.define("jquery",function(e){"use strict";var a=layui.jquery,l={config:{},index:layui.rate?layui.rate.index+1e4:0,set:function(e){var l=this;return l.config=a.extend({},l.config,e),l},on:function(e,a){return layui.onevent.call(this,n,e,a)}},i=function(){var e=this,a=e.config;return{setvalue:function(a){e.setvalue.call(e,a)},config:a}},n="rate",t="layui-rate",o="layui-icon-rate",u="layui-icon-rate-solid",s="layui-icon-rate-half",r="layui-icon-rate-solid layui-icon-rate-half",c="layui-icon-rate-solid layui-icon-rate",f="layui-icon-rate layui-icon-rate-half",v=function(e){var i=this;i.index=++l.index,i.config=a.extend({},i.config,l.config,e),i.render()};v.prototype.config={length:5,text:!1,readonly:!1,half:!1,value:0,theme:""},v.prototype.render=function(){var e=this,l=e.config,i=l.theme?'style="color: '+l.theme+';"':"";l.elem=a(l.elem),l.value>l.length&&(l.value=l.length),parseInt(l.value)!==l.value&&(l.half||(l.value=Math.ceil(l.value)-l.value<.5?Math.ceil(l.value):Math.floor(l.value)));for(var n='<ul class="layui-rate" '+(l.readonly?"readonly":"")+">",s=1;s<=l.length;s++){var r='<li class="layui-inline"><i class="layui-icon '+(s>Math.floor(l.value)?o:u)+'" '+i+"></i></li>";l.half&&parseInt(l.value)!==l.value&&s==Math.ceil(l.value)?n=n+'<li><i class="layui-icon layui-icon-rate-half" '+i+"></i></li>":n+=r}n+="</ul>"+(l.text?'<span class="layui-inline">'+l.value+"\u661f":"")+"</span>";var c=l.elem,f=c.next("."+t);f[0]&&f.remove(),e.elemTemp=a(n),l.span=e.elemTemp.next("span"),l.setText&&l.setText(l.value),c.html(e.elemTemp),c.addClass("layui-inline"),l.readonly||e.action()},v.prototype.setvalue=function(e){var a=this,l=a.config;l.value=e,a.render()},v.prototype.action=function(){var e=this,l=e.config,i=e.elemTemp,n=i.find("i").width();i.children("li").each(function(e){var t=e+1,v=a(this);v.on("click",function(e){if(l.value=t,l.half){var o=e.pageX-a(this).offset().left;o<=n/2&&(l.value=l.value-.5)}l.text&&i.next("span").text(l.value+"\u661f"),l.choose&&l.choose(l.value),l.setText&&l.setText(l.value)}),v.on("mousemove",function(e){if(i.find("i").each(function(){a(this).addClass(o).removeClass(r)}),i.find("i:lt("+t+")").each(function(){a(this).addClass(u).removeClass(f)}),l.half){var c=e.pageX-a(this).offset().left;c<=n/2&&v.children("i").addClass(s).removeClass(u)}}),v.on("mouseleave",function(){i.find("i").each(function(){a(this).addClass(o).removeClass(r)}),i.find("i:lt("+Math.floor(l.value)+")").each(function(){a(this).addClass(u).removeClass(f)}),l.half&&parseInt(l.value)!==l.value&&i.children("li:eq("+Math.floor(l.value)+")").children("i").addClass(s).removeClass(c)})})},v.prototype.events=function(){var e=this;e.config},l.render=function(e){var a=new v(e);return i.call(a)},e(n,l)});layui.define("jquery",function(e){"use strict";var l=layui.$,o=function(e){},t='<i class="layui-anim layui-anim-rotate layui-anim-loop layui-icon ">&#xe63e;</i>';o.prototype.load=function(e){var o,i,n,r,a=this,c=0;e=e||{};var m=l(e.elem);if(m[0]){var f=l(e.scrollElem||document),u=e.mb||50,s=!("isAuto"in e)||e.isAuto,y=e.end||"\u6ca1\u6709\u66f4\u591a\u4e86",v=e.scrollElem&&e.scrollElem!==document,d="<cite>\u52a0\u8f7d\u66f4\u591a</cite>",h=l('<div class="layui-flow-more"><a href="javascript:;">'+d+"</a></div>");m.find(".layui-flow-more")[0]||m.append(h);var p=function(e,t){e=l(e),h.before(e),t=0==t||null,t?h.html(y):h.find("a").html(d),i=t,o=null,n&&n()},g=function(){o=!0,h.find("a").html(t),"function"==typeof e.done&&e.done(++c,p)};if(g(),h.find("a").on("click",function(){l(this);i||o||g()}),e.isLazyimg)var n=a.lazyimg({elem:e.elem+" img",scrollElem:e.scrollElem});return s?(f.on("scroll",function(){var e=l(this),t=e.scrollTop();r&&clearTimeout(r),!i&&m.width()&&(r=setTimeout(function(){var i=v?e.height():l(window).height(),n=v?e.prop("scrollHeight"):document.documentElement.scrollHeight;n-t-i<=u&&(o||g())},100))}),a):a}},o.prototype.lazyimg=function(e){var o,t=this,i=0;e=e||{};var n=l(e.scrollElem||document),r=e.elem||"img",a=e.scrollElem&&e.scrollElem!==document,c=function(e,l){var o=n.scrollTop(),r=o+l,c=a?function(){return e.offset().top-n.offset().top+o}():e.offset().top;if(c>=o&&c<=r&&e.attr("lay-src")){var f=e.attr("lay-src");layui.img(f,function(){var l=t.lazyimg.elem.eq(i);e.attr("src",f).removeAttr("lay-src"),l[0]&&m(l),i++},function(){t.lazyimg.elem.eq(i);e.removeAttr("lay-src")})}},m=function(e,o){var m=a?(o||n).height():l(window).height(),f=n.scrollTop(),u=f+m;if(t.lazyimg.elem=l(r),e)c(e,m);else for(var s=0;s<t.lazyimg.elem.length;s++){var y=t.lazyimg.elem.eq(s),v=a?function(){return y.offset().top-n.offset().top+f}():y.offset().top;if(c(y,m),i=s,v>u)break}};if(m(),!o){var f;n.on("scroll",function(){var e=l(this);f&&clearTimeout(f),f=setTimeout(function(){m(null,e)},50)}),o=!0}return m},e("flow",new o)});layui.define(["layer","form"],function(t){"use strict";var e=layui.$,i=layui.layer,a=layui.form,l=(layui.hint(),layui.device()),n="layedit",o="layui-show",r="layui-disabled",c=function(){var t=this;t.index=0,t.config={tool:["strong","italic","underline","del","|","left","center","right","|","link","unlink","face","image"],hideTool:[],height:280}};c.prototype.set=function(t){var i=this;return e.extend(!0,i.config,t),i},c.prototype.on=function(t,e){return layui.onevent(n,t,e)},c.prototype.build=function(t,i){i=i||{};var a=this,n=a.config,r="layui-layedit",c=e("string"==typeof t?"#"+t:t),u="LAY_layedit_"+ ++a.index,d=c.next("."+r),y=e.extend({},n,i),f=function(){var t=[],e={};return layui.each(y.hideTool,function(t,i){e[i]=!0}),layui.each(y.tool,function(i,a){C[a]&&!e[a]&&t.push(C[a])}),t.join("")}(),m=e(['<div class="'+r+'">','<div class="layui-unselect layui-layedit-tool">'+f+"</div>",'<div class="layui-layedit-iframe">','<iframe id="'+u+'" name="'+u+'" textarea="'+t+'" frameborder="0"></iframe>',"</div>","</div>"].join(""));return l.ie&&l.ie<8?c.removeClass("layui-hide").addClass(o):(d[0]&&d.remove(),s.call(a,m,c[0],y),c.addClass("layui-hide").after(m),a.index)},c.prototype.getContent=function(t){var e=u(t);if(e[0])return d(e[0].document.body.innerHTML)},c.prototype.getText=function(t){var i=u(t);if(i[0])return e(i[0].document.body).text()},c.prototype.setContent=function(t,i,a){var l=u(t);l[0]&&(a?e(l[0].document.body).append(i):e(l[0].document.body).html(i),layedit.sync(t))},c.prototype.sync=function(t){var i=u(t);if(i[0]){var a=e("#"+i[1].attr("textarea"));a.val(d(i[0].document.body.innerHTML))}},c.prototype.getSelection=function(t){var e=u(t);if(e[0]){var i=m(e[0].document);return document.selection?i.text:i.toString()}};var s=function(t,i,a){var l=this,n=t.find("iframe");n.css({height:a.height}).on("load",function(){var o=n.contents(),r=n.prop("contentWindow"),c=o.find("head"),s=e(["<style>","*{margin: 0; padding: 0;}","body{padding: 10px; line-height: 20px; overflow-x: hidden; word-wrap: break-word; font: 14px Helvetica Neue,Helvetica,PingFang SC,Microsoft YaHei,Tahoma,Arial,sans-serif; -webkit-box-sizing: border-box !important; -moz-box-sizing: border-box !important; box-sizing: border-box !important;}","a{color:#01AAED; text-decoration:none;}a:hover{color:#c00}","p{margin-bottom: 10px;}","img{display: inline-block; border: none; vertical-align: middle;}","pre{margin: 10px 0; padding: 10px; line-height: 20px; border: 1px solid #ddd; border-left-width: 6px; background-color: #F2F2F2; color: #333; font-family: Courier New; font-size: 12px;}","</style>"].join("")),u=o.find("body");c.append(s),u.attr("contenteditable","true").css({"min-height":a.height}).html(i.value||""),y.apply(l,[r,n,i,a]),g.call(l,r,t,a)})},u=function(t){var i=e("#LAY_layedit_"+t),a=i.prop("contentWindow");return[a,i]},d=function(t){return 8==l.ie&&(t=t.replace(/<.+>/g,function(t){return t.toLowerCase()})),t},y=function(t,a,n,o){var r=t.document,c=e(r.body);c.on("keydown",function(t){var e=t.keyCode;if(13===e){var a=m(r),l=p(a),n=l.parentNode;if("pre"===n.tagName.toLowerCase()){if(t.shiftKey)return;return i.msg("\u8bf7\u6682\u65f6\u7528shift+enter"),!1}r.execCommand("formatBlock",!1,"<p>")}}),e(n).parents("form").on("submit",function(){var t=c.html();8==l.ie&&(t=t.replace(/<.+>/g,function(t){return t.toLowerCase()})),n.value=t}),c.on("paste",function(e){r.execCommand("formatBlock",!1,"<p>"),setTimeout(function(){f.call(t,c),n.value=c.html()},100)})},f=function(t){var i=this;i.document;t.find("*[style]").each(function(){var t=this.style.textAlign;this.removeAttribute("style"),e(this).css({"text-align":t||""})}),t.find("table").addClass("layui-table"),t.find("script,link").remove()},m=function(t){return t.selection?t.selection.createRange():t.getSelection().getRangeAt(0)},p=function(t){return t.endContainer||t.parentElement().childNodes[0]},v=function(t,i,a){var l=this.document,n=document.createElement(t);for(var o in i)n.setAttribute(o,i[o]);if(n.removeAttribute("text"),l.selection){var r=a.text||i.text;if("a"===t&&!r)return;r&&(n.innerHTML=r),a.pasteHTML(e(n).prop("outerHTML")),a.select()}else{var r=a.toString()||i.text;if("a"===t&&!r)return;r&&(n.innerHTML=r),a.deleteContents(),a.insertNode(n)}},h=function(t,i){var a=this.document,l="layedit-tool-active",n=p(m(a)),o=function(e){return t.find(".layedit-tool-"+e)};i&&i[i.hasClass(l)?"removeClass":"addClass"](l),t.find(">i").removeClass(l),o("unlink").addClass(r),e(n).parents().each(function(){var t=this.tagName.toLowerCase(),e=this.style.textAlign;"b"!==t&&"strong"!==t||o("b").addClass(l),"i"!==t&&"em"!==t||o("i").addClass(l),"u"===t&&o("u").addClass(l),"strike"===t&&o("d").addClass(l),"p"===t&&("center"===e?o("center").addClass(l):"right"===e?o("right").addClass(l):o("left").addClass(l)),"a"===t&&(o("link").addClass(l),o("unlink").removeClass(r))})},g=function(t,a,l){var n=t.document,o=e(n.body),c={link:function(i){var a=p(i),l=e(a).parent();b.call(o,{href:l.attr("href"),target:l.attr("target")},function(e){var a=l[0];"A"===a.tagName?a.href=e.url:v.call(t,"a",{target:e.target,href:e.url,text:e.url},i)})},unlink:function(t){n.execCommand("unlink")},face:function(e){x.call(this,function(i){v.call(t,"img",{src:i.src,alt:i.alt},e)})},image:function(a){var n=this;layui.use("upload",function(o){var r=l.uploadImage||{};o.render({url:r.url,method:r.type,elem:e(n).find("input")[0],done:function(e){0==e.code?(e.data=e.data||{},v.call(t,"img",{src:e.data.src,alt:e.data.title},a)):i.msg(e.msg||"\u4e0a\u4f20\u5931\u8d25")}})})},code:function(e){k.call(o,function(i){v.call(t,"pre",{text:i.code,"lay-lang":i.lang},e)})},help:function(){i.open({type:2,title:"\u5e2e\u52a9",area:["600px","380px"],shadeClose:!0,shade:.1,skin:"layui-layer-msg",content:["","no"]})}},s=a.find(".layui-layedit-tool"),u=function(){var i=e(this),a=i.attr("layedit-event"),l=i.attr("lay-command");if(!i.hasClass(r)){o.focus();var u=m(n);u.commonAncestorContainer;l?(n.execCommand(l),/justifyLeft|justifyCenter|justifyRight/.test(l)&&n.execCommand("formatBlock",!1,"<p>"),setTimeout(function(){o.focus()},10)):c[a]&&c[a].call(this,u),h.call(t,s,i)}},d=/image/;s.find(">i").on("mousedown",function(){var t=e(this),i=t.attr("layedit-event");d.test(i)||u.call(this)}).on("click",function(){var t=e(this),i=t.attr("layedit-event");d.test(i)&&u.call(this)}),o.on("click",function(){h.call(t,s),i.close(x.index)})},b=function(t,e){var l=this,n=i.open({type:1,id:"LAY_layedit_link",area:"350px",shade:.05,shadeClose:!0,moveType:1,title:"\u8d85\u94fe\u63a5",skin:"layui-layer-msg",content:['<ul class="layui-form" style="margin: 15px;">','<li class="layui-form-item">','<label class="layui-form-label" style="width: 60px;">URL</label>','<div class="layui-input-block" style="margin-left: 90px">','<input name="url" lay-verify="url" value="'+(t.href||"")+'" autofocus="true" autocomplete="off" class="layui-input">',"</div>","</li>",'<li class="layui-form-item">','<label class="layui-form-label" style="width: 60px;">\u6253\u5f00\u65b9\u5f0f</label>','<div class="layui-input-block" style="margin-left: 90px">','<input type="radio" name="target" value="_self" class="layui-input" title="\u5f53\u524d\u7a97\u53e3"'+("_self"!==t.target&&t.target?"":"checked")+">",'<input type="radio" name="target" value="_blank" class="layui-input" title="\u65b0\u7a97\u53e3" '+("_blank"===t.target?"checked":"")+">","</div>","</li>",'<li class="layui-form-item" style="text-align: center;">','<button type="button" lay-submit lay-filter="layedit-link-yes" class="layui-btn"> \u786e\u5b9a </button>','<button style="margin-left: 20px;" type="button" class="layui-btn layui-btn-primary"> \u53d6\u6d88 </button>',"</li>","</ul>"].join(""),success:function(t,n){var o="submit(layedit-link-yes)";a.render("radio"),t.find(".layui-btn-primary").on("click",function(){i.close(n),l.focus()}),a.on(o,function(t){i.close(b.index),e&&e(t.field)})}});b.index=n},x=function(t){var a=function(){var t=["[\u5fae\u7b11]","[\u563b\u563b]","[\u54c8\u54c8]","[\u53ef\u7231]","[\u53ef\u601c]","[\u6316\u9f3b]","[\u5403\u60ca]","[\u5bb3\u7f9e]","[\u6324\u773c]","[\u95ed\u5634]","[\u9119\u89c6]","[\u7231\u4f60]","[\u6cea]","[\u5077\u7b11]","[\u4eb2\u4eb2]","[\u751f\u75c5]","[\u592a\u5f00\u5fc3]","[\u767d\u773c]","[\u53f3\u54fc\u54fc]","[\u5de6\u54fc\u54fc]","[\u5618]","[\u8870]","[\u59d4\u5c48]","[\u5410]","[\u54c8\u6b20]","[\u62b1\u62b1]","[\u6012]","[\u7591\u95ee]","[\u998b\u5634]","[\u62dc\u62dc]","[\u601d\u8003]","[\u6c57]","[\u56f0]","[\u7761]","[\u94b1]","[\u5931\u671b]","[\u9177]","[\u8272]","[\u54fc]","[\u9f13\u638c]","[\u6655]","[\u60b2\u4f24]","[\u6293\u72c2]","[\u9ed1\u7ebf]","[\u9634\u9669]","[\u6012\u9a82]","[\u4e92\u7c89]","[\u5fc3]","[\u4f24\u5fc3]","[\u732a\u5934]","[\u718a\u732b]","[\u5154\u5b50]","[ok]","[\u8036]","[good]","[NO]","[\u8d5e]","[\u6765]","[\u5f31]","[\u8349\u6ce5\u9a6c]","[\u795e\u9a6c]","[\u56e7]","[\u6d6e\u4e91]","[\u7ed9\u529b]","[\u56f4\u89c2]","[\u5a01\u6b66]","[\u5965\u7279\u66fc]","[\u793c\u7269]","[\u949f]","[\u8bdd\u7b52]","[\u8721\u70db]","[\u86cb\u7cd5]"],e={};return layui.each(t,function(t,i){e[i]=layui.cache.dir+"images/face/"+t+".gif"}),e}();return x.hide=x.hide||function(t){"face"!==e(t.target).attr("layedit-event")&&i.close(x.index)},x.index=i.tips(function(){var t=[];return layui.each(a,function(e,i){t.push('<li title="'+e+'"><img src="'+i+'" alt="'+e+'"></li>')}),'<ul class="layui-clear">'+t.join("")+"</ul>"}(),this,{tips:1,time:0,skin:"layui-box layui-util-face",maxWidth:500,success:function(l,n){l.css({marginTop:-4,marginLeft:-10}).find(".layui-clear>li").on("click",function(){t&&t({src:a[this.title],alt:this.title}),i.close(n)}),e(document).off("click",x.hide).on("click",x.hide)}})},k=function(t){var e=this,l=i.open({type:1,id:"LAY_layedit_code",area:"550px",shade:.05,shadeClose:!0,moveType:1,title:"\u63d2\u5165\u4ee3\u7801",skin:"layui-layer-msg",content:['<ul class="layui-form layui-form-pane" style="margin: 15px;">','<li class="layui-form-item">','<label class="layui-form-label">\u8bf7\u9009\u62e9\u8bed\u8a00</label>','<div class="layui-input-block">','<select name="lang">','<option value="JavaScript">JavaScript</option>','<option value="HTML">HTML</option>','<option value="CSS">CSS</option>','<option value="Java">Java</option>','<option value="PHP">PHP</option>','<option value="C#">C#</option>','<option value="Python">Python</option>','<option value="Ruby">Ruby</option>','<option value="Go">Go</option>',"</select>","</div>","</li>",'<li class="layui-form-item layui-form-text">','<label class="layui-form-label">\u4ee3\u7801</label>','<div class="layui-input-block">','<textarea name="code" lay-verify="required" autofocus="true" class="layui-textarea" style="height: 200px;"></textarea>',"</div>","</li>",'<li class="layui-form-item" style="text-align: center;">','<button type="button" lay-submit lay-filter="layedit-code-yes" class="layui-btn"> \u786e\u5b9a </button>','<button style="margin-left: 20px;" type="button" class="layui-btn layui-btn-primary"> \u53d6\u6d88 </button>',"</li>","</ul>"].join(""),success:function(l,n){var o="submit(layedit-code-yes)";a.render("select"),l.find(".layui-btn-primary").on("click",function(){i.close(n),e.focus()}),a.on(o,function(e){i.close(k.index),t&&t(e.field)})}});k.index=l},C={html:'<i class="layui-icon layedit-tool-html" title="HTML\u6e90\u4ee3\u7801" lay-command="html" layedit-event="html"">&#xe64b;</i><span class="layedit-tool-mid"></span>',strong:'<i class="layui-icon layedit-tool-b" title="\u52a0\u7c97" lay-command="Bold" layedit-event="b"">&#xe62b;</i>',italic:'<i class="layui-icon layedit-tool-i" title="\u659c\u4f53" lay-command="italic" layedit-event="i"">&#xe644;</i>',underline:'<i class="layui-icon layedit-tool-u" title="\u4e0b\u5212\u7ebf" lay-command="underline" layedit-event="u"">&#xe646;</i>',del:'<i class="layui-icon layedit-tool-d" title="\u5220\u9664\u7ebf" lay-command="strikeThrough" layedit-event="d"">&#xe64f;</i>',"|":'<span class="layedit-tool-mid"></span>',left:'<i class="layui-icon layedit-tool-left" title="\u5de6\u5bf9\u9f50" lay-command="justifyLeft" layedit-event="left"">&#xe649;</i>',center:'<i class="layui-icon layedit-tool-center" title="\u5c45\u4e2d\u5bf9\u9f50" lay-command="justifyCenter" layedit-event="center"">&#xe647;</i>',right:'<i class="layui-icon layedit-tool-right" title="\u53f3\u5bf9\u9f50" lay-command="justifyRight" layedit-event="right"">&#xe648;</i>',link:'<i class="layui-icon layedit-tool-link" title="\u63d2\u5165\u94fe\u63a5" layedit-event="link"">&#xe64c;</i>',unlink:'<i class="layui-icon layedit-tool-unlink layui-disabled" title="\u6e05\u9664\u94fe\u63a5" lay-command="unlink" layedit-event="unlink"">&#xe64d;</i>',face:'<i class="layui-icon layedit-tool-face" title="\u8868\u60c5" layedit-event="face"">&#xe650;</i>',image:'<i class="layui-icon layedit-tool-image" title="\u56fe\u7247" layedit-event="image">&#xe64a;<input type="file" name="file"></i>',code:'<i class="layui-icon layedit-tool-code" title="\u63d2\u5165\u4ee3\u7801" layedit-event="code">&#xe64e;</i>',help:'<i class="layui-icon layedit-tool-help" title="\u5e2e\u52a9" layedit-event="help">&#xe607;</i>'},L=new c;t(n,L)});layui.define("jquery",function(a){"use strict";var e=layui.$;a("code",function(a){var l=[];a=a||{},a.elem=e(a.elem||".layui-code"),a.lang="lang"in a?a.lang:"code",a.elem.each(function(){l.push(this)}),layui.each(l.reverse(),function(l,i){var t=e(i),c=t.html();(t.attr("lay-encode")||a.encode)&&(c=c.replace(/&(?!#?[a-zA-Z0-9]+;)/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/'/g,"&#39;").replace(/"/g,"&quot;")),t.html('<ol class="layui-code-ol"><li>'+c.replace(/[\r\t\n]+/g,"</li><li>")+"</li></ol>"),t.find(">.layui-code-h3")[0]||t.prepend('<h3 class="layui-code-h3">'+(t.attr("lay-title")||a.title||"&lt;/&gt;")+'<a href="javascript:;">'+(t.attr("lay-lang")||a.lang||"")+"</a></h3>");var n=t.find(">.layui-code-ol");t.addClass("layui-box layui-code-view"),(t.attr("lay-skin")||a.skin)&&t.addClass("layui-code-"+(t.attr("lay-skin")||a.skin)),(n.find("li").length/100|0)>0&&n.css("margin-left",(n.find("li").length/100|0)+"px"),(t.attr("lay-height")||a.height)&&n.css("max-height",t.attr("lay-height")||a.height)})})}).addcss("modules/code.css?v=2","skincodecss");
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/leshuaMakeMoney/leshuaMakeMoneyDetails.js b/pluss-manage-page/src/main/resources/static/resources/js/leshuaMakeMoney/leshuaMakeMoneyDetails.js
new file mode 100644
index 0000000..ff7a9e2
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/leshuaMakeMoney/leshuaMakeMoneyDetails.js
@@ -0,0 +1,96 @@
+/**
+ * create by robot 
+ * date Tue Apr 14 15:06:39 CST 2020 
+ */ 
+
+$(document).ready(function(){
+	//form表单样式
+	layui.use(['layer', 'form'], function() {
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+	//li 切换事件
+	$(".nav-tabs>li").click(function() {
+		var index = $(".nav-tabs>li").index(this);
+		$(this).addClass("active").siblings("li").removeClass("active");
+		
+	})
+	//弹出一个提示层
+	$('.fa-save').on('click', function() {
+		saveLeshuaMakeMoney();
+	});
+
+	//绑定标签栏事件
+	$(document).on('click','.nav-tabs li',function(){
+
+		var action =$(this).data('action');
+		 switch (action) {
+			case "base"://基本资料
+				goBase();
+				break;  
+			case "functions"://多功能
+				goFunctions();
+				break;
+			case "extends"://扩展    
+				goExtends();         
+				break;           
+		 }
+	})
+
+	//加载第一个标签
+	$('.nav-tabs li').eq(0).click();
+	
+});
+
+
+//跳转基本信息 
+function goBase(){
+	var url=ctx+'/leshuaMakeMoney/queryLeshuaMakeMoneyBaseInfo?id='+$('#leshuaMakeMoneyId').val();
+	$('.tab-content').load(url);
+	              
+}
+//跳转多功能输入
+function goFunctions(){ 
+	var url=ctx+'/leshuaMakeMoney/queryLeshuaMakeMoneyFunctionsInfo?id='+$('#leshuaMakeMoneyId').val();
+	$('.tab-content').load(url);  
+	
+}
+//跳转到扩展   
+function goExtends(){
+	
+	var url=ctx+'/leshuaMakeMoney/queryLeshuaMakeMoneyExtendsInfo?id='+$('#leshuaMakeMoneyId').val();
+	$('.tab-content').load(url);          
+}  
+  
+
+ 
+//保存
+function saveLeshuaMakeMoney(){
+	 
+	$(".fa-save").attr("disabled","disabled");
+	$('.fa-save').html('正在保存...')
+	$.ajax({
+		url:ctx+"/leshuaMakeMoney/saveLeshuaMakeMoney",
+		type:"POST",
+		dataType:'json',
+		data:$("#data_form").serializeArray(),
+		complete:function(){
+			$(".fa-save").removeAttr("disabled");
+			$('.fa-save').html('保存')
+		},        
+		success:function(service){ 
+		
+			layer.confirm('保存成功,是否前往列表？', {
+				  btn: ['确认','取消'] //按钮
+				}, function(){
+					$('#goback span').trigger('click'); 
+				}, function(){         
+					layer.closeAll();
+			});  
+			
+		}
+	});  
+}
+ 
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/leshuaMakeMoney/leshuaMakeMoneyList.js b/pluss-manage-page/src/main/resources/static/resources/js/leshuaMakeMoney/leshuaMakeMoneyList.js
new file mode 100644
index 0000000..13eab22
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/leshuaMakeMoney/leshuaMakeMoneyList.js
@@ -0,0 +1,278 @@
+/**
+ * create by robot 
+ * date Tue Apr 14 15:06:39 CST 2020 
+ */ 
+
+var pageIndex=1;
+$(document).ready(function(){
+	//调用查询
+	pageIndex=StringUtil.getQueryString('pageIndex');
+	if(pageIndex==undefined||pageIndex==null){
+		pageIndex=1;
+	}
+	queryLeshuaMakeMoney(pageIndex);
+	//绑定hover操作
+	$(document).on('mouseenter','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").show();
+		var width=15;
+		$(this).children('div').find('li').each(function(){
+			//获取li宽度
+			width+=$(this).width();
+		});
+		$(this).children('div').width(width);
+	})
+	$(document).on('mouseleave','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").hide();
+	});
+
+	//日历控件
+	layui.use(['layer', 'laydate'], function() {
+		var layer = layui.layer;
+		laydate = layui.laydate;
+		laydate.render({
+		elem: '#date1' //指定元素
+		});
+		laydate.render({
+			elem: '#date2' //指定元素
+		});
+	});
+
+
+	//行选中事件
+	$("#allCheck").find("span").click(function() {
+		$(this).toggleClass('checked');
+		if($(this).hasClass('checked')){
+			//所有列选中
+		  $(".checker").find("span").each(function () {
+		         $(this).addClass("checked");
+		    })
+		}else{
+			//所有列取消选中
+			$(".checker").find("span").each(function () {
+				 $(this).removeClass("checked");
+		    })
+		}
+	});
+
+	//单个选中
+	$(document).on('click','.checkeBox span',function() {
+		$(this).toggleClass('checked');
+		//设置头部事件
+		var length=$('.checkeBox span').length;
+		var count=0;
+		$(".checkeBox").find("span").each(function () {
+	        if($(this).hasClass("checked")){
+	        	count++;
+	        }
+	   })
+		//全选
+	   if(count==length){
+		   $("#allCheck").find("span").addClass('checked');
+	   }else{
+		   $("#allCheck").find("span").removeClass('checked');
+	   }
+	})
+	//左右div高度相等
+	var left_content_height = $(".right-content").height();
+	$(".left-content").height(left_content_height+35);
+	var sub_left_height=$(".res-menu").height(left_content_height-60);
+});
+
+//查询
+function queryLeshuaMakeMoney(index){
+	if(typeof(index)=='undefined'){
+		index=1;
+	}
+	var url=ctx+'/leshuaMakeMoney/queryLeshuaMakeMoneyByPage';
+	$.ajax({  
+        url:url,  
+        type:"post", 
+        dataType:"json",  
+        data:{  
+        	"currPage":index,
+        	"id":$('#searchId').val()
+        },  
+        success:function(result){  
+        	//渲染数据
+        	$('#data_content').empty();
+        	var header='';
+        	$.each(result.leshuaMakeMoneyList,function(i){
+        		var leshuaMakeMoney=result.leshuaMakeMoneyList[i];
+        		var data='';
+        		data+='<tr class="odd">';
+        		data+='<td class="textc">';
+				data+='		 <div class="checker checkeBox">';        		data+='		 <span class=""  data-id="'+leshuaMakeMoney.id+'"><input type="checkbox"  value=""></span>';
+        		data+='		</div>';
+        		data+='</td>';
+        		data+='<td class="textc">'+leshuaMakeMoney.id+'</td>';
+        		data+='<td class="textc">'+leshuaMakeMoney.billId+'</td>';
+        		data+='<td class="textc">'+leshuaMakeMoney.createTime+'</td>';
+        		data+='<td class="textc">'+leshuaMakeMoney.merchantId+'</td>';
+        		data+='<td class="textc">'+leshuaMakeMoney.planAmount+'</td>';
+        		data+='<td class="textc">'+leshuaMakeMoney.suspendAmount+'</td>';
+        		data+='<td class="textc">'+leshuaMakeMoney.realAmount+'</td>';
+        		data+='<td class="textc">'+leshuaMakeMoney.state+'</td>';
+        		data+='<td class="textc">'+leshuaMakeMoney.failReason+'</td>';
+        		data+='<td class="textc">'+leshuaMakeMoney.remark+'</td>';
+        		data+='<td class="textc">'+leshuaMakeMoney.recreateFlag+'</td>';
+        		data+='<td class="textc">'+leshuaMakeMoney.settType+'</td>';
+        		data+='<td class="textc">'+leshuaMakeMoney.settDate+'</td>';
+        		data+='<td class="textc">'+leshuaMakeMoney.tag+'</td>';
+        		data+='<td class="textc">'+leshuaMakeMoney.bankretTime+'</td>';
+        		data+='<td class="textc">'+leshuaMakeMoney.bankAccount+'</td>';
+        		data+='<td class="textc">'+leshuaMakeMoney.bankHolder+'</td>';
+        		data+='<td class="textc">';
+        		data+='<div class="positionr listOperaters">';
+        		data+='		<a href="javascript:void(0);"  class="icon-large dlblock w16 h16"><img src="'+resourcePath+'/images/angle-down.png"/></a>';
+        		data+='		<div class="ops_box ops_itemDiv positiona clearfix whitebg">';
+        		data+='			<ul>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showLeshuaMakeMoneyDetails('+leshuaMakeMoney.id+')" class="btn btn-primary fa fa-edit ops_more f12">编辑</a></li>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="initDeleteLeshuaMakeMoney('+leshuaMakeMoney.id+')" class="btn btn-primary fa fa-remove ops_more f12">删除</a></li>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showLeshuaMakeMoneyDetails('+leshuaMakeMoney.id+')" class="btn btn-primary fa fa-detail ops_more f12">明细</a></li>';
+        	    data+='			</ul>';
+              data+='		</div>';
+        	    data+='</div>';
+        	    data+='</td>';
+        	    data+='</tr>';
+        	    $('#data_content').append(data);
+        	});
+        	//分页
+        	$('#pageCount').html(result.pageCount);
+      	$('#currPage').html(result.currPage);
+          $('#totalCount').html(result.count);
+           	//设置分页
+           	pageIndex=result.currPage;
+			$('#pagination').pagination({
+				pageCount: result.pageCount,
+				jump: true,
+				coping: true,
+				jump: true,
+				homePage: '首页',
+				endPage: '末页',
+				prevContent: '上页',
+				nextContent: '下页',
+				current:result.currPage,
+				callback:function(api){
+					pageIndex=api.getCurrent();
+					queryLeshuaMakeMoney(api.getCurrent());
+				}
+			});
+        } 
+    });  
+	//表头列不选中
+	$("#allCheck").find("span").removeClass('checked');
+}
+
+//初始化新增
+function initAddLeshuaMakeMoney(){
+	window.location=ctx+'/leshuaMakeMoney/queryLeshuaMakeMoneyDetails?pageIndex='+pageIndex;
+}
+
+//初始化修改
+function showLeshuaMakeMoneyDetails(id){
+	window.location=ctx+'/leshuaMakeMoney/queryLeshuaMakeMoneyDetails?id='+id+'&pageIndex='+pageIndex;
+}
+
+//初始化删除
+function initDeleteLeshuaMakeMoney(id){
+	
+		layer.open({
+		type: 1,
+		closeBtn: 1,		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r'	, //按钮居中
+		shade: 0.3 ,//不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteLeshuaMakeMoney(id,true);
+		}
+	});
+}
+
+//删除
+function deleteLeshuaMakeMoney(id,showMsg){
+	$.ajax({
+		url:ctx+'/leshuaMakeMoney/deleteLeshuaMakeMoney',
+		data:[{
+			name:'id',
+			value:id
+		}],
+		type:'POST',
+		dataType:'json',
+		success:function(){
+			queryLeshuaMakeMoney(pageIndex);
+			if(showMsg){
+				layer.msg('删除成功!');	
+			}
+		}
+	});
+}
+//头部编辑
+function initEditLeshuaMakeMoney(){
+	var count=0;
+	var id=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+        	 id=$(this).data('id');
+         }
+    })
+    if(count>1){
+    	layer.msg('只能选中一行记录进行操作!');
+    	return ;
+    }
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	 if(id>0){
+	  showLeshuaMakeMoneyDetails(id);
+	 }
+}
+//头部删除
+function initBatchDeleteLeshuaMakeMoney(){
+	var count=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+         }
+    })
+	
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	
+
+	layer.open({
+		type: 1,
+		closeBtn: 1,
+		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r', //按钮居中
+		shade: 0.3, //不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteBatchLeshuaMakeMoney();
+		}
+	});
+	
+}
+//批量删除
+function deleteBatchLeshuaMakeMoney(){
+	
+	$(".checkeBox").find("span").each(function () {
+        if($(this).hasClass("checked")){
+        	var id=$(this).data('id');
+        	deleteLeshuaMakeMoney(id,false);
+        	layer.msg('删除成功!');	
+        }
+   })
+}
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/level/levelDetails.js b/pluss-manage-page/src/main/resources/static/resources/js/level/levelDetails.js
new file mode 100644
index 0000000..782a538
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/level/levelDetails.js
@@ -0,0 +1,111 @@
+/**
+ * create by robot 
+ * date Thu Sep 12 16:16:36 CST 2019 
+ */ 
+
+$(document).ready(function(){
+	//form表单样式
+	layui.use(['layer', 'form'], function() {
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+	//li 切换事件
+	$(".nav-tabs>li").click(function() {
+		var index = $(".nav-tabs>li").index(this);
+		$(this).addClass("active").siblings("li").removeClass("active");
+		
+	})
+	//弹出一个提示层
+	$('.fa-save').on('click', function() {
+		checker();
+	});
+
+	//绑定标签栏事件
+	$(document).on('click','.nav-tabs li',function(){
+
+		var action =$(this).data('action');
+		 switch (action) {
+			case "base"://基本资料
+				goBase();
+				break;  
+			case "functions"://多功能
+				goFunctions();
+				break;
+			case "extends"://扩展    
+				goExtends();         
+				break;           
+		 }
+	})
+
+	//加载第一个标签
+	$('.nav-tabs li').eq(0).click();
+	
+});
+
+
+//跳转基本信息 
+function goBase(){
+	var url=ctx+'/level/queryLevelBaseInfo?id='+$('#levelId').val();
+	$('.tab-content').load(url);
+	              
+}
+//跳转多功能输入
+function goFunctions(){ 
+	var url=ctx+'/level/queryLevelFunctionsInfo?id='+$('#levelId').val();
+	$('.tab-content').load(url);  
+	
+}
+//跳转到扩展   
+function goExtends(){
+	
+	var url=ctx+'/level/queryLevelExtendsInfo?id='+$('#levelId').val();
+	$('.tab-content').load(url);          
+}  
+  
+
+ 
+//保存
+function saveLevel(){
+	 
+	$(".fa-save").attr("disabled","disabled");
+	$('.fa-save').html('正在保存...')
+	$.ajax({
+		url:ctx+"/level/saveLevel",
+		type:"POST",
+		dataType:'json',
+		data:$("#data_form").serializeArray(),
+		complete:function(){
+			$(".fa-save").removeAttr("disabled");
+			$('.fa-save').html('保存')
+		},        
+		success:function(service){ 
+		
+			layer.confirm('保存成功,是否前往列表？', {
+				  btn: ['确认','取消'] //按钮
+				}, function(){
+					$('#goback span').trigger('click'); 
+				}, function(){         
+					layer.closeAll();
+			});  
+			
+		}
+	});  
+}
+
+function checker(){
+	var    authCount=$('#authCount').val();
+	var   tradeMoney=$('#tradeMoney').val();
+	var    rate=$('#rate').val()		 	
+	   
+	  if(tradeMoney.match(/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/)){
+		 
+		  if(authCount.match(/^[1-9]\d*$/)){
+			  saveLevel();			  
+			}else{alert("请输入正确的实名认证数！");}	    	
+	    }else{
+	    	 alert("交易额不合格！");
+	    }		    
+}
+ 
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/level/levelList.js b/pluss-manage-page/src/main/resources/static/resources/js/level/levelList.js
new file mode 100644
index 0000000..e4b2c56
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/level/levelList.js
@@ -0,0 +1,206 @@
+/**
+ * create by robot 
+ * date Thu Sep 12 16:16:36 CST 2019 
+ */ 
+
+var pageIndex=1;
+$(document).ready(function(){
+	//调用查询
+	pageIndex=StringUtil.getQueryString('pageIndex');
+	if(pageIndex==undefined||pageIndex==null){
+		pageIndex=1;
+	}
+	queryLevel(pageIndex);
+	
+	//绑定hover操作
+	$(document).on('mouseenter','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").show();
+		var width=15;
+		$(this).children('div').find('li').each(function(){
+			//获取li宽度
+			width+=$(this).width();
+		});
+		$(this).children('div').width(width);
+	})
+	$(document).on('mouseleave','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").hide();
+	});
+
+	//日历控件
+	layui.use(['layer', 'laydate'], function() {
+		var layer = layui.layer;
+		laydate = layui.laydate;
+		laydate.render({
+		elem: '#date1' //指定元素
+		});
+		laydate.render({
+			elem: '#date2' //指定元素
+		});
+	});
+
+	//行选中事件
+	$("#allCheck").find("span").click(function() {
+		$(this).toggleClass('checked');
+		if($(this).hasClass('checked')){
+			//所有列选中
+		  $(".checker").find("span").each(function () {
+		         $(this).addClass("checked");
+		    })
+		}else{
+			//所有列取消选中
+			$(".checker").find("span").each(function () {
+				 $(this).removeClass("checked");
+		    })
+		}
+	});
+
+	//单个选中
+	$(document).on('click','.checkeBox span',function() {
+		$(this).toggleClass('checked');
+		//设置头部事件
+		var length=$('.checkeBox span').length;
+		var count=0;
+		$(".checkeBox").find("span").each(function () {
+	        if($(this).hasClass("checked")){
+	        	count++;
+	        }
+	   })
+		//全选
+	   if(count==length){
+		   $("#allCheck").find("span").addClass('checked');
+	   }else{
+		   $("#allCheck").find("span").removeClass('checked');
+	   }
+	})
+	//左右div高度相等
+	var left_content_height = $(".right-content").height();
+	$(".left-content").height(left_content_height+35);
+	var sub_left_height=$(".res-menu").height(left_content_height-60);
+});
+
+//查询
+function queryLevel(index){
+	
+	if(typeof(index)=='undefined'){
+		index=1;
+	}
+	var url=ctx+'/level/queryLevelByPage';
+	$.ajax({  
+        url:url,  
+        type:"post", 
+        dataType:"json",  
+        data:{  
+        	"currPage":index,
+        	"id":$('#searchId').val()
+        },  
+        success:function(result){  
+        	//渲染数据
+        	$('#data_content').empty();
+        	var header='';
+        	$.each(result.levelList,function(i){
+        		var level=result.levelList[i];
+        		
+        		if(level.logo==null || level.logo==""){
+        			level.logo="--";
+        		}
+        		if(level.createDt==null || level.createDt==""){
+        			level.createDt="--";
+        		}
+        		
+        		if(level.createDt){
+      		      var date = new Date(level.createDt);
+      		      var month = date.getMonth() + 1 < 10 ? "0" + (date.getMonth() + 1) : date.getMonth() + 1;
+      		      var day = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();
+      		    level.createDt = date.getFullYear() + "/" + month + "/" + day;
+      		    }
+        		
+        		var data='';
+        		data+='<tr class="odd">';
+        		data+='<td class="textc">';
+				data+='		 <div class="checker checkeBox">';        		data+='		 <span class=""  data-id="'+level.id+'"><input type="checkbox"  value=""></span>';
+        		data+='		</div>';
+        		data+='</td>';
+        		//data+='<td class="textc">'+level.id+'</td>';
+        		data+='<td class="textc">'+level.level+'</td>';
+        		data+='<td class="textc">'+level.tradeMoney+'</td>';
+        		data+='<td class="textc">'+level.authCount+'</td>';
+        		data+='<td class="textc">'+level.levelName+'</td>';
+        		data+='<td class="textc">'+level.rate+'</td>';
+        		//data+='<td class="textc">'+level.createDt+'</td>';
+        		//data+='<td class="textc"><img  width="50px" height="50px" src="'+level.logo+'"></td>';
+        		data+='<td class="textc">';
+        		data+='<div class="positionr listOperaters">';
+        		data+='		<a href="javascript:void(0);"  class="icon-large dlblock w16 h16"><img src="'+resourcePath+'/images/angle-down.png"/></a>';
+        		data+='		<div class="ops_box ops_itemDiv positiona clearfix whitebg">';
+        		data+='			<ul>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showLevelDetails('+level.id+')" class="layui-btn layui-btn-sm layui-btn-radius layui-btn-normal fa fa-edit ops_more f12">编辑</a></li>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showLevelDetails('+level.id+')" class="layui-btn layui-btn-sm layui-btn-radius layui-btn-danger fa fa-detail ops_more f12">明细</a></li>';
+        	    data+='			</ul>';
+              data+='		</div>';
+        	    data+='</div>';
+        	    data+='</td>';
+        	    data+='</tr>';
+        	    $('#data_content').append(data);
+        	});
+        	//分页
+        	$('#pageCount').html(result.pageCount);
+      	$('#currPage').html(result.currPage);
+          $('#totalCount').html(result.count);
+           	//设置分页
+           	pageIndex=result.currPage;
+			$('#pagination').pagination({
+				pageCount: result.pageCount,
+				jump: true,
+				coping: true,
+				jump: true,
+				homePage: '首页',
+				endPage: '末页',
+				prevContent: '上页',
+				nextContent: '下页',
+				current:result.currPage,
+				callback:function(api){
+					pageIndex=api.getCurrent();
+					queryLevel(api.getCurrent());
+				}
+			});
+        } 
+    });  
+	//表头列不选中
+	$("#allCheck").find("span").removeClass('checked');
+}
+
+//初始化新增
+function initAddLevel(){
+	window.location=ctx+'/level/queryLevelDetails?pageIndex='+pageIndex;
+}
+
+//初始化修改
+function showLevelDetails(id){
+	window.location=ctx+'/level/queryLevelDetails?id='+id+'&pageIndex='+pageIndex;
+}
+
+
+
+
+//头部编辑
+function initEditLevel(){
+	var count=0;
+	var id=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+        	 id=$(this).data('id');
+         }
+    })
+    if(count>1){
+    	layer.msg('只能选中一行记录进行操作!');
+    	return ;
+    }
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	 if(id>0){
+	  showLevelDetails(id);
+	 }
+}
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/login/login.js b/pluss-manage-page/src/main/resources/static/resources/js/login/login.js
new file mode 100644
index 0000000..9eea727
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/login/login.js
@@ -0,0 +1,176 @@
+var registerEnabled = 'false';
+var validCodeEnabled = 'false';
+var layer;
+$(function () {
+    layui.use(['layer'], function () {
+        layer = layui.layer;
+    });
+
+    var login = new Login();
+    login.init();
+});
+/**
+ * 功能：移除首尾空格
+ */
+String.prototype.trim = function () {
+    return this.replace(/(^[ \t\n\r]+)|([ \t\n\r]+$)/g, '');
+};
+
+var Login = function () {
+};
+
+Login.prototype = {
+    init: function () {
+        if (this.hasInit) // 是否已初始化
+            return false;
+        this.hasInit = true;
+        this.handeEvent();
+
+        if (registerEnabled == 'true') {
+            $(".register").removeClass("hidden");
+        } else {
+            $(".register").addClass("hidden");
+        }
+        if (validCodeEnabled == 'true') {
+            $("#validCodeFormGroup").removeClass("hidden");
+        }
+
+        $("#username").focus();
+        this.handleFixInputPlaceholderForIE();
+    },
+    handeEvent: function () {
+        var me = this;
+        $('body').keydown(function (event) {// 处理回车事件
+            if (event.keyCode == 13)
+                me.login();
+        });
+
+        $(document).on('click', '#reset', function (e) {// 重置
+            $('#loginForm')[0].reset();
+        });
+        $(document).on('click', '#login', function (e) {// 登录
+            me.login();
+        });
+    },
+    handleFixInputPlaceholderForIE: function () {
+        var isIE8 = !!navigator.userAgent.match(/MSIE 8.0/), isIE9 = !!navigator.userAgent
+            .match(/MSIE 9.0/), isIE10 = !!navigator.userAgent
+            .match(/MSIE 10.0/);
+        // fix html5 placeholder attribute for ie7 & ie8
+        if (isIE8 || isIE9) { // ie8 & ie9
+            $(
+                'input[placeholder]:not(.placeholder-no-fix), textarea[placeholder]:not(.placeholder-no-fix)')
+                .each(
+                    function () {
+                        var input = $(this);
+
+                        if (input.val() === ''
+                            && input.attr("placeholder") !== '') {
+                            input.addClass("placeholder").val(
+                                input.attr('placeholder'));
+                        }
+
+                        input.focus(function () {
+                            if (input.val() == input.attr('placeholder')) {
+                                input.val('');
+                            }
+                        });
+
+                        input.blur(function () {
+                            if (input.val() === ''
+                                || input.val() == input.attr('placeholder')) {
+                                input.val(input.attr('placeholder'));
+                            }
+                        });
+                    });
+        }
+    },
+    /**
+     * 登录
+     */
+    login: function () {
+        var username = $("#username").val(), password = $("#password").val();
+
+        if (username == "") {
+            layer.msg("用户名或者密码为空");
+            $("#username").focus();
+            return;
+        }
+
+        if (registerEnabled == 'true'
+            && !(/^((\(\d{2,3}\))|(\d{3}\-))?1\d{10}$/
+                .test(username.trim()))) {
+            layer.msg("请使用手机号码登录");
+            $("#username").focus();
+            throw new error("请使用手机号码登录");
+        }
+
+        if (password == "") {
+            layer.msg("用户名或者密码为空");
+            $("#password").focus();
+            return;
+        }
+        var _this = this;
+        var loading = layer.load(0, {
+            shade: 0.3
+        });
+
+        var param = {
+            loginName: username,
+            password: password,
+            validCode: $("#validCode").val(),
+            'rememberme': $('#rememberMe').is(':checked') ? 'on' : 'off',
+        };
+
+        $.post(ctx + "/login/doLogin",
+            param,
+            function (data) {
+                if (data.result == 1) {
+                    var __redirectUri = data.redirectUri;
+                    if (undefined == __redirectUri || null == __redirectUri || "" == __redirectUri || typeof (__redirectUri) == 'undefined') {
+                        window.location.href = ctx;
+                    } else {
+                        localStorage.setItem("token", data.token);
+                        localStorage.setItem("userId", data.userId);
+                        window.location.href = __redirectUri;
+                    }
+
+                } else if (data.result == 2) {
+                    layer.close(loading);
+                    param.kickout = false;
+                    layer.confirm(data.message, function (rtn) {
+                        if (rtn) {
+
+                            param.kickout = true;
+                            $.post(ctx + "/login.htm",
+                                param,
+                                function (data) {
+                                    param.kickout = false;
+                                    layer.close(loading);
+                                    if (data.result == 1) {
+                                        window.location.href = ctx
+                                            + "/platform/console/main.htm";
+                                    } else {
+                                        layer.close(loading);
+                                        if (data.validCode) {
+                                            $("#validCodeFormGroup").removeClass("hidden");
+                                        }
+                                        layer.msg(data.message);
+                                    }
+                                }, "json");
+
+                        }
+
+                    });
+
+                } else {
+                    layer.close(loading);
+                    layer.msg(data.message);
+                }
+
+            }, "json");
+
+
+    }
+
+};
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/main/main.js b/pluss-manage-page/src/main/resources/static/resources/js/main/main.js
new file mode 100644
index 0000000..e1c404c
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/main/main.js
@@ -0,0 +1,156 @@
+var $;
+layui.config({
+    base: ctx + '/resources/layuiadmin/' //静态资源所在路径
+}).use(['index', 'jquery', 'element'], function() {
+    $ = layui.jquery;
+    let element = layui.element;
+    let admin = layui.admin;
+
+    notifyStatus()
+
+    admin.events.message = null;
+
+    $.ajax({
+        url: ctx + "/auth/getPermissionMenusOnceAll",
+        type: 'POST',
+        dataType: 'json',
+        success: function (menus) {
+            g_menus = menus;
+            //获取父节点
+            var html = "";
+
+            /** 左边菜单，顶部节点id */
+            var rootId = null;
+            var tempRoot = [];
+            var root = [];
+            var flag = false;
+
+            // 列表排序遍历
+            $.each (g_menus, function(i, menu) {
+                // 第一遍循环，查找根节点的id
+                if (menu.parentId == null) {
+                    rootId = menu.id;
+                    // 同 break
+                    return false;
+                }
+            });
+
+            if (rootId == null || rootId == undefined) {
+                return;
+            }
+
+            var index = 0;
+            $.each (g_menus, function (i, menu) {
+                // 第二遍循环，查找根节点菜单
+                if (menu.parentId == rootId) {
+                    menu.subMenu = [];
+                    root[index] = menu;
+                    index++;
+                }
+            })
+            /** 获取菜单结构 */
+            menuRecursion(root, g_menus);
+
+            var menuText = menuHtml("", "", root, true);
+
+            $('#leftMenu').html(menuText)
+            element.render('nav')
+        }
+    })
+})
+
+function menuRecursion(root, data) {
+    root.sort(function (a, b) {
+        return a.menuOrder - b.menuOrder;
+    });
+
+    for (var i=0; i < root.length; i++) {
+        for (var j=0; j<data.length; j++) {
+            if (data[j].parentId == root[i].id) {
+                var subMenuLength = root[i].subMenu.length;
+                data[j].subMenu = [];
+                root[i].subMenu[subMenuLength] = data[j];
+                //data.splice(j, 1);
+            }
+        }
+
+        if (root[i].subMenu.length > 0) {
+            menuRecursion(root[i].subMenu, data);
+        }
+    }
+}
+
+function menuHtml(start, padding, root, isRoot) {
+
+    if (root.length > 0) {
+        if (isRoot) {
+            start += '<ul class="layui-nav layui-nav-tree" lay-shrink="all" id="LAY-system-side-menu" lay-filter="layadmin-system-side-menu">';
+        } else {
+            start += '<dl class="layui-nav-child">';
+        }
+    }
+
+    for (var i=0; i<root.length; i++) {
+        var subMenu = root[i].subMenu;
+        if (isRoot) {
+            start += '<li class="layui-nav-item">';
+            if (root[i].link !== "" && root[i].link !== undefined && root[i].link !== "#") {
+                start += '<a lay-href="'+ ctx + root[i].link + '">';
+                start += padding + root[i].name + '</a>';
+            } else {
+                start += '<a href="javascript:;" lay-tips="'+ root[i].name + '" lay-direction="2">';
+                start += '' + root[i].name + '</a>';
+            }
+
+            if (subMenu.length > 0) {
+                start = menuHtml(start, padding + "&nbsp;&nbsp;&nbsp;&nbsp;", subMenu, false);
+            }
+
+            start += '</li>';
+        } else {
+            start += '<dd class="layui-nav-item">';
+            if (root[i].link !== "" && root[i].link !== undefined && root[i].link !== "#") {
+                start += '<a lay-href="'+ ctx + root[i].link + '">';
+                start += padding + root[i].name + '</a>';
+            } else {
+                start += '<a href="javascript:;" lay-tips="'+ root[i].name + '" lay-direction="2">';
+                start += padding + root[i].name + '</a>';
+            }
+
+            if (subMenu.length > 0) {
+                start = menuHtml(start, padding + "&nbsp;&nbsp;&nbsp;&nbsp;", subMenu, false);
+            }
+
+            start += '</dd>';
+        }
+    }
+
+
+
+    if (root.length > 0) {
+        if (isRoot) {
+            start += '</ul>';
+        } else {
+            start += '</dl>';
+        }
+        start += '';
+    }
+
+    return start;
+}
+
+function notifyStatus() {
+    $.ajax({
+        url: ctx + "/notification/countStatus",
+        method: 'get',
+        dataType: 'JSON',
+        contentType: "application/json",
+        success: function (count) {
+            if (count > 0){
+                $('.layui-badge-dot').show();
+            } else {
+                $('.layui-badge-dot').hide();
+            }
+        }
+    })
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/memberOrder/memberOrderDetails.js b/pluss-manage-page/src/main/resources/static/resources/js/memberOrder/memberOrderDetails.js
new file mode 100644
index 0000000..5c94a99
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/memberOrder/memberOrderDetails.js
@@ -0,0 +1,96 @@
+/**
+ * create by robot 
+ * date Wed Sep 25 17:39:35 CST 2019 
+ */ 
+
+$(document).ready(function(){
+	//form表单样式
+	layui.use(['layer', 'form'], function() {
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+	//li 切换事件
+	$(".nav-tabs>li").click(function() {
+		var index = $(".nav-tabs>li").index(this);
+		$(this).addClass("active").siblings("li").removeClass("active");
+		
+	})
+	//弹出一个提示层
+	$('.fa-save').on('click', function() {
+		saveMemberOrder();
+	});
+
+	//绑定标签栏事件
+	$(document).on('click','.nav-tabs li',function(){
+
+		var action =$(this).data('action');
+		 switch (action) {
+			case "base"://基本资料
+				goBase();
+				break;  
+			case "functions"://多功能
+				goFunctions();
+				break;
+			case "extends"://扩展    
+				goExtends();         
+				break;           
+		 }
+	})
+
+	//加载第一个标签
+	$('.nav-tabs li').eq(0).click();
+	
+});
+
+
+//跳转基本信息 
+function goBase(){
+	var url=ctx+'/memberOrder/queryMemberOrderBaseInfo?id='+$('#memberOrderId').val();
+	$('.tab-content').load(url);
+	              
+}
+//跳转多功能输入
+function goFunctions(){ 
+	var url=ctx+'/memberOrder/queryMemberOrderFunctionsInfo?id='+$('#memberOrderId').val();
+	$('.tab-content').load(url);  
+	
+}
+//跳转到扩展   
+function goExtends(){
+	
+	var url=ctx+'/memberOrder/queryMemberOrderExtendsInfo?id='+$('#memberOrderId').val();
+	$('.tab-content').load(url);          
+}  
+  
+
+ 
+//保存
+function saveMemberOrder(){
+	 
+	$(".fa-save").attr("disabled","disabled");
+	$('.fa-save').html('正在保存...')
+	$.ajax({
+		url:ctx+"/memberOrder/saveMemberOrder",
+		type:"POST",
+		dataType:'json',
+		data:$("#data_form").serializeArray(),
+		complete:function(){
+			$(".fa-save").removeAttr("disabled");
+			$('.fa-save').html('保存')
+		},        
+		success:function(service){ 
+		
+			layer.confirm('保存成功,是否前往列表？', {
+				  btn: ['确认','取消'] //按钮
+				}, function(){
+					$('#goback span').trigger('click'); 
+				}, function(){         
+					layer.closeAll();
+			});  
+			
+		}
+	});  
+}
+ 
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/memberOrder/memberOrderList.js b/pluss-manage-page/src/main/resources/static/resources/js/memberOrder/memberOrderList.js
new file mode 100644
index 0000000..bf10a48
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/memberOrder/memberOrderList.js
@@ -0,0 +1,272 @@
+/**
+ * create by robot 
+ * date Wed Sep 25 17:39:35 CST 2019 
+ */ 
+
+var pageIndex=1;
+$(document).ready(function(){
+	//调用查询
+	pageIndex=StringUtil.getQueryString('pageIndex');
+	if(pageIndex==undefined||pageIndex==null){
+		pageIndex=1;
+	}
+	queryMemberOrder(pageIndex);
+	//绑定hover操作
+	$(document).on('mouseenter','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").show();
+		var width=15;
+		$(this).children('div').find('li').each(function(){
+			//获取li宽度
+			width+=$(this).width();
+		});
+		$(this).children('div').width(width);
+	})
+	$(document).on('mouseleave','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").hide();
+	});
+
+	//日历控件
+	layui.use(['layer', 'laydate'], function() {
+		var layer = layui.layer;
+		laydate = layui.laydate;
+		laydate.render({
+		elem: '#date1' //指定元素
+		});
+		laydate.render({
+			elem: '#date2' //指定元素
+		});
+	});
+
+	//行选中事件
+	$("#allCheck").find("span").click(function() {
+		$(this).toggleClass('checked');
+		if($(this).hasClass('checked')){
+			//所有列选中
+		  $(".checker").find("span").each(function () {
+		         $(this).addClass("checked");
+		    })
+		}else{
+			//所有列取消选中
+			$(".checker").find("span").each(function () {
+				 $(this).removeClass("checked");
+		    })
+		}
+	});
+
+	//单个选中
+	$(document).on('click','.checkeBox span',function() {
+		$(this).toggleClass('checked');
+		//设置头部事件
+		var length=$('.checkeBox span').length;
+		var count=0;
+		$(".checkeBox").find("span").each(function () {
+	        if($(this).hasClass("checked")){
+	        	count++;
+	        }
+	   })
+		//全选
+	   if(count==length){
+		   $("#allCheck").find("span").addClass('checked');
+	   }else{
+		   $("#allCheck").find("span").removeClass('checked');
+	   }
+	})
+	//左右div高度相等
+	var left_content_height = $(".right-content").height();
+	$(".left-content").height(left_content_height+35);
+	var sub_left_height=$(".res-menu").height(left_content_height-60);
+});
+
+//查询
+function queryMemberOrder(index){
+	if(typeof(index)=='undefined'){
+		index=1;
+	}
+	var url=ctx+'/memberOrder/queryMemberOrderByPage';
+	$.ajax({  
+        url:url,  
+        type:"post", 
+        dataType:"json",  
+        data:{  
+        	"currPage":index,
+        	"id":$('#searchId').val()
+        },  
+        success:function(result){  
+        	//渲染数据
+        	$('#data_content').empty();
+        	var header='';
+        	$.each(result.memberOrderList,function(i){
+        		var memberOrder=result.memberOrderList[i];
+        		var data='';
+        		data+='<tr class="odd">';
+        		data+='<td class="textc">';
+				data+='		 <div class="checker checkeBox">';        		data+='		 <span class=""  data-id="'+memberOrder.id+'"><input type="checkbox"  value=""></span>';
+        		data+='		</div>';
+        		data+='</td>';
+        		data+='<td class="textc">'+memberOrder.id+'</td>';
+        		data+='<td class="textc">'+memberOrder.merchantCode+'</td>';
+        		data+='<td class="textc">'+memberOrder.merchantName+'</td>';
+        		data+='<td class="textc">'+memberOrder.storeId+'</td>';
+        		data+='<td class="textc">'+memberOrder.storeName+'</td>';
+        		data+='<td class="textc">'+memberOrder.memberCode+'</td>';
+        		data+='<td class="textc">'+memberOrder.nickName+'</td>';
+        		data+='<td class="textc">'+memberOrder.createDt+'</td>';
+        		data+='<td class="textc">'+memberOrder.orderType+'</td>';
+        		data+='<td class="textc">'+memberOrder.orderFee+'</td>';
+        		data+='<td class="textc">'+memberOrder.orderStatus+'</td>';
+        		data+='<td class="textc">'+memberOrder.rechargeType+'</td>';
+        		data+='<td class="textc">';
+        		data+='<div class="positionr listOperaters">';
+        		data+='		<a href="javascript:void(0);"  class="icon-large dlblock w16 h16"><img src="'+resourcePath+'/images/angle-down.png"/></a>';
+        		data+='		<div class="ops_box ops_itemDiv positiona clearfix whitebg">';
+        		data+='			<ul>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showMemberOrderDetails('+memberOrder.id+')" class="btn btn-primary fa fa-edit ops_more f12">编辑</a></li>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="initDeleteMemberOrder('+memberOrder.id+')" class="btn btn-primary fa fa-remove ops_more f12">删除</a></li>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showMemberOrderDetails('+memberOrder.id+')" class="btn btn-primary fa fa-detail ops_more f12">明细</a></li>';
+        	    data+='			</ul>';
+              data+='		</div>';
+        	    data+='</div>';
+        	    data+='</td>';
+        	    data+='</tr>';
+        	    $('#data_content').append(data);
+        	});
+        	//分页
+        	$('#pageCount').html(result.pageCount);
+      	$('#currPage').html(result.currPage);
+          $('#totalCount').html(result.count);
+           	//设置分页
+           	pageIndex=result.currPage;
+			$('#pagination').pagination({
+				pageCount: result.pageCount,
+				jump: true,
+				coping: true,
+				jump: true,
+				homePage: '首页',
+				endPage: '末页',
+				prevContent: '上页',
+				nextContent: '下页',
+				current:result.currPage,
+				callback:function(api){
+					pageIndex=api.getCurrent();
+					queryMemberOrder(api.getCurrent());
+				}
+			});
+        } 
+    });  
+	//表头列不选中
+	$("#allCheck").find("span").removeClass('checked');
+}
+
+//初始化新增
+function initAddMemberOrder(){
+	window.location=ctx+'/memberOrder/queryMemberOrderDetails?pageIndex='+pageIndex;
+}
+
+//初始化修改
+function showMemberOrderDetails(id){
+	window.location=ctx+'/memberOrder/queryMemberOrderDetails?id='+id+'&pageIndex='+pageIndex;
+}
+
+//初始化删除
+function initDeleteMemberOrder(id){
+	
+		layer.open({
+		type: 1,
+		closeBtn: 1,		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r'	, //按钮居中
+		shade: 0.3 ,//不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteMemberOrder(id,true);
+		}
+	});
+}
+
+//删除
+function deleteMemberOrder(id,showMsg){
+	$.ajax({
+		url:ctx+'/memberOrder/deleteMemberOrder',
+		data:[{
+			name:'id',
+			value:id
+		}],
+		type:'POST',
+		dataType:'json',
+		success:function(){
+			queryMemberOrder(pageIndex);
+			if(showMsg){
+				layer.msg('删除成功!');	
+			}
+		}
+	});
+}
+//头部编辑
+function initEditMemberOrder(){
+	var count=0;
+	var id=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+        	 id=$(this).data('id');
+         }
+    })
+    if(count>1){
+    	layer.msg('只能选中一行记录进行操作!');
+    	return ;
+    }
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	 if(id>0){
+	  showMemberOrderDetails(id);
+	 }
+}
+//头部删除
+function initBatchDeleteMemberOrder(){
+	var count=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+         }
+    })
+	
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	
+
+	layer.open({
+		type: 1,
+		closeBtn: 1,
+		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r', //按钮居中
+		shade: 0.3, //不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteBatchMemberOrder();
+		}
+	});
+	
+}
+//批量删除
+function deleteBatchMemberOrder(){
+	
+	$(".checkeBox").find("span").each(function () {
+        if($(this).hasClass("checked")){
+        	var id=$(this).data('id');
+        	deleteMemberOrder(id,false);
+        	layer.msg('删除成功!');	
+        }
+   })
+}
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/merchantAddress/merchantAddressDetails.js b/pluss-manage-page/src/main/resources/static/resources/js/merchantAddress/merchantAddressDetails.js
new file mode 100644
index 0000000..0dae167
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/merchantAddress/merchantAddressDetails.js
@@ -0,0 +1,96 @@
+/**
+ * create by robot 
+ * date Mon Dec 23 09:39:24 CST 2019 
+ */ 
+
+$(document).ready(function(){
+	//form表单样式
+	layui.use(['layer', 'form'], function() {
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+	//li 切换事件
+	$(".nav-tabs>li").click(function() {
+		var index = $(".nav-tabs>li").index(this);
+		$(this).addClass("active").siblings("li").removeClass("active");
+		
+	})
+	//弹出一个提示层
+	$('.fa-save').on('click', function() {
+		saveMerchantAddress();
+	});
+
+	//绑定标签栏事件
+	$(document).on('click','.nav-tabs li',function(){
+
+		var action =$(this).data('action');
+		 switch (action) {
+			case "base"://基本资料
+				goBase();
+				break;  
+			case "functions"://多功能
+				goFunctions();
+				break;
+			case "extends"://扩展    
+				goExtends();         
+				break;           
+		 }
+	})
+
+	//加载第一个标签
+	$('.nav-tabs li').eq(0).click();
+	
+});
+
+
+//跳转基本信息 
+function goBase(){
+	var url=ctx+'/merchantAddress/queryMerchantAddressBaseInfo?id='+$('#merchantAddressId').val();
+	$('.tab-content').load(url);
+	              
+}
+//跳转多功能输入
+function goFunctions(){ 
+	var url=ctx+'/merchantAddress/queryMerchantAddressFunctionsInfo?id='+$('#merchantAddressId').val();
+	$('.tab-content').load(url);  
+	
+}
+//跳转到扩展   
+function goExtends(){
+	
+	var url=ctx+'/merchantAddress/queryMerchantAddressExtendsInfo?id='+$('#merchantAddressId').val();
+	$('.tab-content').load(url);          
+}  
+  
+
+ 
+//保存
+function saveMerchantAddress(){
+	 
+	$(".fa-save").attr("disabled","disabled");
+	$('.fa-save').html('正在保存...')
+	$.ajax({
+		url:ctx+"/merchantAddress/saveMerchantAddress",
+		type:"POST",
+		dataType:'json',
+		data:$("#data_form").serializeArray(),
+		complete:function(){
+			$(".fa-save").removeAttr("disabled");
+			$('.fa-save').html('保存')
+		},        
+		success:function(service){ 
+		
+			layer.confirm('保存成功,是否前往列表？', {
+				  btn: ['确认','取消'] //按钮
+				}, function(){
+					$('#goback span').trigger('click'); 
+				}, function(){         
+					layer.closeAll();
+			});  
+			
+		}
+	});  
+}
+ 
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/merchantAddress/merchantAddressList.js b/pluss-manage-page/src/main/resources/static/resources/js/merchantAddress/merchantAddressList.js
new file mode 100644
index 0000000..fb4c105
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/merchantAddress/merchantAddressList.js
@@ -0,0 +1,270 @@
+/**
+ * create by robot 
+ * date Mon Dec 23 09:39:24 CST 2019 
+ */ 
+
+var pageIndex=1;
+$(document).ready(function(){
+	//调用查询
+	pageIndex=StringUtil.getQueryString('pageIndex');
+	if(pageIndex==undefined||pageIndex==null){
+		pageIndex=1;
+	}
+	queryMerchantAddress(pageIndex);
+	//绑定hover操作
+	$(document).on('mouseenter','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").show();
+		var width=15;
+		$(this).children('div').find('li').each(function(){
+			//获取li宽度
+			width+=$(this).width();
+		});
+		$(this).children('div').width(width);
+	})
+	$(document).on('mouseleave','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").hide();
+	});
+
+	//日历控件
+	layui.use(['layer', 'laydate'], function() {
+		var layer = layui.layer;
+		laydate = layui.laydate;
+		laydate.render({
+		elem: '#date1' //指定元素
+		});
+		laydate.render({
+			elem: '#date2' //指定元素
+		});
+	});
+
+
+	//行选中事件
+	$("#allCheck").find("span").click(function() {
+		$(this).toggleClass('checked');
+		if($(this).hasClass('checked')){
+			//所有列选中
+		  $(".checker").find("span").each(function () {
+		         $(this).addClass("checked");
+		    })
+		}else{
+			//所有列取消选中
+			$(".checker").find("span").each(function () {
+				 $(this).removeClass("checked");
+		    })
+		}
+	});
+
+	//单个选中
+	$(document).on('click','.checkeBox span',function() {
+		$(this).toggleClass('checked');
+		//设置头部事件
+		var length=$('.checkeBox span').length;
+		var count=0;
+		$(".checkeBox").find("span").each(function () {
+	        if($(this).hasClass("checked")){
+	        	count++;
+	        }
+	   })
+		//全选
+	   if(count==length){
+		   $("#allCheck").find("span").addClass('checked');
+	   }else{
+		   $("#allCheck").find("span").removeClass('checked');
+	   }
+	})
+	//左右div高度相等
+	var left_content_height = $(".right-content").height();
+	$(".left-content").height(left_content_height+35);
+	var sub_left_height=$(".res-menu").height(left_content_height-60);
+});
+
+//查询
+function queryMerchantAddress(index){
+	if(typeof(index)=='undefined'){
+		index=1;
+	}
+	var url=ctx+'/merchantAddress/queryMerchantAddressByPage';
+	$.ajax({  
+        url:url,  
+        type:"post", 
+        dataType:"json",  
+        data:{  
+        	"currPage":index,
+        	"id":$('#searchId').val()
+        },  
+        success:function(result){  
+        	//渲染数据
+        	$('#data_content').empty();
+        	var header='';
+        	$.each(result.merchantAddressList,function(i){
+        		var merchantAddress=result.merchantAddressList[i];
+        		var data='';
+        		data+='<tr class="odd">';
+        		data+='<td class="textc">';
+				data+='		 <div class="checker checkeBox">';        		data+='		 <span class=""  data-id="'+merchantAddress.id+'"><input type="checkbox"  value=""></span>';
+        		data+='		</div>';
+        		data+='</td>';
+        		data+='<td class="textc">'+merchantAddress.id+'</td>';
+        		data+='<td class="textc">'+merchantAddress.userId+'</td>';
+        		data+='<td class="textc">'+merchantAddress.merchantCode+'</td>';
+        		data+='<td class="textc">'+merchantAddress.provinces+'</td>';
+        		data+='<td class="textc">'+merchantAddress.address+'</td>';
+        		data+='<td class="textc">'+merchantAddress.linkPhone+'</td>';
+        		data+='<td class="textc">'+merchantAddress.linkName+'</td>';
+        		data+='<td class="textc">'+merchantAddress.isDefault+'</td>';
+        		data+='<td class="textc">'+merchantAddress.createDt+'</td>';
+        		data+='<td class="textc">';
+        		data+='<div class="positionr listOperaters">';
+        		data+='		<a href="javascript:void(0);"  class="icon-large dlblock w16 h16"><img src="'+resourcePath+'/images/angle-down.png"/></a>';
+        		data+='		<div class="ops_box ops_itemDiv positiona clearfix whitebg">';
+        		data+='			<ul>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showMerchantAddressDetails('+merchantAddress.id+')" class="btn btn-primary fa fa-edit ops_more f12">编辑</a></li>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="initDeleteMerchantAddress('+merchantAddress.id+')" class="btn btn-primary fa fa-remove ops_more f12">删除</a></li>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showMerchantAddressDetails('+merchantAddress.id+')" class="btn btn-primary fa fa-detail ops_more f12">明细</a></li>';
+        	    data+='			</ul>';
+              data+='		</div>';
+        	    data+='</div>';
+        	    data+='</td>';
+        	    data+='</tr>';
+        	    $('#data_content').append(data);
+        	});
+        	//分页
+        	$('#pageCount').html(result.pageCount);
+      	$('#currPage').html(result.currPage);
+          $('#totalCount').html(result.count);
+           	//设置分页
+           	pageIndex=result.currPage;
+			$('#pagination').pagination({
+				pageCount: result.pageCount,
+				jump: true,
+				coping: true,
+				jump: true,
+				homePage: '首页',
+				endPage: '末页',
+				prevContent: '上页',
+				nextContent: '下页',
+				current:result.currPage,
+				callback:function(api){
+					pageIndex=api.getCurrent();
+					queryMerchantAddress(api.getCurrent());
+				}
+			});
+        } 
+    });  
+	//表头列不选中
+	$("#allCheck").find("span").removeClass('checked');
+}
+
+//初始化新增
+function initAddMerchantAddress(){
+	window.location=ctx+'/merchantAddress/queryMerchantAddressDetails?pageIndex='+pageIndex;
+}
+
+//初始化修改
+function showMerchantAddressDetails(id){
+	window.location=ctx+'/merchantAddress/queryMerchantAddressDetails?id='+id+'&pageIndex='+pageIndex;
+}
+
+//初始化删除
+function initDeleteMerchantAddress(id){
+	
+		layer.open({
+		type: 1,
+		closeBtn: 1,		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r'	, //按钮居中
+		shade: 0.3 ,//不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteMerchantAddress(id,true);
+		}
+	});
+}
+
+//删除
+function deleteMerchantAddress(id,showMsg){
+	$.ajax({
+		url:ctx+'/merchantAddress/deleteMerchantAddress',
+		data:[{
+			name:'id',
+			value:id
+		}],
+		type:'POST',
+		dataType:'json',
+		success:function(){
+			queryMerchantAddress(pageIndex);
+			if(showMsg){
+				layer.msg('删除成功!');	
+			}
+		}
+	});
+}
+//头部编辑
+function initEditMerchantAddress(){
+	var count=0;
+	var id=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+        	 id=$(this).data('id');
+         }
+    })
+    if(count>1){
+    	layer.msg('只能选中一行记录进行操作!');
+    	return ;
+    }
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	 if(id>0){
+	  showMerchantAddressDetails(id);
+	 }
+}
+//头部删除
+function initBatchDeleteMerchantAddress(){
+	var count=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+         }
+    })
+	
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	
+
+	layer.open({
+		type: 1,
+		closeBtn: 1,
+		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r', //按钮居中
+		shade: 0.3, //不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteBatchMerchantAddress();
+		}
+	});
+	
+}
+//批量删除
+function deleteBatchMerchantAddress(){
+	
+	$(".checkeBox").find("span").each(function () {
+        if($(this).hasClass("checked")){
+        	var id=$(this).data('id');
+        	deleteMerchantAddress(id,false);
+        	layer.msg('删除成功!');	
+        }
+   })
+}
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/merchantBankCard/merchantBankCardDetails.js b/pluss-manage-page/src/main/resources/static/resources/js/merchantBankCard/merchantBankCardDetails.js
new file mode 100644
index 0000000..7ca8db9
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/merchantBankCard/merchantBankCardDetails.js
@@ -0,0 +1,96 @@
+/**
+ * create by robot 
+ * date Tue Sep 10 15:03:55 CST 2019 
+ */ 
+
+$(document).ready(function(){
+	//form表单样式
+	layui.use(['layer', 'form'], function() {
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+	//li 切换事件
+	$(".nav-tabs>li").click(function() {
+		var index = $(".nav-tabs>li").index(this);
+		$(this).addClass("active").siblings("li").removeClass("active");
+		
+	})
+	//弹出一个提示层
+	$('.fa-save').on('click', function() {
+		saveMerchantBankCard();
+	});
+
+	//绑定标签栏事件
+	$(document).on('click','.nav-tabs li',function(){
+
+		var action =$(this).data('action');
+		 switch (action) {
+			case "base"://基本资料
+				goBase();
+				break;  
+			case "functions"://多功能
+				goFunctions();
+				break;
+			case "extends"://扩展    
+				goExtends();         
+				break;           
+		 }
+	})
+
+	//加载第一个标签
+	$('.nav-tabs li').eq(0).click();
+	
+});
+
+
+//跳转基本信息 
+function goBase(){
+	var url=ctx+'/merchantBankCard/queryMerchantBankCardBaseInfo?id='+$('#merchantBankCardId').val();
+	$('.tab-content').load(url);
+	              
+}
+//跳转多功能输入
+function goFunctions(){ 
+	var url=ctx+'/merchantBankCard/queryMerchantBankCardFunctionsInfo?id='+$('#merchantBankCardId').val();
+	$('.tab-content').load(url);  
+	
+}
+//跳转到扩展   
+function goExtends(){
+	
+	var url=ctx+'/merchantBankCard/queryMerchantBankCardExtendsInfo?id='+$('#merchantBankCardId').val();
+	$('.tab-content').load(url);          
+}  
+  
+
+ 
+//保存
+function saveMerchantBankCard(){
+	 
+	$(".fa-save").attr("disabled","disabled");
+	$('.fa-save').html('正在保存...')
+	$.ajax({
+		url:ctx+"/merchantBankCard/saveMerchantBankCard",
+		type:"POST",
+		dataType:'json',
+		data:$("#data_form").serializeArray(),
+		complete:function(){
+			$(".fa-save").removeAttr("disabled");
+			$('.fa-save').html('保存')
+		},        
+		success:function(service){ 
+		
+			layer.confirm('保存成功,是否前往列表？', {
+				  btn: ['确认','取消'] //按钮
+				}, function(){
+					$('#goback span').trigger('click'); 
+				}, function(){         
+					layer.closeAll();
+			});  
+			
+		}
+	});  
+}
+ 
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/merchantBankCard/merchantBankCardList.js b/pluss-manage-page/src/main/resources/static/resources/js/merchantBankCard/merchantBankCardList.js
new file mode 100644
index 0000000..b7f6549
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/merchantBankCard/merchantBankCardList.js
@@ -0,0 +1,354 @@
+/**
+ * create by robot 
+ * date Tue Sep 10 15:03:55 CST 2019 
+ */ 
+
+var pageIndex=1;
+$(document).ready(function(){
+	//调用查询
+	pageIndex=StringUtil.getQueryString('pageIndex');
+	if(pageIndex==undefined||pageIndex==null){
+		pageIndex=1;
+	}
+	queryMerchantBankCard(pageIndex);
+	//绑定hover操作
+	$(document).on('mouseenter','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").show();
+		var width=15;
+		$(this).children('div').find('li').each(function(){
+			//获取li宽度
+			width+=$(this).width();
+		});
+		$(this).children('div').width(width);
+	})
+	$(document).on('mouseleave','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").hide();
+	});
+
+	//日历控件
+	layui.use(['layer', 'laydate'], function() {
+		var layer = layui.layer;
+		laydate = layui.laydate;
+		laydate.render({
+		elem: '#date1' //指定元素
+		});
+		laydate.render({
+			elem: '#date2' //指定元素
+		});
+	});
+
+	//行选中事件
+	$("#allCheck").find("span").click(function() {
+		$(this).toggleClass('checked');
+		if($(this).hasClass('checked')){
+			//所有列选中
+		  $(".checker").find("span").each(function () {
+		         $(this).addClass("checked");
+		    })
+		}else{
+			//所有列取消选中
+			$(".checker").find("span").each(function () {
+				 $(this).removeClass("checked");
+		    })
+		}
+	});
+
+	//单个选中
+	$(document).on('click','.checkeBox span',function() {
+		$(this).toggleClass('checked');
+		//设置头部事件
+		var length=$('.checkeBox span').length;
+		var count=0;
+		$(".checkeBox").find("span").each(function () {
+	        if($(this).hasClass("checked")){
+	        	count++;
+	        }
+	   })
+		//全选
+	   if(count==length){
+		   $("#allCheck").find("span").addClass('checked');
+	   }else{
+		   $("#allCheck").find("span").removeClass('checked');
+	   }
+	})
+	//左右div高度相等
+	var left_content_height = $(".right-content").height();
+	$(".left-content").height(left_content_height+35);
+	var sub_left_height=$(".res-menu").height(left_content_height-60);
+});
+
+//查询
+function queryMerchantBankCard(index){
+	if(typeof(index)=='undefined'){
+		index=1;
+	}
+	var url=ctx+'/merchantBankCard/queryMerchantBankCardByPage';
+	$.ajax({  
+        url:url,  
+        type:"post", 
+        dataType:"json",  
+        data:{  
+        	"currPage":index,
+        	"alias":$("#alias").val(),
+        	"userId":$("#userId").val(),
+        	"linkPhone":$("#phone").val(),
+        },  
+        success:function(result){  
+        	var presentPage = result.currPage;
+        	//渲染数据
+        	$('#data_content').empty();
+        	var header='';
+        	$.each(result.merchantBankCardList,function(i){
+        		var orderNumber = (presentPage-1)*12+i+1;
+        		var merchantBankCard=result.merchantBankCardList[i];
+        		var data='';
+        		var createDt='';
+        		if(merchantBankCard.createDt!=null){
+        			createDt=new Date(merchantBankCard.createDt).toYYYYMMDD();
+        		}
+        	/*	var updateDt='';
+        		if(merchantBankCard.updateDt!=null){
+        			updateDt=new Date(merchantBankCard.updateDt).toYYYYMMDD();
+        		}*/
+        		var cardHolderAddress="";
+        		if(merchantBankCard.cardHolderAddress!=null&&merchantBankCard.cardHolderAddress!=""){
+        			cardHolderAddress=merchantBankCard.cardHolderAddress;
+        		}
+        		data+='<tr class="odd">';
+        		data+='<td class="textc">';
+				data+='		 <div class="checker checkeBox">';        		
+				data+='		 <span class=""  data-id="'+merchantBankCard.id+'"><input type="checkbox"  value=""></span>';
+        		data+='		</div>';
+        		data+='</td>';
+        		data+='<td class="textc">'+orderNumber+'</td>';
+        		data+='<td class="textc">'+merchantBankCard.userId+'</td>';
+        		var linkPhone = '';
+        		if(StringUtil.isNotBlank(merchantBankCard.linkPhone)){
+        			linkPhone = merchantBankCard.linkPhone;
+        		}
+        		data+='<td class="textc">'+linkPhone+'</td>';
+        		if(StringUtil.isNotBlank($("#admin").val())){
+        		}
+        		var alias = '';
+        		if(StringUtil.isNotBlank(merchantBankCard.alias)){
+        			alias=merchantBankCard.alias;
+        		}
+        		data+='<td class="textc">'+alias+'</td>';
+        		
+        		data+='<td class="textc">'+merchantBankCard.merchantName+'</td>';
+        		
+        		var auditStatus='';
+        			var aliStatus='';
+        			if(merchantBankCard.aliStatus=='0'||StringUtil.isBlank(merchantBankCard.aliStatus)){
+        				aliStatus='支付宝--未进件';
+        			}else if(merchantBankCard.aliStatus=='1'){
+        				aliStatus='支付宝--审核中';
+        			}else if(merchantBankCard.aliStatus=='2'){
+        				aliStatus='支付宝--审核失败';
+        			}else if(merchantBankCard.aliStatus=='3'){
+        				aliStatus='支付宝--已审核';
+        			}else if(merchantBankCard.aliStatus=='4'){
+        				aliStatus='支付宝--代签约';
+        			}
+        			var wechatStatus='';
+        			if(merchantBankCard.wechatStatus=='0'||StringUtil.isBlank(merchantBankCard.wechatStatus)){
+        				wechatStatus='微信--未进件';
+        			}else if(merchantBankCard.wechatStatus=='1'){
+        				wechatStatus='微信--审核中';
+        			}else if(merchantBankCard.wechatStatus=='2'){
+        				wechatStatus='微信--审核失败';
+        			}else if(merchantBankCard.wechatStatus=='3'){
+        				wechatStatus='微信--已审核';
+        			}else if(merchantBankCard.wechatStatus=='4'){
+        				wechatStatus='微信--代签约';
+        			}
+        			var leshuaStatus='';
+        			if(merchantBankCard.leshuaStatus=='0'||StringUtil.isBlank(merchantBankCard.leshuaStatus)){
+        				leshuaStatus='乐刷--未进件';
+        			}else if(merchantBankCard.leshuaStatus=='1'){
+        				leshuaStatus='乐刷--审核中';
+        			}else if(merchantBankCard.leshuaStatus=='2'){
+        				leshuaStatus='乐刷--审核失败';
+        			}else if(merchantBankCard.leshuaStatus=='3'){
+        				leshuaStatus='乐刷--已审核';
+        			}else if(merchantBankCard.leshuaStatus=='4'){
+        				leshuaStatus='乐刷--代签约';
+        			}
+        		auditStatus=aliStatus+'</br>'+wechatStatus+'</br>'+leshuaStatus;
+        		data+='<td class="textc">'+auditStatus+'</td>';
+        		var rate='';
+        		var aliRate='';
+        		if(StringUtil.isNotBlank(merchantBankCard.aliRate)){
+        			aliRate='支付宝--'+merchantBankCard.aliRate;
+        		}
+        		var wechatRate='';
+        		if(StringUtil.isNotBlank(merchantBankCard.wechatRate)){
+        			wechatRate='微信--'+merchantBankCard.wechatRate;
+        		}
+        		var leshuaRate='';
+        		if(StringUtil.isNotBlank(merchantBankCard.leshuaRate)){
+        			leshuaRate='乐刷--'+merchantBankCard.leshuaRate;
+        		}
+        		rate+=aliRate+'</br>'+wechatRate+'</br>'+leshuaRate
+        		data+='<td class="textc">'+rate+'</td>';
+        		/*data+='<td class="textc">';
+        		data+='<div class="positionr listOperaters">';
+        		data+='		<a href="javascript:void(0);"  class="icon-large dlblock w16 h16"><img src="'+resourcePath+'/images/angle-down.png"/></a>';
+        		data+='		<div class="ops_box ops_itemDiv positiona clearfix whitebg">';
+        		data+='			<ul>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showMerchantInfo('+merchantBankCard.userId+')" class="layui-btn layui-btn-sm layui-btn-radius fa fa-detail ops_more f12">详情</a></li>';
+        	    data+='			</ul>';
+        	    data+='		</div>';
+        	    data+='</div>';
+        	    data+='</td>';*/
+        	    data+='</tr>';
+        	    $('#data_content').append(data);
+        	});
+        	//分页
+        	$('#pageCount').html(result.pageCount);
+      	$('#currPage').html(result.currPage);
+          $('#totalCount').html(result.count);
+           	//设置分页
+           	pageIndex=result.currPage;
+			$('#pagination').pagination({
+				pageCount: result.pageCount,
+				jump: true,
+				coping: true,
+				jump: true,
+				homePage: '首页',
+				endPage: '末页',
+				prevContent: '上页',
+				nextContent: '下页',
+				current:result.currPage,
+				callback:function(api){
+					pageIndex=api.getCurrent();
+					queryMerchantBankCard(api.getCurrent());
+				}
+			});
+        } 
+    });  
+	//表头列不选中
+	$("#allCheck").find("span").removeClass('checked');
+}
+
+//初始化新增
+function initAddMerchantBankCard(){
+	window.location=ctx+'/merchantBankCard/queryMerchantBankCardDetails?pageIndex='+pageIndex;
+}
+
+//初始化修改
+function showMerchantBankCardDetails(id){
+	window.location=ctx+'/merchantBankCard/queryMerchantBankCardDetails?id='+id+'&pageIndex='+pageIndex;
+}
+
+//初始化删除
+function initDeleteMerchantBankCard(id){
+	
+		layer.open({
+		type: 1,
+		closeBtn: 1,		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r'	, //按钮居中
+		shade: 0.3 ,//不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteMerchantBankCard(id,true);
+		}
+	});
+}
+
+//删除
+function deleteMerchantBankCard(id,showMsg){
+	$.ajax({
+		url:ctx+'/merchantBankCard/deleteMerchantBankCard',
+		data:[{
+			name:'id',
+			value:id
+		}],
+		type:'POST',
+		dataType:'json',
+		success:function(){
+			queryMerchantBankCard(pageIndex);
+			if(showMsg){
+				layer.msg('删除成功!');	
+			}
+		}
+	});
+}
+//头部编辑
+function initEditMerchantBankCard(){
+	var count=0;
+	var id=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+        	 id=$(this).data('id');
+         }
+    })
+    if(count>1){
+    	layer.msg('只能选中一行记录进行操作!');
+    	return ;
+    }
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	 if(id>0){
+	  showMerchantBankCardDetails(id);
+	 }
+}
+//头部删除
+function initBatchDeleteMerchantBankCard(){
+	var count=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+         }
+    })
+	
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	
+
+	layer.open({
+		type: 1,
+		closeBtn: 1,
+		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r', //按钮居中
+		shade: 0.3, //不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteBatchMerchantBankCard();
+		}
+	});
+	
+}
+//批量删除
+function deleteBatchMerchantBankCard(){
+	
+	$(".checkeBox").find("span").each(function () {
+        if($(this).hasClass("checked")){
+        	var id=$(this).data('id');
+        	deleteMerchantBankCard(id,false);
+        	layer.msg('删除成功!');	
+        }
+   })
+}
+
+/**
+ * 跳转进件详情
+ * @returns
+ */
+function showMerchantInfo(userId){
+	window.location=ctx+"/merchantBankCard/queryMerchantInfo?userId="+userId;
+}
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/merchantBaseInfo/merchantBaseInfoDetails.js b/pluss-manage-page/src/main/resources/static/resources/js/merchantBaseInfo/merchantBaseInfoDetails.js
new file mode 100644
index 0000000..a560708
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/merchantBaseInfo/merchantBaseInfoDetails.js
@@ -0,0 +1,194 @@
+/**
+ * create by robot 
+ * date Tue Sep 10 15:03:55 CST 2019 
+ */ 
+
+$(document).ready(function(){
+	//form表单样式
+	layui.use(['layer', 'form'], function() {
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+	//li 切换事件
+	$(".nav-tabs>li").click(function() {
+		var index = $(".nav-tabs>li").index(this);
+		$(this).addClass("active").siblings("li").removeClass("active");
+		
+	})
+	//弹出一个提示层
+	$('.fa-save').on('click', function() {
+		saveMerchantBaseInfo();
+	});
+
+	//绑定标签栏事件
+	$(document).on('click','.nav-tabs li',function(){
+
+		var action =$(this).data('action');
+		 switch (action) {
+			case "base"://基本资料
+				goBase();
+				break;  
+			case "functions"://多功能
+				goFunctions();
+				break;
+			case "extends"://扩展    
+				goExtends();         
+				break;           
+		 }
+	})
+
+	//加载第一个标签
+	$('.nav-tabs li').eq(0).click();
+	
+});
+
+
+//跳转基本信息 
+function goBase(){
+	var url=ctx+'/merchantBaseInfo/queryMerchantBaseInfoBaseInfo?id='+$('#merchantBaseInfoId').val();
+	$('.tab-content').load(url);
+	              
+}
+//跳转多功能输入
+function goFunctions(){ 
+	var url=ctx+'/merchantBaseInfo/queryMerchantBaseInfoFunctionsInfo?id='+$('#merchantBaseInfoId').val();
+	$('.tab-content').load(url);  
+	
+}
+//跳转到扩展   
+function goExtends(){
+	
+	var url=ctx+'/merchantBaseInfo/queryMerchantBaseInfoExtendsInfo?id='+$('#merchantBaseInfoId').val();
+	$('.tab-content').load(url);          
+}  
+  
+
+ 
+//保存
+function saveMerchantBaseInfo(){
+	//商户名称
+	var merchantName=$("#merchantName").val();
+	if(StringUtil.isBlank(merchantName)){
+		layer.msg('请输入商户名称'); 
+		return;
+	}
+	//商户类型
+	var merchantType=$("#merchantType option:selected").val();
+	if(StringUtil.isBlank(merchantType)){
+		layer.msg('请选择商户类型'); 
+		return;
+	}
+	//商户经营类型
+	var dealType=$("#dealType option:selected").val();
+	if(StringUtil.isBlank(dealType)){
+		layer.msg('请选择商户经营类型'); 
+		return;
+	}
+	//商户清算资金是否支持T+0到账
+	var supportPrepayment=$("#supportPrepayment option:selected").val();
+	if(StringUtil.isBlank(supportPrepayment)){
+		layer.msg('请选择是否支持T+0到账'); 
+		return;
+	}
+	settleMode
+	//结算方式
+	var settleMode=$("#settleMode option:selected").val();
+	if(StringUtil.isBlank(settleMode)){
+		layer.msg('请选择结算方式'); 
+		return;
+	}
+	//经营类目
+	var mcc=$("#mcc").val();
+	if(StringUtil.isBlank(mcc)){
+		layer.msg('请输入经营类目'); 
+		return;
+	}
+	//是否支持花呗分期
+	var supportStage=$("#supportStage option:selected").val();
+	if(StringUtil.isBlank(supportStage)){
+		layer.msg('请选择是否支持花呗分期'); 
+		return;
+	}
+	//公众号相关信息的类型
+	var partnerType=$("#partnerType option:selected").val();
+	if(StringUtil.isBlank(partnerType)){
+		layer.msg('请选择公众号相关信息的类型'); 
+		return;
+	}
+	//支付宝费率版本
+	var rateVersion=$("#rateVersion option:selected").val();
+	if(StringUtil.isBlank(rateVersion)){
+		layer.msg('请选择支付宝费率版本'); 
+		return;
+	}
+	//商户简称
+	var alias=$("#alias").val();
+	if(StringUtil.isBlank(alias)){
+		layer.msg('请输入商户简称');
+		return;
+	}
+	//手机号
+	var contactMobile=$("#contactMobile").val();
+	if(StringUtil.isBlank(contactMobile)){
+		layer.msg('请输入手机号');
+		return;
+	}
+	if(StringUtil.isNotPhone(contactMobile)){
+		layer.msg('请输入正确的手机号'); 
+		return;
+	}
+	//联系人姓名
+	var contactName=$("#contactName").val();
+	if(StringUtil.isBlank(contactName)){
+		layer.msg('请输入联系人姓名'); 
+		return;
+	}
+	//地址
+	var address=$("#address").val();
+	if(StringUtil.isBlank(address)){
+		layer.msg('请输入地址'); 
+		return;
+	}
+	//商户客服电话
+	var servicePhoneNo = $("#servicePhoneNo").val();
+	if(StringUtil.isNotPhone(servicePhoneNo)){
+		if(StringUtil.isBlank(servicePhoneNo)){
+			layer.msg('请输入手机号');
+		}else{
+			layer.msg('请输入正确的手机号');
+		}
+		return;
+	}
+	var email=$("#email").val();
+	if(StringUtil.isNotEmail(email)){
+		layer.msg('请输入正确的邮箱格式'); 
+		return;
+	}
+	 
+	$(".fa-save").attr("disabled","disabled");
+	$('.fa-save').html('正在保存...')
+	$.ajax({
+		url:ctx+"/merchantBaseInfo/saveMerchantBaseInfo",
+		type:"POST",
+		dataType:'json',
+		data:$("#data_form").serializeArray(),
+		complete:function(){
+			$(".fa-save").removeAttr("disabled");
+			$('.fa-save').html('保存')
+		},        
+		success:function(service){ 
+		
+			layer.confirm('保存成功,是否前往列表？', {
+				  btn: ['确认','取消'] //按钮
+				}, function(){
+					$('#goback span').trigger('click');
+				}, function(){         
+					layer.closeAll();
+			});  
+			
+		}
+	});  
+}
+ 
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/merchantBaseInfo/merchantBaseInfoList.js b/pluss-manage-page/src/main/resources/static/resources/js/merchantBaseInfo/merchantBaseInfoList.js
new file mode 100644
index 0000000..cb3fca8
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/merchantBaseInfo/merchantBaseInfoList.js
@@ -0,0 +1,142 @@
+/**
+ * create by robot 
+ * date Tue Sep 10 15:03:55 CST 2019 
+ */ 
+
+var pageIndex=1;
+$(document).ready(function(){
+	//调用查询
+	pageIndex=StringUtil.getQueryString('pageIndex');
+	if(pageIndex==undefined||pageIndex==null){
+		pageIndex=1;
+	}
+	//绑定hover操作
+	$(document).on('mouseenter','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").show();
+		var width=15;
+		$(this).children('div').find('li').each(function(){
+			//获取li宽度
+			width+=$(this).width();
+		});
+		$(this).children('div').width(width);
+	})
+	$(document).on('mouseleave','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").hide();
+	});
+
+	//日历控件
+	layui.use(['layer', 'laydate'], function() {
+		var layer = layui.layer;
+		laydate = layui.laydate;
+		laydate.render({
+		elem: '#date1' //指定元素
+		});
+		laydate.render({
+			elem: '#date2' //指定元素
+		});
+	});
+
+
+	//行选中事件
+	$("#allCheck").find("span").click(function() {
+		$(this).toggleClass('checked');
+		if($(this).hasClass('checked')){
+			//所有列选中
+		  $(".checker").find("span").each(function () {
+		         $(this).addClass("checked");
+		    })
+		}else{
+			//所有列取消选中
+			$(".checker").find("span").each(function () {
+				 $(this).removeClass("checked");
+		    })
+		}
+	});
+
+	//单个选中
+	$(document).on('click','.checkeBox span',function() {
+		$(this).toggleClass('checked');
+		//设置头部事件
+		var length=$('.checkeBox span').length;
+		var count=0;
+		$(".checkeBox").find("span").each(function () {
+	        if($(this).hasClass("checked")){
+	        	count++;
+	        }
+	   })
+		//全选
+	   if(count==length){
+		   $("#allCheck").find("span").addClass('checked');
+	   }else{
+		   $("#allCheck").find("span").removeClass('checked');
+	   }
+	})
+	//左右div高度相等
+	var left_content_height = $(".right-content").height();
+	$(".left-content").height(left_content_height+35);
+	var sub_left_height=$(".res-menu").height(left_content_height-60);
+});
+
+function updateBaseInfoLeshuaRate(id){
+	var htmlStr = '<div style="margin: 10px;"><label >商户费率：</label><input id="leshuaRate"></div>';
+	layer.open({
+		type:1,
+		title:'商家费率',
+		area: '350px;',
+		shade:0.3,
+		maxmin:true,
+		content:htmlStr,
+		btn:['确定','取消'],
+		yes:function(){
+			var leshuaRate = $("#leshuaRate").val();
+			if(parseFloat(leshuaRate)<parseFloat(0.0021)){
+				layer.msg('费率不能比0.0021小');
+				return;
+			}
+			if(parseFloat(leshuaRate)>0.01){
+				layer.msg('费率不能比0.001大');
+				return;
+			}
+			updateRate(id,2,leshuaRate);
+		},
+	})
+}
+
+function updateRate(id,aisle,rate){
+	$.ajax({
+		url:ctx+'/merchantBaseInfo/updateRate',
+		data:{
+			"id":id,
+			"aisle":aisle,
+			"rate":rate,
+		},
+		dataType:"json",
+		type:"post",
+		success:function(res){
+			layer.msg(res.msg);
+			queryMerchantBaseInfo(pageIndex);
+			setTimeout(function (){layer.closeAll();},1500);
+		}
+	})
+}
+
+
+//时间格式化处理
+function dateFtt(fmt,date)   
+{ //author: meizz   
+  var o = {   
+    "M+" : date.getMonth()+1,                 //月份   
+    "d+" : date.getDate(),                    //日   
+    "h+" : date.getHours(),                   //小时   
+    "m+" : date.getMinutes(),                 //分   
+    "s+" : date.getSeconds(),                 //秒   
+    "q+" : Math.floor((date.getMonth()+3)/3), //季度   
+    "S"  : date.getMilliseconds()             //毫秒   
+  };   
+  if(/(y+)/.test(fmt))   
+    fmt=fmt.replace(RegExp.$1, (date.getFullYear()+"").substr(4 - RegExp.$1.length));   
+  for(var k in o)   
+    if(new RegExp("("+ k +")").test(fmt))   
+  fmt = fmt.replace(RegExp.$1, (RegExp.$1.length==1) ? (o[k]) : (("00"+ o[k]).substr((""+ o[k]).length)));   
+  return fmt;   
+} 
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/merchantBaseInfo/moreMerchantList.js b/pluss-manage-page/src/main/resources/static/resources/js/merchantBaseInfo/moreMerchantList.js
new file mode 100644
index 0000000..a84b7e5
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/merchantBaseInfo/moreMerchantList.js
@@ -0,0 +1,327 @@
+/**
+ * create by robot 
+ * date Tue Sep 10 15:03:55 CST 2019 
+ */ 
+
+var pageIndex=1;
+$(document).ready(function(){
+	//调用查询
+	pageIndex=StringUtil.getQueryString('pageIndex');
+	if(pageIndex==undefined||pageIndex==null){
+		pageIndex=1;
+	}
+	queryMoreMerchantBaseInfoByPage(pageIndex);
+	//绑定hover操作
+	$(document).on('mouseenter','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").show();
+		var width=15;
+		$(this).children('div').find('li').each(function(){
+			//获取li宽度
+			width+=$(this).width();
+		});
+		$(this).children('div').width(width);
+	})
+	$(document).on('mouseleave','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").hide();
+	});
+
+	//日历控件
+	layui.use(['layer', 'laydate'], function() {
+		var layer = layui.layer;
+		laydate = layui.laydate;
+		laydate.render({
+		elem: '#date1' //指定元素
+		});
+		laydate.render({
+			elem: '#date2' //指定元素
+		});
+	});
+
+
+	//行选中事件
+	$("#allCheck").find("span").click(function() {
+		$(this).toggleClass('checked');
+		if($(this).hasClass('checked')){
+			//所有列选中
+		  $(".checker").find("span").each(function () {
+		         $(this).addClass("checked");
+		    })
+		}else{
+			//所有列取消选中
+			$(".checker").find("span").each(function () {
+				 $(this).removeClass("checked");
+		    })
+		}
+	});
+
+	//单个选中
+	$(document).on('click','.checkeBox span',function() {
+		$(this).toggleClass('checked');
+		//设置头部事件
+		var length=$('.checkeBox span').length;
+		var count=0;
+		$(".checkeBox").find("span").each(function () {
+	        if($(this).hasClass("checked")){
+	        	count++;
+	        }
+	   })
+		//全选
+	   if(count==length){
+		   $("#allCheck").find("span").addClass('checked');
+	   }else{
+		   $("#allCheck").find("span").removeClass('checked');
+	   }
+	})
+	//左右div高度相等
+	var left_content_height = $(".right-content").height();
+	$(".left-content").height(left_content_height+35);
+	var sub_left_height=$(".res-menu").height(left_content_height-60);
+});
+
+//查询
+function queryMoreMerchantBaseInfoByPage(index){
+	//alert(11);
+	if(typeof(index)=='undefined'){
+		index=1;
+	}
+	var url=ctx+'/merchantBaseInfo/queryMoreMerchantBaseInfoByPage';
+	$.ajax({  
+        url:url,  
+        type:"post", 
+        dataType:"json",  
+        data:{  
+        	"currPage":index,
+        	//"id":$('#searchId').val(),
+        	"userName":$("#userName").val(),
+        },  
+        success:function(result){ 
+        	var presentPage = result.currPage;
+        	//渲染数据
+        	$('#data_content').empty();
+        	var header='';
+        	$.each(result.merchantBaseInfoList,function(i){
+        		var orderNumber = (presentPage-1)*12+i+1;
+        		var merchantBaseInfo=result.merchantBaseInfoList[i];
+        		
+        		
+        		
+        		var data='';
+        		
+        		data+='<tr class="odd">';
+        		data+='<td class="textc">';
+				data+='		 <div class="checker checkeBox">';        		
+				data+='		 <span class=""  data-id="'+merchantBaseInfo.id+'"><input type="checkbox"  value=""></span>';
+        		data+='		</div>';
+        		data+='</td>';
+        		data+='<td class="textc">'+orderNumber+'</td>';
+        		data+='<td class="textc">'+merchantBaseInfo.merchantName+'</td>';
+        		data+='<td class="textc">'+merchantBaseInfo.mccName+'</td>';
+        		data+='<td class="textc">'+merchantBaseInfo.contactMobile+'</td>';
+        		data+='<td class="textc">'+merchantBaseInfo.leshuaMerchantAddress+''+merchantBaseInfo.address+'</td>';
+        		data+='<td class="textc">'+merchantBaseInfo.merchantCode+'</td>';
+        		data+='<td class="textc">'+merchantBaseInfo.status+'</td>';
+        		
+    			data+='<td class="textc">';
+    			data+='<div class="positionr listOperaters">';
+    			data+='		<a href="javascript:void(0);"  class="icon-large dlblock w16 h16"><img src="'+resourcePath+'/images/angle-down.png"/></a>';
+    			data+='		<div class="ops_box ops_itemDiv positiona clearfix whitebg">';
+    			data+='			<ul>';
+    			data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showMerchantInfo(\''+merchantBaseInfo.merchantCode+'\')" class="btn btn-primary fa fa-edit ops_more f12">详情</a></li>';
+    			data+='			</ul>';
+    			data+='		</div>';
+    			data+='</div>';
+    			data+='</td>';
+        		
+        	    data+='</tr>';
+        	    $('#data_content').append(data);
+        	});
+        	//分页
+        	$('#pageCount').html(result.pageCount);
+      	$('#currPage').html(result.currPage);
+          $('#totalCount').html(result.count);
+           	//设置分页
+           	pageIndex=result.currPage;
+			$('#pagination').pagination({
+				pageCount: result.pageCount,
+				jump: true,
+				coping: true,
+				jump: true,
+				homePage: '首页',
+				endPage: '末页',
+				prevContent: '上页',
+				nextContent: '下页',
+				current:result.currPage,
+				callback:function(api){
+					pageIndex=api.getCurrent();
+					queryMerchantBaseInfo(api.getCurrent());
+				}
+			});
+        } 
+    });  
+	//表头列不选中
+	$("#allCheck").find("span").removeClass('checked');
+}
+
+//初始化新增
+function initAddMerchantBaseInfo(){
+	window.location=ctx+'/merchantBaseInfo/queryMerchantBaseInfoDetails?pageIndex='+pageIndex;
+}
+
+//初始化修改
+function showMerchantBaseInfoDetails(id){
+	window.location=ctx+'/merchantBaseInfo/queryMerchantBaseInfoDetails?id='+id+'&pageIndex='+pageIndex;
+}
+
+//初始化删除
+function initDeleteMerchantBaseInfo(id){
+	
+		layer.open({
+		type: 1,
+		closeBtn: 1,		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r'	, //按钮居中
+		shade: 0.3 ,//不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteMerchantBaseInfo(id,true);
+		}
+	});
+}
+
+//删除
+function deleteMerchantBaseInfo(id,showMsg){
+	$.ajax({
+		url:ctx+'/merchantBaseInfo/deleteMerchantBaseInfo',
+		data:[{
+			name:'id',
+			value:id
+		}],
+		type:'POST',
+		dataType:'json',
+		success:function(){
+			queryMerchantBaseInfo(pageIndex);
+			if(showMsg){
+				layer.msg('删除成功!');	
+			}
+		}
+	});
+}
+//头部编辑
+function initEditMerchantBaseInfo(){
+	var count=0;
+	var id=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+        	 id=$(this).data('id');
+         }
+    })
+    if(count>1){
+    	layer.msg('只能选中一行记录进行操作!');
+    	return ;
+    }
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	 if(id>0){
+	  showMerchantBaseInfoDetails(id);
+	 }
+}
+//头部删除
+function initBatchDeleteMerchantBaseInfo(){
+	var count=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+         }
+    })
+	
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	
+
+	layer.open({
+		type: 1,
+		closeBtn: 1,
+		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r', //按钮居中
+		shade: 0.3, //不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteBatchMerchantBaseInfo();
+		}
+	});
+	
+}
+//批量删除
+function deleteBatchMerchantBaseInfo(){
+	
+	$(".checkeBox").find("span").each(function () {
+        if($(this).hasClass("checked")){
+        	var id=$(this).data('id');
+        	deleteMerchantBaseInfo(id,false);
+        	layer.msg('删除成功!');	
+        }
+   })
+}
+
+function updateLeshuaRate(id){
+	var htmlStr = '<div style="margin: 10px;"><label >商户费率：</label><input id="leshuaRate"></div>';
+	layer.open({
+		type:1,
+		title:'商家费率',
+		area: '350px;',
+		shade:0.3,
+		maxmin:true,
+		content:htmlStr,
+		btn:['确定','取消'],
+		yes:function(){
+			var leshuaRate = $("#leshuaRate").val();
+			if(parseFloat(leshuaRate)<parseFloat(0.0021)){
+				layer.msg('费率不能比0.0021小');
+				return;
+			}
+			if(parseFloat(leshuaRate)>0.01){
+				layer.msg('费率不能比0.001大');
+				return;
+			}
+			updateRate(id,2,leshuaRate);
+		},
+	})
+}
+
+function updateRate(id,aisle,rate){
+	$.ajax({
+		url:ctx+'/merchantBaseInfo/updateRate',
+		data:{
+			"id":id,
+			"aisle":aisle,
+			"rate":rate,
+		},
+		dataType:"json",
+		type:"post",
+		success:function(res){
+			layer.msg(res.msg);
+			queryMerchantBaseInfo(pageIndex);
+			setTimeout(function (){layer.closeAll();},1500);
+		}
+	})
+	
+}
+/**
+ * 跳转进件详情
+ * @returns
+ */
+function showMerchantInfo(merchantCode){
+	window.location=ctx+"/merchantBaseInfo/queryMerchantInfo?merchantCode="+merchantCode;
+}
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/merchantImage/merchantImageDetails.js b/pluss-manage-page/src/main/resources/static/resources/js/merchantImage/merchantImageDetails.js
new file mode 100644
index 0000000..fea5393
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/merchantImage/merchantImageDetails.js
@@ -0,0 +1,96 @@
+/**
+ * create by robot 
+ * date Tue Sep 10 15:03:55 CST 2019 
+ */ 
+
+$(document).ready(function(){
+	//form表单样式
+	layui.use(['layer', 'form'], function() {
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+	//li 切换事件
+	$(".nav-tabs>li").click(function() {
+		var index = $(".nav-tabs>li").index(this);
+		$(this).addClass("active").siblings("li").removeClass("active");
+		
+	})
+	//弹出一个提示层
+	$('.fa-save').on('click', function() {
+		saveMerchantImage();
+	});
+
+	//绑定标签栏事件
+	$(document).on('click','.nav-tabs li',function(){
+
+		var action =$(this).data('action');
+		 switch (action) {
+			case "base"://基本资料
+				goBase();
+				break;  
+			case "functions"://多功能
+				goFunctions();
+				break;
+			case "extends"://扩展    
+				goExtends();         
+				break;           
+		 }
+	})
+
+	//加载第一个标签
+	$('.nav-tabs li').eq(0).click();
+	
+});
+
+
+//跳转基本信息 
+function goBase(){
+	var url=ctx+'/merchantImage/queryMerchantImageBaseInfo?id='+$('#merchantImageId').val();
+	$('.tab-content').load(url);
+	              
+}
+//跳转多功能输入
+function goFunctions(){ 
+	var url=ctx+'/merchantImage/queryMerchantImageFunctionsInfo?id='+$('#merchantImageId').val();
+	$('.tab-content').load(url);  
+	
+}
+//跳转到扩展   
+function goExtends(){
+	
+	var url=ctx+'/merchantImage/queryMerchantImageExtendsInfo?id='+$('#merchantImageId').val();
+	$('.tab-content').load(url);          
+}  
+  
+
+ 
+//保存
+function saveMerchantImage(){
+	 
+	$(".fa-save").attr("disabled","disabled");
+	$('.fa-save').html('正在保存...')
+	$.ajax({
+		url:ctx+"/merchantImage/saveMerchantImage",
+		type:"POST",
+		dataType:'json',
+		data:$("#data_form").serializeArray(),
+		complete:function(){
+			$(".fa-save").removeAttr("disabled");
+			$('.fa-save').html('保存')
+		},        
+		success:function(service){ 
+		
+			layer.confirm('保存成功,是否前往列表？', {
+				  btn: ['确认','取消'] //按钮
+				}, function(){
+					$('#goback span').trigger('click'); 
+				}, function(){         
+					layer.closeAll();
+			});  
+			
+		}
+	});  
+}
+ 
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/merchantImage/merchantImageList.js b/pluss-manage-page/src/main/resources/static/resources/js/merchantImage/merchantImageList.js
new file mode 100644
index 0000000..9903741
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/merchantImage/merchantImageList.js
@@ -0,0 +1,268 @@
+/**
+ * create by robot 
+ * date Tue Sep 10 15:03:55 CST 2019 
+ */ 
+
+var pageIndex=1;
+$(document).ready(function(){
+	//调用查询
+	pageIndex=StringUtil.getQueryString('pageIndex');
+	if(pageIndex==undefined||pageIndex==null){
+		pageIndex=1;
+	}
+	queryMerchantImage(pageIndex);
+	//绑定hover操作
+	$(document).on('mouseenter','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").show();
+		var width=15;
+		$(this).children('div').find('li').each(function(){
+			//获取li宽度
+			width+=$(this).width();
+		});
+		$(this).children('div').width(width);
+	})
+	$(document).on('mouseleave','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").hide();
+	});
+
+	//日历控件
+	layui.use(['layer', 'laydate'], function() {
+		var layer = layui.layer;
+		laydate = layui.laydate;
+		laydate.render({
+		elem: '#date1' //指定元素
+		});
+		laydate.render({
+			elem: '#date2' //指定元素
+		});
+	});
+
+
+	//行选中事件
+	$("#allCheck").find("span").click(function() {
+		$(this).toggleClass('checked');
+		if($(this).hasClass('checked')){
+			//所有列选中
+		  $(".checker").find("span").each(function () {
+		         $(this).addClass("checked");
+		    })
+		}else{
+			//所有列取消选中
+			$(".checker").find("span").each(function () {
+				 $(this).removeClass("checked");
+		    })
+		}
+	});
+
+	//单个选中
+	$(document).on('click','.checkeBox span',function() {
+		$(this).toggleClass('checked');
+		//设置头部事件
+		var length=$('.checkeBox span').length;
+		var count=0;
+		$(".checkeBox").find("span").each(function () {
+	        if($(this).hasClass("checked")){
+	        	count++;
+	        }
+	   })
+		//全选
+	   if(count==length){
+		   $("#allCheck").find("span").addClass('checked');
+	   }else{
+		   $("#allCheck").find("span").removeClass('checked');
+	   }
+	})
+	//左右div高度相等
+	var left_content_height = $(".right-content").height();
+	$(".left-content").height(left_content_height+35);
+	var sub_left_height=$(".res-menu").height(left_content_height-60);
+});
+
+//查询
+function queryMerchantImage(index){
+	if(typeof(index)=='undefined'){
+		index=1;
+	}
+	var url=ctx+'/merchantImage/queryMerchantImageByPage';
+	$.ajax({  
+        url:url,  
+        type:"post", 
+        dataType:"json",  
+        data:{  
+        	"currPage":index,
+        	"id":$('#searchId').val()
+        },  
+        success:function(result){  
+        	//渲染数据
+        	$('#data_content').empty();
+        	var header='';
+        	$.each(result.merchantImageList,function(i){
+        		var merchantImage=result.merchantImageList[i];
+        		var data='';
+        		data+='<tr class="odd">';
+        		data+='<td class="textc">';
+				data+='		 <div class="checker checkeBox">';        		data+='		 <span class=""  data-id="'+merchantImage.id+'"><input type="checkbox"  value=""></span>';
+        		data+='		</div>';
+        		data+='</td>';
+        		data+='<td class="textc">'+merchantImage.id+'</td>';
+        		data+='<td class="textc">'+merchantImage.merchantCode+'</td>';
+        		data+='<td class="textc">'+merchantImage.photoType+'</td>';
+        		data+='<td class="textc">'+merchantImage.photoUrl+'</td>';
+        		data+='<td class="textc">'+merchantImage.picUrl+'</td>';
+        		data+='<td class="textc">'+merchantImage.createDt+'</td>';
+        		data+='<td class="textc">'+merchantImage.updateDt+'</td>';
+        		data+='<td class="textc">';
+        		data+='<div class="positionr listOperaters">';
+        		data+='		<a href="javascript:void(0);"  class="icon-large dlblock w16 h16"><img src="'+resourcePath+'/images/angle-down.png"/></a>';
+        		data+='		<div class="ops_box ops_itemDiv positiona clearfix whitebg">';
+        		data+='			<ul>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showMerchantImageDetails('+merchantImage.id+')" class="btn btn-primary fa fa-edit ops_more f12">编辑</a></li>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="initDeleteMerchantImage('+merchantImage.id+')" class="btn btn-primary fa fa-remove ops_more f12">删除</a></li>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showMerchantImageDetails('+merchantImage.id+')" class="btn btn-primary fa fa-detail ops_more f12">明细</a></li>';
+        	    data+='			</ul>';
+              data+='		</div>';
+        	    data+='</div>';
+        	    data+='</td>';
+        	    data+='</tr>';
+        	    $('#data_content').append(data);
+        	});
+        	//分页
+        	$('#pageCount').html(result.pageCount);
+      	$('#currPage').html(result.currPage);
+          $('#totalCount').html(result.count);
+           	//设置分页
+           	pageIndex=result.currPage;
+			$('#pagination').pagination({
+				pageCount: result.pageCount,
+				jump: true,
+				coping: true,
+				jump: true,
+				homePage: '首页',
+				endPage: '末页',
+				prevContent: '上页',
+				nextContent: '下页',
+				current:result.currPage,
+				callback:function(api){
+					pageIndex=api.getCurrent();
+					queryMerchantImage(api.getCurrent());
+				}
+			});
+        } 
+    });  
+	//表头列不选中
+	$("#allCheck").find("span").removeClass('checked');
+}
+
+//初始化新增
+function initAddMerchantImage(){
+	window.location=ctx+'/merchantImage/queryMerchantImageDetails?pageIndex='+pageIndex;
+}
+
+//初始化修改
+function showMerchantImageDetails(id){
+	window.location=ctx+'/merchantImage/queryMerchantImageDetails?id='+id+'&pageIndex='+pageIndex;
+}
+
+//初始化删除
+function initDeleteMerchantImage(id){
+	
+		layer.open({
+		type: 1,
+		closeBtn: 1,		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r'	, //按钮居中
+		shade: 0.3 ,//不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteMerchantImage(id,true);
+		}
+	});
+}
+
+//删除
+function deleteMerchantImage(id,showMsg){
+	$.ajax({
+		url:ctx+'/merchantImage/deleteMerchantImage',
+		data:[{
+			name:'id',
+			value:id
+		}],
+		type:'POST',
+		dataType:'json',
+		success:function(){
+			queryMerchantImage(pageIndex);
+			if(showMsg){
+				layer.msg('删除成功!');	
+			}
+		}
+	});
+}
+//头部编辑
+function initEditMerchantImage(){
+	var count=0;
+	var id=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+        	 id=$(this).data('id');
+         }
+    })
+    if(count>1){
+    	layer.msg('只能选中一行记录进行操作!');
+    	return ;
+    }
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	 if(id>0){
+	  showMerchantImageDetails(id);
+	 }
+}
+//头部删除
+function initBatchDeleteMerchantImage(){
+	var count=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+         }
+    })
+	
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	
+
+	layer.open({
+		type: 1,
+		closeBtn: 1,
+		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r', //按钮居中
+		shade: 0.3, //不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteBatchMerchantImage();
+		}
+	});
+	
+}
+//批量删除
+function deleteBatchMerchantImage(){
+	
+	$(".checkeBox").find("span").each(function () {
+        if($(this).hasClass("checked")){
+        	var id=$(this).data('id');
+        	deleteMerchantImage(id,false);
+        	layer.msg('删除成功!');	
+        }
+   })
+}
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/merchantIncome/merchantIncomeDetails.js b/pluss-manage-page/src/main/resources/static/resources/js/merchantIncome/merchantIncomeDetails.js
new file mode 100644
index 0000000..2020795
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/merchantIncome/merchantIncomeDetails.js
@@ -0,0 +1,96 @@
+/**
+ * create by robot 
+ * date Fri Oct 11 16:00:02 CST 2019 
+ */ 
+
+$(document).ready(function(){
+	//form表单样式
+	layui.use(['layer', 'form'], function() {
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+	//li 切换事件
+	$(".nav-tabs>li").click(function() {
+		var index = $(".nav-tabs>li").index(this);
+		$(this).addClass("active").siblings("li").removeClass("active");
+		
+	})
+	//弹出一个提示层
+	$('.fa-save').on('click', function() {
+		saveMerchantIncome();
+	});
+
+	//绑定标签栏事件
+	$(document).on('click','.nav-tabs li',function(){
+
+		var action =$(this).data('action');
+		 switch (action) {
+			case "base"://基本资料
+				goBase();
+				break;  
+			case "functions"://多功能
+				goFunctions();
+				break;
+			case "extends"://扩展    
+				goExtends();         
+				break;           
+		 }
+	})
+
+	//加载第一个标签
+	$('.nav-tabs li').eq(0).click();
+	
+});
+
+
+//跳转基本信息 
+function goBase(){
+	var url=ctx+'/merchantIncome/queryMerchantIncomeBaseInfo?id='+$('#merchantIncomeId').val();
+	$('.tab-content').load(url);
+	              
+}
+//跳转多功能输入
+function goFunctions(){ 
+	var url=ctx+'/merchantIncome/queryMerchantIncomeFunctionsInfo?id='+$('#merchantIncomeId').val();
+	$('.tab-content').load(url);  
+	
+}
+//跳转到扩展   
+function goExtends(){
+	
+	var url=ctx+'/merchantIncome/queryMerchantIncomeExtendsInfo?id='+$('#merchantIncomeId').val();
+	$('.tab-content').load(url);          
+}  
+  
+
+ 
+//保存
+function saveMerchantIncome(){
+	 
+	$(".fa-save").attr("disabled","disabled");
+	$('.fa-save').html('正在保存...')
+	$.ajax({
+		url:ctx+"/merchantIncome/saveMerchantIncome",
+		type:"POST",
+		dataType:'json',
+		data:$("#data_form").serializeArray(),
+		complete:function(){
+			$(".fa-save").removeAttr("disabled");
+			$('.fa-save').html('保存')
+		},        
+		success:function(service){ 
+		
+			layer.confirm('保存成功,是否前往列表？', {
+				  btn: ['确认','取消'] //按钮
+				}, function(){
+					$('#goback span').trigger('click'); 
+				}, function(){         
+					layer.closeAll();
+			});  
+			
+		}
+	});  
+}
+ 
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/merchantIncome/merchantIncomeList.js b/pluss-manage-page/src/main/resources/static/resources/js/merchantIncome/merchantIncomeList.js
new file mode 100644
index 0000000..f1a15f7
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/merchantIncome/merchantIncomeList.js
@@ -0,0 +1,278 @@
+/**
+ * create by robot 
+ * date Fri Oct 11 16:00:02 CST 2019 
+ */ 
+
+var pageIndex=1;
+$(document).ready(function(){
+	//调用查询
+	pageIndex=StringUtil.getQueryString('pageIndex');
+	if(pageIndex==undefined||pageIndex==null){
+		pageIndex=1;
+	}
+	queryMerchantIncome(pageIndex);
+	//绑定hover操作
+	$(document).on('mouseenter','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").show();
+		var width=15;
+		$(this).children('div').find('li').each(function(){
+			//获取li宽度
+			width+=$(this).width();
+		});
+		$(this).children('div').width(width);
+	})
+	$(document).on('mouseleave','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").hide();
+	});
+
+	//日历控件
+	layui.use(['layer', 'laydate'], function() {
+		var layer = layui.layer;
+		laydate = layui.laydate;
+		laydate.render({
+		elem: '#date1' //指定元素
+		});
+		laydate.render({
+			elem: '#date2' //指定元素
+		});
+	});
+
+	//行选中事件
+	$("#allCheck").find("span").click(function() {
+		$(this).toggleClass('checked');
+		if($(this).hasClass('checked')){
+			//所有列选中
+		  $(".checker").find("span").each(function () {
+		         $(this).addClass("checked");
+		    })
+		}else{
+			//所有列取消选中
+			$(".checker").find("span").each(function () {
+				 $(this).removeClass("checked");
+		    })
+		}
+	});
+
+	//单个选中
+	$(document).on('click','.checkeBox span',function() {
+		$(this).toggleClass('checked');
+		//设置头部事件
+		var length=$('.checkeBox span').length;
+		var count=0;
+		$(".checkeBox").find("span").each(function () {
+	        if($(this).hasClass("checked")){
+	        	count++;
+	        }
+	   })
+		//全选
+	   if(count==length){
+		   $("#allCheck").find("span").addClass('checked');
+	   }else{
+		   $("#allCheck").find("span").removeClass('checked');
+	   }
+	})
+	//左右div高度相等
+	var left_content_height = $(".right-content").height();
+	$(".left-content").height(left_content_height+35);
+	var sub_left_height=$(".res-menu").height(left_content_height-60);
+});
+
+//查询
+function queryMerchantIncome(index){
+	if(typeof(index)=='undefined'){
+		index=1;
+	}
+	var url=ctx+'/merchantIncome/queryMerchantIncomeByPage';
+	$.ajax({  
+        url:url,  
+        type:"post", 
+        dataType:"json",  
+        data:{  
+        	"currPage":index,
+        	"id":$('#searchId').val()
+        },  
+        success:function(result){  
+        	//渲染数据
+        	$('#data_content').empty();
+        	var header='';
+        	$.each(result.merchantIncomeList,function(i){
+        		var merchantIncome=result.merchantIncomeList[i];
+        		var data='';
+        		data+='<tr class="odd">';
+        		data+='<td class="textc">';
+				data+='		 <div class="checker checkeBox">';        		data+='		 <span class=""  data-id="'+merchantIncome.id+'"><input type="checkbox"  value=""></span>';
+        		data+='		</div>';
+        		data+='</td>';
+        		data+='<td class="textc">'+merchantIncome.id+'</td>';
+        		data+='<td class="textc">'+merchantIncome.userId+'</td>';
+        		data+='<td class="textc">'+merchantIncome.merchantCode+'</td>';
+        		data+='<td class="textc">'+merchantIncome.merchantName+'</td>';
+        		data+='<td class="textc">'+merchantIncome.storeId+'</td>';
+        		data+='<td class="textc">'+merchantIncome.storeName+'</td>';
+        		data+='<td class="textc">'+merchantIncome.dealType+'</td>';
+        		data+='<td class="textc">'+merchantIncome.dealFee+'</td>';
+        		data+='<td class="textc">'+merchantIncome.incomeFee+'</td>';
+        		data+='<td class="textc">'+merchantIncome.createTime+'</td>';
+        		data+='<td class="textc">'+merchantIncome.payTypeCode+'</td>';
+        		data+='<td class="textc">'+merchantIncome.payTypeName+'</td>';
+        		data+='<td class="textc">'+merchantIncome.memberCode+'</td>';
+        		data+='<td class="textc">'+merchantIncome.memberName+'</td>';
+        		data+='<td class="textc">'+merchantIncome.memberPic+'</td>';
+        		data+='<td class="textc">'+merchantIncome.incomeType+'</td>';
+        		data+='<td class="textc">'+merchantIncome.plateformProfit+'</td>';
+        		data+='<td class="textc">'+merchantIncome.promoterProfit+'</td>';
+        		data+='<td class="textc">';
+        		data+='<div class="positionr listOperaters">';
+        		data+='		<a href="javascript:void(0);"  class="icon-large dlblock w16 h16"><img src="'+resourcePath+'/images/angle-down.png"/></a>';
+        		data+='		<div class="ops_box ops_itemDiv positiona clearfix whitebg">';
+        		data+='			<ul>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showMerchantIncomeDetails('+merchantIncome.id+')" class="btn btn-primary fa fa-edit ops_more f12">编辑</a></li>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="initDeleteMerchantIncome('+merchantIncome.id+')" class="btn btn-primary fa fa-remove ops_more f12">删除</a></li>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showMerchantIncomeDetails('+merchantIncome.id+')" class="btn btn-primary fa fa-detail ops_more f12">明细</a></li>';
+        	    data+='			</ul>';
+              data+='		</div>';
+        	    data+='</div>';
+        	    data+='</td>';
+        	    data+='</tr>';
+        	    $('#data_content').append(data);
+        	});
+        	//分页
+        	$('#pageCount').html(result.pageCount);
+      	$('#currPage').html(result.currPage);
+          $('#totalCount').html(result.count);
+           	//设置分页
+           	pageIndex=result.currPage;
+			$('#pagination').pagination({
+				pageCount: result.pageCount,
+				jump: true,
+				coping: true,
+				jump: true,
+				homePage: '首页',
+				endPage: '末页',
+				prevContent: '上页',
+				nextContent: '下页',
+				current:result.currPage,
+				callback:function(api){
+					pageIndex=api.getCurrent();
+					queryMerchantIncome(api.getCurrent());
+				}
+			});
+        } 
+    });  
+	//表头列不选中
+	$("#allCheck").find("span").removeClass('checked');
+}
+
+//初始化新增
+function initAddMerchantIncome(){
+	window.location=ctx+'/merchantIncome/queryMerchantIncomeDetails?pageIndex='+pageIndex;
+}
+
+//初始化修改
+function showMerchantIncomeDetails(id){
+	window.location=ctx+'/merchantIncome/queryMerchantIncomeDetails?id='+id+'&pageIndex='+pageIndex;
+}
+
+//初始化删除
+function initDeleteMerchantIncome(id){
+	
+		layer.open({
+		type: 1,
+		closeBtn: 1,		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r'	, //按钮居中
+		shade: 0.3 ,//不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteMerchantIncome(id,true);
+		}
+	});
+}
+
+//删除
+function deleteMerchantIncome(id,showMsg){
+	$.ajax({
+		url:ctx+'/merchantIncome/deleteMerchantIncome',
+		data:[{
+			name:'id',
+			value:id
+		}],
+		type:'POST',
+		dataType:'json',
+		success:function(){
+			queryMerchantIncome(pageIndex);
+			if(showMsg){
+				layer.msg('删除成功!');	
+			}
+		}
+	});
+}
+//头部编辑
+function initEditMerchantIncome(){
+	var count=0;
+	var id=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+        	 id=$(this).data('id');
+         }
+    })
+    if(count>1){
+    	layer.msg('只能选中一行记录进行操作!');
+    	return ;
+    }
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	 if(id>0){
+	  showMerchantIncomeDetails(id);
+	 }
+}
+//头部删除
+function initBatchDeleteMerchantIncome(){
+	var count=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+         }
+    })
+	
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	
+
+	layer.open({
+		type: 1,
+		closeBtn: 1,
+		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r', //按钮居中
+		shade: 0.3, //不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteBatchMerchantIncome();
+		}
+	});
+	
+}
+//批量删除
+function deleteBatchMerchantIncome(){
+	
+	$(".checkeBox").find("span").each(function () {
+        if($(this).hasClass("checked")){
+        	var id=$(this).data('id');
+        	deleteMerchantIncome(id,false);
+        	layer.msg('删除成功!');	
+        }
+   })
+}
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/merchantOrder/merchantOrderDetails.js b/pluss-manage-page/src/main/resources/static/resources/js/merchantOrder/merchantOrderDetails.js
new file mode 100644
index 0000000..a6791f3
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/merchantOrder/merchantOrderDetails.js
@@ -0,0 +1,96 @@
+/**
+ * create by robot 
+ * date Wed Sep 25 11:16:40 CST 2019 
+ */ 
+
+$(document).ready(function(){
+	//form表单样式
+	layui.use(['layer', 'form'], function() {
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+	//li 切换事件
+	$(".nav-tabs>li").click(function() {
+		var index = $(".nav-tabs>li").index(this);
+		$(this).addClass("active").siblings("li").removeClass("active");
+		
+	})
+	//弹出一个提示层
+	$('.fa-save').on('click', function() {
+		saveMerchantOrder();
+	});
+
+	//绑定标签栏事件
+	$(document).on('click','.nav-tabs li',function(){
+
+		var action =$(this).data('action');
+		 switch (action) {
+			case "base"://基本资料
+				goBase();
+				break;  
+			case "functions"://多功能
+				goFunctions();
+				break;
+			case "extends"://扩展    
+				goExtends();         
+				break;           
+		 }
+	})
+
+	//加载第一个标签
+	$('.nav-tabs li').eq(0).click();
+	
+});
+
+
+//跳转基本信息 
+function goBase(){
+	var url=ctx+'/merchantOrder/queryMerchantOrderBaseInfo?id='+$('#merchantOrderId').val();
+	$('.tab-content').load(url);
+	              
+}
+//跳转多功能输入
+function goFunctions(){ 
+	var url=ctx+'/merchantOrder/queryMerchantOrderFunctionsInfo?id='+$('#merchantOrderId').val();
+	$('.tab-content').load(url);  
+	
+}
+//跳转到扩展   
+function goExtends(){
+	
+	var url=ctx+'/merchantOrder/queryMerchantOrderExtendsInfo?id='+$('#merchantOrderId').val();
+	$('.tab-content').load(url);          
+}  
+  
+
+ 
+//保存
+function saveMerchantOrder(){
+	 
+	$(".fa-save").attr("disabled","disabled");
+	$('.fa-save').html('正在保存...')
+	$.ajax({
+		url:ctx+"/merchantOrder/saveMerchantOrder",
+		type:"POST",
+		dataType:'json',
+		data:$("#data_form").serializeArray(),
+		complete:function(){
+			$(".fa-save").removeAttr("disabled");
+			$('.fa-save').html('保存')
+		},        
+		success:function(service){ 
+		
+			layer.confirm('保存成功,是否前往列表？', {
+				  btn: ['确认','取消'] //按钮
+				}, function(){
+					$('#goback span').trigger('click'); 
+				}, function(){         
+					layer.closeAll();
+			});  
+			
+		}
+	});  
+}
+ 
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/merchantOrder/merchantOrderList.js b/pluss-manage-page/src/main/resources/static/resources/js/merchantOrder/merchantOrderList.js
new file mode 100644
index 0000000..5a3d189
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/merchantOrder/merchantOrderList.js
@@ -0,0 +1,66 @@
+/**
+ * create by robot 
+ * date Wed Sep 25 11:16:40 CST 2019 
+ */ 
+
+var pageIndex=1;
+$(document).ready(function(){
+	//调用查询
+	pageIndex=StringUtil.getQueryString('pageIndex');
+	if(pageIndex==undefined||pageIndex==null){
+		pageIndex=1;
+	}
+	//queryMerchantOrder(pageIndex);
+	//绑定hover操作
+	$(document).on('mouseenter','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").show();
+		var width=15;
+		$(this).children('div').find('li').each(function(){
+			//获取li宽度
+			width+=$(this).width();
+		});
+		$(this).children('div').width(width);
+	})
+	$(document).on('mouseleave','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").hide();
+	});
+
+	//行选中事件
+	$("#allCheck").find("span").click(function() {
+		$(this).toggleClass('checked');
+		if($(this).hasClass('checked')){
+			//所有列选中
+		  $(".checker").find("span").each(function () {
+		         $(this).addClass("checked");
+		    })
+		}else{
+			//所有列取消选中
+			$(".checker").find("span").each(function () {
+				 $(this).removeClass("checked");
+		    })
+		}
+	});
+
+	//单个选中
+	$(document).on('click','.checkeBox span',function() {
+		$(this).toggleClass('checked');
+		//设置头部事件
+		var length=$('.checkeBox span').length;
+		var count=0;
+		$(".checkeBox").find("span").each(function () {
+	        if($(this).hasClass("checked")){
+	        	count++;
+	        }
+	   })
+		//全选
+	   if(count==length){
+		   $("#allCheck").find("span").addClass('checked');
+	   }else{
+		   $("#allCheck").find("span").removeClass('checked');
+	   }
+	})
+	//左右div高度相等
+	var left_content_height = $(".right-content").height();
+	$(".left-content").height(left_content_height+35);
+	var sub_left_height=$(".res-menu").height(left_content_height-60);
+});
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/merchantOrder/orderRefund.js b/pluss-manage-page/src/main/resources/static/resources/js/merchantOrder/orderRefund.js
new file mode 100644
index 0000000..51f2d03
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/merchantOrder/orderRefund.js
@@ -0,0 +1,556 @@
+/**
+ * create by robot 
+ * date Wed Sep 25 11:16:40 CST 2019 
+ */ 
+
+var pageIndex=1;
+$(document).ready(function(){
+	//调用查询
+	pageIndex=StringUtil.getQueryString('pageIndex');
+	if(pageIndex==undefined||pageIndex==null){
+		pageIndex=1;
+	}
+	queryMerchantOrder(pageIndex);
+	//绑定hover操作
+	$(document).on('mouseenter','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").show();
+		var width=15;
+		$(this).children('div').find('li').each(function(){
+			//获取li宽度
+			width+=$(this).width();
+		});
+		$(this).children('div').width(width);
+	})
+	$(document).on('mouseleave','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").hide();
+	});
+
+	//日历控件
+	layui.use(['layer', 'laydate'], function() {
+		var layer = layui.layer;
+		laydate = layui.laydate;
+		laydate.render({
+		elem: '#date1' //指定元素
+		});
+		laydate.render({
+			elem: '#date2' //指定元素
+		});
+	});
+
+	//行选中事件
+	$("#allCheck").find("span").click(function() {
+		$(this).toggleClass('checked');
+		if($(this).hasClass('checked')){
+			//所有列选中
+		  $(".checker").find("span").each(function () {
+		         $(this).addClass("checked");
+		    })
+		}else{
+			//所有列取消选中
+			$(".checker").find("span").each(function () {
+				 $(this).removeClass("checked");
+		    })
+		}
+	});
+
+	//单个选中
+	$(document).on('click','.checkeBox span',function() {
+		$(this).toggleClass('checked');
+		//设置头部事件
+		var length=$('.checkeBox span').length;
+		var count=0;
+		$(".checkeBox").find("span").each(function () {
+	        if($(this).hasClass("checked")){
+	        	count++;
+	        }
+	   })
+		//全选
+	   if(count==length){
+		   $("#allCheck").find("span").addClass('checked');
+	   }else{
+		   $("#allCheck").find("span").removeClass('checked');
+	   }
+	})
+	//左右div高度相等
+	var left_content_height = $(".right-content").height();
+	$(".left-content").height(left_content_height+35);
+	var sub_left_height=$(".res-menu").height(left_content_height-60);
+});
+
+//查询
+function queryMerchantOrder(index){
+	if(typeof(index)=='undefined'){
+		index=1;
+	}
+	var url=ctx+'/merchantOrder/queryOrderRefund';
+	$.ajax({  
+        url:url,  
+        type:"post", 
+        dataType:"json",  
+        data:{  
+        	"currPage":index,
+        	"payTypeCodeList":$("#payTypeCodeList").ySelectedValues(","),
+        	"staffCodeList":$("#staffCodeList").ySelectedValues(","),
+        	"storeIdList":$("#storeIdList").ySelectedValues(","),
+//        	"storeIdList":$("#storeIdList").val(),
+        	"timeStatus":$("#timeStatus").val(),
+        	"orderType":$("#orderType").val(),
+        },  
+        success:function(result){  
+        	var presentPage = result.currPage;
+        	//渲染数据
+        	$('#data_content').empty();
+        	var header='';
+        	$.each(result.merchantOrderList,function(i){
+        		var orderNumber1 = (presentPage-1)*12+i+1;//展示的序号
+        		var merchantOrder=result.merchantOrderList[i];
+        		var payTypeName=''
+            		var transNo='';
+            		if(merchantOrder.payTypeCode=='wechatPay'){
+            			payTypeName='微信';
+            			if(StringUtil.isNotBlank(merchantOrder.weChatTransNo)){
+                			transNo=merchantOrder.weChatTransNo;
+                		}
+            		}else if(merchantOrder.payTypeCode=='aliPay'){
+            			payTypeName='支付宝';
+            			if(StringUtil.isNotBlank(merchantOrder.aliPayTransNo)){
+                			transNo=merchantOrder.aliPayTransNo;
+                		}
+            		}else if(merchantOrder.payTypeCode=='leshuaPay0'){
+            			payTypeName='乐刷支付宝支付';
+            			if(StringUtil.isNotBlank(merchantOrder.leshuaTransNo)){
+                			transNo=merchantOrder.leshuaTransNo;
+                		}
+            		}else if(merchantOrder.payTypeCode=='leshuaPay1'){
+            			payTypeName='乐刷微信支付';
+            			if(StringUtil.isNotBlank(merchantOrder.leshuaTransNo)){
+                			transNo=merchantOrder.leshuaTransNo;
+                		}
+            		}else if(merchantOrder.payTypeCode=='leshuaPay2'){
+            			payTypeName='乐刷刷卡支付';
+            			if(StringUtil.isNotBlank(merchantOrder.leshuaTransNo)){
+                			transNo=merchantOrder.leshuaTransNo;
+                		}
+            		}else if(merchantOrder.payTypeCode=='bank'){
+            			payTypeName='银联';
+            			if(StringUtil.isNotBlank(merchantOrder.leshuaTransNo)){
+                			transNo=merchantOrder.leshuaTransNo;
+                		}
+            		}
+        		var data='';
+        		data+='<tr class="odd">';
+        		data+='<td class="textc">';
+				data+='		 <div class="checker checkeBox">';        		
+				data+='		 <span class=""  data-id="'+merchantOrder.id+'"><input type="checkbox"  value=""></span>';
+        		data+='		</div>';
+        		data+='</td>';
+        		data+='<td class="textc">'+orderNumber1+'</td>';
+        		data+='<td class="textc">'+merchantOrder.id+'</td>';
+        		var orderNumber='';
+        		if(StringUtil.isNotBlank(merchantOrder.orderNumber)){
+        			orderNumber=merchantOrder.orderNumber;
+        		}
+        		data+='<td class="textc">'+orderNumber+'</td>';
+        		data+='<td class="textc">'+transNo+'</td>';
+        		var merchantName='';
+        		if(StringUtil.isNotBlank(merchantOrder.merchantName)){
+        			merchantName=merchantOrder.merchantName;
+        		}
+        		/*data+='<td class="textc">'+merchantOrder.merchantCode+'</td>';*/
+        		data+='<td class="textc">'+merchantOrder.alias+'</td>';
+//        		var storeName='';
+//        		if(StringUtil.isNotBlank(merchantOrder.storeName)){
+//        			storeName=merchantOrder.storeName;
+//        		}
+//        		data+='<td class="textc">'+storeName+'</td>';
+        		
+        		var orderType='';
+        		switch (merchantOrder.orderType) {
+				case "1":
+					orderType="主扫";
+					break;
+				case "2":
+					orderType="被扫";
+					break;
+				case "3":
+					orderType="会员充值";
+					break;
+				case "4":
+					orderType="POS";
+					break;
+				}
+        		data+='<td class="textc">'+orderType+'</td>';
+        		data+='<td class="textc">'+payTypeName+'</td>';
+        		/*data+='<td class="textc">'+merchantOrder.payTypeCode+'</td>';*/
+        		data+='<td class="textc">'+merchantOrder.consumeFee+'</td>';
+        		/*data+='<td class="textc">'+merchantOrder.memberCode+'</td>';*/
+        		/*data+='<td class="textc">'+merchantOrder.storeId+'</td>';*/
+        		var createDt='';
+        		if(StringUtil.isNotBlank(merchantOrder.createDt)){
+        			createDt=dateFtt("yyyy-MM-dd hh:mm",new Date(merchantOrder.createDt));
+        		}
+        		data+='<td class="textc">'+createDt+'</td>';
+        		/*data+='<td class="textc">'+merchantOrder.staffCode+'</td>';*/
+        		var status='';
+        		if(merchantOrder.status=='2'){
+        			status='退款成功';
+        		}else if(merchantOrder.status=='3'){
+        			status='退款失败';
+        		}else if(merchantOrder.status=='4'){
+        			status='退款中';
+        		}else if(merchantOrder.status=='0'){
+        			status='交易成功';
+        		}else if(merchantOrder.status=='1'){
+        			status='交易失败';
+        		}else if(merchantOrder.status=='5'){
+        			status='待付款';
+        		}
+        		data+='<td class="textc">'+status+'</td>';
+        		/*data+='<td class="textc">';
+        		//店长
+        		if($("#staffTypeSession").val()=='0'){
+        			if(merchantOrder.status=='4'){
+        				data+='<div class="positionr listOperaters">';
+                		data+='		<a href="javascript:v`										oid(0);"  class="icon-large dlblock w16 h16"><img src="'+resourcePath+'/images/angle-down.png"/></a>';
+                		data+='		<div class="ops_box ops_itemDiv positiona clearfix whitebg">';
+                		data+='			<ul>';
+                		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="buinourPassDetail('+merchantOrder.id+')" class="btn btn-primary fa fa-edit ops_more f12">审核通过</a></li>';
+                		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="buinourRefuseDetail('+merchantOrder.id+')" class="btn btn-primary fa fa-edit ops_more f12">审核拒绝</a></li>';
+                	    data+='			</ul>';
+                        data+='		</div>';
+                	    data+='</div>';
+        			}else
+        			if(merchantOrder.status!='2'&&merchantOrder.status!='5'){
+        				data+='<div class="positionr listOperaters">';
+                		data+='		<a href="javascript:void(0);"  class="icon-large dlblock w16 h16"><img src="'+resourcePath+'/images/angle-down.png"/></a>';
+                		data+='		<div class="ops_box ops_itemDiv positiona clearfix whitebg">';
+                		data+='			<ul>';
+                		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="clerkSponsorRefundDetail('+merchantOrder.id+')" class="btn btn-primary fa fa-edit ops_more f12">退款</a></li>';
+                	    data+='			</ul>';
+                        data+='		</div>';
+                	    data+='</div>';
+        			}
+        			//其他人员
+        		}else{
+        			if(merchantOrder.status!='2'&&merchantOrder.status!='4'&&merchantOrder.status!='5'){
+        				data+='<div class="positionr listOperaters">';
+                		data+='		<a href="javascript:void(0);"  class="icon-large dlblock w16 h16"><img src="'+resourcePath+'/images/angle-down.png"/></a>';
+                		data+='		<div class="ops_box ops_itemDiv positiona clearfix whitebg">';
+                		data+='			<ul>';
+                		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="clerkSponsorRefundDetail('+merchantOrder.id+')" class="btn btn-primary fa fa-edit ops_more f12">发起退款</a></li>';
+                	    data+='			</ul>';
+                        data+='		</div>';
+                	    data+='</div>';
+        			}
+        		}
+        	    data+='</td>';*/
+        	    data+='</tr>';
+        	    $('#data_content').append(data);
+        	});
+        	//分页
+        	$('#pageCount').html(result.pageCount);
+      	$('#currPage').html(result.currPage);
+          $('#totalCount').html(result.count);
+           	//设置分页
+           	pageIndex=result.currPage;
+			$('#pagination').pagination({
+				pageCount: result.pageCount,
+				jump: true,
+				coping: true,
+				jump: true,
+				homePage: '首页',
+				endPage: '末页',
+				prevContent: '上页',
+				nextContent: '下页',
+				current:result.currPage,
+				callback:function(api){
+					pageIndex=api.getCurrent();
+					queryMerchantOrder(api.getCurrent());
+				}
+			});
+        } 
+    });  
+	//表头列不选中
+	$("#allCheck").find("span").removeClass('checked');
+}
+
+//初始化新增
+function initAddMerchantOrder(){
+	window.location=ctx+'/merchantOrder/queryMerchantOrderDetails?pageIndex='+pageIndex;
+}
+
+//初始化修改
+function showMerchantOrderDetails(id){
+	window.location=ctx+'/merchantOrder/queryMerchantOrderDetails?id='+id+'&pageIndex='+pageIndex;
+}
+
+//初始化删除
+function initDeleteMerchantOrder(id){
+	
+		layer.open({
+		type: 1,
+		closeBtn: 1,		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r'	, //按钮居中
+		shade: 0.3 ,//不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteMerchantOrder(id,true);
+		}
+	});
+}
+
+//删除
+function deleteMerchantOrder(id,showMsg){
+	$.ajax({
+		url:ctx+'/merchantOrder/deleteMerchantOrder',
+		data:[{
+			name:'id',
+			value:id
+		}],
+		type:'POST',
+		dataType:'json',
+		success:function(){
+			queryMerchantOrder(pageIndex);
+			if(showMsg){
+				layer.msg('删除成功!');	
+			}
+		}
+	});
+}
+//头部编辑
+function initEditMerchantOrder(){
+	var count=0;
+	var id=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+        	 id=$(this).data('id');
+         }
+    })
+    if(count>1){
+    	layer.msg('只能选中一行记录进行操作!');
+    	return ;
+    }
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	 if(id>0){
+	  showMerchantOrderDetails(id);
+	 }
+}
+//头部删除
+function initBatchDeleteMerchantOrder(){
+	var count=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+         }
+    })
+	
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	
+
+	layer.open({
+		type: 1,
+		closeBtn: 1,
+		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r', //按钮居中
+		shade: 0.3, //不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteBatchMerchantOrder();
+		}
+	});
+	
+}
+//批量删除
+function deleteBatchMerchantOrder(){
+	
+	$(".checkeBox").find("span").each(function () {
+        if($(this).hasClass("checked")){
+        	var id=$(this).data('id');
+        	deleteMerchantOrder(id,false);
+        	layer.msg('删除成功!');	
+        }
+   })
+}
+
+//店长审核通过
+function buinourPassDetail(id){
+	layer.open({
+		type: 1,
+		closeBtn: 1,		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认审核通过吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r'	, //按钮居中
+		shade: 0.3 ,//不显示遮罩
+		yes: function() {
+			buinourPass(id);
+			layer.closeAll();
+		}
+	});
+}
+
+function buinourPass(id){
+	$.ajax({
+		url:ctx+'/merchantOrder/buinourPass',
+		data:{
+			"id":id
+		},
+		dataType:"json",
+		type:"post",
+		success:function(result){
+			if(result.data=='1'){
+				layer.msg('审核通过成功');
+			}else{
+				layer.msg('审核通过失败');
+			}
+			queryMerchantOrder(pageIndex);
+		}
+	})
+}
+
+//店长审核拒绝
+function buinourRefuseDetail(id){
+	layer.open({
+		type: 1,
+		closeBtn: 1,		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认审核拒绝吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r'	, //按钮居中
+		shade: 0.3 ,//不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			buinourRefuse(id);
+		}
+	});
+}
+
+function buinourRefuse(id){
+	$.ajax({
+		url:ctx+'/merchantOrder/buinourRefuse',
+		data:{
+			"id":id
+		},
+		dataType:"json",
+		type:"post",
+		success:function(result){
+			if(result.data=='1'){
+				layer.msg('审核拒绝成功');
+			}else{
+				layer.msg('审核拒绝失败');
+			}
+			queryMerchantOrder(pageIndex);
+		}
+	})	
+}
+//店长退款
+function buinourRefundDetail(id){
+	layer.open({
+		type: 1,
+		closeBtn: 1,		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认要退款吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r'	, //按钮居中
+		shade: 0.3 ,//不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			buinourRefund(id);
+		}
+	});
+}
+
+function buinourRefund(){
+	$.ajax({
+		url:ctx+'/merchantOrder/buinourRefund',
+		data:{
+			"id":id
+		},
+		dataType:"json",
+		type:"post",
+		success:function(result){
+			if(result.data=='1'){
+				layer.msg('退款发起成功');
+			}else{
+				layer.msg('退款发起失败');
+			}
+			queryMerchantOrder(pageIndex);
+		}
+	})
+}
+
+//店员发起退款
+function clerkSponsorRefundDetail(id){
+	layer.open({
+		type: 1,
+		closeBtn: 1,		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认发起退款吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r'	, //按钮居中
+		shade: 0.3 ,//不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			clerkSponsorRefund(id);
+		}
+	});
+}
+
+function clerkSponsorRefund(id){
+	$.ajax({
+		url:ctx+'/merchantOrder/clerkSponsorRefund',
+		data:{
+			"id":id
+		},
+		dataType:"json",
+		type:"post",
+		success:function(result){
+			if(result.data=='1'){
+				layer.msg('发起退款成功');
+			}else{
+				layer.msg('发起退款失败');
+			}
+			queryMerchantOrder(pageIndex);
+		}
+	})
+}
+
+//时间格式化处理
+function dateFtt(fmt,date)   
+{ //author: meizz   
+  var o = {   
+    "M+" : date.getMonth()+1,                 //月份   
+    "d+" : date.getDate(),                    //日   
+    "h+" : date.getHours(),                   //小时   
+    "m+" : date.getMinutes(),                 //分   
+    "s+" : date.getSeconds(),                 //秒   
+    "q+" : Math.floor((date.getMonth()+3)/3), //季度   
+    "S"  : date.getMilliseconds()             //毫秒   
+  };   
+  if(/(y+)/.test(fmt))   
+    fmt=fmt.replace(RegExp.$1, (date.getFullYear()+"").substr(4 - RegExp.$1.length));   
+  for(var k in o)   
+    if(new RegExp("("+ k +")").test(fmt))   
+  fmt = fmt.replace(RegExp.$1, (RegExp.$1.length==1) ? (o[k]) : (("00"+ o[k]).substr((""+ o[k]).length)));   
+  return fmt;   
+}
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/merchantOrder/summaryOfWater.js b/pluss-manage-page/src/main/resources/static/resources/js/merchantOrder/summaryOfWater.js
new file mode 100644
index 0000000..06b542e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/merchantOrder/summaryOfWater.js
@@ -0,0 +1,166 @@
+/**
+ * create by robot 
+ * date Wed Sep 25 17:39:35 CST 2019 
+ */ 
+
+var pageIndex=1;
+$(document).ready(function(){
+	//调用查询
+	pageIndex=StringUtil.getQueryString('pageIndex');
+	if(pageIndex==undefined||pageIndex==null){
+		pageIndex=1;
+	}
+	queryMerchantOrder(pageIndex);
+	//绑定hover操作
+	$(document).on('mouseenter','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").show();
+		var width=15;
+		$(this).children('div').find('li').each(function(){
+			//获取li宽度
+			width+=$(this).width();
+		});
+		$(this).children('div').width(width);
+	})
+	$(document).on('mouseleave','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").hide();
+	});
+
+	//日历控件
+	layui.use(['layer', 'laydate'], function() {
+		var layer = layui.layer;
+		laydate = layui.laydate;
+		laydate.render({
+		elem: '#date1' //指定元素
+		});
+		laydate.render({
+			elem: '#date2' //指定元素
+		});
+	});
+
+
+	//行选中事件
+	$("#allCheck").find("span").click(function() {
+		$(this).toggleClass('checked');
+		if($(this).hasClass('checked')){
+			//所有列选中
+		  $(".checker").find("span").each(function () {
+		         $(this).addClass("checked");
+		    })
+		}else{
+			//所有列取消选中
+			$(".checker").find("span").each(function () {
+				 $(this).removeClass("checked");
+		    })
+		}
+	});
+
+	//单个选中
+	$(document).on('click','.checkeBox span',function() {
+		$(this).toggleClass('checked');
+		//设置头部事件
+		var length=$('.checkeBox span').length;
+		var count=0;
+		$(".checkeBox").find("span").each(function () {
+	        if($(this).hasClass("checked")){
+	        	count++;
+	        }
+	   })
+		//全选
+	   if(count==length){
+		   $("#allCheck").find("span").addClass('checked');
+	   }else{
+		   $("#allCheck").find("span").removeClass('checked');
+	   }
+	})
+	//左右div高度相等
+	var left_content_height = $(".right-content").height();
+	$(".left-content").height(left_content_height+35);
+	var sub_left_height=$(".res-menu").height(left_content_height-60);
+});
+
+//查询
+function queryMerchantOrder(index){
+	if(typeof(index)=='undefined'){
+		index=1;
+	}
+	var url=ctx+'/merchantOrder/querySummaryOfWater';
+	$.ajax({  
+        url:url,  
+        type:"post",
+        dataType:"json",  
+        data:{ 
+        	"merchantCode":$("#merchantCode").val(),
+        	"payTypeCodeList":$("#payTypeCodeList").ySelectedValues(","),
+        	"staffCodeList":$("#staffCodeList").ySelectedValues(","),
+        	"storeIdList":$("#storeIdList").ySelectedValues(","),
+        	"timeStatus":$("#timeStatus").val(),
+        },  
+        success:function(result){  
+        	//渲染数据
+        	$('#data_content').empty();
+        	var header='';
+        	var summaryOfWater=result.summaryOfWaterVO;
+        	var data='';
+        	data+='<tr class="odd">';
+    		data+='<td class="textc">'+summaryOfWater.dealCount+'</td>';
+    		data+='<td class="textc">'+summaryOfWater.dealSum+'</td>';
+    		data+='<td class="textc">'+summaryOfWater.refundCount+'</td>';
+    		data+='<td class="textc">'+summaryOfWater.netRefund+'</td>';
+    		/*data+='<td class="textc">';
+    		data+='<div class="positionr listOperaters">';
+    		data+='		<a href="javascript:void(0);"  class="icon-large dlblock w16 h16"><img src="'+resourcePath+'/images/angle-down.png"/></a>';
+    		data+='		<div class="ops_box ops_itemDiv positiona clearfix whitebg">';
+    		data+='			<ul>';
+    		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showMemberOrderDetails('+memberOrder.id+')" class="btn btn-primary fa fa-edit ops_more f12">编辑</a></li>';
+    		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="initDeleteMemberOrder('+memberOrder.id+')" class="btn btn-primary fa fa-remove ops_more f12">删除</a></li>';
+    		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showMemberOrderDetails('+memberOrder.id+')" class="btn btn-primary fa fa-detail ops_more f12">明细</a></li>';
+    	    data+='			</ul>';
+          data+='		</div>';
+    	    data+='</div>';
+    	    data+='</td>';*/
+    	    data+='</tr>';
+    	    $('#data_content').append(data);
+        	
+        	/*$.each(result.summaryOfWater,function(i){
+        		var memberOrder=result.memberOrderList[i];
+        		var data='';
+        		data+='<tr class="odd">';
+        		data+='<td class="textc">';
+				data+='		 <div class="checker checkeBox">';        		data+='		 <span class=""  data-id="'+memberOrder.id+'"><input type="checkbox"  value=""></span>';
+        		data+='		</div>';
+        		data+='</td>';
+        		data+='<td class="textc">'+memberOrder.id+'</td>';
+        		data+='<td class="textc">'+memberOrder.merchantCode+'</td>';
+        		data+='<td class="textc">'+memberOrder.merchantName+'</td>';
+        		data+='<td class="textc">'+memberOrder.storeId+'</td>';
+        		data+='<td class="textc">'+memberOrder.storeName+'</td>';
+        		data+='<td class="textc">'+memberOrder.memberCode+'</td>';
+        		data+='<td class="textc">'+memberOrder.nickName+'</td>';
+        		data+='<td class="textc">'+memberOrder.createDt+'</td>';
+        		data+='<td class="textc">'+memberOrder.orderType+'</td>';
+        		data+='<td class="textc">'+memberOrder.orderFee+'</td>';
+        		data+='<td class="textc">'+memberOrder.orderStatus+'</td>';
+        		data+='<td class="textc">'+memberOrder.rechargeType+'</td>';
+        		data+='<td class="textc">';
+        		data+='<div class="positionr listOperaters">';
+        		data+='		<a href="javascript:void(0);"  class="icon-large dlblock w16 h16"><img src="'+resourcePath+'/images/angle-down.png"/></a>';
+        		data+='		<div class="ops_box ops_itemDiv positiona clearfix whitebg">';
+        		data+='			<ul>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showMemberOrderDetails('+memberOrder.id+')" class="btn btn-primary fa fa-edit ops_more f12">编辑</a></li>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="initDeleteMemberOrder('+memberOrder.id+')" class="btn btn-primary fa fa-remove ops_more f12">删除</a></li>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showMemberOrderDetails('+memberOrder.id+')" class="btn btn-primary fa fa-detail ops_more f12">明细</a></li>';
+        	    data+='			</ul>';
+              data+='		</div>';
+        	    data+='</div>';
+        	    data+='</td>';
+        	    data+='</tr>';
+        	    $('#data_content').append(data);
+        	});*/
+        }  
+    });  
+	//表头列不选中
+	$("#allCheck").find("span").removeClass('checked');
+}
+
+
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/merchantProfit/merchantProfitDetails.js b/pluss-manage-page/src/main/resources/static/resources/js/merchantProfit/merchantProfitDetails.js
new file mode 100644
index 0000000..0b5367c
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/merchantProfit/merchantProfitDetails.js
@@ -0,0 +1,96 @@
+/**
+ * create by robot 
+ * date Mon Apr 27 18:33:02 CST 2020 
+ */ 
+
+$(document).ready(function(){
+	//form表单样式
+	layui.use(['layer', 'form'], function() {
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+	//li 切换事件
+	$(".nav-tabs>li").click(function() {
+		var index = $(".nav-tabs>li").index(this);
+		$(this).addClass("active").siblings("li").removeClass("active");
+		
+	})
+	//弹出一个提示层
+	$('.fa-save').on('click', function() {
+		saveMerchantProfit();
+	});
+
+	//绑定标签栏事件
+	$(document).on('click','.nav-tabs li',function(){
+
+		var action =$(this).data('action');
+		 switch (action) {
+			case "base"://基本资料
+				goBase();
+				break;  
+			case "functions"://多功能
+				goFunctions();
+				break;
+			case "extends"://扩展    
+				goExtends();         
+				break;           
+		 }
+	})
+
+	//加载第一个标签
+	$('.nav-tabs li').eq(0).click();
+	
+});
+
+
+//跳转基本信息 
+function goBase(){
+	var url=ctx+'/merchantProfit/queryMerchantProfitBaseInfo?id='+$('#merchantProfitId').val();
+	$('.tab-content').load(url);
+	              
+}
+//跳转多功能输入
+function goFunctions(){ 
+	var url=ctx+'/merchantProfit/queryMerchantProfitFunctionsInfo?id='+$('#merchantProfitId').val();
+	$('.tab-content').load(url);  
+	
+}
+//跳转到扩展   
+function goExtends(){
+	
+	var url=ctx+'/merchantProfit/queryMerchantProfitExtendsInfo?id='+$('#merchantProfitId').val();
+	$('.tab-content').load(url);          
+}  
+  
+
+ 
+//保存
+function saveMerchantProfit(){
+	 
+	$(".fa-save").attr("disabled","disabled");
+	$('.fa-save').html('正在保存...')
+	$.ajax({
+		url:ctx+"/merchantProfit/saveMerchantProfit",
+		type:"POST",
+		dataType:'json',
+		data:$("#data_form").serializeArray(),
+		complete:function(){
+			$(".fa-save").removeAttr("disabled");
+			$('.fa-save').html('保存')
+		},        
+		success:function(service){ 
+		
+			layer.confirm('保存成功,是否前往列表？', {
+				  btn: ['确认','取消'] //按钮
+				}, function(){
+					$('#goback span').trigger('click'); 
+				}, function(){         
+					layer.closeAll();
+			});  
+			
+		}
+	});  
+}
+ 
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/merchantProfit/merchantProfitList.js b/pluss-manage-page/src/main/resources/static/resources/js/merchantProfit/merchantProfitList.js
new file mode 100644
index 0000000..abbf9e4
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/merchantProfit/merchantProfitList.js
@@ -0,0 +1,270 @@
+/**
+ * create by robot 
+ * date Mon Apr 27 18:33:02 CST 2020 
+ */ 
+
+var pageIndex=1;
+$(document).ready(function(){
+	//调用查询
+	pageIndex=StringUtil.getQueryString('pageIndex');
+	if(pageIndex==undefined||pageIndex==null){
+		pageIndex=1;
+	}
+	queryMerchantProfit(pageIndex);
+	//绑定hover操作
+	$(document).on('mouseenter','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").show();
+		var width=15;
+		$(this).children('div').find('li').each(function(){
+			//获取li宽度
+			width+=$(this).width();
+		});
+		$(this).children('div').width(width);
+	})
+	$(document).on('mouseleave','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").hide();
+	});
+
+	//日历控件
+	layui.use(['layer', 'laydate'], function() {
+		var layer = layui.layer;
+		laydate = layui.laydate;
+		laydate.render({
+		elem: '#date1' //指定元素
+		});
+		laydate.render({
+			elem: '#date2' //指定元素
+		});
+	});
+
+	//行选中事件
+	$("#allCheck").find("span").click(function() {
+		$(this).toggleClass('checked');
+		if($(this).hasClass('checked')){
+			//所有列选中
+		  $(".checker").find("span").each(function () {
+		         $(this).addClass("checked");
+		    })
+		}else{
+			//所有列取消选中
+			$(".checker").find("span").each(function () {
+				 $(this).removeClass("checked");
+		    })
+		}
+	});
+
+	//单个选中
+	$(document).on('click','.checkeBox span',function() {
+		$(this).toggleClass('checked');
+		//设置头部事件
+		var length=$('.checkeBox span').length;
+		var count=0;
+		$(".checkeBox").find("span").each(function () {
+	        if($(this).hasClass("checked")){
+	        	count++;
+	        }
+	   })
+		//全选
+	   if(count==length){
+		   $("#allCheck").find("span").addClass('checked');
+	   }else{
+		   $("#allCheck").find("span").removeClass('checked');
+	   }
+	})
+	//左右div高度相等
+	var left_content_height = $(".right-content").height();
+	$(".left-content").height(left_content_height+35);
+	var sub_left_height=$(".res-menu").height(left_content_height-60);
+});
+
+//查询
+function queryMerchantProfit(index){
+	if(typeof(index)=='undefined'){
+		index=1;
+	}
+	var url=ctx+'/merchantProfit/queryMerchantProfitByPage';
+	$.ajax({  
+        url:url,  
+        type:"post", 
+        dataType:"json",  
+        data:{  
+        	"currPage":index,
+        	"id":$('#searchId').val()
+        },  
+        success:function(result){  
+        	//渲染数据
+        	$('#data_content').empty();
+        	var header='';
+        	$.each(result.merchantProfitList,function(i){
+        		var merchantProfit=result.merchantProfitList[i];
+        		var data='';
+        		data+='<tr class="odd">';
+        		data+='<td class="textc">';
+				data+='		 <div class="checker checkeBox">';        		data+='		 <span class=""  data-id="'+merchantProfit.id+'"><input type="checkbox"  value=""></span>';
+        		data+='		</div>';
+        		data+='</td>';
+        		data+='<td class="textc">'+merchantProfit.id+'</td>';
+        		data+='<td class="textc">'+merchantProfit.userId+'</td>';
+        		data+='<td class="textc">'+merchantProfit.type+'</td>';
+        		data+='<td class="textc">'+merchantProfit.price+'</td>';
+        		data+='<td class="textc">'+merchantProfit.orderNumber+'</td>';
+        		data+='<td class="textc">'+merchantProfit.merchantCode+'</td>';
+        		data+='<td class="textc">'+merchantProfit.merchantName+'</td>';
+        		data+='<td class="textc">'+merchantProfit.consumeFee+'</td>';
+        		data+='<td class="textc">'+merchantProfit.createDt+'</td>';
+        		data+='<td class="textc">'+merchantProfit.orderDt+'</td>';
+        		data+='<td class="textc">';
+        		data+='<div class="positionr listOperaters">';
+        		data+='		<a href="javascript:void(0);"  class="icon-large dlblock w16 h16"><img src="'+resourcePath+'/images/angle-down.png"/></a>';
+        		data+='		<div class="ops_box ops_itemDiv positiona clearfix whitebg">';
+        		data+='			<ul>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showMerchantProfitDetails('+merchantProfit.id+')" class="btn btn-primary fa fa-edit ops_more f12">编辑</a></li>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="initDeleteMerchantProfit('+merchantProfit.id+')" class="btn btn-primary fa fa-remove ops_more f12">删除</a></li>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showMerchantProfitDetails('+merchantProfit.id+')" class="btn btn-primary fa fa-detail ops_more f12">明细</a></li>';
+        	    data+='			</ul>';
+              data+='		</div>';
+        	    data+='</div>';
+        	    data+='</td>';
+        	    data+='</tr>';
+        	    $('#data_content').append(data);
+        	});
+        	//分页
+        	$('#pageCount').html(result.pageCount);
+      	$('#currPage').html(result.currPage);
+          $('#totalCount').html(result.count);
+           	//设置分页
+           	pageIndex=result.currPage;
+			$('#pagination').pagination({
+				pageCount: result.pageCount,
+				jump: true,
+				coping: true,
+				jump: true,
+				homePage: '首页',
+				endPage: '末页',
+				prevContent: '上页',
+				nextContent: '下页',
+				current:result.currPage,
+				callback:function(api){
+					pageIndex=api.getCurrent();
+					queryMerchantProfit(api.getCurrent());
+				}
+			});
+        } 
+    });  
+	//表头列不选中
+	$("#allCheck").find("span").removeClass('checked');
+}
+
+//初始化新增
+function initAddMerchantProfit(){
+	window.location=ctx+'/merchantProfit/queryMerchantProfitDetails?pageIndex='+pageIndex;
+}
+
+//初始化修改
+function showMerchantProfitDetails(id){
+	window.location=ctx+'/merchantProfit/queryMerchantProfitDetails?id='+id+'&pageIndex='+pageIndex;
+}
+
+//初始化删除
+function initDeleteMerchantProfit(id){
+	
+		layer.open({
+		type: 1,
+		closeBtn: 1,		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r'	, //按钮居中
+		shade: 0.3 ,//不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteMerchantProfit(id,true);
+		}
+	});
+}
+
+//删除
+function deleteMerchantProfit(id,showMsg){
+	$.ajax({
+		url:ctx+'/merchantProfit/deleteMerchantProfit',
+		data:[{
+			name:'id',
+			value:id
+		}],
+		type:'POST',
+		dataType:'json',
+		success:function(){
+			queryMerchantProfit(pageIndex);
+			if(showMsg){
+				layer.msg('删除成功!');	
+			}
+		}
+	});
+}
+//头部编辑
+function initEditMerchantProfit(){
+	var count=0;
+	var id=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+        	 id=$(this).data('id');
+         }
+    })
+    if(count>1){
+    	layer.msg('只能选中一行记录进行操作!');
+    	return ;
+    }
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	 if(id>0){
+	  showMerchantProfitDetails(id);
+	 }
+}
+//头部删除
+function initBatchDeleteMerchantProfit(){
+	var count=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+         }
+    })
+	
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	
+
+	layer.open({
+		type: 1,
+		closeBtn: 1,
+		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r', //按钮居中
+		shade: 0.3, //不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteBatchMerchantProfit();
+		}
+	});
+	
+}
+//批量删除
+function deleteBatchMerchantProfit(){
+	
+	$(".checkeBox").find("span").each(function () {
+        if($(this).hasClass("checked")){
+        	var id=$(this).data('id');
+        	deleteMerchantProfit(id,false);
+        	layer.msg('删除成功!');	
+        }
+   })
+}
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/merchantRegistAuditRecord/merchantRegistAuditRecordDetails.js b/pluss-manage-page/src/main/resources/static/resources/js/merchantRegistAuditRecord/merchantRegistAuditRecordDetails.js
new file mode 100644
index 0000000..35e7814
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/merchantRegistAuditRecord/merchantRegistAuditRecordDetails.js
@@ -0,0 +1,96 @@
+/**
+ * create by robot 
+ * date Tue Sep 10 15:03:55 CST 2019 
+ */ 
+
+$(document).ready(function(){
+	//form表单样式
+	layui.use(['layer', 'form'], function() {
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+	//li 切换事件
+	$(".nav-tabs>li").click(function() {
+		var index = $(".nav-tabs>li").index(this);
+		$(this).addClass("active").siblings("li").removeClass("active");
+		
+	})
+	//弹出一个提示层
+	$('.fa-save').on('click', function() {
+		saveMerchantRegistAuditRecord();
+	});
+
+	//绑定标签栏事件
+	$(document).on('click','.nav-tabs li',function(){
+
+		var action =$(this).data('action');
+		 switch (action) {
+			case "base"://基本资料
+				goBase();
+				break;  
+			case "functions"://多功能
+				goFunctions();
+				break;
+			case "extends"://扩展    
+				goExtends();         
+				break;           
+		 }
+	})
+
+	//加载第一个标签
+	$('.nav-tabs li').eq(0).click();
+	
+});
+
+
+//跳转基本信息 
+function goBase(){
+	var url=ctx+'/merchantRegistAuditRecord/queryMerchantRegistAuditRecordBaseInfo?id='+$('#merchantRegistAuditRecordId').val();
+	$('.tab-content').load(url);
+	              
+}
+//跳转多功能输入
+function goFunctions(){ 
+	var url=ctx+'/merchantRegistAuditRecord/queryMerchantRegistAuditRecordFunctionsInfo?id='+$('#merchantRegistAuditRecordId').val();
+	$('.tab-content').load(url);  
+	
+}
+//跳转到扩展   
+function goExtends(){
+	
+	var url=ctx+'/merchantRegistAuditRecord/queryMerchantRegistAuditRecordExtendsInfo?id='+$('#merchantRegistAuditRecordId').val();
+	$('.tab-content').load(url);          
+}  
+  
+
+ 
+//保存
+function saveMerchantRegistAuditRecord(){
+	 
+	$(".fa-save").attr("disabled","disabled");
+	$('.fa-save').html('正在保存...')
+	$.ajax({
+		url:ctx+"/merchantRegistAuditRecord/saveMerchantRegistAuditRecord",
+		type:"POST",
+		dataType:'json',
+		data:$("#data_form").serializeArray(),
+		complete:function(){
+			$(".fa-save").removeAttr("disabled");
+			$('.fa-save').html('保存')
+		},        
+		success:function(service){ 
+		
+			layer.confirm('保存成功,是否前往列表？', {
+				  btn: ['确认','取消'] //按钮
+				}, function(){
+					$('#goback span').trigger('click'); 
+				}, function(){         
+					layer.closeAll();
+			});  
+			
+		}
+	});  
+}
+ 
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/merchantRegistAuditRecord/merchantRegistAuditRecordList.js b/pluss-manage-page/src/main/resources/static/resources/js/merchantRegistAuditRecord/merchantRegistAuditRecordList.js
new file mode 100644
index 0000000..35c51c1
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/merchantRegistAuditRecord/merchantRegistAuditRecordList.js
@@ -0,0 +1,272 @@
+/**
+ * create by robot 
+ * date Tue Sep 10 15:03:55 CST 2019 
+ */ 
+
+var pageIndex=1;
+$(document).ready(function(){
+	//调用查询
+	pageIndex=StringUtil.getQueryString('pageIndex');
+	if(pageIndex==undefined||pageIndex==null){
+		pageIndex=1;
+	}
+	queryMerchantRegistAuditRecord(pageIndex);
+	//绑定hover操作
+	$(document).on('mouseenter','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").show();
+		var width=15;
+		$(this).children('div').find('li').each(function(){
+			//获取li宽度
+			width+=$(this).width();
+		});
+		$(this).children('div').width(width);
+	})
+	$(document).on('mouseleave','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").hide();
+	});
+
+	//日历控件
+	layui.use(['layer', 'laydate'], function() {
+		var layer = layui.layer;
+		laydate = layui.laydate;
+		laydate.render({
+		elem: '#date1' //指定元素
+		});
+		laydate.render({
+			elem: '#date2' //指定元素
+		});
+	});
+
+	//行选中事件
+	$("#allCheck").find("span").click(function() {
+		$(this).toggleClass('checked');
+		if($(this).hasClass('checked')){
+			//所有列选中
+		  $(".checker").find("span").each(function () {
+		         $(this).addClass("checked");
+		    })
+		}else{
+			//所有列取消选中
+			$(".checker").find("span").each(function () {
+				 $(this).removeClass("checked");
+		    })
+		}
+	});
+
+	//单个选中
+	$(document).on('click','.checkeBox span',function() {
+		$(this).toggleClass('checked');
+		//设置头部事件
+		var length=$('.checkeBox span').length;
+		var count=0;
+		$(".checkeBox").find("span").each(function () {
+	        if($(this).hasClass("checked")){
+	        	count++;
+	        }
+	   })
+		//全选
+	   if(count==length){
+		   $("#allCheck").find("span").addClass('checked');
+	   }else{
+		   $("#allCheck").find("span").removeClass('checked');
+	   }
+	})
+	//左右div高度相等
+	var left_content_height = $(".right-content").height();
+	$(".left-content").height(left_content_height+35);
+	var sub_left_height=$(".res-menu").height(left_content_height-60);
+});
+
+//查询
+function queryMerchantRegistAuditRecord(index){
+	if(typeof(index)=='undefined'){
+		index=1;
+	}
+	var url=ctx+'/merchantRegistAuditRecord/queryMerchantRegistAuditRecordByPage';
+	$.ajax({  
+        url:url,  
+        type:"post", 
+        dataType:"json",  
+        data:{  
+        	"currPage":index,
+        	"id":$('#searchId').val()
+        },  
+        success:function(result){  
+        	//渲染数据
+        	$('#data_content').empty();
+        	var header='';
+        	$.each(result.merchantRegistAuditRecordList,function(i){
+        		var merchantRegistAuditRecord=result.merchantRegistAuditRecordList[i];
+        		var data='';
+        		data+='<tr class="odd">';
+        		data+='<td class="textc">';
+				data+='		 <div class="checker checkeBox">';        		data+='		 <span class=""  data-id="'+merchantRegistAuditRecord.id+'"><input type="checkbox"  value=""></span>';
+        		data+='		</div>';
+        		data+='</td>';
+        		data+='<td class="textc">'+merchantRegistAuditRecord.id+'</td>';
+        		data+='<td class="textc">'+merchantRegistAuditRecord.merchantCode+'</td>';
+        		data+='<td class="textc">'+merchantRegistAuditRecord.merchantName+'</td>';
+        		data+='<td class="textc">'+merchantRegistAuditRecord.agentCode+'</td>';
+        		data+='<td class="textc">'+merchantRegistAuditRecord.agentName+'</td>';
+        		data+='<td class="textc">'+merchantRegistAuditRecord.creator+'</td>';
+        		data+='<td class="textc">'+merchantRegistAuditRecord.message+'</td>';
+        		data+='<td class="textc">'+merchantRegistAuditRecord.type+'</td>';
+        		data+='<td class="textc">'+merchantRegistAuditRecord.status+'</td>';
+        		data+='<td class="textc">'+merchantRegistAuditRecord.failReason+'</td>';
+        		data+='<td class="textc">'+merchantRegistAuditRecord.creatDt+'</td>';
+        		data+='<td class="textc">'+merchantRegistAuditRecord.modifyStatus+'</td>';
+        		data+='<td class="textc">';
+        		data+='<div class="positionr listOperaters">';
+        		data+='		<a href="javascript:void(0);"  class="icon-large dlblock w16 h16"><img src="'+resourcePath+'/images/angle-down.png"/></a>';
+        		data+='		<div class="ops_box ops_itemDiv positiona clearfix whitebg">';
+        		data+='			<ul>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showMerchantRegistAuditRecordDetails('+merchantRegistAuditRecord.id+')" class="btn btn-primary fa fa-edit ops_more f12">编辑</a></li>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="initDeleteMerchantRegistAuditRecord('+merchantRegistAuditRecord.id+')" class="btn btn-primary fa fa-remove ops_more f12">删除</a></li>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showMerchantRegistAuditRecordDetails('+merchantRegistAuditRecord.id+')" class="btn btn-primary fa fa-detail ops_more f12">明细</a></li>';
+        	    data+='			</ul>';
+              data+='		</div>';
+        	    data+='</div>';
+        	    data+='</td>';
+        	    data+='</tr>';
+        	    $('#data_content').append(data);
+        	});
+        	//分页
+        	$('#pageCount').html(result.pageCount);
+      	$('#currPage').html(result.currPage);
+          $('#totalCount').html(result.count);
+           	//设置分页
+           	pageIndex=result.currPage;
+			$('#pagination').pagination({
+				pageCount: result.pageCount,
+				jump: true,
+				coping: true,
+				jump: true,
+				homePage: '首页',
+				endPage: '末页',
+				prevContent: '上页',
+				nextContent: '下页',
+				current:result.currPage,
+				callback:function(api){
+					pageIndex=api.getCurrent();
+					queryMerchantRegistAuditRecord(api.getCurrent());
+				}
+			});
+        } 
+    });  
+	//表头列不选中
+	$("#allCheck").find("span").removeClass('checked');
+}
+
+//初始化新增
+function initAddMerchantRegistAuditRecord(){
+	window.location=ctx+'/merchantRegistAuditRecord/queryMerchantRegistAuditRecordDetails?pageIndex='+pageIndex;
+}
+
+//初始化修改
+function showMerchantRegistAuditRecordDetails(id){
+	window.location=ctx+'/merchantRegistAuditRecord/queryMerchantRegistAuditRecordDetails?id='+id+'&pageIndex='+pageIndex;
+}
+
+//初始化删除
+function initDeleteMerchantRegistAuditRecord(id){
+	
+		layer.open({
+		type: 1,
+		closeBtn: 1,		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r'	, //按钮居中
+		shade: 0.3 ,//不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteMerchantRegistAuditRecord(id,true);
+		}
+	});
+}
+
+//删除
+function deleteMerchantRegistAuditRecord(id,showMsg){
+	$.ajax({
+		url:ctx+'/merchantRegistAuditRecord/deleteMerchantRegistAuditRecord',
+		data:[{
+			name:'id',
+			value:id
+		}],
+		type:'POST',
+		dataType:'json',
+		success:function(){
+			queryMerchantRegistAuditRecord(pageIndex);
+			if(showMsg){
+				layer.msg('删除成功!');	
+			}
+		}
+	});
+}
+//头部编辑
+function initEditMerchantRegistAuditRecord(){
+	var count=0;
+	var id=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+        	 id=$(this).data('id');
+         }
+    })
+    if(count>1){
+    	layer.msg('只能选中一行记录进行操作!');
+    	return ;
+    }
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	 if(id>0){
+	  showMerchantRegistAuditRecordDetails(id);
+	 }
+}
+//头部删除
+function initBatchDeleteMerchantRegistAuditRecord(){
+	var count=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+         }
+    })
+	
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	
+
+	layer.open({
+		type: 1,
+		closeBtn: 1,
+		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r', //按钮居中
+		shade: 0.3, //不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteBatchMerchantRegistAuditRecord();
+		}
+	});
+	
+}
+//批量删除
+function deleteBatchMerchantRegistAuditRecord(){
+	
+	$(".checkeBox").find("span").each(function () {
+        if($(this).hasClass("checked")){
+        	var id=$(this).data('id');
+        	deleteMerchantRegistAuditRecord(id,false);
+        	layer.msg('删除成功!');	
+        }
+   })
+}
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/merchantRegistLog/merchantRegistLogDetails.js b/pluss-manage-page/src/main/resources/static/resources/js/merchantRegistLog/merchantRegistLogDetails.js
new file mode 100644
index 0000000..b6ec948
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/merchantRegistLog/merchantRegistLogDetails.js
@@ -0,0 +1,96 @@
+/**
+ * create by robot 
+ * date Tue Sep 10 15:03:55 CST 2019 
+ */ 
+
+$(document).ready(function(){
+	//form表单样式
+	layui.use(['layer', 'form'], function() {
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+	//li 切换事件
+	$(".nav-tabs>li").click(function() {
+		var index = $(".nav-tabs>li").index(this);
+		$(this).addClass("active").siblings("li").removeClass("active");
+		
+	})
+	//弹出一个提示层
+	$('.fa-save').on('click', function() {
+		saveMerchantRegistLog();
+	});
+
+	//绑定标签栏事件
+	$(document).on('click','.nav-tabs li',function(){
+
+		var action =$(this).data('action');
+		 switch (action) {
+			case "base"://基本资料
+				goBase();
+				break;  
+			case "functions"://多功能
+				goFunctions();
+				break;
+			case "extends"://扩展    
+				goExtends();         
+				break;           
+		 }
+	})
+
+	//加载第一个标签
+	$('.nav-tabs li').eq(0).click();
+	
+});
+
+
+//跳转基本信息 
+function goBase(){
+	var url=ctx+'/merchantRegistLog/queryMerchantRegistLogBaseInfo?id='+$('#merchantRegistLogId').val();
+	$('.tab-content').load(url);
+	              
+}
+//跳转多功能输入
+function goFunctions(){ 
+	var url=ctx+'/merchantRegistLog/queryMerchantRegistLogFunctionsInfo?id='+$('#merchantRegistLogId').val();
+	$('.tab-content').load(url);  
+	
+}
+//跳转到扩展   
+function goExtends(){
+	
+	var url=ctx+'/merchantRegistLog/queryMerchantRegistLogExtendsInfo?id='+$('#merchantRegistLogId').val();
+	$('.tab-content').load(url);          
+}  
+  
+
+ 
+//保存
+function saveMerchantRegistLog(){
+	 
+	$(".fa-save").attr("disabled","disabled");
+	$('.fa-save').html('正在保存...')
+	$.ajax({
+		url:ctx+"/merchantRegistLog/saveMerchantRegistLog",
+		type:"POST",
+		dataType:'json',
+		data:$("#data_form").serializeArray(),
+		complete:function(){
+			$(".fa-save").removeAttr("disabled");
+			$('.fa-save').html('保存')
+		},        
+		success:function(service){ 
+		
+			layer.confirm('保存成功,是否前往列表？', {
+				  btn: ['确认','取消'] //按钮
+				}, function(){
+					$('#goback span').trigger('click'); 
+				}, function(){         
+					layer.closeAll();
+			});  
+			
+		}
+	});  
+}
+ 
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/merchantRegistLog/merchantRegistLogList.js b/pluss-manage-page/src/main/resources/static/resources/js/merchantRegistLog/merchantRegistLogList.js
new file mode 100644
index 0000000..1794620
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/merchantRegistLog/merchantRegistLogList.js
@@ -0,0 +1,271 @@
+/**
+ * create by robot 
+ * date Tue Sep 10 15:03:55 CST 2019 
+ */ 
+
+var pageIndex=1;
+$(document).ready(function(){
+	//调用查询
+	pageIndex=StringUtil.getQueryString('pageIndex');
+	if(pageIndex==undefined||pageIndex==null){
+		pageIndex=1;
+	}
+	queryMerchantRegistLog(pageIndex);
+	//绑定hover操作
+	$(document).on('mouseenter','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").show();
+		var width=15;
+		$(this).children('div').find('li').each(function(){
+			//获取li宽度
+			width+=$(this).width();
+		});
+		$(this).children('div').width(width);
+	})
+	$(document).on('mouseleave','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").hide();
+	});
+
+	//日历控件
+	layui.use(['layer', 'laydate'], function() {
+		var layer = layui.layer;
+		laydate = layui.laydate;
+		laydate.render({
+		elem: '#date1' //指定元素
+		});
+		laydate.render({
+			elem: '#date2' //指定元素
+		});
+	});
+
+
+	//行选中事件
+	$("#allCheck").find("span").click(function() {
+		$(this).toggleClass('checked');
+		if($(this).hasClass('checked')){
+			//所有列选中
+		  $(".checker").find("span").each(function () {
+		         $(this).addClass("checked");
+		    })
+		}else{
+			//所有列取消选中
+			$(".checker").find("span").each(function () {
+				 $(this).removeClass("checked");
+		    })
+		}
+	});
+
+	//单个选中
+	$(document).on('click','.checkeBox span',function() {
+		$(this).toggleClass('checked');
+		//设置头部事件
+		var length=$('.checkeBox span').length;
+		var count=0;
+		$(".checkeBox").find("span").each(function () {
+	        if($(this).hasClass("checked")){
+	        	count++;
+	        }
+	   })
+		//全选
+	   if(count==length){
+		   $("#allCheck").find("span").addClass('checked');
+	   }else{
+		   $("#allCheck").find("span").removeClass('checked');
+	   }
+	})
+	//左右div高度相等
+	var left_content_height = $(".right-content").height();
+	$(".left-content").height(left_content_height+35);
+	var sub_left_height=$(".res-menu").height(left_content_height-60);
+});
+
+//查询
+function queryMerchantRegistLog(index){
+	if(typeof(index)=='undefined'){
+		index=1;
+	}
+	var url=ctx+'/merchantRegistLog/queryMerchantRegistLogByPage';
+	$.ajax({  
+        url:url,  
+        type:"post", 
+        dataType:"json",  
+        data:{  
+        	"currPage":index,
+        	"id":$('#searchId').val()
+        },  
+        success:function(result){  
+        	//渲染数据
+        	$('#data_content').empty();
+        	var header='';
+        	$.each(result.merchantRegistLogList,function(i){
+        		var merchantRegistLog=result.merchantRegistLogList[i];
+        		var data='';
+        		data+='<tr class="odd">';
+        		data+='<td class="textc">';
+				data+='		 <div class="checker checkeBox">';        		data+='		 <span class=""  data-id="'+merchantRegistLog.id+'"><input type="checkbox"  value=""></span>';
+        		data+='		</div>';
+        		data+='</td>';
+        		data+='<td class="textc">'+merchantRegistLog.id+'</td>';
+        		data+='<td class="textc">'+merchantRegistLog.merchantCode+'</td>';
+        		data+='<td class="textc">'+merchantRegistLog.storeId+'</td>';
+        		data+='<td class="textc">'+merchantRegistLog.applyStatus+'</td>';
+        		data+='<td class="textc">'+merchantRegistLog.message+'</td>';
+        		data+='<td class="textc">'+merchantRegistLog.createDt+'</td>';
+        		data+='<td class="textc">'+merchantRegistLog.merchantName+'</td>';
+        		data+='<td class="textc">'+merchantRegistLog.merchantId+'</td>';
+        		data+='<td class="textc">'+merchantRegistLog.parentCode+'</td>';
+        		data+='<td class="textc">'+merchantRegistLog.creator+'</td>';
+        		data+='<td class="textc">';
+        		data+='<div class="positionr listOperaters">';
+        		data+='		<a href="javascript:void(0);"  class="icon-large dlblock w16 h16"><img src="'+resourcePath+'/images/angle-down.png"/></a>';
+        		data+='		<div class="ops_box ops_itemDiv positiona clearfix whitebg">';
+        		data+='			<ul>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showMerchantRegistLogDetails('+merchantRegistLog.id+')" class="btn btn-primary fa fa-edit ops_more f12">编辑</a></li>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="initDeleteMerchantRegistLog('+merchantRegistLog.id+')" class="btn btn-primary fa fa-remove ops_more f12">删除</a></li>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showMerchantRegistLogDetails('+merchantRegistLog.id+')" class="btn btn-primary fa fa-detail ops_more f12">明细</a></li>';
+        	    data+='			</ul>';
+              data+='		</div>';
+        	    data+='</div>';
+        	    data+='</td>';
+        	    data+='</tr>';
+        	    $('#data_content').append(data);
+        	});
+        	//分页
+        	$('#pageCount').html(result.pageCount);
+      	$('#currPage').html(result.currPage);
+          $('#totalCount').html(result.count);
+           	//设置分页
+           	pageIndex=result.currPage;
+			$('#pagination').pagination({
+				pageCount: result.pageCount,
+				jump: true,
+				coping: true,
+				jump: true,
+				homePage: '首页',
+				endPage: '末页',
+				prevContent: '上页',
+				nextContent: '下页',
+				current:result.currPage,
+				callback:function(api){
+					pageIndex=api.getCurrent();
+					queryMerchantRegistLog(api.getCurrent());
+				}
+			});
+        } 
+    });  
+	//表头列不选中
+	$("#allCheck").find("span").removeClass('checked');
+}
+
+//初始化新增
+function initAddMerchantRegistLog(){
+	window.location=ctx+'/merchantRegistLog/queryMerchantRegistLogDetails?pageIndex='+pageIndex;
+}
+
+//初始化修改
+function showMerchantRegistLogDetails(id){
+	window.location=ctx+'/merchantRegistLog/queryMerchantRegistLogDetails?id='+id+'&pageIndex='+pageIndex;
+}
+
+//初始化删除
+function initDeleteMerchantRegistLog(id){
+	
+		layer.open({
+		type: 1,
+		closeBtn: 1,		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r'	, //按钮居中
+		shade: 0.3 ,//不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteMerchantRegistLog(id,true);
+		}
+	});
+}
+
+//删除
+function deleteMerchantRegistLog(id,showMsg){
+	$.ajax({
+		url:ctx+'/merchantRegistLog/deleteMerchantRegistLog',
+		data:[{
+			name:'id',
+			value:id
+		}],
+		type:'POST',
+		dataType:'json',
+		success:function(){
+			queryMerchantRegistLog(pageIndex);
+			if(showMsg){
+				layer.msg('删除成功!');	
+			}
+		}
+	});
+}
+//头部编辑
+function initEditMerchantRegistLog(){
+	var count=0;
+	var id=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+        	 id=$(this).data('id');
+         }
+    })
+    if(count>1){
+    	layer.msg('只能选中一行记录进行操作!');
+    	return ;
+    }
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	 if(id>0){
+	  showMerchantRegistLogDetails(id);
+	 }
+}
+//头部删除
+function initBatchDeleteMerchantRegistLog(){
+	var count=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+         }
+    })
+	
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	
+
+	layer.open({
+		type: 1,
+		closeBtn: 1,
+		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r', //按钮居中
+		shade: 0.3, //不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteBatchMerchantRegistLog();
+		}
+	});
+	
+}
+//批量删除
+function deleteBatchMerchantRegistLog(){
+	
+	$(".checkeBox").find("span").each(function () {
+        if($(this).hasClass("checked")){
+        	var id=$(this).data('id');
+        	deleteMerchantRegistLog(id,false);
+        	layer.msg('删除成功!');	
+        }
+   })
+}
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/merchantStore/merchantStoreDetails.js b/pluss-manage-page/src/main/resources/static/resources/js/merchantStore/merchantStoreDetails.js
new file mode 100644
index 0000000..5a416a8
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/merchantStore/merchantStoreDetails.js
@@ -0,0 +1,201 @@
+/**
+ * create by robot 
+ * date Tue Sep 10 15:03:55 CST 2019 
+ */ 
+
+$(document).ready(function(){
+	//form表单样式
+	layui.use(['layer', 'form'], function() {
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+	//li 切换事件
+	$(".nav-tabs>li").click(function() {
+		var index = $(".nav-tabs>li").index(this);
+		$(this).addClass("active").siblings("li").removeClass("active");
+		
+	})
+	//弹出一个提示层
+	$('.fa-save').on('click', function() {
+		saveMerchantStore();
+	});
+
+	//绑定标签栏事件
+	$(document).on('click','.nav-tabs li',function(){
+
+		var action =$(this).data('action');
+		 switch (action) {
+			case "base"://基本资料
+				goBase();
+				break;  
+			case "functions"://多功能
+				goFunctions();
+				break;
+			case "extends"://扩展    
+				goExtends();         
+				break;           
+		 }
+	})
+
+	//加载第一个标签
+	$('.nav-tabs li').eq(0).click();
+	
+});
+
+
+//跳转基本信息 
+function goBase(){
+	var url=ctx+'/merchantStore/queryMerchantStoreBaseInfo?id='+$('#merchantStoreId').val();
+	$('.tab-content').load(url);
+	              
+}
+//跳转多功能输入
+function goFunctions(){ 
+	var url=ctx+'/merchantStore/queryMerchantStoreFunctionsInfo?id='+$('#merchantStoreId').val();
+	$('.tab-content').load(url);  
+	
+}
+//跳转到扩展   
+function goExtends(){
+	var url=ctx+'/merchantStore/queryMerchantStoreExtendsInfo?id='+$('#merchantStoreId').val();
+	$('.tab-content').load(url);          
+} 
+ 
+//保存
+function saveMerchantStore(){
+	var isAdmin=$("#isAdmin").val();
+	if(isAdmin=='1'){
+		var merchantCode=$("#merchantCode option:selected").val();
+		if(StringUtil.isBlank(merchantCode)){
+			layer.msg('请选择商户');
+			return;
+		}
+	}
+	if(isAdmin=='0'){
+		var merchantCode=$("#merchantCode").val();
+		if(StringUtil.isBlank(merchantCode)){
+			layer.msg('您尚未开通商户');
+			return;
+		}
+	}
+	
+	var storeName=$("#storeName").val();
+	if(StringUtil.isBlank(storeName)){
+		layer.msg('请输入店铺名称');
+		return;
+	}
+	var address=$("#address").val();
+	if(StringUtil.isBlank(address)){
+		layer.msg('请输入门店地址');
+		return;
+	}
+	
+	var linkPhone=$("#linkPhone").val();
+	if(StringUtil.isBlank(linkPhone)){
+		layer.msg('请输入联系电话');
+		return;
+	}
+	if(StringUtil.isNotPhone(linkPhone)){
+		layer.msg('请输入正确的联系方式');
+		return;
+	}
+	var productDesc=$("#productDesc").val();
+	if(StringUtil.isBlank(productDesc)){
+		layer.msg('请选择经营类目');
+		return;
+	}
+	var openingTime=$("#openingTime").val();
+	if(StringUtil.isBlank(openingTime)){
+		layer.msg('请输入营业时间');
+		return;
+	}
+	var storeDesc=$("#storeDesc").val();
+	if(StringUtil.isBlank(storeDesc)){
+		layer.msg('请输入门店简介');
+		return;
+	}
+	
+	var logo=$("#logo").val();
+	if(StringUtil.isBlank(logo)){
+		layer.msg('请上传门店logo');
+		return;
+	}
+	
+	var storeHeadPic=$("#storeHeadPic").val();
+	if(StringUtil.isBlank(storeHeadPic)){
+		layer.msg('请上传门头照');
+		return;
+	}
+	var cashPic=$("#cashPic").val();
+	if(StringUtil.isBlank(cashPic)){
+		layer.msg('请上传收银台照');
+		return;
+	}
+	var storeInsidePic=$("#storeInsidePic").val();
+	if(StringUtil.isBlank(storeInsidePic)){
+		layer.msg('请上传店内环境照');
+		return;
+	}
+	
+	var status=$("#status option:selected").val();
+	if(StringUtil.isBlank(status)){
+		layer.msg('请选择店铺状态');
+		return;
+	}
+	 
+	$(".fa-save").attr("disabled","disabled");
+	$('.fa-save').html('正在保存...')
+	$.ajax({
+		url:ctx+"/merchantStore/saveMerchantStore",
+		type:"POST",
+		dataType:'json',
+		data:$("#data_form").serializeArray(),
+		complete:function(){
+			$(".fa-save").removeAttr("disabled");
+			$('.fa-save').html('保存')
+		},        
+		success:function(service){ 
+			layer.confirm('保存成功,是否前往列表？', {
+				  btn: ['确认','取消'] //按钮
+				}, function(){
+					$('#goback span').trigger('click'); 
+				}, function(){         
+					layer.closeAll();
+			});  
+			
+		}
+	});  
+}
+
+function uploadImage1(){
+	$.seocooUpload(function(data){
+		var url=data.url;
+		$('#demo1').attr("src",url);
+		$('#logo').val(url);
+	})
+}
+
+function uploadImage2(){
+		$.seocooUpload(function(data){
+			var url=data.url;
+			$('#demo2').attr("src",url);
+			$('#storeHeadPic').val(url);
+		})
+}
+function uploadImage3(){
+	$.seocooUpload(function(data){
+		var url=data.url;
+		$('#demo3').attr("src",url);
+		$('#cashPic').val(url);
+	})
+}
+function uploadImage4(){
+	$.seocooUpload(function(data){
+		var url=data.url;
+		$('#demo4').attr("src",url);
+		$('#storeInsidePic').val(url);
+	})
+}
+ 
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/merchantStore/merchantStoreList.js b/pluss-manage-page/src/main/resources/static/resources/js/merchantStore/merchantStoreList.js
new file mode 100644
index 0000000..7d86ebd
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/merchantStore/merchantStoreList.js
@@ -0,0 +1,379 @@
+/**
+ * create by robot
+ * date Tue Sep 10 15:03:55 CST 2019
+ */
+
+var pageIndex = 1;
+
+var type = '${admin}'
+$(document).ready(function () {
+    //调用查询
+    pageIndex = StringUtil.getQueryString('pageIndex');
+    if (pageIndex == undefined || pageIndex == null) {
+        pageIndex = 1;
+    }
+    // queryMerchantStore(pageIndex);
+    //绑定hover操作
+    $(document).on('mouseenter', '.listOperaters', function () {
+        $(this).children(".ops_itemDiv").show();
+        var width = 15;
+        $(this).children('div').find('li').each(function () {
+            //获取li宽度
+            width += $(this).width();
+        });
+        $(this).children('div').width(width);
+    });
+    $(document).on('mouseleave', '.listOperaters', function () {
+        $(this).children(".ops_itemDiv").hide();
+    });
+
+    //日历控件
+    layui.use(['layer', 'laydate'], function () {
+        var layer = layui.layer;
+        laydate = layui.laydate;
+        laydate.render({
+            elem: '#date1' //指定元素
+        });
+        laydate.render({
+            elem: '#date2' //指定元素
+        });
+    });
+
+    //行选中事件
+    $("#allCheck").find("span").click(function () {
+        $(this).toggleClass('checked');
+        if ($(this).hasClass('checked')) {
+            //所有列选中
+            $(".checker").find("span").each(function () {
+                $(this).addClass("checked");
+            })
+        } else {
+            //所有列取消选中
+            $(".checker").find("span").each(function () {
+                $(this).removeClass("checked");
+            })
+        }
+    });
+
+    //单个选中
+    $(document).on('click', '.checkeBox span', function () {
+        $(this).toggleClass('checked');
+        //设置头部事件
+        var length = $('.checkeBox span').length;
+        var count = 0;
+        $(".checkeBox").find("span").each(function () {
+            if ($(this).hasClass("checked")) {
+                count++;
+            }
+        });
+        //全选
+        if (count == length) {
+            $("#allCheck").find("span").addClass('checked');
+        } else {
+            $("#allCheck").find("span").removeClass('checked');
+        }
+    });
+    //左右div高度相等
+    var left_content_height = $(".right-content").height();
+    $(".left-content").height(left_content_height + 35);
+    var sub_left_height = $(".res-menu").height(left_content_height - 60);
+});
+
+//初始化新增
+function initAddMerchantStore() {
+    window.location = ctx + '/merchantStore/queryMerchantStoreDetails?pageIndex=' + pageIndex;
+}
+
+//初始化详情
+function showMerchantStoreParticulars(id) {
+    window.location = ctx + '/merchantStore/merchantStorePath?id=' + id;
+}
+
+//快付状态审核
+function updateChannelStatus(id,status,userId) {
+    var index = layer.confirm('确定对用户ID为【'+userId+'】开通快付吗？', {icon: 3, title:'提示'}, function(index){
+        $.ajax({
+            url: ctx + '/merchantStore/updateChannelStatus',
+            data: {"csId":id,"status":status},
+            type: 'POST',
+            dataType: 'json',
+            success: function (res) {
+                layer.close(index);
+                let icon = 2;
+                if (res.code == 200) {
+                    icon = 1;
+                    reload();
+                }
+                layer.msg(res.message,{icon:icon});
+            }
+        });
+    });
+}
+
+//初始化修改
+function showMerchantStoreDetails(id) {
+    window.location = ctx + '/merchantStore/queryMerchantStoreDetails?id=' + id + '&pageIndex=' + pageIndex;
+}
+
+/**
+ * 跳转进件详情
+ * @returns
+ */
+function showMerchantInfo(userId) {
+    window.location = ctx + "/merchantBankCard/queryMerchantInfo?userId=" + userId;
+}
+
+//初始化收款码
+var dkIndex = 0;
+var dkId = 0;
+var dkStatus = 0;
+function showMerchantStoreReceipt(data,payEcdemicSwitch) {
+    let channelVal = data.channel;
+    let channelText = data.channel == 4 ? "银盛" : data.channel == 3 ? "瑞银信" : "随行付";
+    var url = ctx + '/merchantStore/showMerchantStoreReceipt?userId=' + data.userId + "&channel="+channelVal;
+    var load = layer.load(1);
+    dkId = data.userId;
+    dkStatus = payEcdemicSwitch;
+    $.get(url, function (res) {
+        layer.close(load);
+        if (res.code == 1) {
+            var qrCodeUrl = res.url;
+            dkIndex = layer.open({
+                type: 1,
+                title: res.storeName+'('+channelText+')',
+                skin: 'layui-layer-molv',
+                shade: 0.3,
+                content: '<div id="qrcode" style="width:250px; height:250px;"></div><div class="allopatry-btn"><button class="layui-btn layui-btn-sm allopatry" data-t="open" data-id="'+data.userId+'" data-value="'+payEcdemicSwitch+'">开启</button><button class="layui-btn layui-btn-sm layui-btn-normal allopatry" data-t="close" data-id="'+data.userId+'" data-value="'+payEcdemicSwitch+'">关闭</button></div>',//这里content是一个普通的String
+                success: function () {
+                    $("#qrcode").qrcode({text:qrCodeUrl,width:250,height:250});
+                }
+            });
+        } else {
+            layer.msg(res.msg, {icon: 2});
+        }
+    })
+}
+//手动进件
+function manualMerchantIncom(userId) {
+    layer.confirm('确认对用户ID为【' + userId + '】发起进件?', {icon: 3, title: '提示', skin: 'layui-layer-molv'}, function (index) {
+        var load = layer.load(1);
+        var url = ctx + '/merchantStore/manualMerchantIncom/' + userId;
+        $.get(url, function (res) {
+            layer.close(load);
+            layer.close(index);
+            if (res.code == 1) {
+                layer.msg(res.msg, {icon: 1});
+            } else {
+                layer.msg(res.msg, {icon: 2});
+            }
+        })
+    });
+}
+
+//手动进件
+function batchMerchantIncom() {
+    layer.confirm('确认批量发起进件?', {icon: 3, title: '提示', skin: 'layui-layer-molv'}, function (index) {
+        var load = layer.load(1);
+        var url = ctx + '/merchantStore/batchMerchantIncom';
+        $.get(url, function (res) {
+            layer.close(load);
+            layer.close(index);
+            if (res.code == 1) {
+                layer.msg(res.msg, {icon: 1});
+            } else {
+                layer.msg(res.msg, {icon: 2});
+            }
+        })
+    });
+}
+
+//批量删除
+function deleteBatchMerchantStore() {
+    $(".checkeBox").find("span").each(function () {
+        if ($(this).hasClass("checked")) {
+            var id = $(this).data('id');
+            deleteMerchantStore(id, false);
+            layer.msg('删除成功!');
+        }
+    })
+}
+
+//点击放大图片
+function enlargePicture(billPicUrl) {
+    //alert("即将弹出图片");
+    var data = '';
+    data += '<img src="' + billPicUrl + '"  class="img" onerror="this.src=\'https://www.shouyinbei.net/resources/images/error.jpg\'" >';
+    $('#picture').append(data);
+    $('#pictureWindow').show();
+}
+
+function hidePictureWindow() {
+    $('#picture').empty();
+    $('#pictureWindow').hide();
+}
+
+
+//头部禁用
+function disableMerchantStore() {
+    var count = 0;
+    var checkStatus = table.checkStatus('merchantStoreList');
+    checkStatus.data;
+    count = checkStatus.data.length;
+    console.log(checkStatus.data);
+
+    if (count == 0) {
+        layer.msg('请选中一行记录!');
+        return;
+    }
+    if (count > 1) {
+        layer.msg('请单行记录!');
+        return;
+    }
+
+    $.ajax({
+        url: ctx + '/merchantStore/queryStatus',
+        data: {
+            id: checkStatus.data[0].id
+        },
+        type: 'POST',
+        dataType: 'json',
+        success: function (res) {
+            if (res.resultCode == 1) {
+                var resultValue = res.resultValue;
+                if (resultValue == 2) {
+                    url = ctx + '/merchantStore/merchantStoreForbidden?resultValue=' + resultValue + '&id=' + checkStatus.data[0].userId;
+                    layer.open({
+                        type: 2,
+                        title: '开通所选中的交易状态',
+                        shade: 0.5,
+                        maxmin: true,
+                        area: ['550px', '300px'],
+                        content: url
+                    });
+                } else if (resultValue == 1) {
+                    url = ctx + '/merchantStore/merchantStoreForbidden?resultValue=' + resultValue + '&id=' + checkStatus.data[0].userId;
+                    layer.open({
+                        type: 2,
+                        title: '禁用所选中的交易状态',
+                        shade: 0.5,
+                        maxmin: true,
+                        area: ['550px', '300px'],
+                        content: url
+                    });
+                } else layer.msg(" 请选择您需要开通或禁用的交易状态！");
+            }
+        }
+    });
+}
+
+//电子围栏
+function payEcdemicSwitchMerchantStore() {
+    var count = 0;
+    var checkStatus = table.checkStatus('merchantStoreList');
+    checkStatus.data;
+    count = checkStatus.data.length;
+    if (count == 0) {
+        layer.msg('请选中一行记录!');
+        return;
+    }
+    if (count > 1) {
+        layer.msg('请单行记录!');
+        return;
+    }
+
+    $.ajax({
+        url: ctx + '/merchantStore/merchantStorePayEcdemicSwitch',
+        data: {
+            id: checkStatus.data[0].id,
+        },
+        type: 'POST',
+        dataType: 'json',
+        success: function (res) {
+            // layer.close(index);
+            if (res.resultCode == 1) {
+                var payEcdemicSwitch = res.payEcdemicSwitch;
+                if (payEcdemicSwitch == 1) {
+                    url = ctx + '/merchantStore/merchantStoreThoroughfare?payEcdemicSwitch=' + payEcdemicSwitch + '&id=' + checkStatus.data[0].userId;
+                    layer.open({
+                        type: 2,
+                        title: '关闭所选中的异地支付通道',
+                        shade: 0.5,
+                        maxmin: true,
+                        area: ['550px', '300px'],
+                        content: url
+                    });
+                } else if (payEcdemicSwitch == 0) {
+                    url = ctx + '/merchantStore/merchantStoreThoroughfare?payEcdemicSwitch=' + payEcdemicSwitch + '&id=' + checkStatus.data[0].userId;
+                    layer.open({
+                        type: 2,
+                        title: '开启所选中的异地支付通道',
+                        shade: 0.5,
+                        maxmin: true,
+                        area: ['550px', '300px'],
+                        content: url
+                    });
+                }
+            }
+        }
+    });
+}
+
+//操作营销商户
+function isMarket() {
+    var count;
+    var checkStatus = table.checkStatus('merchantStoreList');
+    checkStatus.data;
+    count = checkStatus.data.length;
+
+    if (count == 0) {
+        layer.msg('请选中一行记录！');
+        return;
+    }
+
+    if (count > 1) {
+        layer.msg('禁止操作多行');
+        return;
+    }
+
+    var data = checkStatus.data[0].isMarket == 0? 1: 0;
+    var index = layer.confirm("是否确认" + (checkStatus.data[0].isMarket == 0 ? '<span style="color: green;">开通</span>' : '<span style="color: red;">关闭</span>') + "所选商户为营销商户？",
+        {title: "开通/关闭营销商户"},
+        function () {
+        var idArr = [];
+        checkStatus.data.forEach(function(item) {
+            var id = item.id;
+            idArr.push(id);
+        });
+
+        $.ajax({
+            url: ctx + '/merchantStore/operatMarket',
+            data: {ids: idArr, isMarker: data},
+            type: 'POST',
+            dataType: 'json',
+            success: function (res) {
+                layer.close(index);
+                if (res.resultCode == 1) {
+                    table.reload('merchantStoreList');
+                }
+            }
+        });
+    })
+}
+
+function dateFtt(fmt, date) { //author: meizz
+    var o = {
+        "M+": date.getMonth() + 1,                 //月份
+        "d+": date.getDate(),                    //日
+        "h+": date.getHours(),                   //小时
+        "m+": date.getMinutes(),                 //分
+        "s+": date.getSeconds(),                 //秒
+        "q+": Math.floor((date.getMonth() + 3) / 3), //季度
+        "S": date.getMilliseconds()             //毫秒
+    };
+    if (/(y+)/.test(fmt))
+        fmt = fmt.replace(RegExp.$1, (date.getFullYear() + "").substr(4 - RegExp.$1.length));
+    for (var k in o)
+        if (new RegExp("(" + k + ")").test(fmt))
+            fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
+    return fmt;
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/merchantStore/merchantStoreParticulars.js b/pluss-manage-page/src/main/resources/static/resources/js/merchantStore/merchantStoreParticulars.js
new file mode 100644
index 0000000..8705a31
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/merchantStore/merchantStoreParticulars.js
@@ -0,0 +1,140 @@
+var pageIndex=1;
+$(document).ready(function(){
+    //调用查询
+    pageIndex=StringUtil.getQueryString('pageIndex');
+    if(pageIndex==undefined||pageIndex==null){
+        pageIndex=1;
+    }
+    queryUserApp(pageIndex);
+    //绑定hover操作
+    $(document).on('mouseenter','.listOperaters',function(){
+        $(this).children(".ops_itemDiv").show();
+        var width=15;
+        $(this).children('div').find('li').each(function(){
+            //获取li宽度
+            width+=$(this).width();
+        });
+        $(this).children('div').width(width);
+    })
+    $(document).on('mouseleave','.listOperaters',function(){
+        $(this).children(".ops_itemDiv").hide();
+    });
+
+    //日历控件
+    layui.use(['layer', 'laydate'], function() {
+        var layer = layui.layer;
+        laydate = layui.laydate;
+        laydate.render({
+            elem: '#date1' //指定元素
+        });
+        laydate.render({
+            elem: '#date2' //指定元素
+        });
+    });
+
+    //行选中事件
+    $("#allCheck").find("span").click(function() {
+        $(this).toggleClass('checked');
+        if($(this).hasClass('checked')){
+            //所有列选中
+            $(".checker").find("span").each(function () {
+                $(this).addClass("checked");
+            })
+        }else{
+            //所有列取消选中
+            $(".checker").find("span").each(function () {
+                $(this).removeClass("checked");
+            })
+        }
+    });
+    //左右div高度相等
+    var left_content_height = $(".right-content").height();
+    $(".left-content").height(left_content_height+35);
+    var sub_left_height=$(".res-menu").height(left_content_height-60);
+});
+
+//查询
+function queryUserApp(index){
+    if(typeof(index)=='undefined'){
+        index=1;
+    }
+    var url=ctx+'/merchantStore/queryMerchantStoreParticulars';
+    $.ajax({
+        url:url,
+        type:"post",
+        dataType:"json",
+        data:{
+            "currPage":index,
+            "id":$("#id").val(),
+        },
+        success:function(result){
+            var presentPage = result.currPage;
+            //渲染数据
+            $('#data_content').empty();
+            var header='';
+            $.each(result.operationRecordList,function(i){
+                var orderNumber = (presentPage-1)*12+i+1;
+                var operationRecordList=result.operationRecordList[i];
+                var data='';
+                data+='<tr class="odd">';
+                data+='<td class="textc">'+orderNumber+'</td>';
+                if (result.admin){
+                    data+='<td class="textc">'+operationRecordList.loginName+'</td>';
+                }
+                data+='<td class="textc">'+operationRecordList.dictName+'</td>';
+                data+='<td class="textc">'+operationRecordList.remark+'</td>';
+                var createTime='';
+                if(StringUtil.isNotBlank(operationRecordList.createTime)){
+                    // createDt=new Date(operationRecordList.createDt).toYYYYMMDD();
+                    createTime= dateFtt("yyyy-MM-dd hh:mm:ss",new Date(operationRecordList.createTime));
+                }
+                data+='<td class="textc">'+createTime+'</td>';
+                data+='</tr>';
+                $('#data_content').append(data);
+            });
+            //分页
+            $('#pageCount').html(result.pageCount);
+            $('#currPage').html(result.currPage);
+            $('#totalCount').html(result.count);
+            //设置分页
+            pageIndex=result.currPage;
+            $('#pagination').pagination({
+                pageCount: result.pageCount,
+                jump: true,
+                coping: true,
+                jump: true,
+                homePage: '首页',
+                endPage: '末页',
+                prevContent: '上页',
+                nextContent: '下页',
+                current:result.currPage,
+                callback:function(api){
+                    pageIndex=api.getCurrent();
+                    queryUserApp(api.getCurrent());
+                }
+            });
+        }
+    });
+    //表头列不选中
+    $("#allCheck").find("span").removeClass('checked');
+}
+
+function dateFtt(fmt,date)
+{ //author: meizz
+    var o = {
+        "M+" : date.getMonth()+1,                 //月份
+        "d+" : date.getDate(),                    //日
+        "h+" : date.getHours(),                   //小时
+        "m+" : date.getMinutes(),                 //分
+        "s+" : date.getSeconds(),                 //秒
+        "q+" : Math.floor((date.getMonth()+3)/3), //季度
+        "S"  : date.getMilliseconds()             //毫秒
+    };
+    if(/(y+)/.test(fmt))
+        fmt=fmt.replace(RegExp.$1, (date.getFullYear()+"").substr(4 - RegExp.$1.length));
+    for(var k in o)
+        if(new RegExp("("+ k +")").test(fmt))
+            fmt = fmt.replace(RegExp.$1, (RegExp.$1.length==1) ? (o[k]) : (("00"+ o[k]).substr((""+ o[k]).length)));
+    return fmt;
+}
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/nicescroll.min.js b/pluss-manage-page/src/main/resources/static/resources/js/nicescroll.min.js
new file mode 100644
index 0000000..c3f8cbb
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/nicescroll.min.js
@@ -0,0 +1,334 @@
+/* jquery.nicescroll v3.7.6 InuYaksa - MIT - https://nicescroll.areaaperta.com */
+!function(e){"function"==typeof define&&define.amd?define(["jquery"],e):"object"==typeof exports?module.exports=e(require("jquery")):e(jQuery)}(function(e){"use strict"
+function o(){var e=c.currentScript||function(){var e=c.getElementsByTagName("script")
+return e.length?e[e.length-1]:!1}(),o=e?e.src.split("?")[0]:""
+return o.split("/").length>0?o.split("/").slice(0,-1).join("/")+"/":""}function t(e,o,t){for(var r=0,i=o.length;i>r;r++)t(e,o[r])}var r=!1,i=!1,s=0,n=2e3,l=0,a=e,c=document,d=window,u=a(d),h=[],p=d.requestAnimationFrame||d.webkitRequestAnimationFrame||d.mozRequestAnimationFrame||!1,m=d.cancelAnimationFrame||d.webkitCancelAnimationFrame||d.mozCancelAnimationFrame||!1
+if(p)d.cancelAnimationFrame||(m=function(e){})
+else{var f=0
+p=function(e,o){var t=(new Date).getTime(),r=Math.max(0,16-(t-f)),i=d.setTimeout(function(){e(t+r)},r)
+return f=t+r,i},m=function(e){d.clearTimeout(e)}}var g=d.MutationObserver||d.WebKitMutationObserver||!1,v=Date.now||function(){return(new Date).getTime()},w={zindex:"auto",cursoropacitymin:0,cursoropacitymax:1,cursorcolor:"#424242",cursorwidth:"6px",cursorborder:"1px solid #fff",cursorborderradius:"5px",scrollspeed:40,mousescrollstep:27,touchbehavior:!1,emulatetouch:!1,hwacceleration:!0,usetransition:!0,boxzoom:!1,dblclickzoom:!0,gesturezoom:!0,grabcursorenabled:!0,autohidemode:!0,background:"",iframeautoresize:!0,cursorminheight:32,preservenativescrolling:!0,railoffset:!1,railhoffset:!1,bouncescroll:!0,spacebarenabled:!0,railpadding:{top:0,right:0,left:0,bottom:0},disableoutline:!0,horizrailenabled:!0,railalign:"right",railvalign:"bottom",enabletranslate3d:!0,enablemousewheel:!0,enablekeyboard:!0,smoothscroll:!0,sensitiverail:!0,enablemouselockapi:!0,cursorfixedheight:!1,directionlockdeadzone:6,hidecursordelay:400,nativeparentscrolling:!0,enablescrollonselection:!0,overflowx:!0,overflowy:!0,cursordragspeed:.3,rtlmode:"auto",cursordragontouch:!1,oneaxismousemode:"auto",scriptpath:o(),preventmultitouchscrolling:!0,disablemutationobserver:!1,enableobserver:!0,scrollbarid:!1},b=!1,y=function(){function e(){var e=["grab","-webkit-grab","-moz-grab"];(s.ischrome&&!s.ischrome38||s.isie)&&(e=[])
+for(var o=0,r=e.length;r>o;o++){var i=e[o]
+if(t.cursor=i,t.cursor==i)return i}return"url(https://cdnjs.cloudflare.com/ajax/libs/slider-pro/1.3.0/css/images/openhand.cur),n-resize"}if(b)return b
+var o=c.createElement("DIV"),t=o.style,r=navigator.userAgent,i=navigator.platform,s={}
+return s.haspointerlock="pointerLockElement"in c||"webkitPointerLockElement"in c||"mozPointerLockElement"in c,s.isopera="opera"in d,s.isopera12=s.isopera&&"getUserMedia"in navigator,s.isoperamini="[object OperaMini]"===Object.prototype.toString.call(d.operamini),s.isie="all"in c&&"attachEvent"in o&&!s.isopera,s.isieold=s.isie&&!("msInterpolationMode"in t),s.isie7=s.isie&&!s.isieold&&(!("documentMode"in c)||7===c.documentMode),s.isie8=s.isie&&"documentMode"in c&&8===c.documentMode,s.isie9=s.isie&&"performance"in d&&9===c.documentMode,s.isie10=s.isie&&"performance"in d&&10===c.documentMode,s.isie11="msRequestFullscreen"in o&&c.documentMode>=11,s.ismsedge="msCredentials"in d,s.ismozilla="MozAppearance"in t,s.iswebkit=!s.ismsedge&&"WebkitAppearance"in t,s.ischrome=s.iswebkit&&"chrome"in d,s.ischrome38=s.ischrome&&"touchAction"in t,s.ischrome22=!s.ischrome38&&s.ischrome&&s.haspointerlock,s.ischrome26=!s.ischrome38&&s.ischrome&&"transition"in t,s.cantouch="ontouchstart"in c.documentElement||"ontouchstart"in d,s.hasw3ctouch=(d.PointerEvent||!1)&&(navigator.maxTouchPoints>0||navigator.msMaxTouchPoints>0),s.hasmstouch=!s.hasw3ctouch&&(d.MSPointerEvent||!1),s.ismac=/^mac$/i.test(i),s.isios=s.cantouch&&/iphone|ipad|ipod/i.test(i),s.isios4=s.isios&&!("seal"in Object),s.isios7=s.isios&&"webkitHidden"in c,s.isios8=s.isios&&"hidden"in c,s.isios10=s.isios&&d.Proxy,s.isandroid=/android/i.test(r),s.haseventlistener="addEventListener"in o,s.trstyle=!1,s.hastransform=!1,s.hastranslate3d=!1,s.transitionstyle=!1,s.hastransition=!1,s.transitionend=!1,s.trstyle="transform",s.hastransform="transform"in t||function(){for(var e=["msTransform","webkitTransform","MozTransform","OTransform"],o=0,r=e.length;r>o;o++)if(void 0!==t[e[o]]){s.trstyle=e[o]
+break}s.hastransform=!!s.trstyle}(),s.hastransform&&(t[s.trstyle]="translate3d(1px,2px,3px)",s.hastranslate3d=/translate3d/.test(t[s.trstyle])),s.transitionstyle="transition",s.prefixstyle="",s.transitionend="transitionend",s.hastransition="transition"in t||function(){s.transitionend=!1
+for(var e=["webkitTransition","msTransition","MozTransition","OTransition","OTransition","KhtmlTransition"],o=["-webkit-","-ms-","-moz-","-o-","-o","-khtml-"],r=["webkitTransitionEnd","msTransitionEnd","transitionend","otransitionend","oTransitionEnd","KhtmlTransitionEnd"],i=0,n=e.length;n>i;i++)if(e[i]in t){s.transitionstyle=e[i],s.prefixstyle=o[i],s.transitionend=r[i]
+break}s.ischrome26&&(s.prefixstyle=o[1]),s.hastransition=s.transitionstyle}(),s.cursorgrabvalue=e(),s.hasmousecapture="setCapture"in o,s.hasMutationObserver=g!==!1,o=null,b=s,s},x=function(e,o){function t(){var e=T.doc.css(P.trstyle)
+return e&&"matrix"==e.substr(0,6)?e.replace(/^.*\((.*)\)$/g,"$1").replace(/px/g,"").split(/, +/):!1}function f(){var e=T.win
+if("zIndex"in e)return e.zIndex()
+for(;e.length>0;){if(9==e[0].nodeType)return!1
+var o=e.css("zIndex")
+if(!isNaN(o)&&0!==o)return parseInt(o)
+e=e.parent()}return!1}function b(e,o,t){var r=e.css(o),i=parseFloat(r)
+if(isNaN(i)){i=I[r]||0
+var s=3==i?t?T.win.outerHeight()-T.win.innerHeight():T.win.outerWidth()-T.win.innerWidth():1
+return T.isie8&&i&&(i+=1),s?i:0}return i}function x(e,o,t,r){T._bind(e,o,function(r){r=r||d.event
+var i={original:r,target:r.target||r.srcElement,type:"wheel",deltaMode:"MozMousePixelScroll"==r.type?0:1,deltaX:0,deltaZ:0,preventDefault:function(){return r.preventDefault?r.preventDefault():r.returnValue=!1,!1},stopImmediatePropagation:function(){r.stopImmediatePropagation?r.stopImmediatePropagation():r.cancelBubble=!0}}
+return"mousewheel"==o?(r.wheelDeltaX&&(i.deltaX=-1/40*r.wheelDeltaX),r.wheelDeltaY&&(i.deltaY=-1/40*r.wheelDeltaY),!i.deltaY&&!i.deltaX&&(i.deltaY=-1/40*r.wheelDelta)):i.deltaY=r.detail,t.call(e,i)},r)}function z(e,o,t,r){T.scrollrunning||(T.newscrolly=T.getScrollTop(),T.newscrollx=T.getScrollLeft(),A=v())
+var i=v()-A
+if(A=v(),i>350?q=1:q+=(2-q)/10,e=e*q|0,o=o*q|0,e){if(r)if(0>e){if(T.getScrollLeft()>=T.page.maxw)return!0}else if(T.getScrollLeft()<=0)return!0
+var s=e>0?1:-1
+D!==s&&(T.scrollmom&&T.scrollmom.stop(),T.newscrollx=T.getScrollLeft(),D=s),T.lastdeltax-=e}if(o){var n=function(){var e=T.getScrollTop()
+if(0>o){if(e>=T.page.maxh)return!0}else if(0>=e)return!0}()
+if(n){if(M.nativeparentscrolling&&t&&!T.ispage&&!T.zoomactive)return!0
+var l=T.view.h>>1
+T.newscrolly<-l?(T.newscrolly=-l,o=-1):T.newscrolly>T.page.maxh+l?(T.newscrolly=T.page.maxh+l,o=1):o=0}var a=o>0?1:-1
+X!==a&&(T.scrollmom&&T.scrollmom.stop(),T.newscrolly=T.getScrollTop(),X=a),T.lastdeltay-=o}(o||e)&&T.synched("relativexy",function(){var e=T.lastdeltay+T.newscrolly
+T.lastdeltay=0
+var o=T.lastdeltax+T.newscrollx
+T.lastdeltax=0,T.rail.drag||T.doScrollPos(o,e)})}function k(e,o,t){var r,i
+if(!t&&j)return!0
+if(0===e.deltaMode?(r=0|-(e.deltaX*(M.mousescrollstep/54)),i=0|-(e.deltaY*(M.mousescrollstep/54))):1===e.deltaMode&&(r=0|-(e.deltaX*M.mousescrollstep*50/80),i=0|-(e.deltaY*M.mousescrollstep*50/80)),o&&M.oneaxismousemode&&0===r&&i&&(r=i,i=0,t)){var s=0>r?T.getScrollLeft()>=T.page.maxw:T.getScrollLeft()<=0
+s&&(i=r,r=0)}T.isrtlmode&&(r=-r)
+var n=z(r,i,t,!0)
+return n?void(t&&(j=!0)):(j=!1,e.stopImmediatePropagation(),e.preventDefault())}var T=this
+this.version="3.7.6",this.name="nicescroll",this.me=o
+var E=a("body"),M=this.opt={doc:E,win:!1}
+if(a.extend(M,w),M.snapbackspeed=80,e)for(var L in M)void 0!==e[L]&&(M[L]=e[L])
+if(M.disablemutationobserver&&(g=!1),this.doc=M.doc,this.iddoc=this.doc&&this.doc[0]?this.doc[0].id||"":"",this.ispage=/^BODY|HTML/.test(M.win?M.win[0].nodeName:this.doc[0].nodeName),this.haswrapper=M.win!==!1,this.win=M.win||(this.ispage?u:this.doc),this.docscroll=this.ispage&&!this.haswrapper?u:this.win,this.body=E,this.viewport=!1,this.isfixed=!1,this.iframe=!1,this.isiframe="IFRAME"==this.doc[0].nodeName&&"IFRAME"==this.win[0].nodeName,this.istextarea="TEXTAREA"==this.win[0].nodeName,this.forcescreen=!1,this.canshowonmouseevent="scroll"!=M.autohidemode,this.onmousedown=!1,this.onmouseup=!1,this.onmousemove=!1,this.onmousewheel=!1,this.onkeypress=!1,this.ongesturezoom=!1,this.onclick=!1,this.onscrollstart=!1,this.onscrollend=!1,this.onscrollcancel=!1,this.onzoomin=!1,this.onzoomout=!1,this.view=!1,this.page=!1,this.scroll={x:0,y:0},this.scrollratio={x:0,y:0},this.cursorheight=20,this.scrollvaluemax=0,"auto"==M.rtlmode){var C=this.win[0]==d?this.body:this.win,N=C.css("writing-mode")||C.css("-webkit-writing-mode")||C.css("-ms-writing-mode")||C.css("-moz-writing-mode")
+"horizontal-tb"==N||"lr-tb"==N||""===N?(this.isrtlmode="rtl"==C.css("direction"),this.isvertical=!1):(this.isrtlmode="vertical-rl"==N||"tb"==N||"tb-rl"==N||"rl-tb"==N,this.isvertical="vertical-rl"==N||"tb"==N||"tb-rl"==N)}else this.isrtlmode=M.rtlmode===!0,this.isvertical=!1
+if(this.scrollrunning=!1,this.scrollmom=!1,this.observer=!1,this.observerremover=!1,this.observerbody=!1,M.scrollbarid!==!1)this.id=M.scrollbarid
+else do this.id="ascrail"+n++
+while(c.getElementById(this.id))
+this.rail=!1,this.cursor=!1,this.cursorfreezed=!1,this.selectiondrag=!1,this.zoom=!1,this.zoomactive=!1,this.hasfocus=!1,this.hasmousefocus=!1,this.railslocked=!1,this.locked=!1,this.hidden=!1,this.cursoractive=!0,this.wheelprevented=!1,this.overflowx=M.overflowx,this.overflowy=M.overflowy,this.nativescrollingarea=!1,this.checkarea=0,this.events=[],this.saved={},this.delaylist={},this.synclist={},this.lastdeltax=0,this.lastdeltay=0,this.detected=y()
+var P=a.extend({},this.detected)
+this.canhwscroll=P.hastransform&&M.hwacceleration,this.ishwscroll=this.canhwscroll&&T.haswrapper,this.isrtlmode?this.isvertical?this.hasreversehr=!(P.iswebkit||P.isie||P.isie11):this.hasreversehr=!(P.iswebkit||P.isie&&!P.isie10&&!P.isie11):this.hasreversehr=!1,this.istouchcapable=!1,P.cantouch||!P.hasw3ctouch&&!P.hasmstouch?!P.cantouch||P.isios||P.isandroid||!P.iswebkit&&!P.ismozilla||(this.istouchcapable=!0):this.istouchcapable=!0,M.enablemouselockapi||(P.hasmousecapture=!1,P.haspointerlock=!1),this.debounced=function(e,o,t){if(T){var r=T.delaylist[e]||!1
+r||(T.delaylist[e]={h:p(function(){T.delaylist[e].fn.call(T),T.delaylist[e]=!1},t)},o.call(T)),T.delaylist[e].fn=o}},this.synched=function(e,o){T.synclist[e]?T.synclist[e]=o:(T.synclist[e]=o,p(function(){T&&(T.synclist[e]&&T.synclist[e].call(T),T.synclist[e]=null)}))},this.unsynched=function(e){T.synclist[e]&&(T.synclist[e]=!1)},this.css=function(e,o){for(var t in o)T.saved.css.push([e,t,e.css(t)]),e.css(t,o[t])},this.scrollTop=function(e){return void 0===e?T.getScrollTop():T.setScrollTop(e)},this.scrollLeft=function(e){return void 0===e?T.getScrollLeft():T.setScrollLeft(e)}
+var R=function(e,o,t,r,i,s,n){this.st=e,this.ed=o,this.spd=t,this.p1=r||0,this.p2=i||1,this.p3=s||0,this.p4=n||1,this.ts=v(),this.df=o-e}
+if(R.prototype={B2:function(e){return 3*(1-e)*(1-e)*e},B3:function(e){return 3*(1-e)*e*e},B4:function(e){return e*e*e},getPos:function(){return(v()-this.ts)/this.spd},getNow:function(){var e=(v()-this.ts)/this.spd,o=this.B2(e)+this.B3(e)+this.B4(e)
+return e>=1?this.ed:this.st+this.df*o|0},update:function(e,o){return this.st=this.getNow(),this.ed=e,this.spd=o,this.ts=v(),this.df=this.ed-this.st,this}},this.ishwscroll){this.doc.translate={x:0,y:0,tx:"0px",ty:"0px"},P.hastranslate3d&&P.isios&&this.doc.css("-webkit-backface-visibility","hidden"),this.getScrollTop=function(e){if(!e){var o=t()
+if(o)return 16==o.length?-o[13]:-o[5]
+if(T.timerscroll&&T.timerscroll.bz)return T.timerscroll.bz.getNow()}return T.doc.translate.y},this.getScrollLeft=function(e){if(!e){var o=t()
+if(o)return 16==o.length?-o[12]:-o[4]
+if(T.timerscroll&&T.timerscroll.bh)return T.timerscroll.bh.getNow()}return T.doc.translate.x},this.notifyScrollEvent=function(e){var o=c.createEvent("UIEvents")
+o.initUIEvent("scroll",!1,!1,d,1),o.niceevent=!0,e.dispatchEvent(o)}
+var _=this.isrtlmode?1:-1
+P.hastranslate3d&&M.enabletranslate3d?(this.setScrollTop=function(e,o){T.doc.translate.y=e,T.doc.translate.ty=-1*e+"px",T.doc.css(P.trstyle,"translate3d("+T.doc.translate.tx+","+T.doc.translate.ty+",0)"),o||T.notifyScrollEvent(T.win[0])},this.setScrollLeft=function(e,o){T.doc.translate.x=e,T.doc.translate.tx=e*_+"px",T.doc.css(P.trstyle,"translate3d("+T.doc.translate.tx+","+T.doc.translate.ty+",0)"),o||T.notifyScrollEvent(T.win[0])}):(this.setScrollTop=function(e,o){T.doc.translate.y=e,T.doc.translate.ty=-1*e+"px",T.doc.css(P.trstyle,"translate("+T.doc.translate.tx+","+T.doc.translate.ty+")"),o||T.notifyScrollEvent(T.win[0])},this.setScrollLeft=function(e,o){T.doc.translate.x=e,T.doc.translate.tx=e*_+"px",T.doc.css(P.trstyle,"translate("+T.doc.translate.tx+","+T.doc.translate.ty+")"),o||T.notifyScrollEvent(T.win[0])})}else this.getScrollTop=function(){return T.docscroll.scrollTop()},this.setScrollTop=function(e){T.docscroll.scrollTop(e)},this.getScrollLeft=function(){var e
+return e=T.hasreversehr?T.detected.ismozilla?T.page.maxw-Math.abs(T.docscroll.scrollLeft()):T.page.maxw-T.docscroll.scrollLeft():T.docscroll.scrollLeft()},this.setScrollLeft=function(e){return setTimeout(function(){return T?(T.hasreversehr&&(e=T.detected.ismozilla?-(T.page.maxw-e):T.page.maxw-e),T.docscroll.scrollLeft(e)):void 0},1)}
+this.getTarget=function(e){return e?e.target?e.target:e.srcElement?e.srcElement:!1:!1},this.hasParent=function(e,o){if(!e)return!1
+for(var t=e.target||e.srcElement||e||!1;t&&t.id!=o;)t=t.parentNode||!1
+return t!==!1}
+var I={thin:1,medium:3,thick:5}
+this.getDocumentScrollOffset=function(){return{top:d.pageYOffset||c.documentElement.scrollTop,left:d.pageXOffset||c.documentElement.scrollLeft}},this.getOffset=function(){if(T.isfixed){var e=T.win.offset(),o=T.getDocumentScrollOffset()
+return e.top-=o.top,e.left-=o.left,e}var t=T.win.offset()
+if(!T.viewport)return t
+var r=T.viewport.offset()
+return{top:t.top-r.top,left:t.left-r.left}},this.updateScrollBar=function(e){var o,t
+if(T.ishwscroll)T.rail.css({height:T.win.innerHeight()-(M.railpadding.top+M.railpadding.bottom)}),T.railh&&T.railh.css({width:T.win.innerWidth()-(M.railpadding.left+M.railpadding.right)})
+else{var r=T.getOffset()
+if(o={top:r.top,left:r.left-(M.railpadding.left+M.railpadding.right)},o.top+=b(T.win,"border-top-width",!0),o.left+=T.rail.align?T.win.outerWidth()-b(T.win,"border-right-width")-T.rail.width:b(T.win,"border-left-width"),t=M.railoffset,t&&(t.top&&(o.top+=t.top),t.left&&(o.left+=t.left)),T.railslocked||T.rail.css({top:o.top,left:o.left,height:(e?e.h:T.win.innerHeight())-(M.railpadding.top+M.railpadding.bottom)}),T.zoom&&T.zoom.css({top:o.top+1,left:1==T.rail.align?o.left-20:o.left+T.rail.width+4}),T.railh&&!T.railslocked){o={top:r.top,left:r.left},t=M.railhoffset,t&&(t.top&&(o.top+=t.top),t.left&&(o.left+=t.left))
+var i=T.railh.align?o.top+b(T.win,"border-top-width",!0)+T.win.innerHeight()-T.railh.height:o.top+b(T.win,"border-top-width",!0),s=o.left+b(T.win,"border-left-width")
+T.railh.css({top:i-(M.railpadding.top+M.railpadding.bottom),left:s,width:T.railh.width})}}},this.doRailClick=function(e,o,t){var r,i,s,n
+T.railslocked||(T.cancelEvent(e),"pageY"in e||(e.pageX=e.clientX+c.documentElement.scrollLeft,e.pageY=e.clientY+c.documentElement.scrollTop),o?(r=t?T.doScrollLeft:T.doScrollTop,s=t?(e.pageX-T.railh.offset().left-T.cursorwidth/2)*T.scrollratio.x:(e.pageY-T.rail.offset().top-T.cursorheight/2)*T.scrollratio.y,T.unsynched("relativexy"),r(0|s)):(r=t?T.doScrollLeftBy:T.doScrollBy,s=t?T.scroll.x:T.scroll.y,n=t?e.pageX-T.railh.offset().left:e.pageY-T.rail.offset().top,i=t?T.view.w:T.view.h,r(s>=n?i:-i)))},T.newscrolly=T.newscrollx=0,T.hasanimationframe="requestAnimationFrame"in d,T.hascancelanimationframe="cancelAnimationFrame"in d,T.hasborderbox=!1,this.init=function(){if(T.saved.css=[],P.isoperamini)return!0
+if(P.isandroid&&!("hidden"in c))return!0
+M.emulatetouch=M.emulatetouch||M.touchbehavior,T.hasborderbox=d.getComputedStyle&&"border-box"===d.getComputedStyle(c.body)["box-sizing"]
+var e={"overflow-y":"hidden"}
+if((P.isie11||P.isie10)&&(e["-ms-overflow-style"]="none"),T.ishwscroll&&(this.doc.css(P.transitionstyle,P.prefixstyle+"transform 0ms ease-out"),P.transitionend&&T.bind(T.doc,P.transitionend,T.onScrollTransitionEnd,!1)),T.zindex="auto",T.ispage||"auto"!=M.zindex?T.zindex=M.zindex:T.zindex=f()||"auto",!T.ispage&&"auto"!=T.zindex&&T.zindex>l&&(l=T.zindex),T.isie&&0===T.zindex&&"auto"==M.zindex&&(T.zindex="auto"),!T.ispage||!P.isieold){var o=T.docscroll
+T.ispage&&(o=T.haswrapper?T.win:T.doc),T.css(o,e),T.ispage&&(P.isie11||P.isie)&&T.css(a("html"),e),!P.isios||T.ispage||T.haswrapper||T.css(E,{"-webkit-overflow-scrolling":"touch"})
+var t=a(c.createElement("div"))
+t.css({position:"relative",top:0,"float":"right",width:M.cursorwidth,height:0,"background-color":M.cursorcolor,border:M.cursorborder,"background-clip":"padding-box","-webkit-border-radius":M.cursorborderradius,"-moz-border-radius":M.cursorborderradius,"border-radius":M.cursorborderradius}),t.addClass("nicescroll-cursors"),T.cursor=t
+var n=a(c.createElement("div"))
+n.attr("id",T.id),n.addClass("nicescroll-rails nicescroll-rails-vr")
+var h,p,m=["left","right","top","bottom"]
+for(var v in m)p=m[v],h=M.railpadding[p]||0,h&&n.css("padding-"+p,h+"px")
+n.append(t),n.width=Math.max(parseFloat(M.cursorwidth),t.outerWidth()),n.css({width:n.width+"px",zIndex:T.zindex,background:M.background,cursor:"default"}),n.visibility=!0,n.scrollable=!0,n.align="left"==M.railalign?0:1,T.rail=n,T.rail.drag=!1
+var w=!1
+!M.boxzoom||T.ispage||P.isieold||(w=c.createElement("div"),T.bind(w,"click",T.doZoom),T.bind(w,"mouseenter",function(){T.zoom.css("opacity",M.cursoropacitymax)}),T.bind(w,"mouseleave",function(){T.zoom.css("opacity",M.cursoropacitymin)}),T.zoom=a(w),T.zoom.css({cursor:"pointer",zIndex:T.zindex,backgroundImage:"url("+M.scriptpath+"zoomico.png)",height:18,width:18,backgroundPosition:"0 0"}),M.dblclickzoom&&T.bind(T.win,"dblclick",T.doZoom),P.cantouch&&M.gesturezoom&&(T.ongesturezoom=function(e){return e.scale>1.5&&T.doZoomIn(e),e.scale<.8&&T.doZoomOut(e),T.cancelEvent(e)},T.bind(T.win,"gestureend",T.ongesturezoom))),T.railh=!1
+var b
+if(M.horizrailenabled&&(T.css(o,{overflowX:"hidden"}),t=a(c.createElement("div")),t.css({position:"absolute",top:0,height:M.cursorwidth,width:0,backgroundColor:M.cursorcolor,border:M.cursorborder,backgroundClip:"padding-box","-webkit-border-radius":M.cursorborderradius,"-moz-border-radius":M.cursorborderradius,"border-radius":M.cursorborderradius}),P.isieold&&t.css("overflow","hidden"),t.addClass("nicescroll-cursors"),T.cursorh=t,b=a(c.createElement("div")),b.attr("id",T.id+"-hr"),b.addClass("nicescroll-rails nicescroll-rails-hr"),b.height=Math.max(parseFloat(M.cursorwidth),t.outerHeight()),b.css({height:b.height+"px",zIndex:T.zindex,background:M.background}),b.append(t),b.visibility=!0,b.scrollable=!0,b.align="top"==M.railvalign?0:1,T.railh=b,T.railh.drag=!1),T.ispage)n.css({position:"fixed",top:0,height:"100%"}),n.css(n.align?{right:0}:{left:0}),T.body.append(n),T.railh&&(b.css({position:"fixed",left:0,width:"100%"}),b.css(b.align?{bottom:0}:{top:0}),T.body.append(b))
+else{if(T.ishwscroll){"static"==T.win.css("position")&&T.css(T.win,{position:"relative"})
+var y="HTML"==T.win[0].nodeName?T.body:T.win
+a(y).scrollTop(0).scrollLeft(0),T.zoom&&(T.zoom.css({position:"absolute",top:1,right:0,"margin-right":n.width+4}),y.append(T.zoom)),n.css({position:"absolute",top:0}),n.css(n.align?{right:0}:{left:0}),y.append(n),b&&(b.css({position:"absolute",left:0,bottom:0}),b.css(b.align?{bottom:0}:{top:0}),y.append(b))}else{T.isfixed="fixed"==T.win.css("position")
+var x=T.isfixed?"fixed":"absolute"
+T.isfixed||(T.viewport=T.getViewport(T.win[0])),T.viewport&&(T.body=T.viewport,/fixed|absolute/.test(T.viewport.css("position"))||T.css(T.viewport,{position:"relative"})),n.css({position:x}),T.zoom&&T.zoom.css({position:x}),T.updateScrollBar(),T.body.append(n),T.zoom&&T.body.append(T.zoom),T.railh&&(b.css({position:x}),T.body.append(b))}P.isios&&T.css(T.win,{"-webkit-tap-highlight-color":"rgba(0,0,0,0)","-webkit-touch-callout":"none"}),M.disableoutline&&(P.isie&&T.win.attr("hideFocus","true"),P.iswebkit&&T.win.css("outline","none"))}if(M.autohidemode===!1?(T.autohidedom=!1,T.rail.css({opacity:M.cursoropacitymax}),T.railh&&T.railh.css({opacity:M.cursoropacitymax})):M.autohidemode===!0||"leave"===M.autohidemode?(T.autohidedom=a().add(T.rail),P.isie8&&(T.autohidedom=T.autohidedom.add(T.cursor)),T.railh&&(T.autohidedom=T.autohidedom.add(T.railh)),T.railh&&P.isie8&&(T.autohidedom=T.autohidedom.add(T.cursorh))):"scroll"==M.autohidemode?(T.autohidedom=a().add(T.rail),T.railh&&(T.autohidedom=T.autohidedom.add(T.railh))):"cursor"==M.autohidemode?(T.autohidedom=a().add(T.cursor),T.railh&&(T.autohidedom=T.autohidedom.add(T.cursorh))):"hidden"==M.autohidemode&&(T.autohidedom=!1,T.hide(),T.railslocked=!1),P.cantouch||T.istouchcapable||M.emulatetouch||P.hasmstouch){T.scrollmom=new S(T)
+T.ontouchstart=function(e){if(T.locked)return!1
+if(e.pointerType&&("mouse"===e.pointerType||e.pointerType===e.MSPOINTER_TYPE_MOUSE))return!1
+if(T.hasmoving=!1,T.scrollmom.timer&&(T.triggerScrollEnd(),T.scrollmom.stop()),!T.railslocked){var o=T.getTarget(e)
+if(o){var t=/INPUT/i.test(o.nodeName)&&/range/i.test(o.type)
+if(t)return T.stopPropagation(e)}var r="mousedown"===e.type
+if(!("clientX"in e)&&"changedTouches"in e&&(e.clientX=e.changedTouches[0].clientX,e.clientY=e.changedTouches[0].clientY),T.forcescreen){var i=e
+e={original:e.original?e.original:e},e.clientX=i.screenX,e.clientY=i.screenY}if(T.rail.drag={x:e.clientX,y:e.clientY,sx:T.scroll.x,sy:T.scroll.y,st:T.getScrollTop(),sl:T.getScrollLeft(),pt:2,dl:!1,tg:o},T.ispage||!M.directionlockdeadzone)T.rail.drag.dl="f"
+else{var s={w:u.width(),h:u.height()},n=T.getContentSize(),l=n.h-s.h,c=n.w-s.w
+T.rail.scrollable&&!T.railh.scrollable?T.rail.drag.ck=l>0?"v":!1:!T.rail.scrollable&&T.railh.scrollable?T.rail.drag.ck=c>0?"h":!1:T.rail.drag.ck=!1}if(M.emulatetouch&&T.isiframe&&P.isie){var d=T.win.position()
+T.rail.drag.x+=d.left,T.rail.drag.y+=d.top}if(T.hasmoving=!1,T.lastmouseup=!1,T.scrollmom.reset(e.clientX,e.clientY),o&&r){var h=/INPUT|SELECT|BUTTON|TEXTAREA/i.test(o.nodeName)
+if(!h)return P.hasmousecapture&&o.setCapture(),M.emulatetouch?(o.onclick&&!o._onclick&&(o._onclick=o.onclick,o.onclick=function(e){return T.hasmoving?!1:void o._onclick.call(this,e)}),T.cancelEvent(e)):T.stopPropagation(e);/SUBMIT|CANCEL|BUTTON/i.test(a(o).attr("type"))&&(T.preventclick={tg:o,click:!1})}}},T.ontouchend=function(e){if(!T.rail.drag)return!0
+if(2==T.rail.drag.pt){if(e.pointerType&&("mouse"===e.pointerType||e.pointerType===e.MSPOINTER_TYPE_MOUSE))return!1
+T.rail.drag=!1
+var o="mouseup"===e.type
+if(T.hasmoving&&(T.scrollmom.doMomentum(),T.lastmouseup=!0,T.hideCursor(),P.hasmousecapture&&c.releaseCapture(),o))return T.cancelEvent(e)}else if(1==T.rail.drag.pt)return T.onmouseup(e)}
+var z=M.emulatetouch&&T.isiframe&&!P.hasmousecapture,k=.3*M.directionlockdeadzone|0
+T.ontouchmove=function(e,o){if(!T.rail.drag)return!0
+if(e.targetTouches&&M.preventmultitouchscrolling&&e.targetTouches.length>1)return!0
+if(e.pointerType&&("mouse"===e.pointerType||e.pointerType===e.MSPOINTER_TYPE_MOUSE))return!0
+if(2==T.rail.drag.pt){"changedTouches"in e&&(e.clientX=e.changedTouches[0].clientX,e.clientY=e.changedTouches[0].clientY)
+var t,r
+if(r=t=0,z&&!o){var i=T.win.position()
+r=-i.left,t=-i.top}var s=e.clientY+t,n=s-T.rail.drag.y,l=e.clientX+r,a=l-T.rail.drag.x,d=T.rail.drag.st-n
+if(T.ishwscroll&&M.bouncescroll)0>d?d=Math.round(d/2):d>T.page.maxh&&(d=T.page.maxh+Math.round((d-T.page.maxh)/2))
+else if(0>d?(d=0,s=0):d>T.page.maxh&&(d=T.page.maxh,s=0),0===s&&!T.hasmoving)return T.ispage||(T.rail.drag=!1),!0
+var u=T.getScrollLeft()
+if(T.railh&&T.railh.scrollable&&(u=T.isrtlmode?a-T.rail.drag.sl:T.rail.drag.sl-a,T.ishwscroll&&M.bouncescroll?0>u?u=Math.round(u/2):u>T.page.maxw&&(u=T.page.maxw+Math.round((u-T.page.maxw)/2)):(0>u&&(u=0,l=0),u>T.page.maxw&&(u=T.page.maxw,l=0))),!T.hasmoving){if(T.rail.drag.y===e.clientY&&T.rail.drag.x===e.clientX)return T.cancelEvent(e)
+var h=Math.abs(n),p=Math.abs(a),m=M.directionlockdeadzone
+if(T.rail.drag.ck?"v"==T.rail.drag.ck?p>m&&k>=h?T.rail.drag=!1:h>m&&(T.rail.drag.dl="v"):"h"==T.rail.drag.ck&&(h>m&&k>=p?T.rail.drag=!1:p>m&&(T.rail.drag.dl="h")):h>m&&p>m?T.rail.drag.dl="f":h>m?T.rail.drag.dl=p>k?"f":"v":p>m&&(T.rail.drag.dl=h>k?"f":"h"),!T.rail.drag.dl)return T.cancelEvent(e)
+T.triggerScrollStart(e.clientX,e.clientY,0,0,0),T.hasmoving=!0}return T.preventclick&&!T.preventclick.click&&(T.preventclick.click=T.preventclick.tg.onclick||!1,T.preventclick.tg.onclick=T.onpreventclick),T.rail.drag.dl&&("v"==T.rail.drag.dl?u=T.rail.drag.sl:"h"==T.rail.drag.dl&&(d=T.rail.drag.st)),T.synched("touchmove",function(){T.rail.drag&&2==T.rail.drag.pt&&(T.prepareTransition&&T.resetTransition(),T.rail.scrollable&&T.setScrollTop(d),T.scrollmom.update(l,s),T.railh&&T.railh.scrollable?(T.setScrollLeft(u),T.showCursor(d,u)):T.showCursor(d),P.isie10&&c.selection.clear())}),T.cancelEvent(e)}return 1==T.rail.drag.pt?T.onmousemove(e):void 0},T.ontouchstartCursor=function(e,o){if(!T.rail.drag||3==T.rail.drag.pt){if(T.locked)return T.cancelEvent(e)
+T.cancelScroll(),T.rail.drag={x:e.touches[0].clientX,y:e.touches[0].clientY,sx:T.scroll.x,sy:T.scroll.y,pt:3,hr:!!o}
+var t=T.getTarget(e)
+return!T.ispage&&P.hasmousecapture&&t.setCapture(),T.isiframe&&!P.hasmousecapture&&(T.saved.csspointerevents=T.doc.css("pointer-events"),T.css(T.doc,{"pointer-events":"none"})),T.cancelEvent(e)}},T.ontouchendCursor=function(e){if(T.rail.drag){if(P.hasmousecapture&&c.releaseCapture(),T.isiframe&&!P.hasmousecapture&&T.doc.css("pointer-events",T.saved.csspointerevents),3!=T.rail.drag.pt)return
+return T.rail.drag=!1,T.cancelEvent(e)}},T.ontouchmoveCursor=function(e){if(T.rail.drag){if(3!=T.rail.drag.pt)return
+if(T.cursorfreezed=!0,T.rail.drag.hr){T.scroll.x=T.rail.drag.sx+(e.touches[0].clientX-T.rail.drag.x),T.scroll.x<0&&(T.scroll.x=0)
+var o=T.scrollvaluemaxw
+T.scroll.x>o&&(T.scroll.x=o)}else{T.scroll.y=T.rail.drag.sy+(e.touches[0].clientY-T.rail.drag.y),T.scroll.y<0&&(T.scroll.y=0)
+var t=T.scrollvaluemax
+T.scroll.y>t&&(T.scroll.y=t)}return T.synched("touchmove",function(){T.rail.drag&&3==T.rail.drag.pt&&(T.showCursor(),T.rail.drag.hr?T.doScrollLeft(Math.round(T.scroll.x*T.scrollratio.x),M.cursordragspeed):T.doScrollTop(Math.round(T.scroll.y*T.scrollratio.y),M.cursordragspeed))}),T.cancelEvent(e)}}}if(T.onmousedown=function(e,o){if(!T.rail.drag||1==T.rail.drag.pt){if(T.railslocked)return T.cancelEvent(e)
+T.cancelScroll(),T.rail.drag={x:e.clientX,y:e.clientY,sx:T.scroll.x,sy:T.scroll.y,pt:1,hr:o||!1}
+var t=T.getTarget(e)
+return P.hasmousecapture&&t.setCapture(),T.isiframe&&!P.hasmousecapture&&(T.saved.csspointerevents=T.doc.css("pointer-events"),T.css(T.doc,{"pointer-events":"none"})),T.hasmoving=!1,T.cancelEvent(e)}},T.onmouseup=function(e){return T.rail.drag?1!=T.rail.drag.pt?!0:(P.hasmousecapture&&c.releaseCapture(),T.isiframe&&!P.hasmousecapture&&T.doc.css("pointer-events",T.saved.csspointerevents),T.rail.drag=!1,T.cursorfreezed=!1,T.hasmoving&&T.triggerScrollEnd(),T.cancelEvent(e)):void 0},T.onmousemove=function(e){if(T.rail.drag){if(1!==T.rail.drag.pt)return
+if(P.ischrome&&0===e.which)return T.onmouseup(e)
+if(T.cursorfreezed=!0,T.hasmoving||T.triggerScrollStart(e.clientX,e.clientY,0,0,0),T.hasmoving=!0,T.rail.drag.hr){T.scroll.x=T.rail.drag.sx+(e.clientX-T.rail.drag.x),T.scroll.x<0&&(T.scroll.x=0)
+var o=T.scrollvaluemaxw
+T.scroll.x>o&&(T.scroll.x=o)}else{T.scroll.y=T.rail.drag.sy+(e.clientY-T.rail.drag.y),T.scroll.y<0&&(T.scroll.y=0)
+var t=T.scrollvaluemax
+T.scroll.y>t&&(T.scroll.y=t)}return T.synched("mousemove",function(){T.cursorfreezed&&(T.showCursor(),T.rail.drag.hr?T.scrollLeft(Math.round(T.scroll.x*T.scrollratio.x)):T.scrollTop(Math.round(T.scroll.y*T.scrollratio.y)))}),T.cancelEvent(e)}T.checkarea=0},P.cantouch||M.emulatetouch)T.onpreventclick=function(e){return T.preventclick?(T.preventclick.tg.onclick=T.preventclick.click,T.preventclick=!1,T.cancelEvent(e)):void 0},T.onclick=P.isios?!1:function(e){return T.lastmouseup?(T.lastmouseup=!1,T.cancelEvent(e)):!0},M.grabcursorenabled&&P.cursorgrabvalue&&(T.css(T.ispage?T.doc:T.win,{cursor:P.cursorgrabvalue}),T.css(T.rail,{cursor:P.cursorgrabvalue}))
+else{var L=function(e){if(T.selectiondrag){if(e){var o=T.win.outerHeight(),t=e.pageY-T.selectiondrag.top
+t>0&&o>t&&(t=0),t>=o&&(t-=o),T.selectiondrag.df=t}if(0!==T.selectiondrag.df){var r=0|-(2*T.selectiondrag.df/6)
+T.doScrollBy(r),T.debounced("doselectionscroll",function(){L()},50)}}}
+"getSelection"in c?T.hasTextSelected=function(){return c.getSelection().rangeCount>0}:"selection"in c?T.hasTextSelected=function(){return"None"!=c.selection.type}:T.hasTextSelected=function(){return!1},T.onselectionstart=function(e){T.ispage||(T.selectiondrag=T.win.offset())},T.onselectionend=function(e){T.selectiondrag=!1},T.onselectiondrag=function(e){T.selectiondrag&&T.hasTextSelected()&&T.debounced("selectionscroll",function(){L(e)},250)}}if(P.hasw3ctouch?(T.css(T.ispage?a("html"):T.win,{"touch-action":"none"}),T.css(T.rail,{"touch-action":"none"}),T.css(T.cursor,{"touch-action":"none"}),T.bind(T.win,"pointerdown",T.ontouchstart),T.bind(c,"pointerup",T.ontouchend),T.delegate(c,"pointermove",T.ontouchmove)):P.hasmstouch?(T.css(T.ispage?a("html"):T.win,{"-ms-touch-action":"none"}),T.css(T.rail,{"-ms-touch-action":"none"}),T.css(T.cursor,{"-ms-touch-action":"none"}),T.bind(T.win,"MSPointerDown",T.ontouchstart),T.bind(c,"MSPointerUp",T.ontouchend),T.delegate(c,"MSPointerMove",T.ontouchmove),T.bind(T.cursor,"MSGestureHold",function(e){e.preventDefault()}),T.bind(T.cursor,"contextmenu",function(e){e.preventDefault()})):P.cantouch&&(T.bind(T.win,"touchstart",T.ontouchstart,!1,!0),T.bind(c,"touchend",T.ontouchend,!1,!0),T.bind(c,"touchcancel",T.ontouchend,!1,!0),T.delegate(c,"touchmove",T.ontouchmove,!1,!0)),M.emulatetouch&&(T.bind(T.win,"mousedown",T.ontouchstart,!1,!0),T.bind(c,"mouseup",T.ontouchend,!1,!0),T.bind(c,"mousemove",T.ontouchmove,!1,!0)),(M.cursordragontouch||!P.cantouch&&!M.emulatetouch)&&(T.rail.css({cursor:"default"}),T.railh&&T.railh.css({cursor:"default"}),T.jqbind(T.rail,"mouseenter",function(){return T.ispage||T.win.is(":visible")?(T.canshowonmouseevent&&T.showCursor(),void(T.rail.active=!0)):!1}),T.jqbind(T.rail,"mouseleave",function(){T.rail.active=!1,T.rail.drag||T.hideCursor()}),M.sensitiverail&&(T.bind(T.rail,"click",function(e){T.doRailClick(e,!1,!1)}),T.bind(T.rail,"dblclick",function(e){T.doRailClick(e,!0,!1)}),T.bind(T.cursor,"click",function(e){T.cancelEvent(e)}),T.bind(T.cursor,"dblclick",function(e){T.cancelEvent(e)})),T.railh&&(T.jqbind(T.railh,"mouseenter",function(){return T.ispage||T.win.is(":visible")?(T.canshowonmouseevent&&T.showCursor(),void(T.rail.active=!0)):!1}),T.jqbind(T.railh,"mouseleave",function(){T.rail.active=!1,T.rail.drag||T.hideCursor()}),M.sensitiverail&&(T.bind(T.railh,"click",function(e){T.doRailClick(e,!1,!0)}),T.bind(T.railh,"dblclick",function(e){T.doRailClick(e,!0,!0)}),T.bind(T.cursorh,"click",function(e){T.cancelEvent(e)}),T.bind(T.cursorh,"dblclick",function(e){T.cancelEvent(e)})))),M.cursordragontouch&&(this.istouchcapable||P.cantouch)&&(T.bind(T.cursor,"touchstart",T.ontouchstartCursor),T.bind(T.cursor,"touchmove",T.ontouchmoveCursor),T.bind(T.cursor,"touchend",T.ontouchendCursor),T.cursorh&&T.bind(T.cursorh,"touchstart",function(e){T.ontouchstartCursor(e,!0)}),T.cursorh&&T.bind(T.cursorh,"touchmove",T.ontouchmoveCursor),T.cursorh&&T.bind(T.cursorh,"touchend",T.ontouchendCursor)),M.emulatetouch||P.isandroid||P.isios?(T.bind(P.hasmousecapture?T.win:c,"mouseup",T.ontouchend),T.onclick&&T.bind(c,"click",T.onclick),M.cursordragontouch?(T.bind(T.cursor,"mousedown",T.onmousedown),T.bind(T.cursor,"mouseup",T.onmouseup),T.cursorh&&T.bind(T.cursorh,"mousedown",function(e){T.onmousedown(e,!0)}),T.cursorh&&T.bind(T.cursorh,"mouseup",T.onmouseup)):(T.bind(T.rail,"mousedown",function(e){e.preventDefault()}),T.railh&&T.bind(T.railh,"mousedown",function(e){e.preventDefault()}))):(T.bind(P.hasmousecapture?T.win:c,"mouseup",T.onmouseup),T.bind(c,"mousemove",T.onmousemove),T.onclick&&T.bind(c,"click",T.onclick),T.bind(T.cursor,"mousedown",T.onmousedown),T.bind(T.cursor,"mouseup",T.onmouseup),T.railh&&(T.bind(T.cursorh,"mousedown",function(e){T.onmousedown(e,!0)}),T.bind(T.cursorh,"mouseup",T.onmouseup)),!T.ispage&&M.enablescrollonselection&&(T.bind(T.win[0],"mousedown",T.onselectionstart),T.bind(c,"mouseup",T.onselectionend),T.bind(T.cursor,"mouseup",T.onselectionend),T.cursorh&&T.bind(T.cursorh,"mouseup",T.onselectionend),T.bind(c,"mousemove",T.onselectiondrag)),T.zoom&&(T.jqbind(T.zoom,"mouseenter",function(){T.canshowonmouseevent&&T.showCursor(),T.rail.active=!0}),T.jqbind(T.zoom,"mouseleave",function(){T.rail.active=!1,T.rail.drag||T.hideCursor()}))),M.enablemousewheel&&(T.isiframe||T.mousewheel(P.isie&&T.ispage?c:T.win,T.onmousewheel),T.mousewheel(T.rail,T.onmousewheel),T.railh&&T.mousewheel(T.railh,T.onmousewheelhr)),T.ispage||P.cantouch||/HTML|^BODY/.test(T.win[0].nodeName)||(T.win.attr("tabindex")||T.win.attr({tabindex:++s}),T.bind(T.win,"focus",function(e){r=T.getTarget(e).id||T.getTarget(e)||!1,T.hasfocus=!0,T.canshowonmouseevent&&T.noticeCursor()}),T.bind(T.win,"blur",function(e){r=!1,T.hasfocus=!1}),T.bind(T.win,"mouseenter",function(e){i=T.getTarget(e).id||T.getTarget(e)||!1,T.hasmousefocus=!0,T.canshowonmouseevent&&T.noticeCursor()}),T.bind(T.win,"mouseleave",function(e){i=!1,T.hasmousefocus=!1,T.rail.drag||T.hideCursor()})),T.onkeypress=function(e){if(T.railslocked&&0===T.page.maxh)return!0
+e=e||d.event
+var o=T.getTarget(e)
+if(o&&/INPUT|TEXTAREA|SELECT|OPTION/.test(o.nodeName)){var t=o.getAttribute("type")||o.type||!1
+if(!t||!/submit|button|cancel/i.tp)return!0}if(a(o).attr("contenteditable"))return!0
+if(T.hasfocus||T.hasmousefocus&&!r||T.ispage&&!r&&!i){var s=e.keyCode
+if(T.railslocked&&27!=s)return T.cancelEvent(e)
+var n=e.ctrlKey||!1,l=e.shiftKey||!1,c=!1
+switch(s){case 38:case 63233:T.doScrollBy(72),c=!0
+break
+case 40:case 63235:T.doScrollBy(-72),c=!0
+break
+case 37:case 63232:T.railh&&(n?T.doScrollLeft(0):T.doScrollLeftBy(72),c=!0)
+break
+case 39:case 63234:T.railh&&(n?T.doScrollLeft(T.page.maxw):T.doScrollLeftBy(-72),c=!0)
+break
+case 33:case 63276:T.doScrollBy(T.view.h),c=!0
+break
+case 34:case 63277:T.doScrollBy(-T.view.h),c=!0
+break
+case 36:case 63273:T.railh&&n?T.doScrollPos(0,0):T.doScrollTo(0),c=!0
+break
+case 35:case 63275:T.railh&&n?T.doScrollPos(T.page.maxw,T.page.maxh):T.doScrollTo(T.page.maxh),c=!0
+break
+case 32:M.spacebarenabled&&(l?T.doScrollBy(T.view.h):T.doScrollBy(-T.view.h),c=!0)
+break
+case 27:T.zoomactive&&(T.doZoom(),c=!0)}if(c)return T.cancelEvent(e)}},M.enablekeyboard&&T.bind(c,P.isopera&&!P.isopera12?"keypress":"keydown",T.onkeypress),T.bind(c,"keydown",function(e){var o=e.ctrlKey||!1
+o&&(T.wheelprevented=!0)}),T.bind(c,"keyup",function(e){var o=e.ctrlKey||!1
+o||(T.wheelprevented=!1)}),T.bind(d,"blur",function(e){T.wheelprevented=!1}),T.bind(d,"resize",T.onscreenresize),T.bind(d,"orientationchange",T.onscreenresize),T.bind(d,"load",T.lazyResize),P.ischrome&&!T.ispage&&!T.haswrapper){var C=T.win.attr("style"),N=parseFloat(T.win.css("width"))+1
+T.win.css("width",N),T.synched("chromefix",function(){T.win.attr("style",C)})}if(T.onAttributeChange=function(e){T.lazyResize(T.isieold?250:30)},M.enableobserver&&(T.isie11||g===!1||(T.observerbody=new g(function(e){return e.forEach(function(e){return"attributes"==e.type?E.hasClass("modal-open")&&E.hasClass("modal-dialog")&&!a.contains(a(".modal-dialog")[0],T.doc[0])?T.hide():T.show():void 0}),T.me.clientWidth!=T.page.width||T.me.clientHeight!=T.page.height||document.body.scrollHeight!=T.page.maxh?T.lazyResize(30):void 0}),T.observerbody.observe(c.body,{childList:!0,subtree:!0,characterData:!1,attributes:!0,attributeFilter:["class"]})),!T.ispage&&!T.haswrapper)){var R=T.win[0]
+g!==!1?(T.observer=new g(function(e){e.forEach(T.onAttributeChange)}),T.observer.observe(R,{childList:!0,characterData:!1,attributes:!0,subtree:!1}),T.observerremover=new g(function(e){e.forEach(function(e){if(e.removedNodes.length>0)for(var o in e.removedNodes)if(T&&e.removedNodes[o]===R)return T.remove()})}),T.observerremover.observe(R.parentNode,{childList:!0,characterData:!1,attributes:!1,subtree:!1})):(T.bind(R,P.isie&&!P.isie9?"propertychange":"DOMAttrModified",T.onAttributeChange),P.isie9&&R.attachEvent("onpropertychange",T.onAttributeChange),T.bind(R,"DOMNodeRemoved",function(e){e.target===R&&T.remove()}))}!T.ispage&&M.boxzoom&&T.bind(d,"resize",T.resizeZoom),T.istextarea&&(T.bind(T.win,"keydown",T.lazyResize),T.bind(T.win,"mouseup",T.lazyResize)),T.lazyResize(30)}if("IFRAME"==this.doc[0].nodeName){var _=function(){T.iframexd=!1
+var o
+try{o="contentDocument"in this?this.contentDocument:this.contentWindow._doc
+o.domain}catch(t){T.iframexd=!0,o=!1}if(T.iframexd)return"console"in d&&console.log("NiceScroll error: policy restriced iframe"),!0
+if(T.forcescreen=!0,T.isiframe&&(T.iframe={doc:a(o),html:T.doc.contents().find("html")[0],body:T.doc.contents().find("body")[0]},T.getContentSize=function(){return{w:Math.max(T.iframe.html.scrollWidth,T.iframe.body.scrollWidth),h:Math.max(T.iframe.html.scrollHeight,T.iframe.body.scrollHeight)}},T.docscroll=a(T.iframe.body)),!P.isios&&M.iframeautoresize&&!T.isiframe){T.win.scrollTop(0),T.doc.height("")
+var r=Math.max(o.getElementsByTagName("html")[0].scrollHeight,o.body.scrollHeight)
+T.doc.height(r)}T.lazyResize(30),T.css(a(T.iframe.body),e),P.isios&&T.haswrapper&&T.css(a(o.body),{"-webkit-transform":"translate3d(0,0,0)"}),"contentWindow"in this?T.bind(this.contentWindow,"scroll",T.onscroll):T.bind(o,"scroll",T.onscroll),M.enablemousewheel&&T.mousewheel(o,T.onmousewheel),M.enablekeyboard&&T.bind(o,P.isopera?"keypress":"keydown",T.onkeypress),P.cantouch?(T.bind(o,"touchstart",T.ontouchstart),T.bind(o,"touchmove",T.ontouchmove)):M.emulatetouch&&(T.bind(o,"mousedown",T.ontouchstart),T.bind(o,"mousemove",function(e){return T.ontouchmove(e,!0)}),M.grabcursorenabled&&P.cursorgrabvalue&&T.css(a(o.body),{cursor:P.cursorgrabvalue})),T.bind(o,"mouseup",T.ontouchend),T.zoom&&(M.dblclickzoom&&T.bind(o,"dblclick",T.doZoom),T.ongesturezoom&&T.bind(o,"gestureend",T.ongesturezoom))}
+this.doc[0].readyState&&"complete"===this.doc[0].readyState&&setTimeout(function(){_.call(T.doc[0],!1)},500),T.bind(this.doc,"load",_)}},this.showCursor=function(e,o){if(T.cursortimeout&&(clearTimeout(T.cursortimeout),T.cursortimeout=0),T.rail){if(T.autohidedom&&(T.autohidedom.stop().css({opacity:M.cursoropacitymax}),T.cursoractive=!0),T.rail.drag&&1==T.rail.drag.pt||(void 0!==e&&e!==!1&&(T.scroll.y=e/T.scrollratio.y|0),void 0!==o&&(T.scroll.x=o/T.scrollratio.x|0)),T.cursor.css({height:T.cursorheight,top:T.scroll.y}),T.cursorh){var t=T.hasreversehr?T.scrollvaluemaxw-T.scroll.x:T.scroll.x
+T.cursorh.css({width:T.cursorwidth,left:!T.rail.align&&T.rail.visibility?t+T.rail.width:t}),T.cursoractive=!0}T.zoom&&T.zoom.stop().css({opacity:M.cursoropacitymax})}},this.hideCursor=function(e){T.cursortimeout||T.rail&&T.autohidedom&&(T.hasmousefocus&&"leave"===M.autohidemode||(T.cursortimeout=setTimeout(function(){T.rail.active&&T.showonmouseevent||(T.autohidedom.stop().animate({opacity:M.cursoropacitymin}),T.zoom&&T.zoom.stop().animate({opacity:M.cursoropacitymin}),T.cursoractive=!1),T.cursortimeout=0},e||M.hidecursordelay)))},this.noticeCursor=function(e,o,t){T.showCursor(o,t),T.rail.active||T.hideCursor(e)},this.getContentSize=T.ispage?function(){return{w:Math.max(c.body.scrollWidth,c.documentElement.scrollWidth),h:Math.max(c.body.scrollHeight,c.documentElement.scrollHeight)}}:T.haswrapper?function(){return{w:T.doc[0].offsetWidth,h:T.doc[0].offsetHeight}}:function(){return{w:T.docscroll[0].scrollWidth,h:T.docscroll[0].scrollHeight}},this.onResize=function(e,o){if(!T||!T.win)return!1
+var t=T.page.maxh,r=T.page.maxw,i=T.view.h,s=T.view.w
+if(T.view={w:T.ispage?T.win.width():T.win[0].clientWidth,h:T.ispage?T.win.height():T.win[0].clientHeight},T.page=o?o:T.getContentSize(),T.page.maxh=Math.max(0,T.page.h-T.view.h),T.page.maxw=Math.max(0,T.page.w-T.view.w),T.page.maxh==t&&T.page.maxw==r&&T.view.w==s&&T.view.h==i){if(T.ispage)return T
+var n=T.win.offset()
+if(T.lastposition){var l=T.lastposition
+if(l.top==n.top&&l.left==n.left)return T}T.lastposition=n}if(0===T.page.maxh?(T.hideRail(),T.scrollvaluemax=0,T.scroll.y=0,T.scrollratio.y=0,T.cursorheight=0,T.setScrollTop(0),T.rail&&(T.rail.scrollable=!1)):(T.page.maxh-=M.railpadding.top+M.railpadding.bottom,T.rail.scrollable=!0),0===T.page.maxw?(T.hideRailHr(),T.scrollvaluemaxw=0,T.scroll.x=0,T.scrollratio.x=0,T.cursorwidth=0,T.setScrollLeft(0),T.railh&&(T.railh.scrollable=!1)):(T.page.maxw-=M.railpadding.left+M.railpadding.right,T.railh&&(T.railh.scrollable=M.horizrailenabled)),T.railslocked=T.locked||0===T.page.maxh&&0===T.page.maxw,T.railslocked)return T.ispage||T.updateScrollBar(T.view),!1
+T.hidden||(T.rail.visibility||T.showRail(),T.railh&&!T.railh.visibility&&T.showRailHr()),T.istextarea&&T.win.css("resize")&&"none"!=T.win.css("resize")&&(T.view.h-=20),T.cursorheight=Math.min(T.view.h,Math.round(T.view.h*(T.view.h/T.page.h))),T.cursorheight=M.cursorfixedheight?M.cursorfixedheight:Math.max(M.cursorminheight,T.cursorheight),T.cursorwidth=Math.min(T.view.w,Math.round(T.view.w*(T.view.w/T.page.w))),T.cursorwidth=M.cursorfixedheight?M.cursorfixedheight:Math.max(M.cursorminheight,T.cursorwidth),T.scrollvaluemax=T.view.h-T.cursorheight-(M.railpadding.top+M.railpadding.bottom),T.hasborderbox||(T.scrollvaluemax-=T.cursor[0].offsetHeight-T.cursor[0].clientHeight),T.railh&&(T.railh.width=T.page.maxh>0?T.view.w-T.rail.width:T.view.w,T.scrollvaluemaxw=T.railh.width-T.cursorwidth-(M.railpadding.left+M.railpadding.right)),T.ispage||T.updateScrollBar(T.view),T.scrollratio={x:T.page.maxw/T.scrollvaluemaxw,y:T.page.maxh/T.scrollvaluemax}
+var a=T.getScrollTop()
+return a>T.page.maxh?T.doScrollTop(T.page.maxh):(T.scroll.y=T.getScrollTop()/T.scrollratio.y|0,T.scroll.x=T.getScrollLeft()/T.scrollratio.x|0,T.cursoractive&&T.noticeCursor()),T.scroll.y&&0===T.getScrollTop()&&T.doScrollTo(T.scroll.y*T.scrollratio.y|0),T},this.resize=T.onResize
+var O=0
+this.onscreenresize=function(e){clearTimeout(O)
+var o=!T.ispage&&!T.haswrapper
+o&&T.hideRails(),O=setTimeout(function(){T&&(o&&T.showRails(),T.resize()),O=0},120)},this.lazyResize=function(e){return clearTimeout(O),e=isNaN(e)?240:e,O=setTimeout(function(){T&&T.resize(),O=0},e),T},this.jqbind=function(e,o,t){T.events.push({e:e,n:o,f:t,q:!0}),a(e).on(o,t)},this.mousewheel=function(e,o,t){var r="jquery"in e?e[0]:e
+if("onwheel"in c.createElement("div"))T._bind(r,"wheel",o,t||!1)
+else{var i=void 0!==c.onmousewheel?"mousewheel":"DOMMouseScroll"
+x(r,i,o,t||!1),"DOMMouseScroll"==i&&x(r,"MozMousePixelScroll",o,t||!1)}}
+var Y=!1
+if(P.haseventlistener){try{var H=Object.defineProperty({},"passive",{get:function(){Y=!0}})
+d.addEventListener("test",null,H)}catch(B){}this.stopPropagation=function(e){return e?(e=e.original?e.original:e,e.stopPropagation(),!1):!1},this.cancelEvent=function(e){return e.cancelable&&e.preventDefault(),e.stopImmediatePropagation(),e.preventManipulation&&e.preventManipulation(),!1}}else Event.prototype.preventDefault=function(){this.returnValue=!1},Event.prototype.stopPropagation=function(){this.cancelBubble=!0},d.constructor.prototype.addEventListener=c.constructor.prototype.addEventListener=Element.prototype.addEventListener=function(e,o,t){this.attachEvent("on"+e,o)},d.constructor.prototype.removeEventListener=c.constructor.prototype.removeEventListener=Element.prototype.removeEventListener=function(e,o,t){this.detachEvent("on"+e,o)},this.cancelEvent=function(e){return e=e||d.event,e&&(e.cancelBubble=!0,e.cancel=!0,e.returnValue=!1),!1},this.stopPropagation=function(e){return e=e||d.event,e&&(e.cancelBubble=!0),!1}
+this.delegate=function(e,o,t,r,i){var s=h[o]||!1
+s||(s={a:[],l:[],f:function(e){for(var o=s.l,t=o.length-1,r=!1,i=t;i>=0;i--)if(r=o[i].call(e.target,e),r===!1)return!1
+return r}},T.bind(e,o,s.f,r,i),h[o]=s),T.ispage?(s.a=[T.id].concat(s.a),s.l=[t].concat(s.l)):(s.a.push(T.id),s.l.push(t))},this.undelegate=function(e,o,t,r,i){var s=h[o]||!1
+if(s&&s.l)for(var n=0,l=s.l.length;l>n;n++)s.a[n]===T.id&&(s.a.splice(n),s.l.splice(n),0===s.a.length&&(T._unbind(e,o,s.l.f),h[o]=null))},this.bind=function(e,o,t,r,i){var s="jquery"in e?e[0]:e
+T._bind(s,o,t,r||!1,i||!1)},this._bind=function(e,o,t,r,i){T.events.push({e:e,n:o,f:t,b:r,q:!1}),Y&&i?e.addEventListener(o,t,{passive:!1,capture:r}):e.addEventListener(o,t,r||!1)},this._unbind=function(e,o,t,r){h[o]?T.undelegate(e,o,t,r):e.removeEventListener(o,t,r)},this.unbindAll=function(){for(var e=0;e<T.events.length;e++){var o=T.events[e]
+o.q?o.e.unbind(o.n,o.f):T._unbind(o.e,o.n,o.f,o.b)}},this.showRails=function(){return T.showRail().showRailHr()},this.showRail=function(){return 0===T.page.maxh||!T.ispage&&"none"==T.win.css("display")||(T.rail.visibility=!0,T.rail.css("display","block")),T},this.showRailHr=function(){return T.railh&&(0===T.page.maxw||!T.ispage&&"none"==T.win.css("display")||(T.railh.visibility=!0,T.railh.css("display","block"))),T},this.hideRails=function(){return T.hideRail().hideRailHr()},this.hideRail=function(){return T.rail.visibility=!1,T.rail.css("display","none"),T},this.hideRailHr=function(){return T.railh&&(T.railh.visibility=!1,T.railh.css("display","none")),T},this.show=function(){return T.hidden=!1,T.railslocked=!1,T.showRails()},this.hide=function(){return T.hidden=!0,T.railslocked=!0,T.hideRails()},this.toggle=function(){return T.hidden?T.show():T.hide()},this.remove=function(){T.stop(),T.cursortimeout&&clearTimeout(T.cursortimeout)
+for(var e in T.delaylist)T.delaylist[e]&&m(T.delaylist[e].h)
+T.doZoomOut(),T.unbindAll(),P.isie9&&T.win[0].detachEvent("onpropertychange",T.onAttributeChange),T.observer!==!1&&T.observer.disconnect(),T.observerremover!==!1&&T.observerremover.disconnect(),T.observerbody!==!1&&T.observerbody.disconnect(),T.events=null,T.cursor&&T.cursor.remove(),T.cursorh&&T.cursorh.remove(),T.rail&&T.rail.remove(),T.railh&&T.railh.remove(),T.zoom&&T.zoom.remove()
+for(var o=0;o<T.saved.css.length;o++){var t=T.saved.css[o]
+t[0].css(t[1],void 0===t[2]?"":t[2])}T.saved=!1,T.me.data("__nicescroll","")
+var r=a.nicescroll
+r.each(function(e){if(this&&this.id===T.id){delete r[e]
+for(var o=++e;o<r.length;o++,e++)r[e]=r[o]
+r.length--,r.length&&delete r[r.length]}})
+for(var i in T)T[i]=null,delete T[i]
+T=null},this.scrollstart=function(e){return this.onscrollstart=e,T},this.scrollend=function(e){return this.onscrollend=e,T},this.scrollcancel=function(e){return this.onscrollcancel=e,T},this.zoomin=function(e){return this.onzoomin=e,T},this.zoomout=function(e){return this.onzoomout=e,T},this.isScrollable=function(e){var o=e.target?e.target:e
+if("OPTION"==o.nodeName)return!0
+for(;o&&1==o.nodeType&&o!==this.me[0]&&!/^BODY|HTML/.test(o.nodeName);){var t=a(o),r=t.css("overflowY")||t.css("overflowX")||t.css("overflow")||""
+if(/scroll|auto/.test(r))return o.clientHeight!=o.scrollHeight
+o=o.parentNode?o.parentNode:!1}return!1},this.getViewport=function(e){for(var o=e&&e.parentNode?e.parentNode:!1;o&&1==o.nodeType&&!/^BODY|HTML/.test(o.nodeName);){var t=a(o)
+if(/fixed|absolute/.test(t.css("position")))return t
+var r=t.css("overflowY")||t.css("overflowX")||t.css("overflow")||""
+if(/scroll|auto/.test(r)&&o.clientHeight!=o.scrollHeight)return t
+if(t.getNiceScroll().length>0)return t
+o=o.parentNode?o.parentNode:!1}return!1},this.triggerScrollStart=function(e,o,t,r,i){if(T.onscrollstart){var s={type:"scrollstart",current:{x:e,y:o},request:{x:t,y:r},end:{x:T.newscrollx,y:T.newscrolly},speed:i}
+T.onscrollstart.call(T,s)}},this.triggerScrollEnd=function(){if(T.onscrollend){var e=T.getScrollLeft(),o=T.getScrollTop(),t={type:"scrollend",current:{x:e,y:o},end:{x:e,y:o}}
+T.onscrollend.call(T,t)}}
+var X=0,D=0,A=0,q=1,j=!1
+if(this.onmousewheel=function(e){if(T.wheelprevented||T.locked)return!1
+if(T.railslocked)return T.debounced("checkunlock",T.resize,250),!1
+if(T.rail.drag)return T.cancelEvent(e)
+if("auto"===M.oneaxismousemode&&0!==e.deltaX&&(M.oneaxismousemode=!1),M.oneaxismousemode&&0===e.deltaX&&!T.rail.scrollable)return T.railh&&T.railh.scrollable?T.onmousewheelhr(e):!0
+var o=v(),t=!1
+if(M.preservenativescrolling&&T.checkarea+600<o&&(T.nativescrollingarea=T.isScrollable(e),t=!0),T.checkarea=o,T.nativescrollingarea)return!0
+var r=k(e,!1,t)
+return r&&(T.checkarea=0),r},this.onmousewheelhr=function(e){if(!T.wheelprevented){if(T.railslocked||!T.railh.scrollable)return!0
+if(T.rail.drag)return T.cancelEvent(e)
+var o=v(),t=!1
+return M.preservenativescrolling&&T.checkarea+600<o&&(T.nativescrollingarea=T.isScrollable(e),t=!0),T.checkarea=o,T.nativescrollingarea?!0:T.railslocked?T.cancelEvent(e):k(e,!0,t)}},this.stop=function(){return T.cancelScroll(),T.scrollmon&&T.scrollmon.stop(),T.cursorfreezed=!1,T.scroll.y=Math.round(T.getScrollTop()*(1/T.scrollratio.y)),T.noticeCursor(),T},this.getTransitionSpeed=function(e){return 80+e/72*M.scrollspeed|0},M.smoothscroll)if(T.ishwscroll&&P.hastransition&&M.usetransition&&M.smoothscroll){var F=""
+this.resetTransition=function(){F="",T.doc.css(P.prefixstyle+"transition-duration","0ms")},this.prepareTransition=function(e,o){var t=o?e:T.getTransitionSpeed(e),r=t+"ms"
+return F!==r&&(F=r,T.doc.css(P.prefixstyle+"transition-duration",r)),t},this.doScrollLeft=function(e,o){var t=T.scrollrunning?T.newscrolly:T.getScrollTop()
+T.doScrollPos(e,t,o)},this.doScrollTop=function(e,o){var t=T.scrollrunning?T.newscrollx:T.getScrollLeft()
+T.doScrollPos(t,e,o)},this.cursorupdate={running:!1,start:function(){var e=this
+if(!e.running){e.running=!0
+var o=function(){e.running&&p(o),T.showCursor(T.getScrollTop(),T.getScrollLeft()),T.notifyScrollEvent(T.win[0])}
+p(o)}},stop:function(){this.running=!1}},this.doScrollPos=function(e,o,t){var r=T.getScrollTop(),i=T.getScrollLeft()
+if(((T.newscrolly-r)*(o-r)<0||(T.newscrollx-i)*(e-i)<0)&&T.cancelScroll(),M.bouncescroll?(0>o?o=o/2|0:o>T.page.maxh&&(o=T.page.maxh+(o-T.page.maxh)/2|0),0>e?e=e/2|0:e>T.page.maxw&&(e=T.page.maxw+(e-T.page.maxw)/2|0)):(0>o?o=0:o>T.page.maxh&&(o=T.page.maxh),0>e?e=0:e>T.page.maxw&&(e=T.page.maxw)),T.scrollrunning&&e==T.newscrollx&&o==T.newscrolly)return!1
+T.newscrolly=o,T.newscrollx=e
+var s=T.getScrollTop(),n=T.getScrollLeft(),l={}
+l.x=e-n,l.y=o-s
+var a=0|Math.sqrt(l.x*l.x+l.y*l.y),c=T.prepareTransition(a)
+T.scrollrunning||(T.scrollrunning=!0,T.triggerScrollStart(n,s,e,o,c),T.cursorupdate.start()),T.scrollendtrapped=!0,P.transitionend||(T.scrollendtrapped&&clearTimeout(T.scrollendtrapped),T.scrollendtrapped=setTimeout(T.onScrollTransitionEnd,c)),T.setScrollTop(T.newscrolly),T.setScrollLeft(T.newscrollx)},this.cancelScroll=function(){if(!T.scrollendtrapped)return!0
+var e=T.getScrollTop(),o=T.getScrollLeft()
+return T.scrollrunning=!1,P.transitionend||clearTimeout(P.transitionend),T.scrollendtrapped=!1,T.resetTransition(),T.setScrollTop(e),T.railh&&T.setScrollLeft(o),T.timerscroll&&T.timerscroll.tm&&clearInterval(T.timerscroll.tm),T.timerscroll=!1,T.cursorfreezed=!1,T.cursorupdate.stop(),T.showCursor(e,o),T},this.onScrollTransitionEnd=function(){if(T.scrollendtrapped){var e=T.getScrollTop(),o=T.getScrollLeft()
+if(0>e?e=0:e>T.page.maxh&&(e=T.page.maxh),0>o?o=0:o>T.page.maxw&&(o=T.page.maxw),e!=T.newscrolly||o!=T.newscrollx)return T.doScrollPos(o,e,M.snapbackspeed)
+T.scrollrunning&&T.triggerScrollEnd(),T.scrollrunning=!1,T.scrollendtrapped=!1,T.resetTransition(),T.timerscroll=!1,T.setScrollTop(e),T.railh&&T.setScrollLeft(o),T.cursorupdate.stop(),T.noticeCursor(!1,e,o),T.cursorfreezed=!1}}}else this.doScrollLeft=function(e,o){var t=T.scrollrunning?T.newscrolly:T.getScrollTop()
+T.doScrollPos(e,t,o)},this.doScrollTop=function(e,o){var t=T.scrollrunning?T.newscrollx:T.getScrollLeft()
+T.doScrollPos(t,e,o)},this.doScrollPos=function(e,o,t){var r=T.getScrollTop(),i=T.getScrollLeft();((T.newscrolly-r)*(o-r)<0||(T.newscrollx-i)*(e-i)<0)&&T.cancelScroll()
+var s=!1
+if(T.bouncescroll&&T.rail.visibility||(0>o?(o=0,s=!0):o>T.page.maxh&&(o=T.page.maxh,s=!0)),T.bouncescroll&&T.railh.visibility||(0>e?(e=0,s=!0):e>T.page.maxw&&(e=T.page.maxw,s=!0)),T.scrollrunning&&T.newscrolly===o&&T.newscrollx===e)return!0
+T.newscrolly=o,T.newscrollx=e,T.dst={},T.dst.x=e-i,T.dst.y=o-r,T.dst.px=i,T.dst.py=r
+var n=0|Math.sqrt(T.dst.x*T.dst.x+T.dst.y*T.dst.y),l=T.getTransitionSpeed(n)
+T.bzscroll={}
+var a=s?1:.58
+T.bzscroll.x=new R(i,T.newscrollx,l,0,0,a,1),T.bzscroll.y=new R(r,T.newscrolly,l,0,0,a,1)
+var c=(v(),function(){if(T.scrollrunning){var e=T.bzscroll.y.getPos()
+T.setScrollLeft(T.bzscroll.x.getNow()),T.setScrollTop(T.bzscroll.y.getNow()),1>=e?T.timer=p(c):(T.scrollrunning=!1,T.timer=0,T.triggerScrollEnd())}})
+T.scrollrunning||(T.triggerScrollStart(i,r,e,o,l),T.scrollrunning=!0,T.timer=p(c))},this.cancelScroll=function(){return T.timer&&m(T.timer),T.timer=0,T.bzscroll=!1,T.scrollrunning=!1,T}
+else this.doScrollLeft=function(e,o){var t=T.getScrollTop()
+T.doScrollPos(e,t,o)},this.doScrollTop=function(e,o){var t=T.getScrollLeft()
+T.doScrollPos(t,e,o)},this.doScrollPos=function(e,o,t){var r=e>T.page.maxw?T.page.maxw:e
+0>r&&(r=0)
+var i=o>T.page.maxh?T.page.maxh:o
+0>i&&(i=0),T.synched("scroll",function(){T.setScrollTop(i),T.setScrollLeft(r)})},this.cancelScroll=function(){}
+this.doScrollBy=function(e,o){z(0,e)},this.doScrollLeftBy=function(e,o){z(e,0)},this.doScrollTo=function(e,o){var t=o?Math.round(e*T.scrollratio.y):e
+0>t?t=0:t>T.page.maxh&&(t=T.page.maxh),T.cursorfreezed=!1,T.doScrollTop(e)},this.checkContentSize=function(){var e=T.getContentSize();(e.h!=T.page.h||e.w!=T.page.w)&&T.resize(!1,e)},T.onscroll=function(e){T.rail.drag||T.cursorfreezed||T.synched("scroll",function(){T.scroll.y=Math.round(T.getScrollTop()/T.scrollratio.y),T.railh&&(T.scroll.x=Math.round(T.getScrollLeft()/T.scrollratio.x)),T.noticeCursor()})},T.bind(T.docscroll,"scroll",T.onscroll),this.doZoomIn=function(e){if(!T.zoomactive){T.zoomactive=!0,T.zoomrestore={style:{}}
+var o=["position","top","left","zIndex","backgroundColor","marginTop","marginBottom","marginLeft","marginRight"],t=T.win[0].style
+for(var r in o){var i=o[r]
+T.zoomrestore.style[i]=void 0!==t[i]?t[i]:""}T.zoomrestore.style.width=T.win.css("width"),T.zoomrestore.style.height=T.win.css("height"),T.zoomrestore.padding={w:T.win.outerWidth()-T.win.width(),h:T.win.outerHeight()-T.win.height()},P.isios4&&(T.zoomrestore.scrollTop=u.scrollTop(),u.scrollTop(0)),T.win.css({position:P.isios4?"absolute":"fixed",top:0,left:0,zIndex:l+100,margin:0})
+var s=T.win.css("backgroundColor")
+return(""===s||/transparent|rgba\(0, 0, 0, 0\)|rgba\(0,0,0,0\)/.test(s))&&T.win.css("backgroundColor","#fff"),T.rail.css({zIndex:l+101}),T.zoom.css({zIndex:l+102}),T.zoom.css("backgroundPosition","0 -18px"),T.resizeZoom(),T.onzoomin&&T.onzoomin.call(T),T.cancelEvent(e)}},this.doZoomOut=function(e){return T.zoomactive?(T.zoomactive=!1,T.win.css("margin",""),T.win.css(T.zoomrestore.style),P.isios4&&u.scrollTop(T.zoomrestore.scrollTop),T.rail.css({"z-index":T.zindex}),T.zoom.css({"z-index":T.zindex}),T.zoomrestore=!1,T.zoom.css("backgroundPosition","0 0"),T.onResize(),T.onzoomout&&T.onzoomout.call(T),T.cancelEvent(e)):void 0},this.doZoom=function(e){return T.zoomactive?T.doZoomOut(e):T.doZoomIn(e)},this.resizeZoom=function(){if(T.zoomactive){var e=T.getScrollTop()
+T.win.css({width:u.width()-T.zoomrestore.padding.w+"px",height:u.height()-T.zoomrestore.padding.h+"px"}),T.onResize(),T.setScrollTop(Math.min(T.page.maxh,e))}},this.init(),a.nicescroll.push(this)},S=function(e){var o=this
+this.nc=e,this.lastx=0,this.lasty=0,this.speedx=0,this.speedy=0,this.lasttime=0,this.steptime=0,this.snapx=!1,this.snapy=!1,this.demulx=0,this.demuly=0,this.lastscrollx=-1,this.lastscrolly=-1,this.chkx=0,this.chky=0,this.timer=0,this.reset=function(e,t){o.stop(),o.steptime=0,o.lasttime=v(),o.speedx=0,o.speedy=0,o.lastx=e,o.lasty=t,o.lastscrollx=-1,o.lastscrolly=-1},this.update=function(e,t){var r=v()
+o.steptime=r-o.lasttime,o.lasttime=r
+var i=t-o.lasty,s=e-o.lastx,n=o.nc.getScrollTop(),l=o.nc.getScrollLeft(),a=n+i,c=l+s
+o.snapx=0>c||c>o.nc.page.maxw,o.snapy=0>a||a>o.nc.page.maxh,o.speedx=s,o.speedy=i,o.lastx=e,o.lasty=t},this.stop=function(){o.nc.unsynched("domomentum2d"),o.timer&&clearTimeout(o.timer),o.timer=0,o.lastscrollx=-1,o.lastscrolly=-1},this.doSnapy=function(e,t){var r=!1
+0>t?(t=0,r=!0):t>o.nc.page.maxh&&(t=o.nc.page.maxh,r=!0),0>e?(e=0,r=!0):e>o.nc.page.maxw&&(e=o.nc.page.maxw,r=!0),r?o.nc.doScrollPos(e,t,o.nc.opt.snapbackspeed):o.nc.triggerScrollEnd()},this.doMomentum=function(e){var t=v(),r=e?t+e:o.lasttime,i=o.nc.getScrollLeft(),s=o.nc.getScrollTop(),n=o.nc.page.maxh,l=o.nc.page.maxw
+o.speedx=l>0?Math.min(60,o.speedx):0,o.speedy=n>0?Math.min(60,o.speedy):0
+var a=r&&60>=t-r;(0>s||s>n||0>i||i>l)&&(a=!1)
+var c=o.speedy&&a?o.speedy:!1,d=o.speedx&&a?o.speedx:!1
+if(c||d){var u=Math.max(16,o.steptime)
+if(u>50){var h=u/50
+o.speedx*=h,o.speedy*=h,u=50}o.demulxy=0,o.lastscrollx=o.nc.getScrollLeft(),o.chkx=o.lastscrollx,o.lastscrolly=o.nc.getScrollTop(),o.chky=o.lastscrolly
+var p=o.lastscrollx,m=o.lastscrolly,f=function(){var e=v()-t>600?.04:.02
+o.speedx&&(p=Math.floor(o.lastscrollx-o.speedx*(1-o.demulxy)),o.lastscrollx=p,(0>p||p>l)&&(e=.1)),o.speedy&&(m=Math.floor(o.lastscrolly-o.speedy*(1-o.demulxy)),o.lastscrolly=m,(0>m||m>n)&&(e=.1)),o.demulxy=Math.min(1,o.demulxy+e),o.nc.synched("domomentum2d",function(){if(o.speedx){o.nc.getScrollLeft()
+o.chkx=p,o.nc.setScrollLeft(p)}if(o.speedy){o.nc.getScrollTop()
+o.chky=m,o.nc.setScrollTop(m)}o.timer||(o.nc.hideCursor(),o.doSnapy(p,m))}),o.demulxy<1?o.timer=setTimeout(f,u):(o.stop(),o.nc.hideCursor(),o.doSnapy(p,m))}
+f()}else o.doSnapy(o.nc.getScrollLeft(),o.nc.getScrollTop())}},z=e.fn.scrollTop
+e.cssHooks.pageYOffset={get:function(e,o,t){var r=a.data(e,"__nicescroll")||!1
+return r&&r.ishwscroll?r.getScrollTop():z.call(e)},set:function(e,o){var t=a.data(e,"__nicescroll")||!1
+return t&&t.ishwscroll?t.setScrollTop(parseInt(o)):z.call(e,o),this}},e.fn.scrollTop=function(e){if(void 0===e){var o=this[0]?a.data(this[0],"__nicescroll")||!1:!1
+return o&&o.ishwscroll?o.getScrollTop():z.call(this)}return this.each(function(){var o=a.data(this,"__nicescroll")||!1
+o&&o.ishwscroll?o.setScrollTop(parseInt(e)):z.call(a(this),e)})}
+var k=e.fn.scrollLeft
+a.cssHooks.pageXOffset={get:function(e,o,t){var r=a.data(e,"__nicescroll")||!1
+return r&&r.ishwscroll?r.getScrollLeft():k.call(e)},set:function(e,o){var t=a.data(e,"__nicescroll")||!1
+return t&&t.ishwscroll?t.setScrollLeft(parseInt(o)):k.call(e,o),this}},e.fn.scrollLeft=function(e){if(void 0===e){var o=this[0]?a.data(this[0],"__nicescroll")||!1:!1
+return o&&o.ishwscroll?o.getScrollLeft():k.call(this)}return this.each(function(){var o=a.data(this,"__nicescroll")||!1
+o&&o.ishwscroll?o.setScrollLeft(parseInt(e)):k.call(a(this),e)})}
+var T=function(e){var o=this
+if(this.length=0,this.name="nicescrollarray",this.each=function(e){return a.each(o,e),o},this.push=function(e){o[o.length]=e,o.length++},this.eq=function(e){return o[e]},e)for(var t=0;t<e.length;t++){var r=a.data(e[t],"__nicescroll")||!1
+r&&(this[this.length]=r,this.length++)}return this}
+t(T.prototype,["show","hide","toggle","onResize","resize","remove","stop","doScrollPos"],function(e,o){e[o]=function(){var e=arguments
+return this.each(function(){this[o].apply(this,e)})}}),e.fn.getNiceScroll=function(e){return void 0===e?new T(this):this[e]&&a.data(this[e],"__nicescroll")||!1}
+var E=e.expr.pseudos||e.expr[":"]
+E.nicescroll=function(e){return void 0!==a.data(e,"__nicescroll")},a.fn.niceScroll=function(e,o){void 0!==o||"object"!=typeof e||"jquery"in e||(o=e,e=!1)
+var t=new T
+return this.each(function(){var r=a(this),i=a.extend({},o)
+if(e){var s=a(e)
+i.doc=s.length>1?a(e,r):s,i.win=r}var n=!("doc"in i)
+n||"win"in i||(i.win=r)
+var l=r.data("__nicescroll")||!1
+l||(i.doc=i.doc||r,l=new x(i,r),r.data("__nicescroll",l)),t.push(l)}),1===t.length?t[0]:t},d.NiceScroll={getjQuery:function(){return e}},a.nicescroll||(a.nicescroll=new T,a.nicescroll.options=w)})
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/phoneValidateCode/phoneValidateCodeDetails.js b/pluss-manage-page/src/main/resources/static/resources/js/phoneValidateCode/phoneValidateCodeDetails.js
new file mode 100644
index 0000000..ed72ca7
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/phoneValidateCode/phoneValidateCodeDetails.js
@@ -0,0 +1,96 @@
+/**
+ * create by robot 
+ * date Tue Sep 10 15:03:55 CST 2019 
+ */ 
+
+$(document).ready(function(){
+	//form表单样式
+	layui.use(['layer', 'form'], function() {
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+	//li 切换事件
+	$(".nav-tabs>li").click(function() {
+		var index = $(".nav-tabs>li").index(this);
+		$(this).addClass("active").siblings("li").removeClass("active");
+		
+	})
+	//弹出一个提示层
+	$('.fa-save').on('click', function() {
+		savePhoneValidateCode();
+	});
+
+	//绑定标签栏事件
+	$(document).on('click','.nav-tabs li',function(){
+
+		var action =$(this).data('action');
+		 switch (action) {
+			case "base"://基本资料
+				goBase();
+				break;  
+			case "functions"://多功能
+				goFunctions();
+				break;
+			case "extends"://扩展    
+				goExtends();         
+				break;           
+		 }
+	})
+
+	//加载第一个标签
+	$('.nav-tabs li').eq(0).click();
+	
+});
+
+
+//跳转基本信息 
+function goBase(){
+	var url=ctx+'/phoneValidateCode/queryPhoneValidateCodeBaseInfo?id='+$('#phoneValidateCodeId').val();
+	$('.tab-content').load(url);
+	              
+}
+//跳转多功能输入
+function goFunctions(){ 
+	var url=ctx+'/phoneValidateCode/queryPhoneValidateCodeFunctionsInfo?id='+$('#phoneValidateCodeId').val();
+	$('.tab-content').load(url);  
+	
+}
+//跳转到扩展   
+function goExtends(){
+	
+	var url=ctx+'/phoneValidateCode/queryPhoneValidateCodeExtendsInfo?id='+$('#phoneValidateCodeId').val();
+	$('.tab-content').load(url);          
+}  
+  
+
+ 
+//保存
+function savePhoneValidateCode(){
+	 
+	$(".fa-save").attr("disabled","disabled");
+	$('.fa-save').html('正在保存...')
+	$.ajax({
+		url:ctx+"/phoneValidateCode/savePhoneValidateCode",
+		type:"POST",
+		dataType:'json',
+		data:$("#data_form").serializeArray(),
+		complete:function(){
+			$(".fa-save").removeAttr("disabled");
+			$('.fa-save').html('保存')
+		},        
+		success:function(service){ 
+		
+			layer.confirm('保存成功,是否前往列表？', {
+				  btn: ['确认','取消'] //按钮
+				}, function(){
+					$('#goback span').trigger('click'); 
+				}, function(){         
+					layer.closeAll();
+			});  
+			
+		}
+	});  
+}
+ 
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/phoneValidateCode/phoneValidateCodeList.js b/pluss-manage-page/src/main/resources/static/resources/js/phoneValidateCode/phoneValidateCodeList.js
new file mode 100644
index 0000000..25b2ba8
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/phoneValidateCode/phoneValidateCodeList.js
@@ -0,0 +1,267 @@
+/**
+ * create by robot 
+ * date Tue Sep 10 15:03:55 CST 2019 
+ */ 
+
+var pageIndex=1;
+$(document).ready(function(){
+	//调用查询
+	pageIndex=StringUtil.getQueryString('pageIndex');
+	if(pageIndex==undefined||pageIndex==null){
+		pageIndex=1;
+	}
+	queryPhoneValidateCode(pageIndex);
+	//绑定hover操作
+	$(document).on('mouseenter','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").show();
+		var width=15;
+		$(this).children('div').find('li').each(function(){
+			//获取li宽度
+			width+=$(this).width();
+		});
+		$(this).children('div').width(width);
+	})
+	$(document).on('mouseleave','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").hide();
+	});
+
+	//日历控件
+	layui.use(['layer', 'laydate'], function() {
+		var layer = layui.layer;
+		laydate = layui.laydate;
+		laydate.render({
+		elem: '#date1' //指定元素
+		});
+		laydate.render({
+			elem: '#date2' //指定元素
+		});
+	});
+
+
+	//行选中事件
+	$("#allCheck").find("span").click(function() {
+		$(this).toggleClass('checked');
+		if($(this).hasClass('checked')){
+			//所有列选中
+		  $(".checker").find("span").each(function () {
+		         $(this).addClass("checked");
+		    })
+		}else{
+			//所有列取消选中
+			$(".checker").find("span").each(function () {
+				 $(this).removeClass("checked");
+		    })
+		}
+	});
+
+	//单个选中
+	$(document).on('click','.checkeBox span',function() {
+		$(this).toggleClass('checked');
+		//设置头部事件
+		var length=$('.checkeBox span').length;
+		var count=0;
+		$(".checkeBox").find("span").each(function () {
+	        if($(this).hasClass("checked")){
+	        	count++;
+	        }
+	   })
+		//全选
+	   if(count==length){
+		   $("#allCheck").find("span").addClass('checked');
+	   }else{
+		   $("#allCheck").find("span").removeClass('checked');
+	   }
+	})
+	//左右div高度相等
+	var left_content_height = $(".right-content").height();
+	$(".left-content").height(left_content_height+35);
+	var sub_left_height=$(".res-menu").height(left_content_height-60);
+});
+
+//查询
+function queryPhoneValidateCode(index){
+	if(typeof(index)=='undefined'){
+		index=1;
+	}
+	var url=ctx+'/phoneValidateCode/queryPhoneValidateCodeByPage';
+	$.ajax({  
+        url:url,  
+        type:"post", 
+        dataType:"json",  
+        data:{  
+        	"currPage":index,
+        	"id":$('#searchId').val()
+        },  
+        success:function(result){  
+        	//渲染数据
+        	$('#data_content').empty();
+        	var header='';
+        	$.each(result.phoneValidateCodeList,function(i){
+        		var phoneValidateCode=result.phoneValidateCodeList[i];
+        		var data='';
+        		data+='<tr class="odd">';
+        		data+='<td class="textc">';
+				data+='		 <div class="checker checkeBox">';        		data+='		 <span class=""  data-id="'+phoneValidateCode.id+'"><input type="checkbox"  value=""></span>';
+        		data+='		</div>';
+        		data+='</td>';
+        		data+='<td class="textc">'+phoneValidateCode.id+'</td>';
+        		data+='<td class="textc">'+phoneValidateCode.phone+'</td>';
+        		data+='<td class="textc">'+phoneValidateCode.code+'</td>';
+        		data+='<td class="textc">'+phoneValidateCode.sendDt+'</td>';
+        		data+='<td class="textc">'+phoneValidateCode.status+'</td>';
+        		data+='<td class="textc">'+phoneValidateCode.remark+'</td>';
+        		data+='<td class="textc">';
+        		data+='<div class="positionr listOperaters">';
+        		data+='		<a href="javascript:void(0);"  class="icon-large dlblock w16 h16"><img src="'+resourcePath+'/images/angle-down.png"/></a>';
+        		data+='		<div class="ops_box ops_itemDiv positiona clearfix whitebg">';
+        		data+='			<ul>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showPhoneValidateCodeDetails('+phoneValidateCode.id+')" class="btn btn-primary fa fa-edit ops_more f12">编辑</a></li>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="initDeletePhoneValidateCode('+phoneValidateCode.id+')" class="btn btn-primary fa fa-remove ops_more f12">删除</a></li>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showPhoneValidateCodeDetails('+phoneValidateCode.id+')" class="btn btn-primary fa fa-detail ops_more f12">明细</a></li>';
+        	    data+='			</ul>';
+              data+='		</div>';
+        	    data+='</div>';
+        	    data+='</td>';
+        	    data+='</tr>';
+        	    $('#data_content').append(data);
+        	});
+        	//分页
+        	$('#pageCount').html(result.pageCount);
+      	$('#currPage').html(result.currPage);
+          $('#totalCount').html(result.count);
+           	//设置分页
+           	pageIndex=result.currPage;
+			$('#pagination').pagination({
+				pageCount: result.pageCount,
+				jump: true,
+				coping: true,
+				jump: true,
+				homePage: '首页',
+				endPage: '末页',
+				prevContent: '上页',
+				nextContent: '下页',
+				current:result.currPage,
+				callback:function(api){
+					pageIndex=api.getCurrent();
+					queryPhoneValidateCode(api.getCurrent());
+				}
+			});
+        } 
+    });  
+	//表头列不选中
+	$("#allCheck").find("span").removeClass('checked');
+}
+
+//初始化新增
+function initAddPhoneValidateCode(){
+	window.location=ctx+'/phoneValidateCode/queryPhoneValidateCodeDetails?pageIndex='+pageIndex;
+}
+
+//初始化修改
+function showPhoneValidateCodeDetails(id){
+	window.location=ctx+'/phoneValidateCode/queryPhoneValidateCodeDetails?id='+id+'&pageIndex='+pageIndex;
+}
+
+//初始化删除
+function initDeletePhoneValidateCode(id){
+	
+		layer.open({
+		type: 1,
+		closeBtn: 1,		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r'	, //按钮居中
+		shade: 0.3 ,//不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deletePhoneValidateCode(id,true);
+		}
+	});
+}
+
+//删除
+function deletePhoneValidateCode(id,showMsg){
+	$.ajax({
+		url:ctx+'/phoneValidateCode/deletePhoneValidateCode',
+		data:[{
+			name:'id',
+			value:id
+		}],
+		type:'POST',
+		dataType:'json',
+		success:function(){
+			queryPhoneValidateCode(pageIndex);
+			if(showMsg){
+				layer.msg('删除成功!');	
+			}
+		}
+	});
+}
+//头部编辑
+function initEditPhoneValidateCode(){
+	var count=0;
+	var id=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+        	 id=$(this).data('id');
+         }
+    })
+    if(count>1){
+    	layer.msg('只能选中一行记录进行操作!');
+    	return ;
+    }
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	 if(id>0){
+	  showPhoneValidateCodeDetails(id);
+	 }
+}
+//头部删除
+function initBatchDeletePhoneValidateCode(){
+	var count=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+         }
+    })
+	
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	
+
+	layer.open({
+		type: 1,
+		closeBtn: 1,
+		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r', //按钮居中
+		shade: 0.3, //不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteBatchPhoneValidateCode();
+		}
+	});
+	
+}
+//批量删除
+function deleteBatchPhoneValidateCode(){
+	
+	$(".checkeBox").find("span").each(function () {
+        if($(this).hasClass("checked")){
+        	var id=$(this).data('id');
+        	deletePhoneValidateCode(id,false);
+        	layer.msg('删除成功!');	
+        }
+   })
+}
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/realFans/realFansDetails.js b/pluss-manage-page/src/main/resources/static/resources/js/realFans/realFansDetails.js
new file mode 100644
index 0000000..e491cf8
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/realFans/realFansDetails.js
@@ -0,0 +1,96 @@
+/**
+ * create by robot 
+ * date Fri Dec 06 18:04:13 CST 2019 
+ */ 
+
+$(document).ready(function(){
+	//form表单样式
+	layui.use(['layer', 'form'], function() {
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+	//li 切换事件
+	$(".nav-tabs>li").click(function() {
+		var index = $(".nav-tabs>li").index(this);
+		$(this).addClass("active").siblings("li").removeClass("active");
+		
+	})
+	//弹出一个提示层
+	$('.fa-save').on('click', function() {
+		saveRealFans();
+	});
+
+	//绑定标签栏事件
+	$(document).on('click','.nav-tabs li',function(){
+
+		var action =$(this).data('action');
+		 switch (action) {
+			case "base"://基本资料
+				goBase();
+				break;  
+			case "functions"://多功能
+				goFunctions();
+				break;
+			case "extends"://扩展    
+				goExtends();         
+				break;           
+		 }
+	})
+
+	//加载第一个标签
+	$('.nav-tabs li').eq(0).click();
+	
+});
+
+
+//跳转基本信息 
+function goBase(){
+	var url=ctx+'/realFans/queryRealFansBaseInfo?id='+$('#realFansId').val();
+	$('.tab-content').load(url);
+	              
+}
+//跳转多功能输入
+function goFunctions(){ 
+	var url=ctx+'/realFans/queryRealFansFunctionsInfo?id='+$('#realFansId').val();
+	$('.tab-content').load(url);  
+	
+}
+//跳转到扩展   
+function goExtends(){
+	
+	var url=ctx+'/realFans/queryRealFansExtendsInfo?id='+$('#realFansId').val();
+	$('.tab-content').load(url);          
+}  
+  
+
+ 
+//保存
+function saveRealFans(){
+	 
+	$(".fa-save").attr("disabled","disabled");
+	$('.fa-save').html('正在保存...')
+	$.ajax({
+		url:ctx+"/realFans/saveRealFans",
+		type:"POST",
+		dataType:'json',
+		data:$("#data_form").serializeArray(),
+		complete:function(){
+			$(".fa-save").removeAttr("disabled");
+			$('.fa-save').html('保存')
+		},        
+		success:function(service){ 
+		
+			layer.confirm('保存成功,是否前往列表？', {
+				  btn: ['确认','取消'] //按钮
+				}, function(){
+					$('#goback span').trigger('click'); 
+				}, function(){         
+					layer.closeAll();
+			});  
+			
+		}
+	});  
+}
+ 
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/realFans/realFansList.js b/pluss-manage-page/src/main/resources/static/resources/js/realFans/realFansList.js
new file mode 100644
index 0000000..17e3f61
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/realFans/realFansList.js
@@ -0,0 +1,337 @@
+/**
+ * create by robot 
+ * date Fri Dec 06 18:04:13 CST 2019 
+ */ 
+
+var pageIndex=1;
+$(document).ready(function(){
+	//调用查询
+	pageIndex=StringUtil.getQueryString('pageIndex');
+	if(pageIndex==undefined||pageIndex==null){
+		pageIndex=1;
+	}
+	queryRealFans(pageIndex);
+	//绑定hover操作
+	$(document).on('mouseenter','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").show();
+		var width=15;
+		$(this).children('div').find('li').each(function(){
+			//获取li宽度
+			width+=$(this).width();
+		});
+		$(this).children('div').width(width);
+	})
+	$(document).on('mouseleave','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").hide();
+	});
+
+	//日历控件
+	layui.use(['layer', 'laydate'], function() {
+		var layer = layui.layer;
+		laydate = layui.laydate;
+		laydate.render({
+			elem: '#date1', //指定元素
+			format:'yyyy-MM-dd 00:00:00'
+		});
+		laydate.render({
+			elem: '#date2', //指定元素
+			format:'yyyy-MM-dd 23:59:59'
+		});
+	});
+
+
+	//行选中事件
+	$("#allCheck").find("span").click(function() {
+		$(this).toggleClass('checked');
+		if($(this).hasClass('checked')){
+			//所有列选中
+		  $(".checker").find("span").each(function () {
+		         $(this).addClass("checked");
+		    })
+		}else{
+			//所有列取消选中
+			$(".checker").find("span").each(function () {
+				 $(this).removeClass("checked");
+		    })
+		}
+	});
+
+	//单个选中
+	$(document).on('click','.checkeBox span',function() {
+		$(this).toggleClass('checked');
+		//设置头部事件
+		var length=$('.checkeBox span').length;
+		var count=0;
+		$(".checkeBox").find("span").each(function () {
+	        if($(this).hasClass("checked")){
+	        	count++;
+	        }
+	   })
+		//全选
+	   if(count==length){
+		   $("#allCheck").find("span").addClass('checked');
+	   }else{
+		   $("#allCheck").find("span").removeClass('checked');
+	   }
+	})
+	//左右div高度相等
+	var left_content_height = $(".right-content").height();
+	$(".left-content").height(left_content_height+35);
+	var sub_left_height=$(".res-menu").height(left_content_height-60);
+});
+
+//查询
+function queryRealFans(index){
+	if(typeof(index)=='undefined'){
+		index=1;
+	}
+	var url=ctx+'/realFans/queryRealFansByPage';
+	$.ajax({  
+        url:url,  
+        type:"post", 
+        dataType:"json",  
+        data:{  
+        	"currPage":index,
+        	"phone":$('#phone').val(),
+        	"nickName":$('#nickName').val(),
+        	"enableMerchantCode":$('#enableMerchantCode').val(),
+        	"startTime":$('#date1').val(),
+        	"endTime":$('#date2').val(),
+        	"merchantName":$("#merchantName").val(),
+        	"alias":$("#alias").val(),
+        },  
+        success:function(result){ 
+        	var presentPage = result.currPage;
+        	//渲染数据
+        	$('#data_content').empty();
+        	var header='';
+        	$.each(result.realFansList,function(i){
+        		var orderNumber = (presentPage-1)*40+i+1;
+        		var realFans=result.realFansList[i];
+        		var data='';
+        		data+='<tr class="odd">';
+        		data+='<td class="textc">';
+				data+='		 <div class="checker checkeBox">';        		data+='		 <span class=""  data-id="'+realFans.id+'"><input type="checkbox"  value=""></span>';
+        		data+='		</div>';
+        		data+='</td>';
+        		data+='<td class="textc">'+orderNumber+'</td>';//realFans.id
+        		var nickName='';
+        		if(StringUtil.isNotBlank(realFans.nickName)){
+        			nickName=realFans.nickName;
+        		}
+        		data+='<td class="textc">'+nickName+'</td>';
+        		data+='<td class="textc"><img src="'+realFans.logo+'" onerror="javascript:this.src=\'https://www.shouyinbei.net/resources/images/error.jpg\'"   height="30px" width="30px"></img></td>';
+        		/*var logo='';
+        		if(StringUtil.isNotBlank(realFans.logo)){
+        			logo=realFans.logo;
+        		}
+        		data+='<td class="textc">'+logo+'</td>';*/
+        		/*var phone='';
+        		if(StringUtil.isNotBlank(realFans.phone)){
+        			phone=realFans.phone;
+        		}
+        		data+='<td class="textc">'+phone+'</td>';*/
+        		var soleId='';
+        		if(StringUtil.isNotBlank(realFans.soleId)){
+        			soleId=realFans.soleId;
+        		}
+        		if(StringUtil.isNotBlank($("#admin").val())){
+        			data+='<td class="textc">'+soleId+'</td>';
+        		}
+        		var aliConsum='';
+        		if(StringUtil.isNotBlank(realFans.aliConsum)){
+        			aliConsum=realFans.aliConsum;
+        		}
+        		data+='<td class="textc">'+aliConsum+'</td>';
+        		var wechatConsum='';
+        		if(StringUtil.isNotBlank(realFans.wechatConsum)){
+        			wechatConsum=realFans.wechatConsum;
+        		}
+        		data+='<td class="textc">'+wechatConsum+'</td>';
+        		var alias='';
+        		if(StringUtil.isNotBlank(realFans.alias)){
+        			alias=realFans.alias;
+        		}
+        		if(StringUtil.isNotBlank($("#admin").val())){
+        			data+='<td class="textc">'+alias+'</td>';
+        		}
+        		var enableTime='';
+        		if(StringUtil.isNotBlank(realFans.consumTime)){
+					enableTime= dateFtt("yyyy-MM-dd hh:mm:ss",new Date(realFans.consumTime));
+        		}
+        		data+='<td class="textc">'+enableTime+'</td>';
+        		/*data+='<td class="textc">';
+        		data+='<div class="positionr listOperaters">';
+        		data+='		<a href="javascript:void(0);"  class="icon-large dlblock w16 h16"><img src="'+resourcePath+'/images/angle-down.png"/></a>';
+        		data+='		<div class="ops_box ops_itemDiv positiona clearfix whitebg">';
+        		data+='			<ul>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showRealFansDetails('+realFans.id+')" class="layui-btn layui-btn-sm layui-btn-radius fa fa-edit ops_more f12">编辑</a></li>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="initDeleteRealFans('+realFans.id+')" class="layui-btn layui-btn-sm layui-btn-radius layui-btn-danger fa fa-remove ops_more f12">删除</a></li>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showRealFansDetails('+realFans.id+')" class="layui-btn layui-btn-sm layui-btn-radius fa fa-detail ops_more f12">明细</a></li>';
+        	    data+='			</ul>';
+              data+='		</div>';
+        	    data+='</div>';
+        	    data+='</td>';*/
+        	    data+='</tr>';
+        	    $('#data_content').append(data);
+        	});
+        	//分页
+			$('#pageCount').html(result.pageCount);
+			$('#currPage').html(result.currPage);
+			$('#totalCount').html(result.count);
+			//设置分页
+			pageIndex=result.currPage;
+			$('#pagination').pagination({
+				pageCount: result.pageCount,
+				coping: true,
+				jump: true,
+				homePage: '首页',
+				endPage: '末页',
+				prevContent: '上页',
+				nextContent: '下页',
+				current:result.currPage,
+				callback:function(api){
+					pageIndex=api.getCurrent();
+					queryRealFans(api.getCurrent());
+				}
+			});
+
+        } 
+    });  
+	//表头列不选中
+	$("#allCheck").find("span").removeClass('checked');
+}
+
+//初始化新增
+function initAddRealFans(){
+	window.location=ctx+'/realFans/queryRealFansDetails?pageIndex='+pageIndex;
+}
+
+//初始化修改
+function showRealFansDetails(id){
+	window.location=ctx+'/realFans/queryRealFansDetails?id='+id+'&pageIndex='+pageIndex;
+}
+
+//初始化删除
+function initDeleteRealFans(id){
+	
+		layer.open({
+		type: 1,
+		closeBtn: 1,		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r'	, //按钮居中
+		shade: 0.3 ,//不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteRealFans(id,true);
+		}
+	});
+}
+
+//删除
+function deleteRealFans(id,showMsg){
+	$.ajax({
+		url:ctx+'/realFans/deleteRealFans',
+		data:[{
+			name:'id',
+			value:id
+		}],
+		type:'POST',
+		dataType:'json',
+		success:function(){
+			queryRealFans(pageIndex);
+			if(showMsg){
+				layer.msg('删除成功!');	
+			}
+		}
+	});
+}
+//头部编辑
+function initEditRealFans(){
+	var count=0;
+	var id=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+        	 id=$(this).data('id');
+         }
+    })
+    if(count>1){
+    	layer.msg('只能选中一行记录进行操作!');
+    	return ;
+    }
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	 if(id>0){
+	  showRealFansDetails(id);
+	 }
+}
+//头部删除
+function initBatchDeleteRealFans(){
+	var count=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+         }
+    })
+	
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	
+
+	layer.open({
+		type: 1,
+		closeBtn: 1,
+		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r', //按钮居中
+		shade: 0.3, //不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteBatchRealFans();
+		}
+	});
+	
+}
+//批量删除
+function deleteBatchRealFans(){
+	
+	$(".checkeBox").find("span").each(function () {
+        if($(this).hasClass("checked")){
+        	var id=$(this).data('id');
+        	deleteRealFans(id,false);
+        	layer.msg('删除成功!');	
+        }
+   })
+}
+
+//时间格式化处理
+function dateFtt(fmt,date)
+{ //author: meizz
+	var o = {
+		"M+" : date.getMonth()+1,                 //月份
+		"d+" : date.getDate(),                    //日
+		"h+" : date.getHours(),                   //小时
+		"m+" : date.getMinutes(),                 //分
+		"s+" : date.getSeconds(),                 //秒
+		"q+" : Math.floor((date.getMonth()+3)/3), //季度
+		"S"  : date.getMilliseconds()             //毫秒
+	};
+	if(/(y+)/.test(fmt))
+		fmt=fmt.replace(RegExp.$1, (date.getFullYear()+"").substr(4 - RegExp.$1.length));
+	for(var k in o)
+		if(new RegExp("("+ k +")").test(fmt))
+			fmt = fmt.replace(RegExp.$1, (RegExp.$1.length==1) ? (o[k]) : (("00"+ o[k]).substr((""+ o[k]).length)));
+	return fmt;
+}
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/roleInfo/roleInfoDetails.js b/pluss-manage-page/src/main/resources/static/resources/js/roleInfo/roleInfoDetails.js
new file mode 100644
index 0000000..1e6a759
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/roleInfo/roleInfoDetails.js
@@ -0,0 +1,96 @@
+/**
+ * create by robot 
+ * date Thu Jul 25 19:43:04 CST 2019 
+ */ 
+
+$(document).ready(function(){
+	//form表单样式
+	layui.use(['layer', 'form'], function() {
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+	//li 切换事件
+	$(".nav-tabs>li").click(function() {
+		var index = $(".nav-tabs>li").index(this);
+		$(this).addClass("active").siblings("li").removeClass("active");
+		
+	})
+	//弹出一个提示层
+	$('.fa-save').on('click', function() {
+		saveRoleInfo();
+	});
+
+	//绑定标签栏事件
+	$(document).on('click','.nav-tabs li',function(){
+
+		var action =$(this).data('action');
+		 switch (action) {
+			case "base"://基本资料
+				goBase();
+				break;  
+			case "functions"://多功能
+				goFunctions();
+				break;
+			case "extends"://扩展    
+				goExtends();         
+				break;           
+		 }
+	})
+
+	//加载第一个标签
+	$('.nav-tabs li').eq(0).click();
+	
+});
+
+
+//跳转基本信息 
+function goBase(){
+	var url=ctx+'/roleInfo/queryRoleInfoBaseInfo?id='+$('#roleInfoId').val();
+	$('.tab-content').load(url);
+	              
+}
+//跳转多功能输入
+function goFunctions(){ 
+	var url=ctx+'/roleInfo/queryRoleInfoFunctionsInfo?id='+$('#roleInfoId').val();
+	$('.tab-content').load(url);  
+	
+}
+//跳转到扩展   
+function goExtends(){
+	
+	var url=ctx+'/roleInfo/queryRoleInfoExtendsInfo?id='+$('#roleInfoId').val();
+	$('.tab-content').load(url);          
+}  
+  
+
+ 
+//保存
+function saveRoleInfo(){
+	 
+	$(".fa-save").attr("disabled","disabled");
+	$('.fa-save').html('正在保存...')
+	$.ajax({
+		url:ctx+"/roleInfo/saveRoleInfo",
+		type:"POST",
+		dataType:'json',
+		data:$("#data_form").serializeArray(),
+		complete:function(){
+			$(".fa-save").removeAttr("disabled");
+			$('.fa-save').html('保存')
+		},        
+		success:function(service){ 
+		
+			layer.confirm('保存成功,是否前往列表？', {
+				  btn: ['确认','取消'] //按钮
+				}, function(){
+					$('#goback span').trigger('click'); 
+				}, function(){         
+					layer.closeAll();
+			});  
+			
+		}
+	});  
+}
+ 
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/roleInfo/roleInfoList.js b/pluss-manage-page/src/main/resources/static/resources/js/roleInfo/roleInfoList.js
new file mode 100644
index 0000000..f37ff6b
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/roleInfo/roleInfoList.js
@@ -0,0 +1,264 @@
+/**
+ * create by robot 
+ * date Thu Jul 25 19:43:04 CST 2019 
+ */ 
+
+var pageIndex=1;
+$(document).ready(function(){
+	//调用查询
+	pageIndex=StringUtil.getQueryString('pageIndex');
+	if(pageIndex==undefined||pageIndex==null){
+		pageIndex=1;
+	}
+	queryRoleInfo(pageIndex);
+	//绑定hover操作
+	$(document).on('mouseenter','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").show();
+		var width=15;
+		$(this).children('div').find('li').each(function(){
+			//获取li宽度
+			width+=$(this).width();
+		});
+		$(this).children('div').width(width);
+	})
+	$(document).on('mouseleave','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").hide();
+	});
+
+	//日历控件
+	layui.use(['layer', 'laydate'], function() {
+		var layer = layui.layer;
+		laydate = layui.laydate;
+		laydate.render({
+		elem: '#date1' //指定元素
+		});
+		laydate.render({
+			elem: '#date2' //指定元素
+		});
+	});
+
+
+	//行选中事件
+	$("#allCheck").find("span").click(function() {
+		$(this).toggleClass('checked');
+		if($(this).hasClass('checked')){
+			//所有列选中
+		  $(".checker").find("span").each(function () {
+		         $(this).addClass("checked");
+		    })
+		}else{
+			//所有列取消选中
+			$(".checker").find("span").each(function () {
+				 $(this).removeClass("checked");
+		    })
+		}
+	});
+
+	//单个选中
+	$(document).on('click','.checkeBox span',function() {
+		$(this).toggleClass('checked');
+		//设置头部事件
+		var length=$('.checkeBox span').length;
+		var count=0;
+		$(".checkeBox").find("span").each(function () {
+	        if($(this).hasClass("checked")){
+	        	count++;
+	        }
+	   })
+		//全选
+	   if(count==length){
+		   $("#allCheck").find("span").addClass('checked');
+	   }else{
+		   $("#allCheck").find("span").removeClass('checked');
+	   }
+	})
+	//左右div高度相等
+	var left_content_height = $(".right-content").height();
+	$(".left-content").height(left_content_height+35);
+	var sub_left_height=$(".res-menu").height(left_content_height-60);
+});
+
+//查询
+function queryRoleInfo(index){
+	if(typeof(index)=='undefined'){
+		index=1;
+	}
+	var url=ctx+'/roleInfo/queryRoleInfoByPage';
+	$.ajax({  
+        url:url,  
+        type:"post", 
+        dataType:"json",  
+        data:{  
+        	"currPage":index,
+        	"name":$('#name').val()
+        },  
+        success:function(result){  
+        	//渲染数据
+        	$('#data_content').empty();
+        	var header='';
+        	$.each(result.roleInfoList,function(i){
+        		var roleInfo=result.roleInfoList[i];
+        		var data='';
+        		data+='<tr class="odd">';
+        		data+='<td class="textc">';
+				data+='		 <div class="checker checkeBox">';        		data+='		 <span class=""  data-id="'+roleInfo.id+'"><input type="checkbox"  value=""></span>';
+        		data+='		</div>';
+        		data+='</td>';
+        		data+='<td class="textc">'+roleInfo.id+'</td>';
+        		data+='<td class="textc">'+roleInfo.name+'</td>';
+        		data+='<td class="textc">'+roleInfo.creator+'</td>';
+        		data+='<td class="textc">'+roleInfo.updator+'</td>';
+        		data+='<td class="textc">';
+        		data+='<div class="positionr listOperaters">';
+        		data+='		<a href="javascript:void(0);"  class="icon-large dlblock w16 h16"><img src="'+resourcePath+'/images/angle-down.png"/></a>';
+        		data+='		<div class="ops_box ops_itemDiv positiona clearfix whitebg">';
+        		data+='			<ul>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showRoleInfoDetails('+roleInfo.id+')" class="layui-btn layui-btn-sm layui-btn-radius fa fa-edit ops_more f12">修改</a></li>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="initDeleteRoleInfo('+roleInfo.id+')" class="layui-btn layui-btn-sm layui-btn-radius layui-btn-danger fa fa-remove ops_more f12">删除</a></li>';
+        	    data+='			</ul>';
+              data+='		</div>';
+        	    data+='</div>';
+        	    data+='</td>';
+        	    data+='</tr>';
+        	    $('#data_content').append(data);
+        	});
+        	//分页
+        	$('#pageCount').html(result.pageCount);
+      	$('#currPage').html(result.currPage);
+          $('#totalCount').html(result.count);
+           	//设置分页
+           	pageIndex=result.currPage;
+			$('#pagination').pagination({
+				pageCount: result.pageCount,
+				jump: true,
+				coping: true,
+				jump: true,
+				homePage: '首页',
+				endPage: '末页',
+				prevContent: '上页',
+				nextContent: '下页',
+				current:result.currPage,
+				callback:function(api){
+					pageIndex=api.getCurrent();
+					queryRoleInfo(api.getCurrent());
+				}
+			});
+        } 
+    });  
+	//表头列不选中
+	$("#allCheck").find("span").removeClass('checked');
+}
+
+//初始化新增
+function initAddRoleInfo(){
+	window.location=ctx+'/roleInfo/edit';
+}
+
+//初始化修改
+function showRoleInfoDetails(id){
+	window.location=ctx+'/roleInfo/edit?id='+id;
+}
+
+//初始化删除
+function initDeleteRoleInfo(id){
+	
+		layer.open({
+		type: 1,
+		closeBtn: 1,		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r'	, //按钮居中
+		shade: 0.3 ,//不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteRoleInfo(id,true);
+		}
+	});
+}
+
+//删除
+function deleteRoleInfo(id,showMsg){
+	$.ajax({
+		url:ctx+'/roleInfo/deleteRoleInfo',
+		data:[{
+			name:'id',
+			value:id
+		}],
+		type:'POST',
+		dataType:'json',
+		success:function(){
+			queryRoleInfo(pageIndex);
+			if(showMsg){
+				layer.msg('删除成功!');	
+			}
+		}
+	});
+}
+//头部编辑
+function initEditRoleInfo(){
+	var count=0;
+	var id=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+        	 id=$(this).data('id');
+         }
+    })
+    if(count>1){
+    	layer.msg('只能选中一行记录进行操作!');
+    	return ;
+    }
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	 if(id>0){
+	  showRoleInfoDetails(id);
+	 }
+}
+//头部删除
+function initBatchDeleteRoleInfo(){
+	var count=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+         }
+    })
+	
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	
+
+	layer.open({
+		type: 1,
+		closeBtn: 1,
+		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r', //按钮居中
+		shade: 0.3, //不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteBatchRoleInfo();
+		}
+	});
+	
+}
+//批量删除
+function deleteBatchRoleInfo(){
+	
+	$(".checkeBox").find("span").each(function () {
+        if($(this).hasClass("checked")){
+        	var id=$(this).data('id');
+        	deleteRoleInfo(id,false);
+        	layer.msg('删除成功!');	
+        }
+   })
+}
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/shop/shop.js b/pluss-manage-page/src/main/resources/static/resources/js/shop/shop.js
new file mode 100644
index 0000000..f740b34
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/shop/shop.js
@@ -0,0 +1,7 @@
+/**
+ * 跳转进件详情
+ * @returns
+ */
+function showShop(userId) {
+    window.location = ctx + "/merchantBankCard/queryMerchantInfo?userId=" + userId;
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/swiper.min.js b/pluss-manage-page/src/main/resources/static/resources/js/swiper.min.js
new file mode 100644
index 0000000..e1e1a63
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/swiper.min.js
@@ -0,0 +1,13 @@
+/**
+ * Swiper 4.4.6
+ * Most modern mobile touch slider and framework with hardware accelerated transitions
+ * http://www.idangero.us/swiper/
+ *
+ * Copyright 2014-2018 Vladimir Kharlampidi
+ *
+ * Released under the MIT License
+ *
+ * Released on: December 19, 2018
+ */
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):e.Swiper=t()}(this,function(){"use strict";var f="undefined"==typeof document?{body:{},addEventListener:function(){},removeEventListener:function(){},activeElement:{blur:function(){},nodeName:""},querySelector:function(){return null},querySelectorAll:function(){return[]},getElementById:function(){return null},createEvent:function(){return{initEvent:function(){}}},createElement:function(){return{children:[],childNodes:[],style:{},setAttribute:function(){},getElementsByTagName:function(){return[]}}},location:{hash:""}}:document,J="undefined"==typeof window?{document:f,navigator:{userAgent:""},location:{},history:{},CustomEvent:function(){return this},addEventListener:function(){},removeEventListener:function(){},getComputedStyle:function(){return{getPropertyValue:function(){return""}}},Image:function(){},Date:function(){},screen:{},setTimeout:function(){},clearTimeout:function(){}}:window,l=function(e){for(var t=0;t<e.length;t+=1)this[t]=e[t];return this.length=e.length,this};function L(e,t){var a=[],i=0;if(e&&!t&&e instanceof l)return e;if(e)if("string"==typeof e){var s,r,n=e.trim();if(0<=n.indexOf("<")&&0<=n.indexOf(">")){var o="div";for(0===n.indexOf("<li")&&(o="ul"),0===n.indexOf("<tr")&&(o="tbody"),0!==n.indexOf("<td")&&0!==n.indexOf("<th")||(o="tr"),0===n.indexOf("<tbody")&&(o="table"),0===n.indexOf("<option")&&(o="select"),(r=f.createElement(o)).innerHTML=n,i=0;i<r.childNodes.length;i+=1)a.push(r.childNodes[i])}else for(s=t||"#"!==e[0]||e.match(/[ .<>:~]/)?(t||f).querySelectorAll(e.trim()):[f.getElementById(e.trim().split("#")[1])],i=0;i<s.length;i+=1)s[i]&&a.push(s[i])}else if(e.nodeType||e===J||e===f)a.push(e);else if(0<e.length&&e[0].nodeType)for(i=0;i<e.length;i+=1)a.push(e[i]);return new l(a)}function r(e){for(var t=[],a=0;a<e.length;a+=1)-1===t.indexOf(e[a])&&t.push(e[a]);return t}L.fn=l.prototype,L.Class=l,L.Dom7=l;var t={addClass:function(e){if(void 0===e)return this;for(var t=e.split(" "),a=0;a<t.length;a+=1)for(var i=0;i<this.length;i+=1)void 0!==this[i]&&void 0!==this[i].classList&&this[i].classList.add(t[a]);return this},removeClass:function(e){for(var t=e.split(" "),a=0;a<t.length;a+=1)for(var i=0;i<this.length;i+=1)void 0!==this[i]&&void 0!==this[i].classList&&this[i].classList.remove(t[a]);return this},hasClass:function(e){return!!this[0]&&this[0].classList.contains(e)},toggleClass:function(e){for(var t=e.split(" "),a=0;a<t.length;a+=1)for(var i=0;i<this.length;i+=1)void 0!==this[i]&&void 0!==this[i].classList&&this[i].classList.toggle(t[a]);return this},attr:function(e,t){var a=arguments;if(1===arguments.length&&"string"==typeof e)return this[0]?this[0].getAttribute(e):void 0;for(var i=0;i<this.length;i+=1)if(2===a.length)this[i].setAttribute(e,t);else for(var s in e)this[i][s]=e[s],this[i].setAttribute(s,e[s]);return this},removeAttr:function(e){for(var t=0;t<this.length;t+=1)this[t].removeAttribute(e);return this},data:function(e,t){var a;if(void 0!==t){for(var i=0;i<this.length;i+=1)(a=this[i]).dom7ElementDataStorage||(a.dom7ElementDataStorage={}),a.dom7ElementDataStorage[e]=t;return this}if(a=this[0]){if(a.dom7ElementDataStorage&&e in a.dom7ElementDataStorage)return a.dom7ElementDataStorage[e];var s=a.getAttribute("data-"+e);return s||void 0}},transform:function(e){for(var t=0;t<this.length;t+=1){var a=this[t].style;a.webkitTransform=e,a.transform=e}return this},transition:function(e){"string"!=typeof e&&(e+="ms");for(var t=0;t<this.length;t+=1){var a=this[t].style;a.webkitTransitionDuration=e,a.transitionDuration=e}return this},on:function(){for(var e,t=[],a=arguments.length;a--;)t[a]=arguments[a];var i=t[0],r=t[1],n=t[2],s=t[3];function o(e){var t=e.target;if(t){var a=e.target.dom7EventData||[];if(a.indexOf(e)<0&&a.unshift(e),L(t).is(r))n.apply(t,a);else for(var i=L(t).parents(),s=0;s<i.length;s+=1)L(i[s]).is(r)&&n.apply(i[s],a)}}function l(e){var t=e&&e.target&&e.target.dom7EventData||[];t.indexOf(e)<0&&t.unshift(e),n.apply(this,t)}"function"==typeof t[1]&&(i=(e=t)[0],n=e[1],s=e[2],r=void 0),s||(s=!1);for(var d,p=i.split(" "),c=0;c<this.length;c+=1){var u=this[c];if(r)for(d=0;d<p.length;d+=1){var h=p[d];u.dom7LiveListeners||(u.dom7LiveListeners={}),u.dom7LiveListeners[h]||(u.dom7LiveListeners[h]=[]),u.dom7LiveListeners[h].push({listener:n,proxyListener:o}),u.addEventListener(h,o,s)}else for(d=0;d<p.length;d+=1){var v=p[d];u.dom7Listeners||(u.dom7Listeners={}),u.dom7Listeners[v]||(u.dom7Listeners[v]=[]),u.dom7Listeners[v].push({listener:n,proxyListener:l}),u.addEventListener(v,l,s)}}return this},off:function(){for(var e,t=[],a=arguments.length;a--;)t[a]=arguments[a];var i=t[0],s=t[1],r=t[2],n=t[3];"function"==typeof t[1]&&(i=(e=t)[0],r=e[1],n=e[2],s=void 0),n||(n=!1);for(var o=i.split(" "),l=0;l<o.length;l+=1)for(var d=o[l],p=0;p<this.length;p+=1){var c=this[p],u=void 0;if(!s&&c.dom7Listeners?u=c.dom7Listeners[d]:s&&c.dom7LiveListeners&&(u=c.dom7LiveListeners[d]),u&&u.length)for(var h=u.length-1;0<=h;h-=1){var v=u[h];r&&v.listener===r?(c.removeEventListener(d,v.proxyListener,n),u.splice(h,1)):r||(c.removeEventListener(d,v.proxyListener,n),u.splice(h,1))}}return this},trigger:function(){for(var e=[],t=arguments.length;t--;)e[t]=arguments[t];for(var a=e[0].split(" "),i=e[1],s=0;s<a.length;s+=1)for(var r=a[s],n=0;n<this.length;n+=1){var o=this[n],l=void 0;try{l=new J.CustomEvent(r,{detail:i,bubbles:!0,cancelable:!0})}catch(e){(l=f.createEvent("Event")).initEvent(r,!0,!0),l.detail=i}o.dom7EventData=e.filter(function(e,t){return 0<t}),o.dispatchEvent(l),o.dom7EventData=[],delete o.dom7EventData}return this},transitionEnd:function(t){var a,i=["webkitTransitionEnd","transitionend"],s=this;function r(e){if(e.target===this)for(t.call(this,e),a=0;a<i.length;a+=1)s.off(i[a],r)}if(t)for(a=0;a<i.length;a+=1)s.on(i[a],r);return this},outerWidth:function(e){if(0<this.length){if(e){var t=this.styles();return this[0].offsetWidth+parseFloat(t.getPropertyValue("margin-right"))+parseFloat(t.getPropertyValue("margin-left"))}return this[0].offsetWidth}return null},outerHeight:function(e){if(0<this.length){if(e){var t=this.styles();return this[0].offsetHeight+parseFloat(t.getPropertyValue("margin-top"))+parseFloat(t.getPropertyValue("margin-bottom"))}return this[0].offsetHeight}return null},offset:function(){if(0<this.length){var e=this[0],t=e.getBoundingClientRect(),a=f.body,i=e.clientTop||a.clientTop||0,s=e.clientLeft||a.clientLeft||0,r=e===J?J.scrollY:e.scrollTop,n=e===J?J.scrollX:e.scrollLeft;return{top:t.top+r-i,left:t.left+n-s}}return null},css:function(e,t){var a;if(1===arguments.length){if("string"!=typeof e){for(a=0;a<this.length;a+=1)for(var i in e)this[a].style[i]=e[i];return this}if(this[0])return J.getComputedStyle(this[0],null).getPropertyValue(e)}if(2===arguments.length&&"string"==typeof e){for(a=0;a<this.length;a+=1)this[a].style[e]=t;return this}return this},each:function(e){if(!e)return this;for(var t=0;t<this.length;t+=1)if(!1===e.call(this[t],t,this[t]))return this;return this},html:function(e){if(void 0===e)return this[0]?this[0].innerHTML:void 0;for(var t=0;t<this.length;t+=1)this[t].innerHTML=e;return this},text:function(e){if(void 0===e)return this[0]?this[0].textContent.trim():null;for(var t=0;t<this.length;t+=1)this[t].textContent=e;return this},is:function(e){var t,a,i=this[0];if(!i||void 0===e)return!1;if("string"==typeof e){if(i.matches)return i.matches(e);if(i.webkitMatchesSelector)return i.webkitMatchesSelector(e);if(i.msMatchesSelector)return i.msMatchesSelector(e);for(t=L(e),a=0;a<t.length;a+=1)if(t[a]===i)return!0;return!1}if(e===f)return i===f;if(e===J)return i===J;if(e.nodeType||e instanceof l){for(t=e.nodeType?[e]:e,a=0;a<t.length;a+=1)if(t[a]===i)return!0;return!1}return!1},index:function(){var e,t=this[0];if(t){for(e=0;null!==(t=t.previousSibling);)1===t.nodeType&&(e+=1);return e}},eq:function(e){if(void 0===e)return this;var t,a=this.length;return new l(a-1<e?[]:e<0?(t=a+e)<0?[]:[this[t]]:[this[e]])},append:function(){for(var e,t=[],a=arguments.length;a--;)t[a]=arguments[a];for(var i=0;i<t.length;i+=1){e=t[i];for(var s=0;s<this.length;s+=1)if("string"==typeof e){var r=f.createElement("div");for(r.innerHTML=e;r.firstChild;)this[s].appendChild(r.firstChild)}else if(e instanceof l)for(var n=0;n<e.length;n+=1)this[s].appendChild(e[n]);else this[s].appendChild(e)}return this},prepend:function(e){var t,a;for(t=0;t<this.length;t+=1)if("string"==typeof e){var i=f.createElement("div");for(i.innerHTML=e,a=i.childNodes.length-1;0<=a;a-=1)this[t].insertBefore(i.childNodes[a],this[t].childNodes[0])}else if(e instanceof l)for(a=0;a<e.length;a+=1)this[t].insertBefore(e[a],this[t].childNodes[0]);else this[t].insertBefore(e,this[t].childNodes[0]);return this},next:function(e){return 0<this.length?e?this[0].nextElementSibling&&L(this[0].nextElementSibling).is(e)?new l([this[0].nextElementSibling]):new l([]):this[0].nextElementSibling?new l([this[0].nextElementSibling]):new l([]):new l([])},nextAll:function(e){var t=[],a=this[0];if(!a)return new l([]);for(;a.nextElementSibling;){var i=a.nextElementSibling;e?L(i).is(e)&&t.push(i):t.push(i),a=i}return new l(t)},prev:function(e){if(0<this.length){var t=this[0];return e?t.previousElementSibling&&L(t.previousElementSibling).is(e)?new l([t.previousElementSibling]):new l([]):t.previousElementSibling?new l([t.previousElementSibling]):new l([])}return new l([])},prevAll:function(e){var t=[],a=this[0];if(!a)return new l([]);for(;a.previousElementSibling;){var i=a.previousElementSibling;e?L(i).is(e)&&t.push(i):t.push(i),a=i}return new l(t)},parent:function(e){for(var t=[],a=0;a<this.length;a+=1)null!==this[a].parentNode&&(e?L(this[a].parentNode).is(e)&&t.push(this[a].parentNode):t.push(this[a].parentNode));return L(r(t))},parents:function(e){for(var t=[],a=0;a<this.length;a+=1)for(var i=this[a].parentNode;i;)e?L(i).is(e)&&t.push(i):t.push(i),i=i.parentNode;return L(r(t))},closest:function(e){var t=this;return void 0===e?new l([]):(t.is(e)||(t=t.parents(e).eq(0)),t)},find:function(e){for(var t=[],a=0;a<this.length;a+=1)for(var i=this[a].querySelectorAll(e),s=0;s<i.length;s+=1)t.push(i[s]);return new l(t)},children:function(e){for(var t=[],a=0;a<this.length;a+=1)for(var i=this[a].childNodes,s=0;s<i.length;s+=1)e?1===i[s].nodeType&&L(i[s]).is(e)&&t.push(i[s]):1===i[s].nodeType&&t.push(i[s]);return new l(r(t))},remove:function(){for(var e=0;e<this.length;e+=1)this[e].parentNode&&this[e].parentNode.removeChild(this[e]);return this},add:function(){for(var e=[],t=arguments.length;t--;)e[t]=arguments[t];var a,i;for(a=0;a<e.length;a+=1){var s=L(e[a]);for(i=0;i<s.length;i+=1)this[this.length]=s[i],this.length+=1}return this},styles:function(){return this[0]?J.getComputedStyle(this[0],null):{}}};Object.keys(t).forEach(function(e){L.fn[e]=t[e]});var e,a,i,ee={deleteProps:function(e){var t=e;Object.keys(t).forEach(function(e){try{t[e]=null}catch(e){}try{delete t[e]}catch(e){}})},nextTick:function(e,t){return void 0===t&&(t=0),setTimeout(e,t)},now:function(){return Date.now()},getTranslate:function(e,t){var a,i,s;void 0===t&&(t="x");var r=J.getComputedStyle(e,null);return J.WebKitCSSMatrix?(6<(i=r.transform||r.webkitTransform).split(",").length&&(i=i.split(", ").map(function(e){return e.replace(",",".")}).join(", ")),s=new J.WebKitCSSMatrix("none"===i?"":i)):a=(s=r.MozTransform||r.OTransform||r.MsTransform||r.msTransform||r.transform||r.getPropertyValue("transform").replace("translate(","matrix(1, 0, 0, 1,")).toString().split(","),"x"===t&&(i=J.WebKitCSSMatrix?s.m41:16===a.length?parseFloat(a[12]):parseFloat(a[4])),"y"===t&&(i=J.WebKitCSSMatrix?s.m42:16===a.length?parseFloat(a[13]):parseFloat(a[5])),i||0},parseUrlQuery:function(e){var t,a,i,s,r={},n=e||J.location.href;if("string"==typeof n&&n.length)for(s=(a=(n=-1<n.indexOf("?")?n.replace(/\S*\?/,""):"").split("&").filter(function(e){return""!==e})).length,t=0;t<s;t+=1)i=a[t].replace(/#\S+/g,"").split("="),r[decodeURIComponent(i[0])]=void 0===i[1]?void 0:decodeURIComponent(i[1])||"";return r},isObject:function(e){return"object"==typeof e&&null!==e&&e.constructor&&e.constructor===Object},extend:function(){for(var e=[],t=arguments.length;t--;)e[t]=arguments[t];for(var a=Object(e[0]),i=1;i<e.length;i+=1){var s=e[i];if(null!=s)for(var r=Object.keys(Object(s)),n=0,o=r.length;n<o;n+=1){var l=r[n],d=Object.getOwnPropertyDescriptor(s,l);void 0!==d&&d.enumerable&&(ee.isObject(a[l])&&ee.isObject(s[l])?ee.extend(a[l],s[l]):!ee.isObject(a[l])&&ee.isObject(s[l])?(a[l]={},ee.extend(a[l],s[l])):a[l]=s[l])}}return a}},te=(i=f.createElement("div"),{touch:J.Modernizr&&!0===J.Modernizr.touch||!!(0<J.navigator.maxTouchPoints||"ontouchstart"in J||J.DocumentTouch&&f instanceof J.DocumentTouch),pointerEvents:!!(J.navigator.pointerEnabled||J.PointerEvent||"maxTouchPoints"in J.navigator),prefixedPointerEvents:!!J.navigator.msPointerEnabled,transition:(a=i.style,"transition"in a||"webkitTransition"in a||"MozTransition"in a),transforms3d:J.Modernizr&&!0===J.Modernizr.csstransforms3d||(e=i.style,"webkitPerspective"in e||"MozPerspective"in e||"OPerspective"in e||"MsPerspective"in e||"perspective"in e),flexbox:function(){for(var e=i.style,t="alignItems webkitAlignItems webkitBoxAlign msFlexAlign mozBoxAlign webkitFlexDirection msFlexDirection mozBoxDirection mozBoxOrient webkitBoxDirection webkitBoxOrient".split(" "),a=0;a<t.length;a+=1)if(t[a]in e)return!0;return!1}(),observer:"MutationObserver"in J||"WebkitMutationObserver"in J,passiveListener:function(){var e=!1;try{var t=Object.defineProperty({},"passive",{get:function(){e=!0}});J.addEventListener("testPassiveListener",null,t)}catch(e){}return e}(),gestures:"ongesturestart"in J}),s=function(e){void 0===e&&(e={});var t=this;t.params=e,t.eventsListeners={},t.params&&t.params.on&&Object.keys(t.params.on).forEach(function(e){t.on(e,t.params.on[e])})},n={components:{configurable:!0}};s.prototype.on=function(e,t,a){var i=this;if("function"!=typeof t)return i;var s=a?"unshift":"push";return e.split(" ").forEach(function(e){i.eventsListeners[e]||(i.eventsListeners[e]=[]),i.eventsListeners[e][s](t)}),i},s.prototype.once=function(i,s,e){var r=this;if("function"!=typeof s)return r;return r.on(i,function e(){for(var t=[],a=arguments.length;a--;)t[a]=arguments[a];s.apply(r,t),r.off(i,e)},e)},s.prototype.off=function(e,i){var s=this;return s.eventsListeners&&e.split(" ").forEach(function(a){void 0===i?s.eventsListeners[a]=[]:s.eventsListeners[a]&&s.eventsListeners[a].length&&s.eventsListeners[a].forEach(function(e,t){e===i&&s.eventsListeners[a].splice(t,1)})}),s},s.prototype.emit=function(){for(var e=[],t=arguments.length;t--;)e[t]=arguments[t];var a,i,s,r=this;return r.eventsListeners&&("string"==typeof e[0]||Array.isArray(e[0])?(a=e[0],i=e.slice(1,e.length),s=r):(a=e[0].events,i=e[0].data,s=e[0].context||r),(Array.isArray(a)?a:a.split(" ")).forEach(function(e){if(r.eventsListeners&&r.eventsListeners[e]){var t=[];r.eventsListeners[e].forEach(function(e){t.push(e)}),t.forEach(function(e){e.apply(s,i)})}})),r},s.prototype.useModulesParams=function(a){var i=this;i.modules&&Object.keys(i.modules).forEach(function(e){var t=i.modules[e];t.params&&ee.extend(a,t.params)})},s.prototype.useModules=function(i){void 0===i&&(i={});var s=this;s.modules&&Object.keys(s.modules).forEach(function(e){var a=s.modules[e],t=i[e]||{};a.instance&&Object.keys(a.instance).forEach(function(e){var t=a.instance[e];s[e]="function"==typeof t?t.bind(s):t}),a.on&&s.on&&Object.keys(a.on).forEach(function(e){s.on(e,a.on[e])}),a.create&&a.create.bind(s)(t)})},n.components.set=function(e){this.use&&this.use(e)},s.installModule=function(t){for(var e=[],a=arguments.length-1;0<a--;)e[a]=arguments[a+1];var i=this;i.prototype.modules||(i.prototype.modules={});var s=t.name||Object.keys(i.prototype.modules).length+"_"+ee.now();return(i.prototype.modules[s]=t).proto&&Object.keys(t.proto).forEach(function(e){i.prototype[e]=t.proto[e]}),t.static&&Object.keys(t.static).forEach(function(e){i[e]=t.static[e]}),t.install&&t.install.apply(i,e),i},s.use=function(e){for(var t=[],a=arguments.length-1;0<a--;)t[a]=arguments[a+1];var i=this;return Array.isArray(e)?(e.forEach(function(e){return i.installModule(e)}),i):i.installModule.apply(i,[e].concat(t))},Object.defineProperties(s,n);var o={updateSize:function(){var e,t,a=this,i=a.$el;e=void 0!==a.params.width?a.params.width:i[0].clientWidth,t=void 0!==a.params.height?a.params.height:i[0].clientHeight,0===e&&a.isHorizontal()||0===t&&a.isVertical()||(e=e-parseInt(i.css("padding-left"),10)-parseInt(i.css("padding-right"),10),t=t-parseInt(i.css("padding-top"),10)-parseInt(i.css("padding-bottom"),10),ee.extend(a,{width:e,height:t,size:a.isHorizontal()?e:t}))},updateSlides:function(){var e=this,t=e.params,a=e.$wrapperEl,i=e.size,s=e.rtlTranslate,r=e.wrongRTL,n=e.virtual&&t.virtual.enabled,o=n?e.virtual.slides.length:e.slides.length,l=a.children("."+e.params.slideClass),d=n?e.virtual.slides.length:l.length,p=[],c=[],u=[],h=t.slidesOffsetBefore;"function"==typeof h&&(h=t.slidesOffsetBefore.call(e));var v=t.slidesOffsetAfter;"function"==typeof v&&(v=t.slidesOffsetAfter.call(e));var f=e.snapGrid.length,m=e.snapGrid.length,g=t.spaceBetween,b=-h,w=0,y=0;if(void 0!==i){var x,T;"string"==typeof g&&0<=g.indexOf("%")&&(g=parseFloat(g.replace("%",""))/100*i),e.virtualSize=-g,s?l.css({marginLeft:"",marginTop:""}):l.css({marginRight:"",marginBottom:""}),1<t.slidesPerColumn&&(x=Math.floor(d/t.slidesPerColumn)===d/e.params.slidesPerColumn?d:Math.ceil(d/t.slidesPerColumn)*t.slidesPerColumn,"auto"!==t.slidesPerView&&"row"===t.slidesPerColumnFill&&(x=Math.max(x,t.slidesPerView*t.slidesPerColumn)));for(var E,S=t.slidesPerColumn,C=x/S,M=Math.floor(d/t.slidesPerColumn),k=0;k<d;k+=1){T=0;var P=l.eq(k);if(1<t.slidesPerColumn){var z=void 0,$=void 0,L=void 0;"column"===t.slidesPerColumnFill?(L=k-($=Math.floor(k/S))*S,(M<$||$===M&&L===S-1)&&S<=(L+=1)&&(L=0,$+=1),z=$+L*x/S,P.css({"-webkit-box-ordinal-group":z,"-moz-box-ordinal-group":z,"-ms-flex-order":z,"-webkit-order":z,order:z})):$=k-(L=Math.floor(k/C))*C,P.css("margin-"+(e.isHorizontal()?"top":"left"),0!==L&&t.spaceBetween&&t.spaceBetween+"px").attr("data-swiper-column",$).attr("data-swiper-row",L)}if("none"!==P.css("display")){if("auto"===t.slidesPerView){var I=J.getComputedStyle(P[0],null),D=P[0].style.transform,O=P[0].style.webkitTransform;if(D&&(P[0].style.transform="none"),O&&(P[0].style.webkitTransform="none"),t.roundLengths)T=e.isHorizontal()?P.outerWidth(!0):P.outerHeight(!0);else if(e.isHorizontal()){var A=parseFloat(I.getPropertyValue("width")),N=parseFloat(I.getPropertyValue("padding-left")),H=parseFloat(I.getPropertyValue("padding-right")),G=parseFloat(I.getPropertyValue("margin-left")),B=parseFloat(I.getPropertyValue("margin-right")),X=I.getPropertyValue("box-sizing");T=X&&"border-box"===X?A+G+B:A+N+H+G+B}else{var Y=parseFloat(I.getPropertyValue("height")),V=parseFloat(I.getPropertyValue("padding-top")),F=parseFloat(I.getPropertyValue("padding-bottom")),R=parseFloat(I.getPropertyValue("margin-top")),q=parseFloat(I.getPropertyValue("margin-bottom")),W=I.getPropertyValue("box-sizing");T=W&&"border-box"===W?Y+R+q:Y+V+F+R+q}D&&(P[0].style.transform=D),O&&(P[0].style.webkitTransform=O),t.roundLengths&&(T=Math.floor(T))}else T=(i-(t.slidesPerView-1)*g)/t.slidesPerView,t.roundLengths&&(T=Math.floor(T)),l[k]&&(e.isHorizontal()?l[k].style.width=T+"px":l[k].style.height=T+"px");l[k]&&(l[k].swiperSlideSize=T),u.push(T),t.centeredSlides?(b=b+T/2+w/2+g,0===w&&0!==k&&(b=b-i/2-g),0===k&&(b=b-i/2-g),Math.abs(b)<.001&&(b=0),t.roundLengths&&(b=Math.floor(b)),y%t.slidesPerGroup==0&&p.push(b),c.push(b)):(t.roundLengths&&(b=Math.floor(b)),y%t.slidesPerGroup==0&&p.push(b),c.push(b),b=b+T+g),e.virtualSize+=T+g,w=T,y+=1}}if(e.virtualSize=Math.max(e.virtualSize,i)+v,s&&r&&("slide"===t.effect||"coverflow"===t.effect)&&a.css({width:e.virtualSize+t.spaceBetween+"px"}),te.flexbox&&!t.setWrapperSize||(e.isHorizontal()?a.css({width:e.virtualSize+t.spaceBetween+"px"}):a.css({height:e.virtualSize+t.spaceBetween+"px"})),1<t.slidesPerColumn&&(e.virtualSize=(T+t.spaceBetween)*x,e.virtualSize=Math.ceil(e.virtualSize/t.slidesPerColumn)-t.spaceBetween,e.isHorizontal()?a.css({width:e.virtualSize+t.spaceBetween+"px"}):a.css({height:e.virtualSize+t.spaceBetween+"px"}),t.centeredSlides)){E=[];for(var j=0;j<p.length;j+=1){var U=p[j];t.roundLengths&&(U=Math.floor(U)),p[j]<e.virtualSize+p[0]&&E.push(U)}p=E}if(!t.centeredSlides){E=[];for(var K=0;K<p.length;K+=1){var _=p[K];t.roundLengths&&(_=Math.floor(_)),p[K]<=e.virtualSize-i&&E.push(_)}p=E,1<Math.floor(e.virtualSize-i)-Math.floor(p[p.length-1])&&p.push(e.virtualSize-i)}if(0===p.length&&(p=[0]),0!==t.spaceBetween&&(e.isHorizontal()?s?l.css({marginLeft:g+"px"}):l.css({marginRight:g+"px"}):l.css({marginBottom:g+"px"})),t.centerInsufficientSlides){var Z=0;if(u.forEach(function(e){Z+=e+(t.spaceBetween?t.spaceBetween:0)}),(Z-=t.spaceBetween)<i){var Q=(i-Z)/2;p.forEach(function(e,t){p[t]=e-Q}),c.forEach(function(e,t){c[t]=e+Q})}}ee.extend(e,{slides:l,snapGrid:p,slidesGrid:c,slidesSizesGrid:u}),d!==o&&e.emit("slidesLengthChange"),p.length!==f&&(e.params.watchOverflow&&e.checkOverflow(),e.emit("snapGridLengthChange")),c.length!==m&&e.emit("slidesGridLengthChange"),(t.watchSlidesProgress||t.watchSlidesVisibility)&&e.updateSlidesOffset()}},updateAutoHeight:function(e){var t,a=this,i=[],s=0;if("number"==typeof e?a.setTransition(e):!0===e&&a.setTransition(a.params.speed),"auto"!==a.params.slidesPerView&&1<a.params.slidesPerView)for(t=0;t<Math.ceil(a.params.slidesPerView);t+=1){var r=a.activeIndex+t;if(r>a.slides.length)break;i.push(a.slides.eq(r)[0])}else i.push(a.slides.eq(a.activeIndex)[0]);for(t=0;t<i.length;t+=1)if(void 0!==i[t]){var n=i[t].offsetHeight;s=s<n?n:s}s&&a.$wrapperEl.css("height",s+"px")},updateSlidesOffset:function(){for(var e=this.slides,t=0;t<e.length;t+=1)e[t].swiperSlideOffset=this.isHorizontal()?e[t].offsetLeft:e[t].offsetTop},updateSlidesProgress:function(e){void 0===e&&(e=this&&this.translate||0);var t=this,a=t.params,i=t.slides,s=t.rtlTranslate;if(0!==i.length){void 0===i[0].swiperSlideOffset&&t.updateSlidesOffset();var r=-e;s&&(r=e),i.removeClass(a.slideVisibleClass),t.visibleSlidesIndexes=[],t.visibleSlides=[];for(var n=0;n<i.length;n+=1){var o=i[n],l=(r+(a.centeredSlides?t.minTranslate():0)-o.swiperSlideOffset)/(o.swiperSlideSize+a.spaceBetween);if(a.watchSlidesVisibility){var d=-(r-o.swiperSlideOffset),p=d+t.slidesSizesGrid[n];(0<=d&&d<t.size||0<p&&p<=t.size||d<=0&&p>=t.size)&&(t.visibleSlides.push(o),t.visibleSlidesIndexes.push(n),i.eq(n).addClass(a.slideVisibleClass))}o.progress=s?-l:l}t.visibleSlides=L(t.visibleSlides)}},updateProgress:function(e){void 0===e&&(e=this&&this.translate||0);var t=this,a=t.params,i=t.maxTranslate()-t.minTranslate(),s=t.progress,r=t.isBeginning,n=t.isEnd,o=r,l=n;0===i?n=r=!(s=0):(r=(s=(e-t.minTranslate())/i)<=0,n=1<=s),ee.extend(t,{progress:s,isBeginning:r,isEnd:n}),(a.watchSlidesProgress||a.watchSlidesVisibility)&&t.updateSlidesProgress(e),r&&!o&&t.emit("reachBeginning toEdge"),n&&!l&&t.emit("reachEnd toEdge"),(o&&!r||l&&!n)&&t.emit("fromEdge"),t.emit("progress",s)},updateSlidesClasses:function(){var e,t=this,a=t.slides,i=t.params,s=t.$wrapperEl,r=t.activeIndex,n=t.realIndex,o=t.virtual&&i.virtual.enabled;a.removeClass(i.slideActiveClass+" "+i.slideNextClass+" "+i.slidePrevClass+" "+i.slideDuplicateActiveClass+" "+i.slideDuplicateNextClass+" "+i.slideDuplicatePrevClass),(e=o?t.$wrapperEl.find("."+i.slideClass+'[data-swiper-slide-index="'+r+'"]'):a.eq(r)).addClass(i.slideActiveClass),i.loop&&(e.hasClass(i.slideDuplicateClass)?s.children("."+i.slideClass+":not(."+i.slideDuplicateClass+')[data-swiper-slide-index="'+n+'"]').addClass(i.slideDuplicateActiveClass):s.children("."+i.slideClass+"."+i.slideDuplicateClass+'[data-swiper-slide-index="'+n+'"]').addClass(i.slideDuplicateActiveClass));var l=e.nextAll("."+i.slideClass).eq(0).addClass(i.slideNextClass);i.loop&&0===l.length&&(l=a.eq(0)).addClass(i.slideNextClass);var d=e.prevAll("."+i.slideClass).eq(0).addClass(i.slidePrevClass);i.loop&&0===d.length&&(d=a.eq(-1)).addClass(i.slidePrevClass),i.loop&&(l.hasClass(i.slideDuplicateClass)?s.children("."+i.slideClass+":not(."+i.slideDuplicateClass+')[data-swiper-slide-index="'+l.attr("data-swiper-slide-index")+'"]').addClass(i.slideDuplicateNextClass):s.children("."+i.slideClass+"."+i.slideDuplicateClass+'[data-swiper-slide-index="'+l.attr("data-swiper-slide-index")+'"]').addClass(i.slideDuplicateNextClass),d.hasClass(i.slideDuplicateClass)?s.children("."+i.slideClass+":not(."+i.slideDuplicateClass+')[data-swiper-slide-index="'+d.attr("data-swiper-slide-index")+'"]').addClass(i.slideDuplicatePrevClass):s.children("."+i.slideClass+"."+i.slideDuplicateClass+'[data-swiper-slide-index="'+d.attr("data-swiper-slide-index")+'"]').addClass(i.slideDuplicatePrevClass))},updateActiveIndex:function(e){var t,a=this,i=a.rtlTranslate?a.translate:-a.translate,s=a.slidesGrid,r=a.snapGrid,n=a.params,o=a.activeIndex,l=a.realIndex,d=a.snapIndex,p=e;if(void 0===p){for(var c=0;c<s.length;c+=1)void 0!==s[c+1]?i>=s[c]&&i<s[c+1]-(s[c+1]-s[c])/2?p=c:i>=s[c]&&i<s[c+1]&&(p=c+1):i>=s[c]&&(p=c);n.normalizeSlideIndex&&(p<0||void 0===p)&&(p=0)}if((t=0<=r.indexOf(i)?r.indexOf(i):Math.floor(p/n.slidesPerGroup))>=r.length&&(t=r.length-1),p!==o){var u=parseInt(a.slides.eq(p).attr("data-swiper-slide-index")||p,10);ee.extend(a,{snapIndex:t,realIndex:u,previousIndex:o,activeIndex:p}),a.emit("activeIndexChange"),a.emit("snapIndexChange"),l!==u&&a.emit("realIndexChange"),a.emit("slideChange")}else t!==d&&(a.snapIndex=t,a.emit("snapIndexChange"))},updateClickedSlide:function(e){var t=this,a=t.params,i=L(e.target).closest("."+a.slideClass)[0],s=!1;if(i)for(var r=0;r<t.slides.length;r+=1)t.slides[r]===i&&(s=!0);if(!i||!s)return t.clickedSlide=void 0,void(t.clickedIndex=void 0);t.clickedSlide=i,t.virtual&&t.params.virtual.enabled?t.clickedIndex=parseInt(L(i).attr("data-swiper-slide-index"),10):t.clickedIndex=L(i).index(),a.slideToClickedSlide&&void 0!==t.clickedIndex&&t.clickedIndex!==t.activeIndex&&t.slideToClickedSlide()}};var d={getTranslate:function(e){void 0===e&&(e=this.isHorizontal()?"x":"y");var t=this.params,a=this.rtlTranslate,i=this.translate,s=this.$wrapperEl;if(t.virtualTranslate)return a?-i:i;var r=ee.getTranslate(s[0],e);return a&&(r=-r),r||0},setTranslate:function(e,t){var a=this,i=a.rtlTranslate,s=a.params,r=a.$wrapperEl,n=a.progress,o=0,l=0;a.isHorizontal()?o=i?-e:e:l=e,s.roundLengths&&(o=Math.floor(o),l=Math.floor(l)),s.virtualTranslate||(te.transforms3d?r.transform("translate3d("+o+"px, "+l+"px, 0px)"):r.transform("translate("+o+"px, "+l+"px)")),a.previousTranslate=a.translate,a.translate=a.isHorizontal()?o:l;var d=a.maxTranslate()-a.minTranslate();(0===d?0:(e-a.minTranslate())/d)!==n&&a.updateProgress(e),a.emit("setTranslate",a.translate,t)},minTranslate:function(){return-this.snapGrid[0]},maxTranslate:function(){return-this.snapGrid[this.snapGrid.length-1]}};var p={setTransition:function(e,t){this.$wrapperEl.transition(e),this.emit("setTransition",e,t)},transitionStart:function(e,t){void 0===e&&(e=!0);var a=this,i=a.activeIndex,s=a.params,r=a.previousIndex;s.autoHeight&&a.updateAutoHeight();var n=t;if(n||(n=r<i?"next":i<r?"prev":"reset"),a.emit("transitionStart"),e&&i!==r){if("reset"===n)return void a.emit("slideResetTransitionStart");a.emit("slideChangeTransitionStart"),"next"===n?a.emit("slideNextTransitionStart"):a.emit("slidePrevTransitionStart")}},transitionEnd:function(e,t){void 0===e&&(e=!0);var a=this,i=a.activeIndex,s=a.previousIndex;a.animating=!1,a.setTransition(0);var r=t;if(r||(r=s<i?"next":i<s?"prev":"reset"),a.emit("transitionEnd"),e&&i!==s){if("reset"===r)return void a.emit("slideResetTransitionEnd");a.emit("slideChangeTransitionEnd"),"next"===r?a.emit("slideNextTransitionEnd"):a.emit("slidePrevTransitionEnd")}}};var c={slideTo:function(e,t,a,i){void 0===e&&(e=0),void 0===t&&(t=this.params.speed),void 0===a&&(a=!0);var s=this,r=e;r<0&&(r=0);var n=s.params,o=s.snapGrid,l=s.slidesGrid,d=s.previousIndex,p=s.activeIndex,c=s.rtlTranslate;if(s.animating&&n.preventInteractionOnTransition)return!1;var u=Math.floor(r/n.slidesPerGroup);u>=o.length&&(u=o.length-1),(p||n.initialSlide||0)===(d||0)&&a&&s.emit("beforeSlideChangeStart");var h,v=-o[u];if(s.updateProgress(v),n.normalizeSlideIndex)for(var f=0;f<l.length;f+=1)-Math.floor(100*v)>=Math.floor(100*l[f])&&(r=f);if(s.initialized&&r!==p){if(!s.allowSlideNext&&v<s.translate&&v<s.minTranslate())return!1;if(!s.allowSlidePrev&&v>s.translate&&v>s.maxTranslate()&&(p||0)!==r)return!1}return h=p<r?"next":r<p?"prev":"reset",c&&-v===s.translate||!c&&v===s.translate?(s.updateActiveIndex(r),n.autoHeight&&s.updateAutoHeight(),s.updateSlidesClasses(),"slide"!==n.effect&&s.setTranslate(v),"reset"!==h&&(s.transitionStart(a,h),s.transitionEnd(a,h)),!1):(0!==t&&te.transition?(s.setTransition(t),s.setTranslate(v),s.updateActiveIndex(r),s.updateSlidesClasses(),s.emit("beforeTransitionStart",t,i),s.transitionStart(a,h),s.animating||(s.animating=!0,s.onSlideToWrapperTransitionEnd||(s.onSlideToWrapperTransitionEnd=function(e){s&&!s.destroyed&&e.target===this&&(s.$wrapperEl[0].removeEventListener("transitionend",s.onSlideToWrapperTransitionEnd),s.$wrapperEl[0].removeEventListener("webkitTransitionEnd",s.onSlideToWrapperTransitionEnd),s.onSlideToWrapperTransitionEnd=null,delete s.onSlideToWrapperTransitionEnd,s.transitionEnd(a,h))}),s.$wrapperEl[0].addEventListener("transitionend",s.onSlideToWrapperTransitionEnd),s.$wrapperEl[0].addEventListener("webkitTransitionEnd",s.onSlideToWrapperTransitionEnd))):(s.setTransition(0),s.setTranslate(v),s.updateActiveIndex(r),s.updateSlidesClasses(),s.emit("beforeTransitionStart",t,i),s.transitionStart(a,h),s.transitionEnd(a,h)),!0)},slideToLoop:function(e,t,a,i){void 0===e&&(e=0),void 0===t&&(t=this.params.speed),void 0===a&&(a=!0);var s=e;return this.params.loop&&(s+=this.loopedSlides),this.slideTo(s,t,a,i)},slideNext:function(e,t,a){void 0===e&&(e=this.params.speed),void 0===t&&(t=!0);var i=this,s=i.params,r=i.animating;return s.loop?!r&&(i.loopFix(),i._clientLeft=i.$wrapperEl[0].clientLeft,i.slideTo(i.activeIndex+s.slidesPerGroup,e,t,a)):i.slideTo(i.activeIndex+s.slidesPerGroup,e,t,a)},slidePrev:function(e,t,a){void 0===e&&(e=this.params.speed),void 0===t&&(t=!0);var i=this,s=i.params,r=i.animating,n=i.snapGrid,o=i.slidesGrid,l=i.rtlTranslate;if(s.loop){if(r)return!1;i.loopFix(),i._clientLeft=i.$wrapperEl[0].clientLeft}function d(e){return e<0?-Math.floor(Math.abs(e)):Math.floor(e)}var p,c=d(l?i.translate:-i.translate),u=n.map(function(e){return d(e)}),h=(o.map(function(e){return d(e)}),n[u.indexOf(c)],n[u.indexOf(c)-1]);return void 0!==h&&(p=o.indexOf(h))<0&&(p=i.activeIndex-1),i.slideTo(p,e,t,a)},slideReset:function(e,t,a){return void 0===e&&(e=this.params.speed),void 0===t&&(t=!0),this.slideTo(this.activeIndex,e,t,a)},slideToClosest:function(e,t,a){void 0===e&&(e=this.params.speed),void 0===t&&(t=!0);var i=this,s=i.activeIndex,r=Math.floor(s/i.params.slidesPerGroup);if(r<i.snapGrid.length-1){var n=i.rtlTranslate?i.translate:-i.translate,o=i.snapGrid[r];(i.snapGrid[r+1]-o)/2<n-o&&(s=i.params.slidesPerGroup)}return i.slideTo(s,e,t,a)},slideToClickedSlide:function(){var e,t=this,a=t.params,i=t.$wrapperEl,s="auto"===a.slidesPerView?t.slidesPerViewDynamic():a.slidesPerView,r=t.clickedIndex;if(a.loop){if(t.animating)return;e=parseInt(L(t.clickedSlide).attr("data-swiper-slide-index"),10),a.centeredSlides?r<t.loopedSlides-s/2||r>t.slides.length-t.loopedSlides+s/2?(t.loopFix(),r=i.children("."+a.slideClass+'[data-swiper-slide-index="'+e+'"]:not(.'+a.slideDuplicateClass+")").eq(0).index(),ee.nextTick(function(){t.slideTo(r)})):t.slideTo(r):r>t.slides.length-s?(t.loopFix(),r=i.children("."+a.slideClass+'[data-swiper-slide-index="'+e+'"]:not(.'+a.slideDuplicateClass+")").eq(0).index(),ee.nextTick(function(){t.slideTo(r)})):t.slideTo(r)}else t.slideTo(r)}};var u={loopCreate:function(){var i=this,e=i.params,t=i.$wrapperEl;t.children("."+e.slideClass+"."+e.slideDuplicateClass).remove();var s=t.children("."+e.slideClass);if(e.loopFillGroupWithBlank){var a=e.slidesPerGroup-s.length%e.slidesPerGroup;if(a!==e.slidesPerGroup){for(var r=0;r<a;r+=1){var n=L(f.createElement("div")).addClass(e.slideClass+" "+e.slideBlankClass);t.append(n)}s=t.children("."+e.slideClass)}}"auto"!==e.slidesPerView||e.loopedSlides||(e.loopedSlides=s.length),i.loopedSlides=parseInt(e.loopedSlides||e.slidesPerView,10),i.loopedSlides+=e.loopAdditionalSlides,i.loopedSlides>s.length&&(i.loopedSlides=s.length);var o=[],l=[];s.each(function(e,t){var a=L(t);e<i.loopedSlides&&l.push(t),e<s.length&&e>=s.length-i.loopedSlides&&o.push(t),a.attr("data-swiper-slide-index",e)});for(var d=0;d<l.length;d+=1)t.append(L(l[d].cloneNode(!0)).addClass(e.slideDuplicateClass));for(var p=o.length-1;0<=p;p-=1)t.prepend(L(o[p].cloneNode(!0)).addClass(e.slideDuplicateClass))},loopFix:function(){var e,t=this,a=t.params,i=t.activeIndex,s=t.slides,r=t.loopedSlides,n=t.allowSlidePrev,o=t.allowSlideNext,l=t.snapGrid,d=t.rtlTranslate;t.allowSlidePrev=!0,t.allowSlideNext=!0;var p=-l[i]-t.getTranslate();i<r?(e=s.length-3*r+i,e+=r,t.slideTo(e,0,!1,!0)&&0!==p&&t.setTranslate((d?-t.translate:t.translate)-p)):("auto"===a.slidesPerView&&2*r<=i||i>=s.length-r)&&(e=-s.length+i+r,e+=r,t.slideTo(e,0,!1,!0)&&0!==p&&t.setTranslate((d?-t.translate:t.translate)-p));t.allowSlidePrev=n,t.allowSlideNext=o},loopDestroy:function(){var e=this.$wrapperEl,t=this.params,a=this.slides;e.children("."+t.slideClass+"."+t.slideDuplicateClass+",."+t.slideClass+"."+t.slideBlankClass).remove(),a.removeAttr("data-swiper-slide-index")}};var h={setGrabCursor:function(e){if(!(te.touch||!this.params.simulateTouch||this.params.watchOverflow&&this.isLocked)){var t=this.el;t.style.cursor="move",t.style.cursor=e?"-webkit-grabbing":"-webkit-grab",t.style.cursor=e?"-moz-grabbin":"-moz-grab",t.style.cursor=e?"grabbing":"grab"}},unsetGrabCursor:function(){te.touch||this.params.watchOverflow&&this.isLocked||(this.el.style.cursor="")}};var v={appendSlide:function(e){var t=this,a=t.$wrapperEl,i=t.params;if(i.loop&&t.loopDestroy(),"object"==typeof e&&"length"in e)for(var s=0;s<e.length;s+=1)e[s]&&a.append(e[s]);else a.append(e);i.loop&&t.loopCreate(),i.observer&&te.observer||t.update()},prependSlide:function(e){var t=this,a=t.params,i=t.$wrapperEl,s=t.activeIndex;a.loop&&t.loopDestroy();var r=s+1;if("object"==typeof e&&"length"in e){for(var n=0;n<e.length;n+=1)e[n]&&i.prepend(e[n]);r=s+e.length}else i.prepend(e);a.loop&&t.loopCreate(),a.observer&&te.observer||t.update(),t.slideTo(r,0,!1)},addSlide:function(e,t){var a=this,i=a.$wrapperEl,s=a.params,r=a.activeIndex;s.loop&&(r-=a.loopedSlides,a.loopDestroy(),a.slides=i.children("."+s.slideClass));var n=a.slides.length;if(e<=0)a.prependSlide(t);else if(n<=e)a.appendSlide(t);else{for(var o=e<r?r+1:r,l=[],d=n-1;e<=d;d-=1){var p=a.slides.eq(d);p.remove(),l.unshift(p)}if("object"==typeof t&&"length"in t){for(var c=0;c<t.length;c+=1)t[c]&&i.append(t[c]);o=e<r?r+t.length:r}else i.append(t);for(var u=0;u<l.length;u+=1)i.append(l[u]);s.loop&&a.loopCreate(),s.observer&&te.observer||a.update(),s.loop?a.slideTo(o+a.loopedSlides,0,!1):a.slideTo(o,0,!1)}},removeSlide:function(e){var t=this,a=t.params,i=t.$wrapperEl,s=t.activeIndex;a.loop&&(s-=t.loopedSlides,t.loopDestroy(),t.slides=i.children("."+a.slideClass));var r,n=s;if("object"==typeof e&&"length"in e){for(var o=0;o<e.length;o+=1)r=e[o],t.slides[r]&&t.slides.eq(r).remove(),r<n&&(n-=1);n=Math.max(n,0)}else r=e,t.slides[r]&&t.slides.eq(r).remove(),r<n&&(n-=1),n=Math.max(n,0);a.loop&&t.loopCreate(),a.observer&&te.observer||t.update(),a.loop?t.slideTo(n+t.loopedSlides,0,!1):t.slideTo(n,0,!1)},removeAllSlides:function(){for(var e=[],t=0;t<this.slides.length;t+=1)e.push(t);this.removeSlide(e)}},m=function(){var e=J.navigator.userAgent,t={ios:!1,android:!1,androidChrome:!1,desktop:!1,windows:!1,iphone:!1,ipod:!1,ipad:!1,cordova:J.cordova||J.phonegap,phonegap:J.cordova||J.phonegap},a=e.match(/(Windows Phone);?[\s\/]+([\d.]+)?/),i=e.match(/(Android);?[\s\/]+([\d.]+)?/),s=e.match(/(iPad).*OS\s([\d_]+)/),r=e.match(/(iPod)(.*OS\s([\d_]+))?/),n=!s&&e.match(/(iPhone\sOS|iOS)\s([\d_]+)/);if(a&&(t.os="windows",t.osVersion=a[2],t.windows=!0),i&&!a&&(t.os="android",t.osVersion=i[2],t.android=!0,t.androidChrome=0<=e.toLowerCase().indexOf("chrome")),(s||n||r)&&(t.os="ios",t.ios=!0),n&&!r&&(t.osVersion=n[2].replace(/_/g,"."),t.iphone=!0),s&&(t.osVersion=s[2].replace(/_/g,"."),t.ipad=!0),r&&(t.osVersion=r[3]?r[3].replace(/_/g,"."):null,t.iphone=!0),t.ios&&t.osVersion&&0<=e.indexOf("Version/")&&"10"===t.osVersion.split(".")[0]&&(t.osVersion=e.toLowerCase().split("version/")[1].split(" ")[0]),t.desktop=!(t.os||t.android||t.webView),t.webView=(n||s||r)&&e.match(/.*AppleWebKit(?!.*Safari)/i),t.os&&"ios"===t.os){var o=t.osVersion.split("."),l=f.querySelector('meta[name="viewport"]');t.minimalUi=!t.webView&&(r||n)&&(1*o[0]==7?1<=1*o[1]:7<1*o[0])&&l&&0<=l.getAttribute("content").indexOf("minimal-ui")}return t.pixelRatio=J.devicePixelRatio||1,t}();function g(){var e=this,t=e.params,a=e.el;if(!a||0!==a.offsetWidth){t.breakpoints&&e.setBreakpoint();var i=e.allowSlideNext,s=e.allowSlidePrev,r=e.snapGrid;if(e.allowSlideNext=!0,e.allowSlidePrev=!0,e.updateSize(),e.updateSlides(),t.freeMode){var n=Math.min(Math.max(e.translate,e.maxTranslate()),e.minTranslate());e.setTranslate(n),e.updateActiveIndex(),e.updateSlidesClasses(),t.autoHeight&&e.updateAutoHeight()}else e.updateSlidesClasses(),("auto"===t.slidesPerView||1<t.slidesPerView)&&e.isEnd&&!e.params.centeredSlides?e.slideTo(e.slides.length-1,0,!1,!0):e.slideTo(e.activeIndex,0,!1,!0);e.allowSlidePrev=s,e.allowSlideNext=i,e.params.watchOverflow&&r!==e.snapGrid&&e.checkOverflow()}}var b={attachEvents:function(){var e=this,t=e.params,a=e.touchEvents,i=e.el,s=e.wrapperEl;e.onTouchStart=function(e){var t=this,a=t.touchEventsData,i=t.params,s=t.touches;if(!t.animating||!i.preventInteractionOnTransition){var r=e;if(r.originalEvent&&(r=r.originalEvent),a.isTouchEvent="touchstart"===r.type,(a.isTouchEvent||!("which"in r)||3!==r.which)&&!(!a.isTouchEvent&&"button"in r&&0<r.button||a.isTouched&&a.isMoved))if(i.noSwiping&&L(r.target).closest(i.noSwipingSelector?i.noSwipingSelector:"."+i.noSwipingClass)[0])t.allowClick=!0;else if(!i.swipeHandler||L(r).closest(i.swipeHandler)[0]){s.currentX="touchstart"===r.type?r.targetTouches[0].pageX:r.pageX,s.currentY="touchstart"===r.type?r.targetTouches[0].pageY:r.pageY;var n=s.currentX,o=s.currentY,l=i.edgeSwipeDetection||i.iOSEdgeSwipeDetection,d=i.edgeSwipeThreshold||i.iOSEdgeSwipeThreshold;if(!l||!(n<=d||n>=J.screen.width-d)){if(ee.extend(a,{isTouched:!0,isMoved:!1,allowTouchCallbacks:!0,isScrolling:void 0,startMoving:void 0}),s.startX=n,s.startY=o,a.touchStartTime=ee.now(),t.allowClick=!0,t.updateSize(),t.swipeDirection=void 0,0<i.threshold&&(a.allowThresholdMove=!1),"touchstart"!==r.type){var p=!0;L(r.target).is(a.formElements)&&(p=!1),f.activeElement&&L(f.activeElement).is(a.formElements)&&f.activeElement!==r.target&&f.activeElement.blur();var c=p&&t.allowTouchMove&&i.touchStartPreventDefault;(i.touchStartForcePreventDefault||c)&&r.preventDefault()}t.emit("touchStart",r)}}}}.bind(e),e.onTouchMove=function(e){var t=this,a=t.touchEventsData,i=t.params,s=t.touches,r=t.rtlTranslate,n=e;if(n.originalEvent&&(n=n.originalEvent),a.isTouched){if(!a.isTouchEvent||"mousemove"!==n.type){var o="touchmove"===n.type?n.targetTouches[0].pageX:n.pageX,l="touchmove"===n.type?n.targetTouches[0].pageY:n.pageY;if(n.preventedByNestedSwiper)return s.startX=o,void(s.startY=l);if(!t.allowTouchMove)return t.allowClick=!1,void(a.isTouched&&(ee.extend(s,{startX:o,startY:l,currentX:o,currentY:l}),a.touchStartTime=ee.now()));if(a.isTouchEvent&&i.touchReleaseOnEdges&&!i.loop)if(t.isVertical()){if(l<s.startY&&t.translate<=t.maxTranslate()||l>s.startY&&t.translate>=t.minTranslate())return a.isTouched=!1,void(a.isMoved=!1)}else if(o<s.startX&&t.translate<=t.maxTranslate()||o>s.startX&&t.translate>=t.minTranslate())return;if(a.isTouchEvent&&f.activeElement&&n.target===f.activeElement&&L(n.target).is(a.formElements))return a.isMoved=!0,void(t.allowClick=!1);if(a.allowTouchCallbacks&&t.emit("touchMove",n),!(n.targetTouches&&1<n.targetTouches.length)){s.currentX=o,s.currentY=l;var d,p=s.currentX-s.startX,c=s.currentY-s.startY;if(!(t.params.threshold&&Math.sqrt(Math.pow(p,2)+Math.pow(c,2))<t.params.threshold))if(void 0===a.isScrolling&&(t.isHorizontal()&&s.currentY===s.startY||t.isVertical()&&s.currentX===s.startX?a.isScrolling=!1:25<=p*p+c*c&&(d=180*Math.atan2(Math.abs(c),Math.abs(p))/Math.PI,a.isScrolling=t.isHorizontal()?d>i.touchAngle:90-d>i.touchAngle)),a.isScrolling&&t.emit("touchMoveOpposite",n),void 0===a.startMoving&&(s.currentX===s.startX&&s.currentY===s.startY||(a.startMoving=!0)),a.isScrolling)a.isTouched=!1;else if(a.startMoving){t.allowClick=!1,n.preventDefault(),i.touchMoveStopPropagation&&!i.nested&&n.stopPropagation(),a.isMoved||(i.loop&&t.loopFix(),a.startTranslate=t.getTranslate(),t.setTransition(0),t.animating&&t.$wrapperEl.trigger("webkitTransitionEnd transitionend"),a.allowMomentumBounce=!1,!i.grabCursor||!0!==t.allowSlideNext&&!0!==t.allowSlidePrev||t.setGrabCursor(!0),t.emit("sliderFirstMove",n)),t.emit("sliderMove",n),a.isMoved=!0;var u=t.isHorizontal()?p:c;s.diff=u,u*=i.touchRatio,r&&(u=-u),t.swipeDirection=0<u?"prev":"next",a.currentTranslate=u+a.startTranslate;var h=!0,v=i.resistanceRatio;if(i.touchReleaseOnEdges&&(v=0),0<u&&a.currentTranslate>t.minTranslate()?(h=!1,i.resistance&&(a.currentTranslate=t.minTranslate()-1+Math.pow(-t.minTranslate()+a.startTranslate+u,v))):u<0&&a.currentTranslate<t.maxTranslate()&&(h=!1,i.resistance&&(a.currentTranslate=t.maxTranslate()+1-Math.pow(t.maxTranslate()-a.startTranslate-u,v))),h&&(n.preventedByNestedSwiper=!0),!t.allowSlideNext&&"next"===t.swipeDirection&&a.currentTranslate<a.startTranslate&&(a.currentTranslate=a.startTranslate),!t.allowSlidePrev&&"prev"===t.swipeDirection&&a.currentTranslate>a.startTranslate&&(a.currentTranslate=a.startTranslate),0<i.threshold){if(!(Math.abs(u)>i.threshold||a.allowThresholdMove))return void(a.currentTranslate=a.startTranslate);if(!a.allowThresholdMove)return a.allowThresholdMove=!0,s.startX=s.currentX,s.startY=s.currentY,a.currentTranslate=a.startTranslate,void(s.diff=t.isHorizontal()?s.currentX-s.startX:s.currentY-s.startY)}i.followFinger&&((i.freeMode||i.watchSlidesProgress||i.watchSlidesVisibility)&&(t.updateActiveIndex(),t.updateSlidesClasses()),i.freeMode&&(0===a.velocities.length&&a.velocities.push({position:s[t.isHorizontal()?"startX":"startY"],time:a.touchStartTime}),a.velocities.push({position:s[t.isHorizontal()?"currentX":"currentY"],time:ee.now()})),t.updateProgress(a.currentTranslate),t.setTranslate(a.currentTranslate))}}}}else a.startMoving&&a.isScrolling&&t.emit("touchMoveOpposite",n)}.bind(e),e.onTouchEnd=function(e){var t=this,a=t.touchEventsData,i=t.params,s=t.touches,r=t.rtlTranslate,n=t.$wrapperEl,o=t.slidesGrid,l=t.snapGrid,d=e;if(d.originalEvent&&(d=d.originalEvent),a.allowTouchCallbacks&&t.emit("touchEnd",d),a.allowTouchCallbacks=!1,!a.isTouched)return a.isMoved&&i.grabCursor&&t.setGrabCursor(!1),a.isMoved=!1,void(a.startMoving=!1);i.grabCursor&&a.isMoved&&a.isTouched&&(!0===t.allowSlideNext||!0===t.allowSlidePrev)&&t.setGrabCursor(!1);var p,c=ee.now(),u=c-a.touchStartTime;if(t.allowClick&&(t.updateClickedSlide(d),t.emit("tap",d),u<300&&300<c-a.lastClickTime&&(a.clickTimeout&&clearTimeout(a.clickTimeout),a.clickTimeout=ee.nextTick(function(){t&&!t.destroyed&&t.emit("click",d)},300)),u<300&&c-a.lastClickTime<300&&(a.clickTimeout&&clearTimeout(a.clickTimeout),t.emit("doubleTap",d))),a.lastClickTime=ee.now(),ee.nextTick(function(){t.destroyed||(t.allowClick=!0)}),!a.isTouched||!a.isMoved||!t.swipeDirection||0===s.diff||a.currentTranslate===a.startTranslate)return a.isTouched=!1,a.isMoved=!1,void(a.startMoving=!1);if(a.isTouched=!1,a.isMoved=!1,a.startMoving=!1,p=i.followFinger?r?t.translate:-t.translate:-a.currentTranslate,i.freeMode){if(p<-t.minTranslate())return void t.slideTo(t.activeIndex);if(p>-t.maxTranslate())return void(t.slides.length<l.length?t.slideTo(l.length-1):t.slideTo(t.slides.length-1));if(i.freeModeMomentum){if(1<a.velocities.length){var h=a.velocities.pop(),v=a.velocities.pop(),f=h.position-v.position,m=h.time-v.time;t.velocity=f/m,t.velocity/=2,Math.abs(t.velocity)<i.freeModeMinimumVelocity&&(t.velocity=0),(150<m||300<ee.now()-h.time)&&(t.velocity=0)}else t.velocity=0;t.velocity*=i.freeModeMomentumVelocityRatio,a.velocities.length=0;var g=1e3*i.freeModeMomentumRatio,b=t.velocity*g,w=t.translate+b;r&&(w=-w);var y,x,T=!1,E=20*Math.abs(t.velocity)*i.freeModeMomentumBounceRatio;if(w<t.maxTranslate())i.freeModeMomentumBounce?(w+t.maxTranslate()<-E&&(w=t.maxTranslate()-E),y=t.maxTranslate(),T=!0,a.allowMomentumBounce=!0):w=t.maxTranslate(),i.loop&&i.centeredSlides&&(x=!0);else if(w>t.minTranslate())i.freeModeMomentumBounce?(w-t.minTranslate()>E&&(w=t.minTranslate()+E),y=t.minTranslate(),T=!0,a.allowMomentumBounce=!0):w=t.minTranslate(),i.loop&&i.centeredSlides&&(x=!0);else if(i.freeModeSticky){for(var S,C=0;C<l.length;C+=1)if(l[C]>-w){S=C;break}w=-(w=Math.abs(l[S]-w)<Math.abs(l[S-1]-w)||"next"===t.swipeDirection?l[S]:l[S-1])}if(x&&t.once("transitionEnd",function(){t.loopFix()}),0!==t.velocity)g=r?Math.abs((-w-t.translate)/t.velocity):Math.abs((w-t.translate)/t.velocity);else if(i.freeModeSticky)return void t.slideToClosest();i.freeModeMomentumBounce&&T?(t.updateProgress(y),t.setTransition(g),t.setTranslate(w),t.transitionStart(!0,t.swipeDirection),t.animating=!0,n.transitionEnd(function(){t&&!t.destroyed&&a.allowMomentumBounce&&(t.emit("momentumBounce"),t.setTransition(i.speed),t.setTranslate(y),n.transitionEnd(function(){t&&!t.destroyed&&t.transitionEnd()}))})):t.velocity?(t.updateProgress(w),t.setTransition(g),t.setTranslate(w),t.transitionStart(!0,t.swipeDirection),t.animating||(t.animating=!0,n.transitionEnd(function(){t&&!t.destroyed&&t.transitionEnd()}))):t.updateProgress(w),t.updateActiveIndex(),t.updateSlidesClasses()}else if(i.freeModeSticky)return void t.slideToClosest();(!i.freeModeMomentum||u>=i.longSwipesMs)&&(t.updateProgress(),t.updateActiveIndex(),t.updateSlidesClasses())}else{for(var M=0,k=t.slidesSizesGrid[0],P=0;P<o.length;P+=i.slidesPerGroup)void 0!==o[P+i.slidesPerGroup]?p>=o[P]&&p<o[P+i.slidesPerGroup]&&(k=o[(M=P)+i.slidesPerGroup]-o[P]):p>=o[P]&&(M=P,k=o[o.length-1]-o[o.length-2]);var z=(p-o[M])/k;if(u>i.longSwipesMs){if(!i.longSwipes)return void t.slideTo(t.activeIndex);"next"===t.swipeDirection&&(z>=i.longSwipesRatio?t.slideTo(M+i.slidesPerGroup):t.slideTo(M)),"prev"===t.swipeDirection&&(z>1-i.longSwipesRatio?t.slideTo(M+i.slidesPerGroup):t.slideTo(M))}else{if(!i.shortSwipes)return void t.slideTo(t.activeIndex);"next"===t.swipeDirection&&t.slideTo(M+i.slidesPerGroup),"prev"===t.swipeDirection&&t.slideTo(M)}}}.bind(e),e.onClick=function(e){this.allowClick||(this.params.preventClicks&&e.preventDefault(),this.params.preventClicksPropagation&&this.animating&&(e.stopPropagation(),e.stopImmediatePropagation()))}.bind(e);var r="container"===t.touchEventsTarget?i:s,n=!!t.nested;if(te.touch||!te.pointerEvents&&!te.prefixedPointerEvents){if(te.touch){var o=!("touchstart"!==a.start||!te.passiveListener||!t.passiveListeners)&&{passive:!0,capture:!1};r.addEventListener(a.start,e.onTouchStart,o),r.addEventListener(a.move,e.onTouchMove,te.passiveListener?{passive:!1,capture:n}:n),r.addEventListener(a.end,e.onTouchEnd,o)}(t.simulateTouch&&!m.ios&&!m.android||t.simulateTouch&&!te.touch&&m.ios)&&(r.addEventListener("mousedown",e.onTouchStart,!1),f.addEventListener("mousemove",e.onTouchMove,n),f.addEventListener("mouseup",e.onTouchEnd,!1))}else r.addEventListener(a.start,e.onTouchStart,!1),f.addEventListener(a.move,e.onTouchMove,n),f.addEventListener(a.end,e.onTouchEnd,!1);(t.preventClicks||t.preventClicksPropagation)&&r.addEventListener("click",e.onClick,!0),e.on(m.ios||m.android?"resize orientationchange observerUpdate":"resize observerUpdate",g,!0)},detachEvents:function(){var e=this,t=e.params,a=e.touchEvents,i=e.el,s=e.wrapperEl,r="container"===t.touchEventsTarget?i:s,n=!!t.nested;if(te.touch||!te.pointerEvents&&!te.prefixedPointerEvents){if(te.touch){var o=!("onTouchStart"!==a.start||!te.passiveListener||!t.passiveListeners)&&{passive:!0,capture:!1};r.removeEventListener(a.start,e.onTouchStart,o),r.removeEventListener(a.move,e.onTouchMove,n),r.removeEventListener(a.end,e.onTouchEnd,o)}(t.simulateTouch&&!m.ios&&!m.android||t.simulateTouch&&!te.touch&&m.ios)&&(r.removeEventListener("mousedown",e.onTouchStart,!1),f.removeEventListener("mousemove",e.onTouchMove,n),f.removeEventListener("mouseup",e.onTouchEnd,!1))}else r.removeEventListener(a.start,e.onTouchStart,!1),f.removeEventListener(a.move,e.onTouchMove,n),f.removeEventListener(a.end,e.onTouchEnd,!1);(t.preventClicks||t.preventClicksPropagation)&&r.removeEventListener("click",e.onClick,!0),e.off(m.ios||m.android?"resize orientationchange observerUpdate":"resize observerUpdate",g)}};var w,y={setBreakpoint:function(){var e=this,t=e.activeIndex,a=e.initialized,i=e.loopedSlides;void 0===i&&(i=0);var s=e.params,r=s.breakpoints;if(r&&(!r||0!==Object.keys(r).length)){var n=e.getBreakpoint(r);if(n&&e.currentBreakpoint!==n){var o=n in r?r[n]:void 0;o&&["slidesPerView","spaceBetween","slidesPerGroup"].forEach(function(e){var t=o[e];void 0!==t&&(o[e]="slidesPerView"!==e||"AUTO"!==t&&"auto"!==t?"slidesPerView"===e?parseFloat(t):parseInt(t,10):"auto")});var l=o||e.originalParams,d=s.loop&&l.slidesPerView!==s.slidesPerView;ee.extend(e.params,l),ee.extend(e,{allowTouchMove:e.params.allowTouchMove,allowSlideNext:e.params.allowSlideNext,allowSlidePrev:e.params.allowSlidePrev}),e.currentBreakpoint=n,d&&a&&(e.loopDestroy(),e.loopCreate(),e.updateSlides(),e.slideTo(t-i+e.loopedSlides,0,!1)),e.emit("breakpoint",l)}}},getBreakpoint:function(e){if(e){var t=!1,a=[];Object.keys(e).forEach(function(e){a.push(e)}),a.sort(function(e,t){return parseInt(e,10)-parseInt(t,10)});for(var i=0;i<a.length;i+=1){var s=a[i];this.params.breakpointsInverse?s<=J.innerWidth&&(t=s):s>=J.innerWidth&&!t&&(t=s)}return t||"max"}}},I={isIE:!!J.navigator.userAgent.match(/Trident/g)||!!J.navigator.userAgent.match(/MSIE/g),isEdge:!!J.navigator.userAgent.match(/Edge/g),isSafari:(w=J.navigator.userAgent.toLowerCase(),0<=w.indexOf("safari")&&w.indexOf("chrome")<0&&w.indexOf("android")<0),isUiWebView:/(iPhone|iPod|iPad).*AppleWebKit(?!.*Safari)/i.test(J.navigator.userAgent)};var x={init:!0,direction:"horizontal",touchEventsTarget:"container",initialSlide:0,speed:300,preventInteractionOnTransition:!1,edgeSwipeDetection:!1,edgeSwipeThreshold:20,freeMode:!1,freeModeMomentum:!0,freeModeMomentumRatio:1,freeModeMomentumBounce:!0,freeModeMomentumBounceRatio:1,freeModeMomentumVelocityRatio:1,freeModeSticky:!1,freeModeMinimumVelocity:.02,autoHeight:!1,setWrapperSize:!1,virtualTranslate:!1,effect:"slide",breakpoints:void 0,breakpointsInverse:!1,spaceBetween:0,slidesPerView:1,slidesPerColumn:1,slidesPerColumnFill:"column",slidesPerGroup:1,centeredSlides:!1,slidesOffsetBefore:0,slidesOffsetAfter:0,normalizeSlideIndex:!0,centerInsufficientSlides:!1,watchOverflow:!1,roundLengths:!1,touchRatio:1,touchAngle:45,simulateTouch:!0,shortSwipes:!0,longSwipes:!0,longSwipesRatio:.5,longSwipesMs:300,followFinger:!0,allowTouchMove:!0,threshold:0,touchMoveStopPropagation:!0,touchStartPreventDefault:!0,touchStartForcePreventDefault:!1,touchReleaseOnEdges:!1,uniqueNavElements:!0,resistance:!0,resistanceRatio:.85,watchSlidesProgress:!1,watchSlidesVisibility:!1,grabCursor:!1,preventClicks:!0,preventClicksPropagation:!0,slideToClickedSlide:!1,preloadImages:!0,updateOnImagesReady:!0,loop:!1,loopAdditionalSlides:0,loopedSlides:null,loopFillGroupWithBlank:!1,allowSlidePrev:!0,allowSlideNext:!0,swipeHandler:null,noSwiping:!0,noSwipingClass:"swiper-no-swiping",noSwipingSelector:null,passiveListeners:!0,containerModifierClass:"swiper-container-",slideClass:"swiper-slide",slideBlankClass:"swiper-slide-invisible-blank",slideActiveClass:"swiper-slide-active",slideDuplicateActiveClass:"swiper-slide-duplicate-active",slideVisibleClass:"swiper-slide-visible",slideDuplicateClass:"swiper-slide-duplicate",slideNextClass:"swiper-slide-next",slideDuplicateNextClass:"swiper-slide-duplicate-next",slidePrevClass:"swiper-slide-prev",slideDuplicatePrevClass:"swiper-slide-duplicate-prev",wrapperClass:"swiper-wrapper",runCallbacksOnInit:!0},T={update:o,translate:d,transition:p,slide:c,loop:u,grabCursor:h,manipulation:v,events:b,breakpoints:y,checkOverflow:{checkOverflow:function(){var e=this,t=e.isLocked;e.isLocked=1===e.snapGrid.length,e.allowSlideNext=!e.isLocked,e.allowSlidePrev=!e.isLocked,t!==e.isLocked&&e.emit(e.isLocked?"lock":"unlock"),t&&t!==e.isLocked&&(e.isEnd=!1,e.navigation.update())}},classes:{addClasses:function(){var t=this.classNames,a=this.params,e=this.rtl,i=this.$el,s=[];s.push(a.direction),a.freeMode&&s.push("free-mode"),te.flexbox||s.push("no-flexbox"),a.autoHeight&&s.push("autoheight"),e&&s.push("rtl"),1<a.slidesPerColumn&&s.push("multirow"),m.android&&s.push("android"),m.ios&&s.push("ios"),(I.isIE||I.isEdge)&&(te.pointerEvents||te.prefixedPointerEvents)&&s.push("wp8-"+a.direction),s.forEach(function(e){t.push(a.containerModifierClass+e)}),i.addClass(t.join(" "))},removeClasses:function(){var e=this.$el,t=this.classNames;e.removeClass(t.join(" "))}},images:{loadImage:function(e,t,a,i,s,r){var n;function o(){r&&r()}e.complete&&s?o():t?((n=new J.Image).onload=o,n.onerror=o,i&&(n.sizes=i),a&&(n.srcset=a),t&&(n.src=t)):o()},preloadImages:function(){var e=this;function t(){null!=e&&e&&!e.destroyed&&(void 0!==e.imagesLoaded&&(e.imagesLoaded+=1),e.imagesLoaded===e.imagesToLoad.length&&(e.params.updateOnImagesReady&&e.update(),e.emit("imagesReady")))}e.imagesToLoad=e.$el.find("img");for(var a=0;a<e.imagesToLoad.length;a+=1){var i=e.imagesToLoad[a];e.loadImage(i,i.currentSrc||i.getAttribute("src"),i.srcset||i.getAttribute("srcset"),i.sizes||i.getAttribute("sizes"),!0,t)}}}},E={},S=function(u){function h(){for(var e,t,s,a=[],i=arguments.length;i--;)a[i]=arguments[i];1===a.length&&a[0].constructor&&a[0].constructor===Object?s=a[0]:(t=(e=a)[0],s=e[1]),s||(s={}),s=ee.extend({},s),t&&!s.el&&(s.el=t),u.call(this,s),Object.keys(T).forEach(function(t){Object.keys(T[t]).forEach(function(e){h.prototype[e]||(h.prototype[e]=T[t][e])})});var r=this;void 0===r.modules&&(r.modules={}),Object.keys(r.modules).forEach(function(e){var t=r.modules[e];if(t.params){var a=Object.keys(t.params)[0],i=t.params[a];if("object"!=typeof i||null===i)return;if(!(a in s&&"enabled"in i))return;!0===s[a]&&(s[a]={enabled:!0}),"object"!=typeof s[a]||"enabled"in s[a]||(s[a].enabled=!0),s[a]||(s[a]={enabled:!1})}});var n=ee.extend({},x);r.useModulesParams(n),r.params=ee.extend({},n,E,s),r.originalParams=ee.extend({},r.params),r.passedParams=ee.extend({},s);var o=(r.$=L)(r.params.el);if(t=o[0]){if(1<o.length){var l=[];return o.each(function(e,t){var a=ee.extend({},s,{el:t});l.push(new h(a))}),l}t.swiper=r,o.data("swiper",r);var d,p,c=o.children("."+r.params.wrapperClass);return ee.extend(r,{$el:o,el:t,$wrapperEl:c,wrapperEl:c[0],classNames:[],slides:L(),slidesGrid:[],snapGrid:[],slidesSizesGrid:[],isHorizontal:function(){return"horizontal"===r.params.direction},isVertical:function(){return"vertical"===r.params.direction},rtl:"rtl"===t.dir.toLowerCase()||"rtl"===o.css("direction"),rtlTranslate:"horizontal"===r.params.direction&&("rtl"===t.dir.toLowerCase()||"rtl"===o.css("direction")),wrongRTL:"-webkit-box"===c.css("display"),activeIndex:0,realIndex:0,isBeginning:!0,isEnd:!1,translate:0,previousTranslate:0,progress:0,velocity:0,animating:!1,allowSlideNext:r.params.allowSlideNext,allowSlidePrev:r.params.allowSlidePrev,touchEvents:(d=["touchstart","touchmove","touchend"],p=["mousedown","mousemove","mouseup"],te.pointerEvents?p=["pointerdown","pointermove","pointerup"]:te.prefixedPointerEvents&&(p=["MSPointerDown","MSPointerMove","MSPointerUp"]),r.touchEventsTouch={start:d[0],move:d[1],end:d[2]},r.touchEventsDesktop={start:p[0],move:p[1],end:p[2]},te.touch||!r.params.simulateTouch?r.touchEventsTouch:r.touchEventsDesktop),touchEventsData:{isTouched:void 0,isMoved:void 0,allowTouchCallbacks:void 0,touchStartTime:void 0,isScrolling:void 0,currentTranslate:void 0,startTranslate:void 0,allowThresholdMove:void 0,formElements:"input, select, option, textarea, button, video",lastClickTime:ee.now(),clickTimeout:void 0,velocities:[],allowMomentumBounce:void 0,isTouchEvent:void 0,startMoving:void 0},allowClick:!0,allowTouchMove:r.params.allowTouchMove,touches:{startX:0,startY:0,currentX:0,currentY:0,diff:0},imagesToLoad:[],imagesLoaded:0}),r.useModules(),r.params.init&&r.init(),r}}u&&(h.__proto__=u);var e={extendedDefaults:{configurable:!0},defaults:{configurable:!0},Class:{configurable:!0},$:{configurable:!0}};return((h.prototype=Object.create(u&&u.prototype)).constructor=h).prototype.slidesPerViewDynamic=function(){var e=this,t=e.params,a=e.slides,i=e.slidesGrid,s=e.size,r=e.activeIndex,n=1;if(t.centeredSlides){for(var o,l=a[r].swiperSlideSize,d=r+1;d<a.length;d+=1)a[d]&&!o&&(n+=1,s<(l+=a[d].swiperSlideSize)&&(o=!0));for(var p=r-1;0<=p;p-=1)a[p]&&!o&&(n+=1,s<(l+=a[p].swiperSlideSize)&&(o=!0))}else for(var c=r+1;c<a.length;c+=1)i[c]-i[r]<s&&(n+=1);return n},h.prototype.update=function(){var a=this;if(a&&!a.destroyed){var e=a.snapGrid,t=a.params;t.breakpoints&&a.setBreakpoint(),a.updateSize(),a.updateSlides(),a.updateProgress(),a.updateSlidesClasses(),a.params.freeMode?(i(),a.params.autoHeight&&a.updateAutoHeight()):(("auto"===a.params.slidesPerView||1<a.params.slidesPerView)&&a.isEnd&&!a.params.centeredSlides?a.slideTo(a.slides.length-1,0,!1,!0):a.slideTo(a.activeIndex,0,!1,!0))||i(),t.watchOverflow&&e!==a.snapGrid&&a.checkOverflow(),a.emit("update")}function i(){var e=a.rtlTranslate?-1*a.translate:a.translate,t=Math.min(Math.max(e,a.maxTranslate()),a.minTranslate());a.setTranslate(t),a.updateActiveIndex(),a.updateSlidesClasses()}},h.prototype.init=function(){var e=this;e.initialized||(e.emit("beforeInit"),e.params.breakpoints&&e.setBreakpoint(),e.addClasses(),e.params.loop&&e.loopCreate(),e.updateSize(),e.updateSlides(),e.params.watchOverflow&&e.checkOverflow(),e.params.grabCursor&&e.setGrabCursor(),e.params.preloadImages&&e.preloadImages(),e.params.loop?e.slideTo(e.params.initialSlide+e.loopedSlides,0,e.params.runCallbacksOnInit):e.slideTo(e.params.initialSlide,0,e.params.runCallbacksOnInit),e.attachEvents(),e.initialized=!0,e.emit("init"))},h.prototype.destroy=function(e,t){void 0===e&&(e=!0),void 0===t&&(t=!0);var a=this,i=a.params,s=a.$el,r=a.$wrapperEl,n=a.slides;return void 0===a.params||a.destroyed||(a.emit("beforeDestroy"),a.initialized=!1,a.detachEvents(),i.loop&&a.loopDestroy(),t&&(a.removeClasses(),s.removeAttr("style"),r.removeAttr("style"),n&&n.length&&n.removeClass([i.slideVisibleClass,i.slideActiveClass,i.slideNextClass,i.slidePrevClass].join(" ")).removeAttr("style").removeAttr("data-swiper-slide-index").removeAttr("data-swiper-column").removeAttr("data-swiper-row")),a.emit("destroy"),Object.keys(a.eventsListeners).forEach(function(e){a.off(e)}),!1!==e&&(a.$el[0].swiper=null,a.$el.data("swiper",null),ee.deleteProps(a)),a.destroyed=!0),null},h.extendDefaults=function(e){ee.extend(E,e)},e.extendedDefaults.get=function(){return E},e.defaults.get=function(){return x},e.Class.get=function(){return u},e.$.get=function(){return L},Object.defineProperties(h,e),h}(s),C={name:"device",proto:{device:m},static:{device:m}},M={name:"support",proto:{support:te},static:{support:te}},k={name:"browser",proto:{browser:I},static:{browser:I}},P={name:"resize",create:function(){var e=this;ee.extend(e,{resize:{resizeHandler:function(){e&&!e.destroyed&&e.initialized&&(e.emit("beforeResize"),e.emit("resize"))},orientationChangeHandler:function(){e&&!e.destroyed&&e.initialized&&e.emit("orientationchange")}}})},on:{init:function(){J.addEventListener("resize",this.resize.resizeHandler),J.addEventListener("orientationchange",this.resize.orientationChangeHandler)},destroy:function(){J.removeEventListener("resize",this.resize.resizeHandler),J.removeEventListener("orientationchange",this.resize.orientationChangeHandler)}}},z={func:J.MutationObserver||J.WebkitMutationObserver,attach:function(e,t){void 0===t&&(t={});var a=this,i=new z.func(function(e){if(1!==e.length){var t=function(){a.emit("observerUpdate",e[0])};J.requestAnimationFrame?J.requestAnimationFrame(t):J.setTimeout(t,0)}else a.emit("observerUpdate",e[0])});i.observe(e,{attributes:void 0===t.attributes||t.attributes,childList:void 0===t.childList||t.childList,characterData:void 0===t.characterData||t.characterData}),a.observer.observers.push(i)},init:function(){var e=this;if(te.observer&&e.params.observer){if(e.params.observeParents)for(var t=e.$el.parents(),a=0;a<t.length;a+=1)e.observer.attach(t[a]);e.observer.attach(e.$el[0],{childList:e.params.observeSlideChildren}),e.observer.attach(e.$wrapperEl[0],{attributes:!1})}},destroy:function(){this.observer.observers.forEach(function(e){e.disconnect()}),this.observer.observers=[]}},$={name:"observer",params:{observer:!1,observeParents:!1,observeSlideChildren:!1},create:function(){ee.extend(this,{observer:{init:z.init.bind(this),attach:z.attach.bind(this),destroy:z.destroy.bind(this),observers:[]}})},on:{init:function(){this.observer.init()},destroy:function(){this.observer.destroy()}}},D={update:function(e){var t=this,a=t.params,i=a.slidesPerView,s=a.slidesPerGroup,r=a.centeredSlides,n=t.params.virtual,o=n.addSlidesBefore,l=n.addSlidesAfter,d=t.virtual,p=d.from,c=d.to,u=d.slides,h=d.slidesGrid,v=d.renderSlide,f=d.offset;t.updateActiveIndex();var m,g,b,w=t.activeIndex||0;m=t.rtlTranslate?"right":t.isHorizontal()?"left":"top",r?(g=Math.floor(i/2)+s+o,b=Math.floor(i/2)+s+l):(g=i+(s-1)+o,b=s+l);var y=Math.max((w||0)-b,0),x=Math.min((w||0)+g,u.length-1),T=(t.slidesGrid[y]||0)-(t.slidesGrid[0]||0);function E(){t.updateSlides(),t.updateProgress(),t.updateSlidesClasses(),t.lazy&&t.params.lazy.enabled&&t.lazy.load()}if(ee.extend(t.virtual,{from:y,to:x,offset:T,slidesGrid:t.slidesGrid}),p===y&&c===x&&!e)return t.slidesGrid!==h&&T!==f&&t.slides.css(m,T+"px"),void t.updateProgress();if(t.params.virtual.renderExternal)return t.params.virtual.renderExternal.call(t,{offset:T,from:y,to:x,slides:function(){for(var e=[],t=y;t<=x;t+=1)e.push(u[t]);return e}()}),void E();var S=[],C=[];if(e)t.$wrapperEl.find("."+t.params.slideClass).remove();else for(var M=p;M<=c;M+=1)(M<y||x<M)&&t.$wrapperEl.find("."+t.params.slideClass+'[data-swiper-slide-index="'+M+'"]').remove();for(var k=0;k<u.length;k+=1)y<=k&&k<=x&&(void 0===c||e?C.push(k):(c<k&&C.push(k),k<p&&S.push(k)));C.forEach(function(e){t.$wrapperEl.append(v(u[e],e))}),S.sort(function(e,t){return t-e}).forEach(function(e){t.$wrapperEl.prepend(v(u[e],e))}),t.$wrapperEl.children(".swiper-slide").css(m,T+"px"),E()},renderSlide:function(e,t){var a=this,i=a.params.virtual;if(i.cache&&a.virtual.cache[t])return a.virtual.cache[t];var s=i.renderSlide?L(i.renderSlide.call(a,e,t)):L('<div class="'+a.params.slideClass+'" data-swiper-slide-index="'+t+'">'+e+"</div>");return s.attr("data-swiper-slide-index")||s.attr("data-swiper-slide-index",t),i.cache&&(a.virtual.cache[t]=s),s},appendSlide:function(e){this.virtual.slides.push(e),this.virtual.update(!0)},prependSlide:function(e){var t=this;if(t.virtual.slides.unshift(e),t.params.virtual.cache){var a=t.virtual.cache,i={};Object.keys(a).forEach(function(e){i[e+1]=a[e]}),t.virtual.cache=i}t.virtual.update(!0),t.slideNext(0)}},O={name:"virtual",params:{virtual:{enabled:!1,slides:[],cache:!0,renderSlide:null,renderExternal:null,addSlidesBefore:0,addSlidesAfter:0}},create:function(){var e=this;ee.extend(e,{virtual:{update:D.update.bind(e),appendSlide:D.appendSlide.bind(e),prependSlide:D.prependSlide.bind(e),renderSlide:D.renderSlide.bind(e),slides:e.params.virtual.slides,cache:{}}})},on:{beforeInit:function(){var e=this;if(e.params.virtual.enabled){e.classNames.push(e.params.containerModifierClass+"virtual");var t={watchSlidesProgress:!0};ee.extend(e.params,t),ee.extend(e.originalParams,t),e.params.initialSlide||e.virtual.update()}},setTranslate:function(){this.params.virtual.enabled&&this.virtual.update()}}},A={handle:function(e){var t=this,a=t.rtlTranslate,i=e;i.originalEvent&&(i=i.originalEvent);var s=i.keyCode||i.charCode;if(!t.allowSlideNext&&(t.isHorizontal()&&39===s||t.isVertical()&&40===s))return!1;if(!t.allowSlidePrev&&(t.isHorizontal()&&37===s||t.isVertical()&&38===s))return!1;if(!(i.shiftKey||i.altKey||i.ctrlKey||i.metaKey||f.activeElement&&f.activeElement.nodeName&&("input"===f.activeElement.nodeName.toLowerCase()||"textarea"===f.activeElement.nodeName.toLowerCase()))){if(t.params.keyboard.onlyInViewport&&(37===s||39===s||38===s||40===s)){var r=!1;if(0<t.$el.parents("."+t.params.slideClass).length&&0===t.$el.parents("."+t.params.slideActiveClass).length)return;var n=J.innerWidth,o=J.innerHeight,l=t.$el.offset();a&&(l.left-=t.$el[0].scrollLeft);for(var d=[[l.left,l.top],[l.left+t.width,l.top],[l.left,l.top+t.height],[l.left+t.width,l.top+t.height]],p=0;p<d.length;p+=1){var c=d[p];0<=c[0]&&c[0]<=n&&0<=c[1]&&c[1]<=o&&(r=!0)}if(!r)return}t.isHorizontal()?(37!==s&&39!==s||(i.preventDefault?i.preventDefault():i.returnValue=!1),(39===s&&!a||37===s&&a)&&t.slideNext(),(37===s&&!a||39===s&&a)&&t.slidePrev()):(38!==s&&40!==s||(i.preventDefault?i.preventDefault():i.returnValue=!1),40===s&&t.slideNext(),38===s&&t.slidePrev()),t.emit("keyPress",s)}},enable:function(){this.keyboard.enabled||(L(f).on("keydown",this.keyboard.handle),this.keyboard.enabled=!0)},disable:function(){this.keyboard.enabled&&(L(f).off("keydown",this.keyboard.handle),this.keyboard.enabled=!1)}},N={name:"keyboard",params:{keyboard:{enabled:!1,onlyInViewport:!0}},create:function(){ee.extend(this,{keyboard:{enabled:!1,enable:A.enable.bind(this),disable:A.disable.bind(this),handle:A.handle.bind(this)}})},on:{init:function(){this.params.keyboard.enabled&&this.keyboard.enable()},destroy:function(){this.keyboard.enabled&&this.keyboard.disable()}}};var H={lastScrollTime:ee.now(),event:-1<J.navigator.userAgent.indexOf("firefox")?"DOMMouseScroll":function(){var e="onwheel",t=e in f;if(!t){var a=f.createElement("div");a.setAttribute(e,"return;"),t="function"==typeof a[e]}return!t&&f.implementation&&f.implementation.hasFeature&&!0!==f.implementation.hasFeature("","")&&(t=f.implementation.hasFeature("Events.wheel","3.0")),t}()?"wheel":"mousewheel",normalize:function(e){var t=0,a=0,i=0,s=0;return"detail"in e&&(a=e.detail),"wheelDelta"in e&&(a=-e.wheelDelta/120),"wheelDeltaY"in e&&(a=-e.wheelDeltaY/120),"wheelDeltaX"in e&&(t=-e.wheelDeltaX/120),"axis"in e&&e.axis===e.HORIZONTAL_AXIS&&(t=a,a=0),i=10*t,s=10*a,"deltaY"in e&&(s=e.deltaY),"deltaX"in e&&(i=e.deltaX),(i||s)&&e.deltaMode&&(1===e.deltaMode?(i*=40,s*=40):(i*=800,s*=800)),i&&!t&&(t=i<1?-1:1),s&&!a&&(a=s<1?-1:1),{spinX:t,spinY:a,pixelX:i,pixelY:s}},handleMouseEnter:function(){this.mouseEntered=!0},handleMouseLeave:function(){this.mouseEntered=!1},handle:function(e){var t=e,a=this,i=a.params.mousewheel;if(!a.mouseEntered&&!i.releaseOnEdges)return!0;t.originalEvent&&(t=t.originalEvent);var s=0,r=a.rtlTranslate?-1:1,n=H.normalize(t);if(i.forceToAxis)if(a.isHorizontal()){if(!(Math.abs(n.pixelX)>Math.abs(n.pixelY)))return!0;s=n.pixelX*r}else{if(!(Math.abs(n.pixelY)>Math.abs(n.pixelX)))return!0;s=n.pixelY}else s=Math.abs(n.pixelX)>Math.abs(n.pixelY)?-n.pixelX*r:-n.pixelY;if(0===s)return!0;if(i.invert&&(s=-s),a.params.freeMode){a.params.loop&&a.loopFix();var o=a.getTranslate()+s*i.sensitivity,l=a.isBeginning,d=a.isEnd;if(o>=a.minTranslate()&&(o=a.minTranslate()),o<=a.maxTranslate()&&(o=a.maxTranslate()),a.setTransition(0),a.setTranslate(o),a.updateProgress(),a.updateActiveIndex(),a.updateSlidesClasses(),(!l&&a.isBeginning||!d&&a.isEnd)&&a.updateSlidesClasses(),a.params.freeModeSticky&&(clearTimeout(a.mousewheel.timeout),a.mousewheel.timeout=ee.nextTick(function(){a.slideToClosest()},300)),a.emit("scroll",t),a.params.autoplay&&a.params.autoplayDisableOnInteraction&&a.autoplay.stop(),o===a.minTranslate()||o===a.maxTranslate())return!0}else{if(60<ee.now()-a.mousewheel.lastScrollTime)if(s<0)if(a.isEnd&&!a.params.loop||a.animating){if(i.releaseOnEdges)return!0}else a.slideNext(),a.emit("scroll",t);else if(a.isBeginning&&!a.params.loop||a.animating){if(i.releaseOnEdges)return!0}else a.slidePrev(),a.emit("scroll",t);a.mousewheel.lastScrollTime=(new J.Date).getTime()}return t.preventDefault?t.preventDefault():t.returnValue=!1,!1},enable:function(){var e=this;if(!H.event)return!1;if(e.mousewheel.enabled)return!1;var t=e.$el;return"container"!==e.params.mousewheel.eventsTarged&&(t=L(e.params.mousewheel.eventsTarged)),t.on("mouseenter",e.mousewheel.handleMouseEnter),t.on("mouseleave",e.mousewheel.handleMouseLeave),t.on(H.event,e.mousewheel.handle),e.mousewheel.enabled=!0},disable:function(){var e=this;if(!H.event)return!1;if(!e.mousewheel.enabled)return!1;var t=e.$el;return"container"!==e.params.mousewheel.eventsTarged&&(t=L(e.params.mousewheel.eventsTarged)),t.off(H.event,e.mousewheel.handle),!(e.mousewheel.enabled=!1)}},G={update:function(){var e=this,t=e.params.navigation;if(!e.params.loop){var a=e.navigation,i=a.$nextEl,s=a.$prevEl;s&&0<s.length&&(e.isBeginning?s.addClass(t.disabledClass):s.removeClass(t.disabledClass),s[e.params.watchOverflow&&e.isLocked?"addClass":"removeClass"](t.lockClass)),i&&0<i.length&&(e.isEnd?i.addClass(t.disabledClass):i.removeClass(t.disabledClass),i[e.params.watchOverflow&&e.isLocked?"addClass":"removeClass"](t.lockClass))}},onPrevClick:function(e){e.preventDefault(),this.isBeginning&&!this.params.loop||this.slidePrev()},onNextClick:function(e){e.preventDefault(),this.isEnd&&!this.params.loop||this.slideNext()},init:function(){var e,t,a=this,i=a.params.navigation;(i.nextEl||i.prevEl)&&(i.nextEl&&(e=L(i.nextEl),a.params.uniqueNavElements&&"string"==typeof i.nextEl&&1<e.length&&1===a.$el.find(i.nextEl).length&&(e=a.$el.find(i.nextEl))),i.prevEl&&(t=L(i.prevEl),a.params.uniqueNavElements&&"string"==typeof i.prevEl&&1<t.length&&1===a.$el.find(i.prevEl).length&&(t=a.$el.find(i.prevEl))),e&&0<e.length&&e.on("click",a.navigation.onNextClick),t&&0<t.length&&t.on("click",a.navigation.onPrevClick),ee.extend(a.navigation,{$nextEl:e,nextEl:e&&e[0],$prevEl:t,prevEl:t&&t[0]}))},destroy:function(){var e=this,t=e.navigation,a=t.$nextEl,i=t.$prevEl;a&&a.length&&(a.off("click",e.navigation.onNextClick),a.removeClass(e.params.navigation.disabledClass)),i&&i.length&&(i.off("click",e.navigation.onPrevClick),i.removeClass(e.params.navigation.disabledClass))}},B={update:function(){var e=this,t=e.rtl,s=e.params.pagination;if(s.el&&e.pagination.el&&e.pagination.$el&&0!==e.pagination.$el.length){var r,a=e.virtual&&e.params.virtual.enabled?e.virtual.slides.length:e.slides.length,i=e.pagination.$el,n=e.params.loop?Math.ceil((a-2*e.loopedSlides)/e.params.slidesPerGroup):e.snapGrid.length;if(e.params.loop?((r=Math.ceil((e.activeIndex-e.loopedSlides)/e.params.slidesPerGroup))>a-1-2*e.loopedSlides&&(r-=a-2*e.loopedSlides),n-1<r&&(r-=n),r<0&&"bullets"!==e.params.paginationType&&(r=n+r)):r=void 0!==e.snapIndex?e.snapIndex:e.activeIndex||0,"bullets"===s.type&&e.pagination.bullets&&0<e.pagination.bullets.length){var o,l,d,p=e.pagination.bullets;if(s.dynamicBullets&&(e.pagination.bulletSize=p.eq(0)[e.isHorizontal()?"outerWidth":"outerHeight"](!0),i.css(e.isHorizontal()?"width":"height",e.pagination.bulletSize*(s.dynamicMainBullets+4)+"px"),1<s.dynamicMainBullets&&void 0!==e.previousIndex&&(e.pagination.dynamicBulletIndex+=r-e.previousIndex,e.pagination.dynamicBulletIndex>s.dynamicMainBullets-1?e.pagination.dynamicBulletIndex=s.dynamicMainBullets-1:e.pagination.dynamicBulletIndex<0&&(e.pagination.dynamicBulletIndex=0)),o=r-e.pagination.dynamicBulletIndex,d=((l=o+(Math.min(p.length,s.dynamicMainBullets)-1))+o)/2),p.removeClass(s.bulletActiveClass+" "+s.bulletActiveClass+"-next "+s.bulletActiveClass+"-next-next "+s.bulletActiveClass+"-prev "+s.bulletActiveClass+"-prev-prev "+s.bulletActiveClass+"-main"),1<i.length)p.each(function(e,t){var a=L(t),i=a.index();i===r&&a.addClass(s.bulletActiveClass),s.dynamicBullets&&(o<=i&&i<=l&&a.addClass(s.bulletActiveClass+"-main"),i===o&&a.prev().addClass(s.bulletActiveClass+"-prev").prev().addClass(s.bulletActiveClass+"-prev-prev"),i===l&&a.next().addClass(s.bulletActiveClass+"-next").next().addClass(s.bulletActiveClass+"-next-next"))});else if(p.eq(r).addClass(s.bulletActiveClass),s.dynamicBullets){for(var c=p.eq(o),u=p.eq(l),h=o;h<=l;h+=1)p.eq(h).addClass(s.bulletActiveClass+"-main");c.prev().addClass(s.bulletActiveClass+"-prev").prev().addClass(s.bulletActiveClass+"-prev-prev"),u.next().addClass(s.bulletActiveClass+"-next").next().addClass(s.bulletActiveClass+"-next-next")}if(s.dynamicBullets){var v=Math.min(p.length,s.dynamicMainBullets+4),f=(e.pagination.bulletSize*v-e.pagination.bulletSize)/2-d*e.pagination.bulletSize,m=t?"right":"left";p.css(e.isHorizontal()?m:"top",f+"px")}}if("fraction"===s.type&&(i.find("."+s.currentClass).text(s.formatFractionCurrent(r+1)),i.find("."+s.totalClass).text(s.formatFractionTotal(n))),"progressbar"===s.type){var g;g=s.progressbarOpposite?e.isHorizontal()?"vertical":"horizontal":e.isHorizontal()?"horizontal":"vertical";var b=(r+1)/n,w=1,y=1;"horizontal"===g?w=b:y=b,i.find("."+s.progressbarFillClass).transform("translate3d(0,0,0) scaleX("+w+") scaleY("+y+")").transition(e.params.speed)}"custom"===s.type&&s.renderCustom?(i.html(s.renderCustom(e,r+1,n)),e.emit("paginationRender",e,i[0])):e.emit("paginationUpdate",e,i[0]),i[e.params.watchOverflow&&e.isLocked?"addClass":"removeClass"](s.lockClass)}},render:function(){var e=this,t=e.params.pagination;if(t.el&&e.pagination.el&&e.pagination.$el&&0!==e.pagination.$el.length){var a=e.virtual&&e.params.virtual.enabled?e.virtual.slides.length:e.slides.length,i=e.pagination.$el,s="";if("bullets"===t.type){for(var r=e.params.loop?Math.ceil((a-2*e.loopedSlides)/e.params.slidesPerGroup):e.snapGrid.length,n=0;n<r;n+=1)t.renderBullet?s+=t.renderBullet.call(e,n,t.bulletClass):s+="<"+t.bulletElement+' class="'+t.bulletClass+'"></'+t.bulletElement+">";i.html(s),e.pagination.bullets=i.find("."+t.bulletClass)}"fraction"===t.type&&(s=t.renderFraction?t.renderFraction.call(e,t.currentClass,t.totalClass):'<span class="'+t.currentClass+'"></span> / <span class="'+t.totalClass+'"></span>',i.html(s)),"progressbar"===t.type&&(s=t.renderProgressbar?t.renderProgressbar.call(e,t.progressbarFillClass):'<span class="'+t.progressbarFillClass+'"></span>',i.html(s)),"custom"!==t.type&&e.emit("paginationRender",e.pagination.$el[0])}},init:function(){var a=this,e=a.params.pagination;if(e.el){var t=L(e.el);0!==t.length&&(a.params.uniqueNavElements&&"string"==typeof e.el&&1<t.length&&1===a.$el.find(e.el).length&&(t=a.$el.find(e.el)),"bullets"===e.type&&e.clickable&&t.addClass(e.clickableClass),t.addClass(e.modifierClass+e.type),"bullets"===e.type&&e.dynamicBullets&&(t.addClass(""+e.modifierClass+e.type+"-dynamic"),a.pagination.dynamicBulletIndex=0,e.dynamicMainBullets<1&&(e.dynamicMainBullets=1)),"progressbar"===e.type&&e.progressbarOpposite&&t.addClass(e.progressbarOppositeClass),e.clickable&&t.on("click","."+e.bulletClass,function(e){e.preventDefault();var t=L(this).index()*a.params.slidesPerGroup;a.params.loop&&(t+=a.loopedSlides),a.slideTo(t)}),ee.extend(a.pagination,{$el:t,el:t[0]}))}},destroy:function(){var e=this,t=e.params.pagination;if(t.el&&e.pagination.el&&e.pagination.$el&&0!==e.pagination.$el.length){var a=e.pagination.$el;a.removeClass(t.hiddenClass),a.removeClass(t.modifierClass+t.type),e.pagination.bullets&&e.pagination.bullets.removeClass(t.bulletActiveClass),t.clickable&&a.off("click","."+t.bulletClass)}}},X={setTranslate:function(){var e=this;if(e.params.scrollbar.el&&e.scrollbar.el){var t=e.scrollbar,a=e.rtlTranslate,i=e.progress,s=t.dragSize,r=t.trackSize,n=t.$dragEl,o=t.$el,l=e.params.scrollbar,d=s,p=(r-s)*i;a?0<(p=-p)?(d=s-p,p=0):r<-p+s&&(d=r+p):p<0?(d=s+p,p=0):r<p+s&&(d=r-p),e.isHorizontal()?(te.transforms3d?n.transform("translate3d("+p+"px, 0, 0)"):n.transform("translateX("+p+"px)"),n[0].style.width=d+"px"):(te.transforms3d?n.transform("translate3d(0px, "+p+"px, 0)"):n.transform("translateY("+p+"px)"),n[0].style.height=d+"px"),l.hide&&(clearTimeout(e.scrollbar.timeout),o[0].style.opacity=1,e.scrollbar.timeout=setTimeout(function(){o[0].style.opacity=0,o.transition(400)},1e3))}},setTransition:function(e){this.params.scrollbar.el&&this.scrollbar.el&&this.scrollbar.$dragEl.transition(e)},updateSize:function(){var e=this;if(e.params.scrollbar.el&&e.scrollbar.el){var t=e.scrollbar,a=t.$dragEl,i=t.$el;a[0].style.width="",a[0].style.height="";var s,r=e.isHorizontal()?i[0].offsetWidth:i[0].offsetHeight,n=e.size/e.virtualSize,o=n*(r/e.size);s="auto"===e.params.scrollbar.dragSize?r*n:parseInt(e.params.scrollbar.dragSize,10),e.isHorizontal()?a[0].style.width=s+"px":a[0].style.height=s+"px",i[0].style.display=1<=n?"none":"",e.params.scrollbarHide&&(i[0].style.opacity=0),ee.extend(t,{trackSize:r,divider:n,moveDivider:o,dragSize:s}),t.$el[e.params.watchOverflow&&e.isLocked?"addClass":"removeClass"](e.params.scrollbar.lockClass)}},setDragPosition:function(e){var t,a=this,i=a.scrollbar,s=a.rtlTranslate,r=i.$el,n=i.dragSize,o=i.trackSize;t=((a.isHorizontal()?"touchstart"===e.type||"touchmove"===e.type?e.targetTouches[0].pageX:e.pageX||e.clientX:"touchstart"===e.type||"touchmove"===e.type?e.targetTouches[0].pageY:e.pageY||e.clientY)-r.offset()[a.isHorizontal()?"left":"top"]-n/2)/(o-n),t=Math.max(Math.min(t,1),0),s&&(t=1-t);var l=a.minTranslate()+(a.maxTranslate()-a.minTranslate())*t;a.updateProgress(l),a.setTranslate(l),a.updateActiveIndex(),a.updateSlidesClasses()},onDragStart:function(e){var t=this,a=t.params.scrollbar,i=t.scrollbar,s=t.$wrapperEl,r=i.$el,n=i.$dragEl;t.scrollbar.isTouched=!0,e.preventDefault(),e.stopPropagation(),s.transition(100),n.transition(100),i.setDragPosition(e),clearTimeout(t.scrollbar.dragTimeout),r.transition(0),a.hide&&r.css("opacity",1),t.emit("scrollbarDragStart",e)},onDragMove:function(e){var t=this.scrollbar,a=this.$wrapperEl,i=t.$el,s=t.$dragEl;this.scrollbar.isTouched&&(e.preventDefault?e.preventDefault():e.returnValue=!1,t.setDragPosition(e),a.transition(0),i.transition(0),s.transition(0),this.emit("scrollbarDragMove",e))},onDragEnd:function(e){var t=this,a=t.params.scrollbar,i=t.scrollbar.$el;t.scrollbar.isTouched&&(t.scrollbar.isTouched=!1,a.hide&&(clearTimeout(t.scrollbar.dragTimeout),t.scrollbar.dragTimeout=ee.nextTick(function(){i.css("opacity",0),i.transition(400)},1e3)),t.emit("scrollbarDragEnd",e),a.snapOnRelease&&t.slideToClosest())},enableDraggable:function(){var e=this;if(e.params.scrollbar.el){var t=e.scrollbar,a=e.touchEventsTouch,i=e.touchEventsDesktop,s=e.params,r=t.$el[0],n=!(!te.passiveListener||!s.passiveListeners)&&{passive:!1,capture:!1},o=!(!te.passiveListener||!s.passiveListeners)&&{passive:!0,capture:!1};te.touch?(r.addEventListener(a.start,e.scrollbar.onDragStart,n),r.addEventListener(a.move,e.scrollbar.onDragMove,n),r.addEventListener(a.end,e.scrollbar.onDragEnd,o)):(r.addEventListener(i.start,e.scrollbar.onDragStart,n),f.addEventListener(i.move,e.scrollbar.onDragMove,n),f.addEventListener(i.end,e.scrollbar.onDragEnd,o))}},disableDraggable:function(){var e=this;if(e.params.scrollbar.el){var t=e.scrollbar,a=e.touchEventsTouch,i=e.touchEventsDesktop,s=e.params,r=t.$el[0],n=!(!te.passiveListener||!s.passiveListeners)&&{passive:!1,capture:!1},o=!(!te.passiveListener||!s.passiveListeners)&&{passive:!0,capture:!1};te.touch?(r.removeEventListener(a.start,e.scrollbar.onDragStart,n),r.removeEventListener(a.move,e.scrollbar.onDragMove,n),r.removeEventListener(a.end,e.scrollbar.onDragEnd,o)):(r.removeEventListener(i.start,e.scrollbar.onDragStart,n),f.removeEventListener(i.move,e.scrollbar.onDragMove,n),f.removeEventListener(i.end,e.scrollbar.onDragEnd,o))}},init:function(){var e=this;if(e.params.scrollbar.el){var t=e.scrollbar,a=e.$el,i=e.params.scrollbar,s=L(i.el);e.params.uniqueNavElements&&"string"==typeof i.el&&1<s.length&&1===a.find(i.el).length&&(s=a.find(i.el));var r=s.find("."+e.params.scrollbar.dragClass);0===r.length&&(r=L('<div class="'+e.params.scrollbar.dragClass+'"></div>'),s.append(r)),ee.extend(t,{$el:s,el:s[0],$dragEl:r,dragEl:r[0]}),i.draggable&&t.enableDraggable()}},destroy:function(){this.scrollbar.disableDraggable()}},Y={setTransform:function(e,t){var a=this.rtl,i=L(e),s=a?-1:1,r=i.attr("data-swiper-parallax")||"0",n=i.attr("data-swiper-parallax-x"),o=i.attr("data-swiper-parallax-y"),l=i.attr("data-swiper-parallax-scale"),d=i.attr("data-swiper-parallax-opacity");if(n||o?(n=n||"0",o=o||"0"):this.isHorizontal()?(n=r,o="0"):(o=r,n="0"),n=0<=n.indexOf("%")?parseInt(n,10)*t*s+"%":n*t*s+"px",o=0<=o.indexOf("%")?parseInt(o,10)*t+"%":o*t+"px",null!=d){var p=d-(d-1)*(1-Math.abs(t));i[0].style.opacity=p}if(null==l)i.transform("translate3d("+n+", "+o+", 0px)");else{var c=l-(l-1)*(1-Math.abs(t));i.transform("translate3d("+n+", "+o+", 0px) scale("+c+")")}},setTranslate:function(){var i=this,e=i.$el,t=i.slides,s=i.progress,r=i.snapGrid;e.children("[data-swiper-parallax], [data-swiper-parallax-x], [data-swiper-parallax-y]").each(function(e,t){i.parallax.setTransform(t,s)}),t.each(function(e,t){var a=t.progress;1<i.params.slidesPerGroup&&"auto"!==i.params.slidesPerView&&(a+=Math.ceil(e/2)-s*(r.length-1)),a=Math.min(Math.max(a,-1),1),L(t).find("[data-swiper-parallax], [data-swiper-parallax-x], [data-swiper-parallax-y]").each(function(e,t){i.parallax.setTransform(t,a)})})},setTransition:function(s){void 0===s&&(s=this.params.speed);this.$el.find("[data-swiper-parallax], [data-swiper-parallax-x], [data-swiper-parallax-y]").each(function(e,t){var a=L(t),i=parseInt(a.attr("data-swiper-parallax-duration"),10)||s;0===s&&(i=0),a.transition(i)})}},V={getDistanceBetweenTouches:function(e){if(e.targetTouches.length<2)return 1;var t=e.targetTouches[0].pageX,a=e.targetTouches[0].pageY,i=e.targetTouches[1].pageX,s=e.targetTouches[1].pageY;return Math.sqrt(Math.pow(i-t,2)+Math.pow(s-a,2))},onGestureStart:function(e){var t=this,a=t.params.zoom,i=t.zoom,s=i.gesture;if(i.fakeGestureTouched=!1,i.fakeGestureMoved=!1,!te.gestures){if("touchstart"!==e.type||"touchstart"===e.type&&e.targetTouches.length<2)return;i.fakeGestureTouched=!0,s.scaleStart=V.getDistanceBetweenTouches(e)}s.$slideEl&&s.$slideEl.length||(s.$slideEl=L(e.target).closest(".swiper-slide"),0===s.$slideEl.length&&(s.$slideEl=t.slides.eq(t.activeIndex)),s.$imageEl=s.$slideEl.find("img, svg, canvas"),s.$imageWrapEl=s.$imageEl.parent("."+a.containerClass),s.maxRatio=s.$imageWrapEl.attr("data-swiper-zoom")||a.maxRatio,0!==s.$imageWrapEl.length)?(s.$imageEl.transition(0),t.zoom.isScaling=!0):s.$imageEl=void 0},onGestureChange:function(e){var t=this.params.zoom,a=this.zoom,i=a.gesture;if(!te.gestures){if("touchmove"!==e.type||"touchmove"===e.type&&e.targetTouches.length<2)return;a.fakeGestureMoved=!0,i.scaleMove=V.getDistanceBetweenTouches(e)}i.$imageEl&&0!==i.$imageEl.length&&(a.scale=te.gestures?e.scale*a.currentScale:i.scaleMove/i.scaleStart*a.currentScale,a.scale>i.maxRatio&&(a.scale=i.maxRatio-1+Math.pow(a.scale-i.maxRatio+1,.5)),a.scale<t.minRatio&&(a.scale=t.minRatio+1-Math.pow(t.minRatio-a.scale+1,.5)),i.$imageEl.transform("translate3d(0,0,0) scale("+a.scale+")"))},onGestureEnd:function(e){var t=this.params.zoom,a=this.zoom,i=a.gesture;if(!te.gestures){if(!a.fakeGestureTouched||!a.fakeGestureMoved)return;if("touchend"!==e.type||"touchend"===e.type&&e.changedTouches.length<2&&!m.android)return;a.fakeGestureTouched=!1,a.fakeGestureMoved=!1}i.$imageEl&&0!==i.$imageEl.length&&(a.scale=Math.max(Math.min(a.scale,i.maxRatio),t.minRatio),i.$imageEl.transition(this.params.speed).transform("translate3d(0,0,0) scale("+a.scale+")"),a.currentScale=a.scale,a.isScaling=!1,1===a.scale&&(i.$slideEl=void 0))},onTouchStart:function(e){var t=this.zoom,a=t.gesture,i=t.image;a.$imageEl&&0!==a.$imageEl.length&&(i.isTouched||(m.android&&e.preventDefault(),i.isTouched=!0,i.touchesStart.x="touchstart"===e.type?e.targetTouches[0].pageX:e.pageX,i.touchesStart.y="touchstart"===e.type?e.targetTouches[0].pageY:e.pageY))},onTouchMove:function(e){var t=this,a=t.zoom,i=a.gesture,s=a.image,r=a.velocity;if(i.$imageEl&&0!==i.$imageEl.length&&(t.allowClick=!1,s.isTouched&&i.$slideEl)){s.isMoved||(s.width=i.$imageEl[0].offsetWidth,s.height=i.$imageEl[0].offsetHeight,s.startX=ee.getTranslate(i.$imageWrapEl[0],"x")||0,s.startY=ee.getTranslate(i.$imageWrapEl[0],"y")||0,i.slideWidth=i.$slideEl[0].offsetWidth,i.slideHeight=i.$slideEl[0].offsetHeight,i.$imageWrapEl.transition(0),t.rtl&&(s.startX=-s.startX,s.startY=-s.startY));var n=s.width*a.scale,o=s.height*a.scale;if(!(n<i.slideWidth&&o<i.slideHeight)){if(s.minX=Math.min(i.slideWidth/2-n/2,0),s.maxX=-s.minX,s.minY=Math.min(i.slideHeight/2-o/2,0),s.maxY=-s.minY,s.touchesCurrent.x="touchmove"===e.type?e.targetTouches[0].pageX:e.pageX,s.touchesCurrent.y="touchmove"===e.type?e.targetTouches[0].pageY:e.pageY,!s.isMoved&&!a.isScaling){if(t.isHorizontal()&&(Math.floor(s.minX)===Math.floor(s.startX)&&s.touchesCurrent.x<s.touchesStart.x||Math.floor(s.maxX)===Math.floor(s.startX)&&s.touchesCurrent.x>s.touchesStart.x))return void(s.isTouched=!1);if(!t.isHorizontal()&&(Math.floor(s.minY)===Math.floor(s.startY)&&s.touchesCurrent.y<s.touchesStart.y||Math.floor(s.maxY)===Math.floor(s.startY)&&s.touchesCurrent.y>s.touchesStart.y))return void(s.isTouched=!1)}e.preventDefault(),e.stopPropagation(),s.isMoved=!0,s.currentX=s.touchesCurrent.x-s.touchesStart.x+s.startX,s.currentY=s.touchesCurrent.y-s.touchesStart.y+s.startY,s.currentX<s.minX&&(s.currentX=s.minX+1-Math.pow(s.minX-s.currentX+1,.8)),s.currentX>s.maxX&&(s.currentX=s.maxX-1+Math.pow(s.currentX-s.maxX+1,.8)),s.currentY<s.minY&&(s.currentY=s.minY+1-Math.pow(s.minY-s.currentY+1,.8)),s.currentY>s.maxY&&(s.currentY=s.maxY-1+Math.pow(s.currentY-s.maxY+1,.8)),r.prevPositionX||(r.prevPositionX=s.touchesCurrent.x),r.prevPositionY||(r.prevPositionY=s.touchesCurrent.y),r.prevTime||(r.prevTime=Date.now()),r.x=(s.touchesCurrent.x-r.prevPositionX)/(Date.now()-r.prevTime)/2,r.y=(s.touchesCurrent.y-r.prevPositionY)/(Date.now()-r.prevTime)/2,Math.abs(s.touchesCurrent.x-r.prevPositionX)<2&&(r.x=0),Math.abs(s.touchesCurrent.y-r.prevPositionY)<2&&(r.y=0),r.prevPositionX=s.touchesCurrent.x,r.prevPositionY=s.touchesCurrent.y,r.prevTime=Date.now(),i.$imageWrapEl.transform("translate3d("+s.currentX+"px, "+s.currentY+"px,0)")}}},onTouchEnd:function(){var e=this.zoom,t=e.gesture,a=e.image,i=e.velocity;if(t.$imageEl&&0!==t.$imageEl.length){if(!a.isTouched||!a.isMoved)return a.isTouched=!1,void(a.isMoved=!1);a.isTouched=!1,a.isMoved=!1;var s=300,r=300,n=i.x*s,o=a.currentX+n,l=i.y*r,d=a.currentY+l;0!==i.x&&(s=Math.abs((o-a.currentX)/i.x)),0!==i.y&&(r=Math.abs((d-a.currentY)/i.y));var p=Math.max(s,r);a.currentX=o,a.currentY=d;var c=a.width*e.scale,u=a.height*e.scale;a.minX=Math.min(t.slideWidth/2-c/2,0),a.maxX=-a.minX,a.minY=Math.min(t.slideHeight/2-u/2,0),a.maxY=-a.minY,a.currentX=Math.max(Math.min(a.currentX,a.maxX),a.minX),a.currentY=Math.max(Math.min(a.currentY,a.maxY),a.minY),t.$imageWrapEl.transition(p).transform("translate3d("+a.currentX+"px, "+a.currentY+"px,0)")}},onTransitionEnd:function(){var e=this.zoom,t=e.gesture;t.$slideEl&&this.previousIndex!==this.activeIndex&&(t.$imageEl.transform("translate3d(0,0,0) scale(1)"),t.$imageWrapEl.transform("translate3d(0,0,0)"),e.scale=1,e.currentScale=1,t.$slideEl=void 0,t.$imageEl=void 0,t.$imageWrapEl=void 0)},toggle:function(e){var t=this.zoom;t.scale&&1!==t.scale?t.out():t.in(e)},in:function(e){var t,a,i,s,r,n,o,l,d,p,c,u,h,v,f,m,g=this,b=g.zoom,w=g.params.zoom,y=b.gesture,x=b.image;(y.$slideEl||(y.$slideEl=g.clickedSlide?L(g.clickedSlide):g.slides.eq(g.activeIndex),y.$imageEl=y.$slideEl.find("img, svg, canvas"),y.$imageWrapEl=y.$imageEl.parent("."+w.containerClass)),y.$imageEl&&0!==y.$imageEl.length)&&(y.$slideEl.addClass(""+w.zoomedSlideClass),void 0===x.touchesStart.x&&e?(t="touchend"===e.type?e.changedTouches[0].pageX:e.pageX,a="touchend"===e.type?e.changedTouches[0].pageY:e.pageY):(t=x.touchesStart.x,a=x.touchesStart.y),b.scale=y.$imageWrapEl.attr("data-swiper-zoom")||w.maxRatio,b.currentScale=y.$imageWrapEl.attr("data-swiper-zoom")||w.maxRatio,e?(f=y.$slideEl[0].offsetWidth,m=y.$slideEl[0].offsetHeight,i=y.$slideEl.offset().left+f/2-t,s=y.$slideEl.offset().top+m/2-a,o=y.$imageEl[0].offsetWidth,l=y.$imageEl[0].offsetHeight,d=o*b.scale,p=l*b.scale,h=-(c=Math.min(f/2-d/2,0)),v=-(u=Math.min(m/2-p/2,0)),(r=i*b.scale)<c&&(r=c),h<r&&(r=h),(n=s*b.scale)<u&&(n=u),v<n&&(n=v)):n=r=0,y.$imageWrapEl.transition(300).transform("translate3d("+r+"px, "+n+"px,0)"),y.$imageEl.transition(300).transform("translate3d(0,0,0) scale("+b.scale+")"))},out:function(){var e=this,t=e.zoom,a=e.params.zoom,i=t.gesture;i.$slideEl||(i.$slideEl=e.clickedSlide?L(e.clickedSlide):e.slides.eq(e.activeIndex),i.$imageEl=i.$slideEl.find("img, svg, canvas"),i.$imageWrapEl=i.$imageEl.parent("."+a.containerClass)),i.$imageEl&&0!==i.$imageEl.length&&(t.scale=1,t.currentScale=1,i.$imageWrapEl.transition(300).transform("translate3d(0,0,0)"),i.$imageEl.transition(300).transform("translate3d(0,0,0) scale(1)"),i.$slideEl.removeClass(""+a.zoomedSlideClass),i.$slideEl=void 0)},enable:function(){var e=this,t=e.zoom;if(!t.enabled){t.enabled=!0;var a=!("touchstart"!==e.touchEvents.start||!te.passiveListener||!e.params.passiveListeners)&&{passive:!0,capture:!1};te.gestures?(e.$wrapperEl.on("gesturestart",".swiper-slide",t.onGestureStart,a),e.$wrapperEl.on("gesturechange",".swiper-slide",t.onGestureChange,a),e.$wrapperEl.on("gestureend",".swiper-slide",t.onGestureEnd,a)):"touchstart"===e.touchEvents.start&&(e.$wrapperEl.on(e.touchEvents.start,".swiper-slide",t.onGestureStart,a),e.$wrapperEl.on(e.touchEvents.move,".swiper-slide",t.onGestureChange,a),e.$wrapperEl.on(e.touchEvents.end,".swiper-slide",t.onGestureEnd,a)),e.$wrapperEl.on(e.touchEvents.move,"."+e.params.zoom.containerClass,t.onTouchMove)}},disable:function(){var e=this,t=e.zoom;if(t.enabled){e.zoom.enabled=!1;var a=!("touchstart"!==e.touchEvents.start||!te.passiveListener||!e.params.passiveListeners)&&{passive:!0,capture:!1};te.gestures?(e.$wrapperEl.off("gesturestart",".swiper-slide",t.onGestureStart,a),e.$wrapperEl.off("gesturechange",".swiper-slide",t.onGestureChange,a),e.$wrapperEl.off("gestureend",".swiper-slide",t.onGestureEnd,a)):"touchstart"===e.touchEvents.start&&(e.$wrapperEl.off(e.touchEvents.start,".swiper-slide",t.onGestureStart,a),e.$wrapperEl.off(e.touchEvents.move,".swiper-slide",t.onGestureChange,a),e.$wrapperEl.off(e.touchEvents.end,".swiper-slide",t.onGestureEnd,a)),e.$wrapperEl.off(e.touchEvents.move,"."+e.params.zoom.containerClass,t.onTouchMove)}}},F={loadInSlide:function(e,l){void 0===l&&(l=!0);var d=this,p=d.params.lazy;if(void 0!==e&&0!==d.slides.length){var c=d.virtual&&d.params.virtual.enabled?d.$wrapperEl.children("."+d.params.slideClass+'[data-swiper-slide-index="'+e+'"]'):d.slides.eq(e),t=c.find("."+p.elementClass+":not(."+p.loadedClass+"):not(."+p.loadingClass+")");!c.hasClass(p.elementClass)||c.hasClass(p.loadedClass)||c.hasClass(p.loadingClass)||(t=t.add(c[0])),0!==t.length&&t.each(function(e,t){var i=L(t);i.addClass(p.loadingClass);var s=i.attr("data-background"),r=i.attr("data-src"),n=i.attr("data-srcset"),o=i.attr("data-sizes");d.loadImage(i[0],r||s,n,o,!1,function(){if(null!=d&&d&&(!d||d.params)&&!d.destroyed){if(s?(i.css("background-image",'url("'+s+'")'),i.removeAttr("data-background")):(n&&(i.attr("srcset",n),i.removeAttr("data-srcset")),o&&(i.attr("sizes",o),i.removeAttr("data-sizes")),r&&(i.attr("src",r),i.removeAttr("data-src"))),i.addClass(p.loadedClass).removeClass(p.loadingClass),c.find("."+p.preloaderClass).remove(),d.params.loop&&l){var e=c.attr("data-swiper-slide-index");if(c.hasClass(d.params.slideDuplicateClass)){var t=d.$wrapperEl.children('[data-swiper-slide-index="'+e+'"]:not(.'+d.params.slideDuplicateClass+")");d.lazy.loadInSlide(t.index(),!1)}else{var a=d.$wrapperEl.children("."+d.params.slideDuplicateClass+'[data-swiper-slide-index="'+e+'"]');d.lazy.loadInSlide(a.index(),!1)}}d.emit("lazyImageReady",c[0],i[0])}}),d.emit("lazyImageLoad",c[0],i[0])})}},load:function(){var i=this,t=i.$wrapperEl,a=i.params,s=i.slides,e=i.activeIndex,r=i.virtual&&a.virtual.enabled,n=a.lazy,o=a.slidesPerView;function l(e){if(r){if(t.children("."+a.slideClass+'[data-swiper-slide-index="'+e+'"]').length)return!0}else if(s[e])return!0;return!1}function d(e){return r?L(e).attr("data-swiper-slide-index"):L(e).index()}if("auto"===o&&(o=0),i.lazy.initialImageLoaded||(i.lazy.initialImageLoaded=!0),i.params.watchSlidesVisibility)t.children("."+a.slideVisibleClass).each(function(e,t){var a=r?L(t).attr("data-swiper-slide-index"):L(t).index();i.lazy.loadInSlide(a)});else if(1<o)for(var p=e;p<e+o;p+=1)l(p)&&i.lazy.loadInSlide(p);else i.lazy.loadInSlide(e);if(n.loadPrevNext)if(1<o||n.loadPrevNextAmount&&1<n.loadPrevNextAmount){for(var c=n.loadPrevNextAmount,u=o,h=Math.min(e+u+Math.max(c,u),s.length),v=Math.max(e-Math.max(u,c),0),f=e+o;f<h;f+=1)l(f)&&i.lazy.loadInSlide(f);for(var m=v;m<e;m+=1)l(m)&&i.lazy.loadInSlide(m)}else{var g=t.children("."+a.slideNextClass);0<g.length&&i.lazy.loadInSlide(d(g));var b=t.children("."+a.slidePrevClass);0<b.length&&i.lazy.loadInSlide(d(b))}}},R={LinearSpline:function(e,t){var a,i,s,r,n,o=function(e,t){for(i=-1,a=e.length;1<a-i;)e[s=a+i>>1]<=t?i=s:a=s;return a};return this.x=e,this.y=t,this.lastIndex=e.length-1,this.interpolate=function(e){return e?(n=o(this.x,e),r=n-1,(e-this.x[r])*(this.y[n]-this.y[r])/(this.x[n]-this.x[r])+this.y[r]):0},this},getInterpolateFunction:function(e){var t=this;t.controller.spline||(t.controller.spline=t.params.loop?new R.LinearSpline(t.slidesGrid,e.slidesGrid):new R.LinearSpline(t.snapGrid,e.snapGrid))},setTranslate:function(e,t){var a,i,s=this,r=s.controller.control;function n(e){var t=s.rtlTranslate?-s.translate:s.translate;"slide"===s.params.controller.by&&(s.controller.getInterpolateFunction(e),i=-s.controller.spline.interpolate(-t)),i&&"container"!==s.params.controller.by||(a=(e.maxTranslate()-e.minTranslate())/(s.maxTranslate()-s.minTranslate()),i=(t-s.minTranslate())*a+e.minTranslate()),s.params.controller.inverse&&(i=e.maxTranslate()-i),e.updateProgress(i),e.setTranslate(i,s),e.updateActiveIndex(),e.updateSlidesClasses()}if(Array.isArray(r))for(var o=0;o<r.length;o+=1)r[o]!==t&&r[o]instanceof S&&n(r[o]);else r instanceof S&&t!==r&&n(r)},setTransition:function(t,e){var a,i=this,s=i.controller.control;function r(e){e.setTransition(t,i),0!==t&&(e.transitionStart(),e.params.autoHeight&&ee.nextTick(function(){e.updateAutoHeight()}),e.$wrapperEl.transitionEnd(function(){s&&(e.params.loop&&"slide"===i.params.controller.by&&e.loopFix(),e.transitionEnd())}))}if(Array.isArray(s))for(a=0;a<s.length;a+=1)s[a]!==e&&s[a]instanceof S&&r(s[a]);else s instanceof S&&e!==s&&r(s)}},q={makeElFocusable:function(e){return e.attr("tabIndex","0"),e},addElRole:function(e,t){return e.attr("role",t),e},addElLabel:function(e,t){return e.attr("aria-label",t),e},disableEl:function(e){return e.attr("aria-disabled",!0),e},enableEl:function(e){return e.attr("aria-disabled",!1),e},onEnterKey:function(e){var t=this,a=t.params.a11y;if(13===e.keyCode){var i=L(e.target);t.navigation&&t.navigation.$nextEl&&i.is(t.navigation.$nextEl)&&(t.isEnd&&!t.params.loop||t.slideNext(),t.isEnd?t.a11y.notify(a.lastSlideMessage):t.a11y.notify(a.nextSlideMessage)),t.navigation&&t.navigation.$prevEl&&i.is(t.navigation.$prevEl)&&(t.isBeginning&&!t.params.loop||t.slidePrev(),t.isBeginning?t.a11y.notify(a.firstSlideMessage):t.a11y.notify(a.prevSlideMessage)),t.pagination&&i.is("."+t.params.pagination.bulletClass)&&i[0].click()}},notify:function(e){var t=this.a11y.liveRegion;0!==t.length&&(t.html(""),t.html(e))},updateNavigation:function(){var e=this;if(!e.params.loop){var t=e.navigation,a=t.$nextEl,i=t.$prevEl;i&&0<i.length&&(e.isBeginning?e.a11y.disableEl(i):e.a11y.enableEl(i)),a&&0<a.length&&(e.isEnd?e.a11y.disableEl(a):e.a11y.enableEl(a))}},updatePagination:function(){var i=this,s=i.params.a11y;i.pagination&&i.params.pagination.clickable&&i.pagination.bullets&&i.pagination.bullets.length&&i.pagination.bullets.each(function(e,t){var a=L(t);i.a11y.makeElFocusable(a),i.a11y.addElRole(a,"button"),i.a11y.addElLabel(a,s.paginationBulletMessage.replace(/{{index}}/,a.index()+1))})},init:function(){var e=this;e.$el.append(e.a11y.liveRegion);var t,a,i=e.params.a11y;e.navigation&&e.navigation.$nextEl&&(t=e.navigation.$nextEl),e.navigation&&e.navigation.$prevEl&&(a=e.navigation.$prevEl),t&&(e.a11y.makeElFocusable(t),e.a11y.addElRole(t,"button"),e.a11y.addElLabel(t,i.nextSlideMessage),t.on("keydown",e.a11y.onEnterKey)),a&&(e.a11y.makeElFocusable(a),e.a11y.addElRole(a,"button"),e.a11y.addElLabel(a,i.prevSlideMessage),a.on("keydown",e.a11y.onEnterKey)),e.pagination&&e.params.pagination.clickable&&e.pagination.bullets&&e.pagination.bullets.length&&e.pagination.$el.on("keydown","."+e.params.pagination.bulletClass,e.a11y.onEnterKey)},destroy:function(){var e,t,a=this;a.a11y.liveRegion&&0<a.a11y.liveRegion.length&&a.a11y.liveRegion.remove(),a.navigation&&a.navigation.$nextEl&&(e=a.navigation.$nextEl),a.navigation&&a.navigation.$prevEl&&(t=a.navigation.$prevEl),e&&e.off("keydown",a.a11y.onEnterKey),t&&t.off("keydown",a.a11y.onEnterKey),a.pagination&&a.params.pagination.clickable&&a.pagination.bullets&&a.pagination.bullets.length&&a.pagination.$el.off("keydown","."+a.params.pagination.bulletClass,a.a11y.onEnterKey)}},W={init:function(){var e=this;if(e.params.history){if(!J.history||!J.history.pushState)return e.params.history.enabled=!1,void(e.params.hashNavigation.enabled=!0);var t=e.history;t.initialized=!0,t.paths=W.getPathValues(),(t.paths.key||t.paths.value)&&(t.scrollToSlide(0,t.paths.value,e.params.runCallbacksOnInit),e.params.history.replaceState||J.addEventListener("popstate",e.history.setHistoryPopState))}},destroy:function(){this.params.history.replaceState||J.removeEventListener("popstate",this.history.setHistoryPopState)},setHistoryPopState:function(){this.history.paths=W.getPathValues(),this.history.scrollToSlide(this.params.speed,this.history.paths.value,!1)},getPathValues:function(){var e=J.location.pathname.slice(1).split("/").filter(function(e){return""!==e}),t=e.length;return{key:e[t-2],value:e[t-1]}},setHistory:function(e,t){if(this.history.initialized&&this.params.history.enabled){var a=this.slides.eq(t),i=W.slugify(a.attr("data-history"));J.location.pathname.includes(e)||(i=e+"/"+i);var s=J.history.state;s&&s.value===i||(this.params.history.replaceState?J.history.replaceState({value:i},null,i):J.history.pushState({value:i},null,i))}},slugify:function(e){return e.toString().toLowerCase().replace(/\s+/g,"-").replace(/[^\w-]+/g,"").replace(/--+/g,"-").replace(/^-+/,"").replace(/-+$/,"")},scrollToSlide:function(e,t,a){var i=this;if(t)for(var s=0,r=i.slides.length;s<r;s+=1){var n=i.slides.eq(s);if(W.slugify(n.attr("data-history"))===t&&!n.hasClass(i.params.slideDuplicateClass)){var o=n.index();i.slideTo(o,e,a)}}else i.slideTo(0,e,a)}},j={onHashCange:function(){var e=this,t=f.location.hash.replace("#","");if(t!==e.slides.eq(e.activeIndex).attr("data-hash")){var a=e.$wrapperEl.children("."+e.params.slideClass+'[data-hash="'+t+'"]').index();if(void 0===a)return;e.slideTo(a)}},setHash:function(){var e=this;if(e.hashNavigation.initialized&&e.params.hashNavigation.enabled)if(e.params.hashNavigation.replaceState&&J.history&&J.history.replaceState)J.history.replaceState(null,null,"#"+e.slides.eq(e.activeIndex).attr("data-hash")||"");else{var t=e.slides.eq(e.activeIndex),a=t.attr("data-hash")||t.attr("data-history");f.location.hash=a||""}},init:function(){var e=this;if(!(!e.params.hashNavigation.enabled||e.params.history&&e.params.history.enabled)){e.hashNavigation.initialized=!0;var t=f.location.hash.replace("#","");if(t)for(var a=0,i=e.slides.length;a<i;a+=1){var s=e.slides.eq(a);if((s.attr("data-hash")||s.attr("data-history"))===t&&!s.hasClass(e.params.slideDuplicateClass)){var r=s.index();e.slideTo(r,0,e.params.runCallbacksOnInit,!0)}}e.params.hashNavigation.watchState&&L(J).on("hashchange",e.hashNavigation.onHashCange)}},destroy:function(){this.params.hashNavigation.watchState&&L(J).off("hashchange",this.hashNavigation.onHashCange)}},U={run:function(){var e=this,t=e.slides.eq(e.activeIndex),a=e.params.autoplay.delay;t.attr("data-swiper-autoplay")&&(a=t.attr("data-swiper-autoplay")||e.params.autoplay.delay),e.autoplay.timeout=ee.nextTick(function(){e.params.autoplay.reverseDirection?e.params.loop?(e.loopFix(),e.slidePrev(e.params.speed,!0,!0),e.emit("autoplay")):e.isBeginning?e.params.autoplay.stopOnLastSlide?e.autoplay.stop():(e.slideTo(e.slides.length-1,e.params.speed,!0,!0),e.emit("autoplay")):(e.slidePrev(e.params.speed,!0,!0),e.emit("autoplay")):e.params.loop?(e.loopFix(),e.slideNext(e.params.speed,!0,!0),e.emit("autoplay")):e.isEnd?e.params.autoplay.stopOnLastSlide?e.autoplay.stop():(e.slideTo(0,e.params.speed,!0,!0),e.emit("autoplay")):(e.slideNext(e.params.speed,!0,!0),e.emit("autoplay"))},a)},start:function(){var e=this;return void 0===e.autoplay.timeout&&(!e.autoplay.running&&(e.autoplay.running=!0,e.emit("autoplayStart"),e.autoplay.run(),!0))},stop:function(){var e=this;return!!e.autoplay.running&&(void 0!==e.autoplay.timeout&&(e.autoplay.timeout&&(clearTimeout(e.autoplay.timeout),e.autoplay.timeout=void 0),e.autoplay.running=!1,e.emit("autoplayStop"),!0))},pause:function(e){var t=this;t.autoplay.running&&(t.autoplay.paused||(t.autoplay.timeout&&clearTimeout(t.autoplay.timeout),t.autoplay.paused=!0,0!==e&&t.params.autoplay.waitForTransition?(t.$wrapperEl[0].addEventListener("transitionend",t.autoplay.onTransitionEnd),t.$wrapperEl[0].addEventListener("webkitTransitionEnd",t.autoplay.onTransitionEnd)):(t.autoplay.paused=!1,t.autoplay.run())))}},K={setTranslate:function(){for(var e=this,t=e.slides,a=0;a<t.length;a+=1){var i=e.slides.eq(a),s=-i[0].swiperSlideOffset;e.params.virtualTranslate||(s-=e.translate);var r=0;e.isHorizontal()||(r=s,s=0);var n=e.params.fadeEffect.crossFade?Math.max(1-Math.abs(i[0].progress),0):1+Math.min(Math.max(i[0].progress,-1),0);i.css({opacity:n}).transform("translate3d("+s+"px, "+r+"px, 0px)")}},setTransition:function(e){var a=this,t=a.slides,i=a.$wrapperEl;if(t.transition(e),a.params.virtualTranslate&&0!==e){var s=!1;t.transitionEnd(function(){if(!s&&a&&!a.destroyed){s=!0,a.animating=!1;for(var e=["webkitTransitionEnd","transitionend"],t=0;t<e.length;t+=1)i.trigger(e[t])}})}}},_={setTranslate:function(){var e,t=this,a=t.$el,i=t.$wrapperEl,s=t.slides,r=t.width,n=t.height,o=t.rtlTranslate,l=t.size,d=t.params.cubeEffect,p=t.isHorizontal(),c=t.virtual&&t.params.virtual.enabled,u=0;d.shadow&&(p?(0===(e=i.find(".swiper-cube-shadow")).length&&(e=L('<div class="swiper-cube-shadow"></div>'),i.append(e)),e.css({height:r+"px"})):0===(e=a.find(".swiper-cube-shadow")).length&&(e=L('<div class="swiper-cube-shadow"></div>'),a.append(e)));for(var h=0;h<s.length;h+=1){var v=s.eq(h),f=h;c&&(f=parseInt(v.attr("data-swiper-slide-index"),10));var m=90*f,g=Math.floor(m/360);o&&(m=-m,g=Math.floor(-m/360));var b=Math.max(Math.min(v[0].progress,1),-1),w=0,y=0,x=0;f%4==0?(w=4*-g*l,x=0):(f-1)%4==0?(w=0,x=4*-g*l):(f-2)%4==0?(w=l+4*g*l,x=l):(f-3)%4==0&&(w=-l,x=3*l+4*l*g),o&&(w=-w),p||(y=w,w=0);var T="rotateX("+(p?0:-m)+"deg) rotateY("+(p?m:0)+"deg) translate3d("+w+"px, "+y+"px, "+x+"px)";if(b<=1&&-1<b&&(u=90*f+90*b,o&&(u=90*-f-90*b)),v.transform(T),d.slideShadows){var E=p?v.find(".swiper-slide-shadow-left"):v.find(".swiper-slide-shadow-top"),S=p?v.find(".swiper-slide-shadow-right"):v.find(".swiper-slide-shadow-bottom");0===E.length&&(E=L('<div class="swiper-slide-shadow-'+(p?"left":"top")+'"></div>'),v.append(E)),0===S.length&&(S=L('<div class="swiper-slide-shadow-'+(p?"right":"bottom")+'"></div>'),v.append(S)),E.length&&(E[0].style.opacity=Math.max(-b,0)),S.length&&(S[0].style.opacity=Math.max(b,0))}}if(i.css({"-webkit-transform-origin":"50% 50% -"+l/2+"px","-moz-transform-origin":"50% 50% -"+l/2+"px","-ms-transform-origin":"50% 50% -"+l/2+"px","transform-origin":"50% 50% -"+l/2+"px"}),d.shadow)if(p)e.transform("translate3d(0px, "+(r/2+d.shadowOffset)+"px, "+-r/2+"px) rotateX(90deg) rotateZ(0deg) scale("+d.shadowScale+")");else{var C=Math.abs(u)-90*Math.floor(Math.abs(u)/90),M=1.5-(Math.sin(2*C*Math.PI/360)/2+Math.cos(2*C*Math.PI/360)/2),k=d.shadowScale,P=d.shadowScale/M,z=d.shadowOffset;e.transform("scale3d("+k+", 1, "+P+") translate3d(0px, "+(n/2+z)+"px, "+-n/2/P+"px) rotateX(-90deg)")}var $=I.isSafari||I.isUiWebView?-l/2:0;i.transform("translate3d(0px,0,"+$+"px) rotateX("+(t.isHorizontal()?0:u)+"deg) rotateY("+(t.isHorizontal()?-u:0)+"deg)")},setTransition:function(e){var t=this.$el;this.slides.transition(e).find(".swiper-slide-shadow-top, .swiper-slide-shadow-right, .swiper-slide-shadow-bottom, .swiper-slide-shadow-left").transition(e),this.params.cubeEffect.shadow&&!this.isHorizontal()&&t.find(".swiper-cube-shadow").transition(e)}},Z={setTranslate:function(){for(var e=this,t=e.slides,a=e.rtlTranslate,i=0;i<t.length;i+=1){var s=t.eq(i),r=s[0].progress;e.params.flipEffect.limitRotation&&(r=Math.max(Math.min(s[0].progress,1),-1));var n=-180*r,o=0,l=-s[0].swiperSlideOffset,d=0;if(e.isHorizontal()?a&&(n=-n):(d=l,o=-n,n=l=0),s[0].style.zIndex=-Math.abs(Math.round(r))+t.length,e.params.flipEffect.slideShadows){var p=e.isHorizontal()?s.find(".swiper-slide-shadow-left"):s.find(".swiper-slide-shadow-top"),c=e.isHorizontal()?s.find(".swiper-slide-shadow-right"):s.find(".swiper-slide-shadow-bottom");0===p.length&&(p=L('<div class="swiper-slide-shadow-'+(e.isHorizontal()?"left":"top")+'"></div>'),s.append(p)),0===c.length&&(c=L('<div class="swiper-slide-shadow-'+(e.isHorizontal()?"right":"bottom")+'"></div>'),s.append(c)),p.length&&(p[0].style.opacity=Math.max(-r,0)),c.length&&(c[0].style.opacity=Math.max(r,0))}s.transform("translate3d("+l+"px, "+d+"px, 0px) rotateX("+o+"deg) rotateY("+n+"deg)")}},setTransition:function(e){var a=this,t=a.slides,i=a.activeIndex,s=a.$wrapperEl;if(t.transition(e).find(".swiper-slide-shadow-top, .swiper-slide-shadow-right, .swiper-slide-shadow-bottom, .swiper-slide-shadow-left").transition(e),a.params.virtualTranslate&&0!==e){var r=!1;t.eq(i).transitionEnd(function(){if(!r&&a&&!a.destroyed){r=!0,a.animating=!1;for(var e=["webkitTransitionEnd","transitionend"],t=0;t<e.length;t+=1)s.trigger(e[t])}})}}},Q={setTranslate:function(){for(var e=this,t=e.width,a=e.height,i=e.slides,s=e.$wrapperEl,r=e.slidesSizesGrid,n=e.params.coverflowEffect,o=e.isHorizontal(),l=e.translate,d=o?t/2-l:a/2-l,p=o?n.rotate:-n.rotate,c=n.depth,u=0,h=i.length;u<h;u+=1){var v=i.eq(u),f=r[u],m=(d-v[0].swiperSlideOffset-f/2)/f*n.modifier,g=o?p*m:0,b=o?0:p*m,w=-c*Math.abs(m),y=o?0:n.stretch*m,x=o?n.stretch*m:0;Math.abs(x)<.001&&(x=0),Math.abs(y)<.001&&(y=0),Math.abs(w)<.001&&(w=0),Math.abs(g)<.001&&(g=0),Math.abs(b)<.001&&(b=0);var T="translate3d("+x+"px,"+y+"px,"+w+"px)  rotateX("+b+"deg) rotateY("+g+"deg)";if(v.transform(T),v[0].style.zIndex=1-Math.abs(Math.round(m)),n.slideShadows){var E=o?v.find(".swiper-slide-shadow-left"):v.find(".swiper-slide-shadow-top"),S=o?v.find(".swiper-slide-shadow-right"):v.find(".swiper-slide-shadow-bottom");0===E.length&&(E=L('<div class="swiper-slide-shadow-'+(o?"left":"top")+'"></div>'),v.append(E)),0===S.length&&(S=L('<div class="swiper-slide-shadow-'+(o?"right":"bottom")+'"></div>'),v.append(S)),E.length&&(E[0].style.opacity=0<m?m:0),S.length&&(S[0].style.opacity=0<-m?-m:0)}}(te.pointerEvents||te.prefixedPointerEvents)&&(s[0].style.perspectiveOrigin=d+"px 50%")},setTransition:function(e){this.slides.transition(e).find(".swiper-slide-shadow-top, .swiper-slide-shadow-right, .swiper-slide-shadow-bottom, .swiper-slide-shadow-left").transition(e)}},ae={init:function(){var e=this,t=e.params.thumbs,a=e.constructor;t.swiper instanceof a?(e.thumbs.swiper=t.swiper,ee.extend(e.thumbs.swiper.originalParams,{watchSlidesProgress:!0,slideToClickedSlide:!1}),ee.extend(e.thumbs.swiper.params,{watchSlidesProgress:!0,slideToClickedSlide:!1})):ee.isObject(t.swiper)&&(e.thumbs.swiper=new a(ee.extend({},t.swiper,{watchSlidesVisibility:!0,watchSlidesProgress:!0,slideToClickedSlide:!1})),e.thumbs.swiperCreated=!0),e.thumbs.swiper.$el.addClass(e.params.thumbs.thumbsContainerClass),e.thumbs.swiper.on("tap",e.thumbs.onThumbClick)},onThumbClick:function(){var e=this,t=e.thumbs.swiper;if(t){var a=t.clickedIndex,i=t.clickedSlide;if(!(i&&L(i).hasClass(e.params.thumbs.slideThumbActiveClass)||null==a)){var s;if(s=t.params.loop?parseInt(L(t.clickedSlide).attr("data-swiper-slide-index"),10):a,e.params.loop){var r=e.activeIndex;e.slides.eq(r).hasClass(e.params.slideDuplicateClass)&&(e.loopFix(),e._clientLeft=e.$wrapperEl[0].clientLeft,r=e.activeIndex);var n=e.slides.eq(r).prevAll('[data-swiper-slide-index="'+s+'"]').eq(0).index(),o=e.slides.eq(r).nextAll('[data-swiper-slide-index="'+s+'"]').eq(0).index();s=void 0===n?o:void 0===o?n:o-r<r-n?o:n}e.slideTo(s)}}},update:function(e){var t=this,a=t.thumbs.swiper;if(a){var i="auto"===a.params.slidesPerView?a.slidesPerViewDynamic():a.params.slidesPerView;if(t.realIndex!==a.realIndex){var s,r=a.activeIndex;if(a.params.loop){a.slides.eq(r).hasClass(a.params.slideDuplicateClass)&&(a.loopFix(),a._clientLeft=a.$wrapperEl[0].clientLeft,r=a.activeIndex);var n=a.slides.eq(r).prevAll('[data-swiper-slide-index="'+t.realIndex+'"]').eq(0).index(),o=a.slides.eq(r).nextAll('[data-swiper-slide-index="'+t.realIndex+'"]').eq(0).index();s=void 0===n?o:void 0===o?n:o-r==r-n?r:o-r<r-n?o:n}else s=t.realIndex;a.visibleSlidesIndexes.indexOf(s)<0&&(a.params.centeredSlides?s=r<s?s-Math.floor(i/2)+1:s+Math.floor(i/2)-1:r<s&&(s=s-i+1),a.slideTo(s,e?0:void 0))}var l=1,d=t.params.thumbs.slideThumbActiveClass;if(1<t.params.slidesPerView&&!t.params.centeredSlides&&(l=t.params.slidesPerView),a.slides.removeClass(d),a.params.loop)for(var p=0;p<l;p+=1)a.$wrapperEl.children('[data-swiper-slide-index="'+(t.realIndex+p)+'"]').addClass(d);else for(var c=0;c<l;c+=1)a.slides.eq(t.realIndex+c).addClass(d)}}},ie=[C,M,k,P,$,O,N,{name:"mousewheel",params:{mousewheel:{enabled:!1,releaseOnEdges:!1,invert:!1,forceToAxis:!1,sensitivity:1,eventsTarged:"container"}},create:function(){var e=this;ee.extend(e,{mousewheel:{enabled:!1,enable:H.enable.bind(e),disable:H.disable.bind(e),handle:H.handle.bind(e),handleMouseEnter:H.handleMouseEnter.bind(e),handleMouseLeave:H.handleMouseLeave.bind(e),lastScrollTime:ee.now()}})},on:{init:function(){this.params.mousewheel.enabled&&this.mousewheel.enable()},destroy:function(){this.mousewheel.enabled&&this.mousewheel.disable()}}},{name:"navigation",params:{navigation:{nextEl:null,prevEl:null,hideOnClick:!1,disabledClass:"swiper-button-disabled",hiddenClass:"swiper-button-hidden",lockClass:"swiper-button-lock"}},create:function(){var e=this;ee.extend(e,{navigation:{init:G.init.bind(e),update:G.update.bind(e),destroy:G.destroy.bind(e),onNextClick:G.onNextClick.bind(e),onPrevClick:G.onPrevClick.bind(e)}})},on:{init:function(){this.navigation.init(),this.navigation.update()},toEdge:function(){this.navigation.update()},fromEdge:function(){this.navigation.update()},destroy:function(){this.navigation.destroy()},click:function(e){var t=this.navigation,a=t.$nextEl,i=t.$prevEl;!this.params.navigation.hideOnClick||L(e.target).is(i)||L(e.target).is(a)||(a&&a.toggleClass(this.params.navigation.hiddenClass),i&&i.toggleClass(this.params.navigation.hiddenClass))}}},{name:"pagination",params:{pagination:{el:null,bulletElement:"span",clickable:!1,hideOnClick:!1,renderBullet:null,renderProgressbar:null,renderFraction:null,renderCustom:null,progressbarOpposite:!1,type:"bullets",dynamicBullets:!1,dynamicMainBullets:1,formatFractionCurrent:function(e){return e},formatFractionTotal:function(e){return e},bulletClass:"swiper-pagination-bullet",bulletActiveClass:"swiper-pagination-bullet-active",modifierClass:"swiper-pagination-",currentClass:"swiper-pagination-current",totalClass:"swiper-pagination-total",hiddenClass:"swiper-pagination-hidden",progressbarFillClass:"swiper-pagination-progressbar-fill",progressbarOppositeClass:"swiper-pagination-progressbar-opposite",clickableClass:"swiper-pagination-clickable",lockClass:"swiper-pagination-lock"}},create:function(){var e=this;ee.extend(e,{pagination:{init:B.init.bind(e),render:B.render.bind(e),update:B.update.bind(e),destroy:B.destroy.bind(e),dynamicBulletIndex:0}})},on:{init:function(){this.pagination.init(),this.pagination.render(),this.pagination.update()},activeIndexChange:function(){this.params.loop?this.pagination.update():void 0===this.snapIndex&&this.pagination.update()},snapIndexChange:function(){this.params.loop||this.pagination.update()},slidesLengthChange:function(){this.params.loop&&(this.pagination.render(),this.pagination.update())},snapGridLengthChange:function(){this.params.loop||(this.pagination.render(),this.pagination.update())},destroy:function(){this.pagination.destroy()},click:function(e){var t=this;t.params.pagination.el&&t.params.pagination.hideOnClick&&0<t.pagination.$el.length&&!L(e.target).hasClass(t.params.pagination.bulletClass)&&t.pagination.$el.toggleClass(t.params.pagination.hiddenClass)}}},{name:"scrollbar",params:{scrollbar:{el:null,dragSize:"auto",hide:!1,draggable:!1,snapOnRelease:!0,lockClass:"swiper-scrollbar-lock",dragClass:"swiper-scrollbar-drag"}},create:function(){var e=this;ee.extend(e,{scrollbar:{init:X.init.bind(e),destroy:X.destroy.bind(e),updateSize:X.updateSize.bind(e),setTranslate:X.setTranslate.bind(e),setTransition:X.setTransition.bind(e),enableDraggable:X.enableDraggable.bind(e),disableDraggable:X.disableDraggable.bind(e),setDragPosition:X.setDragPosition.bind(e),onDragStart:X.onDragStart.bind(e),onDragMove:X.onDragMove.bind(e),onDragEnd:X.onDragEnd.bind(e),isTouched:!1,timeout:null,dragTimeout:null}})},on:{init:function(){this.scrollbar.init(),this.scrollbar.updateSize(),this.scrollbar.setTranslate()},update:function(){this.scrollbar.updateSize()},resize:function(){this.scrollbar.updateSize()},observerUpdate:function(){this.scrollbar.updateSize()},setTranslate:function(){this.scrollbar.setTranslate()},setTransition:function(e){this.scrollbar.setTransition(e)},destroy:function(){this.scrollbar.destroy()}}},{name:"parallax",params:{parallax:{enabled:!1}},create:function(){ee.extend(this,{parallax:{setTransform:Y.setTransform.bind(this),setTranslate:Y.setTranslate.bind(this),setTransition:Y.setTransition.bind(this)}})},on:{beforeInit:function(){this.params.parallax.enabled&&(this.params.watchSlidesProgress=!0,this.originalParams.watchSlidesProgress=!0)},init:function(){this.params.parallax&&this.parallax.setTranslate()},setTranslate:function(){this.params.parallax&&this.parallax.setTranslate()},setTransition:function(e){this.params.parallax&&this.parallax.setTransition(e)}}},{name:"zoom",params:{zoom:{enabled:!1,maxRatio:3,minRatio:1,toggle:!0,containerClass:"swiper-zoom-container",zoomedSlideClass:"swiper-slide-zoomed"}},create:function(){var i=this,t={enabled:!1,scale:1,currentScale:1,isScaling:!1,gesture:{$slideEl:void 0,slideWidth:void 0,slideHeight:void 0,$imageEl:void 0,$imageWrapEl:void 0,maxRatio:3},image:{isTouched:void 0,isMoved:void 0,currentX:void 0,currentY:void 0,minX:void 0,minY:void 0,maxX:void 0,maxY:void 0,width:void 0,height:void 0,startX:void 0,startY:void 0,touchesStart:{},touchesCurrent:{}},velocity:{x:void 0,y:void 0,prevPositionX:void 0,prevPositionY:void 0,prevTime:void 0}};"onGestureStart onGestureChange onGestureEnd onTouchStart onTouchMove onTouchEnd onTransitionEnd toggle enable disable in out".split(" ").forEach(function(e){t[e]=V[e].bind(i)}),ee.extend(i,{zoom:t});var s=1;Object.defineProperty(i.zoom,"scale",{get:function(){return s},set:function(e){if(s!==e){var t=i.zoom.gesture.$imageEl?i.zoom.gesture.$imageEl[0]:void 0,a=i.zoom.gesture.$slideEl?i.zoom.gesture.$slideEl[0]:void 0;i.emit("zoomChange",e,t,a)}s=e}})},on:{init:function(){this.params.zoom.enabled&&this.zoom.enable()},destroy:function(){this.zoom.disable()},touchStart:function(e){this.zoom.enabled&&this.zoom.onTouchStart(e)},touchEnd:function(e){this.zoom.enabled&&this.zoom.onTouchEnd(e)},doubleTap:function(e){this.params.zoom.enabled&&this.zoom.enabled&&this.params.zoom.toggle&&this.zoom.toggle(e)},transitionEnd:function(){this.zoom.enabled&&this.params.zoom.enabled&&this.zoom.onTransitionEnd()}}},{name:"lazy",params:{lazy:{enabled:!1,loadPrevNext:!1,loadPrevNextAmount:1,loadOnTransitionStart:!1,elementClass:"swiper-lazy",loadingClass:"swiper-lazy-loading",loadedClass:"swiper-lazy-loaded",preloaderClass:"swiper-lazy-preloader"}},create:function(){ee.extend(this,{lazy:{initialImageLoaded:!1,load:F.load.bind(this),loadInSlide:F.loadInSlide.bind(this)}})},on:{beforeInit:function(){this.params.lazy.enabled&&this.params.preloadImages&&(this.params.preloadImages=!1)},init:function(){this.params.lazy.enabled&&!this.params.loop&&0===this.params.initialSlide&&this.lazy.load()},scroll:function(){this.params.freeMode&&!this.params.freeModeSticky&&this.lazy.load()},resize:function(){this.params.lazy.enabled&&this.lazy.load()},scrollbarDragMove:function(){this.params.lazy.enabled&&this.lazy.load()},transitionStart:function(){var e=this;e.params.lazy.enabled&&(e.params.lazy.loadOnTransitionStart||!e.params.lazy.loadOnTransitionStart&&!e.lazy.initialImageLoaded)&&e.lazy.load()},transitionEnd:function(){this.params.lazy.enabled&&!this.params.lazy.loadOnTransitionStart&&this.lazy.load()}}},{name:"controller",params:{controller:{control:void 0,inverse:!1,by:"slide"}},create:function(){var e=this;ee.extend(e,{controller:{control:e.params.controller.control,getInterpolateFunction:R.getInterpolateFunction.bind(e),setTranslate:R.setTranslate.bind(e),setTransition:R.setTransition.bind(e)}})},on:{update:function(){this.controller.control&&this.controller.spline&&(this.controller.spline=void 0,delete this.controller.spline)},resize:function(){this.controller.control&&this.controller.spline&&(this.controller.spline=void 0,delete this.controller.spline)},observerUpdate:function(){this.controller.control&&this.controller.spline&&(this.controller.spline=void 0,delete this.controller.spline)},setTranslate:function(e,t){this.controller.control&&this.controller.setTranslate(e,t)},setTransition:function(e,t){this.controller.control&&this.controller.setTransition(e,t)}}},{name:"a11y",params:{a11y:{enabled:!0,notificationClass:"swiper-notification",prevSlideMessage:"Previous slide",nextSlideMessage:"Next slide",firstSlideMessage:"This is the first slide",lastSlideMessage:"This is the last slide",paginationBulletMessage:"Go to slide {{index}}"}},create:function(){var t=this;ee.extend(t,{a11y:{liveRegion:L('<span class="'+t.params.a11y.notificationClass+'" aria-live="assertive" aria-atomic="true"></span>')}}),Object.keys(q).forEach(function(e){t.a11y[e]=q[e].bind(t)})},on:{init:function(){this.params.a11y.enabled&&(this.a11y.init(),this.a11y.updateNavigation())},toEdge:function(){this.params.a11y.enabled&&this.a11y.updateNavigation()},fromEdge:function(){this.params.a11y.enabled&&this.a11y.updateNavigation()},paginationUpdate:function(){this.params.a11y.enabled&&this.a11y.updatePagination()},destroy:function(){this.params.a11y.enabled&&this.a11y.destroy()}}},{name:"history",params:{history:{enabled:!1,replaceState:!1,key:"slides"}},create:function(){var e=this;ee.extend(e,{history:{init:W.init.bind(e),setHistory:W.setHistory.bind(e),setHistoryPopState:W.setHistoryPopState.bind(e),scrollToSlide:W.scrollToSlide.bind(e),destroy:W.destroy.bind(e)}})},on:{init:function(){this.params.history.enabled&&this.history.init()},destroy:function(){this.params.history.enabled&&this.history.destroy()},transitionEnd:function(){this.history.initialized&&this.history.setHistory(this.params.history.key,this.activeIndex)}}},{name:"hash-navigation",params:{hashNavigation:{enabled:!1,replaceState:!1,watchState:!1}},create:function(){var e=this;ee.extend(e,{hashNavigation:{initialized:!1,init:j.init.bind(e),destroy:j.destroy.bind(e),setHash:j.setHash.bind(e),onHashCange:j.onHashCange.bind(e)}})},on:{init:function(){this.params.hashNavigation.enabled&&this.hashNavigation.init()},destroy:function(){this.params.hashNavigation.enabled&&this.hashNavigation.destroy()},transitionEnd:function(){this.hashNavigation.initialized&&this.hashNavigation.setHash()}}},{name:"autoplay",params:{autoplay:{enabled:!1,delay:3e3,waitForTransition:!0,disableOnInteraction:!0,stopOnLastSlide:!1,reverseDirection:!1}},create:function(){var t=this;ee.extend(t,{autoplay:{running:!1,paused:!1,run:U.run.bind(t),start:U.start.bind(t),stop:U.stop.bind(t),pause:U.pause.bind(t),onTransitionEnd:function(e){t&&!t.destroyed&&t.$wrapperEl&&e.target===this&&(t.$wrapperEl[0].removeEventListener("transitionend",t.autoplay.onTransitionEnd),t.$wrapperEl[0].removeEventListener("webkitTransitionEnd",t.autoplay.onTransitionEnd),t.autoplay.paused=!1,t.autoplay.running?t.autoplay.run():t.autoplay.stop())}}})},on:{init:function(){this.params.autoplay.enabled&&this.autoplay.start()},beforeTransitionStart:function(e,t){this.autoplay.running&&(t||!this.params.autoplay.disableOnInteraction?this.autoplay.pause(e):this.autoplay.stop())},sliderFirstMove:function(){this.autoplay.running&&(this.params.autoplay.disableOnInteraction?this.autoplay.stop():this.autoplay.pause())},destroy:function(){this.autoplay.running&&this.autoplay.stop()}}},{name:"effect-fade",params:{fadeEffect:{crossFade:!1}},create:function(){ee.extend(this,{fadeEffect:{setTranslate:K.setTranslate.bind(this),setTransition:K.setTransition.bind(this)}})},on:{beforeInit:function(){var e=this;if("fade"===e.params.effect){e.classNames.push(e.params.containerModifierClass+"fade");var t={slidesPerView:1,slidesPerColumn:1,slidesPerGroup:1,watchSlidesProgress:!0,spaceBetween:0,virtualTranslate:!0};ee.extend(e.params,t),ee.extend(e.originalParams,t)}},setTranslate:function(){"fade"===this.params.effect&&this.fadeEffect.setTranslate()},setTransition:function(e){"fade"===this.params.effect&&this.fadeEffect.setTransition(e)}}},{name:"effect-cube",params:{cubeEffect:{slideShadows:!0,shadow:!0,shadowOffset:20,shadowScale:.94}},create:function(){ee.extend(this,{cubeEffect:{setTranslate:_.setTranslate.bind(this),setTransition:_.setTransition.bind(this)}})},on:{beforeInit:function(){var e=this;if("cube"===e.params.effect){e.classNames.push(e.params.containerModifierClass+"cube"),e.classNames.push(e.params.containerModifierClass+"3d");var t={slidesPerView:1,slidesPerColumn:1,slidesPerGroup:1,watchSlidesProgress:!0,resistanceRatio:0,spaceBetween:0,centeredSlides:!1,virtualTranslate:!0};ee.extend(e.params,t),ee.extend(e.originalParams,t)}},setTranslate:function(){"cube"===this.params.effect&&this.cubeEffect.setTranslate()},setTransition:function(e){"cube"===this.params.effect&&this.cubeEffect.setTransition(e)}}},{name:"effect-flip",params:{flipEffect:{slideShadows:!0,limitRotation:!0}},create:function(){ee.extend(this,{flipEffect:{setTranslate:Z.setTranslate.bind(this),setTransition:Z.setTransition.bind(this)}})},on:{beforeInit:function(){var e=this;if("flip"===e.params.effect){e.classNames.push(e.params.containerModifierClass+"flip"),e.classNames.push(e.params.containerModifierClass+"3d");var t={slidesPerView:1,slidesPerColumn:1,slidesPerGroup:1,watchSlidesProgress:!0,spaceBetween:0,virtualTranslate:!0};ee.extend(e.params,t),ee.extend(e.originalParams,t)}},setTranslate:function(){"flip"===this.params.effect&&this.flipEffect.setTranslate()},setTransition:function(e){"flip"===this.params.effect&&this.flipEffect.setTransition(e)}}},{name:"effect-coverflow",params:{coverflowEffect:{rotate:50,stretch:0,depth:100,modifier:1,slideShadows:!0}},create:function(){ee.extend(this,{coverflowEffect:{setTranslate:Q.setTranslate.bind(this),setTransition:Q.setTransition.bind(this)}})},on:{beforeInit:function(){var e=this;"coverflow"===e.params.effect&&(e.classNames.push(e.params.containerModifierClass+"coverflow"),e.classNames.push(e.params.containerModifierClass+"3d"),e.params.watchSlidesProgress=!0,e.originalParams.watchSlidesProgress=!0)},setTranslate:function(){"coverflow"===this.params.effect&&this.coverflowEffect.setTranslate()},setTransition:function(e){"coverflow"===this.params.effect&&this.coverflowEffect.setTransition(e)}}},{name:"thumbs",params:{thumbs:{swiper:null,slideThumbActiveClass:"swiper-slide-thumb-active",thumbsContainerClass:"swiper-container-thumbs"}},create:function(){ee.extend(this,{thumbs:{swiper:null,init:ae.init.bind(this),update:ae.update.bind(this),onThumbClick:ae.onThumbClick.bind(this)}})},on:{beforeInit:function(){var e=this.params.thumbs;e&&e.swiper&&(this.thumbs.init(),this.thumbs.update(!0))},slideChange:function(){this.thumbs.swiper&&this.thumbs.update()},update:function(){this.thumbs.swiper&&this.thumbs.update()},resize:function(){this.thumbs.swiper&&this.thumbs.update()},observerUpdate:function(){this.thumbs.swiper&&this.thumbs.update()},setTransition:function(e){var t=this.thumbs.swiper;t&&t.setTransition(e)},beforeDestroy:function(){var e=this.thumbs.swiper;e&&this.thumbs.swiperCreated&&e&&e.destroy()}}}];return void 0===S.use&&(S.use=S.Class.use,S.installModule=S.Class.installModule),S.use(ie),S});
+//# sourceMappingURL=swiper.min.js.map
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/systemInfo/systemInfoDetails.js b/pluss-manage-page/src/main/resources/static/resources/js/systemInfo/systemInfoDetails.js
new file mode 100644
index 0000000..68bae5f
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/systemInfo/systemInfoDetails.js
@@ -0,0 +1,115 @@
+/**
+ * create by robot 
+ * date Sat Sep 21 15:27:41 CST 2019 
+ */ 
+
+$(document).ready(function(){
+	//form表单样式
+	layui.use(['layer', 'form'], function() {
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+	//li 切换事件
+	$(".nav-tabs>li").click(function() {
+		var index = $(".nav-tabs>li").index(this);
+		$(this).addClass("active").siblings("li").removeClass("active");
+		
+	})
+	//弹出一个提示层
+	$('.fa-save').on('click', function() {
+		saveSystemInfo();
+	});
+
+	//绑定标签栏事件
+	$(document).on('click','.nav-tabs li',function(){
+
+		var action =$(this).data('action');
+		 switch (action) {
+			case "base"://基本资料
+				goBase();
+				break;  
+			case "functions"://多功能
+				goFunctions();
+				break;
+			case "extends"://扩展    
+				goExtends();         
+				break;           
+		 }
+	})
+
+	//加载第一个标签
+	$('.nav-tabs li').eq(0).click();
+	
+});
+
+
+//跳转基本信息 
+function goBase(){
+	var url=ctx+'/systemInfo/querySystemInfoBaseInfo?id='+$('#systemInfoId').val();
+	$('.tab-content').load(url);
+	              
+}
+//跳转多功能输入
+function goFunctions(){ 
+	var url=ctx+'/systemInfo/querySystemInfoFunctionsInfo?id='+$('#systemInfoId').val();
+	$('.tab-content').load(url);  
+	
+}
+//跳转到扩展   
+function goExtends(){
+	
+	var url=ctx+'/systemInfo/querySystemInfoExtendsInfo?id='+$('#systemInfoId').val();
+	$('.tab-content').load(url);          
+}  
+  
+
+ 
+//保存
+function saveSystemInfo(){
+	var title=$("#title").val();
+	var content=$("#content").val();
+	var remark=$("#remark").val();
+	var seq=$("#seq").val();
+	if(StringUtil.isBlank(title)){
+		layer.msg('请输入标题');
+		return;
+	}
+	if(StringUtil.isBlank(content)){
+		layer.msg('请输入内容');
+		return;
+	}
+	if(StringUtil.isNotJustInteger(seq)){
+		if(StringUtil.isBlank(seq)){
+			layer.msg('请输入排序');
+			return;
+		}
+		layer.msg('请输入正确的排序格式(正整数)')
+		return
+	}
+	$(".fa-save").attr("disabled","disabled");
+	$('.fa-save').html('正在保存...')
+	$.ajax({
+		url:ctx+"/systemInfo/saveSystemInfo",
+		type:"POST",
+		dataType:'json',
+		data:$("#data_form").serializeArray(),
+		complete:function(){
+			$(".fa-save").removeAttr("disabled");
+			$('.fa-save').html('保存')
+		},        
+		success:function(service){ 
+		
+			layer.confirm('保存成功,是否前往列表？', {
+				  btn: ['确认','取消'] //按钮
+				}, function(){
+					$('#goback span').trigger('click'); 
+				}, function(){         
+					layer.closeAll();
+			});  
+			
+		}
+	});  
+}
+ 
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/systemInfo/systemInfoList.js b/pluss-manage-page/src/main/resources/static/resources/js/systemInfo/systemInfoList.js
new file mode 100644
index 0000000..b27439c
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/systemInfo/systemInfoList.js
@@ -0,0 +1,315 @@
+/**
+ * create by robot 
+ * date Sat Sep 21 15:27:41 CST 2019 
+ */ 
+
+var pageIndex=1;
+$(document).ready(function(){
+	//调用查询
+	pageIndex=StringUtil.getQueryString('pageIndex');
+	if(pageIndex==undefined||pageIndex==null){
+		pageIndex=1;
+	}
+	querySystemInfo(pageIndex);
+	//绑定hover操作
+	$(document).on('mouseenter','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").show();
+		var width=15;
+		$(this).children('div').find('li').each(function(){
+			//获取li宽度
+			width+=$(this).width();
+		});
+		$(this).children('div').width(width);
+	})
+	$(document).on('mouseleave','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").hide();
+	});
+
+	//日历控件
+	layui.use(['layer', 'laydate'], function() {
+		var layer = layui.layer;
+		laydate = layui.laydate;
+		laydate.render({
+		elem: '#date1' //指定元素
+		});
+		laydate.render({
+			elem: '#date2' //指定元素
+		});
+	});
+
+
+	//行选中事件
+	$("#allCheck").find("span").click(function() {
+		$(this).toggleClass('checked');
+		if($(this).hasClass('checked')){
+			//所有列选中
+		  $(".checker").find("span").each(function () {
+		         $(this).addClass("checked");
+		    })
+		}else{
+			//所有列取消选中
+			$(".checker").find("span").each(function () {
+				 $(this).removeClass("checked");
+		    })
+		}
+	});
+
+	//单个选中
+	$(document).on('click','.checkeBox span',function() {
+		$(this).toggleClass('checked');
+		//设置头部事件
+		var length=$('.checkeBox span').length;
+		var count=0;
+		$(".checkeBox").find("span").each(function () {
+	        if($(this).hasClass("checked")){
+	        	count++;
+	        }
+	   })
+		//全选
+	   if(count==length){
+		   $("#allCheck").find("span").addClass('checked');
+	   }else{
+		   $("#allCheck").find("span").removeClass('checked');
+	   }
+	})
+	//左右div高度相等
+	var left_content_height = $(".right-content").height();
+	$(".left-content").height(left_content_height+35);
+	var sub_left_height=$(".res-menu").height(left_content_height-60);
+});
+
+//查询
+function querySystemInfo(index){
+	if(typeof(index)=='undefined'){
+		index=1;
+	}
+	var url=ctx+'/systemInfo/querySystemInfoByPage';
+	$.ajax({  
+        url:url,  
+        type:"post", 
+        dataType:"json",  
+        data:{  
+        	"currPage":index,
+        	"title":$("#title").val(),
+        	"content":$("#content").val(),
+        },  
+        success:function(result){  
+        	//渲染数据
+        	$('#data_content').empty();
+        	var presentPage=result.currPage;
+        	var header='';
+        	$.each(result.systemInfoList,function(i){
+        		var orderNumber=(presentPage-1)*12+i+1;
+        		var systemInfo=result.systemInfoList[i];
+        		var data='';
+        		data+='<tr class="odd">';
+        		data+='<td class="textc">';
+				data+='		 <div class="checker checkeBox">';        		data+='		 <span class=""  data-id="'+systemInfo.id+'"><input type="checkbox"  value=""></span>';
+        		data+='		</div>';
+        		data+='</td>';
+        		data+='<td class="textc">'+orderNumber+'</td>';
+        		var title='';
+        		if(StringUtil.isNotBlank(systemInfo.title)){
+        			title=systemInfo.title;
+        		}
+        		data+='<td class="textc">'+title+'</td>';
+        		var content='';
+        		if(StringUtil.isNotBlank(systemInfo.content)){
+        			content=systemInfo.content;
+        		}
+        		data+='<td class="textc">'+content+'</td>';
+        		var remark='';
+        		if(StringUtil.isNotBlank(systemInfo.remark)){
+        			remark=systemInfo.remark;
+        		}
+        		data+='<td class="textc">'+remark+'</td>';
+        		var seq='';
+        		if(StringUtil.isNotBlank(systemInfo.seq)){
+        			seq=systemInfo.seq;
+        		}
+        		data+='<td class="textc">'+seq+'</td>';
+        		var createDt='';
+        		if(StringUtil.isNotBlank(systemInfo.createDt)){
+        			createDt= dateFtt("yyyy-MM-dd hh:mm",new Date(systemInfo.createDt));
+        		}
+        		data+='<td class="textc">'+createDt+'</td>';
+        		data+='<td class="textc">';
+        		data+='<div class="positionr listOperaters">';
+        		data+='		<a href="javascript:void(0);"  class="icon-large dlblock w16 h16"><img src="'+resourcePath+'/images/angle-down.png"/></a>';
+        		data+='		<div class="ops_box ops_itemDiv positiona clearfix whitebg">';
+        		data+='			<ul>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showSystemInfoDetails('+systemInfo.id+')" class="btn btn-primary fa fa-edit ops_more f12">编辑</a></li>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="initDeleteSystemInfo('+systemInfo.id+')" class="btn btn-primary fa fa-remove ops_more f12">删除</a></li>';
+        		/*data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showSystemInfoReadDetails('+systemInfo.id+')" class="btn btn-primary fa fa-detail ops_more f12">明细</a></li>';*/
+        	    data+='			</ul>';
+              data+='		</div>';
+        	    data+='</div>';
+        	    data+='</td>';
+        	    data+='</tr>';
+        	    $('#data_content').append(data);
+        	});
+        	//分页
+        	$('#pageCount').html(result.pageCount);
+      	$('#currPage').html(result.currPage);
+          $('#totalCount').html(result.count);
+           	//设置分页
+           	pageIndex=result.currPage;
+			$('#pagination').pagination({
+				pageCount: result.pageCount,
+				jump: true,
+				coping: true,
+				jump: true,
+				homePage: '首页',
+				endPage: '末页',
+				prevContent: '上页',
+				nextContent: '下页',
+				current:result.currPage,
+				callback:function(api){
+					pageIndex=api.getCurrent();
+					querySystemInfo(api.getCurrent());
+				}
+			});
+        } 
+    });  
+	//表头列不选中
+	$("#allCheck").find("span").removeClass('checked');
+}
+
+//初始化新增
+function initAddSystemInfo(){
+	window.location=ctx+'/systemInfo/querySystemInfoDetails?pageIndex='+pageIndex;
+}
+
+//初始化修改
+function showSystemInfoDetails(id){
+	window.location=ctx+'/systemInfo/querySystemInfoDetails?id='+id+'&pageIndex='+pageIndex;
+}
+
+//初始化明细
+function showSystemInfoReadDetails(id){
+	window.location=ctx+'/systemInfo/querySystemInfoReadDetails?id='+id+'&pageIndex='+pageIndex;
+}
+
+//初始化删除
+function initDeleteSystemInfo(id){
+	
+		layer.open({
+		type: 1,
+		closeBtn: 1,		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r'	, //按钮居中
+		shade: 0.3 ,//不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteSystemInfo(id,true);
+		}
+	});
+}
+
+//删除
+function deleteSystemInfo(id,showMsg){
+	$.ajax({
+		url:ctx+'/systemInfo/deleteSystemInfo',
+		data:[{
+			name:'id',
+			value:id
+		}],
+		type:'POST',
+		dataType:'json',
+		success:function(){
+			querySystemInfo(pageIndex);
+			if(showMsg){
+				layer.msg('删除成功!');	
+			}
+		}
+	});
+}
+//头部编辑
+function initEditSystemInfo(){
+	var count=0;
+	var id=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+        	 id=$(this).data('id');
+         }
+    })
+    if(count>1){
+    	layer.msg('只能选中一行记录进行操作!');
+    	return ;
+    }
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	 if(id>0){
+	  showSystemInfoDetails(id);
+	 }
+}
+//头部删除
+function initBatchDeleteSystemInfo(){
+	var count=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+         }
+    })
+	
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	
+
+	layer.open({
+		type: 1,
+		closeBtn: 1,
+		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r', //按钮居中
+		shade: 0.3, //不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteBatchSystemInfo();
+		}
+	});
+	
+}
+//批量删除
+function deleteBatchSystemInfo(){
+	
+	$(".checkeBox").find("span").each(function () {
+        if($(this).hasClass("checked")){
+        	var id=$(this).data('id');
+        	deleteSystemInfo(id,false);
+        	layer.msg('删除成功!');	
+        }
+   })
+}
+
+//时间格式化处理
+function dateFtt(fmt,date)   
+{ //author: meizz   
+  var o = {   
+    "M+" : date.getMonth()+1,                 //月份   
+    "d+" : date.getDate(),                    //日   
+    "h+" : date.getHours(),                   //小时   
+    "m+" : date.getMinutes(),                 //分   
+    "s+" : date.getSeconds(),                 //秒   
+    "q+" : Math.floor((date.getMonth()+3)/3), //季度   
+    "S"  : date.getMilliseconds()             //毫秒   
+  };   
+  if(/(y+)/.test(fmt))   
+    fmt=fmt.replace(RegExp.$1, (date.getFullYear()+"").substr(4 - RegExp.$1.length));   
+  for(var k in o)   
+    if(new RegExp("("+ k +")").test(fmt))   
+  fmt = fmt.replace(RegExp.$1, (RegExp.$1.length==1) ? (o[k]) : (("00"+ o[k]).substr((""+ o[k]).length)));   
+  return fmt;   
+}
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/systemInfo/systemInfoReadDetails.js b/pluss-manage-page/src/main/resources/static/resources/js/systemInfo/systemInfoReadDetails.js
new file mode 100644
index 0000000..f6e653f
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/systemInfo/systemInfoReadDetails.js
@@ -0,0 +1,115 @@
+/**
+ * create by robot 
+ * date Sat Sep 21 15:27:41 CST 2019 
+ */ 
+
+$(document).ready(function(){
+	//form表单样式
+	layui.use(['layer', 'form'], function() {
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+	//li 切换事件
+	$(".nav-tabs>li").click(function() {
+		var index = $(".nav-tabs>li").index(this);
+		$(this).addClass("active").siblings("li").removeClass("active");
+		
+	})
+	//弹出一个提示层
+	$('.fa-save').on('click', function() {
+		saveSystemInfo();
+	});
+
+	//绑定标签栏事件
+	$(document).on('click','.nav-tabs li',function(){
+
+		var action =$(this).data('action');
+		 switch (action) {
+			case "base"://基本资料
+				goBase();
+				break;  
+			case "functions"://多功能
+				goFunctions();
+				break;
+			case "extends"://扩展    
+				goExtends();         
+				break;           
+		 }
+	})
+
+	//加载第一个标签
+	$('.nav-tabs li').eq(0).click();
+	
+});
+
+
+//跳转基本信息 
+function goBase(){
+	var url=ctx+'/systemInfo/querySystemInfoBaseReadInfo?id='+$('#systemInfoId').val();
+	$('.tab-content').load(url);
+	              
+}
+//跳转多功能输入
+function goFunctions(){ 
+	var url=ctx+'/systemInfo/querySystemInfoFunctionsInfo?id='+$('#systemInfoId').val();
+	$('.tab-content').load(url);  
+	
+}
+//跳转到扩展   
+function goExtends(){
+	
+	var url=ctx+'/systemInfo/querySystemInfoExtendsInfo?id='+$('#systemInfoId').val();
+	$('.tab-content').load(url);          
+}  
+  
+
+ 
+//保存
+function saveSystemInfo(){
+	var title=$("#title").val();
+	var content=$("#content").val();
+	var remark=$("#remark").val();
+	var seq=$("#seq").val();
+	if(StringUtil.isBlank(title)){
+		layer.msg('请输入标题');
+		return;
+	}
+	if(StringUtil.isBlank(content)){
+		layer.msg('请输入内容');
+		return;
+	}
+	if(StringUtil.isNotJustInteger(seq)){
+		if(StringUtil.isBlank(seq)){
+			layer.msg('请输入排序');
+			return;
+		}
+		layer.msg('请输入正确的排序格式(正整数)')
+		return
+	}
+	$(".fa-save").attr("disabled","disabled");
+	$('.fa-save').html('正在保存...')
+	$.ajax({
+		url:ctx+"/systemInfo/saveSystemInfo",
+		type:"POST",
+		dataType:'json',
+		data:$("#data_form").serializeArray(),
+		complete:function(){
+			$(".fa-save").removeAttr("disabled");
+			$('.fa-save').html('保存')
+		},        
+		success:function(service){ 
+		
+			layer.confirm('保存成功,是否前往列表？', {
+				  btn: ['确认','取消'] //按钮
+				}, function(){
+					$('#goback span').trigger('click'); 
+				}, function(){         
+					layer.closeAll();
+			});  
+			
+		}
+	});  
+}
+ 
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/jquery/jquery-1.10.1.min.js b/pluss-manage-page/src/main/resources/static/resources/js/third-party/jquery/jquery-1.10.1.min.js
new file mode 100644
index 0000000..e407e76
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/third-party/jquery/jquery-1.10.1.min.js
@@ -0,0 +1,6 @@
+/*! jQuery v1.10.1 | (c) 2005, 2013 jQuery Foundation, Inc. | jquery.org/license
+//@ sourceMappingURL=jquery-1.10.1.min.map
+*/
+(function(e,t){var n,r,i=typeof t,o=e.location,a=e.document,s=a.documentElement,l=e.jQuery,u=e.$,c={},p=[],f="1.10.1",d=p.concat,h=p.push,g=p.slice,m=p.indexOf,y=c.toString,v=c.hasOwnProperty,b=f.trim,x=function(e,t){return new x.fn.init(e,t,r)},w=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,T=/\S+/g,C=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,N=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,k=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,E=/^[\],:{}\s]*$/,S=/(?:^|:|,)(?:\s*\[)+/g,A=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,j=/"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g,D=/^-ms-/,L=/-([\da-z])/gi,H=function(e,t){return t.toUpperCase()},q=function(e){(a.addEventListener||"load"===e.type||"complete"===a.readyState)&&(_(),x.ready())},_=function(){a.addEventListener?(a.removeEventListener("DOMContentLoaded",q,!1),e.removeEventListener("load",q,!1)):(a.detachEvent("onreadystatechange",q),e.detachEvent("onload",q))};x.fn=x.prototype={jquery:f,constructor:x,init:function(e,n,r){var i,o;if(!e)return this;if("string"==typeof e){if(i="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:N.exec(e),!i||!i[1]&&n)return!n||n.jquery?(n||r).find(e):this.constructor(n).find(e);if(i[1]){if(n=n instanceof x?n[0]:n,x.merge(this,x.parseHTML(i[1],n&&n.nodeType?n.ownerDocument||n:a,!0)),k.test(i[1])&&x.isPlainObject(n))for(i in n)x.isFunction(this[i])?this[i](n[i]):this.attr(i,n[i]);return this}if(o=a.getElementById(i[2]),o&&o.parentNode){if(o.id!==i[2])return r.find(e);this.length=1,this[0]=o}return this.context=a,this.selector=e,this}return e.nodeType?(this.context=this[0]=e,this.length=1,this):x.isFunction(e)?r.ready(e):(e.selector!==t&&(this.selector=e.selector,this.context=e.context),x.makeArray(e,this))},selector:"",length:0,toArray:function(){return g.call(this)},get:function(e){return null==e?this.toArray():0>e?this[this.length+e]:this[e]},pushStack:function(e){var t=x.merge(this.constructor(),e);return t.prevObject=this,t.context=this.context,t},each:function(e,t){return x.each(this,e,t)},ready:function(e){return x.ready.promise().done(e),this},slice:function(){return this.pushStack(g.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(0>e?t:0);return this.pushStack(n>=0&&t>n?[this[n]]:[])},map:function(e){return this.pushStack(x.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject||this.constructor(null)},push:h,sort:[].sort,splice:[].splice},x.fn.init.prototype=x.fn,x.extend=x.fn.extend=function(){var e,n,r,i,o,a,s=arguments[0]||{},l=1,u=arguments.length,c=!1;for("boolean"==typeof s&&(c=s,s=arguments[1]||{},l=2),"object"==typeof s||x.isFunction(s)||(s={}),u===l&&(s=this,--l);u>l;l++)if(null!=(o=arguments[l]))for(i in o)e=s[i],r=o[i],s!==r&&(c&&r&&(x.isPlainObject(r)||(n=x.isArray(r)))?(n?(n=!1,a=e&&x.isArray(e)?e:[]):a=e&&x.isPlainObject(e)?e:{},s[i]=x.extend(c,a,r)):r!==t&&(s[i]=r));return s},x.extend({expando:"jQuery"+(f+Math.random()).replace(/\D/g,""),noConflict:function(t){return e.$===x&&(e.$=u),t&&e.jQuery===x&&(e.jQuery=l),x},isReady:!1,readyWait:1,holdReady:function(e){e?x.readyWait++:x.ready(!0)},ready:function(e){if(e===!0?!--x.readyWait:!x.isReady){if(!a.body)return setTimeout(x.ready);x.isReady=!0,e!==!0&&--x.readyWait>0||(n.resolveWith(a,[x]),x.fn.trigger&&x(a).trigger("ready").off("ready"))}},isFunction:function(e){return"function"===x.type(e)},isArray:Array.isArray||function(e){return"array"===x.type(e)},isWindow:function(e){return null!=e&&e==e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?c[y.call(e)]||"object":typeof e},isPlainObject:function(e){var n;if(!e||"object"!==x.type(e)||e.nodeType||x.isWindow(e))return!1;try{if(e.constructor&&!v.call(e,"constructor")&&!v.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(r){return!1}if(x.support.ownLast)for(n in e)return v.call(e,n);for(n in e);return n===t||v.call(e,n)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},error:function(e){throw Error(e)},parseHTML:function(e,t,n){if(!e||"string"!=typeof e)return null;"boolean"==typeof t&&(n=t,t=!1),t=t||a;var r=k.exec(e),i=!n&&[];return r?[t.createElement(r[1])]:(r=x.buildFragment([e],t,i),i&&x(i).remove(),x.merge([],r.childNodes))},parseJSON:function(n){return e.JSON&&e.JSON.parse?e.JSON.parse(n):null===n?n:"string"==typeof n&&(n=x.trim(n),n&&E.test(n.replace(A,"@").replace(j,"]").replace(S,"")))?Function("return "+n)():(x.error("Invalid JSON: "+n),t)},parseXML:function(n){var r,i;if(!n||"string"!=typeof n)return null;try{e.DOMParser?(i=new DOMParser,r=i.parseFromString(n,"text/xml")):(r=new ActiveXObject("Microsoft.XMLDOM"),r.async="false",r.loadXML(n))}catch(o){r=t}return r&&r.documentElement&&!r.getElementsByTagName("parsererror").length||x.error("Invalid XML: "+n),r},noop:function(){},globalEval:function(t){t&&x.trim(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(D,"ms-").replace(L,H)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t,n){var r,i=0,o=e.length,a=M(e);if(n){if(a){for(;o>i;i++)if(r=t.apply(e[i],n),r===!1)break}else for(i in e)if(r=t.apply(e[i],n),r===!1)break}else if(a){for(;o>i;i++)if(r=t.call(e[i],i,e[i]),r===!1)break}else for(i in e)if(r=t.call(e[i],i,e[i]),r===!1)break;return e},trim:b&&!b.call("\ufeff\u00a0")?function(e){return null==e?"":b.call(e)}:function(e){return null==e?"":(e+"").replace(C,"")},makeArray:function(e,t){var n=t||[];return null!=e&&(M(Object(e))?x.merge(n,"string"==typeof e?[e]:e):h.call(n,e)),n},inArray:function(e,t,n){var r;if(t){if(m)return m.call(t,e,n);for(r=t.length,n=n?0>n?Math.max(0,r+n):n:0;r>n;n++)if(n in t&&t[n]===e)return n}return-1},merge:function(e,n){var r=n.length,i=e.length,o=0;if("number"==typeof r)for(;r>o;o++)e[i++]=n[o];else while(n[o]!==t)e[i++]=n[o++];return e.length=i,e},grep:function(e,t,n){var r,i=[],o=0,a=e.length;for(n=!!n;a>o;o++)r=!!t(e[o],o),n!==r&&i.push(e[o]);return i},map:function(e,t,n){var r,i=0,o=e.length,a=M(e),s=[];if(a)for(;o>i;i++)r=t(e[i],i,n),null!=r&&(s[s.length]=r);else for(i in e)r=t(e[i],i,n),null!=r&&(s[s.length]=r);return d.apply([],s)},guid:1,proxy:function(e,n){var r,i,o;return"string"==typeof n&&(o=e[n],n=e,e=o),x.isFunction(e)?(r=g.call(arguments,2),i=function(){return e.apply(n||this,r.concat(g.call(arguments)))},i.guid=e.guid=e.guid||x.guid++,i):t},access:function(e,n,r,i,o,a,s){var l=0,u=e.length,c=null==r;if("object"===x.type(r)){o=!0;for(l in r)x.access(e,n,l,r[l],!0,a,s)}else if(i!==t&&(o=!0,x.isFunction(i)||(s=!0),c&&(s?(n.call(e,i),n=null):(c=n,n=function(e,t,n){return c.call(x(e),n)})),n))for(;u>l;l++)n(e[l],r,s?i:i.call(e[l],l,n(e[l],r)));return o?e:c?n.call(e):u?n(e[0],r):a},now:function(){return(new Date).getTime()},swap:function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];i=n.apply(e,r||[]);for(o in t)e.style[o]=a[o];return i}}),x.ready.promise=function(t){if(!n)if(n=x.Deferred(),"complete"===a.readyState)setTimeout(x.ready);else if(a.addEventListener)a.addEventListener("DOMContentLoaded",q,!1),e.addEventListener("load",q,!1);else{a.attachEvent("onreadystatechange",q),e.attachEvent("onload",q);var r=!1;try{r=null==e.frameElement&&a.documentElement}catch(i){}r&&r.doScroll&&function o(){if(!x.isReady){try{r.doScroll("left")}catch(e){return setTimeout(o,50)}_(),x.ready()}}()}return n.promise(t)},x.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(e,t){c["[object "+t+"]"]=t.toLowerCase()});function M(e){var t=e.length,n=x.type(e);return x.isWindow(e)?!1:1===e.nodeType&&t?!0:"array"===n||"function"!==n&&(0===t||"number"==typeof t&&t>0&&t-1 in e)}r=x(a),function(e,t){var n,r,i,o,a,s,l,u,c,p,f,d,h,g,m,y,v,b="sizzle"+-new Date,w=e.document,T=0,C=0,N=lt(),k=lt(),E=lt(),S=!1,A=function(){return 0},j=typeof t,D=1<<31,L={}.hasOwnProperty,H=[],q=H.pop,_=H.push,M=H.push,O=H.slice,F=H.indexOf||function(e){var t=0,n=this.length;for(;n>t;t++)if(this[t]===e)return t;return-1},B="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",P="[\\x20\\t\\r\\n\\f]",R="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",W=R.replace("w","w#"),$="\\["+P+"*("+R+")"+P+"*(?:([*^$|!~]?=)"+P+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+W+")|)|)"+P+"*\\]",I=":("+R+")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+$.replace(3,8)+")*)|.*)\\)|)",z=RegExp("^"+P+"+|((?:^|[^\\\\])(?:\\\\.)*)"+P+"+$","g"),X=RegExp("^"+P+"*,"+P+"*"),U=RegExp("^"+P+"*([>+~]|"+P+")"+P+"*"),V=RegExp(P+"*[+~]"),Y=RegExp("="+P+"*([^\\]'\"]*)"+P+"*\\]","g"),J=RegExp(I),G=RegExp("^"+W+"$"),Q={ID:RegExp("^#("+R+")"),CLASS:RegExp("^\\.("+R+")"),TAG:RegExp("^("+R.replace("w","w*")+")"),ATTR:RegExp("^"+$),PSEUDO:RegExp("^"+I),CHILD:RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+P+"*(even|odd|(([+-]|)(\\d*)n|)"+P+"*(?:([+-]|)"+P+"*(\\d+)|))"+P+"*\\)|)","i"),bool:RegExp("^(?:"+B+")$","i"),needsContext:RegExp("^"+P+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+P+"*((?:-\\d)?\\d*)"+P+"*\\)|)(?=[^-]|$)","i")},K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,et=/^(?:input|select|textarea|button)$/i,tt=/^h\d$/i,nt=/'|\\/g,rt=RegExp("\\\\([\\da-f]{1,6}"+P+"?|("+P+")|.)","ig"),it=function(e,t,n){var r="0x"+t-65536;return r!==r||n?t:0>r?String.fromCharCode(r+65536):String.fromCharCode(55296|r>>10,56320|1023&r)};try{M.apply(H=O.call(w.childNodes),w.childNodes),H[w.childNodes.length].nodeType}catch(ot){M={apply:H.length?function(e,t){_.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function at(e,t,n,i){var o,a,s,l,u,c,d,m,y,x;if((t?t.ownerDocument||t:w)!==f&&p(t),t=t||f,n=n||[],!e||"string"!=typeof e)return n;if(1!==(l=t.nodeType)&&9!==l)return[];if(h&&!i){if(o=Z.exec(e))if(s=o[1]){if(9===l){if(a=t.getElementById(s),!a||!a.parentNode)return n;if(a.id===s)return n.push(a),n}else if(t.ownerDocument&&(a=t.ownerDocument.getElementById(s))&&v(t,a)&&a.id===s)return n.push(a),n}else{if(o[2])return M.apply(n,t.getElementsByTagName(e)),n;if((s=o[3])&&r.getElementsByClassName&&t.getElementsByClassName)return M.apply(n,t.getElementsByClassName(s)),n}if(r.qsa&&(!g||!g.test(e))){if(m=d=b,y=t,x=9===l&&e,1===l&&"object"!==t.nodeName.toLowerCase()){c=bt(e),(d=t.getAttribute("id"))?m=d.replace(nt,"\\$&"):t.setAttribute("id",m),m="[id='"+m+"'] ",u=c.length;while(u--)c[u]=m+xt(c[u]);y=V.test(e)&&t.parentNode||t,x=c.join(",")}if(x)try{return M.apply(n,y.querySelectorAll(x)),n}catch(T){}finally{d||t.removeAttribute("id")}}}return At(e.replace(z,"$1"),t,n,i)}function st(e){return K.test(e+"")}function lt(){var e=[];function t(n,r){return e.push(n+=" ")>o.cacheLength&&delete t[e.shift()],t[n]=r}return t}function ut(e){return e[b]=!0,e}function ct(e){var t=f.createElement("div");try{return!!e(t)}catch(n){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function pt(e,t,n){e=e.split("|");var r,i=e.length,a=n?null:t;while(i--)(r=o.attrHandle[e[i]])&&r!==t||(o.attrHandle[e[i]]=a)}function ft(e,t){var n=e.getAttributeNode(t);return n&&n.specified?n.value:e[t]===!0?t.toLowerCase():null}function dt(e,t){return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}function ht(e){return"input"===e.nodeName.toLowerCase()?e.defaultValue:t}function gt(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&(~t.sourceIndex||D)-(~e.sourceIndex||D);if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function mt(e){return function(t){var n=t.nodeName.toLowerCase();return"input"===n&&t.type===e}}function yt(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function vt(e){return ut(function(t){return t=+t,ut(function(n,r){var i,o=e([],n.length,t),a=o.length;while(a--)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}s=at.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?"HTML"!==t.nodeName:!1},r=at.support={},p=at.setDocument=function(e){var n=e?e.ownerDocument||e:w,i=n.parentWindow;return n!==f&&9===n.nodeType&&n.documentElement?(f=n,d=n.documentElement,h=!s(n),i&&i.frameElement&&i.attachEvent("onbeforeunload",function(){p()}),r.attributes=ct(function(e){return e.innerHTML="<a href='#'></a>",pt("type|href|height|width",dt,"#"===e.firstChild.getAttribute("href")),pt(B,ft,null==e.getAttribute("disabled")),e.className="i",!e.getAttribute("className")}),r.input=ct(function(e){return e.innerHTML="<input>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")}),pt("value",ht,r.attributes&&r.input),r.getElementsByTagName=ct(function(e){return e.appendChild(n.createComment("")),!e.getElementsByTagName("*").length}),r.getElementsByClassName=ct(function(e){return e.innerHTML="<div class='a'></div><div class='a i'></div>",e.firstChild.className="i",2===e.getElementsByClassName("i").length}),r.getById=ct(function(e){return d.appendChild(e).id=b,!n.getElementsByName||!n.getElementsByName(b).length}),r.getById?(o.find.ID=function(e,t){if(typeof t.getElementById!==j&&h){var n=t.getElementById(e);return n&&n.parentNode?[n]:[]}},o.filter.ID=function(e){var t=e.replace(rt,it);return function(e){return e.getAttribute("id")===t}}):(delete o.find.ID,o.filter.ID=function(e){var t=e.replace(rt,it);return function(e){var n=typeof e.getAttributeNode!==j&&e.getAttributeNode("id");return n&&n.value===t}}),o.find.TAG=r.getElementsByTagName?function(e,n){return typeof n.getElementsByTagName!==j?n.getElementsByTagName(e):t}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},o.find.CLASS=r.getElementsByClassName&&function(e,n){return typeof n.getElementsByClassName!==j&&h?n.getElementsByClassName(e):t},m=[],g=[],(r.qsa=st(n.querySelectorAll))&&(ct(function(e){e.innerHTML="<select><option selected=''></option></select>",e.querySelectorAll("[selected]").length||g.push("\\["+P+"*(?:value|"+B+")"),e.querySelectorAll(":checked").length||g.push(":checked")}),ct(function(e){var t=n.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("t",""),e.querySelectorAll("[t^='']").length&&g.push("[*^$]="+P+"*(?:''|\"\")"),e.querySelectorAll(":enabled").length||g.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),g.push(",.*:")})),(r.matchesSelector=st(y=d.webkitMatchesSelector||d.mozMatchesSelector||d.oMatchesSelector||d.msMatchesSelector))&&ct(function(e){r.disconnectedMatch=y.call(e,"div"),y.call(e,"[s!='']:x"),m.push("!=",I)}),g=g.length&&RegExp(g.join("|")),m=m.length&&RegExp(m.join("|")),v=st(d.contains)||d.compareDocumentPosition?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},r.sortDetached=ct(function(e){return 1&e.compareDocumentPosition(n.createElement("div"))}),A=d.compareDocumentPosition?function(e,t){if(e===t)return S=!0,0;var i=t.compareDocumentPosition&&e.compareDocumentPosition&&e.compareDocumentPosition(t);return i?1&i||!r.sortDetached&&t.compareDocumentPosition(e)===i?e===n||v(w,e)?-1:t===n||v(w,t)?1:c?F.call(c,e)-F.call(c,t):0:4&i?-1:1:e.compareDocumentPosition?-1:1}:function(e,t){var r,i=0,o=e.parentNode,a=t.parentNode,s=[e],l=[t];if(e===t)return S=!0,0;if(!o||!a)return e===n?-1:t===n?1:o?-1:a?1:c?F.call(c,e)-F.call(c,t):0;if(o===a)return gt(e,t);r=e;while(r=r.parentNode)s.unshift(r);r=t;while(r=r.parentNode)l.unshift(r);while(s[i]===l[i])i++;return i?gt(s[i],l[i]):s[i]===w?-1:l[i]===w?1:0},n):f},at.matches=function(e,t){return at(e,null,null,t)},at.matchesSelector=function(e,t){if((e.ownerDocument||e)!==f&&p(e),t=t.replace(Y,"='$1']"),!(!r.matchesSelector||!h||m&&m.test(t)||g&&g.test(t)))try{var n=y.call(e,t);if(n||r.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(i){}return at(t,f,null,[e]).length>0},at.contains=function(e,t){return(e.ownerDocument||e)!==f&&p(e),v(e,t)},at.attr=function(e,n){(e.ownerDocument||e)!==f&&p(e);var i=o.attrHandle[n.toLowerCase()],a=i&&L.call(o.attrHandle,n.toLowerCase())?i(e,n,!h):t;return a===t?r.attributes||!h?e.getAttribute(n):(a=e.getAttributeNode(n))&&a.specified?a.value:null:a},at.error=function(e){throw Error("Syntax error, unrecognized expression: "+e)},at.uniqueSort=function(e){var t,n=[],i=0,o=0;if(S=!r.detectDuplicates,c=!r.sortStable&&e.slice(0),e.sort(A),S){while(t=e[o++])t===e[o]&&(i=n.push(o));while(i--)e.splice(n[i],1)}return e},a=at.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=a(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r];r++)n+=a(t);return n},o=at.selectors={cacheLength:50,createPseudo:ut,match:Q,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(rt,it),e[3]=(e[4]||e[5]||"").replace(rt,it),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||at.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&at.error(e[0]),e},PSEUDO:function(e){var n,r=!e[5]&&e[2];return Q.CHILD.test(e[0])?null:(e[3]&&e[4]!==t?e[2]=e[4]:r&&J.test(r)&&(n=bt(r,!0))&&(n=r.indexOf(")",r.length-n)-r.length)&&(e[0]=e[0].slice(0,n),e[2]=r.slice(0,n)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(rt,it).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=N[e+" "];return t||(t=RegExp("(^|"+P+")"+e+"("+P+"|$)"))&&N(e,function(e){return t.test("string"==typeof e.className&&e.className||typeof e.getAttribute!==j&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=at.attr(r,e);return null==i?"!="===t:t?(i+="","="===t?i===n:"!="===t?i!==n:"^="===t?n&&0===i.indexOf(n):"*="===t?n&&i.indexOf(n)>-1:"$="===t?n&&i.slice(-n.length)===n:"~="===t?(" "+i+" ").indexOf(n)>-1:"|="===t?i===n||i.slice(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,l){var u,c,p,f,d,h,g=o!==a?"nextSibling":"previousSibling",m=t.parentNode,y=s&&t.nodeName.toLowerCase(),v=!l&&!s;if(m){if(o){while(g){p=t;while(p=p[g])if(s?p.nodeName.toLowerCase()===y:1===p.nodeType)return!1;h=g="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?m.firstChild:m.lastChild],a&&v){c=m[b]||(m[b]={}),u=c[e]||[],d=u[0]===T&&u[1],f=u[0]===T&&u[2],p=d&&m.childNodes[d];while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if(1===p.nodeType&&++f&&p===t){c[e]=[T,d,f];break}}else if(v&&(u=(t[b]||(t[b]={}))[e])&&u[0]===T)f=u[1];else while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if((s?p.nodeName.toLowerCase()===y:1===p.nodeType)&&++f&&(v&&((p[b]||(p[b]={}))[e]=[T,f]),p===t))break;return f-=i,f===r||0===f%r&&f/r>=0}}},PSEUDO:function(e,t){var n,r=o.pseudos[e]||o.setFilters[e.toLowerCase()]||at.error("unsupported pseudo: "+e);return r[b]?r(t):r.length>1?(n=[e,e,"",t],o.setFilters.hasOwnProperty(e.toLowerCase())?ut(function(e,n){var i,o=r(e,t),a=o.length;while(a--)i=F.call(e,o[a]),e[i]=!(n[i]=o[a])}):function(e){return r(e,0,n)}):r}},pseudos:{not:ut(function(e){var t=[],n=[],r=l(e.replace(z,"$1"));return r[b]?ut(function(e,t,n,i){var o,a=r(e,null,i,[]),s=e.length;while(s--)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,i,o){return t[0]=e,r(t,null,o,n),!n.pop()}}),has:ut(function(e){return function(t){return at(e,t).length>0}}),contains:ut(function(e){return function(t){return(t.textContent||t.innerText||a(t)).indexOf(e)>-1}}),lang:ut(function(e){return G.test(e||"")||at.error("unsupported lang: "+e),e=e.replace(rt,it).toLowerCase(),function(t){var n;do if(n=h?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang"))return n=n.toLowerCase(),n===e||0===n.indexOf(e+"-");while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===d},focus:function(e){return e===f.activeElement&&(!f.hasFocus||f.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeName>"@"||3===e.nodeType||4===e.nodeType)return!1;return!0},parent:function(e){return!o.pseudos.empty(e)},header:function(e){return tt.test(e.nodeName)},input:function(e){return et.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||t.toLowerCase()===e.type)},first:vt(function(){return[0]}),last:vt(function(e,t){return[t-1]}),eq:vt(function(e,t,n){return[0>n?n+t:n]}),even:vt(function(e,t){var n=0;for(;t>n;n+=2)e.push(n);return e}),odd:vt(function(e,t){var n=1;for(;t>n;n+=2)e.push(n);return e}),lt:vt(function(e,t,n){var r=0>n?n+t:n;for(;--r>=0;)e.push(r);return e}),gt:vt(function(e,t,n){var r=0>n?n+t:n;for(;t>++r;)e.push(r);return e})}};for(n in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})o.pseudos[n]=mt(n);for(n in{submit:!0,reset:!0})o.pseudos[n]=yt(n);function bt(e,t){var n,r,i,a,s,l,u,c=k[e+" "];if(c)return t?0:c.slice(0);s=e,l=[],u=o.preFilter;while(s){(!n||(r=X.exec(s)))&&(r&&(s=s.slice(r[0].length)||s),l.push(i=[])),n=!1,(r=U.exec(s))&&(n=r.shift(),i.push({value:n,type:r[0].replace(z," ")}),s=s.slice(n.length));for(a in o.filter)!(r=Q[a].exec(s))||u[a]&&!(r=u[a](r))||(n=r.shift(),i.push({value:n,type:a,matches:r}),s=s.slice(n.length));if(!n)break}return t?s.length:s?at.error(e):k(e,l).slice(0)}function xt(e){var t=0,n=e.length,r="";for(;n>t;t++)r+=e[t].value;return r}function wt(e,t,n){var r=t.dir,o=n&&"parentNode"===r,a=C++;return t.first?function(t,n,i){while(t=t[r])if(1===t.nodeType||o)return e(t,n,i)}:function(t,n,s){var l,u,c,p=T+" "+a;if(s){while(t=t[r])if((1===t.nodeType||o)&&e(t,n,s))return!0}else while(t=t[r])if(1===t.nodeType||o)if(c=t[b]||(t[b]={}),(u=c[r])&&u[0]===p){if((l=u[1])===!0||l===i)return l===!0}else if(u=c[r]=[p],u[1]=e(t,n,s)||i,u[1]===!0)return!0}}function Tt(e){return e.length>1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function Ct(e,t,n,r,i){var o,a=[],s=0,l=e.length,u=null!=t;for(;l>s;s++)(o=e[s])&&(!n||n(o,r,i))&&(a.push(o),u&&t.push(s));return a}function Nt(e,t,n,r,i,o){return r&&!r[b]&&(r=Nt(r)),i&&!i[b]&&(i=Nt(i,o)),ut(function(o,a,s,l){var u,c,p,f=[],d=[],h=a.length,g=o||St(t||"*",s.nodeType?[s]:s,[]),m=!e||!o&&t?g:Ct(g,f,e,s,l),y=n?i||(o?e:h||r)?[]:a:m;if(n&&n(m,y,s,l),r){u=Ct(y,d),r(u,[],s,l),c=u.length;while(c--)(p=u[c])&&(y[d[c]]=!(m[d[c]]=p))}if(o){if(i||e){if(i){u=[],c=y.length;while(c--)(p=y[c])&&u.push(m[c]=p);i(null,y=[],u,l)}c=y.length;while(c--)(p=y[c])&&(u=i?F.call(o,p):f[c])>-1&&(o[u]=!(a[u]=p))}}else y=Ct(y===a?y.splice(h,y.length):y),i?i(null,a,y,l):M.apply(a,y)})}function kt(e){var t,n,r,i=e.length,a=o.relative[e[0].type],s=a||o.relative[" "],l=a?1:0,c=wt(function(e){return e===t},s,!0),p=wt(function(e){return F.call(t,e)>-1},s,!0),f=[function(e,n,r){return!a&&(r||n!==u)||((t=n).nodeType?c(e,n,r):p(e,n,r))}];for(;i>l;l++)if(n=o.relative[e[l].type])f=[wt(Tt(f),n)];else{if(n=o.filter[e[l].type].apply(null,e[l].matches),n[b]){for(r=++l;i>r;r++)if(o.relative[e[r].type])break;return Nt(l>1&&Tt(f),l>1&&xt(e.slice(0,l-1).concat({value:" "===e[l-2].type?"*":""})).replace(z,"$1"),n,r>l&&kt(e.slice(l,r)),i>r&&kt(e=e.slice(r)),i>r&&xt(e))}f.push(n)}return Tt(f)}function Et(e,t){var n=0,r=t.length>0,a=e.length>0,s=function(s,l,c,p,d){var h,g,m,y=[],v=0,b="0",x=s&&[],w=null!=d,C=u,N=s||a&&o.find.TAG("*",d&&l.parentNode||l),k=T+=null==C?1:Math.random()||.1;for(w&&(u=l!==f&&l,i=n);null!=(h=N[b]);b++){if(a&&h){g=0;while(m=e[g++])if(m(h,l,c)){p.push(h);break}w&&(T=k,i=++n)}r&&((h=!m&&h)&&v--,s&&x.push(h))}if(v+=b,r&&b!==v){g=0;while(m=t[g++])m(x,y,l,c);if(s){if(v>0)while(b--)x[b]||y[b]||(y[b]=q.call(p));y=Ct(y)}M.apply(p,y),w&&!s&&y.length>0&&v+t.length>1&&at.uniqueSort(p)}return w&&(T=k,u=C),x};return r?ut(s):s}l=at.compile=function(e,t){var n,r=[],i=[],o=E[e+" "];if(!o){t||(t=bt(e)),n=t.length;while(n--)o=kt(t[n]),o[b]?r.push(o):i.push(o);o=E(e,Et(i,r))}return o};function St(e,t,n){var r=0,i=t.length;for(;i>r;r++)at(e,t[r],n);return n}function At(e,t,n,i){var a,s,u,c,p,f=bt(e);if(!i&&1===f.length){if(s=f[0]=f[0].slice(0),s.length>2&&"ID"===(u=s[0]).type&&r.getById&&9===t.nodeType&&h&&o.relative[s[1].type]){if(t=(o.find.ID(u.matches[0].replace(rt,it),t)||[])[0],!t)return n;e=e.slice(s.shift().value.length)}a=Q.needsContext.test(e)?0:s.length;while(a--){if(u=s[a],o.relative[c=u.type])break;if((p=o.find[c])&&(i=p(u.matches[0].replace(rt,it),V.test(s[0].type)&&t.parentNode||t))){if(s.splice(a,1),e=i.length&&xt(s),!e)return M.apply(n,i),n;break}}}return l(e,f)(i,t,!h,n,V.test(e)),n}o.pseudos.nth=o.pseudos.eq;function jt(){}jt.prototype=o.filters=o.pseudos,o.setFilters=new jt,r.sortStable=b.split("").sort(A).join("")===b,p(),[0,0].sort(A),r.detectDuplicates=S,x.find=at,x.expr=at.selectors,x.expr[":"]=x.expr.pseudos,x.unique=at.uniqueSort,x.text=at.getText,x.isXMLDoc=at.isXML,x.contains=at.contains}(e);var O={};function F(e){var t=O[e]={};return x.each(e.match(T)||[],function(e,n){t[n]=!0}),t}x.Callbacks=function(e){e="string"==typeof e?O[e]||F(e):x.extend({},e);var n,r,i,o,a,s,l=[],u=!e.once&&[],c=function(t){for(r=e.memory&&t,i=!0,a=s||0,s=0,o=l.length,n=!0;l&&o>a;a++)if(l[a].apply(t[0],t[1])===!1&&e.stopOnFalse){r=!1;break}n=!1,l&&(u?u.length&&c(u.shift()):r?l=[]:p.disable())},p={add:function(){if(l){var t=l.length;(function i(t){x.each(t,function(t,n){var r=x.type(n);"function"===r?e.unique&&p.has(n)||l.push(n):n&&n.length&&"string"!==r&&i(n)})})(arguments),n?o=l.length:r&&(s=t,c(r))}return this},remove:function(){return l&&x.each(arguments,function(e,t){var r;while((r=x.inArray(t,l,r))>-1)l.splice(r,1),n&&(o>=r&&o--,a>=r&&a--)}),this},has:function(e){return e?x.inArray(e,l)>-1:!(!l||!l.length)},empty:function(){return l=[],o=0,this},disable:function(){return l=u=r=t,this},disabled:function(){return!l},lock:function(){return u=t,r||p.disable(),this},locked:function(){return!u},fireWith:function(e,t){return t=t||[],t=[e,t.slice?t.slice():t],!l||i&&!u||(n?u.push(t):c(t)),this},fire:function(){return p.fireWith(this,arguments),this},fired:function(){return!!i}};return p},x.extend({Deferred:function(e){var t=[["resolve","done",x.Callbacks("once memory"),"resolved"],["reject","fail",x.Callbacks("once memory"),"rejected"],["notify","progress",x.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return x.Deferred(function(n){x.each(t,function(t,o){var a=o[0],s=x.isFunction(e[t])&&e[t];i[o[1]](function(){var e=s&&s.apply(this,arguments);e&&x.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[a+"With"](this===r?n.promise():this,s?[e]:arguments)})}),e=null}).promise()},promise:function(e){return null!=e?x.extend(e,r):r}},i={};return r.pipe=r.then,x.each(t,function(e,o){var a=o[2],s=o[3];r[o[1]]=a.add,s&&a.add(function(){n=s},t[1^e][2].disable,t[2][2].lock),i[o[0]]=function(){return i[o[0]+"With"](this===i?r:this,arguments),this},i[o[0]+"With"]=a.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t=0,n=g.call(arguments),r=n.length,i=1!==r||e&&x.isFunction(e.promise)?r:0,o=1===i?e:x.Deferred(),a=function(e,t,n){return function(r){t[e]=this,n[e]=arguments.length>1?g.call(arguments):r,n===s?o.notifyWith(t,n):--i||o.resolveWith(t,n)}},s,l,u;if(r>1)for(s=Array(r),l=Array(r),u=Array(r);r>t;t++)n[t]&&x.isFunction(n[t].promise)?n[t].promise().done(a(t,u,n)).fail(o.reject).progress(a(t,l,s)):--i;return i||o.resolveWith(u,n),o.promise()}}),x.support=function(t){var n,r,o,s,l,u,c,p,f,d=a.createElement("div");if(d.setAttribute("className","t"),d.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",n=d.getElementsByTagName("*")||[],r=d.getElementsByTagName("a")[0],!r||!r.style||!n.length)return t;s=a.createElement("select"),u=s.appendChild(a.createElement("option")),o=d.getElementsByTagName("input")[0],r.style.cssText="top:1px;float:left;opacity:.5",t.getSetAttribute="t"!==d.className,t.leadingWhitespace=3===d.firstChild.nodeType,t.tbody=!d.getElementsByTagName("tbody").length,t.htmlSerialize=!!d.getElementsByTagName("link").length,t.style=/top/.test(r.getAttribute("style")),t.hrefNormalized="/a"===r.getAttribute("href"),t.opacity=/^0.5/.test(r.style.opacity),t.cssFloat=!!r.style.cssFloat,t.checkOn=!!o.value,t.optSelected=u.selected,t.enctype=!!a.createElement("form").enctype,t.html5Clone="<:nav></:nav>"!==a.createElement("nav").cloneNode(!0).outerHTML,t.inlineBlockNeedsLayout=!1,t.shrinkWrapBlocks=!1,t.pixelPosition=!1,t.deleteExpando=!0,t.noCloneEvent=!0,t.reliableMarginRight=!0,t.boxSizingReliable=!0,o.checked=!0,t.noCloneChecked=o.cloneNode(!0).checked,s.disabled=!0,t.optDisabled=!u.disabled;try{delete d.test}catch(h){t.deleteExpando=!1}o=a.createElement("input"),o.setAttribute("value",""),t.input=""===o.getAttribute("value"),o.value="t",o.setAttribute("type","radio"),t.radioValue="t"===o.value,o.setAttribute("checked","t"),o.setAttribute("name","t"),l=a.createDocumentFragment(),l.appendChild(o),t.appendChecked=o.checked,t.checkClone=l.cloneNode(!0).cloneNode(!0).lastChild.checked,d.attachEvent&&(d.attachEvent("onclick",function(){t.noCloneEvent=!1}),d.cloneNode(!0).click());for(f in{submit:!0,change:!0,focusin:!0})d.setAttribute(c="on"+f,"t"),t[f+"Bubbles"]=c in e||d.attributes[c].expando===!1;d.style.backgroundClip="content-box",d.cloneNode(!0).style.backgroundClip="",t.clearCloneStyle="content-box"===d.style.backgroundClip;for(f in x(t))break;return t.ownLast="0"!==f,x(function(){var n,r,o,s="padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;",l=a.getElementsByTagName("body")[0];l&&(n=a.createElement("div"),n.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px",l.appendChild(n).appendChild(d),d.innerHTML="<table><tr><td></td><td>t</td></tr></table>",o=d.getElementsByTagName("td"),o[0].style.cssText="padding:0;margin:0;border:0;display:none",p=0===o[0].offsetHeight,o[0].style.display="",o[1].style.display="none",t.reliableHiddenOffsets=p&&0===o[0].offsetHeight,d.innerHTML="",d.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",x.swap(l,null!=l.style.zoom?{zoom:1}:{},function(){t.boxSizing=4===d.offsetWidth}),e.getComputedStyle&&(t.pixelPosition="1%"!==(e.getComputedStyle(d,null)||{}).top,t.boxSizingReliable="4px"===(e.getComputedStyle(d,null)||{width:"4px"}).width,r=d.appendChild(a.createElement("div")),r.style.cssText=d.style.cssText=s,r.style.marginRight=r.style.width="0",d.style.width="1px",t.reliableMarginRight=!parseFloat((e.getComputedStyle(r,null)||{}).marginRight)),typeof d.style.zoom!==i&&(d.innerHTML="",d.style.cssText=s+"width:1px;padding:1px;display:inline;zoom:1",t.inlineBlockNeedsLayout=3===d.offsetWidth,d.style.display="block",d.innerHTML="<div></div>",d.firstChild.style.width="5px",t.shrinkWrapBlocks=3!==d.offsetWidth,t.inlineBlockNeedsLayout&&(l.style.zoom=1)),l.removeChild(n),n=d=o=r=null)
+}),n=s=l=u=r=o=null,t}({});var B=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,P=/([A-Z])/g;function R(e,n,r,i){if(x.acceptData(e)){var o,a,s=x.expando,l=e.nodeType,u=l?x.cache:e,c=l?e[s]:e[s]&&s;if(c&&u[c]&&(i||u[c].data)||r!==t||"string"!=typeof n)return c||(c=l?e[s]=p.pop()||x.guid++:s),u[c]||(u[c]=l?{}:{toJSON:x.noop}),("object"==typeof n||"function"==typeof n)&&(i?u[c]=x.extend(u[c],n):u[c].data=x.extend(u[c].data,n)),a=u[c],i||(a.data||(a.data={}),a=a.data),r!==t&&(a[x.camelCase(n)]=r),"string"==typeof n?(o=a[n],null==o&&(o=a[x.camelCase(n)])):o=a,o}}function W(e,t,n){if(x.acceptData(e)){var r,i,o=e.nodeType,a=o?x.cache:e,s=o?e[x.expando]:x.expando;if(a[s]){if(t&&(r=n?a[s]:a[s].data)){x.isArray(t)?t=t.concat(x.map(t,x.camelCase)):t in r?t=[t]:(t=x.camelCase(t),t=t in r?[t]:t.split(" ")),i=t.length;while(i--)delete r[t[i]];if(n?!I(r):!x.isEmptyObject(r))return}(n||(delete a[s].data,I(a[s])))&&(o?x.cleanData([e],!0):x.support.deleteExpando||a!=a.window?delete a[s]:a[s]=null)}}}x.extend({cache:{},noData:{applet:!0,embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(e){return e=e.nodeType?x.cache[e[x.expando]]:e[x.expando],!!e&&!I(e)},data:function(e,t,n){return R(e,t,n)},removeData:function(e,t){return W(e,t)},_data:function(e,t,n){return R(e,t,n,!0)},_removeData:function(e,t){return W(e,t,!0)},acceptData:function(e){if(e.nodeType&&1!==e.nodeType&&9!==e.nodeType)return!1;var t=e.nodeName&&x.noData[e.nodeName.toLowerCase()];return!t||t!==!0&&e.getAttribute("classid")===t}}),x.fn.extend({data:function(e,n){var r,i,o=null,a=0,s=this[0];if(e===t){if(this.length&&(o=x.data(s),1===s.nodeType&&!x._data(s,"parsedAttrs"))){for(r=s.attributes;r.length>a;a++)i=r[a].name,0===i.indexOf("data-")&&(i=x.camelCase(i.slice(5)),$(s,i,o[i]));x._data(s,"parsedAttrs",!0)}return o}return"object"==typeof e?this.each(function(){x.data(this,e)}):arguments.length>1?this.each(function(){x.data(this,e,n)}):s?$(s,e,x.data(s,e)):null},removeData:function(e){return this.each(function(){x.removeData(this,e)})}});function $(e,n,r){if(r===t&&1===e.nodeType){var i="data-"+n.replace(P,"-$1").toLowerCase();if(r=e.getAttribute(i),"string"==typeof r){try{r="true"===r?!0:"false"===r?!1:"null"===r?null:+r+""===r?+r:B.test(r)?x.parseJSON(r):r}catch(o){}x.data(e,n,r)}else r=t}return r}function I(e){var t;for(t in e)if(("data"!==t||!x.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}x.extend({queue:function(e,n,r){var i;return e?(n=(n||"fx")+"queue",i=x._data(e,n),r&&(!i||x.isArray(r)?i=x._data(e,n,x.makeArray(r)):i.push(r)),i||[]):t},dequeue:function(e,t){t=t||"fx";var n=x.queue(e,t),r=n.length,i=n.shift(),o=x._queueHooks(e,t),a=function(){x.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,a,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return x._data(e,n)||x._data(e,n,{empty:x.Callbacks("once memory").add(function(){x._removeData(e,t+"queue"),x._removeData(e,n)})})}}),x.fn.extend({queue:function(e,n){var r=2;return"string"!=typeof e&&(n=e,e="fx",r--),r>arguments.length?x.queue(this[0],e):n===t?this:this.each(function(){var t=x.queue(this,e,n);x._queueHooks(this,e),"fx"===e&&"inprogress"!==t[0]&&x.dequeue(this,e)})},dequeue:function(e){return this.each(function(){x.dequeue(this,e)})},delay:function(e,t){return e=x.fx?x.fx.speeds[e]||e:e,t=t||"fx",this.queue(t,function(t,n){var r=setTimeout(t,e);n.stop=function(){clearTimeout(r)}})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,n){var r,i=1,o=x.Deferred(),a=this,s=this.length,l=function(){--i||o.resolveWith(a,[a])};"string"!=typeof e&&(n=e,e=t),e=e||"fx";while(s--)r=x._data(a[s],e+"queueHooks"),r&&r.empty&&(i++,r.empty.add(l));return l(),o.promise(n)}});var z,X,U=/[\t\r\n\f]/g,V=/\r/g,Y=/^(?:input|select|textarea|button|object)$/i,J=/^(?:a|area)$/i,G=/^(?:checked|selected)$/i,Q=x.support.getSetAttribute,K=x.support.input;x.fn.extend({attr:function(e,t){return x.access(this,x.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){x.removeAttr(this,e)})},prop:function(e,t){return x.access(this,x.prop,e,t,arguments.length>1)},removeProp:function(e){return e=x.propFix[e]||e,this.each(function(){try{this[e]=t,delete this[e]}catch(n){}})},addClass:function(e){var t,n,r,i,o,a=0,s=this.length,l="string"==typeof e&&e;if(x.isFunction(e))return this.each(function(t){x(this).addClass(e.call(this,t,this.className))});if(l)for(t=(e||"").match(T)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(U," "):" ")){o=0;while(i=t[o++])0>r.indexOf(" "+i+" ")&&(r+=i+" ");n.className=x.trim(r)}return this},removeClass:function(e){var t,n,r,i,o,a=0,s=this.length,l=0===arguments.length||"string"==typeof e&&e;if(x.isFunction(e))return this.each(function(t){x(this).removeClass(e.call(this,t,this.className))});if(l)for(t=(e||"").match(T)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(U," "):"")){o=0;while(i=t[o++])while(r.indexOf(" "+i+" ")>=0)r=r.replace(" "+i+" "," ");n.className=e?x.trim(r):""}return this},toggleClass:function(e,t){var n=typeof e,r="boolean"==typeof t;return x.isFunction(e)?this.each(function(n){x(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if("string"===n){var o,a=0,s=x(this),l=t,u=e.match(T)||[];while(o=u[a++])l=r?l:!s.hasClass(o),s[l?"addClass":"removeClass"](o)}else(n===i||"boolean"===n)&&(this.className&&x._data(this,"__className__",this.className),this.className=this.className||e===!1?"":x._data(this,"__className__")||"")})},hasClass:function(e){var t=" "+e+" ",n=0,r=this.length;for(;r>n;n++)if(1===this[n].nodeType&&(" "+this[n].className+" ").replace(U," ").indexOf(t)>=0)return!0;return!1},val:function(e){var n,r,i,o=this[0];{if(arguments.length)return i=x.isFunction(e),this.each(function(n){var o;1===this.nodeType&&(o=i?e.call(this,n,x(this).val()):e,null==o?o="":"number"==typeof o?o+="":x.isArray(o)&&(o=x.map(o,function(e){return null==e?"":e+""})),r=x.valHooks[this.type]||x.valHooks[this.nodeName.toLowerCase()],r&&"set"in r&&r.set(this,o,"value")!==t||(this.value=o))});if(o)return r=x.valHooks[o.type]||x.valHooks[o.nodeName.toLowerCase()],r&&"get"in r&&(n=r.get(o,"value"))!==t?n:(n=o.value,"string"==typeof n?n.replace(V,""):null==n?"":n)}}}),x.extend({valHooks:{option:{get:function(e){var t=x.find.attr(e,"value");return null!=t?t:e.text}},select:{get:function(e){var t,n,r=e.options,i=e.selectedIndex,o="select-one"===e.type||0>i,a=o?null:[],s=o?i+1:r.length,l=0>i?s:o?i:0;for(;s>l;l++)if(n=r[l],!(!n.selected&&l!==i||(x.support.optDisabled?n.disabled:null!==n.getAttribute("disabled"))||n.parentNode.disabled&&x.nodeName(n.parentNode,"optgroup"))){if(t=x(n).val(),o)return t;a.push(t)}return a},set:function(e,t){var n,r,i=e.options,o=x.makeArray(t),a=i.length;while(a--)r=i[a],(r.selected=x.inArray(x(r).val(),o)>=0)&&(n=!0);return n||(e.selectedIndex=-1),o}}},attr:function(e,n,r){var o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return typeof e.getAttribute===i?x.prop(e,n,r):(1===s&&x.isXMLDoc(e)||(n=n.toLowerCase(),o=x.attrHooks[n]||(x.expr.match.bool.test(n)?X:z)),r===t?o&&"get"in o&&null!==(a=o.get(e,n))?a:(a=x.find.attr(e,n),null==a?t:a):null!==r?o&&"set"in o&&(a=o.set(e,r,n))!==t?a:(e.setAttribute(n,r+""),r):(x.removeAttr(e,n),t))},removeAttr:function(e,t){var n,r,i=0,o=t&&t.match(T);if(o&&1===e.nodeType)while(n=o[i++])r=x.propFix[n]||n,x.expr.match.bool.test(n)?K&&Q||!G.test(n)?e[r]=!1:e[x.camelCase("default-"+n)]=e[r]=!1:x.attr(e,n,""),e.removeAttribute(Q?n:r)},attrHooks:{type:{set:function(e,t){if(!x.support.radioValue&&"radio"===t&&x.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},propFix:{"for":"htmlFor","class":"className"},prop:function(e,n,r){var i,o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return a=1!==s||!x.isXMLDoc(e),a&&(n=x.propFix[n]||n,o=x.propHooks[n]),r!==t?o&&"set"in o&&(i=o.set(e,r,n))!==t?i:e[n]=r:o&&"get"in o&&null!==(i=o.get(e,n))?i:e[n]},propHooks:{tabIndex:{get:function(e){var t=x.find.attr(e,"tabindex");return t?parseInt(t,10):Y.test(e.nodeName)||J.test(e.nodeName)&&e.href?0:-1}}}}),X={set:function(e,t,n){return t===!1?x.removeAttr(e,n):K&&Q||!G.test(n)?e.setAttribute(!Q&&x.propFix[n]||n,n):e[x.camelCase("default-"+n)]=e[n]=!0,n}},x.each(x.expr.match.bool.source.match(/\w+/g),function(e,n){var r=x.expr.attrHandle[n]||x.find.attr;x.expr.attrHandle[n]=K&&Q||!G.test(n)?function(e,n,i){var o=x.expr.attrHandle[n],a=i?t:(x.expr.attrHandle[n]=t)!=r(e,n,i)?n.toLowerCase():null;return x.expr.attrHandle[n]=o,a}:function(e,n,r){return r?t:e[x.camelCase("default-"+n)]?n.toLowerCase():null}}),K&&Q||(x.attrHooks.value={set:function(e,n,r){return x.nodeName(e,"input")?(e.defaultValue=n,t):z&&z.set(e,n,r)}}),Q||(z={set:function(e,n,r){var i=e.getAttributeNode(r);return i||e.setAttributeNode(i=e.ownerDocument.createAttribute(r)),i.value=n+="","value"===r||n===e.getAttribute(r)?n:t}},x.expr.attrHandle.id=x.expr.attrHandle.name=x.expr.attrHandle.coords=function(e,n,r){var i;return r?t:(i=e.getAttributeNode(n))&&""!==i.value?i.value:null},x.valHooks.button={get:function(e,n){var r=e.getAttributeNode(n);return r&&r.specified?r.value:t},set:z.set},x.attrHooks.contenteditable={set:function(e,t,n){z.set(e,""===t?!1:t,n)}},x.each(["width","height"],function(e,n){x.attrHooks[n]={set:function(e,r){return""===r?(e.setAttribute(n,"auto"),r):t}}})),x.support.hrefNormalized||x.each(["href","src"],function(e,t){x.propHooks[t]={get:function(e){return e.getAttribute(t,4)}}}),x.support.style||(x.attrHooks.style={get:function(e){return e.style.cssText||t},set:function(e,t){return e.style.cssText=t+""}}),x.support.optSelected||(x.propHooks.selected={get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null}}),x.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){x.propFix[this.toLowerCase()]=this}),x.support.enctype||(x.propFix.enctype="encoding"),x.each(["radio","checkbox"],function(){x.valHooks[this]={set:function(e,n){return x.isArray(n)?e.checked=x.inArray(x(e).val(),n)>=0:t}},x.support.checkOn||(x.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})});var Z=/^(?:input|select|textarea)$/i,et=/^key/,tt=/^(?:mouse|contextmenu)|click/,nt=/^(?:focusinfocus|focusoutblur)$/,rt=/^([^.]*)(?:\.(.+)|)$/;function it(){return!0}function ot(){return!1}function at(){try{return a.activeElement}catch(e){}}x.event={global:{},add:function(e,n,r,o,a){var s,l,u,c,p,f,d,h,g,m,y,v=x._data(e);if(v){r.handler&&(c=r,r=c.handler,a=c.selector),r.guid||(r.guid=x.guid++),(l=v.events)||(l=v.events={}),(f=v.handle)||(f=v.handle=function(e){return typeof x===i||e&&x.event.triggered===e.type?t:x.event.dispatch.apply(f.elem,arguments)},f.elem=e),n=(n||"").match(T)||[""],u=n.length;while(u--)s=rt.exec(n[u])||[],g=y=s[1],m=(s[2]||"").split(".").sort(),g&&(p=x.event.special[g]||{},g=(a?p.delegateType:p.bindType)||g,p=x.event.special[g]||{},d=x.extend({type:g,origType:y,data:o,handler:r,guid:r.guid,selector:a,needsContext:a&&x.expr.match.needsContext.test(a),namespace:m.join(".")},c),(h=l[g])||(h=l[g]=[],h.delegateCount=0,p.setup&&p.setup.call(e,o,m,f)!==!1||(e.addEventListener?e.addEventListener(g,f,!1):e.attachEvent&&e.attachEvent("on"+g,f))),p.add&&(p.add.call(e,d),d.handler.guid||(d.handler.guid=r.guid)),a?h.splice(h.delegateCount++,0,d):h.push(d),x.event.global[g]=!0);e=null}},remove:function(e,t,n,r,i){var o,a,s,l,u,c,p,f,d,h,g,m=x.hasData(e)&&x._data(e);if(m&&(c=m.events)){t=(t||"").match(T)||[""],u=t.length;while(u--)if(s=rt.exec(t[u])||[],d=g=s[1],h=(s[2]||"").split(".").sort(),d){p=x.event.special[d]||{},d=(r?p.delegateType:p.bindType)||d,f=c[d]||[],s=s[2]&&RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),l=o=f.length;while(o--)a=f[o],!i&&g!==a.origType||n&&n.guid!==a.guid||s&&!s.test(a.namespace)||r&&r!==a.selector&&("**"!==r||!a.selector)||(f.splice(o,1),a.selector&&f.delegateCount--,p.remove&&p.remove.call(e,a));l&&!f.length&&(p.teardown&&p.teardown.call(e,h,m.handle)!==!1||x.removeEvent(e,d,m.handle),delete c[d])}else for(d in c)x.event.remove(e,d+t[u],n,r,!0);x.isEmptyObject(c)&&(delete m.handle,x._removeData(e,"events"))}},trigger:function(n,r,i,o){var s,l,u,c,p,f,d,h=[i||a],g=v.call(n,"type")?n.type:n,m=v.call(n,"namespace")?n.namespace.split("."):[];if(u=f=i=i||a,3!==i.nodeType&&8!==i.nodeType&&!nt.test(g+x.event.triggered)&&(g.indexOf(".")>=0&&(m=g.split("."),g=m.shift(),m.sort()),l=0>g.indexOf(":")&&"on"+g,n=n[x.expando]?n:new x.Event(g,"object"==typeof n&&n),n.isTrigger=o?2:3,n.namespace=m.join("."),n.namespace_re=n.namespace?RegExp("(^|\\.)"+m.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,n.result=t,n.target||(n.target=i),r=null==r?[n]:x.makeArray(r,[n]),p=x.event.special[g]||{},o||!p.trigger||p.trigger.apply(i,r)!==!1)){if(!o&&!p.noBubble&&!x.isWindow(i)){for(c=p.delegateType||g,nt.test(c+g)||(u=u.parentNode);u;u=u.parentNode)h.push(u),f=u;f===(i.ownerDocument||a)&&h.push(f.defaultView||f.parentWindow||e)}d=0;while((u=h[d++])&&!n.isPropagationStopped())n.type=d>1?c:p.bindType||g,s=(x._data(u,"events")||{})[n.type]&&x._data(u,"handle"),s&&s.apply(u,r),s=l&&u[l],s&&x.acceptData(u)&&s.apply&&s.apply(u,r)===!1&&n.preventDefault();if(n.type=g,!o&&!n.isDefaultPrevented()&&(!p._default||p._default.apply(h.pop(),r)===!1)&&x.acceptData(i)&&l&&i[g]&&!x.isWindow(i)){f=i[l],f&&(i[l]=null),x.event.triggered=g;try{i[g]()}catch(y){}x.event.triggered=t,f&&(i[l]=f)}return n.result}},dispatch:function(e){e=x.event.fix(e);var n,r,i,o,a,s=[],l=g.call(arguments),u=(x._data(this,"events")||{})[e.type]||[],c=x.event.special[e.type]||{};if(l[0]=e,e.delegateTarget=this,!c.preDispatch||c.preDispatch.call(this,e)!==!1){s=x.event.handlers.call(this,e,u),n=0;while((o=s[n++])&&!e.isPropagationStopped()){e.currentTarget=o.elem,a=0;while((i=o.handlers[a++])&&!e.isImmediatePropagationStopped())(!e.namespace_re||e.namespace_re.test(i.namespace))&&(e.handleObj=i,e.data=i.data,r=((x.event.special[i.origType]||{}).handle||i.handler).apply(o.elem,l),r!==t&&(e.result=r)===!1&&(e.preventDefault(),e.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,e),e.result}},handlers:function(e,n){var r,i,o,a,s=[],l=n.delegateCount,u=e.target;if(l&&u.nodeType&&(!e.button||"click"!==e.type))for(;u!=this;u=u.parentNode||this)if(1===u.nodeType&&(u.disabled!==!0||"click"!==e.type)){for(o=[],a=0;l>a;a++)i=n[a],r=i.selector+" ",o[r]===t&&(o[r]=i.needsContext?x(r,this).index(u)>=0:x.find(r,this,null,[u]).length),o[r]&&o.push(i);o.length&&s.push({elem:u,handlers:o})}return n.length>l&&s.push({elem:this,handlers:n.slice(l)}),s},fix:function(e){if(e[x.expando])return e;var t,n,r,i=e.type,o=e,s=this.fixHooks[i];s||(this.fixHooks[i]=s=tt.test(i)?this.mouseHooks:et.test(i)?this.keyHooks:{}),r=s.props?this.props.concat(s.props):this.props,e=new x.Event(o),t=r.length;while(t--)n=r[t],e[n]=o[n];return e.target||(e.target=o.srcElement||a),3===e.target.nodeType&&(e.target=e.target.parentNode),e.metaKey=!!e.metaKey,s.filter?s.filter(e,o):e},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return null==e.which&&(e.which=null!=t.charCode?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,n){var r,i,o,s=n.button,l=n.fromElement;return null==e.pageX&&null!=n.clientX&&(i=e.target.ownerDocument||a,o=i.documentElement,r=i.body,e.pageX=n.clientX+(o&&o.scrollLeft||r&&r.scrollLeft||0)-(o&&o.clientLeft||r&&r.clientLeft||0),e.pageY=n.clientY+(o&&o.scrollTop||r&&r.scrollTop||0)-(o&&o.clientTop||r&&r.clientTop||0)),!e.relatedTarget&&l&&(e.relatedTarget=l===e.target?n.toElement:l),e.which||s===t||(e.which=1&s?1:2&s?3:4&s?2:0),e}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==at()&&this.focus)try{return this.focus(),!1}catch(e){}},delegateType:"focusin"},blur:{trigger:function(){return this===at()&&this.blur?(this.blur(),!1):t},delegateType:"focusout"},click:{trigger:function(){return x.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):t},_default:function(e){return x.nodeName(e.target,"a")}},beforeunload:{postDispatch:function(e){e.result!==t&&(e.originalEvent.returnValue=e.result)}}},simulate:function(e,t,n,r){var i=x.extend(new x.Event,n,{type:e,isSimulated:!0,originalEvent:{}});r?x.event.trigger(i,null,t):x.event.dispatch.call(t,i),i.isDefaultPrevented()&&n.preventDefault()}},x.removeEvent=a.removeEventListener?function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n,!1)}:function(e,t,n){var r="on"+t;e.detachEvent&&(typeof e[r]===i&&(e[r]=null),e.detachEvent(r,n))},x.Event=function(e,n){return this instanceof x.Event?(e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||e.returnValue===!1||e.getPreventDefault&&e.getPreventDefault()?it:ot):this.type=e,n&&x.extend(this,n),this.timeStamp=e&&e.timeStamp||x.now(),this[x.expando]=!0,t):new x.Event(e,n)},x.Event.prototype={isDefaultPrevented:ot,isPropagationStopped:ot,isImmediatePropagationStopped:ot,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=it,e&&(e.preventDefault?e.preventDefault():e.returnValue=!1)},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=it,e&&(e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=it,this.stopPropagation()}},x.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(e,t){x.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,o=e.handleObj;return(!i||i!==r&&!x.contains(r,i))&&(e.type=o.origType,n=o.handler.apply(this,arguments),e.type=t),n}}}),x.support.submitBubbles||(x.event.special.submit={setup:function(){return x.nodeName(this,"form")?!1:(x.event.add(this,"click._submit keypress._submit",function(e){var n=e.target,r=x.nodeName(n,"input")||x.nodeName(n,"button")?n.form:t;r&&!x._data(r,"submitBubbles")&&(x.event.add(r,"submit._submit",function(e){e._submit_bubble=!0}),x._data(r,"submitBubbles",!0))}),t)},postDispatch:function(e){e._submit_bubble&&(delete e._submit_bubble,this.parentNode&&!e.isTrigger&&x.event.simulate("submit",this.parentNode,e,!0))},teardown:function(){return x.nodeName(this,"form")?!1:(x.event.remove(this,"._submit"),t)}}),x.support.changeBubbles||(x.event.special.change={setup:function(){return Z.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(x.event.add(this,"propertychange._change",function(e){"checked"===e.originalEvent.propertyName&&(this._just_changed=!0)}),x.event.add(this,"click._change",function(e){this._just_changed&&!e.isTrigger&&(this._just_changed=!1),x.event.simulate("change",this,e,!0)})),!1):(x.event.add(this,"beforeactivate._change",function(e){var t=e.target;Z.test(t.nodeName)&&!x._data(t,"changeBubbles")&&(x.event.add(t,"change._change",function(e){!this.parentNode||e.isSimulated||e.isTrigger||x.event.simulate("change",this.parentNode,e,!0)}),x._data(t,"changeBubbles",!0))}),t)},handle:function(e){var n=e.target;return this!==n||e.isSimulated||e.isTrigger||"radio"!==n.type&&"checkbox"!==n.type?e.handleObj.handler.apply(this,arguments):t},teardown:function(){return x.event.remove(this,"._change"),!Z.test(this.nodeName)}}),x.support.focusinBubbles||x.each({focus:"focusin",blur:"focusout"},function(e,t){var n=0,r=function(e){x.event.simulate(t,e.target,x.event.fix(e),!0)};x.event.special[t]={setup:function(){0===n++&&a.addEventListener(e,r,!0)},teardown:function(){0===--n&&a.removeEventListener(e,r,!0)}}}),x.fn.extend({on:function(e,n,r,i,o){var a,s;if("object"==typeof e){"string"!=typeof n&&(r=r||n,n=t);for(a in e)this.on(a,n,r,e[a],o);return this}if(null==r&&null==i?(i=n,r=n=t):null==i&&("string"==typeof n?(i=r,r=t):(i=r,r=n,n=t)),i===!1)i=ot;else if(!i)return this;return 1===o&&(s=i,i=function(e){return x().off(e),s.apply(this,arguments)},i.guid=s.guid||(s.guid=x.guid++)),this.each(function(){x.event.add(this,e,i,r,n)})},one:function(e,t,n,r){return this.on(e,t,n,r,1)},off:function(e,n,r){var i,o;if(e&&e.preventDefault&&e.handleObj)return i=e.handleObj,x(e.delegateTarget).off(i.namespace?i.origType+"."+i.namespace:i.origType,i.selector,i.handler),this;if("object"==typeof e){for(o in e)this.off(o,n,e[o]);return this}return(n===!1||"function"==typeof n)&&(r=n,n=t),r===!1&&(r=ot),this.each(function(){x.event.remove(this,e,r,n)})},trigger:function(e,t){return this.each(function(){x.event.trigger(e,t,this)})},triggerHandler:function(e,n){var r=this[0];return r?x.event.trigger(e,n,r,!0):t}});var st=/^.[^:#\[\.,]*$/,lt=/^(?:parents|prev(?:Until|All))/,ut=x.expr.match.needsContext,ct={children:!0,contents:!0,next:!0,prev:!0};x.fn.extend({find:function(e){var t,n=[],r=this,i=r.length;if("string"!=typeof e)return this.pushStack(x(e).filter(function(){for(t=0;i>t;t++)if(x.contains(r[t],this))return!0}));for(t=0;i>t;t++)x.find(e,r[t],n);return n=this.pushStack(i>1?x.unique(n):n),n.selector=this.selector?this.selector+" "+e:e,n},has:function(e){var t,n=x(e,this),r=n.length;return this.filter(function(){for(t=0;r>t;t++)if(x.contains(this,n[t]))return!0})},not:function(e){return this.pushStack(ft(this,e||[],!0))},filter:function(e){return this.pushStack(ft(this,e||[],!1))},is:function(e){return!!ft(this,"string"==typeof e&&ut.test(e)?x(e):e||[],!1).length},closest:function(e,t){var n,r=0,i=this.length,o=[],a=ut.test(e)||"string"!=typeof e?x(e,t||this.context):0;for(;i>r;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(11>n.nodeType&&(a?a.index(n)>-1:1===n.nodeType&&x.find.matchesSelector(n,e))){n=o.push(n);break}return this.pushStack(o.length>1?x.unique(o):o)},index:function(e){return e?"string"==typeof e?x.inArray(this[0],x(e)):x.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){var n="string"==typeof e?x(e,t):x.makeArray(e&&e.nodeType?[e]:e),r=x.merge(this.get(),n);return this.pushStack(x.unique(r))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}});function pt(e,t){do e=e[t];while(e&&1!==e.nodeType);return e}x.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return x.dir(e,"parentNode")},parentsUntil:function(e,t,n){return x.dir(e,"parentNode",n)},next:function(e){return pt(e,"nextSibling")},prev:function(e){return pt(e,"previousSibling")},nextAll:function(e){return x.dir(e,"nextSibling")},prevAll:function(e){return x.dir(e,"previousSibling")},nextUntil:function(e,t,n){return x.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return x.dir(e,"previousSibling",n)},siblings:function(e){return x.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return x.sibling(e.firstChild)},contents:function(e){return x.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:x.merge([],e.childNodes)}},function(e,t){x.fn[e]=function(n,r){var i=x.map(this,t,n);return"Until"!==e.slice(-5)&&(r=n),r&&"string"==typeof r&&(i=x.filter(r,i)),this.length>1&&(ct[e]||(i=x.unique(i)),lt.test(e)&&(i=i.reverse())),this.pushStack(i)}}),x.extend({filter:function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?x.find.matchesSelector(r,e)?[r]:[]:x.find.matches(e,x.grep(t,function(e){return 1===e.nodeType}))},dir:function(e,n,r){var i=[],o=e[n];while(o&&9!==o.nodeType&&(r===t||1!==o.nodeType||!x(o).is(r)))1===o.nodeType&&i.push(o),o=o[n];return i},sibling:function(e,t){var n=[];for(;e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n}});function ft(e,t,n){if(x.isFunction(t))return x.grep(e,function(e,r){return!!t.call(e,r,e)!==n});if(t.nodeType)return x.grep(e,function(e){return e===t!==n});if("string"==typeof t){if(st.test(t))return x.filter(t,e,n);t=x.filter(t,e)}return x.grep(e,function(e){return x.inArray(e,t)>=0!==n})}function dt(e){var t=ht.split("|"),n=e.createDocumentFragment();if(n.createElement)while(t.length)n.createElement(t.pop());return n}var ht="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",gt=/ jQuery\d+="(?:null|\d+)"/g,mt=RegExp("<(?:"+ht+")[\\s/>]","i"),yt=/^\s+/,vt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bt=/<([\w:]+)/,xt=/<tbody/i,wt=/<|&#?\w+;/,Tt=/<(?:script|style|link)/i,Ct=/^(?:checkbox|radio)$/i,Nt=/checked\s*(?:[^=]|=\s*.checked.)/i,kt=/^$|\/(?:java|ecma)script/i,Et=/^true\/(.*)/,St=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,At={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:x.support.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]},jt=dt(a),Dt=jt.appendChild(a.createElement("div"));At.optgroup=At.option,At.tbody=At.tfoot=At.colgroup=At.caption=At.thead,At.th=At.td,x.fn.extend({text:function(e){return x.access(this,function(e){return e===t?x.text(this):this.empty().append((this[0]&&this[0].ownerDocument||a).createTextNode(e))},null,e,arguments.length)},append:function(){return this.domManip(arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Lt(this,e);t.appendChild(e)}})},prepend:function(){return this.domManip(arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Lt(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},remove:function(e,t){var n,r=e?x.filter(e,this):this,i=0;for(;null!=(n=r[i]);i++)t||1!==n.nodeType||x.cleanData(Ft(n)),n.parentNode&&(t&&x.contains(n.ownerDocument,n)&&_t(Ft(n,"script")),n.parentNode.removeChild(n));return this},empty:function(){var e,t=0;for(;null!=(e=this[t]);t++){1===e.nodeType&&x.cleanData(Ft(e,!1));while(e.firstChild)e.removeChild(e.firstChild);e.options&&x.nodeName(e,"select")&&(e.options.length=0)}return this},clone:function(e,t){return e=null==e?!1:e,t=null==t?e:t,this.map(function(){return x.clone(this,e,t)})},html:function(e){return x.access(this,function(e){var n=this[0]||{},r=0,i=this.length;if(e===t)return 1===n.nodeType?n.innerHTML.replace(gt,""):t;if(!("string"!=typeof e||Tt.test(e)||!x.support.htmlSerialize&&mt.test(e)||!x.support.leadingWhitespace&&yt.test(e)||At[(bt.exec(e)||["",""])[1].toLowerCase()])){e=e.replace(vt,"<$1></$2>");try{for(;i>r;r++)n=this[r]||{},1===n.nodeType&&(x.cleanData(Ft(n,!1)),n.innerHTML=e);n=0}catch(o){}}n&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var e=x.map(this,function(e){return[e.nextSibling,e.parentNode]}),t=0;return this.domManip(arguments,function(n){var r=e[t++],i=e[t++];i&&(r&&r.parentNode!==i&&(r=this.nextSibling),x(this).remove(),i.insertBefore(n,r))},!0),t?this:this.remove()},detach:function(e){return this.remove(e,!0)},domManip:function(e,t,n){e=d.apply([],e);var r,i,o,a,s,l,u=0,c=this.length,p=this,f=c-1,h=e[0],g=x.isFunction(h);if(g||!(1>=c||"string"!=typeof h||x.support.checkClone)&&Nt.test(h))return this.each(function(r){var i=p.eq(r);g&&(e[0]=h.call(this,r,i.html())),i.domManip(e,t,n)});if(c&&(l=x.buildFragment(e,this[0].ownerDocument,!1,!n&&this),r=l.firstChild,1===l.childNodes.length&&(l=r),r)){for(a=x.map(Ft(l,"script"),Ht),o=a.length;c>u;u++)i=l,u!==f&&(i=x.clone(i,!0,!0),o&&x.merge(a,Ft(i,"script"))),t.call(this[u],i,u);if(o)for(s=a[a.length-1].ownerDocument,x.map(a,qt),u=0;o>u;u++)i=a[u],kt.test(i.type||"")&&!x._data(i,"globalEval")&&x.contains(s,i)&&(i.src?x._evalUrl(i.src):x.globalEval((i.text||i.textContent||i.innerHTML||"").replace(St,"")));l=r=null}return this}});function Lt(e,t){return x.nodeName(e,"table")&&x.nodeName(1===t.nodeType?t:t.firstChild,"tr")?e.getElementsByTagName("tbody")[0]||e.appendChild(e.ownerDocument.createElement("tbody")):e}function Ht(e){return e.type=(null!==x.find.attr(e,"type"))+"/"+e.type,e}function qt(e){var t=Et.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function _t(e,t){var n,r=0;for(;null!=(n=e[r]);r++)x._data(n,"globalEval",!t||x._data(t[r],"globalEval"))}function Mt(e,t){if(1===t.nodeType&&x.hasData(e)){var n,r,i,o=x._data(e),a=x._data(t,o),s=o.events;if(s){delete a.handle,a.events={};for(n in s)for(r=0,i=s[n].length;i>r;r++)x.event.add(t,n,s[n][r])}a.data&&(a.data=x.extend({},a.data))}}function Ot(e,t){var n,r,i;if(1===t.nodeType){if(n=t.nodeName.toLowerCase(),!x.support.noCloneEvent&&t[x.expando]){i=x._data(t);for(r in i.events)x.removeEvent(t,r,i.handle);t.removeAttribute(x.expando)}"script"===n&&t.text!==e.text?(Ht(t).text=e.text,qt(t)):"object"===n?(t.parentNode&&(t.outerHTML=e.outerHTML),x.support.html5Clone&&e.innerHTML&&!x.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):"input"===n&&Ct.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):"option"===n?t.defaultSelected=t.selected=e.defaultSelected:("input"===n||"textarea"===n)&&(t.defaultValue=e.defaultValue)}}x.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){x.fn[e]=function(e){var n,r=0,i=[],o=x(e),a=o.length-1;for(;a>=r;r++)n=r===a?this:this.clone(!0),x(o[r])[t](n),h.apply(i,n.get());return this.pushStack(i)}});function Ft(e,n){var r,o,a=0,s=typeof e.getElementsByTagName!==i?e.getElementsByTagName(n||"*"):typeof e.querySelectorAll!==i?e.querySelectorAll(n||"*"):t;if(!s)for(s=[],r=e.childNodes||e;null!=(o=r[a]);a++)!n||x.nodeName(o,n)?s.push(o):x.merge(s,Ft(o,n));return n===t||n&&x.nodeName(e,n)?x.merge([e],s):s}function Bt(e){Ct.test(e.type)&&(e.defaultChecked=e.checked)}x.extend({clone:function(e,t,n){var r,i,o,a,s,l=x.contains(e.ownerDocument,e);if(x.support.html5Clone||x.isXMLDoc(e)||!mt.test("<"+e.nodeName+">")?o=e.cloneNode(!0):(Dt.innerHTML=e.outerHTML,Dt.removeChild(o=Dt.firstChild)),!(x.support.noCloneEvent&&x.support.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||x.isXMLDoc(e)))for(r=Ft(o),s=Ft(e),a=0;null!=(i=s[a]);++a)r[a]&&Ot(i,r[a]);if(t)if(n)for(s=s||Ft(e),r=r||Ft(o),a=0;null!=(i=s[a]);a++)Mt(i,r[a]);else Mt(e,o);return r=Ft(o,"script"),r.length>0&&_t(r,!l&&Ft(e,"script")),r=s=i=null,o},buildFragment:function(e,t,n,r){var i,o,a,s,l,u,c,p=e.length,f=dt(t),d=[],h=0;for(;p>h;h++)if(o=e[h],o||0===o)if("object"===x.type(o))x.merge(d,o.nodeType?[o]:o);else if(wt.test(o)){s=s||f.appendChild(t.createElement("div")),l=(bt.exec(o)||["",""])[1].toLowerCase(),c=At[l]||At._default,s.innerHTML=c[1]+o.replace(vt,"<$1></$2>")+c[2],i=c[0];while(i--)s=s.lastChild;if(!x.support.leadingWhitespace&&yt.test(o)&&d.push(t.createTextNode(yt.exec(o)[0])),!x.support.tbody){o="table"!==l||xt.test(o)?"<table>"!==c[1]||xt.test(o)?0:s:s.firstChild,i=o&&o.childNodes.length;while(i--)x.nodeName(u=o.childNodes[i],"tbody")&&!u.childNodes.length&&o.removeChild(u)}x.merge(d,s.childNodes),s.textContent="";while(s.firstChild)s.removeChild(s.firstChild);s=f.lastChild}else d.push(t.createTextNode(o));s&&f.removeChild(s),x.support.appendChecked||x.grep(Ft(d,"input"),Bt),h=0;while(o=d[h++])if((!r||-1===x.inArray(o,r))&&(a=x.contains(o.ownerDocument,o),s=Ft(f.appendChild(o),"script"),a&&_t(s),n)){i=0;while(o=s[i++])kt.test(o.type||"")&&n.push(o)}return s=null,f},cleanData:function(e,t){var n,r,o,a,s=0,l=x.expando,u=x.cache,c=x.support.deleteExpando,f=x.event.special;for(;null!=(n=e[s]);s++)if((t||x.acceptData(n))&&(o=n[l],a=o&&u[o])){if(a.events)for(r in a.events)f[r]?x.event.remove(n,r):x.removeEvent(n,r,a.handle);
+u[o]&&(delete u[o],c?delete n[l]:typeof n.removeAttribute!==i?n.removeAttribute(l):n[l]=null,p.push(o))}},_evalUrl:function(e){return x.ajax({url:e,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})}}),x.fn.extend({wrapAll:function(e){if(x.isFunction(e))return this.each(function(t){x(this).wrapAll(e.call(this,t))});if(this[0]){var t=x(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstChild&&1===e.firstChild.nodeType)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return x.isFunction(e)?this.each(function(t){x(this).wrapInner(e.call(this,t))}):this.each(function(){var t=x(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=x.isFunction(e);return this.each(function(n){x(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){x.nodeName(this,"body")||x(this).replaceWith(this.childNodes)}).end()}});var Pt,Rt,Wt,$t=/alpha\([^)]*\)/i,It=/opacity\s*=\s*([^)]*)/,zt=/^(top|right|bottom|left)$/,Xt=/^(none|table(?!-c[ea]).+)/,Ut=/^margin/,Vt=RegExp("^("+w+")(.*)$","i"),Yt=RegExp("^("+w+")(?!px)[a-z%]+$","i"),Jt=RegExp("^([+-])=("+w+")","i"),Gt={BODY:"block"},Qt={position:"absolute",visibility:"hidden",display:"block"},Kt={letterSpacing:0,fontWeight:400},Zt=["Top","Right","Bottom","Left"],en=["Webkit","O","Moz","ms"];function tn(e,t){if(t in e)return t;var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=en.length;while(i--)if(t=en[i]+n,t in e)return t;return r}function nn(e,t){return e=t||e,"none"===x.css(e,"display")||!x.contains(e.ownerDocument,e)}function rn(e,t){var n,r,i,o=[],a=0,s=e.length;for(;s>a;a++)r=e[a],r.style&&(o[a]=x._data(r,"olddisplay"),n=r.style.display,t?(o[a]||"none"!==n||(r.style.display=""),""===r.style.display&&nn(r)&&(o[a]=x._data(r,"olddisplay",ln(r.nodeName)))):o[a]||(i=nn(r),(n&&"none"!==n||!i)&&x._data(r,"olddisplay",i?n:x.css(r,"display"))));for(a=0;s>a;a++)r=e[a],r.style&&(t&&"none"!==r.style.display&&""!==r.style.display||(r.style.display=t?o[a]||"":"none"));return e}x.fn.extend({css:function(e,n){return x.access(this,function(e,n,r){var i,o,a={},s=0;if(x.isArray(n)){for(o=Rt(e),i=n.length;i>s;s++)a[n[s]]=x.css(e,n[s],!1,o);return a}return r!==t?x.style(e,n,r):x.css(e,n)},e,n,arguments.length>1)},show:function(){return rn(this,!0)},hide:function(){return rn(this)},toggle:function(e){var t="boolean"==typeof e;return this.each(function(){(t?e:nn(this))?x(this).show():x(this).hide()})}}),x.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Wt(e,"opacity");return""===n?"1":n}}}},cssNumber:{columnCount:!0,fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":x.support.cssFloat?"cssFloat":"styleFloat"},style:function(e,n,r,i){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var o,a,s,l=x.camelCase(n),u=e.style;if(n=x.cssProps[l]||(x.cssProps[l]=tn(u,l)),s=x.cssHooks[n]||x.cssHooks[l],r===t)return s&&"get"in s&&(o=s.get(e,!1,i))!==t?o:u[n];if(a=typeof r,"string"===a&&(o=Jt.exec(r))&&(r=(o[1]+1)*o[2]+parseFloat(x.css(e,n)),a="number"),!(null==r||"number"===a&&isNaN(r)||("number"!==a||x.cssNumber[l]||(r+="px"),x.support.clearCloneStyle||""!==r||0!==n.indexOf("background")||(u[n]="inherit"),s&&"set"in s&&(r=s.set(e,r,i))===t)))try{u[n]=r}catch(c){}}},css:function(e,n,r,i){var o,a,s,l=x.camelCase(n);return n=x.cssProps[l]||(x.cssProps[l]=tn(e.style,l)),s=x.cssHooks[n]||x.cssHooks[l],s&&"get"in s&&(a=s.get(e,!0,r)),a===t&&(a=Wt(e,n,i)),"normal"===a&&n in Kt&&(a=Kt[n]),""===r||r?(o=parseFloat(a),r===!0||x.isNumeric(o)?o||0:a):a}}),e.getComputedStyle?(Rt=function(t){return e.getComputedStyle(t,null)},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),l=s?s.getPropertyValue(n)||s[n]:t,u=e.style;return s&&(""!==l||x.contains(e.ownerDocument,e)||(l=x.style(e,n)),Yt.test(l)&&Ut.test(n)&&(i=u.width,o=u.minWidth,a=u.maxWidth,u.minWidth=u.maxWidth=u.width=l,l=s.width,u.width=i,u.minWidth=o,u.maxWidth=a)),l}):a.documentElement.currentStyle&&(Rt=function(e){return e.currentStyle},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),l=s?s[n]:t,u=e.style;return null==l&&u&&u[n]&&(l=u[n]),Yt.test(l)&&!zt.test(n)&&(i=u.left,o=e.runtimeStyle,a=o&&o.left,a&&(o.left=e.currentStyle.left),u.left="fontSize"===n?"1em":l,l=u.pixelLeft+"px",u.left=i,a&&(o.left=a)),""===l?"auto":l});function on(e,t,n){var r=Vt.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function an(e,t,n,r,i){var o=n===(r?"border":"content")?4:"width"===t?1:0,a=0;for(;4>o;o+=2)"margin"===n&&(a+=x.css(e,n+Zt[o],!0,i)),r?("content"===n&&(a-=x.css(e,"padding"+Zt[o],!0,i)),"margin"!==n&&(a-=x.css(e,"border"+Zt[o]+"Width",!0,i))):(a+=x.css(e,"padding"+Zt[o],!0,i),"padding"!==n&&(a+=x.css(e,"border"+Zt[o]+"Width",!0,i)));return a}function sn(e,t,n){var r=!0,i="width"===t?e.offsetWidth:e.offsetHeight,o=Rt(e),a=x.support.boxSizing&&"border-box"===x.css(e,"boxSizing",!1,o);if(0>=i||null==i){if(i=Wt(e,t,o),(0>i||null==i)&&(i=e.style[t]),Yt.test(i))return i;r=a&&(x.support.boxSizingReliable||i===e.style[t]),i=parseFloat(i)||0}return i+an(e,t,n||(a?"border":"content"),r,o)+"px"}function ln(e){var t=a,n=Gt[e];return n||(n=un(e,t),"none"!==n&&n||(Pt=(Pt||x("<iframe frameborder='0' width='0' height='0'/>").css("cssText","display:block !important")).appendTo(t.documentElement),t=(Pt[0].contentWindow||Pt[0].contentDocument).document,t.write("<!doctype html><html><body>"),t.close(),n=un(e,t),Pt.detach()),Gt[e]=n),n}function un(e,t){var n=x(t.createElement(e)).appendTo(t.body),r=x.css(n[0],"display");return n.remove(),r}x.each(["height","width"],function(e,n){x.cssHooks[n]={get:function(e,r,i){return r?0===e.offsetWidth&&Xt.test(x.css(e,"display"))?x.swap(e,Qt,function(){return sn(e,n,i)}):sn(e,n,i):t},set:function(e,t,r){var i=r&&Rt(e);return on(e,t,r?an(e,n,r,x.support.boxSizing&&"border-box"===x.css(e,"boxSizing",!1,i),i):0)}}}),x.support.opacity||(x.cssHooks.opacity={get:function(e,t){return It.test((t&&e.currentStyle?e.currentStyle.filter:e.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":t?"1":""},set:function(e,t){var n=e.style,r=e.currentStyle,i=x.isNumeric(t)?"alpha(opacity="+100*t+")":"",o=r&&r.filter||n.filter||"";n.zoom=1,(t>=1||""===t)&&""===x.trim(o.replace($t,""))&&n.removeAttribute&&(n.removeAttribute("filter"),""===t||r&&!r.filter)||(n.filter=$t.test(o)?o.replace($t,i):o+" "+i)}}),x(function(){x.support.reliableMarginRight||(x.cssHooks.marginRight={get:function(e,n){return n?x.swap(e,{display:"inline-block"},Wt,[e,"marginRight"]):t}}),!x.support.pixelPosition&&x.fn.position&&x.each(["top","left"],function(e,n){x.cssHooks[n]={get:function(e,r){return r?(r=Wt(e,n),Yt.test(r)?x(e).position()[n]+"px":r):t}}})}),x.expr&&x.expr.filters&&(x.expr.filters.hidden=function(e){return 0>=e.offsetWidth&&0>=e.offsetHeight||!x.support.reliableHiddenOffsets&&"none"===(e.style&&e.style.display||x.css(e,"display"))},x.expr.filters.visible=function(e){return!x.expr.filters.hidden(e)}),x.each({margin:"",padding:"",border:"Width"},function(e,t){x.cssHooks[e+t]={expand:function(n){var r=0,i={},o="string"==typeof n?n.split(" "):[n];for(;4>r;r++)i[e+Zt[r]+t]=o[r]||o[r-2]||o[0];return i}},Ut.test(e)||(x.cssHooks[e+t].set=on)});var cn=/%20/g,pn=/\[\]$/,fn=/\r?\n/g,dn=/^(?:submit|button|image|reset|file)$/i,hn=/^(?:input|select|textarea|keygen)/i;x.fn.extend({serialize:function(){return x.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=x.prop(this,"elements");return e?x.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!x(this).is(":disabled")&&hn.test(this.nodeName)&&!dn.test(e)&&(this.checked||!Ct.test(e))}).map(function(e,t){var n=x(this).val();return null==n?null:x.isArray(n)?x.map(n,function(e){return{name:t.name,value:e.replace(fn,"\r\n")}}):{name:t.name,value:n.replace(fn,"\r\n")}}).get()}}),x.param=function(e,n){var r,i=[],o=function(e,t){t=x.isFunction(t)?t():null==t?"":t,i[i.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};if(n===t&&(n=x.ajaxSettings&&x.ajaxSettings.traditional),x.isArray(e)||e.jquery&&!x.isPlainObject(e))x.each(e,function(){o(this.name,this.value)});else for(r in e)gn(r,e[r],n,o);return i.join("&").replace(cn,"+")};function gn(e,t,n,r){var i;if(x.isArray(t))x.each(t,function(t,i){n||pn.test(e)?r(e,i):gn(e+"["+("object"==typeof i?t:"")+"]",i,n,r)});else if(n||"object"!==x.type(t))r(e,t);else for(i in t)gn(e+"["+i+"]",t[i],n,r)}x.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(e,t){x.fn[t]=function(e,n){return arguments.length>0?this.on(t,null,e,n):this.trigger(t)}}),x.fn.extend({hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)},bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)}});var mn,yn,vn=x.now(),bn=/\?/,xn=/#.*$/,wn=/([?&])_=[^&]*/,Tn=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Cn=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Nn=/^(?:GET|HEAD)$/,kn=/^\/\//,En=/^([\w.+-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,Sn=x.fn.load,An={},jn={},Dn="*/".concat("*");try{yn=o.href}catch(Ln){yn=a.createElement("a"),yn.href="",yn=yn.href}mn=En.exec(yn.toLowerCase())||[];function Hn(e){return function(t,n){"string"!=typeof t&&(n=t,t="*");var r,i=0,o=t.toLowerCase().match(T)||[];if(x.isFunction(n))while(r=o[i++])"+"===r[0]?(r=r.slice(1)||"*",(e[r]=e[r]||[]).unshift(n)):(e[r]=e[r]||[]).push(n)}}function qn(e,n,r,i){var o={},a=e===jn;function s(l){var u;return o[l]=!0,x.each(e[l]||[],function(e,l){var c=l(n,r,i);return"string"!=typeof c||a||o[c]?a?!(u=c):t:(n.dataTypes.unshift(c),s(c),!1)}),u}return s(n.dataTypes[0])||!o["*"]&&s("*")}function _n(e,n){var r,i,o=x.ajaxSettings.flatOptions||{};for(i in n)n[i]!==t&&((o[i]?e:r||(r={}))[i]=n[i]);return r&&x.extend(!0,e,r),e}x.fn.load=function(e,n,r){if("string"!=typeof e&&Sn)return Sn.apply(this,arguments);var i,o,a,s=this,l=e.indexOf(" ");return l>=0&&(i=e.slice(l,e.length),e=e.slice(0,l)),x.isFunction(n)?(r=n,n=t):n&&"object"==typeof n&&(a="POST"),s.length>0&&x.ajax({url:e,type:a,dataType:"html",data:n}).done(function(e){o=arguments,s.html(i?x("<div>").append(x.parseHTML(e)).find(i):e)}).complete(r&&function(e,t){s.each(r,o||[e.responseText,t,e])}),this},x.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){x.fn[t]=function(e){return this.on(t,e)}}),x.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:yn,type:"GET",isLocal:Cn.test(mn[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Dn,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":x.parseJSON,"text xml":x.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?_n(_n(e,x.ajaxSettings),t):_n(x.ajaxSettings,e)},ajaxPrefilter:Hn(An),ajaxTransport:Hn(jn),ajax:function(e,n){"object"==typeof e&&(n=e,e=t),n=n||{};var r,i,o,a,s,l,u,c,p=x.ajaxSetup({},n),f=p.context||p,d=p.context&&(f.nodeType||f.jquery)?x(f):x.event,h=x.Deferred(),g=x.Callbacks("once memory"),m=p.statusCode||{},y={},v={},b=0,w="canceled",C={readyState:0,getResponseHeader:function(e){var t;if(2===b){if(!c){c={};while(t=Tn.exec(a))c[t[1].toLowerCase()]=t[2]}t=c[e.toLowerCase()]}return null==t?null:t},getAllResponseHeaders:function(){return 2===b?a:null},setRequestHeader:function(e,t){var n=e.toLowerCase();return b||(e=v[n]=v[n]||e,y[e]=t),this},overrideMimeType:function(e){return b||(p.mimeType=e),this},statusCode:function(e){var t;if(e)if(2>b)for(t in e)m[t]=[m[t],e[t]];else C.always(e[C.status]);return this},abort:function(e){var t=e||w;return u&&u.abort(t),k(0,t),this}};if(h.promise(C).complete=g.add,C.success=C.done,C.error=C.fail,p.url=((e||p.url||yn)+"").replace(xn,"").replace(kn,mn[1]+"//"),p.type=n.method||n.type||p.method||p.type,p.dataTypes=x.trim(p.dataType||"*").toLowerCase().match(T)||[""],null==p.crossDomain&&(r=En.exec(p.url.toLowerCase()),p.crossDomain=!(!r||r[1]===mn[1]&&r[2]===mn[2]&&(r[3]||("http:"===r[1]?"80":"443"))===(mn[3]||("http:"===mn[1]?"80":"443")))),p.data&&p.processData&&"string"!=typeof p.data&&(p.data=x.param(p.data,p.traditional)),qn(An,p,n,C),2===b)return C;l=p.global,l&&0===x.active++&&x.event.trigger("ajaxStart"),p.type=p.type.toUpperCase(),p.hasContent=!Nn.test(p.type),o=p.url,p.hasContent||(p.data&&(o=p.url+=(bn.test(o)?"&":"?")+p.data,delete p.data),p.cache===!1&&(p.url=wn.test(o)?o.replace(wn,"$1_="+vn++):o+(bn.test(o)?"&":"?")+"_="+vn++)),p.ifModified&&(x.lastModified[o]&&C.setRequestHeader("If-Modified-Since",x.lastModified[o]),x.etag[o]&&C.setRequestHeader("If-None-Match",x.etag[o])),(p.data&&p.hasContent&&p.contentType!==!1||n.contentType)&&C.setRequestHeader("Content-Type",p.contentType),C.setRequestHeader("Accept",p.dataTypes[0]&&p.accepts[p.dataTypes[0]]?p.accepts[p.dataTypes[0]]+("*"!==p.dataTypes[0]?", "+Dn+"; q=0.01":""):p.accepts["*"]);for(i in p.headers)C.setRequestHeader(i,p.headers[i]);if(p.beforeSend&&(p.beforeSend.call(f,C,p)===!1||2===b))return C.abort();w="abort";for(i in{success:1,error:1,complete:1})C[i](p[i]);if(u=qn(jn,p,n,C)){C.readyState=1,l&&d.trigger("ajaxSend",[C,p]),p.async&&p.timeout>0&&(s=setTimeout(function(){C.abort("timeout")},p.timeout));try{b=1,u.send(y,k)}catch(N){if(!(2>b))throw N;k(-1,N)}}else k(-1,"No Transport");function k(e,n,r,i){var c,y,v,w,T,N=n;2!==b&&(b=2,s&&clearTimeout(s),u=t,a=i||"",C.readyState=e>0?4:0,c=e>=200&&300>e||304===e,r&&(w=Mn(p,C,r)),w=On(p,w,C,c),c?(p.ifModified&&(T=C.getResponseHeader("Last-Modified"),T&&(x.lastModified[o]=T),T=C.getResponseHeader("etag"),T&&(x.etag[o]=T)),204===e||"HEAD"===p.type?N="nocontent":304===e?N="notmodified":(N=w.state,y=w.data,v=w.error,c=!v)):(v=N,(e||!N)&&(N="error",0>e&&(e=0))),C.status=e,C.statusText=(n||N)+"",c?h.resolveWith(f,[y,N,C]):h.rejectWith(f,[C,N,v]),C.statusCode(m),m=t,l&&d.trigger(c?"ajaxSuccess":"ajaxError",[C,p,c?y:v]),g.fireWith(f,[C,N]),l&&(d.trigger("ajaxComplete",[C,p]),--x.active||x.event.trigger("ajaxStop")))}return C},getJSON:function(e,t,n){return x.get(e,t,n,"json")},getScript:function(e,n){return x.get(e,t,n,"script")}}),x.each(["get","post"],function(e,n){x[n]=function(e,r,i,o){return x.isFunction(r)&&(o=o||i,i=r,r=t),x.ajax({url:e,type:n,dataType:o,data:r,success:i})}});function Mn(e,n,r){var i,o,a,s,l=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),o===t&&(o=e.mimeType||n.getResponseHeader("Content-Type"));if(o)for(s in l)if(l[s]&&l[s].test(o)){u.unshift(s);break}if(u[0]in r)a=u[0];else{for(s in r){if(!u[0]||e.converters[s+" "+u[0]]){a=s;break}i||(i=s)}a=a||i}return a?(a!==u[0]&&u.unshift(a),r[a]):t}function On(e,t,n,r){var i,o,a,s,l,u={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)u[a.toLowerCase()]=e.converters[a];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!l&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),l=o,o=c.shift())if("*"===o)o=l;else if("*"!==l&&l!==o){if(a=u[l+" "+o]||u["* "+o],!a)for(i in u)if(s=i.split(" "),s[1]===o&&(a=u[l+" "+s[0]]||u["* "+s[0]])){a===!0?a=u[i]:u[i]!==!0&&(o=s[0],c.unshift(s[1]));break}if(a!==!0)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(p){return{state:"parsererror",error:a?p:"No conversion from "+l+" to "+o}}}return{state:"success",data:t}}x.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(e){return x.globalEval(e),e}}}),x.ajaxPrefilter("script",function(e){e.cache===t&&(e.cache=!1),e.crossDomain&&(e.type="GET",e.global=!1)}),x.ajaxTransport("script",function(e){if(e.crossDomain){var n,r=a.head||x("head")[0]||a.documentElement;return{send:function(t,i){n=a.createElement("script"),n.async=!0,e.scriptCharset&&(n.charset=e.scriptCharset),n.src=e.url,n.onload=n.onreadystatechange=function(e,t){(t||!n.readyState||/loaded|complete/.test(n.readyState))&&(n.onload=n.onreadystatechange=null,n.parentNode&&n.parentNode.removeChild(n),n=null,t||i(200,"success"))},r.insertBefore(n,r.firstChild)},abort:function(){n&&n.onload(t,!0)}}}});var Fn=[],Bn=/(=)\?(?=&|$)|\?\?/;x.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Fn.pop()||x.expando+"_"+vn++;return this[e]=!0,e}}),x.ajaxPrefilter("json jsonp",function(n,r,i){var o,a,s,l=n.jsonp!==!1&&(Bn.test(n.url)?"url":"string"==typeof n.data&&!(n.contentType||"").indexOf("application/x-www-form-urlencoded")&&Bn.test(n.data)&&"data");return l||"jsonp"===n.dataTypes[0]?(o=n.jsonpCallback=x.isFunction(n.jsonpCallback)?n.jsonpCallback():n.jsonpCallback,l?n[l]=n[l].replace(Bn,"$1"+o):n.jsonp!==!1&&(n.url+=(bn.test(n.url)?"&":"?")+n.jsonp+"="+o),n.converters["script json"]=function(){return s||x.error(o+" was not called"),s[0]},n.dataTypes[0]="json",a=e[o],e[o]=function(){s=arguments},i.always(function(){e[o]=a,n[o]&&(n.jsonpCallback=r.jsonpCallback,Fn.push(o)),s&&x.isFunction(a)&&a(s[0]),s=a=t}),"script"):t});var Pn,Rn,Wn=0,$n=e.ActiveXObject&&function(){var e;for(e in Pn)Pn[e](t,!0)};function In(){try{return new e.XMLHttpRequest}catch(t){}}function zn(){try{return new e.ActiveXObject("Microsoft.XMLHTTP")}catch(t){}}x.ajaxSettings.xhr=e.ActiveXObject?function(){return!this.isLocal&&In()||zn()}:In,Rn=x.ajaxSettings.xhr(),x.support.cors=!!Rn&&"withCredentials"in Rn,Rn=x.support.ajax=!!Rn,Rn&&x.ajaxTransport(function(n){if(!n.crossDomain||x.support.cors){var r;return{send:function(i,o){var a,s,l=n.xhr();if(n.username?l.open(n.type,n.url,n.async,n.username,n.password):l.open(n.type,n.url,n.async),n.xhrFields)for(s in n.xhrFields)l[s]=n.xhrFields[s];n.mimeType&&l.overrideMimeType&&l.overrideMimeType(n.mimeType),n.crossDomain||i["X-Requested-With"]||(i["X-Requested-With"]="XMLHttpRequest");try{for(s in i)l.setRequestHeader(s,i[s])}catch(u){}l.send(n.hasContent&&n.data||null),r=function(e,i){var s,u,c,p;try{if(r&&(i||4===l.readyState))if(r=t,a&&(l.onreadystatechange=x.noop,$n&&delete Pn[a]),i)4!==l.readyState&&l.abort();else{p={},s=l.status,u=l.getAllResponseHeaders(),"string"==typeof l.responseText&&(p.text=l.responseText);try{c=l.statusText}catch(f){c=""}s||!n.isLocal||n.crossDomain?1223===s&&(s=204):s=p.text?200:404}}catch(d){i||o(-1,d)}p&&o(s,c,p,u)},n.async?4===l.readyState?setTimeout(r):(a=++Wn,$n&&(Pn||(Pn={},x(e).unload($n)),Pn[a]=r),l.onreadystatechange=r):r()},abort:function(){r&&r(t,!0)}}}});var Xn,Un,Vn=/^(?:toggle|show|hide)$/,Yn=RegExp("^(?:([+-])=|)("+w+")([a-z%]*)$","i"),Jn=/queueHooks$/,Gn=[nr],Qn={"*":[function(e,t){var n=this.createTween(e,t),r=n.cur(),i=Yn.exec(t),o=i&&i[3]||(x.cssNumber[e]?"":"px"),a=(x.cssNumber[e]||"px"!==o&&+r)&&Yn.exec(x.css(n.elem,e)),s=1,l=20;if(a&&a[3]!==o){o=o||a[3],i=i||[],a=+r||1;do s=s||".5",a/=s,x.style(n.elem,e,a+o);while(s!==(s=n.cur()/r)&&1!==s&&--l)}return i&&(a=n.start=+a||+r||0,n.unit=o,n.end=i[1]?a+(i[1]+1)*i[2]:+i[2]),n}]};function Kn(){return setTimeout(function(){Xn=t}),Xn=x.now()}function Zn(e,t,n){var r,i=(Qn[t]||[]).concat(Qn["*"]),o=0,a=i.length;for(;a>o;o++)if(r=i[o].call(n,t,e))return r}function er(e,t,n){var r,i,o=0,a=Gn.length,s=x.Deferred().always(function(){delete l.elem}),l=function(){if(i)return!1;var t=Xn||Kn(),n=Math.max(0,u.startTime+u.duration-t),r=n/u.duration||0,o=1-r,a=0,l=u.tweens.length;for(;l>a;a++)u.tweens[a].run(o);return s.notifyWith(e,[u,o,n]),1>o&&l?n:(s.resolveWith(e,[u]),!1)},u=s.promise({elem:e,props:x.extend({},t),opts:x.extend(!0,{specialEasing:{}},n),originalProperties:t,originalOptions:n,startTime:Xn||Kn(),duration:n.duration,tweens:[],createTween:function(t,n){var r=x.Tween(e,u.opts,t,n,u.opts.specialEasing[t]||u.opts.easing);return u.tweens.push(r),r},stop:function(t){var n=0,r=t?u.tweens.length:0;if(i)return this;for(i=!0;r>n;n++)u.tweens[n].run(1);return t?s.resolveWith(e,[u,t]):s.rejectWith(e,[u,t]),this}}),c=u.props;for(tr(c,u.opts.specialEasing);a>o;o++)if(r=Gn[o].call(u,e,c,u.opts))return r;return x.map(c,Zn,u),x.isFunction(u.opts.start)&&u.opts.start.call(e,u),x.fx.timer(x.extend(l,{elem:e,anim:u,queue:u.opts.queue})),u.progress(u.opts.progress).done(u.opts.done,u.opts.complete).fail(u.opts.fail).always(u.opts.always)}function tr(e,t){var n,r,i,o,a;for(n in e)if(r=x.camelCase(n),i=t[r],o=e[n],x.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),a=x.cssHooks[r],a&&"expand"in a){o=a.expand(o),delete e[r];for(n in o)n in e||(e[n]=o[n],t[n]=i)}else t[r]=i}x.Animation=x.extend(er,{tweener:function(e,t){x.isFunction(e)?(t=e,e=["*"]):e=e.split(" ");var n,r=0,i=e.length;for(;i>r;r++)n=e[r],Qn[n]=Qn[n]||[],Qn[n].unshift(t)},prefilter:function(e,t){t?Gn.unshift(e):Gn.push(e)}});function nr(e,t,n){var r,i,o,a,s,l,u=this,c={},p=e.style,f=e.nodeType&&nn(e),d=x._data(e,"fxshow");n.queue||(s=x._queueHooks(e,"fx"),null==s.unqueued&&(s.unqueued=0,l=s.empty.fire,s.empty.fire=function(){s.unqueued||l()}),s.unqueued++,u.always(function(){u.always(function(){s.unqueued--,x.queue(e,"fx").length||s.empty.fire()})})),1===e.nodeType&&("height"in t||"width"in t)&&(n.overflow=[p.overflow,p.overflowX,p.overflowY],"inline"===x.css(e,"display")&&"none"===x.css(e,"float")&&(x.support.inlineBlockNeedsLayout&&"inline"!==ln(e.nodeName)?p.zoom=1:p.display="inline-block")),n.overflow&&(p.overflow="hidden",x.support.shrinkWrapBlocks||u.always(function(){p.overflow=n.overflow[0],p.overflowX=n.overflow[1],p.overflowY=n.overflow[2]}));for(r in t)if(i=t[r],Vn.exec(i)){if(delete t[r],o=o||"toggle"===i,i===(f?"hide":"show"))continue;c[r]=d&&d[r]||x.style(e,r)}if(!x.isEmptyObject(c)){d?"hidden"in d&&(f=d.hidden):d=x._data(e,"fxshow",{}),o&&(d.hidden=!f),f?x(e).show():u.done(function(){x(e).hide()}),u.done(function(){var t;x._removeData(e,"fxshow");for(t in c)x.style(e,t,c[t])});for(r in c)a=Zn(f?d[r]:0,r,u),r in d||(d[r]=a.start,f&&(a.end=a.start,a.start="width"===r||"height"===r?1:0))}}function rr(e,t,n,r,i){return new rr.prototype.init(e,t,n,r,i)}x.Tween=rr,rr.prototype={constructor:rr,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||"swing",this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(x.cssNumber[n]?"":"px")},cur:function(){var e=rr.propHooks[this.prop];return e&&e.get?e.get(this):rr.propHooks._default.get(this)},run:function(e){var t,n=rr.propHooks[this.prop];return this.pos=t=this.options.duration?x.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):rr.propHooks._default.set(this),this}},rr.prototype.init.prototype=rr.prototype,rr.propHooks={_default:{get:function(e){var t;return null==e.elem[e.prop]||e.elem.style&&null!=e.elem.style[e.prop]?(t=x.css(e.elem,e.prop,""),t&&"auto"!==t?t:0):e.elem[e.prop]},set:function(e){x.fx.step[e.prop]?x.fx.step[e.prop](e):e.elem.style&&(null!=e.elem.style[x.cssProps[e.prop]]||x.cssHooks[e.prop])?x.style(e.elem,e.prop,e.now+e.unit):e.elem[e.prop]=e.now}}},rr.propHooks.scrollTop=rr.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},x.each(["toggle","show","hide"],function(e,t){var n=x.fn[t];x.fn[t]=function(e,r,i){return null==e||"boolean"==typeof e?n.apply(this,arguments):this.animate(ir(t,!0),e,r,i)}}),x.fn.extend({fadeTo:function(e,t,n,r){return this.filter(nn).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(e,t,n,r){var i=x.isEmptyObject(e),o=x.speed(t,n,r),a=function(){var t=er(this,x.extend({},e),o);(i||x._data(this,"finish"))&&t.stop(!0)};return a.finish=a,i||o.queue===!1?this.each(a):this.queue(o.queue,a)},stop:function(e,n,r){var i=function(e){var t=e.stop;delete e.stop,t(r)};return"string"!=typeof e&&(r=n,n=e,e=t),n&&e!==!1&&this.queue(e||"fx",[]),this.each(function(){var t=!0,n=null!=e&&e+"queueHooks",o=x.timers,a=x._data(this);if(n)a[n]&&a[n].stop&&i(a[n]);else for(n in a)a[n]&&a[n].stop&&Jn.test(n)&&i(a[n]);for(n=o.length;n--;)o[n].elem!==this||null!=e&&o[n].queue!==e||(o[n].anim.stop(r),t=!1,o.splice(n,1));(t||!r)&&x.dequeue(this,e)})},finish:function(e){return e!==!1&&(e=e||"fx"),this.each(function(){var t,n=x._data(this),r=n[e+"queue"],i=n[e+"queueHooks"],o=x.timers,a=r?r.length:0;for(n.finish=!0,x.queue(this,e,[]),i&&i.stop&&i.stop.call(this,!0),t=o.length;t--;)o[t].elem===this&&o[t].queue===e&&(o[t].anim.stop(!0),o.splice(t,1));for(t=0;a>t;t++)r[t]&&r[t].finish&&r[t].finish.call(this);delete n.finish})}});function ir(e,t){var n,r={height:e},i=0;for(t=t?1:0;4>i;i+=2-t)n=Zt[i],r["margin"+n]=r["padding"+n]=e;return t&&(r.opacity=r.width=e),r}x.each({slideDown:ir("show"),slideUp:ir("hide"),slideToggle:ir("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,t){x.fn[e]=function(e,n,r){return this.animate(t,e,n,r)}}),x.speed=function(e,t,n){var r=e&&"object"==typeof e?x.extend({},e):{complete:n||!n&&t||x.isFunction(e)&&e,duration:e,easing:n&&t||t&&!x.isFunction(t)&&t};return r.duration=x.fx.off?0:"number"==typeof r.duration?r.duration:r.duration in x.fx.speeds?x.fx.speeds[r.duration]:x.fx.speeds._default,(null==r.queue||r.queue===!0)&&(r.queue="fx"),r.old=r.complete,r.complete=function(){x.isFunction(r.old)&&r.old.call(this),r.queue&&x.dequeue(this,r.queue)},r},x.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2}},x.timers=[],x.fx=rr.prototype.init,x.fx.tick=function(){var e,n=x.timers,r=0;for(Xn=x.now();n.length>r;r++)e=n[r],e()||n[r]!==e||n.splice(r--,1);n.length||x.fx.stop(),Xn=t},x.fx.timer=function(e){e()&&x.timers.push(e)&&x.fx.start()},x.fx.interval=13,x.fx.start=function(){Un||(Un=setInterval(x.fx.tick,x.fx.interval))},x.fx.stop=function(){clearInterval(Un),Un=null},x.fx.speeds={slow:600,fast:200,_default:400},x.fx.step={},x.expr&&x.expr.filters&&(x.expr.filters.animated=function(e){return x.grep(x.timers,function(t){return e===t.elem}).length}),x.fn.offset=function(e){if(arguments.length)return e===t?this:this.each(function(t){x.offset.setOffset(this,e,t)});var n,r,o={top:0,left:0},a=this[0],s=a&&a.ownerDocument;if(s)return n=s.documentElement,x.contains(n,a)?(typeof a.getBoundingClientRect!==i&&(o=a.getBoundingClientRect()),r=or(s),{top:o.top+(r.pageYOffset||n.scrollTop)-(n.clientTop||0),left:o.left+(r.pageXOffset||n.scrollLeft)-(n.clientLeft||0)}):o},x.offset={setOffset:function(e,t,n){var r=x.css(e,"position");"static"===r&&(e.style.position="relative");var i=x(e),o=i.offset(),a=x.css(e,"top"),s=x.css(e,"left"),l=("absolute"===r||"fixed"===r)&&x.inArray("auto",[a,s])>-1,u={},c={},p,f;l?(c=i.position(),p=c.top,f=c.left):(p=parseFloat(a)||0,f=parseFloat(s)||0),x.isFunction(t)&&(t=t.call(e,n,o)),null!=t.top&&(u.top=t.top-o.top+p),null!=t.left&&(u.left=t.left-o.left+f),"using"in t?t.using.call(e,u):i.css(u)}},x.fn.extend({position:function(){if(this[0]){var e,t,n={top:0,left:0},r=this[0];return"fixed"===x.css(r,"position")?t=r.getBoundingClientRect():(e=this.offsetParent(),t=this.offset(),x.nodeName(e[0],"html")||(n=e.offset()),n.top+=x.css(e[0],"borderTopWidth",!0),n.left+=x.css(e[0],"borderLeftWidth",!0)),{top:t.top-n.top-x.css(r,"marginTop",!0),left:t.left-n.left-x.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent||s;while(e&&!x.nodeName(e,"html")&&"static"===x.css(e,"position"))e=e.offsetParent;return e||s})}}),x.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,n){var r=/Y/.test(n);x.fn[e]=function(i){return x.access(this,function(e,i,o){var a=or(e);return o===t?a?n in a?a[n]:a.document.documentElement[i]:e[i]:(a?a.scrollTo(r?x(a).scrollLeft():o,r?o:x(a).scrollTop()):e[i]=o,t)},e,i,arguments.length,null)}});function or(e){return x.isWindow(e)?e:9===e.nodeType?e.defaultView||e.parentWindow:!1}x.each({Height:"height",Width:"width"},function(e,n){x.each({padding:"inner"+e,content:n,"":"outer"+e},function(r,i){x.fn[i]=function(i,o){var a=arguments.length&&(r||"boolean"!=typeof i),s=r||(i===!0||o===!0?"margin":"border");return x.access(this,function(n,r,i){var o;return x.isWindow(n)?n.document.documentElement["client"+e]:9===n.nodeType?(o=n.documentElement,Math.max(n.body["scroll"+e],o["scroll"+e],n.body["offset"+e],o["offset"+e],o["client"+e])):i===t?x.css(n,r,s):x.style(n,r,i,s)},n,a?i:t,a,null)}})}),x.fn.size=function(){return this.length},x.fn.andSelf=x.fn.addBack,"object"==typeof module&&module&&"object"==typeof module.exports?module.exports=x:(e.jQuery=e.$=x,"function"==typeof define&&define.amd&&define("jquery",[],function(){return x}))})(window);
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/jquery/jquery-1.11.0.min.js b/pluss-manage-page/src/main/resources/static/resources/js/third-party/jquery/jquery-1.11.0.min.js
new file mode 100644
index 0000000..fc516fb
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/third-party/jquery/jquery-1.11.0.min.js
@@ -0,0 +1,5 @@
+// JavaScript Document
+/*! jQuery v1.11.0 | (c) 2005, 2014 jQuery Foundation, Inc. | jquery.org/license */
+!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k="".trim,l={},m="1.11.0",n=function(a,b){return new n.fn.init(a,b)},o=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,p=/^-ms-/,q=/-([\da-z])/gi,r=function(a,b){return b.toUpperCase()};n.fn=n.prototype={jquery:m,constructor:n,selector:"",length:0,toArray:function(){return d.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var b=n.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return n.each(this,a,b)},map:function(a){return this.pushStack(n.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:c.sort,splice:c.splice},n.extend=n.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||n.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(e=arguments[h]))for(d in e)a=g[d],c=e[d],g!==c&&(j&&c&&(n.isPlainObject(c)||(b=n.isArray(c)))?(b?(b=!1,f=a&&n.isArray(a)?a:[]):f=a&&n.isPlainObject(a)?a:{},g[d]=n.extend(j,f,c)):void 0!==c&&(g[d]=c));return g},n.extend({expando:"jQuery"+(m+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===n.type(a)},isArray:Array.isArray||function(a){return"array"===n.type(a)},isWindow:function(a){return null!=a&&a==a.window},isNumeric:function(a){return a-parseFloat(a)>=0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},isPlainObject:function(a){var b;if(!a||"object"!==n.type(a)||a.nodeType||n.isWindow(a))return!1;try{if(a.constructor&&!j.call(a,"constructor")&&!j.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}if(l.ownLast)for(b in a)return j.call(a,b);for(b in a);return void 0===b||j.call(a,b)},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?h[i.call(a)]||"object":typeof a},globalEval:function(b){b&&n.trim(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(p,"ms-").replace(q,r)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var d,e=0,f=a.length,g=s(a);if(c){if(g){for(;f>e;e++)if(d=b.apply(a[e],c),d===!1)break}else for(e in a)if(d=b.apply(a[e],c),d===!1)break}else if(g){for(;f>e;e++)if(d=b.call(a[e],e,a[e]),d===!1)break}else for(e in a)if(d=b.call(a[e],e,a[e]),d===!1)break;return a},trim:k&&!k.call("\ufeff\xa0")?function(a){return null==a?"":k.call(a)}:function(a){return null==a?"":(a+"").replace(o,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(s(Object(a))?n.merge(c,"string"==typeof a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){var d;if(b){if(g)return g.call(b,a,c);for(d=b.length,c=c?0>c?Math.max(0,d+c):c:0;d>c;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,b){var c=+b.length,d=0,e=a.length;while(c>d)a[e++]=b[d++];if(c!==c)while(void 0!==b[d])a[e++]=b[d++];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,f=0,g=a.length,h=s(a),i=[];if(h)for(;g>f;f++)d=b(a[f],f,c),null!=d&&i.push(d);else for(f in a)d=b(a[f],f,c),null!=d&&i.push(d);return e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;return"string"==typeof b&&(f=a[b],b=a,a=f),n.isFunction(a)?(c=d.call(arguments,2),e=function(){return a.apply(b||this,c.concat(d.call(arguments)))},e.guid=a.guid=a.guid||n.guid++,e):void 0},now:function(){return+new Date},support:l}),n.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){h["[object "+b+"]"]=b.toLowerCase()});function s(a){var b=a.length,c=n.type(a);return"function"===c||n.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var t=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s="sizzle"+-new Date,t=a.document,u=0,v=0,w=eb(),x=eb(),y=eb(),z=function(a,b){return a===b&&(j=!0),0},A="undefined",B=1<<31,C={}.hasOwnProperty,D=[],E=D.pop,F=D.push,G=D.push,H=D.slice,I=D.indexOf||function(a){for(var b=0,c=this.length;c>b;b++)if(this[b]===a)return b;return-1},J="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",K="[\\x20\\t\\r\\n\\f]",L="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",M=L.replace("w","w#"),N="\\["+K+"*("+L+")"+K+"*(?:([*^$|!~]?=)"+K+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+M+")|)|)"+K+"*\\]",O=":("+L+")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+N.replace(3,8)+")*)|.*)\\)|)",P=new RegExp("^"+K+"+|((?:^|[^\\\\])(?:\\\\.)*)"+K+"+$","g"),Q=new RegExp("^"+K+"*,"+K+"*"),R=new RegExp("^"+K+"*([>+~]|"+K+")"+K+"*"),S=new RegExp("="+K+"*([^\\]'\"]*?)"+K+"*\\]","g"),T=new RegExp(O),U=new RegExp("^"+M+"$"),V={ID:new RegExp("^#("+L+")"),CLASS:new RegExp("^\\.("+L+")"),TAG:new RegExp("^("+L.replace("w","w*")+")"),ATTR:new RegExp("^"+N),PSEUDO:new RegExp("^"+O),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+K+"*(even|odd|(([+-]|)(\\d*)n|)"+K+"*(?:([+-]|)"+K+"*(\\d+)|))"+K+"*\\)|)","i"),bool:new RegExp("^(?:"+J+")$","i"),needsContext:new RegExp("^"+K+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+K+"*((?:-\\d)?\\d*)"+K+"*\\)|)(?=[^-]|$)","i")},W=/^(?:input|select|textarea|button)$/i,X=/^h\d$/i,Y=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,$=/[+~]/,_=/'|\\/g,ab=new RegExp("\\\\([\\da-f]{1,6}"+K+"?|("+K+")|.)","ig"),bb=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)};try{G.apply(D=H.call(t.childNodes),t.childNodes),D[t.childNodes.length].nodeType}catch(cb){G={apply:D.length?function(a,b){F.apply(a,H.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function db(a,b,d,e){var f,g,h,i,j,m,p,q,u,v;if((b?b.ownerDocument||b:t)!==l&&k(b),b=b||l,d=d||[],!a||"string"!=typeof a)return d;if(1!==(i=b.nodeType)&&9!==i)return[];if(n&&!e){if(f=Z.exec(a))if(h=f[1]){if(9===i){if(g=b.getElementById(h),!g||!g.parentNode)return d;if(g.id===h)return d.push(g),d}else if(b.ownerDocument&&(g=b.ownerDocument.getElementById(h))&&r(b,g)&&g.id===h)return d.push(g),d}else{if(f[2])return G.apply(d,b.getElementsByTagName(a)),d;if((h=f[3])&&c.getElementsByClassName&&b.getElementsByClassName)return G.apply(d,b.getElementsByClassName(h)),d}if(c.qsa&&(!o||!o.test(a))){if(q=p=s,u=b,v=9===i&&a,1===i&&"object"!==b.nodeName.toLowerCase()){m=ob(a),(p=b.getAttribute("id"))?q=p.replace(_,"\\$&"):b.setAttribute("id",q),q="[id='"+q+"'] ",j=m.length;while(j--)m[j]=q+pb(m[j]);u=$.test(a)&&mb(b.parentNode)||b,v=m.join(",")}if(v)try{return G.apply(d,u.querySelectorAll(v)),d}catch(w){}finally{p||b.removeAttribute("id")}}}return xb(a.replace(P,"$1"),b,d,e)}function eb(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function fb(a){return a[s]=!0,a}function gb(a){var b=l.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function hb(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function ib(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||B)-(~a.sourceIndex||B);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function jb(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function kb(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function lb(a){return fb(function(b){return b=+b,fb(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function mb(a){return a&&typeof a.getElementsByTagName!==A&&a}c=db.support={},f=db.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},k=db.setDocument=function(a){var b,e=a?a.ownerDocument||a:t,g=e.defaultView;return e!==l&&9===e.nodeType&&e.documentElement?(l=e,m=e.documentElement,n=!f(e),g&&g!==g.top&&(g.addEventListener?g.addEventListener("unload",function(){k()},!1):g.attachEvent&&g.attachEvent("onunload",function(){k()})),c.attributes=gb(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=gb(function(a){return a.appendChild(e.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=Y.test(e.getElementsByClassName)&&gb(function(a){return a.innerHTML="<div class='a'></div><div class='a i'></div>",a.firstChild.className="i",2===a.getElementsByClassName("i").length}),c.getById=gb(function(a){return m.appendChild(a).id=s,!e.getElementsByName||!e.getElementsByName(s).length}),c.getById?(d.find.ID=function(a,b){if(typeof b.getElementById!==A&&n){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(ab,bb);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(ab,bb);return function(a){var c=typeof a.getAttributeNode!==A&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return typeof b.getElementsByTagName!==A?b.getElementsByTagName(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return typeof b.getElementsByClassName!==A&&n?b.getElementsByClassName(a):void 0},p=[],o=[],(c.qsa=Y.test(e.querySelectorAll))&&(gb(function(a){a.innerHTML="<select t=''><option selected=''></option></select>",a.querySelectorAll("[t^='']").length&&o.push("[*^$]="+K+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||o.push("\\["+K+"*(?:value|"+J+")"),a.querySelectorAll(":checked").length||o.push(":checked")}),gb(function(a){var b=e.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&o.push("name"+K+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||o.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),o.push(",.*:")})),(c.matchesSelector=Y.test(q=m.webkitMatchesSelector||m.mozMatchesSelector||m.oMatchesSelector||m.msMatchesSelector))&&gb(function(a){c.disconnectedMatch=q.call(a,"div"),q.call(a,"[s!='']:x"),p.push("!=",O)}),o=o.length&&new RegExp(o.join("|")),p=p.length&&new RegExp(p.join("|")),b=Y.test(m.compareDocumentPosition),r=b||Y.test(m.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},z=b?function(a,b){if(a===b)return j=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===e||a.ownerDocument===t&&r(t,a)?-1:b===e||b.ownerDocument===t&&r(t,b)?1:i?I.call(i,a)-I.call(i,b):0:4&d?-1:1)}:function(a,b){if(a===b)return j=!0,0;var c,d=0,f=a.parentNode,g=b.parentNode,h=[a],k=[b];if(!f||!g)return a===e?-1:b===e?1:f?-1:g?1:i?I.call(i,a)-I.call(i,b):0;if(f===g)return ib(a,b);c=a;while(c=c.parentNode)h.unshift(c);c=b;while(c=c.parentNode)k.unshift(c);while(h[d]===k[d])d++;return d?ib(h[d],k[d]):h[d]===t?-1:k[d]===t?1:0},e):l},db.matches=function(a,b){return db(a,null,null,b)},db.matchesSelector=function(a,b){if((a.ownerDocument||a)!==l&&k(a),b=b.replace(S,"='$1']"),!(!c.matchesSelector||!n||p&&p.test(b)||o&&o.test(b)))try{var d=q.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return db(b,l,null,[a]).length>0},db.contains=function(a,b){return(a.ownerDocument||a)!==l&&k(a),r(a,b)},db.attr=function(a,b){(a.ownerDocument||a)!==l&&k(a);var e=d.attrHandle[b.toLowerCase()],f=e&&C.call(d.attrHandle,b.toLowerCase())?e(a,b,!n):void 0;return void 0!==f?f:c.attributes||!n?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},db.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},db.uniqueSort=function(a){var b,d=[],e=0,f=0;if(j=!c.detectDuplicates,i=!c.sortStable&&a.slice(0),a.sort(z),j){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return i=null,a},e=db.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=db.selectors={cacheLength:50,createPseudo:fb,match:V,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(ab,bb),a[3]=(a[4]||a[5]||"").replace(ab,bb),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||db.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&db.error(a[0]),a},PSEUDO:function(a){var b,c=!a[5]&&a[2];return V.CHILD.test(a[0])?null:(a[3]&&void 0!==a[4]?a[2]=a[4]:c&&T.test(c)&&(b=ob(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(ab,bb).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=w[a+" "];return b||(b=new RegExp("(^|"+K+")"+a+"("+K+"|$)"))&&w(a,function(a){return b.test("string"==typeof a.className&&a.className||typeof a.getAttribute!==A&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=db.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),t=!i&&!h;if(q){if(f){while(p){l=b;while(l=l[p])if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&t){k=q[s]||(q[s]={}),j=k[a]||[],n=j[0]===u&&j[1],m=j[0]===u&&j[2],l=n&&q.childNodes[n];while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if(1===l.nodeType&&++m&&l===b){k[a]=[u,n,m];break}}else if(t&&(j=(b[s]||(b[s]={}))[a])&&j[0]===u)m=j[1];else while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if((h?l.nodeName.toLowerCase()===r:1===l.nodeType)&&++m&&(t&&((l[s]||(l[s]={}))[a]=[u,m]),l===b))break;return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||db.error("unsupported pseudo: "+a);return e[s]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?fb(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=I.call(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:fb(function(a){var b=[],c=[],d=g(a.replace(P,"$1"));return d[s]?fb(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),!c.pop()}}),has:fb(function(a){return function(b){return db(a,b).length>0}}),contains:fb(function(a){return function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:fb(function(a){return U.test(a||"")||db.error("unsupported lang: "+a),a=a.replace(ab,bb).toLowerCase(),function(b){var c;do if(c=n?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===m},focus:function(a){return a===l.activeElement&&(!l.hasFocus||l.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return X.test(a.nodeName)},input:function(a){return W.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:lb(function(){return[0]}),last:lb(function(a,b){return[b-1]}),eq:lb(function(a,b,c){return[0>c?c+b:c]}),even:lb(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:lb(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:lb(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:lb(function(a,b,c){for(var d=0>c?c+b:c;++d<b;)a.push(d);return a})}},d.pseudos.nth=d.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})d.pseudos[b]=jb(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=kb(b);function nb(){}nb.prototype=d.filters=d.pseudos,d.setFilters=new nb;function ob(a,b){var c,e,f,g,h,i,j,k=x[a+" "];if(k)return b?0:k.slice(0);h=a,i=[],j=d.preFilter;while(h){(!c||(e=Q.exec(h)))&&(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=R.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(P," ")}),h=h.slice(c.length));for(g in d.filter)!(e=V[g].exec(h))||j[g]&&!(e=j[g](e))||(c=e.shift(),f.push({value:c,type:g,matches:e}),h=h.slice(c.length));if(!c)break}return b?h.length:h?db.error(a):x(a,i).slice(0)}function pb(a){for(var b=0,c=a.length,d="";c>b;b++)d+=a[b].value;return d}function qb(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=v++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j=[u,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(i=b[s]||(b[s]={}),(h=i[d])&&h[0]===u&&h[1]===f)return j[2]=h[2];if(i[d]=j,j[2]=a(b,c,g))return!0}}}function rb(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function sb(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function tb(a,b,c,d,e,f){return d&&!d[s]&&(d=tb(d)),e&&!e[s]&&(e=tb(e,f)),fb(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||wb(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:sb(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=sb(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?I.call(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=sb(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):G.apply(g,r)})}function ub(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],i=g||d.relative[" "],j=g?1:0,k=qb(function(a){return a===b},i,!0),l=qb(function(a){return I.call(b,a)>-1},i,!0),m=[function(a,c,d){return!g&&(d||c!==h)||((b=c).nodeType?k(a,c,d):l(a,c,d))}];f>j;j++)if(c=d.relative[a[j].type])m=[qb(rb(m),c)];else{if(c=d.filter[a[j].type].apply(null,a[j].matches),c[s]){for(e=++j;f>e;e++)if(d.relative[a[e].type])break;return tb(j>1&&rb(m),j>1&&pb(a.slice(0,j-1).concat({value:" "===a[j-2].type?"*":""})).replace(P,"$1"),c,e>j&&ub(a.slice(j,e)),f>e&&ub(a=a.slice(e)),f>e&&pb(a))}m.push(c)}return rb(m)}function vb(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,i,j,k){var m,n,o,p=0,q="0",r=f&&[],s=[],t=h,v=f||e&&d.find.TAG("*",k),w=u+=null==t?1:Math.random()||.1,x=v.length;for(k&&(h=g!==l&&g);q!==x&&null!=(m=v[q]);q++){if(e&&m){n=0;while(o=a[n++])if(o(m,g,i)){j.push(m);break}k&&(u=w)}c&&((m=!o&&m)&&p--,f&&r.push(m))}if(p+=q,c&&q!==p){n=0;while(o=b[n++])o(r,s,g,i);if(f){if(p>0)while(q--)r[q]||s[q]||(s[q]=E.call(j));s=sb(s)}G.apply(j,s),k&&!f&&s.length>0&&p+b.length>1&&db.uniqueSort(j)}return k&&(u=w,h=t),r};return c?fb(f):f}g=db.compile=function(a,b){var c,d=[],e=[],f=y[a+" "];if(!f){b||(b=ob(a)),c=b.length;while(c--)f=ub(b[c]),f[s]?d.push(f):e.push(f);f=y(a,vb(e,d))}return f};function wb(a,b,c){for(var d=0,e=b.length;e>d;d++)db(a,b[d],c);return c}function xb(a,b,e,f){var h,i,j,k,l,m=ob(a);if(!f&&1===m.length){if(i=m[0]=m[0].slice(0),i.length>2&&"ID"===(j=i[0]).type&&c.getById&&9===b.nodeType&&n&&d.relative[i[1].type]){if(b=(d.find.ID(j.matches[0].replace(ab,bb),b)||[])[0],!b)return e;a=a.slice(i.shift().value.length)}h=V.needsContext.test(a)?0:i.length;while(h--){if(j=i[h],d.relative[k=j.type])break;if((l=d.find[k])&&(f=l(j.matches[0].replace(ab,bb),$.test(i[0].type)&&mb(b.parentNode)||b))){if(i.splice(h,1),a=f.length&&pb(i),!a)return G.apply(e,f),e;break}}}return g(a,m)(f,b,!n,e,$.test(a)&&mb(b.parentNode)||b),e}return c.sortStable=s.split("").sort(z).join("")===s,c.detectDuplicates=!!j,k(),c.sortDetached=gb(function(a){return 1&a.compareDocumentPosition(l.createElement("div"))}),gb(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||hb("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&gb(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||hb("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),gb(function(a){return null==a.getAttribute("disabled")})||hb(J,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),db}(a);n.find=t,n.expr=t.selectors,n.expr[":"]=n.expr.pseudos,n.unique=t.uniqueSort,n.text=t.getText,n.isXMLDoc=t.isXML,n.contains=t.contains;var u=n.expr.match.needsContext,v=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,w=/^.[^:#\[\.,]*$/;function x(a,b,c){if(n.isFunction(b))return n.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return n.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(w.test(b))return n.filter(b,a,c);b=n.filter(b,a)}return n.grep(a,function(a){return n.inArray(a,b)>=0!==c})}n.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?n.find.matchesSelector(d,a)?[d]:[]:n.find.matches(a,n.grep(b,function(a){return 1===a.nodeType}))},n.fn.extend({find:function(a){var b,c=[],d=this,e=d.length;if("string"!=typeof a)return this.pushStack(n(a).filter(function(){for(b=0;e>b;b++)if(n.contains(d[b],this))return!0}));for(b=0;e>b;b++)n.find(a,d[b],c);return c=this.pushStack(e>1?n.unique(c):c),c.selector=this.selector?this.selector+" "+a:a,c},filter:function(a){return this.pushStack(x(this,a||[],!1))},not:function(a){return this.pushStack(x(this,a||[],!0))},is:function(a){return!!x(this,"string"==typeof a&&u.test(a)?n(a):a||[],!1).length}});var y,z=a.document,A=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,B=n.fn.init=function(a,b){var c,d;if(!a)return this;if("string"==typeof a){if(c="<"===a.charAt(0)&&">"===a.charAt(a.length-1)&&a.length>=3?[null,a,null]:A.exec(a),!c||!c[1]&&b)return!b||b.jquery?(b||y).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof n?b[0]:b,n.merge(this,n.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:z,!0)),v.test(c[1])&&n.isPlainObject(b))for(c in b)n.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}if(d=z.getElementById(c[2]),d&&d.parentNode){if(d.id!==c[2])return y.find(a);this.length=1,this[0]=d}return this.context=z,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):n.isFunction(a)?"undefined"!=typeof y.ready?y.ready(a):a(n):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),n.makeArray(a,this))};B.prototype=n.fn,y=n(z);var C=/^(?:parents|prev(?:Until|All))/,D={children:!0,contents:!0,next:!0,prev:!0};n.extend({dir:function(a,b,c){var d=[],e=a[b];while(e&&9!==e.nodeType&&(void 0===c||1!==e.nodeType||!n(e).is(c)))1===e.nodeType&&d.push(e),e=e[b];return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),n.fn.extend({has:function(a){var b,c=n(a,this),d=c.length;return this.filter(function(){for(b=0;d>b;b++)if(n.contains(this,c[b]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=u.test(a)||"string"!=typeof a?n(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&n.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?n.unique(f):f)},index:function(a){return a?"string"==typeof a?n.inArray(this[0],n(a)):n.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(n.unique(n.merge(this.get(),n(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function E(a,b){do a=a[b];while(a&&1!==a.nodeType);return a}n.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return n.dir(a,"parentNode")},parentsUntil:function(a,b,c){return n.dir(a,"parentNode",c)},next:function(a){return E(a,"nextSibling")},prev:function(a){return E(a,"previousSibling")},nextAll:function(a){return n.dir(a,"nextSibling")},prevAll:function(a){return n.dir(a,"previousSibling")},nextUntil:function(a,b,c){return n.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return n.dir(a,"previousSibling",c)},siblings:function(a){return n.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return n.sibling(a.firstChild)},contents:function(a){return n.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:n.merge([],a.childNodes)}},function(a,b){n.fn[a]=function(c,d){var e=n.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=n.filter(d,e)),this.length>1&&(D[a]||(e=n.unique(e)),C.test(a)&&(e=e.reverse())),this.pushStack(e)}});var F=/\S+/g,G={};function H(a){var b=G[a]={};return n.each(a.match(F)||[],function(a,c){b[c]=!0}),b}n.Callbacks=function(a){a="string"==typeof a?G[a]||H(a):n.extend({},a);var b,c,d,e,f,g,h=[],i=!a.once&&[],j=function(l){for(c=a.memory&&l,d=!0,f=g||0,g=0,e=h.length,b=!0;h&&e>f;f++)if(h[f].apply(l[0],l[1])===!1&&a.stopOnFalse){c=!1;break}b=!1,h&&(i?i.length&&j(i.shift()):c?h=[]:k.disable())},k={add:function(){if(h){var d=h.length;!function f(b){n.each(b,function(b,c){var d=n.type(c);"function"===d?a.unique&&k.has(c)||h.push(c):c&&c.length&&"string"!==d&&f(c)})}(arguments),b?e=h.length:c&&(g=d,j(c))}return this},remove:function(){return h&&n.each(arguments,function(a,c){var d;while((d=n.inArray(c,h,d))>-1)h.splice(d,1),b&&(e>=d&&e--,f>=d&&f--)}),this},has:function(a){return a?n.inArray(a,h)>-1:!(!h||!h.length)},empty:function(){return h=[],e=0,this},disable:function(){return h=i=c=void 0,this},disabled:function(){return!h},lock:function(){return i=void 0,c||k.disable(),this},locked:function(){return!i},fireWith:function(a,c){return!h||d&&!i||(c=c||[],c=[a,c.slice?c.slice():c],b?i.push(c):j(c)),this},fire:function(){return k.fireWith(this,arguments),this},fired:function(){return!!d}};return k},n.extend({Deferred:function(a){var b=[["resolve","done",n.Callbacks("once memory"),"resolved"],["reject","fail",n.Callbacks("once memory"),"rejected"],["notify","progress",n.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return n.Deferred(function(c){n.each(b,function(b,f){var g=n.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&n.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?n.extend(a,d):d}},e={};return d.pipe=d.then,n.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=d.call(arguments),e=c.length,f=1!==e||a&&n.isFunction(a.promise)?e:0,g=1===f?a:n.Deferred(),h=function(a,b,c){return function(e){b[a]=this,c[a]=arguments.length>1?d.call(arguments):e,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(e>1)for(i=new Array(e),j=new Array(e),k=new Array(e);e>b;b++)c[b]&&n.isFunction(c[b].promise)?c[b].promise().done(h(b,k,c)).fail(g.reject).progress(h(b,j,i)):--f;return f||g.resolveWith(k,c),g.promise()}});var I;n.fn.ready=function(a){return n.ready.promise().done(a),this},n.extend({isReady:!1,readyWait:1,holdReady:function(a){a?n.readyWait++:n.ready(!0)},ready:function(a){if(a===!0?!--n.readyWait:!n.isReady){if(!z.body)return setTimeout(n.ready);n.isReady=!0,a!==!0&&--n.readyWait>0||(I.resolveWith(z,[n]),n.fn.trigger&&n(z).trigger("ready").off("ready"))}}});function J(){z.addEventListener?(z.removeEventListener("DOMContentLoaded",K,!1),a.removeEventListener("load",K,!1)):(z.detachEvent("onreadystatechange",K),a.detachEvent("onload",K))}function K(){(z.addEventListener||"load"===event.type||"complete"===z.readyState)&&(J(),n.ready())}n.ready.promise=function(b){if(!I)if(I=n.Deferred(),"complete"===z.readyState)setTimeout(n.ready);else if(z.addEventListener)z.addEventListener("DOMContentLoaded",K,!1),a.addEventListener("load",K,!1);else{z.attachEvent("onreadystatechange",K),a.attachEvent("onload",K);var c=!1;try{c=null==a.frameElement&&z.documentElement}catch(d){}c&&c.doScroll&&!function e(){if(!n.isReady){try{c.doScroll("left")}catch(a){return setTimeout(e,50)}J(),n.ready()}}()}return I.promise(b)};var L="undefined",M;for(M in n(l))break;l.ownLast="0"!==M,l.inlineBlockNeedsLayout=!1,n(function(){var a,b,c=z.getElementsByTagName("body")[0];c&&(a=z.createElement("div"),a.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px",b=z.createElement("div"),c.appendChild(a).appendChild(b),typeof b.style.zoom!==L&&(b.style.cssText="border:0;margin:0;width:1px;padding:1px;display:inline;zoom:1",(l.inlineBlockNeedsLayout=3===b.offsetWidth)&&(c.style.zoom=1)),c.removeChild(a),a=b=null)}),function(){var a=z.createElement("div");if(null==l.deleteExpando){l.deleteExpando=!0;try{delete a.test}catch(b){l.deleteExpando=!1}}a=null}(),n.acceptData=function(a){var b=n.noData[(a.nodeName+" ").toLowerCase()],c=+a.nodeType||1;return 1!==c&&9!==c?!1:!b||b!==!0&&a.getAttribute("classid")===b};var N=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,O=/([A-Z])/g;function P(a,b,c){if(void 0===c&&1===a.nodeType){var d="data-"+b.replace(O,"-$1").toLowerCase();if(c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:N.test(c)?n.parseJSON(c):c}catch(e){}n.data(a,b,c)}else c=void 0}return c}function Q(a){var b;for(b in a)if(("data"!==b||!n.isEmptyObject(a[b]))&&"toJSON"!==b)return!1;return!0}function R(a,b,d,e){if(n.acceptData(a)){var f,g,h=n.expando,i=a.nodeType,j=i?n.cache:a,k=i?a[h]:a[h]&&h;if(k&&j[k]&&(e||j[k].data)||void 0!==d||"string"!=typeof b)return k||(k=i?a[h]=c.pop()||n.guid++:h),j[k]||(j[k]=i?{}:{toJSON:n.noop}),("object"==typeof b||"function"==typeof b)&&(e?j[k]=n.extend(j[k],b):j[k].data=n.extend(j[k].data,b)),g=j[k],e||(g.data||(g.data={}),g=g.data),void 0!==d&&(g[n.camelCase(b)]=d),"string"==typeof b?(f=g[b],null==f&&(f=g[n.camelCase(b)])):f=g,f
+}}function S(a,b,c){if(n.acceptData(a)){var d,e,f=a.nodeType,g=f?n.cache:a,h=f?a[n.expando]:n.expando;if(g[h]){if(b&&(d=c?g[h]:g[h].data)){n.isArray(b)?b=b.concat(n.map(b,n.camelCase)):b in d?b=[b]:(b=n.camelCase(b),b=b in d?[b]:b.split(" ")),e=b.length;while(e--)delete d[b[e]];if(c?!Q(d):!n.isEmptyObject(d))return}(c||(delete g[h].data,Q(g[h])))&&(f?n.cleanData([a],!0):l.deleteExpando||g!=g.window?delete g[h]:g[h]=null)}}}n.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(a){return a=a.nodeType?n.cache[a[n.expando]]:a[n.expando],!!a&&!Q(a)},data:function(a,b,c){return R(a,b,c)},removeData:function(a,b){return S(a,b)},_data:function(a,b,c){return R(a,b,c,!0)},_removeData:function(a,b){return S(a,b,!0)}}),n.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=n.data(f),1===f.nodeType&&!n._data(f,"parsedAttrs"))){c=g.length;while(c--)d=g[c].name,0===d.indexOf("data-")&&(d=n.camelCase(d.slice(5)),P(f,d,e[d]));n._data(f,"parsedAttrs",!0)}return e}return"object"==typeof a?this.each(function(){n.data(this,a)}):arguments.length>1?this.each(function(){n.data(this,a,b)}):f?P(f,a,n.data(f,a)):void 0},removeData:function(a){return this.each(function(){n.removeData(this,a)})}}),n.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=n._data(a,b),c&&(!d||n.isArray(c)?d=n._data(a,b,n.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=n.queue(a,b),d=c.length,e=c.shift(),f=n._queueHooks(a,b),g=function(){n.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return n._data(a,c)||n._data(a,c,{empty:n.Callbacks("once memory").add(function(){n._removeData(a,b+"queue"),n._removeData(a,c)})})}}),n.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length<c?n.queue(this[0],a):void 0===b?this:this.each(function(){var c=n.queue(this,a,b);n._queueHooks(this,a),"fx"===a&&"inprogress"!==c[0]&&n.dequeue(this,a)})},dequeue:function(a){return this.each(function(){n.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,b){var c,d=1,e=n.Deferred(),f=this,g=this.length,h=function(){--d||e.resolveWith(f,[f])};"string"!=typeof a&&(b=a,a=void 0),a=a||"fx";while(g--)c=n._data(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}});var T=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,U=["Top","Right","Bottom","Left"],V=function(a,b){return a=b||a,"none"===n.css(a,"display")||!n.contains(a.ownerDocument,a)},W=n.access=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===n.type(c)){e=!0;for(h in c)n.access(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,n.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(n(a),c)})),b))for(;i>h;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},X=/^(?:checkbox|radio)$/i;!function(){var a=z.createDocumentFragment(),b=z.createElement("div"),c=z.createElement("input");if(b.setAttribute("className","t"),b.innerHTML="  <link/><table></table><a href='/a'>a</a>",l.leadingWhitespace=3===b.firstChild.nodeType,l.tbody=!b.getElementsByTagName("tbody").length,l.htmlSerialize=!!b.getElementsByTagName("link").length,l.html5Clone="<:nav></:nav>"!==z.createElement("nav").cloneNode(!0).outerHTML,c.type="checkbox",c.checked=!0,a.appendChild(c),l.appendChecked=c.checked,b.innerHTML="<textarea>x</textarea>",l.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue,a.appendChild(b),b.innerHTML="<input type='radio' checked='checked' name='t'/>",l.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,l.noCloneEvent=!0,b.attachEvent&&(b.attachEvent("onclick",function(){l.noCloneEvent=!1}),b.cloneNode(!0).click()),null==l.deleteExpando){l.deleteExpando=!0;try{delete b.test}catch(d){l.deleteExpando=!1}}a=b=c=null}(),function(){var b,c,d=z.createElement("div");for(b in{submit:!0,change:!0,focusin:!0})c="on"+b,(l[b+"Bubbles"]=c in a)||(d.setAttribute(c,"t"),l[b+"Bubbles"]=d.attributes[c].expando===!1);d=null}();var Y=/^(?:input|select|textarea)$/i,Z=/^key/,$=/^(?:mouse|contextmenu)|click/,_=/^(?:focusinfocus|focusoutblur)$/,ab=/^([^.]*)(?:\.(.+)|)$/;function bb(){return!0}function cb(){return!1}function db(){try{return z.activeElement}catch(a){}}n.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=n._data(a);if(r){c.handler&&(i=c,c=i.handler,e=i.selector),c.guid||(c.guid=n.guid++),(g=r.events)||(g=r.events={}),(k=r.handle)||(k=r.handle=function(a){return typeof n===L||a&&n.event.triggered===a.type?void 0:n.event.dispatch.apply(k.elem,arguments)},k.elem=a),b=(b||"").match(F)||[""],h=b.length;while(h--)f=ab.exec(b[h])||[],o=q=f[1],p=(f[2]||"").split(".").sort(),o&&(j=n.event.special[o]||{},o=(e?j.delegateType:j.bindType)||o,j=n.event.special[o]||{},l=n.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&n.expr.match.needsContext.test(e),namespace:p.join(".")},i),(m=g[o])||(m=g[o]=[],m.delegateCount=0,j.setup&&j.setup.call(a,d,p,k)!==!1||(a.addEventListener?a.addEventListener(o,k,!1):a.attachEvent&&a.attachEvent("on"+o,k))),j.add&&(j.add.call(a,l),l.handler.guid||(l.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,l):m.push(l),n.event.global[o]=!0);a=null}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=n.hasData(a)&&n._data(a);if(r&&(k=r.events)){b=(b||"").match(F)||[""],j=b.length;while(j--)if(h=ab.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=n.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,m=k[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),i=f=m.length;while(f--)g=m[f],!e&&q!==g.origType||c&&c.guid!==g.guid||h&&!h.test(g.namespace)||d&&d!==g.selector&&("**"!==d||!g.selector)||(m.splice(f,1),g.selector&&m.delegateCount--,l.remove&&l.remove.call(a,g));i&&!m.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||n.removeEvent(a,o,r.handle),delete k[o])}else for(o in k)n.event.remove(a,o+b[j],c,d,!0);n.isEmptyObject(k)&&(delete r.handle,n._removeData(a,"events"))}},trigger:function(b,c,d,e){var f,g,h,i,k,l,m,o=[d||z],p=j.call(b,"type")?b.type:b,q=j.call(b,"namespace")?b.namespace.split("."):[];if(h=l=d=d||z,3!==d.nodeType&&8!==d.nodeType&&!_.test(p+n.event.triggered)&&(p.indexOf(".")>=0&&(q=p.split("."),p=q.shift(),q.sort()),g=p.indexOf(":")<0&&"on"+p,b=b[n.expando]?b:new n.Event(p,"object"==typeof b&&b),b.isTrigger=e?2:3,b.namespace=q.join("."),b.namespace_re=b.namespace?new RegExp("(^|\\.)"+q.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=d),c=null==c?[b]:n.makeArray(c,[b]),k=n.event.special[p]||{},e||!k.trigger||k.trigger.apply(d,c)!==!1)){if(!e&&!k.noBubble&&!n.isWindow(d)){for(i=k.delegateType||p,_.test(i+p)||(h=h.parentNode);h;h=h.parentNode)o.push(h),l=h;l===(d.ownerDocument||z)&&o.push(l.defaultView||l.parentWindow||a)}m=0;while((h=o[m++])&&!b.isPropagationStopped())b.type=m>1?i:k.bindType||p,f=(n._data(h,"events")||{})[b.type]&&n._data(h,"handle"),f&&f.apply(h,c),f=g&&h[g],f&&f.apply&&n.acceptData(h)&&(b.result=f.apply(h,c),b.result===!1&&b.preventDefault());if(b.type=p,!e&&!b.isDefaultPrevented()&&(!k._default||k._default.apply(o.pop(),c)===!1)&&n.acceptData(d)&&g&&d[p]&&!n.isWindow(d)){l=d[g],l&&(d[g]=null),n.event.triggered=p;try{d[p]()}catch(r){}n.event.triggered=void 0,l&&(d[g]=l)}return b.result}},dispatch:function(a){a=n.event.fix(a);var b,c,e,f,g,h=[],i=d.call(arguments),j=(n._data(this,"events")||{})[a.type]||[],k=n.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=n.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,g=0;while((e=f.handlers[g++])&&!a.isImmediatePropagationStopped())(!a.namespace_re||a.namespace_re.test(e.namespace))&&(a.handleObj=e,a.data=e.data,c=((n.event.special[e.origType]||{}).handle||e.handler).apply(f.elem,i),void 0!==c&&(a.result=c)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&(!a.button||"click"!==a.type))for(;i!=this;i=i.parentNode||this)if(1===i.nodeType&&(i.disabled!==!0||"click"!==a.type)){for(e=[],f=0;h>f;f++)d=b[f],c=d.selector+" ",void 0===e[c]&&(e[c]=d.needsContext?n(c,this).index(i)>=0:n.find(c,this,null,[i]).length),e[c]&&e.push(d);e.length&&g.push({elem:i,handlers:e})}return h<b.length&&g.push({elem:this,handlers:b.slice(h)}),g},fix:function(a){if(a[n.expando])return a;var b,c,d,e=a.type,f=a,g=this.fixHooks[e];g||(this.fixHooks[e]=g=$.test(e)?this.mouseHooks:Z.test(e)?this.keyHooks:{}),d=g.props?this.props.concat(g.props):this.props,a=new n.Event(f),b=d.length;while(b--)c=d[b],a[c]=f[c];return a.target||(a.target=f.srcElement||z),3===a.target.nodeType&&(a.target=a.target.parentNode),a.metaKey=!!a.metaKey,g.filter?g.filter(a,f):a},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){return null==a.which&&(a.which=null!=b.charCode?b.charCode:b.keyCode),a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,b){var c,d,e,f=b.button,g=b.fromElement;return null==a.pageX&&null!=b.clientX&&(d=a.target.ownerDocument||z,e=d.documentElement,c=d.body,a.pageX=b.clientX+(e&&e.scrollLeft||c&&c.scrollLeft||0)-(e&&e.clientLeft||c&&c.clientLeft||0),a.pageY=b.clientY+(e&&e.scrollTop||c&&c.scrollTop||0)-(e&&e.clientTop||c&&c.clientTop||0)),!a.relatedTarget&&g&&(a.relatedTarget=g===a.target?b.toElement:g),a.which||void 0===f||(a.which=1&f?1:2&f?3:4&f?2:0),a}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==db()&&this.focus)try{return this.focus(),!1}catch(a){}},delegateType:"focusin"},blur:{trigger:function(){return this===db()&&this.blur?(this.blur(),!1):void 0},delegateType:"focusout"},click:{trigger:function(){return n.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):void 0},_default:function(a){return n.nodeName(a.target,"a")}},beforeunload:{postDispatch:function(a){void 0!==a.result&&(a.originalEvent.returnValue=a.result)}}},simulate:function(a,b,c,d){var e=n.extend(new n.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?n.event.trigger(e,null,b):n.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},n.removeEvent=z.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){var d="on"+b;a.detachEvent&&(typeof a[d]===L&&(a[d]=null),a.detachEvent(d,c))},n.Event=function(a,b){return this instanceof n.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||void 0===a.defaultPrevented&&(a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault())?bb:cb):this.type=a,b&&n.extend(this,b),this.timeStamp=a&&a.timeStamp||n.now(),void(this[n.expando]=!0)):new n.Event(a,b)},n.Event.prototype={isDefaultPrevented:cb,isPropagationStopped:cb,isImmediatePropagationStopped:cb,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=bb,a&&(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=bb,a&&(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=bb,this.stopPropagation()}},n.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){n.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj;return(!e||e!==d&&!n.contains(d,e))&&(a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b),c}}}),l.submitBubbles||(n.event.special.submit={setup:function(){return n.nodeName(this,"form")?!1:void n.event.add(this,"click._submit keypress._submit",function(a){var b=a.target,c=n.nodeName(b,"input")||n.nodeName(b,"button")?b.form:void 0;c&&!n._data(c,"submitBubbles")&&(n.event.add(c,"submit._submit",function(a){a._submit_bubble=!0}),n._data(c,"submitBubbles",!0))})},postDispatch:function(a){a._submit_bubble&&(delete a._submit_bubble,this.parentNode&&!a.isTrigger&&n.event.simulate("submit",this.parentNode,a,!0))},teardown:function(){return n.nodeName(this,"form")?!1:void n.event.remove(this,"._submit")}}),l.changeBubbles||(n.event.special.change={setup:function(){return Y.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(n.event.add(this,"propertychange._change",function(a){"checked"===a.originalEvent.propertyName&&(this._just_changed=!0)}),n.event.add(this,"click._change",function(a){this._just_changed&&!a.isTrigger&&(this._just_changed=!1),n.event.simulate("change",this,a,!0)})),!1):void n.event.add(this,"beforeactivate._change",function(a){var b=a.target;Y.test(b.nodeName)&&!n._data(b,"changeBubbles")&&(n.event.add(b,"change._change",function(a){!this.parentNode||a.isSimulated||a.isTrigger||n.event.simulate("change",this.parentNode,a,!0)}),n._data(b,"changeBubbles",!0))})},handle:function(a){var b=a.target;return this!==b||a.isSimulated||a.isTrigger||"radio"!==b.type&&"checkbox"!==b.type?a.handleObj.handler.apply(this,arguments):void 0},teardown:function(){return n.event.remove(this,"._change"),!Y.test(this.nodeName)}}),l.focusinBubbles||n.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){n.event.simulate(b,a.target,n.event.fix(a),!0)};n.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=n._data(d,b);e||d.addEventListener(a,c,!0),n._data(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=n._data(d,b)-1;e?n._data(d,b,e):(d.removeEventListener(a,c,!0),n._removeData(d,b))}}}),n.fn.extend({on:function(a,b,c,d,e){var f,g;if("object"==typeof a){"string"!=typeof b&&(c=c||b,b=void 0);for(f in a)this.on(f,b,c,a[f],e);return this}if(null==c&&null==d?(d=b,c=b=void 0):null==d&&("string"==typeof b?(d=c,c=void 0):(d=c,c=b,b=void 0)),d===!1)d=cb;else if(!d)return this;return 1===e&&(g=d,d=function(a){return n().off(a),g.apply(this,arguments)},d.guid=g.guid||(g.guid=n.guid++)),this.each(function(){n.event.add(this,a,d,c,b)})},one:function(a,b,c,d){return this.on(a,b,c,d,1)},off:function(a,b,c){var d,e;if(a&&a.preventDefault&&a.handleObj)return d=a.handleObj,n(a.delegateTarget).off(d.namespace?d.origType+"."+d.namespace:d.origType,d.selector,d.handler),this;if("object"==typeof a){for(e in a)this.off(e,b,a[e]);return this}return(b===!1||"function"==typeof b)&&(c=b,b=void 0),c===!1&&(c=cb),this.each(function(){n.event.remove(this,a,c,b)})},trigger:function(a,b){return this.each(function(){n.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];return c?n.event.trigger(a,b,c,!0):void 0}});function eb(a){var b=fb.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}var fb="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",gb=/ jQuery\d+="(?:null|\d+)"/g,hb=new RegExp("<(?:"+fb+")[\\s/>]","i"),ib=/^\s+/,jb=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,kb=/<([\w:]+)/,lb=/<tbody/i,mb=/<|&#?\w+;/,nb=/<(?:script|style|link)/i,ob=/checked\s*(?:[^=]|=\s*.checked.)/i,pb=/^$|\/(?:java|ecma)script/i,qb=/^true\/(.*)/,rb=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,sb={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:l.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]},tb=eb(z),ub=tb.appendChild(z.createElement("div"));sb.optgroup=sb.option,sb.tbody=sb.tfoot=sb.colgroup=sb.caption=sb.thead,sb.th=sb.td;function vb(a,b){var c,d,e=0,f=typeof a.getElementsByTagName!==L?a.getElementsByTagName(b||"*"):typeof a.querySelectorAll!==L?a.querySelectorAll(b||"*"):void 0;if(!f)for(f=[],c=a.childNodes||a;null!=(d=c[e]);e++)!b||n.nodeName(d,b)?f.push(d):n.merge(f,vb(d,b));return void 0===b||b&&n.nodeName(a,b)?n.merge([a],f):f}function wb(a){X.test(a.type)&&(a.defaultChecked=a.checked)}function xb(a,b){return n.nodeName(a,"table")&&n.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function yb(a){return a.type=(null!==n.find.attr(a,"type"))+"/"+a.type,a}function zb(a){var b=qb.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function Ab(a,b){for(var c,d=0;null!=(c=a[d]);d++)n._data(c,"globalEval",!b||n._data(b[d],"globalEval"))}function Bb(a,b){if(1===b.nodeType&&n.hasData(a)){var c,d,e,f=n._data(a),g=n._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;e>d;d++)n.event.add(b,c,h[c][d])}g.data&&(g.data=n.extend({},g.data))}}function Cb(a,b){var c,d,e;if(1===b.nodeType){if(c=b.nodeName.toLowerCase(),!l.noCloneEvent&&b[n.expando]){e=n._data(b);for(d in e.events)n.removeEvent(b,d,e.handle);b.removeAttribute(n.expando)}"script"===c&&b.text!==a.text?(yb(b).text=a.text,zb(b)):"object"===c?(b.parentNode&&(b.outerHTML=a.outerHTML),l.html5Clone&&a.innerHTML&&!n.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):"input"===c&&X.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):"option"===c?b.defaultSelected=b.selected=a.defaultSelected:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}}n.extend({clone:function(a,b,c){var d,e,f,g,h,i=n.contains(a.ownerDocument,a);if(l.html5Clone||n.isXMLDoc(a)||!hb.test("<"+a.nodeName+">")?f=a.cloneNode(!0):(ub.innerHTML=a.outerHTML,ub.removeChild(f=ub.firstChild)),!(l.noCloneEvent&&l.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||n.isXMLDoc(a)))for(d=vb(f),h=vb(a),g=0;null!=(e=h[g]);++g)d[g]&&Cb(e,d[g]);if(b)if(c)for(h=h||vb(a),d=d||vb(f),g=0;null!=(e=h[g]);g++)Bb(e,d[g]);else Bb(a,f);return d=vb(f,"script"),d.length>0&&Ab(d,!i&&vb(a,"script")),d=h=e=null,f},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,k,m=a.length,o=eb(b),p=[],q=0;m>q;q++)if(f=a[q],f||0===f)if("object"===n.type(f))n.merge(p,f.nodeType?[f]:f);else if(mb.test(f)){h=h||o.appendChild(b.createElement("div")),i=(kb.exec(f)||["",""])[1].toLowerCase(),k=sb[i]||sb._default,h.innerHTML=k[1]+f.replace(jb,"<$1></$2>")+k[2],e=k[0];while(e--)h=h.lastChild;if(!l.leadingWhitespace&&ib.test(f)&&p.push(b.createTextNode(ib.exec(f)[0])),!l.tbody){f="table"!==i||lb.test(f)?"<table>"!==k[1]||lb.test(f)?0:h:h.firstChild,e=f&&f.childNodes.length;while(e--)n.nodeName(j=f.childNodes[e],"tbody")&&!j.childNodes.length&&f.removeChild(j)}n.merge(p,h.childNodes),h.textContent="";while(h.firstChild)h.removeChild(h.firstChild);h=o.lastChild}else p.push(b.createTextNode(f));h&&o.removeChild(h),l.appendChecked||n.grep(vb(p,"input"),wb),q=0;while(f=p[q++])if((!d||-1===n.inArray(f,d))&&(g=n.contains(f.ownerDocument,f),h=vb(o.appendChild(f),"script"),g&&Ab(h),c)){e=0;while(f=h[e++])pb.test(f.type||"")&&c.push(f)}return h=null,o},cleanData:function(a,b){for(var d,e,f,g,h=0,i=n.expando,j=n.cache,k=l.deleteExpando,m=n.event.special;null!=(d=a[h]);h++)if((b||n.acceptData(d))&&(f=d[i],g=f&&j[f])){if(g.events)for(e in g.events)m[e]?n.event.remove(d,e):n.removeEvent(d,e,g.handle);j[f]&&(delete j[f],k?delete d[i]:typeof d.removeAttribute!==L?d.removeAttribute(i):d[i]=null,c.push(f))}}}),n.fn.extend({text:function(a){return W(this,function(a){return void 0===a?n.text(this):this.empty().append((this[0]&&this[0].ownerDocument||z).createTextNode(a))},null,a,arguments.length)},append:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=xb(this,a);b.appendChild(a)}})},prepend:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=xb(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},remove:function(a,b){for(var c,d=a?n.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||n.cleanData(vb(c)),c.parentNode&&(b&&n.contains(c.ownerDocument,c)&&Ab(vb(c,"script")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++){1===a.nodeType&&n.cleanData(vb(a,!1));while(a.firstChild)a.removeChild(a.firstChild);a.options&&n.nodeName(a,"select")&&(a.options.length=0)}return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return n.clone(this,a,b)})},html:function(a){return W(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a)return 1===b.nodeType?b.innerHTML.replace(gb,""):void 0;if(!("string"!=typeof a||nb.test(a)||!l.htmlSerialize&&hb.test(a)||!l.leadingWhitespace&&ib.test(a)||sb[(kb.exec(a)||["",""])[1].toLowerCase()])){a=a.replace(jb,"<$1></$2>");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(n.cleanData(vb(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=arguments[0];return this.domManip(arguments,function(b){a=this.parentNode,n.cleanData(vb(this)),a&&a.replaceChild(b,this)}),a&&(a.length||a.nodeType)?this:this.remove()},detach:function(a){return this.remove(a,!0)},domManip:function(a,b){a=e.apply([],a);var c,d,f,g,h,i,j=0,k=this.length,m=this,o=k-1,p=a[0],q=n.isFunction(p);if(q||k>1&&"string"==typeof p&&!l.checkClone&&ob.test(p))return this.each(function(c){var d=m.eq(c);q&&(a[0]=p.call(this,c,d.html())),d.domManip(a,b)});if(k&&(i=n.buildFragment(a,this[0].ownerDocument,!1,this),c=i.firstChild,1===i.childNodes.length&&(i=c),c)){for(g=n.map(vb(i,"script"),yb),f=g.length;k>j;j++)d=i,j!==o&&(d=n.clone(d,!0,!0),f&&n.merge(g,vb(d,"script"))),b.call(this[j],d,j);if(f)for(h=g[g.length-1].ownerDocument,n.map(g,zb),j=0;f>j;j++)d=g[j],pb.test(d.type||"")&&!n._data(d,"globalEval")&&n.contains(h,d)&&(d.src?n._evalUrl&&n._evalUrl(d.src):n.globalEval((d.text||d.textContent||d.innerHTML||"").replace(rb,"")));i=c=null}return this}}),n.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){n.fn[a]=function(a){for(var c,d=0,e=[],g=n(a),h=g.length-1;h>=d;d++)c=d===h?this:this.clone(!0),n(g[d])[b](c),f.apply(e,c.get());return this.pushStack(e)}});var Db,Eb={};function Fb(b,c){var d=n(c.createElement(b)).appendTo(c.body),e=a.getDefaultComputedStyle?a.getDefaultComputedStyle(d[0]).display:n.css(d[0],"display");return d.detach(),e}function Gb(a){var b=z,c=Eb[a];return c||(c=Fb(a,b),"none"!==c&&c||(Db=(Db||n("<iframe frameborder='0' width='0' height='0'/>")).appendTo(b.documentElement),b=(Db[0].contentWindow||Db[0].contentDocument).document,b.write(),b.close(),c=Fb(a,b),Db.detach()),Eb[a]=c),c}!function(){var a,b,c=z.createElement("div"),d="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;padding:0;margin:0;border:0";c.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",a=c.getElementsByTagName("a")[0],a.style.cssText="float:left;opacity:.5",l.opacity=/^0.5/.test(a.style.opacity),l.cssFloat=!!a.style.cssFloat,c.style.backgroundClip="content-box",c.cloneNode(!0).style.backgroundClip="",l.clearCloneStyle="content-box"===c.style.backgroundClip,a=c=null,l.shrinkWrapBlocks=function(){var a,c,e,f;if(null==b){if(a=z.getElementsByTagName("body")[0],!a)return;f="border:0;width:0;height:0;position:absolute;top:0;left:-9999px",c=z.createElement("div"),e=z.createElement("div"),a.appendChild(c).appendChild(e),b=!1,typeof e.style.zoom!==L&&(e.style.cssText=d+";width:1px;padding:1px;zoom:1",e.innerHTML="<div></div>",e.firstChild.style.width="5px",b=3!==e.offsetWidth),a.removeChild(c),a=c=e=null}return b}}();var Hb=/^margin/,Ib=new RegExp("^("+T+")(?!px)[a-z%]+$","i"),Jb,Kb,Lb=/^(top|right|bottom|left)$/;a.getComputedStyle?(Jb=function(a){return a.ownerDocument.defaultView.getComputedStyle(a,null)},Kb=function(a,b,c){var d,e,f,g,h=a.style;return c=c||Jb(a),g=c?c.getPropertyValue(b)||c[b]:void 0,c&&(""!==g||n.contains(a.ownerDocument,a)||(g=n.style(a,b)),Ib.test(g)&&Hb.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=g,g=c.width,h.width=d,h.minWidth=e,h.maxWidth=f)),void 0===g?g:g+""}):z.documentElement.currentStyle&&(Jb=function(a){return a.currentStyle},Kb=function(a,b,c){var d,e,f,g,h=a.style;return c=c||Jb(a),g=c?c[b]:void 0,null==g&&h&&h[b]&&(g=h[b]),Ib.test(g)&&!Lb.test(b)&&(d=h.left,e=a.runtimeStyle,f=e&&e.left,f&&(e.left=a.currentStyle.left),h.left="fontSize"===b?"1em":g,g=h.pixelLeft+"px",h.left=d,f&&(e.left=f)),void 0===g?g:g+""||"auto"});function Mb(a,b){return{get:function(){var c=a();if(null!=c)return c?void delete this.get:(this.get=b).apply(this,arguments)}}}!function(){var b,c,d,e,f,g,h=z.createElement("div"),i="border:0;width:0;height:0;position:absolute;top:0;left:-9999px",j="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;padding:0;margin:0;border:0";h.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",b=h.getElementsByTagName("a")[0],b.style.cssText="float:left;opacity:.5",l.opacity=/^0.5/.test(b.style.opacity),l.cssFloat=!!b.style.cssFloat,h.style.backgroundClip="content-box",h.cloneNode(!0).style.backgroundClip="",l.clearCloneStyle="content-box"===h.style.backgroundClip,b=h=null,n.extend(l,{reliableHiddenOffsets:function(){if(null!=c)return c;var a,b,d,e=z.createElement("div"),f=z.getElementsByTagName("body")[0];if(f)return e.setAttribute("className","t"),e.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",a=z.createElement("div"),a.style.cssText=i,f.appendChild(a).appendChild(e),e.innerHTML="<table><tr><td></td><td>t</td></tr></table>",b=e.getElementsByTagName("td"),b[0].style.cssText="padding:0;margin:0;border:0;display:none",d=0===b[0].offsetHeight,b[0].style.display="",b[1].style.display="none",c=d&&0===b[0].offsetHeight,f.removeChild(a),e=f=null,c},boxSizing:function(){return null==d&&k(),d},boxSizingReliable:function(){return null==e&&k(),e},pixelPosition:function(){return null==f&&k(),f},reliableMarginRight:function(){var b,c,d,e;if(null==g&&a.getComputedStyle){if(b=z.getElementsByTagName("body")[0],!b)return;c=z.createElement("div"),d=z.createElement("div"),c.style.cssText=i,b.appendChild(c).appendChild(d),e=d.appendChild(z.createElement("div")),e.style.cssText=d.style.cssText=j,e.style.marginRight=e.style.width="0",d.style.width="1px",g=!parseFloat((a.getComputedStyle(e,null)||{}).marginRight),b.removeChild(c)}return g}});function k(){var b,c,h=z.getElementsByTagName("body")[0];h&&(b=z.createElement("div"),c=z.createElement("div"),b.style.cssText=i,h.appendChild(b).appendChild(c),c.style.cssText="-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;position:absolute;display:block;padding:1px;border:1px;width:4px;margin-top:1%;top:1%",n.swap(h,null!=h.style.zoom?{zoom:1}:{},function(){d=4===c.offsetWidth}),e=!0,f=!1,g=!0,a.getComputedStyle&&(f="1%"!==(a.getComputedStyle(c,null)||{}).top,e="4px"===(a.getComputedStyle(c,null)||{width:"4px"}).width),h.removeChild(b),c=h=null)}}(),n.swap=function(a,b,c,d){var e,f,g={};for(f in b)g[f]=a.style[f],a.style[f]=b[f];e=c.apply(a,d||[]);for(f in b)a.style[f]=g[f];return e};var Nb=/alpha\([^)]*\)/i,Ob=/opacity\s*=\s*([^)]*)/,Pb=/^(none|table(?!-c[ea]).+)/,Qb=new RegExp("^("+T+")(.*)$","i"),Rb=new RegExp("^([+-])=("+T+")","i"),Sb={position:"absolute",visibility:"hidden",display:"block"},Tb={letterSpacing:0,fontWeight:400},Ub=["Webkit","O","Moz","ms"];function Vb(a,b){if(b in a)return b;var c=b.charAt(0).toUpperCase()+b.slice(1),d=b,e=Ub.length;while(e--)if(b=Ub[e]+c,b in a)return b;return d}function Wb(a,b){for(var c,d,e,f=[],g=0,h=a.length;h>g;g++)d=a[g],d.style&&(f[g]=n._data(d,"olddisplay"),c=d.style.display,b?(f[g]||"none"!==c||(d.style.display=""),""===d.style.display&&V(d)&&(f[g]=n._data(d,"olddisplay",Gb(d.nodeName)))):f[g]||(e=V(d),(c&&"none"!==c||!e)&&n._data(d,"olddisplay",e?c:n.css(d,"display"))));for(g=0;h>g;g++)d=a[g],d.style&&(b&&"none"!==d.style.display&&""!==d.style.display||(d.style.display=b?f[g]||"":"none"));return a}function Xb(a,b,c){var d=Qb.exec(b);return d?Math.max(0,d[1]-(c||0))+(d[2]||"px"):b}function Yb(a,b,c,d,e){for(var f=c===(d?"border":"content")?4:"width"===b?1:0,g=0;4>f;f+=2)"margin"===c&&(g+=n.css(a,c+U[f],!0,e)),d?("content"===c&&(g-=n.css(a,"padding"+U[f],!0,e)),"margin"!==c&&(g-=n.css(a,"border"+U[f]+"Width",!0,e))):(g+=n.css(a,"padding"+U[f],!0,e),"padding"!==c&&(g+=n.css(a,"border"+U[f]+"Width",!0,e)));return g}function Zb(a,b,c){var d=!0,e="width"===b?a.offsetWidth:a.offsetHeight,f=Jb(a),g=l.boxSizing()&&"border-box"===n.css(a,"boxSizing",!1,f);if(0>=e||null==e){if(e=Kb(a,b,f),(0>e||null==e)&&(e=a.style[b]),Ib.test(e))return e;d=g&&(l.boxSizingReliable()||e===a.style[b]),e=parseFloat(e)||0}return e+Yb(a,b,c||(g?"border":"content"),d,f)+"px"}n.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=Kb(a,"opacity");return""===c?"1":c}}}},cssNumber:{columnCount:!0,fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":l.cssFloat?"cssFloat":"styleFloat"},style:function(a,b,c,d){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var e,f,g,h=n.camelCase(b),i=a.style;if(b=n.cssProps[h]||(n.cssProps[h]=Vb(i,h)),g=n.cssHooks[b]||n.cssHooks[h],void 0===c)return g&&"get"in g&&void 0!==(e=g.get(a,!1,d))?e:i[b];if(f=typeof c,"string"===f&&(e=Rb.exec(c))&&(c=(e[1]+1)*e[2]+parseFloat(n.css(a,b)),f="number"),null!=c&&c===c&&("number"!==f||n.cssNumber[h]||(c+="px"),l.clearCloneStyle||""!==c||0!==b.indexOf("background")||(i[b]="inherit"),!(g&&"set"in g&&void 0===(c=g.set(a,c,d)))))try{i[b]="",i[b]=c}catch(j){}}},css:function(a,b,c,d){var e,f,g,h=n.camelCase(b);return b=n.cssProps[h]||(n.cssProps[h]=Vb(a.style,h)),g=n.cssHooks[b]||n.cssHooks[h],g&&"get"in g&&(f=g.get(a,!0,c)),void 0===f&&(f=Kb(a,b,d)),"normal"===f&&b in Tb&&(f=Tb[b]),""===c||c?(e=parseFloat(f),c===!0||n.isNumeric(e)?e||0:f):f}}),n.each(["height","width"],function(a,b){n.cssHooks[b]={get:function(a,c,d){return c?0===a.offsetWidth&&Pb.test(n.css(a,"display"))?n.swap(a,Sb,function(){return Zb(a,b,d)}):Zb(a,b,d):void 0},set:function(a,c,d){var e=d&&Jb(a);return Xb(a,c,d?Yb(a,b,d,l.boxSizing()&&"border-box"===n.css(a,"boxSizing",!1,e),e):0)}}}),l.opacity||(n.cssHooks.opacity={get:function(a,b){return Ob.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=n.isNumeric(b)?"alpha(opacity="+100*b+")":"",f=d&&d.filter||c.filter||"";c.zoom=1,(b>=1||""===b)&&""===n.trim(f.replace(Nb,""))&&c.removeAttribute&&(c.removeAttribute("filter"),""===b||d&&!d.filter)||(c.filter=Nb.test(f)?f.replace(Nb,e):f+" "+e)}}),n.cssHooks.marginRight=Mb(l.reliableMarginRight,function(a,b){return b?n.swap(a,{display:"inline-block"},Kb,[a,"marginRight"]):void 0}),n.each({margin:"",padding:"",border:"Width"},function(a,b){n.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];4>d;d++)e[a+U[d]+b]=f[d]||f[d-2]||f[0];return e}},Hb.test(a)||(n.cssHooks[a+b].set=Xb)}),n.fn.extend({css:function(a,b){return W(this,function(a,b,c){var d,e,f={},g=0;if(n.isArray(b)){for(d=Jb(a),e=b.length;e>g;g++)f[b[g]]=n.css(a,b[g],!1,d);return f}return void 0!==c?n.style(a,b,c):n.css(a,b)
+},a,b,arguments.length>1)},show:function(){return Wb(this,!0)},hide:function(){return Wb(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){V(this)?n(this).show():n(this).hide()})}});function $b(a,b,c,d,e){return new $b.prototype.init(a,b,c,d,e)}n.Tween=$b,$b.prototype={constructor:$b,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||"swing",this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(n.cssNumber[c]?"":"px")},cur:function(){var a=$b.propHooks[this.prop];return a&&a.get?a.get(this):$b.propHooks._default.get(this)},run:function(a){var b,c=$b.propHooks[this.prop];return this.pos=b=this.options.duration?n.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):$b.propHooks._default.set(this),this}},$b.prototype.init.prototype=$b.prototype,$b.propHooks={_default:{get:function(a){var b;return null==a.elem[a.prop]||a.elem.style&&null!=a.elem.style[a.prop]?(b=n.css(a.elem,a.prop,""),b&&"auto"!==b?b:0):a.elem[a.prop]},set:function(a){n.fx.step[a.prop]?n.fx.step[a.prop](a):a.elem.style&&(null!=a.elem.style[n.cssProps[a.prop]]||n.cssHooks[a.prop])?n.style(a.elem,a.prop,a.now+a.unit):a.elem[a.prop]=a.now}}},$b.propHooks.scrollTop=$b.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},n.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2}},n.fx=$b.prototype.init,n.fx.step={};var _b,ac,bc=/^(?:toggle|show|hide)$/,cc=new RegExp("^(?:([+-])=|)("+T+")([a-z%]*)$","i"),dc=/queueHooks$/,ec=[jc],fc={"*":[function(a,b){var c=this.createTween(a,b),d=c.cur(),e=cc.exec(b),f=e&&e[3]||(n.cssNumber[a]?"":"px"),g=(n.cssNumber[a]||"px"!==f&&+d)&&cc.exec(n.css(c.elem,a)),h=1,i=20;if(g&&g[3]!==f){f=f||g[3],e=e||[],g=+d||1;do h=h||".5",g/=h,n.style(c.elem,a,g+f);while(h!==(h=c.cur()/d)&&1!==h&&--i)}return e&&(g=c.start=+g||+d||0,c.unit=f,c.end=e[1]?g+(e[1]+1)*e[2]:+e[2]),c}]};function gc(){return setTimeout(function(){_b=void 0}),_b=n.now()}function hc(a,b){var c,d={height:a},e=0;for(b=b?1:0;4>e;e+=2-b)c=U[e],d["margin"+c]=d["padding"+c]=a;return b&&(d.opacity=d.width=a),d}function ic(a,b,c){for(var d,e=(fc[b]||[]).concat(fc["*"]),f=0,g=e.length;g>f;f++)if(d=e[f].call(c,b,a))return d}function jc(a,b,c){var d,e,f,g,h,i,j,k,m=this,o={},p=a.style,q=a.nodeType&&V(a),r=n._data(a,"fxshow");c.queue||(h=n._queueHooks(a,"fx"),null==h.unqueued&&(h.unqueued=0,i=h.empty.fire,h.empty.fire=function(){h.unqueued||i()}),h.unqueued++,m.always(function(){m.always(function(){h.unqueued--,n.queue(a,"fx").length||h.empty.fire()})})),1===a.nodeType&&("height"in b||"width"in b)&&(c.overflow=[p.overflow,p.overflowX,p.overflowY],j=n.css(a,"display"),k=Gb(a.nodeName),"none"===j&&(j=k),"inline"===j&&"none"===n.css(a,"float")&&(l.inlineBlockNeedsLayout&&"inline"!==k?p.zoom=1:p.display="inline-block")),c.overflow&&(p.overflow="hidden",l.shrinkWrapBlocks()||m.always(function(){p.overflow=c.overflow[0],p.overflowX=c.overflow[1],p.overflowY=c.overflow[2]}));for(d in b)if(e=b[d],bc.exec(e)){if(delete b[d],f=f||"toggle"===e,e===(q?"hide":"show")){if("show"!==e||!r||void 0===r[d])continue;q=!0}o[d]=r&&r[d]||n.style(a,d)}if(!n.isEmptyObject(o)){r?"hidden"in r&&(q=r.hidden):r=n._data(a,"fxshow",{}),f&&(r.hidden=!q),q?n(a).show():m.done(function(){n(a).hide()}),m.done(function(){var b;n._removeData(a,"fxshow");for(b in o)n.style(a,b,o[b])});for(d in o)g=ic(q?r[d]:0,d,m),d in r||(r[d]=g.start,q&&(g.end=g.start,g.start="width"===d||"height"===d?1:0))}}function kc(a,b){var c,d,e,f,g;for(c in a)if(d=n.camelCase(c),e=b[d],f=a[c],n.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=n.cssHooks[d],g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}function lc(a,b,c){var d,e,f=0,g=ec.length,h=n.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=_b||gc(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;i>g;g++)j.tweens[g].run(f);return h.notifyWith(a,[j,f,c]),1>f&&i?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:n.extend({},b),opts:n.extend(!0,{specialEasing:{}},c),originalProperties:b,originalOptions:c,startTime:_b||gc(),duration:c.duration,tweens:[],createTween:function(b,c){var d=n.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(d),d},stop:function(b){var c=0,d=b?j.tweens.length:0;if(e)return this;for(e=!0;d>c;c++)j.tweens[c].run(1);return b?h.resolveWith(a,[j,b]):h.rejectWith(a,[j,b]),this}}),k=j.props;for(kc(k,j.opts.specialEasing);g>f;f++)if(d=ec[f].call(j,a,k,j.opts))return d;return n.map(k,ic,j),n.isFunction(j.opts.start)&&j.opts.start.call(a,j),n.fx.timer(n.extend(i,{elem:a,anim:j,queue:j.opts.queue})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}n.Animation=n.extend(lc,{tweener:function(a,b){n.isFunction(a)?(b=a,a=["*"]):a=a.split(" ");for(var c,d=0,e=a.length;e>d;d++)c=a[d],fc[c]=fc[c]||[],fc[c].unshift(b)},prefilter:function(a,b){b?ec.unshift(a):ec.push(a)}}),n.speed=function(a,b,c){var d=a&&"object"==typeof a?n.extend({},a):{complete:c||!c&&b||n.isFunction(a)&&a,duration:a,easing:c&&b||b&&!n.isFunction(b)&&b};return d.duration=n.fx.off?0:"number"==typeof d.duration?d.duration:d.duration in n.fx.speeds?n.fx.speeds[d.duration]:n.fx.speeds._default,(null==d.queue||d.queue===!0)&&(d.queue="fx"),d.old=d.complete,d.complete=function(){n.isFunction(d.old)&&d.old.call(this),d.queue&&n.dequeue(this,d.queue)},d},n.fn.extend({fadeTo:function(a,b,c,d){return this.filter(V).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=n.isEmptyObject(a),f=n.speed(b,c,d),g=function(){var b=lc(this,n.extend({},a),f);(e||n._data(this,"finish"))&&b.stop(!0)};return g.finish=g,e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,b,c){var d=function(a){var b=a.stop;delete a.stop,b(c)};return"string"!=typeof a&&(c=b,b=a,a=void 0),b&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,e=null!=a&&a+"queueHooks",f=n.timers,g=n._data(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&dc.test(e)&&d(g[e]);for(e=f.length;e--;)f[e].elem!==this||null!=a&&f[e].queue!==a||(f[e].anim.stop(c),b=!1,f.splice(e,1));(b||!c)&&n.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=n._data(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=n.timers,g=d?d.length:0;for(c.finish=!0,n.queue(this,a,[]),e&&e.stop&&e.stop.call(this,!0),b=f.length;b--;)f[b].elem===this&&f[b].queue===a&&(f[b].anim.stop(!0),f.splice(b,1));for(b=0;g>b;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),n.each(["toggle","show","hide"],function(a,b){var c=n.fn[b];n.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(hc(b,!0),a,d,e)}}),n.each({slideDown:hc("show"),slideUp:hc("hide"),slideToggle:hc("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){n.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),n.timers=[],n.fx.tick=function(){var a,b=n.timers,c=0;for(_b=n.now();c<b.length;c++)a=b[c],a()||b[c]!==a||b.splice(c--,1);b.length||n.fx.stop(),_b=void 0},n.fx.timer=function(a){n.timers.push(a),a()?n.fx.start():n.timers.pop()},n.fx.interval=13,n.fx.start=function(){ac||(ac=setInterval(n.fx.tick,n.fx.interval))},n.fx.stop=function(){clearInterval(ac),ac=null},n.fx.speeds={slow:600,fast:200,_default:400},n.fn.delay=function(a,b){return a=n.fx?n.fx.speeds[a]||a:a,b=b||"fx",this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},function(){var a,b,c,d,e=z.createElement("div");e.setAttribute("className","t"),e.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",a=e.getElementsByTagName("a")[0],c=z.createElement("select"),d=c.appendChild(z.createElement("option")),b=e.getElementsByTagName("input")[0],a.style.cssText="top:1px",l.getSetAttribute="t"!==e.className,l.style=/top/.test(a.getAttribute("style")),l.hrefNormalized="/a"===a.getAttribute("href"),l.checkOn=!!b.value,l.optSelected=d.selected,l.enctype=!!z.createElement("form").enctype,c.disabled=!0,l.optDisabled=!d.disabled,b=z.createElement("input"),b.setAttribute("value",""),l.input=""===b.getAttribute("value"),b.value="t",b.setAttribute("type","radio"),l.radioValue="t"===b.value,a=b=c=d=e=null}();var mc=/\r/g;n.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=n.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,n(this).val()):a,null==e?e="":"number"==typeof e?e+="":n.isArray(e)&&(e=n.map(e,function(a){return null==a?"":a+""})),b=n.valHooks[this.type]||n.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=n.valHooks[e.type]||n.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(mc,""):null==c?"":c)}}}),n.extend({valHooks:{option:{get:function(a){var b=n.find.attr(a,"value");return null!=b?b:n.text(a)}},select:{get:function(a){for(var b,c,d=a.options,e=a.selectedIndex,f="select-one"===a.type||0>e,g=f?null:[],h=f?e+1:d.length,i=0>e?h:f?e:0;h>i;i++)if(c=d[i],!(!c.selected&&i!==e||(l.optDisabled?c.disabled:null!==c.getAttribute("disabled"))||c.parentNode.disabled&&n.nodeName(c.parentNode,"optgroup"))){if(b=n(c).val(),f)return b;g.push(b)}return g},set:function(a,b){var c,d,e=a.options,f=n.makeArray(b),g=e.length;while(g--)if(d=e[g],n.inArray(n.valHooks.option.get(d),f)>=0)try{d.selected=c=!0}catch(h){d.scrollHeight}else d.selected=!1;return c||(a.selectedIndex=-1),e}}}}),n.each(["radio","checkbox"],function(){n.valHooks[this]={set:function(a,b){return n.isArray(b)?a.checked=n.inArray(n(a).val(),b)>=0:void 0}},l.checkOn||(n.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})});var nc,oc,pc=n.expr.attrHandle,qc=/^(?:checked|selected)$/i,rc=l.getSetAttribute,sc=l.input;n.fn.extend({attr:function(a,b){return W(this,n.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){n.removeAttr(this,a)})}}),n.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(a&&3!==f&&8!==f&&2!==f)return typeof a.getAttribute===L?n.prop(a,b,c):(1===f&&n.isXMLDoc(a)||(b=b.toLowerCase(),d=n.attrHooks[b]||(n.expr.match.bool.test(b)?oc:nc)),void 0===c?d&&"get"in d&&null!==(e=d.get(a,b))?e:(e=n.find.attr(a,b),null==e?void 0:e):null!==c?d&&"set"in d&&void 0!==(e=d.set(a,c,b))?e:(a.setAttribute(b,c+""),c):void n.removeAttr(a,b))},removeAttr:function(a,b){var c,d,e=0,f=b&&b.match(F);if(f&&1===a.nodeType)while(c=f[e++])d=n.propFix[c]||c,n.expr.match.bool.test(c)?sc&&rc||!qc.test(c)?a[d]=!1:a[n.camelCase("default-"+c)]=a[d]=!1:n.attr(a,c,""),a.removeAttribute(rc?c:d)},attrHooks:{type:{set:function(a,b){if(!l.radioValue&&"radio"===b&&n.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}}}),oc={set:function(a,b,c){return b===!1?n.removeAttr(a,c):sc&&rc||!qc.test(c)?a.setAttribute(!rc&&n.propFix[c]||c,c):a[n.camelCase("default-"+c)]=a[c]=!0,c}},n.each(n.expr.match.bool.source.match(/\w+/g),function(a,b){var c=pc[b]||n.find.attr;pc[b]=sc&&rc||!qc.test(b)?function(a,b,d){var e,f;return d||(f=pc[b],pc[b]=e,e=null!=c(a,b,d)?b.toLowerCase():null,pc[b]=f),e}:function(a,b,c){return c?void 0:a[n.camelCase("default-"+b)]?b.toLowerCase():null}}),sc&&rc||(n.attrHooks.value={set:function(a,b,c){return n.nodeName(a,"input")?void(a.defaultValue=b):nc&&nc.set(a,b,c)}}),rc||(nc={set:function(a,b,c){var d=a.getAttributeNode(c);return d||a.setAttributeNode(d=a.ownerDocument.createAttribute(c)),d.value=b+="","value"===c||b===a.getAttribute(c)?b:void 0}},pc.id=pc.name=pc.coords=function(a,b,c){var d;return c?void 0:(d=a.getAttributeNode(b))&&""!==d.value?d.value:null},n.valHooks.button={get:function(a,b){var c=a.getAttributeNode(b);return c&&c.specified?c.value:void 0},set:nc.set},n.attrHooks.contenteditable={set:function(a,b,c){nc.set(a,""===b?!1:b,c)}},n.each(["width","height"],function(a,b){n.attrHooks[b]={set:function(a,c){return""===c?(a.setAttribute(b,"auto"),c):void 0}}})),l.style||(n.attrHooks.style={get:function(a){return a.style.cssText||void 0},set:function(a,b){return a.style.cssText=b+""}});var tc=/^(?:input|select|textarea|button|object)$/i,uc=/^(?:a|area)$/i;n.fn.extend({prop:function(a,b){return W(this,n.prop,a,b,arguments.length>1)},removeProp:function(a){return a=n.propFix[a]||a,this.each(function(){try{this[a]=void 0,delete this[a]}catch(b){}})}}),n.extend({propFix:{"for":"htmlFor","class":"className"},prop:function(a,b,c){var d,e,f,g=a.nodeType;if(a&&3!==g&&8!==g&&2!==g)return f=1!==g||!n.isXMLDoc(a),f&&(b=n.propFix[b]||b,e=n.propHooks[b]),void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){var b=n.find.attr(a,"tabindex");return b?parseInt(b,10):tc.test(a.nodeName)||uc.test(a.nodeName)&&a.href?0:-1}}}}),l.hrefNormalized||n.each(["href","src"],function(a,b){n.propHooks[b]={get:function(a){return a.getAttribute(b,4)}}}),l.optSelected||(n.propHooks.selected={get:function(a){var b=a.parentNode;return b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex),null}}),n.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){n.propFix[this.toLowerCase()]=this}),l.enctype||(n.propFix.enctype="encoding");var vc=/[\t\r\n\f]/g;n.fn.extend({addClass:function(a){var b,c,d,e,f,g,h=0,i=this.length,j="string"==typeof a&&a;if(n.isFunction(a))return this.each(function(b){n(this).addClass(a.call(this,b,this.className))});if(j)for(b=(a||"").match(F)||[];i>h;h++)if(c=this[h],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(vc," "):" ")){f=0;while(e=b[f++])d.indexOf(" "+e+" ")<0&&(d+=e+" ");g=n.trim(d),c.className!==g&&(c.className=g)}return this},removeClass:function(a){var b,c,d,e,f,g,h=0,i=this.length,j=0===arguments.length||"string"==typeof a&&a;if(n.isFunction(a))return this.each(function(b){n(this).removeClass(a.call(this,b,this.className))});if(j)for(b=(a||"").match(F)||[];i>h;h++)if(c=this[h],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(vc," "):"")){f=0;while(e=b[f++])while(d.indexOf(" "+e+" ")>=0)d=d.replace(" "+e+" "," ");g=a?n.trim(d):"",c.className!==g&&(c.className=g)}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):this.each(n.isFunction(a)?function(c){n(this).toggleClass(a.call(this,c,this.className,b),b)}:function(){if("string"===c){var b,d=0,e=n(this),f=a.match(F)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else(c===L||"boolean"===c)&&(this.className&&n._data(this,"__className__",this.className),this.className=this.className||a===!1?"":n._data(this,"__className__")||"")})},hasClass:function(a){for(var b=" "+a+" ",c=0,d=this.length;d>c;c++)if(1===this[c].nodeType&&(" "+this[c].className+" ").replace(vc," ").indexOf(b)>=0)return!0;return!1}}),n.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){n.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),n.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)}});var wc=n.now(),xc=/\?/,yc=/(,)|(\[|{)|(}|])|"(?:[^"\\\r\n]|\\["\\\/bfnrt]|\\u[\da-fA-F]{4})*"\s*:?|true|false|null|-?(?!0\d)\d+(?:\.\d+|)(?:[eE][+-]?\d+|)/g;n.parseJSON=function(b){if(a.JSON&&a.JSON.parse)return a.JSON.parse(b+"");var c,d=null,e=n.trim(b+"");return e&&!n.trim(e.replace(yc,function(a,b,e,f){return c&&b&&(d=0),0===d?a:(c=e||b,d+=!f-!e,"")}))?Function("return "+e)():n.error("Invalid JSON: "+b)},n.parseXML=function(b){var c,d;if(!b||"string"!=typeof b)return null;try{a.DOMParser?(d=new DOMParser,c=d.parseFromString(b,"text/xml")):(c=new ActiveXObject("Microsoft.XMLDOM"),c.async="false",c.loadXML(b))}catch(e){c=void 0}return c&&c.documentElement&&!c.getElementsByTagName("parsererror").length||n.error("Invalid XML: "+b),c};var zc,Ac,Bc=/#.*$/,Cc=/([?&])_=[^&]*/,Dc=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Ec=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Fc=/^(?:GET|HEAD)$/,Gc=/^\/\//,Hc=/^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,Ic={},Jc={},Kc="*/".concat("*");try{Ac=location.href}catch(Lc){Ac=z.createElement("a"),Ac.href="",Ac=Ac.href}zc=Hc.exec(Ac.toLowerCase())||[];function Mc(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(F)||[];if(n.isFunction(c))while(d=f[e++])"+"===d.charAt(0)?(d=d.slice(1)||"*",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function Nc(a,b,c,d){var e={},f=a===Jc;function g(h){var i;return e[h]=!0,n.each(a[h]||[],function(a,h){var j=h(b,c,d);return"string"!=typeof j||f||e[j]?f?!(i=j):void 0:(b.dataTypes.unshift(j),g(j),!1)}),i}return g(b.dataTypes[0])||!e["*"]&&g("*")}function Oc(a,b){var c,d,e=n.ajaxSettings.flatOptions||{};for(d in b)void 0!==b[d]&&((e[d]?a:c||(c={}))[d]=b[d]);return c&&n.extend(!0,a,c),a}function Pc(a,b,c){var d,e,f,g,h=a.contents,i=a.dataTypes;while("*"===i[0])i.shift(),void 0===e&&(e=a.mimeType||b.getResponseHeader("Content-Type"));if(e)for(g in h)if(h[g]&&h[g].test(e)){i.unshift(g);break}if(i[0]in c)f=i[0];else{for(g in c){if(!i[0]||a.converters[g+" "+i[0]]){f=g;break}d||(d=g)}f=f||d}return f?(f!==i[0]&&i.unshift(f),c[f]):void 0}function Qc(a,b,c,d){var e,f,g,h,i,j={},k=a.dataTypes.slice();if(k[1])for(g in a.converters)j[g.toLowerCase()]=a.converters[g];f=k.shift();while(f)if(a.responseFields[f]&&(c[a.responseFields[f]]=b),!i&&d&&a.dataFilter&&(b=a.dataFilter(b,a.dataType)),i=f,f=k.shift())if("*"===f)f=i;else if("*"!==i&&i!==f){if(g=j[i+" "+f]||j["* "+f],!g)for(e in j)if(h=e.split(" "),h[1]===f&&(g=j[i+" "+h[0]]||j["* "+h[0]])){g===!0?g=j[e]:j[e]!==!0&&(f=h[0],k.unshift(h[1]));break}if(g!==!0)if(g&&a["throws"])b=g(b);else try{b=g(b)}catch(l){return{state:"parsererror",error:g?l:"No conversion from "+i+" to "+f}}}return{state:"success",data:b}}n.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Ac,type:"GET",isLocal:Ec.test(zc[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Kc,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":n.parseJSON,"text xml":n.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?Oc(Oc(a,n.ajaxSettings),b):Oc(n.ajaxSettings,a)},ajaxPrefilter:Mc(Ic),ajaxTransport:Mc(Jc),ajax:function(a,b){"object"==typeof a&&(b=a,a=void 0),b=b||{};var c,d,e,f,g,h,i,j,k=n.ajaxSetup({},b),l=k.context||k,m=k.context&&(l.nodeType||l.jquery)?n(l):n.event,o=n.Deferred(),p=n.Callbacks("once memory"),q=k.statusCode||{},r={},s={},t=0,u="canceled",v={readyState:0,getResponseHeader:function(a){var b;if(2===t){if(!j){j={};while(b=Dc.exec(f))j[b[1].toLowerCase()]=b[2]}b=j[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return 2===t?f:null},setRequestHeader:function(a,b){var c=a.toLowerCase();return t||(a=s[c]=s[c]||a,r[a]=b),this},overrideMimeType:function(a){return t||(k.mimeType=a),this},statusCode:function(a){var b;if(a)if(2>t)for(b in a)q[b]=[q[b],a[b]];else v.always(a[v.status]);return this},abort:function(a){var b=a||u;return i&&i.abort(b),x(0,b),this}};if(o.promise(v).complete=p.add,v.success=v.done,v.error=v.fail,k.url=((a||k.url||Ac)+"").replace(Bc,"").replace(Gc,zc[1]+"//"),k.type=b.method||b.type||k.method||k.type,k.dataTypes=n.trim(k.dataType||"*").toLowerCase().match(F)||[""],null==k.crossDomain&&(c=Hc.exec(k.url.toLowerCase()),k.crossDomain=!(!c||c[1]===zc[1]&&c[2]===zc[2]&&(c[3]||("http:"===c[1]?"80":"443"))===(zc[3]||("http:"===zc[1]?"80":"443")))),k.data&&k.processData&&"string"!=typeof k.data&&(k.data=n.param(k.data,k.traditional)),Nc(Ic,k,b,v),2===t)return v;h=k.global,h&&0===n.active++&&n.event.trigger("ajaxStart"),k.type=k.type.toUpperCase(),k.hasContent=!Fc.test(k.type),e=k.url,k.hasContent||(k.data&&(e=k.url+=(xc.test(e)?"&":"?")+k.data,delete k.data),k.cache===!1&&(k.url=Cc.test(e)?e.replace(Cc,"$1_="+wc++):e+(xc.test(e)?"&":"?")+"_="+wc++)),k.ifModified&&(n.lastModified[e]&&v.setRequestHeader("If-Modified-Since",n.lastModified[e]),n.etag[e]&&v.setRequestHeader("If-None-Match",n.etag[e])),(k.data&&k.hasContent&&k.contentType!==!1||b.contentType)&&v.setRequestHeader("Content-Type",k.contentType),v.setRequestHeader("Accept",k.dataTypes[0]&&k.accepts[k.dataTypes[0]]?k.accepts[k.dataTypes[0]]+("*"!==k.dataTypes[0]?", "+Kc+"; q=0.01":""):k.accepts["*"]);for(d in k.headers)v.setRequestHeader(d,k.headers[d]);if(k.beforeSend&&(k.beforeSend.call(l,v,k)===!1||2===t))return v.abort();u="abort";for(d in{success:1,error:1,complete:1})v[d](k[d]);if(i=Nc(Jc,k,b,v)){v.readyState=1,h&&m.trigger("ajaxSend",[v,k]),k.async&&k.timeout>0&&(g=setTimeout(function(){v.abort("timeout")},k.timeout));try{t=1,i.send(r,x)}catch(w){if(!(2>t))throw w;x(-1,w)}}else x(-1,"No Transport");function x(a,b,c,d){var j,r,s,u,w,x=b;2!==t&&(t=2,g&&clearTimeout(g),i=void 0,f=d||"",v.readyState=a>0?4:0,j=a>=200&&300>a||304===a,c&&(u=Pc(k,v,c)),u=Qc(k,u,v,j),j?(k.ifModified&&(w=v.getResponseHeader("Last-Modified"),w&&(n.lastModified[e]=w),w=v.getResponseHeader("etag"),w&&(n.etag[e]=w)),204===a||"HEAD"===k.type?x="nocontent":304===a?x="notmodified":(x=u.state,r=u.data,s=u.error,j=!s)):(s=x,(a||!x)&&(x="error",0>a&&(a=0))),v.status=a,v.statusText=(b||x)+"",j?o.resolveWith(l,[r,x,v]):o.rejectWith(l,[v,x,s]),v.statusCode(q),q=void 0,h&&m.trigger(j?"ajaxSuccess":"ajaxError",[v,k,j?r:s]),p.fireWith(l,[v,x]),h&&(m.trigger("ajaxComplete",[v,k]),--n.active||n.event.trigger("ajaxStop")))}return v},getJSON:function(a,b,c){return n.get(a,b,c,"json")},getScript:function(a,b){return n.get(a,void 0,b,"script")}}),n.each(["get","post"],function(a,b){n[b]=function(a,c,d,e){return n.isFunction(c)&&(e=e||d,d=c,c=void 0),n.ajax({url:a,type:b,dataType:e,data:c,success:d})}}),n.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){n.fn[b]=function(a){return this.on(b,a)}}),n._evalUrl=function(a){return n.ajax({url:a,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})},n.fn.extend({wrapAll:function(a){if(n.isFunction(a))return this.each(function(b){n(this).wrapAll(a.call(this,b))});if(this[0]){var b=n(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&1===a.firstChild.nodeType)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){return this.each(n.isFunction(a)?function(b){n(this).wrapInner(a.call(this,b))}:function(){var b=n(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=n.isFunction(a);return this.each(function(c){n(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){n.nodeName(this,"body")||n(this).replaceWith(this.childNodes)}).end()}}),n.expr.filters.hidden=function(a){return a.offsetWidth<=0&&a.offsetHeight<=0||!l.reliableHiddenOffsets()&&"none"===(a.style&&a.style.display||n.css(a,"display"))},n.expr.filters.visible=function(a){return!n.expr.filters.hidden(a)};var Rc=/%20/g,Sc=/\[\]$/,Tc=/\r?\n/g,Uc=/^(?:submit|button|image|reset|file)$/i,Vc=/^(?:input|select|textarea|keygen)/i;function Wc(a,b,c,d){var e;if(n.isArray(b))n.each(b,function(b,e){c||Sc.test(a)?d(a,e):Wc(a+"["+("object"==typeof e?b:"")+"]",e,c,d)});else if(c||"object"!==n.type(b))d(a,b);else for(e in b)Wc(a+"["+e+"]",b[e],c,d)}n.param=function(a,b){var c,d=[],e=function(a,b){b=n.isFunction(b)?b():null==b?"":b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};if(void 0===b&&(b=n.ajaxSettings&&n.ajaxSettings.traditional),n.isArray(a)||a.jquery&&!n.isPlainObject(a))n.each(a,function(){e(this.name,this.value)});else for(c in a)Wc(c,a[c],b,e);return d.join("&").replace(Rc,"+")},n.fn.extend({serialize:function(){return n.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=n.prop(this,"elements");return a?n.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!n(this).is(":disabled")&&Vc.test(this.nodeName)&&!Uc.test(a)&&(this.checked||!X.test(a))}).map(function(a,b){var c=n(this).val();return null==c?null:n.isArray(c)?n.map(c,function(a){return{name:b.name,value:a.replace(Tc,"\r\n")}}):{name:b.name,value:c.replace(Tc,"\r\n")}}).get()}}),n.ajaxSettings.xhr=void 0!==a.ActiveXObject?function(){return!this.isLocal&&/^(get|post|head|put|delete|options)$/i.test(this.type)&&$c()||_c()}:$c;var Xc=0,Yc={},Zc=n.ajaxSettings.xhr();a.ActiveXObject&&n(a).on("unload",function(){for(var a in Yc)Yc[a](void 0,!0)}),l.cors=!!Zc&&"withCredentials"in Zc,Zc=l.ajax=!!Zc,Zc&&n.ajaxTransport(function(a){if(!a.crossDomain||l.cors){var b;return{send:function(c,d){var e,f=a.xhr(),g=++Xc;if(f.open(a.type,a.url,a.async,a.username,a.password),a.xhrFields)for(e in a.xhrFields)f[e]=a.xhrFields[e];a.mimeType&&f.overrideMimeType&&f.overrideMimeType(a.mimeType),a.crossDomain||c["X-Requested-With"]||(c["X-Requested-With"]="XMLHttpRequest");for(e in c)void 0!==c[e]&&f.setRequestHeader(e,c[e]+"");f.send(a.hasContent&&a.data||null),b=function(c,e){var h,i,j;if(b&&(e||4===f.readyState))if(delete Yc[g],b=void 0,f.onreadystatechange=n.noop,e)4!==f.readyState&&f.abort();else{j={},h=f.status,"string"==typeof f.responseText&&(j.text=f.responseText);try{i=f.statusText}catch(k){i=""}h||!a.isLocal||a.crossDomain?1223===h&&(h=204):h=j.text?200:404}j&&d(h,i,j,f.getAllResponseHeaders())},a.async?4===f.readyState?setTimeout(b):f.onreadystatechange=Yc[g]=b:b()},abort:function(){b&&b(void 0,!0)}}}});function $c(){try{return new a.XMLHttpRequest}catch(b){}}function _c(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}n.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(a){return n.globalEval(a),a}}}),n.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),n.ajaxTransport("script",function(a){if(a.crossDomain){var b,c=z.head||n("head")[0]||z.documentElement;return{send:function(d,e){b=z.createElement("script"),b.async=!0,a.scriptCharset&&(b.charset=a.scriptCharset),b.src=a.url,b.onload=b.onreadystatechange=function(a,c){(c||!b.readyState||/loaded|complete/.test(b.readyState))&&(b.onload=b.onreadystatechange=null,b.parentNode&&b.parentNode.removeChild(b),b=null,c||e(200,"success"))},c.insertBefore(b,c.firstChild)},abort:function(){b&&b.onload(void 0,!0)}}}});var ad=[],bd=/(=)\?(?=&|$)|\?\?/;n.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=ad.pop()||n.expando+"_"+wc++;return this[a]=!0,a}}),n.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(bd.test(b.url)?"url":"string"==typeof b.data&&!(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&bd.test(b.data)&&"data");return h||"jsonp"===b.dataTypes[0]?(e=b.jsonpCallback=n.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,h?b[h]=b[h].replace(bd,"$1"+e):b.jsonp!==!1&&(b.url+=(xc.test(b.url)?"&":"?")+b.jsonp+"="+e),b.converters["script json"]=function(){return g||n.error(e+" was not called"),g[0]},b.dataTypes[0]="json",f=a[e],a[e]=function(){g=arguments},d.always(function(){a[e]=f,b[e]&&(b.jsonpCallback=c.jsonpCallback,ad.push(e)),g&&n.isFunction(f)&&f(g[0]),g=f=void 0}),"script"):void 0}),n.parseHTML=function(a,b,c){if(!a||"string"!=typeof a)return null;"boolean"==typeof b&&(c=b,b=!1),b=b||z;var d=v.exec(a),e=!c&&[];return d?[b.createElement(d[1])]:(d=n.buildFragment([a],b,e),e&&e.length&&n(e).remove(),n.merge([],d.childNodes))};var cd=n.fn.load;n.fn.load=function(a,b,c){if("string"!=typeof a&&cd)return cd.apply(this,arguments);var d,e,f,g=this,h=a.indexOf(" ");return h>=0&&(d=a.slice(h,a.length),a=a.slice(0,h)),n.isFunction(b)?(c=b,b=void 0):b&&"object"==typeof b&&(f="POST"),g.length>0&&n.ajax({url:a,type:f,dataType:"html",data:b}).done(function(a){e=arguments,g.html(d?n("<div>").append(n.parseHTML(a)).find(d):a)}).complete(c&&function(a,b){g.each(c,e||[a.responseText,b,a])}),this},n.expr.filters.animated=function(a){return n.grep(n.timers,function(b){return a===b.elem}).length};var dd=a.document.documentElement;function ed(a){return n.isWindow(a)?a:9===a.nodeType?a.defaultView||a.parentWindow:!1}n.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=n.css(a,"position"),l=n(a),m={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=n.css(a,"top"),i=n.css(a,"left"),j=("absolute"===k||"fixed"===k)&&n.inArray("auto",[f,i])>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),n.isFunction(b)&&(b=b.call(a,c,h)),null!=b.top&&(m.top=b.top-h.top+g),null!=b.left&&(m.left=b.left-h.left+e),"using"in b?b.using.call(a,m):l.css(m)}},n.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){n.offset.setOffset(this,a,b)});var b,c,d={top:0,left:0},e=this[0],f=e&&e.ownerDocument;if(f)return b=f.documentElement,n.contains(b,e)?(typeof e.getBoundingClientRect!==L&&(d=e.getBoundingClientRect()),c=ed(f),{top:d.top+(c.pageYOffset||b.scrollTop)-(b.clientTop||0),left:d.left+(c.pageXOffset||b.scrollLeft)-(b.clientLeft||0)}):d},position:function(){if(this[0]){var a,b,c={top:0,left:0},d=this[0];return"fixed"===n.css(d,"position")?b=d.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),n.nodeName(a[0],"html")||(c=a.offset()),c.top+=n.css(a[0],"borderTopWidth",!0),c.left+=n.css(a[0],"borderLeftWidth",!0)),{top:b.top-c.top-n.css(d,"marginTop",!0),left:b.left-c.left-n.css(d,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||dd;while(a&&!n.nodeName(a,"html")&&"static"===n.css(a,"position"))a=a.offsetParent;return a||dd})}}),n.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,b){var c=/Y/.test(b);n.fn[a]=function(d){return W(this,function(a,d,e){var f=ed(a);return void 0===e?f?b in f?f[b]:f.document.documentElement[d]:a[d]:void(f?f.scrollTo(c?n(f).scrollLeft():e,c?e:n(f).scrollTop()):a[d]=e)},a,d,arguments.length,null)}}),n.each(["top","left"],function(a,b){n.cssHooks[b]=Mb(l.pixelPosition,function(a,c){return c?(c=Kb(a,b),Ib.test(c)?n(a).position()[b]+"px":c):void 0})}),n.each({Height:"height",Width:"width"},function(a,b){n.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){n.fn[d]=function(d,e){var f=arguments.length&&(c||"boolean"!=typeof d),g=c||(d===!0||e===!0?"margin":"border");return W(this,function(b,c,d){var e;return n.isWindow(b)?b.document.documentElement["client"+a]:9===b.nodeType?(e=b.documentElement,Math.max(b.body["scroll"+a],e["scroll"+a],b.body["offset"+a],e["offset"+a],e["client"+a])):void 0===d?n.css(b,c,g):n.style(b,c,d,g)},b,f?d:void 0,f,null)}})}),n.fn.size=function(){return this.length},n.fn.andSelf=n.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return n});var fd=a.jQuery,gd=a.$;return n.noConflict=function(b){return a.$===n&&(a.$=gd),b&&a.jQuery===n&&(a.jQuery=fd),n},typeof b===L&&(a.jQuery=a.$=n),n});
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/jquery/jquery-ui.min.js b/pluss-manage-page/src/main/resources/static/resources/js/third-party/jquery/jquery-ui.min.js
new file mode 100644
index 0000000..6afd615
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/third-party/jquery/jquery-ui.min.js
@@ -0,0 +1,12 @@
+/*! jQuery UI - v1.10.4 - 2014-01-17
+* http://jqueryui.com
+* Includes: jquery.ui.core.js, jquery.ui.widget.js, jquery.ui.mouse.js, jquery.ui.draggable.js, jquery.ui.droppable.js, jquery.ui.resizable.js, jquery.ui.selectable.js, jquery.ui.sortable.js, jquery.ui.effect.js, jquery.ui.accordion.js, jquery.ui.autocomplete.js, jquery.ui.button.js, jquery.ui.datepicker.js, jquery.ui.dialog.js, jquery.ui.effect-blind.js, jquery.ui.effect-bounce.js, jquery.ui.effect-clip.js, jquery.ui.effect-drop.js, jquery.ui.effect-explode.js, jquery.ui.effect-fade.js, jquery.ui.effect-fold.js, jquery.ui.effect-highlight.js, jquery.ui.effect-pulsate.js, jquery.ui.effect-scale.js, jquery.ui.effect-shake.js, jquery.ui.effect-slide.js, jquery.ui.effect-transfer.js, jquery.ui.menu.js, jquery.ui.position.js, jquery.ui.progressbar.js, jquery.ui.slider.js, jquery.ui.spinner.js, jquery.ui.tabs.js, jquery.ui.tooltip.js
+* Copyright 2014 jQuery Foundation and other contributors; Licensed MIT */
+(function(t,e){function i(e,i){var n,o,a,r=e.nodeName.toLowerCase();return"area"===r?(n=e.parentNode,o=n.name,e.href&&o&&"map"===n.nodeName.toLowerCase()?(a=t("img[usemap=#"+o+"]")[0],!!a&&s(a)):!1):(/input|select|textarea|button|object/.test(r)?!e.disabled:"a"===r?e.href||i:i)&&s(e)}function s(e){return t.expr.filters.visible(e)&&!t(e).parents().addBack().filter(function(){return"hidden"===t.css(this,"visibility")}).length}var n=0,o=/^ui-id-\d+$/;t.ui=t.ui||{},t.extend(t.ui,{version:"1.10.4",keyCode:{BACKSPACE:8,COMMA:188,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,LEFT:37,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SPACE:32,TAB:9,UP:38}}),t.fn.extend({focus:function(e){return function(i,s){return"number"==typeof i?this.each(function(){var e=this;setTimeout(function(){t(e).focus(),s&&s.call(e)},i)}):e.apply(this,arguments)}}(t.fn.focus),scrollParent:function(){var e;return e=t.ui.ie&&/(static|relative)/.test(this.css("position"))||/absolute/.test(this.css("position"))?this.parents().filter(function(){return/(relative|absolute|fixed)/.test(t.css(this,"position"))&&/(auto|scroll)/.test(t.css(this,"overflow")+t.css(this,"overflow-y")+t.css(this,"overflow-x"))}).eq(0):this.parents().filter(function(){return/(auto|scroll)/.test(t.css(this,"overflow")+t.css(this,"overflow-y")+t.css(this,"overflow-x"))}).eq(0),/fixed/.test(this.css("position"))||!e.length?t(document):e},zIndex:function(i){if(i!==e)return this.css("zIndex",i);if(this.length)for(var s,n,o=t(this[0]);o.length&&o[0]!==document;){if(s=o.css("position"),("absolute"===s||"relative"===s||"fixed"===s)&&(n=parseInt(o.css("zIndex"),10),!isNaN(n)&&0!==n))return n;o=o.parent()}return 0},uniqueId:function(){return this.each(function(){this.id||(this.id="ui-id-"+ ++n)})},removeUniqueId:function(){return this.each(function(){o.test(this.id)&&t(this).removeAttr("id")})}}),t.extend(t.expr[":"],{data:t.expr.createPseudo?t.expr.createPseudo(function(e){return function(i){return!!t.data(i,e)}}):function(e,i,s){return!!t.data(e,s[3])},focusable:function(e){return i(e,!isNaN(t.attr(e,"tabindex")))},tabbable:function(e){var s=t.attr(e,"tabindex"),n=isNaN(s);return(n||s>=0)&&i(e,!n)}}),t("<a>").outerWidth(1).jquery||t.each(["Width","Height"],function(i,s){function n(e,i,s,n){return t.each(o,function(){i-=parseFloat(t.css(e,"padding"+this))||0,s&&(i-=parseFloat(t.css(e,"border"+this+"Width"))||0),n&&(i-=parseFloat(t.css(e,"margin"+this))||0)}),i}var o="Width"===s?["Left","Right"]:["Top","Bottom"],a=s.toLowerCase(),r={innerWidth:t.fn.innerWidth,innerHeight:t.fn.innerHeight,outerWidth:t.fn.outerWidth,outerHeight:t.fn.outerHeight};t.fn["inner"+s]=function(i){return i===e?r["inner"+s].call(this):this.each(function(){t(this).css(a,n(this,i)+"px")})},t.fn["outer"+s]=function(e,i){return"number"!=typeof e?r["outer"+s].call(this,e):this.each(function(){t(this).css(a,n(this,e,!0,i)+"px")})}}),t.fn.addBack||(t.fn.addBack=function(t){return this.add(null==t?this.prevObject:this.prevObject.filter(t))}),t("<a>").data("a-b","a").removeData("a-b").data("a-b")&&(t.fn.removeData=function(e){return function(i){return arguments.length?e.call(this,t.camelCase(i)):e.call(this)}}(t.fn.removeData)),t.ui.ie=!!/msie [\w.]+/.exec(navigator.userAgent.toLowerCase()),t.support.selectstart="onselectstart"in document.createElement("div"),t.fn.extend({disableSelection:function(){return this.bind((t.support.selectstart?"selectstart":"mousedown")+".ui-disableSelection",function(t){t.preventDefault()})},enableSelection:function(){return this.unbind(".ui-disableSelection")}}),t.extend(t.ui,{plugin:{add:function(e,i,s){var n,o=t.ui[e].prototype;for(n in s)o.plugins[n]=o.plugins[n]||[],o.plugins[n].push([i,s[n]])},call:function(t,e,i){var s,n=t.plugins[e];if(n&&t.element[0].parentNode&&11!==t.element[0].parentNode.nodeType)for(s=0;n.length>s;s++)t.options[n[s][0]]&&n[s][1].apply(t.element,i)}},hasScroll:function(e,i){if("hidden"===t(e).css("overflow"))return!1;var s=i&&"left"===i?"scrollLeft":"scrollTop",n=!1;return e[s]>0?!0:(e[s]=1,n=e[s]>0,e[s]=0,n)}})})(jQuery),function(t,e){var i=0,s=Array.prototype.slice,n=t.cleanData;t.cleanData=function(e){for(var i,s=0;null!=(i=e[s]);s++)try{t(i).triggerHandler("remove")}catch(o){}n(e)},t.widget=function(i,s,n){var o,a,r,h,l={},c=i.split(".")[0];i=i.split(".")[1],o=c+"-"+i,n||(n=s,s=t.Widget),t.expr[":"][o.toLowerCase()]=function(e){return!!t.data(e,o)},t[c]=t[c]||{},a=t[c][i],r=t[c][i]=function(t,i){return this._createWidget?(arguments.length&&this._createWidget(t,i),e):new r(t,i)},t.extend(r,a,{version:n.version,_proto:t.extend({},n),_childConstructors:[]}),h=new s,h.options=t.widget.extend({},h.options),t.each(n,function(i,n){return t.isFunction(n)?(l[i]=function(){var t=function(){return s.prototype[i].apply(this,arguments)},e=function(t){return s.prototype[i].apply(this,t)};return function(){var i,s=this._super,o=this._superApply;return this._super=t,this._superApply=e,i=n.apply(this,arguments),this._super=s,this._superApply=o,i}}(),e):(l[i]=n,e)}),r.prototype=t.widget.extend(h,{widgetEventPrefix:a?h.widgetEventPrefix||i:i},l,{constructor:r,namespace:c,widgetName:i,widgetFullName:o}),a?(t.each(a._childConstructors,function(e,i){var s=i.prototype;t.widget(s.namespace+"."+s.widgetName,r,i._proto)}),delete a._childConstructors):s._childConstructors.push(r),t.widget.bridge(i,r)},t.widget.extend=function(i){for(var n,o,a=s.call(arguments,1),r=0,h=a.length;h>r;r++)for(n in a[r])o=a[r][n],a[r].hasOwnProperty(n)&&o!==e&&(i[n]=t.isPlainObject(o)?t.isPlainObject(i[n])?t.widget.extend({},i[n],o):t.widget.extend({},o):o);return i},t.widget.bridge=function(i,n){var o=n.prototype.widgetFullName||i;t.fn[i]=function(a){var r="string"==typeof a,h=s.call(arguments,1),l=this;return a=!r&&h.length?t.widget.extend.apply(null,[a].concat(h)):a,r?this.each(function(){var s,n=t.data(this,o);return n?t.isFunction(n[a])&&"_"!==a.charAt(0)?(s=n[a].apply(n,h),s!==n&&s!==e?(l=s&&s.jquery?l.pushStack(s.get()):s,!1):e):t.error("no such method '"+a+"' for "+i+" widget instance"):t.error("cannot call methods on "+i+" prior to initialization; "+"attempted to call method '"+a+"'")}):this.each(function(){var e=t.data(this,o);e?e.option(a||{})._init():t.data(this,o,new n(a,this))}),l}},t.Widget=function(){},t.Widget._childConstructors=[],t.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",defaultElement:"<div>",options:{disabled:!1,create:null},_createWidget:function(e,s){s=t(s||this.defaultElement||this)[0],this.element=t(s),this.uuid=i++,this.eventNamespace="."+this.widgetName+this.uuid,this.options=t.widget.extend({},this.options,this._getCreateOptions(),e),this.bindings=t(),this.hoverable=t(),this.focusable=t(),s!==this&&(t.data(s,this.widgetFullName,this),this._on(!0,this.element,{remove:function(t){t.target===s&&this.destroy()}}),this.document=t(s.style?s.ownerDocument:s.document||s),this.window=t(this.document[0].defaultView||this.document[0].parentWindow)),this._create(),this._trigger("create",null,this._getCreateEventData()),this._init()},_getCreateOptions:t.noop,_getCreateEventData:t.noop,_create:t.noop,_init:t.noop,destroy:function(){this._destroy(),this.element.unbind(this.eventNamespace).removeData(this.widgetName).removeData(this.widgetFullName).removeData(t.camelCase(this.widgetFullName)),this.widget().unbind(this.eventNamespace).removeAttr("aria-disabled").removeClass(this.widgetFullName+"-disabled "+"ui-state-disabled"),this.bindings.unbind(this.eventNamespace),this.hoverable.removeClass("ui-state-hover"),this.focusable.removeClass("ui-state-focus")},_destroy:t.noop,widget:function(){return this.element},option:function(i,s){var n,o,a,r=i;if(0===arguments.length)return t.widget.extend({},this.options);if("string"==typeof i)if(r={},n=i.split("."),i=n.shift(),n.length){for(o=r[i]=t.widget.extend({},this.options[i]),a=0;n.length-1>a;a++)o[n[a]]=o[n[a]]||{},o=o[n[a]];if(i=n.pop(),1===arguments.length)return o[i]===e?null:o[i];o[i]=s}else{if(1===arguments.length)return this.options[i]===e?null:this.options[i];r[i]=s}return this._setOptions(r),this},_setOptions:function(t){var e;for(e in t)this._setOption(e,t[e]);return this},_setOption:function(t,e){return this.options[t]=e,"disabled"===t&&(this.widget().toggleClass(this.widgetFullName+"-disabled ui-state-disabled",!!e).attr("aria-disabled",e),this.hoverable.removeClass("ui-state-hover"),this.focusable.removeClass("ui-state-focus")),this},enable:function(){return this._setOption("disabled",!1)},disable:function(){return this._setOption("disabled",!0)},_on:function(i,s,n){var o,a=this;"boolean"!=typeof i&&(n=s,s=i,i=!1),n?(s=o=t(s),this.bindings=this.bindings.add(s)):(n=s,s=this.element,o=this.widget()),t.each(n,function(n,r){function h(){return i||a.options.disabled!==!0&&!t(this).hasClass("ui-state-disabled")?("string"==typeof r?a[r]:r).apply(a,arguments):e}"string"!=typeof r&&(h.guid=r.guid=r.guid||h.guid||t.guid++);var l=n.match(/^(\w+)\s*(.*)$/),c=l[1]+a.eventNamespace,u=l[2];u?o.delegate(u,c,h):s.bind(c,h)})},_off:function(t,e){e=(e||"").split(" ").join(this.eventNamespace+" ")+this.eventNamespace,t.unbind(e).undelegate(e)},_delay:function(t,e){function i(){return("string"==typeof t?s[t]:t).apply(s,arguments)}var s=this;return setTimeout(i,e||0)},_hoverable:function(e){this.hoverable=this.hoverable.add(e),this._on(e,{mouseenter:function(e){t(e.currentTarget).addClass("ui-state-hover")},mouseleave:function(e){t(e.currentTarget).removeClass("ui-state-hover")}})},_focusable:function(e){this.focusable=this.focusable.add(e),this._on(e,{focusin:function(e){t(e.currentTarget).addClass("ui-state-focus")},focusout:function(e){t(e.currentTarget).removeClass("ui-state-focus")}})},_trigger:function(e,i,s){var n,o,a=this.options[e];if(s=s||{},i=t.Event(i),i.type=(e===this.widgetEventPrefix?e:this.widgetEventPrefix+e).toLowerCase(),i.target=this.element[0],o=i.originalEvent)for(n in o)n in i||(i[n]=o[n]);return this.element.trigger(i,s),!(t.isFunction(a)&&a.apply(this.element[0],[i].concat(s))===!1||i.isDefaultPrevented())}},t.each({show:"fadeIn",hide:"fadeOut"},function(e,i){t.Widget.prototype["_"+e]=function(s,n,o){"string"==typeof n&&(n={effect:n});var a,r=n?n===!0||"number"==typeof n?i:n.effect||i:e;n=n||{},"number"==typeof n&&(n={duration:n}),a=!t.isEmptyObject(n),n.complete=o,n.delay&&s.delay(n.delay),a&&t.effects&&t.effects.effect[r]?s[e](n):r!==e&&s[r]?s[r](n.duration,n.easing,o):s.queue(function(i){t(this)[e](),o&&o.call(s[0]),i()})}})}(jQuery),function(t){var e=!1;t(document).mouseup(function(){e=!1}),t.widget("ui.mouse",{version:"1.10.4",options:{cancel:"input,textarea,button,select,option",distance:1,delay:0},_mouseInit:function(){var e=this;this.element.bind("mousedown."+this.widgetName,function(t){return e._mouseDown(t)}).bind("click."+this.widgetName,function(i){return!0===t.data(i.target,e.widgetName+".preventClickEvent")?(t.removeData(i.target,e.widgetName+".preventClickEvent"),i.stopImmediatePropagation(),!1):undefined}),this.started=!1},_mouseDestroy:function(){this.element.unbind("."+this.widgetName),this._mouseMoveDelegate&&t(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate)},_mouseDown:function(i){if(!e){this._mouseStarted&&this._mouseUp(i),this._mouseDownEvent=i;var s=this,n=1===i.which,o="string"==typeof this.options.cancel&&i.target.nodeName?t(i.target).closest(this.options.cancel).length:!1;return n&&!o&&this._mouseCapture(i)?(this.mouseDelayMet=!this.options.delay,this.mouseDelayMet||(this._mouseDelayTimer=setTimeout(function(){s.mouseDelayMet=!0},this.options.delay)),this._mouseDistanceMet(i)&&this._mouseDelayMet(i)&&(this._mouseStarted=this._mouseStart(i)!==!1,!this._mouseStarted)?(i.preventDefault(),!0):(!0===t.data(i.target,this.widgetName+".preventClickEvent")&&t.removeData(i.target,this.widgetName+".preventClickEvent"),this._mouseMoveDelegate=function(t){return s._mouseMove(t)},this._mouseUpDelegate=function(t){return s._mouseUp(t)},t(document).bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate),i.preventDefault(),e=!0,!0)):!0}},_mouseMove:function(e){return t.ui.ie&&(!document.documentMode||9>document.documentMode)&&!e.button?this._mouseUp(e):this._mouseStarted?(this._mouseDrag(e),e.preventDefault()):(this._mouseDistanceMet(e)&&this._mouseDelayMet(e)&&(this._mouseStarted=this._mouseStart(this._mouseDownEvent,e)!==!1,this._mouseStarted?this._mouseDrag(e):this._mouseUp(e)),!this._mouseStarted)},_mouseUp:function(e){return t(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate),this._mouseStarted&&(this._mouseStarted=!1,e.target===this._mouseDownEvent.target&&t.data(e.target,this.widgetName+".preventClickEvent",!0),this._mouseStop(e)),!1},_mouseDistanceMet:function(t){return Math.max(Math.abs(this._mouseDownEvent.pageX-t.pageX),Math.abs(this._mouseDownEvent.pageY-t.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return!0}})}(jQuery),function(t){t.widget("ui.draggable",t.ui.mouse,{version:"1.10.4",widgetEventPrefix:"drag",options:{addClasses:!0,appendTo:"parent",axis:!1,connectToSortable:!1,containment:!1,cursor:"auto",cursorAt:!1,grid:!1,handle:!1,helper:"original",iframeFix:!1,opacity:!1,refreshPositions:!1,revert:!1,revertDuration:500,scope:"default",scroll:!0,scrollSensitivity:20,scrollSpeed:20,snap:!1,snapMode:"both",snapTolerance:20,stack:!1,zIndex:!1,drag:null,start:null,stop:null},_create:function(){"original"!==this.options.helper||/^(?:r|a|f)/.test(this.element.css("position"))||(this.element[0].style.position="relative"),this.options.addClasses&&this.element.addClass("ui-draggable"),this.options.disabled&&this.element.addClass("ui-draggable-disabled"),this._mouseInit()},_destroy:function(){this.element.removeClass("ui-draggable ui-draggable-dragging ui-draggable-disabled"),this._mouseDestroy()},_mouseCapture:function(e){var i=this.options;return this.helper||i.disabled||t(e.target).closest(".ui-resizable-handle").length>0?!1:(this.handle=this._getHandle(e),this.handle?(t(i.iframeFix===!0?"iframe":i.iframeFix).each(function(){t("<div class='ui-draggable-iframeFix' style='background: #fff;'></div>").css({width:this.offsetWidth+"px",height:this.offsetHeight+"px",position:"absolute",opacity:"0.001",zIndex:1e3}).css(t(this).offset()).appendTo("body")}),!0):!1)},_mouseStart:function(e){var i=this.options;return this.helper=this._createHelper(e),this.helper.addClass("ui-draggable-dragging"),this._cacheHelperProportions(),t.ui.ddmanager&&(t.ui.ddmanager.current=this),this._cacheMargins(),this.cssPosition=this.helper.css("position"),this.scrollParent=this.helper.scrollParent(),this.offsetParent=this.helper.offsetParent(),this.offsetParentCssPosition=this.offsetParent.css("position"),this.offset=this.positionAbs=this.element.offset(),this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left},this.offset.scroll=!1,t.extend(this.offset,{click:{left:e.pageX-this.offset.left,top:e.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()}),this.originalPosition=this.position=this._generatePosition(e),this.originalPageX=e.pageX,this.originalPageY=e.pageY,i.cursorAt&&this._adjustOffsetFromHelper(i.cursorAt),this._setContainment(),this._trigger("start",e)===!1?(this._clear(),!1):(this._cacheHelperProportions(),t.ui.ddmanager&&!i.dropBehaviour&&t.ui.ddmanager.prepareOffsets(this,e),this._mouseDrag(e,!0),t.ui.ddmanager&&t.ui.ddmanager.dragStart(this,e),!0)},_mouseDrag:function(e,i){if("fixed"===this.offsetParentCssPosition&&(this.offset.parent=this._getParentOffset()),this.position=this._generatePosition(e),this.positionAbs=this._convertPositionTo("absolute"),!i){var s=this._uiHash();if(this._trigger("drag",e,s)===!1)return this._mouseUp({}),!1;this.position=s.position}return this.options.axis&&"y"===this.options.axis||(this.helper[0].style.left=this.position.left+"px"),this.options.axis&&"x"===this.options.axis||(this.helper[0].style.top=this.position.top+"px"),t.ui.ddmanager&&t.ui.ddmanager.drag(this,e),!1},_mouseStop:function(e){var i=this,s=!1;return t.ui.ddmanager&&!this.options.dropBehaviour&&(s=t.ui.ddmanager.drop(this,e)),this.dropped&&(s=this.dropped,this.dropped=!1),"original"!==this.options.helper||t.contains(this.element[0].ownerDocument,this.element[0])?("invalid"===this.options.revert&&!s||"valid"===this.options.revert&&s||this.options.revert===!0||t.isFunction(this.options.revert)&&this.options.revert.call(this.element,s)?t(this.helper).animate(this.originalPosition,parseInt(this.options.revertDuration,10),function(){i._trigger("stop",e)!==!1&&i._clear()}):this._trigger("stop",e)!==!1&&this._clear(),!1):!1},_mouseUp:function(e){return t("div.ui-draggable-iframeFix").each(function(){this.parentNode.removeChild(this)}),t.ui.ddmanager&&t.ui.ddmanager.dragStop(this,e),t.ui.mouse.prototype._mouseUp.call(this,e)},cancel:function(){return this.helper.is(".ui-draggable-dragging")?this._mouseUp({}):this._clear(),this},_getHandle:function(e){return this.options.handle?!!t(e.target).closest(this.element.find(this.options.handle)).length:!0},_createHelper:function(e){var i=this.options,s=t.isFunction(i.helper)?t(i.helper.apply(this.element[0],[e])):"clone"===i.helper?this.element.clone().removeAttr("id"):this.element;return s.parents("body").length||s.appendTo("parent"===i.appendTo?this.element[0].parentNode:i.appendTo),s[0]===this.element[0]||/(fixed|absolute)/.test(s.css("position"))||s.css("position","absolute"),s},_adjustOffsetFromHelper:function(e){"string"==typeof e&&(e=e.split(" ")),t.isArray(e)&&(e={left:+e[0],top:+e[1]||0}),"left"in e&&(this.offset.click.left=e.left+this.margins.left),"right"in e&&(this.offset.click.left=this.helperProportions.width-e.right+this.margins.left),"top"in e&&(this.offset.click.top=e.top+this.margins.top),"bottom"in e&&(this.offset.click.top=this.helperProportions.height-e.bottom+this.margins.top)},_getParentOffset:function(){var e=this.offsetParent.offset();return"absolute"===this.cssPosition&&this.scrollParent[0]!==document&&t.contains(this.scrollParent[0],this.offsetParent[0])&&(e.left+=this.scrollParent.scrollLeft(),e.top+=this.scrollParent.scrollTop()),(this.offsetParent[0]===document.body||this.offsetParent[0].tagName&&"html"===this.offsetParent[0].tagName.toLowerCase()&&t.ui.ie)&&(e={top:0,left:0}),{top:e.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:e.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if("relative"===this.cssPosition){var t=this.element.position();return{top:t.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:t.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.element.css("marginLeft"),10)||0,top:parseInt(this.element.css("marginTop"),10)||0,right:parseInt(this.element.css("marginRight"),10)||0,bottom:parseInt(this.element.css("marginBottom"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var e,i,s,n=this.options;return n.containment?"window"===n.containment?(this.containment=[t(window).scrollLeft()-this.offset.relative.left-this.offset.parent.left,t(window).scrollTop()-this.offset.relative.top-this.offset.parent.top,t(window).scrollLeft()+t(window).width()-this.helperProportions.width-this.margins.left,t(window).scrollTop()+(t(window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top],undefined):"document"===n.containment?(this.containment=[0,0,t(document).width()-this.helperProportions.width-this.margins.left,(t(document).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top],undefined):n.containment.constructor===Array?(this.containment=n.containment,undefined):("parent"===n.containment&&(n.containment=this.helper[0].parentNode),i=t(n.containment),s=i[0],s&&(e="hidden"!==i.css("overflow"),this.containment=[(parseInt(i.css("borderLeftWidth"),10)||0)+(parseInt(i.css("paddingLeft"),10)||0),(parseInt(i.css("borderTopWidth"),10)||0)+(parseInt(i.css("paddingTop"),10)||0),(e?Math.max(s.scrollWidth,s.offsetWidth):s.offsetWidth)-(parseInt(i.css("borderRightWidth"),10)||0)-(parseInt(i.css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left-this.margins.right,(e?Math.max(s.scrollHeight,s.offsetHeight):s.offsetHeight)-(parseInt(i.css("borderBottomWidth"),10)||0)-(parseInt(i.css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top-this.margins.bottom],this.relative_container=i),undefined):(this.containment=null,undefined)},_convertPositionTo:function(e,i){i||(i=this.position);var s="absolute"===e?1:-1,n="absolute"!==this.cssPosition||this.scrollParent[0]!==document&&t.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent;return this.offset.scroll||(this.offset.scroll={top:n.scrollTop(),left:n.scrollLeft()}),{top:i.top+this.offset.relative.top*s+this.offset.parent.top*s-("fixed"===this.cssPosition?-this.scrollParent.scrollTop():this.offset.scroll.top)*s,left:i.left+this.offset.relative.left*s+this.offset.parent.left*s-("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():this.offset.scroll.left)*s}},_generatePosition:function(e){var i,s,n,o,a=this.options,r="absolute"!==this.cssPosition||this.scrollParent[0]!==document&&t.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,h=e.pageX,l=e.pageY;return this.offset.scroll||(this.offset.scroll={top:r.scrollTop(),left:r.scrollLeft()}),this.originalPosition&&(this.containment&&(this.relative_container?(s=this.relative_container.offset(),i=[this.containment[0]+s.left,this.containment[1]+s.top,this.containment[2]+s.left,this.containment[3]+s.top]):i=this.containment,e.pageX-this.offset.click.left<i[0]&&(h=i[0]+this.offset.click.left),e.pageY-this.offset.click.top<i[1]&&(l=i[1]+this.offset.click.top),e.pageX-this.offset.click.left>i[2]&&(h=i[2]+this.offset.click.left),e.pageY-this.offset.click.top>i[3]&&(l=i[3]+this.offset.click.top)),a.grid&&(n=a.grid[1]?this.originalPageY+Math.round((l-this.originalPageY)/a.grid[1])*a.grid[1]:this.originalPageY,l=i?n-this.offset.click.top>=i[1]||n-this.offset.click.top>i[3]?n:n-this.offset.click.top>=i[1]?n-a.grid[1]:n+a.grid[1]:n,o=a.grid[0]?this.originalPageX+Math.round((h-this.originalPageX)/a.grid[0])*a.grid[0]:this.originalPageX,h=i?o-this.offset.click.left>=i[0]||o-this.offset.click.left>i[2]?o:o-this.offset.click.left>=i[0]?o-a.grid[0]:o+a.grid[0]:o)),{top:l-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+("fixed"===this.cssPosition?-this.scrollParent.scrollTop():this.offset.scroll.top),left:h-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():this.offset.scroll.left)}},_clear:function(){this.helper.removeClass("ui-draggable-dragging"),this.helper[0]===this.element[0]||this.cancelHelperRemoval||this.helper.remove(),this.helper=null,this.cancelHelperRemoval=!1},_trigger:function(e,i,s){return s=s||this._uiHash(),t.ui.plugin.call(this,e,[i,s]),"drag"===e&&(this.positionAbs=this._convertPositionTo("absolute")),t.Widget.prototype._trigger.call(this,e,i,s)},plugins:{},_uiHash:function(){return{helper:this.helper,position:this.position,originalPosition:this.originalPosition,offset:this.positionAbs}}}),t.ui.plugin.add("draggable","connectToSortable",{start:function(e,i){var s=t(this).data("ui-draggable"),n=s.options,o=t.extend({},i,{item:s.element});s.sortables=[],t(n.connectToSortable).each(function(){var i=t.data(this,"ui-sortable");i&&!i.options.disabled&&(s.sortables.push({instance:i,shouldRevert:i.options.revert}),i.refreshPositions(),i._trigger("activate",e,o))})},stop:function(e,i){var s=t(this).data("ui-draggable"),n=t.extend({},i,{item:s.element});t.each(s.sortables,function(){this.instance.isOver?(this.instance.isOver=0,s.cancelHelperRemoval=!0,this.instance.cancelHelperRemoval=!1,this.shouldRevert&&(this.instance.options.revert=this.shouldRevert),this.instance._mouseStop(e),this.instance.options.helper=this.instance.options._helper,"original"===s.options.helper&&this.instance.currentItem.css({top:"auto",left:"auto"})):(this.instance.cancelHelperRemoval=!1,this.instance._trigger("deactivate",e,n))})},drag:function(e,i){var s=t(this).data("ui-draggable"),n=this;t.each(s.sortables,function(){var o=!1,a=this;this.instance.positionAbs=s.positionAbs,this.instance.helperProportions=s.helperProportions,this.instance.offset.click=s.offset.click,this.instance._intersectsWith(this.instance.containerCache)&&(o=!0,t.each(s.sortables,function(){return this.instance.positionAbs=s.positionAbs,this.instance.helperProportions=s.helperProportions,this.instance.offset.click=s.offset.click,this!==a&&this.instance._intersectsWith(this.instance.containerCache)&&t.contains(a.instance.element[0],this.instance.element[0])&&(o=!1),o})),o?(this.instance.isOver||(this.instance.isOver=1,this.instance.currentItem=t(n).clone().removeAttr("id").appendTo(this.instance.element).data("ui-sortable-item",!0),this.instance.options._helper=this.instance.options.helper,this.instance.options.helper=function(){return i.helper[0]},e.target=this.instance.currentItem[0],this.instance._mouseCapture(e,!0),this.instance._mouseStart(e,!0,!0),this.instance.offset.click.top=s.offset.click.top,this.instance.offset.click.left=s.offset.click.left,this.instance.offset.parent.left-=s.offset.parent.left-this.instance.offset.parent.left,this.instance.offset.parent.top-=s.offset.parent.top-this.instance.offset.parent.top,s._trigger("toSortable",e),s.dropped=this.instance.element,s.currentItem=s.element,this.instance.fromOutside=s),this.instance.currentItem&&this.instance._mouseDrag(e)):this.instance.isOver&&(this.instance.isOver=0,this.instance.cancelHelperRemoval=!0,this.instance.options.revert=!1,this.instance._trigger("out",e,this.instance._uiHash(this.instance)),this.instance._mouseStop(e,!0),this.instance.options.helper=this.instance.options._helper,this.instance.currentItem.remove(),this.instance.placeholder&&this.instance.placeholder.remove(),s._trigger("fromSortable",e),s.dropped=!1)})}}),t.ui.plugin.add("draggable","cursor",{start:function(){var e=t("body"),i=t(this).data("ui-draggable").options;e.css("cursor")&&(i._cursor=e.css("cursor")),e.css("cursor",i.cursor)},stop:function(){var e=t(this).data("ui-draggable").options;e._cursor&&t("body").css("cursor",e._cursor)}}),t.ui.plugin.add("draggable","opacity",{start:function(e,i){var s=t(i.helper),n=t(this).data("ui-draggable").options;s.css("opacity")&&(n._opacity=s.css("opacity")),s.css("opacity",n.opacity)},stop:function(e,i){var s=t(this).data("ui-draggable").options;s._opacity&&t(i.helper).css("opacity",s._opacity)}}),t.ui.plugin.add("draggable","scroll",{start:function(){var e=t(this).data("ui-draggable");e.scrollParent[0]!==document&&"HTML"!==e.scrollParent[0].tagName&&(e.overflowOffset=e.scrollParent.offset())},drag:function(e){var i=t(this).data("ui-draggable"),s=i.options,n=!1;i.scrollParent[0]!==document&&"HTML"!==i.scrollParent[0].tagName?(s.axis&&"x"===s.axis||(i.overflowOffset.top+i.scrollParent[0].offsetHeight-e.pageY<s.scrollSensitivity?i.scrollParent[0].scrollTop=n=i.scrollParent[0].scrollTop+s.scrollSpeed:e.pageY-i.overflowOffset.top<s.scrollSensitivity&&(i.scrollParent[0].scrollTop=n=i.scrollParent[0].scrollTop-s.scrollSpeed)),s.axis&&"y"===s.axis||(i.overflowOffset.left+i.scrollParent[0].offsetWidth-e.pageX<s.scrollSensitivity?i.scrollParent[0].scrollLeft=n=i.scrollParent[0].scrollLeft+s.scrollSpeed:e.pageX-i.overflowOffset.left<s.scrollSensitivity&&(i.scrollParent[0].scrollLeft=n=i.scrollParent[0].scrollLeft-s.scrollSpeed))):(s.axis&&"x"===s.axis||(e.pageY-t(document).scrollTop()<s.scrollSensitivity?n=t(document).scrollTop(t(document).scrollTop()-s.scrollSpeed):t(window).height()-(e.pageY-t(document).scrollTop())<s.scrollSensitivity&&(n=t(document).scrollTop(t(document).scrollTop()+s.scrollSpeed))),s.axis&&"y"===s.axis||(e.pageX-t(document).scrollLeft()<s.scrollSensitivity?n=t(document).scrollLeft(t(document).scrollLeft()-s.scrollSpeed):t(window).width()-(e.pageX-t(document).scrollLeft())<s.scrollSensitivity&&(n=t(document).scrollLeft(t(document).scrollLeft()+s.scrollSpeed)))),n!==!1&&t.ui.ddmanager&&!s.dropBehaviour&&t.ui.ddmanager.prepareOffsets(i,e)}}),t.ui.plugin.add("draggable","snap",{start:function(){var e=t(this).data("ui-draggable"),i=e.options;e.snapElements=[],t(i.snap.constructor!==String?i.snap.items||":data(ui-draggable)":i.snap).each(function(){var i=t(this),s=i.offset();this!==e.element[0]&&e.snapElements.push({item:this,width:i.outerWidth(),height:i.outerHeight(),top:s.top,left:s.left})})},drag:function(e,i){var s,n,o,a,r,h,l,c,u,d,p=t(this).data("ui-draggable"),f=p.options,g=f.snapTolerance,m=i.offset.left,v=m+p.helperProportions.width,_=i.offset.top,b=_+p.helperProportions.height;for(u=p.snapElements.length-1;u>=0;u--)r=p.snapElements[u].left,h=r+p.snapElements[u].width,l=p.snapElements[u].top,c=l+p.snapElements[u].height,r-g>v||m>h+g||l-g>b||_>c+g||!t.contains(p.snapElements[u].item.ownerDocument,p.snapElements[u].item)?(p.snapElements[u].snapping&&p.options.snap.release&&p.options.snap.release.call(p.element,e,t.extend(p._uiHash(),{snapItem:p.snapElements[u].item})),p.snapElements[u].snapping=!1):("inner"!==f.snapMode&&(s=g>=Math.abs(l-b),n=g>=Math.abs(c-_),o=g>=Math.abs(r-v),a=g>=Math.abs(h-m),s&&(i.position.top=p._convertPositionTo("relative",{top:l-p.helperProportions.height,left:0}).top-p.margins.top),n&&(i.position.top=p._convertPositionTo("relative",{top:c,left:0}).top-p.margins.top),o&&(i.position.left=p._convertPositionTo("relative",{top:0,left:r-p.helperProportions.width}).left-p.margins.left),a&&(i.position.left=p._convertPositionTo("relative",{top:0,left:h}).left-p.margins.left)),d=s||n||o||a,"outer"!==f.snapMode&&(s=g>=Math.abs(l-_),n=g>=Math.abs(c-b),o=g>=Math.abs(r-m),a=g>=Math.abs(h-v),s&&(i.position.top=p._convertPositionTo("relative",{top:l,left:0}).top-p.margins.top),n&&(i.position.top=p._convertPositionTo("relative",{top:c-p.helperProportions.height,left:0}).top-p.margins.top),o&&(i.position.left=p._convertPositionTo("relative",{top:0,left:r}).left-p.margins.left),a&&(i.position.left=p._convertPositionTo("relative",{top:0,left:h-p.helperProportions.width}).left-p.margins.left)),!p.snapElements[u].snapping&&(s||n||o||a||d)&&p.options.snap.snap&&p.options.snap.snap.call(p.element,e,t.extend(p._uiHash(),{snapItem:p.snapElements[u].item})),p.snapElements[u].snapping=s||n||o||a||d)}}),t.ui.plugin.add("draggable","stack",{start:function(){var e,i=this.data("ui-draggable").options,s=t.makeArray(t(i.stack)).sort(function(e,i){return(parseInt(t(e).css("zIndex"),10)||0)-(parseInt(t(i).css("zIndex"),10)||0)});s.length&&(e=parseInt(t(s[0]).css("zIndex"),10)||0,t(s).each(function(i){t(this).css("zIndex",e+i)}),this.css("zIndex",e+s.length))}}),t.ui.plugin.add("draggable","zIndex",{start:function(e,i){var s=t(i.helper),n=t(this).data("ui-draggable").options;s.css("zIndex")&&(n._zIndex=s.css("zIndex")),s.css("zIndex",n.zIndex)},stop:function(e,i){var s=t(this).data("ui-draggable").options;s._zIndex&&t(i.helper).css("zIndex",s._zIndex)}})}(jQuery),function(t){function e(t,e,i){return t>e&&e+i>t}t.widget("ui.droppable",{version:"1.10.4",widgetEventPrefix:"drop",options:{accept:"*",activeClass:!1,addClasses:!0,greedy:!1,hoverClass:!1,scope:"default",tolerance:"intersect",activate:null,deactivate:null,drop:null,out:null,over:null},_create:function(){var e,i=this.options,s=i.accept;
+this.isover=!1,this.isout=!0,this.accept=t.isFunction(s)?s:function(t){return t.is(s)},this.proportions=function(){return arguments.length?(e=arguments[0],undefined):e?e:e={width:this.element[0].offsetWidth,height:this.element[0].offsetHeight}},t.ui.ddmanager.droppables[i.scope]=t.ui.ddmanager.droppables[i.scope]||[],t.ui.ddmanager.droppables[i.scope].push(this),i.addClasses&&this.element.addClass("ui-droppable")},_destroy:function(){for(var e=0,i=t.ui.ddmanager.droppables[this.options.scope];i.length>e;e++)i[e]===this&&i.splice(e,1);this.element.removeClass("ui-droppable ui-droppable-disabled")},_setOption:function(e,i){"accept"===e&&(this.accept=t.isFunction(i)?i:function(t){return t.is(i)}),t.Widget.prototype._setOption.apply(this,arguments)},_activate:function(e){var i=t.ui.ddmanager.current;this.options.activeClass&&this.element.addClass(this.options.activeClass),i&&this._trigger("activate",e,this.ui(i))},_deactivate:function(e){var i=t.ui.ddmanager.current;this.options.activeClass&&this.element.removeClass(this.options.activeClass),i&&this._trigger("deactivate",e,this.ui(i))},_over:function(e){var i=t.ui.ddmanager.current;i&&(i.currentItem||i.element)[0]!==this.element[0]&&this.accept.call(this.element[0],i.currentItem||i.element)&&(this.options.hoverClass&&this.element.addClass(this.options.hoverClass),this._trigger("over",e,this.ui(i)))},_out:function(e){var i=t.ui.ddmanager.current;i&&(i.currentItem||i.element)[0]!==this.element[0]&&this.accept.call(this.element[0],i.currentItem||i.element)&&(this.options.hoverClass&&this.element.removeClass(this.options.hoverClass),this._trigger("out",e,this.ui(i)))},_drop:function(e,i){var s=i||t.ui.ddmanager.current,n=!1;return s&&(s.currentItem||s.element)[0]!==this.element[0]?(this.element.find(":data(ui-droppable)").not(".ui-draggable-dragging").each(function(){var e=t.data(this,"ui-droppable");return e.options.greedy&&!e.options.disabled&&e.options.scope===s.options.scope&&e.accept.call(e.element[0],s.currentItem||s.element)&&t.ui.intersect(s,t.extend(e,{offset:e.element.offset()}),e.options.tolerance)?(n=!0,!1):undefined}),n?!1:this.accept.call(this.element[0],s.currentItem||s.element)?(this.options.activeClass&&this.element.removeClass(this.options.activeClass),this.options.hoverClass&&this.element.removeClass(this.options.hoverClass),this._trigger("drop",e,this.ui(s)),this.element):!1):!1},ui:function(t){return{draggable:t.currentItem||t.element,helper:t.helper,position:t.position,offset:t.positionAbs}}}),t.ui.intersect=function(t,i,s){if(!i.offset)return!1;var n,o,a=(t.positionAbs||t.position.absolute).left,r=(t.positionAbs||t.position.absolute).top,h=a+t.helperProportions.width,l=r+t.helperProportions.height,c=i.offset.left,u=i.offset.top,d=c+i.proportions().width,p=u+i.proportions().height;switch(s){case"fit":return a>=c&&d>=h&&r>=u&&p>=l;case"intersect":return a+t.helperProportions.width/2>c&&d>h-t.helperProportions.width/2&&r+t.helperProportions.height/2>u&&p>l-t.helperProportions.height/2;case"pointer":return n=(t.positionAbs||t.position.absolute).left+(t.clickOffset||t.offset.click).left,o=(t.positionAbs||t.position.absolute).top+(t.clickOffset||t.offset.click).top,e(o,u,i.proportions().height)&&e(n,c,i.proportions().width);case"touch":return(r>=u&&p>=r||l>=u&&p>=l||u>r&&l>p)&&(a>=c&&d>=a||h>=c&&d>=h||c>a&&h>d);default:return!1}},t.ui.ddmanager={current:null,droppables:{"default":[]},prepareOffsets:function(e,i){var s,n,o=t.ui.ddmanager.droppables[e.options.scope]||[],a=i?i.type:null,r=(e.currentItem||e.element).find(":data(ui-droppable)").addBack();t:for(s=0;o.length>s;s++)if(!(o[s].options.disabled||e&&!o[s].accept.call(o[s].element[0],e.currentItem||e.element))){for(n=0;r.length>n;n++)if(r[n]===o[s].element[0]){o[s].proportions().height=0;continue t}o[s].visible="none"!==o[s].element.css("display"),o[s].visible&&("mousedown"===a&&o[s]._activate.call(o[s],i),o[s].offset=o[s].element.offset(),o[s].proportions({width:o[s].element[0].offsetWidth,height:o[s].element[0].offsetHeight}))}},drop:function(e,i){var s=!1;return t.each((t.ui.ddmanager.droppables[e.options.scope]||[]).slice(),function(){this.options&&(!this.options.disabled&&this.visible&&t.ui.intersect(e,this,this.options.tolerance)&&(s=this._drop.call(this,i)||s),!this.options.disabled&&this.visible&&this.accept.call(this.element[0],e.currentItem||e.element)&&(this.isout=!0,this.isover=!1,this._deactivate.call(this,i)))}),s},dragStart:function(e,i){e.element.parentsUntil("body").bind("scroll.droppable",function(){e.options.refreshPositions||t.ui.ddmanager.prepareOffsets(e,i)})},drag:function(e,i){e.options.refreshPositions&&t.ui.ddmanager.prepareOffsets(e,i),t.each(t.ui.ddmanager.droppables[e.options.scope]||[],function(){if(!this.options.disabled&&!this.greedyChild&&this.visible){var s,n,o,a=t.ui.intersect(e,this,this.options.tolerance),r=!a&&this.isover?"isout":a&&!this.isover?"isover":null;r&&(this.options.greedy&&(n=this.options.scope,o=this.element.parents(":data(ui-droppable)").filter(function(){return t.data(this,"ui-droppable").options.scope===n}),o.length&&(s=t.data(o[0],"ui-droppable"),s.greedyChild="isover"===r)),s&&"isover"===r&&(s.isover=!1,s.isout=!0,s._out.call(s,i)),this[r]=!0,this["isout"===r?"isover":"isout"]=!1,this["isover"===r?"_over":"_out"].call(this,i),s&&"isout"===r&&(s.isout=!1,s.isover=!0,s._over.call(s,i)))}})},dragStop:function(e,i){e.element.parentsUntil("body").unbind("scroll.droppable"),e.options.refreshPositions||t.ui.ddmanager.prepareOffsets(e,i)}}}(jQuery),function(t){function e(t){return parseInt(t,10)||0}function i(t){return!isNaN(parseInt(t,10))}t.widget("ui.resizable",t.ui.mouse,{version:"1.10.4",widgetEventPrefix:"resize",options:{alsoResize:!1,animate:!1,animateDuration:"slow",animateEasing:"swing",aspectRatio:!1,autoHide:!1,containment:!1,ghost:!1,grid:!1,handles:"e,s,se",helper:!1,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:90,resize:null,start:null,stop:null},_create:function(){var e,i,s,n,o,a=this,r=this.options;if(this.element.addClass("ui-resizable"),t.extend(this,{_aspectRatio:!!r.aspectRatio,aspectRatio:r.aspectRatio,originalElement:this.element,_proportionallyResizeElements:[],_helper:r.helper||r.ghost||r.animate?r.helper||"ui-resizable-helper":null}),this.element[0].nodeName.match(/canvas|textarea|input|select|button|img/i)&&(this.element.wrap(t("<div class='ui-wrapper' style='overflow: hidden;'></div>").css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),top:this.element.css("top"),left:this.element.css("left")})),this.element=this.element.parent().data("ui-resizable",this.element.data("ui-resizable")),this.elementIsWrapper=!0,this.element.css({marginLeft:this.originalElement.css("marginLeft"),marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom")}),this.originalElement.css({marginLeft:0,marginTop:0,marginRight:0,marginBottom:0}),this.originalResizeStyle=this.originalElement.css("resize"),this.originalElement.css("resize","none"),this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"})),this.originalElement.css({margin:this.originalElement.css("margin")}),this._proportionallyResize()),this.handles=r.handles||(t(".ui-resizable-handle",this.element).length?{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",nw:".ui-resizable-nw"}:"e,s,se"),this.handles.constructor===String)for("all"===this.handles&&(this.handles="n,e,s,w,se,sw,ne,nw"),e=this.handles.split(","),this.handles={},i=0;e.length>i;i++)s=t.trim(e[i]),o="ui-resizable-"+s,n=t("<div class='ui-resizable-handle "+o+"'></div>"),n.css({zIndex:r.zIndex}),"se"===s&&n.addClass("ui-icon ui-icon-gripsmall-diagonal-se"),this.handles[s]=".ui-resizable-"+s,this.element.append(n);this._renderAxis=function(e){var i,s,n,o;e=e||this.element;for(i in this.handles)this.handles[i].constructor===String&&(this.handles[i]=t(this.handles[i],this.element).show()),this.elementIsWrapper&&this.originalElement[0].nodeName.match(/textarea|input|select|button/i)&&(s=t(this.handles[i],this.element),o=/sw|ne|nw|se|n|s/.test(i)?s.outerHeight():s.outerWidth(),n=["padding",/ne|nw|n/.test(i)?"Top":/se|sw|s/.test(i)?"Bottom":/^e$/.test(i)?"Right":"Left"].join(""),e.css(n,o),this._proportionallyResize()),t(this.handles[i]).length},this._renderAxis(this.element),this._handles=t(".ui-resizable-handle",this.element).disableSelection(),this._handles.mouseover(function(){a.resizing||(this.className&&(n=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i)),a.axis=n&&n[1]?n[1]:"se")}),r.autoHide&&(this._handles.hide(),t(this.element).addClass("ui-resizable-autohide").mouseenter(function(){r.disabled||(t(this).removeClass("ui-resizable-autohide"),a._handles.show())}).mouseleave(function(){r.disabled||a.resizing||(t(this).addClass("ui-resizable-autohide"),a._handles.hide())})),this._mouseInit()},_destroy:function(){this._mouseDestroy();var e,i=function(e){t(e).removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing").removeData("resizable").removeData("ui-resizable").unbind(".resizable").find(".ui-resizable-handle").remove()};return this.elementIsWrapper&&(i(this.element),e=this.element,this.originalElement.css({position:e.css("position"),width:e.outerWidth(),height:e.outerHeight(),top:e.css("top"),left:e.css("left")}).insertAfter(e),e.remove()),this.originalElement.css("resize",this.originalResizeStyle),i(this.originalElement),this},_mouseCapture:function(e){var i,s,n=!1;for(i in this.handles)s=t(this.handles[i])[0],(s===e.target||t.contains(s,e.target))&&(n=!0);return!this.options.disabled&&n},_mouseStart:function(i){var s,n,o,a=this.options,r=this.element.position(),h=this.element;return this.resizing=!0,/absolute/.test(h.css("position"))?h.css({position:"absolute",top:h.css("top"),left:h.css("left")}):h.is(".ui-draggable")&&h.css({position:"absolute",top:r.top,left:r.left}),this._renderProxy(),s=e(this.helper.css("left")),n=e(this.helper.css("top")),a.containment&&(s+=t(a.containment).scrollLeft()||0,n+=t(a.containment).scrollTop()||0),this.offset=this.helper.offset(),this.position={left:s,top:n},this.size=this._helper?{width:this.helper.width(),height:this.helper.height()}:{width:h.width(),height:h.height()},this.originalSize=this._helper?{width:h.outerWidth(),height:h.outerHeight()}:{width:h.width(),height:h.height()},this.originalPosition={left:s,top:n},this.sizeDiff={width:h.outerWidth()-h.width(),height:h.outerHeight()-h.height()},this.originalMousePosition={left:i.pageX,top:i.pageY},this.aspectRatio="number"==typeof a.aspectRatio?a.aspectRatio:this.originalSize.width/this.originalSize.height||1,o=t(".ui-resizable-"+this.axis).css("cursor"),t("body").css("cursor","auto"===o?this.axis+"-resize":o),h.addClass("ui-resizable-resizing"),this._propagate("start",i),!0},_mouseDrag:function(e){var i,s=this.helper,n={},o=this.originalMousePosition,a=this.axis,r=this.position.top,h=this.position.left,l=this.size.width,c=this.size.height,u=e.pageX-o.left||0,d=e.pageY-o.top||0,p=this._change[a];return p?(i=p.apply(this,[e,u,d]),this._updateVirtualBoundaries(e.shiftKey),(this._aspectRatio||e.shiftKey)&&(i=this._updateRatio(i,e)),i=this._respectSize(i,e),this._updateCache(i),this._propagate("resize",e),this.position.top!==r&&(n.top=this.position.top+"px"),this.position.left!==h&&(n.left=this.position.left+"px"),this.size.width!==l&&(n.width=this.size.width+"px"),this.size.height!==c&&(n.height=this.size.height+"px"),s.css(n),!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize(),t.isEmptyObject(n)||this._trigger("resize",e,this.ui()),!1):!1},_mouseStop:function(e){this.resizing=!1;var i,s,n,o,a,r,h,l=this.options,c=this;return this._helper&&(i=this._proportionallyResizeElements,s=i.length&&/textarea/i.test(i[0].nodeName),n=s&&t.ui.hasScroll(i[0],"left")?0:c.sizeDiff.height,o=s?0:c.sizeDiff.width,a={width:c.helper.width()-o,height:c.helper.height()-n},r=parseInt(c.element.css("left"),10)+(c.position.left-c.originalPosition.left)||null,h=parseInt(c.element.css("top"),10)+(c.position.top-c.originalPosition.top)||null,l.animate||this.element.css(t.extend(a,{top:h,left:r})),c.helper.height(c.size.height),c.helper.width(c.size.width),this._helper&&!l.animate&&this._proportionallyResize()),t("body").css("cursor","auto"),this.element.removeClass("ui-resizable-resizing"),this._propagate("stop",e),this._helper&&this.helper.remove(),!1},_updateVirtualBoundaries:function(t){var e,s,n,o,a,r=this.options;a={minWidth:i(r.minWidth)?r.minWidth:0,maxWidth:i(r.maxWidth)?r.maxWidth:1/0,minHeight:i(r.minHeight)?r.minHeight:0,maxHeight:i(r.maxHeight)?r.maxHeight:1/0},(this._aspectRatio||t)&&(e=a.minHeight*this.aspectRatio,n=a.minWidth/this.aspectRatio,s=a.maxHeight*this.aspectRatio,o=a.maxWidth/this.aspectRatio,e>a.minWidth&&(a.minWidth=e),n>a.minHeight&&(a.minHeight=n),a.maxWidth>s&&(a.maxWidth=s),a.maxHeight>o&&(a.maxHeight=o)),this._vBoundaries=a},_updateCache:function(t){this.offset=this.helper.offset(),i(t.left)&&(this.position.left=t.left),i(t.top)&&(this.position.top=t.top),i(t.height)&&(this.size.height=t.height),i(t.width)&&(this.size.width=t.width)},_updateRatio:function(t){var e=this.position,s=this.size,n=this.axis;return i(t.height)?t.width=t.height*this.aspectRatio:i(t.width)&&(t.height=t.width/this.aspectRatio),"sw"===n&&(t.left=e.left+(s.width-t.width),t.top=null),"nw"===n&&(t.top=e.top+(s.height-t.height),t.left=e.left+(s.width-t.width)),t},_respectSize:function(t){var e=this._vBoundaries,s=this.axis,n=i(t.width)&&e.maxWidth&&e.maxWidth<t.width,o=i(t.height)&&e.maxHeight&&e.maxHeight<t.height,a=i(t.width)&&e.minWidth&&e.minWidth>t.width,r=i(t.height)&&e.minHeight&&e.minHeight>t.height,h=this.originalPosition.left+this.originalSize.width,l=this.position.top+this.size.height,c=/sw|nw|w/.test(s),u=/nw|ne|n/.test(s);return a&&(t.width=e.minWidth),r&&(t.height=e.minHeight),n&&(t.width=e.maxWidth),o&&(t.height=e.maxHeight),a&&c&&(t.left=h-e.minWidth),n&&c&&(t.left=h-e.maxWidth),r&&u&&(t.top=l-e.minHeight),o&&u&&(t.top=l-e.maxHeight),t.width||t.height||t.left||!t.top?t.width||t.height||t.top||!t.left||(t.left=null):t.top=null,t},_proportionallyResize:function(){if(this._proportionallyResizeElements.length){var t,e,i,s,n,o=this.helper||this.element;for(t=0;this._proportionallyResizeElements.length>t;t++){if(n=this._proportionallyResizeElements[t],!this.borderDif)for(this.borderDif=[],i=[n.css("borderTopWidth"),n.css("borderRightWidth"),n.css("borderBottomWidth"),n.css("borderLeftWidth")],s=[n.css("paddingTop"),n.css("paddingRight"),n.css("paddingBottom"),n.css("paddingLeft")],e=0;i.length>e;e++)this.borderDif[e]=(parseInt(i[e],10)||0)+(parseInt(s[e],10)||0);n.css({height:o.height()-this.borderDif[0]-this.borderDif[2]||0,width:o.width()-this.borderDif[1]-this.borderDif[3]||0})}}},_renderProxy:function(){var e=this.element,i=this.options;this.elementOffset=e.offset(),this._helper?(this.helper=this.helper||t("<div style='overflow:hidden;'></div>"),this.helper.addClass(this._helper).css({width:this.element.outerWidth()-1,height:this.element.outerHeight()-1,position:"absolute",left:this.elementOffset.left+"px",top:this.elementOffset.top+"px",zIndex:++i.zIndex}),this.helper.appendTo("body").disableSelection()):this.helper=this.element},_change:{e:function(t,e){return{width:this.originalSize.width+e}},w:function(t,e){var i=this.originalSize,s=this.originalPosition;return{left:s.left+e,width:i.width-e}},n:function(t,e,i){var s=this.originalSize,n=this.originalPosition;return{top:n.top+i,height:s.height-i}},s:function(t,e,i){return{height:this.originalSize.height+i}},se:function(e,i,s){return t.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[e,i,s]))},sw:function(e,i,s){return t.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[e,i,s]))},ne:function(e,i,s){return t.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[e,i,s]))},nw:function(e,i,s){return t.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[e,i,s]))}},_propagate:function(e,i){t.ui.plugin.call(this,e,[i,this.ui()]),"resize"!==e&&this._trigger(e,i,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}}),t.ui.plugin.add("resizable","animate",{stop:function(e){var i=t(this).data("ui-resizable"),s=i.options,n=i._proportionallyResizeElements,o=n.length&&/textarea/i.test(n[0].nodeName),a=o&&t.ui.hasScroll(n[0],"left")?0:i.sizeDiff.height,r=o?0:i.sizeDiff.width,h={width:i.size.width-r,height:i.size.height-a},l=parseInt(i.element.css("left"),10)+(i.position.left-i.originalPosition.left)||null,c=parseInt(i.element.css("top"),10)+(i.position.top-i.originalPosition.top)||null;i.element.animate(t.extend(h,c&&l?{top:c,left:l}:{}),{duration:s.animateDuration,easing:s.animateEasing,step:function(){var s={width:parseInt(i.element.css("width"),10),height:parseInt(i.element.css("height"),10),top:parseInt(i.element.css("top"),10),left:parseInt(i.element.css("left"),10)};n&&n.length&&t(n[0]).css({width:s.width,height:s.height}),i._updateCache(s),i._propagate("resize",e)}})}}),t.ui.plugin.add("resizable","containment",{start:function(){var i,s,n,o,a,r,h,l=t(this).data("ui-resizable"),c=l.options,u=l.element,d=c.containment,p=d instanceof t?d.get(0):/parent/.test(d)?u.parent().get(0):d;p&&(l.containerElement=t(p),/document/.test(d)||d===document?(l.containerOffset={left:0,top:0},l.containerPosition={left:0,top:0},l.parentData={element:t(document),left:0,top:0,width:t(document).width(),height:t(document).height()||document.body.parentNode.scrollHeight}):(i=t(p),s=[],t(["Top","Right","Left","Bottom"]).each(function(t,n){s[t]=e(i.css("padding"+n))}),l.containerOffset=i.offset(),l.containerPosition=i.position(),l.containerSize={height:i.innerHeight()-s[3],width:i.innerWidth()-s[1]},n=l.containerOffset,o=l.containerSize.height,a=l.containerSize.width,r=t.ui.hasScroll(p,"left")?p.scrollWidth:a,h=t.ui.hasScroll(p)?p.scrollHeight:o,l.parentData={element:p,left:n.left,top:n.top,width:r,height:h}))},resize:function(e){var i,s,n,o,a=t(this).data("ui-resizable"),r=a.options,h=a.containerOffset,l=a.position,c=a._aspectRatio||e.shiftKey,u={top:0,left:0},d=a.containerElement;d[0]!==document&&/static/.test(d.css("position"))&&(u=h),l.left<(a._helper?h.left:0)&&(a.size.width=a.size.width+(a._helper?a.position.left-h.left:a.position.left-u.left),c&&(a.size.height=a.size.width/a.aspectRatio),a.position.left=r.helper?h.left:0),l.top<(a._helper?h.top:0)&&(a.size.height=a.size.height+(a._helper?a.position.top-h.top:a.position.top),c&&(a.size.width=a.size.height*a.aspectRatio),a.position.top=a._helper?h.top:0),a.offset.left=a.parentData.left+a.position.left,a.offset.top=a.parentData.top+a.position.top,i=Math.abs((a._helper?a.offset.left-u.left:a.offset.left-u.left)+a.sizeDiff.width),s=Math.abs((a._helper?a.offset.top-u.top:a.offset.top-h.top)+a.sizeDiff.height),n=a.containerElement.get(0)===a.element.parent().get(0),o=/relative|absolute/.test(a.containerElement.css("position")),n&&o&&(i-=Math.abs(a.parentData.left)),i+a.size.width>=a.parentData.width&&(a.size.width=a.parentData.width-i,c&&(a.size.height=a.size.width/a.aspectRatio)),s+a.size.height>=a.parentData.height&&(a.size.height=a.parentData.height-s,c&&(a.size.width=a.size.height*a.aspectRatio))},stop:function(){var e=t(this).data("ui-resizable"),i=e.options,s=e.containerOffset,n=e.containerPosition,o=e.containerElement,a=t(e.helper),r=a.offset(),h=a.outerWidth()-e.sizeDiff.width,l=a.outerHeight()-e.sizeDiff.height;e._helper&&!i.animate&&/relative/.test(o.css("position"))&&t(this).css({left:r.left-n.left-s.left,width:h,height:l}),e._helper&&!i.animate&&/static/.test(o.css("position"))&&t(this).css({left:r.left-n.left-s.left,width:h,height:l})}}),t.ui.plugin.add("resizable","alsoResize",{start:function(){var e=t(this).data("ui-resizable"),i=e.options,s=function(e){t(e).each(function(){var e=t(this);e.data("ui-resizable-alsoresize",{width:parseInt(e.width(),10),height:parseInt(e.height(),10),left:parseInt(e.css("left"),10),top:parseInt(e.css("top"),10)})})};"object"!=typeof i.alsoResize||i.alsoResize.parentNode?s(i.alsoResize):i.alsoResize.length?(i.alsoResize=i.alsoResize[0],s(i.alsoResize)):t.each(i.alsoResize,function(t){s(t)})},resize:function(e,i){var s=t(this).data("ui-resizable"),n=s.options,o=s.originalSize,a=s.originalPosition,r={height:s.size.height-o.height||0,width:s.size.width-o.width||0,top:s.position.top-a.top||0,left:s.position.left-a.left||0},h=function(e,s){t(e).each(function(){var e=t(this),n=t(this).data("ui-resizable-alsoresize"),o={},a=s&&s.length?s:e.parents(i.originalElement[0]).length?["width","height"]:["width","height","top","left"];t.each(a,function(t,e){var i=(n[e]||0)+(r[e]||0);i&&i>=0&&(o[e]=i||null)}),e.css(o)})};"object"!=typeof n.alsoResize||n.alsoResize.nodeType?h(n.alsoResize):t.each(n.alsoResize,function(t,e){h(t,e)})},stop:function(){t(this).removeData("resizable-alsoresize")}}),t.ui.plugin.add("resizable","ghost",{start:function(){var e=t(this).data("ui-resizable"),i=e.options,s=e.size;e.ghost=e.originalElement.clone(),e.ghost.css({opacity:.25,display:"block",position:"relative",height:s.height,width:s.width,margin:0,left:0,top:0}).addClass("ui-resizable-ghost").addClass("string"==typeof i.ghost?i.ghost:""),e.ghost.appendTo(e.helper)},resize:function(){var e=t(this).data("ui-resizable");e.ghost&&e.ghost.css({position:"relative",height:e.size.height,width:e.size.width})},stop:function(){var e=t(this).data("ui-resizable");e.ghost&&e.helper&&e.helper.get(0).removeChild(e.ghost.get(0))}}),t.ui.plugin.add("resizable","grid",{resize:function(){var e=t(this).data("ui-resizable"),i=e.options,s=e.size,n=e.originalSize,o=e.originalPosition,a=e.axis,r="number"==typeof i.grid?[i.grid,i.grid]:i.grid,h=r[0]||1,l=r[1]||1,c=Math.round((s.width-n.width)/h)*h,u=Math.round((s.height-n.height)/l)*l,d=n.width+c,p=n.height+u,f=i.maxWidth&&d>i.maxWidth,g=i.maxHeight&&p>i.maxHeight,m=i.minWidth&&i.minWidth>d,v=i.minHeight&&i.minHeight>p;i.grid=r,m&&(d+=h),v&&(p+=l),f&&(d-=h),g&&(p-=l),/^(se|s|e)$/.test(a)?(e.size.width=d,e.size.height=p):/^(ne)$/.test(a)?(e.size.width=d,e.size.height=p,e.position.top=o.top-u):/^(sw)$/.test(a)?(e.size.width=d,e.size.height=p,e.position.left=o.left-c):(p-l>0?(e.size.height=p,e.position.top=o.top-u):(e.size.height=l,e.position.top=o.top+n.height-l),d-h>0?(e.size.width=d,e.position.left=o.left-c):(e.size.width=h,e.position.left=o.left+n.width-h))}})}(jQuery),function(t){t.widget("ui.selectable",t.ui.mouse,{version:"1.10.4",options:{appendTo:"body",autoRefresh:!0,distance:0,filter:"*",tolerance:"touch",selected:null,selecting:null,start:null,stop:null,unselected:null,unselecting:null},_create:function(){var e,i=this;this.element.addClass("ui-selectable"),this.dragged=!1,this.refresh=function(){e=t(i.options.filter,i.element[0]),e.addClass("ui-selectee"),e.each(function(){var e=t(this),i=e.offset();t.data(this,"selectable-item",{element:this,$element:e,left:i.left,top:i.top,right:i.left+e.outerWidth(),bottom:i.top+e.outerHeight(),startselected:!1,selected:e.hasClass("ui-selected"),selecting:e.hasClass("ui-selecting"),unselecting:e.hasClass("ui-unselecting")})})},this.refresh(),this.selectees=e.addClass("ui-selectee"),this._mouseInit(),this.helper=t("<div class='ui-selectable-helper'></div>")},_destroy:function(){this.selectees.removeClass("ui-selectee").removeData("selectable-item"),this.element.removeClass("ui-selectable ui-selectable-disabled"),this._mouseDestroy()},_mouseStart:function(e){var i=this,s=this.options;this.opos=[e.pageX,e.pageY],this.options.disabled||(this.selectees=t(s.filter,this.element[0]),this._trigger("start",e),t(s.appendTo).append(this.helper),this.helper.css({left:e.pageX,top:e.pageY,width:0,height:0}),s.autoRefresh&&this.refresh(),this.selectees.filter(".ui-selected").each(function(){var s=t.data(this,"selectable-item");s.startselected=!0,e.metaKey||e.ctrlKey||(s.$element.removeClass("ui-selected"),s.selected=!1,s.$element.addClass("ui-unselecting"),s.unselecting=!0,i._trigger("unselecting",e,{unselecting:s.element}))}),t(e.target).parents().addBack().each(function(){var s,n=t.data(this,"selectable-item");return n?(s=!e.metaKey&&!e.ctrlKey||!n.$element.hasClass("ui-selected"),n.$element.removeClass(s?"ui-unselecting":"ui-selected").addClass(s?"ui-selecting":"ui-unselecting"),n.unselecting=!s,n.selecting=s,n.selected=s,s?i._trigger("selecting",e,{selecting:n.element}):i._trigger("unselecting",e,{unselecting:n.element}),!1):undefined}))},_mouseDrag:function(e){if(this.dragged=!0,!this.options.disabled){var i,s=this,n=this.options,o=this.opos[0],a=this.opos[1],r=e.pageX,h=e.pageY;return o>r&&(i=r,r=o,o=i),a>h&&(i=h,h=a,a=i),this.helper.css({left:o,top:a,width:r-o,height:h-a}),this.selectees.each(function(){var i=t.data(this,"selectable-item"),l=!1;i&&i.element!==s.element[0]&&("touch"===n.tolerance?l=!(i.left>r||o>i.right||i.top>h||a>i.bottom):"fit"===n.tolerance&&(l=i.left>o&&r>i.right&&i.top>a&&h>i.bottom),l?(i.selected&&(i.$element.removeClass("ui-selected"),i.selected=!1),i.unselecting&&(i.$element.removeClass("ui-unselecting"),i.unselecting=!1),i.selecting||(i.$element.addClass("ui-selecting"),i.selecting=!0,s._trigger("selecting",e,{selecting:i.element}))):(i.selecting&&((e.metaKey||e.ctrlKey)&&i.startselected?(i.$element.removeClass("ui-selecting"),i.selecting=!1,i.$element.addClass("ui-selected"),i.selected=!0):(i.$element.removeClass("ui-selecting"),i.selecting=!1,i.startselected&&(i.$element.addClass("ui-unselecting"),i.unselecting=!0),s._trigger("unselecting",e,{unselecting:i.element}))),i.selected&&(e.metaKey||e.ctrlKey||i.startselected||(i.$element.removeClass("ui-selected"),i.selected=!1,i.$element.addClass("ui-unselecting"),i.unselecting=!0,s._trigger("unselecting",e,{unselecting:i.element})))))}),!1}},_mouseStop:function(e){var i=this;return this.dragged=!1,t(".ui-unselecting",this.element[0]).each(function(){var s=t.data(this,"selectable-item");s.$element.removeClass("ui-unselecting"),s.unselecting=!1,s.startselected=!1,i._trigger("unselected",e,{unselected:s.element})}),t(".ui-selecting",this.element[0]).each(function(){var s=t.data(this,"selectable-item");s.$element.removeClass("ui-selecting").addClass("ui-selected"),s.selecting=!1,s.selected=!0,s.startselected=!0,i._trigger("selected",e,{selected:s.element})}),this._trigger("stop",e),this.helper.remove(),!1}})}(jQuery),function(t){function e(t,e,i){return t>e&&e+i>t}function i(t){return/left|right/.test(t.css("float"))||/inline|table-cell/.test(t.css("display"))}t.widget("ui.sortable",t.ui.mouse,{version:"1.10.4",widgetEventPrefix:"sort",ready:!1,options:{appendTo:"parent",axis:!1,connectWith:!1,containment:!1,cursor:"auto",cursorAt:!1,dropOnEmpty:!0,forcePlaceholderSize:!1,forceHelperSize:!1,grid:!1,handle:!1,helper:"original",items:"> *",opacity:!1,placeholder:!1,revert:!1,scroll:!0,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1e3,activate:null,beforeStop:null,change:null,deactivate:null,out:null,over:null,receive:null,remove:null,sort:null,start:null,stop:null,update:null},_create:function(){var t=this.options;this.containerCache={},this.element.addClass("ui-sortable"),this.refresh(),this.floating=this.items.length?"x"===t.axis||i(this.items[0].item):!1,this.offset=this.element.offset(),this._mouseInit(),this.ready=!0},_destroy:function(){this.element.removeClass("ui-sortable ui-sortable-disabled"),this._mouseDestroy();for(var t=this.items.length-1;t>=0;t--)this.items[t].item.removeData(this.widgetName+"-item");return this},_setOption:function(e,i){"disabled"===e?(this.options[e]=i,this.widget().toggleClass("ui-sortable-disabled",!!i)):t.Widget.prototype._setOption.apply(this,arguments)},_mouseCapture:function(e,i){var s=null,n=!1,o=this;return this.reverting?!1:this.options.disabled||"static"===this.options.type?!1:(this._refreshItems(e),t(e.target).parents().each(function(){return t.data(this,o.widgetName+"-item")===o?(s=t(this),!1):undefined}),t.data(e.target,o.widgetName+"-item")===o&&(s=t(e.target)),s?!this.options.handle||i||(t(this.options.handle,s).find("*").addBack().each(function(){this===e.target&&(n=!0)}),n)?(this.currentItem=s,this._removeCurrentsFromItems(),!0):!1:!1)},_mouseStart:function(e,i,s){var n,o,a=this.options;if(this.currentContainer=this,this.refreshPositions(),this.helper=this._createHelper(e),this._cacheHelperProportions(),this._cacheMargins(),this.scrollParent=this.helper.scrollParent(),this.offset=this.currentItem.offset(),this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left},t.extend(this.offset,{click:{left:e.pageX-this.offset.left,top:e.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()}),this.helper.css("position","absolute"),this.cssPosition=this.helper.css("position"),this.originalPosition=this._generatePosition(e),this.originalPageX=e.pageX,this.originalPageY=e.pageY,a.cursorAt&&this._adjustOffsetFromHelper(a.cursorAt),this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]},this.helper[0]!==this.currentItem[0]&&this.currentItem.hide(),this._createPlaceholder(),a.containment&&this._setContainment(),a.cursor&&"auto"!==a.cursor&&(o=this.document.find("body"),this.storedCursor=o.css("cursor"),o.css("cursor",a.cursor),this.storedStylesheet=t("<style>*{ cursor: "+a.cursor+" !important; }</style>").appendTo(o)),a.opacity&&(this.helper.css("opacity")&&(this._storedOpacity=this.helper.css("opacity")),this.helper.css("opacity",a.opacity)),a.zIndex&&(this.helper.css("zIndex")&&(this._storedZIndex=this.helper.css("zIndex")),this.helper.css("zIndex",a.zIndex)),this.scrollParent[0]!==document&&"HTML"!==this.scrollParent[0].tagName&&(this.overflowOffset=this.scrollParent.offset()),this._trigger("start",e,this._uiHash()),this._preserveHelperProportions||this._cacheHelperProportions(),!s)for(n=this.containers.length-1;n>=0;n--)this.containers[n]._trigger("activate",e,this._uiHash(this));return t.ui.ddmanager&&(t.ui.ddmanager.current=this),t.ui.ddmanager&&!a.dropBehaviour&&t.ui.ddmanager.prepareOffsets(this,e),this.dragging=!0,this.helper.addClass("ui-sortable-helper"),this._mouseDrag(e),!0},_mouseDrag:function(e){var i,s,n,o,a=this.options,r=!1;for(this.position=this._generatePosition(e),this.positionAbs=this._convertPositionTo("absolute"),this.lastPositionAbs||(this.lastPositionAbs=this.positionAbs),this.options.scroll&&(this.scrollParent[0]!==document&&"HTML"!==this.scrollParent[0].tagName?(this.overflowOffset.top+this.scrollParent[0].offsetHeight-e.pageY<a.scrollSensitivity?this.scrollParent[0].scrollTop=r=this.scrollParent[0].scrollTop+a.scrollSpeed:e.pageY-this.overflowOffset.top<a.scrollSensitivity&&(this.scrollParent[0].scrollTop=r=this.scrollParent[0].scrollTop-a.scrollSpeed),this.overflowOffset.left+this.scrollParent[0].offsetWidth-e.pageX<a.scrollSensitivity?this.scrollParent[0].scrollLeft=r=this.scrollParent[0].scrollLeft+a.scrollSpeed:e.pageX-this.overflowOffset.left<a.scrollSensitivity&&(this.scrollParent[0].scrollLeft=r=this.scrollParent[0].scrollLeft-a.scrollSpeed)):(e.pageY-t(document).scrollTop()<a.scrollSensitivity?r=t(document).scrollTop(t(document).scrollTop()-a.scrollSpeed):t(window).height()-(e.pageY-t(document).scrollTop())<a.scrollSensitivity&&(r=t(document).scrollTop(t(document).scrollTop()+a.scrollSpeed)),e.pageX-t(document).scrollLeft()<a.scrollSensitivity?r=t(document).scrollLeft(t(document).scrollLeft()-a.scrollSpeed):t(window).width()-(e.pageX-t(document).scrollLeft())<a.scrollSensitivity&&(r=t(document).scrollLeft(t(document).scrollLeft()+a.scrollSpeed))),r!==!1&&t.ui.ddmanager&&!a.dropBehaviour&&t.ui.ddmanager.prepareOffsets(this,e)),this.positionAbs=this._convertPositionTo("absolute"),this.options.axis&&"y"===this.options.axis||(this.helper[0].style.left=this.position.left+"px"),this.options.axis&&"x"===this.options.axis||(this.helper[0].style.top=this.position.top+"px"),i=this.items.length-1;i>=0;i--)if(s=this.items[i],n=s.item[0],o=this._intersectsWithPointer(s),o&&s.instance===this.currentContainer&&n!==this.currentItem[0]&&this.placeholder[1===o?"next":"prev"]()[0]!==n&&!t.contains(this.placeholder[0],n)&&("semi-dynamic"===this.options.type?!t.contains(this.element[0],n):!0)){if(this.direction=1===o?"down":"up","pointer"!==this.options.tolerance&&!this._intersectsWithSides(s))break;
+this._rearrange(e,s),this._trigger("change",e,this._uiHash());break}return this._contactContainers(e),t.ui.ddmanager&&t.ui.ddmanager.drag(this,e),this._trigger("sort",e,this._uiHash()),this.lastPositionAbs=this.positionAbs,!1},_mouseStop:function(e,i){if(e){if(t.ui.ddmanager&&!this.options.dropBehaviour&&t.ui.ddmanager.drop(this,e),this.options.revert){var s=this,n=this.placeholder.offset(),o=this.options.axis,a={};o&&"x"!==o||(a.left=n.left-this.offset.parent.left-this.margins.left+(this.offsetParent[0]===document.body?0:this.offsetParent[0].scrollLeft)),o&&"y"!==o||(a.top=n.top-this.offset.parent.top-this.margins.top+(this.offsetParent[0]===document.body?0:this.offsetParent[0].scrollTop)),this.reverting=!0,t(this.helper).animate(a,parseInt(this.options.revert,10)||500,function(){s._clear(e)})}else this._clear(e,i);return!1}},cancel:function(){if(this.dragging){this._mouseUp({target:null}),"original"===this.options.helper?this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper"):this.currentItem.show();for(var e=this.containers.length-1;e>=0;e--)this.containers[e]._trigger("deactivate",null,this._uiHash(this)),this.containers[e].containerCache.over&&(this.containers[e]._trigger("out",null,this._uiHash(this)),this.containers[e].containerCache.over=0)}return this.placeholder&&(this.placeholder[0].parentNode&&this.placeholder[0].parentNode.removeChild(this.placeholder[0]),"original"!==this.options.helper&&this.helper&&this.helper[0].parentNode&&this.helper.remove(),t.extend(this,{helper:null,dragging:!1,reverting:!1,_noFinalSort:null}),this.domPosition.prev?t(this.domPosition.prev).after(this.currentItem):t(this.domPosition.parent).prepend(this.currentItem)),this},serialize:function(e){var i=this._getItemsAsjQuery(e&&e.connected),s=[];return e=e||{},t(i).each(function(){var i=(t(e.item||this).attr(e.attribute||"id")||"").match(e.expression||/(.+)[\-=_](.+)/);i&&s.push((e.key||i[1]+"[]")+"="+(e.key&&e.expression?i[1]:i[2]))}),!s.length&&e.key&&s.push(e.key+"="),s.join("&")},toArray:function(e){var i=this._getItemsAsjQuery(e&&e.connected),s=[];return e=e||{},i.each(function(){s.push(t(e.item||this).attr(e.attribute||"id")||"")}),s},_intersectsWith:function(t){var e=this.positionAbs.left,i=e+this.helperProportions.width,s=this.positionAbs.top,n=s+this.helperProportions.height,o=t.left,a=o+t.width,r=t.top,h=r+t.height,l=this.offset.click.top,c=this.offset.click.left,u="x"===this.options.axis||s+l>r&&h>s+l,d="y"===this.options.axis||e+c>o&&a>e+c,p=u&&d;return"pointer"===this.options.tolerance||this.options.forcePointerForContainers||"pointer"!==this.options.tolerance&&this.helperProportions[this.floating?"width":"height"]>t[this.floating?"width":"height"]?p:e+this.helperProportions.width/2>o&&a>i-this.helperProportions.width/2&&s+this.helperProportions.height/2>r&&h>n-this.helperProportions.height/2},_intersectsWithPointer:function(t){var i="x"===this.options.axis||e(this.positionAbs.top+this.offset.click.top,t.top,t.height),s="y"===this.options.axis||e(this.positionAbs.left+this.offset.click.left,t.left,t.width),n=i&&s,o=this._getDragVerticalDirection(),a=this._getDragHorizontalDirection();return n?this.floating?a&&"right"===a||"down"===o?2:1:o&&("down"===o?2:1):!1},_intersectsWithSides:function(t){var i=e(this.positionAbs.top+this.offset.click.top,t.top+t.height/2,t.height),s=e(this.positionAbs.left+this.offset.click.left,t.left+t.width/2,t.width),n=this._getDragVerticalDirection(),o=this._getDragHorizontalDirection();return this.floating&&o?"right"===o&&s||"left"===o&&!s:n&&("down"===n&&i||"up"===n&&!i)},_getDragVerticalDirection:function(){var t=this.positionAbs.top-this.lastPositionAbs.top;return 0!==t&&(t>0?"down":"up")},_getDragHorizontalDirection:function(){var t=this.positionAbs.left-this.lastPositionAbs.left;return 0!==t&&(t>0?"right":"left")},refresh:function(t){return this._refreshItems(t),this.refreshPositions(),this},_connectWith:function(){var t=this.options;return t.connectWith.constructor===String?[t.connectWith]:t.connectWith},_getItemsAsjQuery:function(e){function i(){r.push(this)}var s,n,o,a,r=[],h=[],l=this._connectWith();if(l&&e)for(s=l.length-1;s>=0;s--)for(o=t(l[s]),n=o.length-1;n>=0;n--)a=t.data(o[n],this.widgetFullName),a&&a!==this&&!a.options.disabled&&h.push([t.isFunction(a.options.items)?a.options.items.call(a.element):t(a.options.items,a.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),a]);for(h.push([t.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):t(this.options.items,this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),this]),s=h.length-1;s>=0;s--)h[s][0].each(i);return t(r)},_removeCurrentsFromItems:function(){var e=this.currentItem.find(":data("+this.widgetName+"-item)");this.items=t.grep(this.items,function(t){for(var i=0;e.length>i;i++)if(e[i]===t.item[0])return!1;return!0})},_refreshItems:function(e){this.items=[],this.containers=[this];var i,s,n,o,a,r,h,l,c=this.items,u=[[t.isFunction(this.options.items)?this.options.items.call(this.element[0],e,{item:this.currentItem}):t(this.options.items,this.element),this]],d=this._connectWith();if(d&&this.ready)for(i=d.length-1;i>=0;i--)for(n=t(d[i]),s=n.length-1;s>=0;s--)o=t.data(n[s],this.widgetFullName),o&&o!==this&&!o.options.disabled&&(u.push([t.isFunction(o.options.items)?o.options.items.call(o.element[0],e,{item:this.currentItem}):t(o.options.items,o.element),o]),this.containers.push(o));for(i=u.length-1;i>=0;i--)for(a=u[i][1],r=u[i][0],s=0,l=r.length;l>s;s++)h=t(r[s]),h.data(this.widgetName+"-item",a),c.push({item:h,instance:a,width:0,height:0,left:0,top:0})},refreshPositions:function(e){this.offsetParent&&this.helper&&(this.offset.parent=this._getParentOffset());var i,s,n,o;for(i=this.items.length-1;i>=0;i--)s=this.items[i],s.instance!==this.currentContainer&&this.currentContainer&&s.item[0]!==this.currentItem[0]||(n=this.options.toleranceElement?t(this.options.toleranceElement,s.item):s.item,e||(s.width=n.outerWidth(),s.height=n.outerHeight()),o=n.offset(),s.left=o.left,s.top=o.top);if(this.options.custom&&this.options.custom.refreshContainers)this.options.custom.refreshContainers.call(this);else for(i=this.containers.length-1;i>=0;i--)o=this.containers[i].element.offset(),this.containers[i].containerCache.left=o.left,this.containers[i].containerCache.top=o.top,this.containers[i].containerCache.width=this.containers[i].element.outerWidth(),this.containers[i].containerCache.height=this.containers[i].element.outerHeight();return this},_createPlaceholder:function(e){e=e||this;var i,s=e.options;s.placeholder&&s.placeholder.constructor!==String||(i=s.placeholder,s.placeholder={element:function(){var s=e.currentItem[0].nodeName.toLowerCase(),n=t("<"+s+">",e.document[0]).addClass(i||e.currentItem[0].className+" ui-sortable-placeholder").removeClass("ui-sortable-helper");return"tr"===s?e.currentItem.children().each(function(){t("<td>&#160;</td>",e.document[0]).attr("colspan",t(this).attr("colspan")||1).appendTo(n)}):"img"===s&&n.attr("src",e.currentItem.attr("src")),i||n.css("visibility","hidden"),n},update:function(t,n){(!i||s.forcePlaceholderSize)&&(n.height()||n.height(e.currentItem.innerHeight()-parseInt(e.currentItem.css("paddingTop")||0,10)-parseInt(e.currentItem.css("paddingBottom")||0,10)),n.width()||n.width(e.currentItem.innerWidth()-parseInt(e.currentItem.css("paddingLeft")||0,10)-parseInt(e.currentItem.css("paddingRight")||0,10)))}}),e.placeholder=t(s.placeholder.element.call(e.element,e.currentItem)),e.currentItem.after(e.placeholder),s.placeholder.update(e,e.placeholder)},_contactContainers:function(s){var n,o,a,r,h,l,c,u,d,p,f=null,g=null;for(n=this.containers.length-1;n>=0;n--)if(!t.contains(this.currentItem[0],this.containers[n].element[0]))if(this._intersectsWith(this.containers[n].containerCache)){if(f&&t.contains(this.containers[n].element[0],f.element[0]))continue;f=this.containers[n],g=n}else this.containers[n].containerCache.over&&(this.containers[n]._trigger("out",s,this._uiHash(this)),this.containers[n].containerCache.over=0);if(f)if(1===this.containers.length)this.containers[g].containerCache.over||(this.containers[g]._trigger("over",s,this._uiHash(this)),this.containers[g].containerCache.over=1);else{for(a=1e4,r=null,p=f.floating||i(this.currentItem),h=p?"left":"top",l=p?"width":"height",c=this.positionAbs[h]+this.offset.click[h],o=this.items.length-1;o>=0;o--)t.contains(this.containers[g].element[0],this.items[o].item[0])&&this.items[o].item[0]!==this.currentItem[0]&&(!p||e(this.positionAbs.top+this.offset.click.top,this.items[o].top,this.items[o].height))&&(u=this.items[o].item.offset()[h],d=!1,Math.abs(u-c)>Math.abs(u+this.items[o][l]-c)&&(d=!0,u+=this.items[o][l]),a>Math.abs(u-c)&&(a=Math.abs(u-c),r=this.items[o],this.direction=d?"up":"down"));if(!r&&!this.options.dropOnEmpty)return;if(this.currentContainer===this.containers[g])return;r?this._rearrange(s,r,null,!0):this._rearrange(s,null,this.containers[g].element,!0),this._trigger("change",s,this._uiHash()),this.containers[g]._trigger("change",s,this._uiHash(this)),this.currentContainer=this.containers[g],this.options.placeholder.update(this.currentContainer,this.placeholder),this.containers[g]._trigger("over",s,this._uiHash(this)),this.containers[g].containerCache.over=1}},_createHelper:function(e){var i=this.options,s=t.isFunction(i.helper)?t(i.helper.apply(this.element[0],[e,this.currentItem])):"clone"===i.helper?this.currentItem.clone():this.currentItem;return s.parents("body").length||t("parent"!==i.appendTo?i.appendTo:this.currentItem[0].parentNode)[0].appendChild(s[0]),s[0]===this.currentItem[0]&&(this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")}),(!s[0].style.width||i.forceHelperSize)&&s.width(this.currentItem.width()),(!s[0].style.height||i.forceHelperSize)&&s.height(this.currentItem.height()),s},_adjustOffsetFromHelper:function(e){"string"==typeof e&&(e=e.split(" ")),t.isArray(e)&&(e={left:+e[0],top:+e[1]||0}),"left"in e&&(this.offset.click.left=e.left+this.margins.left),"right"in e&&(this.offset.click.left=this.helperProportions.width-e.right+this.margins.left),"top"in e&&(this.offset.click.top=e.top+this.margins.top),"bottom"in e&&(this.offset.click.top=this.helperProportions.height-e.bottom+this.margins.top)},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var e=this.offsetParent.offset();return"absolute"===this.cssPosition&&this.scrollParent[0]!==document&&t.contains(this.scrollParent[0],this.offsetParent[0])&&(e.left+=this.scrollParent.scrollLeft(),e.top+=this.scrollParent.scrollTop()),(this.offsetParent[0]===document.body||this.offsetParent[0].tagName&&"html"===this.offsetParent[0].tagName.toLowerCase()&&t.ui.ie)&&(e={top:0,left:0}),{top:e.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:e.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if("relative"===this.cssPosition){var t=this.currentItem.position();return{top:t.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:t.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.currentItem.css("marginLeft"),10)||0,top:parseInt(this.currentItem.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var e,i,s,n=this.options;"parent"===n.containment&&(n.containment=this.helper[0].parentNode),("document"===n.containment||"window"===n.containment)&&(this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,t("document"===n.containment?document:window).width()-this.helperProportions.width-this.margins.left,(t("document"===n.containment?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top]),/^(document|window|parent)$/.test(n.containment)||(e=t(n.containment)[0],i=t(n.containment).offset(),s="hidden"!==t(e).css("overflow"),this.containment=[i.left+(parseInt(t(e).css("borderLeftWidth"),10)||0)+(parseInt(t(e).css("paddingLeft"),10)||0)-this.margins.left,i.top+(parseInt(t(e).css("borderTopWidth"),10)||0)+(parseInt(t(e).css("paddingTop"),10)||0)-this.margins.top,i.left+(s?Math.max(e.scrollWidth,e.offsetWidth):e.offsetWidth)-(parseInt(t(e).css("borderLeftWidth"),10)||0)-(parseInt(t(e).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,i.top+(s?Math.max(e.scrollHeight,e.offsetHeight):e.offsetHeight)-(parseInt(t(e).css("borderTopWidth"),10)||0)-(parseInt(t(e).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top])},_convertPositionTo:function(e,i){i||(i=this.position);var s="absolute"===e?1:-1,n="absolute"!==this.cssPosition||this.scrollParent[0]!==document&&t.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,o=/(html|body)/i.test(n[0].tagName);return{top:i.top+this.offset.relative.top*s+this.offset.parent.top*s-("fixed"===this.cssPosition?-this.scrollParent.scrollTop():o?0:n.scrollTop())*s,left:i.left+this.offset.relative.left*s+this.offset.parent.left*s-("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():o?0:n.scrollLeft())*s}},_generatePosition:function(e){var i,s,n=this.options,o=e.pageX,a=e.pageY,r="absolute"!==this.cssPosition||this.scrollParent[0]!==document&&t.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,h=/(html|body)/i.test(r[0].tagName);return"relative"!==this.cssPosition||this.scrollParent[0]!==document&&this.scrollParent[0]!==this.offsetParent[0]||(this.offset.relative=this._getRelativeOffset()),this.originalPosition&&(this.containment&&(e.pageX-this.offset.click.left<this.containment[0]&&(o=this.containment[0]+this.offset.click.left),e.pageY-this.offset.click.top<this.containment[1]&&(a=this.containment[1]+this.offset.click.top),e.pageX-this.offset.click.left>this.containment[2]&&(o=this.containment[2]+this.offset.click.left),e.pageY-this.offset.click.top>this.containment[3]&&(a=this.containment[3]+this.offset.click.top)),n.grid&&(i=this.originalPageY+Math.round((a-this.originalPageY)/n.grid[1])*n.grid[1],a=this.containment?i-this.offset.click.top>=this.containment[1]&&i-this.offset.click.top<=this.containment[3]?i:i-this.offset.click.top>=this.containment[1]?i-n.grid[1]:i+n.grid[1]:i,s=this.originalPageX+Math.round((o-this.originalPageX)/n.grid[0])*n.grid[0],o=this.containment?s-this.offset.click.left>=this.containment[0]&&s-this.offset.click.left<=this.containment[2]?s:s-this.offset.click.left>=this.containment[0]?s-n.grid[0]:s+n.grid[0]:s)),{top:a-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+("fixed"===this.cssPosition?-this.scrollParent.scrollTop():h?0:r.scrollTop()),left:o-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():h?0:r.scrollLeft())}},_rearrange:function(t,e,i,s){i?i[0].appendChild(this.placeholder[0]):e.item[0].parentNode.insertBefore(this.placeholder[0],"down"===this.direction?e.item[0]:e.item[0].nextSibling),this.counter=this.counter?++this.counter:1;var n=this.counter;this._delay(function(){n===this.counter&&this.refreshPositions(!s)})},_clear:function(t,e){function i(t,e,i){return function(s){i._trigger(t,s,e._uiHash(e))}}this.reverting=!1;var s,n=[];if(!this._noFinalSort&&this.currentItem.parent().length&&this.placeholder.before(this.currentItem),this._noFinalSort=null,this.helper[0]===this.currentItem[0]){for(s in this._storedCSS)("auto"===this._storedCSS[s]||"static"===this._storedCSS[s])&&(this._storedCSS[s]="");this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper")}else this.currentItem.show();for(this.fromOutside&&!e&&n.push(function(t){this._trigger("receive",t,this._uiHash(this.fromOutside))}),!this.fromOutside&&this.domPosition.prev===this.currentItem.prev().not(".ui-sortable-helper")[0]&&this.domPosition.parent===this.currentItem.parent()[0]||e||n.push(function(t){this._trigger("update",t,this._uiHash())}),this!==this.currentContainer&&(e||(n.push(function(t){this._trigger("remove",t,this._uiHash())}),n.push(function(t){return function(e){t._trigger("receive",e,this._uiHash(this))}}.call(this,this.currentContainer)),n.push(function(t){return function(e){t._trigger("update",e,this._uiHash(this))}}.call(this,this.currentContainer)))),s=this.containers.length-1;s>=0;s--)e||n.push(i("deactivate",this,this.containers[s])),this.containers[s].containerCache.over&&(n.push(i("out",this,this.containers[s])),this.containers[s].containerCache.over=0);if(this.storedCursor&&(this.document.find("body").css("cursor",this.storedCursor),this.storedStylesheet.remove()),this._storedOpacity&&this.helper.css("opacity",this._storedOpacity),this._storedZIndex&&this.helper.css("zIndex","auto"===this._storedZIndex?"":this._storedZIndex),this.dragging=!1,this.cancelHelperRemoval){if(!e){for(this._trigger("beforeStop",t,this._uiHash()),s=0;n.length>s;s++)n[s].call(this,t);this._trigger("stop",t,this._uiHash())}return this.fromOutside=!1,!1}if(e||this._trigger("beforeStop",t,this._uiHash()),this.placeholder[0].parentNode.removeChild(this.placeholder[0]),this.helper[0]!==this.currentItem[0]&&this.helper.remove(),this.helper=null,!e){for(s=0;n.length>s;s++)n[s].call(this,t);this._trigger("stop",t,this._uiHash())}return this.fromOutside=!1,!0},_trigger:function(){t.Widget.prototype._trigger.apply(this,arguments)===!1&&this.cancel()},_uiHash:function(e){var i=e||this;return{helper:i.helper,placeholder:i.placeholder||t([]),position:i.position,originalPosition:i.originalPosition,offset:i.positionAbs,item:i.currentItem,sender:e?e.element:null}}})}(jQuery),function(t,e){var i="ui-effects-";t.effects={effect:{}},function(t,e){function i(t,e,i){var s=u[e.type]||{};return null==t?i||!e.def?null:e.def:(t=s.floor?~~t:parseFloat(t),isNaN(t)?e.def:s.mod?(t+s.mod)%s.mod:0>t?0:t>s.max?s.max:t)}function s(i){var s=l(),n=s._rgba=[];return i=i.toLowerCase(),f(h,function(t,o){var a,r=o.re.exec(i),h=r&&o.parse(r),l=o.space||"rgba";return h?(a=s[l](h),s[c[l].cache]=a[c[l].cache],n=s._rgba=a._rgba,!1):e}),n.length?("0,0,0,0"===n.join()&&t.extend(n,o.transparent),s):o[i]}function n(t,e,i){return i=(i+1)%1,1>6*i?t+6*(e-t)*i:1>2*i?e:2>3*i?t+6*(e-t)*(2/3-i):t}var o,a="backgroundColor borderBottomColor borderLeftColor borderRightColor borderTopColor color columnRuleColor outlineColor textDecorationColor textEmphasisColor",r=/^([\-+])=\s*(\d+\.?\d*)/,h=[{re:/rgba?\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,parse:function(t){return[t[1],t[2],t[3],t[4]]}},{re:/rgba?\(\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,parse:function(t){return[2.55*t[1],2.55*t[2],2.55*t[3],t[4]]}},{re:/#([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})/,parse:function(t){return[parseInt(t[1],16),parseInt(t[2],16),parseInt(t[3],16)]}},{re:/#([a-f0-9])([a-f0-9])([a-f0-9])/,parse:function(t){return[parseInt(t[1]+t[1],16),parseInt(t[2]+t[2],16),parseInt(t[3]+t[3],16)]}},{re:/hsla?\(\s*(\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,space:"hsla",parse:function(t){return[t[1],t[2]/100,t[3]/100,t[4]]}}],l=t.Color=function(e,i,s,n){return new t.Color.fn.parse(e,i,s,n)},c={rgba:{props:{red:{idx:0,type:"byte"},green:{idx:1,type:"byte"},blue:{idx:2,type:"byte"}}},hsla:{props:{hue:{idx:0,type:"degrees"},saturation:{idx:1,type:"percent"},lightness:{idx:2,type:"percent"}}}},u={"byte":{floor:!0,max:255},percent:{max:1},degrees:{mod:360,floor:!0}},d=l.support={},p=t("<p>")[0],f=t.each;p.style.cssText="background-color:rgba(1,1,1,.5)",d.rgba=p.style.backgroundColor.indexOf("rgba")>-1,f(c,function(t,e){e.cache="_"+t,e.props.alpha={idx:3,type:"percent",def:1}}),l.fn=t.extend(l.prototype,{parse:function(n,a,r,h){if(n===e)return this._rgba=[null,null,null,null],this;(n.jquery||n.nodeType)&&(n=t(n).css(a),a=e);var u=this,d=t.type(n),p=this._rgba=[];return a!==e&&(n=[n,a,r,h],d="array"),"string"===d?this.parse(s(n)||o._default):"array"===d?(f(c.rgba.props,function(t,e){p[e.idx]=i(n[e.idx],e)}),this):"object"===d?(n instanceof l?f(c,function(t,e){n[e.cache]&&(u[e.cache]=n[e.cache].slice())}):f(c,function(e,s){var o=s.cache;f(s.props,function(t,e){if(!u[o]&&s.to){if("alpha"===t||null==n[t])return;u[o]=s.to(u._rgba)}u[o][e.idx]=i(n[t],e,!0)}),u[o]&&0>t.inArray(null,u[o].slice(0,3))&&(u[o][3]=1,s.from&&(u._rgba=s.from(u[o])))}),this):e},is:function(t){var i=l(t),s=!0,n=this;return f(c,function(t,o){var a,r=i[o.cache];return r&&(a=n[o.cache]||o.to&&o.to(n._rgba)||[],f(o.props,function(t,i){return null!=r[i.idx]?s=r[i.idx]===a[i.idx]:e})),s}),s},_space:function(){var t=[],e=this;return f(c,function(i,s){e[s.cache]&&t.push(i)}),t.pop()},transition:function(t,e){var s=l(t),n=s._space(),o=c[n],a=0===this.alpha()?l("transparent"):this,r=a[o.cache]||o.to(a._rgba),h=r.slice();return s=s[o.cache],f(o.props,function(t,n){var o=n.idx,a=r[o],l=s[o],c=u[n.type]||{};null!==l&&(null===a?h[o]=l:(c.mod&&(l-a>c.mod/2?a+=c.mod:a-l>c.mod/2&&(a-=c.mod)),h[o]=i((l-a)*e+a,n)))}),this[n](h)},blend:function(e){if(1===this._rgba[3])return this;var i=this._rgba.slice(),s=i.pop(),n=l(e)._rgba;return l(t.map(i,function(t,e){return(1-s)*n[e]+s*t}))},toRgbaString:function(){var e="rgba(",i=t.map(this._rgba,function(t,e){return null==t?e>2?1:0:t});return 1===i[3]&&(i.pop(),e="rgb("),e+i.join()+")"},toHslaString:function(){var e="hsla(",i=t.map(this.hsla(),function(t,e){return null==t&&(t=e>2?1:0),e&&3>e&&(t=Math.round(100*t)+"%"),t});return 1===i[3]&&(i.pop(),e="hsl("),e+i.join()+")"},toHexString:function(e){var i=this._rgba.slice(),s=i.pop();return e&&i.push(~~(255*s)),"#"+t.map(i,function(t){return t=(t||0).toString(16),1===t.length?"0"+t:t}).join("")},toString:function(){return 0===this._rgba[3]?"transparent":this.toRgbaString()}}),l.fn.parse.prototype=l.fn,c.hsla.to=function(t){if(null==t[0]||null==t[1]||null==t[2])return[null,null,null,t[3]];var e,i,s=t[0]/255,n=t[1]/255,o=t[2]/255,a=t[3],r=Math.max(s,n,o),h=Math.min(s,n,o),l=r-h,c=r+h,u=.5*c;return e=h===r?0:s===r?60*(n-o)/l+360:n===r?60*(o-s)/l+120:60*(s-n)/l+240,i=0===l?0:.5>=u?l/c:l/(2-c),[Math.round(e)%360,i,u,null==a?1:a]},c.hsla.from=function(t){if(null==t[0]||null==t[1]||null==t[2])return[null,null,null,t[3]];var e=t[0]/360,i=t[1],s=t[2],o=t[3],a=.5>=s?s*(1+i):s+i-s*i,r=2*s-a;return[Math.round(255*n(r,a,e+1/3)),Math.round(255*n(r,a,e)),Math.round(255*n(r,a,e-1/3)),o]},f(c,function(s,n){var o=n.props,a=n.cache,h=n.to,c=n.from;l.fn[s]=function(s){if(h&&!this[a]&&(this[a]=h(this._rgba)),s===e)return this[a].slice();var n,r=t.type(s),u="array"===r||"object"===r?s:arguments,d=this[a].slice();return f(o,function(t,e){var s=u["object"===r?t:e.idx];null==s&&(s=d[e.idx]),d[e.idx]=i(s,e)}),c?(n=l(c(d)),n[a]=d,n):l(d)},f(o,function(e,i){l.fn[e]||(l.fn[e]=function(n){var o,a=t.type(n),h="alpha"===e?this._hsla?"hsla":"rgba":s,l=this[h](),c=l[i.idx];return"undefined"===a?c:("function"===a&&(n=n.call(this,c),a=t.type(n)),null==n&&i.empty?this:("string"===a&&(o=r.exec(n),o&&(n=c+parseFloat(o[2])*("+"===o[1]?1:-1))),l[i.idx]=n,this[h](l)))})})}),l.hook=function(e){var i=e.split(" ");f(i,function(e,i){t.cssHooks[i]={set:function(e,n){var o,a,r="";if("transparent"!==n&&("string"!==t.type(n)||(o=s(n)))){if(n=l(o||n),!d.rgba&&1!==n._rgba[3]){for(a="backgroundColor"===i?e.parentNode:e;(""===r||"transparent"===r)&&a&&a.style;)try{r=t.css(a,"backgroundColor"),a=a.parentNode}catch(h){}n=n.blend(r&&"transparent"!==r?r:"_default")}n=n.toRgbaString()}try{e.style[i]=n}catch(h){}}},t.fx.step[i]=function(e){e.colorInit||(e.start=l(e.elem,i),e.end=l(e.end),e.colorInit=!0),t.cssHooks[i].set(e.elem,e.start.transition(e.end,e.pos))}})},l.hook(a),t.cssHooks.borderColor={expand:function(t){var e={};return f(["Top","Right","Bottom","Left"],function(i,s){e["border"+s+"Color"]=t}),e}},o=t.Color.names={aqua:"#00ffff",black:"#000000",blue:"#0000ff",fuchsia:"#ff00ff",gray:"#808080",green:"#008000",lime:"#00ff00",maroon:"#800000",navy:"#000080",olive:"#808000",purple:"#800080",red:"#ff0000",silver:"#c0c0c0",teal:"#008080",white:"#ffffff",yellow:"#ffff00",transparent:[null,null,null,0],_default:"#ffffff"}}(jQuery),function(){function i(e){var i,s,n=e.ownerDocument.defaultView?e.ownerDocument.defaultView.getComputedStyle(e,null):e.currentStyle,o={};if(n&&n.length&&n[0]&&n[n[0]])for(s=n.length;s--;)i=n[s],"string"==typeof n[i]&&(o[t.camelCase(i)]=n[i]);else for(i in n)"string"==typeof n[i]&&(o[i]=n[i]);return o}function s(e,i){var s,n,a={};for(s in i)n=i[s],e[s]!==n&&(o[s]||(t.fx.step[s]||!isNaN(parseFloat(n)))&&(a[s]=n));return a}var n=["add","remove","toggle"],o={border:1,borderBottom:1,borderColor:1,borderLeft:1,borderRight:1,borderTop:1,borderWidth:1,margin:1,padding:1};t.each(["borderLeftStyle","borderRightStyle","borderBottomStyle","borderTopStyle"],function(e,i){t.fx.step[i]=function(t){("none"!==t.end&&!t.setAttr||1===t.pos&&!t.setAttr)&&(jQuery.style(t.elem,i,t.end),t.setAttr=!0)}}),t.fn.addBack||(t.fn.addBack=function(t){return this.add(null==t?this.prevObject:this.prevObject.filter(t))}),t.effects.animateClass=function(e,o,a,r){var h=t.speed(o,a,r);return this.queue(function(){var o,a=t(this),r=a.attr("class")||"",l=h.children?a.find("*").addBack():a;l=l.map(function(){var e=t(this);return{el:e,start:i(this)}}),o=function(){t.each(n,function(t,i){e[i]&&a[i+"Class"](e[i])})},o(),l=l.map(function(){return this.end=i(this.el[0]),this.diff=s(this.start,this.end),this}),a.attr("class",r),l=l.map(function(){var e=this,i=t.Deferred(),s=t.extend({},h,{queue:!1,complete:function(){i.resolve(e)}});return this.el.animate(this.diff,s),i.promise()}),t.when.apply(t,l.get()).done(function(){o(),t.each(arguments,function(){var e=this.el;t.each(this.diff,function(t){e.css(t,"")})}),h.complete.call(a[0])})})},t.fn.extend({addClass:function(e){return function(i,s,n,o){return s?t.effects.animateClass.call(this,{add:i},s,n,o):e.apply(this,arguments)}}(t.fn.addClass),removeClass:function(e){return function(i,s,n,o){return arguments.length>1?t.effects.animateClass.call(this,{remove:i},s,n,o):e.apply(this,arguments)}}(t.fn.removeClass),toggleClass:function(i){return function(s,n,o,a,r){return"boolean"==typeof n||n===e?o?t.effects.animateClass.call(this,n?{add:s}:{remove:s},o,a,r):i.apply(this,arguments):t.effects.animateClass.call(this,{toggle:s},n,o,a)}}(t.fn.toggleClass),switchClass:function(e,i,s,n,o){return t.effects.animateClass.call(this,{add:i,remove:e},s,n,o)}})}(),function(){function s(e,i,s,n){return t.isPlainObject(e)&&(i=e,e=e.effect),e={effect:e},null==i&&(i={}),t.isFunction(i)&&(n=i,s=null,i={}),("number"==typeof i||t.fx.speeds[i])&&(n=s,s=i,i={}),t.isFunction(s)&&(n=s,s=null),i&&t.extend(e,i),s=s||i.duration,e.duration=t.fx.off?0:"number"==typeof s?s:s in t.fx.speeds?t.fx.speeds[s]:t.fx.speeds._default,e.complete=n||i.complete,e}function n(e){return!e||"number"==typeof e||t.fx.speeds[e]?!0:"string"!=typeof e||t.effects.effect[e]?t.isFunction(e)?!0:"object"!=typeof e||e.effect?!1:!0:!0}t.extend(t.effects,{version:"1.10.4",save:function(t,e){for(var s=0;e.length>s;s++)null!==e[s]&&t.data(i+e[s],t[0].style[e[s]])},restore:function(t,s){var n,o;for(o=0;s.length>o;o++)null!==s[o]&&(n=t.data(i+s[o]),n===e&&(n=""),t.css(s[o],n))},setMode:function(t,e){return"toggle"===e&&(e=t.is(":hidden")?"show":"hide"),e},getBaseline:function(t,e){var i,s;switch(t[0]){case"top":i=0;break;case"middle":i=.5;break;case"bottom":i=1;break;default:i=t[0]/e.height}switch(t[1]){case"left":s=0;break;case"center":s=.5;break;case"right":s=1;break;default:s=t[1]/e.width}return{x:s,y:i}},createWrapper:function(e){if(e.parent().is(".ui-effects-wrapper"))return e.parent();var i={width:e.outerWidth(!0),height:e.outerHeight(!0),"float":e.css("float")},s=t("<div></div>").addClass("ui-effects-wrapper").css({fontSize:"100%",background:"transparent",border:"none",margin:0,padding:0}),n={width:e.width(),height:e.height()},o=document.activeElement;try{o.id}catch(a){o=document.body}return e.wrap(s),(e[0]===o||t.contains(e[0],o))&&t(o).focus(),s=e.parent(),"static"===e.css("position")?(s.css({position:"relative"}),e.css({position:"relative"})):(t.extend(i,{position:e.css("position"),zIndex:e.css("z-index")}),t.each(["top","left","bottom","right"],function(t,s){i[s]=e.css(s),isNaN(parseInt(i[s],10))&&(i[s]="auto")}),e.css({position:"relative",top:0,left:0,right:"auto",bottom:"auto"})),e.css(n),s.css(i).show()},removeWrapper:function(e){var i=document.activeElement;return e.parent().is(".ui-effects-wrapper")&&(e.parent().replaceWith(e),(e[0]===i||t.contains(e[0],i))&&t(i).focus()),e},setTransition:function(e,i,s,n){return n=n||{},t.each(i,function(t,i){var o=e.cssUnit(i);o[0]>0&&(n[i]=o[0]*s+o[1])}),n}}),t.fn.extend({effect:function(){function e(e){function s(){t.isFunction(o)&&o.call(n[0]),t.isFunction(e)&&e()}var n=t(this),o=i.complete,r=i.mode;(n.is(":hidden")?"hide"===r:"show"===r)?(n[r](),s()):a.call(n[0],i,s)}var i=s.apply(this,arguments),n=i.mode,o=i.queue,a=t.effects.effect[i.effect];return t.fx.off||!a?n?this[n](i.duration,i.complete):this.each(function(){i.complete&&i.complete.call(this)}):o===!1?this.each(e):this.queue(o||"fx",e)},show:function(t){return function(e){if(n(e))return t.apply(this,arguments);var i=s.apply(this,arguments);return i.mode="show",this.effect.call(this,i)}}(t.fn.show),hide:function(t){return function(e){if(n(e))return t.apply(this,arguments);var i=s.apply(this,arguments);return i.mode="hide",this.effect.call(this,i)}}(t.fn.hide),toggle:function(t){return function(e){if(n(e)||"boolean"==typeof e)return t.apply(this,arguments);var i=s.apply(this,arguments);return i.mode="toggle",this.effect.call(this,i)}}(t.fn.toggle),cssUnit:function(e){var i=this.css(e),s=[];return t.each(["em","px","%","pt"],function(t,e){i.indexOf(e)>0&&(s=[parseFloat(i),e])}),s}})}(),function(){var e={};t.each(["Quad","Cubic","Quart","Quint","Expo"],function(t,i){e[i]=function(e){return Math.pow(e,t+2)}}),t.extend(e,{Sine:function(t){return 1-Math.cos(t*Math.PI/2)},Circ:function(t){return 1-Math.sqrt(1-t*t)},Elastic:function(t){return 0===t||1===t?t:-Math.pow(2,8*(t-1))*Math.sin((80*(t-1)-7.5)*Math.PI/15)},Back:function(t){return t*t*(3*t-2)},Bounce:function(t){for(var e,i=4;((e=Math.pow(2,--i))-1)/11>t;);return 1/Math.pow(4,3-i)-7.5625*Math.pow((3*e-2)/22-t,2)}}),t.each(e,function(e,i){t.easing["easeIn"+e]=i,t.easing["easeOut"+e]=function(t){return 1-i(1-t)},t.easing["easeInOut"+e]=function(t){return.5>t?i(2*t)/2:1-i(-2*t+2)/2}})}()}(jQuery),function(t){var e=0,i={},s={};i.height=i.paddingTop=i.paddingBottom=i.borderTopWidth=i.borderBottomWidth="hide",s.height=s.paddingTop=s.paddingBottom=s.borderTopWidth=s.borderBottomWidth="show",t.widget("ui.accordion",{version:"1.10.4",options:{active:0,animate:{},collapsible:!1,event:"click",header:"> li > :first-child,> :not(li):even",heightStyle:"auto",icons:{activeHeader:"ui-icon-triangle-1-s",header:"ui-icon-triangle-1-e"},activate:null,beforeActivate:null},_create:function(){var e=this.options;this.prevShow=this.prevHide=t(),this.element.addClass("ui-accordion ui-widget ui-helper-reset").attr("role","tablist"),e.collapsible||e.active!==!1&&null!=e.active||(e.active=0),this._processPanels(),0>e.active&&(e.active+=this.headers.length),this._refresh()},_getCreateEventData:function(){return{header:this.active,panel:this.active.length?this.active.next():t(),content:this.active.length?this.active.next():t()}},_createIcons:function(){var e=this.options.icons;e&&(t("<span>").addClass("ui-accordion-header-icon ui-icon "+e.header).prependTo(this.headers),this.active.children(".ui-accordion-header-icon").removeClass(e.header).addClass(e.activeHeader),this.headers.addClass("ui-accordion-icons"))
+},_destroyIcons:function(){this.headers.removeClass("ui-accordion-icons").children(".ui-accordion-header-icon").remove()},_destroy:function(){var t;this.element.removeClass("ui-accordion ui-widget ui-helper-reset").removeAttr("role"),this.headers.removeClass("ui-accordion-header ui-accordion-header-active ui-helper-reset ui-state-default ui-corner-all ui-state-active ui-state-disabled ui-corner-top").removeAttr("role").removeAttr("aria-expanded").removeAttr("aria-selected").removeAttr("aria-controls").removeAttr("tabIndex").each(function(){/^ui-accordion/.test(this.id)&&this.removeAttribute("id")}),this._destroyIcons(),t=this.headers.next().css("display","").removeAttr("role").removeAttr("aria-hidden").removeAttr("aria-labelledby").removeClass("ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content ui-accordion-content-active ui-state-disabled").each(function(){/^ui-accordion/.test(this.id)&&this.removeAttribute("id")}),"content"!==this.options.heightStyle&&t.css("height","")},_setOption:function(t,e){return"active"===t?(this._activate(e),undefined):("event"===t&&(this.options.event&&this._off(this.headers,this.options.event),this._setupEvents(e)),this._super(t,e),"collapsible"!==t||e||this.options.active!==!1||this._activate(0),"icons"===t&&(this._destroyIcons(),e&&this._createIcons()),"disabled"===t&&this.headers.add(this.headers.next()).toggleClass("ui-state-disabled",!!e),undefined)},_keydown:function(e){if(!e.altKey&&!e.ctrlKey){var i=t.ui.keyCode,s=this.headers.length,n=this.headers.index(e.target),o=!1;switch(e.keyCode){case i.RIGHT:case i.DOWN:o=this.headers[(n+1)%s];break;case i.LEFT:case i.UP:o=this.headers[(n-1+s)%s];break;case i.SPACE:case i.ENTER:this._eventHandler(e);break;case i.HOME:o=this.headers[0];break;case i.END:o=this.headers[s-1]}o&&(t(e.target).attr("tabIndex",-1),t(o).attr("tabIndex",0),o.focus(),e.preventDefault())}},_panelKeyDown:function(e){e.keyCode===t.ui.keyCode.UP&&e.ctrlKey&&t(e.currentTarget).prev().focus()},refresh:function(){var e=this.options;this._processPanels(),e.active===!1&&e.collapsible===!0||!this.headers.length?(e.active=!1,this.active=t()):e.active===!1?this._activate(0):this.active.length&&!t.contains(this.element[0],this.active[0])?this.headers.length===this.headers.find(".ui-state-disabled").length?(e.active=!1,this.active=t()):this._activate(Math.max(0,e.active-1)):e.active=this.headers.index(this.active),this._destroyIcons(),this._refresh()},_processPanels:function(){this.headers=this.element.find(this.options.header).addClass("ui-accordion-header ui-helper-reset ui-state-default ui-corner-all"),this.headers.next().addClass("ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom").filter(":not(.ui-accordion-content-active)").hide()},_refresh:function(){var i,s=this.options,n=s.heightStyle,o=this.element.parent(),a=this.accordionId="ui-accordion-"+(this.element.attr("id")||++e);this.active=this._findActive(s.active).addClass("ui-accordion-header-active ui-state-active ui-corner-top").removeClass("ui-corner-all"),this.active.next().addClass("ui-accordion-content-active").show(),this.headers.attr("role","tab").each(function(e){var i=t(this),s=i.attr("id"),n=i.next(),o=n.attr("id");s||(s=a+"-header-"+e,i.attr("id",s)),o||(o=a+"-panel-"+e,n.attr("id",o)),i.attr("aria-controls",o),n.attr("aria-labelledby",s)}).next().attr("role","tabpanel"),this.headers.not(this.active).attr({"aria-selected":"false","aria-expanded":"false",tabIndex:-1}).next().attr({"aria-hidden":"true"}).hide(),this.active.length?this.active.attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0}).next().attr({"aria-hidden":"false"}):this.headers.eq(0).attr("tabIndex",0),this._createIcons(),this._setupEvents(s.event),"fill"===n?(i=o.height(),this.element.siblings(":visible").each(function(){var e=t(this),s=e.css("position");"absolute"!==s&&"fixed"!==s&&(i-=e.outerHeight(!0))}),this.headers.each(function(){i-=t(this).outerHeight(!0)}),this.headers.next().each(function(){t(this).height(Math.max(0,i-t(this).innerHeight()+t(this).height()))}).css("overflow","auto")):"auto"===n&&(i=0,this.headers.next().each(function(){i=Math.max(i,t(this).css("height","").height())}).height(i))},_activate:function(e){var i=this._findActive(e)[0];i!==this.active[0]&&(i=i||this.active[0],this._eventHandler({target:i,currentTarget:i,preventDefault:t.noop}))},_findActive:function(e){return"number"==typeof e?this.headers.eq(e):t()},_setupEvents:function(e){var i={keydown:"_keydown"};e&&t.each(e.split(" "),function(t,e){i[e]="_eventHandler"}),this._off(this.headers.add(this.headers.next())),this._on(this.headers,i),this._on(this.headers.next(),{keydown:"_panelKeyDown"}),this._hoverable(this.headers),this._focusable(this.headers)},_eventHandler:function(e){var i=this.options,s=this.active,n=t(e.currentTarget),o=n[0]===s[0],a=o&&i.collapsible,r=a?t():n.next(),h=s.next(),l={oldHeader:s,oldPanel:h,newHeader:a?t():n,newPanel:r};e.preventDefault(),o&&!i.collapsible||this._trigger("beforeActivate",e,l)===!1||(i.active=a?!1:this.headers.index(n),this.active=o?t():n,this._toggle(l),s.removeClass("ui-accordion-header-active ui-state-active"),i.icons&&s.children(".ui-accordion-header-icon").removeClass(i.icons.activeHeader).addClass(i.icons.header),o||(n.removeClass("ui-corner-all").addClass("ui-accordion-header-active ui-state-active ui-corner-top"),i.icons&&n.children(".ui-accordion-header-icon").removeClass(i.icons.header).addClass(i.icons.activeHeader),n.next().addClass("ui-accordion-content-active")))},_toggle:function(e){var i=e.newPanel,s=this.prevShow.length?this.prevShow:e.oldPanel;this.prevShow.add(this.prevHide).stop(!0,!0),this.prevShow=i,this.prevHide=s,this.options.animate?this._animate(i,s,e):(s.hide(),i.show(),this._toggleComplete(e)),s.attr({"aria-hidden":"true"}),s.prev().attr("aria-selected","false"),i.length&&s.length?s.prev().attr({tabIndex:-1,"aria-expanded":"false"}):i.length&&this.headers.filter(function(){return 0===t(this).attr("tabIndex")}).attr("tabIndex",-1),i.attr("aria-hidden","false").prev().attr({"aria-selected":"true",tabIndex:0,"aria-expanded":"true"})},_animate:function(t,e,n){var o,a,r,h=this,l=0,c=t.length&&(!e.length||t.index()<e.index()),u=this.options.animate||{},d=c&&u.down||u,p=function(){h._toggleComplete(n)};return"number"==typeof d&&(r=d),"string"==typeof d&&(a=d),a=a||d.easing||u.easing,r=r||d.duration||u.duration,e.length?t.length?(o=t.show().outerHeight(),e.animate(i,{duration:r,easing:a,step:function(t,e){e.now=Math.round(t)}}),t.hide().animate(s,{duration:r,easing:a,complete:p,step:function(t,i){i.now=Math.round(t),"height"!==i.prop?l+=i.now:"content"!==h.options.heightStyle&&(i.now=Math.round(o-e.outerHeight()-l),l=0)}}),undefined):e.animate(i,r,a,p):t.animate(s,r,a,p)},_toggleComplete:function(t){var e=t.oldPanel;e.removeClass("ui-accordion-content-active").prev().removeClass("ui-corner-top").addClass("ui-corner-all"),e.length&&(e.parent()[0].className=e.parent()[0].className),this._trigger("activate",null,t)}})}(jQuery),function(t){t.widget("ui.autocomplete",{version:"1.10.4",defaultElement:"<input>",options:{appendTo:null,autoFocus:!1,delay:300,minLength:1,position:{my:"left top",at:"left bottom",collision:"none"},source:null,change:null,close:null,focus:null,open:null,response:null,search:null,select:null},requestIndex:0,pending:0,_create:function(){var e,i,s,n=this.element[0].nodeName.toLowerCase(),o="textarea"===n,a="input"===n;this.isMultiLine=o?!0:a?!1:this.element.prop("isContentEditable"),this.valueMethod=this.element[o||a?"val":"text"],this.isNewMenu=!0,this.element.addClass("ui-autocomplete-input").attr("autocomplete","off"),this._on(this.element,{keydown:function(n){if(this.element.prop("readOnly"))return e=!0,s=!0,i=!0,undefined;e=!1,s=!1,i=!1;var o=t.ui.keyCode;switch(n.keyCode){case o.PAGE_UP:e=!0,this._move("previousPage",n);break;case o.PAGE_DOWN:e=!0,this._move("nextPage",n);break;case o.UP:e=!0,this._keyEvent("previous",n);break;case o.DOWN:e=!0,this._keyEvent("next",n);break;case o.ENTER:case o.NUMPAD_ENTER:this.menu.active&&(e=!0,n.preventDefault(),this.menu.select(n));break;case o.TAB:this.menu.active&&this.menu.select(n);break;case o.ESCAPE:this.menu.element.is(":visible")&&(this._value(this.term),this.close(n),n.preventDefault());break;default:i=!0,this._searchTimeout(n)}},keypress:function(s){if(e)return e=!1,(!this.isMultiLine||this.menu.element.is(":visible"))&&s.preventDefault(),undefined;if(!i){var n=t.ui.keyCode;switch(s.keyCode){case n.PAGE_UP:this._move("previousPage",s);break;case n.PAGE_DOWN:this._move("nextPage",s);break;case n.UP:this._keyEvent("previous",s);break;case n.DOWN:this._keyEvent("next",s)}}},input:function(t){return s?(s=!1,t.preventDefault(),undefined):(this._searchTimeout(t),undefined)},focus:function(){this.selectedItem=null,this.previous=this._value()},blur:function(t){return this.cancelBlur?(delete this.cancelBlur,undefined):(clearTimeout(this.searching),this.close(t),this._change(t),undefined)}}),this._initSource(),this.menu=t("<ul>").addClass("ui-autocomplete ui-front").appendTo(this._appendTo()).menu({role:null}).hide().data("ui-menu"),this._on(this.menu.element,{mousedown:function(e){e.preventDefault(),this.cancelBlur=!0,this._delay(function(){delete this.cancelBlur});var i=this.menu.element[0];t(e.target).closest(".ui-menu-item").length||this._delay(function(){var e=this;this.document.one("mousedown",function(s){s.target===e.element[0]||s.target===i||t.contains(i,s.target)||e.close()})})},menufocus:function(e,i){if(this.isNewMenu&&(this.isNewMenu=!1,e.originalEvent&&/^mouse/.test(e.originalEvent.type)))return this.menu.blur(),this.document.one("mousemove",function(){t(e.target).trigger(e.originalEvent)}),undefined;var s=i.item.data("ui-autocomplete-item");!1!==this._trigger("focus",e,{item:s})?e.originalEvent&&/^key/.test(e.originalEvent.type)&&this._value(s.value):this.liveRegion.text(s.value)},menuselect:function(t,e){var i=e.item.data("ui-autocomplete-item"),s=this.previous;this.element[0]!==this.document[0].activeElement&&(this.element.focus(),this.previous=s,this._delay(function(){this.previous=s,this.selectedItem=i})),!1!==this._trigger("select",t,{item:i})&&this._value(i.value),this.term=this._value(),this.close(t),this.selectedItem=i}}),this.liveRegion=t("<span>",{role:"status","aria-live":"polite"}).addClass("ui-helper-hidden-accessible").insertBefore(this.element),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_destroy:function(){clearTimeout(this.searching),this.element.removeClass("ui-autocomplete-input").removeAttr("autocomplete"),this.menu.element.remove(),this.liveRegion.remove()},_setOption:function(t,e){this._super(t,e),"source"===t&&this._initSource(),"appendTo"===t&&this.menu.element.appendTo(this._appendTo()),"disabled"===t&&e&&this.xhr&&this.xhr.abort()},_appendTo:function(){var e=this.options.appendTo;return e&&(e=e.jquery||e.nodeType?t(e):this.document.find(e).eq(0)),e||(e=this.element.closest(".ui-front")),e.length||(e=this.document[0].body),e},_initSource:function(){var e,i,s=this;t.isArray(this.options.source)?(e=this.options.source,this.source=function(i,s){s(t.ui.autocomplete.filter(e,i.term))}):"string"==typeof this.options.source?(i=this.options.source,this.source=function(e,n){s.xhr&&s.xhr.abort(),s.xhr=t.ajax({url:i,data:e,dataType:"json",success:function(t){n(t)},error:function(){n([])}})}):this.source=this.options.source},_searchTimeout:function(t){clearTimeout(this.searching),this.searching=this._delay(function(){this.term!==this._value()&&(this.selectedItem=null,this.search(null,t))},this.options.delay)},search:function(t,e){return t=null!=t?t:this._value(),this.term=this._value(),t.length<this.options.minLength?this.close(e):this._trigger("search",e)!==!1?this._search(t):undefined},_search:function(t){this.pending++,this.element.addClass("ui-autocomplete-loading"),this.cancelSearch=!1,this.source({term:t},this._response())},_response:function(){var e=++this.requestIndex;return t.proxy(function(t){e===this.requestIndex&&this.__response(t),this.pending--,this.pending||this.element.removeClass("ui-autocomplete-loading")},this)},__response:function(t){t&&(t=this._normalize(t)),this._trigger("response",null,{content:t}),!this.options.disabled&&t&&t.length&&!this.cancelSearch?(this._suggest(t),this._trigger("open")):this._close()},close:function(t){this.cancelSearch=!0,this._close(t)},_close:function(t){this.menu.element.is(":visible")&&(this.menu.element.hide(),this.menu.blur(),this.isNewMenu=!0,this._trigger("close",t))},_change:function(t){this.previous!==this._value()&&this._trigger("change",t,{item:this.selectedItem})},_normalize:function(e){return e.length&&e[0].label&&e[0].value?e:t.map(e,function(e){return"string"==typeof e?{label:e,value:e}:t.extend({label:e.label||e.value,value:e.value||e.label},e)})},_suggest:function(e){var i=this.menu.element.empty();this._renderMenu(i,e),this.isNewMenu=!0,this.menu.refresh(),i.show(),this._resizeMenu(),i.position(t.extend({of:this.element},this.options.position)),this.options.autoFocus&&this.menu.next()},_resizeMenu:function(){var t=this.menu.element;t.outerWidth(Math.max(t.width("").outerWidth()+1,this.element.outerWidth()))},_renderMenu:function(e,i){var s=this;t.each(i,function(t,i){s._renderItemData(e,i)})},_renderItemData:function(t,e){return this._renderItem(t,e).data("ui-autocomplete-item",e)},_renderItem:function(e,i){return t("<li>").append(t("<a>").text(i.label)).appendTo(e)},_move:function(t,e){return this.menu.element.is(":visible")?this.menu.isFirstItem()&&/^previous/.test(t)||this.menu.isLastItem()&&/^next/.test(t)?(this._value(this.term),this.menu.blur(),undefined):(this.menu[t](e),undefined):(this.search(null,e),undefined)},widget:function(){return this.menu.element},_value:function(){return this.valueMethod.apply(this.element,arguments)},_keyEvent:function(t,e){(!this.isMultiLine||this.menu.element.is(":visible"))&&(this._move(t,e),e.preventDefault())}}),t.extend(t.ui.autocomplete,{escapeRegex:function(t){return t.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")},filter:function(e,i){var s=RegExp(t.ui.autocomplete.escapeRegex(i),"i");return t.grep(e,function(t){return s.test(t.label||t.value||t)})}}),t.widget("ui.autocomplete",t.ui.autocomplete,{options:{messages:{noResults:"No search results.",results:function(t){return t+(t>1?" results are":" result is")+" available, use up and down arrow keys to navigate."}}},__response:function(t){var e;this._superApply(arguments),this.options.disabled||this.cancelSearch||(e=t&&t.length?this.options.messages.results(t.length):this.options.messages.noResults,this.liveRegion.text(e))}})}(jQuery),function(t){var e,i="ui-button ui-widget ui-state-default ui-corner-all",s="ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only",n=function(){var e=t(this);setTimeout(function(){e.find(":ui-button").button("refresh")},1)},o=function(e){var i=e.name,s=e.form,n=t([]);return i&&(i=i.replace(/'/g,"\\'"),n=s?t(s).find("[name='"+i+"']"):t("[name='"+i+"']",e.ownerDocument).filter(function(){return!this.form})),n};t.widget("ui.button",{version:"1.10.4",defaultElement:"<button>",options:{disabled:null,text:!0,label:null,icons:{primary:null,secondary:null}},_create:function(){this.element.closest("form").unbind("reset"+this.eventNamespace).bind("reset"+this.eventNamespace,n),"boolean"!=typeof this.options.disabled?this.options.disabled=!!this.element.prop("disabled"):this.element.prop("disabled",this.options.disabled),this._determineButtonType(),this.hasTitle=!!this.buttonElement.attr("title");var s=this,a=this.options,r="checkbox"===this.type||"radio"===this.type,h=r?"":"ui-state-active";null===a.label&&(a.label="input"===this.type?this.buttonElement.val():this.buttonElement.html()),this._hoverable(this.buttonElement),this.buttonElement.addClass(i).attr("role","button").bind("mouseenter"+this.eventNamespace,function(){a.disabled||this===e&&t(this).addClass("ui-state-active")}).bind("mouseleave"+this.eventNamespace,function(){a.disabled||t(this).removeClass(h)}).bind("click"+this.eventNamespace,function(t){a.disabled&&(t.preventDefault(),t.stopImmediatePropagation())}),this._on({focus:function(){this.buttonElement.addClass("ui-state-focus")},blur:function(){this.buttonElement.removeClass("ui-state-focus")}}),r&&this.element.bind("change"+this.eventNamespace,function(){s.refresh()}),"checkbox"===this.type?this.buttonElement.bind("click"+this.eventNamespace,function(){return a.disabled?!1:undefined}):"radio"===this.type?this.buttonElement.bind("click"+this.eventNamespace,function(){if(a.disabled)return!1;t(this).addClass("ui-state-active"),s.buttonElement.attr("aria-pressed","true");var e=s.element[0];o(e).not(e).map(function(){return t(this).button("widget")[0]}).removeClass("ui-state-active").attr("aria-pressed","false")}):(this.buttonElement.bind("mousedown"+this.eventNamespace,function(){return a.disabled?!1:(t(this).addClass("ui-state-active"),e=this,s.document.one("mouseup",function(){e=null}),undefined)}).bind("mouseup"+this.eventNamespace,function(){return a.disabled?!1:(t(this).removeClass("ui-state-active"),undefined)}).bind("keydown"+this.eventNamespace,function(e){return a.disabled?!1:((e.keyCode===t.ui.keyCode.SPACE||e.keyCode===t.ui.keyCode.ENTER)&&t(this).addClass("ui-state-active"),undefined)}).bind("keyup"+this.eventNamespace+" blur"+this.eventNamespace,function(){t(this).removeClass("ui-state-active")}),this.buttonElement.is("a")&&this.buttonElement.keyup(function(e){e.keyCode===t.ui.keyCode.SPACE&&t(this).click()})),this._setOption("disabled",a.disabled),this._resetButton()},_determineButtonType:function(){var t,e,i;this.type=this.element.is("[type=checkbox]")?"checkbox":this.element.is("[type=radio]")?"radio":this.element.is("input")?"input":"button","checkbox"===this.type||"radio"===this.type?(t=this.element.parents().last(),e="label[for='"+this.element.attr("id")+"']",this.buttonElement=t.find(e),this.buttonElement.length||(t=t.length?t.siblings():this.element.siblings(),this.buttonElement=t.filter(e),this.buttonElement.length||(this.buttonElement=t.find(e))),this.element.addClass("ui-helper-hidden-accessible"),i=this.element.is(":checked"),i&&this.buttonElement.addClass("ui-state-active"),this.buttonElement.prop("aria-pressed",i)):this.buttonElement=this.element},widget:function(){return this.buttonElement},_destroy:function(){this.element.removeClass("ui-helper-hidden-accessible"),this.buttonElement.removeClass(i+" ui-state-active "+s).removeAttr("role").removeAttr("aria-pressed").html(this.buttonElement.find(".ui-button-text").html()),this.hasTitle||this.buttonElement.removeAttr("title")},_setOption:function(t,e){return this._super(t,e),"disabled"===t?(this.element.prop("disabled",!!e),e&&this.buttonElement.removeClass("ui-state-focus"),undefined):(this._resetButton(),undefined)},refresh:function(){var e=this.element.is("input, button")?this.element.is(":disabled"):this.element.hasClass("ui-button-disabled");e!==this.options.disabled&&this._setOption("disabled",e),"radio"===this.type?o(this.element[0]).each(function(){t(this).is(":checked")?t(this).button("widget").addClass("ui-state-active").attr("aria-pressed","true"):t(this).button("widget").removeClass("ui-state-active").attr("aria-pressed","false")}):"checkbox"===this.type&&(this.element.is(":checked")?this.buttonElement.addClass("ui-state-active").attr("aria-pressed","true"):this.buttonElement.removeClass("ui-state-active").attr("aria-pressed","false"))},_resetButton:function(){if("input"===this.type)return this.options.label&&this.element.val(this.options.label),undefined;var e=this.buttonElement.removeClass(s),i=t("<span></span>",this.document[0]).addClass("ui-button-text").html(this.options.label).appendTo(e.empty()).text(),n=this.options.icons,o=n.primary&&n.secondary,a=[];n.primary||n.secondary?(this.options.text&&a.push("ui-button-text-icon"+(o?"s":n.primary?"-primary":"-secondary")),n.primary&&e.prepend("<span class='ui-button-icon-primary ui-icon "+n.primary+"'></span>"),n.secondary&&e.append("<span class='ui-button-icon-secondary ui-icon "+n.secondary+"'></span>"),this.options.text||(a.push(o?"ui-button-icons-only":"ui-button-icon-only"),this.hasTitle||e.attr("title",t.trim(i)))):a.push("ui-button-text-only"),e.addClass(a.join(" "))}}),t.widget("ui.buttonset",{version:"1.10.4",options:{items:"button, input[type=button], input[type=submit], input[type=reset], input[type=checkbox], input[type=radio], a, :data(ui-button)"},_create:function(){this.element.addClass("ui-buttonset")},_init:function(){this.refresh()},_setOption:function(t,e){"disabled"===t&&this.buttons.button("option",t,e),this._super(t,e)},refresh:function(){var e="rtl"===this.element.css("direction");this.buttons=this.element.find(this.options.items).filter(":ui-button").button("refresh").end().not(":ui-button").button().end().map(function(){return t(this).button("widget")[0]}).removeClass("ui-corner-all ui-corner-left ui-corner-right").filter(":first").addClass(e?"ui-corner-right":"ui-corner-left").end().filter(":last").addClass(e?"ui-corner-left":"ui-corner-right").end().end()},_destroy:function(){this.element.removeClass("ui-buttonset"),this.buttons.map(function(){return t(this).button("widget")[0]}).removeClass("ui-corner-left ui-corner-right").end().button("destroy")}})}(jQuery),function(t,e){function i(){this._curInst=null,this._keyEvent=!1,this._disabledInputs=[],this._datepickerShowing=!1,this._inDialog=!1,this._mainDivId="ui-datepicker-div",this._inlineClass="ui-datepicker-inline",this._appendClass="ui-datepicker-append",this._triggerClass="ui-datepicker-trigger",this._dialogClass="ui-datepicker-dialog",this._disableClass="ui-datepicker-disabled",this._unselectableClass="ui-datepicker-unselectable",this._currentClass="ui-datepicker-current-day",this._dayOverClass="ui-datepicker-days-cell-over",this.regional=[],this.regional[""]={closeText:"Done",prevText:"Prev",nextText:"Next",currentText:"Today",monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayNamesMin:["Su","Mo","Tu","We","Th","Fr","Sa"],weekHeader:"Wk",dateFormat:"mm/dd/yy",firstDay:0,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""},this._defaults={showOn:"focus",showAnim:"fadeIn",showOptions:{},defaultDate:null,appendText:"",buttonText:"...",buttonImage:"",buttonImageOnly:!1,hideIfNoPrevNext:!1,navigationAsDateFormat:!1,gotoCurrent:!1,changeMonth:!1,changeYear:!1,yearRange:"c-10:c+10",showOtherMonths:!1,selectOtherMonths:!1,showWeek:!1,calculateWeek:this.iso8601Week,shortYearCutoff:"+10",minDate:null,maxDate:null,duration:"fast",beforeShowDay:null,beforeShow:null,onSelect:null,onChangeMonthYear:null,onClose:null,numberOfMonths:1,showCurrentAtPos:0,stepMonths:1,stepBigMonths:12,altField:"",altFormat:"",constrainInput:!0,showButtonPanel:!1,autoSize:!1,disabled:!1},t.extend(this._defaults,this.regional[""]),this.dpDiv=s(t("<div id='"+this._mainDivId+"' class='ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>"))}function s(e){var i="button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a";return e.delegate(i,"mouseout",function(){t(this).removeClass("ui-state-hover"),-1!==this.className.indexOf("ui-datepicker-prev")&&t(this).removeClass("ui-datepicker-prev-hover"),-1!==this.className.indexOf("ui-datepicker-next")&&t(this).removeClass("ui-datepicker-next-hover")}).delegate(i,"mouseover",function(){t.datepicker._isDisabledDatepicker(o.inline?e.parent()[0]:o.input[0])||(t(this).parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover"),t(this).addClass("ui-state-hover"),-1!==this.className.indexOf("ui-datepicker-prev")&&t(this).addClass("ui-datepicker-prev-hover"),-1!==this.className.indexOf("ui-datepicker-next")&&t(this).addClass("ui-datepicker-next-hover"))})}function n(e,i){t.extend(e,i);for(var s in i)null==i[s]&&(e[s]=i[s]);return e}t.extend(t.ui,{datepicker:{version:"1.10.4"}});var o,a="datepicker";t.extend(i.prototype,{markerClassName:"hasDatepicker",maxRows:4,_widgetDatepicker:function(){return this.dpDiv},setDefaults:function(t){return n(this._defaults,t||{}),this},_attachDatepicker:function(e,i){var s,n,o;s=e.nodeName.toLowerCase(),n="div"===s||"span"===s,e.id||(this.uuid+=1,e.id="dp"+this.uuid),o=this._newInst(t(e),n),o.settings=t.extend({},i||{}),"input"===s?this._connectDatepicker(e,o):n&&this._inlineDatepicker(e,o)},_newInst:function(e,i){var n=e[0].id.replace(/([^A-Za-z0-9_\-])/g,"\\\\$1");return{id:n,input:e,selectedDay:0,selectedMonth:0,selectedYear:0,drawMonth:0,drawYear:0,inline:i,dpDiv:i?s(t("<div class='"+this._inlineClass+" ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>")):this.dpDiv}},_connectDatepicker:function(e,i){var s=t(e);i.append=t([]),i.trigger=t([]),s.hasClass(this.markerClassName)||(this._attachments(s,i),s.addClass(this.markerClassName).keydown(this._doKeyDown).keypress(this._doKeyPress).keyup(this._doKeyUp),this._autoSize(i),t.data(e,a,i),i.settings.disabled&&this._disableDatepicker(e))},_attachments:function(e,i){var s,n,o,a=this._get(i,"appendText"),r=this._get(i,"isRTL");i.append&&i.append.remove(),a&&(i.append=t("<span class='"+this._appendClass+"'>"+a+"</span>"),e[r?"before":"after"](i.append)),e.unbind("focus",this._showDatepicker),i.trigger&&i.trigger.remove(),s=this._get(i,"showOn"),("focus"===s||"both"===s)&&e.focus(this._showDatepicker),("button"===s||"both"===s)&&(n=this._get(i,"buttonText"),o=this._get(i,"buttonImage"),i.trigger=t(this._get(i,"buttonImageOnly")?t("<img/>").addClass(this._triggerClass).attr({src:o,alt:n,title:n}):t("<button type='button'></button>").addClass(this._triggerClass).html(o?t("<img/>").attr({src:o,alt:n,title:n}):n)),e[r?"before":"after"](i.trigger),i.trigger.click(function(){return t.datepicker._datepickerShowing&&t.datepicker._lastInput===e[0]?t.datepicker._hideDatepicker():t.datepicker._datepickerShowing&&t.datepicker._lastInput!==e[0]?(t.datepicker._hideDatepicker(),t.datepicker._showDatepicker(e[0])):t.datepicker._showDatepicker(e[0]),!1}))},_autoSize:function(t){if(this._get(t,"autoSize")&&!t.inline){var e,i,s,n,o=new Date(2009,11,20),a=this._get(t,"dateFormat");a.match(/[DM]/)&&(e=function(t){for(i=0,s=0,n=0;t.length>n;n++)t[n].length>i&&(i=t[n].length,s=n);return s},o.setMonth(e(this._get(t,a.match(/MM/)?"monthNames":"monthNamesShort"))),o.setDate(e(this._get(t,a.match(/DD/)?"dayNames":"dayNamesShort"))+20-o.getDay())),t.input.attr("size",this._formatDate(t,o).length)}},_inlineDatepicker:function(e,i){var s=t(e);s.hasClass(this.markerClassName)||(s.addClass(this.markerClassName).append(i.dpDiv),t.data(e,a,i),this._setDate(i,this._getDefaultDate(i),!0),this._updateDatepicker(i),this._updateAlternate(i),i.settings.disabled&&this._disableDatepicker(e),i.dpDiv.css("display","block"))},_dialogDatepicker:function(e,i,s,o,r){var h,l,c,u,d,p=this._dialogInst;return p||(this.uuid+=1,h="dp"+this.uuid,this._dialogInput=t("<input type='text' id='"+h+"' style='position: absolute; top: -100px; width: 0px;'/>"),this._dialogInput.keydown(this._doKeyDown),t("body").append(this._dialogInput),p=this._dialogInst=this._newInst(this._dialogInput,!1),p.settings={},t.data(this._dialogInput[0],a,p)),n(p.settings,o||{}),i=i&&i.constructor===Date?this._formatDate(p,i):i,this._dialogInput.val(i),this._pos=r?r.length?r:[r.pageX,r.pageY]:null,this._pos||(l=document.documentElement.clientWidth,c=document.documentElement.clientHeight,u=document.documentElement.scrollLeft||document.body.scrollLeft,d=document.documentElement.scrollTop||document.body.scrollTop,this._pos=[l/2-100+u,c/2-150+d]),this._dialogInput.css("left",this._pos[0]+20+"px").css("top",this._pos[1]+"px"),p.settings.onSelect=s,this._inDialog=!0,this.dpDiv.addClass(this._dialogClass),this._showDatepicker(this._dialogInput[0]),t.blockUI&&t.blockUI(this.dpDiv),t.data(this._dialogInput[0],a,p),this},_destroyDatepicker:function(e){var i,s=t(e),n=t.data(e,a);s.hasClass(this.markerClassName)&&(i=e.nodeName.toLowerCase(),t.removeData(e,a),"input"===i?(n.append.remove(),n.trigger.remove(),s.removeClass(this.markerClassName).unbind("focus",this._showDatepicker).unbind("keydown",this._doKeyDown).unbind("keypress",this._doKeyPress).unbind("keyup",this._doKeyUp)):("div"===i||"span"===i)&&s.removeClass(this.markerClassName).empty())},_enableDatepicker:function(e){var i,s,n=t(e),o=t.data(e,a);n.hasClass(this.markerClassName)&&(i=e.nodeName.toLowerCase(),"input"===i?(e.disabled=!1,o.trigger.filter("button").each(function(){this.disabled=!1}).end().filter("img").css({opacity:"1.0",cursor:""})):("div"===i||"span"===i)&&(s=n.children("."+this._inlineClass),s.children().removeClass("ui-state-disabled"),s.find("select.ui-datepicker-month, select.ui-datepicker-year").prop("disabled",!1)),this._disabledInputs=t.map(this._disabledInputs,function(t){return t===e?null:t}))},_disableDatepicker:function(e){var i,s,n=t(e),o=t.data(e,a);n.hasClass(this.markerClassName)&&(i=e.nodeName.toLowerCase(),"input"===i?(e.disabled=!0,o.trigger.filter("button").each(function(){this.disabled=!0}).end().filter("img").css({opacity:"0.5",cursor:"default"})):("div"===i||"span"===i)&&(s=n.children("."+this._inlineClass),s.children().addClass("ui-state-disabled"),s.find("select.ui-datepicker-month, select.ui-datepicker-year").prop("disabled",!0)),this._disabledInputs=t.map(this._disabledInputs,function(t){return t===e?null:t}),this._disabledInputs[this._disabledInputs.length]=e)},_isDisabledDatepicker:function(t){if(!t)return!1;for(var e=0;this._disabledInputs.length>e;e++)if(this._disabledInputs[e]===t)return!0;return!1},_getInst:function(e){try{return t.data(e,a)}catch(i){throw"Missing instance data for this datepicker"}},_optionDatepicker:function(i,s,o){var a,r,h,l,c=this._getInst(i);return 2===arguments.length&&"string"==typeof s?"defaults"===s?t.extend({},t.datepicker._defaults):c?"all"===s?t.extend({},c.settings):this._get(c,s):null:(a=s||{},"string"==typeof s&&(a={},a[s]=o),c&&(this._curInst===c&&this._hideDatepicker(),r=this._getDateDatepicker(i,!0),h=this._getMinMaxDate(c,"min"),l=this._getMinMaxDate(c,"max"),n(c.settings,a),null!==h&&a.dateFormat!==e&&a.minDate===e&&(c.settings.minDate=this._formatDate(c,h)),null!==l&&a.dateFormat!==e&&a.maxDate===e&&(c.settings.maxDate=this._formatDate(c,l)),"disabled"in a&&(a.disabled?this._disableDatepicker(i):this._enableDatepicker(i)),this._attachments(t(i),c),this._autoSize(c),this._setDate(c,r),this._updateAlternate(c),this._updateDatepicker(c)),e)},_changeDatepicker:function(t,e,i){this._optionDatepicker(t,e,i)},_refreshDatepicker:function(t){var e=this._getInst(t);e&&this._updateDatepicker(e)},_setDateDatepicker:function(t,e){var i=this._getInst(t);i&&(this._setDate(i,e),this._updateDatepicker(i),this._updateAlternate(i))},_getDateDatepicker:function(t,e){var i=this._getInst(t);return i&&!i.inline&&this._setDateFromField(i,e),i?this._getDate(i):null},_doKeyDown:function(e){var i,s,n,o=t.datepicker._getInst(e.target),a=!0,r=o.dpDiv.is(".ui-datepicker-rtl");if(o._keyEvent=!0,t.datepicker._datepickerShowing)switch(e.keyCode){case 9:t.datepicker._hideDatepicker(),a=!1;break;case 13:return n=t("td."+t.datepicker._dayOverClass+":not(."+t.datepicker._currentClass+")",o.dpDiv),n[0]&&t.datepicker._selectDay(e.target,o.selectedMonth,o.selectedYear,n[0]),i=t.datepicker._get(o,"onSelect"),i?(s=t.datepicker._formatDate(o),i.apply(o.input?o.input[0]:null,[s,o])):t.datepicker._hideDatepicker(),!1;case 27:t.datepicker._hideDatepicker();break;case 33:t.datepicker._adjustDate(e.target,e.ctrlKey?-t.datepicker._get(o,"stepBigMonths"):-t.datepicker._get(o,"stepMonths"),"M");break;case 34:t.datepicker._adjustDate(e.target,e.ctrlKey?+t.datepicker._get(o,"stepBigMonths"):+t.datepicker._get(o,"stepMonths"),"M");
+break;case 35:(e.ctrlKey||e.metaKey)&&t.datepicker._clearDate(e.target),a=e.ctrlKey||e.metaKey;break;case 36:(e.ctrlKey||e.metaKey)&&t.datepicker._gotoToday(e.target),a=e.ctrlKey||e.metaKey;break;case 37:(e.ctrlKey||e.metaKey)&&t.datepicker._adjustDate(e.target,r?1:-1,"D"),a=e.ctrlKey||e.metaKey,e.originalEvent.altKey&&t.datepicker._adjustDate(e.target,e.ctrlKey?-t.datepicker._get(o,"stepBigMonths"):-t.datepicker._get(o,"stepMonths"),"M");break;case 38:(e.ctrlKey||e.metaKey)&&t.datepicker._adjustDate(e.target,-7,"D"),a=e.ctrlKey||e.metaKey;break;case 39:(e.ctrlKey||e.metaKey)&&t.datepicker._adjustDate(e.target,r?-1:1,"D"),a=e.ctrlKey||e.metaKey,e.originalEvent.altKey&&t.datepicker._adjustDate(e.target,e.ctrlKey?+t.datepicker._get(o,"stepBigMonths"):+t.datepicker._get(o,"stepMonths"),"M");break;case 40:(e.ctrlKey||e.metaKey)&&t.datepicker._adjustDate(e.target,7,"D"),a=e.ctrlKey||e.metaKey;break;default:a=!1}else 36===e.keyCode&&e.ctrlKey?t.datepicker._showDatepicker(this):a=!1;a&&(e.preventDefault(),e.stopPropagation())},_doKeyPress:function(i){var s,n,o=t.datepicker._getInst(i.target);return t.datepicker._get(o,"constrainInput")?(s=t.datepicker._possibleChars(t.datepicker._get(o,"dateFormat")),n=String.fromCharCode(null==i.charCode?i.keyCode:i.charCode),i.ctrlKey||i.metaKey||" ">n||!s||s.indexOf(n)>-1):e},_doKeyUp:function(e){var i,s=t.datepicker._getInst(e.target);if(s.input.val()!==s.lastVal)try{i=t.datepicker.parseDate(t.datepicker._get(s,"dateFormat"),s.input?s.input.val():null,t.datepicker._getFormatConfig(s)),i&&(t.datepicker._setDateFromField(s),t.datepicker._updateAlternate(s),t.datepicker._updateDatepicker(s))}catch(n){}return!0},_showDatepicker:function(e){if(e=e.target||e,"input"!==e.nodeName.toLowerCase()&&(e=t("input",e.parentNode)[0]),!t.datepicker._isDisabledDatepicker(e)&&t.datepicker._lastInput!==e){var i,s,o,a,r,h,l;i=t.datepicker._getInst(e),t.datepicker._curInst&&t.datepicker._curInst!==i&&(t.datepicker._curInst.dpDiv.stop(!0,!0),i&&t.datepicker._datepickerShowing&&t.datepicker._hideDatepicker(t.datepicker._curInst.input[0])),s=t.datepicker._get(i,"beforeShow"),o=s?s.apply(e,[e,i]):{},o!==!1&&(n(i.settings,o),i.lastVal=null,t.datepicker._lastInput=e,t.datepicker._setDateFromField(i),t.datepicker._inDialog&&(e.value=""),t.datepicker._pos||(t.datepicker._pos=t.datepicker._findPos(e),t.datepicker._pos[1]+=e.offsetHeight),a=!1,t(e).parents().each(function(){return a|="fixed"===t(this).css("position"),!a}),r={left:t.datepicker._pos[0],top:t.datepicker._pos[1]},t.datepicker._pos=null,i.dpDiv.empty(),i.dpDiv.css({position:"absolute",display:"block",top:"-1000px"}),t.datepicker._updateDatepicker(i),r=t.datepicker._checkOffset(i,r,a),i.dpDiv.css({position:t.datepicker._inDialog&&t.blockUI?"static":a?"fixed":"absolute",display:"none",left:r.left+"px",top:r.top+"px"}),i.inline||(h=t.datepicker._get(i,"showAnim"),l=t.datepicker._get(i,"duration"),i.dpDiv.zIndex(t(e).zIndex()+1),t.datepicker._datepickerShowing=!0,t.effects&&t.effects.effect[h]?i.dpDiv.show(h,t.datepicker._get(i,"showOptions"),l):i.dpDiv[h||"show"](h?l:null),t.datepicker._shouldFocusInput(i)&&i.input.focus(),t.datepicker._curInst=i))}},_updateDatepicker:function(e){this.maxRows=4,o=e,e.dpDiv.empty().append(this._generateHTML(e)),this._attachHandlers(e),e.dpDiv.find("."+this._dayOverClass+" a").mouseover();var i,s=this._getNumberOfMonths(e),n=s[1],a=17;e.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width(""),n>1&&e.dpDiv.addClass("ui-datepicker-multi-"+n).css("width",a*n+"em"),e.dpDiv[(1!==s[0]||1!==s[1]?"add":"remove")+"Class"]("ui-datepicker-multi"),e.dpDiv[(this._get(e,"isRTL")?"add":"remove")+"Class"]("ui-datepicker-rtl"),e===t.datepicker._curInst&&t.datepicker._datepickerShowing&&t.datepicker._shouldFocusInput(e)&&e.input.focus(),e.yearshtml&&(i=e.yearshtml,setTimeout(function(){i===e.yearshtml&&e.yearshtml&&e.dpDiv.find("select.ui-datepicker-year:first").replaceWith(e.yearshtml),i=e.yearshtml=null},0))},_shouldFocusInput:function(t){return t.input&&t.input.is(":visible")&&!t.input.is(":disabled")&&!t.input.is(":focus")},_checkOffset:function(e,i,s){var n=e.dpDiv.outerWidth(),o=e.dpDiv.outerHeight(),a=e.input?e.input.outerWidth():0,r=e.input?e.input.outerHeight():0,h=document.documentElement.clientWidth+(s?0:t(document).scrollLeft()),l=document.documentElement.clientHeight+(s?0:t(document).scrollTop());return i.left-=this._get(e,"isRTL")?n-a:0,i.left-=s&&i.left===e.input.offset().left?t(document).scrollLeft():0,i.top-=s&&i.top===e.input.offset().top+r?t(document).scrollTop():0,i.left-=Math.min(i.left,i.left+n>h&&h>n?Math.abs(i.left+n-h):0),i.top-=Math.min(i.top,i.top+o>l&&l>o?Math.abs(o+r):0),i},_findPos:function(e){for(var i,s=this._getInst(e),n=this._get(s,"isRTL");e&&("hidden"===e.type||1!==e.nodeType||t.expr.filters.hidden(e));)e=e[n?"previousSibling":"nextSibling"];return i=t(e).offset(),[i.left,i.top]},_hideDatepicker:function(e){var i,s,n,o,r=this._curInst;!r||e&&r!==t.data(e,a)||this._datepickerShowing&&(i=this._get(r,"showAnim"),s=this._get(r,"duration"),n=function(){t.datepicker._tidyDialog(r)},t.effects&&(t.effects.effect[i]||t.effects[i])?r.dpDiv.hide(i,t.datepicker._get(r,"showOptions"),s,n):r.dpDiv["slideDown"===i?"slideUp":"fadeIn"===i?"fadeOut":"hide"](i?s:null,n),i||n(),this._datepickerShowing=!1,o=this._get(r,"onClose"),o&&o.apply(r.input?r.input[0]:null,[r.input?r.input.val():"",r]),this._lastInput=null,this._inDialog&&(this._dialogInput.css({position:"absolute",left:"0",top:"-100px"}),t.blockUI&&(t.unblockUI(),t("body").append(this.dpDiv))),this._inDialog=!1)},_tidyDialog:function(t){t.dpDiv.removeClass(this._dialogClass).unbind(".ui-datepicker-calendar")},_checkExternalClick:function(e){if(t.datepicker._curInst){var i=t(e.target),s=t.datepicker._getInst(i[0]);(i[0].id!==t.datepicker._mainDivId&&0===i.parents("#"+t.datepicker._mainDivId).length&&!i.hasClass(t.datepicker.markerClassName)&&!i.closest("."+t.datepicker._triggerClass).length&&t.datepicker._datepickerShowing&&(!t.datepicker._inDialog||!t.blockUI)||i.hasClass(t.datepicker.markerClassName)&&t.datepicker._curInst!==s)&&t.datepicker._hideDatepicker()}},_adjustDate:function(e,i,s){var n=t(e),o=this._getInst(n[0]);this._isDisabledDatepicker(n[0])||(this._adjustInstDate(o,i+("M"===s?this._get(o,"showCurrentAtPos"):0),s),this._updateDatepicker(o))},_gotoToday:function(e){var i,s=t(e),n=this._getInst(s[0]);this._get(n,"gotoCurrent")&&n.currentDay?(n.selectedDay=n.currentDay,n.drawMonth=n.selectedMonth=n.currentMonth,n.drawYear=n.selectedYear=n.currentYear):(i=new Date,n.selectedDay=i.getDate(),n.drawMonth=n.selectedMonth=i.getMonth(),n.drawYear=n.selectedYear=i.getFullYear()),this._notifyChange(n),this._adjustDate(s)},_selectMonthYear:function(e,i,s){var n=t(e),o=this._getInst(n[0]);o["selected"+("M"===s?"Month":"Year")]=o["draw"+("M"===s?"Month":"Year")]=parseInt(i.options[i.selectedIndex].value,10),this._notifyChange(o),this._adjustDate(n)},_selectDay:function(e,i,s,n){var o,a=t(e);t(n).hasClass(this._unselectableClass)||this._isDisabledDatepicker(a[0])||(o=this._getInst(a[0]),o.selectedDay=o.currentDay=t("a",n).html(),o.selectedMonth=o.currentMonth=i,o.selectedYear=o.currentYear=s,this._selectDate(e,this._formatDate(o,o.currentDay,o.currentMonth,o.currentYear)))},_clearDate:function(e){var i=t(e);this._selectDate(i,"")},_selectDate:function(e,i){var s,n=t(e),o=this._getInst(n[0]);i=null!=i?i:this._formatDate(o),o.input&&o.input.val(i),this._updateAlternate(o),s=this._get(o,"onSelect"),s?s.apply(o.input?o.input[0]:null,[i,o]):o.input&&o.input.trigger("change"),o.inline?this._updateDatepicker(o):(this._hideDatepicker(),this._lastInput=o.input[0],"object"!=typeof o.input[0]&&o.input.focus(),this._lastInput=null)},_updateAlternate:function(e){var i,s,n,o=this._get(e,"altField");o&&(i=this._get(e,"altFormat")||this._get(e,"dateFormat"),s=this._getDate(e),n=this.formatDate(i,s,this._getFormatConfig(e)),t(o).each(function(){t(this).val(n)}))},noWeekends:function(t){var e=t.getDay();return[e>0&&6>e,""]},iso8601Week:function(t){var e,i=new Date(t.getTime());return i.setDate(i.getDate()+4-(i.getDay()||7)),e=i.getTime(),i.setMonth(0),i.setDate(1),Math.floor(Math.round((e-i)/864e5)/7)+1},parseDate:function(i,s,n){if(null==i||null==s)throw"Invalid arguments";if(s="object"==typeof s?""+s:s+"",""===s)return null;var o,a,r,h,l=0,c=(n?n.shortYearCutoff:null)||this._defaults.shortYearCutoff,u="string"!=typeof c?c:(new Date).getFullYear()%100+parseInt(c,10),d=(n?n.dayNamesShort:null)||this._defaults.dayNamesShort,p=(n?n.dayNames:null)||this._defaults.dayNames,f=(n?n.monthNamesShort:null)||this._defaults.monthNamesShort,g=(n?n.monthNames:null)||this._defaults.monthNames,m=-1,v=-1,_=-1,b=-1,y=!1,w=function(t){var e=i.length>o+1&&i.charAt(o+1)===t;return e&&o++,e},x=function(t){var e=w(t),i="@"===t?14:"!"===t?20:"y"===t&&e?4:"o"===t?3:2,n=RegExp("^\\d{1,"+i+"}"),o=s.substring(l).match(n);if(!o)throw"Missing number at position "+l;return l+=o[0].length,parseInt(o[0],10)},k=function(i,n,o){var a=-1,r=t.map(w(i)?o:n,function(t,e){return[[e,t]]}).sort(function(t,e){return-(t[1].length-e[1].length)});if(t.each(r,function(t,i){var n=i[1];return s.substr(l,n.length).toLowerCase()===n.toLowerCase()?(a=i[0],l+=n.length,!1):e}),-1!==a)return a+1;throw"Unknown name at position "+l},D=function(){if(s.charAt(l)!==i.charAt(o))throw"Unexpected literal at position "+l;l++};for(o=0;i.length>o;o++)if(y)"'"!==i.charAt(o)||w("'")?D():y=!1;else switch(i.charAt(o)){case"d":_=x("d");break;case"D":k("D",d,p);break;case"o":b=x("o");break;case"m":v=x("m");break;case"M":v=k("M",f,g);break;case"y":m=x("y");break;case"@":h=new Date(x("@")),m=h.getFullYear(),v=h.getMonth()+1,_=h.getDate();break;case"!":h=new Date((x("!")-this._ticksTo1970)/1e4),m=h.getFullYear(),v=h.getMonth()+1,_=h.getDate();break;case"'":w("'")?D():y=!0;break;default:D()}if(s.length>l&&(r=s.substr(l),!/^\s+/.test(r)))throw"Extra/unparsed characters found in date: "+r;if(-1===m?m=(new Date).getFullYear():100>m&&(m+=(new Date).getFullYear()-(new Date).getFullYear()%100+(u>=m?0:-100)),b>-1)for(v=1,_=b;;){if(a=this._getDaysInMonth(m,v-1),a>=_)break;v++,_-=a}if(h=this._daylightSavingAdjust(new Date(m,v-1,_)),h.getFullYear()!==m||h.getMonth()+1!==v||h.getDate()!==_)throw"Invalid date";return h},ATOM:"yy-mm-dd",COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd",RFC_822:"D, d M y",RFC_850:"DD, dd-M-y",RFC_1036:"D, d M y",RFC_1123:"D, d M yy",RFC_2822:"D, d M yy",RSS:"D, d M y",TICKS:"!",TIMESTAMP:"@",W3C:"yy-mm-dd",_ticksTo1970:1e7*60*60*24*(718685+Math.floor(492.5)-Math.floor(19.7)+Math.floor(4.925)),formatDate:function(t,e,i){if(!e)return"";var s,n=(i?i.dayNamesShort:null)||this._defaults.dayNamesShort,o=(i?i.dayNames:null)||this._defaults.dayNames,a=(i?i.monthNamesShort:null)||this._defaults.monthNamesShort,r=(i?i.monthNames:null)||this._defaults.monthNames,h=function(e){var i=t.length>s+1&&t.charAt(s+1)===e;return i&&s++,i},l=function(t,e,i){var s=""+e;if(h(t))for(;i>s.length;)s="0"+s;return s},c=function(t,e,i,s){return h(t)?s[e]:i[e]},u="",d=!1;if(e)for(s=0;t.length>s;s++)if(d)"'"!==t.charAt(s)||h("'")?u+=t.charAt(s):d=!1;else switch(t.charAt(s)){case"d":u+=l("d",e.getDate(),2);break;case"D":u+=c("D",e.getDay(),n,o);break;case"o":u+=l("o",Math.round((new Date(e.getFullYear(),e.getMonth(),e.getDate()).getTime()-new Date(e.getFullYear(),0,0).getTime())/864e5),3);break;case"m":u+=l("m",e.getMonth()+1,2);break;case"M":u+=c("M",e.getMonth(),a,r);break;case"y":u+=h("y")?e.getFullYear():(10>e.getYear()%100?"0":"")+e.getYear()%100;break;case"@":u+=e.getTime();break;case"!":u+=1e4*e.getTime()+this._ticksTo1970;break;case"'":h("'")?u+="'":d=!0;break;default:u+=t.charAt(s)}return u},_possibleChars:function(t){var e,i="",s=!1,n=function(i){var s=t.length>e+1&&t.charAt(e+1)===i;return s&&e++,s};for(e=0;t.length>e;e++)if(s)"'"!==t.charAt(e)||n("'")?i+=t.charAt(e):s=!1;else switch(t.charAt(e)){case"d":case"m":case"y":case"@":i+="0123456789";break;case"D":case"M":return null;case"'":n("'")?i+="'":s=!0;break;default:i+=t.charAt(e)}return i},_get:function(t,i){return t.settings[i]!==e?t.settings[i]:this._defaults[i]},_setDateFromField:function(t,e){if(t.input.val()!==t.lastVal){var i=this._get(t,"dateFormat"),s=t.lastVal=t.input?t.input.val():null,n=this._getDefaultDate(t),o=n,a=this._getFormatConfig(t);try{o=this.parseDate(i,s,a)||n}catch(r){s=e?"":s}t.selectedDay=o.getDate(),t.drawMonth=t.selectedMonth=o.getMonth(),t.drawYear=t.selectedYear=o.getFullYear(),t.currentDay=s?o.getDate():0,t.currentMonth=s?o.getMonth():0,t.currentYear=s?o.getFullYear():0,this._adjustInstDate(t)}},_getDefaultDate:function(t){return this._restrictMinMax(t,this._determineDate(t,this._get(t,"defaultDate"),new Date))},_determineDate:function(e,i,s){var n=function(t){var e=new Date;return e.setDate(e.getDate()+t),e},o=function(i){try{return t.datepicker.parseDate(t.datepicker._get(e,"dateFormat"),i,t.datepicker._getFormatConfig(e))}catch(s){}for(var n=(i.toLowerCase().match(/^c/)?t.datepicker._getDate(e):null)||new Date,o=n.getFullYear(),a=n.getMonth(),r=n.getDate(),h=/([+\-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g,l=h.exec(i);l;){switch(l[2]||"d"){case"d":case"D":r+=parseInt(l[1],10);break;case"w":case"W":r+=7*parseInt(l[1],10);break;case"m":case"M":a+=parseInt(l[1],10),r=Math.min(r,t.datepicker._getDaysInMonth(o,a));break;case"y":case"Y":o+=parseInt(l[1],10),r=Math.min(r,t.datepicker._getDaysInMonth(o,a))}l=h.exec(i)}return new Date(o,a,r)},a=null==i||""===i?s:"string"==typeof i?o(i):"number"==typeof i?isNaN(i)?s:n(i):new Date(i.getTime());return a=a&&"Invalid Date"==""+a?s:a,a&&(a.setHours(0),a.setMinutes(0),a.setSeconds(0),a.setMilliseconds(0)),this._daylightSavingAdjust(a)},_daylightSavingAdjust:function(t){return t?(t.setHours(t.getHours()>12?t.getHours()+2:0),t):null},_setDate:function(t,e,i){var s=!e,n=t.selectedMonth,o=t.selectedYear,a=this._restrictMinMax(t,this._determineDate(t,e,new Date));t.selectedDay=t.currentDay=a.getDate(),t.drawMonth=t.selectedMonth=t.currentMonth=a.getMonth(),t.drawYear=t.selectedYear=t.currentYear=a.getFullYear(),n===t.selectedMonth&&o===t.selectedYear||i||this._notifyChange(t),this._adjustInstDate(t),t.input&&t.input.val(s?"":this._formatDate(t))},_getDate:function(t){var e=!t.currentYear||t.input&&""===t.input.val()?null:this._daylightSavingAdjust(new Date(t.currentYear,t.currentMonth,t.currentDay));return e},_attachHandlers:function(e){var i=this._get(e,"stepMonths"),s="#"+e.id.replace(/\\\\/g,"\\");e.dpDiv.find("[data-handler]").map(function(){var e={prev:function(){t.datepicker._adjustDate(s,-i,"M")},next:function(){t.datepicker._adjustDate(s,+i,"M")},hide:function(){t.datepicker._hideDatepicker()},today:function(){t.datepicker._gotoToday(s)},selectDay:function(){return t.datepicker._selectDay(s,+this.getAttribute("data-month"),+this.getAttribute("data-year"),this),!1},selectMonth:function(){return t.datepicker._selectMonthYear(s,this,"M"),!1},selectYear:function(){return t.datepicker._selectMonthYear(s,this,"Y"),!1}};t(this).bind(this.getAttribute("data-event"),e[this.getAttribute("data-handler")])})},_generateHTML:function(t){var e,i,s,n,o,a,r,h,l,c,u,d,p,f,g,m,v,_,b,y,w,x,k,D,C,I,P,T,M,S,z,A,E,H,N,W,O,F,R,L=new Date,j=this._daylightSavingAdjust(new Date(L.getFullYear(),L.getMonth(),L.getDate())),Y=this._get(t,"isRTL"),B=this._get(t,"showButtonPanel"),V=this._get(t,"hideIfNoPrevNext"),K=this._get(t,"navigationAsDateFormat"),q=this._getNumberOfMonths(t),U=this._get(t,"showCurrentAtPos"),Q=this._get(t,"stepMonths"),X=1!==q[0]||1!==q[1],$=this._daylightSavingAdjust(t.currentDay?new Date(t.currentYear,t.currentMonth,t.currentDay):new Date(9999,9,9)),G=this._getMinMaxDate(t,"min"),J=this._getMinMaxDate(t,"max"),Z=t.drawMonth-U,te=t.drawYear;if(0>Z&&(Z+=12,te--),J)for(e=this._daylightSavingAdjust(new Date(J.getFullYear(),J.getMonth()-q[0]*q[1]+1,J.getDate())),e=G&&G>e?G:e;this._daylightSavingAdjust(new Date(te,Z,1))>e;)Z--,0>Z&&(Z=11,te--);for(t.drawMonth=Z,t.drawYear=te,i=this._get(t,"prevText"),i=K?this.formatDate(i,this._daylightSavingAdjust(new Date(te,Z-Q,1)),this._getFormatConfig(t)):i,s=this._canAdjustMonth(t,-1,te,Z)?"<a class='ui-datepicker-prev ui-corner-all' data-handler='prev' data-event='click' title='"+i+"'><span class='ui-icon ui-icon-circle-triangle-"+(Y?"e":"w")+"'>"+i+"</span></a>":V?"":"<a class='ui-datepicker-prev ui-corner-all ui-state-disabled' title='"+i+"'><span class='ui-icon ui-icon-circle-triangle-"+(Y?"e":"w")+"'>"+i+"</span></a>",n=this._get(t,"nextText"),n=K?this.formatDate(n,this._daylightSavingAdjust(new Date(te,Z+Q,1)),this._getFormatConfig(t)):n,o=this._canAdjustMonth(t,1,te,Z)?"<a class='ui-datepicker-next ui-corner-all' data-handler='next' data-event='click' title='"+n+"'><span class='ui-icon ui-icon-circle-triangle-"+(Y?"w":"e")+"'>"+n+"</span></a>":V?"":"<a class='ui-datepicker-next ui-corner-all ui-state-disabled' title='"+n+"'><span class='ui-icon ui-icon-circle-triangle-"+(Y?"w":"e")+"'>"+n+"</span></a>",a=this._get(t,"currentText"),r=this._get(t,"gotoCurrent")&&t.currentDay?$:j,a=K?this.formatDate(a,r,this._getFormatConfig(t)):a,h=t.inline?"":"<button type='button' class='ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all' data-handler='hide' data-event='click'>"+this._get(t,"closeText")+"</button>",l=B?"<div class='ui-datepicker-buttonpane ui-widget-content'>"+(Y?h:"")+(this._isInRange(t,r)?"<button type='button' class='ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all' data-handler='today' data-event='click'>"+a+"</button>":"")+(Y?"":h)+"</div>":"",c=parseInt(this._get(t,"firstDay"),10),c=isNaN(c)?0:c,u=this._get(t,"showWeek"),d=this._get(t,"dayNames"),p=this._get(t,"dayNamesMin"),f=this._get(t,"monthNames"),g=this._get(t,"monthNamesShort"),m=this._get(t,"beforeShowDay"),v=this._get(t,"showOtherMonths"),_=this._get(t,"selectOtherMonths"),b=this._getDefaultDate(t),y="",x=0;q[0]>x;x++){for(k="",this.maxRows=4,D=0;q[1]>D;D++){if(C=this._daylightSavingAdjust(new Date(te,Z,t.selectedDay)),I=" ui-corner-all",P="",X){if(P+="<div class='ui-datepicker-group",q[1]>1)switch(D){case 0:P+=" ui-datepicker-group-first",I=" ui-corner-"+(Y?"right":"left");break;case q[1]-1:P+=" ui-datepicker-group-last",I=" ui-corner-"+(Y?"left":"right");break;default:P+=" ui-datepicker-group-middle",I=""}P+="'>"}for(P+="<div class='ui-datepicker-header ui-widget-header ui-helper-clearfix"+I+"'>"+(/all|left/.test(I)&&0===x?Y?o:s:"")+(/all|right/.test(I)&&0===x?Y?s:o:"")+this._generateMonthYearHeader(t,Z,te,G,J,x>0||D>0,f,g)+"</div><table class='ui-datepicker-calendar'><thead>"+"<tr>",T=u?"<th class='ui-datepicker-week-col'>"+this._get(t,"weekHeader")+"</th>":"",w=0;7>w;w++)M=(w+c)%7,T+="<th"+((w+c+6)%7>=5?" class='ui-datepicker-week-end'":"")+">"+"<span title='"+d[M]+"'>"+p[M]+"</span></th>";for(P+=T+"</tr></thead><tbody>",S=this._getDaysInMonth(te,Z),te===t.selectedYear&&Z===t.selectedMonth&&(t.selectedDay=Math.min(t.selectedDay,S)),z=(this._getFirstDayOfMonth(te,Z)-c+7)%7,A=Math.ceil((z+S)/7),E=X?this.maxRows>A?this.maxRows:A:A,this.maxRows=E,H=this._daylightSavingAdjust(new Date(te,Z,1-z)),N=0;E>N;N++){for(P+="<tr>",W=u?"<td class='ui-datepicker-week-col'>"+this._get(t,"calculateWeek")(H)+"</td>":"",w=0;7>w;w++)O=m?m.apply(t.input?t.input[0]:null,[H]):[!0,""],F=H.getMonth()!==Z,R=F&&!_||!O[0]||G&&G>H||J&&H>J,W+="<td class='"+((w+c+6)%7>=5?" ui-datepicker-week-end":"")+(F?" ui-datepicker-other-month":"")+(H.getTime()===C.getTime()&&Z===t.selectedMonth&&t._keyEvent||b.getTime()===H.getTime()&&b.getTime()===C.getTime()?" "+this._dayOverClass:"")+(R?" "+this._unselectableClass+" ui-state-disabled":"")+(F&&!v?"":" "+O[1]+(H.getTime()===$.getTime()?" "+this._currentClass:"")+(H.getTime()===j.getTime()?" ui-datepicker-today":""))+"'"+(F&&!v||!O[2]?"":" title='"+O[2].replace(/'/g,"&#39;")+"'")+(R?"":" data-handler='selectDay' data-event='click' data-month='"+H.getMonth()+"' data-year='"+H.getFullYear()+"'")+">"+(F&&!v?"&#xa0;":R?"<span class='ui-state-default'>"+H.getDate()+"</span>":"<a class='ui-state-default"+(H.getTime()===j.getTime()?" ui-state-highlight":"")+(H.getTime()===$.getTime()?" ui-state-active":"")+(F?" ui-priority-secondary":"")+"' href='#'>"+H.getDate()+"</a>")+"</td>",H.setDate(H.getDate()+1),H=this._daylightSavingAdjust(H);P+=W+"</tr>"}Z++,Z>11&&(Z=0,te++),P+="</tbody></table>"+(X?"</div>"+(q[0]>0&&D===q[1]-1?"<div class='ui-datepicker-row-break'></div>":""):""),k+=P}y+=k}return y+=l,t._keyEvent=!1,y},_generateMonthYearHeader:function(t,e,i,s,n,o,a,r){var h,l,c,u,d,p,f,g,m=this._get(t,"changeMonth"),v=this._get(t,"changeYear"),_=this._get(t,"showMonthAfterYear"),b="<div class='ui-datepicker-title'>",y="";if(o||!m)y+="<span class='ui-datepicker-month'>"+a[e]+"</span>";else{for(h=s&&s.getFullYear()===i,l=n&&n.getFullYear()===i,y+="<select class='ui-datepicker-month' data-handler='selectMonth' data-event='change'>",c=0;12>c;c++)(!h||c>=s.getMonth())&&(!l||n.getMonth()>=c)&&(y+="<option value='"+c+"'"+(c===e?" selected='selected'":"")+">"+r[c]+"</option>");y+="</select>"}if(_||(b+=y+(!o&&m&&v?"":"&#xa0;")),!t.yearshtml)if(t.yearshtml="",o||!v)b+="<span class='ui-datepicker-year'>"+i+"</span>";else{for(u=this._get(t,"yearRange").split(":"),d=(new Date).getFullYear(),p=function(t){var e=t.match(/c[+\-].*/)?i+parseInt(t.substring(1),10):t.match(/[+\-].*/)?d+parseInt(t,10):parseInt(t,10);return isNaN(e)?d:e},f=p(u[0]),g=Math.max(f,p(u[1]||"")),f=s?Math.max(f,s.getFullYear()):f,g=n?Math.min(g,n.getFullYear()):g,t.yearshtml+="<select class='ui-datepicker-year' data-handler='selectYear' data-event='change'>";g>=f;f++)t.yearshtml+="<option value='"+f+"'"+(f===i?" selected='selected'":"")+">"+f+"</option>";t.yearshtml+="</select>",b+=t.yearshtml,t.yearshtml=null}return b+=this._get(t,"yearSuffix"),_&&(b+=(!o&&m&&v?"":"&#xa0;")+y),b+="</div>"},_adjustInstDate:function(t,e,i){var s=t.drawYear+("Y"===i?e:0),n=t.drawMonth+("M"===i?e:0),o=Math.min(t.selectedDay,this._getDaysInMonth(s,n))+("D"===i?e:0),a=this._restrictMinMax(t,this._daylightSavingAdjust(new Date(s,n,o)));t.selectedDay=a.getDate(),t.drawMonth=t.selectedMonth=a.getMonth(),t.drawYear=t.selectedYear=a.getFullYear(),("M"===i||"Y"===i)&&this._notifyChange(t)},_restrictMinMax:function(t,e){var i=this._getMinMaxDate(t,"min"),s=this._getMinMaxDate(t,"max"),n=i&&i>e?i:e;return s&&n>s?s:n},_notifyChange:function(t){var e=this._get(t,"onChangeMonthYear");e&&e.apply(t.input?t.input[0]:null,[t.selectedYear,t.selectedMonth+1,t])},_getNumberOfMonths:function(t){var e=this._get(t,"numberOfMonths");return null==e?[1,1]:"number"==typeof e?[1,e]:e},_getMinMaxDate:function(t,e){return this._determineDate(t,this._get(t,e+"Date"),null)},_getDaysInMonth:function(t,e){return 32-this._daylightSavingAdjust(new Date(t,e,32)).getDate()},_getFirstDayOfMonth:function(t,e){return new Date(t,e,1).getDay()},_canAdjustMonth:function(t,e,i,s){var n=this._getNumberOfMonths(t),o=this._daylightSavingAdjust(new Date(i,s+(0>e?e:n[0]*n[1]),1));return 0>e&&o.setDate(this._getDaysInMonth(o.getFullYear(),o.getMonth())),this._isInRange(t,o)},_isInRange:function(t,e){var i,s,n=this._getMinMaxDate(t,"min"),o=this._getMinMaxDate(t,"max"),a=null,r=null,h=this._get(t,"yearRange");return h&&(i=h.split(":"),s=(new Date).getFullYear(),a=parseInt(i[0],10),r=parseInt(i[1],10),i[0].match(/[+\-].*/)&&(a+=s),i[1].match(/[+\-].*/)&&(r+=s)),(!n||e.getTime()>=n.getTime())&&(!o||e.getTime()<=o.getTime())&&(!a||e.getFullYear()>=a)&&(!r||r>=e.getFullYear())},_getFormatConfig:function(t){var e=this._get(t,"shortYearCutoff");return e="string"!=typeof e?e:(new Date).getFullYear()%100+parseInt(e,10),{shortYearCutoff:e,dayNamesShort:this._get(t,"dayNamesShort"),dayNames:this._get(t,"dayNames"),monthNamesShort:this._get(t,"monthNamesShort"),monthNames:this._get(t,"monthNames")}},_formatDate:function(t,e,i,s){e||(t.currentDay=t.selectedDay,t.currentMonth=t.selectedMonth,t.currentYear=t.selectedYear);var n=e?"object"==typeof e?e:this._daylightSavingAdjust(new Date(s,i,e)):this._daylightSavingAdjust(new Date(t.currentYear,t.currentMonth,t.currentDay));return this.formatDate(this._get(t,"dateFormat"),n,this._getFormatConfig(t))}}),t.fn.datepicker=function(e){if(!this.length)return this;t.datepicker.initialized||(t(document).mousedown(t.datepicker._checkExternalClick),t.datepicker.initialized=!0),0===t("#"+t.datepicker._mainDivId).length&&t("body").append(t.datepicker.dpDiv);var i=Array.prototype.slice.call(arguments,1);return"string"!=typeof e||"isDisabled"!==e&&"getDate"!==e&&"widget"!==e?"option"===e&&2===arguments.length&&"string"==typeof arguments[1]?t.datepicker["_"+e+"Datepicker"].apply(t.datepicker,[this[0]].concat(i)):this.each(function(){"string"==typeof e?t.datepicker["_"+e+"Datepicker"].apply(t.datepicker,[this].concat(i)):t.datepicker._attachDatepicker(this,e)}):t.datepicker["_"+e+"Datepicker"].apply(t.datepicker,[this[0]].concat(i))},t.datepicker=new i,t.datepicker.initialized=!1,t.datepicker.uuid=(new Date).getTime(),t.datepicker.version="1.10.4"}(jQuery),function(t){var e={buttons:!0,height:!0,maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0,width:!0},i={maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0};t.widget("ui.dialog",{version:"1.10.4",options:{appendTo:"body",autoOpen:!0,buttons:[],closeOnEscape:!0,closeText:"close",dialogClass:"",draggable:!0,hide:null,height:"auto",maxHeight:null,maxWidth:null,minHeight:150,minWidth:150,modal:!1,position:{my:"center",at:"center",of:window,collision:"fit",using:function(e){var i=t(this).css(e).offset().top;0>i&&t(this).css("top",e.top-i)}},resizable:!0,show:null,title:null,width:300,beforeClose:null,close:null,drag:null,dragStart:null,dragStop:null,focus:null,open:null,resize:null,resizeStart:null,resizeStop:null},_create:function(){this.originalCss={display:this.element[0].style.display,width:this.element[0].style.width,minHeight:this.element[0].style.minHeight,maxHeight:this.element[0].style.maxHeight,height:this.element[0].style.height},this.originalPosition={parent:this.element.parent(),index:this.element.parent().children().index(this.element)},this.originalTitle=this.element.attr("title"),this.options.title=this.options.title||this.originalTitle,this._createWrapper(),this.element.show().removeAttr("title").addClass("ui-dialog-content ui-widget-content").appendTo(this.uiDialog),this._createTitlebar(),this._createButtonPane(),this.options.draggable&&t.fn.draggable&&this._makeDraggable(),this.options.resizable&&t.fn.resizable&&this._makeResizable(),this._isOpen=!1},_init:function(){this.options.autoOpen&&this.open()},_appendTo:function(){var e=this.options.appendTo;return e&&(e.jquery||e.nodeType)?t(e):this.document.find(e||"body").eq(0)},_destroy:function(){var t,e=this.originalPosition;this._destroyOverlay(),this.element.removeUniqueId().removeClass("ui-dialog-content ui-widget-content").css(this.originalCss).detach(),this.uiDialog.stop(!0,!0).remove(),this.originalTitle&&this.element.attr("title",this.originalTitle),t=e.parent.children().eq(e.index),t.length&&t[0]!==this.element[0]?t.before(this.element):e.parent.append(this.element)},widget:function(){return this.uiDialog},disable:t.noop,enable:t.noop,close:function(e){var i,s=this;if(this._isOpen&&this._trigger("beforeClose",e)!==!1){if(this._isOpen=!1,this._destroyOverlay(),!this.opener.filter(":focusable").focus().length)try{i=this.document[0].activeElement,i&&"body"!==i.nodeName.toLowerCase()&&t(i).blur()}catch(n){}this._hide(this.uiDialog,this.options.hide,function(){s._trigger("close",e)})}},isOpen:function(){return this._isOpen},moveToTop:function(){this._moveToTop()},_moveToTop:function(t,e){var i=!!this.uiDialog.nextAll(":visible").insertBefore(this.uiDialog).length;return i&&!e&&this._trigger("focus",t),i},open:function(){var e=this;return this._isOpen?(this._moveToTop()&&this._focusTabbable(),undefined):(this._isOpen=!0,this.opener=t(this.document[0].activeElement),this._size(),this._position(),this._createOverlay(),this._moveToTop(null,!0),this._show(this.uiDialog,this.options.show,function(){e._focusTabbable(),e._trigger("focus")}),this._trigger("open"),undefined)},_focusTabbable:function(){var t=this.element.find("[autofocus]");t.length||(t=this.element.find(":tabbable")),t.length||(t=this.uiDialogButtonPane.find(":tabbable")),t.length||(t=this.uiDialogTitlebarClose.filter(":tabbable")),t.length||(t=this.uiDialog),t.eq(0).focus()},_keepFocus:function(e){function i(){var e=this.document[0].activeElement,i=this.uiDialog[0]===e||t.contains(this.uiDialog[0],e);i||this._focusTabbable()}e.preventDefault(),i.call(this),this._delay(i)},_createWrapper:function(){this.uiDialog=t("<div>").addClass("ui-dialog ui-widget ui-widget-content ui-corner-all ui-front "+this.options.dialogClass).hide().attr({tabIndex:-1,role:"dialog"}).appendTo(this._appendTo()),this._on(this.uiDialog,{keydown:function(e){if(this.options.closeOnEscape&&!e.isDefaultPrevented()&&e.keyCode&&e.keyCode===t.ui.keyCode.ESCAPE)return e.preventDefault(),this.close(e),undefined;if(e.keyCode===t.ui.keyCode.TAB){var i=this.uiDialog.find(":tabbable"),s=i.filter(":first"),n=i.filter(":last");e.target!==n[0]&&e.target!==this.uiDialog[0]||e.shiftKey?e.target!==s[0]&&e.target!==this.uiDialog[0]||!e.shiftKey||(n.focus(1),e.preventDefault()):(s.focus(1),e.preventDefault())}},mousedown:function(t){this._moveToTop(t)&&this._focusTabbable()}}),this.element.find("[aria-describedby]").length||this.uiDialog.attr({"aria-describedby":this.element.uniqueId().attr("id")})},_createTitlebar:function(){var e;this.uiDialogTitlebar=t("<div>").addClass("ui-dialog-titlebar ui-widget-header ui-corner-all ui-helper-clearfix").prependTo(this.uiDialog),this._on(this.uiDialogTitlebar,{mousedown:function(e){t(e.target).closest(".ui-dialog-titlebar-close")||this.uiDialog.focus()}}),this.uiDialogTitlebarClose=t("<button type='button'></button>").button({label:this.options.closeText,icons:{primary:"ui-icon-closethick"},text:!1}).addClass("ui-dialog-titlebar-close").appendTo(this.uiDialogTitlebar),this._on(this.uiDialogTitlebarClose,{click:function(t){t.preventDefault(),this.close(t)}}),e=t("<span>").uniqueId().addClass("ui-dialog-title").prependTo(this.uiDialogTitlebar),this._title(e),this.uiDialog.attr({"aria-labelledby":e.attr("id")})},_title:function(t){this.options.title||t.html("&#160;"),t.text(this.options.title)},_createButtonPane:function(){this.uiDialogButtonPane=t("<div>").addClass("ui-dialog-buttonpane ui-widget-content ui-helper-clearfix"),this.uiButtonSet=t("<div>").addClass("ui-dialog-buttonset").appendTo(this.uiDialogButtonPane),this._createButtons()},_createButtons:function(){var e=this,i=this.options.buttons;return this.uiDialogButtonPane.remove(),this.uiButtonSet.empty(),t.isEmptyObject(i)||t.isArray(i)&&!i.length?(this.uiDialog.removeClass("ui-dialog-buttons"),undefined):(t.each(i,function(i,s){var n,o;s=t.isFunction(s)?{click:s,text:i}:s,s=t.extend({type:"button"},s),n=s.click,s.click=function(){n.apply(e.element[0],arguments)},o={icons:s.icons,text:s.showText},delete s.icons,delete s.showText,t("<button></button>",s).button(o).appendTo(e.uiButtonSet)}),this.uiDialog.addClass("ui-dialog-buttons"),this.uiDialogButtonPane.appendTo(this.uiDialog),undefined)},_makeDraggable:function(){function e(t){return{position:t.position,offset:t.offset}}var i=this,s=this.options;this.uiDialog.draggable({cancel:".ui-dialog-content, .ui-dialog-titlebar-close",handle:".ui-dialog-titlebar",containment:"document",start:function(s,n){t(this).addClass("ui-dialog-dragging"),i._blockFrames(),i._trigger("dragStart",s,e(n))},drag:function(t,s){i._trigger("drag",t,e(s))},stop:function(n,o){s.position=[o.position.left-i.document.scrollLeft(),o.position.top-i.document.scrollTop()],t(this).removeClass("ui-dialog-dragging"),i._unblockFrames(),i._trigger("dragStop",n,e(o))}})},_makeResizable:function(){function e(t){return{originalPosition:t.originalPosition,originalSize:t.originalSize,position:t.position,size:t.size}}var i=this,s=this.options,n=s.resizable,o=this.uiDialog.css("position"),a="string"==typeof n?n:"n,e,s,w,se,sw,ne,nw";
+this.uiDialog.resizable({cancel:".ui-dialog-content",containment:"document",alsoResize:this.element,maxWidth:s.maxWidth,maxHeight:s.maxHeight,minWidth:s.minWidth,minHeight:this._minHeight(),handles:a,start:function(s,n){t(this).addClass("ui-dialog-resizing"),i._blockFrames(),i._trigger("resizeStart",s,e(n))},resize:function(t,s){i._trigger("resize",t,e(s))},stop:function(n,o){s.height=t(this).height(),s.width=t(this).width(),t(this).removeClass("ui-dialog-resizing"),i._unblockFrames(),i._trigger("resizeStop",n,e(o))}}).css("position",o)},_minHeight:function(){var t=this.options;return"auto"===t.height?t.minHeight:Math.min(t.minHeight,t.height)},_position:function(){var t=this.uiDialog.is(":visible");t||this.uiDialog.show(),this.uiDialog.position(this.options.position),t||this.uiDialog.hide()},_setOptions:function(s){var n=this,o=!1,a={};t.each(s,function(t,s){n._setOption(t,s),t in e&&(o=!0),t in i&&(a[t]=s)}),o&&(this._size(),this._position()),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option",a)},_setOption:function(t,e){var i,s,n=this.uiDialog;"dialogClass"===t&&n.removeClass(this.options.dialogClass).addClass(e),"disabled"!==t&&(this._super(t,e),"appendTo"===t&&this.uiDialog.appendTo(this._appendTo()),"buttons"===t&&this._createButtons(),"closeText"===t&&this.uiDialogTitlebarClose.button({label:""+e}),"draggable"===t&&(i=n.is(":data(ui-draggable)"),i&&!e&&n.draggable("destroy"),!i&&e&&this._makeDraggable()),"position"===t&&this._position(),"resizable"===t&&(s=n.is(":data(ui-resizable)"),s&&!e&&n.resizable("destroy"),s&&"string"==typeof e&&n.resizable("option","handles",e),s||e===!1||this._makeResizable()),"title"===t&&this._title(this.uiDialogTitlebar.find(".ui-dialog-title")))},_size:function(){var t,e,i,s=this.options;this.element.show().css({width:"auto",minHeight:0,maxHeight:"none",height:0}),s.minWidth>s.width&&(s.width=s.minWidth),t=this.uiDialog.css({height:"auto",width:s.width}).outerHeight(),e=Math.max(0,s.minHeight-t),i="number"==typeof s.maxHeight?Math.max(0,s.maxHeight-t):"none","auto"===s.height?this.element.css({minHeight:e,maxHeight:i,height:"auto"}):this.element.height(Math.max(0,s.height-t)),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option","minHeight",this._minHeight())},_blockFrames:function(){this.iframeBlocks=this.document.find("iframe").map(function(){var e=t(this);return t("<div>").css({position:"absolute",width:e.outerWidth(),height:e.outerHeight()}).appendTo(e.parent()).offset(e.offset())[0]})},_unblockFrames:function(){this.iframeBlocks&&(this.iframeBlocks.remove(),delete this.iframeBlocks)},_allowInteraction:function(e){return t(e.target).closest(".ui-dialog").length?!0:!!t(e.target).closest(".ui-datepicker").length},_createOverlay:function(){if(this.options.modal){var e=this,i=this.widgetFullName;t.ui.dialog.overlayInstances||this._delay(function(){t.ui.dialog.overlayInstances&&this.document.bind("focusin.dialog",function(s){e._allowInteraction(s)||(s.preventDefault(),t(".ui-dialog:visible:last .ui-dialog-content").data(i)._focusTabbable())})}),this.overlay=t("<div>").addClass("ui-widget-overlay ui-front").appendTo(this._appendTo()),this._on(this.overlay,{mousedown:"_keepFocus"}),t.ui.dialog.overlayInstances++}},_destroyOverlay:function(){this.options.modal&&this.overlay&&(t.ui.dialog.overlayInstances--,t.ui.dialog.overlayInstances||this.document.unbind("focusin.dialog"),this.overlay.remove(),this.overlay=null)}}),t.ui.dialog.overlayInstances=0,t.uiBackCompat!==!1&&t.widget("ui.dialog",t.ui.dialog,{_position:function(){var e,i=this.options.position,s=[],n=[0,0];i?(("string"==typeof i||"object"==typeof i&&"0"in i)&&(s=i.split?i.split(" "):[i[0],i[1]],1===s.length&&(s[1]=s[0]),t.each(["left","top"],function(t,e){+s[t]===s[t]&&(n[t]=s[t],s[t]=e)}),i={my:s[0]+(0>n[0]?n[0]:"+"+n[0])+" "+s[1]+(0>n[1]?n[1]:"+"+n[1]),at:s.join(" ")}),i=t.extend({},t.ui.dialog.prototype.options.position,i)):i=t.ui.dialog.prototype.options.position,e=this.uiDialog.is(":visible"),e||this.uiDialog.show(),this.uiDialog.position(i),e||this.uiDialog.hide()}})}(jQuery),function(t){var e=/up|down|vertical/,i=/up|left|vertical|horizontal/;t.effects.effect.blind=function(s,n){var o,a,r,h=t(this),l=["position","top","bottom","left","right","height","width"],c=t.effects.setMode(h,s.mode||"hide"),u=s.direction||"up",d=e.test(u),p=d?"height":"width",f=d?"top":"left",g=i.test(u),m={},v="show"===c;h.parent().is(".ui-effects-wrapper")?t.effects.save(h.parent(),l):t.effects.save(h,l),h.show(),o=t.effects.createWrapper(h).css({overflow:"hidden"}),a=o[p](),r=parseFloat(o.css(f))||0,m[p]=v?a:0,g||(h.css(d?"bottom":"right",0).css(d?"top":"left","auto").css({position:"absolute"}),m[f]=v?r:a+r),v&&(o.css(p,0),g||o.css(f,r+a)),o.animate(m,{duration:s.duration,easing:s.easing,queue:!1,complete:function(){"hide"===c&&h.hide(),t.effects.restore(h,l),t.effects.removeWrapper(h),n()}})}}(jQuery),function(t){t.effects.effect.bounce=function(e,i){var s,n,o,a=t(this),r=["position","top","bottom","left","right","height","width"],h=t.effects.setMode(a,e.mode||"effect"),l="hide"===h,c="show"===h,u=e.direction||"up",d=e.distance,p=e.times||5,f=2*p+(c||l?1:0),g=e.duration/f,m=e.easing,v="up"===u||"down"===u?"top":"left",_="up"===u||"left"===u,b=a.queue(),y=b.length;for((c||l)&&r.push("opacity"),t.effects.save(a,r),a.show(),t.effects.createWrapper(a),d||(d=a["top"===v?"outerHeight":"outerWidth"]()/3),c&&(o={opacity:1},o[v]=0,a.css("opacity",0).css(v,_?2*-d:2*d).animate(o,g,m)),l&&(d/=Math.pow(2,p-1)),o={},o[v]=0,s=0;p>s;s++)n={},n[v]=(_?"-=":"+=")+d,a.animate(n,g,m).animate(o,g,m),d=l?2*d:d/2;l&&(n={opacity:0},n[v]=(_?"-=":"+=")+d,a.animate(n,g,m)),a.queue(function(){l&&a.hide(),t.effects.restore(a,r),t.effects.removeWrapper(a),i()}),y>1&&b.splice.apply(b,[1,0].concat(b.splice(y,f+1))),a.dequeue()}}(jQuery),function(t){t.effects.effect.clip=function(e,i){var s,n,o,a=t(this),r=["position","top","bottom","left","right","height","width"],h=t.effects.setMode(a,e.mode||"hide"),l="show"===h,c=e.direction||"vertical",u="vertical"===c,d=u?"height":"width",p=u?"top":"left",f={};t.effects.save(a,r),a.show(),s=t.effects.createWrapper(a).css({overflow:"hidden"}),n="IMG"===a[0].tagName?s:a,o=n[d](),l&&(n.css(d,0),n.css(p,o/2)),f[d]=l?o:0,f[p]=l?0:o/2,n.animate(f,{queue:!1,duration:e.duration,easing:e.easing,complete:function(){l||a.hide(),t.effects.restore(a,r),t.effects.removeWrapper(a),i()}})}}(jQuery),function(t){t.effects.effect.drop=function(e,i){var s,n=t(this),o=["position","top","bottom","left","right","opacity","height","width"],a=t.effects.setMode(n,e.mode||"hide"),r="show"===a,h=e.direction||"left",l="up"===h||"down"===h?"top":"left",c="up"===h||"left"===h?"pos":"neg",u={opacity:r?1:0};t.effects.save(n,o),n.show(),t.effects.createWrapper(n),s=e.distance||n["top"===l?"outerHeight":"outerWidth"](!0)/2,r&&n.css("opacity",0).css(l,"pos"===c?-s:s),u[l]=(r?"pos"===c?"+=":"-=":"pos"===c?"-=":"+=")+s,n.animate(u,{queue:!1,duration:e.duration,easing:e.easing,complete:function(){"hide"===a&&n.hide(),t.effects.restore(n,o),t.effects.removeWrapper(n),i()}})}}(jQuery),function(t){t.effects.effect.explode=function(e,i){function s(){b.push(this),b.length===u*d&&n()}function n(){p.css({visibility:"visible"}),t(b).remove(),g||p.hide(),i()}var o,a,r,h,l,c,u=e.pieces?Math.round(Math.sqrt(e.pieces)):3,d=u,p=t(this),f=t.effects.setMode(p,e.mode||"hide"),g="show"===f,m=p.show().css("visibility","hidden").offset(),v=Math.ceil(p.outerWidth()/d),_=Math.ceil(p.outerHeight()/u),b=[];for(o=0;u>o;o++)for(h=m.top+o*_,c=o-(u-1)/2,a=0;d>a;a++)r=m.left+a*v,l=a-(d-1)/2,p.clone().appendTo("body").wrap("<div></div>").css({position:"absolute",visibility:"visible",left:-a*v,top:-o*_}).parent().addClass("ui-effects-explode").css({position:"absolute",overflow:"hidden",width:v,height:_,left:r+(g?l*v:0),top:h+(g?c*_:0),opacity:g?0:1}).animate({left:r+(g?0:l*v),top:h+(g?0:c*_),opacity:g?1:0},e.duration||500,e.easing,s)}}(jQuery),function(t){t.effects.effect.fade=function(e,i){var s=t(this),n=t.effects.setMode(s,e.mode||"toggle");s.animate({opacity:n},{queue:!1,duration:e.duration,easing:e.easing,complete:i})}}(jQuery),function(t){t.effects.effect.fold=function(e,i){var s,n,o=t(this),a=["position","top","bottom","left","right","height","width"],r=t.effects.setMode(o,e.mode||"hide"),h="show"===r,l="hide"===r,c=e.size||15,u=/([0-9]+)%/.exec(c),d=!!e.horizFirst,p=h!==d,f=p?["width","height"]:["height","width"],g=e.duration/2,m={},v={};t.effects.save(o,a),o.show(),s=t.effects.createWrapper(o).css({overflow:"hidden"}),n=p?[s.width(),s.height()]:[s.height(),s.width()],u&&(c=parseInt(u[1],10)/100*n[l?0:1]),h&&s.css(d?{height:0,width:c}:{height:c,width:0}),m[f[0]]=h?n[0]:c,v[f[1]]=h?n[1]:0,s.animate(m,g,e.easing).animate(v,g,e.easing,function(){l&&o.hide(),t.effects.restore(o,a),t.effects.removeWrapper(o),i()})}}(jQuery),function(t){t.effects.effect.highlight=function(e,i){var s=t(this),n=["backgroundImage","backgroundColor","opacity"],o=t.effects.setMode(s,e.mode||"show"),a={backgroundColor:s.css("backgroundColor")};"hide"===o&&(a.opacity=0),t.effects.save(s,n),s.show().css({backgroundImage:"none",backgroundColor:e.color||"#ffff99"}).animate(a,{queue:!1,duration:e.duration,easing:e.easing,complete:function(){"hide"===o&&s.hide(),t.effects.restore(s,n),i()}})}}(jQuery),function(t){t.effects.effect.pulsate=function(e,i){var s,n=t(this),o=t.effects.setMode(n,e.mode||"show"),a="show"===o,r="hide"===o,h=a||"hide"===o,l=2*(e.times||5)+(h?1:0),c=e.duration/l,u=0,d=n.queue(),p=d.length;for((a||!n.is(":visible"))&&(n.css("opacity",0).show(),u=1),s=1;l>s;s++)n.animate({opacity:u},c,e.easing),u=1-u;n.animate({opacity:u},c,e.easing),n.queue(function(){r&&n.hide(),i()}),p>1&&d.splice.apply(d,[1,0].concat(d.splice(p,l+1))),n.dequeue()}}(jQuery),function(t){t.effects.effect.puff=function(e,i){var s=t(this),n=t.effects.setMode(s,e.mode||"hide"),o="hide"===n,a=parseInt(e.percent,10)||150,r=a/100,h={height:s.height(),width:s.width(),outerHeight:s.outerHeight(),outerWidth:s.outerWidth()};t.extend(e,{effect:"scale",queue:!1,fade:!0,mode:n,complete:i,percent:o?a:100,from:o?h:{height:h.height*r,width:h.width*r,outerHeight:h.outerHeight*r,outerWidth:h.outerWidth*r}}),s.effect(e)},t.effects.effect.scale=function(e,i){var s=t(this),n=t.extend(!0,{},e),o=t.effects.setMode(s,e.mode||"effect"),a=parseInt(e.percent,10)||(0===parseInt(e.percent,10)?0:"hide"===o?0:100),r=e.direction||"both",h=e.origin,l={height:s.height(),width:s.width(),outerHeight:s.outerHeight(),outerWidth:s.outerWidth()},c={y:"horizontal"!==r?a/100:1,x:"vertical"!==r?a/100:1};n.effect="size",n.queue=!1,n.complete=i,"effect"!==o&&(n.origin=h||["middle","center"],n.restore=!0),n.from=e.from||("show"===o?{height:0,width:0,outerHeight:0,outerWidth:0}:l),n.to={height:l.height*c.y,width:l.width*c.x,outerHeight:l.outerHeight*c.y,outerWidth:l.outerWidth*c.x},n.fade&&("show"===o&&(n.from.opacity=0,n.to.opacity=1),"hide"===o&&(n.from.opacity=1,n.to.opacity=0)),s.effect(n)},t.effects.effect.size=function(e,i){var s,n,o,a=t(this),r=["position","top","bottom","left","right","width","height","overflow","opacity"],h=["position","top","bottom","left","right","overflow","opacity"],l=["width","height","overflow"],c=["fontSize"],u=["borderTopWidth","borderBottomWidth","paddingTop","paddingBottom"],d=["borderLeftWidth","borderRightWidth","paddingLeft","paddingRight"],p=t.effects.setMode(a,e.mode||"effect"),f=e.restore||"effect"!==p,g=e.scale||"both",m=e.origin||["middle","center"],v=a.css("position"),_=f?r:h,b={height:0,width:0,outerHeight:0,outerWidth:0};"show"===p&&a.show(),s={height:a.height(),width:a.width(),outerHeight:a.outerHeight(),outerWidth:a.outerWidth()},"toggle"===e.mode&&"show"===p?(a.from=e.to||b,a.to=e.from||s):(a.from=e.from||("show"===p?b:s),a.to=e.to||("hide"===p?b:s)),o={from:{y:a.from.height/s.height,x:a.from.width/s.width},to:{y:a.to.height/s.height,x:a.to.width/s.width}},("box"===g||"both"===g)&&(o.from.y!==o.to.y&&(_=_.concat(u),a.from=t.effects.setTransition(a,u,o.from.y,a.from),a.to=t.effects.setTransition(a,u,o.to.y,a.to)),o.from.x!==o.to.x&&(_=_.concat(d),a.from=t.effects.setTransition(a,d,o.from.x,a.from),a.to=t.effects.setTransition(a,d,o.to.x,a.to))),("content"===g||"both"===g)&&o.from.y!==o.to.y&&(_=_.concat(c).concat(l),a.from=t.effects.setTransition(a,c,o.from.y,a.from),a.to=t.effects.setTransition(a,c,o.to.y,a.to)),t.effects.save(a,_),a.show(),t.effects.createWrapper(a),a.css("overflow","hidden").css(a.from),m&&(n=t.effects.getBaseline(m,s),a.from.top=(s.outerHeight-a.outerHeight())*n.y,a.from.left=(s.outerWidth-a.outerWidth())*n.x,a.to.top=(s.outerHeight-a.to.outerHeight)*n.y,a.to.left=(s.outerWidth-a.to.outerWidth)*n.x),a.css(a.from),("content"===g||"both"===g)&&(u=u.concat(["marginTop","marginBottom"]).concat(c),d=d.concat(["marginLeft","marginRight"]),l=r.concat(u).concat(d),a.find("*[width]").each(function(){var i=t(this),s={height:i.height(),width:i.width(),outerHeight:i.outerHeight(),outerWidth:i.outerWidth()};f&&t.effects.save(i,l),i.from={height:s.height*o.from.y,width:s.width*o.from.x,outerHeight:s.outerHeight*o.from.y,outerWidth:s.outerWidth*o.from.x},i.to={height:s.height*o.to.y,width:s.width*o.to.x,outerHeight:s.height*o.to.y,outerWidth:s.width*o.to.x},o.from.y!==o.to.y&&(i.from=t.effects.setTransition(i,u,o.from.y,i.from),i.to=t.effects.setTransition(i,u,o.to.y,i.to)),o.from.x!==o.to.x&&(i.from=t.effects.setTransition(i,d,o.from.x,i.from),i.to=t.effects.setTransition(i,d,o.to.x,i.to)),i.css(i.from),i.animate(i.to,e.duration,e.easing,function(){f&&t.effects.restore(i,l)})})),a.animate(a.to,{queue:!1,duration:e.duration,easing:e.easing,complete:function(){0===a.to.opacity&&a.css("opacity",a.from.opacity),"hide"===p&&a.hide(),t.effects.restore(a,_),f||("static"===v?a.css({position:"relative",top:a.to.top,left:a.to.left}):t.each(["top","left"],function(t,e){a.css(e,function(e,i){var s=parseInt(i,10),n=t?a.to.left:a.to.top;return"auto"===i?n+"px":s+n+"px"})})),t.effects.removeWrapper(a),i()}})}}(jQuery),function(t){t.effects.effect.shake=function(e,i){var s,n=t(this),o=["position","top","bottom","left","right","height","width"],a=t.effects.setMode(n,e.mode||"effect"),r=e.direction||"left",h=e.distance||20,l=e.times||3,c=2*l+1,u=Math.round(e.duration/c),d="up"===r||"down"===r?"top":"left",p="up"===r||"left"===r,f={},g={},m={},v=n.queue(),_=v.length;for(t.effects.save(n,o),n.show(),t.effects.createWrapper(n),f[d]=(p?"-=":"+=")+h,g[d]=(p?"+=":"-=")+2*h,m[d]=(p?"-=":"+=")+2*h,n.animate(f,u,e.easing),s=1;l>s;s++)n.animate(g,u,e.easing).animate(m,u,e.easing);n.animate(g,u,e.easing).animate(f,u/2,e.easing).queue(function(){"hide"===a&&n.hide(),t.effects.restore(n,o),t.effects.removeWrapper(n),i()}),_>1&&v.splice.apply(v,[1,0].concat(v.splice(_,c+1))),n.dequeue()}}(jQuery),function(t){t.effects.effect.slide=function(e,i){var s,n=t(this),o=["position","top","bottom","left","right","width","height"],a=t.effects.setMode(n,e.mode||"show"),r="show"===a,h=e.direction||"left",l="up"===h||"down"===h?"top":"left",c="up"===h||"left"===h,u={};t.effects.save(n,o),n.show(),s=e.distance||n["top"===l?"outerHeight":"outerWidth"](!0),t.effects.createWrapper(n).css({overflow:"hidden"}),r&&n.css(l,c?isNaN(s)?"-"+s:-s:s),u[l]=(r?c?"+=":"-=":c?"-=":"+=")+s,n.animate(u,{queue:!1,duration:e.duration,easing:e.easing,complete:function(){"hide"===a&&n.hide(),t.effects.restore(n,o),t.effects.removeWrapper(n),i()}})}}(jQuery),function(t){t.effects.effect.transfer=function(e,i){var s=t(this),n=t(e.to),o="fixed"===n.css("position"),a=t("body"),r=o?a.scrollTop():0,h=o?a.scrollLeft():0,l=n.offset(),c={top:l.top-r,left:l.left-h,height:n.innerHeight(),width:n.innerWidth()},u=s.offset(),d=t("<div class='ui-effects-transfer'></div>").appendTo(document.body).addClass(e.className).css({top:u.top-r,left:u.left-h,height:s.innerHeight(),width:s.innerWidth(),position:o?"fixed":"absolute"}).animate(c,e.duration,e.easing,function(){d.remove(),i()})}}(jQuery),function(t){t.widget("ui.menu",{version:"1.10.4",defaultElement:"<ul>",delay:300,options:{icons:{submenu:"ui-icon-carat-1-e"},menus:"ul",position:{my:"left top",at:"right top"},role:"menu",blur:null,focus:null,select:null},_create:function(){this.activeMenu=this.element,this.mouseHandled=!1,this.element.uniqueId().addClass("ui-menu ui-widget ui-widget-content ui-corner-all").toggleClass("ui-menu-icons",!!this.element.find(".ui-icon").length).attr({role:this.options.role,tabIndex:0}).bind("click"+this.eventNamespace,t.proxy(function(t){this.options.disabled&&t.preventDefault()},this)),this.options.disabled&&this.element.addClass("ui-state-disabled").attr("aria-disabled","true"),this._on({"mousedown .ui-menu-item > a":function(t){t.preventDefault()},"click .ui-state-disabled > a":function(t){t.preventDefault()},"click .ui-menu-item:has(a)":function(e){var i=t(e.target).closest(".ui-menu-item");!this.mouseHandled&&i.not(".ui-state-disabled").length&&(this.select(e),e.isPropagationStopped()||(this.mouseHandled=!0),i.has(".ui-menu").length?this.expand(e):!this.element.is(":focus")&&t(this.document[0].activeElement).closest(".ui-menu").length&&(this.element.trigger("focus",[!0]),this.active&&1===this.active.parents(".ui-menu").length&&clearTimeout(this.timer)))},"mouseenter .ui-menu-item":function(e){var i=t(e.currentTarget);i.siblings().children(".ui-state-active").removeClass("ui-state-active"),this.focus(e,i)},mouseleave:"collapseAll","mouseleave .ui-menu":"collapseAll",focus:function(t,e){var i=this.active||this.element.children(".ui-menu-item").eq(0);e||this.focus(t,i)},blur:function(e){this._delay(function(){t.contains(this.element[0],this.document[0].activeElement)||this.collapseAll(e)})},keydown:"_keydown"}),this.refresh(),this._on(this.document,{click:function(e){t(e.target).closest(".ui-menu").length||this.collapseAll(e),this.mouseHandled=!1}})},_destroy:function(){this.element.removeAttr("aria-activedescendant").find(".ui-menu").addBack().removeClass("ui-menu ui-widget ui-widget-content ui-corner-all ui-menu-icons").removeAttr("role").removeAttr("tabIndex").removeAttr("aria-labelledby").removeAttr("aria-expanded").removeAttr("aria-hidden").removeAttr("aria-disabled").removeUniqueId().show(),this.element.find(".ui-menu-item").removeClass("ui-menu-item").removeAttr("role").removeAttr("aria-disabled").children("a").removeUniqueId().removeClass("ui-corner-all ui-state-hover").removeAttr("tabIndex").removeAttr("role").removeAttr("aria-haspopup").children().each(function(){var e=t(this);e.data("ui-menu-submenu-carat")&&e.remove()}),this.element.find(".ui-menu-divider").removeClass("ui-menu-divider ui-widget-content")},_keydown:function(e){function i(t){return t.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")}var s,n,o,a,r,h=!0;switch(e.keyCode){case t.ui.keyCode.PAGE_UP:this.previousPage(e);break;case t.ui.keyCode.PAGE_DOWN:this.nextPage(e);break;case t.ui.keyCode.HOME:this._move("first","first",e);break;case t.ui.keyCode.END:this._move("last","last",e);break;case t.ui.keyCode.UP:this.previous(e);break;case t.ui.keyCode.DOWN:this.next(e);break;case t.ui.keyCode.LEFT:this.collapse(e);break;case t.ui.keyCode.RIGHT:this.active&&!this.active.is(".ui-state-disabled")&&this.expand(e);break;case t.ui.keyCode.ENTER:case t.ui.keyCode.SPACE:this._activate(e);break;case t.ui.keyCode.ESCAPE:this.collapse(e);break;default:h=!1,n=this.previousFilter||"",o=String.fromCharCode(e.keyCode),a=!1,clearTimeout(this.filterTimer),o===n?a=!0:o=n+o,r=RegExp("^"+i(o),"i"),s=this.activeMenu.children(".ui-menu-item").filter(function(){return r.test(t(this).children("a").text())}),s=a&&-1!==s.index(this.active.next())?this.active.nextAll(".ui-menu-item"):s,s.length||(o=String.fromCharCode(e.keyCode),r=RegExp("^"+i(o),"i"),s=this.activeMenu.children(".ui-menu-item").filter(function(){return r.test(t(this).children("a").text())})),s.length?(this.focus(e,s),s.length>1?(this.previousFilter=o,this.filterTimer=this._delay(function(){delete this.previousFilter},1e3)):delete this.previousFilter):delete this.previousFilter}h&&e.preventDefault()},_activate:function(t){this.active.is(".ui-state-disabled")||(this.active.children("a[aria-haspopup='true']").length?this.expand(t):this.select(t))},refresh:function(){var e,i=this.options.icons.submenu,s=this.element.find(this.options.menus);this.element.toggleClass("ui-menu-icons",!!this.element.find(".ui-icon").length),s.filter(":not(.ui-menu)").addClass("ui-menu ui-widget ui-widget-content ui-corner-all").hide().attr({role:this.options.role,"aria-hidden":"true","aria-expanded":"false"}).each(function(){var e=t(this),s=e.prev("a"),n=t("<span>").addClass("ui-menu-icon ui-icon "+i).data("ui-menu-submenu-carat",!0);s.attr("aria-haspopup","true").prepend(n),e.attr("aria-labelledby",s.attr("id"))}),e=s.add(this.element),e.children(":not(.ui-menu-item):has(a)").addClass("ui-menu-item").attr("role","presentation").children("a").uniqueId().addClass("ui-corner-all").attr({tabIndex:-1,role:this._itemRole()}),e.children(":not(.ui-menu-item)").each(function(){var e=t(this);/[^\-\u2014\u2013\s]/.test(e.text())||e.addClass("ui-widget-content ui-menu-divider")}),e.children(".ui-state-disabled").attr("aria-disabled","true"),this.active&&!t.contains(this.element[0],this.active[0])&&this.blur()},_itemRole:function(){return{menu:"menuitem",listbox:"option"}[this.options.role]},_setOption:function(t,e){"icons"===t&&this.element.find(".ui-menu-icon").removeClass(this.options.icons.submenu).addClass(e.submenu),this._super(t,e)},focus:function(t,e){var i,s;this.blur(t,t&&"focus"===t.type),this._scrollIntoView(e),this.active=e.first(),s=this.active.children("a").addClass("ui-state-focus"),this.options.role&&this.element.attr("aria-activedescendant",s.attr("id")),this.active.parent().closest(".ui-menu-item").children("a:first").addClass("ui-state-active"),t&&"keydown"===t.type?this._close():this.timer=this._delay(function(){this._close()},this.delay),i=e.children(".ui-menu"),i.length&&t&&/^mouse/.test(t.type)&&this._startOpening(i),this.activeMenu=e.parent(),this._trigger("focus",t,{item:e})},_scrollIntoView:function(e){var i,s,n,o,a,r;this._hasScroll()&&(i=parseFloat(t.css(this.activeMenu[0],"borderTopWidth"))||0,s=parseFloat(t.css(this.activeMenu[0],"paddingTop"))||0,n=e.offset().top-this.activeMenu.offset().top-i-s,o=this.activeMenu.scrollTop(),a=this.activeMenu.height(),r=e.height(),0>n?this.activeMenu.scrollTop(o+n):n+r>a&&this.activeMenu.scrollTop(o+n-a+r))},blur:function(t,e){e||clearTimeout(this.timer),this.active&&(this.active.children("a").removeClass("ui-state-focus"),this.active=null,this._trigger("blur",t,{item:this.active}))},_startOpening:function(t){clearTimeout(this.timer),"true"===t.attr("aria-hidden")&&(this.timer=this._delay(function(){this._close(),this._open(t)},this.delay))},_open:function(e){var i=t.extend({of:this.active},this.options.position);clearTimeout(this.timer),this.element.find(".ui-menu").not(e.parents(".ui-menu")).hide().attr("aria-hidden","true"),e.show().removeAttr("aria-hidden").attr("aria-expanded","true").position(i)},collapseAll:function(e,i){clearTimeout(this.timer),this.timer=this._delay(function(){var s=i?this.element:t(e&&e.target).closest(this.element.find(".ui-menu"));s.length||(s=this.element),this._close(s),this.blur(e),this.activeMenu=s},this.delay)},_close:function(t){t||(t=this.active?this.active.parent():this.element),t.find(".ui-menu").hide().attr("aria-hidden","true").attr("aria-expanded","false").end().find("a.ui-state-active").removeClass("ui-state-active")},collapse:function(t){var e=this.active&&this.active.parent().closest(".ui-menu-item",this.element);e&&e.length&&(this._close(),this.focus(t,e))},expand:function(t){var e=this.active&&this.active.children(".ui-menu ").children(".ui-menu-item").first();e&&e.length&&(this._open(e.parent()),this._delay(function(){this.focus(t,e)}))},next:function(t){this._move("next","first",t)},previous:function(t){this._move("prev","last",t)},isFirstItem:function(){return this.active&&!this.active.prevAll(".ui-menu-item").length},isLastItem:function(){return this.active&&!this.active.nextAll(".ui-menu-item").length},_move:function(t,e,i){var s;this.active&&(s="first"===t||"last"===t?this.active["first"===t?"prevAll":"nextAll"](".ui-menu-item").eq(-1):this.active[t+"All"](".ui-menu-item").eq(0)),s&&s.length&&this.active||(s=this.activeMenu.children(".ui-menu-item")[e]()),this.focus(i,s)},nextPage:function(e){var i,s,n;return this.active?(this.isLastItem()||(this._hasScroll()?(s=this.active.offset().top,n=this.element.height(),this.active.nextAll(".ui-menu-item").each(function(){return i=t(this),0>i.offset().top-s-n}),this.focus(e,i)):this.focus(e,this.activeMenu.children(".ui-menu-item")[this.active?"last":"first"]())),undefined):(this.next(e),undefined)},previousPage:function(e){var i,s,n;return this.active?(this.isFirstItem()||(this._hasScroll()?(s=this.active.offset().top,n=this.element.height(),this.active.prevAll(".ui-menu-item").each(function(){return i=t(this),i.offset().top-s+n>0}),this.focus(e,i)):this.focus(e,this.activeMenu.children(".ui-menu-item").first())),undefined):(this.next(e),undefined)},_hasScroll:function(){return this.element.outerHeight()<this.element.prop("scrollHeight")},select:function(e){this.active=this.active||t(e.target).closest(".ui-menu-item");var i={item:this.active};this.active.has(".ui-menu").length||this.collapseAll(e,!0),this._trigger("select",e,i)}})}(jQuery),function(t,e){function i(t,e,i){return[parseFloat(t[0])*(p.test(t[0])?e/100:1),parseFloat(t[1])*(p.test(t[1])?i/100:1)]}function s(e,i){return parseInt(t.css(e,i),10)||0}function n(e){var i=e[0];return 9===i.nodeType?{width:e.width(),height:e.height(),offset:{top:0,left:0}}:t.isWindow(i)?{width:e.width(),height:e.height(),offset:{top:e.scrollTop(),left:e.scrollLeft()}}:i.preventDefault?{width:0,height:0,offset:{top:i.pageY,left:i.pageX}}:{width:e.outerWidth(),height:e.outerHeight(),offset:e.offset()}}t.ui=t.ui||{};var o,a=Math.max,r=Math.abs,h=Math.round,l=/left|center|right/,c=/top|center|bottom/,u=/[\+\-]\d+(\.[\d]+)?%?/,d=/^\w+/,p=/%$/,f=t.fn.position;t.position={scrollbarWidth:function(){if(o!==e)return o;var i,s,n=t("<div style='display:block;position:absolute;width:50px;height:50px;overflow:hidden;'><div style='height:100px;width:auto;'></div></div>"),a=n.children()[0];return t("body").append(n),i=a.offsetWidth,n.css("overflow","scroll"),s=a.offsetWidth,i===s&&(s=n[0].clientWidth),n.remove(),o=i-s},getScrollInfo:function(e){var i=e.isWindow||e.isDocument?"":e.element.css("overflow-x"),s=e.isWindow||e.isDocument?"":e.element.css("overflow-y"),n="scroll"===i||"auto"===i&&e.width<e.element[0].scrollWidth,o="scroll"===s||"auto"===s&&e.height<e.element[0].scrollHeight;return{width:o?t.position.scrollbarWidth():0,height:n?t.position.scrollbarWidth():0}},getWithinInfo:function(e){var i=t(e||window),s=t.isWindow(i[0]),n=!!i[0]&&9===i[0].nodeType;return{element:i,isWindow:s,isDocument:n,offset:i.offset()||{left:0,top:0},scrollLeft:i.scrollLeft(),scrollTop:i.scrollTop(),width:s?i.width():i.outerWidth(),height:s?i.height():i.outerHeight()}}},t.fn.position=function(e){if(!e||!e.of)return f.apply(this,arguments);e=t.extend({},e);var o,p,g,m,v,_,b=t(e.of),y=t.position.getWithinInfo(e.within),w=t.position.getScrollInfo(y),x=(e.collision||"flip").split(" "),k={};return _=n(b),b[0].preventDefault&&(e.at="left top"),p=_.width,g=_.height,m=_.offset,v=t.extend({},m),t.each(["my","at"],function(){var t,i,s=(e[this]||"").split(" ");1===s.length&&(s=l.test(s[0])?s.concat(["center"]):c.test(s[0])?["center"].concat(s):["center","center"]),s[0]=l.test(s[0])?s[0]:"center",s[1]=c.test(s[1])?s[1]:"center",t=u.exec(s[0]),i=u.exec(s[1]),k[this]=[t?t[0]:0,i?i[0]:0],e[this]=[d.exec(s[0])[0],d.exec(s[1])[0]]}),1===x.length&&(x[1]=x[0]),"right"===e.at[0]?v.left+=p:"center"===e.at[0]&&(v.left+=p/2),"bottom"===e.at[1]?v.top+=g:"center"===e.at[1]&&(v.top+=g/2),o=i(k.at,p,g),v.left+=o[0],v.top+=o[1],this.each(function(){var n,l,c=t(this),u=c.outerWidth(),d=c.outerHeight(),f=s(this,"marginLeft"),_=s(this,"marginTop"),D=u+f+s(this,"marginRight")+w.width,C=d+_+s(this,"marginBottom")+w.height,I=t.extend({},v),P=i(k.my,c.outerWidth(),c.outerHeight());"right"===e.my[0]?I.left-=u:"center"===e.my[0]&&(I.left-=u/2),"bottom"===e.my[1]?I.top-=d:"center"===e.my[1]&&(I.top-=d/2),I.left+=P[0],I.top+=P[1],t.support.offsetFractions||(I.left=h(I.left),I.top=h(I.top)),n={marginLeft:f,marginTop:_},t.each(["left","top"],function(i,s){t.ui.position[x[i]]&&t.ui.position[x[i]][s](I,{targetWidth:p,targetHeight:g,elemWidth:u,elemHeight:d,collisionPosition:n,collisionWidth:D,collisionHeight:C,offset:[o[0]+P[0],o[1]+P[1]],my:e.my,at:e.at,within:y,elem:c})}),e.using&&(l=function(t){var i=m.left-I.left,s=i+p-u,n=m.top-I.top,o=n+g-d,h={target:{element:b,left:m.left,top:m.top,width:p,height:g},element:{element:c,left:I.left,top:I.top,width:u,height:d},horizontal:0>s?"left":i>0?"right":"center",vertical:0>o?"top":n>0?"bottom":"middle"};u>p&&p>r(i+s)&&(h.horizontal="center"),d>g&&g>r(n+o)&&(h.vertical="middle"),h.important=a(r(i),r(s))>a(r(n),r(o))?"horizontal":"vertical",e.using.call(this,t,h)}),c.offset(t.extend(I,{using:l}))})},t.ui.position={fit:{left:function(t,e){var i,s=e.within,n=s.isWindow?s.scrollLeft:s.offset.left,o=s.width,r=t.left-e.collisionPosition.marginLeft,h=n-r,l=r+e.collisionWidth-o-n;e.collisionWidth>o?h>0&&0>=l?(i=t.left+h+e.collisionWidth-o-n,t.left+=h-i):t.left=l>0&&0>=h?n:h>l?n+o-e.collisionWidth:n:h>0?t.left+=h:l>0?t.left-=l:t.left=a(t.left-r,t.left)},top:function(t,e){var i,s=e.within,n=s.isWindow?s.scrollTop:s.offset.top,o=e.within.height,r=t.top-e.collisionPosition.marginTop,h=n-r,l=r+e.collisionHeight-o-n;e.collisionHeight>o?h>0&&0>=l?(i=t.top+h+e.collisionHeight-o-n,t.top+=h-i):t.top=l>0&&0>=h?n:h>l?n+o-e.collisionHeight:n:h>0?t.top+=h:l>0?t.top-=l:t.top=a(t.top-r,t.top)}},flip:{left:function(t,e){var i,s,n=e.within,o=n.offset.left+n.scrollLeft,a=n.width,h=n.isWindow?n.scrollLeft:n.offset.left,l=t.left-e.collisionPosition.marginLeft,c=l-h,u=l+e.collisionWidth-a-h,d="left"===e.my[0]?-e.elemWidth:"right"===e.my[0]?e.elemWidth:0,p="left"===e.at[0]?e.targetWidth:"right"===e.at[0]?-e.targetWidth:0,f=-2*e.offset[0];0>c?(i=t.left+d+p+f+e.collisionWidth-a-o,(0>i||r(c)>i)&&(t.left+=d+p+f)):u>0&&(s=t.left-e.collisionPosition.marginLeft+d+p+f-h,(s>0||u>r(s))&&(t.left+=d+p+f))},top:function(t,e){var i,s,n=e.within,o=n.offset.top+n.scrollTop,a=n.height,h=n.isWindow?n.scrollTop:n.offset.top,l=t.top-e.collisionPosition.marginTop,c=l-h,u=l+e.collisionHeight-a-h,d="top"===e.my[1],p=d?-e.elemHeight:"bottom"===e.my[1]?e.elemHeight:0,f="top"===e.at[1]?e.targetHeight:"bottom"===e.at[1]?-e.targetHeight:0,g=-2*e.offset[1];0>c?(s=t.top+p+f+g+e.collisionHeight-a-o,t.top+p+f+g>c&&(0>s||r(c)>s)&&(t.top+=p+f+g)):u>0&&(i=t.top-e.collisionPosition.marginTop+p+f+g-h,t.top+p+f+g>u&&(i>0||u>r(i))&&(t.top+=p+f+g))}},flipfit:{left:function(){t.ui.position.flip.left.apply(this,arguments),t.ui.position.fit.left.apply(this,arguments)},top:function(){t.ui.position.flip.top.apply(this,arguments),t.ui.position.fit.top.apply(this,arguments)}}},function(){var e,i,s,n,o,a=document.getElementsByTagName("body")[0],r=document.createElement("div");e=document.createElement(a?"div":"body"),s={visibility:"hidden",width:0,height:0,border:0,margin:0,background:"none"},a&&t.extend(s,{position:"absolute",left:"-1000px",top:"-1000px"});for(o in s)e.style[o]=s[o];e.appendChild(r),i=a||document.documentElement,i.insertBefore(e,i.firstChild),r.style.cssText="position: absolute; left: 10.7432222px;",n=t(r).offset().left,t.support.offsetFractions=n>10&&11>n,e.innerHTML="",i.removeChild(e)}()}(jQuery),function(t,e){t.widget("ui.progressbar",{version:"1.10.4",options:{max:100,value:0,change:null,complete:null},min:0,_create:function(){this.oldValue=this.options.value=this._constrainedValue(),this.element.addClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").attr({role:"progressbar","aria-valuemin":this.min}),this.valueDiv=t("<div class='ui-progressbar-value ui-widget-header ui-corner-left'></div>").appendTo(this.element),this._refreshValue()
+},_destroy:function(){this.element.removeClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").removeAttr("role").removeAttr("aria-valuemin").removeAttr("aria-valuemax").removeAttr("aria-valuenow"),this.valueDiv.remove()},value:function(t){return t===e?this.options.value:(this.options.value=this._constrainedValue(t),this._refreshValue(),e)},_constrainedValue:function(t){return t===e&&(t=this.options.value),this.indeterminate=t===!1,"number"!=typeof t&&(t=0),this.indeterminate?!1:Math.min(this.options.max,Math.max(this.min,t))},_setOptions:function(t){var e=t.value;delete t.value,this._super(t),this.options.value=this._constrainedValue(e),this._refreshValue()},_setOption:function(t,e){"max"===t&&(e=Math.max(this.min,e)),this._super(t,e)},_percentage:function(){return this.indeterminate?100:100*(this.options.value-this.min)/(this.options.max-this.min)},_refreshValue:function(){var e=this.options.value,i=this._percentage();this.valueDiv.toggle(this.indeterminate||e>this.min).toggleClass("ui-corner-right",e===this.options.max).width(i.toFixed(0)+"%"),this.element.toggleClass("ui-progressbar-indeterminate",this.indeterminate),this.indeterminate?(this.element.removeAttr("aria-valuenow"),this.overlayDiv||(this.overlayDiv=t("<div class='ui-progressbar-overlay'></div>").appendTo(this.valueDiv))):(this.element.attr({"aria-valuemax":this.options.max,"aria-valuenow":e}),this.overlayDiv&&(this.overlayDiv.remove(),this.overlayDiv=null)),this.oldValue!==e&&(this.oldValue=e,this._trigger("change")),e===this.options.max&&this._trigger("complete")}})}(jQuery),function(t){var e=5;t.widget("ui.slider",t.ui.mouse,{version:"1.10.4",widgetEventPrefix:"slide",options:{animate:!1,distance:0,max:100,min:0,orientation:"horizontal",range:!1,step:1,value:0,values:null,change:null,slide:null,start:null,stop:null},_create:function(){this._keySliding=!1,this._mouseSliding=!1,this._animateOff=!0,this._handleIndex=null,this._detectOrientation(),this._mouseInit(),this.element.addClass("ui-slider ui-slider-"+this.orientation+" ui-widget"+" ui-widget-content"+" ui-corner-all"),this._refresh(),this._setOption("disabled",this.options.disabled),this._animateOff=!1},_refresh:function(){this._createRange(),this._createHandles(),this._setupEvents(),this._refreshValue()},_createHandles:function(){var e,i,s=this.options,n=this.element.find(".ui-slider-handle").addClass("ui-state-default ui-corner-all"),o="<a class='ui-slider-handle ui-state-default ui-corner-all' href='#'></a>",a=[];for(i=s.values&&s.values.length||1,n.length>i&&(n.slice(i).remove(),n=n.slice(0,i)),e=n.length;i>e;e++)a.push(o);this.handles=n.add(t(a.join("")).appendTo(this.element)),this.handle=this.handles.eq(0),this.handles.each(function(e){t(this).data("ui-slider-handle-index",e)})},_createRange:function(){var e=this.options,i="";e.range?(e.range===!0&&(e.values?e.values.length&&2!==e.values.length?e.values=[e.values[0],e.values[0]]:t.isArray(e.values)&&(e.values=e.values.slice(0)):e.values=[this._valueMin(),this._valueMin()]),this.range&&this.range.length?this.range.removeClass("ui-slider-range-min ui-slider-range-max").css({left:"",bottom:""}):(this.range=t("<div></div>").appendTo(this.element),i="ui-slider-range ui-widget-header ui-corner-all"),this.range.addClass(i+("min"===e.range||"max"===e.range?" ui-slider-range-"+e.range:""))):(this.range&&this.range.remove(),this.range=null)},_setupEvents:function(){var t=this.handles.add(this.range).filter("a");this._off(t),this._on(t,this._handleEvents),this._hoverable(t),this._focusable(t)},_destroy:function(){this.handles.remove(),this.range&&this.range.remove(),this.element.removeClass("ui-slider ui-slider-horizontal ui-slider-vertical ui-widget ui-widget-content ui-corner-all"),this._mouseDestroy()},_mouseCapture:function(e){var i,s,n,o,a,r,h,l,c=this,u=this.options;return u.disabled?!1:(this.elementSize={width:this.element.outerWidth(),height:this.element.outerHeight()},this.elementOffset=this.element.offset(),i={x:e.pageX,y:e.pageY},s=this._normValueFromMouse(i),n=this._valueMax()-this._valueMin()+1,this.handles.each(function(e){var i=Math.abs(s-c.values(e));(n>i||n===i&&(e===c._lastChangedValue||c.values(e)===u.min))&&(n=i,o=t(this),a=e)}),r=this._start(e,a),r===!1?!1:(this._mouseSliding=!0,this._handleIndex=a,o.addClass("ui-state-active").focus(),h=o.offset(),l=!t(e.target).parents().addBack().is(".ui-slider-handle"),this._clickOffset=l?{left:0,top:0}:{left:e.pageX-h.left-o.width()/2,top:e.pageY-h.top-o.height()/2-(parseInt(o.css("borderTopWidth"),10)||0)-(parseInt(o.css("borderBottomWidth"),10)||0)+(parseInt(o.css("marginTop"),10)||0)},this.handles.hasClass("ui-state-hover")||this._slide(e,a,s),this._animateOff=!0,!0))},_mouseStart:function(){return!0},_mouseDrag:function(t){var e={x:t.pageX,y:t.pageY},i=this._normValueFromMouse(e);return this._slide(t,this._handleIndex,i),!1},_mouseStop:function(t){return this.handles.removeClass("ui-state-active"),this._mouseSliding=!1,this._stop(t,this._handleIndex),this._change(t,this._handleIndex),this._handleIndex=null,this._clickOffset=null,this._animateOff=!1,!1},_detectOrientation:function(){this.orientation="vertical"===this.options.orientation?"vertical":"horizontal"},_normValueFromMouse:function(t){var e,i,s,n,o;return"horizontal"===this.orientation?(e=this.elementSize.width,i=t.x-this.elementOffset.left-(this._clickOffset?this._clickOffset.left:0)):(e=this.elementSize.height,i=t.y-this.elementOffset.top-(this._clickOffset?this._clickOffset.top:0)),s=i/e,s>1&&(s=1),0>s&&(s=0),"vertical"===this.orientation&&(s=1-s),n=this._valueMax()-this._valueMin(),o=this._valueMin()+s*n,this._trimAlignValue(o)},_start:function(t,e){var i={handle:this.handles[e],value:this.value()};return this.options.values&&this.options.values.length&&(i.value=this.values(e),i.values=this.values()),this._trigger("start",t,i)},_slide:function(t,e,i){var s,n,o;this.options.values&&this.options.values.length?(s=this.values(e?0:1),2===this.options.values.length&&this.options.range===!0&&(0===e&&i>s||1===e&&s>i)&&(i=s),i!==this.values(e)&&(n=this.values(),n[e]=i,o=this._trigger("slide",t,{handle:this.handles[e],value:i,values:n}),s=this.values(e?0:1),o!==!1&&this.values(e,i))):i!==this.value()&&(o=this._trigger("slide",t,{handle:this.handles[e],value:i}),o!==!1&&this.value(i))},_stop:function(t,e){var i={handle:this.handles[e],value:this.value()};this.options.values&&this.options.values.length&&(i.value=this.values(e),i.values=this.values()),this._trigger("stop",t,i)},_change:function(t,e){if(!this._keySliding&&!this._mouseSliding){var i={handle:this.handles[e],value:this.value()};this.options.values&&this.options.values.length&&(i.value=this.values(e),i.values=this.values()),this._lastChangedValue=e,this._trigger("change",t,i)}},value:function(t){return arguments.length?(this.options.value=this._trimAlignValue(t),this._refreshValue(),this._change(null,0),undefined):this._value()},values:function(e,i){var s,n,o;if(arguments.length>1)return this.options.values[e]=this._trimAlignValue(i),this._refreshValue(),this._change(null,e),undefined;if(!arguments.length)return this._values();if(!t.isArray(arguments[0]))return this.options.values&&this.options.values.length?this._values(e):this.value();for(s=this.options.values,n=arguments[0],o=0;s.length>o;o+=1)s[o]=this._trimAlignValue(n[o]),this._change(null,o);this._refreshValue()},_setOption:function(e,i){var s,n=0;switch("range"===e&&this.options.range===!0&&("min"===i?(this.options.value=this._values(0),this.options.values=null):"max"===i&&(this.options.value=this._values(this.options.values.length-1),this.options.values=null)),t.isArray(this.options.values)&&(n=this.options.values.length),t.Widget.prototype._setOption.apply(this,arguments),e){case"orientation":this._detectOrientation(),this.element.removeClass("ui-slider-horizontal ui-slider-vertical").addClass("ui-slider-"+this.orientation),this._refreshValue();break;case"value":this._animateOff=!0,this._refreshValue(),this._change(null,0),this._animateOff=!1;break;case"values":for(this._animateOff=!0,this._refreshValue(),s=0;n>s;s+=1)this._change(null,s);this._animateOff=!1;break;case"min":case"max":this._animateOff=!0,this._refreshValue(),this._animateOff=!1;break;case"range":this._animateOff=!0,this._refresh(),this._animateOff=!1}},_value:function(){var t=this.options.value;return t=this._trimAlignValue(t)},_values:function(t){var e,i,s;if(arguments.length)return e=this.options.values[t],e=this._trimAlignValue(e);if(this.options.values&&this.options.values.length){for(i=this.options.values.slice(),s=0;i.length>s;s+=1)i[s]=this._trimAlignValue(i[s]);return i}return[]},_trimAlignValue:function(t){if(this._valueMin()>=t)return this._valueMin();if(t>=this._valueMax())return this._valueMax();var e=this.options.step>0?this.options.step:1,i=(t-this._valueMin())%e,s=t-i;return 2*Math.abs(i)>=e&&(s+=i>0?e:-e),parseFloat(s.toFixed(5))},_valueMin:function(){return this.options.min},_valueMax:function(){return this.options.max},_refreshValue:function(){var e,i,s,n,o,a=this.options.range,r=this.options,h=this,l=this._animateOff?!1:r.animate,c={};this.options.values&&this.options.values.length?this.handles.each(function(s){i=100*((h.values(s)-h._valueMin())/(h._valueMax()-h._valueMin())),c["horizontal"===h.orientation?"left":"bottom"]=i+"%",t(this).stop(1,1)[l?"animate":"css"](c,r.animate),h.options.range===!0&&("horizontal"===h.orientation?(0===s&&h.range.stop(1,1)[l?"animate":"css"]({left:i+"%"},r.animate),1===s&&h.range[l?"animate":"css"]({width:i-e+"%"},{queue:!1,duration:r.animate})):(0===s&&h.range.stop(1,1)[l?"animate":"css"]({bottom:i+"%"},r.animate),1===s&&h.range[l?"animate":"css"]({height:i-e+"%"},{queue:!1,duration:r.animate}))),e=i}):(s=this.value(),n=this._valueMin(),o=this._valueMax(),i=o!==n?100*((s-n)/(o-n)):0,c["horizontal"===this.orientation?"left":"bottom"]=i+"%",this.handle.stop(1,1)[l?"animate":"css"](c,r.animate),"min"===a&&"horizontal"===this.orientation&&this.range.stop(1,1)[l?"animate":"css"]({width:i+"%"},r.animate),"max"===a&&"horizontal"===this.orientation&&this.range[l?"animate":"css"]({width:100-i+"%"},{queue:!1,duration:r.animate}),"min"===a&&"vertical"===this.orientation&&this.range.stop(1,1)[l?"animate":"css"]({height:i+"%"},r.animate),"max"===a&&"vertical"===this.orientation&&this.range[l?"animate":"css"]({height:100-i+"%"},{queue:!1,duration:r.animate}))},_handleEvents:{keydown:function(i){var s,n,o,a,r=t(i.target).data("ui-slider-handle-index");switch(i.keyCode){case t.ui.keyCode.HOME:case t.ui.keyCode.END:case t.ui.keyCode.PAGE_UP:case t.ui.keyCode.PAGE_DOWN:case t.ui.keyCode.UP:case t.ui.keyCode.RIGHT:case t.ui.keyCode.DOWN:case t.ui.keyCode.LEFT:if(i.preventDefault(),!this._keySliding&&(this._keySliding=!0,t(i.target).addClass("ui-state-active"),s=this._start(i,r),s===!1))return}switch(a=this.options.step,n=o=this.options.values&&this.options.values.length?this.values(r):this.value(),i.keyCode){case t.ui.keyCode.HOME:o=this._valueMin();break;case t.ui.keyCode.END:o=this._valueMax();break;case t.ui.keyCode.PAGE_UP:o=this._trimAlignValue(n+(this._valueMax()-this._valueMin())/e);break;case t.ui.keyCode.PAGE_DOWN:o=this._trimAlignValue(n-(this._valueMax()-this._valueMin())/e);break;case t.ui.keyCode.UP:case t.ui.keyCode.RIGHT:if(n===this._valueMax())return;o=this._trimAlignValue(n+a);break;case t.ui.keyCode.DOWN:case t.ui.keyCode.LEFT:if(n===this._valueMin())return;o=this._trimAlignValue(n-a)}this._slide(i,r,o)},click:function(t){t.preventDefault()},keyup:function(e){var i=t(e.target).data("ui-slider-handle-index");this._keySliding&&(this._keySliding=!1,this._stop(e,i),this._change(e,i),t(e.target).removeClass("ui-state-active"))}}})}(jQuery),function(t){function e(t){return function(){var e=this.element.val();t.apply(this,arguments),this._refresh(),e!==this.element.val()&&this._trigger("change")}}t.widget("ui.spinner",{version:"1.10.4",defaultElement:"<input>",widgetEventPrefix:"spin",options:{culture:null,icons:{down:"ui-icon-triangle-1-s",up:"ui-icon-triangle-1-n"},incremental:!0,max:null,min:null,numberFormat:null,page:10,step:1,change:null,spin:null,start:null,stop:null},_create:function(){this._setOption("max",this.options.max),this._setOption("min",this.options.min),this._setOption("step",this.options.step),""!==this.value()&&this._value(this.element.val(),!0),this._draw(),this._on(this._events),this._refresh(),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_getCreateOptions:function(){var e={},i=this.element;return t.each(["min","max","step"],function(t,s){var n=i.attr(s);void 0!==n&&n.length&&(e[s]=n)}),e},_events:{keydown:function(t){this._start(t)&&this._keydown(t)&&t.preventDefault()},keyup:"_stop",focus:function(){this.previous=this.element.val()},blur:function(t){return this.cancelBlur?(delete this.cancelBlur,void 0):(this._stop(),this._refresh(),this.previous!==this.element.val()&&this._trigger("change",t),void 0)},mousewheel:function(t,e){if(e){if(!this.spinning&&!this._start(t))return!1;this._spin((e>0?1:-1)*this.options.step,t),clearTimeout(this.mousewheelTimer),this.mousewheelTimer=this._delay(function(){this.spinning&&this._stop(t)},100),t.preventDefault()}},"mousedown .ui-spinner-button":function(e){function i(){var t=this.element[0]===this.document[0].activeElement;t||(this.element.focus(),this.previous=s,this._delay(function(){this.previous=s}))}var s;s=this.element[0]===this.document[0].activeElement?this.previous:this.element.val(),e.preventDefault(),i.call(this),this.cancelBlur=!0,this._delay(function(){delete this.cancelBlur,i.call(this)}),this._start(e)!==!1&&this._repeat(null,t(e.currentTarget).hasClass("ui-spinner-up")?1:-1,e)},"mouseup .ui-spinner-button":"_stop","mouseenter .ui-spinner-button":function(e){return t(e.currentTarget).hasClass("ui-state-active")?this._start(e)===!1?!1:(this._repeat(null,t(e.currentTarget).hasClass("ui-spinner-up")?1:-1,e),void 0):void 0},"mouseleave .ui-spinner-button":"_stop"},_draw:function(){var t=this.uiSpinner=this.element.addClass("ui-spinner-input").attr("autocomplete","off").wrap(this._uiSpinnerHtml()).parent().append(this._buttonHtml());this.element.attr("role","spinbutton"),this.buttons=t.find(".ui-spinner-button").attr("tabIndex",-1).button().removeClass("ui-corner-all"),this.buttons.height()>Math.ceil(.5*t.height())&&t.height()>0&&t.height(t.height()),this.options.disabled&&this.disable()},_keydown:function(e){var i=this.options,s=t.ui.keyCode;switch(e.keyCode){case s.UP:return this._repeat(null,1,e),!0;case s.DOWN:return this._repeat(null,-1,e),!0;case s.PAGE_UP:return this._repeat(null,i.page,e),!0;case s.PAGE_DOWN:return this._repeat(null,-i.page,e),!0}return!1},_uiSpinnerHtml:function(){return"<span class='ui-spinner ui-widget ui-widget-content ui-corner-all'></span>"},_buttonHtml:function(){return"<a class='ui-spinner-button ui-spinner-up ui-corner-tr'><span class='ui-icon "+this.options.icons.up+"'>&#9650;</span>"+"</a>"+"<a class='ui-spinner-button ui-spinner-down ui-corner-br'>"+"<span class='ui-icon "+this.options.icons.down+"'>&#9660;</span>"+"</a>"},_start:function(t){return this.spinning||this._trigger("start",t)!==!1?(this.counter||(this.counter=1),this.spinning=!0,!0):!1},_repeat:function(t,e,i){t=t||500,clearTimeout(this.timer),this.timer=this._delay(function(){this._repeat(40,e,i)},t),this._spin(e*this.options.step,i)},_spin:function(t,e){var i=this.value()||0;this.counter||(this.counter=1),i=this._adjustValue(i+t*this._increment(this.counter)),this.spinning&&this._trigger("spin",e,{value:i})===!1||(this._value(i),this.counter++)},_increment:function(e){var i=this.options.incremental;return i?t.isFunction(i)?i(e):Math.floor(e*e*e/5e4-e*e/500+17*e/200+1):1},_precision:function(){var t=this._precisionOf(this.options.step);return null!==this.options.min&&(t=Math.max(t,this._precisionOf(this.options.min))),t},_precisionOf:function(t){var e=""+t,i=e.indexOf(".");return-1===i?0:e.length-i-1},_adjustValue:function(t){var e,i,s=this.options;return e=null!==s.min?s.min:0,i=t-e,i=Math.round(i/s.step)*s.step,t=e+i,t=parseFloat(t.toFixed(this._precision())),null!==s.max&&t>s.max?s.max:null!==s.min&&s.min>t?s.min:t},_stop:function(t){this.spinning&&(clearTimeout(this.timer),clearTimeout(this.mousewheelTimer),this.counter=0,this.spinning=!1,this._trigger("stop",t))},_setOption:function(t,e){if("culture"===t||"numberFormat"===t){var i=this._parse(this.element.val());return this.options[t]=e,this.element.val(this._format(i)),void 0}("max"===t||"min"===t||"step"===t)&&"string"==typeof e&&(e=this._parse(e)),"icons"===t&&(this.buttons.first().find(".ui-icon").removeClass(this.options.icons.up).addClass(e.up),this.buttons.last().find(".ui-icon").removeClass(this.options.icons.down).addClass(e.down)),this._super(t,e),"disabled"===t&&(e?(this.element.prop("disabled",!0),this.buttons.button("disable")):(this.element.prop("disabled",!1),this.buttons.button("enable")))},_setOptions:e(function(t){this._super(t),this._value(this.element.val())}),_parse:function(t){return"string"==typeof t&&""!==t&&(t=window.Globalize&&this.options.numberFormat?Globalize.parseFloat(t,10,this.options.culture):+t),""===t||isNaN(t)?null:t},_format:function(t){return""===t?"":window.Globalize&&this.options.numberFormat?Globalize.format(t,this.options.numberFormat,this.options.culture):t},_refresh:function(){this.element.attr({"aria-valuemin":this.options.min,"aria-valuemax":this.options.max,"aria-valuenow":this._parse(this.element.val())})},_value:function(t,e){var i;""!==t&&(i=this._parse(t),null!==i&&(e||(i=this._adjustValue(i)),t=this._format(i))),this.element.val(t),this._refresh()},_destroy:function(){this.element.removeClass("ui-spinner-input").prop("disabled",!1).removeAttr("autocomplete").removeAttr("role").removeAttr("aria-valuemin").removeAttr("aria-valuemax").removeAttr("aria-valuenow"),this.uiSpinner.replaceWith(this.element)},stepUp:e(function(t){this._stepUp(t)}),_stepUp:function(t){this._start()&&(this._spin((t||1)*this.options.step),this._stop())},stepDown:e(function(t){this._stepDown(t)}),_stepDown:function(t){this._start()&&(this._spin((t||1)*-this.options.step),this._stop())},pageUp:e(function(t){this._stepUp((t||1)*this.options.page)}),pageDown:e(function(t){this._stepDown((t||1)*this.options.page)}),value:function(t){return arguments.length?(e(this._value).call(this,t),void 0):this._parse(this.element.val())},widget:function(){return this.uiSpinner}})}(jQuery),function(t,e){function i(){return++n}function s(t){return t=t.cloneNode(!1),t.hash.length>1&&decodeURIComponent(t.href.replace(o,""))===decodeURIComponent(location.href.replace(o,""))}var n=0,o=/#.*$/;t.widget("ui.tabs",{version:"1.10.4",delay:300,options:{active:null,collapsible:!1,event:"click",heightStyle:"content",hide:null,show:null,activate:null,beforeActivate:null,beforeLoad:null,load:null},_create:function(){var e=this,i=this.options;this.running=!1,this.element.addClass("ui-tabs ui-widget ui-widget-content ui-corner-all").toggleClass("ui-tabs-collapsible",i.collapsible).delegate(".ui-tabs-nav > li","mousedown"+this.eventNamespace,function(e){t(this).is(".ui-state-disabled")&&e.preventDefault()}).delegate(".ui-tabs-anchor","focus"+this.eventNamespace,function(){t(this).closest("li").is(".ui-state-disabled")&&this.blur()}),this._processTabs(),i.active=this._initialActive(),t.isArray(i.disabled)&&(i.disabled=t.unique(i.disabled.concat(t.map(this.tabs.filter(".ui-state-disabled"),function(t){return e.tabs.index(t)}))).sort()),this.active=this.options.active!==!1&&this.anchors.length?this._findActive(i.active):t(),this._refresh(),this.active.length&&this.load(i.active)},_initialActive:function(){var i=this.options.active,s=this.options.collapsible,n=location.hash.substring(1);return null===i&&(n&&this.tabs.each(function(s,o){return t(o).attr("aria-controls")===n?(i=s,!1):e}),null===i&&(i=this.tabs.index(this.tabs.filter(".ui-tabs-active"))),(null===i||-1===i)&&(i=this.tabs.length?0:!1)),i!==!1&&(i=this.tabs.index(this.tabs.eq(i)),-1===i&&(i=s?!1:0)),!s&&i===!1&&this.anchors.length&&(i=0),i},_getCreateEventData:function(){return{tab:this.active,panel:this.active.length?this._getPanelForTab(this.active):t()}},_tabKeydown:function(i){var s=t(this.document[0].activeElement).closest("li"),n=this.tabs.index(s),o=!0;if(!this._handlePageNav(i)){switch(i.keyCode){case t.ui.keyCode.RIGHT:case t.ui.keyCode.DOWN:n++;break;case t.ui.keyCode.UP:case t.ui.keyCode.LEFT:o=!1,n--;break;case t.ui.keyCode.END:n=this.anchors.length-1;break;case t.ui.keyCode.HOME:n=0;break;case t.ui.keyCode.SPACE:return i.preventDefault(),clearTimeout(this.activating),this._activate(n),e;case t.ui.keyCode.ENTER:return i.preventDefault(),clearTimeout(this.activating),this._activate(n===this.options.active?!1:n),e;default:return}i.preventDefault(),clearTimeout(this.activating),n=this._focusNextTab(n,o),i.ctrlKey||(s.attr("aria-selected","false"),this.tabs.eq(n).attr("aria-selected","true"),this.activating=this._delay(function(){this.option("active",n)},this.delay))}},_panelKeydown:function(e){this._handlePageNav(e)||e.ctrlKey&&e.keyCode===t.ui.keyCode.UP&&(e.preventDefault(),this.active.focus())},_handlePageNav:function(i){return i.altKey&&i.keyCode===t.ui.keyCode.PAGE_UP?(this._activate(this._focusNextTab(this.options.active-1,!1)),!0):i.altKey&&i.keyCode===t.ui.keyCode.PAGE_DOWN?(this._activate(this._focusNextTab(this.options.active+1,!0)),!0):e},_findNextTab:function(e,i){function s(){return e>n&&(e=0),0>e&&(e=n),e}for(var n=this.tabs.length-1;-1!==t.inArray(s(),this.options.disabled);)e=i?e+1:e-1;return e},_focusNextTab:function(t,e){return t=this._findNextTab(t,e),this.tabs.eq(t).focus(),t},_setOption:function(t,i){return"active"===t?(this._activate(i),e):"disabled"===t?(this._setupDisabled(i),e):(this._super(t,i),"collapsible"===t&&(this.element.toggleClass("ui-tabs-collapsible",i),i||this.options.active!==!1||this._activate(0)),"event"===t&&this._setupEvents(i),"heightStyle"===t&&this._setupHeightStyle(i),e)},_tabId:function(t){return t.attr("aria-controls")||"ui-tabs-"+i()},_sanitizeSelector:function(t){return t?t.replace(/[!"$%&'()*+,.\/:;<=>?@\[\]\^`{|}~]/g,"\\$&"):""},refresh:function(){var e=this.options,i=this.tablist.children(":has(a[href])");e.disabled=t.map(i.filter(".ui-state-disabled"),function(t){return i.index(t)}),this._processTabs(),e.active!==!1&&this.anchors.length?this.active.length&&!t.contains(this.tablist[0],this.active[0])?this.tabs.length===e.disabled.length?(e.active=!1,this.active=t()):this._activate(this._findNextTab(Math.max(0,e.active-1),!1)):e.active=this.tabs.index(this.active):(e.active=!1,this.active=t()),this._refresh()},_refresh:function(){this._setupDisabled(this.options.disabled),this._setupEvents(this.options.event),this._setupHeightStyle(this.options.heightStyle),this.tabs.not(this.active).attr({"aria-selected":"false",tabIndex:-1}),this.panels.not(this._getPanelForTab(this.active)).hide().attr({"aria-expanded":"false","aria-hidden":"true"}),this.active.length?(this.active.addClass("ui-tabs-active ui-state-active").attr({"aria-selected":"true",tabIndex:0}),this._getPanelForTab(this.active).show().attr({"aria-expanded":"true","aria-hidden":"false"})):this.tabs.eq(0).attr("tabIndex",0)},_processTabs:function(){var e=this;this.tablist=this._getList().addClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all").attr("role","tablist"),this.tabs=this.tablist.find("> li:has(a[href])").addClass("ui-state-default ui-corner-top").attr({role:"tab",tabIndex:-1}),this.anchors=this.tabs.map(function(){return t("a",this)[0]}).addClass("ui-tabs-anchor").attr({role:"presentation",tabIndex:-1}),this.panels=t(),this.anchors.each(function(i,n){var o,a,r,h=t(n).uniqueId().attr("id"),l=t(n).closest("li"),c=l.attr("aria-controls");s(n)?(o=n.hash,a=e.element.find(e._sanitizeSelector(o))):(r=e._tabId(l),o="#"+r,a=e.element.find(o),a.length||(a=e._createPanel(r),a.insertAfter(e.panels[i-1]||e.tablist)),a.attr("aria-live","polite")),a.length&&(e.panels=e.panels.add(a)),c&&l.data("ui-tabs-aria-controls",c),l.attr({"aria-controls":o.substring(1),"aria-labelledby":h}),a.attr("aria-labelledby",h)}),this.panels.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").attr("role","tabpanel")},_getList:function(){return this.tablist||this.element.find("ol,ul").eq(0)},_createPanel:function(e){return t("<div>").attr("id",e).addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").data("ui-tabs-destroy",!0)},_setupDisabled:function(e){t.isArray(e)&&(e.length?e.length===this.anchors.length&&(e=!0):e=!1);for(var i,s=0;i=this.tabs[s];s++)e===!0||-1!==t.inArray(s,e)?t(i).addClass("ui-state-disabled").attr("aria-disabled","true"):t(i).removeClass("ui-state-disabled").removeAttr("aria-disabled");this.options.disabled=e},_setupEvents:function(e){var i={click:function(t){t.preventDefault()}};e&&t.each(e.split(" "),function(t,e){i[e]="_eventHandler"}),this._off(this.anchors.add(this.tabs).add(this.panels)),this._on(this.anchors,i),this._on(this.tabs,{keydown:"_tabKeydown"}),this._on(this.panels,{keydown:"_panelKeydown"}),this._focusable(this.tabs),this._hoverable(this.tabs)},_setupHeightStyle:function(e){var i,s=this.element.parent();"fill"===e?(i=s.height(),i-=this.element.outerHeight()-this.element.height(),this.element.siblings(":visible").each(function(){var e=t(this),s=e.css("position");"absolute"!==s&&"fixed"!==s&&(i-=e.outerHeight(!0))}),this.element.children().not(this.panels).each(function(){i-=t(this).outerHeight(!0)}),this.panels.each(function(){t(this).height(Math.max(0,i-t(this).innerHeight()+t(this).height()))}).css("overflow","auto")):"auto"===e&&(i=0,this.panels.each(function(){i=Math.max(i,t(this).height("").height())}).height(i))},_eventHandler:function(e){var i=this.options,s=this.active,n=t(e.currentTarget),o=n.closest("li"),a=o[0]===s[0],r=a&&i.collapsible,h=r?t():this._getPanelForTab(o),l=s.length?this._getPanelForTab(s):t(),c={oldTab:s,oldPanel:l,newTab:r?t():o,newPanel:h};e.preventDefault(),o.hasClass("ui-state-disabled")||o.hasClass("ui-tabs-loading")||this.running||a&&!i.collapsible||this._trigger("beforeActivate",e,c)===!1||(i.active=r?!1:this.tabs.index(o),this.active=a?t():o,this.xhr&&this.xhr.abort(),l.length||h.length||t.error("jQuery UI Tabs: Mismatching fragment identifier."),h.length&&this.load(this.tabs.index(o),e),this._toggle(e,c))},_toggle:function(e,i){function s(){o.running=!1,o._trigger("activate",e,i)}function n(){i.newTab.closest("li").addClass("ui-tabs-active ui-state-active"),a.length&&o.options.show?o._show(a,o.options.show,s):(a.show(),s())}var o=this,a=i.newPanel,r=i.oldPanel;this.running=!0,r.length&&this.options.hide?this._hide(r,this.options.hide,function(){i.oldTab.closest("li").removeClass("ui-tabs-active ui-state-active"),n()}):(i.oldTab.closest("li").removeClass("ui-tabs-active ui-state-active"),r.hide(),n()),r.attr({"aria-expanded":"false","aria-hidden":"true"}),i.oldTab.attr("aria-selected","false"),a.length&&r.length?i.oldTab.attr("tabIndex",-1):a.length&&this.tabs.filter(function(){return 0===t(this).attr("tabIndex")}).attr("tabIndex",-1),a.attr({"aria-expanded":"true","aria-hidden":"false"}),i.newTab.attr({"aria-selected":"true",tabIndex:0})},_activate:function(e){var i,s=this._findActive(e);s[0]!==this.active[0]&&(s.length||(s=this.active),i=s.find(".ui-tabs-anchor")[0],this._eventHandler({target:i,currentTarget:i,preventDefault:t.noop}))},_findActive:function(e){return e===!1?t():this.tabs.eq(e)},_getIndex:function(t){return"string"==typeof t&&(t=this.anchors.index(this.anchors.filter("[href$='"+t+"']"))),t},_destroy:function(){this.xhr&&this.xhr.abort(),this.element.removeClass("ui-tabs ui-widget ui-widget-content ui-corner-all ui-tabs-collapsible"),this.tablist.removeClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all").removeAttr("role"),this.anchors.removeClass("ui-tabs-anchor").removeAttr("role").removeAttr("tabIndex").removeUniqueId(),this.tabs.add(this.panels).each(function(){t.data(this,"ui-tabs-destroy")?t(this).remove():t(this).removeClass("ui-state-default ui-state-active ui-state-disabled ui-corner-top ui-corner-bottom ui-widget-content ui-tabs-active ui-tabs-panel").removeAttr("tabIndex").removeAttr("aria-live").removeAttr("aria-busy").removeAttr("aria-selected").removeAttr("aria-labelledby").removeAttr("aria-hidden").removeAttr("aria-expanded").removeAttr("role")}),this.tabs.each(function(){var e=t(this),i=e.data("ui-tabs-aria-controls");i?e.attr("aria-controls",i).removeData("ui-tabs-aria-controls"):e.removeAttr("aria-controls")}),this.panels.show(),"content"!==this.options.heightStyle&&this.panels.css("height","")},enable:function(i){var s=this.options.disabled;s!==!1&&(i===e?s=!1:(i=this._getIndex(i),s=t.isArray(s)?t.map(s,function(t){return t!==i?t:null}):t.map(this.tabs,function(t,e){return e!==i?e:null})),this._setupDisabled(s))},disable:function(i){var s=this.options.disabled;if(s!==!0){if(i===e)s=!0;else{if(i=this._getIndex(i),-1!==t.inArray(i,s))return;s=t.isArray(s)?t.merge([i],s).sort():[i]}this._setupDisabled(s)}},load:function(e,i){e=this._getIndex(e);var n=this,o=this.tabs.eq(e),a=o.find(".ui-tabs-anchor"),r=this._getPanelForTab(o),h={tab:o,panel:r};s(a[0])||(this.xhr=t.ajax(this._ajaxSettings(a,i,h)),this.xhr&&"canceled"!==this.xhr.statusText&&(o.addClass("ui-tabs-loading"),r.attr("aria-busy","true"),this.xhr.success(function(t){setTimeout(function(){r.html(t),n._trigger("load",i,h)},1)}).complete(function(t,e){setTimeout(function(){"abort"===e&&n.panels.stop(!1,!0),o.removeClass("ui-tabs-loading"),r.removeAttr("aria-busy"),t===n.xhr&&delete n.xhr},1)})))},_ajaxSettings:function(e,i,s){var n=this;return{url:e.attr("href"),beforeSend:function(e,o){return n._trigger("beforeLoad",i,t.extend({jqXHR:e,ajaxSettings:o},s))}}},_getPanelForTab:function(e){var i=t(e).attr("aria-controls");return this.element.find(this._sanitizeSelector("#"+i))}})}(jQuery),function(t){function e(e,i){var s=(e.attr("aria-describedby")||"").split(/\s+/);s.push(i),e.data("ui-tooltip-id",i).attr("aria-describedby",t.trim(s.join(" ")))}function i(e){var i=e.data("ui-tooltip-id"),s=(e.attr("aria-describedby")||"").split(/\s+/),n=t.inArray(i,s);-1!==n&&s.splice(n,1),e.removeData("ui-tooltip-id"),s=t.trim(s.join(" ")),s?e.attr("aria-describedby",s):e.removeAttr("aria-describedby")}var s=0;t.widget("ui.tooltip",{version:"1.10.4",options:{content:function(){var e=t(this).attr("title")||"";return t("<a>").text(e).html()},hide:!0,items:"[title]:not([disabled])",position:{my:"left top+15",at:"left bottom",collision:"flipfit flip"},show:!0,tooltipClass:null,track:!1,close:null,open:null},_create:function(){this._on({mouseover:"open",focusin:"open"}),this.tooltips={},this.parents={},this.options.disabled&&this._disable()},_setOption:function(e,i){var s=this;return"disabled"===e?(this[i?"_disable":"_enable"](),this.options[e]=i,void 0):(this._super(e,i),"content"===e&&t.each(this.tooltips,function(t,e){s._updateContent(e)}),void 0)},_disable:function(){var e=this;t.each(this.tooltips,function(i,s){var n=t.Event("blur");n.target=n.currentTarget=s[0],e.close(n,!0)}),this.element.find(this.options.items).addBack().each(function(){var e=t(this);e.is("[title]")&&e.data("ui-tooltip-title",e.attr("title")).attr("title","")})},_enable:function(){this.element.find(this.options.items).addBack().each(function(){var e=t(this);e.data("ui-tooltip-title")&&e.attr("title",e.data("ui-tooltip-title"))})},open:function(e){var i=this,s=t(e?e.target:this.element).closest(this.options.items);s.length&&!s.data("ui-tooltip-id")&&(s.attr("title")&&s.data("ui-tooltip-title",s.attr("title")),s.data("ui-tooltip-open",!0),e&&"mouseover"===e.type&&s.parents().each(function(){var e,s=t(this);s.data("ui-tooltip-open")&&(e=t.Event("blur"),e.target=e.currentTarget=this,i.close(e,!0)),s.attr("title")&&(s.uniqueId(),i.parents[this.id]={element:this,title:s.attr("title")},s.attr("title",""))}),this._updateContent(s,e))},_updateContent:function(t,e){var i,s=this.options.content,n=this,o=e?e.type:null;
+return"string"==typeof s?this._open(e,t,s):(i=s.call(t[0],function(i){t.data("ui-tooltip-open")&&n._delay(function(){e&&(e.type=o),this._open(e,t,i)})}),i&&this._open(e,t,i),void 0)},_open:function(i,s,n){function o(t){l.of=t,a.is(":hidden")||a.position(l)}var a,r,h,l=t.extend({},this.options.position);if(n){if(a=this._find(s),a.length)return a.find(".ui-tooltip-content").html(n),void 0;s.is("[title]")&&(i&&"mouseover"===i.type?s.attr("title",""):s.removeAttr("title")),a=this._tooltip(s),e(s,a.attr("id")),a.find(".ui-tooltip-content").html(n),this.options.track&&i&&/^mouse/.test(i.type)?(this._on(this.document,{mousemove:o}),o(i)):a.position(t.extend({of:s},this.options.position)),a.hide(),this._show(a,this.options.show),this.options.show&&this.options.show.delay&&(h=this.delayedShow=setInterval(function(){a.is(":visible")&&(o(l.of),clearInterval(h))},t.fx.interval)),this._trigger("open",i,{tooltip:a}),r={keyup:function(e){if(e.keyCode===t.ui.keyCode.ESCAPE){var i=t.Event(e);i.currentTarget=s[0],this.close(i,!0)}},remove:function(){this._removeTooltip(a)}},i&&"mouseover"!==i.type||(r.mouseleave="close"),i&&"focusin"!==i.type||(r.focusout="close"),this._on(!0,s,r)}},close:function(e){var s=this,n=t(e?e.currentTarget:this.element),o=this._find(n);this.closing||(clearInterval(this.delayedShow),n.data("ui-tooltip-title")&&n.attr("title",n.data("ui-tooltip-title")),i(n),o.stop(!0),this._hide(o,this.options.hide,function(){s._removeTooltip(t(this))}),n.removeData("ui-tooltip-open"),this._off(n,"mouseleave focusout keyup"),n[0]!==this.element[0]&&this._off(n,"remove"),this._off(this.document,"mousemove"),e&&"mouseleave"===e.type&&t.each(this.parents,function(e,i){t(i.element).attr("title",i.title),delete s.parents[e]}),this.closing=!0,this._trigger("close",e,{tooltip:o}),this.closing=!1)},_tooltip:function(e){var i="ui-tooltip-"+s++,n=t("<div>").attr({id:i,role:"tooltip"}).addClass("ui-tooltip ui-widget ui-corner-all ui-widget-content "+(this.options.tooltipClass||""));return t("<div>").addClass("ui-tooltip-content").appendTo(n),n.appendTo(this.document[0].body),this.tooltips[i]=e,n},_find:function(e){var i=e.data("ui-tooltip-id");return i?t("#"+i):t()},_removeTooltip:function(t){t.remove(),delete this.tooltips[t.attr("id")]},_destroy:function(){var e=this;t.each(this.tooltips,function(i,s){var n=t.Event("blur");n.target=n.currentTarget=s[0],e.close(n,!0),t("#"+i).remove(),s.data("ui-tooltip-title")&&(s.attr("title",s.data("ui-tooltip-title")),s.removeData("ui-tooltip-title"))})}})}(jQuery);
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/jquery/jquery.form.js b/pluss-manage-page/src/main/resources/static/resources/js/third-party/jquery/jquery.form.js
new file mode 100644
index 0000000..a8075ee
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/third-party/jquery/jquery.form.js
@@ -0,0 +1,911 @@
+/*!
+ * jQuery Form Plugin
+ * version: 2.83 (11-JUL-2011)
+ * @requires jQuery v1.3.2 or later
+ *
+ * Examples and documentation at: http://malsup.com/jquery/form/
+ * Dual licensed under the MIT and GPL licenses:
+ *   http://www.opensource.org/licenses/mit-license.php
+ *   http://www.gnu.org/licenses/gpl.html
+ */
+;(function($) {
+
+/*
+	Usage Note:
+	-----------
+	Do not use both ajaxSubmit and ajaxForm on the same form.  These
+	functions are intended to be exclusive.  Use ajaxSubmit if you want
+	to bind your own submit handler to the form.  For example,
+
+	$(document).ready(function() {
+		$('#myForm').bind('submit', function(e) {
+			e.preventDefault(); // <-- important
+			$(this).ajaxSubmit({
+				target: '#output'
+			});
+		});
+	});
+
+	Use ajaxForm when you want the plugin to manage all the event binding
+	for you.  For example,
+
+	$(document).ready(function() {
+		$('#myForm').ajaxForm({
+			target: '#output'
+		});
+	});
+
+	When using ajaxForm, the ajaxSubmit function will be invoked for you
+	at the appropriate time.
+*/
+
+/**
+ * ajaxSubmit() provides a mechanism for immediately submitting
+ * an HTML form using AJAX.
+ */
+$.fn.ajaxSubmit = function(options) {
+	// fast fail if nothing selected (http://dev.jquery.com/ticket/2752)
+	if (!this.length) {
+		log('ajaxSubmit: skipping submit process - no element selected');
+		return this;
+	}
+	
+	var method, action, url, $form = this;
+
+	if (typeof options == 'function') {
+		options = { success: options };
+	}
+
+	method = this.attr('method');
+	action = this.attr('action');
+	url = (typeof action === 'string') ? $.trim(action) : '';
+	url = url || window.location.href || '';
+	if (url) {
+		// clean url (don't include hash vaue)
+		url = (url.match(/^([^#]+)/)||[])[1];
+	}
+
+	options = $.extend(true, {
+		url:  url,
+		success: $.ajaxSettings.success,
+		type: method || 'GET',
+		iframeSrc: /^https/i.test(window.location.href || '') ? 'javascript:false' : 'about:blank'
+	}, options);
+
+	// hook for manipulating the form data before it is extracted;
+	// convenient for use with rich editors like tinyMCE or FCKEditor
+	var veto = {};
+	this.trigger('form-pre-serialize', [this, options, veto]);
+	if (veto.veto) {
+		log('ajaxSubmit: submit vetoed via form-pre-serialize trigger');
+		return this;
+	}
+
+	// provide opportunity to alter form data before it is serialized
+	if (options.beforeSerialize && options.beforeSerialize(this, options) === false) {
+		log('ajaxSubmit: submit aborted via beforeSerialize callback');
+		return this;
+	}
+
+	var n,v,a = this.formToArray(options.semantic);
+	if (options.data) {
+		options.extraData = options.data;
+		for (n in options.data) {
+			if(options.data[n] instanceof Array) {
+				for (var k in options.data[n]) {
+					a.push( { name: n, value: options.data[n][k] } );
+				}
+			}
+			else {
+				v = options.data[n];
+				v = $.isFunction(v) ? v() : v; // if value is fn, invoke it
+				a.push( { name: n, value: v } );
+			}
+		}
+	}
+
+	// give pre-submit callback an opportunity to abort the submit
+	if (options.beforeSubmit && options.beforeSubmit(a, this, options) === false) {
+		log('ajaxSubmit: submit aborted via beforeSubmit callback');
+		return this;
+	}
+
+	// fire vetoable 'validate' event
+	this.trigger('form-submit-validate', [a, this, options, veto]);
+	if (veto.veto) {
+		log('ajaxSubmit: submit vetoed via form-submit-validate trigger');
+		return this;
+	}
+
+	var q = $.param(a);
+
+	if (options.type.toUpperCase() == 'GET') {
+		options.url += (options.url.indexOf('?') >= 0 ? '&' : '?') + q;
+		options.data = null;  // data is null for 'get'
+	}
+	else {
+		options.data = q; // data is the query string for 'post'
+	}
+
+	var callbacks = [];
+	if (options.resetForm) {
+		callbacks.push(function() { $form.resetForm(); });
+	}
+	if (options.clearForm) {
+		callbacks.push(function() { $form.clearForm(); });
+	}
+
+	// perform a load on the target only if dataType is not provided
+	if (!options.dataType && options.target) {
+		var oldSuccess = options.success || function(){};
+		callbacks.push(function(data) {
+			var fn = options.replaceTarget ? 'replaceWith' : 'html';
+			$(options.target)[fn](data).each(oldSuccess, arguments);
+		});
+	}
+	else if (options.success) {
+		callbacks.push(options.success);
+	}
+
+	options.success = function(data, status, xhr) { // jQuery 1.4+ passes xhr as 3rd arg
+		var context = options.context || options;   // jQuery 1.4+ supports scope context 
+		for (var i=0, max=callbacks.length; i < max; i++) {
+			callbacks[i].apply(context, [data, status, xhr || $form, $form]);
+		}
+	};
+
+	// are there files to upload?
+	var fileInputs = $('input:file', this).length > 0;
+	var mp = 'multipart/form-data';
+	var multipart = ($form.attr('enctype') == mp || $form.attr('encoding') == mp);
+
+	// options.iframe allows user to force iframe mode
+	// 06-NOV-09: now defaulting to iframe mode if file input is detected
+   if (options.iframe !== false && (fileInputs || options.iframe || multipart)) {
+	   // hack to fix Safari hang (thanks to Tim Molendijk for this)
+	   // see:  http://groups.google.com/group/jquery-dev/browse_thread/thread/36395b7ab510dd5d
+	   if (options.closeKeepAlive) {
+		   $.get(options.closeKeepAlive, function() { fileUpload(a); });
+		}
+	   else {
+		   fileUpload(a);
+		}
+   }
+   else {
+		// IE7 massage (see issue 57)
+		if ($.browser.msie && method == 'get') { 
+			var ieMeth = $form[0].getAttribute('method');
+			if (typeof ieMeth === 'string')
+				options.type = ieMeth;
+		}
+		$.ajax(options);
+   }
+
+	// fire 'notify' event
+	this.trigger('form-submit-notify', [this, options]);
+	return this;
+
+
+	// private function for handling file uploads (hat tip to YAHOO!)
+	function fileUpload(a) {
+		var form = $form[0], el, i, s, g, id, $io, io, xhr, sub, n, timedOut, timeoutHandle;
+        var useProp = !!$.fn.prop;
+
+        if (a) {
+        	// ensure that every serialized input is still enabled
+          	for (i=0; i < a.length; i++) {
+                el = $(form[a[i].name]);
+                el[ useProp ? 'prop' : 'attr' ]('disabled', false);
+          	}
+        }
+
+		if ($(':input[name=submit],:input[id=submit]', form).length) {
+			// if there is an input with a name or id of 'submit' then we won't be
+			// able to invoke the submit fn on the form (at least not x-browser)
+			alert('Error: Form elements must not have name or id of "submit".');
+			return;
+		}
+		
+		s = $.extend(true, {}, $.ajaxSettings, options);
+		s.context = s.context || s;
+		id = 'jqFormIO' + (new Date().getTime());
+		if (s.iframeTarget) {
+			$io = $(s.iframeTarget);
+			n = $io.attr('name');
+			if (n == null)
+			 	$io.attr('name', id);
+			else
+				id = n;
+		}
+		else {
+			$io = $('<iframe name="' + id + '" src="'+ s.iframeSrc +'" />');
+			$io.css({ position: 'absolute', top: '-1000px', left: '-1000px' });
+		}
+		io = $io[0];
+
+
+		xhr = { // mock object
+			aborted: 0,
+			responseText: null,
+			responseXML: null,
+			status: 0,
+			statusText: 'n/a',
+			getAllResponseHeaders: function() {},
+			getResponseHeader: function() {},
+			setRequestHeader: function() {},
+			abort: function(status) {
+				var e = (status === 'timeout' ? 'timeout' : 'aborted');
+				log('aborting upload... ' + e);
+				this.aborted = 1;
+				$io.attr('src', s.iframeSrc); // abort op in progress
+				xhr.error = e;
+				s.error && s.error.call(s.context, xhr, e, status);
+				g && $.event.trigger("ajaxError", [xhr, s, e]);
+				s.complete && s.complete.call(s.context, xhr, e);
+			}
+		};
+
+		g = s.global;
+		// trigger ajax global events so that activity/block indicators work like normal
+		if (g && ! $.active++) {
+			$.event.trigger("ajaxStart");
+		}
+		if (g) {
+			$.event.trigger("ajaxSend", [xhr, s]);
+		}
+
+		if (s.beforeSend && s.beforeSend.call(s.context, xhr, s) === false) {
+			if (s.global) {
+				$.active--;
+			}
+			return;
+		}
+		if (xhr.aborted) {
+			return;
+		}
+
+		// add submitting element to data if we know it
+		sub = form.clk;
+		if (sub) {
+			n = sub.name;
+			if (n && !sub.disabled) {
+				s.extraData = s.extraData || {};
+				s.extraData[n] = sub.value;
+				if (sub.type == "image") {
+					s.extraData[n+'.x'] = form.clk_x;
+					s.extraData[n+'.y'] = form.clk_y;
+				}
+			}
+		}
+		
+		var CLIENT_TIMEOUT_ABORT = 1;
+		var SERVER_ABORT = 2;
+
+		function getDoc(frame) {
+			var doc = frame.contentWindow ? frame.contentWindow.document : frame.contentDocument ? frame.contentDocument : frame.document;
+			return doc;
+		}
+		
+		// take a breath so that pending repaints get some cpu time before the upload starts
+		function doSubmit() {
+			// make sure form attrs are set
+			var t = $form.attr('target'), a = $form.attr('action');
+
+			// update form attrs in IE friendly way
+			form.setAttribute('target',id);
+			if (!method) {
+				form.setAttribute('method', 'POST');
+			}
+			if (a != s.url) {
+				form.setAttribute('action', s.url);
+			}
+
+			// ie borks in some cases when setting encoding
+			if (! s.skipEncodingOverride && (!method || /post/i.test(method))) {
+				$form.attr({
+					encoding: 'multipart/form-data',
+					enctype:  'multipart/form-data'
+				});
+			}
+
+			// support timout
+			if (s.timeout) {
+				timeoutHandle = setTimeout(function() { timedOut = true; cb(CLIENT_TIMEOUT_ABORT); }, s.timeout);
+			}
+			
+			// look for server aborts
+			function checkState() {
+				try {
+					var state = getDoc(io).readyState;
+					log('state = ' + state);
+					if (state.toLowerCase() == 'uninitialized')
+						setTimeout(checkState,50);
+				}
+				catch(e) {
+					log('Server abort: ' , e, ' (', e.name, ')');
+					cb(SERVER_ABORT);
+					timeoutHandle && clearTimeout(timeoutHandle);
+					timeoutHandle = undefined;
+				}
+			}
+
+			// add "extra" data to form if provided in options
+			var extraInputs = [];
+			try {
+				if (s.extraData) {
+					for (var n in s.extraData) {
+						extraInputs.push(
+							$('<input type="hidden" name="'+n+'" />').attr('value',s.extraData[n])
+								.appendTo(form)[0]);
+					}
+				}
+
+				if (!s.iframeTarget) {
+					// add iframe to doc and submit the form
+					$io.appendTo('body');
+	                io.attachEvent ? io.attachEvent('onload', cb) : io.addEventListener('load', cb, false);
+				}
+				setTimeout(checkState,15);
+				form.submit();
+			}
+			finally {
+				// reset attrs and remove "extra" input elements
+				form.setAttribute('action',a);
+				if(t) {
+					form.setAttribute('target', t);
+				} else {
+					$form.removeAttr('target');
+				}
+				$(extraInputs).remove();
+			}
+		}
+
+		if (s.forceSync) {
+			doSubmit();
+		}
+		else {
+			setTimeout(doSubmit, 10); // this lets dom updates render
+		}
+
+		var data, doc, domCheckCount = 50, callbackProcessed;
+
+		function cb(e) {
+			if (xhr.aborted || callbackProcessed) {
+				return;
+			}
+			try {
+				doc = getDoc(io);
+			}
+			catch(ex) {
+				log('cannot access response document: ', ex);
+				e = SERVER_ABORT;
+			}
+			if (e === CLIENT_TIMEOUT_ABORT && xhr) {
+				xhr.abort('timeout');
+				return;
+			}
+			else if (e == SERVER_ABORT && xhr) {
+				xhr.abort('server abort');
+				return;
+			}
+
+			if (!doc || doc.location.href == s.iframeSrc) {
+				// response not received yet
+				if (!timedOut)
+					return;
+			}
+            io.detachEvent ? io.detachEvent('onload', cb) : io.removeEventListener('load', cb, false);
+
+			var status = 'success', errMsg;
+			try {
+				if (timedOut) {
+					throw 'timeout';
+				}
+
+				var isXml = s.dataType == 'xml' || doc.XMLDocument || $.isXMLDoc(doc);
+				log('isXml='+isXml);
+				if (!isXml && window.opera && (doc.body == null || doc.body.innerHTML == '')) {
+					if (--domCheckCount) {
+						// in some browsers (Opera) the iframe DOM is not always traversable when
+						// the onload callback fires, so we loop a bit to accommodate
+						log('requeing onLoad callback, DOM not available');
+						setTimeout(cb, 250);
+						return;
+					}
+					// let this fall through because server response could be an empty document
+					//log('Could not access iframe DOM after mutiple tries.');
+					//throw 'DOMException: not available';
+				}
+
+				//log('response detected');
+                var docRoot = doc.body ? doc.body : doc.documentElement;
+                xhr.responseText = docRoot ? docRoot.innerHTML : null;
+				xhr.responseXML = doc.XMLDocument ? doc.XMLDocument : doc;
+				if (isXml)
+					s.dataType = 'xml';
+				xhr.getResponseHeader = function(header){
+					var headers = {'content-type': s.dataType};
+					return headers[header];
+				};
+                // support for XHR 'status' & 'statusText' emulation :
+                if (docRoot) {
+                    xhr.status = Number( docRoot.getAttribute('status') ) || xhr.status;
+                    xhr.statusText = docRoot.getAttribute('statusText') || xhr.statusText;
+                }
+
+				var dt = s.dataType || '';
+				var scr = /(json|script|text)/.test(dt.toLowerCase());
+				if (scr || s.textarea) {
+					// see if user embedded response in textarea
+					var ta = doc.getElementsByTagName('textarea')[0];
+					if (ta) {
+						xhr.responseText = ta.value;
+                        // support for XHR 'status' & 'statusText' emulation :
+                        xhr.status = Number( ta.getAttribute('status') ) || xhr.status;
+                        xhr.statusText = ta.getAttribute('statusText') || xhr.statusText;
+					}
+					else if (scr) {
+						// account for browsers injecting pre around json response
+						var pre = doc.getElementsByTagName('pre')[0];
+						var b = doc.getElementsByTagName('body')[0];
+						if (pre) {
+							xhr.responseText = pre.textContent ? pre.textContent : pre.innerHTML;
+						}
+						else if (b) {
+							xhr.responseText = b.innerHTML;
+						}
+					}
+				}
+				else if (s.dataType == 'xml' && !xhr.responseXML && xhr.responseText != null) {
+					xhr.responseXML = toXml(xhr.responseText);
+				}
+
+                try {
+                    data = httpData(xhr, s.dataType, s);
+                }
+                catch (e) {
+                    status = 'parsererror';
+                    xhr.error = errMsg = (e || status);
+                }
+			}
+			catch (e) {
+				log('error caught: ',e);
+				status = 'error';
+                xhr.error = errMsg = (e || status);
+			}
+
+			if (xhr.aborted) {
+				log('upload aborted');
+				status = null;
+			}
+
+            if (xhr.status) { // we've set xhr.status
+                status = (xhr.status >= 200 && xhr.status < 300 || xhr.status === 304) ? 'success' : 'error';
+            }
+
+			// ordering of these callbacks/triggers is odd, but that's how $.ajax does it
+			if (status === 'success') {
+				s.success && s.success.call(s.context, data, 'success', xhr);
+				g && $.event.trigger("ajaxSuccess", [xhr, s]);
+			}
+            else if (status) {
+				if (errMsg == undefined)
+					errMsg = xhr.statusText;
+				s.error && s.error.call(s.context, xhr, status, errMsg);
+				g && $.event.trigger("ajaxError", [xhr, s, errMsg]);
+            }
+
+			g && $.event.trigger("ajaxComplete", [xhr, s]);
+
+			if (g && ! --$.active) {
+				$.event.trigger("ajaxStop");
+			}
+
+			s.complete && s.complete.call(s.context, xhr, status);
+
+			callbackProcessed = true;
+			if (s.timeout)
+				clearTimeout(timeoutHandle);
+
+			// clean up
+			setTimeout(function() {
+				if (!s.iframeTarget)
+					$io.remove();
+				xhr.responseXML = null;
+			}, 100);
+		}
+
+		var toXml = $.parseXML || function(s, doc) { // use parseXML if available (jQuery 1.5+)
+			if (window.ActiveXObject) {
+				doc = new ActiveXObject('Microsoft.XMLDOM');
+				doc.async = 'false';
+				doc.loadXML(s);
+			}
+			else {
+				doc = (new DOMParser()).parseFromString(s, 'text/xml');
+			}
+			return (doc && doc.documentElement && doc.documentElement.nodeName != 'parsererror') ? doc : null;
+		};
+		var parseJSON = $.parseJSON || function(s) {
+			return window['eval']('(' + s + ')');
+		};
+
+		var httpData = function( xhr, type, s ) { // mostly lifted from jq1.4.4
+
+			var ct = xhr.getResponseHeader('content-type') || '',
+				xml = type === 'xml' || !type && ct.indexOf('xml') >= 0,
+				data = xml ? xhr.responseXML : xhr.responseText;
+
+			if (xml && data.documentElement.nodeName === 'parsererror') {
+				$.error && $.error('parsererror');
+			}
+			if (s && s.dataFilter) {
+				data = s.dataFilter(data, type);
+			}
+			if (typeof data === 'string') {
+				if (type === 'json' || !type && ct.indexOf('json') >= 0) {
+					data = parseJSON(data);
+				} else if (type === "script" || !type && ct.indexOf("javascript") >= 0) {
+					$.globalEval(data);
+				}
+			}
+			return data;
+		};
+	}
+};
+
+/**
+ * ajaxForm() provides a mechanism for fully automating form submission.
+ *
+ * The advantages of using this method instead of ajaxSubmit() are:
+ *
+ * 1: This method will include coordinates for <input type="image" /> elements (if the element
+ *	is used to submit the form).
+ * 2. This method will include the submit element's name/value data (for the element that was
+ *	used to submit the form).
+ * 3. This method binds the submit() method to the form for you.
+ *
+ * The options argument for ajaxForm works exactly as it does for ajaxSubmit.  ajaxForm merely
+ * passes the options argument along after properly binding events for submit elements and
+ * the form itself.
+ */
+$.fn.ajaxForm = function(options) {
+	// in jQuery 1.3+ we can fix mistakes with the ready state
+	if (this.length === 0) {
+		var o = { s: this.selector, c: this.context };
+		if (!$.isReady && o.s) {
+			log('DOM not ready, queuing ajaxForm');
+			$(function() {
+				$(o.s,o.c).ajaxForm(options);
+			});
+			return this;
+		}
+		// is your DOM ready?  http://docs.jquery.com/Tutorials:Introducing_$(document).ready()
+		log('terminating; zero elements found by selector' + ($.isReady ? '' : ' (DOM not ready)'));
+		return this;
+	}
+
+	return this.ajaxFormUnbind().bind('submit.form-plugin', function(e) {
+		if (!e.isDefaultPrevented()) { // if event has been canceled, don't proceed
+			e.preventDefault();
+			$(this).ajaxSubmit(options);
+		}
+	}).bind('click.form-plugin', function(e) {
+		var target = e.target;
+		var $el = $(target);
+		if (!($el.is(":submit,input:image"))) {
+			// is this a child element of the submit el?  (ex: a span within a button)
+			var t = $el.closest(':submit');
+			if (t.length == 0) {
+				return;
+			}
+			target = t[0];
+		}
+		var form = this;
+		form.clk = target;
+		if (target.type == 'image') {
+			if (e.offsetX != undefined) {
+				form.clk_x = e.offsetX;
+				form.clk_y = e.offsetY;
+			} else if (typeof $.fn.offset == 'function') { // try to use dimensions plugin
+				var offset = $el.offset();
+				form.clk_x = e.pageX - offset.left;
+				form.clk_y = e.pageY - offset.top;
+			} else {
+				form.clk_x = e.pageX - target.offsetLeft;
+				form.clk_y = e.pageY - target.offsetTop;
+			}
+		}
+		// clear form vars
+		setTimeout(function() { form.clk = form.clk_x = form.clk_y = null; }, 100);
+	});
+};
+
+// ajaxFormUnbind unbinds the event handlers that were bound by ajaxForm
+$.fn.ajaxFormUnbind = function() {
+	return this.unbind('submit.form-plugin click.form-plugin');
+};
+
+/**
+ * formToArray() gathers form element data into an array of objects that can
+ * be passed to any of the following ajax functions: $.get, $.post, or load.
+ * Each object in the array has both a 'name' and 'value' property.  An example of
+ * an array for a simple login form might be:
+ *
+ * [ { name: 'username', value: 'jresig' }, { name: 'password', value: 'secret' } ]
+ *
+ * It is this array that is passed to pre-submit callback functions provided to the
+ * ajaxSubmit() and ajaxForm() methods.
+ */
+$.fn.formToArray = function(semantic) {
+	var a = [];
+	if (this.length === 0) {
+		return a;
+	}
+
+	var form = this[0];
+	var els = semantic ? form.getElementsByTagName('*') : form.elements;
+	if (!els) {
+		return a;
+	}
+
+	var i,j,n,v,el,max,jmax;
+	for(i=0, max=els.length; i < max; i++) {
+		el = els[i];
+		n = el.name;
+		if (!n) {
+			continue;
+		}
+
+		if (semantic && form.clk && el.type == "image") {
+			// handle image inputs on the fly when semantic == true
+			if(!el.disabled && form.clk == el) {
+				a.push({name: n, value: $(el).val()});
+				a.push({name: n+'.x', value: form.clk_x}, {name: n+'.y', value: form.clk_y});
+			}
+			continue;
+		}
+
+		v = $.fieldValue(el, true);
+		if (v && v.constructor == Array) {
+			for(j=0, jmax=v.length; j < jmax; j++) {
+				a.push({name: n, value: v[j]});
+			}
+		}
+		else if (v !== null && typeof v != 'undefined') {
+			a.push({name: n, value: v});
+		}
+	}
+
+	if (!semantic && form.clk) {
+		// input type=='image' are not found in elements array! handle it here
+		var $input = $(form.clk), input = $input[0];
+		n = input.name;
+		if (n && !input.disabled && input.type == 'image') {
+			a.push({name: n, value: $input.val()});
+			a.push({name: n+'.x', value: form.clk_x}, {name: n+'.y', value: form.clk_y});
+		}
+	}
+	return a;
+};
+
+/**
+ * Serializes form data into a 'submittable' string. This method will return a string
+ * in the format: name1=value1&amp;name2=value2
+ */
+$.fn.formSerialize = function(semantic) {
+	//hand off to jQuery.param for proper encoding
+	return $.param(this.formToArray(semantic));
+};
+
+/**
+ * Serializes all field elements in the jQuery object into a query string.
+ * This method will return a string in the format: name1=value1&amp;name2=value2
+ */
+$.fn.fieldSerialize = function(successful) {
+	var a = [];
+	this.each(function() {
+		var n = this.name;
+		if (!n) {
+			return;
+		}
+		var v = $.fieldValue(this, successful);
+		if (v && v.constructor == Array) {
+			for (var i=0,max=v.length; i < max; i++) {
+				a.push({name: n, value: v[i]});
+			}
+		}
+		else if (v !== null && typeof v != 'undefined') {
+			a.push({name: this.name, value: v});
+		}
+	});
+	//hand off to jQuery.param for proper encoding
+	return $.param(a);
+};
+
+/**
+ * Returns the value(s) of the element in the matched set.  For example, consider the following form:
+ *
+ *  <form><fieldset>
+ *	  <input name="A" type="text" />
+ *	  <input name="A" type="text" />
+ *	  <input name="B" type="checkbox" value="B1" />
+ *	  <input name="B" type="checkbox" value="B2"/>
+ *	  <input name="C" type="radio" value="C1" />
+ *	  <input name="C" type="radio" value="C2" />
+ *  </fieldset></form>
+ *
+ *  var v = $(':text').fieldValue();
+ *  // if no values are entered into the text inputs
+ *  v == ['','']
+ *  // if values entered into the text inputs are 'foo' and 'bar'
+ *  v == ['foo','bar']
+ *
+ *  var v = $(':checkbox').fieldValue();
+ *  // if neither checkbox is checked
+ *  v === undefined
+ *  // if both checkboxes are checked
+ *  v == ['B1', 'B2']
+ *
+ *  var v = $(':radio').fieldValue();
+ *  // if neither radio is checked
+ *  v === undefined
+ *  // if first radio is checked
+ *  v == ['C1']
+ *
+ * The successful argument controls whether or not the field element must be 'successful'
+ * (per http://www.w3.org/TR/html4/interact/forms.html#successful-controls).
+ * The default value of the successful argument is true.  If this value is false the value(s)
+ * for each element is returned.
+ *
+ * Note: This method *always* returns an array.  If no valid value can be determined the
+ *	   array will be empty, otherwise it will contain one or more values.
+ */
+$.fn.fieldValue = function(successful) {
+	for (var val=[], i=0, max=this.length; i < max; i++) {
+		var el = this[i];
+		var v = $.fieldValue(el, successful);
+		if (v === null || typeof v == 'undefined' || (v.constructor == Array && !v.length)) {
+			continue;
+		}
+		v.constructor == Array ? $.merge(val, v) : val.push(v);
+	}
+	return val;
+};
+
+/**
+ * Returns the value of the field element.
+ */
+$.fieldValue = function(el, successful) {
+	var n = el.name, t = el.type, tag = el.tagName.toLowerCase();
+	if (successful === undefined) {
+		successful = true;
+	}
+
+	if (successful && (!n || el.disabled || t == 'reset' || t == 'button' ||
+		(t == 'checkbox' || t == 'radio') && !el.checked ||
+		(t == 'submit' || t == 'image') && el.form && el.form.clk != el ||
+		tag == 'select' && el.selectedIndex == -1)) {
+			return null;
+	}
+
+	if (tag == 'select') {
+		var index = el.selectedIndex;
+		if (index < 0) {
+			return null;
+		}
+		var a = [], ops = el.options;
+		var one = (t == 'select-one');
+		var max = (one ? index+1 : ops.length);
+		for(var i=(one ? index : 0); i < max; i++) {
+			var op = ops[i];
+			if (op.selected) {
+				var v = op.value;
+				if (!v) { // extra pain for IE...
+					v = (op.attributes && op.attributes['value'] && !(op.attributes['value'].specified)) ? op.text : op.value;
+				}
+				if (one) {
+					return v;
+				}
+				a.push(v);
+			}
+		}
+		return a;
+	}
+	return $(el).val();
+};
+
+/**
+ * Clears the form data.  Takes the following actions on the form's input fields:
+ *  - input text fields will have their 'value' property set to the empty string
+ *  - select elements will have their 'selectedIndex' property set to -1
+ *  - checkbox and radio inputs will have their 'checked' property set to false
+ *  - inputs of type submit, button, reset, and hidden will *not* be effected
+ *  - button elements will *not* be effected
+ */
+$.fn.clearForm = function() {
+	return this.each(function() {
+		$('input,select,textarea', this).clearFields();
+	});
+};
+
+/**
+ * Clears the selected form elements.
+ */
+$.fn.clearFields = $.fn.clearInputs = function() {
+	var re = /^(?:color|date|datetime|email|month|number|password|range|search|tel|text|time|url|week)$/i; // 'hidden' is not in this list
+	return this.each(function() {
+		var t = this.type, tag = this.tagName.toLowerCase();
+		if (re.test(t) || tag == 'textarea') {
+			this.value = '';
+		}
+		else if (t == 'checkbox' || t == 'radio') {
+			this.checked = false;
+		}
+		else if (tag == 'select') {
+			this.selectedIndex = -1;
+		}
+	});
+};
+
+/**
+ * Resets the form data.  Causes all form elements to be reset to their original value.
+ */
+$.fn.resetForm = function() {
+	return this.each(function() {
+		// guard against an input with the name of 'reset'
+		// note that IE reports the reset function as an 'object'
+		if (typeof this.reset == 'function' || (typeof this.reset == 'object' && !this.reset.nodeType)) {
+			this.reset();
+		}
+	});
+};
+
+/**
+ * Enables or disables any matching elements.
+ */
+$.fn.enable = function(b) {
+	if (b === undefined) {
+		b = true;
+	}
+	return this.each(function() {
+		this.disabled = !b;
+	});
+};
+
+/**
+ * Checks/unchecks any matching checkboxes or radio buttons and
+ * selects/deselects and matching option elements.
+ */
+$.fn.selected = function(select) {
+	if (select === undefined) {
+		select = true;
+	}
+	return this.each(function() {
+		var t = this.type;
+		if (t == 'checkbox' || t == 'radio') {
+			this.checked = select;
+		}
+		else if (this.tagName.toLowerCase() == 'option') {
+			var $sel = $(this).parent('select');
+			if (select && $sel[0] && $sel[0].type == 'select-one') {
+				// deselect all other options
+				$sel.find('option').selected(false);
+			}
+			this.selected = select;
+		}
+	});
+};
+
+// helper fn for console logging
+function log() {
+	var msg = '[jquery.form] ' + Array.prototype.join.call(arguments,'');
+	if (window.console && window.console.log) {
+		window.console.log(msg);
+	}
+	else if (window.opera && window.opera.postError) {
+		window.opera.postError(msg);
+	}
+};
+
+})(jQuery);
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/jquery/jquery.min.js b/pluss-manage-page/src/main/resources/static/resources/js/third-party/jquery/jquery.min.js
new file mode 100644
index 0000000..29b3a2c
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/third-party/jquery/jquery.min.js
@@ -0,0 +1,6 @@
+/*! jQuery v1.10.2 | (c) 2005, 2013 jQuery Foundation, Inc. | jquery.org/license
+//@ sourceMappingURL=jquery.min.map
+*/
+(function(e,t){var n,r,i=typeof t,o=e.location,a=e.document,s=a.documentElement,l=e.jQuery,u=e.$,c={},p=[],f="1.10.2",d=p.concat,h=p.push,g=p.slice,m=p.indexOf,y=c.toString,v=c.hasOwnProperty,b=f.trim,x=function(e,t){return new x.fn.init(e,t,r)},w=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,T=/\S+/g,C=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,N=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,k=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,E=/^[\],:{}\s]*$/,S=/(?:^|:|,)(?:\s*\[)+/g,A=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,j=/"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g,D=/^-ms-/,L=/-([\da-z])/gi,H=function(e,t){return t.toUpperCase()},q=function(e){(a.addEventListener||"load"===e.type||"complete"===a.readyState)&&(_(),x.ready())},_=function(){a.addEventListener?(a.removeEventListener("DOMContentLoaded",q,!1),e.removeEventListener("load",q,!1)):(a.detachEvent("onreadystatechange",q),e.detachEvent("onload",q))};x.fn=x.prototype={jquery:f,constructor:x,init:function(e,n,r){var i,o;if(!e)return this;if("string"==typeof e){if(i="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:N.exec(e),!i||!i[1]&&n)return!n||n.jquery?(n||r).find(e):this.constructor(n).find(e);if(i[1]){if(n=n instanceof x?n[0]:n,x.merge(this,x.parseHTML(i[1],n&&n.nodeType?n.ownerDocument||n:a,!0)),k.test(i[1])&&x.isPlainObject(n))for(i in n)x.isFunction(this[i])?this[i](n[i]):this.attr(i,n[i]);return this}if(o=a.getElementById(i[2]),o&&o.parentNode){if(o.id!==i[2])return r.find(e);this.length=1,this[0]=o}return this.context=a,this.selector=e,this}return e.nodeType?(this.context=this[0]=e,this.length=1,this):x.isFunction(e)?r.ready(e):(e.selector!==t&&(this.selector=e.selector,this.context=e.context),x.makeArray(e,this))},selector:"",length:0,toArray:function(){return g.call(this)},get:function(e){return null==e?this.toArray():0>e?this[this.length+e]:this[e]},pushStack:function(e){var t=x.merge(this.constructor(),e);return t.prevObject=this,t.context=this.context,t},each:function(e,t){return x.each(this,e,t)},ready:function(e){return x.ready.promise().done(e),this},slice:function(){return this.pushStack(g.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(0>e?t:0);return this.pushStack(n>=0&&t>n?[this[n]]:[])},map:function(e){return this.pushStack(x.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject||this.constructor(null)},push:h,sort:[].sort,splice:[].splice},x.fn.init.prototype=x.fn,x.extend=x.fn.extend=function(){var e,n,r,i,o,a,s=arguments[0]||{},l=1,u=arguments.length,c=!1;for("boolean"==typeof s&&(c=s,s=arguments[1]||{},l=2),"object"==typeof s||x.isFunction(s)||(s={}),u===l&&(s=this,--l);u>l;l++)if(null!=(o=arguments[l]))for(i in o)e=s[i],r=o[i],s!==r&&(c&&r&&(x.isPlainObject(r)||(n=x.isArray(r)))?(n?(n=!1,a=e&&x.isArray(e)?e:[]):a=e&&x.isPlainObject(e)?e:{},s[i]=x.extend(c,a,r)):r!==t&&(s[i]=r));return s},x.extend({expando:"jQuery"+(f+Math.random()).replace(/\D/g,""),noConflict:function(t){return e.$===x&&(e.$=u),t&&e.jQuery===x&&(e.jQuery=l),x},isReady:!1,readyWait:1,holdReady:function(e){e?x.readyWait++:x.ready(!0)},ready:function(e){if(e===!0?!--x.readyWait:!x.isReady){if(!a.body)return setTimeout(x.ready);x.isReady=!0,e!==!0&&--x.readyWait>0||(n.resolveWith(a,[x]),x.fn.trigger&&x(a).trigger("ready").off("ready"))}},isFunction:function(e){return"function"===x.type(e)},isArray:Array.isArray||function(e){return"array"===x.type(e)},isWindow:function(e){return null!=e&&e==e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?c[y.call(e)]||"object":typeof e},isPlainObject:function(e){var n;if(!e||"object"!==x.type(e)||e.nodeType||x.isWindow(e))return!1;try{if(e.constructor&&!v.call(e,"constructor")&&!v.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(r){return!1}if(x.support.ownLast)for(n in e)return v.call(e,n);for(n in e);return n===t||v.call(e,n)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},error:function(e){throw Error(e)},parseHTML:function(e,t,n){if(!e||"string"!=typeof e)return null;"boolean"==typeof t&&(n=t,t=!1),t=t||a;var r=k.exec(e),i=!n&&[];return r?[t.createElement(r[1])]:(r=x.buildFragment([e],t,i),i&&x(i).remove(),x.merge([],r.childNodes))},parseJSON:function(n){return e.JSON&&e.JSON.parse?e.JSON.parse(n):null===n?n:"string"==typeof n&&(n=x.trim(n),n&&E.test(n.replace(A,"@").replace(j,"]").replace(S,"")))?Function("return "+n)():(x.error("Invalid JSON: "+n),t)},parseXML:function(n){var r,i;if(!n||"string"!=typeof n)return null;try{e.DOMParser?(i=new DOMParser,r=i.parseFromString(n,"text/xml")):(r=new ActiveXObject("Microsoft.XMLDOM"),r.async="false",r.loadXML(n))}catch(o){r=t}return r&&r.documentElement&&!r.getElementsByTagName("parsererror").length||x.error("Invalid XML: "+n),r},noop:function(){},globalEval:function(t){t&&x.trim(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(D,"ms-").replace(L,H)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t,n){var r,i=0,o=e.length,a=M(e);if(n){if(a){for(;o>i;i++)if(r=t.apply(e[i],n),r===!1)break}else for(i in e)if(r=t.apply(e[i],n),r===!1)break}else if(a){for(;o>i;i++)if(r=t.call(e[i],i,e[i]),r===!1)break}else for(i in e)if(r=t.call(e[i],i,e[i]),r===!1)break;return e},trim:b&&!b.call("\ufeff\u00a0")?function(e){return null==e?"":b.call(e)}:function(e){return null==e?"":(e+"").replace(C,"")},makeArray:function(e,t){var n=t||[];return null!=e&&(M(Object(e))?x.merge(n,"string"==typeof e?[e]:e):h.call(n,e)),n},inArray:function(e,t,n){var r;if(t){if(m)return m.call(t,e,n);for(r=t.length,n=n?0>n?Math.max(0,r+n):n:0;r>n;n++)if(n in t&&t[n]===e)return n}return-1},merge:function(e,n){var r=n.length,i=e.length,o=0;if("number"==typeof r)for(;r>o;o++)e[i++]=n[o];else while(n[o]!==t)e[i++]=n[o++];return e.length=i,e},grep:function(e,t,n){var r,i=[],o=0,a=e.length;for(n=!!n;a>o;o++)r=!!t(e[o],o),n!==r&&i.push(e[o]);return i},map:function(e,t,n){var r,i=0,o=e.length,a=M(e),s=[];if(a)for(;o>i;i++)r=t(e[i],i,n),null!=r&&(s[s.length]=r);else for(i in e)r=t(e[i],i,n),null!=r&&(s[s.length]=r);return d.apply([],s)},guid:1,proxy:function(e,n){var r,i,o;return"string"==typeof n&&(o=e[n],n=e,e=o),x.isFunction(e)?(r=g.call(arguments,2),i=function(){return e.apply(n||this,r.concat(g.call(arguments)))},i.guid=e.guid=e.guid||x.guid++,i):t},access:function(e,n,r,i,o,a,s){var l=0,u=e.length,c=null==r;if("object"===x.type(r)){o=!0;for(l in r)x.access(e,n,l,r[l],!0,a,s)}else if(i!==t&&(o=!0,x.isFunction(i)||(s=!0),c&&(s?(n.call(e,i),n=null):(c=n,n=function(e,t,n){return c.call(x(e),n)})),n))for(;u>l;l++)n(e[l],r,s?i:i.call(e[l],l,n(e[l],r)));return o?e:c?n.call(e):u?n(e[0],r):a},now:function(){return(new Date).getTime()},swap:function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];i=n.apply(e,r||[]);for(o in t)e.style[o]=a[o];return i}}),x.ready.promise=function(t){if(!n)if(n=x.Deferred(),"complete"===a.readyState)setTimeout(x.ready);else if(a.addEventListener)a.addEventListener("DOMContentLoaded",q,!1),e.addEventListener("load",q,!1);else{a.attachEvent("onreadystatechange",q),e.attachEvent("onload",q);var r=!1;try{r=null==e.frameElement&&a.documentElement}catch(i){}r&&r.doScroll&&function o(){if(!x.isReady){try{r.doScroll("left")}catch(e){return setTimeout(o,50)}_(),x.ready()}}()}return n.promise(t)},x.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(e,t){c["[object "+t+"]"]=t.toLowerCase()});function M(e){var t=e.length,n=x.type(e);return x.isWindow(e)?!1:1===e.nodeType&&t?!0:"array"===n||"function"!==n&&(0===t||"number"==typeof t&&t>0&&t-1 in e)}r=x(a),function(e,t){var n,r,i,o,a,s,l,u,c,p,f,d,h,g,m,y,v,b="sizzle"+-new Date,w=e.document,T=0,C=0,N=st(),k=st(),E=st(),S=!1,A=function(e,t){return e===t?(S=!0,0):0},j=typeof t,D=1<<31,L={}.hasOwnProperty,H=[],q=H.pop,_=H.push,M=H.push,O=H.slice,F=H.indexOf||function(e){var t=0,n=this.length;for(;n>t;t++)if(this[t]===e)return t;return-1},B="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",P="[\\x20\\t\\r\\n\\f]",R="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",W=R.replace("w","w#"),$="\\["+P+"*("+R+")"+P+"*(?:([*^$|!~]?=)"+P+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+W+")|)|)"+P+"*\\]",I=":("+R+")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+$.replace(3,8)+")*)|.*)\\)|)",z=RegExp("^"+P+"+|((?:^|[^\\\\])(?:\\\\.)*)"+P+"+$","g"),X=RegExp("^"+P+"*,"+P+"*"),U=RegExp("^"+P+"*([>+~]|"+P+")"+P+"*"),V=RegExp(P+"*[+~]"),Y=RegExp("="+P+"*([^\\]'\"]*)"+P+"*\\]","g"),J=RegExp(I),G=RegExp("^"+W+"$"),Q={ID:RegExp("^#("+R+")"),CLASS:RegExp("^\\.("+R+")"),TAG:RegExp("^("+R.replace("w","w*")+")"),ATTR:RegExp("^"+$),PSEUDO:RegExp("^"+I),CHILD:RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+P+"*(even|odd|(([+-]|)(\\d*)n|)"+P+"*(?:([+-]|)"+P+"*(\\d+)|))"+P+"*\\)|)","i"),bool:RegExp("^(?:"+B+")$","i"),needsContext:RegExp("^"+P+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+P+"*((?:-\\d)?\\d*)"+P+"*\\)|)(?=[^-]|$)","i")},K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,et=/^(?:input|select|textarea|button)$/i,tt=/^h\d$/i,nt=/'|\\/g,rt=RegExp("\\\\([\\da-f]{1,6}"+P+"?|("+P+")|.)","ig"),it=function(e,t,n){var r="0x"+t-65536;return r!==r||n?t:0>r?String.fromCharCode(r+65536):String.fromCharCode(55296|r>>10,56320|1023&r)};try{M.apply(H=O.call(w.childNodes),w.childNodes),H[w.childNodes.length].nodeType}catch(ot){M={apply:H.length?function(e,t){_.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function at(e,t,n,i){var o,a,s,l,u,c,d,m,y,x;if((t?t.ownerDocument||t:w)!==f&&p(t),t=t||f,n=n||[],!e||"string"!=typeof e)return n;if(1!==(l=t.nodeType)&&9!==l)return[];if(h&&!i){if(o=Z.exec(e))if(s=o[1]){if(9===l){if(a=t.getElementById(s),!a||!a.parentNode)return n;if(a.id===s)return n.push(a),n}else if(t.ownerDocument&&(a=t.ownerDocument.getElementById(s))&&v(t,a)&&a.id===s)return n.push(a),n}else{if(o[2])return M.apply(n,t.getElementsByTagName(e)),n;if((s=o[3])&&r.getElementsByClassName&&t.getElementsByClassName)return M.apply(n,t.getElementsByClassName(s)),n}if(r.qsa&&(!g||!g.test(e))){if(m=d=b,y=t,x=9===l&&e,1===l&&"object"!==t.nodeName.toLowerCase()){c=mt(e),(d=t.getAttribute("id"))?m=d.replace(nt,"\\$&"):t.setAttribute("id",m),m="[id='"+m+"'] ",u=c.length;while(u--)c[u]=m+yt(c[u]);y=V.test(e)&&t.parentNode||t,x=c.join(",")}if(x)try{return M.apply(n,y.querySelectorAll(x)),n}catch(T){}finally{d||t.removeAttribute("id")}}}return kt(e.replace(z,"$1"),t,n,i)}function st(){var e=[];function t(n,r){return e.push(n+=" ")>o.cacheLength&&delete t[e.shift()],t[n]=r}return t}function lt(e){return e[b]=!0,e}function ut(e){var t=f.createElement("div");try{return!!e(t)}catch(n){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function ct(e,t){var n=e.split("|"),r=e.length;while(r--)o.attrHandle[n[r]]=t}function pt(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&(~t.sourceIndex||D)-(~e.sourceIndex||D);if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function ft(e){return function(t){var n=t.nodeName.toLowerCase();return"input"===n&&t.type===e}}function dt(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function ht(e){return lt(function(t){return t=+t,lt(function(n,r){var i,o=e([],n.length,t),a=o.length;while(a--)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}s=at.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?"HTML"!==t.nodeName:!1},r=at.support={},p=at.setDocument=function(e){var n=e?e.ownerDocument||e:w,i=n.defaultView;return n!==f&&9===n.nodeType&&n.documentElement?(f=n,d=n.documentElement,h=!s(n),i&&i.attachEvent&&i!==i.top&&i.attachEvent("onbeforeunload",function(){p()}),r.attributes=ut(function(e){return e.className="i",!e.getAttribute("className")}),r.getElementsByTagName=ut(function(e){return e.appendChild(n.createComment("")),!e.getElementsByTagName("*").length}),r.getElementsByClassName=ut(function(e){return e.innerHTML="<div class='a'></div><div class='a i'></div>",e.firstChild.className="i",2===e.getElementsByClassName("i").length}),r.getById=ut(function(e){return d.appendChild(e).id=b,!n.getElementsByName||!n.getElementsByName(b).length}),r.getById?(o.find.ID=function(e,t){if(typeof t.getElementById!==j&&h){var n=t.getElementById(e);return n&&n.parentNode?[n]:[]}},o.filter.ID=function(e){var t=e.replace(rt,it);return function(e){return e.getAttribute("id")===t}}):(delete o.find.ID,o.filter.ID=function(e){var t=e.replace(rt,it);return function(e){var n=typeof e.getAttributeNode!==j&&e.getAttributeNode("id");return n&&n.value===t}}),o.find.TAG=r.getElementsByTagName?function(e,n){return typeof n.getElementsByTagName!==j?n.getElementsByTagName(e):t}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},o.find.CLASS=r.getElementsByClassName&&function(e,n){return typeof n.getElementsByClassName!==j&&h?n.getElementsByClassName(e):t},m=[],g=[],(r.qsa=K.test(n.querySelectorAll))&&(ut(function(e){e.innerHTML="<select><option selected=''></option></select>",e.querySelectorAll("[selected]").length||g.push("\\["+P+"*(?:value|"+B+")"),e.querySelectorAll(":checked").length||g.push(":checked")}),ut(function(e){var t=n.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("t",""),e.querySelectorAll("[t^='']").length&&g.push("[*^$]="+P+"*(?:''|\"\")"),e.querySelectorAll(":enabled").length||g.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),g.push(",.*:")})),(r.matchesSelector=K.test(y=d.webkitMatchesSelector||d.mozMatchesSelector||d.oMatchesSelector||d.msMatchesSelector))&&ut(function(e){r.disconnectedMatch=y.call(e,"div"),y.call(e,"[s!='']:x"),m.push("!=",I)}),g=g.length&&RegExp(g.join("|")),m=m.length&&RegExp(m.join("|")),v=K.test(d.contains)||d.compareDocumentPosition?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},A=d.compareDocumentPosition?function(e,t){if(e===t)return S=!0,0;var i=t.compareDocumentPosition&&e.compareDocumentPosition&&e.compareDocumentPosition(t);return i?1&i||!r.sortDetached&&t.compareDocumentPosition(e)===i?e===n||v(w,e)?-1:t===n||v(w,t)?1:c?F.call(c,e)-F.call(c,t):0:4&i?-1:1:e.compareDocumentPosition?-1:1}:function(e,t){var r,i=0,o=e.parentNode,a=t.parentNode,s=[e],l=[t];if(e===t)return S=!0,0;if(!o||!a)return e===n?-1:t===n?1:o?-1:a?1:c?F.call(c,e)-F.call(c,t):0;if(o===a)return pt(e,t);r=e;while(r=r.parentNode)s.unshift(r);r=t;while(r=r.parentNode)l.unshift(r);while(s[i]===l[i])i++;return i?pt(s[i],l[i]):s[i]===w?-1:l[i]===w?1:0},n):f},at.matches=function(e,t){return at(e,null,null,t)},at.matchesSelector=function(e,t){if((e.ownerDocument||e)!==f&&p(e),t=t.replace(Y,"='$1']"),!(!r.matchesSelector||!h||m&&m.test(t)||g&&g.test(t)))try{var n=y.call(e,t);if(n||r.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(i){}return at(t,f,null,[e]).length>0},at.contains=function(e,t){return(e.ownerDocument||e)!==f&&p(e),v(e,t)},at.attr=function(e,n){(e.ownerDocument||e)!==f&&p(e);var i=o.attrHandle[n.toLowerCase()],a=i&&L.call(o.attrHandle,n.toLowerCase())?i(e,n,!h):t;return a===t?r.attributes||!h?e.getAttribute(n):(a=e.getAttributeNode(n))&&a.specified?a.value:null:a},at.error=function(e){throw Error("Syntax error, unrecognized expression: "+e)},at.uniqueSort=function(e){var t,n=[],i=0,o=0;if(S=!r.detectDuplicates,c=!r.sortStable&&e.slice(0),e.sort(A),S){while(t=e[o++])t===e[o]&&(i=n.push(o));while(i--)e.splice(n[i],1)}return e},a=at.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=a(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r];r++)n+=a(t);return n},o=at.selectors={cacheLength:50,createPseudo:lt,match:Q,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(rt,it),e[3]=(e[4]||e[5]||"").replace(rt,it),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||at.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&at.error(e[0]),e},PSEUDO:function(e){var n,r=!e[5]&&e[2];return Q.CHILD.test(e[0])?null:(e[3]&&e[4]!==t?e[2]=e[4]:r&&J.test(r)&&(n=mt(r,!0))&&(n=r.indexOf(")",r.length-n)-r.length)&&(e[0]=e[0].slice(0,n),e[2]=r.slice(0,n)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(rt,it).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=N[e+" "];return t||(t=RegExp("(^|"+P+")"+e+"("+P+"|$)"))&&N(e,function(e){return t.test("string"==typeof e.className&&e.className||typeof e.getAttribute!==j&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=at.attr(r,e);return null==i?"!="===t:t?(i+="","="===t?i===n:"!="===t?i!==n:"^="===t?n&&0===i.indexOf(n):"*="===t?n&&i.indexOf(n)>-1:"$="===t?n&&i.slice(-n.length)===n:"~="===t?(" "+i+" ").indexOf(n)>-1:"|="===t?i===n||i.slice(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,l){var u,c,p,f,d,h,g=o!==a?"nextSibling":"previousSibling",m=t.parentNode,y=s&&t.nodeName.toLowerCase(),v=!l&&!s;if(m){if(o){while(g){p=t;while(p=p[g])if(s?p.nodeName.toLowerCase()===y:1===p.nodeType)return!1;h=g="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?m.firstChild:m.lastChild],a&&v){c=m[b]||(m[b]={}),u=c[e]||[],d=u[0]===T&&u[1],f=u[0]===T&&u[2],p=d&&m.childNodes[d];while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if(1===p.nodeType&&++f&&p===t){c[e]=[T,d,f];break}}else if(v&&(u=(t[b]||(t[b]={}))[e])&&u[0]===T)f=u[1];else while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if((s?p.nodeName.toLowerCase()===y:1===p.nodeType)&&++f&&(v&&((p[b]||(p[b]={}))[e]=[T,f]),p===t))break;return f-=i,f===r||0===f%r&&f/r>=0}}},PSEUDO:function(e,t){var n,r=o.pseudos[e]||o.setFilters[e.toLowerCase()]||at.error("unsupported pseudo: "+e);return r[b]?r(t):r.length>1?(n=[e,e,"",t],o.setFilters.hasOwnProperty(e.toLowerCase())?lt(function(e,n){var i,o=r(e,t),a=o.length;while(a--)i=F.call(e,o[a]),e[i]=!(n[i]=o[a])}):function(e){return r(e,0,n)}):r}},pseudos:{not:lt(function(e){var t=[],n=[],r=l(e.replace(z,"$1"));return r[b]?lt(function(e,t,n,i){var o,a=r(e,null,i,[]),s=e.length;while(s--)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,i,o){return t[0]=e,r(t,null,o,n),!n.pop()}}),has:lt(function(e){return function(t){return at(e,t).length>0}}),contains:lt(function(e){return function(t){return(t.textContent||t.innerText||a(t)).indexOf(e)>-1}}),lang:lt(function(e){return G.test(e||"")||at.error("unsupported lang: "+e),e=e.replace(rt,it).toLowerCase(),function(t){var n;do if(n=h?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang"))return n=n.toLowerCase(),n===e||0===n.indexOf(e+"-");while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===d},focus:function(e){return e===f.activeElement&&(!f.hasFocus||f.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeName>"@"||3===e.nodeType||4===e.nodeType)return!1;return!0},parent:function(e){return!o.pseudos.empty(e)},header:function(e){return tt.test(e.nodeName)},input:function(e){return et.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||t.toLowerCase()===e.type)},first:ht(function(){return[0]}),last:ht(function(e,t){return[t-1]}),eq:ht(function(e,t,n){return[0>n?n+t:n]}),even:ht(function(e,t){var n=0;for(;t>n;n+=2)e.push(n);return e}),odd:ht(function(e,t){var n=1;for(;t>n;n+=2)e.push(n);return e}),lt:ht(function(e,t,n){var r=0>n?n+t:n;for(;--r>=0;)e.push(r);return e}),gt:ht(function(e,t,n){var r=0>n?n+t:n;for(;t>++r;)e.push(r);return e})}},o.pseudos.nth=o.pseudos.eq;for(n in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})o.pseudos[n]=ft(n);for(n in{submit:!0,reset:!0})o.pseudos[n]=dt(n);function gt(){}gt.prototype=o.filters=o.pseudos,o.setFilters=new gt;function mt(e,t){var n,r,i,a,s,l,u,c=k[e+" "];if(c)return t?0:c.slice(0);s=e,l=[],u=o.preFilter;while(s){(!n||(r=X.exec(s)))&&(r&&(s=s.slice(r[0].length)||s),l.push(i=[])),n=!1,(r=U.exec(s))&&(n=r.shift(),i.push({value:n,type:r[0].replace(z," ")}),s=s.slice(n.length));for(a in o.filter)!(r=Q[a].exec(s))||u[a]&&!(r=u[a](r))||(n=r.shift(),i.push({value:n,type:a,matches:r}),s=s.slice(n.length));if(!n)break}return t?s.length:s?at.error(e):k(e,l).slice(0)}function yt(e){var t=0,n=e.length,r="";for(;n>t;t++)r+=e[t].value;return r}function vt(e,t,n){var r=t.dir,o=n&&"parentNode"===r,a=C++;return t.first?function(t,n,i){while(t=t[r])if(1===t.nodeType||o)return e(t,n,i)}:function(t,n,s){var l,u,c,p=T+" "+a;if(s){while(t=t[r])if((1===t.nodeType||o)&&e(t,n,s))return!0}else while(t=t[r])if(1===t.nodeType||o)if(c=t[b]||(t[b]={}),(u=c[r])&&u[0]===p){if((l=u[1])===!0||l===i)return l===!0}else if(u=c[r]=[p],u[1]=e(t,n,s)||i,u[1]===!0)return!0}}function bt(e){return e.length>1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function xt(e,t,n,r,i){var o,a=[],s=0,l=e.length,u=null!=t;for(;l>s;s++)(o=e[s])&&(!n||n(o,r,i))&&(a.push(o),u&&t.push(s));return a}function wt(e,t,n,r,i,o){return r&&!r[b]&&(r=wt(r)),i&&!i[b]&&(i=wt(i,o)),lt(function(o,a,s,l){var u,c,p,f=[],d=[],h=a.length,g=o||Nt(t||"*",s.nodeType?[s]:s,[]),m=!e||!o&&t?g:xt(g,f,e,s,l),y=n?i||(o?e:h||r)?[]:a:m;if(n&&n(m,y,s,l),r){u=xt(y,d),r(u,[],s,l),c=u.length;while(c--)(p=u[c])&&(y[d[c]]=!(m[d[c]]=p))}if(o){if(i||e){if(i){u=[],c=y.length;while(c--)(p=y[c])&&u.push(m[c]=p);i(null,y=[],u,l)}c=y.length;while(c--)(p=y[c])&&(u=i?F.call(o,p):f[c])>-1&&(o[u]=!(a[u]=p))}}else y=xt(y===a?y.splice(h,y.length):y),i?i(null,a,y,l):M.apply(a,y)})}function Tt(e){var t,n,r,i=e.length,a=o.relative[e[0].type],s=a||o.relative[" "],l=a?1:0,c=vt(function(e){return e===t},s,!0),p=vt(function(e){return F.call(t,e)>-1},s,!0),f=[function(e,n,r){return!a&&(r||n!==u)||((t=n).nodeType?c(e,n,r):p(e,n,r))}];for(;i>l;l++)if(n=o.relative[e[l].type])f=[vt(bt(f),n)];else{if(n=o.filter[e[l].type].apply(null,e[l].matches),n[b]){for(r=++l;i>r;r++)if(o.relative[e[r].type])break;return wt(l>1&&bt(f),l>1&&yt(e.slice(0,l-1).concat({value:" "===e[l-2].type?"*":""})).replace(z,"$1"),n,r>l&&Tt(e.slice(l,r)),i>r&&Tt(e=e.slice(r)),i>r&&yt(e))}f.push(n)}return bt(f)}function Ct(e,t){var n=0,r=t.length>0,a=e.length>0,s=function(s,l,c,p,d){var h,g,m,y=[],v=0,b="0",x=s&&[],w=null!=d,C=u,N=s||a&&o.find.TAG("*",d&&l.parentNode||l),k=T+=null==C?1:Math.random()||.1;for(w&&(u=l!==f&&l,i=n);null!=(h=N[b]);b++){if(a&&h){g=0;while(m=e[g++])if(m(h,l,c)){p.push(h);break}w&&(T=k,i=++n)}r&&((h=!m&&h)&&v--,s&&x.push(h))}if(v+=b,r&&b!==v){g=0;while(m=t[g++])m(x,y,l,c);if(s){if(v>0)while(b--)x[b]||y[b]||(y[b]=q.call(p));y=xt(y)}M.apply(p,y),w&&!s&&y.length>0&&v+t.length>1&&at.uniqueSort(p)}return w&&(T=k,u=C),x};return r?lt(s):s}l=at.compile=function(e,t){var n,r=[],i=[],o=E[e+" "];if(!o){t||(t=mt(e)),n=t.length;while(n--)o=Tt(t[n]),o[b]?r.push(o):i.push(o);o=E(e,Ct(i,r))}return o};function Nt(e,t,n){var r=0,i=t.length;for(;i>r;r++)at(e,t[r],n);return n}function kt(e,t,n,i){var a,s,u,c,p,f=mt(e);if(!i&&1===f.length){if(s=f[0]=f[0].slice(0),s.length>2&&"ID"===(u=s[0]).type&&r.getById&&9===t.nodeType&&h&&o.relative[s[1].type]){if(t=(o.find.ID(u.matches[0].replace(rt,it),t)||[])[0],!t)return n;e=e.slice(s.shift().value.length)}a=Q.needsContext.test(e)?0:s.length;while(a--){if(u=s[a],o.relative[c=u.type])break;if((p=o.find[c])&&(i=p(u.matches[0].replace(rt,it),V.test(s[0].type)&&t.parentNode||t))){if(s.splice(a,1),e=i.length&&yt(s),!e)return M.apply(n,i),n;break}}}return l(e,f)(i,t,!h,n,V.test(e)),n}r.sortStable=b.split("").sort(A).join("")===b,r.detectDuplicates=S,p(),r.sortDetached=ut(function(e){return 1&e.compareDocumentPosition(f.createElement("div"))}),ut(function(e){return e.innerHTML="<a href='#'></a>","#"===e.firstChild.getAttribute("href")})||ct("type|href|height|width",function(e,n,r){return r?t:e.getAttribute(n,"type"===n.toLowerCase()?1:2)}),r.attributes&&ut(function(e){return e.innerHTML="<input/>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||ct("value",function(e,n,r){return r||"input"!==e.nodeName.toLowerCase()?t:e.defaultValue}),ut(function(e){return null==e.getAttribute("disabled")})||ct(B,function(e,n,r){var i;return r?t:(i=e.getAttributeNode(n))&&i.specified?i.value:e[n]===!0?n.toLowerCase():null}),x.find=at,x.expr=at.selectors,x.expr[":"]=x.expr.pseudos,x.unique=at.uniqueSort,x.text=at.getText,x.isXMLDoc=at.isXML,x.contains=at.contains}(e);var O={};function F(e){var t=O[e]={};return x.each(e.match(T)||[],function(e,n){t[n]=!0}),t}x.Callbacks=function(e){e="string"==typeof e?O[e]||F(e):x.extend({},e);var n,r,i,o,a,s,l=[],u=!e.once&&[],c=function(t){for(r=e.memory&&t,i=!0,a=s||0,s=0,o=l.length,n=!0;l&&o>a;a++)if(l[a].apply(t[0],t[1])===!1&&e.stopOnFalse){r=!1;break}n=!1,l&&(u?u.length&&c(u.shift()):r?l=[]:p.disable())},p={add:function(){if(l){var t=l.length;(function i(t){x.each(t,function(t,n){var r=x.type(n);"function"===r?e.unique&&p.has(n)||l.push(n):n&&n.length&&"string"!==r&&i(n)})})(arguments),n?o=l.length:r&&(s=t,c(r))}return this},remove:function(){return l&&x.each(arguments,function(e,t){var r;while((r=x.inArray(t,l,r))>-1)l.splice(r,1),n&&(o>=r&&o--,a>=r&&a--)}),this},has:function(e){return e?x.inArray(e,l)>-1:!(!l||!l.length)},empty:function(){return l=[],o=0,this},disable:function(){return l=u=r=t,this},disabled:function(){return!l},lock:function(){return u=t,r||p.disable(),this},locked:function(){return!u},fireWith:function(e,t){return!l||i&&!u||(t=t||[],t=[e,t.slice?t.slice():t],n?u.push(t):c(t)),this},fire:function(){return p.fireWith(this,arguments),this},fired:function(){return!!i}};return p},x.extend({Deferred:function(e){var t=[["resolve","done",x.Callbacks("once memory"),"resolved"],["reject","fail",x.Callbacks("once memory"),"rejected"],["notify","progress",x.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return x.Deferred(function(n){x.each(t,function(t,o){var a=o[0],s=x.isFunction(e[t])&&e[t];i[o[1]](function(){var e=s&&s.apply(this,arguments);e&&x.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[a+"With"](this===r?n.promise():this,s?[e]:arguments)})}),e=null}).promise()},promise:function(e){return null!=e?x.extend(e,r):r}},i={};return r.pipe=r.then,x.each(t,function(e,o){var a=o[2],s=o[3];r[o[1]]=a.add,s&&a.add(function(){n=s},t[1^e][2].disable,t[2][2].lock),i[o[0]]=function(){return i[o[0]+"With"](this===i?r:this,arguments),this},i[o[0]+"With"]=a.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t=0,n=g.call(arguments),r=n.length,i=1!==r||e&&x.isFunction(e.promise)?r:0,o=1===i?e:x.Deferred(),a=function(e,t,n){return function(r){t[e]=this,n[e]=arguments.length>1?g.call(arguments):r,n===s?o.notifyWith(t,n):--i||o.resolveWith(t,n)}},s,l,u;if(r>1)for(s=Array(r),l=Array(r),u=Array(r);r>t;t++)n[t]&&x.isFunction(n[t].promise)?n[t].promise().done(a(t,u,n)).fail(o.reject).progress(a(t,l,s)):--i;return i||o.resolveWith(u,n),o.promise()}}),x.support=function(t){var n,r,o,s,l,u,c,p,f,d=a.createElement("div");if(d.setAttribute("className","t"),d.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",n=d.getElementsByTagName("*")||[],r=d.getElementsByTagName("a")[0],!r||!r.style||!n.length)return t;s=a.createElement("select"),u=s.appendChild(a.createElement("option")),o=d.getElementsByTagName("input")[0],r.style.cssText="top:1px;float:left;opacity:.5",t.getSetAttribute="t"!==d.className,t.leadingWhitespace=3===d.firstChild.nodeType,t.tbody=!d.getElementsByTagName("tbody").length,t.htmlSerialize=!!d.getElementsByTagName("link").length,t.style=/top/.test(r.getAttribute("style")),t.hrefNormalized="/a"===r.getAttribute("href"),t.opacity=/^0.5/.test(r.style.opacity),t.cssFloat=!!r.style.cssFloat,t.checkOn=!!o.value,t.optSelected=u.selected,t.enctype=!!a.createElement("form").enctype,t.html5Clone="<:nav></:nav>"!==a.createElement("nav").cloneNode(!0).outerHTML,t.inlineBlockNeedsLayout=!1,t.shrinkWrapBlocks=!1,t.pixelPosition=!1,t.deleteExpando=!0,t.noCloneEvent=!0,t.reliableMarginRight=!0,t.boxSizingReliable=!0,o.checked=!0,t.noCloneChecked=o.cloneNode(!0).checked,s.disabled=!0,t.optDisabled=!u.disabled;try{delete d.test}catch(h){t.deleteExpando=!1}o=a.createElement("input"),o.setAttribute("value",""),t.input=""===o.getAttribute("value"),o.value="t",o.setAttribute("type","radio"),t.radioValue="t"===o.value,o.setAttribute("checked","t"),o.setAttribute("name","t"),l=a.createDocumentFragment(),l.appendChild(o),t.appendChecked=o.checked,t.checkClone=l.cloneNode(!0).cloneNode(!0).lastChild.checked,d.attachEvent&&(d.attachEvent("onclick",function(){t.noCloneEvent=!1}),d.cloneNode(!0).click());for(f in{submit:!0,change:!0,focusin:!0})d.setAttribute(c="on"+f,"t"),t[f+"Bubbles"]=c in e||d.attributes[c].expando===!1;d.style.backgroundClip="content-box",d.cloneNode(!0).style.backgroundClip="",t.clearCloneStyle="content-box"===d.style.backgroundClip;for(f in x(t))break;return t.ownLast="0"!==f,x(function(){var n,r,o,s="padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;",l=a.getElementsByTagName("body")[0];l&&(n=a.createElement("div"),n.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px",l.appendChild(n).appendChild(d),d.innerHTML="<table><tr><td></td><td>t</td></tr></table>",o=d.getElementsByTagName("td"),o[0].style.cssText="padding:0;margin:0;border:0;display:none",p=0===o[0].offsetHeight,o[0].style.display="",o[1].style.display="none",t.reliableHiddenOffsets=p&&0===o[0].offsetHeight,d.innerHTML="",d.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",x.swap(l,null!=l.style.zoom?{zoom:1}:{},function(){t.boxSizing=4===d.offsetWidth}),e.getComputedStyle&&(t.pixelPosition="1%"!==(e.getComputedStyle(d,null)||{}).top,t.boxSizingReliable="4px"===(e.getComputedStyle(d,null)||{width:"4px"}).width,r=d.appendChild(a.createElement("div")),r.style.cssText=d.style.cssText=s,r.style.marginRight=r.style.width="0",d.style.width="1px",t.reliableMarginRight=!parseFloat((e.getComputedStyle(r,null)||{}).marginRight)),typeof d.style.zoom!==i&&(d.innerHTML="",d.style.cssText=s+"width:1px;padding:1px;display:inline;zoom:1",t.inlineBlockNeedsLayout=3===d.offsetWidth,d.style.display="block",d.innerHTML="<div></div>",d.firstChild.style.width="5px",t.shrinkWrapBlocks=3!==d.offsetWidth,t.inlineBlockNeedsLayout&&(l.style.zoom=1)),l.removeChild(n),n=d=o=r=null)}),n=s=l=u=r=o=null,t
+}({});var B=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,P=/([A-Z])/g;function R(e,n,r,i){if(x.acceptData(e)){var o,a,s=x.expando,l=e.nodeType,u=l?x.cache:e,c=l?e[s]:e[s]&&s;if(c&&u[c]&&(i||u[c].data)||r!==t||"string"!=typeof n)return c||(c=l?e[s]=p.pop()||x.guid++:s),u[c]||(u[c]=l?{}:{toJSON:x.noop}),("object"==typeof n||"function"==typeof n)&&(i?u[c]=x.extend(u[c],n):u[c].data=x.extend(u[c].data,n)),a=u[c],i||(a.data||(a.data={}),a=a.data),r!==t&&(a[x.camelCase(n)]=r),"string"==typeof n?(o=a[n],null==o&&(o=a[x.camelCase(n)])):o=a,o}}function W(e,t,n){if(x.acceptData(e)){var r,i,o=e.nodeType,a=o?x.cache:e,s=o?e[x.expando]:x.expando;if(a[s]){if(t&&(r=n?a[s]:a[s].data)){x.isArray(t)?t=t.concat(x.map(t,x.camelCase)):t in r?t=[t]:(t=x.camelCase(t),t=t in r?[t]:t.split(" ")),i=t.length;while(i--)delete r[t[i]];if(n?!I(r):!x.isEmptyObject(r))return}(n||(delete a[s].data,I(a[s])))&&(o?x.cleanData([e],!0):x.support.deleteExpando||a!=a.window?delete a[s]:a[s]=null)}}}x.extend({cache:{},noData:{applet:!0,embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(e){return e=e.nodeType?x.cache[e[x.expando]]:e[x.expando],!!e&&!I(e)},data:function(e,t,n){return R(e,t,n)},removeData:function(e,t){return W(e,t)},_data:function(e,t,n){return R(e,t,n,!0)},_removeData:function(e,t){return W(e,t,!0)},acceptData:function(e){if(e.nodeType&&1!==e.nodeType&&9!==e.nodeType)return!1;var t=e.nodeName&&x.noData[e.nodeName.toLowerCase()];return!t||t!==!0&&e.getAttribute("classid")===t}}),x.fn.extend({data:function(e,n){var r,i,o=null,a=0,s=this[0];if(e===t){if(this.length&&(o=x.data(s),1===s.nodeType&&!x._data(s,"parsedAttrs"))){for(r=s.attributes;r.length>a;a++)i=r[a].name,0===i.indexOf("data-")&&(i=x.camelCase(i.slice(5)),$(s,i,o[i]));x._data(s,"parsedAttrs",!0)}return o}return"object"==typeof e?this.each(function(){x.data(this,e)}):arguments.length>1?this.each(function(){x.data(this,e,n)}):s?$(s,e,x.data(s,e)):null},removeData:function(e){return this.each(function(){x.removeData(this,e)})}});function $(e,n,r){if(r===t&&1===e.nodeType){var i="data-"+n.replace(P,"-$1").toLowerCase();if(r=e.getAttribute(i),"string"==typeof r){try{r="true"===r?!0:"false"===r?!1:"null"===r?null:+r+""===r?+r:B.test(r)?x.parseJSON(r):r}catch(o){}x.data(e,n,r)}else r=t}return r}function I(e){var t;for(t in e)if(("data"!==t||!x.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}x.extend({queue:function(e,n,r){var i;return e?(n=(n||"fx")+"queue",i=x._data(e,n),r&&(!i||x.isArray(r)?i=x._data(e,n,x.makeArray(r)):i.push(r)),i||[]):t},dequeue:function(e,t){t=t||"fx";var n=x.queue(e,t),r=n.length,i=n.shift(),o=x._queueHooks(e,t),a=function(){x.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,a,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return x._data(e,n)||x._data(e,n,{empty:x.Callbacks("once memory").add(function(){x._removeData(e,t+"queue"),x._removeData(e,n)})})}}),x.fn.extend({queue:function(e,n){var r=2;return"string"!=typeof e&&(n=e,e="fx",r--),r>arguments.length?x.queue(this[0],e):n===t?this:this.each(function(){var t=x.queue(this,e,n);x._queueHooks(this,e),"fx"===e&&"inprogress"!==t[0]&&x.dequeue(this,e)})},dequeue:function(e){return this.each(function(){x.dequeue(this,e)})},delay:function(e,t){return e=x.fx?x.fx.speeds[e]||e:e,t=t||"fx",this.queue(t,function(t,n){var r=setTimeout(t,e);n.stop=function(){clearTimeout(r)}})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,n){var r,i=1,o=x.Deferred(),a=this,s=this.length,l=function(){--i||o.resolveWith(a,[a])};"string"!=typeof e&&(n=e,e=t),e=e||"fx";while(s--)r=x._data(a[s],e+"queueHooks"),r&&r.empty&&(i++,r.empty.add(l));return l(),o.promise(n)}});var z,X,U=/[\t\r\n\f]/g,V=/\r/g,Y=/^(?:input|select|textarea|button|object)$/i,J=/^(?:a|area)$/i,G=/^(?:checked|selected)$/i,Q=x.support.getSetAttribute,K=x.support.input;x.fn.extend({attr:function(e,t){return x.access(this,x.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){x.removeAttr(this,e)})},prop:function(e,t){return x.access(this,x.prop,e,t,arguments.length>1)},removeProp:function(e){return e=x.propFix[e]||e,this.each(function(){try{this[e]=t,delete this[e]}catch(n){}})},addClass:function(e){var t,n,r,i,o,a=0,s=this.length,l="string"==typeof e&&e;if(x.isFunction(e))return this.each(function(t){x(this).addClass(e.call(this,t,this.className))});if(l)for(t=(e||"").match(T)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(U," "):" ")){o=0;while(i=t[o++])0>r.indexOf(" "+i+" ")&&(r+=i+" ");n.className=x.trim(r)}return this},removeClass:function(e){var t,n,r,i,o,a=0,s=this.length,l=0===arguments.length||"string"==typeof e&&e;if(x.isFunction(e))return this.each(function(t){x(this).removeClass(e.call(this,t,this.className))});if(l)for(t=(e||"").match(T)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(U," "):"")){o=0;while(i=t[o++])while(r.indexOf(" "+i+" ")>=0)r=r.replace(" "+i+" "," ");n.className=e?x.trim(r):""}return this},toggleClass:function(e,t){var n=typeof e;return"boolean"==typeof t&&"string"===n?t?this.addClass(e):this.removeClass(e):x.isFunction(e)?this.each(function(n){x(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if("string"===n){var t,r=0,o=x(this),a=e.match(T)||[];while(t=a[r++])o.hasClass(t)?o.removeClass(t):o.addClass(t)}else(n===i||"boolean"===n)&&(this.className&&x._data(this,"__className__",this.className),this.className=this.className||e===!1?"":x._data(this,"__className__")||"")})},hasClass:function(e){var t=" "+e+" ",n=0,r=this.length;for(;r>n;n++)if(1===this[n].nodeType&&(" "+this[n].className+" ").replace(U," ").indexOf(t)>=0)return!0;return!1},val:function(e){var n,r,i,o=this[0];{if(arguments.length)return i=x.isFunction(e),this.each(function(n){var o;1===this.nodeType&&(o=i?e.call(this,n,x(this).val()):e,null==o?o="":"number"==typeof o?o+="":x.isArray(o)&&(o=x.map(o,function(e){return null==e?"":e+""})),r=x.valHooks[this.type]||x.valHooks[this.nodeName.toLowerCase()],r&&"set"in r&&r.set(this,o,"value")!==t||(this.value=o))});if(o)return r=x.valHooks[o.type]||x.valHooks[o.nodeName.toLowerCase()],r&&"get"in r&&(n=r.get(o,"value"))!==t?n:(n=o.value,"string"==typeof n?n.replace(V,""):null==n?"":n)}}}),x.extend({valHooks:{option:{get:function(e){var t=x.find.attr(e,"value");return null!=t?t:e.text}},select:{get:function(e){var t,n,r=e.options,i=e.selectedIndex,o="select-one"===e.type||0>i,a=o?null:[],s=o?i+1:r.length,l=0>i?s:o?i:0;for(;s>l;l++)if(n=r[l],!(!n.selected&&l!==i||(x.support.optDisabled?n.disabled:null!==n.getAttribute("disabled"))||n.parentNode.disabled&&x.nodeName(n.parentNode,"optgroup"))){if(t=x(n).val(),o)return t;a.push(t)}return a},set:function(e,t){var n,r,i=e.options,o=x.makeArray(t),a=i.length;while(a--)r=i[a],(r.selected=x.inArray(x(r).val(),o)>=0)&&(n=!0);return n||(e.selectedIndex=-1),o}}},attr:function(e,n,r){var o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return typeof e.getAttribute===i?x.prop(e,n,r):(1===s&&x.isXMLDoc(e)||(n=n.toLowerCase(),o=x.attrHooks[n]||(x.expr.match.bool.test(n)?X:z)),r===t?o&&"get"in o&&null!==(a=o.get(e,n))?a:(a=x.find.attr(e,n),null==a?t:a):null!==r?o&&"set"in o&&(a=o.set(e,r,n))!==t?a:(e.setAttribute(n,r+""),r):(x.removeAttr(e,n),t))},removeAttr:function(e,t){var n,r,i=0,o=t&&t.match(T);if(o&&1===e.nodeType)while(n=o[i++])r=x.propFix[n]||n,x.expr.match.bool.test(n)?K&&Q||!G.test(n)?e[r]=!1:e[x.camelCase("default-"+n)]=e[r]=!1:x.attr(e,n,""),e.removeAttribute(Q?n:r)},attrHooks:{type:{set:function(e,t){if(!x.support.radioValue&&"radio"===t&&x.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},propFix:{"for":"htmlFor","class":"className"},prop:function(e,n,r){var i,o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return a=1!==s||!x.isXMLDoc(e),a&&(n=x.propFix[n]||n,o=x.propHooks[n]),r!==t?o&&"set"in o&&(i=o.set(e,r,n))!==t?i:e[n]=r:o&&"get"in o&&null!==(i=o.get(e,n))?i:e[n]},propHooks:{tabIndex:{get:function(e){var t=x.find.attr(e,"tabindex");return t?parseInt(t,10):Y.test(e.nodeName)||J.test(e.nodeName)&&e.href?0:-1}}}}),X={set:function(e,t,n){return t===!1?x.removeAttr(e,n):K&&Q||!G.test(n)?e.setAttribute(!Q&&x.propFix[n]||n,n):e[x.camelCase("default-"+n)]=e[n]=!0,n}},x.each(x.expr.match.bool.source.match(/\w+/g),function(e,n){var r=x.expr.attrHandle[n]||x.find.attr;x.expr.attrHandle[n]=K&&Q||!G.test(n)?function(e,n,i){var o=x.expr.attrHandle[n],a=i?t:(x.expr.attrHandle[n]=t)!=r(e,n,i)?n.toLowerCase():null;return x.expr.attrHandle[n]=o,a}:function(e,n,r){return r?t:e[x.camelCase("default-"+n)]?n.toLowerCase():null}}),K&&Q||(x.attrHooks.value={set:function(e,n,r){return x.nodeName(e,"input")?(e.defaultValue=n,t):z&&z.set(e,n,r)}}),Q||(z={set:function(e,n,r){var i=e.getAttributeNode(r);return i||e.setAttributeNode(i=e.ownerDocument.createAttribute(r)),i.value=n+="","value"===r||n===e.getAttribute(r)?n:t}},x.expr.attrHandle.id=x.expr.attrHandle.name=x.expr.attrHandle.coords=function(e,n,r){var i;return r?t:(i=e.getAttributeNode(n))&&""!==i.value?i.value:null},x.valHooks.button={get:function(e,n){var r=e.getAttributeNode(n);return r&&r.specified?r.value:t},set:z.set},x.attrHooks.contenteditable={set:function(e,t,n){z.set(e,""===t?!1:t,n)}},x.each(["width","height"],function(e,n){x.attrHooks[n]={set:function(e,r){return""===r?(e.setAttribute(n,"auto"),r):t}}})),x.support.hrefNormalized||x.each(["href","src"],function(e,t){x.propHooks[t]={get:function(e){return e.getAttribute(t,4)}}}),x.support.style||(x.attrHooks.style={get:function(e){return e.style.cssText||t},set:function(e,t){return e.style.cssText=t+""}}),x.support.optSelected||(x.propHooks.selected={get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null}}),x.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){x.propFix[this.toLowerCase()]=this}),x.support.enctype||(x.propFix.enctype="encoding"),x.each(["radio","checkbox"],function(){x.valHooks[this]={set:function(e,n){return x.isArray(n)?e.checked=x.inArray(x(e).val(),n)>=0:t}},x.support.checkOn||(x.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})});var Z=/^(?:input|select|textarea)$/i,et=/^key/,tt=/^(?:mouse|contextmenu)|click/,nt=/^(?:focusinfocus|focusoutblur)$/,rt=/^([^.]*)(?:\.(.+)|)$/;function it(){return!0}function ot(){return!1}function at(){try{return a.activeElement}catch(e){}}x.event={global:{},add:function(e,n,r,o,a){var s,l,u,c,p,f,d,h,g,m,y,v=x._data(e);if(v){r.handler&&(c=r,r=c.handler,a=c.selector),r.guid||(r.guid=x.guid++),(l=v.events)||(l=v.events={}),(f=v.handle)||(f=v.handle=function(e){return typeof x===i||e&&x.event.triggered===e.type?t:x.event.dispatch.apply(f.elem,arguments)},f.elem=e),n=(n||"").match(T)||[""],u=n.length;while(u--)s=rt.exec(n[u])||[],g=y=s[1],m=(s[2]||"").split(".").sort(),g&&(p=x.event.special[g]||{},g=(a?p.delegateType:p.bindType)||g,p=x.event.special[g]||{},d=x.extend({type:g,origType:y,data:o,handler:r,guid:r.guid,selector:a,needsContext:a&&x.expr.match.needsContext.test(a),namespace:m.join(".")},c),(h=l[g])||(h=l[g]=[],h.delegateCount=0,p.setup&&p.setup.call(e,o,m,f)!==!1||(e.addEventListener?e.addEventListener(g,f,!1):e.attachEvent&&e.attachEvent("on"+g,f))),p.add&&(p.add.call(e,d),d.handler.guid||(d.handler.guid=r.guid)),a?h.splice(h.delegateCount++,0,d):h.push(d),x.event.global[g]=!0);e=null}},remove:function(e,t,n,r,i){var o,a,s,l,u,c,p,f,d,h,g,m=x.hasData(e)&&x._data(e);if(m&&(c=m.events)){t=(t||"").match(T)||[""],u=t.length;while(u--)if(s=rt.exec(t[u])||[],d=g=s[1],h=(s[2]||"").split(".").sort(),d){p=x.event.special[d]||{},d=(r?p.delegateType:p.bindType)||d,f=c[d]||[],s=s[2]&&RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),l=o=f.length;while(o--)a=f[o],!i&&g!==a.origType||n&&n.guid!==a.guid||s&&!s.test(a.namespace)||r&&r!==a.selector&&("**"!==r||!a.selector)||(f.splice(o,1),a.selector&&f.delegateCount--,p.remove&&p.remove.call(e,a));l&&!f.length&&(p.teardown&&p.teardown.call(e,h,m.handle)!==!1||x.removeEvent(e,d,m.handle),delete c[d])}else for(d in c)x.event.remove(e,d+t[u],n,r,!0);x.isEmptyObject(c)&&(delete m.handle,x._removeData(e,"events"))}},trigger:function(n,r,i,o){var s,l,u,c,p,f,d,h=[i||a],g=v.call(n,"type")?n.type:n,m=v.call(n,"namespace")?n.namespace.split("."):[];if(u=f=i=i||a,3!==i.nodeType&&8!==i.nodeType&&!nt.test(g+x.event.triggered)&&(g.indexOf(".")>=0&&(m=g.split("."),g=m.shift(),m.sort()),l=0>g.indexOf(":")&&"on"+g,n=n[x.expando]?n:new x.Event(g,"object"==typeof n&&n),n.isTrigger=o?2:3,n.namespace=m.join("."),n.namespace_re=n.namespace?RegExp("(^|\\.)"+m.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,n.result=t,n.target||(n.target=i),r=null==r?[n]:x.makeArray(r,[n]),p=x.event.special[g]||{},o||!p.trigger||p.trigger.apply(i,r)!==!1)){if(!o&&!p.noBubble&&!x.isWindow(i)){for(c=p.delegateType||g,nt.test(c+g)||(u=u.parentNode);u;u=u.parentNode)h.push(u),f=u;f===(i.ownerDocument||a)&&h.push(f.defaultView||f.parentWindow||e)}d=0;while((u=h[d++])&&!n.isPropagationStopped())n.type=d>1?c:p.bindType||g,s=(x._data(u,"events")||{})[n.type]&&x._data(u,"handle"),s&&s.apply(u,r),s=l&&u[l],s&&x.acceptData(u)&&s.apply&&s.apply(u,r)===!1&&n.preventDefault();if(n.type=g,!o&&!n.isDefaultPrevented()&&(!p._default||p._default.apply(h.pop(),r)===!1)&&x.acceptData(i)&&l&&i[g]&&!x.isWindow(i)){f=i[l],f&&(i[l]=null),x.event.triggered=g;try{i[g]()}catch(y){}x.event.triggered=t,f&&(i[l]=f)}return n.result}},dispatch:function(e){e=x.event.fix(e);var n,r,i,o,a,s=[],l=g.call(arguments),u=(x._data(this,"events")||{})[e.type]||[],c=x.event.special[e.type]||{};if(l[0]=e,e.delegateTarget=this,!c.preDispatch||c.preDispatch.call(this,e)!==!1){s=x.event.handlers.call(this,e,u),n=0;while((o=s[n++])&&!e.isPropagationStopped()){e.currentTarget=o.elem,a=0;while((i=o.handlers[a++])&&!e.isImmediatePropagationStopped())(!e.namespace_re||e.namespace_re.test(i.namespace))&&(e.handleObj=i,e.data=i.data,r=((x.event.special[i.origType]||{}).handle||i.handler).apply(o.elem,l),r!==t&&(e.result=r)===!1&&(e.preventDefault(),e.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,e),e.result}},handlers:function(e,n){var r,i,o,a,s=[],l=n.delegateCount,u=e.target;if(l&&u.nodeType&&(!e.button||"click"!==e.type))for(;u!=this;u=u.parentNode||this)if(1===u.nodeType&&(u.disabled!==!0||"click"!==e.type)){for(o=[],a=0;l>a;a++)i=n[a],r=i.selector+" ",o[r]===t&&(o[r]=i.needsContext?x(r,this).index(u)>=0:x.find(r,this,null,[u]).length),o[r]&&o.push(i);o.length&&s.push({elem:u,handlers:o})}return n.length>l&&s.push({elem:this,handlers:n.slice(l)}),s},fix:function(e){if(e[x.expando])return e;var t,n,r,i=e.type,o=e,s=this.fixHooks[i];s||(this.fixHooks[i]=s=tt.test(i)?this.mouseHooks:et.test(i)?this.keyHooks:{}),r=s.props?this.props.concat(s.props):this.props,e=new x.Event(o),t=r.length;while(t--)n=r[t],e[n]=o[n];return e.target||(e.target=o.srcElement||a),3===e.target.nodeType&&(e.target=e.target.parentNode),e.metaKey=!!e.metaKey,s.filter?s.filter(e,o):e},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return null==e.which&&(e.which=null!=t.charCode?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,n){var r,i,o,s=n.button,l=n.fromElement;return null==e.pageX&&null!=n.clientX&&(i=e.target.ownerDocument||a,o=i.documentElement,r=i.body,e.pageX=n.clientX+(o&&o.scrollLeft||r&&r.scrollLeft||0)-(o&&o.clientLeft||r&&r.clientLeft||0),e.pageY=n.clientY+(o&&o.scrollTop||r&&r.scrollTop||0)-(o&&o.clientTop||r&&r.clientTop||0)),!e.relatedTarget&&l&&(e.relatedTarget=l===e.target?n.toElement:l),e.which||s===t||(e.which=1&s?1:2&s?3:4&s?2:0),e}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==at()&&this.focus)try{return this.focus(),!1}catch(e){}},delegateType:"focusin"},blur:{trigger:function(){return this===at()&&this.blur?(this.blur(),!1):t},delegateType:"focusout"},click:{trigger:function(){return x.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):t},_default:function(e){return x.nodeName(e.target,"a")}},beforeunload:{postDispatch:function(e){e.result!==t&&(e.originalEvent.returnValue=e.result)}}},simulate:function(e,t,n,r){var i=x.extend(new x.Event,n,{type:e,isSimulated:!0,originalEvent:{}});r?x.event.trigger(i,null,t):x.event.dispatch.call(t,i),i.isDefaultPrevented()&&n.preventDefault()}},x.removeEvent=a.removeEventListener?function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n,!1)}:function(e,t,n){var r="on"+t;e.detachEvent&&(typeof e[r]===i&&(e[r]=null),e.detachEvent(r,n))},x.Event=function(e,n){return this instanceof x.Event?(e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||e.returnValue===!1||e.getPreventDefault&&e.getPreventDefault()?it:ot):this.type=e,n&&x.extend(this,n),this.timeStamp=e&&e.timeStamp||x.now(),this[x.expando]=!0,t):new x.Event(e,n)},x.Event.prototype={isDefaultPrevented:ot,isPropagationStopped:ot,isImmediatePropagationStopped:ot,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=it,e&&(e.preventDefault?e.preventDefault():e.returnValue=!1)},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=it,e&&(e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=it,this.stopPropagation()}},x.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(e,t){x.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,o=e.handleObj;return(!i||i!==r&&!x.contains(r,i))&&(e.type=o.origType,n=o.handler.apply(this,arguments),e.type=t),n}}}),x.support.submitBubbles||(x.event.special.submit={setup:function(){return x.nodeName(this,"form")?!1:(x.event.add(this,"click._submit keypress._submit",function(e){var n=e.target,r=x.nodeName(n,"input")||x.nodeName(n,"button")?n.form:t;r&&!x._data(r,"submitBubbles")&&(x.event.add(r,"submit._submit",function(e){e._submit_bubble=!0}),x._data(r,"submitBubbles",!0))}),t)},postDispatch:function(e){e._submit_bubble&&(delete e._submit_bubble,this.parentNode&&!e.isTrigger&&x.event.simulate("submit",this.parentNode,e,!0))},teardown:function(){return x.nodeName(this,"form")?!1:(x.event.remove(this,"._submit"),t)}}),x.support.changeBubbles||(x.event.special.change={setup:function(){return Z.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(x.event.add(this,"propertychange._change",function(e){"checked"===e.originalEvent.propertyName&&(this._just_changed=!0)}),x.event.add(this,"click._change",function(e){this._just_changed&&!e.isTrigger&&(this._just_changed=!1),x.event.simulate("change",this,e,!0)})),!1):(x.event.add(this,"beforeactivate._change",function(e){var t=e.target;Z.test(t.nodeName)&&!x._data(t,"changeBubbles")&&(x.event.add(t,"change._change",function(e){!this.parentNode||e.isSimulated||e.isTrigger||x.event.simulate("change",this.parentNode,e,!0)}),x._data(t,"changeBubbles",!0))}),t)},handle:function(e){var n=e.target;return this!==n||e.isSimulated||e.isTrigger||"radio"!==n.type&&"checkbox"!==n.type?e.handleObj.handler.apply(this,arguments):t},teardown:function(){return x.event.remove(this,"._change"),!Z.test(this.nodeName)}}),x.support.focusinBubbles||x.each({focus:"focusin",blur:"focusout"},function(e,t){var n=0,r=function(e){x.event.simulate(t,e.target,x.event.fix(e),!0)};x.event.special[t]={setup:function(){0===n++&&a.addEventListener(e,r,!0)},teardown:function(){0===--n&&a.removeEventListener(e,r,!0)}}}),x.fn.extend({on:function(e,n,r,i,o){var a,s;if("object"==typeof e){"string"!=typeof n&&(r=r||n,n=t);for(a in e)this.on(a,n,r,e[a],o);return this}if(null==r&&null==i?(i=n,r=n=t):null==i&&("string"==typeof n?(i=r,r=t):(i=r,r=n,n=t)),i===!1)i=ot;else if(!i)return this;return 1===o&&(s=i,i=function(e){return x().off(e),s.apply(this,arguments)},i.guid=s.guid||(s.guid=x.guid++)),this.each(function(){x.event.add(this,e,i,r,n)})},one:function(e,t,n,r){return this.on(e,t,n,r,1)},off:function(e,n,r){var i,o;if(e&&e.preventDefault&&e.handleObj)return i=e.handleObj,x(e.delegateTarget).off(i.namespace?i.origType+"."+i.namespace:i.origType,i.selector,i.handler),this;if("object"==typeof e){for(o in e)this.off(o,n,e[o]);return this}return(n===!1||"function"==typeof n)&&(r=n,n=t),r===!1&&(r=ot),this.each(function(){x.event.remove(this,e,r,n)})},trigger:function(e,t){return this.each(function(){x.event.trigger(e,t,this)})},triggerHandler:function(e,n){var r=this[0];return r?x.event.trigger(e,n,r,!0):t}});var st=/^.[^:#\[\.,]*$/,lt=/^(?:parents|prev(?:Until|All))/,ut=x.expr.match.needsContext,ct={children:!0,contents:!0,next:!0,prev:!0};x.fn.extend({find:function(e){var t,n=[],r=this,i=r.length;if("string"!=typeof e)return this.pushStack(x(e).filter(function(){for(t=0;i>t;t++)if(x.contains(r[t],this))return!0}));for(t=0;i>t;t++)x.find(e,r[t],n);return n=this.pushStack(i>1?x.unique(n):n),n.selector=this.selector?this.selector+" "+e:e,n},has:function(e){var t,n=x(e,this),r=n.length;return this.filter(function(){for(t=0;r>t;t++)if(x.contains(this,n[t]))return!0})},not:function(e){return this.pushStack(ft(this,e||[],!0))},filter:function(e){return this.pushStack(ft(this,e||[],!1))},is:function(e){return!!ft(this,"string"==typeof e&&ut.test(e)?x(e):e||[],!1).length},closest:function(e,t){var n,r=0,i=this.length,o=[],a=ut.test(e)||"string"!=typeof e?x(e,t||this.context):0;for(;i>r;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(11>n.nodeType&&(a?a.index(n)>-1:1===n.nodeType&&x.find.matchesSelector(n,e))){n=o.push(n);break}return this.pushStack(o.length>1?x.unique(o):o)},index:function(e){return e?"string"==typeof e?x.inArray(this[0],x(e)):x.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){var n="string"==typeof e?x(e,t):x.makeArray(e&&e.nodeType?[e]:e),r=x.merge(this.get(),n);return this.pushStack(x.unique(r))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}});function pt(e,t){do e=e[t];while(e&&1!==e.nodeType);return e}x.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return x.dir(e,"parentNode")},parentsUntil:function(e,t,n){return x.dir(e,"parentNode",n)},next:function(e){return pt(e,"nextSibling")},prev:function(e){return pt(e,"previousSibling")},nextAll:function(e){return x.dir(e,"nextSibling")},prevAll:function(e){return x.dir(e,"previousSibling")},nextUntil:function(e,t,n){return x.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return x.dir(e,"previousSibling",n)},siblings:function(e){return x.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return x.sibling(e.firstChild)},contents:function(e){return x.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:x.merge([],e.childNodes)}},function(e,t){x.fn[e]=function(n,r){var i=x.map(this,t,n);return"Until"!==e.slice(-5)&&(r=n),r&&"string"==typeof r&&(i=x.filter(r,i)),this.length>1&&(ct[e]||(i=x.unique(i)),lt.test(e)&&(i=i.reverse())),this.pushStack(i)}}),x.extend({filter:function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?x.find.matchesSelector(r,e)?[r]:[]:x.find.matches(e,x.grep(t,function(e){return 1===e.nodeType}))},dir:function(e,n,r){var i=[],o=e[n];while(o&&9!==o.nodeType&&(r===t||1!==o.nodeType||!x(o).is(r)))1===o.nodeType&&i.push(o),o=o[n];return i},sibling:function(e,t){var n=[];for(;e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n}});function ft(e,t,n){if(x.isFunction(t))return x.grep(e,function(e,r){return!!t.call(e,r,e)!==n});if(t.nodeType)return x.grep(e,function(e){return e===t!==n});if("string"==typeof t){if(st.test(t))return x.filter(t,e,n);t=x.filter(t,e)}return x.grep(e,function(e){return x.inArray(e,t)>=0!==n})}function dt(e){var t=ht.split("|"),n=e.createDocumentFragment();if(n.createElement)while(t.length)n.createElement(t.pop());return n}var ht="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",gt=/ jQuery\d+="(?:null|\d+)"/g,mt=RegExp("<(?:"+ht+")[\\s/>]","i"),yt=/^\s+/,vt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bt=/<([\w:]+)/,xt=/<tbody/i,wt=/<|&#?\w+;/,Tt=/<(?:script|style|link)/i,Ct=/^(?:checkbox|radio)$/i,Nt=/checked\s*(?:[^=]|=\s*.checked.)/i,kt=/^$|\/(?:java|ecma)script/i,Et=/^true\/(.*)/,St=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,At={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:x.support.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]},jt=dt(a),Dt=jt.appendChild(a.createElement("div"));At.optgroup=At.option,At.tbody=At.tfoot=At.colgroup=At.caption=At.thead,At.th=At.td,x.fn.extend({text:function(e){return x.access(this,function(e){return e===t?x.text(this):this.empty().append((this[0]&&this[0].ownerDocument||a).createTextNode(e))},null,e,arguments.length)},append:function(){return this.domManip(arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Lt(this,e);t.appendChild(e)}})},prepend:function(){return this.domManip(arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Lt(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},remove:function(e,t){var n,r=e?x.filter(e,this):this,i=0;for(;null!=(n=r[i]);i++)t||1!==n.nodeType||x.cleanData(Ft(n)),n.parentNode&&(t&&x.contains(n.ownerDocument,n)&&_t(Ft(n,"script")),n.parentNode.removeChild(n));return this},empty:function(){var e,t=0;for(;null!=(e=this[t]);t++){1===e.nodeType&&x.cleanData(Ft(e,!1));while(e.firstChild)e.removeChild(e.firstChild);e.options&&x.nodeName(e,"select")&&(e.options.length=0)}return this},clone:function(e,t){return e=null==e?!1:e,t=null==t?e:t,this.map(function(){return x.clone(this,e,t)})},html:function(e){return x.access(this,function(e){var n=this[0]||{},r=0,i=this.length;if(e===t)return 1===n.nodeType?n.innerHTML.replace(gt,""):t;if(!("string"!=typeof e||Tt.test(e)||!x.support.htmlSerialize&&mt.test(e)||!x.support.leadingWhitespace&&yt.test(e)||At[(bt.exec(e)||["",""])[1].toLowerCase()])){e=e.replace(vt,"<$1></$2>");try{for(;i>r;r++)n=this[r]||{},1===n.nodeType&&(x.cleanData(Ft(n,!1)),n.innerHTML=e);n=0}catch(o){}}n&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var e=x.map(this,function(e){return[e.nextSibling,e.parentNode]}),t=0;return this.domManip(arguments,function(n){var r=e[t++],i=e[t++];i&&(r&&r.parentNode!==i&&(r=this.nextSibling),x(this).remove(),i.insertBefore(n,r))},!0),t?this:this.remove()},detach:function(e){return this.remove(e,!0)},domManip:function(e,t,n){e=d.apply([],e);var r,i,o,a,s,l,u=0,c=this.length,p=this,f=c-1,h=e[0],g=x.isFunction(h);if(g||!(1>=c||"string"!=typeof h||x.support.checkClone)&&Nt.test(h))return this.each(function(r){var i=p.eq(r);g&&(e[0]=h.call(this,r,i.html())),i.domManip(e,t,n)});if(c&&(l=x.buildFragment(e,this[0].ownerDocument,!1,!n&&this),r=l.firstChild,1===l.childNodes.length&&(l=r),r)){for(a=x.map(Ft(l,"script"),Ht),o=a.length;c>u;u++)i=l,u!==f&&(i=x.clone(i,!0,!0),o&&x.merge(a,Ft(i,"script"))),t.call(this[u],i,u);if(o)for(s=a[a.length-1].ownerDocument,x.map(a,qt),u=0;o>u;u++)i=a[u],kt.test(i.type||"")&&!x._data(i,"globalEval")&&x.contains(s,i)&&(i.src?x._evalUrl(i.src):x.globalEval((i.text||i.textContent||i.innerHTML||"").replace(St,"")));l=r=null}return this}});function Lt(e,t){return x.nodeName(e,"table")&&x.nodeName(1===t.nodeType?t:t.firstChild,"tr")?e.getElementsByTagName("tbody")[0]||e.appendChild(e.ownerDocument.createElement("tbody")):e}function Ht(e){return e.type=(null!==x.find.attr(e,"type"))+"/"+e.type,e}function qt(e){var t=Et.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function _t(e,t){var n,r=0;for(;null!=(n=e[r]);r++)x._data(n,"globalEval",!t||x._data(t[r],"globalEval"))}function Mt(e,t){if(1===t.nodeType&&x.hasData(e)){var n,r,i,o=x._data(e),a=x._data(t,o),s=o.events;if(s){delete a.handle,a.events={};for(n in s)for(r=0,i=s[n].length;i>r;r++)x.event.add(t,n,s[n][r])}a.data&&(a.data=x.extend({},a.data))}}function Ot(e,t){var n,r,i;if(1===t.nodeType){if(n=t.nodeName.toLowerCase(),!x.support.noCloneEvent&&t[x.expando]){i=x._data(t);for(r in i.events)x.removeEvent(t,r,i.handle);t.removeAttribute(x.expando)}"script"===n&&t.text!==e.text?(Ht(t).text=e.text,qt(t)):"object"===n?(t.parentNode&&(t.outerHTML=e.outerHTML),x.support.html5Clone&&e.innerHTML&&!x.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):"input"===n&&Ct.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):"option"===n?t.defaultSelected=t.selected=e.defaultSelected:("input"===n||"textarea"===n)&&(t.defaultValue=e.defaultValue)}}x.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){x.fn[e]=function(e){var n,r=0,i=[],o=x(e),a=o.length-1;for(;a>=r;r++)n=r===a?this:this.clone(!0),x(o[r])[t](n),h.apply(i,n.get());return this.pushStack(i)}});function Ft(e,n){var r,o,a=0,s=typeof e.getElementsByTagName!==i?e.getElementsByTagName(n||"*"):typeof e.querySelectorAll!==i?e.querySelectorAll(n||"*"):t;if(!s)for(s=[],r=e.childNodes||e;null!=(o=r[a]);a++)!n||x.nodeName(o,n)?s.push(o):x.merge(s,Ft(o,n));return n===t||n&&x.nodeName(e,n)?x.merge([e],s):s}function Bt(e){Ct.test(e.type)&&(e.defaultChecked=e.checked)}x.extend({clone:function(e,t,n){var r,i,o,a,s,l=x.contains(e.ownerDocument,e);if(x.support.html5Clone||x.isXMLDoc(e)||!mt.test("<"+e.nodeName+">")?o=e.cloneNode(!0):(Dt.innerHTML=e.outerHTML,Dt.removeChild(o=Dt.firstChild)),!(x.support.noCloneEvent&&x.support.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||x.isXMLDoc(e)))for(r=Ft(o),s=Ft(e),a=0;null!=(i=s[a]);++a)r[a]&&Ot(i,r[a]);if(t)if(n)for(s=s||Ft(e),r=r||Ft(o),a=0;null!=(i=s[a]);a++)Mt(i,r[a]);else Mt(e,o);return r=Ft(o,"script"),r.length>0&&_t(r,!l&&Ft(e,"script")),r=s=i=null,o},buildFragment:function(e,t,n,r){var i,o,a,s,l,u,c,p=e.length,f=dt(t),d=[],h=0;for(;p>h;h++)if(o=e[h],o||0===o)if("object"===x.type(o))x.merge(d,o.nodeType?[o]:o);else if(wt.test(o)){s=s||f.appendChild(t.createElement("div")),l=(bt.exec(o)||["",""])[1].toLowerCase(),c=At[l]||At._default,s.innerHTML=c[1]+o.replace(vt,"<$1></$2>")+c[2],i=c[0];while(i--)s=s.lastChild;if(!x.support.leadingWhitespace&&yt.test(o)&&d.push(t.createTextNode(yt.exec(o)[0])),!x.support.tbody){o="table"!==l||xt.test(o)?"<table>"!==c[1]||xt.test(o)?0:s:s.firstChild,i=o&&o.childNodes.length;while(i--)x.nodeName(u=o.childNodes[i],"tbody")&&!u.childNodes.length&&o.removeChild(u)}x.merge(d,s.childNodes),s.textContent="";while(s.firstChild)s.removeChild(s.firstChild);s=f.lastChild}else d.push(t.createTextNode(o));s&&f.removeChild(s),x.support.appendChecked||x.grep(Ft(d,"input"),Bt),h=0;while(o=d[h++])if((!r||-1===x.inArray(o,r))&&(a=x.contains(o.ownerDocument,o),s=Ft(f.appendChild(o),"script"),a&&_t(s),n)){i=0;while(o=s[i++])kt.test(o.type||"")&&n.push(o)}return s=null,f},cleanData:function(e,t){var n,r,o,a,s=0,l=x.expando,u=x.cache,c=x.support.deleteExpando,f=x.event.special;for(;null!=(n=e[s]);s++)if((t||x.acceptData(n))&&(o=n[l],a=o&&u[o])){if(a.events)for(r in a.events)f[r]?x.event.remove(n,r):x.removeEvent(n,r,a.handle);
+u[o]&&(delete u[o],c?delete n[l]:typeof n.removeAttribute!==i?n.removeAttribute(l):n[l]=null,p.push(o))}},_evalUrl:function(e){return x.ajax({url:e,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})}}),x.fn.extend({wrapAll:function(e){if(x.isFunction(e))return this.each(function(t){x(this).wrapAll(e.call(this,t))});if(this[0]){var t=x(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstChild&&1===e.firstChild.nodeType)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return x.isFunction(e)?this.each(function(t){x(this).wrapInner(e.call(this,t))}):this.each(function(){var t=x(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=x.isFunction(e);return this.each(function(n){x(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){x.nodeName(this,"body")||x(this).replaceWith(this.childNodes)}).end()}});var Pt,Rt,Wt,$t=/alpha\([^)]*\)/i,It=/opacity\s*=\s*([^)]*)/,zt=/^(top|right|bottom|left)$/,Xt=/^(none|table(?!-c[ea]).+)/,Ut=/^margin/,Vt=RegExp("^("+w+")(.*)$","i"),Yt=RegExp("^("+w+")(?!px)[a-z%]+$","i"),Jt=RegExp("^([+-])=("+w+")","i"),Gt={BODY:"block"},Qt={position:"absolute",visibility:"hidden",display:"block"},Kt={letterSpacing:0,fontWeight:400},Zt=["Top","Right","Bottom","Left"],en=["Webkit","O","Moz","ms"];function tn(e,t){if(t in e)return t;var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=en.length;while(i--)if(t=en[i]+n,t in e)return t;return r}function nn(e,t){return e=t||e,"none"===x.css(e,"display")||!x.contains(e.ownerDocument,e)}function rn(e,t){var n,r,i,o=[],a=0,s=e.length;for(;s>a;a++)r=e[a],r.style&&(o[a]=x._data(r,"olddisplay"),n=r.style.display,t?(o[a]||"none"!==n||(r.style.display=""),""===r.style.display&&nn(r)&&(o[a]=x._data(r,"olddisplay",ln(r.nodeName)))):o[a]||(i=nn(r),(n&&"none"!==n||!i)&&x._data(r,"olddisplay",i?n:x.css(r,"display"))));for(a=0;s>a;a++)r=e[a],r.style&&(t&&"none"!==r.style.display&&""!==r.style.display||(r.style.display=t?o[a]||"":"none"));return e}x.fn.extend({css:function(e,n){return x.access(this,function(e,n,r){var i,o,a={},s=0;if(x.isArray(n)){for(o=Rt(e),i=n.length;i>s;s++)a[n[s]]=x.css(e,n[s],!1,o);return a}return r!==t?x.style(e,n,r):x.css(e,n)},e,n,arguments.length>1)},show:function(){return rn(this,!0)},hide:function(){return rn(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){nn(this)?x(this).show():x(this).hide()})}}),x.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Wt(e,"opacity");return""===n?"1":n}}}},cssNumber:{columnCount:!0,fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":x.support.cssFloat?"cssFloat":"styleFloat"},style:function(e,n,r,i){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var o,a,s,l=x.camelCase(n),u=e.style;if(n=x.cssProps[l]||(x.cssProps[l]=tn(u,l)),s=x.cssHooks[n]||x.cssHooks[l],r===t)return s&&"get"in s&&(o=s.get(e,!1,i))!==t?o:u[n];if(a=typeof r,"string"===a&&(o=Jt.exec(r))&&(r=(o[1]+1)*o[2]+parseFloat(x.css(e,n)),a="number"),!(null==r||"number"===a&&isNaN(r)||("number"!==a||x.cssNumber[l]||(r+="px"),x.support.clearCloneStyle||""!==r||0!==n.indexOf("background")||(u[n]="inherit"),s&&"set"in s&&(r=s.set(e,r,i))===t)))try{u[n]=r}catch(c){}}},css:function(e,n,r,i){var o,a,s,l=x.camelCase(n);return n=x.cssProps[l]||(x.cssProps[l]=tn(e.style,l)),s=x.cssHooks[n]||x.cssHooks[l],s&&"get"in s&&(a=s.get(e,!0,r)),a===t&&(a=Wt(e,n,i)),"normal"===a&&n in Kt&&(a=Kt[n]),""===r||r?(o=parseFloat(a),r===!0||x.isNumeric(o)?o||0:a):a}}),e.getComputedStyle?(Rt=function(t){return e.getComputedStyle(t,null)},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),l=s?s.getPropertyValue(n)||s[n]:t,u=e.style;return s&&(""!==l||x.contains(e.ownerDocument,e)||(l=x.style(e,n)),Yt.test(l)&&Ut.test(n)&&(i=u.width,o=u.minWidth,a=u.maxWidth,u.minWidth=u.maxWidth=u.width=l,l=s.width,u.width=i,u.minWidth=o,u.maxWidth=a)),l}):a.documentElement.currentStyle&&(Rt=function(e){return e.currentStyle},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),l=s?s[n]:t,u=e.style;return null==l&&u&&u[n]&&(l=u[n]),Yt.test(l)&&!zt.test(n)&&(i=u.left,o=e.runtimeStyle,a=o&&o.left,a&&(o.left=e.currentStyle.left),u.left="fontSize"===n?"1em":l,l=u.pixelLeft+"px",u.left=i,a&&(o.left=a)),""===l?"auto":l});function on(e,t,n){var r=Vt.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function an(e,t,n,r,i){var o=n===(r?"border":"content")?4:"width"===t?1:0,a=0;for(;4>o;o+=2)"margin"===n&&(a+=x.css(e,n+Zt[o],!0,i)),r?("content"===n&&(a-=x.css(e,"padding"+Zt[o],!0,i)),"margin"!==n&&(a-=x.css(e,"border"+Zt[o]+"Width",!0,i))):(a+=x.css(e,"padding"+Zt[o],!0,i),"padding"!==n&&(a+=x.css(e,"border"+Zt[o]+"Width",!0,i)));return a}function sn(e,t,n){var r=!0,i="width"===t?e.offsetWidth:e.offsetHeight,o=Rt(e),a=x.support.boxSizing&&"border-box"===x.css(e,"boxSizing",!1,o);if(0>=i||null==i){if(i=Wt(e,t,o),(0>i||null==i)&&(i=e.style[t]),Yt.test(i))return i;r=a&&(x.support.boxSizingReliable||i===e.style[t]),i=parseFloat(i)||0}return i+an(e,t,n||(a?"border":"content"),r,o)+"px"}function ln(e){var t=a,n=Gt[e];return n||(n=un(e,t),"none"!==n&&n||(Pt=(Pt||x("<iframe frameborder='0' width='0' height='0'/>").css("cssText","display:block !important")).appendTo(t.documentElement),t=(Pt[0].contentWindow||Pt[0].contentDocument).document,t.write("<!doctype html><html><body>"),t.close(),n=un(e,t),Pt.detach()),Gt[e]=n),n}function un(e,t){var n=x(t.createElement(e)).appendTo(t.body),r=x.css(n[0],"display");return n.remove(),r}x.each(["height","width"],function(e,n){x.cssHooks[n]={get:function(e,r,i){return r?0===e.offsetWidth&&Xt.test(x.css(e,"display"))?x.swap(e,Qt,function(){return sn(e,n,i)}):sn(e,n,i):t},set:function(e,t,r){var i=r&&Rt(e);return on(e,t,r?an(e,n,r,x.support.boxSizing&&"border-box"===x.css(e,"boxSizing",!1,i),i):0)}}}),x.support.opacity||(x.cssHooks.opacity={get:function(e,t){return It.test((t&&e.currentStyle?e.currentStyle.filter:e.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":t?"1":""},set:function(e,t){var n=e.style,r=e.currentStyle,i=x.isNumeric(t)?"alpha(opacity="+100*t+")":"",o=r&&r.filter||n.filter||"";n.zoom=1,(t>=1||""===t)&&""===x.trim(o.replace($t,""))&&n.removeAttribute&&(n.removeAttribute("filter"),""===t||r&&!r.filter)||(n.filter=$t.test(o)?o.replace($t,i):o+" "+i)}}),x(function(){x.support.reliableMarginRight||(x.cssHooks.marginRight={get:function(e,n){return n?x.swap(e,{display:"inline-block"},Wt,[e,"marginRight"]):t}}),!x.support.pixelPosition&&x.fn.position&&x.each(["top","left"],function(e,n){x.cssHooks[n]={get:function(e,r){return r?(r=Wt(e,n),Yt.test(r)?x(e).position()[n]+"px":r):t}}})}),x.expr&&x.expr.filters&&(x.expr.filters.hidden=function(e){return 0>=e.offsetWidth&&0>=e.offsetHeight||!x.support.reliableHiddenOffsets&&"none"===(e.style&&e.style.display||x.css(e,"display"))},x.expr.filters.visible=function(e){return!x.expr.filters.hidden(e)}),x.each({margin:"",padding:"",border:"Width"},function(e,t){x.cssHooks[e+t]={expand:function(n){var r=0,i={},o="string"==typeof n?n.split(" "):[n];for(;4>r;r++)i[e+Zt[r]+t]=o[r]||o[r-2]||o[0];return i}},Ut.test(e)||(x.cssHooks[e+t].set=on)});var cn=/%20/g,pn=/\[\]$/,fn=/\r?\n/g,dn=/^(?:submit|button|image|reset|file)$/i,hn=/^(?:input|select|textarea|keygen)/i;x.fn.extend({serialize:function(){return x.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=x.prop(this,"elements");return e?x.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!x(this).is(":disabled")&&hn.test(this.nodeName)&&!dn.test(e)&&(this.checked||!Ct.test(e))}).map(function(e,t){var n=x(this).val();return null==n?null:x.isArray(n)?x.map(n,function(e){return{name:t.name,value:e.replace(fn,"\r\n")}}):{name:t.name,value:n.replace(fn,"\r\n")}}).get()}}),x.param=function(e,n){var r,i=[],o=function(e,t){t=x.isFunction(t)?t():null==t?"":t,i[i.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};if(n===t&&(n=x.ajaxSettings&&x.ajaxSettings.traditional),x.isArray(e)||e.jquery&&!x.isPlainObject(e))x.each(e,function(){o(this.name,this.value)});else for(r in e)gn(r,e[r],n,o);return i.join("&").replace(cn,"+")};function gn(e,t,n,r){var i;if(x.isArray(t))x.each(t,function(t,i){n||pn.test(e)?r(e,i):gn(e+"["+("object"==typeof i?t:"")+"]",i,n,r)});else if(n||"object"!==x.type(t))r(e,t);else for(i in t)gn(e+"["+i+"]",t[i],n,r)}x.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(e,t){x.fn[t]=function(e,n){return arguments.length>0?this.on(t,null,e,n):this.trigger(t)}}),x.fn.extend({hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)},bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)}});var mn,yn,vn=x.now(),bn=/\?/,xn=/#.*$/,wn=/([?&])_=[^&]*/,Tn=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Cn=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Nn=/^(?:GET|HEAD)$/,kn=/^\/\//,En=/^([\w.+-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,Sn=x.fn.load,An={},jn={},Dn="*/".concat("*");try{yn=o.href}catch(Ln){yn=a.createElement("a"),yn.href="",yn=yn.href}mn=En.exec(yn.toLowerCase())||[];function Hn(e){return function(t,n){"string"!=typeof t&&(n=t,t="*");var r,i=0,o=t.toLowerCase().match(T)||[];if(x.isFunction(n))while(r=o[i++])"+"===r[0]?(r=r.slice(1)||"*",(e[r]=e[r]||[]).unshift(n)):(e[r]=e[r]||[]).push(n)}}function qn(e,n,r,i){var o={},a=e===jn;function s(l){var u;return o[l]=!0,x.each(e[l]||[],function(e,l){var c=l(n,r,i);return"string"!=typeof c||a||o[c]?a?!(u=c):t:(n.dataTypes.unshift(c),s(c),!1)}),u}return s(n.dataTypes[0])||!o["*"]&&s("*")}function _n(e,n){var r,i,o=x.ajaxSettings.flatOptions||{};for(i in n)n[i]!==t&&((o[i]?e:r||(r={}))[i]=n[i]);return r&&x.extend(!0,e,r),e}x.fn.load=function(e,n,r){if("string"!=typeof e&&Sn)return Sn.apply(this,arguments);var i,o,a,s=this,l=e.indexOf(" ");return l>=0&&(i=e.slice(l,e.length),e=e.slice(0,l)),x.isFunction(n)?(r=n,n=t):n&&"object"==typeof n&&(a="POST"),s.length>0&&x.ajax({url:e,type:a,dataType:"html",data:n}).done(function(e){o=arguments,s.html(i?x("<div>").append(x.parseHTML(e)).find(i):e)}).complete(r&&function(e,t){s.each(r,o||[e.responseText,t,e])}),this},x.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){x.fn[t]=function(e){return this.on(t,e)}}),x.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:yn,type:"GET",isLocal:Cn.test(mn[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Dn,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":x.parseJSON,"text xml":x.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?_n(_n(e,x.ajaxSettings),t):_n(x.ajaxSettings,e)},ajaxPrefilter:Hn(An),ajaxTransport:Hn(jn),ajax:function(e,n){"object"==typeof e&&(n=e,e=t),n=n||{};var r,i,o,a,s,l,u,c,p=x.ajaxSetup({},n),f=p.context||p,d=p.context&&(f.nodeType||f.jquery)?x(f):x.event,h=x.Deferred(),g=x.Callbacks("once memory"),m=p.statusCode||{},y={},v={},b=0,w="canceled",C={readyState:0,getResponseHeader:function(e){var t;if(2===b){if(!c){c={};while(t=Tn.exec(a))c[t[1].toLowerCase()]=t[2]}t=c[e.toLowerCase()]}return null==t?null:t},getAllResponseHeaders:function(){return 2===b?a:null},setRequestHeader:function(e,t){var n=e.toLowerCase();return b||(e=v[n]=v[n]||e,y[e]=t),this},overrideMimeType:function(e){return b||(p.mimeType=e),this},statusCode:function(e){var t;if(e)if(2>b)for(t in e)m[t]=[m[t],e[t]];else C.always(e[C.status]);return this},abort:function(e){var t=e||w;return u&&u.abort(t),k(0,t),this}};if(h.promise(C).complete=g.add,C.success=C.done,C.error=C.fail,p.url=((e||p.url||yn)+"").replace(xn,"").replace(kn,mn[1]+"//"),p.type=n.method||n.type||p.method||p.type,p.dataTypes=x.trim(p.dataType||"*").toLowerCase().match(T)||[""],null==p.crossDomain&&(r=En.exec(p.url.toLowerCase()),p.crossDomain=!(!r||r[1]===mn[1]&&r[2]===mn[2]&&(r[3]||("http:"===r[1]?"80":"443"))===(mn[3]||("http:"===mn[1]?"80":"443")))),p.data&&p.processData&&"string"!=typeof p.data&&(p.data=x.param(p.data,p.traditional)),qn(An,p,n,C),2===b)return C;l=p.global,l&&0===x.active++&&x.event.trigger("ajaxStart"),p.type=p.type.toUpperCase(),p.hasContent=!Nn.test(p.type),o=p.url,p.hasContent||(p.data&&(o=p.url+=(bn.test(o)?"&":"?")+p.data,delete p.data),p.cache===!1&&(p.url=wn.test(o)?o.replace(wn,"$1_="+vn++):o+(bn.test(o)?"&":"?")+"_="+vn++)),p.ifModified&&(x.lastModified[o]&&C.setRequestHeader("If-Modified-Since",x.lastModified[o]),x.etag[o]&&C.setRequestHeader("If-None-Match",x.etag[o])),(p.data&&p.hasContent&&p.contentType!==!1||n.contentType)&&C.setRequestHeader("Content-Type",p.contentType),C.setRequestHeader("Accept",p.dataTypes[0]&&p.accepts[p.dataTypes[0]]?p.accepts[p.dataTypes[0]]+("*"!==p.dataTypes[0]?", "+Dn+"; q=0.01":""):p.accepts["*"]);for(i in p.headers)C.setRequestHeader(i,p.headers[i]);if(p.beforeSend&&(p.beforeSend.call(f,C,p)===!1||2===b))return C.abort();w="abort";for(i in{success:1,error:1,complete:1})C[i](p[i]);if(u=qn(jn,p,n,C)){C.readyState=1,l&&d.trigger("ajaxSend",[C,p]),p.async&&p.timeout>0&&(s=setTimeout(function(){C.abort("timeout")},p.timeout));try{b=1,u.send(y,k)}catch(N){if(!(2>b))throw N;k(-1,N)}}else k(-1,"No Transport");function k(e,n,r,i){var c,y,v,w,T,N=n;2!==b&&(b=2,s&&clearTimeout(s),u=t,a=i||"",C.readyState=e>0?4:0,c=e>=200&&300>e||304===e,r&&(w=Mn(p,C,r)),w=On(p,w,C,c),c?(p.ifModified&&(T=C.getResponseHeader("Last-Modified"),T&&(x.lastModified[o]=T),T=C.getResponseHeader("etag"),T&&(x.etag[o]=T)),204===e||"HEAD"===p.type?N="nocontent":304===e?N="notmodified":(N=w.state,y=w.data,v=w.error,c=!v)):(v=N,(e||!N)&&(N="error",0>e&&(e=0))),C.status=e,C.statusText=(n||N)+"",c?h.resolveWith(f,[y,N,C]):h.rejectWith(f,[C,N,v]),C.statusCode(m),m=t,l&&d.trigger(c?"ajaxSuccess":"ajaxError",[C,p,c?y:v]),g.fireWith(f,[C,N]),l&&(d.trigger("ajaxComplete",[C,p]),--x.active||x.event.trigger("ajaxStop")))}return C},getJSON:function(e,t,n){return x.get(e,t,n,"json")},getScript:function(e,n){return x.get(e,t,n,"script")}}),x.each(["get","post"],function(e,n){x[n]=function(e,r,i,o){return x.isFunction(r)&&(o=o||i,i=r,r=t),x.ajax({url:e,type:n,dataType:o,data:r,success:i})}});function Mn(e,n,r){var i,o,a,s,l=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),o===t&&(o=e.mimeType||n.getResponseHeader("Content-Type"));if(o)for(s in l)if(l[s]&&l[s].test(o)){u.unshift(s);break}if(u[0]in r)a=u[0];else{for(s in r){if(!u[0]||e.converters[s+" "+u[0]]){a=s;break}i||(i=s)}a=a||i}return a?(a!==u[0]&&u.unshift(a),r[a]):t}function On(e,t,n,r){var i,o,a,s,l,u={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)u[a.toLowerCase()]=e.converters[a];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!l&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),l=o,o=c.shift())if("*"===o)o=l;else if("*"!==l&&l!==o){if(a=u[l+" "+o]||u["* "+o],!a)for(i in u)if(s=i.split(" "),s[1]===o&&(a=u[l+" "+s[0]]||u["* "+s[0]])){a===!0?a=u[i]:u[i]!==!0&&(o=s[0],c.unshift(s[1]));break}if(a!==!0)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(p){return{state:"parsererror",error:a?p:"No conversion from "+l+" to "+o}}}return{state:"success",data:t}}x.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(e){return x.globalEval(e),e}}}),x.ajaxPrefilter("script",function(e){e.cache===t&&(e.cache=!1),e.crossDomain&&(e.type="GET",e.global=!1)}),x.ajaxTransport("script",function(e){if(e.crossDomain){var n,r=a.head||x("head")[0]||a.documentElement;return{send:function(t,i){n=a.createElement("script"),n.async=!0,e.scriptCharset&&(n.charset=e.scriptCharset),n.src=e.url,n.onload=n.onreadystatechange=function(e,t){(t||!n.readyState||/loaded|complete/.test(n.readyState))&&(n.onload=n.onreadystatechange=null,n.parentNode&&n.parentNode.removeChild(n),n=null,t||i(200,"success"))},r.insertBefore(n,r.firstChild)},abort:function(){n&&n.onload(t,!0)}}}});var Fn=[],Bn=/(=)\?(?=&|$)|\?\?/;x.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Fn.pop()||x.expando+"_"+vn++;return this[e]=!0,e}}),x.ajaxPrefilter("json jsonp",function(n,r,i){var o,a,s,l=n.jsonp!==!1&&(Bn.test(n.url)?"url":"string"==typeof n.data&&!(n.contentType||"").indexOf("application/x-www-form-urlencoded")&&Bn.test(n.data)&&"data");return l||"jsonp"===n.dataTypes[0]?(o=n.jsonpCallback=x.isFunction(n.jsonpCallback)?n.jsonpCallback():n.jsonpCallback,l?n[l]=n[l].replace(Bn,"$1"+o):n.jsonp!==!1&&(n.url+=(bn.test(n.url)?"&":"?")+n.jsonp+"="+o),n.converters["script json"]=function(){return s||x.error(o+" was not called"),s[0]},n.dataTypes[0]="json",a=e[o],e[o]=function(){s=arguments},i.always(function(){e[o]=a,n[o]&&(n.jsonpCallback=r.jsonpCallback,Fn.push(o)),s&&x.isFunction(a)&&a(s[0]),s=a=t}),"script"):t});var Pn,Rn,Wn=0,$n=e.ActiveXObject&&function(){var e;for(e in Pn)Pn[e](t,!0)};function In(){try{return new e.XMLHttpRequest}catch(t){}}function zn(){try{return new e.ActiveXObject("Microsoft.XMLHTTP")}catch(t){}}x.ajaxSettings.xhr=e.ActiveXObject?function(){return!this.isLocal&&In()||zn()}:In,Rn=x.ajaxSettings.xhr(),x.support.cors=!!Rn&&"withCredentials"in Rn,Rn=x.support.ajax=!!Rn,Rn&&x.ajaxTransport(function(n){if(!n.crossDomain||x.support.cors){var r;return{send:function(i,o){var a,s,l=n.xhr();if(n.username?l.open(n.type,n.url,n.async,n.username,n.password):l.open(n.type,n.url,n.async),n.xhrFields)for(s in n.xhrFields)l[s]=n.xhrFields[s];n.mimeType&&l.overrideMimeType&&l.overrideMimeType(n.mimeType),n.crossDomain||i["X-Requested-With"]||(i["X-Requested-With"]="XMLHttpRequest");try{for(s in i)l.setRequestHeader(s,i[s])}catch(u){}l.send(n.hasContent&&n.data||null),r=function(e,i){var s,u,c,p;try{if(r&&(i||4===l.readyState))if(r=t,a&&(l.onreadystatechange=x.noop,$n&&delete Pn[a]),i)4!==l.readyState&&l.abort();else{p={},s=l.status,u=l.getAllResponseHeaders(),"string"==typeof l.responseText&&(p.text=l.responseText);try{c=l.statusText}catch(f){c=""}s||!n.isLocal||n.crossDomain?1223===s&&(s=204):s=p.text?200:404}}catch(d){i||o(-1,d)}p&&o(s,c,p,u)},n.async?4===l.readyState?setTimeout(r):(a=++Wn,$n&&(Pn||(Pn={},x(e).unload($n)),Pn[a]=r),l.onreadystatechange=r):r()},abort:function(){r&&r(t,!0)}}}});var Xn,Un,Vn=/^(?:toggle|show|hide)$/,Yn=RegExp("^(?:([+-])=|)("+w+")([a-z%]*)$","i"),Jn=/queueHooks$/,Gn=[nr],Qn={"*":[function(e,t){var n=this.createTween(e,t),r=n.cur(),i=Yn.exec(t),o=i&&i[3]||(x.cssNumber[e]?"":"px"),a=(x.cssNumber[e]||"px"!==o&&+r)&&Yn.exec(x.css(n.elem,e)),s=1,l=20;if(a&&a[3]!==o){o=o||a[3],i=i||[],a=+r||1;do s=s||".5",a/=s,x.style(n.elem,e,a+o);while(s!==(s=n.cur()/r)&&1!==s&&--l)}return i&&(a=n.start=+a||+r||0,n.unit=o,n.end=i[1]?a+(i[1]+1)*i[2]:+i[2]),n}]};function Kn(){return setTimeout(function(){Xn=t}),Xn=x.now()}function Zn(e,t,n){var r,i=(Qn[t]||[]).concat(Qn["*"]),o=0,a=i.length;for(;a>o;o++)if(r=i[o].call(n,t,e))return r}function er(e,t,n){var r,i,o=0,a=Gn.length,s=x.Deferred().always(function(){delete l.elem}),l=function(){if(i)return!1;var t=Xn||Kn(),n=Math.max(0,u.startTime+u.duration-t),r=n/u.duration||0,o=1-r,a=0,l=u.tweens.length;for(;l>a;a++)u.tweens[a].run(o);return s.notifyWith(e,[u,o,n]),1>o&&l?n:(s.resolveWith(e,[u]),!1)},u=s.promise({elem:e,props:x.extend({},t),opts:x.extend(!0,{specialEasing:{}},n),originalProperties:t,originalOptions:n,startTime:Xn||Kn(),duration:n.duration,tweens:[],createTween:function(t,n){var r=x.Tween(e,u.opts,t,n,u.opts.specialEasing[t]||u.opts.easing);return u.tweens.push(r),r},stop:function(t){var n=0,r=t?u.tweens.length:0;if(i)return this;for(i=!0;r>n;n++)u.tweens[n].run(1);return t?s.resolveWith(e,[u,t]):s.rejectWith(e,[u,t]),this}}),c=u.props;for(tr(c,u.opts.specialEasing);a>o;o++)if(r=Gn[o].call(u,e,c,u.opts))return r;return x.map(c,Zn,u),x.isFunction(u.opts.start)&&u.opts.start.call(e,u),x.fx.timer(x.extend(l,{elem:e,anim:u,queue:u.opts.queue})),u.progress(u.opts.progress).done(u.opts.done,u.opts.complete).fail(u.opts.fail).always(u.opts.always)}function tr(e,t){var n,r,i,o,a;for(n in e)if(r=x.camelCase(n),i=t[r],o=e[n],x.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),a=x.cssHooks[r],a&&"expand"in a){o=a.expand(o),delete e[r];for(n in o)n in e||(e[n]=o[n],t[n]=i)}else t[r]=i}x.Animation=x.extend(er,{tweener:function(e,t){x.isFunction(e)?(t=e,e=["*"]):e=e.split(" ");var n,r=0,i=e.length;for(;i>r;r++)n=e[r],Qn[n]=Qn[n]||[],Qn[n].unshift(t)},prefilter:function(e,t){t?Gn.unshift(e):Gn.push(e)}});function nr(e,t,n){var r,i,o,a,s,l,u=this,c={},p=e.style,f=e.nodeType&&nn(e),d=x._data(e,"fxshow");n.queue||(s=x._queueHooks(e,"fx"),null==s.unqueued&&(s.unqueued=0,l=s.empty.fire,s.empty.fire=function(){s.unqueued||l()}),s.unqueued++,u.always(function(){u.always(function(){s.unqueued--,x.queue(e,"fx").length||s.empty.fire()})})),1===e.nodeType&&("height"in t||"width"in t)&&(n.overflow=[p.overflow,p.overflowX,p.overflowY],"inline"===x.css(e,"display")&&"none"===x.css(e,"float")&&(x.support.inlineBlockNeedsLayout&&"inline"!==ln(e.nodeName)?p.zoom=1:p.display="inline-block")),n.overflow&&(p.overflow="hidden",x.support.shrinkWrapBlocks||u.always(function(){p.overflow=n.overflow[0],p.overflowX=n.overflow[1],p.overflowY=n.overflow[2]}));for(r in t)if(i=t[r],Vn.exec(i)){if(delete t[r],o=o||"toggle"===i,i===(f?"hide":"show"))continue;c[r]=d&&d[r]||x.style(e,r)}if(!x.isEmptyObject(c)){d?"hidden"in d&&(f=d.hidden):d=x._data(e,"fxshow",{}),o&&(d.hidden=!f),f?x(e).show():u.done(function(){x(e).hide()}),u.done(function(){var t;x._removeData(e,"fxshow");for(t in c)x.style(e,t,c[t])});for(r in c)a=Zn(f?d[r]:0,r,u),r in d||(d[r]=a.start,f&&(a.end=a.start,a.start="width"===r||"height"===r?1:0))}}function rr(e,t,n,r,i){return new rr.prototype.init(e,t,n,r,i)}x.Tween=rr,rr.prototype={constructor:rr,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||"swing",this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(x.cssNumber[n]?"":"px")},cur:function(){var e=rr.propHooks[this.prop];return e&&e.get?e.get(this):rr.propHooks._default.get(this)},run:function(e){var t,n=rr.propHooks[this.prop];return this.pos=t=this.options.duration?x.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):rr.propHooks._default.set(this),this}},rr.prototype.init.prototype=rr.prototype,rr.propHooks={_default:{get:function(e){var t;return null==e.elem[e.prop]||e.elem.style&&null!=e.elem.style[e.prop]?(t=x.css(e.elem,e.prop,""),t&&"auto"!==t?t:0):e.elem[e.prop]},set:function(e){x.fx.step[e.prop]?x.fx.step[e.prop](e):e.elem.style&&(null!=e.elem.style[x.cssProps[e.prop]]||x.cssHooks[e.prop])?x.style(e.elem,e.prop,e.now+e.unit):e.elem[e.prop]=e.now}}},rr.propHooks.scrollTop=rr.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},x.each(["toggle","show","hide"],function(e,t){var n=x.fn[t];x.fn[t]=function(e,r,i){return null==e||"boolean"==typeof e?n.apply(this,arguments):this.animate(ir(t,!0),e,r,i)}}),x.fn.extend({fadeTo:function(e,t,n,r){return this.filter(nn).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(e,t,n,r){var i=x.isEmptyObject(e),o=x.speed(t,n,r),a=function(){var t=er(this,x.extend({},e),o);(i||x._data(this,"finish"))&&t.stop(!0)};return a.finish=a,i||o.queue===!1?this.each(a):this.queue(o.queue,a)},stop:function(e,n,r){var i=function(e){var t=e.stop;delete e.stop,t(r)};return"string"!=typeof e&&(r=n,n=e,e=t),n&&e!==!1&&this.queue(e||"fx",[]),this.each(function(){var t=!0,n=null!=e&&e+"queueHooks",o=x.timers,a=x._data(this);if(n)a[n]&&a[n].stop&&i(a[n]);else for(n in a)a[n]&&a[n].stop&&Jn.test(n)&&i(a[n]);for(n=o.length;n--;)o[n].elem!==this||null!=e&&o[n].queue!==e||(o[n].anim.stop(r),t=!1,o.splice(n,1));(t||!r)&&x.dequeue(this,e)})},finish:function(e){return e!==!1&&(e=e||"fx"),this.each(function(){var t,n=x._data(this),r=n[e+"queue"],i=n[e+"queueHooks"],o=x.timers,a=r?r.length:0;for(n.finish=!0,x.queue(this,e,[]),i&&i.stop&&i.stop.call(this,!0),t=o.length;t--;)o[t].elem===this&&o[t].queue===e&&(o[t].anim.stop(!0),o.splice(t,1));for(t=0;a>t;t++)r[t]&&r[t].finish&&r[t].finish.call(this);delete n.finish})}});function ir(e,t){var n,r={height:e},i=0;for(t=t?1:0;4>i;i+=2-t)n=Zt[i],r["margin"+n]=r["padding"+n]=e;return t&&(r.opacity=r.width=e),r}x.each({slideDown:ir("show"),slideUp:ir("hide"),slideToggle:ir("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,t){x.fn[e]=function(e,n,r){return this.animate(t,e,n,r)}}),x.speed=function(e,t,n){var r=e&&"object"==typeof e?x.extend({},e):{complete:n||!n&&t||x.isFunction(e)&&e,duration:e,easing:n&&t||t&&!x.isFunction(t)&&t};return r.duration=x.fx.off?0:"number"==typeof r.duration?r.duration:r.duration in x.fx.speeds?x.fx.speeds[r.duration]:x.fx.speeds._default,(null==r.queue||r.queue===!0)&&(r.queue="fx"),r.old=r.complete,r.complete=function(){x.isFunction(r.old)&&r.old.call(this),r.queue&&x.dequeue(this,r.queue)},r},x.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2}},x.timers=[],x.fx=rr.prototype.init,x.fx.tick=function(){var e,n=x.timers,r=0;for(Xn=x.now();n.length>r;r++)e=n[r],e()||n[r]!==e||n.splice(r--,1);n.length||x.fx.stop(),Xn=t},x.fx.timer=function(e){e()&&x.timers.push(e)&&x.fx.start()},x.fx.interval=13,x.fx.start=function(){Un||(Un=setInterval(x.fx.tick,x.fx.interval))},x.fx.stop=function(){clearInterval(Un),Un=null},x.fx.speeds={slow:600,fast:200,_default:400},x.fx.step={},x.expr&&x.expr.filters&&(x.expr.filters.animated=function(e){return x.grep(x.timers,function(t){return e===t.elem}).length}),x.fn.offset=function(e){if(arguments.length)return e===t?this:this.each(function(t){x.offset.setOffset(this,e,t)});var n,r,o={top:0,left:0},a=this[0],s=a&&a.ownerDocument;if(s)return n=s.documentElement,x.contains(n,a)?(typeof a.getBoundingClientRect!==i&&(o=a.getBoundingClientRect()),r=or(s),{top:o.top+(r.pageYOffset||n.scrollTop)-(n.clientTop||0),left:o.left+(r.pageXOffset||n.scrollLeft)-(n.clientLeft||0)}):o},x.offset={setOffset:function(e,t,n){var r=x.css(e,"position");"static"===r&&(e.style.position="relative");var i=x(e),o=i.offset(),a=x.css(e,"top"),s=x.css(e,"left"),l=("absolute"===r||"fixed"===r)&&x.inArray("auto",[a,s])>-1,u={},c={},p,f;l?(c=i.position(),p=c.top,f=c.left):(p=parseFloat(a)||0,f=parseFloat(s)||0),x.isFunction(t)&&(t=t.call(e,n,o)),null!=t.top&&(u.top=t.top-o.top+p),null!=t.left&&(u.left=t.left-o.left+f),"using"in t?t.using.call(e,u):i.css(u)}},x.fn.extend({position:function(){if(this[0]){var e,t,n={top:0,left:0},r=this[0];return"fixed"===x.css(r,"position")?t=r.getBoundingClientRect():(e=this.offsetParent(),t=this.offset(),x.nodeName(e[0],"html")||(n=e.offset()),n.top+=x.css(e[0],"borderTopWidth",!0),n.left+=x.css(e[0],"borderLeftWidth",!0)),{top:t.top-n.top-x.css(r,"marginTop",!0),left:t.left-n.left-x.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent||s;while(e&&!x.nodeName(e,"html")&&"static"===x.css(e,"position"))e=e.offsetParent;return e||s})}}),x.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,n){var r=/Y/.test(n);x.fn[e]=function(i){return x.access(this,function(e,i,o){var a=or(e);return o===t?a?n in a?a[n]:a.document.documentElement[i]:e[i]:(a?a.scrollTo(r?x(a).scrollLeft():o,r?o:x(a).scrollTop()):e[i]=o,t)},e,i,arguments.length,null)}});function or(e){return x.isWindow(e)?e:9===e.nodeType?e.defaultView||e.parentWindow:!1}x.each({Height:"height",Width:"width"},function(e,n){x.each({padding:"inner"+e,content:n,"":"outer"+e},function(r,i){x.fn[i]=function(i,o){var a=arguments.length&&(r||"boolean"!=typeof i),s=r||(i===!0||o===!0?"margin":"border");return x.access(this,function(n,r,i){var o;return x.isWindow(n)?n.document.documentElement["client"+e]:9===n.nodeType?(o=n.documentElement,Math.max(n.body["scroll"+e],o["scroll"+e],n.body["offset"+e],o["offset"+e],o["client"+e])):i===t?x.css(n,r,s):x.style(n,r,i,s)},n,a?i:t,a,null)}})}),x.fn.size=function(){return this.length},x.fn.andSelf=x.fn.addBack,"object"==typeof module&&module&&"object"==typeof module.exports?module.exports=x:(e.jQuery=e.$=x,"function"==typeof define&&define.amd&&define("jquery",[],function(){return x}))})(window);
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/jquery/jquery.pagination.js b/pluss-manage-page/src/main/resources/static/resources/js/third-party/jquery/jquery.pagination.js
new file mode 100644
index 0000000..cf586c6
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/third-party/jquery/jquery.pagination.js
@@ -0,0 +1,249 @@
+/**
+ * This jQuery plugin displays pagination links inside the selected elements.
+ * 
+ * This plugin needs at least jQuery 1.4.2
+ *
+ * @author Gabriel Birke (birke *at* d-scribe *dot* de)
+ * @version 2.2
+ * @param {int} maxentries Number of entries to paginate
+ * @param {Object} opts Several options (see README for documentation)
+ * @return {Object} jQuery Object
+ */
+ (function($){
+	/**
+	 * @class Class for calculating pagination values
+	 */
+	$.PaginationCalculator = function(maxentries, opts) {
+		this.maxentries = maxentries;
+		this.opts = opts;
+	}
+	
+	$.extend($.PaginationCalculator.prototype, {
+		/**
+		 * Calculate the maximum number of pages
+		 * @method
+		 * @returns {Number}
+		 */
+		numPages:function() {
+			return Math.ceil(this.maxentries/this.opts.items_per_page);
+		},
+		/**
+		 * Calculate start and end point of pagination links depending on 
+		 * current_page and num_display_entries.
+		 * @returns {Array}
+		 */
+		getInterval:function(current_page)  {
+			var ne_half = Math.floor(this.opts.num_display_entries/2);
+			var np = this.numPages();
+			var upper_limit = np - this.opts.num_display_entries;
+			var start = current_page > ne_half ? Math.max( Math.min(current_page - ne_half, upper_limit), 0 ) : 0;
+			var end = current_page > ne_half?Math.min(current_page+ne_half + (this.opts.num_display_entries % 2), np):Math.min(this.opts.num_display_entries, np);
+			return {start:start, end:end};
+		}
+	});
+	
+	// Initialize jQuery object container for pagination renderers
+	$.PaginationRenderers = {}
+	
+	/**
+	 * @class Default renderer for rendering pagination links
+	 */
+	$.PaginationRenderers.defaultRenderer = function(maxentries, opts) {
+		this.maxentries = maxentries;
+		this.opts = opts;
+		this.pc = new $.PaginationCalculator(maxentries, opts);
+	}
+	$.extend($.PaginationRenderers.defaultRenderer.prototype, {
+		/**
+		 * Helper function for generating a single link (or a span tag if it's the current page)
+		 * @param {Number} page_id The page id for the new item
+		 * @param {Number} current_page 
+		 * @param {Object} appendopts Options for the new item: text and classes
+		 * @returns {jQuery} jQuery object containing the link
+		 */
+		createLink:function(page_id, current_page, appendopts){
+			var lnk, np = this.pc.numPages();
+			page_id = page_id<0?0:(page_id<np?page_id:np-1); // Normalize page id to sane value
+			appendopts = $.extend({text:page_id+1, classes:""}, appendopts||{});
+			if(page_id == current_page){
+				lnk = $("<a class='current'>" + appendopts.text + "</a>");
+			}
+			else
+			{
+				lnk = $("<a>" + appendopts.text + "</a>")
+					.attr('href', this.opts.link_to.replace(/__id__/,page_id));
+			}
+			if(appendopts.classes){ lnk.addClass(appendopts.classes); }
+			lnk.data('page_id', page_id);
+			return lnk;
+		},
+		// Generate a range of numeric links 
+		appendRange:function(container, current_page, start, end, opts) {
+			var i;
+			for(i=start; i<end; i++) {
+				this.createLink(i, current_page, opts).appendTo(container);
+			}
+		},
+		getLinks:function(current_page, eventHandler) {
+			var begin, end,
+				interval = this.pc.getInterval(current_page),
+				np = this.pc.numPages(),
+				fragment = $("<div class='pagination'></div>");
+			
+			// Generate "Previous"-Link
+			if(this.opts.prev_text && (current_page > 0 || this.opts.prev_show_always)){
+				fragment.append(this.createLink(current_page-1, current_page, {text:this.opts.prev_text, classes:"prev"}));
+			}
+			// Generate starting points
+			if (interval.start > 0 && this.opts.num_edge_entries > 0)
+			{
+				end = Math.min(this.opts.num_edge_entries, interval.start);
+				this.appendRange(fragment, current_page, 0, end, {classes:'sp'});
+				if(this.opts.num_edge_entries < interval.start && this.opts.ellipse_text)
+				{
+					$("<span class='pagination-break'>"+this.opts.ellipse_text+"</span>").appendTo(fragment);
+				}
+			}
+			// Generate interval links
+			this.appendRange(fragment, current_page, interval.start, interval.end);
+			// Generate ending points
+			if (interval.end < np && this.opts.num_edge_entries > 0)
+			{
+				if(np-this.opts.num_edge_entries > interval.end && this.opts.ellipse_text)
+				{
+					$("<span class='pagination-break'>"+this.opts.ellipse_text+"</span>").appendTo(fragment);
+				}
+				begin = Math.max(np-this.opts.num_edge_entries, interval.end);
+				this.appendRange(fragment, current_page, begin, np, {classes:'ep'});
+				
+			}
+			// Generate "Next"-Link
+			if(this.opts.next_text && (current_page < np-1 || this.opts.next_show_always)){
+				fragment.append(this.createLink(current_page+1, current_page, {text:this.opts.next_text, classes:"next"}));
+			}
+			$('a', fragment).click(eventHandler);
+			return fragment;
+		}
+	});
+	
+	// Extend jQuery
+	$.fn.pagination = function(maxentries, opts){
+		
+		// Initialize options with default values
+		opts = $.extend({
+			items_per_page:1,
+			num_display_entries:4,
+			current_page:0,
+			num_edge_entries:1,
+			link_to:"#",
+			prev_text:"<i></i>上一页",
+			next_text:"下一页 <i></i>",
+			ellipse_text:"...",
+			prev_show_always:true,
+			next_show_always:true,
+			renderer:"defaultRenderer",
+			show_if_single_page:false,
+			load_first_page:false,
+			callback:function(){return false;}
+		},opts||{});
+		
+		var containers = this,
+			renderer, links, current_page;
+
+		//goto
+    $(".page-btn").one("click",function(){
+    	var allPage = $(".allPage").text();
+    	//console.log(allPage);
+      var goPage = $(".page-go input").val() - 1; //跳转页数
+      if(goPage > -1 && goPage < allPage){
+				opts.current_page = goPage;
+      	$("#Pagination").pagination(allPage,opts);
+      }else {
+      	$("#Pagination").pagination(allPage);
+      }
+      //清空用户跳转页数
+      $(".page-go input").val("");
+    });
+		
+		/**
+		 * This is the event handling function for the pagination links. 
+		 * @param {int} page_id The new page number
+		 */
+		function paginationClickHandler(evt){
+			var links, 
+				new_current_page = $(evt.target).data('page_id'),
+				continuePropagation = selectPage(new_current_page);
+			if (!continuePropagation) {
+				evt.stopPropagation();
+			}
+			return continuePropagation;
+		}
+		
+		/**
+		 * This is a utility function for the internal event handlers. 
+		 * It sets the new current page on the pagination container objects, 
+		 * generates a new HTMl fragment for the pagination links and calls
+		 * the callback function.
+		 */
+		function selectPage(new_current_page) {
+			// update the link display of a all containers
+			containers.data('current_page', new_current_page);
+			links = renderer.getLinks(new_current_page, paginationClickHandler);
+			containers.empty();
+			links.appendTo(containers);
+			// call the callback and propagate the event if it does not return false
+			var continuePropagation = opts.callback(new_current_page, containers);
+			return continuePropagation;
+		}
+		
+		// -----------------------------------
+		// Initialize containers
+		// -----------------------------------
+                current_page = parseInt(opts.current_page);
+		containers.data('current_page', current_page);
+		// Create a sane value for maxentries and items_per_page
+		maxentries = (!maxentries || maxentries < 0)?1:maxentries;
+		opts.items_per_page = (!opts.items_per_page || opts.items_per_page < 0)?1:opts.items_per_page;
+		
+		if(!$.PaginationRenderers[opts.renderer])
+		{
+			throw new ReferenceError("Pagination renderer '" + opts.renderer + "' was not found in jQuery.PaginationRenderers object.");
+		}
+		renderer = new $.PaginationRenderers[opts.renderer](maxentries, opts);
+		
+		// Attach control events to the DOM elements
+		var pc = new $.PaginationCalculator(maxentries, opts);
+		var np = pc.numPages();
+		containers.bind('setPage', {numPages:np}, function(evt, page_id) { 
+				if(page_id >= 0 && page_id < evt.data.numPages) {
+					selectPage(page_id); return false;
+				}
+		});
+		containers.bind('prevPage', function(evt){
+				var current_page = $(this).data('current_page');
+				if (current_page > 0) {
+					selectPage(current_page - 1);
+				}
+				return false;
+		});
+		containers.bind('nextPage', {numPages:np}, function(evt){
+				var current_page = $(this).data('current_page');
+				if(current_page < evt.data.numPages - 1) {
+					selectPage(current_page + 1);
+				}
+				return false;
+		});
+		
+		// When all initialisation is done, draw the links
+		links = renderer.getLinks(current_page, paginationClickHandler);
+		containers.empty();
+		if(np > 1 || opts.show_if_single_page) {
+			links.appendTo(containers);
+		}
+		// call callback function
+		if(opts.load_first_page) {
+			opts.callback(current_page, containers);
+		}
+	} // End of $.fn.pagination block
+	
+})(jQuery);
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/kindeditor-all-min.js b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/kindeditor-all-min.js
new file mode 100644
index 0000000..3bb6d01
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/kindeditor-all-min.js
@@ -0,0 +1,355 @@
+/* KindEditor 4.1.10 (2013-11-23), Copyright (C) kindsoft.net, Licence: http://www.kindsoft.net/license.php */(function(b,d){function f(a){if(!a)return!1;return Object.prototype.toString.call(a)==="[object Array]"}function j(a){if(!a)return!1;return Object.prototype.toString.call(a)==="[object Function]"}function e(a,c){for(var g=0,b=c.length;g<b;g++)if(a===c[g])return g;return-1}function h(a,c){if(f(a))for(var g=0,b=a.length;g<b;g++){if(c.call(a[g],g,a[g])===!1)break}else for(g in a)if(a.hasOwnProperty(g)&&c.call(a[g],g,a[g])===!1)break}function m(a){return a.replace(/(?:^[ \t\n\r]+)|(?:[ \t\n\r]+$)/g,"")}
+function n(a,c,g){g=g===d?",":g;return(g+c+g).indexOf(g+a+g)>=0}function o(a,c){c=c||"px";return a&&/^\d+$/.test(a)?a+c:a}function l(a){var c;return a&&(c=/(\d+)/.exec(a))?parseInt(c[1],10):0}function s(a){return a.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;")}function v(a){return a.replace(/&lt;/g,"<").replace(/&gt;/g,">").replace(/&quot;/g,'"').replace(/&amp;/g,"&")}function p(a){var c=a.split("-"),a="";h(c,function(c,b){a+=c>0?b.charAt(0).toUpperCase()+
+b.substr(1):b});return a}function r(a){function c(a){a=parseInt(a,10).toString(16).toUpperCase();return a.length>1?a:"0"+a}return a.replace(/rgb\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)/ig,function(a,b,d,k){return"#"+c(b)+c(d)+c(k)})}function z(a,c){var c=c===d?",":c,g={},b=f(a)?a:a.split(c),t;h(b,function(a,c){if(t=/^(\d+)\.\.(\d+)$/.exec(c))for(var b=parseInt(t[1],10);b<=parseInt(t[2],10);b++)g[b.toString()]=!0;else g[c]=!0});return g}function D(a,c){return Array.prototype.slice.call(a,c||0)}function q(a,
+c){return a===d?c:a}function A(a,c,g){g||(g=c,c=null);var b;if(c){var d=function(){};d.prototype=c.prototype;b=new d;h(g,function(a,c){b[a]=c})}else b=g;b.constructor=a;a.prototype=b;a.parent=c?c.prototype:null}function B(a){var c;if(c=/\{[\s\S]*\}|\[[\s\S]*\]/.exec(a))a=c[0];c=/[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g;c.lastIndex=0;c.test(a)&&(a=a.replace(c,function(a){return"\\u"+("0000"+a.charCodeAt(0).toString(16)).slice(-4)}));
+if(/^[\],:{}\s]*$/.test(a.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,"@").replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,"]").replace(/(?:^|:|,)(?:\s*\[)+/g,"")))return eval("("+a+")");throw"JSON parse error";}function G(a,c,g){a.addEventListener?a.addEventListener(c,g,fb):a.attachEvent&&a.attachEvent("on"+c,g)}function C(a,c,g){a.removeEventListener?a.removeEventListener(c,g,fb):a.detachEvent&&a.detachEvent("on"+c,g)}function u(a,c){this.init(a,c)}function I(a){try{delete a[ma]}catch(c){a.removeAttribute&&
+a.removeAttribute(ma)}}function E(a,c,g){if(c.indexOf(",")>=0)h(c.split(","),function(){E(a,this,g)});else{var b=a[ma]||null;b||(a[ma]=++gb,b=gb);L[b]===d&&(L[b]={});var t=L[b][c];t&&t.length>0?C(a,c,t[0]):(L[b][c]=[],L[b].el=a);t=L[b][c];t.length===0&&(t[0]=function(c){var g=c?new u(a,c):d;h(t,function(c,b){c>0&&b&&b.call(a,g)})});e(g,t)<0&&t.push(g);G(a,c,t[0])}}function T(a,c,g){if(c&&c.indexOf(",")>=0)h(c.split(","),function(){T(a,this,g)});else{var b=a[ma]||null;if(b)if(c===d)b in L&&(h(L[b],
+function(c,g){c!="el"&&g.length>0&&C(a,c,g[0])}),delete L[b],I(a));else if(L[b]){var t=L[b][c];if(t&&t.length>0){g===d?(C(a,c,t[0]),delete L[b][c]):(h(t,function(a,c){a>0&&c===g&&t.splice(a,1)}),t.length==1&&(C(a,c,t[0]),delete L[b][c]));var k=0;h(L[b],function(){k++});k<2&&(delete L[b],I(a))}}}}function qa(a,c){if(c.indexOf(",")>=0)h(c.split(","),function(){qa(a,this)});else{var g=a[ma]||null;if(g){var b=L[g][c];if(L[g]&&b&&b.length>0)b[0]()}}}function $(a,c,g){c=/^\d{2,}$/.test(c)?c:c.toUpperCase().charCodeAt(0);
+E(a,"keydown",function(b){b.ctrlKey&&b.which==c&&!b.shiftKey&&!b.altKey&&(g.call(a),b.stop())})}function M(a){for(var c={},g=/\s*([\w\-]+)\s*:([^;]*)(;|$)/g,b;b=g.exec(a);){var d=m(b[1].toLowerCase());b=m(r(b[2]));c[d]=b}return c}function K(a){for(var c={},g=/\s+(?:([\w\-:]+)|(?:([\w\-:]+)=([^\s"'<>]+))|(?:([\w\-:"]+)="([^"]*)")|(?:([\w\-:"]+)='([^']*)'))(?=(?:\s|\/|>)+)/g,b;b=g.exec(a);){var d=(b[1]||b[2]||b[4]||b[6]).toLowerCase();c[d]=(b[2]?b[3]:b[4]?b[5]:b[7])||""}return c}function O(a,c){return a=
+/\s+class\s*=/.test(a)?a.replace(/(\s+class=["']?)([^"']*)(["']?[\s>])/,function(a,b,d,k){return(" "+d+" ").indexOf(" "+c+" ")<0?d===""?b+c+k:b+d+" "+c+k:a}):a.substr(0,a.length-1)+' class="'+c+'">'}function Q(a){var c="";h(M(a),function(a,b){c+=a+":"+b+";"});return c}function R(a,c,g,b){function t(a){for(var a=a.split("/"),c=[],g=0,b=a.length;g<b;g++){var d=a[g];d==".."?c.length>0&&c.pop():d!==""&&d!="."&&c.push(d)}return"/"+c.join("/")}function k(c,g){if(a.substr(0,c.length)===c){for(var d=[],t=
+0;t<g;t++)d.push("..");t=".";d.length>0&&(t+="/"+d.join("/"));b=="/"&&(t+="/");return t+a.substr(c.length)}else if(i=/^(.*)\//.exec(c))return k(i[1],++g)}c=q(c,"").toLowerCase();a.substr(0,5)!="data:"&&(a=a.replace(/([^:])\/\//g,"$1/"));if(e(c,["absolute","relative","domain"])<0)return a;g=g||location.protocol+"//"+location.host;if(b===d)var w=location.pathname.match(/^(\/.*)\//),b=w?w[1]:"";var i;if(i=/^(\w+:\/\/[^\/]*)/.exec(a)){if(i[1]!==g)return a}else if(/^\w+:/.test(a))return a;/^\//.test(a)?
+a=g+t(a.substr(1)):/^\w+:\/\//.test(a)||(a=g+t(b+"/"+a));c==="relative"?a=k(g+b,0).substr(2):c==="absolute"&&a.substr(0,g.length)===g&&(a=a.substr(g.length));return a}function H(a,c,g,b,d){a==null&&(a="");var g=g||"",b=q(b,!1),d=q(d,"\t"),k="xx-small,x-small,small,medium,large,x-large,xx-large".split(","),a=a.replace(/(<(?:pre|pre\s[^>]*)>)([\s\S]*?)(<\/pre>)/ig,function(a,c,g,b){return c+g.replace(/<(?:br|br\s[^>]*)>/ig,"\n")+b}),a=a.replace(/<(?:br|br\s[^>]*)\s*\/?>\s*<\/p>/ig,"</p>"),a=a.replace(/(<(?:p|p\s[^>]*)>)\s*(<\/p>)/ig,
+"$1<br />$2"),a=a.replace(/\u200B/g,""),a=a.replace(/\u00A9/g,"&copy;"),a=a.replace(/\u00AE/g,"&reg;"),a=a.replace(/<[^>]+/g,function(a){return a.replace(/\s+/g," ")}),w={};c&&(h(c,function(a,c){for(var g=a.split(","),b=0,d=g.length;b<d;b++)w[g[b]]=z(c)}),w.script||(a=a.replace(/(<(?:script|script\s[^>]*)>)([\s\S]*?)(<\/script>)/ig,"")),w.style||(a=a.replace(/(<(?:style|style\s[^>]*)>)([\s\S]*?)(<\/style>)/ig,"")));var i=[],a=a.replace(/(\s*)<(\/)?([\w\-:]+)((?:\s+|(?:\s+[\w\-:]+)|(?:\s+[\w\-:]+=[^\s"'<>]+)|(?:\s+[\w\-:"]+="[^"]*")|(?:\s+[\w\-:"]+='[^']*'))*)(\/)?>(\s*)/g,
+function(a,f,n,l,o,j,s){var f=f||"",n=n||"",m=l.toLowerCase(),r=o||"",l=j?" "+j:"",s=s||"";if(c&&!w[m])return"";l===""&&hb[m]&&(l=" /");ib[m]&&(f&&(f=" "),s&&(s=" "));Ma[m]&&(n?s="\n":f="\n");b&&m=="br"&&(s="\n");if(jb[m]&&!Ma[m])if(b){n&&i.length>0&&i[i.length-1]===m?i.pop():i.push(m);s=f="\n";o=0;for(j=n?i.length:i.length-1;o<j;o++)f+=d,n||(s+=d);l?i.pop():n||(s+=d)}else f=s="";if(r!==""){var p=K(a);if(m==="font"){var v={},q="";h(p,function(a,c){if(a==="color")v.color=c,delete p[a];a==="size"&&
+(v["font-size"]=k[parseInt(c,10)-1]||"",delete p[a]);a==="face"&&(v["font-family"]=c,delete p[a]);a==="style"&&(q=c)});q&&!/;$/.test(q)&&(q+=";");h(v,function(a,c){c!==""&&(/\s/.test(c)&&(c="'"+c+"'"),q+=a+":"+c+";")});p.style=q}h(p,function(a,b){Lb[a]&&(p[a]=a);e(a,["src","href"])>=0&&(p[a]=R(b,g));(c&&a!=="style"&&!w[m]["*"]&&!w[m][a]||m==="body"&&a==="contenteditable"||/^kindeditor_\d+$/.test(a))&&delete p[a];if(a==="style"&&b!==""){var d=M(b);h(d,function(a){c&&!w[m].style&&!w[m]["."+a]&&delete d[a]});
+var V="";h(d,function(a,c){V+=a+":"+c+";"});p.style=V}});r="";h(p,function(a,c){a==="style"&&c===""||(c=c.replace(/"/g,"&quot;"),r+=" "+a+'="'+c+'"')})}m==="font"&&(m="span");return f+"<"+n+m+r+l+">"+s}),a=a.replace(/(<(?:pre|pre\s[^>]*)>)([\s\S]*?)(<\/pre>)/ig,function(a,c,g,b){return c+g.replace(/\n/g,'<span id="__kindeditor_pre_newline__">\n')+b}),a=a.replace(/\n\s*\n/g,"\n"),a=a.replace(/<span id="__kindeditor_pre_newline__">\n/g,"\n");return m(a)}function U(a,c){a=a.replace(/<meta[\s\S]*?>/ig,
+"").replace(/<![\s\S]*?>/ig,"").replace(/<style[^>]*>[\s\S]*?<\/style>/ig,"").replace(/<script[^>]*>[\s\S]*?<\/script>/ig,"").replace(/<w:[^>]+>[\s\S]*?<\/w:[^>]+>/ig,"").replace(/<o:[^>]+>[\s\S]*?<\/o:[^>]+>/ig,"").replace(/<xml>[\s\S]*?<\/xml>/ig,"").replace(/<(?:table|td)[^>]*>/ig,function(a){return a.replace(/border-bottom:([#\w\s]+)/ig,"border:$1")});return H(a,c)}function W(a){if(/\.(rm|rmvb)(\?|$)/i.test(a))return"audio/x-pn-realaudio-plugin";if(/\.(swf|flv)(\?|$)/i.test(a))return"application/x-shockwave-flash";
+return"video/x-ms-asf-plugin"}function S(a){return K(unescape(a))}function Na(a){var c="<embed ";h(a,function(a,b){c+=a+'="'+b+'" '});c+="/>";return c}function kb(a,c){var g=c.width,b=c.height,d=c.type||W(c.src),k=Na(c),w="";/\D/.test(g)?w+="width:"+g+";":g>0&&(w+="width:"+g+"px;");/\D/.test(b)?w+="height:"+b+";":b>0&&(w+="height:"+b+"px;");g=/realaudio/i.test(d)?"ke-rm":/flash/i.test(d)?"ke-flash":"ke-media";g='<img class="'+g+'" src="'+a+'" ';w!==""&&(g+='style="'+w+'" ');g+='data-ke-tag="'+escape(k)+
+'" alt="" />';return g}function Da(a,c){if(a.nodeType==9&&c.nodeType!=9)return!0;for(;c=c.parentNode;)if(c==a)return!0;return!1}function Ea(a,c){var c=c.toLowerCase(),g=null;if(!Mb&&a.nodeName.toLowerCase()!="script"){var b=a.ownerDocument.createElement("div");b.appendChild(a.cloneNode(!1));b=K(v(b.innerHTML));c in b&&(g=b[c])}else try{g=a.getAttribute(c,2)}catch(d){g=a.getAttribute(c,1)}c==="style"&&g!==null&&(g=Q(g));return g}function Fa(a,c){function g(a){if(typeof a!="string")return a;return a.replace(/([^\w\-])/g,
+"\\$1")}function b(a,c){return a==="*"||a.toLowerCase()===g(c.toLowerCase())}function d(a,c,g){var t=[];(a=(g.ownerDocument||g).getElementById(a.replace(/\\/g,"")))&&b(c,a.nodeName)&&Da(g,a)&&t.push(a);return t}function k(a,c,g){var d=g.ownerDocument||g,t=[],k,w,i;if(g.getElementsByClassName){d=g.getElementsByClassName(a.replace(/\\/g,""));k=0;for(w=d.length;k<w;k++)i=d[k],b(c,i.nodeName)&&t.push(i)}else if(d.querySelectorAll){d=d.querySelectorAll((g.nodeName!=="#document"?g.nodeName+" ":"")+c+"."+
+a);k=0;for(w=d.length;k<w;k++)i=d[k],Da(g,i)&&t.push(i)}else{d=g.getElementsByTagName(c);a=" "+a+" ";k=0;for(w=d.length;k<w;k++)if(i=d[k],i.nodeType==1)(c=i.className)&&(" "+c+" ").indexOf(a)>-1&&t.push(i)}return t}function w(a,c,b,d){for(var t=[],b=d.getElementsByTagName(b),V=0,k=b.length;V<k;V++)d=b[V],d.nodeType==1&&(c===null?Ea(d,a)!==null&&t.push(d):c===g(Ea(d,a))&&t.push(d));return t}function i(a,c){var g=[],e,f=(e=/^((?:\\.|[^.#\s\[<>])+)/.exec(a))?e[1]:"*";if(e=/#((?:[\w\-]|\\.)+)$/.exec(a))g=
+d(e[1],f,c);else if(e=/\.((?:[\w\-]|\\.)+)$/.exec(a))g=k(e[1],f,c);else if(e=/\[((?:[\w\-]|\\.)+)\]/.exec(a))g=w(e[1].toLowerCase(),null,f,c);else if(e=/\[((?:[\w\-]|\\.)+)\s*=\s*['"]?((?:\\.|[^'"]+)+)['"]?\]/.exec(a)){g=e[1].toLowerCase();e=e[2];if(g==="id")f=d(e,f,c);else if(g==="class")f=k(e,f,c);else if(g==="name"){g=[];e=(c.ownerDocument||c).getElementsByName(e.replace(/\\/g,""));for(var Z,h=0,l=e.length;h<l;h++)Z=e[h],b(f,Z.nodeName)&&Da(c,Z)&&Z.getAttribute("name")!==null&&g.push(Z);f=g}else f=
+w(g,e,f,c);g=f}else{f=c.getElementsByTagName(f);Z=0;for(h=f.length;Z<h;Z++)e=f[Z],e.nodeType==1&&g.push(e)}return g}var f=a.split(",");if(f.length>1){var n=[];h(f,function(){h(Fa(this,c),function(){e(this,n)<0&&n.push(this)})});return n}for(var c=c||document,f=[],l,o=/((?:\\.|[^\s>])+|[\s>])/g;l=o.exec(a);)l[1]!==" "&&f.push(l[1]);l=[];if(f.length==1)return i(f[0],c);var o=!1,m,s,j,r,p,v,q,B,E,u;v=0;for(lenth=f.length;v<lenth;v++)if(m=f[v],m===">")o=!0;else{if(v>0){s=[];q=0;for(E=l.length;q<E;q++){r=
+l[q];j=i(m,r);B=0;for(u=j.length;B<u;B++)p=j[B],o?r===p.parentNode&&s.push(p):s.push(p)}l=s}else l=i(m,c);if(l.length===0)return[]}return l}function ia(a){if(!a)return document;return a.ownerDocument||a.document||a}function ja(a){if(!a)return b;a=ia(a);return a.parentWindow||a.defaultView}function Nb(a,c){if(a.nodeType==1){var g=ia(a);try{a.innerHTML='<img id="__kindeditor_temp_tag__" width="0" height="0" style="display:none;" />'+c;var b=g.getElementById("__kindeditor_temp_tag__");b.parentNode.removeChild(b)}catch(d){i(a).empty(),
+i("@"+c,g).each(function(){a.appendChild(this)})}}}function Oa(a,c,g){F&&N<8&&c.toLowerCase()=="class"&&(c="className");a.setAttribute(c,""+g)}function Pa(a){if(!a||!a.nodeName)return"";return a.nodeName.toLowerCase()}function Ob(a,c){var g=ja(a),b=p(c),d="";g.getComputedStyle?(g=g.getComputedStyle(a,null),d=g[b]||g.getPropertyValue(c)||a.style[b]):a.currentStyle&&(d=a.currentStyle[b]||a.style[b]);return d}function X(a){a=a||document;return da?a.body:a.documentElement}function na(a){var a=a||document,
+c;F||Pb||Qa?(c=X(a).scrollLeft,a=X(a).scrollTop):(c=ja(a).scrollX,a=ja(a).scrollY);return{x:c,y:a}}function P(a){this.init(a)}function lb(a){a.collapsed=a.startContainer===a.endContainer&&a.startOffset===a.endOffset;return a}function Ra(a,c,g){function b(d,t,V){var k=d.nodeValue.length,i;c&&(i=d.cloneNode(!0),i=t>0?i.splitText(t):i,V<k&&i.splitText(V-t));if(g){var w=d;t>0&&(w=d.splitText(t),a.setStart(d,t));V<k&&(d=w.splitText(V-t),a.setEnd(d,0));e.push(w)}return i}function d(){g&&a.up().collapse(!0);
+for(var c=0,b=e.length;c<b;c++){var t=e[c];t.parentNode&&t.parentNode.removeChild(t)}}function k(d,t){for(var m=d.firstChild,s;m;){s=(new aa(i)).selectNode(m);h=s.compareBoundaryPoints(ra,a);h>=0&&l<=0&&(l=s.compareBoundaryPoints(sa,a));l>=0&&n<=0&&(n=s.compareBoundaryPoints(oa,a));n>=0&&o<=0&&(o=s.compareBoundaryPoints(ta,a));if(o>=0)return!1;s=m.nextSibling;if(h>0)if(m.nodeType==1)if(l>=0&&n<=0)c&&t.appendChild(m.cloneNode(!0)),g&&e.push(m);else{var j;c&&(j=m.cloneNode(!1),t.appendChild(j));if(k(m,
+j)===!1)return!1}else if(m.nodeType==3&&(m=m==f.startContainer?b(m,f.startOffset,m.nodeValue.length):m==f.endContainer?b(m,0,f.endOffset):b(m,0,m.nodeValue.length),c))try{t.appendChild(m)}catch(r){}m=s}}var i=a.doc,e=[],f=a.cloneRange().down(),h=-1,l=-1,n=-1,o=-1,m=a.commonAncestor(),s=i.createDocumentFragment();if(m.nodeType==3)return m=b(m,a.startOffset,a.endOffset),c&&s.appendChild(m),d(),c?s:a;k(m,s);g&&a.up().collapse(!0);for(var m=0,j=e.length;m<j;m++){var r=e[m];r.parentNode&&r.parentNode.removeChild(r)}return c?
+s:a}function ua(a,c){for(var g=c;g;){var b=i(g);if(b.name=="marquee"||b.name=="select")return;g=g.parentNode}try{a.moveToElementText(c)}catch(d){}}function mb(a,c){var g=a.parentElement().ownerDocument,b=a.duplicate();b.collapse(c);var d=b.parentElement(),k=d.childNodes;if(k.length===0)return{node:d.parentNode,offset:i(d).index()};var w=g,e=0,f=-1,h=a.duplicate();ua(h,d);for(var l=0,n=k.length;l<n;l++){var o=k[l],f=h.compareEndPoints("StartToStart",b);if(f===0)return{node:o.parentNode,offset:l};if(o.nodeType==
+1){var m=a.duplicate(),s,j=i(o),r=o;j.isControl()&&(s=g.createElement("span"),j.after(s),r=s,e+=j.text().replace(/\r\n|\n|\r/g,"").length);ua(m,r);h.setEndPoint("StartToEnd",m);f>0?e+=m.text.replace(/\r\n|\n|\r/g,"").length:e=0;s&&i(s).remove()}else o.nodeType==3&&(h.moveStart("character",o.nodeValue.length),e+=o.nodeValue.length);f<0&&(w=o)}if(f<0&&w.nodeType==1)return{node:d,offset:i(d.lastChild).index()+1};if(f>0)for(;w.nextSibling&&w.nodeType==1;)w=w.nextSibling;h=a.duplicate();ua(h,d);h.setEndPoint("StartToEnd",
+b);e-=h.text.replace(/\r\n|\n|\r/g,"").length;if(f>0&&w.nodeType==3)for(g=w.previousSibling;g&&g.nodeType==3;)e-=g.nodeValue.length,g=g.previousSibling;return{node:w,offset:e}}function nb(a,c){var g=a.ownerDocument||a,b=g.body.createTextRange();if(g==a)return b.collapse(!0),b;if(a.nodeType==1&&a.childNodes.length>0){var d=a.childNodes,k;c===0?(k=d[0],d=!0):(k=d[c-1],d=!1);if(!k)return b;if(i(k).name==="head")return c===1&&(d=!0),c===2&&(d=!1),b.collapse(d),b;if(k.nodeType==1){var w=i(k),e;w.isControl()&&
+(e=g.createElement("span"),d?w.before(e):w.after(e),k=e);ua(b,k);b.collapse(d);e&&i(e).remove();return b}a=k;c=d?0:k.nodeValue.length}g=g.createElement("span");i(a).before(g);ua(b,g);b.moveStart("character",c);i(g).remove();return b}function ob(a){function c(a){if(i(a.node).name=="tr")a.node=a.node.cells[a.offset],a.offset=0}var g;if(Y){if(a.item)return g=ia(a.item(0)),g=new aa(g),g.selectNode(a.item(0)),g;g=a.parentElement().ownerDocument;var b=mb(a,!0),a=mb(a,!1);c(b);c(a);g=new aa(g);g.setStart(b.node,
+b.offset);g.setEnd(a.node,a.offset);return g}b=a.startContainer;g=b.ownerDocument||b;g=new aa(g);g.setStart(b,a.startOffset);g.setEnd(a.endContainer,a.endOffset);return g}function aa(a){this.init(a)}function Sa(a){if(!a.nodeName)return a.constructor===aa?a:ob(a);return new aa(a)}function ea(a,c,g){try{a.execCommand(c,!1,g)}catch(b){}}function pb(a,c){var g="";try{g=a.queryCommandValue(c)}catch(b){}typeof g!=="string"&&(g="");return g}function Ta(a){var c=ja(a);return Y?a.selection:c.getSelection()}
+function qb(a){var c={},g,b;h(a,function(a,d){g=a.split(",");for(var i=0,e=g.length;i<e;i++)b=g[i],c[b]=d});return c}function Ua(a,c){return rb(a,c,"*")||rb(a,c)}function rb(a,c,g){g=g||a.name;if(a.type!==1)return!1;c=qb(c);if(!c[g])return!1;for(var g=c[g].split(","),c=0,b=g.length;c<b;c++){var d=g[c];if(d==="*")return!0;var k=/^(\.?)([^=]+)(?:=([^=]*))?$/.exec(d),i=k[1]?"css":"attr",d=k[2],k=k[3]||"";if(k===""&&a[i](d)!=="")return!0;if(k!==""&&a[i](d)===k)return!0}return!1}function Va(a,c){a.type==
+1&&(sb(a,c,"*"),sb(a,c))}function sb(a,c,g){g=g||a.name;if(a.type===1&&(c=qb(c),c[g])){for(var g=c[g].split(","),c=!1,b=0,d=g.length;b<d;b++){var k=g[b];if(k==="*"){c=!0;break}var i=/^(\.?)([^=]+)(?:=([^=]*))?$/.exec(k),k=i[2];i[1]?(k=p(k),a[0].style[k]&&(a[0].style[k]="")):a.removeAttr(k)}c&&a.remove(!0)}}function Wa(a){for(;a.first();)a=a.first();return a}function pa(a){if(a.type!=1||a.isSingle())return!1;return a.html().replace(/<[^>]+>/g,"")===""}function Qb(a,c,g){h(c,function(c,g){c!=="style"&&
+a.attr(c,g)});h(g,function(c,g){a.css(c,g)})}function va(a){this.init(a)}function tb(a){a.nodeName&&(a=ia(a),a=Sa(a).selectNodeContents(a.body).collapse(!1));return new va(a)}function Xa(a){var c=a.moveEl,g=a.moveFn,b=a.clickEl||c,t=a.beforeDrag,k=[document];(a.iframeFix===d||a.iframeFix)&&i("iframe").each(function(){if(!/^https?:\/\//.test(R(this.src||"","absolute"))){var a;try{a=Ya(this)}catch(c){}if(a){var g=i(this).pos();i(a).data("pos-x",g.x);i(a).data("pos-y",g.y);k.push(a)}}});b.mousedown(function(a){function d(a){a.preventDefault();
+var c=i(ia(a.target)),t=fa((c.data("pos-x")||0)+a.pageX-j),a=fa((c.data("pos-y")||0)+a.pageY-r);g.call(b,n,o,m,s,t,a)}function e(a){a.preventDefault()}function f(a){a.preventDefault();i(k).unbind("mousemove",d).unbind("mouseup",f).unbind("selectstart",e);h.releaseCapture&&h.releaseCapture()}a.stopPropagation();var h=b.get(),n=l(c.css("left")),o=l(c.css("top")),m=c.width(),s=c.height(),j=a.pageX,r=a.pageY;t&&t();i(k).mousemove(d).mouseup(f).bind("selectstart",e);h.setCapture&&h.setCapture()})}function ga(a){this.init(a)}
+function Za(a){return new ga(a)}function Ya(a){a=i(a)[0];return a.contentDocument||a.contentWindow.document}function Rb(a,c,g,b){var d=[$a===""?"<html>":'<html dir="'+$a+'">','<head><meta charset="utf-8" /><title></title>',"<style>","html {margin:0;padding:0;}","body {margin:0;padding:5px;}",'body, td {font:12px/1.5 "sans serif",tahoma,verdana,helvetica;}',"body, p, div {word-wrap: break-word;}","p {margin:5px 0;}","table {border-collapse:collapse;}","img {border:0;}","noscript {display:none;}","table.ke-zeroborder td {border:1px dotted #AAA;}",
+"img.ke-flash {","\tborder:1px solid #AAA;","\tbackground-image:url("+a+"common/flash.gif);","\tbackground-position:center center;","\tbackground-repeat:no-repeat;","\twidth:100px;","\theight:100px;","}","img.ke-rm {","\tborder:1px solid #AAA;","\tbackground-image:url("+a+"common/rm.gif);","\tbackground-position:center center;","\tbackground-repeat:no-repeat;","\twidth:100px;","\theight:100px;","}","img.ke-media {","\tborder:1px solid #AAA;","\tbackground-image:url("+a+"common/media.gif);","\tbackground-position:center center;",
+"\tbackground-repeat:no-repeat;","\twidth:100px;","\theight:100px;","}","img.ke-anchor {","\tborder:1px dashed #666;","\twidth:16px;","\theight:16px;","}",".ke-script, .ke-noscript, .ke-display-none {","\tdisplay:none;","\tfont-size:0;","\twidth:0;","\theight:0;","}",".ke-pagebreak {","\tborder:1px dotted #AAA;","\tfont-size:0;","\theight:2px;","}","</style>"];f(g)||(g=[g]);h(g,function(a,c){c&&d.push('<link href="'+c+'" rel="stylesheet" />')});b&&d.push("<style>"+b+"</style>");d.push("</head><body "+
+(c?'class="'+c+'"':"")+"></body></html>");return d.join("\n")}function wa(a,c){if(a.hasVal()){if(c===d){var g=a.val();return g=g.replace(/(<(?:p|p\s[^>]*)>) *(<\/p>)/ig,"")}return a.val(c)}return a.html(c)}function xa(a){this.init(a)}function ub(a){return new xa(a)}function vb(a,c){var g=this.get(a);g&&!g.hasClass("ke-disabled")&&c(g)}function Ga(a){this.init(a)}function wb(a){return new Ga(a)}function ya(a){this.init(a)}function ab(a){return new ya(a)}function za(a){this.init(a)}function xb(a){return new za(a)}
+function bb(a){this.init(a)}function Aa(a){this.init(a)}function yb(a){return new Aa(a)}function cb(a,c){var g=document.getElementsByTagName("head")[0]||(da?document.body:document.documentElement),b=document.createElement("script");g.appendChild(b);b.src=a;b.charset="utf-8";b.onload=b.onreadystatechange=function(){if(!this.readyState||this.readyState==="loaded")c&&c(),b.onload=b.onreadystatechange=null,g.removeChild(b)}}function zb(a){var c=a.indexOf("?");return c>0?a.substr(0,c):a}function db(a){for(var c=
+document.getElementsByTagName("head")[0]||(da?document.body:document.documentElement),g=document.createElement("link"),b=zb(R(a,"absolute")),d=i('link[rel="stylesheet"]',c),k=0,w=d.length;k<w;k++)if(zb(R(d[k].href,"absolute"))===b)return;c.appendChild(g);g.href=a;g.rel="stylesheet"}function Ab(a,c){if(a===d)return ba;if(!c)return ba[a];ba[a]=c}function Bb(a){var c,g="core";if(c=/^(\w+)\.(\w+)$/.exec(a))g=c[1],a=c[2];return{ns:g,key:a}}function Cb(a,c){c=c===d?i.options.langType:c;if(typeof a==="string"){if(!ca[c])return"no language";
+var g=a.length-1;if(a.substr(g)===".")return ca[c][a.substr(0,g)];g=Bb(a);return ca[c][g.ns][g.key]}h(a,function(a,g){var b=Bb(a);ca[c]||(ca[c]={});ca[c][b.ns]||(ca[c][b.ns]={});ca[c][b.ns][b.key]=g})}function Ha(a,c){if(!a.collapsed){var a=a.cloneRange().up(),g=a.startContainer,b=a.startOffset;if(ka||a.isControl())if((g=i(g.childNodes[b]))&&g.name=="img"&&c(g))return g}}function Sb(){var a=this;i(a.edit.doc).contextmenu(function(c){a.menu&&a.hideMenu();if(a.useContextmenu){if(a._contextmenus.length!==
+0){var g=0,b=[];for(h(a._contextmenus,function(){if(this.title=="-")b.push(this);else if(this.cond&&this.cond()&&(b.push(this),this.width&&this.width>g))g=this.width});b.length>0&&b[0].title=="-";)b.shift();for(;b.length>0&&b[b.length-1].title=="-";)b.pop();var d=null;h(b,function(a){this.title=="-"&&d.title=="-"&&delete b[a];d=this});if(b.length>0){c.preventDefault();var k=i(a.edit.iframe).pos(),w=ab({x:k.x+c.clientX,y:k.y+c.clientY,width:g,css:{visibility:"hidden"},shadowMode:a.shadowMode});h(b,
+function(){this.title&&w.addItem(this)});var k=X(w.doc),e=w.div.height();c.clientY+e>=k.clientHeight-100&&w.pos(w.x,l(w.y)-e);w.div.css("visibility","visible");a.menu=w}}}else c.preventDefault()})}function Tb(){function a(a){for(a=i(a.commonAncestor());a;){if(a.type==1&&!a.isStyle())break;a=a.parent()}return a.name}var c=this,g=c.edit.doc,b=c.newlineTag;if(!(F&&b!=="br")&&(!la||!(N<3&&b!=="p"))&&!(Qa&&N<9)){var d=z("h1,h2,h3,h4,h5,h6,pre,li"),k=z("p,h1,h2,h3,h4,h5,h6,pre,li,blockquote");i(g).keydown(function(i){if(!(i.which!=
+13||i.shiftKey||i.ctrlKey||i.altKey)){c.cmd.selection();var e=a(c.cmd.range);e=="marquee"||e=="select"||(b==="br"&&!d[e]?(i.preventDefault(),c.insertHtml("<br />"+(F&&N<9?"":"\u200b"))):k[e]||ea(g,"formatblock","<p>"))}});i(g).keyup(function(d){if(!(d.which!=13||d.shiftKey||d.ctrlKey||d.altKey)&&b!="br")if(la){var d=c.cmd.commonAncestor("p"),t=c.cmd.commonAncestor("a");t&&t.text()==""&&(t.remove(!0),c.cmd.range.selectNodeContents(d[0]).collapse(!0),c.cmd.select())}else if(c.cmd.selection(),d=a(c.cmd.range),
+!(d=="marquee"||d=="select"))if(k[d]||ea(g,"formatblock","<p>"),d=c.cmd.commonAncestor("div")){for(var t=i("<p></p>"),e=d[0].firstChild;e;){var f=e.nextSibling;t.append(e);e=f}d.before(t);d.remove();c.cmd.range.selectNodeContents(t[0]);c.cmd.select()}})}}function Ub(){var a=this,c=a.edit.doc;i(c).keydown(function(g){if(g.which==9)if(g.preventDefault(),a.afterTab)a.afterTab.call(a,g);else{var g=a.cmd,b=g.range;b.shrink();b.collapsed&&b.startContainer.nodeType==1&&(b.insertNode(i("@&nbsp;",c)[0]),g.select());
+a.insertHtml("&nbsp;&nbsp;&nbsp;&nbsp;")}})}function Vb(){var a=this;i(a.edit.textarea[0],a.edit.win).focus(function(c){a.afterFocus&&a.afterFocus.call(a,c)}).blur(function(c){a.afterBlur&&a.afterBlur.call(a,c)})}function ha(a){return m(a.replace(/<span [^>]*id="?__kindeditor_bookmark_\w+_\d+__"?[^>]*><\/span>/ig,""))}function Ia(a){return a.replace(/<div[^>]+class="?__kindeditor_paste__"?[^>]*>[\s\S]*?<\/div>/ig,"")}function Db(a,c){if(a.length===0)a.push(c);else{var g=a[a.length-1];ha(c.html)!==
+ha(g.html)&&a.push(c)}}function Eb(a,c){var g=this.edit,b=g.doc.body,d,k;if(a.length===0)return this;g.designMode?(d=this.cmd.range,k=d.createBookmark(!0),k.html=b.innerHTML):k={html:b.innerHTML};Db(c,k);var e=a.pop();ha(k.html)===ha(e.html)&&a.length>0&&(e=a.pop());g.designMode?(g.html(e.html),e.start&&(d.moveToBookmark(e),this.select())):i(b).html(ha(e.html));return this}function Ba(a){function c(a,c){Ba.prototype[a]===d&&(g[a]=c);g.options[a]=c}var g=this;g.options={};h(a,function(g){c(g,a[g])});
+h(i.options,function(a,b){g[a]===d&&c(a,b)});var b=i(g.srcElement||"<textarea/>");if(!g.width)g.width=b[0].style.width||b.width();if(!g.height)g.height=b[0].style.height||b.height();c("width",q(g.width,g.minWidth));c("height",q(g.height,g.minHeight));c("width",o(g.width));c("height",o(g.height));if(Wb&&(!Xb||N<534))g.designMode=!1;g.srcElement=b;g.initContent="";g.plugin={};g.isCreated=!1;g._handlers={};g._contextmenus=[];g._undoStack=[];g._redoStack=[];g._firstAddBookmark=!0;g.menu=g.contextmenu=
+null;g.dialogs=[]}function Fb(a,c){function g(a){h(ba,function(c,g){j(g)&&g.call(a,KindEditor)});return a.create()}c=c||{};c.basePath=q(c.basePath,i.basePath);c.themesPath=q(c.themesPath,c.basePath+"themes/");c.langPath=q(c.langPath,c.basePath+"lang/");c.pluginsPath=q(c.pluginsPath,c.basePath+"plugins/");if(q(c.loadStyleMode,i.options.loadStyleMode)){var b=q(c.themeType,i.options.themeType);db(c.themesPath+"default/default.css");db(c.themesPath+b+"/"+b+".css")}if((b=i(a))&&b.length!==0){if(b.length>
+1)return b.each(function(){Fb(this,c)}),_instances[0];c.srcElement=b[0];var d=new Ba(c);_instances.push(d);if(ca[d.langType])return g(d);cb(d.langPath+d.langType+".js?ver="+encodeURIComponent(i.DEBUG?Ja:Ka),function(){g(d)});return d}}function Ca(a,c){i(a).each(function(a,b){i.each(_instances,function(a,g){if(g&&g.srcElement[0]==b)return c.call(g,a),!1})})}if(!b.KindEditor){if(!b.console)b.console={};if(!console.log)console.log=function(){};var Ka="4.1.10 (2013-11-23)",J=navigator.userAgent.toLowerCase(),
+F=J.indexOf("msie")>-1&&J.indexOf("opera")==-1,Pb=J.indexOf("msie")==-1&&J.indexOf("trident")>-1,la=J.indexOf("gecko")>-1&&J.indexOf("khtml")==-1,ka=J.indexOf("applewebkit")>-1,Qa=J.indexOf("opera")>-1,Wb=J.indexOf("mobile")>-1,Xb=/ipad|iphone|ipod/.test(J),da=document.compatMode!="CSS1Compat",Y=!b.getSelection,N=(J=/(?:msie|firefox|webkit|opera)[\/:\s](\d+)/.exec(J))?J[1]:"0",Ja=(new Date).getTime(),fa=Math.round,i={DEBUG:!1,VERSION:Ka,IE:F,GECKO:la,WEBKIT:ka,OPERA:Qa,V:N,TIME:Ja,each:h,isArray:f,
+isFunction:j,inArray:e,inString:n,trim:m,addUnit:o,removeUnit:l,escape:s,unescape:v,toCamel:p,toHex:r,toMap:z,toArray:D,undef:q,invalidUrl:function(a){return!a||/[<>"]/.test(a)},addParam:function(a,c){return a.indexOf("?")>=0?a+"&"+c:a+"?"+c},extend:A,json:B},ib=z("a,abbr,acronym,b,basefont,bdo,big,br,button,cite,code,del,dfn,em,font,i,img,input,ins,kbd,label,map,q,s,samp,select,small,span,strike,strong,sub,sup,textarea,tt,u,var"),jb=z("address,applet,blockquote,body,center,dd,dir,div,dl,dt,fieldset,form,frameset,h1,h2,h3,h4,h5,h6,head,hr,html,iframe,ins,isindex,li,map,menu,meta,noframes,noscript,object,ol,p,pre,script,style,table,tbody,td,tfoot,th,thead,title,tr,ul"),
+hb=z("area,base,basefont,br,col,frame,hr,img,input,isindex,link,meta,param,embed"),Gb=z("b,basefont,big,del,em,font,i,s,small,span,strike,strong,sub,sup,u"),Yb=z("img,table,input,textarea,button"),Ma=z("pre,style,script"),La=z("html,head,body,td,tr,table,ol,ul,li");z("colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr");var Lb=z("checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected"),Hb=z("input,button,textarea,select");i.basePath=function(){for(var a=
+document.getElementsByTagName("script"),c,g=0,b=a.length;g<b;g++)if(c=a[g].src||"",/kindeditor[\w\-\.]*\.js/.test(c))return c.substring(0,c.lastIndexOf("/")+1);return""}();i.options={designMode:!0,fullscreenMode:!1,filterMode:!0,wellFormatMode:!0,shadowMode:!0,loadStyleMode:!0,basePath:i.basePath,themesPath:i.basePath+"themes/",langPath:i.basePath+"lang/",pluginsPath:i.basePath+"plugins/",themeType:"default",langType:"zh_CN",urlType:"",newlineTag:"p",resizeType:2,syncType:"form",pasteType:2,dialogAlignType:"page",
+useContextmenu:!0,fullscreenShortcut:!1,bodyClass:"ke-content",indentChar:"\t",cssPath:"",cssData:"",minWidth:650,minHeight:100,minChangeSize:50,zIndex:811213,items:["source","|","undo","redo","|","preview","print","template","code","cut","copy","paste","plainpaste","wordpaste","|","justifyleft","justifycenter","justifyright","justifyfull","insertorderedlist","insertunorderedlist","indent","outdent","subscript","superscript","clearhtml","quickformat","selectall","|","fullscreen","/","formatblock",
+"fontname","fontsize","|","forecolor","hilitecolor","bold","italic","underline","strikethrough","lineheight","removeformat","|","image","table","hr","emoticons","baidumap","pagebreak","anchor","link","unlink","|","about"],noDisableItems:["source","fullscreen"],colorTable:[["#E53333","#E56600","#FF9900","#64451D","#DFC5A4","#FFE500"],["#009900","#006600","#99BB00","#B8D100","#60D978","#00D5FF"],["#337FE5","#003399","#4C33E5","#9933E5","#CC33E5","#EE33EE"],
+["#FFFFFF","#CCCCCC","#999999","#666666","#333333","#000000"]],fontSizeTable:["9px","10px","12px","14px","16px","18px","24px","32px"],htmlTags:{font:["id","class","color","size","face",".background-color"],span:["id","class",".color",".background-color",".font-size",".font-family",".background",".font-weight",".font-style",".text-decoration",".vertical-align",".line-height"],div:["id","class","align",".border",".margin",".padding",".text-align",".color",".background-color",".font-size",".font-family",
+".font-weight",".background",".font-style",".text-decoration",".vertical-align",".margin-left"],table:["id","class","border","cellspacing","cellpadding","width","height","align","bordercolor",".padding",".margin",".border","bgcolor",".text-align",".color",".background-color",".font-size",".font-family",".font-weight",".font-style",".text-decoration",".background",".width",".height",".border-collapse"],"td,th":["id","class","align","valign","width","height","colspan","rowspan","bgcolor",".text-align",
+".color",".background-color",".font-size",".font-family",".font-weight",".font-style",".text-decoration",".vertical-align",".background",".border"],a:["id","class","href","target","name"],embed:["id","class","src","width","height","type","loop","autostart","quality",".width",".height","align","allowscriptaccess"],img:["id","class","src","width","height","border","alt","title","align",".width",".height",".border"],"p,ol,ul,li,blockquote,h1,h2,h3,h4,h5,h6":["id","class","align",".text-align",".color",
+".background-color",".font-size",".font-family",".background",".font-weight",".font-style",".text-decoration",".vertical-align",".text-indent",".margin-left"],pre:["id","class"],hr:["id","class",".page-break-after"],"br,tbody,tr,strong,b,sub,sup,em,i,u,strike,s,del":["id","class"],iframe:["id","class","src","frameborder","width","height",".width",".height"]},layout:'<div class="container"><div class="toolbar"></div><div class="edit"></div><div class="statusbar"></div></div>'};var fb=!1,Ib=z("8,9,13,32,46,48..57,59,61,65..90,106,109..111,188,190..192,219..222"),
+J=z("33..40"),eb={};h(Ib,function(a,c){eb[a]=c});h(J,function(a,c){eb[a]=c});var Zb="altKey,attrChange,attrName,bubbles,button,cancelable,charCode,clientX,clientY,ctrlKey,currentTarget,data,detail,eventPhase,fromElement,handler,keyCode,metaKey,newValue,offsetX,offsetY,originalTarget,pageX,pageY,prevValue,relatedNode,relatedTarget,screenX,screenY,shiftKey,srcElement,target,toElement,view,wheelDelta,which".split(",");A(u,{init:function(a,c){var g=this,b=a.ownerDocument||a.document||a;g.event=c;h(Zb,
+function(a,b){g[b]=c[b]});if(!g.target)g.target=g.srcElement||b;if(g.target.nodeType===3)g.target=g.target.parentNode;if(!g.relatedTarget&&g.fromElement)g.relatedTarget=g.fromElement===g.target?g.toElement:g.fromElement;if(g.pageX==null&&g.clientX!=null){var t=b.documentElement,b=b.body;g.pageX=g.clientX+(t&&t.scrollLeft||b&&b.scrollLeft||0)-(t&&t.clientLeft||b&&b.clientLeft||0);g.pageY=g.clientY+(t&&t.scrollTop||b&&b.scrollTop||0)-(t&&t.clientTop||b&&b.clientTop||0)}if(!g.which&&(g.charCode||g.charCode===
+0?g.charCode:g.keyCode))g.which=g.charCode||g.keyCode;if(!g.metaKey&&g.ctrlKey)g.metaKey=g.ctrlKey;if(!g.which&&g.button!==d)g.which=g.button&1?1:g.button&2?3:g.button&4?2:0;switch(g.which){case 186:g.which=59;break;case 187:case 107:case 43:g.which=61;break;case 189:case 45:g.which=109;break;case 42:g.which=106;break;case 47:g.which=111;break;case 78:g.which=110}g.which>=96&&g.which<=105&&(g.which-=48)},preventDefault:function(){var a=this.event;a.preventDefault?a.preventDefault():a.returnValue=
+!1},stopPropagation:function(){var a=this.event;a.stopPropagation?a.stopPropagation():a.cancelBubble=!0},stop:function(){this.preventDefault();this.stopPropagation()}});var ma="kindeditor_"+Ja,gb=0,L={},Jb=!1;F&&b.attachEvent("onunload",function(){h(L,function(a,c){c.el&&T(c.el)})});i.ctrl=$;i.ready=function(a){function c(){t||(t=!0,a(KindEditor),Jb=!0)}function g(){if(!t){try{document.documentElement.doScroll("left")}catch(a){setTimeout(g,100);return}c()}}function d(){document.readyState==="complete"&&
+c()}if(Jb)a(KindEditor);else{var t=!1;if(document.addEventListener)E(document,"DOMContentLoaded",c);else if(document.attachEvent){E(document,"readystatechange",d);var k=!1;try{k=b.frameElement==null}catch(i){}document.documentElement.doScroll&&k&&g()}E(b,"load",c)}};i.formatUrl=R;i.formatHtml=H;i.getCssList=M;i.getAttrList=K;i.mediaType=W;i.mediaAttrs=S;i.mediaEmbed=Na;i.mediaImg=kb;i.clearMsWord=U;i.tmpl=function(a,c){var g=new Function("obj","var p=[],print=function(){p.push.apply(p,arguments);};with(obj){p.push('"+
+a.replace(/[\r\t\n]/g," ").split("<%").join("\t").replace(/((^|%>)[^\t]*)'/g,"$1\r").replace(/\t=(.*?)%>/g,"',$1,'").split("\t").join("');").split("%>").join("p.push('").split("\r").join("\\'")+"');}return p.join('');");return c?g(c):g};J=document.createElement("div");J.setAttribute("className","t");var Mb=J.className!=="t";i.query=function(a,c){var g=Fa(a,c);return g.length>0?g[0]:null};i.queryAll=Fa;A(P,{init:function(a){for(var a=f(a)?a:[a],c=0,g=0,b=a.length;g<b;g++)a[g]&&(this[g]=a[g].constructor===
+P?a[g][0]:a[g],c++);this.length=c;this.doc=ia(this[0]);this.name=Pa(this[0]);this.type=this.length>0?this[0].nodeType:null;this.win=ja(this[0])},each:function(a){for(var c=0;c<this.length;c++)if(a.call(this[c],c,this[c])===!1)break;return this},bind:function(a,c){this.each(function(){E(this,a,c)});return this},unbind:function(a,c){this.each(function(){T(this,a,c)});return this},fire:function(a){if(this.length<1)return this;qa(this[0],a);return this},hasAttr:function(a){if(this.length<1)return!1;return!!Ea(this[0],
+a)},attr:function(a,c){var g=this;if(a===d)return K(g.outer());if(typeof a==="object")return h(a,function(a,c){g.attr(a,c)}),g;if(c===d)return c=g.length<1?null:Ea(g[0],a),c===null?"":c;g.each(function(){Oa(this,a,c)});return g},removeAttr:function(a){this.each(function(){var c=a;F&&N<8&&c.toLowerCase()=="class"&&(c="className");Oa(this,c,"");this.removeAttribute(c)});return this},get:function(a){if(this.length<1)return null;return this[a||0]},eq:function(a){if(this.length<1)return null;return this[a]?
+new P(this[a]):null},hasClass:function(a){if(this.length<1)return!1;return n(a,this[0].className," ")},addClass:function(a){this.each(function(){if(!n(a,this.className," "))this.className=m(this.className+" "+a)});return this},removeClass:function(a){this.each(function(){if(n(a,this.className," "))this.className=m(this.className.replace(RegExp("(^|\\s)"+a+"(\\s|$)")," "))});return this},html:function(a){if(a===d){if(this.length<1||this.type!=1)return"";return H(this[0].innerHTML)}this.each(function(){Nb(this,
+a)});return this},text:function(){if(this.length<1)return"";return F?this[0].innerText:this[0].textContent},hasVal:function(){if(this.length<1)return!1;return!!Hb[Pa(this[0])]},val:function(a){if(a===d){if(this.length<1)return"";return this.hasVal()?this[0].value:this.attr("value")}else return this.each(function(){Hb[Pa(this)]?this.value=a:Oa(this,"value",a)}),this},css:function(a,c){var g=this;if(a===d)return M(g.attr("style"));if(typeof a==="object")return h(a,function(a,c){g.css(a,c)}),g;if(c===
+d){if(g.length<1)return"";return g[0].style[p(a)]||Ob(g[0],a)||""}g.each(function(){this.style[p(a)]=c});return g},width:function(a){if(a===d){if(this.length<1)return 0;return this[0].offsetWidth}return this.css("width",o(a))},height:function(a){if(a===d){if(this.length<1)return 0;return this[0].offsetHeight}return this.css("height",o(a))},opacity:function(a){this.each(function(){this.style.opacity===d?this.style.filter=a==1?"":"alpha(opacity="+a*100+")":this.style.opacity=a==1?"":a});return this},
+data:function(a,c){a="kindeditor_data_"+a;if(c===d){if(this.length<1)return null;return this[0][a]}this.each(function(){this[a]=c});return this},pos:function(){var a=this[0],c=0,g=0;if(a)if(a.getBoundingClientRect)a=a.getBoundingClientRect(),g=na(this.doc),c=a.left+g.x,g=a.top+g.y;else for(;a;)c+=a.offsetLeft,g+=a.offsetTop,a=a.offsetParent;return{x:fa(c),y:fa(g)}},clone:function(a){if(this.length<1)return new P([]);return new P(this[0].cloneNode(a))},append:function(a){this.each(function(){this.appendChild&&
+this.appendChild(i(a)[0])});return this},appendTo:function(a){this.each(function(){i(a)[0].appendChild(this)});return this},before:function(a){this.each(function(){this.parentNode.insertBefore(i(a)[0],this)});return this},after:function(a){this.each(function(){this.nextSibling?this.parentNode.insertBefore(i(a)[0],this.nextSibling):this.parentNode.appendChild(i(a)[0])});return this},replaceWith:function(a){var c=[];this.each(function(g,b){T(b);var d=i(a)[0];b.parentNode.replaceChild(d,b);c.push(d)});
+return i(c)},empty:function(){this.each(function(a,c){for(var b=c.firstChild;b;){if(!c.parentNode)break;var d=b.nextSibling;b.parentNode.removeChild(b);b=d}});return this},remove:function(a){var c=this;c.each(function(b,d){if(d.parentNode){T(d);if(a)for(var i=d.firstChild;i;){var k=i.nextSibling;d.parentNode.insertBefore(i,d);i=k}d.parentNode.removeChild(d);delete c[b]}});c.length=0;return c},show:function(a){a===d&&(a=this._originDisplay||"");if(this.css("display")!="none")return this;return this.css("display",
+a)},hide:function(){if(this.length<1)return this;this._originDisplay=this[0].style.display;return this.css("display","none")},outer:function(){if(this.length<1)return"";var a=this.doc.createElement("div");a.appendChild(this[0].cloneNode(!0));return H(a.innerHTML)},isSingle:function(){return!!hb[this.name]},isInline:function(){return!!ib[this.name]},isBlock:function(){return!!jb[this.name]},isStyle:function(){return!!Gb[this.name]},isControl:function(){return!!Yb[this.name]},contains:function(a){if(this.length<
+1)return!1;return Da(this[0],i(a)[0])},parent:function(){if(this.length<1)return null;var a=this[0].parentNode;return a?new P(a):null},children:function(){if(this.length<1)return new P([]);for(var a=[],c=this[0].firstChild;c;)(c.nodeType!=3||m(c.nodeValue)!=="")&&a.push(c),c=c.nextSibling;return new P(a)},first:function(){var a=this.children();return a.length>0?a.eq(0):null},last:function(){var a=this.children();return a.length>0?a.eq(a.length-1):null},index:function(){if(this.length<1)return-1;for(var a=
+-1,c=this[0];c;)a++,c=c.previousSibling;return a},prev:function(){if(this.length<1)return null;var a=this[0].previousSibling;return a?new P(a):null},next:function(){if(this.length<1)return null;var a=this[0].nextSibling;return a?new P(a):null},scan:function(a,c){function b(d){for(d=c?d.firstChild:d.lastChild;d;){var i=c?d.nextSibling:d.previousSibling;if(a(d)===!1)return!1;if(b(d)===!1)return!1;d=i}}if(!(this.length<1))return c=c===d?!0:c,b(this[0]),this}});h("blur,focus,focusin,focusout,load,resize,scroll,unload,click,dblclick,mousedown,mouseup,mousemove,mouseover,mouseout,mouseenter,mouseleave,change,select,submit,keydown,keypress,keyup,error,contextmenu".split(","),
+function(a,c){P.prototype[c]=function(a){return a?this.bind(c,a):this.fire(c)}});J=i;i=function(a,c){function b(a){a[0]||(a=[]);return new P(a)}if(!(a===d||a===null)){if(typeof a==="string"){c&&(c=i(c)[0]);var e=a.length;a.charAt(0)==="@"&&(a=a.substr(1));if(a.length!==e||/<.+>/.test(a)){var e=(c?c.ownerDocument||c:document).createElement("div"),t=[];e.innerHTML='<img id="__kindeditor_temp_tag__" width="0" height="0" style="display:none;" />'+a;for(var k=0,w=e.childNodes.length;k<w;k++){var h=e.childNodes[k];
+h.id!="__kindeditor_temp_tag__"&&t.push(h)}return b(t)}return b(Fa(a,c))}if(a&&a.constructor===P)return a;a.toArray&&(a=a.toArray());if(f(a))return b(a);return b(D(arguments))}};h(J,function(a,c){i[a]=c});i.NodeClass=P;b.KindEditor=i;var sa=0,ra=1,oa=2,ta=3,Kb=0;A(aa,{init:function(a){this.startContainer=a;this.startOffset=0;this.endContainer=a;this.endOffset=0;this.collapsed=!0;this.doc=a},commonAncestor:function(){function a(a){for(var c=[];a;)c.push(a),a=a.parentNode;return c}for(var c=a(this.startContainer),
+b=a(this.endContainer),d=0,i=c.length,k=b.length,e,f;++d;)if(e=c[i-d],f=b[k-d],!e||!f||e!==f)break;return c[i-d+1]},setStart:function(a,c){var b=this.doc;this.startContainer=a;this.startOffset=c;if(this.endContainer===b)this.endContainer=a,this.endOffset=c;return lb(this)},setEnd:function(a,c){var b=this.doc;this.endContainer=a;this.endOffset=c;if(this.startContainer===b)this.startContainer=a,this.startOffset=c;return lb(this)},setStartBefore:function(a){return this.setStart(a.parentNode||this.doc,
+i(a).index())},setStartAfter:function(a){return this.setStart(a.parentNode||this.doc,i(a).index()+1)},setEndBefore:function(a){return this.setEnd(a.parentNode||this.doc,i(a).index())},setEndAfter:function(a){return this.setEnd(a.parentNode||this.doc,i(a).index()+1)},selectNode:function(a){return this.setStartBefore(a).setEndAfter(a)},selectNodeContents:function(a){var c=i(a);if(c.type==3||c.isSingle())return this.selectNode(a);c=c.children();if(c.length>0)return this.setStartBefore(c[0]).setEndAfter(c[c.length-
+1]);return this.setStart(a,0).setEnd(a,0)},collapse:function(a){if(a)return this.setEnd(this.startContainer,this.startOffset);return this.setStart(this.endContainer,this.endOffset)},compareBoundaryPoints:function(a,c){var b=this.get(),d=c.get();if(Y){var t={};t[sa]="StartToStart";t[ra]="EndToStart";t[oa]="EndToEnd";t[ta]="StartToEnd";b=b.compareEndPoints(t[a],d);if(b!==0)return b;var k,e,f,h;if(a===sa||a===ta)k=this.startContainer,f=this.startOffset;if(a===ra||a===oa)k=this.endContainer,f=this.endOffset;
+if(a===sa||a===ra)e=c.startContainer,h=c.startOffset;if(a===oa||a===ta)e=c.endContainer,h=c.endOffset;if(k===e)return k=f-h,k>0?1:k<0?-1:0;for(b=e;b&&b.parentNode!==k;)b=b.parentNode;if(b)return i(b).index()>=f?-1:1;for(b=k;b&&b.parentNode!==e;)b=b.parentNode;if(b)return i(b).index()>=h?1:-1;if((b=i(e).next())&&b.contains(k))return 1;if((b=i(k).next())&&b.contains(e))return-1}else return b.compareBoundaryPoints(a,d)},cloneRange:function(){return(new aa(this.doc)).setStart(this.startContainer,this.startOffset).setEnd(this.endContainer,
+this.endOffset)},toString:function(){var a=this.get();return(Y?a.text:a.toString()).replace(/\r\n|\n|\r/g,"")},cloneContents:function(){return Ra(this,!0,!1)},deleteContents:function(){return Ra(this,!1,!0)},extractContents:function(){return Ra(this,!0,!0)},insertNode:function(a){var c=this.startContainer,b=this.startOffset,d=this.endContainer,i=this.endOffset,k,e,f,h=1;if(a.nodeName.toLowerCase()==="#document-fragment")k=a.firstChild,e=a.lastChild,h=a.childNodes.length;c.nodeType==1?(f=c.childNodes[b])?
+(c.insertBefore(a,f),c===d&&(i+=h)):c.appendChild(a):c.nodeType==3&&(b===0?(c.parentNode.insertBefore(a,c),c.parentNode===d&&(i+=h)):b>=c.nodeValue.length?c.nextSibling?c.parentNode.insertBefore(a,c.nextSibling):c.parentNode.appendChild(a):(f=b>0?c.splitText(b):c,c.parentNode.insertBefore(a,f),c===d&&(d=f,i-=b)));k?this.setStartBefore(k).setEndAfter(e):this.selectNode(a);if(this.compareBoundaryPoints(oa,this.cloneRange().setEnd(d,i))>=1)return this;return this.setEnd(d,i)},surroundContents:function(a){a.appendChild(this.extractContents());
+return this.insertNode(a).selectNode(a)},isControl:function(){var a=this.startContainer,c=this.startOffset,b=this.endContainer,d=this.endOffset;return a.nodeType==1&&a===b&&c+1===d&&i(a.childNodes[c]).isControl()},get:function(a){var c=this.doc;if(!Y){c=c.createRange();try{c.setStart(this.startContainer,this.startOffset),c.setEnd(this.endContainer,this.endOffset)}catch(b){}return c}if(a&&this.isControl())return c=c.body.createControlRange(),c.addElement(this.startContainer.childNodes[this.startOffset]),
+c;a=this.cloneRange().down();c=c.body.createTextRange();c.setEndPoint("StartToStart",nb(a.startContainer,a.startOffset));c.setEndPoint("EndToStart",nb(a.endContainer,a.endOffset));return c},html:function(){return i(this.cloneContents()).outer()},down:function(){function a(a,b,d){if(a.nodeType==1&&(a=i(a).children(),a.length!==0)){var k,e,f,h;b>0&&(k=a.eq(b-1));b<a.length&&(e=a.eq(b));if(k&&k.type==3)f=k[0],h=f.nodeValue.length;e&&e.type==3&&(f=e[0],h=0);f&&(d?c.setStart(f,h):c.setEnd(f,h))}}var c=
+this;a(c.startContainer,c.startOffset,!0);a(c.endContainer,c.endOffset,!1);return c},up:function(){function a(a,b,d){a.nodeType==3&&(b===0?d?c.setStartBefore(a):c.setEndBefore(a):b==a.nodeValue.length&&(d?c.setStartAfter(a):c.setEndAfter(a)))}var c=this;a(c.startContainer,c.startOffset,!0);a(c.endContainer,c.endOffset,!1);return c},enlarge:function(a){function c(c,d,k){c=i(c);if(!(c.type==3||La[c.name]||!a&&c.isBlock()))if(d===0){for(;!c.prev();){d=c.parent();if(!d||La[d.name]||!a&&d.isBlock())break;
+c=d}k?b.setStartBefore(c[0]):b.setEndBefore(c[0])}else if(d==c.children().length){for(;!c.next();){d=c.parent();if(!d||La[d.name]||!a&&d.isBlock())break;c=d}k?b.setStartAfter(c[0]):b.setEndAfter(c[0])}}var b=this;b.up();c(b.startContainer,b.startOffset,!0);c(b.endContainer,b.endOffset,!1);return b},shrink:function(){for(var a,c=this.collapsed;this.startContainer.nodeType==1&&(a=this.startContainer.childNodes[this.startOffset])&&a.nodeType==1&&!i(a).isSingle();)this.setStart(a,0);if(c)return this.collapse(c);
+for(;this.endContainer.nodeType==1&&this.endOffset>0&&(a=this.endContainer.childNodes[this.endOffset-1])&&a.nodeType==1&&!i(a).isSingle();)this.setEnd(a,a.childNodes.length);return this},createBookmark:function(a){var c,b=i('<span style="display:none;"></span>',this.doc)[0];b.id="__kindeditor_bookmark_start_"+Kb++ +"__";if(!this.collapsed)c=b.cloneNode(!0),c.id="__kindeditor_bookmark_end_"+Kb++ +"__";c&&this.cloneRange().collapse(!1).insertNode(c).setEndBefore(c);this.insertNode(b).setStartAfter(b);
+return{start:a?"#"+b.id:b,end:c?a?"#"+c.id:c:null}},moveToBookmark:function(a){var c=this.doc,b=i(a.start,c),a=a.end?i(a.end,c):null;if(!b||b.length<1)return this;this.setStartBefore(b[0]);b.remove();a&&a.length>0?(this.setEndBefore(a[0]),a.remove()):this.collapse(!0);return this},dump:function(){console.log("--------------------");console.log(this.startContainer.nodeType==3?this.startContainer.nodeValue:this.startContainer,this.startOffset);console.log(this.endContainer.nodeType==3?this.endContainer.nodeValue:
+this.endContainer,this.endOffset)}});i.RangeClass=aa;i.range=Sa;i.START_TO_START=sa;i.START_TO_END=ra;i.END_TO_END=oa;i.END_TO_START=ta;A(va,{init:function(a){var c=a.doc;this.doc=c;this.win=ja(c);this.sel=Ta(c);this.range=a},selection:function(a){var c=this.doc,b;b=Ta(c);var d;try{d=b.rangeCount>0?b.getRangeAt(0):b.createRange()}catch(e){}b=Y&&(!d||!d.item&&d.parentElement().ownerDocument!==c)?null:d;this.sel=Ta(c);if(b)return this.range=Sa(b),i(this.range.startContainer).name=="html"&&this.range.selectNodeContents(c.body).collapse(!1),
+this;a&&this.range.selectNodeContents(c.body).collapse(!1);return this},select:function(a){var a=q(a,!0),c=this.sel,b=this.range.cloneRange().shrink(),d=b.startContainer,e=b.startOffset,k=ia(d),f=this.win,h,l=!1;if(a&&d.nodeType==1&&b.collapsed){if(Y){c=i("<span>&nbsp;</span>",k);b.insertNode(c[0]);h=k.body.createTextRange();try{h.moveToElementText(c[0])}catch(n){}h.collapse(!1);h.select();c.remove();f.focus();return this}if(ka&&(a=d.childNodes,i(d).isInline()||e>0&&i(a[e-1]).isInline()||a[e]&&i(a[e]).isInline()))b.insertNode(k.createTextNode("\u200b")),
+l=!0}if(Y)try{h=b.get(!0),h.select()}catch(o){}else l&&b.collapse(!1),h=b.get(!0),c.removeAllRanges(),c.addRange(h),k!==document&&(b=i(h.endContainer).pos(),f.scrollTo(b.x,b.y));f.focus();return this},wrap:function(a){var c=this.range,b;b=i(a,this.doc);if(c.collapsed)return c.shrink(),c.insertNode(b[0]).selectNodeContents(b[0]),this;if(b.isBlock()){for(var d=a=b.clone(!0);d.first();)d=d.first();d.append(c.extractContents());c.insertNode(a[0]).selectNode(a[0]);return this}c.enlarge();var e=c.createBookmark(),
+a=c.commonAncestor(),k=!1;i(a).scan(function(a){if(!k&&a==e.start)k=!0;else if(k){if(a==e.end)return!1;var c=i(a),d;a:{for(d=c;d&&d.name!="body";){if(Ma[d.name]||d.name=="div"&&d.hasClass("ke-script")){d=!0;break a}d=d.parent()}d=!1}if(!d&&c.type==3&&m(a.nodeValue).length>0){for(var f;(f=c.parent())&&f.isStyle()&&f.children().length==1;)c=f;f=b;f=f.clone(!0);if(c.type==3)Wa(f).append(c.clone(!1)),c.replaceWith(f);else{for(var a=c,h;(h=c.first())&&h.children().length==1;)c=h;h=c.first();for(c=c.doc.createDocumentFragment();h;)c.appendChild(h[0]),
+h=h.next();h=a.clone(!0);d=Wa(h);for(var l=h,n=!1;f;){for(;l;)l.name===f.name&&(Qb(l,f.attr(),f.css()),n=!0),l=l.first();n||d.append(f.clone(!1));n=!1;f=f.first()}f=h;c.firstChild&&Wa(f).append(c);a.replaceWith(f)}}}});c.moveToBookmark(e);return this},split:function(a,c){for(var b=this.range,d=b.doc,e=b.cloneRange().collapse(a),k=e.startContainer,f=e.startOffset,h=k.nodeType==3?k.parentNode:k,l=!1,n;h&&h.parentNode;){n=i(h);if(c){if(!n.isStyle())break;if(!Ua(n,c))break}else if(La[n.name])break;l=
+!0;h=h.parentNode}if(l)d=d.createElement("span"),b.cloneRange().collapse(!a).insertNode(d),a?e.setStartBefore(h.firstChild).setEnd(k,f):e.setStart(k,f).setEndAfter(h.lastChild),k=e.extractContents(),f=k.firstChild,l=k.lastChild,a?(e.insertNode(k),b.setStartAfter(l).setEndBefore(d)):(h.appendChild(k),b.setStartBefore(d).setEndBefore(f)),e=d.parentNode,e==b.endContainer&&(h=i(d).prev(),k=i(d).next(),h&&k&&h.type==3&&k.type==3?b.setEnd(h[0],h[0].nodeValue.length):a||b.setEnd(b.endContainer,b.endOffset-
+1)),e.removeChild(d);return this},remove:function(a){var c=this.doc,b=this.range;b.enlarge();if(b.startOffset===0){for(var d=i(b.startContainer),e;(e=d.parent())&&e.isStyle()&&e.children().length==1;)d=e;b.setStart(d[0],0);d=i(b.startContainer);d.isBlock()&&Va(d,a);(d=d.parent())&&d.isBlock()&&Va(d,a)}if(b.collapsed){this.split(!0,a);c=b.startContainer;d=b.startOffset;if(d>0&&(e=i(c.childNodes[d-1]))&&pa(e))e.remove(),b.setStart(c,d-1);(d=i(c.childNodes[d]))&&pa(d)&&d.remove();pa(c)&&(b.startBefore(c),
+c.remove());b.collapse(!0);return this}this.split(!0,a);this.split(!1,a);var k=c.createElement("span"),f=c.createElement("span");b.cloneRange().collapse(!1).insertNode(f);b.cloneRange().collapse(!0).insertNode(k);var l=[],n=!1;i(b.commonAncestor()).scan(function(a){if(!n&&a==k)n=!0;else{if(a==f)return!1;n&&l.push(a)}});i(k).remove();i(f).remove();c=b.startContainer;d=b.startOffset;e=b.endContainer;var o=b.endOffset;if(d>0){var m=i(c.childNodes[d-1]);m&&pa(m)&&(m.remove(),b.setStart(c,d-1),c==e&&b.setEnd(e,
+o-1));if((d=i(c.childNodes[d]))&&pa(d))d.remove(),c==e&&b.setEnd(e,o-1)}(c=i(e.childNodes[b.endOffset]))&&pa(c)&&c.remove();c=b.createBookmark(!0);h(l,function(c,b){Va(i(b),a)});b.moveToBookmark(c);return this},commonNode:function(a){function c(c){for(var b=c;c;){if(Ua(i(c),a))return i(c);c=c.parentNode}for(;b&&(b=b.lastChild);)if(Ua(i(b),a))return i(b);return null}var b=this.range,d=b.endContainer,b=b.endOffset,e=d.nodeType==3||b===0?d:d.childNodes[b-1],k=c(e);if(k)return k;if(e.nodeType==1||d.nodeType==
+3&&b===0)if(d=i(e).prev())return c(d);return null},commonAncestor:function(a){function c(c){for(;c;){if(c.nodeType==1&&c.tagName.toLowerCase()===a)return c;c=c.parentNode}return null}var b=this.range,d=b.startContainer,e=b.startOffset,k=b.endContainer,b=b.endOffset,k=k.nodeType==3||b===0?k:k.childNodes[b-1],d=c(d.nodeType==3||e===0?d:d.childNodes[e-1]),e=c(k);if(d&&e&&d===e)return i(d);return null},state:function(a){var c=this.doc,b=!1;try{b=c.queryCommandState(a)}catch(d){}return b},val:function(a){var c=
+this.doc,a=a.toLowerCase(),b="";if(a==="fontfamily"||a==="fontname")return b=pb(c,"fontname"),b=b.replace(/['"]/g,""),b.toLowerCase();if(a==="formatblock"){b=pb(c,a);if(b===""&&(a=this.commonNode({"h1,h2,h3,h4,h5,h6,p,div,pre,address":"*"})))b=a.name;b==="Normal"&&(b="p");return b.toLowerCase()}if(a==="fontsize")return(a=this.commonNode({"*":".font-size"}))&&(b=a.css("font-size")),b.toLowerCase();if(a==="forecolor")return(a=this.commonNode({"*":".color"}))&&(b=a.css("color")),b=r(b),b===""&&(b="default"),
+b.toLowerCase();if(a==="hilitecolor")return(a=this.commonNode({"*":".background-color"}))&&(b=a.css("background-color")),b=r(b),b===""&&(b="default"),b.toLowerCase();return b},toggle:function(a,c){this.commonNode(c)?this.remove(c):this.wrap(a);return this.select()},bold:function(){return this.toggle("<strong></strong>",{span:".font-weight=bold",strong:"*",b:"*"})},italic:function(){return this.toggle("<em></em>",{span:".font-style=italic",em:"*",i:"*"})},underline:function(){return this.toggle("<u></u>",
+{span:".text-decoration=underline",u:"*"})},strikethrough:function(){return this.toggle("<s></s>",{span:".text-decoration=line-through",s:"*"})},forecolor:function(a){return this.wrap('<span style="color:'+a+';"></span>').select()},hilitecolor:function(a){return this.wrap('<span style="background-color:'+a+';"></span>').select()},fontsize:function(a){return this.wrap('<span style="font-size:'+a+';"></span>').select()},fontname:function(a){return this.fontfamily(a)},fontfamily:function(a){return this.wrap('<span style="font-family:'+
+a+';"></span>').select()},removeformat:function(){var a={"*":".font-weight,.font-style,.text-decoration,.color,.background-color,.font-size,.font-family,.text-indent"};h(Gb,function(c){a[c]="*"});this.remove(a);return this.select()},inserthtml:function(a,c){function b(a,c){var c='<img id="__kindeditor_temp_tag__" width="0" height="0" style="display:none;" />'+c,d=a.get();d.item?d.item(0).outerHTML=c:d.pasteHTML(c);var g=a.doc.getElementById("__kindeditor_temp_tag__");g.parentNode.removeChild(g);d=
+ob(d);a.setEnd(d.endContainer,d.endOffset);a.collapse(!1);e.select(!1)}function d(a,c){var b=a.doc,g=b.createDocumentFragment();i("@"+c,b).each(function(){g.appendChild(this)});a.deleteContents();a.insertNode(g);a.collapse(!1);e.select(!1)}var e=this,k=e.range;if(a==="")return e;if(Y&&c){try{b(k,a)}catch(f){d(k,a)}return e}d(k,a);return e},hr:function(){return this.inserthtml("<hr />")},print:function(){this.win.print();return this},insertimage:function(a,c,b,d,e,i){c=q(c,"");q(e,0);a='<img src="'+
+s(a)+'" data-ke-src="'+s(a)+'" ';b&&(a+='width="'+s(b)+'" ');d&&(a+='height="'+s(d)+'" ');c&&(a+='title="'+s(c)+'" ');i&&(a+='align="'+s(i)+'" ');a+='alt="'+s(c)+'" ';a+="/>";return this.inserthtml(a)},createlink:function(a,c){function b(a,c,d){i(a).attr("href",c).attr("data-ke-src",c);d?i(a).attr("target",d):i(a).removeAttr("target")}var d=this.doc,e=this.range;this.select();var k=this.commonNode({a:"*"});k&&!e.isControl()&&(e.selectNode(k.get()),this.select());k='<a href="'+s(a)+'" data-ke-src="'+
+s(a)+'" ';c&&(k+=' target="'+s(c)+'"');if(e.collapsed)return k+=">"+s(a)+"</a>",this.inserthtml(k);if(e.isControl()){var f=i(e.startContainer.childNodes[e.startOffset]);k+="></a>";f.after(i(k,d));f.next().append(f);e.selectNode(f[0]);return this.select()}var k=e.startContainer,f=e.startOffset,h=e.endContainer,e=e.endOffset;if(k.nodeType==1&&k===h&&f+1===e&&(e=k.childNodes[f],e.nodeName.toLowerCase()=="a"))return b(e,a,c),this;ea(d,"createlink","__kindeditor_temp_url__");i('a[href="__kindeditor_temp_url__"]',
+d).each(function(){b(this,a,c)});return this},unlink:function(){var a=this.doc,c=this.range;this.select();if(c.collapsed){var b=this.commonNode({a:"*"});b&&(c.selectNode(b.get()),this.select());ea(a,"unlink",null);ka&&i(c.startContainer).name==="img"&&(a=i(c.startContainer).parent(),a.name==="a"&&a.remove(!0))}else ea(a,"unlink",null);return this}});h("formatblock,selectall,justifyleft,justifycenter,justifyright,justifyfull,insertorderedlist,insertunorderedlist,indent,outdent,subscript,superscript".split(","),
+function(a,c){va.prototype[c]=function(a){this.select();ea(this.doc,c,a);Y&&e(c,"justifyleft,justifycenter,justifyright,justifyfull".split(","))>=0&&this.selection();(!Y||e(c,"formatblock,selectall,insertorderedlist,insertunorderedlist".split(","))>=0)&&this.selection();return this}});h("cut,copy,paste".split(","),function(a,c){va.prototype[c]=function(){if(!this.doc.queryCommandSupported(c))throw"not supported";this.select();ea(this.doc,c,null);return this}});i.CmdClass=va;i.cmd=tb;A(ga,{init:function(a){var c=
+this;c.name=a.name||"";c.doc=a.doc||document;c.win=ja(c.doc);c.x=o(a.x);c.y=o(a.y);c.z=a.z;c.width=o(a.width);c.height=o(a.height);c.div=i('<div style="display:block;"></div>');c.options=a;c._alignEl=a.alignEl;c.width&&c.div.css("width",c.width);c.height&&c.div.css("height",c.height);c.z&&c.div.css({position:"absolute",left:c.x,top:c.y,"z-index":c.z});c.z&&(c.x===d||c.y===d)&&c.autoPos(c.width,c.height);a.cls&&c.div.addClass(a.cls);a.shadowMode&&c.div.addClass("ke-shadow");a.css&&c.div.css(a.css);
+a.src?i(a.src).replaceWith(c.div):i(c.doc.body).append(c.div);a.html&&c.div.html(a.html);if(a.autoScroll)if(F&&N<7||da){var b=na();i(c.win).bind("scroll",function(){var a=na(),d=a.x-b.x,a=a.y-b.y;c.pos(l(c.x)+d,l(c.y)+a,!1)})}else c.div.css("position","fixed")},pos:function(a,c,b){b=q(b,!0);if(a!==null&&(a=a<0?0:o(a),this.div.css("left",a),b))this.x=a;if(c!==null&&(c=c<0?0:o(c),this.div.css("top",c),b))this.y=c;return this},autoPos:function(a,c){var b=l(a)||0,d=l(c)||0,e=na();if(this._alignEl){var k=
+i(this._alignEl),f=k.pos(),b=fa(k[0].clientWidth/2-b/2),d=fa(k[0].clientHeight/2-d/2);x=b<0?f.x:f.x+b;y=d<0?f.y:f.y+d}else f=X(this.doc),x=fa(e.x+(f.clientWidth-b)/2),y=fa(e.y+(f.clientHeight-d)/2);F&&N<7||da||(x-=e.x,y-=e.y);return this.pos(x,y)},remove:function(){var a=this;(F&&N<7||da)&&i(a.win).unbind("scroll");a.div.remove();h(a,function(c){a[c]=null});return this},show:function(){this.div.show();return this},hide:function(){this.div.hide();return this},draggable:function(a){var c=this,a=a||
+{};a.moveEl=c.div;a.moveFn=function(a,b,d,e,i,f){if((a+=i)<0)a=0;if((b+=f)<0)b=0;c.pos(a,b)};Xa(a);return c}});i.WidgetClass=ga;i.widget=Za;var $a="";if(J=document.getElementsByTagName("html"))$a=J[0].dir;A(xa,ga,{init:function(a){function c(){var c=Ya(b.iframe);c.open();if(h)c.domain=document.domain;c.write(Rb(d,e,k,f));c.close();b.win=b.iframe[0].contentWindow;b.doc=c;var l=tb(c);b.afterChange(function(){l.selection()});ka&&i(c).click(function(a){i(a.target).name==="img"&&(l.selection(!0),l.range.selectNode(a.target),
+l.select())});if(F)b._mousedownHandler=function(){var a=l.range.cloneRange();a.shrink();a.isControl()&&b.blur()},i(document).mousedown(b._mousedownHandler),i(c).keydown(function(a){if(a.which==8){l.selection();var c=l.range;c.isControl()&&(c.collapse(!0),i(c.startContainer.childNodes[c.startOffset]).remove(),a.preventDefault())}});b.cmd=l;b.html(wa(b.srcElement));F?(c.body.disabled=!0,c.body.contentEditable=!0,c.body.removeAttribute("disabled")):c.designMode="on";a.afterCreate&&a.afterCreate.call(b)}
+var b=this;xa.parent.init.call(b,a);b.srcElement=i(a.srcElement);b.div.addClass("ke-edit");b.designMode=q(a.designMode,!0);b.beforeGetHtml=a.beforeGetHtml;b.beforeSetHtml=a.beforeSetHtml;b.afterSetHtml=a.afterSetHtml;var d=q(a.themesPath,""),e=a.bodyClass,k=a.cssPath,f=a.cssData,h=location.protocol!="res:"&&location.host.replace(/:\d+/,"")!==document.domain,l="document.open();"+(h?'document.domain="'+document.domain+'";':"")+"document.close();",l=F?' src="javascript:void(function(){'+encodeURIComponent(l)+
+'}())"':"";b.iframe=i('<iframe class="ke-edit-iframe" hidefocus="true" frameborder="0"'+l+"></iframe>").css("width","100%");b.textarea=i('<textarea class="ke-edit-textarea" hidefocus="true"></textarea>').css("width","100%");b.tabIndex=isNaN(parseInt(a.tabIndex,10))?b.srcElement.attr("tabindex"):parseInt(a.tabIndex,10);b.iframe.attr("tabindex",b.tabIndex);b.textarea.attr("tabindex",b.tabIndex);b.width&&b.setWidth(b.width);b.height&&b.setHeight(b.height);b.designMode?b.textarea.hide():b.iframe.hide();
+h&&b.iframe.bind("load",function(){b.iframe.unbind("load");F?c():setTimeout(c,0)});b.div.append(b.iframe);b.div.append(b.textarea);b.srcElement.hide();!h&&c()},setWidth:function(a){this.width=a=o(a);this.div.css("width",a);return this},setHeight:function(a){this.height=a=o(a);this.div.css("height",a);this.iframe.css("height",a);if(F&&N<8||da)a=o(l(a)-2);this.textarea.css("height",a);return this},remove:function(){var a=this.doc;i(a.body).unbind();i(a).unbind();i(this.win).unbind();this._mousedownHandler&&
+i(document).unbind("mousedown",this._mousedownHandler);wa(this.srcElement,this.html());this.srcElement.show();a.write("");this.iframe.unbind();this.textarea.unbind();xa.parent.remove.call(this)},html:function(a,c){var b=this.doc;if(this.designMode){b=b.body;if(a===d)return a=c?"<!doctype html><html>"+b.parentNode.innerHTML+"</html>":b.innerHTML,this.beforeGetHtml&&(a=this.beforeGetHtml(a)),la&&a=="<br />"&&(a=""),a;this.beforeSetHtml&&(a=this.beforeSetHtml(a));F&&N>=9&&(a=a.replace(/(<.*?checked=")checked(".*>)/ig,
+"$1$2"));i(b).html(a);this.afterSetHtml&&this.afterSetHtml();return this}if(a===d)return this.textarea.val();this.textarea.val(a);return this},design:function(a){if(a===d?!this.designMode:a){if(!this.designMode)a=this.html(),this.designMode=!0,this.html(a),this.textarea.hide(),this.iframe.show()}else if(this.designMode)a=this.html(),this.designMode=!1,this.html(a),this.iframe.hide(),this.textarea.show();return this.focus()},focus:function(){this.designMode?this.win.focus():this.textarea[0].focus();
+return this},blur:function(){if(F){var a=i('<input type="text" style="float:left;width:0;height:0;padding:0;margin:0;border:0;" value="" />',this.div);this.div.append(a);a[0].focus();a.remove()}else this.designMode?this.win.blur():this.textarea[0].blur();return this},afterChange:function(a){function c(c){setTimeout(function(){a(c)},1)}var b=this.doc,d=b.body;i(b).keyup(function(c){!c.ctrlKey&&!c.altKey&&eb[c.which]&&a(c)});i(b).mouseup(a).contextmenu(a);i(this.win).blur(a);i(d).bind("paste",c);i(d).bind("cut",
+c);return this}});i.EditClass=xa;i.edit=ub;i.iframeDoc=Ya;A(Ga,ga,{init:function(a){function c(a){a=i(a);if(a.hasClass("ke-outline"))return a;if(a.hasClass("ke-toolbar-icon"))return a.parent()}function b(a,d){var g=c(a.target);if(g&&!g.hasClass("ke-disabled")&&!g.hasClass("ke-selected"))g[d]("ke-on")}var d=this;Ga.parent.init.call(d,a);d.disableMode=q(a.disableMode,!1);d.noDisableItemMap=z(q(a.noDisableItems,[]));d._itemMap={};d.div.addClass("ke-toolbar").bind("contextmenu,mousedown,mousemove",function(a){a.preventDefault()}).attr("unselectable",
+"on");d.div.mouseover(function(a){b(a,"addClass")}).mouseout(function(a){b(a,"removeClass")}).click(function(a){var b=c(a.target);b&&!b.hasClass("ke-disabled")&&d.options.click.call(this,a,b.attr("data-name"))})},get:function(a){if(this._itemMap[a])return this._itemMap[a];return this._itemMap[a]=i("span.ke-icon-"+a,this.div).parent()},select:function(a){vb.call(this,a,function(a){a.addClass("ke-selected")});return self},unselect:function(a){vb.call(this,a,function(a){a.removeClass("ke-selected").removeClass("ke-on")});
+return self},enable:function(a){if(a=a.get?a:this.get(a))a.removeClass("ke-disabled"),a.opacity(1);return this},disable:function(a){if(a=a.get?a:this.get(a))a.removeClass("ke-selected").addClass("ke-disabled"),a.opacity(0.5);return this},disableAll:function(a,c){var b=this,e=b.noDisableItemMap;c&&(e=z(c));(a===d?!b.disableMode:a)?(i("span.ke-outline",b.div).each(function(){var a=i(this),c=a[0].getAttribute("data-name",2);e[c]||b.disable(a)}),b.disableMode=!0):(i("span.ke-outline",b.div).each(function(){var a=
+i(this),c=a[0].getAttribute("data-name",2);e[c]||b.enable(a)}),b.disableMode=!1);return b}});i.ToolbarClass=Ga;i.toolbar=wb;A(ya,ga,{init:function(a){a.z=a.z||811213;ya.parent.init.call(this,a);this.centerLineMode=q(a.centerLineMode,!0);this.div.addClass("ke-menu").bind("click,mousedown",function(a){a.stopPropagation()}).attr("unselectable","on")},addItem:function(a){if(a.title==="-")this.div.append(i('<div class="ke-menu-separator"></div>'));else{var c=i('<div class="ke-menu-item" unselectable="on"></div>'),
+b=i('<div class="ke-inline-block ke-menu-item-left"></div>'),d=i('<div class="ke-inline-block ke-menu-item-right"></div>'),e=o(a.height),f=q(a.iconClass,"");this.div.append(c);e&&(c.css("height",e),d.css("line-height",e));var h;this.centerLineMode&&(h=i('<div class="ke-inline-block ke-menu-item-center"></div>'),e&&h.css("height",e));c.mouseover(function(){i(this).addClass("ke-menu-item-on");h&&h.addClass("ke-menu-item-center-on")}).mouseout(function(){i(this).removeClass("ke-menu-item-on");h&&h.removeClass("ke-menu-item-center-on")}).click(function(c){a.click.call(i(this));
+c.stopPropagation()}).append(b);h&&c.append(h);c.append(d);a.checked&&(f="ke-icon-checked");f!==""&&b.html('<span class="ke-inline-block ke-toolbar-icon ke-toolbar-icon-url '+f+'"></span>');d.html(a.title);return this}},remove:function(){this.options.beforeRemove&&this.options.beforeRemove.call(this);i(".ke-menu-item",this.div[0]).unbind();ya.parent.remove.call(this);return this}});i.MenuClass=ya;i.menu=ab;A(za,ga,{init:function(a){a.z=a.z||811213;za.parent.init.call(this,a);var c=a.colors||[["#E53333",
+"#E56600","#FF9900","#64451D","#DFC5A4","#FFE500"],["#009900","#006600","#99BB00","#B8D100","#60D978","#00D5FF"],["#337FE5","#003399","#4C33E5","#9933E5","#CC33E5","#EE33EE"],["#FFFFFF","#CCCCCC","#999999","#666666","#333333","#000000"]];this.selectedColor=(a.selectedColor||"").toLowerCase();this._cells=[];this.div.addClass("ke-colorpicker").bind("click,mousedown",function(a){a.stopPropagation()}).attr("unselectable","on");a=this.doc.createElement("table");this.div.append(a);a.className="ke-colorpicker-table";
+a.cellPadding=0;a.cellSpacing=0;a.border=0;var b=a.insertRow(0),d=b.insertCell(0);d.colSpan=c[0].length;this._addAttr(d,"","ke-colorpicker-cell-top");for(var e=0;e<c.length;e++)for(var b=a.insertRow(e+1),i=0;i<c[e].length;i++)d=b.insertCell(i),this._addAttr(d,c[e][i],"ke-colorpicker-cell")},_addAttr:function(a,c,b){var d=this,a=i(a).addClass(b);d.selectedColor===c.toLowerCase()&&a.addClass("ke-colorpicker-cell-selected");a.attr("title",c||d.options.noColor);a.mouseover(function(){i(this).addClass("ke-colorpicker-cell-on")});
+a.mouseout(function(){i(this).removeClass("ke-colorpicker-cell-on")});a.click(function(a){a.stop();d.options.click.call(i(this),c)});c?a.append(i('<div class="ke-colorpicker-cell-color" unselectable="on"></div>').css("background-color",c)):a.html(d.options.noColor);i(a).attr("unselectable","on");d._cells.push(a)},remove:function(){h(this._cells,function(){this.unbind()});za.parent.remove.call(this);return this}});i.ColorPickerClass=za;i.colorpicker=xb;A(bb,{init:function(a){var c=i(a.button),b=a.fieldName||
+"file",d=a.url||"",e=c.val(),f=a.extraParams||{},h=c[0].className||"",l=a.target||"kindeditor_upload_iframe_"+(new Date).getTime();a.afterError=a.afterError||function(a){alert(a)};var n=[],o;for(o in f)n.push('<input type="hidden" name="'+o+'" value="'+f[o]+'" />');b=['<div class="ke-inline-block '+h+'">',a.target?"":'<iframe name="'+l+'" style="display:none;"></iframe>',a.form?'<div class="ke-upload-area">':'<form class="ke-upload-area ke-form" method="post" enctype="multipart/form-data" target="'+
+l+'" action="'+d+'">','<span class="ke-button-common">',n.join(""),'<input type="button" class="ke-button-common ke-button" value="'+e+'" />',"</span>",'<input type="file" class="ke-upload-file" name="'+b+'" tabindex="-1" />',a.form?"</div>":"</form>","</div>"].join("");b=i(b,c.doc);c.hide();c.before(b);this.div=b;this.button=c;this.iframe=a.target?i('iframe[name="'+l+'"]'):i("iframe",b);this.form=a.form?i(a.form):i("form",b);this.fileBox=i(".ke-upload-file",b);c=a.width||i(".ke-button-common",b).width();
+i(".ke-upload-area",b).width(c);this.options=a},submit:function(){var a=this,c=a.iframe;c.bind("load",function(){c.unbind();var b=document.createElement("form");a.fileBox.before(b);i(b).append(a.fileBox);b.reset();i(b).remove(!0);var b=i.iframeDoc(c),d=b.getElementsByTagName("pre")[0],e="",f,e=d?d.innerHTML:b.body.innerHTML,e=v(e);c[0].src="javascript:false";try{f=i.json(e)}catch(h){a.options.afterError.call(a,"<!doctype html><html>"+b.body.parentNode.innerHTML+"</html>")}f&&a.options.afterUpload.call(a,
+f)});a.form[0].submit();return a},remove:function(){this.fileBox&&this.fileBox.unbind();this.iframe.remove();this.div.remove();this.button.show();return this}});i.UploadButtonClass=bb;i.uploadbutton=function(a){return new bb(a)};A(Aa,ga,{init:function(a){var c=q(a.shadowMode,!0);a.z=a.z||811213;a.shadowMode=!1;a.autoScroll=q(a.autoScroll,!0);Aa.parent.init.call(this,a);var b=a.title,d=i(a.body,this.doc),e=a.previewBtn,f=a.yesBtn,n=a.noBtn,o=a.closeBtn,m=q(a.showMask,!0);this.div.addClass("ke-dialog").bind("click,mousedown",
+function(a){a.stopPropagation()});var s=i('<div class="ke-dialog-content"></div>').appendTo(this.div);F&&N<7?this.iframeMask=i('<iframe src="about:blank" class="ke-dialog-shadow"></iframe>').appendTo(this.div):c&&i('<div class="ke-dialog-shadow"></div>').appendTo(this.div);c=i('<div class="ke-dialog-header"></div>');s.append(c);c.html(b);this.closeIcon=i('<span class="ke-dialog-icon-close" title="'+o.name+'"></span>').click(o.click);c.append(this.closeIcon);this.draggable({clickEl:c,beforeDrag:a.beforeDrag});
+a=i('<div class="ke-dialog-body"></div>');s.append(a);a.append(d);var j=i('<div class="ke-dialog-footer"></div>');(e||f||n)&&s.append(j);h([{btn:e,name:"preview"},{btn:f,name:"yes"},{btn:n,name:"no"}],function(){if(this.btn){var a=this.btn,a=a||{},c=a.name||"",b=i('<span class="ke-button-common ke-button-outer" title="'+c+'"></span>'),c=i('<input class="ke-button-common ke-button" type="button" value="'+c+'" />');a.click&&c.click(a.click);b.append(c);b.addClass("ke-dialog-"+this.name);j.append(b)}});
+this.height&&a.height(l(this.height)-c.height()-j.height());this.div.width(this.div.width());this.div.height(this.div.height());this.mask=null;if(m)d=X(this.doc),this.mask=Za({x:0,y:0,z:this.z-1,cls:"ke-dialog-mask",width:Math.max(d.scrollWidth,d.clientWidth),height:Math.max(d.scrollHeight,d.clientHeight)});this.autoPos(this.div.width(),this.div.height());this.footerDiv=j;this.bodyDiv=a;this.headerDiv=c;this.isLoading=!1},setMaskIndex:function(a){this.mask.div.css("z-index",a)},showLoading:function(a){var a=
+q(a,""),c=this.bodyDiv;this.loading=i('<div class="ke-dialog-loading"><div class="ke-inline-block ke-dialog-loading-content" style="margin-top:'+Math.round(c.height()/3)+'px;">'+a+"</div></div>").width(c.width()).height(c.height()).css("top",this.headerDiv.height()+"px");c.css("visibility","hidden").after(this.loading);this.isLoading=!0;return this},hideLoading:function(){this.loading&&this.loading.remove();this.bodyDiv.css("visibility","visible");this.isLoading=!1;return this},remove:function(){this.options.beforeRemove&&
+this.options.beforeRemove.call(this);this.mask&&this.mask.remove();this.iframeMask&&this.iframeMask.remove();this.closeIcon.unbind();i("input",this.div).unbind();i("button",this.div).unbind();this.footerDiv.unbind();this.bodyDiv.unbind();this.headerDiv.unbind();i("iframe",this.div).each(function(){i(this).remove()});Aa.parent.remove.call(this);return this}});i.DialogClass=Aa;i.dialog=yb;i.tabs=function(a){var c=Za(a),b=c.remove,d=a.afterSelect,a=c.div,e=[];a.addClass("ke-tabs").bind("contextmenu,mousedown,mousemove",
+function(a){a.preventDefault()});var f=i('<ul class="ke-tabs-ul ke-clearfix"></ul>');a.append(f);c.add=function(a){var c=i('<li class="ke-tabs-li">'+a.title+"</li>");c.data("tab",a);e.push(c);f.append(c)};c.selectedIndex=0;c.select=function(a){c.selectedIndex=a;h(e,function(b,d){d.unbind();b===a?(d.addClass("ke-tabs-li-selected"),i(d.data("tab").panel).show("")):(d.removeClass("ke-tabs-li-selected").removeClass("ke-tabs-li-on").mouseover(function(){i(this).addClass("ke-tabs-li-on")}).mouseout(function(){i(this).removeClass("ke-tabs-li-on")}).click(function(){c.select(b)}),
+i(d.data("tab").panel).hide())});d&&d.call(c,a)};c.remove=function(){h(e,function(){this.remove()});f.remove();b.call(c)};return c};i.loadScript=cb;i.loadStyle=db;i.ajax=function(a,c,d,e,i){var d=d||"GET",i=i||"json",f=b.XMLHttpRequest?new b.XMLHttpRequest:new ActiveXObject("Microsoft.XMLHTTP");f.open(d,a,!0);f.onreadystatechange=function(){if(f.readyState==4&&f.status==200&&c){var a=m(f.responseText);i=="json"&&(a=B(a));c(a)}};if(d=="POST"){var l=[];h(e,function(a,c){l.push(encodeURIComponent(a)+
+"="+encodeURIComponent(c))});try{f.setRequestHeader("Content-Type","application/x-www-form-urlencoded")}catch(n){}f.send(l.join("&"))}else f.send(null)};var ba={},ca={};Ba.prototype={lang:function(a){return Cb(a,this.langType)},loadPlugin:function(a,c){var b=this;if(ba[a]){if(!j(ba[a]))return setTimeout(function(){b.loadPlugin(a,c)},100),b;ba[a].call(b,KindEditor);c&&c.call(b);return b}ba[a]="loading";cb(b.pluginsPath+a+"/"+a+".js?ver="+encodeURIComponent(i.DEBUG?Ja:Ka),function(){setTimeout(function(){ba[a]&&
+b.loadPlugin(a,c)},0)});return b},handler:function(a,c){var b=this;b._handlers[a]||(b._handlers[a]=[]);if(j(c))return b._handlers[a].push(c),b;h(b._handlers[a],function(){c=this.call(b,c)});return c},clickToolbar:function(a,c){var b=this,e="clickToolbar"+a;if(c===d){if(b._handlers[e])return b.handler(e);b.loadPlugin(a,function(){b.handler(e)});return b}return b.handler(e,c)},updateState:function(){var a=this;h("justifyleft,justifycenter,justifyright,justifyfull,insertorderedlist,insertunorderedlist,subscript,superscript,bold,italic,underline,strikethrough".split(","),
+function(c,b){a.cmd.state(b)?a.toolbar.select(b):a.toolbar.unselect(b)});return a},addContextmenu:function(a){this._contextmenus.push(a);return this},afterCreate:function(a){return this.handler("afterCreate",a)},beforeRemove:function(a){return this.handler("beforeRemove",a)},beforeGetHtml:function(a){return this.handler("beforeGetHtml",a)},beforeSetHtml:function(a){return this.handler("beforeSetHtml",a)},afterSetHtml:function(a){return this.handler("afterSetHtml",a)},create:function(){function a(){m.height()===
+0?setTimeout(a,100):c.resize(e,f,!1)}var c=this,d=c.fullscreenMode;if(c.isCreated)return c;if(c.srcElement.data("kindeditor"))return c;c.srcElement.data("kindeditor","true");d?X().style.overflow="hidden":X().style.overflow="";var e=d?X().clientWidth+"px":c.width,f=d?X().clientHeight+"px":c.height;if(F&&N<8||da)f=o(l(f)+2);var k=c.container=i(c.layout);d?i(document.body).append(k):c.srcElement.before(k);var h=i(".toolbar",k),n=i(".edit",k),m=c.statusbar=i(".statusbar",k);k.removeClass("container").addClass("ke-container ke-container-"+
+c.themeType).css("width",e);if(d){k.css({position:"absolute",left:0,top:0,"z-index":811211});if(!la)c._scrollPos=na();b.scrollTo(0,0);i(document.body).css({height:"1px",overflow:"hidden"});i(document.body.parentNode).css("overflow","hidden");c._fullscreenExecuted=!0}else c._fullscreenExecuted&&(i(document.body).css({height:"",overflow:""}),i(document.body.parentNode).css("overflow","")),c._scrollPos&&b.scrollTo(c._scrollPos.x,c._scrollPos.y);var s=[];i.each(c.items,function(a,b){b=="|"?s.push('<span class="ke-inline-block ke-separator"></span>'):
+b=="/"?s.push('<div class="ke-hr"></div>'):(s.push('<span class="ke-outline" data-name="'+b+'" title="'+c.lang(b)+'" unselectable="on">'),s.push('<span class="ke-toolbar-icon ke-toolbar-icon-url ke-icon-'+b+'" unselectable="on"></span></span>'))});var h=c.toolbar=wb({src:h,html:s.join(""),noDisableItems:c.noDisableItems,click:function(a,b){a.stop();if(c.menu){var d=c.menu.name;c.hideMenu();if(d===b)return}c.clickToolbar(b)}}),j=l(f)-h.div.height(),r=c.edit=ub({height:j>0&&l(f)>c.minHeight?j:c.minHeight,
+src:n,srcElement:c.srcElement,designMode:c.designMode,themesPath:c.themesPath,bodyClass:c.bodyClass,cssPath:c.cssPath,cssData:c.cssData,beforeGetHtml:function(a){a=c.beforeGetHtml(a);a=ha(Ia(a));return H(a,c.filterMode?c.htmlTags:null,c.urlType,c.wellFormatMode,c.indentChar)},beforeSetHtml:function(a){a=H(a,c.filterMode?c.htmlTags:null,"",!1);return c.beforeSetHtml(a)},afterSetHtml:function(){c.edit=r=this;c.afterSetHtml()},afterCreate:function(){c.edit=r=this;c.cmd=r.cmd;c._docMousedownFn=function(){c.menu&&
+c.hideMenu()};i(r.doc,document).mousedown(c._docMousedownFn);Sb.call(c);Tb.call(c);Ub.call(c);Vb.call(c);r.afterChange(function(){r.designMode&&(c.updateState(),c.addBookmark(),c.options.afterChange&&c.options.afterChange.call(c))});r.textarea.keyup(function(a){!a.ctrlKey&&!a.altKey&&Ib[a.which]&&c.options.afterChange&&c.options.afterChange.call(c)});c.readonlyMode&&c.readonly();c.isCreated=!0;if(c.initContent==="")c.initContent=c.html();if(c._undoStack.length>0){var a=c._undoStack.pop();a.start&&
+(c.html(a.html),r.cmd.range.moveToBookmark(a),c.select())}c.afterCreate();c.options.afterCreate&&c.options.afterCreate.call(c)}});m.removeClass("statusbar").addClass("ke-statusbar").append('<span class="ke-inline-block ke-statusbar-center-icon"></span>').append('<span class="ke-inline-block ke-statusbar-right-icon"></span>');if(c._fullscreenResizeHandler)i(b).unbind("resize",c._fullscreenResizeHandler),c._fullscreenResizeHandler=null;a();d?(c._fullscreenResizeHandler=function(){c.isCreated&&c.resize(X().clientWidth,
+X().clientHeight,!1)},i(b).bind("resize",c._fullscreenResizeHandler),h.select("fullscreen"),m.first().css("visibility","hidden"),m.last().css("visibility","hidden")):(la&&i(b).bind("scroll",function(){c._scrollPos=na()}),c.resizeType>0?Xa({moveEl:k,clickEl:m,moveFn:function(a,b,d,g,e,f){g+=f;c.resize(null,g)}}):m.first().css("visibility","hidden"),c.resizeType===2?Xa({moveEl:k,clickEl:m.last(),moveFn:function(a,b,d,g,e,f){d+=e;g+=f;c.resize(d,g)}}):m.last().css("visibility","hidden"));return c},remove:function(){var a=
+this;if(!a.isCreated)return a;a.beforeRemove();a.srcElement.data("kindeditor","");a.menu&&a.hideMenu();h(a.dialogs,function(){a.hideDialog()});i(document).unbind("mousedown",a._docMousedownFn);a.toolbar.remove();a.edit.remove();a.statusbar.last().unbind();a.statusbar.unbind();a.container.remove();a.container=a.toolbar=a.edit=a.menu=null;a.dialogs=[];a.isCreated=!1;return a},resize:function(a,c,b){b=q(b,!0);if(a&&(/%/.test(a)||(a=l(a),a=a<this.minWidth?this.minWidth:a),this.container.css("width",o(a)),
+b))this.width=o(a);if(c&&(c=l(c),editHeight=l(c)-this.toolbar.div.height()-this.statusbar.height(),editHeight=editHeight<this.minHeight?this.minHeight:editHeight,this.edit.setHeight(editHeight),b))this.height=o(c);return this},select:function(){this.isCreated&&this.cmd.select();return this},html:function(a){if(a===d)return this.isCreated?this.edit.html():wa(this.srcElement);this.isCreated?this.edit.html(a):wa(this.srcElement,a);this.isCreated&&this.cmd.selection();return this},fullHtml:function(){return this.isCreated?
+this.edit.html(d,!0):""},text:function(a){return a===d?m(this.html().replace(/<(?!img|embed).*?>/ig,"").replace(/&nbsp;/ig," ")):this.html(s(a))},isEmpty:function(){return m(this.text().replace(/\r\n|\n|\r/,""))===""},isDirty:function(){return m(this.initContent.replace(/\r\n|\n|\r|t/g,""))!==m(this.html().replace(/\r\n|\n|\r|t/g,""))},selectedHtml:function(){var a=this.isCreated?this.cmd.range.html():"";return a=ha(Ia(a))},count:function(a){a=(a||"html").toLowerCase();if(a==="html")return this.html().length;
+if(a==="text")return this.text().replace(/<(?:img|embed).*?>/ig,"K").replace(/\r\n|\n|\r/g,"").length;return 0},exec:function(a){var a=a.toLowerCase(),c=this.cmd,b=e(a,"selectall,copy,paste,print".split(","))<0;b&&this.addBookmark(!1);c[a].apply(c,D(arguments,1));b&&(this.updateState(),this.addBookmark(!1),this.options.afterChange&&this.options.afterChange.call(this));return this},insertHtml:function(a,c){if(!this.isCreated)return this;a=this.beforeSetHtml(a);this.exec("inserthtml",a,c);return this},
+appendHtml:function(a){this.html(this.html()+a);if(this.isCreated)a=this.cmd,a.range.selectNodeContents(a.doc.body).collapse(!1),a.select();return this},sync:function(){wa(this.srcElement,this.html());return this},focus:function(){this.isCreated?this.edit.focus():this.srcElement[0].focus();return this},blur:function(){this.isCreated?this.edit.blur():this.srcElement[0].blur();return this},addBookmark:function(a){var a=q(a,!0),c=this.edit,b=c.doc.body,d=Ia(b.innerHTML);if(a&&this._undoStack.length>
+0&&Math.abs(d.length-ha(this._undoStack[this._undoStack.length-1].html).length)<this.minChangeSize)return this;c.designMode&&!this._firstAddBookmark?(c=this.cmd.range,a=c.createBookmark(!0),a.html=Ia(b.innerHTML),c.moveToBookmark(a)):a={html:d};this._firstAddBookmark=!1;Db(this._undoStack,a);return this},undo:function(){return Eb.call(this,this._undoStack,this._redoStack)},redo:function(){return Eb.call(this,this._redoStack,this._undoStack)},fullscreen:function(a){this.fullscreenMode=a===d?!this.fullscreenMode:
+a;this.addBookmark(!1);return this.remove().create()},readonly:function(a){var a=q(a,!0),c=this,b=c.edit,d=b.doc;c.designMode?c.toolbar.disableAll(a,[]):h(c.noDisableItems,function(){c.toolbar[a?"disable":"enable"](this)});F?d.body.contentEditable=!a:d.designMode=a?"off":"on";b.textarea[0].disabled=a},createMenu:function(a){var c=this.toolbar.get(a.name),b=c.pos();a.x=b.x;a.y=b.y+c.height();a.z=this.options.zIndex;a.shadowMode=q(a.shadowMode,this.shadowMode);a.selectedColor!==d?(a.cls="ke-colorpicker-"+
+this.themeType,a.noColor=this.lang("noColor"),this.menu=xb(a)):(a.cls="ke-menu-"+this.themeType,a.centerLineMode=!1,this.menu=ab(a));return this.menu},hideMenu:function(){this.menu.remove();this.menu=null;return this},hideContextmenu:function(){this.contextmenu.remove();this.contextmenu=null;return this},createDialog:function(a){var b=this;a.z=b.options.zIndex;a.shadowMode=q(a.shadowMode,b.shadowMode);a.closeBtn=q(a.closeBtn,{name:b.lang("close"),click:function(){b.hideDialog();F&&b.cmd&&b.cmd.select()}});
+a.noBtn=q(a.noBtn,{name:b.lang(a.yesBtn?"no":"close"),click:function(){b.hideDialog();F&&b.cmd&&b.cmd.select()}});if(b.dialogAlignType!="page")a.alignEl=b.container;a.cls="ke-dialog-"+b.themeType;if(b.dialogs.length>0){var d=b.dialogs[b.dialogs.length-1];b.dialogs[0].setMaskIndex(d.z+2);a.z=d.z+3;a.showMask=!1}a=yb(a);b.dialogs.push(a);return a},hideDialog:function(){this.dialogs.length>0&&this.dialogs.pop().remove();this.dialogs.length>0&&this.dialogs[0].setMaskIndex(this.dialogs[this.dialogs.length-
+1].z-1);return this},errorDialog:function(a){var b=this.createDialog({width:750,title:this.lang("uploadError"),body:'<div style="padding:10px 20px;"><iframe frameborder="0" style="width:708px;height:400px;"></iframe></div>'}),b=i("iframe",b.div),d=i.iframeDoc(b);d.open();d.write(a);d.close();i(d.body).css("background-color","#FFF");b[0].contentWindow.focus();return this}};_instances=[];i.remove=function(a){Ca(a,function(a){this.remove();_instances.splice(a,1)})};i.sync=function(a){Ca(a,function(){this.sync()})};
+i.html=function(a,b){Ca(a,function(){this.html(b)})};i.insertHtml=function(a,b){Ca(a,function(){this.insertHtml(b)})};i.appendHtml=function(a,b){Ca(a,function(){this.appendHtml(b)})};F&&N<7&&ea(document,"BackgroundImageCache",!0);i.EditorClass=Ba;i.editor=function(a){return new Ba(a)};i.create=Fb;i.instances=_instances;i.plugin=Ab;i.lang=Cb;Ab("core",function(a){var c=this,g={undo:"Z",redo:"Y",bold:"B",italic:"I",underline:"U",print:"P",selectall:"A"};c.afterSetHtml(function(){c.options.afterChange&&
+c.options.afterChange.call(c)});c.afterCreate(function(){if(c.syncType=="form"){for(var d=a(c.srcElement),g=!1;d=d.parent();)if(d.name=="form"){g=!0;break}if(g){d.bind("submit",function(){c.sync();a(b).bind("unload",function(){c.edit.textarea.remove()})});var e=a('[type="reset"]',d);e.click(function(){c.html(c.initContent);c.cmd.selection()});c.beforeRemove(function(){d.unbind();e.unbind()})}}});c.clickToolbar("source",function(){c.edit.designMode?(c.toolbar.disableAll(!0),c.edit.design(!1),c.toolbar.select("source")):
+(c.toolbar.disableAll(!1),c.edit.design(!0),c.toolbar.unselect("source"),la?setTimeout(function(){c.cmd.selection()},0):c.cmd.selection());c.designMode=c.edit.designMode});c.afterCreate(function(){c.designMode||c.toolbar.disableAll(!0).select("source")});c.clickToolbar("fullscreen",function(){c.fullscreen()});if(c.fullscreenShortcut){var f=!1;c.afterCreate(function(){a(c.edit.doc,c.edit.textarea).keyup(function(a){a.which==27&&setTimeout(function(){c.fullscreen()},0)});if(f){if(F&&!c.designMode)return;
+c.focus()}f||(f=!0)})}h("undo,redo".split(","),function(a,b){g[b]&&c.afterCreate(function(){$(this.edit.doc,g[b],function(){c.clickToolbar(b)})});c.clickToolbar(b,function(){c[b]()})});c.clickToolbar("formatblock",function(){var a=c.lang("formatblock.formatBlock"),b={h1:28,h2:24,h3:18,H4:14,p:12},d=c.cmd.val("formatblock"),g=c.createMenu({name:"formatblock",width:c.langType=="en"?200:150});h(a,function(a,e){var f="font-size:"+b[a]+"px;";a.charAt(0)==="h"&&(f+="font-weight:bold;");g.addItem({title:'<span style="'+
+f+'" unselectable="on">'+e+"</span>",height:b[a]+12,checked:d===a||d===e,click:function(){c.select().exec("formatblock","<"+a+">").hideMenu()}})})});c.clickToolbar("fontname",function(){var a=c.cmd.val("fontname"),b=c.createMenu({name:"fontname",width:150});h(c.lang("fontname.fontName"),function(d,g){b.addItem({title:'<span style="font-family: '+d+';" unselectable="on">'+g+"</span>",checked:a===d.toLowerCase()||a===g.toLowerCase(),click:function(){c.exec("fontname",d).hideMenu()}})})});c.clickToolbar("fontsize",
+function(){var a=c.cmd.val("fontsize"),b=c.createMenu({name:"fontsize",width:150});h(c.fontSizeTable,function(d,g){b.addItem({title:'<span style="font-size:'+g+';" unselectable="on">'+g+"</span>",height:l(g)+12,checked:a===g,click:function(){c.exec("fontsize",g).hideMenu()}})})});h("forecolor,hilitecolor".split(","),function(a,b){c.clickToolbar(b,function(){c.createMenu({name:b,selectedColor:c.cmd.val(b)||"default",colors:c.colorTable,click:function(a){c.exec(b,a).hideMenu()}})})});h("cut,copy,paste".split(","),
+function(a,b){c.clickToolbar(b,function(){c.focus();try{c.exec(b,null)}catch(a){alert(c.lang(b+"Error"))}})});c.clickToolbar("about",function(){var a='<div style="margin:20px;"><div>KindEditor '+Ka+'</div><div>Copyright &copy; <a href="http://www.kindsoft.net/" target="_blank">kindsoft.net</a> All rights reserved.</div></div>';c.createDialog({name:"about",width:350,title:c.lang("about"),body:a})});c.plugin.getSelectedLink=function(){return c.cmd.commonAncestor("a")};c.plugin.getSelectedImage=function(){return Ha(c.edit.cmd.range,
+function(a){return!/^ke-\w+$/i.test(a[0].className)})};c.plugin.getSelectedFlash=function(){return Ha(c.edit.cmd.range,function(a){return a[0].className=="ke-flash"})};c.plugin.getSelectedMedia=function(){return Ha(c.edit.cmd.range,function(a){return a[0].className=="ke-media"||a[0].className=="ke-rm"})};c.plugin.getSelectedAnchor=function(){return Ha(c.edit.cmd.range,function(a){return a[0].className=="ke-anchor"})};h("link,image,flash,media,anchor".split(","),function(a,b){var g=b.charAt(0).toUpperCase()+
+b.substr(1);h("edit,delete".split(","),function(a,e){c.addContextmenu({title:c.lang(e+g),click:function(){c.loadPlugin(b,function(){c.plugin[b][e]();c.hideMenu()})},cond:c.plugin["getSelected"+g],width:150,iconClass:e=="edit"?"ke-icon-"+b:d})});c.addContextmenu({title:"-"})});c.plugin.getSelectedTable=function(){return c.cmd.commonAncestor("table")};c.plugin.getSelectedRow=function(){return c.cmd.commonAncestor("tr")};c.plugin.getSelectedCell=function(){return c.cmd.commonAncestor("td")};h("prop,cellprop,colinsertleft,colinsertright,rowinsertabove,rowinsertbelow,rowmerge,colmerge,rowsplit,colsplit,coldelete,rowdelete,insert,delete".split(","),
+function(a,b){var d=e(b,["prop","delete"])<0?c.plugin.getSelectedCell:c.plugin.getSelectedTable;c.addContextmenu({title:c.lang("table"+b),click:function(){c.loadPlugin("table",function(){c.plugin.table[b]();c.hideMenu()})},cond:d,width:170,iconClass:"ke-icon-table"+b})});c.addContextmenu({title:"-"});h("selectall,justifyleft,justifycenter,justifyright,justifyfull,insertorderedlist,insertunorderedlist,indent,outdent,subscript,superscript,hr,print,bold,italic,underline,strikethrough,removeformat,unlink".split(","),
+function(a,b){g[b]&&c.afterCreate(function(){$(this.edit.doc,g[b],function(){c.cmd.selection();c.clickToolbar(b)})});c.clickToolbar(b,function(){c.focus().exec(b,null)})});c.afterCreate(function(){function b(){g.range.moveToBookmark(e);g.select();ka&&(a("div."+i,f).each(function(){a(this).after("<br />").remove(!0)}),a("span.Apple-style-span",f).remove(!0),a("span.Apple-tab-span",f).remove(!0),a("span[style]",f).each(function(){a(this).css("white-space")=="nowrap"&&a(this).remove(!0)}),a("meta",f).remove());
+var d=f[0].innerHTML;f.remove();d!==""&&(ka&&(d=d.replace(/(<br>)\1/ig,"$1")),c.pasteType===2&&(d=d.replace(/(<(?:p|p\s[^>]*)>) *(<\/p>)/ig,""),/schemas-microsoft-com|worddocument|mso-\w+/i.test(d)?d=U(d,c.filterMode?c.htmlTags:a.options.htmlTags):(d=H(d,c.filterMode?c.htmlTags:null),d=c.beforeSetHtml(d))),c.pasteType===1&&(d=d.replace(/&nbsp;/ig," "),d=d.replace(/\n\s*\n/g,"\n"),d=d.replace(/<br[^>]*>/ig,"\n"),d=d.replace(/<\/p><p[^>]*>/ig,"\n"),d=d.replace(/<[^>]+>/g,""),d=d.replace(/ {2}/g," &nbsp;"),
+c.newlineTag=="p"?/\n/.test(d)&&(d=d.replace(/^/,"<p>").replace(/$/,"<br /></p>").replace(/\n/g,"<br /></p><p>")):d=d.replace(/\n/g,"<br />$&")),c.insertHtml(d,!0))}var d=c.edit.doc,g,e,f,i="__kindeditor_paste__",h=!1;a(d.body).bind("paste",function(l){if(c.pasteType===0)l.stop();else if(!h){h=!0;a("div."+i,d).remove();g=c.cmd.selection();e=g.range.createBookmark();f=a('<div class="'+i+'"></div>',d).css({position:"absolute",width:"1px",height:"1px",overflow:"hidden",left:"-1981px",top:a(e.start).pos().y+
+"px","white-space":"nowrap"});a(d.body).append(f);if(F){var n=g.range.get(!0);n.moveToElementText(f[0]);n.select();n.execCommand("paste");l.preventDefault()}else g.range.selectNodeContents(f[0]),g.select();setTimeout(function(){b();h=!1},0)}})});c.beforeGetHtml(function(a){F&&N<=8&&(a=a.replace(/<div\s+[^>]*data-ke-input-tag="([^"]*)"[^>]*>([\s\S]*?)<\/div>/ig,function(a,b){return unescape(b)}),a=a.replace(/(<input)((?:\s+[^>]*)?>)/ig,function(a,b,c){if(!/\s+type="[^"]+"/i.test(a))return b+' type="text"'+
+c;return a}));return a.replace(/(<(?:noscript|noscript\s[^>]*)>)([\s\S]*?)(<\/noscript>)/ig,function(a,b,c,d){return b+v(c).replace(/\s+/g," ")+d}).replace(/<img[^>]*class="?ke-(flash|rm|media)"?[^>]*>/ig,function(a){var a=K(a),b=M(a.style||""),c=S(a["data-ke-tag"]),d=q(b.width,""),b=q(b.height,"");/px/i.test(d)&&(d=l(d));/px/i.test(b)&&(b=l(b));c.width=q(a.width,d);c.height=q(a.height,b);return Na(c)}).replace(/<img[^>]*class="?ke-anchor"?[^>]*>/ig,function(a){a=K(a);return'<a name="'+unescape(a["data-ke-name"])+
+'"></a>'}).replace(/<div\s+[^>]*data-ke-script-attr="([^"]*)"[^>]*>([\s\S]*?)<\/div>/ig,function(a,b,c){return"<script"+unescape(b)+">"+unescape(c)+"<\/script>"}).replace(/<div\s+[^>]*data-ke-noscript-attr="([^"]*)"[^>]*>([\s\S]*?)<\/div>/ig,function(a,b,c){return"<noscript"+unescape(b)+">"+unescape(c)+"</noscript>"}).replace(/(<[^>]*)data-ke-src="([^"]*)"([^>]*>)/ig,function(a,b,c){a=a.replace(/(\s+(?:href|src)=")[^"]*(")/i,function(a,b,d){return b+v(c)+d});return a=a.replace(/\s+data-ke-src="[^"]*"/i,
+"")}).replace(/(<[^>]+\s)data-ke-(on\w+="[^"]*"[^>]*>)/ig,function(a,b,c){return b+c})});c.beforeSetHtml(function(a){F&&N<=8&&(a=a.replace(/<input[^>]*>|<(select|button)[^>]*>[\s\S]*?<\/\1>/ig,function(a){var b=K(a);if(M(b.style||"").display=="none")return'<div class="ke-display-none" data-ke-input-tag="'+escape(a)+'"></div>';return a}));return a.replace(/<embed[^>]*type="([^"]+)"[^>]*>(?:<\/embed>)?/ig,function(a){a=K(a);a.src=q(a.src,"");a.width=q(a.width,0);a.height=q(a.height,0);return kb(c.themesPath+
+"common/blank.gif",a)}).replace(/<a[^>]*name="([^"]+)"[^>]*>(?:<\/a>)?/ig,function(a){var b=K(a);if(b.href!==d)return a;return'<img class="ke-anchor" src="'+c.themesPath+'common/anchor.gif" data-ke-name="'+escape(b.name)+'" />'}).replace(/<script([^>]*)>([\s\S]*?)<\/script>/ig,function(a,b,c){return'<div class="ke-script" data-ke-script-attr="'+escape(b)+'">'+escape(c)+"</div>"}).replace(/<noscript([^>]*)>([\s\S]*?)<\/noscript>/ig,function(a,b,c){return'<div class="ke-noscript" data-ke-noscript-attr="'+
+escape(b)+'">'+escape(c)+"</div>"}).replace(/(<[^>]*)(href|src)="([^"]*)"([^>]*>)/ig,function(a,b,c,d,g){if(a.match(/\sdata-ke-src="[^"]*"/i))return a;return a=b+c+'="'+d+'" data-ke-src="'+s(d)+'"'+g}).replace(/(<[^>]+\s)(on\w+="[^"]*"[^>]*>)/ig,function(a,b,c){return b+"data-ke-"+c}).replace(/<table[^>]*\s+border="0"[^>]*>/ig,function(a){if(a.indexOf("ke-zeroborder")>=0)return a;return O(a,"ke-zeroborder")})})})}})(window);
+KindEditor.lang({source:"HTML\u4ee3\u7801",preview:"\u9884\u89c8",undo:"\u540e\u9000(Ctrl+Z)",redo:"\u524d\u8fdb(Ctrl+Y)",cut:"\u526a\u5207(Ctrl+X)",copy:"\u590d\u5236(Ctrl+C)",paste:"\u7c98\u8d34(Ctrl+V)",plainpaste:"\u7c98\u8d34\u4e3a\u65e0\u683c\u5f0f\u6587\u672c",wordpaste:"\u4eceWord\u7c98\u8d34",selectall:"\u5168\u9009(Ctrl+A)",justifyleft:"\u5de6\u5bf9\u9f50",justifycenter:"\u5c45\u4e2d",justifyright:"\u53f3\u5bf9\u9f50",justifyfull:"\u4e24\u7aef\u5bf9\u9f50",insertorderedlist:"\u7f16\u53f7",
+insertunorderedlist:"\u9879\u76ee\u7b26\u53f7",indent:"\u589e\u52a0\u7f29\u8fdb",outdent:"\u51cf\u5c11\u7f29\u8fdb",subscript:"\u4e0b\u6807",superscript:"\u4e0a\u6807",formatblock:"\u6bb5\u843d",fontname:"\u5b57\u4f53",fontsize:"\u6587\u5b57\u5927\u5c0f",forecolor:"\u6587\u5b57\u989c\u8272",hilitecolor:"\u6587\u5b57\u80cc\u666f",bold:"\u7c97\u4f53(Ctrl+B)",italic:"\u659c\u4f53(Ctrl+I)",underline:"\u4e0b\u5212\u7ebf(Ctrl+U)",strikethrough:"\u5220\u9664\u7ebf",removeformat:"\u5220\u9664\u683c\u5f0f",
+image:"\u56fe\u7247",multiimage:"\u6279\u91cf\u56fe\u7247\u4e0a\u4f20",flash:"Flash",media:"\u89c6\u97f3\u9891",table:"\u8868\u683c",tablecell:"\u5355\u5143\u683c",hr:"\u63d2\u5165\u6a2a\u7ebf",emoticons:"\u63d2\u5165\u8868\u60c5",link:"\u8d85\u7ea7\u94fe\u63a5",unlink:"\u53d6\u6d88\u8d85\u7ea7\u94fe\u63a5",fullscreen:"\u5168\u5c4f\u663e\u793a",about:"\u5173\u4e8e",print:"\u6253\u5370(Ctrl+P)",filemanager:"\u6587\u4ef6\u7a7a\u95f4",code:"\u63d2\u5165\u7a0b\u5e8f\u4ee3\u7801",map:"Google\u5730\u56fe",
+baidumap:"\u767e\u5ea6\u5730\u56fe",lineheight:"\u884c\u8ddd",clearhtml:"\u6e05\u7406HTML\u4ee3\u7801",pagebreak:"\u63d2\u5165\u5206\u9875\u7b26",quickformat:"\u4e00\u952e\u6392\u7248",insertfile:"\u63d2\u5165\u6587\u4ef6",template:"\u63d2\u5165\u6a21\u677f",anchor:"\u951a\u70b9",yes:"\u786e\u5b9a",no:"\u53d6\u6d88",close:"\u5173\u95ed",editImage:"\u56fe\u7247\u5c5e\u6027",deleteImage:"\u5220\u9664\u56fe\u7247",editFlash:"Flash\u5c5e\u6027",deleteFlash:"\u5220\u9664Flash",editMedia:"\u89c6\u97f3\u9891\u5c5e\u6027",
+deleteMedia:"\u5220\u9664\u89c6\u97f3\u9891",editLink:"\u8d85\u7ea7\u94fe\u63a5\u5c5e\u6027",deleteLink:"\u53d6\u6d88\u8d85\u7ea7\u94fe\u63a5",editAnchor:"\u951a\u70b9\u5c5e\u6027",deleteAnchor:"\u5220\u9664\u951a\u70b9",tableprop:"\u8868\u683c\u5c5e\u6027",tablecellprop:"\u5355\u5143\u683c\u5c5e\u6027",tableinsert:"\u63d2\u5165\u8868\u683c",tabledelete:"\u5220\u9664\u8868\u683c",tablecolinsertleft:"\u5de6\u4fa7\u63d2\u5165\u5217",tablecolinsertright:"\u53f3\u4fa7\u63d2\u5165\u5217",tablerowinsertabove:"\u4e0a\u65b9\u63d2\u5165\u884c",
+tablerowinsertbelow:"\u4e0b\u65b9\u63d2\u5165\u884c",tablerowmerge:"\u5411\u4e0b\u5408\u5e76\u5355\u5143\u683c",tablecolmerge:"\u5411\u53f3\u5408\u5e76\u5355\u5143\u683c",tablerowsplit:"\u62c6\u5206\u884c",tablecolsplit:"\u62c6\u5206\u5217",tablecoldelete:"\u5220\u9664\u5217",tablerowdelete:"\u5220\u9664\u884c",noColor:"\u65e0\u989c\u8272",pleaseSelectFile:"\u8bf7\u9009\u62e9\u6587\u4ef6\u3002",invalidImg:"\u8bf7\u8f93\u5165\u6709\u6548\u7684URL\u5730\u5740\u3002\n\u53ea\u5141\u8bb8jpg,gif,bmp,png\u683c\u5f0f\u3002",
+invalidMedia:"\u8bf7\u8f93\u5165\u6709\u6548\u7684URL\u5730\u5740\u3002\n\u53ea\u5141\u8bb8swf,flv,mp3,wav,wma,wmv,mid,avi,mpg,asf,rm,rmvb\u683c\u5f0f\u3002",invalidWidth:"\u5bbd\u5ea6\u5fc5\u987b\u4e3a\u6570\u5b57\u3002",invalidHeight:"\u9ad8\u5ea6\u5fc5\u987b\u4e3a\u6570\u5b57\u3002",invalidBorder:"\u8fb9\u6846\u5fc5\u987b\u4e3a\u6570\u5b57\u3002",invalidUrl:"\u8bf7\u8f93\u5165\u6709\u6548\u7684URL\u5730\u5740\u3002",invalidRows:"\u884c\u6570\u4e3a\u5fc5\u9009\u9879\uff0c\u53ea\u5141\u8bb8\u8f93\u5165\u5927\u4e8e0\u7684\u6570\u5b57\u3002",
+invalidCols:"\u5217\u6570\u4e3a\u5fc5\u9009\u9879\uff0c\u53ea\u5141\u8bb8\u8f93\u5165\u5927\u4e8e0\u7684\u6570\u5b57\u3002",invalidPadding:"\u8fb9\u8ddd\u5fc5\u987b\u4e3a\u6570\u5b57\u3002",invalidSpacing:"\u95f4\u8ddd\u5fc5\u987b\u4e3a\u6570\u5b57\u3002",invalidJson:"\u670d\u52a1\u5668\u53d1\u751f\u6545\u969c\u3002",uploadSuccess:"\u4e0a\u4f20\u6210\u529f\u3002",cutError:"\u60a8\u7684\u6d4f\u89c8\u5668\u5b89\u5168\u8bbe\u7f6e\u4e0d\u5141\u8bb8\u4f7f\u7528\u526a\u5207\u64cd\u4f5c\uff0c\u8bf7\u4f7f\u7528\u5feb\u6377\u952e(Ctrl+X)\u6765\u5b8c\u6210\u3002",
+copyError:"\u60a8\u7684\u6d4f\u89c8\u5668\u5b89\u5168\u8bbe\u7f6e\u4e0d\u5141\u8bb8\u4f7f\u7528\u590d\u5236\u64cd\u4f5c\uff0c\u8bf7\u4f7f\u7528\u5feb\u6377\u952e(Ctrl+C)\u6765\u5b8c\u6210\u3002",pasteError:"\u60a8\u7684\u6d4f\u89c8\u5668\u5b89\u5168\u8bbe\u7f6e\u4e0d\u5141\u8bb8\u4f7f\u7528\u7c98\u8d34\u64cd\u4f5c\uff0c\u8bf7\u4f7f\u7528\u5feb\u6377\u952e(Ctrl+V)\u6765\u5b8c\u6210\u3002",ajaxLoading:"\u52a0\u8f7d\u4e2d\uff0c\u8bf7\u7a0d\u5019 ...",uploadLoading:"\u4e0a\u4f20\u4e2d\uff0c\u8bf7\u7a0d\u5019 ...",
+uploadError:"\u4e0a\u4f20\u9519\u8bef","plainpaste.comment":"\u8bf7\u4f7f\u7528\u5feb\u6377\u952e(Ctrl+V)\u628a\u5185\u5bb9\u7c98\u8d34\u5230\u4e0b\u9762\u7684\u65b9\u6846\u91cc\u3002","wordpaste.comment":"\u8bf7\u4f7f\u7528\u5feb\u6377\u952e(Ctrl+V)\u628a\u5185\u5bb9\u7c98\u8d34\u5230\u4e0b\u9762\u7684\u65b9\u6846\u91cc\u3002","code.pleaseInput":"\u8bf7\u8f93\u5165\u7a0b\u5e8f\u4ee3\u7801\u3002","link.url":"URL","link.linkType":"\u6253\u5f00\u7c7b\u578b","link.newWindow":"\u65b0\u7a97\u53e3","link.selfWindow":"\u5f53\u524d\u7a97\u53e3",
+"flash.url":"URL","flash.width":"\u5bbd\u5ea6","flash.height":"\u9ad8\u5ea6","flash.upload":"\u4e0a\u4f20","flash.viewServer":"\u6587\u4ef6\u7a7a\u95f4","media.url":"URL","media.width":"\u5bbd\u5ea6","media.height":"\u9ad8\u5ea6","media.autostart":"\u81ea\u52a8\u64ad\u653e","media.upload":"\u4e0a\u4f20","media.viewServer":"\u6587\u4ef6\u7a7a\u95f4","image.remoteImage":"\u7f51\u7edc\u56fe\u7247","image.localImage":"\u672c\u5730\u4e0a\u4f20","image.remoteUrl":"\u56fe\u7247\u5730\u5740","image.localUrl":"\u4e0a\u4f20\u6587\u4ef6",
+"image.size":"\u56fe\u7247\u5927\u5c0f","image.width":"\u5bbd","image.height":"\u9ad8","image.resetSize":"\u91cd\u7f6e\u5927\u5c0f","image.align":"\u5bf9\u9f50\u65b9\u5f0f","image.defaultAlign":"\u9ed8\u8ba4\u65b9\u5f0f","image.leftAlign":"\u5de6\u5bf9\u9f50","image.rightAlign":"\u53f3\u5bf9\u9f50","image.imgTitle":"\u56fe\u7247\u8bf4\u660e","image.upload":"\u6d4f\u89c8...","image.viewServer":"\u56fe\u7247\u7a7a\u95f4","multiimage.uploadDesc":"\u5141\u8bb8\u7528\u6237\u540c\u65f6\u4e0a\u4f20<%=uploadLimit%>\u5f20\u56fe\u7247\uff0c\u5355\u5f20\u56fe\u7247\u5bb9\u91cf\u4e0d\u8d85\u8fc7<%=sizeLimit%>",
+"multiimage.startUpload":"\u5f00\u59cb\u4e0a\u4f20","multiimage.clearAll":"\u5168\u90e8\u6e05\u7a7a","multiimage.insertAll":"\u5168\u90e8\u63d2\u5165","multiimage.queueLimitExceeded":"\u6587\u4ef6\u6570\u91cf\u8d85\u8fc7\u9650\u5236\u3002","multiimage.fileExceedsSizeLimit":"\u6587\u4ef6\u5927\u5c0f\u8d85\u8fc7\u9650\u5236\u3002","multiimage.zeroByteFile":"\u65e0\u6cd5\u4e0a\u4f20\u7a7a\u6587\u4ef6\u3002","multiimage.invalidFiletype":"\u6587\u4ef6\u7c7b\u578b\u4e0d\u6b63\u786e\u3002","multiimage.unknownError":"\u53d1\u751f\u5f02\u5e38\uff0c\u65e0\u6cd5\u4e0a\u4f20\u3002",
+"multiimage.pending":"\u7b49\u5f85\u4e0a\u4f20","multiimage.uploadError":"\u4e0a\u4f20\u5931\u8d25","filemanager.emptyFolder":"\u7a7a\u6587\u4ef6\u5939","filemanager.moveup":"\u79fb\u5230\u4e0a\u4e00\u7ea7\u6587\u4ef6\u5939","filemanager.viewType":"\u663e\u793a\u65b9\u5f0f\uff1a","filemanager.viewImage":"\u7f29\u7565\u56fe","filemanager.listImage":"\u8be6\u7ec6\u4fe1\u606f","filemanager.orderType":"\u6392\u5e8f\u65b9\u5f0f\uff1a","filemanager.fileName":"\u540d\u79f0","filemanager.fileSize":"\u5927\u5c0f",
+"filemanager.fileType":"\u7c7b\u578b","insertfile.url":"URL","insertfile.title":"\u6587\u4ef6\u8bf4\u660e","insertfile.upload":"\u4e0a\u4f20","insertfile.viewServer":"\u6587\u4ef6\u7a7a\u95f4","table.cells":"\u5355\u5143\u683c\u6570","table.rows":"\u884c\u6570","table.cols":"\u5217\u6570","table.size":"\u5927\u5c0f","table.width":"\u5bbd\u5ea6","table.height":"\u9ad8\u5ea6","table.percent":"%","table.px":"px","table.space":"\u8fb9\u8ddd\u95f4\u8ddd","table.padding":"\u8fb9\u8ddd","table.spacing":"\u95f4\u8ddd",
+"table.align":"\u5bf9\u9f50\u65b9\u5f0f","table.textAlign":"\u6c34\u5e73\u5bf9\u9f50","table.verticalAlign":"\u5782\u76f4\u5bf9\u9f50","table.alignDefault":"\u9ed8\u8ba4","table.alignLeft":"\u5de6\u5bf9\u9f50","table.alignCenter":"\u5c45\u4e2d","table.alignRight":"\u53f3\u5bf9\u9f50","table.alignTop":"\u9876\u90e8","table.alignMiddle":"\u4e2d\u90e8","table.alignBottom":"\u5e95\u90e8","table.alignBaseline":"\u57fa\u7ebf","table.border":"\u8fb9\u6846","table.borderWidth":"\u8fb9\u6846","table.borderColor":"\u989c\u8272",
+"table.backgroundColor":"\u80cc\u666f\u989c\u8272","map.address":"\u5730\u5740: ","map.search":"\u641c\u7d22","baidumap.address":"\u5730\u5740: ","baidumap.search":"\u641c\u7d22","baidumap.insertDynamicMap":"\u63d2\u5165\u52a8\u6001\u5730\u56fe","anchor.name":"\u951a\u70b9\u540d\u79f0","formatblock.formatBlock":{h1:"\u6807\u9898 1",h2:"\u6807\u9898 2",h3:"\u6807\u9898 3",h4:"\u6807\u9898 4",p:"\u6b63 \u6587"},"fontname.fontName":{SimSun:"\u5b8b\u4f53",NSimSun:"\u65b0\u5b8b\u4f53",FangSong_GB2312:"\u4eff\u5b8b_GB2312",
+KaiTi_GB2312:"\u6977\u4f53_GB2312",SimHei:"\u9ed1\u4f53","Microsoft YaHei":"\u5fae\u8f6f\u96c5\u9ed1",Arial:"Arial","Arial Black":"Arial Black","Times New Roman":"Times New Roman","Courier New":"Courier New",Tahoma:"Tahoma",Verdana:"Verdana"},"lineheight.lineHeight":[{1:"\u5355\u500d\u884c\u8ddd"},{"1.5":"1.5\u500d\u884c\u8ddd"},{2:"2\u500d\u884c\u8ddd"},{"2.5":"2.5\u500d\u884c\u8ddd"},{3:"3\u500d\u884c\u8ddd"}],"template.selectTemplate":"\u53ef\u9009\u6a21\u677f","template.replaceContent":"\u66ff\u6362\u5f53\u524d\u5185\u5bb9",
+"template.fileList":{"1.html":"\u56fe\u7247\u548c\u6587\u5b57","2.html":"\u8868\u683c","3.html":"\u9879\u76ee\u7f16\u53f7"}},"zh_CN");
+KindEditor.plugin("anchor",function(b){var d=this,f=d.lang("anchor.");d.plugin.anchor={edit:function(){var j=['<div style="padding:20px;"><div class="ke-dialog-row">','<label for="keName">'+f.name+"</label>",'<input class="ke-input-text" type="text" id="keName" name="name" value="" style="width:100px;" /></div></div>'].join(""),j=d.createDialog({name:"anchor",width:300,title:d.lang("anchor"),body:j,yesBtn:{name:d.lang("yes"),click:function(){d.insertHtml('<a name="'+e.val()+'">').hideDialog().focus()}}}).div,
+e=b('input[name="name"]',j);(j=d.plugin.getSelectedAnchor())&&e.val(unescape(j.attr("data-ke-name")));e[0].focus();e[0].select()},"delete":function(){d.plugin.getSelectedAnchor().remove()}};d.clickToolbar("anchor",d.plugin.anchor.edit)});
+KindEditor.plugin("autoheight",function(b){function d(){var d=j.edit,f=d.doc.body;d.iframe.height(e);j.resize(null,Math.max((b.IE?f.scrollHeight:f.offsetHeight)+76,e))}function f(){e=b.removeUnit(j.height);j.edit.afterChange(d);var f=j.edit,m=f.doc.body;f.iframe[0].scroll="no";m.style.overflowY="hidden";d()}var j=this;if(j.autoHeightMode){var e;j.isCreated?f():j.afterCreate(f)}});
+KindEditor.plugin("baidumap",function(b){var d=this,f=d.lang("baidumap."),j=b.undef(d.mapWidth,558),e=b.undef(d.mapHeight,360);d.clickToolbar("baidumap",function(){function h(){v=r[0].contentWindow;p=b.iframeDoc(r)}var m=['<div style="padding:10px 20px;"><div class="ke-header"><div class="ke-left">',f.address+' <input id="kindeditor_plugin_map_address" name="address" class="ke-input-text" value="" style="width:200px;" /> ','<span class="ke-button-common ke-button-outer">','<input type="button" name="searchBtn" class="ke-button-common ke-button" value="'+
+f.search+'" />','</span></div><div class="ke-right">','<input type="checkbox" id="keInsertDynamicMap" name="insertDynamicMap" value="1" /> <label for="keInsertDynamicMap">'+f.insertDynamicMap+"</label>",'</div><div class="ke-clearfix"></div></div>','<div class="ke-map" style="width:'+j+"px;height:"+e+'px;"></div>',"</div>"].join(""),m=d.createDialog({name:"baidumap",width:j+42,title:d.lang("baidumap"),body:m,yesBtn:{name:d.lang("yes"),click:function(){var b=v.map,f=b.getCenter(),f=f.lng+","+f.lat,
+b=b.getZoom(),b=[s[0].checked?d.pluginsPath+"baidumap/index.html":"http://api.map.baidu.com/staticimage","?center="+encodeURIComponent(f),"&zoom="+encodeURIComponent(b),"&width="+j,"&height="+e,"&markers="+encodeURIComponent(f),"&markerStyles="+encodeURIComponent("l,A")].join("");s[0].checked?d.insertHtml('<iframe src="'+b+'" frameborder="0" style="width:'+(j+2)+"px;height:"+(e+2)+'px;"></iframe>'):d.exec("insertimage",b);d.hideDialog().focus()}},beforeRemove:function(){l.remove();p&&p.write("");
+r.remove()}}),n=m.div,o=b('[name="address"]',n),l=b('[name="searchBtn"]',n),s=b('[name="insertDynamicMap"]',m.div),v,p,r=b('<iframe class="ke-textarea" frameborder="0" src="'+d.pluginsPath+'baidumap/map.html" style="width:'+j+"px;height:"+e+'px;"></iframe>');r.bind("load",function(){r.unbind("load");b.IE?h():setTimeout(h,0)});b(".ke-map",n).replaceWith(r);l.click(function(){v.search(o.val())})})});
+KindEditor.plugin("clearhtml",function(b){var d=this;d.clickToolbar("clearhtml",function(){d.focus();var f=d.html(),f=f.replace(/(<script[^>]*>)([\s\S]*?)(<\/script>)/ig,""),f=f.replace(/(<style[^>]*>)([\s\S]*?)(<\/style>)/ig,""),f=b.formatHtml(f,{a:["href","target"],embed:["src","width","height","type","loop","autostart","quality",".width",".height","align","allowscriptaccess"],img:["src","width","height","border","alt","title",".width",".height"],table:["border"],"td,th":["rowspan","colspan"],"div,hr,br,tbody,tr,p,ol,ul,li,blockquote,h1,h2,h3,h4,h5,h6":[]});
+d.html(f);d.cmd.selection(!0);d.addBookmark()})});
+KindEditor.plugin("code",function(b){var d=this;d.clickToolbar("code",function(){var f=d.lang("code."),j=d.createDialog({name:"code",width:450,title:d.lang("code"),body:'<div style="padding:10px 20px;"><div class="ke-dialog-row"><select class="ke-code-type"><option value="js">JavaScript</option><option value="html">HTML</option><option value="css">CSS</option><option value="php">PHP</option><option value="pl">Perl</option><option value="py">Python</option><option value="rb">Ruby</option><option value="java">Java</option><option value="vb">ASP/VB</option><option value="cpp">C/C++</option><option value="cs">C#</option><option value="xml">XML</option><option value="bsh">Shell</option><option value="">Other</option></select></div><textarea class="ke-textarea" style="width:408px;height:260px;"></textarea></div>',yesBtn:{name:d.lang("yes"),
+click:function(){var h=b(".ke-code-type",j.div).val(),m=e.val(),h='<pre class="prettyprint'+(h===""?"":" lang-"+h)+'">\n'+b.escape(m)+"</pre> ";b.trim(m)===""?(alert(f.pleaseInput),e[0].focus()):d.insertHtml(h).hideDialog().focus()}}}),e=b("textarea",j.div);e[0].focus()})});
+KindEditor.plugin("emoticons",function(b){var d=this,f=d.emoticonsPath||d.pluginsPath+"emoticons/images/",j=d.allowPreviewEmoticons===void 0?!0:d.allowPreviewEmoticons,e=1;d.clickToolbar("emoticons",function(){function h(e,h,l){B?e.mouseover(function(){h>D?(B.css("left",0),B.css("right","")):(B.css("left",""),B.css("right",0));G.attr("src",f+l+".gif");b(this).addClass("ke-on")}):e.mouseover(function(){b(this).addClass("ke-on")});e.mouseout(function(){b(this).removeClass("ke-on")});e.click(function(b){d.insertHtml('<img src="'+
+f+l+'.gif" border="0" alt="" />').hideMenu().focus();b.stop()})}function m(d,e){var l=document.createElement("table");e.append(l);B&&(b(l).mouseover(function(){B.show("block")}),b(l).mouseout(function(){B.hide()}),A.push(b(l)));l.className="ke-table";l.cellPadding=0;l.cellSpacing=0;l.border=0;for(var n=(d-1)*r+p,o=0;o<s;o++)for(var m=l.insertRow(o),j=0;j<v;j++){var q=b(m.insertCell(j));q.addClass("ke-cell");h(q,j,n);var u=b('<span class="ke-img"></span>').css("background-position","-"+24*n+"px 0px").css("background-image",
+"url("+f+"static.gif)");q.append(u);A.push(q);n++}return l}function n(){b.each(A,function(){this.unbind()})}function o(b,d){b.click(function(b){n();C.parentNode.removeChild(C);u.remove();C=m(d,q);l(d);e=d;b.stop()})}function l(d){u=b('<div class="ke-page"></div>');q.append(u);for(var e=1;e<=z;e++){if(d!==e){var f=b('<a href="javascript:;">['+e+"]</a>");o(f,e);u.append(f);A.push(f)}else u.append(b("@["+e+"]"));u.append(b("@&nbsp;"))}}var s=5,v=9,p=0,r=s*v,z=Math.ceil(135/r),D=Math.floor(v/2),q=b('<div class="ke-plugin-emoticons"></div>'),
+A=[];d.createMenu({name:"emoticons",beforeRemove:function(){n()}}).div.append(q);var B,G;j&&(B=b('<div class="ke-preview"></div>').css("right",0),G=b('<img class="ke-preview-img" src="'+f+p+'.gif" />'),q.append(B),B.append(G));var C=m(e,q),u;l(e)})});
+KindEditor.plugin("filemanager",function(b){function d(b,d){d.is_dir?b.attr("title",d.filename):b.attr("title",d.filename+" ("+Math.ceil(d.filesize/1024)+"KB, "+d.datetime+")")}var f=this,j=b.undef(f.fileManagerJson,f.basePath+"php/file_manager_json.php"),e=f.pluginsPath+"filemanager/images/",h=f.lang("filemanager.");f.plugin.filemanagerDialog=function(m){function n(d,e,h){d="path="+d+"&order="+e+"&dir="+z;A.showLoading(f.lang("ajaxLoading"));b.ajax(b.addParam(j,d+"&"+(new Date).getTime()),function(b){A.hideLoading();
+h(b)})}function o(d,e,f,h){var l=b.formatUrl(e.current_url+f.filename,"absolute"),o=encodeURIComponent(e.current_dir_path+f.filename+"/");f.is_dir?d.click(function(){n(o,u.val(),h)}):f.is_photo?d.click(function(){q.call(this,l,f.filename)}):d.click(function(){q.call(this,l,f.filename)});I.push(d)}function l(d,e){function f(){C.val()=="VIEW"?n(d.current_dir_path,u.val(),v):n(d.current_dir_path,u.val(),s)}b.each(I,function(){this.unbind()});G.unbind();C.unbind();u.unbind();d.current_dir_path&&G.click(function(){n(d.moveup_dir_path,
+u.val(),e)});C.change(f);u.change(f);B.html("")}function s(d){l(d,s);var f=document.createElement("table");f.className="ke-table";f.cellPadding=0;f.cellSpacing=0;f.border=0;B.append(f);for(var n=d.file_list,m=0,j=n.length;m<j;m++){var r=n[m],p=b(f.insertRow(m));p.mouseover(function(){b(this).addClass("ke-on")}).mouseout(function(){b(this).removeClass("ke-on")});var q=b('<img src="'+(e+(r.is_dir?"folder-16.gif":"file-16.gif"))+'" width="16" height="16" alt="'+r.filename+'" align="absmiddle" />'),q=
+b(p[0].insertCell(0)).addClass("ke-cell ke-name").append(q).append(document.createTextNode(" "+r.filename));!r.is_dir||r.has_file?(p.css("cursor","pointer"),q.attr("title",r.filename),o(q,d,r,s)):q.attr("title",h.emptyFolder);b(p[0].insertCell(1)).addClass("ke-cell ke-size").html(r.is_dir?"-":Math.ceil(r.filesize/1024)+"KB");b(p[0].insertCell(2)).addClass("ke-cell ke-datetime").html(r.datetime)}}function v(f){l(f,v);for(var n=f.file_list,m=0,s=n.length;m<s;m++){var j=n[m],r=b('<div class="ke-inline-block ke-item"></div>');
+B.append(r);var p=b('<div class="ke-inline-block ke-photo"></div>').mouseover(function(){b(this).addClass("ke-on")}).mouseout(function(){b(this).removeClass("ke-on")});r.append(p);var q=f.current_url+j.filename,q=b('<img src="'+(j.is_dir?e+"folder-64.gif":j.is_photo?q:e+"file-64.gif")+'" width="80" height="80" alt="'+j.filename+'" />');!j.is_dir||j.has_file?(p.css("cursor","pointer"),d(p,j),o(p,f,j,v)):p.attr("title",h.emptyFolder);p.append(q);r.append('<div class="ke-name" title="'+j.filename+'">'+
+j.filename+"</div>")}}var p=b.undef(m.width,650),r=b.undef(m.height,510),z=b.undef(m.dirName,""),D=b.undef(m.viewType,"VIEW").toUpperCase(),q=m.clickFn,m=['<div style="padding:10px 20px;"><div class="ke-plugin-filemanager-header"><div class="ke-left">','<img class="ke-inline-block" name="moveupImg" src="'+e+'go-up.gif" width="16" height="16" border="0" alt="" /> ','<a class="ke-inline-block" name="moveupLink" href="javascript:;">'+h.moveup+"</a>",'</div><div class="ke-right">',h.viewType+' <select class="ke-inline-block" name="viewType">',
+'<option value="VIEW">'+h.viewImage+"</option>",'<option value="LIST">'+h.listImage+"</option>","</select> ",h.orderType+' <select class="ke-inline-block" name="orderType">','<option value="NAME">'+h.fileName+"</option>",'<option value="SIZE">'+h.fileSize+"</option>",'<option value="TYPE">'+h.fileType+"</option>",'</select></div><div class="ke-clearfix"></div></div><div class="ke-plugin-filemanager-body"></div></div>'].join(""),A=f.createDialog({name:"filemanager",width:p,height:r,title:f.lang("filemanager"),
+body:m}),p=A.div,B=b(".ke-plugin-filemanager-body",p);b('[name="moveupImg"]',p);var G=b('[name="moveupLink"]',p);b('[name="viewServer"]',p);var C=b('[name="viewType"]',p),u=b('[name="orderType"]',p),I=[];C.val(D);n("",u.val(),D=="VIEW"?v:s);return A}});
+KindEditor.plugin("flash",function(b){var d=this,f=d.lang("flash."),j=b.undef(d.allowFlashUpload,!0),e=b.undef(d.allowFileManager,!1),h=b.undef(d.formatUploadUrl,!0),m=b.undef(d.extraFileUploadParams,{}),n=b.undef(d.filePostName,"imgFile"),o=b.undef(d.uploadJson,d.basePath+"php/upload_json.php");d.plugin.flash={edit:function(){var l=['<div style="padding:20px;"><div class="ke-dialog-row">','<label for="keUrl" style="width:60px;">'+f.url+"</label>",'<input class="ke-input-text" type="text" id="keUrl" name="url" value="" style="width:160px;" /> &nbsp;',
+'<input type="button" class="ke-upload-button" value="'+f.upload+'" /> &nbsp;','<span class="ke-button-common ke-button-outer">','<input type="button" class="ke-button-common ke-button" name="viewServer" value="'+f.viewServer+'" />','</span></div><div class="ke-dialog-row">','<label for="keWidth" style="width:60px;">'+f.width+"</label>",'<input type="text" id="keWidth" class="ke-input-text ke-input-number" name="width" value="550" maxlength="4" /> </div><div class="ke-dialog-row">','<label for="keHeight" style="width:60px;">'+
+f.height+"</label>",'<input type="text" id="keHeight" class="ke-input-text ke-input-number" name="height" value="400" maxlength="4" /> </div></div>'].join(""),s=d.createDialog({name:"flash",width:450,title:d.lang("flash"),body:l,yesBtn:{name:d.lang("yes"),click:function(){var e=b.trim(p.val()),f=r.val(),h=z.val();e=="http://"||b.invalidUrl(e)?(alert(d.lang("invalidUrl")),p[0].focus()):/^\d*$/.test(f)?/^\d*$/.test(h)?(e=b.mediaImg(d.themesPath+"common/blank.gif",{src:e,type:b.mediaType(".swf"),width:f,
+height:h,quality:"high"}),d.insertHtml(e).hideDialog().focus()):(alert(d.lang("invalidHeight")),z[0].focus()):(alert(d.lang("invalidWidth")),r[0].focus())}}}),v=s.div,p=b('[name="url"]',v),l=b('[name="viewServer"]',v),r=b('[name="width"]',v),z=b('[name="height"]',v);p.val("http://");if(j){var D=b.uploadbutton({button:b(".ke-upload-button",v)[0],fieldName:n,extraParams:m,url:b.addParam(o,"dir=flash"),afterUpload:function(e){s.hideLoading();if(e.error===0){var f=e.url;h&&(f=b.formatUrl(f,"absolute"));
+p.val(f);d.afterUpload&&d.afterUpload.call(d,f,e,"flash");alert(d.lang("uploadSuccess"))}else alert(e.message)},afterError:function(b){s.hideLoading();d.errorDialog(b)}});D.fileBox.change(function(){s.showLoading(d.lang("uploadLoading"));D.submit()})}else b(".ke-upload-button",v).hide();e?l.click(function(){d.loadPlugin("filemanager",function(){d.plugin.filemanagerDialog({viewType:"LIST",dirName:"flash",clickFn:function(e){d.dialogs.length>1&&(b('[name="url"]',v).val(e),d.afterSelectFile&&d.afterSelectFile.call(d,
+e),d.hideDialog())}})})}):l.hide();if(l=d.plugin.getSelectedFlash()){var q=b.mediaAttrs(l.attr("data-ke-tag"));p.val(q.src);r.val(b.removeUnit(l.css("width"))||q.width||0);z.val(b.removeUnit(l.css("height"))||q.height||0)}p[0].focus();p[0].select()},"delete":function(){d.plugin.getSelectedFlash().remove();d.addBookmark()}};d.clickToolbar("flash",d.plugin.flash.edit)});
+KindEditor.plugin("image",function(b){var d=this,f=b.undef(d.allowImageUpload,!0),j=b.undef(d.allowImageRemote,!0),e=b.undef(d.formatUploadUrl,!0),h=b.undef(d.allowFileManager,!1),m=b.undef(d.uploadJson,d.basePath+"php/upload_json.php"),n=b.undef(d.imageTabIndex,0),o=d.pluginsPath+"image/images/",l=b.undef(d.extraFileUploadParams,{}),s=b.undef(d.filePostName,"imgFile"),v=b.undef(d.fillDescAfterUploadImage,!1),p=d.lang("image.");d.plugin.imageDialog=function(f){function n(b,d){M.val(b);K.val(d);W=
+b;S=d}b.undef(f.imageWidth,"");b.undef(f.imageHeight,"");b.undef(f.imageTitle,"");b.undef(f.imageAlign,"");var j=b.undef(f.showRemote,!0),q=b.undef(f.showLocal,!0),A=b.undef(f.tabIndex,0),B=f.clickFn,G="kindeditor_upload_iframe_"+(new Date).getTime(),C=[],u;for(u in l)C.push('<input type="hidden" name="'+u+'" value="'+l[u]+'" />');var C=['<div style="padding:20px;"><div class="tabs"></div><div class="tab1" style="display:none;"><div class="ke-dialog-row">','<label for="remoteUrl" style="width:60px;">'+
+p.remoteUrl+"</label>",'<input type="text" id="remoteUrl" class="ke-input-text" name="url" value="" style="width:200px;" /> &nbsp;<span class="ke-button-common ke-button-outer">','<input type="button" class="ke-button-common ke-button" name="viewServer" value="'+p.viewServer+'" />','</span></div><div class="ke-dialog-row">','<label for="remoteWidth" style="width:60px;">'+p.size+"</label>",p.width+' <input type="text" id="remoteWidth" class="ke-input-text ke-input-number" name="width" value="" maxlength="4" /> ',
+p.height+' <input type="text" class="ke-input-text ke-input-number" name="height" value="" maxlength="4" /> ','<img class="ke-refresh-btn" src="'+o+'refresh.png" width="16" height="16" alt="" style="cursor:pointer;" title="'+p.resetSize+'" />','</div><div class="ke-dialog-row">','<label style="width:60px;">'+p.align+"</label>",'<input type="radio" name="align" class="ke-inline-block" value="" checked="checked" /> <img name="defaultImg" src="'+o+'align_top.gif" width="23" height="25" alt="" />',' <input type="radio" name="align" class="ke-inline-block" value="left" /> <img name="leftImg" src="'+
+o+'align_left.gif" width="23" height="25" alt="" />',' <input type="radio" name="align" class="ke-inline-block" value="right" /> <img name="rightImg" src="'+o+'align_right.gif" width="23" height="25" alt="" />','</div><div class="ke-dialog-row">','<label for="remoteTitle" style="width:60px;">'+p.imgTitle+"</label>",'<input type="text" id="remoteTitle" class="ke-input-text" name="title" value="" style="width:200px;" /></div></div><div class="tab2" style="display:none;">','<iframe name="'+G+'" style="display:none;"></iframe>',
+'<form class="ke-upload-area ke-form" method="post" enctype="multipart/form-data" target="'+G+'" action="'+b.addParam(m,"dir=image")+'">','<div class="ke-dialog-row">',C.join(""),'<label style="width:60px;">'+p.localUrl+"</label>",'<input type="text" name="localUrl" class="ke-input-text" tabindex="-1" style="width:200px;" readonly="true" /> &nbsp;','<input type="button" class="ke-upload-button" value="'+p.upload+'" />',"</div></form></div></div>"].join(""),I=d.createDialog({name:"image",width:q||
+h?450:400,height:q&&j?300:250,title:d.lang("image"),body:C,yesBtn:{name:d.lang("yes"),click:function(){if(!I.isLoading)if(q&&j&&H&&H.selectedIndex===1||!j)U.fileBox.val()==""?alert(d.lang("pleaseSelectFile")):(I.showLoading(d.lang("uploadLoading")),U.submit(),qa.val(""));else{var e=b.trim(T.val()),f=M.val(),h=K.val(),l=Q.val(),n="";R.each(function(){if(this.checked)return n=this.value,!1});e=="http://"||b.invalidUrl(e)?(alert(d.lang("invalidUrl")),T[0].focus()):/^\d*$/.test(f)?/^\d*$/.test(h)?B.call(d,
+e,l,f,h,0,n):(alert(d.lang("invalidHeight")),K[0].focus()):(alert(d.lang("invalidWidth")),M[0].focus())}}},beforeRemove:function(){$.unbind();M.unbind();K.unbind();O.unbind()}}),E=I.div,T=b('[name="url"]',E),qa=b('[name="localUrl"]',E),$=b('[name="viewServer"]',E),M=b('.tab1 [name="width"]',E),K=b('.tab1 [name="height"]',E),O=b(".ke-refresh-btn",E),Q=b('.tab1 [name="title"]',E),R=b('.tab1 [name="align"]',E),H;j&&q?(H=b.tabs({src:b(".tabs",E),afterSelect:function(){}}),H.add({title:p.remoteImage,panel:b(".tab1",
+E)}),H.add({title:p.localImage,panel:b(".tab2",E)}),H.select(A)):j?b(".tab1",E).show():q&&b(".tab2",E).show();var U=b.uploadbutton({button:b(".ke-upload-button",E)[0],fieldName:s,form:b(".ke-form",E),target:G,width:60,afterUpload:function(f){I.hideLoading();if(f.error===0){var h=f.url;e&&(h=b.formatUrl(h,"absolute"));d.afterUpload&&d.afterUpload.call(d,h,f,"image");v?(b(".ke-dialog-row #remoteUrl",E).val(h),b(".ke-tabs-li",E)[0].click(),b(".ke-refresh-btn",E).click()):B.call(d,h,f.title,f.width,f.height,
+f.border,f.align)}else alert(f.message)},afterError:function(b){I.hideLoading();d.errorDialog(b)}});U.fileBox.change(function(){qa.val(U.fileBox.val())});h?$.click(function(){d.loadPlugin("filemanager",function(){d.plugin.filemanagerDialog({viewType:"VIEW",dirName:"image",clickFn:function(e){d.dialogs.length>1&&(b('[name="url"]',E).val(e),d.afterSelectFile&&d.afterSelectFile.call(d,e),d.hideDialog())}})})}):$.hide();var W=0,S=0;O.click(function(){var d=b('<img src="'+T.val()+'" />',document).css({position:"absolute",
+visibility:"hidden",top:0,left:"-1000px"});d.bind("load",function(){n(d.width(),d.height());d.remove()});b(document.body).append(d)});M.change(function(){W>0&&K.val(Math.round(S/W*parseInt(this.value,10)))});K.change(function(){S>0&&M.val(Math.round(W/S*parseInt(this.value,10)))});T.val(f.imageUrl);n(f.imageWidth,f.imageHeight);Q.val(f.imageTitle);R.each(function(){if(this.value===f.imageAlign)return this.checked=!0,!1});j&&A===0&&(T[0].focus(),T[0].select());return I};d.plugin.image={edit:function(){var b=
+d.plugin.getSelectedImage();d.plugin.imageDialog({imageUrl:b?b.attr("data-ke-src"):"http://",imageWidth:b?b.width():"",imageHeight:b?b.height():"",imageTitle:b?b.attr("title"):"",imageAlign:b?b.attr("align"):"",showRemote:j,showLocal:f,tabIndex:b?0:n,clickFn:function(e,f,h,l,n,o){b?(b.attr("src",e),b.attr("data-ke-src",e),b.attr("width",h),b.attr("height",l),b.attr("title",f),b.attr("align",o),b.attr("alt",f)):d.exec("insertimage",e,f,h,l,n,o);setTimeout(function(){d.hideDialog().focus()},0)}})},
+"delete":function(){var b=d.plugin.getSelectedImage();b.parent().name=="a"&&(b=b.parent());b.remove();d.addBookmark()}};d.clickToolbar("image",d.plugin.image.edit)});
+KindEditor.plugin("insertfile",function(b){var d=this,f=b.undef(d.allowFileUpload,!0),j=b.undef(d.allowFileManager,!1),e=b.undef(d.formatUploadUrl,!0),h=b.undef(d.uploadJson,d.basePath+"php/upload_json.php"),m=b.undef(d.extraFileUploadParams,{}),n=b.undef(d.filePostName,"imgFile"),o=d.lang("insertfile.");d.plugin.fileDialog=function(l){var s=b.undef(l.fileUrl,"http://"),v=b.undef(l.fileTitle,""),p=l.clickFn,l=['<div style="padding:20px;"><div class="ke-dialog-row">','<label for="keUrl" style="width:60px;">'+
+o.url+"</label>",'<input type="text" id="keUrl" name="url" class="ke-input-text" style="width:160px;" /> &nbsp;','<input type="button" class="ke-upload-button" value="'+o.upload+'" /> &nbsp;','<span class="ke-button-common ke-button-outer">','<input type="button" class="ke-button-common ke-button" name="viewServer" value="'+o.viewServer+'" />','</span></div><div class="ke-dialog-row">','<label for="keTitle" style="width:60px;">'+o.title+"</label>",'<input type="text" id="keTitle" class="ke-input-text" name="title" value="" style="width:160px;" /></div></div></form></div>'].join(""),
+r=d.createDialog({name:"insertfile",width:450,title:d.lang("insertfile"),body:l,yesBtn:{name:d.lang("yes"),click:function(){var e=b.trim(D.val()),f=q.val();e=="http://"||b.invalidUrl(e)?(alert(d.lang("invalidUrl")),D[0].focus()):(b.trim(f)===""&&(f=e),p.call(d,e,f))}}}),z=r.div,D=b('[name="url"]',z),l=b('[name="viewServer"]',z),q=b('[name="title"]',z);if(f){var A=b.uploadbutton({button:b(".ke-upload-button",z)[0],fieldName:n,url:b.addParam(h,"dir=file"),extraParams:m,afterUpload:function(f){r.hideLoading();
+if(f.error===0){var h=f.url;e&&(h=b.formatUrl(h,"absolute"));D.val(h);d.afterUpload&&d.afterUpload.call(d,h,f,"insertfile");alert(d.lang("uploadSuccess"))}else alert(f.message)},afterError:function(b){r.hideLoading();d.errorDialog(b)}});A.fileBox.change(function(){r.showLoading(d.lang("uploadLoading"));A.submit()})}else b(".ke-upload-button",z).hide();j?l.click(function(){d.loadPlugin("filemanager",function(){d.plugin.filemanagerDialog({viewType:"LIST",dirName:"file",clickFn:function(e){d.dialogs.length>
+1&&(b('[name="url"]',z).val(e),d.afterSelectFile&&d.afterSelectFile.call(d,e),d.hideDialog())}})})}):l.hide();D.val(s);q.val(v);D[0].focus();D[0].select()};d.clickToolbar("insertfile",function(){d.plugin.fileDialog({clickFn:function(b,e){d.insertHtml('<a class="ke-insertfile" href="'+b+'" data-ke-src="'+b+'" target="_blank">'+e+"</a>").hideDialog().focus()}})})});
+KindEditor.plugin("lineheight",function(b){var d=this,f=d.lang("lineheight.");d.clickToolbar("lineheight",function(){var j="",e=d.cmd.commonNode({"*":".line-height"});e&&(j=e.css("line-height"));var h=d.createMenu({name:"lineheight",width:150});b.each(f.lineHeight,function(e,f){b.each(f,function(b,e){h.addItem({title:e,checked:j===b,click:function(){d.cmd.toggle('<span style="line-height:'+b+';"></span>',{span:".line-height="+b});d.updateState();d.addBookmark();d.hideMenu()}})})})})});
+KindEditor.plugin("link",function(b){var d=this;d.plugin.link={edit:function(){var f=d.lang("link."),j='<div style="padding:20px;"><div class="ke-dialog-row"><label for="keUrl" style="width:60px;">'+f.url+'</label><input class="ke-input-text" type="text" id="keUrl" name="url" value="" style="width:260px;" /></div><div class="ke-dialog-row""><label for="keType" style="width:60px;">'+f.linkType+'</label><select id="keType" name="type"></select></div></div>',j=d.createDialog({name:"link",width:450,title:d.lang("link"),
+body:j,yesBtn:{name:d.lang("yes"),click:function(){var f=b.trim(e.val());f=="http://"||b.invalidUrl(f)?(alert(d.lang("invalidUrl")),e[0].focus()):d.exec("createlink",f,h.val()).hideDialog().focus()}}}).div,e=b('input[name="url"]',j),h=b('select[name="type"]',j);e.val("http://");h[0].options[0]=new Option(f.newWindow,"_blank");h[0].options[1]=new Option(f.selfWindow,"");d.cmd.selection();if(f=d.plugin.getSelectedLink())d.cmd.range.selectNode(f[0]),d.cmd.select(),e.val(f.attr("data-ke-src")),h.val(f.attr("target"));
+e[0].focus();e[0].select()},"delete":function(){d.exec("unlink",null)}};d.clickToolbar("link",d.plugin.link.edit)});
+KindEditor.plugin("map",function(b){var d=this,f=d.lang("map.");d.clickToolbar("map",function(){function j(){n=l[0].contentWindow;o=b.iframeDoc(l)}var e=['<div style="padding:10px 20px;"><div class="ke-dialog-row">',f.address+' <input id="kindeditor_plugin_map_address" name="address" class="ke-input-text" value="" style="width:200px;" /> ','<span class="ke-button-common ke-button-outer">','<input type="button" name="searchBtn" class="ke-button-common ke-button" value="'+f.search+'" />','</span></div><div class="ke-map" style="width:558px;height:360px;"></div></div>'].join(""),
+e=d.createDialog({name:"map",width:600,title:d.lang("map"),body:e,yesBtn:{name:d.lang("yes"),click:function(){var b=n.map,e=b.getCenter().lat()+","+b.getCenter().lng(),f=b.getZoom(),b=b.getMapTypeId(),h="http://maps.googleapis.com/maps/api/staticmap";h+="?center="+encodeURIComponent(e);h+="&zoom="+encodeURIComponent(f);h+="&size=558x360";h+="&maptype="+encodeURIComponent(b);h+="&markers="+encodeURIComponent(e);h+="&language="+d.langType;h+="&sensor=false";d.exec("insertimage",h).hideDialog().focus()}},
+beforeRemove:function(){m.remove();o&&o.write("");l.remove()}}).div,h=b('[name="address"]',e),m=b('[name="searchBtn"]',e),n,o;['<!doctype html><html><head>\n<meta name="viewport" content="initial-scale=1.0, user-scalable=no" />\n<style>\n\thtml { height: 100% }\n\tbody { height: 100%; margin: 0; padding: 0; background-color: #FFF }\n\t#map_canvas { height: 100% }\n</style>','<script src="http://maps.googleapis.com/maps/api/js?sensor=false&language='+d.langType+'"><\/script>','<script>\nvar map, geocoder;\nfunction initialize() {\n\tvar latlng = new google.maps.LatLng(31.230393, 121.473704);\n\tvar options = {\n\t\tzoom: 11,\n\t\tcenter: latlng,\n\t\tdisableDefaultUI: true,\n\t\tpanControl: true,\n\t\tzoomControl: true,\n\t\tmapTypeControl: true,\n\t\tscaleControl: true,\n\t\tstreetViewControl: false,\n\t\toverviewMapControl: true,\n\t\tmapTypeId: google.maps.MapTypeId.ROADMAP\n\t};\n\tmap = new google.maps.Map(document.getElementById("map_canvas"), options);\n\tgeocoder = new google.maps.Geocoder();\n\tgeocoder.geocode({latLng: latlng}, function(results, status) {\n\t\tif (status == google.maps.GeocoderStatus.OK) {\n\t\t\tif (results[3]) {\n\t\t\t\tparent.document.getElementById("kindeditor_plugin_map_address").value = results[3].formatted_address;\n\t\t\t}\n\t\t}\n\t});\n}\nfunction search(address) {\n\tif (!map) return;\n\tgeocoder.geocode({address : address}, function(results, status) {\n\t\tif (status == google.maps.GeocoderStatus.OK) {\n\t\t\tmap.setZoom(11);\n\t\t\tmap.setCenter(results[0].geometry.location);\n\t\t\tvar marker = new google.maps.Marker({\n\t\t\t\tmap: map,\n\t\t\t\tposition: results[0].geometry.location\n\t\t\t});\n\t\t} else {\n\t\t\talert("Invalid address: " + address);\n\t\t}\n\t});\n}\n<\/script>\n</head>\n<body onload="initialize();">\n<div id="map_canvas" style="width:100%; height:100%"></div>\n</body></html>'].join("\n");
+var l=b('<iframe class="ke-textarea" frameborder="0" src="'+d.pluginsPath+'map/map.html" style="width:558px;height:360px;"></iframe>');l.bind("load",function(){l.unbind("load");b.IE?j():setTimeout(j,0)});b(".ke-map",e).replaceWith(l);m.click(function(){n.search(h.val())})})});
+KindEditor.plugin("media",function(b){var d=this,f=d.lang("media."),j=b.undef(d.allowMediaUpload,!0),e=b.undef(d.allowFileManager,!1),h=b.undef(d.formatUploadUrl,!0),m=b.undef(d.extraFileUploadParams,{}),n=b.undef(d.filePostName,"imgFile"),o=b.undef(d.uploadJson,d.basePath+"php/upload_json.php");d.plugin.media={edit:function(){var l=['<div style="padding:20px;"><div class="ke-dialog-row">','<label for="keUrl" style="width:60px;">'+f.url+"</label>",'<input class="ke-input-text" type="text" id="keUrl" name="url" value="" style="width:160px;" /> &nbsp;',
+'<input type="button" class="ke-upload-button" value="'+f.upload+'" /> &nbsp;','<span class="ke-button-common ke-button-outer">','<input type="button" class="ke-button-common ke-button" name="viewServer" value="'+f.viewServer+'" />','</span></div><div class="ke-dialog-row">','<label for="keWidth" style="width:60px;">'+f.width+"</label>",'<input type="text" id="keWidth" class="ke-input-text ke-input-number" name="width" value="550" maxlength="4" /></div><div class="ke-dialog-row">','<label for="keHeight" style="width:60px;">'+
+f.height+"</label>",'<input type="text" id="keHeight" class="ke-input-text ke-input-number" name="height" value="400" maxlength="4" /></div><div class="ke-dialog-row">','<label for="keAutostart">'+f.autostart+"</label>",'<input type="checkbox" id="keAutostart" name="autostart" value="" /> </div></div>'].join(""),s=d.createDialog({name:"media",width:450,height:230,title:d.lang("media"),body:l,yesBtn:{name:d.lang("yes"),click:function(){var e=b.trim(p.val()),f=r.val(),h=z.val();e=="http://"||b.invalidUrl(e)?
+(alert(d.lang("invalidUrl")),p[0].focus()):/^\d*$/.test(f)?/^\d*$/.test(h)?(e=b.mediaImg(d.themesPath+"common/blank.gif",{src:e,type:b.mediaType(e),width:f,height:h,autostart:D[0].checked?"true":"false",loop:"true"}),d.insertHtml(e).hideDialog().focus()):(alert(d.lang("invalidHeight")),z[0].focus()):(alert(d.lang("invalidWidth")),r[0].focus())}}}),v=s.div,p=b('[name="url"]',v),l=b('[name="viewServer"]',v),r=b('[name="width"]',v),z=b('[name="height"]',v),D=b('[name="autostart"]',v);p.val("http://");
+if(j){var q=b.uploadbutton({button:b(".ke-upload-button",v)[0],fieldName:n,extraParams:m,url:b.addParam(o,"dir=media"),afterUpload:function(e){s.hideLoading();if(e.error===0){var f=e.url;h&&(f=b.formatUrl(f,"absolute"));p.val(f);d.afterUpload&&d.afterUpload.call(d,f,e,"media");alert(d.lang("uploadSuccess"))}else alert(e.message)},afterError:function(b){s.hideLoading();d.errorDialog(b)}});q.fileBox.change(function(){s.showLoading(d.lang("uploadLoading"));q.submit()})}else b(".ke-upload-button",v).hide();
+e?l.click(function(){d.loadPlugin("filemanager",function(){d.plugin.filemanagerDialog({viewType:"LIST",dirName:"media",clickFn:function(e){d.dialogs.length>1&&(b('[name="url"]',v).val(e),d.afterSelectFile&&d.afterSelectFile.call(d,e),d.hideDialog())}})})}):l.hide();if(l=d.plugin.getSelectedMedia()){var A=b.mediaAttrs(l.attr("data-ke-tag"));p.val(A.src);r.val(b.removeUnit(l.css("width"))||A.width||0);z.val(b.removeUnit(l.css("height"))||A.height||0);D[0].checked=A.autostart==="true"}p[0].focus();p[0].select()},
+"delete":function(){d.plugin.getSelectedMedia().remove();d.addBookmark()}};d.clickToolbar("media",d.plugin.media.edit)});
+(function(b){function d(b){this.init(b)}b.extend(d,{init:function(d){function j(d,e){b(".ke-status > div",d).hide();b(".ke-message",d).addClass("ke-error").show().html(b.escape(e))}var e=this;d.afterError=d.afterError||function(b){alert(b)};e.options=d;e.progressbars={};e.div=b(d.container).html(['<div class="ke-swfupload"><div class="ke-swfupload-top"><div class="ke-inline-block ke-swfupload-button"><input type="button" value="Browse" /></div>','<div class="ke-inline-block ke-swfupload-desc">'+d.uploadDesc+
+"</div>",'<span class="ke-button-common ke-button-outer ke-swfupload-startupload">','<input type="button" class="ke-button-common ke-button" value="'+d.startButtonValue+'" />','</span></div><div class="ke-swfupload-body"></div></div>'].join(""));e.bodyDiv=b(".ke-swfupload-body",e.div);var h={debug:!1,upload_url:d.uploadUrl,flash_url:d.flashUrl,file_post_name:d.filePostName,button_placeholder:b(".ke-swfupload-button > input",e.div)[0],button_image_url:d.buttonImageUrl,button_width:d.buttonWidth,button_height:d.buttonHeight,
+button_cursor:SWFUpload.CURSOR.HAND,file_types:d.fileTypes,file_types_description:d.fileTypesDesc,file_upload_limit:d.fileUploadLimit,file_size_limit:d.fileSizeLimit,post_params:d.postParams,file_queued_handler:function(b){b.url=e.options.fileIconUrl;e.appendFile(b)},file_queue_error_handler:function(e,h){var o="";switch(h){case SWFUpload.QUEUE_ERROR.QUEUE_LIMIT_EXCEEDED:o=d.queueLimitExceeded;break;case SWFUpload.QUEUE_ERROR.FILE_EXCEEDS_SIZE_LIMIT:o=d.fileExceedsSizeLimit;break;case SWFUpload.QUEUE_ERROR.ZERO_BYTE_FILE:o=
+d.zeroByteFile;break;case SWFUpload.QUEUE_ERROR.INVALID_FILETYPE:o=d.invalidFiletype;break;default:o=d.unknownError}b.DEBUG&&alert(o)},upload_start_handler:function(d){d=b('div[data-id="'+d.id+'"]',this.bodyDiv);b(".ke-status > div",d).hide();b(".ke-progressbar",d).show()},upload_progress_handler:function(b,d,f){d=Math.round(d*100/f);b=e.progressbars[b.id];b.bar.css("width",Math.round(d*80/100)+"px");b.percent.html(d+"%")},upload_error_handler:function(d){d&&d.filestatus==SWFUpload.FILE_STATUS.ERROR&&
+(d=b('div[data-id="'+d.id+'"]',e.bodyDiv).eq(0),j(d,e.options.errorMessage))},upload_success_handler:function(d,f){var h=b('div[data-id="'+d.id+'"]',e.bodyDiv).eq(0),l={};try{l=b.json(f)}catch(s){e.options.afterError.call(this,"<!doctype html><html>"+f+"</html>")}l.error!==0?j(h,b.DEBUG?l.message:e.options.errorMessage):(d.url=l.url,b(".ke-img",h).attr("src",d.url).attr("data-status",d.filestatus).data("data",l),b(".ke-status > div",h).hide())}};e.swfu=new SWFUpload(h);b(".ke-swfupload-startupload input",
+e.div).click(function(){e.swfu.startUpload()})},getUrlList:function(){var d=[];b(".ke-img",self.bodyDiv).each(function(){var j=b(this);j.attr("data-status")==SWFUpload.FILE_STATUS.COMPLETE&&d.push(j.data("data"))});return d},removeFile:function(d){this.swfu.cancelUpload(d);d=b('div[data-id="'+d+'"]',this.bodyDiv);b(".ke-photo",d).unbind();b(".ke-delete",d).unbind();d.remove()},removeFiles:function(){var d=this;b(".ke-item",d.bodyDiv).each(function(){d.removeFile(b(this).attr("data-id"))})},appendFile:function(d){var j=
+this,e=b('<div class="ke-inline-block ke-item" data-id="'+d.id+'"></div>');j.bodyDiv.append(e);var h=b('<div class="ke-inline-block ke-photo"></div>').mouseover(function(){b(this).addClass("ke-on")}).mouseout(function(){b(this).removeClass("ke-on")});e.append(h);var m=b('<img src="'+d.url+'" class="ke-img" data-status="'+d.filestatus+'" width="80" height="80" alt="'+d.name+'" />');h.append(m);b('<span class="ke-delete"></span>').appendTo(h).click(function(){j.removeFile(d.id)});m=b('<div class="ke-status"></div>').appendTo(h);
+b('<div class="ke-progressbar"><div class="ke-progressbar-bar"><div class="ke-progressbar-bar-inner"></div></div><div class="ke-progressbar-percent">0%</div></div>').hide().appendTo(m);b('<div class="ke-message">'+j.options.pendingMessage+"</div>").appendTo(m);e.append('<div class="ke-name">'+d.name+"</div>");j.progressbars[d.id]={bar:b(".ke-progressbar-bar-inner",h),percent:b(".ke-progressbar-percent",h)}},remove:function(){this.removeFiles();this.swfu.destroy();this.div.html("")}});b.swfupload=
+function(b,j){return new d(b,j)}})(KindEditor);
+KindEditor.plugin("multiimage",function(b){var d=this;b.undef(d.formatUploadUrl,!0);var f=b.undef(d.uploadJson,d.basePath+"php/upload_json.php"),j=d.pluginsPath+"multiimage/images/",e=b.undef(d.imageSizeLimit,"1MB");b.undef(d.imageFileTypes,"*.jpg;*.gif;*.png");var h=b.undef(d.imageUploadLimit,20),m=b.undef(d.filePostName,"imgFile"),n=d.lang("multiimage.");d.plugin.multiImageDialog=function(o){var l=o.clickFn,o=b.tmpl(n.uploadDesc,{uploadLimit:h,sizeLimit:e}),s=d.createDialog({name:"multiimage",width:650,
+height:510,title:d.lang("multiimage"),body:'<div style="padding:20px;"><div class="swfupload"></div></div>',previewBtn:{name:n.insertAll,click:function(){l.call(d,v.getUrlList())}},yesBtn:{name:n.clearAll,click:function(){v.removeFiles()}},beforeRemove:function(){(!b.IE||b.V<=8)&&v.remove()}}),v=b.swfupload({container:b(".swfupload",s.div),buttonImageUrl:j+(d.langType=="zh_CN"?"select-files-zh_CN.png":"select-files-en.png"),buttonWidth:d.langType=="zh_CN"?72:88,buttonHeight:23,fileIconUrl:j+"image.png",
+uploadDesc:o,startButtonValue:n.startUpload,uploadUrl:b.addParam(f,"dir=image"),flashUrl:j+"swfupload.swf",filePostName:m,fileTypes:"*.jpg;*.jpeg;*.gif;*.png;*.bmp",fileTypesDesc:"Image Files",fileUploadLimit:h,fileSizeLimit:e,postParams:b.undef(d.extraFileUploadParams,{}),queueLimitExceeded:n.queueLimitExceeded,fileExceedsSizeLimit:n.fileExceedsSizeLimit,zeroByteFile:n.zeroByteFile,invalidFiletype:n.invalidFiletype,unknownError:n.unknownError,pendingMessage:n.pending,errorMessage:n.uploadError,afterError:function(b){d.errorDialog(b)}});
+return s};d.clickToolbar("multiimage",function(){d.plugin.multiImageDialog({clickFn:function(e){e.length!==0&&(b.each(e,function(b,e){d.afterUpload&&d.afterUpload.call(d,e.url,e,"multiimage");d.exec("insertimage",e.url,e.title,e.width,e.height,e.border,e.align)}),setTimeout(function(){d.hideDialog().focus()},0))}})})});
+(function(){window.SWFUpload=function(b){this.initSWFUpload(b)};SWFUpload.prototype.initSWFUpload=function(b){try{this.customSettings={},this.settings=b,this.eventQueue=[],this.movieName="KindEditor_SWFUpload_"+SWFUpload.movieCount++,this.movieElement=null,SWFUpload.instances[this.movieName]=this,this.initSettings(),this.loadFlash(),this.displayDebugInfo()}catch(d){throw delete SWFUpload.instances[this.movieName],d;}};SWFUpload.instances={};SWFUpload.movieCount=0;SWFUpload.version="2.2.0 2009-03-25";
+SWFUpload.QUEUE_ERROR={QUEUE_LIMIT_EXCEEDED:-100,FILE_EXCEEDS_SIZE_LIMIT:-110,ZERO_BYTE_FILE:-120,INVALID_FILETYPE:-130};SWFUpload.UPLOAD_ERROR={HTTP_ERROR:-200,MISSING_UPLOAD_URL:-210,IO_ERROR:-220,SECURITY_ERROR:-230,UPLOAD_LIMIT_EXCEEDED:-240,UPLOAD_FAILED:-250,SPECIFIED_FILE_ID_NOT_FOUND:-260,FILE_VALIDATION_FAILED:-270,FILE_CANCELLED:-280,UPLOAD_STOPPED:-290};SWFUpload.FILE_STATUS={QUEUED:-1,IN_PROGRESS:-2,ERROR:-3,COMPLETE:-4,CANCELLED:-5};SWFUpload.BUTTON_ACTION={SELECT_FILE:-100,SELECT_FILES:-110,
+START_UPLOAD:-120};SWFUpload.CURSOR={ARROW:-1,HAND:-2};SWFUpload.WINDOW_MODE={WINDOW:"window",TRANSPARENT:"transparent",OPAQUE:"opaque"};SWFUpload.completeURL=function(b){if(typeof b!=="string"||b.match(/^https?:\/\//i)||b.match(/^\//))return b;var d=window.location.pathname.lastIndexOf("/");path=d<=0?"/":window.location.pathname.substr(0,d)+"/";return path+b};SWFUpload.prototype.initSettings=function(){this.ensureDefault=function(b,d){this.settings[b]=this.settings[b]==void 0?d:this.settings[b]};
+this.ensureDefault("upload_url","");this.ensureDefault("preserve_relative_urls",!1);this.ensureDefault("file_post_name","Filedata");this.ensureDefault("post_params",{});this.ensureDefault("use_query_string",!1);this.ensureDefault("requeue_on_error",!1);this.ensureDefault("http_success",[]);this.ensureDefault("assume_success_timeout",0);this.ensureDefault("file_types","*.*");this.ensureDefault("file_types_description","All Files");this.ensureDefault("file_size_limit",0);this.ensureDefault("file_upload_limit",
+0);this.ensureDefault("file_queue_limit",0);this.ensureDefault("flash_url","swfupload.swf");this.ensureDefault("prevent_swf_caching",!0);this.ensureDefault("button_image_url","");this.ensureDefault("button_width",1);this.ensureDefault("button_height",1);this.ensureDefault("button_text","");this.ensureDefault("button_text_style","color: #000000; font-size: 16pt;");this.ensureDefault("button_text_top_padding",0);this.ensureDefault("button_text_left_padding",0);this.ensureDefault("button_action",SWFUpload.BUTTON_ACTION.SELECT_FILES);
+this.ensureDefault("button_disabled",!1);this.ensureDefault("button_placeholder_id","");this.ensureDefault("button_placeholder",null);this.ensureDefault("button_cursor",SWFUpload.CURSOR.ARROW);this.ensureDefault("button_window_mode",SWFUpload.WINDOW_MODE.WINDOW);this.ensureDefault("debug",!1);this.settings.debug_enabled=this.settings.debug;this.settings.return_upload_start_handler=this.returnUploadStart;this.ensureDefault("swfupload_loaded_handler",null);this.ensureDefault("file_dialog_start_handler",
+null);this.ensureDefault("file_queued_handler",null);this.ensureDefault("file_queue_error_handler",null);this.ensureDefault("file_dialog_complete_handler",null);this.ensureDefault("upload_start_handler",null);this.ensureDefault("upload_progress_handler",null);this.ensureDefault("upload_error_handler",null);this.ensureDefault("upload_success_handler",null);this.ensureDefault("upload_complete_handler",null);this.ensureDefault("debug_handler",this.debugMessage);this.ensureDefault("custom_settings",{});
+this.customSettings=this.settings.custom_settings;if(this.settings.prevent_swf_caching)this.settings.flash_url=this.settings.flash_url+(this.settings.flash_url.indexOf("?")<0?"?":"&")+"preventswfcaching="+(new Date).getTime();if(!this.settings.preserve_relative_urls)this.settings.upload_url=SWFUpload.completeURL(this.settings.upload_url),this.settings.button_image_url=SWFUpload.completeURL(this.settings.button_image_url);delete this.ensureDefault};SWFUpload.prototype.loadFlash=function(){var b,d;
+if(document.getElementById(this.movieName)!==null)throw"ID "+this.movieName+" is already in use. The Flash Object could not be added";b=document.getElementById(this.settings.button_placeholder_id)||this.settings.button_placeholder;if(b==void 0)throw"Could not find the placeholder element: "+this.settings.button_placeholder_id;d=document.createElement("div");d.innerHTML=this.getFlashHTML();b.parentNode.replaceChild(d.firstChild,b);window[this.movieName]==void 0&&(window[this.movieName]=this.getMovieElement())};
+SWFUpload.prototype.getFlashHTML=function(){var b="";KindEditor.IE&&KindEditor.V>8&&(b=' classid = "clsid:d27cdb6e-ae6d-11cf-96b8-444553540000"');return['<object id="',this.movieName,'"'+b+' type="application/x-shockwave-flash" data="',this.settings.flash_url,'" width="',this.settings.button_width,'" height="',this.settings.button_height,'" class="swfupload"><param name="wmode" value="',this.settings.button_window_mode,'" /><param name="movie" value="',this.settings.flash_url,'" /><param name="quality" value="high" /><param name="menu" value="false" /><param name="allowScriptAccess" value="always" />',
+'<param name="flashvars" value="'+this.getFlashVars()+'" />',"</object>"].join("")};SWFUpload.prototype.getFlashVars=function(){var b=this.buildParamString(),d=this.settings.http_success.join(",");return["movieName=",encodeURIComponent(this.movieName),"&amp;uploadURL=",encodeURIComponent(this.settings.upload_url),"&amp;useQueryString=",encodeURIComponent(this.settings.use_query_string),"&amp;requeueOnError=",encodeURIComponent(this.settings.requeue_on_error),"&amp;httpSuccess=",encodeURIComponent(d),
+"&amp;assumeSuccessTimeout=",encodeURIComponent(this.settings.assume_success_timeout),"&amp;params=",encodeURIComponent(b),"&amp;filePostName=",encodeURIComponent(this.settings.file_post_name),"&amp;fileTypes=",encodeURIComponent(this.settings.file_types),"&amp;fileTypesDescription=",encodeURIComponent(this.settings.file_types_description),"&amp;fileSizeLimit=",encodeURIComponent(this.settings.file_size_limit),"&amp;fileUploadLimit=",encodeURIComponent(this.settings.file_upload_limit),"&amp;fileQueueLimit=",
+encodeURIComponent(this.settings.file_queue_limit),"&amp;debugEnabled=",encodeURIComponent(this.settings.debug_enabled),"&amp;buttonImageURL=",encodeURIComponent(this.settings.button_image_url),"&amp;buttonWidth=",encodeURIComponent(this.settings.button_width),"&amp;buttonHeight=",encodeURIComponent(this.settings.button_height),"&amp;buttonText=",encodeURIComponent(this.settings.button_text),"&amp;buttonTextTopPadding=",encodeURIComponent(this.settings.button_text_top_padding),"&amp;buttonTextLeftPadding=",
+encodeURIComponent(this.settings.button_text_left_padding),"&amp;buttonTextStyle=",encodeURIComponent(this.settings.button_text_style),"&amp;buttonAction=",encodeURIComponent(this.settings.button_action),"&amp;buttonDisabled=",encodeURIComponent(this.settings.button_disabled),"&amp;buttonCursor=",encodeURIComponent(this.settings.button_cursor)].join("")};SWFUpload.prototype.getMovieElement=function(){if(this.movieElement==void 0)this.movieElement=document.getElementById(this.movieName);if(this.movieElement===
+null)throw"Could not find Flash element";return this.movieElement};SWFUpload.prototype.buildParamString=function(){var b=this.settings.post_params,d=[];if(typeof b==="object")for(var f in b)b.hasOwnProperty(f)&&d.push(encodeURIComponent(f.toString())+"="+encodeURIComponent(b[f].toString()));return d.join("&amp;")};SWFUpload.prototype.destroy=function(){try{this.cancelUpload(null,!1);var b=null;if((b=this.getMovieElement())&&typeof b.CallFunction==="unknown"){for(var d in b)try{typeof b[d]==="function"&&
+(b[d]=null)}catch(f){}try{b.parentNode.removeChild(b)}catch(j){}}window[this.movieName]=null;SWFUpload.instances[this.movieName]=null;delete SWFUpload.instances[this.movieName];this.movieName=this.eventQueue=this.customSettings=this.settings=this.movieElement=null;return!0}catch(e){return!1}};SWFUpload.prototype.displayDebugInfo=function(){this.debug(["---SWFUpload Instance Info---\nVersion: ",SWFUpload.version,"\nMovie Name: ",this.movieName,"\nSettings:\n\tupload_url:               ",this.settings.upload_url,
+"\n\tflash_url:                ",this.settings.flash_url,"\n\tuse_query_string:         ",this.settings.use_query_string.toString(),"\n\trequeue_on_error:         ",this.settings.requeue_on_error.toString(),"\n\thttp_success:             ",this.settings.http_success.join(", "),"\n\tassume_success_timeout:   ",this.settings.assume_success_timeout,"\n\tfile_post_name:           ",this.settings.file_post_name,"\n\tpost_params:              ",this.settings.post_params.toString(),"\n\tfile_types:               ",
+this.settings.file_types,"\n\tfile_types_description:   ",this.settings.file_types_description,"\n\tfile_size_limit:          ",this.settings.file_size_limit,"\n\tfile_upload_limit:        ",this.settings.file_upload_limit,"\n\tfile_queue_limit:         ",this.settings.file_queue_limit,"\n\tdebug:                    ",this.settings.debug.toString(),"\n\tprevent_swf_caching:      ",this.settings.prevent_swf_caching.toString(),"\n\tbutton_placeholder_id:    ",this.settings.button_placeholder_id.toString(),
+"\n\tbutton_placeholder:       ",this.settings.button_placeholder?"Set":"Not Set","\n\tbutton_image_url:         ",this.settings.button_image_url.toString(),"\n\tbutton_width:             ",this.settings.button_width.toString(),"\n\tbutton_height:            ",this.settings.button_height.toString(),"\n\tbutton_text:              ",this.settings.button_text.toString(),"\n\tbutton_text_style:        ",this.settings.button_text_style.toString(),"\n\tbutton_text_top_padding:  ",this.settings.button_text_top_padding.toString(),
+"\n\tbutton_text_left_padding: ",this.settings.button_text_left_padding.toString(),"\n\tbutton_action:            ",this.settings.button_action.toString(),"\n\tbutton_disabled:          ",this.settings.button_disabled.toString(),"\n\tcustom_settings:          ",this.settings.custom_settings.toString(),"\nEvent Handlers:\n\tswfupload_loaded_handler assigned:  ",(typeof this.settings.swfupload_loaded_handler==="function").toString(),"\n\tfile_dialog_start_handler assigned: ",(typeof this.settings.file_dialog_start_handler===
+"function").toString(),"\n\tfile_queued_handler assigned:       ",(typeof this.settings.file_queued_handler==="function").toString(),"\n\tfile_queue_error_handler assigned:  ",(typeof this.settings.file_queue_error_handler==="function").toString(),"\n\tupload_start_handler assigned:      ",(typeof this.settings.upload_start_handler==="function").toString(),"\n\tupload_progress_handler assigned:   ",(typeof this.settings.upload_progress_handler==="function").toString(),"\n\tupload_error_handler assigned:      ",
+(typeof this.settings.upload_error_handler==="function").toString(),"\n\tupload_success_handler assigned:    ",(typeof this.settings.upload_success_handler==="function").toString(),"\n\tupload_complete_handler assigned:   ",(typeof this.settings.upload_complete_handler==="function").toString(),"\n\tdebug_handler assigned:             ",(typeof this.settings.debug_handler==="function").toString(),"\n"].join(""))};SWFUpload.prototype.addSetting=function(b,d,f){return d==void 0?this.settings[b]=f:this.settings[b]=
+d};SWFUpload.prototype.getSetting=function(b){if(this.settings[b]!=void 0)return this.settings[b];return""};SWFUpload.prototype.callFlash=function(b,d){var d=d||[],f=this.getMovieElement(),j,e;try{e=f.CallFunction('<invoke name="'+b+'" returntype="javascript">'+__flash__argumentsToXML(d,0)+"</invoke>"),j=eval(e)}catch(h){throw"Call to "+b+" failed";}j!=void 0&&typeof j.post==="object"&&(j=this.unescapeFilePostParams(j));return j};SWFUpload.prototype.selectFile=function(){this.callFlash("SelectFile")};
+SWFUpload.prototype.selectFiles=function(){this.callFlash("SelectFiles")};SWFUpload.prototype.startUpload=function(b){this.callFlash("StartUpload",[b])};SWFUpload.prototype.cancelUpload=function(b,d){d!==!1&&(d=!0);this.callFlash("CancelUpload",[b,d])};SWFUpload.prototype.stopUpload=function(){this.callFlash("StopUpload")};SWFUpload.prototype.getStats=function(){return this.callFlash("GetStats")};SWFUpload.prototype.setStats=function(b){this.callFlash("SetStats",[b])};SWFUpload.prototype.getFile=
+function(b){return typeof b==="number"?this.callFlash("GetFileByIndex",[b]):this.callFlash("GetFile",[b])};SWFUpload.prototype.addFileParam=function(b,d,f){return this.callFlash("AddFileParam",[b,d,f])};SWFUpload.prototype.removeFileParam=function(b,d){this.callFlash("RemoveFileParam",[b,d])};SWFUpload.prototype.setUploadURL=function(b){this.settings.upload_url=b.toString();this.callFlash("SetUploadURL",[b])};SWFUpload.prototype.setPostParams=function(b){this.settings.post_params=b;this.callFlash("SetPostParams",
+[b])};SWFUpload.prototype.addPostParam=function(b,d){this.settings.post_params[b]=d;this.callFlash("SetPostParams",[this.settings.post_params])};SWFUpload.prototype.removePostParam=function(b){delete this.settings.post_params[b];this.callFlash("SetPostParams",[this.settings.post_params])};SWFUpload.prototype.setFileTypes=function(b,d){this.settings.file_types=b;this.settings.file_types_description=d;this.callFlash("SetFileTypes",[b,d])};SWFUpload.prototype.setFileSizeLimit=function(b){this.settings.file_size_limit=
+b;this.callFlash("SetFileSizeLimit",[b])};SWFUpload.prototype.setFileUploadLimit=function(b){this.settings.file_upload_limit=b;this.callFlash("SetFileUploadLimit",[b])};SWFUpload.prototype.setFileQueueLimit=function(b){this.settings.file_queue_limit=b;this.callFlash("SetFileQueueLimit",[b])};SWFUpload.prototype.setFilePostName=function(b){this.settings.file_post_name=b;this.callFlash("SetFilePostName",[b])};SWFUpload.prototype.setUseQueryString=function(b){this.settings.use_query_string=b;this.callFlash("SetUseQueryString",
+[b])};SWFUpload.prototype.setRequeueOnError=function(b){this.settings.requeue_on_error=b;this.callFlash("SetRequeueOnError",[b])};SWFUpload.prototype.setHTTPSuccess=function(b){typeof b==="string"&&(b=b.replace(" ","").split(","));this.settings.http_success=b;this.callFlash("SetHTTPSuccess",[b])};SWFUpload.prototype.setAssumeSuccessTimeout=function(b){this.settings.assume_success_timeout=b;this.callFlash("SetAssumeSuccessTimeout",[b])};SWFUpload.prototype.setDebugEnabled=function(b){this.settings.debug_enabled=
+b;this.callFlash("SetDebugEnabled",[b])};SWFUpload.prototype.setButtonImageURL=function(b){b==void 0&&(b="");this.settings.button_image_url=b;this.callFlash("SetButtonImageURL",[b])};SWFUpload.prototype.setButtonDimensions=function(b,d){this.settings.button_width=b;this.settings.button_height=d;var f=this.getMovieElement();if(f!=void 0)f.style.width=b+"px",f.style.height=d+"px";this.callFlash("SetButtonDimensions",[b,d])};SWFUpload.prototype.setButtonText=function(b){this.settings.button_text=b;this.callFlash("SetButtonText",
+[b])};SWFUpload.prototype.setButtonTextPadding=function(b,d){this.settings.button_text_top_padding=d;this.settings.button_text_left_padding=b;this.callFlash("SetButtonTextPadding",[b,d])};SWFUpload.prototype.setButtonTextStyle=function(b){this.settings.button_text_style=b;this.callFlash("SetButtonTextStyle",[b])};SWFUpload.prototype.setButtonDisabled=function(b){this.settings.button_disabled=b;this.callFlash("SetButtonDisabled",[b])};SWFUpload.prototype.setButtonAction=function(b){this.settings.button_action=
+b;this.callFlash("SetButtonAction",[b])};SWFUpload.prototype.setButtonCursor=function(b){this.settings.button_cursor=b;this.callFlash("SetButtonCursor",[b])};SWFUpload.prototype.queueEvent=function(b,d){d==void 0?d=[]:d instanceof Array||(d=[d]);var f=this;if(typeof this.settings[b]==="function")this.eventQueue.push(function(){this.settings[b].apply(this,d)}),setTimeout(function(){f.executeNextEvent()},0);else if(this.settings[b]!==null)throw"Event handler "+b+" is unknown or is not a function";};
+SWFUpload.prototype.executeNextEvent=function(){var b=this.eventQueue?this.eventQueue.shift():null;typeof b==="function"&&b.apply(this)};SWFUpload.prototype.unescapeFilePostParams=function(b){var d=/[$]([0-9a-f]{4})/i,f={},j;if(b!=void 0){for(var e in b.post)if(b.post.hasOwnProperty(e)){j=e;for(var h;(h=d.exec(j))!==null;)j=j.replace(h[0],String.fromCharCode(parseInt("0x"+h[1],16)));f[j]=b.post[e]}b.post=f}return b};SWFUpload.prototype.testExternalInterface=function(){try{return this.callFlash("TestExternalInterface")}catch(b){return!1}};
+SWFUpload.prototype.flashReady=function(){var b=this.getMovieElement();b?(this.cleanUp(b),this.queueEvent("swfupload_loaded_handler")):this.debug("Flash called back ready but the flash movie can't be found.")};SWFUpload.prototype.cleanUp=function(b){try{if(this.movieElement&&typeof b.CallFunction==="unknown"){this.debug("Removing Flash functions hooks (this should only run in IE and should prevent memory leaks)");for(var d in b)try{typeof b[d]==="function"&&(b[d]=null)}catch(f){}}}catch(j){}window.__flash__removeCallback=
+function(b,d){try{b&&(b[d]=null)}catch(f){}}};SWFUpload.prototype.fileDialogStart=function(){this.queueEvent("file_dialog_start_handler")};SWFUpload.prototype.fileQueued=function(b){b=this.unescapeFilePostParams(b);this.queueEvent("file_queued_handler",b)};SWFUpload.prototype.fileQueueError=function(b,d,f){b=this.unescapeFilePostParams(b);this.queueEvent("file_queue_error_handler",[b,d,f])};SWFUpload.prototype.fileDialogComplete=function(b,d,f){this.queueEvent("file_dialog_complete_handler",[b,d,
+f])};SWFUpload.prototype.uploadStart=function(b){b=this.unescapeFilePostParams(b);this.queueEvent("return_upload_start_handler",b)};SWFUpload.prototype.returnUploadStart=function(b){var d;if(typeof this.settings.upload_start_handler==="function")b=this.unescapeFilePostParams(b),d=this.settings.upload_start_handler.call(this,b);else if(this.settings.upload_start_handler!=void 0)throw"upload_start_handler must be a function";d===void 0&&(d=!0);this.callFlash("ReturnUploadStart",[!!d])};SWFUpload.prototype.uploadProgress=
+function(b,d,f){b=this.unescapeFilePostParams(b);this.queueEvent("upload_progress_handler",[b,d,f])};SWFUpload.prototype.uploadError=function(b,d,f){b=this.unescapeFilePostParams(b);this.queueEvent("upload_error_handler",[b,d,f])};SWFUpload.prototype.uploadSuccess=function(b,d,f){b=this.unescapeFilePostParams(b);this.queueEvent("upload_success_handler",[b,d,f])};SWFUpload.prototype.uploadComplete=function(b){b=this.unescapeFilePostParams(b);this.queueEvent("upload_complete_handler",b)};SWFUpload.prototype.debug=
+function(b){this.queueEvent("debug_handler",b)};SWFUpload.prototype.debugMessage=function(b){if(this.settings.debug){var d=[];if(typeof b==="object"&&typeof b.name==="string"&&typeof b.message==="string"){for(var f in b)b.hasOwnProperty(f)&&d.push(f+": "+b[f]);b=d.join("\n")||"";d=b.split("\n");b="EXCEPTION: "+d.join("\nEXCEPTION: ")}SWFUpload.Console.writeLine(b)}};SWFUpload.Console={};SWFUpload.Console.writeLine=function(b){var d,f;try{d=document.getElementById("SWFUpload_Console");if(!d)f=document.createElement("form"),
+document.getElementsByTagName("body")[0].appendChild(f),d=document.createElement("textarea"),d.id="SWFUpload_Console",d.style.fontFamily="monospace",d.setAttribute("wrap","off"),d.wrap="off",d.style.overflow="auto",d.style.width="700px",d.style.height="350px",d.style.margin="5px",f.appendChild(d);d.value+=b+"\n";d.scrollTop=d.scrollHeight-d.clientHeight}catch(j){alert("Exception: "+j.name+" Message: "+j.message)}}})();
+(function(){if(typeof SWFUpload==="function")SWFUpload.queue={},SWFUpload.prototype.initSettings=function(b){return function(){typeof b==="function"&&b.call(this);this.queueSettings={};this.queueSettings.queue_cancelled_flag=!1;this.queueSettings.queue_upload_count=0;this.queueSettings.user_upload_complete_handler=this.settings.upload_complete_handler;this.queueSettings.user_upload_start_handler=this.settings.upload_start_handler;this.settings.upload_complete_handler=SWFUpload.queue.uploadCompleteHandler;
+this.settings.upload_start_handler=SWFUpload.queue.uploadStartHandler;this.settings.queue_complete_handler=this.settings.queue_complete_handler||null}}(SWFUpload.prototype.initSettings),SWFUpload.prototype.startUpload=function(b){this.queueSettings.queue_cancelled_flag=!1;this.callFlash("StartUpload",[b])},SWFUpload.prototype.cancelQueue=function(){this.queueSettings.queue_cancelled_flag=!0;this.stopUpload();for(var b=this.getStats();b.files_queued>0;)this.cancelUpload(),b=this.getStats()},SWFUpload.queue.uploadStartHandler=
+function(b){var d;typeof this.queueSettings.user_upload_start_handler==="function"&&(d=this.queueSettings.user_upload_start_handler.call(this,b));d=d===!1?!1:!0;this.queueSettings.queue_cancelled_flag=!d;return d},SWFUpload.queue.uploadCompleteHandler=function(b){var d=this.queueSettings.user_upload_complete_handler;b.filestatus===SWFUpload.FILE_STATUS.COMPLETE&&this.queueSettings.queue_upload_count++;if(typeof d==="function"?d.call(this,b)!==!1:b.filestatus!==SWFUpload.FILE_STATUS.QUEUED)this.getStats().files_queued>
+0&&this.queueSettings.queue_cancelled_flag===!1?this.startUpload():(this.queueSettings.queue_cancelled_flag===!1?this.queueEvent("queue_complete_handler",[this.queueSettings.queue_upload_count]):this.queueSettings.queue_cancelled_flag=!1,this.queueSettings.queue_upload_count=0)}})();
+KindEditor.plugin("pagebreak",function(b){var d=this,f=b.undef(d.pagebreakHtml,'<hr style="page-break-after: always;" class="ke-pagebreak" />');d.clickToolbar("pagebreak",function(){var j=d.cmd,e=j.range;d.focus();var h=d.newlineTag=="br"||b.WEBKIT?"":'<span id="__kindeditor_tail_tag__"></span>';d.insertHtml(f+h);h!==""&&(h=b("#__kindeditor_tail_tag__",d.edit.doc),e.selectNodeContents(h[0]),h.removeAttr("id"),j.select())})});
+KindEditor.plugin("plainpaste",function(b){var d=this;d.clickToolbar("plainpaste",function(){var f='<div style="padding:10px 20px;"><div style="margin-bottom:10px;">'+d.lang("plainpaste.").comment+'</div><textarea class="ke-textarea" style="width:408px;height:260px;"></textarea></div>',f=d.createDialog({name:"plainpaste",width:450,title:d.lang("plainpaste"),body:f,yesBtn:{name:d.lang("yes"),click:function(){var e=j.val(),e=b.escape(e),e=e.replace(/ {2}/g," &nbsp;"),e=d.newlineTag=="p"?e.replace(/^/,
+"<p>").replace(/$/,"</p>").replace(/\n/g,"</p><p>"):e.replace(/\n/g,"<br />$&");d.insertHtml(e).hideDialog().focus()}}}),j=b("textarea",f.div);j[0].focus()})});
+KindEditor.plugin("preview",function(b){var d=this;d.clickToolbar("preview",function(){d.lang("preview.");var f=d.createDialog({name:"preview",width:750,title:d.lang("preview"),body:'<div style="padding:10px 20px;"><iframe class="ke-textarea" frameborder="0" style="width:708px;height:400px;"></iframe></div>'}),f=b("iframe",f.div),j=b.iframeDoc(f);j.open();j.write(d.fullHtml());j.close();b(j.body).css("background-color","#FFF");f[0].contentWindow.focus()})});
+KindEditor.plugin("quickformat",function(b){function d(b){for(b=b.first();b&&b.first();)b=b.first();return b}var f=this,j=b.toMap("blockquote,center,div,h1,h2,h3,h4,h5,h6,p");f.clickToolbar("quickformat",function(){f.focus();for(var e=f.edit.doc,h=f.cmd.range,m=b(e.body).first(),n,o=[],l=[],s=h.createBookmark(!0);m;){n=m.next();var v=d(m);if(!v||v.name!="img")if(j[m.name]?(m.html(m.html().replace(/^(\s|&nbsp;|\u3000)+/ig,"")),m.css("text-indent","2em")):l.push(m),!n||j[n.name]||j[m.name]&&!j[n.name])l.length>
+0&&o.push(l),l=[];m=n}b.each(o,function(d,f){var h=b('<p style="text-indent:2em;"></p>',e);f[0].before(h);b.each(f,function(b,d){h.append(d)})});h.moveToBookmark(s);f.addBookmark()})});
+KindEditor.plugin("table",function(b){function d(b,d){d=d.toUpperCase();b.css("background-color",d);b.css("color",d==="#000000"?"#FFFFFF":"#000000");b.html(d)}function f(f,h){function l(){b.each(m,function(){this.remove()});m=[];b(document).unbind("click,mousedown",l);f.unbind("click,mousedown",l)}h.bind("click,mousedown",function(b){b.stopPropagation()});h.click(function(){l();var h=b(this),o=h.pos(),o=b.colorpicker({x:o.x,y:o.y+h.height(),z:811214,selectedColor:b(this).html(),colors:e.colorTable,
+noColor:e.lang("noColor"),shadowMode:e.shadowMode,click:function(b){d(h,b);l()}});m.push(o);b(document).bind("click,mousedown",l);f.bind("click,mousedown",l)})}function j(b,d,e){for(var f=b=0,h=d.cells.length;f<h;f++){if(d.cells[f]==e)break;b+=d.cells[f].rowSpan-1}return e.cellIndex-b}var e=this,h=e.lang("table."),m=[];e.plugin.table={prop:function(n){var o=['<div style="padding:20px;"><div class="ke-dialog-row">','<label for="keRows" style="width:90px;">'+h.cells+"</label>",h.rows+' <input type="text" id="keRows" class="ke-input-text ke-input-number" name="rows" value="" maxlength="4" /> &nbsp; ',
+h.cols+' <input type="text" class="ke-input-text ke-input-number" name="cols" value="" maxlength="4" />','</div><div class="ke-dialog-row">','<label for="keWidth" style="width:90px;">'+h.size+"</label>",h.width+' <input type="text" id="keWidth" class="ke-input-text ke-input-number" name="width" value="" maxlength="4" /> &nbsp; ','<select name="widthType">','<option value="%">'+h.percent+"</option>",'<option value="px">'+h.px+"</option>","</select> &nbsp; ",h.height+' <input type="text" class="ke-input-text ke-input-number" name="height" value="" maxlength="4" /> &nbsp; ',
+'<select name="heightType">','<option value="%">'+h.percent+"</option>",'<option value="px">'+h.px+"</option>",'</select></div><div class="ke-dialog-row">','<label for="kePadding" style="width:90px;">'+h.space+"</label>",h.padding+' <input type="text" id="kePadding" class="ke-input-text ke-input-number" name="padding" value="" maxlength="4" /> &nbsp; ',h.spacing+' <input type="text" class="ke-input-text ke-input-number" name="spacing" value="" maxlength="4" />','</div><div class="ke-dialog-row">',
+'<label for="keAlign" style="width:90px;">'+h.align+"</label>",'<select id="keAlign" name="align">','<option value="">'+h.alignDefault+"</option>",'<option value="left">'+h.alignLeft+"</option>",'<option value="center">'+h.alignCenter+"</option>",'<option value="right">'+h.alignRight+"</option>",'</select></div><div class="ke-dialog-row">','<label for="keBorder" style="width:90px;">'+h.border+"</label>",h.borderWidth+' <input type="text" id="keBorder" class="ke-input-text ke-input-number" name="border" value="" maxlength="4" /> &nbsp; ',
+h.borderColor+' <span class="ke-inline-block ke-input-color"></span>','</div><div class="ke-dialog-row">','<label for="keBgColor" style="width:90px;">'+h.backgroundColor+"</label>",'<span class="ke-inline-block ke-input-color"></span></div></div>'].join(""),l=e.cmd.range.createBookmark(),o=e.createDialog({name:"table",width:500,title:e.lang("table"),body:o,beforeRemove:function(){C.unbind()},yesBtn:{name:e.lang("yes"),click:function(){var d=j.val(),f=m.val(),h=p.val(),n=r.val(),o=z.val(),I=D.val(),
+O=q.val(),Q=A.val(),R=B.val(),H=G.val(),U=b(C[0]).html()||"",W=b(C[1]).html()||"";if(d==0||!/^\d+$/.test(d))alert(e.lang("invalidRows")),j[0].focus();else if(f==0||!/^\d+$/.test(f))alert(e.lang("invalidRows")),m[0].focus();else if(/^\d*$/.test(h))if(/^\d*$/.test(n))if(/^\d*$/.test(O))if(/^\d*$/.test(Q))if(/^\d*$/.test(H)){if(u)h!==""?u.width(h+o):u.css("width",""),u[0].width!==void 0&&u.removeAttr("width"),n!==""?u.height(n+I):u.css("height",""),u[0].height!==void 0&&u.removeAttr("height"),u.css("background-color",
+W),u[0].bgColor!==void 0&&u.removeAttr("bgColor"),O!==""?u[0].cellPadding=O:u.removeAttr("cellPadding"),Q!==""?u[0].cellSpacing=Q:u.removeAttr("cellSpacing"),R!==""?u[0].align=R:u.removeAttr("align"),H!==""?u.attr("border",H):u.removeAttr("border"),H===""||H==="0"?u.addClass("ke-zeroborder"):u.removeClass("ke-zeroborder"),U!==""?u.attr("borderColor",U):u.removeAttr("borderColor"),e.hideDialog().focus(),e.cmd.range.moveToBookmark(l),e.cmd.select();else{var S="";h!==""&&(S+="width:"+h+o+";");n!==""&&
+(S+="height:"+n+I+";");W!==""&&(S+="background-color:"+W+";");h="<table";S!==""&&(h+=' style="'+S+'"');O!==""&&(h+=' cellpadding="'+O+'"');Q!==""&&(h+=' cellspacing="'+Q+'"');R!==""&&(h+=' align="'+R+'"');H!==""&&(h+=' border="'+H+'"');if(H===""||H==="0")h+=' class="ke-zeroborder"';U!==""&&(h+=' bordercolor="'+U+'"');h+=">";for(O=0;O<d;O++){h+="<tr>";for(Q=0;Q<f;Q++)h+="<td>"+(b.IE?"&nbsp;":"<br />")+"</td>";h+="</tr>"}h+="</table>";b.IE||(h+="<br />");e.insertHtml(h);e.select().hideDialog().focus()}e.addBookmark()}else alert(e.lang("invalidBorder")),
+G[0].focus();else alert(e.lang("invalidSpacing")),A[0].focus();else alert(e.lang("invalidPadding")),q[0].focus();else alert(e.lang("invalidHeight")),r[0].focus();else alert(e.lang("invalidWidth")),p[0].focus()}}}).div,j=b('[name="rows"]',o).val(3),m=b('[name="cols"]',o).val(2),p=b('[name="width"]',o).val(100),r=b('[name="height"]',o),z=b('[name="widthType"]',o),D=b('[name="heightType"]',o),q=b('[name="padding"]',o).val(2),A=b('[name="spacing"]',o).val(0),B=b('[name="align"]',o),G=b('[name="border"]',
+o).val(1),C=b(".ke-input-color",o);f(o,C.eq(0));f(o,C.eq(1));d(C.eq(0),"#000000");d(C.eq(1),"");j[0].focus();j[0].select();var u;if(!n&&(u=e.plugin.getSelectedTable())){j.val(u[0].rows.length);m.val(u[0].rows.length>0?u[0].rows[0].cells.length:0);j.attr("disabled",!0);m.attr("disabled",!0);var I,n=u[0].style.width||u[0].width,o=u[0].style.height||u[0].height;n!==void 0&&(I=/^(\d+)((?:px|%)*)$/.exec(n))?(p.val(I[1]),z.val(I[2])):p.val("");if(o!==void 0&&(I=/^(\d+)((?:px|%)*)$/.exec(o)))r.val(I[1]),
+D.val(I[2]);q.val(u[0].cellPadding||"");A.val(u[0].cellSpacing||"");B.val(u[0].align||"");G.val(u[0].border===void 0?"":u[0].border);d(C.eq(0),b.toHex(u.attr("borderColor")||""));d(C.eq(1),b.toHex(u[0].style.backgroundColor||u[0].bgColor||""));p[0].focus();p[0].select()}},cellprop:function(){var n=['<div style="padding:20px;"><div class="ke-dialog-row">','<label for="keWidth" style="width:90px;">'+h.size+"</label>",h.width+' <input type="text" id="keWidth" class="ke-input-text ke-input-number" name="width" value="" maxlength="4" /> &nbsp; ',
+'<select name="widthType">','<option value="%">'+h.percent+"</option>",'<option value="px">'+h.px+"</option>","</select> &nbsp; ",h.height+' <input type="text" class="ke-input-text ke-input-number" name="height" value="" maxlength="4" /> &nbsp; ','<select name="heightType">','<option value="%">'+h.percent+"</option>",'<option value="px">'+h.px+"</option>",'</select></div><div class="ke-dialog-row">','<label for="keAlign" style="width:90px;">'+h.align+"</label>",h.textAlign+' <select id="keAlign" name="textAlign">',
+'<option value="">'+h.alignDefault+"</option>",'<option value="left">'+h.alignLeft+"</option>",'<option value="center">'+h.alignCenter+"</option>",'<option value="right">'+h.alignRight+"</option>","</select> ",h.verticalAlign+' <select name="verticalAlign">','<option value="">'+h.alignDefault+"</option>",'<option value="top">'+h.alignTop+"</option>",'<option value="middle">'+h.alignMiddle+"</option>",'<option value="bottom">'+h.alignBottom+"</option>",'<option value="baseline">'+h.alignBaseline+"</option>",
+'</select></div><div class="ke-dialog-row">','<label for="keBorder" style="width:90px;">'+h.border+"</label>",h.borderWidth+' <input type="text" id="keBorder" class="ke-input-text ke-input-number" name="border" value="" maxlength="4" /> &nbsp; ',h.borderColor+' <span class="ke-inline-block ke-input-color"></span>','</div><div class="ke-dialog-row">','<label for="keBgColor" style="width:90px;">'+h.backgroundColor+"</label>",'<span class="ke-inline-block ke-input-color"></span></div></div>'].join(""),
+o=e.cmd.range.createBookmark(),n=e.createDialog({name:"table",width:500,title:e.lang("tablecell"),body:n,beforeRemove:function(){B.unbind()},yesBtn:{name:e.lang("yes"),click:function(){var d=l.val(),f=j.val(),h=m.val(),n=p.val();r.val();z.val();var C=D.val(),$=q.val(),M=A.val(),K=b(B[0]).html()||"",O=b(B[1]).html()||"";/^\d*$/.test(d)?/^\d*$/.test(f)?/^\d*$/.test(M)?(G.css({width:d!==""?d+h:"",height:f!==""?f+n:"","background-color":O,"text-align":C,"vertical-align":$,"border-width":M,"border-style":M!==
+""?"solid":"","border-color":K}),e.hideDialog().focus(),e.cmd.range.moveToBookmark(o),e.cmd.select(),e.addBookmark()):(alert(e.lang("invalidBorder")),A[0].focus()):(alert(e.lang("invalidHeight")),j[0].focus()):(alert(e.lang("invalidWidth")),l[0].focus())}}}).div,l=b('[name="width"]',n).val(100),j=b('[name="height"]',n),m=b('[name="widthType"]',n),p=b('[name="heightType"]',n),r=b('[name="padding"]',n).val(2),z=b('[name="spacing"]',n).val(0),D=b('[name="textAlign"]',n),q=b('[name="verticalAlign"]',
+n),A=b('[name="border"]',n).val(1),B=b(".ke-input-color",n);f(n,B.eq(0));f(n,B.eq(1));d(B.eq(0),"#000000");d(B.eq(1),"");l[0].focus();l[0].select();var G=e.plugin.getSelectedCell(),C=G[0].style.height||G[0].height||"";(n=/^(\d+)((?:px|%)*)$/.exec(G[0].style.width||G[0].width||""))?(l.val(n[1]),m.val(n[2])):l.val("");if(n=/^(\d+)((?:px|%)*)$/.exec(C))j.val(n[1]),p.val(n[2]);D.val(G[0].style.textAlign||"");q.val(G[0].style.verticalAlign||"");(n=G[0].style.borderWidth||"")&&(n=parseInt(n));A.val(n);
+d(B.eq(0),b.toHex(G[0].style.borderColor||""));d(B.eq(1),b.toHex(G[0].style.backgroundColor||""));l[0].focus();l[0].select()},insert:function(){this.prop(!0)},"delete":function(){var b=e.plugin.getSelectedTable();e.cmd.range.setStartBefore(b[0]).collapse(!0);e.cmd.select();b.remove();e.addBookmark()},colinsert:function(d){var f=e.plugin.getSelectedTable()[0],h=e.plugin.getSelectedRow()[0],m=e.plugin.getSelectedCell()[0],d=m.cellIndex+d;d+=f.rows[0].cells.length-h.cells.length;for(var h=0,v=f.rows.length;h<
+v;h++){var p=f.rows[h],d=p.insertCell(d);d.innerHTML=b.IE?"":"<br />";d=j(f,p,d)}e.cmd.range.selectNodeContents(m).collapse(!0);e.cmd.select();e.addBookmark()},colinsertleft:function(){this.colinsert(0)},colinsertright:function(){this.colinsert(1)},rowinsert:function(d){var f=e.plugin.getSelectedTable()[0],h=e.plugin.getSelectedRow()[0],j=e.plugin.getSelectedCell()[0],m=h.rowIndex;d===1&&(m=h.rowIndex+(j.rowSpan-1)+d);for(var p=f.insertRow(m),r=0,z=h.cells.length;r<z;r++){h.cells[r].rowSpan>1&&(z-=
+h.cells[r].rowSpan-1);var D=p.insertCell(r);if(d===1&&h.cells[r].colSpan>1)D.colSpan=h.cells[r].colSpan;D.innerHTML=b.IE?"":"<br />"}for(h=m;h>=0;h--)if(d=f.rows[h].cells,d.length>r){for(f=j.cellIndex;f>=0;f--)d[f].rowSpan>1&&(d[f].rowSpan+=1);break}e.cmd.range.selectNodeContents(j).collapse(!0);e.cmd.select();e.addBookmark()},rowinsertabove:function(){this.rowinsert(0)},rowinsertbelow:function(){this.rowinsert(1)},rowmerge:function(){var b=e.plugin.getSelectedTable()[0],d=e.plugin.getSelectedRow()[0],
+f=e.plugin.getSelectedCell()[0],h=d.rowIndex+f.rowSpan,d=b.rows[h];if(!(b.rows.length<=h))b=f.cellIndex,d.cells.length<=b||(h=d.cells[b],f.colSpan===h.colSpan&&(f.rowSpan+=h.rowSpan,d.deleteCell(b),e.cmd.range.selectNodeContents(f).collapse(!0),e.cmd.select(),e.addBookmark()))},colmerge:function(){e.plugin.getSelectedTable();var b=e.plugin.getSelectedRow()[0],d=e.plugin.getSelectedCell()[0],f=d.cellIndex+1;if(!(b.cells.length<=f)){var h=b.cells[f];d.rowSpan===h.rowSpan&&(d.colSpan+=h.colSpan,b.deleteCell(f),
+e.cmd.range.selectNodeContents(d).collapse(!0),e.cmd.select(),e.addBookmark())}},rowsplit:function(){var d=e.plugin.getSelectedTable()[0],f=e.plugin.getSelectedRow()[0],h=e.plugin.getSelectedCell()[0],m=f.rowIndex;if(h.rowSpan!==1){for(var v=j(d,f,h),f=1,p=h.rowSpan;f<p;f++){var r=d.rows[m+f],v=r.insertCell(v);if(h.colSpan>1)v.colSpan=h.colSpan;v.innerHTML=b.IE?"":"<br />";v=j(d,r,v)}b(h).removeAttr("rowSpan");e.cmd.range.selectNodeContents(h).collapse(!0);e.cmd.select();e.addBookmark()}},colsplit:function(){e.plugin.getSelectedTable();
+var d=e.plugin.getSelectedRow()[0],f=e.plugin.getSelectedCell()[0],h=f.cellIndex;if(f.colSpan!==1){for(var j=1,m=f.colSpan;j<m;j++){var p=d.insertCell(h+j);if(f.rowSpan>1)p.rowSpan=f.rowSpan;p.innerHTML=b.IE?"":"<br />"}b(f).removeAttr("colSpan");e.cmd.range.selectNodeContents(f).collapse(!0);e.cmd.select();e.addBookmark()}},coldelete:function(){for(var d=e.plugin.getSelectedTable()[0],f=e.plugin.getSelectedRow()[0],h=e.plugin.getSelectedCell()[0].cellIndex,j=0,m=d.rows.length;j<m;j++){var p=d.rows[j],
+r=p.cells[h];r.colSpan>1?(r.colSpan-=1,r.colSpan===1&&b(r).removeAttr("colSpan")):p.deleteCell(h);r.rowSpan>1&&(j+=r.rowSpan-1)}f.cells.length===0?(e.cmd.range.setStartBefore(d).collapse(!0),e.cmd.select(),b(d).remove()):e.cmd.selection(!0);e.addBookmark()},rowdelete:function(){for(var d=e.plugin.getSelectedTable()[0],f=e.plugin.getSelectedRow()[0],h=e.plugin.getSelectedCell()[0],f=f.rowIndex,h=h.rowSpan-1;h>=0;h--)d.deleteRow(f+h);d.rows.length===0?(e.cmd.range.setStartBefore(d).collapse(!0),e.cmd.select(),
+b(d).remove()):e.cmd.selection(!0);e.addBookmark()}};e.clickToolbar("table",e.plugin.table.prop)});
+KindEditor.plugin("template",function(b){function d(d){return j+d+"?ver="+encodeURIComponent(b.DEBUG?b.TIME:b.VERSION)}var f=this;f.lang("template.");var j=f.pluginsPath+"template/html/";f.clickToolbar("template",function(){var e=f.lang("template."),h=['<div style="padding:10px 20px;">','<div class="ke-header">','<div class="ke-left">',e.selectTemplate+" <select>"];b.each(e.fileList,function(b,d){h.push('<option value="'+b+'">'+d+"</option>")});html=[h.join(""),'</select></div><div class="ke-right">',
+'<input type="checkbox" id="keReplaceFlag" name="replaceFlag" value="1" /> <label for="keReplaceFlag">'+e.replaceContent+"</label>",'</div><div class="ke-clearfix"></div></div><iframe class="ke-textarea" frameborder="0" style="width:458px;height:260px;background-color:#FFF;"></iframe></div>'].join("");var e=f.createDialog({name:"template",width:500,title:f.lang("template"),body:html,yesBtn:{name:f.lang("yes"),click:function(){var d=b.iframeDoc(o);f[n[0].checked?"html":"insertHtml"](d.body.innerHTML).hideDialog().focus()}}}),
+j=b("select",e.div),n=b('[name="replaceFlag"]',e.div),o=b("iframe",e.div);n[0].checked=!0;o.attr("src",d(j.val()));j.change(function(){o.attr("src",d(this.value))})})});
+KindEditor.plugin("wordpaste",function(b){var d=this;d.clickToolbar("wordpaste",function(){var f='<div style="padding:10px 20px;"><div style="margin-bottom:10px;">'+d.lang("wordpaste.").comment+'</div><iframe class="ke-textarea" frameborder="0" style="width:408px;height:260px;"></iframe></div>',f=d.createDialog({name:"wordpaste",width:450,title:d.lang("wordpaste"),body:f,yesBtn:{name:d.lang("yes"),click:function(){var e=j.body.innerHTML,e=b.clearMsWord(e,d.filterMode?d.htmlTags:b.options.htmlTags);
+d.insertHtml(e).hideDialog().focus()}}}).div,f=b("iframe",f),j=b.iframeDoc(f);if(!b.IE)j.designMode="on";j.open();j.write("<!doctype html><html><head><title>WordPaste</title></head>");j.write('<body style="background-color:#FFF;font-size:12px;margin:2px;">');b.IE||j.write("<br />");j.write("</body></html>");j.close();if(b.IE)j.body.contentEditable="true";f[0].contentWindow.focus()})});
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/kindeditor-all.js b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/kindeditor-all.js
new file mode 100644
index 0000000..a5b8ea3
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/kindeditor-all.js
@@ -0,0 +1,10220 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2013 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @website http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+* @version 4.1.10 (2013-11-23)
+*******************************************************************************/
+(function (window, undefined) {
+	if (window.KindEditor) {
+		return;
+	}
+if (!window.console) {
+	window.console = {};
+}
+if (!console.log) {
+	console.log = function () {};
+}
+var _VERSION = '4.1.10 (2013-11-23)',
+	_ua = navigator.userAgent.toLowerCase(),
+	_IE = _ua.indexOf('msie') > -1 && _ua.indexOf('opera') == -1,
+	_NEWIE = _ua.indexOf('msie') == -1 && _ua.indexOf('trident') > -1,
+	_GECKO = _ua.indexOf('gecko') > -1 && _ua.indexOf('khtml') == -1,
+	_WEBKIT = _ua.indexOf('applewebkit') > -1,
+	_OPERA = _ua.indexOf('opera') > -1,
+	_MOBILE = _ua.indexOf('mobile') > -1,
+	_IOS = /ipad|iphone|ipod/.test(_ua),
+	_QUIRKS = document.compatMode != 'CSS1Compat',
+	_IERANGE = !window.getSelection,
+	_matches = /(?:msie|firefox|webkit|opera)[\/:\s](\d+)/.exec(_ua),
+	_V = _matches ? _matches[1] : '0',
+	_TIME = new Date().getTime();
+function _isArray(val) {
+	if (!val) {
+		return false;
+	}
+	return Object.prototype.toString.call(val) === '[object Array]';
+}
+function _isFunction(val) {
+	if (!val) {
+		return false;
+	}
+	return Object.prototype.toString.call(val) === '[object Function]';
+}
+function _inArray(val, arr) {
+	for (var i = 0, len = arr.length; i < len; i++) {
+		if (val === arr[i]) {
+			return i;
+		}
+	}
+	return -1;
+}
+function _each(obj, fn) {
+	if (_isArray(obj)) {
+		for (var i = 0, len = obj.length; i < len; i++) {
+			if (fn.call(obj[i], i, obj[i]) === false) {
+				break;
+			}
+		}
+	} else {
+		for (var key in obj) {
+			if (obj.hasOwnProperty(key)) {
+				if (fn.call(obj[key], key, obj[key]) === false) {
+					break;
+				}
+			}
+		}
+	}
+}
+function _trim(str) {
+	return str.replace(/(?:^[ \t\n\r]+)|(?:[ \t\n\r]+$)/g, '');
+}
+function _inString(val, str, delimiter) {
+	delimiter = delimiter === undefined ? ',' : delimiter;
+	return (delimiter + str + delimiter).indexOf(delimiter + val + delimiter) >= 0;
+}
+function _addUnit(val, unit) {
+	unit = unit || 'px';
+	return val && /^\d+$/.test(val) ? val + unit : val;
+}
+function _removeUnit(val) {
+	var match;
+	return val && (match = /(\d+)/.exec(val)) ? parseInt(match[1], 10) : 0;
+}
+function _escape(val) {
+	return val.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;');
+}
+function _unescape(val) {
+	return val.replace(/&lt;/g, '<').replace(/&gt;/g, '>').replace(/&quot;/g, '"').replace(/&amp;/g, '&');
+}
+function _toCamel(str) {
+	var arr = str.split('-');
+	str = '';
+	_each(arr, function(key, val) {
+		str += (key > 0) ? val.charAt(0).toUpperCase() + val.substr(1) : val;
+	});
+	return str;
+}
+function _toHex(val) {
+	function hex(d) {
+		var s = parseInt(d, 10).toString(16).toUpperCase();
+		return s.length > 1 ? s : '0' + s;
+	}
+	return val.replace(/rgb\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)/ig,
+		function($0, $1, $2, $3) {
+			return '#' + hex($1) + hex($2) + hex($3);
+		}
+	);
+}
+function _toMap(val, delimiter) {
+	delimiter = delimiter === undefined ? ',' : delimiter;
+	var map = {}, arr = _isArray(val) ? val : val.split(delimiter), match;
+	_each(arr, function(key, val) {
+		if ((match = /^(\d+)\.\.(\d+)$/.exec(val))) {
+			for (var i = parseInt(match[1], 10); i <= parseInt(match[2], 10); i++) {
+				map[i.toString()] = true;
+			}
+		} else {
+			map[val] = true;
+		}
+	});
+	return map;
+}
+function _toArray(obj, offset) {
+	return Array.prototype.slice.call(obj, offset || 0);
+}
+function _undef(val, defaultVal) {
+	return val === undefined ? defaultVal : val;
+}
+function _invalidUrl(url) {
+	return !url || /[<>"]/.test(url);
+}
+function _addParam(url, param) {
+	return url.indexOf('?') >= 0 ? url + '&' + param : url + '?' + param;
+}
+function _extend(child, parent, proto) {
+	if (!proto) {
+		proto = parent;
+		parent = null;
+	}
+	var childProto;
+	if (parent) {
+		var fn = function () {};
+		fn.prototype = parent.prototype;
+		childProto = new fn();
+		_each(proto, function(key, val) {
+			childProto[key] = val;
+		});
+	} else {
+		childProto = proto;
+	}
+	childProto.constructor = child;
+	child.prototype = childProto;
+	child.parent = parent ? parent.prototype : null;
+}
+function _json(text) {
+	var match;
+	if ((match = /\{[\s\S]*\}|\[[\s\S]*\]/.exec(text))) {
+		text = match[0];
+	}
+	var cx = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g;
+	cx.lastIndex = 0;
+	if (cx.test(text)) {
+		text = text.replace(cx, function (a) {
+			return '\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
+		});
+	}
+	if (/^[\],:{}\s]*$/.
+	test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@').
+	replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']').
+	replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
+		return eval('(' + text + ')');
+	}
+	throw 'JSON parse error';
+}
+var _round = Math.round;
+var K = {
+	DEBUG : false,
+	VERSION : _VERSION,
+	IE : _IE,
+	GECKO : _GECKO,
+	WEBKIT : _WEBKIT,
+	OPERA : _OPERA,
+	V : _V,
+	TIME : _TIME,
+	each : _each,
+	isArray : _isArray,
+	isFunction : _isFunction,
+	inArray : _inArray,
+	inString : _inString,
+	trim : _trim,
+	addUnit : _addUnit,
+	removeUnit : _removeUnit,
+	escape : _escape,
+	unescape : _unescape,
+	toCamel : _toCamel,
+	toHex : _toHex,
+	toMap : _toMap,
+	toArray : _toArray,
+	undef : _undef,
+	invalidUrl : _invalidUrl,
+	addParam : _addParam,
+	extend : _extend,
+	json : _json
+};
+var _INLINE_TAG_MAP = _toMap('a,abbr,acronym,b,basefont,bdo,big,br,button,cite,code,del,dfn,em,font,i,img,input,ins,kbd,label,map,q,s,samp,select,small,span,strike,strong,sub,sup,textarea,tt,u,var'),
+	_BLOCK_TAG_MAP = _toMap('address,applet,blockquote,body,center,dd,dir,div,dl,dt,fieldset,form,frameset,h1,h2,h3,h4,h5,h6,head,hr,html,iframe,ins,isindex,li,map,menu,meta,noframes,noscript,object,ol,p,pre,script,style,table,tbody,td,tfoot,th,thead,title,tr,ul'),
+	_SINGLE_TAG_MAP = _toMap('area,base,basefont,br,col,frame,hr,img,input,isindex,link,meta,param,embed'),
+	_STYLE_TAG_MAP = _toMap('b,basefont,big,del,em,font,i,s,small,span,strike,strong,sub,sup,u'),
+	_CONTROL_TAG_MAP = _toMap('img,table,input,textarea,button'),
+	_PRE_TAG_MAP = _toMap('pre,style,script'),
+	_NOSPLIT_TAG_MAP = _toMap('html,head,body,td,tr,table,ol,ul,li'),
+	_AUTOCLOSE_TAG_MAP = _toMap('colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr'),
+	_FILL_ATTR_MAP = _toMap('checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected'),
+	_VALUE_TAG_MAP = _toMap('input,button,textarea,select');
+function _getBasePath() {
+	var els = document.getElementsByTagName('script'), src;
+	for (var i = 0, len = els.length; i < len; i++) {
+		src = els[i].src || '';
+		if (/kindeditor[\w\-\.]*\.js/.test(src)) {
+			return src.substring(0, src.lastIndexOf('/') + 1);
+		}
+	}
+	return '';
+}
+K.basePath = _getBasePath();
+K.options = {
+	designMode : true,
+	fullscreenMode : false,
+	filterMode : true,
+	wellFormatMode : true,
+	shadowMode : true,
+	loadStyleMode : true,
+	basePath : K.basePath,
+	themesPath : K.basePath + 'themes/',
+	langPath : K.basePath + 'lang/',
+	pluginsPath : K.basePath + 'plugins/',
+	themeType : 'default',
+	langType : 'zh_CN',
+	urlType : '',
+	newlineTag : 'p',
+	resizeType : 2,
+	syncType : 'form',
+	pasteType : 2,
+	dialogAlignType : 'page',
+	useContextmenu : true,
+	fullscreenShortcut : false,
+	bodyClass : 'ke-content',
+	indentChar : '\t',
+	cssPath : '',
+	cssData : '',
+	minWidth : 650,
+	minHeight : 100,
+	minChangeSize : 50,
+	zIndex : 811213,
+	items : [
+		'source', '|', 'undo', 'redo', '|', 'preview', 'print', 'template', 'code', 'cut', 'copy', 'paste',
+		'plainpaste', 'wordpaste', '|', 'justifyleft', 'justifycenter', 'justifyright',
+		'justifyfull', 'insertorderedlist', 'insertunorderedlist', 'indent', 'outdent', 'subscript',
+		'superscript', 'clearhtml', 'quickformat', 'selectall', '|', 'fullscreen', '/',
+		'formatblock', 'fontname', 'fontsize', '|', 'forecolor', 'hilitecolor', 'bold',
+		'italic', 'underline', 'strikethrough', 'lineheight', 'removeformat', '|', 'image', 'multiimage',
+		'flash', 'media', 'insertfile', 'table', 'hr', 'emoticons', 'baidumap', 'pagebreak',
+		'anchor', 'link', 'unlink', '|', 'about'
+	],
+	noDisableItems : ['source', 'fullscreen'],
+	colorTable : [
+		['#E53333', '#E56600', '#FF9900', '#64451D', '#DFC5A4', '#FFE500'],
+		['#009900', '#006600', '#99BB00', '#B8D100', '#60D978', '#00D5FF'],
+		['#337FE5', '#003399', '#4C33E5', '#9933E5', '#CC33E5', '#EE33EE'],
+		['#FFFFFF', '#CCCCCC', '#999999', '#666666', '#333333', '#000000']
+	],
+	fontSizeTable : ['9px', '10px', '12px', '14px', '16px', '18px', '24px', '32px'],
+	htmlTags : {
+		font : ['id', 'class', 'color', 'size', 'face', '.background-color'],
+		span : [
+			'id', 'class', '.color', '.background-color', '.font-size', '.font-family', '.background',
+			'.font-weight', '.font-style', '.text-decoration', '.vertical-align', '.line-height'
+		],
+		div : [
+			'id', 'class', 'align', '.border', '.margin', '.padding', '.text-align', '.color',
+			'.background-color', '.font-size', '.font-family', '.font-weight', '.background',
+			'.font-style', '.text-decoration', '.vertical-align', '.margin-left'
+		],
+		table: [
+			'id', 'class', 'border', 'cellspacing', 'cellpadding', 'width', 'height', 'align', 'bordercolor',
+			'.padding', '.margin', '.border', 'bgcolor', '.text-align', '.color', '.background-color',
+			'.font-size', '.font-family', '.font-weight', '.font-style', '.text-decoration', '.background',
+			'.width', '.height', '.border-collapse'
+		],
+		'td,th': [
+			'id', 'class', 'align', 'valign', 'width', 'height', 'colspan', 'rowspan', 'bgcolor',
+			'.text-align', '.color', '.background-color', '.font-size', '.font-family', '.font-weight',
+			'.font-style', '.text-decoration', '.vertical-align', '.background', '.border'
+		],
+		a : ['id', 'class', 'href', 'target', 'name'],
+		embed : ['id', 'class', 'src', 'width', 'height', 'type', 'loop', 'autostart', 'quality', '.width', '.height', 'align', 'allowscriptaccess'],
+		img : ['id', 'class', 'src', 'width', 'height', 'border', 'alt', 'title', 'align', '.width', '.height', '.border'],
+		'p,ol,ul,li,blockquote,h1,h2,h3,h4,h5,h6' : [
+			'id', 'class', 'align', '.text-align', '.color', '.background-color', '.font-size', '.font-family', '.background',
+			'.font-weight', '.font-style', '.text-decoration', '.vertical-align', '.text-indent', '.margin-left'
+		],
+		pre : ['id', 'class'],
+		hr : ['id', 'class', '.page-break-after'],
+		'br,tbody,tr,strong,b,sub,sup,em,i,u,strike,s,del' : ['id', 'class'],
+		iframe : ['id', 'class', 'src', 'frameborder', 'width', 'height', '.width', '.height']
+	},
+	layout : '<div class="container"><div class="toolbar"></div><div class="edit"></div><div class="statusbar"></div></div>'
+};
+var _useCapture = false;
+var _INPUT_KEY_MAP = _toMap('8,9,13,32,46,48..57,59,61,65..90,106,109..111,188,190..192,219..222');
+var _CURSORMOVE_KEY_MAP = _toMap('33..40');
+var _CHANGE_KEY_MAP = {};
+_each(_INPUT_KEY_MAP, function(key, val) {
+	_CHANGE_KEY_MAP[key] = val;
+});
+_each(_CURSORMOVE_KEY_MAP, function(key, val) {
+	_CHANGE_KEY_MAP[key] = val;
+});
+function _bindEvent(el, type, fn) {
+	if (el.addEventListener){
+		el.addEventListener(type, fn, _useCapture);
+	} else if (el.attachEvent){
+		el.attachEvent('on' + type, fn);
+	}
+}
+function _unbindEvent(el, type, fn) {
+	if (el.removeEventListener){
+		el.removeEventListener(type, fn, _useCapture);
+	} else if (el.detachEvent){
+		el.detachEvent('on' + type, fn);
+	}
+}
+var _EVENT_PROPS = ('altKey,attrChange,attrName,bubbles,button,cancelable,charCode,clientX,clientY,ctrlKey,currentTarget,' +
+	'data,detail,eventPhase,fromElement,handler,keyCode,metaKey,newValue,offsetX,offsetY,originalTarget,pageX,' +
+	'pageY,prevValue,relatedNode,relatedTarget,screenX,screenY,shiftKey,srcElement,target,toElement,view,wheelDelta,which').split(',');
+function KEvent(el, event) {
+	this.init(el, event);
+}
+_extend(KEvent, {
+	init : function(el, event) {
+		var self = this, doc = el.ownerDocument || el.document || el;
+		self.event = event;
+		_each(_EVENT_PROPS, function(key, val) {
+			self[val] = event[val];
+		});
+		if (!self.target) {
+			self.target = self.srcElement || doc;
+		}
+		if (self.target.nodeType === 3) {
+			self.target = self.target.parentNode;
+		}
+		if (!self.relatedTarget && self.fromElement) {
+			self.relatedTarget = self.fromElement === self.target ? self.toElement : self.fromElement;
+		}
+		if (self.pageX == null && self.clientX != null) {
+			var d = doc.documentElement, body = doc.body;
+			self.pageX = self.clientX + (d && d.scrollLeft || body && body.scrollLeft || 0) - (d && d.clientLeft || body && body.clientLeft || 0);
+			self.pageY = self.clientY + (d && d.scrollTop  || body && body.scrollTop  || 0) - (d && d.clientTop  || body && body.clientTop  || 0);
+		}
+		if (!self.which && ((self.charCode || self.charCode === 0) ? self.charCode : self.keyCode)) {
+			self.which = self.charCode || self.keyCode;
+		}
+		if (!self.metaKey && self.ctrlKey) {
+			self.metaKey = self.ctrlKey;
+		}
+		if (!self.which && self.button !== undefined) {
+			self.which = (self.button & 1 ? 1 : (self.button & 2 ? 3 : (self.button & 4 ? 2 : 0)));
+		}
+		switch (self.which) {
+		case 186 :
+			self.which = 59;
+			break;
+		case 187 :
+		case 107 :
+		case 43 :
+			self.which = 61;
+			break;
+		case 189 :
+		case 45 :
+			self.which = 109;
+			break;
+		case 42 :
+			self.which = 106;
+			break;
+		case 47 :
+			self.which = 111;
+			break;
+		case 78 :
+			self.which = 110;
+			break;
+		}
+		if (self.which >= 96 && self.which <= 105) {
+			self.which -= 48;
+		}
+	},
+	preventDefault : function() {
+		var ev = this.event;
+		if (ev.preventDefault) {
+			ev.preventDefault();
+		} else {
+			ev.returnValue = false;
+		}
+	},
+	stopPropagation : function() {
+		var ev = this.event;
+		if (ev.stopPropagation) {
+			ev.stopPropagation();
+		} else {
+			ev.cancelBubble = true;
+		}
+	},
+	stop : function() {
+		this.preventDefault();
+		this.stopPropagation();
+	}
+});
+var _eventExpendo = 'kindeditor_' + _TIME, _eventId = 0, _eventData = {};
+function _getId(el) {
+	return el[_eventExpendo] || null;
+}
+function _setId(el) {
+	el[_eventExpendo] = ++_eventId;
+	return _eventId;
+}
+function _removeId(el) {
+	try {
+		delete el[_eventExpendo];
+	} catch(e) {
+		if (el.removeAttribute) {
+			el.removeAttribute(_eventExpendo);
+		}
+	}
+}
+function _bind(el, type, fn) {
+	if (type.indexOf(',') >= 0) {
+		_each(type.split(','), function() {
+			_bind(el, this, fn);
+		});
+		return;
+	}
+	var id = _getId(el);
+	if (!id) {
+		id = _setId(el);
+	}
+	if (_eventData[id] === undefined) {
+		_eventData[id] = {};
+	}
+	var events = _eventData[id][type];
+	if (events && events.length > 0) {
+		_unbindEvent(el, type, events[0]);
+	} else {
+		_eventData[id][type] = [];
+		_eventData[id].el = el;
+	}
+	events = _eventData[id][type];
+	if (events.length === 0) {
+		events[0] = function(e) {
+			var kevent = e ? new KEvent(el, e) : undefined;
+			_each(events, function(i, event) {
+				if (i > 0 && event) {
+					event.call(el, kevent);
+				}
+			});
+		};
+	}
+	if (_inArray(fn, events) < 0) {
+		events.push(fn);
+	}
+	_bindEvent(el, type, events[0]);
+}
+function _unbind(el, type, fn) {
+	if (type && type.indexOf(',') >= 0) {
+		_each(type.split(','), function() {
+			_unbind(el, this, fn);
+		});
+		return;
+	}
+	var id = _getId(el);
+	if (!id) {
+		return;
+	}
+	if (type === undefined) {
+		if (id in _eventData) {
+			_each(_eventData[id], function(key, events) {
+				if (key != 'el' && events.length > 0) {
+					_unbindEvent(el, key, events[0]);
+				}
+			});
+			delete _eventData[id];
+			_removeId(el);
+		}
+		return;
+	}
+	if (!_eventData[id]) {
+		return;
+	}
+	var events = _eventData[id][type];
+	if (events && events.length > 0) {
+		if (fn === undefined) {
+			_unbindEvent(el, type, events[0]);
+			delete _eventData[id][type];
+		} else {
+			_each(events, function(i, event) {
+				if (i > 0 && event === fn) {
+					events.splice(i, 1);
+				}
+			});
+			if (events.length == 1) {
+				_unbindEvent(el, type, events[0]);
+				delete _eventData[id][type];
+			}
+		}
+		var count = 0;
+		_each(_eventData[id], function() {
+			count++;
+		});
+		if (count < 2) {
+			delete _eventData[id];
+			_removeId(el);
+		}
+	}
+}
+function _fire(el, type) {
+	if (type.indexOf(',') >= 0) {
+		_each(type.split(','), function() {
+			_fire(el, this);
+		});
+		return;
+	}
+	var id = _getId(el);
+	if (!id) {
+		return;
+	}
+	var events = _eventData[id][type];
+	if (_eventData[id] && events && events.length > 0) {
+		events[0]();
+	}
+}
+function _ctrl(el, key, fn) {
+	var self = this;
+	key = /^\d{2,}$/.test(key) ? key : key.toUpperCase().charCodeAt(0);
+	_bind(el, 'keydown', function(e) {
+		if (e.ctrlKey && e.which == key && !e.shiftKey && !e.altKey) {
+			fn.call(el);
+			e.stop();
+		}
+	});
+}
+var _readyFinished = false;
+function _ready(fn) {
+	if (_readyFinished) {
+		fn(KindEditor);
+		return;
+	}
+	var loaded = false;
+	function readyFunc() {
+		if (!loaded) {
+			loaded = true;
+			fn(KindEditor);
+			_readyFinished = true;
+		}
+	}
+	function ieReadyFunc() {
+		if (!loaded) {
+			try {
+				document.documentElement.doScroll('left');
+			} catch(e) {
+				setTimeout(ieReadyFunc, 100);
+				return;
+			}
+			readyFunc();
+		}
+	}
+	function ieReadyStateFunc() {
+		if (document.readyState === 'complete') {
+			readyFunc();
+		}
+	}
+	if (document.addEventListener) {
+		_bind(document, 'DOMContentLoaded', readyFunc);
+	} else if (document.attachEvent) {
+		_bind(document, 'readystatechange', ieReadyStateFunc);
+		var toplevel = false;
+		try {
+			toplevel = window.frameElement == null;
+		} catch(e) {}
+		if (document.documentElement.doScroll && toplevel) {
+			ieReadyFunc();
+		}
+	}
+	_bind(window, 'load', readyFunc);
+}
+if (_IE) {
+	window.attachEvent('onunload', function() {
+		_each(_eventData, function(key, events) {
+			if (events.el) {
+				_unbind(events.el);
+			}
+		});
+	});
+}
+K.ctrl = _ctrl;
+K.ready = _ready;
+function _getCssList(css) {
+	var list = {},
+		reg = /\s*([\w\-]+)\s*:([^;]*)(;|$)/g,
+		match;
+	while ((match = reg.exec(css))) {
+		var key = _trim(match[1].toLowerCase()),
+			val = _trim(_toHex(match[2]));
+		list[key] = val;
+	}
+	return list;
+}
+function _getAttrList(tag) {
+	var list = {},
+		reg = /\s+(?:([\w\-:]+)|(?:([\w\-:]+)=([^\s"'<>]+))|(?:([\w\-:"]+)="([^"]*)")|(?:([\w\-:"]+)='([^']*)'))(?=(?:\s|\/|>)+)/g,
+		match;
+	while ((match = reg.exec(tag))) {
+		var key = (match[1] || match[2] || match[4] || match[6]).toLowerCase(),
+			val = (match[2] ? match[3] : (match[4] ? match[5] : match[7])) || '';
+		list[key] = val;
+	}
+	return list;
+}
+function _addClassToTag(tag, className) {
+	if (/\s+class\s*=/.test(tag)) {
+		tag = tag.replace(/(\s+class=["']?)([^"']*)(["']?[\s>])/, function($0, $1, $2, $3) {
+			if ((' ' + $2 + ' ').indexOf(' ' + className + ' ') < 0) {
+				return $2 === '' ? $1 + className + $3 : $1 + $2 + ' ' + className + $3;
+			} else {
+				return $0;
+			}
+		});
+	} else {
+		tag = tag.substr(0, tag.length - 1) + ' class="' + className + '">';
+	}
+	return tag;
+}
+function _formatCss(css) {
+	var str = '';
+	_each(_getCssList(css), function(key, val) {
+		str += key + ':' + val + ';';
+	});
+	return str;
+}
+function _formatUrl(url, mode, host, pathname) {
+	mode = _undef(mode, '').toLowerCase();
+	if (url.substr(0, 5) != 'data:') {
+		url = url.replace(/([^:])\/\//g, '$1/');
+	}
+	if (_inArray(mode, ['absolute', 'relative', 'domain']) < 0) {
+		return url;
+	}
+	host = host || location.protocol + '//' + location.host;
+	if (pathname === undefined) {
+		var m = location.pathname.match(/^(\/.*)\//);
+		pathname = m ? m[1] : '';
+	}
+	var match;
+	if ((match = /^(\w+:\/\/[^\/]*)/.exec(url))) {
+		if (match[1] !== host) {
+			return url;
+		}
+	} else if (/^\w+:/.test(url)) {
+		return url;
+	}
+	function getRealPath(path) {
+		var parts = path.split('/'), paths = [];
+		for (var i = 0, len = parts.length; i < len; i++) {
+			var part = parts[i];
+			if (part == '..') {
+				if (paths.length > 0) {
+					paths.pop();
+				}
+			} else if (part !== '' && part != '.') {
+				paths.push(part);
+			}
+		}
+		return '/' + paths.join('/');
+	}
+	if (/^\//.test(url)) {
+		url = host + getRealPath(url.substr(1));
+	} else if (!/^\w+:\/\//.test(url)) {
+		url = host + getRealPath(pathname + '/' + url);
+	}
+	function getRelativePath(path, depth) {
+		if (url.substr(0, path.length) === path) {
+			var arr = [];
+			for (var i = 0; i < depth; i++) {
+				arr.push('..');
+			}
+			var prefix = '.';
+			if (arr.length > 0) {
+				prefix += '/' + arr.join('/');
+			}
+			if (pathname == '/') {
+				prefix += '/';
+			}
+			return prefix + url.substr(path.length);
+		} else {
+			if ((match = /^(.*)\//.exec(path))) {
+				return getRelativePath(match[1], ++depth);
+			}
+		}
+	}
+	if (mode === 'relative') {
+		url = getRelativePath(host + pathname, 0).substr(2);
+	} else if (mode === 'absolute') {
+		if (url.substr(0, host.length) === host) {
+			url = url.substr(host.length);
+		}
+	}
+	return url;
+}
+function _formatHtml(html, htmlTags, urlType, wellFormatted, indentChar) {
+	if (html == null) {
+		html = '';
+	}
+	urlType = urlType || '';
+	wellFormatted = _undef(wellFormatted, false);
+	indentChar = _undef(indentChar, '\t');
+	var fontSizeList = 'xx-small,x-small,small,medium,large,x-large,xx-large'.split(',');
+	html = html.replace(/(<(?:pre|pre\s[^>]*)>)([\s\S]*?)(<\/pre>)/ig, function($0, $1, $2, $3) {
+		return $1 + $2.replace(/<(?:br|br\s[^>]*)>/ig, '\n') + $3;
+	});
+	html = html.replace(/<(?:br|br\s[^>]*)\s*\/?>\s*<\/p>/ig, '</p>');
+	html = html.replace(/(<(?:p|p\s[^>]*)>)\s*(<\/p>)/ig, '$1<br />$2');
+	html = html.replace(/\u200B/g, '');
+	html = html.replace(/\u00A9/g, '&copy;');
+	html = html.replace(/\u00AE/g, '&reg;');
+	html = html.replace(/<[^>]+/g, function($0) {
+		return $0.replace(/\s+/g, ' ');
+	});
+	var htmlTagMap = {};
+	if (htmlTags) {
+		_each(htmlTags, function(key, val) {
+			var arr = key.split(',');
+			for (var i = 0, len = arr.length; i < len; i++) {
+				htmlTagMap[arr[i]] = _toMap(val);
+			}
+		});
+		if (!htmlTagMap.script) {
+			html = html.replace(/(<(?:script|script\s[^>]*)>)([\s\S]*?)(<\/script>)/ig, '');
+		}
+		if (!htmlTagMap.style) {
+			html = html.replace(/(<(?:style|style\s[^>]*)>)([\s\S]*?)(<\/style>)/ig, '');
+		}
+	}
+	var re = /(\s*)<(\/)?([\w\-:]+)((?:\s+|(?:\s+[\w\-:]+)|(?:\s+[\w\-:]+=[^\s"'<>]+)|(?:\s+[\w\-:"]+="[^"]*")|(?:\s+[\w\-:"]+='[^']*'))*)(\/)?>(\s*)/g;
+	var tagStack = [];
+	html = html.replace(re, function($0, $1, $2, $3, $4, $5, $6) {
+		var full = $0,
+			startNewline = $1 || '',
+			startSlash = $2 || '',
+			tagName = $3.toLowerCase(),
+			attr = $4 || '',
+			endSlash = $5 ? ' ' + $5 : '',
+			endNewline = $6 || '';
+		if (htmlTags && !htmlTagMap[tagName]) {
+			return '';
+		}
+		if (endSlash === '' && _SINGLE_TAG_MAP[tagName]) {
+			endSlash = ' /';
+		}
+		if (_INLINE_TAG_MAP[tagName]) {
+			if (startNewline) {
+				startNewline = ' ';
+			}
+			if (endNewline) {
+				endNewline = ' ';
+			}
+		}
+		if (_PRE_TAG_MAP[tagName]) {
+			if (startSlash) {
+				endNewline = '\n';
+			} else {
+				startNewline = '\n';
+			}
+		}
+		if (wellFormatted && tagName == 'br') {
+			endNewline = '\n';
+		}
+		if (_BLOCK_TAG_MAP[tagName] && !_PRE_TAG_MAP[tagName]) {
+			if (wellFormatted) {
+				if (startSlash && tagStack.length > 0 && tagStack[tagStack.length - 1] === tagName) {
+					tagStack.pop();
+				} else {
+					tagStack.push(tagName);
+				}
+				startNewline = '\n';
+				endNewline = '\n';
+				for (var i = 0, len = startSlash ? tagStack.length : tagStack.length - 1; i < len; i++) {
+					startNewline += indentChar;
+					if (!startSlash) {
+						endNewline += indentChar;
+					}
+				}
+				if (endSlash) {
+					tagStack.pop();
+				} else if (!startSlash) {
+					endNewline += indentChar;
+				}
+			} else {
+				startNewline = endNewline = '';
+			}
+		}
+		if (attr !== '') {
+			var attrMap = _getAttrList(full);
+			if (tagName === 'font') {
+				var fontStyleMap = {}, fontStyle = '';
+				_each(attrMap, function(key, val) {
+					if (key === 'color') {
+						fontStyleMap.color = val;
+						delete attrMap[key];
+					}
+					if (key === 'size') {
+						fontStyleMap['font-size'] = fontSizeList[parseInt(val, 10) - 1] || '';
+						delete attrMap[key];
+					}
+					if (key === 'face') {
+						fontStyleMap['font-family'] = val;
+						delete attrMap[key];
+					}
+					if (key === 'style') {
+						fontStyle = val;
+					}
+				});
+				if (fontStyle && !/;$/.test(fontStyle)) {
+					fontStyle += ';';
+				}
+				_each(fontStyleMap, function(key, val) {
+					if (val === '') {
+						return;
+					}
+					if (/\s/.test(val)) {
+						val = "'" + val + "'";
+					}
+					fontStyle += key + ':' + val + ';';
+				});
+				attrMap.style = fontStyle;
+			}
+			_each(attrMap, function(key, val) {
+				if (_FILL_ATTR_MAP[key]) {
+					attrMap[key] = key;
+				}
+				if (_inArray(key, ['src', 'href']) >= 0) {
+					attrMap[key] = _formatUrl(val, urlType);
+				}
+				if (htmlTags && key !== 'style' && !htmlTagMap[tagName]['*'] && !htmlTagMap[tagName][key] ||
+					tagName === 'body' && key === 'contenteditable' ||
+					/^kindeditor_\d+$/.test(key)) {
+					delete attrMap[key];
+				}
+				if (key === 'style' && val !== '') {
+					var styleMap = _getCssList(val);
+					_each(styleMap, function(k, v) {
+						if (htmlTags && !htmlTagMap[tagName].style && !htmlTagMap[tagName]['.' + k]) {
+							delete styleMap[k];
+						}
+					});
+					var style = '';
+					_each(styleMap, function(k, v) {
+						style += k + ':' + v + ';';
+					});
+					attrMap.style = style;
+				}
+			});
+			attr = '';
+			_each(attrMap, function(key, val) {
+				if (key === 'style' && val === '') {
+					return;
+				}
+				val = val.replace(/"/g, '&quot;');
+				attr += ' ' + key + '="' + val + '"';
+			});
+		}
+		if (tagName === 'font') {
+			tagName = 'span';
+		}
+		return startNewline + '<' + startSlash + tagName + attr + endSlash + '>' + endNewline;
+	});
+	html = html.replace(/(<(?:pre|pre\s[^>]*)>)([\s\S]*?)(<\/pre>)/ig, function($0, $1, $2, $3) {
+		return $1 + $2.replace(/\n/g, '<span id="__kindeditor_pre_newline__">\n') + $3;
+	});
+	html = html.replace(/\n\s*\n/g, '\n');
+	html = html.replace(/<span id="__kindeditor_pre_newline__">\n/g, '\n');
+	return _trim(html);
+}
+function _clearMsWord(html, htmlTags) {
+	html = html.replace(/<meta[\s\S]*?>/ig, '')
+		.replace(/<![\s\S]*?>/ig, '')
+		.replace(/<style[^>]*>[\s\S]*?<\/style>/ig, '')
+		.replace(/<script[^>]*>[\s\S]*?<\/script>/ig, '')
+		.replace(/<w:[^>]+>[\s\S]*?<\/w:[^>]+>/ig, '')
+		.replace(/<o:[^>]+>[\s\S]*?<\/o:[^>]+>/ig, '')
+		.replace(/<xml>[\s\S]*?<\/xml>/ig, '')
+		.replace(/<(?:table|td)[^>]*>/ig, function(full) {
+			return full.replace(/border-bottom:([#\w\s]+)/ig, 'border:$1');
+		});
+	return _formatHtml(html, htmlTags);
+}
+function _mediaType(src) {
+	if (/\.(rm|rmvb)(\?|$)/i.test(src)) {
+		return 'audio/x-pn-realaudio-plugin';
+	}
+	if (/\.(swf|flv)(\?|$)/i.test(src)) {
+		return 'application/x-shockwave-flash';
+	}
+	return 'video/x-ms-asf-plugin';
+}
+function _mediaClass(type) {
+	if (/realaudio/i.test(type)) {
+		return 'ke-rm';
+	}
+	if (/flash/i.test(type)) {
+		return 'ke-flash';
+	}
+	return 'ke-media';
+}
+function _mediaAttrs(srcTag) {
+	return _getAttrList(unescape(srcTag));
+}
+function _mediaEmbed(attrs) {
+	var html = '<embed ';
+	_each(attrs, function(key, val) {
+		html += key + '="' + val + '" ';
+	});
+	html += '/>';
+	return html;
+}
+function _mediaImg(blankPath, attrs) {
+	var width = attrs.width,
+		height = attrs.height,
+		type = attrs.type || _mediaType(attrs.src),
+		srcTag = _mediaEmbed(attrs),
+		style = '';
+	if (/\D/.test(width)) {
+		style += 'width:' + width + ';';
+	} else if (width > 0) {
+		style += 'width:' + width + 'px;';
+	}
+	if (/\D/.test(height)) {
+		style += 'height:' + height + ';';
+	} else if (height > 0) {
+		style += 'height:' + height + 'px;';
+	}
+	var html = '<img class="' + _mediaClass(type) + '" src="' + blankPath + '" ';
+	if (style !== '') {
+		html += 'style="' + style + '" ';
+	}
+	html += 'data-ke-tag="' + escape(srcTag) + '" alt="" />';
+	return html;
+}
+function _tmpl(str, data) {
+	var fn = new Function("obj",
+		"var p=[],print=function(){p.push.apply(p,arguments);};" +
+		"with(obj){p.push('" +
+		str.replace(/[\r\t\n]/g, " ")
+			.split("<%").join("\t")
+			.replace(/((^|%>)[^\t]*)'/g, "$1\r")
+			.replace(/\t=(.*?)%>/g, "',$1,'")
+			.split("\t").join("');")
+			.split("%>").join("p.push('")
+			.split("\r").join("\\'") + "');}return p.join('');");
+	return data ? fn(data) : fn;
+}
+K.formatUrl = _formatUrl;
+K.formatHtml = _formatHtml;
+K.getCssList = _getCssList;
+K.getAttrList = _getAttrList;
+K.mediaType = _mediaType;
+K.mediaAttrs = _mediaAttrs;
+K.mediaEmbed = _mediaEmbed;
+K.mediaImg = _mediaImg;
+K.clearMsWord = _clearMsWord;
+K.tmpl = _tmpl;
+function _contains(nodeA, nodeB) {
+	if (nodeA.nodeType == 9 && nodeB.nodeType != 9) {
+		return true;
+	}
+	while ((nodeB = nodeB.parentNode)) {
+		if (nodeB == nodeA) {
+			return true;
+		}
+	}
+	return false;
+}
+var _getSetAttrDiv = document.createElement('div');
+_getSetAttrDiv.setAttribute('className', 't');
+var _GET_SET_ATTRIBUTE = _getSetAttrDiv.className !== 't';
+function _getAttr(el, key) {
+	key = key.toLowerCase();
+	var val = null;
+	if (!_GET_SET_ATTRIBUTE && el.nodeName.toLowerCase() != 'script') {
+		var div = el.ownerDocument.createElement('div');
+		div.appendChild(el.cloneNode(false));
+		var list = _getAttrList(_unescape(div.innerHTML));
+		if (key in list) {
+			val = list[key];
+		}
+	} else {
+		try {
+			val = el.getAttribute(key, 2);
+		} catch(e) {
+			val = el.getAttribute(key, 1);
+		}
+	}
+	if (key === 'style' && val !== null) {
+		val = _formatCss(val);
+	}
+	return val;
+}
+function _queryAll(expr, root) {
+	var exprList = expr.split(',');
+	if (exprList.length > 1) {
+		var mergedResults = [];
+		_each(exprList, function() {
+			_each(_queryAll(this, root), function() {
+				if (_inArray(this, mergedResults) < 0) {
+					mergedResults.push(this);
+				}
+			});
+		});
+		return mergedResults;
+	}
+	root = root || document;
+	function escape(str) {
+		if (typeof str != 'string') {
+			return str;
+		}
+		return str.replace(/([^\w\-])/g, '\\$1');
+	}
+	function stripslashes(str) {
+		return str.replace(/\\/g, '');
+	}
+	function cmpTag(tagA, tagB) {
+		return tagA === '*' || tagA.toLowerCase() === escape(tagB.toLowerCase());
+	}
+	function byId(id, tag, root) {
+		var arr = [],
+			doc = root.ownerDocument || root,
+			el = doc.getElementById(stripslashes(id));
+		if (el) {
+			if (cmpTag(tag, el.nodeName) && _contains(root, el)) {
+				arr.push(el);
+			}
+		}
+		return arr;
+	}
+	function byClass(className, tag, root) {
+		var doc = root.ownerDocument || root, arr = [], els, i, len, el;
+		if (root.getElementsByClassName) {
+			els = root.getElementsByClassName(stripslashes(className));
+			for (i = 0, len = els.length; i < len; i++) {
+				el = els[i];
+				if (cmpTag(tag, el.nodeName)) {
+					arr.push(el);
+				}
+			}
+		} else if (doc.querySelectorAll) {
+			els = doc.querySelectorAll((root.nodeName !== '#document' ? root.nodeName + ' ' : '') + tag + '.' + className);
+			for (i = 0, len = els.length; i < len; i++) {
+				el = els[i];
+				if (_contains(root, el)) {
+					arr.push(el);
+				}
+			}
+		} else {
+			els = root.getElementsByTagName(tag);
+			className = ' ' + className + ' ';
+			for (i = 0, len = els.length; i < len; i++) {
+				el = els[i];
+				if (el.nodeType == 1) {
+					var cls = el.className;
+					if (cls && (' ' + cls + ' ').indexOf(className) > -1) {
+						arr.push(el);
+					}
+				}
+			}
+		}
+		return arr;
+	}
+	function byName(name, tag, root) {
+		var arr = [], doc = root.ownerDocument || root,
+			els = doc.getElementsByName(stripslashes(name)), el;
+		for (var i = 0, len = els.length; i < len; i++) {
+			el = els[i];
+			if (cmpTag(tag, el.nodeName) && _contains(root, el)) {
+				if (el.getAttribute('name') !== null) {
+					arr.push(el);
+				}
+			}
+		}
+		return arr;
+	}
+	function byAttr(key, val, tag, root) {
+		var arr = [], els = root.getElementsByTagName(tag), el;
+		for (var i = 0, len = els.length; i < len; i++) {
+			el = els[i];
+			if (el.nodeType == 1) {
+				if (val === null) {
+					if (_getAttr(el, key) !== null) {
+						arr.push(el);
+					}
+				} else {
+					if (val === escape(_getAttr(el, key))) {
+						arr.push(el);
+					}
+				}
+			}
+		}
+		return arr;
+	}
+	function select(expr, root) {
+		var arr = [], matches;
+		matches = /^((?:\\.|[^.#\s\[<>])+)/.exec(expr);
+		var tag = matches ? matches[1] : '*';
+		if ((matches = /#((?:[\w\-]|\\.)+)$/.exec(expr))) {
+			arr = byId(matches[1], tag, root);
+		} else if ((matches = /\.((?:[\w\-]|\\.)+)$/.exec(expr))) {
+			arr = byClass(matches[1], tag, root);
+		} else if ((matches = /\[((?:[\w\-]|\\.)+)\]/.exec(expr))) {
+			arr = byAttr(matches[1].toLowerCase(), null, tag, root);
+		} else if ((matches = /\[((?:[\w\-]|\\.)+)\s*=\s*['"]?((?:\\.|[^'"]+)+)['"]?\]/.exec(expr))) {
+			var key = matches[1].toLowerCase(), val = matches[2];
+			if (key === 'id') {
+				arr = byId(val, tag, root);
+			} else if (key === 'class') {
+				arr = byClass(val, tag, root);
+			} else if (key === 'name') {
+				arr = byName(val, tag, root);
+			} else {
+				arr = byAttr(key, val, tag, root);
+			}
+		} else {
+			var els = root.getElementsByTagName(tag), el;
+			for (var i = 0, len = els.length; i < len; i++) {
+				el = els[i];
+				if (el.nodeType == 1) {
+					arr.push(el);
+				}
+			}
+		}
+		return arr;
+	}
+	var parts = [], arr, re = /((?:\\.|[^\s>])+|[\s>])/g;
+	while ((arr = re.exec(expr))) {
+		if (arr[1] !== ' ') {
+			parts.push(arr[1]);
+		}
+	}
+	var results = [];
+	if (parts.length == 1) {
+		return select(parts[0], root);
+	}
+	var isChild = false, part, els, subResults, val, v, i, j, k, length, len, l;
+	for (i = 0, lenth = parts.length; i < lenth; i++) {
+		part = parts[i];
+		if (part === '>') {
+			isChild = true;
+			continue;
+		}
+		if (i > 0) {
+			els = [];
+			for (j = 0, len = results.length; j < len; j++) {
+				val = results[j];
+				subResults = select(part, val);
+				for (k = 0, l = subResults.length; k < l; k++) {
+					v = subResults[k];
+					if (isChild) {
+						if (val === v.parentNode) {
+							els.push(v);
+						}
+					} else {
+						els.push(v);
+					}
+				}
+			}
+			results = els;
+		} else {
+			results = select(part, root);
+		}
+		if (results.length === 0) {
+			return [];
+		}
+	}
+	return results;
+}
+function _query(expr, root) {
+	var arr = _queryAll(expr, root);
+	return arr.length > 0 ? arr[0] : null;
+}
+K.query = _query;
+K.queryAll = _queryAll;
+function _get(val) {
+	return K(val)[0];
+}
+function _getDoc(node) {
+	if (!node) {
+		return document;
+	}
+	return node.ownerDocument || node.document || node;
+}
+function _getWin(node) {
+	if (!node) {
+		return window;
+	}
+	var doc = _getDoc(node);
+	return doc.parentWindow || doc.defaultView;
+}
+function _setHtml(el, html) {
+	if (el.nodeType != 1) {
+		return;
+	}
+	var doc = _getDoc(el);
+	try {
+		el.innerHTML = '<img id="__kindeditor_temp_tag__" width="0" height="0" style="display:none;" />' + html;
+		var temp = doc.getElementById('__kindeditor_temp_tag__');
+		temp.parentNode.removeChild(temp);
+	} catch(e) {
+		K(el).empty();
+		K('@' + html, doc).each(function() {
+			el.appendChild(this);
+		});
+	}
+}
+function _hasClass(el, cls) {
+	return _inString(cls, el.className, ' ');
+}
+function _setAttr(el, key, val) {
+	if (_IE && _V < 8 && key.toLowerCase() == 'class') {
+		key = 'className';
+	}
+	el.setAttribute(key, '' + val);
+}
+function _removeAttr(el, key) {
+	if (_IE && _V < 8 && key.toLowerCase() == 'class') {
+		key = 'className';
+	}
+	_setAttr(el, key, '');
+	el.removeAttribute(key);
+}
+function _getNodeName(node) {
+	if (!node || !node.nodeName) {
+		return '';
+	}
+	return node.nodeName.toLowerCase();
+}
+function _computedCss(el, key) {
+	var self = this, win = _getWin(el), camelKey = _toCamel(key), val = '';
+	if (win.getComputedStyle) {
+		var style = win.getComputedStyle(el, null);
+		val = style[camelKey] || style.getPropertyValue(key) || el.style[camelKey];
+	} else if (el.currentStyle) {
+		val = el.currentStyle[camelKey] || el.style[camelKey];
+	}
+	return val;
+}
+function _hasVal(node) {
+	return !!_VALUE_TAG_MAP[_getNodeName(node)];
+}
+function _docElement(doc) {
+	doc = doc || document;
+	return _QUIRKS ? doc.body : doc.documentElement;
+}
+function _docHeight(doc) {
+	var el = _docElement(doc);
+	return Math.max(el.scrollHeight, el.clientHeight);
+}
+function _docWidth(doc) {
+	var el = _docElement(doc);
+	return Math.max(el.scrollWidth, el.clientWidth);
+}
+function _getScrollPos(doc) {
+	doc = doc || document;
+	var x, y;
+	if (_IE || _NEWIE || _OPERA) {
+		x = _docElement(doc).scrollLeft;
+		y = _docElement(doc).scrollTop;
+	} else {
+		x = _getWin(doc).scrollX;
+		y = _getWin(doc).scrollY;
+	}
+	return {x : x, y : y};
+}
+function KNode(node) {
+	this.init(node);
+}
+_extend(KNode, {
+	init : function(node) {
+		var self = this;
+		node = _isArray(node) ? node : [node];
+		var length = 0;
+		for (var i = 0, len = node.length; i < len; i++) {
+			if (node[i]) {
+				self[i] = node[i].constructor === KNode ? node[i][0] : node[i];
+				length++;
+			}
+		}
+		self.length = length;
+		self.doc = _getDoc(self[0]);
+		self.name = _getNodeName(self[0]);
+		self.type = self.length > 0 ? self[0].nodeType : null;
+		self.win = _getWin(self[0]);
+	},
+	each : function(fn) {
+		var self = this;
+		for (var i = 0; i < self.length; i++) {
+			if (fn.call(self[i], i, self[i]) === false) {
+				return self;
+			}
+		}
+		return self;
+	},
+	bind : function(type, fn) {
+		this.each(function() {
+			_bind(this, type, fn);
+		});
+		return this;
+	},
+	unbind : function(type, fn) {
+		this.each(function() {
+			_unbind(this, type, fn);
+		});
+		return this;
+	},
+	fire : function(type) {
+		if (this.length < 1) {
+			return this;
+		}
+		_fire(this[0], type);
+		return this;
+	},
+	hasAttr : function(key) {
+		if (this.length < 1) {
+			return false;
+		}
+		return !!_getAttr(this[0], key);
+	},
+	attr : function(key, val) {
+		var self = this;
+		if (key === undefined) {
+			return _getAttrList(self.outer());
+		}
+		if (typeof key === 'object') {
+			_each(key, function(k, v) {
+				self.attr(k, v);
+			});
+			return self;
+		}
+		if (val === undefined) {
+			val = self.length < 1 ? null : _getAttr(self[0], key);
+			return val === null ? '' : val;
+		}
+		self.each(function() {
+			_setAttr(this, key, val);
+		});
+		return self;
+	},
+	removeAttr : function(key) {
+		this.each(function() {
+			_removeAttr(this, key);
+		});
+		return this;
+	},
+	get : function(i) {
+		if (this.length < 1) {
+			return null;
+		}
+		return this[i || 0];
+	},
+	eq : function(i) {
+		if (this.length < 1) {
+			return null;
+		}
+		return this[i] ? new KNode(this[i]) : null;
+	},
+	hasClass : function(cls) {
+		if (this.length < 1) {
+			return false;
+		}
+		return _hasClass(this[0], cls);
+	},
+	addClass : function(cls) {
+		this.each(function() {
+			if (!_hasClass(this, cls)) {
+				this.className = _trim(this.className + ' ' + cls);
+			}
+		});
+		return this;
+	},
+	removeClass : function(cls) {
+		this.each(function() {
+			if (_hasClass(this, cls)) {
+				this.className = _trim(this.className.replace(new RegExp('(^|\\s)' + cls + '(\\s|$)'), ' '));
+			}
+		});
+		return this;
+	},
+	html : function(val) {
+		var self = this;
+		if (val === undefined) {
+			if (self.length < 1 || self.type != 1) {
+				return '';
+			}
+			return _formatHtml(self[0].innerHTML);
+		}
+		self.each(function() {
+			_setHtml(this, val);
+		});
+		return self;
+	},
+	text : function() {
+		var self = this;
+		if (self.length < 1) {
+			return '';
+		}
+		return _IE ? self[0].innerText : self[0].textContent;
+	},
+	hasVal : function() {
+		if (this.length < 1) {
+			return false;
+		}
+		return _hasVal(this[0]);
+	},
+	val : function(val) {
+		var self = this;
+		if (val === undefined) {
+			if (self.length < 1) {
+				return '';
+			}
+			return self.hasVal() ? self[0].value : self.attr('value');
+		} else {
+			self.each(function() {
+				if (_hasVal(this)) {
+					this.value = val;
+				} else {
+					_setAttr(this, 'value' , val);
+				}
+			});
+			return self;
+		}
+	},
+	css : function(key, val) {
+		var self = this;
+		if (key === undefined) {
+			return _getCssList(self.attr('style'));
+		}
+		if (typeof key === 'object') {
+			_each(key, function(k, v) {
+				self.css(k, v);
+			});
+			return self;
+		}
+		if (val === undefined) {
+			if (self.length < 1) {
+				return '';
+			}
+			return self[0].style[_toCamel(key)] || _computedCss(self[0], key) || '';
+		}
+		self.each(function() {
+			this.style[_toCamel(key)] = val;
+		});
+		return self;
+	},
+	width : function(val) {
+		var self = this;
+		if (val === undefined) {
+			if (self.length < 1) {
+				return 0;
+			}
+			return self[0].offsetWidth;
+		}
+		return self.css('width', _addUnit(val));
+	},
+	height : function(val) {
+		var self = this;
+		if (val === undefined) {
+			if (self.length < 1) {
+				return 0;
+			}
+			return self[0].offsetHeight;
+		}
+		return self.css('height', _addUnit(val));
+	},
+	opacity : function(val) {
+		this.each(function() {
+			if (this.style.opacity === undefined) {
+				this.style.filter = val == 1 ? '' : 'alpha(opacity=' + (val * 100) + ')';
+			} else {
+				this.style.opacity = val == 1 ? '' : val;
+			}
+		});
+		return this;
+	},
+	data : function(key, val) {
+		var self = this;
+		key = 'kindeditor_data_' + key;
+		if (val === undefined) {
+			if (self.length < 1) {
+				return null;
+			}
+			return self[0][key];
+		}
+		this.each(function() {
+			this[key] = val;
+		});
+		return self;
+	},
+	pos : function() {
+		var self = this, node = self[0], x = 0, y = 0;
+		if (node) {
+			if (node.getBoundingClientRect) {
+				var box = node.getBoundingClientRect(),
+					pos = _getScrollPos(self.doc);
+				x = box.left + pos.x;
+				y = box.top + pos.y;
+			} else {
+				while (node) {
+					x += node.offsetLeft;
+					y += node.offsetTop;
+					node = node.offsetParent;
+				}
+			}
+		}
+		return {x : _round(x), y : _round(y)};
+	},
+	clone : function(bool) {
+		if (this.length < 1) {
+			return new KNode([]);
+		}
+		return new KNode(this[0].cloneNode(bool));
+	},
+	append : function(expr) {
+		this.each(function() {
+			if (this.appendChild) {
+				this.appendChild(_get(expr));
+			}
+		});
+		return this;
+	},
+	appendTo : function(expr) {
+		this.each(function() {
+			_get(expr).appendChild(this);
+		});
+		return this;
+	},
+	before : function(expr) {
+		this.each(function() {
+			this.parentNode.insertBefore(_get(expr), this);
+		});
+		return this;
+	},
+	after : function(expr) {
+		this.each(function() {
+			if (this.nextSibling) {
+				this.parentNode.insertBefore(_get(expr), this.nextSibling);
+			} else {
+				this.parentNode.appendChild(_get(expr));
+			}
+		});
+		return this;
+	},
+	replaceWith : function(expr) {
+		var nodes = [];
+		this.each(function(i, node) {
+			_unbind(node);
+			var newNode = _get(expr);
+			node.parentNode.replaceChild(newNode, node);
+			nodes.push(newNode);
+		});
+		return K(nodes);
+	},
+	empty : function() {
+		var self = this;
+		self.each(function(i, node) {
+			var child = node.firstChild;
+			while (child) {
+				if (!node.parentNode) {
+					return;
+				}
+				var next = child.nextSibling;
+				child.parentNode.removeChild(child);
+				child = next;
+			}
+		});
+		return self;
+	},
+	remove : function(keepChilds) {
+		var self = this;
+		self.each(function(i, node) {
+			if (!node.parentNode) {
+				return;
+			}
+			_unbind(node);
+			if (keepChilds) {
+				var child = node.firstChild;
+				while (child) {
+					var next = child.nextSibling;
+					node.parentNode.insertBefore(child, node);
+					child = next;
+				}
+			}
+			node.parentNode.removeChild(node);
+			delete self[i];
+		});
+		self.length = 0;
+		return self;
+	},
+	show : function(val) {
+		var self = this;
+		if (val === undefined) {
+			val = self._originDisplay || '';
+		}
+		if (self.css('display') != 'none') {
+			return self;
+		}
+		return self.css('display', val);
+	},
+	hide : function() {
+		var self = this;
+		if (self.length < 1) {
+			return self;
+		}
+		self._originDisplay = self[0].style.display;
+		return self.css('display', 'none');
+	},
+	outer : function() {
+		var self = this;
+		if (self.length < 1) {
+			return '';
+		}
+		var div = self.doc.createElement('div'), html;
+		div.appendChild(self[0].cloneNode(true));
+		html = _formatHtml(div.innerHTML);
+		div = null;
+		return html;
+	},
+	isSingle : function() {
+		return !!_SINGLE_TAG_MAP[this.name];
+	},
+	isInline : function() {
+		return !!_INLINE_TAG_MAP[this.name];
+	},
+	isBlock : function() {
+		return !!_BLOCK_TAG_MAP[this.name];
+	},
+	isStyle : function() {
+		return !!_STYLE_TAG_MAP[this.name];
+	},
+	isControl : function() {
+		return !!_CONTROL_TAG_MAP[this.name];
+	},
+	contains : function(otherNode) {
+		if (this.length < 1) {
+			return false;
+		}
+		return _contains(this[0], _get(otherNode));
+	},
+	parent : function() {
+		if (this.length < 1) {
+			return null;
+		}
+		var node = this[0].parentNode;
+		return node ? new KNode(node) : null;
+	},
+	children : function() {
+		if (this.length < 1) {
+			return new KNode([]);
+		}
+		var list = [], child = this[0].firstChild;
+		while (child) {
+			if (child.nodeType != 3 || _trim(child.nodeValue) !== '') {
+				list.push(child);
+			}
+			child = child.nextSibling;
+		}
+		return new KNode(list);
+	},
+	first : function() {
+		var list = this.children();
+		return list.length > 0 ? list.eq(0) : null;
+	},
+	last : function() {
+		var list = this.children();
+		return list.length > 0 ? list.eq(list.length - 1) : null;
+	},
+	index : function() {
+		if (this.length < 1) {
+			return -1;
+		}
+		var i = -1, sibling = this[0];
+		while (sibling) {
+			i++;
+			sibling = sibling.previousSibling;
+		}
+		return i;
+	},
+	prev : function() {
+		if (this.length < 1) {
+			return null;
+		}
+		var node = this[0].previousSibling;
+		return node ? new KNode(node) : null;
+	},
+	next : function() {
+		if (this.length < 1) {
+			return null;
+		}
+		var node = this[0].nextSibling;
+		return node ? new KNode(node) : null;
+	},
+	scan : function(fn, order) {
+		if (this.length < 1) {
+			return;
+		}
+		order = (order === undefined) ? true : order;
+		function walk(node) {
+			var n = order ? node.firstChild : node.lastChild;
+			while (n) {
+				var next = order ? n.nextSibling : n.previousSibling;
+				if (fn(n) === false) {
+					return false;
+				}
+				if (walk(n) === false) {
+					return false;
+				}
+				n = next;
+			}
+		}
+		walk(this[0]);
+		return this;
+	}
+});
+_each(('blur,focus,focusin,focusout,load,resize,scroll,unload,click,dblclick,' +
+	'mousedown,mouseup,mousemove,mouseover,mouseout,mouseenter,mouseleave,' +
+	'change,select,submit,keydown,keypress,keyup,error,contextmenu').split(','), function(i, type) {
+	KNode.prototype[type] = function(fn) {
+		return fn ? this.bind(type, fn) : this.fire(type);
+	};
+});
+var _K = K;
+K = function(expr, root) {
+	if (expr === undefined || expr === null) {
+		return;
+	}
+	function newNode(node) {
+		if (!node[0]) {
+			node = [];
+		}
+		return new KNode(node);
+	}
+	if (typeof expr === 'string') {
+		if (root) {
+			root = _get(root);
+		}
+		var length = expr.length;
+		if (expr.charAt(0) === '@') {
+			expr = expr.substr(1);
+		}
+		if (expr.length !== length || /<.+>/.test(expr)) {
+			var doc = root ? root.ownerDocument || root : document,
+				div = doc.createElement('div'), list = [];
+			div.innerHTML = '<img id="__kindeditor_temp_tag__" width="0" height="0" style="display:none;" />' + expr;
+			for (var i = 0, len = div.childNodes.length; i < len; i++) {
+				var child = div.childNodes[i];
+				if (child.id == '__kindeditor_temp_tag__') {
+					continue;
+				}
+				list.push(child);
+			}
+			return newNode(list);
+		}
+		return newNode(_queryAll(expr, root));
+	}
+	if (expr && expr.constructor === KNode) {
+		return expr;
+	}
+	if (expr.toArray) {
+		expr = expr.toArray();
+	}
+	if (_isArray(expr)) {
+		return newNode(expr);
+	}
+	return newNode(_toArray(arguments));
+};
+_each(_K, function(key, val) {
+	K[key] = val;
+});
+K.NodeClass = KNode;
+window.KindEditor = K;
+var _START_TO_START = 0,
+	_START_TO_END = 1,
+	_END_TO_END = 2,
+	_END_TO_START = 3,
+	_BOOKMARK_ID = 0;
+function _updateCollapsed(range) {
+	range.collapsed = (range.startContainer === range.endContainer && range.startOffset === range.endOffset);
+	return range;
+}
+function _copyAndDelete(range, isCopy, isDelete) {
+	var doc = range.doc, nodeList = [];
+	function splitTextNode(node, startOffset, endOffset) {
+		var length = node.nodeValue.length, centerNode;
+		if (isCopy) {
+			var cloneNode = node.cloneNode(true);
+			if (startOffset > 0) {
+				centerNode = cloneNode.splitText(startOffset);
+			} else {
+				centerNode = cloneNode;
+			}
+			if (endOffset < length) {
+				centerNode.splitText(endOffset - startOffset);
+			}
+		}
+		if (isDelete) {
+			var center = node;
+			if (startOffset > 0) {
+				center = node.splitText(startOffset);
+				range.setStart(node, startOffset);
+			}
+			if (endOffset < length) {
+				var right = center.splitText(endOffset - startOffset);
+				range.setEnd(right, 0);
+			}
+			nodeList.push(center);
+		}
+		return centerNode;
+	}
+	function removeNodes() {
+		if (isDelete) {
+			range.up().collapse(true);
+		}
+		for (var i = 0, len = nodeList.length; i < len; i++) {
+			var node = nodeList[i];
+			if (node.parentNode) {
+				node.parentNode.removeChild(node);
+			}
+		}
+	}
+	var copyRange = range.cloneRange().down();
+	var start = -1, incStart = -1, incEnd = -1, end = -1,
+		ancestor = range.commonAncestor(), frag = doc.createDocumentFragment();
+	if (ancestor.nodeType == 3) {
+		var textNode = splitTextNode(ancestor, range.startOffset, range.endOffset);
+		if (isCopy) {
+			frag.appendChild(textNode);
+		}
+		removeNodes();
+		return isCopy ? frag : range;
+	}
+	function extractNodes(parent, frag) {
+		var node = parent.firstChild, nextNode;
+		while (node) {
+			var testRange = new KRange(doc).selectNode(node);
+			start = testRange.compareBoundaryPoints(_START_TO_END, range);
+			if (start >= 0 && incStart <= 0) {
+				incStart = testRange.compareBoundaryPoints(_START_TO_START, range);
+			}
+			if (incStart >= 0 && incEnd <= 0) {
+				incEnd = testRange.compareBoundaryPoints(_END_TO_END, range);
+			}
+			if (incEnd >= 0 && end <= 0) {
+				end = testRange.compareBoundaryPoints(_END_TO_START, range);
+			}
+			if (end >= 0) {
+				return false;
+			}
+			nextNode = node.nextSibling;
+			if (start > 0) {
+				if (node.nodeType == 1) {
+					if (incStart >= 0 && incEnd <= 0) {
+						if (isCopy) {
+							frag.appendChild(node.cloneNode(true));
+						}
+						if (isDelete) {
+							nodeList.push(node);
+						}
+					} else {
+						var childFlag;
+						if (isCopy) {
+							childFlag = node.cloneNode(false);
+							frag.appendChild(childFlag);
+						}
+						if (extractNodes(node, childFlag) === false) {
+							return false;
+						}
+					}
+				} else if (node.nodeType == 3) {
+					var textNode;
+					if (node == copyRange.startContainer) {
+						textNode = splitTextNode(node, copyRange.startOffset, node.nodeValue.length);
+					} else if (node == copyRange.endContainer) {
+						textNode = splitTextNode(node, 0, copyRange.endOffset);
+					} else {
+						textNode = splitTextNode(node, 0, node.nodeValue.length);
+					}
+					if (isCopy) {
+						try {
+							frag.appendChild(textNode);
+						} catch(e) {}
+					}
+				}
+			}
+			node = nextNode;
+		}
+	}
+	extractNodes(ancestor, frag);
+	if (isDelete) {
+		range.up().collapse(true);
+	}
+	for (var i = 0, len = nodeList.length; i < len; i++) {
+		var node = nodeList[i];
+		if (node.parentNode) {
+			node.parentNode.removeChild(node);
+		}
+	}
+	return isCopy ? frag : range;
+}
+function _moveToElementText(range, el) {
+	var node = el;
+	while (node) {
+		var knode = K(node);
+		if (knode.name == 'marquee' || knode.name == 'select') {
+			return;
+		}
+		node = node.parentNode;
+	}
+	try {
+		range.moveToElementText(el);
+	} catch(e) {}
+}
+function _getStartEnd(rng, isStart) {
+	var doc = rng.parentElement().ownerDocument,
+		pointRange = rng.duplicate();
+	pointRange.collapse(isStart);
+	var parent = pointRange.parentElement(),
+		nodes = parent.childNodes;
+	if (nodes.length === 0) {
+		return {node: parent.parentNode, offset: K(parent).index()};
+	}
+	var startNode = doc, startPos = 0, cmp = -1;
+	var testRange = rng.duplicate();
+	_moveToElementText(testRange, parent);
+	for (var i = 0, len = nodes.length; i < len; i++) {
+		var node = nodes[i];
+		cmp = testRange.compareEndPoints('StartToStart', pointRange);
+		if (cmp === 0) {
+			return {node: node.parentNode, offset: i};
+		}
+		if (node.nodeType == 1) {
+			var nodeRange = rng.duplicate(), dummy, knode = K(node), newNode = node;
+			if (knode.isControl()) {
+				dummy = doc.createElement('span');
+				knode.after(dummy);
+				newNode = dummy;
+				startPos += knode.text().replace(/\r\n|\n|\r/g, '').length;
+			}
+			_moveToElementText(nodeRange, newNode);
+			testRange.setEndPoint('StartToEnd', nodeRange);
+			if (cmp > 0) {
+				startPos += nodeRange.text.replace(/\r\n|\n|\r/g, '').length;
+			} else {
+				startPos = 0;
+			}
+			if (dummy) {
+				K(dummy).remove();
+			}
+		} else if (node.nodeType == 3) {
+			testRange.moveStart('character', node.nodeValue.length);
+			startPos += node.nodeValue.length;
+		}
+		if (cmp < 0) {
+			startNode = node;
+		}
+	}
+	if (cmp < 0 && startNode.nodeType == 1) {
+		return {node: parent, offset: K(parent.lastChild).index() + 1};
+	}
+	if (cmp > 0) {
+		while (startNode.nextSibling && startNode.nodeType == 1) {
+			startNode = startNode.nextSibling;
+		}
+	}
+	testRange = rng.duplicate();
+	_moveToElementText(testRange, parent);
+	testRange.setEndPoint('StartToEnd', pointRange);
+	startPos -= testRange.text.replace(/\r\n|\n|\r/g, '').length;
+	if (cmp > 0 && startNode.nodeType == 3) {
+		var prevNode = startNode.previousSibling;
+		while (prevNode && prevNode.nodeType == 3) {
+			startPos -= prevNode.nodeValue.length;
+			prevNode = prevNode.previousSibling;
+		}
+	}
+	return {node: startNode, offset: startPos};
+}
+function _getEndRange(node, offset) {
+	var doc = node.ownerDocument || node,
+		range = doc.body.createTextRange();
+	if (doc == node) {
+		range.collapse(true);
+		return range;
+	}
+	if (node.nodeType == 1 && node.childNodes.length > 0) {
+		var children = node.childNodes, isStart, child;
+		if (offset === 0) {
+			child = children[0];
+			isStart = true;
+		} else {
+			child = children[offset - 1];
+			isStart = false;
+		}
+		if (!child) {
+			return range;
+		}
+		if (K(child).name === 'head') {
+			if (offset === 1) {
+				isStart = true;
+			}
+			if (offset === 2) {
+				isStart = false;
+			}
+			range.collapse(isStart);
+			return range;
+		}
+		if (child.nodeType == 1) {
+			var kchild = K(child), span;
+			if (kchild.isControl()) {
+				span = doc.createElement('span');
+				if (isStart) {
+					kchild.before(span);
+				} else {
+					kchild.after(span);
+				}
+				child = span;
+			}
+			_moveToElementText(range, child);
+			range.collapse(isStart);
+			if (span) {
+				K(span).remove();
+			}
+			return range;
+		}
+		node = child;
+		offset = isStart ? 0 : child.nodeValue.length;
+	}
+	var dummy = doc.createElement('span');
+	K(node).before(dummy);
+	_moveToElementText(range, dummy);
+	range.moveStart('character', offset);
+	K(dummy).remove();
+	return range;
+}
+function _toRange(rng) {
+	var doc, range;
+	function tr2td(start) {
+		if (K(start.node).name == 'tr') {
+			start.node = start.node.cells[start.offset];
+			start.offset = 0;
+		}
+	}
+	if (_IERANGE) {
+		if (rng.item) {
+			doc = _getDoc(rng.item(0));
+			range = new KRange(doc);
+			range.selectNode(rng.item(0));
+			return range;
+		}
+		doc = rng.parentElement().ownerDocument;
+		var start = _getStartEnd(rng, true),
+			end = _getStartEnd(rng, false);
+		tr2td(start);
+		tr2td(end);
+		range = new KRange(doc);
+		range.setStart(start.node, start.offset);
+		range.setEnd(end.node, end.offset);
+		return range;
+	}
+	var startContainer = rng.startContainer;
+	doc = startContainer.ownerDocument || startContainer;
+	range = new KRange(doc);
+	range.setStart(startContainer, rng.startOffset);
+	range.setEnd(rng.endContainer, rng.endOffset);
+	return range;
+}
+function KRange(doc) {
+	this.init(doc);
+}
+_extend(KRange, {
+	init : function(doc) {
+		var self = this;
+		self.startContainer = doc;
+		self.startOffset = 0;
+		self.endContainer = doc;
+		self.endOffset = 0;
+		self.collapsed = true;
+		self.doc = doc;
+	},
+	commonAncestor : function() {
+		function getParents(node) {
+			var parents = [];
+			while (node) {
+				parents.push(node);
+				node = node.parentNode;
+			}
+			return parents;
+		}
+		var parentsA = getParents(this.startContainer),
+			parentsB = getParents(this.endContainer),
+			i = 0, lenA = parentsA.length, lenB = parentsB.length, parentA, parentB;
+		while (++i) {
+			parentA = parentsA[lenA - i];
+			parentB = parentsB[lenB - i];
+			if (!parentA || !parentB || parentA !== parentB) {
+				break;
+			}
+		}
+		return parentsA[lenA - i + 1];
+	},
+	setStart : function(node, offset) {
+		var self = this, doc = self.doc;
+		self.startContainer = node;
+		self.startOffset = offset;
+		if (self.endContainer === doc) {
+			self.endContainer = node;
+			self.endOffset = offset;
+		}
+		return _updateCollapsed(this);
+	},
+	setEnd : function(node, offset) {
+		var self = this, doc = self.doc;
+		self.endContainer = node;
+		self.endOffset = offset;
+		if (self.startContainer === doc) {
+			self.startContainer = node;
+			self.startOffset = offset;
+		}
+		return _updateCollapsed(this);
+	},
+	setStartBefore : function(node) {
+		return this.setStart(node.parentNode || this.doc, K(node).index());
+	},
+	setStartAfter : function(node) {
+		return this.setStart(node.parentNode || this.doc, K(node).index() + 1);
+	},
+	setEndBefore : function(node) {
+		return this.setEnd(node.parentNode || this.doc, K(node).index());
+	},
+	setEndAfter : function(node) {
+		return this.setEnd(node.parentNode || this.doc, K(node).index() + 1);
+	},
+	selectNode : function(node) {
+		return this.setStartBefore(node).setEndAfter(node);
+	},
+	selectNodeContents : function(node) {
+		var knode = K(node);
+		if (knode.type == 3 || knode.isSingle()) {
+			return this.selectNode(node);
+		}
+		var children = knode.children();
+		if (children.length > 0) {
+			return this.setStartBefore(children[0]).setEndAfter(children[children.length - 1]);
+		}
+		return this.setStart(node, 0).setEnd(node, 0);
+	},
+	collapse : function(toStart) {
+		if (toStart) {
+			return this.setEnd(this.startContainer, this.startOffset);
+		}
+		return this.setStart(this.endContainer, this.endOffset);
+	},
+	compareBoundaryPoints : function(how, range) {
+		var rangeA = this.get(), rangeB = range.get();
+		if (_IERANGE) {
+			var arr = {};
+			arr[_START_TO_START] = 'StartToStart';
+			arr[_START_TO_END] = 'EndToStart';
+			arr[_END_TO_END] = 'EndToEnd';
+			arr[_END_TO_START] = 'StartToEnd';
+			var cmp = rangeA.compareEndPoints(arr[how], rangeB);
+			if (cmp !== 0) {
+				return cmp;
+			}
+			var nodeA, nodeB, nodeC, posA, posB;
+			if (how === _START_TO_START || how === _END_TO_START) {
+				nodeA = this.startContainer;
+				posA = this.startOffset;
+			}
+			if (how === _START_TO_END || how === _END_TO_END) {
+				nodeA = this.endContainer;
+				posA = this.endOffset;
+			}
+			if (how === _START_TO_START || how === _START_TO_END) {
+				nodeB = range.startContainer;
+				posB = range.startOffset;
+			}
+			if (how === _END_TO_END || how === _END_TO_START) {
+				nodeB = range.endContainer;
+				posB = range.endOffset;
+			}
+			if (nodeA === nodeB) {
+				var diff = posA - posB;
+				return diff > 0 ? 1 : (diff < 0 ? -1 : 0);
+			}
+			nodeC = nodeB;
+			while (nodeC && nodeC.parentNode !== nodeA) {
+				nodeC = nodeC.parentNode;
+			}
+			if (nodeC) {
+				return K(nodeC).index() >= posA ? -1 : 1;
+			}
+			nodeC = nodeA;
+			while (nodeC && nodeC.parentNode !== nodeB) {
+				nodeC = nodeC.parentNode;
+			}
+			if (nodeC) {
+				return K(nodeC).index() >= posB ? 1 : -1;
+			}
+			nodeC = K(nodeB).next();
+			if (nodeC && nodeC.contains(nodeA)) {
+				return 1;
+			}
+			nodeC = K(nodeA).next();
+			if (nodeC && nodeC.contains(nodeB)) {
+				return -1;
+			}
+		} else {
+			return rangeA.compareBoundaryPoints(how, rangeB);
+		}
+	},
+	cloneRange : function() {
+		return new KRange(this.doc).setStart(this.startContainer, this.startOffset).setEnd(this.endContainer, this.endOffset);
+	},
+	toString : function() {
+		var rng = this.get(), str = _IERANGE ? rng.text : rng.toString();
+		return str.replace(/\r\n|\n|\r/g, '');
+	},
+	cloneContents : function() {
+		return _copyAndDelete(this, true, false);
+	},
+	deleteContents : function() {
+		return _copyAndDelete(this, false, true);
+	},
+	extractContents : function() {
+		return _copyAndDelete(this, true, true);
+	},
+	insertNode : function(node) {
+		var self = this,
+			sc = self.startContainer, so = self.startOffset,
+			ec = self.endContainer, eo = self.endOffset,
+			firstChild, lastChild, c, nodeCount = 1;
+		if (node.nodeName.toLowerCase() === '#document-fragment') {
+			firstChild = node.firstChild;
+			lastChild = node.lastChild;
+			nodeCount = node.childNodes.length;
+		}
+		if (sc.nodeType == 1) {
+			c = sc.childNodes[so];
+			if (c) {
+				sc.insertBefore(node, c);
+				if (sc === ec) {
+					eo += nodeCount;
+				}
+			} else {
+				sc.appendChild(node);
+			}
+		} else if (sc.nodeType == 3) {
+			if (so === 0) {
+				sc.parentNode.insertBefore(node, sc);
+				if (sc.parentNode === ec) {
+					eo += nodeCount;
+				}
+			} else if (so >= sc.nodeValue.length) {
+				if (sc.nextSibling) {
+					sc.parentNode.insertBefore(node, sc.nextSibling);
+				} else {
+					sc.parentNode.appendChild(node);
+				}
+			} else {
+				if (so > 0) {
+					c = sc.splitText(so);
+				} else {
+					c = sc;
+				}
+				sc.parentNode.insertBefore(node, c);
+				if (sc === ec) {
+					ec = c;
+					eo -= so;
+				}
+			}
+		}
+		if (firstChild) {
+			self.setStartBefore(firstChild).setEndAfter(lastChild);
+		} else {
+			self.selectNode(node);
+		}
+		if (self.compareBoundaryPoints(_END_TO_END, self.cloneRange().setEnd(ec, eo)) >= 1) {
+			return self;
+		}
+		return self.setEnd(ec, eo);
+	},
+	surroundContents : function(node) {
+		node.appendChild(this.extractContents());
+		return this.insertNode(node).selectNode(node);
+	},
+	isControl : function() {
+		var self = this,
+			sc = self.startContainer, so = self.startOffset,
+			ec = self.endContainer, eo = self.endOffset, rng;
+		return sc.nodeType == 1 && sc === ec && so + 1 === eo && K(sc.childNodes[so]).isControl();
+	},
+	get : function(hasControlRange) {
+		var self = this, doc = self.doc, node, rng;
+		if (!_IERANGE) {
+			rng = doc.createRange();
+			try {
+				rng.setStart(self.startContainer, self.startOffset);
+				rng.setEnd(self.endContainer, self.endOffset);
+			} catch (e) {}
+			return rng;
+		}
+		if (hasControlRange && self.isControl()) {
+			rng = doc.body.createControlRange();
+			rng.addElement(self.startContainer.childNodes[self.startOffset]);
+			return rng;
+		}
+		var range = self.cloneRange().down();
+		rng = doc.body.createTextRange();
+		rng.setEndPoint('StartToStart', _getEndRange(range.startContainer, range.startOffset));
+		rng.setEndPoint('EndToStart', _getEndRange(range.endContainer, range.endOffset));
+		return rng;
+	},
+	html : function() {
+		return K(this.cloneContents()).outer();
+	},
+	down : function() {
+		var self = this;
+		function downPos(node, pos, isStart) {
+			if (node.nodeType != 1) {
+				return;
+			}
+			var children = K(node).children();
+			if (children.length === 0) {
+				return;
+			}
+			var left, right, child, offset;
+			if (pos > 0) {
+				left = children.eq(pos - 1);
+			}
+			if (pos < children.length) {
+				right = children.eq(pos);
+			}
+			if (left && left.type == 3) {
+				child = left[0];
+				offset = child.nodeValue.length;
+			}
+			if (right && right.type == 3) {
+				child = right[0];
+				offset = 0;
+			}
+			if (!child) {
+				return;
+			}
+			if (isStart) {
+				self.setStart(child, offset);
+			} else {
+				self.setEnd(child, offset);
+			}
+		}
+		downPos(self.startContainer, self.startOffset, true);
+		downPos(self.endContainer, self.endOffset, false);
+		return self;
+	},
+	up : function() {
+		var self = this;
+		function upPos(node, pos, isStart) {
+			if (node.nodeType != 3) {
+				return;
+			}
+			if (pos === 0) {
+				if (isStart) {
+					self.setStartBefore(node);
+				} else {
+					self.setEndBefore(node);
+				}
+			} else if (pos == node.nodeValue.length) {
+				if (isStart) {
+					self.setStartAfter(node);
+				} else {
+					self.setEndAfter(node);
+				}
+			}
+		}
+		upPos(self.startContainer, self.startOffset, true);
+		upPos(self.endContainer, self.endOffset, false);
+		return self;
+	},
+	enlarge : function(toBlock) {
+		var self = this;
+		self.up();
+		function enlargePos(node, pos, isStart) {
+			var knode = K(node), parent;
+			if (knode.type == 3 || _NOSPLIT_TAG_MAP[knode.name] || !toBlock && knode.isBlock()) {
+				return;
+			}
+			if (pos === 0) {
+				while (!knode.prev()) {
+					parent = knode.parent();
+					if (!parent || _NOSPLIT_TAG_MAP[parent.name] || !toBlock && parent.isBlock()) {
+						break;
+					}
+					knode = parent;
+				}
+				if (isStart) {
+					self.setStartBefore(knode[0]);
+				} else {
+					self.setEndBefore(knode[0]);
+				}
+			} else if (pos == knode.children().length) {
+				while (!knode.next()) {
+					parent = knode.parent();
+					if (!parent || _NOSPLIT_TAG_MAP[parent.name] || !toBlock && parent.isBlock()) {
+						break;
+					}
+					knode = parent;
+				}
+				if (isStart) {
+					self.setStartAfter(knode[0]);
+				} else {
+					self.setEndAfter(knode[0]);
+				}
+			}
+		}
+		enlargePos(self.startContainer, self.startOffset, true);
+		enlargePos(self.endContainer, self.endOffset, false);
+		return self;
+	},
+	shrink : function() {
+		var self = this, child, collapsed = self.collapsed;
+		while (self.startContainer.nodeType == 1 && (child = self.startContainer.childNodes[self.startOffset]) && child.nodeType == 1 && !K(child).isSingle()) {
+			self.setStart(child, 0);
+		}
+		if (collapsed) {
+			return self.collapse(collapsed);
+		}
+		while (self.endContainer.nodeType == 1 && self.endOffset > 0 && (child = self.endContainer.childNodes[self.endOffset - 1]) && child.nodeType == 1 && !K(child).isSingle()) {
+			self.setEnd(child, child.childNodes.length);
+		}
+		return self;
+	},
+	createBookmark : function(serialize) {
+		var self = this, doc = self.doc, endNode,
+			startNode = K('<span style="display:none;"></span>', doc)[0];
+		startNode.id = '__kindeditor_bookmark_start_' + (_BOOKMARK_ID++) + '__';
+		if (!self.collapsed) {
+			endNode = startNode.cloneNode(true);
+			endNode.id = '__kindeditor_bookmark_end_' + (_BOOKMARK_ID++) + '__';
+		}
+		if (endNode) {
+			self.cloneRange().collapse(false).insertNode(endNode).setEndBefore(endNode);
+		}
+		self.insertNode(startNode).setStartAfter(startNode);
+		return {
+			start : serialize ? '#' + startNode.id : startNode,
+			end : endNode ? (serialize ? '#' + endNode.id : endNode) : null
+		};
+	},
+	moveToBookmark : function(bookmark) {
+		var self = this, doc = self.doc,
+			start = K(bookmark.start, doc), end = bookmark.end ? K(bookmark.end, doc) : null;
+		if (!start || start.length < 1) {
+			return self;
+		}
+		self.setStartBefore(start[0]);
+		start.remove();
+		if (end && end.length > 0) {
+			self.setEndBefore(end[0]);
+			end.remove();
+		} else {
+			self.collapse(true);
+		}
+		return self;
+	},
+	dump : function() {
+		console.log('--------------------');
+		console.log(this.startContainer.nodeType == 3 ? this.startContainer.nodeValue : this.startContainer, this.startOffset);
+		console.log(this.endContainer.nodeType == 3 ? this.endContainer.nodeValue : this.endContainer, this.endOffset);
+	}
+});
+function _range(mixed) {
+	if (!mixed.nodeName) {
+		return mixed.constructor === KRange ? mixed : _toRange(mixed);
+	}
+	return new KRange(mixed);
+}
+K.RangeClass = KRange;
+K.range = _range;
+K.START_TO_START = _START_TO_START;
+K.START_TO_END = _START_TO_END;
+K.END_TO_END = _END_TO_END;
+K.END_TO_START = _END_TO_START;
+function _nativeCommand(doc, key, val) {
+	try {
+		doc.execCommand(key, false, val);
+	} catch(e) {}
+}
+function _nativeCommandValue(doc, key) {
+	var val = '';
+	try {
+		val = doc.queryCommandValue(key);
+	} catch (e) {}
+	if (typeof val !== 'string') {
+		val = '';
+	}
+	return val;
+}
+function _getSel(doc) {
+	var win = _getWin(doc);
+	return _IERANGE ? doc.selection : win.getSelection();
+}
+function _getRng(doc) {
+	var sel = _getSel(doc), rng;
+	try {
+		if (sel.rangeCount > 0) {
+			rng = sel.getRangeAt(0);
+		} else {
+			rng = sel.createRange();
+		}
+	} catch(e) {}
+	if (_IERANGE && (!rng || (!rng.item && rng.parentElement().ownerDocument !== doc))) {
+		return null;
+	}
+	return rng;
+}
+function _singleKeyMap(map) {
+	var newMap = {}, arr, v;
+	_each(map, function(key, val) {
+		arr = key.split(',');
+		for (var i = 0, len = arr.length; i < len; i++) {
+			v = arr[i];
+			newMap[v] = val;
+		}
+	});
+	return newMap;
+}
+function _hasAttrOrCss(knode, map) {
+	return _hasAttrOrCssByKey(knode, map, '*') || _hasAttrOrCssByKey(knode, map);
+}
+function _hasAttrOrCssByKey(knode, map, mapKey) {
+	mapKey = mapKey || knode.name;
+	if (knode.type !== 1) {
+		return false;
+	}
+	var newMap = _singleKeyMap(map);
+	if (!newMap[mapKey]) {
+		return false;
+	}
+	var arr = newMap[mapKey].split(',');
+	for (var i = 0, len = arr.length; i < len; i++) {
+		var key = arr[i];
+		if (key === '*') {
+			return true;
+		}
+		var match = /^(\.?)([^=]+)(?:=([^=]*))?$/.exec(key);
+		var method = match[1] ? 'css' : 'attr';
+		key = match[2];
+		var val = match[3] || '';
+		if (val === '' && knode[method](key) !== '') {
+			return true;
+		}
+		if (val !== '' && knode[method](key) === val) {
+			return true;
+		}
+	}
+	return false;
+}
+function _removeAttrOrCss(knode, map) {
+	if (knode.type != 1) {
+		return;
+	}
+	_removeAttrOrCssByKey(knode, map, '*');
+	_removeAttrOrCssByKey(knode, map);
+}
+function _removeAttrOrCssByKey(knode, map, mapKey) {
+	mapKey = mapKey || knode.name;
+	if (knode.type !== 1) {
+		return;
+	}
+	var newMap = _singleKeyMap(map);
+	if (!newMap[mapKey]) {
+		return;
+	}
+	var arr = newMap[mapKey].split(','), allFlag = false;
+	for (var i = 0, len = arr.length; i < len; i++) {
+		var key = arr[i];
+		if (key === '*') {
+			allFlag = true;
+			break;
+		}
+		var match = /^(\.?)([^=]+)(?:=([^=]*))?$/.exec(key);
+		key = match[2];
+		if (match[1]) {
+			key = _toCamel(key);
+			if (knode[0].style[key]) {
+				knode[0].style[key] = '';
+			}
+		} else {
+			knode.removeAttr(key);
+		}
+	}
+	if (allFlag) {
+		knode.remove(true);
+	}
+}
+function _getInnerNode(knode) {
+	var inner = knode;
+	while (inner.first()) {
+		inner = inner.first();
+	}
+	return inner;
+}
+function _isEmptyNode(knode) {
+	if (knode.type != 1 || knode.isSingle()) {
+		return false;
+	}
+	return knode.html().replace(/<[^>]+>/g, '') === '';
+}
+function _mergeWrapper(a, b) {
+	a = a.clone(true);
+	var lastA = _getInnerNode(a), childA = a, merged = false;
+	while (b) {
+		while (childA) {
+			if (childA.name === b.name) {
+				_mergeAttrs(childA, b.attr(), b.css());
+				merged = true;
+			}
+			childA = childA.first();
+		}
+		if (!merged) {
+			lastA.append(b.clone(false));
+		}
+		merged = false;
+		b = b.first();
+	}
+	return a;
+}
+function _wrapNode(knode, wrapper) {
+	wrapper = wrapper.clone(true);
+	if (knode.type == 3) {
+		_getInnerNode(wrapper).append(knode.clone(false));
+		knode.replaceWith(wrapper);
+		return wrapper;
+	}
+	var nodeWrapper = knode, child;
+	while ((child = knode.first()) && child.children().length == 1) {
+		knode = child;
+	}
+	child = knode.first();
+	var frag = knode.doc.createDocumentFragment();
+	while (child) {
+		frag.appendChild(child[0]);
+		child = child.next();
+	}
+	wrapper = _mergeWrapper(nodeWrapper, wrapper);
+	if (frag.firstChild) {
+		_getInnerNode(wrapper).append(frag);
+	}
+	nodeWrapper.replaceWith(wrapper);
+	return wrapper;
+}
+function _mergeAttrs(knode, attrs, styles) {
+	_each(attrs, function(key, val) {
+		if (key !== 'style') {
+			knode.attr(key, val);
+		}
+	});
+	_each(styles, function(key, val) {
+		knode.css(key, val);
+	});
+}
+function _inPreElement(knode) {
+	while (knode && knode.name != 'body') {
+		if (_PRE_TAG_MAP[knode.name] || knode.name == 'div' && knode.hasClass('ke-script')) {
+			return true;
+		}
+		knode = knode.parent();
+	}
+	return false;
+}
+function KCmd(range) {
+	this.init(range);
+}
+_extend(KCmd, {
+	init : function(range) {
+		var self = this, doc = range.doc;
+		self.doc = doc;
+		self.win = _getWin(doc);
+		self.sel = _getSel(doc);
+		self.range = range;
+	},
+	selection : function(forceReset) {
+		var self = this, doc = self.doc, rng = _getRng(doc);
+		self.sel = _getSel(doc);
+		if (rng) {
+			self.range = _range(rng);
+			if (K(self.range.startContainer).name == 'html') {
+				self.range.selectNodeContents(doc.body).collapse(false);
+			}
+			return self;
+		}
+		if (forceReset) {
+			self.range.selectNodeContents(doc.body).collapse(false);
+		}
+		return self;
+	},
+	select : function(hasDummy) {
+		hasDummy = _undef(hasDummy, true);
+		var self = this, sel = self.sel, range = self.range.cloneRange().shrink(),
+			sc = range.startContainer, so = range.startOffset,
+			ec = range.endContainer, eo = range.endOffset,
+			doc = _getDoc(sc), win = self.win, rng, hasU200b = false;
+		if (hasDummy && sc.nodeType == 1 && range.collapsed) {
+			if (_IERANGE) {
+				var dummy = K('<span>&nbsp;</span>', doc);
+				range.insertNode(dummy[0]);
+				rng = doc.body.createTextRange();
+				try {
+					rng.moveToElementText(dummy[0]);
+				} catch(ex) {}
+				rng.collapse(false);
+				rng.select();
+				dummy.remove();
+				win.focus();
+				return self;
+			}
+			if (_WEBKIT) {
+				var children = sc.childNodes;
+				if (K(sc).isInline() || so > 0 && K(children[so - 1]).isInline() || children[so] && K(children[so]).isInline()) {
+					range.insertNode(doc.createTextNode('\u200B'));
+					hasU200b = true;
+				}
+			}
+		}
+		if (_IERANGE) {
+			try {
+				rng = range.get(true);
+				rng.select();
+			} catch(e) {}
+		} else {
+			if (hasU200b) {
+				range.collapse(false);
+			}
+			rng = range.get(true);
+			sel.removeAllRanges();
+			sel.addRange(rng);
+			if (doc !== document) {
+				var pos = K(rng.endContainer).pos();
+				win.scrollTo(pos.x, pos.y);
+			}
+		}
+		win.focus();
+		return self;
+	},
+	wrap : function(val) {
+		var self = this, doc = self.doc, range = self.range, wrapper;
+		wrapper = K(val, doc);
+		if (range.collapsed) {
+			range.shrink();
+			range.insertNode(wrapper[0]).selectNodeContents(wrapper[0]);
+			return self;
+		}
+		if (wrapper.isBlock()) {
+			var copyWrapper = wrapper.clone(true), child = copyWrapper;
+			while (child.first()) {
+				child = child.first();
+			}
+			child.append(range.extractContents());
+			range.insertNode(copyWrapper[0]).selectNode(copyWrapper[0]);
+			return self;
+		}
+		range.enlarge();
+		var bookmark = range.createBookmark(), ancestor = range.commonAncestor(), isStart = false;
+		K(ancestor).scan(function(node) {
+			if (!isStart && node == bookmark.start) {
+				isStart = true;
+				return;
+			}
+			if (isStart) {
+				if (node == bookmark.end) {
+					return false;
+				}
+				var knode = K(node);
+				if (_inPreElement(knode)) {
+					return;
+				}
+				if (knode.type == 3 && _trim(node.nodeValue).length > 0) {
+					var parent;
+					while ((parent = knode.parent()) && parent.isStyle() && parent.children().length == 1) {
+						knode = parent;
+					}
+					_wrapNode(knode, wrapper);
+				}
+			}
+		});
+		range.moveToBookmark(bookmark);
+		return self;
+	},
+	split : function(isStart, map) {
+		var range = this.range, doc = range.doc;
+		var tempRange = range.cloneRange().collapse(isStart);
+		var node = tempRange.startContainer, pos = tempRange.startOffset,
+			parent = node.nodeType == 3 ? node.parentNode : node,
+			needSplit = false, knode;
+		while (parent && parent.parentNode) {
+			knode = K(parent);
+			if (map) {
+				if (!knode.isStyle()) {
+					break;
+				}
+				if (!_hasAttrOrCss(knode, map)) {
+					break;
+				}
+			} else {
+				if (_NOSPLIT_TAG_MAP[knode.name]) {
+					break;
+				}
+			}
+			needSplit = true;
+			parent = parent.parentNode;
+		}
+		if (needSplit) {
+			var dummy = doc.createElement('span');
+			range.cloneRange().collapse(!isStart).insertNode(dummy);
+			if (isStart) {
+				tempRange.setStartBefore(parent.firstChild).setEnd(node, pos);
+			} else {
+				tempRange.setStart(node, pos).setEndAfter(parent.lastChild);
+			}
+			var frag = tempRange.extractContents(),
+				first = frag.firstChild, last = frag.lastChild;
+			if (isStart) {
+				tempRange.insertNode(frag);
+				range.setStartAfter(last).setEndBefore(dummy);
+			} else {
+				parent.appendChild(frag);
+				range.setStartBefore(dummy).setEndBefore(first);
+			}
+			var dummyParent = dummy.parentNode;
+			if (dummyParent == range.endContainer) {
+				var prev = K(dummy).prev(), next = K(dummy).next();
+				if (prev && next && prev.type == 3 && next.type == 3) {
+					range.setEnd(prev[0], prev[0].nodeValue.length);
+				} else if (!isStart) {
+					range.setEnd(range.endContainer, range.endOffset - 1);
+				}
+			}
+			dummyParent.removeChild(dummy);
+		}
+		return this;
+	},
+	remove : function(map) {
+		var self = this, doc = self.doc, range = self.range;
+		range.enlarge();
+		if (range.startOffset === 0) {
+			var ksc = K(range.startContainer), parent;
+			while ((parent = ksc.parent()) && parent.isStyle() && parent.children().length == 1) {
+				ksc = parent;
+			}
+			range.setStart(ksc[0], 0);
+			ksc = K(range.startContainer);
+			if (ksc.isBlock()) {
+				_removeAttrOrCss(ksc, map);
+			}
+			var kscp = ksc.parent();
+			if (kscp && kscp.isBlock()) {
+				_removeAttrOrCss(kscp, map);
+			}
+		}
+		var sc, so;
+		if (range.collapsed) {
+			self.split(true, map);
+			sc = range.startContainer;
+			so = range.startOffset;
+			if (so > 0) {
+				var sb = K(sc.childNodes[so - 1]);
+				if (sb && _isEmptyNode(sb)) {
+					sb.remove();
+					range.setStart(sc, so - 1);
+				}
+			}
+			var sa = K(sc.childNodes[so]);
+			if (sa && _isEmptyNode(sa)) {
+				sa.remove();
+			}
+			if (_isEmptyNode(sc)) {
+				range.startBefore(sc);
+				sc.remove();
+			}
+			range.collapse(true);
+			return self;
+		}
+		self.split(true, map);
+		self.split(false, map);
+		var startDummy = doc.createElement('span'), endDummy = doc.createElement('span');
+		range.cloneRange().collapse(false).insertNode(endDummy);
+		range.cloneRange().collapse(true).insertNode(startDummy);
+		var nodeList = [], cmpStart = false;
+		K(range.commonAncestor()).scan(function(node) {
+			if (!cmpStart && node == startDummy) {
+				cmpStart = true;
+				return;
+			}
+			if (node == endDummy) {
+				return false;
+			}
+			if (cmpStart) {
+				nodeList.push(node);
+			}
+		});
+		K(startDummy).remove();
+		K(endDummy).remove();
+		sc = range.startContainer;
+		so = range.startOffset;
+		var ec = range.endContainer, eo = range.endOffset;
+		if (so > 0) {
+			var startBefore = K(sc.childNodes[so - 1]);
+			if (startBefore && _isEmptyNode(startBefore)) {
+				startBefore.remove();
+				range.setStart(sc, so - 1);
+				if (sc == ec) {
+					range.setEnd(ec, eo - 1);
+				}
+			}
+			var startAfter = K(sc.childNodes[so]);
+			if (startAfter && _isEmptyNode(startAfter)) {
+				startAfter.remove();
+				if (sc == ec) {
+					range.setEnd(ec, eo - 1);
+				}
+			}
+		}
+		var endAfter = K(ec.childNodes[range.endOffset]);
+		if (endAfter && _isEmptyNode(endAfter)) {
+			endAfter.remove();
+		}
+		var bookmark = range.createBookmark(true);
+		_each(nodeList, function(i, node) {
+			_removeAttrOrCss(K(node), map);
+		});
+		range.moveToBookmark(bookmark);
+		return self;
+	},
+	commonNode : function(map) {
+		var range = this.range;
+		var ec = range.endContainer, eo = range.endOffset,
+			node = (ec.nodeType == 3 || eo === 0) ? ec : ec.childNodes[eo - 1];
+		function find(node) {
+			var child = node, parent = node;
+			while (parent) {
+				if (_hasAttrOrCss(K(parent), map)) {
+					return K(parent);
+				}
+				parent = parent.parentNode;
+			}
+			while (child && (child = child.lastChild)) {
+				if (_hasAttrOrCss(K(child), map)) {
+					return K(child);
+				}
+			}
+			return null;
+		}
+		var cNode = find(node);
+		if (cNode) {
+			return cNode;
+		}
+		if (node.nodeType == 1 || (ec.nodeType == 3 && eo === 0)) {
+			var prev = K(node).prev();
+			if (prev) {
+				return find(prev);
+			}
+		}
+		return null;
+	},
+	commonAncestor : function(tagName) {
+		var range = this.range,
+			sc = range.startContainer, so = range.startOffset,
+			ec = range.endContainer, eo = range.endOffset,
+			startNode = (sc.nodeType == 3 || so === 0) ? sc : sc.childNodes[so - 1],
+			endNode = (ec.nodeType == 3 || eo === 0) ? ec : ec.childNodes[eo - 1];
+		function find(node) {
+			while (node) {
+				if (node.nodeType == 1) {
+					if (node.tagName.toLowerCase() === tagName) {
+						return node;
+					}
+				}
+				node = node.parentNode;
+			}
+			return null;
+		}
+		var start = find(startNode), end = find(endNode);
+		if (start && end && start === end) {
+			return K(start);
+		}
+		return null;
+	},
+	state : function(key) {
+		var self = this, doc = self.doc, bool = false;
+		try {
+			bool = doc.queryCommandState(key);
+		} catch (e) {}
+		return bool;
+	},
+	val : function(key) {
+		var self = this, doc = self.doc, range = self.range;
+		function lc(val) {
+			return val.toLowerCase();
+		}
+		key = lc(key);
+		var val = '', knode;
+		if (key === 'fontfamily' || key === 'fontname') {
+			val = _nativeCommandValue(doc, 'fontname');
+			val = val.replace(/['"]/g, '');
+			return lc(val);
+		}
+		if (key === 'formatblock') {
+			val = _nativeCommandValue(doc, key);
+			if (val === '') {
+				knode = self.commonNode({'h1,h2,h3,h4,h5,h6,p,div,pre,address' : '*'});
+				if (knode) {
+					val = knode.name;
+				}
+			}
+			if (val === 'Normal') {
+				val = 'p';
+			}
+			return lc(val);
+		}
+		if (key === 'fontsize') {
+			knode = self.commonNode({'*' : '.font-size'});
+			if (knode) {
+				val = knode.css('font-size');
+			}
+			return lc(val);
+		}
+		if (key === 'forecolor') {
+			knode = self.commonNode({'*' : '.color'});
+			if (knode) {
+				val = knode.css('color');
+			}
+			val = _toHex(val);
+			if (val === '') {
+				val = 'default';
+			}
+			return lc(val);
+		}
+		if (key === 'hilitecolor') {
+			knode = self.commonNode({'*' : '.background-color'});
+			if (knode) {
+				val = knode.css('background-color');
+			}
+			val = _toHex(val);
+			if (val === '') {
+				val = 'default';
+			}
+			return lc(val);
+		}
+		return val;
+	},
+	toggle : function(wrapper, map) {
+		var self = this;
+		if (self.commonNode(map)) {
+			self.remove(map);
+		} else {
+			self.wrap(wrapper);
+		}
+		return self.select();
+	},
+	bold : function() {
+		return this.toggle('<strong></strong>', {
+			span : '.font-weight=bold',
+			strong : '*',
+			b : '*'
+		});
+	},
+	italic : function() {
+		return this.toggle('<em></em>', {
+			span : '.font-style=italic',
+			em : '*',
+			i : '*'
+		});
+	},
+	underline : function() {
+		return this.toggle('<u></u>', {
+			span : '.text-decoration=underline',
+			u : '*'
+		});
+	},
+	strikethrough : function() {
+		return this.toggle('<s></s>', {
+			span : '.text-decoration=line-through',
+			s : '*'
+		});
+	},
+	forecolor : function(val) {
+		return this.wrap('<span style="color:' + val + ';"></span>').select();
+	},
+	hilitecolor : function(val) {
+		return this.wrap('<span style="background-color:' + val + ';"></span>').select();
+	},
+	fontsize : function(val) {
+		return this.wrap('<span style="font-size:' + val + ';"></span>').select();
+	},
+	fontname : function(val) {
+		return this.fontfamily(val);
+	},
+	fontfamily : function(val) {
+		return this.wrap('<span style="font-family:' + val + ';"></span>').select();
+	},
+	removeformat : function() {
+		var map = {
+			'*' : '.font-weight,.font-style,.text-decoration,.color,.background-color,.font-size,.font-family,.text-indent'
+		},
+		tags = _STYLE_TAG_MAP;
+		_each(tags, function(key, val) {
+			map[key] = '*';
+		});
+		this.remove(map);
+		return this.select();
+	},
+	inserthtml : function(val, quickMode) {
+		var self = this, range = self.range;
+		if (val === '') {
+			return self;
+		}
+		function pasteHtml(range, val) {
+			val = '<img id="__kindeditor_temp_tag__" width="0" height="0" style="display:none;" />' + val;
+			var rng = range.get();
+			if (rng.item) {
+				rng.item(0).outerHTML = val;
+			} else {
+				rng.pasteHTML(val);
+			}
+			var temp = range.doc.getElementById('__kindeditor_temp_tag__');
+			temp.parentNode.removeChild(temp);
+			var newRange = _toRange(rng);
+			range.setEnd(newRange.endContainer, newRange.endOffset);
+			range.collapse(false);
+			self.select(false);
+		}
+		function insertHtml(range, val) {
+			var doc = range.doc,
+				frag = doc.createDocumentFragment();
+			K('@' + val, doc).each(function() {
+				frag.appendChild(this);
+			});
+			range.deleteContents();
+			range.insertNode(frag);
+			range.collapse(false);
+			self.select(false);
+		}
+		if (_IERANGE && quickMode) {
+			try {
+				pasteHtml(range, val);
+			} catch(e) {
+				insertHtml(range, val);
+			}
+			return self;
+		}
+		insertHtml(range, val);
+		return self;
+	},
+	hr : function() {
+		return this.inserthtml('<hr />');
+	},
+	print : function() {
+		this.win.print();
+		return this;
+	},
+	insertimage : function(url, title, width, height, border, align) {
+		title = _undef(title, '');
+		border = _undef(border, 0);
+		var html = '<img src="' + _escape(url) + '" data-ke-src="' + _escape(url) + '" ';
+		if (width) {
+			html += 'width="' + _escape(width) + '" ';
+		}
+		if (height) {
+			html += 'height="' + _escape(height) + '" ';
+		}
+		if (title) {
+			html += 'title="' + _escape(title) + '" ';
+		}
+		if (align) {
+			html += 'align="' + _escape(align) + '" ';
+		}
+		html += 'alt="' + _escape(title) + '" ';
+		html += '/>';
+		return this.inserthtml(html);
+	},
+	createlink : function(url, type) {
+		var self = this, doc = self.doc, range = self.range;
+		self.select();
+		var a = self.commonNode({ a : '*' });
+		if (a && !range.isControl()) {
+			range.selectNode(a.get());
+			self.select();
+		}
+		var html = '<a href="' + _escape(url) + '" data-ke-src="' + _escape(url) + '" ';
+		if (type) {
+			html += ' target="' + _escape(type) + '"';
+		}
+		if (range.collapsed) {
+			html += '>' + _escape(url) + '</a>';
+			return self.inserthtml(html);
+		}
+		if (range.isControl()) {
+			var node = K(range.startContainer.childNodes[range.startOffset]);
+			html += '></a>';
+			node.after(K(html, doc));
+			node.next().append(node);
+			range.selectNode(node[0]);
+			return self.select();
+		}
+		function setAttr(node, url, type) {
+			K(node).attr('href', url).attr('data-ke-src', url);
+			if (type) {
+				K(node).attr('target', type);
+			} else {
+				K(node).removeAttr('target');
+			}
+		}
+		var sc = range.startContainer, so = range.startOffset,
+			ec = range.endContainer, eo = range.endOffset;
+		if (sc.nodeType == 1 && sc === ec && so + 1 === eo) {
+			var child = sc.childNodes[so];
+			if (child.nodeName.toLowerCase() == 'a') {
+				setAttr(child, url, type);
+				return self;
+			}
+		}
+		_nativeCommand(doc, 'createlink', '__kindeditor_temp_url__');
+		K('a[href="__kindeditor_temp_url__"]', doc).each(function() {
+			setAttr(this, url, type);
+		});
+		return self;
+	},
+	unlink : function() {
+		var self = this, doc = self.doc, range = self.range;
+		self.select();
+		if (range.collapsed) {
+			var a = self.commonNode({ a : '*' });
+			if (a) {
+				range.selectNode(a.get());
+				self.select();
+			}
+			_nativeCommand(doc, 'unlink', null);
+			if (_WEBKIT && K(range.startContainer).name === 'img') {
+				var parent = K(range.startContainer).parent();
+				if (parent.name === 'a') {
+					parent.remove(true);
+				}
+			}
+		} else {
+			_nativeCommand(doc, 'unlink', null);
+		}
+		return self;
+	}
+});
+_each(('formatblock,selectall,justifyleft,justifycenter,justifyright,justifyfull,insertorderedlist,' +
+	'insertunorderedlist,indent,outdent,subscript,superscript').split(','), function(i, name) {
+	KCmd.prototype[name] = function(val) {
+		var self = this;
+		self.select();
+		_nativeCommand(self.doc, name, val);
+		if (_IERANGE && _inArray(name, 'justifyleft,justifycenter,justifyright,justifyfull'.split(',')) >= 0) {
+			self.selection();
+		}
+		if (!_IERANGE || _inArray(name, 'formatblock,selectall,insertorderedlist,insertunorderedlist'.split(',')) >= 0) {
+			self.selection();
+		}
+		return self;
+	};
+});
+_each('cut,copy,paste'.split(','), function(i, name) {
+	KCmd.prototype[name] = function() {
+		var self = this;
+		if (!self.doc.queryCommandSupported(name)) {
+			throw 'not supported';
+		}
+		self.select();
+		_nativeCommand(self.doc, name, null);
+		return self;
+	};
+});
+function _cmd(mixed) {
+	if (mixed.nodeName) {
+		var doc = _getDoc(mixed);
+		mixed = _range(doc).selectNodeContents(doc.body).collapse(false);
+	}
+	return new KCmd(mixed);
+}
+K.CmdClass = KCmd;
+K.cmd = _cmd;
+function _drag(options) {
+	var moveEl = options.moveEl,
+		moveFn = options.moveFn,
+		clickEl = options.clickEl || moveEl,
+		beforeDrag = options.beforeDrag,
+		iframeFix = options.iframeFix === undefined ? true : options.iframeFix;
+	var docs = [document];
+	if (iframeFix) {
+		K('iframe').each(function() {
+			var src = _formatUrl(this.src || '', 'absolute');
+			if (/^https?:\/\//.test(src)) {
+				return;
+			}
+			var doc;
+			try {
+				doc = _iframeDoc(this);
+			} catch(e) {}
+			if (doc) {
+				var pos = K(this).pos();
+				K(doc).data('pos-x', pos.x);
+				K(doc).data('pos-y', pos.y);
+				docs.push(doc);
+			}
+		});
+	}
+	clickEl.mousedown(function(e) {
+		e.stopPropagation();
+		var self = clickEl.get(),
+			x = _removeUnit(moveEl.css('left')),
+			y = _removeUnit(moveEl.css('top')),
+			width = moveEl.width(),
+			height = moveEl.height(),
+			pageX = e.pageX,
+			pageY = e.pageY;
+		if (beforeDrag) {
+			beforeDrag();
+		}
+		function moveListener(e) {
+			e.preventDefault();
+			var kdoc = K(_getDoc(e.target));
+			var diffX = _round((kdoc.data('pos-x') || 0) + e.pageX - pageX);
+			var diffY = _round((kdoc.data('pos-y') || 0) + e.pageY - pageY);
+			moveFn.call(clickEl, x, y, width, height, diffX, diffY);
+		}
+		function selectListener(e) {
+			e.preventDefault();
+		}
+		function upListener(e) {
+			e.preventDefault();
+			K(docs).unbind('mousemove', moveListener)
+				.unbind('mouseup', upListener)
+				.unbind('selectstart', selectListener);
+			if (self.releaseCapture) {
+				self.releaseCapture();
+			}
+		}
+		K(docs).mousemove(moveListener)
+			.mouseup(upListener)
+			.bind('selectstart', selectListener);
+		if (self.setCapture) {
+			self.setCapture();
+		}
+	});
+}
+function KWidget(options) {
+	this.init(options);
+}
+_extend(KWidget, {
+	init : function(options) {
+		var self = this;
+		self.name = options.name || '';
+		self.doc = options.doc || document;
+		self.win = _getWin(self.doc);
+		self.x = _addUnit(options.x);
+		self.y = _addUnit(options.y);
+		self.z = options.z;
+		self.width = _addUnit(options.width);
+		self.height = _addUnit(options.height);
+		self.div = K('<div style="display:block;"></div>');
+		self.options = options;
+		self._alignEl = options.alignEl;
+		if (self.width) {
+			self.div.css('width', self.width);
+		}
+		if (self.height) {
+			self.div.css('height', self.height);
+		}
+		if (self.z) {
+			self.div.css({
+				position : 'absolute',
+				left : self.x,
+				top : self.y,
+				'z-index' : self.z
+			});
+		}
+		if (self.z && (self.x === undefined || self.y === undefined)) {
+			self.autoPos(self.width, self.height);
+		}
+		if (options.cls) {
+			self.div.addClass(options.cls);
+		}
+		if (options.shadowMode) {
+			self.div.addClass('ke-shadow');
+		}
+		if (options.css) {
+			self.div.css(options.css);
+		}
+		if (options.src) {
+			K(options.src).replaceWith(self.div);
+		} else {
+			K(self.doc.body).append(self.div);
+		}
+		if (options.html) {
+			self.div.html(options.html);
+		}
+		if (options.autoScroll) {
+			if (_IE && _V < 7 || _QUIRKS) {
+				var scrollPos = _getScrollPos();
+				K(self.win).bind('scroll', function(e) {
+					var pos = _getScrollPos(),
+						diffX = pos.x - scrollPos.x,
+						diffY = pos.y - scrollPos.y;
+					self.pos(_removeUnit(self.x) + diffX, _removeUnit(self.y) + diffY, false);
+				});
+			} else {
+				self.div.css('position', 'fixed');
+			}
+		}
+	},
+	pos : function(x, y, updateProp) {
+		var self = this;
+		updateProp = _undef(updateProp, true);
+		if (x !== null) {
+			x = x < 0 ? 0 : _addUnit(x);
+			self.div.css('left', x);
+			if (updateProp) {
+				self.x = x;
+			}
+		}
+		if (y !== null) {
+			y = y < 0 ? 0 : _addUnit(y);
+			self.div.css('top', y);
+			if (updateProp) {
+				self.y = y;
+			}
+		}
+		return self;
+	},
+	autoPos : function(width, height) {
+		var self = this,
+			w = _removeUnit(width) || 0,
+			h = _removeUnit(height) || 0,
+			scrollPos = _getScrollPos();
+		if (self._alignEl) {
+			var knode = K(self._alignEl),
+				pos = knode.pos(),
+				diffX = _round(knode[0].clientWidth / 2 - w / 2),
+				diffY = _round(knode[0].clientHeight / 2 - h / 2);
+			x = diffX < 0 ? pos.x : pos.x + diffX;
+			y = diffY < 0 ? pos.y : pos.y + diffY;
+		} else {
+			var docEl = _docElement(self.doc);
+			x = _round(scrollPos.x + (docEl.clientWidth - w) / 2);
+			y = _round(scrollPos.y + (docEl.clientHeight - h) / 2);
+		}
+		if (!(_IE && _V < 7 || _QUIRKS)) {
+			x -= scrollPos.x;
+			y -= scrollPos.y;
+		}
+		return self.pos(x, y);
+	},
+	remove : function() {
+		var self = this;
+		if (_IE && _V < 7 || _QUIRKS) {
+			K(self.win).unbind('scroll');
+		}
+		self.div.remove();
+		_each(self, function(i) {
+			self[i] = null;
+		});
+		return this;
+	},
+	show : function() {
+		this.div.show();
+		return this;
+	},
+	hide : function() {
+		this.div.hide();
+		return this;
+	},
+	draggable : function(options) {
+		var self = this;
+		options = options || {};
+		options.moveEl = self.div;
+		options.moveFn = function(x, y, width, height, diffX, diffY) {
+			if ((x = x + diffX) < 0) {
+				x = 0;
+			}
+			if ((y = y + diffY) < 0) {
+				y = 0;
+			}
+			self.pos(x, y);
+		};
+		_drag(options);
+		return self;
+	}
+});
+function _widget(options) {
+	return new KWidget(options);
+}
+K.WidgetClass = KWidget;
+K.widget = _widget;
+function _iframeDoc(iframe) {
+	iframe = _get(iframe);
+	return iframe.contentDocument || iframe.contentWindow.document;
+}
+var html, _direction = '';
+if ((html = document.getElementsByTagName('html'))) {
+	_direction = html[0].dir;
+}
+function _getInitHtml(themesPath, bodyClass, cssPath, cssData) {
+	var arr = [
+		(_direction === '' ? '<html>' : '<html dir="' + _direction + '">'),
+		'<head><meta charset="utf-8" /><title></title>',
+		'<style>',
+		'html {margin:0;padding:0;}',
+		'body {margin:0;padding:5px;}',
+		'body, td {font:12px/1.5 "sans serif",tahoma,verdana,helvetica;}',
+		'body, p, div {word-wrap: break-word;}',
+		'p {margin:5px 0;}',
+		'table {border-collapse:collapse;}',
+		'img {border:0;}',
+		'noscript {display:none;}',
+		'table.ke-zeroborder td {border:1px dotted #AAA;}',
+		'img.ke-flash {',
+		'	border:1px solid #AAA;',
+		'	background-image:url(' + themesPath + 'common/flash.gif);',
+		'	background-position:center center;',
+		'	background-repeat:no-repeat;',
+		'	width:100px;',
+		'	height:100px;',
+		'}',
+		'img.ke-rm {',
+		'	border:1px solid #AAA;',
+		'	background-image:url(' + themesPath + 'common/rm.gif);',
+		'	background-position:center center;',
+		'	background-repeat:no-repeat;',
+		'	width:100px;',
+		'	height:100px;',
+		'}',
+		'img.ke-media {',
+		'	border:1px solid #AAA;',
+		'	background-image:url(' + themesPath + 'common/media.gif);',
+		'	background-position:center center;',
+		'	background-repeat:no-repeat;',
+		'	width:100px;',
+		'	height:100px;',
+		'}',
+		'img.ke-anchor {',
+		'	border:1px dashed #666;',
+		'	width:16px;',
+		'	height:16px;',
+		'}',
+		'.ke-script, .ke-noscript, .ke-display-none {',
+		'	display:none;',
+		'	font-size:0;',
+		'	width:0;',
+		'	height:0;',
+		'}',
+		'.ke-pagebreak {',
+		'	border:1px dotted #AAA;',
+		'	font-size:0;',
+		'	height:2px;',
+		'}',
+		'</style>'
+	];
+	if (!_isArray(cssPath)) {
+		cssPath = [cssPath];
+	}
+	_each(cssPath, function(i, path) {
+		if (path) {
+			arr.push('<link href="' + path + '" rel="stylesheet" />');
+		}
+	});
+	if (cssData) {
+		arr.push('<style>' + cssData + '</style>');
+	}
+	arr.push('</head><body ' + (bodyClass ? 'class="' + bodyClass + '"' : '') + '></body></html>');
+	return arr.join('\n');
+}
+function _elementVal(knode, val) {
+	if (knode.hasVal()) {
+		if (val === undefined) {
+			var html = knode.val();
+			html = html.replace(/(<(?:p|p\s[^>]*)>) *(<\/p>)/ig, '');
+			return html;
+		}
+		return knode.val(val);
+	}
+	return knode.html(val);
+}
+function KEdit(options) {
+	this.init(options);
+}
+_extend(KEdit, KWidget, {
+	init : function(options) {
+		var self = this;
+		KEdit.parent.init.call(self, options);
+		self.srcElement = K(options.srcElement);
+		self.div.addClass('ke-edit');
+		self.designMode = _undef(options.designMode, true);
+		self.beforeGetHtml = options.beforeGetHtml;
+		self.beforeSetHtml = options.beforeSetHtml;
+		self.afterSetHtml = options.afterSetHtml;
+		var themesPath = _undef(options.themesPath, ''),
+			bodyClass = options.bodyClass,
+			cssPath = options.cssPath,
+			cssData = options.cssData,
+			isDocumentDomain = location.protocol != 'res:' && location.host.replace(/:\d+/, '') !== document.domain,
+			srcScript = ('document.open();' +
+				(isDocumentDomain ? 'document.domain="' + document.domain + '";' : '') +
+				'document.close();'),
+			iframeSrc = _IE ? ' src="javascript:void(function(){' + encodeURIComponent(srcScript) + '}())"' : '';
+		self.iframe = K('<iframe class="ke-edit-iframe" hidefocus="true" frameborder="0"' + iframeSrc + '></iframe>').css('width', '100%');
+		self.textarea = K('<textarea class="ke-edit-textarea" hidefocus="true"></textarea>').css('width', '100%');
+		self.tabIndex = isNaN(parseInt(options.tabIndex, 10)) ? self.srcElement.attr('tabindex') : parseInt(options.tabIndex, 10);
+		self.iframe.attr('tabindex', self.tabIndex);
+		self.textarea.attr('tabindex', self.tabIndex);
+		if (self.width) {
+			self.setWidth(self.width);
+		}
+		if (self.height) {
+			self.setHeight(self.height);
+		}
+		if (self.designMode) {
+			self.textarea.hide();
+		} else {
+			self.iframe.hide();
+		}
+		function ready() {
+			var doc = _iframeDoc(self.iframe);
+			doc.open();
+			if (isDocumentDomain) {
+				doc.domain = document.domain;
+			}
+			doc.write(_getInitHtml(themesPath, bodyClass, cssPath, cssData));
+			doc.close();
+			self.win = self.iframe[0].contentWindow;
+			self.doc = doc;
+			var cmd = _cmd(doc);
+			self.afterChange(function(e) {
+				cmd.selection();
+			});
+			if (_WEBKIT) {
+				K(doc).click(function(e) {
+					if (K(e.target).name === 'img') {
+						cmd.selection(true);
+						cmd.range.selectNode(e.target);
+						cmd.select();
+					}
+				});
+			}
+			if (_IE) {
+				self._mousedownHandler = function() {
+					var newRange = cmd.range.cloneRange();
+					newRange.shrink();
+					if (newRange.isControl()) {
+						self.blur();
+					}
+				};
+				K(document).mousedown(self._mousedownHandler);
+				K(doc).keydown(function(e) {
+					if (e.which == 8) {
+						cmd.selection();
+						var rng = cmd.range;
+						if (rng.isControl()) {
+							rng.collapse(true);
+							K(rng.startContainer.childNodes[rng.startOffset]).remove();
+							e.preventDefault();
+						}
+					}
+				});
+			}
+			self.cmd = cmd;
+			self.html(_elementVal(self.srcElement));
+			if (_IE) {
+				doc.body.disabled = true;
+				doc.body.contentEditable = true;
+				doc.body.removeAttribute('disabled');
+			} else {
+				doc.designMode = 'on';
+			}
+			if (options.afterCreate) {
+				options.afterCreate.call(self);
+			}
+		}
+		if (isDocumentDomain) {
+			self.iframe.bind('load', function(e) {
+				self.iframe.unbind('load');
+				if (_IE) {
+					ready();
+				} else {
+					setTimeout(ready, 0);
+				}
+			});
+		}
+		self.div.append(self.iframe);
+		self.div.append(self.textarea);
+		self.srcElement.hide();
+		!isDocumentDomain && ready();
+	},
+	setWidth : function(val) {
+		var self = this;
+		val = _addUnit(val);
+		self.width = val;
+		self.div.css('width', val);
+		return self;
+	},
+	setHeight : function(val) {
+		var self = this;
+		val = _addUnit(val);
+		self.height = val;
+		self.div.css('height', val);
+		self.iframe.css('height', val);
+		if ((_IE && _V < 8) || _QUIRKS) {
+			val = _addUnit(_removeUnit(val) - 2);
+		}
+		self.textarea.css('height', val);
+		return self;
+	},
+	remove : function() {
+		var self = this, doc = self.doc;
+		K(doc.body).unbind();
+		K(doc).unbind();
+		K(self.win).unbind();
+		if (self._mousedownHandler) {
+			K(document).unbind('mousedown', self._mousedownHandler);
+		}
+		_elementVal(self.srcElement, self.html());
+		self.srcElement.show();
+		doc.write('');
+		self.iframe.unbind();
+		self.textarea.unbind();
+		KEdit.parent.remove.call(self);
+	},
+	html : function(val, isFull) {
+		var self = this, doc = self.doc;
+		if (self.designMode) {
+			var body = doc.body;
+			if (val === undefined) {
+				if (isFull) {
+					val = '<!doctype html><html>' + body.parentNode.innerHTML + '</html>';
+				} else {
+					val = body.innerHTML;
+				}
+				if (self.beforeGetHtml) {
+					val = self.beforeGetHtml(val);
+				}
+				if (_GECKO && val == '<br />') {
+					val = '';
+				}
+				return val;
+			}
+			if (self.beforeSetHtml) {
+				val = self.beforeSetHtml(val);
+			}
+			if (_IE && _V >= 9) {
+				val = val.replace(/(<.*?checked=")checked(".*>)/ig, '$1$2');
+			}
+			K(body).html(val);
+			if (self.afterSetHtml) {
+				self.afterSetHtml();
+			}
+			return self;
+		}
+		if (val === undefined) {
+			return self.textarea.val();
+		}
+		self.textarea.val(val);
+		return self;
+	},
+	design : function(bool) {
+		var self = this, val;
+		if (bool === undefined ? !self.designMode : bool) {
+			if (!self.designMode) {
+				val = self.html();
+				self.designMode = true;
+				self.html(val);
+				self.textarea.hide();
+				self.iframe.show();
+			}
+		} else {
+			if (self.designMode) {
+				val = self.html();
+				self.designMode = false;
+				self.html(val);
+				self.iframe.hide();
+				self.textarea.show();
+			}
+		}
+		return self.focus();
+	},
+	focus : function() {
+		var self = this;
+		self.designMode ? self.win.focus() : self.textarea[0].focus();
+		return self;
+	},
+	blur : function() {
+		var self = this;
+		if (_IE) {
+			var input = K('<input type="text" style="float:left;width:0;height:0;padding:0;margin:0;border:0;" value="" />', self.div);
+			self.div.append(input);
+			input[0].focus();
+			input.remove();
+		} else {
+			self.designMode ? self.win.blur() : self.textarea[0].blur();
+		}
+		return self;
+	},
+	afterChange : function(fn) {
+		var self = this, doc = self.doc, body = doc.body;
+		K(doc).keyup(function(e) {
+			if (!e.ctrlKey && !e.altKey && _CHANGE_KEY_MAP[e.which]) {
+				fn(e);
+			}
+		});
+		K(doc).mouseup(fn).contextmenu(fn);
+		K(self.win).blur(fn);
+		function timeoutHandler(e) {
+			setTimeout(function() {
+				fn(e);
+			}, 1);
+		}
+		K(body).bind('paste', timeoutHandler);
+		K(body).bind('cut', timeoutHandler);
+		return self;
+	}
+});
+function _edit(options) {
+	return new KEdit(options);
+}
+K.EditClass = KEdit;
+K.edit = _edit;
+K.iframeDoc = _iframeDoc;
+function _selectToolbar(name, fn) {
+	var self = this,
+		knode = self.get(name);
+	if (knode) {
+		if (knode.hasClass('ke-disabled')) {
+			return;
+		}
+		fn(knode);
+	}
+}
+function KToolbar(options) {
+	this.init(options);
+}
+_extend(KToolbar, KWidget, {
+	init : function(options) {
+		var self = this;
+		KToolbar.parent.init.call(self, options);
+		self.disableMode = _undef(options.disableMode, false);
+		self.noDisableItemMap = _toMap(_undef(options.noDisableItems, []));
+		self._itemMap = {};
+		self.div.addClass('ke-toolbar').bind('contextmenu,mousedown,mousemove', function(e) {
+			e.preventDefault();
+		}).attr('unselectable', 'on');
+		function find(target) {
+			var knode = K(target);
+			if (knode.hasClass('ke-outline')) {
+				return knode;
+			}
+			if (knode.hasClass('ke-toolbar-icon')) {
+				return knode.parent();
+			}
+		}
+		function hover(e, method) {
+			var knode = find(e.target);
+			if (knode) {
+				if (knode.hasClass('ke-disabled')) {
+					return;
+				}
+				if (knode.hasClass('ke-selected')) {
+					return;
+				}
+				knode[method]('ke-on');
+			}
+		}
+		self.div.mouseover(function(e) {
+			hover(e, 'addClass');
+		})
+		.mouseout(function(e) {
+			hover(e, 'removeClass');
+		})
+		.click(function(e) {
+			var knode = find(e.target);
+			if (knode) {
+				if (knode.hasClass('ke-disabled')) {
+					return;
+				}
+				self.options.click.call(this, e, knode.attr('data-name'));
+			}
+		});
+	},
+	get : function(name) {
+		if (this._itemMap[name]) {
+			return this._itemMap[name];
+		}
+		return (this._itemMap[name] = K('span.ke-icon-' + name, this.div).parent());
+	},
+	select : function(name) {
+		_selectToolbar.call(this, name, function(knode) {
+			knode.addClass('ke-selected');
+		});
+		return self;
+	},
+	unselect : function(name) {
+		_selectToolbar.call(this, name, function(knode) {
+			knode.removeClass('ke-selected').removeClass('ke-on');
+		});
+		return self;
+	},
+	enable : function(name) {
+		var self = this,
+			knode = name.get ? name : self.get(name);
+		if (knode) {
+			knode.removeClass('ke-disabled');
+			knode.opacity(1);
+		}
+		return self;
+	},
+	disable : function(name) {
+		var self = this,
+			knode = name.get ? name : self.get(name);
+		if (knode) {
+			knode.removeClass('ke-selected').addClass('ke-disabled');
+			knode.opacity(0.5);
+		}
+		return self;
+	},
+	disableAll : function(bool, noDisableItems) {
+		var self = this, map = self.noDisableItemMap, item;
+		if (noDisableItems) {
+			map = _toMap(noDisableItems);
+		}
+		if (bool === undefined ? !self.disableMode : bool) {
+			K('span.ke-outline', self.div).each(function() {
+				var knode = K(this),
+					name = knode[0].getAttribute('data-name', 2);
+				if (!map[name]) {
+					self.disable(knode);
+				}
+			});
+			self.disableMode = true;
+		} else {
+			K('span.ke-outline', self.div).each(function() {
+				var knode = K(this),
+					name = knode[0].getAttribute('data-name', 2);
+				if (!map[name]) {
+					self.enable(knode);
+				}
+			});
+			self.disableMode = false;
+		}
+		return self;
+	}
+});
+function _toolbar(options) {
+	return new KToolbar(options);
+}
+K.ToolbarClass = KToolbar;
+K.toolbar = _toolbar;
+function KMenu(options) {
+	this.init(options);
+}
+_extend(KMenu, KWidget, {
+	init : function(options) {
+		var self = this;
+		options.z = options.z || 811213;
+		KMenu.parent.init.call(self, options);
+		self.centerLineMode = _undef(options.centerLineMode, true);
+		self.div.addClass('ke-menu').bind('click,mousedown', function(e){
+			e.stopPropagation();
+		}).attr('unselectable', 'on');
+	},
+	addItem : function(item) {
+		var self = this;
+		if (item.title === '-') {
+			self.div.append(K('<div class="ke-menu-separator"></div>'));
+			return;
+		}
+		var itemDiv = K('<div class="ke-menu-item" unselectable="on"></div>'),
+			leftDiv = K('<div class="ke-inline-block ke-menu-item-left"></div>'),
+			rightDiv = K('<div class="ke-inline-block ke-menu-item-right"></div>'),
+			height = _addUnit(item.height),
+			iconClass = _undef(item.iconClass, '');
+		self.div.append(itemDiv);
+		if (height) {
+			itemDiv.css('height', height);
+			rightDiv.css('line-height', height);
+		}
+		var centerDiv;
+		if (self.centerLineMode) {
+			centerDiv = K('<div class="ke-inline-block ke-menu-item-center"></div>');
+			if (height) {
+				centerDiv.css('height', height);
+			}
+		}
+		itemDiv.mouseover(function(e) {
+			K(this).addClass('ke-menu-item-on');
+			if (centerDiv) {
+				centerDiv.addClass('ke-menu-item-center-on');
+			}
+		})
+		.mouseout(function(e) {
+			K(this).removeClass('ke-menu-item-on');
+			if (centerDiv) {
+				centerDiv.removeClass('ke-menu-item-center-on');
+			}
+		})
+		.click(function(e) {
+			item.click.call(K(this));
+			e.stopPropagation();
+		})
+		.append(leftDiv);
+		if (centerDiv) {
+			itemDiv.append(centerDiv);
+		}
+		itemDiv.append(rightDiv);
+		if (item.checked) {
+			iconClass = 'ke-icon-checked';
+		}
+		if (iconClass !== '') {
+			leftDiv.html('<span class="ke-inline-block ke-toolbar-icon ke-toolbar-icon-url ' + iconClass + '"></span>');
+		}
+		rightDiv.html(item.title);
+		return self;
+	},
+	remove : function() {
+		var self = this;
+		if (self.options.beforeRemove) {
+			self.options.beforeRemove.call(self);
+		}
+		K('.ke-menu-item', self.div[0]).unbind();
+		KMenu.parent.remove.call(self);
+		return self;
+	}
+});
+function _menu(options) {
+	return new KMenu(options);
+}
+K.MenuClass = KMenu;
+K.menu = _menu;
+function KColorPicker(options) {
+	this.init(options);
+}
+_extend(KColorPicker, KWidget, {
+	init : function(options) {
+		var self = this;
+		options.z = options.z || 811213;
+		KColorPicker.parent.init.call(self, options);
+		var colors = options.colors || [
+			['#E53333', '#E56600', '#FF9900', '#64451D', '#DFC5A4', '#FFE500'],
+			['#009900', '#006600', '#99BB00', '#B8D100', '#60D978', '#00D5FF'],
+			['#337FE5', '#003399', '#4C33E5', '#9933E5', '#CC33E5', '#EE33EE'],
+			['#FFFFFF', '#CCCCCC', '#999999', '#666666', '#333333', '#000000']
+		];
+		self.selectedColor = (options.selectedColor || '').toLowerCase();
+		self._cells = [];
+		self.div.addClass('ke-colorpicker').bind('click,mousedown', function(e){
+			e.stopPropagation();
+		}).attr('unselectable', 'on');
+		var table = self.doc.createElement('table');
+		self.div.append(table);
+		table.className = 'ke-colorpicker-table';
+		table.cellPadding = 0;
+		table.cellSpacing = 0;
+		table.border = 0;
+		var row = table.insertRow(0), cell = row.insertCell(0);
+		cell.colSpan = colors[0].length;
+		self._addAttr(cell, '', 'ke-colorpicker-cell-top');
+		for (var i = 0; i < colors.length; i++) {
+			row = table.insertRow(i + 1);
+			for (var j = 0; j < colors[i].length; j++) {
+				cell = row.insertCell(j);
+				self._addAttr(cell, colors[i][j], 'ke-colorpicker-cell');
+			}
+		}
+	},
+	_addAttr : function(cell, color, cls) {
+		var self = this;
+		cell = K(cell).addClass(cls);
+		if (self.selectedColor === color.toLowerCase()) {
+			cell.addClass('ke-colorpicker-cell-selected');
+		}
+		cell.attr('title', color || self.options.noColor);
+		cell.mouseover(function(e) {
+			K(this).addClass('ke-colorpicker-cell-on');
+		});
+		cell.mouseout(function(e) {
+			K(this).removeClass('ke-colorpicker-cell-on');
+		});
+		cell.click(function(e) {
+			e.stop();
+			self.options.click.call(K(this), color);
+		});
+		if (color) {
+			cell.append(K('<div class="ke-colorpicker-cell-color" unselectable="on"></div>').css('background-color', color));
+		} else {
+			cell.html(self.options.noColor);
+		}
+		K(cell).attr('unselectable', 'on');
+		self._cells.push(cell);
+	},
+	remove : function() {
+		var self = this;
+		_each(self._cells, function() {
+			this.unbind();
+		});
+		KColorPicker.parent.remove.call(self);
+		return self;
+	}
+});
+function _colorpicker(options) {
+	return new KColorPicker(options);
+}
+K.ColorPickerClass = KColorPicker;
+K.colorpicker = _colorpicker;
+function KUploadButton(options) {
+	this.init(options);
+}
+_extend(KUploadButton, {
+	init : function(options) {
+		var self = this,
+			button = K(options.button),
+			fieldName = options.fieldName || 'file',
+			url = options.url || '',
+			title = button.val(),
+			extraParams = options.extraParams || {},
+			cls = button[0].className || '',
+			target = options.target || 'kindeditor_upload_iframe_' + new Date().getTime();
+		options.afterError = options.afterError || function(str) {
+			alert(str);
+		};
+		var hiddenElements = [];
+		for(var k in extraParams){
+			hiddenElements.push('<input type="hidden" name="' + k + '" value="' + extraParams[k] + '" />');
+		}
+		var html = [
+			'<div class="ke-inline-block ' + cls + '">',
+			(options.target ? '' : '<iframe name="' + target + '" style="display:none;"></iframe>'),
+			(options.form ? '<div class="ke-upload-area">' : '<form class="ke-upload-area ke-form" method="post" enctype="multipart/form-data" target="' + target + '" action="' + url + '">'),
+			'<span class="ke-button-common">',
+			hiddenElements.join(''),
+			'<input type="button" class="ke-button-common ke-button" value="' + title + '" />',
+			'</span>',
+			'<input type="file" class="ke-upload-file" name="' + fieldName + '" tabindex="-1" />',
+			(options.form ? '</div>' : '</form>'),
+			'</div>'].join('');
+		var div = K(html, button.doc);
+		button.hide();
+		button.before(div);
+		self.div = div;
+		self.button = button;
+		self.iframe = options.target ? K('iframe[name="' + target + '"]') : K('iframe', div);
+		self.form = options.form ? K(options.form) : K('form', div);
+		self.fileBox = K('.ke-upload-file', div);
+		var width = options.width || K('.ke-button-common', div).width();
+		K('.ke-upload-area', div).width(width);
+		self.options = options;
+	},
+	submit : function() {
+		var self = this,
+			iframe = self.iframe;
+		iframe.bind('load', function() {
+			iframe.unbind();
+			var tempForm = document.createElement('form');
+			self.fileBox.before(tempForm);
+			K(tempForm).append(self.fileBox);
+			tempForm.reset();
+			K(tempForm).remove(true);
+			var doc = K.iframeDoc(iframe),
+				pre = doc.getElementsByTagName('pre')[0],
+				str = '', data;
+			if (pre) {
+				str = pre.innerHTML;
+			} else {
+				str = doc.body.innerHTML;
+			}
+			str = _unescape(str);
+			iframe[0].src = 'javascript:false';
+			try {
+				data = K.json(str);
+			} catch (e) {
+				self.options.afterError.call(self, '<!doctype html><html>' + doc.body.parentNode.innerHTML + '</html>');
+			}
+			if (data) {
+				self.options.afterUpload.call(self, data);
+			}
+		});
+		self.form[0].submit();
+		return self;
+	},
+	remove : function() {
+		var self = this;
+		if (self.fileBox) {
+			self.fileBox.unbind();
+		}
+		self.iframe.remove();
+		self.div.remove();
+		self.button.show();
+		return self;
+	}
+});
+function _uploadbutton(options) {
+	return new KUploadButton(options);
+}
+K.UploadButtonClass = KUploadButton;
+K.uploadbutton = _uploadbutton;
+function _createButton(arg) {
+	arg = arg || {};
+	var name = arg.name || '',
+		span = K('<span class="ke-button-common ke-button-outer" title="' + name + '"></span>'),
+		btn = K('<input class="ke-button-common ke-button" type="button" value="' + name + '" />');
+	if (arg.click) {
+		btn.click(arg.click);
+	}
+	span.append(btn);
+	return span;
+}
+function KDialog(options) {
+	this.init(options);
+}
+_extend(KDialog, KWidget, {
+	init : function(options) {
+		var self = this;
+		var shadowMode = _undef(options.shadowMode, true);
+		options.z = options.z || 811213;
+		options.shadowMode = false;
+		options.autoScroll = _undef(options.autoScroll, true);
+		KDialog.parent.init.call(self, options);
+		var title = options.title,
+			body = K(options.body, self.doc),
+			previewBtn = options.previewBtn,
+			yesBtn = options.yesBtn,
+			noBtn = options.noBtn,
+			closeBtn = options.closeBtn,
+			showMask = _undef(options.showMask, true);
+		self.div.addClass('ke-dialog').bind('click,mousedown', function(e){
+			e.stopPropagation();
+		});
+		var contentDiv = K('<div class="ke-dialog-content"></div>').appendTo(self.div);
+		if (_IE && _V < 7) {
+			self.iframeMask = K('<iframe src="about:blank" class="ke-dialog-shadow"></iframe>').appendTo(self.div);
+		} else if (shadowMode) {
+			K('<div class="ke-dialog-shadow"></div>').appendTo(self.div);
+		}
+		var headerDiv = K('<div class="ke-dialog-header"></div>');
+		contentDiv.append(headerDiv);
+		headerDiv.html(title);
+		self.closeIcon = K('<span class="ke-dialog-icon-close" title="' + closeBtn.name + '"></span>').click(closeBtn.click);
+		headerDiv.append(self.closeIcon);
+		self.draggable({
+			clickEl : headerDiv,
+			beforeDrag : options.beforeDrag
+		});
+		var bodyDiv = K('<div class="ke-dialog-body"></div>');
+		contentDiv.append(bodyDiv);
+		bodyDiv.append(body);
+		var footerDiv = K('<div class="ke-dialog-footer"></div>');
+		if (previewBtn || yesBtn || noBtn) {
+			contentDiv.append(footerDiv);
+		}
+		_each([
+			{ btn : previewBtn, name : 'preview' },
+			{ btn : yesBtn, name : 'yes' },
+			{ btn : noBtn, name : 'no' }
+		], function() {
+			if (this.btn) {
+				var button = _createButton(this.btn);
+				button.addClass('ke-dialog-' + this.name);
+				footerDiv.append(button);
+			}
+		});
+		if (self.height) {
+			bodyDiv.height(_removeUnit(self.height) - headerDiv.height() - footerDiv.height());
+		}
+		self.div.width(self.div.width());
+		self.div.height(self.div.height());
+		self.mask = null;
+		if (showMask) {
+			var docEl = _docElement(self.doc),
+				docWidth = Math.max(docEl.scrollWidth, docEl.clientWidth),
+				docHeight = Math.max(docEl.scrollHeight, docEl.clientHeight);
+			self.mask = _widget({
+				x : 0,
+				y : 0,
+				z : self.z - 1,
+				cls : 'ke-dialog-mask',
+				width : docWidth,
+				height : docHeight
+			});
+		}
+		self.autoPos(self.div.width(), self.div.height());
+		self.footerDiv = footerDiv;
+		self.bodyDiv = bodyDiv;
+		self.headerDiv = headerDiv;
+		self.isLoading = false;
+	},
+	setMaskIndex : function(z) {
+		var self = this;
+		self.mask.div.css('z-index', z);
+	},
+	showLoading : function(msg) {
+		msg = _undef(msg, '');
+		var self = this, body = self.bodyDiv;
+		self.loading = K('<div class="ke-dialog-loading"><div class="ke-inline-block ke-dialog-loading-content" style="margin-top:' + Math.round(body.height() / 3) + 'px;">' + msg + '</div></div>')
+			.width(body.width()).height(body.height())
+			.css('top', self.headerDiv.height() + 'px');
+		body.css('visibility', 'hidden').after(self.loading);
+		self.isLoading = true;
+		return self;
+	},
+	hideLoading : function() {
+		this.loading && this.loading.remove();
+		this.bodyDiv.css('visibility', 'visible');
+		this.isLoading = false;
+		return this;
+	},
+	remove : function() {
+		var self = this;
+		if (self.options.beforeRemove) {
+			self.options.beforeRemove.call(self);
+		}
+		self.mask && self.mask.remove();
+		self.iframeMask && self.iframeMask.remove();
+		self.closeIcon.unbind();
+		K('input', self.div).unbind();
+		K('button', self.div).unbind();
+		self.footerDiv.unbind();
+		self.bodyDiv.unbind();
+		self.headerDiv.unbind();
+		K('iframe', self.div).each(function() {
+			K(this).remove();
+		});
+		KDialog.parent.remove.call(self);
+		return self;
+	}
+});
+function _dialog(options) {
+	return new KDialog(options);
+}
+K.DialogClass = KDialog;
+K.dialog = _dialog;
+function _tabs(options) {
+	var self = _widget(options),
+		remove = self.remove,
+		afterSelect = options.afterSelect,
+		div = self.div,
+		liList = [];
+	div.addClass('ke-tabs')
+		.bind('contextmenu,mousedown,mousemove', function(e) {
+			e.preventDefault();
+		});
+	var ul = K('<ul class="ke-tabs-ul ke-clearfix"></ul>');
+	div.append(ul);
+	self.add = function(tab) {
+		var li = K('<li class="ke-tabs-li">' + tab.title + '</li>');
+		li.data('tab', tab);
+		liList.push(li);
+		ul.append(li);
+	};
+	self.selectedIndex = 0;
+	self.select = function(index) {
+		self.selectedIndex = index;
+		_each(liList, function(i, li) {
+			li.unbind();
+			if (i === index) {
+				li.addClass('ke-tabs-li-selected');
+				K(li.data('tab').panel).show('');
+			} else {
+				li.removeClass('ke-tabs-li-selected').removeClass('ke-tabs-li-on')
+				.mouseover(function() {
+					K(this).addClass('ke-tabs-li-on');
+				})
+				.mouseout(function() {
+					K(this).removeClass('ke-tabs-li-on');
+				})
+				.click(function() {
+					self.select(i);
+				});
+				K(li.data('tab').panel).hide();
+			}
+		});
+		if (afterSelect) {
+			afterSelect.call(self, index);
+		}
+	};
+	self.remove = function() {
+		_each(liList, function() {
+			this.remove();
+		});
+		ul.remove();
+		remove.call(self);
+	};
+	return self;
+}
+K.tabs = _tabs;
+function _loadScript(url, fn) {
+	var head = document.getElementsByTagName('head')[0] || (_QUIRKS ? document.body : document.documentElement),
+		script = document.createElement('script');
+	head.appendChild(script);
+	script.src = url;
+	script.charset = 'utf-8';
+	script.onload = script.onreadystatechange = function() {
+		if (!this.readyState || this.readyState === 'loaded') {
+			if (fn) {
+				fn();
+			}
+			script.onload = script.onreadystatechange = null;
+			head.removeChild(script);
+		}
+	};
+}
+function _chopQuery(url) {
+	var index = url.indexOf('?');
+	return index > 0 ? url.substr(0, index) : url;
+}
+function _loadStyle(url) {
+	var head = document.getElementsByTagName('head')[0] || (_QUIRKS ? document.body : document.documentElement),
+		link = document.createElement('link'),
+		absoluteUrl = _chopQuery(_formatUrl(url, 'absolute'));
+	var links = K('link[rel="stylesheet"]', head);
+	for (var i = 0, len = links.length; i < len; i++) {
+		if (_chopQuery(_formatUrl(links[i].href, 'absolute')) === absoluteUrl) {
+			return;
+		}
+	}
+	head.appendChild(link);
+	link.href = url;
+	link.rel = 'stylesheet';
+}
+function _ajax(url, fn, method, param, dataType) {
+	method = method || 'GET';
+	dataType = dataType || 'json';
+	var xhr = window.XMLHttpRequest ? new window.XMLHttpRequest() : new ActiveXObject('Microsoft.XMLHTTP');
+	xhr.open(method, url, true);
+	xhr.onreadystatechange = function () {
+		if (xhr.readyState == 4 && xhr.status == 200) {
+			if (fn) {
+				var data = _trim(xhr.responseText);
+				if (dataType == 'json') {
+					data = _json(data);
+				}
+				fn(data);
+			}
+		}
+	};
+	if (method == 'POST') {
+		var params = [];
+		_each(param, function(key, val) {
+			params.push(encodeURIComponent(key) + '=' + encodeURIComponent(val));
+		});
+		try {
+			xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
+		} catch (e) {}
+		xhr.send(params.join('&'));
+	} else {
+		xhr.send(null);
+	}
+}
+K.loadScript = _loadScript;
+K.loadStyle = _loadStyle;
+K.ajax = _ajax;
+var _plugins = {};
+function _plugin(name, fn) {
+	if (name === undefined) {
+		return _plugins;
+	}
+	if (!fn) {
+		return _plugins[name];
+	}
+	_plugins[name] = fn;
+}
+var _language = {};
+function _parseLangKey(key) {
+	var match, ns = 'core';
+	if ((match = /^(\w+)\.(\w+)$/.exec(key))) {
+		ns = match[1];
+		key = match[2];
+	}
+	return { ns : ns, key : key };
+}
+function _lang(mixed, langType) {
+	langType = langType === undefined ? K.options.langType : langType;
+	if (typeof mixed === 'string') {
+		if (!_language[langType]) {
+			return 'no language';
+		}
+		var pos = mixed.length - 1;
+		if (mixed.substr(pos) === '.') {
+			return _language[langType][mixed.substr(0, pos)];
+		}
+		var obj = _parseLangKey(mixed);
+		return _language[langType][obj.ns][obj.key];
+	}
+	_each(mixed, function(key, val) {
+		var obj = _parseLangKey(key);
+		if (!_language[langType]) {
+			_language[langType] = {};
+		}
+		if (!_language[langType][obj.ns]) {
+			_language[langType][obj.ns] = {};
+		}
+		_language[langType][obj.ns][obj.key] = val;
+	});
+}
+function _getImageFromRange(range, fn) {
+	if (range.collapsed) {
+		return;
+	}
+	range = range.cloneRange().up();
+	var sc = range.startContainer, so = range.startOffset;
+	if (!_WEBKIT && !range.isControl()) {
+		return;
+	}
+	var img = K(sc.childNodes[so]);
+	if (!img || img.name != 'img') {
+		return;
+	}
+	if (fn(img)) {
+		return img;
+	}
+}
+function _bindContextmenuEvent() {
+	var self = this, doc = self.edit.doc;
+	K(doc).contextmenu(function(e) {
+		if (self.menu) {
+			self.hideMenu();
+		}
+		if (!self.useContextmenu) {
+			e.preventDefault();
+			return;
+		}
+		if (self._contextmenus.length === 0) {
+			return;
+		}
+		var maxWidth = 0, items = [];
+		_each(self._contextmenus, function() {
+			if (this.title == '-') {
+				items.push(this);
+				return;
+			}
+			if (this.cond && this.cond()) {
+				items.push(this);
+				if (this.width && this.width > maxWidth) {
+					maxWidth = this.width;
+				}
+			}
+		});
+		while (items.length > 0 && items[0].title == '-') {
+			items.shift();
+		}
+		while (items.length > 0 && items[items.length - 1].title == '-') {
+			items.pop();
+		}
+		var prevItem = null;
+		_each(items, function(i) {
+			if (this.title == '-' && prevItem.title == '-') {
+				delete items[i];
+			}
+			prevItem = this;
+		});
+		if (items.length > 0) {
+			e.preventDefault();
+			var pos = K(self.edit.iframe).pos(),
+				menu = _menu({
+					x : pos.x + e.clientX,
+					y : pos.y + e.clientY,
+					width : maxWidth,
+					css : { visibility: 'hidden' },
+					shadowMode : self.shadowMode
+				});
+			_each(items, function() {
+				if (this.title) {
+					menu.addItem(this);
+				}
+			});
+			var docEl = _docElement(menu.doc),
+				menuHeight = menu.div.height();
+			if (e.clientY + menuHeight >= docEl.clientHeight - 100) {
+				menu.pos(menu.x, _removeUnit(menu.y) - menuHeight);
+			}
+			menu.div.css('visibility', 'visible');
+			self.menu = menu;
+		}
+	});
+}
+function _bindNewlineEvent() {
+	var self = this, doc = self.edit.doc, newlineTag = self.newlineTag;
+	if (_IE && newlineTag !== 'br') {
+		return;
+	}
+	if (_GECKO && _V < 3 && newlineTag !== 'p') {
+		return;
+	}
+	if (_OPERA && _V < 9) {
+		return;
+	}
+	var brSkipTagMap = _toMap('h1,h2,h3,h4,h5,h6,pre,li'),
+		pSkipTagMap = _toMap('p,h1,h2,h3,h4,h5,h6,pre,li,blockquote');
+	function getAncestorTagName(range) {
+		var ancestor = K(range.commonAncestor());
+		while (ancestor) {
+			if (ancestor.type == 1 && !ancestor.isStyle()) {
+				break;
+			}
+			ancestor = ancestor.parent();
+		}
+		return ancestor.name;
+	}
+	K(doc).keydown(function(e) {
+		if (e.which != 13 || e.shiftKey || e.ctrlKey || e.altKey) {
+			return;
+		}
+		self.cmd.selection();
+		var tagName = getAncestorTagName(self.cmd.range);
+		if (tagName == 'marquee' || tagName == 'select') {
+			return;
+		}
+		if (newlineTag === 'br' && !brSkipTagMap[tagName]) {
+			e.preventDefault();
+			self.insertHtml('<br />' + (_IE && _V < 9 ? '' : '\u200B'));
+			return;
+		}
+		if (!pSkipTagMap[tagName]) {
+			_nativeCommand(doc, 'formatblock', '<p>');
+		}
+	});
+	K(doc).keyup(function(e) {
+		if (e.which != 13 || e.shiftKey || e.ctrlKey || e.altKey) {
+			return;
+		}
+		if (newlineTag == 'br') {
+			return;
+		}
+		if (_GECKO) {
+			var root = self.cmd.commonAncestor('p');
+			var a = self.cmd.commonAncestor('a');
+			if (a && a.text() == '') {
+				a.remove(true);
+				self.cmd.range.selectNodeContents(root[0]).collapse(true);
+				self.cmd.select();
+			}
+			return;
+		}
+		self.cmd.selection();
+		var tagName = getAncestorTagName(self.cmd.range);
+		if (tagName == 'marquee' || tagName == 'select') {
+			return;
+		}
+		if (!pSkipTagMap[tagName]) {
+			_nativeCommand(doc, 'formatblock', '<p>');
+		}
+		var div = self.cmd.commonAncestor('div');
+		if (div) {
+			var p = K('<p></p>'),
+				child = div[0].firstChild;
+			while (child) {
+				var next = child.nextSibling;
+				p.append(child);
+				child = next;
+			}
+			div.before(p);
+			div.remove();
+			self.cmd.range.selectNodeContents(p[0]);
+			self.cmd.select();
+		}
+	});
+}
+function _bindTabEvent() {
+	var self = this, doc = self.edit.doc;
+	K(doc).keydown(function(e) {
+		if (e.which == 9) {
+			e.preventDefault();
+			if (self.afterTab) {
+				self.afterTab.call(self, e);
+				return;
+			}
+			var cmd = self.cmd, range = cmd.range;
+			range.shrink();
+			if (range.collapsed && range.startContainer.nodeType == 1) {
+				range.insertNode(K('@&nbsp;', doc)[0]);
+				cmd.select();
+			}
+			self.insertHtml('&nbsp;&nbsp;&nbsp;&nbsp;');
+		}
+	});
+}
+function _bindFocusEvent() {
+	var self = this;
+	K(self.edit.textarea[0], self.edit.win).focus(function(e) {
+		if (self.afterFocus) {
+			self.afterFocus.call(self, e);
+		}
+	}).blur(function(e) {
+		if (self.afterBlur) {
+			self.afterBlur.call(self, e);
+		}
+	});
+}
+function _removeBookmarkTag(html) {
+	return _trim(html.replace(/<span [^>]*id="?__kindeditor_bookmark_\w+_\d+__"?[^>]*><\/span>/ig, ''));
+}
+function _removeTempTag(html) {
+	return html.replace(/<div[^>]+class="?__kindeditor_paste__"?[^>]*>[\s\S]*?<\/div>/ig, '');
+}
+function _addBookmarkToStack(stack, bookmark) {
+	if (stack.length === 0) {
+		stack.push(bookmark);
+		return;
+	}
+	var prev = stack[stack.length - 1];
+	if (_removeBookmarkTag(bookmark.html) !== _removeBookmarkTag(prev.html)) {
+		stack.push(bookmark);
+	}
+}
+function _undoToRedo(fromStack, toStack) {
+	var self = this, edit = self.edit,
+		body = edit.doc.body,
+		range, bookmark;
+	if (fromStack.length === 0) {
+		return self;
+	}
+	if (edit.designMode) {
+		range = self.cmd.range;
+		bookmark = range.createBookmark(true);
+		bookmark.html = body.innerHTML;
+	} else {
+		bookmark = {
+			html : body.innerHTML
+		};
+	}
+	_addBookmarkToStack(toStack, bookmark);
+	var prev = fromStack.pop();
+	if (_removeBookmarkTag(bookmark.html) === _removeBookmarkTag(prev.html) && fromStack.length > 0) {
+		prev = fromStack.pop();
+	}
+	if (edit.designMode) {
+		edit.html(prev.html);
+		if (prev.start) {
+			range.moveToBookmark(prev);
+			self.select();
+		}
+	} else {
+		K(body).html(_removeBookmarkTag(prev.html));
+	}
+	return self;
+}
+function KEditor(options) {
+	var self = this;
+	self.options = {};
+	function setOption(key, val) {
+		if (KEditor.prototype[key] === undefined) {
+			self[key] = val;
+		}
+		self.options[key] = val;
+	}
+	_each(options, function(key, val) {
+		setOption(key, options[key]);
+	});
+	_each(K.options, function(key, val) {
+		if (self[key] === undefined) {
+			setOption(key, val);
+		}
+	});
+	var se = K(self.srcElement || '<textarea/>');
+	if (!self.width) {
+		self.width = se[0].style.width || se.width();
+	}
+	if (!self.height) {
+		self.height = se[0].style.height || se.height();
+	}
+	setOption('width', _undef(self.width, self.minWidth));
+	setOption('height', _undef(self.height, self.minHeight));
+	setOption('width', _addUnit(self.width));
+	setOption('height', _addUnit(self.height));
+	if (_MOBILE && (!_IOS || _V < 534)) {
+		self.designMode = false;
+	}
+	self.srcElement = se;
+	self.initContent = '';
+	self.plugin = {};
+	self.isCreated = false;
+	self._handlers = {};
+	self._contextmenus = [];
+	self._undoStack = [];
+	self._redoStack = [];
+	self._firstAddBookmark = true;
+	self.menu = self.contextmenu = null;
+	self.dialogs = [];
+}
+KEditor.prototype = {
+	lang : function(mixed) {
+		return _lang(mixed, this.langType);
+	},
+	loadPlugin : function(name, fn) {
+		var self = this;
+		if (_plugins[name]) {
+			if (!_isFunction(_plugins[name])) {
+				setTimeout(function() {
+					self.loadPlugin(name, fn);
+				}, 100);
+				return self;
+			}
+			_plugins[name].call(self, KindEditor);
+			if (fn) {
+				fn.call(self);
+			}
+			return self;
+		}
+		_plugins[name] = 'loading';
+		_loadScript(self.pluginsPath + name + '/' + name + '.js?ver=' + encodeURIComponent(K.DEBUG ? _TIME : _VERSION), function() {
+			setTimeout(function() {
+				if (_plugins[name]) {
+					self.loadPlugin(name, fn);
+				}
+			}, 0);
+		});
+		return self;
+	},
+	handler : function(key, fn) {
+		var self = this;
+		if (!self._handlers[key]) {
+			self._handlers[key] = [];
+		}
+		if (_isFunction(fn)) {
+			self._handlers[key].push(fn);
+			return self;
+		}
+		_each(self._handlers[key], function() {
+			fn = this.call(self, fn);
+		});
+		return fn;
+	},
+	clickToolbar : function(name, fn) {
+		var self = this, key = 'clickToolbar' + name;
+		if (fn === undefined) {
+			if (self._handlers[key]) {
+				return self.handler(key);
+			}
+			self.loadPlugin(name, function() {
+				self.handler(key);
+			});
+			return self;
+		}
+		return self.handler(key, fn);
+	},
+	updateState : function() {
+		var self = this;
+		_each(('justifyleft,justifycenter,justifyright,justifyfull,insertorderedlist,insertunorderedlist,' +
+			'subscript,superscript,bold,italic,underline,strikethrough').split(','), function(i, name) {
+			self.cmd.state(name) ? self.toolbar.select(name) : self.toolbar.unselect(name);
+		});
+		return self;
+	},
+	addContextmenu : function(item) {
+		this._contextmenus.push(item);
+		return this;
+	},
+	afterCreate : function(fn) {
+		return this.handler('afterCreate', fn);
+	},
+	beforeRemove : function(fn) {
+		return this.handler('beforeRemove', fn);
+	},
+	beforeGetHtml : function(fn) {
+		return this.handler('beforeGetHtml', fn);
+	},
+	beforeSetHtml : function(fn) {
+		return this.handler('beforeSetHtml', fn);
+	},
+	afterSetHtml : function(fn) {
+		return this.handler('afterSetHtml', fn);
+	},
+	create : function() {
+		var self = this, fullscreenMode = self.fullscreenMode;
+		if (self.isCreated) {
+			return self;
+		}
+		if (self.srcElement.data('kindeditor')) {
+			return self;
+		}
+		self.srcElement.data('kindeditor', 'true');
+		if (fullscreenMode) {
+			_docElement().style.overflow = 'hidden';
+		} else {
+			_docElement().style.overflow = '';
+		}
+		var width = fullscreenMode ? _docElement().clientWidth + 'px' : self.width,
+			height = fullscreenMode ? _docElement().clientHeight + 'px' : self.height;
+		if ((_IE && _V < 8) || _QUIRKS) {
+			height = _addUnit(_removeUnit(height) + 2);
+		}
+		var container = self.container = K(self.layout);
+		if (fullscreenMode) {
+			K(document.body).append(container);
+		} else {
+			self.srcElement.before(container);
+		}
+		var toolbarDiv = K('.toolbar', container),
+			editDiv = K('.edit', container),
+			statusbar = self.statusbar = K('.statusbar', container);
+		container.removeClass('container')
+			.addClass('ke-container ke-container-' + self.themeType).css('width', width);
+		if (fullscreenMode) {
+			container.css({
+				position : 'absolute',
+				left : 0,
+				top : 0,
+				'z-index' : 811211
+			});
+			if (!_GECKO) {
+				self._scrollPos = _getScrollPos();
+			}
+			window.scrollTo(0, 0);
+			K(document.body).css({
+				'height' : '1px',
+				'overflow' : 'hidden'
+			});
+			K(document.body.parentNode).css('overflow', 'hidden');
+			self._fullscreenExecuted = true;
+		} else {
+			if (self._fullscreenExecuted) {
+				K(document.body).css({
+					'height' : '',
+					'overflow' : ''
+				});
+				K(document.body.parentNode).css('overflow', '');
+			}
+			if (self._scrollPos) {
+				window.scrollTo(self._scrollPos.x, self._scrollPos.y);
+			}
+		}
+		var htmlList = [];
+		K.each(self.items, function(i, name) {
+			if (name == '|') {
+				htmlList.push('<span class="ke-inline-block ke-separator"></span>');
+			} else if (name == '/') {
+				htmlList.push('<div class="ke-hr"></div>');
+			} else {
+				htmlList.push('<span class="ke-outline" data-name="' + name + '" title="' + self.lang(name) + '" unselectable="on">');
+				htmlList.push('<span class="ke-toolbar-icon ke-toolbar-icon-url ke-icon-' + name + '" unselectable="on"></span></span>');
+			}
+		});
+		var toolbar = self.toolbar = _toolbar({
+			src : toolbarDiv,
+			html : htmlList.join(''),
+			noDisableItems : self.noDisableItems,
+			click : function(e, name) {
+				e.stop();
+				if (self.menu) {
+					var menuName = self.menu.name;
+					self.hideMenu();
+					if (menuName === name) {
+						return;
+					}
+				}
+				self.clickToolbar(name);
+			}
+		});
+		var editHeight = _removeUnit(height) - toolbar.div.height();
+		var edit = self.edit = _edit({
+			height : editHeight > 0 && _removeUnit(height) > self.minHeight ? editHeight : self.minHeight,
+			src : editDiv,
+			srcElement : self.srcElement,
+			designMode : self.designMode,
+			themesPath : self.themesPath,
+			bodyClass : self.bodyClass,
+			cssPath : self.cssPath,
+			cssData : self.cssData,
+			beforeGetHtml : function(html) {
+				html = self.beforeGetHtml(html);
+				html = _removeBookmarkTag(_removeTempTag(html));
+				return _formatHtml(html, self.filterMode ? self.htmlTags : null, self.urlType, self.wellFormatMode, self.indentChar);
+			},
+			beforeSetHtml : function(html) {
+				html = _formatHtml(html, self.filterMode ? self.htmlTags : null, '', false);
+				return self.beforeSetHtml(html);
+			},
+			afterSetHtml : function() {
+				self.edit = edit = this;
+				self.afterSetHtml();
+			},
+			afterCreate : function() {
+				self.edit = edit = this;
+				self.cmd = edit.cmd;
+				self._docMousedownFn = function(e) {
+					if (self.menu) {
+						self.hideMenu();
+					}
+				};
+				K(edit.doc, document).mousedown(self._docMousedownFn);
+				_bindContextmenuEvent.call(self);
+				_bindNewlineEvent.call(self);
+				_bindTabEvent.call(self);
+				_bindFocusEvent.call(self);
+				edit.afterChange(function(e) {
+					if (!edit.designMode) {
+						return;
+					}
+					self.updateState();
+					self.addBookmark();
+					if (self.options.afterChange) {
+						self.options.afterChange.call(self);
+					}
+				});
+				edit.textarea.keyup(function(e) {
+					if (!e.ctrlKey && !e.altKey && _INPUT_KEY_MAP[e.which]) {
+						if (self.options.afterChange) {
+							self.options.afterChange.call(self);
+						}
+					}
+				});
+				if (self.readonlyMode) {
+					self.readonly();
+				}
+				self.isCreated = true;
+				if (self.initContent === '') {
+					self.initContent = self.html();
+				}
+				if (self._undoStack.length > 0) {
+					var prev = self._undoStack.pop();
+					if (prev.start) {
+						self.html(prev.html);
+						edit.cmd.range.moveToBookmark(prev);
+						self.select();
+					}
+				}
+				self.afterCreate();
+				if (self.options.afterCreate) {
+					self.options.afterCreate.call(self);
+				}
+			}
+		});
+		statusbar.removeClass('statusbar').addClass('ke-statusbar')
+			.append('<span class="ke-inline-block ke-statusbar-center-icon"></span>')
+			.append('<span class="ke-inline-block ke-statusbar-right-icon"></span>');
+		if (self._fullscreenResizeHandler) {
+			K(window).unbind('resize', self._fullscreenResizeHandler);
+			self._fullscreenResizeHandler = null;
+		}
+		function initResize() {
+			if (statusbar.height() === 0) {
+				setTimeout(initResize, 100);
+				return;
+			}
+			self.resize(width, height, false);
+		}
+		initResize();
+		if (fullscreenMode) {
+			self._fullscreenResizeHandler = function(e) {
+				if (self.isCreated) {
+					self.resize(_docElement().clientWidth, _docElement().clientHeight, false);
+				}
+			};
+			K(window).bind('resize', self._fullscreenResizeHandler);
+			toolbar.select('fullscreen');
+			statusbar.first().css('visibility', 'hidden');
+			statusbar.last().css('visibility', 'hidden');
+		} else {
+			if (_GECKO) {
+				K(window).bind('scroll', function(e) {
+					self._scrollPos = _getScrollPos();
+				});
+			}
+			if (self.resizeType > 0) {
+				_drag({
+					moveEl : container,
+					clickEl : statusbar,
+					moveFn : function(x, y, width, height, diffX, diffY) {
+						height += diffY;
+						self.resize(null, height);
+					}
+				});
+			} else {
+				statusbar.first().css('visibility', 'hidden');
+			}
+			if (self.resizeType === 2) {
+				_drag({
+					moveEl : container,
+					clickEl : statusbar.last(),
+					moveFn : function(x, y, width, height, diffX, diffY) {
+						width += diffX;
+						height += diffY;
+						self.resize(width, height);
+					}
+				});
+			} else {
+				statusbar.last().css('visibility', 'hidden');
+			}
+		}
+		return self;
+	},
+	remove : function() {
+		var self = this;
+		if (!self.isCreated) {
+			return self;
+		}
+		self.beforeRemove();
+		self.srcElement.data('kindeditor', '');
+		if (self.menu) {
+			self.hideMenu();
+		}
+		_each(self.dialogs, function() {
+			self.hideDialog();
+		});
+		K(document).unbind('mousedown', self._docMousedownFn);
+		self.toolbar.remove();
+		self.edit.remove();
+		self.statusbar.last().unbind();
+		self.statusbar.unbind();
+		self.container.remove();
+		self.container = self.toolbar = self.edit = self.menu = null;
+		self.dialogs = [];
+		self.isCreated = false;
+		return self;
+	},
+	resize : function(width, height, updateProp) {
+		var self = this;
+		updateProp = _undef(updateProp, true);
+		if (width) {
+			if (!/%/.test(width)) {
+				width = _removeUnit(width);
+				width = width < self.minWidth ? self.minWidth : width;
+			}
+			self.container.css('width', _addUnit(width));
+			if (updateProp) {
+				self.width = _addUnit(width);
+			}
+		}
+		if (height) {
+			height = _removeUnit(height);
+			editHeight = _removeUnit(height) - self.toolbar.div.height() - self.statusbar.height();
+			editHeight = editHeight < self.minHeight ? self.minHeight : editHeight;
+			self.edit.setHeight(editHeight);
+			if (updateProp) {
+				self.height = _addUnit(height);
+			}
+		}
+		return self;
+	},
+	select : function() {
+		this.isCreated && this.cmd.select();
+		return this;
+	},
+	html : function(val) {
+		var self = this;
+		if (val === undefined) {
+			return self.isCreated ? self.edit.html() : _elementVal(self.srcElement);
+		}
+		self.isCreated ? self.edit.html(val) : _elementVal(self.srcElement, val);
+		if (self.isCreated) {
+			self.cmd.selection();
+		}
+		return self;
+	},
+	fullHtml : function() {
+		return this.isCreated ? this.edit.html(undefined, true) : '';
+	},
+	text : function(val) {
+		var self = this;
+		if (val === undefined) {
+			return _trim(self.html().replace(/<(?!img|embed).*?>/ig, '').replace(/&nbsp;/ig, ' '));
+		} else {
+			return self.html(_escape(val));
+		}
+	},
+	isEmpty : function() {
+		return _trim(this.text().replace(/\r\n|\n|\r/, '')) === '';
+	},
+	isDirty : function() {
+		return _trim(this.initContent.replace(/\r\n|\n|\r|t/g, '')) !== _trim(this.html().replace(/\r\n|\n|\r|t/g, ''));
+	},
+	selectedHtml : function() {
+		var val = this.isCreated ? this.cmd.range.html() : '';
+		val = _removeBookmarkTag(_removeTempTag(val));
+		return val;
+	},
+	count : function(mode) {
+		var self = this;
+		mode = (mode || 'html').toLowerCase();
+		if (mode === 'html') {
+			return self.html().length;
+		}
+		if (mode === 'text') {
+			return self.text().replace(/<(?:img|embed).*?>/ig, 'K').replace(/\r\n|\n|\r/g, '').length;
+		}
+		return 0;
+	},
+	exec : function(key) {
+		key = key.toLowerCase();
+		var self = this, cmd = self.cmd,
+			changeFlag = _inArray(key, 'selectall,copy,paste,print'.split(',')) < 0;
+		if (changeFlag) {
+			self.addBookmark(false);
+		}
+		cmd[key].apply(cmd, _toArray(arguments, 1));
+		if (changeFlag) {
+			self.updateState();
+			self.addBookmark(false);
+			if (self.options.afterChange) {
+				self.options.afterChange.call(self);
+			}
+		}
+		return self;
+	},
+	insertHtml : function(val, quickMode) {
+		if (!this.isCreated) {
+			return this;
+		}
+		val = this.beforeSetHtml(val);
+		this.exec('inserthtml', val, quickMode);
+		return this;
+	},
+	appendHtml : function(val) {
+		this.html(this.html() + val);
+		if (this.isCreated) {
+			var cmd = this.cmd;
+			cmd.range.selectNodeContents(cmd.doc.body).collapse(false);
+			cmd.select();
+		}
+		return this;
+	},
+	sync : function() {
+		_elementVal(this.srcElement, this.html());
+		return this;
+	},
+	focus : function() {
+		this.isCreated ? this.edit.focus() : this.srcElement[0].focus();
+		return this;
+	},
+	blur : function() {
+		this.isCreated ? this.edit.blur() : this.srcElement[0].blur();
+		return this;
+	},
+	addBookmark : function(checkSize) {
+		checkSize = _undef(checkSize, true);
+		var self = this, edit = self.edit,
+			body = edit.doc.body,
+			html = _removeTempTag(body.innerHTML), bookmark;
+		if (checkSize && self._undoStack.length > 0) {
+			var prev = self._undoStack[self._undoStack.length - 1];
+			if (Math.abs(html.length - _removeBookmarkTag(prev.html).length) < self.minChangeSize) {
+				return self;
+			}
+		}
+		if (edit.designMode && !self._firstAddBookmark) {
+			var range = self.cmd.range;
+			bookmark = range.createBookmark(true);
+			bookmark.html = _removeTempTag(body.innerHTML);
+			range.moveToBookmark(bookmark);
+		} else {
+			bookmark = {
+				html : html
+			};
+		}
+		self._firstAddBookmark = false;
+		_addBookmarkToStack(self._undoStack, bookmark);
+		return self;
+	},
+	undo : function() {
+		return _undoToRedo.call(this, this._undoStack, this._redoStack);
+	},
+	redo : function() {
+		return _undoToRedo.call(this, this._redoStack, this._undoStack);
+	},
+	fullscreen : function(bool) {
+		this.fullscreenMode = (bool === undefined ? !this.fullscreenMode : bool);
+		this.addBookmark(false);
+		return this.remove().create();
+	},
+	readonly : function(isReadonly) {
+		isReadonly = _undef(isReadonly, true);
+		var self = this, edit = self.edit, doc = edit.doc;
+		if (self.designMode) {
+			self.toolbar.disableAll(isReadonly, []);
+		} else {
+			_each(self.noDisableItems, function() {
+				self.toolbar[isReadonly ? 'disable' : 'enable'](this);
+			});
+		}
+		if (_IE) {
+			doc.body.contentEditable = !isReadonly;
+		} else {
+			doc.designMode = isReadonly ? 'off' : 'on';
+		}
+		edit.textarea[0].disabled = isReadonly;
+	},
+	createMenu : function(options) {
+		var self = this,
+			name = options.name,
+			knode = self.toolbar.get(name),
+			pos = knode.pos();
+		options.x = pos.x;
+		options.y = pos.y + knode.height();
+		options.z = self.options.zIndex;
+		options.shadowMode = _undef(options.shadowMode, self.shadowMode);
+		if (options.selectedColor !== undefined) {
+			options.cls = 'ke-colorpicker-' + self.themeType;
+			options.noColor = self.lang('noColor');
+			self.menu = _colorpicker(options);
+		} else {
+			options.cls = 'ke-menu-' + self.themeType;
+			options.centerLineMode = false;
+			self.menu = _menu(options);
+		}
+		return self.menu;
+	},
+	hideMenu : function() {
+		this.menu.remove();
+		this.menu = null;
+		return this;
+	},
+	hideContextmenu : function() {
+		this.contextmenu.remove();
+		this.contextmenu = null;
+		return this;
+	},
+	createDialog : function(options) {
+		var self = this, name = options.name;
+		options.z = self.options.zIndex;
+		options.shadowMode = _undef(options.shadowMode, self.shadowMode);
+		options.closeBtn = _undef(options.closeBtn, {
+			name : self.lang('close'),
+			click : function(e) {
+				self.hideDialog();
+				if (_IE && self.cmd) {
+					self.cmd.select();
+				}
+			}
+		});
+		options.noBtn = _undef(options.noBtn, {
+			name : self.lang(options.yesBtn ? 'no' : 'close'),
+			click : function(e) {
+				self.hideDialog();
+				if (_IE && self.cmd) {
+					self.cmd.select();
+				}
+			}
+		});
+		if (self.dialogAlignType != 'page') {
+			options.alignEl = self.container;
+		}
+		options.cls = 'ke-dialog-' + self.themeType;
+		if (self.dialogs.length > 0) {
+			var firstDialog = self.dialogs[0],
+				parentDialog = self.dialogs[self.dialogs.length - 1];
+			firstDialog.setMaskIndex(parentDialog.z + 2);
+			options.z = parentDialog.z + 3;
+			options.showMask = false;
+		}
+		var dialog = _dialog(options);
+		self.dialogs.push(dialog);
+		return dialog;
+	},
+	hideDialog : function() {
+		var self = this;
+		if (self.dialogs.length > 0) {
+			self.dialogs.pop().remove();
+		}
+		if (self.dialogs.length > 0) {
+			var firstDialog = self.dialogs[0],
+				parentDialog = self.dialogs[self.dialogs.length - 1];
+			firstDialog.setMaskIndex(parentDialog.z - 1);
+		}
+		return self;
+	},
+	errorDialog : function(html) {
+		var self = this;
+		var dialog = self.createDialog({
+			width : 750,
+			title : self.lang('uploadError'),
+			body : '<div style="padding:10px 20px;"><iframe frameborder="0" style="width:708px;height:400px;"></iframe></div>'
+		});
+		var iframe = K('iframe', dialog.div), doc = K.iframeDoc(iframe);
+		doc.open();
+		doc.write(html);
+		doc.close();
+		K(doc.body).css('background-color', '#FFF');
+		iframe[0].contentWindow.focus();
+		return self;
+	}
+};
+function _editor(options) {
+	return new KEditor(options);
+}
+_instances = [];
+function _create(expr, options) {
+	options = options || {};
+	options.basePath = _undef(options.basePath, K.basePath);
+	options.themesPath = _undef(options.themesPath, options.basePath + 'themes/');
+	options.langPath = _undef(options.langPath, options.basePath + 'lang/');
+	options.pluginsPath = _undef(options.pluginsPath, options.basePath + 'plugins/');
+	if (_undef(options.loadStyleMode, K.options.loadStyleMode)) {
+		var themeType = _undef(options.themeType, K.options.themeType);
+		_loadStyle(options.themesPath + 'default/default.css');
+		_loadStyle(options.themesPath + themeType + '/' + themeType + '.css');
+	}
+	function create(editor) {
+		_each(_plugins, function(name, fn) {
+			if (_isFunction(fn)) {
+				fn.call(editor, KindEditor);
+			}
+		});
+		return editor.create();
+	}
+	var knode = K(expr);
+	if (!knode || knode.length === 0) {
+		return;
+	}
+	if (knode.length > 1) {
+		knode.each(function() {
+			_create(this, options);
+		});
+		return _instances[0];
+	}
+	options.srcElement = knode[0];
+	var editor = new KEditor(options);
+	_instances.push(editor);
+	if (_language[editor.langType]) {
+		return create(editor);
+	}
+	_loadScript(editor.langPath + editor.langType + '.js?ver=' + encodeURIComponent(K.DEBUG ? _TIME : _VERSION), function() {
+		create(editor);
+	});
+	return editor;
+}
+function _eachEditor(expr, fn) {
+	K(expr).each(function(i, el) {
+		K.each(_instances, function(j, editor) {
+			if (editor && editor.srcElement[0] == el) {
+				fn.call(editor, j);
+				return false;
+			}
+		});
+	});
+}
+K.remove = function(expr) {
+	_eachEditor(expr, function(i) {
+		this.remove();
+		_instances.splice(i, 1);
+	});
+};
+K.sync = function(expr) {
+	_eachEditor(expr, function() {
+		this.sync();
+	});
+};
+K.html = function(expr, val) {
+	_eachEditor(expr, function() {
+		this.html(val);
+	});
+};
+K.insertHtml = function(expr, val) {
+	_eachEditor(expr, function() {
+		this.insertHtml(val);
+	});
+};
+K.appendHtml = function(expr, val) {
+	_eachEditor(expr, function() {
+		this.appendHtml(val);
+	});
+};
+if (_IE && _V < 7) {
+	_nativeCommand(document, 'BackgroundImageCache', true);
+}
+K.EditorClass = KEditor;
+K.editor = _editor;
+K.create = _create;
+K.instances = _instances;
+K.plugin = _plugin;
+K.lang = _lang;
+_plugin('core', function(K) {
+	var self = this,
+		shortcutKeys = {
+			undo : 'Z', redo : 'Y', bold : 'B', italic : 'I', underline : 'U', print : 'P', selectall : 'A'
+		};
+	self.afterSetHtml(function() {
+		if (self.options.afterChange) {
+			self.options.afterChange.call(self);
+		}
+	});
+	self.afterCreate(function() {
+		if (self.syncType != 'form') {
+			return;
+		}
+		var el = K(self.srcElement), hasForm = false;
+		while ((el = el.parent())) {
+			if (el.name == 'form') {
+				hasForm = true;
+				break;
+			}
+		}
+		if (hasForm) {
+			el.bind('submit', function(e) {
+				self.sync();
+				K(window).bind('unload', function() {
+					self.edit.textarea.remove();
+				});
+			});
+			var resetBtn = K('[type="reset"]', el);
+			resetBtn.click(function() {
+				self.html(self.initContent);
+				self.cmd.selection();
+			});
+			self.beforeRemove(function() {
+				el.unbind();
+				resetBtn.unbind();
+			});
+		}
+	});
+	self.clickToolbar('source', function() {
+		if (self.edit.designMode) {
+			self.toolbar.disableAll(true);
+			self.edit.design(false);
+			self.toolbar.select('source');
+		} else {
+			self.toolbar.disableAll(false);
+			self.edit.design(true);
+			self.toolbar.unselect('source');
+			if (_GECKO) {
+				setTimeout(function() {
+					self.cmd.selection();
+				}, 0);
+			} else {
+				self.cmd.selection();
+			}
+		}
+		self.designMode = self.edit.designMode;
+	});
+	self.afterCreate(function() {
+		if (!self.designMode) {
+			self.toolbar.disableAll(true).select('source');
+		}
+	});
+	self.clickToolbar('fullscreen', function() {
+		self.fullscreen();
+	});
+	if (self.fullscreenShortcut) {
+		var loaded = false;
+		self.afterCreate(function() {
+			K(self.edit.doc, self.edit.textarea).keyup(function(e) {
+				if (e.which == 27) {
+					setTimeout(function() {
+						self.fullscreen();
+					}, 0);
+				}
+			});
+			if (loaded) {
+				if (_IE && !self.designMode) {
+					return;
+				}
+				self.focus();
+			}
+			if (!loaded) {
+				loaded = true;
+			}
+		});
+	}
+	_each('undo,redo'.split(','), function(i, name) {
+		if (shortcutKeys[name]) {
+			self.afterCreate(function() {
+				_ctrl(this.edit.doc, shortcutKeys[name], function() {
+					self.clickToolbar(name);
+				});
+			});
+		}
+		self.clickToolbar(name, function() {
+			self[name]();
+		});
+	});
+	self.clickToolbar('formatblock', function() {
+		var blocks = self.lang('formatblock.formatBlock'),
+			heights = {
+				h1 : 28,
+				h2 : 24,
+				h3 : 18,
+				H4 : 14,
+				p : 12
+			},
+			curVal = self.cmd.val('formatblock'),
+			menu = self.createMenu({
+				name : 'formatblock',
+				width : self.langType == 'en' ? 200 : 150
+			});
+		_each(blocks, function(key, val) {
+			var style = 'font-size:' + heights[key] + 'px;';
+			if (key.charAt(0) === 'h') {
+				style += 'font-weight:bold;';
+			}
+			menu.addItem({
+				title : '<span style="' + style + '" unselectable="on">' + val + '</span>',
+				height : heights[key] + 12,
+				checked : (curVal === key || curVal === val),
+				click : function() {
+					self.select().exec('formatblock', '<' + key + '>').hideMenu();
+				}
+			});
+		});
+	});
+	self.clickToolbar('fontname', function() {
+		var curVal = self.cmd.val('fontname'),
+			menu = self.createMenu({
+				name : 'fontname',
+				width : 150
+			});
+		_each(self.lang('fontname.fontName'), function(key, val) {
+			menu.addItem({
+				title : '<span style="font-family: ' + key + ';" unselectable="on">' + val + '</span>',
+				checked : (curVal === key.toLowerCase() || curVal === val.toLowerCase()),
+				click : function() {
+					self.exec('fontname', key).hideMenu();
+				}
+			});
+		});
+	});
+	self.clickToolbar('fontsize', function() {
+		var curVal = self.cmd.val('fontsize'),
+			menu = self.createMenu({
+				name : 'fontsize',
+				width : 150
+			});
+		_each(self.fontSizeTable, function(i, val) {
+			menu.addItem({
+				title : '<span style="font-size:' + val + ';" unselectable="on">' + val + '</span>',
+				height : _removeUnit(val) + 12,
+				checked : curVal === val,
+				click : function() {
+					self.exec('fontsize', val).hideMenu();
+				}
+			});
+		});
+	});
+	_each('forecolor,hilitecolor'.split(','), function(i, name) {
+		self.clickToolbar(name, function() {
+			self.createMenu({
+				name : name,
+				selectedColor : self.cmd.val(name) || 'default',
+				colors : self.colorTable,
+				click : function(color) {
+					self.exec(name, color).hideMenu();
+				}
+			});
+		});
+	});
+	_each(('cut,copy,paste').split(','), function(i, name) {
+		self.clickToolbar(name, function() {
+			self.focus();
+			try {
+				self.exec(name, null);
+			} catch(e) {
+				alert(self.lang(name + 'Error'));
+			}
+		});
+	});
+	self.clickToolbar('about', function() {
+		var html = '<div style="margin:20px;">' +
+			'<div>KindEditor ' + _VERSION + '</div>' +
+			'<div>Copyright &copy; <a href="http://www.kindsoft.net/" target="_blank">kindsoft.net</a> All rights reserved.</div>' +
+			'</div>';
+		self.createDialog({
+			name : 'about',
+			width : 350,
+			title : self.lang('about'),
+			body : html
+		});
+	});
+	self.plugin.getSelectedLink = function() {
+		return self.cmd.commonAncestor('a');
+	};
+	self.plugin.getSelectedImage = function() {
+		return _getImageFromRange(self.edit.cmd.range, function(img) {
+			return !/^ke-\w+$/i.test(img[0].className);
+		});
+	};
+	self.plugin.getSelectedFlash = function() {
+		return _getImageFromRange(self.edit.cmd.range, function(img) {
+			return img[0].className == 'ke-flash';
+		});
+	};
+	self.plugin.getSelectedMedia = function() {
+		return _getImageFromRange(self.edit.cmd.range, function(img) {
+			return img[0].className == 'ke-media' || img[0].className == 'ke-rm';
+		});
+	};
+	self.plugin.getSelectedAnchor = function() {
+		return _getImageFromRange(self.edit.cmd.range, function(img) {
+			return img[0].className == 'ke-anchor';
+		});
+	};
+	_each('link,image,flash,media,anchor'.split(','), function(i, name) {
+		var uName = name.charAt(0).toUpperCase() + name.substr(1);
+		_each('edit,delete'.split(','), function(j, val) {
+			self.addContextmenu({
+				title : self.lang(val + uName),
+				click : function() {
+					self.loadPlugin(name, function() {
+						self.plugin[name][val]();
+						self.hideMenu();
+					});
+				},
+				cond : self.plugin['getSelected' + uName],
+				width : 150,
+				iconClass : val == 'edit' ? 'ke-icon-' + name : undefined
+			});
+		});
+		self.addContextmenu({ title : '-' });
+	});
+	self.plugin.getSelectedTable = function() {
+		return self.cmd.commonAncestor('table');
+	};
+	self.plugin.getSelectedRow = function() {
+		return self.cmd.commonAncestor('tr');
+	};
+	self.plugin.getSelectedCell = function() {
+		return self.cmd.commonAncestor('td');
+	};
+	_each(('prop,cellprop,colinsertleft,colinsertright,rowinsertabove,rowinsertbelow,rowmerge,colmerge,' +
+	'rowsplit,colsplit,coldelete,rowdelete,insert,delete').split(','), function(i, val) {
+		var cond = _inArray(val, ['prop', 'delete']) < 0 ? self.plugin.getSelectedCell : self.plugin.getSelectedTable;
+		self.addContextmenu({
+			title : self.lang('table' + val),
+			click : function() {
+				self.loadPlugin('table', function() {
+					self.plugin.table[val]();
+					self.hideMenu();
+				});
+			},
+			cond : cond,
+			width : 170,
+			iconClass : 'ke-icon-table' + val
+		});
+	});
+	self.addContextmenu({ title : '-' });
+	_each(('selectall,justifyleft,justifycenter,justifyright,justifyfull,insertorderedlist,' +
+		'insertunorderedlist,indent,outdent,subscript,superscript,hr,print,' +
+		'bold,italic,underline,strikethrough,removeformat,unlink').split(','), function(i, name) {
+		if (shortcutKeys[name]) {
+			self.afterCreate(function() {
+				_ctrl(this.edit.doc, shortcutKeys[name], function() {
+					self.cmd.selection();
+					self.clickToolbar(name);
+				});
+			});
+		}
+		self.clickToolbar(name, function() {
+			self.focus().exec(name, null);
+		});
+	});
+	self.afterCreate(function() {
+		var doc = self.edit.doc, cmd, bookmark, div,
+			cls = '__kindeditor_paste__', pasting = false;
+		function movePastedData() {
+			cmd.range.moveToBookmark(bookmark);
+			cmd.select();
+			if (_WEBKIT) {
+				K('div.' + cls, div).each(function() {
+					K(this).after('<br />').remove(true);
+				});
+				K('span.Apple-style-span', div).remove(true);
+				K('span.Apple-tab-span', div).remove(true);
+				K('span[style]', div).each(function() {
+					if (K(this).css('white-space') == 'nowrap') {
+						K(this).remove(true);
+					}
+				});
+				K('meta', div).remove();
+			}
+			var html = div[0].innerHTML;
+			div.remove();
+			if (html === '') {
+				return;
+			}
+			if (_WEBKIT) {
+				html = html.replace(/(<br>)\1/ig, '$1');
+			}
+			if (self.pasteType === 2) {
+				html = html.replace(/(<(?:p|p\s[^>]*)>) *(<\/p>)/ig, '');
+				if (/schemas-microsoft-com|worddocument|mso-\w+/i.test(html)) {
+					html = _clearMsWord(html, self.filterMode ? self.htmlTags : K.options.htmlTags);
+				} else {
+					html = _formatHtml(html, self.filterMode ? self.htmlTags : null);
+					html = self.beforeSetHtml(html);
+				}
+			}
+			if (self.pasteType === 1) {
+				html = html.replace(/&nbsp;/ig, ' ');
+				html = html.replace(/\n\s*\n/g, '\n');
+				html = html.replace(/<br[^>]*>/ig, '\n');
+				html = html.replace(/<\/p><p[^>]*>/ig, '\n');
+				html = html.replace(/<[^>]+>/g, '');
+				html = html.replace(/ {2}/g, ' &nbsp;');
+				if (self.newlineTag == 'p') {
+					if (/\n/.test(html)) {
+						html = html.replace(/^/, '<p>').replace(/$/, '<br /></p>').replace(/\n/g, '<br /></p><p>');
+					}
+				} else {
+					html = html.replace(/\n/g, '<br />$&');
+				}
+			}
+			self.insertHtml(html, true);
+		}
+		K(doc.body).bind('paste', function(e){
+			if (self.pasteType === 0) {
+				e.stop();
+				return;
+			}
+			if (pasting) {
+				return;
+			}
+			pasting = true;
+			K('div.' + cls, doc).remove();
+			cmd = self.cmd.selection();
+			bookmark = cmd.range.createBookmark();
+			div = K('<div class="' + cls + '"></div>', doc).css({
+				position : 'absolute',
+				width : '1px',
+				height : '1px',
+				overflow : 'hidden',
+				left : '-1981px',
+				top : K(bookmark.start).pos().y + 'px',
+				'white-space' : 'nowrap'
+			});
+			K(doc.body).append(div);
+			if (_IE) {
+				var rng = cmd.range.get(true);
+				rng.moveToElementText(div[0]);
+				rng.select();
+				rng.execCommand('paste');
+				e.preventDefault();
+			} else {
+				cmd.range.selectNodeContents(div[0]);
+				cmd.select();
+			}
+			setTimeout(function() {
+				movePastedData();
+				pasting = false;
+			}, 0);
+		});
+	});
+	self.beforeGetHtml(function(html) {
+		if (_IE && _V <= 8) {
+			html = html.replace(/<div\s+[^>]*data-ke-input-tag="([^"]*)"[^>]*>([\s\S]*?)<\/div>/ig, function(full, tag) {
+				return unescape(tag);
+			});
+			html = html.replace(/(<input)((?:\s+[^>]*)?>)/ig, function($0, $1, $2) {
+				if (!/\s+type="[^"]+"/i.test($0)) {
+					return $1 + ' type="text"' + $2;
+				}
+				return $0;
+			});
+		}
+		return html.replace(/(<(?:noscript|noscript\s[^>]*)>)([\s\S]*?)(<\/noscript>)/ig, function($0, $1, $2, $3) {
+			return $1 + _unescape($2).replace(/\s+/g, ' ') + $3;
+		})
+		.replace(/<img[^>]*class="?ke-(flash|rm|media)"?[^>]*>/ig, function(full) {
+			var imgAttrs = _getAttrList(full);
+			var styles = _getCssList(imgAttrs.style || '');
+			var attrs = _mediaAttrs(imgAttrs['data-ke-tag']);
+			var width = _undef(styles.width, '');
+			var height = _undef(styles.height, '');
+			if (/px/i.test(width)) {
+				width = _removeUnit(width);
+			}
+			if (/px/i.test(height)) {
+				height = _removeUnit(height);
+			}
+			attrs.width = _undef(imgAttrs.width, width);
+			attrs.height = _undef(imgAttrs.height, height);
+			return _mediaEmbed(attrs);
+		})
+		.replace(/<img[^>]*class="?ke-anchor"?[^>]*>/ig, function(full) {
+			var imgAttrs = _getAttrList(full);
+			return '<a name="' + unescape(imgAttrs['data-ke-name']) + '"></a>';
+		})
+		.replace(/<div\s+[^>]*data-ke-script-attr="([^"]*)"[^>]*>([\s\S]*?)<\/div>/ig, function(full, attr, code) {
+			return '<script' + unescape(attr) + '>' + unescape(code) + '</script>';
+		})
+		.replace(/<div\s+[^>]*data-ke-noscript-attr="([^"]*)"[^>]*>([\s\S]*?)<\/div>/ig, function(full, attr, code) {
+			return '<noscript' + unescape(attr) + '>' + unescape(code) + '</noscript>';
+		})
+		.replace(/(<[^>]*)data-ke-src="([^"]*)"([^>]*>)/ig, function(full, start, src, end) {
+			full = full.replace(/(\s+(?:href|src)=")[^"]*(")/i, function($0, $1, $2) {
+				return $1 + _unescape(src) + $2;
+			});
+			full = full.replace(/\s+data-ke-src="[^"]*"/i, '');
+			return full;
+		})
+		.replace(/(<[^>]+\s)data-ke-(on\w+="[^"]*"[^>]*>)/ig, function(full, start, end) {
+			return start + end;
+		});
+	});
+	self.beforeSetHtml(function(html) {
+		if (_IE && _V <= 8) {
+			html = html.replace(/<input[^>]*>|<(select|button)[^>]*>[\s\S]*?<\/\1>/ig, function(full) {
+				var attrs = _getAttrList(full);
+				var styles = _getCssList(attrs.style || '');
+				if (styles.display == 'none') {
+					return '<div class="ke-display-none" data-ke-input-tag="' + escape(full) + '"></div>';
+				}
+				return full;
+			});
+		}
+		return html.replace(/<embed[^>]*type="([^"]+)"[^>]*>(?:<\/embed>)?/ig, function(full) {
+			var attrs = _getAttrList(full);
+			attrs.src = _undef(attrs.src, '');
+			attrs.width = _undef(attrs.width, 0);
+			attrs.height = _undef(attrs.height, 0);
+			return _mediaImg(self.themesPath + 'common/blank.gif', attrs);
+		})
+		.replace(/<a[^>]*name="([^"]+)"[^>]*>(?:<\/a>)?/ig, function(full) {
+			var attrs = _getAttrList(full);
+			if (attrs.href !== undefined) {
+				return full;
+			}
+			return '<img class="ke-anchor" src="' + self.themesPath + 'common/anchor.gif" data-ke-name="' + escape(attrs.name) + '" />';
+		})
+		.replace(/<script([^>]*)>([\s\S]*?)<\/script>/ig, function(full, attr, code) {
+			return '<div class="ke-script" data-ke-script-attr="' + escape(attr) + '">' + escape(code) + '</div>';
+		})
+		.replace(/<noscript([^>]*)>([\s\S]*?)<\/noscript>/ig, function(full, attr, code) {
+			return '<div class="ke-noscript" data-ke-noscript-attr="' + escape(attr) + '">' + escape(code) + '</div>';
+		})
+		.replace(/(<[^>]*)(href|src)="([^"]*)"([^>]*>)/ig, function(full, start, key, src, end) {
+			if (full.match(/\sdata-ke-src="[^"]*"/i)) {
+				return full;
+			}
+			full = start + key + '="' + src + '"' + ' data-ke-src="' + _escape(src) + '"' + end;
+			return full;
+		})
+		.replace(/(<[^>]+\s)(on\w+="[^"]*"[^>]*>)/ig, function(full, start, end) {
+			return start + 'data-ke-' + end;
+		})
+		.replace(/<table[^>]*\s+border="0"[^>]*>/ig, function(full) {
+			if (full.indexOf('ke-zeroborder') >= 0) {
+				return full;
+			}
+			return _addClassToTag(full, 'ke-zeroborder');
+		});
+	});
+});
+})(window);
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.lang({
+	source : 'HTML代码',
+	preview : '预览',
+	undo : '后退(Ctrl+Z)',
+	redo : '前进(Ctrl+Y)',
+	cut : '剪切(Ctrl+X)',
+	copy : '复制(Ctrl+C)',
+	paste : '粘贴(Ctrl+V)',
+	plainpaste : '粘贴为无格式文本',
+	wordpaste : '从Word粘贴',
+	selectall : '全选(Ctrl+A)',
+	justifyleft : '左对齐',
+	justifycenter : '居中',
+	justifyright : '右对齐',
+	justifyfull : '两端对齐',
+	insertorderedlist : '编号',
+	insertunorderedlist : '项目符号',
+	indent : '增加缩进',
+	outdent : '减少缩进',
+	subscript : '下标',
+	superscript : '上标',
+	formatblock : '段落',
+	fontname : '字体',
+	fontsize : '文字大小',
+	forecolor : '文字颜色',
+	hilitecolor : '文字背景',
+	bold : '粗体(Ctrl+B)',
+	italic : '斜体(Ctrl+I)',
+	underline : '下划线(Ctrl+U)',
+	strikethrough : '删除线',
+	removeformat : '删除格式',
+	image : '图片',
+	multiimage : '批量图片上传',
+	flash : 'Flash',
+	media : '视音频',
+	table : '表格',
+	tablecell : '单元格',
+	hr : '插入横线',
+	emoticons : '插入表情',
+	link : '超级链接',
+	unlink : '取消超级链接',
+	fullscreen : '全屏显示',
+	about : '关于',
+	print : '打印(Ctrl+P)',
+	filemanager : '文件空间',
+	code : '插入程序代码',
+	map : 'Google地图',
+	baidumap : '百度地图',
+	lineheight : '行距',
+	clearhtml : '清理HTML代码',
+	pagebreak : '插入分页符',
+	quickformat : '一键排版',
+	insertfile : '插入文件',
+	template : '插入模板',
+	anchor : '锚点',
+	yes : '确定',
+	no : '取消',
+	close : '关闭',
+	editImage : '图片属性',
+	deleteImage : '删除图片',
+	editFlash : 'Flash属性',
+	deleteFlash : '删除Flash',
+	editMedia : '视音频属性',
+	deleteMedia : '删除视音频',
+	editLink : '超级链接属性',
+	deleteLink : '取消超级链接',
+	editAnchor : '锚点属性',
+	deleteAnchor : '删除锚点',
+	tableprop : '表格属性',
+	tablecellprop : '单元格属性',
+	tableinsert : '插入表格',
+	tabledelete : '删除表格',
+	tablecolinsertleft : '左侧插入列',
+	tablecolinsertright : '右侧插入列',
+	tablerowinsertabove : '上方插入行',
+	tablerowinsertbelow : '下方插入行',
+	tablerowmerge : '向下合并单元格',
+	tablecolmerge : '向右合并单元格',
+	tablerowsplit : '拆分行',
+	tablecolsplit : '拆分列',
+	tablecoldelete : '删除列',
+	tablerowdelete : '删除行',
+	noColor : '无颜色',
+	pleaseSelectFile : '请选择文件。',
+	invalidImg : "请输入有效的URL地址。\n只允许jpg,gif,bmp,png格式。",
+	invalidMedia : "请输入有效的URL地址。\n只允许swf,flv,mp3,wav,wma,wmv,mid,avi,mpg,asf,rm,rmvb格式。",
+	invalidWidth : "宽度必须为数字。",
+	invalidHeight : "高度必须为数字。",
+	invalidBorder : "边框必须为数字。",
+	invalidUrl : "请输入有效的URL地址。",
+	invalidRows : '行数为必选项，只允许输入大于0的数字。',
+	invalidCols : '列数为必选项，只允许输入大于0的数字。',
+	invalidPadding : '边距必须为数字。',
+	invalidSpacing : '间距必须为数字。',
+	invalidJson : '服务器发生故障。',
+	uploadSuccess : '上传成功。',
+	cutError : '您的浏览器安全设置不允许使用剪切操作，请使用快捷键(Ctrl+X)来完成。',
+	copyError : '您的浏览器安全设置不允许使用复制操作，请使用快捷键(Ctrl+C)来完成。',
+	pasteError : '您的浏览器安全设置不允许使用粘贴操作，请使用快捷键(Ctrl+V)来完成。',
+	ajaxLoading : '加载中，请稍候 ...',
+	uploadLoading : '上传中，请稍候 ...',
+	uploadError : '上传错误',
+	'plainpaste.comment' : '请使用快捷键(Ctrl+V)把内容粘贴到下面的方框里。',
+	'wordpaste.comment' : '请使用快捷键(Ctrl+V)把内容粘贴到下面的方框里。',
+	'code.pleaseInput' : '请输入程序代码。',
+	'link.url' : 'URL',
+	'link.linkType' : '打开类型',
+	'link.newWindow' : '新窗口',
+	'link.selfWindow' : '当前窗口',
+	'flash.url' : 'URL',
+	'flash.width' : '宽度',
+	'flash.height' : '高度',
+	'flash.upload' : '上传',
+	'flash.viewServer' : '文件空间',
+	'media.url' : 'URL',
+	'media.width' : '宽度',
+	'media.height' : '高度',
+	'media.autostart' : '自动播放',
+	'media.upload' : '上传',
+	'media.viewServer' : '文件空间',
+	'image.remoteImage' : '网络图片',
+	'image.localImage' : '本地上传',
+	'image.remoteUrl' : '图片地址',
+	'image.localUrl' : '上传文件',
+	'image.size' : '图片大小',
+	'image.width' : '宽',
+	'image.height' : '高',
+	'image.resetSize' : '重置大小',
+	'image.align' : '对齐方式',
+	'image.defaultAlign' : '默认方式',
+	'image.leftAlign' : '左对齐',
+	'image.rightAlign' : '右对齐',
+	'image.imgTitle' : '图片说明',
+	'image.upload' : '浏览...',
+	'image.viewServer' : '图片空间',
+	'multiimage.uploadDesc' : '允许用户同时上传<%=uploadLimit%>张图片，单张图片容量不超过<%=sizeLimit%>',
+	'multiimage.startUpload' : '开始上传',
+	'multiimage.clearAll' : '全部清空',
+	'multiimage.insertAll' : '全部插入',
+	'multiimage.queueLimitExceeded' : '文件数量超过限制。',
+	'multiimage.fileExceedsSizeLimit' : '文件大小超过限制。',
+	'multiimage.zeroByteFile' : '无法上传空文件。',
+	'multiimage.invalidFiletype' : '文件类型不正确。',
+	'multiimage.unknownError' : '发生异常，无法上传。',
+	'multiimage.pending' : '等待上传',
+	'multiimage.uploadError' : '上传失败',
+	'filemanager.emptyFolder' : '空文件夹',
+	'filemanager.moveup' : '移到上一级文件夹',
+	'filemanager.viewType' : '显示方式：',
+	'filemanager.viewImage' : '缩略图',
+	'filemanager.listImage' : '详细信息',
+	'filemanager.orderType' : '排序方式：',
+	'filemanager.fileName' : '名称',
+	'filemanager.fileSize' : '大小',
+	'filemanager.fileType' : '类型',
+	'insertfile.url' : 'URL',
+	'insertfile.title' : '文件说明',
+	'insertfile.upload' : '上传',
+	'insertfile.viewServer' : '文件空间',
+	'table.cells' : '单元格数',
+	'table.rows' : '行数',
+	'table.cols' : '列数',
+	'table.size' : '大小',
+	'table.width' : '宽度',
+	'table.height' : '高度',
+	'table.percent' : '%',
+	'table.px' : 'px',
+	'table.space' : '边距间距',
+	'table.padding' : '边距',
+	'table.spacing' : '间距',
+	'table.align' : '对齐方式',
+	'table.textAlign' : '水平对齐',
+	'table.verticalAlign' : '垂直对齐',
+	'table.alignDefault' : '默认',
+	'table.alignLeft' : '左对齐',
+	'table.alignCenter' : '居中',
+	'table.alignRight' : '右对齐',
+	'table.alignTop' : '顶部',
+	'table.alignMiddle' : '中部',
+	'table.alignBottom' : '底部',
+	'table.alignBaseline' : '基线',
+	'table.border' : '边框',
+	'table.borderWidth' : '边框',
+	'table.borderColor' : '颜色',
+	'table.backgroundColor' : '背景颜色',
+	'map.address' : '地址: ',
+	'map.search' : '搜索',
+	'baidumap.address' : '地址: ',
+	'baidumap.search' : '搜索',
+	'baidumap.insertDynamicMap' : '插入动态地图',
+	'anchor.name' : '锚点名称',
+	'formatblock.formatBlock' : {
+		h1 : '标题 1',
+		h2 : '标题 2',
+		h3 : '标题 3',
+		h4 : '标题 4',
+		p : '正 文'
+	},
+	'fontname.fontName' : {
+		'SimSun' : '宋体',
+		'NSimSun' : '新宋体',
+		'FangSong_GB2312' : '仿宋_GB2312',
+		'KaiTi_GB2312' : '楷体_GB2312',
+		'SimHei' : '黑体',
+		'Microsoft YaHei' : '微软雅黑',
+		'Arial' : 'Arial',
+		'Arial Black' : 'Arial Black',
+		'Times New Roman' : 'Times New Roman',
+		'Courier New' : 'Courier New',
+		'Tahoma' : 'Tahoma',
+		'Verdana' : 'Verdana'
+	},
+	'lineheight.lineHeight' : [
+		{'1' : '单倍行距'},
+		{'1.5' : '1.5倍行距'},
+		{'2' : '2倍行距'},
+		{'2.5' : '2.5倍行距'},
+		{'3' : '3倍行距'}
+	],
+	'template.selectTemplate' : '可选模板',
+	'template.replaceContent' : '替换当前内容',
+	'template.fileList' : {
+		'1.html' : '图片和文字',
+		'2.html' : '表格',
+		'3.html' : '项目编号'
+	}
+}, 'zh_CN');
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('anchor', function(K) {
+	var self = this, name = 'anchor', lang = self.lang(name + '.');
+	self.plugin.anchor = {
+		edit : function() {
+			var html = ['<div style="padding:20px;">',
+					'<div class="ke-dialog-row">',
+					'<label for="keName">' + lang.name + '</label>',
+					'<input class="ke-input-text" type="text" id="keName" name="name" value="" style="width:100px;" />',
+					'</div>',
+					'</div>'].join('');
+			var dialog = self.createDialog({
+				name : name,
+				width : 300,
+				title : self.lang(name),
+				body : html,
+				yesBtn : {
+					name : self.lang('yes'),
+					click : function(e) {
+						self.insertHtml('<a name="' + nameBox.val() + '">').hideDialog().focus();
+					}
+				}
+			});
+			var div = dialog.div,
+				nameBox = K('input[name="name"]', div);
+			var img = self.plugin.getSelectedAnchor();
+			if (img) {
+				nameBox.val(unescape(img.attr('data-ke-name')));
+			}
+			nameBox[0].focus();
+			nameBox[0].select();
+		},
+		'delete' : function() {
+			self.plugin.getSelectedAnchor().remove();
+		}
+	};
+	self.clickToolbar(name, self.plugin.anchor.edit);
+});
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('autoheight', function(K) {
+	var self = this;
+
+	if (!self.autoHeightMode) {
+		return;
+	}
+
+	var minHeight;
+
+	function hideScroll() {
+		var edit = self.edit;
+		var body = edit.doc.body;
+		edit.iframe[0].scroll = 'no';
+		body.style.overflowY = 'hidden';
+	}
+
+	function resetHeight() {
+		var edit = self.edit;
+		var body = edit.doc.body;
+		edit.iframe.height(minHeight);
+		self.resize(null, Math.max((K.IE ? body.scrollHeight : body.offsetHeight) + 76, minHeight));
+	}
+
+	function init() {
+		minHeight = K.removeUnit(self.height);
+
+		self.edit.afterChange(resetHeight);
+		hideScroll();
+		resetHeight();
+	}
+
+	if (self.isCreated) {
+		init();
+	} else {
+		self.afterCreate(init);
+	}
+});
+
+/*
+* 如何实现真正的自动高度？
+* 修改编辑器高度之后，再次获取body内容高度时，最小值只会是当前iframe的设置高度，这样就导致高度只增不减。
+* 所以每次获取body内容高度之前，先将iframe的高度重置为最小高度，这样就能获取body的实际高度。
+* 由此就实现了真正的自动高度
+* 测试：chrome、firefox、IE9、IE8
+* */
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+// Baidu Maps: http://dev.baidu.com/wiki/map/index.php?title=%E9%A6%96%E9%A1%B5
+
+KindEditor.plugin('baidumap', function(K) {
+	var self = this, name = 'baidumap', lang = self.lang(name + '.');
+	var mapWidth = K.undef(self.mapWidth, 558);
+	var mapHeight = K.undef(self.mapHeight, 360);
+	self.clickToolbar(name, function() {
+		var html = ['<div style="padding:10px 20px;">',
+			'<div class="ke-header">',
+			// left start
+			'<div class="ke-left">',
+			lang.address + ' <input id="kindeditor_plugin_map_address" name="address" class="ke-input-text" value="" style="width:200px;" /> ',
+			'<span class="ke-button-common ke-button-outer">',
+			'<input type="button" name="searchBtn" class="ke-button-common ke-button" value="' + lang.search + '" />',
+			'</span>',
+			'</div>',
+			// right start
+			'<div class="ke-right">',
+			'<input type="checkbox" id="keInsertDynamicMap" name="insertDynamicMap" value="1" /> <label for="keInsertDynamicMap">' + lang.insertDynamicMap + '</label>',
+			'</div>',
+			'<div class="ke-clearfix"></div>',
+			'</div>',
+			'<div class="ke-map" style="width:' + mapWidth + 'px;height:' + mapHeight + 'px;"></div>',
+			'</div>'].join('');
+		var dialog = self.createDialog({
+			name : name,
+			width : mapWidth + 42,
+			title : self.lang(name),
+			body : html,
+			yesBtn : {
+				name : self.lang('yes'),
+				click : function(e) {
+					var map = win.map;
+					var centerObj = map.getCenter();
+					var center = centerObj.lng + ',' + centerObj.lat;
+					var zoom = map.getZoom();
+					var url = [checkbox[0].checked ? self.pluginsPath + 'baidumap/index.html' : 'http://api.map.baidu.com/staticimage',
+						'?center=' + encodeURIComponent(center),
+						'&zoom=' + encodeURIComponent(zoom),
+						'&width=' + mapWidth,
+						'&height=' + mapHeight,
+						'&markers=' + encodeURIComponent(center),
+						'&markerStyles=' + encodeURIComponent('l,A')].join('');
+					if (checkbox[0].checked) {
+						self.insertHtml('<iframe src="' + url + '" frameborder="0" style="width:' + (mapWidth + 2) + 'px;height:' + (mapHeight + 2) + 'px;"></iframe>');
+					} else {
+						self.exec('insertimage', url);
+					}
+					self.hideDialog().focus();
+				}
+			},
+			beforeRemove : function() {
+				searchBtn.remove();
+				if (doc) {
+					doc.write('');
+				}
+				iframe.remove();
+			}
+		});
+		var div = dialog.div,
+			addressBox = K('[name="address"]', div),
+			searchBtn = K('[name="searchBtn"]', div),
+			checkbox = K('[name="insertDynamicMap"]', dialog.div),
+			win, doc;
+		var iframe = K('<iframe class="ke-textarea" frameborder="0" src="' + self.pluginsPath + 'baidumap/map.html" style="width:' + mapWidth + 'px;height:' + mapHeight + 'px;"></iframe>');
+		function ready() {
+			win = iframe[0].contentWindow;
+			doc = K.iframeDoc(iframe);
+		}
+		iframe.bind('load', function() {
+			iframe.unbind('load');
+			if (K.IE) {
+				ready();
+			} else {
+				setTimeout(ready, 0);
+			}
+		});
+		K('.ke-map', div).replaceWith(iframe);
+		// search map
+		searchBtn.click(function() {
+			win.search(addressBox.val());
+		});
+	});
+});
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('clearhtml', function(K) {
+	var self = this, name = 'clearhtml';
+	self.clickToolbar(name, function() {
+		self.focus();
+		var html = self.html();
+		html = html.replace(/(<script[^>]*>)([\s\S]*?)(<\/script>)/ig, '');
+		html = html.replace(/(<style[^>]*>)([\s\S]*?)(<\/style>)/ig, '');
+		html = K.formatHtml(html, {
+			a : ['href', 'target'],
+			embed : ['src', 'width', 'height', 'type', 'loop', 'autostart', 'quality', '.width', '.height', 'align', 'allowscriptaccess'],
+			img : ['src', 'width', 'height', 'border', 'alt', 'title', '.width', '.height'],
+			table : ['border'],
+			'td,th' : ['rowspan', 'colspan'],
+			'div,hr,br,tbody,tr,p,ol,ul,li,blockquote,h1,h2,h3,h4,h5,h6' : []
+		});
+		self.html(html);
+		self.cmd.selection(true);
+		self.addBookmark();
+	});
+});
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+// google code prettify: http://google-code-prettify.googlecode.com/
+// http://google-code-prettify.googlecode.com/
+
+KindEditor.plugin('code', function(K) {
+	var self = this, name = 'code';
+	self.clickToolbar(name, function() {
+		var lang = self.lang(name + '.'),
+			html = ['<div style="padding:10px 20px;">',
+				'<div class="ke-dialog-row">',
+				'<select class="ke-code-type">',
+				'<option value="js">JavaScript</option>',
+				'<option value="html">HTML</option>',
+				'<option value="css">CSS</option>',
+				'<option value="php">PHP</option>',
+				'<option value="pl">Perl</option>',
+				'<option value="py">Python</option>',
+				'<option value="rb">Ruby</option>',
+				'<option value="java">Java</option>',
+				'<option value="vb">ASP/VB</option>',
+				'<option value="cpp">C/C++</option>',
+				'<option value="cs">C#</option>',
+				'<option value="xml">XML</option>',
+				'<option value="bsh">Shell</option>',
+				'<option value="">Other</option>',
+				'</select>',
+				'</div>',
+				'<textarea class="ke-textarea" style="width:408px;height:260px;"></textarea>',
+				'</div>'].join(''),
+			dialog = self.createDialog({
+				name : name,
+				width : 450,
+				title : self.lang(name),
+				body : html,
+				yesBtn : {
+					name : self.lang('yes'),
+					click : function(e) {
+						var type = K('.ke-code-type', dialog.div).val(),
+							code = textarea.val(),
+							cls = type === '' ? '' :  ' lang-' + type,
+							html = '<pre class="prettyprint' + cls + '">\n' + K.escape(code) + '</pre> ';
+						if (K.trim(code) === '') {
+							alert(lang.pleaseInput);
+							textarea[0].focus();
+							return;
+						}
+						self.insertHtml(html).hideDialog().focus();
+					}
+				}
+			}),
+			textarea = K('textarea', dialog.div);
+		textarea[0].focus();
+	});
+});
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('emoticons', function(K) {
+	var self = this, name = 'emoticons',
+		path = (self.emoticonsPath || self.pluginsPath + 'emoticons/images/'),
+		allowPreview = self.allowPreviewEmoticons === undefined ? true : self.allowPreviewEmoticons,
+		currentPageNum = 1;
+	self.clickToolbar(name, function() {
+		var rows = 5, cols = 9, total = 135, startNum = 0,
+			cells = rows * cols, pages = Math.ceil(total / cells),
+			colsHalf = Math.floor(cols / 2),
+			wrapperDiv = K('<div class="ke-plugin-emoticons"></div>'),
+			elements = [],
+			menu = self.createMenu({
+				name : name,
+				beforeRemove : function() {
+					removeEvent();
+				}
+			});
+		menu.div.append(wrapperDiv);
+		var previewDiv, previewImg;
+		if (allowPreview) {
+			previewDiv = K('<div class="ke-preview"></div>').css('right', 0);
+			previewImg = K('<img class="ke-preview-img" src="' + path + startNum + '.gif" />');
+			wrapperDiv.append(previewDiv);
+			previewDiv.append(previewImg);
+		}
+		function bindCellEvent(cell, j, num) {
+			if (previewDiv) {
+				cell.mouseover(function() {
+					if (j > colsHalf) {
+						previewDiv.css('left', 0);
+						previewDiv.css('right', '');
+					} else {
+						previewDiv.css('left', '');
+						previewDiv.css('right', 0);
+					}
+					previewImg.attr('src', path + num + '.gif');
+					K(this).addClass('ke-on');
+				});
+			} else {
+				cell.mouseover(function() {
+					K(this).addClass('ke-on');
+				});
+			}
+			cell.mouseout(function() {
+				K(this).removeClass('ke-on');
+			});
+			cell.click(function(e) {
+				self.insertHtml('<img src="' + path + num + '.gif" border="0" alt="" />').hideMenu().focus();
+				e.stop();
+			});
+		}
+		function createEmoticonsTable(pageNum, parentDiv) {
+			var table = document.createElement('table');
+			parentDiv.append(table);
+			if (previewDiv) {
+				K(table).mouseover(function() {
+					previewDiv.show('block');
+				});
+				K(table).mouseout(function() {
+					previewDiv.hide();
+				});
+				elements.push(K(table));
+			}
+			table.className = 'ke-table';
+			table.cellPadding = 0;
+			table.cellSpacing = 0;
+			table.border = 0;
+			var num = (pageNum - 1) * cells + startNum;
+			for (var i = 0; i < rows; i++) {
+				var row = table.insertRow(i);
+				for (var j = 0; j < cols; j++) {
+					var cell = K(row.insertCell(j));
+					cell.addClass('ke-cell');
+					bindCellEvent(cell, j, num);
+					var span = K('<span class="ke-img"></span>')
+						.css('background-position', '-' + (24 * num) + 'px 0px')
+						.css('background-image', 'url(' + path + 'static.gif)');
+					cell.append(span);
+					elements.push(cell);
+					num++;
+				}
+			}
+			return table;
+		}
+		var table = createEmoticonsTable(currentPageNum, wrapperDiv);
+		function removeEvent() {
+			K.each(elements, function() {
+				this.unbind();
+			});
+		}
+		var pageDiv;
+		function bindPageEvent(el, pageNum) {
+			el.click(function(e) {
+				removeEvent();
+				table.parentNode.removeChild(table);
+				pageDiv.remove();
+				table = createEmoticonsTable(pageNum, wrapperDiv);
+				createPageTable(pageNum);
+				currentPageNum = pageNum;
+				e.stop();
+			});
+		}
+		function createPageTable(currentPageNum) {
+			pageDiv = K('<div class="ke-page"></div>');
+			wrapperDiv.append(pageDiv);
+			for (var pageNum = 1; pageNum <= pages; pageNum++) {
+				if (currentPageNum !== pageNum) {
+					var a = K('<a href="javascript:;">[' + pageNum + ']</a>');
+					bindPageEvent(a, pageNum);
+					pageDiv.append(a);
+					elements.push(a);
+				} else {
+					pageDiv.append(K('@[' + pageNum + ']'));
+				}
+				pageDiv.append(K('@&nbsp;'));
+			}
+		}
+		createPageTable(currentPageNum);
+	});
+});
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('filemanager', function(K) {
+	var self = this, name = 'filemanager',
+		fileManagerJson = K.undef(self.fileManagerJson, self.basePath + 'php/file_manager_json.php'),
+		imgPath = self.pluginsPath + name + '/images/',
+		lang = self.lang(name + '.');
+	function makeFileTitle(filename, filesize, datetime) {
+		return filename + ' (' + Math.ceil(filesize / 1024) + 'KB, ' + datetime + ')';
+	}
+	function bindTitle(el, data) {
+		if (data.is_dir) {
+			el.attr('title', data.filename);
+		} else {
+			el.attr('title', makeFileTitle(data.filename, data.filesize, data.datetime));
+		}
+	}
+	self.plugin.filemanagerDialog = function(options) {
+		var width = K.undef(options.width, 650),
+			height = K.undef(options.height, 510),
+			dirName = K.undef(options.dirName, ''),
+			viewType = K.undef(options.viewType, 'VIEW').toUpperCase(), // "LIST" or "VIEW"
+			clickFn = options.clickFn;
+		var html = [
+			'<div style="padding:10px 20px;">',
+			// header start
+			'<div class="ke-plugin-filemanager-header">',
+			// left start
+			'<div class="ke-left">',
+			'<img class="ke-inline-block" name="moveupImg" src="' + imgPath + 'go-up.gif" width="16" height="16" border="0" alt="" /> ',
+			'<a class="ke-inline-block" name="moveupLink" href="javascript:;">' + lang.moveup + '</a>',
+			'</div>',
+			// right start
+			'<div class="ke-right">',
+			lang.viewType + ' <select class="ke-inline-block" name="viewType">',
+			'<option value="VIEW">' + lang.viewImage + '</option>',
+			'<option value="LIST">' + lang.listImage + '</option>',
+			'</select> ',
+			lang.orderType + ' <select class="ke-inline-block" name="orderType">',
+			'<option value="NAME">' + lang.fileName + '</option>',
+			'<option value="SIZE">' + lang.fileSize + '</option>',
+			'<option value="TYPE">' + lang.fileType + '</option>',
+			'</select>',
+			'</div>',
+			'<div class="ke-clearfix"></div>',
+			'</div>',
+			// body start
+			'<div class="ke-plugin-filemanager-body"></div>',
+			'</div>'
+		].join('');
+		var dialog = self.createDialog({
+			name : name,
+			width : width,
+			height : height,
+			title : self.lang(name),
+			body : html
+		}),
+		div = dialog.div,
+		bodyDiv = K('.ke-plugin-filemanager-body', div),
+		moveupImg = K('[name="moveupImg"]', div),
+		moveupLink = K('[name="moveupLink"]', div),
+		viewServerBtn = K('[name="viewServer"]', div),
+		viewTypeBox = K('[name="viewType"]', div),
+		orderTypeBox = K('[name="orderType"]', div);
+		function reloadPage(path, order, func) {
+			var param = 'path=' + path + '&order=' + order + '&dir=' + dirName;
+			dialog.showLoading(self.lang('ajaxLoading'));
+			K.ajax(K.addParam(fileManagerJson, param + '&' + new Date().getTime()), function(data) {
+				dialog.hideLoading();
+				func(data);
+			});
+		}
+		var elList = [];
+		function bindEvent(el, result, data, createFunc) {
+			var fileUrl = K.formatUrl(result.current_url + data.filename, 'absolute'),
+				dirPath = encodeURIComponent(result.current_dir_path + data.filename + '/');
+			if (data.is_dir) {
+				el.click(function(e) {
+					reloadPage(dirPath, orderTypeBox.val(), createFunc);
+				});
+			} else if (data.is_photo) {
+				el.click(function(e) {
+					clickFn.call(this, fileUrl, data.filename);
+				});
+			} else {
+				el.click(function(e) {
+					clickFn.call(this, fileUrl, data.filename);
+				});
+			}
+			elList.push(el);
+		}
+		function createCommon(result, createFunc) {
+			// remove events
+			K.each(elList, function() {
+				this.unbind();
+			});
+			moveupLink.unbind();
+			viewTypeBox.unbind();
+			orderTypeBox.unbind();
+			// add events
+			if (result.current_dir_path) {
+				moveupLink.click(function(e) {
+					reloadPage(result.moveup_dir_path, orderTypeBox.val(), createFunc);
+				});
+			}
+			function changeFunc() {
+				if (viewTypeBox.val() == 'VIEW') {
+					reloadPage(result.current_dir_path, orderTypeBox.val(), createView);
+				} else {
+					reloadPage(result.current_dir_path, orderTypeBox.val(), createList);
+				}
+			}
+			viewTypeBox.change(changeFunc);
+			orderTypeBox.change(changeFunc);
+			bodyDiv.html('');
+		}
+		function createList(result) {
+			createCommon(result, createList);
+			var table = document.createElement('table');
+			table.className = 'ke-table';
+			table.cellPadding = 0;
+			table.cellSpacing = 0;
+			table.border = 0;
+			bodyDiv.append(table);
+			var fileList = result.file_list;
+			for (var i = 0, len = fileList.length; i < len; i++) {
+				var data = fileList[i], row = K(table.insertRow(i));
+				row.mouseover(function(e) {
+					K(this).addClass('ke-on');
+				})
+				.mouseout(function(e) {
+					K(this).removeClass('ke-on');
+				});
+				var iconUrl = imgPath + (data.is_dir ? 'folder-16.gif' : 'file-16.gif'),
+					img = K('<img src="' + iconUrl + '" width="16" height="16" alt="' + data.filename + '" align="absmiddle" />'),
+					cell0 = K(row[0].insertCell(0)).addClass('ke-cell ke-name').append(img).append(document.createTextNode(' ' + data.filename));
+				if (!data.is_dir || data.has_file) {
+					row.css('cursor', 'pointer');
+					cell0.attr('title', data.filename);
+					bindEvent(cell0, result, data, createList);
+				} else {
+					cell0.attr('title', lang.emptyFolder);
+				}
+				K(row[0].insertCell(1)).addClass('ke-cell ke-size').html(data.is_dir ? '-' : Math.ceil(data.filesize / 1024) + 'KB');
+				K(row[0].insertCell(2)).addClass('ke-cell ke-datetime').html(data.datetime);
+			}
+		}
+		function createView(result) {
+			createCommon(result, createView);
+			var fileList = result.file_list;
+			for (var i = 0, len = fileList.length; i < len; i++) {
+				var data = fileList[i],
+					div = K('<div class="ke-inline-block ke-item"></div>');
+				bodyDiv.append(div);
+				var photoDiv = K('<div class="ke-inline-block ke-photo"></div>')
+					.mouseover(function(e) {
+						K(this).addClass('ke-on');
+					})
+					.mouseout(function(e) {
+						K(this).removeClass('ke-on');
+					});
+				div.append(photoDiv);
+				var fileUrl = result.current_url + data.filename,
+					iconUrl = data.is_dir ? imgPath + 'folder-64.gif' : (data.is_photo ? fileUrl : imgPath + 'file-64.gif');
+				var img = K('<img src="' + iconUrl + '" width="80" height="80" alt="' + data.filename + '" />');
+				if (!data.is_dir || data.has_file) {
+					photoDiv.css('cursor', 'pointer');
+					bindTitle(photoDiv, data);
+					bindEvent(photoDiv, result, data, createView);
+				} else {
+					photoDiv.attr('title', lang.emptyFolder);
+				}
+				photoDiv.append(img);
+				div.append('<div class="ke-name" title="' + data.filename + '">' + data.filename + '</div>');
+			}
+		}
+		viewTypeBox.val(viewType);
+		reloadPage('', orderTypeBox.val(), viewType == 'VIEW' ? createView : createList);
+		return dialog;
+	}
+
+});
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('flash', function(K) {
+	var self = this, name = 'flash', lang = self.lang(name + '.'),
+		allowFlashUpload = K.undef(self.allowFlashUpload, true),
+		allowFileManager = K.undef(self.allowFileManager, false),
+		formatUploadUrl = K.undef(self.formatUploadUrl, true),
+		extraParams = K.undef(self.extraFileUploadParams, {}),
+		filePostName = K.undef(self.filePostName, 'imgFile'),
+		uploadJson = K.undef(self.uploadJson, self.basePath + 'php/upload_json.php');
+	self.plugin.flash = {
+		edit : function() {
+			var html = [
+				'<div style="padding:20px;">',
+				//url
+				'<div class="ke-dialog-row">',
+				'<label for="keUrl" style="width:60px;">' + lang.url + '</label>',
+				'<input class="ke-input-text" type="text" id="keUrl" name="url" value="" style="width:160px;" /> &nbsp;',
+				'<input type="button" class="ke-upload-button" value="' + lang.upload + '" /> &nbsp;',
+				'<span class="ke-button-common ke-button-outer">',
+				'<input type="button" class="ke-button-common ke-button" name="viewServer" value="' + lang.viewServer + '" />',
+				'</span>',
+				'</div>',
+				//width
+				'<div class="ke-dialog-row">',
+				'<label for="keWidth" style="width:60px;">' + lang.width + '</label>',
+				'<input type="text" id="keWidth" class="ke-input-text ke-input-number" name="width" value="550" maxlength="4" /> ',
+				'</div>',
+				//height
+				'<div class="ke-dialog-row">',
+				'<label for="keHeight" style="width:60px;">' + lang.height + '</label>',
+				'<input type="text" id="keHeight" class="ke-input-text ke-input-number" name="height" value="400" maxlength="4" /> ',
+				'</div>',
+				'</div>'
+			].join('');
+			var dialog = self.createDialog({
+				name : name,
+				width : 450,
+				title : self.lang(name),
+				body : html,
+				yesBtn : {
+					name : self.lang('yes'),
+					click : function(e) {
+						var url = K.trim(urlBox.val()),
+							width = widthBox.val(),
+							height = heightBox.val();
+						if (url == 'http://' || K.invalidUrl(url)) {
+							alert(self.lang('invalidUrl'));
+							urlBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(width)) {
+							alert(self.lang('invalidWidth'));
+							widthBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(height)) {
+							alert(self.lang('invalidHeight'));
+							heightBox[0].focus();
+							return;
+						}
+						var html = K.mediaImg(self.themesPath + 'common/blank.gif', {
+								src : url,
+								type : K.mediaType('.swf'),
+								width : width,
+								height : height,
+								quality : 'high'
+							});
+						self.insertHtml(html).hideDialog().focus();
+					}
+				}
+			}),
+			div = dialog.div,
+			urlBox = K('[name="url"]', div),
+			viewServerBtn = K('[name="viewServer"]', div),
+			widthBox = K('[name="width"]', div),
+			heightBox = K('[name="height"]', div);
+			urlBox.val('http://');
+
+			if (allowFlashUpload) {
+				var uploadbutton = K.uploadbutton({
+					button : K('.ke-upload-button', div)[0],
+					fieldName : filePostName,
+					extraParams : extraParams,
+					url : K.addParam(uploadJson, 'dir=flash'),
+					afterUpload : function(data) {
+						dialog.hideLoading();
+						if (data.error === 0) {
+							var url = data.url;
+							if (formatUploadUrl) {
+								url = K.formatUrl(url, 'absolute');
+							}
+							urlBox.val(url);
+							if (self.afterUpload) {
+								self.afterUpload.call(self, url, data, name);
+							}
+							alert(self.lang('uploadSuccess'));
+						} else {
+							alert(data.message);
+						}
+					},
+					afterError : function(html) {
+						dialog.hideLoading();
+						self.errorDialog(html);
+					}
+				});
+				uploadbutton.fileBox.change(function(e) {
+					dialog.showLoading(self.lang('uploadLoading'));
+					uploadbutton.submit();
+				});
+			} else {
+				K('.ke-upload-button', div).hide();
+			}
+
+			if (allowFileManager) {
+				viewServerBtn.click(function(e) {
+					self.loadPlugin('filemanager', function() {
+						self.plugin.filemanagerDialog({
+							viewType : 'LIST',
+							dirName : 'flash',
+							clickFn : function(url, title) {
+								if (self.dialogs.length > 1) {
+									K('[name="url"]', div).val(url);
+									if (self.afterSelectFile) {
+										self.afterSelectFile.call(self, url);
+									}
+									self.hideDialog();
+								}
+							}
+						});
+					});
+				});
+			} else {
+				viewServerBtn.hide();
+			}
+
+			var img = self.plugin.getSelectedFlash();
+			if (img) {
+				var attrs = K.mediaAttrs(img.attr('data-ke-tag'));
+				urlBox.val(attrs.src);
+				widthBox.val(K.removeUnit(img.css('width')) || attrs.width || 0);
+				heightBox.val(K.removeUnit(img.css('height')) || attrs.height || 0);
+			}
+			urlBox[0].focus();
+			urlBox[0].select();
+		},
+		'delete' : function() {
+			self.plugin.getSelectedFlash().remove();
+			// [IE] 删除图片后立即点击图片按钮出错
+			self.addBookmark();
+		}
+	};
+	self.clickToolbar(name, self.plugin.flash.edit);
+});
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('image', function(K) {
+	var self = this, name = 'image',
+		allowImageUpload = K.undef(self.allowImageUpload, true),
+		allowImageRemote = K.undef(self.allowImageRemote, true),
+		formatUploadUrl = K.undef(self.formatUploadUrl, true),
+		allowFileManager = K.undef(self.allowFileManager, false),
+		uploadJson = K.undef(self.uploadJson, self.basePath + 'php/upload_json.php'),
+		imageTabIndex = K.undef(self.imageTabIndex, 0),
+		imgPath = self.pluginsPath + 'image/images/',
+		extraParams = K.undef(self.extraFileUploadParams, {}),
+		filePostName = K.undef(self.filePostName, 'imgFile'),
+		fillDescAfterUploadImage = K.undef(self.fillDescAfterUploadImage, false),
+		lang = self.lang(name + '.');
+
+	self.plugin.imageDialog = function(options) {
+		var imageUrl = options.imageUrl,
+			imageWidth = K.undef(options.imageWidth, ''),
+			imageHeight = K.undef(options.imageHeight, ''),
+			imageTitle = K.undef(options.imageTitle, ''),
+			imageAlign = K.undef(options.imageAlign, ''),
+			showRemote = K.undef(options.showRemote, true),
+			showLocal = K.undef(options.showLocal, true),
+			tabIndex = K.undef(options.tabIndex, 0),
+			clickFn = options.clickFn;
+		var target = 'kindeditor_upload_iframe_' + new Date().getTime();
+		var hiddenElements = [];
+		for(var k in extraParams){
+			hiddenElements.push('<input type="hidden" name="' + k + '" value="' + extraParams[k] + '" />');
+		}
+		var html = [
+			'<div style="padding:20px;">',
+			//tabs
+			'<div class="tabs"></div>',
+			//remote image - start
+			'<div class="tab1" style="display:none;">',
+			//url
+			'<div class="ke-dialog-row">',
+			'<label for="remoteUrl" style="width:60px;">' + lang.remoteUrl + '</label>',
+			'<input type="text" id="remoteUrl" class="ke-input-text" name="url" value="" style="width:200px;" /> &nbsp;',
+			'<span class="ke-button-common ke-button-outer">',
+			'<input type="button" class="ke-button-common ke-button" name="viewServer" value="' + lang.viewServer + '" />',
+			'</span>',
+			'</div>',
+			//size
+			'<div class="ke-dialog-row">',
+			'<label for="remoteWidth" style="width:60px;">' + lang.size + '</label>',
+			lang.width + ' <input type="text" id="remoteWidth" class="ke-input-text ke-input-number" name="width" value="" maxlength="4" /> ',
+			lang.height + ' <input type="text" class="ke-input-text ke-input-number" name="height" value="" maxlength="4" /> ',
+			'<img class="ke-refresh-btn" src="' + imgPath + 'refresh.png" width="16" height="16" alt="" style="cursor:pointer;" title="' + lang.resetSize + '" />',
+			'</div>',
+			//align
+			'<div class="ke-dialog-row">',
+			'<label style="width:60px;">' + lang.align + '</label>',
+			'<input type="radio" name="align" class="ke-inline-block" value="" checked="checked" /> <img name="defaultImg" src="' + imgPath + 'align_top.gif" width="23" height="25" alt="" />',
+			' <input type="radio" name="align" class="ke-inline-block" value="left" /> <img name="leftImg" src="' + imgPath + 'align_left.gif" width="23" height="25" alt="" />',
+			' <input type="radio" name="align" class="ke-inline-block" value="right" /> <img name="rightImg" src="' + imgPath + 'align_right.gif" width="23" height="25" alt="" />',
+			'</div>',
+			//title
+			'<div class="ke-dialog-row">',
+			'<label for="remoteTitle" style="width:60px;">' + lang.imgTitle + '</label>',
+			'<input type="text" id="remoteTitle" class="ke-input-text" name="title" value="" style="width:200px;" />',
+			'</div>',
+			'</div>',
+			//remote image - end
+			//local upload - start
+			'<div class="tab2" style="display:none;">',
+			'<iframe name="' + target + '" style="display:none;"></iframe>',
+			'<form class="ke-upload-area ke-form" method="post" enctype="multipart/form-data" target="' + target + '" action="' + K.addParam(uploadJson, 'dir=image') + '">',
+			//file
+			'<div class="ke-dialog-row">',
+			hiddenElements.join(''),
+			'<label style="width:60px;">' + lang.localUrl + '</label>',
+			'<input type="text" name="localUrl" class="ke-input-text" tabindex="-1" style="width:200px;" readonly="true" /> &nbsp;',
+			'<input type="button" class="ke-upload-button" value="' + lang.upload + '" />',
+			'</div>',
+			'</form>',
+			'</div>',
+			//local upload - end
+			'</div>'
+		].join('');
+		var dialogWidth = showLocal || allowFileManager ? 450 : 400,
+			dialogHeight = showLocal && showRemote ? 300 : 250;
+		var dialog = self.createDialog({
+			name : name,
+			width : dialogWidth,
+			height : dialogHeight,
+			title : self.lang(name),
+			body : html,
+			yesBtn : {
+				name : self.lang('yes'),
+				click : function(e) {
+					// Bugfix: http://code.google.com/p/kindeditor/issues/detail?id=319
+					if (dialog.isLoading) {
+						return;
+					}
+					// insert local image
+					if (showLocal && showRemote && tabs && tabs.selectedIndex === 1 || !showRemote) {
+						if (uploadbutton.fileBox.val() == '') {
+							alert(self.lang('pleaseSelectFile'));
+							return;
+						}
+						dialog.showLoading(self.lang('uploadLoading'));
+						uploadbutton.submit();
+						localUrlBox.val('');
+						return;
+					}
+					// insert remote image
+					var url = K.trim(urlBox.val()),
+						width = widthBox.val(),
+						height = heightBox.val(),
+						title = titleBox.val(),
+						align = '';
+					alignBox.each(function() {
+						if (this.checked) {
+							align = this.value;
+							return false;
+						}
+					});
+					if (url == 'http://' || K.invalidUrl(url)) {
+						alert(self.lang('invalidUrl'));
+						urlBox[0].focus();
+						return;
+					}
+					if (!/^\d*$/.test(width)) {
+						alert(self.lang('invalidWidth'));
+						widthBox[0].focus();
+						return;
+					}
+					if (!/^\d*$/.test(height)) {
+						alert(self.lang('invalidHeight'));
+						heightBox[0].focus();
+						return;
+					}
+					clickFn.call(self, url, title, width, height, 0, align);
+				}
+			},
+			beforeRemove : function() {
+				viewServerBtn.unbind();
+				widthBox.unbind();
+				heightBox.unbind();
+				refreshBtn.unbind();
+			}
+		}),
+		div = dialog.div;
+
+		var urlBox = K('[name="url"]', div),
+			localUrlBox = K('[name="localUrl"]', div),
+			viewServerBtn = K('[name="viewServer"]', div),
+			widthBox = K('.tab1 [name="width"]', div),
+			heightBox = K('.tab1 [name="height"]', div),
+			refreshBtn = K('.ke-refresh-btn', div),
+			titleBox = K('.tab1 [name="title"]', div),
+			alignBox = K('.tab1 [name="align"]', div);
+
+		var tabs;
+		if (showRemote && showLocal) {
+			tabs = K.tabs({
+				src : K('.tabs', div),
+				afterSelect : function(i) {}
+			});
+			tabs.add({
+				title : lang.remoteImage,
+				panel : K('.tab1', div)
+			});
+			tabs.add({
+				title : lang.localImage,
+				panel : K('.tab2', div)
+			});
+			tabs.select(tabIndex);
+		} else if (showRemote) {
+			K('.tab1', div).show();
+		} else if (showLocal) {
+			K('.tab2', div).show();
+		}
+
+		var uploadbutton = K.uploadbutton({
+			button : K('.ke-upload-button', div)[0],
+			fieldName : filePostName,
+			form : K('.ke-form', div),
+			target : target,
+			width: 60,
+			afterUpload : function(data) {
+				dialog.hideLoading();
+				if (data.error === 0) {
+					var url = data.url;
+					if (formatUploadUrl) {
+						url = K.formatUrl(url, 'absolute');
+					}
+					if (self.afterUpload) {
+						self.afterUpload.call(self, url, data, name);
+					}
+					if (!fillDescAfterUploadImage) {
+						clickFn.call(self, url, data.title, data.width, data.height, data.border, data.align);
+					} else {
+						K(".ke-dialog-row #remoteUrl", div).val(url);
+						K(".ke-tabs-li", div)[0].click();
+						K(".ke-refresh-btn", div).click();
+					}
+				} else {
+					alert(data.message);
+				}
+			},
+			afterError : function(html) {
+				dialog.hideLoading();
+				self.errorDialog(html);
+			}
+		});
+		uploadbutton.fileBox.change(function(e) {
+			localUrlBox.val(uploadbutton.fileBox.val());
+		});
+		if (allowFileManager) {
+			viewServerBtn.click(function(e) {
+				self.loadPlugin('filemanager', function() {
+					self.plugin.filemanagerDialog({
+						viewType : 'VIEW',
+						dirName : 'image',
+						clickFn : function(url, title) {
+							if (self.dialogs.length > 1) {
+								K('[name="url"]', div).val(url);
+								if (self.afterSelectFile) {
+									self.afterSelectFile.call(self, url);
+								}
+								self.hideDialog();
+							}
+						}
+					});
+				});
+			});
+		} else {
+			viewServerBtn.hide();
+		}
+		var originalWidth = 0, originalHeight = 0;
+		function setSize(width, height) {
+			widthBox.val(width);
+			heightBox.val(height);
+			originalWidth = width;
+			originalHeight = height;
+		}
+		refreshBtn.click(function(e) {
+			var tempImg = K('<img src="' + urlBox.val() + '" />', document).css({
+				position : 'absolute',
+				visibility : 'hidden',
+				top : 0,
+				left : '-1000px'
+			});
+			tempImg.bind('load', function() {
+				setSize(tempImg.width(), tempImg.height());
+				tempImg.remove();
+			});
+			K(document.body).append(tempImg);
+		});
+		widthBox.change(function(e) {
+			if (originalWidth > 0) {
+				heightBox.val(Math.round(originalHeight / originalWidth * parseInt(this.value, 10)));
+			}
+		});
+		heightBox.change(function(e) {
+			if (originalHeight > 0) {
+				widthBox.val(Math.round(originalWidth / originalHeight * parseInt(this.value, 10)));
+			}
+		});
+		urlBox.val(options.imageUrl);
+		setSize(options.imageWidth, options.imageHeight);
+		titleBox.val(options.imageTitle);
+		alignBox.each(function() {
+			if (this.value === options.imageAlign) {
+				this.checked = true;
+				return false;
+			}
+		});
+		if (showRemote && tabIndex === 0) {
+			urlBox[0].focus();
+			urlBox[0].select();
+		}
+		return dialog;
+	};
+	self.plugin.image = {
+		edit : function() {
+			var img = self.plugin.getSelectedImage();
+			self.plugin.imageDialog({
+				imageUrl : img ? img.attr('data-ke-src') : 'http://',
+				imageWidth : img ? img.width() : '',
+				imageHeight : img ? img.height() : '',
+				imageTitle : img ? img.attr('title') : '',
+				imageAlign : img ? img.attr('align') : '',
+				showRemote : allowImageRemote,
+				showLocal : allowImageUpload,
+				tabIndex: img ? 0 : imageTabIndex,
+				clickFn : function(url, title, width, height, border, align) {
+					if (img) {
+						img.attr('src', url);
+						img.attr('data-ke-src', url);
+						img.attr('width', width);
+						img.attr('height', height);
+						img.attr('title', title);
+						img.attr('align', align);
+						img.attr('alt', title);
+					} else {
+						self.exec('insertimage', url, title, width, height, border, align);
+					}
+					// Bugfix: [Firefox] 上传图片后，总是出现正在加载的样式，需要延迟执行hideDialog
+					setTimeout(function() {
+						self.hideDialog().focus();
+					}, 0);
+				}
+			});
+		},
+		'delete' : function() {
+			var target = self.plugin.getSelectedImage();
+			if (target.parent().name == 'a') {
+				target = target.parent();
+			}
+			target.remove();
+			// [IE] 删除图片后立即点击图片按钮出错
+			self.addBookmark();
+		}
+	};
+	self.clickToolbar(name, self.plugin.image.edit);
+});
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('insertfile', function(K) {
+	var self = this, name = 'insertfile',
+		allowFileUpload = K.undef(self.allowFileUpload, true),
+		allowFileManager = K.undef(self.allowFileManager, false),
+		formatUploadUrl = K.undef(self.formatUploadUrl, true),
+		uploadJson = K.undef(self.uploadJson, self.basePath + 'php/upload_json.php'),
+		extraParams = K.undef(self.extraFileUploadParams, {}),
+		filePostName = K.undef(self.filePostName, 'imgFile'),
+		lang = self.lang(name + '.');
+	self.plugin.fileDialog = function(options) {
+		var fileUrl = K.undef(options.fileUrl, 'http://'),
+			fileTitle = K.undef(options.fileTitle, ''),
+			clickFn = options.clickFn;
+		var html = [
+			'<div style="padding:20px;">',
+			'<div class="ke-dialog-row">',
+			'<label for="keUrl" style="width:60px;">' + lang.url + '</label>',
+			'<input type="text" id="keUrl" name="url" class="ke-input-text" style="width:160px;" /> &nbsp;',
+			'<input type="button" class="ke-upload-button" value="' + lang.upload + '" /> &nbsp;',
+			'<span class="ke-button-common ke-button-outer">',
+			'<input type="button" class="ke-button-common ke-button" name="viewServer" value="' + lang.viewServer + '" />',
+			'</span>',
+			'</div>',
+			//title
+			'<div class="ke-dialog-row">',
+			'<label for="keTitle" style="width:60px;">' + lang.title + '</label>',
+			'<input type="text" id="keTitle" class="ke-input-text" name="title" value="" style="width:160px;" /></div>',
+			'</div>',
+			//form end
+			'</form>',
+			'</div>'
+			].join('');
+		var dialog = self.createDialog({
+			name : name,
+			width : 450,
+			title : self.lang(name),
+			body : html,
+			yesBtn : {
+				name : self.lang('yes'),
+				click : function(e) {
+					var url = K.trim(urlBox.val()),
+						title = titleBox.val();
+					if (url == 'http://' || K.invalidUrl(url)) {
+						alert(self.lang('invalidUrl'));
+						urlBox[0].focus();
+						return;
+					}
+					if (K.trim(title) === '') {
+						title = url;
+					}
+					clickFn.call(self, url, title);
+				}
+			}
+		}),
+		div = dialog.div;
+
+		var urlBox = K('[name="url"]', div),
+			viewServerBtn = K('[name="viewServer"]', div),
+			titleBox = K('[name="title"]', div);
+
+		if (allowFileUpload) {
+			var uploadbutton = K.uploadbutton({
+				button : K('.ke-upload-button', div)[0],
+				fieldName : filePostName,
+				url : K.addParam(uploadJson, 'dir=file'),
+				extraParams : extraParams,
+				afterUpload : function(data) {
+					dialog.hideLoading();
+					if (data.error === 0) {
+						var url = data.url;
+						if (formatUploadUrl) {
+							url = K.formatUrl(url, 'absolute');
+						}
+						urlBox.val(url);
+						if (self.afterUpload) {
+							self.afterUpload.call(self, url, data, name);
+						}
+						alert(self.lang('uploadSuccess'));
+					} else {
+						alert(data.message);
+					}
+				},
+				afterError : function(html) {
+					dialog.hideLoading();
+					self.errorDialog(html);
+				}
+			});
+			uploadbutton.fileBox.change(function(e) {
+				dialog.showLoading(self.lang('uploadLoading'));
+				uploadbutton.submit();
+			});
+		} else {
+			K('.ke-upload-button', div).hide();
+		}
+		if (allowFileManager) {
+			viewServerBtn.click(function(e) {
+				self.loadPlugin('filemanager', function() {
+					self.plugin.filemanagerDialog({
+						viewType : 'LIST',
+						dirName : 'file',
+						clickFn : function(url, title) {
+							if (self.dialogs.length > 1) {
+								K('[name="url"]', div).val(url);
+								if (self.afterSelectFile) {
+									self.afterSelectFile.call(self, url);
+								}
+								self.hideDialog();
+							}
+						}
+					});
+				});
+			});
+		} else {
+			viewServerBtn.hide();
+		}
+		urlBox.val(fileUrl);
+		titleBox.val(fileTitle);
+		urlBox[0].focus();
+		urlBox[0].select();
+	};
+	self.clickToolbar(name, function() {
+		self.plugin.fileDialog({
+			clickFn : function(url, title) {
+				var html = '<a class="ke-insertfile" href="' + url + '" data-ke-src="' + url + '" target="_blank">' + title + '</a>';
+				self.insertHtml(html).hideDialog().focus();
+			}
+		});
+	});
+});
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('lineheight', function(K) {
+	var self = this, name = 'lineheight', lang = self.lang(name + '.');
+	self.clickToolbar(name, function() {
+		var curVal = '', commonNode = self.cmd.commonNode({'*' : '.line-height'});
+		if (commonNode) {
+			curVal = commonNode.css('line-height');
+		}
+		var menu = self.createMenu({
+			name : name,
+			width : 150
+		});
+		K.each(lang.lineHeight, function(i, row) {
+			K.each(row, function(key, val) {
+				menu.addItem({
+					title : val,
+					checked : curVal === key,
+					click : function() {
+						self.cmd.toggle('<span style="line-height:' + key + ';"></span>', {
+							span : '.line-height=' + key
+						});
+						self.updateState();
+						self.addBookmark();
+						self.hideMenu();
+					}
+				});
+			});
+		});
+	});
+});
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('link', function(K) {
+	var self = this, name = 'link';
+	self.plugin.link = {
+		edit : function() {
+			var lang = self.lang(name + '.'),
+				html = '<div style="padding:20px;">' +
+					//url
+					'<div class="ke-dialog-row">' +
+					'<label for="keUrl" style="width:60px;">' + lang.url + '</label>' +
+					'<input class="ke-input-text" type="text" id="keUrl" name="url" value="" style="width:260px;" /></div>' +
+					//type
+					'<div class="ke-dialog-row"">' +
+					'<label for="keType" style="width:60px;">' + lang.linkType + '</label>' +
+					'<select id="keType" name="type"></select>' +
+					'</div>' +
+					'</div>',
+				dialog = self.createDialog({
+					name : name,
+					width : 450,
+					title : self.lang(name),
+					body : html,
+					yesBtn : {
+						name : self.lang('yes'),
+						click : function(e) {
+							var url = K.trim(urlBox.val());
+							if (url == 'http://' || K.invalidUrl(url)) {
+								alert(self.lang('invalidUrl'));
+								urlBox[0].focus();
+								return;
+							}
+							self.exec('createlink', url, typeBox.val()).hideDialog().focus();
+						}
+					}
+				}),
+				div = dialog.div,
+				urlBox = K('input[name="url"]', div),
+				typeBox = K('select[name="type"]', div);
+			urlBox.val('http://');
+			typeBox[0].options[0] = new Option(lang.newWindow, '_blank');
+			typeBox[0].options[1] = new Option(lang.selfWindow, '');
+			self.cmd.selection();
+			var a = self.plugin.getSelectedLink();
+			if (a) {
+				self.cmd.range.selectNode(a[0]);
+				self.cmd.select();
+				urlBox.val(a.attr('data-ke-src'));
+				typeBox.val(a.attr('target'));
+			}
+			urlBox[0].focus();
+			urlBox[0].select();
+		},
+		'delete' : function() {
+			self.exec('unlink', null);
+		}
+	};
+	self.clickToolbar(name, self.plugin.link.edit);
+});
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+// Google Maps: http://code.google.com/apis/maps/index.html
+
+KindEditor.plugin('map', function(K) {
+	var self = this, name = 'map', lang = self.lang(name + '.');
+	self.clickToolbar(name, function() {
+		var html = ['<div style="padding:10px 20px;">',
+			'<div class="ke-dialog-row">',
+			lang.address + ' <input id="kindeditor_plugin_map_address" name="address" class="ke-input-text" value="" style="width:200px;" /> ',
+			'<span class="ke-button-common ke-button-outer">',
+			'<input type="button" name="searchBtn" class="ke-button-common ke-button" value="' + lang.search + '" />',
+			'</span>',
+			'</div>',
+			'<div class="ke-map" style="width:558px;height:360px;"></div>',
+			'</div>'].join('');
+		var dialog = self.createDialog({
+			name : name,
+			width : 600,
+			title : self.lang(name),
+			body : html,
+			yesBtn : {
+				name : self.lang('yes'),
+				click : function(e) {
+					var geocoder = win.geocoder,
+						map = win.map,
+						center = map.getCenter().lat() + ',' + map.getCenter().lng(),
+						zoom = map.getZoom(),
+						maptype = map.getMapTypeId(),
+						url = 'http://maps.googleapis.com/maps/api/staticmap';
+						url += '?center=' + encodeURIComponent(center);
+						url += '&zoom=' + encodeURIComponent(zoom);
+						url += '&size=558x360';
+						url += '&maptype=' + encodeURIComponent(maptype);
+						url += '&markers=' + encodeURIComponent(center);
+						url += '&language=' + self.langType;
+						url += '&sensor=false';
+					self.exec('insertimage', url).hideDialog().focus();
+				}
+			},
+			beforeRemove : function() {
+				searchBtn.remove();
+				if (doc) {
+					doc.write('');
+				}
+				iframe.remove();
+			}
+		});
+		var div = dialog.div,
+			addressBox = K('[name="address"]', div),
+			searchBtn = K('[name="searchBtn"]', div),
+			win, doc;
+		var iframeHtml = ['<!doctype html><html><head>',
+			'<meta name="viewport" content="initial-scale=1.0, user-scalable=no" />',
+			'<style>',
+			'	html { height: 100% }',
+			'	body { height: 100%; margin: 0; padding: 0; background-color: #FFF }',
+			'	#map_canvas { height: 100% }',
+			'</style>',
+			'<script src="http://maps.googleapis.com/maps/api/js?sensor=false&language=' + self.langType + '"></script>',
+			'<script>',
+			'var map, geocoder;',
+			'function initialize() {',
+			'	var latlng = new google.maps.LatLng(31.230393, 121.473704);',
+			'	var options = {',
+			'		zoom: 11,',
+			'		center: latlng,',
+			'		disableDefaultUI: true,',
+			'		panControl: true,',
+			'		zoomControl: true,',
+			'		mapTypeControl: true,',
+			'		scaleControl: true,',
+			'		streetViewControl: false,',
+			'		overviewMapControl: true,',
+			'		mapTypeId: google.maps.MapTypeId.ROADMAP',
+			'	};',
+			'	map = new google.maps.Map(document.getElementById("map_canvas"), options);',
+			'	geocoder = new google.maps.Geocoder();',
+			'	geocoder.geocode({latLng: latlng}, function(results, status) {',
+			'		if (status == google.maps.GeocoderStatus.OK) {',
+			'			if (results[3]) {',
+			'				parent.document.getElementById("kindeditor_plugin_map_address").value = results[3].formatted_address;',
+			'			}',
+			'		}',
+			'	});',
+			'}',
+			'function search(address) {',
+			'	if (!map) return;',
+			'	geocoder.geocode({address : address}, function(results, status) {',
+			'		if (status == google.maps.GeocoderStatus.OK) {',
+			'			map.setZoom(11);',
+			'			map.setCenter(results[0].geometry.location);',
+			'			var marker = new google.maps.Marker({',
+			'				map: map,',
+			'				position: results[0].geometry.location',
+			'			});',
+			'		} else {',
+			'			alert("Invalid address: " + address);',
+			'		}',
+			'	});',
+			'}',
+			'</script>',
+			'</head>',
+			'<body onload="initialize();">',
+			'<div id="map_canvas" style="width:100%; height:100%"></div>',
+			'</body></html>'].join('\n');
+		// TODO：用doc.write(iframeHtml)方式加载时，在IE6上第一次加载报错，暂时使用src方式
+		var iframe = K('<iframe class="ke-textarea" frameborder="0" src="' + self.pluginsPath + 'map/map.html" style="width:558px;height:360px;"></iframe>');
+		function ready() {
+			win = iframe[0].contentWindow;
+			doc = K.iframeDoc(iframe);
+			//doc.open();
+			//doc.write(iframeHtml);
+			//doc.close();
+		}
+		iframe.bind('load', function() {
+			iframe.unbind('load');
+			if (K.IE) {
+				ready();
+			} else {
+				setTimeout(ready, 0);
+			}
+		});
+		K('.ke-map', div).replaceWith(iframe);
+		// search map
+		searchBtn.click(function() {
+			win.search(addressBox.val());
+		});
+	});
+});
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('media', function(K) {
+	var self = this, name = 'media', lang = self.lang(name + '.'),
+		allowMediaUpload = K.undef(self.allowMediaUpload, true),
+		allowFileManager = K.undef(self.allowFileManager, false),
+		formatUploadUrl = K.undef(self.formatUploadUrl, true),
+		extraParams = K.undef(self.extraFileUploadParams, {}),
+		filePostName = K.undef(self.filePostName, 'imgFile'),
+		uploadJson = K.undef(self.uploadJson, self.basePath + 'php/upload_json.php');
+	self.plugin.media = {
+		edit : function() {
+			var html = [
+				'<div style="padding:20px;">',
+				//url
+				'<div class="ke-dialog-row">',
+				'<label for="keUrl" style="width:60px;">' + lang.url + '</label>',
+				'<input class="ke-input-text" type="text" id="keUrl" name="url" value="" style="width:160px;" /> &nbsp;',
+				'<input type="button" class="ke-upload-button" value="' + lang.upload + '" /> &nbsp;',
+				'<span class="ke-button-common ke-button-outer">',
+				'<input type="button" class="ke-button-common ke-button" name="viewServer" value="' + lang.viewServer + '" />',
+				'</span>',
+				'</div>',
+				//width
+				'<div class="ke-dialog-row">',
+				'<label for="keWidth" style="width:60px;">' + lang.width + '</label>',
+				'<input type="text" id="keWidth" class="ke-input-text ke-input-number" name="width" value="550" maxlength="4" />',
+				'</div>',
+				//height
+				'<div class="ke-dialog-row">',
+				'<label for="keHeight" style="width:60px;">' + lang.height + '</label>',
+				'<input type="text" id="keHeight" class="ke-input-text ke-input-number" name="height" value="400" maxlength="4" />',
+				'</div>',
+				//autostart
+				'<div class="ke-dialog-row">',
+				'<label for="keAutostart">' + lang.autostart + '</label>',
+				'<input type="checkbox" id="keAutostart" name="autostart" value="" /> ',
+				'</div>',
+				'</div>'
+			].join('');
+			var dialog = self.createDialog({
+				name : name,
+				width : 450,
+				height : 230,
+				title : self.lang(name),
+				body : html,
+				yesBtn : {
+					name : self.lang('yes'),
+					click : function(e) {
+						var url = K.trim(urlBox.val()),
+							width = widthBox.val(),
+							height = heightBox.val();
+						if (url == 'http://' || K.invalidUrl(url)) {
+							alert(self.lang('invalidUrl'));
+							urlBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(width)) {
+							alert(self.lang('invalidWidth'));
+							widthBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(height)) {
+							alert(self.lang('invalidHeight'));
+							heightBox[0].focus();
+							return;
+						}
+						var html = K.mediaImg(self.themesPath + 'common/blank.gif', {
+								src : url,
+								type : K.mediaType(url),
+								width : width,
+								height : height,
+								autostart : autostartBox[0].checked ? 'true' : 'false',
+								loop : 'true'
+							});
+						self.insertHtml(html).hideDialog().focus();
+					}
+				}
+			}),
+			div = dialog.div,
+			urlBox = K('[name="url"]', div),
+			viewServerBtn = K('[name="viewServer"]', div),
+			widthBox = K('[name="width"]', div),
+			heightBox = K('[name="height"]', div),
+			autostartBox = K('[name="autostart"]', div);
+			urlBox.val('http://');
+
+			if (allowMediaUpload) {
+				var uploadbutton = K.uploadbutton({
+					button : K('.ke-upload-button', div)[0],
+					fieldName : filePostName,
+					extraParams : extraParams,
+					url : K.addParam(uploadJson, 'dir=media'),
+					afterUpload : function(data) {
+						dialog.hideLoading();
+						if (data.error === 0) {
+							var url = data.url;
+							if (formatUploadUrl) {
+								url = K.formatUrl(url, 'absolute');
+							}
+							urlBox.val(url);
+							if (self.afterUpload) {
+								self.afterUpload.call(self, url, data, name);
+							}
+							alert(self.lang('uploadSuccess'));
+						} else {
+							alert(data.message);
+						}
+					},
+					afterError : function(html) {
+						dialog.hideLoading();
+						self.errorDialog(html);
+					}
+				});
+				uploadbutton.fileBox.change(function(e) {
+					dialog.showLoading(self.lang('uploadLoading'));
+					uploadbutton.submit();
+				});
+			} else {
+				K('.ke-upload-button', div).hide();
+			}
+
+			if (allowFileManager) {
+				viewServerBtn.click(function(e) {
+					self.loadPlugin('filemanager', function() {
+						self.plugin.filemanagerDialog({
+							viewType : 'LIST',
+							dirName : 'media',
+							clickFn : function(url, title) {
+								if (self.dialogs.length > 1) {
+									K('[name="url"]', div).val(url);
+									if (self.afterSelectFile) {
+										self.afterSelectFile.call(self, url);
+									}
+									self.hideDialog();
+								}
+							}
+						});
+					});
+				});
+			} else {
+				viewServerBtn.hide();
+			}
+
+			var img = self.plugin.getSelectedMedia();
+			if (img) {
+				var attrs = K.mediaAttrs(img.attr('data-ke-tag'));
+				urlBox.val(attrs.src);
+				widthBox.val(K.removeUnit(img.css('width')) || attrs.width || 0);
+				heightBox.val(K.removeUnit(img.css('height')) || attrs.height || 0);
+				autostartBox[0].checked = (attrs.autostart === 'true');
+			}
+			urlBox[0].focus();
+			urlBox[0].select();
+		},
+		'delete' : function() {
+			self.plugin.getSelectedMedia().remove();
+			// [IE] 删除图片后立即点击图片按钮出错
+			self.addBookmark();
+		}
+	};
+	self.clickToolbar(name, self.plugin.media.edit);
+});
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+
+(function(K) {
+
+function KSWFUpload(options) {
+	this.init(options);
+}
+K.extend(KSWFUpload, {
+	init : function(options) {
+		var self = this;
+		options.afterError = options.afterError || function(str) {
+			alert(str);
+		};
+		self.options = options;
+		self.progressbars = {};
+		// template
+		self.div = K(options.container).html([
+			'<div class="ke-swfupload">',
+			'<div class="ke-swfupload-top">',
+			'<div class="ke-inline-block ke-swfupload-button">',
+			'<input type="button" value="Browse" />',
+			'</div>',
+			'<div class="ke-inline-block ke-swfupload-desc">' + options.uploadDesc + '</div>',
+			'<span class="ke-button-common ke-button-outer ke-swfupload-startupload">',
+			'<input type="button" class="ke-button-common ke-button" value="' + options.startButtonValue + '" />',
+			'</span>',
+			'</div>',
+			'<div class="ke-swfupload-body"></div>',
+			'</div>'
+		].join(''));
+		self.bodyDiv = K('.ke-swfupload-body', self.div);
+
+		function showError(itemDiv, msg) {
+			K('.ke-status > div', itemDiv).hide();
+			K('.ke-message', itemDiv).addClass('ke-error').show().html(K.escape(msg));
+		}
+
+		var settings = {
+			debug : false,
+			upload_url : options.uploadUrl,
+			flash_url : options.flashUrl,
+			file_post_name : options.filePostName,
+			button_placeholder : K('.ke-swfupload-button > input', self.div)[0],
+			button_image_url: options.buttonImageUrl,
+			button_width: options.buttonWidth,
+			button_height: options.buttonHeight,
+			button_cursor : SWFUpload.CURSOR.HAND,
+			file_types : options.fileTypes,
+			file_types_description : options.fileTypesDesc,
+			file_upload_limit : options.fileUploadLimit,
+			file_size_limit : options.fileSizeLimit,
+			post_params : options.postParams,
+			file_queued_handler : function(file) {
+				file.url = self.options.fileIconUrl;
+				self.appendFile(file);
+			},
+			file_queue_error_handler : function(file, errorCode, message) {
+				var errorName = '';
+				switch (errorCode) {
+					case SWFUpload.QUEUE_ERROR.QUEUE_LIMIT_EXCEEDED:
+						errorName = options.queueLimitExceeded;
+						break;
+					case SWFUpload.QUEUE_ERROR.FILE_EXCEEDS_SIZE_LIMIT:
+						errorName = options.fileExceedsSizeLimit;
+						break;
+					case SWFUpload.QUEUE_ERROR.ZERO_BYTE_FILE:
+						errorName = options.zeroByteFile;
+						break;
+					case SWFUpload.QUEUE_ERROR.INVALID_FILETYPE:
+						errorName = options.invalidFiletype;
+						break;
+					default:
+						errorName = options.unknownError;
+						break;
+				}
+				K.DEBUG && alert(errorName);
+			},
+			upload_start_handler : function(file) {
+				var self = this;
+				var itemDiv = K('div[data-id="' + file.id + '"]', self.bodyDiv);
+				K('.ke-status > div', itemDiv).hide();
+				K('.ke-progressbar', itemDiv).show();
+			},
+			upload_progress_handler : function(file, bytesLoaded, bytesTotal) {
+				var percent = Math.round(bytesLoaded * 100 / bytesTotal);
+				var progressbar = self.progressbars[file.id];
+				progressbar.bar.css('width', Math.round(percent * 80 / 100) + 'px');
+				progressbar.percent.html(percent + '%');
+			},
+			upload_error_handler : function(file, errorCode, message) {
+				if (file && file.filestatus == SWFUpload.FILE_STATUS.ERROR) {
+					var itemDiv = K('div[data-id="' + file.id + '"]', self.bodyDiv).eq(0);
+					showError(itemDiv, self.options.errorMessage);
+				}
+			},
+			upload_success_handler : function(file, serverData) {
+				var itemDiv = K('div[data-id="' + file.id + '"]', self.bodyDiv).eq(0);
+				var data = {};
+				try {
+					data = K.json(serverData);
+				} catch (e) {
+					self.options.afterError.call(this, '<!doctype html><html>' + serverData + '</html>');
+				}
+				if (data.error !== 0) {
+					showError(itemDiv, K.DEBUG ? data.message : self.options.errorMessage);
+					return;
+				}
+				file.url = data.url;
+				K('.ke-img', itemDiv).attr('src', file.url).attr('data-status', file.filestatus).data('data', data);
+				K('.ke-status > div', itemDiv).hide();
+			}
+		};
+		self.swfu = new SWFUpload(settings);
+
+		K('.ke-swfupload-startupload input', self.div).click(function() {
+			self.swfu.startUpload();
+		});
+	},
+	getUrlList : function() {
+		var list = [];
+		K('.ke-img', self.bodyDiv).each(function() {
+			var img = K(this);
+			var status = img.attr('data-status');
+			if (status == SWFUpload.FILE_STATUS.COMPLETE) {
+				list.push(img.data('data'));
+			}
+		});
+		return list;
+	},
+	removeFile : function(fileId) {
+		var self = this;
+		self.swfu.cancelUpload(fileId);
+		var itemDiv = K('div[data-id="' + fileId + '"]', self.bodyDiv);
+		K('.ke-photo', itemDiv).unbind();
+		K('.ke-delete', itemDiv).unbind();
+		itemDiv.remove();
+	},
+	removeFiles : function() {
+		var self = this;
+		K('.ke-item', self.bodyDiv).each(function() {
+			self.removeFile(K(this).attr('data-id'));
+		});
+	},
+	appendFile : function(file) {
+		var self = this;
+		var itemDiv = K('<div class="ke-inline-block ke-item" data-id="' + file.id + '"></div>');
+		self.bodyDiv.append(itemDiv);
+		var photoDiv = K('<div class="ke-inline-block ke-photo"></div>')
+			.mouseover(function(e) {
+				K(this).addClass('ke-on');
+			})
+			.mouseout(function(e) {
+				K(this).removeClass('ke-on');
+			});
+		itemDiv.append(photoDiv);
+
+		var img = K('<img src="' + file.url + '" class="ke-img" data-status="' + file.filestatus + '" width="80" height="80" alt="' + file.name + '" />');
+		photoDiv.append(img);
+		K('<span class="ke-delete"></span>').appendTo(photoDiv).click(function() {
+			self.removeFile(file.id);
+		});
+		var statusDiv = K('<div class="ke-status"></div>').appendTo(photoDiv);
+		// progressbar
+		K(['<div class="ke-progressbar">',
+			'<div class="ke-progressbar-bar"><div class="ke-progressbar-bar-inner"></div></div>',
+			'<div class="ke-progressbar-percent">0%</div></div>'].join('')).hide().appendTo(statusDiv);
+		// message
+		K('<div class="ke-message">' + self.options.pendingMessage + '</div>').appendTo(statusDiv);
+
+		itemDiv.append('<div class="ke-name">' + file.name + '</div>');
+
+		self.progressbars[file.id] = {
+			bar : K('.ke-progressbar-bar-inner', photoDiv),
+			percent : K('.ke-progressbar-percent', photoDiv)
+		};
+	},
+	remove : function() {
+		this.removeFiles();
+		this.swfu.destroy();
+		this.div.html('');
+	}
+});
+
+K.swfupload = function(element, options) {
+	return new KSWFUpload(element, options);
+};
+
+})(KindEditor);
+
+KindEditor.plugin('multiimage', function(K) {
+	var self = this, name = 'multiimage',
+		formatUploadUrl = K.undef(self.formatUploadUrl, true),
+		uploadJson = K.undef(self.uploadJson, self.basePath + 'php/upload_json.php'),
+		imgPath = self.pluginsPath + 'multiimage/images/',
+		imageSizeLimit = K.undef(self.imageSizeLimit, '1MB'),
+		imageFileTypes = K.undef(self.imageFileTypes, '*.jpg;*.gif;*.png'),
+		imageUploadLimit = K.undef(self.imageUploadLimit, 20),
+		filePostName = K.undef(self.filePostName, 'imgFile'),
+		lang = self.lang(name + '.');
+
+	self.plugin.multiImageDialog = function(options) {
+		var clickFn = options.clickFn,
+			uploadDesc = K.tmpl(lang.uploadDesc, {uploadLimit : imageUploadLimit, sizeLimit : imageSizeLimit});
+		var html = [
+			'<div style="padding:20px;">',
+			'<div class="swfupload">',
+			'</div>',
+			'</div>'
+		].join('');
+		var dialog = self.createDialog({
+			name : name,
+			width : 650,
+			height : 510,
+			title : self.lang(name),
+			body : html,
+			previewBtn : {
+				name : lang.insertAll,
+				click : function(e) {
+					clickFn.call(self, swfupload.getUrlList());
+				}
+			},
+			yesBtn : {
+				name : lang.clearAll,
+				click : function(e) {
+					swfupload.removeFiles();
+				}
+			},
+			beforeRemove : function() {
+				// IE9 bugfix: https://github.com/kindsoft/kindeditor/issues/72
+				if (!K.IE || K.V <= 8) {
+					swfupload.remove();
+				}
+			}
+		}),
+		div = dialog.div;
+
+		var swfupload = K.swfupload({
+			container : K('.swfupload', div),
+			buttonImageUrl : imgPath + (self.langType == 'zh_CN' ? 'select-files-zh_CN.png' : 'select-files-en.png'),
+			buttonWidth : self.langType == 'zh_CN' ? 72 : 88,
+			buttonHeight : 23,
+			fileIconUrl : imgPath + 'image.png',
+			uploadDesc : uploadDesc,
+			startButtonValue : lang.startUpload,
+			uploadUrl : K.addParam(uploadJson, 'dir=image'),
+			flashUrl : imgPath + 'swfupload.swf',
+			filePostName : filePostName,
+			fileTypes : '*.jpg;*.jpeg;*.gif;*.png;*.bmp',
+			fileTypesDesc : 'Image Files',
+			fileUploadLimit : imageUploadLimit,
+			fileSizeLimit : imageSizeLimit,
+			postParams :  K.undef(self.extraFileUploadParams, {}),
+			queueLimitExceeded : lang.queueLimitExceeded,
+			fileExceedsSizeLimit : lang.fileExceedsSizeLimit,
+			zeroByteFile : lang.zeroByteFile,
+			invalidFiletype : lang.invalidFiletype,
+			unknownError : lang.unknownError,
+			pendingMessage : lang.pending,
+			errorMessage : lang.uploadError,
+			afterError : function(html) {
+				self.errorDialog(html);
+			}
+		});
+
+		return dialog;
+	};
+	self.clickToolbar(name, function() {
+		self.plugin.multiImageDialog({
+			clickFn : function (urlList) {
+				if (urlList.length === 0) {
+					return;
+				}
+				K.each(urlList, function(i, data) {
+					if (self.afterUpload) {
+						self.afterUpload.call(self, data.url, data, 'multiimage');
+					}
+					self.exec('insertimage', data.url, data.title, data.width, data.height, data.border, data.align);
+				});
+				// Bugfix: [Firefox] 上传图片后，总是出现正在加载的样式，需要延迟执行hideDialog
+				setTimeout(function() {
+					self.hideDialog().focus();
+				}, 0);
+			}
+		});
+	});
+});
+
+
+/**
+ * SWFUpload: http://www.swfupload.org, http://swfupload.googlecode.com
+ *
+ * mmSWFUpload 1.0: Flash upload dialog - http://profandesign.se/swfupload/,  http://www.vinterwebb.se/
+ *
+ * SWFUpload is (c) 2006-2007 Lars Huring, Olov Nilz閚 and Mammon Media and is released under the MIT License:
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ * SWFUpload 2 is (c) 2007-2008 Jake Roberts and is released under the MIT License:
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ */
+
+
+/* ******************* */
+/* Constructor & Init  */
+/* ******************* */
+
+(function() {
+
+window.SWFUpload = function (settings) {
+	this.initSWFUpload(settings);
+};
+
+SWFUpload.prototype.initSWFUpload = function (settings) {
+	try {
+		this.customSettings = {};	// A container where developers can place their own settings associated with this instance.
+		this.settings = settings;
+		this.eventQueue = [];
+		this.movieName = "KindEditor_SWFUpload_" + SWFUpload.movieCount++;
+		this.movieElement = null;
+
+
+		// Setup global control tracking
+		SWFUpload.instances[this.movieName] = this;
+
+		// Load the settings.  Load the Flash movie.
+		this.initSettings();
+		this.loadFlash();
+		this.displayDebugInfo();
+	} catch (ex) {
+		delete SWFUpload.instances[this.movieName];
+		throw ex;
+	}
+};
+
+/* *************** */
+/* Static Members  */
+/* *************** */
+SWFUpload.instances = {};
+SWFUpload.movieCount = 0;
+SWFUpload.version = "2.2.0 2009-03-25";
+SWFUpload.QUEUE_ERROR = {
+	QUEUE_LIMIT_EXCEEDED	  		: -100,
+	FILE_EXCEEDS_SIZE_LIMIT  		: -110,
+	ZERO_BYTE_FILE			  		: -120,
+	INVALID_FILETYPE		  		: -130
+};
+SWFUpload.UPLOAD_ERROR = {
+	HTTP_ERROR				  		: -200,
+	MISSING_UPLOAD_URL	      		: -210,
+	IO_ERROR				  		: -220,
+	SECURITY_ERROR			  		: -230,
+	UPLOAD_LIMIT_EXCEEDED	  		: -240,
+	UPLOAD_FAILED			  		: -250,
+	SPECIFIED_FILE_ID_NOT_FOUND		: -260,
+	FILE_VALIDATION_FAILED	  		: -270,
+	FILE_CANCELLED			  		: -280,
+	UPLOAD_STOPPED					: -290
+};
+SWFUpload.FILE_STATUS = {
+	QUEUED		 : -1,
+	IN_PROGRESS	 : -2,
+	ERROR		 : -3,
+	COMPLETE	 : -4,
+	CANCELLED	 : -5
+};
+SWFUpload.BUTTON_ACTION = {
+	SELECT_FILE  : -100,
+	SELECT_FILES : -110,
+	START_UPLOAD : -120
+};
+SWFUpload.CURSOR = {
+	ARROW : -1,
+	HAND : -2
+};
+SWFUpload.WINDOW_MODE = {
+	WINDOW : "window",
+	TRANSPARENT : "transparent",
+	OPAQUE : "opaque"
+};
+
+// Private: takes a URL, determines if it is relative and converts to an absolute URL
+// using the current site. Only processes the URL if it can, otherwise returns the URL untouched
+SWFUpload.completeURL = function(url) {
+	if (typeof(url) !== "string" || url.match(/^https?:\/\//i) || url.match(/^\//)) {
+		return url;
+	}
+
+	var currentURL = window.location.protocol + "//" + window.location.hostname + (window.location.port ? ":" + window.location.port : "");
+
+	var indexSlash = window.location.pathname.lastIndexOf("/");
+	if (indexSlash <= 0) {
+		path = "/";
+	} else {
+		path = window.location.pathname.substr(0, indexSlash) + "/";
+	}
+
+	return /*currentURL +*/ path + url;
+
+};
+
+
+/* ******************** */
+/* Instance Members  */
+/* ******************** */
+
+// Private: initSettings ensures that all the
+// settings are set, getting a default value if one was not assigned.
+SWFUpload.prototype.initSettings = function () {
+	this.ensureDefault = function (settingName, defaultValue) {
+		this.settings[settingName] = (this.settings[settingName] == undefined) ? defaultValue : this.settings[settingName];
+	};
+
+	// Upload backend settings
+	this.ensureDefault("upload_url", "");
+	this.ensureDefault("preserve_relative_urls", false);
+	this.ensureDefault("file_post_name", "Filedata");
+	this.ensureDefault("post_params", {});
+	this.ensureDefault("use_query_string", false);
+	this.ensureDefault("requeue_on_error", false);
+	this.ensureDefault("http_success", []);
+	this.ensureDefault("assume_success_timeout", 0);
+
+	// File Settings
+	this.ensureDefault("file_types", "*.*");
+	this.ensureDefault("file_types_description", "All Files");
+	this.ensureDefault("file_size_limit", 0);	// Default zero means "unlimited"
+	this.ensureDefault("file_upload_limit", 0);
+	this.ensureDefault("file_queue_limit", 0);
+
+	// Flash Settings
+	this.ensureDefault("flash_url", "swfupload.swf");
+	this.ensureDefault("prevent_swf_caching", true);
+
+	// Button Settings
+	this.ensureDefault("button_image_url", "");
+	this.ensureDefault("button_width", 1);
+	this.ensureDefault("button_height", 1);
+	this.ensureDefault("button_text", "");
+	this.ensureDefault("button_text_style", "color: #000000; font-size: 16pt;");
+	this.ensureDefault("button_text_top_padding", 0);
+	this.ensureDefault("button_text_left_padding", 0);
+	this.ensureDefault("button_action", SWFUpload.BUTTON_ACTION.SELECT_FILES);
+	this.ensureDefault("button_disabled", false);
+	this.ensureDefault("button_placeholder_id", "");
+	this.ensureDefault("button_placeholder", null);
+	this.ensureDefault("button_cursor", SWFUpload.CURSOR.ARROW);
+	this.ensureDefault("button_window_mode", SWFUpload.WINDOW_MODE.WINDOW);
+
+	// Debug Settings
+	this.ensureDefault("debug", false);
+	this.settings.debug_enabled = this.settings.debug;	// Here to maintain v2 API
+
+	// Event Handlers
+	this.settings.return_upload_start_handler = this.returnUploadStart;
+	this.ensureDefault("swfupload_loaded_handler", null);
+	this.ensureDefault("file_dialog_start_handler", null);
+	this.ensureDefault("file_queued_handler", null);
+	this.ensureDefault("file_queue_error_handler", null);
+	this.ensureDefault("file_dialog_complete_handler", null);
+
+	this.ensureDefault("upload_start_handler", null);
+	this.ensureDefault("upload_progress_handler", null);
+	this.ensureDefault("upload_error_handler", null);
+	this.ensureDefault("upload_success_handler", null);
+	this.ensureDefault("upload_complete_handler", null);
+
+	this.ensureDefault("debug_handler", this.debugMessage);
+
+	this.ensureDefault("custom_settings", {});
+
+	// Other settings
+	this.customSettings = this.settings.custom_settings;
+
+	// Update the flash url if needed
+	if (!!this.settings.prevent_swf_caching) {
+		this.settings.flash_url = this.settings.flash_url + (this.settings.flash_url.indexOf("?") < 0 ? "?" : "&") + "preventswfcaching=" + new Date().getTime();
+	}
+
+	if (!this.settings.preserve_relative_urls) {
+		//this.settings.flash_url = SWFUpload.completeURL(this.settings.flash_url);	// Don't need to do this one since flash doesn't look at it
+		this.settings.upload_url = SWFUpload.completeURL(this.settings.upload_url);
+		this.settings.button_image_url = SWFUpload.completeURL(this.settings.button_image_url);
+	}
+
+	delete this.ensureDefault;
+};
+
+// Private: loadFlash replaces the button_placeholder element with the flash movie.
+SWFUpload.prototype.loadFlash = function () {
+	var targetElement, tempParent;
+
+	// Make sure an element with the ID we are going to use doesn't already exist
+	if (document.getElementById(this.movieName) !== null) {
+		throw "ID " + this.movieName + " is already in use. The Flash Object could not be added";
+	}
+
+	// Get the element where we will be placing the flash movie
+	targetElement = document.getElementById(this.settings.button_placeholder_id) || this.settings.button_placeholder;
+
+	if (targetElement == undefined) {
+		throw "Could not find the placeholder element: " + this.settings.button_placeholder_id;
+	}
+
+	// Append the container and load the flash
+	tempParent = document.createElement("div");
+	tempParent.innerHTML = this.getFlashHTML();	// Using innerHTML is non-standard but the only sensible way to dynamically add Flash in IE (and maybe other browsers)
+	targetElement.parentNode.replaceChild(tempParent.firstChild, targetElement);
+
+	// Fix IE Flash/Form bug
+	if (window[this.movieName] == undefined) {
+		window[this.movieName] = this.getMovieElement();
+	}
+
+};
+
+// Private: getFlashHTML generates the object tag needed to embed the flash in to the document
+SWFUpload.prototype.getFlashHTML = function () {
+	// Flash Satay object syntax: http://www.alistapart.com/articles/flashsatay
+	// Fix bug for IE9
+	// http://www.kindsoft.net/view.php?bbsid=7&postid=5825&pagenum=1
+	var classid = '';
+	if (KindEditor.IE && KindEditor.V > 8) {
+		classid = ' classid = "clsid:d27cdb6e-ae6d-11cf-96b8-444553540000"';
+	}
+	return ['<object id="', this.movieName, '"' + classid + ' type="application/x-shockwave-flash" data="', this.settings.flash_url, '" width="', this.settings.button_width, '" height="', this.settings.button_height, '" class="swfupload">',
+				'<param name="wmode" value="', this.settings.button_window_mode, '" />',
+				'<param name="movie" value="', this.settings.flash_url, '" />',
+				'<param name="quality" value="high" />',
+				'<param name="menu" value="false" />',
+				'<param name="allowScriptAccess" value="always" />',
+				'<param name="flashvars" value="' + this.getFlashVars() + '" />',
+				'</object>'].join("");
+};
+
+// Private: getFlashVars builds the parameter string that will be passed
+// to flash in the flashvars param.
+SWFUpload.prototype.getFlashVars = function () {
+	// Build a string from the post param object
+	var paramString = this.buildParamString();
+	var httpSuccessString = this.settings.http_success.join(",");
+
+	// Build the parameter string
+	return ["movieName=", encodeURIComponent(this.movieName),
+			"&amp;uploadURL=", encodeURIComponent(this.settings.upload_url),
+			"&amp;useQueryString=", encodeURIComponent(this.settings.use_query_string),
+			"&amp;requeueOnError=", encodeURIComponent(this.settings.requeue_on_error),
+			"&amp;httpSuccess=", encodeURIComponent(httpSuccessString),
+			"&amp;assumeSuccessTimeout=", encodeURIComponent(this.settings.assume_success_timeout),
+			"&amp;params=", encodeURIComponent(paramString),
+			"&amp;filePostName=", encodeURIComponent(this.settings.file_post_name),
+			"&amp;fileTypes=", encodeURIComponent(this.settings.file_types),
+			"&amp;fileTypesDescription=", encodeURIComponent(this.settings.file_types_description),
+			"&amp;fileSizeLimit=", encodeURIComponent(this.settings.file_size_limit),
+			"&amp;fileUploadLimit=", encodeURIComponent(this.settings.file_upload_limit),
+			"&amp;fileQueueLimit=", encodeURIComponent(this.settings.file_queue_limit),
+			"&amp;debugEnabled=", encodeURIComponent(this.settings.debug_enabled),
+			"&amp;buttonImageURL=", encodeURIComponent(this.settings.button_image_url),
+			"&amp;buttonWidth=", encodeURIComponent(this.settings.button_width),
+			"&amp;buttonHeight=", encodeURIComponent(this.settings.button_height),
+			"&amp;buttonText=", encodeURIComponent(this.settings.button_text),
+			"&amp;buttonTextTopPadding=", encodeURIComponent(this.settings.button_text_top_padding),
+			"&amp;buttonTextLeftPadding=", encodeURIComponent(this.settings.button_text_left_padding),
+			"&amp;buttonTextStyle=", encodeURIComponent(this.settings.button_text_style),
+			"&amp;buttonAction=", encodeURIComponent(this.settings.button_action),
+			"&amp;buttonDisabled=", encodeURIComponent(this.settings.button_disabled),
+			"&amp;buttonCursor=", encodeURIComponent(this.settings.button_cursor)
+		].join("");
+};
+
+// Public: getMovieElement retrieves the DOM reference to the Flash element added by SWFUpload
+// The element is cached after the first lookup
+SWFUpload.prototype.getMovieElement = function () {
+	if (this.movieElement == undefined) {
+		this.movieElement = document.getElementById(this.movieName);
+	}
+
+	if (this.movieElement === null) {
+		throw "Could not find Flash element";
+	}
+
+	return this.movieElement;
+};
+
+// Private: buildParamString takes the name/value pairs in the post_params setting object
+// and joins them up in to a string formatted "name=value&amp;name=value"
+SWFUpload.prototype.buildParamString = function () {
+	var postParams = this.settings.post_params;
+	var paramStringPairs = [];
+
+	if (typeof(postParams) === "object") {
+		for (var name in postParams) {
+			if (postParams.hasOwnProperty(name)) {
+				paramStringPairs.push(encodeURIComponent(name.toString()) + "=" + encodeURIComponent(postParams[name].toString()));
+			}
+		}
+	}
+
+	return paramStringPairs.join("&amp;");
+};
+
+// Public: Used to remove a SWFUpload instance from the page. This method strives to remove
+// all references to the SWF, and other objects so memory is properly freed.
+// Returns true if everything was destroyed. Returns a false if a failure occurs leaving SWFUpload in an inconsistant state.
+// Credits: Major improvements provided by steffen
+SWFUpload.prototype.destroy = function () {
+	try {
+		// Make sure Flash is done before we try to remove it
+		this.cancelUpload(null, false);
+
+
+		// Remove the SWFUpload DOM nodes
+		var movieElement = null;
+		movieElement = this.getMovieElement();
+
+		if (movieElement && typeof(movieElement.CallFunction) === "unknown") { // We only want to do this in IE
+			// Loop through all the movie's properties and remove all function references (DOM/JS IE 6/7 memory leak workaround)
+			for (var i in movieElement) {
+				try {
+					if (typeof(movieElement[i]) === "function") {
+						movieElement[i] = null;
+					}
+				} catch (ex1) {}
+			}
+
+			// Remove the Movie Element from the page
+			try {
+				movieElement.parentNode.removeChild(movieElement);
+			} catch (ex) {}
+		}
+
+		// Remove IE form fix reference
+		window[this.movieName] = null;
+
+		// Destroy other references
+		SWFUpload.instances[this.movieName] = null;
+		delete SWFUpload.instances[this.movieName];
+
+		this.movieElement = null;
+		this.settings = null;
+		this.customSettings = null;
+		this.eventQueue = null;
+		this.movieName = null;
+
+
+		return true;
+	} catch (ex2) {
+		return false;
+	}
+};
+
+
+// Public: displayDebugInfo prints out settings and configuration
+// information about this SWFUpload instance.
+// This function (and any references to it) can be deleted when placing
+// SWFUpload in production.
+SWFUpload.prototype.displayDebugInfo = function () {
+	this.debug(
+		[
+			"---SWFUpload Instance Info---\n",
+			"Version: ", SWFUpload.version, "\n",
+			"Movie Name: ", this.movieName, "\n",
+			"Settings:\n",
+			"\t", "upload_url:               ", this.settings.upload_url, "\n",
+			"\t", "flash_url:                ", this.settings.flash_url, "\n",
+			"\t", "use_query_string:         ", this.settings.use_query_string.toString(), "\n",
+			"\t", "requeue_on_error:         ", this.settings.requeue_on_error.toString(), "\n",
+			"\t", "http_success:             ", this.settings.http_success.join(", "), "\n",
+			"\t", "assume_success_timeout:   ", this.settings.assume_success_timeout, "\n",
+			"\t", "file_post_name:           ", this.settings.file_post_name, "\n",
+			"\t", "post_params:              ", this.settings.post_params.toString(), "\n",
+			"\t", "file_types:               ", this.settings.file_types, "\n",
+			"\t", "file_types_description:   ", this.settings.file_types_description, "\n",
+			"\t", "file_size_limit:          ", this.settings.file_size_limit, "\n",
+			"\t", "file_upload_limit:        ", this.settings.file_upload_limit, "\n",
+			"\t", "file_queue_limit:         ", this.settings.file_queue_limit, "\n",
+			"\t", "debug:                    ", this.settings.debug.toString(), "\n",
+
+			"\t", "prevent_swf_caching:      ", this.settings.prevent_swf_caching.toString(), "\n",
+
+			"\t", "button_placeholder_id:    ", this.settings.button_placeholder_id.toString(), "\n",
+			"\t", "button_placeholder:       ", (this.settings.button_placeholder ? "Set" : "Not Set"), "\n",
+			"\t", "button_image_url:         ", this.settings.button_image_url.toString(), "\n",
+			"\t", "button_width:             ", this.settings.button_width.toString(), "\n",
+			"\t", "button_height:            ", this.settings.button_height.toString(), "\n",
+			"\t", "button_text:              ", this.settings.button_text.toString(), "\n",
+			"\t", "button_text_style:        ", this.settings.button_text_style.toString(), "\n",
+			"\t", "button_text_top_padding:  ", this.settings.button_text_top_padding.toString(), "\n",
+			"\t", "button_text_left_padding: ", this.settings.button_text_left_padding.toString(), "\n",
+			"\t", "button_action:            ", this.settings.button_action.toString(), "\n",
+			"\t", "button_disabled:          ", this.settings.button_disabled.toString(), "\n",
+
+			"\t", "custom_settings:          ", this.settings.custom_settings.toString(), "\n",
+			"Event Handlers:\n",
+			"\t", "swfupload_loaded_handler assigned:  ", (typeof this.settings.swfupload_loaded_handler === "function").toString(), "\n",
+			"\t", "file_dialog_start_handler assigned: ", (typeof this.settings.file_dialog_start_handler === "function").toString(), "\n",
+			"\t", "file_queued_handler assigned:       ", (typeof this.settings.file_queued_handler === "function").toString(), "\n",
+			"\t", "file_queue_error_handler assigned:  ", (typeof this.settings.file_queue_error_handler === "function").toString(), "\n",
+			"\t", "upload_start_handler assigned:      ", (typeof this.settings.upload_start_handler === "function").toString(), "\n",
+			"\t", "upload_progress_handler assigned:   ", (typeof this.settings.upload_progress_handler === "function").toString(), "\n",
+			"\t", "upload_error_handler assigned:      ", (typeof this.settings.upload_error_handler === "function").toString(), "\n",
+			"\t", "upload_success_handler assigned:    ", (typeof this.settings.upload_success_handler === "function").toString(), "\n",
+			"\t", "upload_complete_handler assigned:   ", (typeof this.settings.upload_complete_handler === "function").toString(), "\n",
+			"\t", "debug_handler assigned:             ", (typeof this.settings.debug_handler === "function").toString(), "\n"
+		].join("")
+	);
+};
+
+/* Note: addSetting and getSetting are no longer used by SWFUpload but are included
+	the maintain v2 API compatibility
+*/
+// Public: (Deprecated) addSetting adds a setting value. If the value given is undefined or null then the default_value is used.
+SWFUpload.prototype.addSetting = function (name, value, default_value) {
+    if (value == undefined) {
+        return (this.settings[name] = default_value);
+    } else {
+        return (this.settings[name] = value);
+	}
+};
+
+// Public: (Deprecated) getSetting gets a setting. Returns an empty string if the setting was not found.
+SWFUpload.prototype.getSetting = function (name) {
+    if (this.settings[name] != undefined) {
+        return this.settings[name];
+	}
+
+    return "";
+};
+
+
+
+// Private: callFlash handles function calls made to the Flash element.
+// Calls are made with a setTimeout for some functions to work around
+// bugs in the ExternalInterface library.
+SWFUpload.prototype.callFlash = function (functionName, argumentArray) {
+	argumentArray = argumentArray || [];
+
+	var movieElement = this.getMovieElement();
+	var returnValue, returnString;
+
+	// Flash's method if calling ExternalInterface methods (code adapted from MooTools).
+	try {
+		returnString = movieElement.CallFunction('<invoke name="' + functionName + '" returntype="javascript">' + __flash__argumentsToXML(argumentArray, 0) + '</invoke>');
+		returnValue = eval(returnString);
+	} catch (ex) {
+		throw "Call to " + functionName + " failed";
+	}
+
+	// Unescape file post param values
+	if (returnValue != undefined && typeof returnValue.post === "object") {
+		returnValue = this.unescapeFilePostParams(returnValue);
+	}
+
+	return returnValue;
+};
+
+/* *****************************
+	-- Flash control methods --
+	Your UI should use these
+	to operate SWFUpload
+   ***************************** */
+
+// WARNING: this function does not work in Flash Player 10
+// Public: selectFile causes a File Selection Dialog window to appear.  This
+// dialog only allows 1 file to be selected.
+SWFUpload.prototype.selectFile = function () {
+	this.callFlash("SelectFile");
+};
+
+// WARNING: this function does not work in Flash Player 10
+// Public: selectFiles causes a File Selection Dialog window to appear/ This
+// dialog allows the user to select any number of files
+// Flash Bug Warning: Flash limits the number of selectable files based on the combined length of the file names.
+// If the selection name length is too long the dialog will fail in an unpredictable manner.  There is no work-around
+// for this bug.
+SWFUpload.prototype.selectFiles = function () {
+	this.callFlash("SelectFiles");
+};
+
+
+// Public: startUpload starts uploading the first file in the queue unless
+// the optional parameter 'fileID' specifies the ID
+SWFUpload.prototype.startUpload = function (fileID) {
+	this.callFlash("StartUpload", [fileID]);
+};
+
+// Public: cancelUpload cancels any queued file.  The fileID parameter may be the file ID or index.
+// If you do not specify a fileID the current uploading file or first file in the queue is cancelled.
+// If you do not want the uploadError event to trigger you can specify false for the triggerErrorEvent parameter.
+SWFUpload.prototype.cancelUpload = function (fileID, triggerErrorEvent) {
+	if (triggerErrorEvent !== false) {
+		triggerErrorEvent = true;
+	}
+	this.callFlash("CancelUpload", [fileID, triggerErrorEvent]);
+};
+
+// Public: stopUpload stops the current upload and requeues the file at the beginning of the queue.
+// If nothing is currently uploading then nothing happens.
+SWFUpload.prototype.stopUpload = function () {
+	this.callFlash("StopUpload");
+};
+
+/* ************************
+ * Settings methods
+ *   These methods change the SWFUpload settings.
+ *   SWFUpload settings should not be changed directly on the settings object
+ *   since many of the settings need to be passed to Flash in order to take
+ *   effect.
+ * *********************** */
+
+// Public: getStats gets the file statistics object.
+SWFUpload.prototype.getStats = function () {
+	return this.callFlash("GetStats");
+};
+
+// Public: setStats changes the SWFUpload statistics.  You shouldn't need to
+// change the statistics but you can.  Changing the statistics does not
+// affect SWFUpload accept for the successful_uploads count which is used
+// by the upload_limit setting to determine how many files the user may upload.
+SWFUpload.prototype.setStats = function (statsObject) {
+	this.callFlash("SetStats", [statsObject]);
+};
+
+// Public: getFile retrieves a File object by ID or Index.  If the file is
+// not found then 'null' is returned.
+SWFUpload.prototype.getFile = function (fileID) {
+	if (typeof(fileID) === "number") {
+		return this.callFlash("GetFileByIndex", [fileID]);
+	} else {
+		return this.callFlash("GetFile", [fileID]);
+	}
+};
+
+// Public: addFileParam sets a name/value pair that will be posted with the
+// file specified by the Files ID.  If the name already exists then the
+// exiting value will be overwritten.
+SWFUpload.prototype.addFileParam = function (fileID, name, value) {
+	return this.callFlash("AddFileParam", [fileID, name, value]);
+};
+
+// Public: removeFileParam removes a previously set (by addFileParam) name/value
+// pair from the specified file.
+SWFUpload.prototype.removeFileParam = function (fileID, name) {
+	this.callFlash("RemoveFileParam", [fileID, name]);
+};
+
+// Public: setUploadUrl changes the upload_url setting.
+SWFUpload.prototype.setUploadURL = function (url) {
+	this.settings.upload_url = url.toString();
+	this.callFlash("SetUploadURL", [url]);
+};
+
+// Public: setPostParams changes the post_params setting
+SWFUpload.prototype.setPostParams = function (paramsObject) {
+	this.settings.post_params = paramsObject;
+	this.callFlash("SetPostParams", [paramsObject]);
+};
+
+// Public: addPostParam adds post name/value pair.  Each name can have only one value.
+SWFUpload.prototype.addPostParam = function (name, value) {
+	this.settings.post_params[name] = value;
+	this.callFlash("SetPostParams", [this.settings.post_params]);
+};
+
+// Public: removePostParam deletes post name/value pair.
+SWFUpload.prototype.removePostParam = function (name) {
+	delete this.settings.post_params[name];
+	this.callFlash("SetPostParams", [this.settings.post_params]);
+};
+
+// Public: setFileTypes changes the file_types setting and the file_types_description setting
+SWFUpload.prototype.setFileTypes = function (types, description) {
+	this.settings.file_types = types;
+	this.settings.file_types_description = description;
+	this.callFlash("SetFileTypes", [types, description]);
+};
+
+// Public: setFileSizeLimit changes the file_size_limit setting
+SWFUpload.prototype.setFileSizeLimit = function (fileSizeLimit) {
+	this.settings.file_size_limit = fileSizeLimit;
+	this.callFlash("SetFileSizeLimit", [fileSizeLimit]);
+};
+
+// Public: setFileUploadLimit changes the file_upload_limit setting
+SWFUpload.prototype.setFileUploadLimit = function (fileUploadLimit) {
+	this.settings.file_upload_limit = fileUploadLimit;
+	this.callFlash("SetFileUploadLimit", [fileUploadLimit]);
+};
+
+// Public: setFileQueueLimit changes the file_queue_limit setting
+SWFUpload.prototype.setFileQueueLimit = function (fileQueueLimit) {
+	this.settings.file_queue_limit = fileQueueLimit;
+	this.callFlash("SetFileQueueLimit", [fileQueueLimit]);
+};
+
+// Public: setFilePostName changes the file_post_name setting
+SWFUpload.prototype.setFilePostName = function (filePostName) {
+	this.settings.file_post_name = filePostName;
+	this.callFlash("SetFilePostName", [filePostName]);
+};
+
+// Public: setUseQueryString changes the use_query_string setting
+SWFUpload.prototype.setUseQueryString = function (useQueryString) {
+	this.settings.use_query_string = useQueryString;
+	this.callFlash("SetUseQueryString", [useQueryString]);
+};
+
+// Public: setRequeueOnError changes the requeue_on_error setting
+SWFUpload.prototype.setRequeueOnError = function (requeueOnError) {
+	this.settings.requeue_on_error = requeueOnError;
+	this.callFlash("SetRequeueOnError", [requeueOnError]);
+};
+
+// Public: setHTTPSuccess changes the http_success setting
+SWFUpload.prototype.setHTTPSuccess = function (http_status_codes) {
+	if (typeof http_status_codes === "string") {
+		http_status_codes = http_status_codes.replace(" ", "").split(",");
+	}
+
+	this.settings.http_success = http_status_codes;
+	this.callFlash("SetHTTPSuccess", [http_status_codes]);
+};
+
+// Public: setHTTPSuccess changes the http_success setting
+SWFUpload.prototype.setAssumeSuccessTimeout = function (timeout_seconds) {
+	this.settings.assume_success_timeout = timeout_seconds;
+	this.callFlash("SetAssumeSuccessTimeout", [timeout_seconds]);
+};
+
+// Public: setDebugEnabled changes the debug_enabled setting
+SWFUpload.prototype.setDebugEnabled = function (debugEnabled) {
+	this.settings.debug_enabled = debugEnabled;
+	this.callFlash("SetDebugEnabled", [debugEnabled]);
+};
+
+// Public: setButtonImageURL loads a button image sprite
+SWFUpload.prototype.setButtonImageURL = function (buttonImageURL) {
+	if (buttonImageURL == undefined) {
+		buttonImageURL = "";
+	}
+
+	this.settings.button_image_url = buttonImageURL;
+	this.callFlash("SetButtonImageURL", [buttonImageURL]);
+};
+
+// Public: setButtonDimensions resizes the Flash Movie and button
+SWFUpload.prototype.setButtonDimensions = function (width, height) {
+	this.settings.button_width = width;
+	this.settings.button_height = height;
+
+	var movie = this.getMovieElement();
+	if (movie != undefined) {
+		movie.style.width = width + "px";
+		movie.style.height = height + "px";
+	}
+
+	this.callFlash("SetButtonDimensions", [width, height]);
+};
+// Public: setButtonText Changes the text overlaid on the button
+SWFUpload.prototype.setButtonText = function (html) {
+	this.settings.button_text = html;
+	this.callFlash("SetButtonText", [html]);
+};
+// Public: setButtonTextPadding changes the top and left padding of the text overlay
+SWFUpload.prototype.setButtonTextPadding = function (left, top) {
+	this.settings.button_text_top_padding = top;
+	this.settings.button_text_left_padding = left;
+	this.callFlash("SetButtonTextPadding", [left, top]);
+};
+
+// Public: setButtonTextStyle changes the CSS used to style the HTML/Text overlaid on the button
+SWFUpload.prototype.setButtonTextStyle = function (css) {
+	this.settings.button_text_style = css;
+	this.callFlash("SetButtonTextStyle", [css]);
+};
+// Public: setButtonDisabled disables/enables the button
+SWFUpload.prototype.setButtonDisabled = function (isDisabled) {
+	this.settings.button_disabled = isDisabled;
+	this.callFlash("SetButtonDisabled", [isDisabled]);
+};
+// Public: setButtonAction sets the action that occurs when the button is clicked
+SWFUpload.prototype.setButtonAction = function (buttonAction) {
+	this.settings.button_action = buttonAction;
+	this.callFlash("SetButtonAction", [buttonAction]);
+};
+
+// Public: setButtonCursor changes the mouse cursor displayed when hovering over the button
+SWFUpload.prototype.setButtonCursor = function (cursor) {
+	this.settings.button_cursor = cursor;
+	this.callFlash("SetButtonCursor", [cursor]);
+};
+
+/* *******************************
+	Flash Event Interfaces
+	These functions are used by Flash to trigger the various
+	events.
+
+	All these functions a Private.
+
+	Because the ExternalInterface library is buggy the event calls
+	are added to a queue and the queue then executed by a setTimeout.
+	This ensures that events are executed in a determinate order and that
+	the ExternalInterface bugs are avoided.
+******************************* */
+
+SWFUpload.prototype.queueEvent = function (handlerName, argumentArray) {
+	// Warning: Don't call this.debug inside here or you'll create an infinite loop
+
+	if (argumentArray == undefined) {
+		argumentArray = [];
+	} else if (!(argumentArray instanceof Array)) {
+		argumentArray = [argumentArray];
+	}
+
+	var self = this;
+	if (typeof this.settings[handlerName] === "function") {
+		// Queue the event
+		this.eventQueue.push(function () {
+			this.settings[handlerName].apply(this, argumentArray);
+		});
+
+		// Execute the next queued event
+		setTimeout(function () {
+			self.executeNextEvent();
+		}, 0);
+
+	} else if (this.settings[handlerName] !== null) {
+		throw "Event handler " + handlerName + " is unknown or is not a function";
+	}
+};
+
+// Private: Causes the next event in the queue to be executed.  Since events are queued using a setTimeout
+// we must queue them in order to garentee that they are executed in order.
+SWFUpload.prototype.executeNextEvent = function () {
+	// Warning: Don't call this.debug inside here or you'll create an infinite loop
+
+	var  f = this.eventQueue ? this.eventQueue.shift() : null;
+	if (typeof(f) === "function") {
+		f.apply(this);
+	}
+};
+
+// Private: unescapeFileParams is part of a workaround for a flash bug where objects passed through ExternalInterface cannot have
+// properties that contain characters that are not valid for JavaScript identifiers. To work around this
+// the Flash Component escapes the parameter names and we must unescape again before passing them along.
+SWFUpload.prototype.unescapeFilePostParams = function (file) {
+	var reg = /[$]([0-9a-f]{4})/i;
+	var unescapedPost = {};
+	var uk;
+
+	if (file != undefined) {
+		for (var k in file.post) {
+			if (file.post.hasOwnProperty(k)) {
+				uk = k;
+				var match;
+				while ((match = reg.exec(uk)) !== null) {
+					uk = uk.replace(match[0], String.fromCharCode(parseInt("0x" + match[1], 16)));
+				}
+				unescapedPost[uk] = file.post[k];
+			}
+		}
+
+		file.post = unescapedPost;
+	}
+
+	return file;
+};
+
+// Private: Called by Flash to see if JS can call in to Flash (test if External Interface is working)
+SWFUpload.prototype.testExternalInterface = function () {
+	try {
+		return this.callFlash("TestExternalInterface");
+	} catch (ex) {
+		return false;
+	}
+};
+
+// Private: This event is called by Flash when it has finished loading. Don't modify this.
+// Use the swfupload_loaded_handler event setting to execute custom code when SWFUpload has loaded.
+SWFUpload.prototype.flashReady = function () {
+	// Check that the movie element is loaded correctly with its ExternalInterface methods defined
+	var movieElement = this.getMovieElement();
+
+	if (!movieElement) {
+		this.debug("Flash called back ready but the flash movie can't be found.");
+		return;
+	}
+
+	this.cleanUp(movieElement);
+
+	this.queueEvent("swfupload_loaded_handler");
+};
+
+// Private: removes Flash added fuctions to the DOM node to prevent memory leaks in IE.
+// This function is called by Flash each time the ExternalInterface functions are created.
+SWFUpload.prototype.cleanUp = function (movieElement) {
+	// Pro-actively unhook all the Flash functions
+	try {
+		if (this.movieElement && typeof(movieElement.CallFunction) === "unknown") { // We only want to do this in IE
+			this.debug("Removing Flash functions hooks (this should only run in IE and should prevent memory leaks)");
+			for (var key in movieElement) {
+				try {
+					if (typeof(movieElement[key]) === "function") {
+						movieElement[key] = null;
+					}
+				} catch (ex) {
+				}
+			}
+		}
+	} catch (ex1) {
+
+	}
+
+	// Fix Flashes own cleanup code so if the SWFMovie was removed from the page
+	// it doesn't display errors.
+	window["__flash__removeCallback"] = function (instance, name) {
+		try {
+			if (instance) {
+				instance[name] = null;
+			}
+		} catch (flashEx) {
+
+		}
+	};
+
+};
+
+
+/* This is a chance to do something before the browse window opens */
+SWFUpload.prototype.fileDialogStart = function () {
+	this.queueEvent("file_dialog_start_handler");
+};
+
+
+/* Called when a file is successfully added to the queue. */
+SWFUpload.prototype.fileQueued = function (file) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("file_queued_handler", file);
+};
+
+
+/* Handle errors that occur when an attempt to queue a file fails. */
+SWFUpload.prototype.fileQueueError = function (file, errorCode, message) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("file_queue_error_handler", [file, errorCode, message]);
+};
+
+/* Called after the file dialog has closed and the selected files have been queued.
+	You could call startUpload here if you want the queued files to begin uploading immediately. */
+SWFUpload.prototype.fileDialogComplete = function (numFilesSelected, numFilesQueued, numFilesInQueue) {
+	this.queueEvent("file_dialog_complete_handler", [numFilesSelected, numFilesQueued, numFilesInQueue]);
+};
+
+SWFUpload.prototype.uploadStart = function (file) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("return_upload_start_handler", file);
+};
+
+SWFUpload.prototype.returnUploadStart = function (file) {
+	var returnValue;
+	if (typeof this.settings.upload_start_handler === "function") {
+		file = this.unescapeFilePostParams(file);
+		returnValue = this.settings.upload_start_handler.call(this, file);
+	} else if (this.settings.upload_start_handler != undefined) {
+		throw "upload_start_handler must be a function";
+	}
+
+	// Convert undefined to true so if nothing is returned from the upload_start_handler it is
+	// interpretted as 'true'.
+	if (returnValue === undefined) {
+		returnValue = true;
+	}
+
+	returnValue = !!returnValue;
+
+	this.callFlash("ReturnUploadStart", [returnValue]);
+};
+
+
+
+SWFUpload.prototype.uploadProgress = function (file, bytesComplete, bytesTotal) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("upload_progress_handler", [file, bytesComplete, bytesTotal]);
+};
+
+SWFUpload.prototype.uploadError = function (file, errorCode, message) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("upload_error_handler", [file, errorCode, message]);
+};
+
+SWFUpload.prototype.uploadSuccess = function (file, serverData, responseReceived) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("upload_success_handler", [file, serverData, responseReceived]);
+};
+
+SWFUpload.prototype.uploadComplete = function (file) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("upload_complete_handler", file);
+};
+
+/* Called by SWFUpload JavaScript and Flash functions when debug is enabled. By default it writes messages to the
+   internal debug console.  You can override this event and have messages written where you want. */
+SWFUpload.prototype.debug = function (message) {
+	this.queueEvent("debug_handler", message);
+};
+
+
+/* **********************************
+	Debug Console
+	The debug console is a self contained, in page location
+	for debug message to be sent.  The Debug Console adds
+	itself to the body if necessary.
+
+	The console is automatically scrolled as messages appear.
+
+	If you are using your own debug handler or when you deploy to production and
+	have debug disabled you can remove these functions to reduce the file size
+	and complexity.
+********************************** */
+
+// Private: debugMessage is the default debug_handler.  If you want to print debug messages
+// call the debug() function.  When overriding the function your own function should
+// check to see if the debug setting is true before outputting debug information.
+SWFUpload.prototype.debugMessage = function (message) {
+	if (this.settings.debug) {
+		var exceptionMessage, exceptionValues = [];
+
+		// Check for an exception object and print it nicely
+		if (typeof message === "object" && typeof message.name === "string" && typeof message.message === "string") {
+			for (var key in message) {
+				if (message.hasOwnProperty(key)) {
+					exceptionValues.push(key + ": " + message[key]);
+				}
+			}
+			exceptionMessage = exceptionValues.join("\n") || "";
+			exceptionValues = exceptionMessage.split("\n");
+			exceptionMessage = "EXCEPTION: " + exceptionValues.join("\nEXCEPTION: ");
+			SWFUpload.Console.writeLine(exceptionMessage);
+		} else {
+			SWFUpload.Console.writeLine(message);
+		}
+	}
+};
+
+SWFUpload.Console = {};
+SWFUpload.Console.writeLine = function (message) {
+	var console, documentForm;
+
+	try {
+		console = document.getElementById("SWFUpload_Console");
+
+		if (!console) {
+			documentForm = document.createElement("form");
+			document.getElementsByTagName("body")[0].appendChild(documentForm);
+
+			console = document.createElement("textarea");
+			console.id = "SWFUpload_Console";
+			console.style.fontFamily = "monospace";
+			console.setAttribute("wrap", "off");
+			console.wrap = "off";
+			console.style.overflow = "auto";
+			console.style.width = "700px";
+			console.style.height = "350px";
+			console.style.margin = "5px";
+			documentForm.appendChild(console);
+		}
+
+		console.value += message + "\n";
+
+		console.scrollTop = console.scrollHeight - console.clientHeight;
+	} catch (ex) {
+		alert("Exception: " + ex.name + " Message: " + ex.message);
+	}
+};
+
+})();
+
+(function() {
+/*
+	Queue Plug-in
+
+	Features:
+		*Adds a cancelQueue() method for cancelling the entire queue.
+		*All queued files are uploaded when startUpload() is called.
+		*If false is returned from uploadComplete then the queue upload is stopped.
+		 If false is not returned (strict comparison) then the queue upload is continued.
+		*Adds a QueueComplete event that is fired when all the queued files have finished uploading.
+		 Set the event handler with the queue_complete_handler setting.
+
+	*/
+
+if (typeof(SWFUpload) === "function") {
+	SWFUpload.queue = {};
+
+	SWFUpload.prototype.initSettings = (function (oldInitSettings) {
+		return function () {
+			if (typeof(oldInitSettings) === "function") {
+				oldInitSettings.call(this);
+			}
+
+			this.queueSettings = {};
+
+			this.queueSettings.queue_cancelled_flag = false;
+			this.queueSettings.queue_upload_count = 0;
+
+			this.queueSettings.user_upload_complete_handler = this.settings.upload_complete_handler;
+			this.queueSettings.user_upload_start_handler = this.settings.upload_start_handler;
+			this.settings.upload_complete_handler = SWFUpload.queue.uploadCompleteHandler;
+			this.settings.upload_start_handler = SWFUpload.queue.uploadStartHandler;
+
+			this.settings.queue_complete_handler = this.settings.queue_complete_handler || null;
+		};
+	})(SWFUpload.prototype.initSettings);
+
+	SWFUpload.prototype.startUpload = function (fileID) {
+		this.queueSettings.queue_cancelled_flag = false;
+		this.callFlash("StartUpload", [fileID]);
+	};
+
+	SWFUpload.prototype.cancelQueue = function () {
+		this.queueSettings.queue_cancelled_flag = true;
+		this.stopUpload();
+
+		var stats = this.getStats();
+		while (stats.files_queued > 0) {
+			this.cancelUpload();
+			stats = this.getStats();
+		}
+	};
+
+	SWFUpload.queue.uploadStartHandler = function (file) {
+		var returnValue;
+		if (typeof(this.queueSettings.user_upload_start_handler) === "function") {
+			returnValue = this.queueSettings.user_upload_start_handler.call(this, file);
+		}
+
+		// To prevent upload a real "FALSE" value must be returned, otherwise default to a real "TRUE" value.
+		returnValue = (returnValue === false) ? false : true;
+
+		this.queueSettings.queue_cancelled_flag = !returnValue;
+
+		return returnValue;
+	};
+
+	SWFUpload.queue.uploadCompleteHandler = function (file) {
+		var user_upload_complete_handler = this.queueSettings.user_upload_complete_handler;
+		var continueUpload;
+
+		if (file.filestatus === SWFUpload.FILE_STATUS.COMPLETE) {
+			this.queueSettings.queue_upload_count++;
+		}
+
+		if (typeof(user_upload_complete_handler) === "function") {
+			continueUpload = (user_upload_complete_handler.call(this, file) === false) ? false : true;
+		} else if (file.filestatus === SWFUpload.FILE_STATUS.QUEUED) {
+			// If the file was stopped and re-queued don't restart the upload
+			continueUpload = false;
+		} else {
+			continueUpload = true;
+		}
+
+		if (continueUpload) {
+			var stats = this.getStats();
+			if (stats.files_queued > 0 && this.queueSettings.queue_cancelled_flag === false) {
+				this.startUpload();
+			} else if (this.queueSettings.queue_cancelled_flag === false) {
+				this.queueEvent("queue_complete_handler", [this.queueSettings.queue_upload_count]);
+				this.queueSettings.queue_upload_count = 0;
+			} else {
+				this.queueSettings.queue_cancelled_flag = false;
+				this.queueSettings.queue_upload_count = 0;
+			}
+		}
+	};
+}
+
+})();
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('pagebreak', function(K) {
+	var self = this;
+	var name = 'pagebreak';
+	var pagebreakHtml = K.undef(self.pagebreakHtml, '<hr style="page-break-after: always;" class="ke-pagebreak" />');
+
+	self.clickToolbar(name, function() {
+		var cmd = self.cmd, range = cmd.range;
+		self.focus();
+		var tail = self.newlineTag == 'br' || K.WEBKIT ? '' : '<span id="__kindeditor_tail_tag__"></span>';
+		self.insertHtml(pagebreakHtml + tail);
+		if (tail !== '') {
+			var p = K('#__kindeditor_tail_tag__', self.edit.doc);
+			range.selectNodeContents(p[0]);
+			p.removeAttr('id');
+			cmd.select();
+		}
+	});
+});
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('plainpaste', function(K) {
+	var self = this, name = 'plainpaste';
+	self.clickToolbar(name, function() {
+		var lang = self.lang(name + '.'),
+			html = '<div style="padding:10px 20px;">' +
+				'<div style="margin-bottom:10px;">' + lang.comment + '</div>' +
+				'<textarea class="ke-textarea" style="width:408px;height:260px;"></textarea>' +
+				'</div>',
+			dialog = self.createDialog({
+				name : name,
+				width : 450,
+				title : self.lang(name),
+				body : html,
+				yesBtn : {
+					name : self.lang('yes'),
+					click : function(e) {
+						var html = textarea.val();
+						html = K.escape(html);
+						html = html.replace(/ {2}/g, ' &nbsp;');
+						if (self.newlineTag == 'p') {
+							html = html.replace(/^/, '<p>').replace(/$/, '</p>').replace(/\n/g, '</p><p>');
+						} else {
+							html = html.replace(/\n/g, '<br />$&');
+						}
+						self.insertHtml(html).hideDialog().focus();
+					}
+				}
+			}),
+			textarea = K('textarea', dialog.div);
+		textarea[0].focus();
+	});
+});
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('preview', function(K) {
+	var self = this, name = 'preview', undefined;
+	self.clickToolbar(name, function() {
+		var lang = self.lang(name + '.'),
+			html = '<div style="padding:10px 20px;">' +
+				'<iframe class="ke-textarea" frameborder="0" style="width:708px;height:400px;"></iframe>' +
+				'</div>',
+			dialog = self.createDialog({
+				name : name,
+				width : 750,
+				title : self.lang(name),
+				body : html
+			}),
+			iframe = K('iframe', dialog.div),
+			doc = K.iframeDoc(iframe);
+		doc.open();
+		doc.write(self.fullHtml());
+		doc.close();
+		K(doc.body).css('background-color', '#FFF');
+		iframe[0].contentWindow.focus();
+	});
+});
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('quickformat', function(K) {
+	var self = this, name = 'quickformat',
+		blockMap = K.toMap('blockquote,center,div,h1,h2,h3,h4,h5,h6,p');
+	function getFirstChild(knode) {
+		var child = knode.first();
+		while (child && child.first()) {
+			child = child.first();
+		}
+		return child;
+	}
+	self.clickToolbar(name, function() {
+		self.focus();
+		var doc = self.edit.doc,
+			range = self.cmd.range,
+			child = K(doc.body).first(), next,
+			nodeList = [], subList = [],
+			bookmark = range.createBookmark(true);
+		while(child) {
+			next = child.next();
+			var firstChild = getFirstChild(child);
+			if (!firstChild || firstChild.name != 'img') {
+				if (blockMap[child.name]) {
+					child.html(child.html().replace(/^(\s|&nbsp;|　)+/ig, ''));
+					child.css('text-indent', '2em');
+				} else {
+					subList.push(child);
+				}
+				if (!next || (blockMap[next.name] || blockMap[child.name] && !blockMap[next.name])) {
+					if (subList.length > 0) {
+						nodeList.push(subList);
+					}
+					subList = [];
+				}
+			}
+			child = next;
+		}
+		K.each(nodeList, function(i, subList) {
+			var wrapper = K('<p style="text-indent:2em;"></p>', doc);
+			subList[0].before(wrapper);
+			K.each(subList, function(i, knode) {
+				wrapper.append(knode);
+			});
+		});
+		range.moveToBookmark(bookmark);
+		self.addBookmark();
+	});
+});
+
+/**
+--------------------------
+abcd<br />
+1234<br />
+
+to
+
+<p style="text-indent:2em;">
+	abcd<br />
+	1234<br />
+</p>
+
+--------------------------
+
+&nbsp; abcd<img>1233
+<p>1234</p>
+
+to
+
+<p style="text-indent:2em;">abcd<img>1233</p>
+<p style="text-indent:2em;">1234</p>
+
+--------------------------
+*//*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('table', function(K) {
+	var self = this, name = 'table', lang = self.lang(name + '.'), zeroborder = 'ke-zeroborder';
+	// 设置颜色
+	function _setColor(box, color) {
+		color = color.toUpperCase();
+		box.css('background-color', color);
+		box.css('color', color === '#000000' ? '#FFFFFF' : '#000000');
+		box.html(color);
+	}
+	// 初始化取色器
+	var pickerList = [];
+	function _initColorPicker(dialogDiv, colorBox) {
+		colorBox.bind('click,mousedown', function(e){
+			e.stopPropagation();
+		});
+		function removePicker() {
+			K.each(pickerList, function() {
+				this.remove();
+			});
+			pickerList = [];
+			K(document).unbind('click,mousedown', removePicker);
+			dialogDiv.unbind('click,mousedown', removePicker);
+		}
+		colorBox.click(function(e) {
+			removePicker();
+			var box = K(this),
+				pos = box.pos();
+			var picker = K.colorpicker({
+				x : pos.x,
+				y : pos.y + box.height(),
+				z : 811214,
+				selectedColor : K(this).html(),
+				colors : self.colorTable,
+				noColor : self.lang('noColor'),
+				shadowMode : self.shadowMode,
+				click : function(color) {
+					_setColor(box, color);
+					removePicker();
+				}
+			});
+			pickerList.push(picker);
+			K(document).bind('click,mousedown', removePicker);
+			dialogDiv.bind('click,mousedown', removePicker);
+		});
+	}
+	// 取得下一行cell的index
+	function _getCellIndex(table, row, cell) {
+		var rowSpanCount = 0;
+		for (var i = 0, len = row.cells.length; i < len; i++) {
+			if (row.cells[i] == cell) {
+				break;
+			}
+			rowSpanCount += row.cells[i].rowSpan - 1;
+		}
+		return cell.cellIndex - rowSpanCount;
+	}
+	self.plugin.table = {
+		//insert or modify table
+		prop : function(isInsert) {
+			var html = [
+				'<div style="padding:20px;">',
+				//rows, cols
+				'<div class="ke-dialog-row">',
+				'<label for="keRows" style="width:90px;">' + lang.cells + '</label>',
+				lang.rows + ' <input type="text" id="keRows" class="ke-input-text ke-input-number" name="rows" value="" maxlength="4" /> &nbsp; ',
+				lang.cols + ' <input type="text" class="ke-input-text ke-input-number" name="cols" value="" maxlength="4" />',
+				'</div>',
+				//width, height
+				'<div class="ke-dialog-row">',
+				'<label for="keWidth" style="width:90px;">' + lang.size + '</label>',
+				lang.width + ' <input type="text" id="keWidth" class="ke-input-text ke-input-number" name="width" value="" maxlength="4" /> &nbsp; ',
+				'<select name="widthType">',
+				'<option value="%">' + lang.percent + '</option>',
+				'<option value="px">' + lang.px + '</option>',
+				'</select> &nbsp; ',
+				lang.height + ' <input type="text" class="ke-input-text ke-input-number" name="height" value="" maxlength="4" /> &nbsp; ',
+				'<select name="heightType">',
+				'<option value="%">' + lang.percent + '</option>',
+				'<option value="px">' + lang.px + '</option>',
+				'</select>',
+				'</div>',
+				//space, padding
+				'<div class="ke-dialog-row">',
+				'<label for="kePadding" style="width:90px;">' + lang.space + '</label>',
+				lang.padding + ' <input type="text" id="kePadding" class="ke-input-text ke-input-number" name="padding" value="" maxlength="4" /> &nbsp; ',
+				lang.spacing + ' <input type="text" class="ke-input-text ke-input-number" name="spacing" value="" maxlength="4" />',
+				'</div>',
+				//align
+				'<div class="ke-dialog-row">',
+				'<label for="keAlign" style="width:90px;">' + lang.align + '</label>',
+				'<select id="keAlign" name="align">',
+				'<option value="">' + lang.alignDefault + '</option>',
+				'<option value="left">' + lang.alignLeft + '</option>',
+				'<option value="center">' + lang.alignCenter + '</option>',
+				'<option value="right">' + lang.alignRight + '</option>',
+				'</select>',
+				'</div>',
+				//border
+				'<div class="ke-dialog-row">',
+				'<label for="keBorder" style="width:90px;">' + lang.border + '</label>',
+				lang.borderWidth + ' <input type="text" id="keBorder" class="ke-input-text ke-input-number" name="border" value="" maxlength="4" /> &nbsp; ',
+				lang.borderColor + ' <span class="ke-inline-block ke-input-color"></span>',
+				'</div>',
+				//background color
+				'<div class="ke-dialog-row">',
+				'<label for="keBgColor" style="width:90px;">' + lang.backgroundColor + '</label>',
+				'<span class="ke-inline-block ke-input-color"></span>',
+				'</div>',
+				'</div>'
+			].join('');
+			var bookmark = self.cmd.range.createBookmark();
+			var dialog = self.createDialog({
+				name : name,
+				width : 500,
+				title : self.lang(name),
+				body : html,
+				beforeRemove : function() {
+					colorBox.unbind();
+				},
+				yesBtn : {
+					name : self.lang('yes'),
+					click : function(e) {
+						var rows = rowsBox.val(),
+							cols = colsBox.val(),
+							width = widthBox.val(),
+							height = heightBox.val(),
+							widthType = widthTypeBox.val(),
+							heightType = heightTypeBox.val(),
+							padding = paddingBox.val(),
+							spacing = spacingBox.val(),
+							align = alignBox.val(),
+							border = borderBox.val(),
+							borderColor = K(colorBox[0]).html() || '',
+							bgColor = K(colorBox[1]).html() || '';
+						if (rows == 0 || !/^\d+$/.test(rows)) {
+							alert(self.lang('invalidRows'));
+							rowsBox[0].focus();
+							return;
+						}
+						if (cols == 0 || !/^\d+$/.test(cols)) {
+							alert(self.lang('invalidRows'));
+							colsBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(width)) {
+							alert(self.lang('invalidWidth'));
+							widthBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(height)) {
+							alert(self.lang('invalidHeight'));
+							heightBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(padding)) {
+							alert(self.lang('invalidPadding'));
+							paddingBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(spacing)) {
+							alert(self.lang('invalidSpacing'));
+							spacingBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(border)) {
+							alert(self.lang('invalidBorder'));
+							borderBox[0].focus();
+							return;
+						}
+						//modify table
+						if (table) {
+							if (width !== '') {
+								table.width(width + widthType);
+							} else {
+								table.css('width', '');
+							}
+							if (table[0].width !== undefined) {
+								table.removeAttr('width');
+							}
+							if (height !== '') {
+								table.height(height + heightType);
+							} else {
+								table.css('height', '');
+							}
+							if (table[0].height !== undefined) {
+								table.removeAttr('height');
+							}
+							table.css('background-color', bgColor);
+							if (table[0].bgColor !== undefined) {
+								table.removeAttr('bgColor');
+							}
+							if (padding !== '') {
+								table[0].cellPadding = padding;
+							} else {
+								table.removeAttr('cellPadding');
+							}
+							if (spacing !== '') {
+								table[0].cellSpacing = spacing;
+							} else {
+								table.removeAttr('cellSpacing');
+							}
+							if (align !== '') {
+								table[0].align = align;
+							} else {
+								table.removeAttr('align');
+							}
+							if (border !== '') {
+								table.attr('border', border);
+							} else {
+								table.removeAttr('border');
+							}
+							if (border === '' || border === '0') {
+								table.addClass(zeroborder);
+							} else {
+								table.removeClass(zeroborder);
+							}
+							if (borderColor !== '') {
+								table.attr('borderColor', borderColor);
+							} else {
+								table.removeAttr('borderColor');
+							}
+							self.hideDialog().focus();
+							self.cmd.range.moveToBookmark(bookmark);
+							self.cmd.select();
+							self.addBookmark();
+							return;
+						}
+						//insert new table
+						var style = '';
+						if (width !== '') {
+							style += 'width:' + width + widthType + ';';
+						}
+						if (height !== '') {
+							style += 'height:' + height + heightType + ';';
+						}
+						if (bgColor !== '') {
+							style += 'background-color:' + bgColor + ';';
+						}
+						var html = '<table';
+						if (style !== '') {
+							html += ' style="' + style + '"';
+						}
+						if (padding !== '') {
+							html += ' cellpadding="' + padding + '"';
+						}
+						if (spacing !== '') {
+							html += ' cellspacing="' + spacing + '"';
+						}
+						if (align !== '') {
+							html += ' align="' + align + '"';
+						}
+						if (border !== '') {
+							html += ' border="' + border + '"';
+						}
+						if (border === '' || border === '0') {
+							html += ' class="' + zeroborder + '"';
+						}
+						if (borderColor !== '') {
+							html += ' bordercolor="' + borderColor + '"';
+						}
+						html += '>';
+						for (var i = 0; i < rows; i++) {
+							html += '<tr>';
+							for (var j = 0; j < cols; j++) {
+								html += '<td>' + (K.IE ? '&nbsp;' : '<br />') + '</td>';
+							}
+							html += '</tr>';
+						}
+						html += '</table>';
+						if (!K.IE) {
+							html += '<br />';
+						}
+						self.insertHtml(html);
+						self.select().hideDialog().focus();
+						self.addBookmark();
+					}
+				}
+			}),
+			div = dialog.div,
+			rowsBox = K('[name="rows"]', div).val(3),
+			colsBox = K('[name="cols"]', div).val(2),
+			widthBox = K('[name="width"]', div).val(100),
+			heightBox = K('[name="height"]', div),
+			widthTypeBox = K('[name="widthType"]', div),
+			heightTypeBox = K('[name="heightType"]', div),
+			paddingBox = K('[name="padding"]', div).val(2),
+			spacingBox = K('[name="spacing"]', div).val(0),
+			alignBox = K('[name="align"]', div),
+			borderBox = K('[name="border"]', div).val(1),
+			colorBox = K('.ke-input-color', div);
+			_initColorPicker(div, colorBox.eq(0));
+			_initColorPicker(div, colorBox.eq(1));
+			_setColor(colorBox.eq(0), '#000000');
+			_setColor(colorBox.eq(1), '');
+			// foucs and select
+			rowsBox[0].focus();
+			rowsBox[0].select();
+			var table;
+			if (isInsert) {
+				return;
+			}
+			//get selected table node
+			table = self.plugin.getSelectedTable();
+			if (table) {
+				rowsBox.val(table[0].rows.length);
+				colsBox.val(table[0].rows.length > 0 ? table[0].rows[0].cells.length : 0);
+				rowsBox.attr('disabled', true);
+				colsBox.attr('disabled', true);
+				var match,
+					tableWidth = table[0].style.width || table[0].width,
+					tableHeight = table[0].style.height || table[0].height;
+				if (tableWidth !== undefined && (match = /^(\d+)((?:px|%)*)$/.exec(tableWidth))) {
+					widthBox.val(match[1]);
+					widthTypeBox.val(match[2]);
+				} else {
+					widthBox.val('');
+				}
+				if (tableHeight !== undefined && (match = /^(\d+)((?:px|%)*)$/.exec(tableHeight))) {
+					heightBox.val(match[1]);
+					heightTypeBox.val(match[2]);
+				}
+				paddingBox.val(table[0].cellPadding || '');
+				spacingBox.val(table[0].cellSpacing || '');
+				alignBox.val(table[0].align || '');
+				borderBox.val(table[0].border === undefined ? '' : table[0].border);
+				_setColor(colorBox.eq(0), K.toHex(table.attr('borderColor') || ''));
+				_setColor(colorBox.eq(1), K.toHex(table[0].style.backgroundColor || table[0].bgColor || ''));
+				widthBox[0].focus();
+				widthBox[0].select();
+			}
+		},
+		//modify cell
+		cellprop : function() {
+			var html = [
+				'<div style="padding:20px;">',
+				//width, height
+				'<div class="ke-dialog-row">',
+				'<label for="keWidth" style="width:90px;">' + lang.size + '</label>',
+				lang.width + ' <input type="text" id="keWidth" class="ke-input-text ke-input-number" name="width" value="" maxlength="4" /> &nbsp; ',
+				'<select name="widthType">',
+				'<option value="%">' + lang.percent + '</option>',
+				'<option value="px">' + lang.px + '</option>',
+				'</select> &nbsp; ',
+				lang.height + ' <input type="text" class="ke-input-text ke-input-number" name="height" value="" maxlength="4" /> &nbsp; ',
+				'<select name="heightType">',
+				'<option value="%">' + lang.percent + '</option>',
+				'<option value="px">' + lang.px + '</option>',
+				'</select>',
+				'</div>',
+				//align
+				'<div class="ke-dialog-row">',
+				'<label for="keAlign" style="width:90px;">' + lang.align + '</label>',
+				lang.textAlign + ' <select id="keAlign" name="textAlign">',
+				'<option value="">' + lang.alignDefault + '</option>',
+				'<option value="left">' + lang.alignLeft + '</option>',
+				'<option value="center">' + lang.alignCenter + '</option>',
+				'<option value="right">' + lang.alignRight + '</option>',
+				'</select> ',
+				lang.verticalAlign + ' <select name="verticalAlign">',
+				'<option value="">' + lang.alignDefault + '</option>',
+				'<option value="top">' + lang.alignTop + '</option>',
+				'<option value="middle">' + lang.alignMiddle + '</option>',
+				'<option value="bottom">' + lang.alignBottom + '</option>',
+				'<option value="baseline">' + lang.alignBaseline + '</option>',
+				'</select>',
+				'</div>',
+				//border
+				'<div class="ke-dialog-row">',
+				'<label for="keBorder" style="width:90px;">' + lang.border + '</label>',
+				lang.borderWidth + ' <input type="text" id="keBorder" class="ke-input-text ke-input-number" name="border" value="" maxlength="4" /> &nbsp; ',
+				lang.borderColor + ' <span class="ke-inline-block ke-input-color"></span>',
+				'</div>',
+				//background color
+				'<div class="ke-dialog-row">',
+				'<label for="keBgColor" style="width:90px;">' + lang.backgroundColor + '</label>',
+				'<span class="ke-inline-block ke-input-color"></span>',
+				'</div>',
+				'</div>'
+			].join('');
+			var bookmark = self.cmd.range.createBookmark();
+			var dialog = self.createDialog({
+				name : name,
+				width : 500,
+				title : self.lang('tablecell'),
+				body : html,
+				beforeRemove : function() {
+					colorBox.unbind();
+				},
+				yesBtn : {
+					name : self.lang('yes'),
+					click : function(e) {
+						var width = widthBox.val(),
+							height = heightBox.val(),
+							widthType = widthTypeBox.val(),
+							heightType = heightTypeBox.val(),
+							padding = paddingBox.val(),
+							spacing = spacingBox.val(),
+							textAlign = textAlignBox.val(),
+							verticalAlign = verticalAlignBox.val(),
+							border = borderBox.val(),
+							borderColor = K(colorBox[0]).html() || '',
+							bgColor = K(colorBox[1]).html() || '';
+						if (!/^\d*$/.test(width)) {
+							alert(self.lang('invalidWidth'));
+							widthBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(height)) {
+							alert(self.lang('invalidHeight'));
+							heightBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(border)) {
+							alert(self.lang('invalidBorder'));
+							borderBox[0].focus();
+							return;
+						}
+						cell.css({
+							width : width !== '' ? (width + widthType) : '',
+							height : height !== '' ? (height + heightType) : '',
+							'background-color' : bgColor,
+							'text-align' : textAlign,
+							'vertical-align' : verticalAlign,
+							'border-width' : border,
+							'border-style' : border !== '' ? 'solid' : '',
+							'border-color' : borderColor
+						});
+						self.hideDialog().focus();
+						self.cmd.range.moveToBookmark(bookmark);
+						self.cmd.select();
+						self.addBookmark();
+					}
+				}
+			}),
+			div = dialog.div,
+			widthBox = K('[name="width"]', div).val(100),
+			heightBox = K('[name="height"]', div),
+			widthTypeBox = K('[name="widthType"]', div),
+			heightTypeBox = K('[name="heightType"]', div),
+			paddingBox = K('[name="padding"]', div).val(2),
+			spacingBox = K('[name="spacing"]', div).val(0),
+			textAlignBox = K('[name="textAlign"]', div),
+			verticalAlignBox = K('[name="verticalAlign"]', div),
+			borderBox = K('[name="border"]', div).val(1),
+			colorBox = K('.ke-input-color', div);
+			_initColorPicker(div, colorBox.eq(0));
+			_initColorPicker(div, colorBox.eq(1));
+			_setColor(colorBox.eq(0), '#000000');
+			_setColor(colorBox.eq(1), '');
+			// foucs and select
+			widthBox[0].focus();
+			widthBox[0].select();
+			// get selected cell
+			var cell = self.plugin.getSelectedCell();
+			var match,
+				cellWidth = cell[0].style.width || cell[0].width || '',
+				cellHeight = cell[0].style.height || cell[0].height || '';
+			if ((match = /^(\d+)((?:px|%)*)$/.exec(cellWidth))) {
+				widthBox.val(match[1]);
+				widthTypeBox.val(match[2]);
+			} else {
+				widthBox.val('');
+			}
+			if ((match = /^(\d+)((?:px|%)*)$/.exec(cellHeight))) {
+				heightBox.val(match[1]);
+				heightTypeBox.val(match[2]);
+			}
+			textAlignBox.val(cell[0].style.textAlign || '');
+			verticalAlignBox.val(cell[0].style.verticalAlign || '');
+			var border = cell[0].style.borderWidth || '';
+			if (border) {
+				border = parseInt(border);
+			}
+			borderBox.val(border);
+			_setColor(colorBox.eq(0), K.toHex(cell[0].style.borderColor || ''));
+			_setColor(colorBox.eq(1), K.toHex(cell[0].style.backgroundColor || ''));
+			widthBox[0].focus();
+			widthBox[0].select();
+		},
+		insert : function() {
+			this.prop(true);
+		},
+		'delete' : function() {
+			var table = self.plugin.getSelectedTable();
+			self.cmd.range.setStartBefore(table[0]).collapse(true);
+			self.cmd.select();
+			table.remove();
+			self.addBookmark();
+		},
+		colinsert : function(offset) {
+			var table = self.plugin.getSelectedTable()[0],
+				row = self.plugin.getSelectedRow()[0],
+				cell = self.plugin.getSelectedCell()[0],
+				index = cell.cellIndex + offset;
+			// 取得第一行的index
+			index += table.rows[0].cells.length - row.cells.length;
+
+			for (var i = 0, len = table.rows.length; i < len; i++) {
+				var newRow = table.rows[i],
+					newCell = newRow.insertCell(index);
+				newCell.innerHTML = K.IE ? '' : '<br />';
+				// 调整下一行的单元格index
+				index = _getCellIndex(table, newRow, newCell);
+			}
+			self.cmd.range.selectNodeContents(cell).collapse(true);
+			self.cmd.select();
+			self.addBookmark();
+		},
+		colinsertleft : function() {
+			this.colinsert(0);
+		},
+		colinsertright : function() {
+			this.colinsert(1);
+		},
+		rowinsert : function(offset) {
+			var table = self.plugin.getSelectedTable()[0],
+				row = self.plugin.getSelectedRow()[0],
+				cell = self.plugin.getSelectedCell()[0];
+			var rowIndex = row.rowIndex;
+			if (offset === 1) {
+				rowIndex = row.rowIndex + (cell.rowSpan - 1) + offset;
+			}
+			var newRow = table.insertRow(rowIndex);
+
+			for (var i = 0, len = row.cells.length; i < len; i++) {
+				// 调整cell个数
+				if (row.cells[i].rowSpan > 1) {
+					len -= row.cells[i].rowSpan - 1;
+				}
+				var newCell = newRow.insertCell(i);
+				// copy colspan
+				if (offset === 1 && row.cells[i].colSpan > 1) {
+					newCell.colSpan = row.cells[i].colSpan;
+				}
+				newCell.innerHTML = K.IE ? '' : '<br />';
+			}
+			// 调整rowspan
+			for (var j = rowIndex; j >= 0; j--) {
+				var cells = table.rows[j].cells;
+				if (cells.length > i) {
+					for (var k = cell.cellIndex; k >= 0; k--) {
+						if (cells[k].rowSpan > 1) {
+							cells[k].rowSpan += 1;
+						}
+					}
+					break;
+				}
+			}
+			self.cmd.range.selectNodeContents(cell).collapse(true);
+			self.cmd.select();
+			self.addBookmark();
+		},
+		rowinsertabove : function() {
+			this.rowinsert(0);
+		},
+		rowinsertbelow : function() {
+			this.rowinsert(1);
+		},
+		rowmerge : function() {
+			var table = self.plugin.getSelectedTable()[0],
+				row = self.plugin.getSelectedRow()[0],
+				cell = self.plugin.getSelectedCell()[0],
+				rowIndex = row.rowIndex, // 当前行的index
+				nextRowIndex = rowIndex + cell.rowSpan, // 下一行的index
+				nextRow = table.rows[nextRowIndex]; // 下一行
+			// 最后一行不能合并
+			if (table.rows.length <= nextRowIndex) {
+				return;
+			}
+			var cellIndex = cell.cellIndex; // 下一行单元格的index
+			if (nextRow.cells.length <= cellIndex) {
+				return;
+			}
+			var nextCell = nextRow.cells[cellIndex]; // 下一行单元格
+			// 上下行的colspan不一致时不能合并
+			if (cell.colSpan !== nextCell.colSpan) {
+				return;
+			}
+			cell.rowSpan += nextCell.rowSpan;
+			nextRow.deleteCell(cellIndex);
+			self.cmd.range.selectNodeContents(cell).collapse(true);
+			self.cmd.select();
+			self.addBookmark();
+		},
+		colmerge : function() {
+			var table = self.plugin.getSelectedTable()[0],
+				row = self.plugin.getSelectedRow()[0],
+				cell = self.plugin.getSelectedCell()[0],
+				rowIndex = row.rowIndex, // 当前行的index
+				cellIndex = cell.cellIndex,
+				nextCellIndex = cellIndex + 1;
+			// 最后一列不能合并
+			if (row.cells.length <= nextCellIndex) {
+				return;
+			}
+			var nextCell = row.cells[nextCellIndex];
+			// 左右列的rowspan不一致时不能合并
+			if (cell.rowSpan !== nextCell.rowSpan) {
+				return;
+			}
+			cell.colSpan += nextCell.colSpan;
+			row.deleteCell(nextCellIndex);
+			self.cmd.range.selectNodeContents(cell).collapse(true);
+			self.cmd.select();
+			self.addBookmark();
+		},
+		rowsplit : function() {
+			var table = self.plugin.getSelectedTable()[0],
+				row = self.plugin.getSelectedRow()[0],
+				cell = self.plugin.getSelectedCell()[0],
+				rowIndex = row.rowIndex;
+			// 不是可分割单元格
+			if (cell.rowSpan === 1) {
+				return;
+			}
+			var cellIndex = _getCellIndex(table, row, cell);
+			for (var i = 1, len = cell.rowSpan; i < len; i++) {
+				var newRow = table.rows[rowIndex + i],
+					newCell = newRow.insertCell(cellIndex);
+				if (cell.colSpan > 1) {
+					newCell.colSpan = cell.colSpan;
+				}
+				newCell.innerHTML = K.IE ? '' : '<br />';
+				// 调整下一行的单元格index
+				cellIndex = _getCellIndex(table, newRow, newCell);
+			}
+			K(cell).removeAttr('rowSpan');
+			self.cmd.range.selectNodeContents(cell).collapse(true);
+			self.cmd.select();
+			self.addBookmark();
+		},
+		colsplit : function() {
+			var table = self.plugin.getSelectedTable()[0],
+				row = self.plugin.getSelectedRow()[0],
+				cell = self.plugin.getSelectedCell()[0],
+				cellIndex = cell.cellIndex;
+			// 不是可分割单元格
+			if (cell.colSpan === 1) {
+				return;
+			}
+			for (var i = 1, len = cell.colSpan; i < len; i++) {
+				var newCell = row.insertCell(cellIndex + i);
+				if (cell.rowSpan > 1) {
+					newCell.rowSpan = cell.rowSpan;
+				}
+				newCell.innerHTML = K.IE ? '' : '<br />';
+			}
+			K(cell).removeAttr('colSpan');
+			self.cmd.range.selectNodeContents(cell).collapse(true);
+			self.cmd.select();
+			self.addBookmark();
+		},
+		coldelete : function() {
+			var table = self.plugin.getSelectedTable()[0],
+				row = self.plugin.getSelectedRow()[0],
+				cell = self.plugin.getSelectedCell()[0],
+				index = cell.cellIndex;
+			for (var i = 0, len = table.rows.length; i < len; i++) {
+				var newRow = table.rows[i],
+					newCell = newRow.cells[index];
+				if (newCell.colSpan > 1) {
+					newCell.colSpan -= 1;
+					if (newCell.colSpan === 1) {
+						K(newCell).removeAttr('colSpan');
+					}
+				} else {
+					newRow.deleteCell(index);
+				}
+				// 跳过不需要删除的行
+				if (newCell.rowSpan > 1) {
+					i += newCell.rowSpan - 1;
+				}
+			}
+			if (row.cells.length === 0) {
+				self.cmd.range.setStartBefore(table).collapse(true);
+				self.cmd.select();
+				K(table).remove();
+			} else {
+				self.cmd.selection(true);
+			}
+			self.addBookmark();
+		},
+		rowdelete : function() {
+			var table = self.plugin.getSelectedTable()[0],
+				row = self.plugin.getSelectedRow()[0],
+				cell = self.plugin.getSelectedCell()[0],
+				rowIndex = row.rowIndex;
+			// 从下到上删除
+			for (var i = cell.rowSpan - 1; i >= 0; i--) {
+				table.deleteRow(rowIndex + i);
+			}
+			if (table.rows.length === 0) {
+				self.cmd.range.setStartBefore(table).collapse(true);
+				self.cmd.select();
+				K(table).remove();
+			} else {
+				self.cmd.selection(true);
+			}
+			self.addBookmark();
+		}
+	};
+	self.clickToolbar(name, self.plugin.table.prop);
+});
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('template', function(K) {
+	var self = this, name = 'template', lang = self.lang(name + '.'),
+		htmlPath = self.pluginsPath + name + '/html/';
+	function getFilePath(fileName) {
+		return htmlPath + fileName + '?ver=' + encodeURIComponent(K.DEBUG ? K.TIME : K.VERSION);
+	}
+	self.clickToolbar(name, function() {
+		var lang = self.lang(name + '.'),
+			arr = ['<div style="padding:10px 20px;">',
+				'<div class="ke-header">',
+				// left start
+				'<div class="ke-left">',
+				lang. selectTemplate + ' <select>'];
+			K.each(lang.fileList, function(key, val) {
+				arr.push('<option value="' + key + '">' + val + '</option>');
+			});
+			html = [arr.join(''),
+				'</select></div>',
+				// right start
+				'<div class="ke-right">',
+				'<input type="checkbox" id="keReplaceFlag" name="replaceFlag" value="1" /> <label for="keReplaceFlag">' + lang.replaceContent + '</label>',
+				'</div>',
+				'<div class="ke-clearfix"></div>',
+				'</div>',
+				'<iframe class="ke-textarea" frameborder="0" style="width:458px;height:260px;background-color:#FFF;"></iframe>',
+				'</div>'].join('');
+		var dialog = self.createDialog({
+			name : name,
+			width : 500,
+			title : self.lang(name),
+			body : html,
+			yesBtn : {
+				name : self.lang('yes'),
+				click : function(e) {
+					var doc = K.iframeDoc(iframe);
+					self[checkbox[0].checked ? 'html' : 'insertHtml'](doc.body.innerHTML).hideDialog().focus();
+				}
+			}
+		});
+		var selectBox = K('select', dialog.div),
+			checkbox = K('[name="replaceFlag"]', dialog.div),
+			iframe = K('iframe', dialog.div);
+		checkbox[0].checked = true;
+		iframe.attr('src', getFilePath(selectBox.val()));
+		selectBox.change(function() {
+			iframe.attr('src', getFilePath(this.value));
+		});
+	});
+});
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('wordpaste', function(K) {
+	var self = this, name = 'wordpaste';
+	self.clickToolbar(name, function() {
+		var lang = self.lang(name + '.'),
+			html = '<div style="padding:10px 20px;">' +
+				'<div style="margin-bottom:10px;">' + lang.comment + '</div>' +
+				'<iframe class="ke-textarea" frameborder="0" style="width:408px;height:260px;"></iframe>' +
+				'</div>',
+			dialog = self.createDialog({
+				name : name,
+				width : 450,
+				title : self.lang(name),
+				body : html,
+				yesBtn : {
+					name : self.lang('yes'),
+					click : function(e) {
+						var str = doc.body.innerHTML;
+						str = K.clearMsWord(str, self.filterMode ? self.htmlTags : K.options.htmlTags);
+						self.insertHtml(str).hideDialog().focus();
+					}
+				}
+			}),
+			div = dialog.div,
+			iframe = K('iframe', div),
+			doc = K.iframeDoc(iframe);
+		if (!K.IE) {
+			doc.designMode = 'on';
+		}
+		doc.open();
+		doc.write('<!doctype html><html><head><title>WordPaste</title></head>');
+		doc.write('<body style="background-color:#FFF;font-size:12px;margin:2px;">');
+		if (!K.IE) {
+			doc.write('<br />');
+		}
+		doc.write('</body></html>');
+		doc.close();
+		if (K.IE) {
+			doc.body.contentEditable = 'true';
+		}
+		iframe[0].contentWindow.focus();
+	});
+});
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/kindeditor-min.js b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/kindeditor-min.js
new file mode 100644
index 0000000..7b35f52
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/kindeditor-min.js
@@ -0,0 +1,182 @@
+/* KindEditor 4.1.10 (2013-11-23), Copyright (C) kindsoft.net, Licence: http://www.kindsoft.net/license.php */(function(w,i){function Z(a){if(!a)return!1;return Object.prototype.toString.call(a)==="[object Array]"}function wa(a){if(!a)return!1;return Object.prototype.toString.call(a)==="[object Function]"}function J(a,b){for(var c=0,d=b.length;c<d;c++)if(a===b[c])return c;return-1}function m(a,b){if(Z(a))for(var c=0,d=a.length;c<d;c++){if(b.call(a[c],c,a[c])===!1)break}else for(c in a)if(a.hasOwnProperty(c)&&b.call(a[c],c,a[c])===!1)break}function B(a){return a.replace(/(?:^[ \t\n\r]+)|(?:[ \t\n\r]+$)/g,
+"")}function xa(a,b,c){c=c===i?",":c;return(c+b+c).indexOf(c+a+c)>=0}function s(a,b){b=b||"px";return a&&/^\d+$/.test(a)?a+b:a}function t(a){var b;return a&&(b=/(\d+)/.exec(a))?parseInt(b[1],10):0}function C(a){return a.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;")}function fa(a){return a.replace(/&lt;/g,"<").replace(/&gt;/g,">").replace(/&quot;/g,'"').replace(/&amp;/g,"&")}function ga(a){var b=a.split("-"),a="";m(b,function(b,d){a+=b>0?d.charAt(0).toUpperCase()+
+d.substr(1):d});return a}function ya(a){function b(a){a=parseInt(a,10).toString(16).toUpperCase();return a.length>1?a:"0"+a}return a.replace(/rgb\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)/ig,function(a,d,e,g){return"#"+b(d)+b(e)+b(g)})}function u(a,b){var b=b===i?",":b,c={},d=Z(a)?a:a.split(b),e;m(d,function(a,b){if(e=/^(\d+)\.\.(\d+)$/.exec(b))for(var d=parseInt(e[1],10);d<=parseInt(e[2],10);d++)c[d.toString()]=!0;else c[b]=!0});return c}function Ja(a,b){return Array.prototype.slice.call(a,b||0)}
+function l(a,b){return a===i?b:a}function E(a,b,c){c||(c=b,b=null);var d;if(b){var e=function(){};e.prototype=b.prototype;d=new e;m(c,function(a,b){d[a]=b})}else d=c;d.constructor=a;a.prototype=d;a.parent=b?b.prototype:null}function eb(a){var b;if(b=/\{[\s\S]*\}|\[[\s\S]*\]/.exec(a))a=b[0];b=/[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g;b.lastIndex=0;b.test(a)&&(a=a.replace(b,function(a){return"\\u"+("0000"+a.charCodeAt(0).toString(16)).slice(-4)}));
+if(/^[\],:{}\s]*$/.test(a.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,"@").replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,"]").replace(/(?:^|:|,)(?:\s*\[)+/g,"")))return eval("("+a+")");throw"JSON parse error";}function Rb(a,b,c){a.addEventListener?a.addEventListener(b,c,fb):a.attachEvent&&a.attachEvent("on"+b,c)}function za(a,b,c){a.removeEventListener?a.removeEventListener(b,c,fb):a.detachEvent&&a.detachEvent("on"+b,c)}function gb(a,b){this.init(a,b)}function hb(a){try{delete a[$]}catch(b){a.removeAttribute&&
+a.removeAttribute($)}}function aa(a,b,c){if(b.indexOf(",")>=0)m(b.split(","),function(){aa(a,this,c)});else{var d=a[$]||null;d||(a[$]=++ib,d=ib);v[d]===i&&(v[d]={});var e=v[d][b];e&&e.length>0?za(a,b,e[0]):(v[d][b]=[],v[d].el=a);e=v[d][b];e.length===0&&(e[0]=function(b){var c=b?new gb(a,b):i;m(e,function(b,d){b>0&&d&&d.call(a,c)})});J(c,e)<0&&e.push(c);Rb(a,b,e[0])}}function ha(a,b,c){if(b&&b.indexOf(",")>=0)m(b.split(","),function(){ha(a,this,c)});else{var d=a[$]||null;if(d)if(b===i)d in v&&(m(v[d],
+function(b,c){b!="el"&&c.length>0&&za(a,b,c[0])}),delete v[d],hb(a));else if(v[d]){var e=v[d][b];if(e&&e.length>0){c===i?(za(a,b,e[0]),delete v[d][b]):(m(e,function(a,b){a>0&&b===c&&e.splice(a,1)}),e.length==1&&(za(a,b,e[0]),delete v[d][b]));var g=0;m(v[d],function(){g++});g<2&&(delete v[d],hb(a))}}}}function jb(a,b){if(b.indexOf(",")>=0)m(b.split(","),function(){jb(a,this)});else{var c=a[$]||null;if(c){var d=v[c][b];if(v[c]&&d&&d.length>0)d[0]()}}}function Ka(a,b,c){b=/^\d{2,}$/.test(b)?b:b.toUpperCase().charCodeAt(0);
+aa(a,"keydown",function(d){d.ctrlKey&&d.which==b&&!d.shiftKey&&!d.altKey&&(c.call(a),d.stop())})}function ba(a){for(var b={},c=/\s*([\w\-]+)\s*:([^;]*)(;|$)/g,d;d=c.exec(a);){var e=B(d[1].toLowerCase());d=B(ya(d[2]));b[e]=d}return b}function I(a){for(var b={},c=/\s+(?:([\w\-:]+)|(?:([\w\-:]+)=([^\s"'<>]+))|(?:([\w\-:"]+)="([^"]*)")|(?:([\w\-:"]+)='([^']*)'))(?=(?:\s|\/|>)+)/g,d;d=c.exec(a);){var e=(d[1]||d[2]||d[4]||d[6]).toLowerCase();b[e]=(d[2]?d[3]:d[4]?d[5]:d[7])||""}return b}function Sb(a,b){return a=
+/\s+class\s*=/.test(a)?a.replace(/(\s+class=["']?)([^"']*)(["']?[\s>])/,function(a,d,e,g){return(" "+e+" ").indexOf(" "+b+" ")<0?e===""?d+b+g:d+e+" "+b+g:a}):a.substr(0,a.length-1)+' class="'+b+'">'}function Tb(a){var b="";m(ba(a),function(a,d){b+=a+":"+d+";"});return b}function ia(a,b,c,d){function e(a){for(var a=a.split("/"),b=[],c=0,d=a.length;c<d;c++){var e=a[c];e==".."?b.length>0&&b.pop():e!==""&&e!="."&&b.push(e)}return"/"+b.join("/")}function g(b,c){if(a.substr(0,b.length)===b){for(var e=[],
+h=0;h<c;h++)e.push("..");h=".";e.length>0&&(h+="/"+e.join("/"));d=="/"&&(h+="/");return h+a.substr(b.length)}else if(f=/^(.*)\//.exec(b))return g(f[1],++c)}b=l(b,"").toLowerCase();a.substr(0,5)!="data:"&&(a=a.replace(/([^:])\/\//g,"$1/"));if(J(b,["absolute","relative","domain"])<0)return a;c=c||location.protocol+"//"+location.host;if(d===i)var h=location.pathname.match(/^(\/.*)\//),d=h?h[1]:"";var f;if(f=/^(\w+:\/\/[^\/]*)/.exec(a)){if(f[1]!==c)return a}else if(/^\w+:/.test(a))return a;/^\//.test(a)?
+a=c+e(a.substr(1)):/^\w+:\/\//.test(a)||(a=c+e(d+"/"+a));b==="relative"?a=g(c+d,0).substr(2):b==="absolute"&&a.substr(0,c.length)===c&&(a=a.substr(c.length));return a}function U(a,b,c,d,e){a==null&&(a="");var c=c||"",d=l(d,!1),e=l(e,"\t"),g="xx-small,x-small,small,medium,large,x-large,xx-large".split(","),a=a.replace(/(<(?:pre|pre\s[^>]*)>)([\s\S]*?)(<\/pre>)/ig,function(a,b,c,d){return b+c.replace(/<(?:br|br\s[^>]*)>/ig,"\n")+d}),a=a.replace(/<(?:br|br\s[^>]*)\s*\/?>\s*<\/p>/ig,"</p>"),a=a.replace(/(<(?:p|p\s[^>]*)>)\s*(<\/p>)/ig,
+"$1<br />$2"),a=a.replace(/\u200B/g,""),a=a.replace(/\u00A9/g,"&copy;"),a=a.replace(/\u00AE/g,"&reg;"),a=a.replace(/<[^>]+/g,function(a){return a.replace(/\s+/g," ")}),h={};b&&(m(b,function(a,b){for(var c=a.split(","),d=0,e=c.length;d<e;d++)h[c[d]]=u(b)}),h.script||(a=a.replace(/(<(?:script|script\s[^>]*)>)([\s\S]*?)(<\/script>)/ig,"")),h.style||(a=a.replace(/(<(?:style|style\s[^>]*)>)([\s\S]*?)(<\/style>)/ig,"")));var f=[],a=a.replace(/(\s*)<(\/)?([\w\-:]+)((?:\s+|(?:\s+[\w\-:]+)|(?:\s+[\w\-:]+=[^\s"'<>]+)|(?:\s+[\w\-:"]+="[^"]*")|(?:\s+[\w\-:"]+='[^']*'))*)(\/)?>(\s*)/g,
+function(a,n,q,r,K,ja,i){var n=n||"",q=q||"",l=r.toLowerCase(),o=K||"",r=ja?" "+ja:"",i=i||"";if(b&&!h[l])return"";r===""&&kb[l]&&(r=" /");lb[l]&&(n&&(n=" "),i&&(i=" "));La[l]&&(q?i="\n":n="\n");d&&l=="br"&&(i="\n");if(mb[l]&&!La[l])if(d){q&&f.length>0&&f[f.length-1]===l?f.pop():f.push(l);i=n="\n";K=0;for(ja=q?f.length:f.length-1;K<ja;K++)n+=e,q||(i+=e);r?f.pop():q||(i+=e)}else n=i="";if(o!==""){var z=I(a);if(l==="font"){var L={},F="";m(z,function(a,b){if(a==="color")L.color=b,delete z[a];a==="size"&&
+(L["font-size"]=g[parseInt(b,10)-1]||"",delete z[a]);a==="face"&&(L["font-family"]=b,delete z[a]);a==="style"&&(F=b)});F&&!/;$/.test(F)&&(F+=";");m(L,function(a,b){b!==""&&(/\s/.test(b)&&(b="'"+b+"'"),F+=a+":"+b+";")});z.style=F}m(z,function(a,d){Ub[a]&&(z[a]=a);J(a,["src","href"])>=0&&(z[a]=ia(d,c));(b&&a!=="style"&&!h[l]["*"]&&!h[l][a]||l==="body"&&a==="contenteditable"||/^kindeditor_\d+$/.test(a))&&delete z[a];if(a==="style"&&d!==""){var e=ba(d);m(e,function(a){b&&!h[l].style&&!h[l]["."+a]&&delete e[a]});
+var g="";m(e,function(a,b){g+=a+":"+b+";"});z.style=g}});o="";m(z,function(a,b){a==="style"&&b===""||(b=b.replace(/"/g,"&quot;"),o+=" "+a+'="'+b+'"')})}l==="font"&&(l="span");return n+"<"+q+l+o+r+">"+i}),a=a.replace(/(<(?:pre|pre\s[^>]*)>)([\s\S]*?)(<\/pre>)/ig,function(a,b,c,d){return b+c.replace(/\n/g,'<span id="__kindeditor_pre_newline__">\n')+d}),a=a.replace(/\n\s*\n/g,"\n"),a=a.replace(/<span id="__kindeditor_pre_newline__">\n/g,"\n");return B(a)}function nb(a,b){a=a.replace(/<meta[\s\S]*?>/ig,
+"").replace(/<![\s\S]*?>/ig,"").replace(/<style[^>]*>[\s\S]*?<\/style>/ig,"").replace(/<script[^>]*>[\s\S]*?<\/script>/ig,"").replace(/<w:[^>]+>[\s\S]*?<\/w:[^>]+>/ig,"").replace(/<o:[^>]+>[\s\S]*?<\/o:[^>]+>/ig,"").replace(/<xml>[\s\S]*?<\/xml>/ig,"").replace(/<(?:table|td)[^>]*>/ig,function(a){return a.replace(/border-bottom:([#\w\s]+)/ig,"border:$1")});return U(a,b)}function ob(a){if(/\.(rm|rmvb)(\?|$)/i.test(a))return"audio/x-pn-realaudio-plugin";if(/\.(swf|flv)(\?|$)/i.test(a))return"application/x-shockwave-flash";
+return"video/x-ms-asf-plugin"}function pb(a){return I(unescape(a))}function Ma(a){var b="<embed ";m(a,function(a,d){b+=a+'="'+d+'" '});b+="/>";return b}function qb(a,b){var c=b.width,d=b.height,e=b.type||ob(b.src),g=Ma(b),h="";/\D/.test(c)?h+="width:"+c+";":c>0&&(h+="width:"+c+"px;");/\D/.test(d)?h+="height:"+d+";":d>0&&(h+="height:"+d+"px;");c=/realaudio/i.test(e)?"ke-rm":/flash/i.test(e)?"ke-flash":"ke-media";c='<img class="'+c+'" src="'+a+'" ';h!==""&&(c+='style="'+h+'" ');c+='data-ke-tag="'+escape(g)+
+'" alt="" />';return c}function Aa(a,b){if(a.nodeType==9&&b.nodeType!=9)return!0;for(;b=b.parentNode;)if(b==a)return!0;return!1}function Ba(a,b){var b=b.toLowerCase(),c=null;if(!Vb&&a.nodeName.toLowerCase()!="script"){var d=a.ownerDocument.createElement("div");d.appendChild(a.cloneNode(!1));d=I(fa(d.innerHTML));b in d&&(c=d[b])}else try{c=a.getAttribute(b,2)}catch(e){c=a.getAttribute(b,1)}b==="style"&&c!==null&&(c=Tb(c));return c}function Ca(a,b){function c(a){if(typeof a!="string")return a;return a.replace(/([^\w\-])/g,
+"\\$1")}function d(a,b){return a==="*"||a.toLowerCase()===c(b.toLowerCase())}function e(a,b,c){var e=[];(a=(c.ownerDocument||c).getElementById(a.replace(/\\/g,"")))&&d(b,a.nodeName)&&Aa(c,a)&&e.push(a);return e}function g(a,b,c){var e=c.ownerDocument||c,g=[],h,f,j;if(c.getElementsByClassName){e=c.getElementsByClassName(a.replace(/\\/g,""));h=0;for(f=e.length;h<f;h++)j=e[h],d(b,j.nodeName)&&g.push(j)}else if(e.querySelectorAll){e=e.querySelectorAll((c.nodeName!=="#document"?c.nodeName+" ":"")+b+"."+
+a);h=0;for(f=e.length;h<f;h++)j=e[h],Aa(c,j)&&g.push(j)}else{e=c.getElementsByTagName(b);a=" "+a+" ";h=0;for(f=e.length;h<f;h++)if(j=e[h],j.nodeType==1)(b=j.className)&&(" "+b+" ").indexOf(a)>-1&&g.push(j)}return g}function h(a,b,d,e){for(var g=[],d=e.getElementsByTagName(d),h=0,f=d.length;h<f;h++)e=d[h],e.nodeType==1&&(b===null?Ba(e,a)!==null&&g.push(e):b===c(Ba(e,a))&&g.push(e));return g}function f(a,b){var c=[],j,k=(j=/^((?:\\.|[^.#\s\[<>])+)/.exec(a))?j[1]:"*";if(j=/#((?:[\w\-]|\\.)+)$/.exec(a))c=
+e(j[1],k,b);else if(j=/\.((?:[\w\-]|\\.)+)$/.exec(a))c=g(j[1],k,b);else if(j=/\[((?:[\w\-]|\\.)+)\]/.exec(a))c=h(j[1].toLowerCase(),null,k,b);else if(j=/\[((?:[\w\-]|\\.)+)\s*=\s*['"]?((?:\\.|[^'"]+)+)['"]?\]/.exec(a)){c=j[1].toLowerCase();j=j[2];if(c==="id")k=e(j,k,b);else if(c==="class")k=g(j,k,b);else if(c==="name"){c=[];j=(b.ownerDocument||b).getElementsByName(j.replace(/\\/g,""));for(var n,r=0,q=j.length;r<q;r++)n=j[r],d(k,n.nodeName)&&Aa(b,n)&&n.getAttribute("name")!==null&&c.push(n);k=c}else k=
+h(c,j,k,b);c=k}else{k=b.getElementsByTagName(k);n=0;for(r=k.length;n<r;n++)j=k[n],j.nodeType==1&&c.push(j)}return c}var k=a.split(",");if(k.length>1){var n=[];m(k,function(){m(Ca(this,b),function(){J(this,n)<0&&n.push(this)})});return n}for(var b=b||document,k=[],q,r=/((?:\\.|[^\s>])+|[\s>])/g;q=r.exec(a);)q[1]!==" "&&k.push(q[1]);q=[];if(k.length==1)return f(k[0],b);var r=!1,K,l,i,o,p,z,L,F,s,t;z=0;for(lenth=k.length;z<lenth;z++)if(K=k[z],K===">")r=!0;else{if(z>0){l=[];L=0;for(s=q.length;L<s;L++){o=
+q[L];i=f(K,o);F=0;for(t=i.length;F<t;F++)p=i[F],r?o===p.parentNode&&l.push(p):l.push(p)}q=l}else q=f(K,b);if(q.length===0)return[]}return q}function V(a){if(!a)return document;return a.ownerDocument||a.document||a}function W(a){if(!a)return w;a=V(a);return a.parentWindow||a.defaultView}function Wb(a,b){if(a.nodeType==1){var c=V(a);try{a.innerHTML='<img id="__kindeditor_temp_tag__" width="0" height="0" style="display:none;" />'+b;var d=c.getElementById("__kindeditor_temp_tag__");d.parentNode.removeChild(d)}catch(e){f(a).empty(),
+f("@"+b,c).each(function(){a.appendChild(this)})}}}function Na(a,b,c){o&&A<8&&b.toLowerCase()=="class"&&(b="className");a.setAttribute(b,""+c)}function Oa(a){if(!a||!a.nodeName)return"";return a.nodeName.toLowerCase()}function Xb(a,b){var c=W(a),d=ga(b),e="";c.getComputedStyle?(c=c.getComputedStyle(a,null),e=c[d]||c.getPropertyValue(b)||a.style[d]):a.currentStyle&&(e=a.currentStyle[d]||a.style[d]);return e}function G(a){a=a||document;return P?a.body:a.documentElement}function ca(a){var a=a||document,
+b;o||Yb||Pa?(b=G(a).scrollLeft,a=G(a).scrollTop):(b=W(a).scrollX,a=W(a).scrollY);return{x:b,y:a}}function D(a){this.init(a)}function rb(a){a.collapsed=a.startContainer===a.endContainer&&a.startOffset===a.endOffset;return a}function Qa(a,b,c){function d(d,e,g){var h=d.nodeValue.length,k;b&&(k=d.cloneNode(!0),k=e>0?k.splitText(e):k,g<h&&k.splitText(g-e));if(c){var n=d;e>0&&(n=d.splitText(e),a.setStart(d,e));g<h&&(d=n.splitText(g-e),a.setEnd(d,0));f.push(n)}return k}function e(){c&&a.up().collapse(!0);
+for(var b=0,d=f.length;b<d;b++){var e=f[b];e.parentNode&&e.parentNode.removeChild(e)}}function g(e,l){for(var i=e.firstChild,o;i;){o=(new M(h)).selectNode(i);n=o.compareBoundaryPoints(ka,a);n>=0&&q<=0&&(q=o.compareBoundaryPoints(la,a));q>=0&&r<=0&&(r=o.compareBoundaryPoints(da,a));r>=0&&m<=0&&(m=o.compareBoundaryPoints(ma,a));if(m>=0)return!1;o=i.nextSibling;if(n>0)if(i.nodeType==1)if(q>=0&&r<=0)b&&l.appendChild(i.cloneNode(!0)),c&&f.push(i);else{var p;b&&(p=i.cloneNode(!1),l.appendChild(p));if(g(i,
+p)===!1)return!1}else if(i.nodeType==3&&(i=i==k.startContainer?d(i,k.startOffset,i.nodeValue.length):i==k.endContainer?d(i,0,k.endOffset):d(i,0,i.nodeValue.length),b))try{l.appendChild(i)}catch(ja){}i=o}}var h=a.doc,f=[],k=a.cloneRange().down(),n=-1,q=-1,r=-1,m=-1,l=a.commonAncestor(),i=h.createDocumentFragment();if(l.nodeType==3)return l=d(l,a.startOffset,a.endOffset),b&&i.appendChild(l),e(),b?i:a;g(l,i);c&&a.up().collapse(!0);for(var l=0,o=f.length;l<o;l++){var p=f[l];p.parentNode&&p.parentNode.removeChild(p)}return b?
+i:a}function na(a,b){for(var c=b;c;){var d=f(c);if(d.name=="marquee"||d.name=="select")return;c=c.parentNode}try{a.moveToElementText(b)}catch(e){}}function sb(a,b){var c=a.parentElement().ownerDocument,d=a.duplicate();d.collapse(b);var e=d.parentElement(),g=e.childNodes;if(g.length===0)return{node:e.parentNode,offset:f(e).index()};var h=c,j=0,k=-1,n=a.duplicate();na(n,e);for(var q=0,r=g.length;q<r;q++){var i=g[q],k=n.compareEndPoints("StartToStart",d);if(k===0)return{node:i.parentNode,offset:q};if(i.nodeType==
+1){var l=a.duplicate(),m,o=f(i),p=i;o.isControl()&&(m=c.createElement("span"),o.after(m),p=m,j+=o.text().replace(/\r\n|\n|\r/g,"").length);na(l,p);n.setEndPoint("StartToEnd",l);k>0?j+=l.text.replace(/\r\n|\n|\r/g,"").length:j=0;m&&f(m).remove()}else i.nodeType==3&&(n.moveStart("character",i.nodeValue.length),j+=i.nodeValue.length);k<0&&(h=i)}if(k<0&&h.nodeType==1)return{node:e,offset:f(e.lastChild).index()+1};if(k>0)for(;h.nextSibling&&h.nodeType==1;)h=h.nextSibling;n=a.duplicate();na(n,e);n.setEndPoint("StartToEnd",
+d);j-=n.text.replace(/\r\n|\n|\r/g,"").length;if(k>0&&h.nodeType==3)for(c=h.previousSibling;c&&c.nodeType==3;)j-=c.nodeValue.length,c=c.previousSibling;return{node:h,offset:j}}function tb(a,b){var c=a.ownerDocument||a,d=c.body.createTextRange();if(c==a)return d.collapse(!0),d;if(a.nodeType==1&&a.childNodes.length>0){var e=a.childNodes,g;b===0?(g=e[0],e=!0):(g=e[b-1],e=!1);if(!g)return d;if(f(g).name==="head")return b===1&&(e=!0),b===2&&(e=!1),d.collapse(e),d;if(g.nodeType==1){var h=f(g),j;h.isControl()&&
+(j=c.createElement("span"),e?h.before(j):h.after(j),g=j);na(d,g);d.collapse(e);j&&f(j).remove();return d}a=g;b=e?0:g.nodeValue.length}c=c.createElement("span");f(a).before(c);na(d,c);d.moveStart("character",b);f(c).remove();return d}function ub(a){function b(a){if(f(a.node).name=="tr")a.node=a.node.cells[a.offset],a.offset=0}var c;if(H){if(a.item)return c=V(a.item(0)),c=new M(c),c.selectNode(a.item(0)),c;c=a.parentElement().ownerDocument;var d=sb(a,!0),a=sb(a,!1);b(d);b(a);c=new M(c);c.setStart(d.node,
+d.offset);c.setEnd(a.node,a.offset);return c}d=a.startContainer;c=d.ownerDocument||d;c=new M(c);c.setStart(d,a.startOffset);c.setEnd(a.endContainer,a.endOffset);return c}function M(a){this.init(a)}function Ra(a){if(!a.nodeName)return a.constructor===M?a:ub(a);return new M(a)}function Q(a,b,c){try{a.execCommand(b,!1,c)}catch(d){}}function vb(a,b){var c="";try{c=a.queryCommandValue(b)}catch(d){}typeof c!=="string"&&(c="");return c}function Sa(a){var b=W(a);return H?a.selection:b.getSelection()}function wb(a){var b=
+{},c,d;m(a,function(a,g){c=a.split(",");for(var h=0,f=c.length;h<f;h++)d=c[h],b[d]=g});return b}function Ta(a,b){return xb(a,b,"*")||xb(a,b)}function xb(a,b,c){c=c||a.name;if(a.type!==1)return!1;b=wb(b);if(!b[c])return!1;for(var c=b[c].split(","),b=0,d=c.length;b<d;b++){var e=c[b];if(e==="*")return!0;var g=/^(\.?)([^=]+)(?:=([^=]*))?$/.exec(e),h=g[1]?"css":"attr",e=g[2],g=g[3]||"";if(g===""&&a[h](e)!=="")return!0;if(g!==""&&a[h](e)===g)return!0}return!1}function Ua(a,b){a.type==1&&(yb(a,b,"*"),yb(a,
+b))}function yb(a,b,c){c=c||a.name;if(a.type===1&&(b=wb(b),b[c])){for(var c=b[c].split(","),b=!1,d=0,e=c.length;d<e;d++){var g=c[d];if(g==="*"){b=!0;break}var h=/^(\.?)([^=]+)(?:=([^=]*))?$/.exec(g),g=h[2];h[1]?(g=ga(g),a[0].style[g]&&(a[0].style[g]="")):a.removeAttr(g)}b&&a.remove(!0)}}function Va(a){for(;a.first();)a=a.first();return a}function ea(a){if(a.type!=1||a.isSingle())return!1;return a.html().replace(/<[^>]+>/g,"")===""}function Zb(a,b,c){m(b,function(b,c){b!=="style"&&a.attr(b,c)});m(c,
+function(b,c){a.css(b,c)})}function oa(a){this.init(a)}function zb(a){a.nodeName&&(a=V(a),a=Ra(a).selectNodeContents(a.body).collapse(!1));return new oa(a)}function Wa(a){var b=a.moveEl,c=a.moveFn,d=a.clickEl||b,e=a.beforeDrag,g=[document];(a.iframeFix===i||a.iframeFix)&&f("iframe").each(function(){if(!/^https?:\/\//.test(ia(this.src||"","absolute"))){var a;try{a=Xa(this)}catch(b){}if(a){var c=f(this).pos();f(a).data("pos-x",c.x);f(a).data("pos-y",c.y);g.push(a)}}});d.mousedown(function(a){function j(a){a.preventDefault();
+var b=f(V(a.target)),e=R((b.data("pos-x")||0)+a.pageX-p),a=R((b.data("pos-y")||0)+a.pageY-s);c.call(d,r,l,m,o,e,a)}function k(a){a.preventDefault()}function n(a){a.preventDefault();f(g).unbind("mousemove",j).unbind("mouseup",n).unbind("selectstart",k);i.releaseCapture&&i.releaseCapture()}a.stopPropagation();var i=d.get(),r=t(b.css("left")),l=t(b.css("top")),m=b.width(),o=b.height(),p=a.pageX,s=a.pageY;e&&e();f(g).mousemove(j).mouseup(n).bind("selectstart",k);i.setCapture&&i.setCapture()})}function S(a){this.init(a)}
+function Ya(a){return new S(a)}function Xa(a){a=f(a)[0];return a.contentDocument||a.contentWindow.document}function $b(a,b,c,d){var e=[Za===""?"<html>":'<html dir="'+Za+'">','<head><meta charset="utf-8" /><title></title>',"<style>","html {margin:0;padding:0;}","body {margin:0;padding:5px;}",'body, td {font:12px/1.5 "sans serif",tahoma,verdana,helvetica;}',"body, p, div {word-wrap: break-word;}","p {margin:5px 0;}","table {border-collapse:collapse;}","img {border:0;}","noscript {display:none;}","table.ke-zeroborder td {border:1px dotted #AAA;}",
+"img.ke-flash {","\tborder:1px solid #AAA;","\tbackground-image:url("+a+"common/flash.gif);","\tbackground-position:center center;","\tbackground-repeat:no-repeat;","\twidth:100px;","\theight:100px;","}","img.ke-rm {","\tborder:1px solid #AAA;","\tbackground-image:url("+a+"common/rm.gif);","\tbackground-position:center center;","\tbackground-repeat:no-repeat;","\twidth:100px;","\theight:100px;","}","img.ke-media {","\tborder:1px solid #AAA;","\tbackground-image:url("+a+"common/media.gif);","\tbackground-position:center center;",
+"\tbackground-repeat:no-repeat;","\twidth:100px;","\theight:100px;","}","img.ke-anchor {","\tborder:1px dashed #666;","\twidth:16px;","\theight:16px;","}",".ke-script, .ke-noscript, .ke-display-none {","\tdisplay:none;","\tfont-size:0;","\twidth:0;","\theight:0;","}",".ke-pagebreak {","\tborder:1px dotted #AAA;","\tfont-size:0;","\theight:2px;","}","</style>"];Z(c)||(c=[c]);m(c,function(a,b){b&&e.push('<link href="'+b+'" rel="stylesheet" />')});d&&e.push("<style>"+d+"</style>");e.push("</head><body "+
+(b?'class="'+b+'"':"")+"></body></html>");return e.join("\n")}function pa(a,b){if(a.hasVal()){if(b===i){var c=a.val();return c=c.replace(/(<(?:p|p\s[^>]*)>) *(<\/p>)/ig,"")}return a.val(b)}return a.html(b)}function qa(a){this.init(a)}function Ab(a){return new qa(a)}function Bb(a,b){var c=this.get(a);c&&!c.hasClass("ke-disabled")&&b(c)}function Da(a){this.init(a)}function Cb(a){return new Da(a)}function ra(a){this.init(a)}function $a(a){return new ra(a)}function sa(a){this.init(a)}function Db(a){return new sa(a)}
+function ab(a){this.init(a)}function ta(a){this.init(a)}function Eb(a){return new ta(a)}function bb(a,b){var c=document.getElementsByTagName("head")[0]||(P?document.body:document.documentElement),d=document.createElement("script");c.appendChild(d);d.src=a;d.charset="utf-8";d.onload=d.onreadystatechange=function(){if(!this.readyState||this.readyState==="loaded")b&&b(),d.onload=d.onreadystatechange=null,c.removeChild(d)}}function Fb(a){var b=a.indexOf("?");return b>0?a.substr(0,b):a}function cb(a){for(var b=
+document.getElementsByTagName("head")[0]||(P?document.body:document.documentElement),c=document.createElement("link"),d=Fb(ia(a,"absolute")),e=f('link[rel="stylesheet"]',b),g=0,h=e.length;g<h;g++)if(Fb(ia(e[g].href,"absolute"))===d)return;b.appendChild(c);c.href=a;c.rel="stylesheet"}function Gb(a,b){if(a===i)return N;if(!b)return N[a];N[a]=b}function Hb(a){var b,c="core";if(b=/^(\w+)\.(\w+)$/.exec(a))c=b[1],a=b[2];return{ns:c,key:a}}function Ib(a,b){b=b===i?f.options.langType:b;if(typeof a==="string"){if(!O[b])return"no language";
+var c=a.length-1;if(a.substr(c)===".")return O[b][a.substr(0,c)];c=Hb(a);return O[b][c.ns][c.key]}m(a,function(a,c){var g=Hb(a);O[b]||(O[b]={});O[b][g.ns]||(O[b][g.ns]={});O[b][g.ns][g.key]=c})}function Ea(a,b){if(!a.collapsed){var a=a.cloneRange().up(),c=a.startContainer,d=a.startOffset;if(X||a.isControl())if((c=f(c.childNodes[d]))&&c.name=="img"&&b(c))return c}}function ac(){var a=this;f(a.edit.doc).contextmenu(function(b){a.menu&&a.hideMenu();if(a.useContextmenu){if(a._contextmenus.length!==0){var c=
+0,d=[];for(m(a._contextmenus,function(){if(this.title=="-")d.push(this);else if(this.cond&&this.cond()&&(d.push(this),this.width&&this.width>c))c=this.width});d.length>0&&d[0].title=="-";)d.shift();for(;d.length>0&&d[d.length-1].title=="-";)d.pop();var e=null;m(d,function(a){this.title=="-"&&e.title=="-"&&delete d[a];e=this});if(d.length>0){b.preventDefault();var g=f(a.edit.iframe).pos(),h=$a({x:g.x+b.clientX,y:g.y+b.clientY,width:c,css:{visibility:"hidden"},shadowMode:a.shadowMode});m(d,function(){this.title&&
+h.addItem(this)});var g=G(h.doc),j=h.div.height();b.clientY+j>=g.clientHeight-100&&h.pos(h.x,t(h.y)-j);h.div.css("visibility","visible");a.menu=h}}}else b.preventDefault()})}function bc(){function a(a){for(a=f(a.commonAncestor());a;){if(a.type==1&&!a.isStyle())break;a=a.parent()}return a.name}var b=this,c=b.edit.doc,d=b.newlineTag;if(!(o&&d!=="br")&&(!Y||!(A<3&&d!=="p"))&&!(Pa&&A<9)){var e=u("h1,h2,h3,h4,h5,h6,pre,li"),g=u("p,h1,h2,h3,h4,h5,h6,pre,li,blockquote");f(c).keydown(function(f){if(!(f.which!=
+13||f.shiftKey||f.ctrlKey||f.altKey)){b.cmd.selection();var j=a(b.cmd.range);j=="marquee"||j=="select"||(d==="br"&&!e[j]?(f.preventDefault(),b.insertHtml("<br />"+(o&&A<9?"":"\u200b"))):g[j]||Q(c,"formatblock","<p>"))}});f(c).keyup(function(e){if(!(e.which!=13||e.shiftKey||e.ctrlKey||e.altKey)&&d!="br")if(Y){var e=b.cmd.commonAncestor("p"),j=b.cmd.commonAncestor("a");j&&j.text()==""&&(j.remove(!0),b.cmd.range.selectNodeContents(e[0]).collapse(!0),b.cmd.select())}else if(b.cmd.selection(),e=a(b.cmd.range),
+!(e=="marquee"||e=="select"))if(g[e]||Q(c,"formatblock","<p>"),e=b.cmd.commonAncestor("div")){for(var j=f("<p></p>"),k=e[0].firstChild;k;){var n=k.nextSibling;j.append(k);k=n}e.before(j);e.remove();b.cmd.range.selectNodeContents(j[0]);b.cmd.select()}})}}function cc(){var a=this,b=a.edit.doc;f(b).keydown(function(c){if(c.which==9)if(c.preventDefault(),a.afterTab)a.afterTab.call(a,c);else{var c=a.cmd,d=c.range;d.shrink();d.collapsed&&d.startContainer.nodeType==1&&(d.insertNode(f("@&nbsp;",b)[0]),c.select());
+a.insertHtml("&nbsp;&nbsp;&nbsp;&nbsp;")}})}function dc(){var a=this;f(a.edit.textarea[0],a.edit.win).focus(function(b){a.afterFocus&&a.afterFocus.call(a,b)}).blur(function(b){a.afterBlur&&a.afterBlur.call(a,b)})}function T(a){return B(a.replace(/<span [^>]*id="?__kindeditor_bookmark_\w+_\d+__"?[^>]*><\/span>/ig,""))}function Fa(a){return a.replace(/<div[^>]+class="?__kindeditor_paste__"?[^>]*>[\s\S]*?<\/div>/ig,"")}function Jb(a,b){if(a.length===0)a.push(b);else{var c=a[a.length-1];T(b.html)!==T(c.html)&&
+a.push(b)}}function Kb(a,b){var c=this.edit,d=c.doc.body,e,g;if(a.length===0)return this;c.designMode?(e=this.cmd.range,g=e.createBookmark(!0),g.html=d.innerHTML):g={html:d.innerHTML};Jb(b,g);var h=a.pop();T(g.html)===T(h.html)&&a.length>0&&(h=a.pop());c.designMode?(c.html(h.html),h.start&&(e.moveToBookmark(h),this.select())):f(d).html(T(h.html));return this}function ua(a){function b(a,b){ua.prototype[a]===i&&(c[a]=b);c.options[a]=b}var c=this;c.options={};m(a,function(c){b(c,a[c])});m(f.options,
+function(a,d){c[a]===i&&b(a,d)});var d=f(c.srcElement||"<textarea/>");if(!c.width)c.width=d[0].style.width||d.width();if(!c.height)c.height=d[0].style.height||d.height();b("width",l(c.width,c.minWidth));b("height",l(c.height,c.minHeight));b("width",s(c.width));b("height",s(c.height));if(ec&&(!fc||A<534))c.designMode=!1;c.srcElement=d;c.initContent="";c.plugin={};c.isCreated=!1;c._handlers={};c._contextmenus=[];c._undoStack=[];c._redoStack=[];c._firstAddBookmark=!0;c.menu=c.contextmenu=null;c.dialogs=
+[]}function Lb(a,b){function c(a){m(N,function(b,c){wa(c)&&c.call(a,KindEditor)});return a.create()}b=b||{};b.basePath=l(b.basePath,f.basePath);b.themesPath=l(b.themesPath,b.basePath+"themes/");b.langPath=l(b.langPath,b.basePath+"lang/");b.pluginsPath=l(b.pluginsPath,b.basePath+"plugins/");if(l(b.loadStyleMode,f.options.loadStyleMode)){var d=l(b.themeType,f.options.themeType);cb(b.themesPath+"default/default.css");cb(b.themesPath+d+"/"+d+".css")}if((d=f(a))&&d.length!==0){if(d.length>1)return d.each(function(){Lb(this,
+b)}),_instances[0];b.srcElement=d[0];var e=new ua(b);_instances.push(e);if(O[e.langType])return c(e);bb(e.langPath+e.langType+".js?ver="+encodeURIComponent(f.DEBUG?Ga:Ha),function(){c(e)});return e}}function va(a,b){f(a).each(function(a,d){f.each(_instances,function(a,c){if(c&&c.srcElement[0]==d)return b.call(c,a),!1})})}if(!w.KindEditor){if(!w.console)w.console={};if(!console.log)console.log=function(){};var Ha="4.1.10 (2013-11-23)",p=navigator.userAgent.toLowerCase(),o=p.indexOf("msie")>-1&&p.indexOf("opera")==
+-1,Yb=p.indexOf("msie")==-1&&p.indexOf("trident")>-1,Y=p.indexOf("gecko")>-1&&p.indexOf("khtml")==-1,X=p.indexOf("applewebkit")>-1,Pa=p.indexOf("opera")>-1,ec=p.indexOf("mobile")>-1,fc=/ipad|iphone|ipod/.test(p),P=document.compatMode!="CSS1Compat",H=!w.getSelection,A=(p=/(?:msie|firefox|webkit|opera)[\/:\s](\d+)/.exec(p))?p[1]:"0",Ga=(new Date).getTime(),R=Math.round,f={DEBUG:!1,VERSION:Ha,IE:o,GECKO:Y,WEBKIT:X,OPERA:Pa,V:A,TIME:Ga,each:m,isArray:Z,isFunction:wa,inArray:J,inString:xa,trim:B,addUnit:s,
+removeUnit:t,escape:C,unescape:fa,toCamel:ga,toHex:ya,toMap:u,toArray:Ja,undef:l,invalidUrl:function(a){return!a||/[<>"]/.test(a)},addParam:function(a,b){return a.indexOf("?")>=0?a+"&"+b:a+"?"+b},extend:E,json:eb},lb=u("a,abbr,acronym,b,basefont,bdo,big,br,button,cite,code,del,dfn,em,font,i,img,input,ins,kbd,label,map,q,s,samp,select,small,span,strike,strong,sub,sup,textarea,tt,u,var"),mb=u("address,applet,blockquote,body,center,dd,dir,div,dl,dt,fieldset,form,frameset,h1,h2,h3,h4,h5,h6,head,hr,html,iframe,ins,isindex,li,map,menu,meta,noframes,noscript,object,ol,p,pre,script,style,table,tbody,td,tfoot,th,thead,title,tr,ul"),
+kb=u("area,base,basefont,br,col,frame,hr,img,input,isindex,link,meta,param,embed"),Mb=u("b,basefont,big,del,em,font,i,s,small,span,strike,strong,sub,sup,u"),gc=u("img,table,input,textarea,button"),La=u("pre,style,script"),Ia=u("html,head,body,td,tr,table,ol,ul,li");u("colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr");var Ub=u("checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected"),Nb=u("input,button,textarea,select");f.basePath=function(){for(var a=
+document.getElementsByTagName("script"),b,c=0,d=a.length;c<d;c++)if(b=a[c].src||"",/kindeditor[\w\-\.]*\.js/.test(b))return b.substring(0,b.lastIndexOf("/")+1);return""}();f.options={designMode:!0,fullscreenMode:!1,filterMode:!0,wellFormatMode:!0,shadowMode:!0,loadStyleMode:!0,basePath:f.basePath,themesPath:f.basePath+"themes/",langPath:f.basePath+"lang/",pluginsPath:f.basePath+"plugins/",themeType:"default",langType:"zh_CN",urlType:"",newlineTag:"p",resizeType:2,syncType:"form",pasteType:2,dialogAlignType:"page",
+useContextmenu:!0,fullscreenShortcut:!1,bodyClass:"ke-content",indentChar:"\t",cssPath:"",cssData:"",minWidth:650,minHeight:100,minChangeSize:50,zIndex:811213,items:["source","|","undo","redo","|","preview","print","template","code","cut","copy","paste","plainpaste","wordpaste","|","justifyleft","justifycenter","justifyright","justifyfull","insertorderedlist","insertunorderedlist","indent","outdent","subscript","superscript","clearhtml","quickformat","selectall","|","fullscreen","/","formatblock",
+"fontname","fontsize","|","forecolor","hilitecolor","bold","italic","underline","strikethrough","lineheight","removeformat","|","image","multiimage","flash","media","insertfile","table","hr","emoticons","baidumap","pagebreak","anchor","link","unlink","|","about"],noDisableItems:["source","fullscreen"],colorTable:[["#E53333","#E56600","#FF9900","#64451D","#DFC5A4","#FFE500"],["#009900","#006600","#99BB00","#B8D100","#60D978","#00D5FF"],["#337FE5","#003399","#4C33E5","#9933E5","#CC33E5","#EE33EE"],
+["#FFFFFF","#CCCCCC","#999999","#666666","#333333","#000000"]],fontSizeTable:["9px","10px","12px","14px","16px","18px","24px","32px"],htmlTags:{font:["id","class","color","size","face",".background-color"],span:["id","class",".color",".background-color",".font-size",".font-family",".background",".font-weight",".font-style",".text-decoration",".vertical-align",".line-height"],div:["id","class","align",".border",".margin",".padding",".text-align",".color",".background-color",".font-size",".font-family",
+".font-weight",".background",".font-style",".text-decoration",".vertical-align",".margin-left"],table:["id","class","border","cellspacing","cellpadding","width","height","align","bordercolor",".padding",".margin",".border","bgcolor",".text-align",".color",".background-color",".font-size",".font-family",".font-weight",".font-style",".text-decoration",".background",".width",".height",".border-collapse"],"td,th":["id","class","align","valign","width","height","colspan","rowspan","bgcolor",".text-align",
+".color",".background-color",".font-size",".font-family",".font-weight",".font-style",".text-decoration",".vertical-align",".background",".border"],a:["id","class","href","target","name"],embed:["id","class","src","width","height","type","loop","autostart","quality",".width",".height","align","allowscriptaccess"],img:["id","class","src","width","height","border","alt","title","align",".width",".height",".border"],"p,ol,ul,li,blockquote,h1,h2,h3,h4,h5,h6":["id","class","align",".text-align",".color",
+".background-color",".font-size",".font-family",".background",".font-weight",".font-style",".text-decoration",".vertical-align",".text-indent",".margin-left"],pre:["id","class"],hr:["id","class",".page-break-after"],"br,tbody,tr,strong,b,sub,sup,em,i,u,strike,s,del":["id","class"],iframe:["id","class","src","frameborder","width","height",".width",".height"]},layout:'<div class="container"><div class="toolbar"></div><div class="edit"></div><div class="statusbar"></div></div>'};var fb=!1,Ob=u("8,9,13,32,46,48..57,59,61,65..90,106,109..111,188,190..192,219..222"),
+p=u("33..40"),db={};m(Ob,function(a,b){db[a]=b});m(p,function(a,b){db[a]=b});var hc="altKey,attrChange,attrName,bubbles,button,cancelable,charCode,clientX,clientY,ctrlKey,currentTarget,data,detail,eventPhase,fromElement,handler,keyCode,metaKey,newValue,offsetX,offsetY,originalTarget,pageX,pageY,prevValue,relatedNode,relatedTarget,screenX,screenY,shiftKey,srcElement,target,toElement,view,wheelDelta,which".split(",");E(gb,{init:function(a,b){var c=this,d=a.ownerDocument||a.document||a;c.event=b;m(hc,
+function(a,d){c[d]=b[d]});if(!c.target)c.target=c.srcElement||d;if(c.target.nodeType===3)c.target=c.target.parentNode;if(!c.relatedTarget&&c.fromElement)c.relatedTarget=c.fromElement===c.target?c.toElement:c.fromElement;if(c.pageX==null&&c.clientX!=null){var e=d.documentElement,d=d.body;c.pageX=c.clientX+(e&&e.scrollLeft||d&&d.scrollLeft||0)-(e&&e.clientLeft||d&&d.clientLeft||0);c.pageY=c.clientY+(e&&e.scrollTop||d&&d.scrollTop||0)-(e&&e.clientTop||d&&d.clientTop||0)}if(!c.which&&(c.charCode||c.charCode===
+0?c.charCode:c.keyCode))c.which=c.charCode||c.keyCode;if(!c.metaKey&&c.ctrlKey)c.metaKey=c.ctrlKey;if(!c.which&&c.button!==i)c.which=c.button&1?1:c.button&2?3:c.button&4?2:0;switch(c.which){case 186:c.which=59;break;case 187:case 107:case 43:c.which=61;break;case 189:case 45:c.which=109;break;case 42:c.which=106;break;case 47:c.which=111;break;case 78:c.which=110}c.which>=96&&c.which<=105&&(c.which-=48)},preventDefault:function(){var a=this.event;a.preventDefault?a.preventDefault():a.returnValue=
+!1},stopPropagation:function(){var a=this.event;a.stopPropagation?a.stopPropagation():a.cancelBubble=!0},stop:function(){this.preventDefault();this.stopPropagation()}});var $="kindeditor_"+Ga,ib=0,v={},Pb=!1;o&&w.attachEvent("onunload",function(){m(v,function(a,b){b.el&&ha(b.el)})});f.ctrl=Ka;f.ready=function(a){function b(){e||(e=!0,a(KindEditor),Pb=!0)}function c(){if(!e){try{document.documentElement.doScroll("left")}catch(a){setTimeout(c,100);return}b()}}function d(){document.readyState==="complete"&&
+b()}if(Pb)a(KindEditor);else{var e=!1;if(document.addEventListener)aa(document,"DOMContentLoaded",b);else if(document.attachEvent){aa(document,"readystatechange",d);var g=!1;try{g=w.frameElement==null}catch(f){}document.documentElement.doScroll&&g&&c()}aa(w,"load",b)}};f.formatUrl=ia;f.formatHtml=U;f.getCssList=ba;f.getAttrList=I;f.mediaType=ob;f.mediaAttrs=pb;f.mediaEmbed=Ma;f.mediaImg=qb;f.clearMsWord=nb;f.tmpl=function(a,b){var c=new Function("obj","var p=[],print=function(){p.push.apply(p,arguments);};with(obj){p.push('"+
+a.replace(/[\r\t\n]/g," ").split("<%").join("\t").replace(/((^|%>)[^\t]*)'/g,"$1\r").replace(/\t=(.*?)%>/g,"',$1,'").split("\t").join("');").split("%>").join("p.push('").split("\r").join("\\'")+"');}return p.join('');");return b?c(b):c};p=document.createElement("div");p.setAttribute("className","t");var Vb=p.className!=="t";f.query=function(a,b){var c=Ca(a,b);return c.length>0?c[0]:null};f.queryAll=Ca;E(D,{init:function(a){for(var a=Z(a)?a:[a],b=0,c=0,d=a.length;c<d;c++)a[c]&&(this[c]=a[c].constructor===
+D?a[c][0]:a[c],b++);this.length=b;this.doc=V(this[0]);this.name=Oa(this[0]);this.type=this.length>0?this[0].nodeType:null;this.win=W(this[0])},each:function(a){for(var b=0;b<this.length;b++)if(a.call(this[b],b,this[b])===!1)break;return this},bind:function(a,b){this.each(function(){aa(this,a,b)});return this},unbind:function(a,b){this.each(function(){ha(this,a,b)});return this},fire:function(a){if(this.length<1)return this;jb(this[0],a);return this},hasAttr:function(a){if(this.length<1)return!1;return!!Ba(this[0],
+a)},attr:function(a,b){var c=this;if(a===i)return I(c.outer());if(typeof a==="object")return m(a,function(a,b){c.attr(a,b)}),c;if(b===i)return b=c.length<1?null:Ba(c[0],a),b===null?"":b;c.each(function(){Na(this,a,b)});return c},removeAttr:function(a){this.each(function(){var b=a;o&&A<8&&b.toLowerCase()=="class"&&(b="className");Na(this,b,"");this.removeAttribute(b)});return this},get:function(a){if(this.length<1)return null;return this[a||0]},eq:function(a){if(this.length<1)return null;return this[a]?
+new D(this[a]):null},hasClass:function(a){if(this.length<1)return!1;return xa(a,this[0].className," ")},addClass:function(a){this.each(function(){if(!xa(a,this.className," "))this.className=B(this.className+" "+a)});return this},removeClass:function(a){this.each(function(){if(xa(a,this.className," "))this.className=B(this.className.replace(RegExp("(^|\\s)"+a+"(\\s|$)")," "))});return this},html:function(a){if(a===i){if(this.length<1||this.type!=1)return"";return U(this[0].innerHTML)}this.each(function(){Wb(this,
+a)});return this},text:function(){if(this.length<1)return"";return o?this[0].innerText:this[0].textContent},hasVal:function(){if(this.length<1)return!1;return!!Nb[Oa(this[0])]},val:function(a){if(a===i){if(this.length<1)return"";return this.hasVal()?this[0].value:this.attr("value")}else return this.each(function(){Nb[Oa(this)]?this.value=a:Na(this,"value",a)}),this},css:function(a,b){var c=this;if(a===i)return ba(c.attr("style"));if(typeof a==="object")return m(a,function(a,b){c.css(a,b)}),c;if(b===
+i){if(c.length<1)return"";return c[0].style[ga(a)]||Xb(c[0],a)||""}c.each(function(){this.style[ga(a)]=b});return c},width:function(a){if(a===i){if(this.length<1)return 0;return this[0].offsetWidth}return this.css("width",s(a))},height:function(a){if(a===i){if(this.length<1)return 0;return this[0].offsetHeight}return this.css("height",s(a))},opacity:function(a){this.each(function(){this.style.opacity===i?this.style.filter=a==1?"":"alpha(opacity="+a*100+")":this.style.opacity=a==1?"":a});return this},
+data:function(a,b){a="kindeditor_data_"+a;if(b===i){if(this.length<1)return null;return this[0][a]}this.each(function(){this[a]=b});return this},pos:function(){var a=this[0],b=0,c=0;if(a)if(a.getBoundingClientRect)a=a.getBoundingClientRect(),c=ca(this.doc),b=a.left+c.x,c=a.top+c.y;else for(;a;)b+=a.offsetLeft,c+=a.offsetTop,a=a.offsetParent;return{x:R(b),y:R(c)}},clone:function(a){if(this.length<1)return new D([]);return new D(this[0].cloneNode(a))},append:function(a){this.each(function(){this.appendChild&&
+this.appendChild(f(a)[0])});return this},appendTo:function(a){this.each(function(){f(a)[0].appendChild(this)});return this},before:function(a){this.each(function(){this.parentNode.insertBefore(f(a)[0],this)});return this},after:function(a){this.each(function(){this.nextSibling?this.parentNode.insertBefore(f(a)[0],this.nextSibling):this.parentNode.appendChild(f(a)[0])});return this},replaceWith:function(a){var b=[];this.each(function(c,d){ha(d);var e=f(a)[0];d.parentNode.replaceChild(e,d);b.push(e)});
+return f(b)},empty:function(){this.each(function(a,b){for(var c=b.firstChild;c;){if(!b.parentNode)break;var d=c.nextSibling;c.parentNode.removeChild(c);c=d}});return this},remove:function(a){var b=this;b.each(function(c,d){if(d.parentNode){ha(d);if(a)for(var e=d.firstChild;e;){var g=e.nextSibling;d.parentNode.insertBefore(e,d);e=g}d.parentNode.removeChild(d);delete b[c]}});b.length=0;return b},show:function(a){a===i&&(a=this._originDisplay||"");if(this.css("display")!="none")return this;return this.css("display",
+a)},hide:function(){if(this.length<1)return this;this._originDisplay=this[0].style.display;return this.css("display","none")},outer:function(){if(this.length<1)return"";var a=this.doc.createElement("div");a.appendChild(this[0].cloneNode(!0));return U(a.innerHTML)},isSingle:function(){return!!kb[this.name]},isInline:function(){return!!lb[this.name]},isBlock:function(){return!!mb[this.name]},isStyle:function(){return!!Mb[this.name]},isControl:function(){return!!gc[this.name]},contains:function(a){if(this.length<
+1)return!1;return Aa(this[0],f(a)[0])},parent:function(){if(this.length<1)return null;var a=this[0].parentNode;return a?new D(a):null},children:function(){if(this.length<1)return new D([]);for(var a=[],b=this[0].firstChild;b;)(b.nodeType!=3||B(b.nodeValue)!=="")&&a.push(b),b=b.nextSibling;return new D(a)},first:function(){var a=this.children();return a.length>0?a.eq(0):null},last:function(){var a=this.children();return a.length>0?a.eq(a.length-1):null},index:function(){if(this.length<1)return-1;for(var a=
+-1,b=this[0];b;)a++,b=b.previousSibling;return a},prev:function(){if(this.length<1)return null;var a=this[0].previousSibling;return a?new D(a):null},next:function(){if(this.length<1)return null;var a=this[0].nextSibling;return a?new D(a):null},scan:function(a,b){function c(d){for(d=b?d.firstChild:d.lastChild;d;){var e=b?d.nextSibling:d.previousSibling;if(a(d)===!1)return!1;if(c(d)===!1)return!1;d=e}}if(!(this.length<1))return b=b===i?!0:b,c(this[0]),this}});m("blur,focus,focusin,focusout,load,resize,scroll,unload,click,dblclick,mousedown,mouseup,mousemove,mouseover,mouseout,mouseenter,mouseleave,change,select,submit,keydown,keypress,keyup,error,contextmenu".split(","),
+function(a,b){D.prototype[b]=function(a){return a?this.bind(b,a):this.fire(b)}});p=f;f=function(a,b){function c(a){a[0]||(a=[]);return new D(a)}if(!(a===i||a===null)){if(typeof a==="string"){b&&(b=f(b)[0]);var d=a.length;a.charAt(0)==="@"&&(a=a.substr(1));if(a.length!==d||/<.+>/.test(a)){var d=(b?b.ownerDocument||b:document).createElement("div"),e=[];d.innerHTML='<img id="__kindeditor_temp_tag__" width="0" height="0" style="display:none;" />'+a;for(var g=0,h=d.childNodes.length;g<h;g++){var j=d.childNodes[g];
+j.id!="__kindeditor_temp_tag__"&&e.push(j)}return c(e)}return c(Ca(a,b))}if(a&&a.constructor===D)return a;a.toArray&&(a=a.toArray());if(Z(a))return c(a);return c(Ja(arguments))}};m(p,function(a,b){f[a]=b});f.NodeClass=D;w.KindEditor=f;var la=0,ka=1,da=2,ma=3,Qb=0;E(M,{init:function(a){this.startContainer=a;this.startOffset=0;this.endContainer=a;this.endOffset=0;this.collapsed=!0;this.doc=a},commonAncestor:function(){function a(a){for(var b=[];a;)b.push(a),a=a.parentNode;return b}for(var b=a(this.startContainer),
+c=a(this.endContainer),d=0,e=b.length,g=c.length,f,j;++d;)if(f=b[e-d],j=c[g-d],!f||!j||f!==j)break;return b[e-d+1]},setStart:function(a,b){var c=this.doc;this.startContainer=a;this.startOffset=b;if(this.endContainer===c)this.endContainer=a,this.endOffset=b;return rb(this)},setEnd:function(a,b){var c=this.doc;this.endContainer=a;this.endOffset=b;if(this.startContainer===c)this.startContainer=a,this.startOffset=b;return rb(this)},setStartBefore:function(a){return this.setStart(a.parentNode||this.doc,
+f(a).index())},setStartAfter:function(a){return this.setStart(a.parentNode||this.doc,f(a).index()+1)},setEndBefore:function(a){return this.setEnd(a.parentNode||this.doc,f(a).index())},setEndAfter:function(a){return this.setEnd(a.parentNode||this.doc,f(a).index()+1)},selectNode:function(a){return this.setStartBefore(a).setEndAfter(a)},selectNodeContents:function(a){var b=f(a);if(b.type==3||b.isSingle())return this.selectNode(a);b=b.children();if(b.length>0)return this.setStartBefore(b[0]).setEndAfter(b[b.length-
+1]);return this.setStart(a,0).setEnd(a,0)},collapse:function(a){if(a)return this.setEnd(this.startContainer,this.startOffset);return this.setStart(this.endContainer,this.endOffset)},compareBoundaryPoints:function(a,b){var c=this.get(),d=b.get();if(H){var e={};e[la]="StartToStart";e[ka]="EndToStart";e[da]="EndToEnd";e[ma]="StartToEnd";c=c.compareEndPoints(e[a],d);if(c!==0)return c;var g,h,j,k;if(a===la||a===ma)g=this.startContainer,j=this.startOffset;if(a===ka||a===da)g=this.endContainer,j=this.endOffset;
+if(a===la||a===ka)h=b.startContainer,k=b.startOffset;if(a===da||a===ma)h=b.endContainer,k=b.endOffset;if(g===h)return g=j-k,g>0?1:g<0?-1:0;for(c=h;c&&c.parentNode!==g;)c=c.parentNode;if(c)return f(c).index()>=j?-1:1;for(c=g;c&&c.parentNode!==h;)c=c.parentNode;if(c)return f(c).index()>=k?1:-1;if((c=f(h).next())&&c.contains(g))return 1;if((c=f(g).next())&&c.contains(h))return-1}else return c.compareBoundaryPoints(a,d)},cloneRange:function(){return(new M(this.doc)).setStart(this.startContainer,this.startOffset).setEnd(this.endContainer,
+this.endOffset)},toString:function(){var a=this.get();return(H?a.text:a.toString()).replace(/\r\n|\n|\r/g,"")},cloneContents:function(){return Qa(this,!0,!1)},deleteContents:function(){return Qa(this,!1,!0)},extractContents:function(){return Qa(this,!0,!0)},insertNode:function(a){var b=this.startContainer,c=this.startOffset,d=this.endContainer,e=this.endOffset,g,f,j,k=1;if(a.nodeName.toLowerCase()==="#document-fragment")g=a.firstChild,f=a.lastChild,k=a.childNodes.length;b.nodeType==1?(j=b.childNodes[c])?
+(b.insertBefore(a,j),b===d&&(e+=k)):b.appendChild(a):b.nodeType==3&&(c===0?(b.parentNode.insertBefore(a,b),b.parentNode===d&&(e+=k)):c>=b.nodeValue.length?b.nextSibling?b.parentNode.insertBefore(a,b.nextSibling):b.parentNode.appendChild(a):(j=c>0?b.splitText(c):b,b.parentNode.insertBefore(a,j),b===d&&(d=j,e-=c)));g?this.setStartBefore(g).setEndAfter(f):this.selectNode(a);if(this.compareBoundaryPoints(da,this.cloneRange().setEnd(d,e))>=1)return this;return this.setEnd(d,e)},surroundContents:function(a){a.appendChild(this.extractContents());
+return this.insertNode(a).selectNode(a)},isControl:function(){var a=this.startContainer,b=this.startOffset,c=this.endContainer,d=this.endOffset;return a.nodeType==1&&a===c&&b+1===d&&f(a.childNodes[b]).isControl()},get:function(a){var b=this.doc;if(!H){b=b.createRange();try{b.setStart(this.startContainer,this.startOffset),b.setEnd(this.endContainer,this.endOffset)}catch(c){}return b}if(a&&this.isControl())return b=b.body.createControlRange(),b.addElement(this.startContainer.childNodes[this.startOffset]),
+b;a=this.cloneRange().down();b=b.body.createTextRange();b.setEndPoint("StartToStart",tb(a.startContainer,a.startOffset));b.setEndPoint("EndToStart",tb(a.endContainer,a.endOffset));return b},html:function(){return f(this.cloneContents()).outer()},down:function(){function a(a,d,e){if(a.nodeType==1&&(a=f(a).children(),a.length!==0)){var g,h,j,k;d>0&&(g=a.eq(d-1));d<a.length&&(h=a.eq(d));if(g&&g.type==3)j=g[0],k=j.nodeValue.length;h&&h.type==3&&(j=h[0],k=0);j&&(e?b.setStart(j,k):b.setEnd(j,k))}}var b=
+this;a(b.startContainer,b.startOffset,!0);a(b.endContainer,b.endOffset,!1);return b},up:function(){function a(a,d,e){a.nodeType==3&&(d===0?e?b.setStartBefore(a):b.setEndBefore(a):d==a.nodeValue.length&&(e?b.setStartAfter(a):b.setEndAfter(a)))}var b=this;a(b.startContainer,b.startOffset,!0);a(b.endContainer,b.endOffset,!1);return b},enlarge:function(a){function b(b,e,g){b=f(b);if(!(b.type==3||Ia[b.name]||!a&&b.isBlock()))if(e===0){for(;!b.prev();){e=b.parent();if(!e||Ia[e.name]||!a&&e.isBlock())break;
+b=e}g?c.setStartBefore(b[0]):c.setEndBefore(b[0])}else if(e==b.children().length){for(;!b.next();){e=b.parent();if(!e||Ia[e.name]||!a&&e.isBlock())break;b=e}g?c.setStartAfter(b[0]):c.setEndAfter(b[0])}}var c=this;c.up();b(c.startContainer,c.startOffset,!0);b(c.endContainer,c.endOffset,!1);return c},shrink:function(){for(var a,b=this.collapsed;this.startContainer.nodeType==1&&(a=this.startContainer.childNodes[this.startOffset])&&a.nodeType==1&&!f(a).isSingle();)this.setStart(a,0);if(b)return this.collapse(b);
+for(;this.endContainer.nodeType==1&&this.endOffset>0&&(a=this.endContainer.childNodes[this.endOffset-1])&&a.nodeType==1&&!f(a).isSingle();)this.setEnd(a,a.childNodes.length);return this},createBookmark:function(a){var b,c=f('<span style="display:none;"></span>',this.doc)[0];c.id="__kindeditor_bookmark_start_"+Qb++ +"__";if(!this.collapsed)b=c.cloneNode(!0),b.id="__kindeditor_bookmark_end_"+Qb++ +"__";b&&this.cloneRange().collapse(!1).insertNode(b).setEndBefore(b);this.insertNode(c).setStartAfter(c);
+return{start:a?"#"+c.id:c,end:b?a?"#"+b.id:b:null}},moveToBookmark:function(a){var b=this.doc,c=f(a.start,b),a=a.end?f(a.end,b):null;if(!c||c.length<1)return this;this.setStartBefore(c[0]);c.remove();a&&a.length>0?(this.setEndBefore(a[0]),a.remove()):this.collapse(!0);return this},dump:function(){console.log("--------------------");console.log(this.startContainer.nodeType==3?this.startContainer.nodeValue:this.startContainer,this.startOffset);console.log(this.endContainer.nodeType==3?this.endContainer.nodeValue:
+this.endContainer,this.endOffset)}});f.RangeClass=M;f.range=Ra;f.START_TO_START=la;f.START_TO_END=ka;f.END_TO_END=da;f.END_TO_START=ma;E(oa,{init:function(a){var b=a.doc;this.doc=b;this.win=W(b);this.sel=Sa(b);this.range=a},selection:function(a){var b=this.doc,c;c=Sa(b);var d;try{d=c.rangeCount>0?c.getRangeAt(0):c.createRange()}catch(e){}c=H&&(!d||!d.item&&d.parentElement().ownerDocument!==b)?null:d;this.sel=Sa(b);if(c)return this.range=Ra(c),f(this.range.startContainer).name=="html"&&this.range.selectNodeContents(b.body).collapse(!1),
+this;a&&this.range.selectNodeContents(b.body).collapse(!1);return this},select:function(a){var a=l(a,!0),b=this.sel,c=this.range.cloneRange().shrink(),d=c.startContainer,e=c.startOffset,g=V(d),h=this.win,j,k=!1;if(a&&d.nodeType==1&&c.collapsed){if(H){b=f("<span>&nbsp;</span>",g);c.insertNode(b[0]);j=g.body.createTextRange();try{j.moveToElementText(b[0])}catch(n){}j.collapse(!1);j.select();b.remove();h.focus();return this}if(X&&(a=d.childNodes,f(d).isInline()||e>0&&f(a[e-1]).isInline()||a[e]&&f(a[e]).isInline()))c.insertNode(g.createTextNode("\u200b")),
+k=!0}if(H)try{j=c.get(!0),j.select()}catch(i){}else k&&c.collapse(!1),j=c.get(!0),b.removeAllRanges(),b.addRange(j),g!==document&&(c=f(j.endContainer).pos(),h.scrollTo(c.x,c.y));h.focus();return this},wrap:function(a){var b=this.range,c;c=f(a,this.doc);if(b.collapsed)return b.shrink(),b.insertNode(c[0]).selectNodeContents(c[0]),this;if(c.isBlock()){for(var d=a=c.clone(!0);d.first();)d=d.first();d.append(b.extractContents());b.insertNode(a[0]).selectNode(a[0]);return this}b.enlarge();var e=b.createBookmark(),
+a=b.commonAncestor(),g=!1;f(a).scan(function(a){if(!g&&a==e.start)g=!0;else if(g){if(a==e.end)return!1;var b=f(a),d;a:{for(d=b;d&&d.name!="body";){if(La[d.name]||d.name=="div"&&d.hasClass("ke-script")){d=!0;break a}d=d.parent()}d=!1}if(!d&&b.type==3&&B(a.nodeValue).length>0){for(var n;(n=b.parent())&&n.isStyle()&&n.children().length==1;)b=n;n=c;n=n.clone(!0);if(b.type==3)Va(n).append(b.clone(!1)),b.replaceWith(n);else{for(var a=b,i;(i=b.first())&&i.children().length==1;)b=i;i=b.first();for(b=b.doc.createDocumentFragment();i;)b.appendChild(i[0]),
+i=i.next();i=a.clone(!0);d=Va(i);for(var r=i,l=!1;n;){for(;r;)r.name===n.name&&(Zb(r,n.attr(),n.css()),l=!0),r=r.first();l||d.append(n.clone(!1));l=!1;n=n.first()}n=i;b.firstChild&&Va(n).append(b);a.replaceWith(n)}}}});b.moveToBookmark(e);return this},split:function(a,b){for(var c=this.range,d=c.doc,e=c.cloneRange().collapse(a),g=e.startContainer,h=e.startOffset,j=g.nodeType==3?g.parentNode:g,k=!1,n;j&&j.parentNode;){n=f(j);if(b){if(!n.isStyle())break;if(!Ta(n,b))break}else if(Ia[n.name])break;k=
+!0;j=j.parentNode}if(k)d=d.createElement("span"),c.cloneRange().collapse(!a).insertNode(d),a?e.setStartBefore(j.firstChild).setEnd(g,h):e.setStart(g,h).setEndAfter(j.lastChild),g=e.extractContents(),h=g.firstChild,k=g.lastChild,a?(e.insertNode(g),c.setStartAfter(k).setEndBefore(d)):(j.appendChild(g),c.setStartBefore(d).setEndBefore(h)),e=d.parentNode,e==c.endContainer&&(j=f(d).prev(),g=f(d).next(),j&&g&&j.type==3&&g.type==3?c.setEnd(j[0],j[0].nodeValue.length):a||c.setEnd(c.endContainer,c.endOffset-
+1)),e.removeChild(d);return this},remove:function(a){var b=this.doc,c=this.range;c.enlarge();if(c.startOffset===0){for(var d=f(c.startContainer),e;(e=d.parent())&&e.isStyle()&&e.children().length==1;)d=e;c.setStart(d[0],0);d=f(c.startContainer);d.isBlock()&&Ua(d,a);(d=d.parent())&&d.isBlock()&&Ua(d,a)}if(c.collapsed){this.split(!0,a);b=c.startContainer;d=c.startOffset;if(d>0&&(e=f(b.childNodes[d-1]))&&ea(e))e.remove(),c.setStart(b,d-1);(d=f(b.childNodes[d]))&&ea(d)&&d.remove();ea(b)&&(c.startBefore(b),
+b.remove());c.collapse(!0);return this}this.split(!0,a);this.split(!1,a);var g=b.createElement("span"),h=b.createElement("span");c.cloneRange().collapse(!1).insertNode(h);c.cloneRange().collapse(!0).insertNode(g);var j=[],k=!1;f(c.commonAncestor()).scan(function(a){if(!k&&a==g)k=!0;else{if(a==h)return!1;k&&j.push(a)}});f(g).remove();f(h).remove();b=c.startContainer;d=c.startOffset;e=c.endContainer;var n=c.endOffset;if(d>0){var i=f(b.childNodes[d-1]);i&&ea(i)&&(i.remove(),c.setStart(b,d-1),b==e&&c.setEnd(e,
+n-1));if((d=f(b.childNodes[d]))&&ea(d))d.remove(),b==e&&c.setEnd(e,n-1)}(b=f(e.childNodes[c.endOffset]))&&ea(b)&&b.remove();b=c.createBookmark(!0);m(j,function(b,c){Ua(f(c),a)});c.moveToBookmark(b);return this},commonNode:function(a){function b(b){for(var c=b;b;){if(Ta(f(b),a))return f(b);b=b.parentNode}for(;c&&(c=c.lastChild);)if(Ta(f(c),a))return f(c);return null}var c=this.range,d=c.endContainer,c=c.endOffset,e=d.nodeType==3||c===0?d:d.childNodes[c-1],g=b(e);if(g)return g;if(e.nodeType==1||d.nodeType==
+3&&c===0)if(d=f(e).prev())return b(d);return null},commonAncestor:function(a){function b(b){for(;b;){if(b.nodeType==1&&b.tagName.toLowerCase()===a)return b;b=b.parentNode}return null}var c=this.range,d=c.startContainer,e=c.startOffset,g=c.endContainer,c=c.endOffset,g=g.nodeType==3||c===0?g:g.childNodes[c-1],d=b(d.nodeType==3||e===0?d:d.childNodes[e-1]),e=b(g);if(d&&e&&d===e)return f(d);return null},state:function(a){var b=this.doc,c=!1;try{c=b.queryCommandState(a)}catch(d){}return c},val:function(a){var b=
+this.doc,a=a.toLowerCase(),c="";if(a==="fontfamily"||a==="fontname")return c=vb(b,"fontname"),c=c.replace(/['"]/g,""),c.toLowerCase();if(a==="formatblock"){c=vb(b,a);if(c===""&&(a=this.commonNode({"h1,h2,h3,h4,h5,h6,p,div,pre,address":"*"})))c=a.name;c==="Normal"&&(c="p");return c.toLowerCase()}if(a==="fontsize")return(a=this.commonNode({"*":".font-size"}))&&(c=a.css("font-size")),c.toLowerCase();if(a==="forecolor")return(a=this.commonNode({"*":".color"}))&&(c=a.css("color")),c=ya(c),c===""&&(c="default"),
+c.toLowerCase();if(a==="hilitecolor")return(a=this.commonNode({"*":".background-color"}))&&(c=a.css("background-color")),c=ya(c),c===""&&(c="default"),c.toLowerCase();return c},toggle:function(a,b){this.commonNode(b)?this.remove(b):this.wrap(a);return this.select()},bold:function(){return this.toggle("<strong></strong>",{span:".font-weight=bold",strong:"*",b:"*"})},italic:function(){return this.toggle("<em></em>",{span:".font-style=italic",em:"*",i:"*"})},underline:function(){return this.toggle("<u></u>",
+{span:".text-decoration=underline",u:"*"})},strikethrough:function(){return this.toggle("<s></s>",{span:".text-decoration=line-through",s:"*"})},forecolor:function(a){return this.wrap('<span style="color:'+a+';"></span>').select()},hilitecolor:function(a){return this.wrap('<span style="background-color:'+a+';"></span>').select()},fontsize:function(a){return this.wrap('<span style="font-size:'+a+';"></span>').select()},fontname:function(a){return this.fontfamily(a)},fontfamily:function(a){return this.wrap('<span style="font-family:'+
+a+';"></span>').select()},removeformat:function(){var a={"*":".font-weight,.font-style,.text-decoration,.color,.background-color,.font-size,.font-family,.text-indent"};m(Mb,function(b){a[b]="*"});this.remove(a);return this.select()},inserthtml:function(a,b){function c(a,b){var b='<img id="__kindeditor_temp_tag__" width="0" height="0" style="display:none;" />'+b,c=a.get();c.item?c.item(0).outerHTML=b:c.pasteHTML(b);var d=a.doc.getElementById("__kindeditor_temp_tag__");d.parentNode.removeChild(d);c=
+ub(c);a.setEnd(c.endContainer,c.endOffset);a.collapse(!1);e.select(!1)}function d(a,b){var c=a.doc,d=c.createDocumentFragment();f("@"+b,c).each(function(){d.appendChild(this)});a.deleteContents();a.insertNode(d);a.collapse(!1);e.select(!1)}var e=this,g=e.range;if(a==="")return e;if(H&&b){try{c(g,a)}catch(h){d(g,a)}return e}d(g,a);return e},hr:function(){return this.inserthtml("<hr />")},print:function(){this.win.print();return this},insertimage:function(a,b,c,d,e,g){b=l(b,"");l(e,0);a='<img src="'+
+C(a)+'" data-ke-src="'+C(a)+'" ';c&&(a+='width="'+C(c)+'" ');d&&(a+='height="'+C(d)+'" ');b&&(a+='title="'+C(b)+'" ');g&&(a+='align="'+C(g)+'" ');a+='alt="'+C(b)+'" ';a+="/>";return this.inserthtml(a)},createlink:function(a,b){function c(a,b,c){f(a).attr("href",b).attr("data-ke-src",b);c?f(a).attr("target",c):f(a).removeAttr("target")}var d=this.doc,e=this.range;this.select();var g=this.commonNode({a:"*"});g&&!e.isControl()&&(e.selectNode(g.get()),this.select());g='<a href="'+C(a)+'" data-ke-src="'+
+C(a)+'" ';b&&(g+=' target="'+C(b)+'"');if(e.collapsed)return g+=">"+C(a)+"</a>",this.inserthtml(g);if(e.isControl()){var h=f(e.startContainer.childNodes[e.startOffset]);g+="></a>";h.after(f(g,d));h.next().append(h);e.selectNode(h[0]);return this.select()}var g=e.startContainer,h=e.startOffset,j=e.endContainer,e=e.endOffset;if(g.nodeType==1&&g===j&&h+1===e&&(e=g.childNodes[h],e.nodeName.toLowerCase()=="a"))return c(e,a,b),this;Q(d,"createlink","__kindeditor_temp_url__");f('a[href="__kindeditor_temp_url__"]',
+d).each(function(){c(this,a,b)});return this},unlink:function(){var a=this.doc,b=this.range;this.select();if(b.collapsed){var c=this.commonNode({a:"*"});c&&(b.selectNode(c.get()),this.select());Q(a,"unlink",null);X&&f(b.startContainer).name==="img"&&(a=f(b.startContainer).parent(),a.name==="a"&&a.remove(!0))}else Q(a,"unlink",null);return this}});m("formatblock,selectall,justifyleft,justifycenter,justifyright,justifyfull,insertorderedlist,insertunorderedlist,indent,outdent,subscript,superscript".split(","),
+function(a,b){oa.prototype[b]=function(a){this.select();Q(this.doc,b,a);H&&J(b,"justifyleft,justifycenter,justifyright,justifyfull".split(","))>=0&&this.selection();(!H||J(b,"formatblock,selectall,insertorderedlist,insertunorderedlist".split(","))>=0)&&this.selection();return this}});m("cut,copy,paste".split(","),function(a,b){oa.prototype[b]=function(){if(!this.doc.queryCommandSupported(b))throw"not supported";this.select();Q(this.doc,b,null);return this}});f.CmdClass=oa;f.cmd=zb;E(S,{init:function(a){var b=
+this;b.name=a.name||"";b.doc=a.doc||document;b.win=W(b.doc);b.x=s(a.x);b.y=s(a.y);b.z=a.z;b.width=s(a.width);b.height=s(a.height);b.div=f('<div style="display:block;"></div>');b.options=a;b._alignEl=a.alignEl;b.width&&b.div.css("width",b.width);b.height&&b.div.css("height",b.height);b.z&&b.div.css({position:"absolute",left:b.x,top:b.y,"z-index":b.z});b.z&&(b.x===i||b.y===i)&&b.autoPos(b.width,b.height);a.cls&&b.div.addClass(a.cls);a.shadowMode&&b.div.addClass("ke-shadow");a.css&&b.div.css(a.css);
+a.src?f(a.src).replaceWith(b.div):f(b.doc.body).append(b.div);a.html&&b.div.html(a.html);if(a.autoScroll)if(o&&A<7||P){var c=ca();f(b.win).bind("scroll",function(){var a=ca(),e=a.x-c.x,a=a.y-c.y;b.pos(t(b.x)+e,t(b.y)+a,!1)})}else b.div.css("position","fixed")},pos:function(a,b,c){c=l(c,!0);if(a!==null&&(a=a<0?0:s(a),this.div.css("left",a),c))this.x=a;if(b!==null&&(b=b<0?0:s(b),this.div.css("top",b),c))this.y=b;return this},autoPos:function(a,b){var c=t(a)||0,d=t(b)||0,e=ca();if(this._alignEl){var g=
+f(this._alignEl),h=g.pos(),c=R(g[0].clientWidth/2-c/2),d=R(g[0].clientHeight/2-d/2);x=c<0?h.x:h.x+c;y=d<0?h.y:h.y+d}else h=G(this.doc),x=R(e.x+(h.clientWidth-c)/2),y=R(e.y+(h.clientHeight-d)/2);o&&A<7||P||(x-=e.x,y-=e.y);return this.pos(x,y)},remove:function(){var a=this;(o&&A<7||P)&&f(a.win).unbind("scroll");a.div.remove();m(a,function(b){a[b]=null});return this},show:function(){this.div.show();return this},hide:function(){this.div.hide();return this},draggable:function(a){var b=this,a=a||{};a.moveEl=
+b.div;a.moveFn=function(a,d,e,g,f,j){if((a+=f)<0)a=0;if((d+=j)<0)d=0;b.pos(a,d)};Wa(a);return b}});f.WidgetClass=S;f.widget=Ya;var Za="";if(p=document.getElementsByTagName("html"))Za=p[0].dir;E(qa,S,{init:function(a){function b(){var b=Xa(c.iframe);b.open();if(j)b.domain=document.domain;b.write($b(d,e,g,h));b.close();c.win=c.iframe[0].contentWindow;c.doc=b;var k=zb(b);c.afterChange(function(){k.selection()});X&&f(b).click(function(a){f(a.target).name==="img"&&(k.selection(!0),k.range.selectNode(a.target),
+k.select())});if(o)c._mousedownHandler=function(){var a=k.range.cloneRange();a.shrink();a.isControl()&&c.blur()},f(document).mousedown(c._mousedownHandler),f(b).keydown(function(a){if(a.which==8){k.selection();var b=k.range;b.isControl()&&(b.collapse(!0),f(b.startContainer.childNodes[b.startOffset]).remove(),a.preventDefault())}});c.cmd=k;c.html(pa(c.srcElement));o?(b.body.disabled=!0,b.body.contentEditable=!0,b.body.removeAttribute("disabled")):b.designMode="on";a.afterCreate&&a.afterCreate.call(c)}
+var c=this;qa.parent.init.call(c,a);c.srcElement=f(a.srcElement);c.div.addClass("ke-edit");c.designMode=l(a.designMode,!0);c.beforeGetHtml=a.beforeGetHtml;c.beforeSetHtml=a.beforeSetHtml;c.afterSetHtml=a.afterSetHtml;var d=l(a.themesPath,""),e=a.bodyClass,g=a.cssPath,h=a.cssData,j=location.protocol!="res:"&&location.host.replace(/:\d+/,"")!==document.domain,k="document.open();"+(j?'document.domain="'+document.domain+'";':"")+"document.close();",k=o?' src="javascript:void(function(){'+encodeURIComponent(k)+
+'}())"':"";c.iframe=f('<iframe class="ke-edit-iframe" hidefocus="true" frameborder="0"'+k+"></iframe>").css("width","100%");c.textarea=f('<textarea class="ke-edit-textarea" hidefocus="true"></textarea>').css("width","100%");c.tabIndex=isNaN(parseInt(a.tabIndex,10))?c.srcElement.attr("tabindex"):parseInt(a.tabIndex,10);c.iframe.attr("tabindex",c.tabIndex);c.textarea.attr("tabindex",c.tabIndex);c.width&&c.setWidth(c.width);c.height&&c.setHeight(c.height);c.designMode?c.textarea.hide():c.iframe.hide();
+j&&c.iframe.bind("load",function(){c.iframe.unbind("load");o?b():setTimeout(b,0)});c.div.append(c.iframe);c.div.append(c.textarea);c.srcElement.hide();!j&&b()},setWidth:function(a){this.width=a=s(a);this.div.css("width",a);return this},setHeight:function(a){this.height=a=s(a);this.div.css("height",a);this.iframe.css("height",a);if(o&&A<8||P)a=s(t(a)-2);this.textarea.css("height",a);return this},remove:function(){var a=this.doc;f(a.body).unbind();f(a).unbind();f(this.win).unbind();this._mousedownHandler&&
+f(document).unbind("mousedown",this._mousedownHandler);pa(this.srcElement,this.html());this.srcElement.show();a.write("");this.iframe.unbind();this.textarea.unbind();qa.parent.remove.call(this)},html:function(a,b){var c=this.doc;if(this.designMode){c=c.body;if(a===i)return a=b?"<!doctype html><html>"+c.parentNode.innerHTML+"</html>":c.innerHTML,this.beforeGetHtml&&(a=this.beforeGetHtml(a)),Y&&a=="<br />"&&(a=""),a;this.beforeSetHtml&&(a=this.beforeSetHtml(a));o&&A>=9&&(a=a.replace(/(<.*?checked=")checked(".*>)/ig,
+"$1$2"));f(c).html(a);this.afterSetHtml&&this.afterSetHtml();return this}if(a===i)return this.textarea.val();this.textarea.val(a);return this},design:function(a){if(a===i?!this.designMode:a){if(!this.designMode)a=this.html(),this.designMode=!0,this.html(a),this.textarea.hide(),this.iframe.show()}else if(this.designMode)a=this.html(),this.designMode=!1,this.html(a),this.iframe.hide(),this.textarea.show();return this.focus()},focus:function(){this.designMode?this.win.focus():this.textarea[0].focus();
+return this},blur:function(){if(o){var a=f('<input type="text" style="float:left;width:0;height:0;padding:0;margin:0;border:0;" value="" />',this.div);this.div.append(a);a[0].focus();a.remove()}else this.designMode?this.win.blur():this.textarea[0].blur();return this},afterChange:function(a){function b(b){setTimeout(function(){a(b)},1)}var c=this.doc,d=c.body;f(c).keyup(function(b){!b.ctrlKey&&!b.altKey&&db[b.which]&&a(b)});f(c).mouseup(a).contextmenu(a);f(this.win).blur(a);f(d).bind("paste",b);f(d).bind("cut",
+b);return this}});f.EditClass=qa;f.edit=Ab;f.iframeDoc=Xa;E(Da,S,{init:function(a){function b(a){a=f(a);if(a.hasClass("ke-outline"))return a;if(a.hasClass("ke-toolbar-icon"))return a.parent()}function c(a,c){var d=b(a.target);if(d&&!d.hasClass("ke-disabled")&&!d.hasClass("ke-selected"))d[c]("ke-on")}var d=this;Da.parent.init.call(d,a);d.disableMode=l(a.disableMode,!1);d.noDisableItemMap=u(l(a.noDisableItems,[]));d._itemMap={};d.div.addClass("ke-toolbar").bind("contextmenu,mousedown,mousemove",function(a){a.preventDefault()}).attr("unselectable",
+"on");d.div.mouseover(function(a){c(a,"addClass")}).mouseout(function(a){c(a,"removeClass")}).click(function(a){var c=b(a.target);c&&!c.hasClass("ke-disabled")&&d.options.click.call(this,a,c.attr("data-name"))})},get:function(a){if(this._itemMap[a])return this._itemMap[a];return this._itemMap[a]=f("span.ke-icon-"+a,this.div).parent()},select:function(a){Bb.call(this,a,function(a){a.addClass("ke-selected")});return self},unselect:function(a){Bb.call(this,a,function(a){a.removeClass("ke-selected").removeClass("ke-on")});
+return self},enable:function(a){if(a=a.get?a:this.get(a))a.removeClass("ke-disabled"),a.opacity(1);return this},disable:function(a){if(a=a.get?a:this.get(a))a.removeClass("ke-selected").addClass("ke-disabled"),a.opacity(0.5);return this},disableAll:function(a,b){var c=this,d=c.noDisableItemMap;b&&(d=u(b));(a===i?!c.disableMode:a)?(f("span.ke-outline",c.div).each(function(){var a=f(this),b=a[0].getAttribute("data-name",2);d[b]||c.disable(a)}),c.disableMode=!0):(f("span.ke-outline",c.div).each(function(){var a=
+f(this),b=a[0].getAttribute("data-name",2);d[b]||c.enable(a)}),c.disableMode=!1);return c}});f.ToolbarClass=Da;f.toolbar=Cb;E(ra,S,{init:function(a){a.z=a.z||811213;ra.parent.init.call(this,a);this.centerLineMode=l(a.centerLineMode,!0);this.div.addClass("ke-menu").bind("click,mousedown",function(a){a.stopPropagation()}).attr("unselectable","on")},addItem:function(a){if(a.title==="-")this.div.append(f('<div class="ke-menu-separator"></div>'));else{var b=f('<div class="ke-menu-item" unselectable="on"></div>'),
+c=f('<div class="ke-inline-block ke-menu-item-left"></div>'),d=f('<div class="ke-inline-block ke-menu-item-right"></div>'),e=s(a.height),g=l(a.iconClass,"");this.div.append(b);e&&(b.css("height",e),d.css("line-height",e));var h;this.centerLineMode&&(h=f('<div class="ke-inline-block ke-menu-item-center"></div>'),e&&h.css("height",e));b.mouseover(function(){f(this).addClass("ke-menu-item-on");h&&h.addClass("ke-menu-item-center-on")}).mouseout(function(){f(this).removeClass("ke-menu-item-on");h&&h.removeClass("ke-menu-item-center-on")}).click(function(b){a.click.call(f(this));
+b.stopPropagation()}).append(c);h&&b.append(h);b.append(d);a.checked&&(g="ke-icon-checked");g!==""&&c.html('<span class="ke-inline-block ke-toolbar-icon ke-toolbar-icon-url '+g+'"></span>');d.html(a.title);return this}},remove:function(){this.options.beforeRemove&&this.options.beforeRemove.call(this);f(".ke-menu-item",this.div[0]).unbind();ra.parent.remove.call(this);return this}});f.MenuClass=ra;f.menu=$a;E(sa,S,{init:function(a){a.z=a.z||811213;sa.parent.init.call(this,a);var b=a.colors||[["#E53333",
+"#E56600","#FF9900","#64451D","#DFC5A4","#FFE500"],["#009900","#006600","#99BB00","#B8D100","#60D978","#00D5FF"],["#337FE5","#003399","#4C33E5","#9933E5","#CC33E5","#EE33EE"],["#FFFFFF","#CCCCCC","#999999","#666666","#333333","#000000"]];this.selectedColor=(a.selectedColor||"").toLowerCase();this._cells=[];this.div.addClass("ke-colorpicker").bind("click,mousedown",function(a){a.stopPropagation()}).attr("unselectable","on");a=this.doc.createElement("table");this.div.append(a);a.className="ke-colorpicker-table";
+a.cellPadding=0;a.cellSpacing=0;a.border=0;var c=a.insertRow(0),d=c.insertCell(0);d.colSpan=b[0].length;this._addAttr(d,"","ke-colorpicker-cell-top");for(var e=0;e<b.length;e++)for(var c=a.insertRow(e+1),g=0;g<b[e].length;g++)d=c.insertCell(g),this._addAttr(d,b[e][g],"ke-colorpicker-cell")},_addAttr:function(a,b,c){var d=this,a=f(a).addClass(c);d.selectedColor===b.toLowerCase()&&a.addClass("ke-colorpicker-cell-selected");a.attr("title",b||d.options.noColor);a.mouseover(function(){f(this).addClass("ke-colorpicker-cell-on")});
+a.mouseout(function(){f(this).removeClass("ke-colorpicker-cell-on")});a.click(function(a){a.stop();d.options.click.call(f(this),b)});b?a.append(f('<div class="ke-colorpicker-cell-color" unselectable="on"></div>').css("background-color",b)):a.html(d.options.noColor);f(a).attr("unselectable","on");d._cells.push(a)},remove:function(){m(this._cells,function(){this.unbind()});sa.parent.remove.call(this);return this}});f.ColorPickerClass=sa;f.colorpicker=Db;E(ab,{init:function(a){var b=f(a.button),c=a.fieldName||
+"file",d=a.url||"",e=b.val(),g=a.extraParams||{},h=b[0].className||"",j=a.target||"kindeditor_upload_iframe_"+(new Date).getTime();a.afterError=a.afterError||function(a){alert(a)};var k=[],i;for(i in g)k.push('<input type="hidden" name="'+i+'" value="'+g[i]+'" />');c=['<div class="ke-inline-block '+h+'">',a.target?"":'<iframe name="'+j+'" style="display:none;"></iframe>',a.form?'<div class="ke-upload-area">':'<form class="ke-upload-area ke-form" method="post" enctype="multipart/form-data" target="'+
+j+'" action="'+d+'">','<span class="ke-button-common">',k.join(""),'<input type="button" class="ke-button-common ke-button" value="'+e+'" />',"</span>",'<input type="file" class="ke-upload-file" name="'+c+'" tabindex="-1" />',a.form?"</div>":"</form>","</div>"].join("");c=f(c,b.doc);b.hide();b.before(c);this.div=c;this.button=b;this.iframe=a.target?f('iframe[name="'+j+'"]'):f("iframe",c);this.form=a.form?f(a.form):f("form",c);this.fileBox=f(".ke-upload-file",c);b=a.width||f(".ke-button-common",c).width();
+f(".ke-upload-area",c).width(b);this.options=a},submit:function(){var a=this,b=a.iframe;b.bind("load",function(){b.unbind();var c=document.createElement("form");a.fileBox.before(c);f(c).append(a.fileBox);c.reset();f(c).remove(!0);var c=f.iframeDoc(b),d=c.getElementsByTagName("pre")[0],e="",g,e=d?d.innerHTML:c.body.innerHTML,e=fa(e);b[0].src="javascript:false";try{g=f.json(e)}catch(h){a.options.afterError.call(a,"<!doctype html><html>"+c.body.parentNode.innerHTML+"</html>")}g&&a.options.afterUpload.call(a,
+g)});a.form[0].submit();return a},remove:function(){this.fileBox&&this.fileBox.unbind();this.iframe.remove();this.div.remove();this.button.show();return this}});f.UploadButtonClass=ab;f.uploadbutton=function(a){return new ab(a)};E(ta,S,{init:function(a){var b=l(a.shadowMode,!0);a.z=a.z||811213;a.shadowMode=!1;a.autoScroll=l(a.autoScroll,!0);ta.parent.init.call(this,a);var c=a.title,d=f(a.body,this.doc),e=a.previewBtn,g=a.yesBtn,h=a.noBtn,j=a.closeBtn,k=l(a.showMask,!0);this.div.addClass("ke-dialog").bind("click,mousedown",
+function(a){a.stopPropagation()});var i=f('<div class="ke-dialog-content"></div>').appendTo(this.div);o&&A<7?this.iframeMask=f('<iframe src="about:blank" class="ke-dialog-shadow"></iframe>').appendTo(this.div):b&&f('<div class="ke-dialog-shadow"></div>').appendTo(this.div);b=f('<div class="ke-dialog-header"></div>');i.append(b);b.html(c);this.closeIcon=f('<span class="ke-dialog-icon-close" title="'+j.name+'"></span>').click(j.click);b.append(this.closeIcon);this.draggable({clickEl:b,beforeDrag:a.beforeDrag});
+a=f('<div class="ke-dialog-body"></div>');i.append(a);a.append(d);var q=f('<div class="ke-dialog-footer"></div>');(e||g||h)&&i.append(q);m([{btn:e,name:"preview"},{btn:g,name:"yes"},{btn:h,name:"no"}],function(){if(this.btn){var a=this.btn,a=a||{},b=a.name||"",c=f('<span class="ke-button-common ke-button-outer" title="'+b+'"></span>'),b=f('<input class="ke-button-common ke-button" type="button" value="'+b+'" />');a.click&&b.click(a.click);c.append(b);c.addClass("ke-dialog-"+this.name);q.append(c)}});
+this.height&&a.height(t(this.height)-b.height()-q.height());this.div.width(this.div.width());this.div.height(this.div.height());this.mask=null;if(k)d=G(this.doc),this.mask=Ya({x:0,y:0,z:this.z-1,cls:"ke-dialog-mask",width:Math.max(d.scrollWidth,d.clientWidth),height:Math.max(d.scrollHeight,d.clientHeight)});this.autoPos(this.div.width(),this.div.height());this.footerDiv=q;this.bodyDiv=a;this.headerDiv=b;this.isLoading=!1},setMaskIndex:function(a){this.mask.div.css("z-index",a)},showLoading:function(a){var a=
+l(a,""),b=this.bodyDiv;this.loading=f('<div class="ke-dialog-loading"><div class="ke-inline-block ke-dialog-loading-content" style="margin-top:'+Math.round(b.height()/3)+'px;">'+a+"</div></div>").width(b.width()).height(b.height()).css("top",this.headerDiv.height()+"px");b.css("visibility","hidden").after(this.loading);this.isLoading=!0;return this},hideLoading:function(){this.loading&&this.loading.remove();this.bodyDiv.css("visibility","visible");this.isLoading=!1;return this},remove:function(){this.options.beforeRemove&&
+this.options.beforeRemove.call(this);this.mask&&this.mask.remove();this.iframeMask&&this.iframeMask.remove();this.closeIcon.unbind();f("input",this.div).unbind();f("button",this.div).unbind();this.footerDiv.unbind();this.bodyDiv.unbind();this.headerDiv.unbind();f("iframe",this.div).each(function(){f(this).remove()});ta.parent.remove.call(this);return this}});f.DialogClass=ta;f.dialog=Eb;f.tabs=function(a){var b=Ya(a),c=b.remove,d=a.afterSelect,a=b.div,e=[];a.addClass("ke-tabs").bind("contextmenu,mousedown,mousemove",
+function(a){a.preventDefault()});var g=f('<ul class="ke-tabs-ul ke-clearfix"></ul>');a.append(g);b.add=function(a){var b=f('<li class="ke-tabs-li">'+a.title+"</li>");b.data("tab",a);e.push(b);g.append(b)};b.selectedIndex=0;b.select=function(a){b.selectedIndex=a;m(e,function(c,d){d.unbind();c===a?(d.addClass("ke-tabs-li-selected"),f(d.data("tab").panel).show("")):(d.removeClass("ke-tabs-li-selected").removeClass("ke-tabs-li-on").mouseover(function(){f(this).addClass("ke-tabs-li-on")}).mouseout(function(){f(this).removeClass("ke-tabs-li-on")}).click(function(){b.select(c)}),
+f(d.data("tab").panel).hide())});d&&d.call(b,a)};b.remove=function(){m(e,function(){this.remove()});g.remove();c.call(b)};return b};f.loadScript=bb;f.loadStyle=cb;f.ajax=function(a,b,c,d,e){var c=c||"GET",e=e||"json",g=w.XMLHttpRequest?new w.XMLHttpRequest:new ActiveXObject("Microsoft.XMLHTTP");g.open(c,a,!0);g.onreadystatechange=function(){if(g.readyState==4&&g.status==200&&b){var a=B(g.responseText);e=="json"&&(a=eb(a));b(a)}};if(c=="POST"){var f=[];m(d,function(a,b){f.push(encodeURIComponent(a)+
+"="+encodeURIComponent(b))});try{g.setRequestHeader("Content-Type","application/x-www-form-urlencoded")}catch(j){}g.send(f.join("&"))}else g.send(null)};var N={},O={};ua.prototype={lang:function(a){return Ib(a,this.langType)},loadPlugin:function(a,b){var c=this;if(N[a]){if(!wa(N[a]))return setTimeout(function(){c.loadPlugin(a,b)},100),c;N[a].call(c,KindEditor);b&&b.call(c);return c}N[a]="loading";bb(c.pluginsPath+a+"/"+a+".js?ver="+encodeURIComponent(f.DEBUG?Ga:Ha),function(){setTimeout(function(){N[a]&&
+c.loadPlugin(a,b)},0)});return c},handler:function(a,b){var c=this;c._handlers[a]||(c._handlers[a]=[]);if(wa(b))return c._handlers[a].push(b),c;m(c._handlers[a],function(){b=this.call(c,b)});return b},clickToolbar:function(a,b){var c=this,d="clickToolbar"+a;if(b===i){if(c._handlers[d])return c.handler(d);c.loadPlugin(a,function(){c.handler(d)});return c}return c.handler(d,b)},updateState:function(){var a=this;m("justifyleft,justifycenter,justifyright,justifyfull,insertorderedlist,insertunorderedlist,subscript,superscript,bold,italic,underline,strikethrough".split(","),
+function(b,c){a.cmd.state(c)?a.toolbar.select(c):a.toolbar.unselect(c)});return a},addContextmenu:function(a){this._contextmenus.push(a);return this},afterCreate:function(a){return this.handler("afterCreate",a)},beforeRemove:function(a){return this.handler("beforeRemove",a)},beforeGetHtml:function(a){return this.handler("beforeGetHtml",a)},beforeSetHtml:function(a){return this.handler("beforeSetHtml",a)},afterSetHtml:function(a){return this.handler("afterSetHtml",a)},create:function(){function a(){k.height()===
+0?setTimeout(a,100):b.resize(d,e,!1)}var b=this,c=b.fullscreenMode;if(b.isCreated)return b;if(b.srcElement.data("kindeditor"))return b;b.srcElement.data("kindeditor","true");c?G().style.overflow="hidden":G().style.overflow="";var d=c?G().clientWidth+"px":b.width,e=c?G().clientHeight+"px":b.height;if(o&&A<8||P)e=s(t(e)+2);var g=b.container=f(b.layout);c?f(document.body).append(g):b.srcElement.before(g);var h=f(".toolbar",g),j=f(".edit",g),k=b.statusbar=f(".statusbar",g);g.removeClass("container").addClass("ke-container ke-container-"+
+b.themeType).css("width",d);if(c){g.css({position:"absolute",left:0,top:0,"z-index":811211});if(!Y)b._scrollPos=ca();w.scrollTo(0,0);f(document.body).css({height:"1px",overflow:"hidden"});f(document.body.parentNode).css("overflow","hidden");b._fullscreenExecuted=!0}else b._fullscreenExecuted&&(f(document.body).css({height:"",overflow:""}),f(document.body.parentNode).css("overflow","")),b._scrollPos&&w.scrollTo(b._scrollPos.x,b._scrollPos.y);var i=[];f.each(b.items,function(a,c){c=="|"?i.push('<span class="ke-inline-block ke-separator"></span>'):
+c=="/"?i.push('<div class="ke-hr"></div>'):(i.push('<span class="ke-outline" data-name="'+c+'" title="'+b.lang(c)+'" unselectable="on">'),i.push('<span class="ke-toolbar-icon ke-toolbar-icon-url ke-icon-'+c+'" unselectable="on"></span></span>'))});var h=b.toolbar=Cb({src:h,html:i.join(""),noDisableItems:b.noDisableItems,click:function(a,c){a.stop();if(b.menu){var d=b.menu.name;b.hideMenu();if(d===c)return}b.clickToolbar(c)}}),l=t(e)-h.div.height(),m=b.edit=Ab({height:l>0&&t(e)>b.minHeight?l:b.minHeight,
+src:j,srcElement:b.srcElement,designMode:b.designMode,themesPath:b.themesPath,bodyClass:b.bodyClass,cssPath:b.cssPath,cssData:b.cssData,beforeGetHtml:function(a){a=b.beforeGetHtml(a);a=T(Fa(a));return U(a,b.filterMode?b.htmlTags:null,b.urlType,b.wellFormatMode,b.indentChar)},beforeSetHtml:function(a){a=U(a,b.filterMode?b.htmlTags:null,"",!1);return b.beforeSetHtml(a)},afterSetHtml:function(){b.edit=m=this;b.afterSetHtml()},afterCreate:function(){b.edit=m=this;b.cmd=m.cmd;b._docMousedownFn=function(){b.menu&&
+b.hideMenu()};f(m.doc,document).mousedown(b._docMousedownFn);ac.call(b);bc.call(b);cc.call(b);dc.call(b);m.afterChange(function(){m.designMode&&(b.updateState(),b.addBookmark(),b.options.afterChange&&b.options.afterChange.call(b))});m.textarea.keyup(function(a){!a.ctrlKey&&!a.altKey&&Ob[a.which]&&b.options.afterChange&&b.options.afterChange.call(b)});b.readonlyMode&&b.readonly();b.isCreated=!0;if(b.initContent==="")b.initContent=b.html();if(b._undoStack.length>0){var a=b._undoStack.pop();a.start&&
+(b.html(a.html),m.cmd.range.moveToBookmark(a),b.select())}b.afterCreate();b.options.afterCreate&&b.options.afterCreate.call(b)}});k.removeClass("statusbar").addClass("ke-statusbar").append('<span class="ke-inline-block ke-statusbar-center-icon"></span>').append('<span class="ke-inline-block ke-statusbar-right-icon"></span>');if(b._fullscreenResizeHandler)f(w).unbind("resize",b._fullscreenResizeHandler),b._fullscreenResizeHandler=null;a();c?(b._fullscreenResizeHandler=function(){b.isCreated&&b.resize(G().clientWidth,
+G().clientHeight,!1)},f(w).bind("resize",b._fullscreenResizeHandler),h.select("fullscreen"),k.first().css("visibility","hidden"),k.last().css("visibility","hidden")):(Y&&f(w).bind("scroll",function(){b._scrollPos=ca()}),b.resizeType>0?Wa({moveEl:g,clickEl:k,moveFn:function(a,c,d,e,g,f){e+=f;b.resize(null,e)}}):k.first().css("visibility","hidden"),b.resizeType===2?Wa({moveEl:g,clickEl:k.last(),moveFn:function(a,c,d,e,g,f){d+=g;e+=f;b.resize(d,e)}}):k.last().css("visibility","hidden"));return b},remove:function(){var a=
+this;if(!a.isCreated)return a;a.beforeRemove();a.srcElement.data("kindeditor","");a.menu&&a.hideMenu();m(a.dialogs,function(){a.hideDialog()});f(document).unbind("mousedown",a._docMousedownFn);a.toolbar.remove();a.edit.remove();a.statusbar.last().unbind();a.statusbar.unbind();a.container.remove();a.container=a.toolbar=a.edit=a.menu=null;a.dialogs=[];a.isCreated=!1;return a},resize:function(a,b,c){c=l(c,!0);if(a&&(/%/.test(a)||(a=t(a),a=a<this.minWidth?this.minWidth:a),this.container.css("width",s(a)),
+c))this.width=s(a);if(b&&(b=t(b),editHeight=t(b)-this.toolbar.div.height()-this.statusbar.height(),editHeight=editHeight<this.minHeight?this.minHeight:editHeight,this.edit.setHeight(editHeight),c))this.height=s(b);return this},select:function(){this.isCreated&&this.cmd.select();return this},html:function(a){if(a===i)return this.isCreated?this.edit.html():pa(this.srcElement);this.isCreated?this.edit.html(a):pa(this.srcElement,a);this.isCreated&&this.cmd.selection();return this},fullHtml:function(){return this.isCreated?
+this.edit.html(i,!0):""},text:function(a){return a===i?B(this.html().replace(/<(?!img|embed).*?>/ig,"").replace(/&nbsp;/ig," ")):this.html(C(a))},isEmpty:function(){return B(this.text().replace(/\r\n|\n|\r/,""))===""},isDirty:function(){return B(this.initContent.replace(/\r\n|\n|\r|t/g,""))!==B(this.html().replace(/\r\n|\n|\r|t/g,""))},selectedHtml:function(){var a=this.isCreated?this.cmd.range.html():"";return a=T(Fa(a))},count:function(a){a=(a||"html").toLowerCase();if(a==="html")return this.html().length;
+if(a==="text")return this.text().replace(/<(?:img|embed).*?>/ig,"K").replace(/\r\n|\n|\r/g,"").length;return 0},exec:function(a){var a=a.toLowerCase(),b=this.cmd,c=J(a,"selectall,copy,paste,print".split(","))<0;c&&this.addBookmark(!1);b[a].apply(b,Ja(arguments,1));c&&(this.updateState(),this.addBookmark(!1),this.options.afterChange&&this.options.afterChange.call(this));return this},insertHtml:function(a,b){if(!this.isCreated)return this;a=this.beforeSetHtml(a);this.exec("inserthtml",a,b);return this},
+appendHtml:function(a){this.html(this.html()+a);if(this.isCreated)a=this.cmd,a.range.selectNodeContents(a.doc.body).collapse(!1),a.select();return this},sync:function(){pa(this.srcElement,this.html());return this},focus:function(){this.isCreated?this.edit.focus():this.srcElement[0].focus();return this},blur:function(){this.isCreated?this.edit.blur():this.srcElement[0].blur();return this},addBookmark:function(a){var a=l(a,!0),b=this.edit,c=b.doc.body,d=Fa(c.innerHTML);if(a&&this._undoStack.length>
+0&&Math.abs(d.length-T(this._undoStack[this._undoStack.length-1].html).length)<this.minChangeSize)return this;b.designMode&&!this._firstAddBookmark?(b=this.cmd.range,a=b.createBookmark(!0),a.html=Fa(c.innerHTML),b.moveToBookmark(a)):a={html:d};this._firstAddBookmark=!1;Jb(this._undoStack,a);return this},undo:function(){return Kb.call(this,this._undoStack,this._redoStack)},redo:function(){return Kb.call(this,this._redoStack,this._undoStack)},fullscreen:function(a){this.fullscreenMode=a===i?!this.fullscreenMode:
+a;this.addBookmark(!1);return this.remove().create()},readonly:function(a){var a=l(a,!0),b=this,c=b.edit,d=c.doc;b.designMode?b.toolbar.disableAll(a,[]):m(b.noDisableItems,function(){b.toolbar[a?"disable":"enable"](this)});o?d.body.contentEditable=!a:d.designMode=a?"off":"on";c.textarea[0].disabled=a},createMenu:function(a){var b=this.toolbar.get(a.name),c=b.pos();a.x=c.x;a.y=c.y+b.height();a.z=this.options.zIndex;a.shadowMode=l(a.shadowMode,this.shadowMode);a.selectedColor!==i?(a.cls="ke-colorpicker-"+
+this.themeType,a.noColor=this.lang("noColor"),this.menu=Db(a)):(a.cls="ke-menu-"+this.themeType,a.centerLineMode=!1,this.menu=$a(a));return this.menu},hideMenu:function(){this.menu.remove();this.menu=null;return this},hideContextmenu:function(){this.contextmenu.remove();this.contextmenu=null;return this},createDialog:function(a){var b=this;a.z=b.options.zIndex;a.shadowMode=l(a.shadowMode,b.shadowMode);a.closeBtn=l(a.closeBtn,{name:b.lang("close"),click:function(){b.hideDialog();o&&b.cmd&&b.cmd.select()}});
+a.noBtn=l(a.noBtn,{name:b.lang(a.yesBtn?"no":"close"),click:function(){b.hideDialog();o&&b.cmd&&b.cmd.select()}});if(b.dialogAlignType!="page")a.alignEl=b.container;a.cls="ke-dialog-"+b.themeType;if(b.dialogs.length>0){var c=b.dialogs[b.dialogs.length-1];b.dialogs[0].setMaskIndex(c.z+2);a.z=c.z+3;a.showMask=!1}a=Eb(a);b.dialogs.push(a);return a},hideDialog:function(){this.dialogs.length>0&&this.dialogs.pop().remove();this.dialogs.length>0&&this.dialogs[0].setMaskIndex(this.dialogs[this.dialogs.length-
+1].z-1);return this},errorDialog:function(a){var b=this.createDialog({width:750,title:this.lang("uploadError"),body:'<div style="padding:10px 20px;"><iframe frameborder="0" style="width:708px;height:400px;"></iframe></div>'}),b=f("iframe",b.div),c=f.iframeDoc(b);c.open();c.write(a);c.close();f(c.body).css("background-color","#FFF");b[0].contentWindow.focus();return this}};_instances=[];f.remove=function(a){va(a,function(a){this.remove();_instances.splice(a,1)})};f.sync=function(a){va(a,function(){this.sync()})};
+f.html=function(a,b){va(a,function(){this.html(b)})};f.insertHtml=function(a,b){va(a,function(){this.insertHtml(b)})};f.appendHtml=function(a,b){va(a,function(){this.appendHtml(b)})};o&&A<7&&Q(document,"BackgroundImageCache",!0);f.EditorClass=ua;f.editor=function(a){return new ua(a)};f.create=Lb;f.instances=_instances;f.plugin=Gb;f.lang=Ib;Gb("core",function(a){var b=this,c={undo:"Z",redo:"Y",bold:"B",italic:"I",underline:"U",print:"P",selectall:"A"};b.afterSetHtml(function(){b.options.afterChange&&
+b.options.afterChange.call(b)});b.afterCreate(function(){if(b.syncType=="form"){for(var c=a(b.srcElement),d=!1;c=c.parent();)if(c.name=="form"){d=!0;break}if(d){c.bind("submit",function(){b.sync();a(w).bind("unload",function(){b.edit.textarea.remove()})});var f=a('[type="reset"]',c);f.click(function(){b.html(b.initContent);b.cmd.selection()});b.beforeRemove(function(){c.unbind();f.unbind()})}}});b.clickToolbar("source",function(){b.edit.designMode?(b.toolbar.disableAll(!0),b.edit.design(!1),b.toolbar.select("source")):
+(b.toolbar.disableAll(!1),b.edit.design(!0),b.toolbar.unselect("source"),Y?setTimeout(function(){b.cmd.selection()},0):b.cmd.selection());b.designMode=b.edit.designMode});b.afterCreate(function(){b.designMode||b.toolbar.disableAll(!0).select("source")});b.clickToolbar("fullscreen",function(){b.fullscreen()});if(b.fullscreenShortcut){var d=!1;b.afterCreate(function(){a(b.edit.doc,b.edit.textarea).keyup(function(a){a.which==27&&setTimeout(function(){b.fullscreen()},0)});if(d){if(o&&!b.designMode)return;
+b.focus()}d||(d=!0)})}m("undo,redo".split(","),function(a,d){c[d]&&b.afterCreate(function(){Ka(this.edit.doc,c[d],function(){b.clickToolbar(d)})});b.clickToolbar(d,function(){b[d]()})});b.clickToolbar("formatblock",function(){var a=b.lang("formatblock.formatBlock"),c={h1:28,h2:24,h3:18,H4:14,p:12},d=b.cmd.val("formatblock"),f=b.createMenu({name:"formatblock",width:b.langType=="en"?200:150});m(a,function(a,e){var i="font-size:"+c[a]+"px;";a.charAt(0)==="h"&&(i+="font-weight:bold;");f.addItem({title:'<span style="'+
+i+'" unselectable="on">'+e+"</span>",height:c[a]+12,checked:d===a||d===e,click:function(){b.select().exec("formatblock","<"+a+">").hideMenu()}})})});b.clickToolbar("fontname",function(){var a=b.cmd.val("fontname"),c=b.createMenu({name:"fontname",width:150});m(b.lang("fontname.fontName"),function(d,f){c.addItem({title:'<span style="font-family: '+d+';" unselectable="on">'+f+"</span>",checked:a===d.toLowerCase()||a===f.toLowerCase(),click:function(){b.exec("fontname",d).hideMenu()}})})});b.clickToolbar("fontsize",
+function(){var a=b.cmd.val("fontsize"),c=b.createMenu({name:"fontsize",width:150});m(b.fontSizeTable,function(d,f){c.addItem({title:'<span style="font-size:'+f+';" unselectable="on">'+f+"</span>",height:t(f)+12,checked:a===f,click:function(){b.exec("fontsize",f).hideMenu()}})})});m("forecolor,hilitecolor".split(","),function(a,c){b.clickToolbar(c,function(){b.createMenu({name:c,selectedColor:b.cmd.val(c)||"default",colors:b.colorTable,click:function(a){b.exec(c,a).hideMenu()}})})});m("cut,copy,paste".split(","),
+function(a,c){b.clickToolbar(c,function(){b.focus();try{b.exec(c,null)}catch(a){alert(b.lang(c+"Error"))}})});b.clickToolbar("about",function(){var a='<div style="margin:20px;"><div>KindEditor '+Ha+'</div><div>Copyright &copy; <a href="http://www.kindsoft.net/" target="_blank">kindsoft.net</a> All rights reserved.</div></div>';b.createDialog({name:"about",width:350,title:b.lang("about"),body:a})});b.plugin.getSelectedLink=function(){return b.cmd.commonAncestor("a")};b.plugin.getSelectedImage=function(){return Ea(b.edit.cmd.range,
+function(a){return!/^ke-\w+$/i.test(a[0].className)})};b.plugin.getSelectedFlash=function(){return Ea(b.edit.cmd.range,function(a){return a[0].className=="ke-flash"})};b.plugin.getSelectedMedia=function(){return Ea(b.edit.cmd.range,function(a){return a[0].className=="ke-media"||a[0].className=="ke-rm"})};b.plugin.getSelectedAnchor=function(){return Ea(b.edit.cmd.range,function(a){return a[0].className=="ke-anchor"})};m("link,image,flash,media,anchor".split(","),function(a,c){var d=c.charAt(0).toUpperCase()+
+c.substr(1);m("edit,delete".split(","),function(a,e){b.addContextmenu({title:b.lang(e+d),click:function(){b.loadPlugin(c,function(){b.plugin[c][e]();b.hideMenu()})},cond:b.plugin["getSelected"+d],width:150,iconClass:e=="edit"?"ke-icon-"+c:i})});b.addContextmenu({title:"-"})});b.plugin.getSelectedTable=function(){return b.cmd.commonAncestor("table")};b.plugin.getSelectedRow=function(){return b.cmd.commonAncestor("tr")};b.plugin.getSelectedCell=function(){return b.cmd.commonAncestor("td")};m("prop,cellprop,colinsertleft,colinsertright,rowinsertabove,rowinsertbelow,rowmerge,colmerge,rowsplit,colsplit,coldelete,rowdelete,insert,delete".split(","),
+function(a,c){var d=J(c,["prop","delete"])<0?b.plugin.getSelectedCell:b.plugin.getSelectedTable;b.addContextmenu({title:b.lang("table"+c),click:function(){b.loadPlugin("table",function(){b.plugin.table[c]();b.hideMenu()})},cond:d,width:170,iconClass:"ke-icon-table"+c})});b.addContextmenu({title:"-"});m("selectall,justifyleft,justifycenter,justifyright,justifyfull,insertorderedlist,insertunorderedlist,indent,outdent,subscript,superscript,hr,print,bold,italic,underline,strikethrough,removeformat,unlink".split(","),
+function(a,d){c[d]&&b.afterCreate(function(){Ka(this.edit.doc,c[d],function(){b.cmd.selection();b.clickToolbar(d)})});b.clickToolbar(d,function(){b.focus().exec(d,null)})});b.afterCreate(function(){function c(){f.range.moveToBookmark(j);f.select();X&&(a("div."+l,i).each(function(){a(this).after("<br />").remove(!0)}),a("span.Apple-style-span",i).remove(!0),a("span.Apple-tab-span",i).remove(!0),a("span[style]",i).each(function(){a(this).css("white-space")=="nowrap"&&a(this).remove(!0)}),a("meta",i).remove());
+var d=i[0].innerHTML;i.remove();d!==""&&(X&&(d=d.replace(/(<br>)\1/ig,"$1")),b.pasteType===2&&(d=d.replace(/(<(?:p|p\s[^>]*)>) *(<\/p>)/ig,""),/schemas-microsoft-com|worddocument|mso-\w+/i.test(d)?d=nb(d,b.filterMode?b.htmlTags:a.options.htmlTags):(d=U(d,b.filterMode?b.htmlTags:null),d=b.beforeSetHtml(d))),b.pasteType===1&&(d=d.replace(/&nbsp;/ig," "),d=d.replace(/\n\s*\n/g,"\n"),d=d.replace(/<br[^>]*>/ig,"\n"),d=d.replace(/<\/p><p[^>]*>/ig,"\n"),d=d.replace(/<[^>]+>/g,""),d=d.replace(/ {2}/g," &nbsp;"),
+b.newlineTag=="p"?/\n/.test(d)&&(d=d.replace(/^/,"<p>").replace(/$/,"<br /></p>").replace(/\n/g,"<br /></p><p>")):d=d.replace(/\n/g,"<br />$&")),b.insertHtml(d,!0))}var d=b.edit.doc,f,j,i,l="__kindeditor_paste__",m=!1;a(d.body).bind("paste",function(p){if(b.pasteType===0)p.stop();else if(!m){m=!0;a("div."+l,d).remove();f=b.cmd.selection();j=f.range.createBookmark();i=a('<div class="'+l+'"></div>',d).css({position:"absolute",width:"1px",height:"1px",overflow:"hidden",left:"-1981px",top:a(j.start).pos().y+
+"px","white-space":"nowrap"});a(d.body).append(i);if(o){var s=f.range.get(!0);s.moveToElementText(i[0]);s.select();s.execCommand("paste");p.preventDefault()}else f.range.selectNodeContents(i[0]),f.select();setTimeout(function(){c();m=!1},0)}})});b.beforeGetHtml(function(a){o&&A<=8&&(a=a.replace(/<div\s+[^>]*data-ke-input-tag="([^"]*)"[^>]*>([\s\S]*?)<\/div>/ig,function(a,b){return unescape(b)}),a=a.replace(/(<input)((?:\s+[^>]*)?>)/ig,function(a,b,c){if(!/\s+type="[^"]+"/i.test(a))return b+' type="text"'+
+c;return a}));return a.replace(/(<(?:noscript|noscript\s[^>]*)>)([\s\S]*?)(<\/noscript>)/ig,function(a,b,c,d){return b+fa(c).replace(/\s+/g," ")+d}).replace(/<img[^>]*class="?ke-(flash|rm|media)"?[^>]*>/ig,function(a){var a=I(a),b=ba(a.style||""),c=pb(a["data-ke-tag"]),d=l(b.width,""),b=l(b.height,"");/px/i.test(d)&&(d=t(d));/px/i.test(b)&&(b=t(b));c.width=l(a.width,d);c.height=l(a.height,b);return Ma(c)}).replace(/<img[^>]*class="?ke-anchor"?[^>]*>/ig,function(a){a=I(a);return'<a name="'+unescape(a["data-ke-name"])+
+'"></a>'}).replace(/<div\s+[^>]*data-ke-script-attr="([^"]*)"[^>]*>([\s\S]*?)<\/div>/ig,function(a,b,c){return"<script"+unescape(b)+">"+unescape(c)+"<\/script>"}).replace(/<div\s+[^>]*data-ke-noscript-attr="([^"]*)"[^>]*>([\s\S]*?)<\/div>/ig,function(a,b,c){return"<noscript"+unescape(b)+">"+unescape(c)+"</noscript>"}).replace(/(<[^>]*)data-ke-src="([^"]*)"([^>]*>)/ig,function(a,b,c){a=a.replace(/(\s+(?:href|src)=")[^"]*(")/i,function(a,b,d){return b+fa(c)+d});return a=a.replace(/\s+data-ke-src="[^"]*"/i,
+"")}).replace(/(<[^>]+\s)data-ke-(on\w+="[^"]*"[^>]*>)/ig,function(a,b,c){return b+c})});b.beforeSetHtml(function(a){o&&A<=8&&(a=a.replace(/<input[^>]*>|<(select|button)[^>]*>[\s\S]*?<\/\1>/ig,function(a){var b=I(a);if(ba(b.style||"").display=="none")return'<div class="ke-display-none" data-ke-input-tag="'+escape(a)+'"></div>';return a}));return a.replace(/<embed[^>]*type="([^"]+)"[^>]*>(?:<\/embed>)?/ig,function(a){a=I(a);a.src=l(a.src,"");a.width=l(a.width,0);a.height=l(a.height,0);return qb(b.themesPath+
+"common/blank.gif",a)}).replace(/<a[^>]*name="([^"]+)"[^>]*>(?:<\/a>)?/ig,function(a){var c=I(a);if(c.href!==i)return a;return'<img class="ke-anchor" src="'+b.themesPath+'common/anchor.gif" data-ke-name="'+escape(c.name)+'" />'}).replace(/<script([^>]*)>([\s\S]*?)<\/script>/ig,function(a,b,c){return'<div class="ke-script" data-ke-script-attr="'+escape(b)+'">'+escape(c)+"</div>"}).replace(/<noscript([^>]*)>([\s\S]*?)<\/noscript>/ig,function(a,b,c){return'<div class="ke-noscript" data-ke-noscript-attr="'+
+escape(b)+'">'+escape(c)+"</div>"}).replace(/(<[^>]*)(href|src)="([^"]*)"([^>]*>)/ig,function(a,b,c,d,e){if(a.match(/\sdata-ke-src="[^"]*"/i))return a;return a=b+c+'="'+d+'" data-ke-src="'+C(d)+'"'+e}).replace(/(<[^>]+\s)(on\w+="[^"]*"[^>]*>)/ig,function(a,b,c){return b+"data-ke-"+c}).replace(/<table[^>]*\s+border="0"[^>]*>/ig,function(a){if(a.indexOf("ke-zeroborder")>=0)return a;return Sb(a,"ke-zeroborder")})})})}})(window);
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/kindeditor.js b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/kindeditor.js
new file mode 100644
index 0000000..7851a1b
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/kindeditor.js
@@ -0,0 +1,5960 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2013 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @website http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+* @version 4.1.10 (2013-11-23)
+*******************************************************************************/
+(function (window, undefined) {
+	if (window.KindEditor) {
+		return;
+	}
+if (!window.console) {
+	window.console = {};
+}
+if (!console.log) {
+	console.log = function () {};
+}
+var _VERSION = '4.1.10 (2013-11-23)',
+	_ua = navigator.userAgent.toLowerCase(),
+	_IE = _ua.indexOf('msie') > -1 && _ua.indexOf('opera') == -1,
+	_NEWIE = _ua.indexOf('msie') == -1 && _ua.indexOf('trident') > -1,
+	_GECKO = _ua.indexOf('gecko') > -1 && _ua.indexOf('khtml') == -1,
+	_WEBKIT = _ua.indexOf('applewebkit') > -1,
+	_OPERA = _ua.indexOf('opera') > -1,
+	_MOBILE = _ua.indexOf('mobile') > -1,
+	_IOS = /ipad|iphone|ipod/.test(_ua),
+	_QUIRKS = document.compatMode != 'CSS1Compat',
+	_IERANGE = !window.getSelection,
+	_matches = /(?:msie|firefox|webkit|opera)[\/:\s](\d+)/.exec(_ua),
+	_V = _matches ? _matches[1] : '0',
+	_TIME = new Date().getTime();
+function _isArray(val) {
+	if (!val) {
+		return false;
+	}
+	return Object.prototype.toString.call(val) === '[object Array]';
+}
+function _isFunction(val) {
+	if (!val) {
+		return false;
+	}
+	return Object.prototype.toString.call(val) === '[object Function]';
+}
+function _inArray(val, arr) {
+	for (var i = 0, len = arr.length; i < len; i++) {
+		if (val === arr[i]) {
+			return i;
+		}
+	}
+	return -1;
+}
+function _each(obj, fn) {
+	if (_isArray(obj)) {
+		for (var i = 0, len = obj.length; i < len; i++) {
+			if (fn.call(obj[i], i, obj[i]) === false) {
+				break;
+			}
+		}
+	} else {
+		for (var key in obj) {
+			if (obj.hasOwnProperty(key)) {
+				if (fn.call(obj[key], key, obj[key]) === false) {
+					break;
+				}
+			}
+		}
+	}
+}
+function _trim(str) {
+	return str.replace(/(?:^[ \t\n\r]+)|(?:[ \t\n\r]+$)/g, '');
+}
+function _inString(val, str, delimiter) {
+	delimiter = delimiter === undefined ? ',' : delimiter;
+	return (delimiter + str + delimiter).indexOf(delimiter + val + delimiter) >= 0;
+}
+function _addUnit(val, unit) {
+	unit = unit || 'px';
+	return val && /^\d+$/.test(val) ? val + unit : val;
+}
+function _removeUnit(val) {
+	var match;
+	return val && (match = /(\d+)/.exec(val)) ? parseInt(match[1], 10) : 0;
+}
+function _escape(val) {
+	return val.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;');
+}
+function _unescape(val) {
+	return val.replace(/&lt;/g, '<').replace(/&gt;/g, '>').replace(/&quot;/g, '"').replace(/&amp;/g, '&');
+}
+function _toCamel(str) {
+	var arr = str.split('-');
+	str = '';
+	_each(arr, function(key, val) {
+		str += (key > 0) ? val.charAt(0).toUpperCase() + val.substr(1) : val;
+	});
+	return str;
+}
+function _toHex(val) {
+	function hex(d) {
+		var s = parseInt(d, 10).toString(16).toUpperCase();
+		return s.length > 1 ? s : '0' + s;
+	}
+	return val.replace(/rgb\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)/ig,
+		function($0, $1, $2, $3) {
+			return '#' + hex($1) + hex($2) + hex($3);
+		}
+	);
+}
+function _toMap(val, delimiter) {
+	delimiter = delimiter === undefined ? ',' : delimiter;
+	var map = {}, arr = _isArray(val) ? val : val.split(delimiter), match;
+	_each(arr, function(key, val) {
+		if ((match = /^(\d+)\.\.(\d+)$/.exec(val))) {
+			for (var i = parseInt(match[1], 10); i <= parseInt(match[2], 10); i++) {
+				map[i.toString()] = true;
+			}
+		} else {
+			map[val] = true;
+		}
+	});
+	return map;
+}
+function _toArray(obj, offset) {
+	return Array.prototype.slice.call(obj, offset || 0);
+}
+function _undef(val, defaultVal) {
+	return val === undefined ? defaultVal : val;
+}
+function _invalidUrl(url) {
+	return !url || /[<>"]/.test(url);
+}
+function _addParam(url, param) {
+	return url.indexOf('?') >= 0 ? url + '&' + param : url + '?' + param;
+}
+function _extend(child, parent, proto) {
+	if (!proto) {
+		proto = parent;
+		parent = null;
+	}
+	var childProto;
+	if (parent) {
+		var fn = function () {};
+		fn.prototype = parent.prototype;
+		childProto = new fn();
+		_each(proto, function(key, val) {
+			childProto[key] = val;
+		});
+	} else {
+		childProto = proto;
+	}
+	childProto.constructor = child;
+	child.prototype = childProto;
+	child.parent = parent ? parent.prototype : null;
+}
+function _json(text) {
+	var match;
+	if ((match = /\{[\s\S]*\}|\[[\s\S]*\]/.exec(text))) {
+		text = match[0];
+	}
+	var cx = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g;
+	cx.lastIndex = 0;
+	if (cx.test(text)) {
+		text = text.replace(cx, function (a) {
+			return '\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
+		});
+	}
+	if (/^[\],:{}\s]*$/.
+	test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@').
+	replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']').
+	replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
+		return eval('(' + text + ')');
+	}
+	throw 'JSON parse error';
+}
+var _round = Math.round;
+var K = {
+	DEBUG : false,
+	VERSION : _VERSION,
+	IE : _IE,
+	GECKO : _GECKO,
+	WEBKIT : _WEBKIT,
+	OPERA : _OPERA,
+	V : _V,
+	TIME : _TIME,
+	each : _each,
+	isArray : _isArray,
+	isFunction : _isFunction,
+	inArray : _inArray,
+	inString : _inString,
+	trim : _trim,
+	addUnit : _addUnit,
+	removeUnit : _removeUnit,
+	escape : _escape,
+	unescape : _unescape,
+	toCamel : _toCamel,
+	toHex : _toHex,
+	toMap : _toMap,
+	toArray : _toArray,
+	undef : _undef,
+	invalidUrl : _invalidUrl,
+	addParam : _addParam,
+	extend : _extend,
+	json : _json
+};
+var _INLINE_TAG_MAP = _toMap('a,abbr,acronym,b,basefont,bdo,big,br,button,cite,code,del,dfn,em,font,i,img,input,ins,kbd,label,map,q,s,samp,select,small,span,strike,strong,sub,sup,textarea,tt,u,var'),
+	_BLOCK_TAG_MAP = _toMap('address,applet,blockquote,body,center,dd,dir,div,dl,dt,fieldset,form,frameset,h1,h2,h3,h4,h5,h6,head,hr,html,iframe,ins,isindex,li,map,menu,meta,noframes,noscript,object,ol,p,pre,script,style,table,tbody,td,tfoot,th,thead,title,tr,ul'),
+	_SINGLE_TAG_MAP = _toMap('area,base,basefont,br,col,frame,hr,img,input,isindex,link,meta,param,embed'),
+	_STYLE_TAG_MAP = _toMap('b,basefont,big,del,em,font,i,s,small,span,strike,strong,sub,sup,u'),
+	_CONTROL_TAG_MAP = _toMap('img,table,input,textarea,button'),
+	_PRE_TAG_MAP = _toMap('pre,style,script'),
+	_NOSPLIT_TAG_MAP = _toMap('html,head,body,td,tr,table,ol,ul,li'),
+	_AUTOCLOSE_TAG_MAP = _toMap('colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr'),
+	_FILL_ATTR_MAP = _toMap('checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected'),
+	_VALUE_TAG_MAP = _toMap('input,button,textarea,select');
+function _getBasePath() {
+	var els = document.getElementsByTagName('script'), src;
+	for (var i = 0, len = els.length; i < len; i++) {
+		src = els[i].src || '';
+		if (/kindeditor[\w\-\.]*\.js/.test(src)) {
+			return src.substring(0, src.lastIndexOf('/') + 1);
+		}
+	}
+	return '';
+}
+K.basePath = _getBasePath();
+K.options = {
+	designMode : true,
+	fullscreenMode : false,
+	filterMode : true,
+	wellFormatMode : true,
+	shadowMode : true,
+	loadStyleMode : true,
+	basePath : K.basePath,
+	themesPath : K.basePath + 'themes/',
+	langPath : K.basePath + 'lang/',
+	pluginsPath : K.basePath + 'plugins/',
+	themeType : 'default',
+	langType : 'zh_CN',
+	urlType : '',
+	newlineTag : 'p',
+	resizeType : 2,
+	syncType : 'form',
+	pasteType : 2,
+	dialogAlignType : 'page',
+	useContextmenu : true,
+	fullscreenShortcut : false,
+	bodyClass : 'ke-content',
+	indentChar : '\t',
+	cssPath : '',
+	cssData : '',
+	minWidth : 650,
+	minHeight : 100,
+	minChangeSize : 50,
+	zIndex : 811213,
+	items : [
+		'source', '|', 'undo', 'redo', '|', 'preview', 'print', 'template', 'code', 'cut', 'copy', 'paste',
+		'plainpaste', 'wordpaste', '|', 'justifyleft', 'justifycenter', 'justifyright',
+		'justifyfull', 'insertorderedlist', 'insertunorderedlist', 'indent', 'outdent', 'subscript',
+		'superscript', 'clearhtml', 'quickformat', 'selectall', '|', 'fullscreen', '/',
+		'formatblock', 'fontname', 'fontsize', '|', 'forecolor', 'hilitecolor', 'bold',
+		'italic', 'underline', 'strikethrough', 'lineheight', 'removeformat', '|', 'image', 'multiimage',
+		'flash', 'media', 'insertfile', 'table', 'hr', 'emoticons', 'baidumap', 'pagebreak',
+		'anchor', 'link', 'unlink', '|', 'about'
+	],
+	noDisableItems : ['source', 'fullscreen'],
+	colorTable : [
+		['#E53333', '#E56600', '#FF9900', '#64451D', '#DFC5A4', '#FFE500'],
+		['#009900', '#006600', '#99BB00', '#B8D100', '#60D978', '#00D5FF'],
+		['#337FE5', '#003399', '#4C33E5', '#9933E5', '#CC33E5', '#EE33EE'],
+		['#FFFFFF', '#CCCCCC', '#999999', '#666666', '#333333', '#000000']
+	],
+	fontSizeTable : ['9px', '10px', '12px', '14px', '16px', '18px', '24px', '32px'],
+	htmlTags : {
+		font : ['id', 'class', 'color', 'size', 'face', '.background-color'],
+		span : [
+			'id', 'class', '.color', '.background-color', '.font-size', '.font-family', '.background',
+			'.font-weight', '.font-style', '.text-decoration', '.vertical-align', '.line-height'
+		],
+		div : [
+			'id', 'class', 'align', '.border', '.margin', '.padding', '.text-align', '.color',
+			'.background-color', '.font-size', '.font-family', '.font-weight', '.background',
+			'.font-style', '.text-decoration', '.vertical-align', '.margin-left'
+		],
+		table: [
+			'id', 'class', 'border', 'cellspacing', 'cellpadding', 'width', 'height', 'align', 'bordercolor',
+			'.padding', '.margin', '.border', 'bgcolor', '.text-align', '.color', '.background-color',
+			'.font-size', '.font-family', '.font-weight', '.font-style', '.text-decoration', '.background',
+			'.width', '.height', '.border-collapse'
+		],
+		'td,th': [
+			'id', 'class', 'align', 'valign', 'width', 'height', 'colspan', 'rowspan', 'bgcolor',
+			'.text-align', '.color', '.background-color', '.font-size', '.font-family', '.font-weight',
+			'.font-style', '.text-decoration', '.vertical-align', '.background', '.border'
+		],
+		a : ['id', 'class', 'href', 'target', 'name'],
+		embed : ['id', 'class', 'src', 'width', 'height', 'type', 'loop', 'autostart', 'quality', '.width', '.height', 'align', 'allowscriptaccess'],
+		img : ['id', 'class', 'src', 'width', 'height', 'border', 'alt', 'title', 'align', '.width', '.height', '.border'],
+		'p,ol,ul,li,blockquote,h1,h2,h3,h4,h5,h6' : [
+			'id', 'class', 'align', '.text-align', '.color', '.background-color', '.font-size', '.font-family', '.background',
+			'.font-weight', '.font-style', '.text-decoration', '.vertical-align', '.text-indent', '.margin-left'
+		],
+		pre : ['id', 'class'],
+		hr : ['id', 'class', '.page-break-after'],
+		'br,tbody,tr,strong,b,sub,sup,em,i,u,strike,s,del' : ['id', 'class'],
+		iframe : ['id', 'class', 'src', 'frameborder', 'width', 'height', '.width', '.height']
+	},
+	layout : '<div class="container"><div class="toolbar"></div><div class="edit"></div><div class="statusbar"></div></div>'
+};
+var _useCapture = false;
+var _INPUT_KEY_MAP = _toMap('8,9,13,32,46,48..57,59,61,65..90,106,109..111,188,190..192,219..222');
+var _CURSORMOVE_KEY_MAP = _toMap('33..40');
+var _CHANGE_KEY_MAP = {};
+_each(_INPUT_KEY_MAP, function(key, val) {
+	_CHANGE_KEY_MAP[key] = val;
+});
+_each(_CURSORMOVE_KEY_MAP, function(key, val) {
+	_CHANGE_KEY_MAP[key] = val;
+});
+function _bindEvent(el, type, fn) {
+	if (el.addEventListener){
+		el.addEventListener(type, fn, _useCapture);
+	} else if (el.attachEvent){
+		el.attachEvent('on' + type, fn);
+	}
+}
+function _unbindEvent(el, type, fn) {
+	if (el.removeEventListener){
+		el.removeEventListener(type, fn, _useCapture);
+	} else if (el.detachEvent){
+		el.detachEvent('on' + type, fn);
+	}
+}
+var _EVENT_PROPS = ('altKey,attrChange,attrName,bubbles,button,cancelable,charCode,clientX,clientY,ctrlKey,currentTarget,' +
+	'data,detail,eventPhase,fromElement,handler,keyCode,metaKey,newValue,offsetX,offsetY,originalTarget,pageX,' +
+	'pageY,prevValue,relatedNode,relatedTarget,screenX,screenY,shiftKey,srcElement,target,toElement,view,wheelDelta,which').split(',');
+function KEvent(el, event) {
+	this.init(el, event);
+}
+_extend(KEvent, {
+	init : function(el, event) {
+		var self = this, doc = el.ownerDocument || el.document || el;
+		self.event = event;
+		_each(_EVENT_PROPS, function(key, val) {
+			self[val] = event[val];
+		});
+		if (!self.target) {
+			self.target = self.srcElement || doc;
+		}
+		if (self.target.nodeType === 3) {
+			self.target = self.target.parentNode;
+		}
+		if (!self.relatedTarget && self.fromElement) {
+			self.relatedTarget = self.fromElement === self.target ? self.toElement : self.fromElement;
+		}
+		if (self.pageX == null && self.clientX != null) {
+			var d = doc.documentElement, body = doc.body;
+			self.pageX = self.clientX + (d && d.scrollLeft || body && body.scrollLeft || 0) - (d && d.clientLeft || body && body.clientLeft || 0);
+			self.pageY = self.clientY + (d && d.scrollTop  || body && body.scrollTop  || 0) - (d && d.clientTop  || body && body.clientTop  || 0);
+		}
+		if (!self.which && ((self.charCode || self.charCode === 0) ? self.charCode : self.keyCode)) {
+			self.which = self.charCode || self.keyCode;
+		}
+		if (!self.metaKey && self.ctrlKey) {
+			self.metaKey = self.ctrlKey;
+		}
+		if (!self.which && self.button !== undefined) {
+			self.which = (self.button & 1 ? 1 : (self.button & 2 ? 3 : (self.button & 4 ? 2 : 0)));
+		}
+		switch (self.which) {
+		case 186 :
+			self.which = 59;
+			break;
+		case 187 :
+		case 107 :
+		case 43 :
+			self.which = 61;
+			break;
+		case 189 :
+		case 45 :
+			self.which = 109;
+			break;
+		case 42 :
+			self.which = 106;
+			break;
+		case 47 :
+			self.which = 111;
+			break;
+		case 78 :
+			self.which = 110;
+			break;
+		}
+		if (self.which >= 96 && self.which <= 105) {
+			self.which -= 48;
+		}
+	},
+	preventDefault : function() {
+		var ev = this.event;
+		if (ev.preventDefault) {
+			ev.preventDefault();
+		} else {
+			ev.returnValue = false;
+		}
+	},
+	stopPropagation : function() {
+		var ev = this.event;
+		if (ev.stopPropagation) {
+			ev.stopPropagation();
+		} else {
+			ev.cancelBubble = true;
+		}
+	},
+	stop : function() {
+		this.preventDefault();
+		this.stopPropagation();
+	}
+});
+var _eventExpendo = 'kindeditor_' + _TIME, _eventId = 0, _eventData = {};
+function _getId(el) {
+	return el[_eventExpendo] || null;
+}
+function _setId(el) {
+	el[_eventExpendo] = ++_eventId;
+	return _eventId;
+}
+function _removeId(el) {
+	try {
+		delete el[_eventExpendo];
+	} catch(e) {
+		if (el.removeAttribute) {
+			el.removeAttribute(_eventExpendo);
+		}
+	}
+}
+function _bind(el, type, fn) {
+	if (type.indexOf(',') >= 0) {
+		_each(type.split(','), function() {
+			_bind(el, this, fn);
+		});
+		return;
+	}
+	var id = _getId(el);
+	if (!id) {
+		id = _setId(el);
+	}
+	if (_eventData[id] === undefined) {
+		_eventData[id] = {};
+	}
+	var events = _eventData[id][type];
+	if (events && events.length > 0) {
+		_unbindEvent(el, type, events[0]);
+	} else {
+		_eventData[id][type] = [];
+		_eventData[id].el = el;
+	}
+	events = _eventData[id][type];
+	if (events.length === 0) {
+		events[0] = function(e) {
+			var kevent = e ? new KEvent(el, e) : undefined;
+			_each(events, function(i, event) {
+				if (i > 0 && event) {
+					event.call(el, kevent);
+				}
+			});
+		};
+	}
+	if (_inArray(fn, events) < 0) {
+		events.push(fn);
+	}
+	_bindEvent(el, type, events[0]);
+}
+function _unbind(el, type, fn) {
+	if (type && type.indexOf(',') >= 0) {
+		_each(type.split(','), function() {
+			_unbind(el, this, fn);
+		});
+		return;
+	}
+	var id = _getId(el);
+	if (!id) {
+		return;
+	}
+	if (type === undefined) {
+		if (id in _eventData) {
+			_each(_eventData[id], function(key, events) {
+				if (key != 'el' && events.length > 0) {
+					_unbindEvent(el, key, events[0]);
+				}
+			});
+			delete _eventData[id];
+			_removeId(el);
+		}
+		return;
+	}
+	if (!_eventData[id]) {
+		return;
+	}
+	var events = _eventData[id][type];
+	if (events && events.length > 0) {
+		if (fn === undefined) {
+			_unbindEvent(el, type, events[0]);
+			delete _eventData[id][type];
+		} else {
+			_each(events, function(i, event) {
+				if (i > 0 && event === fn) {
+					events.splice(i, 1);
+				}
+			});
+			if (events.length == 1) {
+				_unbindEvent(el, type, events[0]);
+				delete _eventData[id][type];
+			}
+		}
+		var count = 0;
+		_each(_eventData[id], function() {
+			count++;
+		});
+		if (count < 2) {
+			delete _eventData[id];
+			_removeId(el);
+		}
+	}
+}
+function _fire(el, type) {
+	if (type.indexOf(',') >= 0) {
+		_each(type.split(','), function() {
+			_fire(el, this);
+		});
+		return;
+	}
+	var id = _getId(el);
+	if (!id) {
+		return;
+	}
+	var events = _eventData[id][type];
+	if (_eventData[id] && events && events.length > 0) {
+		events[0]();
+	}
+}
+function _ctrl(el, key, fn) {
+	var self = this;
+	key = /^\d{2,}$/.test(key) ? key : key.toUpperCase().charCodeAt(0);
+	_bind(el, 'keydown', function(e) {
+		if (e.ctrlKey && e.which == key && !e.shiftKey && !e.altKey) {
+			fn.call(el);
+			e.stop();
+		}
+	});
+}
+var _readyFinished = false;
+function _ready(fn) {
+	if (_readyFinished) {
+		fn(KindEditor);
+		return;
+	}
+	var loaded = false;
+	function readyFunc() {
+		if (!loaded) {
+			loaded = true;
+			fn(KindEditor);
+			_readyFinished = true;
+		}
+	}
+	function ieReadyFunc() {
+		if (!loaded) {
+			try {
+				document.documentElement.doScroll('left');
+			} catch(e) {
+				setTimeout(ieReadyFunc, 100);
+				return;
+			}
+			readyFunc();
+		}
+	}
+	function ieReadyStateFunc() {
+		if (document.readyState === 'complete') {
+			readyFunc();
+		}
+	}
+	if (document.addEventListener) {
+		_bind(document, 'DOMContentLoaded', readyFunc);
+	} else if (document.attachEvent) {
+		_bind(document, 'readystatechange', ieReadyStateFunc);
+		var toplevel = false;
+		try {
+			toplevel = window.frameElement == null;
+		} catch(e) {}
+		if (document.documentElement.doScroll && toplevel) {
+			ieReadyFunc();
+		}
+	}
+	_bind(window, 'load', readyFunc);
+}
+if (_IE) {
+	window.attachEvent('onunload', function() {
+		_each(_eventData, function(key, events) {
+			if (events.el) {
+				_unbind(events.el);
+			}
+		});
+	});
+}
+K.ctrl = _ctrl;
+K.ready = _ready;
+function _getCssList(css) {
+	var list = {},
+		reg = /\s*([\w\-]+)\s*:([^;]*)(;|$)/g,
+		match;
+	while ((match = reg.exec(css))) {
+		var key = _trim(match[1].toLowerCase()),
+			val = _trim(_toHex(match[2]));
+		list[key] = val;
+	}
+	return list;
+}
+function _getAttrList(tag) {
+	var list = {},
+		reg = /\s+(?:([\w\-:]+)|(?:([\w\-:]+)=([^\s"'<>]+))|(?:([\w\-:"]+)="([^"]*)")|(?:([\w\-:"]+)='([^']*)'))(?=(?:\s|\/|>)+)/g,
+		match;
+	while ((match = reg.exec(tag))) {
+		var key = (match[1] || match[2] || match[4] || match[6]).toLowerCase(),
+			val = (match[2] ? match[3] : (match[4] ? match[5] : match[7])) || '';
+		list[key] = val;
+	}
+	return list;
+}
+function _addClassToTag(tag, className) {
+	if (/\s+class\s*=/.test(tag)) {
+		tag = tag.replace(/(\s+class=["']?)([^"']*)(["']?[\s>])/, function($0, $1, $2, $3) {
+			if ((' ' + $2 + ' ').indexOf(' ' + className + ' ') < 0) {
+				return $2 === '' ? $1 + className + $3 : $1 + $2 + ' ' + className + $3;
+			} else {
+				return $0;
+			}
+		});
+	} else {
+		tag = tag.substr(0, tag.length - 1) + ' class="' + className + '">';
+	}
+	return tag;
+}
+function _formatCss(css) {
+	var str = '';
+	_each(_getCssList(css), function(key, val) {
+		str += key + ':' + val + ';';
+	});
+	return str;
+}
+function _formatUrl(url, mode, host, pathname) {
+	mode = _undef(mode, '').toLowerCase();
+	if (url.substr(0, 5) != 'data:') {
+		url = url.replace(/([^:])\/\//g, '$1/');
+	}
+	if (_inArray(mode, ['absolute', 'relative', 'domain']) < 0) {
+		return url;
+	}
+	host = host || location.protocol + '//' + location.host;
+	if (pathname === undefined) {
+		var m = location.pathname.match(/^(\/.*)\//);
+		pathname = m ? m[1] : '';
+	}
+	var match;
+	if ((match = /^(\w+:\/\/[^\/]*)/.exec(url))) {
+		if (match[1] !== host) {
+			return url;
+		}
+	} else if (/^\w+:/.test(url)) {
+		return url;
+	}
+	function getRealPath(path) {
+		var parts = path.split('/'), paths = [];
+		for (var i = 0, len = parts.length; i < len; i++) {
+			var part = parts[i];
+			if (part == '..') {
+				if (paths.length > 0) {
+					paths.pop();
+				}
+			} else if (part !== '' && part != '.') {
+				paths.push(part);
+			}
+		}
+		return '/' + paths.join('/');
+	}
+	if (/^\//.test(url)) {
+		url = host + getRealPath(url.substr(1));
+	} else if (!/^\w+:\/\//.test(url)) {
+		url = host + getRealPath(pathname + '/' + url);
+	}
+	function getRelativePath(path, depth) {
+		if (url.substr(0, path.length) === path) {
+			var arr = [];
+			for (var i = 0; i < depth; i++) {
+				arr.push('..');
+			}
+			var prefix = '.';
+			if (arr.length > 0) {
+				prefix += '/' + arr.join('/');
+			}
+			if (pathname == '/') {
+				prefix += '/';
+			}
+			return prefix + url.substr(path.length);
+		} else {
+			if ((match = /^(.*)\//.exec(path))) {
+				return getRelativePath(match[1], ++depth);
+			}
+		}
+	}
+	if (mode === 'relative') {
+		url = getRelativePath(host + pathname, 0).substr(2);
+	} else if (mode === 'absolute') {
+		if (url.substr(0, host.length) === host) {
+			url = url.substr(host.length);
+		}
+	}
+	return url;
+}
+function _formatHtml(html, htmlTags, urlType, wellFormatted, indentChar) {
+	if (html == null) {
+		html = '';
+	}
+	urlType = urlType || '';
+	wellFormatted = _undef(wellFormatted, false);
+	indentChar = _undef(indentChar, '\t');
+	var fontSizeList = 'xx-small,x-small,small,medium,large,x-large,xx-large'.split(',');
+	html = html.replace(/(<(?:pre|pre\s[^>]*)>)([\s\S]*?)(<\/pre>)/ig, function($0, $1, $2, $3) {
+		return $1 + $2.replace(/<(?:br|br\s[^>]*)>/ig, '\n') + $3;
+	});
+	html = html.replace(/<(?:br|br\s[^>]*)\s*\/?>\s*<\/p>/ig, '</p>');
+	html = html.replace(/(<(?:p|p\s[^>]*)>)\s*(<\/p>)/ig, '$1<br />$2');
+	html = html.replace(/\u200B/g, '');
+	html = html.replace(/\u00A9/g, '&copy;');
+	html = html.replace(/\u00AE/g, '&reg;');
+	html = html.replace(/<[^>]+/g, function($0) {
+		return $0.replace(/\s+/g, ' ');
+	});
+	var htmlTagMap = {};
+	if (htmlTags) {
+		_each(htmlTags, function(key, val) {
+			var arr = key.split(',');
+			for (var i = 0, len = arr.length; i < len; i++) {
+				htmlTagMap[arr[i]] = _toMap(val);
+			}
+		});
+		if (!htmlTagMap.script) {
+			html = html.replace(/(<(?:script|script\s[^>]*)>)([\s\S]*?)(<\/script>)/ig, '');
+		}
+		if (!htmlTagMap.style) {
+			html = html.replace(/(<(?:style|style\s[^>]*)>)([\s\S]*?)(<\/style>)/ig, '');
+		}
+	}
+	var re = /(\s*)<(\/)?([\w\-:]+)((?:\s+|(?:\s+[\w\-:]+)|(?:\s+[\w\-:]+=[^\s"'<>]+)|(?:\s+[\w\-:"]+="[^"]*")|(?:\s+[\w\-:"]+='[^']*'))*)(\/)?>(\s*)/g;
+	var tagStack = [];
+	html = html.replace(re, function($0, $1, $2, $3, $4, $5, $6) {
+		var full = $0,
+			startNewline = $1 || '',
+			startSlash = $2 || '',
+			tagName = $3.toLowerCase(),
+			attr = $4 || '',
+			endSlash = $5 ? ' ' + $5 : '',
+			endNewline = $6 || '';
+		if (htmlTags && !htmlTagMap[tagName]) {
+			return '';
+		}
+		if (endSlash === '' && _SINGLE_TAG_MAP[tagName]) {
+			endSlash = ' /';
+		}
+		if (_INLINE_TAG_MAP[tagName]) {
+			if (startNewline) {
+				startNewline = ' ';
+			}
+			if (endNewline) {
+				endNewline = ' ';
+			}
+		}
+		if (_PRE_TAG_MAP[tagName]) {
+			if (startSlash) {
+				endNewline = '\n';
+			} else {
+				startNewline = '\n';
+			}
+		}
+		if (wellFormatted && tagName == 'br') {
+			endNewline = '\n';
+		}
+		if (_BLOCK_TAG_MAP[tagName] && !_PRE_TAG_MAP[tagName]) {
+			if (wellFormatted) {
+				if (startSlash && tagStack.length > 0 && tagStack[tagStack.length - 1] === tagName) {
+					tagStack.pop();
+				} else {
+					tagStack.push(tagName);
+				}
+				startNewline = '\n';
+				endNewline = '\n';
+				for (var i = 0, len = startSlash ? tagStack.length : tagStack.length - 1; i < len; i++) {
+					startNewline += indentChar;
+					if (!startSlash) {
+						endNewline += indentChar;
+					}
+				}
+				if (endSlash) {
+					tagStack.pop();
+				} else if (!startSlash) {
+					endNewline += indentChar;
+				}
+			} else {
+				startNewline = endNewline = '';
+			}
+		}
+		if (attr !== '') {
+			var attrMap = _getAttrList(full);
+			if (tagName === 'font') {
+				var fontStyleMap = {}, fontStyle = '';
+				_each(attrMap, function(key, val) {
+					if (key === 'color') {
+						fontStyleMap.color = val;
+						delete attrMap[key];
+					}
+					if (key === 'size') {
+						fontStyleMap['font-size'] = fontSizeList[parseInt(val, 10) - 1] || '';
+						delete attrMap[key];
+					}
+					if (key === 'face') {
+						fontStyleMap['font-family'] = val;
+						delete attrMap[key];
+					}
+					if (key === 'style') {
+						fontStyle = val;
+					}
+				});
+				if (fontStyle && !/;$/.test(fontStyle)) {
+					fontStyle += ';';
+				}
+				_each(fontStyleMap, function(key, val) {
+					if (val === '') {
+						return;
+					}
+					if (/\s/.test(val)) {
+						val = "'" + val + "'";
+					}
+					fontStyle += key + ':' + val + ';';
+				});
+				attrMap.style = fontStyle;
+			}
+			_each(attrMap, function(key, val) {
+				if (_FILL_ATTR_MAP[key]) {
+					attrMap[key] = key;
+				}
+				if (_inArray(key, ['src', 'href']) >= 0) {
+					attrMap[key] = _formatUrl(val, urlType);
+				}
+				if (htmlTags && key !== 'style' && !htmlTagMap[tagName]['*'] && !htmlTagMap[tagName][key] ||
+					tagName === 'body' && key === 'contenteditable' ||
+					/^kindeditor_\d+$/.test(key)) {
+					delete attrMap[key];
+				}
+				if (key === 'style' && val !== '') {
+					var styleMap = _getCssList(val);
+					_each(styleMap, function(k, v) {
+						if (htmlTags && !htmlTagMap[tagName].style && !htmlTagMap[tagName]['.' + k]) {
+							delete styleMap[k];
+						}
+					});
+					var style = '';
+					_each(styleMap, function(k, v) {
+						style += k + ':' + v + ';';
+					});
+					attrMap.style = style;
+				}
+			});
+			attr = '';
+			_each(attrMap, function(key, val) {
+				if (key === 'style' && val === '') {
+					return;
+				}
+				val = val.replace(/"/g, '&quot;');
+				attr += ' ' + key + '="' + val + '"';
+			});
+		}
+		if (tagName === 'font') {
+			tagName = 'span';
+		}
+		return startNewline + '<' + startSlash + tagName + attr + endSlash + '>' + endNewline;
+	});
+	html = html.replace(/(<(?:pre|pre\s[^>]*)>)([\s\S]*?)(<\/pre>)/ig, function($0, $1, $2, $3) {
+		return $1 + $2.replace(/\n/g, '<span id="__kindeditor_pre_newline__">\n') + $3;
+	});
+	html = html.replace(/\n\s*\n/g, '\n');
+	html = html.replace(/<span id="__kindeditor_pre_newline__">\n/g, '\n');
+	return _trim(html);
+}
+function _clearMsWord(html, htmlTags) {
+	html = html.replace(/<meta[\s\S]*?>/ig, '')
+		.replace(/<![\s\S]*?>/ig, '')
+		.replace(/<style[^>]*>[\s\S]*?<\/style>/ig, '')
+		.replace(/<script[^>]*>[\s\S]*?<\/script>/ig, '')
+		.replace(/<w:[^>]+>[\s\S]*?<\/w:[^>]+>/ig, '')
+		.replace(/<o:[^>]+>[\s\S]*?<\/o:[^>]+>/ig, '')
+		.replace(/<xml>[\s\S]*?<\/xml>/ig, '')
+		.replace(/<(?:table|td)[^>]*>/ig, function(full) {
+			return full.replace(/border-bottom:([#\w\s]+)/ig, 'border:$1');
+		});
+	return _formatHtml(html, htmlTags);
+}
+function _mediaType(src) {
+	if (/\.(rm|rmvb)(\?|$)/i.test(src)) {
+		return 'audio/x-pn-realaudio-plugin';
+	}
+	if (/\.(swf|flv)(\?|$)/i.test(src)) {
+		return 'application/x-shockwave-flash';
+	}
+	return 'video/x-ms-asf-plugin';
+}
+function _mediaClass(type) {
+	if (/realaudio/i.test(type)) {
+		return 'ke-rm';
+	}
+	if (/flash/i.test(type)) {
+		return 'ke-flash';
+	}
+	return 'ke-media';
+}
+function _mediaAttrs(srcTag) {
+	return _getAttrList(unescape(srcTag));
+}
+function _mediaEmbed(attrs) {
+	var html = '<embed ';
+	_each(attrs, function(key, val) {
+		html += key + '="' + val + '" ';
+	});
+	html += '/>';
+	return html;
+}
+function _mediaImg(blankPath, attrs) {
+	var width = attrs.width,
+		height = attrs.height,
+		type = attrs.type || _mediaType(attrs.src),
+		srcTag = _mediaEmbed(attrs),
+		style = '';
+	if (/\D/.test(width)) {
+		style += 'width:' + width + ';';
+	} else if (width > 0) {
+		style += 'width:' + width + 'px;';
+	}
+	if (/\D/.test(height)) {
+		style += 'height:' + height + ';';
+	} else if (height > 0) {
+		style += 'height:' + height + 'px;';
+	}
+	var html = '<img class="' + _mediaClass(type) + '" src="' + blankPath + '" ';
+	if (style !== '') {
+		html += 'style="' + style + '" ';
+	}
+	html += 'data-ke-tag="' + escape(srcTag) + '" alt="" />';
+	return html;
+}
+function _tmpl(str, data) {
+	var fn = new Function("obj",
+		"var p=[],print=function(){p.push.apply(p,arguments);};" +
+		"with(obj){p.push('" +
+		str.replace(/[\r\t\n]/g, " ")
+			.split("<%").join("\t")
+			.replace(/((^|%>)[^\t]*)'/g, "$1\r")
+			.replace(/\t=(.*?)%>/g, "',$1,'")
+			.split("\t").join("');")
+			.split("%>").join("p.push('")
+			.split("\r").join("\\'") + "');}return p.join('');");
+	return data ? fn(data) : fn;
+}
+K.formatUrl = _formatUrl;
+K.formatHtml = _formatHtml;
+K.getCssList = _getCssList;
+K.getAttrList = _getAttrList;
+K.mediaType = _mediaType;
+K.mediaAttrs = _mediaAttrs;
+K.mediaEmbed = _mediaEmbed;
+K.mediaImg = _mediaImg;
+K.clearMsWord = _clearMsWord;
+K.tmpl = _tmpl;
+function _contains(nodeA, nodeB) {
+	if (nodeA.nodeType == 9 && nodeB.nodeType != 9) {
+		return true;
+	}
+	while ((nodeB = nodeB.parentNode)) {
+		if (nodeB == nodeA) {
+			return true;
+		}
+	}
+	return false;
+}
+var _getSetAttrDiv = document.createElement('div');
+_getSetAttrDiv.setAttribute('className', 't');
+var _GET_SET_ATTRIBUTE = _getSetAttrDiv.className !== 't';
+function _getAttr(el, key) {
+	key = key.toLowerCase();
+	var val = null;
+	if (!_GET_SET_ATTRIBUTE && el.nodeName.toLowerCase() != 'script') {
+		var div = el.ownerDocument.createElement('div');
+		div.appendChild(el.cloneNode(false));
+		var list = _getAttrList(_unescape(div.innerHTML));
+		if (key in list) {
+			val = list[key];
+		}
+	} else {
+		try {
+			val = el.getAttribute(key, 2);
+		} catch(e) {
+			val = el.getAttribute(key, 1);
+		}
+	}
+	if (key === 'style' && val !== null) {
+		val = _formatCss(val);
+	}
+	return val;
+}
+function _queryAll(expr, root) {
+	var exprList = expr.split(',');
+	if (exprList.length > 1) {
+		var mergedResults = [];
+		_each(exprList, function() {
+			_each(_queryAll(this, root), function() {
+				if (_inArray(this, mergedResults) < 0) {
+					mergedResults.push(this);
+				}
+			});
+		});
+		return mergedResults;
+	}
+	root = root || document;
+	function escape(str) {
+		if (typeof str != 'string') {
+			return str;
+		}
+		return str.replace(/([^\w\-])/g, '\\$1');
+	}
+	function stripslashes(str) {
+		return str.replace(/\\/g, '');
+	}
+	function cmpTag(tagA, tagB) {
+		return tagA === '*' || tagA.toLowerCase() === escape(tagB.toLowerCase());
+	}
+	function byId(id, tag, root) {
+		var arr = [],
+			doc = root.ownerDocument || root,
+			el = doc.getElementById(stripslashes(id));
+		if (el) {
+			if (cmpTag(tag, el.nodeName) && _contains(root, el)) {
+				arr.push(el);
+			}
+		}
+		return arr;
+	}
+	function byClass(className, tag, root) {
+		var doc = root.ownerDocument || root, arr = [], els, i, len, el;
+		if (root.getElementsByClassName) {
+			els = root.getElementsByClassName(stripslashes(className));
+			for (i = 0, len = els.length; i < len; i++) {
+				el = els[i];
+				if (cmpTag(tag, el.nodeName)) {
+					arr.push(el);
+				}
+			}
+		} else if (doc.querySelectorAll) {
+			els = doc.querySelectorAll((root.nodeName !== '#document' ? root.nodeName + ' ' : '') + tag + '.' + className);
+			for (i = 0, len = els.length; i < len; i++) {
+				el = els[i];
+				if (_contains(root, el)) {
+					arr.push(el);
+				}
+			}
+		} else {
+			els = root.getElementsByTagName(tag);
+			className = ' ' + className + ' ';
+			for (i = 0, len = els.length; i < len; i++) {
+				el = els[i];
+				if (el.nodeType == 1) {
+					var cls = el.className;
+					if (cls && (' ' + cls + ' ').indexOf(className) > -1) {
+						arr.push(el);
+					}
+				}
+			}
+		}
+		return arr;
+	}
+	function byName(name, tag, root) {
+		var arr = [], doc = root.ownerDocument || root,
+			els = doc.getElementsByName(stripslashes(name)), el;
+		for (var i = 0, len = els.length; i < len; i++) {
+			el = els[i];
+			if (cmpTag(tag, el.nodeName) && _contains(root, el)) {
+				if (el.getAttribute('name') !== null) {
+					arr.push(el);
+				}
+			}
+		}
+		return arr;
+	}
+	function byAttr(key, val, tag, root) {
+		var arr = [], els = root.getElementsByTagName(tag), el;
+		for (var i = 0, len = els.length; i < len; i++) {
+			el = els[i];
+			if (el.nodeType == 1) {
+				if (val === null) {
+					if (_getAttr(el, key) !== null) {
+						arr.push(el);
+					}
+				} else {
+					if (val === escape(_getAttr(el, key))) {
+						arr.push(el);
+					}
+				}
+			}
+		}
+		return arr;
+	}
+	function select(expr, root) {
+		var arr = [], matches;
+		matches = /^((?:\\.|[^.#\s\[<>])+)/.exec(expr);
+		var tag = matches ? matches[1] : '*';
+		if ((matches = /#((?:[\w\-]|\\.)+)$/.exec(expr))) {
+			arr = byId(matches[1], tag, root);
+		} else if ((matches = /\.((?:[\w\-]|\\.)+)$/.exec(expr))) {
+			arr = byClass(matches[1], tag, root);
+		} else if ((matches = /\[((?:[\w\-]|\\.)+)\]/.exec(expr))) {
+			arr = byAttr(matches[1].toLowerCase(), null, tag, root);
+		} else if ((matches = /\[((?:[\w\-]|\\.)+)\s*=\s*['"]?((?:\\.|[^'"]+)+)['"]?\]/.exec(expr))) {
+			var key = matches[1].toLowerCase(), val = matches[2];
+			if (key === 'id') {
+				arr = byId(val, tag, root);
+			} else if (key === 'class') {
+				arr = byClass(val, tag, root);
+			} else if (key === 'name') {
+				arr = byName(val, tag, root);
+			} else {
+				arr = byAttr(key, val, tag, root);
+			}
+		} else {
+			var els = root.getElementsByTagName(tag), el;
+			for (var i = 0, len = els.length; i < len; i++) {
+				el = els[i];
+				if (el.nodeType == 1) {
+					arr.push(el);
+				}
+			}
+		}
+		return arr;
+	}
+	var parts = [], arr, re = /((?:\\.|[^\s>])+|[\s>])/g;
+	while ((arr = re.exec(expr))) {
+		if (arr[1] !== ' ') {
+			parts.push(arr[1]);
+		}
+	}
+	var results = [];
+	if (parts.length == 1) {
+		return select(parts[0], root);
+	}
+	var isChild = false, part, els, subResults, val, v, i, j, k, length, len, l;
+	for (i = 0, lenth = parts.length; i < lenth; i++) {
+		part = parts[i];
+		if (part === '>') {
+			isChild = true;
+			continue;
+		}
+		if (i > 0) {
+			els = [];
+			for (j = 0, len = results.length; j < len; j++) {
+				val = results[j];
+				subResults = select(part, val);
+				for (k = 0, l = subResults.length; k < l; k++) {
+					v = subResults[k];
+					if (isChild) {
+						if (val === v.parentNode) {
+							els.push(v);
+						}
+					} else {
+						els.push(v);
+					}
+				}
+			}
+			results = els;
+		} else {
+			results = select(part, root);
+		}
+		if (results.length === 0) {
+			return [];
+		}
+	}
+	return results;
+}
+function _query(expr, root) {
+	var arr = _queryAll(expr, root);
+	return arr.length > 0 ? arr[0] : null;
+}
+K.query = _query;
+K.queryAll = _queryAll;
+function _get(val) {
+	return K(val)[0];
+}
+function _getDoc(node) {
+	if (!node) {
+		return document;
+	}
+	return node.ownerDocument || node.document || node;
+}
+function _getWin(node) {
+	if (!node) {
+		return window;
+	}
+	var doc = _getDoc(node);
+	return doc.parentWindow || doc.defaultView;
+}
+function _setHtml(el, html) {
+	if (el.nodeType != 1) {
+		return;
+	}
+	var doc = _getDoc(el);
+	try {
+		el.innerHTML = '<img id="__kindeditor_temp_tag__" width="0" height="0" style="display:none;" />' + html;
+		var temp = doc.getElementById('__kindeditor_temp_tag__');
+		temp.parentNode.removeChild(temp);
+	} catch(e) {
+		K(el).empty();
+		K('@' + html, doc).each(function() {
+			el.appendChild(this);
+		});
+	}
+}
+function _hasClass(el, cls) {
+	return _inString(cls, el.className, ' ');
+}
+function _setAttr(el, key, val) {
+	if (_IE && _V < 8 && key.toLowerCase() == 'class') {
+		key = 'className';
+	}
+	el.setAttribute(key, '' + val);
+}
+function _removeAttr(el, key) {
+	if (_IE && _V < 8 && key.toLowerCase() == 'class') {
+		key = 'className';
+	}
+	_setAttr(el, key, '');
+	el.removeAttribute(key);
+}
+function _getNodeName(node) {
+	if (!node || !node.nodeName) {
+		return '';
+	}
+	return node.nodeName.toLowerCase();
+}
+function _computedCss(el, key) {
+	var self = this, win = _getWin(el), camelKey = _toCamel(key), val = '';
+	if (win.getComputedStyle) {
+		var style = win.getComputedStyle(el, null);
+		val = style[camelKey] || style.getPropertyValue(key) || el.style[camelKey];
+	} else if (el.currentStyle) {
+		val = el.currentStyle[camelKey] || el.style[camelKey];
+	}
+	return val;
+}
+function _hasVal(node) {
+	return !!_VALUE_TAG_MAP[_getNodeName(node)];
+}
+function _docElement(doc) {
+	doc = doc || document;
+	return _QUIRKS ? doc.body : doc.documentElement;
+}
+function _docHeight(doc) {
+	var el = _docElement(doc);
+	return Math.max(el.scrollHeight, el.clientHeight);
+}
+function _docWidth(doc) {
+	var el = _docElement(doc);
+	return Math.max(el.scrollWidth, el.clientWidth);
+}
+function _getScrollPos(doc) {
+	doc = doc || document;
+	var x, y;
+	if (_IE || _NEWIE || _OPERA) {
+		x = _docElement(doc).scrollLeft;
+		y = _docElement(doc).scrollTop;
+	} else {
+		x = _getWin(doc).scrollX;
+		y = _getWin(doc).scrollY;
+	}
+	return {x : x, y : y};
+}
+function KNode(node) {
+	this.init(node);
+}
+_extend(KNode, {
+	init : function(node) {
+		var self = this;
+		node = _isArray(node) ? node : [node];
+		var length = 0;
+		for (var i = 0, len = node.length; i < len; i++) {
+			if (node[i]) {
+				self[i] = node[i].constructor === KNode ? node[i][0] : node[i];
+				length++;
+			}
+		}
+		self.length = length;
+		self.doc = _getDoc(self[0]);
+		self.name = _getNodeName(self[0]);
+		self.type = self.length > 0 ? self[0].nodeType : null;
+		self.win = _getWin(self[0]);
+	},
+	each : function(fn) {
+		var self = this;
+		for (var i = 0; i < self.length; i++) {
+			if (fn.call(self[i], i, self[i]) === false) {
+				return self;
+			}
+		}
+		return self;
+	},
+	bind : function(type, fn) {
+		this.each(function() {
+			_bind(this, type, fn);
+		});
+		return this;
+	},
+	unbind : function(type, fn) {
+		this.each(function() {
+			_unbind(this, type, fn);
+		});
+		return this;
+	},
+	fire : function(type) {
+		if (this.length < 1) {
+			return this;
+		}
+		_fire(this[0], type);
+		return this;
+	},
+	hasAttr : function(key) {
+		if (this.length < 1) {
+			return false;
+		}
+		return !!_getAttr(this[0], key);
+	},
+	attr : function(key, val) {
+		var self = this;
+		if (key === undefined) {
+			return _getAttrList(self.outer());
+		}
+		if (typeof key === 'object') {
+			_each(key, function(k, v) {
+				self.attr(k, v);
+			});
+			return self;
+		}
+		if (val === undefined) {
+			val = self.length < 1 ? null : _getAttr(self[0], key);
+			return val === null ? '' : val;
+		}
+		self.each(function() {
+			_setAttr(this, key, val);
+		});
+		return self;
+	},
+	removeAttr : function(key) {
+		this.each(function() {
+			_removeAttr(this, key);
+		});
+		return this;
+	},
+	get : function(i) {
+		if (this.length < 1) {
+			return null;
+		}
+		return this[i || 0];
+	},
+	eq : function(i) {
+		if (this.length < 1) {
+			return null;
+		}
+		return this[i] ? new KNode(this[i]) : null;
+	},
+	hasClass : function(cls) {
+		if (this.length < 1) {
+			return false;
+		}
+		return _hasClass(this[0], cls);
+	},
+	addClass : function(cls) {
+		this.each(function() {
+			if (!_hasClass(this, cls)) {
+				this.className = _trim(this.className + ' ' + cls);
+			}
+		});
+		return this;
+	},
+	removeClass : function(cls) {
+		this.each(function() {
+			if (_hasClass(this, cls)) {
+				this.className = _trim(this.className.replace(new RegExp('(^|\\s)' + cls + '(\\s|$)'), ' '));
+			}
+		});
+		return this;
+	},
+	html : function(val) {
+		var self = this;
+		if (val === undefined) {
+			if (self.length < 1 || self.type != 1) {
+				return '';
+			}
+			return _formatHtml(self[0].innerHTML);
+		}
+		self.each(function() {
+			_setHtml(this, val);
+		});
+		return self;
+	},
+	text : function() {
+		var self = this;
+		if (self.length < 1) {
+			return '';
+		}
+		return _IE ? self[0].innerText : self[0].textContent;
+	},
+	hasVal : function() {
+		if (this.length < 1) {
+			return false;
+		}
+		return _hasVal(this[0]);
+	},
+	val : function(val) {
+		var self = this;
+		if (val === undefined) {
+			if (self.length < 1) {
+				return '';
+			}
+			return self.hasVal() ? self[0].value : self.attr('value');
+		} else {
+			self.each(function() {
+				if (_hasVal(this)) {
+					this.value = val;
+				} else {
+					_setAttr(this, 'value' , val);
+				}
+			});
+			return self;
+		}
+	},
+	css : function(key, val) {
+		var self = this;
+		if (key === undefined) {
+			return _getCssList(self.attr('style'));
+		}
+		if (typeof key === 'object') {
+			_each(key, function(k, v) {
+				self.css(k, v);
+			});
+			return self;
+		}
+		if (val === undefined) {
+			if (self.length < 1) {
+				return '';
+			}
+			return self[0].style[_toCamel(key)] || _computedCss(self[0], key) || '';
+		}
+		self.each(function() {
+			this.style[_toCamel(key)] = val;
+		});
+		return self;
+	},
+	width : function(val) {
+		var self = this;
+		if (val === undefined) {
+			if (self.length < 1) {
+				return 0;
+			}
+			return self[0].offsetWidth;
+		}
+		return self.css('width', _addUnit(val));
+	},
+	height : function(val) {
+		var self = this;
+		if (val === undefined) {
+			if (self.length < 1) {
+				return 0;
+			}
+			return self[0].offsetHeight;
+		}
+		return self.css('height', _addUnit(val));
+	},
+	opacity : function(val) {
+		this.each(function() {
+			if (this.style.opacity === undefined) {
+				this.style.filter = val == 1 ? '' : 'alpha(opacity=' + (val * 100) + ')';
+			} else {
+				this.style.opacity = val == 1 ? '' : val;
+			}
+		});
+		return this;
+	},
+	data : function(key, val) {
+		var self = this;
+		key = 'kindeditor_data_' + key;
+		if (val === undefined) {
+			if (self.length < 1) {
+				return null;
+			}
+			return self[0][key];
+		}
+		this.each(function() {
+			this[key] = val;
+		});
+		return self;
+	},
+	pos : function() {
+		var self = this, node = self[0], x = 0, y = 0;
+		if (node) {
+			if (node.getBoundingClientRect) {
+				var box = node.getBoundingClientRect(),
+					pos = _getScrollPos(self.doc);
+				x = box.left + pos.x;
+				y = box.top + pos.y;
+			} else {
+				while (node) {
+					x += node.offsetLeft;
+					y += node.offsetTop;
+					node = node.offsetParent;
+				}
+			}
+		}
+		return {x : _round(x), y : _round(y)};
+	},
+	clone : function(bool) {
+		if (this.length < 1) {
+			return new KNode([]);
+		}
+		return new KNode(this[0].cloneNode(bool));
+	},
+	append : function(expr) {
+		this.each(function() {
+			if (this.appendChild) {
+				this.appendChild(_get(expr));
+			}
+		});
+		return this;
+	},
+	appendTo : function(expr) {
+		this.each(function() {
+			_get(expr).appendChild(this);
+		});
+		return this;
+	},
+	before : function(expr) {
+		this.each(function() {
+			this.parentNode.insertBefore(_get(expr), this);
+		});
+		return this;
+	},
+	after : function(expr) {
+		this.each(function() {
+			if (this.nextSibling) {
+				this.parentNode.insertBefore(_get(expr), this.nextSibling);
+			} else {
+				this.parentNode.appendChild(_get(expr));
+			}
+		});
+		return this;
+	},
+	replaceWith : function(expr) {
+		var nodes = [];
+		this.each(function(i, node) {
+			_unbind(node);
+			var newNode = _get(expr);
+			node.parentNode.replaceChild(newNode, node);
+			nodes.push(newNode);
+		});
+		return K(nodes);
+	},
+	empty : function() {
+		var self = this;
+		self.each(function(i, node) {
+			var child = node.firstChild;
+			while (child) {
+				if (!node.parentNode) {
+					return;
+				}
+				var next = child.nextSibling;
+				child.parentNode.removeChild(child);
+				child = next;
+			}
+		});
+		return self;
+	},
+	remove : function(keepChilds) {
+		var self = this;
+		self.each(function(i, node) {
+			if (!node.parentNode) {
+				return;
+			}
+			_unbind(node);
+			if (keepChilds) {
+				var child = node.firstChild;
+				while (child) {
+					var next = child.nextSibling;
+					node.parentNode.insertBefore(child, node);
+					child = next;
+				}
+			}
+			node.parentNode.removeChild(node);
+			delete self[i];
+		});
+		self.length = 0;
+		return self;
+	},
+	show : function(val) {
+		var self = this;
+		if (val === undefined) {
+			val = self._originDisplay || '';
+		}
+		if (self.css('display') != 'none') {
+			return self;
+		}
+		return self.css('display', val);
+	},
+	hide : function() {
+		var self = this;
+		if (self.length < 1) {
+			return self;
+		}
+		self._originDisplay = self[0].style.display;
+		return self.css('display', 'none');
+	},
+	outer : function() {
+		var self = this;
+		if (self.length < 1) {
+			return '';
+		}
+		var div = self.doc.createElement('div'), html;
+		div.appendChild(self[0].cloneNode(true));
+		html = _formatHtml(div.innerHTML);
+		div = null;
+		return html;
+	},
+	isSingle : function() {
+		return !!_SINGLE_TAG_MAP[this.name];
+	},
+	isInline : function() {
+		return !!_INLINE_TAG_MAP[this.name];
+	},
+	isBlock : function() {
+		return !!_BLOCK_TAG_MAP[this.name];
+	},
+	isStyle : function() {
+		return !!_STYLE_TAG_MAP[this.name];
+	},
+	isControl : function() {
+		return !!_CONTROL_TAG_MAP[this.name];
+	},
+	contains : function(otherNode) {
+		if (this.length < 1) {
+			return false;
+		}
+		return _contains(this[0], _get(otherNode));
+	},
+	parent : function() {
+		if (this.length < 1) {
+			return null;
+		}
+		var node = this[0].parentNode;
+		return node ? new KNode(node) : null;
+	},
+	children : function() {
+		if (this.length < 1) {
+			return new KNode([]);
+		}
+		var list = [], child = this[0].firstChild;
+		while (child) {
+			if (child.nodeType != 3 || _trim(child.nodeValue) !== '') {
+				list.push(child);
+			}
+			child = child.nextSibling;
+		}
+		return new KNode(list);
+	},
+	first : function() {
+		var list = this.children();
+		return list.length > 0 ? list.eq(0) : null;
+	},
+	last : function() {
+		var list = this.children();
+		return list.length > 0 ? list.eq(list.length - 1) : null;
+	},
+	index : function() {
+		if (this.length < 1) {
+			return -1;
+		}
+		var i = -1, sibling = this[0];
+		while (sibling) {
+			i++;
+			sibling = sibling.previousSibling;
+		}
+		return i;
+	},
+	prev : function() {
+		if (this.length < 1) {
+			return null;
+		}
+		var node = this[0].previousSibling;
+		return node ? new KNode(node) : null;
+	},
+	next : function() {
+		if (this.length < 1) {
+			return null;
+		}
+		var node = this[0].nextSibling;
+		return node ? new KNode(node) : null;
+	},
+	scan : function(fn, order) {
+		if (this.length < 1) {
+			return;
+		}
+		order = (order === undefined) ? true : order;
+		function walk(node) {
+			var n = order ? node.firstChild : node.lastChild;
+			while (n) {
+				var next = order ? n.nextSibling : n.previousSibling;
+				if (fn(n) === false) {
+					return false;
+				}
+				if (walk(n) === false) {
+					return false;
+				}
+				n = next;
+			}
+		}
+		walk(this[0]);
+		return this;
+	}
+});
+_each(('blur,focus,focusin,focusout,load,resize,scroll,unload,click,dblclick,' +
+	'mousedown,mouseup,mousemove,mouseover,mouseout,mouseenter,mouseleave,' +
+	'change,select,submit,keydown,keypress,keyup,error,contextmenu').split(','), function(i, type) {
+	KNode.prototype[type] = function(fn) {
+		return fn ? this.bind(type, fn) : this.fire(type);
+	};
+});
+var _K = K;
+K = function(expr, root) {
+	if (expr === undefined || expr === null) {
+		return;
+	}
+	function newNode(node) {
+		if (!node[0]) {
+			node = [];
+		}
+		return new KNode(node);
+	}
+	if (typeof expr === 'string') {
+		if (root) {
+			root = _get(root);
+		}
+		var length = expr.length;
+		if (expr.charAt(0) === '@') {
+			expr = expr.substr(1);
+		}
+		if (expr.length !== length || /<.+>/.test(expr)) {
+			var doc = root ? root.ownerDocument || root : document,
+				div = doc.createElement('div'), list = [];
+			div.innerHTML = '<img id="__kindeditor_temp_tag__" width="0" height="0" style="display:none;" />' + expr;
+			for (var i = 0, len = div.childNodes.length; i < len; i++) {
+				var child = div.childNodes[i];
+				if (child.id == '__kindeditor_temp_tag__') {
+					continue;
+				}
+				list.push(child);
+			}
+			return newNode(list);
+		}
+		return newNode(_queryAll(expr, root));
+	}
+	if (expr && expr.constructor === KNode) {
+		return expr;
+	}
+	if (expr.toArray) {
+		expr = expr.toArray();
+	}
+	if (_isArray(expr)) {
+		return newNode(expr);
+	}
+	return newNode(_toArray(arguments));
+};
+_each(_K, function(key, val) {
+	K[key] = val;
+});
+K.NodeClass = KNode;
+window.KindEditor = K;
+var _START_TO_START = 0,
+	_START_TO_END = 1,
+	_END_TO_END = 2,
+	_END_TO_START = 3,
+	_BOOKMARK_ID = 0;
+function _updateCollapsed(range) {
+	range.collapsed = (range.startContainer === range.endContainer && range.startOffset === range.endOffset);
+	return range;
+}
+function _copyAndDelete(range, isCopy, isDelete) {
+	var doc = range.doc, nodeList = [];
+	function splitTextNode(node, startOffset, endOffset) {
+		var length = node.nodeValue.length, centerNode;
+		if (isCopy) {
+			var cloneNode = node.cloneNode(true);
+			if (startOffset > 0) {
+				centerNode = cloneNode.splitText(startOffset);
+			} else {
+				centerNode = cloneNode;
+			}
+			if (endOffset < length) {
+				centerNode.splitText(endOffset - startOffset);
+			}
+		}
+		if (isDelete) {
+			var center = node;
+			if (startOffset > 0) {
+				center = node.splitText(startOffset);
+				range.setStart(node, startOffset);
+			}
+			if (endOffset < length) {
+				var right = center.splitText(endOffset - startOffset);
+				range.setEnd(right, 0);
+			}
+			nodeList.push(center);
+		}
+		return centerNode;
+	}
+	function removeNodes() {
+		if (isDelete) {
+			range.up().collapse(true);
+		}
+		for (var i = 0, len = nodeList.length; i < len; i++) {
+			var node = nodeList[i];
+			if (node.parentNode) {
+				node.parentNode.removeChild(node);
+			}
+		}
+	}
+	var copyRange = range.cloneRange().down();
+	var start = -1, incStart = -1, incEnd = -1, end = -1,
+		ancestor = range.commonAncestor(), frag = doc.createDocumentFragment();
+	if (ancestor.nodeType == 3) {
+		var textNode = splitTextNode(ancestor, range.startOffset, range.endOffset);
+		if (isCopy) {
+			frag.appendChild(textNode);
+		}
+		removeNodes();
+		return isCopy ? frag : range;
+	}
+	function extractNodes(parent, frag) {
+		var node = parent.firstChild, nextNode;
+		while (node) {
+			var testRange = new KRange(doc).selectNode(node);
+			start = testRange.compareBoundaryPoints(_START_TO_END, range);
+			if (start >= 0 && incStart <= 0) {
+				incStart = testRange.compareBoundaryPoints(_START_TO_START, range);
+			}
+			if (incStart >= 0 && incEnd <= 0) {
+				incEnd = testRange.compareBoundaryPoints(_END_TO_END, range);
+			}
+			if (incEnd >= 0 && end <= 0) {
+				end = testRange.compareBoundaryPoints(_END_TO_START, range);
+			}
+			if (end >= 0) {
+				return false;
+			}
+			nextNode = node.nextSibling;
+			if (start > 0) {
+				if (node.nodeType == 1) {
+					if (incStart >= 0 && incEnd <= 0) {
+						if (isCopy) {
+							frag.appendChild(node.cloneNode(true));
+						}
+						if (isDelete) {
+							nodeList.push(node);
+						}
+					} else {
+						var childFlag;
+						if (isCopy) {
+							childFlag = node.cloneNode(false);
+							frag.appendChild(childFlag);
+						}
+						if (extractNodes(node, childFlag) === false) {
+							return false;
+						}
+					}
+				} else if (node.nodeType == 3) {
+					var textNode;
+					if (node == copyRange.startContainer) {
+						textNode = splitTextNode(node, copyRange.startOffset, node.nodeValue.length);
+					} else if (node == copyRange.endContainer) {
+						textNode = splitTextNode(node, 0, copyRange.endOffset);
+					} else {
+						textNode = splitTextNode(node, 0, node.nodeValue.length);
+					}
+					if (isCopy) {
+						try {
+							frag.appendChild(textNode);
+						} catch(e) {}
+					}
+				}
+			}
+			node = nextNode;
+		}
+	}
+	extractNodes(ancestor, frag);
+	if (isDelete) {
+		range.up().collapse(true);
+	}
+	for (var i = 0, len = nodeList.length; i < len; i++) {
+		var node = nodeList[i];
+		if (node.parentNode) {
+			node.parentNode.removeChild(node);
+		}
+	}
+	return isCopy ? frag : range;
+}
+function _moveToElementText(range, el) {
+	var node = el;
+	while (node) {
+		var knode = K(node);
+		if (knode.name == 'marquee' || knode.name == 'select') {
+			return;
+		}
+		node = node.parentNode;
+	}
+	try {
+		range.moveToElementText(el);
+	} catch(e) {}
+}
+function _getStartEnd(rng, isStart) {
+	var doc = rng.parentElement().ownerDocument,
+		pointRange = rng.duplicate();
+	pointRange.collapse(isStart);
+	var parent = pointRange.parentElement(),
+		nodes = parent.childNodes;
+	if (nodes.length === 0) {
+		return {node: parent.parentNode, offset: K(parent).index()};
+	}
+	var startNode = doc, startPos = 0, cmp = -1;
+	var testRange = rng.duplicate();
+	_moveToElementText(testRange, parent);
+	for (var i = 0, len = nodes.length; i < len; i++) {
+		var node = nodes[i];
+		cmp = testRange.compareEndPoints('StartToStart', pointRange);
+		if (cmp === 0) {
+			return {node: node.parentNode, offset: i};
+		}
+		if (node.nodeType == 1) {
+			var nodeRange = rng.duplicate(), dummy, knode = K(node), newNode = node;
+			if (knode.isControl()) {
+				dummy = doc.createElement('span');
+				knode.after(dummy);
+				newNode = dummy;
+				startPos += knode.text().replace(/\r\n|\n|\r/g, '').length;
+			}
+			_moveToElementText(nodeRange, newNode);
+			testRange.setEndPoint('StartToEnd', nodeRange);
+			if (cmp > 0) {
+				startPos += nodeRange.text.replace(/\r\n|\n|\r/g, '').length;
+			} else {
+				startPos = 0;
+			}
+			if (dummy) {
+				K(dummy).remove();
+			}
+		} else if (node.nodeType == 3) {
+			testRange.moveStart('character', node.nodeValue.length);
+			startPos += node.nodeValue.length;
+		}
+		if (cmp < 0) {
+			startNode = node;
+		}
+	}
+	if (cmp < 0 && startNode.nodeType == 1) {
+		return {node: parent, offset: K(parent.lastChild).index() + 1};
+	}
+	if (cmp > 0) {
+		while (startNode.nextSibling && startNode.nodeType == 1) {
+			startNode = startNode.nextSibling;
+		}
+	}
+	testRange = rng.duplicate();
+	_moveToElementText(testRange, parent);
+	testRange.setEndPoint('StartToEnd', pointRange);
+	startPos -= testRange.text.replace(/\r\n|\n|\r/g, '').length;
+	if (cmp > 0 && startNode.nodeType == 3) {
+		var prevNode = startNode.previousSibling;
+		while (prevNode && prevNode.nodeType == 3) {
+			startPos -= prevNode.nodeValue.length;
+			prevNode = prevNode.previousSibling;
+		}
+	}
+	return {node: startNode, offset: startPos};
+}
+function _getEndRange(node, offset) {
+	var doc = node.ownerDocument || node,
+		range = doc.body.createTextRange();
+	if (doc == node) {
+		range.collapse(true);
+		return range;
+	}
+	if (node.nodeType == 1 && node.childNodes.length > 0) {
+		var children = node.childNodes, isStart, child;
+		if (offset === 0) {
+			child = children[0];
+			isStart = true;
+		} else {
+			child = children[offset - 1];
+			isStart = false;
+		}
+		if (!child) {
+			return range;
+		}
+		if (K(child).name === 'head') {
+			if (offset === 1) {
+				isStart = true;
+			}
+			if (offset === 2) {
+				isStart = false;
+			}
+			range.collapse(isStart);
+			return range;
+		}
+		if (child.nodeType == 1) {
+			var kchild = K(child), span;
+			if (kchild.isControl()) {
+				span = doc.createElement('span');
+				if (isStart) {
+					kchild.before(span);
+				} else {
+					kchild.after(span);
+				}
+				child = span;
+			}
+			_moveToElementText(range, child);
+			range.collapse(isStart);
+			if (span) {
+				K(span).remove();
+			}
+			return range;
+		}
+		node = child;
+		offset = isStart ? 0 : child.nodeValue.length;
+	}
+	var dummy = doc.createElement('span');
+	K(node).before(dummy);
+	_moveToElementText(range, dummy);
+	range.moveStart('character', offset);
+	K(dummy).remove();
+	return range;
+}
+function _toRange(rng) {
+	var doc, range;
+	function tr2td(start) {
+		if (K(start.node).name == 'tr') {
+			start.node = start.node.cells[start.offset];
+			start.offset = 0;
+		}
+	}
+	if (_IERANGE) {
+		if (rng.item) {
+			doc = _getDoc(rng.item(0));
+			range = new KRange(doc);
+			range.selectNode(rng.item(0));
+			return range;
+		}
+		doc = rng.parentElement().ownerDocument;
+		var start = _getStartEnd(rng, true),
+			end = _getStartEnd(rng, false);
+		tr2td(start);
+		tr2td(end);
+		range = new KRange(doc);
+		range.setStart(start.node, start.offset);
+		range.setEnd(end.node, end.offset);
+		return range;
+	}
+	var startContainer = rng.startContainer;
+	doc = startContainer.ownerDocument || startContainer;
+	range = new KRange(doc);
+	range.setStart(startContainer, rng.startOffset);
+	range.setEnd(rng.endContainer, rng.endOffset);
+	return range;
+}
+function KRange(doc) {
+	this.init(doc);
+}
+_extend(KRange, {
+	init : function(doc) {
+		var self = this;
+		self.startContainer = doc;
+		self.startOffset = 0;
+		self.endContainer = doc;
+		self.endOffset = 0;
+		self.collapsed = true;
+		self.doc = doc;
+	},
+	commonAncestor : function() {
+		function getParents(node) {
+			var parents = [];
+			while (node) {
+				parents.push(node);
+				node = node.parentNode;
+			}
+			return parents;
+		}
+		var parentsA = getParents(this.startContainer),
+			parentsB = getParents(this.endContainer),
+			i = 0, lenA = parentsA.length, lenB = parentsB.length, parentA, parentB;
+		while (++i) {
+			parentA = parentsA[lenA - i];
+			parentB = parentsB[lenB - i];
+			if (!parentA || !parentB || parentA !== parentB) {
+				break;
+			}
+		}
+		return parentsA[lenA - i + 1];
+	},
+	setStart : function(node, offset) {
+		var self = this, doc = self.doc;
+		self.startContainer = node;
+		self.startOffset = offset;
+		if (self.endContainer === doc) {
+			self.endContainer = node;
+			self.endOffset = offset;
+		}
+		return _updateCollapsed(this);
+	},
+	setEnd : function(node, offset) {
+		var self = this, doc = self.doc;
+		self.endContainer = node;
+		self.endOffset = offset;
+		if (self.startContainer === doc) {
+			self.startContainer = node;
+			self.startOffset = offset;
+		}
+		return _updateCollapsed(this);
+	},
+	setStartBefore : function(node) {
+		return this.setStart(node.parentNode || this.doc, K(node).index());
+	},
+	setStartAfter : function(node) {
+		return this.setStart(node.parentNode || this.doc, K(node).index() + 1);
+	},
+	setEndBefore : function(node) {
+		return this.setEnd(node.parentNode || this.doc, K(node).index());
+	},
+	setEndAfter : function(node) {
+		return this.setEnd(node.parentNode || this.doc, K(node).index() + 1);
+	},
+	selectNode : function(node) {
+		return this.setStartBefore(node).setEndAfter(node);
+	},
+	selectNodeContents : function(node) {
+		var knode = K(node);
+		if (knode.type == 3 || knode.isSingle()) {
+			return this.selectNode(node);
+		}
+		var children = knode.children();
+		if (children.length > 0) {
+			return this.setStartBefore(children[0]).setEndAfter(children[children.length - 1]);
+		}
+		return this.setStart(node, 0).setEnd(node, 0);
+	},
+	collapse : function(toStart) {
+		if (toStart) {
+			return this.setEnd(this.startContainer, this.startOffset);
+		}
+		return this.setStart(this.endContainer, this.endOffset);
+	},
+	compareBoundaryPoints : function(how, range) {
+		var rangeA = this.get(), rangeB = range.get();
+		if (_IERANGE) {
+			var arr = {};
+			arr[_START_TO_START] = 'StartToStart';
+			arr[_START_TO_END] = 'EndToStart';
+			arr[_END_TO_END] = 'EndToEnd';
+			arr[_END_TO_START] = 'StartToEnd';
+			var cmp = rangeA.compareEndPoints(arr[how], rangeB);
+			if (cmp !== 0) {
+				return cmp;
+			}
+			var nodeA, nodeB, nodeC, posA, posB;
+			if (how === _START_TO_START || how === _END_TO_START) {
+				nodeA = this.startContainer;
+				posA = this.startOffset;
+			}
+			if (how === _START_TO_END || how === _END_TO_END) {
+				nodeA = this.endContainer;
+				posA = this.endOffset;
+			}
+			if (how === _START_TO_START || how === _START_TO_END) {
+				nodeB = range.startContainer;
+				posB = range.startOffset;
+			}
+			if (how === _END_TO_END || how === _END_TO_START) {
+				nodeB = range.endContainer;
+				posB = range.endOffset;
+			}
+			if (nodeA === nodeB) {
+				var diff = posA - posB;
+				return diff > 0 ? 1 : (diff < 0 ? -1 : 0);
+			}
+			nodeC = nodeB;
+			while (nodeC && nodeC.parentNode !== nodeA) {
+				nodeC = nodeC.parentNode;
+			}
+			if (nodeC) {
+				return K(nodeC).index() >= posA ? -1 : 1;
+			}
+			nodeC = nodeA;
+			while (nodeC && nodeC.parentNode !== nodeB) {
+				nodeC = nodeC.parentNode;
+			}
+			if (nodeC) {
+				return K(nodeC).index() >= posB ? 1 : -1;
+			}
+			nodeC = K(nodeB).next();
+			if (nodeC && nodeC.contains(nodeA)) {
+				return 1;
+			}
+			nodeC = K(nodeA).next();
+			if (nodeC && nodeC.contains(nodeB)) {
+				return -1;
+			}
+		} else {
+			return rangeA.compareBoundaryPoints(how, rangeB);
+		}
+	},
+	cloneRange : function() {
+		return new KRange(this.doc).setStart(this.startContainer, this.startOffset).setEnd(this.endContainer, this.endOffset);
+	},
+	toString : function() {
+		var rng = this.get(), str = _IERANGE ? rng.text : rng.toString();
+		return str.replace(/\r\n|\n|\r/g, '');
+	},
+	cloneContents : function() {
+		return _copyAndDelete(this, true, false);
+	},
+	deleteContents : function() {
+		return _copyAndDelete(this, false, true);
+	},
+	extractContents : function() {
+		return _copyAndDelete(this, true, true);
+	},
+	insertNode : function(node) {
+		var self = this,
+			sc = self.startContainer, so = self.startOffset,
+			ec = self.endContainer, eo = self.endOffset,
+			firstChild, lastChild, c, nodeCount = 1;
+		if (node.nodeName.toLowerCase() === '#document-fragment') {
+			firstChild = node.firstChild;
+			lastChild = node.lastChild;
+			nodeCount = node.childNodes.length;
+		}
+		if (sc.nodeType == 1) {
+			c = sc.childNodes[so];
+			if (c) {
+				sc.insertBefore(node, c);
+				if (sc === ec) {
+					eo += nodeCount;
+				}
+			} else {
+				sc.appendChild(node);
+			}
+		} else if (sc.nodeType == 3) {
+			if (so === 0) {
+				sc.parentNode.insertBefore(node, sc);
+				if (sc.parentNode === ec) {
+					eo += nodeCount;
+				}
+			} else if (so >= sc.nodeValue.length) {
+				if (sc.nextSibling) {
+					sc.parentNode.insertBefore(node, sc.nextSibling);
+				} else {
+					sc.parentNode.appendChild(node);
+				}
+			} else {
+				if (so > 0) {
+					c = sc.splitText(so);
+				} else {
+					c = sc;
+				}
+				sc.parentNode.insertBefore(node, c);
+				if (sc === ec) {
+					ec = c;
+					eo -= so;
+				}
+			}
+		}
+		if (firstChild) {
+			self.setStartBefore(firstChild).setEndAfter(lastChild);
+		} else {
+			self.selectNode(node);
+		}
+		if (self.compareBoundaryPoints(_END_TO_END, self.cloneRange().setEnd(ec, eo)) >= 1) {
+			return self;
+		}
+		return self.setEnd(ec, eo);
+	},
+	surroundContents : function(node) {
+		node.appendChild(this.extractContents());
+		return this.insertNode(node).selectNode(node);
+	},
+	isControl : function() {
+		var self = this,
+			sc = self.startContainer, so = self.startOffset,
+			ec = self.endContainer, eo = self.endOffset, rng;
+		return sc.nodeType == 1 && sc === ec && so + 1 === eo && K(sc.childNodes[so]).isControl();
+	},
+	get : function(hasControlRange) {
+		var self = this, doc = self.doc, node, rng;
+		if (!_IERANGE) {
+			rng = doc.createRange();
+			try {
+				rng.setStart(self.startContainer, self.startOffset);
+				rng.setEnd(self.endContainer, self.endOffset);
+			} catch (e) {}
+			return rng;
+		}
+		if (hasControlRange && self.isControl()) {
+			rng = doc.body.createControlRange();
+			rng.addElement(self.startContainer.childNodes[self.startOffset]);
+			return rng;
+		}
+		var range = self.cloneRange().down();
+		rng = doc.body.createTextRange();
+		rng.setEndPoint('StartToStart', _getEndRange(range.startContainer, range.startOffset));
+		rng.setEndPoint('EndToStart', _getEndRange(range.endContainer, range.endOffset));
+		return rng;
+	},
+	html : function() {
+		return K(this.cloneContents()).outer();
+	},
+	down : function() {
+		var self = this;
+		function downPos(node, pos, isStart) {
+			if (node.nodeType != 1) {
+				return;
+			}
+			var children = K(node).children();
+			if (children.length === 0) {
+				return;
+			}
+			var left, right, child, offset;
+			if (pos > 0) {
+				left = children.eq(pos - 1);
+			}
+			if (pos < children.length) {
+				right = children.eq(pos);
+			}
+			if (left && left.type == 3) {
+				child = left[0];
+				offset = child.nodeValue.length;
+			}
+			if (right && right.type == 3) {
+				child = right[0];
+				offset = 0;
+			}
+			if (!child) {
+				return;
+			}
+			if (isStart) {
+				self.setStart(child, offset);
+			} else {
+				self.setEnd(child, offset);
+			}
+		}
+		downPos(self.startContainer, self.startOffset, true);
+		downPos(self.endContainer, self.endOffset, false);
+		return self;
+	},
+	up : function() {
+		var self = this;
+		function upPos(node, pos, isStart) {
+			if (node.nodeType != 3) {
+				return;
+			}
+			if (pos === 0) {
+				if (isStart) {
+					self.setStartBefore(node);
+				} else {
+					self.setEndBefore(node);
+				}
+			} else if (pos == node.nodeValue.length) {
+				if (isStart) {
+					self.setStartAfter(node);
+				} else {
+					self.setEndAfter(node);
+				}
+			}
+		}
+		upPos(self.startContainer, self.startOffset, true);
+		upPos(self.endContainer, self.endOffset, false);
+		return self;
+	},
+	enlarge : function(toBlock) {
+		var self = this;
+		self.up();
+		function enlargePos(node, pos, isStart) {
+			var knode = K(node), parent;
+			if (knode.type == 3 || _NOSPLIT_TAG_MAP[knode.name] || !toBlock && knode.isBlock()) {
+				return;
+			}
+			if (pos === 0) {
+				while (!knode.prev()) {
+					parent = knode.parent();
+					if (!parent || _NOSPLIT_TAG_MAP[parent.name] || !toBlock && parent.isBlock()) {
+						break;
+					}
+					knode = parent;
+				}
+				if (isStart) {
+					self.setStartBefore(knode[0]);
+				} else {
+					self.setEndBefore(knode[0]);
+				}
+			} else if (pos == knode.children().length) {
+				while (!knode.next()) {
+					parent = knode.parent();
+					if (!parent || _NOSPLIT_TAG_MAP[parent.name] || !toBlock && parent.isBlock()) {
+						break;
+					}
+					knode = parent;
+				}
+				if (isStart) {
+					self.setStartAfter(knode[0]);
+				} else {
+					self.setEndAfter(knode[0]);
+				}
+			}
+		}
+		enlargePos(self.startContainer, self.startOffset, true);
+		enlargePos(self.endContainer, self.endOffset, false);
+		return self;
+	},
+	shrink : function() {
+		var self = this, child, collapsed = self.collapsed;
+		while (self.startContainer.nodeType == 1 && (child = self.startContainer.childNodes[self.startOffset]) && child.nodeType == 1 && !K(child).isSingle()) {
+			self.setStart(child, 0);
+		}
+		if (collapsed) {
+			return self.collapse(collapsed);
+		}
+		while (self.endContainer.nodeType == 1 && self.endOffset > 0 && (child = self.endContainer.childNodes[self.endOffset - 1]) && child.nodeType == 1 && !K(child).isSingle()) {
+			self.setEnd(child, child.childNodes.length);
+		}
+		return self;
+	},
+	createBookmark : function(serialize) {
+		var self = this, doc = self.doc, endNode,
+			startNode = K('<span style="display:none;"></span>', doc)[0];
+		startNode.id = '__kindeditor_bookmark_start_' + (_BOOKMARK_ID++) + '__';
+		if (!self.collapsed) {
+			endNode = startNode.cloneNode(true);
+			endNode.id = '__kindeditor_bookmark_end_' + (_BOOKMARK_ID++) + '__';
+		}
+		if (endNode) {
+			self.cloneRange().collapse(false).insertNode(endNode).setEndBefore(endNode);
+		}
+		self.insertNode(startNode).setStartAfter(startNode);
+		return {
+			start : serialize ? '#' + startNode.id : startNode,
+			end : endNode ? (serialize ? '#' + endNode.id : endNode) : null
+		};
+	},
+	moveToBookmark : function(bookmark) {
+		var self = this, doc = self.doc,
+			start = K(bookmark.start, doc), end = bookmark.end ? K(bookmark.end, doc) : null;
+		if (!start || start.length < 1) {
+			return self;
+		}
+		self.setStartBefore(start[0]);
+		start.remove();
+		if (end && end.length > 0) {
+			self.setEndBefore(end[0]);
+			end.remove();
+		} else {
+			self.collapse(true);
+		}
+		return self;
+	},
+	dump : function() {
+		console.log('--------------------');
+		console.log(this.startContainer.nodeType == 3 ? this.startContainer.nodeValue : this.startContainer, this.startOffset);
+		console.log(this.endContainer.nodeType == 3 ? this.endContainer.nodeValue : this.endContainer, this.endOffset);
+	}
+});
+function _range(mixed) {
+	if (!mixed.nodeName) {
+		return mixed.constructor === KRange ? mixed : _toRange(mixed);
+	}
+	return new KRange(mixed);
+}
+K.RangeClass = KRange;
+K.range = _range;
+K.START_TO_START = _START_TO_START;
+K.START_TO_END = _START_TO_END;
+K.END_TO_END = _END_TO_END;
+K.END_TO_START = _END_TO_START;
+function _nativeCommand(doc, key, val) {
+	try {
+		doc.execCommand(key, false, val);
+	} catch(e) {}
+}
+function _nativeCommandValue(doc, key) {
+	var val = '';
+	try {
+		val = doc.queryCommandValue(key);
+	} catch (e) {}
+	if (typeof val !== 'string') {
+		val = '';
+	}
+	return val;
+}
+function _getSel(doc) {
+	var win = _getWin(doc);
+	return _IERANGE ? doc.selection : win.getSelection();
+}
+function _getRng(doc) {
+	var sel = _getSel(doc), rng;
+	try {
+		if (sel.rangeCount > 0) {
+			rng = sel.getRangeAt(0);
+		} else {
+			rng = sel.createRange();
+		}
+	} catch(e) {}
+	if (_IERANGE && (!rng || (!rng.item && rng.parentElement().ownerDocument !== doc))) {
+		return null;
+	}
+	return rng;
+}
+function _singleKeyMap(map) {
+	var newMap = {}, arr, v;
+	_each(map, function(key, val) {
+		arr = key.split(',');
+		for (var i = 0, len = arr.length; i < len; i++) {
+			v = arr[i];
+			newMap[v] = val;
+		}
+	});
+	return newMap;
+}
+function _hasAttrOrCss(knode, map) {
+	return _hasAttrOrCssByKey(knode, map, '*') || _hasAttrOrCssByKey(knode, map);
+}
+function _hasAttrOrCssByKey(knode, map, mapKey) {
+	mapKey = mapKey || knode.name;
+	if (knode.type !== 1) {
+		return false;
+	}
+	var newMap = _singleKeyMap(map);
+	if (!newMap[mapKey]) {
+		return false;
+	}
+	var arr = newMap[mapKey].split(',');
+	for (var i = 0, len = arr.length; i < len; i++) {
+		var key = arr[i];
+		if (key === '*') {
+			return true;
+		}
+		var match = /^(\.?)([^=]+)(?:=([^=]*))?$/.exec(key);
+		var method = match[1] ? 'css' : 'attr';
+		key = match[2];
+		var val = match[3] || '';
+		if (val === '' && knode[method](key) !== '') {
+			return true;
+		}
+		if (val !== '' && knode[method](key) === val) {
+			return true;
+		}
+	}
+	return false;
+}
+function _removeAttrOrCss(knode, map) {
+	if (knode.type != 1) {
+		return;
+	}
+	_removeAttrOrCssByKey(knode, map, '*');
+	_removeAttrOrCssByKey(knode, map);
+}
+function _removeAttrOrCssByKey(knode, map, mapKey) {
+	mapKey = mapKey || knode.name;
+	if (knode.type !== 1) {
+		return;
+	}
+	var newMap = _singleKeyMap(map);
+	if (!newMap[mapKey]) {
+		return;
+	}
+	var arr = newMap[mapKey].split(','), allFlag = false;
+	for (var i = 0, len = arr.length; i < len; i++) {
+		var key = arr[i];
+		if (key === '*') {
+			allFlag = true;
+			break;
+		}
+		var match = /^(\.?)([^=]+)(?:=([^=]*))?$/.exec(key);
+		key = match[2];
+		if (match[1]) {
+			key = _toCamel(key);
+			if (knode[0].style[key]) {
+				knode[0].style[key] = '';
+			}
+		} else {
+			knode.removeAttr(key);
+		}
+	}
+	if (allFlag) {
+		knode.remove(true);
+	}
+}
+function _getInnerNode(knode) {
+	var inner = knode;
+	while (inner.first()) {
+		inner = inner.first();
+	}
+	return inner;
+}
+function _isEmptyNode(knode) {
+	if (knode.type != 1 || knode.isSingle()) {
+		return false;
+	}
+	return knode.html().replace(/<[^>]+>/g, '') === '';
+}
+function _mergeWrapper(a, b) {
+	a = a.clone(true);
+	var lastA = _getInnerNode(a), childA = a, merged = false;
+	while (b) {
+		while (childA) {
+			if (childA.name === b.name) {
+				_mergeAttrs(childA, b.attr(), b.css());
+				merged = true;
+			}
+			childA = childA.first();
+		}
+		if (!merged) {
+			lastA.append(b.clone(false));
+		}
+		merged = false;
+		b = b.first();
+	}
+	return a;
+}
+function _wrapNode(knode, wrapper) {
+	wrapper = wrapper.clone(true);
+	if (knode.type == 3) {
+		_getInnerNode(wrapper).append(knode.clone(false));
+		knode.replaceWith(wrapper);
+		return wrapper;
+	}
+	var nodeWrapper = knode, child;
+	while ((child = knode.first()) && child.children().length == 1) {
+		knode = child;
+	}
+	child = knode.first();
+	var frag = knode.doc.createDocumentFragment();
+	while (child) {
+		frag.appendChild(child[0]);
+		child = child.next();
+	}
+	wrapper = _mergeWrapper(nodeWrapper, wrapper);
+	if (frag.firstChild) {
+		_getInnerNode(wrapper).append(frag);
+	}
+	nodeWrapper.replaceWith(wrapper);
+	return wrapper;
+}
+function _mergeAttrs(knode, attrs, styles) {
+	_each(attrs, function(key, val) {
+		if (key !== 'style') {
+			knode.attr(key, val);
+		}
+	});
+	_each(styles, function(key, val) {
+		knode.css(key, val);
+	});
+}
+function _inPreElement(knode) {
+	while (knode && knode.name != 'body') {
+		if (_PRE_TAG_MAP[knode.name] || knode.name == 'div' && knode.hasClass('ke-script')) {
+			return true;
+		}
+		knode = knode.parent();
+	}
+	return false;
+}
+function KCmd(range) {
+	this.init(range);
+}
+_extend(KCmd, {
+	init : function(range) {
+		var self = this, doc = range.doc;
+		self.doc = doc;
+		self.win = _getWin(doc);
+		self.sel = _getSel(doc);
+		self.range = range;
+	},
+	selection : function(forceReset) {
+		var self = this, doc = self.doc, rng = _getRng(doc);
+		self.sel = _getSel(doc);
+		if (rng) {
+			self.range = _range(rng);
+			if (K(self.range.startContainer).name == 'html') {
+				self.range.selectNodeContents(doc.body).collapse(false);
+			}
+			return self;
+		}
+		if (forceReset) {
+			self.range.selectNodeContents(doc.body).collapse(false);
+		}
+		return self;
+	},
+	select : function(hasDummy) {
+		hasDummy = _undef(hasDummy, true);
+		var self = this, sel = self.sel, range = self.range.cloneRange().shrink(),
+			sc = range.startContainer, so = range.startOffset,
+			ec = range.endContainer, eo = range.endOffset,
+			doc = _getDoc(sc), win = self.win, rng, hasU200b = false;
+		if (hasDummy && sc.nodeType == 1 && range.collapsed) {
+			if (_IERANGE) {
+				var dummy = K('<span>&nbsp;</span>', doc);
+				range.insertNode(dummy[0]);
+				rng = doc.body.createTextRange();
+				try {
+					rng.moveToElementText(dummy[0]);
+				} catch(ex) {}
+				rng.collapse(false);
+				rng.select();
+				dummy.remove();
+				win.focus();
+				return self;
+			}
+			if (_WEBKIT) {
+				var children = sc.childNodes;
+				if (K(sc).isInline() || so > 0 && K(children[so - 1]).isInline() || children[so] && K(children[so]).isInline()) {
+					range.insertNode(doc.createTextNode('\u200B'));
+					hasU200b = true;
+				}
+			}
+		}
+		if (_IERANGE) {
+			try {
+				rng = range.get(true);
+				rng.select();
+			} catch(e) {}
+		} else {
+			if (hasU200b) {
+				range.collapse(false);
+			}
+			rng = range.get(true);
+			sel.removeAllRanges();
+			sel.addRange(rng);
+			if (doc !== document) {
+				var pos = K(rng.endContainer).pos();
+				win.scrollTo(pos.x, pos.y);
+			}
+		}
+		win.focus();
+		return self;
+	},
+	wrap : function(val) {
+		var self = this, doc = self.doc, range = self.range, wrapper;
+		wrapper = K(val, doc);
+		if (range.collapsed) {
+			range.shrink();
+			range.insertNode(wrapper[0]).selectNodeContents(wrapper[0]);
+			return self;
+		}
+		if (wrapper.isBlock()) {
+			var copyWrapper = wrapper.clone(true), child = copyWrapper;
+			while (child.first()) {
+				child = child.first();
+			}
+			child.append(range.extractContents());
+			range.insertNode(copyWrapper[0]).selectNode(copyWrapper[0]);
+			return self;
+		}
+		range.enlarge();
+		var bookmark = range.createBookmark(), ancestor = range.commonAncestor(), isStart = false;
+		K(ancestor).scan(function(node) {
+			if (!isStart && node == bookmark.start) {
+				isStart = true;
+				return;
+			}
+			if (isStart) {
+				if (node == bookmark.end) {
+					return false;
+				}
+				var knode = K(node);
+				if (_inPreElement(knode)) {
+					return;
+				}
+				if (knode.type == 3 && _trim(node.nodeValue).length > 0) {
+					var parent;
+					while ((parent = knode.parent()) && parent.isStyle() && parent.children().length == 1) {
+						knode = parent;
+					}
+					_wrapNode(knode, wrapper);
+				}
+			}
+		});
+		range.moveToBookmark(bookmark);
+		return self;
+	},
+	split : function(isStart, map) {
+		var range = this.range, doc = range.doc;
+		var tempRange = range.cloneRange().collapse(isStart);
+		var node = tempRange.startContainer, pos = tempRange.startOffset,
+			parent = node.nodeType == 3 ? node.parentNode : node,
+			needSplit = false, knode;
+		while (parent && parent.parentNode) {
+			knode = K(parent);
+			if (map) {
+				if (!knode.isStyle()) {
+					break;
+				}
+				if (!_hasAttrOrCss(knode, map)) {
+					break;
+				}
+			} else {
+				if (_NOSPLIT_TAG_MAP[knode.name]) {
+					break;
+				}
+			}
+			needSplit = true;
+			parent = parent.parentNode;
+		}
+		if (needSplit) {
+			var dummy = doc.createElement('span');
+			range.cloneRange().collapse(!isStart).insertNode(dummy);
+			if (isStart) {
+				tempRange.setStartBefore(parent.firstChild).setEnd(node, pos);
+			} else {
+				tempRange.setStart(node, pos).setEndAfter(parent.lastChild);
+			}
+			var frag = tempRange.extractContents(),
+				first = frag.firstChild, last = frag.lastChild;
+			if (isStart) {
+				tempRange.insertNode(frag);
+				range.setStartAfter(last).setEndBefore(dummy);
+			} else {
+				parent.appendChild(frag);
+				range.setStartBefore(dummy).setEndBefore(first);
+			}
+			var dummyParent = dummy.parentNode;
+			if (dummyParent == range.endContainer) {
+				var prev = K(dummy).prev(), next = K(dummy).next();
+				if (prev && next && prev.type == 3 && next.type == 3) {
+					range.setEnd(prev[0], prev[0].nodeValue.length);
+				} else if (!isStart) {
+					range.setEnd(range.endContainer, range.endOffset - 1);
+				}
+			}
+			dummyParent.removeChild(dummy);
+		}
+		return this;
+	},
+	remove : function(map) {
+		var self = this, doc = self.doc, range = self.range;
+		range.enlarge();
+		if (range.startOffset === 0) {
+			var ksc = K(range.startContainer), parent;
+			while ((parent = ksc.parent()) && parent.isStyle() && parent.children().length == 1) {
+				ksc = parent;
+			}
+			range.setStart(ksc[0], 0);
+			ksc = K(range.startContainer);
+			if (ksc.isBlock()) {
+				_removeAttrOrCss(ksc, map);
+			}
+			var kscp = ksc.parent();
+			if (kscp && kscp.isBlock()) {
+				_removeAttrOrCss(kscp, map);
+			}
+		}
+		var sc, so;
+		if (range.collapsed) {
+			self.split(true, map);
+			sc = range.startContainer;
+			so = range.startOffset;
+			if (so > 0) {
+				var sb = K(sc.childNodes[so - 1]);
+				if (sb && _isEmptyNode(sb)) {
+					sb.remove();
+					range.setStart(sc, so - 1);
+				}
+			}
+			var sa = K(sc.childNodes[so]);
+			if (sa && _isEmptyNode(sa)) {
+				sa.remove();
+			}
+			if (_isEmptyNode(sc)) {
+				range.startBefore(sc);
+				sc.remove();
+			}
+			range.collapse(true);
+			return self;
+		}
+		self.split(true, map);
+		self.split(false, map);
+		var startDummy = doc.createElement('span'), endDummy = doc.createElement('span');
+		range.cloneRange().collapse(false).insertNode(endDummy);
+		range.cloneRange().collapse(true).insertNode(startDummy);
+		var nodeList = [], cmpStart = false;
+		K(range.commonAncestor()).scan(function(node) {
+			if (!cmpStart && node == startDummy) {
+				cmpStart = true;
+				return;
+			}
+			if (node == endDummy) {
+				return false;
+			}
+			if (cmpStart) {
+				nodeList.push(node);
+			}
+		});
+		K(startDummy).remove();
+		K(endDummy).remove();
+		sc = range.startContainer;
+		so = range.startOffset;
+		var ec = range.endContainer, eo = range.endOffset;
+		if (so > 0) {
+			var startBefore = K(sc.childNodes[so - 1]);
+			if (startBefore && _isEmptyNode(startBefore)) {
+				startBefore.remove();
+				range.setStart(sc, so - 1);
+				if (sc == ec) {
+					range.setEnd(ec, eo - 1);
+				}
+			}
+			var startAfter = K(sc.childNodes[so]);
+			if (startAfter && _isEmptyNode(startAfter)) {
+				startAfter.remove();
+				if (sc == ec) {
+					range.setEnd(ec, eo - 1);
+				}
+			}
+		}
+		var endAfter = K(ec.childNodes[range.endOffset]);
+		if (endAfter && _isEmptyNode(endAfter)) {
+			endAfter.remove();
+		}
+		var bookmark = range.createBookmark(true);
+		_each(nodeList, function(i, node) {
+			_removeAttrOrCss(K(node), map);
+		});
+		range.moveToBookmark(bookmark);
+		return self;
+	},
+	commonNode : function(map) {
+		var range = this.range;
+		var ec = range.endContainer, eo = range.endOffset,
+			node = (ec.nodeType == 3 || eo === 0) ? ec : ec.childNodes[eo - 1];
+		function find(node) {
+			var child = node, parent = node;
+			while (parent) {
+				if (_hasAttrOrCss(K(parent), map)) {
+					return K(parent);
+				}
+				parent = parent.parentNode;
+			}
+			while (child && (child = child.lastChild)) {
+				if (_hasAttrOrCss(K(child), map)) {
+					return K(child);
+				}
+			}
+			return null;
+		}
+		var cNode = find(node);
+		if (cNode) {
+			return cNode;
+		}
+		if (node.nodeType == 1 || (ec.nodeType == 3 && eo === 0)) {
+			var prev = K(node).prev();
+			if (prev) {
+				return find(prev);
+			}
+		}
+		return null;
+	},
+	commonAncestor : function(tagName) {
+		var range = this.range,
+			sc = range.startContainer, so = range.startOffset,
+			ec = range.endContainer, eo = range.endOffset,
+			startNode = (sc.nodeType == 3 || so === 0) ? sc : sc.childNodes[so - 1],
+			endNode = (ec.nodeType == 3 || eo === 0) ? ec : ec.childNodes[eo - 1];
+		function find(node) {
+			while (node) {
+				if (node.nodeType == 1) {
+					if (node.tagName.toLowerCase() === tagName) {
+						return node;
+					}
+				}
+				node = node.parentNode;
+			}
+			return null;
+		}
+		var start = find(startNode), end = find(endNode);
+		if (start && end && start === end) {
+			return K(start);
+		}
+		return null;
+	},
+	state : function(key) {
+		var self = this, doc = self.doc, bool = false;
+		try {
+			bool = doc.queryCommandState(key);
+		} catch (e) {}
+		return bool;
+	},
+	val : function(key) {
+		var self = this, doc = self.doc, range = self.range;
+		function lc(val) {
+			return val.toLowerCase();
+		}
+		key = lc(key);
+		var val = '', knode;
+		if (key === 'fontfamily' || key === 'fontname') {
+			val = _nativeCommandValue(doc, 'fontname');
+			val = val.replace(/['"]/g, '');
+			return lc(val);
+		}
+		if (key === 'formatblock') {
+			val = _nativeCommandValue(doc, key);
+			if (val === '') {
+				knode = self.commonNode({'h1,h2,h3,h4,h5,h6,p,div,pre,address' : '*'});
+				if (knode) {
+					val = knode.name;
+				}
+			}
+			if (val === 'Normal') {
+				val = 'p';
+			}
+			return lc(val);
+		}
+		if (key === 'fontsize') {
+			knode = self.commonNode({'*' : '.font-size'});
+			if (knode) {
+				val = knode.css('font-size');
+			}
+			return lc(val);
+		}
+		if (key === 'forecolor') {
+			knode = self.commonNode({'*' : '.color'});
+			if (knode) {
+				val = knode.css('color');
+			}
+			val = _toHex(val);
+			if (val === '') {
+				val = 'default';
+			}
+			return lc(val);
+		}
+		if (key === 'hilitecolor') {
+			knode = self.commonNode({'*' : '.background-color'});
+			if (knode) {
+				val = knode.css('background-color');
+			}
+			val = _toHex(val);
+			if (val === '') {
+				val = 'default';
+			}
+			return lc(val);
+		}
+		return val;
+	},
+	toggle : function(wrapper, map) {
+		var self = this;
+		if (self.commonNode(map)) {
+			self.remove(map);
+		} else {
+			self.wrap(wrapper);
+		}
+		return self.select();
+	},
+	bold : function() {
+		return this.toggle('<strong></strong>', {
+			span : '.font-weight=bold',
+			strong : '*',
+			b : '*'
+		});
+	},
+	italic : function() {
+		return this.toggle('<em></em>', {
+			span : '.font-style=italic',
+			em : '*',
+			i : '*'
+		});
+	},
+	underline : function() {
+		return this.toggle('<u></u>', {
+			span : '.text-decoration=underline',
+			u : '*'
+		});
+	},
+	strikethrough : function() {
+		return this.toggle('<s></s>', {
+			span : '.text-decoration=line-through',
+			s : '*'
+		});
+	},
+	forecolor : function(val) {
+		return this.wrap('<span style="color:' + val + ';"></span>').select();
+	},
+	hilitecolor : function(val) {
+		return this.wrap('<span style="background-color:' + val + ';"></span>').select();
+	},
+	fontsize : function(val) {
+		return this.wrap('<span style="font-size:' + val + ';"></span>').select();
+	},
+	fontname : function(val) {
+		return this.fontfamily(val);
+	},
+	fontfamily : function(val) {
+		return this.wrap('<span style="font-family:' + val + ';"></span>').select();
+	},
+	removeformat : function() {
+		var map = {
+			'*' : '.font-weight,.font-style,.text-decoration,.color,.background-color,.font-size,.font-family,.text-indent'
+		},
+		tags = _STYLE_TAG_MAP;
+		_each(tags, function(key, val) {
+			map[key] = '*';
+		});
+		this.remove(map);
+		return this.select();
+	},
+	inserthtml : function(val, quickMode) {
+		var self = this, range = self.range;
+		if (val === '') {
+			return self;
+		}
+		function pasteHtml(range, val) {
+			val = '<img id="__kindeditor_temp_tag__" width="0" height="0" style="display:none;" />' + val;
+			var rng = range.get();
+			if (rng.item) {
+				rng.item(0).outerHTML = val;
+			} else {
+				rng.pasteHTML(val);
+			}
+			var temp = range.doc.getElementById('__kindeditor_temp_tag__');
+			temp.parentNode.removeChild(temp);
+			var newRange = _toRange(rng);
+			range.setEnd(newRange.endContainer, newRange.endOffset);
+			range.collapse(false);
+			self.select(false);
+		}
+		function insertHtml(range, val) {
+			var doc = range.doc,
+				frag = doc.createDocumentFragment();
+			K('@' + val, doc).each(function() {
+				frag.appendChild(this);
+			});
+			range.deleteContents();
+			range.insertNode(frag);
+			range.collapse(false);
+			self.select(false);
+		}
+		if (_IERANGE && quickMode) {
+			try {
+				pasteHtml(range, val);
+			} catch(e) {
+				insertHtml(range, val);
+			}
+			return self;
+		}
+		insertHtml(range, val);
+		return self;
+	},
+	hr : function() {
+		return this.inserthtml('<hr />');
+	},
+	print : function() {
+		this.win.print();
+		return this;
+	},
+	insertimage : function(url, title, width, height, border, align) {
+		title = _undef(title, '');
+		border = _undef(border, 0);
+		var html = '<img src="' + _escape(url) + '" data-ke-src="' + _escape(url) + '" ';
+		if (width) {
+			html += 'width="' + _escape(width) + '" ';
+		}
+		if (height) {
+			html += 'height="' + _escape(height) + '" ';
+		}
+		if (title) {
+			html += 'title="' + _escape(title) + '" ';
+		}
+		if (align) {
+			html += 'align="' + _escape(align) + '" ';
+		}
+		html += 'alt="' + _escape(title) + '" ';
+		html += '/>';
+		return this.inserthtml(html);
+	},
+	createlink : function(url, type) {
+		var self = this, doc = self.doc, range = self.range;
+		self.select();
+		var a = self.commonNode({ a : '*' });
+		if (a && !range.isControl()) {
+			range.selectNode(a.get());
+			self.select();
+		}
+		var html = '<a href="' + _escape(url) + '" data-ke-src="' + _escape(url) + '" ';
+		if (type) {
+			html += ' target="' + _escape(type) + '"';
+		}
+		if (range.collapsed) {
+			html += '>' + _escape(url) + '</a>';
+			return self.inserthtml(html);
+		}
+		if (range.isControl()) {
+			var node = K(range.startContainer.childNodes[range.startOffset]);
+			html += '></a>';
+			node.after(K(html, doc));
+			node.next().append(node);
+			range.selectNode(node[0]);
+			return self.select();
+		}
+		function setAttr(node, url, type) {
+			K(node).attr('href', url).attr('data-ke-src', url);
+			if (type) {
+				K(node).attr('target', type);
+			} else {
+				K(node).removeAttr('target');
+			}
+		}
+		var sc = range.startContainer, so = range.startOffset,
+			ec = range.endContainer, eo = range.endOffset;
+		if (sc.nodeType == 1 && sc === ec && so + 1 === eo) {
+			var child = sc.childNodes[so];
+			if (child.nodeName.toLowerCase() == 'a') {
+				setAttr(child, url, type);
+				return self;
+			}
+		}
+		_nativeCommand(doc, 'createlink', '__kindeditor_temp_url__');
+		K('a[href="__kindeditor_temp_url__"]', doc).each(function() {
+			setAttr(this, url, type);
+		});
+		return self;
+	},
+	unlink : function() {
+		var self = this, doc = self.doc, range = self.range;
+		self.select();
+		if (range.collapsed) {
+			var a = self.commonNode({ a : '*' });
+			if (a) {
+				range.selectNode(a.get());
+				self.select();
+			}
+			_nativeCommand(doc, 'unlink', null);
+			if (_WEBKIT && K(range.startContainer).name === 'img') {
+				var parent = K(range.startContainer).parent();
+				if (parent.name === 'a') {
+					parent.remove(true);
+				}
+			}
+		} else {
+			_nativeCommand(doc, 'unlink', null);
+		}
+		return self;
+	}
+});
+_each(('formatblock,selectall,justifyleft,justifycenter,justifyright,justifyfull,insertorderedlist,' +
+	'insertunorderedlist,indent,outdent,subscript,superscript').split(','), function(i, name) {
+	KCmd.prototype[name] = function(val) {
+		var self = this;
+		self.select();
+		_nativeCommand(self.doc, name, val);
+		if (_IERANGE && _inArray(name, 'justifyleft,justifycenter,justifyright,justifyfull'.split(',')) >= 0) {
+			self.selection();
+		}
+		if (!_IERANGE || _inArray(name, 'formatblock,selectall,insertorderedlist,insertunorderedlist'.split(',')) >= 0) {
+			self.selection();
+		}
+		return self;
+	};
+});
+_each('cut,copy,paste'.split(','), function(i, name) {
+	KCmd.prototype[name] = function() {
+		var self = this;
+		if (!self.doc.queryCommandSupported(name)) {
+			throw 'not supported';
+		}
+		self.select();
+		_nativeCommand(self.doc, name, null);
+		return self;
+	};
+});
+function _cmd(mixed) {
+	if (mixed.nodeName) {
+		var doc = _getDoc(mixed);
+		mixed = _range(doc).selectNodeContents(doc.body).collapse(false);
+	}
+	return new KCmd(mixed);
+}
+K.CmdClass = KCmd;
+K.cmd = _cmd;
+function _drag(options) {
+	var moveEl = options.moveEl,
+		moveFn = options.moveFn,
+		clickEl = options.clickEl || moveEl,
+		beforeDrag = options.beforeDrag,
+		iframeFix = options.iframeFix === undefined ? true : options.iframeFix;
+	var docs = [document];
+	if (iframeFix) {
+		K('iframe').each(function() {
+			var src = _formatUrl(this.src || '', 'absolute');
+			if (/^https?:\/\//.test(src)) {
+				return;
+			}
+			var doc;
+			try {
+				doc = _iframeDoc(this);
+			} catch(e) {}
+			if (doc) {
+				var pos = K(this).pos();
+				K(doc).data('pos-x', pos.x);
+				K(doc).data('pos-y', pos.y);
+				docs.push(doc);
+			}
+		});
+	}
+	clickEl.mousedown(function(e) {
+		e.stopPropagation();
+		var self = clickEl.get(),
+			x = _removeUnit(moveEl.css('left')),
+			y = _removeUnit(moveEl.css('top')),
+			width = moveEl.width(),
+			height = moveEl.height(),
+			pageX = e.pageX,
+			pageY = e.pageY;
+		if (beforeDrag) {
+			beforeDrag();
+		}
+		function moveListener(e) {
+			e.preventDefault();
+			var kdoc = K(_getDoc(e.target));
+			var diffX = _round((kdoc.data('pos-x') || 0) + e.pageX - pageX);
+			var diffY = _round((kdoc.data('pos-y') || 0) + e.pageY - pageY);
+			moveFn.call(clickEl, x, y, width, height, diffX, diffY);
+		}
+		function selectListener(e) {
+			e.preventDefault();
+		}
+		function upListener(e) {
+			e.preventDefault();
+			K(docs).unbind('mousemove', moveListener)
+				.unbind('mouseup', upListener)
+				.unbind('selectstart', selectListener);
+			if (self.releaseCapture) {
+				self.releaseCapture();
+			}
+		}
+		K(docs).mousemove(moveListener)
+			.mouseup(upListener)
+			.bind('selectstart', selectListener);
+		if (self.setCapture) {
+			self.setCapture();
+		}
+	});
+}
+function KWidget(options) {
+	this.init(options);
+}
+_extend(KWidget, {
+	init : function(options) {
+		var self = this;
+		self.name = options.name || '';
+		self.doc = options.doc || document;
+		self.win = _getWin(self.doc);
+		self.x = _addUnit(options.x);
+		self.y = _addUnit(options.y);
+		self.z = options.z;
+		self.width = _addUnit(options.width);
+		self.height = _addUnit(options.height);
+		self.div = K('<div style="display:block;"></div>');
+		self.options = options;
+		self._alignEl = options.alignEl;
+		if (self.width) {
+			self.div.css('width', self.width);
+		}
+		if (self.height) {
+			self.div.css('height', self.height);
+		}
+		if (self.z) {
+			self.div.css({
+				position : 'absolute',
+				left : self.x,
+				top : self.y,
+				'z-index' : self.z
+			});
+		}
+		if (self.z && (self.x === undefined || self.y === undefined)) {
+			self.autoPos(self.width, self.height);
+		}
+		if (options.cls) {
+			self.div.addClass(options.cls);
+		}
+		if (options.shadowMode) {
+			self.div.addClass('ke-shadow');
+		}
+		if (options.css) {
+			self.div.css(options.css);
+		}
+		if (options.src) {
+			K(options.src).replaceWith(self.div);
+		} else {
+			K(self.doc.body).append(self.div);
+		}
+		if (options.html) {
+			self.div.html(options.html);
+		}
+		if (options.autoScroll) {
+			if (_IE && _V < 7 || _QUIRKS) {
+				var scrollPos = _getScrollPos();
+				K(self.win).bind('scroll', function(e) {
+					var pos = _getScrollPos(),
+						diffX = pos.x - scrollPos.x,
+						diffY = pos.y - scrollPos.y;
+					self.pos(_removeUnit(self.x) + diffX, _removeUnit(self.y) + diffY, false);
+				});
+			} else {
+				self.div.css('position', 'fixed');
+			}
+		}
+	},
+	pos : function(x, y, updateProp) {
+		var self = this;
+		updateProp = _undef(updateProp, true);
+		if (x !== null) {
+			x = x < 0 ? 0 : _addUnit(x);
+			self.div.css('left', x);
+			if (updateProp) {
+				self.x = x;
+			}
+		}
+		if (y !== null) {
+			y = y < 0 ? 0 : _addUnit(y);
+			self.div.css('top', y);
+			if (updateProp) {
+				self.y = y;
+			}
+		}
+		return self;
+	},
+	autoPos : function(width, height) {
+		var self = this,
+			w = _removeUnit(width) || 0,
+			h = _removeUnit(height) || 0,
+			scrollPos = _getScrollPos();
+		if (self._alignEl) {
+			var knode = K(self._alignEl),
+				pos = knode.pos(),
+				diffX = _round(knode[0].clientWidth / 2 - w / 2),
+				diffY = _round(knode[0].clientHeight / 2 - h / 2);
+			x = diffX < 0 ? pos.x : pos.x + diffX;
+			y = diffY < 0 ? pos.y : pos.y + diffY;
+		} else {
+			var docEl = _docElement(self.doc);
+			x = _round(scrollPos.x + (docEl.clientWidth - w) / 2);
+			y = _round(scrollPos.y + (docEl.clientHeight - h) / 2);
+		}
+		if (!(_IE && _V < 7 || _QUIRKS)) {
+			x -= scrollPos.x;
+			y -= scrollPos.y;
+		}
+		return self.pos(x, y);
+	},
+	remove : function() {
+		var self = this;
+		if (_IE && _V < 7 || _QUIRKS) {
+			K(self.win).unbind('scroll');
+		}
+		self.div.remove();
+		_each(self, function(i) {
+			self[i] = null;
+		});
+		return this;
+	},
+	show : function() {
+		this.div.show();
+		return this;
+	},
+	hide : function() {
+		this.div.hide();
+		return this;
+	},
+	draggable : function(options) {
+		var self = this;
+		options = options || {};
+		options.moveEl = self.div;
+		options.moveFn = function(x, y, width, height, diffX, diffY) {
+			if ((x = x + diffX) < 0) {
+				x = 0;
+			}
+			if ((y = y + diffY) < 0) {
+				y = 0;
+			}
+			self.pos(x, y);
+		};
+		_drag(options);
+		return self;
+	}
+});
+function _widget(options) {
+	return new KWidget(options);
+}
+K.WidgetClass = KWidget;
+K.widget = _widget;
+function _iframeDoc(iframe) {
+	iframe = _get(iframe);
+	return iframe.contentDocument || iframe.contentWindow.document;
+}
+var html, _direction = '';
+if ((html = document.getElementsByTagName('html'))) {
+	_direction = html[0].dir;
+}
+function _getInitHtml(themesPath, bodyClass, cssPath, cssData) {
+	var arr = [
+		(_direction === '' ? '<html>' : '<html dir="' + _direction + '">'),
+		'<head><meta charset="utf-8" /><title></title>',
+		'<style>',
+		'html {margin:0;padding:0;}',
+		'body {margin:0;padding:5px;}',
+		'body, td {font:12px/1.5 "sans serif",tahoma,verdana,helvetica;}',
+		'body, p, div {word-wrap: break-word;}',
+		'p {margin:5px 0;}',
+		'table {border-collapse:collapse;}',
+		'img {border:0;}',
+		'noscript {display:none;}',
+		'table.ke-zeroborder td {border:1px dotted #AAA;}',
+		'img.ke-flash {',
+		'	border:1px solid #AAA;',
+		'	background-image:url(' + themesPath + 'common/flash.gif);',
+		'	background-position:center center;',
+		'	background-repeat:no-repeat;',
+		'	width:100px;',
+		'	height:100px;',
+		'}',
+		'img.ke-rm {',
+		'	border:1px solid #AAA;',
+		'	background-image:url(' + themesPath + 'common/rm.gif);',
+		'	background-position:center center;',
+		'	background-repeat:no-repeat;',
+		'	width:100px;',
+		'	height:100px;',
+		'}',
+		'img.ke-media {',
+		'	border:1px solid #AAA;',
+		'	background-image:url(' + themesPath + 'common/media.gif);',
+		'	background-position:center center;',
+		'	background-repeat:no-repeat;',
+		'	width:100px;',
+		'	height:100px;',
+		'}',
+		'img.ke-anchor {',
+		'	border:1px dashed #666;',
+		'	width:16px;',
+		'	height:16px;',
+		'}',
+		'.ke-script, .ke-noscript, .ke-display-none {',
+		'	display:none;',
+		'	font-size:0;',
+		'	width:0;',
+		'	height:0;',
+		'}',
+		'.ke-pagebreak {',
+		'	border:1px dotted #AAA;',
+		'	font-size:0;',
+		'	height:2px;',
+		'}',
+		'</style>'
+	];
+	if (!_isArray(cssPath)) {
+		cssPath = [cssPath];
+	}
+	_each(cssPath, function(i, path) {
+		if (path) {
+			arr.push('<link href="' + path + '" rel="stylesheet" />');
+		}
+	});
+	if (cssData) {
+		arr.push('<style>' + cssData + '</style>');
+	}
+	arr.push('</head><body ' + (bodyClass ? 'class="' + bodyClass + '"' : '') + '></body></html>');
+	return arr.join('\n');
+}
+function _elementVal(knode, val) {
+	if (knode.hasVal()) {
+		if (val === undefined) {
+			var html = knode.val();
+			html = html.replace(/(<(?:p|p\s[^>]*)>) *(<\/p>)/ig, '');
+			return html;
+		}
+		return knode.val(val);
+	}
+	return knode.html(val);
+}
+function KEdit(options) {
+	this.init(options);
+}
+_extend(KEdit, KWidget, {
+	init : function(options) {
+		var self = this;
+		KEdit.parent.init.call(self, options);
+		self.srcElement = K(options.srcElement);
+		self.div.addClass('ke-edit');
+		self.designMode = _undef(options.designMode, true);
+		self.beforeGetHtml = options.beforeGetHtml;
+		self.beforeSetHtml = options.beforeSetHtml;
+		self.afterSetHtml = options.afterSetHtml;
+		var themesPath = _undef(options.themesPath, ''),
+			bodyClass = options.bodyClass,
+			cssPath = options.cssPath,
+			cssData = options.cssData,
+			isDocumentDomain = location.protocol != 'res:' && location.host.replace(/:\d+/, '') !== document.domain,
+			srcScript = ('document.open();' +
+				(isDocumentDomain ? 'document.domain="' + document.domain + '";' : '') +
+				'document.close();'),
+			iframeSrc = _IE ? ' src="javascript:void(function(){' + encodeURIComponent(srcScript) + '}())"' : '';
+		self.iframe = K('<iframe class="ke-edit-iframe" hidefocus="true" frameborder="0"' + iframeSrc + '></iframe>').css('width', '100%');
+		self.textarea = K('<textarea class="ke-edit-textarea" hidefocus="true"></textarea>').css('width', '100%');
+		self.tabIndex = isNaN(parseInt(options.tabIndex, 10)) ? self.srcElement.attr('tabindex') : parseInt(options.tabIndex, 10);
+		self.iframe.attr('tabindex', self.tabIndex);
+		self.textarea.attr('tabindex', self.tabIndex);
+		if (self.width) {
+			self.setWidth(self.width);
+		}
+		if (self.height) {
+			self.setHeight(self.height);
+		}
+		if (self.designMode) {
+			self.textarea.hide();
+		} else {
+			self.iframe.hide();
+		}
+		function ready() {
+			var doc = _iframeDoc(self.iframe);
+			doc.open();
+			if (isDocumentDomain) {
+				doc.domain = document.domain;
+			}
+			doc.write(_getInitHtml(themesPath, bodyClass, cssPath, cssData));
+			doc.close();
+			self.win = self.iframe[0].contentWindow;
+			self.doc = doc;
+			var cmd = _cmd(doc);
+			self.afterChange(function(e) {
+				cmd.selection();
+			});
+			if (_WEBKIT) {
+				K(doc).click(function(e) {
+					if (K(e.target).name === 'img') {
+						cmd.selection(true);
+						cmd.range.selectNode(e.target);
+						cmd.select();
+					}
+				});
+			}
+			if (_IE) {
+				self._mousedownHandler = function() {
+					var newRange = cmd.range.cloneRange();
+					newRange.shrink();
+					if (newRange.isControl()) {
+						self.blur();
+					}
+				};
+				K(document).mousedown(self._mousedownHandler);
+				K(doc).keydown(function(e) {
+					if (e.which == 8) {
+						cmd.selection();
+						var rng = cmd.range;
+						if (rng.isControl()) {
+							rng.collapse(true);
+							K(rng.startContainer.childNodes[rng.startOffset]).remove();
+							e.preventDefault();
+						}
+					}
+				});
+			}
+			self.cmd = cmd;
+			self.html(_elementVal(self.srcElement));
+			if (_IE) {
+				doc.body.disabled = true;
+				doc.body.contentEditable = true;
+				doc.body.removeAttribute('disabled');
+			} else {
+				doc.designMode = 'on';
+			}
+			if (options.afterCreate) {
+				options.afterCreate.call(self);
+			}
+		}
+		if (isDocumentDomain) {
+			self.iframe.bind('load', function(e) {
+				self.iframe.unbind('load');
+				if (_IE) {
+					ready();
+				} else {
+					setTimeout(ready, 0);
+				}
+			});
+		}
+		self.div.append(self.iframe);
+		self.div.append(self.textarea);
+		self.srcElement.hide();
+		!isDocumentDomain && ready();
+	},
+	setWidth : function(val) {
+		var self = this;
+		val = _addUnit(val);
+		self.width = val;
+		self.div.css('width', val);
+		return self;
+	},
+	setHeight : function(val) {
+		var self = this;
+		val = _addUnit(val);
+		self.height = val;
+		self.div.css('height', val);
+		self.iframe.css('height', val);
+		if ((_IE && _V < 8) || _QUIRKS) {
+			val = _addUnit(_removeUnit(val) - 2);
+		}
+		self.textarea.css('height', val);
+		return self;
+	},
+	remove : function() {
+		var self = this, doc = self.doc;
+		K(doc.body).unbind();
+		K(doc).unbind();
+		K(self.win).unbind();
+		if (self._mousedownHandler) {
+			K(document).unbind('mousedown', self._mousedownHandler);
+		}
+		_elementVal(self.srcElement, self.html());
+		self.srcElement.show();
+		doc.write('');
+		self.iframe.unbind();
+		self.textarea.unbind();
+		KEdit.parent.remove.call(self);
+	},
+	html : function(val, isFull) {
+		var self = this, doc = self.doc;
+		if (self.designMode) {
+			var body = doc.body;
+			if (val === undefined) {
+				if (isFull) {
+					val = '<!doctype html><html>' + body.parentNode.innerHTML + '</html>';
+				} else {
+					val = body.innerHTML;
+				}
+				if (self.beforeGetHtml) {
+					val = self.beforeGetHtml(val);
+				}
+				if (_GECKO && val == '<br />') {
+					val = '';
+				}
+				return val;
+			}
+			if (self.beforeSetHtml) {
+				val = self.beforeSetHtml(val);
+			}
+			if (_IE && _V >= 9) {
+				val = val.replace(/(<.*?checked=")checked(".*>)/ig, '$1$2');
+			}
+			K(body).html(val);
+			if (self.afterSetHtml) {
+				self.afterSetHtml();
+			}
+			return self;
+		}
+		if (val === undefined) {
+			return self.textarea.val();
+		}
+		self.textarea.val(val);
+		return self;
+	},
+	design : function(bool) {
+		var self = this, val;
+		if (bool === undefined ? !self.designMode : bool) {
+			if (!self.designMode) {
+				val = self.html();
+				self.designMode = true;
+				self.html(val);
+				self.textarea.hide();
+				self.iframe.show();
+			}
+		} else {
+			if (self.designMode) {
+				val = self.html();
+				self.designMode = false;
+				self.html(val);
+				self.iframe.hide();
+				self.textarea.show();
+			}
+		}
+		return self.focus();
+	},
+	focus : function() {
+		var self = this;
+		self.designMode ? self.win.focus() : self.textarea[0].focus();
+		return self;
+	},
+	blur : function() {
+		var self = this;
+		if (_IE) {
+			var input = K('<input type="text" style="float:left;width:0;height:0;padding:0;margin:0;border:0;" value="" />', self.div);
+			self.div.append(input);
+			input[0].focus();
+			input.remove();
+		} else {
+			self.designMode ? self.win.blur() : self.textarea[0].blur();
+		}
+		return self;
+	},
+	afterChange : function(fn) {
+		var self = this, doc = self.doc, body = doc.body;
+		K(doc).keyup(function(e) {
+			if (!e.ctrlKey && !e.altKey && _CHANGE_KEY_MAP[e.which]) {
+				fn(e);
+			}
+		});
+		K(doc).mouseup(fn).contextmenu(fn);
+		K(self.win).blur(fn);
+		function timeoutHandler(e) {
+			setTimeout(function() {
+				fn(e);
+			}, 1);
+		}
+		K(body).bind('paste', timeoutHandler);
+		K(body).bind('cut', timeoutHandler);
+		return self;
+	}
+});
+function _edit(options) {
+	return new KEdit(options);
+}
+K.EditClass = KEdit;
+K.edit = _edit;
+K.iframeDoc = _iframeDoc;
+function _selectToolbar(name, fn) {
+	var self = this,
+		knode = self.get(name);
+	if (knode) {
+		if (knode.hasClass('ke-disabled')) {
+			return;
+		}
+		fn(knode);
+	}
+}
+function KToolbar(options) {
+	this.init(options);
+}
+_extend(KToolbar, KWidget, {
+	init : function(options) {
+		var self = this;
+		KToolbar.parent.init.call(self, options);
+		self.disableMode = _undef(options.disableMode, false);
+		self.noDisableItemMap = _toMap(_undef(options.noDisableItems, []));
+		self._itemMap = {};
+		self.div.addClass('ke-toolbar').bind('contextmenu,mousedown,mousemove', function(e) {
+			e.preventDefault();
+		}).attr('unselectable', 'on');
+		function find(target) {
+			var knode = K(target);
+			if (knode.hasClass('ke-outline')) {
+				return knode;
+			}
+			if (knode.hasClass('ke-toolbar-icon')) {
+				return knode.parent();
+			}
+		}
+		function hover(e, method) {
+			var knode = find(e.target);
+			if (knode) {
+				if (knode.hasClass('ke-disabled')) {
+					return;
+				}
+				if (knode.hasClass('ke-selected')) {
+					return;
+				}
+				knode[method]('ke-on');
+			}
+		}
+		self.div.mouseover(function(e) {
+			hover(e, 'addClass');
+		})
+		.mouseout(function(e) {
+			hover(e, 'removeClass');
+		})
+		.click(function(e) {
+			var knode = find(e.target);
+			if (knode) {
+				if (knode.hasClass('ke-disabled')) {
+					return;
+				}
+				self.options.click.call(this, e, knode.attr('data-name'));
+			}
+		});
+	},
+	get : function(name) {
+		if (this._itemMap[name]) {
+			return this._itemMap[name];
+		}
+		return (this._itemMap[name] = K('span.ke-icon-' + name, this.div).parent());
+	},
+	select : function(name) {
+		_selectToolbar.call(this, name, function(knode) {
+			knode.addClass('ke-selected');
+		});
+		return self;
+	},
+	unselect : function(name) {
+		_selectToolbar.call(this, name, function(knode) {
+			knode.removeClass('ke-selected').removeClass('ke-on');
+		});
+		return self;
+	},
+	enable : function(name) {
+		var self = this,
+			knode = name.get ? name : self.get(name);
+		if (knode) {
+			knode.removeClass('ke-disabled');
+			knode.opacity(1);
+		}
+		return self;
+	},
+	disable : function(name) {
+		var self = this,
+			knode = name.get ? name : self.get(name);
+		if (knode) {
+			knode.removeClass('ke-selected').addClass('ke-disabled');
+			knode.opacity(0.5);
+		}
+		return self;
+	},
+	disableAll : function(bool, noDisableItems) {
+		var self = this, map = self.noDisableItemMap, item;
+		if (noDisableItems) {
+			map = _toMap(noDisableItems);
+		}
+		if (bool === undefined ? !self.disableMode : bool) {
+			K('span.ke-outline', self.div).each(function() {
+				var knode = K(this),
+					name = knode[0].getAttribute('data-name', 2);
+				if (!map[name]) {
+					self.disable(knode);
+				}
+			});
+			self.disableMode = true;
+		} else {
+			K('span.ke-outline', self.div).each(function() {
+				var knode = K(this),
+					name = knode[0].getAttribute('data-name', 2);
+				if (!map[name]) {
+					self.enable(knode);
+				}
+			});
+			self.disableMode = false;
+		}
+		return self;
+	}
+});
+function _toolbar(options) {
+	return new KToolbar(options);
+}
+K.ToolbarClass = KToolbar;
+K.toolbar = _toolbar;
+function KMenu(options) {
+	this.init(options);
+}
+_extend(KMenu, KWidget, {
+	init : function(options) {
+		var self = this;
+		options.z = options.z || 811213;
+		KMenu.parent.init.call(self, options);
+		self.centerLineMode = _undef(options.centerLineMode, true);
+		self.div.addClass('ke-menu').bind('click,mousedown', function(e){
+			e.stopPropagation();
+		}).attr('unselectable', 'on');
+	},
+	addItem : function(item) {
+		var self = this;
+		if (item.title === '-') {
+			self.div.append(K('<div class="ke-menu-separator"></div>'));
+			return;
+		}
+		var itemDiv = K('<div class="ke-menu-item" unselectable="on"></div>'),
+			leftDiv = K('<div class="ke-inline-block ke-menu-item-left"></div>'),
+			rightDiv = K('<div class="ke-inline-block ke-menu-item-right"></div>'),
+			height = _addUnit(item.height),
+			iconClass = _undef(item.iconClass, '');
+		self.div.append(itemDiv);
+		if (height) {
+			itemDiv.css('height', height);
+			rightDiv.css('line-height', height);
+		}
+		var centerDiv;
+		if (self.centerLineMode) {
+			centerDiv = K('<div class="ke-inline-block ke-menu-item-center"></div>');
+			if (height) {
+				centerDiv.css('height', height);
+			}
+		}
+		itemDiv.mouseover(function(e) {
+			K(this).addClass('ke-menu-item-on');
+			if (centerDiv) {
+				centerDiv.addClass('ke-menu-item-center-on');
+			}
+		})
+		.mouseout(function(e) {
+			K(this).removeClass('ke-menu-item-on');
+			if (centerDiv) {
+				centerDiv.removeClass('ke-menu-item-center-on');
+			}
+		})
+		.click(function(e) {
+			item.click.call(K(this));
+			e.stopPropagation();
+		})
+		.append(leftDiv);
+		if (centerDiv) {
+			itemDiv.append(centerDiv);
+		}
+		itemDiv.append(rightDiv);
+		if (item.checked) {
+			iconClass = 'ke-icon-checked';
+		}
+		if (iconClass !== '') {
+			leftDiv.html('<span class="ke-inline-block ke-toolbar-icon ke-toolbar-icon-url ' + iconClass + '"></span>');
+		}
+		rightDiv.html(item.title);
+		return self;
+	},
+	remove : function() {
+		var self = this;
+		if (self.options.beforeRemove) {
+			self.options.beforeRemove.call(self);
+		}
+		K('.ke-menu-item', self.div[0]).unbind();
+		KMenu.parent.remove.call(self);
+		return self;
+	}
+});
+function _menu(options) {
+	return new KMenu(options);
+}
+K.MenuClass = KMenu;
+K.menu = _menu;
+function KColorPicker(options) {
+	this.init(options);
+}
+_extend(KColorPicker, KWidget, {
+	init : function(options) {
+		var self = this;
+		options.z = options.z || 811213;
+		KColorPicker.parent.init.call(self, options);
+		var colors = options.colors || [
+			['#E53333', '#E56600', '#FF9900', '#64451D', '#DFC5A4', '#FFE500'],
+			['#009900', '#006600', '#99BB00', '#B8D100', '#60D978', '#00D5FF'],
+			['#337FE5', '#003399', '#4C33E5', '#9933E5', '#CC33E5', '#EE33EE'],
+			['#FFFFFF', '#CCCCCC', '#999999', '#666666', '#333333', '#000000']
+		];
+		self.selectedColor = (options.selectedColor || '').toLowerCase();
+		self._cells = [];
+		self.div.addClass('ke-colorpicker').bind('click,mousedown', function(e){
+			e.stopPropagation();
+		}).attr('unselectable', 'on');
+		var table = self.doc.createElement('table');
+		self.div.append(table);
+		table.className = 'ke-colorpicker-table';
+		table.cellPadding = 0;
+		table.cellSpacing = 0;
+		table.border = 0;
+		var row = table.insertRow(0), cell = row.insertCell(0);
+		cell.colSpan = colors[0].length;
+		self._addAttr(cell, '', 'ke-colorpicker-cell-top');
+		for (var i = 0; i < colors.length; i++) {
+			row = table.insertRow(i + 1);
+			for (var j = 0; j < colors[i].length; j++) {
+				cell = row.insertCell(j);
+				self._addAttr(cell, colors[i][j], 'ke-colorpicker-cell');
+			}
+		}
+	},
+	_addAttr : function(cell, color, cls) {
+		var self = this;
+		cell = K(cell).addClass(cls);
+		if (self.selectedColor === color.toLowerCase()) {
+			cell.addClass('ke-colorpicker-cell-selected');
+		}
+		cell.attr('title', color || self.options.noColor);
+		cell.mouseover(function(e) {
+			K(this).addClass('ke-colorpicker-cell-on');
+		});
+		cell.mouseout(function(e) {
+			K(this).removeClass('ke-colorpicker-cell-on');
+		});
+		cell.click(function(e) {
+			e.stop();
+			self.options.click.call(K(this), color);
+		});
+		if (color) {
+			cell.append(K('<div class="ke-colorpicker-cell-color" unselectable="on"></div>').css('background-color', color));
+		} else {
+			cell.html(self.options.noColor);
+		}
+		K(cell).attr('unselectable', 'on');
+		self._cells.push(cell);
+	},
+	remove : function() {
+		var self = this;
+		_each(self._cells, function() {
+			this.unbind();
+		});
+		KColorPicker.parent.remove.call(self);
+		return self;
+	}
+});
+function _colorpicker(options) {
+	return new KColorPicker(options);
+}
+K.ColorPickerClass = KColorPicker;
+K.colorpicker = _colorpicker;
+function KUploadButton(options) {
+	this.init(options);
+}
+_extend(KUploadButton, {
+	init : function(options) {
+		var self = this,
+			button = K(options.button),
+			fieldName = options.fieldName || 'file',
+			url = options.url || '',
+			title = button.val(),
+			extraParams = options.extraParams || {},
+			cls = button[0].className || '',
+			target = options.target || 'kindeditor_upload_iframe_' + new Date().getTime();
+		options.afterError = options.afterError || function(str) {
+			alert(str);
+		};
+		var hiddenElements = [];
+		for(var k in extraParams){
+			hiddenElements.push('<input type="hidden" name="' + k + '" value="' + extraParams[k] + '" />');
+		}
+		var html = [
+			'<div class="ke-inline-block ' + cls + '">',
+			(options.target ? '' : '<iframe name="' + target + '" style="display:none;"></iframe>'),
+			(options.form ? '<div class="ke-upload-area">' : '<form class="ke-upload-area ke-form" method="post" enctype="multipart/form-data" target="' + target + '" action="' + url + '">'),
+			'<span class="ke-button-common">',
+			hiddenElements.join(''),
+			'<input type="button" class="ke-button-common ke-button" value="' + title + '" />',
+			'</span>',
+			'<input type="file" class="ke-upload-file" name="' + fieldName + '" tabindex="-1" />',
+			(options.form ? '</div>' : '</form>'),
+			'</div>'].join('');
+		var div = K(html, button.doc);
+		button.hide();
+		button.before(div);
+		self.div = div;
+		self.button = button;
+		self.iframe = options.target ? K('iframe[name="' + target + '"]') : K('iframe', div);
+		self.form = options.form ? K(options.form) : K('form', div);
+		self.fileBox = K('.ke-upload-file', div);
+		var width = options.width || K('.ke-button-common', div).width();
+		K('.ke-upload-area', div).width(width);
+		self.options = options;
+	},
+	submit : function() {
+		var self = this,
+			iframe = self.iframe;
+		iframe.bind('load', function() {
+			iframe.unbind();
+			var tempForm = document.createElement('form');
+			self.fileBox.before(tempForm);
+			K(tempForm).append(self.fileBox);
+			tempForm.reset();
+			K(tempForm).remove(true);
+			var doc = K.iframeDoc(iframe),
+				pre = doc.getElementsByTagName('pre')[0],
+				str = '', data;
+			if (pre) {
+				str = pre.innerHTML;
+			} else {
+				str = doc.body.innerHTML;
+			}
+			str = _unescape(str);
+			iframe[0].src = 'javascript:false';
+			try {
+				data = K.json(str);
+			} catch (e) {
+				self.options.afterError.call(self, '<!doctype html><html>' + doc.body.parentNode.innerHTML + '</html>');
+			}
+			if (data) {
+				self.options.afterUpload.call(self, data);
+			}
+		});
+		self.form[0].submit();
+		return self;
+	},
+	remove : function() {
+		var self = this;
+		if (self.fileBox) {
+			self.fileBox.unbind();
+		}
+		self.iframe.remove();
+		self.div.remove();
+		self.button.show();
+		return self;
+	}
+});
+function _uploadbutton(options) {
+	return new KUploadButton(options);
+}
+K.UploadButtonClass = KUploadButton;
+K.uploadbutton = _uploadbutton;
+function _createButton(arg) {
+	arg = arg || {};
+	var name = arg.name || '',
+		span = K('<span class="ke-button-common ke-button-outer" title="' + name + '"></span>'),
+		btn = K('<input class="ke-button-common ke-button" type="button" value="' + name + '" />');
+	if (arg.click) {
+		btn.click(arg.click);
+	}
+	span.append(btn);
+	return span;
+}
+function KDialog(options) {
+	this.init(options);
+}
+_extend(KDialog, KWidget, {
+	init : function(options) {
+		var self = this;
+		var shadowMode = _undef(options.shadowMode, true);
+		options.z = options.z || 811213;
+		options.shadowMode = false;
+		options.autoScroll = _undef(options.autoScroll, true);
+		KDialog.parent.init.call(self, options);
+		var title = options.title,
+			body = K(options.body, self.doc),
+			previewBtn = options.previewBtn,
+			yesBtn = options.yesBtn,
+			noBtn = options.noBtn,
+			closeBtn = options.closeBtn,
+			showMask = _undef(options.showMask, true);
+		self.div.addClass('ke-dialog').bind('click,mousedown', function(e){
+			e.stopPropagation();
+		});
+		var contentDiv = K('<div class="ke-dialog-content"></div>').appendTo(self.div);
+		if (_IE && _V < 7) {
+			self.iframeMask = K('<iframe src="about:blank" class="ke-dialog-shadow"></iframe>').appendTo(self.div);
+		} else if (shadowMode) {
+			K('<div class="ke-dialog-shadow"></div>').appendTo(self.div);
+		}
+		var headerDiv = K('<div class="ke-dialog-header"></div>');
+		contentDiv.append(headerDiv);
+		headerDiv.html(title);
+		self.closeIcon = K('<span class="ke-dialog-icon-close" title="' + closeBtn.name + '"></span>').click(closeBtn.click);
+		headerDiv.append(self.closeIcon);
+		self.draggable({
+			clickEl : headerDiv,
+			beforeDrag : options.beforeDrag
+		});
+		var bodyDiv = K('<div class="ke-dialog-body"></div>');
+		contentDiv.append(bodyDiv);
+		bodyDiv.append(body);
+		var footerDiv = K('<div class="ke-dialog-footer"></div>');
+		if (previewBtn || yesBtn || noBtn) {
+			contentDiv.append(footerDiv);
+		}
+		_each([
+			{ btn : previewBtn, name : 'preview' },
+			{ btn : yesBtn, name : 'yes' },
+			{ btn : noBtn, name : 'no' }
+		], function() {
+			if (this.btn) {
+				var button = _createButton(this.btn);
+				button.addClass('ke-dialog-' + this.name);
+				footerDiv.append(button);
+			}
+		});
+		if (self.height) {
+			bodyDiv.height(_removeUnit(self.height) - headerDiv.height() - footerDiv.height());
+		}
+		self.div.width(self.div.width());
+		self.div.height(self.div.height());
+		self.mask = null;
+		if (showMask) {
+			var docEl = _docElement(self.doc),
+				docWidth = Math.max(docEl.scrollWidth, docEl.clientWidth),
+				docHeight = Math.max(docEl.scrollHeight, docEl.clientHeight);
+			self.mask = _widget({
+				x : 0,
+				y : 0,
+				z : self.z - 1,
+				cls : 'ke-dialog-mask',
+				width : docWidth,
+				height : docHeight
+			});
+		}
+		self.autoPos(self.div.width(), self.div.height());
+		self.footerDiv = footerDiv;
+		self.bodyDiv = bodyDiv;
+		self.headerDiv = headerDiv;
+		self.isLoading = false;
+	},
+	setMaskIndex : function(z) {
+		var self = this;
+		self.mask.div.css('z-index', z);
+	},
+	showLoading : function(msg) {
+		msg = _undef(msg, '');
+		var self = this, body = self.bodyDiv;
+		self.loading = K('<div class="ke-dialog-loading"><div class="ke-inline-block ke-dialog-loading-content" style="margin-top:' + Math.round(body.height() / 3) + 'px;">' + msg + '</div></div>')
+			.width(body.width()).height(body.height())
+			.css('top', self.headerDiv.height() + 'px');
+		body.css('visibility', 'hidden').after(self.loading);
+		self.isLoading = true;
+		return self;
+	},
+	hideLoading : function() {
+		this.loading && this.loading.remove();
+		this.bodyDiv.css('visibility', 'visible');
+		this.isLoading = false;
+		return this;
+	},
+	remove : function() {
+		var self = this;
+		if (self.options.beforeRemove) {
+			self.options.beforeRemove.call(self);
+		}
+		self.mask && self.mask.remove();
+		self.iframeMask && self.iframeMask.remove();
+		self.closeIcon.unbind();
+		K('input', self.div).unbind();
+		K('button', self.div).unbind();
+		self.footerDiv.unbind();
+		self.bodyDiv.unbind();
+		self.headerDiv.unbind();
+		K('iframe', self.div).each(function() {
+			K(this).remove();
+		});
+		KDialog.parent.remove.call(self);
+		return self;
+	}
+});
+function _dialog(options) {
+	return new KDialog(options);
+}
+K.DialogClass = KDialog;
+K.dialog = _dialog;
+function _tabs(options) {
+	var self = _widget(options),
+		remove = self.remove,
+		afterSelect = options.afterSelect,
+		div = self.div,
+		liList = [];
+	div.addClass('ke-tabs')
+		.bind('contextmenu,mousedown,mousemove', function(e) {
+			e.preventDefault();
+		});
+	var ul = K('<ul class="ke-tabs-ul ke-clearfix"></ul>');
+	div.append(ul);
+	self.add = function(tab) {
+		var li = K('<li class="ke-tabs-li">' + tab.title + '</li>');
+		li.data('tab', tab);
+		liList.push(li);
+		ul.append(li);
+	};
+	self.selectedIndex = 0;
+	self.select = function(index) {
+		self.selectedIndex = index;
+		_each(liList, function(i, li) {
+			li.unbind();
+			if (i === index) {
+				li.addClass('ke-tabs-li-selected');
+				K(li.data('tab').panel).show('');
+			} else {
+				li.removeClass('ke-tabs-li-selected').removeClass('ke-tabs-li-on')
+				.mouseover(function() {
+					K(this).addClass('ke-tabs-li-on');
+				})
+				.mouseout(function() {
+					K(this).removeClass('ke-tabs-li-on');
+				})
+				.click(function() {
+					self.select(i);
+				});
+				K(li.data('tab').panel).hide();
+			}
+		});
+		if (afterSelect) {
+			afterSelect.call(self, index);
+		}
+	};
+	self.remove = function() {
+		_each(liList, function() {
+			this.remove();
+		});
+		ul.remove();
+		remove.call(self);
+	};
+	return self;
+}
+K.tabs = _tabs;
+function _loadScript(url, fn) {
+	var head = document.getElementsByTagName('head')[0] || (_QUIRKS ? document.body : document.documentElement),
+		script = document.createElement('script');
+	head.appendChild(script);
+	script.src = url;
+	script.charset = 'utf-8';
+	script.onload = script.onreadystatechange = function() {
+		if (!this.readyState || this.readyState === 'loaded') {
+			if (fn) {
+				fn();
+			}
+			script.onload = script.onreadystatechange = null;
+			head.removeChild(script);
+		}
+	};
+}
+function _chopQuery(url) {
+	var index = url.indexOf('?');
+	return index > 0 ? url.substr(0, index) : url;
+}
+function _loadStyle(url) {
+	var head = document.getElementsByTagName('head')[0] || (_QUIRKS ? document.body : document.documentElement),
+		link = document.createElement('link'),
+		absoluteUrl = _chopQuery(_formatUrl(url, 'absolute'));
+	var links = K('link[rel="stylesheet"]', head);
+	for (var i = 0, len = links.length; i < len; i++) {
+		if (_chopQuery(_formatUrl(links[i].href, 'absolute')) === absoluteUrl) {
+			return;
+		}
+	}
+	head.appendChild(link);
+	link.href = url;
+	link.rel = 'stylesheet';
+}
+function _ajax(url, fn, method, param, dataType) {
+	method = method || 'GET';
+	dataType = dataType || 'json';
+	var xhr = window.XMLHttpRequest ? new window.XMLHttpRequest() : new ActiveXObject('Microsoft.XMLHTTP');
+	xhr.open(method, url, true);
+	xhr.onreadystatechange = function () {
+		if (xhr.readyState == 4 && xhr.status == 200) {
+			if (fn) {
+				var data = _trim(xhr.responseText);
+				if (dataType == 'json') {
+					data = _json(data);
+				}
+				fn(data);
+			}
+		}
+	};
+	if (method == 'POST') {
+		var params = [];
+		_each(param, function(key, val) {
+			params.push(encodeURIComponent(key) + '=' + encodeURIComponent(val));
+		});
+		try {
+			xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
+		} catch (e) {}
+		xhr.send(params.join('&'));
+	} else {
+		xhr.send(null);
+	}
+}
+K.loadScript = _loadScript;
+K.loadStyle = _loadStyle;
+K.ajax = _ajax;
+var _plugins = {};
+function _plugin(name, fn) {
+	if (name === undefined) {
+		return _plugins;
+	}
+	if (!fn) {
+		return _plugins[name];
+	}
+	_plugins[name] = fn;
+}
+var _language = {};
+function _parseLangKey(key) {
+	var match, ns = 'core';
+	if ((match = /^(\w+)\.(\w+)$/.exec(key))) {
+		ns = match[1];
+		key = match[2];
+	}
+	return { ns : ns, key : key };
+}
+function _lang(mixed, langType) {
+	langType = langType === undefined ? K.options.langType : langType;
+	if (typeof mixed === 'string') {
+		if (!_language[langType]) {
+			return 'no language';
+		}
+		var pos = mixed.length - 1;
+		if (mixed.substr(pos) === '.') {
+			return _language[langType][mixed.substr(0, pos)];
+		}
+		var obj = _parseLangKey(mixed);
+		return _language[langType][obj.ns][obj.key];
+	}
+	_each(mixed, function(key, val) {
+		var obj = _parseLangKey(key);
+		if (!_language[langType]) {
+			_language[langType] = {};
+		}
+		if (!_language[langType][obj.ns]) {
+			_language[langType][obj.ns] = {};
+		}
+		_language[langType][obj.ns][obj.key] = val;
+	});
+}
+function _getImageFromRange(range, fn) {
+	if (range.collapsed) {
+		return;
+	}
+	range = range.cloneRange().up();
+	var sc = range.startContainer, so = range.startOffset;
+	if (!_WEBKIT && !range.isControl()) {
+		return;
+	}
+	var img = K(sc.childNodes[so]);
+	if (!img || img.name != 'img') {
+		return;
+	}
+	if (fn(img)) {
+		return img;
+	}
+}
+function _bindContextmenuEvent() {
+	var self = this, doc = self.edit.doc;
+	K(doc).contextmenu(function(e) {
+		if (self.menu) {
+			self.hideMenu();
+		}
+		if (!self.useContextmenu) {
+			e.preventDefault();
+			return;
+		}
+		if (self._contextmenus.length === 0) {
+			return;
+		}
+		var maxWidth = 0, items = [];
+		_each(self._contextmenus, function() {
+			if (this.title == '-') {
+				items.push(this);
+				return;
+			}
+			if (this.cond && this.cond()) {
+				items.push(this);
+				if (this.width && this.width > maxWidth) {
+					maxWidth = this.width;
+				}
+			}
+		});
+		while (items.length > 0 && items[0].title == '-') {
+			items.shift();
+		}
+		while (items.length > 0 && items[items.length - 1].title == '-') {
+			items.pop();
+		}
+		var prevItem = null;
+		_each(items, function(i) {
+			if (this.title == '-' && prevItem.title == '-') {
+				delete items[i];
+			}
+			prevItem = this;
+		});
+		if (items.length > 0) {
+			e.preventDefault();
+			var pos = K(self.edit.iframe).pos(),
+				menu = _menu({
+					x : pos.x + e.clientX,
+					y : pos.y + e.clientY,
+					width : maxWidth,
+					css : { visibility: 'hidden' },
+					shadowMode : self.shadowMode
+				});
+			_each(items, function() {
+				if (this.title) {
+					menu.addItem(this);
+				}
+			});
+			var docEl = _docElement(menu.doc),
+				menuHeight = menu.div.height();
+			if (e.clientY + menuHeight >= docEl.clientHeight - 100) {
+				menu.pos(menu.x, _removeUnit(menu.y) - menuHeight);
+			}
+			menu.div.css('visibility', 'visible');
+			self.menu = menu;
+		}
+	});
+}
+function _bindNewlineEvent() {
+	var self = this, doc = self.edit.doc, newlineTag = self.newlineTag;
+	if (_IE && newlineTag !== 'br') {
+		return;
+	}
+	if (_GECKO && _V < 3 && newlineTag !== 'p') {
+		return;
+	}
+	if (_OPERA && _V < 9) {
+		return;
+	}
+	var brSkipTagMap = _toMap('h1,h2,h3,h4,h5,h6,pre,li'),
+		pSkipTagMap = _toMap('p,h1,h2,h3,h4,h5,h6,pre,li,blockquote');
+	function getAncestorTagName(range) {
+		var ancestor = K(range.commonAncestor());
+		while (ancestor) {
+			if (ancestor.type == 1 && !ancestor.isStyle()) {
+				break;
+			}
+			ancestor = ancestor.parent();
+		}
+		return ancestor.name;
+	}
+	K(doc).keydown(function(e) {
+		if (e.which != 13 || e.shiftKey || e.ctrlKey || e.altKey) {
+			return;
+		}
+		self.cmd.selection();
+		var tagName = getAncestorTagName(self.cmd.range);
+		if (tagName == 'marquee' || tagName == 'select') {
+			return;
+		}
+		if (newlineTag === 'br' && !brSkipTagMap[tagName]) {
+			e.preventDefault();
+			self.insertHtml('<br />' + (_IE && _V < 9 ? '' : '\u200B'));
+			return;
+		}
+		if (!pSkipTagMap[tagName]) {
+			_nativeCommand(doc, 'formatblock', '<p>');
+		}
+	});
+	K(doc).keyup(function(e) {
+		if (e.which != 13 || e.shiftKey || e.ctrlKey || e.altKey) {
+			return;
+		}
+		if (newlineTag == 'br') {
+			return;
+		}
+		if (_GECKO) {
+			var root = self.cmd.commonAncestor('p');
+			var a = self.cmd.commonAncestor('a');
+			if (a && a.text() == '') {
+				a.remove(true);
+				self.cmd.range.selectNodeContents(root[0]).collapse(true);
+				self.cmd.select();
+			}
+			return;
+		}
+		self.cmd.selection();
+		var tagName = getAncestorTagName(self.cmd.range);
+		if (tagName == 'marquee' || tagName == 'select') {
+			return;
+		}
+		if (!pSkipTagMap[tagName]) {
+			_nativeCommand(doc, 'formatblock', '<p>');
+		}
+		var div = self.cmd.commonAncestor('div');
+		if (div) {
+			var p = K('<p></p>'),
+				child = div[0].firstChild;
+			while (child) {
+				var next = child.nextSibling;
+				p.append(child);
+				child = next;
+			}
+			div.before(p);
+			div.remove();
+			self.cmd.range.selectNodeContents(p[0]);
+			self.cmd.select();
+		}
+	});
+}
+function _bindTabEvent() {
+	var self = this, doc = self.edit.doc;
+	K(doc).keydown(function(e) {
+		if (e.which == 9) {
+			e.preventDefault();
+			if (self.afterTab) {
+				self.afterTab.call(self, e);
+				return;
+			}
+			var cmd = self.cmd, range = cmd.range;
+			range.shrink();
+			if (range.collapsed && range.startContainer.nodeType == 1) {
+				range.insertNode(K('@&nbsp;', doc)[0]);
+				cmd.select();
+			}
+			self.insertHtml('&nbsp;&nbsp;&nbsp;&nbsp;');
+		}
+	});
+}
+function _bindFocusEvent() {
+	var self = this;
+	K(self.edit.textarea[0], self.edit.win).focus(function(e) {
+		if (self.afterFocus) {
+			self.afterFocus.call(self, e);
+		}
+	}).blur(function(e) {
+		if (self.afterBlur) {
+			self.afterBlur.call(self, e);
+		}
+	});
+}
+function _removeBookmarkTag(html) {
+	return _trim(html.replace(/<span [^>]*id="?__kindeditor_bookmark_\w+_\d+__"?[^>]*><\/span>/ig, ''));
+}
+function _removeTempTag(html) {
+	return html.replace(/<div[^>]+class="?__kindeditor_paste__"?[^>]*>[\s\S]*?<\/div>/ig, '');
+}
+function _addBookmarkToStack(stack, bookmark) {
+	if (stack.length === 0) {
+		stack.push(bookmark);
+		return;
+	}
+	var prev = stack[stack.length - 1];
+	if (_removeBookmarkTag(bookmark.html) !== _removeBookmarkTag(prev.html)) {
+		stack.push(bookmark);
+	}
+}
+function _undoToRedo(fromStack, toStack) {
+	var self = this, edit = self.edit,
+		body = edit.doc.body,
+		range, bookmark;
+	if (fromStack.length === 0) {
+		return self;
+	}
+	if (edit.designMode) {
+		range = self.cmd.range;
+		bookmark = range.createBookmark(true);
+		bookmark.html = body.innerHTML;
+	} else {
+		bookmark = {
+			html : body.innerHTML
+		};
+	}
+	_addBookmarkToStack(toStack, bookmark);
+	var prev = fromStack.pop();
+	if (_removeBookmarkTag(bookmark.html) === _removeBookmarkTag(prev.html) && fromStack.length > 0) {
+		prev = fromStack.pop();
+	}
+	if (edit.designMode) {
+		edit.html(prev.html);
+		if (prev.start) {
+			range.moveToBookmark(prev);
+			self.select();
+		}
+	} else {
+		K(body).html(_removeBookmarkTag(prev.html));
+	}
+	return self;
+}
+function KEditor(options) {
+	var self = this;
+	self.options = {};
+	function setOption(key, val) {
+		if (KEditor.prototype[key] === undefined) {
+			self[key] = val;
+		}
+		self.options[key] = val;
+	}
+	_each(options, function(key, val) {
+		setOption(key, options[key]);
+	});
+	_each(K.options, function(key, val) {
+		if (self[key] === undefined) {
+			setOption(key, val);
+		}
+	});
+	var se = K(self.srcElement || '<textarea/>');
+	if (!self.width) {
+		self.width = se[0].style.width || se.width();
+	}
+	if (!self.height) {
+		self.height = se[0].style.height || se.height();
+	}
+	setOption('width', _undef(self.width, self.minWidth));
+	setOption('height', _undef(self.height, self.minHeight));
+	setOption('width', _addUnit(self.width));
+	setOption('height', _addUnit(self.height));
+	if (_MOBILE && (!_IOS || _V < 534)) {
+		self.designMode = false;
+	}
+	self.srcElement = se;
+	self.initContent = '';
+	self.plugin = {};
+	self.isCreated = false;
+	self._handlers = {};
+	self._contextmenus = [];
+	self._undoStack = [];
+	self._redoStack = [];
+	self._firstAddBookmark = true;
+	self.menu = self.contextmenu = null;
+	self.dialogs = [];
+}
+KEditor.prototype = {
+	lang : function(mixed) {
+		return _lang(mixed, this.langType);
+	},
+	loadPlugin : function(name, fn) {
+		var self = this;
+		if (_plugins[name]) {
+			if (!_isFunction(_plugins[name])) {
+				setTimeout(function() {
+					self.loadPlugin(name, fn);
+				}, 100);
+				return self;
+			}
+			_plugins[name].call(self, KindEditor);
+			if (fn) {
+				fn.call(self);
+			}
+			return self;
+		}
+		_plugins[name] = 'loading';
+		_loadScript(self.pluginsPath + name + '/' + name + '.js?ver=' + encodeURIComponent(K.DEBUG ? _TIME : _VERSION), function() {
+			setTimeout(function() {
+				if (_plugins[name]) {
+					self.loadPlugin(name, fn);
+				}
+			}, 0);
+		});
+		return self;
+	},
+	handler : function(key, fn) {
+		var self = this;
+		if (!self._handlers[key]) {
+			self._handlers[key] = [];
+		}
+		if (_isFunction(fn)) {
+			self._handlers[key].push(fn);
+			return self;
+		}
+		_each(self._handlers[key], function() {
+			fn = this.call(self, fn);
+		});
+		return fn;
+	},
+	clickToolbar : function(name, fn) {
+		var self = this, key = 'clickToolbar' + name;
+		if (fn === undefined) {
+			if (self._handlers[key]) {
+				return self.handler(key);
+			}
+			self.loadPlugin(name, function() {
+				self.handler(key);
+			});
+			return self;
+		}
+		return self.handler(key, fn);
+	},
+	updateState : function() {
+		var self = this;
+		_each(('justifyleft,justifycenter,justifyright,justifyfull,insertorderedlist,insertunorderedlist,' +
+			'subscript,superscript,bold,italic,underline,strikethrough').split(','), function(i, name) {
+			self.cmd.state(name) ? self.toolbar.select(name) : self.toolbar.unselect(name);
+		});
+		return self;
+	},
+	addContextmenu : function(item) {
+		this._contextmenus.push(item);
+		return this;
+	},
+	afterCreate : function(fn) {
+		return this.handler('afterCreate', fn);
+	},
+	beforeRemove : function(fn) {
+		return this.handler('beforeRemove', fn);
+	},
+	beforeGetHtml : function(fn) {
+		return this.handler('beforeGetHtml', fn);
+	},
+	beforeSetHtml : function(fn) {
+		return this.handler('beforeSetHtml', fn);
+	},
+	afterSetHtml : function(fn) {
+		return this.handler('afterSetHtml', fn);
+	},
+	create : function() {
+		var self = this, fullscreenMode = self.fullscreenMode;
+		if (self.isCreated) {
+			return self;
+		}
+		if (self.srcElement.data('kindeditor')) {
+			return self;
+		}
+		self.srcElement.data('kindeditor', 'true');
+		if (fullscreenMode) {
+			_docElement().style.overflow = 'hidden';
+		} else {
+			_docElement().style.overflow = '';
+		}
+		var width = fullscreenMode ? _docElement().clientWidth + 'px' : self.width,
+			height = fullscreenMode ? _docElement().clientHeight + 'px' : self.height;
+		if ((_IE && _V < 8) || _QUIRKS) {
+			height = _addUnit(_removeUnit(height) + 2);
+		}
+		var container = self.container = K(self.layout);
+		if (fullscreenMode) {
+			K(document.body).append(container);
+		} else {
+			self.srcElement.before(container);
+		}
+		var toolbarDiv = K('.toolbar', container),
+			editDiv = K('.edit', container),
+			statusbar = self.statusbar = K('.statusbar', container);
+		container.removeClass('container')
+			.addClass('ke-container ke-container-' + self.themeType).css('width', width);
+		if (fullscreenMode) {
+			container.css({
+				position : 'absolute',
+				left : 0,
+				top : 0,
+				'z-index' : 811211
+			});
+			if (!_GECKO) {
+				self._scrollPos = _getScrollPos();
+			}
+			window.scrollTo(0, 0);
+			K(document.body).css({
+				'height' : '1px',
+				'overflow' : 'hidden'
+			});
+			K(document.body.parentNode).css('overflow', 'hidden');
+			self._fullscreenExecuted = true;
+		} else {
+			if (self._fullscreenExecuted) {
+				K(document.body).css({
+					'height' : '',
+					'overflow' : ''
+				});
+				K(document.body.parentNode).css('overflow', '');
+			}
+			if (self._scrollPos) {
+				window.scrollTo(self._scrollPos.x, self._scrollPos.y);
+			}
+		}
+		var htmlList = [];
+		K.each(self.items, function(i, name) {
+			if (name == '|') {
+				htmlList.push('<span class="ke-inline-block ke-separator"></span>');
+			} else if (name == '/') {
+				htmlList.push('<div class="ke-hr"></div>');
+			} else {
+				htmlList.push('<span class="ke-outline" data-name="' + name + '" title="' + self.lang(name) + '" unselectable="on">');
+				htmlList.push('<span class="ke-toolbar-icon ke-toolbar-icon-url ke-icon-' + name + '" unselectable="on"></span></span>');
+			}
+		});
+		var toolbar = self.toolbar = _toolbar({
+			src : toolbarDiv,
+			html : htmlList.join(''),
+			noDisableItems : self.noDisableItems,
+			click : function(e, name) {
+				e.stop();
+				if (self.menu) {
+					var menuName = self.menu.name;
+					self.hideMenu();
+					if (menuName === name) {
+						return;
+					}
+				}
+				self.clickToolbar(name);
+			}
+		});
+		var editHeight = _removeUnit(height) - toolbar.div.height();
+		var edit = self.edit = _edit({
+			height : editHeight > 0 && _removeUnit(height) > self.minHeight ? editHeight : self.minHeight,
+			src : editDiv,
+			srcElement : self.srcElement,
+			designMode : self.designMode,
+			themesPath : self.themesPath,
+			bodyClass : self.bodyClass,
+			cssPath : self.cssPath,
+			cssData : self.cssData,
+			beforeGetHtml : function(html) {
+				html = self.beforeGetHtml(html);
+				html = _removeBookmarkTag(_removeTempTag(html));
+				return _formatHtml(html, self.filterMode ? self.htmlTags : null, self.urlType, self.wellFormatMode, self.indentChar);
+			},
+			beforeSetHtml : function(html) {
+				html = _formatHtml(html, self.filterMode ? self.htmlTags : null, '', false);
+				return self.beforeSetHtml(html);
+			},
+			afterSetHtml : function() {
+				self.edit = edit = this;
+				self.afterSetHtml();
+			},
+			afterCreate : function() {
+				self.edit = edit = this;
+				self.cmd = edit.cmd;
+				self._docMousedownFn = function(e) {
+					if (self.menu) {
+						self.hideMenu();
+					}
+				};
+				K(edit.doc, document).mousedown(self._docMousedownFn);
+				_bindContextmenuEvent.call(self);
+				_bindNewlineEvent.call(self);
+				_bindTabEvent.call(self);
+				_bindFocusEvent.call(self);
+				edit.afterChange(function(e) {
+					if (!edit.designMode) {
+						return;
+					}
+					self.updateState();
+					self.addBookmark();
+					if (self.options.afterChange) {
+						self.options.afterChange.call(self);
+					}
+				});
+				edit.textarea.keyup(function(e) {
+					if (!e.ctrlKey && !e.altKey && _INPUT_KEY_MAP[e.which]) {
+						if (self.options.afterChange) {
+							self.options.afterChange.call(self);
+						}
+					}
+				});
+				if (self.readonlyMode) {
+					self.readonly();
+				}
+				self.isCreated = true;
+				if (self.initContent === '') {
+					self.initContent = self.html();
+				}
+				if (self._undoStack.length > 0) {
+					var prev = self._undoStack.pop();
+					if (prev.start) {
+						self.html(prev.html);
+						edit.cmd.range.moveToBookmark(prev);
+						self.select();
+					}
+				}
+				self.afterCreate();
+				if (self.options.afterCreate) {
+					self.options.afterCreate.call(self);
+				}
+			}
+		});
+		statusbar.removeClass('statusbar').addClass('ke-statusbar')
+			.append('<span class="ke-inline-block ke-statusbar-center-icon"></span>')
+			.append('<span class="ke-inline-block ke-statusbar-right-icon"></span>');
+		if (self._fullscreenResizeHandler) {
+			K(window).unbind('resize', self._fullscreenResizeHandler);
+			self._fullscreenResizeHandler = null;
+		}
+		function initResize() {
+			if (statusbar.height() === 0) {
+				setTimeout(initResize, 100);
+				return;
+			}
+			self.resize(width, height, false);
+		}
+		initResize();
+		if (fullscreenMode) {
+			self._fullscreenResizeHandler = function(e) {
+				if (self.isCreated) {
+					self.resize(_docElement().clientWidth, _docElement().clientHeight, false);
+				}
+			};
+			K(window).bind('resize', self._fullscreenResizeHandler);
+			toolbar.select('fullscreen');
+			statusbar.first().css('visibility', 'hidden');
+			statusbar.last().css('visibility', 'hidden');
+		} else {
+			if (_GECKO) {
+				K(window).bind('scroll', function(e) {
+					self._scrollPos = _getScrollPos();
+				});
+			}
+			if (self.resizeType > 0) {
+				_drag({
+					moveEl : container,
+					clickEl : statusbar,
+					moveFn : function(x, y, width, height, diffX, diffY) {
+						height += diffY;
+						self.resize(null, height);
+					}
+				});
+			} else {
+				statusbar.first().css('visibility', 'hidden');
+			}
+			if (self.resizeType === 2) {
+				_drag({
+					moveEl : container,
+					clickEl : statusbar.last(),
+					moveFn : function(x, y, width, height, diffX, diffY) {
+						width += diffX;
+						height += diffY;
+						self.resize(width, height);
+					}
+				});
+			} else {
+				statusbar.last().css('visibility', 'hidden');
+			}
+		}
+		return self;
+	},
+	remove : function() {
+		var self = this;
+		if (!self.isCreated) {
+			return self;
+		}
+		self.beforeRemove();
+		self.srcElement.data('kindeditor', '');
+		if (self.menu) {
+			self.hideMenu();
+		}
+		_each(self.dialogs, function() {
+			self.hideDialog();
+		});
+		K(document).unbind('mousedown', self._docMousedownFn);
+		self.toolbar.remove();
+		self.edit.remove();
+		self.statusbar.last().unbind();
+		self.statusbar.unbind();
+		self.container.remove();
+		self.container = self.toolbar = self.edit = self.menu = null;
+		self.dialogs = [];
+		self.isCreated = false;
+		return self;
+	},
+	resize : function(width, height, updateProp) {
+		var self = this;
+		updateProp = _undef(updateProp, true);
+		if (width) {
+			if (!/%/.test(width)) {
+				width = _removeUnit(width);
+				width = width < self.minWidth ? self.minWidth : width;
+			}
+			self.container.css('width', _addUnit(width));
+			if (updateProp) {
+				self.width = _addUnit(width);
+			}
+		}
+		if (height) {
+			height = _removeUnit(height);
+			editHeight = _removeUnit(height) - self.toolbar.div.height() - self.statusbar.height();
+			editHeight = editHeight < self.minHeight ? self.minHeight : editHeight;
+			self.edit.setHeight(editHeight);
+			if (updateProp) {
+				self.height = _addUnit(height);
+			}
+		}
+		return self;
+	},
+	select : function() {
+		this.isCreated && this.cmd.select();
+		return this;
+	},
+	html : function(val) {
+		var self = this;
+		if (val === undefined) {
+			return self.isCreated ? self.edit.html() : _elementVal(self.srcElement);
+		}
+		self.isCreated ? self.edit.html(val) : _elementVal(self.srcElement, val);
+		if (self.isCreated) {
+			self.cmd.selection();
+		}
+		return self;
+	},
+	fullHtml : function() {
+		return this.isCreated ? this.edit.html(undefined, true) : '';
+	},
+	text : function(val) {
+		var self = this;
+		if (val === undefined) {
+			return _trim(self.html().replace(/<(?!img|embed).*?>/ig, '').replace(/&nbsp;/ig, ' '));
+		} else {
+			return self.html(_escape(val));
+		}
+	},
+	isEmpty : function() {
+		return _trim(this.text().replace(/\r\n|\n|\r/, '')) === '';
+	},
+	isDirty : function() {
+		return _trim(this.initContent.replace(/\r\n|\n|\r|t/g, '')) !== _trim(this.html().replace(/\r\n|\n|\r|t/g, ''));
+	},
+	selectedHtml : function() {
+		var val = this.isCreated ? this.cmd.range.html() : '';
+		val = _removeBookmarkTag(_removeTempTag(val));
+		return val;
+	},
+	count : function(mode) {
+		var self = this;
+		mode = (mode || 'html').toLowerCase();
+		if (mode === 'html') {
+			return self.html().length;
+		}
+		if (mode === 'text') {
+			return self.text().replace(/<(?:img|embed).*?>/ig, 'K').replace(/\r\n|\n|\r/g, '').length;
+		}
+		return 0;
+	},
+	exec : function(key) {
+		key = key.toLowerCase();
+		var self = this, cmd = self.cmd,
+			changeFlag = _inArray(key, 'selectall,copy,paste,print'.split(',')) < 0;
+		if (changeFlag) {
+			self.addBookmark(false);
+		}
+		cmd[key].apply(cmd, _toArray(arguments, 1));
+		if (changeFlag) {
+			self.updateState();
+			self.addBookmark(false);
+			if (self.options.afterChange) {
+				self.options.afterChange.call(self);
+			}
+		}
+		return self;
+	},
+	insertHtml : function(val, quickMode) {
+		if (!this.isCreated) {
+			return this;
+		}
+		val = this.beforeSetHtml(val);
+		this.exec('inserthtml', val, quickMode);
+		return this;
+	},
+	appendHtml : function(val) {
+		this.html(this.html() + val);
+		if (this.isCreated) {
+			var cmd = this.cmd;
+			cmd.range.selectNodeContents(cmd.doc.body).collapse(false);
+			cmd.select();
+		}
+		return this;
+	},
+	sync : function() {
+		_elementVal(this.srcElement, this.html());
+		return this;
+	},
+	focus : function() {
+		this.isCreated ? this.edit.focus() : this.srcElement[0].focus();
+		return this;
+	},
+	blur : function() {
+		this.isCreated ? this.edit.blur() : this.srcElement[0].blur();
+		return this;
+	},
+	addBookmark : function(checkSize) {
+		checkSize = _undef(checkSize, true);
+		var self = this, edit = self.edit,
+			body = edit.doc.body,
+			html = _removeTempTag(body.innerHTML), bookmark;
+		if (checkSize && self._undoStack.length > 0) {
+			var prev = self._undoStack[self._undoStack.length - 1];
+			if (Math.abs(html.length - _removeBookmarkTag(prev.html).length) < self.minChangeSize) {
+				return self;
+			}
+		}
+		if (edit.designMode && !self._firstAddBookmark) {
+			var range = self.cmd.range;
+			bookmark = range.createBookmark(true);
+			bookmark.html = _removeTempTag(body.innerHTML);
+			range.moveToBookmark(bookmark);
+		} else {
+			bookmark = {
+				html : html
+			};
+		}
+		self._firstAddBookmark = false;
+		_addBookmarkToStack(self._undoStack, bookmark);
+		return self;
+	},
+	undo : function() {
+		return _undoToRedo.call(this, this._undoStack, this._redoStack);
+	},
+	redo : function() {
+		return _undoToRedo.call(this, this._redoStack, this._undoStack);
+	},
+	fullscreen : function(bool) {
+		this.fullscreenMode = (bool === undefined ? !this.fullscreenMode : bool);
+		this.addBookmark(false);
+		return this.remove().create();
+	},
+	readonly : function(isReadonly) {
+		isReadonly = _undef(isReadonly, true);
+		var self = this, edit = self.edit, doc = edit.doc;
+		if (self.designMode) {
+			self.toolbar.disableAll(isReadonly, []);
+		} else {
+			_each(self.noDisableItems, function() {
+				self.toolbar[isReadonly ? 'disable' : 'enable'](this);
+			});
+		}
+		if (_IE) {
+			doc.body.contentEditable = !isReadonly;
+		} else {
+			doc.designMode = isReadonly ? 'off' : 'on';
+		}
+		edit.textarea[0].disabled = isReadonly;
+	},
+	createMenu : function(options) {
+		var self = this,
+			name = options.name,
+			knode = self.toolbar.get(name),
+			pos = knode.pos();
+		options.x = pos.x;
+		options.y = pos.y + knode.height();
+		options.z = self.options.zIndex;
+		options.shadowMode = _undef(options.shadowMode, self.shadowMode);
+		if (options.selectedColor !== undefined) {
+			options.cls = 'ke-colorpicker-' + self.themeType;
+			options.noColor = self.lang('noColor');
+			self.menu = _colorpicker(options);
+		} else {
+			options.cls = 'ke-menu-' + self.themeType;
+			options.centerLineMode = false;
+			self.menu = _menu(options);
+		}
+		return self.menu;
+	},
+	hideMenu : function() {
+		this.menu.remove();
+		this.menu = null;
+		return this;
+	},
+	hideContextmenu : function() {
+		this.contextmenu.remove();
+		this.contextmenu = null;
+		return this;
+	},
+	createDialog : function(options) {
+		var self = this, name = options.name;
+		options.z = self.options.zIndex;
+		options.shadowMode = _undef(options.shadowMode, self.shadowMode);
+		options.closeBtn = _undef(options.closeBtn, {
+			name : self.lang('close'),
+			click : function(e) {
+				self.hideDialog();
+				if (_IE && self.cmd) {
+					self.cmd.select();
+				}
+			}
+		});
+		options.noBtn = _undef(options.noBtn, {
+			name : self.lang(options.yesBtn ? 'no' : 'close'),
+			click : function(e) {
+				self.hideDialog();
+				if (_IE && self.cmd) {
+					self.cmd.select();
+				}
+			}
+		});
+		if (self.dialogAlignType != 'page') {
+			options.alignEl = self.container;
+		}
+		options.cls = 'ke-dialog-' + self.themeType;
+		if (self.dialogs.length > 0) {
+			var firstDialog = self.dialogs[0],
+				parentDialog = self.dialogs[self.dialogs.length - 1];
+			firstDialog.setMaskIndex(parentDialog.z + 2);
+			options.z = parentDialog.z + 3;
+			options.showMask = false;
+		}
+		var dialog = _dialog(options);
+		self.dialogs.push(dialog);
+		return dialog;
+	},
+	hideDialog : function() {
+		var self = this;
+		if (self.dialogs.length > 0) {
+			self.dialogs.pop().remove();
+		}
+		if (self.dialogs.length > 0) {
+			var firstDialog = self.dialogs[0],
+				parentDialog = self.dialogs[self.dialogs.length - 1];
+			firstDialog.setMaskIndex(parentDialog.z - 1);
+		}
+		return self;
+	},
+	errorDialog : function(html) {
+		var self = this;
+		var dialog = self.createDialog({
+			width : 750,
+			title : self.lang('uploadError'),
+			body : '<div style="padding:10px 20px;"><iframe frameborder="0" style="width:708px;height:400px;"></iframe></div>'
+		});
+		var iframe = K('iframe', dialog.div), doc = K.iframeDoc(iframe);
+		doc.open();
+		doc.write(html);
+		doc.close();
+		K(doc.body).css('background-color', '#FFF');
+		iframe[0].contentWindow.focus();
+		return self;
+	}
+};
+function _editor(options) {
+	return new KEditor(options);
+}
+_instances = [];
+function _create(expr, options) {
+	options = options || {};
+	options.basePath = _undef(options.basePath, K.basePath);
+	options.themesPath = _undef(options.themesPath, options.basePath + 'themes/');
+	options.langPath = _undef(options.langPath, options.basePath + 'lang/');
+	options.pluginsPath = _undef(options.pluginsPath, options.basePath + 'plugins/');
+	if (_undef(options.loadStyleMode, K.options.loadStyleMode)) {
+		var themeType = _undef(options.themeType, K.options.themeType);
+		_loadStyle(options.themesPath + 'default/default.css');
+		_loadStyle(options.themesPath + themeType + '/' + themeType + '.css');
+	}
+	function create(editor) {
+		_each(_plugins, function(name, fn) {
+			if (_isFunction(fn)) {
+				fn.call(editor, KindEditor);
+			}
+		});
+		return editor.create();
+	}
+	var knode = K(expr);
+	if (!knode || knode.length === 0) {
+		return;
+	}
+	if (knode.length > 1) {
+		knode.each(function() {
+			_create(this, options);
+		});
+		return _instances[0];
+	}
+	options.srcElement = knode[0];
+	var editor = new KEditor(options);
+	_instances.push(editor);
+	if (_language[editor.langType]) {
+		return create(editor);
+	}
+	_loadScript(editor.langPath + editor.langType + '.js?ver=' + encodeURIComponent(K.DEBUG ? _TIME : _VERSION), function() {
+		create(editor);
+	});
+	return editor;
+}
+function _eachEditor(expr, fn) {
+	K(expr).each(function(i, el) {
+		K.each(_instances, function(j, editor) {
+			if (editor && editor.srcElement[0] == el) {
+				fn.call(editor, j);
+				return false;
+			}
+		});
+	});
+}
+K.remove = function(expr) {
+	_eachEditor(expr, function(i) {
+		this.remove();
+		_instances.splice(i, 1);
+	});
+};
+K.sync = function(expr) {
+	_eachEditor(expr, function() {
+		this.sync();
+	});
+};
+K.html = function(expr, val) {
+	_eachEditor(expr, function() {
+		this.html(val);
+	});
+};
+K.insertHtml = function(expr, val) {
+	_eachEditor(expr, function() {
+		this.insertHtml(val);
+	});
+};
+K.appendHtml = function(expr, val) {
+	_eachEditor(expr, function() {
+		this.appendHtml(val);
+	});
+};
+if (_IE && _V < 7) {
+	_nativeCommand(document, 'BackgroundImageCache', true);
+}
+K.EditorClass = KEditor;
+K.editor = _editor;
+K.create = _create;
+K.instances = _instances;
+K.plugin = _plugin;
+K.lang = _lang;
+_plugin('core', function(K) {
+	var self = this,
+		shortcutKeys = {
+			undo : 'Z', redo : 'Y', bold : 'B', italic : 'I', underline : 'U', print : 'P', selectall : 'A'
+		};
+	self.afterSetHtml(function() {
+		if (self.options.afterChange) {
+			self.options.afterChange.call(self);
+		}
+	});
+	self.afterCreate(function() {
+		if (self.syncType != 'form') {
+			return;
+		}
+		var el = K(self.srcElement), hasForm = false;
+		while ((el = el.parent())) {
+			if (el.name == 'form') {
+				hasForm = true;
+				break;
+			}
+		}
+		if (hasForm) {
+			el.bind('submit', function(e) {
+				self.sync();
+				K(window).bind('unload', function() {
+					self.edit.textarea.remove();
+				});
+			});
+			var resetBtn = K('[type="reset"]', el);
+			resetBtn.click(function() {
+				self.html(self.initContent);
+				self.cmd.selection();
+			});
+			self.beforeRemove(function() {
+				el.unbind();
+				resetBtn.unbind();
+			});
+		}
+	});
+	self.clickToolbar('source', function() {
+		if (self.edit.designMode) {
+			self.toolbar.disableAll(true);
+			self.edit.design(false);
+			self.toolbar.select('source');
+		} else {
+			self.toolbar.disableAll(false);
+			self.edit.design(true);
+			self.toolbar.unselect('source');
+			if (_GECKO) {
+				setTimeout(function() {
+					self.cmd.selection();
+				}, 0);
+			} else {
+				self.cmd.selection();
+			}
+		}
+		self.designMode = self.edit.designMode;
+	});
+	self.afterCreate(function() {
+		if (!self.designMode) {
+			self.toolbar.disableAll(true).select('source');
+		}
+	});
+	self.clickToolbar('fullscreen', function() {
+		self.fullscreen();
+	});
+	if (self.fullscreenShortcut) {
+		var loaded = false;
+		self.afterCreate(function() {
+			K(self.edit.doc, self.edit.textarea).keyup(function(e) {
+				if (e.which == 27) {
+					setTimeout(function() {
+						self.fullscreen();
+					}, 0);
+				}
+			});
+			if (loaded) {
+				if (_IE && !self.designMode) {
+					return;
+				}
+				self.focus();
+			}
+			if (!loaded) {
+				loaded = true;
+			}
+		});
+	}
+	_each('undo,redo'.split(','), function(i, name) {
+		if (shortcutKeys[name]) {
+			self.afterCreate(function() {
+				_ctrl(this.edit.doc, shortcutKeys[name], function() {
+					self.clickToolbar(name);
+				});
+			});
+		}
+		self.clickToolbar(name, function() {
+			self[name]();
+		});
+	});
+	self.clickToolbar('formatblock', function() {
+		var blocks = self.lang('formatblock.formatBlock'),
+			heights = {
+				h1 : 28,
+				h2 : 24,
+				h3 : 18,
+				H4 : 14,
+				p : 12
+			},
+			curVal = self.cmd.val('formatblock'),
+			menu = self.createMenu({
+				name : 'formatblock',
+				width : self.langType == 'en' ? 200 : 150
+			});
+		_each(blocks, function(key, val) {
+			var style = 'font-size:' + heights[key] + 'px;';
+			if (key.charAt(0) === 'h') {
+				style += 'font-weight:bold;';
+			}
+			menu.addItem({
+				title : '<span style="' + style + '" unselectable="on">' + val + '</span>',
+				height : heights[key] + 12,
+				checked : (curVal === key || curVal === val),
+				click : function() {
+					self.select().exec('formatblock', '<' + key + '>').hideMenu();
+				}
+			});
+		});
+	});
+	self.clickToolbar('fontname', function() {
+		var curVal = self.cmd.val('fontname'),
+			menu = self.createMenu({
+				name : 'fontname',
+				width : 150
+			});
+		_each(self.lang('fontname.fontName'), function(key, val) {
+			menu.addItem({
+				title : '<span style="font-family: ' + key + ';" unselectable="on">' + val + '</span>',
+				checked : (curVal === key.toLowerCase() || curVal === val.toLowerCase()),
+				click : function() {
+					self.exec('fontname', key).hideMenu();
+				}
+			});
+		});
+	});
+	self.clickToolbar('fontsize', function() {
+		var curVal = self.cmd.val('fontsize'),
+			menu = self.createMenu({
+				name : 'fontsize',
+				width : 150
+			});
+		_each(self.fontSizeTable, function(i, val) {
+			menu.addItem({
+				title : '<span style="font-size:' + val + ';" unselectable="on">' + val + '</span>',
+				height : _removeUnit(val) + 12,
+				checked : curVal === val,
+				click : function() {
+					self.exec('fontsize', val).hideMenu();
+				}
+			});
+		});
+	});
+	_each('forecolor,hilitecolor'.split(','), function(i, name) {
+		self.clickToolbar(name, function() {
+			self.createMenu({
+				name : name,
+				selectedColor : self.cmd.val(name) || 'default',
+				colors : self.colorTable,
+				click : function(color) {
+					self.exec(name, color).hideMenu();
+				}
+			});
+		});
+	});
+	_each(('cut,copy,paste').split(','), function(i, name) {
+		self.clickToolbar(name, function() {
+			self.focus();
+			try {
+				self.exec(name, null);
+			} catch(e) {
+				alert(self.lang(name + 'Error'));
+			}
+		});
+	});
+	self.clickToolbar('about', function() {
+		var html = '<div style="margin:20px;">' +
+			'<div>KindEditor ' + _VERSION + '</div>' +
+			'<div>Copyright &copy; <a href="http://www.kindsoft.net/" target="_blank">kindsoft.net</a> All rights reserved.</div>' +
+			'</div>';
+		self.createDialog({
+			name : 'about',
+			width : 350,
+			title : self.lang('about'),
+			body : html
+		});
+	});
+	self.plugin.getSelectedLink = function() {
+		return self.cmd.commonAncestor('a');
+	};
+	self.plugin.getSelectedImage = function() {
+		return _getImageFromRange(self.edit.cmd.range, function(img) {
+			return !/^ke-\w+$/i.test(img[0].className);
+		});
+	};
+	self.plugin.getSelectedFlash = function() {
+		return _getImageFromRange(self.edit.cmd.range, function(img) {
+			return img[0].className == 'ke-flash';
+		});
+	};
+	self.plugin.getSelectedMedia = function() {
+		return _getImageFromRange(self.edit.cmd.range, function(img) {
+			return img[0].className == 'ke-media' || img[0].className == 'ke-rm';
+		});
+	};
+	self.plugin.getSelectedAnchor = function() {
+		return _getImageFromRange(self.edit.cmd.range, function(img) {
+			return img[0].className == 'ke-anchor';
+		});
+	};
+	_each('link,image,flash,media,anchor'.split(','), function(i, name) {
+		var uName = name.charAt(0).toUpperCase() + name.substr(1);
+		_each('edit,delete'.split(','), function(j, val) {
+			self.addContextmenu({
+				title : self.lang(val + uName),
+				click : function() {
+					self.loadPlugin(name, function() {
+						self.plugin[name][val]();
+						self.hideMenu();
+					});
+				},
+				cond : self.plugin['getSelected' + uName],
+				width : 150,
+				iconClass : val == 'edit' ? 'ke-icon-' + name : undefined
+			});
+		});
+		self.addContextmenu({ title : '-' });
+	});
+	self.plugin.getSelectedTable = function() {
+		return self.cmd.commonAncestor('table');
+	};
+	self.plugin.getSelectedRow = function() {
+		return self.cmd.commonAncestor('tr');
+	};
+	self.plugin.getSelectedCell = function() {
+		return self.cmd.commonAncestor('td');
+	};
+	_each(('prop,cellprop,colinsertleft,colinsertright,rowinsertabove,rowinsertbelow,rowmerge,colmerge,' +
+	'rowsplit,colsplit,coldelete,rowdelete,insert,delete').split(','), function(i, val) {
+		var cond = _inArray(val, ['prop', 'delete']) < 0 ? self.plugin.getSelectedCell : self.plugin.getSelectedTable;
+		self.addContextmenu({
+			title : self.lang('table' + val),
+			click : function() {
+				self.loadPlugin('table', function() {
+					self.plugin.table[val]();
+					self.hideMenu();
+				});
+			},
+			cond : cond,
+			width : 170,
+			iconClass : 'ke-icon-table' + val
+		});
+	});
+	self.addContextmenu({ title : '-' });
+	_each(('selectall,justifyleft,justifycenter,justifyright,justifyfull,insertorderedlist,' +
+		'insertunorderedlist,indent,outdent,subscript,superscript,hr,print,' +
+		'bold,italic,underline,strikethrough,removeformat,unlink').split(','), function(i, name) {
+		if (shortcutKeys[name]) {
+			self.afterCreate(function() {
+				_ctrl(this.edit.doc, shortcutKeys[name], function() {
+					self.cmd.selection();
+					self.clickToolbar(name);
+				});
+			});
+		}
+		self.clickToolbar(name, function() {
+			self.focus().exec(name, null);
+		});
+	});
+	self.afterCreate(function() {
+		var doc = self.edit.doc, cmd, bookmark, div,
+			cls = '__kindeditor_paste__', pasting = false;
+		function movePastedData() {
+			cmd.range.moveToBookmark(bookmark);
+			cmd.select();
+			if (_WEBKIT) {
+				K('div.' + cls, div).each(function() {
+					K(this).after('<br />').remove(true);
+				});
+				K('span.Apple-style-span', div).remove(true);
+				K('span.Apple-tab-span', div).remove(true);
+				K('span[style]', div).each(function() {
+					if (K(this).css('white-space') == 'nowrap') {
+						K(this).remove(true);
+					}
+				});
+				K('meta', div).remove();
+			}
+			var html = div[0].innerHTML;
+			div.remove();
+			if (html === '') {
+				return;
+			}
+			if (_WEBKIT) {
+				html = html.replace(/(<br>)\1/ig, '$1');
+			}
+			if (self.pasteType === 2) {
+				html = html.replace(/(<(?:p|p\s[^>]*)>) *(<\/p>)/ig, '');
+				if (/schemas-microsoft-com|worddocument|mso-\w+/i.test(html)) {
+					html = _clearMsWord(html, self.filterMode ? self.htmlTags : K.options.htmlTags);
+				} else {
+					html = _formatHtml(html, self.filterMode ? self.htmlTags : null);
+					html = self.beforeSetHtml(html);
+				}
+			}
+			if (self.pasteType === 1) {
+				html = html.replace(/&nbsp;/ig, ' ');
+				html = html.replace(/\n\s*\n/g, '\n');
+				html = html.replace(/<br[^>]*>/ig, '\n');
+				html = html.replace(/<\/p><p[^>]*>/ig, '\n');
+				html = html.replace(/<[^>]+>/g, '');
+				html = html.replace(/ {2}/g, ' &nbsp;');
+				if (self.newlineTag == 'p') {
+					if (/\n/.test(html)) {
+						html = html.replace(/^/, '<p>').replace(/$/, '<br /></p>').replace(/\n/g, '<br /></p><p>');
+					}
+				} else {
+					html = html.replace(/\n/g, '<br />$&');
+				}
+			}
+			self.insertHtml(html, true);
+		}
+		K(doc.body).bind('paste', function(e){
+			if (self.pasteType === 0) {
+				e.stop();
+				return;
+			}
+			if (pasting) {
+				return;
+			}
+			pasting = true;
+			K('div.' + cls, doc).remove();
+			cmd = self.cmd.selection();
+			bookmark = cmd.range.createBookmark();
+			div = K('<div class="' + cls + '"></div>', doc).css({
+				position : 'absolute',
+				width : '1px',
+				height : '1px',
+				overflow : 'hidden',
+				left : '-1981px',
+				top : K(bookmark.start).pos().y + 'px',
+				'white-space' : 'nowrap'
+			});
+			K(doc.body).append(div);
+			if (_IE) {
+				var rng = cmd.range.get(true);
+				rng.moveToElementText(div[0]);
+				rng.select();
+				rng.execCommand('paste');
+				e.preventDefault();
+			} else {
+				cmd.range.selectNodeContents(div[0]);
+				cmd.select();
+			}
+			setTimeout(function() {
+				movePastedData();
+				pasting = false;
+			}, 0);
+		});
+	});
+	self.beforeGetHtml(function(html) {
+		if (_IE && _V <= 8) {
+			html = html.replace(/<div\s+[^>]*data-ke-input-tag="([^"]*)"[^>]*>([\s\S]*?)<\/div>/ig, function(full, tag) {
+				return unescape(tag);
+			});
+			html = html.replace(/(<input)((?:\s+[^>]*)?>)/ig, function($0, $1, $2) {
+				if (!/\s+type="[^"]+"/i.test($0)) {
+					return $1 + ' type="text"' + $2;
+				}
+				return $0;
+			});
+		}
+		return html.replace(/(<(?:noscript|noscript\s[^>]*)>)([\s\S]*?)(<\/noscript>)/ig, function($0, $1, $2, $3) {
+			return $1 + _unescape($2).replace(/\s+/g, ' ') + $3;
+		})
+		.replace(/<img[^>]*class="?ke-(flash|rm|media)"?[^>]*>/ig, function(full) {
+			var imgAttrs = _getAttrList(full);
+			var styles = _getCssList(imgAttrs.style || '');
+			var attrs = _mediaAttrs(imgAttrs['data-ke-tag']);
+			var width = _undef(styles.width, '');
+			var height = _undef(styles.height, '');
+			if (/px/i.test(width)) {
+				width = _removeUnit(width);
+			}
+			if (/px/i.test(height)) {
+				height = _removeUnit(height);
+			}
+			attrs.width = _undef(imgAttrs.width, width);
+			attrs.height = _undef(imgAttrs.height, height);
+			return _mediaEmbed(attrs);
+		})
+		.replace(/<img[^>]*class="?ke-anchor"?[^>]*>/ig, function(full) {
+			var imgAttrs = _getAttrList(full);
+			return '<a name="' + unescape(imgAttrs['data-ke-name']) + '"></a>';
+		})
+		.replace(/<div\s+[^>]*data-ke-script-attr="([^"]*)"[^>]*>([\s\S]*?)<\/div>/ig, function(full, attr, code) {
+			return '<script' + unescape(attr) + '>' + unescape(code) + '</script>';
+		})
+		.replace(/<div\s+[^>]*data-ke-noscript-attr="([^"]*)"[^>]*>([\s\S]*?)<\/div>/ig, function(full, attr, code) {
+			return '<noscript' + unescape(attr) + '>' + unescape(code) + '</noscript>';
+		})
+		.replace(/(<[^>]*)data-ke-src="([^"]*)"([^>]*>)/ig, function(full, start, src, end) {
+			full = full.replace(/(\s+(?:href|src)=")[^"]*(")/i, function($0, $1, $2) {
+				return $1 + _unescape(src) + $2;
+			});
+			full = full.replace(/\s+data-ke-src="[^"]*"/i, '');
+			return full;
+		})
+		.replace(/(<[^>]+\s)data-ke-(on\w+="[^"]*"[^>]*>)/ig, function(full, start, end) {
+			return start + end;
+		});
+	});
+	self.beforeSetHtml(function(html) {
+		if (_IE && _V <= 8) {
+			html = html.replace(/<input[^>]*>|<(select|button)[^>]*>[\s\S]*?<\/\1>/ig, function(full) {
+				var attrs = _getAttrList(full);
+				var styles = _getCssList(attrs.style || '');
+				if (styles.display == 'none') {
+					return '<div class="ke-display-none" data-ke-input-tag="' + escape(full) + '"></div>';
+				}
+				return full;
+			});
+		}
+		return html.replace(/<embed[^>]*type="([^"]+)"[^>]*>(?:<\/embed>)?/ig, function(full) {
+			var attrs = _getAttrList(full);
+			attrs.src = _undef(attrs.src, '');
+			attrs.width = _undef(attrs.width, 0);
+			attrs.height = _undef(attrs.height, 0);
+			return _mediaImg(self.themesPath + 'common/blank.gif', attrs);
+		})
+		.replace(/<a[^>]*name="([^"]+)"[^>]*>(?:<\/a>)?/ig, function(full) {
+			var attrs = _getAttrList(full);
+			if (attrs.href !== undefined) {
+				return full;
+			}
+			return '<img class="ke-anchor" src="' + self.themesPath + 'common/anchor.gif" data-ke-name="' + escape(attrs.name) + '" />';
+		})
+		.replace(/<script([^>]*)>([\s\S]*?)<\/script>/ig, function(full, attr, code) {
+			return '<div class="ke-script" data-ke-script-attr="' + escape(attr) + '">' + escape(code) + '</div>';
+		})
+		.replace(/<noscript([^>]*)>([\s\S]*?)<\/noscript>/ig, function(full, attr, code) {
+			return '<div class="ke-noscript" data-ke-noscript-attr="' + escape(attr) + '">' + escape(code) + '</div>';
+		})
+		.replace(/(<[^>]*)(href|src)="([^"]*)"([^>]*>)/ig, function(full, start, key, src, end) {
+			if (full.match(/\sdata-ke-src="[^"]*"/i)) {
+				return full;
+			}
+			full = start + key + '="' + src + '"' + ' data-ke-src="' + _escape(src) + '"' + end;
+			return full;
+		})
+		.replace(/(<[^>]+\s)(on\w+="[^"]*"[^>]*>)/ig, function(full, start, end) {
+			return start + 'data-ke-' + end;
+		})
+		.replace(/<table[^>]*\s+border="0"[^>]*>/ig, function(full) {
+			if (full.indexOf('ke-zeroborder') >= 0) {
+				return full;
+			}
+			return _addClassToTag(full, 'ke-zeroborder');
+		});
+	});
+});
+})(window);
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/lang/ar.js b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/lang/ar.js
new file mode 100644
index 0000000..0516199
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/lang/ar.js
@@ -0,0 +1,233 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+* Arabic Translation By daif alotaibi (http://daif.net/)
+*******************************************************************************/
+
+KindEditor.lang({
+	source : 'عرض المصدر',
+	preview : 'معاينة الصفحة',
+	undo : 'تراجع(Ctrl+Z)',
+	redo : 'إعادة التراجع(Ctrl+Y)',
+	cut : 'قص(Ctrl+X)',
+	copy : 'نسخ(Ctrl+C)',
+	paste : 'لصق(Ctrl+V)',
+	plainpaste : 'لصق كنص عادي',
+	wordpaste : 'لصق من مايكروسفت ورد',
+	selectall : 'تحديد الكل',
+	justifyleft : 'محاذاه لليسار',
+	justifycenter : 'محاذاه للوسط',
+	justifyright : 'محاذاه لليمين',
+	justifyfull : 'محاذاه تلقائية',
+	insertorderedlist : 'قائمة مرقمه',
+	insertunorderedlist : 'قائمة نقطية',
+	indent : 'إزاحه النص',
+	outdent : 'إلغاء الازاحة',
+	subscript : 'أسفل النص',
+	superscript : 'أعلى النص',
+	formatblock : 'Paragraph format',
+	fontname : 'نوع الخط',
+	fontsize : 'حجم الخط',
+	forecolor : 'لون النص',
+	hilitecolor : 'لون خلفية النص',
+	bold : 'عريض(Ctrl+B)',
+	italic : 'مائل(Ctrl+I)',
+	underline : 'خط تحت النص(Ctrl+U)',
+	strikethrough : 'خط على النص',
+	removeformat : 'إزالة التنسيق',
+	image : 'إدراج صورة',
+	multiimage : 'Multi image',
+	flash : 'إدراج فلاش',
+	media : 'إدراج وسائط متعددة',
+	table : 'إدراج جدول',
+	tablecell : 'خلية',
+	hr : 'إدراج خط أفقي',
+	emoticons : 'إدراج وجه ضاحك',
+	link : 'رابط',
+	unlink : 'إزالة الرابط',
+	fullscreen : 'محرر ملئ الشاشة',
+	about : 'حول',
+	print : 'طباعة',
+	filemanager : 'مدير الملفات',
+	code : 'إدراج نص برمجي',
+	map : 'خرائط قووقل',
+	baidumap : 'خرائط قووقل',
+	lineheight : 'إرتفاع السطر',
+	clearhtml : 'مسح كود HTML',
+	pagebreak : 'إدراج فاصل صفحات',
+	quickformat : 'تنسيق سريع',
+	insertfile : 'إدراج ملف',
+	template : 'إدراج قالب',
+	anchor : 'رابط',
+	yes : 'موافق',
+	no : 'إلغاء',
+	close : 'إغلاق',
+	editImage : 'خصائص الصورة',
+	deleteImage : 'حذفالصورة',
+	editFlash : 'خصائص الفلاش',
+	deleteFlash : 'حذف الفلاش',
+	editMedia : 'خصائص الوسائط',
+	deleteMedia : 'حذف الوسائط',
+	editLink : 'خصائص الرابط',
+	deleteLink : 'إزالة الرابط',
+	tableprop : 'خصائص الجدول',
+	tablecellprop : 'خصائص الخلية',
+	tableinsert : 'إدراج جدول',
+	tabledelete : 'حذف جدول',
+	tablecolinsertleft : 'إدراج عمود لليسار',
+	tablecolinsertright : 'إدراج عمود لليسار',
+	tablerowinsertabove : 'إدراج صف للأعلى',
+	tablerowinsertbelow : 'إدراج صف للأسفل',
+	tablerowmerge : 'دمج للأسفل',
+	tablecolmerge : 'دمج لليمين',
+	tablerowsplit : 'تقسم الصف',
+	tablecolsplit : 'تقسيم العمود',
+	tablecoldelete : 'حذف العمود',
+	tablerowdelete : 'حذف الصف',
+	noColor : 'إفتراضي',
+	pleaseSelectFile : 'Please select file.',
+	invalidImg : "الرجاء إدخال رابط صحيح.\nالملفات المسموح بها: jpg,gif,bmp,png",
+	invalidMedia : "الرجاء إدخال رابط صحيح.\nالملفات المسموح بها: swf,flv,mp3,wav,wma,wmv,mid,avi,mpg,asf,rm,rmvb",
+	invalidWidth : "العرض يجب أن يكون رقم.",
+	invalidHeight : "الإرتفاع يجب أن يكون رقم.",
+	invalidBorder : "عرض الحد يجب أن يكون رقم.",
+	invalidUrl : "الرجاء إدخال رابط حيح.",
+	invalidRows : 'صفوف غير صحيح.',
+	invalidCols : 'أعمدة غير صحيحة.',
+	invalidPadding : 'The padding must be number.',
+	invalidSpacing : 'The spacing must be number.',
+	invalidJson : 'Invalid JSON string.',
+	uploadSuccess : 'تم رفع الملف بنجاح.',
+	cutError : 'حاليا غير مدعومة من المتصفح, إستخدم إختصار لوحة المفاتيح (Ctrl+X).',
+	copyError : 'حاليا غير مدعومة من المتصفح, إستخدم إختصار لوحة المفاتيح (Ctrl+C).',
+	pasteError : 'حاليا غير مدعومة من المتصفح, إستخدم إختصار لوحة المفاتيح (Ctrl+V).',
+	ajaxLoading : 'Loading ...',
+	uploadLoading : 'Uploading ...',
+	uploadError : 'Upload Error',
+	'plainpaste.comment' : 'إستخدم إختصار لوحة المفاتيح (Ctrl+V) للصق داخل النافذة.',
+	'wordpaste.comment' : 'إستخدم إختصار لوحة المفاتيح (Ctrl+V) للصق داخل النافذة.',
+	'code.pleaseInput' : 'Please input code.',
+	'link.url' : 'الرابط',
+	'link.linkType' : 'الهدف',
+	'link.newWindow' : 'نافذة جديدة',
+	'link.selfWindow' : 'نفس النافذة',
+	'flash.url' : 'الرابط',
+	'flash.width' : 'العرض',
+	'flash.height' : 'الإرتفاع',
+	'flash.upload' : 'رفع',
+	'flash.viewServer' : 'أستعراض',
+	'media.url' : 'الرابط',
+	'media.width' : 'العرض',
+	'media.height' : 'الإرتفاع',
+	'media.autostart' : 'تشغيل تلقائي',
+	'media.upload' : 'رفع',
+	'media.viewServer' : 'أستعراض',
+	'image.remoteImage' : 'إدراج الرابط',
+	'image.localImage' : 'رفع',
+	'image.remoteUrl' : 'الرابط',
+	'image.localUrl' : 'الملف',
+	'image.size' : 'الحجم',
+	'image.width' : 'العرض',
+	'image.height' : 'الإرتفاع',
+	'image.resetSize' : 'إستعادة الأبعاد',
+	'image.align' : 'محاذاة',
+	'image.defaultAlign' : 'الإفتراضي',
+	'image.leftAlign' : 'اليسار',
+	'image.rightAlign' : 'اليمين',
+	'image.imgTitle' : 'العنوان',
+	'image.upload' : 'أستعراض',
+	'image.viewServer' : 'أستعراض',
+	'multiimage.uploadDesc' : 'Allows users to upload <%=uploadLimit%> images, single image size not exceeding <%=sizeLimit%>',
+	'multiimage.startUpload' : 'Start upload',
+	'multiimage.clearAll' : 'Clear all',
+	'multiimage.insertAll' : 'Insert all',
+	'multiimage.queueLimitExceeded' : 'Queue limit exceeded.',
+	'multiimage.fileExceedsSizeLimit' : 'File exceeds size limit.',
+	'multiimage.zeroByteFile' : 'Zero byte file.',
+	'multiimage.invalidFiletype' : 'Invalid file type.',
+	'multiimage.unknownError' : 'Unknown upload error.',
+	'multiimage.pending' : 'Pending ...',
+	'multiimage.uploadError' : 'Upload error',
+	'filemanager.emptyFolder' : 'فارغ',
+	'filemanager.moveup' : 'المجلد الأب',
+	'filemanager.viewType' : 'العرض: ',
+	'filemanager.viewImage' : 'مصغرات',
+	'filemanager.listImage' : 'قائمة',
+	'filemanager.orderType' : 'الترتيب: ',
+	'filemanager.fileName' : 'بالإسم',
+	'filemanager.fileSize' : 'بالحجم',
+	'filemanager.fileType' : 'بالنوع',
+	'insertfile.url' : 'الرابط',
+	'insertfile.title' : 'العنوان',
+	'insertfile.upload' : 'رفع',
+	'insertfile.viewServer' : 'أستعراض',
+	'table.cells' : 'خلايا',
+	'table.rows' : 'صفوف',
+	'table.cols' : 'أعمدة',
+	'table.size' : 'الأبعاد',
+	'table.width' : 'العرض',
+	'table.height' : 'الإرتفاع',
+	'table.percent' : '%',
+	'table.px' : 'px',
+	'table.space' : 'الخارج',
+	'table.padding' : 'الداخل',
+	'table.spacing' : 'الفراغات',
+	'table.align' : 'محاذاه',
+	'table.textAlign' : 'افقى',
+	'table.verticalAlign' : 'رأسي',
+	'table.alignDefault' : 'إفتراضي',
+	'table.alignLeft' : 'يسار',
+	'table.alignCenter' : 'وسط',
+	'table.alignRight' : 'يمين',
+	'table.alignTop' : 'أعلى',
+	'table.alignMiddle' : 'منتصف',
+	'table.alignBottom' : 'أسفل',
+	'table.alignBaseline' : 'Baseline',
+	'table.border' : 'الحدود',
+	'table.borderWidth' : 'العرض',
+	'table.borderColor' : 'اللون',
+	'table.backgroundColor' : 'الخلفية',
+	'map.address' : 'العنوان: ',
+	'map.search' : 'بحث',
+	'baidumap.address' : 'العنوان: ',
+	'baidumap.search' : 'بحث',
+	'baidumap.insertDynamicMap' : 'Dynamic Map',
+	'anchor.name' : 'إسم الرابط',
+	'formatblock.formatBlock' : {
+		h1 : 'عنوان 1',
+		h2 : 'عنوان 2',
+		h3 : 'عنوان 3',
+		h4 : 'عنوان 4',
+		p : 'عادي'
+	},
+	'fontname.fontName' : {
+		'Arial' : 'Arial',
+		'Arial Black' : 'Arial Black',
+		'Comic Sans MS' : 'Comic Sans MS',
+		'Courier New' : 'Courier New',
+		'Garamond' : 'Garamond',
+		'Georgia' : 'Georgia',
+		'Tahoma' : 'Tahoma',
+		'Times New Roman' : 'Times New Roman',
+		'Trebuchet MS' : 'Trebuchet MS',
+		'Verdana' : 'Verdana'
+	},
+	'lineheight.lineHeight' : [
+		{'1' : 'إرتفاع السطر 1'},
+		{'1.5' : 'إرتفاع السطر 1.5'},
+		{'2' : 'إرتفاع السطر 2'},
+		{'2.5' : 'إرتفاع السطر 2.5'},
+		{'3' : 'إرتفاع السطر 3'}
+	],
+	'template.selectTemplate' : 'قالب',
+	'template.replaceContent' : 'إستبدال المحتوى الحالي',
+	'template.fileList' : {
+		'1.html' : 'صورة ونص',
+		'2.html' : 'جدول',
+		'3.html' : 'قائمة'
+	}
+}, 'ar');
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/lang/en.js b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/lang/en.js
new file mode 100644
index 0000000..39ce909
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/lang/en.js
@@ -0,0 +1,232 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.lang({
+	source : 'Source',
+	preview : 'Preview',
+	undo : 'Undo(Ctrl+Z)',
+	redo : 'Redo(Ctrl+Y)',
+	cut : 'Cut(Ctrl+X)',
+	copy : 'Copy(Ctrl+C)',
+	paste : 'Paste(Ctrl+V)',
+	plainpaste : 'Paste as plain text',
+	wordpaste : 'Paste from Word',
+	selectall : 'Select all',
+	justifyleft : 'Align left',
+	justifycenter : 'Align center',
+	justifyright : 'Align right',
+	justifyfull : 'Align full',
+	insertorderedlist : 'Ordered list',
+	insertunorderedlist : 'Unordered list',
+	indent : 'Increase indent',
+	outdent : 'Decrease indent',
+	subscript : 'Subscript',
+	superscript : 'Superscript',
+	formatblock : 'Paragraph format',
+	fontname : 'Font family',
+	fontsize : 'Font size',
+	forecolor : 'Text color',
+	hilitecolor : 'Highlight color',
+	bold : 'Bold(Ctrl+B)',
+	italic : 'Italic(Ctrl+I)',
+	underline : 'Underline(Ctrl+U)',
+	strikethrough : 'Strikethrough',
+	removeformat : 'Remove format',
+	image : 'Image',
+	multiimage : 'Multi image',
+	flash : 'Flash',
+	media : 'Embeded media',
+	table : 'Table',
+	tablecell : 'Cell',
+	hr : 'Insert horizontal line',
+	emoticons : 'Insert emoticon',
+	link : 'Link',
+	unlink : 'Unlink',
+	fullscreen : 'Toggle fullscreen mode',
+	about : 'About',
+	print : 'Print',
+	filemanager : 'File Manager',
+	code : 'Insert code',
+	map : 'Google Maps',
+	baidumap : 'Baidu Maps',
+	lineheight : 'Line height',
+	clearhtml : 'Clear HTML code',
+	pagebreak : 'Insert Page Break',
+	quickformat : 'Quick Format',
+	insertfile : 'Insert file',
+	template : 'Insert Template',
+	anchor : 'Anchor',
+	yes : 'OK',
+	no : 'Cancel',
+	close : 'Close',
+	editImage : 'Image properties',
+	deleteImage : 'Delete image',
+	editFlash : 'Flash properties',
+	deleteFlash : 'Delete flash',
+	editMedia : 'Media properties',
+	deleteMedia : 'Delete media',
+	editLink : 'Link properties',
+	deleteLink : 'Unlink',
+	tableprop : 'Table properties',
+	tablecellprop : 'Cell properties',
+	tableinsert : 'Insert table',
+	tabledelete : 'Delete table',
+	tablecolinsertleft : 'Insert column left',
+	tablecolinsertright : 'Insert column right',
+	tablerowinsertabove : 'Insert row above',
+	tablerowinsertbelow : 'Insert row below',
+	tablerowmerge : 'Merge down',
+	tablecolmerge : 'Merge right',
+	tablerowsplit : 'Split row',
+	tablecolsplit : 'Split column',
+	tablecoldelete : 'Delete column',
+	tablerowdelete : 'Delete row',
+	noColor : 'Default',
+	pleaseSelectFile : 'Please select file.',
+	invalidImg : "Please type valid URL.\nAllowed file extension: jpg,gif,bmp,png",
+	invalidMedia : "Please type valid URL.\nAllowed file extension: swf,flv,mp3,wav,wma,wmv,mid,avi,mpg,asf,rm,rmvb",
+	invalidWidth : "The width must be number.",
+	invalidHeight : "The height must be number.",
+	invalidBorder : "The border must be number.",
+	invalidUrl : "Please type valid URL.",
+	invalidRows : 'Invalid rows.',
+	invalidCols : 'Invalid columns.',
+	invalidPadding : 'The padding must be number.',
+	invalidSpacing : 'The spacing must be number.',
+	invalidJson : 'Invalid JSON string.',
+	uploadSuccess : 'Upload success.',
+	cutError : 'Currently not supported by your browser, use keyboard shortcut(Ctrl+X) instead.',
+	copyError : 'Currently not supported by your browser, use keyboard shortcut(Ctrl+C) instead.',
+	pasteError : 'Currently not supported by your browser, use keyboard shortcut(Ctrl+V) instead.',
+	ajaxLoading : 'Loading ...',
+	uploadLoading : 'Uploading ...',
+	uploadError : 'Upload Error',
+	'plainpaste.comment' : 'Use keyboard shortcut(Ctrl+V) to paste the text into the window.',
+	'wordpaste.comment' : 'Use keyboard shortcut(Ctrl+V) to paste the text into the window.',
+	'code.pleaseInput' : 'Please input code.',
+	'link.url' : 'URL',
+	'link.linkType' : 'Target',
+	'link.newWindow' : 'New window',
+	'link.selfWindow' : 'Same window',
+	'flash.url' : 'URL',
+	'flash.width' : 'Width',
+	'flash.height' : 'Height',
+	'flash.upload' : 'Upload',
+	'flash.viewServer' : 'Browse',
+	'media.url' : 'URL',
+	'media.width' : 'Width',
+	'media.height' : 'Height',
+	'media.autostart' : 'Auto start',
+	'media.upload' : 'Upload',
+	'media.viewServer' : 'Browse',
+	'image.remoteImage' : 'Insert URL',
+	'image.localImage' : 'Upload',
+	'image.remoteUrl' : 'URL',
+	'image.localUrl' : 'File',
+	'image.size' : 'Size',
+	'image.width' : 'Width',
+	'image.height' : 'Height',
+	'image.resetSize' : 'Reset dimensions',
+	'image.align' : 'Align',
+	'image.defaultAlign' : 'Default',
+	'image.leftAlign' : 'Left',
+	'image.rightAlign' : 'Right',
+	'image.imgTitle' : 'Title',
+	'image.upload' : 'Browse',
+	'image.viewServer' : 'Browse',
+	'multiimage.uploadDesc' : 'Allows users to upload <%=uploadLimit%> images, single image size not exceeding <%=sizeLimit%>',
+	'multiimage.startUpload' : 'Start upload',
+	'multiimage.clearAll' : 'Clear all',
+	'multiimage.insertAll' : 'Insert all',
+	'multiimage.queueLimitExceeded' : 'Queue limit exceeded.',
+	'multiimage.fileExceedsSizeLimit' : 'File exceeds size limit.',
+	'multiimage.zeroByteFile' : 'Zero byte file.',
+	'multiimage.invalidFiletype' : 'Invalid file type.',
+	'multiimage.unknownError' : 'Unknown upload error.',
+	'multiimage.pending' : 'Pending ...',
+	'multiimage.uploadError' : 'Upload error',
+	'filemanager.emptyFolder' : 'Blank',
+	'filemanager.moveup' : 'Parent folder',
+	'filemanager.viewType' : 'Display: ',
+	'filemanager.viewImage' : 'Thumbnails',
+	'filemanager.listImage' : 'List',
+	'filemanager.orderType' : 'Sorting: ',
+	'filemanager.fileName' : 'By name',
+	'filemanager.fileSize' : 'By size',
+	'filemanager.fileType' : 'By type',
+	'insertfile.url' : 'URL',
+	'insertfile.title' : 'Title',
+	'insertfile.upload' : 'Upload',
+	'insertfile.viewServer' : 'Browse',
+	'table.cells' : 'Cells',
+	'table.rows' : 'Rows',
+	'table.cols' : 'Columns',
+	'table.size' : 'Dimensions',
+	'table.width' : 'Width',
+	'table.height' : 'Height',
+	'table.percent' : '%',
+	'table.px' : 'px',
+	'table.space' : 'Space',
+	'table.padding' : 'Padding',
+	'table.spacing' : 'Spacing',
+	'table.align' : 'Align',
+	'table.textAlign' : 'Horizontal',
+	'table.verticalAlign' : 'Vertical',
+	'table.alignDefault' : 'Default',
+	'table.alignLeft' : 'Left',
+	'table.alignCenter' : 'Center',
+	'table.alignRight' : 'Right',
+	'table.alignTop' : 'Top',
+	'table.alignMiddle' : 'Middle',
+	'table.alignBottom' : 'Bottom',
+	'table.alignBaseline' : 'Baseline',
+	'table.border' : 'Border',
+	'table.borderWidth' : 'Width',
+	'table.borderColor' : 'Color',
+	'table.backgroundColor' : 'Background',
+	'map.address' : 'Address: ',
+	'map.search' : 'Search',
+	'baidumap.address' : 'Address: ',
+	'baidumap.search' : 'Search',
+	'baidumap.insertDynamicMap' : 'Dynamic Map',
+	'anchor.name' : 'Anchor name',
+	'formatblock.formatBlock' : {
+		h1 : 'Heading 1',
+		h2 : 'Heading 2',
+		h3 : 'Heading 3',
+		h4 : 'Heading 4',
+		p : 'Normal'
+	},
+	'fontname.fontName' : {
+		'Arial' : 'Arial',
+		'Arial Black' : 'Arial Black',
+		'Comic Sans MS' : 'Comic Sans MS',
+		'Courier New' : 'Courier New',
+		'Garamond' : 'Garamond',
+		'Georgia' : 'Georgia',
+		'Tahoma' : 'Tahoma',
+		'Times New Roman' : 'Times New Roman',
+		'Trebuchet MS' : 'Trebuchet MS',
+		'Verdana' : 'Verdana'
+	},
+	'lineheight.lineHeight' : [
+		{'1' : 'Line height 1'},
+		{'1.5' : 'Line height 1.5'},
+		{'2' : 'Line height 2'},
+		{'2.5' : 'Line height 2.5'},
+		{'3' : 'Line height 3'}
+	],
+	'template.selectTemplate' : 'Template',
+	'template.replaceContent' : 'Replace current content',
+	'template.fileList' : {
+		'1.html' : 'Image and Text',
+		'2.html' : 'Table',
+		'3.html' : 'List'
+	}
+}, 'en');
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/lang/ko.js b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/lang/ko.js
new file mode 100644
index 0000000..2341042
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/lang/ko.js
@@ -0,0 +1,237 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Composite <ukjinplant@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.lang({
+	source : '소스',
+	preview : '미리보기',
+	undo : '작업취소(Ctrl+Z)',
+	redo : '작업재개(Ctrl+Y)',
+	cut : '잘라내기(Ctrl+X)',
+	copy : '복사(Ctrl+C)',
+	paste : '붙여넣기(Ctrl+V)',
+	plainpaste : '일반 텍스트로 붙여넣기',
+	wordpaste : '워드 문서로 붙여넣기',
+	selectall : '전체 선택',
+	justifyleft : '왼쪽 정렬',
+	justifycenter : '가운데 정렬',
+	justifyright : '오른쪽 정렬',
+	justifyfull : '양쪽 정렬',
+	insertorderedlist : '순서 목록',
+	insertunorderedlist : '비순서 목록',
+	indent : '들여쓰기',
+	outdent : '내어쓰기',
+	subscript : '아랫첨자',
+	superscript : '윗첨자',
+	formatblock : '문단 형식',
+	fontname : '글꼴',
+	fontsize : '글자 크기',
+	forecolor : '글자색',
+	hilitecolor : '강조색',
+	bold : '굵게(Ctrl+B)',
+	italic : '이텔릭(Ctrl+I)',
+	underline : '빝줄(Ctrl+U)',
+	strikethrough : '취소선',
+	removeformat : '형식 제거',
+	image : '이미지 추가',
+	multiimage : '여러 이미지 추가',
+	flash : '플래시 추가',
+	media : '미디어 추가',
+	table : '표',
+	tablecell : '열',
+	hr : '구분선 추가',
+	emoticons : '이모티콘 추가',
+	link : '링크',
+	unlink : '링크 제거',
+	fullscreen : '전체 화면 모드',
+	about : '이 에디터는...',
+	print : '인쇄',
+	filemanager : '파일 관리자',
+	code : '코드 추가',
+	map : '구글 맵 추가',
+	baidumap : '바이두 맵 추가',
+	lineheight : '행 간격',
+	clearhtml : 'HTML 코드 정리',
+	pagebreak : '페이지 구분 추가',
+	quickformat : '빠른 형식',
+	insertfile : '파일 추가',
+	template : '템플릿 추가',
+	anchor : '책갈피',
+	yes : '확인',
+	no : '취소',
+	close : '닫기',
+	editImage : '이미지 속성',
+	deleteImage : '이미지 삭제',
+	editFlash : '플래시 속성',
+	deleteFlash : '플래시 삭제',
+	editMedia : '미디어 속성',
+	deleteMedia : '미디어 삭제',
+	editLink : '링크 속성',
+	deleteLink : '링크 삭제',
+	tableprop : '표 속성',
+	tablecellprop : '열 속성',
+	tableinsert : '표 추가',
+	tabledelete : '표 삭제',
+	tablecolinsertleft : '왼쪽으로 열 추가',
+	tablecolinsertright : '오른쪽으로 열 추가',
+	tablerowinsertabove : '위쪽으로 열 추가',
+	tablerowinsertbelow : '아래쪽으로 열 추가',
+	tablerowmerge : '아래로 병합',
+	tablecolmerge : '오른쪽으로 병합',
+	tablerowsplit : '행 나누기',
+	tablecolsplit : '열 나누기',
+	tablecoldelete : '열 삭제',
+	tablerowdelete : '행 삭제',
+	noColor : '기본색',
+	pleaseSelectFile : '파일 선택',
+	invalidImg : "올바른 주소를 입력하세요.\njpg,gif,bmp,png 형식이 가능합니다.",
+	invalidMedia : "올바른 주소를 입력하세요.\nswf,flv,mp3,wav,wma,wmv,mid,avi,mpg,asf,rm,rmvb 형식이 가능합니다.",
+	invalidWidth : "넓이 값은 숫자여야 합니다.",
+	invalidHeight : "높이 값은 숫자여야 합니다.",
+	invalidBorder : "굵기 값은 숫자여야 합니다.",
+	invalidUrl : "올바른 주소를 입력하세요.",
+	invalidRows : '올바른 행이 아닙니다.',
+	invalidCols : '올바른 열이 아닙니다.',
+	invalidPadding : '안쪽 여백 값은 숫자여야 합니다.',
+	invalidSpacing : '간격 길이 값은 숫자여야 합니다.',
+	invalidJson : '올바른 JSON 형식이 아닙니다.',
+	uploadSuccess : '업로드가 완료되었습니다.',
+	cutError : '브라우저가 잘라내기 기능을 지원하지 않습니다, 단축키로 대신 사용하세요. (Ctrl+X)',
+	copyError : '브라우저가 복사 기능을 지원하지 않습니다, 단축키로 대신 사용하세요. (Ctrl+X)',
+	pasteError : '브라우저가 붙여넣기 기능을 지원하지 않습니다, 단축키로 대신 사용하세요. (Ctrl+X)',
+	ajaxLoading : '불러오는 중 ...',
+	uploadLoading : '업로드 중 ...',
+	uploadError : '업로드 오류',
+	'plainpaste.comment' : '단축키(Ctrl+V)를 통하여 여기에 텍스트를 붙여넣으세요.',
+	'wordpaste.comment' : '단축키(Ctrl+V)를 통하여 여기에 워드 텍스트를 붙여넣으세요.',
+	'code.pleaseInput' : 'Please input code.',
+	'link.url' : '주소',
+	'link.linkType' : '창',
+	'link.newWindow' : '새 창',
+	'link.selfWindow' : '현재 창',
+	'flash.url' : '주소',
+	'flash.width' : '넓이',
+	'flash.height' : '높이',
+	'flash.upload' : '업로드',
+	'flash.viewServer' : '찾아보기',
+	'media.url' : '주소',
+	'media.width' : '넓이',
+	'media.height' : '높이',
+	'media.autostart' : '자동 시작',
+	'media.upload' : '업로드',
+	'media.viewServer' : '찾아보기',
+	'image.remoteImage' : '외부 이미지',
+	'image.localImage' : '내부 이미지',
+	'image.remoteUrl' : '주소',
+	'image.localUrl' : '파일',
+	'image.size' : '크기',
+	'image.width' : '넓이',
+	'image.height' : '높이',
+	'image.resetSize' : '기본 크기로',
+	'image.align' : '정렬',
+	'image.defaultAlign' : '기본',
+	'image.leftAlign' : '왼쪽',
+	'image.rightAlign' : '오른쪽',
+	'image.imgTitle' : '제목',
+	'image.upload' : '찾아보기',
+	'image.viewServer' : '찾아보기',
+	'multiimage.uploadDesc' : '최대 이미지 개수: <%=uploadLimit%>개, 개당 이미지 크기: <%=sizeLimit%>',
+	'multiimage.startUpload' : '업로드 시작',
+	'multiimage.clearAll' : '모두 삭제',
+	'multiimage.insertAll' : '모두 삽입',
+	'multiimage.queueLimitExceeded' : '업로드 개수가 초과되었습니다.',
+	'multiimage.fileExceedsSizeLimit' : '업로드 크기가 초과되었습니다.',
+	'multiimage.zeroByteFile' : '파일 크기가 없습니다.',
+	'multiimage.invalidFiletype' : '올바른 이미지가 아닙니다.',
+	'multiimage.unknownError' : '알 수 없는 업로드 오류가 발생하였습니다.',
+	'multiimage.pending' : '처리 중 ...',
+	'multiimage.uploadError' : '업로드 오류',
+	'filemanager.emptyFolder' : '빈 폴더',
+	'filemanager.moveup' : '위로',
+	'filemanager.viewType' : '보기 방식: ',
+	'filemanager.viewImage' : '미리 보기',
+	'filemanager.listImage' : '목록',
+	'filemanager.orderType' : '정렬 방식: ',
+	'filemanager.fileName' : '이름별',
+	'filemanager.fileSize' : '크기별',
+	'filemanager.fileType' : '종류별',
+	'insertfile.url' : '주소',
+	'insertfile.title' : '제목',
+	'insertfile.upload' : '업로드',
+	'insertfile.viewServer' : '찾아보기',
+	'table.cells' : '열',
+	'table.rows' : '행',
+	'table.cols' : '열',
+	'table.size' : '표 크기',
+	'table.width' : '넓이',
+	'table.height' : '높이',
+	'table.percent' : '%',
+	'table.px' : 'px',
+	'table.space' : '간격',
+	'table.padding' : '안쪽여백',
+	'table.spacing' : '간격',
+	'table.align' : '정렬',
+	'table.textAlign' : '수직',
+	'table.verticalAlign' : '수평',
+	'table.alignDefault' : '기본',
+	'table.alignLeft' : '왼쪽',
+	'table.alignCenter' : '가운데',
+	'table.alignRight' : '오른쪽',
+	'table.alignTop' : '위쪽',
+	'table.alignMiddle' : '중간',
+	'table.alignBottom' : '아래쪽',
+	'table.alignBaseline' : '글자기준',
+	'table.border' : '테두리',
+	'table.borderWidth' : '크기',
+	'table.borderColor' : '색상',
+	'table.backgroundColor' : '배경',
+	'map.address' : '주소: ',
+	'map.search' : '검색',
+	'baidumap.address' : '주소: ',
+	'baidumap.search' : '검색',
+	'baidumap.insertDynamicMap' : '동적 지도',
+	'anchor.name' : '책갈피명',
+	'formatblock.formatBlock' : {
+		h1 : '제목 1',
+		h2 : '제목 2',
+		h3 : '제목 3',
+		h4 : '제목 4',
+		p : '본문'
+	},
+	'fontname.fontName' : {
+		'Gulim' : '굴림',
+		'Dotum' : '돋움',
+		'Batang' : '바탕',
+		'Gungsuh' : '궁서',
+		'Malgun Gothic' : '맑은 고딕',
+		'Arial' : 'Arial',
+		'Arial Black' : 'Arial Black',
+		'Comic Sans MS' : 'Comic Sans MS',
+		'Courier New' : 'Courier New',
+		'Garamond' : 'Garamond',
+		'Georgia' : 'Georgia',
+		'Tahoma' : 'Tahoma',
+		'Times New Roman' : 'Times New Roman',
+		'Trebuchet MS' : 'Trebuchet MS',
+		'Verdana' : 'Verdana'
+	},
+	'lineheight.lineHeight' : [
+		{'1' : '행간 1'},
+		{'1.5' : '행간 1.5'},
+		{'2' : '행간 2'},
+		{'2.5' : '행간 2.5'},
+		{'3' : '행간 3'}
+	],
+	'template.selectTemplate' : '템플릿',
+	'template.replaceContent' : '내용 바꾸기',
+	'template.fileList' : {
+		'1.html' : '이미지와 텍스트',
+		'2.html' : '표',
+		'3.html' : '목록'
+	}
+}, 'ko');
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/lang/zh_CN.js b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/lang/zh_CN.js
new file mode 100644
index 0000000..c8506f3
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/lang/zh_CN.js
@@ -0,0 +1,236 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.lang({
+	source : 'HTML代码',
+	preview : '预览',
+	undo : '后退(Ctrl+Z)',
+	redo : '前进(Ctrl+Y)',
+	cut : '剪切(Ctrl+X)',
+	copy : '复制(Ctrl+C)',
+	paste : '粘贴(Ctrl+V)',
+	plainpaste : '粘贴为无格式文本',
+	wordpaste : '从Word粘贴',
+	selectall : '全选(Ctrl+A)',
+	justifyleft : '左对齐',
+	justifycenter : '居中',
+	justifyright : '右对齐',
+	justifyfull : '两端对齐',
+	insertorderedlist : '编号',
+	insertunorderedlist : '项目符号',
+	indent : '增加缩进',
+	outdent : '减少缩进',
+	subscript : '下标',
+	superscript : '上标',
+	formatblock : '段落',
+	fontname : '字体',
+	fontsize : '文字大小',
+	forecolor : '文字颜色',
+	hilitecolor : '文字背景',
+	bold : '粗体(Ctrl+B)',
+	italic : '斜体(Ctrl+I)',
+	underline : '下划线(Ctrl+U)',
+	strikethrough : '删除线',
+	removeformat : '删除格式',
+	image : '图片',
+	multiimage : '批量图片上传',
+	flash : 'Flash',
+	media : '视音频',
+	table : '表格',
+	tablecell : '单元格',
+	hr : '插入横线',
+	emoticons : '插入表情',
+	link : '超级链接',
+	unlink : '取消超级链接',
+	fullscreen : '全屏显示',
+	about : '关于',
+	print : '打印(Ctrl+P)',
+	filemanager : '文件空间',
+	code : '插入程序代码',
+	map : 'Google地图',
+	baidumap : '百度地图',
+	lineheight : '行距',
+	clearhtml : '清理HTML代码',
+	pagebreak : '插入分页符',
+	quickformat : '一键排版',
+	insertfile : '插入文件',
+	template : '插入模板',
+	anchor : '锚点',
+	yes : '确定',
+	no : '取消',
+	close : '关闭',
+	editImage : '图片属性',
+	deleteImage : '删除图片',
+	editFlash : 'Flash属性',
+	deleteFlash : '删除Flash',
+	editMedia : '视音频属性',
+	deleteMedia : '删除视音频',
+	editLink : '超级链接属性',
+	deleteLink : '取消超级链接',
+	editAnchor : '锚点属性',
+	deleteAnchor : '删除锚点',
+	tableprop : '表格属性',
+	tablecellprop : '单元格属性',
+	tableinsert : '插入表格',
+	tabledelete : '删除表格',
+	tablecolinsertleft : '左侧插入列',
+	tablecolinsertright : '右侧插入列',
+	tablerowinsertabove : '上方插入行',
+	tablerowinsertbelow : '下方插入行',
+	tablerowmerge : '向下合并单元格',
+	tablecolmerge : '向右合并单元格',
+	tablerowsplit : '拆分行',
+	tablecolsplit : '拆分列',
+	tablecoldelete : '删除列',
+	tablerowdelete : '删除行',
+	noColor : '无颜色',
+	pleaseSelectFile : '请选择文件。',
+	invalidImg : "请输入有效的URL地址。\n只允许jpg,gif,bmp,png格式。",
+	invalidMedia : "请输入有效的URL地址。\n只允许swf,flv,mp3,wav,wma,wmv,mid,avi,mpg,asf,rm,rmvb格式。",
+	invalidWidth : "宽度必须为数字。",
+	invalidHeight : "高度必须为数字。",
+	invalidBorder : "边框必须为数字。",
+	invalidUrl : "请输入有效的URL地址。",
+	invalidRows : '行数为必选项，只允许输入大于0的数字。',
+	invalidCols : '列数为必选项，只允许输入大于0的数字。',
+	invalidPadding : '边距必须为数字。',
+	invalidSpacing : '间距必须为数字。',
+	invalidJson : '服务器发生故障。',
+	uploadSuccess : '上传成功。',
+	cutError : '您的浏览器安全设置不允许使用剪切操作，请使用快捷键(Ctrl+X)来完成。',
+	copyError : '您的浏览器安全设置不允许使用复制操作，请使用快捷键(Ctrl+C)来完成。',
+	pasteError : '您的浏览器安全设置不允许使用粘贴操作，请使用快捷键(Ctrl+V)来完成。',
+	ajaxLoading : '加载中，请稍候 ...',
+	uploadLoading : '上传中，请稍候 ...',
+	uploadError : '上传错误',
+	'plainpaste.comment' : '请使用快捷键(Ctrl+V)把内容粘贴到下面的方框里。',
+	'wordpaste.comment' : '请使用快捷键(Ctrl+V)把内容粘贴到下面的方框里。',
+	'code.pleaseInput' : '请输入程序代码。',
+	'link.url' : 'URL',
+	'link.linkType' : '打开类型',
+	'link.newWindow' : '新窗口',
+	'link.selfWindow' : '当前窗口',
+	'flash.url' : 'URL',
+	'flash.width' : '宽度',
+	'flash.height' : '高度',
+	'flash.upload' : '上传',
+	'flash.viewServer' : '文件空间',
+	'media.url' : 'URL',
+	'media.width' : '宽度',
+	'media.height' : '高度',
+	'media.autostart' : '自动播放',
+	'media.upload' : '上传',
+	'media.viewServer' : '文件空间',
+	'image.remoteImage' : '网络图片',
+	'image.localImage' : '本地上传',
+	'image.remoteUrl' : '图片地址',
+	'image.localUrl' : '上传文件',
+	'image.size' : '图片大小',
+	'image.width' : '宽',
+	'image.height' : '高',
+	'image.resetSize' : '重置大小',
+	'image.align' : '对齐方式',
+	'image.defaultAlign' : '默认方式',
+	'image.leftAlign' : '左对齐',
+	'image.rightAlign' : '右对齐',
+	'image.imgTitle' : '图片说明',
+	'image.upload' : '浏览...',
+	'image.viewServer' : '图片空间',
+	'multiimage.uploadDesc' : '允许用户同时上传<%=uploadLimit%>张图片，单张图片容量不超过<%=sizeLimit%>',
+	'multiimage.startUpload' : '开始上传',
+	'multiimage.clearAll' : '全部清空',
+	'multiimage.insertAll' : '全部插入',
+	'multiimage.queueLimitExceeded' : '文件数量超过限制。',
+	'multiimage.fileExceedsSizeLimit' : '文件大小超过限制。',
+	'multiimage.zeroByteFile' : '无法上传空文件。',
+	'multiimage.invalidFiletype' : '文件类型不正确。',
+	'multiimage.unknownError' : '发生异常，无法上传。',
+	'multiimage.pending' : '等待上传',
+	'multiimage.uploadError' : '上传失败',
+	'filemanager.emptyFolder' : '空文件夹',
+	'filemanager.moveup' : '移到上一级文件夹',
+	'filemanager.viewType' : '显示方式：',
+	'filemanager.viewImage' : '缩略图',
+	'filemanager.listImage' : '详细信息',
+	'filemanager.orderType' : '排序方式：',
+	'filemanager.fileName' : '名称',
+	'filemanager.fileSize' : '大小',
+	'filemanager.fileType' : '类型',
+	'insertfile.url' : 'URL',
+	'insertfile.title' : '文件说明',
+	'insertfile.upload' : '上传',
+	'insertfile.viewServer' : '文件空间',
+	'table.cells' : '单元格数',
+	'table.rows' : '行数',
+	'table.cols' : '列数',
+	'table.size' : '大小',
+	'table.width' : '宽度',
+	'table.height' : '高度',
+	'table.percent' : '%',
+	'table.px' : 'px',
+	'table.space' : '边距间距',
+	'table.padding' : '边距',
+	'table.spacing' : '间距',
+	'table.align' : '对齐方式',
+	'table.textAlign' : '水平对齐',
+	'table.verticalAlign' : '垂直对齐',
+	'table.alignDefault' : '默认',
+	'table.alignLeft' : '左对齐',
+	'table.alignCenter' : '居中',
+	'table.alignRight' : '右对齐',
+	'table.alignTop' : '顶部',
+	'table.alignMiddle' : '中部',
+	'table.alignBottom' : '底部',
+	'table.alignBaseline' : '基线',
+	'table.border' : '边框',
+	'table.borderWidth' : '边框',
+	'table.borderColor' : '颜色',
+	'table.backgroundColor' : '背景颜色',
+	'map.address' : '地址: ',
+	'map.search' : '搜索',
+	'baidumap.address' : '地址: ',
+	'baidumap.search' : '搜索',
+	'baidumap.insertDynamicMap' : '插入动态地图',
+	'anchor.name' : '锚点名称',
+	'formatblock.formatBlock' : {
+		h1 : '标题 1',
+		h2 : '标题 2',
+		h3 : '标题 3',
+		h4 : '标题 4',
+		p : '正 文'
+	},
+	'fontname.fontName' : {
+		'SimSun' : '宋体',
+		'NSimSun' : '新宋体',
+		'FangSong_GB2312' : '仿宋_GB2312',
+		'KaiTi_GB2312' : '楷体_GB2312',
+		'SimHei' : '黑体',
+		'Microsoft YaHei' : '微软雅黑',
+		'Arial' : 'Arial',
+		'Arial Black' : 'Arial Black',
+		'Times New Roman' : 'Times New Roman',
+		'Courier New' : 'Courier New',
+		'Tahoma' : 'Tahoma',
+		'Verdana' : 'Verdana'
+	},
+	'lineheight.lineHeight' : [
+		{'1' : '单倍行距'},
+		{'1.5' : '1.5倍行距'},
+		{'2' : '2倍行距'},
+		{'2.5' : '2.5倍行距'},
+		{'3' : '3倍行距'}
+	],
+	'template.selectTemplate' : '可选模板',
+	'template.replaceContent' : '替换当前内容',
+	'template.fileList' : {
+		'1.html' : '图片和文字',
+		'2.html' : '表格',
+		'3.html' : '项目编号'
+	}
+}, 'zh_CN');
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/lang/zh_TW.js b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/lang/zh_TW.js
new file mode 100644
index 0000000..ceac2af
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/lang/zh_TW.js
@@ -0,0 +1,235 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.lang({
+	source : '原始碼',
+	preview : '預覽',
+	undo : '復原(Ctrl+Z)',
+	redo : '重複(Ctrl+Y)',
+	cut : '剪下(Ctrl+X)',
+	copy : '複製(Ctrl+C)',
+	paste : '貼上(Ctrl+V)',
+	plainpaste : '貼為純文字格式',
+	wordpaste : '自Word貼上',
+	selectall : '全選(Ctrl+A)',
+	justifyleft : '靠左對齊',
+	justifycenter : '置中',
+	justifyright : '靠右對齊',
+	justifyfull : '左右對齊',
+	insertorderedlist : '編號清單',
+	insertunorderedlist : '項目清單',
+	indent : '增加縮排',
+	outdent : '減少縮排',
+	subscript : '下標',
+	superscript : '上標',
+	formatblock : '標題',
+	fontname : '字體',
+	fontsize : '文字大小',
+	forecolor : '文字顏色',
+	hilitecolor : '背景顏色',
+	bold : '粗體(Ctrl+B)',
+	italic : '斜體(Ctrl+I)',
+	underline : '底線(Ctrl+U)',
+	strikethrough : '刪除線',
+	removeformat : '清除格式',
+	image : '影像',
+	multiimage : '批量影像上傳',
+	flash : 'Flash',
+	media : '多媒體',
+	table : '表格',
+	hr : '插入水平線',
+	emoticons : '插入表情',
+	link : '超連結',
+	unlink : '移除超連結',
+	fullscreen : '最大化',
+	about : '關於',
+	print : '列印(Ctrl+P)',
+	fileManager : '瀏覽伺服器',
+	code : '插入程式代碼',
+	map : 'Google地圖',
+	baidumap : 'Baidu地圖',
+	lineheight : '行距',
+	clearhtml : '清理HTML代碼',
+	pagebreak : '插入分頁符號',
+	quickformat : '快速排版',
+	insertfile : '插入文件',
+	template : '插入樣板',
+	anchor : '錨點',
+	yes : '確定',
+	no : '取消',
+	close : '關閉',
+	editImage : '影像屬性',
+	deleteImage : '刪除影像',
+	editFlash : 'Flash屬性',
+	deleteFlash : '删除Flash',
+	editMedia : '多媒體屬性',
+	deleteMedia : '删除多媒體',
+	editLink : '超連結屬性',
+	deleteLink : '移除超連結',
+	tableprop : '表格屬性',
+	tablecellprop : '儲存格屬性',
+	tableinsert : '插入表格',
+	tabledelete : '刪除表格',
+	tablecolinsertleft : '向左插入列',
+	tablecolinsertright : '向右插入列',
+	tablerowinsertabove : '向上插入欄',
+	tablerowinsertbelow : '下方插入欄',
+	tablerowmerge : '向下合併單元格',
+	tablecolmerge : '向右合併單元格',
+	tablerowsplit : '分割欄',
+	tablecolsplit : '分割列',
+	tablecoldelete : '删除列',
+	tablerowdelete : '删除欄',
+	noColor : '自動',
+	pleaseSelectFile : '請選擇文件。',
+	invalidImg : "請輸入有效的URL。\n只允許jpg,gif,bmp,png格式。",
+	invalidMedia : "請輸入有效的URL。\n只允許swf,flv,mp3,wav,wma,wmv,mid,avi,mpg,asf,rm,rmvb格式。",
+	invalidWidth : "寬度必須是數字。",
+	invalidHeight : "高度必須是數字。",
+	invalidBorder : "邊框必須是數字。",
+	invalidUrl : "請輸入有效的URL。",
+	invalidRows : '欄數是必須輸入項目，只允許輸入大於0的數字。',
+	invalidCols : '列數是必須輸入項目，只允許輸入大於0的數字。',
+	invalidPadding : '內距必須是數字。',
+	invalidSpacing : '間距必須是數字。',
+	invalidBorder : '边框必须为数字。',
+	pleaseInput : "請輸入內容。",
+	invalidJson : '伺服器發生故障。',
+	uploadSuccess : '上傳成功。',
+	cutError : '您的瀏覽器安全設置不允許使用剪下操作，請使用快捷鍵(Ctrl+X)完成。',
+	copyError : '您的瀏覽器安全設置不允許使用剪下操作，請使用快捷鍵(Ctrl+C)完成。',
+	pasteError : '您的瀏覽器安全設置不允許使用剪下操作，請使用快捷鍵(Ctrl+V)完成。',
+	ajaxLoading : '加載中，請稍候 ...',
+	uploadLoading : '上傳中，請稍候 ...',
+	uploadError : '上傳錯誤',
+	'plainpaste.comment' : '請使用快捷鍵(Ctrl+V)把內容貼到下方區域裡。',
+	'wordpaste.comment' : '請使用快捷鍵(Ctrl+V)把內容貼到下方區域裡。',
+	'code.pleaseInput' : 'Please input code.',
+	'link.url' : 'URL',
+	'link.linkType' : '打開類型',
+	'link.newWindow' : '新窗口',
+	'link.selfWindow' : '本頁窗口',
+	'flash.url' : 'URL',
+	'flash.width' : '寬度',
+	'flash.height' : '高度',
+	'flash.upload' : '上傳',
+	'flash.viewServer' : '瀏覽',
+	'media.url' : 'URL',
+	'media.width' : '寬度',
+	'media.height' : '高度',
+	'media.autostart' : '自動播放',
+	'media.upload' : '上傳',
+	'media.viewServer' : '瀏覽',
+	'image.remoteImage' : '網絡影像',
+	'image.localImage' : '上傳影像',
+	'image.remoteUrl' : '影像URL',
+	'image.localUrl' : '影像URL',
+	'image.size' : '影像大小',
+	'image.width' : '寬度',
+	'image.height' : '高度',
+	'image.resetSize' : '原始大小',
+	'image.align' : '對齊方式',
+	'image.defaultAlign' : '未設定',
+	'image.leftAlign' : '向左對齊',
+	'image.rightAlign' : '向右對齊',
+	'image.imgTitle' : '影像說明',
+	'image.upload' : '瀏覽...',
+	'image.viewServer' : '瀏覽...',
+	'multiimage.uploadDesc' : 'Allows users to upload <%=uploadLimit%> images, single image size not exceeding <%=sizeLimit%>',
+	'multiimage.startUpload' : 'Start upload',
+	'multiimage.clearAll' : 'Clear all',
+	'multiimage.insertAll' : 'Insert all',
+	'multiimage.queueLimitExceeded' : 'Queue limit exceeded.',
+	'multiimage.fileExceedsSizeLimit' : 'File exceeds size limit.',
+	'multiimage.zeroByteFile' : 'Zero byte file.',
+	'multiimage.invalidFiletype' : 'Invalid file type.',
+	'multiimage.unknownError' : 'Unknown upload error.',
+	'multiimage.pending' : 'Pending ...',
+	'multiimage.uploadError' : 'Upload error',
+	'filemanager.emptyFolder' : '空文件夾',
+	'filemanager.moveup' : '至上一級文件夾',
+	'filemanager.viewType' : '顯示方式：',
+	'filemanager.viewImage' : '縮略圖',
+	'filemanager.listImage' : '詳細信息',
+	'filemanager.orderType' : '排序方式：',
+	'filemanager.fileName' : '名稱',
+	'filemanager.fileSize' : '大小',
+	'filemanager.fileType' : '類型',
+	'insertfile.url' : 'URL',
+	'insertfile.title' : '文件說明',
+	'insertfile.upload' : '上傳',
+	'insertfile.viewServer' : '瀏覽',
+	'table.cells' : '儲存格數',
+	'table.rows' : '欄數',
+	'table.cols' : '列數',
+	'table.size' : '表格大小',
+	'table.width' : '寬度',
+	'table.height' : '高度',
+	'table.percent' : '%',
+	'table.px' : 'px',
+	'table.space' : '內距間距',
+	'table.padding' : '內距',
+	'table.spacing' : '間距',
+	'table.align' : '對齊方式',
+	'table.textAlign' : '水平對齊',
+	'table.verticalAlign' : '垂直對齊',
+	'table.alignDefault' : '未設定',
+	'table.alignLeft' : '向左對齊',
+	'table.alignCenter' : '置中',
+	'table.alignRight' : '向右對齊',
+	'table.alignTop' : '靠上',
+	'table.alignMiddle' : '置中',
+	'table.alignBottom' : '靠下',
+	'table.alignBaseline' : '基線',
+	'table.border' : '表格邊框',
+	'table.borderWidth' : '邊框',
+	'table.borderColor' : '顏色',
+	'table.backgroundColor' : '背景顏色',
+	'map.address' : '住所: ',
+	'map.search' : '尋找',
+	'baidumap.address' : '住所: ',
+	'baidumap.search' : '尋找',
+	'baidumap.insertDynamicMap' : '插入動態地圖',
+	'anchor.name' : '錨點名稱',
+	'formatblock.formatBlock' : {
+		h1 : '標題 1',
+		h2 : '標題 2',
+		h3 : '標題 3',
+		h4 : '標題 4',
+		p : '一般'
+	},
+	'fontname.fontName' : {
+		'MingLiU' : '細明體',
+		'PMingLiU' : '新細明體',
+		'DFKai-SB' : '標楷體',
+		'SimSun' : '宋體',
+		'NSimSun' : '新宋體',
+		'FangSong' : '仿宋體',
+		'Arial' : 'Arial',
+		'Arial Black' : 'Arial Black',
+		'Times New Roman' : 'Times New Roman',
+		'Courier New' : 'Courier New',
+		'Tahoma' : 'Tahoma',
+		'Verdana' : 'Verdana'
+	},
+	'lineheight.lineHeight' : [
+		{'1' : '单倍行距'},
+		{'1.5' : '1.5倍行距'},
+		{'2' : '2倍行距'},
+		{'2.5' : '2.5倍行距'},
+		{'3' : '3倍行距'}
+	],
+	'template.selectTemplate' : '可選樣板',
+	'template.replaceContent' : '取代當前內容',
+	'template.fileList' : {
+		'1.html' : '影像和文字',
+		'2.html' : '表格',
+		'3.html' : '项目清單'
+	}
+}, 'zh_TW');
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/license.txt b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/license.txt
new file mode 100644
index 0000000..4362b49
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/license.txt
@@ -0,0 +1,502 @@
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/anchor/anchor.js b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/anchor/anchor.js
new file mode 100644
index 0000000..55ab894
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/anchor/anchor.js
@@ -0,0 +1,46 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('anchor', function(K) {
+	var self = this, name = 'anchor', lang = self.lang(name + '.');
+	self.plugin.anchor = {
+		edit : function() {
+			var html = ['<div style="padding:20px;">',
+					'<div class="ke-dialog-row">',
+					'<label for="keName">' + lang.name + '</label>',
+					'<input class="ke-input-text" type="text" id="keName" name="name" value="" style="width:100px;" />',
+					'</div>',
+					'</div>'].join('');
+			var dialog = self.createDialog({
+				name : name,
+				width : 300,
+				title : self.lang(name),
+				body : html,
+				yesBtn : {
+					name : self.lang('yes'),
+					click : function(e) {
+						self.insertHtml('<a name="' + nameBox.val() + '">').hideDialog().focus();
+					}
+				}
+			});
+			var div = dialog.div,
+				nameBox = K('input[name="name"]', div);
+			var img = self.plugin.getSelectedAnchor();
+			if (img) {
+				nameBox.val(unescape(img.attr('data-ke-name')));
+			}
+			nameBox[0].focus();
+			nameBox[0].select();
+		},
+		'delete' : function() {
+			self.plugin.getSelectedAnchor().remove();
+		}
+	};
+	self.clickToolbar(name, self.plugin.anchor.edit);
+});
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/autoheight/autoheight.js b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/autoheight/autoheight.js
new file mode 100644
index 0000000..546578b
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/autoheight/autoheight.js
@@ -0,0 +1,54 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('autoheight', function(K) {
+	var self = this;
+
+	if (!self.autoHeightMode) {
+		return;
+	}
+
+	var minHeight;
+
+	function hideScroll() {
+		var edit = self.edit;
+		var body = edit.doc.body;
+		edit.iframe[0].scroll = 'no';
+		body.style.overflowY = 'hidden';
+	}
+
+	function resetHeight() {
+		var edit = self.edit;
+		var body = edit.doc.body;
+		edit.iframe.height(minHeight);
+		self.resize(null, Math.max((K.IE ? body.scrollHeight : body.offsetHeight) + 76, minHeight));
+	}
+
+	function init() {
+		minHeight = K.removeUnit(self.height);
+
+		self.edit.afterChange(resetHeight);
+		hideScroll();
+		resetHeight();
+	}
+
+	if (self.isCreated) {
+		init();
+	} else {
+		self.afterCreate(init);
+	}
+});
+
+/*
+* 如何实现真正的自动高度？
+* 修改编辑器高度之后，再次获取body内容高度时，最小值只会是当前iframe的设置高度，这样就导致高度只增不减。
+* 所以每次获取body内容高度之前，先将iframe的高度重置为最小高度，这样就能获取body的实际高度。
+* 由此就实现了真正的自动高度
+* 测试：chrome、firefox、IE9、IE8
+* */
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/baidumap/baidumap.js b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/baidumap/baidumap.js
new file mode 100644
index 0000000..12751c4
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/baidumap/baidumap.js
@@ -0,0 +1,93 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+// Baidu Maps: http://dev.baidu.com/wiki/map/index.php?title=%E9%A6%96%E9%A1%B5
+
+KindEditor.plugin('baidumap', function(K) {
+	var self = this, name = 'baidumap', lang = self.lang(name + '.');
+	var mapWidth = K.undef(self.mapWidth, 558);
+	var mapHeight = K.undef(self.mapHeight, 360);
+	self.clickToolbar(name, function() {
+		var html = ['<div style="padding:10px 20px;">',
+			'<div class="ke-header">',
+			// left start
+			'<div class="ke-left">',
+			lang.address + ' <input id="kindeditor_plugin_map_address" name="address" class="ke-input-text" value="" style="width:200px;" /> ',
+			'<span class="ke-button-common ke-button-outer">',
+			'<input type="button" name="searchBtn" class="ke-button-common ke-button" value="' + lang.search + '" />',
+			'</span>',
+			'</div>',
+			// right start
+			'<div class="ke-right">',
+			'<input type="checkbox" id="keInsertDynamicMap" name="insertDynamicMap" value="1" /> <label for="keInsertDynamicMap">' + lang.insertDynamicMap + '</label>',
+			'</div>',
+			'<div class="ke-clearfix"></div>',
+			'</div>',
+			'<div class="ke-map" style="width:' + mapWidth + 'px;height:' + mapHeight + 'px;"></div>',
+			'</div>'].join('');
+		var dialog = self.createDialog({
+			name : name,
+			width : mapWidth + 42,
+			title : self.lang(name),
+			body : html,
+			yesBtn : {
+				name : self.lang('yes'),
+				click : function(e) {
+					var map = win.map;
+					var centerObj = map.getCenter();
+					var center = centerObj.lng + ',' + centerObj.lat;
+					var zoom = map.getZoom();
+					var url = [checkbox[0].checked ? self.pluginsPath + 'baidumap/index.html' : 'http://api.map.baidu.com/staticimage',
+						'?center=' + encodeURIComponent(center),
+						'&zoom=' + encodeURIComponent(zoom),
+						'&width=' + mapWidth,
+						'&height=' + mapHeight,
+						'&markers=' + encodeURIComponent(center),
+						'&markerStyles=' + encodeURIComponent('l,A')].join('');
+					if (checkbox[0].checked) {
+						self.insertHtml('<iframe src="' + url + '" frameborder="0" style="width:' + (mapWidth + 2) + 'px;height:' + (mapHeight + 2) + 'px;"></iframe>');
+					} else {
+						self.exec('insertimage', url);
+					}
+					self.hideDialog().focus();
+				}
+			},
+			beforeRemove : function() {
+				searchBtn.remove();
+				if (doc) {
+					doc.write('');
+				}
+				iframe.remove();
+			}
+		});
+		var div = dialog.div,
+			addressBox = K('[name="address"]', div),
+			searchBtn = K('[name="searchBtn"]', div),
+			checkbox = K('[name="insertDynamicMap"]', dialog.div),
+			win, doc;
+		var iframe = K('<iframe class="ke-textarea" frameborder="0" src="' + self.pluginsPath + 'baidumap/map.html" style="width:' + mapWidth + 'px;height:' + mapHeight + 'px;"></iframe>');
+		function ready() {
+			win = iframe[0].contentWindow;
+			doc = K.iframeDoc(iframe);
+		}
+		iframe.bind('load', function() {
+			iframe.unbind('load');
+			if (K.IE) {
+				ready();
+			} else {
+				setTimeout(ready, 0);
+			}
+		});
+		K('.ke-map', div).replaceWith(iframe);
+		// search map
+		searchBtn.click(function() {
+			win.search(addressBox.val());
+		});
+	});
+});
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/baidumap/index.html b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/baidumap/index.html
new file mode 100644
index 0000000..e106d1a
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/baidumap/index.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta charset="utf-8" />
+<meta name="keywords" content="百度地图,百度地图API，百度地图自定义工具，百度地图所见即所得工具" />
+<meta name="description" content="百度地图API自定义地图，帮助用户在可视化操作下生成百度地图" />
+<title>百度地图API自定义地图</title>
+<!--引用百度地图API-->
+<style type="text/css">
+	html,body{margin:0;padding:0;}
+	.iw_poi_title {color:#CC5522;font-size:14px;font-weight:bold;overflow:hidden;padding-right:13px;white-space:nowrap}
+	.iw_poi_content {font:12px arial,sans-serif;overflow:visible;padding-top:4px;white-space:-moz-pre-wrap;word-wrap:break-word}
+</style>
+<script type="text/javascript" src="http://api.map.baidu.com/api?key=&v=1.1&services=true"></script>
+</head>
+
+<body onload="initMap();">
+  <!--百度地图容器-->
+  <div style="width:697px;height:550px;border:#ccc solid 1px;" id="dituContent"></div>
+</body>
+<script type="text/javascript">
+	function getParam(name) {
+		return location.href.match(new RegExp('[?&]' + name + '=([^?&]+)', 'i')) ? decodeURIComponent(RegExp.$1) : '';
+	}
+	var centerParam = getParam('center');
+	var zoomParam = getParam('zoom');
+	var widthParam = getParam('width');
+	var heightParam = getParam('height');
+	var markersParam = getParam('markers');
+	var markerStylesParam = getParam('markerStyles');
+
+	//创建和初始化地图函数：
+	function initMap(){
+		// [FF]切换模式后报错
+		if (!window.BMap) {
+			return;
+		}
+		var dituContent = document.getElementById('dituContent');
+		dituContent.style.width = widthParam + 'px';
+		dituContent.style.height = heightParam + 'px';
+
+		createMap();//创建地图
+		setMapEvent();//设置地图事件
+		addMapControl();//向地图添加控件
+
+		// 创建标注
+		var markersArr = markersParam.split(',');
+		var point = new BMap.Point(markersArr[0], markersArr[1]);
+		var marker = new BMap.Marker(point);
+		map.addOverlay(marker); // 将标注添加到地图中
+	}
+
+	//创建地图函数：
+	function createMap(){
+		var map = new BMap.Map("dituContent");//在百度地图容器中创建一个地图
+		var centerArr = centerParam.split(',');
+		var point = new BMap.Point(centerArr[0], centerArr[1]);//定义一个中心点坐标
+		map.centerAndZoom(point, zoomParam);//设定地图的中心点和坐标并将地图显示在地图容器中
+		window.map = map;//将map变量存储在全局
+	}
+
+	//地图事件设置函数：
+	function setMapEvent(){
+		map.enableDragging();//启用地图拖拽事件，默认启用(可不写)
+		map.enableScrollWheelZoom();//启用地图滚轮放大缩小
+		map.enableDoubleClickZoom();//启用鼠标双击放大，默认启用(可不写)
+		map.enableKeyboard();//启用键盘上下左右键移动地图
+	}
+
+	//地图控件添加函数：
+	function addMapControl(){
+		//向地图中添加缩放控件
+	var ctrl_nav = new BMap.NavigationControl({anchor:BMAP_ANCHOR_TOP_LEFT,type:BMAP_NAVIGATION_CONTROL_LARGE});
+	map.addControl(ctrl_nav);
+		//向地图中添加缩略图控件
+	var ctrl_ove = new BMap.OverviewMapControl({anchor:BMAP_ANCHOR_BOTTOM_RIGHT,isOpen:1});
+	map.addControl(ctrl_ove);
+		//向地图中添加比例尺控件
+	var ctrl_sca = new BMap.ScaleControl({anchor:BMAP_ANCHOR_BOTTOM_LEFT});
+	map.addControl(ctrl_sca);
+	}
+</script>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/baidumap/map.html b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/baidumap/map.html
new file mode 100644
index 0000000..b65ea1d
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/baidumap/map.html
@@ -0,0 +1,43 @@
+<!doctype html>
+<html>
+	<head>
+		<meta charset="utf-8" />
+		<title>Baidu Maps</title>
+		<style>
+			html { height: 100% }
+			body { height: 100%; margin: 0; padding: 0; background-color: #FFF }
+		</style>
+		<script charset="utf-8" src="http://api.map.baidu.com/api?v=1.3"></script>
+		<script>
+			var map, geocoder;
+			function initialize() {
+				map = new BMap.Map('map_canvas');
+				var point = new BMap.Point(121.473704, 31.230393);
+				map.centerAndZoom(point, 11);
+				map.addControl(new BMap.NavigationControl());
+				map.enableScrollWheelZoom();
+
+				var gc = new BMap.Geocoder();
+				gc.getLocation(point, function(rs){
+					var addComp = rs.addressComponents;
+					var address = [addComp.city].join('');
+					parent.document.getElementById("kindeditor_plugin_map_address").value = address;
+				});
+			}
+			function search(address) {
+				if (!map) return;
+				var local = new BMap.LocalSearch(map, {
+					renderOptions: {
+						map: map,
+						autoViewport: true,
+						selectFirstResult: false
+					}
+				});
+				local.search(address);
+			}
+		</script>
+	</head>
+	<body onload="initialize();">
+		<div id="map_canvas" style="width:100%; height:100%"></div>
+	</body>
+</html>
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/clearhtml/clearhtml.js b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/clearhtml/clearhtml.js
new file mode 100644
index 0000000..1bf0e5d
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/clearhtml/clearhtml.js
@@ -0,0 +1,29 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('clearhtml', function(K) {
+	var self = this, name = 'clearhtml';
+	self.clickToolbar(name, function() {
+		self.focus();
+		var html = self.html();
+		html = html.replace(/(<script[^>]*>)([\s\S]*?)(<\/script>)/ig, '');
+		html = html.replace(/(<style[^>]*>)([\s\S]*?)(<\/style>)/ig, '');
+		html = K.formatHtml(html, {
+			a : ['href', 'target'],
+			embed : ['src', 'width', 'height', 'type', 'loop', 'autostart', 'quality', '.width', '.height', 'align', 'allowscriptaccess'],
+			img : ['src', 'width', 'height', 'border', 'alt', 'title', '.width', '.height'],
+			table : ['border'],
+			'td,th' : ['rowspan', 'colspan'],
+			'div,hr,br,tbody,tr,p,ol,ul,li,blockquote,h1,h2,h3,h4,h5,h6' : []
+		});
+		self.html(html);
+		self.cmd.selection(true);
+		self.addBookmark();
+	});
+});
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/code/code.js b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/code/code.js
new file mode 100644
index 0000000..85e4225
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/code/code.js
@@ -0,0 +1,62 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+// google code prettify: http://google-code-prettify.googlecode.com/
+// http://google-code-prettify.googlecode.com/
+
+KindEditor.plugin('code', function(K) {
+	var self = this, name = 'code';
+	self.clickToolbar(name, function() {
+		var lang = self.lang(name + '.'),
+			html = ['<div style="padding:10px 20px;">',
+				'<div class="ke-dialog-row">',
+				'<select class="ke-code-type">',
+				'<option value="js">JavaScript</option>',
+				'<option value="html">HTML</option>',
+				'<option value="css">CSS</option>',
+				'<option value="php">PHP</option>',
+				'<option value="pl">Perl</option>',
+				'<option value="py">Python</option>',
+				'<option value="rb">Ruby</option>',
+				'<option value="java">Java</option>',
+				'<option value="vb">ASP/VB</option>',
+				'<option value="cpp">C/C++</option>',
+				'<option value="cs">C#</option>',
+				'<option value="xml">XML</option>',
+				'<option value="bsh">Shell</option>',
+				'<option value="">Other</option>',
+				'</select>',
+				'</div>',
+				'<textarea class="ke-textarea" style="width:408px;height:260px;"></textarea>',
+				'</div>'].join(''),
+			dialog = self.createDialog({
+				name : name,
+				width : 450,
+				title : self.lang(name),
+				body : html,
+				yesBtn : {
+					name : self.lang('yes'),
+					click : function(e) {
+						var type = K('.ke-code-type', dialog.div).val(),
+							code = textarea.val(),
+							cls = type === '' ? '' :  ' lang-' + type,
+							html = '<pre class="prettyprint' + cls + '">\n' + K.escape(code) + '</pre> ';
+						if (K.trim(code) === '') {
+							alert(lang.pleaseInput);
+							textarea[0].focus();
+							return;
+						}
+						self.insertHtml(html).hideDialog().focus();
+					}
+				}
+			}),
+			textarea = K('textarea', dialog.div);
+		textarea[0].focus();
+	});
+});
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/code/prettify.css b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/code/prettify.css
new file mode 100644
index 0000000..b8287e5
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/code/prettify.css
@@ -0,0 +1,13 @@
+.pln{color:#000}@media screen{.str{color:#080}.kwd{color:#008}.com{color:#800}.typ{color:#606}.lit{color:#066}.pun,.opn,.clo{color:#660}.tag{color:#008}.atn{color:#606}.atv{color:#080}.dec,.var{color:#606}.fun{color:red}}@media print,projection{.str{color:#060}.kwd{color:#006;font-weight:bold}.com{color:#600;font-style:italic}.typ{color:#404;font-weight:bold}.lit{color:#044}.pun,.opn,.clo{color:#440}.tag{color:#006;font-weight:bold}.atn{color:#404}.atv{color:#060}}pre.prettyprint{padding:2px;border:1px solid #888}ol.linenums{margin-top:0;margin-bottom:0}li.L0,li.L1,li.L2,li.L3,li.L5,li.L6,li.L7,li.L8{list-style-type:none}li.L1,li.L3,li.L5,li.L7,li.L9{background:#eee}
+
+pre.prettyprint {
+	border: 0;
+	border-left: 3px solid rgb(204, 204, 204);
+	margin-left: 2em;
+	padding: 0.5em;
+	font-size: 110%;
+	display: block;
+	font-family: "Consolas", "Monaco", "Bitstream Vera Sans Mono", "Courier New", Courier, monospace;
+	margin: 1em 0px;
+	white-space: pre;
+}
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/code/prettify.js b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/code/prettify.js
new file mode 100644
index 0000000..eef5ad7
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/code/prettify.js
@@ -0,0 +1,28 @@
+var q=null;window.PR_SHOULD_USE_CONTINUATION=!0;
+(function(){function L(a){function m(a){var f=a.charCodeAt(0);if(f!==92)return f;var b=a.charAt(1);return(f=r[b])?f:"0"<=b&&b<="7"?parseInt(a.substring(1),8):b==="u"||b==="x"?parseInt(a.substring(2),16):a.charCodeAt(1)}function e(a){if(a<32)return(a<16?"\\x0":"\\x")+a.toString(16);a=String.fromCharCode(a);if(a==="\\"||a==="-"||a==="["||a==="]")a="\\"+a;return a}function h(a){for(var f=a.substring(1,a.length-1).match(/\\u[\dA-Fa-f]{4}|\\x[\dA-Fa-f]{2}|\\[0-3][0-7]{0,2}|\\[0-7]{1,2}|\\[\S\s]|[^\\]/g),a=
+[],b=[],o=f[0]==="^",c=o?1:0,i=f.length;c<i;++c){var j=f[c];if(/\\[bdsw]/i.test(j))a.push(j);else{var j=m(j),d;c+2<i&&"-"===f[c+1]?(d=m(f[c+2]),c+=2):d=j;b.push([j,d]);d<65||j>122||(d<65||j>90||b.push([Math.max(65,j)|32,Math.min(d,90)|32]),d<97||j>122||b.push([Math.max(97,j)&-33,Math.min(d,122)&-33]))}}b.sort(function(a,f){return a[0]-f[0]||f[1]-a[1]});f=[];j=[NaN,NaN];for(c=0;c<b.length;++c)i=b[c],i[0]<=j[1]+1?j[1]=Math.max(j[1],i[1]):f.push(j=i);b=["["];o&&b.push("^");b.push.apply(b,a);for(c=0;c<
+f.length;++c)i=f[c],b.push(e(i[0])),i[1]>i[0]&&(i[1]+1>i[0]&&b.push("-"),b.push(e(i[1])));b.push("]");return b.join("")}function y(a){for(var f=a.source.match(/\[(?:[^\\\]]|\\[\S\s])*]|\\u[\dA-Fa-f]{4}|\\x[\dA-Fa-f]{2}|\\\d+|\\[^\dux]|\(\?[!:=]|[()^]|[^()[\\^]+/g),b=f.length,d=[],c=0,i=0;c<b;++c){var j=f[c];j==="("?++i:"\\"===j.charAt(0)&&(j=+j.substring(1))&&j<=i&&(d[j]=-1)}for(c=1;c<d.length;++c)-1===d[c]&&(d[c]=++t);for(i=c=0;c<b;++c)j=f[c],j==="("?(++i,d[i]===void 0&&(f[c]="(?:")):"\\"===j.charAt(0)&&
+(j=+j.substring(1))&&j<=i&&(f[c]="\\"+d[i]);for(i=c=0;c<b;++c)"^"===f[c]&&"^"!==f[c+1]&&(f[c]="");if(a.ignoreCase&&s)for(c=0;c<b;++c)j=f[c],a=j.charAt(0),j.length>=2&&a==="["?f[c]=h(j):a!=="\\"&&(f[c]=j.replace(/[A-Za-z]/g,function(a){a=a.charCodeAt(0);return"["+String.fromCharCode(a&-33,a|32)+"]"}));return f.join("")}for(var t=0,s=!1,l=!1,p=0,d=a.length;p<d;++p){var g=a[p];if(g.ignoreCase)l=!0;else if(/[a-z]/i.test(g.source.replace(/\\u[\da-f]{4}|\\x[\da-f]{2}|\\[^UXux]/gi,""))){s=!0;l=!1;break}}for(var r=
+{b:8,t:9,n:10,v:11,f:12,r:13},n=[],p=0,d=a.length;p<d;++p){g=a[p];if(g.global||g.multiline)throw Error(""+g);n.push("(?:"+y(g)+")")}return RegExp(n.join("|"),l?"gi":"g")}function M(a){function m(a){switch(a.nodeType){case 1:if(e.test(a.className))break;for(var g=a.firstChild;g;g=g.nextSibling)m(g);g=a.nodeName;if("BR"===g||"LI"===g)h[s]="\n",t[s<<1]=y++,t[s++<<1|1]=a;break;case 3:case 4:g=a.nodeValue,g.length&&(g=p?g.replace(/\r\n?/g,"\n"):g.replace(/[\t\n\r ]+/g," "),h[s]=g,t[s<<1]=y,y+=g.length,
+t[s++<<1|1]=a)}}var e=/(?:^|\s)nocode(?:\s|$)/,h=[],y=0,t=[],s=0,l;a.currentStyle?l=a.currentStyle.whiteSpace:window.getComputedStyle&&(l=document.defaultView.getComputedStyle(a,q).getPropertyValue("white-space"));var p=l&&"pre"===l.substring(0,3);m(a);return{a:h.join("").replace(/\n$/,""),c:t}}function B(a,m,e,h){m&&(a={a:m,d:a},e(a),h.push.apply(h,a.e))}function x(a,m){function e(a){for(var l=a.d,p=[l,"pln"],d=0,g=a.a.match(y)||[],r={},n=0,z=g.length;n<z;++n){var f=g[n],b=r[f],o=void 0,c;if(typeof b===
+"string")c=!1;else{var i=h[f.charAt(0)];if(i)o=f.match(i[1]),b=i[0];else{for(c=0;c<t;++c)if(i=m[c],o=f.match(i[1])){b=i[0];break}o||(b="pln")}if((c=b.length>=5&&"lang-"===b.substring(0,5))&&!(o&&typeof o[1]==="string"))c=!1,b="src";c||(r[f]=b)}i=d;d+=f.length;if(c){c=o[1];var j=f.indexOf(c),k=j+c.length;o[2]&&(k=f.length-o[2].length,j=k-c.length);b=b.substring(5);B(l+i,f.substring(0,j),e,p);B(l+i+j,c,C(b,c),p);B(l+i+k,f.substring(k),e,p)}else p.push(l+i,b)}a.e=p}var h={},y;(function(){for(var e=a.concat(m),
+l=[],p={},d=0,g=e.length;d<g;++d){var r=e[d],n=r[3];if(n)for(var k=n.length;--k>=0;)h[n.charAt(k)]=r;r=r[1];n=""+r;p.hasOwnProperty(n)||(l.push(r),p[n]=q)}l.push(/[\S\s]/);y=L(l)})();var t=m.length;return e}function u(a){var m=[],e=[];a.tripleQuotedStrings?m.push(["str",/^(?:'''(?:[^'\\]|\\[\S\s]|''?(?=[^']))*(?:'''|$)|"""(?:[^"\\]|\\[\S\s]|""?(?=[^"]))*(?:"""|$)|'(?:[^'\\]|\\[\S\s])*(?:'|$)|"(?:[^"\\]|\\[\S\s])*(?:"|$))/,q,"'\""]):a.multiLineStrings?m.push(["str",/^(?:'(?:[^'\\]|\\[\S\s])*(?:'|$)|"(?:[^"\\]|\\[\S\s])*(?:"|$)|`(?:[^\\`]|\\[\S\s])*(?:`|$))/,
+q,"'\"`"]):m.push(["str",/^(?:'(?:[^\n\r'\\]|\\.)*(?:'|$)|"(?:[^\n\r"\\]|\\.)*(?:"|$))/,q,"\"'"]);a.verbatimStrings&&e.push(["str",/^@"(?:[^"]|"")*(?:"|$)/,q]);var h=a.hashComments;h&&(a.cStyleComments?(h>1?m.push(["com",/^#(?:##(?:[^#]|#(?!##))*(?:###|$)|.*)/,q,"#"]):m.push(["com",/^#(?:(?:define|elif|else|endif|error|ifdef|include|ifndef|line|pragma|undef|warning)\b|[^\n\r]*)/,q,"#"]),e.push(["str",/^<(?:(?:(?:\.\.\/)*|\/?)(?:[\w-]+(?:\/[\w-]+)+)?[\w-]+\.h|[a-z]\w*)>/,q])):m.push(["com",/^#[^\n\r]*/,
+q,"#"]));a.cStyleComments&&(e.push(["com",/^\/\/[^\n\r]*/,q]),e.push(["com",/^\/\*[\S\s]*?(?:\*\/|$)/,q]));a.regexLiterals&&e.push(["lang-regex",/^(?:^^\.?|[!+-]|!=|!==|#|%|%=|&|&&|&&=|&=|\(|\*|\*=|\+=|,|-=|->|\/|\/=|:|::|;|<|<<|<<=|<=|=|==|===|>|>=|>>|>>=|>>>|>>>=|[?@[^]|\^=|\^\^|\^\^=|{|\||\|=|\|\||\|\|=|~|break|case|continue|delete|do|else|finally|instanceof|return|throw|try|typeof)\s*(\/(?=[^*/])(?:[^/[\\]|\\[\S\s]|\[(?:[^\\\]]|\\[\S\s])*(?:]|$))+\/)/]);(h=a.types)&&e.push(["typ",h]);a=(""+a.keywords).replace(/^ | $/g,
+"");a.length&&e.push(["kwd",RegExp("^(?:"+a.replace(/[\s,]+/g,"|")+")\\b"),q]);m.push(["pln",/^\s+/,q," \r\n\t\xa0"]);e.push(["lit",/^@[$_a-z][\w$@]*/i,q],["typ",/^(?:[@_]?[A-Z]+[a-z][\w$@]*|\w+_t\b)/,q],["pln",/^[$_a-z][\w$@]*/i,q],["lit",/^(?:0x[\da-f]+|(?:\d(?:_\d+)*\d*(?:\.\d*)?|\.\d\+)(?:e[+-]?\d+)?)[a-z]*/i,q,"0123456789"],["pln",/^\\[\S\s]?/,q],["pun",/^.[^\s\w"-$'./@\\`]*/,q]);return x(m,e)}function D(a,m){function e(a){switch(a.nodeType){case 1:if(k.test(a.className))break;if("BR"===a.nodeName)h(a),
+a.parentNode&&a.parentNode.removeChild(a);else for(a=a.firstChild;a;a=a.nextSibling)e(a);break;case 3:case 4:if(p){var b=a.nodeValue,d=b.match(t);if(d){var c=b.substring(0,d.index);a.nodeValue=c;(b=b.substring(d.index+d[0].length))&&a.parentNode.insertBefore(s.createTextNode(b),a.nextSibling);h(a);c||a.parentNode.removeChild(a)}}}}function h(a){function b(a,d){var e=d?a.cloneNode(!1):a,f=a.parentNode;if(f){var f=b(f,1),g=a.nextSibling;f.appendChild(e);for(var h=g;h;h=g)g=h.nextSibling,f.appendChild(h)}return e}
+for(;!a.nextSibling;)if(a=a.parentNode,!a)return;for(var a=b(a.nextSibling,0),e;(e=a.parentNode)&&e.nodeType===1;)a=e;d.push(a)}var k=/(?:^|\s)nocode(?:\s|$)/,t=/\r\n?|\n/,s=a.ownerDocument,l;a.currentStyle?l=a.currentStyle.whiteSpace:window.getComputedStyle&&(l=s.defaultView.getComputedStyle(a,q).getPropertyValue("white-space"));var p=l&&"pre"===l.substring(0,3);for(l=s.createElement("LI");a.firstChild;)l.appendChild(a.firstChild);for(var d=[l],g=0;g<d.length;++g)e(d[g]);m===(m|0)&&d[0].setAttribute("value",
+m);var r=s.createElement("OL");r.className="linenums";for(var n=Math.max(0,m-1|0)||0,g=0,z=d.length;g<z;++g)l=d[g],l.className="L"+(g+n)%10,l.firstChild||l.appendChild(s.createTextNode("\xa0")),r.appendChild(l);a.appendChild(r)}function k(a,m){for(var e=m.length;--e>=0;){var h=m[e];A.hasOwnProperty(h)?window.console&&console.warn("cannot override language handler %s",h):A[h]=a}}function C(a,m){if(!a||!A.hasOwnProperty(a))a=/^\s*</.test(m)?"default-markup":"default-code";return A[a]}function E(a){var m=
+a.g;try{var e=M(a.h),h=e.a;a.a=h;a.c=e.c;a.d=0;C(m,h)(a);var k=/\bMSIE\b/.test(navigator.userAgent),m=/\n/g,t=a.a,s=t.length,e=0,l=a.c,p=l.length,h=0,d=a.e,g=d.length,a=0;d[g]=s;var r,n;for(n=r=0;n<g;)d[n]!==d[n+2]?(d[r++]=d[n++],d[r++]=d[n++]):n+=2;g=r;for(n=r=0;n<g;){for(var z=d[n],f=d[n+1],b=n+2;b+2<=g&&d[b+1]===f;)b+=2;d[r++]=z;d[r++]=f;n=b}for(d.length=r;h<p;){var o=l[h+2]||s,c=d[a+2]||s,b=Math.min(o,c),i=l[h+1],j;if(i.nodeType!==1&&(j=t.substring(e,b))){k&&(j=j.replace(m,"\r"));i.nodeValue=
+j;var u=i.ownerDocument,v=u.createElement("SPAN");v.className=d[a+1];var x=i.parentNode;x.replaceChild(v,i);v.appendChild(i);e<o&&(l[h+1]=i=u.createTextNode(t.substring(b,o)),x.insertBefore(i,v.nextSibling))}e=b;e>=o&&(h+=2);e>=c&&(a+=2)}}catch(w){"console"in window&&console.log(w&&w.stack?w.stack:w)}}var v=["break,continue,do,else,for,if,return,while"],w=[[v,"auto,case,char,const,default,double,enum,extern,float,goto,int,long,register,short,signed,sizeof,static,struct,switch,typedef,union,unsigned,void,volatile"],
+"catch,class,delete,false,import,new,operator,private,protected,public,this,throw,true,try,typeof"],F=[w,"alignof,align_union,asm,axiom,bool,concept,concept_map,const_cast,constexpr,decltype,dynamic_cast,explicit,export,friend,inline,late_check,mutable,namespace,nullptr,reinterpret_cast,static_assert,static_cast,template,typeid,typename,using,virtual,where"],G=[w,"abstract,boolean,byte,extends,final,finally,implements,import,instanceof,null,native,package,strictfp,super,synchronized,throws,transient"],
+H=[G,"as,base,by,checked,decimal,delegate,descending,dynamic,event,fixed,foreach,from,group,implicit,in,interface,internal,into,is,lock,object,out,override,orderby,params,partial,readonly,ref,sbyte,sealed,stackalloc,string,select,uint,ulong,unchecked,unsafe,ushort,var"],w=[w,"debugger,eval,export,function,get,null,set,undefined,var,with,Infinity,NaN"],I=[v,"and,as,assert,class,def,del,elif,except,exec,finally,from,global,import,in,is,lambda,nonlocal,not,or,pass,print,raise,try,with,yield,False,True,None"],
+J=[v,"alias,and,begin,case,class,def,defined,elsif,end,ensure,false,in,module,next,nil,not,or,redo,rescue,retry,self,super,then,true,undef,unless,until,when,yield,BEGIN,END"],v=[v,"case,done,elif,esac,eval,fi,function,in,local,set,then,until"],K=/^(DIR|FILE|vector|(de|priority_)?queue|list|stack|(const_)?iterator|(multi)?(set|map)|bitset|u?(int|float)\d*)/,N=/\S/,O=u({keywords:[F,H,w,"caller,delete,die,do,dump,elsif,eval,exit,foreach,for,goto,if,import,last,local,my,next,no,our,print,package,redo,require,sub,undef,unless,until,use,wantarray,while,BEGIN,END"+
+I,J,v],hashComments:!0,cStyleComments:!0,multiLineStrings:!0,regexLiterals:!0}),A={};k(O,["default-code"]);k(x([],[["pln",/^[^<?]+/],["dec",/^<!\w[^>]*(?:>|$)/],["com",/^<\!--[\S\s]*?(?:--\>|$)/],["lang-",/^<\?([\S\s]+?)(?:\?>|$)/],["lang-",/^<%([\S\s]+?)(?:%>|$)/],["pun",/^(?:<[%?]|[%?]>)/],["lang-",/^<xmp\b[^>]*>([\S\s]+?)<\/xmp\b[^>]*>/i],["lang-js",/^<script\b[^>]*>([\S\s]*?)(<\/script\b[^>]*>)/i],["lang-css",/^<style\b[^>]*>([\S\s]*?)(<\/style\b[^>]*>)/i],["lang-in.tag",/^(<\/?[a-z][^<>]*>)/i]]),
+["default-markup","htm","html","mxml","xhtml","xml","xsl"]);k(x([["pln",/^\s+/,q," \t\r\n"],["atv",/^(?:"[^"]*"?|'[^']*'?)/,q,"\"'"]],[["tag",/^^<\/?[a-z](?:[\w-.:]*\w)?|\/?>$/i],["atn",/^(?!style[\s=]|on)[a-z](?:[\w:-]*\w)?/i],["lang-uq.val",/^=\s*([^\s"'>]*(?:[^\s"'/>]|\/(?=\s)))/],["pun",/^[/<->]+/],["lang-js",/^on\w+\s*=\s*"([^"]+)"/i],["lang-js",/^on\w+\s*=\s*'([^']+)'/i],["lang-js",/^on\w+\s*=\s*([^\s"'>]+)/i],["lang-css",/^style\s*=\s*"([^"]+)"/i],["lang-css",/^style\s*=\s*'([^']+)'/i],["lang-css",
+/^style\s*=\s*([^\s"'>]+)/i]]),["in.tag"]);k(x([],[["atv",/^[\S\s]+/]]),["uq.val"]);k(u({keywords:F,hashComments:!0,cStyleComments:!0,types:K}),["c","cc","cpp","cxx","cyc","m"]);k(u({keywords:"null,true,false"}),["json"]);k(u({keywords:H,hashComments:!0,cStyleComments:!0,verbatimStrings:!0,types:K}),["cs"]);k(u({keywords:G,cStyleComments:!0}),["java"]);k(u({keywords:v,hashComments:!0,multiLineStrings:!0}),["bsh","csh","sh"]);k(u({keywords:I,hashComments:!0,multiLineStrings:!0,tripleQuotedStrings:!0}),
+["cv","py"]);k(u({keywords:"caller,delete,die,do,dump,elsif,eval,exit,foreach,for,goto,if,import,last,local,my,next,no,our,print,package,redo,require,sub,undef,unless,until,use,wantarray,while,BEGIN,END",hashComments:!0,multiLineStrings:!0,regexLiterals:!0}),["perl","pl","pm"]);k(u({keywords:J,hashComments:!0,multiLineStrings:!0,regexLiterals:!0}),["rb"]);k(u({keywords:w,cStyleComments:!0,regexLiterals:!0}),["js"]);k(u({keywords:"all,and,by,catch,class,else,extends,false,finally,for,if,in,is,isnt,loop,new,no,not,null,of,off,on,or,return,super,then,true,try,unless,until,when,while,yes",
+hashComments:3,cStyleComments:!0,multilineStrings:!0,tripleQuotedStrings:!0,regexLiterals:!0}),["coffee"]);k(x([],[["str",/^[\S\s]+/]]),["regex"]);window.prettyPrintOne=function(a,m,e){var h=document.createElement("PRE");h.innerHTML=a;e&&D(h,e);E({g:m,i:e,h:h});return h.innerHTML};window.prettyPrint=function(a){function m(){for(var e=window.PR_SHOULD_USE_CONTINUATION?l.now()+250:Infinity;p<h.length&&l.now()<e;p++){var n=h[p],k=n.className;if(k.indexOf("prettyprint")>=0){var k=k.match(g),f,b;if(b=
+!k){b=n;for(var o=void 0,c=b.firstChild;c;c=c.nextSibling)var i=c.nodeType,o=i===1?o?b:c:i===3?N.test(c.nodeValue)?b:o:o;b=(f=o===b?void 0:o)&&"CODE"===f.tagName}b&&(k=f.className.match(g));k&&(k=k[1]);b=!1;for(o=n.parentNode;o;o=o.parentNode)if((o.tagName==="pre"||o.tagName==="code"||o.tagName==="xmp")&&o.className&&o.className.indexOf("prettyprint")>=0){b=!0;break}b||((b=(b=n.className.match(/\blinenums\b(?::(\d+))?/))?b[1]&&b[1].length?+b[1]:!0:!1)&&D(n,b),d={g:k,h:n,i:b},E(d))}}p<h.length?setTimeout(m,
+250):a&&a()}for(var e=[document.getElementsByTagName("pre"),document.getElementsByTagName("code"),document.getElementsByTagName("xmp")],h=[],k=0;k<e.length;++k)for(var t=0,s=e[k].length;t<s;++t)h.push(e[k][t]);var e=q,l=Date;l.now||(l={now:function(){return+new Date}});var p=0,d,g=/\blang(?:uage)?-([\w.]+)(?!\S)/;m()};window.PR={createSimpleLexer:x,registerLangHandler:k,sourceDecorator:u,PR_ATTRIB_NAME:"atn",PR_ATTRIB_VALUE:"atv",PR_COMMENT:"com",PR_DECLARATION:"dec",PR_KEYWORD:"kwd",PR_LITERAL:"lit",
+PR_NOCODE:"nocode",PR_PLAIN:"pln",PR_PUNCTUATION:"pun",PR_SOURCE:"src",PR_STRING:"str",PR_TAG:"tag",PR_TYPE:"typ"}})();
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/emoticons.js b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/emoticons.js
new file mode 100644
index 0000000..a990066
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/emoticons.js
@@ -0,0 +1,129 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('emoticons', function(K) {
+	var self = this, name = 'emoticons',
+		path = (self.emoticonsPath || self.pluginsPath + 'emoticons/images/'),
+		allowPreview = self.allowPreviewEmoticons === undefined ? true : self.allowPreviewEmoticons,
+		currentPageNum = 1;
+	self.clickToolbar(name, function() {
+		var rows = 5, cols = 9, total = 135, startNum = 0,
+			cells = rows * cols, pages = Math.ceil(total / cells),
+			colsHalf = Math.floor(cols / 2),
+			wrapperDiv = K('<div class="ke-plugin-emoticons"></div>'),
+			elements = [],
+			menu = self.createMenu({
+				name : name,
+				beforeRemove : function() {
+					removeEvent();
+				}
+			});
+		menu.div.append(wrapperDiv);
+		var previewDiv, previewImg;
+		if (allowPreview) {
+			previewDiv = K('<div class="ke-preview"></div>').css('right', 0);
+			previewImg = K('<img class="ke-preview-img" src="' + path + startNum + '.gif" />');
+			wrapperDiv.append(previewDiv);
+			previewDiv.append(previewImg);
+		}
+		function bindCellEvent(cell, j, num) {
+			if (previewDiv) {
+				cell.mouseover(function() {
+					if (j > colsHalf) {
+						previewDiv.css('left', 0);
+						previewDiv.css('right', '');
+					} else {
+						previewDiv.css('left', '');
+						previewDiv.css('right', 0);
+					}
+					previewImg.attr('src', path + num + '.gif');
+					K(this).addClass('ke-on');
+				});
+			} else {
+				cell.mouseover(function() {
+					K(this).addClass('ke-on');
+				});
+			}
+			cell.mouseout(function() {
+				K(this).removeClass('ke-on');
+			});
+			cell.click(function(e) {
+				self.insertHtml('<img src="' + path + num + '.gif" border="0" alt="" />').hideMenu().focus();
+				e.stop();
+			});
+		}
+		function createEmoticonsTable(pageNum, parentDiv) {
+			var table = document.createElement('table');
+			parentDiv.append(table);
+			if (previewDiv) {
+				K(table).mouseover(function() {
+					previewDiv.show('block');
+				});
+				K(table).mouseout(function() {
+					previewDiv.hide();
+				});
+				elements.push(K(table));
+			}
+			table.className = 'ke-table';
+			table.cellPadding = 0;
+			table.cellSpacing = 0;
+			table.border = 0;
+			var num = (pageNum - 1) * cells + startNum;
+			for (var i = 0; i < rows; i++) {
+				var row = table.insertRow(i);
+				for (var j = 0; j < cols; j++) {
+					var cell = K(row.insertCell(j));
+					cell.addClass('ke-cell');
+					bindCellEvent(cell, j, num);
+					var span = K('<span class="ke-img"></span>')
+						.css('background-position', '-' + (24 * num) + 'px 0px')
+						.css('background-image', 'url(' + path + 'static.gif)');
+					cell.append(span);
+					elements.push(cell);
+					num++;
+				}
+			}
+			return table;
+		}
+		var table = createEmoticonsTable(currentPageNum, wrapperDiv);
+		function removeEvent() {
+			K.each(elements, function() {
+				this.unbind();
+			});
+		}
+		var pageDiv;
+		function bindPageEvent(el, pageNum) {
+			el.click(function(e) {
+				removeEvent();
+				table.parentNode.removeChild(table);
+				pageDiv.remove();
+				table = createEmoticonsTable(pageNum, wrapperDiv);
+				createPageTable(pageNum);
+				currentPageNum = pageNum;
+				e.stop();
+			});
+		}
+		function createPageTable(currentPageNum) {
+			pageDiv = K('<div class="ke-page"></div>');
+			wrapperDiv.append(pageDiv);
+			for (var pageNum = 1; pageNum <= pages; pageNum++) {
+				if (currentPageNum !== pageNum) {
+					var a = K('<a href="javascript:;">[' + pageNum + ']</a>');
+					bindPageEvent(a, pageNum);
+					pageDiv.append(a);
+					elements.push(a);
+				} else {
+					pageDiv.append(K('@[' + pageNum + ']'));
+				}
+				pageDiv.append(K('@&nbsp;'));
+			}
+		}
+		createPageTable(currentPageNum);
+	});
+});
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/0.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/0.gif
new file mode 100644
index 0000000..5be27cb
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/0.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/1.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/1.gif
new file mode 100644
index 0000000..a2644a9
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/1.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/10.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/10.gif
new file mode 100644
index 0000000..905c15b
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/10.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/100.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/100.gif
new file mode 100644
index 0000000..92ad35d
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/100.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/101.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/101.gif
new file mode 100644
index 0000000..1f27663
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/101.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/102.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/102.gif
new file mode 100644
index 0000000..748ded1
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/102.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/103.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/103.gif
new file mode 100644
index 0000000..be9eaa0
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/103.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/104.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/104.gif
new file mode 100644
index 0000000..d7c2066
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/104.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/105.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/105.gif
new file mode 100644
index 0000000..2f353ca
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/105.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/106.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/106.gif
new file mode 100644
index 0000000..5193534
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/106.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/107.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/107.gif
new file mode 100644
index 0000000..70d38d3
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/107.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/108.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/108.gif
new file mode 100644
index 0000000..749d500
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/108.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/109.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/109.gif
new file mode 100644
index 0000000..6f57d56
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/109.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/11.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/11.gif
new file mode 100644
index 0000000..b512dd5
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/11.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/110.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/110.gif
new file mode 100644
index 0000000..e253abc
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/110.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/111.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/111.gif
new file mode 100644
index 0000000..0c56723
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/111.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/112.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/112.gif
new file mode 100644
index 0000000..c8ddce8
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/112.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/113.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/113.gif
new file mode 100644
index 0000000..2727104
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/113.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/114.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/114.gif
new file mode 100644
index 0000000..53918e2
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/114.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/115.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/115.gif
new file mode 100644
index 0000000..4db3369
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/115.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/116.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/116.gif
new file mode 100644
index 0000000..57326bd
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/116.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/117.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/117.gif
new file mode 100644
index 0000000..14611b6
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/117.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/118.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/118.gif
new file mode 100644
index 0000000..8c25500
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/118.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/119.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/119.gif
new file mode 100644
index 0000000..65bb468
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/119.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/12.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/12.gif
new file mode 100644
index 0000000..547529c
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/12.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/120.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/120.gif
new file mode 100644
index 0000000..5ce77c0
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/120.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/121.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/121.gif
new file mode 100644
index 0000000..a021aba
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/121.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/122.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/122.gif
new file mode 100644
index 0000000..9a79e11
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/122.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/123.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/123.gif
new file mode 100644
index 0000000..b9480be
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/123.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/124.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/124.gif
new file mode 100644
index 0000000..7fed477
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/124.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/125.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/125.gif
new file mode 100644
index 0000000..e2c3c11
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/125.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/126.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/126.gif
new file mode 100644
index 0000000..24105c9
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/126.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/127.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/127.gif
new file mode 100644
index 0000000..0cead36
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/127.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/128.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/128.gif
new file mode 100644
index 0000000..3185861
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/128.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/129.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/129.gif
new file mode 100644
index 0000000..ffd7c6b
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/129.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/13.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/13.gif
new file mode 100644
index 0000000..3475300
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/13.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/130.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/130.gif
new file mode 100644
index 0000000..d828e3d
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/130.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/131.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/131.gif
new file mode 100644
index 0000000..dcb096f
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/131.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/132.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/132.gif
new file mode 100644
index 0000000..1b272a6
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/132.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/133.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/133.gif
new file mode 100644
index 0000000..0d0e864
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/133.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/134.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/134.gif
new file mode 100644
index 0000000..cf48356
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/134.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/14.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/14.gif
new file mode 100644
index 0000000..6a788f8
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/14.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/15.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/15.gif
new file mode 100644
index 0000000..debab8e
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/15.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/16.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/16.gif
new file mode 100644
index 0000000..ed5d29f
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/16.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/17.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/17.gif
new file mode 100644
index 0000000..85886fe
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/17.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/18.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/18.gif
new file mode 100644
index 0000000..b6af218
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/18.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/19.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/19.gif
new file mode 100644
index 0000000..e045ff2
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/19.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/2.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/2.gif
new file mode 100644
index 0000000..40cfda4
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/2.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/20.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/20.gif
new file mode 100644
index 0000000..efd650f
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/20.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/21.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/21.gif
new file mode 100644
index 0000000..cb8cf6d
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/21.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/22.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/22.gif
new file mode 100644
index 0000000..96b04df
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/22.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/23.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/23.gif
new file mode 100644
index 0000000..96516b8
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/23.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/24.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/24.gif
new file mode 100644
index 0000000..5f925c7
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/24.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/25.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/25.gif
new file mode 100644
index 0000000..97f8b1a
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/25.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/26.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/26.gif
new file mode 100644
index 0000000..a7cded7
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/26.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/27.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/27.gif
new file mode 100644
index 0000000..bb46890
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/27.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/28.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/28.gif
new file mode 100644
index 0000000..f59dd58
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/28.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/29.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/29.gif
new file mode 100644
index 0000000..3c5227e
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/29.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/3.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/3.gif
new file mode 100644
index 0000000..6d6f762
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/3.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/30.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/30.gif
new file mode 100644
index 0000000..e24a180
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/30.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/31.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/31.gif
new file mode 100644
index 0000000..073e743
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/31.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/32.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/32.gif
new file mode 100644
index 0000000..772eff2
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/32.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/33.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/33.gif
new file mode 100644
index 0000000..217c1c5
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/33.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/34.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/34.gif
new file mode 100644
index 0000000..e9d4213
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/34.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/35.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/35.gif
new file mode 100644
index 0000000..d6da2c3
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/35.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/36.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/36.gif
new file mode 100644
index 0000000..c1e6ac9
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/36.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/37.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/37.gif
new file mode 100644
index 0000000..92efec6
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/37.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/38.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/38.gif
new file mode 100644
index 0000000..489f0f9
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/38.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/39.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/39.gif
new file mode 100644
index 0000000..734f6d8
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/39.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/4.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/4.gif
new file mode 100644
index 0000000..6ccdaa2
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/4.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/40.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/40.gif
new file mode 100644
index 0000000..24a8eb6
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/40.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/41.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/41.gif
new file mode 100644
index 0000000..99139e1
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/41.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/42.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/42.gif
new file mode 100644
index 0000000..f60897e
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/42.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/43.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/43.gif
new file mode 100644
index 0000000..4350491
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/43.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/44.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/44.gif
new file mode 100644
index 0000000..650d3dd
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/44.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/45.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/45.gif
new file mode 100644
index 0000000..5c8e071
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/45.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/46.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/46.gif
new file mode 100644
index 0000000..f3cb074
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/46.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/47.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/47.gif
new file mode 100644
index 0000000..5b3057a
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/47.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/48.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/48.gif
new file mode 100644
index 0000000..27a30c1
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/48.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/49.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/49.gif
new file mode 100644
index 0000000..dcfa48a
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/49.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/5.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/5.gif
new file mode 100644
index 0000000..ab0b81b
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/5.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/50.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/50.gif
new file mode 100644
index 0000000..029cf0f
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/50.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/51.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/51.gif
new file mode 100644
index 0000000..69f183f
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/51.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/52.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/52.gif
new file mode 100644
index 0000000..d41e8aa
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/52.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/53.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/53.gif
new file mode 100644
index 0000000..56352dd
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/53.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/54.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/54.gif
new file mode 100644
index 0000000..b28d848
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/54.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/55.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/55.gif
new file mode 100644
index 0000000..e18da84
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/55.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/56.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/56.gif
new file mode 100644
index 0000000..edf96f0
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/56.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/57.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/57.gif
new file mode 100644
index 0000000..3f0e2b9
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/57.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/58.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/58.gif
new file mode 100644
index 0000000..47b1aaa
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/58.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/59.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/59.gif
new file mode 100644
index 0000000..918288b
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/59.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/6.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/6.gif
new file mode 100644
index 0000000..ceab122
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/6.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/60.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/60.gif
new file mode 100644
index 0000000..66d2113
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/60.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/61.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/61.gif
new file mode 100644
index 0000000..034933e
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/61.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/62.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/62.gif
new file mode 100644
index 0000000..8d5c4fd
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/62.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/63.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/63.gif
new file mode 100644
index 0000000..d58fcf6
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/63.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/64.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/64.gif
new file mode 100644
index 0000000..c4e00bd
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/64.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/65.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/65.gif
new file mode 100644
index 0000000..da23bfa
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/65.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/66.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/66.gif
new file mode 100644
index 0000000..310ec65
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/66.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/67.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/67.gif
new file mode 100644
index 0000000..51761ba
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/67.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/68.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/68.gif
new file mode 100644
index 0000000..345cb43
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/68.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/69.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/69.gif
new file mode 100644
index 0000000..e0f28a0
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/69.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/7.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/7.gif
new file mode 100644
index 0000000..2f45399
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/7.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/70.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/70.gif
new file mode 100644
index 0000000..24284cf
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/70.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/71.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/71.gif
new file mode 100644
index 0000000..a0ccf2e
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/71.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/72.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/72.gif
new file mode 100644
index 0000000..7e113ee
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/72.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/73.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/73.gif
new file mode 100644
index 0000000..c0293c3
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/73.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/74.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/74.gif
new file mode 100644
index 0000000..1c52bde
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/74.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/75.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/75.gif
new file mode 100644
index 0000000..9cb9aa7
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/75.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/76.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/76.gif
new file mode 100644
index 0000000..27019f8
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/76.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/77.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/77.gif
new file mode 100644
index 0000000..8f882f5
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/77.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/78.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/78.gif
new file mode 100644
index 0000000..d0d0856
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/78.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/79.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/79.gif
new file mode 100644
index 0000000..61652a7
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/79.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/8.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/8.gif
new file mode 100644
index 0000000..f6c8834
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/8.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/80.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/80.gif
new file mode 100644
index 0000000..9a77936
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/80.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/81.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/81.gif
new file mode 100644
index 0000000..2329101
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/81.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/82.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/82.gif
new file mode 100644
index 0000000..644748a
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/82.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/83.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/83.gif
new file mode 100644
index 0000000..fbf275b
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/83.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/84.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/84.gif
new file mode 100644
index 0000000..076f0c6
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/84.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/85.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/85.gif
new file mode 100644
index 0000000..d254af4
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/85.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/86.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/86.gif
new file mode 100644
index 0000000..8f09d33
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/86.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/87.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/87.gif
new file mode 100644
index 0000000..df70756
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/87.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/88.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/88.gif
new file mode 100644
index 0000000..4d8b15e
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/88.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/89.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/89.gif
new file mode 100644
index 0000000..05726dc
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/89.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/9.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/9.gif
new file mode 100644
index 0000000..c2d8450
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/9.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/90.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/90.gif
new file mode 100644
index 0000000..adaf20e
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/90.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/91.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/91.gif
new file mode 100644
index 0000000..608d0ad
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/91.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/92.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/92.gif
new file mode 100644
index 0000000..b909e16
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/92.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/93.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/93.gif
new file mode 100644
index 0000000..7f71a8c
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/93.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/94.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/94.gif
new file mode 100644
index 0000000..4f26d7d
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/94.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/95.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/95.gif
new file mode 100644
index 0000000..5ef6d38
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/95.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/96.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/96.gif
new file mode 100644
index 0000000..2b709e1
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/96.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/97.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/97.gif
new file mode 100644
index 0000000..cf29be8
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/97.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/98.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/98.gif
new file mode 100644
index 0000000..c70e7d3
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/98.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/99.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/99.gif
new file mode 100644
index 0000000..05c1863
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/99.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/static.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/static.gif
new file mode 100644
index 0000000..b8c444b
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/static.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/filemanager/filemanager.js b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/filemanager/filemanager.js
new file mode 100644
index 0000000..fd899af
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/filemanager/filemanager.js
@@ -0,0 +1,189 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('filemanager', function(K) {
+	var self = this, name = 'filemanager',
+		fileManagerJson = K.undef(self.fileManagerJson, self.basePath + 'php/file_manager_json.php'),
+		imgPath = self.pluginsPath + name + '/images/',
+		lang = self.lang(name + '.');
+	function makeFileTitle(filename, filesize, datetime) {
+		return filename + ' (' + Math.ceil(filesize / 1024) + 'KB, ' + datetime + ')';
+	}
+	function bindTitle(el, data) {
+		if (data.is_dir) {
+			el.attr('title', data.filename);
+		} else {
+			el.attr('title', makeFileTitle(data.filename, data.filesize, data.datetime));
+		}
+	}
+	self.plugin.filemanagerDialog = function(options) {
+		var width = K.undef(options.width, 650),
+			height = K.undef(options.height, 510),
+			dirName = K.undef(options.dirName, ''),
+			viewType = K.undef(options.viewType, 'VIEW').toUpperCase(), // "LIST" or "VIEW"
+			clickFn = options.clickFn;
+		var html = [
+			'<div style="padding:10px 20px;">',
+			// header start
+			'<div class="ke-plugin-filemanager-header">',
+			// left start
+			'<div class="ke-left">',
+			'<img class="ke-inline-block" name="moveupImg" src="' + imgPath + 'go-up.gif" width="16" height="16" border="0" alt="" /> ',
+			'<a class="ke-inline-block" name="moveupLink" href="javascript:;">' + lang.moveup + '</a>',
+			'</div>',
+			// right start
+			'<div class="ke-right">',
+			lang.viewType + ' <select class="ke-inline-block" name="viewType">',
+			'<option value="VIEW">' + lang.viewImage + '</option>',
+			'<option value="LIST">' + lang.listImage + '</option>',
+			'</select> ',
+			lang.orderType + ' <select class="ke-inline-block" name="orderType">',
+			'<option value="NAME">' + lang.fileName + '</option>',
+			'<option value="SIZE">' + lang.fileSize + '</option>',
+			'<option value="TYPE">' + lang.fileType + '</option>',
+			'</select>',
+			'</div>',
+			'<div class="ke-clearfix"></div>',
+			'</div>',
+			// body start
+			'<div class="ke-plugin-filemanager-body"></div>',
+			'</div>'
+		].join('');
+		var dialog = self.createDialog({
+			name : name,
+			width : width,
+			height : height,
+			title : self.lang(name),
+			body : html
+		}),
+		div = dialog.div,
+		bodyDiv = K('.ke-plugin-filemanager-body', div),
+		moveupImg = K('[name="moveupImg"]', div),
+		moveupLink = K('[name="moveupLink"]', div),
+		viewServerBtn = K('[name="viewServer"]', div),
+		viewTypeBox = K('[name="viewType"]', div),
+		orderTypeBox = K('[name="orderType"]', div);
+		function reloadPage(path, order, func) {
+			var param = 'path=' + path + '&order=' + order + '&dir=' + dirName;
+			dialog.showLoading(self.lang('ajaxLoading'));
+			K.ajax(K.addParam(fileManagerJson, param + '&' + new Date().getTime()), function(data) {
+				dialog.hideLoading();
+				func(data);
+			});
+		}
+		var elList = [];
+		function bindEvent(el, result, data, createFunc) {
+			var fileUrl = K.formatUrl(result.current_url + data.filename, 'absolute'),
+				dirPath = encodeURIComponent(result.current_dir_path + data.filename + '/');
+			if (data.is_dir) {
+				el.click(function(e) {
+					reloadPage(dirPath, orderTypeBox.val(), createFunc);
+				});
+			} else if (data.is_photo) {
+				el.click(function(e) {
+					clickFn.call(this, fileUrl, data.filename);
+				});
+			} else {
+				el.click(function(e) {
+					clickFn.call(this, fileUrl, data.filename);
+				});
+			}
+			elList.push(el);
+		}
+		function createCommon(result, createFunc) {
+			// remove events
+			K.each(elList, function() {
+				this.unbind();
+			});
+			moveupLink.unbind();
+			viewTypeBox.unbind();
+			orderTypeBox.unbind();
+			// add events
+			if (result.current_dir_path) {
+				moveupLink.click(function(e) {
+					reloadPage(result.moveup_dir_path, orderTypeBox.val(), createFunc);
+				});
+			}
+			function changeFunc() {
+				if (viewTypeBox.val() == 'VIEW') {
+					reloadPage(result.current_dir_path, orderTypeBox.val(), createView);
+				} else {
+					reloadPage(result.current_dir_path, orderTypeBox.val(), createList);
+				}
+			}
+			viewTypeBox.change(changeFunc);
+			orderTypeBox.change(changeFunc);
+			bodyDiv.html('');
+		}
+		function createList(result) {
+			createCommon(result, createList);
+			var table = document.createElement('table');
+			table.className = 'ke-table';
+			table.cellPadding = 0;
+			table.cellSpacing = 0;
+			table.border = 0;
+			bodyDiv.append(table);
+			var fileList = result.file_list;
+			for (var i = 0, len = fileList.length; i < len; i++) {
+				var data = fileList[i], row = K(table.insertRow(i));
+				row.mouseover(function(e) {
+					K(this).addClass('ke-on');
+				})
+				.mouseout(function(e) {
+					K(this).removeClass('ke-on');
+				});
+				var iconUrl = imgPath + (data.is_dir ? 'folder-16.gif' : 'file-16.gif'),
+					img = K('<img src="' + iconUrl + '" width="16" height="16" alt="' + data.filename + '" align="absmiddle" />'),
+					cell0 = K(row[0].insertCell(0)).addClass('ke-cell ke-name').append(img).append(document.createTextNode(' ' + data.filename));
+				if (!data.is_dir || data.has_file) {
+					row.css('cursor', 'pointer');
+					cell0.attr('title', data.filename);
+					bindEvent(cell0, result, data, createList);
+				} else {
+					cell0.attr('title', lang.emptyFolder);
+				}
+				K(row[0].insertCell(1)).addClass('ke-cell ke-size').html(data.is_dir ? '-' : Math.ceil(data.filesize / 1024) + 'KB');
+				K(row[0].insertCell(2)).addClass('ke-cell ke-datetime').html(data.datetime);
+			}
+		}
+		function createView(result) {
+			createCommon(result, createView);
+			var fileList = result.file_list;
+			for (var i = 0, len = fileList.length; i < len; i++) {
+				var data = fileList[i],
+					div = K('<div class="ke-inline-block ke-item"></div>');
+				bodyDiv.append(div);
+				var photoDiv = K('<div class="ke-inline-block ke-photo"></div>')
+					.mouseover(function(e) {
+						K(this).addClass('ke-on');
+					})
+					.mouseout(function(e) {
+						K(this).removeClass('ke-on');
+					});
+				div.append(photoDiv);
+				var fileUrl = result.current_url + data.filename,
+					iconUrl = data.is_dir ? imgPath + 'folder-64.gif' : (data.is_photo ? fileUrl : imgPath + 'file-64.gif');
+				var img = K('<img src="' + iconUrl + '" width="80" height="80" alt="' + data.filename + '" />');
+				if (!data.is_dir || data.has_file) {
+					photoDiv.css('cursor', 'pointer');
+					bindTitle(photoDiv, data);
+					bindEvent(photoDiv, result, data, createView);
+				} else {
+					photoDiv.attr('title', lang.emptyFolder);
+				}
+				photoDiv.append(img);
+				div.append('<div class="ke-name" title="' + data.filename + '">' + data.filename + '</div>');
+			}
+		}
+		viewTypeBox.val(viewType);
+		reloadPage('', orderTypeBox.val(), viewType == 'VIEW' ? createView : createList);
+		return dialog;
+	}
+
+});
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/filemanager/images/file-16.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/filemanager/images/file-16.gif
new file mode 100644
index 0000000..2cf6e47
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/filemanager/images/file-16.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/filemanager/images/file-64.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/filemanager/images/file-64.gif
new file mode 100644
index 0000000..2e211da
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/filemanager/images/file-64.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/filemanager/images/folder-16.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/filemanager/images/folder-16.gif
new file mode 100644
index 0000000..850b5a3
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/filemanager/images/folder-16.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/filemanager/images/folder-64.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/filemanager/images/folder-64.gif
new file mode 100644
index 0000000..e8a1b09
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/filemanager/images/folder-64.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/filemanager/images/go-up.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/filemanager/images/go-up.gif
new file mode 100644
index 0000000..92ae23d
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/filemanager/images/go-up.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/flash/flash.js b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/flash/flash.js
new file mode 100644
index 0000000..d5d465e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/flash/flash.js
@@ -0,0 +1,161 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('flash', function(K) {
+	var self = this, name = 'flash', lang = self.lang(name + '.'),
+		allowFlashUpload = K.undef(self.allowFlashUpload, true),
+		allowFileManager = K.undef(self.allowFileManager, false),
+		formatUploadUrl = K.undef(self.formatUploadUrl, true),
+		extraParams = K.undef(self.extraFileUploadParams, {}),
+		filePostName = K.undef(self.filePostName, 'imgFile'),
+		uploadJson = K.undef(self.uploadJson, self.basePath + 'php/upload_json.php');
+	self.plugin.flash = {
+		edit : function() {
+			var html = [
+				'<div style="padding:20px;">',
+				//url
+				'<div class="ke-dialog-row">',
+				'<label for="keUrl" style="width:60px;">' + lang.url + '</label>',
+				'<input class="ke-input-text" type="text" id="keUrl" name="url" value="" style="width:160px;" /> &nbsp;',
+				'<input type="button" class="ke-upload-button" value="' + lang.upload + '" /> &nbsp;',
+				'<span class="ke-button-common ke-button-outer">',
+				'<input type="button" class="ke-button-common ke-button" name="viewServer" value="' + lang.viewServer + '" />',
+				'</span>',
+				'</div>',
+				//width
+				'<div class="ke-dialog-row">',
+				'<label for="keWidth" style="width:60px;">' + lang.width + '</label>',
+				'<input type="text" id="keWidth" class="ke-input-text ke-input-number" name="width" value="550" maxlength="4" /> ',
+				'</div>',
+				//height
+				'<div class="ke-dialog-row">',
+				'<label for="keHeight" style="width:60px;">' + lang.height + '</label>',
+				'<input type="text" id="keHeight" class="ke-input-text ke-input-number" name="height" value="400" maxlength="4" /> ',
+				'</div>',
+				'</div>'
+			].join('');
+			var dialog = self.createDialog({
+				name : name,
+				width : 450,
+				title : self.lang(name),
+				body : html,
+				yesBtn : {
+					name : self.lang('yes'),
+					click : function(e) {
+						var url = K.trim(urlBox.val()),
+							width = widthBox.val(),
+							height = heightBox.val();
+						if (url == 'http://' || K.invalidUrl(url)) {
+							alert(self.lang('invalidUrl'));
+							urlBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(width)) {
+							alert(self.lang('invalidWidth'));
+							widthBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(height)) {
+							alert(self.lang('invalidHeight'));
+							heightBox[0].focus();
+							return;
+						}
+						var html = K.mediaImg(self.themesPath + 'common/blank.gif', {
+								src : url,
+								type : K.mediaType('.swf'),
+								width : width,
+								height : height,
+								quality : 'high'
+							});
+						self.insertHtml(html).hideDialog().focus();
+					}
+				}
+			}),
+			div = dialog.div,
+			urlBox = K('[name="url"]', div),
+			viewServerBtn = K('[name="viewServer"]', div),
+			widthBox = K('[name="width"]', div),
+			heightBox = K('[name="height"]', div);
+			urlBox.val('http://');
+
+			if (allowFlashUpload) {
+				var uploadbutton = K.uploadbutton({
+					button : K('.ke-upload-button', div)[0],
+					fieldName : filePostName,
+					extraParams : extraParams,
+					url : K.addParam(uploadJson, 'dir=flash'),
+					afterUpload : function(data) {
+						dialog.hideLoading();
+						if (data.error === 0) {
+							var url = data.url;
+							if (formatUploadUrl) {
+								url = K.formatUrl(url, 'absolute');
+							}
+							urlBox.val(url);
+							if (self.afterUpload) {
+								self.afterUpload.call(self, url, data, name);
+							}
+							alert(self.lang('uploadSuccess'));
+						} else {
+							alert(data.message);
+						}
+					},
+					afterError : function(html) {
+						dialog.hideLoading();
+						self.errorDialog(html);
+					}
+				});
+				uploadbutton.fileBox.change(function(e) {
+					dialog.showLoading(self.lang('uploadLoading'));
+					uploadbutton.submit();
+				});
+			} else {
+				K('.ke-upload-button', div).hide();
+			}
+
+			if (allowFileManager) {
+				viewServerBtn.click(function(e) {
+					self.loadPlugin('filemanager', function() {
+						self.plugin.filemanagerDialog({
+							viewType : 'LIST',
+							dirName : 'flash',
+							clickFn : function(url, title) {
+								if (self.dialogs.length > 1) {
+									K('[name="url"]', div).val(url);
+									if (self.afterSelectFile) {
+										self.afterSelectFile.call(self, url);
+									}
+									self.hideDialog();
+								}
+							}
+						});
+					});
+				});
+			} else {
+				viewServerBtn.hide();
+			}
+
+			var img = self.plugin.getSelectedFlash();
+			if (img) {
+				var attrs = K.mediaAttrs(img.attr('data-ke-tag'));
+				urlBox.val(attrs.src);
+				widthBox.val(K.removeUnit(img.css('width')) || attrs.width || 0);
+				heightBox.val(K.removeUnit(img.css('height')) || attrs.height || 0);
+			}
+			urlBox[0].focus();
+			urlBox[0].select();
+		},
+		'delete' : function() {
+			self.plugin.getSelectedFlash().remove();
+			// [IE] 删除图片后立即点击图片按钮出错
+			self.addBookmark();
+		}
+	};
+	self.clickToolbar(name, self.plugin.flash.edit);
+});
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/image/image.js b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/image/image.js
new file mode 100644
index 0000000..69029ed
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/image/image.js
@@ -0,0 +1,328 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('image', function(K) {
+	var self = this, name = 'image',
+		allowImageUpload = K.undef(self.allowImageUpload, true),
+		allowImageRemote = K.undef(self.allowImageRemote, true),
+		formatUploadUrl = K.undef(self.formatUploadUrl, true),
+		allowFileManager = K.undef(self.allowFileManager, false),
+		uploadJson = K.undef(self.uploadJson, self.basePath + 'php/upload_json.php'),
+		imageTabIndex = K.undef(self.imageTabIndex, 0),
+		imgPath = self.pluginsPath + 'image/images/',
+		extraParams = K.undef(self.extraFileUploadParams, {}),
+		filePostName = K.undef(self.filePostName, 'imgFile'),
+		fillDescAfterUploadImage = K.undef(self.fillDescAfterUploadImage, false),
+		lang = self.lang(name + '.');
+
+	self.plugin.imageDialog = function(options) {
+		var imageUrl = options.imageUrl,
+			imageWidth = K.undef(options.imageWidth, ''),
+			imageHeight = K.undef(options.imageHeight, ''),
+			imageTitle = K.undef(options.imageTitle, ''),
+			imageAlign = K.undef(options.imageAlign, ''),
+			showRemote = K.undef(options.showRemote, true),
+			showLocal = K.undef(options.showLocal, true),
+			tabIndex = K.undef(options.tabIndex, 0),
+			clickFn = options.clickFn;
+		var target = 'kindeditor_upload_iframe_' + new Date().getTime();
+		var hiddenElements = [];
+		for(var k in extraParams){
+			hiddenElements.push('<input type="hidden" name="' + k + '" value="' + extraParams[k] + '" />');
+		}
+		var html = [
+			'<div style="padding:20px;">',
+			//tabs
+			'<div class="tabs"></div>',
+			//remote image - start
+			'<div class="tab1" style="display:none;">',
+			//url
+			'<div class="ke-dialog-row">',
+			'<label for="remoteUrl" style="width:60px;">' + lang.remoteUrl + '</label>',
+			'<input type="text" id="remoteUrl" class="ke-input-text" name="url" value="" style="width:200px;" /> &nbsp;',
+			'<span class="ke-button-common ke-button-outer">',
+			'<input type="button" class="ke-button-common ke-button" name="viewServer" value="' + lang.viewServer + '" />',
+			'</span>',
+			'</div>',
+			//size
+			'<div class="ke-dialog-row">',
+			'<label for="remoteWidth" style="width:60px;">' + lang.size + '</label>',
+			lang.width + ' <input type="text" id="remoteWidth" class="ke-input-text ke-input-number" name="width" value="" maxlength="4" /> ',
+			lang.height + ' <input type="text" class="ke-input-text ke-input-number" name="height" value="" maxlength="4" /> ',
+			'<img class="ke-refresh-btn" src="' + imgPath + 'refresh.png" width="16" height="16" alt="" style="cursor:pointer;" title="' + lang.resetSize + '" />',
+			'</div>',
+			//align
+			'<div class="ke-dialog-row">',
+			'<label style="width:60px;">' + lang.align + '</label>',
+			'<input type="radio" name="align" class="ke-inline-block" value="" checked="checked" /> <img name="defaultImg" src="' + imgPath + 'align_top.gif" width="23" height="25" alt="" />',
+			' <input type="radio" name="align" class="ke-inline-block" value="left" /> <img name="leftImg" src="' + imgPath + 'align_left.gif" width="23" height="25" alt="" />',
+			' <input type="radio" name="align" class="ke-inline-block" value="right" /> <img name="rightImg" src="' + imgPath + 'align_right.gif" width="23" height="25" alt="" />',
+			'</div>',
+			//title
+			'<div class="ke-dialog-row">',
+			'<label for="remoteTitle" style="width:60px;">' + lang.imgTitle + '</label>',
+			'<input type="text" id="remoteTitle" class="ke-input-text" name="title" value="" style="width:200px;" />',
+			'</div>',
+			'</div>',
+			//remote image - end
+			//local upload - start
+			'<div class="tab2" style="display:none;">',
+			'<iframe name="' + target + '" style="display:none;"></iframe>',
+			'<form class="ke-upload-area ke-form" method="post" enctype="multipart/form-data" target="' + target + '" action="' + K.addParam(uploadJson, 'dir=image') + '">',
+			//file
+			'<div class="ke-dialog-row">',
+			hiddenElements.join(''),
+			'<label style="width:60px;">' + lang.localUrl + '</label>',
+			'<input type="text" name="localUrl" class="ke-input-text" tabindex="-1" style="width:200px;" readonly="true" /> &nbsp;',
+			'<input type="button" class="ke-upload-button" value="' + lang.upload + '" />',
+			'</div>',
+			'</form>',
+			'</div>',
+			//local upload - end
+			'</div>'
+		].join('');
+		var dialogWidth = showLocal || allowFileManager ? 450 : 400,
+			dialogHeight = showLocal && showRemote ? 300 : 250;
+		var dialog = self.createDialog({
+			name : name,
+			width : dialogWidth,
+			height : dialogHeight,
+			title : self.lang(name),
+			body : html,
+			yesBtn : {
+				name : self.lang('yes'),
+				click : function(e) {
+					// Bugfix: http://code.google.com/p/kindeditor/issues/detail?id=319
+					if (dialog.isLoading) {
+						return;
+					}
+					// insert local image
+					if (showLocal && showRemote && tabs && tabs.selectedIndex === 1 || !showRemote) {
+						if (uploadbutton.fileBox.val() == '') {
+							alert(self.lang('pleaseSelectFile'));
+							return;
+						}
+						dialog.showLoading(self.lang('uploadLoading'));
+						uploadbutton.submit();
+						localUrlBox.val('');
+						return;
+					}
+					// insert remote image
+					var url = K.trim(urlBox.val()),
+						width = widthBox.val(),
+						height = heightBox.val(),
+						title = titleBox.val(),
+						align = '';
+					alignBox.each(function() {
+						if (this.checked) {
+							align = this.value;
+							return false;
+						}
+					});
+					if (url == 'http://' || K.invalidUrl(url)) {
+						alert(self.lang('invalidUrl'));
+						urlBox[0].focus();
+						return;
+					}
+					if (!/^\d*$/.test(width)) {
+						alert(self.lang('invalidWidth'));
+						widthBox[0].focus();
+						return;
+					}
+					if (!/^\d*$/.test(height)) {
+						alert(self.lang('invalidHeight'));
+						heightBox[0].focus();
+						return;
+					}
+					clickFn.call(self, url, title, width, height, 0, align);
+				}
+			},
+			beforeRemove : function() {
+				viewServerBtn.unbind();
+				widthBox.unbind();
+				heightBox.unbind();
+				refreshBtn.unbind();
+			}
+		}),
+		div = dialog.div;
+
+		var urlBox = K('[name="url"]', div),
+			localUrlBox = K('[name="localUrl"]', div),
+			viewServerBtn = K('[name="viewServer"]', div),
+			widthBox = K('.tab1 [name="width"]', div),
+			heightBox = K('.tab1 [name="height"]', div),
+			refreshBtn = K('.ke-refresh-btn', div),
+			titleBox = K('.tab1 [name="title"]', div),
+			alignBox = K('.tab1 [name="align"]', div);
+
+		var tabs;
+		if (showRemote && showLocal) {
+			tabs = K.tabs({
+				src : K('.tabs', div),
+				afterSelect : function(i) {}
+			});
+			tabs.add({
+				title : lang.remoteImage,
+				panel : K('.tab1', div)
+			});
+			tabs.add({
+				title : lang.localImage,
+				panel : K('.tab2', div)
+			});
+			tabs.select(tabIndex);
+		} else if (showRemote) {
+			K('.tab1', div).show();
+		} else if (showLocal) {
+			K('.tab2', div).show();
+		}
+
+		var uploadbutton = K.uploadbutton({
+			button : K('.ke-upload-button', div)[0],
+			fieldName : filePostName,
+			form : K('.ke-form', div),
+			target : target,
+			width: 60,
+			afterUpload : function(data) {
+				dialog.hideLoading();
+				if (data.error === 0) {
+					var url = data.url;
+					if (formatUploadUrl) {
+						url = K.formatUrl(url, 'absolute');
+					}
+					if (self.afterUpload) {
+						self.afterUpload.call(self, url, data, name);
+					}
+					if (!fillDescAfterUploadImage) {
+						clickFn.call(self, url, data.title, data.width, data.height, data.border, data.align);
+					} else {
+						K(".ke-dialog-row #remoteUrl", div).val(url);
+						K(".ke-tabs-li", div)[0].click();
+						K(".ke-refresh-btn", div).click();
+					}
+				} else {
+					alert(data.message);
+				}
+			},
+			afterError : function(html) {
+				dialog.hideLoading();
+				self.errorDialog(html);
+			}
+		});
+		uploadbutton.fileBox.change(function(e) {
+			localUrlBox.val(uploadbutton.fileBox.val());
+		});
+		if (allowFileManager) {
+			viewServerBtn.click(function(e) {
+				self.loadPlugin('filemanager', function() {
+					self.plugin.filemanagerDialog({
+						viewType : 'VIEW',
+						dirName : 'image',
+						clickFn : function(url, title) {
+							if (self.dialogs.length > 1) {
+								K('[name="url"]', div).val(url);
+								if (self.afterSelectFile) {
+									self.afterSelectFile.call(self, url);
+								}
+								self.hideDialog();
+							}
+						}
+					});
+				});
+			});
+		} else {
+			viewServerBtn.hide();
+		}
+		var originalWidth = 0, originalHeight = 0;
+		function setSize(width, height) {
+			widthBox.val(width);
+			heightBox.val(height);
+			originalWidth = width;
+			originalHeight = height;
+		}
+		refreshBtn.click(function(e) {
+			var tempImg = K('<img src="' + urlBox.val() + '" />', document).css({
+				position : 'absolute',
+				visibility : 'hidden',
+				top : 0,
+				left : '-1000px'
+			});
+			tempImg.bind('load', function() {
+				setSize(tempImg.width(), tempImg.height());
+				tempImg.remove();
+			});
+			K(document.body).append(tempImg);
+		});
+		widthBox.change(function(e) {
+			if (originalWidth > 0) {
+				heightBox.val(Math.round(originalHeight / originalWidth * parseInt(this.value, 10)));
+			}
+		});
+		heightBox.change(function(e) {
+			if (originalHeight > 0) {
+				widthBox.val(Math.round(originalWidth / originalHeight * parseInt(this.value, 10)));
+			}
+		});
+		urlBox.val(options.imageUrl);
+		setSize(options.imageWidth, options.imageHeight);
+		titleBox.val(options.imageTitle);
+		alignBox.each(function() {
+			if (this.value === options.imageAlign) {
+				this.checked = true;
+				return false;
+			}
+		});
+		if (showRemote && tabIndex === 0) {
+			urlBox[0].focus();
+			urlBox[0].select();
+		}
+		return dialog;
+	};
+	self.plugin.image = {
+		edit : function() {
+			var img = self.plugin.getSelectedImage();
+			self.plugin.imageDialog({
+				imageUrl : img ? img.attr('data-ke-src') : 'http://',
+				imageWidth : img ? img.width() : '',
+				imageHeight : img ? img.height() : '',
+				imageTitle : img ? img.attr('title') : '',
+				imageAlign : img ? img.attr('align') : '',
+				showRemote : allowImageRemote,
+				showLocal : allowImageUpload,
+				tabIndex: img ? 0 : imageTabIndex,
+				clickFn : function(url, title, width, height, border, align) {
+					if (img) {
+						img.attr('src', url);
+						img.attr('data-ke-src', url);
+						img.attr('width', width);
+						img.attr('height', height);
+						img.attr('title', title);
+						img.attr('align', align);
+						img.attr('alt', title);
+					} else {
+						self.exec('insertimage', url, title, width, height, border, align);
+					}
+					// Bugfix: [Firefox] 上传图片后，总是出现正在加载的样式，需要延迟执行hideDialog
+					setTimeout(function() {
+						self.hideDialog().focus();
+					}, 0);
+				}
+			});
+		},
+		'delete' : function() {
+			var target = self.plugin.getSelectedImage();
+			if (target.parent().name == 'a') {
+				target = target.parent();
+			}
+			target.remove();
+			// [IE] 删除图片后立即点击图片按钮出错
+			self.addBookmark();
+		}
+	};
+	self.clickToolbar(name, self.plugin.image.edit);
+});
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/image/images/align_left.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/image/images/align_left.gif
new file mode 100644
index 0000000..ab17f56
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/image/images/align_left.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/image/images/align_right.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/image/images/align_right.gif
new file mode 100644
index 0000000..e8ebe6a
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/image/images/align_right.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/image/images/align_top.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/image/images/align_top.gif
new file mode 100644
index 0000000..d8826a5
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/image/images/align_top.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/image/images/refresh.png b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/image/images/refresh.png
new file mode 100644
index 0000000..77e12d1
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/image/images/refresh.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/insertfile/insertfile.js b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/insertfile/insertfile.js
new file mode 100644
index 0000000..b8c523e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/insertfile/insertfile.js
@@ -0,0 +1,138 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('insertfile', function(K) {
+	var self = this, name = 'insertfile',
+		allowFileUpload = K.undef(self.allowFileUpload, true),
+		allowFileManager = K.undef(self.allowFileManager, false),
+		formatUploadUrl = K.undef(self.formatUploadUrl, true),
+		uploadJson = K.undef(self.uploadJson, self.basePath + 'php/upload_json.php'),
+		extraParams = K.undef(self.extraFileUploadParams, {}),
+		filePostName = K.undef(self.filePostName, 'imgFile'),
+		lang = self.lang(name + '.');
+	self.plugin.fileDialog = function(options) {
+		var fileUrl = K.undef(options.fileUrl, 'http://'),
+			fileTitle = K.undef(options.fileTitle, ''),
+			clickFn = options.clickFn;
+		var html = [
+			'<div style="padding:20px;">',
+			'<div class="ke-dialog-row">',
+			'<label for="keUrl" style="width:60px;">' + lang.url + '</label>',
+			'<input type="text" id="keUrl" name="url" class="ke-input-text" style="width:160px;" /> &nbsp;',
+			'<input type="button" class="ke-upload-button" value="' + lang.upload + '" /> &nbsp;',
+			'<span class="ke-button-common ke-button-outer">',
+			'<input type="button" class="ke-button-common ke-button" name="viewServer" value="' + lang.viewServer + '" />',
+			'</span>',
+			'</div>',
+			//title
+			'<div class="ke-dialog-row">',
+			'<label for="keTitle" style="width:60px;">' + lang.title + '</label>',
+			'<input type="text" id="keTitle" class="ke-input-text" name="title" value="" style="width:160px;" /></div>',
+			'</div>',
+			//form end
+			'</form>',
+			'</div>'
+			].join('');
+		var dialog = self.createDialog({
+			name : name,
+			width : 450,
+			title : self.lang(name),
+			body : html,
+			yesBtn : {
+				name : self.lang('yes'),
+				click : function(e) {
+					var url = K.trim(urlBox.val()),
+						title = titleBox.val();
+					if (url == 'http://' || K.invalidUrl(url)) {
+						alert(self.lang('invalidUrl'));
+						urlBox[0].focus();
+						return;
+					}
+					if (K.trim(title) === '') {
+						title = url;
+					}
+					clickFn.call(self, url, title);
+				}
+			}
+		}),
+		div = dialog.div;
+
+		var urlBox = K('[name="url"]', div),
+			viewServerBtn = K('[name="viewServer"]', div),
+			titleBox = K('[name="title"]', div);
+
+		if (allowFileUpload) {
+			var uploadbutton = K.uploadbutton({
+				button : K('.ke-upload-button', div)[0],
+				fieldName : filePostName,
+				url : K.addParam(uploadJson, 'dir=file'),
+				extraParams : extraParams,
+				afterUpload : function(data) {
+					dialog.hideLoading();
+					if (data.error === 0) {
+						var url = data.url;
+						if (formatUploadUrl) {
+							url = K.formatUrl(url, 'absolute');
+						}
+						urlBox.val(url);
+						if (self.afterUpload) {
+							self.afterUpload.call(self, url, data, name);
+						}
+						alert(self.lang('uploadSuccess'));
+					} else {
+						alert(data.message);
+					}
+				},
+				afterError : function(html) {
+					dialog.hideLoading();
+					self.errorDialog(html);
+				}
+			});
+			uploadbutton.fileBox.change(function(e) {
+				dialog.showLoading(self.lang('uploadLoading'));
+				uploadbutton.submit();
+			});
+		} else {
+			K('.ke-upload-button', div).hide();
+		}
+		if (allowFileManager) {
+			viewServerBtn.click(function(e) {
+				self.loadPlugin('filemanager', function() {
+					self.plugin.filemanagerDialog({
+						viewType : 'LIST',
+						dirName : 'file',
+						clickFn : function(url, title) {
+							if (self.dialogs.length > 1) {
+								K('[name="url"]', div).val(url);
+								if (self.afterSelectFile) {
+									self.afterSelectFile.call(self, url);
+								}
+								self.hideDialog();
+							}
+						}
+					});
+				});
+			});
+		} else {
+			viewServerBtn.hide();
+		}
+		urlBox.val(fileUrl);
+		titleBox.val(fileTitle);
+		urlBox[0].focus();
+		urlBox[0].select();
+	};
+	self.clickToolbar(name, function() {
+		self.plugin.fileDialog({
+			clickFn : function(url, title) {
+				var html = '<a class="ke-insertfile" href="' + url + '" data-ke-src="' + url + '" target="_blank">' + title + '</a>';
+				self.insertHtml(html).hideDialog().focus();
+			}
+		});
+	});
+});
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/lineheight/lineheight.js b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/lineheight/lineheight.js
new file mode 100644
index 0000000..ae679d7
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/lineheight/lineheight.js
@@ -0,0 +1,38 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('lineheight', function(K) {
+	var self = this, name = 'lineheight', lang = self.lang(name + '.');
+	self.clickToolbar(name, function() {
+		var curVal = '', commonNode = self.cmd.commonNode({'*' : '.line-height'});
+		if (commonNode) {
+			curVal = commonNode.css('line-height');
+		}
+		var menu = self.createMenu({
+			name : name,
+			width : 150
+		});
+		K.each(lang.lineHeight, function(i, row) {
+			K.each(row, function(key, val) {
+				menu.addItem({
+					title : val,
+					checked : curVal === key,
+					click : function() {
+						self.cmd.toggle('<span style="line-height:' + key + ';"></span>', {
+							span : '.line-height=' + key
+						});
+						self.updateState();
+						self.addBookmark();
+						self.hideMenu();
+					}
+				});
+			});
+		});
+	});
+});
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/link/link.js b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/link/link.js
new file mode 100644
index 0000000..352fa3c
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/link/link.js
@@ -0,0 +1,66 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('link', function(K) {
+	var self = this, name = 'link';
+	self.plugin.link = {
+		edit : function() {
+			var lang = self.lang(name + '.'),
+				html = '<div style="padding:20px;">' +
+					//url
+					'<div class="ke-dialog-row">' +
+					'<label for="keUrl" style="width:60px;">' + lang.url + '</label>' +
+					'<input class="ke-input-text" type="text" id="keUrl" name="url" value="" style="width:260px;" /></div>' +
+					//type
+					'<div class="ke-dialog-row"">' +
+					'<label for="keType" style="width:60px;">' + lang.linkType + '</label>' +
+					'<select id="keType" name="type"></select>' +
+					'</div>' +
+					'</div>',
+				dialog = self.createDialog({
+					name : name,
+					width : 450,
+					title : self.lang(name),
+					body : html,
+					yesBtn : {
+						name : self.lang('yes'),
+						click : function(e) {
+							var url = K.trim(urlBox.val());
+							if (url == 'http://' || K.invalidUrl(url)) {
+								alert(self.lang('invalidUrl'));
+								urlBox[0].focus();
+								return;
+							}
+							self.exec('createlink', url, typeBox.val()).hideDialog().focus();
+						}
+					}
+				}),
+				div = dialog.div,
+				urlBox = K('input[name="url"]', div),
+				typeBox = K('select[name="type"]', div);
+			urlBox.val('http://');
+			typeBox[0].options[0] = new Option(lang.newWindow, '_blank');
+			typeBox[0].options[1] = new Option(lang.selfWindow, '');
+			self.cmd.selection();
+			var a = self.plugin.getSelectedLink();
+			if (a) {
+				self.cmd.range.selectNode(a[0]);
+				self.cmd.select();
+				urlBox.val(a.attr('data-ke-src'));
+				typeBox.val(a.attr('target'));
+			}
+			urlBox[0].focus();
+			urlBox[0].select();
+		},
+		'delete' : function() {
+			self.exec('unlink', null);
+		}
+	};
+	self.clickToolbar(name, self.plugin.link.edit);
+});
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/map/map.html b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/map/map.html
new file mode 100644
index 0000000..1a9ad7d
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/map/map.html
@@ -0,0 +1,57 @@
+<!doctype html>
+<html>
+	<head>
+	<meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
+	<style>
+		html { height: 100% }
+		body { height: 100%; margin: 0; padding: 0; background-color: #FFF }
+		#map_canvas { height: 100% }
+	</style>
+	<script src="http://maps.googleapis.com/maps/api/js?sensor=false&language=zh_CN"></script>
+	<script>
+		var map, geocoder;
+		function initialize() {
+			var latlng = new google.maps.LatLng(31.230393, 121.473704);
+			var options = {
+				zoom: 11,
+				center: latlng,
+				disableDefaultUI: true,
+				panControl: true,
+				zoomControl: true,
+				mapTypeControl: true,
+				scaleControl: true,
+				streetViewControl: false,
+				overviewMapControl: true,
+				mapTypeId: google.maps.MapTypeId.ROADMAP
+			};
+			map = new google.maps.Map(document.getElementById("map_canvas"), options);
+			geocoder = new google.maps.Geocoder();
+			geocoder.geocode({latLng: latlng}, function(results, status) {
+				if (status == google.maps.GeocoderStatus.OK) {
+					if (results[3]) {
+						parent.document.getElementById("kindeditor_plugin_map_address").value = results[3].formatted_address;
+					}
+				}
+			});
+		}
+		function search(address) {
+			if (!map) return;
+			geocoder.geocode({address : address}, function(results, status) {
+				if (status == google.maps.GeocoderStatus.OK) {
+					map.setZoom(11);
+					map.setCenter(results[0].geometry.location);
+					var marker = new google.maps.Marker({
+						map: map,
+						position: results[0].geometry.location
+					});
+				} else {
+					alert("Invalid address: " + address);
+				}
+			});
+		}
+	</script>
+	</head>
+	<body onload="initialize();">
+		<div id="map_canvas" style="width:100%; height:100%"></div>
+	</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/map/map.js b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/map/map.js
new file mode 100644
index 0000000..5290875
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/map/map.js
@@ -0,0 +1,137 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+// Google Maps: http://code.google.com/apis/maps/index.html
+
+KindEditor.plugin('map', function(K) {
+	var self = this, name = 'map', lang = self.lang(name + '.');
+	self.clickToolbar(name, function() {
+		var html = ['<div style="padding:10px 20px;">',
+			'<div class="ke-dialog-row">',
+			lang.address + ' <input id="kindeditor_plugin_map_address" name="address" class="ke-input-text" value="" style="width:200px;" /> ',
+			'<span class="ke-button-common ke-button-outer">',
+			'<input type="button" name="searchBtn" class="ke-button-common ke-button" value="' + lang.search + '" />',
+			'</span>',
+			'</div>',
+			'<div class="ke-map" style="width:558px;height:360px;"></div>',
+			'</div>'].join('');
+		var dialog = self.createDialog({
+			name : name,
+			width : 600,
+			title : self.lang(name),
+			body : html,
+			yesBtn : {
+				name : self.lang('yes'),
+				click : function(e) {
+					var geocoder = win.geocoder,
+						map = win.map,
+						center = map.getCenter().lat() + ',' + map.getCenter().lng(),
+						zoom = map.getZoom(),
+						maptype = map.getMapTypeId(),
+						url = 'http://maps.googleapis.com/maps/api/staticmap';
+						url += '?center=' + encodeURIComponent(center);
+						url += '&zoom=' + encodeURIComponent(zoom);
+						url += '&size=558x360';
+						url += '&maptype=' + encodeURIComponent(maptype);
+						url += '&markers=' + encodeURIComponent(center);
+						url += '&language=' + self.langType;
+						url += '&sensor=false';
+					self.exec('insertimage', url).hideDialog().focus();
+				}
+			},
+			beforeRemove : function() {
+				searchBtn.remove();
+				if (doc) {
+					doc.write('');
+				}
+				iframe.remove();
+			}
+		});
+		var div = dialog.div,
+			addressBox = K('[name="address"]', div),
+			searchBtn = K('[name="searchBtn"]', div),
+			win, doc;
+		var iframeHtml = ['<!doctype html><html><head>',
+			'<meta name="viewport" content="initial-scale=1.0, user-scalable=no" />',
+			'<style>',
+			'	html { height: 100% }',
+			'	body { height: 100%; margin: 0; padding: 0; background-color: #FFF }',
+			'	#map_canvas { height: 100% }',
+			'</style>',
+			'<script src="http://maps.googleapis.com/maps/api/js?sensor=false&language=' + self.langType + '"></script>',
+			'<script>',
+			'var map, geocoder;',
+			'function initialize() {',
+			'	var latlng = new google.maps.LatLng(31.230393, 121.473704);',
+			'	var options = {',
+			'		zoom: 11,',
+			'		center: latlng,',
+			'		disableDefaultUI: true,',
+			'		panControl: true,',
+			'		zoomControl: true,',
+			'		mapTypeControl: true,',
+			'		scaleControl: true,',
+			'		streetViewControl: false,',
+			'		overviewMapControl: true,',
+			'		mapTypeId: google.maps.MapTypeId.ROADMAP',
+			'	};',
+			'	map = new google.maps.Map(document.getElementById("map_canvas"), options);',
+			'	geocoder = new google.maps.Geocoder();',
+			'	geocoder.geocode({latLng: latlng}, function(results, status) {',
+			'		if (status == google.maps.GeocoderStatus.OK) {',
+			'			if (results[3]) {',
+			'				parent.document.getElementById("kindeditor_plugin_map_address").value = results[3].formatted_address;',
+			'			}',
+			'		}',
+			'	});',
+			'}',
+			'function search(address) {',
+			'	if (!map) return;',
+			'	geocoder.geocode({address : address}, function(results, status) {',
+			'		if (status == google.maps.GeocoderStatus.OK) {',
+			'			map.setZoom(11);',
+			'			map.setCenter(results[0].geometry.location);',
+			'			var marker = new google.maps.Marker({',
+			'				map: map,',
+			'				position: results[0].geometry.location',
+			'			});',
+			'		} else {',
+			'			alert("Invalid address: " + address);',
+			'		}',
+			'	});',
+			'}',
+			'</script>',
+			'</head>',
+			'<body onload="initialize();">',
+			'<div id="map_canvas" style="width:100%; height:100%"></div>',
+			'</body></html>'].join('\n');
+		// TODO：用doc.write(iframeHtml)方式加载时，在IE6上第一次加载报错，暂时使用src方式
+		var iframe = K('<iframe class="ke-textarea" frameborder="0" src="' + self.pluginsPath + 'map/map.html" style="width:558px;height:360px;"></iframe>');
+		function ready() {
+			win = iframe[0].contentWindow;
+			doc = K.iframeDoc(iframe);
+			//doc.open();
+			//doc.write(iframeHtml);
+			//doc.close();
+		}
+		iframe.bind('load', function() {
+			iframe.unbind('load');
+			if (K.IE) {
+				ready();
+			} else {
+				setTimeout(ready, 0);
+			}
+		});
+		K('.ke-map', div).replaceWith(iframe);
+		// search map
+		searchBtn.click(function() {
+			win.search(addressBox.val());
+		});
+	});
+});
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/media/media.js b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/media/media.js
new file mode 100644
index 0000000..5803466
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/media/media.js
@@ -0,0 +1,170 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('media', function(K) {
+	var self = this, name = 'media', lang = self.lang(name + '.'),
+		allowMediaUpload = K.undef(self.allowMediaUpload, true),
+		allowFileManager = K.undef(self.allowFileManager, false),
+		formatUploadUrl = K.undef(self.formatUploadUrl, true),
+		extraParams = K.undef(self.extraFileUploadParams, {}),
+		filePostName = K.undef(self.filePostName, 'imgFile'),
+		uploadJson = K.undef(self.uploadJson, self.basePath + 'php/upload_json.php');
+	self.plugin.media = {
+		edit : function() {
+			var html = [
+				'<div style="padding:20px;">',
+				//url
+				'<div class="ke-dialog-row">',
+				'<label for="keUrl" style="width:60px;">' + lang.url + '</label>',
+				'<input class="ke-input-text" type="text" id="keUrl" name="url" value="" style="width:160px;" /> &nbsp;',
+				'<input type="button" class="ke-upload-button" value="' + lang.upload + '" /> &nbsp;',
+				'<span class="ke-button-common ke-button-outer">',
+				'<input type="button" class="ke-button-common ke-button" name="viewServer" value="' + lang.viewServer + '" />',
+				'</span>',
+				'</div>',
+				//width
+				'<div class="ke-dialog-row">',
+				'<label for="keWidth" style="width:60px;">' + lang.width + '</label>',
+				'<input type="text" id="keWidth" class="ke-input-text ke-input-number" name="width" value="550" maxlength="4" />',
+				'</div>',
+				//height
+				'<div class="ke-dialog-row">',
+				'<label for="keHeight" style="width:60px;">' + lang.height + '</label>',
+				'<input type="text" id="keHeight" class="ke-input-text ke-input-number" name="height" value="400" maxlength="4" />',
+				'</div>',
+				//autostart
+				'<div class="ke-dialog-row">',
+				'<label for="keAutostart">' + lang.autostart + '</label>',
+				'<input type="checkbox" id="keAutostart" name="autostart" value="" /> ',
+				'</div>',
+				'</div>'
+			].join('');
+			var dialog = self.createDialog({
+				name : name,
+				width : 450,
+				height : 230,
+				title : self.lang(name),
+				body : html,
+				yesBtn : {
+					name : self.lang('yes'),
+					click : function(e) {
+						var url = K.trim(urlBox.val()),
+							width = widthBox.val(),
+							height = heightBox.val();
+						if (url == 'http://' || K.invalidUrl(url)) {
+							alert(self.lang('invalidUrl'));
+							urlBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(width)) {
+							alert(self.lang('invalidWidth'));
+							widthBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(height)) {
+							alert(self.lang('invalidHeight'));
+							heightBox[0].focus();
+							return;
+						}
+						var html = K.mediaImg(self.themesPath + 'common/blank.gif', {
+								src : url,
+								type : K.mediaType(url),
+								width : width,
+								height : height,
+								autostart : autostartBox[0].checked ? 'true' : 'false',
+								loop : 'true'
+							});
+						self.insertHtml(html).hideDialog().focus();
+					}
+				}
+			}),
+			div = dialog.div,
+			urlBox = K('[name="url"]', div),
+			viewServerBtn = K('[name="viewServer"]', div),
+			widthBox = K('[name="width"]', div),
+			heightBox = K('[name="height"]', div),
+			autostartBox = K('[name="autostart"]', div);
+			urlBox.val('http://');
+
+			if (allowMediaUpload) {
+				var uploadbutton = K.uploadbutton({
+					button : K('.ke-upload-button', div)[0],
+					fieldName : filePostName,
+					extraParams : extraParams,
+					url : K.addParam(uploadJson, 'dir=media'),
+					afterUpload : function(data) {
+						dialog.hideLoading();
+						if (data.error === 0) {
+							var url = data.url;
+							if (formatUploadUrl) {
+								url = K.formatUrl(url, 'absolute');
+							}
+							urlBox.val(url);
+							if (self.afterUpload) {
+								self.afterUpload.call(self, url, data, name);
+							}
+							alert(self.lang('uploadSuccess'));
+						} else {
+							alert(data.message);
+						}
+					},
+					afterError : function(html) {
+						dialog.hideLoading();
+						self.errorDialog(html);
+					}
+				});
+				uploadbutton.fileBox.change(function(e) {
+					dialog.showLoading(self.lang('uploadLoading'));
+					uploadbutton.submit();
+				});
+			} else {
+				K('.ke-upload-button', div).hide();
+			}
+
+			if (allowFileManager) {
+				viewServerBtn.click(function(e) {
+					self.loadPlugin('filemanager', function() {
+						self.plugin.filemanagerDialog({
+							viewType : 'LIST',
+							dirName : 'media',
+							clickFn : function(url, title) {
+								if (self.dialogs.length > 1) {
+									K('[name="url"]', div).val(url);
+									if (self.afterSelectFile) {
+										self.afterSelectFile.call(self, url);
+									}
+									self.hideDialog();
+								}
+							}
+						});
+					});
+				});
+			} else {
+				viewServerBtn.hide();
+			}
+
+			var img = self.plugin.getSelectedMedia();
+			if (img) {
+				var attrs = K.mediaAttrs(img.attr('data-ke-tag'));
+				urlBox.val(attrs.src);
+				widthBox.val(K.removeUnit(img.css('width')) || attrs.width || 0);
+				heightBox.val(K.removeUnit(img.css('height')) || attrs.height || 0);
+				autostartBox[0].checked = (attrs.autostart === 'true');
+			}
+			urlBox[0].focus();
+			urlBox[0].select();
+		},
+		'delete' : function() {
+			self.plugin.getSelectedMedia().remove();
+			// [IE] 删除图片后立即点击图片按钮出错
+			self.addBookmark();
+		}
+	};
+	self.clickToolbar(name, self.plugin.media.edit);
+});
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/multiimage/images/image.png b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/multiimage/images/image.png
new file mode 100644
index 0000000..fe79cf0
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/multiimage/images/image.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/multiimage/images/select-files-en.png b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/multiimage/images/select-files-en.png
new file mode 100644
index 0000000..a926a6e
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/multiimage/images/select-files-en.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/multiimage/images/select-files-zh_CN.png b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/multiimage/images/select-files-zh_CN.png
new file mode 100644
index 0000000..5a31d36
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/multiimage/images/select-files-zh_CN.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/multiimage/images/swfupload.swf b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/multiimage/images/swfupload.swf
new file mode 100644
index 0000000..e3f7670
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/multiimage/images/swfupload.swf differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/multiimage/multiimage.js b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/multiimage/multiimage.js
new file mode 100644
index 0000000..5e6ecf8
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/multiimage/multiimage.js
@@ -0,0 +1,1384 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+
+(function(K) {
+
+function KSWFUpload(options) {
+	this.init(options);
+}
+K.extend(KSWFUpload, {
+	init : function(options) {
+		var self = this;
+		options.afterError = options.afterError || function(str) {
+			alert(str);
+		};
+		self.options = options;
+		self.progressbars = {};
+		// template
+		self.div = K(options.container).html([
+			'<div class="ke-swfupload">',
+			'<div class="ke-swfupload-top">',
+			'<div class="ke-inline-block ke-swfupload-button">',
+			'<input type="button" value="Browse" />',
+			'</div>',
+			'<div class="ke-inline-block ke-swfupload-desc">' + options.uploadDesc + '</div>',
+			'<span class="ke-button-common ke-button-outer ke-swfupload-startupload">',
+			'<input type="button" class="ke-button-common ke-button" value="' + options.startButtonValue + '" />',
+			'</span>',
+			'</div>',
+			'<div class="ke-swfupload-body"></div>',
+			'</div>'
+		].join(''));
+		self.bodyDiv = K('.ke-swfupload-body', self.div);
+
+		function showError(itemDiv, msg) {
+			K('.ke-status > div', itemDiv).hide();
+			K('.ke-message', itemDiv).addClass('ke-error').show().html(K.escape(msg));
+		}
+
+		var settings = {
+			debug : false,
+			upload_url : options.uploadUrl,
+			flash_url : options.flashUrl,
+			file_post_name : options.filePostName,
+			button_placeholder : K('.ke-swfupload-button > input', self.div)[0],
+			button_image_url: options.buttonImageUrl,
+			button_width: options.buttonWidth,
+			button_height: options.buttonHeight,
+			button_cursor : SWFUpload.CURSOR.HAND,
+			file_types : options.fileTypes,
+			file_types_description : options.fileTypesDesc,
+			file_upload_limit : options.fileUploadLimit,
+			file_size_limit : options.fileSizeLimit,
+			post_params : options.postParams,
+			file_queued_handler : function(file) {
+				file.url = self.options.fileIconUrl;
+				self.appendFile(file);
+			},
+			file_queue_error_handler : function(file, errorCode, message) {
+				var errorName = '';
+				switch (errorCode) {
+					case SWFUpload.QUEUE_ERROR.QUEUE_LIMIT_EXCEEDED:
+						errorName = options.queueLimitExceeded;
+						break;
+					case SWFUpload.QUEUE_ERROR.FILE_EXCEEDS_SIZE_LIMIT:
+						errorName = options.fileExceedsSizeLimit;
+						break;
+					case SWFUpload.QUEUE_ERROR.ZERO_BYTE_FILE:
+						errorName = options.zeroByteFile;
+						break;
+					case SWFUpload.QUEUE_ERROR.INVALID_FILETYPE:
+						errorName = options.invalidFiletype;
+						break;
+					default:
+						errorName = options.unknownError;
+						break;
+				}
+				K.DEBUG && alert(errorName);
+			},
+			upload_start_handler : function(file) {
+				var self = this;
+				var itemDiv = K('div[data-id="' + file.id + '"]', self.bodyDiv);
+				K('.ke-status > div', itemDiv).hide();
+				K('.ke-progressbar', itemDiv).show();
+			},
+			upload_progress_handler : function(file, bytesLoaded, bytesTotal) {
+				var percent = Math.round(bytesLoaded * 100 / bytesTotal);
+				var progressbar = self.progressbars[file.id];
+				progressbar.bar.css('width', Math.round(percent * 80 / 100) + 'px');
+				progressbar.percent.html(percent + '%');
+			},
+			upload_error_handler : function(file, errorCode, message) {
+				if (file && file.filestatus == SWFUpload.FILE_STATUS.ERROR) {
+					var itemDiv = K('div[data-id="' + file.id + '"]', self.bodyDiv).eq(0);
+					showError(itemDiv, self.options.errorMessage);
+				}
+			},
+			upload_success_handler : function(file, serverData) {
+				var itemDiv = K('div[data-id="' + file.id + '"]', self.bodyDiv).eq(0);
+				var data = {};
+				try {
+					data = K.json(serverData);
+				} catch (e) {
+					self.options.afterError.call(this, '<!doctype html><html>' + serverData + '</html>');
+				}
+				if (data.error !== 0) {
+					showError(itemDiv, K.DEBUG ? data.message : self.options.errorMessage);
+					return;
+				}
+				file.url = data.url;
+				K('.ke-img', itemDiv).attr('src', file.url).attr('data-status', file.filestatus).data('data', data);
+				K('.ke-status > div', itemDiv).hide();
+			}
+		};
+		self.swfu = new SWFUpload(settings);
+
+		K('.ke-swfupload-startupload input', self.div).click(function() {
+			self.swfu.startUpload();
+		});
+	},
+	getUrlList : function() {
+		var list = [];
+		K('.ke-img', self.bodyDiv).each(function() {
+			var img = K(this);
+			var status = img.attr('data-status');
+			if (status == SWFUpload.FILE_STATUS.COMPLETE) {
+				list.push(img.data('data'));
+			}
+		});
+		return list;
+	},
+	removeFile : function(fileId) {
+		var self = this;
+		self.swfu.cancelUpload(fileId);
+		var itemDiv = K('div[data-id="' + fileId + '"]', self.bodyDiv);
+		K('.ke-photo', itemDiv).unbind();
+		K('.ke-delete', itemDiv).unbind();
+		itemDiv.remove();
+	},
+	removeFiles : function() {
+		var self = this;
+		K('.ke-item', self.bodyDiv).each(function() {
+			self.removeFile(K(this).attr('data-id'));
+		});
+	},
+	appendFile : function(file) {
+		var self = this;
+		var itemDiv = K('<div class="ke-inline-block ke-item" data-id="' + file.id + '"></div>');
+		self.bodyDiv.append(itemDiv);
+		var photoDiv = K('<div class="ke-inline-block ke-photo"></div>')
+			.mouseover(function(e) {
+				K(this).addClass('ke-on');
+			})
+			.mouseout(function(e) {
+				K(this).removeClass('ke-on');
+			});
+		itemDiv.append(photoDiv);
+
+		var img = K('<img src="' + file.url + '" class="ke-img" data-status="' + file.filestatus + '" width="80" height="80" alt="' + file.name + '" />');
+		photoDiv.append(img);
+		K('<span class="ke-delete"></span>').appendTo(photoDiv).click(function() {
+			self.removeFile(file.id);
+		});
+		var statusDiv = K('<div class="ke-status"></div>').appendTo(photoDiv);
+		// progressbar
+		K(['<div class="ke-progressbar">',
+			'<div class="ke-progressbar-bar"><div class="ke-progressbar-bar-inner"></div></div>',
+			'<div class="ke-progressbar-percent">0%</div></div>'].join('')).hide().appendTo(statusDiv);
+		// message
+		K('<div class="ke-message">' + self.options.pendingMessage + '</div>').appendTo(statusDiv);
+
+		itemDiv.append('<div class="ke-name">' + file.name + '</div>');
+
+		self.progressbars[file.id] = {
+			bar : K('.ke-progressbar-bar-inner', photoDiv),
+			percent : K('.ke-progressbar-percent', photoDiv)
+		};
+	},
+	remove : function() {
+		this.removeFiles();
+		this.swfu.destroy();
+		this.div.html('');
+	}
+});
+
+K.swfupload = function(element, options) {
+	return new KSWFUpload(element, options);
+};
+
+})(KindEditor);
+
+KindEditor.plugin('multiimage', function(K) {
+	var self = this, name = 'multiimage',
+		formatUploadUrl = K.undef(self.formatUploadUrl, true),
+		uploadJson = K.undef(self.uploadJson, self.basePath + 'php/upload_json.php'),
+		imgPath = self.pluginsPath + 'multiimage/images/',
+		imageSizeLimit = K.undef(self.imageSizeLimit, '1MB'),
+		imageFileTypes = K.undef(self.imageFileTypes, '*.jpg;*.gif;*.png'),
+		imageUploadLimit = K.undef(self.imageUploadLimit, 20),
+		filePostName = K.undef(self.filePostName, 'imgFile'),
+		lang = self.lang(name + '.');
+
+	self.plugin.multiImageDialog = function(options) {
+		var clickFn = options.clickFn,
+			uploadDesc = K.tmpl(lang.uploadDesc, {uploadLimit : imageUploadLimit, sizeLimit : imageSizeLimit});
+		var html = [
+			'<div style="padding:20px;">',
+			'<div class="swfupload">',
+			'</div>',
+			'</div>'
+		].join('');
+		var dialog = self.createDialog({
+			name : name,
+			width : 650,
+			height : 510,
+			title : self.lang(name),
+			body : html,
+			previewBtn : {
+				name : lang.insertAll,
+				click : function(e) {
+					clickFn.call(self, swfupload.getUrlList());
+				}
+			},
+			yesBtn : {
+				name : lang.clearAll,
+				click : function(e) {
+					swfupload.removeFiles();
+				}
+			},
+			beforeRemove : function() {
+				// IE9 bugfix: https://github.com/kindsoft/kindeditor/issues/72
+				if (!K.IE || K.V <= 8) {
+					swfupload.remove();
+				}
+			}
+		}),
+		div = dialog.div;
+
+		var swfupload = K.swfupload({
+			container : K('.swfupload', div),
+			buttonImageUrl : imgPath + (self.langType == 'zh_CN' ? 'select-files-zh_CN.png' : 'select-files-en.png'),
+			buttonWidth : self.langType == 'zh_CN' ? 72 : 88,
+			buttonHeight : 23,
+			fileIconUrl : imgPath + 'image.png',
+			uploadDesc : uploadDesc,
+			startButtonValue : lang.startUpload,
+			uploadUrl : K.addParam(uploadJson, 'dir=image'),
+			flashUrl : imgPath + 'swfupload.swf',
+			filePostName : filePostName,
+			fileTypes : '*.jpg;*.jpeg;*.gif;*.png;*.bmp',
+			fileTypesDesc : 'Image Files',
+			fileUploadLimit : imageUploadLimit,
+			fileSizeLimit : imageSizeLimit,
+			postParams :  K.undef(self.extraFileUploadParams, {}),
+			queueLimitExceeded : lang.queueLimitExceeded,
+			fileExceedsSizeLimit : lang.fileExceedsSizeLimit,
+			zeroByteFile : lang.zeroByteFile,
+			invalidFiletype : lang.invalidFiletype,
+			unknownError : lang.unknownError,
+			pendingMessage : lang.pending,
+			errorMessage : lang.uploadError,
+			afterError : function(html) {
+				self.errorDialog(html);
+			}
+		});
+
+		return dialog;
+	};
+	self.clickToolbar(name, function() {
+		self.plugin.multiImageDialog({
+			clickFn : function (urlList) {
+				if (urlList.length === 0) {
+					return;
+				}
+				K.each(urlList, function(i, data) {
+					if (self.afterUpload) {
+						self.afterUpload.call(self, data.url, data, 'multiimage');
+					}
+					self.exec('insertimage', data.url, data.title, data.width, data.height, data.border, data.align);
+				});
+				// Bugfix: [Firefox] 上传图片后，总是出现正在加载的样式，需要延迟执行hideDialog
+				setTimeout(function() {
+					self.hideDialog().focus();
+				}, 0);
+			}
+		});
+	});
+});
+
+
+/**
+ * SWFUpload: http://www.swfupload.org, http://swfupload.googlecode.com
+ *
+ * mmSWFUpload 1.0: Flash upload dialog - http://profandesign.se/swfupload/,  http://www.vinterwebb.se/
+ *
+ * SWFUpload is (c) 2006-2007 Lars Huring, Olov Nilz閚 and Mammon Media and is released under the MIT License:
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ * SWFUpload 2 is (c) 2007-2008 Jake Roberts and is released under the MIT License:
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ */
+
+
+/* ******************* */
+/* Constructor & Init  */
+/* ******************* */
+
+(function() {
+
+window.SWFUpload = function (settings) {
+	this.initSWFUpload(settings);
+};
+
+SWFUpload.prototype.initSWFUpload = function (settings) {
+	try {
+		this.customSettings = {};	// A container where developers can place their own settings associated with this instance.
+		this.settings = settings;
+		this.eventQueue = [];
+		this.movieName = "KindEditor_SWFUpload_" + SWFUpload.movieCount++;
+		this.movieElement = null;
+
+
+		// Setup global control tracking
+		SWFUpload.instances[this.movieName] = this;
+
+		// Load the settings.  Load the Flash movie.
+		this.initSettings();
+		this.loadFlash();
+		this.displayDebugInfo();
+	} catch (ex) {
+		delete SWFUpload.instances[this.movieName];
+		throw ex;
+	}
+};
+
+/* *************** */
+/* Static Members  */
+/* *************** */
+SWFUpload.instances = {};
+SWFUpload.movieCount = 0;
+SWFUpload.version = "2.2.0 2009-03-25";
+SWFUpload.QUEUE_ERROR = {
+	QUEUE_LIMIT_EXCEEDED	  		: -100,
+	FILE_EXCEEDS_SIZE_LIMIT  		: -110,
+	ZERO_BYTE_FILE			  		: -120,
+	INVALID_FILETYPE		  		: -130
+};
+SWFUpload.UPLOAD_ERROR = {
+	HTTP_ERROR				  		: -200,
+	MISSING_UPLOAD_URL	      		: -210,
+	IO_ERROR				  		: -220,
+	SECURITY_ERROR			  		: -230,
+	UPLOAD_LIMIT_EXCEEDED	  		: -240,
+	UPLOAD_FAILED			  		: -250,
+	SPECIFIED_FILE_ID_NOT_FOUND		: -260,
+	FILE_VALIDATION_FAILED	  		: -270,
+	FILE_CANCELLED			  		: -280,
+	UPLOAD_STOPPED					: -290
+};
+SWFUpload.FILE_STATUS = {
+	QUEUED		 : -1,
+	IN_PROGRESS	 : -2,
+	ERROR		 : -3,
+	COMPLETE	 : -4,
+	CANCELLED	 : -5
+};
+SWFUpload.BUTTON_ACTION = {
+	SELECT_FILE  : -100,
+	SELECT_FILES : -110,
+	START_UPLOAD : -120
+};
+SWFUpload.CURSOR = {
+	ARROW : -1,
+	HAND : -2
+};
+SWFUpload.WINDOW_MODE = {
+	WINDOW : "window",
+	TRANSPARENT : "transparent",
+	OPAQUE : "opaque"
+};
+
+// Private: takes a URL, determines if it is relative and converts to an absolute URL
+// using the current site. Only processes the URL if it can, otherwise returns the URL untouched
+SWFUpload.completeURL = function(url) {
+	if (typeof(url) !== "string" || url.match(/^https?:\/\//i) || url.match(/^\//)) {
+		return url;
+	}
+
+	var currentURL = window.location.protocol + "//" + window.location.hostname + (window.location.port ? ":" + window.location.port : "");
+
+	var indexSlash = window.location.pathname.lastIndexOf("/");
+	if (indexSlash <= 0) {
+		path = "/";
+	} else {
+		path = window.location.pathname.substr(0, indexSlash) + "/";
+	}
+
+	return /*currentURL +*/ path + url;
+
+};
+
+
+/* ******************** */
+/* Instance Members  */
+/* ******************** */
+
+// Private: initSettings ensures that all the
+// settings are set, getting a default value if one was not assigned.
+SWFUpload.prototype.initSettings = function () {
+	this.ensureDefault = function (settingName, defaultValue) {
+		this.settings[settingName] = (this.settings[settingName] == undefined) ? defaultValue : this.settings[settingName];
+	};
+
+	// Upload backend settings
+	this.ensureDefault("upload_url", "");
+	this.ensureDefault("preserve_relative_urls", false);
+	this.ensureDefault("file_post_name", "Filedata");
+	this.ensureDefault("post_params", {});
+	this.ensureDefault("use_query_string", false);
+	this.ensureDefault("requeue_on_error", false);
+	this.ensureDefault("http_success", []);
+	this.ensureDefault("assume_success_timeout", 0);
+
+	// File Settings
+	this.ensureDefault("file_types", "*.*");
+	this.ensureDefault("file_types_description", "All Files");
+	this.ensureDefault("file_size_limit", 0);	// Default zero means "unlimited"
+	this.ensureDefault("file_upload_limit", 0);
+	this.ensureDefault("file_queue_limit", 0);
+
+	// Flash Settings
+	this.ensureDefault("flash_url", "swfupload.swf");
+	this.ensureDefault("prevent_swf_caching", true);
+
+	// Button Settings
+	this.ensureDefault("button_image_url", "");
+	this.ensureDefault("button_width", 1);
+	this.ensureDefault("button_height", 1);
+	this.ensureDefault("button_text", "");
+	this.ensureDefault("button_text_style", "color: #000000; font-size: 16pt;");
+	this.ensureDefault("button_text_top_padding", 0);
+	this.ensureDefault("button_text_left_padding", 0);
+	this.ensureDefault("button_action", SWFUpload.BUTTON_ACTION.SELECT_FILES);
+	this.ensureDefault("button_disabled", false);
+	this.ensureDefault("button_placeholder_id", "");
+	this.ensureDefault("button_placeholder", null);
+	this.ensureDefault("button_cursor", SWFUpload.CURSOR.ARROW);
+	this.ensureDefault("button_window_mode", SWFUpload.WINDOW_MODE.WINDOW);
+
+	// Debug Settings
+	this.ensureDefault("debug", false);
+	this.settings.debug_enabled = this.settings.debug;	// Here to maintain v2 API
+
+	// Event Handlers
+	this.settings.return_upload_start_handler = this.returnUploadStart;
+	this.ensureDefault("swfupload_loaded_handler", null);
+	this.ensureDefault("file_dialog_start_handler", null);
+	this.ensureDefault("file_queued_handler", null);
+	this.ensureDefault("file_queue_error_handler", null);
+	this.ensureDefault("file_dialog_complete_handler", null);
+
+	this.ensureDefault("upload_start_handler", null);
+	this.ensureDefault("upload_progress_handler", null);
+	this.ensureDefault("upload_error_handler", null);
+	this.ensureDefault("upload_success_handler", null);
+	this.ensureDefault("upload_complete_handler", null);
+
+	this.ensureDefault("debug_handler", this.debugMessage);
+
+	this.ensureDefault("custom_settings", {});
+
+	// Other settings
+	this.customSettings = this.settings.custom_settings;
+
+	// Update the flash url if needed
+	if (!!this.settings.prevent_swf_caching) {
+		this.settings.flash_url = this.settings.flash_url + (this.settings.flash_url.indexOf("?") < 0 ? "?" : "&") + "preventswfcaching=" + new Date().getTime();
+	}
+
+	if (!this.settings.preserve_relative_urls) {
+		//this.settings.flash_url = SWFUpload.completeURL(this.settings.flash_url);	// Don't need to do this one since flash doesn't look at it
+		this.settings.upload_url = SWFUpload.completeURL(this.settings.upload_url);
+		this.settings.button_image_url = SWFUpload.completeURL(this.settings.button_image_url);
+	}
+
+	delete this.ensureDefault;
+};
+
+// Private: loadFlash replaces the button_placeholder element with the flash movie.
+SWFUpload.prototype.loadFlash = function () {
+	var targetElement, tempParent;
+
+	// Make sure an element with the ID we are going to use doesn't already exist
+	if (document.getElementById(this.movieName) !== null) {
+		throw "ID " + this.movieName + " is already in use. The Flash Object could not be added";
+	}
+
+	// Get the element where we will be placing the flash movie
+	targetElement = document.getElementById(this.settings.button_placeholder_id) || this.settings.button_placeholder;
+
+	if (targetElement == undefined) {
+		throw "Could not find the placeholder element: " + this.settings.button_placeholder_id;
+	}
+
+	// Append the container and load the flash
+	tempParent = document.createElement("div");
+	tempParent.innerHTML = this.getFlashHTML();	// Using innerHTML is non-standard but the only sensible way to dynamically add Flash in IE (and maybe other browsers)
+	targetElement.parentNode.replaceChild(tempParent.firstChild, targetElement);
+
+	// Fix IE Flash/Form bug
+	if (window[this.movieName] == undefined) {
+		window[this.movieName] = this.getMovieElement();
+	}
+
+};
+
+// Private: getFlashHTML generates the object tag needed to embed the flash in to the document
+SWFUpload.prototype.getFlashHTML = function () {
+	// Flash Satay object syntax: http://www.alistapart.com/articles/flashsatay
+	// Fix bug for IE9
+	// http://www.kindsoft.net/view.php?bbsid=7&postid=5825&pagenum=1
+	var classid = '';
+	if (KindEditor.IE && KindEditor.V > 8) {
+		classid = ' classid = "clsid:d27cdb6e-ae6d-11cf-96b8-444553540000"';
+	}
+	return ['<object id="', this.movieName, '"' + classid + ' type="application/x-shockwave-flash" data="', this.settings.flash_url, '" width="', this.settings.button_width, '" height="', this.settings.button_height, '" class="swfupload">',
+				'<param name="wmode" value="', this.settings.button_window_mode, '" />',
+				'<param name="movie" value="', this.settings.flash_url, '" />',
+				'<param name="quality" value="high" />',
+				'<param name="menu" value="false" />',
+				'<param name="allowScriptAccess" value="always" />',
+				'<param name="flashvars" value="' + this.getFlashVars() + '" />',
+				'</object>'].join("");
+};
+
+// Private: getFlashVars builds the parameter string that will be passed
+// to flash in the flashvars param.
+SWFUpload.prototype.getFlashVars = function () {
+	// Build a string from the post param object
+	var paramString = this.buildParamString();
+	var httpSuccessString = this.settings.http_success.join(",");
+
+	// Build the parameter string
+	return ["movieName=", encodeURIComponent(this.movieName),
+			"&amp;uploadURL=", encodeURIComponent(this.settings.upload_url),
+			"&amp;useQueryString=", encodeURIComponent(this.settings.use_query_string),
+			"&amp;requeueOnError=", encodeURIComponent(this.settings.requeue_on_error),
+			"&amp;httpSuccess=", encodeURIComponent(httpSuccessString),
+			"&amp;assumeSuccessTimeout=", encodeURIComponent(this.settings.assume_success_timeout),
+			"&amp;params=", encodeURIComponent(paramString),
+			"&amp;filePostName=", encodeURIComponent(this.settings.file_post_name),
+			"&amp;fileTypes=", encodeURIComponent(this.settings.file_types),
+			"&amp;fileTypesDescription=", encodeURIComponent(this.settings.file_types_description),
+			"&amp;fileSizeLimit=", encodeURIComponent(this.settings.file_size_limit),
+			"&amp;fileUploadLimit=", encodeURIComponent(this.settings.file_upload_limit),
+			"&amp;fileQueueLimit=", encodeURIComponent(this.settings.file_queue_limit),
+			"&amp;debugEnabled=", encodeURIComponent(this.settings.debug_enabled),
+			"&amp;buttonImageURL=", encodeURIComponent(this.settings.button_image_url),
+			"&amp;buttonWidth=", encodeURIComponent(this.settings.button_width),
+			"&amp;buttonHeight=", encodeURIComponent(this.settings.button_height),
+			"&amp;buttonText=", encodeURIComponent(this.settings.button_text),
+			"&amp;buttonTextTopPadding=", encodeURIComponent(this.settings.button_text_top_padding),
+			"&amp;buttonTextLeftPadding=", encodeURIComponent(this.settings.button_text_left_padding),
+			"&amp;buttonTextStyle=", encodeURIComponent(this.settings.button_text_style),
+			"&amp;buttonAction=", encodeURIComponent(this.settings.button_action),
+			"&amp;buttonDisabled=", encodeURIComponent(this.settings.button_disabled),
+			"&amp;buttonCursor=", encodeURIComponent(this.settings.button_cursor)
+		].join("");
+};
+
+// Public: getMovieElement retrieves the DOM reference to the Flash element added by SWFUpload
+// The element is cached after the first lookup
+SWFUpload.prototype.getMovieElement = function () {
+	if (this.movieElement == undefined) {
+		this.movieElement = document.getElementById(this.movieName);
+	}
+
+	if (this.movieElement === null) {
+		throw "Could not find Flash element";
+	}
+
+	return this.movieElement;
+};
+
+// Private: buildParamString takes the name/value pairs in the post_params setting object
+// and joins them up in to a string formatted "name=value&amp;name=value"
+SWFUpload.prototype.buildParamString = function () {
+	var postParams = this.settings.post_params;
+	var paramStringPairs = [];
+
+	if (typeof(postParams) === "object") {
+		for (var name in postParams) {
+			if (postParams.hasOwnProperty(name)) {
+				paramStringPairs.push(encodeURIComponent(name.toString()) + "=" + encodeURIComponent(postParams[name].toString()));
+			}
+		}
+	}
+
+	return paramStringPairs.join("&amp;");
+};
+
+// Public: Used to remove a SWFUpload instance from the page. This method strives to remove
+// all references to the SWF, and other objects so memory is properly freed.
+// Returns true if everything was destroyed. Returns a false if a failure occurs leaving SWFUpload in an inconsistant state.
+// Credits: Major improvements provided by steffen
+SWFUpload.prototype.destroy = function () {
+	try {
+		// Make sure Flash is done before we try to remove it
+		this.cancelUpload(null, false);
+
+
+		// Remove the SWFUpload DOM nodes
+		var movieElement = null;
+		movieElement = this.getMovieElement();
+
+		if (movieElement && typeof(movieElement.CallFunction) === "unknown") { // We only want to do this in IE
+			// Loop through all the movie's properties and remove all function references (DOM/JS IE 6/7 memory leak workaround)
+			for (var i in movieElement) {
+				try {
+					if (typeof(movieElement[i]) === "function") {
+						movieElement[i] = null;
+					}
+				} catch (ex1) {}
+			}
+
+			// Remove the Movie Element from the page
+			try {
+				movieElement.parentNode.removeChild(movieElement);
+			} catch (ex) {}
+		}
+
+		// Remove IE form fix reference
+		window[this.movieName] = null;
+
+		// Destroy other references
+		SWFUpload.instances[this.movieName] = null;
+		delete SWFUpload.instances[this.movieName];
+
+		this.movieElement = null;
+		this.settings = null;
+		this.customSettings = null;
+		this.eventQueue = null;
+		this.movieName = null;
+
+
+		return true;
+	} catch (ex2) {
+		return false;
+	}
+};
+
+
+// Public: displayDebugInfo prints out settings and configuration
+// information about this SWFUpload instance.
+// This function (and any references to it) can be deleted when placing
+// SWFUpload in production.
+SWFUpload.prototype.displayDebugInfo = function () {
+	this.debug(
+		[
+			"---SWFUpload Instance Info---\n",
+			"Version: ", SWFUpload.version, "\n",
+			"Movie Name: ", this.movieName, "\n",
+			"Settings:\n",
+			"\t", "upload_url:               ", this.settings.upload_url, "\n",
+			"\t", "flash_url:                ", this.settings.flash_url, "\n",
+			"\t", "use_query_string:         ", this.settings.use_query_string.toString(), "\n",
+			"\t", "requeue_on_error:         ", this.settings.requeue_on_error.toString(), "\n",
+			"\t", "http_success:             ", this.settings.http_success.join(", "), "\n",
+			"\t", "assume_success_timeout:   ", this.settings.assume_success_timeout, "\n",
+			"\t", "file_post_name:           ", this.settings.file_post_name, "\n",
+			"\t", "post_params:              ", this.settings.post_params.toString(), "\n",
+			"\t", "file_types:               ", this.settings.file_types, "\n",
+			"\t", "file_types_description:   ", this.settings.file_types_description, "\n",
+			"\t", "file_size_limit:          ", this.settings.file_size_limit, "\n",
+			"\t", "file_upload_limit:        ", this.settings.file_upload_limit, "\n",
+			"\t", "file_queue_limit:         ", this.settings.file_queue_limit, "\n",
+			"\t", "debug:                    ", this.settings.debug.toString(), "\n",
+
+			"\t", "prevent_swf_caching:      ", this.settings.prevent_swf_caching.toString(), "\n",
+
+			"\t", "button_placeholder_id:    ", this.settings.button_placeholder_id.toString(), "\n",
+			"\t", "button_placeholder:       ", (this.settings.button_placeholder ? "Set" : "Not Set"), "\n",
+			"\t", "button_image_url:         ", this.settings.button_image_url.toString(), "\n",
+			"\t", "button_width:             ", this.settings.button_width.toString(), "\n",
+			"\t", "button_height:            ", this.settings.button_height.toString(), "\n",
+			"\t", "button_text:              ", this.settings.button_text.toString(), "\n",
+			"\t", "button_text_style:        ", this.settings.button_text_style.toString(), "\n",
+			"\t", "button_text_top_padding:  ", this.settings.button_text_top_padding.toString(), "\n",
+			"\t", "button_text_left_padding: ", this.settings.button_text_left_padding.toString(), "\n",
+			"\t", "button_action:            ", this.settings.button_action.toString(), "\n",
+			"\t", "button_disabled:          ", this.settings.button_disabled.toString(), "\n",
+
+			"\t", "custom_settings:          ", this.settings.custom_settings.toString(), "\n",
+			"Event Handlers:\n",
+			"\t", "swfupload_loaded_handler assigned:  ", (typeof this.settings.swfupload_loaded_handler === "function").toString(), "\n",
+			"\t", "file_dialog_start_handler assigned: ", (typeof this.settings.file_dialog_start_handler === "function").toString(), "\n",
+			"\t", "file_queued_handler assigned:       ", (typeof this.settings.file_queued_handler === "function").toString(), "\n",
+			"\t", "file_queue_error_handler assigned:  ", (typeof this.settings.file_queue_error_handler === "function").toString(), "\n",
+			"\t", "upload_start_handler assigned:      ", (typeof this.settings.upload_start_handler === "function").toString(), "\n",
+			"\t", "upload_progress_handler assigned:   ", (typeof this.settings.upload_progress_handler === "function").toString(), "\n",
+			"\t", "upload_error_handler assigned:      ", (typeof this.settings.upload_error_handler === "function").toString(), "\n",
+			"\t", "upload_success_handler assigned:    ", (typeof this.settings.upload_success_handler === "function").toString(), "\n",
+			"\t", "upload_complete_handler assigned:   ", (typeof this.settings.upload_complete_handler === "function").toString(), "\n",
+			"\t", "debug_handler assigned:             ", (typeof this.settings.debug_handler === "function").toString(), "\n"
+		].join("")
+	);
+};
+
+/* Note: addSetting and getSetting are no longer used by SWFUpload but are included
+	the maintain v2 API compatibility
+*/
+// Public: (Deprecated) addSetting adds a setting value. If the value given is undefined or null then the default_value is used.
+SWFUpload.prototype.addSetting = function (name, value, default_value) {
+    if (value == undefined) {
+        return (this.settings[name] = default_value);
+    } else {
+        return (this.settings[name] = value);
+	}
+};
+
+// Public: (Deprecated) getSetting gets a setting. Returns an empty string if the setting was not found.
+SWFUpload.prototype.getSetting = function (name) {
+    if (this.settings[name] != undefined) {
+        return this.settings[name];
+	}
+
+    return "";
+};
+
+
+
+// Private: callFlash handles function calls made to the Flash element.
+// Calls are made with a setTimeout for some functions to work around
+// bugs in the ExternalInterface library.
+SWFUpload.prototype.callFlash = function (functionName, argumentArray) {
+	argumentArray = argumentArray || [];
+
+	var movieElement = this.getMovieElement();
+	var returnValue, returnString;
+
+	// Flash's method if calling ExternalInterface methods (code adapted from MooTools).
+	try {
+		returnString = movieElement.CallFunction('<invoke name="' + functionName + '" returntype="javascript">' + __flash__argumentsToXML(argumentArray, 0) + '</invoke>');
+		returnValue = eval(returnString);
+	} catch (ex) {
+		throw "Call to " + functionName + " failed";
+	}
+
+	// Unescape file post param values
+	if (returnValue != undefined && typeof returnValue.post === "object") {
+		returnValue = this.unescapeFilePostParams(returnValue);
+	}
+
+	return returnValue;
+};
+
+/* *****************************
+	-- Flash control methods --
+	Your UI should use these
+	to operate SWFUpload
+   ***************************** */
+
+// WARNING: this function does not work in Flash Player 10
+// Public: selectFile causes a File Selection Dialog window to appear.  This
+// dialog only allows 1 file to be selected.
+SWFUpload.prototype.selectFile = function () {
+	this.callFlash("SelectFile");
+};
+
+// WARNING: this function does not work in Flash Player 10
+// Public: selectFiles causes a File Selection Dialog window to appear/ This
+// dialog allows the user to select any number of files
+// Flash Bug Warning: Flash limits the number of selectable files based on the combined length of the file names.
+// If the selection name length is too long the dialog will fail in an unpredictable manner.  There is no work-around
+// for this bug.
+SWFUpload.prototype.selectFiles = function () {
+	this.callFlash("SelectFiles");
+};
+
+
+// Public: startUpload starts uploading the first file in the queue unless
+// the optional parameter 'fileID' specifies the ID
+SWFUpload.prototype.startUpload = function (fileID) {
+	this.callFlash("StartUpload", [fileID]);
+};
+
+// Public: cancelUpload cancels any queued file.  The fileID parameter may be the file ID or index.
+// If you do not specify a fileID the current uploading file or first file in the queue is cancelled.
+// If you do not want the uploadError event to trigger you can specify false for the triggerErrorEvent parameter.
+SWFUpload.prototype.cancelUpload = function (fileID, triggerErrorEvent) {
+	if (triggerErrorEvent !== false) {
+		triggerErrorEvent = true;
+	}
+	this.callFlash("CancelUpload", [fileID, triggerErrorEvent]);
+};
+
+// Public: stopUpload stops the current upload and requeues the file at the beginning of the queue.
+// If nothing is currently uploading then nothing happens.
+SWFUpload.prototype.stopUpload = function () {
+	this.callFlash("StopUpload");
+};
+
+/* ************************
+ * Settings methods
+ *   These methods change the SWFUpload settings.
+ *   SWFUpload settings should not be changed directly on the settings object
+ *   since many of the settings need to be passed to Flash in order to take
+ *   effect.
+ * *********************** */
+
+// Public: getStats gets the file statistics object.
+SWFUpload.prototype.getStats = function () {
+	return this.callFlash("GetStats");
+};
+
+// Public: setStats changes the SWFUpload statistics.  You shouldn't need to
+// change the statistics but you can.  Changing the statistics does not
+// affect SWFUpload accept for the successful_uploads count which is used
+// by the upload_limit setting to determine how many files the user may upload.
+SWFUpload.prototype.setStats = function (statsObject) {
+	this.callFlash("SetStats", [statsObject]);
+};
+
+// Public: getFile retrieves a File object by ID or Index.  If the file is
+// not found then 'null' is returned.
+SWFUpload.prototype.getFile = function (fileID) {
+	if (typeof(fileID) === "number") {
+		return this.callFlash("GetFileByIndex", [fileID]);
+	} else {
+		return this.callFlash("GetFile", [fileID]);
+	}
+};
+
+// Public: addFileParam sets a name/value pair that will be posted with the
+// file specified by the Files ID.  If the name already exists then the
+// exiting value will be overwritten.
+SWFUpload.prototype.addFileParam = function (fileID, name, value) {
+	return this.callFlash("AddFileParam", [fileID, name, value]);
+};
+
+// Public: removeFileParam removes a previously set (by addFileParam) name/value
+// pair from the specified file.
+SWFUpload.prototype.removeFileParam = function (fileID, name) {
+	this.callFlash("RemoveFileParam", [fileID, name]);
+};
+
+// Public: setUploadUrl changes the upload_url setting.
+SWFUpload.prototype.setUploadURL = function (url) {
+	this.settings.upload_url = url.toString();
+	this.callFlash("SetUploadURL", [url]);
+};
+
+// Public: setPostParams changes the post_params setting
+SWFUpload.prototype.setPostParams = function (paramsObject) {
+	this.settings.post_params = paramsObject;
+	this.callFlash("SetPostParams", [paramsObject]);
+};
+
+// Public: addPostParam adds post name/value pair.  Each name can have only one value.
+SWFUpload.prototype.addPostParam = function (name, value) {
+	this.settings.post_params[name] = value;
+	this.callFlash("SetPostParams", [this.settings.post_params]);
+};
+
+// Public: removePostParam deletes post name/value pair.
+SWFUpload.prototype.removePostParam = function (name) {
+	delete this.settings.post_params[name];
+	this.callFlash("SetPostParams", [this.settings.post_params]);
+};
+
+// Public: setFileTypes changes the file_types setting and the file_types_description setting
+SWFUpload.prototype.setFileTypes = function (types, description) {
+	this.settings.file_types = types;
+	this.settings.file_types_description = description;
+	this.callFlash("SetFileTypes", [types, description]);
+};
+
+// Public: setFileSizeLimit changes the file_size_limit setting
+SWFUpload.prototype.setFileSizeLimit = function (fileSizeLimit) {
+	this.settings.file_size_limit = fileSizeLimit;
+	this.callFlash("SetFileSizeLimit", [fileSizeLimit]);
+};
+
+// Public: setFileUploadLimit changes the file_upload_limit setting
+SWFUpload.prototype.setFileUploadLimit = function (fileUploadLimit) {
+	this.settings.file_upload_limit = fileUploadLimit;
+	this.callFlash("SetFileUploadLimit", [fileUploadLimit]);
+};
+
+// Public: setFileQueueLimit changes the file_queue_limit setting
+SWFUpload.prototype.setFileQueueLimit = function (fileQueueLimit) {
+	this.settings.file_queue_limit = fileQueueLimit;
+	this.callFlash("SetFileQueueLimit", [fileQueueLimit]);
+};
+
+// Public: setFilePostName changes the file_post_name setting
+SWFUpload.prototype.setFilePostName = function (filePostName) {
+	this.settings.file_post_name = filePostName;
+	this.callFlash("SetFilePostName", [filePostName]);
+};
+
+// Public: setUseQueryString changes the use_query_string setting
+SWFUpload.prototype.setUseQueryString = function (useQueryString) {
+	this.settings.use_query_string = useQueryString;
+	this.callFlash("SetUseQueryString", [useQueryString]);
+};
+
+// Public: setRequeueOnError changes the requeue_on_error setting
+SWFUpload.prototype.setRequeueOnError = function (requeueOnError) {
+	this.settings.requeue_on_error = requeueOnError;
+	this.callFlash("SetRequeueOnError", [requeueOnError]);
+};
+
+// Public: setHTTPSuccess changes the http_success setting
+SWFUpload.prototype.setHTTPSuccess = function (http_status_codes) {
+	if (typeof http_status_codes === "string") {
+		http_status_codes = http_status_codes.replace(" ", "").split(",");
+	}
+
+	this.settings.http_success = http_status_codes;
+	this.callFlash("SetHTTPSuccess", [http_status_codes]);
+};
+
+// Public: setHTTPSuccess changes the http_success setting
+SWFUpload.prototype.setAssumeSuccessTimeout = function (timeout_seconds) {
+	this.settings.assume_success_timeout = timeout_seconds;
+	this.callFlash("SetAssumeSuccessTimeout", [timeout_seconds]);
+};
+
+// Public: setDebugEnabled changes the debug_enabled setting
+SWFUpload.prototype.setDebugEnabled = function (debugEnabled) {
+	this.settings.debug_enabled = debugEnabled;
+	this.callFlash("SetDebugEnabled", [debugEnabled]);
+};
+
+// Public: setButtonImageURL loads a button image sprite
+SWFUpload.prototype.setButtonImageURL = function (buttonImageURL) {
+	if (buttonImageURL == undefined) {
+		buttonImageURL = "";
+	}
+
+	this.settings.button_image_url = buttonImageURL;
+	this.callFlash("SetButtonImageURL", [buttonImageURL]);
+};
+
+// Public: setButtonDimensions resizes the Flash Movie and button
+SWFUpload.prototype.setButtonDimensions = function (width, height) {
+	this.settings.button_width = width;
+	this.settings.button_height = height;
+
+	var movie = this.getMovieElement();
+	if (movie != undefined) {
+		movie.style.width = width + "px";
+		movie.style.height = height + "px";
+	}
+
+	this.callFlash("SetButtonDimensions", [width, height]);
+};
+// Public: setButtonText Changes the text overlaid on the button
+SWFUpload.prototype.setButtonText = function (html) {
+	this.settings.button_text = html;
+	this.callFlash("SetButtonText", [html]);
+};
+// Public: setButtonTextPadding changes the top and left padding of the text overlay
+SWFUpload.prototype.setButtonTextPadding = function (left, top) {
+	this.settings.button_text_top_padding = top;
+	this.settings.button_text_left_padding = left;
+	this.callFlash("SetButtonTextPadding", [left, top]);
+};
+
+// Public: setButtonTextStyle changes the CSS used to style the HTML/Text overlaid on the button
+SWFUpload.prototype.setButtonTextStyle = function (css) {
+	this.settings.button_text_style = css;
+	this.callFlash("SetButtonTextStyle", [css]);
+};
+// Public: setButtonDisabled disables/enables the button
+SWFUpload.prototype.setButtonDisabled = function (isDisabled) {
+	this.settings.button_disabled = isDisabled;
+	this.callFlash("SetButtonDisabled", [isDisabled]);
+};
+// Public: setButtonAction sets the action that occurs when the button is clicked
+SWFUpload.prototype.setButtonAction = function (buttonAction) {
+	this.settings.button_action = buttonAction;
+	this.callFlash("SetButtonAction", [buttonAction]);
+};
+
+// Public: setButtonCursor changes the mouse cursor displayed when hovering over the button
+SWFUpload.prototype.setButtonCursor = function (cursor) {
+	this.settings.button_cursor = cursor;
+	this.callFlash("SetButtonCursor", [cursor]);
+};
+
+/* *******************************
+	Flash Event Interfaces
+	These functions are used by Flash to trigger the various
+	events.
+
+	All these functions a Private.
+
+	Because the ExternalInterface library is buggy the event calls
+	are added to a queue and the queue then executed by a setTimeout.
+	This ensures that events are executed in a determinate order and that
+	the ExternalInterface bugs are avoided.
+******************************* */
+
+SWFUpload.prototype.queueEvent = function (handlerName, argumentArray) {
+	// Warning: Don't call this.debug inside here or you'll create an infinite loop
+
+	if (argumentArray == undefined) {
+		argumentArray = [];
+	} else if (!(argumentArray instanceof Array)) {
+		argumentArray = [argumentArray];
+	}
+
+	var self = this;
+	if (typeof this.settings[handlerName] === "function") {
+		// Queue the event
+		this.eventQueue.push(function () {
+			this.settings[handlerName].apply(this, argumentArray);
+		});
+
+		// Execute the next queued event
+		setTimeout(function () {
+			self.executeNextEvent();
+		}, 0);
+
+	} else if (this.settings[handlerName] !== null) {
+		throw "Event handler " + handlerName + " is unknown or is not a function";
+	}
+};
+
+// Private: Causes the next event in the queue to be executed.  Since events are queued using a setTimeout
+// we must queue them in order to garentee that they are executed in order.
+SWFUpload.prototype.executeNextEvent = function () {
+	// Warning: Don't call this.debug inside here or you'll create an infinite loop
+
+	var  f = this.eventQueue ? this.eventQueue.shift() : null;
+	if (typeof(f) === "function") {
+		f.apply(this);
+	}
+};
+
+// Private: unescapeFileParams is part of a workaround for a flash bug where objects passed through ExternalInterface cannot have
+// properties that contain characters that are not valid for JavaScript identifiers. To work around this
+// the Flash Component escapes the parameter names and we must unescape again before passing them along.
+SWFUpload.prototype.unescapeFilePostParams = function (file) {
+	var reg = /[$]([0-9a-f]{4})/i;
+	var unescapedPost = {};
+	var uk;
+
+	if (file != undefined) {
+		for (var k in file.post) {
+			if (file.post.hasOwnProperty(k)) {
+				uk = k;
+				var match;
+				while ((match = reg.exec(uk)) !== null) {
+					uk = uk.replace(match[0], String.fromCharCode(parseInt("0x" + match[1], 16)));
+				}
+				unescapedPost[uk] = file.post[k];
+			}
+		}
+
+		file.post = unescapedPost;
+	}
+
+	return file;
+};
+
+// Private: Called by Flash to see if JS can call in to Flash (test if External Interface is working)
+SWFUpload.prototype.testExternalInterface = function () {
+	try {
+		return this.callFlash("TestExternalInterface");
+	} catch (ex) {
+		return false;
+	}
+};
+
+// Private: This event is called by Flash when it has finished loading. Don't modify this.
+// Use the swfupload_loaded_handler event setting to execute custom code when SWFUpload has loaded.
+SWFUpload.prototype.flashReady = function () {
+	// Check that the movie element is loaded correctly with its ExternalInterface methods defined
+	var movieElement = this.getMovieElement();
+
+	if (!movieElement) {
+		this.debug("Flash called back ready but the flash movie can't be found.");
+		return;
+	}
+
+	this.cleanUp(movieElement);
+
+	this.queueEvent("swfupload_loaded_handler");
+};
+
+// Private: removes Flash added fuctions to the DOM node to prevent memory leaks in IE.
+// This function is called by Flash each time the ExternalInterface functions are created.
+SWFUpload.prototype.cleanUp = function (movieElement) {
+	// Pro-actively unhook all the Flash functions
+	try {
+		if (this.movieElement && typeof(movieElement.CallFunction) === "unknown") { // We only want to do this in IE
+			this.debug("Removing Flash functions hooks (this should only run in IE and should prevent memory leaks)");
+			for (var key in movieElement) {
+				try {
+					if (typeof(movieElement[key]) === "function") {
+						movieElement[key] = null;
+					}
+				} catch (ex) {
+				}
+			}
+		}
+	} catch (ex1) {
+
+	}
+
+	// Fix Flashes own cleanup code so if the SWFMovie was removed from the page
+	// it doesn't display errors.
+	window["__flash__removeCallback"] = function (instance, name) {
+		try {
+			if (instance) {
+				instance[name] = null;
+			}
+		} catch (flashEx) {
+
+		}
+	};
+
+};
+
+
+/* This is a chance to do something before the browse window opens */
+SWFUpload.prototype.fileDialogStart = function () {
+	this.queueEvent("file_dialog_start_handler");
+};
+
+
+/* Called when a file is successfully added to the queue. */
+SWFUpload.prototype.fileQueued = function (file) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("file_queued_handler", file);
+};
+
+
+/* Handle errors that occur when an attempt to queue a file fails. */
+SWFUpload.prototype.fileQueueError = function (file, errorCode, message) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("file_queue_error_handler", [file, errorCode, message]);
+};
+
+/* Called after the file dialog has closed and the selected files have been queued.
+	You could call startUpload here if you want the queued files to begin uploading immediately. */
+SWFUpload.prototype.fileDialogComplete = function (numFilesSelected, numFilesQueued, numFilesInQueue) {
+	this.queueEvent("file_dialog_complete_handler", [numFilesSelected, numFilesQueued, numFilesInQueue]);
+};
+
+SWFUpload.prototype.uploadStart = function (file) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("return_upload_start_handler", file);
+};
+
+SWFUpload.prototype.returnUploadStart = function (file) {
+	var returnValue;
+	if (typeof this.settings.upload_start_handler === "function") {
+		file = this.unescapeFilePostParams(file);
+		returnValue = this.settings.upload_start_handler.call(this, file);
+	} else if (this.settings.upload_start_handler != undefined) {
+		throw "upload_start_handler must be a function";
+	}
+
+	// Convert undefined to true so if nothing is returned from the upload_start_handler it is
+	// interpretted as 'true'.
+	if (returnValue === undefined) {
+		returnValue = true;
+	}
+
+	returnValue = !!returnValue;
+
+	this.callFlash("ReturnUploadStart", [returnValue]);
+};
+
+
+
+SWFUpload.prototype.uploadProgress = function (file, bytesComplete, bytesTotal) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("upload_progress_handler", [file, bytesComplete, bytesTotal]);
+};
+
+SWFUpload.prototype.uploadError = function (file, errorCode, message) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("upload_error_handler", [file, errorCode, message]);
+};
+
+SWFUpload.prototype.uploadSuccess = function (file, serverData, responseReceived) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("upload_success_handler", [file, serverData, responseReceived]);
+};
+
+SWFUpload.prototype.uploadComplete = function (file) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("upload_complete_handler", file);
+};
+
+/* Called by SWFUpload JavaScript and Flash functions when debug is enabled. By default it writes messages to the
+   internal debug console.  You can override this event and have messages written where you want. */
+SWFUpload.prototype.debug = function (message) {
+	this.queueEvent("debug_handler", message);
+};
+
+
+/* **********************************
+	Debug Console
+	The debug console is a self contained, in page location
+	for debug message to be sent.  The Debug Console adds
+	itself to the body if necessary.
+
+	The console is automatically scrolled as messages appear.
+
+	If you are using your own debug handler or when you deploy to production and
+	have debug disabled you can remove these functions to reduce the file size
+	and complexity.
+********************************** */
+
+// Private: debugMessage is the default debug_handler.  If you want to print debug messages
+// call the debug() function.  When overriding the function your own function should
+// check to see if the debug setting is true before outputting debug information.
+SWFUpload.prototype.debugMessage = function (message) {
+	if (this.settings.debug) {
+		var exceptionMessage, exceptionValues = [];
+
+		// Check for an exception object and print it nicely
+		if (typeof message === "object" && typeof message.name === "string" && typeof message.message === "string") {
+			for (var key in message) {
+				if (message.hasOwnProperty(key)) {
+					exceptionValues.push(key + ": " + message[key]);
+				}
+			}
+			exceptionMessage = exceptionValues.join("\n") || "";
+			exceptionValues = exceptionMessage.split("\n");
+			exceptionMessage = "EXCEPTION: " + exceptionValues.join("\nEXCEPTION: ");
+			SWFUpload.Console.writeLine(exceptionMessage);
+		} else {
+			SWFUpload.Console.writeLine(message);
+		}
+	}
+};
+
+SWFUpload.Console = {};
+SWFUpload.Console.writeLine = function (message) {
+	var console, documentForm;
+
+	try {
+		console = document.getElementById("SWFUpload_Console");
+
+		if (!console) {
+			documentForm = document.createElement("form");
+			document.getElementsByTagName("body")[0].appendChild(documentForm);
+
+			console = document.createElement("textarea");
+			console.id = "SWFUpload_Console";
+			console.style.fontFamily = "monospace";
+			console.setAttribute("wrap", "off");
+			console.wrap = "off";
+			console.style.overflow = "auto";
+			console.style.width = "700px";
+			console.style.height = "350px";
+			console.style.margin = "5px";
+			documentForm.appendChild(console);
+		}
+
+		console.value += message + "\n";
+
+		console.scrollTop = console.scrollHeight - console.clientHeight;
+	} catch (ex) {
+		alert("Exception: " + ex.name + " Message: " + ex.message);
+	}
+};
+
+})();
+
+(function() {
+/*
+	Queue Plug-in
+
+	Features:
+		*Adds a cancelQueue() method for cancelling the entire queue.
+		*All queued files are uploaded when startUpload() is called.
+		*If false is returned from uploadComplete then the queue upload is stopped.
+		 If false is not returned (strict comparison) then the queue upload is continued.
+		*Adds a QueueComplete event that is fired when all the queued files have finished uploading.
+		 Set the event handler with the queue_complete_handler setting.
+
+	*/
+
+if (typeof(SWFUpload) === "function") {
+	SWFUpload.queue = {};
+
+	SWFUpload.prototype.initSettings = (function (oldInitSettings) {
+		return function () {
+			if (typeof(oldInitSettings) === "function") {
+				oldInitSettings.call(this);
+			}
+
+			this.queueSettings = {};
+
+			this.queueSettings.queue_cancelled_flag = false;
+			this.queueSettings.queue_upload_count = 0;
+
+			this.queueSettings.user_upload_complete_handler = this.settings.upload_complete_handler;
+			this.queueSettings.user_upload_start_handler = this.settings.upload_start_handler;
+			this.settings.upload_complete_handler = SWFUpload.queue.uploadCompleteHandler;
+			this.settings.upload_start_handler = SWFUpload.queue.uploadStartHandler;
+
+			this.settings.queue_complete_handler = this.settings.queue_complete_handler || null;
+		};
+	})(SWFUpload.prototype.initSettings);
+
+	SWFUpload.prototype.startUpload = function (fileID) {
+		this.queueSettings.queue_cancelled_flag = false;
+		this.callFlash("StartUpload", [fileID]);
+	};
+
+	SWFUpload.prototype.cancelQueue = function () {
+		this.queueSettings.queue_cancelled_flag = true;
+		this.stopUpload();
+
+		var stats = this.getStats();
+		while (stats.files_queued > 0) {
+			this.cancelUpload();
+			stats = this.getStats();
+		}
+	};
+
+	SWFUpload.queue.uploadStartHandler = function (file) {
+		var returnValue;
+		if (typeof(this.queueSettings.user_upload_start_handler) === "function") {
+			returnValue = this.queueSettings.user_upload_start_handler.call(this, file);
+		}
+
+		// To prevent upload a real "FALSE" value must be returned, otherwise default to a real "TRUE" value.
+		returnValue = (returnValue === false) ? false : true;
+
+		this.queueSettings.queue_cancelled_flag = !returnValue;
+
+		return returnValue;
+	};
+
+	SWFUpload.queue.uploadCompleteHandler = function (file) {
+		var user_upload_complete_handler = this.queueSettings.user_upload_complete_handler;
+		var continueUpload;
+
+		if (file.filestatus === SWFUpload.FILE_STATUS.COMPLETE) {
+			this.queueSettings.queue_upload_count++;
+		}
+
+		if (typeof(user_upload_complete_handler) === "function") {
+			continueUpload = (user_upload_complete_handler.call(this, file) === false) ? false : true;
+		} else if (file.filestatus === SWFUpload.FILE_STATUS.QUEUED) {
+			// If the file was stopped and re-queued don't restart the upload
+			continueUpload = false;
+		} else {
+			continueUpload = true;
+		}
+
+		if (continueUpload) {
+			var stats = this.getStats();
+			if (stats.files_queued > 0 && this.queueSettings.queue_cancelled_flag === false) {
+				this.startUpload();
+			} else if (this.queueSettings.queue_cancelled_flag === false) {
+				this.queueEvent("queue_complete_handler", [this.queueSettings.queue_upload_count]);
+				this.queueSettings.queue_upload_count = 0;
+			} else {
+				this.queueSettings.queue_cancelled_flag = false;
+				this.queueSettings.queue_upload_count = 0;
+			}
+		}
+	};
+}
+
+})();
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/pagebreak/pagebreak.js b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/pagebreak/pagebreak.js
new file mode 100644
index 0000000..dfa883a
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/pagebreak/pagebreak.js
@@ -0,0 +1,27 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('pagebreak', function(K) {
+	var self = this;
+	var name = 'pagebreak';
+	var pagebreakHtml = K.undef(self.pagebreakHtml, '<hr style="page-break-after: always;" class="ke-pagebreak" />');
+
+	self.clickToolbar(name, function() {
+		var cmd = self.cmd, range = cmd.range;
+		self.focus();
+		var tail = self.newlineTag == 'br' || K.WEBKIT ? '' : '<span id="__kindeditor_tail_tag__"></span>';
+		self.insertHtml(pagebreakHtml + tail);
+		if (tail !== '') {
+			var p = K('#__kindeditor_tail_tag__', self.edit.doc);
+			range.selectNodeContents(p[0]);
+			p.removeAttr('id');
+			cmd.select();
+		}
+	});
+});
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/plainpaste/plainpaste.js b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/plainpaste/plainpaste.js
new file mode 100644
index 0000000..8f7bed8
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/plainpaste/plainpaste.js
@@ -0,0 +1,41 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('plainpaste', function(K) {
+	var self = this, name = 'plainpaste';
+	self.clickToolbar(name, function() {
+		var lang = self.lang(name + '.'),
+			html = '<div style="padding:10px 20px;">' +
+				'<div style="margin-bottom:10px;">' + lang.comment + '</div>' +
+				'<textarea class="ke-textarea" style="width:408px;height:260px;"></textarea>' +
+				'</div>',
+			dialog = self.createDialog({
+				name : name,
+				width : 450,
+				title : self.lang(name),
+				body : html,
+				yesBtn : {
+					name : self.lang('yes'),
+					click : function(e) {
+						var html = textarea.val();
+						html = K.escape(html);
+						html = html.replace(/ {2}/g, ' &nbsp;');
+						if (self.newlineTag == 'p') {
+							html = html.replace(/^/, '<p>').replace(/$/, '</p>').replace(/\n/g, '</p><p>');
+						} else {
+							html = html.replace(/\n/g, '<br />$&');
+						}
+						self.insertHtml(html).hideDialog().focus();
+					}
+				}
+			}),
+			textarea = K('textarea', dialog.div);
+		textarea[0].focus();
+	});
+});
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/preview/preview.js b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/preview/preview.js
new file mode 100644
index 0000000..ef6e2cf
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/preview/preview.js
@@ -0,0 +1,31 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('preview', function(K) {
+	var self = this, name = 'preview', undefined;
+	self.clickToolbar(name, function() {
+		var lang = self.lang(name + '.'),
+			html = '<div style="padding:10px 20px;">' +
+				'<iframe class="ke-textarea" frameborder="0" style="width:708px;height:400px;"></iframe>' +
+				'</div>',
+			dialog = self.createDialog({
+				name : name,
+				width : 750,
+				title : self.lang(name),
+				body : html
+			}),
+			iframe = K('iframe', dialog.div),
+			doc = K.iframeDoc(iframe);
+		doc.open();
+		doc.write(self.fullHtml());
+		doc.close();
+		K(doc.body).css('background-color', '#FFF');
+		iframe[0].contentWindow.focus();
+	});
+});
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/quickformat/quickformat.js b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/quickformat/quickformat.js
new file mode 100644
index 0000000..5b98c72
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/quickformat/quickformat.js
@@ -0,0 +1,81 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('quickformat', function(K) {
+	var self = this, name = 'quickformat',
+		blockMap = K.toMap('blockquote,center,div,h1,h2,h3,h4,h5,h6,p');
+	function getFirstChild(knode) {
+		var child = knode.first();
+		while (child && child.first()) {
+			child = child.first();
+		}
+		return child;
+	}
+	self.clickToolbar(name, function() {
+		self.focus();
+		var doc = self.edit.doc,
+			range = self.cmd.range,
+			child = K(doc.body).first(), next,
+			nodeList = [], subList = [],
+			bookmark = range.createBookmark(true);
+		while(child) {
+			next = child.next();
+			var firstChild = getFirstChild(child);
+			if (!firstChild || firstChild.name != 'img') {
+				if (blockMap[child.name]) {
+					child.html(child.html().replace(/^(\s|&nbsp;|　)+/ig, ''));
+					child.css('text-indent', '2em');
+				} else {
+					subList.push(child);
+				}
+				if (!next || (blockMap[next.name] || blockMap[child.name] && !blockMap[next.name])) {
+					if (subList.length > 0) {
+						nodeList.push(subList);
+					}
+					subList = [];
+				}
+			}
+			child = next;
+		}
+		K.each(nodeList, function(i, subList) {
+			var wrapper = K('<p style="text-indent:2em;"></p>', doc);
+			subList[0].before(wrapper);
+			K.each(subList, function(i, knode) {
+				wrapper.append(knode);
+			});
+		});
+		range.moveToBookmark(bookmark);
+		self.addBookmark();
+	});
+});
+
+/**
+--------------------------
+abcd<br />
+1234<br />
+
+to
+
+<p style="text-indent:2em;">
+	abcd<br />
+	1234<br />
+</p>
+
+--------------------------
+
+&nbsp; abcd<img>1233
+<p>1234</p>
+
+to
+
+<p style="text-indent:2em;">abcd<img>1233</p>
+<p style="text-indent:2em;">1234</p>
+
+--------------------------
+*/
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/table/table.js b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/table/table.js
new file mode 100644
index 0000000..4033b6a
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/table/table.js
@@ -0,0 +1,712 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('table', function(K) {
+	var self = this, name = 'table', lang = self.lang(name + '.'), zeroborder = 'ke-zeroborder';
+	// 设置颜色
+	function _setColor(box, color) {
+		color = color.toUpperCase();
+		box.css('background-color', color);
+		box.css('color', color === '#000000' ? '#FFFFFF' : '#000000');
+		box.html(color);
+	}
+	// 初始化取色器
+	var pickerList = [];
+	function _initColorPicker(dialogDiv, colorBox) {
+		colorBox.bind('click,mousedown', function(e){
+			e.stopPropagation();
+		});
+		function removePicker() {
+			K.each(pickerList, function() {
+				this.remove();
+			});
+			pickerList = [];
+			K(document).unbind('click,mousedown', removePicker);
+			dialogDiv.unbind('click,mousedown', removePicker);
+		}
+		colorBox.click(function(e) {
+			removePicker();
+			var box = K(this),
+				pos = box.pos();
+			var picker = K.colorpicker({
+				x : pos.x,
+				y : pos.y + box.height(),
+				z : 811214,
+				selectedColor : K(this).html(),
+				colors : self.colorTable,
+				noColor : self.lang('noColor'),
+				shadowMode : self.shadowMode,
+				click : function(color) {
+					_setColor(box, color);
+					removePicker();
+				}
+			});
+			pickerList.push(picker);
+			K(document).bind('click,mousedown', removePicker);
+			dialogDiv.bind('click,mousedown', removePicker);
+		});
+	}
+	// 取得下一行cell的index
+	function _getCellIndex(table, row, cell) {
+		var rowSpanCount = 0;
+		for (var i = 0, len = row.cells.length; i < len; i++) {
+			if (row.cells[i] == cell) {
+				break;
+			}
+			rowSpanCount += row.cells[i].rowSpan - 1;
+		}
+		return cell.cellIndex - rowSpanCount;
+	}
+	self.plugin.table = {
+		//insert or modify table
+		prop : function(isInsert) {
+			var html = [
+				'<div style="padding:20px;">',
+				//rows, cols
+				'<div class="ke-dialog-row">',
+				'<label for="keRows" style="width:90px;">' + lang.cells + '</label>',
+				lang.rows + ' <input type="text" id="keRows" class="ke-input-text ke-input-number" name="rows" value="" maxlength="4" /> &nbsp; ',
+				lang.cols + ' <input type="text" class="ke-input-text ke-input-number" name="cols" value="" maxlength="4" />',
+				'</div>',
+				//width, height
+				'<div class="ke-dialog-row">',
+				'<label for="keWidth" style="width:90px;">' + lang.size + '</label>',
+				lang.width + ' <input type="text" id="keWidth" class="ke-input-text ke-input-number" name="width" value="" maxlength="4" /> &nbsp; ',
+				'<select name="widthType">',
+				'<option value="%">' + lang.percent + '</option>',
+				'<option value="px">' + lang.px + '</option>',
+				'</select> &nbsp; ',
+				lang.height + ' <input type="text" class="ke-input-text ke-input-number" name="height" value="" maxlength="4" /> &nbsp; ',
+				'<select name="heightType">',
+				'<option value="%">' + lang.percent + '</option>',
+				'<option value="px">' + lang.px + '</option>',
+				'</select>',
+				'</div>',
+				//space, padding
+				'<div class="ke-dialog-row">',
+				'<label for="kePadding" style="width:90px;">' + lang.space + '</label>',
+				lang.padding + ' <input type="text" id="kePadding" class="ke-input-text ke-input-number" name="padding" value="" maxlength="4" /> &nbsp; ',
+				lang.spacing + ' <input type="text" class="ke-input-text ke-input-number" name="spacing" value="" maxlength="4" />',
+				'</div>',
+				//align
+				'<div class="ke-dialog-row">',
+				'<label for="keAlign" style="width:90px;">' + lang.align + '</label>',
+				'<select id="keAlign" name="align">',
+				'<option value="">' + lang.alignDefault + '</option>',
+				'<option value="left">' + lang.alignLeft + '</option>',
+				'<option value="center">' + lang.alignCenter + '</option>',
+				'<option value="right">' + lang.alignRight + '</option>',
+				'</select>',
+				'</div>',
+				//border
+				'<div class="ke-dialog-row">',
+				'<label for="keBorder" style="width:90px;">' + lang.border + '</label>',
+				lang.borderWidth + ' <input type="text" id="keBorder" class="ke-input-text ke-input-number" name="border" value="" maxlength="4" /> &nbsp; ',
+				lang.borderColor + ' <span class="ke-inline-block ke-input-color"></span>',
+				'</div>',
+				//background color
+				'<div class="ke-dialog-row">',
+				'<label for="keBgColor" style="width:90px;">' + lang.backgroundColor + '</label>',
+				'<span class="ke-inline-block ke-input-color"></span>',
+				'</div>',
+				'</div>'
+			].join('');
+			var bookmark = self.cmd.range.createBookmark();
+			var dialog = self.createDialog({
+				name : name,
+				width : 500,
+				title : self.lang(name),
+				body : html,
+				beforeRemove : function() {
+					colorBox.unbind();
+				},
+				yesBtn : {
+					name : self.lang('yes'),
+					click : function(e) {
+						var rows = rowsBox.val(),
+							cols = colsBox.val(),
+							width = widthBox.val(),
+							height = heightBox.val(),
+							widthType = widthTypeBox.val(),
+							heightType = heightTypeBox.val(),
+							padding = paddingBox.val(),
+							spacing = spacingBox.val(),
+							align = alignBox.val(),
+							border = borderBox.val(),
+							borderColor = K(colorBox[0]).html() || '',
+							bgColor = K(colorBox[1]).html() || '';
+						if (rows == 0 || !/^\d+$/.test(rows)) {
+							alert(self.lang('invalidRows'));
+							rowsBox[0].focus();
+							return;
+						}
+						if (cols == 0 || !/^\d+$/.test(cols)) {
+							alert(self.lang('invalidRows'));
+							colsBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(width)) {
+							alert(self.lang('invalidWidth'));
+							widthBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(height)) {
+							alert(self.lang('invalidHeight'));
+							heightBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(padding)) {
+							alert(self.lang('invalidPadding'));
+							paddingBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(spacing)) {
+							alert(self.lang('invalidSpacing'));
+							spacingBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(border)) {
+							alert(self.lang('invalidBorder'));
+							borderBox[0].focus();
+							return;
+						}
+						//modify table
+						if (table) {
+							if (width !== '') {
+								table.width(width + widthType);
+							} else {
+								table.css('width', '');
+							}
+							if (table[0].width !== undefined) {
+								table.removeAttr('width');
+							}
+							if (height !== '') {
+								table.height(height + heightType);
+							} else {
+								table.css('height', '');
+							}
+							if (table[0].height !== undefined) {
+								table.removeAttr('height');
+							}
+							table.css('background-color', bgColor);
+							if (table[0].bgColor !== undefined) {
+								table.removeAttr('bgColor');
+							}
+							if (padding !== '') {
+								table[0].cellPadding = padding;
+							} else {
+								table.removeAttr('cellPadding');
+							}
+							if (spacing !== '') {
+								table[0].cellSpacing = spacing;
+							} else {
+								table.removeAttr('cellSpacing');
+							}
+							if (align !== '') {
+								table[0].align = align;
+							} else {
+								table.removeAttr('align');
+							}
+							if (border !== '') {
+								table.attr('border', border);
+							} else {
+								table.removeAttr('border');
+							}
+							if (border === '' || border === '0') {
+								table.addClass(zeroborder);
+							} else {
+								table.removeClass(zeroborder);
+							}
+							if (borderColor !== '') {
+								table.attr('borderColor', borderColor);
+							} else {
+								table.removeAttr('borderColor');
+							}
+							self.hideDialog().focus();
+							self.cmd.range.moveToBookmark(bookmark);
+							self.cmd.select();
+							self.addBookmark();
+							return;
+						}
+						//insert new table
+						var style = '';
+						if (width !== '') {
+							style += 'width:' + width + widthType + ';';
+						}
+						if (height !== '') {
+							style += 'height:' + height + heightType + ';';
+						}
+						if (bgColor !== '') {
+							style += 'background-color:' + bgColor + ';';
+						}
+						var html = '<table';
+						if (style !== '') {
+							html += ' style="' + style + '"';
+						}
+						if (padding !== '') {
+							html += ' cellpadding="' + padding + '"';
+						}
+						if (spacing !== '') {
+							html += ' cellspacing="' + spacing + '"';
+						}
+						if (align !== '') {
+							html += ' align="' + align + '"';
+						}
+						if (border !== '') {
+							html += ' border="' + border + '"';
+						}
+						if (border === '' || border === '0') {
+							html += ' class="' + zeroborder + '"';
+						}
+						if (borderColor !== '') {
+							html += ' bordercolor="' + borderColor + '"';
+						}
+						html += '>';
+						for (var i = 0; i < rows; i++) {
+							html += '<tr>';
+							for (var j = 0; j < cols; j++) {
+								html += '<td>' + (K.IE ? '&nbsp;' : '<br />') + '</td>';
+							}
+							html += '</tr>';
+						}
+						html += '</table>';
+						if (!K.IE) {
+							html += '<br />';
+						}
+						self.insertHtml(html);
+						self.select().hideDialog().focus();
+						self.addBookmark();
+					}
+				}
+			}),
+			div = dialog.div,
+			rowsBox = K('[name="rows"]', div).val(3),
+			colsBox = K('[name="cols"]', div).val(2),
+			widthBox = K('[name="width"]', div).val(100),
+			heightBox = K('[name="height"]', div),
+			widthTypeBox = K('[name="widthType"]', div),
+			heightTypeBox = K('[name="heightType"]', div),
+			paddingBox = K('[name="padding"]', div).val(2),
+			spacingBox = K('[name="spacing"]', div).val(0),
+			alignBox = K('[name="align"]', div),
+			borderBox = K('[name="border"]', div).val(1),
+			colorBox = K('.ke-input-color', div);
+			_initColorPicker(div, colorBox.eq(0));
+			_initColorPicker(div, colorBox.eq(1));
+			_setColor(colorBox.eq(0), '#000000');
+			_setColor(colorBox.eq(1), '');
+			// foucs and select
+			rowsBox[0].focus();
+			rowsBox[0].select();
+			var table;
+			if (isInsert) {
+				return;
+			}
+			//get selected table node
+			table = self.plugin.getSelectedTable();
+			if (table) {
+				rowsBox.val(table[0].rows.length);
+				colsBox.val(table[0].rows.length > 0 ? table[0].rows[0].cells.length : 0);
+				rowsBox.attr('disabled', true);
+				colsBox.attr('disabled', true);
+				var match,
+					tableWidth = table[0].style.width || table[0].width,
+					tableHeight = table[0].style.height || table[0].height;
+				if (tableWidth !== undefined && (match = /^(\d+)((?:px|%)*)$/.exec(tableWidth))) {
+					widthBox.val(match[1]);
+					widthTypeBox.val(match[2]);
+				} else {
+					widthBox.val('');
+				}
+				if (tableHeight !== undefined && (match = /^(\d+)((?:px|%)*)$/.exec(tableHeight))) {
+					heightBox.val(match[1]);
+					heightTypeBox.val(match[2]);
+				}
+				paddingBox.val(table[0].cellPadding || '');
+				spacingBox.val(table[0].cellSpacing || '');
+				alignBox.val(table[0].align || '');
+				borderBox.val(table[0].border === undefined ? '' : table[0].border);
+				_setColor(colorBox.eq(0), K.toHex(table.attr('borderColor') || ''));
+				_setColor(colorBox.eq(1), K.toHex(table[0].style.backgroundColor || table[0].bgColor || ''));
+				widthBox[0].focus();
+				widthBox[0].select();
+			}
+		},
+		//modify cell
+		cellprop : function() {
+			var html = [
+				'<div style="padding:20px;">',
+				//width, height
+				'<div class="ke-dialog-row">',
+				'<label for="keWidth" style="width:90px;">' + lang.size + '</label>',
+				lang.width + ' <input type="text" id="keWidth" class="ke-input-text ke-input-number" name="width" value="" maxlength="4" /> &nbsp; ',
+				'<select name="widthType">',
+				'<option value="%">' + lang.percent + '</option>',
+				'<option value="px">' + lang.px + '</option>',
+				'</select> &nbsp; ',
+				lang.height + ' <input type="text" class="ke-input-text ke-input-number" name="height" value="" maxlength="4" /> &nbsp; ',
+				'<select name="heightType">',
+				'<option value="%">' + lang.percent + '</option>',
+				'<option value="px">' + lang.px + '</option>',
+				'</select>',
+				'</div>',
+				//align
+				'<div class="ke-dialog-row">',
+				'<label for="keAlign" style="width:90px;">' + lang.align + '</label>',
+				lang.textAlign + ' <select id="keAlign" name="textAlign">',
+				'<option value="">' + lang.alignDefault + '</option>',
+				'<option value="left">' + lang.alignLeft + '</option>',
+				'<option value="center">' + lang.alignCenter + '</option>',
+				'<option value="right">' + lang.alignRight + '</option>',
+				'</select> ',
+				lang.verticalAlign + ' <select name="verticalAlign">',
+				'<option value="">' + lang.alignDefault + '</option>',
+				'<option value="top">' + lang.alignTop + '</option>',
+				'<option value="middle">' + lang.alignMiddle + '</option>',
+				'<option value="bottom">' + lang.alignBottom + '</option>',
+				'<option value="baseline">' + lang.alignBaseline + '</option>',
+				'</select>',
+				'</div>',
+				//border
+				'<div class="ke-dialog-row">',
+				'<label for="keBorder" style="width:90px;">' + lang.border + '</label>',
+				lang.borderWidth + ' <input type="text" id="keBorder" class="ke-input-text ke-input-number" name="border" value="" maxlength="4" /> &nbsp; ',
+				lang.borderColor + ' <span class="ke-inline-block ke-input-color"></span>',
+				'</div>',
+				//background color
+				'<div class="ke-dialog-row">',
+				'<label for="keBgColor" style="width:90px;">' + lang.backgroundColor + '</label>',
+				'<span class="ke-inline-block ke-input-color"></span>',
+				'</div>',
+				'</div>'
+			].join('');
+			var bookmark = self.cmd.range.createBookmark();
+			var dialog = self.createDialog({
+				name : name,
+				width : 500,
+				title : self.lang('tablecell'),
+				body : html,
+				beforeRemove : function() {
+					colorBox.unbind();
+				},
+				yesBtn : {
+					name : self.lang('yes'),
+					click : function(e) {
+						var width = widthBox.val(),
+							height = heightBox.val(),
+							widthType = widthTypeBox.val(),
+							heightType = heightTypeBox.val(),
+							padding = paddingBox.val(),
+							spacing = spacingBox.val(),
+							textAlign = textAlignBox.val(),
+							verticalAlign = verticalAlignBox.val(),
+							border = borderBox.val(),
+							borderColor = K(colorBox[0]).html() || '',
+							bgColor = K(colorBox[1]).html() || '';
+						if (!/^\d*$/.test(width)) {
+							alert(self.lang('invalidWidth'));
+							widthBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(height)) {
+							alert(self.lang('invalidHeight'));
+							heightBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(border)) {
+							alert(self.lang('invalidBorder'));
+							borderBox[0].focus();
+							return;
+						}
+						cell.css({
+							width : width !== '' ? (width + widthType) : '',
+							height : height !== '' ? (height + heightType) : '',
+							'background-color' : bgColor,
+							'text-align' : textAlign,
+							'vertical-align' : verticalAlign,
+							'border-width' : border,
+							'border-style' : border !== '' ? 'solid' : '',
+							'border-color' : borderColor
+						});
+						self.hideDialog().focus();
+						self.cmd.range.moveToBookmark(bookmark);
+						self.cmd.select();
+						self.addBookmark();
+					}
+				}
+			}),
+			div = dialog.div,
+			widthBox = K('[name="width"]', div).val(100),
+			heightBox = K('[name="height"]', div),
+			widthTypeBox = K('[name="widthType"]', div),
+			heightTypeBox = K('[name="heightType"]', div),
+			paddingBox = K('[name="padding"]', div).val(2),
+			spacingBox = K('[name="spacing"]', div).val(0),
+			textAlignBox = K('[name="textAlign"]', div),
+			verticalAlignBox = K('[name="verticalAlign"]', div),
+			borderBox = K('[name="border"]', div).val(1),
+			colorBox = K('.ke-input-color', div);
+			_initColorPicker(div, colorBox.eq(0));
+			_initColorPicker(div, colorBox.eq(1));
+			_setColor(colorBox.eq(0), '#000000');
+			_setColor(colorBox.eq(1), '');
+			// foucs and select
+			widthBox[0].focus();
+			widthBox[0].select();
+			// get selected cell
+			var cell = self.plugin.getSelectedCell();
+			var match,
+				cellWidth = cell[0].style.width || cell[0].width || '',
+				cellHeight = cell[0].style.height || cell[0].height || '';
+			if ((match = /^(\d+)((?:px|%)*)$/.exec(cellWidth))) {
+				widthBox.val(match[1]);
+				widthTypeBox.val(match[2]);
+			} else {
+				widthBox.val('');
+			}
+			if ((match = /^(\d+)((?:px|%)*)$/.exec(cellHeight))) {
+				heightBox.val(match[1]);
+				heightTypeBox.val(match[2]);
+			}
+			textAlignBox.val(cell[0].style.textAlign || '');
+			verticalAlignBox.val(cell[0].style.verticalAlign || '');
+			var border = cell[0].style.borderWidth || '';
+			if (border) {
+				border = parseInt(border);
+			}
+			borderBox.val(border);
+			_setColor(colorBox.eq(0), K.toHex(cell[0].style.borderColor || ''));
+			_setColor(colorBox.eq(1), K.toHex(cell[0].style.backgroundColor || ''));
+			widthBox[0].focus();
+			widthBox[0].select();
+		},
+		insert : function() {
+			this.prop(true);
+		},
+		'delete' : function() {
+			var table = self.plugin.getSelectedTable();
+			self.cmd.range.setStartBefore(table[0]).collapse(true);
+			self.cmd.select();
+			table.remove();
+			self.addBookmark();
+		},
+		colinsert : function(offset) {
+			var table = self.plugin.getSelectedTable()[0],
+				row = self.plugin.getSelectedRow()[0],
+				cell = self.plugin.getSelectedCell()[0],
+				index = cell.cellIndex + offset;
+			// 取得第一行的index
+			index += table.rows[0].cells.length - row.cells.length;
+
+			for (var i = 0, len = table.rows.length; i < len; i++) {
+				var newRow = table.rows[i],
+					newCell = newRow.insertCell(index);
+				newCell.innerHTML = K.IE ? '' : '<br />';
+				// 调整下一行的单元格index
+				index = _getCellIndex(table, newRow, newCell);
+			}
+			self.cmd.range.selectNodeContents(cell).collapse(true);
+			self.cmd.select();
+			self.addBookmark();
+		},
+		colinsertleft : function() {
+			this.colinsert(0);
+		},
+		colinsertright : function() {
+			this.colinsert(1);
+		},
+		rowinsert : function(offset) {
+			var table = self.plugin.getSelectedTable()[0],
+				row = self.plugin.getSelectedRow()[0],
+				cell = self.plugin.getSelectedCell()[0];
+			var rowIndex = row.rowIndex;
+			if (offset === 1) {
+				rowIndex = row.rowIndex + (cell.rowSpan - 1) + offset;
+			}
+			var newRow = table.insertRow(rowIndex);
+
+			for (var i = 0, len = row.cells.length; i < len; i++) {
+				// 调整cell个数
+				if (row.cells[i].rowSpan > 1) {
+					len -= row.cells[i].rowSpan - 1;
+				}
+				var newCell = newRow.insertCell(i);
+				// copy colspan
+				if (offset === 1 && row.cells[i].colSpan > 1) {
+					newCell.colSpan = row.cells[i].colSpan;
+				}
+				newCell.innerHTML = K.IE ? '' : '<br />';
+			}
+			// 调整rowspan
+			for (var j = rowIndex; j >= 0; j--) {
+				var cells = table.rows[j].cells;
+				if (cells.length > i) {
+					for (var k = cell.cellIndex; k >= 0; k--) {
+						if (cells[k].rowSpan > 1) {
+							cells[k].rowSpan += 1;
+						}
+					}
+					break;
+				}
+			}
+			self.cmd.range.selectNodeContents(cell).collapse(true);
+			self.cmd.select();
+			self.addBookmark();
+		},
+		rowinsertabove : function() {
+			this.rowinsert(0);
+		},
+		rowinsertbelow : function() {
+			this.rowinsert(1);
+		},
+		rowmerge : function() {
+			var table = self.plugin.getSelectedTable()[0],
+				row = self.plugin.getSelectedRow()[0],
+				cell = self.plugin.getSelectedCell()[0],
+				rowIndex = row.rowIndex, // 当前行的index
+				nextRowIndex = rowIndex + cell.rowSpan, // 下一行的index
+				nextRow = table.rows[nextRowIndex]; // 下一行
+			// 最后一行不能合并
+			if (table.rows.length <= nextRowIndex) {
+				return;
+			}
+			var cellIndex = cell.cellIndex; // 下一行单元格的index
+			if (nextRow.cells.length <= cellIndex) {
+				return;
+			}
+			var nextCell = nextRow.cells[cellIndex]; // 下一行单元格
+			// 上下行的colspan不一致时不能合并
+			if (cell.colSpan !== nextCell.colSpan) {
+				return;
+			}
+			cell.rowSpan += nextCell.rowSpan;
+			nextRow.deleteCell(cellIndex);
+			self.cmd.range.selectNodeContents(cell).collapse(true);
+			self.cmd.select();
+			self.addBookmark();
+		},
+		colmerge : function() {
+			var table = self.plugin.getSelectedTable()[0],
+				row = self.plugin.getSelectedRow()[0],
+				cell = self.plugin.getSelectedCell()[0],
+				rowIndex = row.rowIndex, // 当前行的index
+				cellIndex = cell.cellIndex,
+				nextCellIndex = cellIndex + 1;
+			// 最后一列不能合并
+			if (row.cells.length <= nextCellIndex) {
+				return;
+			}
+			var nextCell = row.cells[nextCellIndex];
+			// 左右列的rowspan不一致时不能合并
+			if (cell.rowSpan !== nextCell.rowSpan) {
+				return;
+			}
+			cell.colSpan += nextCell.colSpan;
+			row.deleteCell(nextCellIndex);
+			self.cmd.range.selectNodeContents(cell).collapse(true);
+			self.cmd.select();
+			self.addBookmark();
+		},
+		rowsplit : function() {
+			var table = self.plugin.getSelectedTable()[0],
+				row = self.plugin.getSelectedRow()[0],
+				cell = self.plugin.getSelectedCell()[0],
+				rowIndex = row.rowIndex;
+			// 不是可分割单元格
+			if (cell.rowSpan === 1) {
+				return;
+			}
+			var cellIndex = _getCellIndex(table, row, cell);
+			for (var i = 1, len = cell.rowSpan; i < len; i++) {
+				var newRow = table.rows[rowIndex + i],
+					newCell = newRow.insertCell(cellIndex);
+				if (cell.colSpan > 1) {
+					newCell.colSpan = cell.colSpan;
+				}
+				newCell.innerHTML = K.IE ? '' : '<br />';
+				// 调整下一行的单元格index
+				cellIndex = _getCellIndex(table, newRow, newCell);
+			}
+			K(cell).removeAttr('rowSpan');
+			self.cmd.range.selectNodeContents(cell).collapse(true);
+			self.cmd.select();
+			self.addBookmark();
+		},
+		colsplit : function() {
+			var table = self.plugin.getSelectedTable()[0],
+				row = self.plugin.getSelectedRow()[0],
+				cell = self.plugin.getSelectedCell()[0],
+				cellIndex = cell.cellIndex;
+			// 不是可分割单元格
+			if (cell.colSpan === 1) {
+				return;
+			}
+			for (var i = 1, len = cell.colSpan; i < len; i++) {
+				var newCell = row.insertCell(cellIndex + i);
+				if (cell.rowSpan > 1) {
+					newCell.rowSpan = cell.rowSpan;
+				}
+				newCell.innerHTML = K.IE ? '' : '<br />';
+			}
+			K(cell).removeAttr('colSpan');
+			self.cmd.range.selectNodeContents(cell).collapse(true);
+			self.cmd.select();
+			self.addBookmark();
+		},
+		coldelete : function() {
+			var table = self.plugin.getSelectedTable()[0],
+				row = self.plugin.getSelectedRow()[0],
+				cell = self.plugin.getSelectedCell()[0],
+				index = cell.cellIndex;
+			for (var i = 0, len = table.rows.length; i < len; i++) {
+				var newRow = table.rows[i],
+					newCell = newRow.cells[index];
+				if (newCell.colSpan > 1) {
+					newCell.colSpan -= 1;
+					if (newCell.colSpan === 1) {
+						K(newCell).removeAttr('colSpan');
+					}
+				} else {
+					newRow.deleteCell(index);
+				}
+				// 跳过不需要删除的行
+				if (newCell.rowSpan > 1) {
+					i += newCell.rowSpan - 1;
+				}
+			}
+			if (row.cells.length === 0) {
+				self.cmd.range.setStartBefore(table).collapse(true);
+				self.cmd.select();
+				K(table).remove();
+			} else {
+				self.cmd.selection(true);
+			}
+			self.addBookmark();
+		},
+		rowdelete : function() {
+			var table = self.plugin.getSelectedTable()[0],
+				row = self.plugin.getSelectedRow()[0],
+				cell = self.plugin.getSelectedCell()[0],
+				rowIndex = row.rowIndex;
+			// 从下到上删除
+			for (var i = cell.rowSpan - 1; i >= 0; i--) {
+				table.deleteRow(rowIndex + i);
+			}
+			if (table.rows.length === 0) {
+				self.cmd.range.setStartBefore(table).collapse(true);
+				self.cmd.select();
+				K(table).remove();
+			} else {
+				self.cmd.selection(true);
+			}
+			self.addBookmark();
+		}
+	};
+	self.clickToolbar(name, self.plugin.table.prop);
+});
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/template/html/1.html b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/template/html/1.html
new file mode 100644
index 0000000..034126b
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/template/html/1.html
@@ -0,0 +1,14 @@
+<!doctype html>
+<html>
+<head>
+	<meta charset="utf-8" />
+</head>
+<body>
+	<h3>
+		<img align="left" height="100" style="margin-right: 10px" width="100" />在此处输入标题
+	</h3>
+	<p>
+		在此处输入内容
+	</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/template/html/2.html b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/template/html/2.html
new file mode 100644
index 0000000..dc2584a
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/template/html/2.html
@@ -0,0 +1,42 @@
+<!doctype html>
+<html>
+<head>
+	<meta charset="utf-8" />
+</head>
+<body>
+	<h3>
+		标题
+	</h3>
+	<table style="width:100%;" cellpadding="2" cellspacing="0" border="1">
+		<tbody>
+			<tr>
+				<td>
+					<h3>标题1</h3>
+				</td>
+				<td>
+					<h3>标题1</h3>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					内容1
+				</td>
+				<td>
+					内容2
+				</td>
+			</tr>
+			<tr>
+				<td>
+					内容3
+				</td>
+				<td>
+					内容4
+				</td>
+			</tr>
+		</tbody>
+	</table>
+	<p>
+		表格说明
+	</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/template/html/3.html b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/template/html/3.html
new file mode 100644
index 0000000..873f0c6
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/template/html/3.html
@@ -0,0 +1,36 @@
+<!doctype html>
+<html>
+<head>
+	<meta charset="utf-8" />
+</head>
+<body>
+	<p>
+		在此处输入内容
+	</p>
+	<ol>
+		<li>
+			描述1
+		</li>
+		<li>
+			描述2
+		</li>
+		<li>
+			描述3
+		</li>
+	</ol>
+	<p>
+		在此处输入内容
+	</p>
+	<ul>
+		<li>
+			描述1
+		</li>
+		<li>
+			描述2
+		</li>
+		<li>
+			描述3
+		</li>
+	</ul>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/template/template.js b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/template/template.js
new file mode 100644
index 0000000..4029e87
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/template/template.js
@@ -0,0 +1,58 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('template', function(K) {
+	var self = this, name = 'template', lang = self.lang(name + '.'),
+		htmlPath = self.pluginsPath + name + '/html/';
+	function getFilePath(fileName) {
+		return htmlPath + fileName + '?ver=' + encodeURIComponent(K.DEBUG ? K.TIME : K.VERSION);
+	}
+	self.clickToolbar(name, function() {
+		var lang = self.lang(name + '.'),
+			arr = ['<div style="padding:10px 20px;">',
+				'<div class="ke-header">',
+				// left start
+				'<div class="ke-left">',
+				lang. selectTemplate + ' <select>'];
+			K.each(lang.fileList, function(key, val) {
+				arr.push('<option value="' + key + '">' + val + '</option>');
+			});
+			html = [arr.join(''),
+				'</select></div>',
+				// right start
+				'<div class="ke-right">',
+				'<input type="checkbox" id="keReplaceFlag" name="replaceFlag" value="1" /> <label for="keReplaceFlag">' + lang.replaceContent + '</label>',
+				'</div>',
+				'<div class="ke-clearfix"></div>',
+				'</div>',
+				'<iframe class="ke-textarea" frameborder="0" style="width:458px;height:260px;background-color:#FFF;"></iframe>',
+				'</div>'].join('');
+		var dialog = self.createDialog({
+			name : name,
+			width : 500,
+			title : self.lang(name),
+			body : html,
+			yesBtn : {
+				name : self.lang('yes'),
+				click : function(e) {
+					var doc = K.iframeDoc(iframe);
+					self[checkbox[0].checked ? 'html' : 'insertHtml'](doc.body.innerHTML).hideDialog().focus();
+				}
+			}
+		});
+		var selectBox = K('select', dialog.div),
+			checkbox = K('[name="replaceFlag"]', dialog.div),
+			iframe = K('iframe', dialog.div);
+		checkbox[0].checked = true;
+		iframe.attr('src', getFilePath(selectBox.val()));
+		selectBox.change(function() {
+			iframe.attr('src', getFilePath(this.value));
+		});
+	});
+});
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/wordpaste/wordpaste.js b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/wordpaste/wordpaste.js
new file mode 100644
index 0000000..22061e1
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/wordpaste/wordpaste.js
@@ -0,0 +1,51 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('wordpaste', function(K) {
+	var self = this, name = 'wordpaste';
+	self.clickToolbar(name, function() {
+		var lang = self.lang(name + '.'),
+			html = '<div style="padding:10px 20px;">' +
+				'<div style="margin-bottom:10px;">' + lang.comment + '</div>' +
+				'<iframe class="ke-textarea" frameborder="0" style="width:408px;height:260px;"></iframe>' +
+				'</div>',
+			dialog = self.createDialog({
+				name : name,
+				width : 450,
+				title : self.lang(name),
+				body : html,
+				yesBtn : {
+					name : self.lang('yes'),
+					click : function(e) {
+						var str = doc.body.innerHTML;
+						str = K.clearMsWord(str, self.filterMode ? self.htmlTags : K.options.htmlTags);
+						self.insertHtml(str).hideDialog().focus();
+					}
+				}
+			}),
+			div = dialog.div,
+			iframe = K('iframe', div),
+			doc = K.iframeDoc(iframe);
+		if (!K.IE) {
+			doc.designMode = 'on';
+		}
+		doc.open();
+		doc.write('<!doctype html><html><head><title>WordPaste</title></head>');
+		doc.write('<body style="background-color:#FFF;font-size:12px;margin:2px;">');
+		if (!K.IE) {
+			doc.write('<br />');
+		}
+		doc.write('</body></html>');
+		doc.close();
+		if (K.IE) {
+			doc.body.contentEditable = 'true';
+		}
+		iframe[0].contentWindow.focus();
+	});
+});
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/common/anchor.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/common/anchor.gif
new file mode 100644
index 0000000..61145ea
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/common/anchor.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/common/blank.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/common/blank.gif
new file mode 100644
index 0000000..5bfd67a
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/common/blank.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/common/flash.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/common/flash.gif
new file mode 100644
index 0000000..2cb12b2
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/common/flash.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/common/loading.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/common/loading.gif
new file mode 100644
index 0000000..c69e937
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/common/loading.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/common/media.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/common/media.gif
new file mode 100644
index 0000000..e1c0e30
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/common/media.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/common/rm.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/common/rm.gif
new file mode 100644
index 0000000..d013d55
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/common/rm.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/default/background.png b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/default/background.png
new file mode 100644
index 0000000..bbfb056
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/default/background.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/default/default.css b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/default/default.css
new file mode 100644
index 0000000..428b6c8
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/default/default.css
@@ -0,0 +1,1149 @@
+/* common */
+.ke-inline-block {
+	display: -moz-inline-stack;
+	display: inline-block;
+	vertical-align: middle;
+	zoom: 1;
+	*display: inline;
+}
+.ke-clearfix {
+	zoom: 1;
+}
+.ke-clearfix:after {
+	content: ".";
+	display: block;
+	clear: both;
+	font-size: 0;
+	height: 0;
+	line-height: 0;
+	visibility: hidden;
+}
+.ke-shadow {
+	box-shadow: 1px 1px 3px #A0A0A0;
+	-moz-box-shadow: 1px 1px 3px #A0A0A0;
+	-webkit-box-shadow: 1px 1px 3px #A0A0A0;
+	filter: progid:DXImageTransform.Microsoft.Shadow(color='#A0A0A0', Direction=135, Strength=3);
+	background-color: #F0F0EE;
+}
+.ke-menu a,
+.ke-menu a:hover,
+.ke-dialog a,
+.ke-dialog a:hover {
+	color: #337FE5;
+	text-decoration: none;
+}
+/* icons */
+.ke-icon-source {
+	background-position: 0px 0px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-preview {
+	background-position: 0px -16px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-print {
+	background-position: 0px -32px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-undo {
+	background-position: 0px -48px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-redo {
+	background-position: 0px -64px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-cut {
+	background-position: 0px -80px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-copy {
+	background-position: 0px -96px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-paste {
+	background-position: 0px -112px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-selectall {
+	background-position: 0px -128px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-justifyleft {
+	background-position: 0px -144px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-justifycenter {
+	background-position: 0px -160px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-justifyright {
+	background-position: 0px -176px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-justifyfull {
+	background-position: 0px -192px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-insertorderedlist {
+	background-position: 0px -208px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-insertunorderedlist {
+	background-position: 0px -224px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-indent {
+	background-position: 0px -240px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-outdent {
+	background-position: 0px -256px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-subscript {
+	background-position: 0px -272px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-superscript {
+	background-position: 0px -288px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-date {
+	background-position: 0px -304px;
+	width: 25px;
+	height: 16px;
+}
+.ke-icon-time {
+	background-position: 0px -320px;
+	width: 25px;
+	height: 16px;
+}
+.ke-icon-formatblock {
+	background-position: 0px -336px;
+	width: 25px;
+	height: 16px;
+}
+.ke-icon-fontname {
+	background-position: 0px -352px;
+	width: 21px;
+	height: 16px;
+}
+.ke-icon-fontsize {
+	background-position: 0px -368px;
+	width: 23px;
+	height: 16px;
+}
+.ke-icon-forecolor {
+	background-position: 0px -384px;
+	width: 20px;
+	height: 16px;
+}
+.ke-icon-hilitecolor {
+	background-position: 0px -400px;
+	width: 23px;
+	height: 16px;
+}
+.ke-icon-bold {
+	background-position: 0px -416px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-italic {
+	background-position: 0px -432px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-underline {
+	background-position: 0px -448px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-strikethrough {
+	background-position: 0px -464px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-removeformat {
+	background-position: 0px -480px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-image {
+	background-position: 0px -496px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-flash {
+	background-position: 0px -512px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-media {
+	background-position: 0px -528px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-div {
+	background-position: 0px -544px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-formula {
+	background-position: 0px -576px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-hr {
+	background-position: 0px -592px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-emoticons {
+	background-position: 0px -608px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-link {
+	background-position: 0px -624px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-unlink {
+	background-position: 0px -640px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-fullscreen {
+	background-position: 0px -656px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-about {
+	background-position: 0px -672px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-plainpaste {
+	background-position: 0px -704px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-wordpaste {
+	background-position: 0px -720px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-table {
+	background-position: 0px -784px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tablemenu {
+	background-position: 0px -768px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tableinsert {
+	background-position: 0px -784px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tabledelete {
+	background-position: 0px -800px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tablecolinsertleft {
+	background-position: 0px -816px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tablecolinsertright {
+	background-position: 0px -832px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tablerowinsertabove {
+	background-position: 0px -848px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tablerowinsertbelow {
+	background-position: 0px -864px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tablecoldelete {
+	background-position: 0px -880px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tablerowdelete {
+	background-position: 0px -896px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tablecellprop {
+	background-position: 0px -912px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tableprop {
+	background-position: 0px -928px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-checked {
+	background-position: 0px -944px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-code {
+	background-position: 0px -960px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-map {
+	background-position: 0px -976px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-baidumap {
+	background-position: 0px -976px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-lineheight {
+	background-position: 0px -992px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-clearhtml {
+	background-position: 0px -1008px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-pagebreak {
+	background-position: 0px -1024px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-insertfile {
+	background-position: 0px -1040px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-quickformat {
+	background-position: 0px -1056px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-template {
+	background-position: 0px -1072px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tablecellsplit {
+	background-position: 0px -1088px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tablerowmerge {
+	background-position: 0px -1104px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tablerowsplit {
+	background-position: 0px -1120px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tablecolmerge {
+	background-position: 0px -1136px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tablecolsplit {
+	background-position: 0px -1152px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-anchor {
+	background-position: 0px -1168px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-search {
+	background-position: 0px -1184px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-new {
+	background-position: 0px -1200px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-specialchar {
+	background-position: 0px -1216px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-multiimage {
+	background-position: 0px -1232px;
+	width: 16px;
+	height: 16px;
+}
+/* container */
+.ke-container {
+	display: block;
+	border: 1px solid #CCCCCC;
+	background-color: #FFF;
+	overflow: hidden;
+	margin: 0;
+	padding: 0;
+}
+/* toolbar */
+.ke-toolbar {
+	border-bottom: 1px solid #CCC;
+	background-color: #F0F0EE;
+	padding: 2px 5px;
+	text-align: left;
+	overflow: hidden;
+	zoom: 1;
+}
+.ke-toolbar-icon {
+	background-repeat: no-repeat;
+	font-size: 0;
+	line-height: 0;
+	overflow: hidden;
+	display: block;
+}
+.ke-toolbar-icon-url {
+	background-image: url(default.png);
+}
+.ke-toolbar .ke-outline {
+	border: 1px solid #F0F0EE;
+	margin: 1px;
+	padding: 1px 2px;
+	font-size: 0;
+	line-height: 0;
+	overflow: hidden;
+	cursor: pointer;
+	display: block;
+	float: left;
+}
+.ke-toolbar .ke-on {
+	border: 1px solid #5690D2;
+}
+.ke-toolbar .ke-selected {
+	border: 1px solid #5690D2;
+	background-color: #E9EFF6;
+}
+.ke-toolbar .ke-disabled {
+	cursor: default;
+}
+.ke-toolbar .ke-separator {
+	height: 16px;
+	margin: 2px 3px;
+	border-left: 1px solid #A0A0A0;
+	border-right: 1px solid #FFFFFF;
+	border-top:0;
+	border-bottom:0;
+	width: 0;
+	font-size: 0;
+	line-height: 0;
+	overflow: hidden;
+	display: block;
+	float: left;
+}
+.ke-toolbar .ke-hr {
+	overflow: hidden;
+	height: 1px;
+	clear: both;
+}
+/* edit */
+.ke-edit {
+	padding: 0;
+}
+.ke-edit-iframe,
+.ke-edit-textarea {
+	border: 0;
+	margin: 0;
+	padding: 0;
+	overflow: auto;
+}
+.ke-edit-textarea {
+	font: 12px/1.5 "Consolas", "Monaco", "Bitstream Vera Sans Mono", "Courier New", Courier, monospace;
+	color: #000;
+	overflow: auto;
+	resize: none;
+}
+.ke-edit-textarea:focus {
+	outline: none;
+}
+/* statusbar */
+.ke-statusbar {
+	position: relative;
+	background-color: #F0F0EE;
+	border-top: 1px solid #CCCCCC;
+	font-size: 0;
+	line-height: 0;
+	*height: 12px;
+	overflow: hidden;
+	text-align: center;
+	cursor: s-resize;
+}
+.ke-statusbar-center-icon {
+	background-position: -0px -754px;
+	width: 15px;
+	height: 11px;
+	background-image: url(default.png);
+}
+.ke-statusbar-right-icon {
+	position: absolute;
+	right: 0;
+	bottom: 0;
+	cursor: se-resize;
+	background-position: -5px -741px;
+	width: 11px;
+	height: 11px;
+	background-image: url(default.png);
+}
+/* menu */
+.ke-menu {
+	border: 1px solid #A0A0A0;
+	background-color: #F1F1F1;
+	color: #222222;
+	padding: 2px;
+	font-family: "sans serif",tahoma,verdana,helvetica;
+	font-size: 12px;
+	text-align: left;
+	overflow: hidden;
+}
+.ke-menu-item {
+	border: 1px solid #F1F1F1;
+	background-color: #F1F1F1;
+	color: #222222;
+	height: 24px;
+	overflow: hidden;
+	cursor: pointer;
+}
+.ke-menu-item-on {
+	border: 1px solid #5690D2;
+	background-color: #E9EFF6;
+}
+.ke-menu-item-left {
+	width: 27px;
+	text-align: center;
+	overflow: hidden;
+}
+.ke-menu-item-center {
+	width: 0;
+	height: 24px;
+	border-left: 1px solid #E3E3E3;
+	border-right: 1px solid #FFFFFF;
+	border-top: 0;
+	border-bottom: 0;
+}
+.ke-menu-item-center-on {
+	border-left: 1px solid #E9EFF6;
+	border-right: 1px solid #E9EFF6;
+}
+.ke-menu-item-right {
+	border: 0;
+	padding: 0 0 0 5px;
+	line-height: 24px;
+	text-align: left;
+	overflow: hidden;
+}
+.ke-menu-separator {
+	margin: 2px 0;
+	height: 0;
+	overflow: hidden;
+	border-top: 1px solid #CCCCCC;
+	border-bottom: 1px solid #FFFFFF;
+	border-left: 0;
+	border-right: 0;
+}
+/* colorpicker */
+.ke-colorpicker {
+	border: 1px solid #A0A0A0;
+	background-color: #F1F1F1;
+	color: #222222;
+	padding: 2px;
+}
+.ke-colorpicker-table {
+	border:0;
+	margin:0;
+	padding:0;
+	border-collapse: separate;
+}
+.ke-colorpicker-cell {
+	font-size: 0;
+	line-height: 0;
+	border: 1px solid #F0F0EE;
+	cursor: pointer;
+	margin:3px;
+	padding:0;
+}
+.ke-colorpicker-cell-top {
+	font-family: "sans serif",tahoma,verdana,helvetica;
+	font-size: 12px;
+	line-height: 24px;
+	border: 1px solid #F0F0EE;
+	cursor: pointer;
+	margin:0;
+	padding:0;
+	text-align: center;
+}
+.ke-colorpicker-cell-on {
+	border: 1px solid #5690D2;
+}
+.ke-colorpicker-cell-selected {
+	border: 1px solid #2446AB;
+}
+.ke-colorpicker-cell-color {
+	width: 14px;
+	height: 14px;
+	margin: 3px;
+	padding: 0;
+	border: 0;
+}
+/* dialog */
+.ke-dialog {
+	position: absolute;
+	margin: 0;
+	padding: 0;
+}
+.ke-dialog .ke-header {
+	width: 100%;
+	margin-bottom: 10px;
+}
+.ke-dialog .ke-header .ke-left {
+	float: left;
+}
+.ke-dialog .ke-header .ke-right {
+	float: right;
+}
+.ke-dialog .ke-header label {
+	margin-right: 0;
+	cursor: pointer;
+	font-weight: normal;
+	display: inline;
+	vertical-align: top;
+}
+.ke-dialog-content {
+	background-color: #FFF;
+	width: 100%;
+	height: 100%;
+	color: #333;
+	border: 1px solid #A0A0A0;
+}
+.ke-dialog-shadow {
+	position: absolute;
+	z-index: -1;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	box-shadow: 3px 3px 7px #999;
+	-moz-box-shadow: 3px 3px 7px #999;
+	-webkit-box-shadow: 3px 3px 7px #999;
+	filter: progid:DXImageTransform.Microsoft.Blur(PixelRadius='3', MakeShadow='true', ShadowOpacity='0.4');
+	background-color: #F0F0EE;
+}
+.ke-dialog-header {
+	border:0;
+	margin:0;
+	padding: 0 10px;
+	background: url(background.png) repeat scroll 0 0 #F0F0EE;
+	border-bottom: 1px solid #CFCFCF;
+	height: 24px;
+	font: 12px/24px "sans serif",tahoma,verdana,helvetica;
+	text-align: left;
+	color: #222;
+	cursor: move;
+}
+.ke-dialog-icon-close {
+	display: block;
+	background: url(default.png) no-repeat scroll 0px -688px;
+	width: 16px;
+	height: 16px;
+	position: absolute;
+	right: 6px;
+	top: 6px;
+	cursor: pointer;
+}
+.ke-dialog-body {
+	font: 12px/1.5 "sans serif",tahoma,verdana,helvetica;
+	text-align: left;
+	overflow: hidden;
+	width: 100%;
+}
+.ke-dialog-body textarea {
+	display: block;
+	overflow: auto;
+	padding: 0;
+	resize: none;
+}
+.ke-dialog-body textarea:focus,
+.ke-dialog-body input:focus,
+.ke-dialog-body select:focus {
+	outline: none;
+}
+.ke-dialog-body label {
+	margin-right: 10px;
+	cursor: pointer;
+	display: -moz-inline-stack;
+	display: inline-block;
+	vertical-align: middle;
+	zoom: 1;
+	*display: inline;
+}
+.ke-dialog-body img {
+	display: -moz-inline-stack;
+	display: inline-block;
+	vertical-align: middle;
+	zoom: 1;
+	*display: inline;
+}
+.ke-dialog-body select {
+	display: -moz-inline-stack;
+	display: inline-block;
+	vertical-align: middle;
+	zoom: 1;
+	*display: inline;
+	width: auto;
+}
+.ke-dialog-body .ke-textarea {
+	display: block;
+	width: 408px;
+	height: 260px;
+	font-family: "sans serif",tahoma,verdana,helvetica;
+	font-size: 12px;
+	border-color: #848484 #E0E0E0 #E0E0E0 #848484;
+	border-style: solid;
+	border-width: 1px;
+}
+.ke-dialog-body .ke-form {
+	margin: 0;
+	padding: 0;
+}
+.ke-dialog-loading {
+	position: absolute;
+	top: 0;
+	left: 1px;
+	z-index: 1;
+	text-align: center;
+}
+.ke-dialog-loading-content {
+	background: url("../common/loading.gif") no-repeat;
+    color: #666;
+    font-size: 14px;
+    font-weight: bold;
+    height: 31px;
+    line-height: 31px;
+    padding-left: 36px;
+}
+.ke-dialog-row {
+	margin-bottom: 10px;
+}
+.ke-dialog-footer {
+	font: 12px/1 "sans serif",tahoma,verdana,helvetica;
+	text-align: right;
+	padding:0 0 5px 0;
+	background-color: #FFF;
+	width: 100%;
+}
+.ke-dialog-preview,
+.ke-dialog-yes {
+	margin: 5px;
+}
+.ke-dialog-no {
+	margin: 5px 10px 5px 5px;
+}
+.ke-dialog-mask {
+	background-color:#FFF;
+	filter:alpha(opacity=50);
+	opacity:0.5;
+}
+.ke-button-common {
+	background: url(background.png) no-repeat scroll 0 -25px transparent;
+	cursor: pointer;
+	height: 23px;
+	line-height: 23px;
+	overflow: visible;
+	display: inline-block;
+	vertical-align: top;
+	cursor: pointer;
+}
+.ke-button-outer {
+	background-position: 0 -25px;
+	padding: 0;
+	position: relative;
+	display: -moz-inline-stack;
+	display: inline-block;
+	vertical-align: middle;
+	zoom: 1;
+	*display: inline;
+}
+.ke-button {
+	background-position: right -25px;
+	padding: 0 12px;
+	margin: 0;
+	font-family: "sans serif",tahoma,verdana,helvetica;
+	border: 0 none;
+	color: #333;
+	font-size: 12px;
+	left: 2px;
+	text-decoration: none;
+}
+/* inputbox */
+.ke-input-text {
+	background-color:#FFFFFF;
+	font-family: "sans serif",tahoma,verdana,helvetica;
+	font-size: 12px;
+	line-height: 17px;
+	height: 17px;
+	padding: 2px 4px;
+	border-color: #848484 #E0E0E0 #E0E0E0 #848484;
+	border-style: solid;
+	border-width: 1px;
+	display: -moz-inline-stack;
+	display: inline-block;
+	vertical-align: middle;
+	zoom: 1;
+	*display: inline;
+}
+.ke-input-number {
+	width: 50px;
+}
+.ke-input-color {
+	border: 1px solid #A0A0A0;
+	background-color: #FFFFFF;
+	font-size: 12px;
+	width: 60px;
+	height: 20px;
+	line-height: 20px;
+	padding-left: 5px;
+	overflow: hidden;
+	cursor: pointer;
+	display: -moz-inline-stack;
+	display: inline-block;
+	vertical-align: middle;
+	zoom: 1;
+	*display: inline;
+}
+.ke-upload-button {
+	position: relative;
+}
+.ke-upload-area {
+	position: relative;
+	overflow: hidden;
+	margin: 0;
+	padding: 0;
+	*height: 25px;
+}
+.ke-upload-area .ke-upload-file {
+	position: absolute;
+	font-size: 60px;
+	top: 0;
+	right: 0;
+	padding: 0;
+	margin: 0;
+	z-index: 811212;
+	border: 0 none;
+	opacity: 0;
+	filter: alpha(opacity=0);
+}
+/* tabs */
+.ke-tabs {
+	font: 12px/1 "sans serif",tahoma,verdana,helvetica;
+	border-bottom:1px solid #A0A0A0;
+	padding-left:5px;
+	margin-bottom:20px;
+}
+.ke-tabs-ul  {
+	list-style-image:none;
+	list-style-position:outside;
+	list-style-type:none;
+	margin:0;
+	padding:0;
+}
+.ke-tabs-li {
+	position: relative;
+	border: 1px solid #A0A0A0;
+	background-color: #F0F0EE;
+	margin: 0 2px -1px 0;
+	padding: 0 20px;
+	float: left;
+	line-height: 25px;
+	text-align: center;
+	color: #555555;
+	cursor: pointer;
+}
+.ke-tabs-li-selected {
+	background-color: #FFF;
+	border-bottom: 1px solid #FFF;
+	color: #000;
+	cursor: default;
+}
+.ke-tabs-li-on {
+	background-color: #FFF;
+	color: #000;
+}
+/* progressbar */
+.ke-progressbar {
+	position: relative;
+	margin: 0;
+	padding: 0;
+}
+.ke-progressbar-bar {
+	border: 1px solid #6FA5DB;
+	width: 80px;
+	height: 5px;
+	margin: 10px 10px 0 10px;
+	padding: 0;
+}
+.ke-progressbar-bar-inner {
+	width: 0;
+	height: 5px;
+	background-color: #6FA5DB;
+	overflow: hidden;
+	margin: 0;
+	padding: 0;
+}
+.ke-progressbar-percent {
+	position: absolute;
+	top: 0;
+	left: 40%;
+	display: none;
+}
+/* swfupload */
+.ke-swfupload-top {
+	position: relative;
+	margin-bottom: 10px;
+	_width: 608px;
+}
+.ke-swfupload-button {
+	height: 23px;
+	line-height: 23px;
+}
+.ke-swfupload-desc {
+	padding: 0 10px;
+	height: 23px;
+	line-height: 23px;
+}
+.ke-swfupload-startupload {
+	position: absolute;
+	top: 0;
+	right: 0;
+}
+.ke-swfupload-body {
+	overflow: scroll;
+	background-color:#FFFFFF;
+	border-color: #848484 #E0E0E0 #E0E0E0 #848484;
+	border-style: solid;
+	border-width: 1px;
+	width: auto;
+	height: 370px;
+	padding: 5px;
+}
+.ke-swfupload-body .ke-item {
+	width: 100px;
+	margin: 5px;
+}
+.ke-swfupload-body .ke-photo {
+	position: relative;
+	border: 1px solid #DDDDDD;
+	background-color:#FFFFFF;
+	padding: 10px;
+}
+.ke-swfupload-body .ke-delete {
+	display: block;
+	background: url(default.png) no-repeat scroll 0px -688px;
+	width: 16px;
+	height: 16px;
+	position: absolute;
+	right: 0;
+	top: 0;
+	cursor: pointer;
+}
+.ke-swfupload-body .ke-status  {
+	position: absolute;
+	left: 0;
+	bottom: 5px;
+	width: 100px;
+	height: 17px;
+}
+.ke-swfupload-body .ke-message  {
+	width: 100px;
+	text-align: center;
+	overflow: hidden;
+	height:17px;
+}
+.ke-swfupload-body .ke-error  {
+	color: red;
+}
+.ke-swfupload-body .ke-name {
+	width: 100px;
+	text-align: center;
+	overflow: hidden;
+	height:16px;
+}
+.ke-swfupload-body .ke-on {
+	border: 1px solid #5690D2;
+	background-color: #E9EFF6;
+}
+
+/* emoticons */
+.ke-plugin-emoticons {
+	position: relative;
+}
+.ke-plugin-emoticons .ke-preview {
+	position: absolute;
+	text-align: center;
+	margin: 2px;
+	padding: 10px;
+	top: 0;
+	border: 1px solid #A0A0A0;
+	background-color: #FFFFFF;
+	display: none;
+}
+.ke-plugin-emoticons .ke-preview-img {
+	border:0;
+	margin:0;
+	padding:0;
+}
+.ke-plugin-emoticons .ke-table {
+	border:0;
+	margin:0;
+	padding:0;
+	border-collapse:separate;
+}
+.ke-plugin-emoticons .ke-cell {
+	margin:0;
+	padding:1px;
+	border:1px solid #F0F0EE;
+	cursor:pointer;
+}
+.ke-plugin-emoticons .ke-on {
+	border: 1px solid #5690D2;
+	background-color: #E9EFF6;
+}
+.ke-plugin-emoticons .ke-img {
+	display:block;
+	background-repeat:no-repeat;
+	overflow:hidden;
+	margin:2px;
+	width:24px;
+	height:24px;
+	margin: 0;
+	padding: 0;
+	border: 0;
+}
+.ke-plugin-emoticons .ke-page {
+	text-align: right;
+	margin: 5px;
+	padding: 0;
+	border: 0;
+	font: 12px/1 "sans serif",tahoma,verdana,helvetica;
+	color: #333;
+	text-decoration: none;
+}
+.ke-plugin-plainpaste-textarea,
+.ke-plugin-wordpaste-iframe {
+	display: block;
+	width: 408px;
+	height: 260px;
+	font-family: "sans serif",tahoma,verdana,helvetica;
+	font-size: 12px;
+	border-color: #848484 #E0E0E0 #E0E0E0 #848484;
+	border-style: solid;
+	border-width: 1px;
+}
+/* filemanager */
+.ke-plugin-filemanager-header {
+	width: 100%;
+	margin-bottom: 10px;
+}
+.ke-plugin-filemanager-header .ke-left {
+	float: left;
+}
+.ke-plugin-filemanager-header .ke-right {
+	float: right;
+}
+.ke-plugin-filemanager-body {
+	overflow: scroll;
+	background-color:#FFFFFF;
+	border-color: #848484 #E0E0E0 #E0E0E0 #848484;
+	border-style: solid;
+	border-width: 1px;
+	width: auto;
+	height: 370px;
+	padding: 5px;
+}
+.ke-plugin-filemanager-body .ke-item {
+	width: 100px;
+	margin: 5px;
+}
+.ke-plugin-filemanager-body .ke-photo {
+	border: 1px solid #DDDDDD;
+	background-color:#FFFFFF;
+	padding: 10px;
+}
+.ke-plugin-filemanager-body .ke-name {
+	width: 100px;
+	text-align: center;
+	overflow: hidden;
+	height:16px;
+}
+.ke-plugin-filemanager-body .ke-on {
+	border: 1px solid #5690D2;
+	background-color: #E9EFF6;
+}
+.ke-plugin-filemanager-body .ke-table {
+	width: 95%;
+	border: 0;
+	margin: 0;
+	padding: 0;
+	border-collapse: separate;
+}
+.ke-plugin-filemanager-body .ke-table .ke-cell {
+	margin: 0;
+	padding: 0;
+	border: 0;
+}
+.ke-plugin-filemanager-body .ke-table .ke-name {
+	width: 55%;
+	text-align: left;
+}
+.ke-plugin-filemanager-body .ke-table .ke-size {
+	width: 15%;
+	text-align: left;
+}
+.ke-plugin-filemanager-body .ke-table .ke-datetime {
+	width: 30%;
+	text-align: center;
+}
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/default/default.png b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/default/default.png
new file mode 100644
index 0000000..cc9e72d
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/default/default.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/qq/editor.gif b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/qq/editor.gif
new file mode 100644
index 0000000..b256841
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/qq/editor.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/qq/qq.css b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/qq/qq.css
new file mode 100644
index 0000000..a45e08c
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/qq/qq.css
@@ -0,0 +1,143 @@
+/* container */
+.ke-container-qq {
+	display: block;
+	border: 1px solid #c3c3c3;
+	background-color: #FFF;
+	overflow: hidden;
+	margin: 0;
+	padding: 0;
+}
+/* toolbar */
+.ke-container-qq .ke-toolbar {
+	border-bottom: 1px solid #c3c3c3;
+	background-color: #FFFFFF;
+	padding: 2px 5px;
+	text-align: left;
+	overflow: hidden;
+	zoom: 1;
+}
+.ke-toolbar-icon-url {
+	background-image: url(editor.gif);
+	width:18px;
+	*xwidth:20px;
+	height:18px;
+	*xheight:20px;
+}
+.ke-icon-checked{
+	background-image: url(../default/default.png);
+	width:16px;
+	height:16px;
+}
+.ke-container-qq .ke-icon-bold{
+	background-position: 4px 1px;
+}
+.ke-container-qq .ke-icon-italic{
+	background-position: -27px 1px;
+}
+.ke-container-qq .ke-icon-italic{
+	background-position: -28px 1px;
+}
+.ke-container-qq .ke-icon-underline{
+	background-position: -60px 1px;
+}
+.ke-container-qq .ke-icon-fontname{
+	background-position: -95px 1px;
+}
+.ke-container-qq .ke-icon-fontsize{
+	background-position: -128px 1px;
+}
+.ke-container-qq .ke-icon-forecolor{
+	background-position: -159px 1px;
+}
+.ke-container-qq .ke-icon-hilitecolor{
+	background-position: -190px 1px;
+}
+.ke-container-qq .ke-icon-plug-align{
+	background-position: -223px 1px;
+}
+.plug-align-justifyleft{
+	background-position: -350px 1px;
+}
+.plug-align-justifycenter{
+	background-position: -382px 1px;
+}
+.plug-align-justifyright{
+	background-position: -414px 1px;
+}
+.plug-order-insertorderedlist{
+	background-position: -446px 1px;
+}
+.plug-order-insertunorderedlist{
+	background-position: -477px 1px;
+}
+.plug-indent-indent{
+	background-position: -513px 1px;
+}
+.plug-indent-outdent{
+	background-position: -545px 1px;
+}
+.ke-container-qq .ke-icon-plug-order{
+	background-position: -255px 1px;
+}
+.ke-container-qq .ke-icon-plug-indent{
+	background-position: -287px 1px;
+}
+.ke-container-qq .ke-icon-link{
+	background-position: -319px 1px;
+}
+
+.ke-container-qq .ke-toolbar .ke-outline {
+	cursor: default;
+	padding:0px;
+	border:1px solid #fff;
+}
+.ke-container-qq .ke-toolbar .ke-on {
+	border-left:1px solid white;
+	border-top:1px solid white;
+	border-right:1px solid gray;
+	border-bottom:1px solid gray;
+	background-color: #FFFFFF;
+}
+.ke-container-qq .ke-toolbar .ke-selected {
+	border-left:1px solid gray;
+	border-top:1px solid gray;
+	border-right:1px solid white;
+	border-bottom:1px solid white;
+	background-color: #FFFFFF;
+}
+.ke-container-qq .ke-toolbar  .ke-disabled {
+	cursor: default;
+}
+
+.ke-colorpicker-qq{
+	background:#fff;
+}
+/* statusbar */
+.ke-container-qq .ke-statusbar {
+	display:none;
+}
+/* menu */
+.ke-menu-qq {
+	border:1px solid #a6a6a6;
+	position:absolute;
+	background:#fff;
+	-moz-box-shadow:2px 2px 4px #DDDDDD;
+	z-index:999;
+	left:-400px;
+	top:-386px;
+	right:218px;
+	width:130px;
+}
+.ke-menu-qq .ke-menu-item {
+	padding:0px;
+	background:#fff;
+}
+.ke-menu-qq .ke-menu-item-on {
+	border:1px solid #000080;background:#FFEEC2;color:#036;
+}
+.ke-menu-qq .ke-toolbar .ke-selected {
+	border:1px solid #9a9afb;
+}
+.ke-menu-qq .ke-menu-item-left{
+	width:auto;
+}
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/simple/simple.css b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/simple/simple.css
new file mode 100644
index 0000000..4c76cf9
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/simple/simple.css
@@ -0,0 +1,100 @@
+/* container */
+.ke-container-simple {
+	display: block;
+	border: 1px solid #CCC;
+	background-color: #FFF;
+	overflow: hidden;
+}
+/* toolbar */
+.ke-container-simple .ke-toolbar {
+	border-bottom: 1px solid #CCC;
+	background-color: #FFF;
+	padding: 2px 5px;
+	overflow: hidden;
+}
+.ke-container-simple .ke-toolbar .ke-outline {
+	border: 1px solid #FFF;
+	background-color: transparent;
+	margin: 1px;
+	padding: 1px 2px;
+	font-size: 0;
+	line-height: 0;
+	overflow: hidden;
+	cursor: pointer;
+}
+.ke-container-simple .ke-toolbar .ke-on {
+	border: 1px solid #5690D2;
+}
+.ke-container-simple .ke-toolbar .ke-selected {
+	border: 1px solid #5690D2;
+	background-color: #E9EFF6;
+}
+.ke-container-simple .ke-toolbar  .ke-disabled {
+	cursor: default;
+}
+/* statusbar */
+.ke-container-simple .ke-statusbar {
+	position: relative;
+	background-color: #FFF;
+	border-top: 1px solid #CCCCCC;
+	font-size: 0;
+	line-height: 0;
+	*height: 12px;
+	overflow: hidden;
+	text-align: center;
+	cursor: s-resize;
+}
+/* menu */
+.ke-menu-simple {
+	border: 1px solid #A0A0A0;
+	background-color: #FFF;
+	color: #222222;
+	padding: 2px;
+	font-family: "sans serif",tahoma,verdana,helvetica;
+	font-size: 12px;
+	text-align: left;
+	overflow: hidden;
+}
+.ke-menu-simple .ke-menu-item {
+	border: 1px solid #FFF;
+	background-color: #FFF;
+	color: #222222;
+	height: 24px;
+	overflow: hidden;
+	cursor: pointer;
+}
+.ke-menu-simple .ke-menu-item-on {
+	border: 1px solid #5690D2;
+	background-color: #FFF;
+}
+/* colorpicker */
+.ke-colorpicker-simple {
+	border: 1px solid #A0A0A0;
+	background-color: #FEFEFE;
+	color: #222222;
+	padding: 2px;
+}
+.ke-colorpicker-simple .ke-colorpicker-cell {
+	font-size: 0;
+	line-height: 0;
+	border: 1px solid #FEFEFE;
+	cursor: pointer;
+	margin:3px;
+	padding:0;
+}
+.ke-colorpicker-simple .ke-colorpicker-cell-top {
+	font-family: "sans serif",tahoma,verdana,helvetica;
+	font-size: 12px;
+	line-height: 24px;
+	border: 1px solid #FEFEFE;
+	cursor: pointer;
+	margin:0;
+	padding:0;
+	text-align: center;
+}
+.ke-colorpicker-simple .ke-colorpicker-cell-on {
+	border: 1px solid #5690D2;
+}
+.ke-colorpicker-simple .ke-colorpicker-cell-selected {
+	border: 1px solid #2446AB;
+}
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/third-party/swiper-3.4.2.jquery.min.js b/pluss-manage-page/src/main/resources/static/resources/js/third-party/swiper-3.4.2.jquery.min.js
new file mode 100644
index 0000000..3d379c7
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/third-party/swiper-3.4.2.jquery.min.js
@@ -0,0 +1,18 @@
+/**
+ * Swiper 3.4.2
+ * Most modern mobile touch slider and framework with hardware accelerated transitions
+ * 
+ * http://www.idangero.us/swiper/
+ * 
+ * Copyright 2017, Vladimir Kharlampidi
+ * The iDangero.us
+ * http://www.idangero.us/
+ * 
+ * Licensed under MIT
+ * 
+ * Released on: March 10, 2017
+ */
+!function(){"use strict";var e,a=function(t,s){function r(e){return Math.floor(e)}function i(){var e=x.params.autoplay,a=x.slides.eq(x.activeIndex);a.attr("data-swiper-autoplay")&&(e=a.attr("data-swiper-autoplay")||x.params.autoplay),x.autoplayTimeoutId=setTimeout(function(){x.params.loop?(x.fixLoop(),x._slideNext(),x.emit("onAutoplay",x)):x.isEnd?s.autoplayStopOnLast?x.stopAutoplay():(x._slideTo(0),x.emit("onAutoplay",x)):(x._slideNext(),x.emit("onAutoplay",x))},e)}function n(a,t){var s=e(a.target);if(!s.is(t))if("string"==typeof t)s=s.parents(t);else if(t.nodeType){var r;return s.parents().each(function(e,a){a===t&&(r=t)}),r?t:void 0}if(0!==s.length)return s[0]}function o(e,a){a=a||{};var t=window.MutationObserver||window.WebkitMutationObserver,s=new t(function(e){e.forEach(function(e){x.onResize(!0),x.emit("onObserverUpdate",x,e)})});s.observe(e,{attributes:void 0===a.attributes||a.attributes,childList:void 0===a.childList||a.childList,characterData:void 0===a.characterData||a.characterData}),x.observers.push(s)}function l(e){e.originalEvent&&(e=e.originalEvent);var a=e.keyCode||e.charCode;if(!x.params.allowSwipeToNext&&(x.isHorizontal()&&39===a||!x.isHorizontal()&&40===a))return!1;if(!x.params.allowSwipeToPrev&&(x.isHorizontal()&&37===a||!x.isHorizontal()&&38===a))return!1;if(!(e.shiftKey||e.altKey||e.ctrlKey||e.metaKey||document.activeElement&&document.activeElement.nodeName&&("input"===document.activeElement.nodeName.toLowerCase()||"textarea"===document.activeElement.nodeName.toLowerCase()))){if(37===a||39===a||38===a||40===a){var t=!1;if(x.container.parents("."+x.params.slideClass).length>0&&0===x.container.parents("."+x.params.slideActiveClass).length)return;var s={left:window.pageXOffset,top:window.pageYOffset},r=window.innerWidth,i=window.innerHeight,n=x.container.offset();x.rtl&&(n.left=n.left-x.container[0].scrollLeft);for(var o=[[n.left,n.top],[n.left+x.width,n.top],[n.left,n.top+x.height],[n.left+x.width,n.top+x.height]],l=0;l<o.length;l++){var p=o[l];p[0]>=s.left&&p[0]<=s.left+r&&p[1]>=s.top&&p[1]<=s.top+i&&(t=!0)}if(!t)return}x.isHorizontal()?(37!==a&&39!==a||(e.preventDefault?e.preventDefault():e.returnValue=!1),(39===a&&!x.rtl||37===a&&x.rtl)&&x.slideNext(),(37===a&&!x.rtl||39===a&&x.rtl)&&x.slidePrev()):(38!==a&&40!==a||(e.preventDefault?e.preventDefault():e.returnValue=!1),40===a&&x.slideNext(),38===a&&x.slidePrev()),x.emit("onKeyPress",x,a)}}function p(e){var a=0,t=0,s=0,r=0;return"detail"in e&&(t=e.detail),"wheelDelta"in e&&(t=-e.wheelDelta/120),"wheelDeltaY"in e&&(t=-e.wheelDeltaY/120),"wheelDeltaX"in e&&(a=-e.wheelDeltaX/120),"axis"in e&&e.axis===e.HORIZONTAL_AXIS&&(a=t,t=0),s=10*a,r=10*t,"deltaY"in e&&(r=e.deltaY),"deltaX"in e&&(s=e.deltaX),(s||r)&&e.deltaMode&&(1===e.deltaMode?(s*=40,r*=40):(s*=800,r*=800)),s&&!a&&(a=s<1?-1:1),r&&!t&&(t=r<1?-1:1),{spinX:a,spinY:t,pixelX:s,pixelY:r}}function d(e){e.originalEvent&&(e=e.originalEvent);var a=0,t=x.rtl?-1:1,s=p(e);if(x.params.mousewheelForceToAxis)if(x.isHorizontal()){if(!(Math.abs(s.pixelX)>Math.abs(s.pixelY)))return;a=s.pixelX*t}else{if(!(Math.abs(s.pixelY)>Math.abs(s.pixelX)))return;a=s.pixelY}else a=Math.abs(s.pixelX)>Math.abs(s.pixelY)?-s.pixelX*t:-s.pixelY;if(0!==a){if(x.params.mousewheelInvert&&(a=-a),x.params.freeMode){var r=x.getWrapperTranslate()+a*x.params.mousewheelSensitivity,i=x.isBeginning,n=x.isEnd;if(r>=x.minTranslate()&&(r=x.minTranslate()),r<=x.maxTranslate()&&(r=x.maxTranslate()),x.setWrapperTransition(0),x.setWrapperTranslate(r),x.updateProgress(),x.updateActiveIndex(),(!i&&x.isBeginning||!n&&x.isEnd)&&x.updateClasses(),x.params.freeModeSticky?(clearTimeout(x.mousewheel.timeout),x.mousewheel.timeout=setTimeout(function(){x.slideReset()},300)):x.params.lazyLoading&&x.lazy&&x.lazy.load(),x.emit("onScroll",x,e),x.params.autoplay&&x.params.autoplayDisableOnInteraction&&x.stopAutoplay(),0===r||r===x.maxTranslate())return}else{if((new window.Date).getTime()-x.mousewheel.lastScrollTime>60)if(a<0)if(x.isEnd&&!x.params.loop||x.animating){if(x.params.mousewheelReleaseOnEdges)return!0}else x.slideNext(),x.emit("onScroll",x,e);else if(x.isBeginning&&!x.params.loop||x.animating){if(x.params.mousewheelReleaseOnEdges)return!0}else x.slidePrev(),x.emit("onScroll",x,e);x.mousewheel.lastScrollTime=(new window.Date).getTime()}return e.preventDefault?e.preventDefault():e.returnValue=!1,!1}}function m(a,t){a=e(a);var s,r,i,n=x.rtl?-1:1;s=a.attr("data-swiper-parallax")||"0",r=a.attr("data-swiper-parallax-x"),i=a.attr("data-swiper-parallax-y"),r||i?(r=r||"0",i=i||"0"):x.isHorizontal()?(r=s,i="0"):(i=s,r="0"),r=r.indexOf("%")>=0?parseInt(r,10)*t*n+"%":r*t*n+"px",i=i.indexOf("%")>=0?parseInt(i,10)*t+"%":i*t+"px",a.transform("translate3d("+r+", "+i+",0px)")}function u(e){return 0!==e.indexOf("on")&&(e=e[0]!==e[0].toUpperCase()?"on"+e[0].toUpperCase()+e.substring(1):"on"+e),e}if(!(this instanceof a))return new a(t,s);var c={direction:"horizontal",touchEventsTarget:"container",initialSlide:0,speed:300,autoplay:!1,autoplayDisableOnInteraction:!0,autoplayStopOnLast:!1,iOSEdgeSwipeDetection:!1,iOSEdgeSwipeThreshold:20,freeMode:!1,freeModeMomentum:!0,freeModeMomentumRatio:1,freeModeMomentumBounce:!0,freeModeMomentumBounceRatio:1,freeModeMomentumVelocityRatio:1,freeModeSticky:!1,freeModeMinimumVelocity:.02,autoHeight:!1,setWrapperSize:!1,virtualTranslate:!1,effect:"slide",coverflow:{rotate:50,stretch:0,depth:100,modifier:1,slideShadows:!0},flip:{slideShadows:!0,limitRotation:!0},cube:{slideShadows:!0,shadow:!0,shadowOffset:20,shadowScale:.94},fade:{crossFade:!1},parallax:!1,zoom:!1,zoomMax:3,zoomMin:1,zoomToggle:!0,scrollbar:null,scrollbarHide:!0,scrollbarDraggable:!1,scrollbarSnapOnRelease:!1,keyboardControl:!1,mousewheelControl:!1,mousewheelReleaseOnEdges:!1,mousewheelInvert:!1,mousewheelForceToAxis:!1,mousewheelSensitivity:1,mousewheelEventsTarged:"container",hashnav:!1,hashnavWatchState:!1,history:!1,replaceState:!1,breakpoints:void 0,spaceBetween:0,slidesPerView:1,slidesPerColumn:1,slidesPerColumnFill:"column",slidesPerGroup:1,centeredSlides:!1,slidesOffsetBefore:0,slidesOffsetAfter:0,roundLengths:!1,touchRatio:1,touchAngle:45,simulateTouch:!0,shortSwipes:!0,longSwipes:!0,longSwipesRatio:.5,longSwipesMs:300,followFinger:!0,onlyExternal:!1,threshold:0,touchMoveStopPropagation:!0,touchReleaseOnEdges:!1,uniqueNavElements:!0,pagination:null,paginationElement:"span",paginationClickable:!1,paginationHide:!1,paginationBulletRender:null,paginationProgressRender:null,paginationFractionRender:null,paginationCustomRender:null,paginationType:"bullets",resistance:!0,resistanceRatio:.85,nextButton:null,prevButton:null,watchSlidesProgress:!1,watchSlidesVisibility:!1,grabCursor:!1,preventClicks:!0,preventClicksPropagation:!0,slideToClickedSlide:!1,lazyLoading:!1,lazyLoadingInPrevNext:!1,lazyLoadingInPrevNextAmount:1,lazyLoadingOnTransitionStart:!1,preloadImages:!0,updateOnImagesReady:!0,loop:!1,loopAdditionalSlides:0,loopedSlides:null,control:void 0,controlInverse:!1,controlBy:"slide",normalizeSlideIndex:!0,allowSwipeToPrev:!0,allowSwipeToNext:!0,swipeHandler:null,noSwiping:!0,noSwipingClass:"swiper-no-swiping",passiveListeners:!0,containerModifierClass:"swiper-container-",slideClass:"swiper-slide",slideActiveClass:"swiper-slide-active",slideDuplicateActiveClass:"swiper-slide-duplicate-active",slideVisibleClass:"swiper-slide-visible",slideDuplicateClass:"swiper-slide-duplicate",slideNextClass:"swiper-slide-next",slideDuplicateNextClass:"swiper-slide-duplicate-next",slidePrevClass:"swiper-slide-prev",slideDuplicatePrevClass:"swiper-slide-duplicate-prev",wrapperClass:"swiper-wrapper",bulletClass:"swiper-pagination-bullet",bulletActiveClass:"swiper-pagination-bullet-active",buttonDisabledClass:"swiper-button-disabled",paginationCurrentClass:"swiper-pagination-current",paginationTotalClass:"swiper-pagination-total",paginationHiddenClass:"swiper-pagination-hidden",paginationProgressbarClass:"swiper-pagination-progressbar",paginationClickableClass:"swiper-pagination-clickable",paginationModifierClass:"swiper-pagination-",lazyLoadingClass:"swiper-lazy",lazyStatusLoadingClass:"swiper-lazy-loading",lazyStatusLoadedClass:"swiper-lazy-loaded",lazyPreloaderClass:"swiper-lazy-preloader",notificationClass:"swiper-notification",preloaderClass:"preloader",zoomContainerClass:"swiper-zoom-container",observer:!1,observeParents:!1,a11y:!1,prevSlideMessage:"Previous slide",nextSlideMessage:"Next slide",firstSlideMessage:"This is the first slide",lastSlideMessage:"This is the last slide",paginationBulletMessage:"Go to slide {{index}}",runCallbacksOnInit:!0},g=s&&s.virtualTranslate;s=s||{};var h={};for(var v in s)if("object"!=typeof s[v]||null===s[v]||(s[v].nodeType||s[v]===window||s[v]===document||"undefined"!=typeof Dom7&&s[v]instanceof Dom7||"undefined"!=typeof jQuery&&s[v]instanceof jQuery))h[v]=s[v];else{h[v]={};for(var f in s[v])h[v][f]=s[v][f]}for(var w in c)if(void 0===s[w])s[w]=c[w];else if("object"==typeof s[w])for(var y in c[w])void 0===s[w][y]&&(s[w][y]=c[w][y]);var x=this;if(x.params=s,x.originalParams=h,x.classNames=[],void 0!==e&&"undefined"!=typeof Dom7&&(e=Dom7),(void 0!==e||(e="undefined"==typeof Dom7?window.Dom7||window.Zepto||window.jQuery:Dom7))&&(x.$=e,x.currentBreakpoint=void 0,x.getActiveBreakpoint=function(){if(!x.params.breakpoints)return!1;var e,a=!1,t=[];for(e in x.params.breakpoints)x.params.breakpoints.hasOwnProperty(e)&&t.push(e);t.sort(function(e,a){return parseInt(e,10)>parseInt(a,10)});for(var s=0;s<t.length;s++)(e=t[s])>=window.innerWidth&&!a&&(a=e);return a||"max"},x.setBreakpoint=function(){var e=x.getActiveBreakpoint();if(e&&x.currentBreakpoint!==e){var a=e in x.params.breakpoints?x.params.breakpoints[e]:x.originalParams,t=x.params.loop&&a.slidesPerView!==x.params.slidesPerView;for(var s in a)x.params[s]=a[s];x.currentBreakpoint=e,t&&x.destroyLoop&&x.reLoop(!0)}},x.params.breakpoints&&x.setBreakpoint(),x.container=e(t),0!==x.container.length)){if(x.container.length>1){var T=[];return x.container.each(function(){T.push(new a(this,s))}),T}x.container[0].swiper=x,x.container.data("swiper",x),x.classNames.push(x.params.containerModifierClass+x.params.direction),x.params.freeMode&&x.classNames.push(x.params.containerModifierClass+"free-mode"),x.support.flexbox||(x.classNames.push(x.params.containerModifierClass+"no-flexbox"),x.params.slidesPerColumn=1),x.params.autoHeight&&x.classNames.push(x.params.containerModifierClass+"autoheight"),(x.params.parallax||x.params.watchSlidesVisibility)&&(x.params.watchSlidesProgress=!0),x.params.touchReleaseOnEdges&&(x.params.resistanceRatio=0),["cube","coverflow","flip"].indexOf(x.params.effect)>=0&&(x.support.transforms3d?(x.params.watchSlidesProgress=!0,x.classNames.push(x.params.containerModifierClass+"3d")):x.params.effect="slide"),"slide"!==x.params.effect&&x.classNames.push(x.params.containerModifierClass+x.params.effect),"cube"===x.params.effect&&(x.params.resistanceRatio=0,x.params.slidesPerView=1,x.params.slidesPerColumn=1,x.params.slidesPerGroup=1,x.params.centeredSlides=!1,x.params.spaceBetween=0,x.params.virtualTranslate=!0),"fade"!==x.params.effect&&"flip"!==x.params.effect||(x.params.slidesPerView=1,x.params.slidesPerColumn=1,x.params.slidesPerGroup=1,x.params.watchSlidesProgress=!0,x.params.spaceBetween=0,void 0===g&&(x.params.virtualTranslate=!0)),x.params.grabCursor&&x.support.touch&&(x.params.grabCursor=!1),x.wrapper=x.container.children("."+x.params.wrapperClass),x.params.pagination&&(x.paginationContainer=e(x.params.pagination),x.params.uniqueNavElements&&"string"==typeof x.params.pagination&&x.paginationContainer.length>1&&1===x.container.find(x.params.pagination).length&&(x.paginationContainer=x.container.find(x.params.pagination)),"bullets"===x.params.paginationType&&x.params.paginationClickable?x.paginationContainer.addClass(x.params.paginationModifierClass+"clickable"):x.params.paginationClickable=!1,x.paginationContainer.addClass(x.params.paginationModifierClass+x.params.paginationType)),(x.params.nextButton||x.params.prevButton)&&(x.params.nextButton&&(x.nextButton=e(x.params.nextButton),x.params.uniqueNavElements&&"string"==typeof x.params.nextButton&&x.nextButton.length>1&&1===x.container.find(x.params.nextButton).length&&(x.nextButton=x.container.find(x.params.nextButton))),x.params.prevButton&&(x.prevButton=e(x.params.prevButton),x.params.uniqueNavElements&&"string"==typeof x.params.prevButton&&x.prevButton.length>1&&1===x.container.find(x.params.prevButton).length&&(x.prevButton=x.container.find(x.params.prevButton)))),x.isHorizontal=function(){return"horizontal"===x.params.direction},x.rtl=x.isHorizontal()&&("rtl"===x.container[0].dir.toLowerCase()||"rtl"===x.container.css("direction")),x.rtl&&x.classNames.push(x.params.containerModifierClass+"rtl"),x.rtl&&(x.wrongRTL="-webkit-box"===x.wrapper.css("display")),x.params.slidesPerColumn>1&&x.classNames.push(x.params.containerModifierClass+"multirow"),x.device.android&&x.classNames.push(x.params.containerModifierClass+"android"),x.container.addClass(x.classNames.join(" ")),x.translate=0,x.progress=0,x.velocity=0,x.lockSwipeToNext=function(){x.params.allowSwipeToNext=!1,x.params.allowSwipeToPrev===!1&&x.params.grabCursor&&x.unsetGrabCursor()},x.lockSwipeToPrev=function(){x.params.allowSwipeToPrev=!1,x.params.allowSwipeToNext===!1&&x.params.grabCursor&&x.unsetGrabCursor()},x.lockSwipes=function(){x.params.allowSwipeToNext=x.params.allowSwipeToPrev=!1,x.params.grabCursor&&x.unsetGrabCursor()},x.unlockSwipeToNext=function(){x.params.allowSwipeToNext=!0,x.params.allowSwipeToPrev===!0&&x.params.grabCursor&&x.setGrabCursor()},x.unlockSwipeToPrev=function(){x.params.allowSwipeToPrev=!0,x.params.allowSwipeToNext===!0&&x.params.grabCursor&&x.setGrabCursor()},x.unlockSwipes=function(){x.params.allowSwipeToNext=x.params.allowSwipeToPrev=!0,x.params.grabCursor&&x.setGrabCursor()},x.setGrabCursor=function(e){x.container[0].style.cursor="move",x.container[0].style.cursor=e?"-webkit-grabbing":"-webkit-grab",x.container[0].style.cursor=e?"-moz-grabbin":"-moz-grab",x.container[0].style.cursor=e?"grabbing":"grab"},x.unsetGrabCursor=function(){x.container[0].style.cursor=""},x.params.grabCursor&&x.setGrabCursor(),x.imagesToLoad=[],x.imagesLoaded=0,x.loadImage=function(e,a,t,s,r,i){function n(){i&&i()}var o;e.complete&&r?n():a?(o=new window.Image,o.onload=n,o.onerror=n,s&&(o.sizes=s),t&&(o.srcset=t),a&&(o.src=a)):n()},x.preloadImages=function(){function e(){void 0!==x&&null!==x&&x&&(void 0!==x.imagesLoaded&&x.imagesLoaded++,x.imagesLoaded===x.imagesToLoad.length&&(x.params.updateOnImagesReady&&x.update(),x.emit("onImagesReady",x)))}x.imagesToLoad=x.container.find("img");for(var a=0;a<x.imagesToLoad.length;a++)x.loadImage(x.imagesToLoad[a],x.imagesToLoad[a].currentSrc||x.imagesToLoad[a].getAttribute("src"),x.imagesToLoad[a].srcset||x.imagesToLoad[a].getAttribute("srcset"),x.imagesToLoad[a].sizes||x.imagesToLoad[a].getAttribute("sizes"),!0,e)},x.autoplayTimeoutId=void 0,x.autoplaying=!1,x.autoplayPaused=!1,x.startAutoplay=function(){return void 0===x.autoplayTimeoutId&&(!!x.params.autoplay&&(!x.autoplaying&&(x.autoplaying=!0,x.emit("onAutoplayStart",x),void i())))},x.stopAutoplay=function(e){x.autoplayTimeoutId&&(x.autoplayTimeoutId&&clearTimeout(x.autoplayTimeoutId),x.autoplaying=!1,x.autoplayTimeoutId=void 0,x.emit("onAutoplayStop",x))},x.pauseAutoplay=function(e){x.autoplayPaused||(x.autoplayTimeoutId&&clearTimeout(x.autoplayTimeoutId),x.autoplayPaused=!0,0===e?(x.autoplayPaused=!1,i()):x.wrapper.transitionEnd(function(){x&&(x.autoplayPaused=!1,x.autoplaying?i():x.stopAutoplay())}))},x.minTranslate=function(){return-x.snapGrid[0]},x.maxTranslate=function(){return-x.snapGrid[x.snapGrid.length-1]},x.updateAutoHeight=function(){var e,a=[],t=0;if("auto"!==x.params.slidesPerView&&x.params.slidesPerView>1)for(e=0;e<Math.ceil(x.params.slidesPerView);e++){var s=x.activeIndex+e;if(s>x.slides.length)break;a.push(x.slides.eq(s)[0])}else a.push(x.slides.eq(x.activeIndex)[0]);for(e=0;e<a.length;e++)if(void 0!==a[e]){var r=a[e].offsetHeight;t=r>t?r:t}t&&x.wrapper.css("height",t+"px")},x.updateContainerSize=function(){var e,a;e=void 0!==x.params.width?x.params.width:x.container[0].clientWidth,a=void 0!==x.params.height?x.params.height:x.container[0].clientHeight,0===e&&x.isHorizontal()||0===a&&!x.isHorizontal()||(e=e-parseInt(x.container.css("padding-left"),10)-parseInt(x.container.css("padding-right"),10),a=a-parseInt(x.container.css("padding-top"),10)-parseInt(x.container.css("padding-bottom"),10),x.width=e,x.height=a,x.size=x.isHorizontal()?x.width:x.height)},x.updateSlidesSize=function(){x.slides=x.wrapper.children("."+x.params.slideClass),x.snapGrid=[],x.slidesGrid=[],x.slidesSizesGrid=[];var e,a=x.params.spaceBetween,t=-x.params.slidesOffsetBefore,s=0,i=0;if(void 0!==x.size){"string"==typeof a&&a.indexOf("%")>=0&&(a=parseFloat(a.replace("%",""))/100*x.size),x.virtualSize=-a,x.rtl?x.slides.css({marginLeft:"",marginTop:""}):x.slides.css({marginRight:"",marginBottom:""});var n;x.params.slidesPerColumn>1&&(n=Math.floor(x.slides.length/x.params.slidesPerColumn)===x.slides.length/x.params.slidesPerColumn?x.slides.length:Math.ceil(x.slides.length/x.params.slidesPerColumn)*x.params.slidesPerColumn,"auto"!==x.params.slidesPerView&&"row"===x.params.slidesPerColumnFill&&(n=Math.max(n,x.params.slidesPerView*x.params.slidesPerColumn)));var o,l=x.params.slidesPerColumn,p=n/l,d=p-(x.params.slidesPerColumn*p-x.slides.length);for(e=0;e<x.slides.length;e++){o=0;var m=x.slides.eq(e);if(x.params.slidesPerColumn>1){var u,c,g;"column"===x.params.slidesPerColumnFill?(c=Math.floor(e/l),g=e-c*l,(c>d||c===d&&g===l-1)&&++g>=l&&(g=0,c++),u=c+g*n/l,m.css({"-webkit-box-ordinal-group":u,"-moz-box-ordinal-group":u,"-ms-flex-order":u,"-webkit-order":u,order:u})):(g=Math.floor(e/p),c=e-g*p),m.css("margin-"+(x.isHorizontal()?"top":"left"),0!==g&&x.params.spaceBetween&&x.params.spaceBetween+"px").attr("data-swiper-column",c).attr("data-swiper-row",g)}"none"!==m.css("display")&&("auto"===x.params.slidesPerView?(o=x.isHorizontal()?m.outerWidth(!0):m.outerHeight(!0),x.params.roundLengths&&(o=r(o))):(o=(x.size-(x.params.slidesPerView-1)*a)/x.params.slidesPerView,x.params.roundLengths&&(o=r(o)),x.isHorizontal()?x.slides[e].style.width=o+"px":x.slides[e].style.height=o+"px"),x.slides[e].swiperSlideSize=o,x.slidesSizesGrid.push(o),x.params.centeredSlides?(t=t+o/2+s/2+a,0===s&&0!==e&&(t=t-x.size/2-a),0===e&&(t=t-x.size/2-a),Math.abs(t)<.001&&(t=0),i%x.params.slidesPerGroup==0&&x.snapGrid.push(t),x.slidesGrid.push(t)):(i%x.params.slidesPerGroup==0&&x.snapGrid.push(t),x.slidesGrid.push(t),t=t+o+a),x.virtualSize+=o+a,s=o,i++)}x.virtualSize=Math.max(x.virtualSize,x.size)+x.params.slidesOffsetAfter;var h;if(x.rtl&&x.wrongRTL&&("slide"===x.params.effect||"coverflow"===x.params.effect)&&x.wrapper.css({width:x.virtualSize+x.params.spaceBetween+"px"}),x.support.flexbox&&!x.params.setWrapperSize||(x.isHorizontal()?x.wrapper.css({width:x.virtualSize+x.params.spaceBetween+"px"}):x.wrapper.css({height:x.virtualSize+x.params.spaceBetween+"px"})),x.params.slidesPerColumn>1&&(x.virtualSize=(o+x.params.spaceBetween)*n,x.virtualSize=Math.ceil(x.virtualSize/x.params.slidesPerColumn)-x.params.spaceBetween,x.isHorizontal()?x.wrapper.css({width:x.virtualSize+x.params.spaceBetween+"px"}):x.wrapper.css({height:x.virtualSize+x.params.spaceBetween+"px"}),x.params.centeredSlides)){for(h=[],e=0;e<x.snapGrid.length;e++)x.snapGrid[e]<x.virtualSize+x.snapGrid[0]&&h.push(x.snapGrid[e]);x.snapGrid=h}if(!x.params.centeredSlides){for(h=[],e=0;e<x.snapGrid.length;e++)x.snapGrid[e]<=x.virtualSize-x.size&&h.push(x.snapGrid[e]);x.snapGrid=h,Math.floor(x.virtualSize-x.size)-Math.floor(x.snapGrid[x.snapGrid.length-1])>1&&x.snapGrid.push(x.virtualSize-x.size)}0===x.snapGrid.length&&(x.snapGrid=[0]),0!==x.params.spaceBetween&&(x.isHorizontal()?x.rtl?x.slides.css({marginLeft:a+"px"}):x.slides.css({marginRight:a+"px"}):x.slides.css({marginBottom:a+"px"})),x.params.watchSlidesProgress&&x.updateSlidesOffset()}},x.updateSlidesOffset=function(){for(var e=0;e<x.slides.length;e++)x.slides[e].swiperSlideOffset=x.isHorizontal()?x.slides[e].offsetLeft:x.slides[e].offsetTop},x.currentSlidesPerView=function(){var e,a,t=1;if(x.params.centeredSlides){var s,r=x.slides[x.activeIndex].swiperSlideSize;for(e=x.activeIndex+1;e<x.slides.length;e++)x.slides[e]&&!s&&(r+=x.slides[e].swiperSlideSize,t++,r>x.size&&(s=!0));for(a=x.activeIndex-1;a>=0;a--)x.slides[a]&&!s&&(r+=x.slides[a].swiperSlideSize,t++,r>x.size&&(s=!0))}else for(e=x.activeIndex+1;e<x.slides.length;e++)x.slidesGrid[e]-x.slidesGrid[x.activeIndex]<x.size&&t++;return t},x.updateSlidesProgress=function(e){if(void 0===e&&(e=x.translate||0),0!==x.slides.length){void 0===x.slides[0].swiperSlideOffset&&x.updateSlidesOffset();var a=-e;x.rtl&&(a=e),x.slides.removeClass(x.params.slideVisibleClass);for(var t=0;t<x.slides.length;t++){var s=x.slides[t],r=(a+(x.params.centeredSlides?x.minTranslate():0)-s.swiperSlideOffset)/(s.swiperSlideSize+x.params.spaceBetween);if(x.params.watchSlidesVisibility){var i=-(a-s.swiperSlideOffset),n=i+x.slidesSizesGrid[t];(i>=0&&i<x.size||n>0&&n<=x.size||i<=0&&n>=x.size)&&x.slides.eq(t).addClass(x.params.slideVisibleClass)}s.progress=x.rtl?-r:r}}},x.updateProgress=function(e){void 0===e&&(e=x.translate||0);var a=x.maxTranslate()-x.minTranslate(),t=x.isBeginning,s=x.isEnd;0===a?(x.progress=0,x.isBeginning=x.isEnd=!0):(x.progress=(e-x.minTranslate())/a,x.isBeginning=x.progress<=0,x.isEnd=x.progress>=1),x.isBeginning&&!t&&x.emit("onReachBeginning",x),x.isEnd&&!s&&x.emit("onReachEnd",x),x.params.watchSlidesProgress&&x.updateSlidesProgress(e),x.emit("onProgress",x,x.progress)},x.updateActiveIndex=function(){var e,a,t,s=x.rtl?x.translate:-x.translate;for(a=0;a<x.slidesGrid.length;a++)void 0!==x.slidesGrid[a+1]?s>=x.slidesGrid[a]&&s<x.slidesGrid[a+1]-(x.slidesGrid[a+1]-x.slidesGrid[a])/2?e=a:s>=x.slidesGrid[a]&&s<x.slidesGrid[a+1]&&(e=a+1):s>=x.slidesGrid[a]&&(e=a);x.params.normalizeSlideIndex&&(e<0||void 0===e)&&(e=0),t=Math.floor(e/x.params.slidesPerGroup),t>=x.snapGrid.length&&(t=x.snapGrid.length-1),e!==x.activeIndex&&(x.snapIndex=t,x.previousIndex=x.activeIndex,x.activeIndex=e,x.updateClasses(),x.updateRealIndex())},x.updateRealIndex=function(){x.realIndex=parseInt(x.slides.eq(x.activeIndex).attr("data-swiper-slide-index")||x.activeIndex,10)},x.updateClasses=function(){x.slides.removeClass(x.params.slideActiveClass+" "+x.params.slideNextClass+" "+x.params.slidePrevClass+" "+x.params.slideDuplicateActiveClass+" "+x.params.slideDuplicateNextClass+" "+x.params.slideDuplicatePrevClass);var a=x.slides.eq(x.activeIndex);a.addClass(x.params.slideActiveClass),s.loop&&(a.hasClass(x.params.slideDuplicateClass)?x.wrapper.children("."+x.params.slideClass+":not(."+x.params.slideDuplicateClass+')[data-swiper-slide-index="'+x.realIndex+'"]').addClass(x.params.slideDuplicateActiveClass):x.wrapper.children("."+x.params.slideClass+"."+x.params.slideDuplicateClass+'[data-swiper-slide-index="'+x.realIndex+'"]').addClass(x.params.slideDuplicateActiveClass));var t=a.next("."+x.params.slideClass).addClass(x.params.slideNextClass);x.params.loop&&0===t.length&&(t=x.slides.eq(0),t.addClass(x.params.slideNextClass));var r=a.prev("."+x.params.slideClass).addClass(x.params.slidePrevClass);if(x.params.loop&&0===r.length&&(r=x.slides.eq(-1),r.addClass(x.params.slidePrevClass)),s.loop&&(t.hasClass(x.params.slideDuplicateClass)?x.wrapper.children("."+x.params.slideClass+":not(."+x.params.slideDuplicateClass+')[data-swiper-slide-index="'+t.attr("data-swiper-slide-index")+'"]').addClass(x.params.slideDuplicateNextClass):x.wrapper.children("."+x.params.slideClass+"."+x.params.slideDuplicateClass+'[data-swiper-slide-index="'+t.attr("data-swiper-slide-index")+'"]').addClass(x.params.slideDuplicateNextClass),r.hasClass(x.params.slideDuplicateClass)?x.wrapper.children("."+x.params.slideClass+":not(."+x.params.slideDuplicateClass+')[data-swiper-slide-index="'+r.attr("data-swiper-slide-index")+'"]').addClass(x.params.slideDuplicatePrevClass):x.wrapper.children("."+x.params.slideClass+"."+x.params.slideDuplicateClass+'[data-swiper-slide-index="'+r.attr("data-swiper-slide-index")+'"]').addClass(x.params.slideDuplicatePrevClass)),x.paginationContainer&&x.paginationContainer.length>0){var i,n=x.params.loop?Math.ceil((x.slides.length-2*x.loopedSlides)/x.params.slidesPerGroup):x.snapGrid.length;if(x.params.loop?(i=Math.ceil((x.activeIndex-x.loopedSlides)/x.params.slidesPerGroup),i>x.slides.length-1-2*x.loopedSlides&&(i-=x.slides.length-2*x.loopedSlides),i>n-1&&(i-=n),i<0&&"bullets"!==x.params.paginationType&&(i=n+i)):i=void 0!==x.snapIndex?x.snapIndex:x.activeIndex||0,"bullets"===x.params.paginationType&&x.bullets&&x.bullets.length>0&&(x.bullets.removeClass(x.params.bulletActiveClass),x.paginationContainer.length>1?x.bullets.each(function(){e(this).index()===i&&e(this).addClass(x.params.bulletActiveClass)}):x.bullets.eq(i).addClass(x.params.bulletActiveClass)),"fraction"===x.params.paginationType&&(x.paginationContainer.find("."+x.params.paginationCurrentClass).text(i+1),x.paginationContainer.find("."+x.params.paginationTotalClass).text(n)),"progress"===x.params.paginationType){var o=(i+1)/n,l=o,p=1;x.isHorizontal()||(p=o,l=1),x.paginationContainer.find("."+x.params.paginationProgressbarClass).transform("translate3d(0,0,0) scaleX("+l+") scaleY("+p+")").transition(x.params.speed)}"custom"===x.params.paginationType&&x.params.paginationCustomRender&&(x.paginationContainer.html(x.params.paginationCustomRender(x,i+1,n)),x.emit("onPaginationRendered",x,x.paginationContainer[0]))}x.params.loop||(x.params.prevButton&&x.prevButton&&x.prevButton.length>0&&(x.isBeginning?(x.prevButton.addClass(x.params.buttonDisabledClass),x.params.a11y&&x.a11y&&x.a11y.disable(x.prevButton)):(x.prevButton.removeClass(x.params.buttonDisabledClass),x.params.a11y&&x.a11y&&x.a11y.enable(x.prevButton))),x.params.nextButton&&x.nextButton&&x.nextButton.length>0&&(x.isEnd?(x.nextButton.addClass(x.params.buttonDisabledClass),x.params.a11y&&x.a11y&&x.a11y.disable(x.nextButton)):(x.nextButton.removeClass(x.params.buttonDisabledClass),x.params.a11y&&x.a11y&&x.a11y.enable(x.nextButton))))},x.updatePagination=function(){if(x.params.pagination&&x.paginationContainer&&x.paginationContainer.length>0){var e="";if("bullets"===x.params.paginationType){for(var a=x.params.loop?Math.ceil((x.slides.length-2*x.loopedSlides)/x.params.slidesPerGroup):x.snapGrid.length,t=0;t<a;t++)e+=x.params.paginationBulletRender?x.params.paginationBulletRender(x,t,x.params.bulletClass):"<"+x.params.paginationElement+' class="'+x.params.bulletClass+'"></'+x.params.paginationElement+">";x.paginationContainer.html(e),x.bullets=x.paginationContainer.find("."+x.params.bulletClass),x.params.paginationClickable&&x.params.a11y&&x.a11y&&x.a11y.initPagination()}"fraction"===x.params.paginationType&&(e=x.params.paginationFractionRender?x.params.paginationFractionRender(x,x.params.paginationCurrentClass,x.params.paginationTotalClass):'<span class="'+x.params.paginationCurrentClass+'"></span> / <span class="'+x.params.paginationTotalClass+'"></span>',x.paginationContainer.html(e)),"progress"===x.params.paginationType&&(e=x.params.paginationProgressRender?x.params.paginationProgressRender(x,x.params.paginationProgressbarClass):'<span class="'+x.params.paginationProgressbarClass+'"></span>',x.paginationContainer.html(e)),"custom"!==x.params.paginationType&&x.emit("onPaginationRendered",x,x.paginationContainer[0])}},x.update=function(e){function a(){x.rtl,x.translate;t=Math.min(Math.max(x.translate,x.maxTranslate()),x.minTranslate()),x.setWrapperTranslate(t),x.updateActiveIndex(),x.updateClasses()}if(x){x.updateContainerSize(),x.updateSlidesSize(),x.updateProgress(),x.updatePagination(),x.updateClasses(),x.params.scrollbar&&x.scrollbar&&x.scrollbar.set();var t;if(e){x.controller&&x.controller.spline&&(x.controller.spline=void 0),x.params.freeMode?(a(),x.params.autoHeight&&x.updateAutoHeight()):(("auto"===x.params.slidesPerView||x.params.slidesPerView>1)&&x.isEnd&&!x.params.centeredSlides?x.slideTo(x.slides.length-1,0,!1,!0):x.slideTo(x.activeIndex,0,!1,!0))||a()}else x.params.autoHeight&&x.updateAutoHeight()}},x.onResize=function(e){x.params.onBeforeResize&&x.params.onBeforeResize(x),x.params.breakpoints&&x.setBreakpoint();var a=x.params.allowSwipeToPrev,t=x.params.allowSwipeToNext;x.params.allowSwipeToPrev=x.params.allowSwipeToNext=!0,x.updateContainerSize(),x.updateSlidesSize(),("auto"===x.params.slidesPerView||x.params.freeMode||e)&&x.updatePagination(),x.params.scrollbar&&x.scrollbar&&x.scrollbar.set(),x.controller&&x.controller.spline&&(x.controller.spline=void 0);var s=!1;if(x.params.freeMode){var r=Math.min(Math.max(x.translate,x.maxTranslate()),x.minTranslate());x.setWrapperTranslate(r),x.updateActiveIndex(),x.updateClasses(),x.params.autoHeight&&x.updateAutoHeight()}else x.updateClasses(),s=("auto"===x.params.slidesPerView||x.params.slidesPerView>1)&&x.isEnd&&!x.params.centeredSlides?x.slideTo(x.slides.length-1,0,!1,!0):x.slideTo(x.activeIndex,0,!1,!0);x.params.lazyLoading&&!s&&x.lazy&&x.lazy.load(),x.params.allowSwipeToPrev=a,x.params.allowSwipeToNext=t,x.params.onAfterResize&&x.params.onAfterResize(x)},x.touchEventsDesktop={start:"mousedown",move:"mousemove",end:"mouseup"},window.navigator.pointerEnabled?x.touchEventsDesktop={start:"pointerdown",move:"pointermove",end:"pointerup"}:window.navigator.msPointerEnabled&&(x.touchEventsDesktop={start:"MSPointerDown",move:"MSPointerMove",end:"MSPointerUp"}),x.touchEvents={start:x.support.touch||!x.params.simulateTouch?"touchstart":x.touchEventsDesktop.start,move:x.support.touch||!x.params.simulateTouch?"touchmove":x.touchEventsDesktop.move,end:x.support.touch||!x.params.simulateTouch?"touchend":x.touchEventsDesktop.end},(window.navigator.pointerEnabled||window.navigator.msPointerEnabled)&&("container"===x.params.touchEventsTarget?x.container:x.wrapper).addClass("swiper-wp8-"+x.params.direction),x.initEvents=function(e){var a=e?"off":"on",t=e?"removeEventListener":"addEventListener",r="container"===x.params.touchEventsTarget?x.container[0]:x.wrapper[0],i=x.support.touch?r:document,n=!!x.params.nested;if(x.browser.ie)r[t](x.touchEvents.start,x.onTouchStart,!1),i[t](x.touchEvents.move,x.onTouchMove,n),i[t](x.touchEvents.end,x.onTouchEnd,!1);else{if(x.support.touch){var o=!("touchstart"!==x.touchEvents.start||!x.support.passiveListener||!x.params.passiveListeners)&&{passive:!0,capture:!1};r[t](x.touchEvents.start,x.onTouchStart,o),r[t](x.touchEvents.move,x.onTouchMove,n),r[t](x.touchEvents.end,x.onTouchEnd,o)}(s.simulateTouch&&!x.device.ios&&!x.device.android||s.simulateTouch&&!x.support.touch&&x.device.ios)&&(r[t]("mousedown",x.onTouchStart,!1),document[t]("mousemove",x.onTouchMove,n),document[t]("mouseup",x.onTouchEnd,!1))}window[t]("resize",x.onResize),x.params.nextButton&&x.nextButton&&x.nextButton.length>0&&(x.nextButton[a]("click",x.onClickNext),x.params.a11y&&x.a11y&&x.nextButton[a]("keydown",x.a11y.onEnterKey)),x.params.prevButton&&x.prevButton&&x.prevButton.length>0&&(x.prevButton[a]("click",x.onClickPrev),x.params.a11y&&x.a11y&&x.prevButton[a]("keydown",x.a11y.onEnterKey)),x.params.pagination&&x.params.paginationClickable&&(x.paginationContainer[a]("click","."+x.params.bulletClass,x.onClickIndex),x.params.a11y&&x.a11y&&x.paginationContainer[a]("keydown","."+x.params.bulletClass,x.a11y.onEnterKey)),(x.params.preventClicks||x.params.preventClicksPropagation)&&r[t]("click",x.preventClicks,!0)},x.attachEvents=function(){x.initEvents()},x.detachEvents=function(){x.initEvents(!0)},x.allowClick=!0,x.preventClicks=function(e){x.allowClick||(x.params.preventClicks&&e.preventDefault(),x.params.preventClicksPropagation&&x.animating&&(e.stopPropagation(),e.stopImmediatePropagation()))},x.onClickNext=function(e){e.preventDefault(),x.isEnd&&!x.params.loop||x.slideNext()},x.onClickPrev=function(e){e.preventDefault(),x.isBeginning&&!x.params.loop||x.slidePrev()},x.onClickIndex=function(a){a.preventDefault();var t=e(this).index()*x.params.slidesPerGroup
+;x.params.loop&&(t+=x.loopedSlides),x.slideTo(t)},x.updateClickedSlide=function(a){var t=n(a,"."+x.params.slideClass),s=!1;if(t)for(var r=0;r<x.slides.length;r++)x.slides[r]===t&&(s=!0);if(!t||!s)return x.clickedSlide=void 0,void(x.clickedIndex=void 0);if(x.clickedSlide=t,x.clickedIndex=e(t).index(),x.params.slideToClickedSlide&&void 0!==x.clickedIndex&&x.clickedIndex!==x.activeIndex){var i,o=x.clickedIndex,l="auto"===x.params.slidesPerView?x.currentSlidesPerView():x.params.slidesPerView;if(x.params.loop){if(x.animating)return;i=parseInt(e(x.clickedSlide).attr("data-swiper-slide-index"),10),x.params.centeredSlides?o<x.loopedSlides-l/2||o>x.slides.length-x.loopedSlides+l/2?(x.fixLoop(),o=x.wrapper.children("."+x.params.slideClass+'[data-swiper-slide-index="'+i+'"]:not(.'+x.params.slideDuplicateClass+")").eq(0).index(),setTimeout(function(){x.slideTo(o)},0)):x.slideTo(o):o>x.slides.length-l?(x.fixLoop(),o=x.wrapper.children("."+x.params.slideClass+'[data-swiper-slide-index="'+i+'"]:not(.'+x.params.slideDuplicateClass+")").eq(0).index(),setTimeout(function(){x.slideTo(o)},0)):x.slideTo(o)}else x.slideTo(o)}};var b,C,S,z,M,P,E,I,k,D,L="input, select, textarea, button, video",B=Date.now(),H=[];x.animating=!1,x.touches={startX:0,startY:0,currentX:0,currentY:0,diff:0};var G,X;x.onTouchStart=function(a){if(a.originalEvent&&(a=a.originalEvent),(G="touchstart"===a.type)||!("which"in a)||3!==a.which){if(x.params.noSwiping&&n(a,"."+x.params.noSwipingClass))return void(x.allowClick=!0);if(!x.params.swipeHandler||n(a,x.params.swipeHandler)){var t=x.touches.currentX="touchstart"===a.type?a.targetTouches[0].pageX:a.pageX,s=x.touches.currentY="touchstart"===a.type?a.targetTouches[0].pageY:a.pageY;if(!(x.device.ios&&x.params.iOSEdgeSwipeDetection&&t<=x.params.iOSEdgeSwipeThreshold)){if(b=!0,C=!1,S=!0,M=void 0,X=void 0,x.touches.startX=t,x.touches.startY=s,z=Date.now(),x.allowClick=!0,x.updateContainerSize(),x.swipeDirection=void 0,x.params.threshold>0&&(I=!1),"touchstart"!==a.type){var r=!0;e(a.target).is(L)&&(r=!1),document.activeElement&&e(document.activeElement).is(L)&&document.activeElement.blur(),r&&a.preventDefault()}x.emit("onTouchStart",x,a)}}}},x.onTouchMove=function(a){if(a.originalEvent&&(a=a.originalEvent),!G||"mousemove"!==a.type){if(a.preventedByNestedSwiper)return x.touches.startX="touchmove"===a.type?a.targetTouches[0].pageX:a.pageX,void(x.touches.startY="touchmove"===a.type?a.targetTouches[0].pageY:a.pageY);if(x.params.onlyExternal)return x.allowClick=!1,void(b&&(x.touches.startX=x.touches.currentX="touchmove"===a.type?a.targetTouches[0].pageX:a.pageX,x.touches.startY=x.touches.currentY="touchmove"===a.type?a.targetTouches[0].pageY:a.pageY,z=Date.now()));if(G&&x.params.touchReleaseOnEdges&&!x.params.loop)if(x.isHorizontal()){if(x.touches.currentX<x.touches.startX&&x.translate<=x.maxTranslate()||x.touches.currentX>x.touches.startX&&x.translate>=x.minTranslate())return}else if(x.touches.currentY<x.touches.startY&&x.translate<=x.maxTranslate()||x.touches.currentY>x.touches.startY&&x.translate>=x.minTranslate())return;if(G&&document.activeElement&&a.target===document.activeElement&&e(a.target).is(L))return C=!0,void(x.allowClick=!1);if(S&&x.emit("onTouchMove",x,a),!(a.targetTouches&&a.targetTouches.length>1)){if(x.touches.currentX="touchmove"===a.type?a.targetTouches[0].pageX:a.pageX,x.touches.currentY="touchmove"===a.type?a.targetTouches[0].pageY:a.pageY,void 0===M){var t;x.isHorizontal()&&x.touches.currentY===x.touches.startY||!x.isHorizontal()&&x.touches.currentX===x.touches.startX?M=!1:(t=180*Math.atan2(Math.abs(x.touches.currentY-x.touches.startY),Math.abs(x.touches.currentX-x.touches.startX))/Math.PI,M=x.isHorizontal()?t>x.params.touchAngle:90-t>x.params.touchAngle)}if(M&&x.emit("onTouchMoveOpposite",x,a),void 0===X&&(x.touches.currentX===x.touches.startX&&x.touches.currentY===x.touches.startY||(X=!0)),b){if(M)return void(b=!1);if(X){x.allowClick=!1,x.emit("onSliderMove",x,a),a.preventDefault(),x.params.touchMoveStopPropagation&&!x.params.nested&&a.stopPropagation(),C||(s.loop&&x.fixLoop(),E=x.getWrapperTranslate(),x.setWrapperTransition(0),x.animating&&x.wrapper.trigger("webkitTransitionEnd transitionend oTransitionEnd MSTransitionEnd msTransitionEnd"),x.params.autoplay&&x.autoplaying&&(x.params.autoplayDisableOnInteraction?x.stopAutoplay():x.pauseAutoplay()),D=!1,!x.params.grabCursor||x.params.allowSwipeToNext!==!0&&x.params.allowSwipeToPrev!==!0||x.setGrabCursor(!0)),C=!0;var r=x.touches.diff=x.isHorizontal()?x.touches.currentX-x.touches.startX:x.touches.currentY-x.touches.startY;r*=x.params.touchRatio,x.rtl&&(r=-r),x.swipeDirection=r>0?"prev":"next",P=r+E;var i=!0;if(r>0&&P>x.minTranslate()?(i=!1,x.params.resistance&&(P=x.minTranslate()-1+Math.pow(-x.minTranslate()+E+r,x.params.resistanceRatio))):r<0&&P<x.maxTranslate()&&(i=!1,x.params.resistance&&(P=x.maxTranslate()+1-Math.pow(x.maxTranslate()-E-r,x.params.resistanceRatio))),i&&(a.preventedByNestedSwiper=!0),!x.params.allowSwipeToNext&&"next"===x.swipeDirection&&P<E&&(P=E),!x.params.allowSwipeToPrev&&"prev"===x.swipeDirection&&P>E&&(P=E),x.params.threshold>0){if(!(Math.abs(r)>x.params.threshold||I))return void(P=E);if(!I)return I=!0,x.touches.startX=x.touches.currentX,x.touches.startY=x.touches.currentY,P=E,void(x.touches.diff=x.isHorizontal()?x.touches.currentX-x.touches.startX:x.touches.currentY-x.touches.startY)}x.params.followFinger&&((x.params.freeMode||x.params.watchSlidesProgress)&&x.updateActiveIndex(),x.params.freeMode&&(0===H.length&&H.push({position:x.touches[x.isHorizontal()?"startX":"startY"],time:z}),H.push({position:x.touches[x.isHorizontal()?"currentX":"currentY"],time:(new window.Date).getTime()})),x.updateProgress(P),x.setWrapperTranslate(P))}}}}},x.onTouchEnd=function(a){if(a.originalEvent&&(a=a.originalEvent),S&&x.emit("onTouchEnd",x,a),S=!1,b){x.params.grabCursor&&C&&b&&(x.params.allowSwipeToNext===!0||x.params.allowSwipeToPrev===!0)&&x.setGrabCursor(!1);var t=Date.now(),s=t-z;if(x.allowClick&&(x.updateClickedSlide(a),x.emit("onTap",x,a),s<300&&t-B>300&&(k&&clearTimeout(k),k=setTimeout(function(){x&&(x.params.paginationHide&&x.paginationContainer.length>0&&!e(a.target).hasClass(x.params.bulletClass)&&x.paginationContainer.toggleClass(x.params.paginationHiddenClass),x.emit("onClick",x,a))},300)),s<300&&t-B<300&&(k&&clearTimeout(k),x.emit("onDoubleTap",x,a))),B=Date.now(),setTimeout(function(){x&&(x.allowClick=!0)},0),!b||!C||!x.swipeDirection||0===x.touches.diff||P===E)return void(b=C=!1);b=C=!1;var r;if(r=x.params.followFinger?x.rtl?x.translate:-x.translate:-P,x.params.freeMode){if(r<-x.minTranslate())return void x.slideTo(x.activeIndex);if(r>-x.maxTranslate())return void(x.slides.length<x.snapGrid.length?x.slideTo(x.snapGrid.length-1):x.slideTo(x.slides.length-1));if(x.params.freeModeMomentum){if(H.length>1){var i=H.pop(),n=H.pop(),o=i.position-n.position,l=i.time-n.time;x.velocity=o/l,x.velocity=x.velocity/2,Math.abs(x.velocity)<x.params.freeModeMinimumVelocity&&(x.velocity=0),(l>150||(new window.Date).getTime()-i.time>300)&&(x.velocity=0)}else x.velocity=0;x.velocity=x.velocity*x.params.freeModeMomentumVelocityRatio,H.length=0;var p=1e3*x.params.freeModeMomentumRatio,d=x.velocity*p,m=x.translate+d;x.rtl&&(m=-m);var u,c=!1,g=20*Math.abs(x.velocity)*x.params.freeModeMomentumBounceRatio;if(m<x.maxTranslate())x.params.freeModeMomentumBounce?(m+x.maxTranslate()<-g&&(m=x.maxTranslate()-g),u=x.maxTranslate(),c=!0,D=!0):m=x.maxTranslate();else if(m>x.minTranslate())x.params.freeModeMomentumBounce?(m-x.minTranslate()>g&&(m=x.minTranslate()+g),u=x.minTranslate(),c=!0,D=!0):m=x.minTranslate();else if(x.params.freeModeSticky){var h,v=0;for(v=0;v<x.snapGrid.length;v+=1)if(x.snapGrid[v]>-m){h=v;break}m=Math.abs(x.snapGrid[h]-m)<Math.abs(x.snapGrid[h-1]-m)||"next"===x.swipeDirection?x.snapGrid[h]:x.snapGrid[h-1],x.rtl||(m=-m)}if(0!==x.velocity)p=x.rtl?Math.abs((-m-x.translate)/x.velocity):Math.abs((m-x.translate)/x.velocity);else if(x.params.freeModeSticky)return void x.slideReset();x.params.freeModeMomentumBounce&&c?(x.updateProgress(u),x.setWrapperTransition(p),x.setWrapperTranslate(m),x.onTransitionStart(),x.animating=!0,x.wrapper.transitionEnd(function(){x&&D&&(x.emit("onMomentumBounce",x),x.setWrapperTransition(x.params.speed),x.setWrapperTranslate(u),x.wrapper.transitionEnd(function(){x&&x.onTransitionEnd()}))})):x.velocity?(x.updateProgress(m),x.setWrapperTransition(p),x.setWrapperTranslate(m),x.onTransitionStart(),x.animating||(x.animating=!0,x.wrapper.transitionEnd(function(){x&&x.onTransitionEnd()}))):x.updateProgress(m),x.updateActiveIndex()}return void((!x.params.freeModeMomentum||s>=x.params.longSwipesMs)&&(x.updateProgress(),x.updateActiveIndex()))}var f,w=0,y=x.slidesSizesGrid[0];for(f=0;f<x.slidesGrid.length;f+=x.params.slidesPerGroup)void 0!==x.slidesGrid[f+x.params.slidesPerGroup]?r>=x.slidesGrid[f]&&r<x.slidesGrid[f+x.params.slidesPerGroup]&&(w=f,y=x.slidesGrid[f+x.params.slidesPerGroup]-x.slidesGrid[f]):r>=x.slidesGrid[f]&&(w=f,y=x.slidesGrid[x.slidesGrid.length-1]-x.slidesGrid[x.slidesGrid.length-2]);var T=(r-x.slidesGrid[w])/y;if(s>x.params.longSwipesMs){if(!x.params.longSwipes)return void x.slideTo(x.activeIndex);"next"===x.swipeDirection&&(T>=x.params.longSwipesRatio?x.slideTo(w+x.params.slidesPerGroup):x.slideTo(w)),"prev"===x.swipeDirection&&(T>1-x.params.longSwipesRatio?x.slideTo(w+x.params.slidesPerGroup):x.slideTo(w))}else{if(!x.params.shortSwipes)return void x.slideTo(x.activeIndex);"next"===x.swipeDirection&&x.slideTo(w+x.params.slidesPerGroup),"prev"===x.swipeDirection&&x.slideTo(w)}}},x._slideTo=function(e,a){return x.slideTo(e,a,!0,!0)},x.slideTo=function(e,a,t,s){void 0===t&&(t=!0),void 0===e&&(e=0),e<0&&(e=0),x.snapIndex=Math.floor(e/x.params.slidesPerGroup),x.snapIndex>=x.snapGrid.length&&(x.snapIndex=x.snapGrid.length-1);var r=-x.snapGrid[x.snapIndex];if(x.params.autoplay&&x.autoplaying&&(s||!x.params.autoplayDisableOnInteraction?x.pauseAutoplay(a):x.stopAutoplay()),x.updateProgress(r),x.params.normalizeSlideIndex)for(var i=0;i<x.slidesGrid.length;i++)-Math.floor(100*r)>=Math.floor(100*x.slidesGrid[i])&&(e=i);return!(!x.params.allowSwipeToNext&&r<x.translate&&r<x.minTranslate())&&(!(!x.params.allowSwipeToPrev&&r>x.translate&&r>x.maxTranslate()&&(x.activeIndex||0)!==e)&&(void 0===a&&(a=x.params.speed),x.previousIndex=x.activeIndex||0,x.activeIndex=e,x.updateRealIndex(),x.rtl&&-r===x.translate||!x.rtl&&r===x.translate?(x.params.autoHeight&&x.updateAutoHeight(),x.updateClasses(),"slide"!==x.params.effect&&x.setWrapperTranslate(r),!1):(x.updateClasses(),x.onTransitionStart(t),0===a||x.browser.lteIE9?(x.setWrapperTranslate(r),x.setWrapperTransition(0),x.onTransitionEnd(t)):(x.setWrapperTranslate(r),x.setWrapperTransition(a),x.animating||(x.animating=!0,x.wrapper.transitionEnd(function(){x&&x.onTransitionEnd(t)}))),!0)))},x.onTransitionStart=function(e){void 0===e&&(e=!0),x.params.autoHeight&&x.updateAutoHeight(),x.lazy&&x.lazy.onTransitionStart(),e&&(x.emit("onTransitionStart",x),x.activeIndex!==x.previousIndex&&(x.emit("onSlideChangeStart",x),x.activeIndex>x.previousIndex?x.emit("onSlideNextStart",x):x.emit("onSlidePrevStart",x)))},x.onTransitionEnd=function(e){x.animating=!1,x.setWrapperTransition(0),void 0===e&&(e=!0),x.lazy&&x.lazy.onTransitionEnd(),e&&(x.emit("onTransitionEnd",x),x.activeIndex!==x.previousIndex&&(x.emit("onSlideChangeEnd",x),x.activeIndex>x.previousIndex?x.emit("onSlideNextEnd",x):x.emit("onSlidePrevEnd",x))),x.params.history&&x.history&&x.history.setHistory(x.params.history,x.activeIndex),x.params.hashnav&&x.hashnav&&x.hashnav.setHash()},x.slideNext=function(e,a,t){if(x.params.loop){if(x.animating)return!1;x.fixLoop();x.container[0].clientLeft;return x.slideTo(x.activeIndex+x.params.slidesPerGroup,a,e,t)}return x.slideTo(x.activeIndex+x.params.slidesPerGroup,a,e,t)},x._slideNext=function(e){return x.slideNext(!0,e,!0)},x.slidePrev=function(e,a,t){if(x.params.loop){if(x.animating)return!1;x.fixLoop();x.container[0].clientLeft;return x.slideTo(x.activeIndex-1,a,e,t)}return x.slideTo(x.activeIndex-1,a,e,t)},x._slidePrev=function(e){return x.slidePrev(!0,e,!0)},x.slideReset=function(e,a,t){return x.slideTo(x.activeIndex,a,e)},x.disableTouchControl=function(){return x.params.onlyExternal=!0,!0},x.enableTouchControl=function(){return x.params.onlyExternal=!1,!0},x.setWrapperTransition=function(e,a){x.wrapper.transition(e),"slide"!==x.params.effect&&x.effects[x.params.effect]&&x.effects[x.params.effect].setTransition(e),x.params.parallax&&x.parallax&&x.parallax.setTransition(e),x.params.scrollbar&&x.scrollbar&&x.scrollbar.setTransition(e),x.params.control&&x.controller&&x.controller.setTransition(e,a),x.emit("onSetTransition",x,e)},x.setWrapperTranslate=function(e,a,t){var s=0,i=0;x.isHorizontal()?s=x.rtl?-e:e:i=e,x.params.roundLengths&&(s=r(s),i=r(i)),x.params.virtualTranslate||(x.support.transforms3d?x.wrapper.transform("translate3d("+s+"px, "+i+"px, 0px)"):x.wrapper.transform("translate("+s+"px, "+i+"px)")),x.translate=x.isHorizontal()?s:i;var n,o=x.maxTranslate()-x.minTranslate();n=0===o?0:(e-x.minTranslate())/o,n!==x.progress&&x.updateProgress(e),a&&x.updateActiveIndex(),"slide"!==x.params.effect&&x.effects[x.params.effect]&&x.effects[x.params.effect].setTranslate(x.translate),x.params.parallax&&x.parallax&&x.parallax.setTranslate(x.translate),x.params.scrollbar&&x.scrollbar&&x.scrollbar.setTranslate(x.translate),x.params.control&&x.controller&&x.controller.setTranslate(x.translate,t),x.emit("onSetTranslate",x,x.translate)},x.getTranslate=function(e,a){var t,s,r,i;return void 0===a&&(a="x"),x.params.virtualTranslate?x.rtl?-x.translate:x.translate:(r=window.getComputedStyle(e,null),window.WebKitCSSMatrix?(s=r.transform||r.webkitTransform,s.split(",").length>6&&(s=s.split(", ").map(function(e){return e.replace(",",".")}).join(", ")),i=new window.WebKitCSSMatrix("none"===s?"":s)):(i=r.MozTransform||r.OTransform||r.MsTransform||r.msTransform||r.transform||r.getPropertyValue("transform").replace("translate(","matrix(1, 0, 0, 1,"),t=i.toString().split(",")),"x"===a&&(s=window.WebKitCSSMatrix?i.m41:16===t.length?parseFloat(t[12]):parseFloat(t[4])),"y"===a&&(s=window.WebKitCSSMatrix?i.m42:16===t.length?parseFloat(t[13]):parseFloat(t[5])),x.rtl&&s&&(s=-s),s||0)},x.getWrapperTranslate=function(e){return void 0===e&&(e=x.isHorizontal()?"x":"y"),x.getTranslate(x.wrapper[0],e)},x.observers=[],x.initObservers=function(){if(x.params.observeParents)for(var e=x.container.parents(),a=0;a<e.length;a++)o(e[a]);o(x.container[0],{childList:!1}),o(x.wrapper[0],{attributes:!1})},x.disconnectObservers=function(){for(var e=0;e<x.observers.length;e++)x.observers[e].disconnect();x.observers=[]},x.createLoop=function(){x.wrapper.children("."+x.params.slideClass+"."+x.params.slideDuplicateClass).remove();var a=x.wrapper.children("."+x.params.slideClass);"auto"!==x.params.slidesPerView||x.params.loopedSlides||(x.params.loopedSlides=a.length),x.loopedSlides=parseInt(x.params.loopedSlides||x.params.slidesPerView,10),x.loopedSlides=x.loopedSlides+x.params.loopAdditionalSlides,x.loopedSlides>a.length&&(x.loopedSlides=a.length);var t,s=[],r=[];for(a.each(function(t,i){var n=e(this);t<x.loopedSlides&&r.push(i),t<a.length&&t>=a.length-x.loopedSlides&&s.push(i),n.attr("data-swiper-slide-index",t)}),t=0;t<r.length;t++)x.wrapper.append(e(r[t].cloneNode(!0)).addClass(x.params.slideDuplicateClass));for(t=s.length-1;t>=0;t--)x.wrapper.prepend(e(s[t].cloneNode(!0)).addClass(x.params.slideDuplicateClass))},x.destroyLoop=function(){x.wrapper.children("."+x.params.slideClass+"."+x.params.slideDuplicateClass).remove(),x.slides.removeAttr("data-swiper-slide-index")},x.reLoop=function(e){var a=x.activeIndex-x.loopedSlides;x.destroyLoop(),x.createLoop(),x.updateSlidesSize(),e&&x.slideTo(a+x.loopedSlides,0,!1)},x.fixLoop=function(){var e;x.activeIndex<x.loopedSlides?(e=x.slides.length-3*x.loopedSlides+x.activeIndex,e+=x.loopedSlides,x.slideTo(e,0,!1,!0)):("auto"===x.params.slidesPerView&&x.activeIndex>=2*x.loopedSlides||x.activeIndex>x.slides.length-2*x.params.slidesPerView)&&(e=-x.slides.length+x.activeIndex+x.loopedSlides,e+=x.loopedSlides,x.slideTo(e,0,!1,!0))},x.appendSlide=function(e){if(x.params.loop&&x.destroyLoop(),"object"==typeof e&&e.length)for(var a=0;a<e.length;a++)e[a]&&x.wrapper.append(e[a]);else x.wrapper.append(e);x.params.loop&&x.createLoop(),x.params.observer&&x.support.observer||x.update(!0)},x.prependSlide=function(e){x.params.loop&&x.destroyLoop();var a=x.activeIndex+1;if("object"==typeof e&&e.length){for(var t=0;t<e.length;t++)e[t]&&x.wrapper.prepend(e[t]);a=x.activeIndex+e.length}else x.wrapper.prepend(e);x.params.loop&&x.createLoop(),x.params.observer&&x.support.observer||x.update(!0),x.slideTo(a,0,!1)},x.removeSlide=function(e){x.params.loop&&(x.destroyLoop(),x.slides=x.wrapper.children("."+x.params.slideClass));var a,t=x.activeIndex;if("object"==typeof e&&e.length){for(var s=0;s<e.length;s++)a=e[s],x.slides[a]&&x.slides.eq(a).remove(),a<t&&t--;t=Math.max(t,0)}else a=e,x.slides[a]&&x.slides.eq(a).remove(),a<t&&t--,t=Math.max(t,0);x.params.loop&&x.createLoop(),x.params.observer&&x.support.observer||x.update(!0),x.params.loop?x.slideTo(t+x.loopedSlides,0,!1):x.slideTo(t,0,!1)},x.removeAllSlides=function(){for(var e=[],a=0;a<x.slides.length;a++)e.push(a);x.removeSlide(e)},x.effects={fade:{setTranslate:function(){for(var e=0;e<x.slides.length;e++){var a=x.slides.eq(e),t=a[0].swiperSlideOffset,s=-t;x.params.virtualTranslate||(s-=x.translate);var r=0;x.isHorizontal()||(r=s,s=0);var i=x.params.fade.crossFade?Math.max(1-Math.abs(a[0].progress),0):1+Math.min(Math.max(a[0].progress,-1),0);a.css({opacity:i}).transform("translate3d("+s+"px, "+r+"px, 0px)")}},setTransition:function(e){if(x.slides.transition(e),x.params.virtualTranslate&&0!==e){var a=!1;x.slides.transitionEnd(function(){if(!a&&x){a=!0,x.animating=!1;for(var e=["webkitTransitionEnd","transitionend","oTransitionEnd","MSTransitionEnd","msTransitionEnd"],t=0;t<e.length;t++)x.wrapper.trigger(e[t])}})}}},flip:{setTranslate:function(){for(var a=0;a<x.slides.length;a++){var t=x.slides.eq(a),s=t[0].progress;x.params.flip.limitRotation&&(s=Math.max(Math.min(t[0].progress,1),-1));var r=t[0].swiperSlideOffset,i=-180*s,n=i,o=0,l=-r,p=0;if(x.isHorizontal()?x.rtl&&(n=-n):(p=l,l=0,o=-n,n=0),t[0].style.zIndex=-Math.abs(Math.round(s))+x.slides.length,x.params.flip.slideShadows){var d=x.isHorizontal()?t.find(".swiper-slide-shadow-left"):t.find(".swiper-slide-shadow-top"),m=x.isHorizontal()?t.find(".swiper-slide-shadow-right"):t.find(".swiper-slide-shadow-bottom");0===d.length&&(d=e('<div class="swiper-slide-shadow-'+(x.isHorizontal()?"left":"top")+'"></div>'),t.append(d)),0===m.length&&(m=e('<div class="swiper-slide-shadow-'+(x.isHorizontal()?"right":"bottom")+'"></div>'),t.append(m)),d.length&&(d[0].style.opacity=Math.max(-s,0)),m.length&&(m[0].style.opacity=Math.max(s,0))}t.transform("translate3d("+l+"px, "+p+"px, 0px) rotateX("+o+"deg) rotateY("+n+"deg)")}},setTransition:function(a){if(x.slides.transition(a).find(".swiper-slide-shadow-top, .swiper-slide-shadow-right, .swiper-slide-shadow-bottom, .swiper-slide-shadow-left").transition(a),x.params.virtualTranslate&&0!==a){var t=!1;x.slides.eq(x.activeIndex).transitionEnd(function(){if(!t&&x&&e(this).hasClass(x.params.slideActiveClass)){t=!0,x.animating=!1;for(var a=["webkitTransitionEnd","transitionend","oTransitionEnd","MSTransitionEnd","msTransitionEnd"],s=0;s<a.length;s++)x.wrapper.trigger(a[s])}})}}},cube:{setTranslate:function(){var a,t=0;x.params.cube.shadow&&(x.isHorizontal()?(a=x.wrapper.find(".swiper-cube-shadow"),0===a.length&&(a=e('<div class="swiper-cube-shadow"></div>'),x.wrapper.append(a)),a.css({height:x.width+"px"})):(a=x.container.find(".swiper-cube-shadow"),0===a.length&&(a=e('<div class="swiper-cube-shadow"></div>'),x.container.append(a))));for(var s=0;s<x.slides.length;s++){var r=x.slides.eq(s),i=90*s,n=Math.floor(i/360);x.rtl&&(i=-i,n=Math.floor(-i/360));var o=Math.max(Math.min(r[0].progress,1),-1),l=0,p=0,d=0;s%4==0?(l=4*-n*x.size,d=0):(s-1)%4==0?(l=0,d=4*-n*x.size):(s-2)%4==0?(l=x.size+4*n*x.size,d=x.size):(s-3)%4==0&&(l=-x.size,d=3*x.size+4*x.size*n),x.rtl&&(l=-l),x.isHorizontal()||(p=l,l=0);var m="rotateX("+(x.isHorizontal()?0:-i)+"deg) rotateY("+(x.isHorizontal()?i:0)+"deg) translate3d("+l+"px, "+p+"px, "+d+"px)";if(o<=1&&o>-1&&(t=90*s+90*o,x.rtl&&(t=90*-s-90*o)),r.transform(m),x.params.cube.slideShadows){var u=x.isHorizontal()?r.find(".swiper-slide-shadow-left"):r.find(".swiper-slide-shadow-top"),c=x.isHorizontal()?r.find(".swiper-slide-shadow-right"):r.find(".swiper-slide-shadow-bottom");0===u.length&&(u=e('<div class="swiper-slide-shadow-'+(x.isHorizontal()?"left":"top")+'"></div>'),r.append(u)),0===c.length&&(c=e('<div class="swiper-slide-shadow-'+(x.isHorizontal()?"right":"bottom")+'"></div>'),r.append(c)),u.length&&(u[0].style.opacity=Math.max(-o,0)),c.length&&(c[0].style.opacity=Math.max(o,0))}}if(x.wrapper.css({"-webkit-transform-origin":"50% 50% -"+x.size/2+"px","-moz-transform-origin":"50% 50% -"+x.size/2+"px","-ms-transform-origin":"50% 50% -"+x.size/2+"px","transform-origin":"50% 50% -"+x.size/2+"px"}),x.params.cube.shadow)if(x.isHorizontal())a.transform("translate3d(0px, "+(x.width/2+x.params.cube.shadowOffset)+"px, "+-x.width/2+"px) rotateX(90deg) rotateZ(0deg) scale("+x.params.cube.shadowScale+")");else{var g=Math.abs(t)-90*Math.floor(Math.abs(t)/90),h=1.5-(Math.sin(2*g*Math.PI/360)/2+Math.cos(2*g*Math.PI/360)/2),v=x.params.cube.shadowScale,f=x.params.cube.shadowScale/h,w=x.params.cube.shadowOffset;a.transform("scale3d("+v+", 1, "+f+") translate3d(0px, "+(x.height/2+w)+"px, "+-x.height/2/f+"px) rotateX(-90deg)")}var y=x.isSafari||x.isUiWebView?-x.size/2:0;x.wrapper.transform("translate3d(0px,0,"+y+"px) rotateX("+(x.isHorizontal()?0:t)+"deg) rotateY("+(x.isHorizontal()?-t:0)+"deg)")},setTransition:function(e){x.slides.transition(e).find(".swiper-slide-shadow-top, .swiper-slide-shadow-right, .swiper-slide-shadow-bottom, .swiper-slide-shadow-left").transition(e),x.params.cube.shadow&&!x.isHorizontal()&&x.container.find(".swiper-cube-shadow").transition(e)}},coverflow:{setTranslate:function(){for(var a=x.translate,t=x.isHorizontal()?-a+x.width/2:-a+x.height/2,s=x.isHorizontal()?x.params.coverflow.rotate:-x.params.coverflow.rotate,r=x.params.coverflow.depth,i=0,n=x.slides.length;i<n;i++){var o=x.slides.eq(i),l=x.slidesSizesGrid[i],p=o[0].swiperSlideOffset,d=(t-p-l/2)/l*x.params.coverflow.modifier,m=x.isHorizontal()?s*d:0,u=x.isHorizontal()?0:s*d,c=-r*Math.abs(d),g=x.isHorizontal()?0:x.params.coverflow.stretch*d,h=x.isHorizontal()?x.params.coverflow.stretch*d:0;Math.abs(h)<.001&&(h=0),Math.abs(g)<.001&&(g=0),Math.abs(c)<.001&&(c=0),Math.abs(m)<.001&&(m=0),Math.abs(u)<.001&&(u=0);var v="translate3d("+h+"px,"+g+"px,"+c+"px)  rotateX("+u+"deg) rotateY("+m+"deg)";if(o.transform(v),o[0].style.zIndex=1-Math.abs(Math.round(d)),x.params.coverflow.slideShadows){var f=x.isHorizontal()?o.find(".swiper-slide-shadow-left"):o.find(".swiper-slide-shadow-top"),w=x.isHorizontal()?o.find(".swiper-slide-shadow-right"):o.find(".swiper-slide-shadow-bottom");0===f.length&&(f=e('<div class="swiper-slide-shadow-'+(x.isHorizontal()?"left":"top")+'"></div>'),o.append(f)),0===w.length&&(w=e('<div class="swiper-slide-shadow-'+(x.isHorizontal()?"right":"bottom")+'"></div>'),o.append(w)),f.length&&(f[0].style.opacity=d>0?d:0),w.length&&(w[0].style.opacity=-d>0?-d:0)}}if(x.browser.ie){x.wrapper[0].style.perspectiveOrigin=t+"px 50%"}},setTransition:function(e){x.slides.transition(e).find(".swiper-slide-shadow-top, .swiper-slide-shadow-right, .swiper-slide-shadow-bottom, .swiper-slide-shadow-left").transition(e)}}},x.lazy={initialImageLoaded:!1,loadImageInSlide:function(a,t){if(void 0!==a&&(void 0===t&&(t=!0),0!==x.slides.length)){var s=x.slides.eq(a),r=s.find("."+x.params.lazyLoadingClass+":not(."+x.params.lazyStatusLoadedClass+"):not(."+x.params.lazyStatusLoadingClass+")");!s.hasClass(x.params.lazyLoadingClass)||s.hasClass(x.params.lazyStatusLoadedClass)||s.hasClass(x.params.lazyStatusLoadingClass)||(r=r.add(s[0])),0!==r.length&&r.each(function(){var a=e(this);a.addClass(x.params.lazyStatusLoadingClass);var r=a.attr("data-background"),i=a.attr("data-src"),n=a.attr("data-srcset"),o=a.attr("data-sizes");x.loadImage(a[0],i||r,n,o,!1,function(){if(void 0!==x&&null!==x&&x){if(r?(a.css("background-image",'url("'+r+'")'),a.removeAttr("data-background")):(n&&(a.attr("srcset",n),a.removeAttr("data-srcset")),o&&(a.attr("sizes",o),a.removeAttr("data-sizes")),i&&(a.attr("src",i),a.removeAttr("data-src"))),a.addClass(x.params.lazyStatusLoadedClass).removeClass(x.params.lazyStatusLoadingClass),s.find("."+x.params.lazyPreloaderClass+", ."+x.params.preloaderClass).remove(),x.params.loop&&t){var e=s.attr("data-swiper-slide-index");if(s.hasClass(x.params.slideDuplicateClass)){var l=x.wrapper.children('[data-swiper-slide-index="'+e+'"]:not(.'+x.params.slideDuplicateClass+")");x.lazy.loadImageInSlide(l.index(),!1)}else{var p=x.wrapper.children("."+x.params.slideDuplicateClass+'[data-swiper-slide-index="'+e+'"]');x.lazy.loadImageInSlide(p.index(),!1)}}x.emit("onLazyImageReady",x,s[0],a[0])}}),x.emit("onLazyImageLoad",x,s[0],a[0])})}},load:function(){var a,t=x.params.slidesPerView;if("auto"===t&&(t=0),x.lazy.initialImageLoaded||(x.lazy.initialImageLoaded=!0),x.params.watchSlidesVisibility)x.wrapper.children("."+x.params.slideVisibleClass).each(function(){x.lazy.loadImageInSlide(e(this).index())});else if(t>1)for(a=x.activeIndex;a<x.activeIndex+t;a++)x.slides[a]&&x.lazy.loadImageInSlide(a);else x.lazy.loadImageInSlide(x.activeIndex);if(x.params.lazyLoadingInPrevNext)if(t>1||x.params.lazyLoadingInPrevNextAmount&&x.params.lazyLoadingInPrevNextAmount>1){var s=x.params.lazyLoadingInPrevNextAmount,r=t,i=Math.min(x.activeIndex+r+Math.max(s,r),x.slides.length),n=Math.max(x.activeIndex-Math.max(r,s),0);for(a=x.activeIndex+t;a<i;a++)x.slides[a]&&x.lazy.loadImageInSlide(a);for(a=n;a<x.activeIndex;a++)x.slides[a]&&x.lazy.loadImageInSlide(a)}else{var o=x.wrapper.children("."+x.params.slideNextClass);o.length>0&&x.lazy.loadImageInSlide(o.index());var l=x.wrapper.children("."+x.params.slidePrevClass);l.length>0&&x.lazy.loadImageInSlide(l.index())}},onTransitionStart:function(){x.params.lazyLoading&&(x.params.lazyLoadingOnTransitionStart||!x.params.lazyLoadingOnTransitionStart&&!x.lazy.initialImageLoaded)&&x.lazy.load()},onTransitionEnd:function(){x.params.lazyLoading&&!x.params.lazyLoadingOnTransitionStart&&x.lazy.load()}},x.scrollbar={isTouched:!1,setDragPosition:function(e){var a=x.scrollbar,t=x.isHorizontal()?"touchstart"===e.type||"touchmove"===e.type?e.targetTouches[0].pageX:e.pageX||e.clientX:"touchstart"===e.type||"touchmove"===e.type?e.targetTouches[0].pageY:e.pageY||e.clientY,s=t-a.track.offset()[x.isHorizontal()?"left":"top"]-a.dragSize/2,r=-x.minTranslate()*a.moveDivider,i=-x.maxTranslate()*a.moveDivider;s<r?s=r:s>i&&(s=i),s=-s/a.moveDivider,x.updateProgress(s),x.setWrapperTranslate(s,!0)},dragStart:function(e){var a=x.scrollbar;a.isTouched=!0,e.preventDefault(),e.stopPropagation(),a.setDragPosition(e),clearTimeout(a.dragTimeout),a.track.transition(0),x.params.scrollbarHide&&a.track.css("opacity",1),x.wrapper.transition(100),a.drag.transition(100),x.emit("onScrollbarDragStart",x)},dragMove:function(e){var a=x.scrollbar;a.isTouched&&(e.preventDefault?e.preventDefault():e.returnValue=!1,a.setDragPosition(e),x.wrapper.transition(0),a.track.transition(0),a.drag.transition(0),x.emit("onScrollbarDragMove",x))},dragEnd:function(e){var a=x.scrollbar;a.isTouched&&(a.isTouched=!1,x.params.scrollbarHide&&(clearTimeout(a.dragTimeout),a.dragTimeout=setTimeout(function(){a.track.css("opacity",0),a.track.transition(400)},1e3)),x.emit("onScrollbarDragEnd",x),x.params.scrollbarSnapOnRelease&&x.slideReset())},draggableEvents:function(){return x.params.simulateTouch!==!1||x.support.touch?x.touchEvents:x.touchEventsDesktop}(),enableDraggable:function(){var a=x.scrollbar,t=x.support.touch?a.track:document;e(a.track).on(a.draggableEvents.start,a.dragStart),e(t).on(a.draggableEvents.move,a.dragMove),e(t).on(a.draggableEvents.end,a.dragEnd)},disableDraggable:function(){var a=x.scrollbar,t=x.support.touch?a.track:document;e(a.track).off(a.draggableEvents.start,a.dragStart),e(t).off(a.draggableEvents.move,a.dragMove),e(t).off(a.draggableEvents.end,a.dragEnd)},set:function(){if(x.params.scrollbar){var a=x.scrollbar;a.track=e(x.params.scrollbar),x.params.uniqueNavElements&&"string"==typeof x.params.scrollbar&&a.track.length>1&&1===x.container.find(x.params.scrollbar).length&&(a.track=x.container.find(x.params.scrollbar)),a.drag=a.track.find(".swiper-scrollbar-drag"),0===a.drag.length&&(a.drag=e('<div class="swiper-scrollbar-drag"></div>'),a.track.append(a.drag)),a.drag[0].style.width="",a.drag[0].style.height="",a.trackSize=x.isHorizontal()?a.track[0].offsetWidth:a.track[0].offsetHeight,a.divider=x.size/x.virtualSize,a.moveDivider=a.divider*(a.trackSize/x.size),a.dragSize=a.trackSize*a.divider,x.isHorizontal()?a.drag[0].style.width=a.dragSize+"px":a.drag[0].style.height=a.dragSize+"px",a.divider>=1?a.track[0].style.display="none":a.track[0].style.display="",x.params.scrollbarHide&&(a.track[0].style.opacity=0)}},setTranslate:function(){if(x.params.scrollbar){var e,a=x.scrollbar,t=(x.translate,a.dragSize);e=(a.trackSize-a.dragSize)*x.progress,x.rtl&&x.isHorizontal()?(e=-e,e>0?(t=a.dragSize-e,e=0):-e+a.dragSize>a.trackSize&&(t=a.trackSize+e)):e<0?(t=a.dragSize+e,e=0):e+a.dragSize>a.trackSize&&(t=a.trackSize-e),x.isHorizontal()?(x.support.transforms3d?a.drag.transform("translate3d("+e+"px, 0, 0)"):a.drag.transform("translateX("+e+"px)"),a.drag[0].style.width=t+"px"):(x.support.transforms3d?a.drag.transform("translate3d(0px, "+e+"px, 0)"):a.drag.transform("translateY("+e+"px)"),a.drag[0].style.height=t+"px"),x.params.scrollbarHide&&(clearTimeout(a.timeout),a.track[0].style.opacity=1,a.timeout=setTimeout(function(){a.track[0].style.opacity=0,a.track.transition(400)},1e3))}},setTransition:function(e){x.params.scrollbar&&x.scrollbar.drag.transition(e)}},x.controller={LinearSpline:function(e,a){var t=function(){var e,a,t;return function(s,r){for(a=-1,e=s.length;e-a>1;)s[t=e+a>>1]<=r?a=t:e=t;return e}}();this.x=e,this.y=a,this.lastIndex=e.length-1;var s,r;this.x.length;this.interpolate=function(e){return e?(r=t(this.x,e),s=r-1,(e-this.x[s])*(this.y[r]-this.y[s])/(this.x[r]-this.x[s])+this.y[s]):0}},getInterpolateFunction:function(e){x.controller.spline||(x.controller.spline=x.params.loop?new x.controller.LinearSpline(x.slidesGrid,e.slidesGrid):new x.controller.LinearSpline(x.snapGrid,e.snapGrid))},setTranslate:function(e,t){function s(a){e=a.rtl&&"horizontal"===a.params.direction?-x.translate:x.translate,"slide"===x.params.controlBy&&(x.controller.getInterpolateFunction(a),i=-x.controller.spline.interpolate(-e)),i&&"container"!==x.params.controlBy||(r=(a.maxTranslate()-a.minTranslate())/(x.maxTranslate()-x.minTranslate()),i=(e-x.minTranslate())*r+a.minTranslate()),x.params.controlInverse&&(i=a.maxTranslate()-i),a.updateProgress(i),a.setWrapperTranslate(i,!1,x),a.updateActiveIndex()}var r,i,n=x.params.control;if(Array.isArray(n))for(var o=0;o<n.length;o++)n[o]!==t&&n[o]instanceof a&&s(n[o]);else n instanceof a&&t!==n&&s(n)},setTransition:function(e,t){function s(a){a.setWrapperTransition(e,x),0!==e&&(a.onTransitionStart(),a.wrapper.transitionEnd(function(){i&&(a.params.loop&&"slide"===x.params.controlBy&&a.fixLoop(),a.onTransitionEnd())}))}var r,i=x.params.control;if(Array.isArray(i))for(r=0;r<i.length;r++)i[r]!==t&&i[r]instanceof a&&s(i[r]);else i instanceof a&&t!==i&&s(i)}},x.hashnav={onHashCange:function(e,a){var t=document.location.hash.replace("#","");t!==x.slides.eq(x.activeIndex).attr("data-hash")&&x.slideTo(x.wrapper.children("."+x.params.slideClass+'[data-hash="'+t+'"]').index())},attachEvents:function(a){var t=a?"off":"on";e(window)[t]("hashchange",x.hashnav.onHashCange)},setHash:function(){
+if(x.hashnav.initialized&&x.params.hashnav)if(x.params.replaceState&&window.history&&window.history.replaceState)window.history.replaceState(null,null,"#"+x.slides.eq(x.activeIndex).attr("data-hash")||"");else{var e=x.slides.eq(x.activeIndex),a=e.attr("data-hash")||e.attr("data-history");document.location.hash=a||""}},init:function(){if(x.params.hashnav&&!x.params.history){x.hashnav.initialized=!0;var e=document.location.hash.replace("#","");if(e)for(var a=0,t=x.slides.length;a<t;a++){var s=x.slides.eq(a),r=s.attr("data-hash")||s.attr("data-history");if(r===e&&!s.hasClass(x.params.slideDuplicateClass)){var i=s.index();x.slideTo(i,0,x.params.runCallbacksOnInit,!0)}}x.params.hashnavWatchState&&x.hashnav.attachEvents()}},destroy:function(){x.params.hashnavWatchState&&x.hashnav.attachEvents(!0)}},x.history={init:function(){if(x.params.history){if(!window.history||!window.history.pushState)return x.params.history=!1,void(x.params.hashnav=!0);x.history.initialized=!0,this.paths=this.getPathValues(),(this.paths.key||this.paths.value)&&(this.scrollToSlide(0,this.paths.value,x.params.runCallbacksOnInit),x.params.replaceState||window.addEventListener("popstate",this.setHistoryPopState))}},setHistoryPopState:function(){x.history.paths=x.history.getPathValues(),x.history.scrollToSlide(x.params.speed,x.history.paths.value,!1)},getPathValues:function(){var e=window.location.pathname.slice(1).split("/"),a=e.length;return{key:e[a-2],value:e[a-1]}},setHistory:function(e,a){if(x.history.initialized&&x.params.history){var t=x.slides.eq(a),s=this.slugify(t.attr("data-history"));window.location.pathname.includes(e)||(s=e+"/"+s),x.params.replaceState?window.history.replaceState(null,null,s):window.history.pushState(null,null,s)}},slugify:function(e){return e.toString().toLowerCase().replace(/\s+/g,"-").replace(/[^\w\-]+/g,"").replace(/\-\-+/g,"-").replace(/^-+/,"").replace(/-+$/,"")},scrollToSlide:function(e,a,t){if(a)for(var s=0,r=x.slides.length;s<r;s++){var i=x.slides.eq(s),n=this.slugify(i.attr("data-history"));if(n===a&&!i.hasClass(x.params.slideDuplicateClass)){var o=i.index();x.slideTo(o,e,t)}}else x.slideTo(0,e,t)}},x.disableKeyboardControl=function(){x.params.keyboardControl=!1,e(document).off("keydown",l)},x.enableKeyboardControl=function(){x.params.keyboardControl=!0,e(document).on("keydown",l)},x.mousewheel={event:!1,lastScrollTime:(new window.Date).getTime()},x.params.mousewheelControl&&(x.mousewheel.event=navigator.userAgent.indexOf("firefox")>-1?"DOMMouseScroll":function(){var e="onwheel"in document;if(!e){var a=document.createElement("div");a.setAttribute("onwheel","return;"),e="function"==typeof a.onwheel}return!e&&document.implementation&&document.implementation.hasFeature&&document.implementation.hasFeature("","")!==!0&&(e=document.implementation.hasFeature("Events.wheel","3.0")),e}()?"wheel":"mousewheel"),x.disableMousewheelControl=function(){if(!x.mousewheel.event)return!1;var a=x.container;return"container"!==x.params.mousewheelEventsTarged&&(a=e(x.params.mousewheelEventsTarged)),a.off(x.mousewheel.event,d),x.params.mousewheelControl=!1,!0},x.enableMousewheelControl=function(){if(!x.mousewheel.event)return!1;var a=x.container;return"container"!==x.params.mousewheelEventsTarged&&(a=e(x.params.mousewheelEventsTarged)),a.on(x.mousewheel.event,d),x.params.mousewheelControl=!0,!0},x.parallax={setTranslate:function(){x.container.children("[data-swiper-parallax], [data-swiper-parallax-x], [data-swiper-parallax-y]").each(function(){m(this,x.progress)}),x.slides.each(function(){var a=e(this);a.find("[data-swiper-parallax], [data-swiper-parallax-x], [data-swiper-parallax-y]").each(function(){m(this,Math.min(Math.max(a[0].progress,-1),1))})})},setTransition:function(a){void 0===a&&(a=x.params.speed),x.container.find("[data-swiper-parallax], [data-swiper-parallax-x], [data-swiper-parallax-y]").each(function(){var t=e(this),s=parseInt(t.attr("data-swiper-parallax-duration"),10)||a;0===a&&(s=0),t.transition(s)})}},x.zoom={scale:1,currentScale:1,isScaling:!1,gesture:{slide:void 0,slideWidth:void 0,slideHeight:void 0,image:void 0,imageWrap:void 0,zoomMax:x.params.zoomMax},image:{isTouched:void 0,isMoved:void 0,currentX:void 0,currentY:void 0,minX:void 0,minY:void 0,maxX:void 0,maxY:void 0,width:void 0,height:void 0,startX:void 0,startY:void 0,touchesStart:{},touchesCurrent:{}},velocity:{x:void 0,y:void 0,prevPositionX:void 0,prevPositionY:void 0,prevTime:void 0},getDistanceBetweenTouches:function(e){if(e.targetTouches.length<2)return 1;var a=e.targetTouches[0].pageX,t=e.targetTouches[0].pageY,s=e.targetTouches[1].pageX,r=e.targetTouches[1].pageY;return Math.sqrt(Math.pow(s-a,2)+Math.pow(r-t,2))},onGestureStart:function(a){var t=x.zoom;if(!x.support.gestures){if("touchstart"!==a.type||"touchstart"===a.type&&a.targetTouches.length<2)return;t.gesture.scaleStart=t.getDistanceBetweenTouches(a)}if(!(t.gesture.slide&&t.gesture.slide.length||(t.gesture.slide=e(this),0===t.gesture.slide.length&&(t.gesture.slide=x.slides.eq(x.activeIndex)),t.gesture.image=t.gesture.slide.find("img, svg, canvas"),t.gesture.imageWrap=t.gesture.image.parent("."+x.params.zoomContainerClass),t.gesture.zoomMax=t.gesture.imageWrap.attr("data-swiper-zoom")||x.params.zoomMax,0!==t.gesture.imageWrap.length)))return void(t.gesture.image=void 0);t.gesture.image.transition(0),t.isScaling=!0},onGestureChange:function(e){var a=x.zoom;if(!x.support.gestures){if("touchmove"!==e.type||"touchmove"===e.type&&e.targetTouches.length<2)return;a.gesture.scaleMove=a.getDistanceBetweenTouches(e)}a.gesture.image&&0!==a.gesture.image.length&&(x.support.gestures?a.scale=e.scale*a.currentScale:a.scale=a.gesture.scaleMove/a.gesture.scaleStart*a.currentScale,a.scale>a.gesture.zoomMax&&(a.scale=a.gesture.zoomMax-1+Math.pow(a.scale-a.gesture.zoomMax+1,.5)),a.scale<x.params.zoomMin&&(a.scale=x.params.zoomMin+1-Math.pow(x.params.zoomMin-a.scale+1,.5)),a.gesture.image.transform("translate3d(0,0,0) scale("+a.scale+")"))},onGestureEnd:function(e){var a=x.zoom;!x.support.gestures&&("touchend"!==e.type||"touchend"===e.type&&e.changedTouches.length<2)||a.gesture.image&&0!==a.gesture.image.length&&(a.scale=Math.max(Math.min(a.scale,a.gesture.zoomMax),x.params.zoomMin),a.gesture.image.transition(x.params.speed).transform("translate3d(0,0,0) scale("+a.scale+")"),a.currentScale=a.scale,a.isScaling=!1,1===a.scale&&(a.gesture.slide=void 0))},onTouchStart:function(e,a){var t=e.zoom;t.gesture.image&&0!==t.gesture.image.length&&(t.image.isTouched||("android"===e.device.os&&a.preventDefault(),t.image.isTouched=!0,t.image.touchesStart.x="touchstart"===a.type?a.targetTouches[0].pageX:a.pageX,t.image.touchesStart.y="touchstart"===a.type?a.targetTouches[0].pageY:a.pageY))},onTouchMove:function(e){var a=x.zoom;if(a.gesture.image&&0!==a.gesture.image.length&&(x.allowClick=!1,a.image.isTouched&&a.gesture.slide)){a.image.isMoved||(a.image.width=a.gesture.image[0].offsetWidth,a.image.height=a.gesture.image[0].offsetHeight,a.image.startX=x.getTranslate(a.gesture.imageWrap[0],"x")||0,a.image.startY=x.getTranslate(a.gesture.imageWrap[0],"y")||0,a.gesture.slideWidth=a.gesture.slide[0].offsetWidth,a.gesture.slideHeight=a.gesture.slide[0].offsetHeight,a.gesture.imageWrap.transition(0),x.rtl&&(a.image.startX=-a.image.startX),x.rtl&&(a.image.startY=-a.image.startY));var t=a.image.width*a.scale,s=a.image.height*a.scale;if(!(t<a.gesture.slideWidth&&s<a.gesture.slideHeight)){if(a.image.minX=Math.min(a.gesture.slideWidth/2-t/2,0),a.image.maxX=-a.image.minX,a.image.minY=Math.min(a.gesture.slideHeight/2-s/2,0),a.image.maxY=-a.image.minY,a.image.touchesCurrent.x="touchmove"===e.type?e.targetTouches[0].pageX:e.pageX,a.image.touchesCurrent.y="touchmove"===e.type?e.targetTouches[0].pageY:e.pageY,!a.image.isMoved&&!a.isScaling){if(x.isHorizontal()&&Math.floor(a.image.minX)===Math.floor(a.image.startX)&&a.image.touchesCurrent.x<a.image.touchesStart.x||Math.floor(a.image.maxX)===Math.floor(a.image.startX)&&a.image.touchesCurrent.x>a.image.touchesStart.x)return void(a.image.isTouched=!1);if(!x.isHorizontal()&&Math.floor(a.image.minY)===Math.floor(a.image.startY)&&a.image.touchesCurrent.y<a.image.touchesStart.y||Math.floor(a.image.maxY)===Math.floor(a.image.startY)&&a.image.touchesCurrent.y>a.image.touchesStart.y)return void(a.image.isTouched=!1)}e.preventDefault(),e.stopPropagation(),a.image.isMoved=!0,a.image.currentX=a.image.touchesCurrent.x-a.image.touchesStart.x+a.image.startX,a.image.currentY=a.image.touchesCurrent.y-a.image.touchesStart.y+a.image.startY,a.image.currentX<a.image.minX&&(a.image.currentX=a.image.minX+1-Math.pow(a.image.minX-a.image.currentX+1,.8)),a.image.currentX>a.image.maxX&&(a.image.currentX=a.image.maxX-1+Math.pow(a.image.currentX-a.image.maxX+1,.8)),a.image.currentY<a.image.minY&&(a.image.currentY=a.image.minY+1-Math.pow(a.image.minY-a.image.currentY+1,.8)),a.image.currentY>a.image.maxY&&(a.image.currentY=a.image.maxY-1+Math.pow(a.image.currentY-a.image.maxY+1,.8)),a.velocity.prevPositionX||(a.velocity.prevPositionX=a.image.touchesCurrent.x),a.velocity.prevPositionY||(a.velocity.prevPositionY=a.image.touchesCurrent.y),a.velocity.prevTime||(a.velocity.prevTime=Date.now()),a.velocity.x=(a.image.touchesCurrent.x-a.velocity.prevPositionX)/(Date.now()-a.velocity.prevTime)/2,a.velocity.y=(a.image.touchesCurrent.y-a.velocity.prevPositionY)/(Date.now()-a.velocity.prevTime)/2,Math.abs(a.image.touchesCurrent.x-a.velocity.prevPositionX)<2&&(a.velocity.x=0),Math.abs(a.image.touchesCurrent.y-a.velocity.prevPositionY)<2&&(a.velocity.y=0),a.velocity.prevPositionX=a.image.touchesCurrent.x,a.velocity.prevPositionY=a.image.touchesCurrent.y,a.velocity.prevTime=Date.now(),a.gesture.imageWrap.transform("translate3d("+a.image.currentX+"px, "+a.image.currentY+"px,0)")}}},onTouchEnd:function(e,a){var t=e.zoom;if(t.gesture.image&&0!==t.gesture.image.length){if(!t.image.isTouched||!t.image.isMoved)return t.image.isTouched=!1,void(t.image.isMoved=!1);t.image.isTouched=!1,t.image.isMoved=!1;var s=300,r=300,i=t.velocity.x*s,n=t.image.currentX+i,o=t.velocity.y*r,l=t.image.currentY+o;0!==t.velocity.x&&(s=Math.abs((n-t.image.currentX)/t.velocity.x)),0!==t.velocity.y&&(r=Math.abs((l-t.image.currentY)/t.velocity.y));var p=Math.max(s,r);t.image.currentX=n,t.image.currentY=l;var d=t.image.width*t.scale,m=t.image.height*t.scale;t.image.minX=Math.min(t.gesture.slideWidth/2-d/2,0),t.image.maxX=-t.image.minX,t.image.minY=Math.min(t.gesture.slideHeight/2-m/2,0),t.image.maxY=-t.image.minY,t.image.currentX=Math.max(Math.min(t.image.currentX,t.image.maxX),t.image.minX),t.image.currentY=Math.max(Math.min(t.image.currentY,t.image.maxY),t.image.minY),t.gesture.imageWrap.transition(p).transform("translate3d("+t.image.currentX+"px, "+t.image.currentY+"px,0)")}},onTransitionEnd:function(e){var a=e.zoom;a.gesture.slide&&e.previousIndex!==e.activeIndex&&(a.gesture.image.transform("translate3d(0,0,0) scale(1)"),a.gesture.imageWrap.transform("translate3d(0,0,0)"),a.gesture.slide=a.gesture.image=a.gesture.imageWrap=void 0,a.scale=a.currentScale=1)},toggleZoom:function(a,t){var s=a.zoom;if(s.gesture.slide||(s.gesture.slide=a.clickedSlide?e(a.clickedSlide):a.slides.eq(a.activeIndex),s.gesture.image=s.gesture.slide.find("img, svg, canvas"),s.gesture.imageWrap=s.gesture.image.parent("."+a.params.zoomContainerClass)),s.gesture.image&&0!==s.gesture.image.length){var r,i,n,o,l,p,d,m,u,c,g,h,v,f,w,y,x,T;void 0===s.image.touchesStart.x&&t?(r="touchend"===t.type?t.changedTouches[0].pageX:t.pageX,i="touchend"===t.type?t.changedTouches[0].pageY:t.pageY):(r=s.image.touchesStart.x,i=s.image.touchesStart.y),s.scale&&1!==s.scale?(s.scale=s.currentScale=1,s.gesture.imageWrap.transition(300).transform("translate3d(0,0,0)"),s.gesture.image.transition(300).transform("translate3d(0,0,0) scale(1)"),s.gesture.slide=void 0):(s.scale=s.currentScale=s.gesture.imageWrap.attr("data-swiper-zoom")||a.params.zoomMax,t?(x=s.gesture.slide[0].offsetWidth,T=s.gesture.slide[0].offsetHeight,n=s.gesture.slide.offset().left,o=s.gesture.slide.offset().top,l=n+x/2-r,p=o+T/2-i,u=s.gesture.image[0].offsetWidth,c=s.gesture.image[0].offsetHeight,g=u*s.scale,h=c*s.scale,v=Math.min(x/2-g/2,0),f=Math.min(T/2-h/2,0),w=-v,y=-f,d=l*s.scale,m=p*s.scale,d<v&&(d=v),d>w&&(d=w),m<f&&(m=f),m>y&&(m=y)):(d=0,m=0),s.gesture.imageWrap.transition(300).transform("translate3d("+d+"px, "+m+"px,0)"),s.gesture.image.transition(300).transform("translate3d(0,0,0) scale("+s.scale+")"))}},attachEvents:function(a){var t=a?"off":"on";if(x.params.zoom){var s=(x.slides,!("touchstart"!==x.touchEvents.start||!x.support.passiveListener||!x.params.passiveListeners)&&{passive:!0,capture:!1});x.support.gestures?(x.slides[t]("gesturestart",x.zoom.onGestureStart,s),x.slides[t]("gesturechange",x.zoom.onGestureChange,s),x.slides[t]("gestureend",x.zoom.onGestureEnd,s)):"touchstart"===x.touchEvents.start&&(x.slides[t](x.touchEvents.start,x.zoom.onGestureStart,s),x.slides[t](x.touchEvents.move,x.zoom.onGestureChange,s),x.slides[t](x.touchEvents.end,x.zoom.onGestureEnd,s)),x[t]("touchStart",x.zoom.onTouchStart),x.slides.each(function(a,s){e(s).find("."+x.params.zoomContainerClass).length>0&&e(s)[t](x.touchEvents.move,x.zoom.onTouchMove)}),x[t]("touchEnd",x.zoom.onTouchEnd),x[t]("transitionEnd",x.zoom.onTransitionEnd),x.params.zoomToggle&&x.on("doubleTap",x.zoom.toggleZoom)}},init:function(){x.zoom.attachEvents()},destroy:function(){x.zoom.attachEvents(!0)}},x._plugins=[];for(var Y in x.plugins){var A=x.plugins[Y](x,x.params[Y]);A&&x._plugins.push(A)}return x.callPlugins=function(e){for(var a=0;a<x._plugins.length;a++)e in x._plugins[a]&&x._plugins[a][e](arguments[1],arguments[2],arguments[3],arguments[4],arguments[5])},x.emitterEventListeners={},x.emit=function(e){x.params[e]&&x.params[e](arguments[1],arguments[2],arguments[3],arguments[4],arguments[5]);var a;if(x.emitterEventListeners[e])for(a=0;a<x.emitterEventListeners[e].length;a++)x.emitterEventListeners[e][a](arguments[1],arguments[2],arguments[3],arguments[4],arguments[5]);x.callPlugins&&x.callPlugins(e,arguments[1],arguments[2],arguments[3],arguments[4],arguments[5])},x.on=function(e,a){return e=u(e),x.emitterEventListeners[e]||(x.emitterEventListeners[e]=[]),x.emitterEventListeners[e].push(a),x},x.off=function(e,a){var t;if(e=u(e),void 0===a)return x.emitterEventListeners[e]=[],x;if(x.emitterEventListeners[e]&&0!==x.emitterEventListeners[e].length){for(t=0;t<x.emitterEventListeners[e].length;t++)x.emitterEventListeners[e][t]===a&&x.emitterEventListeners[e].splice(t,1);return x}},x.once=function(e,a){e=u(e);var t=function(){a(arguments[0],arguments[1],arguments[2],arguments[3],arguments[4]),x.off(e,t)};return x.on(e,t),x},x.a11y={makeFocusable:function(e){return e.attr("tabIndex","0"),e},addRole:function(e,a){return e.attr("role",a),e},addLabel:function(e,a){return e.attr("aria-label",a),e},disable:function(e){return e.attr("aria-disabled",!0),e},enable:function(e){return e.attr("aria-disabled",!1),e},onEnterKey:function(a){13===a.keyCode&&(e(a.target).is(x.params.nextButton)?(x.onClickNext(a),x.isEnd?x.a11y.notify(x.params.lastSlideMessage):x.a11y.notify(x.params.nextSlideMessage)):e(a.target).is(x.params.prevButton)&&(x.onClickPrev(a),x.isBeginning?x.a11y.notify(x.params.firstSlideMessage):x.a11y.notify(x.params.prevSlideMessage)),e(a.target).is("."+x.params.bulletClass)&&e(a.target)[0].click())},liveRegion:e('<span class="'+x.params.notificationClass+'" aria-live="assertive" aria-atomic="true"></span>'),notify:function(e){var a=x.a11y.liveRegion;0!==a.length&&(a.html(""),a.html(e))},init:function(){x.params.nextButton&&x.nextButton&&x.nextButton.length>0&&(x.a11y.makeFocusable(x.nextButton),x.a11y.addRole(x.nextButton,"button"),x.a11y.addLabel(x.nextButton,x.params.nextSlideMessage)),x.params.prevButton&&x.prevButton&&x.prevButton.length>0&&(x.a11y.makeFocusable(x.prevButton),x.a11y.addRole(x.prevButton,"button"),x.a11y.addLabel(x.prevButton,x.params.prevSlideMessage)),e(x.container).append(x.a11y.liveRegion)},initPagination:function(){x.params.pagination&&x.params.paginationClickable&&x.bullets&&x.bullets.length&&x.bullets.each(function(){var a=e(this);x.a11y.makeFocusable(a),x.a11y.addRole(a,"button"),x.a11y.addLabel(a,x.params.paginationBulletMessage.replace(/{{index}}/,a.index()+1))})},destroy:function(){x.a11y.liveRegion&&x.a11y.liveRegion.length>0&&x.a11y.liveRegion.remove()}},x.init=function(){x.params.loop&&x.createLoop(),x.updateContainerSize(),x.updateSlidesSize(),x.updatePagination(),x.params.scrollbar&&x.scrollbar&&(x.scrollbar.set(),x.params.scrollbarDraggable&&x.scrollbar.enableDraggable()),"slide"!==x.params.effect&&x.effects[x.params.effect]&&(x.params.loop||x.updateProgress(),x.effects[x.params.effect].setTranslate()),x.params.loop?x.slideTo(x.params.initialSlide+x.loopedSlides,0,x.params.runCallbacksOnInit):(x.slideTo(x.params.initialSlide,0,x.params.runCallbacksOnInit),0===x.params.initialSlide&&(x.parallax&&x.params.parallax&&x.parallax.setTranslate(),x.lazy&&x.params.lazyLoading&&(x.lazy.load(),x.lazy.initialImageLoaded=!0))),x.attachEvents(),x.params.observer&&x.support.observer&&x.initObservers(),x.params.preloadImages&&!x.params.lazyLoading&&x.preloadImages(),x.params.zoom&&x.zoom&&x.zoom.init(),x.params.autoplay&&x.startAutoplay(),x.params.keyboardControl&&x.enableKeyboardControl&&x.enableKeyboardControl(),x.params.mousewheelControl&&x.enableMousewheelControl&&x.enableMousewheelControl(),x.params.hashnavReplaceState&&(x.params.replaceState=x.params.hashnavReplaceState),x.params.history&&x.history&&x.history.init(),x.params.hashnav&&x.hashnav&&x.hashnav.init(),x.params.a11y&&x.a11y&&x.a11y.init(),x.emit("onInit",x)},x.cleanupStyles=function(){x.container.removeClass(x.classNames.join(" ")).removeAttr("style"),x.wrapper.removeAttr("style"),x.slides&&x.slides.length&&x.slides.removeClass([x.params.slideVisibleClass,x.params.slideActiveClass,x.params.slideNextClass,x.params.slidePrevClass].join(" ")).removeAttr("style").removeAttr("data-swiper-column").removeAttr("data-swiper-row"),x.paginationContainer&&x.paginationContainer.length&&x.paginationContainer.removeClass(x.params.paginationHiddenClass),x.bullets&&x.bullets.length&&x.bullets.removeClass(x.params.bulletActiveClass),x.params.prevButton&&e(x.params.prevButton).removeClass(x.params.buttonDisabledClass),x.params.nextButton&&e(x.params.nextButton).removeClass(x.params.buttonDisabledClass),x.params.scrollbar&&x.scrollbar&&(x.scrollbar.track&&x.scrollbar.track.length&&x.scrollbar.track.removeAttr("style"),x.scrollbar.drag&&x.scrollbar.drag.length&&x.scrollbar.drag.removeAttr("style"))},x.destroy=function(e,a){x.detachEvents(),x.stopAutoplay(),x.params.scrollbar&&x.scrollbar&&x.params.scrollbarDraggable&&x.scrollbar.disableDraggable(),x.params.loop&&x.destroyLoop(),a&&x.cleanupStyles(),x.disconnectObservers(),x.params.zoom&&x.zoom&&x.zoom.destroy(),x.params.keyboardControl&&x.disableKeyboardControl&&x.disableKeyboardControl(),x.params.mousewheelControl&&x.disableMousewheelControl&&x.disableMousewheelControl(),x.params.a11y&&x.a11y&&x.a11y.destroy(),x.params.history&&!x.params.replaceState&&window.removeEventListener("popstate",x.history.setHistoryPopState),x.params.hashnav&&x.hashnav&&x.hashnav.destroy(),x.emit("onDestroy"),e!==!1&&(x=null)},x.init(),x}};a.prototype={isSafari:function(){var e=window.navigator.userAgent.toLowerCase();return e.indexOf("safari")>=0&&e.indexOf("chrome")<0&&e.indexOf("android")<0}(),isUiWebView:/(iPhone|iPod|iPad).*AppleWebKit(?!.*Safari)/i.test(window.navigator.userAgent),isArray:function(e){return"[object Array]"===Object.prototype.toString.apply(e)},browser:{ie:window.navigator.pointerEnabled||window.navigator.msPointerEnabled,ieTouch:window.navigator.msPointerEnabled&&window.navigator.msMaxTouchPoints>1||window.navigator.pointerEnabled&&window.navigator.maxTouchPoints>1,lteIE9:function(){var e=document.createElement("div");return e.innerHTML="<!--[if lte IE 9]><i></i><![endif]-->",1===e.getElementsByTagName("i").length}()},device:function(){var e=window.navigator.userAgent,a=e.match(/(Android);?[\s\/]+([\d.]+)?/),t=e.match(/(iPad).*OS\s([\d_]+)/),s=e.match(/(iPod)(.*OS\s([\d_]+))?/),r=!t&&e.match(/(iPhone\sOS|iOS)\s([\d_]+)/);return{ios:t||r||s,android:a}}(),support:{touch:window.Modernizr&&Modernizr.touch===!0||function(){return!!("ontouchstart"in window||window.DocumentTouch&&document instanceof DocumentTouch)}(),transforms3d:window.Modernizr&&Modernizr.csstransforms3d===!0||function(){var e=document.createElement("div").style;return"webkitPerspective"in e||"MozPerspective"in e||"OPerspective"in e||"MsPerspective"in e||"perspective"in e}(),flexbox:function(){for(var e=document.createElement("div").style,a="alignItems webkitAlignItems webkitBoxAlign msFlexAlign mozBoxAlign webkitFlexDirection msFlexDirection mozBoxDirection mozBoxOrient webkitBoxDirection webkitBoxOrient".split(" "),t=0;t<a.length;t++)if(a[t]in e)return!0}(),observer:function(){return"MutationObserver"in window||"WebkitMutationObserver"in window}(),passiveListener:function(){var e=!1;try{var a=Object.defineProperty({},"passive",{get:function(){e=!0}});window.addEventListener("testPassiveListener",null,a)}catch(e){}return e}(),gestures:function(){return"ongesturestart"in window}()},plugins:{}};for(var t=["jQuery","Zepto","Dom7"],s=0;s<t.length;s++)window[t[s]]&&function(e){e.fn.swiper=function(t){var s;return e(this).each(function(){var e=new a(this,t);s||(s=e)}),s}}(window[t[s]]);var r;r="undefined"==typeof Dom7?window.Dom7||window.Zepto||window.jQuery:Dom7,r&&("transitionEnd"in r.fn||(r.fn.transitionEnd=function(e){function a(i){if(i.target===this)for(e.call(this,i),t=0;t<s.length;t++)r.off(s[t],a)}var t,s=["webkitTransitionEnd","transitionend","oTransitionEnd","MSTransitionEnd","msTransitionEnd"],r=this;if(e)for(t=0;t<s.length;t++)r.on(s[t],a);return this}),"transform"in r.fn||(r.fn.transform=function(e){for(var a=0;a<this.length;a++){var t=this[a].style;t.webkitTransform=t.MsTransform=t.msTransform=t.MozTransform=t.OTransform=t.transform=e}return this}),"transition"in r.fn||(r.fn.transition=function(e){"string"!=typeof e&&(e+="ms");for(var a=0;a<this.length;a++){var t=this[a].style;t.webkitTransitionDuration=t.MsTransitionDuration=t.msTransitionDuration=t.MozTransitionDuration=t.OTransitionDuration=t.transitionDuration=e}return this}),"outerWidth"in r.fn||(r.fn.outerWidth=function(e){return this.length>0?e?this[0].offsetWidth+parseFloat(this.css("margin-right"))+parseFloat(this.css("margin-left")):this[0].offsetWidth:null})),window.Swiper=a}(),"undefined"!=typeof module?module.exports=window.Swiper:"function"==typeof define&&define.amd&&define([],function(){"use strict";return window.Swiper});
+//# sourceMappingURL=maps/swiper.jquery.min.js.map
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/upload/upload.js b/pluss-manage-page/src/main/resources/static/resources/js/upload/upload.js
new file mode 100644
index 0000000..b7f832d
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/upload/upload.js
@@ -0,0 +1,111 @@
+
+var settings={"callback":function(){}};
+/**
+ * 上传组件
+ */
+jQuery.extend({          
+    seocooUpload:function(options,callback) { 
+		//创建form表单
+	 	if(typeof(options.formName)=='undefined'||options.formName==''){
+	 		//删除已有元素
+	 		$('#uploadSImage').remove();
+   	   	 	var form='<form action="" method="post" id="uploadSelfImage" name="uploadSelfImage" enctype="multipart/form-data" encoding="multipart/form-data">';
+   	   	 		form+='<input type="file"  id="imageFile" name="imageFile" style="display:none;"  onchange="uploadSelfImg();"/>';
+   	   	 		form+='<input type="hidden"  id="isPress"  name="isPress" value="0"/>';
+   	   	 		form+='</form>';
+   	   	 	$("body").append(form);
+	   	 }
+	 	var res=jQuery.isFunction(options);
+	 	if(res){
+			callback=options;
+		}
+    	var defaults={"fileName":"imageFile",
+    				  "formName":"uploadSelfImage",
+    				  "formAction":'/upload/uploadImage',
+    				  "callback":callback
+    				  };
+   	 	 settings= $.extend(defaults,options);  
+   	 	 //设置压缩属性
+   	 	 if(typeof(options.isPress)!='undefined'&&options.isPress!=''){
+   	 		 $('#isPress').val(settings.isPress);
+   	 	 }
+   	 	
+   	 	//触发上传按钮
+   	 	$('#'+settings.fileName).click();
+     }
+}); 
+
+function showFailError(){
+	alert("上传失败");
+}
+
+//上传
+function uploadSelfImg(){
+		var advertImgName =$('#'+settings.fileName).val();
+		if (advertImgName == "" || advertImgName == null) {
+			alert("请选择文件！");
+			return;
+		}
+		var file_name = advertImgName
+				.substring(advertImgName.lastIndexOf("\\") + 1);
+		var filename_atr = advertImgName.substring(
+				advertImgName.lastIndexOf(".") + 1, advertImgName.length);
+//		var reg1 = "gif,jpg,jpeg,png,bmp,GIF,JPG,JPEG,PNG,BMP";
+//		if ((reg1.indexOf(filename_atr) < 0)) {
+//			alert("请选择gif,jpg,jpeg,png,bmp格式的图片文件！");
+//			//$('#file').val('');
+//			$('#'+settings.fileName).val('');
+//			return;
+//		}
+		//获取上传图片的大小(B)
+		var imge=document.getElementById(settings.fileName);
+		//超过1M的图片时
+		if(imge.files.item(0).size>1048576000){
+			//$('#'+settings.fileName).val('');
+			alert("图片太大，请上传小于1M的图片！");
+			return;
+		}
+		var options = {
+		      dataType : "json",
+		      async: false,
+		      data :{
+		    	  'filename_atr': filename_atr
+		      },
+		      success :settings.callback,
+		      error:showFailError,
+		      timeout: 30000000      //限制请求的时间，当请求大于3秒后，跳出请求
+		  };
+		$('#'+settings.formName).attr('action',settings.formAction);
+		jQuery('#'+settings.formName).ajaxSubmit(options);
+		$('#'+settings.formName).attr('action','');
+}
+
+jQuery.extend({          
+	videoUpload:function(options,callback) { 
+		//创建form表单
+	 	if(typeof(options.formName)=='undefined'||options.formName==''){
+	 		//删除已有元素
+	 		$('#uploadSImage').remove();
+   	   	 	var form='<form action="" method="post" id="uploadSelfImage" name="uploadSelfImage" enctype="multipart/form-data" encoding="multipart/form-data">';
+   	   	 		form+='<input type="file"  id="imageFile" name="imageFile" style="display:none;"  onchange="uploadSelfImg();"/>';
+   	   	 		form+='<input type="hidden"  id="isPress"  name="isPress" value="0"/>';
+   	   	 		form+='</form>';
+   	   	 	$("body").append(form);
+	   	 }
+	 	var res=jQuery.isFunction(options);
+	 	if(res){
+			callback=options;
+		}
+    	var defaults={"fileName":"imageFile",
+    				  "formName":"uploadSelfImage",
+    				  "formAction":ctx+'/upload/uploadImage',
+    				  "callback":callback};
+   	 	 settings= $.extend(defaults,options);  
+   	 	 //设置压缩属性
+   	 	 if(typeof(options.isPress)!='undefined'&&options.isPress!=''){
+   	 		 $('#isPress').val(settings.isPress);
+   	 	 }
+   	 	//触发上传按钮
+   	 	$('#'+settings.fileName).click();
+     }
+});
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/userInfo/userInfoDetails.js b/pluss-manage-page/src/main/resources/static/resources/js/userInfo/userInfoDetails.js
new file mode 100644
index 0000000..209f903
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/userInfo/userInfoDetails.js
@@ -0,0 +1,96 @@
+/**
+ * create by robot 
+ * date Thu Jul 25 19:43:04 CST 2019 
+ */ 
+
+$(document).ready(function(){
+	//form表单样式
+	layui.use(['layer', 'form'], function() {
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+	//li 切换事件
+	$(".nav-tabs>li").click(function() {
+		var index = $(".nav-tabs>li").index(this);
+		$(this).addClass("active").siblings("li").removeClass("active");
+		
+	})
+	//弹出一个提示层
+	$('.fa-save').on('click', function() {
+		saveUserInfo();
+	});
+
+	//绑定标签栏事件
+	$(document).on('click','.nav-tabs li',function(){
+
+		var action =$(this).data('action');
+		 switch (action) {
+			case "base"://基本资料
+				goBase();
+				break;  
+			case "functions"://多功能
+				goFunctions();
+				break;
+			case "extends"://扩展    
+				goExtends();         
+				break;           
+		 }
+	})
+
+	//加载第一个标签
+	$('.nav-tabs li').eq(0).click();
+	
+});
+
+
+//跳转基本信息 
+function goBase(){
+	var url=ctx+'/userInfo/queryUserInfoBaseInfo?id='+$('#userInfoId').val();
+	$('.tab-content').load(url);
+	              
+}
+//跳转多功能输入
+function goFunctions(){ 
+	var url=ctx+'/userInfo/queryUserInfoFunctionsInfo?id='+$('#userInfoId').val();
+	$('.tab-content').load(url);  
+	
+}
+//跳转到扩展   
+function goExtends(){
+	
+	var url=ctx+'/userInfo/queryUserInfoExtendsInfo?id='+$('#userInfoId').val();
+	$('.tab-content').load(url);          
+}  
+  
+
+ 
+//保存
+function saveUserInfo(){
+	 
+	$(".fa-save").attr("disabled","disabled");
+	$('.fa-save').html('正在保存...')
+	$.ajax({
+		url:ctx+"/userInfo/saveUserInfo",
+		type:"POST",
+		dataType:'json',
+		data:$("#data_form").serializeArray(),
+		complete:function(){
+			$(".fa-save").removeAttr("disabled");
+			$('.fa-save').html('保存')
+		},        
+		success:function(service){ 
+		
+			layer.confirm('保存成功,是否前往列表？', {
+				  btn: ['确认','取消'] //按钮
+				}, function(){
+					$('#goback span').trigger('click'); 
+				}, function(){         
+					layer.closeAll();
+			});  
+			
+		}
+	});  
+}
+ 
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/userInfo/userInfoList.js b/pluss-manage-page/src/main/resources/static/resources/js/userInfo/userInfoList.js
new file mode 100644
index 0000000..33b5a84
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/userInfo/userInfoList.js
@@ -0,0 +1,346 @@
+/**
+ * create by robot 
+ * date Thu Jul 25 19:43:04 CST 2019 
+ */ 
+
+var pageIndex=1;
+$(document).ready(function(){
+	//调用查询
+	pageIndex=StringUtil.getQueryString('pageIndex');
+	if(pageIndex==undefined||pageIndex==null){
+		pageIndex=1;
+	}
+	queryUserInfo(pageIndex);
+	//绑定hover操作
+	$(document).on('mouseenter','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").show();
+		var width=15;
+		$(this).children('div').find('li').each(function(){
+			//获取li宽度
+			width+=$(this).width();
+		});
+		$(this).children('div').width(width);
+	})
+	$(document).on('mouseleave','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").hide();
+	});
+
+	//日历控件
+	layui.use(['layer', 'laydate'], function() {
+		var layer = layui.layer;
+		laydate = layui.laydate;
+		laydate.render({
+		elem: '#date1' //指定元素
+		});
+		laydate.render({
+			elem: '#date2' //指定元素
+		});
+	});
+
+
+	//行选中事件
+	$("#allCheck").find("span").click(function() {
+		$(this).toggleClass('checked');
+		if($(this).hasClass('checked')){
+			//所有列选中
+		  $(".checker").find("span").each(function () {
+		         $(this).addClass("checked");
+		    })
+		}else{
+			//所有列取消选中
+			$(".checker").find("span").each(function () {
+				 $(this).removeClass("checked");
+		    })
+		}
+	});
+
+	//单个选中
+	$(document).on('click','.checkeBox span',function() {
+		$(this).toggleClass('checked');
+		//设置头部事件
+		var length=$('.checkeBox span').length;
+		var count=0;
+		$(".checkeBox").find("span").each(function () {
+	        if($(this).hasClass("checked")){
+	        	count++;
+	        }
+	   })
+		//全选
+	   if(count==length){
+		   $("#allCheck").find("span").addClass('checked');
+	   }else{
+		   $("#allCheck").find("span").removeClass('checked');
+	   }
+	})
+	//左右div高度相等
+	var left_content_height = $(".right-content").height();
+	$(".left-content").height(left_content_height+35);
+	var sub_left_height=$(".res-menu").height(left_content_height-60);
+});
+
+//查询
+function queryUserInfo(index){
+	if(typeof(index)=='undefined'){
+		index=1;
+	}
+	var url=ctx+'/userInfo/queryUserInfoByPage';
+	$.ajax({  
+        url:url,  
+        type:"post", 
+        dataType:"json",  
+        data:{  
+        	"currPage":index,
+        	//"id":$('#searchId').val(),
+        	"loginName":$("#loginName").val(),
+        },  
+        success:function(result){  
+        	//渲染数据
+        	$('#data_content').empty();
+        	var header='';
+        	$.each(result.userInfoList,function(i){
+        		var userInfo=result.userInfoList[i];
+        		
+//        		var createTime="";
+//        		if(userInfo.createTime!=null){
+//        			var crtTime = new Date(userInfo.createTime)
+//        			createTime =dateFtt("yyyy-MM-dd hh:mm:ss",userInfo.createTime);
+//        		}
+//        		
+//        		var updateTime="";
+//        		if(userInfo.updateTime!=null){
+//        			var crtTime = new Date(userInfo.updateTime)
+//        			updateTime =dateFtt("yyyy-MM-dd hh:mm:ss",crtTime);
+//        		}
+        		
+        		
+        		var data='';
+        		data+='<tr class="odd">';
+        		data+='<td class="textc">';
+				data+='		 <div class="checker checkeBox">';        		data+='		 <span class=""  data-id="'+userInfo.id+'"><input type="checkbox"  value=""></span>';
+        		data+='		</div>';
+        		data+='</td>';
+        		data+='<td class="textc">'+userInfo.id+'</td>';
+        		var loginName='';
+        		if(StringUtil.isNotBlank(userInfo.loginName)){
+        			loginName=userInfo.loginName;
+        		}
+        		data+='<td class="textc">'+loginName+'</td>';
+        		var trueName='';
+        		if(StringUtil.isNotBlank(userInfo.trueName)){
+        			trueName=userInfo.trueName;
+        		}
+        		data+='<td class="textc">'+trueName+'</td>';
+        		/*data+='<td class="textc">'+userInfo.phone+'</td>';
+        		var sex='';
+        		if(StringUtil.isNotBlank(userInfo.sex)){
+        			sex=userInfo.sex;
+        		}
+        		data+='<td class="textc">'+sex+'</td>';
+        		var organName='';
+        		if(StringUtil.isNotBlank(userInfo.organName)){
+        			organName=userInfo.organName;
+        		}
+        		data+='<td class="textc">'+organName+'</td>';
+        		var organTypeName='';
+        		if(StringUtil.isNotBlank(userInfo.organTypeName)){
+        			organTypeName=userInfo.organTypeName;
+        		}
+        		data+='<td class="textc">'+organTypeName+'</td>';*/
+        		/*var status='';
+        		if(userInfo.status=='1'){
+    				status='有效';
+    			}else if(userInfo.status=='0'){
+    				status='无效';
+    			}
+        		data+='<td class="textc">'+status+'</td>';
+        		var creator='';
+        		if(StringUtil.isNotBlank(userInfo.creator)){
+        			creator=userInfo.creator;
+        		}
+        		data+='<td class="textc">'+creator+'</td>';
+        		var updator='';
+        		if(StringUtil.isNotBlank(userInfo.updator)){
+        			updator=userInfo.updator;
+        		}
+        		data+='<td class="textc">'+updator+'</td>';*/
+        		data+='<td class="textc">';
+        		data+='<div class="positionr listOperaters">';
+        		data+='		<a href="javascript:void(0);"  class="icon-large dlblock w16 h16"><img src="'+resourcePath+'/images/angle-down.png"/></a>';
+        		data+='		<div class="ops_box ops_itemDiv positiona clearfix whitebg">';
+        		data+='			<ul>';
+        		/*data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showUserInfoDetails('+userInfo.id+')" class="btn btn-primary fa fa-edit ops_more f12">编辑</a></li>';*/
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="initDeleteUserInfo('+userInfo.id+')" class="layui-btn layui-btn-sm layui-btn-radius layui-btn-danger fa fa-remove ops_more f12">删除</a></li>';
+        /*		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showUserInfoReadDetails('+userInfo.id+')" class="btn btn-primary fa fa-detail ops_more f12">详情</a></li>';*/
+        	    data+='			</ul>';
+              data+='		</div>';
+        	    data+='</div>';
+        	    data+='</td>';
+        	    data+='</tr>';
+        	    $('#data_content').append(data);
+        	});
+        	//分页
+        	$('#pageCount').html(result.pageCount);
+      	$('#currPage').html(result.currPage);
+          $('#totalCount').html(result.count);
+           	//设置分页
+           	pageIndex=result.currPage;
+			$('#pagination').pagination({
+				pageCount: result.pageCount,
+				jump: true,
+				coping: true,
+				jump: true,
+				homePage: '首页',
+				endPage: '末页',
+				prevContent: '上页',
+				nextContent: '下页',
+				current:result.currPage,
+				callback:function(api){
+					pageIndex=api.getCurrent();
+					queryUserInfo(api.getCurrent());
+				}
+			});
+        } 
+    });  
+	//表头列不选中
+	$("#allCheck").find("span").removeClass('checked');
+}
+
+//初始化新增
+function initAddUserInfo(){
+	window.location=ctx+'/userInfo/edit?id=';
+}
+
+//初始化修改
+function showUserInfoDetails(id){
+	window.location=ctx+'/userInfo/edit?id='+id+'&pageIndex='+pageIndex;
+}
+
+//初始化详情
+function showUserInfoReadDetails(id){
+	window.location=ctx+'/userInfo/detail?id='+id+'&pageIndex='+pageIndex;
+}
+
+//初始化删除
+function initDeleteUserInfo(id){
+	
+		layer.open({
+		type: 1,
+		closeBtn: 1,		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r'	, //按钮居中
+		shade: 0.3 ,//不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteUserInfo(id,true);
+		}
+	});
+}
+
+//删除
+function deleteUserInfo(id,showMsg){
+	$.ajax({
+		url:ctx+'/userInfo/deleteUserInfo',
+		data:[{
+			name:'id',
+			value:id
+		}],
+		type:'POST',
+		dataType:'json',
+		success:function(){
+			queryUserInfo(pageIndex);
+			if(showMsg){
+				layer.msg('删除成功!');	
+			}
+		}
+	});
+}
+//头部编辑
+function initEditUserInfo(){
+	var count=0;
+	var id=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+        	 id=$(this).data('id');
+         }
+    })
+    if(count>1){
+    	layer.msg('只能选中一行记录进行操作!');
+    	return ;
+    }
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	 if(id>0){
+	  showUserInfoDetails(id);
+	 }
+}
+//头部删除
+function initBatchDeleteUserInfo(){
+	var count=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+         }
+    })
+	
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	
+
+	layer.open({
+		type: 1,
+		closeBtn: 1,
+		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r', //按钮居中
+		shade: 0.3, //不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteBatchUserInfo();
+		}
+	});
+	
+}
+//批量删除
+function deleteBatchUserInfo(){
+	
+	$(".checkeBox").find("span").each(function () {
+        if($(this).hasClass("checked")){
+        	var id=$(this).data('id');
+        	deleteUserInfo(id,false);
+        	layer.msg('删除成功!');	
+        }
+   })
+}
+
+
+
+function dateFtt(fmt,date)   
+{ //author: meizz   
+  var o = {   
+    "M+" : date.getMonth()+1,                 //月份   
+    "d+" : date.getDate(),                    //日   
+    "h+" : date.getHours(),                   //小时   
+    "m+" : date.getMinutes(),                 //分   
+    "s+" : date.getSeconds(),                 //秒   
+    "q+" : Math.floor((date.getMonth()+3)/3), //季度   
+    "S"  : date.getMilliseconds()             //毫秒   
+  };   
+  if(/(y+)/.test(fmt))   
+    fmt=fmt.replace(RegExp.$1, (date.getFullYear()+"").substr(4 - RegExp.$1.length));   
+  for(var k in o)   
+    if(new RegExp("("+ k +")").test(fmt))   
+  fmt = fmt.replace(RegExp.$1, (RegExp.$1.length==1) ? (o[k]) : (("00"+ o[k]).substr((""+ o[k]).length)));   
+  return fmt;   
+} 
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/userOrgan/userOrganDetails.js b/pluss-manage-page/src/main/resources/static/resources/js/userOrgan/userOrganDetails.js
new file mode 100644
index 0000000..384e333
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/userOrgan/userOrganDetails.js
@@ -0,0 +1,96 @@
+/**
+ * create by robot 
+ * date Tue Sep 10 15:03:55 CST 2019 
+ */ 
+
+$(document).ready(function(){
+	//form表单样式
+	layui.use(['layer', 'form'], function() {
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+	//li 切换事件
+	$(".nav-tabs>li").click(function() {
+		var index = $(".nav-tabs>li").index(this);
+		$(this).addClass("active").siblings("li").removeClass("active");
+		
+	})
+	//弹出一个提示层
+	$('.fa-save').on('click', function() {
+		saveUserOrgan();
+	});
+
+	//绑定标签栏事件
+	$(document).on('click','.nav-tabs li',function(){
+
+		var action =$(this).data('action');
+		 switch (action) {
+			case "base"://基本资料
+				goBase();
+				break;  
+			case "functions"://多功能
+				goFunctions();
+				break;
+			case "extends"://扩展    
+				goExtends();         
+				break;           
+		 }
+	})
+
+	//加载第一个标签
+	$('.nav-tabs li').eq(0).click();
+	
+});
+
+
+//跳转基本信息 
+function goBase(){
+	var url=ctx+'/userOrgan/queryUserOrganBaseInfo?id='+$('#userOrganId').val();
+	$('.tab-content').load(url);
+	              
+}
+//跳转多功能输入
+function goFunctions(){ 
+	var url=ctx+'/userOrgan/queryUserOrganFunctionsInfo?id='+$('#userOrganId').val();
+	$('.tab-content').load(url);  
+	
+}
+//跳转到扩展   
+function goExtends(){
+	
+	var url=ctx+'/userOrgan/queryUserOrganExtendsInfo?id='+$('#userOrganId').val();
+	$('.tab-content').load(url);          
+}  
+  
+
+ 
+//保存
+function saveUserOrgan(){
+	 
+	$(".fa-save").attr("disabled","disabled");
+	$('.fa-save').html('正在保存...')
+	$.ajax({
+		url:ctx+"/userOrgan/saveUserOrgan",
+		type:"POST",
+		dataType:'json',
+		data:$("#data_form").serializeArray(),
+		complete:function(){
+			$(".fa-save").removeAttr("disabled");
+			$('.fa-save').html('保存')
+		},        
+		success:function(service){ 
+		
+			layer.confirm('保存成功,是否前往列表？', {
+				  btn: ['确认','取消'] //按钮
+				}, function(){
+					$('#goback span').trigger('click'); 
+				}, function(){         
+					layer.closeAll();
+			});  
+			
+		}
+	});  
+}
+ 
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/userOrgan/userOrganList.js b/pluss-manage-page/src/main/resources/static/resources/js/userOrgan/userOrganList.js
new file mode 100644
index 0000000..02bcb42
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/userOrgan/userOrganList.js
@@ -0,0 +1,269 @@
+/**
+ * create by robot 
+ * date Tue Sep 10 15:03:55 CST 2019 
+ */ 
+
+var pageIndex=1;
+$(document).ready(function(){
+	//调用查询
+	pageIndex=StringUtil.getQueryString('pageIndex');
+	if(pageIndex==undefined||pageIndex==null){
+		pageIndex=1;
+	}
+	queryUserOrgan(pageIndex);
+	//绑定hover操作
+	$(document).on('mouseenter','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").show();
+		var width=15;
+		$(this).children('div').find('li').each(function(){
+			//获取li宽度
+			width+=$(this).width();
+		});
+		$(this).children('div').width(width);
+	})
+	$(document).on('mouseleave','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").hide();
+	});
+
+	//日历控件
+	layui.use(['layer', 'laydate'], function() {
+		var layer = layui.layer;
+		laydate = layui.laydate;
+		laydate.render({
+		elem: '#date1' //指定元素
+		});
+		laydate.render({
+			elem: '#date2' //指定元素
+		});
+	});
+
+
+	//行选中事件
+	$("#allCheck").find("span").click(function() {
+		$(this).toggleClass('checked');
+		if($(this).hasClass('checked')){
+			//所有列选中
+		  $(".checker").find("span").each(function () {
+		         $(this).addClass("checked");
+		    })
+		}else{
+			//所有列取消选中
+			$(".checker").find("span").each(function () {
+				 $(this).removeClass("checked");
+		    })
+		}
+	});
+
+	//单个选中
+	$(document).on('click','.checkeBox span',function() {
+		$(this).toggleClass('checked');
+		//设置头部事件
+		var length=$('.checkeBox span').length;
+		var count=0;
+		$(".checkeBox").find("span").each(function () {
+	        if($(this).hasClass("checked")){
+	        	count++;
+	        }
+	   })
+		//全选
+	   if(count==length){
+		   $("#allCheck").find("span").addClass('checked');
+	   }else{
+		   $("#allCheck").find("span").removeClass('checked');
+	   }
+	})
+	//左右div高度相等
+	var left_content_height = $(".right-content").height();
+	$(".left-content").height(left_content_height+35);
+	var sub_left_height=$(".res-menu").height(left_content_height-60);
+});
+
+//查询
+function queryUserOrgan(index){
+	if(typeof(index)=='undefined'){
+		index=1;
+	}
+	var url=ctx+'/userOrgan/queryUserOrganByPage';
+	$.ajax({  
+        url:url,  
+        type:"post", 
+        dataType:"json",  
+        data:{  
+        	"currPage":index,
+        	"id":$('#searchId').val()
+        },  
+        success:function(result){  
+        	//渲染数据
+        	$('#data_content').empty();
+        	var header='';
+        	$.each(result.userOrganList,function(i){
+        		var userOrgan=result.userOrganList[i];
+        		var data='';
+        		data+='<tr class="odd">';
+        		data+='<td class="textc">';
+				data+='		 <div class="checker checkeBox">';        		data+='		 <span class=""  data-id="'+userOrgan.id+'"><input type="checkbox"  value=""></span>';
+        		data+='		</div>';
+        		data+='</td>';
+        		data+='<td class="textc">'+userOrgan.id+'</td>';
+        		data+='<td class="textc">'+userOrgan.userId+'</td>';
+        		data+='<td class="textc">'+userOrgan.organCode+'</td>';
+        		data+='<td class="textc">'+userOrgan.organName+'</td>';
+        		data+='<td class="textc">'+userOrgan.organTypeCode+'</td>';
+        		data+='<td class="textc">'+userOrgan.organTypeName+'</td>';
+        		data+='<td class="textc">';
+        		if(result.userType=='merchant'||result.admin=='admin'){
+        			data+='<div class="positionr listOperaters">';
+            		data+='		<a href="javascript:void(0);"  class="icon-large dlblock w16 h16"><img src="'+resourcePath+'/images/angle-down.png"/></a>';
+            		data+='		<div class="ops_box ops_itemDiv positiona clearfix whitebg">';
+            		data+='			<ul>';
+            		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showUserOrganDetails('+userOrgan.id+')" class="btn btn-primary fa fa-edit ops_more f12">编辑</a></li>';
+            		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="initDeleteUserOrgan('+userOrgan.id+')" class="btn btn-primary fa fa-remove ops_more f12">删除</a></li>';
+            		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showUserOrganDetails('+userOrgan.id+')" class="btn btn-primary fa fa-detail ops_more f12">明细</a></li>';
+            	    data+='			</ul>';
+                  data+='		</div>';
+            	    data+='</div>';
+        		}
+        	    data+='</td>';
+        	    data+='</tr>';
+        	    $('#data_content').append(data);
+        	});
+        	//分页
+        	$('#pageCount').html(result.pageCount);
+      	$('#currPage').html(result.currPage);
+          $('#totalCount').html(result.count);
+           	//设置分页
+           	pageIndex=result.currPage;
+			$('#pagination').pagination({
+				pageCount: result.pageCount,
+				jump: true,
+				coping: true,
+				jump: true,
+				homePage: '首页',
+				endPage: '末页',
+				prevContent: '上页',
+				nextContent: '下页',
+				current:result.currPage,
+				callback:function(api){
+					pageIndex=api.getCurrent();
+					queryUserOrgan(api.getCurrent());
+				}
+			});
+        } 
+    });  
+	//表头列不选中
+	$("#allCheck").find("span").removeClass('checked');
+}
+
+//初始化新增
+function initAddUserOrgan(){
+	window.location=ctx+'/userOrgan/queryUserOrganDetails?pageIndex='+pageIndex;
+}
+
+//初始化修改
+function showUserOrganDetails(id){
+	window.location=ctx+'/userOrgan/queryUserOrganDetails?id='+id+'&pageIndex='+pageIndex;
+}
+
+//初始化删除
+function initDeleteUserOrgan(id){
+	
+		layer.open({
+		type: 1,
+		closeBtn: 1,		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r'	, //按钮居中
+		shade: 0.3 ,//不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteUserOrgan(id,true);
+		}
+	});
+}
+
+//删除
+function deleteUserOrgan(id,showMsg){
+	$.ajax({
+		url:ctx+'/userOrgan/deleteUserOrgan',
+		data:[{
+			name:'id',
+			value:id
+		}],
+		type:'POST',
+		dataType:'json',
+		success:function(){
+			queryUserOrgan(pageIndex);
+			if(showMsg){
+				layer.msg('删除成功!');	
+			}
+		}
+	});
+}
+//头部编辑
+function initEditUserOrgan(){
+	var count=0;
+	var id=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+        	 id=$(this).data('id');
+         }
+    })
+    if(count>1){
+    	layer.msg('只能选中一行记录进行操作!');
+    	return ;
+    }
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	 if(id>0){
+	  showUserOrganDetails(id);
+	 }
+}
+//头部删除
+function initBatchDeleteUserOrgan(){
+	var count=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+         }
+    })
+	
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	
+
+	layer.open({
+		type: 1,
+		closeBtn: 1,
+		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r', //按钮居中
+		shade: 0.3, //不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteBatchUserOrgan();
+		}
+	});
+	
+}
+//批量删除
+function deleteBatchUserOrgan(){
+	
+	$(".checkeBox").find("span").each(function () {
+        if($(this).hasClass("checked")){
+        	var id=$(this).data('id');
+        	deleteUserOrgan(id,false);
+        	layer.msg('删除成功!');	
+        }
+   })
+}
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/utils/DateUtil.js b/pluss-manage-page/src/main/resources/static/resources/js/utils/DateUtil.js
new file mode 100644
index 0000000..e024cb5
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/utils/DateUtil.js
@@ -0,0 +1,39 @@
+/**
+ * 格式化yyyy-MM-DD HH:MM:SS
+ */
+Date.prototype.toYYYYMMDDHHMMSS = function() {
+	var mouth=this.getMonth() + 1<10?'0'+(this.getMonth() + 1):(this.getMonth() + 1);
+	var day=this.getDate()<10?'0'+this.getDate():this.getDate();
+	
+    return this.getFullYear() + "-" + mouth + "-" + day + " " + this.getHours() + ":" + this.getMinutes() + ":" + this.getSeconds() ;
+};
+/**
+ * 格式化yyyy-MM-DD
+ */
+Date.prototype.toYYYYMMDD = function() {
+	var mouth=this.getMonth() + 1<10?'0'+(this.getMonth() + 1):(this.getMonth() + 1);
+	var day=this.getDate()<10?'0'+this.getDate():this.getDate();
+	
+    return this.getFullYear() + "-" + mouth + "-" + day;
+};
+/**
+ * 格式化你想要的格式
+ */
+Date.prototype.format = function(format) {   
+   var o = {
+     "M+" : this.getMonth()+1, // month
+     "d+" : this.getDate(),    // day
+     "h+" : this.getHours(),   // hour
+     "m+" : this.getMinutes(), // minute
+     "s+" : this.getSeconds(), // second
+     "q+" : Math.floor((this.getMonth()+3)/3), // quarter
+     "S" : this.getMilliseconds() // millisecond
+   }   
+   if(/(y+)/.test(format)) format=format.replace(RegExp.$1,   
+     (this.getFullYear()+"").substr(4 - RegExp.$1.length));   
+   for(var k in o)if(new RegExp("("+ k +")").test(format))   
+     format = format.replace(RegExp.$1,   
+       RegExp.$1.length==1 ? o[k] :    
+         ("00"+ o[k]).substr((""+ o[k]).length));   
+   return format;   
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/utils/DialogUtil.js b/pluss-manage-page/src/main/resources/static/resources/js/utils/DialogUtil.js
new file mode 100644
index 0000000..1a1ce6e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/utils/DialogUtil.js
@@ -0,0 +1,318 @@
+/**
+ * 
+ * 为了layer的顶层dialog显示
+ * 相关API请看<a herf="http://layer.layui.com/api.html">http://layer.layui.com/api.html</a>
+ 
+ * 
+ * <pre>
+ * 邮箱:50875875@qq.com
+ * 日期:2019-02-17-21:29:34
+ * 版权：安徽航天信息有限公司
+ * </pre>
+ */
+DialogUtil = {
+	/**
+	 * 获取顶部窗口
+	 */
+	getParent : function(w) {
+		var win = w ? w : window;
+		if (win.parent != win) // 找到最顶层窗口
+			return this.getParent(win.parent);
+		return win;
+	},
+	/**
+	 * 格式化 var str=String.format("姓名:{0},性别:{1}","hugh","男"); alert(str);
+	 * 
+	 * @returns
+	 */
+	format : function() {
+		var template = arguments[0], args = arguments, str = template.replace(
+				/\{(\d+)\}/g, function(m, i) {
+					return args[parseInt(i) + 1];
+				});
+		return str;
+	},
+	layer : function() {
+		return this.getParent().laydialog;
+	},
+	open : function(options) {
+		return this.layer().open(options);
+	},
+	/**
+	 * 关闭指定的弹窗
+	 * @param index 对话框的index
+	 * @returns
+	 */
+	close : function(index) {
+		return this.layer().close(index);
+	},
+	/**
+	 * 关闭当前的弹窗
+	 * @returns
+	 */
+	closeDialog : function() {
+		if(frameElement &&frameElement.dialog){
+			return this.close(frameElement.dialog.index);
+		}else{
+		   if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") !=-1) {  
+		        window.location.href="about:blank";  
+		        window.close();  
+		    } else {  
+		        window.opener = null;  
+		        window.open("", "_self");  
+		        window.close();  
+		    }  
+		}
+	},
+	/**
+	 * 关闭所有的弹窗
+	 * @returns
+	 */
+	closeAll : function() {
+		return this.layer().closeAll();
+	},
+	/**
+	 * 获得弹出窗口的Window对象<br>
+	 * DialogUtil.getChildFrameWindow().xxx();
+	 * xxx ：是具体的方法。
+	 * @param index 这个是对话框的id
+	 * @returns
+	 */
+	getChildFrameWindow:function(index){
+		return this.layer().getChildFrameWindow(index);
+	},
+	/**
+	 * 可以通过选择器查找对象
+	 * @param selector 
+	 * @param index
+	 * @returns
+	 */
+	getChildFrame:function(selector, index){
+		return this.layer().getChildFrame(selector,index);
+	},
+	/**
+	 * 弹窗框
+	 * @param options 
+	 * params  传递的参数 
+	 * callback 回调
+	 * 
+	 * @returns
+	 */
+	dialog:function(options){
+		var opts = jQuery.extend({}, {
+		    type: 2,
+		    area: ['90%', '90%'],
+		    fix: true, //固定
+		    maxmin: true,
+		    btnAlign:'c'
+		}, options);
+		return this.layer().open(opts);
+	},
+	/**
+	 * 窗口回调
+	 * @param options
+	 */
+	callback:function(options){
+		if(frameElement.dialog){
+			if(frameElement.dialog.callback){
+				frameElement.dialog.callback(options);
+			}
+		}
+	},
+	/**
+	 * 全屏窗口
+	 * @returns
+	 */
+	openFullWindow:function(){
+		var options={},
+    		defaultOptions = {
+			    type: 2,
+			    area: ['100%', '100%'],
+			    fix: true, //固定
+			    maxmin: true
+			};
+	    if (typeof arguments[0] === 'object' ) {
+	        options = jQuery.extend(true, defaultOptions, arguments[0]);
+	    } else {
+	        options = jQuery.extend(true, defaultOptions, {
+	        	content: arguments[0],
+	        	title:typeof arguments[1] !== 'undefined' ? arguments[1] : null
+	        });
+	    }
+	    options = jQuery.extend(true, defaultOptions, options);
+		return this.layer().open(options);
+	},
+	/**
+	 * alert
+	 * 
+	 * @param content  【必填】 提示消息 //注意这个是字符串，
+	 * @param title  【选填】 如果是function类型 ,则是回调（callback），如果是String类型 则是提示标题,不传入为默认值‘提示'
+	 * @param callback 【选填】  如果是function类型 ,则是回调（callback）
+	 * @returns
+	 */
+	alert : function(content,title,callback){
+			var  o = {
+				content: content
+			 };
+			if (typeof (title) == "function") o.callback = title;
+			if(callback) o.callback = callback;
+			if (typeof (title) == "string" && title != "") o.title = title;
+		return this.layer().alert(o);
+	},
+	/**
+	 * 警告
+	 * 
+	 * @param content  【必填】 提示消息
+	 * @param title  【选填】 如果是function类型 ,则是回调（callback），如果是String类型 则是提示标题,不传入为默认值‘提示'
+	 * @param callback 【选填】  如果是function类型 ,则是回调（callback）
+	 * @returns
+	 */
+	warn:function(content,title,callback){
+		var  o = {
+				content: content,
+				icon:0
+			 };
+			if (typeof (title) == "function") o.callback = title;
+			if(callback) o.callback = callback;
+			if (typeof (title) == "string" && title != "") o.title = title;
+		return this.layer().alert(o);
+	},
+	/**
+	 * 错误提示信息
+	 * @param content 【必填】 错误信息简述
+	 * @param detail 【必填】 详细错误信息
+	 * @param title  【选填】  如果是function类型 ,则是回调（callback），如果是String类型 则是提示标题,不传入为默认值‘提示'
+	 * @param callback 【选填】  如果是function类型 ,则是回调（callback）
+	 * @returns
+	 */
+	error : function(content,detail,title,callback){ 
+		if(detail){
+			var divTemplate="<div class='div_error' >" +
+			"<div class='div_error_msg'><i class='fa fa-times-circle'></i>&nbsp;{0}</div>" +
+				"<div style='text-align:left; padding-bottom:10px; padding-left:10px;'></div>" +
+			"<div class='div_error_detail'>{1}</div>" +
+			"</div>";
+			var msg=this.format(divTemplate,content,detail);
+			if (typeof (title) == "function") {
+				callback = title;
+				title ="提示";
+			}
+			if (typeof (title) == "string" && title != "") title = title;
+		    return this.layer().alert({
+		    	content: msg,
+		    	title:title,
+		    	callback:callback
+		    });
+		}else{
+		    return this.layer().alert({
+		    	content: content,
+				icon:2
+		    });
+		}
+	
+	},
+	/**
+	 *  确认对话框
+	 *  
+	 * @param content 【必填】 提示消息
+	 * @param title 【选填】     如果是function类型 ,则是回调（callback），如果是String类型 则是提示标题,不传入为默认值‘提示’；
+	 * @param callback 【选填】  如果是function类型 ,则是回调（callback），如果是boolean类型 并且为true 则是按钮为是否  否则是默认
+	 * @param buttonsLabel 【选填】 如果是boolean类型 则是按钮为是否
+	 * @returns 
+	 */
+	confirm : function(content,title,callback,buttonsLabel) {
+		var  o = {content:content };
+		if (typeof (title) == "function") o.callback = title;
+		if (typeof (callback) == "boolean") buttonsLabel = callback;
+		if (typeof (callback) == "function") o.callback  = callback;
+		if (typeof (title) == "string" && title != "") o.title = title;
+		if(buttonsLabel){
+			o.btn = [{
+				label: '&#x662F;'//是
+	           }, {
+	        	   label: '&#x5426;'//否
+	           }];
+		}
+		return this.layer().confirm(o);
+	},
+	/**
+	 * 加载的对话框
+	 * @param icon 【选填】加载的图标 0-2可选 如果是0，无需传
+	 * @param options  【选填】 可以设置时间等参数
+	 * @returns
+	 */
+	load : function(icon, options) {
+		if(!options)
+			options = {};
+		if(typeof (icon) == "string"){
+			options = {title:icon};
+			icon = 0;
+		}
+		
+		return this.layer().load(icon, options);
+	},
+	/**
+	 * 顶部通知框
+	 * @param content  【必填】提示消息
+	 * @param options  【选填】选项
+	 * @param callback 【选填】回调
+	 * @returns
+	 */
+	toastr : function(content,options, callback) {
+		var opts ={
+				offset : 0,
+				shift :6};
+		if(typeof (options)  == "boolean") {
+			opts.shift = options?0:6;
+		}else if(typeof (options)  == "function"){
+			callback = options;
+		}
+		return this.msg(content,opts, callback);
+	},
+	/**
+	 * 提示消息 【中间】
+	 * @param content 【必填】提示消息
+	 * @param options 【必填】选项
+	 * @param callback 【选填】回调
+	 * @returns
+	 */
+	msg : function(content, options, callback) {
+		return this.layer().msg(content, options, callback);
+	},
+	/**
+	 * 气泡提示
+	 * @param content 【必填】提示消息
+	 * @param follow  位置
+	 * @param options 【必填】选项
+	 * @returns
+	 */
+	tips : function(content, follow, options) {
+		return this.layer().tips(content, follow, options);
+	},
+	// 导出专用
+	tipDialog : function(title, message, detail, type, callback) {
+		var divTemplate = "<div class='div_error' >"
+				+ "<div class='div_error_msg'>{0}</div>"
+				+ "<div style='text-align:left; padding-bottom:10px; padding-left:10px;'></div>"
+				+ "<div class='div_error_detail'>{1}</div>" + "</div>";
+		var content = this.format(divTemplate, message, detail);
+		return this.layer().alert( {
+			title:title,
+			content:content,
+			icon :  type
+		});
+	},
+	/**
+	 * tab 层
+	 * @param options
+	 */
+	tab:function(options){
+		return this.layer().tab(options);
+	},
+	/**
+	 * prompt层
+	 */
+	prompt:function(options,yes){
+		return this.layer().prompt(options,yes);
+	}
+};
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/utils/StringUtil.js b/pluss-manage-page/src/main/resources/static/resources/js/utils/StringUtil.js
new file mode 100644
index 0000000..bb361ff
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/utils/StringUtil.js
@@ -0,0 +1,202 @@
+/*******************************************************************************
+ * 
+ * 系统主页
+ * 
+ * <pre>
+ *  
+ * 作者：liys
+ * 邮箱:5087587@qq.com
+ * 日期:2019-2-15-11:43:52
+ * 版权：安徽航天信息有限公司
+ * </pre>
+ * 
+ ******************************************************************************/
+StringUtil={
+	//获取url参数
+	getQueryString:function(name){
+	    var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i"); 
+	    var r = window.location.search.substr(1).match(reg); 
+	    if (r != null) return unescape(r[2]); 
+	    return null; 
+		
+	},
+	//校验字符串不为空
+	isNotBlank:function(text){
+		return !(this.isBlank(text))
+	},
+	//校验字符串是否为空
+	isBlank:function(text){
+		if(text==null){
+			return true;
+		}
+		if(text==""){
+			return true;
+		}
+		if(text.length==0){
+			return true;
+		}
+		if(text==undefined){
+			return true;
+		}
+		return false;
+	},
+	//判断一个对象是否为空
+	objectIsBlank:function(obj){
+		if(JSON.stringify(obj)=="{}"){
+			return true
+		}
+		if(Object.keys(obj).length==0){
+			return true
+		}
+		return false
+	},
+	//判断一个对象是否不为空
+	objectIsNotBlank:function(obj){
+		return !(this.objectIsBlank(obj))
+	},
+	/**
+	 * 判断一个字符串是邮箱
+	 * @param str
+	 * @returns
+	 */
+	isEmail:function(str){
+		var pattern = /\w[-\w.+]*@([A-Za-z0-9][-A-Za-z0-9]+\.)+[A-Za-z]{2,14}/g;
+		return (pattern.test(str))
+	},
+	/**
+	 * 判断一个字符串不是邮箱
+	 * @param str
+	 * @returns
+	 */
+	isNotEmail:function(str){
+		var pattern = /\w[-\w.+]*@([A-Za-z0-9][-A-Za-z0-9]+\.)+[A-Za-z]{2,14}/g;
+		return !(pattern.test(str))
+	},
+	/**
+	 * 判断一个字符串是身份证
+	 * @param str
+	 * @returns
+	 */
+	isIdCard:function(str){
+		var pattern = /\d{17}[0-9Xx]|\d{15}/g;
+		return (pattern.test(str))
+	},
+	
+	/**
+	 * 判断一个字符串不是身份证
+	 * @param str
+	 * @returns
+	 */
+	isNotIdCard:function(str){
+		var pattern = /\d{17}[0-9Xx]|\d{15}/g;
+		return !(pattern.test(str))
+	},
+	
+	/**
+	 * 判断一个字符串是正整数
+	 * @param str
+	 * @returns
+	 */
+	isJustInteger:function(str){
+		var pattern = /^[1-9]\d*$/;
+		return (pattern.test(str))
+	},
+	/**
+	 * 判断一个字符串不是正整数
+	 * @param str
+	 * @returns
+	 */
+	isNotJustInteger:function(str){
+		return !(this.isJustInteger(str))
+	},
+	
+	/**
+	 * 判断一个字符串是手机号
+	 * @param str
+	 * @returns
+	 */
+	isPhone:function(str){
+		var pattern = /(13\d|14[579]|15[^4\D]|17[^49\D]|18\d)\d{8}/g;
+		return (pattern.test(str))
+	},
+	/**
+	 * 判断一个字符串不是手机号
+	 * @param str
+	 * @returns
+	 */
+	isNotPhone:function(str){
+		var pattern = /(13\d|14[579]|15[^4\D]|17[^49\D]|18\d)\d{8}/g;
+		return !(pattern.test(str))
+	},
+	/**
+	 * 判断一个字符串是正整数和小数
+	 */
+	isJustIntgerAndDecimals:function(str){
+		var pattern =  /^\d+(\.\d{1,6})?$/;
+		return (pattern.test(str))
+	},
+	/**
+	 * 判断一个字符串是正整数和小数
+	 */
+	isNotJustIntgerAndDecimals:function(str){
+		return !(this.isJustIntgerAndDecimals(str))
+	},
+	/**
+	 * 判断一个字符串是正整数和小数（保留两位小数）
+	 */
+	isNotJustIntgerAndDecimals2:function(str){
+		var pattern =  /^\d+(\.\d{1,2})?$/;
+		return !(pattern.test(str))
+	},
+	/**
+	 * 0-1之间的最多两位小数(包含0和1)
+	 */
+	isZeroAndOneBT(str){
+		var pattern = /^(0(\.\d{1,2})?|1(\.0{1,2})?)$/;
+		return (pattern.test(str))
+	},
+	/**
+	 * 不是0-1之间的最多两位小数(包含0和1)
+	 */
+	isNotZeroAndOneBT(str){
+		var pattern = /^(0(\.\d{1,2})?|1(\.0{1,2})?)$/;
+		return !(pattern.test(str))
+	},
+	
+	/**
+	 * 0-1之间的最多两位小数(不包含0)
+	 */
+	isOneBT(str){
+		var pattern =  /\b0(\.\d{1,2})\b/g;
+		return (pattern.test(str))
+	},
+	/**
+	 * 不是0-1之间的最多两位小数(不包含0)
+	 */
+	isNotOneBT(str){
+		var pattern =  /\b0(\.\d{1,2})\b/g;
+		return !(pattern.test(str))
+	},
+	
+	/**
+	 * 0-1之间的最多两位小数(包含0)
+	 */
+	isZeroOneBT(str){
+		var pattern =  /\b0(\.\d{1,2})?\b/g;
+		return (pattern.test(str))
+	},
+	/**
+	 * 不是0-1之间的最多两位小数(包含0)
+	 */
+	isNotZeroOneBT(str){
+		var pattern =  /\b0(\.\d{1,2})?\b/g;
+		return !(pattern.test(str))
+	},
+	
+	
+	
+
+	
+}
+
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/utils/nzh.min.js b/pluss-manage-page/src/main/resources/static/resources/js/utils/nzh.min.js
new file mode 100644
index 0000000..73708da
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/utils/nzh.min.js
@@ -0,0 +1,6 @@
+/*!
+ * nzh v1.0.4
+ * Homepage http://cnwhy.github.io/nzh
+ * License BSD-2-Clause
+ */
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):t.Nzh=e()}(this,function(){"use strict";function t(t,e){return e={exports:{}},t(e,e.exports),e.exports}function e(t,e){var r=i.getNumbResult(t);if(!r)return t;e=e?e:{};var n=this.ch,c=this.ch_u,h=this.ch_f||"",u=this.ch_d||".",a=n.charAt(0),o=r.int,s=r.decimal,l=r.minus,f="",g="",p=l?h:"",d=function t(r,h,u){r=i.getNumbResult(r).int;var o="",s=arguments.length>1?arguments[1]:e.tenMin,l=r.length;if(1==l)return n.charAt(+r);if(l<=4)for(var f=0,g=l;g--;){var p=+r.charAt(f);o+=s&&2==l&&0==f&&1==p?"":n.charAt(p),o+=p&&g?c.charAt(g):"",f++}else{for(var d=r.length/4>>0,_=r.length%4;0==_||!c.charAt(3+d);)_+=4,d--;var A=r.substr(0,_),v=r.substr(_);o=t(A,s)+c.charAt(3+d)+("0"==v.charAt(0)?a:"")+t(v,s)}return o=i.clearZero(o,a)};if(s){s=i.clearZero(s,"0","$");for(var _=0;_<s.length;_++)g+=n.charAt(+s.charAt(_));g=g?u+g:""}if(f=d(o),e.ww&&c.length>5){var A=c.charAt(4),v=c.charAt(5),m=f.lastIndexOf(v);~m&&(f=f.substring(0,m).replace(new RegExp(v,"g"),A+A)+f.substring(m))}return p+f+g}function r(t){t=t.toString();var e=t.split(this.ch_d),r=e[0].replace(this.ch_f,""),n=e[1],c=!!~e[0].indexOf(this.ch_f),h=this.ch_u.charAt(1),u=this.ch_u.charAt(4),a=this.ch_u.charAt(5);r=r.replace(new RegExp(u+"{2}","g"),a);for(var o=r.split(""),s=0,l=0,f=[],g=[],p=[],d=0;d<o.length;d++){var _=o[d],A=0,v=0;if(~(A=this.ch.indexOf(_)))A>0&&p.unshift(A);else if(~(v=this.ch_u.indexOf(_))){var m=i.getDigit(v);s>v?(i.unshiftZero(p,m),i.centerArray(g,p)):v>=l?(0==d&&(p=[1]),i.centerArray(f,g,p),f.length>0&&i.unshiftZero(f,m),l=v):(0==p.length&&h==_&&(p=[1]),i.centerArray(g,p),i.unshiftZero(g,i.getDigit(v)),s=v)}}i.centerArray(f,g,p).reverse(),0==f.length&&f.push(0);var y=0;if(n){f.push("."),y="0.";for(var d=0;d<n.length;d++)y+=this.ch.indexOf(n.charAt(d)),f.push(this.ch.indexOf(n.charAt(d)));y=+y}return c&&f.unshift("-"),parseFloat(f.join(""))}function n(t,r){var n={ww:!0,complete:!1,outSymbol:!0},c=i.getNumbResult(t),h=this.ch.charAt(0);if(r="object"==typeof r?r:{},!c)return t;r=i.extend(n,r);var u=c.num,a=c.decimal||"",o=r.outSymbol?this.m_t:"",s=a?"":this.m_z,l="";if(r.complete){for(var f=1;f<this.m_u.length;f++)l+=e.call(this,a.charAt(f-1)||"0")+this.m_u.charAt(f);s=e.call(this,u,r)+this.m_u.charAt(0)}else{if(a=i.clearZero(a,"0","$"))for(var g,f=0;f<this.m_u.length-1;f++)a.charAt(f)&&"0"!=a.charAt(f)&&(l+=e.call(this,a.charAt(f))+this.m_u.charAt(f+1),g=!1),"0"!==a.charAt(f)||g||(0==f&&"0"==u||(l+=h),g=!0);"0"==u&&!s&&l||(s=e.call(this,u,r)+this.m_u.charAt(0)+s)}return o+s+l}function c(t,e){return{encodeS:function(e,r){return r=i.extend({ww:!0,tenMin:!0},r),h.CL.call(t,e,r)},encodeB:function(t,r){return r=i.extend({ww:!0},r),h.CL.call(e,t,r)},decodeS:function(){return h.unCL.apply(t,arguments)},decodeB:function(){return h.unCL.apply(e,arguments)},toMoney:function(t,r){return r=i.extend({ww:!0},r),h.toMoney.call(e,t,r)}}}var i=t(function(t,e){var r=/^([+-])?0*(\d+)(\.(\d+))?$/,n=/^([+-])?0*(\d+)(\.(\d+))?e(([+-])?(\d+))$/i,c=e.e2ten=function(t){var e=n.exec(t.toString());if(!e)return t;var r=e[2],c=e[4]||"",i=e[5]?+e[5]:0;if(i>0){var h=c.substr(0,i);h=h.length<i?h+new Array(i-h.length+1).join("0"):h,c=c.substr(i),r+=h}else{i=-i;var u=r.length-i;u=u<0?0:u;var a=r.substr(u,i);a=a.length<i?new Array(i-a.length+1).join("0")+a:a,r=r.substring(0,u),c=a+c}return r=""==r?"0":r,("-"==e[1]?"-":"")+r+(c?"."+c:"")};e.getNumbResult=function(t){var e=r.exec(t.toString());if(!e&&n.test(t.toString())&&(e=r.exec(c(t.toString()))),e)return{int:e[2],decimal:e[4],minus:"-"==e[1],num:e.slice(1,3).join("")}},e.centerArray=function t(e,r){if(e.splice.apply(e,[0,r.length].concat(r.splice(0,r.length))),arguments.length>2){var n=[].slice.call(arguments,2);n.unshift(e),t.apply(null,n)}return e};var i=e.hasAttr=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)};e.extend=function(t){for(var e,r=arguments[0]||{},n=Array.prototype.slice.call(arguments,1),c=0;c<n.length;c++){var h=n[c];for(e in h)i(h,e)&&(r[e]=h[e])}return r},e.getDigit=function(t){return t>=5?4*(t-4)+4:t},e.unshiftZero=function(t,e){if(null==e&&(e=1),!(e<=0))for(;e--;)t.unshift(0)},e.clearZero=function(t,e,r){if(null==t)return"";var n=~"*.?+$^[](){}|\\/".indexOf(e)?"\\"+e:e,c=new RegExp("^"+n+"+"),i=new RegExp(n+"+$"),h=new RegExp(n+"{2}","g");return t=t.toString(),"^"==r&&(t=t.replace(c,"")),r&&"$"!=r||(t=t.replace(i,"")),r&&"nto1"!=r||(t=t.replace(h,e)),t}}),h=(i.e2ten,i.getNumbResult,i.centerArray,i.hasAttr,i.extend,i.getDigit,i.unshiftZero,i.clearZero,{CL:e,unCL:r,toMoney:n}),u=c,a={ch:"零一二三四五六七八九",ch_u:"个十百千万亿",ch_f:"负",ch_d:"点"},o={ch:"零壹贰叁肆伍陆柒捌玖",ch_u:"个拾佰仟万亿",ch_f:"负",ch_d:"点",m_t:"人民币",m_z:"整",m_u:"元角分"},s={ch:"零一二三四五六七八九",ch_u:"個十百千萬億",ch_f:"負",ch_d:"點"},l={ch:"零壹貳參肆伍陸柒捌玖",ch_u:"個拾佰仟萬億",ch_f:"負",ch_d:"點",m_t:"$",m_z:"整",m_u:"圓角分"},f={s:a,b:o,hk_s:s,hk_b:l},g=function(t){this.lang=t,this.encode=function(){return h.CL.apply(t,arguments)},this.decode=function(){return h.unCL.apply(t,arguments)},this.toMoney=function(){return h.toMoney.apply(t,arguments)}};g.langs=f,g.cn=u(f.s,f.b),g.hk=u(f.hk_s,f.hk_b);var p=g;return p});
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/js/ySelect.js b/pluss-manage-page/src/main/resources/static/resources/js/ySelect.js
new file mode 100644
index 0000000..011b483
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/js/ySelect.js
@@ -0,0 +1,313 @@
+(function($) {
+    $.fn.ySelect = function(options) {
+      var defaultOptions={
+          placeholder: '请选择',
+          numDisplayed: 4,
+          overflowText: '{n} selected',
+          searchText: '搜索',
+          showSearch: true
+      }
+        if (typeof options == 'string' ) {
+          var  settings = options;
+        }
+        else {
+
+          var  settings = $.extend(true,{},defaultOptions, options);
+        }
+
+
+        /**
+         * Constructor
+         */
+        function ySelect(select, settings) {
+            this.$select = $(select);
+            this.settings = settings;
+            this.create();
+        }
+
+
+        /**
+         * Prototype class
+         */
+        ySelect.prototype = {
+            create: function() {
+                var multiple = this.$select.is('[multiple]') ? ' multiple' : '';
+                this.$select.wrap('<div class="fs-wrap' + multiple + '"></div>');
+                this.$select.before('<div class="fs-label-wrap"><div class="fs-label">' + this.settings.placeholder + '</div><span class="fs-arrow"></span></div>');
+                this.$select.before('<div class="fs-dropdown hidden"><div class="fs-options"></div></div>');
+                this.$select.addClass('hidden');
+                this.$wrap = this.$select.closest('.fs-wrap');
+                this.reload();
+            },
+
+            reload: function() {
+                if (this.settings.showSearch) {
+                    var search = '<div class="fs-search"><input type="search" placeholder="' + this.settings.searchText + '" /><span class="fs-selectAll"><i class="fa fa-check-square-o"></i></span></div>';
+                    this.$wrap.find('.fs-dropdown').prepend(search);
+                }
+                var choices = this.buildOptions(this.$select);
+                this.$wrap.find('.fs-options').html(choices);
+                this.reloadDropdownLabel();
+            },
+
+            destroy: function() {
+                this.$wrap.find('.fs-label-wrap').remove();
+                this.$wrap.find('.fs-dropdown').remove();
+                this.$select.unwrap().removeClass('hidden');
+            },
+
+            buildOptions: function($element) {
+                var $this = this;
+
+                var choices = '';
+                $element.children().each(function(i, el) {
+                    var $el = $(el);
+
+                    if ('optgroup' == $el.prop('nodeName').toLowerCase()) {
+                        choices += '<div class="fs-optgroup">';
+                        choices += '<div class="fs-optgroup-label">' + $el.prop('label') + '</div>';
+                        choices += $this.buildOptions($el);
+                        choices += '</div>';
+                    }
+                    else {
+                        var selected = $el.is('[selected]') ? ' selected' : '';
+                        choices += '<div class="fs-option' + selected + '" data-value="' + $el.prop('value') + '"><span class="fs-checkbox"><i></i></span><div class="fs-option-label">' + $el.html() + '</div></div>';
+                    }
+                });
+
+                return choices;
+            },
+
+            reloadDropdownLabel: function() {
+                var settings = this.settings;
+                var labelText = [];
+
+                this.$wrap.find('.fs-option.selected').each(function(i, el) {
+                    labelText.push($(el).find('.fs-option-label').text());
+                });
+
+                if (labelText.length < 1) {
+                    labelText = settings.placeholder;
+                }
+                else if (labelText.length > settings.numDisplayed) {
+                    labelText = settings.overflowText.replace('{n}', labelText.length);
+                }
+                else {
+                    labelText = labelText.join(', ');
+                }
+
+                this.$wrap.find('.fs-label').html(labelText);
+                this.$select.change();
+            },
+            setwrap: function() {
+              // if(settings.isCheck==false)
+              //   this.$wrap.find('.fs-dropdown').addClass('hidden');
+              return "123";
+            },
+        }
+
+
+        /**
+         * Loop through each matching element
+         */
+        return this.each(function() {
+            var data = $(this).data('ySelect');
+
+            if (!data) {
+                data = new ySelect(this, settings);
+                $(this).data('ySelect', data);
+            }
+
+            if (typeof settings == 'string') {
+                data[settings]();
+            }
+        });
+    }
+
+
+    /**
+     * Events
+     */
+    window.ySelect = {
+        'active': null,
+        'idx': -1
+    };
+
+    function setIndexes($wrap) {
+        $wrap.find('.fs-option:not(.hidden)').each(function(i, el) {
+            $(el).attr('data-index', i);
+            $wrap.find('.fs-option').removeClass('hl');
+        });
+        $wrap.find('.fs-search input').focus();
+        window.ySelect.idx = -1;
+    }
+
+    function setScroll($wrap) {
+        var $container = $wrap.find('.fs-options');
+        var $selected = $wrap.find('.fs-option.hl');
+
+        var itemMin = $selected.offset().top + $container.scrollTop();
+        var itemMax = itemMin + $selected.outerHeight();
+        var containerMin = $container.offset().top + $container.scrollTop();
+        var containerMax = containerMin + $container.outerHeight();
+
+        if (itemMax > containerMax) { // scroll down
+            var to = $container.scrollTop() + itemMax - containerMax;
+            $container.scrollTop(to);
+        }
+        else if (itemMin < containerMin) { // scroll up
+            var to = $container.scrollTop() - containerMin - itemMin;
+            $container.scrollTop(to);
+        }
+    }
+
+    $(document).on('click', '.fs-selectAll', function() {
+        $(this).parent().next().find('.fs-option.selected').click();
+        $(this).parent().next().find('.fs-option').click();
+        $(this).addClass('selected');
+    });
+    $(document).on('click', '.fs-selectAll.selected', function() {
+        $(this).parent().next().find('.fs-option.selected').click();
+        $(this).removeClass('selected');
+    });
+
+    $(document).on('click', '.fs-option', function() {
+        var $wrap = $(this).closest('.fs-wrap');
+
+        if ($wrap.hasClass('multiple')) {
+            var selected = [];
+
+            $(this).toggleClass('selected');
+            $wrap.find('.fs-option.selected').each(function(i, el) {
+                selected.push($(el).attr('data-value'));
+            });
+        }
+        else {
+            var selected = $(this).attr('data-value');
+            $wrap.find('.fs-option').removeClass('selected');
+            $(this).addClass('selected');
+            $wrap.find('.fs-dropdown').hide();
+        }
+
+        $wrap.find('select').val(selected);
+        $wrap.find('select').ySelect('reloadDropdownLabel');
+        $wrap.find('select').ySelect('setwrap');
+    });
+    $(document).on('keyup', '.fs-search input', function(e) {
+        if (40 == e.which) {
+            $(this).blur();
+            return;
+        }
+
+        var $wrap = $(this).closest('.fs-wrap');
+        var keywords = $(this).val();
+
+        $wrap.find('.fs-option, .fs-optgroup-label').removeClass('hidden');
+
+        if ('' != keywords) {
+            $wrap.find('.fs-option').each(function() {
+                var regex = new RegExp(keywords, 'gi');
+                if (null === $(this).find('.fs-option-label').text().match(regex)) {
+                    $(this).addClass('hidden');
+                }
+            });
+
+            $wrap.find('.fs-optgroup-label').each(function() {
+                var num_visible = $(this).closest('.fs-optgroup').find('.fs-option:not(.hidden)').length;
+                if (num_visible < 1) {
+                    $(this).addClass('hidden');
+                }
+            });
+        }
+
+        setIndexes($wrap);
+    });
+
+    $(document).on('click', function(e) {
+        var $el = $(e.target);
+        var $wrap = $el.closest('.fs-wrap');
+
+        if (0 < $wrap.length) {
+            if ($el.hasClass('fs-label')||$el.hasClass('fs-arrow')) {
+                window.ySelect.active = $wrap;
+                var is_hidden = $wrap.find('.fs-dropdown').hasClass('hidden');
+                $('.fs-dropdown').addClass('hidden');
+
+                if (is_hidden) {
+                    $wrap.find('.fs-dropdown').removeClass('hidden');
+                }
+                else {
+                    $wrap.find('.fs-dropdown').addClass('hidden');
+                }
+
+                setIndexes($wrap);
+            }
+        }
+        else {
+            $('.fs-dropdown').addClass('hidden');
+            window.ySelect.active = null;
+        }
+    });
+
+    $(document).on('keydown', function(e) {
+        var $wrap = window.ySelect.active;
+
+        if (null === $wrap) {
+            return;
+        }
+        else if (38 == e.which) { // up
+            e.preventDefault();
+
+            $wrap.find('.fs-option').removeClass('hl');
+
+            if (window.ySelect.idx > 0) {
+                window.ySelect.idx--;
+                $wrap.find('.fs-option[data-index=' + window.ySelect.idx + ']').addClass('hl');
+                setScroll($wrap);
+            }
+            else {
+                window.ySelect.idx = -1;
+                $wrap.find('.fs-search input').focus();
+            }
+        }
+        else if (40 == e.which) { // down
+            e.preventDefault();
+
+            var last_index = $wrap.find('.fs-option:last').attr('data-index');
+            if (window.ySelect.idx < parseInt(last_index)) {
+                window.ySelect.idx++;
+                $wrap.find('.fs-option').removeClass('hl');
+                $wrap.find('.fs-option[data-index=' + window.ySelect.idx + ']').addClass('hl');
+                setScroll($wrap);
+            }
+        }
+        else if (32 == e.which || 13 == e.which) { // space, enter
+            $wrap.find('.fs-option.hl').click();
+        }
+        else if (27 == e.which) { // esc
+            $('.fs-dropdown').addClass('hidden');
+            window.ySelect.active = null;
+        }
+    });
+
+    //update by ycx,for this plugin to get selected values
+    $.fn.ySelectedValues=function (splitString)
+      {
+        var result="";
+        var $selects=this.find("option:selected");
+        for (var i = 0; i < $selects.length; i++) {
+          result+=$selects[i].value+((i==$selects.length-1)?"":splitString);
+        }
+        return result;
+      }
+    $.fn.ySelectedTexts=function (splitString)
+      {
+        var result="";
+        var $selects=this.find("option:selected");
+        for (var i = 0; i < $selects.length; i++) {
+          result+=$selects[i].text+((i==$selects.length-1)?"":splitString);
+        }
+        return result;
+      }
+
+})(jQuery);
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiExtension/dropdown.css b/pluss-manage-page/src/main/resources/static/resources/layuiExtension/dropdown.css
new file mode 100644
index 0000000..df63efc
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiExtension/dropdown.css
@@ -0,0 +1,7 @@
+/**
+ * layui.mDropdown
+ * v2.3.2
+ * by Microanswer
+ * http://layuidropdown.microanswer.cn/
+ **/
+html #layuicss-dropdown_css{display:none;position:absolute;width:1989px}.dropdown-root{position:fixed;outline:0;overflow:hidden}.dropdown-pointer{width:0;height:0;position:absolute;display:block;overflow:hidden;background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgBAMAAABQs2O3AAAAAXNSR0IB2cksfwAAAAlwSFlzAAAOxAAADsQBlSsOGwAAABVQTFRFAAAAgICAgICAgICAhISE8PDw////jUnEegAAAAd0Uk5TAB/2/////74r3wgAAACOSURBVHicfcztDYAgDEVR2MCwgXEDwwbGDYwbyP4jyJfYlvbdvzc5zrH8ti8OFeKxou+384JEiPeDiAykhIgMpASICiCiAoDogE10wCQGYBEDMAgC6AQBVIIBGsEAhRDATAhgIiZAEhMgCAXghAIwQgUooQKEMICfMIBBmMBHmEAnANAIADQCAYVwCCjEC5fhzAE36RUGAAAAAElFTkSuQmCC) bottom center no-repeat;background-size:100% 50%;-webkit-transform-origin:center center;-moz-transform-origin:center center;-ms-transform-origin:center center;-o-transform-origin:center center;transform-origin:center center}.dropdown-pointer.bottom{-webkit-transform:rotate(-180deg);-moz-transform:rotate(-180deg);-ms-transform:rotate(-180deg);-o-transform:rotate(-180deg);transform:rotate(-180deg)}.dropdown-root .dropdown-content{background-color:#fff;border-radius:3px;box-shadow:1px 1px 5px #979797;overflow-x:auto;overflow-y:hidden}.dropdown-root .dropdown-content .dropdown-content-table .dropdown-content-thead{display:table-header-group}.dropdown-root .dropdown-content .dropdown-content-table .dropdown-content-tbody{display:table-row-group}.dropdown-root .dropdown-content .dropdown-content-table .dropdown-content-tr{display:table-row}.dropdown-root .dropdown-content .dropdown-content-table,.dropdown-root .dropdown-content .dropdown-content-table .dropdown-content-td,.dropdown-root .dropdown-content .dropdown-content-table .dropdown-content-th{display:table-cell;border:unset;text-align:unset;font-weight:400;min-height:unset;font-size:12px;line-height:12px;padding-top:0;padding-bottom:0}.dropdown-root .dropdown-content .dropdown-content-table .dropdown-content-th{font-weight:700}.dropdown-root .dropdown-content .dropdown-content-table .dropdown-content-tr,.dropdown-root .dropdown-content .dropdown-content-table .dropdown-content-tr:hover{background-color:unset}.dropdown-root .dropdown-content .dropdown-menu-wrap{border-right:1px solid transparent;overflow-y:auto;overflow-x:hidden}.dropdown-root .dropdown-content .dropdown-menu-fixed-head{border-right:1px solid transparent;overflow:hidden}.dropdown-root .dropdown-content .dropdown-menu-fixed-head .menu-fixed-head{margin:6px 14px 2px;color:#a8a8a8;font-size:12px}.dropdown-root .dropdown-content .dropdown-menu-fixed-head.menu-splitor,.dropdown-root .dropdown-content .dropdown-menu-wrap.menu-splitor{border-right:1px solid #D9D9D9}.dropdown-root .dropdown-content .dropdown-menu-wrap.overflowauto{overflow-y:auto;overflow-x:hidden}.dropdown-root .dropdown-content .dropdown-menu-wrap .dropdown-menu{padding:0;margin:0}.dropdown-root .dropdown-content .dropdown-menu-wrap .dropdown-menu .menu-item-wrap{list-style:none;outline:0}.dropdown-root .dropdown-content .dropdown-menu-wrap .dropdown-menu .menu-item-wrap:first-child{margin-top:10px}.dropdown-root .dropdown-content .dropdown-menu-wrap .dropdown-menu .menu-item-wrap.nomargin{margin-top:0!important}.dropdown-root .dropdown-content .dropdown-menu-wrap .dropdown-menu .menu-item-wrap:last-child{margin-bottom:10px}.dropdown-root .dropdown-content .dropdown-menu-wrap .dropdown-menu .menu-item-wrap .menu-header{margin-top:6px}.dropdown-root .dropdown-content .dropdown-menu-wrap .dropdown-menu .menu-item-wrap .menu-header.withLine{margin-left:0;margin-bottom:0;margin-right:0}.dropdown-root .dropdown-content .dropdown-menu-wrap .dropdown-menu .menu-item-wrap .menu-header,.dropdown-root .dropdown-content .dropdown-menu-wrap .dropdown-menu .menu-item-wrap .menu-header legend{font-size:12px!important;line-height:15px!important;padding:0 14px!important;color:#a8a8a8}.dropdown-root .dropdown-content .dropdown-menu-wrap .dropdown-menu .menu-item-wrap .menu-item{line-height:36px}.dropdown-root .dropdown-content .dropdown-menu-wrap .dropdown-menu .menu-item-wrap .menu-item a{display:block;color:#333;padding:0 20px;min-width:40px;text-indent:0;font-size:14px;white-space:nowrap}.dropdown-root .dropdown-content .dropdown-menu-wrap .dropdown-menu .menu-item-wrap .menu-item a:hover{background-color:#D9D9D9}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiExtension/mDropdown.js b/pluss-manage-page/src/main/resources/static/resources/layuiExtension/mDropdown.js
new file mode 100644
index 0000000..891e945
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiExtension/mDropdown.js
@@ -0,0 +1,7 @@
+/**
+ * layui.mDropdown
+ * v2.3.2
+ * by Microanswer
+ * http://layuidropdown.microanswer.cn/
+ **/
+layui.define(["jquery","laytpl"],function(i){var s=layui.jquery||layui.$,r=layui.laytpl,e="a",d={},c="1",u="2",m="3";function f(i){if(!i)throw new Error("菜单条目内必须填写内容。");if("hr"===i)return"hr";if(0!==i.indexOf("{"))throw new Error("除了分割线hr，别的菜单条目都必须保证是合格的Javascript对象或json对象。");return new Function("return "+i)()}function a(i){if(i&&0<i.length){for(var n=0,t=new Array(i.length),o=0;o<i.length;o++)for(var e=i[o],d=0;d<e.length;d++)e[d].header&&e[d].fixed&&(n++,t[o]=e[d],e.splice(d,1),d--);if(0<n)return t}return null}var l=window.MICROANSWER_DROPDOWAN||"dropdown",p="<div tabindex='0' class='layui-anim layui-anim-upbit dropdown-root' "+l+"-id='{{d.downid}}' style='display: none;z-index: {{d.zIndex}}'>{{# if (d.arrow){ }}<div class='dropdown-pointer'></div>{{# } }}<div class='dropdown-content' style='margin: {{d.gap}}px {{d.gap}}px;background-color: {{d.backgroundColor}};min-width: {{d.minWidth}}px;max-width: {{d.maxWidth}}px;min-height: {{d.minHeight}}px;max-height: {{d.maxHeight}}px;white-space: {{d.nowrap?\"nowrap\":\"normal\"}}'>",h="</div></div>",w=p+"<div class='dropdown-content-table' cellpadding='0' cellspacing='0'>{{# if (d.fixHeaders && d.fixHeaders.length > 0){ }}<div class='dropdown-content-thead'><div class='dropdown-content-tr'>{{# layui.each(d.fixHeaders, function(i, fixHeader){ }}{{# if (fixHeader) { }}<div class='dropdown-content-th'><div class='dropdown-menu-fixed-head {{(d.menuSplitor && i < (d.menus.length-1))?\"menu-splitor\":\"\"}}'><div class='menu-fixed-head' style='text-align: {{fixHeader.align||\"center\"}}'>{{fixHeader.header}}</div></div></div>{{# } else { }}<th><div class='dropdown-menu-fixed-head {{(d.menuSplitor && i < (d.menus.length-1))?\"menu-splitor\":\"\"}}'><div class='menu-fixed-head'>&nbsp;</div></div></th>{{# } }}{{# }); }}</div></div>{{# } }}<div class='dropdown-content-tbody'><div class='dropdown-content-tr'>{{# layui.each(d.menus, function(i, menu){ }}<div class='dropdown-content-td' valign='top'><div class='dropdown-menu-wrap {{(d.menuSplitor && i < (d.menus.length-1))?\"menu-splitor\":\"\"}} overflowauto' style='min-height: {{d.minHeight}}px;max-height: {{d.maxHeight - ((d.fixHeaders)?24:0)}}px;'><ul class='dropdown-menu' style=''>{{# layui.each(menu, function(index, item){ }}<li class='menu-item-wrap {{(d.fixHeaders && d.fixHeaders.length) > 0?\"nomargin\":\"\"}}'>{{# if ('hr' === item) { }}<hr>{{# } else if (item.header) { }}{{# if (item.withLine) { }}<fieldset class=\"layui-elem-field layui-field-title menu-header withLine\"><legend>{{item.header}}</legend></fieldset>{{# } else { }}<div class='menu-header' style='text-align: {{item.align||\"left\"}}'>{{item.header}}</div>{{# } }}{{# } else { }}<div class='menu-item'><a href='javascript:;' lay-event='{{item.event}}'>{{# if (item.layIcon){ }}<i class='layui-icon {{item.layIcon}}'></i>&nbsp;{{# } }}<span class='{{item.txtClass||\"\"}}'>{{item.txt}}</span></a></div>{{# } }}</li>{{# }); }}</ul></div></div>{{#});}}</div></div></div>"+h,t={menus:[],templateMenu:"",template:"",showBy:"click",align:"left",minWidth:80,maxWidth:500,minHeight:10,maxHeight:400,zIndex:891,gap:8,onHide:function(i,n){},onShow:function(i,n){},scrollBehavior:"follow",backgroundColor:"#FFF",cssLink:"https://cdn.jsdelivr.net/gh/microanswer/layui.mDropdown@2.3.2/dist/dropdown.css",immed:!1,arrow:!0,templateMenuSptor:"[]",menuSplitor:!0};function v(i,n){"string"==typeof i&&(i=s(i)),this.$dom=i,this.option=s.extend({downid:String(Math.random()).split(".")[1],filter:i.attr("lay-filter")},t,n),20<this.option.gap&&(this.option.gap=20),this.init()}function o(i,o){s(i||"[lay-"+l+"]").each(function(){var i=s(this),n=new Function("return "+(i.attr("lay-"+l)||"{}"))();i.removeAttr("lay-"+l);var t=i.data(l)||new v(i,s.extend({},n,o||{}));i.data(l,t)})}window[l+"_useOwnCss"]||layui.link(window[l+"_cssLink"]||t.cssLink,function(){},l+"_css"),v.prototype.init=function(){var n=this,i=!1;if(n.option.menus&&0<n.option.menus.length){i=!0;var t=n.option.menus[0];Array.isArray(t)||(n.option.menus=[n.option.menus]),n.option.fixHeaders=a(n.option.menus),n.option.nowrap=!0,r(w).render(n.option,function(i){n.downHtml=i,n.initEvent()})}else if(n.option.templateMenu){var o;i=!0,o=-1===n.option.templateMenu.indexOf("#")?"#"+n.option.templateMenu:n.option.templateMenu;var e=s.extend(s.extend({},n.option),n.option.data||{});r(s(o).text()).render(e,function(i){n.option.menus=function(i,n){if(!i)return"";if(!n)throw new Error("请指定菜单模板限定符。");for(var t,o,e=n.charAt(0),d=n.charAt(1),s=i.length,r=0,a=c,l=!1,p=[];r<s;){var h=i.charAt(r);a!==c||l?a!==u||l?a===m&&(l?(o.srcStr+=h,l=!1):"\\"===h?l=!0:h===d?(o=f(o.srcStr),t.push(o),a=u):o.srcStr+=h):e===h?(o={srcStr:""},a=m):d===h&&(a=c):e===h&&(t=[],p.push(t),a=u),r+=1}return p}(i,n.option.templateMenuSptor),n.option.fixHeaders=a(n.option.menus),n.option.nowrap=!0,r(w).render(n.option,function(i){n.downHtml=i,n.initEvent()})})}else if(n.option.template){var d;i=!0,d=-1===n.option.template.indexOf("#")?"#"+n.option.template:n.option.template,(e=s.extend(s.extend({},n.option),n.option.data||{})).nowrap=!1,r(p+s(d).html()+h).render(e,function(i){n.downHtml=i,n.initEvent()})}else layui.hint().error("下拉框目前即没配置菜单项，也没配置下拉模板。[#"+(n.$dom.attr("id")||"")+",filter="+n.option.filter+"]");i&&this.option.immed&&this.downHtml&&this.show()},v.prototype.initSize=function(){if(this.$down&&(this.$down.find(".dropdown-pointer").css({width:2*this.option.gap,height:2*this.option.gap}),!this._sized)){var i=0;this.$down.find(".dropdown-menu-wrap").each(function(){i=Math.max(i,s(this).height())}),this.$down.find(".dropdown-menu-wrap").css({height:i}),this._sized=!0}},v.prototype.initPosition=function(){if(this.$down){var i,n,t,o,e=this.$dom.offset(),d=this.$dom.outerHeight(),s=this.$dom.outerWidth(),r=e.left,a=e.top-window.pageYOffset,l=this.$down.outerHeight(),p=this.$down.outerWidth();n=d+a,(i="right"===this.option.align?r+s-p+this.option.gap:"center"===this.option.align?r+(s-p)/2:r-this.option.gap)+p>=window.innerWidth&&(i=window.innerWidth-p-2*this.option.gap),t=i<r?s<p?r-i+s/2:p/2:s<p?i+(r+s-i)/2:p/2,t-=this.option.gap;var h=this.$arrowDom;o=-this.option.gap,h.css("left",t),h.css("right","unset"),n+l>=window.innerHeight?(n=a-l,o=l-this.option.gap,h.css("top",o).addClass("bottom")):h.css("top",o).removeClass("bottom"),this.$down.css("left",i),this.$down.css("top",n)}},v.prototype.show=function(){var t,i,n=this,o=!1;n.$down||(n.$down=s(n.downHtml),n.$dom.after(n.$down),n.$arrowDom=n.$down.find(".dropdown-pointer"),o=!0),n.initPosition(),n.opening=!0,setTimeout(function(){n.$down.focus()},100),n.$down.addClass("layui-show"),n.initSize(),n.opened=!0,o&&n.initDropdownEvent(),t=n,i=d[e]||[],s.each(i,function(i,n){n(t)}),o&&n.onSuccess(),n.option.onShow&&n.option.onShow(n.$dom,n.$down)},v.prototype.hide=function(){this.opened&&(this.fcd=!1,this.$down.removeClass("layui-show"),this.opened=!1,this.option.onHide&&this.option.onHide(this.$dom,this.$down))},v.prototype.hideWhenCan=function(){this.mic||this.opening||this.fcd||this.hide()},v.prototype.toggle=function(){this.opened?this.hide():this.show()},v.prototype.onSuccess=function(){this.option.success&&this.option.success(this.$down)},v.prototype._onScroll=function(){var i=this;i.opened&&("follow"===this.option.scrollBehavior?setTimeout(function(){i.initPosition()},1):this.hide())},v.prototype.initEvent=function(){var i,n,t,o=this;n=function(i){i!==o&&o.hide()},(t=d[i=e]||[]).push(n),d[i]=t,s(window).on("scroll",function(){o._onScroll()}),o.$dom.parents().on("scroll",function(){o._onScroll()}),s(window).on("resize",function(){o.opened&&o.initPosition()}),o.initDomEvent()},v.prototype.initDomEvent=function(){var i=this;i.$dom.mouseenter(function(){i.mic=!0,"hover"===i.option.showBy&&(i.fcd=!0,i.show())}),i.$dom.mouseleave(function(){i.mic=!1}),"click"===i.option.showBy&&i.$dom.on("click",function(){i.fcd=!0,i.toggle()}),i.$dom.on("blur",function(){i.fcd=!1,i.hideWhenCan()})},v.prototype.initDropdownEvent=function(){var o=this;o.$down.find(".dropdown-menu-wrap").on("mousewheel",function(i){var n=s(this);(i=i||window.event).cancelable=!0,i.cancelBubble=!0,i.preventDefault(),i.stopPropagation(),i.stopImmediatePropagation&&i.stopImmediatePropagation(),i.returnValue=!1,o.scrolling&&n.finish();var t=-i.originalEvent.wheelDelta||i.originalEvent.detail;0<t?(50<t&&(t=50),o.scrolling=!0,n.animate({scrollTop:n.scrollTop()+t},{duration:170,complete:function(){o.scrolling=!1}})):t<0?(t<-50&&(t=-50),o.scrolling=!0,n.animate({scrollTop:n.scrollTop()+t},{duration:170,complete:function(){o.scrolling=!1}})):o.scrolling=!1}),o.$down.mouseenter(function(){o.mic=!0,o.$down.focus()}),o.$down.mouseleave(function(){o.mic=!1}),o.$down.on("blur",function(){o.fcd=!1,o.hideWhenCan()}),o.$down.on("focus",function(){o.opening=!1}),o.option.menus&&s("["+l+"-id='"+o.option.downid+"']").on("click","a",function(){var i=(s(this).attr("lay-event")||"").trim();i?(layui.event.call(this,l,l+"("+o.option.filter+")",i),o.hide()):layui.hint().error("菜单条目["+this.outerHTML+"]未设置event。")})},o(),i(l,{suite:o,onFilter:function(i,n){layui.onevent(l,l+"("+i+")",function(i){n&&n(i)})},hide:function(i){s(i).each(function(){var i=s(this).data(l);i&&i.hide()})},show:function(n,t){s(n).each(function(){var i=s(this).data(l);i?i.show():(layui.hint().error("警告：尝试在选择器【"+n+"】上进行下拉框show操作，但此选择器对应的dom并没有初始化下拉框。"),(t=t||{}).immed=!0,o(n,t))})},version:"2.3.2"})});
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiExtension/readme.md b/pluss-manage-page/src/main/resources/static/resources/layuiExtension/readme.md
new file mode 100644
index 0000000..0ca73f5
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiExtension/readme.md
@@ -0,0 +1,7 @@
+![下拉框首页图](https://file.microanswer.cn/home_of_layuidropdown.png)
+
+- [控件首页](http://layuidropdown.microanswer.cn/?layuizip)
+- [立即体验](http://test.microanswer.cn/page/dropdown.html?layuizip)
+- [使用文档](https://www.microanswer.cn/blog/74?layuizip)
+
+by [Microanswer](https://www.microanswer.cn?layuizip).
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/config.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/config.js
new file mode 100644
index 0000000..e91167b
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/config.js
@@ -0,0 +1,111 @@
+/**
+
+ @Name：layuiAdmin iframe版全局配置
+ @Author：贤心
+ @Site：http://www.layui.com/admin/
+ @License：LPPL（layui付费产品协议）
+    
+ */
+ 
+layui.define(['laytpl', 'layer', 'element', 'util'], function(exports){
+  exports('setter', {
+    container: 'LAY_app' //容器ID
+    ,base: layui.cache.base //记录静态资源所在路径
+    ,views: layui.cache.base + 'tpl/' //动态模板所在目录
+    ,entry: 'index' //默认视图文件名
+    ,engine: '.html' //视图文件后缀名
+    ,pageTabs: true //是否开启页面选项卡功能。iframe版推荐开启
+    
+    ,name: 'layuiAdmin'
+    ,tableName: 'layuiAdmin' //本地存储表名
+    ,MOD_NAME: 'admin' //模块事件名
+    
+    ,debug: true //是否开启调试模式。如开启，接口异常时会抛出异常 URL 等信息
+
+    //自定义请求字段
+    ,request: {
+      tokenName: false //自动携带 token 的字段名（如：access_token）。可设置 false 不携带。
+    }
+    
+    //自定义响应字段
+    ,response: {
+      statusName: 'code' //数据状态的字段名称
+      ,statusCode: {
+        ok: 0 //数据状态一切正常的状态码
+        ,logout: 1001 //登录状态失效的状态码
+      }
+      ,msgName: 'msg' //状态信息的字段名称
+      ,dataName: 'data' //数据详情的字段名称
+    }
+    
+    //扩展的第三方模块
+    ,extend: [
+      'echarts', //echarts 核心包
+      'echartsTheme' //echarts 主题
+    ]
+    
+    //主题配置
+    ,theme: {
+      //内置主题配色方案
+      color: [{
+        main: '#20222A' //主题色
+        ,selected: '#009688' //选中色
+        ,alias: 'default' //默认别名
+      },{
+        main: '#03152A'
+        ,selected: '#3B91FF'
+        ,alias: 'dark-blue' //藏蓝
+      },{
+        main: '#2E241B'
+        ,selected: '#A48566'
+        ,alias: 'coffee' //咖啡
+      },{
+        main: '#50314F'
+        ,selected: '#7A4D7B'
+        ,alias: 'purple-red' //紫红
+      },{
+        main: '#344058'
+        ,logo: '#1E9FFF'
+        ,selected: '#1E9FFF'
+        ,alias: 'ocean' //海洋
+      },{
+        main: '#3A3D49'
+        ,logo: '#2F9688'
+        ,selected: '#5FB878'
+        ,alias: 'green' //墨绿
+      },{
+        main: '#20222A'
+        ,logo: '#F78400'
+        ,selected: '#F78400'
+        ,alias: 'red' //橙色
+      },{
+        main: '#28333E'
+        ,logo: '#AA3130'
+        ,selected: '#AA3130'
+        ,alias: 'fashion-red' //时尚红
+      },{
+        main: '#24262F'
+        ,logo: '#3A3D49'
+        ,selected: '#009688'
+        ,alias: 'classic-black' //经典黑
+      },{
+        logo: '#226A62'
+        ,header: '#2F9688'
+        ,alias: 'green-header' //墨绿头
+      },{
+        main: '#344058'
+        ,logo: '#0085E8'
+        ,selected: '#1E9FFF'
+        ,header: '#1E9FFF'
+        ,alias: 'ocean-header' //海洋头
+      },{
+        header: '#393D49'
+        ,alias: 'classic-black-header' //经典黑头
+      }]
+      
+      //初始的颜色索引，对应上面的配色方案数组索引
+      //如果本地已经有主题色记录，则以本地记录为优先，除非请求本地数据（localStorage）
+      ,initColorIndex: 0
+    }
+  });
+});
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/console/prograss.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/console/prograss.js
new file mode 100644
index 0000000..13a093b
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/console/prograss.js
@@ -0,0 +1,36 @@
+{
+  "code": 0
+  ,"msg": ""
+  ,"count": "100"
+  ,"data": [{
+    "prograss": "开会"
+    ,"time": "一小时"
+    ,"complete": "已完成"
+    ,"LAY_CHECKED": true
+  },{
+    "prograss": "项目开发"
+    ,"time": "两小时"
+    ,"complete": "进行中"
+    ,"LAY_CHECKED": true
+  },{
+    "prograss": "陪吃饭"
+    ,"time": "一小时"
+    ,"complete": "未完成"
+  },{
+    "prograss": "修改小bug"
+    ,"time": "半小时"
+    ,"complete": "未完成"
+  },{
+    "prograss": "修改大bug"
+    ,"time": "两小时"
+    ,"complete": "未完成"
+  },{
+    "prograss": "修改小bug"
+    ,"time": "半小时"
+    ,"complete": "未完成"
+  },{
+    "prograss": "修改大bug"
+    ,"time": "两小时"
+    ,"complete": "未完成"
+  }]
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/console/top-card.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/console/top-card.js
new file mode 100644
index 0000000..51ee9bb
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/console/top-card.js
@@ -0,0 +1,76 @@
+{
+  "code": 0
+  ,"msg": ""
+  ,"count": "100"
+  ,"data": [{
+    "id": 111
+    ,"title": "社区开始接受 “赞助商广告” 投放"
+    ,"username": "贤心"
+    ,"channel": "公告"
+    ,"href": "http://fly.layui.com/jie/15697/"
+    ,"crt": 61632
+  },{
+    "id": 222
+    ,"title": "layui 一周年"
+    ,"username": "猫吃"
+    ,"channel": "讨论"
+    ,"href": "http://fly.layui.com/jie/16622/"
+    ,"crt": 61632
+  },{
+    "id": 333
+    ,"title": "四个月的前端"
+    ,"username": "fd"
+    ,"channel": "分享"
+    ,"href": "http://fly.layui.com/jie/16651/"
+    ,"crt": 61632
+  },{
+    "id": 333
+    ,"title": "如何评价LayUI和他的作者闲心"
+    ,"username": "纸飞机"
+    ,"channel": "提问"
+    ,"href": "http://fly.layui.com/jie/9352/"
+    ,"crt": 61632
+  },{
+    "id": 333
+    ,"title": "如何评价LayUI和他的作者闲心"
+    ,"username": "纸飞机"
+    ,"channel": "提问"
+    ,"href": "http://fly.layui.com/jie/9352/"
+    ,"crt": 61632
+  },{
+    "id": 333
+    ,"title": "如何评价LayUI和他的作者闲心"
+    ,"username": "纸飞机"
+    ,"channel": "提问"
+    ,"href": "http://fly.layui.com/jie/9352/"
+    ,"crt": 61632
+  },{
+    "id": 333
+    ,"title": "如何评价LayUI和他的作者闲心"
+    ,"username": "纸飞机"
+    ,"channel": "提问"
+    ,"href": "http://fly.layui.com/jie/9352/"
+    ,"crt": 61632
+  },{
+    "id": 333
+    ,"title": "如何评价LayUI和他的作者闲心"
+    ,"username": "纸飞机"
+    ,"channel": "提问"
+    ,"href": "http://fly.layui.com/jie/9352/"
+    ,"crt": 61632
+  },{
+    "id": 333
+    ,"title": "如何评价LayUI和他的作者闲心"
+    ,"username": "纸飞机"
+    ,"channel": "提问"
+    ,"href": "http://fly.layui.com/jie/9352/"
+    ,"crt": 61632
+  },{
+    "id": 333
+    ,"title": "如何评价LayUI和他的作者闲心"
+    ,"username": "纸飞机"
+    ,"channel": "提问"
+    ,"href": "http://fly.layui.com/jie/9352/"
+    ,"crt": 61632
+  }]
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/console/top-search.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/console/top-search.js
new file mode 100644
index 0000000..9750e5e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/console/top-search.js
@@ -0,0 +1,46 @@
+{
+  "code": 0
+  ,"msg": ""
+  ,"count": "100"
+  ,"data": [{
+    "keywords": "贤心是男是女"
+    ,"frequency": 8520
+    ,"userNums": 2216
+  },{
+    "keywords": "Java程序员能找到女朋友吗"
+    ,"frequency": 666
+    ,"userNums": 333
+  },{
+    "keywords": "此表格是静态模拟数据"
+    ,"frequency": 666
+    ,"userNums": 333
+  },{
+    "keywords": "layui官方教程"
+    ,"frequency": 666
+    ,"userNums": 333
+  },{
+    "keywords": "layui官方教程"
+    ,"frequency": 666
+    ,"userNums": 333
+  },{
+    "keywords": "layui官方教程"
+    ,"frequency": 666
+    ,"userNums": 333
+  },{
+    "keywords": "layui官方教程"
+    ,"frequency": 666
+    ,"userNums": 333
+  },{
+    "keywords": "layui官方教程"
+    ,"frequency": 666
+    ,"userNums": 333
+  },{
+    "keywords": "layui官方教程"
+    ,"frequency": 666
+    ,"userNums": 333
+  },{
+    "keywords": "layui官方教程"
+    ,"frequency": 666
+    ,"userNums": 333
+  }]
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/content/comment.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/content/comment.js
new file mode 100644
index 0000000..45b8c3f
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/content/comment.js
@@ -0,0 +1,56 @@
+{
+  "code": 0
+  ,"msg": ""
+  ,"count": "100"
+  ,"data": [{
+    "id": "001"
+    ,"reviewers": "赵"
+    ,"content": "我又爱上编程了"
+    ,"commtime": 20160312
+  },{
+    "id": "002"
+    ,"reviewers": "钱"
+    ,"content": "女生出门要小心"
+    ,"commtime": 20160821
+  },{
+    "id": "003"
+    ,"reviewers": "孙"
+    ,"content": "框架就用layui"
+    ,"commtime": 20161212
+  },{
+    "id": "004"
+    ,"reviewers": "李"
+    ,"content": "心姐么么哒" 
+    ,"commtime": 20170311
+  },{
+    "id": "005"
+    ,"reviewers": "周"
+    ,"content": "希望明天是个好天气"
+    ,"commtime": 20170612
+  },{
+    "id": "006"
+    ,"reviewers": "吴"
+    ,"content": "我又爱上编程了"
+    ,"commtime": 20171112
+  },{
+    "id": "007"
+    ,"reviewers": "郑"
+    ,"content": "女生出门要小心"
+    ,"commtime": 20171230
+  },{
+    "id": "008"
+    ,"reviewers": "王"
+    ,"content": "框架就用layui"
+    ,"commtime": 20180112
+  },{
+    "id": "009"
+    ,"reviewers": "冯"
+    ,"content": "心姐么么哒"
+    ,"commtime": 20180221
+  },{
+    "id": "010"
+    ,"reviewers": "陈"
+    ,"content": "希望明天是个好天气"
+    ,"commtime": 20180312
+  }]
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/content/list.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/content/list.js
new file mode 100644
index 0000000..b70f3e7
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/content/list.js
@@ -0,0 +1,62 @@
+{
+  "code": 0
+  ,"msg": ""
+  ,"count": "100"
+  ,"data": [{
+    "id": "001"
+    ,"label": "美食"
+    ,"title": "舌尖上的中国第一季"
+    ,"author": "作者-1"
+    ,"content": "通过中华美食的多个侧面，来展现食物给中国人生活带来的仪式、伦理等方面的文化；见识中国特色食材以及与食物相关、构成中国美食特有气质的一系列元素；了解中华饮食文化的精致和源远流长"
+    ,"uploadtime": 20121204
+    ,"status": true
+  },{
+    "id": "002"
+    ,"label": "美食"
+    ,"title": "舌尖上的中国第二季"
+    ,"author": "作者-2"
+    ,"content": "以食物为窗口，读懂中国——通过美食，使人们可以有滋有味地认知这个古老的东方国度。“一方水土一方人”，本片将通过展示人们日常生活中与美食相关的多重侧面，描绘与感知中国人的文化传统、家族观念、生活态度与故土难离。人们收获、保存、烹饪、生产美食，并在其过程中留存和传承食物所承载的味觉记忆、饮食习俗、文化样态与家常情感。"
+    ,"uploadtime": 20141204
+    ,"status": false
+  },{
+    "id": "003"
+    ,"label": "美食"
+    ,"title": "舌尖上的中国第三季"
+    ,"author": "作者-3"
+    ,"content": "以食物为窗口，读懂中国——通过美食，使人们可以有滋有味地认知这个古老的东方国度。“一方水土一方人”，本片将通过展示人们日常生活中与美食相关的多重侧面，描绘与感知中国人的文化传统、家族观念、生活态度与故土难离。人们收获、保存、烹饪、生产美食，并在其过程中留存和传承食物所承载的味觉记忆、饮食习俗、文化样态与家常情感将世界美食和中国美食进行比照。春耕、夏耘、秋收、冬藏，天人合一的东方哲学让中国饮食依时而变，智慧灵动，中医营养摄生学说创造了食材运用的新天地，儒家人伦道德则把心意和家的味道端上我们的餐桌。淘洗历史，糅合时光，一代又一代的中国人在天地间升起烟火，用至精至诚的心意烹制食物，一餐一食之间，中国人展示个性，确认归属，构建文明，理解和把握着世界的奥妙。"
+    ,"uploadtime": 20161204
+    ,"status": false
+  },{
+    "id": "004"
+    ,"label": "历史"
+    ,"title": "诸葛亮骂王朗"
+    ,"author": "作者-1"
+    ,"content": "皓首匹夫！苍髯老贼！你即将命归于九泉之下，届时，有何面目见汉朝二十四代先帝？二臣贼子！你枉活七十有六，一生未立寸功，只会摇唇舞舌，助曹为虐！一条断脊之犬，还敢在我军阵前狺狺狂吠！我从未见过如此厚颜无耻之人！！！"
+    ,"uploadtime": 20180201
+    ,"status": false
+  },{
+    "id": "005"
+    ,"label": "新闻"
+    ,"title": "新时代特色中国梦"
+    ,"author": "作者-1"
+    ,"content": "今天，我们比历史上任何时期都更接近、更有信心和能力实现中华民族伟大复兴的目标。新时代已经到来，蓝图已经绘就，中国梦离我们越来越近了。"
+    ,"uploadtime": 20180512
+    ,"status": false
+  },{
+    "id": "006"
+    ,"label": "新闻"
+    ,"title": "新时代特色中国梦"
+    ,"author": "作者-2"
+    ,"content": "梦想不会主动走向我们，只有我们去主动实现梦想。行百里者半九十。虽然中国梦离我们越来越近了，但是要实现中国梦，还要靠我们以永不懈怠的精神状态、功在不舍的坚强意志，不忘初心，继续前进。"
+    ,"uploadtime": 20180514
+    ,"status": false
+  },{
+    "id": "007"
+    ,"label": "体育"
+    ,"title": "皇马大战利物浦"
+    ,"author": "作者-3"
+    ,"content": "对欧足联而言，更想要产生个新冠军。连续三年都是同一个冠军队，这会毁掉欧冠……”格里姆表态，“皇马有梦幻般的阵容，但从促进竞争的角度而言，另一支球队获胜会更好。"
+    ,"uploadtime": 20180515
+    ,"status": false
+  }]
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/content/tags.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/content/tags.js
new file mode 100644
index 0000000..6ca85cd
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/content/tags.js
@@ -0,0 +1,21 @@
+{
+  "code": 0
+  ,"msg": ""
+  ,"count": "100"
+  ,"data": [{
+    "id": "001"
+    ,"tags": "美食"
+  },{
+    "id": "002"
+    ,"tags": "新闻"  
+  },{
+    "id": "003"
+    ,"tags": "八卦"
+  },{
+    "id": "004"
+    ,"tags": "体育"  
+  },{
+    "id": "005"
+    ,"tags": "音乐"
+  }]
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/forum/list.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/forum/list.js
new file mode 100644
index 0000000..144e75b
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/forum/list.js
@@ -0,0 +1,62 @@
+{
+  "code": 0
+  ,"msg": ""
+  ,"count": "100"
+  ,"data": [{
+    "id": "1001"
+    ,"poster": "赵"
+    ,"avatar": "https://wx4.sinaimg.cn/mw1024/5db11ff4gy1fmx4keaw9pj20dw08caa4.jpg"
+    ,"content": "为什么花儿这么么红"
+    ,"posttime": 20160805
+    ,"top": false
+  },{
+    "id": "1002"
+    ,"poster": "钱"
+    ,"avatar": "https://wx4.sinaimg.cn/mw1024/5db11ff4gy1fmx4keaw9pj20dw08caa4.jpg"
+    ,"content": "喜欢胡歌，赞赞赞"
+    ,"posttime": 20161205
+    ,"top": true
+  },{
+    "id": "1003"
+    ,"poster": "孙"
+    ,"avatar": "https://wx4.sinaimg.cn/mw1024/5db11ff4gy1fmx4keaw9pj20dw08caa4.jpg"
+    ,"content": "明天就要考试了，好紧张，求保佑"
+    ,"posttime": 20170405
+    ,"top": false
+  },{
+    "id": "1004"
+    ,"poster": "李"
+    ,"avatar": "https://wx4.sinaimg.cn/mw1024/5db11ff4gy1fmx4keaw9pj20dw08caa4.jpg"
+    ,"content": "希望明天是个好天气" 
+    ,"posttime": 20171005
+    ,"top": false
+  },{
+    "id": "1005"
+    ,"poster": "周"
+    ,"avatar": "https://wx4.sinaimg.cn/mw1024/5db11ff4gy1fmx4keaw9pj20dw08caa4.jpg"
+    ,"content": "女追男隔层纱，是不是真的"
+    ,"posttime": 20180205
+    ,"top": false
+  },{
+    "id": "1006"
+    ,"poster": "吴"
+    ,"avatar": "https://wx4.sinaimg.cn/mw1024/5db11ff4gy1fmx4keaw9pj20dw08caa4.jpg"
+    ,"content": "竟然有人跳楼，年轻人想不开啊！" 
+    ,"posttime": 20180512
+    ,"top": false
+  },{
+    "id": "1007"
+    ,"poster": "郑"
+    ,"avatar": "https://wx4.sinaimg.cn/mw1024/5db11ff4gy1fmx4keaw9pj20dw08caa4.jpg"
+    ,"content": "大家一定不能学那个年轻人，珍爱生命啊"
+    ,"posttime": 20180512
+    ,"top": false
+  },{
+    "id": "1008"
+    ,"poster": "王"
+    ,"avatar": "https://wx4.sinaimg.cn/mw1024/5db11ff4gy1fmx4keaw9pj20dw08caa4.jpg"
+    ,"content": "想知道南昌哪里有好吃的西安肉夹馍"
+    ,"posttime": 20180514
+    ,"top": false
+  }]
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/forum/replys.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/forum/replys.js
new file mode 100644
index 0000000..0703695
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/forum/replys.js
@@ -0,0 +1,69 @@
+{
+  "code": 0
+  ,"msg": ""
+  ,"count": "100"
+  ,"data": [{
+    "id": "001"
+    ,"replyer": "吴"
+    ,"cardid": "1002"
+    ,"avatar": "https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg"
+    ,"content": "有眼光，我也喜欢胡歌！"
+    ,"replytime": 20161205
+  },{
+    "id": "002"
+    ,"replyer": "郑"
+    ,"cardid": "1002"
+    ,"avatar": "https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg"
+    ,"content": "同上同上。"
+    ,"replytime": 20161205
+  },{
+    "id": "003"
+    ,"replyer": "王"
+    ,"cardid": "1003"
+    ,"avatar": "https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg"
+    ,"content": "能过一定过，不能过紧张也没用"
+    ,"replytime": 20170405
+  },{
+    "id": "004"
+    ,"replyer": "冯"
+    ,"cardid": "1001"
+    ,"avatar": "https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg"
+    ,"content": "可能因为你流鼻血了。" 
+    ,"replytime": 20170405
+  },{
+    "id": "005"
+    ,"replyer": "陈"
+    ,"cardid": "1003"
+    ,"avatar": "https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg"
+    ,"content": "加油加油，看好你"
+    ,"replytime": 20170405
+  },{
+    "id": "006"
+    ,"replyer": "褚"
+    ,"cardid": "1005"
+    ,"avatar": "https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg"
+    ,"content": "纯属放屁" 
+    ,"replytime": 20180207
+  },{
+    "id": "007"
+    ,"replyer": "卫"
+    ,"cardid": "1005"
+    ,"avatar": "https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg"
+    ,"content": "可以试试"
+    ,"replytime": 20180207
+  },{
+    "id": "006"
+    ,"replyer": "蒋"
+    ,"cardid": "1006"
+    ,"avatar": "https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg"
+    ,"content": "是啊是啊，太恐怖了。" 
+    ,"replytime": 20180512
+  },{
+    "id": "007"
+    ,"replyer": "沈"
+    ,"cardid": "1008"
+    ,"avatar": "https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg"
+    ,"content": "魏家凉皮的凉皮就很不错奥。"
+    ,"replytime": 20180515
+  }]
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/layer/photos.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/layer/photos.js
new file mode 100644
index 0000000..7daedc3
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/layer/photos.js
@@ -0,0 +1,39 @@
+{
+  "code": 0,
+  "msg": "",
+  "title": "JSON请求的相册",
+  "id": 8,
+  "start": 0,
+  "data": [
+    {
+      "alt": "layer",
+      "pid": 109,
+      "src": "https://wx4.sinaimg.cn/mw1024/5db11ff4gy1fmx4keaw9pj20dw08caa4.jpg",
+      "thumb": ""
+    },
+    {
+      "alt": "说好的，一起Fly",
+      "pid": 110,
+      "src": "https://wx4.sinaimg.cn/mw1024/5db11ff4gy1fmx4kebemcj20ga09saa1.jpg",
+      "thumb": ""
+    },
+    {
+      "alt": "佟丽娅女神",
+      "pid": 111,
+      "src": "https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg",
+      "thumb": ""
+    },
+    {
+      "alt": "凤姐是个好人",
+      "pid": 112,
+      "src": "https://wx3.sinaimg.cn/mw690/5db11ff4gy1fmx4kec9vuj20b20dwmyk.jpg",
+      "thumb": ""
+    },
+    {
+      "alt": "星空如此深邃",
+      "pid": 113,
+      "src": "https://wx3.sinaimg.cn/mw690/5db11ff4gy1fmx4keca8ag208g06iglw.gif",
+      "thumb": ""
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/layim/getList.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/layim/getList.js
new file mode 100644
index 0000000..aa88110
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/layim/getList.js
@@ -0,0 +1,96 @@
+{
+  "code": 0
+  ,"msg": ""
+  ,"data": {
+    "mine": {
+      "username": "纸飞机"
+      ,"id": "100000"
+      ,"status": "online"
+      ,"sign": "在深邃的编码世界，做一枚轻盈的纸飞机"
+      ,"avatar": "//res.layui.com/images/fly/avatar/00.jpg"
+    }
+    ,"friend": [{
+      "groupname": "知名人物"
+      ,"id": 0
+      ,"list": [{
+        "username": "贤心"
+        ,"id": "100001"
+        ,"avatar": "//tva1.sinaimg.cn/crop.0.0.118.118.180/5db11ff4gw1e77d3nqrv8j203b03cweg.jpg"
+        ,"sign": "这些都是测试数据，实际使用请严格按照该格式返回"
+        ,"status": "online"
+      },{
+        "username": "刘涛tamia"
+        ,"id": "100001222"
+        ,"sign": "如约而至，不负姊妹欢乐颂"
+        ,"avatar": "//tva4.sinaimg.cn/crop.0.1.1125.1125.180/475bb144jw8f9nwebnuhkj20v90vbwh9.jpg"
+      },{
+        "username": "谢楠"
+        ,"id": "10034001"
+        ,"avatar": "//tva2.sinaimg.cn/crop.1.0.747.747.180/633f068fjw8f9h040n951j20ku0kr74t.jpg"
+        ,"sign": ""
+      },{
+        "username": "马小云"
+        ,"id": "168168"
+        ,"avatar": "//tva1.sinaimg.cn/crop.0.0.180.180.180/7fde8b93jw1e8qgp5bmzyj2050050aa8.jpg"
+        ,"sign": "让天下没有难写的代码"
+      },{
+        "username": "徐小峥"
+        ,"id": "666666"
+        ,"avatar": "//tva1.sinaimg.cn/crop.0.0.512.512.180/6a4acad5jw8eqi6yaholjj20e80e8t9f.jpg"
+        ,"sign": "代码在囧途，也要写到底"
+      }]
+    },{
+      "groupname": "网红声优"
+      ,"id": 1
+      ,"list": [{
+        "username": "罗玉凤"
+        ,"id": "121286"
+        ,"avatar": "//tva4.sinaimg.cn/crop.0.0.640.640.180/4a02849cjw8fc8vn18vktj20hs0hs75v.jpg"
+        ,"sign": "在自己实力不济的时候，不要去相信什么媒体和记者。他们不是善良的人，有时候候他们的采访对当事人而言就是陷阱"
+      },{
+        "username": "Z_子晴"
+        ,"id": "108101"
+        ,"avatar": "//tva1.sinaimg.cn/crop.0.23.1242.1242.180/8693225ajw8fbimjimpjwj20yi0zs77l.jpg"
+        ,"sign": "微电商达人"
+      },{
+        "username": "大鱼_MsYuyu"
+        ,"id": "12123454"
+        ,"avatar": "//tva2.sinaimg.cn/crop.0.0.512.512.180/005LMAegjw8f2bp9qg4mrj30e80e8dg5.jpg"
+        ,"sign": "我瘋了！這也太準了吧  超級笑點低"
+      },{
+        "username": "醋醋cucu"
+        ,"id": "102101"
+        ,"avatar": "//tva2.sinaimg.cn/crop.0.0.640.640.180/648fbe5ejw8ethmg0u9egj20hs0ht0tn.jpg"
+        ,"sign": ""
+      },{
+        "username": "柏雪近在它香"
+        ,"id": "3435343"
+        ,"avatar": "//tva2.sinaimg.cn/crop.0.8.751.751.180/961a9be5jw8fczq7q98i7j20kv0lcwfn.jpg"
+        ,"sign": ""
+      }]
+    },{
+      "groupname": "女神艺人"
+      ,"id": 2
+      ,"list": [{
+        "username": "王祖贤"
+        ,"id": "76543"
+        ,"avatar": "//wx2.sinaimg.cn/mw690/5db11ff4gy1flxmew7edlj203d03wt8n.jpg"
+        ,"sign": "我爱贤心"
+      },{
+        "username": "佟丽娅"
+        ,"id": "4803920"
+        ,"avatar": "//tva3.sinaimg.cn/crop.0.0.750.750.180/5033b6dbjw8etqysyifpkj20ku0kuwfw.jpg"
+        ,"sign": "我也爱贤心吖吖啊"
+      }]
+    }]
+    ,"group": [{
+      "groupname": "前端群"
+      ,"id": "101"
+      ,"avatar": "//tva1.sinaimg.cn/crop.0.0.200.200.50/006q8Q6bjw8f20zsdem2mj305k05kdfw.jpg"
+    },{
+      "groupname": "Fly社区官方群"
+      ,"id": "102"
+      ,"avatar": "//tva2.sinaimg.cn/crop.0.0.199.199.180/005Zseqhjw1eplix1brxxj305k05kjrf.jpg"
+    }]
+  }
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/layim/getMembers.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/layim/getMembers.js
new file mode 100644
index 0000000..66dcba0
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/layim/getMembers.js
@@ -0,0 +1,67 @@
+{
+  "code": 0
+  ,"msg": ""
+  ,"data": {
+    "list": [{
+      "username": "贤心"
+      ,"id": "100001"
+      ,"avatar": "//tva1.sinaimg.cn/crop.0.0.118.118.180/5db11ff4gw1e77d3nqrv8j203b03cweg.jpg"
+      ,"sign": "这些都是测试数据，实际使用请严格按照该格式返回"
+    },{
+      "username": "Z_子晴"
+      ,"id": "108101"
+      ,"avatar": "//tva1.sinaimg.cn/crop.0.23.1242.1242.180/8693225ajw8fbimjimpjwj20yi0zs77l.jpg"
+      ,"sign": "微电商达人"
+    },{
+      "username": "Lemon_CC"
+      ,"id": "102101"
+      ,"avatar": "//tva4.sinaimg.cn/crop.0.0.180.180.180/6d424ea5jw1e8qgp5bmzyj2050050aa8.jpg"
+      ,"sign": ""
+    },{
+      "username": "马小云"
+      ,"id": "168168"
+      ,"avatar": "//tva1.sinaimg.cn/crop.0.0.180.180.180/7fde8b93jw1e8qgp5bmzyj2050050aa8.jpg"
+      ,"sign": "让天下没有难写的代码"
+    },{
+      "username": "徐小峥"
+      ,"id": "666666"
+      ,"avatar": "//tva1.sinaimg.cn/crop.0.0.512.512.180/6a4acad5jw8eqi6yaholjj20e80e8t9f.jpg"
+      ,"sign": "代码在囧途，也要写到底"
+    },{
+      "username": "罗玉凤"
+      ,"id": "121286"
+      ,"avatar": "//tva4.sinaimg.cn/crop.0.0.640.640.180/4a02849cjw8fc8vn18vktj20hs0hs75v.jpg"
+      ,"sign": "在自己实力不济的时候，不要去相信什么媒体和记者。他们不是善良的人，有时候候他们的采访对当事人而言就是陷阱"
+    },{
+      "username": "刘涛tamia"
+      ,"id": "100001222"
+      ,"avatar": "//tva4.sinaimg.cn/crop.0.1.1125.1125.180/475bb144jw8f9nwebnuhkj20v90vbwh9.jpg"
+      ,"sign": "如约而至，不负姊妹欢乐颂"
+    },{
+        "username": "大鱼_MsYuyu"
+        ,"id": "12123454"
+        ,"avatar": "//tva2.sinaimg.cn/crop.0.0.512.512.180/005LMAegjw8f2bp9qg4mrj30e80e8dg5.jpg"
+        ,"sign": "我瘋了！這也太準了吧  超級笑點低"
+      },{
+        "username": "谢楠"
+        ,"id": "10034001"
+        ,"avatar": "//tva2.sinaimg.cn/crop.1.0.747.747.180/633f068fjw8f9h040n951j20ku0kr74t.jpg"
+        ,"sign": ""
+      },{
+        "username": "柏雪近在它香"
+        ,"id": "3435343"
+        ,"avatar": "//tva2.sinaimg.cn/crop.0.8.751.751.180/961a9be5jw8fczq7q98i7j20kv0lcwfn.jpg"
+        ,"sign": ""
+      },{
+        "username": "林心如"
+        ,"id": "76543"
+        ,"avatar": "//tva3.sinaimg.cn/crop.0.0.512.512.180/48f122e6jw8fcmi072lkyj20e80e8t9i.jpg"
+        ,"sign": "我爱贤心"
+      },{
+        "username": "佟丽娅"
+        ,"id": "4803920"
+        ,"avatar": "//tva3.sinaimg.cn/crop.0.0.750.750.180/5033b6dbjw8etqysyifpkj20ku0kuwfw.jpg"
+        ,"sign": "我也爱贤心吖吖啊"
+      }]
+  }
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/mall/order.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/mall/order.js
new file mode 100644
index 0000000..9ce2971
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/mall/order.js
@@ -0,0 +1,42 @@
+{
+  "code": 0
+  ,"msg": ""
+  ,"count": "100"
+  ,"data": [{
+    "invoice": "X123565541"
+    ,"username": "张小三"
+    ,"orderDate": "2017-11-10"
+    ,"amount": 800
+    ,"status": 1
+  },{
+    "invoice": "X123565542"
+    ,"username": "李小四"
+    ,"orderDate": "2017-11-10"
+    ,"amount": 800
+    ,"status": 0
+  },{
+    "invoice": "X123565543"
+    ,"username": "王老五"
+    ,"orderDate": "2017-11-10"
+    ,"amount": 800
+    ,"status": 1
+  },{
+    "invoice": "X123565544"
+    ,"username": "赵小六"
+    ,"orderDate": "2017-11-09"
+    ,"amount": 1600
+    ,"status": 1
+  },{
+    "invoice": "X123565545"
+    ,"username": "孙小七"
+    ,"orderDate": "2017-11-09"
+    ,"amount": 1600
+    ,"status": -1
+  },{
+    "invoice": "X123565546"
+    ,"username": "周小八"
+    ,"orderDate": "2017-11-08"
+    ,"amount": 2600
+    ,"status": 1
+  }]
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/menu.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/menu.js
new file mode 100644
index 0000000..0408505
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/menu.js
@@ -0,0 +1,227 @@
+{
+  "code": 0
+  ,"msg": ""
+  ,"data": [{
+    "name": "component"
+    ,"title": "组件"
+    ,"icon": "layui-icon-component"
+    ,"list": [{
+      "name": "grid"
+      ,"title": "栅格"
+      ,"list": [{
+        "name": "list"
+        ,"title": "等比例列表排列"
+      },{
+        "name": "mobile"
+        ,"title": "按移动端排列"
+      },{
+        "name": "mobile-pc"
+        ,"title": "移动桌面端组合"
+      },{
+        "name": "all"
+        ,"title": "全端复杂组合"
+      },{
+        "name": "stack"
+        ,"title": "低于桌面堆叠排列"
+      },{
+        "name": "speed-dial"
+        ,"title": "九宫格"
+      }]
+    }, {
+      "name": "button"
+      ,"title": "按钮"
+    }, {
+      "name": "form"
+      ,"title": "表单"
+      ,"list": [{
+        "name": "element"
+        ,"title": "表单元素"
+      },{
+        "name": "group"
+        ,"title": "表单组合"
+      }]
+    }, {
+      "name": "nav"
+      ,"title": "导航"
+    }, {
+      "name": "tabs"
+      ,"title": "选项卡"
+    }, {
+      "name": "progress"
+      ,"title": "进度条"
+    }, {
+      "name": "panel"
+      ,"title": "面板"
+    }, {
+      "name": "badge"
+      ,"title": "徽章"
+    }, {
+      "name": "timeline"
+      ,"title": "时间线"
+    }, {
+      "name": "anim"
+      ,"title": "动画"
+    }, {
+      "name": "auxiliar"
+      ,"title": "辅助"
+    }, {
+      "name": "layer"
+      ,"title": "通用弹层"
+      ,"list": [{
+        "name": "list"
+        ,"title": "功能演示"
+      },{
+        "name": "special-demo"
+        ,"title": "特殊示例"
+      },{
+        "name": "theme"
+        ,"title": "风格定制"
+      }]
+    }, {
+      "name": "laydate"
+      ,"title": "日期时间"
+    }, {
+      "name": "table"
+      ,"title": "表格"
+    }, {
+      "name": "laypage"
+      ,"title": "分页"
+    }, {
+      "name": "upload"
+      ,"title": "上传"
+    }, {
+      "name": "carousel"
+      ,"title": "轮播"
+    }, {
+      "name": "laytpl"
+      ,"title": "模板引擎"
+    }, {
+      "name": "flow"
+      ,"title": "流加载"
+    }, {
+      "name": "util"
+      ,"title": "工具"
+    }, {
+      "name": "code"
+      ,"title": "代码修饰"
+    }, {
+      "name": "layim"
+      ,"title": "即时聊天"
+      ,"jump": "senior/im/"
+    }]
+  }, {
+    "name": "template"
+    ,"title": "模板"
+    ,"icon": "layui-icon-template"
+    ,"list": [{
+      "name": "user"
+      ,"title": "用户相关"
+      ,"spread": true
+      ,"list": [{
+        "name": "reg"
+        ,"title": "注册"
+        ,"jump": "user/reg"
+      },{
+        "name": "login"
+        ,"title": "登入"
+        ,"jump": "user/login"
+      },{
+        "name": "forget"
+        ,"title": "忘记密码"
+        ,"jump": "user/forget"
+      }]
+    }, {
+      "name": "tips"
+      ,"title": "提示页面"
+      ,"spread": true
+      ,"list": [{
+        "name": "404"
+        ,"title": "404"
+      },{
+        "name": "error"
+        ,"title": "错误提示"
+      }]
+    }, {
+      "name": ""
+      ,"title": "内嵌页面"
+      ,"spread": true
+      ,"list": [{
+        "name": ""
+        ,"title": "百度一下"
+        ,"jump": "/iframe/link/baidu"
+      }, {
+        "name": ""
+        ,"title": "layui官网"
+        ,"jump": "/iframe/link/layui"
+      }, {
+        "name": ""
+        ,"title": "layuiAdmin官网"
+        ,"jump": "/iframe/link/layuiAdmin"
+      }]
+    }]
+  }, {
+    "name": "app"
+    ,"title": "应用"
+    ,"icon": "layui-icon-app"
+    ,"list": [{
+      "name": "message"
+      ,"title": "消息中心"
+    }]
+  }, {
+    "name": "senior"
+    ,"title": "高级"
+    ,"icon": "layui-icon-senior"
+    ,"list": [{
+      "name": "im"
+      ,"title": "通讯系统"
+    }]
+  }, {
+    "name": "user"
+    ,"title": "用户"
+    ,"icon": "layui-icon-user"
+    ,"list": [{
+      "name": "user"
+      ,"title": "用户"
+      ,"spread": true
+      ,"list": [{
+        "name": "list"
+        ,"title": "用户列表"
+      }]
+    },{
+      "name": "administrators"
+      ,"title": "后台管理组"
+      ,"spread": true
+      ,"list": [{
+        "name": "list"
+        ,"title": "管理员列表"
+      },{
+        "name": "role"
+        ,"title": "角色管理"
+      }]
+    }]
+  }, {
+    "name": "set"
+    ,"title": "设置"
+    ,"icon": "layui-icon-set"
+    ,"list": [{
+      "name": "base"
+      ,"title": "基本设置"
+      ,"spread": true
+      ,"list": [{
+        "name": "website"
+        ,"title": "系统设置"
+      },{
+        "name": "email"
+        ,"title": "邮件服务"
+      }]
+    },{
+      "name": "security"
+      ,"title": "安全设置"
+    }]
+  }, {
+    "name": "get"
+    ,"title": "授权"
+    ,"icon": "layui-icon-auz"
+    ,"jump": "system/get"
+  }]
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/menu1.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/menu1.js
new file mode 100644
index 0000000..0cfd0c0
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/menu1.js
@@ -0,0 +1,271 @@
+{
+  "code": 0
+  ,"msg": ""
+  ,"data": [{
+    "name": "component"
+    ,"title": "组件"
+    ,"icon": "layui-icon-component"
+    ,"list": [{
+      "name": "grid"
+      ,"title": "栅格"
+      ,"list": [{
+        "name": "list"
+        ,"title": "等比例列表排列"
+      },{
+        "name": "mobile"
+        ,"title": "按移动端排列"
+      },{
+        "name": "mobile-pc"
+        ,"title": "移动桌面端组合"
+      },{
+        "name": "all"
+        ,"title": "全端复杂组合"
+      },{
+        "name": "stack"
+        ,"title": "低于桌面堆叠排列"
+      },{
+        "name": "speed-dial"
+        ,"title": "九宫格"
+      }]
+    }, {
+      "name": "button"
+      ,"title": "按钮"
+    }, {
+      "name": "form"
+      ,"title": "表单"
+      ,"list": [{
+        "name": "element"
+        ,"title": "表单元素"
+      },{
+        "name": "group"
+        ,"title": "表单组合"
+      }]
+    }, {
+      "name": "nav"
+      ,"title": "导航"
+    }, {
+      "name": "tabs"
+      ,"title": "选项卡"
+    }, {
+      "name": "progress"
+      ,"title": "进度条"
+    }, {
+      "name": "panel"
+      ,"title": "面板"
+    }, {
+      "name": "badge"
+      ,"title": "徽章"
+    }, {
+      "name": "timeline"
+      ,"title": "时间线"
+    }, {
+      "name": "anim"
+      ,"title": "动画"
+    }, {
+      "name": "auxiliar"
+      ,"title": "辅助"
+    }, {
+      "name": "layer"
+      ,"title": "通用弹层"
+      ,"list": [{
+        "name": "list"
+        ,"title": "功能演示"
+      },{
+        "name": "special-demo"
+        ,"title": "特殊示例"
+      },{
+        "name": "theme"
+        ,"title": "风格定制"
+      }]
+    }, {
+      "name": "laydate"
+      ,"title": "日期时间"
+    }, {
+      "name": "table"
+      ,"title": "表格"
+    }, {
+      "name": "laypage"
+      ,"title": "分页"
+    }, {
+      "name": "upload"
+      ,"title": "上传"
+    }, {
+      "name": "carousel"
+      ,"title": "轮播"
+    }, {
+      "name": "laytpl"
+      ,"title": "模板引擎"
+    }, {
+      "name": "flow"
+      ,"title": "流加载"
+    }, {
+      "name": "util"
+      ,"title": "工具"
+    }, {
+      "name": "code"
+      ,"title": "代码修饰"
+    }, {
+      "name": "layim"
+      ,"title": "即时聊天"
+      ,"jump": "senior/im/chat"
+    }]
+  }, {
+    "name": "template"
+    ,"title": "模板"
+    ,"icon": "layui-icon-template"
+    ,"list": [{
+      "name": "user"
+      ,"title": "用户相关"
+      ,"spread": true
+      ,"list": [{
+        "name": "reg"
+        ,"title": "注册"
+        ,"jump": "user/reg"
+      },{
+        "name": "login"
+        ,"title": "登入"
+        ,"jump": "user/login"
+      },{
+        "name": "forget"
+        ,"title": "忘记密码"
+        ,"jump": "user/forget"
+      }]
+    }, {
+      "name": "tips"
+      ,"title": "提示页面"
+      ,"spread": true
+      ,"list": [{
+        "name": "404"
+        ,"title": "404"
+      },{
+        "name": "error"
+        ,"title": "错误提示"
+      }]
+    }]
+  }, {
+    "name": "app"
+    ,"title": "应用"
+    ,"icon": "layui-icon-app"
+    ,"list": [{
+      "name": "message"
+      ,"title": "消息中心"
+    },{
+      "name": "content"
+      ,"title": "内容系统"
+      ,"spread": true
+      ,"list": [{
+        "name": "list"
+        ,"title": "所有文章"
+      },{
+        "name": "comment"
+        ,"title": "评论管理"
+      },{
+        "name": "tags"
+        ,"title": "标签管理"
+      }]
+    },{
+      "name": "forum"
+      ,"title": "社区系统"
+      ,"spread": true
+      ,"list": [{
+        "name": "list"
+        ,"title": "全部帖子"
+      },{
+        "name": "replys"
+        ,"title": "所有回帖"
+      }]
+    },{
+      "name": "mall"
+      ,"title": "商城管理"
+      ,"spread": true
+      ,"list": [{
+        "name": "list"
+        ,"title": "商品列表"
+      },{
+        "name": "category"
+        ,"title": "分类管理"
+      },{
+        "name": "specs"
+        ,"title": "规格管理"
+      }]
+    }]
+  }, {
+    "name": "senior"
+    ,"title": "高级"
+    ,"icon": "layui-icon-senior"
+    ,"list": [{
+      "name": "im"
+      ,"title": "通讯系统"
+      ,"spread": true
+      ,"list": [{
+        "name": "chat"
+        ,"title": "社交聊天"
+      },{
+        "name": "kefu"
+        ,"title": "客服系统"
+      }]
+    },{
+      "name": "echarts"
+      ,"title": "Echarts 集成"
+      ,"spread": true
+      ,"list": [{
+        "name": "line"
+        ,"title": "折线图"
+      },{
+        "name": "bar"
+        ,"title": "柱状图"
+      },{
+        "name": "map"
+        ,"title": "地图"
+      }]
+    }]
+  }, {
+    "name": "user"
+    ,"title": "用户"
+    ,"icon": "layui-icon-user"
+    ,"list": [{
+      "name": "user"
+      ,"title": "用户"
+      ,"spread": true
+      ,"list": [{
+        "name": "list"
+        ,"title": "用户列表"
+      }]
+    },{
+      "name": "administrators"
+      ,"title": "后台管理组"
+      ,"spread": true
+      ,"list": [{
+        "name": "list"
+        ,"title": "管理员列表"
+      },{
+        "name": "role"
+        ,"title": "角色管理"
+      }]
+    }]
+  }, {
+    "name": "set"
+    ,"title": "设置"
+    ,"icon": "layui-icon-set"
+    ,"list": [{
+      "name": "base"
+      ,"title": "基本设置"
+      ,"spread": true
+      ,"list": [{
+        "name": "website"
+        ,"title": "系统设置"
+      },{
+        "name": "email"
+        ,"title": "邮件服务"
+      }]
+    },{
+      "name": "security"
+      ,"title": "安全设置"
+    }]
+  }, {
+    "name": "get"
+    ,"title": "授权"
+    ,"icon": "layui-icon-auz"
+    ,"jump": "system/get"
+  }]
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/message/all.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/message/all.js
new file mode 100644
index 0000000..da50293
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/message/all.js
@@ -0,0 +1,46 @@
+{
+  "code": 0
+  ,"msg": ""
+  ,"count": 60
+  ,"data": [{
+    "id": 123
+    ,"title": "你好新朋友，感谢使用 layuiAdmin"
+    ,"time": 1510363800000
+  }, {
+    "id": 111
+    ,"title": "贤心发来了一段私信"
+    ,"time": 1510212370000
+  }, {
+    "id": 111
+    ,"title": "贤心发来了一段私信"
+    ,"time": 1510212370000
+  }, {
+    "id": 111
+    ,"title": "贤心发来了一段私信"
+    ,"time": 1510212370000
+  }, {
+    "id": 111
+    ,"title": "贤心发来了一段私信"
+    ,"time": 1510212370000
+  }, {
+    "id": 111
+    ,"title": "贤心发来了一段私信"
+    ,"time": 1510212370000
+  }, {
+    "id": 111
+    ,"title": "贤心发来了一段私信"
+    ,"time": 1510212370000
+  }, {
+    "id": 111
+    ,"title": "贤心发来了一段私信"
+    ,"time": 1510212370000
+  }, {
+    "id": 111
+    ,"title": "贤心发来了一段私信"
+    ,"time": 1510212370000
+  }, {
+    "id": 111
+    ,"title": "贤心发来了一段私信"
+    ,"time": 1507447570000
+  }]
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/message/detail.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/message/detail.js
new file mode 100644
index 0000000..010b950
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/message/detail.js
@@ -0,0 +1,10 @@
+{
+  "code": 0
+  ,"msg": ""
+  ,"data": {
+    "id": 111
+    ,"title": "你好新朋友，感谢使用 layuiAdmin"
+    ,"content": "<p>一直以来，layui 秉承无偿开源的初心，虔诚致力于服务各层次前后端 Web 开发者，在商业横飞的当今时代，这一信念从未动摇。即便身单力薄，仍然重拾决心，埋头造轮，以尽可能地填补产品本身的缺口。在过去的一段的时间，我一直在寻求持久之道，已维持你眼前所见的一切。而 layuiAdmin 是我们尝试解决的手段之一。我相信真正有爱于 layui 生态的你，定然不会错过这一拥抱吧。</p><p>子曰：君子不用防，小人防不住。请务必通过官网正规渠道，获得 <a href=\"http://www.layui.com/admin/\" target=\"_blank\">layuiAdmin</a>！</p><p>—— 贤心（<a href=\"http://www.layui.com/\" target=\"_blank\">layui.com</a>）</p>"
+    ,"time": 1510363800000
+  }
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/message/direct.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/message/direct.js
new file mode 100644
index 0000000..8f0ddbe
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/message/direct.js
@@ -0,0 +1,46 @@
+{
+  "code": 0
+  ,"msg": ""
+  ,"count": 60
+  ,"data": [{
+    "id": 123
+    ,"title": "贤心发来了一段私信"
+    ,"time": 1510363800000
+  }, {
+    "id": 111
+    ,"title": "贤心发来了一段私信"
+    ,"time": 1510212370000
+  }, {
+    "id": 111
+    ,"title": "贤心发来了一段私信"
+    ,"time": 1510212370000
+  }, {
+    "id": 111
+    ,"title": "贤心发来了一段私信"
+    ,"time": 1510212370000
+  }, {
+    "id": 111
+    ,"title": "贤心发来了一段私信"
+    ,"time": 1510212370000
+  }, {
+    "id": 111
+    ,"title": "贤心发来了一段私信"
+    ,"time": 1510212370000
+  }, {
+    "id": 111
+    ,"title": "贤心发来了一段私信"
+    ,"time": 1510212370000
+  }, {
+    "id": 111
+    ,"title": "贤心发来了一段私信"
+    ,"time": 1510212370000
+  }, {
+    "id": 111
+    ,"title": "贤心发来了一段私信"
+    ,"time": 1510212370000
+  }, {
+    "id": 111
+    ,"title": "贤心发来了一段私信"
+    ,"time": 1507447570000
+  }]
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/message/new.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/message/new.js
new file mode 100644
index 0000000..668f4b5
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/message/new.js
@@ -0,0 +1,7 @@
+{
+  "code": 0
+  ,"msg": ""
+  ,"data": {
+    "newmsg": 3
+  }
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/message/notice.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/message/notice.js
new file mode 100644
index 0000000..665f677
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/message/notice.js
@@ -0,0 +1,46 @@
+{
+  "code": 0
+  ,"msg": ""
+  ,"count": 60
+  ,"data": [{
+    "id": 123
+    ,"title": "你好新朋友，感谢使用 layuiAdmin"
+    ,"time": 1510363800000
+  }, {
+    "id": 111
+    ,"title": "你好新朋友，感谢使用 layuiAdmin"
+    ,"time": 1510212370000
+  }, {
+    "id": 111
+    ,"title": "你好新朋友，感谢使用 layuiAdmin"
+    ,"time": 1510212370000
+  }, {
+    "id": 111
+    ,"title": "你好新朋友，感谢使用 layuiAdmin"
+    ,"time": 1510212370000
+  }, {
+    "id": 111
+    ,"title": "你好新朋友，感谢使用 layuiAdmin"
+    ,"time": 1510212370000
+  }, {
+    "id": 111
+    ,"title": "你好新朋友，感谢使用 layuiAdmin"
+    ,"time": 1510212370000
+  }, {
+    "id": 111
+    ,"title": "你好新朋友，感谢使用 layuiAdmin"
+    ,"time": 1510212370000
+  }, {
+    "id": 111
+    ,"title": "你好新朋友，感谢使用 layuiAdmin"
+    ,"time": 1510212370000
+  }, {
+    "id": 111
+    ,"title": "你好新朋友，感谢使用 layuiAdmin"
+    ,"time": 1510212370000
+  }, {
+    "id": 111
+    ,"title": "你好新朋友，感谢使用 layuiAdmin"
+    ,"time": 1507447570000
+  }]
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/table/demo.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/table/demo.js
new file mode 100644
index 0000000..8f90d90
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/table/demo.js
@@ -0,0 +1,96 @@
+
+{
+  "code": 0
+  ,"msg": ""
+  ,"count": 3000000
+  ,"data": [{
+    "id": "10001"
+    ,"username": "杜甫"
+    ,"email": "xianxin@layui.com"
+    ,"sex": "男"
+    ,"city": "浙江杭州"
+    ,"sign": "点击此处，显示更多。当内容超出时，点击单元格会自动显示更多内容。"
+    ,"experience": "116"
+    ,"ip": "192.168.0.8"
+    ,"logins": "108"
+    ,"joinTime": "2016-10-14"
+  }, {
+    "id": "10002"
+    ,"username": "李白"
+    ,"email": "xianxin@layui.com"
+    ,"sex": "男"
+    ,"city": "浙江杭州"
+    ,"sign": "君不见，黄河之水天上来，奔流到海不复回。 君不见，高堂明镜悲白发，朝如青丝暮成雪。 人生得意须尽欢，莫使金樽空对月。 天生我材必有用，千金散尽还复来。 烹羊宰牛且为乐，会须一饮三百杯。 岑夫子，丹丘生，将进酒，杯莫停。 与君歌一曲，请君为我倾耳听。(倾耳听 一作：侧耳听) 钟鼓馔玉不足贵，但愿长醉不复醒。(不足贵 一作：何足贵；不复醒 一作：不愿醒/不用醒) 古来圣贤皆寂寞，惟有饮者留其名。(古来 一作：自古；惟 通：唯) 陈王昔时宴平乐，斗酒十千恣欢谑。 主人何为言少钱，径须沽取对君酌。 五花马，千金裘，呼儿将出换美酒，与尔同销万古愁。"
+    ,"experience": "12"
+    ,"ip": "192.168.0.8"
+    ,"logins": "106"
+    ,"joinTime": "2016-10-14"
+    ,"LAY_CHECKED": true
+  }, {
+    "id": "10003"
+    ,"username": "王勃"
+    ,"email": "xianxin@layui.com"
+    ,"sex": "男"
+    ,"city": "浙江杭州"
+    ,"sign": "人生恰似一场修行"
+    ,"experience": "65"
+    ,"ip": "192.168.0.8"
+    ,"logins": "106"
+    ,"joinTime": "2016-10-14"
+  }, {
+    "id": "10004"
+    ,"username": "李清照"
+    ,"email": "xianxin@layui.com"
+    ,"sex": "女"
+    ,"city": "浙江杭州"
+    ,"sign": "人生恰似一场修行"
+    ,"experience": "666"
+    ,"ip": "192.168.0.8"
+    ,"logins": "106"
+    ,"joinTime": "2016-10-14"
+  }, {
+    "id": "10005"
+    ,"username": "冰心"
+    ,"email": "xianxin@layui.com"
+    ,"sex": "女"
+    ,"city": "浙江杭州"
+    ,"sign": "人生恰似一场修行"
+    ,"experience": "86"
+    ,"ip": "192.168.0.8"
+    ,"logins": "106"
+    ,"joinTime": "2016-10-14"
+  }, {
+    "id": "10006"
+    ,"username": "贤心"
+    ,"email": "xianxin@layui.com"
+    ,"sex": "男"
+    ,"city": "浙江杭州"
+    ,"sign": "人生恰似一场修行"
+    ,"experience": "12"
+    ,"ip": "192.168.0.8"
+    ,"logins": "106"
+    ,"joinTime": "2016-10-14"
+  }, {
+    "id": "10007"
+    ,"username": "贤心"
+    ,"email": "xianxin@layui.com"
+    ,"sex": "男"
+    ,"city": "浙江杭州"
+    ,"sign": "人生恰似一场修行"
+    ,"experience": "16"
+    ,"ip": "192.168.0.8"
+    ,"logins": "106"
+    ,"joinTime": "2016-10-14"
+  }, {
+    "id": "10008"
+    ,"username": "贤心"
+    ,"email": "xianxin@layui.com"
+    ,"sex": "男"
+    ,"city": "浙江杭州"
+    ,"sign": "人生恰似一场修行"
+    ,"experience": "106"
+    ,"ip": "192.168.0.8"
+    ,"logins": "106"
+    ,"joinTime": "2016-10-14"
+  }]
+}  
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/table/demo2.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/table/demo2.js
new file mode 100644
index 0000000..f6fae59
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/table/demo2.js
@@ -0,0 +1,61 @@
+
+{
+  "code": 0
+  ,"msg": ""
+  ,"count": 66
+  ,"data": [{
+    "username": "张小三"
+    ,"amount": 18
+    ,"province": "浙江"
+    ,"city": "杭州"
+    ,"zone": "西湖区"
+    ,"street": "西溪街道"
+    ,"address": "西溪花园"
+    ,"house": "30栋1单元"
+  }, {
+    "username": "李小四"
+    ,"amount": 39
+    ,"province": "江苏"
+    ,"city": "苏州"
+    ,"zone": "姑苏区"
+    ,"street": "丝绸路"
+    ,"address": "天墅之城"
+    ,"house": "9幢2单元"
+  }, {
+    "username": "王小五"
+    ,"amount": 8
+    ,"province": "江西"
+    ,"city": "南昌"
+    ,"zone": "青山湖区"
+    ,"street": "艾溪湖办事处"
+    ,"address": "中兴和园"
+    ,"house": "1幢3单元"
+  }, {
+    "username": "赵小六"
+    ,"amount": 16
+    ,"province": "福建"
+    ,"city": "泉州"
+    ,"zone": "丰泽区"
+    ,"street": "南洋街道"
+    ,"address": "南洋村"
+    ,"house": "6幢1单元"
+  }, {
+    "username": "孙小七"
+    ,"amount": 12
+    ,"province": "湖北"
+    ,"city": "武汉"
+    ,"zone": "武昌区"
+    ,"street": "武昌大道"
+    ,"address": "两湖花园"
+    ,"house": "16幢2单元"
+  }, {
+    "username": "周小八"
+    ,"amount": 11
+    ,"province": "安徽"
+    ,"city": "黄山"
+    ,"zone": "黄山区"
+    ,"street": "汤口镇"
+    ,"address": "温泉村"
+    ,"house": "21号"
+  }]
+}  
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/table/user.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/table/user.js
new file mode 100644
index 0000000..240c7aa
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/table/user.js
@@ -0,0 +1,2 @@
+
+{"code":0,"msg":"","count":1000,"data":[{"id":10000,"username":"user-0","sex":"女","city":"城市-0","sign":"签名-0","experience":255,"logins":24,"wealth":82830700,"classify":"作家","score":57},{"id":10001,"username":"user-1","sex":"男","city":"城市-1","sign":"签名-1","experience":884,"logins":58,"wealth":64928690,"classify":"词人","score":27},{"id":10002,"username":"user-2","sex":"女","city":"城市-2","sign":"签名-2","experience":650,"logins":77,"wealth":6298078,"classify":"酱油","score":31},{"id":10003,"username":"user-3","sex":"女","city":"城市-3","sign":"签名-3","experience":362,"logins":157,"wealth":37117017,"classify":"诗人","score":68},{"id":10004,"username":"user-4","sex":"男","city":"城市-4","sign":"签名-4","experience":807,"logins":51,"wealth":76263262,"classify":"作家","score":6},{"id":10005,"username":"user-5","sex":"女","city":"城市-5","sign":"签名-5","experience":173,"logins":68,"wealth":60344147,"classify":"作家","score":87},{"id":10006,"username":"user-6","sex":"女","city":"城市-6","sign":"签名-6","experience":982,"logins":37,"wealth":57768166,"classify":"作家","score":34},{"id":10007,"username":"user-7","sex":"男","city":"城市-7","sign":"签名-7","experience":727,"logins":150,"wealth":82030578,"classify":"作家","score":28},{"id":10008,"username":"user-8","sex":"男","city":"城市-8","sign":"签名-8","experience":951,"logins":133,"wealth":16503371,"classify":"词人","score":14},{"id":10009,"username":"user-9","sex":"女","city":"城市-9","sign":"签名-9","experience":484,"logins":25,"wealth":86801934,"classify":"词人","score":75}]}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/table/user30.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/table/user30.js
new file mode 100644
index 0000000..0246bbd
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/table/user30.js
@@ -0,0 +1,2 @@
+
+{"code":0,"msg":"","count":1000,"data":[{"id":10000,"username":"user-0","sex":"女","city":"城市-0","sign":"签名-0","experience":255,"logins":24,"wealth":82830700,"classify":"作家","score":57},{"id":10001,"username":"user-1","sex":"男","city":"城市-1","sign":"签名-1","experience":884,"logins":58,"wealth":64928690,"classify":"词人","score":27},{"id":10002,"username":"user-2","sex":"女","city":"城市-2","sign":"签名-2","experience":650,"logins":77,"wealth":6298078,"classify":"酱油","score":31},{"id":10003,"username":"user-3","sex":"女","city":"城市-3","sign":"签名-3","experience":362,"logins":157,"wealth":37117017,"classify":"诗人","score":68},{"id":10004,"username":"user-4","sex":"男","city":"城市-4","sign":"签名-4","experience":807,"logins":51,"wealth":76263262,"classify":"作家","score":6},{"id":10005,"username":"user-5","sex":"女","city":"城市-5","sign":"签名-5","experience":173,"logins":68,"wealth":60344147,"classify":"作家","score":87},{"id":10006,"username":"user-6","sex":"女","city":"城市-6","sign":"签名-6","experience":982,"logins":37,"wealth":57768166,"classify":"作家","score":34},{"id":10007,"username":"user-7","sex":"男","city":"城市-7","sign":"签名-7","experience":727,"logins":150,"wealth":82030578,"classify":"作家","score":28},{"id":10008,"username":"user-8","sex":"男","city":"城市-8","sign":"签名-8","experience":951,"logins":133,"wealth":16503371,"classify":"词人","score":14},{"id":10009,"username":"user-9","sex":"女","city":"城市-9","sign":"签名-9","experience":484,"logins":25,"wealth":86801934,"classify":"词人","score":75},{"id":10010,"username":"user-10","sex":"女","city":"城市-10","sign":"签名-10","experience":1016,"logins":182,"wealth":71294671,"classify":"诗人","score":34},{"id":10011,"username":"user-11","sex":"女","city":"城市-11","sign":"签名-11","experience":492,"logins":107,"wealth":8062783,"classify":"诗人","score":6},{"id":10012,"username":"user-12","sex":"女","city":"城市-12","sign":"签名-12","experience":106,"logins":176,"wealth":42622704,"classify":"词人","score":54},{"id":10013,"username":"user-13","sex":"男","city":"城市-13","sign":"签名-13","experience":1047,"logins":94,"wealth":59508583,"classify":"诗人","score":63},{"id":10014,"username":"user-14","sex":"男","city":"城市-14","sign":"签名-14","experience":873,"logins":116,"wealth":72549912,"classify":"词人","score":8},{"id":10015,"username":"user-15","sex":"女","city":"城市-15","sign":"签名-15","experience":1068,"logins":27,"wealth":52737025,"classify":"作家","score":28},{"id":10016,"username":"user-16","sex":"女","city":"城市-16","sign":"签名-16","experience":862,"logins":168,"wealth":37069775,"classify":"酱油","score":86},{"id":10017,"username":"user-17","sex":"女","city":"城市-17","sign":"签名-17","experience":1060,"logins":187,"wealth":66099525,"classify":"作家","score":69},{"id":10018,"username":"user-18","sex":"女","city":"城市-18","sign":"签名-18","experience":866,"logins":88,"wealth":81722326,"classify":"词人","score":74},{"id":10019,"username":"user-19","sex":"女","city":"城市-19","sign":"签名-19","experience":682,"logins":106,"wealth":68647362,"classify":"词人","score":51},{"id":10020,"username":"user-20","sex":"男","city":"城市-20","sign":"签名-20","experience":770,"logins":24,"wealth":92420248,"classify":"诗人","score":87},{"id":10021,"username":"user-21","sex":"男","city":"城市-21","sign":"签名-21","experience":184,"logins":131,"wealth":71566045,"classify":"词人","score":99},{"id":10022,"username":"user-22","sex":"男","city":"城市-22","sign":"签名-22","experience":739,"logins":152,"wealth":60907929,"classify":"作家","score":18},{"id":10023,"username":"user-23","sex":"女","city":"城市-23","sign":"签名-23","experience":127,"logins":82,"wealth":14765943,"classify":"作家","score":30},{"id":10024,"username":"user-24","sex":"女","city":"城市-24","sign":"签名-24","experience":212,"logins":133,"wealth":59011052,"classify":"词人","score":76},{"id":10025,"username":"user-25","sex":"女","city":"城市-25","sign":"签名-25","experience":938,"logins":182,"wealth":91183097,"classify":"作家","score":69},{"id":10026,"username":"user-26","sex":"男","city":"城市-26","sign":"签名-26","experience":978,"logins":7,"wealth":48008413,"classify":"作家","score":65},{"id":10027,"username":"user-27","sex":"女","city":"城市-27","sign":"签名-27","experience":371,"logins":44,"wealth":64419691,"classify":"诗人","score":60},{"id":10028,"username":"user-28","sex":"女","city":"城市-28","sign":"签名-28","experience":977,"logins":21,"wealth":75935022,"classify":"作家","score":37},{"id":10029,"username":"user-29","sex":"男","city":"城市-29","sign":"签名-29","experience":647,"logins":107,"wealth":97450636,"classify":"酱油","score":27}]}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/upload/demo.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/upload/demo.js
new file mode 100644
index 0000000..77674fe
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/upload/demo.js
@@ -0,0 +1,7 @@
+{
+  "code": 0,
+  "msg": "",
+  "data": {
+    "src": "https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg"
+  }
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/user/forget.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/user/forget.js
new file mode 100644
index 0000000..836bba4
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/user/forget.js
@@ -0,0 +1,7 @@
+{
+  "code": 0
+  ,"msg": "注册成功"
+  ,"data": {
+    
+  }
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/user/login.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/user/login.js
new file mode 100644
index 0000000..ff906d5
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/user/login.js
@@ -0,0 +1,7 @@
+{
+  "code": 0
+  ,"msg": "登入成功"
+  ,"data": {
+    "access_token": "c262e61cd13ad99fc650e6908c7e5e65b63d2f32185ecfed6b801ee3fbdd5c0a"
+  }
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/user/logout.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/user/logout.js
new file mode 100644
index 0000000..9fd1ff2
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/user/logout.js
@@ -0,0 +1,5 @@
+{
+  "code": 0
+  ,"msg": "退出成功"
+  ,"data": null
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/user/reg.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/user/reg.js
new file mode 100644
index 0000000..836bba4
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/user/reg.js
@@ -0,0 +1,7 @@
+{
+  "code": 0
+  ,"msg": "注册成功"
+  ,"data": {
+    
+  }
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/user/resetpass.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/user/resetpass.js
new file mode 100644
index 0000000..836bba4
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/user/resetpass.js
@@ -0,0 +1,7 @@
+{
+  "code": 0
+  ,"msg": "注册成功"
+  ,"data": {
+    
+  }
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/user/session.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/user/session.js
new file mode 100644
index 0000000..54ce1ef
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/user/session.js
@@ -0,0 +1,9 @@
+{
+  "code": 0
+  ,"msg": ""
+  ,"data": {
+    "username": "贤心"
+    ,"sex": "男"
+    ,"role": 1
+  }
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/user/sms.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/user/sms.js
new file mode 100644
index 0000000..836bba4
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/user/sms.js
@@ -0,0 +1,7 @@
+{
+  "code": 0
+  ,"msg": "注册成功"
+  ,"data": {
+    
+  }
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/useradmin/mangadmin.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/useradmin/mangadmin.js
new file mode 100644
index 0000000..50d3e28
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/useradmin/mangadmin.js
@@ -0,0 +1,78 @@
+{
+  "code": 0
+  ,"msg": ""
+  ,"count": "100"
+  ,"data": [{
+    "id": "1001"
+    ,"loginname": "admin"
+    ,"telphone": "11111111111"
+    ,"email": "111@qq.com"
+    ,"role": "超级管理员"
+    ,"jointime": "20150217"
+    ,"check": true
+  },{
+    "id": "1002"
+    ,"loginname": "common-1"
+    ,"telphone": "22222222222"
+    ,"email": "222@qq.com"
+    ,"role": "管理员"
+    ,"jointime": "20160217"
+    ,"check": false
+  },{
+    "id": "1003"
+    ,"loginname": "common-2"
+    ,"telphone": "33333333333"
+    ,"email": "333@qq.com"
+    ,"role": "管理员"
+    ,"jointime": "20161012"
+    ,"check": false
+  },{
+    "id": "1004"
+    ,"loginname": "common-3"
+    ,"telphone": "44444444444"
+    ,"email": "444@qq.com"
+    ,"role": "管理员"
+    ,"jointime": "20170518"
+    ,"check": true
+  },{
+    "id": "1005"
+    ,"loginname": "common-4"
+    ,"telphone": "55555555555"
+    ,"email": "555@qq.com"
+    ,"role": "管理员"
+    ,"jointime": "20180101"
+    ,"check": false
+  },{
+    "id": "1006"
+    ,"loginname": "common-5"
+    ,"telphone": "66666666666"
+    ,"email": "666@qq.com"
+    ,"role": "管理员"
+    ,"jointime": "20160217"
+    ,"check": false
+  },{
+    "id": "1007"
+    ,"loginname": "common-6"
+    ,"telphone": "77777777777"
+    ,"email": "777@qq.com"
+    ,"role": "管理员"
+    ,"jointime": "20161012"
+    ,"check": false
+  },{
+    "id": "1008"
+    ,"loginname": "common-7"
+    ,"telphone": "88888888888"
+    ,"email": "888@qq.com"
+    ,"role": "管理员"
+    ,"jointime": "20170518"
+    ,"check": true
+  },{
+    "id": "1009"
+    ,"loginname": "common-8"
+    ,"telphone": "99999999999"
+    ,"email": "999@qq.com"
+    ,"role": "管理员"
+    ,"jointime": "20180101"
+    ,"check": false
+  }]
+}
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/useradmin/role.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/useradmin/role.js
new file mode 100644
index 0000000..6d5ba5d
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/useradmin/role.js
@@ -0,0 +1,54 @@
+{
+  "code": 0
+  ,"msg": ""
+  ,"count": "100"
+  ,"data": [{
+    "id": "1"
+    ,"rolename": "超级管理员"
+    ,"limits": "管理所有的管理员"
+    ,"descr": "拥有至高无上的权利"
+    ,"check": true
+  },{
+    "id": "2"
+    ,"rolename": "管理员"
+    ,"limits": "所有列表的管理"
+    ,"descr": "事情很多，权力很大"
+    ,"check": true
+  },{
+    "id": "3"
+    ,"rolename": "文章撰写员"
+    ,"limits": "负责文章的编写"
+    ,"descr": "文采第一的人才集合"
+    ,"check": false
+  },{
+    "id": "4"
+    ,"rolename": "纠错员"
+    ,"limits": "负责文章内容的修改"
+    ,"descr": "暂无"
+    ,"check": false
+  },{
+    "id": "5"
+    ,"rolename": "统计人员"
+    ,"limits": "对数据进行统计"
+    ,"descr": "暂无"
+    ,"check": false
+  },{
+    "id": "6"
+    ,"rolename": "评估员"
+    ,"limits": "对统计数据进行评估"
+    ,"descr": "及时捕捉市场发展动态"
+    ,"check": false
+  },{
+    "id": "7"
+    ,"rolename": "采购员"
+    ,"limits": "负责员工的伙食"
+    ,"descr": "暂无"
+    ,"check": false
+  },{
+    "id": "8"
+    ,"rolename": "推销员"
+    ,"limits": "介绍销售公司产品"
+    ,"descr": "暂无"
+    ,"check": false
+  }]
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/useradmin/webuser.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/useradmin/webuser.js
new file mode 100644
index 0000000..02a7b41
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/useradmin/webuser.js
@@ -0,0 +1,143 @@
+{
+  "code": 0
+  ,"msg": ""
+  ,"count": "100"
+  ,"data": [{
+    "id": "001"
+    ,"username": "用户-1"
+    ,"avatar": "https://wx4.sinaimg.cn/mw1024/5db11ff4gy1fmx4keaw9pj20dw08caa4.jpg"
+    ,"phone": 12345678901
+    ,"email": "11111@qq.com"
+    ,"sex": "男"
+    ,"ip": "1111111"
+    ,"jointime": 20171204
+  },{
+    "id": "002"
+    ,"username": "用户-2"
+    ,"avatar": "https://wx4.sinaimg.cn/mw1024/5db11ff4gy1fmx4keaw9pj20dw08caa4.jpg"
+    ,"phone": 12345678901
+    ,"email": "11111@qq.com"
+    ,"sex": "男"
+    ,"ip": "1111111"
+    ,"jointime": 20171204
+  },{
+    "id": "003"
+    ,"username": "用户-3"
+    ,"avatar": "https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg"
+    ,"phone": 12345678901
+    ,"email": "11111@qq.com"
+    ,"sex": "女"
+    ,"ip": "1111111"
+    ,"jointime": 20171011
+    ,"LAY_CHECKED": true
+  },{
+    "id": "004"
+    ,"username": "用户-4"
+    ,"avatar": "https://wx4.sinaimg.cn/mw1024/5db11ff4gy1fmx4keaw9pj20dw08caa4.jpg"
+    ,"phone": 12345678901
+    ,"email": "11111@qq.com"
+    ,"sex": "男"
+    ,"ip": "1111111"
+    ,"jointime": 20160505
+  },{
+    "id": "005"
+    ,"username": "用户-5"
+    ,"avatar": "https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg"
+    ,"phone": 12345678901
+    ,"email": "11111@qq.com"
+    ,"sex": "男"
+    ,"ip": "1111111"
+    ,"jointime": 20171204
+  },{
+   "id": "006"
+    ,"username": "用户-6"
+    ,"avatar": "https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg"
+    ,"phone": 12345678901
+    ,"email": "11111@qq.com"
+    ,"sex": "男"
+    ,"ip": "1111111"
+    ,"jointime": 20171204
+  },{
+    "id": "007"
+    ,"username": "用户-7"
+    ,"avatar": "https://wx3.sinaimg.cn/mw690/5db11ff4gy1fmx4keca8ag208g06iglw.gif"
+    ,"phone": 12345678901
+    ,"email": "11111@qq.com"
+    ,"sex": "男"
+    ,"ip": "1111111"
+    ,"jointime": 20180210
+  },{
+    "id": "008"
+    ,"username": "用户-8"
+    ,"avatar": "https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg"
+    ,"phone": 12345678901
+    ,"email": "11111@qq.com"
+    ,"sex": "女"
+    ,"ip": "1111111"
+    ,"jointime": 20171204
+  },{
+   "id": "009"
+    ,"username": "用户-9"
+    ,"avatar": "https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg"
+    ,"phone": 12345678901
+    ,"email": "11111@qq.com"
+    ,"sex": "女"
+    ,"ip": "1111111"
+    ,"jointime": 20171204
+  },{
+    "id": "010"
+    ,"username": "用户-10"
+    ,"avatar": "https://wx4.sinaimg.cn/mw1024/5db11ff4gy1fmx4keaw9pj20dw08caa4.jpg"
+    ,"phone": 12345678901
+    ,"email": "11111@qq.com"
+    ,"sex": "男"
+    ,"ip": "1111111"
+    ,"jointime": 20170719
+  },{
+    "id": "011"
+    ,"username": "用户-11"
+    ,"avatar": "https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg"
+    ,"phone": 12345678901
+    ,"email": "11111@qq.com"
+    ,"sex": "男"
+    ,"ip": "1111111"
+    ,"jointime": 20171204
+  },{
+    "id": "012"
+    ,"username": "用户-12"
+    ,"avatar": "https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg"
+    ,"phone": 12345678901
+    ,"email": "11111@qq.com"
+    ,"sex": "女"
+    ,"ip": "1111111"
+    ,"jointime": 20171204
+  },{
+    "id": "013"
+    ,"username": "用户-13"
+    ,"avatar": "https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg"
+    ,"phone": 12345678901
+    ,"email": "11111@qq.com"
+    ,"sex": "女"
+    ,"ip": "1111111"
+    ,"jointime": 20171204
+    ,"LAY_CHECKED": true
+  },{
+    "id": "014"
+    ,"username": "用户-14"
+    ,"avatar": "https://wx3.sinaimg.cn/mw690/5db11ff4gy1fmx4keca8ag208g06iglw.gif"
+    ,"phone": 12345678901
+    ,"email": "11111@qq.com"
+    ,"sex": "男"
+    ,"ip": "1111111"
+    ,"jointime": 20171204
+  },{
+    "id": "015"
+    ,"username": "用户-15"
+    ,"avatar": "https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg"
+    ,"phone": 12345678901
+    ,"email": "11111@qq.com"
+    ,"sex": "男"
+    ,"ip": "1111111"
+    ,"jointime": 20171204
+  }]
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/workorder/demo.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/workorder/demo.js
new file mode 100644
index 0000000..81066c2
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/workorder/demo.js
@@ -0,0 +1,78 @@
+{
+  "code": 0
+  ,"msg": ""
+  ,"count": "100"
+  ,"data": [{
+    "orderid": 111
+    ,"title": "移动支付踏入马来西亚，聚合支付紧随其后"
+    ,"attr": "公告"
+    ,"progress": "25%"
+    ,"submit": "贤心"
+    ,"accept": "员工-1"
+    ,"state": "处理中"
+  },{
+    "orderid": 222
+    ,"title": "凡科拖拽式免费建站神器，享双重优惠！"
+    ,"attr": "讨论"
+    ,"progress": "100%"
+    ,"submit": "猫吃"
+    ,"accept": "员工-1"
+    ,"state": "已处理"
+  },{
+    "orderid": 333
+    ,"title": "看着别人的老板给员工送汽车有感"
+    ,"attr": "分享"
+    ,"progress": "0%"
+    ,"submit": "纸飞机"
+    ,"accept": ""
+    ,"state": "未分配"
+  },{
+    "orderid": 444
+    ,"title": "DISCUZ的云平台应该彻底完了"
+    ,"attr": "提问"
+    ,"progress": "0%"
+    ,"submit": "纸飞机"
+    ,"accept": ""
+    ,"state": "未分配"
+  },{
+    "orderid": 555
+    ,"title": "现在个人网站还有必要长期坚持下去吗？"
+    ,"attr": "提问"
+    ,"progress": "50%"
+    ,"submit": "纸飞机"
+    ,"accept": "员工-2"
+    ,"state": "处理中"
+  },{
+    "orderid": 666
+    ,"title": "向北京公安局投诉了京东商城"
+    ,"attr": "公告"
+    ,"progress": "25%"
+    ,"submit": "纸飞机"
+    ,"accept": "员工-3"
+    ,"state": "处理中"
+  },{
+    "orderid": 777
+    ,"title": "游戏 网页美工，一个月多少工资才正常？"
+    ,"attr": "提问"
+    ,"progress": "100%"
+    ,"submit": "纸飞机"
+    ,"accept": "员工-1"
+    ,"state": "已处理"
+  },{
+    "orderid": 888
+    ,"title": "几年没来了，蓝色理想帖子这么少了啊"
+    ,"attr": "提问"
+    ,"progress": "0%"
+    ,"submit": "纸飞机"
+    ,"accept": ""
+    ,"state": "未分配"
+  },{
+    "orderid": 999
+    ,"title": "我的天，求推荐靠谱的学习网站"
+    ,"attr": "提问"
+    ,"progress": "50%"
+    ,"submit": "纸飞机"
+    ,"accept": "员工-2"
+    ,"state": "处理中"
+  }]
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/说明.txt b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/说明.txt
new file mode 100644
index 0000000..ff402e5
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/json/说明.txt
@@ -0,0 +1,3 @@
+
+注意：这里是模拟的数据。
+实际应用时，请在模板文件（.html）中的 lay-url="" 和其它相关接口的 url 设置成你真实的接口地址
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/layui.css b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/layui.css
new file mode 100644
index 0000000..c784a25
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/layui.css
@@ -0,0 +1 @@
+.layui-inline,img{display:inline-block;vertical-align:middle}h1,h2,h3,h4,h5,h6{font-weight:400}a,body{color:#333}.layui-edge,.layui-header,.layui-inline,.layui-main{position:relative}.layui-edge,hr{height:0;overflow:hidden}.layui-layout-body,.layui-side,.layui-side-scroll{overflow-x:hidden}.layui-edge,.layui-elip,hr{overflow:hidden}.layui-btn,.layui-edge,.layui-inline,img{vertical-align:middle}.layui-btn,.layui-disabled,.layui-icon,.layui-unselect{-moz-user-select:none;-webkit-user-select:none;-ms-user-select:none}blockquote,body,button,dd,div,dl,dt,form,h1,h2,h3,h4,h5,h6,input,li,ol,p,pre,td,textarea,th,ul{margin:0;padding:0;-webkit-tap-highlight-color:rgba(0,0,0,0)}a:active,a:hover{outline:0}img{border:none}li{list-style:none}table{border-collapse:collapse;border-spacing:0}h4,h5,h6{font-size:100%}button,input,optgroup,option,select,textarea{font-family:inherit;font-size:inherit;font-style:inherit;font-weight:inherit;outline:0}pre{white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space:-o-pre-wrap;word-wrap:break-word}body{line-height:1.6;color:rgba(0,0,0,.85);font:14px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif}hr{line-height:0;margin:10px 0;padding:0;border:none!important;border-bottom:1px solid #eee!important;clear:both;background:0 0}a{text-decoration:none}a:hover{color:#777}a cite{font-style:normal;*cursor:pointer}.layui-border-box,.layui-border-box *{box-sizing:border-box}.layui-box,.layui-box *{box-sizing:content-box}.layui-clear{clear:both;*zoom:1}.layui-clear:after{content:'\20';clear:both;*zoom:1;display:block;height:0}.layui-inline{*display:inline;*zoom:1}.layui-btn,.layui-btn-group,.layui-edge{display:inline-block}.layui-edge{width:0;border-width:6px;border-style:dashed;border-color:transparent}.layui-edge-top{top:-4px;border-bottom-color:#999;border-bottom-style:solid}.layui-edge-right{border-left-color:#999;border-left-style:solid}.layui-edge-bottom{top:2px;border-top-color:#999;border-top-style:solid}.layui-edge-left{border-right-color:#999;border-right-style:solid}.layui-elip{text-overflow:ellipsis;white-space:nowrap}.layui-disabled,.layui-disabled:hover{color:#d2d2d2!important;cursor:not-allowed!important}.layui-circle{border-radius:100%}.layui-show{display:block!important}.layui-hide{display:none!important}.layui-show-v{visibility:visible!important}.layui-hide-v{visibility:hidden!important}@font-face{font-family:layui-icon;src:url(../font/iconfont.eot?v=256);src:url(../font/iconfont.eot?v=256#iefix) format('embedded-opentype'),url(../font/iconfont.woff2?v=256) format('woff2'),url(../font/iconfont.woff?v=256) format('woff'),url(../font/iconfont.ttf?v=256) format('truetype'),url(../font/iconfont.svg?v=256#layui-icon) format('svg')}.layui-icon{font-family:layui-icon!important;font-size:16px;font-style:normal;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.layui-icon-reply-fill:before{content:"\e611"}.layui-icon-set-fill:before{content:"\e614"}.layui-icon-menu-fill:before{content:"\e60f"}.layui-icon-search:before{content:"\e615"}.layui-icon-share:before{content:"\e641"}.layui-icon-set-sm:before{content:"\e620"}.layui-icon-engine:before{content:"\e628"}.layui-icon-close:before{content:"\1006"}.layui-icon-close-fill:before{content:"\1007"}.layui-icon-chart-screen:before{content:"\e629"}.layui-icon-star:before{content:"\e600"}.layui-icon-circle-dot:before{content:"\e617"}.layui-icon-chat:before{content:"\e606"}.layui-icon-release:before{content:"\e609"}.layui-icon-list:before{content:"\e60a"}.layui-icon-chart:before{content:"\e62c"}.layui-icon-ok-circle:before{content:"\1005"}.layui-icon-layim-theme:before{content:"\e61b"}.layui-icon-table:before{content:"\e62d"}.layui-icon-right:before{content:"\e602"}.layui-icon-left:before{content:"\e603"}.layui-icon-cart-simple:before{content:"\e698"}.layui-icon-face-cry:before{content:"\e69c"}.layui-icon-face-smile:before{content:"\e6af"}.layui-icon-survey:before{content:"\e6b2"}.layui-icon-tree:before{content:"\e62e"}.layui-icon-ie:before{content:"\e7bb"}.layui-icon-upload-circle:before{content:"\e62f"}.layui-icon-add-circle:before{content:"\e61f"}.layui-icon-download-circle:before{content:"\e601"}.layui-icon-templeate-1:before{content:"\e630"}.layui-icon-util:before{content:"\e631"}.layui-icon-face-surprised:before{content:"\e664"}.layui-icon-edit:before{content:"\e642"}.layui-icon-speaker:before{content:"\e645"}.layui-icon-down:before{content:"\e61a"}.layui-icon-file:before{content:"\e621"}.layui-icon-layouts:before{content:"\e632"}.layui-icon-rate-half:before{content:"\e6c9"}.layui-icon-add-circle-fine:before{content:"\e608"}.layui-icon-prev-circle:before{content:"\e633"}.layui-icon-read:before{content:"\e705"}.layui-icon-404:before{content:"\e61c"}.layui-icon-carousel:before{content:"\e634"}.layui-icon-help:before{content:"\e607"}.layui-icon-code-circle:before{content:"\e635"}.layui-icon-windows:before{content:"\e67f"}.layui-icon-water:before{content:"\e636"}.layui-icon-username:before{content:"\e66f"}.layui-icon-find-fill:before{content:"\e670"}.layui-icon-about:before{content:"\e60b"}.layui-icon-location:before{content:"\e715"}.layui-icon-up:before{content:"\e619"}.layui-icon-pause:before{content:"\e651"}.layui-icon-date:before{content:"\e637"}.layui-icon-layim-uploadfile:before{content:"\e61d"}.layui-icon-delete:before{content:"\e640"}.layui-icon-play:before{content:"\e652"}.layui-icon-top:before{content:"\e604"}.layui-icon-firefox:before{content:"\e686"}.layui-icon-friends:before{content:"\e612"}.layui-icon-refresh-3:before{content:"\e9aa"}.layui-icon-ok:before{content:"\e605"}.layui-icon-layer:before{content:"\e638"}.layui-icon-face-smile-fine:before{content:"\e60c"}.layui-icon-dollar:before{content:"\e659"}.layui-icon-group:before{content:"\e613"}.layui-icon-layim-download:before{content:"\e61e"}.layui-icon-picture-fine:before{content:"\e60d"}.layui-icon-link:before{content:"\e64c"}.layui-icon-diamond:before{content:"\e735"}.layui-icon-log:before{content:"\e60e"}.layui-icon-key:before{content:"\e683"}.layui-icon-rate-solid:before{content:"\e67a"}.layui-icon-fonts-del:before{content:"\e64f"}.layui-icon-unlink:before{content:"\e64d"}.layui-icon-fonts-clear:before{content:"\e639"}.layui-icon-triangle-r:before{content:"\e623"}.layui-icon-circle:before{content:"\e63f"}.layui-icon-radio:before{content:"\e643"}.layui-icon-align-center:before{content:"\e647"}.layui-icon-align-right:before{content:"\e648"}.layui-icon-align-left:before{content:"\e649"}.layui-icon-loading-1:before{content:"\e63e"}.layui-icon-return:before{content:"\e65c"}.layui-icon-fonts-strong:before{content:"\e62b"}.layui-icon-upload:before{content:"\e67c"}.layui-icon-dialogue:before{content:"\e63a"}.layui-icon-video:before{content:"\e6ed"}.layui-icon-headset:before{content:"\e6fc"}.layui-icon-cellphone-fine:before{content:"\e63b"}.layui-icon-add-1:before{content:"\e654"}.layui-icon-face-smile-b:before{content:"\e650"}.layui-icon-fonts-html:before{content:"\e64b"}.layui-icon-screen-full:before{content:"\e622"}.layui-icon-form:before{content:"\e63c"}.layui-icon-cart:before{content:"\e657"}.layui-icon-camera-fill:before{content:"\e65d"}.layui-icon-tabs:before{content:"\e62a"}.layui-icon-heart-fill:before{content:"\e68f"}.layui-icon-fonts-code:before{content:"\e64e"}.layui-icon-ios:before{content:"\e680"}.layui-icon-at:before{content:"\e687"}.layui-icon-fire:before{content:"\e756"}.layui-icon-set:before{content:"\e716"}.layui-icon-fonts-u:before{content:"\e646"}.layui-icon-triangle-d:before{content:"\e625"}.layui-icon-tips:before{content:"\e702"}.layui-icon-picture:before{content:"\e64a"}.layui-icon-more-vertical:before{content:"\e671"}.layui-icon-bluetooth:before{content:"\e689"}.layui-icon-flag:before{content:"\e66c"}.layui-icon-loading:before{content:"\e63d"}.layui-icon-fonts-i:before{content:"\e644"}.layui-icon-refresh-1:before{content:"\e666"}.layui-icon-rmb:before{content:"\e65e"}.layui-icon-addition:before{content:"\e624"}.layui-icon-home:before{content:"\e68e"}.layui-icon-time:before{content:"\e68d"}.layui-icon-user:before{content:"\e770"}.layui-icon-notice:before{content:"\e667"}.layui-icon-chrome:before{content:"\e68a"}.layui-icon-edge:before{content:"\e68b"}.layui-icon-login-weibo:before{content:"\e675"}.layui-icon-voice:before{content:"\e688"}.layui-icon-upload-drag:before{content:"\e681"}.layui-icon-login-qq:before{content:"\e676"}.layui-icon-snowflake:before{content:"\e6b1"}.layui-icon-heart:before{content:"\e68c"}.layui-icon-logout:before{content:"\e682"}.layui-icon-file-b:before{content:"\e655"}.layui-icon-template:before{content:"\e663"}.layui-icon-transfer:before{content:"\e691"}.layui-icon-auz:before{content:"\e672"}.layui-icon-console:before{content:"\e665"}.layui-icon-app:before{content:"\e653"}.layui-icon-prev:before{content:"\e65a"}.layui-icon-website:before{content:"\e7ae"}.layui-icon-next:before{content:"\e65b"}.layui-icon-component:before{content:"\e857"}.layui-icon-android:before{content:"\e684"}.layui-icon-more:before{content:"\e65f"}.layui-icon-login-wechat:before{content:"\e677"}.layui-icon-shrink-right:before{content:"\e668"}.layui-icon-spread-left:before{content:"\e66b"}.layui-icon-camera:before{content:"\e660"}.layui-icon-note:before{content:"\e66e"}.layui-icon-refresh:before{content:"\e669"}.layui-icon-female:before{content:"\e661"}.layui-icon-male:before{content:"\e662"}.layui-icon-screen-restore:before{content:"\e758"}.layui-icon-password:before{content:"\e673"}.layui-icon-senior:before{content:"\e674"}.layui-icon-theme:before{content:"\e66a"}.layui-icon-tread:before{content:"\e6c5"}.layui-icon-praise:before{content:"\e6c6"}.layui-icon-star-fill:before{content:"\e658"}.layui-icon-rate:before{content:"\e67b"}.layui-icon-template-1:before{content:"\e656"}.layui-icon-vercode:before{content:"\e679"}.layui-icon-service:before{content:"\e626"}.layui-icon-cellphone:before{content:"\e678"}.layui-icon-print:before{content:"\e66d"}.layui-icon-cols:before{content:"\e610"}.layui-icon-wifi:before{content:"\e7e0"}.layui-icon-export:before{content:"\e67d"}.layui-icon-rss:before{content:"\e808"}.layui-icon-slider:before{content:"\e714"}.layui-icon-email:before{content:"\e618"}.layui-icon-subtraction:before{content:"\e67e"}.layui-icon-mike:before{content:"\e6dc"}.layui-icon-light:before{content:"\e748"}.layui-icon-gift:before{content:"\e627"}.layui-icon-mute:before{content:"\e685"}.layui-icon-reduce-circle:before{content:"\e616"}.layui-icon-music:before{content:"\e690"}.layui-main{width:1140px;margin:0 auto}.layui-header{z-index:1000;height:60px}.layui-header a:hover{transition:all .5s;-webkit-transition:all .5s}.layui-side{position:fixed;left:0;top:0;bottom:0;z-index:999;width:200px}.layui-side-scroll{position:relative;width:220px;height:100%}.layui-body{position:relative;left:200px;right:0;top:0;bottom:0;z-index:900;width:auto;box-sizing:border-box}.layui-layout-admin .layui-header{position:fixed;top:0;left:0;right:0;background-color:#23262E}.layui-layout-admin .layui-side{top:60px;width:200px;overflow-x:hidden}.layui-layout-admin .layui-body{position:absolute;top:60px;padding-bottom:44px}.layui-layout-admin .layui-main{width:auto;margin:0 15px}.layui-layout-admin .layui-footer{position:fixed;left:200px;right:0;bottom:0;z-index:990;height:44px;line-height:44px;padding:0 15px;box-shadow:-1px 0 4px rgb(0 0 0 / 12%);background-color:#FAFAFA}.layui-layout-admin .layui-logo{position:absolute;left:0;top:0;width:200px;height:100%;line-height:60px;text-align:center;color:#009688;font-size:16px;box-shadow:0 1px 2px 0 rgb(0 0 0 / 15%)}.layui-layout-admin .layui-header .layui-nav{background:0 0}.layui-layout-left{position:absolute!important;left:200px;top:0}.layui-layout-right{position:absolute!important;right:0;top:0}.layui-container{position:relative;margin:0 auto;padding:0 15px;box-sizing:border-box}.layui-fluid{position:relative;margin:0 auto;padding:0 15px}.layui-row:after,.layui-row:before{content:"";display:block;clear:both}.layui-col-lg1,.layui-col-lg10,.layui-col-lg11,.layui-col-lg12,.layui-col-lg2,.layui-col-lg3,.layui-col-lg4,.layui-col-lg5,.layui-col-lg6,.layui-col-lg7,.layui-col-lg8,.layui-col-lg9,.layui-col-md1,.layui-col-md10,.layui-col-md11,.layui-col-md12,.layui-col-md2,.layui-col-md3,.layui-col-md4,.layui-col-md5,.layui-col-md6,.layui-col-md7,.layui-col-md8,.layui-col-md9,.layui-col-sm1,.layui-col-sm10,.layui-col-sm11,.layui-col-sm12,.layui-col-sm2,.layui-col-sm3,.layui-col-sm4,.layui-col-sm5,.layui-col-sm6,.layui-col-sm7,.layui-col-sm8,.layui-col-sm9,.layui-col-xs1,.layui-col-xs10,.layui-col-xs11,.layui-col-xs12,.layui-col-xs2,.layui-col-xs3,.layui-col-xs4,.layui-col-xs5,.layui-col-xs6,.layui-col-xs7,.layui-col-xs8,.layui-col-xs9{position:relative;display:block;box-sizing:border-box}.layui-col-xs1,.layui-col-xs10,.layui-col-xs11,.layui-col-xs12,.layui-col-xs2,.layui-col-xs3,.layui-col-xs4,.layui-col-xs5,.layui-col-xs6,.layui-col-xs7,.layui-col-xs8,.layui-col-xs9{float:left}.layui-col-xs1{width:8.33333333%}.layui-col-xs2{width:16.66666667%}.layui-col-xs3{width:25%}.layui-col-xs4{width:33.33333333%}.layui-col-xs5{width:41.66666667%}.layui-col-xs6{width:50%}.layui-col-xs7{width:58.33333333%}.layui-col-xs8{width:66.66666667%}.layui-col-xs9{width:75%}.layui-col-xs10{width:83.33333333%}.layui-col-xs11{width:91.66666667%}.layui-col-xs12{width:100%}.layui-col-xs-offset1{margin-left:8.33333333%}.layui-col-xs-offset2{margin-left:16.66666667%}.layui-col-xs-offset3{margin-left:25%}.layui-col-xs-offset4{margin-left:33.33333333%}.layui-col-xs-offset5{margin-left:41.66666667%}.layui-col-xs-offset6{margin-left:50%}.layui-col-xs-offset7{margin-left:58.33333333%}.layui-col-xs-offset8{margin-left:66.66666667%}.layui-col-xs-offset9{margin-left:75%}.layui-col-xs-offset10{margin-left:83.33333333%}.layui-col-xs-offset11{margin-left:91.66666667%}.layui-col-xs-offset12{margin-left:100%}@media screen and (max-width:768px){.layui-hide-xs{display:none!important}.layui-show-xs-block{display:block!important}.layui-show-xs-inline{display:inline!important}.layui-show-xs-inline-block{display:inline-block!important}}@media screen and (min-width:768px){.layui-container{width:750px}.layui-hide-sm{display:none!important}.layui-show-sm-block{display:block!important}.layui-show-sm-inline{display:inline!important}.layui-show-sm-inline-block{display:inline-block!important}.layui-col-sm1,.layui-col-sm10,.layui-col-sm11,.layui-col-sm12,.layui-col-sm2,.layui-col-sm3,.layui-col-sm4,.layui-col-sm5,.layui-col-sm6,.layui-col-sm7,.layui-col-sm8,.layui-col-sm9{float:left}.layui-col-sm1{width:8.33333333%}.layui-col-sm2{width:16.66666667%}.layui-col-sm3{width:25%}.layui-col-sm4{width:33.33333333%}.layui-col-sm5{width:41.66666667%}.layui-col-sm6{width:50%}.layui-col-sm7{width:58.33333333%}.layui-col-sm8{width:66.66666667%}.layui-col-sm9{width:75%}.layui-col-sm10{width:83.33333333%}.layui-col-sm11{width:91.66666667%}.layui-col-sm12{width:100%}.layui-col-sm-offset1{margin-left:8.33333333%}.layui-col-sm-offset2{margin-left:16.66666667%}.layui-col-sm-offset3{margin-left:25%}.layui-col-sm-offset4{margin-left:33.33333333%}.layui-col-sm-offset5{margin-left:41.66666667%}.layui-col-sm-offset6{margin-left:50%}.layui-col-sm-offset7{margin-left:58.33333333%}.layui-col-sm-offset8{margin-left:66.66666667%}.layui-col-sm-offset9{margin-left:75%}.layui-col-sm-offset10{margin-left:83.33333333%}.layui-col-sm-offset11{margin-left:91.66666667%}.layui-col-sm-offset12{margin-left:100%}}@media screen and (min-width:992px){.layui-container{width:970px}.layui-hide-md{display:none!important}.layui-show-md-block{display:block!important}.layui-show-md-inline{display:inline!important}.layui-show-md-inline-block{display:inline-block!important}.layui-col-md1,.layui-col-md10,.layui-col-md11,.layui-col-md12,.layui-col-md2,.layui-col-md3,.layui-col-md4,.layui-col-md5,.layui-col-md6,.layui-col-md7,.layui-col-md8,.layui-col-md9{float:left}.layui-col-md1{width:8.33333333%}.layui-col-md2{width:16.66666667%}.layui-col-md3{width:25%}.layui-col-md4{width:33.33333333%}.layui-col-md5{width:41.66666667%}.layui-col-md6{width:50%}.layui-col-md7{width:58.33333333%}.layui-col-md8{width:66.66666667%}.layui-col-md9{width:75%}.layui-col-md10{width:83.33333333%}.layui-col-md11{width:91.66666667%}.layui-col-md12{width:100%}.layui-col-md-offset1{margin-left:8.33333333%}.layui-col-md-offset2{margin-left:16.66666667%}.layui-col-md-offset3{margin-left:25%}.layui-col-md-offset4{margin-left:33.33333333%}.layui-col-md-offset5{margin-left:41.66666667%}.layui-col-md-offset6{margin-left:50%}.layui-col-md-offset7{margin-left:58.33333333%}.layui-col-md-offset8{margin-left:66.66666667%}.layui-col-md-offset9{margin-left:75%}.layui-col-md-offset10{margin-left:83.33333333%}.layui-col-md-offset11{margin-left:91.66666667%}.layui-col-md-offset12{margin-left:100%}}@media screen and (min-width:1200px){.layui-container{width:1170px}.layui-hide-lg{display:none!important}.layui-show-lg-block{display:block!important}.layui-show-lg-inline{display:inline!important}.layui-show-lg-inline-block{display:inline-block!important}.layui-col-lg1,.layui-col-lg10,.layui-col-lg11,.layui-col-lg12,.layui-col-lg2,.layui-col-lg3,.layui-col-lg4,.layui-col-lg5,.layui-col-lg6,.layui-col-lg7,.layui-col-lg8,.layui-col-lg9{float:left}.layui-col-lg1{width:8.33333333%}.layui-col-lg2{width:16.66666667%}.layui-col-lg3{width:25%}.layui-col-lg4{width:33.33333333%}.layui-col-lg5{width:41.66666667%}.layui-col-lg6{width:50%}.layui-col-lg7{width:58.33333333%}.layui-col-lg8{width:66.66666667%}.layui-col-lg9{width:75%}.layui-col-lg10{width:83.33333333%}.layui-col-lg11{width:91.66666667%}.layui-col-lg12{width:100%}.layui-col-lg-offset1{margin-left:8.33333333%}.layui-col-lg-offset2{margin-left:16.66666667%}.layui-col-lg-offset3{margin-left:25%}.layui-col-lg-offset4{margin-left:33.33333333%}.layui-col-lg-offset5{margin-left:41.66666667%}.layui-col-lg-offset6{margin-left:50%}.layui-col-lg-offset7{margin-left:58.33333333%}.layui-col-lg-offset8{margin-left:66.66666667%}.layui-col-lg-offset9{margin-left:75%}.layui-col-lg-offset10{margin-left:83.33333333%}.layui-col-lg-offset11{margin-left:91.66666667%}.layui-col-lg-offset12{margin-left:100%}}.layui-col-space1{margin:-.5px}.layui-col-space1>*{padding:.5px}.layui-col-space2{margin:-1px}.layui-col-space2>*{padding:1px}.layui-col-space4{margin:-2px}.layui-col-space4>*{padding:2px}.layui-col-space5{margin:-2.5px}.layui-col-space5>*{padding:2.5px}.layui-col-space6{margin:-3px}.layui-col-space6>*{padding:3px}.layui-col-space8{margin:-4px}.layui-col-space8>*{padding:4px}.layui-col-space10{margin:-5px}.layui-col-space10>*{padding:5px}.layui-col-space12{margin:-6px}.layui-col-space12>*{padding:6px}.layui-col-space14{margin:-7px}.layui-col-space14>*{padding:7px}.layui-col-space15{margin:-7.5px}.layui-col-space15>*{padding:7.5px}.layui-col-space16{margin:-8px}.layui-col-space16>*{padding:8px}.layui-col-space18{margin:-9px}.layui-col-space18>*{padding:9px}.layui-col-space20{margin:-10px}.layui-col-space20>*{padding:10px}.layui-col-space22{margin:-11px}.layui-col-space22>*{padding:11px}.layui-col-space24{margin:-12px}.layui-col-space24>*{padding:12px}.layui-col-space25{margin:-12.5px}.layui-col-space25>*{padding:12.5px}.layui-col-space26{margin:-13px}.layui-col-space26>*{padding:13px}.layui-col-space28{margin:-14px}.layui-col-space28>*{padding:14px}.layui-col-space30{margin:-15px}.layui-col-space30>*{padding:15px}.layui-btn,.layui-input,.layui-select,.layui-textarea,.layui-upload-button{outline:0;-webkit-appearance:none;transition:all .3s;-webkit-transition:all .3s;box-sizing:border-box}.layui-elem-quote{margin-bottom:10px;padding:15px;line-height:1.6;border-left:5px solid #5FB878;border-radius:0 2px 2px 0;background-color:#FAFAFA}.layui-quote-nm{border-style:solid;border-width:1px 1px 1px 5px;background:0 0}.layui-elem-field{margin-bottom:10px;padding:0;border-width:1px;border-style:solid}.layui-elem-field legend{margin-left:20px;padding:0 10px;font-size:20px;font-weight:300}.layui-field-title{margin:10px 0 20px;border-width:1px 0 0}.layui-field-box{padding:15px}.layui-field-title .layui-field-box{padding:10px 0}.layui-progress{position:relative;height:6px;border-radius:20px;background-color:#eee}.layui-progress-bar{position:absolute;left:0;top:0;width:0;max-width:100%;height:6px;border-radius:20px;text-align:right;background-color:#5FB878;transition:all .3s;-webkit-transition:all .3s}.layui-progress-big,.layui-progress-big .layui-progress-bar{height:18px;line-height:18px}.layui-progress-text{position:relative;top:-20px;line-height:18px;font-size:12px;color:#666}.layui-progress-big .layui-progress-text{position:static;padding:0 10px;color:#fff}.layui-collapse{border-width:1px;border-style:solid;border-radius:2px}.layui-colla-content,.layui-colla-item{border-top-width:1px;border-top-style:solid}.layui-colla-item:first-child{border-top:none}.layui-colla-title{position:relative;height:42px;line-height:42px;padding:0 15px 0 35px;color:#333;background-color:#FAFAFA;cursor:pointer;font-size:14px;overflow:hidden}.layui-colla-content{display:none;padding:10px 15px;line-height:1.6;color:#666}.layui-colla-icon{position:absolute;left:15px;top:0;font-size:14px}.layui-card-body,.layui-card-header,.layui-form-label,.layui-form-mid,.layui-form-select,.layui-input-block,.layui-input-inline,.layui-panel,.layui-textarea{position:relative}.layui-card{margin-bottom:15px;border-radius:2px;background-color:#fff;box-shadow:0 1px 2px 0 rgba(0,0,0,.05)}.layui-form-select dl,.layui-panel{box-shadow:1px 1px 4px rgb(0 0 0 / 8%)}.layui-card:last-child{margin-bottom:0}.layui-card-header{height:42px;line-height:42px;padding:0 15px;border-bottom:1px solid #f6f6f6;color:#333;border-radius:2px 2px 0 0;font-size:14px}.layui-card-body{padding:10px 15px;line-height:24px}.layui-card-body[pad15]{padding:15px}.layui-card-body[pad20]{padding:20px}.layui-card-body .layui-table{margin:5px 0}.layui-card .layui-tab{margin:0}.layui-panel{border-width:1px;border-style:solid;border-radius:2px;background-color:#fff;color:#666}.layui-bg-black,.layui-bg-blue,.layui-bg-cyan,.layui-bg-green,.layui-bg-orange,.layui-bg-red{color:#fff!important}.layui-panel-window{position:relative;padding:15px;border-radius:0;border-top:5px solid #eee;background-color:#fff}.layui-border,.layui-border-black,.layui-border-blue,.layui-border-cyan,.layui-border-green,.layui-border-orange,.layui-border-red{border-width:1px;border-style:solid}.layui-auxiliar-moving{position:fixed;left:0;right:0;top:0;bottom:0;width:100%;height:100%;background:0 0;z-index:9999999999}.layui-bg-red{background-color:#FF5722!important}.layui-bg-orange{background-color:#FFB800!important}.layui-bg-green{background-color:#009688!important}.layui-bg-cyan{background-color:#2F4056!important}.layui-bg-blue{background-color:#1E9FFF!important}.layui-bg-black{background-color:#393D49!important}.layui-bg-gray{background-color:#FAFAFA!important;color:#666!important}.layui-badge-rim,.layui-border,.layui-colla-content,.layui-colla-item,.layui-collapse,.layui-elem-field,.layui-form-pane .layui-form-item[pane],.layui-form-pane .layui-form-label,.layui-input,.layui-layedit,.layui-layedit-tool,.layui-panel,.layui-quote-nm,.layui-select,.layui-tab-bar,.layui-tab-card,.layui-tab-title,.layui-tab-title .layui-this:after,.layui-textarea{border-color:#eee}.layui-border{color:#666!important}.layui-border-red{border-color:#FF5722!important;color:#FF5722!important}.layui-border-orange{border-color:#FFB800!important;color:#FFB800!important}.layui-border-green{border-color:#009688!important;color:#009688!important}.layui-border-cyan{border-color:#2F4056!important;color:#2F4056!important}.layui-border-blue{border-color:#1E9FFF!important;color:#1E9FFF!important}.layui-border-black{border-color:#393D49!important;color:#393D49!important}.layui-timeline-item:before{background-color:#eee}.layui-text{line-height:1.6;font-size:14px;color:#666}.layui-text h1,.layui-text h2,.layui-text h3{font-weight:500;color:#333}.layui-text h1{font-size:30px}.layui-text h2{font-size:24px}.layui-text h3{font-size:18px}.layui-text a:not(.layui-btn){color:#01AAED}.layui-text a:not(.layui-btn):hover{text-decoration:underline}.layui-text ul{padding:5px 0 5px 15px}.layui-text ul li{margin-top:5px;list-style-type:disc}.layui-text em,.layui-word-aux{color:#999!important;padding-left:5px!important;padding-right:5px!important}.layui-text p{margin:10px 0}.layui-text p:first-child{margin-top:0}.layui-font-12{font-size:12px!important}.layui-font-14{font-size:14px!important}.layui-font-16{font-size:16px!important}.layui-font-18{font-size:18px!important}.layui-font-20{font-size:20px!important}.layui-font-red{color:#FF5722!important}.layui-font-orange{color:#FFB800!important}.layui-font-green{color:#009688!important}.layui-font-cyan{color:#2F4056!important}.layui-font-blue{color:#01AAED!important}.layui-font-black{color:#000!important}.layui-font-gray{color:#c2c2c2!important}.layui-btn{height:38px;line-height:38px;border:1px solid transparent;padding:0 18px;background-color:#009688;color:#fff;white-space:nowrap;text-align:center;font-size:14px;border-radius:2px;cursor:pointer}.layui-btn:hover{opacity:.8;filter:alpha(opacity=80);color:#fff}.layui-btn:active{opacity:1;filter:alpha(opacity=100)}.layui-btn+.layui-btn{margin-left:10px}.layui-btn-container{font-size:0}.layui-btn-container .layui-btn{margin-right:10px;margin-bottom:10px}.layui-btn-container .layui-btn+.layui-btn{margin-left:0}.layui-table .layui-btn-container .layui-btn{margin-bottom:9px}.layui-btn-radius{border-radius:100px}.layui-btn .layui-icon{padding:0 2px;vertical-align:middle\9;vertical-align:bottom}.layui-btn-primary{border-color:#d2d2d2;background:0 0;color:#666}.layui-btn-primary:hover{border-color:#009688;color:#333}.layui-btn-normal{background-color:#1E9FFF}.layui-btn-warm{background-color:#FFB800}.layui-btn-danger{background-color:#FF5722}.layui-btn-checked{background-color:#5FB878}.layui-btn-disabled,.layui-btn-disabled:active,.layui-btn-disabled:hover{border-color:#eee!important;background-color:#FBFBFB!important;color:#d2d2d2!important;cursor:not-allowed!important;opacity:1}.layui-btn-lg{height:44px;line-height:44px;padding:0 25px;font-size:16px}.layui-btn-sm{height:30px;line-height:30px;padding:0 10px;font-size:12px}.layui-btn-xs{height:22px;line-height:22px;padding:0 5px;font-size:12px}.layui-btn-xs i{font-size:12px!important}.layui-btn-group{vertical-align:middle;font-size:0}.layui-btn-group .layui-btn{margin-left:0!important;margin-right:0!important;border-left:1px solid rgba(255,255,255,.5);border-radius:0}.layui-btn-group .layui-btn-primary{border-left:none}.layui-btn-group .layui-btn-primary:hover{border-color:#d2d2d2;color:#009688}.layui-btn-group .layui-btn:first-child{border-left:none;border-radius:2px 0 0 2px}.layui-btn-group .layui-btn-primary:first-child{border-left:1px solid #d2d2d2}.layui-btn-group .layui-btn:last-child{border-radius:0 2px 2px 0}.layui-btn-group .layui-btn+.layui-btn{margin-left:0}.layui-btn-group+.layui-btn-group{margin-left:10px}.layui-btn-fluid{width:100%}.layui-input,.layui-select,.layui-textarea{height:38px;line-height:1.3;line-height:38px\9;border-width:1px;border-style:solid;background-color:#fff;color:rgba(0,0,0,.85);border-radius:2px}.layui-input::-webkit-input-placeholder,.layui-select::-webkit-input-placeholder,.layui-textarea::-webkit-input-placeholder{line-height:1.3}.layui-input,.layui-textarea{display:block;width:100%;padding-left:10px}.layui-input:hover,.layui-textarea:hover{border-color:#eee!important}.layui-input:focus,.layui-textarea:focus{border-color:#d2d2d2!important}.layui-textarea{min-height:100px;height:auto;line-height:20px;padding:6px 10px;resize:vertical}.layui-select{padding:0 10px}.layui-form input[type=checkbox],.layui-form input[type=radio],.layui-form select{display:none}.layui-form [lay-ignore]{display:initial}.layui-form-item{margin-bottom:15px;clear:both;*zoom:1}.layui-form-item:after{content:'\20';clear:both;*zoom:1;display:block;height:0}.layui-form-label{float:left;display:block;padding:9px 15px;width:80px;font-weight:400;line-height:20px;text-align:right}.layui-form-label-col{display:block;float:none;padding:9px 0;line-height:20px;text-align:left}.layui-form-item .layui-inline{margin-bottom:5px;margin-right:10px}.layui-input-block{margin-left:110px;min-height:36px}.layui-input-inline{display:inline-block;vertical-align:middle}.layui-form-item .layui-input-inline{float:left;width:190px;margin-right:10px}.layui-form-text .layui-input-inline{width:auto}.layui-form-mid{float:left;display:block;padding:9px 0!important;line-height:20px;margin-right:10px}.layui-form-danger+.layui-form-select .layui-input,.layui-form-danger:focus{border-color:#FF5722!important}.layui-form-select .layui-input{padding-right:30px;cursor:pointer}.layui-form-select .layui-edge{position:absolute;right:10px;top:50%;margin-top:-3px;cursor:pointer;border-width:6px;border-top-color:#c2c2c2;border-top-style:solid;transition:all .3s;-webkit-transition:all .3s}.layui-form-select dl{display:none;position:absolute;left:0;top:42px;padding:5px 0;z-index:899;min-width:100%;border:1px solid #eee;max-height:300px;overflow-y:auto;background-color:#fff;border-radius:2px;box-sizing:border-box}.layui-form-select dl dd,.layui-form-select dl dt{padding:0 10px;line-height:36px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}.layui-form-select dl dt{font-size:12px;color:#999}.layui-form-select dl dd{cursor:pointer}.layui-form-select dl dd:hover{background-color:#F6F6F6;-webkit-transition:.5s all;transition:.5s all}.layui-form-select .layui-select-group dd{padding-left:20px}.layui-form-select dl dd.layui-select-tips{padding-left:10px!important;color:#999}.layui-form-select dl dd.layui-this{background-color:#5FB878;color:#fff}.layui-form-checkbox,.layui-form-select dl dd.layui-disabled{background-color:#fff}.layui-form-selected dl{display:block}.layui-form-checkbox,.layui-form-checkbox *,.layui-form-switch{display:inline-block;vertical-align:middle}.layui-form-selected .layui-edge{margin-top:-9px;-webkit-transform:rotate(180deg);transform:rotate(180deg);margin-top:-3px\9}:root .layui-form-selected .layui-edge{margin-top:-9px\0/IE9}.layui-form-selectup dl{top:auto;bottom:42px}.layui-select-none{margin:5px 0;text-align:center;color:#999}.layui-select-disabled .layui-disabled{border-color:#eee!important}.layui-select-disabled .layui-edge{border-top-color:#d2d2d2}.layui-form-checkbox{position:relative;height:30px;line-height:30px;margin-right:10px;padding-right:30px;cursor:pointer;font-size:0;-webkit-transition:.1s linear;transition:.1s linear;box-sizing:border-box}.layui-form-checkbox span{padding:0 10px;height:100%;font-size:14px;border-radius:2px 0 0 2px;background-color:#d2d2d2;color:#fff;overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.layui-form-checkbox:hover span{background-color:#c2c2c2}.layui-form-checkbox i{position:absolute;right:0;top:0;width:30px;height:28px;border:1px solid #d2d2d2;border-left:none;border-radius:0 2px 2px 0;color:#fff;font-size:20px;text-align:center}.layui-form-checkbox:hover i{border-color:#c2c2c2;color:#c2c2c2}.layui-form-checked,.layui-form-checked:hover{border-color:#5FB878}.layui-form-checked span,.layui-form-checked:hover span{background-color:#5FB878}.layui-form-checked i,.layui-form-checked:hover i{color:#5FB878}.layui-form-item .layui-form-checkbox{margin-top:4px}.layui-form-checkbox[lay-skin=primary]{height:auto!important;line-height:normal!important;min-width:18px;min-height:18px;border:none!important;margin-right:0;padding-left:28px;padding-right:0;background:0 0}.layui-form-checkbox[lay-skin=primary] span{padding-left:0;padding-right:15px;line-height:18px;background:0 0;color:#666}.layui-form-checkbox[lay-skin=primary] i{right:auto;left:0;width:16px;height:16px;line-height:16px;border:1px solid #d2d2d2;font-size:12px;border-radius:2px;background-color:#fff;-webkit-transition:.1s linear;transition:.1s linear}.layui-form-checkbox[lay-skin=primary]:hover i{border-color:#5FB878;color:#fff}.layui-form-checked[lay-skin=primary] i{border-color:#5FB878!important;background-color:#5FB878;color:#fff}.layui-checkbox-disabled[lay-skin=primary] span{background:0 0!important;color:#c2c2c2!important}.layui-checkbox-disabled[lay-skin=primary]:hover i{border-color:#d2d2d2}.layui-form-item .layui-form-checkbox[lay-skin=primary]{margin-top:10px}.layui-form-switch{position:relative;height:22px;line-height:22px;min-width:35px;padding:0 5px;margin-top:8px;border:1px solid #d2d2d2;border-radius:20px;cursor:pointer;background-color:#fff;-webkit-transition:.1s linear;transition:.1s linear}.layui-form-switch i{position:absolute;left:5px;top:3px;width:16px;height:16px;border-radius:20px;background-color:#d2d2d2;-webkit-transition:.1s linear;transition:.1s linear}.layui-form-switch em{position:relative;top:0;width:25px;margin-left:21px;padding:0!important;text-align:center!important;color:#999!important;font-style:normal!important;font-size:12px}.layui-form-onswitch{border-color:#5FB878;background-color:#5FB878}.layui-checkbox-disabled,.layui-checkbox-disabled i{border-color:#eee!important}.layui-form-onswitch i{left:100%;margin-left:-21px;background-color:#fff}.layui-form-onswitch em{margin-left:5px;margin-right:21px;color:#fff!important}.layui-checkbox-disabled span{background-color:#eee!important}.layui-checkbox-disabled em{color:#d2d2d2!important}.layui-checkbox-disabled:hover i{color:#fff!important}[lay-radio]{display:none}.layui-form-radio,.layui-form-radio *{display:inline-block;vertical-align:middle}.layui-form-radio{line-height:28px;margin:6px 10px 0 0;padding-right:10px;cursor:pointer;font-size:0}.layui-form-radio *{font-size:14px}.layui-form-radio>i{margin-right:8px;font-size:22px;color:#c2c2c2}.layui-form-radio:hover *,.layui-form-radioed,.layui-form-radioed>i{color:#5FB878}.layui-radio-disabled>i{color:#eee!important}.layui-radio-disabled *{color:#c2c2c2!important}.layui-form-pane .layui-form-label{width:110px;padding:8px 15px;height:38px;line-height:20px;border-width:1px;border-style:solid;border-radius:2px 0 0 2px;text-align:center;background-color:#FAFAFA;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;box-sizing:border-box}.layui-form-pane .layui-input-inline{margin-left:-1px}.layui-form-pane .layui-input-block{margin-left:110px;left:-1px}.layui-form-pane .layui-input{border-radius:0 2px 2px 0}.layui-form-pane .layui-form-text .layui-form-label{float:none;width:100%;border-radius:2px;box-sizing:border-box;text-align:left}.layui-form-pane .layui-form-text .layui-input-inline{display:block;margin:0;top:-1px;clear:both}.layui-form-pane .layui-form-text .layui-input-block{margin:0;left:0;top:-1px}.layui-form-pane .layui-form-text .layui-textarea{min-height:100px;border-radius:0 0 2px 2px}.layui-form-pane .layui-form-checkbox{margin:4px 0 4px 10px}.layui-form-pane .layui-form-radio,.layui-form-pane .layui-form-switch{margin-top:6px;margin-left:10px}.layui-form-pane .layui-form-item[pane]{position:relative;border-width:1px;border-style:solid}.layui-form-pane .layui-form-item[pane] .layui-form-label{position:absolute;left:0;top:0;height:100%;border-width:0 1px 0 0}.layui-form-pane .layui-form-item[pane] .layui-input-inline{margin-left:110px}@media screen and (max-width:450px){.layui-form-item .layui-form-label{text-overflow:ellipsis;overflow:hidden;white-space:nowrap}.layui-form-item .layui-inline{display:block;margin-right:0;margin-bottom:20px;clear:both}.layui-form-item .layui-inline:after{content:'\20';clear:both;display:block;height:0}.layui-form-item .layui-input-inline{display:block;float:none;left:-3px;width:auto!important;margin:0 0 10px 112px}.layui-form-item .layui-input-inline+.layui-form-mid{margin-left:110px;top:-5px;padding:0}.layui-form-item .layui-form-checkbox{margin-right:5px;margin-bottom:5px}}.layui-layedit{border-width:1px;border-style:solid;border-radius:2px}.layui-layedit-tool{padding:3px 5px;border-bottom-width:1px;border-bottom-style:solid;font-size:0}.layedit-tool-fixed{position:fixed;top:0;border-top:1px solid #eee}.layui-layedit-tool .layedit-tool-mid,.layui-layedit-tool .layui-icon{display:inline-block;vertical-align:middle;text-align:center;font-size:14px}.layui-layedit-tool .layui-icon{position:relative;width:32px;height:30px;line-height:30px;margin:3px 5px;color:#777;cursor:pointer;border-radius:2px}.layui-layedit-tool .layui-icon:hover{color:#393D49}.layui-layedit-tool .layui-icon:active{color:#000}.layui-layedit-tool .layedit-tool-active{background-color:#eee;color:#000}.layui-layedit-tool .layui-disabled,.layui-layedit-tool .layui-disabled:hover{color:#d2d2d2;cursor:not-allowed}.layui-layedit-tool .layedit-tool-mid{width:1px;height:18px;margin:0 10px;background-color:#d2d2d2}.layedit-tool-html{width:50px!important;font-size:30px!important}.layedit-tool-b,.layedit-tool-code,.layedit-tool-help{font-size:16px!important}.layedit-tool-d,.layedit-tool-face,.layedit-tool-image,.layedit-tool-unlink{font-size:18px!important}.layedit-tool-image input{position:absolute;font-size:0;left:0;top:0;width:100%;height:100%;opacity:.01;filter:Alpha(opacity=1);cursor:pointer}.layui-layedit-iframe iframe{display:block;width:100%}#LAY_layedit_code{overflow:hidden}.layui-laypage{display:inline-block;*display:inline;*zoom:1;vertical-align:middle;margin:10px 0;font-size:0}.layui-laypage>a:first-child,.layui-laypage>a:first-child em{border-radius:2px 0 0 2px}.layui-laypage>a:last-child,.layui-laypage>a:last-child em{border-radius:0 2px 2px 0}.layui-laypage>:first-child{margin-left:0!important}.layui-laypage>:last-child{margin-right:0!important}.layui-laypage a,.layui-laypage button,.layui-laypage input,.layui-laypage select,.layui-laypage span{border:1px solid #eee}.layui-laypage a,.layui-laypage span{display:inline-block;*display:inline;*zoom:1;vertical-align:middle;padding:0 15px;height:28px;line-height:28px;margin:0 -1px 5px 0;background-color:#fff;color:#333;font-size:12px}.layui-flow-more a *,.layui-laypage input,.layui-table-view select[lay-ignore]{display:inline-block}.layui-laypage a:hover{color:#009688}.layui-laypage em{font-style:normal}.layui-laypage .layui-laypage-spr{color:#999;font-weight:700}.layui-laypage a{text-decoration:none}.layui-laypage .layui-laypage-curr{position:relative}.layui-laypage .layui-laypage-curr em{position:relative;color:#fff}.layui-laypage .layui-laypage-curr .layui-laypage-em{position:absolute;left:-1px;top:-1px;padding:1px;width:100%;height:100%;background-color:#009688}.layui-laypage-em{border-radius:2px}.layui-laypage-next em,.layui-laypage-prev em{font-family:Sim sun;font-size:16px}.layui-laypage .layui-laypage-count,.layui-laypage .layui-laypage-limits,.layui-laypage .layui-laypage-refresh,.layui-laypage .layui-laypage-skip{margin-left:10px;margin-right:10px;padding:0;border:none}.layui-laypage .layui-laypage-limits,.layui-laypage .layui-laypage-refresh{vertical-align:top}.layui-laypage .layui-laypage-refresh i{font-size:18px;cursor:pointer}.layui-laypage select{height:22px;padding:3px;border-radius:2px;cursor:pointer}.layui-laypage .layui-laypage-skip{height:30px;line-height:30px;color:#999}.layui-laypage button,.layui-laypage input{height:30px;line-height:30px;border-radius:2px;vertical-align:top;background-color:#fff;box-sizing:border-box}.layui-laypage input{width:40px;margin:0 10px;padding:0 3px;text-align:center}.layui-laypage input:focus,.layui-laypage select:focus{border-color:#009688!important}.layui-laypage button{margin-left:10px;padding:0 10px;cursor:pointer}.layui-table,.layui-table-view{margin:10px 0}.layui-flow-more{margin:10px 0;text-align:center;color:#999;font-size:14px}.layui-flow-more a{height:32px;line-height:32px}.layui-flow-more a *{vertical-align:top}.layui-flow-more a cite{padding:0 20px;border-radius:3px;background-color:#eee;color:#333;font-style:normal}.layui-flow-more a cite:hover{opacity:.8}.layui-flow-more a i{font-size:30px;color:#737383}.layui-table{width:100%;background-color:#fff;color:#666}.layui-table tr{transition:all .3s;-webkit-transition:all .3s}.layui-table th{text-align:left;font-weight:400}.layui-table tbody tr:hover,.layui-table thead tr,.layui-table-click,.layui-table-header,.layui-table-hover,.layui-table-mend,.layui-table-patch,.layui-table-tool,.layui-table-total,.layui-table-total tr,.layui-table[lay-even] tr:nth-child(even){background-color:#FAFAFA}.layui-table td,.layui-table th,.layui-table-col-set,.layui-table-fixed-r,.layui-table-grid-down,.layui-table-header,.layui-table-page,.layui-table-tips-main,.layui-table-tool,.layui-table-total,.layui-table-view,.layui-table[lay-skin=line],.layui-table[lay-skin=row]{border-width:1px;border-style:solid;border-color:#eee}.layui-table td,.layui-table th{position:relative;padding:9px 15px;min-height:20px;line-height:20px;font-size:14px}.layui-table[lay-skin=line] td,.layui-table[lay-skin=line] th{border-width:0 0 1px}.layui-table[lay-skin=row] td,.layui-table[lay-skin=row] th{border-width:0 1px 0 0}.layui-table[lay-skin=nob] td,.layui-table[lay-skin=nob] th{border:none}.layui-table img{max-width:100px}.layui-table[lay-size=lg] td,.layui-table[lay-size=lg] th{padding:15px 30px}.layui-table-view .layui-table[lay-size=lg] .layui-table-cell{height:40px;line-height:40px}.layui-table[lay-size=sm] td,.layui-table[lay-size=sm] th{font-size:12px;padding:5px 10px}.layui-table-view .layui-table[lay-size=sm] .layui-table-cell{height:20px;line-height:20px}.layui-table[lay-data]{display:none}.layui-table-box{position:relative;overflow:hidden}.layui-table-view .layui-table{position:relative;width:auto;margin:0}.layui-table-view .layui-table[lay-skin=line]{border-width:0 1px 0 0}.layui-table-view .layui-table[lay-skin=row]{border-width:0 0 1px}.layui-table-view .layui-table td,.layui-table-view .layui-table th{padding:5px 0;border-top:none;border-left:none}.layui-table-view .layui-table th.layui-unselect .layui-table-cell span{cursor:pointer}.layui-table-view .layui-table td{cursor:default}.layui-table-view .layui-table td[data-edit=text]{cursor:text}.layui-table-view .layui-form-checkbox[lay-skin=primary] i{width:18px;height:18px}.layui-table-view .layui-form-radio{line-height:0;padding:0}.layui-table-view .layui-form-radio>i{margin:0;font-size:20px}.layui-table-init{position:absolute;left:0;top:0;width:100%;height:100%;text-align:center;z-index:110}.layui-table-init .layui-icon{position:absolute;left:50%;top:50%;margin:-15px 0 0 -15px;font-size:30px;color:#c2c2c2}.layui-table-header{border-width:0 0 1px;overflow:hidden}.layui-table-header .layui-table{margin-bottom:-1px}.layui-table-tool .layui-inline[lay-event]{position:relative;width:26px;height:26px;padding:5px;line-height:16px;margin-right:10px;text-align:center;color:#333;border:1px solid #ccc;cursor:pointer;-webkit-transition:.5s all;transition:.5s all}.layui-table-tool .layui-inline[lay-event]:hover{border:1px solid #999}.layui-table-tool-temp{padding-right:120px}.layui-table-tool-self{position:absolute;right:17px;top:10px}.layui-table-tool .layui-table-tool-self .layui-inline[lay-event]{margin:0 0 0 10px}.layui-table-tool-panel{position:absolute;top:29px;left:-1px;padding:5px 0;min-width:150px;min-height:40px;border:1px solid #d2d2d2;text-align:left;overflow-y:auto;background-color:#fff;box-shadow:0 2px 4px rgba(0,0,0,.12)}.layui-table-cell,.layui-table-tool-panel li{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.layui-table-tool-panel li{padding:0 10px;line-height:30px;-webkit-transition:.5s all;transition:.5s all}.layui-menu li,.layui-menu-body-title a:hover,.layui-menu-body-title>.layui-icon:hover{transition:all .3s}.layui-table-tool-panel li .layui-form-checkbox[lay-skin=primary]{width:100%;padding-left:28px}.layui-table-tool-panel li:hover{background-color:#F6F6F6}.layui-table-tool-panel li .layui-form-checkbox[lay-skin=primary] i{position:absolute;left:0;top:0}.layui-table-tool-panel li .layui-form-checkbox[lay-skin=primary] span{padding:0}.layui-table-tool .layui-table-tool-self .layui-table-tool-panel{left:auto;right:-1px}.layui-table-col-set{position:absolute;right:0;top:0;width:20px;height:100%;border-width:0 0 0 1px;background-color:#fff}.layui-table-sort{width:10px;height:20px;margin-left:5px;cursor:pointer!important}.layui-table-sort .layui-edge{position:absolute;left:5px;border-width:5px}.layui-table-sort .layui-table-sort-asc{top:3px;border-top:none;border-bottom-style:solid;border-bottom-color:#b2b2b2}.layui-table-sort .layui-table-sort-asc:hover{border-bottom-color:#666}.layui-table-sort .layui-table-sort-desc{bottom:5px;border-bottom:none;border-top-style:solid;border-top-color:#b2b2b2}.layui-table-sort .layui-table-sort-desc:hover{border-top-color:#666}.layui-table-sort[lay-sort=asc] .layui-table-sort-asc{border-bottom-color:#000}.layui-table-sort[lay-sort=desc] .layui-table-sort-desc{border-top-color:#000}.layui-table-cell{height:28px;line-height:28px;padding:0 15px;position:relative;box-sizing:border-box}.layui-table-cell .layui-form-checkbox[lay-skin=primary]{top:-1px;padding:0}.layui-table-cell .layui-table-link{color:#01AAED}.laytable-cell-checkbox,.laytable-cell-numbers,.laytable-cell-radio,.laytable-cell-space{padding:0;text-align:center}.layui-table-body{position:relative;overflow:auto;margin-right:-1px;margin-bottom:-1px}.layui-table-body .layui-none{line-height:26px;padding:30px 15px;text-align:center;color:#999}.layui-table-fixed{position:absolute;left:0;top:0;z-index:101}.layui-table-fixed .layui-table-body{overflow:hidden}.layui-table-fixed-l{box-shadow:1px 0 8px rgba(0,0,0,.08)}.layui-table-fixed-r{left:auto;right:-1px;border-width:0 0 0 1px;box-shadow:-1px 0 8px rgba(0,0,0,.08)}.layui-table-fixed-r .layui-table-header{position:relative;overflow:visible}.layui-table-mend{position:absolute;right:-49px;top:0;height:100%;width:50px}.layui-table-tool{position:relative;z-index:890;width:100%;min-height:50px;line-height:30px;padding:10px 15px;border-width:0 0 1px}.layui-table-tool .layui-btn-container{margin-bottom:-10px}.layui-table-page,.layui-table-total{border-width:1px 0 0;margin-bottom:-1px;overflow:hidden}.layui-table-page{position:relative;width:100%;padding:7px 7px 0;height:41px;font-size:12px;white-space:nowrap}.layui-table-page>div{height:26px}.layui-table-page .layui-laypage{margin:0}.layui-table-page .layui-laypage a,.layui-table-page .layui-laypage span{height:26px;line-height:26px;margin-bottom:10px;border:none;background:0 0}.layui-table-page .layui-laypage a,.layui-table-page .layui-laypage span.layui-laypage-curr{padding:0 12px}.layui-table-page .layui-laypage span{margin-left:0;padding:0}.layui-table-page .layui-laypage .layui-laypage-prev{margin-left:-7px!important}.layui-table-page .layui-laypage .layui-laypage-curr .layui-laypage-em{left:0;top:0;padding:0}.layui-table-page .layui-laypage button,.layui-table-page .layui-laypage input{height:26px;line-height:26px}.layui-table-page .layui-laypage input{width:40px}.layui-table-page .layui-laypage button{padding:0 10px}.layui-table-page select{height:18px}.layui-table-patch .layui-table-cell{padding:0;width:30px}.layui-table-edit{position:absolute;left:0;top:0;width:100%;height:100%;padding:0 14px 1px;border-radius:0;box-shadow:1px 1px 20px rgba(0,0,0,.15)}.layui-table-edit:focus{border-color:#5FB878!important}select.layui-table-edit{padding:0 0 0 10px;border-color:#d2d2d2}.layui-table-view .layui-form-checkbox,.layui-table-view .layui-form-radio,.layui-table-view .layui-form-switch{top:0;margin:0;box-sizing:content-box}.layui-colorpicker-alpha-slider,.layui-colorpicker-side-slider,.layui-menu,.layui-menu *,.layui-nav{box-sizing:border-box}.layui-table-view .layui-form-checkbox{top:-1px;height:26px;line-height:26px}.layui-table-view .layui-form-checkbox i{height:26px}.layui-table-grid .layui-table-cell{overflow:visible}.layui-table-grid-down{position:absolute;top:0;right:0;width:26px;height:100%;padding:5px 0;border-width:0 0 0 1px;text-align:center;background-color:#fff;color:#999;cursor:pointer}.layui-table-grid-down .layui-icon{position:absolute;top:50%;left:50%;margin:-8px 0 0 -8px}.layui-table-grid-down:hover{background-color:#fbfbfb}body .layui-table-tips .layui-layer-content{background:0 0;padding:0;box-shadow:0 1px 6px rgba(0,0,0,.12)}.layui-table-tips-main{margin:-44px 0 0 -1px;max-height:150px;padding:8px 15px;font-size:14px;overflow-y:scroll;background-color:#fff;color:#666}.layui-table-tips-c{position:absolute;right:-3px;top:-13px;width:20px;height:20px;padding:3px;cursor:pointer;background-color:#666;border-radius:50%;color:#fff}.layui-table-tips-c:hover{background-color:#777}.layui-table-tips-c:before{position:relative;right:-2px}.layui-upload-file{display:none!important;opacity:.01;filter:Alpha(opacity=1)}.layui-upload-drag,.layui-upload-form,.layui-upload-wrap{display:inline-block}.layui-upload-list{margin:10px 0}.layui-upload-choose{max-width:200px;padding:0 10px;color:#999;font-size:14px;text-overflow:ellipsis;overflow:hidden;white-space:nowrap}.layui-upload-drag{position:relative;padding:30px;border:1px dashed #e2e2e2;background-color:#fff;text-align:center;cursor:pointer;color:#999}.layui-upload-drag .layui-icon{font-size:50px;color:#009688}.layui-upload-drag[lay-over]{border-color:#009688}.layui-upload-iframe{position:absolute;width:0;height:0;border:0;visibility:hidden}.layui-upload-wrap{position:relative;vertical-align:middle}.layui-upload-wrap .layui-upload-file{display:block!important;position:absolute;left:0;top:0;z-index:10;font-size:100px;width:100%;height:100%;opacity:.01;filter:Alpha(opacity=1);cursor:pointer}.layui-btn-container .layui-upload-choose{padding-left:0}.layui-menu{position:relative;margin:5px 0;background-color:#fff}.layui-menu li,.layui-menu-body-title a{padding:5px 15px}.layui-menu li{position:relative;margin:1px 0;width:calc(100% + 1px);line-height:26px;color:rgba(0,0,0,.8);font-size:14px;white-space:nowrap;cursor:pointer}.layui-menu li:hover{background-color:#F6F6F6}.layui-menu-item-parent:hover>.layui-menu-body-panel{display:block;animation-name:layui-fadein;animation-duration:.3s;animation-fill-mode:both;animation-delay:.2s}.layui-menu-item-group .layui-menu-body-title,.layui-menu-item-parent .layui-menu-body-title{padding-right:25px}.layui-menu .layui-menu-item-divider:hover,.layui-menu .layui-menu-item-group:hover,.layui-menu .layui-menu-item-none:hover{background:0 0;cursor:default}.layui-menu .layui-menu-item-group>ul{margin:5px 0 -5px}.layui-menu .layui-menu-item-group>.layui-menu-body-title{color:rgba(0,0,0,.35);user-select:none}.layui-menu .layui-menu-item-none{color:rgba(0,0,0,.35);cursor:default;text-align:center}.layui-menu .layui-menu-item-divider{margin:5px 0;padding:0;height:0;line-height:0;border-bottom:1px solid #eee;overflow:hidden}.layui-menu .layui-menu-item-down:hover,.layui-menu .layui-menu-item-up:hover{cursor:pointer}.layui-menu .layui-menu-item-up>.layui-menu-body-title{color:rgba(0,0,0,.8)}.layui-menu .layui-menu-item-up>ul{visibility:hidden;height:0;overflow:hidden}.layui-menu .layui-menu-item-down:hover>.layui-menu-body-title>.layui-icon,.layui-menu .layui-menu-item-up>.layui-menu-body-title:hover>.layui-icon{color:rgba(0,0,0,1)}.layui-menu .layui-menu-item-down>ul{visibility:visible;height:auto}.layui-breadcrumb,.layui-tree-btnGroup{visibility:hidden}.layui-menu .layui-menu-item-checked,.layui-menu .layui-menu-item-checked2{background-color:#F6F6F6!important;color:#5FB878}.layui-menu .layui-menu-item-checked a,.layui-menu .layui-menu-item-checked2 a{color:#5FB878}.layui-menu .layui-menu-item-checked:after{position:absolute;right:0;top:0;bottom:0;border-right:3px solid #5FB878;content:""}.layui-menu-body-title{position:relative;overflow:hidden;text-overflow:ellipsis}.layui-menu-body-title a{display:block;margin:-5px -15px;color:rgba(0,0,0,.8)}.layui-menu-body-title>.layui-icon{position:absolute;right:0;top:0;font-size:14px}.layui-menu-body-title>.layui-icon-right{right:-1px}.layui-menu-body-panel{display:none;position:absolute;top:-7px;left:100%;z-index:1000;margin-left:13px;padding:5px 0}.layui-menu-body-panel:before{content:"";position:absolute;width:20px;left:-16px;top:0;bottom:0}.layui-menu-body-panel-left{left:auto;right:100%;margin:0 13px}.layui-menu-body-panel-left:before{left:auto;right:-16px}.layui-menu-lg li{line-height:32px}.layui-menu-lg .layui-menu-body-title a:hover,.layui-menu-lg li:hover{background:0 0;color:#5FB878}.layui-menu-lg li .layui-menu-body-panel{margin-left:14px}.layui-menu-lg li .layui-menu-body-panel-left{margin:0 15px}.layui-dropdown{position:absolute;left:-999999px;top:-999999px;z-index:66666666;margin:5px 0;min-width:100px}.layui-dropdown:before{content:"";position:absolute;width:100%;height:6px;left:0;top:-6px}.layui-nav{position:relative;padding:0 20px;background-color:#393D49;color:#fff;border-radius:2px;font-size:0}.layui-nav *{font-size:14px}.layui-nav .layui-nav-item{position:relative;display:inline-block;*display:inline;*zoom:1;vertical-align:middle;line-height:60px}.layui-nav .layui-nav-item a{display:block;padding:0 20px;color:#fff;color:rgba(255,255,255,.7);transition:all .3s;-webkit-transition:all .3s}.layui-nav .layui-this:after,.layui-nav-bar{content:"";position:absolute;left:0;top:0;width:0;height:5px;background-color:#5FB878;transition:all .2s;-webkit-transition:all .2s;pointer-events:none}.layui-nav-bar{z-index:1000}.layui-nav[lay-bar=disabled] .layui-nav-bar{display:none}.layui-nav .layui-nav-item a:hover,.layui-nav .layui-this a{color:#fff}.layui-nav .layui-this:after{top:auto;bottom:0;width:100%}.layui-nav-img{width:30px;height:30px;margin-right:10px;border-radius:50%}.layui-nav .layui-nav-more{position:absolute;top:0;right:3px;left:auto!important;margin-top:0;font-size:12px;cursor:pointer;transition:all .2s;-webkit-transition:all .2s}.layui-nav .layui-nav-mored,.layui-nav-itemed>a .layui-nav-more{transform:rotate(180deg)}.layui-nav-child{display:none;position:absolute;left:0;top:65px;min-width:100%;line-height:36px;padding:5px 0;box-shadow:0 2px 4px rgba(0,0,0,.12);border:1px solid #eee;background-color:#fff;z-index:100;border-radius:2px;white-space:nowrap}.layui-nav .layui-nav-child a{color:#666;color:rgba(0,0,0,.8)}.layui-nav .layui-nav-child a:hover{background-color:#F6F6F6;color:rgba(0,0,0,.8)}.layui-nav-child dd{margin:1px 0;position:relative}.layui-nav-child dd.layui-this{background-color:#F6F6F6;color:#000}.layui-nav-child dd.layui-this:after{display:none}.layui-nav-child-r{left:auto;right:0}.layui-nav-child-c{text-align:center}.layui-nav-tree{width:200px;padding:0}.layui-nav-tree .layui-nav-item{display:block;width:100%;line-height:40px}.layui-nav-tree .layui-nav-item a{position:relative;height:40px;line-height:40px;text-overflow:ellipsis;overflow:hidden;white-space:nowrap}.layui-nav-tree .layui-nav-item>a{padding-top:5px;padding-bottom:5px}.layui-nav-tree .layui-nav-more{right:15px}.layui-nav-tree .layui-nav-item>a .layui-nav-more{padding:5px 0}.layui-nav-tree .layui-nav-bar{width:5px;height:0;background-color:#009688}.layui-side .layui-nav-tree .layui-nav-bar{width:2px}.layui-nav-tree .layui-nav-child dd.layui-this,.layui-nav-tree .layui-nav-child dd.layui-this a,.layui-nav-tree .layui-this,.layui-nav-tree .layui-this>a,.layui-nav-tree .layui-this>a:hover{background-color:#009688;color:#fff}.layui-nav-tree .layui-this:after{display:none}.layui-nav-itemed>a,.layui-nav-tree .layui-nav-title a,.layui-nav-tree .layui-nav-title a:hover{color:#fff!important}.layui-nav-tree .layui-nav-child{position:relative;z-index:0;top:0;border:none;box-shadow:none}.layui-nav-tree .layui-nav-child dd{margin:0}.layui-nav-tree .layui-nav-child a{color:#fff;color:rgba(255,255,255,.7)}.layui-nav-tree .layui-nav-child,.layui-nav-tree .layui-nav-child a:hover{background:0 0;color:#fff}.layui-nav-itemed>.layui-nav-child{display:block;background-color:rgba(0,0,0,.3)!important}.layui-nav-itemed>.layui-nav-child>.layui-this>.layui-nav-child{display:block}.layui-nav-side{position:fixed;top:0;bottom:0;left:0;overflow-x:hidden;z-index:999}.layui-breadcrumb{font-size:0}.layui-breadcrumb>*{font-size:14px}.layui-breadcrumb a{color:#999!important}.layui-breadcrumb a:hover{color:#5FB878!important}.layui-breadcrumb a cite{color:#666;font-style:normal}.layui-breadcrumb span[lay-separator]{margin:0 10px;color:#999}.layui-tab{margin:10px 0;text-align:left!important}.layui-tab[overflow]>.layui-tab-title{overflow:hidden}.layui-tab-title{position:relative;left:0;height:40px;white-space:nowrap;font-size:0;border-bottom-width:1px;border-bottom-style:solid;transition:all .2s;-webkit-transition:all .2s}.layui-tab-title li{display:inline-block;*display:inline;*zoom:1;vertical-align:middle;font-size:14px;transition:all .2s;-webkit-transition:all .2s;position:relative;line-height:40px;min-width:65px;padding:0 15px;text-align:center;cursor:pointer}.layui-tab-title li a{display:block;padding:0 15px;margin:0 -15px}.layui-tab-title .layui-this{color:#000}.layui-tab-title .layui-this:after{position:absolute;left:0;top:0;content:"";width:100%;height:41px;border-width:1px;border-style:solid;border-bottom-color:#fff;border-radius:2px 2px 0 0;box-sizing:border-box;pointer-events:none}.layui-tab-bar{position:absolute;right:0;top:0;z-index:10;width:30px;height:39px;line-height:39px;border-width:1px;border-style:solid;border-radius:2px;text-align:center;background-color:#fff;cursor:pointer}.layui-tab-bar .layui-icon{position:relative;display:inline-block;top:3px;transition:all .3s;-webkit-transition:all .3s}.layui-tab-item{display:none}.layui-tab-more{padding-right:30px;height:auto!important;white-space:normal!important}.layui-tab-more li.layui-this:after{border-bottom-color:#eee;border-radius:2px}.layui-tab-more .layui-tab-bar .layui-icon{top:-2px;top:3px\9;-webkit-transform:rotate(180deg);transform:rotate(180deg)}:root .layui-tab-more .layui-tab-bar .layui-icon{top:-2px\0/IE9}.layui-tab-content{padding:15px 0}.layui-tab-title li .layui-tab-close{position:relative;display:inline-block;width:18px;height:18px;line-height:20px;margin-left:8px;top:1px;text-align:center;font-size:14px;color:#c2c2c2;transition:all .2s;-webkit-transition:all .2s}.layui-tab-title li .layui-tab-close:hover{border-radius:2px;background-color:#FF5722;color:#fff}.layui-tab-brief>.layui-tab-title .layui-this{color:#009688}.layui-tab-brief>.layui-tab-more li.layui-this:after,.layui-tab-brief>.layui-tab-title .layui-this:after{border:none;border-radius:0;border-bottom:2px solid #5FB878}.layui-tab-brief[overflow]>.layui-tab-title .layui-this:after{top:-1px}.layui-tab-card{border-width:1px;border-style:solid;border-radius:2px;box-shadow:0 2px 5px 0 rgba(0,0,0,.1)}.layui-tab-card>.layui-tab-title{background-color:#FAFAFA}.layui-tab-card>.layui-tab-title li{margin-right:-1px;margin-left:-1px}.layui-tab-card>.layui-tab-title .layui-this{background-color:#fff}.layui-tab-card>.layui-tab-title .layui-this:after{border-top:none;border-width:1px;border-bottom-color:#fff}.layui-tab-card>.layui-tab-title .layui-tab-bar{height:40px;line-height:40px;border-radius:0;border-top:none;border-right:none}.layui-tab-card>.layui-tab-more .layui-this{background:0 0;color:#5FB878}.layui-tab-card>.layui-tab-more .layui-this:after{border:none}.layui-timeline{padding-left:5px}.layui-timeline-item{position:relative;padding-bottom:20px}.layui-timeline-axis{position:absolute;left:-5px;top:0;z-index:10;width:20px;height:20px;line-height:20px;background-color:#fff;color:#5FB878;border-radius:50%;text-align:center;cursor:pointer}.layui-timeline-axis:hover{color:#FF5722}.layui-timeline-item:before{content:"";position:absolute;left:5px;top:0;z-index:0;width:1px;height:100%}.layui-timeline-item:first-child:before{display:block}.layui-timeline-item:last-child:before{display:none}.layui-timeline-content{padding-left:25px}.layui-timeline-title{position:relative;margin-bottom:10px;line-height:22px}.layui-badge,.layui-badge-dot,.layui-badge-rim{position:relative;display:inline-block;padding:0 6px;font-size:12px;text-align:center;background-color:#FF5722;color:#fff;border-radius:2px}.layui-badge{height:18px;line-height:18px}.layui-badge-dot{width:8px;height:8px;padding:0;border-radius:50%}.layui-badge-rim{height:18px;line-height:18px;border-width:1px;border-style:solid;background-color:#fff;color:#666}.layui-btn .layui-badge,.layui-btn .layui-badge-dot{margin-left:5px}.layui-nav .layui-badge,.layui-nav .layui-badge-dot{position:absolute;top:50%;margin:-5px 6px 0}.layui-nav .layui-badge{margin-top:-10px}.layui-tab-title .layui-badge,.layui-tab-title .layui-badge-dot{left:5px;top:-2px}.layui-carousel{position:relative;left:0;top:0;background-color:#f8f8f8}.layui-carousel>[carousel-item]{position:relative;width:100%;height:100%;overflow:hidden}.layui-carousel>[carousel-item]:before{position:absolute;content:'\e63d';left:50%;top:50%;width:100px;line-height:20px;margin:-10px 0 0 -50px;text-align:center;color:#c2c2c2;font-family:layui-icon!important;font-size:30px;font-style:normal;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.layui-carousel>[carousel-item]>*{display:none;position:absolute;left:0;top:0;width:100%;height:100%;background-color:#f8f8f8;transition-duration:.3s;-webkit-transition-duration:.3s}.layui-carousel-updown>*{-webkit-transition:.3s ease-in-out up;transition:.3s ease-in-out up}.layui-carousel-arrow{display:none\9;opacity:0;position:absolute;left:10px;top:50%;margin-top:-18px;width:36px;height:36px;line-height:36px;text-align:center;font-size:20px;border:0;border-radius:50%;background-color:rgba(0,0,0,.2);color:#fff;-webkit-transition-duration:.3s;transition-duration:.3s;cursor:pointer}.layui-carousel-arrow[lay-type=add]{left:auto!important;right:10px}.layui-carousel:hover .layui-carousel-arrow[lay-type=add],.layui-carousel[lay-arrow=always] .layui-carousel-arrow[lay-type=add]{right:20px}.layui-carousel[lay-arrow=always] .layui-carousel-arrow{opacity:1;left:20px}.layui-carousel[lay-arrow=none] .layui-carousel-arrow{display:none}.layui-carousel-arrow:hover,.layui-carousel-ind ul:hover{background-color:rgba(0,0,0,.35)}.layui-carousel:hover .layui-carousel-arrow{display:block\9;opacity:1;left:20px}.layui-carousel-ind{position:relative;top:-35px;width:100%;line-height:0!important;text-align:center;font-size:0}.layui-carousel[lay-indicator=outside]{margin-bottom:30px}.layui-carousel[lay-indicator=outside] .layui-carousel-ind{top:10px}.layui-carousel[lay-indicator=outside] .layui-carousel-ind ul{background-color:rgba(0,0,0,.5)}.layui-carousel[lay-indicator=none] .layui-carousel-ind{display:none}.layui-carousel-ind ul{display:inline-block;padding:5px;background-color:rgba(0,0,0,.2);border-radius:10px;-webkit-transition-duration:.3s;transition-duration:.3s}.layui-carousel-ind li{display:inline-block;width:10px;height:10px;margin:0 3px;font-size:14px;background-color:#eee;background-color:rgba(255,255,255,.5);border-radius:50%;cursor:pointer;-webkit-transition-duration:.3s;transition-duration:.3s}.layui-carousel-ind li:hover{background-color:rgba(255,255,255,.7)}.layui-carousel-ind li.layui-this{background-color:#fff}.layui-carousel>[carousel-item]>.layui-carousel-next,.layui-carousel>[carousel-item]>.layui-carousel-prev,.layui-carousel>[carousel-item]>.layui-this{display:block}.layui-carousel>[carousel-item]>.layui-this{left:0}.layui-carousel>[carousel-item]>.layui-carousel-prev{left:-100%}.layui-carousel>[carousel-item]>.layui-carousel-next{left:100%}.layui-carousel>[carousel-item]>.layui-carousel-next.layui-carousel-left,.layui-carousel>[carousel-item]>.layui-carousel-prev.layui-carousel-right{left:0}.layui-carousel>[carousel-item]>.layui-this.layui-carousel-left{left:-100%}.layui-carousel>[carousel-item]>.layui-this.layui-carousel-right{left:100%}.layui-carousel[lay-anim=updown] .layui-carousel-arrow{left:50%!important;top:20px;margin:0 0 0 -18px}.layui-carousel[lay-anim=updown]>[carousel-item]>*,.layui-carousel[lay-anim=fade]>[carousel-item]>*{left:0!important}.layui-carousel[lay-anim=updown] .layui-carousel-arrow[lay-type=add]{top:auto!important;bottom:20px}.layui-carousel[lay-anim=updown] .layui-carousel-ind{position:absolute;top:50%;right:20px;width:auto;height:auto}.layui-carousel[lay-anim=updown] .layui-carousel-ind ul{padding:3px 5px}.layui-carousel[lay-anim=updown] .layui-carousel-ind li{display:block;margin:6px 0}.layui-carousel[lay-anim=updown]>[carousel-item]>.layui-this{top:0}.layui-carousel[lay-anim=updown]>[carousel-item]>.layui-carousel-prev{top:-100%}.layui-carousel[lay-anim=updown]>[carousel-item]>.layui-carousel-next{top:100%}.layui-carousel[lay-anim=updown]>[carousel-item]>.layui-carousel-next.layui-carousel-left,.layui-carousel[lay-anim=updown]>[carousel-item]>.layui-carousel-prev.layui-carousel-right{top:0}.layui-carousel[lay-anim=updown]>[carousel-item]>.layui-this.layui-carousel-left{top:-100%}.layui-carousel[lay-anim=updown]>[carousel-item]>.layui-this.layui-carousel-right{top:100%}.layui-carousel[lay-anim=fade]>[carousel-item]>.layui-carousel-next,.layui-carousel[lay-anim=fade]>[carousel-item]>.layui-carousel-prev{opacity:0}.layui-carousel[lay-anim=fade]>[carousel-item]>.layui-carousel-next.layui-carousel-left,.layui-carousel[lay-anim=fade]>[carousel-item]>.layui-carousel-prev.layui-carousel-right{opacity:1}.layui-carousel[lay-anim=fade]>[carousel-item]>.layui-this.layui-carousel-left,.layui-carousel[lay-anim=fade]>[carousel-item]>.layui-this.layui-carousel-right{opacity:0}.layui-fixbar{position:fixed;right:15px;bottom:15px;z-index:999999}.layui-fixbar li{width:50px;height:50px;line-height:50px;margin-bottom:1px;text-align:center;cursor:pointer;font-size:30px;background-color:#9F9F9F;color:#fff;border-radius:2px;opacity:.95}.layui-fixbar li:hover{opacity:.85}.layui-fixbar li:active{opacity:1}.layui-fixbar .layui-fixbar-top{display:none;font-size:40px}body .layui-util-face{border:none;background:0 0}body .layui-util-face .layui-layer-content{padding:0;background-color:#fff;color:#666;box-shadow:none}.layui-util-face .layui-layer-TipsG{display:none}.layui-transfer-active,.layui-transfer-box{display:inline-block;vertical-align:middle}.layui-util-face ul{position:relative;width:372px;padding:10px;border:1px solid #D9D9D9;background-color:#fff;box-shadow:0 0 20px rgba(0,0,0,.2)}.layui-util-face ul li{cursor:pointer;float:left;border:1px solid #e8e8e8;height:22px;width:26px;overflow:hidden;margin:-1px 0 0 -1px;padding:4px 2px;text-align:center}.layui-util-face ul li:hover{position:relative;z-index:2;border:1px solid #eb7350;background:#fff9ec}.layui-code{position:relative;margin:10px 0;padding:15px;line-height:20px;border:1px solid #eee;border-left-width:6px;background-color:#FAFAFA;color:#333;font-family:Courier New;font-size:12px}.layui-transfer-box,.layui-transfer-header,.layui-transfer-search{border-width:0;border-style:solid;border-color:#eee}.layui-transfer-box{position:relative;border-width:1px;width:200px;height:360px;border-radius:2px;background-color:#fff}.layui-transfer-box .layui-form-checkbox{width:100%;margin:0!important}.layui-transfer-header{height:38px;line-height:38px;padding:0 10px;border-bottom-width:1px}.layui-transfer-search{position:relative;padding:10px;border-bottom-width:1px}.layui-transfer-search .layui-input{height:32px;padding-left:30px;font-size:12px}.layui-transfer-search .layui-icon-search{position:absolute;left:20px;top:50%;margin-top:-8px;color:#666}.layui-transfer-active{margin:0 15px}.layui-transfer-active .layui-btn{display:block;margin:0;padding:0 15px;background-color:#5FB878;border-color:#5FB878;color:#fff}.layui-transfer-active .layui-btn-disabled{background-color:#FBFBFB;border-color:#eee;color:#d2d2d2}.layui-transfer-active .layui-btn:first-child{margin-bottom:15px}.layui-transfer-active .layui-btn .layui-icon{margin:0;font-size:14px!important}.layui-transfer-data{padding:5px 0;overflow:auto}.layui-transfer-data li{height:32px;line-height:32px;padding:0 10px}.layui-transfer-data li:hover{background-color:#F6F6F6;transition:.5s all}.layui-transfer-data .layui-none{padding:15px 10px;text-align:center;color:#999}.layui-rate,.layui-rate *{display:inline-block;vertical-align:middle}.layui-rate{padding:10px 5px 10px 0;font-size:0}.layui-rate li i.layui-icon{font-size:20px;color:#FFB800;margin-right:5px;transition:all .3s;-webkit-transition:all .3s}.layui-rate li i:hover{cursor:pointer;transform:scale(1.12);-webkit-transform:scale(1.12)}.layui-rate[readonly] li i:hover{cursor:default;transform:scale(1)}.layui-colorpicker{width:26px;height:26px;border:1px solid #eee;padding:5px;border-radius:2px;line-height:24px;display:inline-block;cursor:pointer;transition:all .3s;-webkit-transition:all .3s}.layui-colorpicker:hover{border-color:#d2d2d2}.layui-colorpicker.layui-colorpicker-lg{width:34px;height:34px;line-height:32px}.layui-colorpicker.layui-colorpicker-sm{width:24px;height:24px;line-height:22px}.layui-colorpicker.layui-colorpicker-xs{width:22px;height:22px;line-height:20px}.layui-colorpicker-trigger-bgcolor{display:block;background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAIAAADZF8uwAAAAGUlEQVQYV2M4gwH+YwCGIasIUwhT25BVBADtzYNYrHvv4gAAAABJRU5ErkJggg==);border-radius:2px}.layui-colorpicker-trigger-span{display:block;height:100%;box-sizing:border-box;border:1px solid rgba(0,0,0,.15);border-radius:2px;text-align:center}.layui-colorpicker-trigger-i{display:inline-block;color:#FFF;font-size:12px}.layui-colorpicker-trigger-i.layui-icon-close{color:#999}.layui-colorpicker-main{position:absolute;left:-999999px;top:-999999px;z-index:66666666;width:280px;margin:5px 0;padding:7px;background:#FFF;border:1px solid #d2d2d2;border-radius:2px;box-shadow:0 2px 4px rgba(0,0,0,.12)}.layui-colorpicker-main-wrapper{height:180px;position:relative}.layui-colorpicker-basis{width:260px;height:100%;position:relative}.layui-colorpicker-basis-white{width:100%;height:100%;position:absolute;top:0;left:0;background:linear-gradient(90deg,#FFF,hsla(0,0%,100%,0))}.layui-colorpicker-basis-black{width:100%;height:100%;position:absolute;top:0;left:0;background:linear-gradient(0deg,#000,transparent)}.layui-colorpicker-basis-cursor{width:10px;height:10px;border:1px solid #FFF;border-radius:50%;position:absolute;top:-3px;right:-3px;cursor:pointer}.layui-colorpicker-side{position:absolute;top:0;right:0;width:12px;height:100%;background:linear-gradient(red,#FF0,#0F0,#0FF,#00F,#F0F,red)}.layui-colorpicker-side-slider{width:100%;height:5px;box-shadow:0 0 1px #888;background:#FFF;border-radius:1px;border:1px solid #f0f0f0;cursor:pointer;position:absolute;left:0}.layui-colorpicker-main-alpha{display:none;height:12px;margin-top:7px;background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAIAAADZF8uwAAAAGUlEQVQYV2M4gwH+YwCGIasIUwhT25BVBADtzYNYrHvv4gAAAABJRU5ErkJggg==)}.layui-colorpicker-alpha-bgcolor{height:100%;position:relative}.layui-colorpicker-alpha-slider{width:5px;height:100%;box-shadow:0 0 1px #888;background:#FFF;border-radius:1px;border:1px solid #f0f0f0;cursor:pointer;position:absolute;top:0}.layui-colorpicker-main-pre{padding-top:7px;font-size:0}.layui-colorpicker-pre{width:20px;height:20px;border-radius:2px;display:inline-block;margin-left:6px;margin-bottom:7px;cursor:pointer}.layui-colorpicker-pre:nth-child(11n+1){margin-left:0}.layui-colorpicker-pre-isalpha{background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAIAAADZF8uwAAAAGUlEQVQYV2M4gwH+YwCGIasIUwhT25BVBADtzYNYrHvv4gAAAABJRU5ErkJggg==)}.layui-colorpicker-pre.layui-this{box-shadow:0 0 3px 2px rgba(0,0,0,.15)}.layui-colorpicker-pre>div{height:100%;border-radius:2px}.layui-colorpicker-main-input{text-align:right;padding-top:7px}.layui-colorpicker-main-input .layui-btn-container .layui-btn{margin:0 0 0 10px}.layui-colorpicker-main-input div.layui-inline{float:left;margin-right:10px;font-size:14px}.layui-colorpicker-main-input input.layui-input{width:150px;height:30px;color:#666}.layui-slider{height:4px;background:#eee;border-radius:3px;position:relative;cursor:pointer}.layui-slider-bar{border-radius:3px;position:absolute;height:100%}.layui-slider-step{position:absolute;top:0;width:4px;height:4px;border-radius:50%;background:#FFF;-webkit-transform:translateX(-50%);transform:translateX(-50%)}.layui-slider-wrap{width:36px;height:36px;position:absolute;top:-16px;-webkit-transform:translateX(-50%);transform:translateX(-50%);z-index:10;text-align:center}.layui-slider-wrap-btn{width:12px;height:12px;border-radius:50%;background:#FFF;display:inline-block;vertical-align:middle;cursor:pointer;transition:.3s}.layui-slider-wrap:after{content:"";height:100%;display:inline-block;vertical-align:middle}.layui-slider-wrap-btn.layui-slider-hover,.layui-slider-wrap-btn:hover{transform:scale(1.2)}.layui-slider-wrap-btn.layui-disabled:hover{transform:scale(1)!important}.layui-slider-tips{position:absolute;top:-42px;z-index:66666666;white-space:nowrap;display:none;-webkit-transform:translateX(-50%);transform:translateX(-50%);color:#FFF;background:#000;border-radius:3px;height:25px;line-height:25px;padding:0 10px}.layui-slider-tips:after{content:"";position:absolute;bottom:-12px;left:50%;margin-left:-6px;width:0;height:0;border-width:6px;border-style:solid;border-color:#000 transparent transparent}.layui-slider-input{width:70px;height:32px;border:1px solid #eee;border-radius:3px;font-size:16px;line-height:32px;position:absolute;right:0;top:-14px}.layui-slider-input-btn{position:absolute;top:0;right:0;width:20px;height:100%;border-left:1px solid #eee}.layui-slider-input-btn i{cursor:pointer;position:absolute;right:0;bottom:0;width:20px;height:50%;font-size:12px;line-height:16px;text-align:center;color:#999}.layui-slider-input-btn i:first-child{top:0;border-bottom:1px solid #eee}.layui-slider-input-txt{height:100%;font-size:14px}.layui-slider-input-txt input{height:100%;border:none}.layui-slider-input-btn i:hover{color:#009688}.layui-slider-vertical{width:4px;margin-left:33px}.layui-slider-vertical .layui-slider-bar{width:4px}.layui-slider-vertical .layui-slider-step{top:auto;left:0;-webkit-transform:translateY(50%);transform:translateY(50%)}.layui-slider-vertical .layui-slider-wrap{top:auto;left:-16px;-webkit-transform:translateY(50%);transform:translateY(50%)}.layui-slider-vertical .layui-slider-tips{top:auto;left:2px}@media \0screen{.layui-slider-wrap-btn{margin-left:-20px}.layui-slider-vertical .layui-slider-wrap-btn{margin-left:0;margin-bottom:-20px}.layui-slider-vertical .layui-slider-tips{margin-left:-8px}.layui-slider>span{margin-left:8px}}.layui-tree{line-height:22px}.layui-tree .layui-form-checkbox{margin:0!important}.layui-tree-set{width:100%;position:relative}.layui-tree-pack{display:none;padding-left:20px;position:relative}.layui-tree-iconClick,.layui-tree-main{display:inline-block;vertical-align:middle}.layui-tree-line .layui-tree-pack{padding-left:27px}.layui-tree-line .layui-tree-set .layui-tree-set:after{content:"";position:absolute;top:14px;left:-9px;width:17px;height:0;border-top:1px dotted #c0c4cc}.layui-tree-entry{position:relative;padding:3px 0;height:20px;white-space:nowrap}.layui-tree-entry:hover{background-color:#eee}.layui-tree-line .layui-tree-entry:hover{background-color:rgba(0,0,0,0)}.layui-tree-line .layui-tree-entry:hover .layui-tree-txt{color:#999;text-decoration:underline;transition:.3s}.layui-tree-main{cursor:pointer;padding-right:10px}.layui-tree-line .layui-tree-set:before{content:"";position:absolute;top:0;left:-9px;width:0;height:100%;border-left:1px dotted #c0c4cc}.layui-tree-line .layui-tree-set.layui-tree-setLineShort:before{height:13px}.layui-tree-line .layui-tree-set.layui-tree-setHide:before{height:0}.layui-tree-iconClick{position:relative;height:20px;line-height:20px;margin:0 10px;color:#c0c4cc}.layui-tree-icon{height:12px;line-height:12px;width:12px;text-align:center;border:1px solid #c0c4cc}.layui-tree-iconClick .layui-icon{font-size:18px}.layui-tree-icon .layui-icon{font-size:12px;color:#666}.layui-tree-iconArrow{padding:0 5px}.layui-tree-iconArrow:after{content:"";position:absolute;left:4px;top:3px;z-index:100;width:0;height:0;border-width:5px;border-style:solid;border-color:transparent transparent transparent #c0c4cc;transition:.5s}.layui-tree-btnGroup,.layui-tree-editInput{position:relative;vertical-align:middle;display:inline-block}.layui-tree-spread>.layui-tree-entry>.layui-tree-iconClick>.layui-tree-iconArrow:after{transform:rotate(90deg) translate(3px,4px)}.layui-tree-txt{display:inline-block;vertical-align:middle;color:#555}.layui-tree-search{margin-bottom:15px;color:#666}.layui-tree-btnGroup .layui-icon{display:inline-block;vertical-align:middle;padding:0 2px;cursor:pointer}.layui-tree-btnGroup .layui-icon:hover{color:#999;transition:.3s}.layui-tree-entry:hover .layui-tree-btnGroup{visibility:visible}.layui-tree-editInput{height:20px;line-height:20px;padding:0 3px;border:none;background-color:rgba(0,0,0,.05)}.layui-tree-emptyText{text-align:center;color:#999}.layui-anim{-webkit-animation-duration:.3s;-webkit-animation-fill-mode:both;animation-duration:.3s;animation-fill-mode:both}.layui-anim.layui-icon{display:inline-block}.layui-anim-loop{-webkit-animation-iteration-count:infinite;animation-iteration-count:infinite}.layui-trans,.layui-trans a{transition:all .2s;-webkit-transition:all .2s}@-webkit-keyframes layui-rotate{from{-webkit-transform:rotate(0)}to{-webkit-transform:rotate(360deg)}}@keyframes layui-rotate{from{transform:rotate(0)}to{transform:rotate(360deg)}}.layui-anim-rotate{-webkit-animation-name:layui-rotate;animation-name:layui-rotate;-webkit-animation-duration:1s;animation-duration:1s;-webkit-animation-timing-function:linear;animation-timing-function:linear}@-webkit-keyframes layui-up{from{-webkit-transform:translate3d(0,100%,0);opacity:.3}to{-webkit-transform:translate3d(0,0,0);opacity:1}}@keyframes layui-up{from{transform:translate3d(0,100%,0);opacity:.3}to{transform:translate3d(0,0,0);opacity:1}}.layui-anim-up{-webkit-animation-name:layui-up;animation-name:layui-up}@-webkit-keyframes layui-upbit{from{-webkit-transform:translate3d(0,15px,0);opacity:.3}to{-webkit-transform:translate3d(0,0,0);opacity:1}}@keyframes layui-upbit{from{transform:translate3d(0,15px,0);opacity:.3}to{transform:translate3d(0,0,0);opacity:1}}.layui-anim-upbit{-webkit-animation-name:layui-upbit;animation-name:layui-upbit}@keyframes layui-down{0%{opacity:.3;transform:translate3d(0,-100%,0)}100%{opacity:1;transform:translate3d(0,0,0)}}.layui-anim-down{animation-name:layui-down}@keyframes layui-downbit{0%{opacity:.3;transform:translate3d(0,-5px,0)}100%{opacity:1;transform:translate3d(0,0,0)}}.layui-anim-downbit{animation-name:layui-downbit}@-webkit-keyframes layui-scale{0%{opacity:.3;-webkit-transform:scale(.5)}100%{opacity:1;-webkit-transform:scale(1)}}@keyframes layui-scale{0%{opacity:.3;-ms-transform:scale(.5);transform:scale(.5)}100%{opacity:1;-ms-transform:scale(1);transform:scale(1)}}.layui-anim-scale{-webkit-animation-name:layui-scale;animation-name:layui-scale}@-webkit-keyframes layui-scale-spring{0%{opacity:.5;-webkit-transform:scale(.5)}80%{opacity:.8;-webkit-transform:scale(1.1)}100%{opacity:1;-webkit-transform:scale(1)}}@keyframes layui-scale-spring{0%{opacity:.5;transform:scale(.5)}80%{opacity:.8;transform:scale(1.1)}100%{opacity:1;transform:scale(1)}}.layui-anim-scaleSpring{-webkit-animation-name:layui-scale-spring;animation-name:layui-scale-spring}@keyframes layui-scalesmall{0%{opacity:.3;transform:scale(1.5)}100%{opacity:1;transform:scale(1)}}.layui-anim-scalesmall{animation-name:layui-scalesmall}@keyframes layui-scalesmall-spring{0%{opacity:.3;transform:scale(1.5)}80%{opacity:.8;transform:scale(.9)}100%{opacity:1;transform:scale(1)}}.layui-anim-scalesmall-spring{animation-name:layui-scalesmall-spring}@-webkit-keyframes layui-fadein{0%{opacity:0}100%{opacity:1}}@keyframes layui-fadein{0%{opacity:0}100%{opacity:1}}.layui-anim-fadein{-webkit-animation-name:layui-fadein;animation-name:layui-fadein}@-webkit-keyframes layui-fadeout{0%{opacity:1}100%{opacity:0}}@keyframes layui-fadeout{0%{opacity:1}100%{opacity:0}}.layui-anim-fadeout{-webkit-animation-name:layui-fadeout;animation-name:layui-fadeout}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/layui.mobile.css b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/layui.mobile.css
new file mode 100644
index 0000000..cefeb46
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/layui.mobile.css
@@ -0,0 +1,2 @@
+/** layui-v2.3.0 MIT License By https://www.layui.com */
+ blockquote,body,button,dd,div,dl,dt,form,h1,h2,h3,h4,h5,h6,input,legend,li,ol,p,td,textarea,th,ul{margin:0;padding:0;-webkit-tap-highlight-color:rgba(0,0,0,0)}html{font:12px 'Helvetica Neue','PingFang SC',STHeitiSC-Light,Helvetica,Arial,sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}a,button,input{-webkit-tap-highlight-color:rgba(255,0,0,0)}a{text-decoration:none;background:0 0}a:active,a:hover{outline:0}table{border-collapse:collapse;border-spacing:0}li{list-style:none}b,strong{font-weight:700}h1,h2,h3,h4,h5,h6{font-weight:500}address,cite,dfn,em,var{font-style:normal}dfn{font-style:italic}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}img{border:0;vertical-align:bottom}.layui-inline,input,label{vertical-align:middle}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0;outline:0}button,select{text-transform:none}select{-webkit-appearance:none;border:none}input{line-height:normal}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}@font-face{font-family:layui-icon;src:url(../font/iconfont.eot?v=1.0.7);src:url(../font/iconfont.eot?v=1.0.7#iefix) format('embedded-opentype'),url(../font/iconfont.woff?v=1.0.7) format('woff'),url(../font/iconfont.ttf?v=1.0.7) format('truetype'),url(../font/iconfont.svg?v=1.0.7#iconfont) format('svg')}.layui-icon{font-family:layui-icon!important;font-size:16px;font-style:normal;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.layui-box,.layui-box *{-webkit-box-sizing:content-box!important;-moz-box-sizing:content-box!important;box-sizing:content-box!important}.layui-border-box,.layui-border-box *{-webkit-box-sizing:border-box!important;-moz-box-sizing:border-box!important;box-sizing:border-box!important}.layui-inline{position:relative;display:inline-block;*display:inline;*zoom:1}.layui-edge,.layui-upload-iframe{position:absolute;width:0;height:0}.layui-edge{border-style:dashed;border-color:transparent;overflow:hidden}.layui-elip{text-overflow:ellipsis;overflow:hidden;white-space:nowrap}.layui-unselect{-moz-user-select:none;-webkit-user-select:none;-ms-user-select:none}.layui-disabled,.layui-disabled:active{background-color:#d2d2d2!important;color:#fff!important;cursor:not-allowed!important}.layui-circle{border-radius:100%}.layui-show{display:block!important}.layui-hide{display:none!important}.layui-upload-iframe{border:0;visibility:hidden}.layui-upload-enter{border:1px solid #009E94;background-color:#009E94;color:#fff;-webkit-transform:scale(1.1);transform:scale(1.1)}@-webkit-keyframes layui-m-anim-scale{0%{opacity:0;-webkit-transform:scale(.5);transform:scale(.5)}100%{opacity:1;-webkit-transform:scale(1);transform:scale(1)}}@keyframes layui-m-anim-scale{0%{opacity:0;-webkit-transform:scale(.5);transform:scale(.5)}100%{opacity:1;-webkit-transform:scale(1);transform:scale(1)}}.layui-m-anim-scale{animation-name:layui-m-anim-scale;-webkit-animation-name:layui-m-anim-scale}@-webkit-keyframes layui-m-anim-up{0%{opacity:0;-webkit-transform:translateY(800px);transform:translateY(800px)}100%{opacity:1;-webkit-transform:translateY(0);transform:translateY(0)}}@keyframes layui-m-anim-up{0%{opacity:0;-webkit-transform:translateY(800px);transform:translateY(800px)}100%{opacity:1;-webkit-transform:translateY(0);transform:translateY(0)}}.layui-m-anim-up{-webkit-animation-name:layui-m-anim-up;animation-name:layui-m-anim-up}@-webkit-keyframes layui-m-anim-left{0%{-webkit-transform:translateX(100%);transform:translateX(100%)}100%{-webkit-transform:translateX(0);transform:translateX(0)}}@keyframes layui-m-anim-left{0%{-webkit-transform:translateX(100%);transform:translateX(100%)}100%{-webkit-transform:translateX(0);transform:translateX(0)}}.layui-m-anim-left{-webkit-animation-name:layui-m-anim-left;animation-name:layui-m-anim-left}@-webkit-keyframes layui-m-anim-right{0%{-webkit-transform:translateX(-100%);transform:translateX(-100%)}100%{-webkit-transform:translateX(0);transform:translateX(0)}}@keyframes layui-m-anim-right{0%{-webkit-transform:translateX(-100%);transform:translateX(-100%)}100%{-webkit-transform:translateX(0);transform:translateX(0)}}.layui-m-anim-right{-webkit-animation-name:layui-m-anim-right;animation-name:layui-m-anim-right}@-webkit-keyframes layui-m-anim-lout{0%{-webkit-transform:translateX(0);transform:translateX(0)}100%{-webkit-transform:translateX(-100%);transform:translateX(-100%)}}@keyframes layui-m-anim-lout{0%{-webkit-transform:translateX(0);transform:translateX(0)}100%{-webkit-transform:translateX(-100%);transform:translateX(-100%)}}.layui-m-anim-lout{-webkit-animation-name:layui-m-anim-lout;animation-name:layui-m-anim-lout}@-webkit-keyframes layui-m-anim-rout{0%{-webkit-transform:translateX(0);transform:translateX(0)}100%{-webkit-transform:translateX(100%);transform:translateX(100%)}}@keyframes layui-m-anim-rout{0%{-webkit-transform:translateX(0);transform:translateX(0)}100%{-webkit-transform:translateX(100%);transform:translateX(100%)}}.layui-m-anim-rout{-webkit-animation-name:layui-m-anim-rout;animation-name:layui-m-anim-rout}.layui-m-layer{position:relative;z-index:19891014}.layui-m-layer *{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}.layui-m-layermain,.layui-m-layershade{position:fixed;left:0;top:0;width:100%;height:100%}.layui-m-layershade{background-color:rgba(0,0,0,.7);pointer-events:auto}.layui-m-layermain{display:table;font-family:Helvetica,arial,sans-serif;pointer-events:none}.layui-m-layermain .layui-m-layersection{display:table-cell;vertical-align:middle;text-align:center}.layui-m-layerchild{position:relative;display:inline-block;text-align:left;background-color:#fff;font-size:14px;border-radius:5px;box-shadow:0 0 8px rgba(0,0,0,.1);pointer-events:auto;-webkit-overflow-scrolling:touch;-webkit-animation-fill-mode:both;animation-fill-mode:both;-webkit-animation-duration:.2s;animation-duration:.2s}.layui-m-layer0 .layui-m-layerchild{width:90%;max-width:640px}.layui-m-layer1 .layui-m-layerchild{border:none;border-radius:0}.layui-m-layer2 .layui-m-layerchild{width:auto;max-width:260px;min-width:40px;border:none;background:0 0;box-shadow:none;color:#fff}.layui-m-layerchild h3{padding:0 10px;height:60px;line-height:60px;font-size:16px;font-weight:400;border-radius:5px 5px 0 0;text-align:center}.layui-m-layerbtn span,.layui-m-layerchild h3{text-overflow:ellipsis;overflow:hidden;white-space:nowrap}.layui-m-layercont{padding:50px 30px;line-height:22px;text-align:center}.layui-m-layer1 .layui-m-layercont{padding:0;text-align:left}.layui-m-layer2 .layui-m-layercont{text-align:center;padding:0;line-height:0}.layui-m-layer2 .layui-m-layercont i{width:25px;height:25px;margin-left:8px;display:inline-block;background-color:#fff;border-radius:100%;-webkit-animation:layui-m-anim-loading 1.4s infinite ease-in-out;animation:layui-m-anim-loading 1.4s infinite ease-in-out;-webkit-animation-fill-mode:both;animation-fill-mode:both}.layui-m-layerbtn,.layui-m-layerbtn span{position:relative;text-align:center;border-radius:0 0 5px 5px}.layui-m-layer2 .layui-m-layercont p{margin-top:20px}@-webkit-keyframes layui-m-anim-loading{0%,100%,80%{transform:scale(0);-webkit-transform:scale(0)}40%{transform:scale(1);-webkit-transform:scale(1)}}@keyframes layui-m-anim-loading{0%,100%,80%{transform:scale(0);-webkit-transform:scale(0)}40%{transform:scale(1);-webkit-transform:scale(1)}}.layui-m-layer2 .layui-m-layercont i:first-child{margin-left:0;-webkit-animation-delay:-.32s;animation-delay:-.32s}.layui-m-layer2 .layui-m-layercont i.layui-m-layerload{-webkit-animation-delay:-.16s;animation-delay:-.16s}.layui-m-layer2 .layui-m-layercont>div{line-height:22px;padding-top:7px;margin-bottom:20px;font-size:14px}.layui-m-layerbtn{display:box;display:-moz-box;display:-webkit-box;width:100%;height:50px;line-height:50px;font-size:0;border-top:1px solid #D0D0D0;background-color:#F2F2F2}.layui-m-layerbtn span{display:block;-moz-box-flex:1;box-flex:1;-webkit-box-flex:1;font-size:14px;cursor:pointer}.layui-m-layerbtn span[yes]{color:#40AFFE}.layui-m-layerbtn span[no]{border-right:1px solid #D0D0D0;border-radius:0 0 0 5px}.layui-m-layerbtn span:active{background-color:#F6F6F6}.layui-m-layerend{position:absolute;right:7px;top:10px;width:30px;height:30px;border:0;font-weight:400;background:0 0;cursor:pointer;-webkit-appearance:none;font-size:30px}.layui-m-layerend::after,.layui-m-layerend::before{position:absolute;left:5px;top:15px;content:'';width:18px;height:1px;background-color:#999;transform:rotate(45deg);-webkit-transform:rotate(45deg);border-radius:3px}.layui-m-layerend::after{transform:rotate(-45deg);-webkit-transform:rotate(-45deg)}body .layui-m-layer .layui-m-layer-footer{position:fixed;width:95%;max-width:100%;margin:0 auto;left:0;right:0;bottom:10px;background:0 0}.layui-m-layer-footer .layui-m-layercont{padding:20px;border-radius:5px 5px 0 0;background-color:rgba(255,255,255,.8)}.layui-m-layer-footer .layui-m-layerbtn{display:block;height:auto;background:0 0;border-top:none}.layui-m-layer-footer .layui-m-layerbtn span{background-color:rgba(255,255,255,.8)}.layui-m-layer-footer .layui-m-layerbtn span[no]{color:#FD482C;border-top:1px solid #c2c2c2;border-radius:0 0 5px 5px}.layui-m-layer-footer .layui-m-layerbtn span[yes]{margin-top:10px;border-radius:5px}body .layui-m-layer .layui-m-layer-msg{width:auto;max-width:90%;margin:0 auto;bottom:-150px;background-color:rgba(0,0,0,.7);color:#fff}.layui-m-layer-msg .layui-m-layercont{padding:10px 20px}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/modules/code.css b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/modules/code.css
new file mode 100644
index 0000000..0fee0c5
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/modules/code.css
@@ -0,0 +1 @@
+html #layuicss-skincodecss{display:none;position:absolute;width:1989px}.layui-code-h3,.layui-code-view{position:relative;font-size:12px}.layui-code-view{display:block;margin:10px 0;padding:0;border:1px solid #eee;border-left-width:6px;background-color:#FAFAFA;color:#333;font-family:Courier New}.layui-code-h3{padding:0 10px;height:40px;line-height:40px;border-bottom:1px solid #eee}.layui-code-h3 a{position:absolute;right:10px;top:0;color:#999}.layui-code-view .layui-code-ol{position:relative;overflow:auto}.layui-code-view .layui-code-ol li{position:relative;margin-left:45px;line-height:20px;padding:0 10px;border-left:1px solid #e2e2e2;list-style-type:decimal-leading-zero;*list-style-type:decimal;background-color:#fff}.layui-code-view .layui-code-ol li:first-child{padding-top:10px}.layui-code-view .layui-code-ol li:last-child{padding-bottom:10px}.layui-code-view pre{margin:0}.layui-code-notepad{border:1px solid #0C0C0C;border-left-color:#3F3F3F;background-color:#0C0C0C;color:#C2BE9E}.layui-code-notepad .layui-code-h3{border-bottom:none}.layui-code-notepad .layui-code-ol li{background-color:#3F3F3F;border-left:none}.layui-code-demo .layui-code{visibility:visible!important;margin:-15px;border-top:none;border-right:none;border-bottom:none}.layui-code-demo .layui-tab-content{padding:15px;border-top:none}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/modules/laydate/default/laydate.css b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/modules/laydate/default/laydate.css
new file mode 100644
index 0000000..c08928b
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/modules/laydate/default/laydate.css
@@ -0,0 +1 @@
+.laydate-set-ym,.layui-laydate,.layui-laydate *,.layui-laydate-list{box-sizing:border-box}html #layuicss-laydate{display:none;position:absolute;width:1989px}.layui-laydate *{margin:0;padding:0}.layui-laydate{position:absolute;z-index:66666666;margin:5px 0;border-radius:2px;font-size:14px;-webkit-animation-duration:.2s;animation-duration:.2s;-webkit-animation-fill-mode:both;animation-fill-mode:both;animation-name:laydate-downbit}.layui-laydate-main{width:272px}.layui-laydate-content td,.layui-laydate-header *,.layui-laydate-list li{transition-duration:.3s;-webkit-transition-duration:.3s}@keyframes laydate-downbit{0%{opacity:.3;transform:translate3d(0,-5px,0)}100%{opacity:1;transform:translate3d(0,0,0)}}.layui-laydate-static{position:relative;z-index:0;display:inline-block;margin:0;-webkit-animation:none;animation:none}.laydate-ym-show .laydate-next-m,.laydate-ym-show .laydate-prev-m{display:none!important}.laydate-ym-show .laydate-next-y,.laydate-ym-show .laydate-prev-y{display:inline-block!important}.laydate-time-show .laydate-set-ym span[lay-type=month],.laydate-time-show .laydate-set-ym span[lay-type=year],.laydate-time-show .layui-laydate-header .layui-icon,.laydate-ym-show .laydate-set-ym span[lay-type=month]{display:none!important}.layui-laydate-header{position:relative;line-height:30px;padding:10px 70px 5px}.layui-laydate-header *{display:inline-block;vertical-align:bottom}.layui-laydate-header i{position:absolute;top:10px;padding:0 5px;color:#999;font-size:18px;cursor:pointer}.layui-laydate-header i.laydate-prev-y{left:15px}.layui-laydate-header i.laydate-prev-m{left:45px}.layui-laydate-header i.laydate-next-y{right:15px}.layui-laydate-header i.laydate-next-m{right:45px}.laydate-set-ym{width:100%;text-align:center;text-overflow:ellipsis;overflow:hidden;white-space:nowrap}.laydate-set-ym span{padding:0 10px;cursor:pointer}.laydate-time-text{cursor:default!important}.layui-laydate-content{position:relative;padding:10px;-moz-user-select:none;-webkit-user-select:none;-ms-user-select:none}.layui-laydate-content table{border-collapse:collapse;border-spacing:0}.layui-laydate-content td,.layui-laydate-content th{width:36px;height:30px;padding:5px;text-align:center}.layui-laydate-content td{position:relative;cursor:pointer}.laydate-day-mark{position:absolute;left:0;top:0;width:100%;line-height:30px;font-size:12px;overflow:hidden}.laydate-day-mark::after{position:absolute;content:'';right:2px;top:2px;width:5px;height:5px;border-radius:50%}.layui-laydate-footer{position:relative;height:46px;line-height:26px;padding:10px}.layui-laydate-footer span{display:inline-block;vertical-align:top;height:26px;line-height:24px;padding:0 10px;border:1px solid #C9C9C9;border-radius:2px;background-color:#fff;font-size:12px;cursor:pointer;white-space:nowrap;transition:all .3s}.layui-laydate-list>li,.layui-laydate-range .layui-laydate-main{display:inline-block;vertical-align:middle}.layui-laydate-footer span:hover{color:#5FB878}.layui-laydate-footer span.layui-laydate-preview{cursor:default;border-color:transparent!important}.layui-laydate-footer span.layui-laydate-preview:hover{color:#666}.layui-laydate-footer span:first-child.layui-laydate-preview{padding-left:0}.laydate-footer-btns{position:absolute;right:10px;top:10px}.laydate-footer-btns span{margin:0 0 0 -1px}.layui-laydate-list{position:absolute;left:0;top:0;width:100%;height:100%;padding:10px;background-color:#fff}.layui-laydate-list>li{position:relative;width:33.3%;height:36px;line-height:36px;margin:3px 0;text-align:center;cursor:pointer}.laydate-month-list>li{width:25%;margin:17px 0}.laydate-time-list>li{height:100%;margin:0;line-height:normal;cursor:default}.laydate-time-list p{position:relative;top:-4px;line-height:29px}.laydate-time-list ol{height:181px;overflow:hidden}.laydate-time-list>li:hover ol{overflow-y:auto}.laydate-time-list ol li{width:130%;padding-left:33px;height:30px;line-height:30px;text-align:left;cursor:pointer}.layui-laydate-hint{position:absolute;top:115px;left:50%;width:250px;margin-left:-125px;line-height:20px;padding:15px;text-align:center;font-size:12px}.layui-laydate-range{width:546px}.layui-laydate-range .laydate-main-list-1 .layui-laydate-content,.layui-laydate-range .laydate-main-list-1 .layui-laydate-header{border-left:1px solid #e2e2e2}.layui-laydate,.layui-laydate-hint{border:1px solid #d2d2d2;box-shadow:0 2px 4px rgba(0,0,0,.12);background-color:#fff;color:#666}.layui-laydate-header{border-bottom:1px solid #e2e2e2}.layui-laydate-header i:hover,.layui-laydate-header span:hover{color:#5FB878}.layui-laydate-content{border-top:none 0;border-bottom:none 0}.layui-laydate-content th{font-weight:400;color:#333}.layui-laydate-content td{color:#666}.layui-laydate-content td.laydate-selected{background-color:#B5FFF8}.laydate-selected:hover{background-color:#00F7DE!important}.layui-laydate-content td:hover,.layui-laydate-list li:hover{background-color:#eee;color:#333}.laydate-time-list li ol{margin:0;padding:0;border:1px solid #e2e2e2;border-left-width:0}.laydate-time-list li:first-child ol{border-left-width:1px}.laydate-time-list>li:hover{background:0 0}.layui-laydate-content .laydate-day-next,.layui-laydate-content .laydate-day-prev{color:#d2d2d2}.laydate-selected.laydate-day-next,.laydate-selected.laydate-day-prev{background-color:#f8f8f8!important}.layui-laydate-footer{border-top:1px solid #e2e2e2}.layui-laydate-hint{color:#FF5722}.laydate-day-mark::after{background-color:#5FB878}.layui-laydate-content td.layui-this .laydate-day-mark::after{display:none}.layui-laydate-footer span[lay-type=date]{color:#5FB878}.layui-laydate .layui-this{background-color:#009688!important;color:#fff!important}.layui-laydate .laydate-disabled,.layui-laydate .laydate-disabled:hover{background:0 0!important;color:#d2d2d2!important;cursor:not-allowed!important;-moz-user-select:none;-webkit-user-select:none;-ms-user-select:none}.laydate-theme-molv{border:none}.laydate-theme-molv.layui-laydate-range{width:548px}.laydate-theme-molv .layui-laydate-main{width:274px}.laydate-theme-molv .layui-laydate-header{border:none;background-color:#009688}.laydate-theme-molv .layui-laydate-header i,.laydate-theme-molv .layui-laydate-header span{color:#f6f6f6}.laydate-theme-molv .layui-laydate-header i:hover,.laydate-theme-molv .layui-laydate-header span:hover{color:#fff}.laydate-theme-molv .layui-laydate-content{border:1px solid #e2e2e2;border-top:none;border-bottom:none}.laydate-theme-molv .laydate-main-list-1 .layui-laydate-content{border-left:none}.laydate-theme-grid .laydate-month-list>li,.laydate-theme-grid .laydate-year-list>li,.laydate-theme-grid .layui-laydate-content td,.laydate-theme-grid .layui-laydate-content thead,.laydate-theme-molv .layui-laydate-footer{border:1px solid #e2e2e2}.laydate-theme-grid .laydate-selected,.laydate-theme-grid .laydate-selected:hover{background-color:#f2f2f2!important;color:#009688!important}.laydate-theme-grid .laydate-selected.laydate-day-next,.laydate-theme-grid .laydate-selected.laydate-day-prev{color:#d2d2d2!important}.laydate-theme-grid .laydate-month-list,.laydate-theme-grid .laydate-year-list{margin:1px 0 0 1px}.laydate-theme-grid .laydate-month-list>li,.laydate-theme-grid .laydate-year-list>li{margin:0 -1px -1px 0}.laydate-theme-grid .laydate-year-list>li{height:43px;line-height:43px}.laydate-theme-grid .laydate-month-list>li{height:71px;line-height:71px}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/modules/layer/default/icon-ext.png b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/modules/layer/default/icon-ext.png
new file mode 100644
index 0000000..bbbb669
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/modules/layer/default/icon-ext.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/modules/layer/default/icon.png b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/modules/layer/default/icon.png
new file mode 100644
index 0000000..3e17da8
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/modules/layer/default/icon.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/modules/layer/default/layer.css b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/modules/layer/default/layer.css
new file mode 100644
index 0000000..db51f31
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/modules/layer/default/layer.css
@@ -0,0 +1 @@
+.layui-layer-imgbar,.layui-layer-imgtit a,.layui-layer-tab .layui-layer-title span,.layui-layer-title{text-overflow:ellipsis;white-space:nowrap}html #layuicss-layer{display:none;position:absolute;width:1989px}.layui-layer,.layui-layer-shade{position:fixed;_position:absolute;pointer-events:auto}.layui-layer-shade{top:0;left:0;width:100%;height:100%;_height:expression(document.body.offsetHeight+"px")}.layui-layer{-webkit-overflow-scrolling:touch;top:150px;left:0;margin:0;padding:0;background-color:#fff;-webkit-background-clip:content;border-radius:2px;box-shadow:1px 1px 50px rgba(0,0,0,.3)}.layui-layer-close{position:absolute}.layui-layer-content{position:relative}.layui-layer-border{border:1px solid #B2B2B2;border:1px solid rgba(0,0,0,.1);box-shadow:1px 1px 5px rgba(0,0,0,.2)}.layui-layer-load{background:url(loading-1.gif) center center no-repeat #eee}.layui-layer-ico{background:url(icon.png) no-repeat}.layui-layer-btn a,.layui-layer-dialog .layui-layer-ico,.layui-layer-setwin a{display:inline-block;*display:inline;*zoom:1;vertical-align:top}.layui-layer-move{display:none;position:fixed;*position:absolute;left:0;top:0;width:100%;height:100%;cursor:move;opacity:0;filter:alpha(opacity=0);background-color:#fff;z-index:2147483647}.layui-layer-resize{position:absolute;width:15px;height:15px;right:0;bottom:0;cursor:se-resize}.layer-anim{-webkit-animation-fill-mode:both;animation-fill-mode:both;-webkit-animation-duration:.3s;animation-duration:.3s}@-webkit-keyframes layer-bounceIn{0%{opacity:0;-webkit-transform:scale(.5);transform:scale(.5)}100%{opacity:1;-webkit-transform:scale(1);transform:scale(1)}}@keyframes layer-bounceIn{0%{opacity:0;-webkit-transform:scale(.5);-ms-transform:scale(.5);transform:scale(.5)}100%{opacity:1;-webkit-transform:scale(1);-ms-transform:scale(1);transform:scale(1)}}.layer-anim-00{-webkit-animation-name:layer-bounceIn;animation-name:layer-bounceIn}@-webkit-keyframes layer-zoomInDown{0%{opacity:0;-webkit-transform:scale(.1) translateY(-2000px);transform:scale(.1) translateY(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateY(60px);transform:scale(.475) translateY(60px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}@keyframes layer-zoomInDown{0%{opacity:0;-webkit-transform:scale(.1) translateY(-2000px);-ms-transform:scale(.1) translateY(-2000px);transform:scale(.1) translateY(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateY(60px);-ms-transform:scale(.475) translateY(60px);transform:scale(.475) translateY(60px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}.layer-anim-01{-webkit-animation-name:layer-zoomInDown;animation-name:layer-zoomInDown}@-webkit-keyframes layer-fadeInUpBig{0%{opacity:0;-webkit-transform:translateY(2000px);transform:translateY(2000px)}100%{opacity:1;-webkit-transform:translateY(0);transform:translateY(0)}}@keyframes layer-fadeInUpBig{0%{opacity:0;-webkit-transform:translateY(2000px);-ms-transform:translateY(2000px);transform:translateY(2000px)}100%{opacity:1;-webkit-transform:translateY(0);-ms-transform:translateY(0);transform:translateY(0)}}.layer-anim-02{-webkit-animation-name:layer-fadeInUpBig;animation-name:layer-fadeInUpBig}@-webkit-keyframes layer-zoomInLeft{0%{opacity:0;-webkit-transform:scale(.1) translateX(-2000px);transform:scale(.1) translateX(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateX(48px);transform:scale(.475) translateX(48px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}@keyframes layer-zoomInLeft{0%{opacity:0;-webkit-transform:scale(.1) translateX(-2000px);-ms-transform:scale(.1) translateX(-2000px);transform:scale(.1) translateX(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateX(48px);-ms-transform:scale(.475) translateX(48px);transform:scale(.475) translateX(48px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}.layer-anim-03{-webkit-animation-name:layer-zoomInLeft;animation-name:layer-zoomInLeft}@-webkit-keyframes layer-rollIn{0%{opacity:0;-webkit-transform:translateX(-100%) rotate(-120deg);transform:translateX(-100%) rotate(-120deg)}100%{opacity:1;-webkit-transform:translateX(0) rotate(0);transform:translateX(0) rotate(0)}}@keyframes layer-rollIn{0%{opacity:0;-webkit-transform:translateX(-100%) rotate(-120deg);-ms-transform:translateX(-100%) rotate(-120deg);transform:translateX(-100%) rotate(-120deg)}100%{opacity:1;-webkit-transform:translateX(0) rotate(0);-ms-transform:translateX(0) rotate(0);transform:translateX(0) rotate(0)}}.layer-anim-04{-webkit-animation-name:layer-rollIn;animation-name:layer-rollIn}@keyframes layer-fadeIn{0%{opacity:0}100%{opacity:1}}.layer-anim-05{-webkit-animation-name:layer-fadeIn;animation-name:layer-fadeIn}@-webkit-keyframes layer-shake{0%,100%{-webkit-transform:translateX(0);transform:translateX(0)}10%,30%,50%,70%,90%{-webkit-transform:translateX(-10px);transform:translateX(-10px)}20%,40%,60%,80%{-webkit-transform:translateX(10px);transform:translateX(10px)}}@keyframes layer-shake{0%,100%{-webkit-transform:translateX(0);-ms-transform:translateX(0);transform:translateX(0)}10%,30%,50%,70%,90%{-webkit-transform:translateX(-10px);-ms-transform:translateX(-10px);transform:translateX(-10px)}20%,40%,60%,80%{-webkit-transform:translateX(10px);-ms-transform:translateX(10px);transform:translateX(10px)}}.layer-anim-06{-webkit-animation-name:layer-shake;animation-name:layer-shake}@-webkit-keyframes fadeIn{0%{opacity:0}100%{opacity:1}}.layui-layer-title{padding:0 80px 0 20px;height:50px;line-height:50px;border-bottom:1px solid #F0F0F0;font-size:14px;color:#333;overflow:hidden;border-radius:2px 2px 0 0}.layui-layer-setwin{position:absolute;right:15px;*right:0;top:17px;font-size:0;line-height:initial}.layui-layer-setwin a{position:relative;width:16px;height:16px;margin-left:10px;font-size:12px;_overflow:hidden}.layui-layer-setwin .layui-layer-min cite{position:absolute;width:14px;height:2px;left:0;top:50%;margin-top:-1px;background-color:#2E2D3C;cursor:pointer;_overflow:hidden}.layui-layer-setwin .layui-layer-min:hover cite{background-color:#2D93CA}.layui-layer-setwin .layui-layer-max{background-position:-32px -40px}.layui-layer-setwin .layui-layer-max:hover{background-position:-16px -40px}.layui-layer-setwin .layui-layer-maxmin{background-position:-65px -40px}.layui-layer-setwin .layui-layer-maxmin:hover{background-position:-49px -40px}.layui-layer-setwin .layui-layer-close1{background-position:1px -40px;cursor:pointer}.layui-layer-setwin .layui-layer-close1:hover{opacity:.7}.layui-layer-setwin .layui-layer-close2{position:absolute;right:-28px;top:-28px;width:30px;height:30px;margin-left:0;background-position:-149px -31px;*right:-18px;_display:none}.layui-layer-setwin .layui-layer-close2:hover{background-position:-180px -31px}.layui-layer-btn{text-align:right;padding:0 15px 12px;pointer-events:auto;user-select:none;-webkit-user-select:none}.layui-layer-btn a{height:28px;line-height:28px;margin:5px 5px 0;padding:0 15px;border:1px solid #dedede;background-color:#fff;color:#333;border-radius:2px;font-weight:400;cursor:pointer;text-decoration:none}.layui-layer-btn a:hover{opacity:.9;text-decoration:none}.layui-layer-btn a:active{opacity:.8}.layui-layer-btn .layui-layer-btn0{border-color:#1E9FFF;background-color:#1E9FFF;color:#fff}.layui-layer-btn-l{text-align:left}.layui-layer-btn-c{text-align:center}.layui-layer-dialog{min-width:300px}.layui-layer-dialog .layui-layer-content{position:relative;padding:20px;line-height:24px;word-break:break-all;overflow:hidden;font-size:14px;overflow-x:hidden;overflow-y:auto}.layui-layer-dialog .layui-layer-content .layui-layer-ico{position:absolute;top:16px;left:15px;_left:-40px;width:30px;height:30px}.layui-layer-ico1{background-position:-30px 0}.layui-layer-ico2{background-position:-60px 0}.layui-layer-ico3{background-position:-90px 0}.layui-layer-ico4{background-position:-120px 0}.layui-layer-ico5{background-position:-150px 0}.layui-layer-ico6{background-position:-180px 0}.layui-layer-rim{border:6px solid #8D8D8D;border:6px solid rgba(0,0,0,.3);border-radius:5px;box-shadow:none}.layui-layer-msg{min-width:180px;border:1px solid #D3D4D3;box-shadow:none}.layui-layer-hui{min-width:100px;background-color:#000;filter:alpha(opacity=60);background-color:rgba(0,0,0,.6);color:#fff;border:none}.layui-layer-hui .layui-layer-content{padding:12px 25px;text-align:center}.layui-layer-dialog .layui-layer-padding{padding:20px 20px 20px 55px;text-align:left}.layui-layer-page .layui-layer-content{position:relative;overflow:auto}.layui-layer-iframe .layui-layer-btn,.layui-layer-page .layui-layer-btn{padding-top:10px}.layui-layer-nobg{background:0 0}.layui-layer-iframe iframe{display:block;width:100%}.layui-layer-loading{border-radius:100%;background:0 0;box-shadow:none;border:none}.layui-layer-loading .layui-layer-content{width:60px;height:24px;background:url(loading-0.gif) no-repeat}.layui-layer-loading .layui-layer-loading1{width:37px;height:37px;background:url(loading-1.gif) no-repeat}.layui-layer-ico16,.layui-layer-loading .layui-layer-loading2{width:32px;height:32px;background:url(loading-2.gif) no-repeat}.layui-layer-tips{background:0 0;box-shadow:none;border:none}.layui-layer-tips .layui-layer-content{position:relative;line-height:22px;min-width:12px;padding:8px 15px;font-size:12px;_float:left;border-radius:2px;box-shadow:1px 1px 3px rgba(0,0,0,.2);background-color:#000;color:#fff}.layui-layer-tips .layui-layer-close{right:-2px;top:-1px}.layui-layer-tips i.layui-layer-TipsG{position:absolute;width:0;height:0;border-width:8px;border-color:transparent;border-style:dashed;*overflow:hidden}.layui-layer-tips i.layui-layer-TipsB,.layui-layer-tips i.layui-layer-TipsT{left:5px;border-right-style:solid;border-right-color:#000}.layui-layer-tips i.layui-layer-TipsT{bottom:-8px}.layui-layer-tips i.layui-layer-TipsB{top:-8px}.layui-layer-tips i.layui-layer-TipsL,.layui-layer-tips i.layui-layer-TipsR{top:5px;border-bottom-style:solid;border-bottom-color:#000}.layui-layer-tips i.layui-layer-TipsR{left:-8px}.layui-layer-tips i.layui-layer-TipsL{right:-8px}.layui-layer-lan[type=dialog]{min-width:280px}.layui-layer-lan .layui-layer-title{background:#4476A7;color:#fff;border:none}.layui-layer-lan .layui-layer-btn{padding:5px 10px 10px;text-align:right;border-top:1px solid #E9E7E7}.layui-layer-lan .layui-layer-btn a{background:#fff;border-color:#E9E7E7;color:#333}.layui-layer-lan .layui-layer-btn .layui-layer-btn1{background:#C9C5C5}.layui-layer-molv .layui-layer-title{background:#009f95;color:#fff;border:none}.layui-layer-molv .layui-layer-btn a{background:#009f95;border-color:#009f95}.layui-layer-molv .layui-layer-btn .layui-layer-btn1{background:#92B8B1}.layui-layer-iconext{background:url(icon-ext.png) no-repeat}.layui-layer-prompt .layui-layer-input{display:block;width:260px;height:36px;margin:0 auto;line-height:30px;padding-left:10px;border:1px solid #e6e6e6;color:#333}.layui-layer-prompt textarea.layui-layer-input{width:300px;height:100px;line-height:20px;padding:6px 10px}.layui-layer-prompt .layui-layer-content{padding:20px}.layui-layer-prompt .layui-layer-btn{padding-top:0}.layui-layer-tab{box-shadow:1px 1px 50px rgba(0,0,0,.4)}.layui-layer-tab .layui-layer-title{padding-left:0;overflow:visible}.layui-layer-tab .layui-layer-title span{position:relative;float:left;min-width:80px;max-width:300px;padding:0 20px;text-align:center;overflow:hidden;cursor:pointer}.layui-layer-tab .layui-layer-title span.layui-this{height:51px;border-left:1px solid #eee;border-right:1px solid #eee;background-color:#fff;z-index:10}.layui-layer-tab .layui-layer-title span:first-child{border-left:none}.layui-layer-tabmain{line-height:24px;clear:both}.layui-layer-tabmain .layui-layer-tabli{display:none}.layui-layer-tabmain .layui-layer-tabli.layui-this{display:block}.layui-layer-photos{background:0 0;box-shadow:none}.layui-layer-photos .layui-layer-content{overflow:hidden;text-align:center}.layui-layer-photos .layui-layer-phimg img{position:relative;width:100%;display:inline-block;*display:inline;*zoom:1;vertical-align:top}.layui-layer-imgnext,.layui-layer-imgprev{position:fixed;top:50%;width:27px;_width:44px;height:44px;margin-top:-22px;outline:0;blr:expression(this.onFocus=this.blur())}.layui-layer-imgprev{left:30px;background-position:-5px -5px;_background-position:-70px -5px}.layui-layer-imgprev:hover{background-position:-33px -5px;_background-position:-120px -5px}.layui-layer-imgnext{right:30px;_right:8px;background-position:-5px -50px;_background-position:-70px -50px}.layui-layer-imgnext:hover{background-position:-33px -50px;_background-position:-120px -50px}.layui-layer-imgbar{position:fixed;left:0;right:0;bottom:0;width:100%;height:40px;line-height:40px;background-color:#000\9;filter:Alpha(opacity=60);background-color:rgba(2,0,0,.35);color:#fff;overflow:hidden;font-size:0}.layui-layer-imgtit *{display:inline-block;*display:inline;*zoom:1;vertical-align:top;font-size:12px}.layui-layer-imgtit a{max-width:65%;overflow:hidden;color:#fff}.layui-layer-imgtit a:hover{color:#fff;text-decoration:underline}.layui-layer-imgtit em{padding-left:10px;font-style:normal}@-webkit-keyframes layer-bounceOut{100%{opacity:0;-webkit-transform:scale(.7);transform:scale(.7)}30%{-webkit-transform:scale(1.05);transform:scale(1.05)}0%{-webkit-transform:scale(1);transform:scale(1)}}@keyframes layer-bounceOut{100%{opacity:0;-webkit-transform:scale(.7);-ms-transform:scale(.7);transform:scale(.7)}30%{-webkit-transform:scale(1.05);-ms-transform:scale(1.05);transform:scale(1.05)}0%{-webkit-transform:scale(1);-ms-transform:scale(1);transform:scale(1)}}.layer-anim-close{-webkit-animation-name:layer-bounceOut;animation-name:layer-bounceOut;-webkit-animation-fill-mode:both;animation-fill-mode:both;-webkit-animation-duration:.2s;animation-duration:.2s}@media screen and (max-width:1100px){.layui-layer-iframe{overflow-y:auto;-webkit-overflow-scrolling:touch}}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/modules/layer/default/loading-0.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/modules/layer/default/loading-0.gif
new file mode 100644
index 0000000..6f3c953
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/modules/layer/default/loading-0.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/modules/layer/default/loading-1.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/modules/layer/default/loading-1.gif
new file mode 100644
index 0000000..db3a483
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/modules/layer/default/loading-1.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/modules/layer/default/loading-2.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/modules/layer/default/loading-2.gif
new file mode 100644
index 0000000..5bb90fd
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/modules/layer/default/loading-2.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/modules/layim/html/chatlog.html b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/modules/layim/html/chatlog.html
new file mode 100644
index 0000000..9cbc571
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/modules/layim/html/chatlog.html
@@ -0,0 +1,96 @@
+ 
+ 
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+<title>聊天记录</title>
+
+<link rel="stylesheet" href="http://local.res.layui.com/layui/src/css/layui.css">
+<style>
+body .layim-chat-main{height: auto;}
+</style>
+</head>
+<body>
+
+<div class="layim-chat-main">
+  <ul id="LAY_view"></ul>
+</div>
+
+<div id="LAY_page" style="margin: 0 10px;"></div>
+
+
+<textarea title="消息模版" id="LAY_tpl" style="display:none;">
+{{# layui.each(d.data, function(index, item){
+  if(item.id == parent.layui.layim.cache().mine.id){ }}
+    <li class="layim-chat-mine"><div class="layim-chat-user"><img src="{{ item.avatar }}"><cite><i>{{ layui.data.date(item.timestamp) }}</i>{{ item.username }}</cite></div><div class="layim-chat-text">{{ layui.layim.content(item.content) }}</div></li>
+  {{# } else { }}
+    <li><div class="layim-chat-user"><img src="{{ item.avatar }}"><cite>{{ item.username }}<i>{{ layui.data.date(item.timestamp) }}</i></cite></div><div class="layim-chat-text">{{ layui.layim.content(item.content) }}</div></li>
+  {{# }
+}); }}
+</textarea>
+
+<!-- 
+上述模版采用了 laytpl 语法，不了解的同学可以去看下文档：http://www.layui.com/doc/modules/laytpl.html
+
+-->
+
+
+<script src="http://local.res.layui.com/layui/src/layui.js"></script>
+<script>
+layui.use(['layim', 'laypage'], function(){
+  var layim = layui.layim
+  ,layer = layui.layer
+  ,laytpl = layui.laytpl
+  ,$ = layui.jquery
+  ,laypage = layui.laypage;
+  
+  //聊天记录的分页此处不做演示，你可以采用laypage，不了解的同学见文档：http://www.layui.com/doc/modules/laypage.html
+  
+  
+  //开始请求聊天记录
+  var param =  location.search //获得URL参数。该窗口url会携带会话id和type，他们是你请求聊天记录的重要凭据
+  
+  //实际使用时，下述的res一般是通过Ajax获得，而此处仅仅只是演示数据格式
+  ,res = {
+    code: 0
+    ,msg: ''
+    ,data: [{
+      username: '纸飞机'
+      ,id: 100000
+      ,avatar: 'http://tva3.sinaimg.cn/crop.0.0.512.512.180/8693225ajw8f2rt20ptykj20e80e8weu.jpg'
+      ,timestamp: 1480897882000
+      ,content: 'face[抱抱] face[心] 你好啊小美女'
+    }, {
+      username: 'Z_子晴'
+      ,id: 108101
+      ,avatar: 'http://tva3.sinaimg.cn/crop.0.0.512.512.180/8693225ajw8f2rt20ptykj20e80e8weu.jpg'
+      ,timestamp: 1480897892000
+      ,content: '你没发错吧？face[微笑]'
+    },{
+      username: 'Z_子晴'
+      ,id: 108101
+      ,avatar: 'http://tva3.sinaimg.cn/crop.0.0.512.512.180/8693225ajw8f2rt20ptykj20e80e8weu.jpg'
+      ,timestamp: 1480897898000
+      ,content: '你是谁呀亲。。我爱的是贤心！我爱的是贤心！我爱的是贤心！重要的事情要说三遍~'
+    },{
+      username: 'Z_子晴'
+      ,id: 108101
+      ,avatar: 'http://tva3.sinaimg.cn/crop.0.0.512.512.180/8693225ajw8f2rt20ptykj20e80e8weu.jpg'
+      ,timestamp: 1480897908000
+      ,content: '注意：这些都是模拟数据，实际使用时，需将其中的模拟接口改为你的项目真实接口。\n该模版文件所在目录（相对于layui.js）：\n/css/modules/layim/html/chatlog.html'
+    }]
+  }
+  
+  //console.log(param)
+  
+  var html = laytpl(LAY_tpl.value).render({
+    data: res.data
+  });
+  $('#LAY_view').html(html);
+  
+});
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/modules/layim/html/find.html b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/modules/layim/html/find.html
new file mode 100644
index 0000000..ff5cab1
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/modules/layim/html/find.html
@@ -0,0 +1,38 @@
+ 
+ 
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+<title>发现</title>
+
+<link rel="stylesheet" href="http://local.res.layui.com/layui/src/css/layui.css">
+<style>
+
+</style>
+</head>
+<body>
+
+<div style="margin: 15px;">
+  <blockquote class="layui-elem-quote">此为自定义的【查找】页面，因需求不一，所以官方暂不提供该模版结构与样式，实际使用时，可移至该文件到你的项目中，对页面自行把控。
+  <br>文件所在目录（相对于layui.js）：/css/modules/layim/html/find.html</blockquote>
+</div>
+
+
+
+<script src="http://local.res.layui.com/layui/src/layui.js"></script>
+<script>
+layui.use(['layim', 'laypage'], function(){
+  var layim = layui.layim
+  ,layer = layui.layer
+  ,laytpl = layui.laytpl
+  ,$ = layui.jquery
+  ,laypage = layui.laypage;
+  
+  //一些添加好友请求之类的交互参见文档
+  
+});
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/modules/layim/html/getmsg.json b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/modules/layim/html/getmsg.json
new file mode 100644
index 0000000..3d9b9d4
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/modules/layim/html/getmsg.json
@@ -0,0 +1,87 @@
+{
+    "code": 0,
+    "pages": 1,
+    "data": [
+        {
+            "id": 76,
+            "content": "申请添加你为好友",
+            "uid": 168,
+            "from": 166488,
+            "from_group": 0,
+            "type": 1,
+            "remark": "有问题要问",
+            "href": null,
+            "read": 1,
+            "time": "刚刚",
+            "user": {
+                "id": 166488,
+                "avatar": "http://q.qlogo.cn/qqapp/101235792/B704597964F9BD0DB648292D1B09F7E8/100",
+                "username": "李彦宏",
+                "sign": null
+            }
+        },
+        {
+            "id": 75,
+            "content": "申请添加你为好友",
+            "uid": 168,
+            "from": 347592,
+            "from_group": 0,
+            "type": 1,
+            "remark": "你好啊！",
+            "href": null,
+            "read": 1,
+            "time": "刚刚",
+            "user": {
+                "id": 347592,
+                "avatar": "http://q.qlogo.cn/qqapp/101235792/B78751375E0531675B1272AD994BA875/100",
+                "username": "麻花疼",
+                "sign": null
+            }
+        },
+        {
+            "id": 62,
+            "content": "雷军 拒绝了你的好友申请",
+            "uid": 168,
+            "from": null,
+            "from_group": null,
+            "type": 1,
+            "remark": null,
+            "href": null,
+            "read": 1,
+            "time": "10天前",
+            "user": {
+                "id": null
+            }
+        },
+        {
+            "id": 60,
+            "content": "马小云 已经同意你的好友申请",
+            "uid": 168,
+            "from": null,
+            "from_group": null,
+            "type": 1,
+            "remark": null,
+            "href": null,
+            "read": 1,
+            "time": "10天前",
+            "user": {
+                "id": null
+            }
+        },
+        {
+            "id": 61,
+            "content": "贤心 已经同意你的好友申请",
+            "uid": 168,
+            "from": null,
+            "from_group": null,
+            "type": 1,
+            "remark": null,
+            "href": null,
+            "read": 1,
+            "time": "10天前",
+            "user": {
+                "id": null
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/modules/layim/html/msgbox.html b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/modules/layim/html/msgbox.html
new file mode 100644
index 0000000..0adf002
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/modules/layim/html/msgbox.html
@@ -0,0 +1,208 @@
+ 
+ 
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+<title>消息盒子</title>
+
+<link rel="stylesheet" href="../../../layui.css?v=1">
+<style>
+.layim-msgbox{margin: 15px;}
+.layim-msgbox li{position: relative; margin-bottom: 10px; padding: 0 130px 10px 60px; padding-bottom: 10px; line-height: 22px; border-bottom: 1px dotted #e2e2e2;}
+.layim-msgbox .layim-msgbox-tips{margin: 0; padding: 10px 0; border: none; text-align: center; color: #999;}
+.layim-msgbox .layim-msgbox-system{padding: 0 10px 10px 10px;}
+.layim-msgbox li p span{padding-left: 5px; color: #999;}
+.layim-msgbox li p em{font-style: normal; color: #FF5722;}
+
+.layim-msgbox-avatar{position: absolute; left: 0; top: 0; width: 50px; height: 50px;}
+.layim-msgbox-user{padding-top: 5px;}
+.layim-msgbox-content{margin-top: 3px;}
+.layim-msgbox .layui-btn-small{padding: 0 15px; margin-left: 5px;}
+.layim-msgbox-btn{position: absolute; right: 0; top: 12px; color: #999;}
+</style>
+</head>
+<body>
+
+<ul class="layim-msgbox" id="LAY_view"></ul>
+
+<div style="margin: 0 15px;">
+  <blockquote class="layui-elem-quote">注意：这些都是模拟数据，实际使用时，需将其中的模拟接口改为你的项目真实接口。
+  <br>该模版文件所在目录（相对于layui.js）：/css/modules/layim/html/msgbox.html</blockquote>
+</div>
+
+<textarea title="消息模版" id="LAY_tpl" style="display:none;">
+{{# layui.each(d.data, function(index, item){
+  if(item.from){ }}
+    <li data-uid="{{ item.from }}" data-fromGroup="{{ item.from_group }}">
+      <a href="/u/{{ item.from }}/" target="_blank">
+        <img src="{{ item.user.avatar }}" class="layui-circle layim-msgbox-avatar">
+      </a>
+      <p class="layim-msgbox-user">
+        <a href="/u/{{ item.from }}/" target="_blank">{{ item.user.username||'' }}</a>
+        <span>{{ item.time }}</span>
+      </p>
+      <p class="layim-msgbox-content">
+        {{ item.content }} 
+        <span>{{ item.remark ? '附言: '+item.remark : '' }}</span>
+      </p>
+      <p class="layim-msgbox-btn">
+        <button class="layui-btn layui-btn-small" data-type="agree">同意</button>
+        <button class="layui-btn layui-btn-small layui-btn-primary" data-type="refuse">拒绝</button>
+      </p>
+    </li>
+  {{# } else { }}
+    <li class="layim-msgbox-system">
+      <p><em>系统：</em>{{ item.content }}<span>{{ item.time }}</span></p>
+    </li>
+  {{# }
+}); }}
+</textarea>
+
+<!-- 
+上述模版采用了 laytpl 语法，不了解的同学可以去看下文档：http://www.layui.com/doc/modules/laytpl.html 
+-->
+
+
+<script src="../../../../layui.js?v=1"></script>
+<script>
+layui.use(['layim', 'flow'], function(){
+  var layim = layui.layim
+  ,layer = layui.layer
+  ,laytpl = layui.laytpl
+  ,$ = layui.jquery
+  ,flow = layui.flow;
+
+  var cache = {}; //用于临时记录请求到的数据
+
+  //请求消息
+  var renderMsg = function(page, callback){
+    
+    //实际部署时，请将下述 getmsg.json 改为你的接口地址
+    
+    $.get('getmsg.json', {
+      page: page || 1
+    }, function(res){
+      if(res.code != 0){
+        return layer.msg(res.msg);
+      }
+
+      //记录来源用户信息
+      layui.each(res.data, function(index, item){
+        cache[item.from] = item.user;
+      });
+
+      callback && callback(res.data, res.pages);
+    });
+  };
+
+  //消息信息流
+  flow.load({
+    elem: '#LAY_view' //流加载容器
+    ,isAuto: false
+    ,end: '<li class="layim-msgbox-tips">暂无更多新消息</li>'
+    ,done: function(page, next){ //加载下一页
+      renderMsg(page, function(data, pages){
+        var html = laytpl(LAY_tpl.value).render({
+          data: data
+          ,page: page
+        });
+        next(html, page < pages);
+      });
+    }
+  });
+
+  //打开页面即把消息标记为已读
+  /*
+  $.post('/message/read', {
+    type: 1
+  });
+  */
+
+  //操作
+  var active = {
+    //同意
+    agree: function(othis){
+      var li = othis.parents('li')
+      ,uid = li.data('uid')
+      ,from_group = li.data('fromGroup')
+      ,user = cache[uid];
+
+      //选择分组
+      parent.layui.layim.setFriendGroup({
+        type: 'friend'
+        ,username: user.username
+        ,avatar: user.avatar
+        ,group: parent.layui.layim.cache().friend //获取好友分组数据
+        ,submit: function(group, index){
+          
+          //将好友追加到主面板
+          parent.layui.layim.addList({
+            type: 'friend'
+            ,avatar: user.avatar //好友头像
+            ,username: user.username //好友昵称
+            ,groupid: group //所在的分组id
+            ,id: uid //好友ID
+            ,sign: user.sign //好友签名
+          });
+          parent.layer.close(index);
+          othis.parent().html('已同意');
+        
+        
+          //实际部署时，请开启下述注释，并改成你的接口地址
+          /*
+          $.post('/im/agreeFriend', {
+            uid: uid //对方用户ID
+            ,from_group: from_group //对方设定的好友分组
+            ,group: group //我设定的好友分组
+          }, function(res){
+            if(res.code != 0){
+              return layer.msg(res.msg);
+            }
+
+            //将好友追加到主面板
+            parent.layui.layim.addList({
+              type: 'friend'
+              ,avatar: user.avatar //好友头像
+              ,username: user.username //好友昵称
+              ,groupid: group //所在的分组id
+              ,id: uid //好友ID
+              ,sign: user.sign //好友签名
+            });
+            parent.layer.close(index);
+            othis.parent().html('已同意');
+          });
+          */
+          
+        }
+      });
+    }
+
+    //拒绝
+    ,refuse: function(othis){
+      var li = othis.parents('li')
+      ,uid = li.data('uid');
+
+      layer.confirm('确定拒绝吗？', function(index){
+        $.post('/im/refuseFriend', {
+          uid: uid //对方用户ID
+        }, function(res){
+          if(res.code != 0){
+            return layer.msg(res.msg);
+          }
+          layer.close(index);
+          othis.parent().html('<em>已拒绝</em>');
+        });
+      });
+    }
+  };
+
+  $('body').on('click', '.layui-btn', function(){
+    var othis = $(this), type = othis.data('type');
+    active[type] ? active[type].call(this, othis) : '';
+  });
+});
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/modules/layim/layim.css b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/modules/layim/layim.css
new file mode 100644
index 0000000..e9872f1
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/modules/layim/layim.css
@@ -0,0 +1,2 @@
+/** layui-v2.3.0 MIT License By https://www.layui.com */
+ html #layuicss-skinlayimcss{display:none;position:absolute;width:1989px}body .layui-layim,body .layui-layim-chat{border:1px solid #D9D9D9;border-color:rgba(0,0,0,.05);background-repeat:no-repeat;background-color:#F6F6F6;color:#333;font-family:\5FAE\8F6F\96C5\9ED1}body .layui-layim-chat{background-size:cover}body .layui-layim .layui-layer-title{height:110px;border-bottom:none;background:0 0}.layui-layim-main{position:relative;top:-98px;left:0}body .layui-layim .layui-layer-content,body .layui-layim-chat .layui-layer-content{overflow:visible}.layui-layim cite,.layui-layim em,.layui-layim-chat cite,.layui-layim-chat em{font-style:normal}.layui-layim-info{height:50px;font-size:0;padding:0 15px}.layui-layim-info *{font-size:14px}.layim-tab-content li h5 *,.layui-layim-info div,.layui-layim-skin li,.layui-layim-tab li,.layui-layim-tool li{display:inline-block;vertical-align:top;*zoom:1;*display:inline}.layim-tab-content li h5 span,.layui-layim-info .layui-layim-user,.layui-layim-list li p,.layui-layim-list li span,.layui-layim-remark{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.layui-layim-info .layui-layim-user{max-width:150px;margin-right:5px;font-size:16px}.layui-layim-status{position:relative;top:2px;line-height:19px;cursor:pointer}.layim-status-online{color:#3FDD86}.layim-status-hide{color:#DD691D}.layim-menu-box{display:none;position:absolute;z-index:100;top:24px;left:-31px;padding:5px 0;width:85px;border:1px solid #E2E2E2;border-radius:2px;background-color:#fff;box-shadow:1px 1px 20px rgba(0,0,0,.1)}.layim-menu-box li{position:relative;line-height:22px;padding-left:30px;font-size:12px}.layim-menu-box li cite{padding-right:5px;font-size:14px}.layim-menu-box li i{display:none;position:absolute;left:8px;top:0;font-weight:700;color:#5FB878}.layim-menu-box .layim-this i{display:block}.layim-menu-box li:hover{background-color:#eee}.layui-layim-remark{position:relative;left:-6px;display:block;width:100%;border:1px solid transparent;margin-top:8px;padding:0 5px;height:26px;line-height:26px;background:0 0;border-radius:2px}.layui-layim-remark:focus,.layui-layim-remark:hover{border:1px solid #d2d2d2;border-color:rgba(0,0,0,.15)}.layui-layim-remark:focus{background-color:#fff}.layui-layim-tab{margin-top:10px;padding:9px 0;font-size:0}.layui-layim-tab li{position:relative;width:33.33%;height:24px;line-height:24px;font-size:22px;text-align:center;color:#666;color:rgba(0,0,0,.6);cursor:pointer}.layim-tab-two li{width:50%}.layui-layim-tab li.layim-this:after{content:'';position:absolute;left:0;bottom:-9px;width:100%;height:3px;background-color:#3FDD86}.layui-layim-tab li.layim-hide{display:none}.layui-layim-tab li:hover{opacity:.8;filter:Alpha(opacity=80)}.layim-tab-content{display:none;padding:10px 0;height:349px;overflow:hidden;background-color:#fff;background-color:rgba(255,255,255,.9)}.layim-tab-content:hover{overflow-y:auto}.layim-tab-content li h5{position:relative;margin-right:15px;padding-left:30px;height:28px;line-height:28px;cursor:pointer;font-size:0;white-space:nowrap;overflow:hidden}.layim-tab-content li h5 *{font-size:14px}.layim-tab-content li h5 span{max-width:125px}.layim-tab-content li h5 i{position:absolute;left:12px;top:0;color:#C9BDBB}.layim-tab-content li h5 em{padding-left:5px;color:#999}.layim-tab-content li h5[lay-type=true] i{top:2px}.layim-tab-content li ul{display:none;margin-bottom:10px}.layui-layim-list li{position:relative;height:42px;padding:5px 15px 5px 60px;font-size:0;cursor:pointer}.layui-layim-list li:hover{background-color:#F2F2F2;background-color:rgba(0,0,0,.05)}.layui-layim-list li.layim-null{height:20px;line-height:20px;padding:0;font-size:14px;color:#999;text-align:center;cursor:default}.layui-layim-list li.layim-null:hover{background:0 0}.layui-layim-list li *{display:inline-block;*display:inline;*zoom:1;vertical-align:top;font-size:14px}.layui-layim-list li span{margin-top:4px;max-width:155px}.layui-layim-list li img{position:absolute;left:15px;top:8px;width:36px;height:36px;border-radius:100%}.layui-layim-list li p{display:block;padding-right:30px;line-height:18px;font-size:12px;color:#999}.layui-layim-list li .layim-msg-status{display:none;position:absolute;right:10px;bottom:7px;padding:0 5px;height:16px;line-height:16px;border-radius:16px;text-align:center;font-size:10px;background-color:#F74C31;color:#fff}.layim-list-gray{-webkit-filter:grayscale(100%);-ms-filter:grayscale(100%);filter:grayscale(100%);filter:gray}.layui-layim-tool{padding:0 10px;font-size:0;background-color:#F6F6F6;border-radius:0 0 2px 2px}.layui-layim-tool li{position:relative;width:48px;height:37px;line-height:40px;text-align:center;font-size:22px;cursor:pointer}.layui-layim-tool li:active{background-color:#e2e2e2}.layui-layim-tool .layim-tool-msgbox{line-height:37px}.layui-layim-tool .layim-tool-find{line-height:38px}.layui-layim-tool .layim-tool-skin{font-size:26px}.layim-tool-msgbox span{display:none;position:absolute;left:12px;top:-12px;height:20px;line-height:20px;padding:0 10px;border-radius:2px;background-color:#33DF83;color:#fff;font-size:12px;-webkit-animation-duration:1s;animation-duration:1s}.layim-tool-msgbox .layer-anim-05{display:block}.layui-layim-search{display:none;position:absolute;bottom:5px;left:5px;height:28px;line-height:28px}.layui-layim-search input{width:210px;padding:0 30px 0 10px;height:30px;line-height:30px;border:none;border-radius:3px;background-color:#ddd}.layui-layim-search label{position:absolute;right:6px;top:4px;font-size:20px;cursor:pointer;color:#333;font-weight:400}.layui-layim-skin{margin:10px 0 0 10px;font-size:0}.layui-layim-skin li{margin:0 10px 10px 0;line-height:60px;text-align:center;background-color:#f6f6f6}.layui-layim-skin li,.layui-layim-skin li img{width:86px;height:60px;cursor:pointer}.layui-layim-skin li img:hover{opacity:.8;filter:Alpha(opacity=80)}.layui-layim-skin li cite{font-size:14px;font-style:normal}body .layui-layim-chat{background-color:#fff}body .layui-layim-chat-list{width:760px}body .layui-layim-chat .layui-layer-title{height:80px;border-bottom:none;background-color:#F8F8F8;background-color:rgba(245,245,245,.7)}body .layui-layim-chat .layui-layer-content{background:0 0}.layim-chat-list li *,.layui-layim-min .layui-layer-content *{display:inline-block;*display:inline;*zoom:1;vertical-align:top;font-size:14px}.layim-chat-list{display:none;position:absolute;z-index:1000;top:-80px;width:200px;height:100%;background-color:#D9D9D9;overflow:hidden;font-size:0}.layim-chat-list:hover{overflow-y:auto}.layim-chat-list li,.layui-layim-min .layui-layer-content{position:relative;margin:5px;padding:5px 30px 5px 5px;line-height:40px;cursor:pointer;border-radius:3px}.layim-chat-list li img,.layui-layim-min .layui-layer-content img{width:40px;height:40px;border-radius:100%}.layui-layim-photos{cursor:crosshair}.layim-chat-list li{white-space:nowrap}.layim-chat-list li span,.layui-layim-min .layui-layer-content span{width:100px;padding-left:10px;font-size:16px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}.layim-chat-list li span cite{color:#999;padding-left:10px}.layim-chat-list li:hover{background-color:#E2E2E2}.layim-chat-list li.layim-this{background-color:#F3F3F3}.layim-chat-list li .layui-icon{display:none;position:absolute;right:5px;top:7px;color:#555;font-size:22px}.layim-chat-list li .layui-icon:hover{color:#c00}.layim-chat-list li:hover .layui-icon{display:inline-block}.layim-chat-system{margin:10px 0;text-align:center}.layim-chat-system span{display:inline-block;line-height:30px;padding:0 15px;border-radius:3px;background-color:#e2e2e2;cursor:default;font-size:14px}.layim-chat{display:none;position:relative;background-color:#fff;background-color:rgba(255,255,255,.9)}.layim-chat-title{position:absolute;top:-80px;height:80px}.layim-chat-other{position:relative;top:15px;left:15px;padding-left:60px;cursor:default}.layim-chat-other img{position:absolute;left:0;top:0;width:50px;height:50px;border-radius:100%}.layim-chat-username{position:relative;top:5px;font-size:18px}.layim-chat-status{margin-top:6px;font-size:14px;color:#999}.layim-chat-group .layim-chat-other .layim-chat-username{cursor:pointer}.layim-chat-group .layim-chat-other .layim-chat-username em{padding:0 10px;color:#999}.layim-chat-main{height:262px;padding:15px 15px 5px;overflow-x:hidden;overflow-y:auto}.layim-chat-main ul li{position:relative;font-size:0;margin-bottom:10px;padding-left:60px;min-height:68px}.layim-chat-text,.layim-chat-user{display:inline-block;*display:inline;*zoom:1;vertical-align:top;font-size:14px}.layim-chat-user{position:absolute;left:3px}.layim-chat-user img{width:40px;height:40px;border-radius:100%}.layim-chat-user cite{position:absolute;left:60px;top:-2px;width:500px;line-height:24px;font-size:12px;white-space:nowrap;color:#999;text-align:left;font-style:normal}.layim-chat-user cite i{padding-left:15px;font-style:normal}.layim-chat-text{position:relative;line-height:22px;margin-top:25px;padding:8px 15px;background-color:#e2e2e2;border-radius:3px;color:#333;word-break:break-all;max-width:462px\9}.layim-chat-text:after{content:'';position:absolute;left:-10px;top:13px;width:0;height:0;border-style:solid dashed dashed;border-color:#e2e2e2 transparent transparent;overflow:hidden;border-width:10px}.layim-chat-text a{color:#33DF83}.layim-chat-text img{max-width:100%;vertical-align:middle}.layim-chat-text .layui-layim-file,.layui-layim-file{display:block;text-align:center}.layim-chat-text .layui-layim-file{color:#333}.layui-layim-file:hover{opacity:.9}.layui-layim-file i{font-size:80px;line-height:80px}.layui-layim-file cite{display:block;line-height:20px;font-size:14px}.layui-layim-audio{text-align:center;cursor:pointer}.layui-layim-audio .layui-icon{position:relative;top:5px;font-size:24px}.layui-layim-audio p{margin-top:3px}.layui-layim-video{width:120px;height:80px;line-height:80px;background-color:#333;text-align:center;border-radius:3px}.layui-layim-video .layui-icon{font-size:36px;cursor:pointer;color:#fff}.layim-chat-main ul .layim-chat-system{min-height:0;padding:0}.layim-chat-main ul .layim-chat-mine{text-align:right;padding-left:0;padding-right:60px}.layim-chat-mine .layim-chat-user{left:auto;right:3px}.layim-chat-mine .layim-chat-user cite{left:auto;right:60px;text-align:right}.layim-chat-mine .layim-chat-user cite i{padding-left:0;padding-right:15px}.layim-chat-mine .layim-chat-text{margin-left:0;text-align:left;background-color:#5FB878;color:#fff}.layim-chat-mine .layim-chat-text:after{left:auto;right:-10px;border-top-color:#5FB878}.layim-chat-mine .layim-chat-text a{color:#fff}.layim-chat-footer{border-top:1px solid #F1F1F1}.layim-chat-tool{position:relative;padding:0 8px;height:38px;line-height:38px;font-size:0}.layim-chat-tool span{position:relative;margin:0 10px;display:inline-block;*display:inline;*zoom:1;vertical-align:top;font-size:24px;cursor:pointer}.layim-chat-tool .layim-tool-log{position:absolute;right:5px;font-size:14px}.layim-tool-log i{position:relative;top:2px;margin-right:5px;font-size:20px;color:#999}.layim-tool-image input{position:absolute;font-size:0;left:0;top:0;width:100%;height:100%;opacity:.01;filter:Alpha(opacity=1);cursor:pointer}body .layui-layim-face{margin:10px 0 0 -18px;border:none;background:0 0}body .layui-layim-face .layui-layer-content{padding:0;background-color:#fff;color:#666;box-shadow:none}.layui-layim-face .layui-layer-TipsG{display:none}.layui-layim-face ul{position:relative;width:372px;padding:10px;border:1px solid #D9D9D9;background-color:#fff;box-shadow:0 0 20px rgba(0,0,0,.2)}.layui-layim-face ul li{cursor:pointer;float:left;border:1px solid #e8e8e8;height:22px;width:26px;overflow:hidden;margin:-1px 0 0 -1px;padding:4px 2px;text-align:center}.layui-layim-face ul li:hover{position:relative;z-index:2;border:1px solid #eb7350;background:#fff9ec}.layim-chat-textarea{margin-left:10px}.layim-chat-textarea textarea{display:block;width:100%;padding:5px 0 0;height:68px;line-height:20px;border:none;overflow:auto;resize:none;background:0 0}.layim-chat-textarea textarea:focus{outline:0}.layim-chat-bottom{position:relative;height:46px}.layim-chat-send{position:absolute;right:15px;top:3px;height:32px;line-height:32px;font-size:0;cursor:pointer}.layim-chat-send span{display:inline-block;*display:inline;*zoom:1;vertical-align:top;font-size:14px;line-height:32px;margin-left:5px;padding:0 20px;background-color:#5FB878;color:#fff;border-radius:3px}.layim-chat-send span:hover{background-color:#69BC80}.layim-chat-send span:active{background-color:#59B573}.layim-chat-send .layim-send-btn{border-radius:3px 0 0 3px}.layim-chat-send .layim-send-set{position:relative;width:30px;height:32px;margin-left:0;padding:0;border-left:1px solid #85C998;border-radius:0 3px 3px 0}.layim-send-set .layui-edge{position:absolute;top:14px;left:9px;border-width:6px;border-top-style:solid;border-top-color:#fff}.layim-chat-send .layim-menu-box{left:auto;right:0;top:33px;width:180px;padding:10px 0}.layim-chat-send .layim-menu-box li{padding-right:15px;line-height:28px}body .layui-layim-min{border:1px solid #D9D9D9}.layui-layim-min .layui-layer-content{margin:0 5px;padding:5px 10px;white-space:nowrap}.layui-layim-close .layui-layer-content span{width:auto;max-width:120px}body .layui-layim-members{margin:25px 0 0 -75px;border:none;background:0 0}body .layui-layim-members .layui-layer-content{padding:0;background:0 0;color:#666;box-shadow:none}.layui-layim-members .layui-layer-TipsG{display:none}.layui-layim-members ul{position:relative;width:578px;height:200px;padding:10px 10px 0;border:1px solid #D9D9D9;background-color:#fff;background-color:rgba(255,255,255,.9);box-shadow:none;overflow:hidden;font-size:0}.layui-layim-members ul:hover{overflow:auto}.layim-add-img,.layim-add-remark,.layui-layim-members li{display:inline-block;*display:inline;*zoom:1;vertical-align:top;font-size:14px}.layui-layim-members li{width:112px;margin:10px 0;text-align:center}.layui-layim-members li a{position:relative;display:inline-block;max-width:100%}.layui-layim-members li a:after{content:'';position:absolute;width:46px;height:46px;left:50%;margin-left:-23px;top:0;border:1px solid #eee;border-color:rgba(0,0,0,.1);border-radius:100%}.layui-layim-members li img{width:48px;height:48px;border-radius:100%}.layui-layim-members li:hover{opacity:.9}.layui-layim-members li a cite{display:block;padding:0 3px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}body .layui-layim-contextmenu{margin:70px 0 0 30px;width:200px;padding:5px 0;border:1px solid #ccc;background:#fff;border-radius:0;box-shadow:0 0 5px rgba(0,0,0,.2)}body .layui-layim-contextmenu .layui-layer-content{padding:0;background-color:#fff;color:#333;font-size:14px;box-shadow:none}.layui-layim-contextmenu .layui-layer-TipsG{display:none}.layui-layim-contextmenu li{padding:0 15px 0 35px;cursor:pointer;line-height:30px}.layui-layim-contextmenu li:hover{background-color:#F2F2F2}.layim-add-box{margin:15px;font-size:0}.layim-add-img img,.layim-add-remark p{margin-bottom:10px}.layim-add-img{width:100px;margin-right:20px;text-align:center}.layim-add-img img{width:100px;height:100px}.layim-add-remark{width:280px}.layim-add-remark .layui-select{width:100%;margin-bottom:10px}.layim-add-remark .layui-textarea{height:80px;min-height:80px;resize:none}.layim-tab-content,.layui-layim-face ul,.layui-layim-tab{margin-bottom:0}.layim-tab-content li h5{margin-top:0;margin-bottom:0},.layui-layim-face img{vertical-align:bottom}.layim-chat-other span{color:#444}.layim-chat-other span cite{padding:0 15px;color:#999}.layim-chat-other:hover{text-decoration:none}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/modules/layim/mobile/layim.css b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/modules/layim/mobile/layim.css
new file mode 100644
index 0000000..65b5170
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/modules/layim/mobile/layim.css
@@ -0,0 +1,2 @@
+/** layui-v2.3.0 MIT License By https://www.layui.com */
+ .layim-tab-content li h5,.layui-layim-list li{border-bottom:1px solid #f2f2f2;cursor:pointer}html #layuicss-skinlayim-mobilecss{display:none;position:absolute;width:1989px}.layim-tab-content li h5 *,.layui-layim-skin li,.layui-layim-tab li,.layui-layim-tool li{display:inline-block;vertical-align:top;*zoom:1;*display:inline}.layim-tab-content li h5 span,.layui-layim-list li p,.layui-layim-list li span{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.layui-layim-tab{position:absolute;bottom:0;left:0;right:0;height:50px;border-top:1px solid #f2f2f2;background-color:#fff}.layui-layim-tab li{position:relative;width:33.33%;height:50px;text-align:center;color:#666;color:rgba(0,0,0,.6);cursor:pointer}.layui-layim-tab li .layui-icon{position:relative;top:7px;font-size:25px}.layui-layim-tab li span{position:relative;bottom:-3px;display:block;font-size:12px}.layui-layim-tab li[lay-type=more] .layui-icon{top:4px;font-size:22px}.layui-layim-tab li.layim-this{color:#3FDD86}.layim-new{display:none;position:absolute;top:5px;left:50%;margin-left:15px;width:10px;height:10px;border-radius:10px;background-color:#F74C31;color:#fff}.layim-list-top .layim-new{position:relative;vertical-align:top;top:10px;left:initial;margin-left:5px}.layim-list-top i.layui-show{display:inline-block!important}.layim-tab-content,.layim-tab-content li ul{display:none}.layui-layim{position:fixed;left:0;right:0;top:50px;bottom:50px;overflow-y:auto;overflow-x:hidden;-webkit-overflow-scrolling:touch}.layim-tab-content li h5{position:relative;padding-left:35px;height:45px;line-height:45px;font-size:0;white-space:nowrap;overflow:hidden}.layim-tab-content li h5 *{font-size:17px}.layim-tab-content li h5 span{max-width:80%}.layim-tab-content li h5 i{position:absolute;left:12px;top:0;color:#C9BDBB}.layim-tab-content li h5 em{padding-left:5px;color:#999}.layim-list-friend,.layim-list-group{background-color:#fff}.layui-layim-list li{position:relative;height:42px;padding:5px 15px 5px 60px;font-size:0}.layui-layim-list li:active{background-color:#F2F2F2;background-color:rgba(0,0,0,.05)}.layui-layim-list li.layim-null{height:20px;line-height:20px;padding:10px 0;color:#999;text-align:center;cursor:default;font-size:14px}.layim-list-history li.layim-null{padding:30px 0;border-bottom:none;background-color:#eee}.layui-layim-list li *{display:inline-block;*display:inline;*zoom:1;vertical-align:top;font-size:17px}.layui-layim-list li span{margin-top:2px;max-width:155px;font-size:17px}.layui-layim-list li img{position:absolute;left:12px;top:8px;width:36px;height:36px;border-radius:100%}.layui-layim-list li p{display:block;padding-right:30px;line-height:18px;font-size:13px;color:#999}.layui-layim-list li .layim-msg-status{display:none;position:absolute;right:10px;bottom:7px;padding:0 5px;height:17px;line-height:17px;border-radius:17px;text-align:center;font-size:10px;background-color:#F74C31;color:#fff}.layim-list-gray{-webkit-filter:grayscale(100%);-ms-filter:grayscale(100%);filter:grayscale(100%);filter:gray}.layim-list-top{background-color:#fff;font-size:17px}.layim-list-top li{position:relative;padding:0 15px 0 50px;line-height:45px;border-bottom:1px solid #f2f2f2;cursor:pointer}.layim-list-top li:last-child{margin-bottom:10px;border-bottom:none}.layim-list-top li .layui-icon{position:absolute;left:12px;top:0;margin-right:10px;color:#36373C;font-size:24px}.layim-list-top li[layim-event=newFriend] .layui-icon{left:15px}.layim-panel,.layim-title{position:fixed;left:0;right:0;top:0}.layim-list-top li[layim-event=group] .layui-icon{font-size:20px}.layim-list-top li[layim-event=about] .layui-icon{font-size:25px}.layim-panel{bottom:0;background-color:#eee;-webkit-animation-fill-mode:both;animation-fill-mode:both;-webkit-animation-duration:.2s;animation-duration:.2s}.layim-title{height:50px;line-height:50px;padding:0 15px;background-color:#36373C;color:#fff;font-size:18px}.layim-chat-status{padding-left:15px;font-size:14px;opacity:.7}.layim-title .layim-chat-back{display:inline-block;vertical-align:middle;position:relative;padding:0 15px;margin-left:-10px;top:0;font-size:24px;cursor:pointer}.layim-chat-detail{position:absolute;right:0;top:0;padding:0 15px;font-size:18px;cursor:pointer}.layim-chat-main,.layim-content{position:fixed;top:50px;left:0;right:0;overflow-y:auto;overflow-x:hidden}.layim-chat-detail:active,.layim-title .layim-chat-back:active{opacity:.8}.layui-layim .layim-title{text-align:left}.layui-layim .layim-title p{padding:0 15px}.layim-content{bottom:0}.layim-chat-main{width:100%;bottom:85px;padding:15px;-webkit-box-sizing:border-box!important;-moz-box-sizing:border-box!important;box-sizing:border-box!important}.layim-chat-main ul{overflow-x:hidden}.layim-chat-main ul li{position:relative;font-size:0;margin-bottom:10px;padding-left:60px;min-height:68px}.layim-chat-text,.layim-chat-user{display:inline-block;*display:inline;*zoom:1;vertical-align:top;font-size:15px}.layim-chat-user{position:absolute;left:3px}.layim-chat-user img{width:40px;height:40px;border-radius:100%}.layim-chat-user cite{position:absolute;left:60px;top:-2px;width:500px;line-height:24px;font-size:12px;white-space:nowrap;color:#999;text-align:left;font-style:normal}.layim-chat-user cite i{padding-left:15px;font-style:normal}.layim-chat-text{position:relative;min-height:22px;line-height:22px;margin-top:25px;padding:8px 15px;background-color:#fff;border-radius:3px;color:#333;word-break:break-all}.layim-chat-text:after{content:'';position:absolute;left:-10px;top:13px;width:0;height:0;border-style:solid dashed dashed;border-color:#fff transparent transparent;overflow:hidden;border-width:10px}.layim-chat-text a{color:#33DF83}.layim-chat-text img{max-width:100%;vertical-align:middle}.layim-chat-text .layui-layim-file,.layui-layim-file{display:block;text-align:center}.layim-chat-text .layui-layim-file{color:#333}.layui-layim-file:active{opacity:.9}.layui-layim-file i{font-size:80px;line-height:80px}.layui-layim-file cite{display:block;line-height:20px;font-size:17px}.layui-layim-audio{text-align:center;cursor:pointer}.layui-layim-audio .layui-icon{position:relative;top:5px;font-size:24px}.layui-layim-audio p{margin-top:3px}.layui-layim-video{width:120px;height:80px;line-height:80px;background-color:#333;text-align:center;border-radius:3px}.layui-layim-video .layui-icon{font-size:36px;cursor:pointer;color:#fff}.layim-chat-main ul .layim-chat-mine{text-align:right;padding-left:0;padding-right:60px}.layim-chat-mine .layim-chat-user{left:auto;right:3px}.layim-chat-mine .layim-chat-user cite{left:auto;right:60px;text-align:right}.layim-chat-mine .layim-chat-user cite i{padding-left:0;padding-right:15px}.layim-chat-mine .layim-chat-text{margin-left:0;text-align:left;background-color:#5FB878;color:#fff}.layim-chat-mine .layim-chat-text:after{left:auto;right:-10px;border-top-color:#5FB878}.layim-chat-mine .layim-chat-text a{color:#fff}.layim-chat-main ul .layim-chat-system{min-height:0;margin:20px 0 5px;padding:0}.layim-chat-system{margin:10px 0;text-align:center}.layim-chat-system span{display:inline-block;line-height:30px;padding:0 15px;border-radius:3px;background-color:#ddd;color:#fff;font-size:14px;cursor:pointer}.layim-chat-footer{position:fixed;bottom:0;left:10px;right:10px;height:80px}.layim-chat-send{display:-webkit-box;display:-webkit-flex;display:flex}.layim-chat-send input{-webkit-box-flex:1;-webkit-flex:1;flex:1;height:40px;padding-left:5px;border:0;background-color:#fff;border-radius:3px}.layim-chat-send button{border-radius:3px;height:40px;padding:0 20px;border:0;margin-left:10px;background-color:#5FB878;color:#fff}.layim-chat-tool{position:relative;width:100%;overflow-x:auto;padding:0;height:38px;line-height:38px;margin-top:3px;font-size:0;white-space:nowrap}.layim-chat-tool span{position:relative;margin:0 15px;display:inline-block;*display:inline;*zoom:1;vertical-align:top;font-size:28px;cursor:pointer}.layim-chat-tool .layim-tool-log{position:absolute;right:5px;font-size:14px}.layim-tool-log i{position:relative;top:2px;margin-right:5px;font-size:20px;color:#999}.layim-tool-image input{position:absolute;font-size:0;left:0;top:0;width:100%;height:100%;opacity:.01;filter:Alpha(opacity=1);cursor:pointer}.layim-layer{position:fixed;bottom:85px;left:10px;right:10px;margin:0 auto}.layui-layim-face{position:relative;max-height:180px;overflow:auto;padding:10px;font-size:0}.layui-layim-face li{cursor:pointer;display:inline-block;vertical-align:bottom;padding:5px 2px;text-align:center;width:10%;-webkit-box-sizing:border-box!important;-moz-box-sizing:border-box!important;box-sizing:border-box!important}.layui-layim-face li img{width:22px;height:22px}.layim-about{font-size:17px}.layim-about .layui-m-layercont{text-align:left}.layim-about .layui-m-layercont p{line-height:30px}.layim-about .layui-m-layercont a{color:#01AAED}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/modules/layim/skin/1.jpg b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/modules/layim/skin/1.jpg
new file mode 100644
index 0000000..d9f9926
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/modules/layim/skin/1.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/modules/layim/skin/2.jpg b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/modules/layim/skin/2.jpg
new file mode 100644
index 0000000..0bffb50
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/modules/layim/skin/2.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/modules/layim/skin/3.jpg b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/modules/layim/skin/3.jpg
new file mode 100644
index 0000000..53ba921
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/modules/layim/skin/3.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/modules/layim/skin/4.jpg b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/modules/layim/skin/4.jpg
new file mode 100644
index 0000000..83b4738
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/modules/layim/skin/4.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/modules/layim/skin/5.jpg b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/modules/layim/skin/5.jpg
new file mode 100644
index 0000000..8ed74b9
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/modules/layim/skin/5.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/modules/layim/skin/logo.jpg b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/modules/layim/skin/logo.jpg
new file mode 100644
index 0000000..26c7358
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/modules/layim/skin/logo.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/modules/layim/voice/default.mp3 b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/modules/layim/voice/default.mp3
new file mode 100644
index 0000000..90013c5
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/css/modules/layim/voice/default.mp3 differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/font/iconfont.eot b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/font/iconfont.eot
new file mode 100644
index 0000000..622d7ec
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/font/iconfont.eot differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/font/iconfont.svg b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/font/iconfont.svg
new file mode 100644
index 0000000..999ca1f
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/font/iconfont.svg
@@ -0,0 +1,554 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<!--
+2013-9-30: Created.
+-->
+<svg>
+<metadata>
+Created by iconfont
+</metadata>
+<defs>
+
+<font id="layui-icon" horiz-adv-x="1024" >
+  <font-face
+    font-family="layui-icon"
+    font-weight="500"
+    font-stretch="normal"
+    units-per-em="1024"
+    ascent="896"
+    descent="-128"
+  />
+    <missing-glyph />
+    
+    <glyph glyph-name="reply-fill" unicode="&#58897;" d="M507.904 835.5840000000001q93.184 1.024 175.104-33.792t143.872-94.72 97.792-141.312 36.864-174.592q1.024-88.064-30.208-165.888t-87.04-137.728-131.072-98.816-162.304-48.128q-22.528-3.072-48.128-5.12t-56.832-3.072-69.632 0-86.528 6.144q-106.496 10.24-158.208 26.624t-41.472 18.432q54.272 9.216 93.184 29.696 20.48 11.264 16.896 32.256t-19.968 39.424q-52.224 57.344-84.48 133.632t-34.304 164.352q-1.024 93.184 33.792 175.104t95.232 143.36 142.336 97.28 175.104 36.864zM707.584 385.024q0-26.624 18.432-45.568t45.056-18.944 45.568 18.944 18.944 45.568-18.944 45.056-45.568 18.432-45.056-18.432-18.432-45.056zM450.56 385.024q0-26.624 19.456-46.08t46.08-19.456q27.648 0 46.592 19.456t18.944 46.08q0 27.648-18.944 46.592t-46.592 18.944q-26.624 0-46.08-18.944t-19.456-46.592zM196.608 386.048q0-26.624 18.944-46.08t45.568-19.456q27.648 0 46.592 19.456t18.944 46.08-18.944 45.568-46.592 18.944q-26.624 0-45.568-18.944t-18.944-45.568z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="set-fill" unicode="&#58900;" d="M916.9398 445.2101l-69.9664 10.7833c-18.6619 2.863-38.1388 17.826-43.3424 33.2487-5.1618 15.3809-15.0883 65.4524-3.9288 80.6661l41.9004 57.135c11.1595 15.2346 9.3832 38.5985-3.9706 51.9314l-30.6364 30.6573c-13.3538 13.3538-36.7177 15.151-51.9314 3.9497l-57.135-41.8795c-15.2346-11.1804-39.4344-14.3987-53.7704-7.168-14.3569 7.2307-57.3022 35.7773-60.1652 54.4183l-10.7833 69.9664C570.3471 807.6016 552.542 822.8571 533.6712 822.8571h-43.34236734693877c-18.8709 0-36.6759-15.2555-39.5389-33.9174l-10.7833-69.9664c-2.863-18.6619-17.826-38.1388-33.2487-43.3424-15.4018-5.1827-65.4524-15.1092-80.687-3.9288L268.9567 713.5817c-15.2346 11.1804-38.6194 9.3832-51.9523-3.9497l-30.6364-30.6573c-13.3747-13.3538-15.151-36.7177-3.9706-51.9314l41.9004-57.135c11.1595-15.2346 14.3778-39.4136 7.168-53.7704-7.2307-14.3569-35.7773-57.2813-54.4183-60.1443l-69.9664-10.7833C88.3984 442.3471 73.1429 424.542 73.1429 405.6712v-43.34236734693877c0-18.8709 15.2555-36.6759 33.9174-39.5389l69.9664-10.7833c18.6619-2.863 38.1388-17.8469 43.3424-33.2487 5.1618-15.4018 15.0883-65.4733 3.9288-80.687l-41.9004-57.135c-11.1595-15.2346-9.3832-38.6194 3.9706-51.9314l30.6364-30.6573c13.3538-13.3538 36.7177-15.151 51.9523-3.9706l57.135 41.9213c15.2346 11.1386 39.4136 14.3778 53.7704 7.168 14.3569-7.2307 57.2813-35.7773 60.1443-54.4183l10.7833-69.9664c2.863-18.6619 20.6472-33.9174 39.5389-33.9174h43.34236734693877c18.8709 0 36.6759 15.2555 39.5389 33.9174l10.7833 69.9664c2.863 18.6619 17.826 38.1388 33.2487 43.3215 15.4018 5.1827 65.4524 15.0883 80.6661 3.9288l57.1559-41.9213c15.2346-11.1595 38.5985-9.3623 51.9314 3.9706l30.6364 30.6573c13.3747 13.3329 15.151 36.7177 3.9706 51.9314l-41.9004 57.135c-11.1595 15.2346-14.3778 39.4136-7.168 53.7496 7.2307 14.3778 35.7773 57.3231 54.4183 60.1861l69.9664 10.7833c18.6619 2.863 33.9174 20.6472 33.9174 39.5389v43.34236734693877C950.8571 424.542 935.6016 442.3471 916.9398 445.2101zM512 210.4633c-95.838 0-173.5367 77.6986-173.5367 173.5367s77.6986 173.5367 173.5367 173.5367 173.5367-77.6986 173.5367-173.5367S607.838 210.4633 512 210.4633zM512 384m-104.7824 0a5.014 5.014 0 1 1 209.5647 0 5.014 5.014 0 1 1-209.5647 0Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="menu-fill" unicode="&#58895;" d="M511.999488 834.254727c-248.678712 0-450.273176-201.585181-450.273176-450.254727s201.594464-450.254727 450.273176-450.254727 450.273176 201.585181 450.273176 450.254727S760.6782 834.254727 511.999488 834.254727zM266.371377 589.705012l491.256222 0 0-33.772174L266.371377 555.932838 266.371377 589.705012zM757.627599 178.29396499999996L266.371377 178.29396499999996l0 33.773198 491.256222 0L757.627599 178.29396499999996zM140.487278 367.11340099999995l0 33.771151 743.024421 0 0-33.771151L140.487278 367.11340099999995z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="search" unicode="&#58901;" d="M439.323351 120.52219c-49.280352 0-97.09834 9.656941-142.126681 28.699646-43.480015 18.388812-82.522793 44.706201-116.043584 78.225619s-59.841305 72.560596-78.230871 116.03883C83.878729 388.513804 74.222416 436.330856 74.222416 485.609189c0 49.284473 9.656313 97.104595 28.699798 142.133138 18.388542 43.479257 44.71008 82.520435 78.231894 116.03883 33.518745 33.515325 72.562546 59.832713 116.043584 78.219479 45.027318 19.039635 92.846329 28.694529 142.125658 28.694529 49.280352 0 97.099364-9.653871 142.126681-28.694529 43.481039-18.385742 82.525863-44.704155 116.044608-78.220502 33.520791-33.518395 59.842328-72.559573 78.230871-116.03883 19.042462-45.028543 28.699798-92.848665 28.699798-142.133138 0-49.278333-9.657336-97.095385-28.701845-142.122905-18.388542-43.47721-44.708033-82.520435-78.228824-116.03883s-72.563569-59.838853-116.043584-78.226642C536.422715 130.177084 488.603703 120.52219 439.323351 120.52219zM439.323351 797.483242c-171.975699 0-311.887855-139.906423-311.887855-311.875077S267.347652 173.734112 439.323351 173.734112s311.887855 139.907447 311.887855 311.874053S611.299051 797.483242 439.323351 797.483242zM890.678206-48.734702c-22.121716 0-42.90387 8.562003-58.541653 24.115234L674.672953 128.025071l37.039062 38.20616 157.888289-153.058978c5.606924-5.606695 13.091693-8.692986 21.077901-8.692986 7.983139 0 15.464837 3.087315 21.070738 8.69094 5.616135 5.622044 8.715856 13.126972 8.715856 21.123087 0 7.980765-3.091535 15.46318-8.702552 21.067828l-0.301888 0.306992L758.714395 213.230662l38.207726 37.035498 152.611906-157.427472c15.571265-15.638165 24.144876-36.422538 24.144876-58.549487 0-22.195511-8.625801-43.054585-24.287121-58.735729C933.723298-40.112324 912.876674-48.734702 890.678206-48.734702zM281.015489 327.245392c-42.340005 42.320874-65.652899 98.584296-65.643689 158.421102 0.008187 59.818387 23.319034 116.074645 65.637549 158.4078l37.634651-37.619806c-66.60666-66.629513-66.60973-175.00071-0.007163-241.577011L281.015489 327.245392z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="share" unicode="&#58945;" d="M769.714 306.453c-51.754 0-97.702-24.851-126.571-63.269L394.479 367.94100000000003c3.93 13.798 6.034 28.364 6.034 43.424 0 16.496-2.527 32.399-7.211 47.35l247.724 124.288c28.71-40.052 75.647-66.151 128.687-66.151 87.388 0 158.229 70.84 158.229 158.229 0 87.388-70.841 158.229-158.229 158.229-87.389 0-158.229-70.841-158.229-158.229 0-6.046 0.352-12.009 1.011-17.88L351.22 526.116c-28.371 26.943-66.723 43.479-108.938 43.479-87.388 0-158.229-70.84-158.229-158.229s70.84-158.229 158.229-158.229c43.752 0 83.354 17.758 111.997 46.459l258.676-129.779c-0.964-7.062-1.474-14.266-1.474-21.592 0-87.389 70.84-158.229 158.229-158.229s158.229 70.84 158.229 158.229C927.938 235.61199999999997 857.103 306.453 769.714 306.453L769.714 306.453z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="set-sm" unicode="&#58912;" d="M946.367 405.895c0.02 21.85-13.04 38.49-31.74 41.57-18.69 3.07-79.05 13.01-85.99 14.14-6.95 1.15-14.09 8.07-15.4 11.45-1.32 3.37-8.94 22.2-11.87 29.46-2.95 7.27-1.92 16.58 4.39 25.52 6.3 8.93 39.9 55.87 48.38 67.72 8.49 11.87 8.65 34.61-4.84 48.39-13.48 13.78-47.75 47.09-56.73 55.86-8.99 8.76-31.08 8.64-42.67 0.43-11.58-8.2-71.69-51.01-71.69-51.01s-9.97-6.89-20.67-2.64c-10.7 4.24-33.43 14.07-33.43 14.07s-7.19 5.43-9.68 19.79c-2.5 14.37-11.11 65.28-14.07 82.7-2.97 17.42-20.67 29.62-37.83 29.46-17.16-0.14-57.91 0-74.33 0s-32.26-15.68-34.75-29.46c-2.49-13.79-11.56-69.16-14.07-84.45-2.52-15.3-11.44-18.48-11.44-18.48s-19.56-8.06-29.91-12.31c-10.34-4.26-15.39-2.64-30.35 7.48-14.95 10.11-44.74 31.03-63.04 43.83-18.3 12.81-38.12 7.92-49.26-3.52s-36.06-35.77-51.02-50.43c-14.95-14.66-12.61-37.54 0.58-55.71 13.2-18.18 32.34-45.43 41.35-58.21 9.01-12.78 10.84-19.5 8.36-26.82-2.49-7.34-6.64-16.58-11.43-27.72-4.81-11.13-9.69-13.64-27.86-17.01-17.36-3.21-58.42-9.92-77.4-13.31-18.99-3.37-30.66-21.43-30.66-41.81l0-64.66c0-24.34 13.2-37.24 38.42-41.93 25.22-4.69 62.66-10.66 74.77-12.61 12.1-1.95 17.67-6.6 21.41-15.54 3.73-8.94 5.13-10.12 9.37-22.57 4.26-12.47 6.46-15.55-4.98-31.67-11.44-16.13-34.31-48.11-46.03-64.51-11.74-16.4-6.45-37.83 4.98-49.85 11.44-12.03 35.47-35.64 48.97-48.97 13.49-13.33 35.19-16.28 53.36-3.52 18.19 12.75 54.98 38.99 65.69 46.62 10.7 7.63 21.91 5.28 27.85 2.94 5.94-2.35 11.25-4.6 22-9.1 10.73-4.48 13.85-11.2 16.41-23.45 2.57-12.24 10.19-56.85 13.93-78.59 3.75-21.72 18.91-33.43 40.62-33.72 21.7-0.29 33.27-0.12 61.57 0 28.29 0.13 41.86 12.61 45.45 31.38 3.59 18.76 12.45 72.94 14.22 83.72 1.78 10.76 5.94 14.73 13.63 18.47 7.7 3.74 14.32 6.47 26.84 11.88 12.51 5.4 18.91 0.66 27.7-5.72 8.8-6.39 47.51-33.78 63.78-45.31 16.28-11.53 36.73-10.33 51.9 4.4 15.18 14.73 31.62 30.99 49.27 48.38 17.64 17.4 12.16 39.59 4.4 51.46-7.77 11.88-44.49 62.95-49.71 70.23-5.21 7.28-4.4 18.62-1.75 24.63 2.64 6.01 8.44 18.24 11.72 25.22 3.29 6.97 9.6 11.22 18.18 12.9 8.58 1.69 62.72 11 83.75 14.61 21.03 3.64 31.11 19.92 31.26 39.92C946.427 359.93499999999995 946.347 388.525 946.367 405.895zM908.587 338.615c0.21-5.76-4.66-10.65-8.82-11.38-4.17-0.73-63.26-11.38-81.48-14.29-18.21-2.92-33.23-15.07-38.72-28.06-3.98-9.44-5.47-13.51-10.59-26.96-5.12-13.44-4.64-32.19 2.56-42.26 7.2-10.08 46.82-64.9 50.38-70.45s4.27-11.95-1.28-17.5-40.99-41.2-47.39-47.39c-6.41-6.19-11.83-4.8-18.79 0-6.95 4.8-39.61 26.39-64.44 44.36-16.96 12.28-32.82 12.43-48.7 6.02-15.87-6.42 1.28 0.28-22.2-8.97-23.48-9.25-30.23-27.62-33.73-48.24-3.5-20.63-10.67-62.98-11.95-70.45-1.28-7.47-5.55-11.1-13.66-11.1l-64.9 0c-8.11 0-11.74 2.99-14.52 11.95-2.77 8.97-10.03 54.87-12.8 74.29-2.78 19.43-13.82 36.12-24.77 40.56-10.94 4.45-4.98 2.14-27.32 11.1-22.34 8.97-39.63 4.5-51.23-3.84-11.61-8.34-58.64-42.69-65.33-46.96-6.68-4.28-14.65-3.28-18.35 0.42-3.7 3.7-40.56 40.56-46.54 46.54-5.98 5.98-5.36 12.92 0 20.49 5.36 7.58 28.39 40.76 40.99 57.95 12.59 17.2 17.93 34.74 9.82 53.49-8.12 18.74-4.42 10.24-12.39 28.6-7.96 18.36-24.28 24.46-38.42 26.9-14.14 2.43-68.88 11.53-76.85 13.23-7.97 1.71-11.95 7.26-11.95 14.09l0 66.18c0 9.53 7.67 12.44 12.38 13.23 4.7 0.8 54.22 9.18 73 12.39 18.79 3.2 36.36 11.32 43.55 29.03 7.19 17.7 4.27 11.1 11.1 27.32 6.83 16.23 3.8 33.94-7.68 49.96-11.49 16.01-38.85 54-44.4 61.9-5.55 7.9-5.77 12.6 0.85 19.21 6.62 6.62 42.05 42.48 46.96 46.97 4.91 4.48 12.07 5.4 18.36 0.85 6.3-4.55 49.31-35.65 64.04-46.11 14.73-10.46 32.35-12.56 49.1-5.55 16.75 7.02 10.25 4.48 26.9 11.1s24.84 19.09 28.18 39.71c3.33 20.61 11.95 74.14 12.81 77.7 0.85 3.55 5.55 10.46 11.74 10.46s65.82-0.07 69.8 0c3.99 0.07 10.3-3.29 11.32-9.18 1.02-5.9 13.02-74.29 14.94-86.25 1.92-11.95 15.58-28.57 25.54-32.73 9.96-4.16 21.35-8.75 31.31-13.09 9.97-4.34 30.13-1.91 36.15 2.28 6.03 4.18 70.52 48.81 75.43 52.37 4.91 3.56 11.52 3.27 17.64-2.85s43.34-43.19 47.54-47.53c4.19-4.34 4.66-8.66 1.14-13.66-3.53-5.01-36.72-51.8-47.54-67.46-10.81-15.65-11.73-33.73-5.41-48.96 6.33-15.22 3.99-9.39 9.11-21.91 5.13-12.53 16.28-29.03 33.59-31.88 17.31-2.85 76.92-12.74 84.82-13.95 7.9-1.21 11.1-7.18 11.1-13.37S908.377 344.385 908.587 338.615zM526.833 573.1949999999999c-110.45 0-200-89.54-200-200s89.55-200 200-200c110.46 0 200 89.54 200 200S637.293 573.1949999999999 526.833 573.1949999999999zM526.833 208.19500000000005c-91.12 0-165 73.87-165 165s73.88 165 165 165c91.13 0 165-73.87 165-165S617.963 208.19500000000005 526.833 208.19500000000005z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="engine" unicode="&#58920;" d="M422.214332 360.70413299999996L186.183684 360.70413299999996l0 46.568461 236.030648 0c10.379577 40.075407 46.47537 69.794509 89.785668 69.794509 51.432433 0 93.067103-41.657943 93.067103-93.067103C605.067103 332.56756700000005 563.40916 290.909624 512 290.909624 468.689703 290.909624 432.593909 320.65199900000005 422.214332 360.70413299999996L422.214332 360.70413299999996zM512 779.634098c-218.529658 0-395.634098-177.10444-395.634098-395.634098 0-218.529658 177.10444-395.634098 395.634098-395.634098 154.76275 0 288.417257 89.064217 353.440885 218.55293l101.398692-59.112389-23.063141-39.959044-62.161099 35.909613c-33.745261-51.595341-77.42792-96.115813-129.093079-129.744711l35.653614-61.765464-40.308133-23.295867-35.653614 61.765464c-53.620057-27.345298-113.360805-44.404109-176.894987-47.73209L535.319139-127.99706800000001l-46.568461 0 0 70.981412c-63.534182 3.327981-123.27493 20.386792-176.894987 47.73209l-35.653614-61.765464-40.308133 23.295867 35.653614 61.765464c-51.665159 33.628898-95.347818 78.149371-129.093079 129.744711l-62.161099-35.909613-23.295867 40.308133 62.114553 35.863067c-27.415116 53.550239-44.799743 113.104807-48.127724 176.685534L0.002932 360.70413299999996l0 46.568461 70.958139 0c3.327981 63.580727 20.712609 123.135295 48.127724 176.685534l-62.114553 35.863067 23.295867 40.308133 62.161099-35.909613c33.745261 51.595341 77.42792 96.115813 129.093079 129.744711l-35.653614 61.765464 40.308133 23.295867 35.653614-61.765464c53.620057 27.345298 113.360805 44.404109 176.894987 47.73209L488.727406 895.997068l46.568461 0 0-70.981412c63.534182-3.327981 123.27493-20.386792 176.894987-47.73209l35.653614 61.765464 40.308133-23.295867-35.653614-61.765464c51.665159-33.628898 95.347818-78.149371 129.093079-129.744711l62.161099 35.909613 23.063141-39.959044-101.398692-59.112389C800.417257 690.569881 666.76275 779.634098 512 779.634098L512 779.634098z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="close" unicode="&#4102;" d="M783.483 701.249L512 429.775 240.517 701.249c-10.082 10.083-26.429 10.083-36.51 0-10.083-10.082-10.083-26.429 0-36.509l271.481-271.475L204.008 121.78800000000001c-10.083-10.081-10.083-26.428 0-36.508 10.082-10.082 26.429-10.082 36.51 0L512 356.755l271.483-271.475c10.082-10.082 26.429-10.082 36.513 0 10.081 10.083 10.081 26.428 0 36.508L548.51 393.265l271.485 271.474c10.081 10.083 10.081 26.429 0 36.509C809.912 711.33 793.564 711.33 783.483 701.249z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="close-fill" unicode="&#4103;" d="M512 822.022125c-217.47508 0-394.423141-176.949085-394.423141-394.423141 0-217.474057 176.948061-394.422118 394.423141-394.422118 217.473033 0 394.422118 176.948061 394.422118 394.422118C906.422118 645.07304 729.473033 822.022125 512 822.022125zM702.228529 270.92978200000005c8.030907-8.030907 8.030907-21.052478 0-29.083385s-21.052478-8.030907-29.083385 0L512 402.992563 350.853833 241.84741899999995c-8.030907-8.030907-21.052478-8.030907-29.083385 0s-8.030907 21.052478 0 29.083385l161.146167 161.146167L321.771471 593.222115c-8.030907 8.030907-8.030907 21.052478 0 29.083385s21.052478 8.030907 29.083385 0l161.146167-161.146167L673.145144 622.305501c8.030907 8.030907 21.052478 8.030907 29.083385 0s8.030907-21.052478 0-29.083385L541.082362 432.075949 702.228529 270.92978200000005z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="chart-screen" unicode="&#58921;" d="M963.930903 179.21903299999997l0 34.824133-37.354769-2.675946L926.576133 694.8538169999999 691.413206 694.8538169999999l0 70.462818L330.260819 765.316635l0-70.462818L95.690386 694.8538169999999l0-480.809627-35.621289 0 0-34.824133 432.583253 0 0-141.228535-90.313935 0 0-35.307134 216.753649 0 0 35.307134-90.313935 0L528.778128 179.21903299999997 963.930903 179.21903299999997zM366.212636 730.008478L655.216819 730.008478l0-35.307134L366.212636 694.7013440000001 366.212636 730.008478zM364.817869 332.73133600000006L222.224244 406.252817l14.295588 27.736715 123.238812-63.523779 173.928285 159.755494 127.5807-92.634794 93.13826 122.414027 12.420891-9.449209 12.420891-9.449209L667.639756 394.365068l-131.636063 95.621824L364.817869 332.73133600000006z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="star" unicode="&#58880;" d="M749.624889-84.152889c-15.672889 0-31.246222 3.882667-45.084444 11.306667l-192.526222 103.637333L319.544889-72.817778c-31.203556-16.64-70.314667-14.392889-99.043556 5.304889-29.511111 20.337778-44.743111 55.921778-38.840889 90.695111l37.703111 225.251556L56.661333 410.908444c-25.002667 24.888889-33.464889 60.984889-22.058667 94.193778 11.349333 32.910222 40.064 56.576 74.965333 61.752889l221.326222 32.896 96.128 199.580444c15.488 32.085333 48.853333 52.807111 84.992 52.807111 36.167111 0 69.518222-20.736 84.963556-52.807111l96.156444-199.580444 221.297778-32.910222c34.872889-5.162667 63.616-28.8 74.979556-61.696 11.392-33.28 2.944-69.361778-22.030222-94.250667L804.622222 248.433778l37.745778-225.28c5.845333-34.773333-9.386667-70.357333-38.812444-90.638222C787.569778-78.392889 768.938667-84.152889 749.624889-84.152889zM512.014222 91.548444c4.636444 0 9.272889-1.137778 13.482667-3.384889l205.937778-110.862222c12.373333-6.641778 28.316444-5.802667 39.936 2.133333 11.392 7.836444 17.123556 21.006222 14.890667 34.304L746.097778 253.496889c-1.507556 9.088 1.450667 18.332444 7.964444 24.832l173.141333 172.842667c9.457778 9.429333 12.686222 23.025778 8.405333 35.484444-4.380444 12.672-15.701333 21.873778-29.525333 23.921778L669.866667 545.706667c-9.315556 1.379556-17.365333 7.296-21.447111 15.786667L545.720889 774.641778c-6.030222 12.529778-19.256889 20.608-33.706667 20.608s-27.690667-8.092444-33.763556-20.622222L375.608889 561.493333c-4.081778-8.490667-12.131556-14.407111-21.447111-15.786667L117.930667 510.577778c-13.624889-2.033778-25.201778-11.434667-29.539556-23.992889-4.266667-12.416-1.024-25.984 8.433778-35.399111L269.937778 278.328889c6.513778-6.499556 9.472-15.744 7.964444-24.832l-40.135111-239.744c-2.247111-13.312 3.484444-26.439111 14.976-34.360889 11.434667-7.836444 27.349333-8.775111 39.950222-2.062222l205.852444 110.833778C502.741333 90.410667 507.377778 91.548444 512.014222 91.548444zM200.32 439.210667c-6.840889 0-12.885333 4.963556-14.023111 11.946667-1.251556 7.751111 4.010667 15.061333 11.761778 16.312889l9.443556 1.536c7.793778 1.336889 15.061333-4.010667 16.312889-11.761778 1.251556-7.751111-4.010667-15.061333-11.761778-16.312889l-9.443556-1.536C201.856 439.267556 201.073778 439.210667 200.32 439.210667zM252.544 447.687111c-6.684444 0-12.643556 4.721778-13.937778 11.534222-1.493333 7.708444 3.555556 15.175111 11.264 16.654222l153.927111 29.696 58.055111 133.148444c3.157333 7.182222 11.548444 10.496 18.716444 7.352889 7.210667-3.143111 10.510222-11.52 7.367111-18.716444l-61.056-140.017778c-1.877333-4.295111-5.745778-7.395556-10.353778-8.277333l-161.28-31.118222C254.336 447.758222 253.44 447.687111 252.544 447.687111z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="circle-dot" unicode="&#58903;" d="M513.133312 830.6731560000001c-247.538793 0-448.208115-200.669322-448.208115-448.207092 0-247.538793 200.670346-448.208115 448.208115-448.208115 247.538793 0 448.208115 200.670346 448.208115 448.208115C961.341427 630.004857 760.673128 830.6731560000001 513.133312 830.6731560000001zM513.132288-6.649187999999981c-214.901465 0-389.113205 174.212764-389.113205 389.114229 0 214.902488 174.21174 389.115252 389.113205 389.115252 214.903511 0 389.115252-174.212764 389.115252-389.115252C902.24754 167.563576 728.0358-6.649187999999981 513.132288-6.649187999999981zM513.133312 382.46504100000004m-344.602456 0a336.754 336.754 0 1 1 689.204911 0 336.754 336.754 0 1 1-689.204911 0Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="chat" unicode="&#58886;" d="M132.682393 414.567179c0 208.287837 166.471452 377.143593 379.317095 377.143593s385.380184-168.855756 385.380184-377.143593c0-177.196725-122.197086-325.812507-290.49821-366.259708l-116.291586-51.04763 0 41.126676C290.570353 52.175568999999996 132.682393 215.31206599999996 132.682393 414.567179zM83.799056 414.567179c0-211.946157 160.764474-387.135154 369.469819-415.152255-3.2623-20.458961-10.036587-65.024969-7.286963-65.024969 2.384303 0 114.89068 47.294143 189.700503 78.865185 176.193885 51.91437 304.518528 211.946157 304.518528 401.312038 0 231.432976-191.70823 419.042865-428.200432 419.042865S83.799056 646.0001560000001 83.799056 414.567179zM340.71952 276.63573699999995c22.935362-41.481763 89.831958-75.102489 170.391738-75.102489 79.650061 0 148.489916 32.909527 172.168198 73.681116-12.701277 5.979178-19.068288 8.02886-28.131711 12.21009-19.894096-31.257911-75.425853-59.661821-142.729725-59.661821-66.969251 0-122.836653 28.40391-143.598512 61.083194L340.71952 276.63573699999995z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="release" unicode="&#58889;" d="M990.78144 828.5388800000001c-3.35872 1.59744-7.04512 2.37568-11.01824 2.37568-14.45888 0-27.60704-10.81344-27.40224-10.81344-8.8064-4.42368-880.59904-443.22816-911.44192-459.44832-17.408-9.13408-27.36128-24.73984-25.92768-40.71424 1.10592-13.14816 9.78944-23.51104 23.10144-27.77088 26.17344-8.27392 290.24256-91.58656 290.24256-91.58656l4.83328-1.47456 16.67072 50.05312-254.32064 79.54432 780.73856 406.28224c-82.82112-93.88032-420.53632-476.32384-436.10112-493.93664-20.11136-22.48704-29.4912-45.09696-29.40928-70.98368l0.28672-153.27232-0.08192 0c0 0 0.08192-53.49376 0.08192-53.6576l0-1.96608 0 0c1.18784-13.5168 12.73856-24.24832 26.54208-24.24832s25.51808 10.73152 26.74688 24.24832l0 0c0 0 0.53248 191.03744 0 205.08672-0.49152 12.4928 5.07904 26.54208 10.69056 33.05472 5.65248 6.38976 390.63552 442.61376 465.75616 527.81056-21.38112-106.41408-126.68928-629.76-128.24576-637.41952-0.8192-4.05504-2.58048-4.05504-3.35872-4.05504-0.6144 0-1.31072 0.12288-2.048 0.36864-7.45472 2.37568-268.82048 81.55136-279.92064 84.91008l-4.7104 1.4336-17.16224-50.50368 5.07904-1.59744c2.58048-0.77824 258.90816-79.09376 284.38528-86.46656 5.07904-1.47456 10.24-2.2528 15.44192-2.2528 26.99264 0 49.5616 19.37408 54.8864 46.98112 2.08896 10.93632 27.0336 134.67648 55.9104 277.99552 39.77216 197.14048 84.7872 420.61824 85.93408 427.6224l0.6144 3.31776C1009.70496 798.96576 1013.26848 817.9712 990.78144 828.5388800000001z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="list" unicode="&#58890;" d="M618.04471 733.97072l-397.175835 0c-16.927531 0-30.699186-13.771655-30.699186-30.699186l0-638.543068c0-16.927531 13.771655-30.699186 30.699186-30.699186l582.261227 0c16.927531 0 30.699186 13.771655 30.699186 30.699186l-0.726547 476.760404L618.04471 733.97072zM803.771715 541.488871 619.537713 541.488871 619.537713 705.552483 803.771715 541.488871zM813.363164 64.728466c0-5.64251-4.590552-10.233062-10.233062-10.233062l-582.261227 0c-5.64251 0-10.233062 4.590552-10.233062 10.233062l0 638.543068c0 5.64251 4.590552 10.233062 10.233062 10.233062l378.202715 0 0-192.481849 214.291574 0L813.363164 64.728466zM298.129516 482.495268l55.258535 0 0-55.258535-55.258535 0 0 55.258535ZM399.777591 468.168981l323.364759 0 0-26.605961-323.364759 0 0 26.605961ZM298.129516 342.044446l55.258535 0 0-55.258535-55.258535 0 0 55.258535ZM399.777591 327.718159l323.364759 0 0-26.605961-323.364759 0 0 26.605961ZM298.129516 199.804884l55.258535 0 0-55.258535-55.258535 0 0 55.258535ZM399.777591 185.478598l323.364759 0 0-26.605961-323.364759 0 0 26.605961ZM881.315812 53.053566"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="chart" unicode="&#58924;" d="M953.440991 315.668729L784.061302 315.668729 681.06451 437.392024c-0.312108 0.373507-0.635473 0.737804-0.969071 1.094938-0.013303 0.014326-0.026606 0.027629-0.039909 0.041956-0.276293 0.293689-0.559748 0.582261-0.851391 0.86367-0.053212 0.051165-0.107447 0.099261-0.160659 0.150426-0.249687 0.237407-0.50142 0.470721-0.76134 0.697895-0.089028 0.078795-0.181125 0.153496-0.272199 0.230244-0.225127 0.191358-0.451278 0.381693-0.683569 0.565888-0.124843 0.099261-0.251733 0.192382-0.3776 0.288572-0.200568 0.153496-0.402159 0.306992-0.607844 0.454348-0.159636 0.11461-0.322341 0.224104-0.485047 0.334621-0.177032 0.12075-0.354064 0.242524-0.535189 0.35918-0.195451 0.12689-0.394996 0.246617-0.593518 0.367367-0.152473 0.092098-0.302899 0.186242-0.457418 0.275269-0.237407 0.137123-0.477884 0.268106-0.718361 0.397043-0.121773 0.065492-0.2415 0.132006-0.364297 0.195451-0.283456 0.146333-0.571005 0.285502-0.859577 0.420579-0.085958 0.040932-0.170892 0.082888-0.257873 0.122797-0.337691 0.154519-0.679475 0.298805-1.022283 0.437975-0.044002 0.017396-0.086981 0.036839-0.130983 0.055259-1.604544 0.638543-3.2623 1.113357-4.948709 1.416256-0.343831 0.062422-0.687662 0.112564-1.031493 0.160659-0.055259 0.008186-0.110517 0.01842-0.165776 0.025583-1.633197 0.216941-3.25923 0.26913-4.861728 0.173962-0.013303-0.001023-0.026606-0.001023-0.040932-0.002047-0.363274-0.022513-0.724501-0.054235-1.085728-0.091074-0.060375-0.00614-0.119727-0.011256-0.180102-0.017396-0.310062-0.034792-0.618077-0.077771-0.926092-0.122797-0.116657-0.017396-0.232291-0.032746-0.348947-0.051165-0.24764-0.040932-0.494257-0.086981-0.740874-0.135076-0.178055-0.033769-0.355087-0.067538-0.532119-0.105401-0.183172-0.039909-0.36532-0.083911-0.547469-0.127913-0.237407-0.056282-0.474814-0.113587-0.710175-0.176009-0.12075-0.032746-0.240477-0.068562-0.360204-0.102331-0.292666-0.082888-0.584308-0.168846-0.874927-0.26299-0.063445-0.020466-0.125867-0.042979-0.188288-0.063445-0.338714-0.112564-0.675382-0.230244-1.010003-0.357134-0.019443-0.007163-0.038886-0.01535-0.058328-0.022513-1.493004-0.571005-2.948145-1.284249-4.340865-2.149966-0.067538-0.041956-0.13303-0.088004-0.200568-0.12996-0.273223-0.172939-0.545422-0.346901-0.813528-0.531096-1.416256-0.971118-2.734274-2.089591-3.936659-3.333932-0.025583-0.026606-0.049119-0.053212-0.074701-0.079818-0.26299-0.275269-0.521886-0.555655-0.773619-0.843204-0.058328-0.066515-0.112564-0.134053-0.169869-0.200568-0.211824-0.246617-0.420579-0.496304-0.62217-0.751107-0.083911-0.106424-0.164752-0.214894-0.246617-0.322341-0.167822-0.218988-0.334621-0.437975-0.49528-0.663102-0.102331-0.14224-0.199545-0.287549-0.298805-0.431835-0.13303-0.194428-0.26606-0.387833-0.393973-0.586354-0.115634-0.179079-0.225127-0.360204-0.335644-0.541329-0.103354-0.168846-0.207731-0.336668-0.306992-0.508583-0.12689-0.220011-0.24764-0.443092-0.36839-0.666172-0.074701-0.138146-0.151449-0.275269-0.223081-0.416486-0.137123-0.265036-0.265036-0.533143-0.39295-0.802272-0.050142-0.105401-0.101307-0.209778-0.150426-0.316202-0.144286-0.317225-0.279363-0.63752-0.410346-0.958838-0.026606-0.064468-0.055259-0.127913-0.080841-0.193405-0.150426-0.378623-0.291642-0.760317-0.423649-1.14508-0.005117-0.016373-0.011256-0.031722-0.017396-0.048095-0.157589-0.463558-0.303922-0.930185-0.434905-1.400906l-97.897657-342.642824L435.093423 811.832042c-0.071631 0.569982-0.165776 1.13587-0.275269 1.696642-0.008186 0.040932-0.017396 0.081864-0.025583 0.12382-0.071631 0.356111-0.148379 0.709151-0.234337 1.061169-0.031722 0.128937-0.065492 0.255827-0.099261 0.38374-0.066515 0.254803-0.135076 0.508583-0.208754 0.760317-0.060375 0.206708-0.124843 0.411369-0.190335 0.615007-0.053212 0.166799-0.107447 0.332575-0.164752 0.49835-0.092098 0.26913-0.190335 0.535189-0.290619 0.800225-0.037862 0.098237-0.074701 0.196475-0.113587 0.293689-0.12382 0.313132-0.25378 0.623193-0.38988 0.930185-0.022513 0.050142-0.044002 0.100284-0.066515 0.150426-0.152473 0.338714-0.311085 0.672312-0.477884 1.00284-0.01228 0.024559-0.024559 0.049119-0.037862 0.074701-0.173962 0.343831-0.356111 0.682545-0.545422 1.017166-0.011256 0.019443-0.022513 0.039909-0.033769 0.059352-0.188288 0.330528-0.382717 0.654916-0.584308 0.975211-0.021489 0.034792-0.044002 0.068562-0.065492 0.103354-0.190335 0.298805-0.385786 0.592494-0.587378 0.88209-0.045025 0.065492-0.091074 0.12996-0.137123 0.194428-0.180102 0.252757-0.363274 0.502443-0.551562 0.74906-0.079818 0.105401-0.162706 0.208754-0.24457 0.312108-0.157589 0.199545-0.317225 0.396019-0.480954 0.590448-0.124843 0.149403-0.252757 0.295735-0.381693 0.442068-0.125867 0.14224-0.251733 0.284479-0.38067 0.424672-0.174985 0.191358-0.355087 0.378623-0.536212 0.563842-0.088004 0.090051-0.176009 0.180102-0.26606 0.26913-0.224104 0.222057-0.452301 0.440022-0.684592 0.653893-0.054235 0.050142-0.10847 0.100284-0.163729 0.150426-0.265036 0.240477-0.535189 0.474814-0.810459 0.704035-0.028653 0.023536-0.056282 0.047072-0.084934 0.070608-0.294712 0.243547-0.595564 0.479931-0.902556 0.711198-0.01535 0.011256-0.029676 0.022513-0.045025 0.033769-0.311085 0.232291-0.627287 0.458441-0.949628 0.677429-0.019443 0.013303-0.037862 0.025583-0.057305 0.038886-0.309038 0.208754-0.623193 0.411369-0.942465 0.606821-0.045025 0.027629-0.090051 0.054235-0.134053 0.081864-0.288572 0.174985-0.581238 0.343831-0.877997 0.50756-0.090051 0.050142-0.181125 0.098237-0.272199 0.147356-0.25071 0.134053-0.502443 0.265036-0.759293 0.391926-0.156566 0.077771-0.314155 0.151449-0.472767 0.226151-0.194428 0.091074-0.38988 0.182149-0.587378 0.268106-0.239454 0.105401-0.481977 0.204661-0.724501 0.302899-0.12382 0.049119-0.246617 0.100284-0.37146 0.148379-0.334621 0.128937-0.673335 0.249687-1.014096 0.36532-0.042979 0.014326-0.085958 0.029676-0.128937 0.044002-1.6158 0.536212-3.296069 0.915859-5.02034 1.119497-0.01535 0.002047-0.029676 0.004093-0.044002 0.00614-0.309038 0.035816-0.620124 0.062422-0.931209 0.086981-0.132006 0.010233-0.265036 0.025583-0.397043 0.033769-0.174985 0.011256-0.349971 0.01535-0.525979 0.022513-0.270153 0.01228-0.539282 0.024559-0.808412 0.027629-0.054235 0.001023-0.10847-0.001023-0.162706-0.001023-1.696642 0.010233-3.371794-0.149403-5.006014-0.466628-0.065492-0.01228-0.12996-0.027629-0.195451-0.039909-0.331551-0.067538-0.662079-0.13917-0.989537-0.218988-0.148379-0.035816-0.295735-0.075725-0.443092-0.11461-0.234337-0.061398-0.468674-0.124843-0.700965-0.192382-0.224104-0.065492-0.445138-0.135076-0.666172-0.206708-0.149403-0.048095-0.297782-0.096191-0.446162-0.147356-0.286526-0.098237-0.568958-0.201591-0.850367-0.309038-0.079818-0.030699-0.160659-0.061398-0.240477-0.093121-0.330528-0.12996-0.655939-0.267083-0.979304-0.410346-0.033769-0.01535-0.067538-0.029676-0.101307-0.045025-0.355087-0.159636-0.705058-0.325411-1.050935-0.500397-0.008186-0.004093-0.016373-0.008186-0.023536-0.01228-0.360204-0.182149-0.714268-0.372483-1.064238-0.569982-0.004093-0.002047-0.008186-0.005117-0.013303-0.007163-0.344854-0.196475-0.684592-0.399089-1.019213-0.610914-0.020466-0.013303-0.040932-0.025583-0.060375-0.038886-0.313132-0.199545-0.621147-0.404206-0.925069-0.61603-0.050142-0.034792-0.099261-0.070608-0.149403-0.105401-0.268106-0.190335-0.532119-0.38374-0.791016-0.583285-0.091074-0.069585-0.181125-0.141216-0.271176-0.212848-0.212848-0.167822-0.422625-0.337691-0.629333-0.512676-0.137123-0.11461-0.271176-0.232291-0.406253-0.349971-0.154519-0.1361-0.308015-0.272199-0.459464-0.412392-0.179079-0.164752-0.354064-0.332575-0.528026-0.502443-0.102331-0.100284-0.204661-0.199545-0.304945-0.301875-0.211824-0.212848-0.418532-0.430812-0.623193-0.651846-0.059352-0.064468-0.119727-0.128937-0.179079-0.194428-0.231267-0.254803-0.456395-0.515746-0.678452-0.780783-0.031722-0.037862-0.063445-0.075725-0.095167-0.11461-0.23536-0.285502-0.465604-0.577145-0.688685-0.874927-0.01842-0.024559-0.036839-0.048095-0.055259-0.072655-0.226151-0.301875-0.445138-0.60989-0.657986-0.923022-0.019443-0.028653-0.038886-0.057305-0.058328-0.084934-0.202615-0.300852-0.400113-0.606821-0.590448-0.916882-0.032746-0.053212-0.064468-0.105401-0.096191-0.158612-0.169869-0.282433-0.335644-0.567935-0.49528-0.857531-0.053212-0.097214-0.105401-0.194428-0.158612-0.292666-0.130983-0.24457-0.258896-0.490164-0.381693-0.73985-0.080841-0.162706-0.157589-0.326435-0.234337-0.491187-0.088004-0.189312-0.177032-0.378623-0.260943-0.571005-0.107447-0.245593-0.209778-0.493234-0.310062-0.741897-0.047072-0.11768-0.095167-0.234337-0.141216-0.354064-0.130983-0.340761-0.25378-0.684592-0.370437-1.030469-0.013303-0.037862-0.026606-0.075725-0.038886-0.113587-0.180102-0.543376-0.345877-1.092891-0.48914-1.650593L244.22942 305.59939599999996 67.355037 305.59939599999996c-14.128789 0-25.582655-11.453866-25.582655-25.582655s11.453866-25.582655 25.582655-25.582655l191.314257 0c0.867764 0 1.725294 0.044002 2.570545 0.128937 0.828878-0.080841 1.656733-0.1361 2.478448-0.1361 11.218506 0 21.512966 7.439436 24.644283 18.779715l113.358791 410.43686 103.412254-723.884758c0.00921-0.072655 0.021489-0.145309 0.030699-0.217964l0.046049-0.320295c0.002047-0.011256 0.005117-0.021489 0.00614-0.032746 0.109494-0.7552 0.25071-1.502213 0.425695-2.238994 0.01535-0.064468 0.031722-0.12689 0.047072-0.191358 0.166799-0.679475 0.358157-1.350764 0.579191-2.01182 0.041956-0.124843 0.088004-0.24764 0.130983-0.37146 0.210801-0.600681 0.437975-1.194198 0.692778-1.77646 0.068562-0.156566 0.144286-0.309038 0.215918-0.464581 0.223081-0.484024 0.460488-0.961908 0.713244-1.431605 0.106424-0.196475 0.213871-0.390903 0.325411-0.584308 0.265036-0.462534 0.545422-0.914836 0.838088-1.359974 0.088004-0.13303 0.170892-0.268106 0.260943-0.399089 0.354064-0.51677 0.732687-1.016143 1.12359-1.506307 0.078795-0.099261 0.156566-0.198521 0.237407-0.296759 0.420579-0.511653 0.864694-1.004887 1.325182-1.482771 0.051165-0.052189 0.101307-0.105401 0.152473-0.157589 0.494257-0.50449 1.010003-0.989537 1.548262-1.454118 0.00921-0.007163 0.017396-0.014326 0.026606-0.022513 1.636267-1.408069 3.466961-2.620687 5.466502-3.592828 0.075725-0.036839 0.151449-0.074701 0.228197-0.11154 0.576121-0.273223 1.165546-0.525979 1.768273-0.75827 0.158612-0.061398 0.319272-0.118704 0.478907-0.177032 0.558725-0.202615 1.124614-0.393973 1.704828-0.559748 0.005117-0.001023 0.010233-0.002047 0.01535-0.004093 0.278339-0.079818 0.562818-0.13917 0.844228-0.209778 0.394996-0.098237 0.789992-0.194428 1.184989-0.274246 0.283456-0.056282 0.568958-0.103354 0.854461-0.149403 0.445138-0.073678 0.889253-0.134053 1.333368-0.183172 0.229221-0.024559 0.456395-0.052189 0.686638-0.071631 0.710175-0.059352 1.418302-0.099261 2.122337-0.099261 0.337691 0 0.671289 0.027629 1.007957 0.040932 0.276293 0.011256 0.550539 0.013303 0.828878 0.033769 0.401136 0.029676 0.799202 0.079818 1.196245 0.127913 0.191358 0.022513 0.38067 0.033769 0.572028 0.061398 0.069585 0.010233 0.1361 0.024559 0.205685 0.034792 0.232291 0.034792 0.462534 0.075725 0.692778 0.116657 0.463558 0.082888 0.921999 0.176009 1.3743 0.283456 0.109494 0.025583 0.218988 0.047072 0.327458 0.074701 0.582261 0.145309 1.152243 0.316202 1.716084 0.499373 0.098237 0.031722 0.196475 0.063445 0.293689 0.097214 1.90335 0.644683 3.694135 1.50119 5.351891 2.540869 0.014326 0.00921 0.028653 0.01842 0.042979 0.027629 1.089821 0.686638 2.121314 1.452071 3.087315 2.287089 0.083911 0.071631 0.167822 0.143263 0.25071 0.215918 0.424672 0.3776 0.837064 0.76748 1.235131 1.170662 0.12382 0.124843 0.243547 0.254803 0.36532 0.382717 0.317225 0.334621 0.626263 0.677429 0.925069 1.028423 0.155543 0.183172 0.308015 0.36839 0.458441 0.556679 0.26606 0.331551 0.523933 0.670266 0.773619 1.01512 0.130983 0.180102 0.261966 0.35918 0.387833 0.543376 0.294712 0.429789 0.575098 0.86981 0.843204 1.316995 0.099261 0.165776 0.195451 0.334621 0.290619 0.503467 0.283456 0.499373 0.555655 1.004887 0.806365 1.52268 0.031722 0.065492 0.060375 0.13303 0.091074 0.199545 0.276293 0.584308 0.530073 1.178849 0.762363 1.784646 0.00614 0.017396 0.014326 0.034792 0.020466 0.051165 0.251733 0.661056 0.472767 1.336438 0.669242 2.020006 0.002047 0.008186 0.00614 0.016373 0.008186 0.024559l0.061398 0.215918c0.029676 0.106424 0.062422 0.210801 0.090051 0.317225l117.579929 411.527704 79.800487-94.308923c0.070608-0.083911 0.146333-0.161682 0.217964-0.243547 0.190335-0.220011 0.38374-0.436952 0.581238-0.649799 0.134053-0.144286 0.26913-0.285502 0.405229-0.425695 0.164752-0.168846 0.331551-0.335644 0.50142-0.500397 0.164752-0.159636 0.329505-0.319272 0.496304-0.473791 0.138146-0.12689 0.279363-0.25071 0.419556-0.37453 0.198521-0.174985 0.397043-0.350994 0.599657-0.518816 0.081864-0.067538 0.166799-0.132006 0.249687-0.198521 0.817622-0.661056 1.667989-1.264806 2.545986-1.811252 0.098237-0.061398 0.195451-0.125867 0.294712-0.185218 0.228197-0.138146 0.459464-0.267083 0.691755-0.398066 0.157589-0.089028 0.315178-0.178055 0.474814-0.264013 0.200568-0.107447 0.403183-0.208754 0.606821-0.311085 0.202615-0.101307 0.406253-0.201591 0.611937-0.297782 0.173962-0.080841 0.348947-0.159636 0.523933-0.237407 0.245593-0.10847 0.494257-0.212848 0.743944-0.313132 0.144286-0.058328 0.289596-0.115634 0.434905-0.171915 0.291642-0.11154 0.586354-0.216941 0.883113-0.317225 0.11154-0.037862 0.223081-0.076748 0.334621-0.113587 0.337691-0.109494 0.677429-0.210801 1.02126-0.305969 0.078795-0.021489 0.157589-0.046049 0.236384-0.066515 0.376577-0.101307 0.757247-0.193405 1.140986-0.277316 0.050142-0.011256 0.100284-0.023536 0.150426-0.034792 0.405229-0.085958 0.813528-0.162706 1.225921-0.229221 0.031722-0.005117 0.063445-0.01228 0.096191-0.017396 0.412392-0.065492 0.828878-0.12075 1.24741-0.165776 0.032746-0.004093 0.064468-0.00921 0.097214-0.01228 0.382717-0.039909 0.768503-0.068562 1.155313-0.092098 0.068562-0.004093 0.1361-0.01228 0.204661-0.01535 0.25992-0.013303 0.521886-0.01535 0.782829-0.020466 0.188288-0.004093 0.376577-0.01535 0.564865-0.01535 0.008186 0 0.01535 0.001023 0.023536 0.001023l181.208085 0c14.129812 0 25.582655 11.453866 25.582655 25.582655S967.56978 315.668729 953.440991 315.668729z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="ok-circle" unicode="&#4101;" d="M516.152065-63.152063c-60.696384 0-119.594819 11.894911-175.056991 35.353183-53.55473 22.651906-101.646028 55.073316-142.936433 96.364745-41.291428 41.291428-73.712839 89.381703-96.363721 142.936433-23.458271 55.462173-35.353183 114.359584-35.353183 175.055968s11.894911 119.594819 35.353183 175.056991c22.651906 53.55473 55.073316 101.646028 96.363721 142.936433 41.290405 41.291428 89.381703 73.712839 142.936433 96.363721 55.462173 23.458271 114.359584 35.353183 175.056991 35.353183s119.594819-11.894911 175.056991-35.353183c53.55473-22.651906 101.645005-55.073316 142.936433-96.363721 41.291428-41.290405 73.711815-89.38068 96.363721-142.936433 23.459295-55.462173 35.353183-114.359584 35.353183-175.056991 0-60.696384-11.893888-119.593795-35.353183-175.055968-22.651906-53.55473-55.072293-101.645005-96.363721-142.936433s-89.381703-73.712839-142.936433-96.364745C635.747907-51.25715200000002 576.849472-63.152063 516.152065-63.152063zM516.152065 774.870222c-214.115566 0-388.311956-174.196391-388.311956-388.311956s174.196391-388.311956 388.311956-388.311956 388.311956 174.196391 388.311956 388.311956S730.268654 774.870222 516.152065 774.870222zM434.74908 132.830517L209.49278 358.08784 289.087583 437.68162 434.74908 292.020122 743.218594 600.488613 822.812373 520.89381Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="layim-theme" unicode="&#58907;" d="M958.830745 538.643056L740.659817 692.753993l-100.539834 0-3.977591-9.332553c-0.37146-0.871857-38.021965-86.8613-124.772748-88.667435-35.691897 0.76441-67.206658 15.500019-93.680613 43.828204-20.658506 22.106484-30.374798 44.584428-30.456662 44.776809l-3.955078 9.393951-100.587929 0L64.518433 538.643056 169.320337 379.756349l89.956801 65.019853-19.016099-368.05254 268.86654 0 4.093225 0 269.866311 0-19.016099 368.051517 89.956801-65.018829L958.830745 538.643056zM730.105437 507.20402l20.655436-399.781172-237.540068 0-4.093225 0L272.587282 107.42284700000005l20.656459 399.781172-115.938546-83.797521-36.3243 55.070246 159.440315 111.641683-19.276019 30.638811L121.066333 508.667348l-14.548344 22.056342 185.921433 131.330094 71.077825 0c5.332449-10.04375 15.433504-26.779923 30.951943-43.580564 32.047904-34.69622 72.256674-53.486168 116.345822-54.411237l0-0.031722c0.203638 0.00307 0.406253 0.01228 0.60989 0.016373 0.203638-0.00307 0.406253-0.013303 0.60989-0.016373l0 0.031722c44.073798 0.925069 84.359316 19.703761 116.566856 54.379515 15.623839 16.821107 25.814945 33.579793 31.188326 43.612287l71.120804 0 185.921433-131.330094-14.548344-22.056342L742.203986 620.7551920000001l-19.276019-30.638811 159.440315-111.641683-36.3243-55.070246L730.105437 507.20402z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="table" unicode="&#58925;" d="M304.738028 343.684806M729.544153 511.153982M595.52788 637.723655M143.806755 686.614156l0-601.704045L881.172549 84.91011100000003l0 601.704045L143.806755 686.614156zM420.318416 299.80441299999995l0 128.936581 184.341448 0 0-128.936581L420.318416 299.80441299999995zM604.659865 256.825552l0-128.936581L420.318416 127.88897099999997l0 128.936581L604.659865 256.825552zM604.659865 600.656435l0-128.936581L420.318416 471.719854l0 128.936581L604.659865 600.656435zM374.232798 600.656435l0-128.936581L189.89135 471.719854l0 128.936581L374.232798 600.656435zM189.89135 428.740994L374.232798 428.740994l0-128.936581L189.89135 299.80441299999995 189.89135 428.740994zM650.745483 428.740994l184.341448 0 0-128.936581L650.745483 299.80441299999995 650.745483 428.740994zM650.745483 471.719854l0 128.936581 184.341448 0 0-128.936581L650.745483 471.719854zM189.89135 256.825552L374.232798 256.825552l0-128.936581L189.89135 127.88897099999997 189.89135 256.825552zM650.745483 127.88897099999997l0 128.936581 184.341448 0 0-128.936581L650.745483 127.88897099999997z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="right" unicode="&#58882;" d="M283.648 721.9189759999999L340.873216 780.926976 740.352 383.99795200000005 340.876288-12.925952000000052 283.648 46.07795199999998 619.52 383.99795200000005Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="left" unicode="&#58883;" d="M740.352 721.9189759999999L683.126784 780.926976 283.648 383.99795200000005 683.123712-12.925952000000052 740.352 46.07795199999998 404.48 383.99795200000005Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="cart-simple" unicode="&#59032;" d="M235.097303 196.866982C247.384597 160.417152 286.382106 132.37606800000003 324.772759 132.37606800000003L861.658537 132.37606800000003 880.429732 132.37606800000003 885.649214 150.54185399999994 1009.08775 580.154957C1021.388907 622.967661 993.187631 660.786325 949.051586 660.786325L424.585365 660.786325C410.791718 660.786325 399.609756 649.5207379999999 399.609756 635.623932 399.609756 621.727125 410.791718 610.461538 424.585365 610.461538L949.051586 610.461538C959.924 610.461538 964.161052 604.779539 961.106394 594.148171L837.667859 164.53506800000002 861.658537 182.70085500000005 324.772759 182.70085500000005C307.742153 182.70085500000005 287.789837 197.04752900000005 282.395194 213.05054900000005L73.600164 832.433664C69.16437 845.592294 54.980454 852.636656 41.919502 848.167687 28.858551 843.698719 21.86648 829.408727 26.302275 816.250097L235.097303 196.866982ZM399.609756-6.017094000000043C399.609756 49.57012899999995 354.881911 94.63247799999999 299.707317 94.63247799999999 244.532723 94.63247799999999 199.804878 49.57012899999995 199.804878-6.017094000000043 199.804878-61.604318000000035 244.532723-106.66666699999996 299.707317-106.66666699999996 354.881911-106.66666699999996 399.609756-61.604318000000035 399.609756-6.017094000000043ZM249.756098-6.017094000000043C249.756098 21.77651800000001 272.120021 44.30769299999997 299.707317 44.30769299999997 327.294613 44.30769299999997 349.658537 21.77651800000001 349.658537-6.017094000000043 349.658537-33.810704999999984 327.294613-56.34187899999995 299.707317-56.34187899999995 272.120021-56.34187899999995 249.756098-33.810704999999984 249.756098-6.017094000000043ZM924.097562-6.017094000000043C924.097562 49.57012899999995 879.369715 94.63247799999999 824.195121 94.63247799999999 769.020529 94.63247799999999 724.292683 49.57012899999995 724.292683-6.017094000000043 724.292683-61.604318000000035 769.020529-106.66666699999996 824.195121-106.66666699999996 879.369715-106.66666699999996 924.097562-61.604318000000035 924.097562-6.017094000000043ZM774.243902-6.017094000000043C774.243902 21.77651800000001 796.607825 44.30769299999997 824.195121 44.30769299999997 851.782419 44.30769299999997 874.146342 21.77651800000001 874.146342-6.017094000000043 874.146342-33.810704999999984 851.782419-56.34187899999995 824.195121-56.34187899999995 796.607825-56.34187899999995 774.243902-33.810704999999984 774.243902-6.017094000000043Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="face-cry" unicode="&#59036;" d="M1024 384C1024 666.769792 794.769792 896 512 896 229.230208 896 0 666.769792 0 384 0 101.23020799999995 229.230208-128 512-128 629.410831-128 740.826187-88.33104600000001 830.768465-16.686661999999956 841.557579-8.092490999999995 843.33693 7.620766000000003 834.742758 18.409879000000046 826.148587 29.198990999999978 810.43533 30.978341999999998 799.646219 22.384173000000033 718.470035-42.277495000000044 618.001779-78.04878099999996 512-78.04878099999996 256.817504-78.04878099999996 49.951219 128.81750399999999 49.951219 384 49.951219 639.182496 256.817504 846.048781 512 846.048781 767.182496 846.048781 974.048781 639.182496 974.048781 384 974.048781 296.507166 949.714859 212.66323599999998 904.470807 140.039307 897.177109 128.33175700000004 900.755245 112.92820300000005 912.462793 105.63450699999999 924.170342 98.34080900000004 939.573897 101.91894200000002 946.867595 113.62649199999998 997.013826 194.11920399999997 1024 287.101621 1024 384ZM337.170731 396.487806C371.654852 396.487806 399.609756 424.442709 399.609756 458.926829 399.609756 493.41095 371.654852 521.365854 337.170731 521.365854 302.686611 521.365854 274.731708 493.41095 274.731708 458.926829 274.731708 424.442709 302.686611 396.487806 337.170731 396.487806ZM711.804879 396.487806C746.288998 396.487806 774.243902 424.442709 774.243902 458.926829 774.243902 493.41095 746.288998 521.365854 711.804879 521.365854 677.320757 521.365854 649.365854 493.41095 649.365854 458.926829 649.365854 424.442709 677.320757 396.487806 711.804879 396.487806ZM352.788105 191.21547499999997C396.165222 225.91716899999994 453.151987 246.639629 524.487806 246.639629 595.823622 246.639629 652.810387 225.91716899999994 696.187505 191.21547499999997 722.700531 170.00505399999997 738.882517 148.42907300000002 746.631548 132.931012 752.800254 120.59359800000004 747.799529 105.59142399999996 735.462114 99.42271600000004 723.124702 93.25401 708.122526 98.25473499999998 701.953818 110.59214899999995 701.03616 112.42746499999998 698.492224 116.61747600000001 694.165854 122.38597100000004 686.602473 132.47047699999996 676.927317 142.654852 664.983226 152.21012499999995 630.311565 179.947456 584.273939 196.68840999999998 524.487806 196.68840999999998 464.70167 196.68840999999998 418.664045 179.947456 383.992384 152.21012499999995 372.048292 142.654852 362.373137 132.47047699999996 354.809756 122.38597100000004 350.483386 116.61747600000001 347.93945 112.42746499999998 347.021792 110.59214899999995 340.853084 98.25473499999998 325.850908 93.25401 313.513495 99.42271600000004 301.176081 105.59142399999996 296.175356 120.59359800000004 302.344062 132.931012 310.093092 148.42907300000002 326.275078 170.00505399999997 352.788105 191.21547499999997Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="face-smile" unicode="&#59055;" d="M1024 384C1024 666.769792 794.769792 896 512 896 229.230208 896 0 666.769792 0 384 0 101.23020799999995 229.230208-128 512-128 629.410831-128 740.826187-88.33104600000001 830.768465-16.686661999999956 841.557579-8.092490999999995 843.33693 7.620766000000003 834.742758 18.409879000000046 826.148587 29.198990999999978 810.43533 30.978341999999998 799.646219 22.384173000000033 718.470035-42.277495000000044 618.001779-78.04878099999996 512-78.04878099999996 256.817504-78.04878099999996 49.951219 128.81750399999999 49.951219 384 49.951219 639.182496 256.817504 846.048781 512 846.048781 767.182496 846.048781 974.048781 639.182496 974.048781 384 974.048781 296.507166 949.714859 212.66323599999998 904.470807 140.039307 897.177109 128.33175700000004 900.755245 112.92820300000005 912.462793 105.63450699999999 924.170342 98.34080900000004 939.573897 101.91894200000002 946.867595 113.62649199999998 997.013826 194.11920399999997 1024 287.101621 1024 384ZM337.170731 396.487806C371.654852 396.487806 399.609756 424.442709 399.609756 458.926829 399.609756 493.41095 371.654852 521.365854 337.170731 521.365854 302.686611 521.365854 274.731708 493.41095 274.731708 458.926829 274.731708 424.442709 302.686611 396.487806 337.170731 396.487806ZM711.804879 396.487806C746.288998 396.487806 774.243902 424.442709 774.243902 458.926829 774.243902 493.41095 746.288998 521.365854 711.804879 521.365854 677.320757 521.365854 649.365854 493.41095 649.365854 458.926829 649.365854 424.442709 677.320757 396.487806 711.804879 396.487806ZM352.788105 127.22903299999996C396.165222 92.52733899999998 453.151987 71.80487900000003 524.487806 71.80487900000003 595.823622 71.80487900000003 652.810387 92.52733899999998 696.187505 127.22903299999996 722.700531 148.43945399999996 738.882517 170.01543500000002 746.631548 185.51349500000003 752.800254 197.850908 747.799529 212.85308399999997 735.462114 219.021792 723.124702 225.19049800000005 708.122526 220.18977299999995 701.953818 207.85235799999998 701.03616 206.01704299999994 698.492224 201.82703100000003 694.165854 196.058537 686.602473 185.97402899999997 676.927317 175.78965500000004 664.983226 166.23438299999998 630.311565 138.49705200000005 584.273939 121.75609799999995 524.487806 121.75609799999995 464.70167 121.75609799999995 418.664045 138.49705200000005 383.992384 166.23438299999998 372.048292 175.78965500000004 362.373137 185.97402899999997 354.809756 196.058537 350.483386 201.82703100000003 347.93945 206.01704299999994 347.021792 207.85235799999998 340.853084 220.18977299999995 325.850908 225.19049800000005 313.513495 219.021792 301.176081 212.85308399999997 296.175356 197.850908 302.344062 185.51349500000003 310.093092 170.01543500000002 326.275078 148.43945399999996 352.788105 127.22903299999996Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="survey" unicode="&#59058;" d="M722.355804 849.454545C761.006291 849.454545 792.380951 818.166023 792.380951 779.627344L792.380951 437.500928 799.081094 453.813218 401.874746 51.22138 418.539682 58.181818 138.070006 58.181818C99.387643 58.181818 68.063492 89.328555 68.063492 127.771428L68.063492 872.727273 44.698413 849.454545 722.355804 849.454545ZM21.333333 896 21.333333 872.727273 21.333333 127.771428C21.333333 63.604277 73.59726 11.636363 138.070006 11.636363L418.539682 11.636363 428.337293 11.636363 435.204619 18.596802 832.410967 421.18864 839.11111 427.979625 839.11111 437.500928 839.11111 779.627344C839.11111 843.859757 786.827324 896 722.355804 896L44.698413 896 21.333333 896ZM775.859347 307.365395 759.337741 290.90909 775.859347 274.452787 869.319663 181.361879 885.841269 164.905574 902.362876 181.361879 972.458114 251.18006 988.979721 267.636363 972.458114 284.092668 878.997796 377.183575 862.47619 393.639878 845.954583 377.183575 775.859347 307.365395ZM845.954583 344.27097 939.414901 251.18006 939.414901 284.092668 869.319663 214.274485 902.362876 214.274485 808.902558 307.365395 808.902558 274.452787 878.997796 344.27097 845.954583 344.27097ZM518.843473 51.365395 513.841133 46.382827 512.453734 39.473248 489.088655-76.890387 482.215251-111.121568 516.58227-104.275332 633.407665-81.002605 640.344663-79.620689 645.347004-74.638121 902.362876 181.361879 918.884482 197.818182 902.362876 214.274485 808.902558 307.365395 792.380951 323.821698 775.859347 307.365395 518.843473 51.365395ZM775.859347 274.452787 869.319663 181.361879 869.319663 214.274485 612.303791-41.725515 624.243127-35.361033 507.41773-58.633758 534.911345-86.018703 558.276425 30.344934 551.886686 18.452787 808.902558 274.452787 775.859347 274.452787ZM426.576706 298.269073C444.201086 298.269073 458.488469 284.053815 458.488469 266.500753L458.488469 258.086116C458.488469 240.540958 444.323959 226.317797 426.576706 226.317797L426.576706 226.317797C408.952326 226.317797 394.664943 240.533054 394.664943 258.086116L394.664943 266.500753C394.664943 284.045911 408.829453 298.269073 426.576706 298.269073L426.576706 298.269073ZM278.349205 552.435127C278.349205 552.435127 280.851125 530.485568 305.477133 530.485568 330.103138 530.485568 331.559155 552.435127 331.559155 552.435127 329.927383 623.508937 362.988497 657.25782 430.67155 653.905282 475.722639 648.839223 499.06407 623.508937 500.624896 577.839917 497.503245 557.501184 480.405116 531.202385 449.969026 499.092521 409.671358 458.489557 389.522524 422.133143 389.522524 390.023279L389.522524 357.093903C389.522524 357.093903 392.614705 337.454532 414.885933 337.454532 437.157161 337.454532 440.249342 357.093903 440.249342 357.093903L440.249342 379.965664C440.249342 406.785969 459.546816 439.044836 498.21271 476.369762 538.652271 513.471183 558.730159 547.369069 558.730159 577.839917 555.395669 662.323878 511.195938 706.353877 425.776235 709.780917 327.515198 711.419936 278.349205 658.971339 278.349205 552.435127Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="tree" unicode="&#58926;" d="M962.691679 258.53447400000005c-8.721639 54.163597-34.298154 97.584526-73.089645 133.8638-44.721551 41.825594-99.282191 65.724911-156.512636 84.432994-26.935466 8.80555-54.079686 16.971533-81.129762 25.427112 41.188074 7.485485 81.495082 10.991332 121.872698 12.269441 39.906895 1.26276 79.885422 0.276293 120.633475 0.276293-30.644951 44.233434-74.588789 71.110571-127.260405 84.384899-53.004191 13.357216-103.742782 9.715269-152.261822-32.081673 18.715247 66.336848 12.464893 120.18936-38.810934 160.830989-32.450063 25.719778-77.127611 31.000038-111.319341 14.916734 58.583257-31.127951 82.051761-84.265172 94.304829-145.102772-44.638663 69.056795-110.067838 96.432283-187.710173 86.487793-56.123228-7.187703-110.723777-26.270317-166.003801-40.048111 15.677051-14.358009 31.136138-24.116257 47.932686-27.839045 51.427276-11.399631 103.405091-20.301372 155.098427-30.524201 37.036521-7.323802 75.163887-12.144598 104.448864-40.879036-78.096682 23.458271-155.928329 30.034037-235.541551 9.092076C186.718589 530.20385 104.838743 479.821369 81.996502 429.437865c46.955428 23.955598 95.807043 18.776645 144.606469 17.139356 37.737486-1.266853 76.089979-3.461845 113.238041 1.594311 52.683896 7.170307 104.513332 20.624736 159.209048 31.909757-91.88164-62.077847-186.516997-122.342396-159.194722-259.889075 58.852386 100.205213 163.392324 150.107763 229.951229 238.105956-16.239869-91.498924 6.980995-169.376619 66.432015-237.83785 41.815361-48.152696 89.979314-92.010577 110.706381-156.013263 12.758582 141.877311-25.823132 270.789333-97.911984 396.334677C755.996107 391.809873 858.199837 325.909977 962.691679 258.53447400000005zM513.476631 320.10169099999996c-27.767414-14.065344-39.008432-35.954887-42.252313-64.998363-6.078439-54.437843-15.162328-108.532879-21.799492-162.916487-3.90903-32.026414-5.519714-64.333214-8.16496-96.53052 30.078039 0 55.507198 0 79.961146 0 9.912767 78.200036 19.732413 154.247037 28.913517 230.369761 0.883113 7.322779-0.756223 15.746636-3.705392 22.591531C536.246217 272.25086999999996 524.967336 295.41135899999995 513.476631 320.10169099999996z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="ie" unicode="&#59323;" d="M734.208 267.1616l236.05248 0c1.82272 16.36352 2.53952 33.09568 2.53952 50.19648 0 80.22016-21.52448 155.46368-59.12576 220.2624 38.87104 103.30112 37.49888 190.99648-14.56128 243.38432-49.50016 49.27488-182.29248 41.28768-332.41088-25.1904-11.10016 0.83968-22.3232 1.26976-33.62816 1.26976-206.04928 0-378.92096-141.80352-426.7008-332.84096 64.63488 82.75968 132.62848 142.7456 223.47776 186.44992-8.25344-7.74144-56.46336-55.64416-64.55296-63.75424-239.55456-239.47264-315.0848-552.30464-233.79968-633.61024 61.78816-61.76768 173.75232-51.34336 302.36672 11.65312 59.8016-30.45376 127.50848-47.63648 199.20896-47.63648 193.1264 0 356.80256 124.3136 416.09216 297.45152l-237.8752 0c-32.72704-60.37504-96.74752-101.4784-170.20928-101.4784s-137.48224 41.10336-170.20928 101.4784c-14.5408 27.27936-22.91712 58.55232-22.91712 91.648l0 0.7168 386.2528 0zM348.30336 383.20128c5.44768 97.11616 86.20032 174.592 184.77056 174.592s179.3024-77.47584 184.77056-174.592l-369.54112 0zM896.96256 732.20096c33.52576-33.87392 32.68608-96.21504 4.01408-174.01856-49.13152 74.91584-120.5248 133.9392-204.8 167.64928 90.112 38.64576 163.40992 43.76576 200.78592 6.38976zM93.4912-71.24992c-42.78272 42.8032-29.88032 132.608 25.23136 240.82432 34.304-96.27648 101.15072-177.09056 187.33056-229.15072-95.4368-43.3152-173.52704-50.66752-212.56192-11.6736z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="upload-circle" unicode="&#58927;" d="M512-128c282.768 0 512 229.216 512 512C1024 666.768 794.768 896 512 896 229.216 896 0 666.768 0 384 0 101.21600000000001 229.216-128 512-128zM512 848c256.272 0 464-207.744 464-464 0-256.272-207.728-464-464-464S48 127.72799999999995 48 384C48 640.256 255.728 848 512 848zM377.728 534.544L480 534.544l0-478c0-17.664 14.336-32 32-32s32 14.336 32 32L544 534.544l102.272 0c17.616 0 23.424 11.568 12.944 25.68l-128.128 172.624c-10.496 14.128-27.664 14.128-38.16 0L364.8 560.24C354.32 546.1120000000001 360.128 534.544 377.728 534.544z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="add-circle" unicode="&#58911;" d="M675.04 412.736l-127.04 0 0 127.264c0 20.064-16.288 36.32-36.32 36.32-20.064 0-36.32-16.192-36.32-36.32l0-127.232-127.072 0c-20.064 0-36.352-16.32-36.352-36.352 0-20.064 16.224-36.352 36.352-36.352l127.072 0 0-127.232c0-20 16.256-36.384 36.32-36.384 20.032 0 36.32 16.256 36.32 36.384l0 127.136 127.04 0c19.968 0 36.352 16.256 36.352 36.384C711.36 396.448 695.136 412.736 675.04 412.736L675.04 412.736zM511.328 830.56c-250.24 0-453.952-203.616-453.952-453.952 0-250.336 203.712-453.952 453.952-453.952 250.336 0 453.984 203.584 453.984 453.952C965.312 626.944 761.696 830.56 511.328 830.56L511.328 830.56zM511.328-20.576000000000022c-219.04 0-397.184 178.176-397.184 397.152 0 219.104 178.144 397.216 397.184 397.216s397.216-178.112 397.216-397.216C908.576 157.63199999999995 730.368-20.576000000000022 511.328-20.576000000000022L511.328-20.576000000000022zM511.328-20.576000000000022"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="download-circle" unicode="&#58881;" d="M510.771521 828.211081c-244.998947 0-443.597097-198.60429-443.597097-443.590957s198.59815-443.591981 443.597097-443.591981c244.986667 0 443.583794 198.60429 443.583794 443.591981S755.758188 828.211081 510.771521 828.211081zM510.771521-30.044013999999947c-229.010811 0-414.664138 185.65435-414.664138 414.664138 0 229.010811 185.653327 414.657998 414.664138 414.657998 228.996484 0 414.652881-185.647187 414.652881-414.657998C925.424402 155.60931300000004 739.768005-30.044013999999947 510.771521-30.044013999999947zM662.749888 352.39518799999996L537.719266 245.82501100000002l0 324.388065c0 14.887059-12.06478 26.953885-26.947745 26.953885-14.894222 0-26.961048-12.066827-26.961048-26.953885l0-325.410348L357.936647 352.39518799999996c-10.56359 10.599406-27.693736 10.599406-38.267559 0-10.56359-10.596336-10.56359-27.777647 0-38.375006l170.181961-161.220868c5.629207-5.652743 13.111622-8.060583 20.49887-7.680936 7.373944-0.379647 14.859429 2.02717 20.488637 7.680936l170.181961 161.220868c10.562567 10.597359 10.562567 27.77867 0 38.375006C690.443623 362.99561700000004 673.313477 362.99561700000004 662.749888 352.39518799999996z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="templeate-1" unicode="&#58928;" d="M320 384L106.666667 384c-35.349333 0-64-28.650667-64-64l0-213.333333c0-35.349333 28.650667-64 64-64l213.333333 0c35.349333 0 64 28.650667 64 64L384 320C384 355.349333 355.349333 384 320 384zM256 341.33333300000004l0-256L170.666667 85.33333300000004 170.666667 341.33333300000004 256 341.33333300000004zM85.333333 106.66666699999996L85.333333 320c0 11.754667 9.578667 21.333333 21.333333 21.333333l42.666667 0 0-256L106.666667 85.33333300000004C94.912 85.33333300000004 85.333333 94.91200000000003 85.333333 106.66666699999996zM341.333333 106.66666699999996c0-11.754667-9.578667-21.333333-21.333333-21.333333l-42.666667 0L277.333333 341.33333300000004l42.666667 0c11.754667 0 21.333333-9.578667 21.333333-21.333333L341.333333 106.66666699999996zM576 554.666667L234.666667 554.666667c-47.061333 0-85.333333-38.272-85.333333-85.333333l0-42.666667 42.666667 0 0 42.666667c0 23.530667 19.136 42.666667 42.666667 42.666667l42.666667 0 0-96 21.333333 0L298.666667 512l213.333333 0 0-426.666667-85.333333 0-21.333333-42.666667 170.666667 0c47.061333 0 85.333333 38.272 85.333333 85.333333L661.333333 469.333333C661.333333 516.394667 623.061333 554.666667 576 554.666667zM618.666667 128c0-23.530667-19.136-42.666667-42.666667-42.666667l-42.666667 0L533.333333 512l42.666667 0c23.530667 0 42.666667-19.136 42.666667-42.666667L618.666667 128zM853.333333 42.66666699999996c47.061333 0 85.333333 38.272 85.333333 85.333333L938.666667 640c0 47.061333-38.272 85.333333-85.333333 85.333333L341.333333 725.333333c-47.061333 0-85.333333-38.272-85.333333-85.333333l0-42.666667 42.666667 0 0 42.666667c0 23.530667 19.136 42.666667 42.666667 42.666667l85.333333 0 0-85.333333 21.333333 0 0 85.333333 298.666667 0 0-597.333333-42.666667 0-21.333333-42.666667L853.333333 42.66666699999996zM896 128c0-23.530667-19.136-42.666667-42.666667-42.666667l-85.333333 0L768 682.666667l85.333333 0c23.530667 0 42.666667-19.136 42.666667-42.666667L896 128z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="util" unicode="&#58929;" d="M282.127566 639.0826059999999c-13.120832-13.221116-30.625508-20.50808-49.278333-20.50808-18.618033 0-36.157501 7.286963-49.311079 20.50808l-32.885991 33.019021 98.623181 99.027387 32.885991-33.019021c13.186324-13.221116 20.473287-30.829146 20.473287-49.548486C302.599829 669.8769589999999 295.347658 652.26893 282.127566 639.0826059999999L282.127566 639.0826059999999zM249.308089 705.0899489999999l-0.032746 0-32.884968-32.987299c4.418636-4.417613 10.252505-6.845918 16.458857-6.845918 6.206352 0 12.041244 2.428306 16.426111 6.813173 4.418636 4.452405 6.845918 10.288321 6.845918 16.493649C256.121262 694.802652 253.693979 700.671313 249.308089 705.0899489999999L249.308089 705.0899489999999zM396.703067 496.343671L249.578242 638.778684l32.278147 33.626865 147.157571-142.468782L396.703067 496.343671 396.703067 496.343671zM751.45979 133.92852400000004L618.131179 274.071332l32.884968 32.985252 133.330658-140.141784L751.45979 133.92852400000004 751.45979 133.92852400000004zM850.184279 67.95597399999997c-22.700001-22.766516-52.481282-34.168194-82.264609-34.168194-29.714765 0-59.395762 11.333116-81.994456 34.033118L538.194592 222.398462l32.884968 33.021068L718.811206 100.806149c27.117614-27.183106 71.269183-27.116591 98.488105 0.169869 27.186176 27.287483 27.117614 71.773673-0.135076 99.196233l-147.426701 154.273642 32.851199 33.021068 147.461493-154.308435C895.447159 187.557956 895.514697 113.421468 850.184279 67.95597399999997L850.184279 67.95597399999997zM801.716404 468.380806c-30.726815-30.860868-71.605851-47.861054-115.082038-47.861054-43.442418 0-84.321454 16.999163-115.082038 47.861054-30.760584 30.861892-47.692209 71.877027-47.692209 115.521037s16.931624 84.691891 47.692209 115.554806l42.497906 42.666752 32.885991-32.986275-42.497906-42.667775c-21.99085-22.090111-34.099632-51.367925-34.065863-82.566484 0-31.163767 12.108782-60.441581 34.065863-82.499969 21.956058-22.058388 51.16531-34.20094 82.196047-34.20094 31.064506 0 60.239989 12.142551 82.196047 34.20094l42.49893 42.665729 32.884968-33.019021L801.716404 468.380806 801.716404 468.380806zM844.214311 511.049604l-49.311079 49.51267-16.45988-16.493649c-17.538445-17.638729-40.879036-27.352975-65.73719-27.352975l-0.032746 0c-24.824385 0-48.198745 9.713222-65.73719 27.352975-17.539468 17.607006-27.252691 41.082674-27.252691 66.007343 0 24.925692 9.679453 48.400337 27.252691 66.040089l16.458857 16.495696-49.344848 49.51267 32.885991 33.021068 82.196047-82.533738-49.311079-49.482995c-8.769734-8.835226-13.626345-20.571525-13.626345-33.051767 0-12.446473 4.856611-24.183795 13.626345-32.987299 8.768711-8.835226 20.439518-13.69286 32.884968-13.69286 12.411681 0 24.082488 4.857635 32.852222 13.69286l49.344848 49.514717 82.196047-82.534761L844.214311 511.049604 844.214311 511.049604zM233.591129 129.139451l0 46.681182 46.512337 0 0-46.681182L233.591129 129.139451 233.591129 129.139451zM538.160823 356.538555l-92.247984 91.572602 32.717146 33.18889 92.214215-91.539856L538.160823 356.538555 538.160823 356.538555zM304.2187 101.04355599999997l173.634596 239.842507 37.641295-27.454282L338.318332 69.23715300000003c-21.923312-22.057365-51.132564-34.20094-82.19707-34.20094-31.028691 0-60.237943 12.143575-82.196047 34.168194-21.958104 22.057365-34.065863 51.335179-34.065863 82.533738 0 31.198559 12.107759 60.476373 34.065863 82.533738l2.765997 2.360767L417.243893 412.054963l27.353998-37.742603L205.596542 200.00340600000004c-12.411681-13.053294-19.224854-30.119995-19.224854-48.26526 0-18.71934 7.252171-36.291554 20.438495-49.513694C232.747925 76.15265599999998 277.775444 75.71263499999998 304.2187 101.04355599999997L304.2187 101.04355599999997z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="face-surprised" unicode="&#58980;" d="M485.656116-128C221.592397-128 6.762016 86.81718000000001 6.762016 350.87649799999997s214.830381 478.867697 478.8941 478.867697c264.041716 0 478.854495-214.812779 478.854495-478.867697S749.697832-128 485.656116-128zM485.656116 798.834741c-247.024795 0-447.975846-200.959852-447.975846-447.962644 0-247.002792 200.951051-447.962644 447.975846-447.962644 247.002792 0 447.953843 200.959852 447.953843 447.962644C933.609959 597.8748889999999 732.658908 798.834741 485.656116 798.834741zM352.033458 447.380528c0-30.469398-24.682677-55.147675-55.143274-55.147675-30.451796 0-55.143274 24.678276-55.143274 55.147675 0 30.460597 24.691478 55.138874 55.143274 55.138874C327.350781 502.519402 352.033458 477.845526 352.033458 447.380528zM674.417647 502.519402c-30.460597 0-55.156476-24.678276-55.156476-55.138874 0-30.469398 24.695879-55.147675 55.156476-55.147675 30.451796 0 55.143274 24.678276 55.143274 55.147675C729.560922 477.845526 704.869444 502.519402 674.417647 502.519402zM562.005634 165.30976499999997c0-59.733046-34.192262-108.165484-76.349518-108.165484-42.166057 0-76.36272 48.432438-76.36272 108.165484 0 59.724245 34.196663 108.152282 76.36272 108.152282C527.813371 273.45764699999995 562.005634 225.03400999999997 562.005634 165.30976499999997zM835.631745 793.712503c0 0 12.871605 56.819883 41.959231 85.925112 29.083226 29.096427 69.915916 15.124685 78.492585-8.801097 9.461179-26.385689-2.033053-50.069442-29.092027-56.164202C899.404495 808.463141 874.880237 826.192952 835.631745 793.712503zM916.698651 757.570797c0 0 35.767659 20.576965 64.877288 19.393218 29.136032-1.174946 41.431165-29.144833 33.109728-45.110024-9.192746-17.588993-27.054573-22.966463-43.217788-11.797871C954.979023 731.44034 952.453108 752.721393 916.698651 757.570797z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="edit" unicode="&#58946;" d="M769.089 516.251l-125.896 125.89 62.974 62.947c20.866 20.838 54.652 20.838 75.517 0l50.353-50.351c20.865-20.865 20.865-54.703 0-75.567L769.089 516.251zM403.349 150.52700000000004L277.453 276.418 619.706 615.982 745.601 490.09ZM176.314 47.283000000000015L252.912 251.87699999999995 377.753 127.01199999999994Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="speaker" unicode="&#58949;" d="M587.182306 754.7203c-6.003737 2.705622-13.043061 1.642406-17.984606-2.721994l-259.223926-229.293243-148.246369 0c-9.253758 0-16.752546-7.498788-16.752546-16.756639l0-267.886213c0-9.249665 7.498788-16.756639 16.752546-16.756639l144.050814 0c9.253758 0 16.752546 7.506974 16.752546 16.756639L322.530764 490.391099c1.774413 0.704035 3.433192 1.719154 4.892427 3.010567l236.127905 208.861912 0-653.332912-160.751171 137.64287c-2.12643 1.824555-90.300632 78.69941-93.927229 76.162634-4.427846-3.097548-15.768125-17.59882-18.419512-22.512736-0.953721-1.768273-2.196015-1.334391 15.413038-16.379039 25.674753-21.936615 73.780377-61.548798 75.144444-62.717414l10.007935-8.570189 178.388876-152.761196c3.093455-2.653433 6.978948-4.028757 10.900258-4.028757 2.369977 0 4.756327 0.503467 7.003508 1.534959 5.939269 2.738367 9.749038 8.677637 9.749038 15.217586L597.060281 739.446431C597.060281 746.034477 593.190137 752.013655 587.182306 754.7203L587.182306 754.7203zM290.453185 254.814756l-115.040083 0L175.413102 489.195877l115.03906 0 0-234.381122L290.453185 254.814756zM747.742119 375.98444300000006c0-51.55212-34.83232-96.658434-84.702124-109.693308-1.415232-0.375553-2.846838-0.551562-4.245697-0.551562-7.438413 0-14.234189 4.992711-16.200984 12.523221-2.338255 8.949836 3.021823 18.104333 11.967566 20.442588 35.136242 9.18929 59.672054 40.96397 59.672054 77.279061 0 36.307927-24.535813 68.090794-59.672054 77.271898-8.945743 2.346441-14.305821 11.492752-11.967566 20.450774 2.342348 8.953929 11.499915 14.305821 20.446681 11.967566C712.909799 472.643899 747.742119 427.530422 747.742119 375.98444300000006L747.742119 375.98444300000006zM864.950588 375.793084c0-88.87619-48.554856-170.44495-126.718053-212.883505-2.537799-1.375324-5.276167-2.02717-7.982812-2.02717-5.939269 0-11.69946 3.166109-14.733563 8.762571-4.417613 8.134261-1.39886 18.303878 6.727215 22.720468 67.350944 36.566824 109.198028 106.851587 109.198028 183.427636 0 76.844156-42.055838 147.272181-109.741403 183.78784-8.154727 4.396123-11.192923 14.557554-6.795776 22.700001 4.38896 8.142447 14.558577 11.184737 22.701025 6.795776C816.151162 546.697499 864.950588 464.976266 864.950588 375.793084L864.950588 375.793084z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="down" unicode="&#58906;" d="M888.306 619.94c15.615 15.617 40.93 15.617 56.545 0v0c15.617-15.615 15.617-40.93 0-56.545l-405.733-405.734c-15.615-15.617-40.928-15.617-56.545 0v0c-15.615 15.615-15.615 40.93 0 56.545l405.733 405.734zM538.619 214.20600000000002c15.617-15.615 15.617-40.93 0-56.545v0c-15.615-15.617-40.928-15.617-56.545 0l-405.734 405.734c-15.615 15.615-15.615 40.93 0 56.545v0c15.617 15.617 40.93 15.617 56.547 0l405.732-405.734zM538.619 214.20600000000002z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="file" unicode="&#58913;" d="M887.443911 598.6304l0-44.578133 0-45.511111 0-477.866667c0-37.705956-30.560711-68.266667-68.266667-68.266667l-614.4 0c-37.705956 0-68.266667 30.560711-68.266667 68.266667l0 705.422222c0 37.6832 30.560711 68.266667 68.266667 68.266667l386.844444 0 45.511111 0 38.024533 0c7.805156 2.594133 16.566044 1.2288 22.778311-5.006222l183.136711-183.159467C885.919289 611.373511 887.876267 604.9564439999999 887.443911 598.6304zM659.888356 531.296711c-12.583822 0-22.755556 10.171733-22.755556 22.755556l0 204.8-45.511111 0-364.088889 0c-25.122133 0-45.511111-20.388978-45.511111-45.511111l0-659.911111c0-25.122133 20.388978-45.511111 45.511111-45.511111l568.888889 0c25.122133 0 45.511111 20.388978 45.511111 45.511111l0 455.111111 0 22.755556L659.888356 531.296711zM682.643911 750.273422l0-173.4656 159.288889 0 0 14.176711L682.643911 750.273422z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="layouts" unicode="&#58930;" d="M917.213-103.239h-810.426c-23.151 0-41.918 18.766-41.918 41.917l0 698.644c0 23.148 18.767 41.917 41.918 41.917h810.426c23.149 0 41.918-18.769 41.918-41.917v-698.643c0-23.151-18.769-41.918-41.918-41.918zM316.38-61.321h600.833v363.294h-600.833v-363.294zM106.787-61.321h167.674v363.294h-167.674v-363.294zM148.705 637.322c-23.151 0-41.918-18.769-41.918-41.92s18.767-41.92 41.918-41.92 41.92 18.768 41.92 41.92-18.769 41.92-41.92 41.92zM274.461 637.322c-23.151 0-41.918-18.769-41.918-41.92s18.767-41.92 41.918-41.92c23.151 0 41.92 18.768 41.92 41.92s-18.77 41.92-41.92 41.92zM400.216 637.322c-23.15 0-41.918-18.769-41.918-41.92s18.769-41.92 41.918-41.92c23.152 0 41.92 18.768 41.92 41.92s-18.768 41.92-41.92 41.92zM875.293 511.566h-768.506v-167.675h810.426l0 167.675h-41.921z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="rate-half" unicode="&#59081;" d="M1012.064 504l-359.552 31.008-140.512 331.04-140.512-331.552-359.552-30.496 273.024-236.544-82.016-351.552 309.056 186.528 309.056-186.528-81.504 351.552 272.544 236.544zM512 195.96799999999996l0 465.056 85.504-202.016 219.04-19.008-166.016-144.032 50.016-214.016-188.512 114.016z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="add-circle-fine" unicode="&#58888;" d="M509.989715-60.972421000000054c-246.734474 0-446.75195 200.023616-446.75195 446.75809 0 246.732427 200.017476 446.75195 446.75195 446.75195 246.733451 0 446.757067-200.019523 446.757067-446.75195C956.746782 139.051195 756.723166-60.972421000000054 509.989715-60.972421000000054L509.989715-60.972421000000054zM509.989715 812.433746c-235.633648 0-426.650123-191.014428-426.650123-426.648077 0-235.639788 191.016475-426.654216 426.650123-426.654216 235.638765 0 426.654216 191.014428 426.654216 426.654216C936.643931 621.419318 745.62848 812.433746 509.989715 812.433746L509.989715 812.433746zM527.863804 153.46957999999995l-35.741016 0L492.122789 367.909533 277.678742 367.909533 277.678742 403.653619l214.443024 0L492.121765 618.0956189999999l35.741016 0L527.862781 403.653619l214.442 0 0-35.744086L527.863804 367.909533 527.863804 153.46957999999995 527.863804 153.46957999999995zM527.863804 153.46957999999995"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="prev-circle" unicode="&#58931;" d="M508.638018 827.97307c-246.403458 0-446.845649-200.463469-446.845649-446.845649 0-246.382179 200.442191-446.845649 446.845649-446.845649 246.382179 0 446.845649 200.463469 446.845649 446.845649C955.483667 627.5096 755.041476 827.97307 508.638018 827.97307zM508.638018-23.16149900000005c-222.933422 0-404.28892 181.355498-404.28892 404.28892 0 222.933422 181.355498 404.28892 404.28892 404.28892 222.912144 0 404.28892-181.355498 404.28892-404.28892C912.926939 158.19399899999996 731.57144-23.16149900000005 508.638018-23.16149900000005zM252.87208 485.1999c8.639016 26.129831-32.470784 37.215859-41.067243 11.32009-27.810822-83.730363-22.321004-168.545923 14.086277-248.573851 11.362646-24.938243 48.025268-3.298146 36.747735 21.491148C230.976644 339.081373 228.806251 412.853462 252.87208 485.1999zM599.262572 247.73335499999996l-127.627629 133.394065 127.47868 133.223838c9.043305 9.064583 9.022026 23.789211-0.021278 32.832516-8.809243 8.830521-24.087108 8.766686-32.832516 0l-148.310199-148.310199c-4.617405-4.638683-6.979303-11.064749-6.553736-17.746156-0.404289-6.702685 1.936331-13.107472 6.575015-17.788712l148.310199-148.28892c4.383343-4.383343 10.213615-6.787798 16.405619-6.787798 6.170726 0 12.000997 2.404455 16.405619 6.787798C608.156928 224.114371 608.156928 238.83899899999994 599.262572 247.73335499999996z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="read" unicode="&#59141;" d="M335.282306 712.495464C399.587328 713.451107 442.778899 696.882717 470.183494 669.3706540000001 479.127332 660.39174 485.691302 650.857363 490.241971 641.442689 492.795622 636.159553 494.049041 632.438701 494.358795 631.0740940000001L493.723712 636.7409230000001 493.723706 196.90019600000005C493.723706 199.018106 495.816045 203.920655 503.591595 207.36436700000002 511.039185 210.66283299999998 515.68422 209.16527399999995 517.176538 207.906613L500.671543 188.33763 521.297207 203.50146800000005C514.140179 213.23636899999997 499.631258 225.71450900000002 476.134074 237.35914000000002 439.577969 255.475456 390.86048 266.10507900000005 328.491925 266.10508200000004 265.860796 266.10508200000004 219.424582 255.71817999999996 186.827162 237.741581 164.977332 225.69198700000004 152.538132 212.28117299999997 147.220271 201.30886999999996L170.257196 190.14374199999997 151.035786 207.05224299999998C152.884078 209.15336100000002 158.307299 211.80336599999998 167.849005 208.050434 177.092077 204.41496099999995 179.2 199.20011699999998 179.2 196.66445199999998L179.2 497.049743 179.2 636.7409230000001 175.817447 624.023021C177.078908 626.226721 180.088681 630.807811 184.828724 636.965629 192.95423 647.521524 202.792594 658.127492 214.297641 668.007961 247.526453 696.544681 287.381649 713.209056 334.514421 712.495571L335.282306 712.495464ZM335.289387 763.689705C274.661039 764.607483 223.081402 743.04085 180.940156 706.850184 156.32698 685.712527 139.975514 664.470237 131.382553 649.4588249999999L128 643.549699 128 636.7409230000001 128 497.049743 128 196.66445199999998C128 159.26104999999995 164.542545 144.88818300000003 189.478606 173.23524099999997L191.776657 175.84764199999995 193.294121 178.978613C194.07832 180.59664399999997 199.156367 186.07133399999998 211.552092 192.907243 236.030601 206.40648099999999 274.024879 214.905082 328.491925 214.905082 383.221547 214.905079 424.163878 205.97190999999998 453.399258 191.483569 469.376966 183.56540600000005 477.614626 176.48075300000005 480.045882 173.17379000000005L481.844905 170.72677999999996 484.166551 168.768644C511.279708 145.90070000000003 544.923706 160.801293 544.923706 196.90019600000005L544.923712 636.740922 544.288627 642.407751C540.427211 659.419023 529.175531 682.697124 506.45814 705.503602 468.987716 743.1209699999999 412.352271 764.846461 334.521502 763.689812L335.289387 763.689705ZM0 506.026694L0 27.856867999999963C0-8.875636999999983 34.793167-23.40043300000002 61.4635 1.2485080000000153L63.46242 3.315859000000046C65.301149 5.444836000000009 69.655573 9.862312999999972 76.498228 15.820363000000043 88.306297 26.101906999999983 102.566352 36.46294 119.251411 46.17438500000003 167.295691 74.13829099999998 224.90855 90.95018200000004 292.337329 90.95018200000004 358.378978 90.95018000000005 409.459345 71.66956600000003 448.125308 39.64774 461.506042 28.56627400000002 472.380655 16.734758000000056 480.912593 4.997000999999955 485.832384-1.7713730000000396 488.762874-6.741985999999997 489.872527-9.02252199999998 496.058545-21.73590200000001 511.379537-27.027375000000006 524.092917-20.84135500000002 536.806298-14.655337000000031 542.097771 0.6656550000000152 535.91175 13.379036000000042 527.471002 30.726293000000055 509.777717 55.06771800000001 480.782336 79.08069999999998 433.134118 118.54132300000003 370.586889 142.15017999999998 292.337329 142.15018199999997 215.474895 142.15018499999996 149.074727 122.77408400000002 93.495781 90.424668 59.761154 70.78961500000003 36.872315 50.859801999999945 24.713677 36.78188399999999L44.088049 20.048869999999965 26.712598 38.84923500000002C28.162783 40.189508000000046 32.877261 41.946117999999956 40.792576 38.64178100000004 49.035365 35.200736000000006 51.2 30.12989200000004 51.2 27.856867999999963L51.2 506.026694C51.2 520.165184 39.73849 531.626694 25.6 531.626694 11.46151 531.626694 0 520.165184 0 506.026694L0 506.026694ZM696.80221 763.689812C618.971441 764.846461 562.335996 743.1209699999999 524.86557 705.503602 502.148181 682.697124 490.896501 659.419023 487.035083 642.407751L486.4 636.740922 486.400004 196.90019600000005C486.400006 160.801293 520.044004 145.90070000000003 547.157161 168.768644L549.478807 170.72677999999996 551.27783 173.17379000000005C553.709086 176.48075300000005 561.946746 183.56540600000005 577.924452 191.483569 607.159834 205.97190999999998 648.102165 214.905079 702.831787 214.905082 757.298833 214.905082 795.293111 206.40648099999999 819.77162 192.907243 832.167345 186.07133399999998 837.245391 180.59664399999997 838.029591 178.978613L839.547055 175.84764199999995 841.845105 173.23524099999997C866.781167 144.88818300000003 903.323712 159.26104999999995 903.323712 196.66445199999998L903.323712 497.049743 903.323712 636.7409230000001 903.323712 643.549699 899.941158 649.4588249999999C891.348196 664.470237 874.996732 685.712527 850.383556 706.850184 808.24231 743.04085 756.662673 764.607483 696.034325 763.689705L696.80221 763.689812ZM696.809291 712.495571C743.942063 713.209056 783.797257 696.544681 817.026071 668.007961 828.531119 658.127492 838.369481 647.521524 846.494989 636.965629 851.235031 630.807811 854.244804 626.226721 855.506263 624.023021L852.123712 636.7409230000001 852.123712 497.049743 852.123712 196.66445199999998C852.123712 199.20011699999998 854.231635 204.41496099999995 863.474707 208.050434 873.016412 211.80336599999998 878.439633 209.15336100000002 880.287925 207.05224299999998L861.066515 190.14374199999997 884.103441 201.30886999999996C878.785579 212.28117299999997 866.346381 225.69198700000004 844.49655 237.741581 811.89913 255.71817999999996 765.462916 266.10508200000004 702.831785 266.10508200000004 640.463232 266.10507900000005 591.745741 255.475456 555.189638 237.35914000000002 531.692454 225.71450900000002 517.183533 213.23636899999997 510.026502 203.50146800000005L530.652166 188.33763 514.147172 207.906613C515.63949 209.16527399999995 520.284527 210.66283299999998 527.732117 207.36436700000002 535.507665 203.920655 537.600004 199.018106 537.600004 196.90019600000005L537.6 636.7409230000001 536.964917 631.0740940000001C537.274671 632.438701 538.52809 636.159553 541.081741 641.442689 545.63241 650.857363 552.196378 660.39174 561.140218 669.3706540000001 588.544813 696.882717 631.736384 713.451107 696.041406 712.495464L696.809291 712.495571ZM972.799998 506.026694L972.799998 27.856867999999963C972.799998 30.12989200000004 974.964631 35.200736000000006 983.207422 38.64178100000004 991.122737 41.946117999999956 995.837214 40.189508000000046 997.287401 38.84923500000002L979.911949 20.048869999999965 999.286321 36.78188399999999C987.127682 50.859801999999945 964.238844 70.78961500000003 930.504218 90.424668 874.925269 122.77408400000002 808.525103 142.15018499999996 731.662669 142.15018199999997 653.132708 142.15017999999998 590.55104 117.26282200000003 543.127755 75.73800100000005 514.370099 50.55719499999998 496.945662 25.10259599999995 488.705389 7.022771000000034 482.841769-5.842485000000011 488.517717-21.02524200000005 501.382974-26.888862000000017 514.248233-32.752481999999986 529.430987-27.07653300000004 535.294607-14.211275 536.420563-11.740835999999945 539.350332-6.450639000000024 544.25735 0.7178109999999833 552.731727 13.097653000000037 563.54464 25.561581000000047 576.856734 37.21792900000003 615.190044 70.78337499999998 665.901421 90.95018000000005 731.662669 90.95018200000004 799.091447 90.95018200000004 856.704307 74.13829099999998 904.748587 46.17438500000003 921.433645 36.46294 935.6937 26.101906999999983 947.501771 15.820363000000043 954.344425 9.862312999999972 958.698848 5.444836000000009 960.537577 3.315859000000046L962.536497 1.2485080000000153C989.206831-23.40043300000002 1023.999998-8.875636999999983 1023.999998 27.856867999999963L1023.999998 506.026694C1023.999998 520.165184 1012.538487 531.626694 998.399998 531.626694 984.261508 531.626694 972.799998 520.165184 972.799998 506.026694L972.799998 506.026694Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="404" unicode="&#58908;" d="M300.197309 299.705317l4.427931 1.803972c1.147982-2.787956 10.167841-7.543882 26.89558-14.267777l5.411915-12.955798c10.659833-24.927611 23.123639-62.483024 37.555413-112.66624 14.431775 5.575913 34.439462 0.983985 60.351057-13.611787l1.803972-4.427931L389.575913 107.828315l18.203716-42.639334c2.459962-5.575913-12.463805-15.579757-44.7713-29.847534-11.151826 7.215887-19.84369 9.675849-26.403587 7.05189l-0.983985 2.131967c-10.823831 25.419603-16.235746 42.311339-16.399744 50.675208l-4.427931-1.803972 6.3959-14.923767-11.151826-4.263933c-41.655349-16.235746-71.830878-18.695708-90.690583-7.871877l-4.427931-1.803972-1.803972 4.263933c-7.05189 16.727739 3.607944 77.406791 32.307495 182.037156 11.479821 4.427931 19.1877 14.923767 22.959641 31.323511C281.337604 290.685458 291.83344 296.425368 300.197309 299.705317L300.197309 299.705317zM216.230621 80.276746c28.371557 19.515695 40.999359 32.799488 38.047406 39.68738-0.983985 2.131967-0.65599 5.575913 0.65599 10.167841l-0.983985 2.131967c-25.5836-21.483664-38.047406-32.963485-37.391416-34.439462C215.246637 88.804612 215.082639 83.064702 216.230621 80.276746L216.230621 80.276746zM216.722614 72.896861l0.983985-2.131967c11.643818 1.147982 21.155669 3.279949 28.699552 6.231903 0.819987 0.327995 7.379885 5.411915 19.84369 15.251762l-0.983985 2.131967c-7.543882-2.951954-12.7918-0.983985-15.743754 6.067905C226.398463 85.032671 215.574632 75.848815 216.722614 72.896861L216.722614 72.896861zM225.90647 143.743754l11.151826 4.263933c-1.147982-2.623959-6.3959-8.691864-15.579757-18.53171-2.295964-10.823831-2.787956-17.547726-1.639974-20.335682 27.715567 20.663677 40.34337 33.783472 37.883408 39.523382l0.819987 10.331839-3.443946-3.935939-9.019859-3.443946-0.983985 2.131967c11.151826 4.263933 17.875721 16.891736 20.49968 37.719411l-0.983985 2.131967C239.35426 172.443306 227.21845 160.307495 227.874439 157.027546L225.90647 143.743754 225.90647 143.743754zM231.646381 173.42729l0.983985-2.131967 2.131967 0.819987c28.371557 23.123639 40.179372 40.179372 35.423447 51.331198 1.475977 0.65599 1.967969 1.639974 1.475977 2.951954l-2.295964-0.819987c-28.863549-21.647662-40.999359-38.047406-36.407431-49.035234C231.482383 175.723254 230.990391 174.73927 231.646381 173.42729L231.646381 173.42729zM240.994234 211.966688l0.983985-2.131967c13.775785 10.331839 35.915439 29.847534 66.418962 58.21909l2.131967 0.819987-6.3959 14.923767 0.491992 5.083921-2.295964-0.819987c-36.571429-32.963485-55.431134-51.82319-56.579116-56.743113L240.994234 211.966688 240.994234 211.966688zM311.67713 107.336323l-35.751441-13.939782c-1.475977-0.491992-6.887892-4.263933-16.235746-11.315823l0.819987-1.967969 12.299808 2.131967 20.007687 7.871877c11.643818 4.591928 32.143498 19.84369 61.171044 46.08328l-6.3959 14.923767-2.131967-0.819987c-24.107623-16.891736-34.439462-29.191544-31.159513-36.899423C315.449071 110.616272 314.629084 108.484305 311.67713 107.336323L311.67713 107.336323zM267.889814 264.773863l0.819987-1.967969c17.875721 16.891736 27.387572 25.419603 28.207559 25.747598l-0.983985 2.131967-8.855862-3.443946C274.941704 282.485586 268.545804 274.941704 267.889814 264.773863L267.889814 264.773863zM275.597694 222.954516c16.071749-37.883408 20.007687-67.894939 11.971813-90.034593l-3.443946-28.863549 26.89558 10.495836c-7.543882 30.011531-18.367713 65.598975-32.471493 106.926329l-0.983985 2.131967L275.597694 222.954516 275.597694 222.954516zM279.369635 231.810378l6.3959-14.923767c13.44779 15.087764 24.435618 24.271621 32.63549 27.55157l-3.607944 8.527867-2.459962 11.643818-2.131967-0.819987C289.045484 247.06214 278.713645 236.566304 279.369635 231.810378L279.369635 231.810378zM292.817425 194.58296c23.943626 17.219731 33.619475 30.995516 29.191544 41.491352l-2.787956 6.3959-2.295964-0.819987c-21.483664-18.859705-30.667521-31.651505-27.879564-38.3754L292.817425 194.58296 292.817425 194.58296zM294.457399 190.483024l2.787956-6.3959 2.295964-11.807816 2.295964 0.819987-0.491992-5.083921 6.3959-14.923767 32.471493 27.387572-6.3959 15.087764c-9.347854-10.331839-16.235746-16.399744-20.827675-18.203716l-2.295964-0.983985c-0.65599 1.639974 6.067905 10.167841 20.335682 25.419603l-3.115951 13.611787-0.983985 2.131967L294.457399 190.483024 294.457399 190.483024zM307.413197 148.171685l2.787956-6.3959 2.295964-11.643818c23.943626 17.219731 35.259449 27.387572 33.94747 30.503523l-5.411915 12.955798C329.224856 165.719411 318.07303 157.191544 307.413197 148.171685L307.413197 148.171685zM355.792441 131.935939c-23.779628-17.711723-34.111467-30.011531-30.995516-37.227418l1.475977-9.347854c25.255605 18.039718 36.899423 29.355541 34.931454 33.783472 24.435618 21.155669 38.703395 32.471493 42.803331 33.94747l-0.819987 1.967969c-1.803972 2.787956-6.723895 4.099936-14.595772 4.427931l-30.831518-31.9795L355.792441 131.935939 355.792441 131.935939zM327.912876 81.26073l4.591928-10.659833-0.491992-5.083921 2.295964 0.819987c23.451634 14.595772 34.275464 23.615631 32.63549 27.55157l-5.411915 12.955798L327.912876 81.26073 327.912876 81.26073zM333.816784 61.253043l5.411915-12.7918c25.747598 13.283792 37.719411 22.139654 35.915439 26.403587l-4.591928 10.659833C348.412556 70.272902 336.112748 62.237028 333.816784 61.253043L333.816784 61.253043zM357.596413 139.971813l1.803972-4.099936c4.919923 1.967969 8.527867 9.839846 10.823831 23.943626l-2.295964-0.819987C364.648302 147.679693 361.204356 141.44779 357.596413 139.971813L357.596413 139.971813zM731.674568 256.081999l3.935939-0.163997c-0.163997-2.459962 4.755926-9.019859 14.759769-19.515695l-0.65599-11.315823c-1.147982-21.975657-5.411915-53.955157-12.955798-95.774504 12.627803-0.65599 25.911595-10.659833 39.68738-30.175529l-0.163997-3.935939-47.887252-10.823831-1.967969-37.719411c-0.327995-4.919923-14.923767-7.379885-43.951313-7.379885-5.575913 9.019859-11.151826 13.775785-16.891736 13.939782l0.163997 1.967969c1.147982 22.467649 3.279949 36.735426 6.231903 42.967329l-3.935939 0.163997-0.65599-13.119795-9.839846 0.491992c-36.571429 1.803972-60.023062 9.839846-70.026906 24.271621l-3.935939 0.163997 0.163997 3.771941c0.819987 14.759769 30.667521 56.087124 89.706598 124.14606 10.167841-0.491992 19.515695 4.755926 28.371557 15.579757C714.290839 255.754004 724.294683 256.573991 731.674568 256.081999L731.674568 256.081999zM587.848815 115.86419l-0.163997-1.967969c9.019859-2.951954 16.891736-4.591928 23.615631-4.919923 0.65599 0 7.379885 1.475977 20.171685 4.755926l0.163997 1.967969c-6.723895 0.327995-9.839846 3.607944-9.511851 9.675849C599.328635 121.6041 588.012812 118.324151 587.848815 115.86419L587.848815 115.86419zM590.144779 121.440102c28.043562 5.083921 42.147341 10.659833 42.475336 16.727739 0.163997 1.803972 1.475977 4.263933 4.099936 7.215887l0.163997 1.967969c-26.731582-7.379885-40.015375-11.807816-40.179372-13.119795C592.440743 128.163997 590.308776 123.900064 590.144779 121.440102L590.144779 121.440102zM620.15631 165.227418l9.839846-0.491992c-1.803972-1.475977-7.871877-4.427931-18.367713-8.527867-5.575913-7.215887-8.527867-12.13581-8.527867-14.595772 28.043562 6.067905 42.147341 11.643818 42.311339 16.727739l4.263933 7.379885-3.935939-1.803972-8.035874 0.327995 0.163997 1.967969c9.839846-0.491992 19.351698 6.559898 28.863549 21.155669l0.163997 1.967969c-26.23959-7.379885-39.68738-12.463805-40.34337-14.923767L620.15631 165.227418 620.15631 165.227418zM670.667521 109.960282l-31.487508 1.475977c-1.31198 0-6.559898-0.983985-16.071749-2.951954l-0.163997-1.803972 9.839846-2.459962 17.711723-0.819987c10.331839-0.491992 30.995516 4.099936 61.991031 13.939782l0.65599 13.119795-1.803972 0.163997c-23.943626-4.591928-36.079436-10.167841-36.407431-16.891736C674.603459 110.944266 673.29148 109.796284 670.667521 109.960282L670.667521 109.960282zM635.244074 185.399103l-0.163997-1.967969 1.803972-0.163997c29.355541 7.70788 44.279308 16.563741 44.7713 26.23959 1.31198 0 2.131967 0.491992 2.131967 1.639974l-1.967969 0.163997c-29.191544-6.3959-44.115311-14.595772-44.607303-24.271621C635.900064 187.039078 635.244074 186.547085 635.244074 185.399103L635.244074 185.399103zM685.755285 207.37476c-1.803972-33.29148-9.675849-56.907111-23.615631-70.682896l-12.955798-20.171685 23.779628-1.147982c5.247918 24.763613 10.167841 54.611147 14.595772 89.870596l0.163997 1.967969L685.755285 207.37476 685.755285 207.37476zM656.071749 210.818706l-0.163997-1.967969c13.939782 3.115951 37.391416 10.167841 70.354901 21.155669l1.803972-0.163997 0.65599 13.119795 2.295964 3.607944-1.967969 0.163997c-39.03139-12.299808-59.859065-20.007687-62.483024-23.287636L656.071749 210.818706 656.071749 210.818706zM670.339526 68.46893l-0.65599-11.315823c23.943626 1.31198 35.915439 3.935939 36.079436 7.70788l0.491992 9.347854C684.443306 70.272902 672.471493 68.304933 670.339526 68.46893L670.339526 68.46893zM673.29148 85.196669l-0.491992-9.347854-2.295964-3.607944 1.967969-0.163997c22.631646 2.951954 33.94747 6.231903 34.111467 9.511851l0.65599 11.315823L673.29148 85.196669 673.29148 85.196669zM712.158873 113.568225c-23.943626-5.247918-36.079436-10.987828-36.407431-17.219731l-2.295964-7.379885c25.255605 5.083921 37.883408 9.511851 38.211403 13.44779 25.747598 7.543882 40.34337 11.151826 43.951313 10.987828l0.163997 1.803972c-0.327995 2.623959-3.443946 5.247918-9.347854 8.035874l-34.439462-13.44779L712.158873 113.568225 712.158873 113.568225zM682.147341 141.611787l-0.327995-5.73991-2.459962-9.347854c23.943626 4.755926 36.079436 8.691864 36.079436 11.479821l0.65599 11.315823C704.778988 147.351698 693.463165 144.727739 682.147341 141.611787L682.147341 141.611787zM688.051249 177.199231l-0.327995-5.73991-2.623959-9.511851 1.967969-0.163997-2.295964-3.607944-0.65599-13.119795 33.94747 9.511851 0.65599 13.283792c-10.659833-4.591928-18.039718-6.723895-21.975657-6.559898l-1.967969 0.163997c0 1.475977 8.199872 5.411915 24.271621 12.13581l2.623959 11.151826 0.163997 1.967969L688.051249 177.199231 688.051249 177.199231zM688.215247 180.807175c23.943626 4.755926 36.243434 11.807816 36.735426 20.991672l0.327995 5.73991-1.967969 0.163997c-22.631646-6.887892-34.275464-13.283792-34.603459-19.1877L688.215247 180.807175 688.215247 180.807175zM691.82319 212.786675l-0.65599-13.119795c15.415759 6.723895 26.89558 10.003844 34.111467 9.511851l0.327995 7.543882 2.459962 9.511851-1.803972 0.163997C704.450993 220.986547 692.971172 216.558616 691.82319 212.786675L691.82319 212.786675zM695.103139 240.994234l-0.163997-1.803972c19.351698 6.559898 29.355541 9.839846 30.339526 9.839846l0.163997 1.967969-7.871877 0.327995C706.746957 251.818065 699.367072 248.374119 695.103139 240.994234L695.103139 240.994234zM716.422806 118.980141l-0.163997-3.607944c4.427931-0.163997 10.003844 4.427931 16.727739 14.10378l-1.967969 0.163997C724.45868 122.26009 719.538757 118.816143 716.422806 118.980141L716.422806 118.980141zM479.118514 382.196028c53.627162 10.167841 89.870596 1.967969 109.222293-24.599616 9.675849-18.695708 15.579757-33.455477 17.875721-44.279308 11.807816-56.743113-5.903908-103.154388-53.299167-138.741832-12.463805-5.083921-22.631646-8.363869-30.339526-10.003844-31.651505-6.067905-63.631006 5.083921-95.938501 33.455477-9.347854 16.399744-15.251762 31.159513-18.039718 44.279308-13.283792 63.795003 1.967969 108.238309 45.919283 133.165919L479.118514 382.196028 479.118514 382.196028zM410.075593 265.429853c6.231903 5.247918 11.479821 8.199872 15.579757 9.019859-9.675849-9.347854-14.431775-15.087764-13.939782-17.219731-0.327995-5.411915-0.163997-10.167841 0.819987-14.267777l2.131967 0.327995c24.271621 15.743754 35.915439 25.5836 35.095452 29.519539l-2.131967 10.003844c-4.099936-3.607944-8.035874-5.73991-11.643818-6.559898l-0.819987 4.099936c10.823831 2.131967 15.251762 11.971813 13.44779 29.519539l-1.967969-0.327995c-22.467649-16.399744-34.603459-27.715567-36.407431-33.94747C409.255605 273.30173 409.255605 269.857783 410.075593 265.429853L410.075593 265.429853zM410.23959 286.257527c33.127482 21.647662 47.887252 40.34337 44.607303 56.251121-29.683536-23.615631-44.443306-36.079436-44.279308-37.555413C409.747598 295.769379 409.5836 289.537476 410.23959 286.257527L410.23959 286.257527zM412.699552 315.777066l0.491992-2.131967c27.059577 20.663677 44.607303 37.227418 52.643177 49.527226 10.331839 1.967969 17.055734 7.379885 20.49968 16.235746l-2.131967-0.491992C447.303011 372.028187 423.523382 350.872518 412.699552 315.777066L412.699552 315.777066zM414.339526 234.926329c2.459962-4.919923 4.263933-9.347854 5.083921-13.44779 18.859705 14.759769 30.339526 22.467649 34.111467 23.123639l-3.771941 18.039718C444.18706 261.493914 432.379244 252.310058 414.339526 234.926329L414.339526 234.926329zM421.883408 220.002562c2.131967-9.839846 5.247918-14.759769 9.675849-14.759769l27.879564 21.975657c-0.327995 1.147982-2.131967 6.231903-5.411915 15.415759C437.299167 228.530429 426.639334 220.986547 421.883408 220.002562L421.883408 220.002562zM432.707239 199.174888c5.083921-5.903908 8.527867-8.691864 10.495836-8.363869l3.935939 0.819987c10.987828 10.495836 19.1877 16.235746 24.599616 17.219731-0.819987 3.935939-3.935939 8.855862-9.511851 14.759769C442.21909 209.014734 432.379244 200.814862 432.707239 199.174888L432.707239 199.174888zM448.450993 185.563101l0.491992-2.131967c2.459962 0.491992 6.3959-0.819987 11.807816-3.771941 18.859705 10.003844 28.207559 16.727739 28.207559 19.84369-6.067905 1.639974-9.511851 4.427931-10.331839 8.363869C466.818706 202.946829 456.814862 195.566944 448.450993 185.563101L448.450993 185.563101zM469.442665 179.331198l0.491992-2.131967 14.923767 0.65599 12.627803 2.459962c2.459962 0.491992 8.199872 3.771941 17.547726 9.839846l-0.491992 2.131967c-6.887892-1.31198-13.611787 0.163997-20.49968 4.263933L469.442665 179.331198 469.442665 179.331198zM476.494555 249.030109l4.591928-21.811659c2.951954-14.431775 12.463805-25.091608 28.535554-31.9795l4.099936 0.819987c24.599616 34.275464 32.143498 73.798847 22.795644 118.570147l-2.459962 11.971813-6.231903 19.515695-6.067905-1.147982c-3.935939-0.819987-14.267777 0-30.831518 2.295964C473.870596 316.597053 469.278668 283.961563 476.494555 249.030109L476.494555 249.030109zM476.494555 363.172325l0.327995-1.967969c10.823831-2.131967 17.547726-3.115951 20.007687-2.623959 13.939782 10.167841 21.647662 17.875721 23.287636 23.287636l-21.319667-1.967969C496.174247 379.408072 488.630365 373.832159 476.494555 363.172325L476.494555 363.172325zM508.966047 363.172325l3.771941 2.787956c1.147982 0.163997 6.231903-2.951954 15.087764-9.675849 10.331839 13.119795 18.203716 20.171685 23.779628 21.155669-0.65599 2.951954-8.199872 4.263933-22.467649 4.099936C515.361947 370.716208 508.638053 364.648302 508.966047 363.172325L508.966047 363.172325zM511.590006 185.235106l0.491992-2.131967 4.099936 0.819987c19.84369 3.771941 35.751441 17.219731 47.723254 40.34337C554.557335 214.754644 537.173607 201.634849 511.590006 185.235106L511.590006 185.235106zM521.921845 197.534914c38.211403 24.271621 56.087124 42.311339 53.79116 53.79116 1.967969 4.919923 2.623959 8.527867 2.295964 10.823831-35.095452-26.567585-51.495195-44.935298-49.363229-54.939142C526.349776 206.71877 524.217809 203.602819 521.921845 197.534914L521.921845 197.534914zM528.64574 352.348495l7.543882-15.251762 2.131967 0.491992c4.263933 5.73991 13.283792 14.431775 27.059577 25.911595l-0.491992 2.131967c-5.411915 5.247918-8.363869 8.855862-8.855862 10.823831l-4.099936-0.819987L528.64574 352.348495 528.64574 352.348495zM536.845612 333.324792l4.263933-9.675849-0.491992-8.363869 4.099936 0.819987c19.515695 17.711723 29.027546 27.059577 28.863549 28.371557l-0.491992 2.131967c-1.967969 9.347854-4.263933 13.611787-7.05189 13.119795C548.817425 342.508648 539.141576 333.652787 536.845612 333.324792L536.845612 333.324792zM539.797566 236.402306c27.715567 19.84369 40.999359 32.63549 39.68738 38.703395 1.31198 7.215887 1.803972 12.13581 1.147982 14.759769l-1.967969-0.327995-35.095452-29.519539C540.78155 245.586163 539.469571 237.714286 539.797566 236.402306L539.797566 236.402306zM542.257527 307.413197l2.459962-11.971813 10.003844 3.935939c-7.05189-7.871877-10.331839-12.627803-10.003844-14.267777-0.65599-10.495836-0.819987-16.727739-0.327995-18.695708 18.695708 13.611787 30.831518 24.927611 36.243434 33.94747l-2.459962 11.971813c-7.05189-7.05189-12.7918-10.987828-16.727739-11.807816 8.035874 11.315823 13.939782 17.383728 17.711723 18.039718l-4.099936 19.84369C554.557335 320.532992 543.733504 310.201153 542.257527 307.413197L542.257527 307.413197zM307.249199 569.153107c-9.675849 0-17.711723-6.887892-19.84369-16.071749-4.263933-12.463805 1.639974-28.863549 29.519539-35.751441 1.31198 35.587444 0 49.527226 0 49.527226C313.809097 568.33312 310.693145 569.153107 307.249199 569.153107L307.249199 569.153107zM709.862908 537.173607c0-1.147982 0-2.131967-0.163997-3.115951 2.131967 3.279949 3.279949 7.215887 3.279949 11.479821 0 11.643818-9.183857 21.155669-20.49968 21.155669-3.443946 0-6.723895-0.819987-9.511851-2.459962C697.891095 563.905189 709.862908 551.933376 709.862908 537.173607L709.862908 537.173607zM531.761691 520.281871c0.65599 15.743754-32.963485 49.199231-32.963485 49.199231 0-18.203716 9.347854-42.803331 12.463805-48.707239-8.035874-11.643818-13.283792-32.307495-13.283792-32.307495S531.105701 504.374119 531.761691 520.281871L531.761691 520.281871zM488.794363 507.326073c2.459962 0 4.427931 1.967969 4.427931 4.427931 0 2.459962-1.967969 4.427931-4.427931 4.427931-2.459962 0-4.427931-1.967969-4.427931-4.427931C484.366432 509.294042 486.334401 507.326073 488.794363 507.326073L488.794363 507.326073zM445.335042 629.668161c-0.819987 8.855862-2.131967 16.235746-2.131967 16.235746s-53.627162 7.05189-63.959001-30.503523C395.151826 632.94811 427.623318 631.144138 445.335042 629.668161L445.335042 629.668161zM620.648302 614.908392c-9.675849 37.719411-63.303011 31.651505-63.303011 31.651505s-1.475977-7.379885-2.459962-16.235746C572.597053 631.636131 605.232543 632.784113 620.648302 614.908392L620.648302 614.908392zM419.587444 518.313901c29.847534 0 53.955157 21.975657 53.955157 49.035234 0 27.059577-24.271621 49.035234-53.955157 49.035234-29.847534 0-53.955157-21.975657-53.955157-49.035234C365.632287 540.289558 389.903908 518.313901 419.587444 518.313901L419.587444 518.313901zM419.587444 613.76041c28.371557 0 51.331198-20.827675 51.331198-46.411275 0-25.5836-22.959641-46.411275-51.331198-46.411275-28.207559 0-51.331198 20.827675-51.331198 46.411275C368.256246 592.932735 391.379885 613.76041 419.587444 613.76041L419.587444 613.76041zM419.587444 534.38565c20.007687 0 36.243434 14.759769 36.243434 32.799488 0 18.203716-16.235746 32.799488-36.243434 32.799488s-36.243434-14.759769-36.243434-32.799488C383.34401 549.14542 399.579757 534.38565 419.587444 534.38565L419.587444 534.38565zM435.331198 552.261371c1.967969 2.131967 4.919923 2.623959 6.559898 1.147982 1.639974-1.475977 1.475977-4.263933-0.491992-6.3959-1.967969-2.131967-4.919923-2.623959-6.559898-1.147982C433.035234 547.341448 433.199231 550.129404 435.331198 552.261371L435.331198 552.261371zM395.971813 585.880846c5.411915 5.73991 13.283792 7.05189 17.875721 3.115951 4.591928-3.935939 3.935939-11.807816-1.475977-17.547726-5.411915-5.73991-13.283792-7.05189-17.875721-3.115951C389.903908 572.433056 390.559898 580.304933 395.971813 585.880846L395.971813 585.880846zM584.240871 518.313901c29.847534 0 53.955157 21.975657 53.955157 49.035234 0 27.059577-24.271621 49.035234-53.955157 49.035234-29.847534 0-53.955157-21.975657-53.955157-49.035234C530.121717 540.289558 554.393338 518.313901 584.240871 518.313901L584.240871 518.313901zM584.240871 613.76041c28.371557 0 51.331198-20.827675 51.331198-46.411275 0-25.5836-22.959641-46.411275-51.331198-46.411275-28.207559 0-51.331198 20.827675-51.331198 46.411275C532.909673 592.932735 555.869315 613.76041 584.240871 613.76041L584.240871 613.76041zM584.240871 534.38565c20.007687 0 36.243434 14.759769 36.243434 32.799488 0 18.203716-16.235746 32.799488-36.243434 32.799488-20.007687 0-36.243434-14.759769-36.243434-32.799488C547.997438 549.14542 564.233184 534.38565 584.240871 534.38565L584.240871 534.38565zM599.820628 552.261371c1.967969 2.131967 4.919923 2.623959 6.559898 1.147982 1.639974-1.475977 1.475977-4.263933-0.491992-6.3959-1.967969-2.131967-4.919923-2.623959-6.559898-1.147982C597.688661 547.341448 597.852659 550.129404 599.820628 552.261371L599.820628 552.261371zM560.62524 585.880846c5.411915 5.73991 13.283792 7.05189 17.875721 3.115951 4.591928-3.935939 3.935939-11.807816-1.475977-17.547726-5.411915-5.73991-13.283792-7.05189-17.875721-3.115951C554.557335 572.433056 555.213325 580.304933 560.62524 585.880846L560.62524 585.880846zM957.171044 381.540038C957.171044 381.540038 957.171044 381.540038 957.171044 381.540038c-0.65599 0.983985-1.31198 1.803972-1.967969 2.951954-0.327995 0.327995-0.491992 0.65599-0.819987 0.983985-0.327995 0.327995-1.967969 0.65599-2.295964 0.983985-11.315823 14.759769-29.355541 40.34337-62.975016 46.247277l0 34.931454c0 4.263933-0.819987 8.691864-5.083921 8.691864L685.919283 476.330557c-0.163997 10.331839-0.327995 18.203716-0.65599 27.879564 24.435618 1.803972 43.295324 19.351698 43.295324 41.491352 0 22.467649-19.84369 40.671365-45.263293 41.819347-1.967969 78.226778-5.903908 143.98975-7.70788 150.549648l-0.491992 0.983985c-1.967969 2.295964-9.511851 5.247918-21.155669 8.363869 0.327995 13.939782-3.279949 29.355541-11.643818 46.08328 3.443946-21.647662-22.795644-36.079436-26.567585-38.047406-0.163997 0-0.327995 0-0.491992 0 0.163997 4.427931 0 57.727098-88.230621 97.90647-1.475977-44.115311-14.10378-70.682896-31.9795-86.754644L494.534273 766.606022l-5.411915-0.327995 0-0.163997 0 0 0 0 0.327995 0 0.327995-0.163997c-0.819987-0.163997-0.983985-0.491992-1.147982-1.147982-10.331839-8.035874-28.043562-18.203716-64.450993-18.203716-13.283792 0-28.207559 1.31198-44.607303 3.935939-4.099936 0.819987-7.70788 1.147982-11.151826 1.147982-5.575913 0-10.003844-0.983985-16.071749-2.295964l-0.327995 0-0.327995-0.163997c-17.547726-4.099936-27.55157-7.70788-30.011531-10.659833l-0.491992-0.983985c-0.491992-2.131967-2.295964-8.363869-5.73991-150.549648-25.255605-0.983985-45.263293-19.351698-45.263293-41.983344 0-22.139654 18.859705-39.523382 43.459321-41.163357-0.163997-9.675849-0.327995-17.547726-0.65599-27.879564L132.099936 476.002562c-4.427931 0-10.495836-4.591928-10.495836-8.691864l0-97.414478c-11.807816-0.65599-19.679693-2.295964-26.731582-4.755926-29.027546-10.495836-35.751441-35.915439-35.587444-60.023062 0-1.475977 0.491992-2.787956 0.983985-3.771941-6.723895-11.643818-6.231903-25.5836-5.083921-35.587444 0.983985-8.035874 2.623959-12.13581 4.427931-13.939782-4.263933-8.855862-0.983985-18.859705 1.967969-26.731582 3.771941-10.167841 12.13581-11.971813 22.139654-10.003844-4.755926-9.019859-2.459962-17.219731 11.643818-28.699552 4.427931-3.607944 14.267777 7.05189 26.075593 16.071749l0-267.151826c0-4.263933 6.067905-6.067905 10.331839-6.067905l751.928251 0c4.427931 0 5.083921 1.803972 5.083921 6.067905L888.784113 248.374119c16.727739 0.983985 29.355541 7.70788 38.539398 19.84369 4.591928 6.231903 7.871877 11.807816 8.691864 16.891736C977.670724 313.153107 982.262652 344.640615 957.171044 381.540038L957.171044 381.540038zM316.433056 508.638053c-22.959641 0.491992-40.835362 16.727739-40.835362 36.735426 0 20.335682 18.859705 36.899423 41.983344 36.899423l0 2.623959 0.163997-0.65599c0-0.819987 0-1.475977 0-2.295964 0.491992 0.163997 0.983985 0.163997 1.475977 0.327995l1.803972 0 0 0.491992c5.247918 1.31198 12.7918 2.951954 19.351698 3.771941 10.003844 35.095452 34.111467 64.122998 34.111467 64.122998s-9.839846 28.863549-13.939782 67.238949c51.167201-85.11467 229.268418-81.178732 280.107623-10.823831-4.591928-32.799488-12.627803-56.415119-12.627803-56.415119s24.107623-28.863549 34.111467-64.122998c6.559898-0.819987 13.939782-1.147982 19.023703-2.295964 0 0.491992 0 2.623959 0 2.623959l0.491992 0c23.123639 0 41.983344-18.695708 41.983344-39.03139 0-9.347854-3.935939-18.695708-10.495836-25.419603-10.167841-6.723895-25.091608-10.331839-40.835362-10.331839 0-6.723895 0.983985-19.351698 1.803972-35.423447L318.401025 476.658552c0.163997 10.331839 0.491992 19.84369 0.65599 30.175529l0 2.131967L316.433056 508.638053 316.433056 508.638053zM126.524023 462.554773c0 4.099936 6.3959 9.183857 10.823831 9.183857l741.432415 0c4.263933 0 5.575913-4.919923 5.575913-9.183857l0-29.027546c0 0.491992-6.723895 1.475977-10.823831 1.147982-22.795644-2.295964-44.443306-3.607944-60.679052-9.183857L176.215247 425.491352l-1.31198-2.787956 0-60.18706c-10.823831 5.903908-25.5836 8.363869-48.215247 7.871877L126.68802 462.554773 126.524023 462.554773zM821.381166-13.693786 180.807175-13.693786 180.807175 282.649584c10.823831 4.263933 15.579757 10.987828 15.087764 21.975657-0.491992 8.363869-4.263933 13.611787-15.087764 16.727739l0 7.379885c5.903908 1.967969 3.935939 4.263933 5.247918 6.723895 5.411915 10.495836 5.575913 18.203716-5.247918 23.779628l0 55.759129 615.318386 0c-2.787956-5.575913-4.755926-7.871877-5.575913-12.299808-1.475977-8.035874-1.639974-18.367713-1.147982-28.207559L697.891095 315.449071c0 0-28.371557-15.251762-16.727739-32.799488 11.643818-17.383728 32.307495-11.479821 50.511211-0.327995 12.13581 7.379885 39.68738 23.287636 63.959001 40.179372 0.163997-0.163997 0.327995-0.163997 0.491992-0.327995-1.803972-1.31198-2.951954-2.295964-2.951954-2.295964-11.151826-7.543882-6.887892-36.899423 15.415759-41.327354 3.115951-0.65599 9.675849 0 9.675849 1.147982l0-293.391416L821.381166-13.693786 821.381166-13.693786zM177.855221 271.169763c0 3.443946-2.131967 6.231903-4.755926 8.035874 1.639974 0.491992 3.771941 0.983985 4.755926 1.475977L177.855221 271.169763 177.855221 271.169763zM177.855221 322.828956c-0.983985 0.163997-1.639974 0.327995-2.459962 0.491992 0.819987 0.491992 1.475977 0.983985 2.459962 1.475977L177.855221 322.828956 177.855221 322.828956zM878.780269-65.516976 137.347854-65.516976c-4.263933 0-10.823831 2.131967-10.823831 6.3959L126.524023 206.882767c5.903908 1.147982 4.919923 2.295964 6.723895 3.279949 19.679693 8.035874 38.047406 25.255605 25.747598 33.127482-0.163997 0-1.475977 0.163997-1.639974 0.163997 9.511851 3.771941 17.547726 9.839846 17.547726 20.663677l0-289.29148 655.169763 2.459962 0 291.915439c9.839846-9.675849 21.647662-14.595772 34.603459-10.331839 3.279949-6.559898 13.611787-9.839846 19.515695-10.331839l0-307.495195C884.192184-63.38501 883.044202-65.516976 878.780269-65.516976L878.780269-65.516976zM878.780269-65.516976"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="carousel" unicode="&#58932;" d="M1002.069333 144.38400000000001L1002.069333 611.6906670000001c0 24.213333-16.917333 49.578667-42.069333 49.578667l-64 0 1.152 6.4c0 31.338667-26.005333 57.6-58.538667 57.6L186.432 725.269333c-31.936 0-58.410667-31.957333-58.410667-64l-0.213333 0.96L67.178667 662.229333c-25.152 0-45.226667-20.288-45.226667-44.501333l0-467.328L21.354667 150.39999999999998c0-24.789333 20.629333-44.693333 45.312-44.693333L127.786667 105.70666700000004l0-5.184C127.786667 69.03466700000001 153.792 42.66666699999996 186.432 42.66666699999996l652.842667 0c31.658667 0 56.277333 10.901333 56.725333 42.602667l64 0c24.661333 0 42.666667 34.325333 42.666667 59.114667L1002.069333 144.38400000000001zM128 149.26933299999996L64 149.26933299999996l0 469.333333 64 0L128 149.26933299999996zM853.333333 106.602667c0-6.421333-14.848-21.333333-21.333333-21.333333l-640 0c-6.485333 0-21.333333 14.848-21.333333 21.333333l0 554.666667c0 6.378667 9.258667 18.56 15.744 18.56l5.589333 2.773333 640 0c6.442667 0 21.333333-14.954667 21.333333-21.333333L853.333333 106.602667zM960 127.93600000000004l-64 0 0 490.666667 60.842667 1.984c4.970667 0 3.157333 2.944 3.157333-1.984l0-469.333333C960 144.29866700000002 965.013333 127.93600000000004 960 127.93600000000004zM412.458667 399.829333c43.925333 0 79.637333 34.773333 79.637333 77.482667 0 42.752-35.712 77.482667-79.637333 77.482667-43.925333 0-79.637333-34.730667-79.637333-77.482667C332.8 434.602667 368.533333 399.829333 412.458667 399.829333zM412.458667 516.0533330000001c21.952 0 39.829333-17.365333 39.829333-38.741333 0-21.333333-17.877333-38.741333-39.829333-38.741333-21.952 0-39.829333 17.408-39.829333 38.741333C372.629333 498.709333 390.506667 516.0533330000001 412.458667 516.0533330000001zM785.92 457.386667c-95.914667-23.338667-137.728-87.765333-168.256-134.805333-24.213333-37.269333-39.082667-58.346667-65.109333-58.346667l-0.042667 0c-35.456 0-57.109333 14.272-80.042667 28.16-24.362667 14.741333-49.536 29.952-88.64 29.952-75.648 0-156.906667-93.269333-165.930667-103.893333L213.333333 167.38133300000004c0-10.709333 8.917333-18.112 19.925333-18.112l557.504 0c10.986667 0 19.904 7.402667 19.904 18.112L810.666667 438.570667c0 5.973333-2.837333 11.626667-7.658667 15.296C798.186667 457.536 791.872 458.858667 785.92 457.386667zM770.858667 188.52266699999996L253.162667 188.52266699999996c24.874667 27.733333 85.290667 95.082667 130.666667 95.082667 27.733333 0 46.229333-11.157333 67.605333-24.128 25.152-15.168 53.632-32.426667 99.712-33.941333l2.944-0.064c47.637333 0 71.722667 37.12 97.237333 76.416 26.645333 41.088 56.469333 79.104 119.530667 102.485333L770.858667 188.52266699999996z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="help" unicode="&#58887;" d="M690.2 741.8C635.2 783.6 573.2 798 494.6 798c-59.6 0-110.6-12.2-151-39.4C284 718 256 649.8 256 542l153.6 0c0 28.8-2.8 59.8 14 86.4 16.8 26.6 40.2 47 80.4 47 40.8 0 61.8-11.8 81.6-36.2 16.8-20.8 23.2-45.6 23.2-72 0-22.8-11.6-43.8-25.4-62.8-7.6-11.2-17.6-21.2-30.2-30.8 0 0-83-49.4-112.2-96.2-21.8-34.8-29.6-78.4-31.4-130.6-0.2-3.8 1.2-11.6 14.4-11.6 13 0 112 0 123.6 0 11.6 0 14 8.8 14.2 12.4 0.8 19 3.2 48.2 6.6 59.2 6.6 20.8 19.4 39 39.4 54.6l41.4 28.6c37.4 29.2 67.2 53 80.4 71.8 22.6 30.8 38.4 68.8 38.4 113.8C768 649 741 703.2 690.2 741.8zM484 155.6c-51.8 1.6-94.6-34.4-96.4-90.6-1.6-56.4 39-93.4 91-95 54-1.6 95.8 33.2 97.4 89.4C577.6 115.6 538 154 484 155.6z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="code-circle" unicode="&#58933;" d="M513.544163 893.525741c-282.101629 0-510.78094-228.679311-510.78094-510.76288 0-282.083569 228.679311-510.76288 510.78094-510.76288s510.76288 228.679311 510.76288 510.76288C1024.325103 664.8464309999999 795.645793 893.525741 513.544163 893.525741zM513.544163-83.46335899999997c-257.503523 0-466.22622 208.740757-466.22622 466.22622S256.0587 848.989082 513.544163 848.989082s466.22622-208.740757 466.22622-466.22622S771.047686-83.46335899999997 513.544163-83.46335899999997zM171.771357 359.77212099999997L414.357086 256.088033 414.357086 300.805295 221.978945 380.50532599999997 414.357086 459.464886 414.357086 504.182148 171.771357 401.76228ZM442.585309 193.38272800000004L478.814238 193.38272800000004 584.737801 572.1429949999999 548.743656 572.1429949999999ZM612.749301 504.182148L612.749301 459.464886 804.874598 380.50532599999997 612.749301 300.805295 612.749301 256.088033 855.33503 359.77212099999997 855.33503 401.76228Z"  horiz-adv-x="1025" />
+
+    
+    <glyph glyph-name="windows" unicode="&#59007;" d="M437 329l0-325.5-341 47 0 278.5 341 0zm0 371.5l0-329.5-341 0 0 282.5zm491-371.5l0-393-453.5 62.5 0 330.5 453.5 0zm0 439l0-397-453.5 0 0 334.5z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="water" unicode="&#58934;" d="M862.315763 33.684211000000005C802.869868 33.684211000000005 754.526289 82.94399999999996 754.526289 143.50371900000005 754.526289 162.33094700000004 759.35885 180.96056099999998 768.520956 197.43438600000002 768.64671 197.79368399999998 768.808394 198.15298199999995 769.006008 198.49431600000003L849.075622 334.542596 849.057657 334.542596 862.315763 357.052632 875.573868 334.542596 875.573868 334.542596 955.140464 199.356632C955.715341 198.67396499999995 956.164464 197.865544 956.380043 196.96729800000003 965.380464 180.60126300000002 970.123201 162.151298 970.105236 143.50371900000005 970.105236 82.94399999999996 921.761657 33.684211000000005 862.315763 33.684211000000005L862.315763 33.684211000000005ZM924.33064 188.57768399999998C924.204885 188.79326300000002 924.115061 189.02680699999996 924.025236 189.27831600000002L862.315763 302.996211 800.606289 189.260351C800.516464 189.02680699999996 800.42664 188.79326300000002 800.300885 188.57768399999998 793.977236 176.505263 790.635763 162.81600000000003 790.635763 148.965053 790.635763 105.29235100000005 822.792956 69.75775399999998 862.333727 69.75775399999998 901.856534 69.75775399999998 933.995763 105.29235100000005 933.995763 148.98301800000002 933.995763 162.81600000000003 930.654289 176.52322800000002 924.33064 188.57768399999998L924.33064 188.57768399999998ZM682.684605 392.982456C593.50678 392.982456 520.982429 469.602807 520.982429 563.8108070000001 520.982429 593.093614 528.240254 622.071018 541.965447 647.706947 542.163061 648.281825 542.396605 648.820772 542.684043 649.341754L662.815412 860.968421 662.797447 860.968421 682.684605 896 702.571763 860.968421 702.535833 860.968421 821.89471 650.689123C822.774991 649.647158 823.439692 648.3716489999999 823.781026 646.970386 837.25471 621.514105 844.368815 592.8241399999999 844.35085 563.8108070000001 844.35085 469.602807 771.844464 392.982456 682.684605 392.982456L682.684605 392.982456ZM791.408254 630.1192980000001C791.21064 630.4965609999999 791.030991 630.891789 790.887271 631.322947L682.684605 823.924772 574.446008 631.287018C574.320254 630.891789 574.140605 630.4965609999999 573.942991 630.1013330000001 562.840675 609.6931930000001 556.912254 596.075789 556.912254 572.631579 556.912254 498.634105 613.375973 428.876351 682.684605 428.876351 751.993236 428.876351 808.367131 489.058807 808.367131 563.056281 808.367131 586.500491 802.492605 609.6931930000001 791.408254 630.1192980000001L791.408254 630.1192980000001ZM538.695833 276.983018C540.115061 275.330246 541.174991 273.33614 541.713938 271.12645599999996 563.433517 231.11859600000003 574.895131 186.02666699999997 574.895131 140.43171900000004 574.895131-7.581192999999985 458.051341-128 314.403903-128 170.738499-128 53.89471-7.581192999999985 53.89471 140.43171900000004 53.89471 186.47578899999996 65.589868 231.998877 87.704675 272.294175 88.010078 273.17445599999996 88.387341 274.01880700000004 88.872394 274.863158L282.408394 607.411649 282.372464 607.411649 314.403903 662.45614 346.453306 607.411649 346.399412 607.411649 538.695833 276.983018 538.695833 276.983018ZM314.403903 590.614456L119.807973 257.79649099999995C119.556464 257.113825 119.251061 256.449123 118.873798 255.78442099999995 98.932745 220.48336800000004 88.387341 180.42161399999998 88.387341 139.91073700000004 88.387341 12.072420999999963 189.799271-91.89052600000002 314.421868-91.89052600000002 439.026499-91.89052600000002 540.420464 12.072420999999963 540.402499 139.91073700000004 540.402499 180.42161399999998 529.857096 220.50133300000005 509.916043 255.78442099999995 509.53878 256.449123 509.233377 257.131789 508.963903 257.86835099999996L314.403903 590.614456 314.403903 590.614456Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="username" unicode="&#58991;" d="M514.594 824.888c-144.11 0-260.979-118.46-260.979-264.558 0-88.783 43.497-166.928 109.711-214.898-135.361-59.354-230.159-195.858-230.159-354.931h0.894c1.541-21.375 18.641-38.377 40.117-38.377s38.575 17.051 40.117 38.377h0.645c0 0.944-0.099 1.79-0.099 2.734 0 0.05 0 0.099 0 0.149 0 0.099-0.05 0.149-0.05 0.199 0.05 159.967 120 291.054 273.009 304.924 8.948-0.944 17.598-2.734 26.844-2.734 144.11 0 260.979 118.46 260.979 264.558s-116.919 264.558-261.029 264.558zM514.594 377.54499999999996c-99.769 0-180.698 81.972-180.698 183.183s80.879 183.183 180.698 183.183c99.719 0 180.647-81.972 180.647-183.183s-80.879-183.183-180.647-183.183zM896.021-6.615000000000009c0 0.348-0.199 0.645-0.199 0.994-1.043 105.038-43.397 200.034-111.35 269.131v0c-7.157 7.357-17.001 11.98-27.986 11.98-21.574 0-39.122-17.747-39.122-39.668 0-11.135 4.573-21.127 11.83-28.334l-0.099-0.05c52.742-55.229 85.302-130.589 85.302-213.853 0-1.043-0.149-1.987-0.149-3.034h0.994c1.491-21.375 18.691-38.377 40.117-38.377 21.475 0 38.575 17.051 40.117 38.377h0.597c0 0.796-0.099 1.491-0.099 2.287-0.05 0.149 0.05 0.348 0.05 0.547z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="find-fill" unicode="&#58992;" d="M512 896C229.236364 896 0 666.763636 0 384c0-282.786909 229.236364-512 512-512s512 229.213091 512 512C1024 666.763636 794.763636 896 512 896zM657.291636 383.976727c0-77.195636-60.392727-139.729455-136.424727-144.407273l-175.732364-151.714909-22.877091 13.242182 58.228364 222.021818c-8.634182 18.548364-13.800727 39.074909-13.800727 60.858182 0 77.195636 60.369455 139.729455 136.378182 144.430545l175.802182 151.714909 22.877091-13.172364-58.251636-222.068364C652.125091 426.309818 657.291636 405.806545 657.291636 383.976727zM512 384m-66.048 0a2.838 2.838 0 1 1 132.096 0 2.838 2.838 0 1 1-132.096 0Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="about" unicode="&#58891;" d="M514.27174 834.607768c-249.516844 0-451.789687-202.272843-451.789687-451.789687s202.272843-451.789687 451.789687-451.789687 451.789687 202.272843 451.789687 451.789687S763.788583 834.607768 514.27174 834.607768zM514.27174-20.12919999999997c-222.541469 0-402.947282 180.405813-402.947282 402.947282s180.405813 402.947282 402.947282 402.947282 402.947282-180.405813 402.947282-402.947282S736.814232-20.12919999999997 514.27174-20.12919999999997zM514.295276 593.979362c-9.44614-10.360975-14.307867-22.951735-14.307867-37.483706 0-11.960403 3.886517-22.396079 11.534707-30.457686 7.783267-8.211009 17.853623-12.450567 29.313629-12.450567 9.312086 0 23.139 2.849908 35.782971 16.900925 9.865695 10.641361 14.866592 23.437805 14.866592 37.693484 0 11.68104-4.031826 21.900799-11.744485 29.832446C562.925856 615.325529 532.358677 613.449809 514.295276 593.979362zM549.461193 293.282882c-12.110829-11.541871-20.589944-18.759249-26.236548-23.316032 2.77009 14.953573 9.976212 44.614104 27.330462 103.023398 17.297968 57.890478 18.799158 67.991534 18.799158 72.955592 0 8.65717-3.63683 16.335037-9.921977 21.642926-14.124695 11.661597-39.035038 9.349949-69.131497-7.677866-16.779152-9.408277-34.595936-24.759917-54.493102-46.576805l-10.377348-11.541871 34.425044-26.548656 8.818853 8.715499c9.573029 9.292644 16.086373 15.35164 20.411889 19.393699-26.294876-86.460164-39.093367-140.190903-39.093367-164.262134 0-10.907421 3.172249-19.970844 9.573029-26.839275 6.460132-7.039323 15.510252-10.736529 25.891693-10.736529 10.146081 0 21.792329 3.926426 35.922141 11.949146 12.741185 7.212262 31.883151 23.029506 58.641585 48.190559l10.837836 10.391674-31.30703 30.475082L549.461193 293.282882z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="location" unicode="&#59157;" d="M451.673935-98.39569900000004C478.883834-129.01914699999998 524.254807-128.8089789999999 551.400292-97.92885100000001 553.755808-95.38790800000004 558.821323-89.79676199999994 565.872444-81.84834999999998 577.572838-68.65901699999995 590.597131-53.62432000000001 604.615947-36.99831500000005 644.662065 10.495494000000008 684.708678 61.282182000000034 722.129538 113.35355300000003 759.658524 165.575381 792.492213 216.29072599999995 819.314991 264.54153799999995 868.685946 353.35368300000005 896 430.456574 896 493.714285 896 715.890551 719.301715 896 501.333333 896 283.364952 896 106.666667 715.890551 106.666667 493.714285 106.666667 430.401284 134.05152 353.19426999999996 183.54613 264.23737800000004 210.371803 216.02347099999997 243.193308 165.34812399999998 280.699364 113.16684599999996 318.155192 61.05544999999995 358.239268 10.22578999999996 398.322835-37.31103099999996 412.354743-53.95207300000004 425.391185-69.00072999999998 437.102468-82.20257900000001 444.160087-90.15846599999998 449.230214-95.75492099999997 451.982775-98.73670600000003L451.673935-98.39569900000004ZM486.822684-65.32134799999994C484.281231-62.568254000000024 479.425084-57.207989 472.585916-49.49835900000005 461.135889-36.591016999999965 448.364015-21.84776099999999 434.602351-5.527214999999956 395.275714 41.11192700000004 355.949587 90.98045200000001 319.289224 141.985137 282.808749 192.739548 250.983685 241.87642200000005 225.158316 288.29247799999996 179.388826 370.55419500000005 154.50505 440.709839 154.50505 493.714285 154.50505 688.960095 309.785362 847.238095 501.333333 847.238095 692.881306 847.238095 848.161617 688.960095 848.161617 493.714285 848.161617 440.753978 823.345286 370.701737 777.693969 288.58074899999997 751.873483 242.13293399999998 720.038415 192.96007499999996 683.537446 142.16873799999996 646.912604 91.20503299999996 607.624538 41.38032599999997 568.335977-5.21503800000005 554.587654-21.52024300000005 541.828177-36.24924999999996 530.389289-49.14379699999995 523.556841-56.84571100000005 518.705521-62.20043499999997 516.166694-64.95052599999997 507.543772-74.74891100000002 495.255793-74.80583000000001 487.131524-65.66235300000005L486.822684-65.32134799999994ZM714.955981 428.971194C723.919106 453.372045 728.565658 479.331002 728.565658 505.904762 728.565658 627.091817 632.184774 725.333333 513.29293 725.333333 394.401086 725.333333 298.020202 627.091817 298.020202 505.904762 298.020202 384.717709 394.401086 286.47619 513.29293 286.47619 549.003859 286.47619 583.510052 295.36805300000003 614.373097 312.125591 626.032316 318.456132 630.449257 333.22218 624.238611 345.10648100000003 618.027966 356.99078199999997 603.541579 361.49299399999995 591.882359 355.16245100000003 567.900883 342.14136099999996 541.111735 335.23809500000004 513.29293 335.23809500000004 420.821495 335.23809500000004 345.858586 411.648164 345.858586 505.904762 345.858586 600.161359 420.821495 676.571428 513.29293 676.571428 605.764365 676.571428 680.727273 600.161359 680.727273 505.904762 680.727273 485.192019 677.117041 465.022684 670.154965 446.069408 665.522846 433.459117 671.796821 419.408892 684.168282 414.687349 696.53974 409.965809 710.323861 416.360905 714.955981 428.971194L714.955981 428.971194Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="up" unicode="&#58905;" d="M513.6 539.2l384-384c12.8-12.8 32-12.8 44.8 0 12.801 12.8 12.801 32 0 44.8l-403.2 403.2C532.8 609.6 520 616 513.6 616c-6.4 0-19.2 0-25.599-6.4L78.399 200c-12.8-12.8-12.8-32 0-44.8s32-12.8 44.8 0L513.6 539.2z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="pause" unicode="&#58961;" d="M512-128c-282.714 0-511.893 229.232-511.893 512 0 282.768 229.179 512 511.893 512 282.714 0 511.893-229.232 511.893-512 0-282.768-229.179-512-511.893-512zM512 863.996c-265.043 0-479.9-214.91-479.9-479.996 0-265.097 214.857-479.996 479.9-479.996 265.043 0 479.9 214.899 479.9 479.996 0 265.086-214.857 479.996-479.9 479.996zM639.973 181.32299999999998h-21.329c-23.558 0-42.658 19.1-42.658 42.658v319.933c0 23.558 19.1 42.658 42.658 42.658h21.329c23.558 0 42.658-19.1 42.658-42.658v-319.933c0-23.558-19.1-42.658-42.658-42.658zM405.356 181.32299999999998h-21.329c-23.558 0-42.658 19.1-42.658 42.658v319.933c0 23.558 19.1 42.658 42.658 42.658h21.329c23.558 0 42.658-19.1 42.658-42.658v-319.933c0-23.558-19.1-42.658-42.658-42.658z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="date" unicode="&#58935;" d="M933.185668 758.3591759999999l-167.054737 0 0 56.506968L732.333174 814.866145l0-56.506968L539.505447 758.3591759999999l0 56.506968-33.796734 0 0-56.506968-216.255299 0 0 56.506968-33.796734 0 0-56.506968L88.005356 758.3591759999999c-12.255115 0-22.224164-9.970072-22.224164-22.224164l0-706.60521c0-12.255115 9.970072-22.225187 22.224164-22.225187l845.179288 0c12.255115 0 22.225187 9.970072 22.225187 22.225187L955.409832 736.135012C955.409832 748.389104 945.43976 758.3591759999999 933.185668 758.3591759999999zM939.036933 29.528778999999986c0-3.226484-2.62478-5.852288-5.852288-5.852288l-845.179288 0c-3.226484 0-5.851265 2.62478-5.851265 5.852288L82.154092 736.135012c0 3.226484 2.62478 5.851265 5.851265 5.851265l167.650301 0 0-55.657624 33.796734 0 0 55.657624 216.255299 0 0-55.657624 33.796734 0 0 55.657624L732.333174 741.986277l0-55.657624 33.796734 0 0 55.657624 167.054737 0c3.226484 0 5.852288-2.62478 5.852288-5.851265L939.036933 29.528778999999986zM206.835765 608.260623l129.098263 0 0-94.008071-129.098263 0 0 94.008071ZM458.879152 608.260623l129.098263 0 0-94.008071-129.098263 0 0 94.008071ZM684.827207 608.260623l129.098263 0 0-94.008071-129.098263 0 0 94.008071ZM206.835765 433.345871l129.098263 0 0-94.008071-129.098263 0 0 94.008071ZM458.879152 433.345871l129.098263 0 0-94.008071-129.098263 0 0 94.008071ZM684.827207 433.345871l129.098263 0 0-94.008071-129.098263 0 0 94.008071ZM206.835765 257.877511l129.098263 0 0-94.008071-129.098263 0 0 94.008071ZM458.879152 257.877511l129.098263 0 0-94.008071-129.098263 0 0 94.008071ZM684.827207 257.877511l129.098263 0 0-94.008071-129.098263 0 0 94.008071Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="layim-uploadfile" unicode="&#58909;" d="M914.7359263333336 663.0359498888887c-20.806884999999987 20.806885000000012-48.471967999999976 32.265868000000026-77.89816099999994 32.265868000000054l-352.221993 2.2737367544323206e-13-120.26099099999992 95.03035300000005-11.157106999999995 8.816806000000007-14.220886 9.769962616701378e-15L197.09333633333344 799.148976888889c-51.69538300000001 2.1316282072803006e-14-93.75224400000005-42.88778599999995-93.75224400000006-95.60442799999993l-1.5631940186722204e-13-255.13888799999998c-1.7763568394002505e-15-2.302439 0.08391099999999785-4.716417999999999 0.24968699999999489-7.196911999999999l-1.9895196601282805e-13-340.692403c-1.9539925233402755e-14-29.426192999999998 11.458982999999954-57.09127599999999 32.26586799999994-77.89816100000002 20.806884999999987-20.806885000000012 48.471967999999976-32.265868000000026 77.89816099999994-32.265868000000054l623.083981-3.410605131648481e-13c29.426192999999998-1.9539925233402755e-14 57.09127599999999 11.458982999999954 77.89816100000002 32.26586799999994 20.806885000000012 20.806884999999987 32.265868000000026 48.471967999999976 32.265868000000054 77.89816099999994L947.0028173333335 585.1377888888885C947.0017943333336 614.5639818888885 935.5428113333334 642.2280418888886 914.7359263333336 663.0359498888887zM197.09333633333372 758.2167298888891l141.88345099999998-8.526512829121202e-14L470.3948853333333 654.369569888889l366.44287999999995-2.2737367544323206e-13c38.236859-2.1316282072803006e-14 69.23178099999997-30.99492100000004 69.23178099999994-69.23178100000004L906.0695463333333 465.9195468888886 144.27334033333327 465.91954688888893 144.2733403333336 703.5445488888892C144.2733403333336 733.7361748888891 167.92296933333355 758.2167298888891 197.09333633333372 758.2167298888891zM836.8377653333331 31.28558888888881L213.75480733333322 31.28558888888915c-38.236859 2.1316282072803006e-14-69.23178099999997 30.99492100000004-69.23178099999994 69.23178100000004L144.52302633333338 424.4776928888892l761.546519-6.252776074688882e-13-2.2737367544323206e-13-323.96134599999993C906.0695463333333 62.28050988888867 875.0746243333334 31.285588888888583 836.8377653333331 31.28558888888881z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="delete" unicode="&#58944;" d="M738.923 24.288h-451.956c-27.2 0-49.327 21.603-49.327 48.157v418.017c0 26.548 22.129 48.147 49.327 48.147h451.956c27.2 0 49.327-21.598 49.327-48.147v-418.017c0-26.555-22.129-48.157-49.327-48.157zM286.966 494.547c-4.447 0-7.168-2.644-7.168-4.084v-418.017c0-1.443 2.722-4.093 7.168-4.093h451.956c4.448 0 7.168 2.651 7.168 4.093v418.017c0 1.44-2.722 4.084-7.168 4.084h-451.956zM832.199 496.302h-640.401c-27.201 0-49.327 20.131-49.327 44.876v61.045c0 24.74 22.128 44.867 49.327 44.867h640.401c27.2 0 49.327-20.127 49.327-44.867v-61.045c0-24.744-22.129-44.876-49.327-44.876zM184.631 541.327c0.387-0.733 2.722-2.866 7.168-2.866h640.401c4.445 0 6.782 2.132 7.168 2.867v60.741c-0.393 0.736-2.733 2.863-7.168 2.863h-640.401c-4.437 0-6.776-2.128-7.168-2.863v-60.742zM600.748 605.354h-174.546c-27.201 0-49.327 20.13-49.327 44.876v10.736c0 24.74 22.128 44.867 49.327 44.867h174.546c27.2 0 49.327-20.126 49.327-44.867v-10.736c0-24.745-22.128-44.876-49.327-44.876zM419.034 650.378c0.387-0.733 2.722-2.865 7.168-2.865h174.546c4.446 0 6.782 2.131 7.168 2.865v10.432c-0.393 0.736-2.734 2.862-7.168 2.862h-174.546c-4.437 0-6.776-2.126-7.168-2.862v-10.432zM404.099 430.833h-30.097c-7.297 0-13.213-5.916-13.213-13.213v-272.34c0-7.297 5.916-13.212 13.213-13.212h30.098c7.297 0 13.212 5.916 13.212 13.212v272.341c0 7.297-5.916 13.213-13.212 13.213zM659.583 430.833h-30.097c-7.298 0-13.213-5.916-13.213-13.213v-272.34c0-7.297 5.917-13.212 13.213-13.212h30.097c7.297 0 13.212 5.916 13.212 13.212v272.341c0 7.297-5.916 13.213-13.212 13.213zM531.841 430.833h-30.098c-7.297 0-13.213-5.916-13.213-13.213v-272.34c0-7.297 5.917-13.212 13.213-13.212h30.098c7.297 0 13.212 5.916 13.212 13.212v272.341c0 7.297-5.916 13.213-13.212 13.213z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="play" unicode="&#58962;" d="M512 896C229.376 896 0 666.624 0 384 0 101.37599999999998 229.376-128 512-128 794.624-128 1024 101.37599999999998 1024 384 1024 666.624 794.624 896 512 896L512 896 512 896zM512-95.23199999999997C245.76-95.23199999999997 32.768 117.75999999999999 32.768 384 32.768 650.24 245.76 863.232 512 863.232S991.232 650.24 991.232 384C991.232 117.75999999999999 778.24-95.23199999999997 512-95.23199999999997L512-95.23199999999997 512-95.23199999999997zM733.184 392.192L393.216 588.8c-4.096 4.096-8.192 4.096-12.288 0C376.832 588.8 372.736 584.704 372.736 580.608l0-393.216c0-4.096 4.096-8.192 4.096-8.192 4.096-4.096 8.192-4.096 12.288 0l344.064 196.608c4.096 4.096 4.096 4.096 4.096 8.192C741.376 388.096 737.28 392.192 733.184 392.192L733.184 392.192 733.184 392.192zM733.184 392.192"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="top" unicode="&#58884;" d="M812 153.4l-300 172.8-300-172.8 300 604L812 153.4zM264.5 209.2l247.5 142.5 247.5-142.5L512 707.5 264.5 209.2zM371.7 138.3l0-126.2-15.9 0 0 126.2-45.9 0L309.9 153l107.4 0 0-14.8L371.7 138.2zM506.6 154.5c26.6 0 43.3-3.9 50-11.7 6.7-7.8 10-27.2 10-58.3 0-33.5-3.2-54.2-9.6-62-6.4-7.8-23.2-11.8-50.4-11.8-27 0-43.8 3.9-50.3 11.7-6.5 7.8-9.8 27.9-9.8 60.3l0 9.9 0.2 13.3c0 18.7 4.2 31.5 12.6 38.4C467.8 151 483.5 154.5 506.6 154.5zM506.5 141c-22.3 0-35.3-2.5-39.1-7.4-3.8-5-5.7-22-5.7-51 0-29.1 1.9-46.1 5.7-51.1 3.8-5 16.8-7.4 39.1-7.4 22.4 0 35.4 2.5 39.2 7.4 3.8 5 5.7 22 5.7 51.1l0 9.2-0.1 13.3c0 15.6-2.6 25.4-7.8 29.6S525.9 141 506.5 141zM608.4 12.1 608.4 153l59.2 0 5.4 0c15.9 0 26.7-3.1 32.5-9.2 5.8-6.1 8.7-17.6 8.7-34.4 0-16.1-3-27.1-9-32.9-6-5.9-17.3-8.8-33.9-8.8l-6.2-0.1-40.7 0 0-55.5L608.4 12.1zM624.3 81.1l37.7 0c15.8 0 25.9 1.6 30.3 4.9 4.4 3.2 6.7 10.7 6.7 22.3 0 13.6-1.5 22.2-4.5 25.9-3 3.6-10.1 5.4-21.3 5.4l-6.1 0.1-42.7 0L624.4 81.1z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="firefox" unicode="&#59014;" d="M516.010667-128q-161.706667 0-288.277333 85.994667t-188.288 227.712q-33.152 74.858667-38.293333 172.010667t14.848 189.994667 63.424 178.282667 102.293333 138.581333l-6.293333-160.576q6.293333 8 38.848 8.853333t40-8.853333q24 46.293333 91.712 78.848t133.994667 33.706667q-30.848-25.706667-68.288-84.864t-33.429333-93.418667q14.293333-4.565333 35.712-7.722667t36.010667-4.288 38.848-2.282667 28.864-1.706667q8.576-2.858667 5.418667-26.005333t-17.429333-43.136q-2.858667-4.010667-9.429333-10.581333t-32.277333-20.288-57.706667-19.434667l8.576-108.010667-79.424 38.293333q-10.282667-24.576-4.288-46.570667t20.565333-37.994667 37.418667-23.722667 46.293333-3.712q29.141333 5.141333 56 19.712t47.722667 25.706667 42.005333 10.005333q34.858667-2.282667 51.136-18.858667t11.136-37.141333q-0.576-1.152-1.429333-3.136t-4.864-7.146667-10.282667-8.853333-18.005333-5.994667-26.581333-0.576q-34.282667-54.293333-82.581333-77.418667t-119.722667-16.853333q42.282667-34.858667 92.864-47.146667t96.277333-3.434667 88.277333 29.717333 73.152 50.005333 45.994667 59.434667q24.576 52.010667 22.293333 109.994667t-21.418667 107.712-44.864 71.424q49.706667-21.717333 78.293333-45.418667t44.010667-64.277333q8.576 97.152-32.853333 196.010667t-119.722667 162.282667q151.424-44.010667 235.434667-159.722667t86.293333-295.722667q1.152-72.576-23.146667-145.706667t-70.570667-136-108.010667-112-141.418667-77.418667-164.864-28.288z"  horiz-adv-x="1025" />
+
+    
+    <glyph glyph-name="friends" unicode="&#58898;" d="M672.02974 765.933689c7.66047-32.266891 8.420787-62.237483 7.713682-95.365998-0.283456-12.778024-7.291057-71.832002-5.3918-89.926102 1.561565-14.936177 5.132904-16.128329 10.759041-28.436656 9.803273-21.422915 6.51846-50.970882 2.76088-72.566736-2.056845-11.816117-6.404873-28.64541-13.017478-38.287001-7.291057-10.645454-21.864984-10.711969-28.319999-23.12365-9.29469-17.848507-4.045129-42.930765-9.903557-62.21497-6.65763-21.883403-23.599488-23.420409-24.877597-52.040237 8.316409-1.243317 16.59598-2.479471 24.877597-3.722788 8.316409-18.498306 23.533996-55.70265 39.08518-66.900689 13.024641-3.728928 26.048259-7.448646 39.07904-11.156084 45.641503-19.593244 96.365768-43.032072 142.108578-63.215764 41.656749-18.381649 91.51325-24.937972 106.575294-70.629617 0-31.026644 2.795673-104.309694 2.025123-144.978952L58.155515-56.631556000000046c-0.757247 40.669258 2.029216 113.952308 2.029216 144.978952 15.065114 45.691645 64.928778 52.247968 106.578364 70.629617 45.74281 20.182668 96.467075 43.62252 142.098345 63.215764 13.027711 3.707438 26.054399 7.427156 39.08211 11.156084 15.554254 11.197016 30.78105 48.402383 39.09439 66.900689l18.492166 4.710278c-4.196579 24.429389-18.658965 26.322505-24.682146 43.62559-2.356674 26.013467-4.729721 52.052516-7.095605 78.079286 0.107447-1.234107-17.006326 3.246951-19.252483 4.716418-24.130583 15.838733-24.618701 80.075757-26.941606 106.793258-1.063215 12.222369 15.163351 22.240537 10.654664 44.62536-26.433022 131.125433 11.437493 219.776496 71.330582 240.123916 41.564651 17.633612 119.167077 50.323129 191.563944 3.716648l17.971303-17.428951 29.061896-5.237281C662.71663 795.172617 672.02974 765.933689 672.02974 765.933689z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="refresh-3" unicode="&#59818;" d="M820.376904 697.14807C740.637816 774.519228 631.884926 822.157201 511.999488 822.157201c-244.621347 0-442.925808-198.305485-442.925808-442.926832 0-244.6193 198.304462-442.925808 442.925808-442.925808 206.075449 0 379.271046 140.739395 428.740738 331.337337L822.859445 267.64189899999997c-45.759183-127.45381-167.656441-218.623229-310.859957-218.623229-182.371584 0-330.210677 147.842163-330.210677 330.210677 0 182.371584 147.840116 330.2117 330.210677 330.2117 88.762603 0 169.32443-35.035958 228.655723-92.015693L557.051567 433.822732l280.641725 0 113.880677 0 3.351328 0L954.925297 831.695438 820.376904 697.14807z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="ok" unicode="&#58885;" d="M960 640L915.2 684.8 371.2 172.79999999999995 108.8 454.4 64 409.6 358.4 83.20000000000005 364.8 89.60000000000002 371.2 83.20000000000005Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="layer" unicode="&#58936;" d="M96.089 724.318l0-684.236 831.822 0L927.911 724.318 96.089 724.318zM884.178 84.457L140.464 84.457 140.464 489.559l743.714 0L884.178 84.457z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="face-smile-fine" unicode="&#58892;" d="M511.558443 852.9315573333333c-246.787686 0-447.597201-200.783932-447.597201-447.598224 0-246.815315 200.783932-447.598224 447.597201-447.598224 246.841921 0 447.64939 200.782909 447.64939 447.598224C959.207833 652.1476253333334 758.400365 852.9315573333333 511.558443 852.9315573333333zM511.558443-4.962310666666667c-226.247884 0-410.295644 184.046736-410.295644 410.295644 0 226.249931 184.072319 410.296667 410.295644 410.296667 226.27449 0 410.346809-184.046736 410.346809-410.296667C921.905252 179.08442633333334 737.832933-4.962310666666667 511.558443-4.962310666666667zM724.38055 303.5726953333334c-9.698896 3.457752-20.366863-1.566682-23.848151-11.264555-28.500101-79.45461-104.372116-132.844587-188.82353-132.844587-84.798315 0-160.770614 53.689806-189.070146 133.590578-3.432169 9.723455-14.075577 14.772448-23.823592 11.364839-9.699919-3.432169-14.797008-14.100136-11.364839-23.823592 33.547047-94.77248 123.668601-158.434405 224.234017-158.434405 100.142791 0 190.140525 63.314001 223.935212 157.564595C739.125369 289.3978573333334 734.102982 300.0903843333334 724.38055 303.5726953333334zM302.49494 515.3479593333334c0-24.653493 19.98517-44.638663 44.638663-44.638663 24.653493 0 44.638663 19.98517 44.638663 44.638663s-19.98517 44.63764-44.638663 44.63764C322.48011 559.9855993333333 302.49494 540.0014523333333 302.49494 515.3479593333334L302.49494 515.3479593333334zM631.398856 515.3479593333334c0-24.653493 19.98517-44.638663 44.63764-44.638663 24.653493 0 44.63764 19.98517 44.63764 44.638663s-19.984147 44.63764-44.63764 44.63764C651.384026 559.9855993333333 631.398856 540.0014523333333 631.398856 515.3479593333334L631.398856 515.3479593333334z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="dollar" unicode="&#58969;" d="M517.565-65.45399999999995c-244.263 0-442.299 198.014-442.299 442.299s198.014 442.299 442.299 442.299c244.263 0 442.299-198.014 442.299-442.299 0-244.263-198.014-442.299-442.299-442.299zM517.565 863.383c-268.751 0-486.564-217.834-486.564-486.564s217.834-486.564 486.564-486.564c268.751 0 486.564 217.834 486.564 486.564 0 268.751-217.834 486.564-486.564 486.564zM497.036 425.349c-18.443 6.957-33.605 16.314-45.238 27.617-11.581 11.306-20.059 23.465-25.468 36.742-5.423 13.177-8.178 26.235-8.178 39.172-0.004 18.194 2.564 34.357 7.846 48.514 5.327 14.231 13.748 25.85 25.468 35.02 11.581 9.167 26.798 15.204 45.482 18.295v-205.52zM534.455 356.13199999999995c16.937-6.756 32.277-14.997 46.035-24.855 13.748-9.678 24.613-21.601 32.929-35.57 8.204-13.909 12.436-30.734 12.622-50.307 0-14.231-1.859-27.907-5.785-40.833-3.858-12.866-9.542-24.531-17.271-34.804-7.691-10.211-17.271-18.443-28.678-24.613-11.328-6.318-24.613-9.678-39.76-10.341v221.377zM534.455 94.18299999999999c29.037 3.318 53.978 11.306 74.785 24.134 20.985 12.866 37.018 30.15 48.281 51.734 11.125 21.535 16.876 46.832 16.937 76.196 0 16.08-1.67 30.377-5.033 42.985-3.318 12.622-8.204 24.15-14.836 34.357-6.739 10.341-14.836 20.189-24.613 29.326-8.853 8.204-19.107 15.957-30.659 23.041-11.328 7.197-22.836 13.706-34.281 19.261-11.581 5.694-21.601 10.516-30.659 14.231v221.377c14.527-3.318 26.662-8.594 36.62-16.192 9.859-7.395 17.766-16.192 23.776-26.384 5.941-10.211 10.341-20.985 12.972-32.345 2.666-11.328 4.026-22.836 3.858-34.097h46.155c0.004 16.314-1.566 32.345-5.327 48.281-3.543 15.957-9.938 30.909-19.107 44.969-8.996 13.909-21.601 26.235-37.684 36.742-16.192 10.521-36.62 18.295-61.318 23.562v49.426h-37.441v-53.316c-23.465-2.624-42.985-8.178-58.595-16.314-15.633-8.204-28.279-18.194-37.684-29.562-9.441-11.328-16.523-23.302-21.226-35.317-4.59-12.062-7.846-23.302-9.316-33.326-1.566-10.211-2.256-18.194-2.115-24.029 0.004-21.601 3.452-40.612 9.863-57.238 6.479-16.523 15.58-30.909 27.178-43.441 11.659-12.436 25.361-23.562 40.833-33.204 15.633-9.678 32.649-18.443 51.098-26.235v-237.329c-18.194 1.984-33.326 7.197-45.094 15.633-11.97 8.369-21.074 19.107-27.714 31.902-6.739 12.972-11.011 27.178-13.363 42.701-2.256 15.58-3.034 31.313-2.115 47.367h-47.803c-1.183-23.776 0.397-46.035 5.033-66.676s12.357-39.03 23.376-55.019c10.892-16.08 25.361-29.037 43.142-39.03 17.847-9.863 39.472-16.08 64.586-18.295v-65.283h37.441v65.283z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="group" unicode="&#58899;" d="M1328.72893437-13.274022189999982L1325.7954575 10.932401249999998 1319.19311938 40.27361905999999 1309.65730438 68.14729219000003 1296.45423969 96.75473719000001 1283.25117594 118.75984405999998 1264.91331781 140.03117906 1244.37414312 156.90310406000003 1215.76669813 173.03964562 1195.22913594 182.57546062999995 1168.08923563 189.17779874999997 1140.94772187 195.77852437 1117.47507031 204.58056750000003 1088.13546594 218.51740312000004 1064.66281438 229.52076375000001 1036.05536844 242.72382749999997 1014.0502625 255.19473187999995 1014.0502625 332.94718406000004 1023.58446406 343.95054469 1032.38811969 358.61954062999996 1038.98884531 373.29014906 1044.12363969 391.62800719 1049.992205 413.63472656 1052.19191 430.50504 1055.370515 429.77126719 1061.727725 430.75016813 1066.61900281 434.662545 1071.99731188 443.46458812 1075.42104594 453.7325625 1077.37723437 466.4469825 1079.82206656 489.43099031 1080.799355 508.991265 1079.82206656 525.61806187 1076.39833344 535.88764969 1069.55247969 539.80002656 1065.64010188 538.82112656 1069.06383594 560.82623344 1071.99731188 587.2339743800001 1072.97621281 611.19526969 1072.48595656 630.26689969 1069.55247969 647.870985 1064.17255719 664.98642656 1056.83805969 680.63432344 1046.56847188 698.24002125 1034.83295281 712.91063063 1021.13963187 724.15750594 1003.53554656 735.40438125 981.53043969 745.67396812 962.94745344 750.56363437 940.45370281 754.47601125 918.4469825 754.964655 895.95323188 751.05227812 874.43676969 743.71777969 855.36513875 735.893025 838.73834188 725.1347934400001 823.33396063 711.44308594 808.66335125 695.30493188 795.4602875 676.23330187 785.9244725 655.69573969 780.05751875 632.22308813 779.32374687 602.14809844 782.25722375 574.27442531 785.9244725 538.3324818799999 777.85620219 538.3324818799999 772.72140875 531.73014375 771.25547656 519.99462469 772.72140875 492.12095156 776.3886575 459.84625688 779.32374687 443.70810375 784.45854031 434.90606063 793.99435531 429.77126719 799.86130906 430.50504 803.53017031 404.83268344 807.19742 389.42830219 813.06598531 372.55637719000003 821.13425656 355.68606375 830.67007156 342.48299999999995 838.00456906 332.94718406000004 837.27079719 253.72718719 845.06329813 250.99690875 855.81346625 248.0392425 867.37158969 243.73981969 878.39107625 239.43878530999996 888.6058325 235.67638781000005 897.74331406 231.10603405999996 908.76441312 226.53729375 920.85956187 219.54952313 932.95471062 212.56014000000005 942.898535 205.30305094000005 955.80002656 195.62693156 966.82112656 185.41378874999998 977.30358781 172.51229719000003 988.32307531 158.26743750000003 1000.01505219 141.87125344000003 1010.0943425 122.51901655999995 1018.69641219 101.55409219 1026.22120719 82.20185436999998 1031.46243781 64.05913219000001 1035.09098281 45.110066250000045 1038.71952688 23.741970000000038 1041.13855625-1.2546703100000514 1041.54172812-18.187877810000032 1040.73538531-33.30681374999995 1037.30842625-44.99879062000002 1030.79156-57.83254968999995 1023.19742-66.36688593999997 1009.28799875-73.42238906 1298.65555719-73.42238906 1311.85862094-66.82005093999999 1322.12820875-56.552076560000046 1328.72893437-45.54871687000002 1330.19647906-31.611880309999947ZM443.23504906 789.36487031L427.10818437 771.62531906 412.59400625 750.66039469 402.11154406 728.08278469 395.66079781 702.27980156 394.854455 669.21972844 398.07982813 638.57868562 402.11154406 599.06786719 393.24176844 599.06786719 387.59736594 591.81077812 385.98467938 578.90928656 387.59736594 548.26824375 391.62908187 512.7891412500001 394.854455 495.04959 400.4988575 485.37347156 410.98131969 479.72906906 417.43206594 480.53541188 421.46378187 452.31339844 425.49549781 435.38019094 431.94624406 416.83429687 440.81601969 398.28840187 451.29848094 383.77422375000003 459.36191375 373.29176156000005 458.55557094 286.20669281000005 444.84773562 277.33691719 412.59400625 262.01639531 379.53393406 247.50221719 352.92460719 234.60072562000005 331.95968281 225.73095 308.57572906 218.47386094 284.3854325 213.63580125 261.00147875 207.99139875000003 236.81118125 197.50893656000005 214.23357031 186.22013156000003 194.07498969 171.70595344000003 171.49737969 149.12834250000003 155.370515 125.74438874999998 143.27536625 103.16677875000005 133.59924781 78.97648125 123.92312844 51.56081156000005 119.08506875 29.789544370000044 115.05335281 11.243650310000021 112.63432344-10.527616869999974 112.63432344-29.879854690000002 115.85969656-49.23209250000002 125.535815-62.133584059999976 140.04999313-71.80970344000002 158.59588719-73.42238906 965.74546437-73.42238906 980.2596425-66.1653 991.5484475-54.87649499999998 998.80553656-42.781346249999956 1000.41822312-27.46082531000002 998.80553656-7.302244689999952 995.58016438 19.30708218999996 988.32307531 51.56081156000005 977.84061313 82.20185436999998 963.326435 113.64924094000003 948.81225688 137.8395375 928.65367531 161.22349125000005 906.07606531 179.76938625000003 874.62867875 197.50893656000005 852.05106875 207.99139875000003 822.21636875 215.24848781000003 792.38166875 222.50557688000004 766.57868562 232.18169624999996 734.32495625 247.50221719 708.52197312 259.59736594000003 677.07458656 274.11154406 652.88429 287.81937937 652.88429 373.29176156000005 663.36675219 385.38691031 673.04287063 401.513775 680.29995969 417.64063969 685.94436219 437.79922031 692.39510844 461.98951781 694.81413781 480.53541188 698.30882938 479.72906906 705.2966 480.80473031 710.67168406 485.10415312 716.585405 494.78027156 720.3478025 506.06907656 722.49912688 520.04623031 725.18586219 545.31218906 726.26152437 566.8141378099999 725.18586219 585.09071344 721.42346469 596.3795184400001 713.89705719 600.68055375 709.59763438 599.6048915599999 713.36003188 623.79518906 716.585405 652.82354531 717.66106719 679.16516625 717.12242937 700.13008969 713.89705719 719.4823275 707.98494781 738.2959275000001 699.92151594 755.49845437 688.63271094 774.85069219 675.73121937 790.97755688 660.67840344 803.34202406 641.32616563 815.70487875 617.13586906 826.99368375 596.7095825 832.37038031 571.98064812 836.66980219 547.79035063 837.20844 523.06302875 832.90740469 499.40975656 824.84397281 478.44483313 816.24351562 460.16825656 804.4160728100001Z"  horiz-adv-x="1449" />
+
+    
+    <glyph glyph-name="layim-download" unicode="&#58910;" d="M186.888458 77.07363199999998l0 581.729108c14.85022-14.450107 35.050284-23.436782 57.359382-23.436782l560.03604 0 0-151.561881 25.029046 0 0 176.591951-585.065086 0c-31.191396 0-57.359382 26.166963-57.359382 57.359382 0 31.191396 26.165939 57.359382 57.359382 57.359382l572.551074 0L816.798914 800.143838 244.24784 800.143838c-45.431725 0-82.388429-36.957727-82.388429-82.388429l0-640.681778c0-41.796942 34.000372-75.789127 75.789127-75.789127l225.950102 0 0 25.029046L237.648538 26.31355099999996C209.661114 26.31355099999996 186.888458 49.078021000000035 186.888458 77.07363199999998zM236.947574 730.269421l560.38601 0 0-25.029046-560.38601 0 0 25.029046ZM686.086897 428.171012c-85.917812 0-164.908864-55.248302-194.553021-135.882783-30.013571-81.641415-4.269233-175.567621 62.624293-230.942813 67.00302-55.465243 164.474982-62.808488 238.931764-17.720593 74.094532 44.868907 113.272833 133.533272 96.080266 218.517829C869.882923 357.47283300000004 783.297916 428.171012 686.086897 428.171012zM686.086897 38.82858599999997c-75.595722 0-145.060817 48.634674-171.092703 119.595842-26.354228 71.839165-3.63069 154.438395 55.287187 203.074092 59.017138 48.718585 144.762011 55.029314 210.191186 15.237029 65.11195-39.59888 99.396801-117.681236 84.064604-192.408171C847.384513 100.72940100000005 771.387655 38.82858599999997 686.086897 38.82858599999997zM698.600909 152.23547199999996L698.600909 311.02496499999995 673.571862 311.02496499999995 673.571862 152.28459099999998 604.675726 221.17254100000002 586.978668 203.47548400000005 686.111456 104.35190499999999 785.185916 203.42738799999995 767.489882 221.123422Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="picture-fine" unicode="&#58893;" d="M958.648085 84.30682933333333L65.772494 84.30682933333333 65.772494 721.9115253333333l892.87559 0L958.648085 84.30682933333333zM97.660762 116.20328333333339l829.099055 0L926.759817 690.0570263333334 97.660762 690.0570263333334 97.660762 116.20328333333339zM648.731616 419.05893933333334l-1.991354 0c-47.801702 0-86.696548 38.900985-86.696548 86.695524l0 1.978051c0 47.809889 38.894845 86.671988 86.696548 86.671988l1.991354 0c47.801702 0 86.698594-38.862099 86.698594-86.671988l0-1.978051C735.43021 457.95992433333333 696.533318 419.05893933333334 648.731616 419.05893933333334zM646.740262 562.5193053333333c-30.224372 0-54.810327-24.582885-54.810327-54.787814l0-1.978051c0-30.230512 24.584931-54.803163 54.810327-54.803163l1.991354 0c30.222325 0 54.810327 24.572652 54.810327 54.803163l0 1.978051c0 30.203906-24.586978 54.787814-54.810327 54.787814L646.740262 562.5193053333333zM91.097276 181.7900473333334l-22.748097 22.338774 274.373974 279.332916 22.750143-22.351054L91.097276 181.7900473333334zM604.886015 215.92242633333342L339.999113 480.74793033333333l22.548552 22.525016L627.433544 238.4638153333334 604.886015 215.92242633333342zM619.007641 202.70744933333333l-22.763446 22.337751 167.989015 171.035398 22.765493-22.350031L619.007641 202.70744933333333zM925.622924 222.7939273333334L758.534418 389.8343373333333l22.548552 22.529109 167.086459-167.044504L925.622924 222.7939273333334z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="link" unicode="&#58956;" d="M262.4-121.60000000000002c-64 0-128 25.6-179.2 76.8-102.4 102.4-102.4 262.4 0 364.8l134.4 134.4 89.6-89.6-134.4-134.4c-51.2-51.2-51.2-128 0-179.2 51.2-51.2 128-51.2 179.2 0l179.2 179.2c25.6 25.6 38.4 57.6 38.4 89.6S556.8 384 537.6 409.6L467.2 473.6l89.6 89.6 70.4-70.4C672 448 697.6 384 697.6 313.6c0-70.4-25.6-134.4-76.8-179.2l-179.2-179.2C396.8-96 326.4-121.60000000000002 262.4-121.60000000000002zM467.2 204.79999999999995L396.8 268.79999999999995c-102.4 102.4-102.4 262.4 0 364.8l179.2 179.2c102.4 102.4 262.4 102.4 364.8 0 102.4-102.4 102.4-262.4 0-364.8l-134.4-134.4-89.6 89.6 134.4 134.4c51.2 51.2 51.2 128 0 179.2-51.2 51.2-134.4 51.2-179.2 0L486.4 544c-51.2-51.2-51.2-128 0-179.2l70.4-70.4L467.2 204.79999999999995z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="diamond" unicode="&#59189;" d="M998.4 526.933333L797.866667 802.133333c-4.266667 6.4-12.8 10.666667-19.2 10.666667L243.2 812.8c0 0-14.933333-2.133333-23.466667-17.066667C194.133333 753.066667 32 512 32 512L21.333333 494.933333l12.8-14.933333L469.333333-27.733333000000016c4.266667-4.266667 6.4-6.4 10.666667-8.533333 6.4-4.266667 32-10.666667 46.933333 0 4.266667 2.133333 6.4 6.4 10.666667 8.533333l409.6 420.266667c10.666667 8.533333 10.666667 25.6 0 34.133333-8.533333 10.666667-23.466667 10.666667-32 0L561.066667 61.86666700000001l153.6 422.4 0 0 251.733333 0c2.133333 0 19.2 0 23.466667 4.266667l2.133333 2.133333C1004.8 497.066667 1006.933333 512 998.4 526.933333zM782.933333 763.733333l-96-226.133333L341.333333 537.6l-85.333333 226.133333L782.933333 763.733333zM221.866667 714.666667l72.533333-179.2-192 0L221.866667 714.666667zM91.733333 488.533333l215.466667 0 138.666667-416L91.733333 488.533333zM503.466667 44.799999999999955l-147.2 443.733333 307.2 0L503.466667 44.799999999999955zM736 535.4666669999999L810.666667 701.866667l119.466667-168.533333L736 533.333333z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="log" unicode="&#58894;" d="M828.01742 700.357158C743.476979 784.899646 631.076002 831.458031 511.516999 831.458031c-119.55798 0-231.959979-46.558385-316.500421-131.09985C110.47716 615.81774 63.918775 503.41574 63.918775 383.85776c0-87.103824 25.045419-171.548074 72.429613-244.204861 9.393951-14.402011 28.685319-18.46249 43.087331-9.071609 14.404058 9.393951 18.46556 28.685319 9.072633 43.089377-40.768519 62.511729-62.317301 135.194098-62.317301 210.187093 0 212.469066 172.85586 385.326972 385.325949 385.326972s385.325949-172.857906 385.325949-385.326972-172.85586-385.326972-385.325949-385.326972c-70.357418 0-139.188062 19.131733-199.052498 55.323003-14.71412 8.900717-33.856086 4.180206-42.753733-10.534937-8.896624-14.71719-4.180206-33.856086 10.534937-42.753733 69.584821-42.070164 149.556201-64.307631 231.271294-64.307631 119.559003 0 231.959979 46.558385 316.500421 131.09985 84.539418 84.539418 131.097804 196.941418 131.097804 316.499397S912.556838 615.81774 828.01742 700.357158zM494.28964 690.216193c-21.782096 0-39.397289-17.658172-39.397289-39.439244l0-283.524378c0-1.360997 0.358157-2.706645 0.493234-4.03285 2.020006-19.886933 18.959817-34.573423 39.379892-34.573423l0 0 0.146333 0.832971 223.590358 0c21.782096 0 39.438221 17.616216 39.438221 39.397289s-17.658172 39.397289-39.439244 39.397289L533.686928 408.273846l0 242.503103C533.686928 672.5580219999999 516.071735 690.216193 494.28964 690.216193z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="key" unicode="&#59011;" d="M819.2 588.8c0-172.8-140.8-307.2-307.2-307.2-172.8 0-307.2 140.8-307.2 307.2C204.8 755.2 339.2 896 512 896S819.2 755.2 819.2 588.8L819.2 588.8zM512 838.4c-140.8 0-249.6-115.2-249.6-249.6 0-134.4 108.8-256 249.6-256s256 115.2 256 249.6S652.8 838.4 512 838.4L512 838.4zM480 300.79999999999995l64 0L544-128l-64 0L480 300.79999999999995 480 300.79999999999995zM512 192l192 0 0-64L512 128 512 192 512 192zM512 64l192 0 0-64L512 0 512 64 512 64z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="rate-solid" unicode="&#59002;" d="M957.111079 492.519576c-3.927449 11.669784-14.447037 19.86442-26.723641 20.816095L647.68068 535.250796 540.183388 811.873997c-4.586458 11.803837-15.951297 19.579941-28.614711 19.579941s-24.02723-7.776104-28.614711-19.579941L375.458719 535.250796l-282.708803-21.915126c-12.276604-0.951675-22.796192-9.146311-26.723641-20.816095-3.927449-11.669784-0.50142-24.557302 8.701173-32.737612l217.547735-193.358823-67.980277-291.298436c-2.848884-12.20702 2.009773-24.919553 12.273535-32.114418 10.264784-7.195889 23.87271-7.42818 34.375925-0.586354l240.624313 156.709111 240.625336-156.709111c5.099135-3.320629 10.92891-4.974291 16.752546-4.974291 6.173606 0 12.342096 1.858324 17.623379 5.561669 10.263761 7.194866 15.122419 19.907399 12.273535 32.114418l-67.980277 291.299459L948.409906 459.781964C957.613522 467.962274 961.037505 480.849792 957.111079 492.519576z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="fonts-del" unicode="&#58959;" d="M928 448l-143.616 0c-3.456 55.616-14.272 106.56-29.504 144.96C725.504 666.816 617.344 768 464.32 768L256 768l0-320L96 448C78.336 448 64 433.664 64 416S78.336 384 96 384L256 384l0-320 229.632 0c156.288 0 240.768 97.856 267.904 167.488C772.736 280.96000000000004 782.272 333.312 784.96 384L928 384C945.664 384 960 398.336 960 416S945.664 448 928 448zM349.376 711.488l63.936 0c35.712 0 251.84 27.968 266.944-263.488l-330.88 0L349.376 711.488zM439.296 120.51199999999994L349.376 120.51199999999994 349.376 382.528 349.376 384l330.88 0C665.344 113.98400000000004 467.968 120.51199999999994 439.296 120.51199999999994z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="unlink" unicode="&#58957;" d="M150.336 767.6800000000001C133.44 762.304 124.16 744.3199999999999 129.472 727.488 131.2 722.1759999999999 134.208 717.44 138.304 713.664l122.624-122.432C270.208 576.192 289.92 571.52 304.96 580.736 320 590.0799999999999 324.672 609.7280000000001 315.456 624.832 312.832 629.056 309.184 632.64 304.96 635.264L182.336 757.696C175.168 765.44 164.672 769.216 154.304 767.6800000000001 152.96 767.808 151.552 767.808 150.336 767.6800000000001L150.336 767.6800000000001zM406.08 831.424c-13.696-4.48-22.72-17.6-22.016-32L384.064 672c0-17.664 14.336-32 32-32s31.872 14.336 31.872 32L447.936 799.424C448.256 817.088 434.304 831.6800000000001 416.64 832 414.464 832.064 412.16 831.808 410.048 831.424 408.704 831.552 407.296 831.552 406.08 831.424L406.08 831.424zM91.392 511.872C73.728 509.12 61.632 492.544 64.384 474.88 67.136 457.28 83.712 445.248 101.376 448L224 448C241.664 448 256 462.208 256 479.872s-14.336 32-32 32L101.376 511.872c-1.984 0.192-3.968 0.192-6.016 0C94.016 512 92.608 512 91.392 511.872L91.392 511.872zM795.456 320c-17.728-2.752-29.824-14.08-27.072-31.744 2.752-17.6 19.328-35.008 36.992-32.256L928 256c17.664 0 32 19.584 32 37.248S945.664 320 928 320l-122.624 0c-1.984 0.192-3.968 0.192-6.016 0-1.344 0.128-2.688 0.128-4.032 0L795.456 320zM598.272 127.42399999999998c-13.76-4.48-22.72-17.6-22.08-32L576.192-32c0-17.664 14.336-32 32-32S640-49.66399999999999 640-32l0 127.424c0.32 17.6-13.568 32.256-31.232 32.576-2.176 0.064-4.352-0.192-6.592-0.576-1.344 0.128-2.688 0.128-4.032 0L598.272 127.42399999999998zM726.272 191.67999999999995c-16.896-5.376-26.24-23.36-20.864-40.192 1.664-5.312 4.736-10.048 8.832-13.824l122.56-122.432c9.28-15.04 28.928-19.776 44.032-10.496 14.976 9.344 19.712 28.992 10.368 44.032-2.624 4.224-6.144 7.808-10.368 10.432l-122.56 122.432c-7.168 7.744-17.6 11.52-28.032 9.984-1.344 0.128-2.688 0.128-4.032 0L726.272 191.61599999999999zM339.968 28.03200000000004c-49.152 0-98.304 18.688-135.744 56.128-74.816 74.88-74.816 196.608 0 271.488l87.744 87.744c12.48 12.48 32.768 12.48 45.248 0s12.48-32.768 0-45.248L249.408 310.46400000000006c-49.92-49.856-49.92-131.136 0-180.992 49.856-49.856 131.136-49.856 180.992 0l87.744 87.744c12.48 12.48 32.768 12.48 45.248 0s12.48-32.768 0-45.248l-87.744-87.744C438.272 46.72000000000003 389.12 28.03200000000004 339.968 28.03200000000004zM702.144 323.712c-8.192 0-16.384 3.136-22.656 9.344-12.48 12.48-12.48 32.768 0 45.248l87.744 87.744c49.856 49.92 49.856 131.072 0 180.992-49.856 49.856-131.136 49.856-180.992 0L498.496 559.296c-12.48-12.48-32.768-12.48-45.248 0s-12.48 32.768 0 45.248l87.744 87.744c74.88 74.88 196.608 74.88 271.488 0 74.88-74.816 74.88-196.672 0-271.488l-87.744-87.744C718.528 326.784 710.336 323.712 702.144 323.712z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="fonts-clear" unicode="&#58937;" d="M944.787709 197.20939699999997L857.081297 197.20939699999997 741.092979-127.73993700000005 815.146059-127.73993700000005 832.440281-65.58476199999996 966.82809-65.58476199999996 984.512408-127.73993700000005 1062.011328-127.73993700000005 944.787709 197.20939699999997 944.787709 197.20939699999997ZM848.04409 1.1865400000000363L898.951519 153.25866699999995 949.923963 1.1865400000000363 848.04409 1.1865400000000363 848.04409 1.1865400000000363ZM210.238376 489.910857L183.386821 513.121524 12.46009 313.522794C-5.874386 292.652698-3.728862 260.989968 17.271265 242.720508 38.401424 224.45104800000001 70.454249 226.66158700000005 88.853741 247.53168300000004L100.361551 260.599873C106.603075 267.55657099999996 117.200662 268.20673 124.287392 262.22527 131.309106 256.048762 132.024281 245.51619000000005 125.912789 238.55949199999998 107.448281 217.62438099999997 98.085995 173.08850800000005 119.216154 154.81904799999995 140.281297 136.614603 183.841932 151.76330199999995 202.371455 172.69841299999996 208.417932 179.525079 219.145551 180.30526999999995 226.167265 174.19377799999995 233.188979 168.14730199999997 233.904154 157.61473 227.792662 150.65803200000005 209.328154 129.85295199999996 199.965868 85.05701599999998 221.096027 66.91758700000003 242.16117 48.648127000000045 285.656789 63.86184100000003 304.186313 84.666921 310.362821 91.62361899999996 321.025424 92.40381000000002 327.982122 86.29231700000003 335.068852 80.18082500000003 335.784027 69.71326999999997 329.672535 62.75657100000001 311.143011 41.82146 301.845741-2.9094599999999673 322.910884-20.983873000000017 344.041043-39.253333 387.601678-24.039619000000016 406.00117-3.234540000000038 412.177678 3.7221590000000333 422.840281 4.437332999999967 429.927011-1.6091430000000173 436.948725-7.720635000000016 437.598884-18.31822199999999 431.487392-25.144889000000035 413.022884-46.08000000000004 403.725614-90.81092100000001 424.790757-109.01536499999997 445.920916-127.15479400000004 477.973741-125.00927000000001 496.373233-104.20419000000004L667.299963 95.52457100000004 658.652852 132.90869799999996 210.238376 489.910857 210.238376 489.910857ZM844.013106 329.516698L680.10809 471.12127 929.639011 715.190857C933.2799 718.376635 936.725741 721.562413 939.976535 725.203302 977.815773 768.048762 973.524725 833.129651 930.28917 870.513778 887.183646 907.702857 821.58263 903.281778 783.808408 860.631365L783.483328 860.761397 564.249805 571.3107299999999 399.824662 713.56546C385.391138 726.113524 363.480789 724.553143 350.867709 710.249651L248.14263 593.871238 225.322059 567.994921 251.393424 545.434413 695.7119 161.25561900000002 726.26936 136.679619 847.328916 281.014857C859.941995 295.318349 858.44663 316.96863499999995 844.013106 329.516698L844.013106 329.516698ZM817.941741 830.724063C839.136916 854.779937 876.000916 857.315556 900.186821 836.250413 924.372725 815.380317 926.908344 778.906413 905.648154 754.85054 884.452979 730.924698 847.588979 728.389079 823.403075 749.3892060000001 799.21717 770.324317 796.811582 806.798222 817.941741 830.724063L817.941741 830.724063ZM765.473932 758.491429C768.919773 741.522286 777.6319 725.593397 791.80536 713.305397 806.043836 701.017397 823.533106 694.580825 841.087392 693.540571L643.634186 494.526984 593.116852 538.2176509999999 765.473932 758.491429 765.473932 758.491429ZM776.006503 299.739429L709.755328 219.314794 307.502122 566.369524 376.809043 645.03873C382.920535 651.865397 393.38809 652.5155560000001 400.409805 646.534095L774.381106 323.01511100000005C781.337805 317.098667 782.117995 306.69612700000005 776.006503 299.739429L776.006503 299.739429Z"  horiz-adv-x="1063" />
+
+    
+    <glyph glyph-name="triangle-r" unicode="&#58915;" d="M293.291 728.256l426.88-355.456-426.88-355.52z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="circle" unicode="&#58943;" d="M511.998 847.999C255.739 847.999 48 640.26 48 383.999c0-256.258 207.739-463.998 463.998-463.998C768.261-79.99900000000002 976 127.74199999999996 976 383.999 976 640.26 768.261 847.999 511.998 847.999zM512.002-16.000999999999976c-220.915 0-400.002 179.088-400.002 400 0 220.917 179.086 400 400.002 400 220.912 0 399.998-179.083 399.998-400C912 163.087 732.914-16.000999999999976 512.002-16.000999999999976z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="radio" unicode="&#58947;" d="M512.5 383.5m-192 0a192 192 0 1 1 384 0 192 192 0 1 1-384 0ZM511.998 847.999C255.739 847.999 48 640.26 48 383.999c0-256.258 207.739-463.998 463.998-463.998C768.261-79.99900000000002 976 127.74199999999996 976 383.999 976 640.26 768.261 847.999 511.998 847.999zM512.002-16.000999999999976c-220.915 0-400.002 179.088-400.002 400 0 220.917 179.086 400 400.002 400 220.912 0 399.998-179.083 399.998-400C912 163.087 732.914-16.000999999999976 512.002-16.000999999999976z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="align-center" unicode="&#58951;" d="M992 448L32 448C14.32 448 0 462.336 0 480 0 497.664 14.32 512 32 512L992 512C1009.68 512 1024 497.664 1024 480 1024 462.336 1009.68 448 992 448ZM800 704C817.664 704 832 689.664 832 672 832 654.336 817.664 640 800 640L224 640C206.32 640 192 654.336 192 672 192 689.664 206.32 704 224 704L800 704ZM992 832L32 832C14.32 832 0 846.336 0 864 0 881.664 14.32 896 32 896L992 896C1009.68 896 1024 881.664 1024 864 1024 846.336 1009.68 832 992 832ZM224 256C206.32 256 192 270.336 192 288 192 305.664 206.32 320 224 320L800 320C817.664 320 832 305.664 832 288 832 270.336 817.664 256 800 256L224 256ZM32 128L992 128C1009.68 128 1024 113.66399999999999 1024 96 1024 78.33600000000001 1009.68 64 992 64L32 64C14.32 64 0 78.33600000000001 0 96 0 113.66399999999999 14.32 128 32 128ZM224-64L800-64C817.664-64 832-78.33600000000001 832-96 832-113.66399999999999 817.664-128 800-128L224-128C206.32-128 192-113.66399999999999 192-96 192-78.33600000000001 206.32-64 224-64Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="align-right" unicode="&#58952;" d="M992 64L32 64C14.32 64 0 78.33600000000001 0 96 0 113.66399999999999 14.32 128 32 128L992 128C1009.68 128 1024 113.66399999999999 1024 96 1024 78.33600000000001 1009.68 64 992 64ZM992 256L288 256C270.32 256 256 270.336 256 288 256 305.664 270.32 320 288 320L992 320C1009.68 320 1024 305.664 1024 288 1024 270.336 1009.68 256 992 256ZM992 448L32 448C14.32 448 0 462.336 0 480 0 497.664 14.32 512 32 512L992 512C1009.68 512 1024 497.664 1024 480 1024 462.336 1009.68 448 992 448ZM992 640L288 640C270.32 640 256 654.336 256 672 256 689.664 270.32 704 288 704L992 704C1009.68 704 1024 689.664 1024 672 1024 654.336 1009.68 640 992 640ZM992 832L32 832C14.32 832 0 846.336 0 864 0 881.664 14.32 896 32 896L992 896C1009.68 896 1024 881.664 1024 864 1024 846.336 1009.68 832 992 832ZM288-64L992-64C1009.68-64 1024-78.33600000000001 1024-96 1024-113.66399999999999 1009.68-128 992-128L288-128C270.32-128 256-113.66399999999999 256-96 256-78.33600000000001 270.32-64 288-64Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="align-left" unicode="&#58953;" d="M992 448L32 448C14.336 448 0 462.336 0 480 0 497.664 14.336 512 32 512L992 512C1009.664 512 1024 497.664 1024 480 1024 462.336 1009.664 448 992 448ZM32 704L736 704C753.68 704 768 689.664 768 672 768 654.336 753.68 640 736 640L32 640C14.336 640 0 654.336 0 672 0 689.664 14.336 704 32 704ZM992 832L32 832C14.336 832 0 846.336 0 864 0 881.664 14.336 896 32 896L992 896C1009.664 896 1024 881.664 1024 864 1024 846.336 1009.664 832 992 832ZM32 320L736 320C753.68 320 768 305.664 768 288 768 270.336 753.68 256 736 256L32 256C14.336 256 0 270.336 0 288 0 305.664 14.336 320 32 320ZM32 128L992 128C1009.664 128 1024 113.66399999999999 1024 96 1024 78.33600000000001 1009.664 64 992 64L32 64C14.336 64 0 78.33600000000001 0 96 0 113.66399999999999 14.336 128 32 128ZM32-64L736-64C753.68-64 768-78.33600000000001 768-96 768-113.66399999999999 753.68-128 736-128L32-128C14.336-128 0-113.66399999999999 0-96 0-78.33600000000001 14.336-64 32-64Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="loading-1" unicode="&#58942;" d="M537.574469 831.696462c-14.123672 0-25.574469-11.447726-25.574469-25.574469 0-14.123672 11.450796-25.574469 25.574469-25.574469 204.495464 0 370.82877-166.358889 370.82877-370.82877 0-14.123672 11.450796-25.574469 25.574469-25.574469 14.123672 0 25.574469 11.450796 25.574469 25.574469C959.551152 642.385838 770.241552 831.696462 537.574469 831.696462z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="return" unicode="&#58972;" d="M927.858848 417.938973L168.863431 417.938973l308.721247 308.86758c11.685133 11.69025 11.435447 30.881334-0.557702 42.868343-11.992125 11.985986-31.18321 12.226462-42.868343 0.536212L75.199191 411.071565c-1.994424-1.662873-3.773953-3.583618-5.294586-5.713119-4.047176-5.373381-6.013971-11.839653-5.9055-18.328437-0.12996-7.794523 2.725064-15.561417 8.595772-21.432125l361.565802-361.744881c11.685133-11.691273 30.876218-11.449773 42.868343 0.535189 11.993149 11.985986 12.242835 31.17707 0.557702 42.868343L168.441828 356.54571799999997l759.417019 0c16.527418 0 29.925566 13.738909 29.925566 30.694069S944.386266 417.938973 927.858848 417.938973z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="fonts-strong" unicode="&#58923;" d="M199.092919 848.487893l355.326704 0c70.335928 0 122.780371-2.942005 157.349701-8.809643 34.568307-5.884011 65.491597-18.131963 92.78522-36.759205 27.27725-18.627243 50.01409-43.427068 68.209498-74.397431 18.195408-30.986735 27.293623-65.699328 27.293623-104.169501 0-41.7161-11.17655-79.977519-33.496905-114.802676s-52.604078-60.951187-90.818425-78.362742c54.075593-15.765055 95.647407-42.626843 124.715443-80.585363s43.602054-82.58388 43.602054-133.877103c0-40.388872-9.417487-79.673597-28.220738-117.839849-18.803251-38.182624-44.482097-68.673056-77.035514-91.489714-32.55444-22.833031-72.702835-36.855396-120.414487-42.09984-29.931706-3.229554-102.122889-5.260817-216.572524-6.060019L199.092919-40.765192999999954 199.092919 848.487893zM378.171504 700.1084940000001l0-205.684546 117.64849 0c69.935816 0 113.410979 1.006933 130.390699 3.038196 30.730908 3.629667 54.891168 14.246469 72.478731 31.850405 17.588587 17.588587 26.381857 40.756239 26.381857 69.473281 0 27.501354-7.594979 49.838082-22.75219 67.042929-15.158235 17.188474-37.702694 27.597545-67.618027 31.242562-17.796318 2.01489-68.945255 3.038196-153.431461 3.038196L378.171504 700.109518zM378.171504 346.04454999999996l0-236.383732 166.622902 0c64.85203 0 106.008382 1.807159 123.43631 5.420453 26.750247 4.828982 48.543599 16.58063 65.363683 35.272341s25.247011 43.714617 25.247011 75.085092c0 26.526143-6.491855 49.03888-19.459191 67.538209-12.983709 18.48398-31.722492 31.961946-56.250118 40.404222s-77.739549 12.663414-159.619394 12.663414L378.171504 346.04454999999996z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="upload" unicode="&#59004;" d="M831.488 478.208C831.488 478.208 831.488 478.208 831.488 478.208c0 143.36-114.688 258.048-253.952 258.048-98.304 0-184.32-57.344-225.28-139.264C327.68 605.184 307.2 609.28 286.72 609.28c-90.112 0-159.744-73.728-159.744-159.744 0-16.384 4.096-28.672 8.192-40.96C57.344 379.904 0 310.27200000000005 0 224.25599999999997c0-106.496 86.016-192.512 192.512-192.512l192.512 0 0 192.512L258.048 224.25599999999997l258.048 258.048 258.048-258.048-126.976 0 0-192.512 192.512 0L839.68 35.84000000000003c106.496 16.384 192.512 110.592 192.512 221.184C1024 371.712 937.984 465.92 831.488 478.208z"  horiz-adv-x="1033" />
+
+    
+    <glyph glyph-name="dialogue" unicode="&#58938;" d="M998.4 500.992C998.4 682.24 811.392 829.696 581.632 829.696c-121.216 0-235.904-41.472-315.264-114.048 37.504 8.192 76.416 13.056 115.456 14.464 59.264 30.592 128.256 46.72 199.808 46.72 198.144 0 359.296-123.776 359.296-275.968 0-31.872-7.04-63.232-20.992-93.056 7.552-28.16 11.264-57.344 11.008-86.528C975.104 374.784 998.4 436.736 998.4 500.992L998.4 500.992zM442.368 398.72c-30.72 0-55.808-23.04-55.808-51.328s25.088-51.328 55.808-51.328 55.808 23.04 55.808 51.328S473.088 398.72 442.368 398.72zM243.328 398.72c-30.72 0-55.808-23.04-55.808-51.328s25.088-51.328 55.808-51.328 55.808 23.04 55.808 51.328C299.264 375.67999999999995 274.176 398.72 243.328 398.72zM641.28 398.72c-30.72 0-55.808-23.04-55.808-51.328s25.088-51.328 55.808-51.328 55.808 23.04 55.808 51.328S672.128 398.72 641.28 398.72zM442.368 677.888C212.608 677.888 25.6 530.432 25.6 349.312c0-179.968 173.696-296.192 332.544-321.664l60.8-78.336c5.632-7.424 14.464-11.008 23.296-11.008 8.832 0 17.792 3.712 23.424 11.008l60.8 78.464C685.312 53.24800000000005 859.008 169.47199999999998 859.008 349.44000000000005 859.136 530.432 672.128 677.888 442.368 677.888zM714.88 173.82399999999996c-52.224-45.184-124.288-77.952-197.376-89.6C503.168 81.91999999999996 490.112 74.24000000000001 481.28 62.72000000000003l-38.784-49.92-38.912 49.92c-8.96 11.52-21.888 19.2-36.224 21.504-73.216 11.776-145.152 44.416-197.376 89.728-39.68 34.304-86.912 92.544-86.912 175.36 0 69.76 35.584 136.192 100.352 187.264 68.736 54.144 160.768 84.096 258.944 84.096 98.304 0 190.336-29.824 259.072-84.096 64.768-51.072 100.352-117.504 100.352-187.264C801.664 266.36800000000005 754.56 208.12800000000004 714.88 173.82399999999996z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="video" unicode="&#59117;" d="M952.523633 599.2477269999999L952.523633 599.2477269999999 952.523633 599.2477269999999zM100.53762400000005 661.054062C100.53762400000005 661.054062 100.53762400000005 661.054062 100.53762400000005 661.054062 100.53762400000005 661.054062 100.53762400000005 661.054062 100.53762400000005 661.054062zM100.74228 720.404517L100.74228 720.404517 100.74228 720.404517zM660.990107 739.9449716666666c8.697911 0 17.498151-0.511642 25.684421-2.353553 12.279404-2.865194 23.22854-8.18627 34.382332-16.679524 15.144599-11.460777 26.196063-29.572899 32.02878-52.187469 3.479165-13.405016 2.967523-28.651944 2.558209-42.05696-0.102328-4.195463-0.204657-8.083941-0.204657-11.665434l0-37.759169 101.407415 70.401919 25.479764 17.60048c0.511642 0.306985 1.330269 1.023284 2.148896 1.637254 4.40012 3.376836 11.051464 8.595583 20.977316 11.051464 3.274508 0.818627 6.549016 1.22794 10.02818 1.22794 9.618867 0 19.44239-3.274508 27.730987999999996-9.311882 18.82842-13.916657999999998 18.726092-35.405616 18.726092-51.061857 0-1.023284 0-2.148896 0-3.172179l0-409.620466c0-15.963226 0.102328-37.963825-19.647047-51.982812-6.753672-4.809433-16.679524-8.390926-27.219346-8.390926-5.01409 0-10.130509 0.818627-15.144599 2.762866-7.162986 2.762866-12.279404 6.856000999999999-16.065554 9.823524-0.920955 0.716299-1.841911 1.432597-2.353553 1.841911l-24.968122 17.395823-101.10043 70.094934 0-37.963825c0-3.581493 0.102328-7.367643 0.204657-11.460777 0.409313-14.735285 0.818627-29.982212-2.865194-43.796542-5.62806-21.488957999999997-16.679524-39.396423-31.107825-50.447886-7.879285-6.037374-18.930748-13.405016-34.075347-16.986509-7.776956-1.841911-16.167882-2.353553-24.45648-2.353553-4.297792 0-8.595583 0.102328-12.688718 0.204657-3.683821 0.102328-7.162986 0.204657-10.232837 0.204657L167.15339300000005 84.94107466666674c-1.944239 0-3.888478 0-5.832717 0-1.944239 0-3.990806 0-5.935045 0-16.577196 0-33.461377 0.61397-47.787349 6.549016-27.935644999999997 11.563106-46.764065 37.759169-53.006096 73.574098l-0.409313 2.251224 0 2.353553c-0.102328 18.930748-0.204657 37.861497-0.306985 56.792245l0 0.511642L53.87588699999998 598.0155226666666c0 4.40012-0.102328 8.902568-0.102328 13.712001999999998-0.306985 27.01469-0.716299 54.950335 9.311882 76.643949 9.823524 21.284300999999996 27.526331999999996 38.066154 48.708304 45.945438 5.730389 2.148896 11.051464 2.762866 15.04227 3.172179 1.023284 0.102328 2.353553 0.306985 3.069851 0.409313l4.093135 1.534926 500.9997 0c3.581493 0 7.572299 0.102328 11.767763 0.306985C651.166583 739.7403146666667 656.078345 739.9449716666666 660.990107 739.9449716666666M304.273409 266.7785886666668L559.889677 394.2797376666667l0 33.973019L304.273409 555.9585626666667 304.273409 266.7785886666668M660.990107 780.8763196666666c-5.62806 0-10.949136-0.204657-15.758569-0.306985-3.888478-0.102328-7.469971-0.204657-10.437494-0.204657L133.79434400000002 780.3646776666667l-7.265314 0-6.446687-2.353553c-5.3210749999999996-0.61397-13.609673-1.841911-22.716898-5.218747-31.210153-11.665434-57.303887-36.121915-71.629859-67.229739-13.814329999999998-30.084541-13.405016-64.159888-12.995703-94.244429 0.102328-4.604777 0.102328-9.004897 0.102328-13.20036l0-371.349655 0-0.102328 0-0.102328 0-0.511642c0.102328-18.930748 0.204657-37.861497 0.306985-56.792245l0-2.251224 0-3.479165 0.61397-3.376836 0.409313-2.251224c4.195463-23.944839 12.791046-45.126811 25.479764-62.727291 13.609673-18.82842 31.107825-32.847407 52.08514-41.545318 21.488957999999997-8.902568 44.001199-9.618867 63.443589-9.618867 2.046567 0 4.093135 0 6.139702 0 1.841911 0 3.78615 0 5.62806 0l473.166384 0c2.558209 0 5.62806-0.102328 9.004897-0.204657 4.195463-0.102328 8.902568-0.306985 13.916657999999998-0.306985 13.302688 0 24.149495 1.125612 33.973019 3.479165 22.819227 5.423404 39.089437 16.474868 49.322274 24.251824 21.693613999999997 16.577196 37.963825 42.363944999999994 45.84311 72.653143 2.251224 8.595583 3.376836 17.088838 3.990806 25.377436l36.838213-25.582093 24.558809-17.088838c0.306985-0.204657 0.61397-0.511642 0.920955-0.716299 4.809433-3.683821 13.609673-10.642149999999999 26.400719-15.656241 9.516538-3.683821 19.647047-5.62806 30.084541-5.62806 18.009793 0 36.53122799999999 5.832717 50.8572 15.963226 16.577196 11.767763 27.730987999999996 27.935644999999997 33.052064 48.094334 3.78615 14.4283 3.78615 27.628659999999996 3.78615 37.34985499999999l0 409.518137c0 0.920955 0 1.739582 0 2.660538l0 0.409313c0 9.41421 0.102328 22.409913-3.479165 36.53122799999999-5.116419 19.749375-15.758569 35.81493-31.721795 47.68502-15.144599 11.153792-33.666034 17.293495-52.08514 17.293495-6.753672 0-13.507345-0.818627-19.954032-2.455881-18.21445-4.604777-30.289198-13.916657999999998-36.019586-18.419107l0 0c-0.204657-0.204657-0.511642-0.409313-0.716299-0.511642l-25.172779-17.293495-0.102328 0-0.102328 0-37.14519799999999-25.786749c-0.511642 7.674628-1.637254 15.553912-3.683821 23.433197-8.18627 31.721795-24.354152 57.508544-46.866394 74.597382-15.758569 11.972419-32.02878 19.851704-49.833916 23.944839C685.8559009999999 779.7507076666667 674.702109 780.8763196666666 660.990107 780.8763196666666L660.990107 780.8763196666666zM345.204757 332.9850436666668L345.204757 489.75210666666663l157.074048-78.48586L345.204757 332.9850436666668 345.204757 332.9850436666668zM347.455981 429.177975L347.455981 308.02118499999995 347.455981 429.177975Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="headset" unicode="&#59132;" d="M356.285031 2.1522690000000466L356.396571 2.1522690000000466 356.396571 285.236626 253.462201 285.236626 253.462201 2.1522690000000466ZM665.076886 285.236626l103.042841 0 0-283.08538-103.042841 0 0 283.08538ZM63.809793 301.950286c0-38.758746-3.195785-112.220874 5.457292-148.208507l65.735144 0c-10.112312 35.644825-7.747451 109.176538-7.747451 148.208507 0 219.937155 172.264389 398.231887 384.763131 398.231887 212.498742 0 384.763131-178.294732 384.763131-398.231887 0-39.031968 2.266623-112.563682-7.845689-148.208507l65.735144 0c8.653077 35.987632 5.555529 109.449761 5.555529 148.208507 0 256.20415-200.670346 463.898469-448.208115 463.898469C264.479115 765.848755 63.809793 558.1544349999999 63.809793 301.950286z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="cellphone-fine" unicode="&#58939;" d="M731.514252 896L292.485748 896C195.323702 896 116.154627 816.830925 116.154627 719.6688790000001l0-671.337759c0-97.162046 79.169075-176.331121 176.331121-176.331121l438.628661 0c97.162046 0 176.331121 79.169075 176.331121 176.331121L907.445529 719.6688790000001C907.845373 816.830925 828.676298 896 731.514252 896zM292.485748 853.216712l438.628661 0c70.772355 0 128.349863-55.178446 133.147989-124.751269L159.737602 728.465443C164.135884 798.038266 222.113237 853.216712 292.485748 853.216712zM865.062085 48.73096399999997c0-73.571261-59.976572-133.547833-133.547833-133.547833L292.485748-84.816868c-73.571261 0-133.547833 59.976572-133.547833 133.547833l0 45.582194 705.724326 0L864.662241 48.73096399999997zM865.062085 137.096447L158.937915 137.096447 158.937915 685.682155l705.724326 0L864.662241 137.096447zM512-54.82858299999998c13.59469 0 26.789535 5.597813 36.385787 15.194065 9.596251 9.596251 15.194065 22.791097 15.194065 36.385787 0 13.59469-5.597813 26.789535-15.194065 36.385787-9.596251 9.596251-22.791097 15.194065-36.385787 15.194065-13.59469 0-26.789535-5.597813-36.385787-15.194065-9.596251-9.596251-15.194065-22.791097-15.194065-36.385787 0-13.59469 5.597813-26.789535 15.194065-36.385787C485.210465-49.23076900000001 498.40531-54.82858299999998 512-54.82858299999998z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="add-1" unicode="&#58964;" d="M566.935 57.63900000000001c0-30.366-24.612-54.972-54.935-54.972v0c-30.384 0-54.996 24.612-54.996 54.972v610.057c0 30.361 24.612 54.972 54.996 54.972v0c30.33 0 54.935-24.612 54.935-54.972v-610.057zM817.004 417.633c30.384 0 54.996-24.606 54.996-54.966v0c0-30.354-24.612-54.966-54.996-54.966h-610.062c-30.33 0-54.942 24.612-54.942 54.966v0c0 30.359 24.612 54.966 54.942 54.966h610.062zM817.004 417.633z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="face-smile-b" unicode="&#58960;" d="M511.931733-128c-136.738133 0-265.284267 53.213867-361.984 149.879467C53.282133 118.51093300000002 0 247.09119999999996 0 384c0 136.738133 53.282133 265.3184 150.050133 362.0864C246.749867 842.683733 375.296 896 512.136533 896s265.4208-53.316267 362.1888-149.9136c199.645867-199.714133 199.543467-524.5952 0-724.206933C777.454933-74.71786699999996 648.772267-128 511.931733-128L511.931733-128 511.931733-128 511.931733-128 511.931733-128 511.931733-128zM512.034133 829.303467c-118.920533 0-230.741333-46.2848-314.914133-130.389333C113.083733 614.8778669999999 66.7648 502.8864 66.7648 384c0-118.9888 46.2848-230.912 130.3552-315.016533 84.0704-84.0704 195.857067-130.321067 314.811733-130.321067 119.022933 0 230.946133 46.318933 315.016533 130.423467 173.704533 173.636267 173.704533 456.157867 0 629.794133C742.877867 782.984533 631.057067 829.303467 512.034133 829.303467L512.034133 829.303467 512.034133 829.303467 512.034133 829.303467 512.034133 829.303467 512.034133 829.303467zM330.103467 244.25813300000004c0 0 59.904-95.9488 181.828267-95.9488s201.8304 95.9488 201.8304 95.9488 45.294933 0.136533 45.192533-47.957333c0 0-78.506667-111.8208-247.022933-111.8208s-223.368533 111.8208-223.368533 111.8208S286.856533 244.25813300000004 330.103467 244.25813300000004L330.103467 244.25813300000004 330.103467 244.25813300000004 330.103467 244.25813300000004 330.103467 244.25813300000004zM363.2128 548.590933c-34.5088 0-62.702933-28.091733-62.702933-62.737067 0-34.679467 28.194133-62.6688 62.702933-62.6688 34.679467 0 62.702933 28.091733 62.702933 62.6688C425.915733 520.4992 397.858133 548.590933 363.2128 548.590933L363.2128 548.590933 363.2128 548.590933 363.2128 548.590933 363.2128 548.590933 363.2128 548.590933zM684.544 548.590933c-34.679467 0-62.702933-28.091733-62.702933-62.737067 0-34.679467 28.023467-62.6688 62.702933-62.6688 34.6112 0 62.600533 28.091733 62.600533 62.6688C747.144533 520.4992 719.121067 548.590933 684.544 548.590933L684.544 548.590933 684.544 548.590933 684.544 548.590933 684.544 548.590933 684.544 548.590933zM684.544 548.590933"  horiz-adv-x="1025" />
+
+    
+    <glyph glyph-name="fonts-html" unicode="&#58955;" d="M194.33 416.235h-101.295v101.28h-46.035v-267.03h46.035v119.7h101.28v-119.7h46.035v267.03h-46.035v-101.28zM277.205 480.69h73.665v-230.205h46.035v230.205h73.665v36.825h-193.365v-36.825zM627.815 335.58000000000004l-46.755 181.935h-73.665v-267.03h46.035v211.785l46.035-211.785h55.245l46.83 213.93-0.795-213.93h46.035v267.03h-73.665l-45.3-181.935zM848.09 287.30999999999995v230.205h-46.035v-267.03h174.945v36.825h-128.91z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="screen-full" unicode="&#58914;" d="M641.750109 511.899972l205.227128 204.519-0.704035-115.89966c-0.282433-9.611915 7.489578-18.09103 17.101493-17.808598l12.297071 0c9.611915 0.283456 17.667382 5.936199 17.808598 15.689331l0.565888 172.57752c0 0.14224 0.282433 9.187243 0.282433 9.187243 0.14224 4.804423-0.99056 9.187243-4.100388 12.297071-3.109828 3.109828-7.347339 5.086855-12.297071 4.946662l-8.763594-0.14224c-0.141216 0-0.278339 0-0.420579-0.14224L697.581696 797.833213c-9.611915-0.283456-17.667382-8.200776-17.808598-17.950837l0-12.297071c1.416256-11.44875 10.458189-18.092054 20.070104-17.808598l112.789832-0.283456-204.66124-203.814965c-9.329483-9.329483-9.329483-24.449855 0-33.778314 9.329483-9.470699 24.452925-9.470699 33.782408 0L641.750109 511.899972zM383.095141 319.11010699999997L177.726797 115.29411900000002l0.707105 115.338888c0.283456 9.607822-7.492648 18.086937-17.104563 17.808598l-13.001105 0c-9.611915-0.283456-17.667382-5.937223-17.808598-15.690354l-0.565888-172.718737c0-0.14224-0.282433-9.187243-0.282433-9.187243-0.14224-4.808516 0.99056-9.187243 4.096295-12.297071 3.109828-3.109828 7.351432-5.086855 12.297071-4.946662l8.762571 0.14224c0.14224 0 0.283456 0 0.425695 0.14224l171.873486-0.708128c9.607822 0.283456 17.667382 8.196683 17.808598 17.950837L344.93503 63.42477399999996c-1.415232 11.44875-10.461259 18.092054-20.074198 17.808598L212.069977 81.51682800000003 416.59 285.32872299999997c9.329483 9.329483 9.329483 24.453948 0 33.782408C407.40685 328.58182999999997 392.424624 328.58182999999997 383.095141 319.11010699999997L383.095141 319.11010699999997zM894.047276 60.03251399999999l-0.424672 172.718737c-0.283456 9.612938-8.200776 15.406898-17.809621 15.690354l-12.296047 0c-9.612938 0.278339-17.243733-8.200776-17.105586-17.808598l0.708128-115.903753L641.750109 319.11010699999997c-9.329483 9.329483-24.452925 9.329483-33.782408 0-9.325389-9.328459-9.325389-24.452925 0-33.782408L812.490795 81.51682800000003l-112.789832-0.283456c-9.611915 0.283456-18.515702-6.502088-20.073174-17.808598l0-12.297071c0.282433-9.611915 8.200776-17.667382 17.808598-17.950837l171.166381 0.708128c0.141216 0 0.282433-0.14224 0.424672-0.14224l8.763594-0.14224c4.803399-0.141216 9.187243 1.694595 12.296047 4.946662 3.109828 3.109828 4.238534 7.488555 4.097318 12.297071 0 0-0.14224 9.046027-0.14224 9.187243L894.047276 60.03149099999996zM212.216309 749.493252l112.789832 0.283456c9.607822-0.283456 18.512632 6.502088 20.070104 17.808598L345.076246 779.883399c-0.283456 9.611915-8.196683 17.667382-17.808598 17.950837l-172.011632-0.708128c-0.14224 0-0.283456 0.14224-0.425695 0.14224l-8.761548 0.14224c-4.808516 0.141216-9.187243-1.694595-12.297071-4.946662-3.109828-3.109828-4.242627-7.488555-4.096295-12.297071 0 0 0.282433-9.046027 0.282433-9.187243l0.420579-172.718737c0.14224-9.608845 8.200776-15.406898 17.808598-15.686261l13.005198 0c9.611915-0.282433 17.242709 8.196683 17.10047 17.808598l-0.564865 115.334795 205.231221-203.958228c9.324366-9.329483 24.448832-9.329483 33.777291 0 9.329483 9.329483 9.329483 24.452925 0 33.782408L212.216309 749.493252 212.216309 749.493252zM212.216309 749.493252"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="form" unicode="&#58940;" d="M314.278111 437.019389l395.439892 0 0-30.297458-395.439892 0L314.278111 437.019389zM314.278111 315.83495200000004l395.439892 0 0-30.297458-395.439892 0L314.278111 315.83495200000004zM314.278111 194.62833l263.626661 0 0-30.297458L314.278111 164.330872 314.278111 194.62833zM609.376235 739.9931730000001c-7.849678 42.966669-48.394988 75.742447-97.378777 75.742447-48.961604 0-89.51311-32.775778-97.380776-75.742447L116.55177 739.9931730000001l0-787.725922 790.893774 0 0 787.725922L609.376235 739.9931730000001zM446.091342 670.440529l0 17.613058 0 36.791056c0 33.410348 29.57295 60.594317 65.906116 60.594317 36.352353 0 65.907115-27.183969 65.907115-60.594317l0-36.791056 0-17.621053 16.672696-8.712493c32.358061-16.929922 57.169039-42.663874 71.406386-73.213161L358.043239 588.50688c14.240345 30.555683 39.051523 56.281241 71.408385 73.213161L446.091342 670.440529zM874.489888-17.436289999999985L149.505227-17.436289999999985 149.505227 709.694715 413.138884 709.694715l0-21.641327c-51.44492-26.923746-88.727643-74.124144-98.86377-129.845165l395.44289 0c-10.102151 55.730615-47.40466 102.921419-98.859773 129.845165l0 21.641327 263.631658 0L874.489888-17.436289999999985z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="cart" unicode="&#58967;" d="M365.920994 84.618469c-39.030945 0-70.78516-31.754215-70.78516-70.78516s31.754215-70.784136 70.78516-70.784136c39.030945 0 70.784136 31.753191 70.784136 70.784136S404.951939 84.618469 365.920994 84.618469zM365.920994-5.784493999999995c-10.818393 0-19.61985 8.801457-19.61985 19.618826 0 10.818393 8.801457 19.61985 19.61985 19.61985s19.618826-8.801457 19.618826-19.61985C385.540843 3.015939000000003 376.739387-5.784493999999995 365.920994-5.784493999999995zM808.821219 84.618469c-39.030945 0-70.784136-31.754215-70.784136-70.78516s31.753191-70.784136 70.784136-70.784136 70.78516 31.753191 70.78516 70.784136S847.852164 84.618469 808.821219 84.618469zM808.821219-5.784493999999995c-10.81737 0-19.618826 8.801457-19.618826 19.618826 0 10.818393 8.801457 19.61985 19.618826 19.61985 10.818393 0 19.61985-8.801457 19.61985-19.61985C828.441069 3.015939000000003 819.640636-5.784493999999995 808.821219-5.784493999999995zM443.99107 305.940157c-14.057157-1.416256-24.305569-13.959943-22.890336-28.0171 1.328251-13.187347 12.446473-23.02132 25.423019-23.02132 0.856507 0 1.723248 0.042979 2.594081 0.130983l439.314561 44.245713c0.088004 0.007163 0.174985 0.01842 0.261966 0.026606l0.180102 0.01842c0.50449 0.051165 1.001817 0.119727 1.496074 0.198521 0.222057 0.035816 0.443092 0.076748 0.663102 0.11768 0.552585 0.103354 1.100054 0.217964 1.638313 0.355087 0.085958 0.022513 0.169869 0.047072 0.254803 0.069585 0.586354 0.156566 1.161453 0.334621 1.728364 0.530073 0.077771 0.026606 0.155543 0.051165 0.233314 0.078795 0.626263 0.222057 1.239224 0.469698 1.840928 0.737804 0.039909 0.017396 0.078795 0.035816 0.118704 0.054235 1.277086 0.577145 2.496867 1.252527 3.647063 2.020006 0.001023 0.001023 0.002047 0.001023 0.00307 0.002047 0.553609 0.369414 1.088798 0.76134 1.609661 1.170662 0.069585 0.054235 0.137123 0.10847 0.205685 0.163729 0.48607 0.38988 0.958838 0.795109 1.413186 1.218758 0.092098 0.084934 0.180102 0.173962 0.270153 0.25992 0.394996 0.378623 0.778736 0.76748 1.14815 1.169639 0.11154 0.121773 0.222057 0.243547 0.331551 0.367367 0.333598 0.3776 0.653893 0.766456 0.964978 1.163499 0.12382 0.158612 0.249687 0.314155 0.370437 0.475837 0.322341 0.432859 0.629333 0.876973 0.925069 1.329275 0.113587 0.173962 0.224104 0.348947 0.333598 0.525979 0.296759 0.479931 0.580215 0.968048 0.845251 1.467421 0.069585 0.130983 0.134053 0.265036 0.201591 0.397043 0.289596 0.568958 0.563842 1.147126 0.811482 1.738597 0.00307 0.007163 0.005117 0.014326 0.008186 0.021489 0.569982 1.369184 1.019213 2.796696 1.345648 4.26514 0 0.001023 0 0.002047 0.001023 0.00307l0.00307 0.013303c0.035816 0.162706 0.075725 0.323365 0.10847 0.487094l56.17951 252.734118c0.895393 4.030803 0.780783 8.04728-0.165776 11.794627 0.50449 2.003634 0.774643 4.101411 0.774643 6.261611 0 14.128789-11.452843 25.582655-25.582655 25.582655L195.47502 616.098125l-52.358485 159.553902c-3.631714 11.067057-14.093996 17.972327-25.177426 17.590634-0.207731 0.005117-0.413416 0.01535-0.62217 0.01535L54.663994 793.258011c-14.128789 0-25.582655-11.453866-25.582655-25.582655s11.453866-25.582655 25.582655-25.582655l45.614897 0 197.955514-603.235934c3.536546-10.776438 13.546527-17.613146 24.303522-17.613146 2.067079 0 4.16281 0.26299 6.245238 0.788969l567.583946 0c14.129812 0 25.582655 11.453866 25.582655 25.582655s-11.452843 25.582655-25.582655 25.582655L340.816223 173.1979 212.265428 564.933839l701.224666 0-48.137347-216.557174L443.99107 305.940157z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="camera-fill" unicode="&#58973;" d="M512 480C436.515555 480 375.111111 419.712 375.111111 345.6 375.111111 271.48800000000006 436.515555 211.20000000000005 512 211.20000000000005 587.484446 211.20000000000005 648.888887 271.48800000000006 648.888887 345.6 648.888887 419.712 587.484446 480 512 480M512 172.79999999999995C414.808889 172.79999999999995 336 250.15679999999998 336 345.6 336 441.0432 414.808889 518.4 512 518.4 609.210667 518.4 688 441.0432 688 345.6 688 250.15679999999998 609.210667 172.79999999999995 512 172.79999999999995M903.111113 691.2L723.767113 691.2C713.383113 691.2 703.448887 695.2512 696.115554 702.4512L640.792887 756.7488C633.459554 763.9488 623.505779 768 613.141333 768L512 768 410.878222 768C400.494222 768 390.56 763.9488 383.226667 756.7488L327.904 702.4512C320.570667 695.2512 310.616889 691.2 300.252445 691.2L120.888889 691.2C77.866667 691.2 42.666667 656.64 42.666667 614.4L42.666667 76.79999999999995C42.666667 34.559999999999945 77.866667 0 120.888889 0L903.111113 0C946.133333 0 981.333333 34.559999999999945 981.333333 76.79999999999995L981.333333 614.4C981.333333 656.64 946.133333 691.2 903.111113 691.2"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="tabs" unicode="&#58922;" d="M310.30303 523.636364L124.121212 523.636364c-17.128727 0-31.030303-13.901576-31.030303-31.030303l0-186.181818c0-17.128727 13.901576-31.030303 31.030303-31.030303l186.181818 0c17.128727 0 31.030303 13.901576 31.030303 31.030303L341.333333 492.606061C341.333333 509.734788 327.431758 523.636364 310.30303 523.636364zM294.787879 306.42424200000005L139.636364 306.42424200000005c-17.128727 0-15.515152-1.613576-15.515152 15.515152L124.121212 477.090909c0 17.128727-1.613576 15.515152 15.515152 15.515152l155.151515 0c17.128727 0 15.515152 1.613576 15.515152-15.515152l0-155.151515C310.30303 304.81066699999997 311.916606 306.42424200000005 294.787879 306.42424200000005zM418.909091 352.969697l480.969697 0 0 31.030303L418.909091 384 418.909091 352.969697zM418.909091 228.84848499999998l480.969697 0 0 31.030303L418.909091 259.878788 418.909091 228.84848499999998zM418.909091 89.21212100000002l480.969697 0 0 31.030303L418.909091 120.24242400000003 418.909091 89.21212100000002zM418.909091 492.606061l480.969697 0 0 31.030303L418.909091 523.636364 418.909091 492.606061zM992.969697 725.333333l-15.515152 0L977.454545 849.454545c0 17.128727-13.901576 31.030303-31.030303 31.030303L775.757576 880.484848c-17.128727 0-31.030303-13.901576-31.030303-31.030303l0-124.121212-139.636364 0L605.090909 849.454545c0 17.128727-13.901576 31.030303-31.030303 31.030303L403.393939 880.484848c-17.128727 0-31.030303-13.901576-31.030303-31.030303l0-124.121212-124.121212 0L248.242424 849.454545c0 17.128727-13.901576 31.030303-31.030303 31.030303L31.030303 880.484848C13.901576 880.484848 0 866.583273 0 849.454545l0-946.424242c0-17.128727 13.901576-31.030303 31.030303-31.030303l961.939394 0c17.128727 0 31.030303 13.901576 31.030303 31.030303L1024 694.30303C1024 711.431758 1010.098424 725.333333 992.969697 725.333333zM992.969697-65.939394c0-17.128727-13.901576-31.030303-31.030303-31.030303L62.060606-96.969697c-17.128727 0-31.030303 13.901576-31.030303 31.030303L31.030303 818.424242c0 17.128727 13.901576 31.030303 31.030303 31.030303l124.121212 0c17.128727 0 31.030303-13.901576 31.030303-31.030303l0-124.121212 744.727273 0c17.128727 0 31.030303-13.901576 31.030303-31.030303L992.969697-65.939394z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="heart-fill" unicode="&#59023;" d="M729.068827 776.44202c-94.686523 0-176.905082-48.314379-217.069851-118.640074-40.163745 70.325695-122.382305 118.640074-217.044268 118.640074-143.767358 0-229.665727-123.660414-229.665727-243.219417 0-283.128359 415.870616-527.841803 433.576883-538.126031 4.062526-2.363837 8.584516-3.538593 13.132088-3.538593 4.547573 0 9.070586 1.174756 13.132088 3.538593 17.706267 10.283204 433.576883 254.997672 433.576883 538.126031C958.708971 652.781606 872.811626 776.44202 729.068827 776.44202z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="fonts-code" unicode="&#58958;" d="M270 626c-12 12-32 12-44 0L9 409c-12-12-12-32 0-44l217-217c6-6 14-9 22-9s16 3 22 9c12 12 12 32 0 44L75 387 270 582C282 595 282 614 270 626zM1015 409L798 626c-12 12-32 12-44 0-12-12-12-32 0-44l195-195L754 192c-12-12-12-32 0-44 6-6 14-9 22-9s16 3 22 9l217 217C1027 377 1027 397 1015 409zM624 696L624 696c-16 6-34-3-40-19L382 119c-6-16 2-34 19-40l0 0c16-6 34 3 40 19l202 558C648 672 640 690 624 696z"  horiz-adv-x="1025" />
+
+    
+    <glyph glyph-name="ios" unicode="&#59008;" d="M821.235026 351.984884c-1.287001 129.729651 105.791442 191.891776 110.553344 194.980577-60.102924 88.030835-153.796561 100.12864-187.258574 101.54434-79.794032 7.979403-155.598362-46.975519-196.010178-46.975519-40.411816 0-102.831341 45.688518-168.983167 44.530218-86.872534-1.287001-167.052666-50.57912-211.840284-128.442651-90.347436-156.756662-23.166009-388.931554 64.864826-515.958505 42.985817-62.162125 94.337137-132.046252 161.647264-129.600951 64.864826 2.574001 89.317835 41.956217 167.696167 41.956217s100.38604-41.956217 169.111867-40.669216c69.755428 1.287001 114.028245 63.449125 156.756662 125.86865 49.42082 72.200729 69.755428 142.084856 70.913728 145.559758C957.14228 145.550002 822.522026 197.030023 821.235026 351.984884L821.235026 351.984884 821.235026 351.984884zM692.277575 732.550935c35.778614 43.371917 59.845524 103.474841 53.281821 163.449065-51.48002-2.059201-113.899545-34.234214-150.83646-77.477431C561.647023 780.041254 532.560811 718.78003 540.411514 660.092806 597.811737 655.588305 656.49896 689.307718 692.277575 732.550935L692.277575 732.550935 692.277575 732.550935z"  horiz-adv-x="1084" />
+
+    
+    <glyph glyph-name="at" unicode="&#59015;" d="M514.162246 831.556269c-246.201331 0-446.51045-200.783932-446.51045-447.571618 0-246.772336 201.037712-447.539896 448.157973-447.539896 50.29857 0 99.615788 8.224312 146.523121 24.436552 18.414395 6.370081 31.060413 12.423961 31.472805 12.630668 7.194866 3.217275 12.614296 9.049097 15.213493 16.401552 2.63092 7.305383 2.155083 15.133675-1.299599 22.043039l-2.883677 5.831822c-7.131421 14.262842-24.974811 20.569478-40.156582 13.850449-0.031722-0.031722-5.8001-3.02694-20.094664-8.082072-41.075511-14.627139-84.21196-22.059412-128.235616-22.059412-210.92592 0-382.487298 171.57775-382.487298 382.487298S305.423131 766.487298 516.349051 766.487298c210.894198 0 382.455575-171.5931 382.455575-382.423853-0.887206-51.868321-13.882172-100.486622-36.606733-136.855948-20.664645-33.104979-46.939055-51.994188-72.199369-51.994188-0.317225 0-0.601704 0-0.887206 0-45.829791 0.792039-75.433016 68.586075-75.433016 172.718737l0 185.269587c0 5.53097-1.426489 9.635451-4.373611 12.550851-4.944616 4.944616-12.360516 4.817726-21.267373 4.864798l-2.472308-0.016373-9.223059 0.016373c-7.701402-0.031722-13.469779 0.063445-17.495466-3.945869-3.645017-3.613294-4.119831-9.096169-4.119831-13.469779l0-31.060413c-45.196365 36.100196-80.440054 59.474556-131.9758 60.378136-1.045819 0.016373-2.059915 0.031722-3.074012 0.031722-108.74368 0-198.470237-99.218746-200.657043-222.779899-2.155083-124.701117 84.845387-227.723491 193.969737-229.625818 1.045819-0.01535 2.059915-0.031722 3.074012-0.031722 63.293535 0 122.276904 34.087353 159.992901 92.103698 24.373107-60.251246 61.519122-91.216491 110.48637-92.071975 0.697895-0.01535 1.394766-0.01535 2.060939-0.01535 33.945113 0 66.716494 14.610766 94.924953 42.328038 47.63695 46.796816 76.066443 124.796284 76.066443 208.643947l0 2.883677C959.595154 630.772336 759.761873 831.556269 514.162246 831.556269zM646.73975 354.651578c0-92.230588-58.475809-167.282934-130.390699-167.282934s-130.390699 75.052347-130.390699 167.282934c0 92.246961 58.475809 167.298284 130.390699 167.298284S646.73975 446.897515 646.73975 354.651578z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="fire" unicode="&#59222;" d="M890.059904 352.19948999999997C845.890699 458.956706 840.554889 548.4951550000001 857.396326 618.42714 859.144623 625.686731 860.991676 631.9776790000001 862.858846 637.425182 863.763607 640.064841 865.906573 645.659889 866.16406 646.532651L880.890349 696.448108 833.062903 675.9309969999999C832.106692 675.5208 830.618069 674.894716 827.426684 673.550492 824.667648 672.380966 822.310677 671.354022 819.868514 670.244809 813.291441 667.2575449999999 807.049466 664.090938 800.697749 660.4128450000001 784.089623 650.795565 768.486253 638.656896 753.86285 623.033596 727.630498 595.007563 706.526618 557.766355 691.78157 509.713231 675.041103 455.157161 671.516484 411.46006 673.004574 347.939834 673.477918 327.73476900000003 673.463923 322.197583 672.83965 318.324215 673.779618 324.156339 684.455526 333.67819899999995 696.104608 329.19567600000005 693.056849 330.36844199999996 685.695898 339.012828 676.314007 361.368339 660.550914 398.92921 646.834249 460.170272 636.817284 549.350468 625.445924 650.588768 630.103925 734.7280519999999 644.646978 801.338628 647.677924 815.221065 650.899934 827.082435 654.086773 836.904609 655.91465 842.538316 657.254607 846.094657 657.880284 847.554385L678.645286 896 628.243642 880.578031C617.409833 877.263087 599.94569 869.52239 578.105438 855.845223 542.547644 833.577626 507.199569 802.385036 474.400401 760.836776 447.596676 726.883228 423.611383 687.30061 403.118547 641.7016189999999 378.907516 587.829195 363.003277 542.798944 353.158029 503.238462 349.274261 487.632585 346.433259 473.323627 344.1945 458.925156 343.334411 453.39353 342.592734 448.063234 341.804612 441.911844 341.502524 439.553997 340.356619 430.329551 340.073506 428.145504 337.596047 409.033293 335.848224 404.35337 329.235273 398.312868 336.081933 404.566848 343.232634 404.098227 346.608002 402.086756 344.852318 403.133013 341.598345 406.493651 337.991853 411.887149 327.030897 428.279226 317.980358 454.883162 313.690598 489.339595 311.250185 508.941598 310.203772 539.08627 310.370048 576.545325 310.480474 601.422138 311.113088 628.122479 312.099068 654.977888 312.481453 665.393013 312.891081 675.105466 313.30045 683.8491750000001 313.545346 689.079919 313.735044 692.813105 313.84201 694.783403L317.55517 763.179488 271.360516 712.604139C270.467691 711.626645 268.852992 709.837042 266.618705 707.326295 262.927895 703.178805 258.823678 698.493751 254.407949 693.3614689999999 241.78797 678.693606 229.164348 663.340425 217.341267 648.004036 211.724185 640.717803 206.411389 633.591345 201.450577 626.6638379999999 176.017063 591.147305 156.617347 555.4025280000001 138.122768 512.155497 90.841957 401.595812 76.97672 299.64870599999995 99.261816 188.13489300000003 126.80821 50.29373899999996 188.553235-37.64422200000001 278.8297-84.690336 344.19104-118.75233700000001 408.837235-128 507.940695-128 525.713007-128 557.977207-125.567138 590.857378-120.46215900000004 641.152493-112.65333099999998 687.496192-99.78932299999997 726.063273-80.59104400000001 738.155853-74.57148800000004 743.07901-59.88870199999997 737.059454-47.79612199999997 731.039898-35.70354299999997 716.357111-30.780384000000026 704.264531-36.79993999999999 670.855859-53.43041900000003 629.092954-65.02289699999994 583.352478-72.12456999999995 552.984316-76.83953499999996 523.228215-79.08327499999996 507.940695-79.08327499999996 416.16215-79.08327499999996 357.934257-70.75375399999996 301.436271-41.310745999999995 224.830174-1.3887230000000272 171.977796 73.88423 147.230072 197.72094500000003 126.99711 298.965952 139.514783 391.004811 183.099329 492.921284 200.282663 533.1021499999999 218.020237 565.784358 241.22153 598.183718 245.831691 604.6215589999999 250.802959 611.289899 256.082244 618.137961 267.31885 632.713596 279.402035 647.409487 291.488864 661.457681 298.732051 669.8762429999999 304.338773 676.1767130000001 307.478705 679.614406L264.997214 697.435142C264.883874 695.347445 264.688038 691.493511 264.43725 686.13688 264.020474 677.234965 263.603959 667.359281 263.215279 656.7726250000001 262.21142 629.430212 261.566827 602.224414 261.453805 576.7624579999999 261.278897 537.3588179999999 262.385015 505.49418 265.148621 483.296209 276.058157 395.668083 322.627019 326.024497 362.226031 362.19561799999997 379.341732 377.829698 384.756649 392.328523 388.584361 421.857186 397.932742 493.974714 407.332926 531.746825 447.736538 621.64966 466.587287 663.594818 488.484326 699.731218 512.795234 730.526996 542.034492 767.565749 573.156162 795.028785 604.068111 814.386984 614.696751 821.043029 624.472062 826.201428 633.124687 830.036563 638.02329 832.207788 641.258688 833.404991 642.556233 833.802016L612.91959 866.825663C608.658554 856.884484 602.686705 838.478616 596.856038 811.772799 581.186705 740.003594 576.231674 650.498985 588.206246 543.890345 607.295279 373.94226100000003 638.819345 298.82556999999997 678.537329 283.542234 701.302332 274.78234499999996 717.731637 289.43566899999996 721.133156 310.5407 722.475759 318.870999 722.489387 324.26340300000004 721.907881 349.08549100000005 720.532565 407.791853 723.691247 446.952173 738.546223 495.36355 751.151827 536.44438 768.544047 567.135763 789.576147 589.605967 809.230566 610.60429 821.725461 617.839716 852.347733 630.9761169999999L842.705318 653.453557 819.246577 660.374464C822.235501 670.505564 813.450321 644.87463 809.839253 629.8801189999999 790.647573 550.1890470000001 796.611315 450.1135 844.8591 333.498332 883.105728 241.056017 874.587669 126.06492400000002 824.002925 61.39712899999995 815.680378 50.75754500000005 817.558709 35.38570000000004 828.198295 27.063153000000057 838.837879 18.740607999999952 854.209724 20.618939999999952 862.532269 31.258523999999966 924.762731 110.81426299999998 934.658528 244.404363 890.059904 352.19948999999997Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="set" unicode="&#59158;" d="M466.496-126.62400000000002l-1.056 0.064c-25.184 2.08-47.456 22.368-51.744 47.232l-17.344 102.4c-0.672 4.064-6.624 11.04-10.56 12.416l-30.336 12.416c-5.44 2.496-15.424 0.8-17.472-0.64l-84.992-60.16c-19.584-14.016-51.456-12.736-70.08 3.168l-64.288 64c-17.952 20.48-19.488 50.592-4.736 71.296l60.416 84.672c2.176 3.072 2.784 11.52 1.024 15.04l0 0c0 0-1.664 3.104-7.264 16.608-6.176 14.848-6.816 17.44-6.816 17.44-0.992 3.04-7.456 8.672-11.36 9.376l-102.56 17.248c-25.152 4.288-45.44 26.624-47.168 52L0 428.288c2.112 27.36 22.496 49.6 47.52 53.728l102.528 17.344c4.128 0.672 11.008 6.56 12.416 10.496l12.608 30.336c2.368 4.992 1.6 14.112-0.8 17.504L113.984 642.24C99.36 662.88 100.704 692.896 117.056 712.192l64.416 64.224c20.672 18.208 51.296 18.784 71.36 4.64l84.992-60.16c1.952-1.376 13.28-2.016 15.04-1.056 0.384 0.192 2.528 1.344 16.704 7.168 14.24 5.92 16.576 6.592 16.576 6.592 3.84 1.184 9.504 7.648 10.144 11.424l17.44 102.4c4.32 25.152 26.752 45.376 52.128 47.104l90.528 0.064c27.328-2.112 49.632-22.368 53.952-47.232l17.344-102.432c0.672-4.064 6.656-11.04 10.624-12.48l30.304-12.352c6.24-2.784 15.456-0.8 17.44 0.608l85.024 60.16c19.52 14.016 51.392 12.704 70.08-3.136l64.288-64.032c17.952-20.48 19.456-50.56 4.736-71.264l-60.416-84.672c-2.208-3.136-2.848-11.616-1.056-15.04 0.16-0.352 1.376-2.56 7.232-16.672 5.856-14.112 6.592-16.512 6.592-16.512 1.248-4.032 7.712-9.6 11.648-10.304l102.56-17.248c25.152-4.224 45.44-26.592 47.168-52l0.096-90.304c-2.112-27.392-22.528-49.6-47.552-53.728l-102.528-17.376c-4.128-0.672-10.944-6.496-12.32-10.432l-12.736-30.432c-2.336-4.928-1.568-14.112 0.832-17.472l60.288-84.512c14.624-20.736 13.216-50.816-3.232-70.048l-64.192-64.096c-11.328-9.92-24.64-14.72-38.784-14.72l0 0c-11.904 0-23.52 3.552-32.704 10.016l-84.992 60.16c-1.952 1.408-13.312 2.016-15.072 1.056-0.288-0.16-2.432-1.312-16.608-7.2-14.08-5.792-16.384-6.496-16.384-6.496-4.16-1.28-9.792-7.776-10.432-11.52l-17.408-102.4c-4.352-25.152-26.72-45.344-52.032-47.104L466.496-126.62400000000002zM347.84 100.60799999999995c10.368 0 20.192-2.112 28.48-6.112l27.648-11.296c20.416-7.072 38.976-28.992 42.848-51.584l17.344-102.336c0.288-1.6 3.136-4.32 5.056-4.832l87.296 0.064c-0.032 0.064 3.04 2.944 3.328 4.672l17.408 102.368c3.872 22.656 23.328 44.832 45.28 51.584 0 0 0 0 0 0-0.096 0 2.976 1.152 12.448 5.056 9.472 3.936 12.384 5.248 13.12 5.568 18.208 9.6 49.44 8.032 67.776-4.96l84.928-60.16c0.192-0.128 1.312-0.64 3.104-0.64l0 0c2.048 0 3.52 0.672 3.872 0.96l61.536 61.408 0 0c-0.16 0 0.064 4.416-0.992 5.952l-60.224 84.448c-13.248 18.624-15.68 47.168-5.792 67.872l11.648 27.84c6.944 19.968 29.408 38.912 51.68 42.496l102.464 17.376c1.824 0.384 4.736 3.648 4.864 5.408L972.8 428.288l0 0c-0.096 0-2.88 3.072-4.576 3.424l-102.72 17.28c-23.168 4.032-44.896 22.976-51.776 45.056l0 0c-0.032 0-1.216 3.04-5.12 12.512-3.968 9.568-5.28 12.512-5.632 13.248-10.24 19.36-8.288 48.736 4.96 67.456L868.448 672c0.96 1.408 0.736 5.6-0.384 6.912l-61.408 61.184c0.704-0.8-0.768-0.192-2.848-0.192-1.728 0-2.784-0.416-3.008-0.576l-85.024-60.16c-17.824-12.8-47.776-15.36-68-5.664l-27.712 11.296c-20.512 7.2-39.04 29.088-42.88 51.584l-17.344 102.336c-0.288 1.76-3.616 4.704-5.504 4.864L467.616 843.52c0-0.064-3.104-2.944-3.392-4.672l-17.408-102.336c-3.84-22.624-23.264-44.8-45.216-51.584 0-0.032-3.008-1.184-12.416-5.088-9.568-3.936-12.512-5.248-13.248-5.568-17.984-9.568-49.344-8.032-67.744 4.992L223.264 739.36c-0.416 0.32-6.176 0.288-6.848-0.224L154.688 677.6320000000001c0 0 0 0 0 0 0.224 0 0.032-4.384 1.056-5.856L216 587.264c13.312-18.752 15.744-47.296 5.76-67.968l-11.52-27.648c-6.976-20.032-29.472-38.944-51.776-42.624L55.968 431.68c-1.824-0.384-4.704-3.648-4.832-5.408l0.096-86.56 0 0c0.096 0 2.912-3.104 4.608-3.424l102.656-17.28c23.04-4 44.704-22.912 51.712-44.928 0.256-0.736 1.44-3.84 5.088-12.64 3.68-8.832 5.024-11.84 5.472-12.736 10.592-20.288 8.672-48.96-4.672-67.904l-60.512-84.768c-0.96-1.408-0.736-5.632 0.384-6.912l61.408-61.184c-0.736 0.8 0.736 0.224 2.816 0.192 1.728 0 2.784 0.416 3.008 0.576l84.992 60.16C318.624 96.32000000000005 333.088 100.60799999999995 347.84 100.60799999999995zM512.032 133.856c-138.336 0-250.848 112.224-250.848 250.176 0 137.92 112.544 250.144 250.848 250.144s250.848-112.224 250.848-250.144C762.88 246.08000000000004 650.336 133.856 512.032 133.856zM512.032 583.136c-110.08 0-199.648-89.312-199.648-199.104s89.568-199.136 199.648-199.136 199.648 89.344 199.648 199.136S622.112 583.136 512.032 583.136z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="fonts-u" unicode="&#58950;" d="M0-49.23076900000001L945.230769-49.23076900000001 945.230769-128 0-128 0-49.23076900000001ZM0 896L407.076943 896 407.076943 834.065644 319.153861 827.872177 299.076923 809.911217 299.076923 365.841959C299.076923 281.19796199999996 317.076716 220.709337 353.076933 184.37435100000005 389.077071 148.03936499999998 448.153442 129.87210800000003 530.307702 129.87210800000003 606.000364 129.87210800000003 660.807522 149.17482299999995 694.730752 187.78072599999996 728.653982 226.38662899999997 745.61536 289.66226700000004 745.61536 377.60953099999995L745.61536 804.956475 724.153817 826.633531 633.461524 834.065644 633.461524 896 955.384596 896 955.384596 834.065644 868.846119 826.633531 849.461563 804.956475 849.461563 364.60331299999996C849.461563 246.92743900000005 819.923338 161.66533900000002 760.846178 108.81441500000005 701.76894 55.96348999999998 606.462188 29.53846199999998 474.923087 29.53846199999998 406.153531 29.53846199999998 345.807951 38.51886300000001 293.884613 56.47990200000004 241.961275 74.44093999999996 201.230887 100.143419 171.692347 133.58820400000002 149.076834 160.01362700000004 133.038474 190.25793999999996 123.57695 224.32200899999998 114.115348 258.386078 109.384625 307.21047599999997 109.384625 370.796702L109.384625 809.911217 89.307687 827.872177 0 834.065644 0 896Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="triangle-d" unicode="&#58917;" d="M773.128299 88.65234199999998M889.696178 575.195553L158.862147 575.195553 524.357446 209.64704300000005 889.696178 575.195553Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="tips" unicode="&#59138;" d="M967.280184 578.537671c-24.915459 58.887178-60.544935 111.76755-105.96745 157.161413-45.393863 45.393863-98.273211 81.051991-157.160389 105.96745-60.988026 25.803689-125.735679 38.853913-192.494129 38.853913-66.729797 0-131.504056-13.0799-192.494129-38.853913-58.887178-24.916483-111.766526-60.544935-157.160389-105.96745-45.393863-45.393863-81.051991-98.274234-105.96745-157.161413-25.803689-60.988026-38.884612-125.734656-38.884612-192.464453s13.0799-131.50508 38.884612-192.464453c24.915459-58.887178 60.544935-111.737874 105.96745-157.161413 45.393863-45.393863 98.273211-81.051991 157.160389-105.96745 60.988026-25.803689 125.735679-38.853913 192.494129-38.853913 66.729797 0 131.504056 13.0799 192.494129 38.853913 58.887178 24.916483 111.766526 60.544935 157.160389 105.96745 45.393863 45.393863 81.051991 98.274234 105.96745 157.161413 25.803689 60.988026 38.853913 125.734656 38.853913 192.464453S993.084896 517.549645 967.280184 578.537671zM511.687892-55.138552000000004c-243.302305 0-441.241446 197.909465-441.241446 441.21177S268.385587 827.284989 511.687892 827.284989c243.273652-0.029676 441.210747-197.938118 441.210747-441.21177S754.990197-55.138552000000004 511.687892-55.138552000000004zM511.657192 573.565427m-45.511543 0a44.475 44.475 0 1 1 91.023086 0 44.475 44.475 0 1 1-91.023086 0ZM542.729885 184.14011300000004c0-17.162892-13.906731-31.071669-31.070646-31.071669l0 0c-17.163915 0-31.070646 13.907755-31.070646 31.071669L480.588593 426.998303c0 17.162892 13.906731 31.071669 31.070646 31.071669l0 0c17.163915 0 31.070646-13.907755 31.070646-31.071669L542.729885 184.14011300000004z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="picture" unicode="&#58954;" d="M765.376 615.424c0 0 103.04 1.024 103.04-100.992 0 0 9.536-98.752-103.04-100.928 0 0-100.864-2.176-99.84 100.928C665.536 514.496 664.448 605.8879999999999 765.376 615.424ZM968.32 770.56c0 0 54.208-4.224 54.208-52.032l0-712.832c0 0-3.2-51.008-54.208-52.096L968.32 770.56ZM1.472 5.631999999999948c0 0 2.176-52.096 52.096-52.096L968.32-46.464000000000055l0 150.848-99.712 0-203.072 206.144-153.024-153.984L304.32 413.568l-205.056-307.072-45.632-1.024L52.48 718.4639999999999 1.472 718.4639999999999 1.472 5.631999999999948ZM968.32 770.56L53.568 770.56c0 0-52.096 1.088-52.096-52.032L968.32 718.528 968.32 770.56Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="more-vertical" unicode="&#58993;" d="M511.998465 623.681848c40.525995 0 73.386404 35.771715 73.386404 79.892585s-32.860409 79.892585-73.386404 79.892585c-40.524972 0-73.384357-35.771715-73.384357-79.892585S471.47247 623.681848 511.998465 623.681848L511.998465 623.681848zM511.998465 463.893608c-40.524972 0-73.384357-35.772738-73.384357-79.893608 0-44.12087 32.859385-79.892585 73.384357-79.892585 40.525995 0 73.386404 35.772738 73.386404 79.892585C585.384869 428.12087 552.52446 463.893608 511.998465 463.893608L511.998465 463.893608zM511.998465 144.320199c-40.524972 0-73.384357-35.733852-73.384357-79.894631 0-44.119847 32.859385-79.893608 73.384357-79.893608 40.525995 0 73.386404 35.772738 73.386404 79.893608C585.383846 108.58634600000005 552.52446 144.320199 511.998465 144.320199L511.998465 144.320199z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="bluetooth" unicode="&#59017;" d="M844.799642 221.19607699999995L538.533306 374.84141l307.696917 177.029926c10.583033 5.006014 17.398252 15.59621 17.569144 27.302833s-6.332219 22.491247-16.764825 27.804253L475.584626 830.045869c-9.517771 4.846378-20.869307 4.39817-29.974685-1.181919-9.105379-5.581112-14.656815-15.493879-14.656815-26.174126l0-288.760636L210.662931 699.284733c-12.974499 10.915607-32.339546 9.248641-43.255153-3.724835-10.915607-12.973476-9.248641-32.339546 3.724835-43.255153L430.953126 433.687656l0-102.83511L171.558307 120.428046c-13.166881-10.68127-15.181771-30.013571-4.500501-43.180452 6.068206-7.480368 14.924921-11.360745 23.859407-11.360745 6.794753 0 13.634532 2.245134 19.322068 6.859221l220.714867 179.046862 0-283.065937c0-10.689457 5.561669-20.61041 14.680351-26.188452 4.903683-2.99931 10.455119-4.510734 16.019859-4.510734 4.78498 0 9.580193 1.118474 13.980409 3.368724l371.449917 224.085638c10.664897 5.456269 17.182334 16.618493 16.691147 28.589129C863.284645 206.04091200000005 855.875908 216.63110800000004 844.799642 221.19607699999995zM763.458055 580.639542L492.351498 420.917818l0 21.60711c0.563842 3.368724 0.558725 6.801916 0 10.153244L492.351498 752.604102 763.458055 580.639542zM492.351498 18.915047999999956L492.351498 311.51001199999996c0.558725 3.347235 0.562818 6.777357 0 10.146081l0 5.809309 267.472797-137.65822L492.351498 18.915047999999956z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="flag" unicode="&#58988;" d="M878.368178 798.272211c-11.363815 4.799306-24.470321 2.360767-33.31578-6.245238-0.36532-0.350994-37.162388-35.304064-95.163383-56.05262-75.462692-26.993794-150.763702-18.409279-223.812415 25.517163-38.347376 23.060205-81.875752 40.665165-129.376603 52.327786-37.582967 9.228175-77.742619 14.777565-119.363552 16.496719-70.805626 2.925632-121.493052-6.224772-123.615389-6.615675-14.56574-2.682086-25.140587-15.380292-25.140587-30.191626L128.58047-31.312913999999978c0-16.954137 13.745049-30.699186 30.699186-30.699186s30.699186 13.745049 30.699186 30.699186L189.978842 266.68306099999995c15.562441 5.250584 47.994084 14.447037 91.40171 17.48728 35.985586 2.51938 72.440869 0.378623 108.35073-6.363941 44.847417-8.420787 89.059362-24.102954 131.409912-46.611597 46.26879-24.591071 93.776803-41.069371 141.203976-48.977481 38.270629-6.380314 76.541257-7.219425 113.740484-2.491751 64.277956 8.16803 103.877859 30.461779 105.532545 31.406291 9.56689 5.464455 15.471366 15.637142 15.471366 26.656103L897.089565 769.958352C897.091612 782.298402 889.73711 793.470859 878.368178 798.272211zM835.69324 257.496841c-14.58416-5.755074-38.82526-13.530155-70.319555-17.225313-30.990828-3.635807-62.940494-2.676969-94.952582 2.851954-40.201607 6.943133-80.731696 21.171182-120.464629 42.289152-48.455595 25.753547-99.208513 43.61945-150.848637 53.101405-29.29214 5.378497-58.896388 8.079002-88.407516 8.079002-12.228509 0-24.443715-0.464581-36.609803-1.39272-34.879392-2.663666-63.618946-8.741082-84.111676-14.355963L189.978842 766.569162c19.971867 2.003634 50.446949 3.910053 86.392626 2.334161 58.186214-2.554172 143.250588-15.041578 218.064504-60.029188 61.32674-36.877909 119.196753-49.491181 169.691797-49.488111 42.293245 0.002047 79.416747 8.854669 109.019972 19.711947 24.269753 8.901741 45.327348 19.747763 62.544475 30.179346L835.692217 257.496841z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="loading" unicode="&#58941;" d="M511.999488 756.654348m-70.608128 0a69 69 0 1 1 141.216255 0 69 69 0 1 1-141.216255 0ZM236.047576 639.997442m-68.561515 0a67 67 0 1 1 137.123031 0 67 67 0 1 1-137.123031 0ZM125.530506 382.12428m-62.421678 0a61 61 0 1 1 124.843356 0 61 61 0 1 1-124.843356 0ZM227.861126 100.71507499999996m-54.235229 0a53 53 0 1 1 108.470457 0 53 53 0 1 1-108.470457 0ZM514.166851-16.84438799999998m-47.192835 0a46.118 46.118 0 1 1 94.385671 0 46.118 46.118 0 1 1-94.385671 0ZM804.730553 91.450061m-33.834596 0a33.064 33.064 0 1 1 67.669192 0 33.064 33.064 0 1 1-67.669192 0ZM935.55411 383.395226m-23.969924 0a23.424 23.424 0 1 1 47.939849 0 23.424 23.424 0 1 1-47.939849 0ZM856.723717 634.80007m-17.135262 0a16.745 16.745 0 1 1 34.270525 0 16.745 16.745 0 1 1-34.270525 0Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="fonts-i" unicode="&#58948;" d="M897.948 834.255l0-64.322-128.65 0L447.674-1.9329999999999927l128.65 0 0-64.32L126.052-66.25300000000004l0 64.32 128.65 0 321.622 771.866-128.65 0L447.674 834.255 897.948 834.255z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="refresh-1" unicode="&#58982;" d="M688.146 736l-192 128v-256l192 128.001zM496.146 767.7090000000001c-231.174-8.416-416-198.479-416-431.709 0-238.587 193.413-432 432-432 233.23 0 423.293 184.826 431.709 416h-64.05c-8.377-195.817-169.778-352-367.658-352-203.241 0-368 164.759-368 368 0 197.88 156.183 359.282 352 367.658v64.051z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="rmb" unicode="&#58974;" d="M511.998465 896C229.23338 896 0.004605 666.769178 0.004605 384.001023c0-282.773272 229.227752-512.001023 511.99386-512.001023 282.769178 0 511.994883 229.227752 511.994883 512.001023C1023.994372 666.769178 794.767644 896 511.998465 896zM511.998465-91.59690499999999c-262.660188 0-475.589742 212.930577-475.589742 475.597929 0 262.663258 212.929554 475.594859 475.589742 475.594859 262.663258 0 475.590765-212.9316 475.590765-475.594859C987.590254 121.33469500000001 774.662747-91.59690499999999 511.998465-91.59690499999999zM738.742652 301.137781L544.432155 301.137781l0 69.780273 194.310497 0c17.835204 0 32.249495 14.43885 32.249495 32.220842 0 17.784038-14.414291 32.19526-32.249495 32.19526L589.7462 435.334155l149.620669 209.579249c8.916067 15.397688 3.63069 35.099403-11.82021 43.988864-15.398712 8.891508-35.097356 3.629667-44.017516-11.793604L512.187777 437.098335 340.84334 677.108664c-8.864902 15.423271-28.617781 20.685111-44.016493 11.793604-15.395642-8.889461-20.685111-28.590152-11.82021-43.988864l149.622716-209.579249L285.628808 435.334155c-17.781992 0-32.245402-14.411221-32.245402-32.19526 0-17.781992 14.46341-32.220842 32.245402-32.220842l194.310497 0 0-69.780273L285.628808 301.137781c-17.781992 0-32.245402-14.413268-32.245402-32.19526s14.46341-32.220842 32.245402-32.220842l194.310497 0 0-132.435265c0-17.780969 14.46341-32.19526 32.248472-32.19526 17.835204 0 32.245402 14.414291 32.245402 32.19526L544.433178 236.72065499999997l194.310497 0c17.835204 0 32.249495 14.43885 32.249495 32.220842S756.577856 301.137781 738.742652 301.137781"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="addition" unicode="&#58916;" d="M544 768L480 768 480 416 128 416 128 352 480 352 480 0 544 0 544 352 895.936 352 895.936 416 544 416Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="home" unicode="&#59022;" d="M824.084343-40.42033900000001H232.898863c-74.604138 0-85.85232 28.334325-85.852321 49.997718l-0.584307 5.314029V447.645552h48.806589v-402.916582c0-25.547863 13.548574-36.343743 37.629015-36.343743h568.020898c25.928532 0 27.978215 6.220678 27.978215 37.84391V447.585177l48.806589 0.118704c0.022513-14.346753 0-382.76666 0-433.098999 0-38.130436-12.726859-54.765301-51.858088-54.765301l-1.76111-0.25992zM1012.470921 493.103884C849.773422 615.120868 687.101505 737.137853 524.404006 859.153814c-6.207375 4.659113-18.433838 4.659113-24.641213 0C337.077573 737.137853 174.393377 615.120868 11.696902 493.103884c-24.856108-18.635429-0.572028-61.044308 24.642236-42.13361A15995638.709915 15995638.709915 0 0 1 512.025071 807.737794c0.988514-0.715291 1.644453-1.144056 2.823302-2.037403 18.040888-13.524015 36.057217-27.036773 54.073546-40.560788 58.291614-43.718711 116.583229-87.437421 174.874843-131.143852 81.33647-61.008492 162.696476-122.015961 244.033969-183.024454 25.212218-18.911722 49.496298 23.497157 24.64019 42.132587z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="time" unicode="&#59021;" d="M511.98464 829.44c-118.97856 0-230.83008-46.35136-314.95168-130.4832C112.90624 614.84032 66.56 502.95808 66.56 384.00512c0-118.9632 46.34624-230.84544 130.47296-314.9568C281.15456-15.093759999999975 393.00608-61.440000000000055 511.98464-61.440000000000055c118.98368 0 230.84032 46.34624 314.9824 130.48832C911.09376 153.15967999999998 957.44 265.02144 957.44 384.00512c0 118.97856-46.34624 230.8352-130.47296 314.95168C742.82496 783.0886399999999 630.96832 829.44 511.98464 829.44z m275.58912-721.02912c-73.61024-73.63584-171.47904-114.18624-275.58912-114.18624s-201.97376 40.5504-275.57888 114.18624c-73.63584 73.61024-114.16064 171.47904-114.16064 275.59424 0 104.11008 40.54528 201.97376 114.18112 275.58912 73.60512 73.63072 171.47392 114.176 275.584 114.176s201.97376-40.54528 275.584-114.176c73.63584-73.61536 114.18112-171.47904 114.18112-275.58912 0-104.1152-40.56576-201.984-114.2016-275.59424zM519.1168 340.20863999999995V628.08064a27.8528 27.8528 0 0 1-27.84256 27.84768 27.8528 27.8528 0 0 1-27.84256-27.84768v-306.23232a27.81184 27.81184 0 0 1 16.88064-25.58976M734.70464 321.84831999999994a31.0784 31.0784 0 0 0-31.07328-31.0784H496.44544a31.08864 31.08864 0 0 0-31.07328 31.0784 31.09376 31.09376 0 0 0 31.07328 31.0784h207.18592a31.08864 31.08864 0 0 0 31.07328-31.0784z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="user" unicode="&#59248;" d="M611.2 342.4c70.4 54.4 115.2 140.8 115.2 230.4 0 156.8-128 288-284.8 288s-284.8-128-284.8-284.8c0-92.8 44.8-182.4 115.2-236.8C108.8 272 0 105.60000000000002 0-80c0-9.6 9.6-19.2 19.2-19.2h848c9.6 0 19.2 9.6 19.2 19.2 0 188.8-112 355.2-275.2 422.4z m-576-396.8C44.8 115.20000000000005 156.8 268.79999999999995 320 320c6.4 3.2 12.8 9.6 12.8 16s-3.2 16-9.6 19.2c-76.8 41.6-128 131.2-128 224 0 134.4 112 246.4 246.4 246.4s246.4-112 246.4-249.6c0-89.6-51.2-176-128-220.8-6.4-3.2-9.6-9.6-9.6-19.2 0-6.4 6.4-12.8 12.8-16 160-51.2 275.2-204.8 281.6-377.6H35.2zM812.8 361.6c54.4 41.6 86.4 108.8 86.4 176 0 89.6-54.4 172.8-134.4 208-9.6 3.2-22.4 0-25.6-9.6-3.2-9.6 0-22.4 9.6-25.6 67.2-28.8 112-99.2 112-172.8 0-67.2-38.4-131.2-96-163.2-6.4-3.2-9.6-9.6-9.6-19.2 0-6.4 6.4-12.8 12.8-16 131.2-41.6 217.6-160 217.6-297.6 0-9.6 9.6-19.2 19.2-19.2s19.2 9.6 19.2 19.2c-3.2 140.8-86.4 262.4-211.2 320z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="notice" unicode="&#58983;" d="M544 798.976V864h-64v-65.024C289.536 786.304 160 658.624 160 416v-288h64V416c0 192 115.456 320 288 320 180.544 0 288-128 288-320v-288h64V416c0 242.88-122.496 370.56-320 382.976zM672 64a160 160 0 1 0-320 0h64a96 96 0 0 1 192 0h64zM64 128h896v-64H64v64z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="chrome" unicode="&#59018;" d="M515.436 583.685H914.285C840.842 730.955 688.748 832.132 513 832.132c-141.284 0-267.274-65.395-349.42-167.546l151.66-262.682c8.535 102.325 95.704 181.781 200.196 181.781zM514.218 550.803c-91.476 0-165.631-74.155-165.631-165.631s74.155-165.631 165.631-165.631c52.7 0 99.615 24.642 129.95 62.999l1.428 2.474 0.355-0.205c21.252 27.852 33.898 62.624 33.898 100.363 0 84.774-63.702 154.626-145.841 164.413l-6.393 0.632c-4.424 0.354-8.882 0.586-13.397 0.586zM929.561 549.585H627.443c52.209-36.066 86.506-96.297 86.506-164.413 0-45.547-18.268-81.598-41.12-121.192L483.898-63.257c9.624-0.617 19.322-0.966 29.102-0.966 247.521 0 448.177 200.656 448.177 448.177 0 58.508-11.225 114.391-31.616 165.631zM514.218 185.441c-83.583 0-144.927 54.804-185.034 124.651l-0.235-0.136-187.482 324.727C93.081 563.124 64.823 476.84 64.823 383.954c0-225.02 165.839-411.288 381.958-443.298l152.278 263.752c-25.769-12.143-54.518-18.967-84.841-18.967z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="edge" unicode="&#59019;" d="M854.794 669.297C797.923 743.783 683.626 823.59 548.62 830.822 136.707 852.889 85.742 435.448 85.742 435.448c55.449 53.038 58.01 97.116 163.936 154.293C673.983 818.768 676.394 476.432 676.394 476.432H346.111c-7.232 65.092 62.681 137.417 62.681 137.417-202.509-98.844-216.974-284.477-216.974-284.477s-28.93-279.655 219.385-364.034 452.029 42.189 452.029 42.189V193.16c-59.065-32.546-102.292-54.405-153.087-63.887-361.623-67.503-364.034 188.044-364.034 188.044h585.83c0 0.001 39.075 199.761-77.147 351.98z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="login-weibo" unicode="&#58997;" d="M411.270737 288.350316c-17.973895 7.504842-41.189053-0.229053-52.264421-17.542737-11.223579-17.394526-5.955368-38.103579 11.870316-46.201263 18.108632-8.232421 42.132211-0.417684 53.342316 17.421474C435.253895 260.05557899999997 429.446737 280.62989500000003 411.270737 288.350316zM455.545263 306.64757899999995c-6.885053 2.721684-15.508211-0.579368-19.550316-7.329684-3.920842-6.790737-1.751579-14.524632 5.146947-17.367579 7.019789-2.883368 16.006737 0.458105 20.048842 7.370105C465.071158 296.259368 462.551579 304.087579 455.545263 306.64757899999995zM427.52 426.684632c-115.968-11.439158-203.924211-82.216421-196.378947-158.073263 7.531789-75.910737 107.654737-128.161684 223.649684-116.749474 115.994947 11.439158 203.924211 82.216421 196.392421 158.140632C643.664842 385.859368 543.541895 438.110316 427.52 426.684632zM529.300211 247.70021099999997c-23.673263-53.355789-91.769263-81.798737-149.530947-63.232-55.754105 17.933474-79.373474 72.811789-54.945684 122.246737 23.956211 48.464842 86.352842 75.870316 141.541053 61.561263C523.506526 353.562947 552.663579 299.85684200000003 529.300211 247.70021099999997zM512 896C229.241263 896 0 666.772211 0 384c0-282.758737 229.241263-512 512-512 282.772211 0 512 229.241263 512 512C1024 666.772211 794.772211 896 512 896zM455.531789 101.02568399999996c-145.354105 0-293.941895 70.197895-293.941895 185.667368 0 60.362105 38.386526 130.182737 104.474947 196.069053 88.252632 87.929263 191.164632 127.986526 229.874526 89.397895 17.084632-17.003789 18.741895-46.457263 7.760842-81.623579-5.726316-17.690947 16.666947-7.895579 16.666947-7.936 71.343158 29.763368 133.564632 31.514947 156.321684-0.862316 12.139789-17.246316 10.954105-41.472-0.215579-69.510737-5.173895-12.921263 1.589895-14.928842 11.466105-17.879579 40.178526-12.422737 84.924632-42.455579 84.924632-95.380211C772.837053 211.36168399999997 646.090105 101.02568399999996 455.531789 101.02568399999996zM718.672842 468.197053c4.715789 14.457263 1.765053 30.962526-9.202526 43.061895-10.954105 12.072421-27.136 16.666947-42.037895 13.527579l0 0.026947c-12.463158-2.694737-24.724211 5.268211-27.392 17.664-2.667789 12.463158 5.281684 24.697263 17.744842 27.338105 30.531368 6.467368 63.595789-2.937263 85.989053-27.715368 22.447158-24.764632 28.456421-58.489263 18.849684-88.064-3.907368-12.099368-16.936421-18.728421-29.062737-14.848-12.139789 3.920842-18.782316 16.922947-14.874947 28.995368L718.672842 468.183579zM853.261474 424.865684c-0.013474-0.013474-0.013474-0.080842-0.013474-0.107789-4.567579-14.026105-19.712-21.706105-33.778526-17.165474-14.133895 4.554105-21.854316 19.590737-17.300211 33.670737l0 0.013474c13.999158 43.169684 5.12 92.429474-27.567158 128.565895-32.714105 36.122947-80.949895 49.92-125.507368 40.488421-14.484211-3.085474-28.752842 6.130526-31.838316 20.574316-3.098947 14.403368 6.144 28.631579 20.641684 31.717053l0.026947 0c62.625684 13.271579 130.519579-6.117053 176.545684-56.966737C860.483368 554.886737 872.892632 485.618526 853.261474 424.865684z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="voice" unicode="&#59016;" d="M463.380164 644.0568969999999v-0.003069c-4.550643 4.549619-10.484795 7.02295-16.913205 7.02295s-12.365632-2.473331-16.915251-7.02295c-4.549619-4.551666-7.020904-10.485819-7.020904-16.914229s2.471284-12.365632 7.020904-16.915251c60.437487-60.438511 93.675496-140.756791 93.675496-226.222301 0-85.464487-33.238009-165.783791-93.675496-226.220255-4.549619-4.551666-7.020904-10.487865-7.020904-16.915252 0-6.429433 2.471284-12.365632 7.020904-16.914228 4.550643-4.549619 10.486842-7.02295 16.915251-7.02295s12.364609 2.473331 16.913205 7.02295c35.114752 35.116799 62.317301 76.06849 80.814584 121.668037 17.904789 44.018539 26.90579 90.608647 26.90579 138.384768s-9.101285 94.26799-26.90579 138.384767c-18.59552 45.697785-45.698808 86.550215-80.814584 121.667013zM781.892405 618.929614v-0.002047c-31.358195 77.452-77.550237 146.990772-137.098471 206.539007-4.550643 4.549619-10.485819 7.02295-16.915252 7.02295-6.42841 0-12.363585-2.473331-16.914228-7.02295-9.29776-9.299807-9.29776-24.531719 0-33.82948 54.997592-54.998615 97.631598-119.195729 126.613676-190.71153 27.993564-69.044516 42.237987-142.045133 42.237987-216.924541s-14.244422-147.882072-42.237987-216.923518c-28.982078-71.517847-71.616084-135.616724-126.613676-190.711529-9.29776-9.298783-9.29776-24.531719 0-33.82948 4.551666-4.551666 10.485819-7.02295 16.914228-7.02295 6.429433 0 12.366655 2.471284 16.915252 7.02295 59.547211 59.547211 105.740276 129.085984 137.098471 206.53696 30.369681 74.78117 45.699832 153.817248 45.699831 234.928591 0 81.111343-15.331173 160.146397-45.699831 234.927567zM299.474141 427.621497c-11.670807 11.573593-27.103288 18.004049-43.522236 18.004049-16.419971 0-31.852452-6.429433-43.52326-18.004049-11.57257-11.57257-18.003026-27.104311-18.003026-43.522236 0-16.420995 6.42841-31.851429 18.003026-43.52326 11.574616-11.57257 27.103288-18.003026 43.52326-18.003025s31.852452 6.429433 43.522236 18.003025c11.573593 11.573593 18.003026 27.104311 18.003025 43.52326 0 16.419971-6.427386 31.852452-18.003025 43.522236z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="upload-drag" unicode="&#59009;" d="M666.931 445.918l-124.245 99.362c-7.221 5.639-16.428 9.042-26.429 9.042-9.963 0-19.136-3.376-26.438-9.047l-124.215-99.391c-9.615-7.772-15.713-19.565-15.713-32.782 0-9.946 3.453-19.084 9.223-26.284 13.828-17.359 41.51-20.465 58.918-6.505l56.252 45.022v-261.12c0-23.177 18.842-41.984 41.95-41.984s41.95 18.842 41.95 41.984v261.12l56.286-45.056c17.545-13.892 45.09-10.718 58.914 6.554 5.754 7.137 9.236 16.316 9.236 26.308 0 13.211-6.086 24.999-15.609 32.716zM235.827 142.95000000000005c-85.026 0-152.542 31.71-188.655 89.839-36.113 58.095-34.406 134.724 4.335 195.174 37.342 58.334 102.366 92.023 178.995 94.549-19.866 130.492 42.667 202.377 84.753 235.008 90.112 69.871 234.257 79.053 335.565 21.367 58.982-33.587 94.037-85.675 100.454-146.978 113.937 18.978 177.562-33.826 206.814-69.905 63.317-78.131 71.27-204.39 18.91-300.203-46.524-85.06-130.389-127.317-229.82-116.497-18.739 2.116-32.222 18.978-30.174 37.683s19.285 32.017 37.683 30.174c96.7-10.718 143.258 46.353 162.406 81.408 39.014 71.373 33.826 167.868-12.049 224.495-38.673 47.684-100.352 60.518-178.483 37.069-2.94-0.916-6.319-1.443-9.822-1.443-18.851 0-34.133 15.282-34.133 34.133 0 1.495 0.096 2.969 0.283 4.414 8.549 68.506-31.114 106.53-65.93 126.362-77.346 44.066-191.522 37.035-259.925-15.974-58.266-45.193-75.947-117.18-51.132-208.179 0.761-2.688 1.198-5.775 1.198-8.963 0-18.851-15.282-34.133-34.133-34.133-1.481 0-2.94 0.094-4.371 0.277-70.759 8.822-128.991-13.535-159.677-61.424-24.61-38.434-26.146-86.46-3.823-122.368 27.716-44.578 86.05-64.375 164.147-55.637 1.132 0.133 2.443 0.209 3.772 0.209 18.853 0 34.138-15.284 34.138-34.138 0-17.525-13.205-31.965-30.208-33.914-14.153-1.653-27.874-2.404-41.118-2.404z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="login-qq" unicode="&#58998;" d="M512 896C229.227789 896 0 666.772211 0 384c0-282.745263 229.227789-512 512-512s512 229.254737 512 512C1024 666.772211 794.772211 896 512 896L512 896zM738.856421 258.93726300000003c0 0-16.208842-44.220632-45.945263-83.941053 0 0 53.126737-18.054737 48.64-64.983579 0 0 1.778526-52.345263-113.461895-48.734316 0 0-81.071158 6.319158-105.377684 40.609684l-21.423158 0c-24.306526-34.304-105.350737-40.609684-105.350737-40.609684-115.280842-3.610947-113.475368 48.734316-113.475368 48.734316-4.500211 46.928842 48.626526 64.983579 48.626526 64.983579-29.709474 39.720421-45.918316 83.941053-45.918316 83.941053-72.057263-116.439579-64.848842 16.249263-64.848842 16.249263 13.527579 78.524632 70.238316 129.967158 70.238316 129.967158-8.111158 71.316211 21.611789 83.941053 21.611789 83.941053C318.410105 709.712842 508.025263 705.859368 512 705.751579c3.988211 0.107789 193.576421 3.961263 199.828211-216.643368 0 0 29.709474-12.638316 21.611789-83.941053 0 0 56.737684-51.442526 70.238316-129.967158l0 0C803.678316 275.18652599999996 810.873263 142.49768400000005 738.856421 258.93726300000003L738.856421 258.93726300000003zM738.856421 258.93726300000003"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="snowflake" unicode="&#59057;" d="M480.695-64h63.725V59.291000000000054l68.854-68.242 44.945 44.546-113.798 112.79v180.02l177.271-102.44 41.67-155.652 60.725 16.284-25.398 94.872 85.259-49.266 31.87 55.246-84.726 48.961 94.497 25.343-16.495 61.622-156.068-41.855-176.934 102.245 177.667 102.667 155.513-41.709 16.274 60.793-94.78 25.418 85.255 49.264-31.869 55.247-84.733-48.965 25.326 94.594-61.557 16.51-41.817-156.206-176.948-102.251V644.461l113.849 113.951-44.459 44.496-69.392-69.454V832h-63.725v-97.935l-69.188 69.249-45.068-45.107 114.256-114.355V438.89l-156.557 90.469L283.45 684.39l-60.188-16.458 24.84-94.632-107.544 62.145-31.868-55.247 106.667-61.639-93.463-25.557 16.074-61.237 154.482 42.243 156.169-90.243-156.138-90.226-154.485 42.243-15.855-60.409 94.289-25.784-107.534-62.14 31.868-55.247 106.672 61.642-24.621-93.801 61.012-16.685 40.69 155.028 156.179 90.25v-180.455l-113.801-112.79 44.338-43.944 69.463 68.845V-64z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="heart" unicode="&#59020;" d="M512 4.100000000000023c-108.9 0-447.3 277.5-447.3 522.2 0 131 106.6 237.6 237.6 237.6 94.9 0 174.8-50.2 209.7-76.1 34.9 25.9 114.8 76.1 209.7 76.1 131 0 237.6-106.6 237.6-237.6 0-244.7-338.4-522.2-447.3-522.2zM302.3 708c-100.2 0-181.7-81.5-181.7-181.7 0-221 326.8-466.3 391.4-466.3s391.4 245.3 391.4 466.3c0 100.2-81.5 181.7-181.7 181.7-103.9 0-190.2-76-191.1-76.8-10.6-9.5-26.7-9.5-37.3 0-0.8 0.8-87.7 76.8-191 76.8z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="logout" unicode="&#59010;" d="M512 832a32 32 0 0 1-32-32v-416a32 32 0 0 1 64 0V800a32 32 0 0 1-32 32zM683.34 798.06a32 32 0 0 1-24.48-59.15C798.07 681.24 896 544.06 896 384c0-212.08-171.92-384-384-384S128 171.91999999999996 128 384c0 160.06 97.93 297.24 237.14 354.91a32 32 0 0 1-24.48 59.15C178.25 730.78 64 570.74 64 384c0-247.42 200.58-448 448-448s448 200.58 448 448c0 186.74-114.25 346.78-276.66 414.06z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="file-b" unicode="&#58965;" d="M790.08 177.91999999999996l-138.112-119.232V177.91999999999996h138.112zM198.848 763.008h627.328v-516.16H617.088a34.56 34.56 0 0 1-34.816-34.432v-206.528H198.848V763.008z m662.208 68.8H164.032a34.56 34.56 0 0 1-34.816-34.432v-825.92a34.56 34.56 0 0 1 34.816-34.432h453.056l278.784 240.896V797.376a34.56 34.56 0 0 1-34.816 34.432z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="template" unicode="&#58979;" d="M734 172.89999999999998v82.8h-59.9v-37l-35.7-9.7 15.7-57.8zM674.1 419.3H734v-81.8h-59.9zM734 600.2l-95.6-26 15.7-57.8 20 5.4v-20.7H734zM866.1 131.29999999999995v-37l-35.7-9.7 7.9-28.9 7.8-28.9 79.9 21.7v82.8h-29.9zM740.9 60.299999999999955L651.4 36l7.9-28.9 7.8-29 89.5 24.4-7.8 28.9zM740.9 781.7l-89.5-24.3 7.9-28.9 7.8-28.9 89.5 24.3-7.8 28.9zM830.4 806l7.9-28.9 7.8-28.9 20 5.5v-20.8H926V832zM866.1 612.6v-120.3H926V612.6h-29.9zM866.1 371.9v-120.3H926V371.9h-29.9zM541.9 665.6l35.7 9.7-7.8 28.9-7.8 28.9-50-13.6L98 832v-783.5l384.1-104.3L512-64l29.9 8.1 35.7 9.7-7.8 28.9-7.8 28.9-20-5.4V120.79999999999995l35.7 9.7-15.7 57.8-20-5.4V486l35.7 9.7-15.7 57.8-20-5.4V665.6z m-59.8-659.4l-324.2 88.1V753.7l324.2-88.1V548l-192 52.2v-427.3l192-52.2v-114.5z m0 360.9V182.79999999999995l-132.2 35.9V521.8l132.2-35.9v-118.8z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="transfer" unicode="&#59025;" d="M320 768H128c-35.2 0-64-28.8-64-64v-640c0-35.2 28.8-64 64-64h192c35.2 0 64 28.8 64 64V704c0 35.2-28.8 64-64 64z m0-672c0-16-16-32-32-32H160c-16 0-32 16-32 32V672c0 16 16 32 32 32h128c16 0 32-16 32-32v-576z m256 544h-64c-19.2 0-32-12.8-32-32s16-32 32-32h64c19.2 0 32 12.8 32 32s-16 32-32 32z m-64-448h-64c-19.2 0-32-12.8-32-32s16-32 32-32h64c19.2 0 32 12.8 32 32s-16 32-32 32z m384 576H704c-35.2 0-64-28.8-64-64v-640c0-35.2 28.8-64 64-64h192c35.2 0 64 28.8 64 64V704c0 35.2-28.8 64-64 64z m0-672c0-16-16-32-32-32H736c-16 0-32 16-32 32V672c0 16 16 32 32 32h128c16 0 32-16 32-32v-576z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="auz" unicode="&#58994;" d="M324.266667 435.2c-17.066667 17.066667-39.822222 17.066667-51.2 0-17.066667-17.066667-17.066667-39.822222 0-51.2l153.6-159.288889c5.688889-5.688889 17.066667-11.377778 28.444444-11.377778s17.066667 5.688889 28.444445 11.377778l295.822222 290.133333c17.066667 17.066667 17.066667 39.822222 0 51.2-17.066667 17.066667-39.822222 17.066667-51.2 0L455.111111 304.355556 324.266667 435.2zM927.288889 753.777778L523.377778 896h-22.755556L96.711111 753.777778c-17.066667-5.688889-28.444444-17.066667-28.444444-34.133334v-432.355555c11.377778-250.311111 409.6-409.6 426.666666-415.288889h22.755556c17.066667 5.688889 415.288889 159.288889 426.666667 415.288889V719.644444c11.377778 17.066667 0 28.444444-17.066667 34.133334z m-45.511111-460.8c-5.688889-182.044444-301.511111-312.888889-369.777778-341.333334-113.777778 45.511111-358.4 182.044444-369.777778 341.333334v398.222222L512 822.044444l369.777778-125.155555v-403.911111z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="console" unicode="&#58981;" d="M30.552 104.72699999999998c4.654-16.29 23.272-23.272 37.236-18.618 16.291 4.655 23.273 23.273 18.618 37.236C16.588 314.182 84.08 521.31 237.68 640c11.636 9.31 23.273 16.29 37.236 25.6 25.6 16.29 53.528 30.255 83.782 39.564 58.182 20.945 118.691 30.254 176.873 27.927h25.6c6.982 0 11.636 0 18.618-2.327 30.255-4.655 58.182-11.637 88.436-23.273 235.055-86.11 356.073-346.764 269.964-581.818-4.654-16.291 2.327-32.582 18.618-37.237 16.291-4.654 32.582 2.328 37.237 18.619 41.89 116.363 39.563 239.709 0 349.09h2.327C921.897 656.2909999999999 738.043 784.2909999999999 537.897 793.6h-48.873c-200.145-9.31-384-137.31-458.472-337.455-39.564-109.381-41.891-232.727 0-351.418z m707.49 386.328a29.498 29.498 0 0 1-41.89 0L521.606 316.509c-4.654 2.327-9.309 2.327-13.963 2.327-32.582 0-58.182-25.6-58.182-58.181s25.6-58.182 58.182-58.182 58.181 25.6 58.181 58.182c0 4.654 0 9.309-2.327 16.29l174.546 174.546c11.636 11.636 11.636 30.254 0 39.564z m228.073-458.473H58.48c-16.29 0-30.255-13.964-30.255-30.255 0-16.29 13.964-30.254 30.255-30.254h907.636c16.291 0 30.255 13.963 30.255 30.254 0 16.291-13.964 30.255-30.255 30.255z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="app" unicode="&#58963;" d="M432.022 818.946h-376.324c-6.627 0-12.078-5.45-12.078-12.078v-376.324c0-6.627 5.45-12.078 12.078-12.078h376.324c6.627 0 12.078 5.45 12.078 12.078v376.473c0 6.627-5.45 11.93-12.078 11.93zM391.517 471.196h-295.169v295.169h295.021v-295.169zM976.847 635.717l-211.95 211.95c-8.837 8.837-23.124 8.837-31.963 0l-211.95-211.95c-8.837-8.837-8.837-23.124 0-31.963l211.95-212.098c8.837-8.837 23.124-8.837 31.963 0l211.95 211.95c8.837 8.987 8.837 23.271 0 32.109zM432.022 313.45000000000005h-376.324c-6.627 0-12.078-5.45-12.078-12.078v-376.324c0-6.627 5.45-12.078 12.078-12.078h376.324c6.627 0 12.078 5.45 12.078 12.078v376.473c0 6.627-5.45 11.93-12.078 11.93zM391.517-34.15499999999997h-295.169v295.021h295.021v-295.021zM932.511 313.45000000000005h-376.324c-6.627 0-12.078-5.45-12.078-12.078v-376.324c0-6.627 5.45-12.078 12.078-12.078h376.324c6.627 0 12.078 5.45 12.078 12.078v376.473c0 6.627-5.45 11.93-12.078 11.93zM891.859-34.15499999999997h-295.021v295.021h295.021v-295.021z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="prev" unicode="&#58970;" d="M62.573 384.103l423.401 423.662c18.985 18.985 49.757 18.985 68.727 0 18.982-18.972 18.985-49.746 0-68.729l-355.058-355.067 356.796-356.796c18.977-18.971 18.976-49.746 0-68.727-18.982-18.976-49.751-18.976-68.727 0l-39.753 39.753 0.269 0.246-385.655 385.661zM451.365 384.103l423.407 423.662c18.985 18.985 49.757 18.985 68.727 0 18.982-18.972 18.985-49.746 0-68.729l-355.058-355.067 356.796-356.796c18.977-18.971 18.976-49.746 0-68.727-18.982-18.976-49.757-18.977-68.727 0l-39.762 39.754 0.273 0.249-385.662 385.661zM451.365 384.103z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="website" unicode="&#59310;" d="M777.073418 147.443038c-30.460759 21.387342-40.83038 40.182278-76.47595 53.792405 25.275949 60.273418 40.182278 83.605063 42.126583 154.896203H887.898734c-3.888608-99.159494-45.367089-143.878481-110.825316-208.688608zM136.101266 356.13164600000005h167.210126c1.944304-71.291139 16.850633-94.622785 42.126583-154.896203-34.997468-13.610127-68.050633-31.756962-98.511393-53.792405C181.468354 212.25316499999997 139.989873 256.97215200000005 136.101266 356.13164600000005z m103.048101 259.888607c29.164557-23.979747 61.56962-42.774684 96.567089-57.681012-19.443038-53.792405-30.460759-90.734177-31.756962-152.951899H136.101266c3.240506 90.734177 46.663291 147.767089 103.048101 210.632911z m309.144304-209.98481V523.989873c47.311392 1.296203 71.291139 10.36962 114.065823 25.27595 18.146835-51.2 28.516456-84.901266 30.460759-143.23038H548.293671z m104.344304-195.078481c-40.182278 12.962025-60.273418 20.091139-104.344304 21.387342V356.13164600000005h144.526582c-1.944304-68.050633-16.202532-88.141772-40.182278-145.174684z m36.941772-57.681013c31.756962-12.313924 39.534177-28.516456 66.75443-47.311392-51.848101-44.718987-114.713924-73.883544-182.116455-84.901266 36.941772 37.589873 90.734177 82.308861 115.362025 132.212658z m-163.321519-137.397468l22.035443 165.913924c40.182278-1.296203 56.38481-7.777215 92.678481-18.794937-27.220253-56.38481-66.106329-106.288608-113.417722-147.118987h-1.296202z m-75.827848 5.18481c-67.402532 11.017722-130.268354 40.83038-182.764557 84.901266 27.868354 19.443038 57.681013 34.997468 88.789873 47.311392 23.331646-48.607595 55.088608-93.326582 93.974684-132.212658z m47.311392 335.068355v-123.787342c-44.070886-1.296203-64.162025-8.425316-104.344304-21.387342-23.979747 57.681013-38.237975 77.124051-40.182278 145.174684h144.526582zM383.675949 549.265823c42.774684-14.906329 66.75443-23.331646 114.065823-25.27595v-117.95443H353.21519c1.944304 58.329114 12.313924 92.03038 30.460759 143.23038z m-37.589873 57.032911c-31.756962 12.962025-60.921519 30.460759-88.141772 51.848101 53.792405 51.848101 115.362025 91.382278 192.486076 104.344304-44.718987-44.718987-80.364557-97.863291-104.344304-156.192405z m151.655696 161.377215v-193.782278c-44.070886 1.296203-64.162025 9.073418-103.696202 22.683544 29.164557 68.698734 49.903797 127.027848 102.4 171.098734h1.296202z m75.827848-4.536708c77.772152-13.610127 149.711392-49.903797 206.744304-104.344304-29.164557-22.035443-46.01519-37.589873-80.364557-51.848102-25.275949 59.625316-82.956962 112.76962-126.379747 156.192406z m-46.01519 4.536708c54.440506-46.01519 97.21519-104.992405 124.435443-171.098734-39.534177-13.610127-59.625316-21.387342-103.696202-22.683544l-22.035443 193.782278h1.296202z m-31.10886-751.149367c-46.663291 38.886076-62.865823 88.789873-91.382279 147.118988 36.293671 11.665823 53.144304 17.498734 93.326582 18.794936v-165.913924h-1.944303zM887.898734 406.035443h-145.174683c-1.296203 61.56962-12.313924 98.511392-31.756962 152.303798 37.589873 15.55443 57.032911 33.053165 88.789873 57.681012 56.38481-62.865823 84.901266-119.898734 88.141772-209.98481z m-375.898734 427.746835c-244.334177 0-442.005063-197.670886-442.005063-442.005063S267.665823-50.227847999999994 512-50.227847999999994s442.005063 197.670886 442.005063 442.005063S756.334177 833.782278 512 833.782278z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="next" unicode="&#58971;" d="M948.066926 382.958838l-411.990051-412.24426c-18.47333-18.47333-48.417689-18.47333-66.875207 0-18.47333 18.461167-18.47333 48.405526 0 66.875207L814.691135 383.088983 467.512212 730.269123c-18.466032 18.458735-18.466032 48.405526 0 66.873991 18.468465 18.464816 48.410391 18.464816 66.872774 0l38.682336-38.682336-0.261507-0.239614 375.259894-375.265975v0.003649m-378.312834 0L157.756743-29.28542200000004c-18.47333-18.47333-48.415256-18.47333-66.872775 0-18.47333 18.461167-18.47333 48.405526 0 66.875207L436.369787 383.088983 89.19208 730.269123c-18.4636 18.458735-18.4636 48.405526 0 66.873991 18.470898 18.464816 48.415256 18.464816 66.872774 0l38.692067-38.682336-0.266372-0.239614 375.267191-375.265975-0.004865 0.003649m0 0z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="component" unicode="&#59479;" d="M917.376 652.544L500.8 891.2a34.304 34.304 0 0 1-34.176 0L50.112 652.48a33.92 33.92 0 0 1-17.088-29.376v-477.44c0-12.16 6.528-23.296 17.088-29.44l416.512-238.72a35.136 35.136 0 0 1 34.176 0l416.576 238.72a33.92 33.92 0 0 1 17.088 29.44v477.44a33.92 33.92 0 0 1-17.088 29.44z m-51.264-487.36l-382.4-219.136-382.336 219.136V603.52l382.336 219.136 382.4-219.136v-438.272zM198.784 535.488a33.792 33.792 0 0 1 12.544-46.4l237.824-136.32V83.20000000000005c0-18.816 15.232-33.92 34.176-33.92a33.92 33.92 0 0 1 34.176 33.92V352.384l238.656 136.832a33.856 33.856 0 0 1 12.544 46.4 34.368 34.368 0 0 1-46.72 12.416L483.712 411.52 245.504 548.0319999999999a34.432 34.432 0 0 1-46.72-12.544z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="android" unicode="&#59012;" d="M391.405714 619.995429a22.308571 22.308571 0 0 1 0 44.544c-11.995429 0-21.723429-10.276571-21.723428-22.272s9.728-22.272 21.723428-22.272z m241.152 0c11.995429 0 21.723429 10.276571 21.723429 22.272s-9.728 22.272-21.723429 22.272a22.308571 22.308571 0 0 1 0-44.544zM168.539429 514.852571a58.514286 58.514286 0 0 0 58.294857-58.294857v-245.723428c0-32.585143-25.709714-58.843429-58.294857-58.843429S109.696 178.285714 109.696 210.834286v245.723428c0 32 26.294857 58.294857 58.843429 58.294857z m605.732571-10.861714v-380.562286c0-34.852571-28.013714-62.866286-62.281143-62.866285h-42.861714v-129.718857c0-32.585143-26.294857-58.843429-58.843429-58.843429s-58.843429 26.294857-58.843428 58.843429v129.718857H472.594286v-129.718857c0-32.585143-26.294857-58.843429-58.843429-58.843429a58.660571 58.660571 0 0 0-58.294857 58.843429l-0.585143 129.718857H312.594286a62.683429 62.683429 0 0 0-62.866286 62.866285V503.990857h524.580571z m-132.571429 231.424c80.018286-41.142857 134.290286-119.990857 134.290286-210.870857H247.424c0 90.843429 54.272 169.728 134.838857 210.870857L341.705143 810.276571a8.338286 8.338286 0 0 0 2.852571 11.446858c3.986286 1.718857 9.142857 0.585143 11.446857-3.437715L397.147429 742.838857c34.852571 15.433143 73.728 23.990857 114.870857 23.990857s80.018286-8.557714 114.870857-23.990857l41.142857 75.446857c2.304 3.986286 7.424 5.156571 11.446857 3.437715a8.338286 8.338286 0 0 0 2.852572-11.446858zM914.267429 456.557714v-245.723428c0-32.585143-26.294857-58.843429-58.843429-58.843429a58.660571 58.660571 0 0 0-58.294857 58.843429v245.723428a58.148571 58.148571 0 0 0 58.294857 58.294857c32.585143 0 58.843429-25.709714 58.843429-58.294857z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="more" unicode="&#58975;" d="M224 288c-52.928 0-96 43.072-96 96s43.072 96 96 96 96-43.072 96-96-43.072-96-96-96z m288 0c-52.928 0-96 43.072-96 96s43.072 96 96 96 96-43.072 96-96-43.072-96-96-96z m288 0c-52.928 0-96 43.072-96 96s43.072 96 96 96 96-43.072 96-96-43.072-96-96-96z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="login-wechat" unicode="&#58999;" d="M516.464646 896C233.714646 896 4.464646 666.75 4.464646 384S233.714646-128 516.464646-128s512 229.25 512 512S799.214646 896 516.464646 896z m-74-523.375c-0.25-0.75-0.5-1.125-0.75-1.875-0.25-0.75-0.5-1.125-0.75-1.875-0.25-0.75-0.5-1.125-0.75-1.875-0.25-0.75-0.5-1.125-0.75-1.875-0.25-0.75-0.5-1.125-0.75-1.875-0.25-0.75-0.5-1.125-0.75-1.875-0.25-0.75-0.5-1.125-0.75-1.875-0.25-0.75-0.5-1.125-0.75-1.875-0.25-0.75-0.5-1.125-0.5-1.875-0.25-0.75-0.5-1.125-0.5-1.875-0.25-0.75-0.5-1.125-0.5-1.875-0.25-0.75-0.25-1.125-0.5-1.875s-0.5-1.125-0.5-1.875c-0.25-0.75-0.25-1.125-0.5-1.875s-0.25-1.125-0.5-1.875-0.25-1.125-0.5-1.875-0.25-1.125-0.5-1.875-0.25-1.125-0.5-1.875-0.25-1.125-0.5-1.875-0.25-1.125-0.5-1.875-0.25-1.125-0.5-1.875c0-0.75-0.25-1.125-0.25-1.875s-0.25-1.125-0.25-1.875-0.25-1.125-0.25-1.875-0.25-1.125-0.25-1.875-0.25-1.125-0.25-1.875-0.25-1.125-0.25-1.875-0.25-1.125-0.25-1.875-0.25-1.125-0.25-1.875-0.25-1.125-0.25-1.875 0-1.125-0.25-1.875c0-0.75-0.25-1.125-0.25-1.875s0-1.125-0.25-1.875c0-0.75 0-1.125-0.25-1.875 0-0.75 0-1.125-0.25-1.875v-22.5c0-0.75 0-1.125 0.25-1.875 0-0.75 0-1.125 0.25-1.875 0-0.75 0-1.125 0.25-1.875 0-0.75 0-1.125 0.25-1.875 0-0.75 0.25-1.125 0.25-1.875s0.25-1.125 0.25-1.875 0.25-1.125 0.25-1.875 0.25-1.125 0.25-1.875 0.25-1.125 0.25-1.875 0.25-1.125 0.25-1.875 0.25-1.125 0.25-1.875 0.25-1.125 0.25-1.875 0.25-1.125 0.25-1.875 0.25-1.125 0.5-1.875 0.25-1.125 0.5-1.875 0.25-1.125 0.5-1.875 0.25-1.125 0.5-1.875 0.25-1.125 0.5-1.875 0.25-1.125 0.5-1.875 0.25-1.125 0.5-1.875 0.25-1.125 0.5-1.875 0.25-1.125 0.5-1.875 0.25-1.125 0.5-1.875l0.25-0.875c-4.25-0.25-8.625-0.75-12.75-0.75-3.75-0.25-7.25-0.25-11-0.25-3.5 0-7 0-10.5 0.25-7.25 0.25-14 0.875-20.75 1.875-4.25 0.5-8.125 1.125-12.375 1.875-3.5 0.5-6.75 1.125-10.25 1.875-3 0.5-6.25 1.125-9.25 1.875-3 0.75-5.875 1.125-8.875 1.875-2.75 0.75-5.875 1.125-8.875 1.875-2.75 0.5-5.625 1.125-8.375 1.625l-3.25-1.625-3.75-1.875-4 1.375-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-2.75-1.375-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-2.5-1.375 0.5 1.375 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.5 1.125c-0.5 0.25-0.75 0.5-1.125 0.75-0.875 0.75-1.625 1.125-2.5 1.875s-1.625 1.125-2.5 1.875-1.625 1.125-2.5 1.875c-0.75 0.75-1.625 1.125-2.375 1.875-0.75 0.75-1.625 1.125-2.375 1.875-0.75 0.75-1.625 1.125-2.375 1.875-0.75 0.75-1.625 1.125-2.375 1.875-0.75 0.75-1.375 1.125-2.375 1.875-0.75 0.75-1.375 1.125-2.125 1.875-0.75 0.75-1.375 1.125-2.125 1.875-0.75 0.75-1.375 1.125-2.125 1.875-0.75 0.75-1.375 1.125-2.125 1.875-0.75 0.75-1.375 1.125-2.125 1.875-0.75 0.75-1.375 1.125-2.125 1.875-0.75 0.75-1.375 1.125-1.875 1.875-0.75 0.75-1.375 1.125-1.875 1.875l-1.875 1.875-1.875 1.875-1.875 1.875-1.875 1.875c-0.75 0.75-1.125 1.125-1.625 1.875s-1.125 1.125-1.625 1.875-1.125 1.125-1.625 1.875-1.125 1.125-1.625 1.875-1.125 1.125-1.625 1.875-1.125 1.125-1.625 1.875-0.875 1.125-1.625 1.875c-0.5 0.75-0.875 1.125-1.625 1.875-0.5 0.75-0.875 1.125-1.375 1.875-0.5 0.75-0.875 1.125-1.375 1.875-0.5 0.75-0.875 1.125-1.375 1.875-0.5 0.75-0.875 1.125-1.375 1.875-0.5 0.75-0.875 1.125-1.375 1.875-0.5 0.75-0.875 1.125-1.375 1.875-0.5 0.75-0.875 1.125-1.375 1.875-0.5 0.75-0.875 1.125-1.375 1.875-0.5 0.75-0.875 1.125-1.125 1.875-0.5 0.75-0.875 1.125-1.125 1.875-0.5 0.75-0.75 1.125-1.125 1.875-0.5 0.75-0.75 1.125-1.125 1.875-0.5 0.75-0.75 1.125-1.125 1.875-0.5 0.75-0.75 1.125-1.125 1.875-0.5 0.75-0.75 1.125-1.125 1.875-0.5 0.75-0.75 1.125-1.125 1.875-0.25 0.75-0.75 1.125-0.875 1.875-0.25 0.75-0.75 1.125-0.875 1.875-0.25 0.75-0.75 1.125-0.875 1.875-0.25 0.75-0.75 1.125-0.875 1.875-0.25 0.75-0.75 1.125-0.875 1.875-0.25 0.75-0.75 1.125-0.875 1.875-0.25 0.75-0.75 1.125-0.875 1.875-0.25 0.75-0.5 1.125-0.875 1.875-0.25 0.75-0.5 1.125-0.875 1.875-0.25 0.75-0.5 1.125-0.875 1.875-0.25 0.75-0.5 1.125-0.75 1.875-0.25 0.75-0.5 1.125-0.75 1.875-0.25 0.75-0.5 1.125-0.75 1.875-0.25 0.75-0.5 1.125-0.75 1.875-0.25 0.75-0.5 1.125-0.75 1.875-0.25 0.75-0.5 1.125-0.75 1.875-0.25 0.75-0.5 1.125-0.75 1.875-0.25 0.75-0.5 1.125-0.75 1.875-0.25 0.75-0.5 1.125-0.75 1.875-0.25 0.75-0.5 1.125-0.75 1.875-0.25 0.75-0.5 1.125-0.5 1.875-0.25 0.75-0.5 1.125-0.5 1.875-0.25 0.75-0.5 1.125-0.5 1.875-0.25 0.75-0.25 1.125-0.5 1.875s-0.25 1.125-0.5 1.875-0.25 1.125-0.5 1.875-0.25 1.125-0.5 1.875-0.25 1.125-0.5 1.875-0.25 1.125-0.5 1.875-0.25 1.125-0.5 1.875-0.25 1.125-0.5 1.875-0.25 1.125-0.25 1.875-0.25 1.125-0.25 1.875-0.25 1.125-0.25 1.875-0.25 1.125-0.25 1.875-0.25 1.125-0.25 1.875-0.25 1.125-0.25 1.875-0.25 1.125-0.25 1.875-0.25 1.125-0.25 1.875-0.25 1.125-0.25 1.875 0 1.125-0.25 1.875c0 0.75 0 1.125-0.25 1.875 0 0.75 0 1.125-0.25 1.875 0 0.75 0 1.125-0.25 1.875V457.25v1.875 1.875 1.875 1.875 1.875 0.875 0.875 1.875 1.875 1.875 1.875 1.875 1.875c0 0.75 0 1.125 0.25 1.875 0 0.75 0 1.125 0.25 1.875 0 0.75 0 1.125 0.25 1.875 0 0.75 0.25 1.125 0.25 1.875s0.25 1.125 0.25 1.875 0.25 1.125 0.25 1.875 0.25 1.125 0.25 1.875 0.25 1.125 0.25 1.875 0.25 1.125 0.25 1.875 0.25 1.125 0.25 1.875 0.25 1.125 0.25 1.875 0.25 1.125 0.25 1.875 0.25 1.125 0.5 1.875c0 0.75 0.25 1.125 0.5 1.875s0.25 1.125 0.5 1.875 0.25 1.125 0.5 1.875 0.25 1.125 0.5 1.875 0.25 1.125 0.5 1.875 0.25 1.125 0.5 1.875 0.25 1.125 0.5 1.875 0.25 1.125 0.5 1.875 0.25 1.125 0.5 1.875 0.25 1.125 0.5 1.875 0.5 1.125 0.5 1.875c0.25 0.75 0.5 1.125 0.5 1.875 0.25 0.75 0.5 1.125 0.5 1.875 0.25 0.75 0.5 1.125 0.75 1.875 0.25 0.75 0.5 1.125 0.75 1.875 0.25 0.75 0.5 1.125 0.75 1.875 0.25 0.75 0.5 1.125 0.75 1.875 0.25 0.75 0.5 1.125 0.75 1.875 0.25 0.75 0.5 1.125 0.75 1.875 0.25 0.75 0.5 1.125 0.75 1.875 0.25 0.75 0.5 1.125 0.75 1.875 0.25 0.75 0.5 1.125 0.75 1.875 0.25 0.75 0.5 1.125 0.75 1.875 0.25 0.75 0.5 1.125 0.75 1.875 0.25 0.75 0.5 1.125 0.875 1.875 0.25 0.75 0.5 1.125 0.875 1.875 0.25 0.75 0.5 1.125 0.875 1.875 0.25 0.75 0.75 1.125 0.875 1.875 0.25 0.75 0.75 1.125 0.875 1.875 0.25 0.75 0.75 1.125 0.875 1.875 0.25 0.75 0.75 1.125 0.875 1.875 0.25 0.75 0.75 1.125 0.875 1.875 0.25 0.75 0.75 1.125 0.875 1.875 0.25 0.75 0.75 1.125 1.125 1.875 0.5 0.75 0.75 1.125 1.125 1.875 0.5 0.75 0.75 1.125 1.125 1.875 0.5 0.75 0.75 1.125 1.125 1.875 0.5 0.75 0.75 1.125 1.125 1.875 0.5 0.75 0.75 1.125 1.125 1.875 0.5 0.75 0.75 1.125 1.125 1.875 0.5 0.75 0.875 1.125 1.125 1.875 0.5 0.75 0.875 1.125 1.125 1.875 0.5 0.75 0.875 1.125 1.125 1.875 0.5 0.75 0.875 1.125 1.375 1.875 0.5 0.75 0.875 1.125 1.375 1.875 0.5 0.75 0.875 1.125 1.375 1.875 0.5 0.75 0.875 1.125 1.375 1.875 0.5 0.75 0.875 1.125 1.375 1.875 0.5 0.75 0.875 1.125 1.375 1.875 0.5 0.75 0.875 1.125 1.375 1.875 0.5 0.75 0.875 1.125 1.625 1.875 0.5 0.75 0.875 1.125 1.625 1.875 0.5 0.75 1.125 1.125 1.625 1.875s1.125 1.125 1.625 1.875 1.125 1.125 1.625 1.875 1.125 1.125 1.625 1.875 1.125 1.125 1.625 1.875l1.875 1.875 1.875 1.875 1.875 1.875 1.875 1.875c0.75 0.75 1.375 1.125 1.875 1.875 0.75 0.75 1.375 1.125 2.125 1.875 0.75 0.75 1.375 1.125 2.125 1.875 0.75 0.75 1.375 1.125 2.125 1.875 0.75 0.75 1.375 1.125 2.125 1.875 0.75 0.75 1.375 1.125 2.125 1.875 0.75 0.75 1.375 1.125 2.375 1.875 0.75 0.75 1.625 1.125 2.375 1.875 0.75 0.75 1.625 1.125 2.375 1.875 0.75 0.75 1.625 1.125 2.375 1.875 0.875 0.75 1.625 1.125 2.5 1.875s1.625 1.125 2.5 1.875 1.875 1.125 2.5 1.875c0.875 0.75 1.875 1.125 2.75 1.875 0.875 0.75 1.875 1.125 2.75 1.875 0.875 0.75 1.875 1.125 2.75 1.875 0.875 0.75 1.875 1.125 3 1.875 0.875 0.75 2.125 1.125 3 1.875s2.125 1.125 3 1.875c1.125 0.75 2.125 1.125 3.25 1.875 1.125 0.75 2.375 1.125 3.25 1.875 1.125 0.75 2.375 1.125 3.5 1.875 1.125 0.75 2.375 1.125 3.75 1.875 1.125 0.75 2.5 1.125 3.75 1.875 1.375 0.75 2.5 1.125 4 1.875 1.375 0.75 2.75 1.125 4.25 1.875 1.375 0.75 2.75 1.125 4.25 1.875 1.375 0.75 3 1.125 4.375 1.875 1.625 0.75 3 1.125 4.625 1.875 1.625 0.75 3.25 1.125 4.875 1.875 1.875 0.75 3.5 1.125 5.375 1.875s3.75 1.125 5.625 1.875c2.125 0.75 4.25 1.125 6 1.875 2.375 0.75 4.375 1.125 6.75 1.875 2.5 0.75 4.875 1.125 7.5 1.875 2.75 0.75 5.625 1.125 8.625 1.875 3.5 0.75 6.75 1.125 10.25 1.875 4.375 0.75 8.875 1.375 13.25 1.875 11 1.125 22.125 1.875 33.25 1.875h2.5c11.125 0 22.375-0.75 33.5-1.875 4.375-0.5 8.875-1.125 13.25-1.875 3.5-0.5 7-1.125 10.25-1.875 2.75-0.5 5.875-1.125 8.625-1.875 2.5-0.5 5.125-1.125 7.625-1.875 2.375-0.5 4.625-1.125 6.75-1.875 2.125-0.5 4.25-1.125 6.25-1.875 1.875-0.75 4-1.125 5.875-1.875s3.75-1.125 5.375-1.875c1.625-0.75 3.5-1.125 5.125-1.875 1.625-0.75 3.25-1.125 4.875-1.875 1.625-0.75 3-1.125 4.625-1.875 1.375-0.75 3-1.125 4.375-1.875s2.75-1.125 4.25-1.875c1.375-0.75 2.75-1.125 4-1.875 1.375-0.75 2.5-1.125 3.75-1.875 1.125-0.75 2.5-1.125 3.75-1.875 1.125-0.75 2.375-1.125 3.5-1.875 1.125-0.75 2.375-1.125 3.5-1.875 1.125-0.75 2.375-1.125 3.25-1.875 1.125-0.75 2.125-1.125 3.25-1.875 1.125-0.75 2.125-1.125 3-1.875s2.125-1.125 3-1.875 1.875-1.125 3-1.875c0.875-0.75 1.875-1.125 2.75-1.875 0.875-0.75 1.875-1.125 2.75-1.875 0.875-0.75 1.875-1.125 2.75-1.875 0.875-0.75 1.875-1.125 2.5-1.875 0.875-0.75 1.625-1.125 2.5-1.875s1.625-1.125 2.5-1.875 1.625-1.125 2.375-1.875c0.75-0.75 1.625-1.125 2.375-1.875 0.75-0.75 1.625-1.125 2.375-1.875 0.75-0.75 1.375-1.125 2.375-1.875 0.75-0.75 1.375-1.125 2.375-1.875 0.75-0.75 1.375-1.125 2.125-1.875 0.75-0.75 1.375-1.125 2.125-1.875 0.75-0.75 1.375-1.125 2.125-1.875 0.75-0.75 1.375-1.125 2.125-1.875 0.75-0.75 1.375-1.125 1.875-1.875 0.75-0.75 1.375-1.125 1.875-1.875l1.875-1.875 1.875-1.875 1.875-1.875 1.875-1.875c0.75-0.75 1.125-1.125 1.625-1.875s1.125-1.125 1.625-1.875 1.125-1.125 1.625-1.875 1.125-1.125 1.625-1.875 1.125-1.125 1.625-1.875 0.875-1.125 1.625-1.875c0.5-0.75 0.875-1.125 1.625-1.875 0.5-0.75 0.875-1.125 1.375-1.875 0.5-0.75 0.875-1.125 1.375-1.875 0.5-0.75 0.875-1.125 1.375-1.875 0.5-0.75 0.875-1.125 1.375-1.875 0.5-0.75 0.875-1.125 1.375-1.875 0.5-0.75 0.875-1.125 1.375-1.875 0.5-0.75 0.875-1.125 1.375-1.875 0.5-0.75 0.875-1.125 1.125-1.875 0.5-0.75 0.875-1.125 1.125-1.875 0.5-0.75 0.875-1.125 1.125-1.875 0.5-0.75 0.75-1.125 1.125-1.875 0.5-0.75 0.75-1.125 1.125-1.875 0.5-0.75 0.75-1.125 1.125-1.875 0.5-0.75 0.75-1.125 1.125-1.875 0.5-0.75 0.75-1.125 1.125-1.875 0.5-0.75 0.75-1.125 1.125-1.875 0.5-0.75 0.75-1.125 0.875-1.875 0.25-0.75 0.75-1.125 0.875-1.875 0.25-0.75 0.75-1.125 0.875-1.875 0.25-0.75 0.75-1.125 0.875-1.875 0.25-0.75 0.75-1.125 0.875-1.875 0.25-0.75 0.75-1.125 0.875-1.875 0.25-0.75 0.75-1.125 0.875-1.875 0.25-0.75 0.75-1.125 0.875-1.875 0.25-0.75 0.5-1.125 0.875-1.875 0.25-0.75 0.5-1.125 0.875-1.875 0.25-0.75 0.5-1.125 0.75-1.875 0.25-0.75 0.5-1.125 0.75-1.875 0.25-0.75 0.5-1.125 0.75-1.875 0.25-0.75 0.5-1.125 0.75-1.875 0.25-0.75 0.5-1.125 0.75-1.875 0.25-0.75 0.5-1.125 0.75-1.875 0.25-0.75 0.5-1.125 0.75-1.875 0.25-0.75 0.5-1.125 0.75-1.875 0.25-0.75 0.5-1.125 0.75-1.875 0.25-0.75 0.5-1.125 0.75-1.875 0.25-0.75 0.5-1.125 0.75-1.875 0.25-0.75 0.5-1.125 0.5-1.875 0.25-0.75 0.5-1.125 0.5-1.875 0.25-0.75 0.25-1.125 0.5-1.875s0.5-1.125 0.5-1.875c0.25-0.75 0.25-1.125 0.5-1.875s0.25-1.125 0.5-1.875 0.25-1.125 0.5-1.875 0.25-1.125 0.5-1.875 0.25-1.125 0.5-1.875c0-0.5 0.25-0.75 0.25-1.125-4.625 0.5-9.25 0.875-14 1.125-3.5 0.25-7 0.25-10.75 0.25-4 0-8.125 0-12.125-0.25-6.75-0.25-13.25-0.875-19.5-1.875-3.75-0.5-7.625-1.125-11.375-1.875-3-0.5-5.875-1.125-8.875-1.875-2.5-0.5-5.125-1.125-7.5-1.875-2.125-0.5-4.375-1.125-6.5-1.875-1.875-0.5-4-1.125-5.875-1.875-1.875-0.5-3.5-1.125-5.375-1.875-1.625-0.75-3.25-1.125-4.875-1.875-1.625-0.75-3-1.125-4.625-1.875-1.375-0.75-3-1.125-4.375-1.875s-2.75-1.125-4.25-1.875c-1.375-0.75-2.5-1.125-4-1.875-1.125-0.75-2.5-1.125-3.75-1.875-1.125-0.75-2.375-1.125-3.5-1.875-1.125-0.75-2.375-1.125-3.5-1.875-1.125-0.75-2.125-1.125-3.25-1.875-0.875-0.75-2.125-1.125-3-1.875s-2.125-1.125-3-1.875-1.875-1.125-3-1.875c-0.875-0.75-1.875-1.125-2.75-1.875-0.875-0.75-1.875-1.125-2.75-1.875-0.875-0.75-1.875-1.125-2.5-1.875-0.875-0.75-1.625-1.125-2.5-1.875s-1.625-1.125-2.5-1.875c-0.75-0.75-1.625-1.125-2.375-1.875-0.75-0.75-1.625-1.125-2.375-1.875-0.75-0.75-1.625-1.125-2.375-1.875-0.75-0.75-1.375-1.125-2.125-1.875-0.75-0.75-1.375-1.125-2.125-1.875-0.75-0.75-1.375-1.125-2.125-1.875-0.75-0.75-1.375-1.125-2.125-1.875-0.75-0.75-1.375-1.125-2.125-1.875-0.75-0.75-1.375-1.125-1.875-1.875l-1.875-1.875-1.875-1.875-1.875-1.875c-0.75-0.75-1.125-1.125-1.625-1.875s-1.125-1.125-1.625-1.875-1.125-1.125-1.625-1.875-1.125-1.125-1.625-1.875-1.125-1.125-1.625-1.875-0.875-1.125-1.625-1.875c-0.5-0.75-0.875-1.125-1.625-1.875-0.5-0.75-0.875-1.125-1.375-1.875-0.5-0.75-0.875-1.125-1.375-1.875-0.5-0.75-0.875-1.125-1.375-1.875-0.5-0.75-0.875-1.125-1.375-1.875-0.5-0.75-0.875-1.125-1.375-1.875-0.5-0.75-0.875-1.125-1.375-1.875-0.5-0.75-0.875-1.125-1.125-1.875-0.5-0.75-0.875-1.125-1.125-1.875-0.5-0.75-0.75-1.125-1.125-1.875-0.5-0.75-0.75-1.125-1.125-1.875-0.5-0.75-0.75-1.125-1.125-1.875-0.5-0.75-0.75-1.125-1.125-1.875-0.5-0.75-0.75-1.125-1.125-1.875-0.5-0.75-0.75-1.125-1.125-1.875-0.5-0.75-0.75-1.125-1.125-1.875-0.25-0.75-0.75-1.125-0.875-1.875-0.25-0.75-0.75-1.125-0.875-1.875-0.25-0.75-0.75-1.125-0.875-1.875-0.25-0.75-0.75-1.125-0.875-1.875-0.25-0.75-0.75-1.125-0.875-1.875-0.25-0.75-0.75-1.125-0.875-1.875-0.25-0.75-0.75-1.125-0.875-1.875-0.25-0.75-0.5-1.125-0.875-1.875-0.25-0.75-0.5-1.125-0.875-1.875-0.25-0.75-0.5-1.125-0.875-1.875-0.25-0.75-0.5-1.125-0.75-1.875-3.125-4.625-3.375-5.125-3.625-5.75z m433.625-71.25v-11.375c0-0.5 0-0.875-0.25-1.625 0-0.5 0-0.875-0.25-1.625 0-0.5 0-0.875-0.25-1.625 0-0.5-0.25-0.875-0.25-1.625 0-0.5-0.25-0.875-0.25-1.625 0-0.5-0.25-0.875-0.25-1.625 0-0.5-0.25-0.875-0.25-1.625 0-0.5-0.25-0.875-0.25-1.625 0-0.5-0.25-0.875-0.25-1.625 0-0.5-0.25-0.875-0.25-1.625 0-0.5-0.25-0.875-0.25-1.625 0-0.5-0.25-0.875-0.25-1.625 0-0.5-0.25-0.875-0.5-1.625-0.25-0.5-0.25-0.875-0.5-1.625-0.25-0.5-0.25-0.875-0.5-1.625-0.25-0.5-0.25-0.875-0.5-1.625-0.25-0.5-0.25-0.875-0.5-1.625-0.25-0.5-0.25-0.875-0.5-1.625-0.25-0.5-0.25-0.875-0.5-1.625-0.25-0.5-0.25-0.875-0.5-1.625-0.25-0.5-0.25-0.875-0.5-1.625-0.25-0.5-0.25-0.875-0.5-1.625-0.25-0.5-0.5-0.875-0.5-1.625-0.25-0.5-0.5-0.875-0.5-1.625-0.25-0.5-0.5-0.875-0.5-1.625-0.25-0.5-0.5-0.875-0.75-1.625-0.25-0.5-0.5-0.875-0.75-1.625-0.25-0.5-0.5-0.875-0.75-1.625-0.25-0.5-0.5-0.875-0.75-1.625-0.25-0.5-0.5-0.875-0.75-1.625-0.25-0.5-0.5-0.875-0.75-1.625-0.25-0.5-0.5-0.875-0.75-1.625-0.25-0.5-0.5-0.875-0.75-1.625-0.25-0.5-0.5-0.875-0.75-1.625-0.25-0.5-0.5-0.875-0.75-1.625-0.25-0.5-0.5-0.875-0.75-1.625-0.25-0.5-0.5-0.875-0.875-1.625-0.25-0.5-0.5-0.875-0.875-1.625-0.25-0.5-0.5-0.875-0.875-1.625-0.25-0.5-0.5-0.875-0.875-1.625-0.25-0.5-0.75-0.875-0.875-1.625-0.25-0.5-0.75-0.875-0.875-1.625-0.25-0.5-0.75-0.875-0.875-1.625-0.25-0.5-0.75-0.875-0.875-1.625-0.25-0.5-0.75-0.875-0.875-1.625-0.25-0.5-0.75-0.875-0.875-1.625-0.25-0.5-0.75-0.875-0.875-1.625-0.25-0.5-0.75-0.875-0.875-1.625-0.5-0.5-0.75-0.875-1.125-1.625-0.5-0.5-0.75-0.875-1.125-1.625-0.5-0.5-0.75-0.875-1.125-1.625-0.5-0.5-0.75-0.875-1.125-1.625-0.5-0.5-0.75-0.875-1.125-1.625-0.5-0.5-0.75-0.875-1.125-1.625-0.5-0.5-0.75-0.875-1.125-1.625-0.5-0.5-0.75-0.875-1.125-1.625-0.5-0.5-0.75-0.875-1.125-1.625-0.5-0.5-0.875-0.875-1.125-1.625-0.5-0.5-0.875-0.875-1.125-1.625-0.5-0.5-0.875-0.875-1.375-1.625-0.5-0.5-0.875-0.875-1.375-1.625-0.5-0.5-0.875-0.875-1.375-1.625-0.5-0.5-0.875-0.875-1.375-1.625-0.5-0.5-0.875-0.875-1.375-1.625-0.5-0.5-0.875-0.875-1.375-1.625-0.5-0.5-0.875-0.875-1.375-1.625-0.5-0.5-0.875-0.875-1.375-1.625-0.5-0.5-0.875-0.875-1.375-1.625-0.5-0.5-0.875-0.875-1.375-1.625l-1.625-1.625-1.625-1.625c-0.5-0.5-1.125-0.875-1.625-1.625-0.5-0.5-1.125-0.875-1.625-1.625-0.5-0.5-1.125-0.875-1.625-1.625-0.5-0.5-1.125-0.875-1.625-1.625-0.5-0.5-1.125-0.875-1.625-1.625-0.5-0.5-1.125-0.875-1.625-1.625-0.5-0.5-1.125-0.875-1.625-1.625-0.75-0.5-1.125-0.875-1.875-1.625-0.75-0.5-1.125-0.875-1.875-1.625-0.75-0.5-1.125-0.875-1.875-1.625-0.75-0.5-1.125-0.875-1.875-1.625-0.75-0.5-1.125-0.875-1.875-1.625-0.75-0.5-1.125-0.875-1.875-1.625-0.75-0.5-1.375-0.875-1.875-1.625-0.75-0.5-1.375-0.875-1.875-1.625-0.75-0.5-1.375-0.875-2.125-1.625-0.75-0.5-1.375-0.875-2.125-1.625l-0.75-0.5 0.25-0.875 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.25-1.125-2.125 1.125-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-0.5 0.25-0.875-0.25c-2.125-0.5-4.25-0.875-6-1.625-2.125-0.5-4.25-0.875-6.25-1.625-2.125-0.5-4.25-0.875-6.5-1.625-2.375-0.5-4.375-0.875-6.75-1.625-2.375-0.5-4.875-1.125-7.25-1.625-2.75-0.5-5.375-1.125-8.125-1.625-3.25-0.5-6.5-1.125-9.75-1.625-5.375-0.75-10.75-1.125-15.875-1.625-2.75-0.25-5.875-0.25-8.625-0.25-3.75 0-7.5 0-11.125 0.25-6.5 0.25-12.75 0.75-19.125 1.625-3.75 0.5-7.5 0.875-11 1.625-2.75 0.5-5.875 0.875-8.625 1.625-2.375 0.5-4.875 0.875-7.25 1.625-2.125 0.5-4.25 0.875-6.25 1.625-1.875 0.5-3.75 0.875-5.625 1.625-1.875 0.5-3.5 0.875-5.125 1.625-1.625 0.5-3.25 0.875-4.875 1.625-1.375 0.5-3 0.875-4.375 1.625-1.375 0.5-2.75 0.875-4.25 1.625-1.375 0.5-2.5 0.875-4 1.625-1.125 0.5-2.5 0.875-3.75 1.625-1.125 0.5-2.375 0.875-3.75 1.625-1.125 0.5-2.375 0.875-3.5 1.625-1.125 0.5-2.125 0.875-3.25 1.625-1.125 0.5-2.125 0.875-3.25 1.625-0.875 0.5-2.125 0.875-3 1.625-0.875 0.5-1.875 0.875-3 1.625-0.875 0.5-1.875 0.875-2.75 1.625-0.875 0.5-1.875 0.875-2.75 1.625-0.875 0.5-1.875 0.875-2.5 1.625-0.875 0.5-1.625 0.875-2.5 1.625-0.875 0.5-1.625 0.875-2.5 1.625-0.75 0.5-1.625 0.875-2.375 1.625-0.75 0.5-1.625 0.875-2.375 1.625-0.75 0.5-1.625 0.875-2.375 1.625-0.75 0.5-1.375 0.875-2.375 1.625-0.75 0.5-1.375 0.875-2.125 1.625-0.75 0.5-1.375 0.875-2.125 1.625-0.75 0.5-1.375 0.875-2.125 1.625-0.75 0.5-1.375 0.875-2.125 1.625-0.75 0.5-1.375 0.875-1.875 1.625-0.75 0.5-1.375 0.875-1.875 1.625-0.75 0.5-1.125 0.875-1.875 1.625-0.75 0.5-1.125 0.875-1.875 1.625-0.75 0.5-1.125 0.875-1.875 1.625-0.75 0.5-1.125 0.875-1.875 1.625-0.5 0.5-1.125 0.875-1.625 1.625-0.5 0.5-1.125 0.875-1.625 1.625-0.5 0.5-1.125 0.875-1.625 1.625-0.5 0.5-1.125 0.875-1.625 1.625l-1.625 1.625-1.625 1.625c-0.5 0.5-0.875 0.875-1.375 1.625-0.5 0.5-0.875 0.875-1.375 1.625-0.5 0.5-0.875 0.875-1.375 1.625-0.5 0.5-0.875 0.875-1.375 1.625-0.5 0.5-0.875 0.875-1.375 1.625-0.5 0.5-0.875 0.875-1.375 1.625-0.5 0.5-0.875 0.875-1.375 1.625-0.5 0.5-0.875 0.875-1.125 1.625-0.5 0.5-0.875 0.875-1.125 1.625-0.5 0.5-0.875 0.875-1.125 1.625-0.5 0.5-0.75 0.875-1.125 1.625-0.5 0.5-0.75 0.875-1.125 1.625-0.5 0.5-0.75 0.875-1.125 1.625-0.5 0.5-0.75 0.875-1.125 1.625-0.5 0.5-0.75 0.875-1.125 1.625-0.5 0.5-0.75 0.875-1.125 1.625-0.5 0.5-0.75 0.875-1.125 1.625-0.25 0.5-0.75 0.875-0.875 1.625-0.25 0.5-0.75 0.875-0.875 1.625-0.25 0.5-0.75 0.875-0.875 1.625-0.25 0.5-0.75 0.875-0.875 1.625-0.25 0.5-0.75 0.875-0.875 1.625-0.25 0.5-0.75 0.875-0.875 1.625-0.25 0.5-0.75 0.875-0.875 1.625-0.25 0.5-0.75 0.875-0.875 1.625-0.25 0.5-0.5 0.875-0.875 1.625-0.25 0.5-0.5 0.875-0.875 1.625-0.25 0.5-0.5 0.875-0.75 1.625-0.25 0.5-0.5 0.875-0.75 1.625-0.25 0.5-0.5 0.875-0.75 1.625-0.25 0.5-0.5 0.875-0.75 1.625-0.25 0.5-0.5 0.875-0.75 1.625-0.25 0.5-0.5 0.875-0.75 1.625-0.25 0.5-0.5 0.875-0.75 1.625-0.25 0.5-0.5 0.875-0.75 1.625-0.25 0.5-0.5 0.875-0.75 1.625-0.25 0.5-0.5 0.875-0.75 1.625-0.25 0.5-0.5 0.875-0.75 1.625-0.25 0.5-0.5 0.875-0.75 1.625-0.25 0.5-0.5 0.875-0.5 1.625-0.25 0.5-0.5 0.875-0.5 1.625-0.25 0.5-0.5 0.875-0.5 1.625-0.25 0.5-0.5 0.875-0.5 1.625-0.25 0.5-0.5 0.875-0.5 1.625-0.25 0.5-0.25 0.875-0.5 1.625-0.25 0.5-0.25 0.875-0.5 1.625-0.25 0.5-0.25 0.875-0.5 1.625-0.25 0.5-0.25 0.875-0.5 1.625-0.25 0.5-0.25 0.875-0.5 1.625-0.25 0.5-0.25 0.875-0.5 1.625-0.25 0.5-0.25 0.875-0.5 1.625-0.25 0.5-0.25 0.875-0.5 1.625-0.25 0.5-0.25 0.875-0.5 1.625-0.25 0.5-0.25 0.875-0.25 1.625 0 0.5-0.25 0.875-0.25 1.625 0 0.5-0.25 0.875-0.25 1.625 0 0.5-0.25 0.875-0.25 1.625 0 0.5-0.25 0.875-0.25 1.625 0 0.5-0.25 0.875-0.25 1.625 0 0.5-0.25 0.875-0.25 1.625 0 0.5-0.25 0.875-0.25 1.625 0 0.5-0.25 0.875-0.25 1.625 0 0.5-0.25 0.875-0.25 1.625 0 0.5-0.25 0.875-0.25 1.625 0 0.5-0.25 0.875-0.25 1.625 0 0.5 0 0.875-0.25 1.625 0 0.5 0 0.875-0.25 1.625 0 0.5 0 0.875-0.25 1.625v1.625 1.625 1.625 3.25 1.625 3.25 1.375 1.625 1.625 1.625 1.625 1.625 1.625 1.625 1.625 1.625c0 0.5 0 0.875 0.25 1.625 0 0.5 0 0.875 0.25 1.625 0 0.5 0 0.875 0.25 1.625 0 0.5 0.25 0.875 0.25 1.625 0 0.5 0.25 0.875 0.25 1.625 0 0.5 0.25 0.875 0.25 1.625 0 0.5 0.25 0.875 0.25 1.625 0 0.5 0.25 0.875 0.25 1.625 0 0.5 0.25 0.875 0.25 1.625 0 0.5 0.25 0.875 0.25 1.625 0 0.5 0.25 0.875 0.25 1.625 0 0.5 0.25 0.875 0.25 1.625 0 0.5 0.25 0.875 0.25 1.625 0 0.5 0.25 0.875 0.25 1.625 0 0.5 0.25 0.875 0.25 1.625 0.25 0.5 0.25 0.875 0.5 1.625 0.25 0.5 0.25 0.875 0.5 1.625 0.25 0.5 0.25 0.875 0.5 1.625 0.25 0.5 0.25 0.875 0.5 1.625 0.25 0.5 0.25 0.875 0.5 1.625 0.25 0.5 0.25 0.875 0.5 1.625 0.25 0.5 0.25 0.875 0.5 1.625 0.25 0.5 0.25 0.875 0.5 1.625 0.25 0.5 0.25 0.875 0.5 1.625 0.25 0.5 0.5 0.875 0.5 1.625 0.25 0.5 0.5 0.875 0.5 1.625 0.25 0.5 0.5 0.875 0.5 1.625 0.25 0.5 0.5 0.875 0.5 1.625 0.25 0.5 0.5 0.875 0.5 1.625 0.25 0.5 0.5 0.875 0.75 1.625 0.25 0.5 0.5 0.875 0.75 1.625 0.25 0.5 0.5 0.875 0.75 1.625 0.25 0.5 0.5 0.875 0.75 1.625 0.25 0.5 0.5 0.875 0.75 1.625 0.25 0.5 0.5 0.875 0.75 1.625 0.25 0.5 0.5 0.875 0.75 1.625 0.25 0.5 0.5 0.875 0.75 1.625 0.25 0.5 0.5 0.875 0.75 1.625 0.25 0.5 0.5 0.875 0.75 1.625 0.25 0.5 0.5 0.875 0.75 1.625 0.25 0.5 0.5 0.875 0.875 1.625 0.25 0.5 0.5 0.875 0.875 1.625 0.25 0.5 0.5 0.875 0.875 1.625 0.25 0.5 0.75 0.875 0.875 1.625 0.25 0.5 0.75 0.875 0.875 1.625 0.25 0.5 0.75 0.875 0.875 1.625 0.25 0.5 0.75 0.875 0.875 1.625 0.25 0.5 0.75 0.875 0.875 1.625 0.25 0.5 0.75 0.875 0.875 1.625 0.25 0.5 0.75 0.875 0.875 1.625 0.25 0.5 0.75 0.875 0.875 1.625 0.25 0.5 0.75 0.875 1.125 1.625 0.5 0.5 0.75 0.875 1.125 1.625 0.5 0.5 0.75 0.875 1.125 1.625 0.5 0.5 0.75 0.875 1.125 1.625 0.5 0.5 0.75 0.875 1.125 1.625 0.5 0.5 0.75 0.875 1.125 1.625 0.5 0.5 0.75 0.875 1.125 1.625 0.5 0.5 0.875 0.875 1.125 1.625 0.5 0.5 0.875 0.875 1.125 1.625 0.5 0.5 0.875 0.875 1.125 1.625 0.5 0.5 0.875 0.875 1.375 1.625 0.5 0.5 0.875 0.875 1.375 1.625 0.5 0.5 0.875 0.875 1.375 1.625 0.5 0.5 0.875 0.875 1.375 1.625 0.5 0.5 0.875 0.875 1.375 1.625 0.5 0.5 0.875 0.875 1.375 1.625 0.5 0.5 0.875 0.875 1.375 1.625l1.625 1.625 1.625 1.625c0.5 0.5 1.125 0.875 1.625 1.625 0.5 0.5 1.125 0.875 1.625 1.625 0.5 0.5 1.125 0.875 1.625 1.625 0.5 0.5 1.125 0.875 1.625 1.625 0.5 0.5 1.125 0.875 1.875 1.625 0.75 0.5 1.125 0.875 1.875 1.625 0.75 0.5 1.125 0.875 1.875 1.625 0.75 0.5 1.125 0.875 1.875 1.625 0.75 0.5 1.375 0.875 1.875 1.625 0.75 0.5 1.375 0.875 1.875 1.625 0.75 0.5 1.375 0.875 2.125 1.625 0.75 0.5 1.375 0.875 2.125 1.625 0.75 0.5 1.375 0.875 2.125 1.625 0.75 0.5 1.375 0.875 2.125 1.625 0.75 0.5 1.375 0.875 2.375 1.625 0.75 0.5 1.625 0.875 2.375 1.625 0.75 0.5 1.625 0.875 2.375 1.625 0.75 0.5 1.625 0.875 2.375 1.625 0.875 0.5 1.625 0.875 2.5 1.625 0.875 0.5 1.625 0.875 2.5 1.625 0.875 0.5 1.875 0.875 2.5 1.625 0.875 0.5 1.875 0.875 2.75 1.625 0.875 0.5 1.875 0.875 2.75 1.625 0.875 0.5 1.875 0.875 3 1.625 0.875 0.5 2.125 0.875 3 1.625 1.125 0.5 2.125 0.875 3.25 1.625 1.125 0.5 2.125 0.875 3.25 1.625 1.125 0.5 2.375 0.875 3.5 1.625 1.125 0.5 2.375 0.875 3.75 1.625 1.125 0.5 2.5 0.875 3.75 1.625 1.375 0.5 2.5 0.875 4 1.625 1.375 0.5 2.75 0.875 4.25 1.625 1.375 0.5 3 0.875 4.375 1.625 1.625 0.5 3.25 0.875 4.875 1.625 1.625 0.5 3.5 0.875 5.125 1.625 1.875 0.5 3.75 0.875 5.875 1.625 2.125 0.5 4.25 1.125 6.25 1.625 2.375 0.5 4.875 1.125 7.25 1.625 2.75 0.5 5.875 1.125 8.625 1.625 3.75 0.75 7.5 1.125 11.125 1.625 9.25 1.125 19.125 1.625 28.875 1.625h1.375c9.25 0 18.375-0.75 27.5-1.625 3.75-0.5 7.25-0.875 10.75-1.625 2.75-0.5 5.625-0.875 8.375-1.625 2.375-0.5 4.625-0.875 7-1.625 2.125-0.5 4.25-0.875 6.25-1.625 1.875-0.5 3.75-0.875 5.625-1.625 1.625-0.5 3.5-0.875 5.125-1.625 1.625-0.5 3.25-0.875 4.625-1.625 1.375-0.5 3-0.875 4.375-1.625 1.375-0.5 2.75-0.875 4.25-1.625 1.375-0.5 2.5-0.875 4-1.625 1.125-0.5 2.5-0.875 3.75-1.625 1.125-0.5 2.375-0.875 3.5-1.625 1.125-0.5 2.375-0.875 3.5-1.625 1.125-0.5 2.125-0.875 3.25-1.625 1.125-0.5 2.125-0.875 3.25-1.625 0.875-0.5 2.125-0.875 3-1.625 0.875-0.5 1.875-0.875 3-1.625 0.875-0.5 1.875-0.875 2.75-1.625 0.875-0.5 1.875-0.875 2.75-1.625 0.875-0.5 1.875-0.875 2.5-1.625 0.875-0.5 1.625-0.875 2.5-1.625 0.875-0.5 1.625-0.875 2.5-1.625 0.875-0.5 1.625-0.875 2.5-1.625 0.75-0.5 1.625-0.875 2.375-1.625 0.75-0.5 1.625-0.875 2.375-1.625 0.75-0.5 1.375-0.875 2.375-1.625 0.75-0.5 1.375-0.875 2.125-1.625 0.75-0.5 1.375-0.875 2.125-1.625 0.75-0.5 1.375-0.875 2.125-1.625 0.75-0.5 1.375-0.875 2.125-1.625 0.75-0.5 1.375-0.875 1.875-1.625 0.75-0.5 1.375-0.875 1.875-1.625 0.75-0.5 1.125-0.875 1.875-1.625 0.75-0.5 1.125-0.875 1.875-1.625 0.75-0.5 1.125-0.875 1.875-1.625 0.75-0.5 1.125-0.875 1.875-1.625 0.5-0.5 1.125-0.875 1.625-1.625 0.5-0.5 1.125-0.875 1.625-1.625 0.5-0.5 1.125-0.875 1.625-1.625 0.5-0.5 1.125-0.875 1.625-1.625 0.5-0.5 1.125-0.875 1.625-1.625l1.625-1.625 1.625-1.625c0.5-0.5 0.875-0.875 1.375-1.625 0.5-0.5 0.875-0.875 1.375-1.625 0.5-0.5 0.875-0.875 1.375-1.625 0.5-0.5 0.875-0.875 1.375-1.625 0.5-0.5 0.875-0.875 1.375-1.625 0.5-0.5 0.875-0.875 1.375-1.625 0.5-0.5 0.875-0.875 1.375-1.625 0.5-0.5 0.875-0.875 1.375-1.625 0.5-0.5 0.875-0.875 1.125-1.625 0.5-0.5 0.75-0.875 1.125-1.625 0.5-0.5 0.875-0.875 1.125-1.625 0.5-0.5 0.75-0.875 1.125-1.625 0.5-0.5 0.75-0.875 1.125-1.625 0.5-0.5 0.75-0.875 1.125-1.625 0.5-0.5 0.75-0.875 1.125-1.625 0.5-0.5 0.75-0.875 1.125-1.625 0.5-0.5 0.75-0.875 1.125-1.625 0.5-0.5 0.75-0.875 0.875-1.625 0.25-0.5 0.75-0.875 0.875-1.625 0.25-0.5 0.75-0.875 0.875-1.625 0.25-0.5 0.75-0.875 0.875-1.625 0.25-0.5 0.75-0.875 0.875-1.625 0.25-0.5 0.75-0.875 0.875-1.625 0.25-0.5 0.75-0.875 0.875-1.625 0.25-0.5 0.5-0.875 0.875-1.625 0.25-0.5 0.75-0.875 0.875-1.625 0.25-0.5 0.5-0.875 0.875-1.625 0.25-0.5 0.5-0.875 0.875-1.625 0.25-0.5 0.5-0.875 0.875-1.625 0.25-0.5 0.5-0.875 0.75-1.625 0.25-0.5 0.5-0.875 0.75-1.625 0.25-0.5 0.5-0.875 0.75-1.625 0.25-0.5 0.5-0.875 0.75-1.625 0.25-0.5 0.5-0.875 0.75-1.625 0.25-0.5 0.5-0.875 0.75-1.625 0.25-0.5 0.5-0.875 0.75-1.625 0.25-0.5 0.5-0.875 0.75-1.625 0.25-0.5 0.5-0.875 0.75-1.625 0.25-0.5 0.5-0.875 0.75-1.625 0.25-0.5 0.5-0.875 0.75-1.625 0.25-0.5 0.5-0.875 0.5-1.625 0.25-0.5 0.5-0.875 0.5-1.625 0.25-0.5 0.5-0.875 0.5-1.625 0.25-0.5 0.25-0.875 0.5-1.625 0.25-0.5 0.25-0.875 0.5-1.625 0.25-0.5 0.25-0.875 0.5-1.625 0.25-0.5 0.25-0.875 0.5-1.625 0.25-0.5 0.25-0.875 0.5-1.625 0.25-0.5 0.25-0.875 0.5-1.625 0.25-0.5 0.25-0.875 0.5-1.625 0.25-0.5 0.25-0.875 0.5-1.625 0.25-0.5 0.25-0.875 0.5-1.625 0.25-0.5 0.25-0.875 0.5-1.625 0.25-0.5 0.25-0.875 0.5-1.625 0.25-0.5 0.25-0.875 0.5-1.625 0-0.5 0.25-0.875 0.25-1.625 0-0.5 0.25-0.875 0.25-1.625 0-0.5 0.25-0.875 0.25-1.625 0-0.5 0.25-0.875 0.25-1.625 0-0.5 0.25-0.875 0.25-1.625 0-0.5 0.25-0.875 0.25-1.625 0-0.5 0.25-0.875 0.25-1.625 0-0.5 0.25-0.875 0.25-1.625 0-0.5 0.25-0.875 0.25-1.625 0-0.5 0-0.875 0.25-1.625 0-0.5 0-0.875 0.25-1.625 0-0.5 0-0.875 0.25-1.625 0-0.5 0-0.875 0.25-1.625 0-0.5 0-0.875 0.25-1.625v-11.375h-3.125zM589.714646 384c-12.625 0-25.375-12.75-25.375-25.375 0-12.75 12.75-25.375 25.375-25.375 19.375 0 31.875 12.625 31.875 25.375-0.125 12.625-12.75 25.375-31.875 25.375zM729.589646 384c-12.625 0-25.375-12.75-25.375-25.375 0-12.75 12.75-25.375 25.375-25.375 19.125 0 31.875 12.625 31.875 25.375 0 12.625-12.75 25.375-31.875 25.375zM328.714646 568.75c-19.125 0-38.375-12.625-38.375-31.625 0-19.125 19.375-31.875 38.375-31.875s31.875 12.75 31.875 31.875-12.875 31.625-31.875 31.625zM506.964646 568.75c-19.125 0-38.125-12.625-38.125-31.625 0-19.125 19.125-31.875 38.125-31.875 19.125 0 31.875 12.75 31.875 31.875s-12.875 31.625-31.875 31.625z"  horiz-adv-x="1059" />
+
+    
+    <glyph glyph-name="shrink-right" unicode="&#58984;" d="M52.294-28.71900000000005h899.793c16.546 0 29.999 13.405 29.999 29.999v59.974c-0.013 16.562-13.436 29.985-29.998 29.999h-899.795c-16.57 0-29.999-13.429-29.999-29.999v-59.974c0-16.617 13.429-29.999 29.999-29.999zM952.087 451.165h-479.884c-16.57 0-29.999-13.405-29.999-29.999v-59.974c0 0 0 0 0 0 0-16.572 13.428-30.01 29.997-30.022h479.885c16.571 0.013 29.999 13.448 29.999 30.022 0 0 0 0 0 0v59.974c0 16.593-13.429 29.999-29.999 29.999zM52.294 691.0840000000001h899.793c16.554 0.013 29.972 13.423 29.999 29.974v59.999c0 16.57-13.429 29.999-29.999 29.999h-899.793c-16.57 0-29.999-13.429-29.999-29.999v-59.997c0-16.546 13.429-29.975 29.999-29.975zM45.183 383.53499999999997l239.919-150.598v301.196l-239.919-150.598z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="spread-left" unicode="&#58987;" d="M942.974 770.924h-843.556c-15.513 0-28.124-12.567-28.124-28.124v-56.226c0.012-15.527 12.596-28.111 28.123-28.124h843.559c15.534 0 28.124 12.59 28.124 28.124v56.226c0 15.578-12.59 28.124-28.124 28.124zM99.418 321.033h449.891c15.534 0 28.124 12.567 28.124 28.124v56.226c0 0 0 0 0 0 0 15.537-12.589 28.134-28.122 28.146h-449.892c-15.534-0.012-28.124-12.608-28.124-28.146 0 0 0 0 0 0v-56.226c0-15.556 12.59-28.124 28.124-28.124zM942.974 96.10900000000004h-843.556c-15.519-0.012-28.099-12.584-28.124-28.101v-56.249c0-15.534 12.59-28.124 28.124-28.124h843.556c15.534 0 28.124 12.59 28.124 28.124v56.248c0 15.513-12.59 28.103-28.124 28.102zM949.641 384.436l-224.924 141.186v-282.37l224.924 141.186z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="camera" unicode="&#58976;" d="M884.3 648.6H704.2L679.5 698l-0.2 0.4c-1.9 3.6-3.6 6.9-5.1 9.9-12 23.4-21.5 41.9-54.1 41.9H416.7c-32.9 0-43.7-21.3-55.1-43.8-1.3-2.6-2.7-5.3-4.2-8.1l-24.8-49.7H152.4c-34 0-61.7-27.7-61.7-61.7v-488c0-34 27.7-61.7 61.7-61.7h731.9c34 0 61.7 27.7 61.7 61.7v488c0 34-27.7 61.7-61.7 61.7zM904 98.89999999999998c0-10.8-8.8-19.7-19.7-19.7H152.4c-10.8 0-19.7 8.8-19.7 19.7v488c0 10.8 8.8 19.7 19.7 19.7h206.1l36.2 72.5c1.5 2.9 2.9 5.7 4.3 8.3 10.6 20.8 11.1 20.8 17.7 20.8H620c4.6 0 5.8-0.6 5.8-0.6 2-1.2 7.2-11.2 10.9-18.5 1.6-3.1 3.3-6.5 5.3-10.1l36.2-72.4h206.1c10.8 0 19.7-8.8 19.7-19.7v-488zM525.5 565.5c-123.5 0-223.6-100.1-223.6-223.6S402 118.20000000000005 525.5 118.20000000000005s223.7 100.1 223.7 223.7c0 123.5-100.2 223.6-223.7 223.6z m0-402.5c-98.8 0-178.9 80.1-178.9 178.9 0 98.8 80.1 178.9 178.9 178.9 98.8 0 178.9-80.1 178.9-178.9 0-98.8-80.1-178.9-178.9-178.9z m246 402.5v-44.7H861v44.7h-89.5z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="note" unicode="&#58990;" d="M987.2 384.36L512.43 859.13a84.75 84.75 0 0 1-65 24.71L111.55 864.09a84.83 84.83 0 0 1-79.65-79.65L12.15 448.57a84.57 84.57 0 0 1 24.69-65l474.8-474.8a84.91 84.91 0 0 1 119.93 0L987.2 264.41999999999996a84.9 84.9 0 0 1 0 119.94z m-39.28-80.66L592.29-51.91999999999996a29.31 29.31 0 0 0-41.37 0L76.1 422.9a29.22 29.22 0 0 0-8.49 22.38l19.74 335.88a29.29 29.29 0 0 0 27.48 27.48l335.9 19.75a29.32 29.32 0 0 0 22.38-8.52l474.8-474.8a29.31 29.31 0 0 0 0.01-41.37zM236.86 659.14c-50.92-50.95-50.92-133.8 0-184.72a130.61 130.61 0 1 1 184.71 184.72c-50.89 50.86-133.77 50.86-184.71 0zM382.29 513.7c-28.38-28.38-77.78-28.38-106.15 0a75.08 75.08 0 1 0 106.15 0z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="refresh" unicode="&#58985;" d="M928 810.666667c-18.133333 0-32-13.866667-32-32v-164.266667C816 747.733333 669.866667 832 512 832 264.533333 832 64 631.4666669999999 64 384s200.533333-448 448-448c230.4 0 422.4 172.8 445.866667 402.133333 2.133333 17.066667-10.666667 33.066667-28.8 35.2-17.066667 2.133333-33.066667-10.666667-35.2-28.8C873.6 148.26666699999998 709.333333 0 512 0c-212.266667 0-384 171.733333-384 384s171.733333 384 384 384c137.6 0 264.533333-74.666667 332.8-192H693.333333c-18.133333 0-32-13.866667-32-32s13.866667-32 32-32h266.666667V778.666667c0 18.133333-14.933333 32-32 32z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="female" unicode="&#58977;" d="M774.4 800c-48 35.2-108.8 51.2-172.8 51.2-105.6 0-208-51.2-268.8-150.4-89.6-134.4-57.6-313.6 60.8-416l-32-51.2-188.8 121.6S128 384 108.8 352c-22.4-35.2 22.4-64 22.4-64l188.8-121.6-105.6-163.2s-19.2-32 16-51.2c38.4-22.4 57.6 12.8 57.6 12.8l102.4 160 185.6-121.6s48-28.8 70.4 6.4c19.2 28.8-25.6 57.6-25.6 57.6L432 192l32 48c44.8-22.4 92.8-32 137.6-32 105.6 0 208 51.2 268.8 150.4 96 147.2 51.2 345.6-96 441.6z m35.2-400c-44.8-67.2-118.4-108.8-201.6-108.8-44.8 0-92.8 12.8-131.2 38.4-112 73.6-147.2 220.8-73.6 332.8 44.8 64 121.6 105.6 201.6 108.8 44.8 0 92.8-12.8 131.2-38.4 112-73.6 147.2-220.8 73.6-332.8z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="male" unicode="&#58978;" d="M889.6 800h-240s-35.2 0-38.4-41.6c0-19.2 16-38.4 38.4-38.4h140.8l-179.2-179.2C556.8 582.4 489.6 608 416 608 240 608 96 464 96 288s144-320 320-320 320 144 320 320c0 73.6-25.6 140.8-67.2 195.2l179.2 179.2v-140.8c0-22.4 19.2-38.4 38.4-38.4 22.4 0 38.4 19.2 38.4 41.6V764.8h3.2C924.8 800 889.6 800 889.6 800zM416 48c-131.2 0-236.8 105.6-236.8 236.8 0 131.2 105.6 236.8 236.8 236.8s236.8-105.6 236.8-236.8c0-131.2-105.6-236.8-236.8-236.8z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="screen-restore" unicode="&#59224;" d="M582.6 454.6v320h50V540l274 274 35.4-35.4-274-274h234.6v-50h-320zM117.4-46l274 274v-234.6h50v320h-320v-50H356l-274-274 35.4-35.4zM132 764h302V814H82v-352h50V764z m760-760H590v-50h352V306h-50v-302z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="password" unicode="&#58995;" d="M519.2 343.29999999999995c-41.1 0-74.4-33.3-74.4-74.4 0-29.7 17.5-55 42.5-67.1v-81.9c0-17.6 14.3-31.9 31.9-31.9 17.6 0 31.9 14.3 31.9 31.9v81.9c25.1 12 42.5 37.4 42.5 66.9 0 41.3-33.2 74.6-74.4 74.6zM827.6-62.10000000000002H189.4c-35.9 0-65.1 29.2-65.1 65.1V428.4c0 35.9 29.2 65.1 65.1 65.1h638.2c17.3 0 33.7-6.7 46-19.1 12.3-12.3 19.1-28.7 19.1-46V3c0-35.9-29.2-65.1-65.1-65.1zM231.9 427.2c-34.8 0-41.3-6.6-41.3-41.3v-340.4c0-34.8 6.6-41.3 41.3-41.3h553.2c34.8 0 41.3 6.6 41.3 41.3V385.9c0 34.8-6.6 41.3-41.3 41.3H231.9zM519.2 86.70000000000005c-18.3 0-33.2 14.8-33.2 33.2V201c-26.3 12.8-42.6 38.8-42.6 67.8 0 41.8 33.9 75.7 75.7 75.7s75.7-33.9 75.7-75.7c0-29-16.3-55-42.5-67.8v-81.1c0.1-18.2-14.9-33.2-33.1-33.2zM519.2 342c-40.4 0-73.2-32.9-73.2-73.2 0-28.3 16.1-53.6 41.9-65.8l0.7-0.4V120c0-17 13.7-30.7 30.7-30.7S550 103.10000000000002 550 120v82.6l0.7 0.4c25.8 12.3 41.9 37.5 41.9 65.8-0.2 40.4-33.1 73.2-73.4 73.2zM207 523.1c-9.1 0-17.6 3.5-23.9 10-6.4 6.4-10 15-10 23.9v2h-0.2l0.2 1.4c0.1 0.5 0.1 0.9 0.2 1.4l0.2 1c0.1 0.6 0.2 1.4 0.4 2 15.3 75.7 57 144.2 117.2 193 29.9 24.2 63.4 43 99.8 56 37.5 13.3 77 20.2 117.5 20.2 61 0 120.8-16.3 173-47.2 50.6-29.9 93-72.8 122.5-123.8 4-5.6 6.1-12.2 6.1-19.2 0-18.3-15-33.3-33.3-33.3-13.2 0-25.1 7.7-30.4 19.8-49.2 84.6-140.4 137.4-238 137.4-128.1 0-238.2-87.1-267.6-211.8v-0.2c-0.7-18.4-15.4-32.6-33.7-32.6z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="senior" unicode="&#58996;" d="M719.9 249.39999999999998L514.7 379.5V485.1C615.6 419 731.5 344 731.5 344s139.2-45.6 139.2 106.5c0 93-172.5 112.1-197.2 11.8l-69.6 47.3s24.2 101.5 162.4 106.5c138.2 4.9 192-94.6 190.9-199.6-1.2-104.7-136-198.3-237.3-167.1zM561 414c-4-19-23-33.7-47.6-33.7l-6.9 4.3-217.3 137.8S171 555.2 160.8 439c-10.2-116.1 147.4-129.5 186.8-23.8l81.7-47.6s-65.1-119.1-198.5-119.1C97.3 248.5 0.6 423.8 114 546.3c113.5 122.4 218.6 64.6 257 35.7 16.4-12.4 85.3-57.9 158.6-105.9l3.1-2.4c28.3-18.2 33.4-35.6 28.3-59.7zM434.1 149.70000000000005h212c16.7 0 30.3-13.6 30.3-30.3v-15.1c0-16.7-13.6-30.3-30.3-30.3h-212c-16.7 0-30.3 13.6-30.3 30.3v15.1c0 16.8 13.6 30.3 30.3 30.3z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="theme" unicode="&#58986;" d="M512 800C229.696 800 0 570.304 0 288c0-90.368 30.304-174.496 85.344-236.896 55.264-62.624 129.152-97.12 208.128-97.12 81.568 0 161.536 36.832 231.264 106.592l2.272 2.496c65.792 81.472 132.896 121.056 205.088 121.056 46.72 0 89.216-15.872 126.688-29.92 30.336-11.328 56.576-21.12 81.216-21.12C1024 133.08799999999997 1024 241.664 1024 288c0 282.304-229.696 512-512 512z m428-602.912c-13.088 0-35.296 8.288-58.784 17.088-40.48 15.136-90.848 33.952-149.12 33.952-92.352 0-175.328-46.944-253.76-143.456-57.184-56.704-121.056-86.688-184.832-86.688-60.352 0-117.216 26.784-160.128 75.456C88.64 144.12800000000004 64 213.216 64 288 64 535.04 264.96 736 512 736s448-200.96 448-448c0-27.328-1.952-90.912-20-90.912zM800.704 379.93600000000004m-64 0a64 64 0 1 1 128 0 64 64 0 1 1-128 0ZM457.024 582.624m-64 0a64 64 0 1 1 128 0 64 64 0 1 1-128 0ZM672.704 555.9359999999999m-64 0a64 64 0 1 1 128 0 64 64 0 1 1-128 0ZM291.392 443.936m-64 0a64 64 0 1 1 128 0 64 64 0 1 1-128 0ZM278.4 197.24800000000005m-96 0a96 96 0 1 1 192 0 96 96 0 1 1-192 0Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="tread" unicode="&#59077;" d="M860.8 172.79999999999995l6.4-57.6-6.4 57.6c12.8 0 25.6 3.2 35.2 12.8 6.4 9.6 6.4 22.4 3.2 32l57.6 12.8-57.6-12.8L800 553.6c-6.4 28.8-25.6 51.2-48 64-9.6 6.4-22.4 9.6-32 9.6H182.4c-22.4 3.2-41.6-6.4-51.2-25.6-6.4-9.6-6.4-19.2-9.6-28.8v-342.4c0-19.2 9.6-38.4 28.8-48 6.4-3.2 12.8-6.4 19.2-6.4h192l19.2-25.6 147.2-188.8c6.4-9.6 19.2-12.8 28.8-9.6 16 3.2 25.6 19.2 22.4 35.2l-9.6 118.4-6.4 67.2h297.6z m-233.6-57.6l9.6-128c3.2-28.8-9.6-54.4-28.8-73.6-35.2-32-92.8-28.8-124.8 6.4l-156.8 195.2H179.2c-19.2 0-38.4 6.4-57.6 16-35.2 19.2-57.6 57.6-57.6 99.2V572.8c0 19.2 6.4 38.4 16 57.6 19.2 38.4 57.6 60.8 99.2 54.4h537.6c67.2-3.2 121.6-48 137.6-112l102.4-339.2c6.4-28.8 3.2-57.6-12.8-80-19.2-22.4-48-38.4-76.8-38.4h-240zM304 627.2v-451.2h57.6V627.2H304z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="praise" unicode="&#59078;" d="M860.8 595.2h-297.6l6.4 67.2 9.6 118.4c3.2 16-6.4 32-22.4 35.2-9.6 3.2-22.4 0-28.8-9.6l-147.2-188.8-19.2-25.6h-192c-6.4 0-12.8-3.2-19.2-6.4-19.2-9.6-28.8-28.8-28.8-48v-342.4c0-9.6 3.2-22.4 9.6-28.8 9.6-19.2 28.8-28.8 48-25.6h537.6c12.8 0 22.4 3.2 32 9.6 25.6 12.8 44.8 35.2 48 64l102.4 336 57.6-12.8-57.6 12.8c3.2 9.6 0 22.4-3.2 32-9.6 6.4-22.4 12.8-35.2 12.8l6.4 57.6-6.4-57.6z m-233.6 57.6h240c28.8 0 57.6-12.8 76.8-38.4 16-22.4 19.2-54.4 12.8-80l-102.4-339.2c-16-64-70.4-108.8-137.6-112H179.2c-41.6-3.2-80 19.2-99.2 54.4-9.6 19.2-16 38.4-16 57.6V537.6c0 41.6 22.4 80 57.6 99.2 19.2 9.6 38.4 12.8 57.6 16h144L480 848c32 35.2 89.6 38.4 124.8 6.4 19.2-19.2 32-44.8 28.8-73.6l-6.4-128z m-323.2-512h57.6V592H304v-451.2z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="star-fill" unicode="&#58968;" d="M752-43.200000000000045c-9.6 0-20.8 3.2-30.4 8l-208 104-209.6-104c-20.8-11.2-48-9.6-67.2 4.8-19.2 14.4-30.4 40-25.6 64l43.2 224L89.6 411.2C72 428.8 65.6 456 72 478.4c8 24 27.2 41.6 52.8 44.8l228.8 41.6 102.4 208c11.2 22.4 33.6 36.8 57.6 36.8s48-14.4 57.6-36.8l102.4-208 228.8-40c24-3.2 44.8-20.8 51.2-44.8 8-24 1.6-49.6-16-67.2L772.8 257.6l41.6-224c4.8-25.6-6.4-49.6-25.6-64-9.6-8-22.4-12.8-36.8-12.8z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="rate" unicode="&#59003;" d="M959.008 489.984l-308 47.008L512 832 372.992 536.992l-308-47.008 223.008-228-52.992-324L512 90.976l276.992-152.992-52.992 324zM512 156L304 39.00800000000004l40 235.008-179.008 182.016 242.016 32 104.992 224 104-224 240.992-34.016L680 273.024l36.992-235.008z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="template-1" unicode="&#58966;" d="M512 384zM43.52 601.6l409.6-176.64c58.88-30.72 110.08 0 110.08 0l414.72 174.08 2.56 2.56c10.24 5.12 15.36 15.36 15.36 28.16 0 15.36-10.24 28.16-23.04 30.72L563.2 837.12c-56.32 23.04-97.28 0-97.28 0L46.08 660.48c-12.8-5.12-20.48-17.92-20.48-30.72s7.68-23.04 17.92-28.16z m0 0M512 222.72000000000003c-2.56 0-7.68 0-10.24 2.56l-486.4 215.04c-12.8 5.12-17.92 20.48-12.8 33.28 5.12 12.8 20.48 17.92 33.28 12.8L512 276.48 988.16 486.4c12.8 5.12 28.16 0 33.28-12.8 5.12-12.8 0-28.16-12.8-33.28l-486.4-215.04c-2.56-2.56-7.68-2.56-10.24-2.56zM512 71.67999999999995c-2.56 0-7.68 0-10.24 2.56l-486.4 215.04c-12.8 5.12-17.92 20.48-12.8 33.28 5.12 10.24 20.48 17.92 33.28 10.24L512 125.44000000000005 988.16 332.79999999999995c12.8 5.12 28.16 0 33.28-12.8 5.12-12.8 0-28.16-12.8-33.28l-486.4-215.04H512zM512-79.36000000000001c-2.56 0-7.68 0-10.24 2.56l-486.4 215.04c-12.8 5.12-17.92 20.48-12.8 33.28 5.12 12.8 20.48 17.92 33.28 12.8L512-25.600000000000023l476.16 209.92c12.8 5.12 28.16 0 33.28-12.8 5.12-12.8 0-28.16-12.8-33.28l-486.4-215.04c-2.56-2.56-7.68-2.56-10.24-2.56z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="vercode" unicode="&#59001;" d="M513.807059-128C351.171765-128 58.428235 126.19294100000002 54.211765 376.16941199999997V662.287059a93.364706 93.364706 0 0 0 81.317647 88.545882 570.428235 570.428235 0 0 1 163.237647 40.357647A393.336471 393.336471 0 0 1 446.945882 872.508235a101.797647 101.797647 0 0 0 120.470589 5.421177A629.458824 629.458824 0 0 1 716.8 792.395294a1255.303529 1255.303529 0 0 1 169.863529-38.550588 98.785882 98.785882 0 0 0 79.510589-90.955294 2911.171765 2911.171765 0 0 0-3.011765-291.538824C924.611765 49.09176500000001 672.828235-128 513.807059-128z m0 963.764706a39.152941 39.152941 0 0 1-24.696471-7.830588A438.512941 438.512941 0 0 0 319.247059 734.569412a608.376471 608.376471 0 0 0-180.705883-43.369412 33.731765 33.731765 0 0 1-24.094117-30.117647v-283.708235C118.663529 155.10588199999995 389.722353-67.76470600000005 513.807059-67.76470600000005s354.183529 148.178824 391.529412 444.536471c9.035294 175.887059 0 281.901176 0 283.105882a38.550588 38.550588 0 0 1-29.515295 33.731765 1287.830588 1287.830588 0 0 0-180.705882 41.562353A676.442353 676.442353 0 0 0 536.094118 829.741176a37.345882 37.345882 0 0 1-24.094118 6.02353zM784.865882 479.171765L487.905882 198.47529399999996a40.357647 40.357647 0 0 0-49.392941-4.818823l-7.830588 6.625882-161.430588 171.068235a40.357647 40.357647 0 1 0 60.235294 55.416471l133.722353-141.552941 267.444706 252.988235a40.357647 40.357647 0 1 0 55.41647-60.235294"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="service" unicode="&#58918;" d="M849.00812012 487.71642715A27.54528398 27.54528398 0 0 1 849.00812012 496.71080566 337.28919434 337.28919434 0 0 1 174.42973145 496.71080566a27.54528398 27.54528398 0 0 1-1e-8-8.99437852 147.28294776 147.28294776 0 0 1-112.42973144-140.53716386V328.06620849a148.40724551 148.40724551 0 0 1 123.67270459-143.34790781A308.6196126 308.6196126 0 0 1 414.4672083-9.222985839999978h5.05933769a84.32229815 84.32229815 0 1 1 0 56.21486573 252.40474688 252.40474688 0 0 0-172.01748955 137.16427235h31.48032481A35.41536562 35.41536562 0 0 1 314.96689531 215.63647705000005V458.48469697a35.41536562 35.41536562 0 0 1-35.97751406 34.29106787H230.64459717A26.42098711 26.42098711 0 0 1 230.64459717 496.71080566a281.07432862 281.07432862 0 0 0 562.14865723 0 26.42098711 26.42098711 0 0 1 0-3.3728915h-48.34478497a35.41536562 35.41536562 0 0 1-35.97751406-34.29106875V215.63647705000005a35.41536562 35.41536562 0 0 1 35.97751406-34.29106787h63.52279893A150.0936917 150.0936917 0 0 1 961.43785156 328.06620849v19.11305479a147.28294776 147.28294776 0 0 1-112.42973144 140.53716386zM498.22735801 46.991879880000056a28.10743242 28.10743242 0 1 0-28.1074333-28.10743242 28.10743242 28.10743242 0 0 0 28.10743329 28.10743242zM258.75202959 240.37101797000003h-43.28544639A93.87882598 93.87882598 0 0 0 118.21486572 328.06620849v19.11305479a93.87882598 93.87882598 0 0 0 97.25171748 89.94378516h43.28544639zM905.22298584 328.06620849a93.87882598 93.87882598 0 0 0-97.25171748-89.94378515h-43.28544727V437.12304844h43.28544727A93.87882598 93.87882598 0 0 0 905.22298584 347.17926328zM633.70518418 705.83010615l-20.7995001 7.30793232a28.10743242 28.10743242 0 0 1-17.42660859-56.21486571l16.30231084-6.18363458a28.10743242 28.10743242 0 1 1 21.92379785 51.71767646zM330.14490928 639.49656503A28.10743242 28.10743242 0 0 1 376.80324805 609.14053711 177.63897568 177.63897568 0 0 0 511.71892578 676.59837597a28.10743242 28.10743242 0 0 1 0 56.21486573 231.60524678 231.60524678 0 0 1-181.57401651-93.31667667z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="cellphone" unicode="&#59000;" d="M785.066667 896H238.933333a102.4 102.4 0 0 1-102.4-102.4v-819.2a102.4 102.4 0 0 1 102.4-102.4h546.133334a102.4 102.4 0 0 1 102.4 102.4V793.6a102.4 102.4 0 0 1-102.4 102.4zM238.933333 827.733333h546.133334a34.133333 34.133333 0 0 0 34.133333-34.133333v-648.533333H204.8V793.6a34.133333 34.133333 0 0 0 34.133333 34.133333z m546.133334-887.466666H238.933333a34.133333 34.133333 0 0 0-34.133333 34.133333v102.4h614.4v-102.4a34.133333 34.133333 0 0 0-34.133333-34.133333zM512 8.53333299999997m-34.133333 0a34.133333 34.133333 0 1 1 68.266666 0 34.133333 34.133333 0 1 1-68.266666 0ZM426.666667 725.333333h170.666666a17.066667 17.066667 0 0 1 0 34.133334h-170.666666a17.066667 17.066667 0 0 1 0-34.133334z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="print" unicode="&#58989;" d="M843.946667 603.733333h-47.36V725.333333a90.026667 90.026667 0 0 1-94.72 85.333334H312.32a81.493333 81.493333 0 0 1-85.333333-85.333334v-121.6H170.666667a81.493333 81.493333 0 0 1-85.333334-85.333333v-325.12a89.173333 89.173333 0 0 1 85.333334-93.866667h56.746666v-52.48a89.6 89.6 0 0 1 89.6-89.6h389.973334a89.6 89.6 0 0 1 89.6 89.6v52.48h47.36a97.706667 97.706667 0 0 1 94.72 93.866667V518.4a90.026667 90.026667 0 0 1-94.72 85.333333zM279.466667 725.333333a30.72 30.72 0 0 0 32.853333 33.706667h389.546667c18.773333 0 42.666667-11.52 42.666666-33.706667v-121.6H279.466667z m465.066666-678.4a37.546667 37.546667 0 0 0-37.546666-37.973333H317.013333a37.546667 37.546667 0 0 0-37.546666 37.973333v170.666667a37.546667 37.546667 0 0 0 37.546666 38.4h389.973334a37.546667 37.546667 0 0 0 37.546666-37.973333z m142.506667 146.346667a45.653333 45.653333 0 0 0-42.666667-42.666667h-47.786666v66.133334a89.6 89.6 0 0 1-89.6 89.6H317.013333a89.6 89.6 0 0 1-89.6-89.6v-65.28H170.666667a37.546667 37.546667 0 0 0-33.28 42.666666v324.266667A31.146667 31.146667 0 0 0 170.666667 552.106667h673.28c19.2 0 42.666667-11.52 42.666666-33.706667z m-640 281.173333h-37.546667a13.226667 13.226667 0 0 0 0 26.026667h38.826667a13.226667 13.226667 0 1 0 0-26.026667z m94.293333 0H298.666667a13.226667 13.226667 0 1 0 0 26.026667h42.666666a13.226667 13.226667 0 0 0 0-26.026667z m426.666667-116.48H248.32a13.226667 13.226667 0 0 0 0 26.026667H768a13.226667 13.226667 0 0 0 0-26.026667z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="cols" unicode="&#58896;" d="M128 448h384V832H128z m64 320h256v-256H192zM576 832v-384h384V832z m320-320H640V768h256zM192 384h64v-384H192zM384 384h64v-384H384zM640 384h64v-384H640zM832 384h64v-384h-64z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="wifi" unicode="&#59360;" d="M723 275.5C666.8 324.4 593.4 354 513 354s-153.8-29.6-210.1-78.6c-3.2-2.8-3.6-7.8-0.8-11.2l36-42.9c2.9-3.4 8-3.8 11.4-0.9C393.1 258.8 450.3 282 513 282s119.9-23.2 163.5-61.5c3.4-2.9 8.5-2.5 11.4 0.9l36 42.9c2.8 3.3 2.4 8.3-0.9 11.2zM840.4 415.6C751.7 489.5 637.6 534 513 534s-238.7-44.5-327.5-118.4c-3.4-2.8-3.8-7.9-1-11.3l36-42.9c2.8-3.4 7.9-3.8 11.2-1C308 423.8 406.1 462 513 462s205-38.2 281.2-101.6c3.4-2.8 8.4-2.4 11.2 1l36 42.9c2.8 3.4 2.4 8.5-1 11.3zM957.1 554.6C835.7 654.2 680.3 714 511 714c-168.2 0-322.6-59-443.7-157.4-3.5-2.8-4-7.9-1.1-11.4l36-42.9c2.8-3.3 7.8-3.8 11.1-1.1C222 589.3 360.3 642 511 642c151.8 0 291-53.5 400-142.7 3.4-2.8 8.4-2.3 11.2 1.1l36 42.9c2.9 3.4 2.4 8.5-1.1 11.3zM512 118m-64 0a64 64 0 1 1 128 0 64 64 0 1 1-128 0Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="export" unicode="&#59005;" d="M896.4374528 479.830016c0 26.673152-21.6236032 48.2967552-48.2967552 48.2967552H630.8069376c-26.673152 0-48.2967552-21.6236032-48.2967552-48.2967552v-83.04831147H384.69522773l-2.71428266 5.36849067c-41.336832 87.44686933-35.95195733 204.128256 150.601728 199.94487467v-108.91537067l172.19037866 164.757504L532.58267307 822.7110912v-106.57245867c-228.64418133 5.70709333-263.651328-183.517184-157.433856-314.01028266l4.6891008-5.34664534h-88.46595414c-26.673152 0-48.2967552-21.6236032-48.2967552-48.2967552v-66.78882986h-98.43616426c-26.673152 0-40.4258816-21.6236032-30.71781547-48.2967552l79.10304427-217.33485227c9.70806613-26.673152 39.20145067-48.2967552 65.87460266-48.2967552h603.70670934c23.75898453 0 37.2506624 17.16169387 33.05745066 39.76178347 0.4980736 2.77108053 0.77441707 5.619712 0.77441707 8.53497173v463.765504z m-60.37067093-306.4528896l-21.8464256 60.02223787c-9.70806613 26.673152-39.20145067 48.2967552-65.87460267 48.2967552H303.44697173v30.56708266c0 13.336576 10.81125547 24.14783147 24.14783147 24.14783147h315.28605013v107.1972352c0 13.336576 10.81125547 24.14783147 24.14783147 24.14783147h144.88917333c13.336576 0 24.14783147-10.81125547 24.14783147-24.14783147v-270.2311424z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="rss" unicode="&#59400;" d="M810.666667 42.624C810.666667 395.562667 523.562667 682.666667 170.666667 682.666667v-85.333334c305.834667 0 554.666667-248.832 554.666666-554.709333h85.333334zM512 42.624h85.333333C597.333333 277.930667 405.930667 469.333333 170.666667 469.333333v-85.333333c188.202667 0 341.333333-153.130667 341.333333-341.376zM256 128m-85.333333 0a85.333333 85.333333 0 1 1 170.666666 0 85.333333 85.333333 0 1 1-170.666666 0Z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="slider" unicode="&#59156;" d="M228.7 683.9v-66.7H112v66.7h116.7z m333.2-266.6v-66.7H112v66.7h449.9zM295.4 150.60000000000002V84H112v66.7h183.4v-0.1z m116.6 600c9 0 16.8-3.3 23.5-9.9 6.5-6.5 9.9-14.5 9.9-23.5v-133.3c0-9-3.3-16.8-9.9-23.5-6.5-6.5-14.5-9.9-23.5-9.9H278.8c-9 0-16.8 3.3-23.5 9.9-6.5 6.5-9.9 14.3-9.9 23.5V717.1c0 9 3.3 16.8 9.9 23.5 6.5 6.5 14.3 9.9 23.5 9.9h133.3v0.1h-0.1z m66.7-533.3c9 0 16.8-3.3 23.5-9.9 6.5-6.5 9.9-14.5 9.9-23.5v-133.3c0-9-3.3-16.8-9.9-23.5-6.5-6.5-14.5-9.9-23.5-9.9H345.3c-9 0-16.8 3.3-23.5 9.9-6.5 6.5-9.9 14.5-9.9 23.5V183.89999999999998c0 9 3.3 16.8 9.9 23.5 6.5 6.5 14.3 9.9 23.5 9.9h133.4v0.1zM912 683.9v-66.7H462.1v66.7H912z m0-533.3V84H528.6v66.7h383.3v-0.1h0.1zM745.2 483.9c9 0 16.8-3.3 23.5-9.9 6.5-6.5 9.9-14.5 9.9-23.5v-133.3c0-9-3.3-16.8-9.9-23.5-6.5-6.5-14.5-9.9-23.5-9.9H612c-9 0-16.8 3.3-23.5 9.9-6.5 6.5-9.9 14.3-9.9 23.5V450.6c0 9 3.3 16.8 9.9 23.5 6.5 6.5 14.5 9.9 23.5 9.9l133.2-0.1zM912 417.3v-66.7H795.3v66.7H912z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="email" unicode="&#58904;" d="M834.446 682.553H194.105c-50.176 0-91.022-40.846-91.022-91.022v-423.026c0-50.176 40.846-91.022 91.022-91.022h640.341c50.176 0 91.022 40.846 91.022 91.022V591.531c0 50.176-40.846 91.022-91.022 91.022z m36.409-514.048c0-20.025-16.384-36.409-36.409-36.409H194.105c-20.025 0-36.409 16.384-36.409 36.409V591.531c0 20.025 16.384 36.409 36.409 36.409h640.341c20.025 0 36.409-16.384 36.409-36.409v-423.026zM786.773 537.941L514.275 366.023 241.777 537.941c-12.743 8.078-29.582 4.21-37.661-8.533-8.078-12.743-4.21-29.582 8.533-37.661l286.72-180.907c4.551-2.845 9.557-4.21 14.563-4.21h0.91c5.006 0 10.013 1.365 14.563 4.21l286.72 180.907c12.743 8.078 16.611 24.917 8.533 37.661-8.306 12.857-25.145 16.611-37.888 8.533z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="subtraction" unicode="&#59006;" d="M785 348H239c-19.8 0-36 16.2-36 36s16.2 36 36 36h546c19.8 0 36-16.2 36-36s-16.2-36-36-36z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="mike" unicode="&#59100;" d="M512 256c115.2 0 208 92.8 208 208V624c0 115.2-92.8 208-208 208s-208-92.8-208-208v-160c0-115.2 92.8-208 208-208zM368 624c0 80 64 144 144 144s144-64 144-144v-160c0-80-64-144-144-144s-144 64-144 144V624zM844.8 416c0 17.6-14.4 32-32 32-16 0-30.4-12.8-32-28.8C758.4 289.6 646.4 192 512 192s-246.4 97.6-268.8 227.2c-1.6 16-16 28.8-32 28.8-17.6 0-32-14.4-32-32v-4.8C204.8 260.79999999999995 328 144 480 129.60000000000002V-32c0-17.6 14.4-32 32-32s32 14.4 32 32V129.60000000000002c152 14.4 275.2 131.2 299.2 280 0 1.6 1.6 4.8 1.6 6.4z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="light" unicode="&#59208;" d="M512 72c-172.313 0-312 139.687-312 312s139.687 312 312 312 312-139.687 312-312-139.687-312-312-312z m0 64c136.967 0 248 111.033 248 248 0 136.967-111.033 248-248 248-136.967 0-248-111.033-248-248 0-136.967 111.033-248 248-248z m0 696c17.673 0 32-14.327 32-32v-51c0-17.673-14.327-32-32-32-17.673 0-32 14.327-32 32V800c0 17.673 14.327 32 32 32z m0-785c17.673 0 32-14.327 32-32v-51c0-17.673-14.327-32-32-32-17.673 0-32 14.327-32 32v51c0 17.673 14.327 32 32 32z m325.945 11.055c-12.497-12.496-32.758-12.496-45.255 0l-36.063 36.063c-12.496 12.497-12.496 32.758 0 45.255 12.497 12.496 32.758 12.496 45.255 0l36.063-36.063c12.496-12.497 12.496-32.758 0-45.255z m-568 565c-12.497-12.496-32.758-12.496-45.255 0l-36.063 36.063c-12.496 12.497-12.496 32.758 0 45.255 12.497 12.496 32.758 12.496 45.255 0l36.063-36.063c12.496-12.497 12.496-32.758 0-45.255z m561 81.318c12.496-12.497 12.496-32.758 0-45.255l-36.063-36.063c-12.497-12.496-32.758-12.496-45.255 0-12.496 12.497-12.496 32.758 0 45.255l36.063 36.063c12.497 12.496 32.758 12.496 45.255 0z m-563.572-565c12.496-12.497 12.496-32.758 0-45.255l-36.063-36.063c-12.497-12.496-32.758-12.496-45.255 0-12.496 12.497-12.496 32.758 0 45.255l36.063 36.063c12.497 12.496 32.758 12.496 45.255 0zM960 384c0-17.673-14.327-32-32-32h-51c-17.673 0-32 14.327-32 32 0 17.673 14.327 32 32 32h51c17.673 0 32-14.327 32-32z m-781 0c0-17.673-14.327-32-32-32H96c-17.673 0-32 14.327-32 32 0 17.673 14.327 32 32 32h51c17.673 0 32-14.327 32-32z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="gift" unicode="&#58919;" d="M796.3 600h-6.7c5.1 6.7 9.6 13.4 13.4 20.1 18.3 32.2 20.8 63.1 7 87.1-9.1 15.7-33 41.2-91.9 36-35.4-3.2-76.1-17.2-114.7-39.4-37.9-21.9-68.9-49.3-89-77.5-4.5 6.4-9.5 12.8-15.1 19.1-19.8 22.3-45.4 42.8-74.1 59.4-38.4 22.2-79.3 35.9-115.1 38.5-43.3 3.2-75.8-10-91.4-37-13.8-24-11.3-54.8 7-86.7 3.7-6.5 8.1-13 13.1-19.5H236c-21.3 0-41.6-7.2-57.4-20.2-17.8-14.9-27.6-35.4-27.6-58v-50.8c0-34.4 23-64.6 55-76.6v-283.9c0-23.3 10.9-47.1 30.1-65.3 18.3-17.4 41.4-27.3 63.4-27.3h434.3c22 0 44.9 10 63 27.6 18.7 18.1 29.3 41.8 29.3 65.1V395c11 4.3 19.6 10.9 27.2 19.5 13.3 15.1 20.8 35.2 20.8 56.6v50.8c-0.1 45.3-32.8 78.1-77.8 78.1z m17.7-78.1v-50.8c0-7.7-3.2-20.3-15-22-0.9 0.1-1.7 0.1-2.6 0.1-1.5 0-2.9-0.1-4.3-0.3H543v91h253.3c11.9 0.1 17.7-5.8 17.7-18zM633.4 651.8c30.7 17.7 63.5 29.2 90 31.6 21.5 1.9 32.6-2.8 34.6-6.3 4.2-7.3-6.3-41.2-52.9-77.2H569.8c14 17 35.3 35.6 63.6 51.9z m-362.8 24.4c2.2 3.7 13.3 8.7 35 7.1 26.6-1.9 59.2-13.1 89.5-30.6 27.7-16 49.4-35.1 63.9-52.8H323.5c-20.3 15.6-36.4 32.9-45.8 49.4-8.9 15.6-8.5 24.4-7.1 26.9zM211 521.9c0 11.2 12.9 18.1 24.9 18.1H483v-91H240.1c-1.4 0.2-2.8 0.3-4.3 0.3-0.9 0-1.8 0-2.7-0.1-11.5 1.5-22.1 11.6-22.1 22v50.7z m55-411.3V389h217v-311H299.4c-13.2 0-33.4 17.5-33.4 32.6zM733.7 78H543V389h223v-278.4c0-15.5-19.1-32.6-32.3-32.6z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="mute" unicode="&#59013;" d="M739 294.4l180.2 180.2M735.391 297.9l180.24 180.24 7.07-7.07-180.239-180.24zM631.4-29.700000000000045c-5.1 0-10.1 1.3-14.5 3.7L277.1 162.20000000000005H116.8c-16 0-28.9 13-28.9 28.9v384c0 16 13 28.9 28.9 28.9h160.3l339.7 189.9c4.5 2.5 9.5 3.8 14.6 3.8 5.3 0 10.6-1.4 15.1-4.1 9.1-5.3 14.8-15.2 14.8-25.8v-767.6c0-10.5-5.6-20.4-14.7-25.8-4.6-2.7-9.9-4.1-15.2-4.1zM305.8 551.5v-336.7L601.4 51V716.8L305.8 551.5zM145.7 220.10000000000002h102.2v326H145.7v-326zM913.2 258.9c-9.3 0-18.1 3.6-24.7 10.3l-63.4 63.4-63.4-63.4c-6.6-6.6-15.4-10.3-24.7-10.3s-18.1 3.6-24.7 10.3c-13.6 13.6-13.6 35.9 0 49.5l63.4 63.4-67.4 67.4c-6.6 6.6-10.3 15.4-10.3 24.7 0 9.3 3.6 18.1 10.3 24.7 6.6 6.6 15.4 10.3 24.7 10.3s18.1-3.6 24.7-10.3l67.4-67.4 67.4 67.4c6.6 6.6 15.4 10.3 24.7 10.3s18.1-3.6 24.7-10.3c6.6-6.6 10.3-15.4 10.3-24.7 0-9.3-3.6-18.1-10.3-24.7L874.6 382l63.4-63.4c13.6-13.6 13.6-35.9 0-49.5-6.7-6.6-15.5-10.2-24.8-10.2z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="reduce-circle" unicode="&#58902;" d="M512-65.5c-60.6 0-119.4 11.9-174.8 35.3-53.5 22.6-101.5 55-142.7 96.2-41.2 41.2-73.6 89.2-96.2 142.7C74.9 264.1 63 322.9 63 383.5s11.9 119.4 35.3 174.8c22.6 53.5 55 101.5 96.2 142.7 41.2 41.2 89.2 73.6 142.7 96.2C392.6 820.6 451.4 832.5 512 832.5s119.4-11.9 174.8-35.3c53.5-22.6 101.5-55 142.7-96.2 41.2-41.2 73.6-89.2 96.2-142.7 23.4-55.4 35.3-114.2 35.3-174.8s-11.9-119.4-35.3-174.8c-22.6-53.5-55-101.5-96.2-142.7s-89.2-73.6-142.7-96.2c-55.4-23.4-114.2-35.3-174.8-35.3z m0 848c-220 0-399-179-399-399s179-399 399-399 399 179 399 399-179 399-399 399zM772 359H252c-13.8 0-25 11.2-25 25s11.2 25 25 25h520c13.8 0 25-11.2 25-25s-11.2-25-25-25z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="music" unicode="&#59024;" d="M575.4 832h-74.5v-633.5C385 251.20000000000005 249.3 180.70000000000005 226.8 76c-7.3-34.1 7.9-70.9 21.9-87.8 79.3-94.6 252.2-50.5 331.6 51.3 35.2 45.2 32.3 84.6 32.3 181.3V608.5c48.8-36.3 103.9-70.1 123.7-135 12.2-40.3-4.1-107.3-17-141.5-3.9-10.3-14.7-18.9-9.7-29.2 34.2-25.4 51.1 28.6 60.9 51.2 10.6 24.5 20.8 54.7 24.4 75.6C833.2 653.2 595.5 661.7 575.4 832z"  horiz-adv-x="1024" />
+
+    
+
+
+  </font>
+</defs></svg>
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/font/iconfont.ttf b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/font/iconfont.ttf
new file mode 100644
index 0000000..06e30f9
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/font/iconfont.ttf differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/font/iconfont.woff b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/font/iconfont.woff
new file mode 100644
index 0000000..66a1783
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/font/iconfont.woff differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/font/iconfont.woff2 b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/font/iconfont.woff2
new file mode 100644
index 0000000..47e9980
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/font/iconfont.woff2 differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/0.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/0.gif
new file mode 100644
index 0000000..a63f0d5
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/0.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/1.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/1.gif
new file mode 100644
index 0000000..b2b78b2
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/1.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/10.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/10.gif
new file mode 100644
index 0000000..556c7e3
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/10.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/11.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/11.gif
new file mode 100644
index 0000000..2bfc58b
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/11.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/12.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/12.gif
new file mode 100644
index 0000000..1c321c7
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/12.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/13.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/13.gif
new file mode 100644
index 0000000..300bbc2
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/13.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/14.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/14.gif
new file mode 100644
index 0000000..43b6d0a
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/14.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/15.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/15.gif
new file mode 100644
index 0000000..c9f25fa
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/15.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/16.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/16.gif
new file mode 100644
index 0000000..34f28e4
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/16.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/17.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/17.gif
new file mode 100644
index 0000000..39cd035
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/17.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/18.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/18.gif
new file mode 100644
index 0000000..7bce299
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/18.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/19.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/19.gif
new file mode 100644
index 0000000..adac542
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/19.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/2.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/2.gif
new file mode 100644
index 0000000..7edbb58
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/2.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/20.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/20.gif
new file mode 100644
index 0000000..50631a6
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/20.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/21.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/21.gif
new file mode 100644
index 0000000..b984212
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/21.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/22.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/22.gif
new file mode 100644
index 0000000..1f0bd8b
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/22.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/23.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/23.gif
new file mode 100644
index 0000000..e05e0f9
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/23.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/24.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/24.gif
new file mode 100644
index 0000000..f35928a
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/24.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/25.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/25.gif
new file mode 100644
index 0000000..0b4a883
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/25.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/26.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/26.gif
new file mode 100644
index 0000000..45c4fb5
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/26.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/27.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/27.gif
new file mode 100644
index 0000000..7a4c013
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/27.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/28.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/28.gif
new file mode 100644
index 0000000..fc5a0cf
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/28.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/29.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/29.gif
new file mode 100644
index 0000000..5dd7442
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/29.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/3.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/3.gif
new file mode 100644
index 0000000..86df67b
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/3.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/30.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/30.gif
new file mode 100644
index 0000000..b751f98
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/30.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/31.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/31.gif
new file mode 100644
index 0000000..c9476d7
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/31.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/32.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/32.gif
new file mode 100644
index 0000000..9931b06
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/32.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/33.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/33.gif
new file mode 100644
index 0000000..59111a3
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/33.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/34.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/34.gif
new file mode 100644
index 0000000..a334548
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/34.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/35.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/35.gif
new file mode 100644
index 0000000..a932264
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/35.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/36.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/36.gif
new file mode 100644
index 0000000..6de432a
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/36.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/37.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/37.gif
new file mode 100644
index 0000000..d05f2da
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/37.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/38.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/38.gif
new file mode 100644
index 0000000..8b1c88a
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/38.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/39.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/39.gif
new file mode 100644
index 0000000..38b84a5
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/39.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/4.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/4.gif
new file mode 100644
index 0000000..d52200c
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/4.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/40.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/40.gif
new file mode 100644
index 0000000..ae42991
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/40.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/41.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/41.gif
new file mode 100644
index 0000000..b9c715c
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/41.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/42.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/42.gif
new file mode 100644
index 0000000..0eb1434
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/42.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/43.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/43.gif
new file mode 100644
index 0000000..ac0b700
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/43.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/44.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/44.gif
new file mode 100644
index 0000000..ad44497
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/44.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/45.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/45.gif
new file mode 100644
index 0000000..6837fca
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/45.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/46.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/46.gif
new file mode 100644
index 0000000..d62916d
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/46.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/47.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/47.gif
new file mode 100644
index 0000000..58a0836
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/47.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/48.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/48.gif
new file mode 100644
index 0000000..7ffd161
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/48.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/49.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/49.gif
new file mode 100644
index 0000000..959b992
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/49.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/5.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/5.gif
new file mode 100644
index 0000000..4e8b09f
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/5.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/50.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/50.gif
new file mode 100644
index 0000000..6e22e7f
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/50.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/51.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/51.gif
new file mode 100644
index 0000000..ad3f4d3
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/51.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/52.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/52.gif
new file mode 100644
index 0000000..39f8a22
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/52.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/53.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/53.gif
new file mode 100644
index 0000000..a181ee7
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/53.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/54.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/54.gif
new file mode 100644
index 0000000..e289d92
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/54.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/55.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/55.gif
new file mode 100644
index 0000000..4351083
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/55.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/56.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/56.gif
new file mode 100644
index 0000000..e0eff22
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/56.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/57.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/57.gif
new file mode 100644
index 0000000..0bf130f
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/57.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/58.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/58.gif
new file mode 100644
index 0000000..0f06508
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/58.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/59.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/59.gif
new file mode 100644
index 0000000..7081e4f
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/59.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/6.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/6.gif
new file mode 100644
index 0000000..f7715bf
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/6.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/60.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/60.gif
new file mode 100644
index 0000000..6e15f89
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/60.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/61.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/61.gif
new file mode 100644
index 0000000..f092d7e
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/61.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/62.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/62.gif
new file mode 100644
index 0000000..7fe4984
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/62.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/63.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/63.gif
new file mode 100644
index 0000000..cf8e23e
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/63.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/64.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/64.gif
new file mode 100644
index 0000000..a779719
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/64.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/65.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/65.gif
new file mode 100644
index 0000000..7bb98f2
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/65.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/66.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/66.gif
new file mode 100644
index 0000000..bb6d077
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/66.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/67.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/67.gif
new file mode 100644
index 0000000..6e33f7c
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/67.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/68.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/68.gif
new file mode 100644
index 0000000..1a6c400
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/68.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/69.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/69.gif
new file mode 100644
index 0000000..a02f0b2
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/69.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/7.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/7.gif
new file mode 100644
index 0000000..e6d4db8
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/7.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/70.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/70.gif
new file mode 100644
index 0000000..416c5c1
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/70.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/71.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/71.gif
new file mode 100644
index 0000000..c17d60c
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/71.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/8.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/8.gif
new file mode 100644
index 0000000..66f967b
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/8.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/9.gif b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/9.gif
new file mode 100644
index 0000000..6044740
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/images/face/9.gif differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/lay/modules/carousel.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/lay/modules/carousel.js
new file mode 100644
index 0000000..5855394
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/lay/modules/carousel.js
@@ -0,0 +1,2 @@
+/** layui-v2.3.0 MIT License By https://www.layui.com */
+ ;layui.define("jquery",function(e){"use strict";var i=layui.$,n=(layui.hint(),layui.device(),{config:{},set:function(e){var n=this;return n.config=i.extend({},n.config,e),n},on:function(e,i){return layui.onevent.call(this,t,e,i)}}),t="carousel",a="layui-this",l=">*[carousel-item]>*",o="layui-carousel-left",r="layui-carousel-right",d="layui-carousel-prev",s="layui-carousel-next",u="layui-carousel-arrow",c="layui-carousel-ind",m=function(e){var t=this;t.config=i.extend({},t.config,n.config,e),t.render()};m.prototype.config={width:"600px",height:"280px",full:!1,arrow:"hover",indicator:"inside",autoplay:!0,interval:3e3,anim:"",trigger:"click",index:0},m.prototype.render=function(){var e=this,n=e.config;n.elem=i(n.elem),n.elem[0]&&(e.elemItem=n.elem.find(l),n.index<0&&(n.index=0),n.index>=e.elemItem.length&&(n.index=e.elemItem.length-1),n.interval<800&&(n.interval=800),n.full?n.elem.css({position:"fixed",width:"100%",height:"100%",zIndex:9999}):n.elem.css({width:n.width,height:n.height}),n.elem.attr("lay-anim",n.anim),e.elemItem.eq(n.index).addClass(a),e.elemItem.length<=1||(e.indicator(),e.arrow(),e.autoplay(),e.events()))},m.prototype.reload=function(e){var n=this;clearInterval(n.timer),n.config=i.extend({},n.config,e),n.render()},m.prototype.prevIndex=function(){var e=this,i=e.config,n=i.index-1;return n<0&&(n=e.elemItem.length-1),n},m.prototype.nextIndex=function(){var e=this,i=e.config,n=i.index+1;return n>=e.elemItem.length&&(n=0),n},m.prototype.addIndex=function(e){var i=this,n=i.config;e=e||1,n.index=n.index+e,n.index>=i.elemItem.length&&(n.index=0)},m.prototype.subIndex=function(e){var i=this,n=i.config;e=e||1,n.index=n.index-e,n.index<0&&(n.index=i.elemItem.length-1)},m.prototype.autoplay=function(){var e=this,i=e.config;i.autoplay&&(e.timer=setInterval(function(){e.slide()},i.interval))},m.prototype.arrow=function(){var e=this,n=e.config,t=i(['<button class="layui-icon '+u+'" lay-type="sub">'+("updown"===n.anim?"&#xe619;":"&#xe603;")+"</button>",'<button class="layui-icon '+u+'" lay-type="add">'+("updown"===n.anim?"&#xe61a;":"&#xe602;")+"</button>"].join(""));n.elem.attr("lay-arrow",n.arrow),n.elem.find("."+u)[0]&&n.elem.find("."+u).remove(),n.elem.append(t),t.on("click",function(){var n=i(this),t=n.attr("lay-type");e.slide(t)})},m.prototype.indicator=function(){var e=this,n=e.config,t=e.elemInd=i(['<div class="'+c+'"><ul>',function(){var i=[];return layui.each(e.elemItem,function(e){i.push("<li"+(n.index===e?' class="layui-this"':"")+"></li>")}),i.join("")}(),"</ul></div>"].join(""));n.elem.attr("lay-indicator",n.indicator),n.elem.find("."+c)[0]&&n.elem.find("."+c).remove(),n.elem.append(t),"updown"===n.anim&&t.css("margin-top",-(t.height()/2)),t.find("li").on("hover"===n.trigger?"mouseover":n.trigger,function(){var t=i(this),a=t.index();a>n.index?e.slide("add",a-n.index):a<n.index&&e.slide("sub",n.index-a)})},m.prototype.slide=function(e,i){var n=this,l=n.elemItem,u=n.config,c=u.index,m=u.elem.attr("lay-filter");n.haveSlide||("sub"===e?(n.subIndex(i),l.eq(u.index).addClass(d),setTimeout(function(){l.eq(c).addClass(r),l.eq(u.index).addClass(r)},50)):(n.addIndex(i),l.eq(u.index).addClass(s),setTimeout(function(){l.eq(c).addClass(o),l.eq(u.index).addClass(o)},50)),setTimeout(function(){l.removeClass(a+" "+d+" "+s+" "+o+" "+r),l.eq(u.index).addClass(a),n.haveSlide=!1},300),n.elemInd.find("li").eq(u.index).addClass(a).siblings().removeClass(a),n.haveSlide=!0,layui.event.call(this,t,"change("+m+")",{index:u.index,prevIndex:c,item:l.eq(u.index)}))},m.prototype.events=function(){var e=this,i=e.config;i.elem.data("haveEvents")||(i.elem.on("mouseenter",function(){clearInterval(e.timer)}).on("mouseleave",function(){e.autoplay()}),i.elem.data("haveEvents",!0))},n.render=function(e){var i=new m(e);return i},e(t,n)});
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/lay/modules/code.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/lay/modules/code.js
new file mode 100644
index 0000000..ad795a6
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/lay/modules/code.js
@@ -0,0 +1,2 @@
+/** layui-v2.3.0 MIT License By https://www.layui.com */
+ ;layui.define("jquery",function(e){"use strict";var a=layui.$,l="http://www.layui.com/doc/modules/code.html";e("code",function(e){var t=[];e=e||{},e.elem=a(e.elem||".layui-code"),e.about=!("about"in e)||e.about,e.elem.each(function(){t.push(this)}),layui.each(t.reverse(),function(t,i){var c=a(i),o=c.html();(c.attr("lay-encode")||e.encode)&&(o=o.replace(/&(?!#?[a-zA-Z0-9]+;)/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/'/g,"&#39;").replace(/"/g,"&quot;")),c.html('<ol class="layui-code-ol"><li>'+o.replace(/[\r\t\n]+/g,"</li><li>")+"</li></ol>"),c.find(">.layui-code-h3")[0]||c.prepend('<h3 class="layui-code-h3">'+(c.attr("lay-title")||e.title||"code")+(e.about?'<a href="'+l+'" target="_blank">layui.code</a>':"")+"</h3>");var d=c.find(">.layui-code-ol");c.addClass("layui-box layui-code-view"),(c.attr("lay-skin")||e.skin)&&c.addClass("layui-code-"+(c.attr("lay-skin")||e.skin)),(d.find("li").length/100|0)>0&&d.css("margin-left",(d.find("li").length/100|0)+"px"),(c.attr("lay-height")||e.height)&&d.css("max-height",c.attr("lay-height")||e.height)})})}).addcss("modules/code.css","skincodecss");
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/lay/modules/element.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/lay/modules/element.js
new file mode 100644
index 0000000..cddd20a
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/lay/modules/element.js
@@ -0,0 +1,2 @@
+/** layui-v2.3.0 MIT License By https://www.layui.com */
+ ;layui.define("jquery",function(t){"use strict";var a=layui.$,i=(layui.hint(),layui.device()),e="element",l="layui-this",n="layui-show",s=function(){this.config={}};s.prototype.set=function(t){var i=this;return a.extend(!0,i.config,t),i},s.prototype.on=function(t,a){return layui.onevent.call(this,e,t,a)},s.prototype.tabAdd=function(t,i){var e=".layui-tab-title",l=a(".layui-tab[lay-filter="+t+"]"),n=l.children(e),s=n.children(".layui-tab-bar"),o=l.children(".layui-tab-content"),r='<li lay-id="'+(i.id||"")+'"'+(i.attr?' lay-attr="'+i.attr+'"':"")+">"+(i.title||"unnaming")+"</li>";return s[0]?s.before(r):n.append(r),o.append('<div class="layui-tab-item">'+(i.content||"")+"</div>"),f.hideTabMore(!0),f.tabAuto(),this},s.prototype.tabDelete=function(t,i){var e=".layui-tab-title",l=a(".layui-tab[lay-filter="+t+"]"),n=l.children(e),s=n.find('>li[lay-id="'+i+'"]');return f.tabDelete(null,s),this},s.prototype.tabChange=function(t,i){var e=".layui-tab-title",l=a(".layui-tab[lay-filter="+t+"]"),n=l.children(e),s=n.find('>li[lay-id="'+i+'"]');return f.tabClick.call(s[0],null,null,s),this},s.prototype.tab=function(t){t=t||{},b.on("click",t.headerElem,function(i){var e=a(this).index();f.tabClick.call(this,i,e,null,t)})},s.prototype.progress=function(t,i){var e="layui-progress",l=a("."+e+"[lay-filter="+t+"]"),n=l.find("."+e+"-bar"),s=n.find("."+e+"-text");return n.css("width",i),s.text(i),this};var o=".layui-nav",r="layui-nav-item",c="layui-nav-bar",u="layui-nav-tree",d="layui-nav-child",y="layui-nav-more",h="layui-anim layui-anim-upbit",f={tabClick:function(t,i,s,o){o=o||{};var r=s||a(this),i=i||r.parent().children("li").index(r),c=o.headerElem?r.parent():r.parents(".layui-tab").eq(0),u=o.bodyElem?a(o.bodyElem):c.children(".layui-tab-content").children(".layui-tab-item"),d=r.find("a"),y=c.attr("lay-filter");"javascript:;"!==d.attr("href")&&"_blank"===d.attr("target")||(r.addClass(l).siblings().removeClass(l),u.eq(i).addClass(n).siblings().removeClass(n)),layui.event.call(this,e,"tab("+y+")",{elem:c,index:i})},tabDelete:function(t,i){var n=i||a(this).parent(),s=n.index(),o=n.parents(".layui-tab").eq(0),r=o.children(".layui-tab-content").children(".layui-tab-item"),c=o.attr("lay-filter");n.hasClass(l)&&(n.next()[0]?f.tabClick.call(n.next()[0],null,s+1):n.prev()[0]&&f.tabClick.call(n.prev()[0],null,s-1)),n.remove(),r.eq(s).remove(),setTimeout(function(){f.tabAuto()},50),layui.event.call(this,e,"tabDelete("+c+")",{elem:o,index:s})},tabAuto:function(){var t="layui-tab-more",e="layui-tab-bar",l="layui-tab-close",n=this;a(".layui-tab").each(function(){var s=a(this),o=s.children(".layui-tab-title"),r=(s.children(".layui-tab-content").children(".layui-tab-item"),'lay-stope="tabmore"'),c=a('<span class="layui-unselect layui-tab-bar" '+r+"><i "+r+' class="layui-icon">&#xe61a;</i></span>');if(n===window&&8!=i.ie&&f.hideTabMore(!0),s.attr("lay-allowClose")&&o.find("li").each(function(){var t=a(this);if(!t.find("."+l)[0]){var i=a('<i class="layui-icon layui-unselect '+l+'">&#x1006;</i>');i.on("click",f.tabDelete),t.append(i)}}),"string"!=typeof s.attr("lay-unauto"))if(o.prop("scrollWidth")>o.outerWidth()+1){if(o.find("."+e)[0])return;o.append(c),s.attr("overflow",""),c.on("click",function(a){o[this.title?"removeClass":"addClass"](t),this.title=this.title?"":"收缩"})}else o.find("."+e).remove(),s.removeAttr("overflow")})},hideTabMore:function(t){var i=a(".layui-tab-title");t!==!0&&"tabmore"===a(t.target).attr("lay-stope")||(i.removeClass("layui-tab-more"),i.find(".layui-tab-bar").attr("title",""))},clickThis:function(){var t=a(this),i=t.parents(o),n=i.attr("lay-filter"),s=t.parent(),c=t.siblings("."+d),y="string"==typeof s.attr("lay-unselect");"javascript:;"!==t.attr("href")&&"_blank"===t.attr("target")||y||c[0]||(i.find("."+l).removeClass(l),s.addClass(l)),i.hasClass(u)&&(c.removeClass(h),c[0]&&(s["none"===c.css("display")?"addClass":"removeClass"](r+"ed"),"all"===i.attr("lay-shrink")&&s.siblings().removeClass(r+"ed"))),layui.event.call(this,e,"nav("+n+")",t)},collapse:function(){var t=a(this),i=t.find(".layui-colla-icon"),l=t.siblings(".layui-colla-content"),s=t.parents(".layui-collapse").eq(0),o=s.attr("lay-filter"),r="none"===l.css("display");if("string"==typeof s.attr("lay-accordion")){var c=s.children(".layui-colla-item").children("."+n);c.siblings(".layui-colla-title").children(".layui-colla-icon").html("&#xe602;"),c.removeClass(n)}l[r?"addClass":"removeClass"](n),i.html(r?"&#xe61a;":"&#xe602;"),layui.event.call(this,e,"collapse("+o+")",{title:t,content:l,show:r})}};s.prototype.init=function(t,e){var l=function(){return e?'[lay-filter="'+e+'"]':""}(),s={tab:function(){f.tabAuto.call({})},nav:function(){var t=200,e={},s={},p={},b=function(l,o,r){var c=a(this),f=c.find("."+d);o.hasClass(u)?l.css({top:c.position().top,height:c.children("a").outerHeight(),opacity:1}):(f.addClass(h),l.css({left:c.position().left+parseFloat(c.css("marginLeft")),top:c.position().top+c.height()-l.height()}),e[r]=setTimeout(function(){l.css({width:c.width(),opacity:1})},i.ie&&i.ie<10?0:t),clearTimeout(p[r]),"block"===f.css("display")&&clearTimeout(s[r]),s[r]=setTimeout(function(){f.addClass(n),c.find("."+y).addClass(y+"d")},300))};a(o+l).each(function(i){var l=a(this),o=a('<span class="'+c+'"></span>'),h=l.find("."+r);l.find("."+c)[0]||(l.append(o),h.on("mouseenter",function(){b.call(this,o,l,i)}).on("mouseleave",function(){l.hasClass(u)||(clearTimeout(s[i]),s[i]=setTimeout(function(){l.find("."+d).removeClass(n),l.find("."+y).removeClass(y+"d")},300))}),l.on("mouseleave",function(){clearTimeout(e[i]),p[i]=setTimeout(function(){l.hasClass(u)?o.css({height:0,top:o.position().top+o.height()/2,opacity:0}):o.css({width:0,left:o.position().left+o.width()/2,opacity:0})},t)})),h.find("a").each(function(){var t=a(this),i=(t.parent(),t.siblings("."+d));i[0]&&!t.children("."+y)[0]&&t.append('<span class="'+y+'"></span>'),t.off("click",f.clickThis).on("click",f.clickThis)})})},breadcrumb:function(){var t=".layui-breadcrumb";a(t+l).each(function(){var t=a(this),i="lay-separator",e=t.attr(i)||"/",l=t.find("a");l.next("span["+i+"]")[0]||(l.each(function(t){t!==l.length-1&&a(this).after("<span "+i+">"+e+"</span>")}),t.css("visibility","visible"))})},progress:function(){var t="layui-progress";a("."+t+l).each(function(){var i=a(this),e=i.find(".layui-progress-bar"),l=e.attr("lay-percent");e.css("width",function(){return/^.+\/.+$/.test(l)?100*new Function("return "+l)()+"%":l}()),i.attr("lay-showPercent")&&setTimeout(function(){e.html('<span class="'+t+'-text">'+l+"</span>")},350)})},collapse:function(){var t="layui-collapse";a("."+t+l).each(function(){var t=a(this).find(".layui-colla-item");t.each(function(){var t=a(this),i=t.find(".layui-colla-title"),e=t.find(".layui-colla-content"),l="none"===e.css("display");i.find(".layui-colla-icon").remove(),i.append('<i class="layui-icon layui-colla-icon">'+(l?"&#xe602;":"&#xe61a;")+"</i>"),i.off("click",f.collapse).on("click",f.collapse)})})}};return s[t]?s[t]():layui.each(s,function(t,a){a()})},s.prototype.render=s.prototype.init;var p=new s,b=a(document);p.render();var v=".layui-tab-title li";b.on("click",v,f.tabClick),b.on("click",f.hideTabMore),a(window).on("resize",f.tabAuto),t(e,p)});
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/lay/modules/flow.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/lay/modules/flow.js
new file mode 100644
index 0000000..0528c56
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/lay/modules/flow.js
@@ -0,0 +1,2 @@
+/** layui-v2.3.0 MIT License By https://www.layui.com */
+ ;layui.define("jquery",function(e){"use strict";var l=layui.$,o=function(e){},t='<i class="layui-anim layui-anim-rotate layui-anim-loop layui-icon ">&#xe63e;</i>';o.prototype.load=function(e){var o,i,n,r,a=this,c=0;e=e||{};var f=l(e.elem);if(f[0]){var m=l(e.scrollElem||document),u=e.mb||50,s=!("isAuto"in e)||e.isAuto,v=e.end||"没有更多了",y=e.scrollElem&&e.scrollElem!==document,d="<cite>加载更多</cite>",h=l('<div class="layui-flow-more"><a href="javascript:;">'+d+"</a></div>");f.find(".layui-flow-more")[0]||f.append(h);var p=function(e,t){e=l(e),h.before(e),t=0==t||null,t?h.html(v):h.find("a").html(d),i=t,o=null,n&&n()},g=function(){o=!0,h.find("a").html(t),"function"==typeof e.done&&e.done(++c,p)};if(g(),h.find("a").on("click",function(){l(this);i||o||g()}),e.isLazyimg)var n=a.lazyimg({elem:e.elem+" img",scrollElem:e.scrollElem});return s?(m.on("scroll",function(){var e=l(this),t=e.scrollTop();r&&clearTimeout(r),i||(r=setTimeout(function(){var i=y?e.height():l(window).height(),n=y?e.prop("scrollHeight"):document.documentElement.scrollHeight;n-t-i<=u&&(o||g())},100))}),a):a}},o.prototype.lazyimg=function(e){var o,t=this,i=0;e=e||{};var n=l(e.scrollElem||document),r=e.elem||"img",a=e.scrollElem&&e.scrollElem!==document,c=function(e,l){var o=n.scrollTop(),r=o+l,c=a?function(){return e.offset().top-n.offset().top+o}():e.offset().top;if(c>=o&&c<=r&&!e.attr("src")){var m=e.attr("lay-src");layui.img(m,function(){var l=t.lazyimg.elem.eq(i);e.attr("src",m).removeAttr("lay-src"),l[0]&&f(l),i++})}},f=function(e,o){var f=a?(o||n).height():l(window).height(),m=n.scrollTop(),u=m+f;if(t.lazyimg.elem=l(r),e)c(e,f);else for(var s=0;s<t.lazyimg.elem.length;s++){var v=t.lazyimg.elem.eq(s),y=a?function(){return v.offset().top-n.offset().top+m}():v.offset().top;if(c(v,f),i=s,y>u)break}};if(f(),!o){var m;n.on("scroll",function(){var e=l(this);m&&clearTimeout(m),m=setTimeout(function(){f(null,e)},50)}),o=!0}return f},e("flow",new o)});
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/lay/modules/form.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/lay/modules/form.js
new file mode 100644
index 0000000..2d9373f
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/lay/modules/form.js
@@ -0,0 +1,2 @@
+/** layui-v2.3.0 MIT License By https://www.layui.com */
+ ;layui.define("layer",function(e){"use strict";var i=layui.$,t=layui.layer,a=layui.hint(),n=layui.device(),l="form",r=".layui-form",s="layui-this",o="layui-hide",c="layui-disabled",u=function(){this.config={verify:{required:[/[\S]+/,"必填项不能为空"],phone:[/^1\d{10}$/,"请输入正确的手机号"],email:[/^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/,"邮箱格式不正确"],url:[/(^#)|(^http(s*):\/\/[^\s]+\.[^\s]+)/,"链接格式不正确"],number:function(e){if(!e||isNaN(e))return"只能填写数字"},date:[/^(\d{4})[-\/](\d{1}|0\d{1}|1[0-2])([-\/](\d{1}|0\d{1}|[1-2][0-9]|3[0-1]))*$/,"日期格式不正确"],identity:[/(^\d{15}$)|(^\d{17}(x|X|\d)$)/,"请输入正确的身份证号"]}}};u.prototype.set=function(e){var t=this;return i.extend(!0,t.config,e),t},u.prototype.verify=function(e){var t=this;return i.extend(!0,t.config.verify,e),t},u.prototype.on=function(e,i){return layui.onevent.call(this,l,e,i)},u.prototype.val=function(e,t){var a=i(r+'[lay-filter="'+e+'"]');a.each(function(e,a){var n=i(this);layui.each(t,function(e,i){var t,a=n.find('[name="'+e+'"]');a[0]&&(t=a[0].type,"checkbox"===t?a[0].checked=i:"radio"===t?a.each(function(){this.value===i&&(this.checked=!0)}):a.val(i))})}),f.render(null,e)},u.prototype.render=function(e,t){var n=this,u=i(r+function(){return t?'[lay-filter="'+t+'"]':""}()),d={select:function(){var e,t="请选择",a="layui-form-select",n="layui-select-title",r="layui-select-none",d="",f=u.find("select"),v=function(t,l){i(t.target).parent().hasClass(n)&&!l||(i("."+a).removeClass(a+"ed "+a+"up"),e&&d&&e.val(d)),e=null},y=function(t,u,f){var y,p=i(this),m=t.find("."+n),k=m.find("input"),g=t.find("dl"),x=g.children("dd"),b=this.selectedIndex;if(!u){var C=function(){var e=t.offset().top+t.outerHeight()+5-h.scrollTop(),i=g.outerHeight();b=p[0].selectedIndex,t.addClass(a+"ed"),x.removeClass(o),y=null,x.eq(b).addClass(s).siblings().removeClass(s),e+i>h.height()&&e>=i&&t.addClass(a+"up")},w=function(e){t.removeClass(a+"ed "+a+"up"),k.blur(),y=null,e||$(k.val(),function(e){e&&(d=g.find("."+s).html(),k&&k.val(d))})};m.on("click",function(e){t.hasClass(a+"ed")?w():(v(e,!0),C()),g.find("."+r).remove()}),m.find(".layui-edge").on("click",function(){k.focus()}),k.on("keyup",function(e){var i=e.keyCode;9===i&&C()}).on("keydown",function(e){var i=e.keyCode;9===i&&w();var t=function(i,a){var n,l;if(e.preventDefault(),a=function(){return a&&a[0]?a:y&&y[0]?y:x.eq(b)}(),l=a[i](),n=a[i]("dd"),l[0]){if(y=a[i](),!n[0]||n.hasClass(c))return t(i,y);n.addClass(s).siblings().removeClass(s);var r=g.children("dd.layui-this"),o=r.position().top,u=g.height(),d=r.height();o>u&&g.scrollTop(o+g.scrollTop()-u+d-5),o<0&&g.scrollTop(o+g.scrollTop())}};38===i&&t("prev"),40===i&&t("next"),13===i&&(e.preventDefault(),g.children("dd."+s).trigger("click"))});var $=function(e,t,a){var n=0;layui.each(x,function(){var t=i(this),l=t.text(),r=l.indexOf(e)===-1;(""===e||"blur"===a?e!==l:r)&&n++,"keyup"===a&&t[r?"addClass":"removeClass"](o)});var l=n===x.length;return t(l),l},T=function(e){var i=this.value,t=e.keyCode;return 9!==t&&13!==t&&37!==t&&38!==t&&39!==t&&40!==t&&($(i,function(e){e?g.find("."+r)[0]||g.append('<p class="'+r+'">无匹配项</p>'):g.find("."+r).remove()},"keyup"),void(""===i&&g.find("."+r).remove()))};f&&k.on("keyup",T).on("blur",function(t){var a=p[0].selectedIndex;e=k,d=i(p[0].options[a]).html(),setTimeout(function(){$(k.val(),function(e){d||k.val("")},"blur")},200)}),x.on("click",function(){var e=i(this),a=e.attr("lay-value"),n=p.attr("lay-filter");return!e.hasClass(c)&&(e.hasClass("layui-select-tips")?k.val(""):(k.val(e.text()),e.addClass(s)),e.siblings().removeClass(s),p.val(a).removeClass("layui-form-danger"),layui.event.call(this,l,"select("+n+")",{elem:p[0],value:a,othis:t}),w(!0),!1)}),t.find("dl>dt").on("click",function(e){return!1}),i(document).off("click",v).on("click",v)}};f.each(function(e,l){var r=i(this),o=r.next("."+a),u=this.disabled,d=l.value,f=i(l.options[l.selectedIndex]),v=l.options[0];if("string"==typeof r.attr("lay-ignore"))return r.show();var h="string"==typeof r.attr("lay-search"),p=v?v.value?t:v.innerHTML||t:t,m=i(['<div class="'+(h?"":"layui-unselect ")+a,(u?" layui-select-disabled":"")+'">','<div class="'+n+'">','<input type="text" placeholder="'+p+'" '+('value="'+(d?f.html():"")+'"')+(h?"":" readonly")+' class="layui-input'+(h?"":" layui-unselect")+(u?" "+c:"")+'">','<i class="layui-edge"></i></div>','<dl class="layui-anim layui-anim-upbit'+(r.find("optgroup")[0]?" layui-select-group":"")+'">',function(e){var i=[];return layui.each(e,function(e,a){0!==e||a.value?"optgroup"===a.tagName.toLowerCase()?i.push("<dt>"+a.label+"</dt>"):i.push('<dd lay-value="'+a.value+'" class="'+(d===a.value?s:"")+(a.disabled?" "+c:"")+'">'+a.innerHTML+"</dd>"):i.push('<dd lay-value="" class="layui-select-tips">'+(a.innerHTML||t)+"</dd>")}),0===i.length&&i.push('<dd lay-value="" class="'+c+'">没有选项</dd>'),i.join("")}(r.find("*"))+"</dl>","</div>"].join(""));o[0]&&o.remove(),r.after(m),y.call(this,m,u,h)})},checkbox:function(){var e={checkbox:["layui-form-checkbox","layui-form-checked","checkbox"],_switch:["layui-form-switch","layui-form-onswitch","switch"]},t=u.find("input[type=checkbox]"),a=function(e,t){var a=i(this);e.on("click",function(){var i=a.attr("lay-filter"),n=(a.attr("lay-text")||"").split("|");a[0].disabled||(a[0].checked?(a[0].checked=!1,e.removeClass(t[1]).find("em").text(n[1])):(a[0].checked=!0,e.addClass(t[1]).find("em").text(n[0])),layui.event.call(a[0],l,t[2]+"("+i+")",{elem:a[0],value:a[0].value,othis:e}))})};t.each(function(t,n){var l=i(this),r=l.attr("lay-skin"),s=(l.attr("lay-text")||"").split("|"),o=this.disabled;"switch"===r&&(r="_"+r);var u=e[r]||e.checkbox;if("string"==typeof l.attr("lay-ignore"))return l.show();var d=l.next("."+u[0]),f=i(['<div class="layui-unselect '+u[0],n.checked?" "+u[1]:"",o?" layui-checkbox-disbaled "+c:"",'"',r?' lay-skin="'+r+'"':"",">",function(){var e=n.title.replace(/\s/g,""),i={checkbox:[e?"<span>"+n.title+"</span>":"",'<i class="layui-icon layui-icon-ok"></i>'].join(""),_switch:"<em>"+((n.checked?s[0]:s[1])||"")+"</em><i></i>"};return i[r]||i.checkbox}(),"</div>"].join(""));d[0]&&d.remove(),l.after(f),a.call(this,f,u)})},radio:function(){var e="layui-form-radio",t=["&#xe643;","&#xe63f;"],a=u.find("input[type=radio]"),n=function(a){var n=i(this),s="layui-anim-scaleSpring";a.on("click",function(){var o=n[0].name,c=n.parents(r),u=n.attr("lay-filter"),d=c.find("input[name="+o.replace(/(\.|#|\[|\])/g,"\\$1")+"]");n[0].disabled||(layui.each(d,function(){var a=i(this).next("."+e);this.checked=!1,a.removeClass(e+"ed"),a.find(".layui-icon").removeClass(s).html(t[1])}),n[0].checked=!0,a.addClass(e+"ed"),a.find(".layui-icon").addClass(s).html(t[0]),layui.event.call(n[0],l,"radio("+u+")",{elem:n[0],value:n[0].value,othis:a}))})};a.each(function(a,l){var r=i(this),s=r.next("."+e),o=this.disabled;if("string"==typeof r.attr("lay-ignore"))return r.show();s[0]&&s.remove();var u=i(['<div class="layui-unselect '+e,l.checked?" "+e+"ed":"",(o?" layui-radio-disbaled "+c:"")+'">','<i class="layui-anim layui-icon">'+t[l.checked?0:1]+"</i>","<div>"+function(){var e=l.title||"";return"string"==typeof r.next().attr("lay-radio")&&(e=r.next().html(),r.next().remove()),e}()+"</div>","</div>"].join(""));r.after(u),n.call(this,u)})}};return e?d[e]?d[e]():a.error("不支持的"+e+"表单渲染"):layui.each(d,function(e,i){i()}),n};var d=function(){var e=i(this),a=f.config.verify,s=null,o="layui-form-danger",c={},u=e.parents(r),d=u.find("*[lay-verify]"),v=e.parents("form")[0],h=u.find("input,select,textarea"),y=e.attr("lay-filter");if(layui.each(d,function(e,l){var r=i(this),c=r.attr("lay-verify").split("|"),u=r.attr("lay-verType"),d=r.val();if(r.removeClass(o),layui.each(c,function(e,i){var c,f="",v="function"==typeof a[i];if(a[i]){var c=v?f=a[i](d,l):!a[i][0].test(d);if(f=f||a[i][1],c)return"tips"===u?t.tips(f,function(){return"string"==typeof r.attr("lay-ignore")||"select"!==l.tagName.toLowerCase()&&!/^checkbox|radio$/.test(l.type)?r:r.next()}(),{tips:1}):"alert"===u?t.alert(f,{title:"提示",shadeClose:!0}):t.msg(f,{icon:5,shift:6}),n.android||n.ios||l.focus(),r.addClass(o),s=!0}}),s)return s}),s)return!1;var p={};return layui.each(h,function(e,i){if(i.name=(i.name||"").replace(/^\s*|\s*&/,""),i.name){if(/^.*\[\]$/.test(i.name)){var t=i.name.match(/^(.*)\[\]$/g)[0];p[t]=0|p[t],i.name=i.name.replace(/^(.*)\[\]$/,"$1["+p[t]++ +"]")}/^checkbox|radio$/.test(i.type)&&!i.checked||(c[i.name]=i.value)}}),layui.event.call(this,l,"submit("+y+")",{elem:this,form:v,field:c})},f=new u,v=i(document),h=i(window);f.render(),v.on("reset",r,function(){var e=i(this).attr("lay-filter");setTimeout(function(){f.render(null,e)},50)}),v.on("submit",r,d).on("click","*[lay-submit]",d),e(l,f)});
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/lay/modules/jquery.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/lay/modules/jquery.js
new file mode 100644
index 0000000..99979e6
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/lay/modules/jquery.js
@@ -0,0 +1,5 @@
+/** layui-v2.3.0 MIT License By https://www.layui.com */
+ ;!function(e,t){"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(e,t){function n(e){var t=!!e&&"length"in e&&e.length,n=pe.type(e);return"function"!==n&&!pe.isWindow(e)&&("array"===n||0===t||"number"==typeof t&&t>0&&t-1 in e)}function r(e,t,n){if(pe.isFunction(t))return pe.grep(e,function(e,r){return!!t.call(e,r,e)!==n});if(t.nodeType)return pe.grep(e,function(e){return e===t!==n});if("string"==typeof t){if(Ce.test(t))return pe.filter(t,e,n);t=pe.filter(t,e)}return pe.grep(e,function(e){return pe.inArray(e,t)>-1!==n})}function i(e,t){do e=e[t];while(e&&1!==e.nodeType);return e}function o(e){var t={};return pe.each(e.match(De)||[],function(e,n){t[n]=!0}),t}function a(){re.addEventListener?(re.removeEventListener("DOMContentLoaded",s),e.removeEventListener("load",s)):(re.detachEvent("onreadystatechange",s),e.detachEvent("onload",s))}function s(){(re.addEventListener||"load"===e.event.type||"complete"===re.readyState)&&(a(),pe.ready())}function u(e,t,n){if(void 0===n&&1===e.nodeType){var r="data-"+t.replace(_e,"-$1").toLowerCase();if(n=e.getAttribute(r),"string"==typeof n){try{n="true"===n||"false"!==n&&("null"===n?null:+n+""===n?+n:qe.test(n)?pe.parseJSON(n):n)}catch(i){}pe.data(e,t,n)}else n=void 0}return n}function l(e){var t;for(t in e)if(("data"!==t||!pe.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}function c(e,t,n,r){if(He(e)){var i,o,a=pe.expando,s=e.nodeType,u=s?pe.cache:e,l=s?e[a]:e[a]&&a;if(l&&u[l]&&(r||u[l].data)||void 0!==n||"string"!=typeof t)return l||(l=s?e[a]=ne.pop()||pe.guid++:a),u[l]||(u[l]=s?{}:{toJSON:pe.noop}),"object"!=typeof t&&"function"!=typeof t||(r?u[l]=pe.extend(u[l],t):u[l].data=pe.extend(u[l].data,t)),o=u[l],r||(o.data||(o.data={}),o=o.data),void 0!==n&&(o[pe.camelCase(t)]=n),"string"==typeof t?(i=o[t],null==i&&(i=o[pe.camelCase(t)])):i=o,i}}function f(e,t,n){if(He(e)){var r,i,o=e.nodeType,a=o?pe.cache:e,s=o?e[pe.expando]:pe.expando;if(a[s]){if(t&&(r=n?a[s]:a[s].data)){pe.isArray(t)?t=t.concat(pe.map(t,pe.camelCase)):t in r?t=[t]:(t=pe.camelCase(t),t=t in r?[t]:t.split(" ")),i=t.length;for(;i--;)delete r[t[i]];if(n?!l(r):!pe.isEmptyObject(r))return}(n||(delete a[s].data,l(a[s])))&&(o?pe.cleanData([e],!0):fe.deleteExpando||a!=a.window?delete a[s]:a[s]=void 0)}}}function d(e,t,n,r){var i,o=1,a=20,s=r?function(){return r.cur()}:function(){return pe.css(e,t,"")},u=s(),l=n&&n[3]||(pe.cssNumber[t]?"":"px"),c=(pe.cssNumber[t]||"px"!==l&&+u)&&Me.exec(pe.css(e,t));if(c&&c[3]!==l){l=l||c[3],n=n||[],c=+u||1;do o=o||".5",c/=o,pe.style(e,t,c+l);while(o!==(o=s()/u)&&1!==o&&--a)}return n&&(c=+c||+u||0,i=n[1]?c+(n[1]+1)*n[2]:+n[2],r&&(r.unit=l,r.start=c,r.end=i)),i}function p(e){var t=ze.split("|"),n=e.createDocumentFragment();if(n.createElement)for(;t.length;)n.createElement(t.pop());return n}function h(e,t){var n,r,i=0,o="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):void 0;if(!o)for(o=[],n=e.childNodes||e;null!=(r=n[i]);i++)!t||pe.nodeName(r,t)?o.push(r):pe.merge(o,h(r,t));return void 0===t||t&&pe.nodeName(e,t)?pe.merge([e],o):o}function g(e,t){for(var n,r=0;null!=(n=e[r]);r++)pe._data(n,"globalEval",!t||pe._data(t[r],"globalEval"))}function m(e){Be.test(e.type)&&(e.defaultChecked=e.checked)}function y(e,t,n,r,i){for(var o,a,s,u,l,c,f,d=e.length,y=p(t),v=[],x=0;x<d;x++)if(a=e[x],a||0===a)if("object"===pe.type(a))pe.merge(v,a.nodeType?[a]:a);else if(Ue.test(a)){for(u=u||y.appendChild(t.createElement("div")),l=(We.exec(a)||["",""])[1].toLowerCase(),f=Xe[l]||Xe._default,u.innerHTML=f[1]+pe.htmlPrefilter(a)+f[2],o=f[0];o--;)u=u.lastChild;if(!fe.leadingWhitespace&&$e.test(a)&&v.push(t.createTextNode($e.exec(a)[0])),!fe.tbody)for(a="table"!==l||Ve.test(a)?"<table>"!==f[1]||Ve.test(a)?0:u:u.firstChild,o=a&&a.childNodes.length;o--;)pe.nodeName(c=a.childNodes[o],"tbody")&&!c.childNodes.length&&a.removeChild(c);for(pe.merge(v,u.childNodes),u.textContent="";u.firstChild;)u.removeChild(u.firstChild);u=y.lastChild}else v.push(t.createTextNode(a));for(u&&y.removeChild(u),fe.appendChecked||pe.grep(h(v,"input"),m),x=0;a=v[x++];)if(r&&pe.inArray(a,r)>-1)i&&i.push(a);else if(s=pe.contains(a.ownerDocument,a),u=h(y.appendChild(a),"script"),s&&g(u),n)for(o=0;a=u[o++];)Ie.test(a.type||"")&&n.push(a);return u=null,y}function v(){return!0}function x(){return!1}function b(){try{return re.activeElement}catch(e){}}function w(e,t,n,r,i,o){var a,s;if("object"==typeof t){"string"!=typeof n&&(r=r||n,n=void 0);for(s in t)w(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),i===!1)i=x;else if(!i)return e;return 1===o&&(a=i,i=function(e){return pe().off(e),a.apply(this,arguments)},i.guid=a.guid||(a.guid=pe.guid++)),e.each(function(){pe.event.add(this,t,i,r,n)})}function T(e,t){return pe.nodeName(e,"table")&&pe.nodeName(11!==t.nodeType?t:t.firstChild,"tr")?e.getElementsByTagName("tbody")[0]||e.appendChild(e.ownerDocument.createElement("tbody")):e}function C(e){return e.type=(null!==pe.find.attr(e,"type"))+"/"+e.type,e}function E(e){var t=it.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function N(e,t){if(1===t.nodeType&&pe.hasData(e)){var n,r,i,o=pe._data(e),a=pe._data(t,o),s=o.events;if(s){delete a.handle,a.events={};for(n in s)for(r=0,i=s[n].length;r<i;r++)pe.event.add(t,n,s[n][r])}a.data&&(a.data=pe.extend({},a.data))}}function k(e,t){var n,r,i;if(1===t.nodeType){if(n=t.nodeName.toLowerCase(),!fe.noCloneEvent&&t[pe.expando]){i=pe._data(t);for(r in i.events)pe.removeEvent(t,r,i.handle);t.removeAttribute(pe.expando)}"script"===n&&t.text!==e.text?(C(t).text=e.text,E(t)):"object"===n?(t.parentNode&&(t.outerHTML=e.outerHTML),fe.html5Clone&&e.innerHTML&&!pe.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):"input"===n&&Be.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):"option"===n?t.defaultSelected=t.selected=e.defaultSelected:"input"!==n&&"textarea"!==n||(t.defaultValue=e.defaultValue)}}function S(e,t,n,r){t=oe.apply([],t);var i,o,a,s,u,l,c=0,f=e.length,d=f-1,p=t[0],g=pe.isFunction(p);if(g||f>1&&"string"==typeof p&&!fe.checkClone&&rt.test(p))return e.each(function(i){var o=e.eq(i);g&&(t[0]=p.call(this,i,o.html())),S(o,t,n,r)});if(f&&(l=y(t,e[0].ownerDocument,!1,e,r),i=l.firstChild,1===l.childNodes.length&&(l=i),i||r)){for(s=pe.map(h(l,"script"),C),a=s.length;c<f;c++)o=l,c!==d&&(o=pe.clone(o,!0,!0),a&&pe.merge(s,h(o,"script"))),n.call(e[c],o,c);if(a)for(u=s[s.length-1].ownerDocument,pe.map(s,E),c=0;c<a;c++)o=s[c],Ie.test(o.type||"")&&!pe._data(o,"globalEval")&&pe.contains(u,o)&&(o.src?pe._evalUrl&&pe._evalUrl(o.src):pe.globalEval((o.text||o.textContent||o.innerHTML||"").replace(ot,"")));l=i=null}return e}function A(e,t,n){for(var r,i=t?pe.filter(t,e):e,o=0;null!=(r=i[o]);o++)n||1!==r.nodeType||pe.cleanData(h(r)),r.parentNode&&(n&&pe.contains(r.ownerDocument,r)&&g(h(r,"script")),r.parentNode.removeChild(r));return e}function D(e,t){var n=pe(t.createElement(e)).appendTo(t.body),r=pe.css(n[0],"display");return n.detach(),r}function j(e){var t=re,n=lt[e];return n||(n=D(e,t),"none"!==n&&n||(ut=(ut||pe("<iframe frameborder='0' width='0' height='0'/>")).appendTo(t.documentElement),t=(ut[0].contentWindow||ut[0].contentDocument).document,t.write(),t.close(),n=D(e,t),ut.detach()),lt[e]=n),n}function L(e,t){return{get:function(){return e()?void delete this.get:(this.get=t).apply(this,arguments)}}}function H(e){if(e in Et)return e;for(var t=e.charAt(0).toUpperCase()+e.slice(1),n=Ct.length;n--;)if(e=Ct[n]+t,e in Et)return e}function q(e,t){for(var n,r,i,o=[],a=0,s=e.length;a<s;a++)r=e[a],r.style&&(o[a]=pe._data(r,"olddisplay"),n=r.style.display,t?(o[a]||"none"!==n||(r.style.display=""),""===r.style.display&&Re(r)&&(o[a]=pe._data(r,"olddisplay",j(r.nodeName)))):(i=Re(r),(n&&"none"!==n||!i)&&pe._data(r,"olddisplay",i?n:pe.css(r,"display"))));for(a=0;a<s;a++)r=e[a],r.style&&(t&&"none"!==r.style.display&&""!==r.style.display||(r.style.display=t?o[a]||"":"none"));return e}function _(e,t,n){var r=bt.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function F(e,t,n,r,i){for(var o=n===(r?"border":"content")?4:"width"===t?1:0,a=0;o<4;o+=2)"margin"===n&&(a+=pe.css(e,n+Oe[o],!0,i)),r?("content"===n&&(a-=pe.css(e,"padding"+Oe[o],!0,i)),"margin"!==n&&(a-=pe.css(e,"border"+Oe[o]+"Width",!0,i))):(a+=pe.css(e,"padding"+Oe[o],!0,i),"padding"!==n&&(a+=pe.css(e,"border"+Oe[o]+"Width",!0,i)));return a}function M(t,n,r){var i=!0,o="width"===n?t.offsetWidth:t.offsetHeight,a=ht(t),s=fe.boxSizing&&"border-box"===pe.css(t,"boxSizing",!1,a);if(re.msFullscreenElement&&e.top!==e&&t.getClientRects().length&&(o=Math.round(100*t.getBoundingClientRect()[n])),o<=0||null==o){if(o=gt(t,n,a),(o<0||null==o)&&(o=t.style[n]),ft.test(o))return o;i=s&&(fe.boxSizingReliable()||o===t.style[n]),o=parseFloat(o)||0}return o+F(t,n,r||(s?"border":"content"),i,a)+"px"}function O(e,t,n,r,i){return new O.prototype.init(e,t,n,r,i)}function R(){return e.setTimeout(function(){Nt=void 0}),Nt=pe.now()}function P(e,t){var n,r={height:e},i=0;for(t=t?1:0;i<4;i+=2-t)n=Oe[i],r["margin"+n]=r["padding"+n]=e;return t&&(r.opacity=r.width=e),r}function B(e,t,n){for(var r,i=($.tweeners[t]||[]).concat($.tweeners["*"]),o=0,a=i.length;o<a;o++)if(r=i[o].call(n,t,e))return r}function W(e,t,n){var r,i,o,a,s,u,l,c,f=this,d={},p=e.style,h=e.nodeType&&Re(e),g=pe._data(e,"fxshow");n.queue||(s=pe._queueHooks(e,"fx"),null==s.unqueued&&(s.unqueued=0,u=s.empty.fire,s.empty.fire=function(){s.unqueued||u()}),s.unqueued++,f.always(function(){f.always(function(){s.unqueued--,pe.queue(e,"fx").length||s.empty.fire()})})),1===e.nodeType&&("height"in t||"width"in t)&&(n.overflow=[p.overflow,p.overflowX,p.overflowY],l=pe.css(e,"display"),c="none"===l?pe._data(e,"olddisplay")||j(e.nodeName):l,"inline"===c&&"none"===pe.css(e,"float")&&(fe.inlineBlockNeedsLayout&&"inline"!==j(e.nodeName)?p.zoom=1:p.display="inline-block")),n.overflow&&(p.overflow="hidden",fe.shrinkWrapBlocks()||f.always(function(){p.overflow=n.overflow[0],p.overflowX=n.overflow[1],p.overflowY=n.overflow[2]}));for(r in t)if(i=t[r],St.exec(i)){if(delete t[r],o=o||"toggle"===i,i===(h?"hide":"show")){if("show"!==i||!g||void 0===g[r])continue;h=!0}d[r]=g&&g[r]||pe.style(e,r)}else l=void 0;if(pe.isEmptyObject(d))"inline"===("none"===l?j(e.nodeName):l)&&(p.display=l);else{g?"hidden"in g&&(h=g.hidden):g=pe._data(e,"fxshow",{}),o&&(g.hidden=!h),h?pe(e).show():f.done(function(){pe(e).hide()}),f.done(function(){var t;pe._removeData(e,"fxshow");for(t in d)pe.style(e,t,d[t])});for(r in d)a=B(h?g[r]:0,r,f),r in g||(g[r]=a.start,h&&(a.end=a.start,a.start="width"===r||"height"===r?1:0))}}function I(e,t){var n,r,i,o,a;for(n in e)if(r=pe.camelCase(n),i=t[r],o=e[n],pe.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),a=pe.cssHooks[r],a&&"expand"in a){o=a.expand(o),delete e[r];for(n in o)n in e||(e[n]=o[n],t[n]=i)}else t[r]=i}function $(e,t,n){var r,i,o=0,a=$.prefilters.length,s=pe.Deferred().always(function(){delete u.elem}),u=function(){if(i)return!1;for(var t=Nt||R(),n=Math.max(0,l.startTime+l.duration-t),r=n/l.duration||0,o=1-r,a=0,u=l.tweens.length;a<u;a++)l.tweens[a].run(o);return s.notifyWith(e,[l,o,n]),o<1&&u?n:(s.resolveWith(e,[l]),!1)},l=s.promise({elem:e,props:pe.extend({},t),opts:pe.extend(!0,{specialEasing:{},easing:pe.easing._default},n),originalProperties:t,originalOptions:n,startTime:Nt||R(),duration:n.duration,tweens:[],createTween:function(t,n){var r=pe.Tween(e,l.opts,t,n,l.opts.specialEasing[t]||l.opts.easing);return l.tweens.push(r),r},stop:function(t){var n=0,r=t?l.tweens.length:0;if(i)return this;for(i=!0;n<r;n++)l.tweens[n].run(1);return t?(s.notifyWith(e,[l,1,0]),s.resolveWith(e,[l,t])):s.rejectWith(e,[l,t]),this}}),c=l.props;for(I(c,l.opts.specialEasing);o<a;o++)if(r=$.prefilters[o].call(l,e,c,l.opts))return pe.isFunction(r.stop)&&(pe._queueHooks(l.elem,l.opts.queue).stop=pe.proxy(r.stop,r)),r;return pe.map(c,B,l),pe.isFunction(l.opts.start)&&l.opts.start.call(e,l),pe.fx.timer(pe.extend(u,{elem:e,anim:l,queue:l.opts.queue})),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always)}function z(e){return pe.attr(e,"class")||""}function X(e){return function(t,n){"string"!=typeof t&&(n=t,t="*");var r,i=0,o=t.toLowerCase().match(De)||[];if(pe.isFunction(n))for(;r=o[i++];)"+"===r.charAt(0)?(r=r.slice(1)||"*",(e[r]=e[r]||[]).unshift(n)):(e[r]=e[r]||[]).push(n)}}function U(e,t,n,r){function i(s){var u;return o[s]=!0,pe.each(e[s]||[],function(e,s){var l=s(t,n,r);return"string"!=typeof l||a||o[l]?a?!(u=l):void 0:(t.dataTypes.unshift(l),i(l),!1)}),u}var o={},a=e===Qt;return i(t.dataTypes[0])||!o["*"]&&i("*")}function V(e,t){var n,r,i=pe.ajaxSettings.flatOptions||{};for(r in t)void 0!==t[r]&&((i[r]?e:n||(n={}))[r]=t[r]);return n&&pe.extend(!0,e,n),e}function Y(e,t,n){for(var r,i,o,a,s=e.contents,u=e.dataTypes;"*"===u[0];)u.shift(),void 0===i&&(i=e.mimeType||t.getResponseHeader("Content-Type"));if(i)for(a in s)if(s[a]&&s[a].test(i)){u.unshift(a);break}if(u[0]in n)o=u[0];else{for(a in n){if(!u[0]||e.converters[a+" "+u[0]]){o=a;break}r||(r=a)}o=o||r}if(o)return o!==u[0]&&u.unshift(o),n[o]}function J(e,t,n,r){var i,o,a,s,u,l={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)l[a.toLowerCase()]=e.converters[a];for(o=c.shift();o;)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!u&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u=o,o=c.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(a=l[u+" "+o]||l["* "+o],!a)for(i in l)if(s=i.split(" "),s[1]===o&&(a=l[u+" "+s[0]]||l["* "+s[0]])){a===!0?a=l[i]:l[i]!==!0&&(o=s[0],c.unshift(s[1]));break}if(a!==!0)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(f){return{state:"parsererror",error:a?f:"No conversion from "+u+" to "+o}}}return{state:"success",data:t}}function G(e){return e.style&&e.style.display||pe.css(e,"display")}function K(e){for(;e&&1===e.nodeType;){if("none"===G(e)||"hidden"===e.type)return!0;e=e.parentNode}return!1}function Q(e,t,n,r){var i;if(pe.isArray(t))pe.each(t,function(t,i){n||rn.test(e)?r(e,i):Q(e+"["+("object"==typeof i&&null!=i?t:"")+"]",i,n,r)});else if(n||"object"!==pe.type(t))r(e,t);else for(i in t)Q(e+"["+i+"]",t[i],n,r)}function Z(){try{return new e.XMLHttpRequest}catch(t){}}function ee(){try{return new e.ActiveXObject("Microsoft.XMLHTTP")}catch(t){}}function te(e){return pe.isWindow(e)?e:9===e.nodeType&&(e.defaultView||e.parentWindow)}var ne=[],re=e.document,ie=ne.slice,oe=ne.concat,ae=ne.push,se=ne.indexOf,ue={},le=ue.toString,ce=ue.hasOwnProperty,fe={},de="1.12.3",pe=function(e,t){return new pe.fn.init(e,t)},he=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,ge=/^-ms-/,me=/-([\da-z])/gi,ye=function(e,t){return t.toUpperCase()};pe.fn=pe.prototype={jquery:de,constructor:pe,selector:"",length:0,toArray:function(){return ie.call(this)},get:function(e){return null!=e?e<0?this[e+this.length]:this[e]:ie.call(this)},pushStack:function(e){var t=pe.merge(this.constructor(),e);return t.prevObject=this,t.context=this.context,t},each:function(e){return pe.each(this,e)},map:function(e){return this.pushStack(pe.map(this,function(t,n){return e.call(t,n,t)}))},slice:function(){return this.pushStack(ie.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(n>=0&&n<t?[this[n]]:[])},end:function(){return this.prevObject||this.constructor()},push:ae,sort:ne.sort,splice:ne.splice},pe.extend=pe.fn.extend=function(){var e,t,n,r,i,o,a=arguments[0]||{},s=1,u=arguments.length,l=!1;for("boolean"==typeof a&&(l=a,a=arguments[s]||{},s++),"object"==typeof a||pe.isFunction(a)||(a={}),s===u&&(a=this,s--);s<u;s++)if(null!=(i=arguments[s]))for(r in i)e=a[r],n=i[r],a!==n&&(l&&n&&(pe.isPlainObject(n)||(t=pe.isArray(n)))?(t?(t=!1,o=e&&pe.isArray(e)?e:[]):o=e&&pe.isPlainObject(e)?e:{},a[r]=pe.extend(l,o,n)):void 0!==n&&(a[r]=n));return a},pe.extend({expando:"jQuery"+(de+Math.random()).replace(/\D/g,""),isReady:!0,error:function(e){throw new Error(e)},noop:function(){},isFunction:function(e){return"function"===pe.type(e)},isArray:Array.isArray||function(e){return"array"===pe.type(e)},isWindow:function(e){return null!=e&&e==e.window},isNumeric:function(e){var t=e&&e.toString();return!pe.isArray(e)&&t-parseFloat(t)+1>=0},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},isPlainObject:function(e){var t;if(!e||"object"!==pe.type(e)||e.nodeType||pe.isWindow(e))return!1;try{if(e.constructor&&!ce.call(e,"constructor")&&!ce.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(n){return!1}if(!fe.ownFirst)for(t in e)return ce.call(e,t);for(t in e);return void 0===t||ce.call(e,t)},type:function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?ue[le.call(e)]||"object":typeof e},globalEval:function(t){t&&pe.trim(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(ge,"ms-").replace(me,ye)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t){var r,i=0;if(n(e))for(r=e.length;i<r&&t.call(e[i],i,e[i])!==!1;i++);else for(i in e)if(t.call(e[i],i,e[i])===!1)break;return e},trim:function(e){return null==e?"":(e+"").replace(he,"")},makeArray:function(e,t){var r=t||[];return null!=e&&(n(Object(e))?pe.merge(r,"string"==typeof e?[e]:e):ae.call(r,e)),r},inArray:function(e,t,n){var r;if(t){if(se)return se.call(t,e,n);for(r=t.length,n=n?n<0?Math.max(0,r+n):n:0;n<r;n++)if(n in t&&t[n]===e)return n}return-1},merge:function(e,t){for(var n=+t.length,r=0,i=e.length;r<n;)e[i++]=t[r++];if(n!==n)for(;void 0!==t[r];)e[i++]=t[r++];return e.length=i,e},grep:function(e,t,n){for(var r,i=[],o=0,a=e.length,s=!n;o<a;o++)r=!t(e[o],o),r!==s&&i.push(e[o]);return i},map:function(e,t,r){var i,o,a=0,s=[];if(n(e))for(i=e.length;a<i;a++)o=t(e[a],a,r),null!=o&&s.push(o);else for(a in e)o=t(e[a],a,r),null!=o&&s.push(o);return oe.apply([],s)},guid:1,proxy:function(e,t){var n,r,i;if("string"==typeof t&&(i=e[t],t=e,e=i),pe.isFunction(e))return n=ie.call(arguments,2),r=function(){return e.apply(t||this,n.concat(ie.call(arguments)))},r.guid=e.guid=e.guid||pe.guid++,r},now:function(){return+new Date},support:fe}),"function"==typeof Symbol&&(pe.fn[Symbol.iterator]=ne[Symbol.iterator]),pe.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(e,t){ue["[object "+t+"]"]=t.toLowerCase()});var ve=function(e){function t(e,t,n,r){var i,o,a,s,u,l,f,p,h=t&&t.ownerDocument,g=t?t.nodeType:9;if(n=n||[],"string"!=typeof e||!e||1!==g&&9!==g&&11!==g)return n;if(!r&&((t?t.ownerDocument||t:B)!==H&&L(t),t=t||H,_)){if(11!==g&&(l=ye.exec(e)))if(i=l[1]){if(9===g){if(!(a=t.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(h&&(a=h.getElementById(i))&&R(t,a)&&a.id===i)return n.push(a),n}else{if(l[2])return Q.apply(n,t.getElementsByTagName(e)),n;if((i=l[3])&&w.getElementsByClassName&&t.getElementsByClassName)return Q.apply(n,t.getElementsByClassName(i)),n}if(w.qsa&&!X[e+" "]&&(!F||!F.test(e))){if(1!==g)h=t,p=e;else if("object"!==t.nodeName.toLowerCase()){for((s=t.getAttribute("id"))?s=s.replace(xe,"\\$&"):t.setAttribute("id",s=P),f=N(e),o=f.length,u=de.test(s)?"#"+s:"[id='"+s+"']";o--;)f[o]=u+" "+d(f[o]);p=f.join(","),h=ve.test(e)&&c(t.parentNode)||t}if(p)try{return Q.apply(n,h.querySelectorAll(p)),n}catch(m){}finally{s===P&&t.removeAttribute("id")}}}return S(e.replace(se,"$1"),t,n,r)}function n(){function e(n,r){return t.push(n+" ")>T.cacheLength&&delete e[t.shift()],e[n+" "]=r}var t=[];return e}function r(e){return e[P]=!0,e}function i(e){var t=H.createElement("div");try{return!!e(t)}catch(n){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function o(e,t){for(var n=e.split("|"),r=n.length;r--;)T.attrHandle[n[r]]=t}function a(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&(~t.sourceIndex||V)-(~e.sourceIndex||V);if(r)return r;if(n)for(;n=n.nextSibling;)if(n===t)return-1;return e?1:-1}function s(e){return function(t){var n=t.nodeName.toLowerCase();return"input"===n&&t.type===e}}function u(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function l(e){return r(function(t){return t=+t,r(function(n,r){for(var i,o=e([],n.length,t),a=o.length;a--;)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}function c(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}function f(){}function d(e){for(var t=0,n=e.length,r="";t<n;t++)r+=e[t].value;return r}function p(e,t,n){var r=t.dir,i=n&&"parentNode"===r,o=I++;return t.first?function(t,n,o){for(;t=t[r];)if(1===t.nodeType||i)return e(t,n,o)}:function(t,n,a){var s,u,l,c=[W,o];if(a){for(;t=t[r];)if((1===t.nodeType||i)&&e(t,n,a))return!0}else for(;t=t[r];)if(1===t.nodeType||i){if(l=t[P]||(t[P]={}),u=l[t.uniqueID]||(l[t.uniqueID]={}),(s=u[r])&&s[0]===W&&s[1]===o)return c[2]=s[2];if(u[r]=c,c[2]=e(t,n,a))return!0}}}function h(e){return e.length>1?function(t,n,r){for(var i=e.length;i--;)if(!e[i](t,n,r))return!1;return!0}:e[0]}function g(e,n,r){for(var i=0,o=n.length;i<o;i++)t(e,n[i],r);return r}function m(e,t,n,r,i){for(var o,a=[],s=0,u=e.length,l=null!=t;s<u;s++)(o=e[s])&&(n&&!n(o,r,i)||(a.push(o),l&&t.push(s)));return a}function y(e,t,n,i,o,a){return i&&!i[P]&&(i=y(i)),o&&!o[P]&&(o=y(o,a)),r(function(r,a,s,u){var l,c,f,d=[],p=[],h=a.length,y=r||g(t||"*",s.nodeType?[s]:s,[]),v=!e||!r&&t?y:m(y,d,e,s,u),x=n?o||(r?e:h||i)?[]:a:v;if(n&&n(v,x,s,u),i)for(l=m(x,p),i(l,[],s,u),c=l.length;c--;)(f=l[c])&&(x[p[c]]=!(v[p[c]]=f));if(r){if(o||e){if(o){for(l=[],c=x.length;c--;)(f=x[c])&&l.push(v[c]=f);o(null,x=[],l,u)}for(c=x.length;c--;)(f=x[c])&&(l=o?ee(r,f):d[c])>-1&&(r[l]=!(a[l]=f))}}else x=m(x===a?x.splice(h,x.length):x),o?o(null,a,x,u):Q.apply(a,x)})}function v(e){for(var t,n,r,i=e.length,o=T.relative[e[0].type],a=o||T.relative[" "],s=o?1:0,u=p(function(e){return e===t},a,!0),l=p(function(e){return ee(t,e)>-1},a,!0),c=[function(e,n,r){var i=!o&&(r||n!==A)||((t=n).nodeType?u(e,n,r):l(e,n,r));return t=null,i}];s<i;s++)if(n=T.relative[e[s].type])c=[p(h(c),n)];else{if(n=T.filter[e[s].type].apply(null,e[s].matches),n[P]){for(r=++s;r<i&&!T.relative[e[r].type];r++);return y(s>1&&h(c),s>1&&d(e.slice(0,s-1).concat({value:" "===e[s-2].type?"*":""})).replace(se,"$1"),n,s<r&&v(e.slice(s,r)),r<i&&v(e=e.slice(r)),r<i&&d(e))}c.push(n)}return h(c)}function x(e,n){var i=n.length>0,o=e.length>0,a=function(r,a,s,u,l){var c,f,d,p=0,h="0",g=r&&[],y=[],v=A,x=r||o&&T.find.TAG("*",l),b=W+=null==v?1:Math.random()||.1,w=x.length;for(l&&(A=a===H||a||l);h!==w&&null!=(c=x[h]);h++){if(o&&c){for(f=0,a||c.ownerDocument===H||(L(c),s=!_);d=e[f++];)if(d(c,a||H,s)){u.push(c);break}l&&(W=b)}i&&((c=!d&&c)&&p--,r&&g.push(c))}if(p+=h,i&&h!==p){for(f=0;d=n[f++];)d(g,y,a,s);if(r){if(p>0)for(;h--;)g[h]||y[h]||(y[h]=G.call(u));y=m(y)}Q.apply(u,y),l&&!r&&y.length>0&&p+n.length>1&&t.uniqueSort(u)}return l&&(W=b,A=v),g};return i?r(a):a}var b,w,T,C,E,N,k,S,A,D,j,L,H,q,_,F,M,O,R,P="sizzle"+1*new Date,B=e.document,W=0,I=0,$=n(),z=n(),X=n(),U=function(e,t){return e===t&&(j=!0),0},V=1<<31,Y={}.hasOwnProperty,J=[],G=J.pop,K=J.push,Q=J.push,Z=J.slice,ee=function(e,t){for(var n=0,r=e.length;n<r;n++)if(e[n]===t)return n;return-1},te="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",ne="[\\x20\\t\\r\\n\\f]",re="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",ie="\\["+ne+"*("+re+")(?:"+ne+"*([*^$|!~]?=)"+ne+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+re+"))|)"+ne+"*\\]",oe=":("+re+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+ie+")*)|.*)\\)|)",ae=new RegExp(ne+"+","g"),se=new RegExp("^"+ne+"+|((?:^|[^\\\\])(?:\\\\.)*)"+ne+"+$","g"),ue=new RegExp("^"+ne+"*,"+ne+"*"),le=new RegExp("^"+ne+"*([>+~]|"+ne+")"+ne+"*"),ce=new RegExp("="+ne+"*([^\\]'\"]*?)"+ne+"*\\]","g"),fe=new RegExp(oe),de=new RegExp("^"+re+"$"),pe={ID:new RegExp("^#("+re+")"),CLASS:new RegExp("^\\.("+re+")"),TAG:new RegExp("^("+re+"|[*])"),ATTR:new RegExp("^"+ie),PSEUDO:new RegExp("^"+oe),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+ne+"*(even|odd|(([+-]|)(\\d*)n|)"+ne+"*(?:([+-]|)"+ne+"*(\\d+)|))"+ne+"*\\)|)","i"),bool:new RegExp("^(?:"+te+")$","i"),needsContext:new RegExp("^"+ne+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+ne+"*((?:-\\d)?\\d*)"+ne+"*\\)|)(?=[^-]|$)","i")},he=/^(?:input|select|textarea|button)$/i,ge=/^h\d$/i,me=/^[^{]+\{\s*\[native \w/,ye=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ve=/[+~]/,xe=/'|\\/g,be=new RegExp("\\\\([\\da-f]{1,6}"+ne+"?|("+ne+")|.)","ig"),we=function(e,t,n){var r="0x"+t-65536;return r!==r||n?t:r<0?String.fromCharCode(r+65536):String.fromCharCode(r>>10|55296,1023&r|56320)},Te=function(){L()};try{Q.apply(J=Z.call(B.childNodes),B.childNodes),J[B.childNodes.length].nodeType}catch(Ce){Q={apply:J.length?function(e,t){K.apply(e,Z.call(t))}:function(e,t){for(var n=e.length,r=0;e[n++]=t[r++];);e.length=n-1}}}w=t.support={},E=t.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return!!t&&"HTML"!==t.nodeName},L=t.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:B;return r!==H&&9===r.nodeType&&r.documentElement?(H=r,q=H.documentElement,_=!E(H),(n=H.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",Te,!1):n.attachEvent&&n.attachEvent("onunload",Te)),w.attributes=i(function(e){return e.className="i",!e.getAttribute("className")}),w.getElementsByTagName=i(function(e){return e.appendChild(H.createComment("")),!e.getElementsByTagName("*").length}),w.getElementsByClassName=me.test(H.getElementsByClassName),w.getById=i(function(e){return q.appendChild(e).id=P,!H.getElementsByName||!H.getElementsByName(P).length}),w.getById?(T.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&_){var n=t.getElementById(e);return n?[n]:[]}},T.filter.ID=function(e){var t=e.replace(be,we);return function(e){return e.getAttribute("id")===t}}):(delete T.find.ID,T.filter.ID=function(e){var t=e.replace(be,we);return function(e){var n="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return n&&n.value===t}}),T.find.TAG=w.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):w.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){for(;n=o[i++];)1===n.nodeType&&r.push(n);return r}return o},T.find.CLASS=w.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&_)return t.getElementsByClassName(e)},M=[],F=[],(w.qsa=me.test(H.querySelectorAll))&&(i(function(e){q.appendChild(e).innerHTML="<a id='"+P+"'></a><select id='"+P+"-\r\\' msallowcapture=''><option selected=''></option></select>",e.querySelectorAll("[msallowcapture^='']").length&&F.push("[*^$]="+ne+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||F.push("\\["+ne+"*(?:value|"+te+")"),e.querySelectorAll("[id~="+P+"-]").length||F.push("~="),e.querySelectorAll(":checked").length||F.push(":checked"),e.querySelectorAll("a#"+P+"+*").length||F.push(".#.+[+~]")}),i(function(e){var t=H.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&F.push("name"+ne+"*[*^$|!~]?="),e.querySelectorAll(":enabled").length||F.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),F.push(",.*:")})),(w.matchesSelector=me.test(O=q.matches||q.webkitMatchesSelector||q.mozMatchesSelector||q.oMatchesSelector||q.msMatchesSelector))&&i(function(e){w.disconnectedMatch=O.call(e,"div"),O.call(e,"[s!='']:x"),M.push("!=",oe)}),F=F.length&&new RegExp(F.join("|")),M=M.length&&new RegExp(M.join("|")),t=me.test(q.compareDocumentPosition),R=t||me.test(q.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)for(;t=t.parentNode;)if(t===e)return!0;return!1},U=t?function(e,t){if(e===t)return j=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n?n:(n=(e.ownerDocument||e)===(t.ownerDocument||t)?e.compareDocumentPosition(t):1,1&n||!w.sortDetached&&t.compareDocumentPosition(e)===n?e===H||e.ownerDocument===B&&R(B,e)?-1:t===H||t.ownerDocument===B&&R(B,t)?1:D?ee(D,e)-ee(D,t):0:4&n?-1:1)}:function(e,t){if(e===t)return j=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,s=[e],u=[t];if(!i||!o)return e===H?-1:t===H?1:i?-1:o?1:D?ee(D,e)-ee(D,t):0;if(i===o)return a(e,t);for(n=e;n=n.parentNode;)s.unshift(n);for(n=t;n=n.parentNode;)u.unshift(n);for(;s[r]===u[r];)r++;return r?a(s[r],u[r]):s[r]===B?-1:u[r]===B?1:0},H):H},t.matches=function(e,n){return t(e,null,null,n)},t.matchesSelector=function(e,n){if((e.ownerDocument||e)!==H&&L(e),n=n.replace(ce,"='$1']"),w.matchesSelector&&_&&!X[n+" "]&&(!M||!M.test(n))&&(!F||!F.test(n)))try{var r=O.call(e,n);if(r||w.disconnectedMatch||e.document&&11!==e.document.nodeType)return r}catch(i){}return t(n,H,null,[e]).length>0},t.contains=function(e,t){return(e.ownerDocument||e)!==H&&L(e),R(e,t)},t.attr=function(e,t){(e.ownerDocument||e)!==H&&L(e);var n=T.attrHandle[t.toLowerCase()],r=n&&Y.call(T.attrHandle,t.toLowerCase())?n(e,t,!_):void 0;return void 0!==r?r:w.attributes||!_?e.getAttribute(t):(r=e.getAttributeNode(t))&&r.specified?r.value:null},t.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},t.uniqueSort=function(e){var t,n=[],r=0,i=0;if(j=!w.detectDuplicates,D=!w.sortStable&&e.slice(0),e.sort(U),j){for(;t=e[i++];)t===e[i]&&(r=n.push(i));for(;r--;)e.splice(n[r],1)}return D=null,e},C=t.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=C(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r++];)n+=C(t);return n},T=t.selectors={cacheLength:50,createPseudo:r,match:pe,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(be,we),e[3]=(e[3]||e[4]||e[5]||"").replace(be,we),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||t.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&t.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return pe.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&fe.test(n)&&(t=N(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(be,we).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=$[e+" "];return t||(t=new RegExp("(^|"+ne+")"+e+"("+ne+"|$)"))&&$(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(e,n,r){return function(i){var o=t.attr(i,e);return null==o?"!="===n:!n||(o+="","="===n?o===r:"!="===n?o!==r:"^="===n?r&&0===o.indexOf(r):"*="===n?r&&o.indexOf(r)>-1:"$="===n?r&&o.slice(-r.length)===r:"~="===n?(" "+o.replace(ae," ")+" ").indexOf(r)>-1:"|="===n&&(o===r||o.slice(0,r.length+1)===r+"-"))}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,u){var l,c,f,d,p,h,g=o!==a?"nextSibling":"previousSibling",m=t.parentNode,y=s&&t.nodeName.toLowerCase(),v=!u&&!s,x=!1;if(m){if(o){for(;g;){for(d=t;d=d[g];)if(s?d.nodeName.toLowerCase()===y:1===d.nodeType)return!1;h=g="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?m.firstChild:m.lastChild],a&&v){for(d=m,f=d[P]||(d[P]={}),c=f[d.uniqueID]||(f[d.uniqueID]={}),
+l=c[e]||[],p=l[0]===W&&l[1],x=p&&l[2],d=p&&m.childNodes[p];d=++p&&d&&d[g]||(x=p=0)||h.pop();)if(1===d.nodeType&&++x&&d===t){c[e]=[W,p,x];break}}else if(v&&(d=t,f=d[P]||(d[P]={}),c=f[d.uniqueID]||(f[d.uniqueID]={}),l=c[e]||[],p=l[0]===W&&l[1],x=p),x===!1)for(;(d=++p&&d&&d[g]||(x=p=0)||h.pop())&&((s?d.nodeName.toLowerCase()!==y:1!==d.nodeType)||!++x||(v&&(f=d[P]||(d[P]={}),c=f[d.uniqueID]||(f[d.uniqueID]={}),c[e]=[W,x]),d!==t)););return x-=i,x===r||x%r===0&&x/r>=0}}},PSEUDO:function(e,n){var i,o=T.pseudos[e]||T.setFilters[e.toLowerCase()]||t.error("unsupported pseudo: "+e);return o[P]?o(n):o.length>1?(i=[e,e,"",n],T.setFilters.hasOwnProperty(e.toLowerCase())?r(function(e,t){for(var r,i=o(e,n),a=i.length;a--;)r=ee(e,i[a]),e[r]=!(t[r]=i[a])}):function(e){return o(e,0,i)}):o}},pseudos:{not:r(function(e){var t=[],n=[],i=k(e.replace(se,"$1"));return i[P]?r(function(e,t,n,r){for(var o,a=i(e,null,r,[]),s=e.length;s--;)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,r,o){return t[0]=e,i(t,null,o,n),t[0]=null,!n.pop()}}),has:r(function(e){return function(n){return t(e,n).length>0}}),contains:r(function(e){return e=e.replace(be,we),function(t){return(t.textContent||t.innerText||C(t)).indexOf(e)>-1}}),lang:r(function(e){return de.test(e||"")||t.error("unsupported lang: "+e),e=e.replace(be,we).toLowerCase(),function(t){var n;do if(n=_?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang"))return n=n.toLowerCase(),n===e||0===n.indexOf(e+"-");while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===q},focus:function(e){return e===H.activeElement&&(!H.hasFocus||H.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!T.pseudos.empty(e)},header:function(e){return ge.test(e.nodeName)},input:function(e){return he.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:l(function(){return[0]}),last:l(function(e,t){return[t-1]}),eq:l(function(e,t,n){return[n<0?n+t:n]}),even:l(function(e,t){for(var n=0;n<t;n+=2)e.push(n);return e}),odd:l(function(e,t){for(var n=1;n<t;n+=2)e.push(n);return e}),lt:l(function(e,t,n){for(var r=n<0?n+t:n;--r>=0;)e.push(r);return e}),gt:l(function(e,t,n){for(var r=n<0?n+t:n;++r<t;)e.push(r);return e})}},T.pseudos.nth=T.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})T.pseudos[b]=s(b);for(b in{submit:!0,reset:!0})T.pseudos[b]=u(b);return f.prototype=T.filters=T.pseudos,T.setFilters=new f,N=t.tokenize=function(e,n){var r,i,o,a,s,u,l,c=z[e+" "];if(c)return n?0:c.slice(0);for(s=e,u=[],l=T.preFilter;s;){r&&!(i=ue.exec(s))||(i&&(s=s.slice(i[0].length)||s),u.push(o=[])),r=!1,(i=le.exec(s))&&(r=i.shift(),o.push({value:r,type:i[0].replace(se," ")}),s=s.slice(r.length));for(a in T.filter)!(i=pe[a].exec(s))||l[a]&&!(i=l[a](i))||(r=i.shift(),o.push({value:r,type:a,matches:i}),s=s.slice(r.length));if(!r)break}return n?s.length:s?t.error(e):z(e,u).slice(0)},k=t.compile=function(e,t){var n,r=[],i=[],o=X[e+" "];if(!o){for(t||(t=N(e)),n=t.length;n--;)o=v(t[n]),o[P]?r.push(o):i.push(o);o=X(e,x(i,r)),o.selector=e}return o},S=t.select=function(e,t,n,r){var i,o,a,s,u,l="function"==typeof e&&e,f=!r&&N(e=l.selector||e);if(n=n||[],1===f.length){if(o=f[0]=f[0].slice(0),o.length>2&&"ID"===(a=o[0]).type&&w.getById&&9===t.nodeType&&_&&T.relative[o[1].type]){if(t=(T.find.ID(a.matches[0].replace(be,we),t)||[])[0],!t)return n;l&&(t=t.parentNode),e=e.slice(o.shift().value.length)}for(i=pe.needsContext.test(e)?0:o.length;i--&&(a=o[i],!T.relative[s=a.type]);)if((u=T.find[s])&&(r=u(a.matches[0].replace(be,we),ve.test(o[0].type)&&c(t.parentNode)||t))){if(o.splice(i,1),e=r.length&&d(o),!e)return Q.apply(n,r),n;break}}return(l||k(e,f))(r,t,!_,n,!t||ve.test(e)&&c(t.parentNode)||t),n},w.sortStable=P.split("").sort(U).join("")===P,w.detectDuplicates=!!j,L(),w.sortDetached=i(function(e){return 1&e.compareDocumentPosition(H.createElement("div"))}),i(function(e){return e.innerHTML="<a href='#'></a>","#"===e.firstChild.getAttribute("href")})||o("type|href|height|width",function(e,t,n){if(!n)return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),w.attributes&&i(function(e){return e.innerHTML="<input/>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||o("value",function(e,t,n){if(!n&&"input"===e.nodeName.toLowerCase())return e.defaultValue}),i(function(e){return null==e.getAttribute("disabled")})||o(te,function(e,t,n){var r;if(!n)return e[t]===!0?t.toLowerCase():(r=e.getAttributeNode(t))&&r.specified?r.value:null}),t}(e);pe.find=ve,pe.expr=ve.selectors,pe.expr[":"]=pe.expr.pseudos,pe.uniqueSort=pe.unique=ve.uniqueSort,pe.text=ve.getText,pe.isXMLDoc=ve.isXML,pe.contains=ve.contains;var xe=function(e,t,n){for(var r=[],i=void 0!==n;(e=e[t])&&9!==e.nodeType;)if(1===e.nodeType){if(i&&pe(e).is(n))break;r.push(e)}return r},be=function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},we=pe.expr.match.needsContext,Te=/^<([\w-]+)\s*\/?>(?:<\/\1>|)$/,Ce=/^.[^:#\[\.,]*$/;pe.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?pe.find.matchesSelector(r,e)?[r]:[]:pe.find.matches(e,pe.grep(t,function(e){return 1===e.nodeType}))},pe.fn.extend({find:function(e){var t,n=[],r=this,i=r.length;if("string"!=typeof e)return this.pushStack(pe(e).filter(function(){for(t=0;t<i;t++)if(pe.contains(r[t],this))return!0}));for(t=0;t<i;t++)pe.find(e,r[t],n);return n=this.pushStack(i>1?pe.unique(n):n),n.selector=this.selector?this.selector+" "+e:e,n},filter:function(e){return this.pushStack(r(this,e||[],!1))},not:function(e){return this.pushStack(r(this,e||[],!0))},is:function(e){return!!r(this,"string"==typeof e&&we.test(e)?pe(e):e||[],!1).length}});var Ee,Ne=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,ke=pe.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||Ee,"string"==typeof e){if(r="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:Ne.exec(e),!r||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof pe?t[0]:t,pe.merge(this,pe.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:re,!0)),Te.test(r[1])&&pe.isPlainObject(t))for(r in t)pe.isFunction(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}if(i=re.getElementById(r[2]),i&&i.parentNode){if(i.id!==r[2])return Ee.find(e);this.length=1,this[0]=i}return this.context=re,this.selector=e,this}return e.nodeType?(this.context=this[0]=e,this.length=1,this):pe.isFunction(e)?"undefined"!=typeof n.ready?n.ready(e):e(pe):(void 0!==e.selector&&(this.selector=e.selector,this.context=e.context),pe.makeArray(e,this))};ke.prototype=pe.fn,Ee=pe(re);var Se=/^(?:parents|prev(?:Until|All))/,Ae={children:!0,contents:!0,next:!0,prev:!0};pe.fn.extend({has:function(e){var t,n=pe(e,this),r=n.length;return this.filter(function(){for(t=0;t<r;t++)if(pe.contains(this,n[t]))return!0})},closest:function(e,t){for(var n,r=0,i=this.length,o=[],a=we.test(e)||"string"!=typeof e?pe(e,t||this.context):0;r<i;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(n.nodeType<11&&(a?a.index(n)>-1:1===n.nodeType&&pe.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(o.length>1?pe.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?pe.inArray(this[0],pe(e)):pe.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(pe.uniqueSort(pe.merge(this.get(),pe(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),pe.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return xe(e,"parentNode")},parentsUntil:function(e,t,n){return xe(e,"parentNode",n)},next:function(e){return i(e,"nextSibling")},prev:function(e){return i(e,"previousSibling")},nextAll:function(e){return xe(e,"nextSibling")},prevAll:function(e){return xe(e,"previousSibling")},nextUntil:function(e,t,n){return xe(e,"nextSibling",n)},prevUntil:function(e,t,n){return xe(e,"previousSibling",n)},siblings:function(e){return be((e.parentNode||{}).firstChild,e)},children:function(e){return be(e.firstChild)},contents:function(e){return pe.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:pe.merge([],e.childNodes)}},function(e,t){pe.fn[e]=function(n,r){var i=pe.map(this,t,n);return"Until"!==e.slice(-5)&&(r=n),r&&"string"==typeof r&&(i=pe.filter(r,i)),this.length>1&&(Ae[e]||(i=pe.uniqueSort(i)),Se.test(e)&&(i=i.reverse())),this.pushStack(i)}});var De=/\S+/g;pe.Callbacks=function(e){e="string"==typeof e?o(e):pe.extend({},e);var t,n,r,i,a=[],s=[],u=-1,l=function(){for(i=e.once,r=t=!0;s.length;u=-1)for(n=s.shift();++u<a.length;)a[u].apply(n[0],n[1])===!1&&e.stopOnFalse&&(u=a.length,n=!1);e.memory||(n=!1),t=!1,i&&(a=n?[]:"")},c={add:function(){return a&&(n&&!t&&(u=a.length-1,s.push(n)),function r(t){pe.each(t,function(t,n){pe.isFunction(n)?e.unique&&c.has(n)||a.push(n):n&&n.length&&"string"!==pe.type(n)&&r(n)})}(arguments),n&&!t&&l()),this},remove:function(){return pe.each(arguments,function(e,t){for(var n;(n=pe.inArray(t,a,n))>-1;)a.splice(n,1),n<=u&&u--}),this},has:function(e){return e?pe.inArray(e,a)>-1:a.length>0},empty:function(){return a&&(a=[]),this},disable:function(){return i=s=[],a=n="",this},disabled:function(){return!a},lock:function(){return i=!0,n||c.disable(),this},locked:function(){return!!i},fireWith:function(e,n){return i||(n=n||[],n=[e,n.slice?n.slice():n],s.push(n),t||l()),this},fire:function(){return c.fireWith(this,arguments),this},fired:function(){return!!r}};return c},pe.extend({Deferred:function(e){var t=[["resolve","done",pe.Callbacks("once memory"),"resolved"],["reject","fail",pe.Callbacks("once memory"),"rejected"],["notify","progress",pe.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return pe.Deferred(function(n){pe.each(t,function(t,o){var a=pe.isFunction(e[t])&&e[t];i[o[1]](function(){var e=a&&a.apply(this,arguments);e&&pe.isFunction(e.promise)?e.promise().progress(n.notify).done(n.resolve).fail(n.reject):n[o[0]+"With"](this===r?n.promise():this,a?[e]:arguments)})}),e=null}).promise()},promise:function(e){return null!=e?pe.extend(e,r):r}},i={};return r.pipe=r.then,pe.each(t,function(e,o){var a=o[2],s=o[3];r[o[1]]=a.add,s&&a.add(function(){n=s},t[1^e][2].disable,t[2][2].lock),i[o[0]]=function(){return i[o[0]+"With"](this===i?r:this,arguments),this},i[o[0]+"With"]=a.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t,n,r,i=0,o=ie.call(arguments),a=o.length,s=1!==a||e&&pe.isFunction(e.promise)?a:0,u=1===s?e:pe.Deferred(),l=function(e,n,r){return function(i){n[e]=this,r[e]=arguments.length>1?ie.call(arguments):i,r===t?u.notifyWith(n,r):--s||u.resolveWith(n,r)}};if(a>1)for(t=new Array(a),n=new Array(a),r=new Array(a);i<a;i++)o[i]&&pe.isFunction(o[i].promise)?o[i].promise().progress(l(i,n,t)).done(l(i,r,o)).fail(u.reject):--s;return s||u.resolveWith(r,o),u.promise()}});var je;pe.fn.ready=function(e){return pe.ready.promise().done(e),this},pe.extend({isReady:!1,readyWait:1,holdReady:function(e){e?pe.readyWait++:pe.ready(!0)},ready:function(e){(e===!0?--pe.readyWait:pe.isReady)||(pe.isReady=!0,e!==!0&&--pe.readyWait>0||(je.resolveWith(re,[pe]),pe.fn.triggerHandler&&(pe(re).triggerHandler("ready"),pe(re).off("ready"))))}}),pe.ready.promise=function(t){if(!je)if(je=pe.Deferred(),"complete"===re.readyState||"loading"!==re.readyState&&!re.documentElement.doScroll)e.setTimeout(pe.ready);else if(re.addEventListener)re.addEventListener("DOMContentLoaded",s),e.addEventListener("load",s);else{re.attachEvent("onreadystatechange",s),e.attachEvent("onload",s);var n=!1;try{n=null==e.frameElement&&re.documentElement}catch(r){}n&&n.doScroll&&!function i(){if(!pe.isReady){try{n.doScroll("left")}catch(t){return e.setTimeout(i,50)}a(),pe.ready()}}()}return je.promise(t)},pe.ready.promise();var Le;for(Le in pe(fe))break;fe.ownFirst="0"===Le,fe.inlineBlockNeedsLayout=!1,pe(function(){var e,t,n,r;n=re.getElementsByTagName("body")[0],n&&n.style&&(t=re.createElement("div"),r=re.createElement("div"),r.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",n.appendChild(r).appendChild(t),"undefined"!=typeof t.style.zoom&&(t.style.cssText="display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1",fe.inlineBlockNeedsLayout=e=3===t.offsetWidth,e&&(n.style.zoom=1)),n.removeChild(r))}),function(){var e=re.createElement("div");fe.deleteExpando=!0;try{delete e.test}catch(t){fe.deleteExpando=!1}e=null}();var He=function(e){var t=pe.noData[(e.nodeName+" ").toLowerCase()],n=+e.nodeType||1;return(1===n||9===n)&&(!t||t!==!0&&e.getAttribute("classid")===t)},qe=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,_e=/([A-Z])/g;pe.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(e){return e=e.nodeType?pe.cache[e[pe.expando]]:e[pe.expando],!!e&&!l(e)},data:function(e,t,n){return c(e,t,n)},removeData:function(e,t){return f(e,t)},_data:function(e,t,n){return c(e,t,n,!0)},_removeData:function(e,t){return f(e,t,!0)}}),pe.fn.extend({data:function(e,t){var n,r,i,o=this[0],a=o&&o.attributes;if(void 0===e){if(this.length&&(i=pe.data(o),1===o.nodeType&&!pe._data(o,"parsedAttrs"))){for(n=a.length;n--;)a[n]&&(r=a[n].name,0===r.indexOf("data-")&&(r=pe.camelCase(r.slice(5)),u(o,r,i[r])));pe._data(o,"parsedAttrs",!0)}return i}return"object"==typeof e?this.each(function(){pe.data(this,e)}):arguments.length>1?this.each(function(){pe.data(this,e,t)}):o?u(o,e,pe.data(o,e)):void 0},removeData:function(e){return this.each(function(){pe.removeData(this,e)})}}),pe.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=pe._data(e,t),n&&(!r||pe.isArray(n)?r=pe._data(e,t,pe.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=pe.queue(e,t),r=n.length,i=n.shift(),o=pe._queueHooks(e,t),a=function(){pe.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,a,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return pe._data(e,n)||pe._data(e,n,{empty:pe.Callbacks("once memory").add(function(){pe._removeData(e,t+"queue"),pe._removeData(e,n)})})}}),pe.fn.extend({queue:function(e,t){var n=2;return"string"!=typeof e&&(t=e,e="fx",n--),arguments.length<n?pe.queue(this[0],e):void 0===t?this:this.each(function(){var n=pe.queue(this,e,t);pe._queueHooks(this,e),"fx"===e&&"inprogress"!==n[0]&&pe.dequeue(this,e)})},dequeue:function(e){return this.each(function(){pe.dequeue(this,e)})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,t){var n,r=1,i=pe.Deferred(),o=this,a=this.length,s=function(){--r||i.resolveWith(o,[o])};for("string"!=typeof e&&(t=e,e=void 0),e=e||"fx";a--;)n=pe._data(o[a],e+"queueHooks"),n&&n.empty&&(r++,n.empty.add(s));return s(),i.promise(t)}}),function(){var e;fe.shrinkWrapBlocks=function(){if(null!=e)return e;e=!1;var t,n,r;return n=re.getElementsByTagName("body")[0],n&&n.style?(t=re.createElement("div"),r=re.createElement("div"),r.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",n.appendChild(r).appendChild(t),"undefined"!=typeof t.style.zoom&&(t.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:1px;width:1px;zoom:1",t.appendChild(re.createElement("div")).style.width="5px",e=3!==t.offsetWidth),n.removeChild(r),e):void 0}}();var Fe=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,Me=new RegExp("^(?:([+-])=|)("+Fe+")([a-z%]*)$","i"),Oe=["Top","Right","Bottom","Left"],Re=function(e,t){return e=t||e,"none"===pe.css(e,"display")||!pe.contains(e.ownerDocument,e)},Pe=function(e,t,n,r,i,o,a){var s=0,u=e.length,l=null==n;if("object"===pe.type(n)){i=!0;for(s in n)Pe(e,t,s,n[s],!0,o,a)}else if(void 0!==r&&(i=!0,pe.isFunction(r)||(a=!0),l&&(a?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(pe(e),n)})),t))for(;s<u;s++)t(e[s],n,a?r:r.call(e[s],s,t(e[s],n)));return i?e:l?t.call(e):u?t(e[0],n):o},Be=/^(?:checkbox|radio)$/i,We=/<([\w:-]+)/,Ie=/^$|\/(?:java|ecma)script/i,$e=/^\s+/,ze="abbr|article|aside|audio|bdi|canvas|data|datalist|details|dialog|figcaption|figure|footer|header|hgroup|main|mark|meter|nav|output|picture|progress|section|summary|template|time|video";!function(){var e=re.createElement("div"),t=re.createDocumentFragment(),n=re.createElement("input");e.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",fe.leadingWhitespace=3===e.firstChild.nodeType,fe.tbody=!e.getElementsByTagName("tbody").length,fe.htmlSerialize=!!e.getElementsByTagName("link").length,fe.html5Clone="<:nav></:nav>"!==re.createElement("nav").cloneNode(!0).outerHTML,n.type="checkbox",n.checked=!0,t.appendChild(n),fe.appendChecked=n.checked,e.innerHTML="<textarea>x</textarea>",fe.noCloneChecked=!!e.cloneNode(!0).lastChild.defaultValue,t.appendChild(e),n=re.createElement("input"),n.setAttribute("type","radio"),n.setAttribute("checked","checked"),n.setAttribute("name","t"),e.appendChild(n),fe.checkClone=e.cloneNode(!0).cloneNode(!0).lastChild.checked,fe.noCloneEvent=!!e.addEventListener,e[pe.expando]=1,fe.attributes=!e.getAttribute(pe.expando)}();var Xe={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:fe.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]};Xe.optgroup=Xe.option,Xe.tbody=Xe.tfoot=Xe.colgroup=Xe.caption=Xe.thead,Xe.th=Xe.td;var Ue=/<|&#?\w+;/,Ve=/<tbody/i;!function(){var t,n,r=re.createElement("div");for(t in{submit:!0,change:!0,focusin:!0})n="on"+t,(fe[t]=n in e)||(r.setAttribute(n,"t"),fe[t]=r.attributes[n].expando===!1);r=null}();var Ye=/^(?:input|select|textarea)$/i,Je=/^key/,Ge=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,Ke=/^(?:focusinfocus|focusoutblur)$/,Qe=/^([^.]*)(?:\.(.+)|)/;pe.event={global:{},add:function(e,t,n,r,i){var o,a,s,u,l,c,f,d,p,h,g,m=pe._data(e);if(m){for(n.handler&&(u=n,n=u.handler,i=u.selector),n.guid||(n.guid=pe.guid++),(a=m.events)||(a=m.events={}),(c=m.handle)||(c=m.handle=function(e){return"undefined"==typeof pe||e&&pe.event.triggered===e.type?void 0:pe.event.dispatch.apply(c.elem,arguments)},c.elem=e),t=(t||"").match(De)||[""],s=t.length;s--;)o=Qe.exec(t[s])||[],p=g=o[1],h=(o[2]||"").split(".").sort(),p&&(l=pe.event.special[p]||{},p=(i?l.delegateType:l.bindType)||p,l=pe.event.special[p]||{},f=pe.extend({type:p,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&pe.expr.match.needsContext.test(i),namespace:h.join(".")},u),(d=a[p])||(d=a[p]=[],d.delegateCount=0,l.setup&&l.setup.call(e,r,h,c)!==!1||(e.addEventListener?e.addEventListener(p,c,!1):e.attachEvent&&e.attachEvent("on"+p,c))),l.add&&(l.add.call(e,f),f.handler.guid||(f.handler.guid=n.guid)),i?d.splice(d.delegateCount++,0,f):d.push(f),pe.event.global[p]=!0);e=null}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,d,p,h,g,m=pe.hasData(e)&&pe._data(e);if(m&&(c=m.events)){for(t=(t||"").match(De)||[""],l=t.length;l--;)if(s=Qe.exec(t[l])||[],p=g=s[1],h=(s[2]||"").split(".").sort(),p){for(f=pe.event.special[p]||{},p=(r?f.delegateType:f.bindType)||p,d=c[p]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),u=o=d.length;o--;)a=d[o],!i&&g!==a.origType||n&&n.guid!==a.guid||s&&!s.test(a.namespace)||r&&r!==a.selector&&("**"!==r||!a.selector)||(d.splice(o,1),a.selector&&d.delegateCount--,f.remove&&f.remove.call(e,a));u&&!d.length&&(f.teardown&&f.teardown.call(e,h,m.handle)!==!1||pe.removeEvent(e,p,m.handle),delete c[p])}else for(p in c)pe.event.remove(e,p+t[l],n,r,!0);pe.isEmptyObject(c)&&(delete m.handle,pe._removeData(e,"events"))}},trigger:function(t,n,r,i){var o,a,s,u,l,c,f,d=[r||re],p=ce.call(t,"type")?t.type:t,h=ce.call(t,"namespace")?t.namespace.split("."):[];if(s=c=r=r||re,3!==r.nodeType&&8!==r.nodeType&&!Ke.test(p+pe.event.triggered)&&(p.indexOf(".")>-1&&(h=p.split("."),p=h.shift(),h.sort()),a=p.indexOf(":")<0&&"on"+p,t=t[pe.expando]?t:new pe.Event(p,"object"==typeof t&&t),t.isTrigger=i?2:3,t.namespace=h.join("."),t.rnamespace=t.namespace?new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,t.result=void 0,t.target||(t.target=r),n=null==n?[t]:pe.makeArray(n,[t]),l=pe.event.special[p]||{},i||!l.trigger||l.trigger.apply(r,n)!==!1)){if(!i&&!l.noBubble&&!pe.isWindow(r)){for(u=l.delegateType||p,Ke.test(u+p)||(s=s.parentNode);s;s=s.parentNode)d.push(s),c=s;c===(r.ownerDocument||re)&&d.push(c.defaultView||c.parentWindow||e)}for(f=0;(s=d[f++])&&!t.isPropagationStopped();)t.type=f>1?u:l.bindType||p,o=(pe._data(s,"events")||{})[t.type]&&pe._data(s,"handle"),o&&o.apply(s,n),o=a&&s[a],o&&o.apply&&He(s)&&(t.result=o.apply(s,n),t.result===!1&&t.preventDefault());if(t.type=p,!i&&!t.isDefaultPrevented()&&(!l._default||l._default.apply(d.pop(),n)===!1)&&He(r)&&a&&r[p]&&!pe.isWindow(r)){c=r[a],c&&(r[a]=null),pe.event.triggered=p;try{r[p]()}catch(g){}pe.event.triggered=void 0,c&&(r[a]=c)}return t.result}},dispatch:function(e){e=pe.event.fix(e);var t,n,r,i,o,a=[],s=ie.call(arguments),u=(pe._data(this,"events")||{})[e.type]||[],l=pe.event.special[e.type]||{};if(s[0]=e,e.delegateTarget=this,!l.preDispatch||l.preDispatch.call(this,e)!==!1){for(a=pe.event.handlers.call(this,e,u),t=0;(i=a[t++])&&!e.isPropagationStopped();)for(e.currentTarget=i.elem,n=0;(o=i.handlers[n++])&&!e.isImmediatePropagationStopped();)e.rnamespace&&!e.rnamespace.test(o.namespace)||(e.handleObj=o,e.data=o.data,r=((pe.event.special[o.origType]||{}).handle||o.handler).apply(i.elem,s),void 0!==r&&(e.result=r)===!1&&(e.preventDefault(),e.stopPropagation()));return l.postDispatch&&l.postDispatch.call(this,e),e.result}},handlers:function(e,t){var n,r,i,o,a=[],s=t.delegateCount,u=e.target;if(s&&u.nodeType&&("click"!==e.type||isNaN(e.button)||e.button<1))for(;u!=this;u=u.parentNode||this)if(1===u.nodeType&&(u.disabled!==!0||"click"!==e.type)){for(r=[],n=0;n<s;n++)o=t[n],i=o.selector+" ",void 0===r[i]&&(r[i]=o.needsContext?pe(i,this).index(u)>-1:pe.find(i,this,null,[u]).length),r[i]&&r.push(o);r.length&&a.push({elem:u,handlers:r})}return s<t.length&&a.push({elem:this,handlers:t.slice(s)}),a},fix:function(e){if(e[pe.expando])return e;var t,n,r,i=e.type,o=e,a=this.fixHooks[i];for(a||(this.fixHooks[i]=a=Ge.test(i)?this.mouseHooks:Je.test(i)?this.keyHooks:{}),r=a.props?this.props.concat(a.props):this.props,e=new pe.Event(o),t=r.length;t--;)n=r[t],e[n]=o[n];return e.target||(e.target=o.srcElement||re),3===e.target.nodeType&&(e.target=e.target.parentNode),e.metaKey=!!e.metaKey,a.filter?a.filter(e,o):e},props:"altKey bubbles cancelable ctrlKey currentTarget detail.html eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return null==e.which&&(e.which=null!=t.charCode?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,t){var n,r,i,o=t.button,a=t.fromElement;return null==e.pageX&&null!=t.clientX&&(r=e.target.ownerDocument||re,i=r.documentElement,n=r.body,e.pageX=t.clientX+(i&&i.scrollLeft||n&&n.scrollLeft||0)-(i&&i.clientLeft||n&&n.clientLeft||0),e.pageY=t.clientY+(i&&i.scrollTop||n&&n.scrollTop||0)-(i&&i.clientTop||n&&n.clientTop||0)),!e.relatedTarget&&a&&(e.relatedTarget=a===e.target?t.toElement:a),e.which||void 0===o||(e.which=1&o?1:2&o?3:4&o?2:0),e}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==b()&&this.focus)try{return this.focus(),!1}catch(e){}},delegateType:"focusin"},blur:{trigger:function(){if(this===b()&&this.blur)return this.blur(),!1},delegateType:"focusout"},click:{trigger:function(){if(pe.nodeName(this,"input")&&"checkbox"===this.type&&this.click)return this.click(),!1},_default:function(e){return pe.nodeName(e.target,"a")}},beforeunload:{postDispatch:function(e){void 0!==e.result&&e.originalEvent&&(e.originalEvent.returnValue=e.result)}}},simulate:function(e,t,n){var r=pe.extend(new pe.Event,n,{type:e,isSimulated:!0});pe.event.trigger(r,null,t),r.isDefaultPrevented()&&n.preventDefault()}},pe.removeEvent=re.removeEventListener?function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n)}:function(e,t,n){var r="on"+t;e.detachEvent&&("undefined"==typeof e[r]&&(e[r]=null),e.detachEvent(r,n))},pe.Event=function(e,t){return this instanceof pe.Event?(e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||void 0===e.defaultPrevented&&e.returnValue===!1?v:x):this.type=e,t&&pe.extend(this,t),this.timeStamp=e&&e.timeStamp||pe.now(),void(this[pe.expando]=!0)):new pe.Event(e,t)},pe.Event.prototype={constructor:pe.Event,isDefaultPrevented:x,isPropagationStopped:x,isImmediatePropagationStopped:x,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=v,e&&(e.preventDefault?e.preventDefault():e.returnValue=!1)},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=v,e&&!this.isSimulated&&(e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0)},stopImmediatePropagation:function(){var e=this.originalEvent;this.isImmediatePropagationStopped=v,e&&e.stopImmediatePropagation&&e.stopImmediatePropagation(),this.stopPropagation()}},pe.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(e,t){pe.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,o=e.handleObj;return i&&(i===r||pe.contains(r,i))||(e.type=o.origType,n=o.handler.apply(this,arguments),e.type=t),n}}}),fe.submit||(pe.event.special.submit={setup:function(){return!pe.nodeName(this,"form")&&void pe.event.add(this,"click._submit keypress._submit",function(e){var t=e.target,n=pe.nodeName(t,"input")||pe.nodeName(t,"button")?pe.prop(t,"form"):void 0;n&&!pe._data(n,"submit")&&(pe.event.add(n,"submit._submit",function(e){e._submitBubble=!0}),pe._data(n,"submit",!0))})},postDispatch:function(e){e._submitBubble&&(delete e._submitBubble,this.parentNode&&!e.isTrigger&&pe.event.simulate("submit",this.parentNode,e))},teardown:function(){return!pe.nodeName(this,"form")&&void pe.event.remove(this,"._submit")}}),fe.change||(pe.event.special.change={setup:function(){return Ye.test(this.nodeName)?("checkbox"!==this.type&&"radio"!==this.type||(pe.event.add(this,"propertychange._change",function(e){"checked"===e.originalEvent.propertyName&&(this._justChanged=!0)}),pe.event.add(this,"click._change",function(e){this._justChanged&&!e.isTrigger&&(this._justChanged=!1),pe.event.simulate("change",this,e)})),!1):void pe.event.add(this,"beforeactivate._change",function(e){var t=e.target;Ye.test(t.nodeName)&&!pe._data(t,"change")&&(pe.event.add(t,"change._change",function(e){!this.parentNode||e.isSimulated||e.isTrigger||pe.event.simulate("change",this.parentNode,e)}),pe._data(t,"change",!0))})},handle:function(e){var t=e.target;if(this!==t||e.isSimulated||e.isTrigger||"radio"!==t.type&&"checkbox"!==t.type)return e.handleObj.handler.apply(this,arguments)},teardown:function(){return pe.event.remove(this,"._change"),!Ye.test(this.nodeName)}}),fe.focusin||pe.each({focus:"focusin",blur:"focusout"},function(e,t){var n=function(e){pe.event.simulate(t,e.target,pe.event.fix(e))};pe.event.special[t]={setup:function(){var r=this.ownerDocument||this,i=pe._data(r,t);i||r.addEventListener(e,n,!0),pe._data(r,t,(i||0)+1)},teardown:function(){var r=this.ownerDocument||this,i=pe._data(r,t)-1;i?pe._data(r,t,i):(r.removeEventListener(e,n,!0),pe._removeData(r,t))}}}),pe.fn.extend({on:function(e,t,n,r){return w(this,e,t,n,r)},one:function(e,t,n,r){return w(this,e,t,n,r,1)},off:function(e,t,n){var r,i;if(e&&e.preventDefault&&e.handleObj)return r=e.handleObj,pe(e.delegateTarget).off(r.namespace?r.origType+"."+r.namespace:r.origType,r.selector,r.handler),this;if("object"==typeof e){for(i in e)this.off(i,t,e[i]);return this}return t!==!1&&"function"!=typeof t||(n=t,t=void 0),n===!1&&(n=x),this.each(function(){pe.event.remove(this,e,n,t)})},trigger:function(e,t){return this.each(function(){pe.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];if(n)return pe.event.trigger(e,t,n,!0)}});var Ze=/ jQuery\d+="(?:null|\d+)"/g,et=new RegExp("<(?:"+ze+")[\\s/>]","i"),tt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi,nt=/<script|<style|<link/i,rt=/checked\s*(?:[^=]|=\s*.checked.)/i,it=/^true\/(.*)/,ot=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,at=p(re),st=at.appendChild(re.createElement("div"));pe.extend({htmlPrefilter:function(e){return e.replace(tt,"<$1></$2>")},clone:function(e,t,n){var r,i,o,a,s,u=pe.contains(e.ownerDocument,e);if(fe.html5Clone||pe.isXMLDoc(e)||!et.test("<"+e.nodeName+">")?o=e.cloneNode(!0):(st.innerHTML=e.outerHTML,st.removeChild(o=st.firstChild)),!(fe.noCloneEvent&&fe.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||pe.isXMLDoc(e)))for(r=h(o),s=h(e),a=0;null!=(i=s[a]);++a)r[a]&&k(i,r[a]);if(t)if(n)for(s=s||h(e),r=r||h(o),a=0;null!=(i=s[a]);a++)N(i,r[a]);else N(e,o);return r=h(o,"script"),r.length>0&&g(r,!u&&h(e,"script")),r=s=i=null,o},cleanData:function(e,t){for(var n,r,i,o,a=0,s=pe.expando,u=pe.cache,l=fe.attributes,c=pe.event.special;null!=(n=e[a]);a++)if((t||He(n))&&(i=n[s],o=i&&u[i])){if(o.events)for(r in o.events)c[r]?pe.event.remove(n,r):pe.removeEvent(n,r,o.handle);u[i]&&(delete u[i],l||"undefined"==typeof n.removeAttribute?n[s]=void 0:n.removeAttribute(s),ne.push(i))}}}),pe.fn.extend({domManip:S,detach:function(e){return A(this,e,!0)},remove:function(e){return A(this,e)},text:function(e){return Pe(this,function(e){return void 0===e?pe.text(this):this.empty().append((this[0]&&this[0].ownerDocument||re).createTextNode(e))},null,e,arguments.length)},append:function(){return S(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=T(this,e);t.appendChild(e)}})},prepend:function(){return S(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=T(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return S(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return S(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},empty:function(){for(var e,t=0;null!=(e=this[t]);t++){for(1===e.nodeType&&pe.cleanData(h(e,!1));e.firstChild;)e.removeChild(e.firstChild);e.options&&pe.nodeName(e,"select")&&(e.options.length=0)}return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map(function(){return pe.clone(this,e,t)})},html:function(e){return Pe(this,function(e){var t=this[0]||{},n=0,r=this.length;if(void 0===e)return 1===t.nodeType?t.innerHTML.replace(Ze,""):void 0;if("string"==typeof e&&!nt.test(e)&&(fe.htmlSerialize||!et.test(e))&&(fe.leadingWhitespace||!$e.test(e))&&!Xe[(We.exec(e)||["",""])[1].toLowerCase()]){e=pe.htmlPrefilter(e);try{for(;n<r;n++)t=this[n]||{},1===t.nodeType&&(pe.cleanData(h(t,!1)),t.innerHTML=e);t=0}catch(i){}}t&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var e=[];return S(this,arguments,function(t){var n=this.parentNode;pe.inArray(this,e)<0&&(pe.cleanData(h(this)),
+n&&n.replaceChild(t,this))},e)}}),pe.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){pe.fn[e]=function(e){for(var n,r=0,i=[],o=pe(e),a=o.length-1;r<=a;r++)n=r===a?this:this.clone(!0),pe(o[r])[t](n),ae.apply(i,n.get());return this.pushStack(i)}});var ut,lt={HTML:"block",BODY:"block"},ct=/^margin/,ft=new RegExp("^("+Fe+")(?!px)[a-z%]+$","i"),dt=function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];i=n.apply(e,r||[]);for(o in t)e.style[o]=a[o];return i},pt=re.documentElement;!function(){function t(){var t,c,f=re.documentElement;f.appendChild(u),l.style.cssText="-webkit-box-sizing:border-box;box-sizing:border-box;position:relative;display:block;margin:auto;border:1px;padding:1px;top:1%;width:50%",n=i=s=!1,r=a=!0,e.getComputedStyle&&(c=e.getComputedStyle(l),n="1%"!==(c||{}).top,s="2px"===(c||{}).marginLeft,i="4px"===(c||{width:"4px"}).width,l.style.marginRight="50%",r="4px"===(c||{marginRight:"4px"}).marginRight,t=l.appendChild(re.createElement("div")),t.style.cssText=l.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:0",t.style.marginRight=t.style.width="0",l.style.width="1px",a=!parseFloat((e.getComputedStyle(t)||{}).marginRight),l.removeChild(t)),l.style.display="none",o=0===l.getClientRects().length,o&&(l.style.display="",l.innerHTML="<table><tr><td></td><td>t</td></tr></table>",t=l.getElementsByTagName("td"),t[0].style.cssText="margin:0;border:0;padding:0;display:none",o=0===t[0].offsetHeight,o&&(t[0].style.display="",t[1].style.display="none",o=0===t[0].offsetHeight)),f.removeChild(u)}var n,r,i,o,a,s,u=re.createElement("div"),l=re.createElement("div");l.style&&(l.style.cssText="float:left;opacity:.5",fe.opacity="0.5"===l.style.opacity,fe.cssFloat=!!l.style.cssFloat,l.style.backgroundClip="content-box",l.cloneNode(!0).style.backgroundClip="",fe.clearCloneStyle="content-box"===l.style.backgroundClip,u=re.createElement("div"),u.style.cssText="border:0;width:8px;height:0;top:0;left:-9999px;padding:0;margin-top:1px;position:absolute",l.innerHTML="",u.appendChild(l),fe.boxSizing=""===l.style.boxSizing||""===l.style.MozBoxSizing||""===l.style.WebkitBoxSizing,pe.extend(fe,{reliableHiddenOffsets:function(){return null==n&&t(),o},boxSizingReliable:function(){return null==n&&t(),i},pixelMarginRight:function(){return null==n&&t(),r},pixelPosition:function(){return null==n&&t(),n},reliableMarginRight:function(){return null==n&&t(),a},reliableMarginLeft:function(){return null==n&&t(),s}}))}();var ht,gt,mt=/^(top|right|bottom|left)$/;e.getComputedStyle?(ht=function(t){var n=t.ownerDocument.defaultView;return n&&n.opener||(n=e),n.getComputedStyle(t)},gt=function(e,t,n){var r,i,o,a,s=e.style;return n=n||ht(e),a=n?n.getPropertyValue(t)||n[t]:void 0,""!==a&&void 0!==a||pe.contains(e.ownerDocument,e)||(a=pe.style(e,t)),n&&!fe.pixelMarginRight()&&ft.test(a)&&ct.test(t)&&(r=s.width,i=s.minWidth,o=s.maxWidth,s.minWidth=s.maxWidth=s.width=a,a=n.width,s.width=r,s.minWidth=i,s.maxWidth=o),void 0===a?a:a+""}):pt.currentStyle&&(ht=function(e){return e.currentStyle},gt=function(e,t,n){var r,i,o,a,s=e.style;return n=n||ht(e),a=n?n[t]:void 0,null==a&&s&&s[t]&&(a=s[t]),ft.test(a)&&!mt.test(t)&&(r=s.left,i=e.runtimeStyle,o=i&&i.left,o&&(i.left=e.currentStyle.left),s.left="fontSize"===t?"1em":a,a=s.pixelLeft+"px",s.left=r,o&&(i.left=o)),void 0===a?a:a+""||"auto"});var yt=/alpha\([^)]*\)/i,vt=/opacity\s*=\s*([^)]*)/i,xt=/^(none|table(?!-c[ea]).+)/,bt=new RegExp("^("+Fe+")(.*)$","i"),wt={position:"absolute",visibility:"hidden",display:"block"},Tt={letterSpacing:"0",fontWeight:"400"},Ct=["Webkit","O","Moz","ms"],Et=re.createElement("div").style;pe.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=gt(e,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":fe.cssFloat?"cssFloat":"styleFloat"},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,a,s=pe.camelCase(t),u=e.style;if(t=pe.cssProps[s]||(pe.cssProps[s]=H(s)||s),a=pe.cssHooks[t]||pe.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(e,!1,r))?i:u[t];if(o=typeof n,"string"===o&&(i=Me.exec(n))&&i[1]&&(n=d(e,t,i),o="number"),null!=n&&n===n&&("number"===o&&(n+=i&&i[3]||(pe.cssNumber[s]?"":"px")),fe.clearCloneStyle||""!==n||0!==t.indexOf("background")||(u[t]="inherit"),!(a&&"set"in a&&void 0===(n=a.set(e,n,r)))))try{u[t]=n}catch(l){}}},css:function(e,t,n,r){var i,o,a,s=pe.camelCase(t);return t=pe.cssProps[s]||(pe.cssProps[s]=H(s)||s),a=pe.cssHooks[t]||pe.cssHooks[s],a&&"get"in a&&(o=a.get(e,!0,n)),void 0===o&&(o=gt(e,t,r)),"normal"===o&&t in Tt&&(o=Tt[t]),""===n||n?(i=parseFloat(o),n===!0||isFinite(i)?i||0:o):o}}),pe.each(["height","width"],function(e,t){pe.cssHooks[t]={get:function(e,n,r){if(n)return xt.test(pe.css(e,"display"))&&0===e.offsetWidth?dt(e,wt,function(){return M(e,t,r)}):M(e,t,r)},set:function(e,n,r){var i=r&&ht(e);return _(e,n,r?F(e,t,r,fe.boxSizing&&"border-box"===pe.css(e,"boxSizing",!1,i),i):0)}}}),fe.opacity||(pe.cssHooks.opacity={get:function(e,t){return vt.test((t&&e.currentStyle?e.currentStyle.filter:e.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":t?"1":""},set:function(e,t){var n=e.style,r=e.currentStyle,i=pe.isNumeric(t)?"alpha(opacity="+100*t+")":"",o=r&&r.filter||n.filter||"";n.zoom=1,(t>=1||""===t)&&""===pe.trim(o.replace(yt,""))&&n.removeAttribute&&(n.removeAttribute("filter"),""===t||r&&!r.filter)||(n.filter=yt.test(o)?o.replace(yt,i):o+" "+i)}}),pe.cssHooks.marginRight=L(fe.reliableMarginRight,function(e,t){if(t)return dt(e,{display:"inline-block"},gt,[e,"marginRight"])}),pe.cssHooks.marginLeft=L(fe.reliableMarginLeft,function(e,t){if(t)return(parseFloat(gt(e,"marginLeft"))||(pe.contains(e.ownerDocument,e)?e.getBoundingClientRect().left-dt(e,{marginLeft:0},function(){return e.getBoundingClientRect().left}):0))+"px"}),pe.each({margin:"",padding:"",border:"Width"},function(e,t){pe.cssHooks[e+t]={expand:function(n){for(var r=0,i={},o="string"==typeof n?n.split(" "):[n];r<4;r++)i[e+Oe[r]+t]=o[r]||o[r-2]||o[0];return i}},ct.test(e)||(pe.cssHooks[e+t].set=_)}),pe.fn.extend({css:function(e,t){return Pe(this,function(e,t,n){var r,i,o={},a=0;if(pe.isArray(t)){for(r=ht(e),i=t.length;a<i;a++)o[t[a]]=pe.css(e,t[a],!1,r);return o}return void 0!==n?pe.style(e,t,n):pe.css(e,t)},e,t,arguments.length>1)},show:function(){return q(this,!0)},hide:function(){return q(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){Re(this)?pe(this).show():pe(this).hide()})}}),pe.Tween=O,O.prototype={constructor:O,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||pe.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(pe.cssNumber[n]?"":"px")},cur:function(){var e=O.propHooks[this.prop];return e&&e.get?e.get(this):O.propHooks._default.get(this)},run:function(e){var t,n=O.propHooks[this.prop];return this.options.duration?this.pos=t=pe.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):O.propHooks._default.set(this),this}},O.prototype.init.prototype=O.prototype,O.propHooks={_default:{get:function(e){var t;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(t=pe.css(e.elem,e.prop,""),t&&"auto"!==t?t:0)},set:function(e){pe.fx.step[e.prop]?pe.fx.step[e.prop](e):1!==e.elem.nodeType||null==e.elem.style[pe.cssProps[e.prop]]&&!pe.cssHooks[e.prop]?e.elem[e.prop]=e.now:pe.style(e.elem,e.prop,e.now+e.unit)}}},O.propHooks.scrollTop=O.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},pe.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},pe.fx=O.prototype.init,pe.fx.step={};var Nt,kt,St=/^(?:toggle|show|hide)$/,At=/queueHooks$/;pe.Animation=pe.extend($,{tweeners:{"*":[function(e,t){var n=this.createTween(e,t);return d(n.elem,e,Me.exec(t),n),n}]},tweener:function(e,t){pe.isFunction(e)?(t=e,e=["*"]):e=e.match(De);for(var n,r=0,i=e.length;r<i;r++)n=e[r],$.tweeners[n]=$.tweeners[n]||[],$.tweeners[n].unshift(t)},prefilters:[W],prefilter:function(e,t){t?$.prefilters.unshift(e):$.prefilters.push(e)}}),pe.speed=function(e,t,n){var r=e&&"object"==typeof e?pe.extend({},e):{complete:n||!n&&t||pe.isFunction(e)&&e,duration:e,easing:n&&t||t&&!pe.isFunction(t)&&t};return r.duration=pe.fx.off?0:"number"==typeof r.duration?r.duration:r.duration in pe.fx.speeds?pe.fx.speeds[r.duration]:pe.fx.speeds._default,null!=r.queue&&r.queue!==!0||(r.queue="fx"),r.old=r.complete,r.complete=function(){pe.isFunction(r.old)&&r.old.call(this),r.queue&&pe.dequeue(this,r.queue)},r},pe.fn.extend({fadeTo:function(e,t,n,r){return this.filter(Re).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(e,t,n,r){var i=pe.isEmptyObject(e),o=pe.speed(t,n,r),a=function(){var t=$(this,pe.extend({},e),o);(i||pe._data(this,"finish"))&&t.stop(!0)};return a.finish=a,i||o.queue===!1?this.each(a):this.queue(o.queue,a)},stop:function(e,t,n){var r=function(e){var t=e.stop;delete e.stop,t(n)};return"string"!=typeof e&&(n=t,t=e,e=void 0),t&&e!==!1&&this.queue(e||"fx",[]),this.each(function(){var t=!0,i=null!=e&&e+"queueHooks",o=pe.timers,a=pe._data(this);if(i)a[i]&&a[i].stop&&r(a[i]);else for(i in a)a[i]&&a[i].stop&&At.test(i)&&r(a[i]);for(i=o.length;i--;)o[i].elem!==this||null!=e&&o[i].queue!==e||(o[i].anim.stop(n),t=!1,o.splice(i,1));!t&&n||pe.dequeue(this,e)})},finish:function(e){return e!==!1&&(e=e||"fx"),this.each(function(){var t,n=pe._data(this),r=n[e+"queue"],i=n[e+"queueHooks"],o=pe.timers,a=r?r.length:0;for(n.finish=!0,pe.queue(this,e,[]),i&&i.stop&&i.stop.call(this,!0),t=o.length;t--;)o[t].elem===this&&o[t].queue===e&&(o[t].anim.stop(!0),o.splice(t,1));for(t=0;t<a;t++)r[t]&&r[t].finish&&r[t].finish.call(this);delete n.finish})}}),pe.each(["toggle","show","hide"],function(e,t){var n=pe.fn[t];pe.fn[t]=function(e,r,i){return null==e||"boolean"==typeof e?n.apply(this,arguments):this.animate(P(t,!0),e,r,i)}}),pe.each({slideDown:P("show"),slideUp:P("hide"),slideToggle:P("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,t){pe.fn[e]=function(e,n,r){return this.animate(t,e,n,r)}}),pe.timers=[],pe.fx.tick=function(){var e,t=pe.timers,n=0;for(Nt=pe.now();n<t.length;n++)e=t[n],e()||t[n]!==e||t.splice(n--,1);t.length||pe.fx.stop(),Nt=void 0},pe.fx.timer=function(e){pe.timers.push(e),e()?pe.fx.start():pe.timers.pop()},pe.fx.interval=13,pe.fx.start=function(){kt||(kt=e.setInterval(pe.fx.tick,pe.fx.interval))},pe.fx.stop=function(){e.clearInterval(kt),kt=null},pe.fx.speeds={slow:600,fast:200,_default:400},pe.fn.delay=function(t,n){return t=pe.fx?pe.fx.speeds[t]||t:t,n=n||"fx",this.queue(n,function(n,r){var i=e.setTimeout(n,t);r.stop=function(){e.clearTimeout(i)}})},function(){var e,t=re.createElement("input"),n=re.createElement("div"),r=re.createElement("select"),i=r.appendChild(re.createElement("option"));n=re.createElement("div"),n.setAttribute("className","t"),n.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",e=n.getElementsByTagName("a")[0],t.setAttribute("type","checkbox"),n.appendChild(t),e=n.getElementsByTagName("a")[0],e.style.cssText="top:1px",fe.getSetAttribute="t"!==n.className,fe.style=/top/.test(e.getAttribute("style")),fe.hrefNormalized="/a"===e.getAttribute("href"),fe.checkOn=!!t.value,fe.optSelected=i.selected,fe.enctype=!!re.createElement("form").enctype,r.disabled=!0,fe.optDisabled=!i.disabled,t=re.createElement("input"),t.setAttribute("value",""),fe.input=""===t.getAttribute("value"),t.value="t",t.setAttribute("type","radio"),fe.radioValue="t"===t.value}();var Dt=/\r/g,jt=/[\x20\t\r\n\f]+/g;pe.fn.extend({val:function(e){var t,n,r,i=this[0];{if(arguments.length)return r=pe.isFunction(e),this.each(function(n){var i;1===this.nodeType&&(i=r?e.call(this,n,pe(this).val()):e,null==i?i="":"number"==typeof i?i+="":pe.isArray(i)&&(i=pe.map(i,function(e){return null==e?"":e+""})),t=pe.valHooks[this.type]||pe.valHooks[this.nodeName.toLowerCase()],t&&"set"in t&&void 0!==t.set(this,i,"value")||(this.value=i))});if(i)return t=pe.valHooks[i.type]||pe.valHooks[i.nodeName.toLowerCase()],t&&"get"in t&&void 0!==(n=t.get(i,"value"))?n:(n=i.value,"string"==typeof n?n.replace(Dt,""):null==n?"":n)}}}),pe.extend({valHooks:{option:{get:function(e){var t=pe.find.attr(e,"value");return null!=t?t:pe.trim(pe.text(e)).replace(jt," ")}},select:{get:function(e){for(var t,n,r=e.options,i=e.selectedIndex,o="select-one"===e.type||i<0,a=o?null:[],s=o?i+1:r.length,u=i<0?s:o?i:0;u<s;u++)if(n=r[u],(n.selected||u===i)&&(fe.optDisabled?!n.disabled:null===n.getAttribute("disabled"))&&(!n.parentNode.disabled||!pe.nodeName(n.parentNode,"optgroup"))){if(t=pe(n).val(),o)return t;a.push(t)}return a},set:function(e,t){for(var n,r,i=e.options,o=pe.makeArray(t),a=i.length;a--;)if(r=i[a],pe.inArray(pe.valHooks.option.get(r),o)>-1)try{r.selected=n=!0}catch(s){r.scrollHeight}else r.selected=!1;return n||(e.selectedIndex=-1),i}}}}),pe.each(["radio","checkbox"],function(){pe.valHooks[this]={set:function(e,t){if(pe.isArray(t))return e.checked=pe.inArray(pe(e).val(),t)>-1}},fe.checkOn||(pe.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})});var Lt,Ht,qt=pe.expr.attrHandle,_t=/^(?:checked|selected)$/i,Ft=fe.getSetAttribute,Mt=fe.input;pe.fn.extend({attr:function(e,t){return Pe(this,pe.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){pe.removeAttr(this,e)})}}),pe.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return"undefined"==typeof e.getAttribute?pe.prop(e,t,n):(1===o&&pe.isXMLDoc(e)||(t=t.toLowerCase(),i=pe.attrHooks[t]||(pe.expr.match.bool.test(t)?Ht:Lt)),void 0!==n?null===n?void pe.removeAttr(e,t):i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:(e.setAttribute(t,n+""),n):i&&"get"in i&&null!==(r=i.get(e,t))?r:(r=pe.find.attr(e,t),null==r?void 0:r))},attrHooks:{type:{set:function(e,t){if(!fe.radioValue&&"radio"===t&&pe.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,r,i=0,o=t&&t.match(De);if(o&&1===e.nodeType)for(;n=o[i++];)r=pe.propFix[n]||n,pe.expr.match.bool.test(n)?Mt&&Ft||!_t.test(n)?e[r]=!1:e[pe.camelCase("default-"+n)]=e[r]=!1:pe.attr(e,n,""),e.removeAttribute(Ft?n:r)}}),Ht={set:function(e,t,n){return t===!1?pe.removeAttr(e,n):Mt&&Ft||!_t.test(n)?e.setAttribute(!Ft&&pe.propFix[n]||n,n):e[pe.camelCase("default-"+n)]=e[n]=!0,n}},pe.each(pe.expr.match.bool.source.match(/\w+/g),function(e,t){var n=qt[t]||pe.find.attr;Mt&&Ft||!_t.test(t)?qt[t]=function(e,t,r){var i,o;return r||(o=qt[t],qt[t]=i,i=null!=n(e,t,r)?t.toLowerCase():null,qt[t]=o),i}:qt[t]=function(e,t,n){if(!n)return e[pe.camelCase("default-"+t)]?t.toLowerCase():null}}),Mt&&Ft||(pe.attrHooks.value={set:function(e,t,n){return pe.nodeName(e,"input")?void(e.defaultValue=t):Lt&&Lt.set(e,t,n)}}),Ft||(Lt={set:function(e,t,n){var r=e.getAttributeNode(n);if(r||e.setAttributeNode(r=e.ownerDocument.createAttribute(n)),r.value=t+="","value"===n||t===e.getAttribute(n))return t}},qt.id=qt.name=qt.coords=function(e,t,n){var r;if(!n)return(r=e.getAttributeNode(t))&&""!==r.value?r.value:null},pe.valHooks.button={get:function(e,t){var n=e.getAttributeNode(t);if(n&&n.specified)return n.value},set:Lt.set},pe.attrHooks.contenteditable={set:function(e,t,n){Lt.set(e,""!==t&&t,n)}},pe.each(["width","height"],function(e,t){pe.attrHooks[t]={set:function(e,n){if(""===n)return e.setAttribute(t,"auto"),n}}})),fe.style||(pe.attrHooks.style={get:function(e){return e.style.cssText||void 0},set:function(e,t){return e.style.cssText=t+""}});var Ot=/^(?:input|select|textarea|button|object)$/i,Rt=/^(?:a|area)$/i;pe.fn.extend({prop:function(e,t){return Pe(this,pe.prop,e,t,arguments.length>1)},removeProp:function(e){return e=pe.propFix[e]||e,this.each(function(){try{this[e]=void 0,delete this[e]}catch(t){}})}}),pe.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&pe.isXMLDoc(e)||(t=pe.propFix[t]||t,i=pe.propHooks[t]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=pe.find.attr(e,"tabindex");return t?parseInt(t,10):Ot.test(e.nodeName)||Rt.test(e.nodeName)&&e.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),fe.hrefNormalized||pe.each(["href","src"],function(e,t){pe.propHooks[t]={get:function(e){return e.getAttribute(t,4)}}}),fe.optSelected||(pe.propHooks.selected={get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),pe.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){pe.propFix[this.toLowerCase()]=this}),fe.enctype||(pe.propFix.enctype="encoding");var Pt=/[\t\r\n\f]/g;pe.fn.extend({addClass:function(e){var t,n,r,i,o,a,s,u=0;if(pe.isFunction(e))return this.each(function(t){pe(this).addClass(e.call(this,t,z(this)))});if("string"==typeof e&&e)for(t=e.match(De)||[];n=this[u++];)if(i=z(n),r=1===n.nodeType&&(" "+i+" ").replace(Pt," ")){for(a=0;o=t[a++];)r.indexOf(" "+o+" ")<0&&(r+=o+" ");s=pe.trim(r),i!==s&&pe.attr(n,"class",s)}return this},removeClass:function(e){var t,n,r,i,o,a,s,u=0;if(pe.isFunction(e))return this.each(function(t){pe(this).removeClass(e.call(this,t,z(this)))});if(!arguments.length)return this.attr("class","");if("string"==typeof e&&e)for(t=e.match(De)||[];n=this[u++];)if(i=z(n),r=1===n.nodeType&&(" "+i+" ").replace(Pt," ")){for(a=0;o=t[a++];)for(;r.indexOf(" "+o+" ")>-1;)r=r.replace(" "+o+" "," ");s=pe.trim(r),i!==s&&pe.attr(n,"class",s)}return this},toggleClass:function(e,t){var n=typeof e;return"boolean"==typeof t&&"string"===n?t?this.addClass(e):this.removeClass(e):pe.isFunction(e)?this.each(function(n){pe(this).toggleClass(e.call(this,n,z(this),t),t)}):this.each(function(){var t,r,i,o;if("string"===n)for(r=0,i=pe(this),o=e.match(De)||[];t=o[r++];)i.hasClass(t)?i.removeClass(t):i.addClass(t);else void 0!==e&&"boolean"!==n||(t=z(this),t&&pe._data(this,"__className__",t),pe.attr(this,"class",t||e===!1?"":pe._data(this,"__className__")||""))})},hasClass:function(e){var t,n,r=0;for(t=" "+e+" ";n=this[r++];)if(1===n.nodeType&&(" "+z(n)+" ").replace(Pt," ").indexOf(t)>-1)return!0;return!1}}),pe.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(e,t){pe.fn[t]=function(e,n){return arguments.length>0?this.on(t,null,e,n):this.trigger(t)}}),pe.fn.extend({hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}});var Bt=e.location,Wt=pe.now(),It=/\?/,$t=/(,)|(\[|{)|(}|])|"(?:[^"\\\r\n]|\\["\\\/bfnrt]|\\u[\da-fA-F]{4})*"\s*:?|true|false|null|-?(?!0\d)\d+(?:\.\d+|)(?:[eE][+-]?\d+|)/g;pe.parseJSON=function(t){if(e.JSON&&e.JSON.parse)return e.JSON.parse(t+"");var n,r=null,i=pe.trim(t+"");return i&&!pe.trim(i.replace($t,function(e,t,i,o){return n&&t&&(r=0),0===r?e:(n=i||t,r+=!o-!i,"")}))?Function("return "+i)():pe.error("Invalid JSON: "+t)},pe.parseXML=function(t){var n,r;if(!t||"string"!=typeof t)return null;try{e.DOMParser?(r=new e.DOMParser,n=r.parseFromString(t,"text/xml")):(n=new e.ActiveXObject("Microsoft.XMLDOM"),n.async="false",n.loadXML(t))}catch(i){n=void 0}return n&&n.documentElement&&!n.getElementsByTagName("parsererror").length||pe.error("Invalid XML: "+t),n};var zt=/#.*$/,Xt=/([?&])_=[^&]*/,Ut=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Vt=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Yt=/^(?:GET|HEAD)$/,Jt=/^\/\//,Gt=/^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,Kt={},Qt={},Zt="*/".concat("*"),en=Bt.href,tn=Gt.exec(en.toLowerCase())||[];pe.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:en,type:"GET",isLocal:Vt.test(tn[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Zt,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":pe.parseJSON,"text xml":pe.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?V(V(e,pe.ajaxSettings),t):V(pe.ajaxSettings,e)},ajaxPrefilter:X(Kt),ajaxTransport:X(Qt),ajax:function(t,n){function r(t,n,r,i){var o,f,v,x,w,C=n;2!==b&&(b=2,u&&e.clearTimeout(u),c=void 0,s=i||"",T.readyState=t>0?4:0,o=t>=200&&t<300||304===t,r&&(x=Y(d,T,r)),x=J(d,x,T,o),o?(d.ifModified&&(w=T.getResponseHeader("Last-Modified"),w&&(pe.lastModified[a]=w),w=T.getResponseHeader("etag"),w&&(pe.etag[a]=w)),204===t||"HEAD"===d.type?C="nocontent":304===t?C="notmodified":(C=x.state,f=x.data,v=x.error,o=!v)):(v=C,!t&&C||(C="error",t<0&&(t=0))),T.status=t,T.statusText=(n||C)+"",o?g.resolveWith(p,[f,C,T]):g.rejectWith(p,[T,C,v]),T.statusCode(y),y=void 0,l&&h.trigger(o?"ajaxSuccess":"ajaxError",[T,d,o?f:v]),m.fireWith(p,[T,C]),l&&(h.trigger("ajaxComplete",[T,d]),--pe.active||pe.event.trigger("ajaxStop")))}"object"==typeof t&&(n=t,t=void 0),n=n||{};var i,o,a,s,u,l,c,f,d=pe.ajaxSetup({},n),p=d.context||d,h=d.context&&(p.nodeType||p.jquery)?pe(p):pe.event,g=pe.Deferred(),m=pe.Callbacks("once memory"),y=d.statusCode||{},v={},x={},b=0,w="canceled",T={readyState:0,getResponseHeader:function(e){var t;if(2===b){if(!f)for(f={};t=Ut.exec(s);)f[t[1].toLowerCase()]=t[2];t=f[e.toLowerCase()]}return null==t?null:t},getAllResponseHeaders:function(){return 2===b?s:null},setRequestHeader:function(e,t){var n=e.toLowerCase();return b||(e=x[n]=x[n]||e,v[e]=t),this},overrideMimeType:function(e){return b||(d.mimeType=e),this},statusCode:function(e){var t;if(e)if(b<2)for(t in e)y[t]=[y[t],e[t]];else T.always(e[T.status]);return this},abort:function(e){var t=e||w;return c&&c.abort(t),r(0,t),this}};if(g.promise(T).complete=m.add,T.success=T.done,T.error=T.fail,d.url=((t||d.url||en)+"").replace(zt,"").replace(Jt,tn[1]+"//"),d.type=n.method||n.type||d.method||d.type,d.dataTypes=pe.trim(d.dataType||"*").toLowerCase().match(De)||[""],null==d.crossDomain&&(i=Gt.exec(d.url.toLowerCase()),d.crossDomain=!(!i||i[1]===tn[1]&&i[2]===tn[2]&&(i[3]||("http:"===i[1]?"80":"443"))===(tn[3]||("http:"===tn[1]?"80":"443")))),d.data&&d.processData&&"string"!=typeof d.data&&(d.data=pe.param(d.data,d.traditional)),U(Kt,d,n,T),2===b)return T;l=pe.event&&d.global,l&&0===pe.active++&&pe.event.trigger("ajaxStart"),d.type=d.type.toUpperCase(),d.hasContent=!Yt.test(d.type),a=d.url,d.hasContent||(d.data&&(a=d.url+=(It.test(a)?"&":"?")+d.data,delete d.data),d.cache===!1&&(d.url=Xt.test(a)?a.replace(Xt,"$1_="+Wt++):a+(It.test(a)?"&":"?")+"_="+Wt++)),d.ifModified&&(pe.lastModified[a]&&T.setRequestHeader("If-Modified-Since",pe.lastModified[a]),pe.etag[a]&&T.setRequestHeader("If-None-Match",pe.etag[a])),(d.data&&d.hasContent&&d.contentType!==!1||n.contentType)&&T.setRequestHeader("Content-Type",d.contentType),T.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+("*"!==d.dataTypes[0]?", "+Zt+"; q=0.01":""):d.accepts["*"]);for(o in d.headers)T.setRequestHeader(o,d.headers[o]);if(d.beforeSend&&(d.beforeSend.call(p,T,d)===!1||2===b))return T.abort();w="abort";for(o in{success:1,error:1,complete:1})T[o](d[o]);if(c=U(Qt,d,n,T)){if(T.readyState=1,l&&h.trigger("ajaxSend",[T,d]),2===b)return T;d.async&&d.timeout>0&&(u=e.setTimeout(function(){T.abort("timeout")},d.timeout));try{b=1,c.send(v,r)}catch(C){if(!(b<2))throw C;r(-1,C)}}else r(-1,"No Transport");return T},getJSON:function(e,t,n){return pe.get(e,t,n,"json")},getScript:function(e,t){return pe.get(e,void 0,t,"script")}}),pe.each(["get","post"],function(e,t){pe[t]=function(e,n,r,i){return pe.isFunction(n)&&(i=i||r,r=n,n=void 0),pe.ajax(pe.extend({url:e,type:t,dataType:i,data:n,success:r},pe.isPlainObject(e)&&e))}}),pe._evalUrl=function(e){return pe.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,"throws":!0})},pe.fn.extend({wrapAll:function(e){if(pe.isFunction(e))return this.each(function(t){pe(this).wrapAll(e.call(this,t))});if(this[0]){var t=pe(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){for(var e=this;e.firstChild&&1===e.firstChild.nodeType;)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return pe.isFunction(e)?this.each(function(t){pe(this).wrapInner(e.call(this,t))}):this.each(function(){var t=pe(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=pe.isFunction(e);return this.each(function(n){pe(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){pe.nodeName(this,"body")||pe(this).replaceWith(this.childNodes)}).end()}}),pe.expr.filters.hidden=function(e){return fe.reliableHiddenOffsets()?e.offsetWidth<=0&&e.offsetHeight<=0&&!e.getClientRects().length:K(e)},pe.expr.filters.visible=function(e){return!pe.expr.filters.hidden(e)};var nn=/%20/g,rn=/\[\]$/,on=/\r?\n/g,an=/^(?:submit|button|image|reset|file)$/i,sn=/^(?:input|select|textarea|keygen)/i;pe.param=function(e,t){var n,r=[],i=function(e,t){t=pe.isFunction(t)?t():null==t?"":t,r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};if(void 0===t&&(t=pe.ajaxSettings&&pe.ajaxSettings.traditional),pe.isArray(e)||e.jquery&&!pe.isPlainObject(e))pe.each(e,function(){i(this.name,this.value)});else for(n in e)Q(n,e[n],t,i);return r.join("&").replace(nn,"+")},pe.fn.extend({serialize:function(){return pe.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=pe.prop(this,"elements");return e?pe.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!pe(this).is(":disabled")&&sn.test(this.nodeName)&&!an.test(e)&&(this.checked||!Be.test(e))}).map(function(e,t){var n=pe(this).val();return null==n?null:pe.isArray(n)?pe.map(n,function(e){return{name:t.name,value:e.replace(on,"\r\n")}}):{name:t.name,value:n.replace(on,"\r\n")}}).get()}}),pe.ajaxSettings.xhr=void 0!==e.ActiveXObject?function(){return this.isLocal?ee():re.documentMode>8?Z():/^(get|post|head|put|delete|options)$/i.test(this.type)&&Z()||ee()}:Z;var un=0,ln={},cn=pe.ajaxSettings.xhr();e.attachEvent&&e.attachEvent("onunload",function(){for(var e in ln)ln[e](void 0,!0)}),fe.cors=!!cn&&"withCredentials"in cn,cn=fe.ajax=!!cn,cn&&pe.ajaxTransport(function(t){if(!t.crossDomain||fe.cors){var n;return{send:function(r,i){var o,a=t.xhr(),s=++un;if(a.open(t.type,t.url,t.async,t.username,t.password),t.xhrFields)for(o in t.xhrFields)a[o]=t.xhrFields[o];t.mimeType&&a.overrideMimeType&&a.overrideMimeType(t.mimeType),t.crossDomain||r["X-Requested-With"]||(r["X-Requested-With"]="XMLHttpRequest");for(o in r)void 0!==r[o]&&a.setRequestHeader(o,r[o]+"");a.send(t.hasContent&&t.data||null),n=function(e,r){var o,u,l;if(n&&(r||4===a.readyState))if(delete ln[s],n=void 0,a.onreadystatechange=pe.noop,r)4!==a.readyState&&a.abort();else{l={},o=a.status,"string"==typeof a.responseText&&(l.text=a.responseText);try{u=a.statusText}catch(c){u=""}o||!t.isLocal||t.crossDomain?1223===o&&(o=204):o=l.text?200:404}l&&i(o,u,l,a.getAllResponseHeaders())},t.async?4===a.readyState?e.setTimeout(n):a.onreadystatechange=ln[s]=n:n()},abort:function(){n&&n(void 0,!0)}}}}),pe.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return pe.globalEval(e),e}}}),pe.ajaxPrefilter("script",function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET",e.global=!1)}),pe.ajaxTransport("script",function(e){if(e.crossDomain){var t,n=re.head||pe("head")[0]||re.documentElement;return{send:function(r,i){t=re.createElement("script"),t.async=!0,e.scriptCharset&&(t.charset=e.scriptCharset),t.src=e.url,t.onload=t.onreadystatechange=function(e,n){(n||!t.readyState||/loaded|complete/.test(t.readyState))&&(t.onload=t.onreadystatechange=null,t.parentNode&&t.parentNode.removeChild(t),t=null,n||i(200,"success"))},n.insertBefore(t,n.firstChild)},abort:function(){t&&t.onload(void 0,!0)}}}});var fn=[],dn=/(=)\?(?=&|$)|\?\?/;pe.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=fn.pop()||pe.expando+"_"+Wt++;return this[e]=!0,e}}),pe.ajaxPrefilter("json jsonp",function(t,n,r){var i,o,a,s=t.jsonp!==!1&&(dn.test(t.url)?"url":"string"==typeof t.data&&0===(t.contentType||"").indexOf("application/x-www-form-urlencoded")&&dn.test(t.data)&&"data");if(s||"jsonp"===t.dataTypes[0])return i=t.jsonpCallback=pe.isFunction(t.jsonpCallback)?t.jsonpCallback():t.jsonpCallback,s?t[s]=t[s].replace(dn,"$1"+i):t.jsonp!==!1&&(t.url+=(It.test(t.url)?"&":"?")+t.jsonp+"="+i),t.converters["script json"]=function(){return a||pe.error(i+" was not called"),a[0]},t.dataTypes[0]="json",o=e[i],e[i]=function(){a=arguments},r.always(function(){void 0===o?pe(e).removeProp(i):e[i]=o,t[i]&&(t.jsonpCallback=n.jsonpCallback,fn.push(i)),a&&pe.isFunction(o)&&o(a[0]),a=o=void 0}),"script"}),pe.parseHTML=function(e,t,n){if(!e||"string"!=typeof e)return null;"boolean"==typeof t&&(n=t,t=!1),t=t||re;var r=Te.exec(e),i=!n&&[];return r?[t.createElement(r[1])]:(r=y([e],t,i),i&&i.length&&pe(i).remove(),pe.merge([],r.childNodes))};var pn=pe.fn.load;return pe.fn.load=function(e,t,n){if("string"!=typeof e&&pn)return pn.apply(this,arguments);var r,i,o,a=this,s=e.indexOf(" ");return s>-1&&(r=pe.trim(e.slice(s,e.length)),e=e.slice(0,s)),pe.isFunction(t)?(n=t,t=void 0):t&&"object"==typeof t&&(i="POST"),a.length>0&&pe.ajax({url:e,type:i||"GET",dataType:"html",data:t}).done(function(e){o=arguments,a.html(r?pe("<div>").append(pe.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},pe.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){pe.fn[t]=function(e){return this.on(t,e)}}),pe.expr.filters.animated=function(e){return pe.grep(pe.timers,function(t){return e===t.elem}).length},pe.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l,c=pe.css(e,"position"),f=pe(e),d={};"static"===c&&(e.style.position="relative"),s=f.offset(),o=pe.css(e,"top"),u=pe.css(e,"left"),l=("absolute"===c||"fixed"===c)&&pe.inArray("auto",[o,u])>-1,l?(r=f.position(),a=r.top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),pe.isFunction(t)&&(t=t.call(e,n,pe.extend({},s))),null!=t.top&&(d.top=t.top-s.top+a),null!=t.left&&(d.left=t.left-s.left+i),"using"in t?t.using.call(e,d):f.css(d)}},pe.fn.extend({offset:function(e){if(arguments.length)return void 0===e?this:this.each(function(t){pe.offset.setOffset(this,e,t)});var t,n,r={top:0,left:0},i=this[0],o=i&&i.ownerDocument;if(o)return t=o.documentElement,pe.contains(t,i)?("undefined"!=typeof i.getBoundingClientRect&&(r=i.getBoundingClientRect()),n=te(o),{top:r.top+(n.pageYOffset||t.scrollTop)-(t.clientTop||0),left:r.left+(n.pageXOffset||t.scrollLeft)-(t.clientLeft||0)}):r},position:function(){if(this[0]){var e,t,n={top:0,left:0},r=this[0];return"fixed"===pe.css(r,"position")?t=r.getBoundingClientRect():(e=this.offsetParent(),t=this.offset(),pe.nodeName(e[0],"html")||(n=e.offset()),n.top+=pe.css(e[0],"borderTopWidth",!0),n.left+=pe.css(e[0],"borderLeftWidth",!0)),{top:t.top-n.top-pe.css(r,"marginTop",!0),left:t.left-n.left-pe.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){
+for(var e=this.offsetParent;e&&!pe.nodeName(e,"html")&&"static"===pe.css(e,"position");)e=e.offsetParent;return e||pt})}}),pe.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,t){var n=/Y/.test(t);pe.fn[e]=function(r){return Pe(this,function(e,r,i){var o=te(e);return void 0===i?o?t in o?o[t]:o.document.documentElement[r]:e[r]:void(o?o.scrollTo(n?pe(o).scrollLeft():i,n?i:pe(o).scrollTop()):e[r]=i)},e,r,arguments.length,null)}}),pe.each(["top","left"],function(e,t){pe.cssHooks[t]=L(fe.pixelPosition,function(e,n){if(n)return n=gt(e,t),ft.test(n)?pe(e).position()[t]+"px":n})}),pe.each({Height:"height",Width:"width"},function(e,t){pe.each({padding:"inner"+e,content:t,"":"outer"+e},function(n,r){pe.fn[r]=function(r,i){var o=arguments.length&&(n||"boolean"!=typeof r),a=n||(r===!0||i===!0?"margin":"border");return Pe(this,function(t,n,r){var i;return pe.isWindow(t)?t.document.documentElement["client"+e]:9===t.nodeType?(i=t.documentElement,Math.max(t.body["scroll"+e],i["scroll"+e],t.body["offset"+e],i["offset"+e],i["client"+e])):void 0===r?pe.css(t,n,a):pe.style(t,n,r,a)},t,o?r:void 0,o,null)}})}),pe.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)}}),pe.fn.size=function(){return this.length},pe.fn.andSelf=pe.fn.addBack,layui.define(function(e){layui.$=pe,e("jquery",pe)}),pe});
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/lay/modules/laydate.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/lay/modules/laydate.js
new file mode 100644
index 0000000..345a217
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/lay/modules/laydate.js
@@ -0,0 +1,2 @@
+/** layui-v2.3.0 MIT License By https://www.layui.com */
+ ;!function(){"use strict";var e=window.layui&&layui.define,t={getPath:function(){var e=document.currentScript?document.currentScript.src:function(){for(var e,t=document.scripts,n=t.length-1,a=n;a>0;a--)if("interactive"===t[a].readyState){e=t[a].src;break}return e||t[n].src}();return e.substring(0,e.lastIndexOf("/")+1)}(),getStyle:function(e,t){var n=e.currentStyle?e.currentStyle:window.getComputedStyle(e,null);return n[n.getPropertyValue?"getPropertyValue":"getAttribute"](t)},link:function(e,a,i){if(n.path){var r=document.getElementsByTagName("head")[0],o=document.createElement("link");"string"==typeof a&&(i=a);var s=(i||e).replace(/\.|\//g,""),l="layuicss-"+s,d=0;o.rel="stylesheet",o.href=n.path+e,o.id=l,document.getElementById(l)||r.appendChild(o),"function"==typeof a&&!function c(){return++d>80?window.console&&console.error("laydate.css: Invalid"):void(1989===parseInt(t.getStyle(document.getElementById(l),"width"))?a():setTimeout(c,100))}()}}},n={v:"5.0.9",config:{},index:window.laydate&&window.laydate.v?1e5:0,path:t.getPath,set:function(e){var t=this;return t.config=w.extend({},t.config,e),t},ready:function(a){var i="laydate",r="",o=(e?"modules/laydate/":"theme/")+"default/laydate.css?v="+n.v+r;return e?layui.addcss(o,a,i):t.link(o,a,i),this}},a=function(){var e=this;return{hint:function(t){e.hint.call(e,t)},config:e.config}},i="laydate",r=".layui-laydate",o="layui-this",s="laydate-disabled",l="开始日期超出了结束日期<br>建议重新选择",d=[100,2e5],c="layui-laydate-static",m="layui-laydate-list",u="laydate-selected",h="layui-laydate-hint",y="laydate-day-prev",f="laydate-day-next",p="layui-laydate-footer",g=".laydate-btns-confirm",v="laydate-time-text",D=".laydate-btns-time",T=function(e){var t=this;t.index=++n.index,t.config=w.extend({},t.config,n.config,e),n.ready(function(){t.init()})},w=function(e){return new C(e)},C=function(e){for(var t=0,n="object"==typeof e?[e]:(this.selector=e,document.querySelectorAll(e||null));t<n.length;t++)this.push(n[t])};C.prototype=[],C.prototype.constructor=C,w.extend=function(){var e=1,t=arguments,n=function(e,t){e=e||(t.constructor===Array?[]:{});for(var a in t)e[a]=t[a]&&t[a].constructor===Object?n(e[a],t[a]):t[a];return e};for(t[0]="object"==typeof t[0]?t[0]:{};e<t.length;e++)"object"==typeof t[e]&&n(t[0],t[e]);return t[0]},w.ie=function(){var e=navigator.userAgent.toLowerCase();return!!(window.ActiveXObject||"ActiveXObject"in window)&&((e.match(/msie\s(\d+)/)||[])[1]||"11")}(),w.stope=function(e){e=e||window.event,e.stopPropagation?e.stopPropagation():e.cancelBubble=!0},w.each=function(e,t){var n,a=this;if("function"!=typeof t)return a;if(e=e||[],e.constructor===Object){for(n in e)if(t.call(e[n],n,e[n]))break}else for(n=0;n<e.length&&!t.call(e[n],n,e[n]);n++);return a},w.digit=function(e,t,n){var a="";e=String(e),t=t||2;for(var i=e.length;i<t;i++)a+="0";return e<Math.pow(10,t)?a+(0|e):e},w.elem=function(e,t){var n=document.createElement(e);return w.each(t||{},function(e,t){n.setAttribute(e,t)}),n},C.addStr=function(e,t){return e=e.replace(/\s+/," "),t=t.replace(/\s+/," ").split(" "),w.each(t,function(t,n){new RegExp("\\b"+n+"\\b").test(e)||(e=e+" "+n)}),e.replace(/^\s|\s$/,"")},C.removeStr=function(e,t){return e=e.replace(/\s+/," "),t=t.replace(/\s+/," ").split(" "),w.each(t,function(t,n){var a=new RegExp("\\b"+n+"\\b");a.test(e)&&(e=e.replace(a,""))}),e.replace(/\s+/," ").replace(/^\s|\s$/,"")},C.prototype.find=function(e){var t=this,n=0,a=[],i="object"==typeof e;return this.each(function(r,o){for(var s=i?[e]:o.querySelectorAll(e||null);n<s.length;n++)a.push(s[n]);t.shift()}),i||(t.selector=(t.selector?t.selector+" ":"")+e),w.each(a,function(e,n){t.push(n)}),t},C.prototype.each=function(e){return w.each.call(this,this,e)},C.prototype.addClass=function(e,t){return this.each(function(n,a){a.className=C[t?"removeStr":"addStr"](a.className,e)})},C.prototype.removeClass=function(e){return this.addClass(e,!0)},C.prototype.hasClass=function(e){var t=!1;return this.each(function(n,a){new RegExp("\\b"+e+"\\b").test(a.className)&&(t=!0)}),t},C.prototype.attr=function(e,t){var n=this;return void 0===t?function(){if(n.length>0)return n[0].getAttribute(e)}():n.each(function(n,a){a.setAttribute(e,t)})},C.prototype.removeAttr=function(e){return this.each(function(t,n){n.removeAttribute(e)})},C.prototype.html=function(e){return this.each(function(t,n){n.innerHTML=e})},C.prototype.val=function(e){return this.each(function(t,n){n.value=e})},C.prototype.append=function(e){return this.each(function(t,n){"object"==typeof e?n.appendChild(e):n.innerHTML=n.innerHTML+e})},C.prototype.remove=function(e){return this.each(function(t,n){e?n.removeChild(e):n.parentNode.removeChild(n)})},C.prototype.on=function(e,t){return this.each(function(n,a){a.attachEvent?a.attachEvent("on"+e,function(e){e.target=e.srcElement,t.call(a,e)}):a.addEventListener(e,t,!1)})},C.prototype.off=function(e,t){return this.each(function(n,a){a.detachEvent?a.detachEvent("on"+e,t):a.removeEventListener(e,t,!1)})},T.isLeapYear=function(e){return e%4===0&&e%100!==0||e%400===0},T.prototype.config={type:"date",range:!1,format:"yyyy-MM-dd",value:null,isInitValue:!0,min:"1900-1-1",max:"2099-12-31",trigger:"focus",show:!1,showBottom:!0,btns:["clear","now","confirm"],lang:"cn",theme:"default",position:null,calendar:!1,mark:{},zIndex:null,done:null,change:null},T.prototype.lang=function(){var e=this,t=e.config,n={cn:{weeks:["日","一","二","三","四","五","六"],time:["时","分","秒"],timeTips:"选择时间",startTime:"开始时间",endTime:"结束时间",dateTips:"返回日期",month:["一","二","三","四","五","六","七","八","九","十","十一","十二"],tools:{confirm:"确定",clear:"清空",now:"现在"}},en:{weeks:["Su","Mo","Tu","We","Th","Fr","Sa"],time:["Hours","Minutes","Seconds"],timeTips:"Select Time",startTime:"Start Time",endTime:"End Time",dateTips:"Select Date",month:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],tools:{confirm:"Confirm",clear:"Clear",now:"Now"}}};return n[t.lang]||n.cn},T.prototype.init=function(){var e=this,t=e.config,n="yyyy|y|MM|M|dd|d|HH|H|mm|m|ss|s",a="static"===t.position,i={year:"yyyy",month:"yyyy-MM",date:"yyyy-MM-dd",time:"HH:mm:ss",datetime:"yyyy-MM-dd HH:mm:ss"};t.elem=w(t.elem),t.eventElem=w(t.eventElem),t.elem[0]&&(t.range===!0&&(t.range="-"),t.format===i.date&&(t.format=i[t.type]),e.format=t.format.match(new RegExp(n+"|.","g"))||[],e.EXP_IF="",e.EXP_SPLIT="",w.each(e.format,function(t,a){var i=new RegExp(n).test(a)?"\\d{"+function(){return new RegExp(n).test(e.format[0===t?t+1:t-1]||"")?/^yyyy|y$/.test(a)?4:a.length:/^yyyy$/.test(a)?"1,4":/^y$/.test(a)?"1,308":"1,2"}()+"}":"\\"+a;e.EXP_IF=e.EXP_IF+i,e.EXP_SPLIT=e.EXP_SPLIT+"("+i+")"}),e.EXP_IF=new RegExp("^"+(t.range?e.EXP_IF+"\\s\\"+t.range+"\\s"+e.EXP_IF:e.EXP_IF)+"$"),e.EXP_SPLIT=new RegExp("^"+e.EXP_SPLIT+"$",""),e.isInput(t.elem[0])||"focus"===t.trigger&&(t.trigger="click"),t.elem.attr("lay-key")||(t.elem.attr("lay-key",e.index),t.eventElem.attr("lay-key",e.index)),t.mark=w.extend({},t.calendar&&"cn"===t.lang?{"0-1-1":"元旦","0-2-14":"情人","0-3-8":"妇女","0-3-12":"植树","0-4-1":"愚人","0-5-1":"劳动","0-5-4":"青年","0-6-1":"儿童","0-9-10":"教师","0-9-18":"国耻","0-10-1":"国庆","0-12-25":"圣诞"}:{},t.mark),w.each(["min","max"],function(e,n){var a=[],i=[];if("number"==typeof t[n]){var r=t[n],o=(new Date).getTime(),s=864e5,l=new Date(r?r<s?o+r*s:r:o);a=[l.getFullYear(),l.getMonth()+1,l.getDate()],r<s||(i=[l.getHours(),l.getMinutes(),l.getSeconds()])}else a=(t[n].match(/\d+-\d+-\d+/)||[""])[0].split("-"),i=(t[n].match(/\d+:\d+:\d+/)||[""])[0].split(":");t[n]={year:0|a[0]||(new Date).getFullYear(),month:a[1]?(0|a[1])-1:(new Date).getMonth(),date:0|a[2]||(new Date).getDate(),hours:0|i[0],minutes:0|i[1],seconds:0|i[2]}}),e.elemID="layui-laydate"+t.elem.attr("lay-key"),(t.show||a)&&e.render(),a||e.events(),t.value&&t.isInitValue&&(t.value.constructor===Date?e.setValue(e.parse(0,e.systemDate(t.value))):e.setValue(t.value)))},T.prototype.render=function(){var e=this,t=e.config,n=e.lang(),a="static"===t.position,i=e.elem=w.elem("div",{id:e.elemID,"class":["layui-laydate",t.range?" layui-laydate-range":"",a?" "+c:"",t.theme&&"default"!==t.theme&&!/^#/.test(t.theme)?" laydate-theme-"+t.theme:""].join("")}),r=e.elemMain=[],o=e.elemHeader=[],s=e.elemCont=[],l=e.table=[],d=e.footer=w.elem("div",{"class":p});if(t.zIndex&&(i.style.zIndex=t.zIndex),w.each(new Array(2),function(e){if(!t.range&&e>0)return!0;var a=w.elem("div",{"class":"layui-laydate-header"}),i=[function(){var e=w.elem("i",{"class":"layui-icon laydate-icon laydate-prev-y"});return e.innerHTML="&#xe65a;",e}(),function(){var e=w.elem("i",{"class":"layui-icon laydate-icon laydate-prev-m"});return e.innerHTML="&#xe603;",e}(),function(){var e=w.elem("div",{"class":"laydate-set-ym"}),t=w.elem("span"),n=w.elem("span");return e.appendChild(t),e.appendChild(n),e}(),function(){var e=w.elem("i",{"class":"layui-icon laydate-icon laydate-next-m"});return e.innerHTML="&#xe602;",e}(),function(){var e=w.elem("i",{"class":"layui-icon laydate-icon laydate-next-y"});return e.innerHTML="&#xe65b;",e}()],d=w.elem("div",{"class":"layui-laydate-content"}),c=w.elem("table"),m=w.elem("thead"),u=w.elem("tr");w.each(i,function(e,t){a.appendChild(t)}),m.appendChild(u),w.each(new Array(6),function(e){var t=c.insertRow(0);w.each(new Array(7),function(a){if(0===e){var i=w.elem("th");i.innerHTML=n.weeks[a],u.appendChild(i)}t.insertCell(a)})}),c.insertBefore(m,c.children[0]),d.appendChild(c),r[e]=w.elem("div",{"class":"layui-laydate-main laydate-main-list-"+e}),r[e].appendChild(a),r[e].appendChild(d),o.push(i),s.push(d),l.push(c)}),w(d).html(function(){var e=[],i=[];return"datetime"===t.type&&e.push('<span lay-type="datetime" class="laydate-btns-time">'+n.timeTips+"</span>"),w.each(t.btns,function(e,r){var o=n.tools[r]||"btn";t.range&&"now"===r||(a&&"clear"===r&&(o="cn"===t.lang?"重置":"Reset"),i.push('<span lay-type="'+r+'" class="laydate-btns-'+r+'">'+o+"</span>"))}),e.push('<div class="laydate-footer-btns">'+i.join("")+"</div>"),e.join("")}()),w.each(r,function(e,t){i.appendChild(t)}),t.showBottom&&i.appendChild(d),/^#/.test(t.theme)){var m=w.elem("style"),u=["#{{id}} .layui-laydate-header{background-color:{{theme}};}","#{{id}} .layui-this{background-color:{{theme}} !important;}"].join("").replace(/{{id}}/g,e.elemID).replace(/{{theme}}/g,t.theme);"styleSheet"in m?(m.setAttribute("type","text/css"),m.styleSheet.cssText=u):m.innerHTML=u,w(i).addClass("laydate-theme-molv"),i.appendChild(m)}e.remove(T.thisElemDate),a?t.elem.append(i):(document.body.appendChild(i),e.position()),e.checkDate().calendar(),e.changeEvent(),T.thisElemDate=e.elemID,"function"==typeof t.ready&&t.ready(w.extend({},t.dateTime,{month:t.dateTime.month+1}))},T.prototype.remove=function(e){var t=this,n=(t.config,w("#"+(e||t.elemID)));return n.hasClass(c)||t.checkDate(function(){n.remove()}),t},T.prototype.position=function(){var e=this,t=e.config,n=e.bindElem||t.elem[0],a=n.getBoundingClientRect(),i=e.elem.offsetWidth,r=e.elem.offsetHeight,o=function(e){return e=e?"scrollLeft":"scrollTop",document.body[e]|document.documentElement[e]},s=function(e){return document.documentElement[e?"clientWidth":"clientHeight"]},l=5,d=a.left,c=a.bottom;d+i+l>s("width")&&(d=s("width")-i-l),c+r+l>s()&&(c=a.top>r?a.top-r:s()-r,c-=2*l),t.position&&(e.elem.style.position=t.position),e.elem.style.left=d+("fixed"===t.position?0:o(1))+"px",e.elem.style.top=c+("fixed"===t.position?0:o())+"px"},T.prototype.hint=function(e){var t=this,n=(t.config,w.elem("div",{"class":h}));n.innerHTML=e||"",w(t.elem).find("."+h).remove(),t.elem.appendChild(n),clearTimeout(t.hinTimer),t.hinTimer=setTimeout(function(){w(t.elem).find("."+h).remove()},3e3)},T.prototype.getAsYM=function(e,t,n){return n?t--:t++,t<0&&(t=11,e--),t>11&&(t=0,e++),[e,t]},T.prototype.systemDate=function(e){var t=e||new Date;return{year:t.getFullYear(),month:t.getMonth(),date:t.getDate(),hours:e?e.getHours():0,minutes:e?e.getMinutes():0,seconds:e?e.getSeconds():0}},T.prototype.checkDate=function(e){var t,a,i=this,r=(new Date,i.config),o=r.dateTime=r.dateTime||i.systemDate(),s=i.bindElem||r.elem[0],l=(i.isInput(s)?"val":"html",i.isInput(s)?s.value:"static"===r.position?"":s.innerHTML),c=function(e){e.year>d[1]&&(e.year=d[1],a=!0),e.month>11&&(e.month=11,a=!0),e.hours>23&&(e.hours=0,a=!0),e.minutes>59&&(e.minutes=0,e.hours++,a=!0),e.seconds>59&&(e.seconds=0,e.minutes++,a=!0),t=n.getEndDate(e.month+1,e.year),e.date>t&&(e.date=t,a=!0)},m=function(e,t,n){var o=["startTime","endTime"];t=(t.match(i.EXP_SPLIT)||[]).slice(1),n=n||0,r.range&&(i[o[n]]=i[o[n]]||{}),w.each(i.format,function(s,l){var c=parseFloat(t[s]);t[s].length<l.length&&(a=!0),/yyyy|y/.test(l)?(c<d[0]&&(c=d[0],a=!0),e.year=c):/MM|M/.test(l)?(c<1&&(c=1,a=!0),e.month=c-1):/dd|d/.test(l)?(c<1&&(c=1,a=!0),e.date=c):/HH|H/.test(l)?(c<1&&(c=0,a=!0),e.hours=c,r.range&&(i[o[n]].hours=c)):/mm|m/.test(l)?(c<1&&(c=0,a=!0),e.minutes=c,r.range&&(i[o[n]].minutes=c)):/ss|s/.test(l)&&(c<1&&(c=0,a=!0),e.seconds=c,r.range&&(i[o[n]].seconds=c))}),c(e)};return"limit"===e?(c(o),i):(l=l||r.value,"string"==typeof l&&(l=l.replace(/\s+/g," ").replace(/^\s|\s$/g,"")),i.startState&&!i.endState&&(delete i.startState,i.endState=!0),"string"==typeof l&&l?i.EXP_IF.test(l)?r.range?(l=l.split(" "+r.range+" "),i.startDate=i.startDate||i.systemDate(),i.endDate=i.endDate||i.systemDate(),r.dateTime=w.extend({},i.startDate),w.each([i.startDate,i.endDate],function(e,t){m(t,l[e],e)})):m(o,l):(i.hint("日期格式不合法<br>必须遵循下述格式：<br>"+(r.range?r.format+" "+r.range+" "+r.format:r.format)+"<br>已为你重置"),a=!0):l&&l.constructor===Date?r.dateTime=i.systemDate(l):(r.dateTime=i.systemDate(),delete i.startState,delete i.endState,delete i.startDate,delete i.endDate,delete i.startTime,delete i.endTime),c(o),a&&l&&i.setValue(r.range?i.endDate?i.parse():"":i.parse()),e&&e(),i)},T.prototype.mark=function(e,t){var n,a=this,i=a.config;return w.each(i.mark,function(e,a){var i=e.split("-");i[0]!=t[0]&&0!=i[0]||i[1]!=t[1]&&0!=i[1]||i[2]!=t[2]||(n=a||t[2])}),n&&e.html('<span class="laydate-day-mark">'+n+"</span>"),a},T.prototype.limit=function(e,t,n,a){var i,r=this,o=r.config,l={},d=o[n>41?"endDate":"dateTime"],c=w.extend({},d,t||{});return w.each({now:c,min:o.min,max:o.max},function(e,t){l[e]=r.newDate(w.extend({year:t.year,month:t.month,date:t.date},function(){var e={};return w.each(a,function(n,a){e[a]=t[a]}),e}())).getTime()}),i=l.now<l.min||l.now>l.max,e&&e[i?"addClass":"removeClass"](s),i},T.prototype.calendar=function(e){var t,a,i,r=this,s=r.config,l=e||s.dateTime,c=new Date,m=r.lang(),u="date"!==s.type&&"datetime"!==s.type,h=e?1:0,y=w(r.table[h]).find("td"),f=w(r.elemHeader[h][2]).find("span");if(l.year<d[0]&&(l.year=d[0],r.hint("最低只能支持到公元"+d[0]+"年")),l.year>d[1]&&(l.year=d[1],r.hint("最高只能支持到公元"+d[1]+"年")),r.firstDate||(r.firstDate=w.extend({},l)),c.setFullYear(l.year,l.month,1),t=c.getDay(),a=n.getEndDate(l.month||12,l.year),i=n.getEndDate(l.month+1,l.year),w.each(y,function(e,n){var d=[l.year,l.month],c=0;n=w(n),n.removeAttr("class"),e<t?(c=a-t+e,n.addClass("laydate-day-prev"),d=r.getAsYM(l.year,l.month,"sub")):e>=t&&e<i+t?(c=e-t,s.range||c+1===l.date&&n.addClass(o)):(c=e-i-t,n.addClass("laydate-day-next"),d=r.getAsYM(l.year,l.month)),d[1]++,d[2]=c+1,n.attr("lay-ymd",d.join("-")).html(d[2]),r.mark(n,d).limit(n,{year:d[0],month:d[1]-1,date:d[2]},e)}),w(f[0]).attr("lay-ym",l.year+"-"+(l.month+1)),w(f[1]).attr("lay-ym",l.year+"-"+(l.month+1)),"cn"===s.lang?(w(f[0]).attr("lay-type","year").html(l.year+"年"),w(f[1]).attr("lay-type","month").html(l.month+1+"月")):(w(f[0]).attr("lay-type","month").html(m.month[l.month]),w(f[1]).attr("lay-type","year").html(l.year)),u&&(s.range&&(e?r.endDate=r.endDate||{year:l.year+("year"===s.type?1:0),month:l.month+("month"===s.type?0:-1)}:r.startDate=r.startDate||{year:l.year,month:l.month},e&&(r.listYM=[[r.startDate.year,r.startDate.month+1],[r.endDate.year,r.endDate.month+1]],r.list(s.type,0).list(s.type,1),"time"===s.type?r.setBtnStatus("时间",w.extend({},r.systemDate(),r.startTime),w.extend({},r.systemDate(),r.endTime)):r.setBtnStatus(!0))),s.range||(r.listYM=[[l.year,l.month+1]],r.list(s.type,0))),s.range&&!e){var p=r.getAsYM(l.year,l.month);r.calendar(w.extend({},l,{year:p[0],month:p[1]}))}return s.range||r.limit(w(r.footer).find(g),null,0,["hours","minutes","seconds"]),s.range&&e&&!u&&r.stampRange(),r},T.prototype.list=function(e,t){var n=this,a=n.config,i=a.dateTime,r=n.lang(),l=a.range&&"date"!==a.type&&"datetime"!==a.type,d=w.elem("ul",{"class":m+" "+{year:"laydate-year-list",month:"laydate-month-list",time:"laydate-time-list"}[e]}),c=n.elemHeader[t],u=w(c[2]).find("span"),h=n.elemCont[t||0],y=w(h).find("."+m)[0],f="cn"===a.lang,p=f?"年":"",T=n.listYM[t]||{},C=["hours","minutes","seconds"],x=["startTime","endTime"][t];if(T[0]<1&&(T[0]=1),"year"===e){var M,b=M=T[0]-7;b<1&&(b=M=1),w.each(new Array(15),function(e){var i=w.elem("li",{"lay-ym":M}),r={year:M};M==T[0]&&w(i).addClass(o),i.innerHTML=M+p,d.appendChild(i),M<n.firstDate.year?(r.month=a.min.month,r.date=a.min.date):M>=n.firstDate.year&&(r.month=a.max.month,r.date=a.max.date),n.limit(w(i),r,t),M++}),w(u[f?0:1]).attr("lay-ym",M-8+"-"+T[1]).html(b+p+" - "+(M-1+p))}else if("month"===e)w.each(new Array(12),function(e){var i=w.elem("li",{"lay-ym":e}),s={year:T[0],month:e};e+1==T[1]&&w(i).addClass(o),i.innerHTML=r.month[e]+(f?"月":""),d.appendChild(i),T[0]<n.firstDate.year?s.date=a.min.date:T[0]>=n.firstDate.year&&(s.date=a.max.date),n.limit(w(i),s,t)}),w(u[f?0:1]).attr("lay-ym",T[0]+"-"+T[1]).html(T[0]+p);else if("time"===e){var E=function(){w(d).find("ol").each(function(e,a){w(a).find("li").each(function(a,i){n.limit(w(i),[{hours:a},{hours:n[x].hours,minutes:a},{hours:n[x].hours,minutes:n[x].minutes,seconds:a}][e],t,[["hours"],["hours","minutes"],["hours","minutes","seconds"]][e])})}),a.range||n.limit(w(n.footer).find(g),n[x],0,["hours","minutes","seconds"])};a.range?n[x]||(n[x]={hours:0,minutes:0,seconds:0}):n[x]=i,w.each([24,60,60],function(e,t){var a=w.elem("li"),i=["<p>"+r.time[e]+"</p><ol>"];w.each(new Array(t),function(t){i.push("<li"+(n[x][C[e]]===t?' class="'+o+'"':"")+">"+w.digit(t,2)+"</li>")}),a.innerHTML=i.join("")+"</ol>",d.appendChild(a)}),E()}if(y&&h.removeChild(y),h.appendChild(d),"year"===e||"month"===e)w(n.elemMain[t]).addClass("laydate-ym-show"),w(d).find("li").on("click",function(){var r=0|w(this).attr("lay-ym");if(!w(this).hasClass(s)){if(0===t)i[e]=r,l&&(n.startDate[e]=r),n.limit(w(n.footer).find(g),null,0);else if(l)n.endDate[e]=r;else{var c="year"===e?n.getAsYM(r,T[1]-1,"sub"):n.getAsYM(T[0],r,"sub");w.extend(i,{year:c[0],month:c[1]})}"year"===a.type||"month"===a.type?(w(d).find("."+o).removeClass(o),w(this).addClass(o),"month"===a.type&&"year"===e&&(n.listYM[t][0]=r,l&&(n[["startDate","endDate"][t]].year=r),n.list("month",t))):(n.checkDate("limit").calendar(),n.closeList()),n.setBtnStatus(),a.range||n.done(null,"change"),w(n.footer).find(D).removeClass(s)}});else{var S=w.elem("span",{"class":v}),k=function(){w(d).find("ol").each(function(e){var t=this,a=w(t).find("li");t.scrollTop=30*(n[x][C[e]]-2),t.scrollTop<=0&&a.each(function(e,n){if(!w(this).hasClass(s))return t.scrollTop=30*(e-2),!0})})},H=w(c[2]).find("."+v);k(),S.innerHTML=a.range?[r.startTime,r.endTime][t]:r.timeTips,w(n.elemMain[t]).addClass("laydate-time-show"),H[0]&&H.remove(),c[2].appendChild(S),w(d).find("ol").each(function(e){var t=this;w(t).find("li").on("click",function(){var r=0|this.innerHTML;w(this).hasClass(s)||(a.range?n[x][C[e]]=r:i[C[e]]=r,w(t).find("."+o).removeClass(o),w(this).addClass(o),E(),k(),(n.endDate||"time"===a.type)&&n.done(null,"change"),n.setBtnStatus())})})}return n},T.prototype.listYM=[],T.prototype.closeList=function(){var e=this;e.config;w.each(e.elemCont,function(t,n){w(this).find("."+m).remove(),w(e.elemMain[t]).removeClass("laydate-ym-show laydate-time-show")}),w(e.elem).find("."+v).remove()},T.prototype.setBtnStatus=function(e,t,n){var a,i=this,r=i.config,o=w(i.footer).find(g),d=r.range&&"date"!==r.type&&"time"!==r.type;d&&(t=t||i.startDate,n=n||i.endDate,a=i.newDate(t).getTime()>i.newDate(n).getTime(),i.limit(null,t)||i.limit(null,n)?o.addClass(s):o[a?"addClass":"removeClass"](s),e&&a&&i.hint("string"==typeof e?l.replace(/日期/g,e):l))},T.prototype.parse=function(e,t){var n=this,a=n.config,i=t||(e?w.extend({},n.endDate,n.endTime):a.range?w.extend({},n.startDate,n.startTime):a.dateTime),r=n.format.concat();return w.each(r,function(e,t){/yyyy|y/.test(t)?r[e]=w.digit(i.year,t.length):/MM|M/.test(t)?r[e]=w.digit(i.month+1,t.length):/dd|d/.test(t)?r[e]=w.digit(i.date,t.length):/HH|H/.test(t)?r[e]=w.digit(i.hours,t.length):/mm|m/.test(t)?r[e]=w.digit(i.minutes,t.length):/ss|s/.test(t)&&(r[e]=w.digit(i.seconds,t.length))}),a.range&&!e?r.join("")+" "+a.range+" "+n.parse(1):r.join("")},T.prototype.newDate=function(e){return e=e||{},new Date(e.year||1,e.month||0,e.date||1,e.hours||0,e.minutes||0,e.seconds||0)},T.prototype.setValue=function(e){var t=this,n=t.config,a=t.bindElem||n.elem[0],i=t.isInput(a)?"val":"html";return"static"===n.position||w(a)[i](e||""),this},T.prototype.stampRange=function(){var e,t,n=this,a=n.config,i=w(n.elem).find("td");if(a.range&&!n.endDate&&w(n.footer).find(g).addClass(s),n.endDate)return e=n.newDate({year:n.startDate.year,month:n.startDate.month,date:n.startDate.date}).getTime(),t=n.newDate({year:n.endDate.year,month:n.endDate.month,date:n.endDate.date}).getTime(),e>t?n.hint(l):void w.each(i,function(a,i){var r=w(i).attr("lay-ymd").split("-"),s=n.newDate({year:r[0],month:r[1]-1,date:r[2]}).getTime();w(i).removeClass(u+" "+o),s!==e&&s!==t||w(i).addClass(w(i).hasClass(y)||w(i).hasClass(f)?u:o),s>e&&s<t&&w(i).addClass(u)})},T.prototype.done=function(e,t){var n=this,a=n.config,i=w.extend({},n.startDate?w.extend(n.startDate,n.startTime):a.dateTime),r=w.extend({},w.extend(n.endDate,n.endTime));return w.each([i,r],function(e,t){"month"in t&&w.extend(t,{month:t.month+1})}),e=e||[n.parse(),i,r],"function"==typeof a[t||"done"]&&a[t||"done"].apply(a,e),n},T.prototype.choose=function(e){var t=this,n=t.config,a=n.dateTime,i=w(t.elem).find("td"),r=e.attr("lay-ymd").split("-"),l=function(e){new Date;e&&w.extend(a,r),n.range&&(t.startDate?w.extend(t.startDate,r):t.startDate=w.extend({},r,t.startTime),t.startYMD=r)};if(r={year:0|r[0],month:(0|r[1])-1,date:0|r[2]},!e.hasClass(s))if(n.range){if(w.each(["startTime","endTime"],function(e,n){t[n]=t[n]||{hours:0,minutes:0,seconds:0}}),t.endState)l(),delete t.endState,delete t.endDate,t.startState=!0,i.removeClass(o+" "+u),e.addClass(o);else if(t.startState){if(e.addClass(o),t.endDate?w.extend(t.endDate,r):t.endDate=w.extend({},r,t.endTime),t.newDate(r).getTime()<t.newDate(t.startYMD).getTime()){var d=w.extend({},t.endDate,{hours:t.startDate.hours,minutes:t.startDate.minutes,seconds:t.startDate.seconds});w.extend(t.endDate,t.startDate,{hours:t.endDate.hours,minutes:t.endDate.minutes,seconds:t.endDate.seconds}),t.startDate=d}n.showBottom||t.done(),t.stampRange(),t.endState=!0,t.done(null,"change")}else e.addClass(o),l(),t.startState=!0;w(t.footer).find(g)[t.endDate?"removeClass":"addClass"](s)}else"static"===n.position?(l(!0),t.calendar().done().done(null,"change")):"date"===n.type?(l(!0),t.setValue(t.parse()).remove().done()):"datetime"===n.type&&(l(!0),t.calendar().done(null,"change"))},T.prototype.tool=function(e,t){var n=this,a=n.config,i=a.dateTime,r="static"===a.position,o={datetime:function(){w(e).hasClass(s)||(n.list("time",0),a.range&&n.list("time",1),w(e).attr("lay-type","date").html(n.lang().dateTips))},date:function(){n.closeList(),w(e).attr("lay-type","datetime").html(n.lang().timeTips)},clear:function(){n.setValue("").remove(),r&&(w.extend(i,n.firstDate),n.calendar()),a.range&&(delete n.startState,delete n.endState,delete n.endDate,delete n.startTime,delete n.endTime),n.done(["",{},{}])},now:function(){var e=new Date;w.extend(i,n.systemDate(),{hours:e.getHours(),minutes:e.getMinutes(),seconds:e.getSeconds()}),n.setValue(n.parse()).remove(),r&&n.calendar(),n.done()},confirm:function(){if(a.range){if(!n.endDate)return n.hint("请先选择日期范围");if(w(e).hasClass(s))return n.hint("time"===a.type?l.replace(/日期/g,"时间"):l)}else if(w(e).hasClass(s))return n.hint("不在有效日期或时间范围内");n.done(),n.setValue(n.parse()).remove()}};o[t]&&o[t]()},T.prototype.change=function(e){var t=this,n=t.config,a=n.dateTime,i=n.range&&("year"===n.type||"month"===n.type),r=t.elemCont[e||0],o=t.listYM[e],s=function(s){var l=["startDate","endDate"][e],d=w(r).find(".laydate-year-list")[0],c=w(r).find(".laydate-month-list")[0];return d&&(o[0]=s?o[0]-15:o[0]+15,t.list("year",e)),c&&(s?o[0]--:o[0]++,t.list("month",e)),(d||c)&&(w.extend(a,{year:o[0]}),i&&(t[l].year=o[0]),n.range||t.done(null,"change"),t.setBtnStatus(),n.range||t.limit(w(t.footer).find(g),{year:o[0]})),d||c};return{prevYear:function(){s("sub")||(a.year--,t.checkDate("limit").calendar(),n.range||t.done(null,"change"))},prevMonth:function(){var e=t.getAsYM(a.year,a.month,"sub");w.extend(a,{year:e[0],month:e[1]}),t.checkDate("limit").calendar(),n.range||t.done(null,"change")},nextMonth:function(){var e=t.getAsYM(a.year,a.month);w.extend(a,{year:e[0],month:e[1]}),t.checkDate("limit").calendar(),n.range||t.done(null,"change")},nextYear:function(){s()||(a.year++,t.checkDate("limit").calendar(),n.range||t.done(null,"change"))}}},T.prototype.changeEvent=function(){var e=this;e.config;w(e.elem).on("click",function(e){w.stope(e)}),w.each(e.elemHeader,function(t,n){w(n[0]).on("click",function(n){e.change(t).prevYear()}),w(n[1]).on("click",function(n){e.change(t).prevMonth()}),w(n[2]).find("span").on("click",function(n){var a=w(this),i=a.attr("lay-ym"),r=a.attr("lay-type");i&&(i=i.split("-"),e.listYM[t]=[0|i[0],0|i[1]],e.list(r,t),w(e.footer).find(D).addClass(s))}),w(n[3]).on("click",function(n){e.change(t).nextMonth()}),w(n[4]).on("click",function(n){e.change(t).nextYear()})}),w.each(e.table,function(t,n){var a=w(n).find("td");a.on("click",function(){e.choose(w(this))})}),w(e.footer).find("span").on("click",function(){var t=w(this).attr("lay-type");e.tool(this,t)})},T.prototype.isInput=function(e){return/input|textarea/.test(e.tagName.toLocaleLowerCase())},T.prototype.events=function(){var e=this,t=e.config,n=function(n,a){n.on(t.trigger,function(){a&&(e.bindElem=this),e.render()})};t.elem[0]&&!t.elem[0].eventHandler&&(n(t.elem,"bind"),n(t.eventElem),w(document).on("click",function(n){n.target!==t.elem[0]&&n.target!==t.eventElem[0]&&n.target!==w(t.closeStop)[0]&&e.remove()}).on("keydown",function(t){13===t.keyCode&&w("#"+e.elemID)[0]&&e.elemID===T.thisElem&&(t.preventDefault(),w(e.footer).find(g)[0].click())}),w(window).on("resize",function(){return!(!e.elem||!w(r)[0])&&void e.position()}),t.elem[0].eventHandler=!0)},n.render=function(e){var t=new T(e);return a.call(t)},n.getEndDate=function(e,t){var n=new Date;return n.setFullYear(t||n.getFullYear(),e||n.getMonth()+1,1),new Date(n.getTime()-864e5).getDate()},window.lay=window.lay||w,e?(n.ready(),layui.define(function(e){n.path=layui.cache.dir,e(i,n)})):"function"==typeof define&&define.amd?define(function(){return n}):function(){n.ready(),window.laydate=n}()}();
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/lay/modules/layedit.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/lay/modules/layedit.js
new file mode 100644
index 0000000..fc1727d
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/lay/modules/layedit.js
@@ -0,0 +1,2 @@
+/** layui-v2.3.0 MIT License By https://www.layui.com */
+ ;layui.define(["layer","form"],function(t){"use strict";var e=layui.$,i=layui.layer,a=layui.form,l=(layui.hint(),layui.device()),n="layedit",o="layui-show",r="layui-disabled",c=function(){var t=this;t.index=0,t.config={tool:["strong","italic","underline","del","|","left","center","right","|","link","unlink","face","image"],hideTool:[],height:280}};c.prototype.set=function(t){var i=this;return e.extend(!0,i.config,t),i},c.prototype.on=function(t,e){return layui.onevent(n,t,e)},c.prototype.build=function(t,i){i=i||{};var a=this,n=a.config,r="layui-layedit",c=e("string"==typeof t?"#"+t:t),u="LAY_layedit_"+ ++a.index,d=c.next("."+r),y=e.extend({},n,i),f=function(){var t=[],e={};return layui.each(y.hideTool,function(t,i){e[i]=!0}),layui.each(y.tool,function(i,a){C[a]&&!e[a]&&t.push(C[a])}),t.join("")}(),m=e(['<div class="'+r+'">','<div class="layui-unselect layui-layedit-tool">'+f+"</div>",'<div class="layui-layedit-iframe">','<iframe id="'+u+'" name="'+u+'" textarea="'+t+'" frameborder="0"></iframe>',"</div>","</div>"].join(""));return l.ie&&l.ie<8?c.removeClass("layui-hide").addClass(o):(d[0]&&d.remove(),s.call(a,m,c[0],y),c.addClass("layui-hide").after(m),a.index)},c.prototype.getContent=function(t){var e=u(t);if(e[0])return d(e[0].document.body.innerHTML)},c.prototype.getText=function(t){var i=u(t);if(i[0])return e(i[0].document.body).text()},c.prototype.setContent=function(t,i,a){var l=u(t);l[0]&&(a?e(l[0].document.body).append(i):e(l[0].document.body).html(i),layedit.sync(t))},c.prototype.sync=function(t){var i=u(t);if(i[0]){var a=e("#"+i[1].attr("textarea"));a.val(d(i[0].document.body.innerHTML))}},c.prototype.getSelection=function(t){var e=u(t);if(e[0]){var i=m(e[0].document);return document.selection?i.text:i.toString()}};var s=function(t,i,a){var l=this,n=t.find("iframe");n.css({height:a.height}).on("load",function(){var o=n.contents(),r=n.prop("contentWindow"),c=o.find("head"),s=e(["<style>","*{margin: 0; padding: 0;}","body{padding: 10px; line-height: 20px; overflow-x: hidden; word-wrap: break-word; font: 14px Helvetica Neue,Helvetica,PingFang SC,Microsoft YaHei,Tahoma,Arial,sans-serif; -webkit-box-sizing: border-box !important; -moz-box-sizing: border-box !important; box-sizing: border-box !important;}","a{color:#01AAED; text-decoration:none;}a:hover{color:#c00}","p{margin-bottom: 10px;}","img{display: inline-block; border: none; vertical-align: middle;}","pre{margin: 10px 0; padding: 10px; line-height: 20px; border: 1px solid #ddd; border-left-width: 6px; background-color: #F2F2F2; color: #333; font-family: Courier New; font-size: 12px;}","</style>"].join("")),u=o.find("body");c.append(s),u.attr("contenteditable","true").css({"min-height":a.height}).html(i.value||""),y.apply(l,[r,n,i,a]),g.call(l,r,t,a)})},u=function(t){var i=e("#LAY_layedit_"+t),a=i.prop("contentWindow");return[a,i]},d=function(t){return 8==l.ie&&(t=t.replace(/<.+>/g,function(t){return t.toLowerCase()})),t},y=function(t,a,n,o){var r=t.document,c=e(r.body);c.on("keydown",function(t){var e=t.keyCode;if(13===e){var a=m(r),l=p(a),n=l.parentNode;if("pre"===n.tagName.toLowerCase()){if(t.shiftKey)return;return i.msg("请暂时用shift+enter"),!1}r.execCommand("formatBlock",!1,"<p>")}}),e(n).parents("form").on("submit",function(){var t=c.html();8==l.ie&&(t=t.replace(/<.+>/g,function(t){return t.toLowerCase()})),n.value=t}),c.on("paste",function(e){r.execCommand("formatBlock",!1,"<p>"),setTimeout(function(){f.call(t,c),n.value=c.html()},100)})},f=function(t){var i=this;i.document;t.find("*[style]").each(function(){var t=this.style.textAlign;this.removeAttribute("style"),e(this).css({"text-align":t||""})}),t.find("table").addClass("layui-table"),t.find("script,link").remove()},m=function(t){return t.selection?t.selection.createRange():t.getSelection().getRangeAt(0)},p=function(t){return t.endContainer||t.parentElement().childNodes[0]},v=function(t,i,a){var l=this.document,n=document.createElement(t);for(var o in i)n.setAttribute(o,i[o]);if(n.removeAttribute("text"),l.selection){var r=a.text||i.text;if("a"===t&&!r)return;r&&(n.innerHTML=r),a.pasteHTML(e(n).prop("outerHTML")),a.select()}else{var r=a.toString()||i.text;if("a"===t&&!r)return;r&&(n.innerHTML=r),a.deleteContents(),a.insertNode(n)}},h=function(t,i){var a=this.document,l="layedit-tool-active",n=p(m(a)),o=function(e){return t.find(".layedit-tool-"+e)};i&&i[i.hasClass(l)?"removeClass":"addClass"](l),t.find(">i").removeClass(l),o("unlink").addClass(r),e(n).parents().each(function(){var t=this.tagName.toLowerCase(),e=this.style.textAlign;"b"!==t&&"strong"!==t||o("b").addClass(l),"i"!==t&&"em"!==t||o("i").addClass(l),"u"===t&&o("u").addClass(l),"strike"===t&&o("d").addClass(l),"p"===t&&("center"===e?o("center").addClass(l):"right"===e?o("right").addClass(l):o("left").addClass(l)),"a"===t&&(o("link").addClass(l),o("unlink").removeClass(r))})},g=function(t,a,l){var n=t.document,o=e(n.body),c={link:function(i){var a=p(i),l=e(a).parent();b.call(o,{href:l.attr("href"),target:l.attr("target")},function(e){var a=l[0];"A"===a.tagName?a.href=e.url:v.call(t,"a",{target:e.target,href:e.url,text:e.url},i)})},unlink:function(t){n.execCommand("unlink")},face:function(e){x.call(this,function(i){v.call(t,"img",{src:i.src,alt:i.alt},e)})},image:function(a){var n=this;layui.use("upload",function(o){var r=l.uploadImage||{};o.render({url:r.url,method:r.type,elem:e(n).find("input")[0],done:function(e){0==e.code?(e.data=e.data||{},v.call(t,"img",{src:e.data.src,alt:e.data.title},a)):i.msg(e.msg||"上传失败")}})})},code:function(e){k.call(o,function(i){v.call(t,"pre",{text:i.code,"lay-lang":i.lang},e)})},help:function(){i.open({type:2,title:"帮助",area:["600px","380px"],shadeClose:!0,shade:.1,skin:"layui-layer-msg",content:["http://www.layui.com/about/layedit/help.html","no"]})}},s=a.find(".layui-layedit-tool"),u=function(){var i=e(this),a=i.attr("layedit-event"),l=i.attr("lay-command");if(!i.hasClass(r)){o.focus();var u=m(n);u.commonAncestorContainer;l?(n.execCommand(l),/justifyLeft|justifyCenter|justifyRight/.test(l)&&n.execCommand("formatBlock",!1,"<p>"),setTimeout(function(){o.focus()},10)):c[a]&&c[a].call(this,u),h.call(t,s,i)}},d=/image/;s.find(">i").on("mousedown",function(){var t=e(this),i=t.attr("layedit-event");d.test(i)||u.call(this)}).on("click",function(){var t=e(this),i=t.attr("layedit-event");d.test(i)&&u.call(this)}),o.on("click",function(){h.call(t,s),i.close(x.index)})},b=function(t,e){var l=this,n=i.open({type:1,id:"LAY_layedit_link",area:"350px",shade:.05,shadeClose:!0,moveType:1,title:"超链接",skin:"layui-layer-msg",content:['<ul class="layui-form" style="margin: 15px;">','<li class="layui-form-item">','<label class="layui-form-label" style="width: 60px;">URL</label>','<div class="layui-input-block" style="margin-left: 90px">','<input name="url" lay-verify="url" value="'+(t.href||"")+'" autofocus="true" autocomplete="off" class="layui-input">',"</div>","</li>",'<li class="layui-form-item">','<label class="layui-form-label" style="width: 60px;">打开方式</label>','<div class="layui-input-block" style="margin-left: 90px">','<input type="radio" name="target" value="_self" class="layui-input" title="当前窗口"'+("_self"!==t.target&&t.target?"":"checked")+">",'<input type="radio" name="target" value="_blank" class="layui-input" title="新窗口" '+("_blank"===t.target?"checked":"")+">","</div>","</li>",'<li class="layui-form-item" style="text-align: center;">','<button type="button" lay-submit lay-filter="layedit-link-yes" class="layui-btn"> 确定 </button>','<button style="margin-left: 20px;" type="button" class="layui-btn layui-btn-primary"> 取消 </button>',"</li>","</ul>"].join(""),success:function(t,n){var o="submit(layedit-link-yes)";a.render("radio"),t.find(".layui-btn-primary").on("click",function(){i.close(n),l.focus()}),a.on(o,function(t){i.close(b.index),e&&e(t.field)})}});b.index=n},x=function(t){var a=function(){var t=["[微笑]","[嘻嘻]","[哈哈]","[可爱]","[可怜]","[挖鼻]","[吃惊]","[害羞]","[挤眼]","[闭嘴]","[鄙视]","[爱你]","[泪]","[偷笑]","[亲亲]","[生病]","[太开心]","[白眼]","[右哼哼]","[左哼哼]","[嘘]","[衰]","[委屈]","[吐]","[哈欠]","[抱抱]","[怒]","[疑问]","[馋嘴]","[拜拜]","[思考]","[汗]","[困]","[睡]","[钱]","[失望]","[酷]","[色]","[哼]","[鼓掌]","[晕]","[悲伤]","[抓狂]","[黑线]","[阴险]","[怒骂]","[互粉]","[心]","[伤心]","[猪头]","[熊猫]","[兔子]","[ok]","[耶]","[good]","[NO]","[赞]","[来]","[弱]","[草泥马]","[神马]","[囧]","[浮云]","[给力]","[围观]","[威武]","[奥特曼]","[礼物]","[钟]","[话筒]","[蜡烛]","[蛋糕]"],e={};return layui.each(t,function(t,i){e[i]=layui.cache.dir+"images/face/"+t+".gif"}),e}();return x.hide=x.hide||function(t){"face"!==e(t.target).attr("layedit-event")&&i.close(x.index)},x.index=i.tips(function(){var t=[];return layui.each(a,function(e,i){t.push('<li title="'+e+'"><img src="'+i+'" alt="'+e+'"></li>')}),'<ul class="layui-clear">'+t.join("")+"</ul>"}(),this,{tips:1,time:0,skin:"layui-box layui-util-face",maxWidth:500,success:function(l,n){l.css({marginTop:-4,marginLeft:-10}).find(".layui-clear>li").on("click",function(){t&&t({src:a[this.title],alt:this.title}),i.close(n)}),e(document).off("click",x.hide).on("click",x.hide)}})},k=function(t){var e=this,l=i.open({type:1,id:"LAY_layedit_code",area:"550px",shade:.05,shadeClose:!0,moveType:1,title:"插入代码",skin:"layui-layer-msg",content:['<ul class="layui-form layui-form-pane" style="margin: 15px;">','<li class="layui-form-item">','<label class="layui-form-label">请选择语言</label>','<div class="layui-input-block">','<select name="lang">','<option value="JavaScript">JavaScript</option>','<option value="HTML">HTML</option>','<option value="CSS">CSS</option>','<option value="Java">Java</option>','<option value="PHP">PHP</option>','<option value="C#">C#</option>','<option value="Python">Python</option>','<option value="Ruby">Ruby</option>','<option value="Go">Go</option>',"</select>","</div>","</li>",'<li class="layui-form-item layui-form-text">','<label class="layui-form-label">代码</label>','<div class="layui-input-block">','<textarea name="code" lay-verify="required" autofocus="true" class="layui-textarea" style="height: 200px;"></textarea>',"</div>","</li>",'<li class="layui-form-item" style="text-align: center;">','<button type="button" lay-submit lay-filter="layedit-code-yes" class="layui-btn"> 确定 </button>','<button style="margin-left: 20px;" type="button" class="layui-btn layui-btn-primary"> 取消 </button>',"</li>","</ul>"].join(""),success:function(l,n){var o="submit(layedit-code-yes)";a.render("select"),l.find(".layui-btn-primary").on("click",function(){i.close(n),e.focus()}),a.on(o,function(e){i.close(k.index),t&&t(e.field)})}});k.index=l},C={html:'<i class="layui-icon layedit-tool-html" title="HTML源代码" lay-command="html" layedit-event="html"">&#xe64b;</i><span class="layedit-tool-mid"></span>',strong:'<i class="layui-icon layedit-tool-b" title="加粗" lay-command="Bold" layedit-event="b"">&#xe62b;</i>',italic:'<i class="layui-icon layedit-tool-i" title="斜体" lay-command="italic" layedit-event="i"">&#xe644;</i>',underline:'<i class="layui-icon layedit-tool-u" title="下划线" lay-command="underline" layedit-event="u"">&#xe646;</i>',del:'<i class="layui-icon layedit-tool-d" title="删除线" lay-command="strikeThrough" layedit-event="d"">&#xe64f;</i>',"|":'<span class="layedit-tool-mid"></span>',left:'<i class="layui-icon layedit-tool-left" title="左对齐" lay-command="justifyLeft" layedit-event="left"">&#xe649;</i>',center:'<i class="layui-icon layedit-tool-center" title="居中对齐" lay-command="justifyCenter" layedit-event="center"">&#xe647;</i>',right:'<i class="layui-icon layedit-tool-right" title="右对齐" lay-command="justifyRight" layedit-event="right"">&#xe648;</i>',link:'<i class="layui-icon layedit-tool-link" title="插入链接" layedit-event="link"">&#xe64c;</i>',unlink:'<i class="layui-icon layedit-tool-unlink layui-disabled" title="清除链接" lay-command="unlink" layedit-event="unlink"">&#xe64d;</i>',face:'<i class="layui-icon layedit-tool-face" title="表情" layedit-event="face"">&#xe650;</i>',image:'<i class="layui-icon layedit-tool-image" title="图片" layedit-event="image">&#xe64a;<input type="file" name="file"></i>',code:'<i class="layui-icon layedit-tool-code" title="插入代码" layedit-event="code">&#xe64e;</i>',help:'<i class="layui-icon layedit-tool-help" title="帮助" layedit-event="help">&#xe607;</i>'},w=new c;t(n,w)});
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/lay/modules/layer.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/lay/modules/layer.js
new file mode 100644
index 0000000..3a9dc86
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/lay/modules/layer.js
@@ -0,0 +1,2 @@
+/** layui-v2.3.0 MIT License By https://www.layui.com */
+ ;!function(e,t){"use strict";var i,n,a=e.layui&&layui.define,o={getPath:function(){var e=document.currentScript?document.currentScript.src:function(){for(var e,t=document.scripts,i=t.length-1,n=i;n>0;n--)if("interactive"===t[n].readyState){e=t[n].src;break}return e||t[i].src}();return e.substring(0,e.lastIndexOf("/")+1)}(),config:{},end:{},minIndex:0,minLeft:[],btn:["&#x786E;&#x5B9A;","&#x53D6;&#x6D88;"],type:["dialog","page","iframe","loading","tips"],getStyle:function(t,i){var n=t.currentStyle?t.currentStyle:e.getComputedStyle(t,null);return n[n.getPropertyValue?"getPropertyValue":"getAttribute"](i)},link:function(t,i,n){if(r.path){var a=document.getElementsByTagName("head")[0],s=document.createElement("link");"string"==typeof i&&(n=i);var l=(n||t).replace(/\.|\//g,""),f="layuicss-"+l,c=0;s.rel="stylesheet",s.href=r.path+t,s.id=f,document.getElementById(f)||a.appendChild(s),"function"==typeof i&&!function u(){return++c>80?e.console&&console.error("layer.css: Invalid"):void(1989===parseInt(o.getStyle(document.getElementById(f),"width"))?i():setTimeout(u,100))}()}}},r={v:"3.1.1",ie:function(){var t=navigator.userAgent.toLowerCase();return!!(e.ActiveXObject||"ActiveXObject"in e)&&((t.match(/msie\s(\d+)/)||[])[1]||"11")}(),index:e.layer&&e.layer.v?1e5:0,path:o.getPath,config:function(e,t){return e=e||{},r.cache=o.config=i.extend({},o.config,e),r.path=o.config.path||r.path,"string"==typeof e.extend&&(e.extend=[e.extend]),o.config.path&&r.ready(),e.extend?(a?layui.addcss("modules/layer/"+e.extend):o.link("theme/"+e.extend),this):this},ready:function(e){var t="layer",i="",n=(a?"modules/layer/":"theme/")+"default/layer.css?v="+r.v+i;return a?layui.addcss(n,e,t):o.link(n,e,t),this},alert:function(e,t,n){var a="function"==typeof t;return a&&(n=t),r.open(i.extend({content:e,yes:n},a?{}:t))},confirm:function(e,t,n,a){var s="function"==typeof t;return s&&(a=n,n=t),r.open(i.extend({content:e,btn:o.btn,yes:n,btn2:a},s?{}:t))},msg:function(e,n,a){var s="function"==typeof n,f=o.config.skin,c=(f?f+" "+f+"-msg":"")||"layui-layer-msg",u=l.anim.length-1;return s&&(a=n),r.open(i.extend({content:e,time:3e3,shade:!1,skin:c,title:!1,closeBtn:!1,btn:!1,resize:!1,end:a},s&&!o.config.skin?{skin:c+" layui-layer-hui",anim:u}:function(){return n=n||{},(n.icon===-1||n.icon===t&&!o.config.skin)&&(n.skin=c+" "+(n.skin||"layui-layer-hui")),n}()))},load:function(e,t){return r.open(i.extend({type:3,icon:e||0,resize:!1,shade:.01},t))},tips:function(e,t,n){return r.open(i.extend({type:4,content:[e,t],closeBtn:!1,time:3e3,shade:!1,resize:!1,fixed:!1,maxWidth:210},n))}},s=function(e){var t=this;t.index=++r.index,t.config=i.extend({},t.config,o.config,e),document.body?t.creat():setTimeout(function(){t.creat()},30)};s.pt=s.prototype;var l=["layui-layer",".layui-layer-title",".layui-layer-main",".layui-layer-dialog","layui-layer-iframe","layui-layer-content","layui-layer-btn","layui-layer-close"];l.anim=["layer-anim-00","layer-anim-01","layer-anim-02","layer-anim-03","layer-anim-04","layer-anim-05","layer-anim-06"],s.pt.config={type:0,shade:.3,fixed:!0,move:l[1],title:"&#x4FE1;&#x606F;",offset:"auto",area:"auto",closeBtn:1,time:0,zIndex:19891014,maxWidth:360,anim:0,isOutAnim:!0,icon:-1,moveType:1,resize:!0,scrollbar:!0,tips:2},s.pt.vessel=function(e,t){var n=this,a=n.index,r=n.config,s=r.zIndex+a,f="object"==typeof r.title,c=r.maxmin&&(1===r.type||2===r.type),u=r.title?'<div class="layui-layer-title" style="'+(f?r.title[1]:"")+'">'+(f?r.title[0]:r.title)+"</div>":"";return r.zIndex=s,t([r.shade?'<div class="layui-layer-shade" id="layui-layer-shade'+a+'" times="'+a+'" style="'+("z-index:"+(s-1)+"; ")+'"></div>':"",'<div class="'+l[0]+(" layui-layer-"+o.type[r.type])+(0!=r.type&&2!=r.type||r.shade?"":" layui-layer-border")+" "+(r.skin||"")+'" id="'+l[0]+a+'" type="'+o.type[r.type]+'" times="'+a+'" showtime="'+r.time+'" conType="'+(e?"object":"string")+'" style="z-index: '+s+"; width:"+r.area[0]+";height:"+r.area[1]+(r.fixed?"":";position:absolute;")+'">'+(e&&2!=r.type?"":u)+'<div id="'+(r.id||"")+'" class="layui-layer-content'+(0==r.type&&r.icon!==-1?" layui-layer-padding":"")+(3==r.type?" layui-layer-loading"+r.icon:"")+'">'+(0==r.type&&r.icon!==-1?'<i class="layui-layer-ico layui-layer-ico'+r.icon+'"></i>':"")+(1==r.type&&e?"":r.content||"")+'</div><span class="layui-layer-setwin">'+function(){var e=c?'<a class="layui-layer-min" href="javascript:;"><cite></cite></a><a class="layui-layer-ico layui-layer-max" href="javascript:;"></a>':"";return r.closeBtn&&(e+='<a class="layui-layer-ico '+l[7]+" "+l[7]+(r.title?r.closeBtn:4==r.type?"1":"2")+'" href="javascript:;"></a>'),e}()+"</span>"+(r.btn?function(){var e="";"string"==typeof r.btn&&(r.btn=[r.btn]);for(var t=0,i=r.btn.length;t<i;t++)e+='<a class="'+l[6]+t+'">'+r.btn[t]+"</a>";return'<div class="'+l[6]+" layui-layer-btn-"+(r.btnAlign||"")+'">'+e+"</div>"}():"")+(r.resize?'<span class="layui-layer-resize"></span>':"")+"</div>"],u,i('<div class="layui-layer-move"></div>')),n},s.pt.creat=function(){var e=this,t=e.config,a=e.index,s=t.content,f="object"==typeof s,c=i("body");if(!t.id||!i("#"+t.id)[0]){switch("string"==typeof t.area&&(t.area="auto"===t.area?["",""]:[t.area,""]),t.shift&&(t.anim=t.shift),6==r.ie&&(t.fixed=!1),t.type){case 0:t.btn="btn"in t?t.btn:o.btn[0],r.closeAll("dialog");break;case 2:var s=t.content=f?t.content:[t.content||"http://layer.layui.com","auto"];t.content='<iframe scrolling="'+(t.content[1]||"auto")+'" allowtransparency="true" id="'+l[4]+a+'" name="'+l[4]+a+'" onload="this.className=\'\';" class="layui-layer-load" frameborder="0" src="'+t.content[0]+'"></iframe>';break;case 3:delete t.title,delete t.closeBtn,t.icon===-1&&0===t.icon,r.closeAll("loading");break;case 4:f||(t.content=[t.content,"body"]),t.follow=t.content[1],t.content=t.content[0]+'<i class="layui-layer-TipsG"></i>',delete t.title,t.tips="object"==typeof t.tips?t.tips:[t.tips,!0],t.tipsMore||r.closeAll("tips")}if(e.vessel(f,function(n,r,u){c.append(n[0]),f?function(){2==t.type||4==t.type?function(){i("body").append(n[1])}():function(){s.parents("."+l[0])[0]||(s.data("display",s.css("display")).show().addClass("layui-layer-wrap").wrap(n[1]),i("#"+l[0]+a).find("."+l[5]).before(r))}()}():c.append(n[1]),i(".layui-layer-move")[0]||c.append(o.moveElem=u),e.layero=i("#"+l[0]+a),t.scrollbar||l.html.css("overflow","hidden").attr("layer-full",a)}).auto(a),i("#layui-layer-shade"+e.index).css({"background-color":t.shade[1]||"#000",opacity:t.shade[0]||t.shade}),2==t.type&&6==r.ie&&e.layero.find("iframe").attr("src",s[0]),4==t.type?e.tips():e.offset(),t.fixed&&n.on("resize",function(){e.offset(),(/^\d+%$/.test(t.area[0])||/^\d+%$/.test(t.area[1]))&&e.auto(a),4==t.type&&e.tips()}),t.time<=0||setTimeout(function(){r.close(e.index)},t.time),e.move().callback(),l.anim[t.anim]){var u="layer-anim "+l.anim[t.anim];e.layero.addClass(u).one("webkitAnimationEnd mozAnimationEnd MSAnimationEnd oanimationend animationend",function(){i(this).removeClass(u)})}t.isOutAnim&&e.layero.data("isOutAnim",!0)}},s.pt.auto=function(e){var t=this,a=t.config,o=i("#"+l[0]+e);""===a.area[0]&&a.maxWidth>0&&(r.ie&&r.ie<8&&a.btn&&o.width(o.innerWidth()),o.outerWidth()>a.maxWidth&&o.width(a.maxWidth));var s=[o.innerWidth(),o.innerHeight()],f=o.find(l[1]).outerHeight()||0,c=o.find("."+l[6]).outerHeight()||0,u=function(e){e=o.find(e),e.height(s[1]-f-c-2*(0|parseFloat(e.css("padding-top"))))};switch(a.type){case 2:u("iframe");break;default:""===a.area[1]?a.maxHeight>0&&o.outerHeight()>a.maxHeight?(s[1]=a.maxHeight,u("."+l[5])):a.fixed&&s[1]>=n.height()&&(s[1]=n.height(),u("."+l[5])):u("."+l[5])}return t},s.pt.offset=function(){var e=this,t=e.config,i=e.layero,a=[i.outerWidth(),i.outerHeight()],o="object"==typeof t.offset;e.offsetTop=(n.height()-a[1])/2,e.offsetLeft=(n.width()-a[0])/2,o?(e.offsetTop=t.offset[0],e.offsetLeft=t.offset[1]||e.offsetLeft):"auto"!==t.offset&&("t"===t.offset?e.offsetTop=0:"r"===t.offset?e.offsetLeft=n.width()-a[0]:"b"===t.offset?e.offsetTop=n.height()-a[1]:"l"===t.offset?e.offsetLeft=0:"lt"===t.offset?(e.offsetTop=0,e.offsetLeft=0):"lb"===t.offset?(e.offsetTop=n.height()-a[1],e.offsetLeft=0):"rt"===t.offset?(e.offsetTop=0,e.offsetLeft=n.width()-a[0]):"rb"===t.offset?(e.offsetTop=n.height()-a[1],e.offsetLeft=n.width()-a[0]):e.offsetTop=t.offset),t.fixed||(e.offsetTop=/%$/.test(e.offsetTop)?n.height()*parseFloat(e.offsetTop)/100:parseFloat(e.offsetTop),e.offsetLeft=/%$/.test(e.offsetLeft)?n.width()*parseFloat(e.offsetLeft)/100:parseFloat(e.offsetLeft),e.offsetTop+=n.scrollTop(),e.offsetLeft+=n.scrollLeft()),i.attr("minLeft")&&(e.offsetTop=n.height()-(i.find(l[1]).outerHeight()||0),e.offsetLeft=i.css("left")),i.css({top:e.offsetTop,left:e.offsetLeft})},s.pt.tips=function(){var e=this,t=e.config,a=e.layero,o=[a.outerWidth(),a.outerHeight()],r=i(t.follow);r[0]||(r=i("body"));var s={width:r.outerWidth(),height:r.outerHeight(),top:r.offset().top,left:r.offset().left},f=a.find(".layui-layer-TipsG"),c=t.tips[0];t.tips[1]||f.remove(),s.autoLeft=function(){s.left+o[0]-n.width()>0?(s.tipLeft=s.left+s.width-o[0],f.css({right:12,left:"auto"})):s.tipLeft=s.left},s.where=[function(){s.autoLeft(),s.tipTop=s.top-o[1]-10,f.removeClass("layui-layer-TipsB").addClass("layui-layer-TipsT").css("border-right-color",t.tips[1])},function(){s.tipLeft=s.left+s.width+10,s.tipTop=s.top,f.removeClass("layui-layer-TipsL").addClass("layui-layer-TipsR").css("border-bottom-color",t.tips[1])},function(){s.autoLeft(),s.tipTop=s.top+s.height+10,f.removeClass("layui-layer-TipsT").addClass("layui-layer-TipsB").css("border-right-color",t.tips[1])},function(){s.tipLeft=s.left-o[0]-10,s.tipTop=s.top,f.removeClass("layui-layer-TipsR").addClass("layui-layer-TipsL").css("border-bottom-color",t.tips[1])}],s.where[c-1](),1===c?s.top-(n.scrollTop()+o[1]+16)<0&&s.where[2]():2===c?n.width()-(s.left+s.width+o[0]+16)>0||s.where[3]():3===c?s.top-n.scrollTop()+s.height+o[1]+16-n.height()>0&&s.where[0]():4===c&&o[0]+16-s.left>0&&s.where[1](),a.find("."+l[5]).css({"background-color":t.tips[1],"padding-right":t.closeBtn?"30px":""}),a.css({left:s.tipLeft-(t.fixed?n.scrollLeft():0),top:s.tipTop-(t.fixed?n.scrollTop():0)})},s.pt.move=function(){var e=this,t=e.config,a=i(document),s=e.layero,l=s.find(t.move),f=s.find(".layui-layer-resize"),c={};return t.move&&l.css("cursor","move"),l.on("mousedown",function(e){e.preventDefault(),t.move&&(c.moveStart=!0,c.offset=[e.clientX-parseFloat(s.css("left")),e.clientY-parseFloat(s.css("top"))],o.moveElem.css("cursor","move").show())}),f.on("mousedown",function(e){e.preventDefault(),c.resizeStart=!0,c.offset=[e.clientX,e.clientY],c.area=[s.outerWidth(),s.outerHeight()],o.moveElem.css("cursor","se-resize").show()}),a.on("mousemove",function(i){if(c.moveStart){var a=i.clientX-c.offset[0],o=i.clientY-c.offset[1],l="fixed"===s.css("position");if(i.preventDefault(),c.stX=l?0:n.scrollLeft(),c.stY=l?0:n.scrollTop(),!t.moveOut){var f=n.width()-s.outerWidth()+c.stX,u=n.height()-s.outerHeight()+c.stY;a<c.stX&&(a=c.stX),a>f&&(a=f),o<c.stY&&(o=c.stY),o>u&&(o=u)}s.css({left:a,top:o})}if(t.resize&&c.resizeStart){var a=i.clientX-c.offset[0],o=i.clientY-c.offset[1];i.preventDefault(),r.style(e.index,{width:c.area[0]+a,height:c.area[1]+o}),c.isResize=!0,t.resizing&&t.resizing(s)}}).on("mouseup",function(e){c.moveStart&&(delete c.moveStart,o.moveElem.hide(),t.moveEnd&&t.moveEnd(s)),c.resizeStart&&(delete c.resizeStart,o.moveElem.hide())}),e},s.pt.callback=function(){function e(){var e=a.cancel&&a.cancel(t.index,n);e===!1||r.close(t.index)}var t=this,n=t.layero,a=t.config;t.openLayer(),a.success&&(2==a.type?n.find("iframe").on("load",function(){a.success(n,t.index)}):a.success(n,t.index)),6==r.ie&&t.IE6(n),n.find("."+l[6]).children("a").on("click",function(){var e=i(this).index();if(0===e)a.yes?a.yes(t.index,n):a.btn1?a.btn1(t.index,n):r.close(t.index);else{var o=a["btn"+(e+1)]&&a["btn"+(e+1)](t.index,n);o===!1||r.close(t.index)}}),n.find("."+l[7]).on("click",e),a.shadeClose&&i("#layui-layer-shade"+t.index).on("click",function(){r.close(t.index)}),n.find(".layui-layer-min").on("click",function(){var e=a.min&&a.min(n);e===!1||r.min(t.index,a)}),n.find(".layui-layer-max").on("click",function(){i(this).hasClass("layui-layer-maxmin")?(r.restore(t.index),a.restore&&a.restore(n)):(r.full(t.index,a),setTimeout(function(){a.full&&a.full(n)},100))}),a.end&&(o.end[t.index]=a.end)},o.reselect=function(){i.each(i("select"),function(e,t){var n=i(this);n.parents("."+l[0])[0]||1==n.attr("layer")&&i("."+l[0]).length<1&&n.removeAttr("layer").show(),n=null})},s.pt.IE6=function(e){i("select").each(function(e,t){var n=i(this);n.parents("."+l[0])[0]||"none"===n.css("display")||n.attr({layer:"1"}).hide(),n=null})},s.pt.openLayer=function(){var e=this;r.zIndex=e.config.zIndex,r.setTop=function(e){var t=function(){r.zIndex++,e.css("z-index",r.zIndex+1)};return r.zIndex=parseInt(e[0].style.zIndex),e.on("mousedown",t),r.zIndex}},o.record=function(e){var t=[e.width(),e.height(),e.position().top,e.position().left+parseFloat(e.css("margin-left"))];e.find(".layui-layer-max").addClass("layui-layer-maxmin"),e.attr({area:t})},o.rescollbar=function(e){l.html.attr("layer-full")==e&&(l.html[0].style.removeProperty?l.html[0].style.removeProperty("overflow"):l.html[0].style.removeAttribute("overflow"),l.html.removeAttr("layer-full"))},e.layer=r,r.getChildFrame=function(e,t){return t=t||i("."+l[4]).attr("times"),i("#"+l[0]+t).find("iframe").contents().find(e)},r.getFrameIndex=function(e){return i("#"+e).parents("."+l[4]).attr("times")},r.iframeAuto=function(e){if(e){var t=r.getChildFrame("html",e).outerHeight(),n=i("#"+l[0]+e),a=n.find(l[1]).outerHeight()||0,o=n.find("."+l[6]).outerHeight()||0;n.css({height:t+a+o}),n.find("iframe").css({height:t})}},r.iframeSrc=function(e,t){i("#"+l[0]+e).find("iframe").attr("src",t)},r.style=function(e,t,n){var a=i("#"+l[0]+e),r=a.find(".layui-layer-content"),s=a.attr("type"),f=a.find(l[1]).outerHeight()||0,c=a.find("."+l[6]).outerHeight()||0;a.attr("minLeft");s!==o.type[3]&&s!==o.type[4]&&(n||(parseFloat(t.width)<=260&&(t.width=260),parseFloat(t.height)-f-c<=64&&(t.height=64+f+c)),a.css(t),c=a.find("."+l[6]).outerHeight(),s===o.type[2]?a.find("iframe").css({height:parseFloat(t.height)-f-c}):r.css({height:parseFloat(t.height)-f-c-parseFloat(r.css("padding-top"))-parseFloat(r.css("padding-bottom"))}))},r.min=function(e,t){var a=i("#"+l[0]+e),s=a.find(l[1]).outerHeight()||0,f=a.attr("minLeft")||181*o.minIndex+"px",c=a.css("position");o.record(a),o.minLeft[0]&&(f=o.minLeft[0],o.minLeft.shift()),a.attr("position",c),r.style(e,{width:180,height:s,left:f,top:n.height()-s,position:"fixed",overflow:"hidden"},!0),a.find(".layui-layer-min").hide(),"page"===a.attr("type")&&a.find(l[4]).hide(),o.rescollbar(e),a.attr("minLeft")||o.minIndex++,a.attr("minLeft",f)},r.restore=function(e){var t=i("#"+l[0]+e),n=t.attr("area").split(",");t.attr("type");r.style(e,{width:parseFloat(n[0]),height:parseFloat(n[1]),top:parseFloat(n[2]),left:parseFloat(n[3]),position:t.attr("position"),overflow:"visible"},!0),t.find(".layui-layer-max").removeClass("layui-layer-maxmin"),t.find(".layui-layer-min").show(),"page"===t.attr("type")&&t.find(l[4]).show(),o.rescollbar(e)},r.full=function(e){var t,a=i("#"+l[0]+e);o.record(a),l.html.attr("layer-full")||l.html.css("overflow","hidden").attr("layer-full",e),clearTimeout(t),t=setTimeout(function(){var t="fixed"===a.css("position");r.style(e,{top:t?0:n.scrollTop(),left:t?0:n.scrollLeft(),width:n.width(),height:n.height()},!0),a.find(".layui-layer-min").hide()},100)},r.title=function(e,t){var n=i("#"+l[0]+(t||r.index)).find(l[1]);n.html(e)},r.close=function(e){var t=i("#"+l[0]+e),n=t.attr("type"),a="layer-anim-close";if(t[0]){var s="layui-layer-wrap",f=function(){if(n===o.type[1]&&"object"===t.attr("conType")){t.children(":not(."+l[5]+")").remove();for(var a=t.find("."+s),r=0;r<2;r++)a.unwrap();a.css("display",a.data("display")).removeClass(s)}else{if(n===o.type[2])try{var f=i("#"+l[4]+e)[0];f.contentWindow.document.write(""),f.contentWindow.close(),t.find("."+l[5])[0].removeChild(f)}catch(c){}t[0].innerHTML="",t.remove()}"function"==typeof o.end[e]&&o.end[e](),delete o.end[e]};t.data("isOutAnim")&&t.addClass("layer-anim "+a),i("#layui-layer-moves, #layui-layer-shade"+e).remove(),6==r.ie&&o.reselect(),o.rescollbar(e),t.attr("minLeft")&&(o.minIndex--,o.minLeft.push(t.attr("minLeft"))),r.ie&&r.ie<10||!t.data("isOutAnim")?f():setTimeout(function(){f()},200)}},r.closeAll=function(e){i.each(i("."+l[0]),function(){var t=i(this),n=e?t.attr("type")===e:1;n&&r.close(t.attr("times")),n=null})};var f=r.cache||{},c=function(e){return f.skin?" "+f.skin+" "+f.skin+"-"+e:""};r.prompt=function(e,t){var a="";if(e=e||{},"function"==typeof e&&(t=e),e.area){var o=e.area;a='style="width: '+o[0]+"; height: "+o[1]+';"',delete e.area}var s,l=2==e.formType?'<textarea class="layui-layer-input"'+a+"></textarea>":function(){return'<input type="'+(1==e.formType?"password":"text")+'" class="layui-layer-input">'}(),f=e.success;return delete e.success,r.open(i.extend({type:1,btn:["&#x786E;&#x5B9A;","&#x53D6;&#x6D88;"],content:l,skin:"layui-layer-prompt"+c("prompt"),maxWidth:n.width(),success:function(t){s=t.find(".layui-layer-input"),s.val(e.value||"").focus(),"function"==typeof f&&f(t)},resize:!1,yes:function(i){var n=s.val();""===n?s.focus():n.length>(e.maxlength||500)?r.tips("&#x6700;&#x591A;&#x8F93;&#x5165;"+(e.maxlength||500)+"&#x4E2A;&#x5B57;&#x6570;",s,{tips:1}):t&&t(n,i,s)}},e))},r.tab=function(e){e=e||{};var t=e.tab||{},n="layui-this",a=e.success;return delete e.success,r.open(i.extend({type:1,skin:"layui-layer-tab"+c("tab"),resize:!1,title:function(){var e=t.length,i=1,a="";if(e>0)for(a='<span class="'+n+'">'+t[0].title+"</span>";i<e;i++)a+="<span>"+t[i].title+"</span>";return a}(),content:'<ul class="layui-layer-tabmain">'+function(){var e=t.length,i=1,a="";if(e>0)for(a='<li class="layui-layer-tabli '+n+'">'+(t[0].content||"no content")+"</li>";i<e;i++)a+='<li class="layui-layer-tabli">'+(t[i].content||"no  content")+"</li>";return a}()+"</ul>",success:function(t){var o=t.find(".layui-layer-title").children(),r=t.find(".layui-layer-tabmain").children();o.on("mousedown",function(t){t.stopPropagation?t.stopPropagation():t.cancelBubble=!0;var a=i(this),o=a.index();a.addClass(n).siblings().removeClass(n),r.eq(o).show().siblings().hide(),"function"==typeof e.change&&e.change(o)}),"function"==typeof a&&a(t)}},e))},r.photos=function(t,n,a){function o(e,t,i){var n=new Image;return n.src=e,n.complete?t(n):(n.onload=function(){n.onload=null,t(n)},void(n.onerror=function(e){n.onerror=null,i(e)}))}var s={};if(t=t||{},t.photos){var l=t.photos.constructor===Object,f=l?t.photos:{},u=f.data||[],d=f.start||0;s.imgIndex=(0|d)+1,t.img=t.img||"img";var y=t.success;if(delete t.success,l){if(0===u.length)return r.msg("&#x6CA1;&#x6709;&#x56FE;&#x7247;")}else{var p=i(t.photos),h=function(){u=[],p.find(t.img).each(function(e){var t=i(this);t.attr("layer-index",e),u.push({alt:t.attr("alt"),pid:t.attr("layer-pid"),src:t.attr("layer-src")||t.attr("src"),thumb:t.attr("src")})})};if(h(),0===u.length)return;if(n||p.on("click",t.img,function(){var e=i(this),n=e.attr("layer-index");r.photos(i.extend(t,{photos:{start:n,data:u,tab:t.tab},full:t.full}),!0),h()}),!n)return}s.imgprev=function(e){s.imgIndex--,s.imgIndex<1&&(s.imgIndex=u.length),s.tabimg(e)},s.imgnext=function(e,t){s.imgIndex++,s.imgIndex>u.length&&(s.imgIndex=1,t)||s.tabimg(e)},s.keyup=function(e){if(!s.end){var t=e.keyCode;e.preventDefault(),37===t?s.imgprev(!0):39===t?s.imgnext(!0):27===t&&r.close(s.index)}},s.tabimg=function(e){if(!(u.length<=1))return f.start=s.imgIndex-1,r.close(s.index),r.photos(t,!0,e)},s.event=function(){s.bigimg.hover(function(){s.imgsee.show()},function(){s.imgsee.hide()}),s.bigimg.find(".layui-layer-imgprev").on("click",function(e){e.preventDefault(),s.imgprev()}),s.bigimg.find(".layui-layer-imgnext").on("click",function(e){e.preventDefault(),s.imgnext()}),i(document).on("keyup",s.keyup)},s.loadi=r.load(1,{shade:!("shade"in t)&&.9,scrollbar:!1}),o(u[d].src,function(n){r.close(s.loadi),s.index=r.open(i.extend({type:1,id:"layui-layer-photos",area:function(){var a=[n.width,n.height],o=[i(e).width()-100,i(e).height()-100];if(!t.full&&(a[0]>o[0]||a[1]>o[1])){var r=[a[0]/o[0],a[1]/o[1]];r[0]>r[1]?(a[0]=a[0]/r[0],a[1]=a[1]/r[0]):r[0]<r[1]&&(a[0]=a[0]/r[1],a[1]=a[1]/r[1])}return[a[0]+"px",a[1]+"px"]}(),title:!1,shade:.9,shadeClose:!0,closeBtn:!1,move:".layui-layer-phimg img",moveType:1,scrollbar:!1,moveOut:!0,isOutAnim:!1,skin:"layui-layer-photos"+c("photos"),content:'<div class="layui-layer-phimg"><img src="'+u[d].src+'" alt="'+(u[d].alt||"")+'" layer-pid="'+u[d].pid+'"><div class="layui-layer-imgsee">'+(u.length>1?'<span class="layui-layer-imguide"><a href="javascript:;" class="layui-layer-iconext layui-layer-imgprev"></a><a href="javascript:;" class="layui-layer-iconext layui-layer-imgnext"></a></span>':"")+'<div class="layui-layer-imgbar" style="display:'+(a?"block":"")+'"><span class="layui-layer-imgtit"><a href="javascript:;">'+(u[d].alt||"")+"</a><em>"+s.imgIndex+"/"+u.length+"</em></span></div></div></div>",success:function(e,i){s.bigimg=e.find(".layui-layer-phimg"),s.imgsee=e.find(".layui-layer-imguide,.layui-layer-imgbar"),s.event(e),t.tab&&t.tab(u[d],e),"function"==typeof y&&y(e)},end:function(){s.end=!0,i(document).off("keyup",s.keyup)}},t))},function(){r.close(s.loadi),r.msg("&#x5F53;&#x524D;&#x56FE;&#x7247;&#x5730;&#x5740;&#x5F02;&#x5E38;<br>&#x662F;&#x5426;&#x7EE7;&#x7EED;&#x67E5;&#x770B;&#x4E0B;&#x4E00;&#x5F20;&#xFF1F;",{time:3e4,btn:["&#x4E0B;&#x4E00;&#x5F20;","&#x4E0D;&#x770B;&#x4E86;"],yes:function(){u.length>1&&s.imgnext(!0,!0)}})})}},o.run=function(t){i=t,n=i(e),l.html=i("html"),r.open=function(e){var t=new s(e);return t.index}},e.layui&&layui.define?(r.ready(),layui.define("jquery",function(t){r.path=layui.cache.dir,o.run(layui.$),e.layer=r,t("layer",r)})):"function"==typeof define&&define.amd?define(["static/resources/layuiadmin/layui/lay/modules/jquery"],function(){return o.run(e.jQuery),r}):function(){o.run(e.jQuery),r.ready()}()}(window);
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/lay/modules/layim.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/lay/modules/layim.js
new file mode 100644
index 0000000..082180b
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/lay/modules/layim.js
@@ -0,0 +1,3 @@
+/** layui-v2.3.0 MIT License By https://www.layui.com */
+ ;layui.define(["layer","laytpl","upload"],function(i){var a="3.7.7",e=layui.$,t=layui.layer,n=layui.laytpl,l=layui.device(),s="layui-show",o="layim-this",d=20,r={},c=function(){this.v=a,e("body").on("click","*[layim-event]",function(i){var a=e(this),t=a.attr("layim-event");ti[t]?ti[t].call(this,a,i):""})};c.prototype.config=function(i){var a=[];if(layui.each(Array(5),function(i){a.push(layui.cache.dir+"css/modules/layim/skin/"+(i+1)+".jpg")}),i=i||{},i.skin=i.skin||[],layui.each(i.skin,function(i,e){a.unshift(e)}),i.skin=a,i=e.extend({isfriend:!0,isgroup:!0,voice:"default.mp3"},i),window.JSON&&window.JSON.parse)return H(i),this},c.prototype.on=function(i,a){return"function"==typeof a&&(r[i]?r[i].push(a):r[i]=[a]),this},c.prototype.cache=function(){return j},c.prototype.chat=function(i){if(window.JSON&&window.JSON.parse)return z(i),this},c.prototype.setChatMin=function(){return N(),this},c.prototype.setChatStatus=function(i){var a=_();if(a){var e=a.elem.find(".layim-chat-status");return e.html(i),this}},c.prototype.getMessage=function(i){return K(i),this},c.prototype.notice=function(i){return J(i),this},c.prototype.add=function(i){return M(i),this},c.prototype.setFriendGroup=function(i){return M(i,"setGroup"),this},c.prototype.msgbox=function(i){return V(i),this},c.prototype.addList=function(i){return P(i),this},c.prototype.removeList=function(i){return W(i),this},c.prototype.setFriendStatus=function(i,a){var t=e(".layim-friend"+i);t["online"===a?"removeClass":"addClass"]("layim-list-gray")},c.prototype.content=function(i){return layui.data.content(i)};var u=function(i){var a={friend:"该分组下暂无好友",group:"暂无群组",history:"暂无历史会话"};return i=i||{},i.item=i.item||"d."+i.type,["{{# var length = 0; layui.each("+i.item+", function(i, data){ length++; }}",'<li layim-event="chat" data-type="'+i.type+'" data-index="{{ '+(i.index||"i")+' }}" class="layim-'+("history"===i.type?"{{i}}":i.type+"{{data.id}}")+' {{ data.status === "offline" ? "layim-list-gray" : "" }}"><img src="{{ data.avatar }}"><span>{{ data.username||data.groupname||data.name||"佚名" }}</span><p>{{ data.remark||data.sign||"" }}</p><span class="layim-msg-status">new</span></li>',"{{# }); if(length === 0){ }}",'<li class="layim-null">'+(a[i.type]||"暂无数据")+"</li>","{{# } }}"].join("")},y=['<div class="layui-layim-main">','<div class="layui-layim-info">','<div class="layui-layim-user">{{ d.mine.username }}</div>','<div class="layui-layim-status">','{{# if(d.mine.status === "online"){ }}','<span class="layui-icon layim-status-online" layim-event="status" lay-type="show">&#xe617;</span>','{{# } else if(d.mine.status === "hide") { }}','<span class="layui-icon layim-status-hide" layim-event="status" lay-type="show">&#xe60f;</span>',"{{# } }}",'<ul class="layui-anim layim-menu-box">','<li {{d.mine.status === "online" ? "class=layim-this" : ""}} layim-event="status" lay-type="online"><i class="layui-icon">&#xe605;</i><cite class="layui-icon layim-status-online">&#xe617;</cite>在线</li>','<li {{d.mine.status === "hide" ? "class=layim-this" : ""}} layim-event="status" lay-type="hide"><i class="layui-icon">&#xe605;</i><cite class="layui-icon layim-status-hide">&#xe60f;</cite>隐身</li>',"</ul>","</div>",'<input class="layui-layim-remark" placeholder="编辑签名" value="{{ d.mine.remark||d.mine.sign||"" }}">',"</div>",'<ul class="layui-unselect layui-layim-tab{{# if(!d.base.isfriend || !d.base.isgroup){ }}'," layim-tab-two",'{{# } }}">','<li class="layui-icon',"{{# if(!d.base.isfriend){ }}"," layim-hide","{{# } else { }}"," layim-this","{{# } }}",'" title="联系人" layim-event="tab" lay-type="friend">&#xe612;</li>','<li class="layui-icon',"{{# if(!d.base.isgroup){ }}"," layim-hide","{{# } else if(!d.base.isfriend) { }}"," layim-this","{{# } }}",'" title="群组" layim-event="tab" lay-type="group">&#xe613;</li>','<li class="layui-icon" title="历史会话" layim-event="tab" lay-type="history">&#xe611;</li>',"</ul>",'<ul class="layui-unselect layim-tab-content {{# if(d.base.isfriend){ }}layui-show{{# } }} layim-list-friend">','{{# layui.each(d.friend, function(index, item){ var spread = d.local["spread"+index]; }}',"<li>",'<h5 layim-event="spread" lay-type="{{ spread }}"><i class="layui-icon">{{# if(spread === "true"){ }}&#xe61a;{{# } else {  }}&#xe602;{{# } }}</i><span>{{ item.groupname||"未命名分组"+index }}</span><em>(<cite class="layim-count"> {{ (item.list||[]).length }}</cite>)</em></h5>','<ul class="layui-layim-list {{# if(spread === "true"){ }}'," layui-show",'{{# } }}">',u({type:"friend",item:"item.list",index:"index"}),"</ul>","</li>","{{# }); if(d.friend.length === 0){ }}",'<li><ul class="layui-layim-list layui-show"><li class="layim-null">暂无联系人</li></ul>',"{{# } }}","</ul>",'<ul class="layui-unselect layim-tab-content {{# if(!d.base.isfriend && d.base.isgroup){ }}layui-show{{# } }}">',"<li>",'<ul class="layui-layim-list layui-show layim-list-group">',u({type:"group"}),"</ul>","</li>","</ul>",'<ul class="layui-unselect layim-tab-content  {{# if(!d.base.isfriend && !d.base.isgroup){ }}layui-show{{# } }}">',"<li>",'<ul class="layui-layim-list layui-show layim-list-history">',u({type:"history"}),"</ul>","</li>","</ul>",'<ul class="layui-unselect layim-tab-content">',"<li>",'<ul class="layui-layim-list layui-show" id="layui-layim-search"></ul>',"</li>","</ul>",'<ul class="layui-unselect layui-layim-tool">','<li class="layui-icon layim-tool-search" layim-event="search" title="搜索">&#xe615;</li>',"{{# if(d.base.msgbox){ }}",'<li class="layui-icon layim-tool-msgbox" layim-event="msgbox" title="消息盒子">&#xe645;<span class="layui-anim"></span></li>',"{{# } }}","{{# if(d.base.find){ }}",'<li class="layui-icon layim-tool-find" layim-event="find" title="查找">&#xe608;</li>',"{{# } }}",'<li class="layui-icon layim-tool-skin" layim-event="skin" title="更换背景">&#xe61b;</li>',"{{# if(!d.base.copyright){ }}",'<li class="layui-icon layim-tool-about" layim-event="about" title="关于">&#xe60b;</li>',"{{# } }}","</ul>",'<div class="layui-layim-search"><input><label class="layui-icon" layim-event="closeSearch">&#x1007;</label></div>',"</div>"].join(""),m=['<ul class="layui-layim-skin">',"{{# layui.each(d.skin, function(index, item){ }}",'<li><img layim-event="setSkin" src="{{ item }}"></li>',"{{# }); }}",'<li layim-event="setSkin"><cite>简约</cite></li>',"</ul>"].join(""),f=['<div class="layim-chat layim-chat-{{d.data.type}}{{d.first ? " layui-show" : ""}}">','<div class="layui-unselect layim-chat-title">','<div class="layim-chat-other">','<img class="layim-{{ d.data.type }}{{ d.data.id }}" src="{{ d.data.avatar }}"><span class="layim-chat-username" layim-event="{{ d.data.type==="group" ? "groupMembers" : "" }}">{{ d.data.name||"佚名" }} {{d.data.temporary ? "<cite>临时会话</cite>" : ""}} {{# if(d.data.type==="group"){ }} <em class="layim-chat-members"></em><i class="layui-icon">&#xe61a;</i> {{# } }}</span>','<p class="layim-chat-status"></p>',"</div>","</div>",'<div class="layim-chat-main">',"<ul></ul>","</div>",'<div class="layim-chat-footer">','<div class="layui-unselect layim-chat-tool" data-json="{{encodeURIComponent(JSON.stringify(d.data))}}">','<span class="layui-icon layim-tool-face" title="选择表情" layim-event="face">&#xe60c;</span>',"{{# if(d.base && d.base.uploadImage){ }}",'<span class="layui-icon layim-tool-image" title="上传图片" layim-event="image">&#xe60d;<input type="file" name="file"></span>',"{{# }; }}","{{# if(d.base && d.base.uploadFile){ }}",'<span class="layui-icon layim-tool-image" title="发送文件" layim-event="image" data-type="file">&#xe61d;<input type="file" name="file"></span>',"{{# }; }}","{{# if(d.base && d.base.isAudio){ }}",'<span class="layui-icon layim-tool-audio" title="发送网络音频" layim-event="media" data-type="audio">&#xe6fc;</span>',"{{# }; }}","{{# if(d.base && d.base.isVideo){ }}",'<span class="layui-icon layim-tool-video" title="发送网络视频" layim-event="media" data-type="video">&#xe6ed;</span>',"{{# }; }}","{{# layui.each(d.base.tool, function(index, item){ }}",'<span class="layui-icon layim-tool-{{item.alias}}" title="{{item.title}}" layim-event="extend" lay-filter="{{ item.alias }}">{{item.icon}}</span>',"{{# }); }}","{{# if(d.base && d.base.chatLog){ }}",'<span class="layim-tool-log" layim-event="chatLog"><i class="layui-icon">&#xe60e;</i>聊天记录</span>',"{{# }; }}","</div>",'<div class="layim-chat-textarea"><textarea></textarea></div>','<div class="layim-chat-bottom">','<div class="layim-chat-send">',"{{# if(!d.base.brief){ }}",'<span class="layim-send-close" layim-event="closeThisChat">关闭</span>',"{{# } }}",'<span class="layim-send-btn" layim-event="send">发送</span>','<span class="layim-send-set" layim-event="setSend" lay-type="show"><em class="layui-edge"></em></span>','<ul class="layui-anim layim-menu-box">','<li {{d.local.sendHotKey !== "Ctrl+Enter" ? "class=layim-this" : ""}} layim-event="setSend" lay-type="Enter"><i class="layui-icon">&#xe618;</i>按Enter键发送消息</li>','<li {{d.local.sendHotKey === "Ctrl+Enter" ? "class=layim-this" : ""}} layim-event="setSend"  lay-type="Ctrl+Enter"><i class="layui-icon">&#xe618;</i>按Ctrl+Enter键发送消息</li>',"</ul>","</div>","</div>","</div>","</div>"].join(""),p=['<div class="layim-add-box">','<div class="layim-add-img"><img class="layui-circle" src="{{ d.data.avatar }}"><p>{{ d.data.name||"" }}</p></div>','<div class="layim-add-remark">','{{# if(d.data.type === "friend" && d.type === "setGroup"){ }}',"<p>选择分组</p>",'{{# } if(d.data.type === "friend"){ }}','<select class="layui-select" id="LAY_layimGroup">',"{{# layui.each(d.data.group, function(index, item){ }}",'<option value="{{ item.id }}">{{ item.groupname }}</option>',"{{# }); }}","</select>","{{# } }}",'{{# if(d.data.type === "group"){ }}',"<p>请输入验证信息</p>",'{{# } if(d.type !== "setGroup"){ }}','<textarea id="LAY_layimRemark" placeholder="验证信息" class="layui-textarea"></textarea>',"{{# } }}","</div>","</div>"].join(""),h=['<li {{ d.mine ? "class=layim-chat-mine" : "" }} {{# if(d.cid){ }}data-cid="{{d.cid}}"{{# } }}>','<div class="layim-chat-user"><img src="{{ d.avatar }}"><cite>',"{{# if(d.mine){ }}",'<i>{{ layui.data.date(d.timestamp) }}</i>{{ d.username||"佚名" }}',"{{# } else { }}",'{{ d.username||"佚名" }}<i>{{ layui.data.date(d.timestamp) }}</i>',"{{# } }}","</cite></div>",'<div class="layim-chat-text">{{ layui.data.content(d.content||"&nbsp") }}</div>',"</li>"].join(""),v='<li class="layim-{{ d.data.type }}{{ d.data.id }} layim-chatlist-{{ d.data.type }}{{ d.data.id }} layim-this" layim-event="tabChat"><img src="{{ d.data.avatar }}"><span>{{ d.data.name||"佚名" }}</span>{{# if(!d.base.brief){ }}<i class="layui-icon" layim-event="closeChat">&#x1007;</i>{{# } }}</li>',g=function(i){return i<10?"0"+(0|i):i};layui.data.date=function(i){var a=new Date(i||new Date);return a.getFullYear()+"-"+g(a.getMonth()+1)+"-"+g(a.getDate())+" "+g(a.getHours())+":"+g(a.getMinutes())+":"+g(a.getSeconds())},layui.data.content=function(i){var a=function(i){return new RegExp("\\n*\\["+(i||"")+"(code|pre|div|span|p|table|thead|th|tbody|tr|td|ul|li|ol|li|dl|dt|dd|h2|h3|h4|h5)([\\s\\S]*?)\\]\\n*","g")};return i=(i||"").replace(/&(?!#?[a-zA-Z0-9]+;)/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/'/g,"&#39;").replace(/"/g,"&quot;").replace(/@(\S+)(\s+?|$)/g,'@<a href="javascript:;">$1</a>$2').replace(/face\[([^\s\[\]]+?)\]/g,function(i){var a=i.replace(/^face/g,"");return'<img alt="'+a+'" title="'+a+'" src="'+X[a]+'">'}).replace(/img\[([^\s]+?)\]/g,function(i){return'<img class="layui-layim-photos" src="'+i.replace(/(^img\[)|(\]$)/g,"")+'">'}).replace(/file\([\s\S]+?\)\[[\s\S]*?\]/g,function(i){var a=(i.match(/file\(([\s\S]+?)\)\[/)||[])[1],e=(i.match(/\)\[([\s\S]*?)\]/)||[])[1];return a?'<a class="layui-layim-file" href="'+a+'" download target="_blank"><i class="layui-icon">&#xe61e;</i><cite>'+(e||a)+"</cite></a>":i}).replace(/audio\[([^\s]+?)\]/g,function(i){return'<div class="layui-unselect layui-layim-audio" layim-event="playAudio" data-src="'+i.replace(/(^audio\[)|(\]$)/g,"")+'"><i class="layui-icon">&#xe652;</i><p>音频消息</p></div>'}).replace(/video\[([^\s]+?)\]/g,function(i){return'<div class="layui-unselect layui-layim-video" layim-event="playVideo" data-src="'+i.replace(/(^video\[)|(\]$)/g,"")+'"><i class="layui-icon">&#xe652;</i></div>'}).replace(/a\([\s\S]+?\)\[[\s\S]*?\]/g,function(i){var a=(i.match(/a\(([\s\S]+?)\)\[/)||[])[1],e=(i.match(/\)\[([\s\S]*?)\]/)||[])[1];return a?'<a href="'+a+'" target="_blank">'+(e||a)+"</a>":i}).replace(a(),"<$1 $2>").replace(a("/"),"</$1>").replace(/\n/g,"<br>")};var x,b,w,k,C,S=function(i,a,n){return i=i||{},e.ajax({url:i.url,type:i.type||"get",data:i.data,dataType:i.dataType||"json",cache:!1,success:function(i){0==i.code?a&&a(i.data||{}):t.msg(i.msg||(n||"Error")+": LAYIM_NOT_GET_DATA",{time:5e3})},error:function(i,a){window.console&&console.log&&console.error("LAYIM_DATE_ERROR："+a)}})},j={message:{},chat:[]},H=function(i){var a=i.init||{};return mine=a.mine||{},local=layui.data("layim")[mine.id]||{},obj={base:i,local:local,mine:mine,history:local.history||{}},create=function(a){var t=a.mine||{},l=layui.data("layim")[t.id]||{},s={base:i,local:l,mine:t,friend:a.friend||[],group:a.group||[],history:l.history||{}};j=e.extend(j,s),L(n(y).render(s)),(l.close||i.min)&&T(),layui.each(r.ready,function(i,a){a&&a(s)})},j=e.extend(j,obj),i.brief?layui.each(r.ready,function(i,a){a&&a(obj)}):void(a.url?S(a,create,"INIT"):create(a))},L=function(i){return t.open({type:1,area:["260px","520px"],skin:"layui-box layui-layim",title:"&#8203;",offset:"rb",id:"layui-layim",shade:!1,anim:2,resize:!1,content:i,success:function(i){x=i,R(i),j.base.right&&i.css("margin-left","-"+j.base.right),b&&t.close(b.attr("times"));var a=[],n=i.find(".layim-list-history");n.find("li").each(function(){a.push(e(this).prop("outerHTML"))}),a.length>0&&(a.reverse(),n.html(a.join(""))),A(),ti.sign()},cancel:function(i){T();var a=layui.data("layim")[j.mine.id]||{};return a.close=!0,layui.data("layim",{key:j.mine.id,value:a}),!1}})},A=function(){x.on("contextmenu",function(i){return i.cancelBubble=!0,i.returnValue=!1,!1});var i=function(){t.closeAll("tips")};x.find(".layim-list-history").on("contextmenu","li",function(a){var n=e(this),l='<ul data-id="'+n[0].id+'" data-index="'+n.data("index")+'"><li layim-event="menuHistory" data-type="one">移除该会话</li><li layim-event="menuHistory" data-type="all">清空全部会话列表</li></ul>';n.hasClass("layim-null")||(t.tips(l,this,{tips:1,time:0,anim:5,fixed:!0,skin:"layui-box layui-layim-contextmenu",success:function(i){var a=function(i){ii(i)};i.off("mousedown",a).on("mousedown",a)}}),e(document).off("mousedown",i).on("mousedown",i),e(window).off("resize",i).on("resize",i))})},T=function(i){return b&&t.close(b.attr("times")),x&&x.hide(),j.mine=j.mine||{},t.open({type:1,title:!1,id:"layui-layim-close",skin:"layui-box layui-layim-min layui-layim-close",shade:!1,closeBtn:!1,anim:2,offset:"rb",resize:!1,content:'<img src="'+(j.mine.avatar||layui.cache.dir+"css/pc/layim/skin/logo.jpg")+'"><span>'+(i||j.base.title||"我的LayIM")+"</span>",move:"#layui-layim-close img",success:function(i,a){b=i,j.base.right&&i.css("margin-left","-"+j.base.right),i.on("click",function(){t.close(a),x.show();var i=layui.data("layim")[j.mine.id]||{};delete i.close,layui.data("layim",{key:j.mine.id,value:i})})}})},z=function(i){i=i||{};var a=e("#layui-layim-chat"),l={data:i,base:j.base,local:j.local};if(!i.id)return t.msg("非法用户");if(a[0]){var s=w.find(".layim-chat-list"),o=s.find(".layim-chatlist-"+i.type+i.id),d=w.find(".layui-layer-max").hasClass("layui-layer-maxmin"),c=a.children(".layim-chat-box");return"none"===w.css("display")&&w.show(),k&&t.close(k.attr("times")),1!==s.find("li").length||o[0]||(d||w.css("width",800),s.css({height:w.height()}).show(),c.css("margin-left","200px")),o[0]||(s.append(n(v).render(l)),c.append(n(f).render(l)),I(i),E()),O(s.find(".layim-chatlist-"+i.type+i.id)),o[0]||U(),$(i),Q(),C}l.first=!0;var u=C=t.open({type:1,area:"600px",skin:"layui-box layui-layim-chat",id:"layui-layim-chat",title:"&#8203;",shade:!1,maxmin:!0,offset:i.offset||"auto",anim:i.anim||0,closeBtn:!j.base.brief&&1,content:n('<ul class="layui-unselect layim-chat-list">'+v+'</ul><div class="layim-chat-box">'+f+"</div>").render(l),success:function(a){w=a,a.css({"min-width":"500px","min-height":"420px"}),I(i),"function"==typeof i.success&&i.success(a),Q(),R(a),$(i),U(),q(),layui.each(r.chatChange,function(i,a){a&&a(_())}),a.on("dblclick",".layui-layim-photos",function(){var i=this.src;t.close(z.photosIndex),t.photos({photos:{data:[{alt:"大图模式",src:i}]},shade:.01,closeBtn:2,anim:0,resize:!1,success:function(i,a){z.photosIndex=a}})})},full:function(i){t.style(u,{width:"100%",height:"100%"},!0),E()},resizing:E,restore:E,min:function(){return N(),!1},end:function(){t.closeAll("tips"),w=null}});return u},I=function(i){e(".layim-"+i.type+i.id).each(function(){e(this).hasClass("layim-list-gray")&&layui.layim.setFriendStatus(i.id,"offline")})},E=function(){var i=w.find(".layim-chat-list"),a=w.find(".layim-chat-main"),e=w.height();i.css({height:e}),a.css({height:e-20-80-158})},N=function(i){var a=i||_().data,n=layui.layim.cache().base;w&&!i&&w.hide(),t.close(N.index),N.index=t.open({type:1,title:!1,skin:"layui-box layui-layim-min",shade:!1,closeBtn:!1,anim:a.anim||2,offset:"b",move:"#layui-layim-min",resize:!1,area:["182px","50px"],content:'<img id="layui-layim-min" src="'+a.avatar+'"><span>'+a.name+"</span>",success:function(a,l){i||(k=a),n.minRight&&t.style(l,{left:e(window).width()-a.outerWidth()-parseFloat(n.minRight)}),a.find(".layui-layer-content span").on("click",function(){t.close(l),i?layui.each(j.chat,function(i,a){z(a)}):w.show(),i&&(j.chat=[],Z())}),a.find(".layui-layer-content img").on("click",function(i){ii(i)})}})},M=function(i,a){return i=i||{},t.close(M.index),M.index=t.open({type:1,area:"430px",title:{friend:"添加好友",group:"加入群组"}[i.type]||"",shade:!1,resize:!1,btn:a?["确认","取消"]:["发送申请","关闭"],content:n(p).render({data:{name:i.username||i.groupname,avatar:i.avatar,group:i.group||parent.layui.layim.cache().friend||[],type:i.type},type:a}),yes:function(e,t){var n=t.find("#LAY_layimGroup"),l=t.find("#LAY_layimRemark");a?i.submit&&i.submit(n.val(),e):i.submit&&i.submit(n.val(),l.val(),e)}})},O=function(i,a){i=i||e(".layim-chat-list ."+o);var n=i.index()===-1?0:i.index(),l=".layim-chat",d=w.find(l).eq(n),c=w.find(".layui-layer-max").hasClass("layui-layer-maxmin");if(a){i.hasClass(o)&&O(0===n?i.next():i.prev());var u=w.find(l).length;return 1===u?t.close(C):(i.remove(),d.remove(),2===u&&(w.find(".layim-chat-list").hide(),c||w.css("width","600px"),w.find(".layim-chat-box").css("margin-left",0)),!1)}i.addClass(o).siblings().removeClass(o),d.addClass(s).siblings(l).removeClass(s),d.find("textarea").focus(),layui.each(r.chatChange,function(i,a){a&&a(_())}),q()},q=function(){var i=_(),a=j.message[i.data.type+i.data.id];a&&delete j.message[i.data.type+i.data.id]},_=c.prototype.thisChat=function(){if(w){var i=e(".layim-chat-list ."+o).index(),a=w.find(".layim-chat").eq(i),t=JSON.parse(decodeURIComponent(a.find(".layim-chat-tool").data("json")));return{elem:a,data:t,textarea:a.find("textarea")}}},R=function(i){var a=layui.data("layim")[j.mine.id]||{},e=a.skin;i.css({"background-image":e?"url("+e+")":function(){return j.base.initSkin?"url("+(layui.cache.dir+"css/modules/layim/skin/"+j.base.initSkin)+")":"none"}()})},$=function(i){var a=layui.data("layim")[j.mine.id]||{},e={},t=a.history||{},l=t[i.type+i.id];if(x){var s=x.find(".layim-list-history");if(i.historyTime=(new Date).getTime(),t[i.type+i.id]=i,a.history=t,layui.data("layim",{key:j.mine.id,value:a}),!l){e[i.type+i.id]=i;var o=n(u({type:"history",item:"d.data"})).render({data:e});s.prepend(o),s.find(".layim-null").remove()}}},D=function(){var i={username:j.mine?j.mine.username:"访客",avatar:j.mine?j.mine.avatar:layui.cache.dir+"css/pc/layim/skin/logo.jpg",id:j.mine?j.mine.id:null,mine:!0},a=_(),e=a.elem.find(".layim-chat-main ul"),l=j.base.maxLength||3e3;if(i.content=a.textarea.val(),""!==i.content.replace(/\s/g,"")){if(i.content.length>l)return t.msg("内容最长不能超过"+l+"个字符");e.append(n(h).render(i));var s={mine:i,to:a.data},o={username:s.mine.username,avatar:s.mine.avatar,id:s.to.id,type:s.to.type,content:s.mine.content,timestamp:(new Date).getTime(),mine:!0};B(o),layui.each(r.sendMessage,function(i,a){a&&a(s)})}Z(),a.textarea.val("").focus()},J=function(i){if(i=i||{},window.Notification)if("granted"===Notification.permission){new Notification(i.title||"",{body:i.content||"",icon:i.avatar||"http://tp2.sinaimg.cn/5488749285/50/5719808192/1"})}else Notification.requestPermission()},F=function(){if(!(l.ie&&l.ie<9)){var i=document.createElement("audio");i.src=layui.cache.dir+"css/modules/layim/voice/"+j.base.voice,i.play()}},G={},K=function(i){i=i||{};var a=e(".layim-chatlist-"+i.type+i.id),t={},l=a.index();if(i.timestamp=i.timestamp||(new Date).getTime(),i.fromid==j.mine.id&&(i.mine=!0),i.system||B(i),G=JSON.parse(JSON.stringify(i)),j.base.voice&&F(),!w&&i.content||l===-1){if(j.message[i.type+i.id])j.message[i.type+i.id].push(i);else if(j.message[i.type+i.id]=[i],"friend"===i.type){var s;layui.each(j.friend,function(a,e){if(layui.each(e.list,function(a,e){if(e.id==i.id)return e.type="friend",e.name=e.username,j.chat.push(e),s=!0}),s)return!0}),s||(i.name=i.username,i.temporary=!0,j.chat.push(i))}else if("group"===i.type){var o;layui.each(j.group,function(a,e){if(e.id==i.id)return e.type="group",e.name=e.groupname,j.chat.push(e),o=!0}),o||(i.name=i.groupname,j.chat.push(i))}else i.name=i.name||i.username||i.groupname,j.chat.push(i);if("group"===i.type&&layui.each(j.group,function(a,e){if(e.id==i.id)return t.avatar=e.avatar,!0}),!i.system)return j.base.notice&&J({title:"来自 "+i.username+" 的消息",content:i.content,avatar:t.avatar||i.avatar}),N({name:"收到新消息",avatar:t.avatar||i.avatar,anim:6})}if(w){var d=_();d.data.type+d.data.id!==i.type+i.id&&(a.addClass("layui-anim layer-anim-06"),setTimeout(function(){a.removeClass("layui-anim layer-anim-06")},300));var r=w.find(".layim-chat").eq(l),c=r.find(".layim-chat-main ul");i.system?l!==-1&&c.append('<li class="layim-chat-system"><span>'+i.content+"</span></li>"):""!==i.content.replace(/\s/g,"")&&c.append(n(h).render(i)),Z()}},Y="layui-anim-loop layer-anim-05",V=function(i){var a=x.find(".layim-tool-msgbox");a.find("span").addClass(Y).html(i)},B=function(i){var a=layui.data("layim")[j.mine.id]||{};a.chatlog=a.chatlog||{};var e=a.chatlog[i.type+i.id];if(e){var t;layui.each(e,function(a,e){e.timestamp===i.timestamp&&e.type===i.type&&e.id===i.id&&e.content===i.content&&(t=!0)}),t||i.fromid==j.mine.id||e.push(i),e.length>d&&e.shift()}else a.chatlog[i.type+i.id]=[i];layui.data("layim",{key:j.mine.id,value:a})},U=function(){var i=layui.data("layim")[j.mine.id]||{},a=_(),e=i.chatlog||{},t=a.elem.find(".layim-chat-main ul");layui.each(e[a.data.type+a.data.id],function(i,a){t.append(n(h).render(a))}),Z()},P=function(i){var a,e={},l=x.find(".layim-list-"+i.type);if(j[i.type])if("friend"===i.type)layui.each(j.friend,function(n,l){if(i.groupid==l.id)return layui.each(j.friend[n].list,function(e,t){if(t.id==i.id)return a=!0}),a?t.msg("好友 ["+(i.username||"")+"] 已经存在列表中",{anim:6}):(j.friend[n].list=j.friend[n].list||[],e[j.friend[n].list.length]=i,i.groupIndex=n,j.friend[n].list.push(i),!0)});else if("group"===i.type){if(layui.each(j.group,function(e,t){if(t.id==i.id)return a=!0}),a)return t.msg("您已是 ["+(i.groupname||"")+"] 的群成员",{anim:6});e[j.group.length]=i,j.group.push(i)}if(!a){var s=n(u({type:i.type,item:"d.data",index:"friend"===i.type?"data.groupIndex":null})).render({data:e});if("friend"===i.type){var o=l.find(">li").eq(i.groupIndex);o.find(".layui-layim-list").append(s),o.find(".layim-count").html(j.friend[i.groupIndex].list.length),o.find(".layim-null")[0]&&o.find(".layim-null").remove()}else"group"===i.type&&(l.append(s),l.find(".layim-null")[0]&&l.find(".layim-null").remove())}},W=function(i){var a=x.find(".layim-list-"+i.type);j[i.type]&&("friend"===i.type?layui.each(j.friend,function(e,t){layui.each(t.list,function(t,n){if(i.id==n.id){var l=a.find(">li").eq(e);l.find(".layui-layim-list>li");return l.find(".layui-layim-list>li").eq(t).remove(),j.friend[e].list.splice(t,1),l.find(".layim-count").html(j.friend[e].list.length),0===j.friend[e].list.length&&l.find(".layui-layim-list").html('<li class="layim-null">该分组下已无好友了</li>'),!0}})}):"group"===i.type&&layui.each(j.group,function(e,t){if(i.id==t.id)return a.find(">li").eq(e).remove(),j.group.splice(e,1),0===j.group.length&&a.html('<li class="layim-null">暂无群组</li>'),!0}))},Z=function(){var i=_(),a=i.elem.find(".layim-chat-main"),e=a.find("ul"),t=e.find("li").length;if(t>=d){var n=e.find("li").eq(0);e.prev().hasClass("layim-chat-system")||e.before('<div class="layim-chat-system"><span layim-event="chatLog">查看更多记录</span></div>'),t>d&&n.remove()}a.scrollTop(a[0].scrollHeight+1e3),a.find("ul li:last").find("img").load(function(){a.scrollTop(a[0].scrollHeight+1e3)})},Q=function(){var i=_(),a=i.textarea;a.focus(),a.off("keydown").on("keydown",function(i){var e=layui.data("layim")[j.mine.id]||{},t=i.keyCode;if("Ctrl+Enter"===e.sendHotKey)return void(i.ctrlKey&&13===t&&D());if(13===t){if(i.ctrlKey)return a.val(a.val()+"\n");if(i.shiftKey)return;i.preventDefault(),D()}})},X=function(){var i=["[微笑]","[嘻嘻]","[哈哈]","[可爱]","[可怜]","[挖鼻]","[吃惊]","[害羞]","[挤眼]","[闭嘴]","[鄙视]","[爱你]","[泪]","[偷笑]","[亲亲]","[生病]","[太开心]","[白眼]","[右哼哼]","[左哼哼]","[嘘]","[衰]","[委屈]","[吐]","[哈欠]","[抱抱]","[怒]","[疑问]","[馋嘴]","[拜拜]","[思考]","[汗]","[困]","[睡]","[钱]","[失望]","[酷]","[色]","[哼]","[鼓掌]","[晕]","[悲伤]","[抓狂]","[黑线]","[阴险]","[怒骂]","[互粉]","[心]","[伤心]","[猪头]","[熊猫]","[兔子]","[ok]","[耶]","[good]","[NO]","[赞]","[来]","[弱]","[草泥马]","[神马]","[囧]","[浮云]","[给力]","[围观]","[威武]","[奥特曼]","[礼物]","[钟]","[话筒]","[蜡烛]","[蛋糕]"],a={};return layui.each(i,function(i,e){a[e]=layui.cache.dir+"images/face/"+i+".gif"}),a}(),ii=layui.stope,ai=function(i,a){var e,t=i.value;i.focus(),document.selection?(e=document.selection.createRange(),document.selection.empty(),e.text=a):(e=[t.substring(0,i.selectionStart),a,t.substr(i.selectionEnd)],i.focus(),i.value=e.join(""))},ei="layui-anim-upbit",ti={status:function(i,a){var t=function(){i.next().hide().removeClass(ei)},n=i.attr("lay-type");if("show"===n)ii(a),i.next().show().addClass(ei),e(document).off("click",t).on("click",t);else{var l=i.parent().prev();i.addClass(o).siblings().removeClass(o),l.html(i.find("cite").html()),l.removeClass("layim-status-"+("online"===n?"hide":"online")).addClass("layim-status-"+n),layui.each(r.online,function(i,a){a&&a(n)})}},sign:function(){var i=x.find(".layui-layim-remark");i.on("change",function(){var i=this.value;layui.each(r.sign,function(a,e){e&&e(i)})}),i.on("keyup",function(i){var a=i.keyCode;13===a&&this.blur()})},tab:function(i){var a,e=".layim-tab-content",t=x.find(".layui-layim-tab>li");"number"==typeof i?(a=i,i=t.eq(a)):a=i.index(),a>2?t.removeClass(o):(ti.tab.index=a,i.addClass(o).siblings().removeClass(o)),x.find(e).eq(a).addClass(s).siblings(e).removeClass(s)},spread:function(i){var a=i.attr("lay-type"),e="true"===a?"false":"true",t=layui.data("layim")[j.mine.id]||{};i.next()["true"===a?"removeClass":"addClass"](s),t["spread"+i.parent().index()]=e,layui.data("layim",{key:j.mine.id,value:t}),i.attr("lay-type",e),i.find(".layui-icon").html("true"===e?"&#xe61a;":"&#xe602;")},search:function(i){var a=x.find(".layui-layim-search"),e=x.find("#layui-layim-search"),t=a.find("input"),n=function(i){var a=t.val().replace(/\s/);if(""===a)ti.tab(0|ti.tab.index);else{for(var n=[],l=j.friend||[],s=j.group||[],o="",d=0;d<l.length;d++)for(var r=0;r<(l[d].list||[]).length;r++)l[d].list[r].username.indexOf(a)!==-1&&(l[d].list[r].type="friend",l[d].list[r].index=d,l[d].list[r].list=r,n.push(l[d].list[r]));for(var c=0;c<s.length;c++)s[c].groupname.indexOf(a)!==-1&&(s[c].type="group",s[c].index=c,s[c].list=c,n.push(s[c]));if(n.length>0)for(var u=0;u<n.length;u++)o+='<li layim-event="chat" data-type="'+n[u].type+'" data-index="'+n[u].index+'" data-list="'+n[u].list+'"><img src="'+n[u].avatar+'"><span>'+(n[u].username||n[u].groupname||"佚名")+"</span><p>"+(n[u].remark||n[u].sign||"")+"</p></li>";else o='<li class="layim-null">无搜索结果</li>';e.html(o),ti.tab(3)}};!j.base.isfriend&&j.base.isgroup?ti.tab.index=1:j.base.isfriend||j.base.isgroup||(ti.tab.index=2),a.show(),t.focus(),t.off("keyup",n).on("keyup",n)},closeSearch:function(i){i.parent().hide(),ti.tab(0|ti.tab.index)},msgbox:function(){var i=x.find(".layim-tool-msgbox");return t.close(ti.msgbox.index),i.find("span").removeClass(Y).html(""),ti.msgbox.index=t.open({type:2,title:"消息盒子",shade:!1,maxmin:!0,area:["600px","520px"],skin:"layui-box layui-layer-border",resize:!1,content:j.base.msgbox})},find:function(){return t.close(ti.find.index),ti.find.index=t.open({type:2,title:"查找",shade:!1,maxmin:!0,area:["1000px","520px"],skin:"layui-box layui-layer-border",resize:!1,content:j.base.find})},skin:function(){t.open({type:1,title:"更换背景",shade:!1,area:"300px",skin:"layui-box layui-layer-border",id:"layui-layim-skin",zIndex:66666666,resize:!1,content:n(m).render({skin:j.base.skin})})},about:function(){t.alert("版本： "+a+'<br>版权所有：<a href="http://layim.layui.com" target="_blank">layim.layui.com</a>',{title:"关于 LayIM",shade:!1})},setSkin:function(i){var a=i.attr("src"),e=layui.data("layim")[j.mine.id]||{};e.skin=a,a||delete e.skin,layui.data("layim",{key:j.mine.id,value:e});try{x.css({"background-image":a?"url("+a+")":"none"}),w.css({"background-image":a?"url("+a+")":"none"})}catch(t){}layui.each(r.setSkin,function(i,e){var t=(a||"").replace(layui.cache.dir+"css/modules/layim/skin/","");e&&e(t,a)})},chat:function(i){var a=layui.data("layim")[j.mine.id]||{},e=i.data("type"),t=i.data("index"),n=i.attr("data-list")||i.index(),l={};"friend"===e?l=j[e][t].list[n]:"group"===e?l=j[e][n]:"history"===e&&(l=(a.history||{})[t]||{}),l.name=l.name||l.username||l.groupname,"history"!==e&&(l.type=e),z(l)},tabChat:function(i){O(i)},closeChat:function(i,a){O(i.parent(),1),ii(a)},closeThisChat:function(){O(null,1)},groupMembers:function(i,a){var n=i.find(".layui-icon"),l=function(){n.html("&#xe61a;"),i.data("down",null),t.close(ti.groupMembers.index)},s=function(i){ii(i)};i.data("down")?l():(n.html("&#xe619;"),i.data("down",!0),ti.groupMembers.index=t.tips('<ul class="layim-members-list"></ul>',i,{tips:3,time:0,anim:5,fixed:!0,skin:"layui-box layui-layim-members",success:function(a){var t=j.base.members||{},n=_(),s=a.find(".layim-members-list"),o="",d={},c=w.find(".layui-layer-max").hasClass("layui-layer-maxmin"),u="none"===w.find(".layim-chat-list").css("display");c&&s.css({width:e(window).width()-22-(u||200)}),t.data=e.extend(t.data,{id:n.data.id}),S(t,function(a){layui.each(a.list,function(i,a){o+='<li data-uid="'+a.id+'"><a href="javascript:;"><img src="'+a.avatar+'"><cite>'+a.username+"</cite></a></li>",d[a.id]=a}),s.html(o),i.find(".layim-chat-members").html(a.members||(a.list||[]).length+"人"),s.find("li").on("click",function(){var i=e(this).data("uid"),a=d[i];z({name:a.username,type:"friend",avatar:a.avatar,id:a.id}),l()}),layui.each(r.members,function(i,e){e&&e(a)})}),a.on("mousedown",function(i){ii(i)})}}),e(document).off("mousedown",l).on("mousedown",l),e(window).off("resize",l).on("resize",l),i.off("mousedown",s).on("mousedown",s))},send:function(){D()},setSend:function(i,a){var t=ti.setSend.box=i.siblings(".layim-menu-box"),n=i.attr("lay-type");if("show"===n)ii(a),t.show().addClass(ei),e(document).off("click",ti.setSendHide).on("click",ti.setSendHide);else{i.addClass(o).siblings().removeClass(o);var l=layui.data("layim")[j.mine.id]||{};l.sendHotKey=n,layui.data("layim",{key:j.mine.id,value:l}),ti.setSendHide(a,i.parent())}},setSendHide:function(i,a){(a||ti.setSend.box).hide().removeClass(ei)},face:function(i,a){var n="",l=_();for(var s in X)n+='<li title="'+s+'"><img src="'+X[s]+'"></li>';n='<ul class="layui-clear layim-face-list">'+n+"</ul>",ti.face.index=t.tips(n,i,{tips:1,time:0,fixed:!0,skin:"layui-box layui-layim-face",success:function(i){i.find(".layim-face-list>li").on("mousedown",function(i){ii(i)}).on("click",function(){ai(l.textarea[0],"face"+this.title+" "),t.close(ti.face.index);
+})}}),e(document).off("mousedown",ti.faceHide).on("mousedown",ti.faceHide),e(window).off("resize",ti.faceHide).on("resize",ti.faceHide),ii(a)},faceHide:function(){t.close(ti.face.index)},image:function(i){var a=i.data("type")||"images",e={images:"uploadImage",file:"uploadFile"},n=_(),l=j.base[e[a]]||{};layui.upload.render({url:l.url||"",method:l.type,elem:i.find("input")[0],accept:a,done:function(i){0==i.code?(i.data=i.data||{},"images"===a?ai(n.textarea[0],"img["+(i.data.src||"")+"]"):"file"===a&&ai(n.textarea[0],"file("+(i.data.src||"")+")["+(i.data.name||"下载文件")+"]"),D()):t.msg(i.msg||"上传失败")}})},media:function(i){var a=i.data("type"),n={audio:"音频",video:"视频"},l=_();t.prompt({title:"请输入网络"+n[a]+"地址",shade:!1,offset:[i.offset().top-e(window).scrollTop()-158+"px",i.offset().left+"px"]},function(i,e){ai(l.textarea[0],a+"["+i+"]"),D(),t.close(e)})},extend:function(i){var a=i.attr("lay-filter"),e=_();layui.each(r["tool("+a+")"],function(a,t){t&&t.call(i,function(i){ai(e.textarea[0],i)},D,e)})},playAudio:function(i){var a=i.data("audio"),e=a||document.createElement("audio"),n=function(){e.pause(),i.removeAttr("status"),i.find("i").html("&#xe652;")};return i.data("error")?t.msg("播放音频源异常"):e.play?void(i.attr("status")?n():(a||(e.src=i.data("src")),e.play(),i.attr("status","pause"),i.data("audio",e),i.find("i").html("&#xe651;"),e.onended=function(){n()},e.onerror=function(){t.msg("播放音频源异常"),i.data("error",!0),n()})):t.msg("您的浏览器不支持audio")},playVideo:function(i){var a=i.data("src"),e=document.createElement("video");return e.play?(t.close(ti.playVideo.index),void(ti.playVideo.index=t.open({type:1,title:"播放视频",area:["460px","300px"],maxmin:!0,shade:!1,content:'<div style="background-color: #000; height: 100%;"><video style="position: absolute; width: 100%; height: 100%;" src="'+a+'" loop="loop" autoplay="autoplay"></video></div>'}))):t.msg("您的浏览器不支持video")},chatLog:function(i){var a=_();return j.base.chatLog?(t.close(ti.chatLog.index),ti.chatLog.index=t.open({type:2,maxmin:!0,title:"与 "+a.data.name+" 的聊天记录",area:["450px","100%"],shade:!1,offset:"rb",skin:"layui-box",anim:2,id:"layui-layim-chatlog",content:j.base.chatLog+"?id="+a.data.id+"&type="+a.data.type})):t.msg("未开启更多聊天记录")},menuHistory:function(i,a){var n=layui.data("layim")[j.mine.id]||{},l=i.parent(),s=i.data("type"),o=x.find(".layim-list-history"),d='<li class="layim-null">暂无历史会话</li>';if("one"===s){var r=n.history;delete r[l.data("index")],n.history=r,layui.data("layim",{key:j.mine.id,value:n}),e("#"+l.data("id")).remove(),0===o.find("li").length&&o.html(d)}else"all"===s&&(delete n.history,layui.data("layim",{key:j.mine.id,value:n}),o.html(d));t.closeAll("tips")}};i("layim",new c)}).addcss("modules/layim/layim.css?v=3.7.7","skinlayimcss");
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/lay/modules/laypage.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/lay/modules/laypage.js
new file mode 100644
index 0000000..2cf64d5
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/lay/modules/laypage.js
@@ -0,0 +1,2 @@
+/** layui-v2.3.0 MIT License By https://www.layui.com */
+ ;layui.define(function(e){"use strict";var a=document,t="getElementById",n="getElementsByTagName",i="laypage",r="layui-disabled",u=function(e){var a=this;a.config=e||{},a.config.index=++s.index,a.render(!0)};u.prototype.type=function(){var e=this.config;if("object"==typeof e.elem)return void 0===e.elem.length?2:3},u.prototype.view=function(){var e=this,a=e.config,t=a.groups="groups"in a?0|a.groups:5;a.layout="object"==typeof a.layout?a.layout:["prev","page","next"],a.count=0|a.count,a.curr=0|a.curr||1,a.limits="object"==typeof a.limits?a.limits:[10,20,30,40,50],a.limit=0|a.limit||10,a.pages=Math.ceil(a.count/a.limit)||1,a.curr>a.pages&&(a.curr=a.pages),t<0?t=1:t>a.pages&&(t=a.pages),a.prev="prev"in a?a.prev:"&#x4E0A;&#x4E00;&#x9875;",a.next="next"in a?a.next:"&#x4E0B;&#x4E00;&#x9875;";var n=a.pages>t?Math.ceil((a.curr+(t>1?1:0))/(t>0?t:1)):1,i={prev:function(){return a.prev?'<a href="javascript:;" class="layui-laypage-prev'+(1==a.curr?" "+r:"")+'" data-page="'+(a.curr-1)+'">'+a.prev+"</a>":""}(),page:function(){var e=[];if(a.count<1)return"";n>1&&a.first!==!1&&0!==t&&e.push('<a href="javascript:;" class="layui-laypage-first" data-page="1"  title="&#x9996;&#x9875;">'+(a.first||1)+"</a>");var i=Math.floor((t-1)/2),r=n>1?a.curr-i:1,u=n>1?function(){var e=a.curr+(t-i-1);return e>a.pages?a.pages:e}():t;for(u-r<t-1&&(r=u-t+1),a.first!==!1&&r>2&&e.push('<span class="layui-laypage-spr">&#x2026;</span>');r<=u;r++)r===a.curr?e.push('<span class="layui-laypage-curr"><em class="layui-laypage-em" '+(/^#/.test(a.theme)?'style="background-color:'+a.theme+';"':"")+"></em><em>"+r+"</em></span>"):e.push('<a href="javascript:;" data-page="'+r+'">'+r+"</a>");return a.pages>t&&a.pages>u&&a.last!==!1&&(u+1<a.pages&&e.push('<span class="layui-laypage-spr">&#x2026;</span>'),0!==t&&e.push('<a href="javascript:;" class="layui-laypage-last" title="&#x5C3E;&#x9875;"  data-page="'+a.pages+'">'+(a.last||a.pages)+"</a>")),e.join("")}(),next:function(){return a.next?'<a href="javascript:;" class="layui-laypage-next'+(a.curr==a.pages?" "+r:"")+'" data-page="'+(a.curr+1)+'">'+a.next+"</a>":""}(),count:'<span class="layui-laypage-count">共 '+a.count+" 条</span>",limit:function(){var e=['<span class="layui-laypage-limits"><select lay-ignore>'];return layui.each(a.limits,function(t,n){e.push('<option value="'+n+'"'+(n===a.limit?"selected":"")+">"+n+" 条/页</option>")}),e.join("")+"</select></span>"}(),refresh:['<a href="javascript:;" data-page="'+a.curr+'" class="layui-laypage-refresh">','<i class="layui-icon layui-icon-refresh"></i>',"</a>"].join(""),skip:function(){return['<span class="layui-laypage-skip">&#x5230;&#x7B2C;','<input type="text" min="1" value="'+a.curr+'" class="layui-input">','&#x9875;<button type="button" class="layui-laypage-btn">&#x786e;&#x5b9a;</button>',"</span>"].join("")}()};return['<div class="layui-box layui-laypage layui-laypage-'+(a.theme?/^#/.test(a.theme)?"molv":a.theme:"default")+'" id="layui-laypage-'+a.index+'">',function(){var e=[];return layui.each(a.layout,function(a,t){i[t]&&e.push(i[t])}),e.join("")}(),"</div>"].join("")},u.prototype.jump=function(e,a){if(e){var t=this,i=t.config,r=e.children,u=e[n]("button")[0],l=e[n]("input")[0],p=e[n]("select")[0],c=function(){var e=0|l.value.replace(/\s|\D/g,"");e&&(i.curr=e,t.render())};if(a)return c();for(var o=0,y=r.length;o<y;o++)"a"===r[o].nodeName.toLowerCase()&&s.on(r[o],"click",function(){var e=0|this.getAttribute("data-page");e<1||e>i.pages||(i.curr=e,t.render())});p&&s.on(p,"change",function(){var e=this.value;i.curr*e>i.count&&(i.curr=Math.ceil(i.count/e)),i.limit=e,t.render()}),u&&s.on(u,"click",function(){c()})}},u.prototype.skip=function(e){if(e){var a=this,t=e[n]("input")[0];t&&s.on(t,"keyup",function(t){var n=this.value,i=t.keyCode;/^(37|38|39|40)$/.test(i)||(/\D/.test(n)&&(this.value=n.replace(/\D/,"")),13===i&&a.jump(e,!0))})}},u.prototype.render=function(e){var n=this,i=n.config,r=n.type(),u=n.view();2===r?i.elem&&(i.elem.innerHTML=u):3===r?i.elem.html(u):a[t](i.elem)&&(a[t](i.elem).innerHTML=u),i.jump&&i.jump(i,e);var s=a[t]("layui-laypage-"+i.index);n.jump(s),i.hash&&!e&&(location.hash="!"+i.hash+"="+i.curr),n.skip(s)};var s={render:function(e){var a=new u(e);return a.index},index:layui.laypage?layui.laypage.index+1e4:0,on:function(e,a,t){return e.attachEvent?e.attachEvent("on"+a,function(a){a.target=a.srcElement,t.call(e,a)}):e.addEventListener(a,t,!1),this}};e(i,s)});
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/lay/modules/laytpl.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/lay/modules/laytpl.js
new file mode 100644
index 0000000..9e694d7
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/lay/modules/laytpl.js
@@ -0,0 +1,2 @@
+/** layui-v2.3.0 MIT License By https://www.layui.com */
+ ;layui.define(function(e){"use strict";var r={open:"{{",close:"}}"},c={exp:function(e){return new RegExp(e,"g")},query:function(e,c,t){var o=["#([\\s\\S])+?","([^{#}])*?"][e||0];return n((c||"")+r.open+o+r.close+(t||""))},escape:function(e){return String(e||"").replace(/&(?!#?[a-zA-Z0-9]+;)/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/'/g,"&#39;").replace(/"/g,"&quot;")},error:function(e,r){var c="Laytpl Error：";return"object"==typeof console&&console.error(c+e+"\n"+(r||"")),c+e}},n=c.exp,t=function(e){this.tpl=e};t.pt=t.prototype,window.errors=0,t.pt.parse=function(e,t){var o=this,p=e,a=n("^"+r.open+"#",""),l=n(r.close+"$","");e=e.replace(/\s+|\r|\t|\n/g," ").replace(n(r.open+"#"),r.open+"# ").replace(n(r.close+"}"),"} "+r.close).replace(/\\/g,"\\\\").replace(n(r.open+"!(.+?)!"+r.close),function(e){return e=e.replace(n("^"+r.open+"!"),"").replace(n("!"+r.close),"").replace(n(r.open+"|"+r.close),function(e){return e.replace(/(.)/g,"\\$1")})}).replace(/(?="|')/g,"\\").replace(c.query(),function(e){return e=e.replace(a,"").replace(l,""),'";'+e.replace(/\\/g,"")+';view+="'}).replace(c.query(1),function(e){var c='"+(';return e.replace(/\s/g,"")===r.open+r.close?"":(e=e.replace(n(r.open+"|"+r.close),""),/^=/.test(e)&&(e=e.replace(/^=/,""),c='"+_escape_('),c+e.replace(/\\/g,"")+')+"')}),e='"use strict";var view = "'+e+'";return view;';try{return o.cache=e=new Function("d, _escape_",e),e(t,c.escape)}catch(u){return delete o.cache,c.error(u,p)}},t.pt.render=function(e,r){var n,t=this;return e?(n=t.cache?t.cache(e,c.escape):t.parse(t.tpl,e),r?void r(n):n):c.error("no data")};var o=function(e){return"string"!=typeof e?c.error("Template not found"):new t(e)};o.config=function(e){e=e||{};for(var c in e)r[c]=e[c]},o.v="1.2.0",e("laytpl",o)});
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/lay/modules/mobile.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/lay/modules/mobile.js
new file mode 100644
index 0000000..c3bb559
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/lay/modules/mobile.js
@@ -0,0 +1,2 @@
+/** layui-v2.3.0 MIT License By https://www.layui.com */
+ ;layui.define(function(i){i("layui.mobile",layui.v)});layui.define(function(e){"use strict";var r={open:"{{",close:"}}"},c={exp:function(e){return new RegExp(e,"g")},query:function(e,c,t){var o=["#([\\s\\S])+?","([^{#}])*?"][e||0];return n((c||"")+r.open+o+r.close+(t||""))},escape:function(e){return String(e||"").replace(/&(?!#?[a-zA-Z0-9]+;)/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/'/g,"&#39;").replace(/"/g,"&quot;")},error:function(e,r){var c="Laytpl Error：";return"object"==typeof console&&console.error(c+e+"\n"+(r||"")),c+e}},n=c.exp,t=function(e){this.tpl=e};t.pt=t.prototype,window.errors=0,t.pt.parse=function(e,t){var o=this,p=e,a=n("^"+r.open+"#",""),l=n(r.close+"$","");e=e.replace(/\s+|\r|\t|\n/g," ").replace(n(r.open+"#"),r.open+"# ").replace(n(r.close+"}"),"} "+r.close).replace(/\\/g,"\\\\").replace(n(r.open+"!(.+?)!"+r.close),function(e){return e=e.replace(n("^"+r.open+"!"),"").replace(n("!"+r.close),"").replace(n(r.open+"|"+r.close),function(e){return e.replace(/(.)/g,"\\$1")})}).replace(/(?="|')/g,"\\").replace(c.query(),function(e){return e=e.replace(a,"").replace(l,""),'";'+e.replace(/\\/g,"")+';view+="'}).replace(c.query(1),function(e){var c='"+(';return e.replace(/\s/g,"")===r.open+r.close?"":(e=e.replace(n(r.open+"|"+r.close),""),/^=/.test(e)&&(e=e.replace(/^=/,""),c='"+_escape_('),c+e.replace(/\\/g,"")+')+"')}),e='"use strict";var view = "'+e+'";return view;';try{return o.cache=e=new Function("d, _escape_",e),e(t,c.escape)}catch(u){return delete o.cache,c.error(u,p)}},t.pt.render=function(e,r){var n,t=this;return e?(n=t.cache?t.cache(e,c.escape):t.parse(t.tpl,e),r?void r(n):n):c.error("no data")};var o=function(e){return"string"!=typeof e?c.error("Template not found"):new t(e)};o.config=function(e){e=e||{};for(var c in e)r[c]=e[c]},o.v="1.2.0",e("laytpl",o)});layui.define(function(e){"use strict";var t=(window,document),i="querySelectorAll",n="getElementsByClassName",a=function(e){return t[i](e)},s={type:0,shade:!0,shadeClose:!0,fixed:!0,anim:"scale"},l={extend:function(e){var t=JSON.parse(JSON.stringify(s));for(var i in e)t[i]=e[i];return t},timer:{},end:{}};l.touch=function(e,t){e.addEventListener("click",function(e){t.call(this,e)},!1)};var o=0,r=["layui-m-layer"],d=function(e){var t=this;t.config=l.extend(e),t.view()};d.prototype.view=function(){var e=this,i=e.config,s=t.createElement("div");e.id=s.id=r[0]+o,s.setAttribute("class",r[0]+" "+r[0]+(i.type||0)),s.setAttribute("index",o);var l=function(){var e="object"==typeof i.title;return i.title?'<h3 style="'+(e?i.title[1]:"")+'">'+(e?i.title[0]:i.title)+"</h3>":""}(),d=function(){"string"==typeof i.btn&&(i.btn=[i.btn]);var e,t=(i.btn||[]).length;return 0!==t&&i.btn?(e='<span yes type="1">'+i.btn[0]+"</span>",2===t&&(e='<span no type="0">'+i.btn[1]+"</span>"+e),'<div class="layui-m-layerbtn">'+e+"</div>"):""}();if(i.fixed||(i.top=i.hasOwnProperty("top")?i.top:100,i.style=i.style||"",i.style+=" top:"+(t.body.scrollTop+i.top)+"px"),2===i.type&&(i.content='<i></i><i class="layui-m-layerload"></i><i></i><p>'+(i.content||"")+"</p>"),i.skin&&(i.anim="up"),"msg"===i.skin&&(i.shade=!1),s.innerHTML=(i.shade?"<div "+("string"==typeof i.shade?'style="'+i.shade+'"':"")+' class="layui-m-layershade"></div>':"")+'<div class="layui-m-layermain" '+(i.fixed?"":'style="position:static;"')+'><div class="layui-m-layersection"><div class="layui-m-layerchild '+(i.skin?"layui-m-layer-"+i.skin+" ":"")+(i.className?i.className:"")+" "+(i.anim?"layui-m-anim-"+i.anim:"")+'" '+(i.style?'style="'+i.style+'"':"")+">"+l+'<div class="layui-m-layercont">'+i.content+"</div>"+d+"</div></div></div>",!i.type||2===i.type){var y=t[n](r[0]+i.type),u=y.length;u>=1&&c.close(y[0].getAttribute("index"))}document.body.appendChild(s);var m=e.elem=a("#"+e.id)[0];i.success&&i.success(m),e.index=o++,e.action(i,m)},d.prototype.action=function(e,t){var i=this;e.time&&(l.timer[i.index]=setTimeout(function(){c.close(i.index)},1e3*e.time));var a=function(){var t=this.getAttribute("type");0==t?(e.no&&e.no(),c.close(i.index)):e.yes?e.yes(i.index):c.close(i.index)};if(e.btn)for(var s=t[n]("layui-m-layerbtn")[0].children,o=s.length,r=0;r<o;r++)l.touch(s[r],a);if(e.shade&&e.shadeClose){var d=t[n]("layui-m-layershade")[0];l.touch(d,function(){c.close(i.index,e.end)})}e.end&&(l.end[i.index]=e.end)};var c={v:"2.0 m",index:o,open:function(e){var t=new d(e||{});return t.index},close:function(e){var i=a("#"+r[0]+e)[0];i&&(i.innerHTML="",t.body.removeChild(i),clearTimeout(l.timer[e]),delete l.timer[e],"function"==typeof l.end[e]&&l.end[e](),delete l.end[e])},closeAll:function(){for(var e=t[n](r[0]),i=0,a=e.length;i<a;i++)c.close(0|e[0].getAttribute("index"))}};e("layer-mobile",c)});layui.define(function(t){var e=function(){function t(t){return null==t?String(t):J[W.call(t)]||"object"}function e(e){return"function"==t(e)}function n(t){return null!=t&&t==t.window}function r(t){return null!=t&&t.nodeType==t.DOCUMENT_NODE}function i(e){return"object"==t(e)}function o(t){return i(t)&&!n(t)&&Object.getPrototypeOf(t)==Object.prototype}function a(t){var e=!!t&&"length"in t&&t.length,r=T.type(t);return"function"!=r&&!n(t)&&("array"==r||0===e||"number"==typeof e&&e>0&&e-1 in t)}function s(t){return A.call(t,function(t){return null!=t})}function u(t){return t.length>0?T.fn.concat.apply([],t):t}function c(t){return t.replace(/::/g,"/").replace(/([A-Z]+)([A-Z][a-z])/g,"$1_$2").replace(/([a-z\d])([A-Z])/g,"$1_$2").replace(/_/g,"-").toLowerCase()}function l(t){return t in F?F[t]:F[t]=new RegExp("(^|\\s)"+t+"(\\s|$)")}function f(t,e){return"number"!=typeof e||k[c(t)]?e:e+"px"}function h(t){var e,n;return $[t]||(e=L.createElement(t),L.body.appendChild(e),n=getComputedStyle(e,"").getPropertyValue("display"),e.parentNode.removeChild(e),"none"==n&&(n="block"),$[t]=n),$[t]}function p(t){return"children"in t?D.call(t.children):T.map(t.childNodes,function(t){if(1==t.nodeType)return t})}function d(t,e){var n,r=t?t.length:0;for(n=0;n<r;n++)this[n]=t[n];this.length=r,this.selector=e||""}function m(t,e,n){for(j in e)n&&(o(e[j])||Q(e[j]))?(o(e[j])&&!o(t[j])&&(t[j]={}),Q(e[j])&&!Q(t[j])&&(t[j]=[]),m(t[j],e[j],n)):e[j]!==E&&(t[j]=e[j])}function v(t,e){return null==e?T(t):T(t).filter(e)}function g(t,n,r,i){return e(n)?n.call(t,r,i):n}function y(t,e,n){null==n?t.removeAttribute(e):t.setAttribute(e,n)}function x(t,e){var n=t.className||"",r=n&&n.baseVal!==E;return e===E?r?n.baseVal:n:void(r?n.baseVal=e:t.className=e)}function b(t){try{return t?"true"==t||"false"!=t&&("null"==t?null:+t+""==t?+t:/^[\[\{]/.test(t)?T.parseJSON(t):t):t}catch(e){return t}}function w(t,e){e(t);for(var n=0,r=t.childNodes.length;n<r;n++)w(t.childNodes[n],e)}var E,j,T,S,C,N,O=[],P=O.concat,A=O.filter,D=O.slice,L=window.document,$={},F={},k={"column-count":1,columns:1,"font-weight":1,"line-height":1,opacity:1,"z-index":1,zoom:1},M=/^\s*<(\w+|!)[^>]*>/,R=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,z=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,Z=/^(?:body|html)$/i,q=/([A-Z])/g,H=["val","css","html","text","data","width","height","offset"],I=["after","prepend","before","append"],V=L.createElement("table"),_=L.createElement("tr"),B={tr:L.createElement("tbody"),tbody:V,thead:V,tfoot:V,td:_,th:_,"*":L.createElement("div")},U=/complete|loaded|interactive/,X=/^[\w-]*$/,J={},W=J.toString,Y={},G=L.createElement("div"),K={tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},Q=Array.isArray||function(t){return t instanceof Array};return Y.matches=function(t,e){if(!e||!t||1!==t.nodeType)return!1;var n=t.matches||t.webkitMatchesSelector||t.mozMatchesSelector||t.oMatchesSelector||t.matchesSelector;if(n)return n.call(t,e);var r,i=t.parentNode,o=!i;return o&&(i=G).appendChild(t),r=~Y.qsa(i,e).indexOf(t),o&&G.removeChild(t),r},C=function(t){return t.replace(/-+(.)?/g,function(t,e){return e?e.toUpperCase():""})},N=function(t){return A.call(t,function(e,n){return t.indexOf(e)==n})},Y.fragment=function(t,e,n){var r,i,a;return R.test(t)&&(r=T(L.createElement(RegExp.$1))),r||(t.replace&&(t=t.replace(z,"<$1></$2>")),e===E&&(e=M.test(t)&&RegExp.$1),e in B||(e="*"),a=B[e],a.innerHTML=""+t,r=T.each(D.call(a.childNodes),function(){a.removeChild(this)})),o(n)&&(i=T(r),T.each(n,function(t,e){H.indexOf(t)>-1?i[t](e):i.attr(t,e)})),r},Y.Z=function(t,e){return new d(t,e)},Y.isZ=function(t){return t instanceof Y.Z},Y.init=function(t,n){var r;if(!t)return Y.Z();if("string"==typeof t)if(t=t.trim(),"<"==t[0]&&M.test(t))r=Y.fragment(t,RegExp.$1,n),t=null;else{if(n!==E)return T(n).find(t);r=Y.qsa(L,t)}else{if(e(t))return T(L).ready(t);if(Y.isZ(t))return t;if(Q(t))r=s(t);else if(i(t))r=[t],t=null;else if(M.test(t))r=Y.fragment(t.trim(),RegExp.$1,n),t=null;else{if(n!==E)return T(n).find(t);r=Y.qsa(L,t)}}return Y.Z(r,t)},T=function(t,e){return Y.init(t,e)},T.extend=function(t){var e,n=D.call(arguments,1);return"boolean"==typeof t&&(e=t,t=n.shift()),n.forEach(function(n){m(t,n,e)}),t},Y.qsa=function(t,e){var n,r="#"==e[0],i=!r&&"."==e[0],o=r||i?e.slice(1):e,a=X.test(o);return t.getElementById&&a&&r?(n=t.getElementById(o))?[n]:[]:1!==t.nodeType&&9!==t.nodeType&&11!==t.nodeType?[]:D.call(a&&!r&&t.getElementsByClassName?i?t.getElementsByClassName(o):t.getElementsByTagName(e):t.querySelectorAll(e))},T.contains=L.documentElement.contains?function(t,e){return t!==e&&t.contains(e)}:function(t,e){for(;e&&(e=e.parentNode);)if(e===t)return!0;return!1},T.type=t,T.isFunction=e,T.isWindow=n,T.isArray=Q,T.isPlainObject=o,T.isEmptyObject=function(t){var e;for(e in t)return!1;return!0},T.isNumeric=function(t){var e=Number(t),n=typeof t;return null!=t&&"boolean"!=n&&("string"!=n||t.length)&&!isNaN(e)&&isFinite(e)||!1},T.inArray=function(t,e,n){return O.indexOf.call(e,t,n)},T.camelCase=C,T.trim=function(t){return null==t?"":String.prototype.trim.call(t)},T.uuid=0,T.support={},T.expr={},T.noop=function(){},T.map=function(t,e){var n,r,i,o=[];if(a(t))for(r=0;r<t.length;r++)n=e(t[r],r),null!=n&&o.push(n);else for(i in t)n=e(t[i],i),null!=n&&o.push(n);return u(o)},T.each=function(t,e){var n,r;if(a(t)){for(n=0;n<t.length;n++)if(e.call(t[n],n,t[n])===!1)return t}else for(r in t)if(e.call(t[r],r,t[r])===!1)return t;return t},T.grep=function(t,e){return A.call(t,e)},window.JSON&&(T.parseJSON=JSON.parse),T.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(t,e){J["[object "+e+"]"]=e.toLowerCase()}),T.fn={constructor:Y.Z,length:0,forEach:O.forEach,reduce:O.reduce,push:O.push,sort:O.sort,splice:O.splice,indexOf:O.indexOf,concat:function(){var t,e,n=[];for(t=0;t<arguments.length;t++)e=arguments[t],n[t]=Y.isZ(e)?e.toArray():e;return P.apply(Y.isZ(this)?this.toArray():this,n)},map:function(t){return T(T.map(this,function(e,n){return t.call(e,n,e)}))},slice:function(){return T(D.apply(this,arguments))},ready:function(t){return U.test(L.readyState)&&L.body?t(T):L.addEventListener("DOMContentLoaded",function(){t(T)},!1),this},get:function(t){return t===E?D.call(this):this[t>=0?t:t+this.length]},toArray:function(){return this.get()},size:function(){return this.length},remove:function(){return this.each(function(){null!=this.parentNode&&this.parentNode.removeChild(this)})},each:function(t){return O.every.call(this,function(e,n){return t.call(e,n,e)!==!1}),this},filter:function(t){return e(t)?this.not(this.not(t)):T(A.call(this,function(e){return Y.matches(e,t)}))},add:function(t,e){return T(N(this.concat(T(t,e))))},is:function(t){return this.length>0&&Y.matches(this[0],t)},not:function(t){var n=[];if(e(t)&&t.call!==E)this.each(function(e){t.call(this,e)||n.push(this)});else{var r="string"==typeof t?this.filter(t):a(t)&&e(t.item)?D.call(t):T(t);this.forEach(function(t){r.indexOf(t)<0&&n.push(t)})}return T(n)},has:function(t){return this.filter(function(){return i(t)?T.contains(this,t):T(this).find(t).size()})},eq:function(t){return t===-1?this.slice(t):this.slice(t,+t+1)},first:function(){var t=this[0];return t&&!i(t)?t:T(t)},last:function(){var t=this[this.length-1];return t&&!i(t)?t:T(t)},find:function(t){var e,n=this;return e=t?"object"==typeof t?T(t).filter(function(){var t=this;return O.some.call(n,function(e){return T.contains(e,t)})}):1==this.length?T(Y.qsa(this[0],t)):this.map(function(){return Y.qsa(this,t)}):T()},closest:function(t,e){var n=[],i="object"==typeof t&&T(t);return this.each(function(o,a){for(;a&&!(i?i.indexOf(a)>=0:Y.matches(a,t));)a=a!==e&&!r(a)&&a.parentNode;a&&n.indexOf(a)<0&&n.push(a)}),T(n)},parents:function(t){for(var e=[],n=this;n.length>0;)n=T.map(n,function(t){if((t=t.parentNode)&&!r(t)&&e.indexOf(t)<0)return e.push(t),t});return v(e,t)},parent:function(t){return v(N(this.pluck("parentNode")),t)},children:function(t){return v(this.map(function(){return p(this)}),t)},contents:function(){return this.map(function(){return this.contentDocument||D.call(this.childNodes)})},siblings:function(t){return v(this.map(function(t,e){return A.call(p(e.parentNode),function(t){return t!==e})}),t)},empty:function(){return this.each(function(){this.innerHTML=""})},pluck:function(t){return T.map(this,function(e){return e[t]})},show:function(){return this.each(function(){"none"==this.style.display&&(this.style.display=""),"none"==getComputedStyle(this,"").getPropertyValue("display")&&(this.style.display=h(this.nodeName))})},replaceWith:function(t){return this.before(t).remove()},wrap:function(t){var n=e(t);if(this[0]&&!n)var r=T(t).get(0),i=r.parentNode||this.length>1;return this.each(function(e){T(this).wrapAll(n?t.call(this,e):i?r.cloneNode(!0):r)})},wrapAll:function(t){if(this[0]){T(this[0]).before(t=T(t));for(var e;(e=t.children()).length;)t=e.first();T(t).append(this)}return this},wrapInner:function(t){var n=e(t);return this.each(function(e){var r=T(this),i=r.contents(),o=n?t.call(this,e):t;i.length?i.wrapAll(o):r.append(o)})},unwrap:function(){return this.parent().each(function(){T(this).replaceWith(T(this).children())}),this},clone:function(){return this.map(function(){return this.cloneNode(!0)})},hide:function(){return this.css("display","none")},toggle:function(t){return this.each(function(){var e=T(this);(t===E?"none"==e.css("display"):t)?e.show():e.hide()})},prev:function(t){return T(this.pluck("previousElementSibling")).filter(t||"*")},next:function(t){return T(this.pluck("nextElementSibling")).filter(t||"*")},html:function(t){return 0 in arguments?this.each(function(e){var n=this.innerHTML;T(this).empty().append(g(this,t,e,n))}):0 in this?this[0].innerHTML:null},text:function(t){return 0 in arguments?this.each(function(e){var n=g(this,t,e,this.textContent);this.textContent=null==n?"":""+n}):0 in this?this.pluck("textContent").join(""):null},attr:function(t,e){var n;return"string"!=typeof t||1 in arguments?this.each(function(n){if(1===this.nodeType)if(i(t))for(j in t)y(this,j,t[j]);else y(this,t,g(this,e,n,this.getAttribute(t)))}):0 in this&&1==this[0].nodeType&&null!=(n=this[0].getAttribute(t))?n:E},removeAttr:function(t){return this.each(function(){1===this.nodeType&&t.split(" ").forEach(function(t){y(this,t)},this)})},prop:function(t,e){return t=K[t]||t,1 in arguments?this.each(function(n){this[t]=g(this,e,n,this[t])}):this[0]&&this[0][t]},removeProp:function(t){return t=K[t]||t,this.each(function(){delete this[t]})},data:function(t,e){var n="data-"+t.replace(q,"-$1").toLowerCase(),r=1 in arguments?this.attr(n,e):this.attr(n);return null!==r?b(r):E},val:function(t){return 0 in arguments?(null==t&&(t=""),this.each(function(e){this.value=g(this,t,e,this.value)})):this[0]&&(this[0].multiple?T(this[0]).find("option").filter(function(){return this.selected}).pluck("value"):this[0].value)},offset:function(t){if(t)return this.each(function(e){var n=T(this),r=g(this,t,e,n.offset()),i=n.offsetParent().offset(),o={top:r.top-i.top,left:r.left-i.left};"static"==n.css("position")&&(o.position="relative"),n.css(o)});if(!this.length)return null;if(L.documentElement!==this[0]&&!T.contains(L.documentElement,this[0]))return{top:0,left:0};var e=this[0].getBoundingClientRect();return{left:e.left+window.pageXOffset,top:e.top+window.pageYOffset,width:Math.round(e.width),height:Math.round(e.height)}},css:function(e,n){if(arguments.length<2){var r=this[0];if("string"==typeof e){if(!r)return;return r.style[C(e)]||getComputedStyle(r,"").getPropertyValue(e)}if(Q(e)){if(!r)return;var i={},o=getComputedStyle(r,"");return T.each(e,function(t,e){i[e]=r.style[C(e)]||o.getPropertyValue(e)}),i}}var a="";if("string"==t(e))n||0===n?a=c(e)+":"+f(e,n):this.each(function(){this.style.removeProperty(c(e))});else for(j in e)e[j]||0===e[j]?a+=c(j)+":"+f(j,e[j])+";":this.each(function(){this.style.removeProperty(c(j))});return this.each(function(){this.style.cssText+=";"+a})},index:function(t){return t?this.indexOf(T(t)[0]):this.parent().children().indexOf(this[0])},hasClass:function(t){return!!t&&O.some.call(this,function(t){return this.test(x(t))},l(t))},addClass:function(t){return t?this.each(function(e){if("className"in this){S=[];var n=x(this),r=g(this,t,e,n);r.split(/\s+/g).forEach(function(t){T(this).hasClass(t)||S.push(t)},this),S.length&&x(this,n+(n?" ":"")+S.join(" "))}}):this},removeClass:function(t){return this.each(function(e){if("className"in this){if(t===E)return x(this,"");S=x(this),g(this,t,e,S).split(/\s+/g).forEach(function(t){S=S.replace(l(t)," ")}),x(this,S.trim())}})},toggleClass:function(t,e){return t?this.each(function(n){var r=T(this),i=g(this,t,n,x(this));i.split(/\s+/g).forEach(function(t){(e===E?!r.hasClass(t):e)?r.addClass(t):r.removeClass(t)})}):this},scrollTop:function(t){if(this.length){var e="scrollTop"in this[0];return t===E?e?this[0].scrollTop:this[0].pageYOffset:this.each(e?function(){this.scrollTop=t}:function(){this.scrollTo(this.scrollX,t)})}},scrollLeft:function(t){if(this.length){var e="scrollLeft"in this[0];return t===E?e?this[0].scrollLeft:this[0].pageXOffset:this.each(e?function(){this.scrollLeft=t}:function(){this.scrollTo(t,this.scrollY)})}},position:function(){if(this.length){var t=this[0],e=this.offsetParent(),n=this.offset(),r=Z.test(e[0].nodeName)?{top:0,left:0}:e.offset();return n.top-=parseFloat(T(t).css("margin-top"))||0,n.left-=parseFloat(T(t).css("margin-left"))||0,r.top+=parseFloat(T(e[0]).css("border-top-width"))||0,r.left+=parseFloat(T(e[0]).css("border-left-width"))||0,{top:n.top-r.top,left:n.left-r.left}}},offsetParent:function(){return this.map(function(){for(var t=this.offsetParent||L.body;t&&!Z.test(t.nodeName)&&"static"==T(t).css("position");)t=t.offsetParent;return t})}},T.fn.detach=T.fn.remove,["width","height"].forEach(function(t){var e=t.replace(/./,function(t){return t[0].toUpperCase()});T.fn[t]=function(i){var o,a=this[0];return i===E?n(a)?a["inner"+e]:r(a)?a.documentElement["scroll"+e]:(o=this.offset())&&o[t]:this.each(function(e){a=T(this),a.css(t,g(this,i,e,a[t]()))})}}),I.forEach(function(e,n){var r=n%2;T.fn[e]=function(){var e,i,o=T.map(arguments,function(n){var r=[];return e=t(n),"array"==e?(n.forEach(function(t){return t.nodeType!==E?r.push(t):T.zepto.isZ(t)?r=r.concat(t.get()):void(r=r.concat(Y.fragment(t)))}),r):"object"==e||null==n?n:Y.fragment(n)}),a=this.length>1;return o.length<1?this:this.each(function(t,e){i=r?e:e.parentNode,e=0==n?e.nextSibling:1==n?e.firstChild:2==n?e:null;var s=T.contains(L.documentElement,i);o.forEach(function(t){if(a)t=t.cloneNode(!0);else if(!i)return T(t).remove();i.insertBefore(t,e),s&&w(t,function(t){if(!(null==t.nodeName||"SCRIPT"!==t.nodeName.toUpperCase()||t.type&&"text/javascript"!==t.type||t.src)){var e=t.ownerDocument?t.ownerDocument.defaultView:window;e.eval.call(e,t.innerHTML)}})})})},T.fn[r?e+"To":"insert"+(n?"Before":"After")]=function(t){return T(t)[e](this),this}}),Y.Z.prototype=d.prototype=T.fn,Y.uniq=N,Y.deserializeValue=b,T.zepto=Y,T}();!function(t){function e(t){return t._zid||(t._zid=h++)}function n(t,n,o,a){if(n=r(n),n.ns)var s=i(n.ns);return(v[e(t)]||[]).filter(function(t){return t&&(!n.e||t.e==n.e)&&(!n.ns||s.test(t.ns))&&(!o||e(t.fn)===e(o))&&(!a||t.sel==a)})}function r(t){var e=(""+t).split(".");return{e:e[0],ns:e.slice(1).sort().join(" ")}}function i(t){return new RegExp("(?:^| )"+t.replace(" "," .* ?")+"(?: |$)")}function o(t,e){return t.del&&!y&&t.e in x||!!e}function a(t){return b[t]||y&&x[t]||t}function s(n,i,s,u,l,h,p){var d=e(n),m=v[d]||(v[d]=[]);i.split(/\s/).forEach(function(e){if("ready"==e)return t(document).ready(s);var i=r(e);i.fn=s,i.sel=l,i.e in b&&(s=function(e){var n=e.relatedTarget;if(!n||n!==this&&!t.contains(this,n))return i.fn.apply(this,arguments)}),i.del=h;var d=h||s;i.proxy=function(t){if(t=c(t),!t.isImmediatePropagationStopped()){t.data=u;var e=d.apply(n,t._args==f?[t]:[t].concat(t._args));return e===!1&&(t.preventDefault(),t.stopPropagation()),e}},i.i=m.length,m.push(i),"addEventListener"in n&&n.addEventListener(a(i.e),i.proxy,o(i,p))})}function u(t,r,i,s,u){var c=e(t);(r||"").split(/\s/).forEach(function(e){n(t,e,i,s).forEach(function(e){delete v[c][e.i],"removeEventListener"in t&&t.removeEventListener(a(e.e),e.proxy,o(e,u))})})}function c(e,n){return!n&&e.isDefaultPrevented||(n||(n=e),t.each(T,function(t,r){var i=n[t];e[t]=function(){return this[r]=w,i&&i.apply(n,arguments)},e[r]=E}),e.timeStamp||(e.timeStamp=Date.now()),(n.defaultPrevented!==f?n.defaultPrevented:"returnValue"in n?n.returnValue===!1:n.getPreventDefault&&n.getPreventDefault())&&(e.isDefaultPrevented=w)),e}function l(t){var e,n={originalEvent:t};for(e in t)j.test(e)||t[e]===f||(n[e]=t[e]);return c(n,t)}var f,h=1,p=Array.prototype.slice,d=t.isFunction,m=function(t){return"string"==typeof t},v={},g={},y="onfocusin"in window,x={focus:"focusin",blur:"focusout"},b={mouseenter:"mouseover",mouseleave:"mouseout"};g.click=g.mousedown=g.mouseup=g.mousemove="MouseEvents",t.event={add:s,remove:u},t.proxy=function(n,r){var i=2 in arguments&&p.call(arguments,2);if(d(n)){var o=function(){return n.apply(r,i?i.concat(p.call(arguments)):arguments)};return o._zid=e(n),o}if(m(r))return i?(i.unshift(n[r],n),t.proxy.apply(null,i)):t.proxy(n[r],n);throw new TypeError("expected function")},t.fn.bind=function(t,e,n){return this.on(t,e,n)},t.fn.unbind=function(t,e){return this.off(t,e)},t.fn.one=function(t,e,n,r){return this.on(t,e,n,r,1)};var w=function(){return!0},E=function(){return!1},j=/^([A-Z]|returnValue$|layer[XY]$|webkitMovement[XY]$)/,T={preventDefault:"isDefaultPrevented",stopImmediatePropagation:"isImmediatePropagationStopped",stopPropagation:"isPropagationStopped"};t.fn.delegate=function(t,e,n){return this.on(e,t,n)},t.fn.undelegate=function(t,e,n){return this.off(e,t,n)},t.fn.live=function(e,n){return t(document.body).delegate(this.selector,e,n),this},t.fn.die=function(e,n){return t(document.body).undelegate(this.selector,e,n),this},t.fn.on=function(e,n,r,i,o){var a,c,h=this;return e&&!m(e)?(t.each(e,function(t,e){h.on(t,n,r,e,o)}),h):(m(n)||d(i)||i===!1||(i=r,r=n,n=f),i!==f&&r!==!1||(i=r,r=f),i===!1&&(i=E),h.each(function(f,h){o&&(a=function(t){return u(h,t.type,i),i.apply(this,arguments)}),n&&(c=function(e){var r,o=t(e.target).closest(n,h).get(0);if(o&&o!==h)return r=t.extend(l(e),{currentTarget:o,liveFired:h}),(a||i).apply(o,[r].concat(p.call(arguments,1)))}),s(h,e,i,r,n,c||a)}))},t.fn.off=function(e,n,r){var i=this;return e&&!m(e)?(t.each(e,function(t,e){i.off(t,n,e)}),i):(m(n)||d(r)||r===!1||(r=n,n=f),r===!1&&(r=E),i.each(function(){u(this,e,r,n)}))},t.fn.trigger=function(e,n){return e=m(e)||t.isPlainObject(e)?t.Event(e):c(e),e._args=n,this.each(function(){e.type in x&&"function"==typeof this[e.type]?this[e.type]():"dispatchEvent"in this?this.dispatchEvent(e):t(this).triggerHandler(e,n)})},t.fn.triggerHandler=function(e,r){var i,o;return this.each(function(a,s){i=l(m(e)?t.Event(e):e),i._args=r,i.target=s,t.each(n(s,e.type||e),function(t,e){if(o=e.proxy(i),i.isImmediatePropagationStopped())return!1})}),o},"focusin focusout focus blur load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select keydown keypress keyup error".split(" ").forEach(function(e){t.fn[e]=function(t){return 0 in arguments?this.bind(e,t):this.trigger(e)}}),t.Event=function(t,e){m(t)||(e=t,t=e.type);var n=document.createEvent(g[t]||"Events"),r=!0;if(e)for(var i in e)"bubbles"==i?r=!!e[i]:n[i]=e[i];return n.initEvent(t,r,!0),c(n)}}(e),function(t){function e(e,n,r){var i=t.Event(n);return t(e).trigger(i,r),!i.isDefaultPrevented()}function n(t,n,r,i){if(t.global)return e(n||x,r,i)}function r(e){e.global&&0===t.active++&&n(e,null,"ajaxStart")}function i(e){e.global&&!--t.active&&n(e,null,"ajaxStop")}function o(t,e){var r=e.context;return e.beforeSend.call(r,t,e)!==!1&&n(e,r,"ajaxBeforeSend",[t,e])!==!1&&void n(e,r,"ajaxSend",[t,e])}function a(t,e,r,i){var o=r.context,a="success";r.success.call(o,t,a,e),i&&i.resolveWith(o,[t,a,e]),n(r,o,"ajaxSuccess",[e,r,t]),u(a,e,r)}function s(t,e,r,i,o){var a=i.context;i.error.call(a,r,e,t),o&&o.rejectWith(a,[r,e,t]),n(i,a,"ajaxError",[r,i,t||e]),u(e,r,i)}function u(t,e,r){var o=r.context;r.complete.call(o,e,t),n(r,o,"ajaxComplete",[e,r]),i(r)}function c(t,e,n){if(n.dataFilter==l)return t;var r=n.context;return n.dataFilter.call(r,t,e)}function l(){}function f(t){return t&&(t=t.split(";",2)[0]),t&&(t==T?"html":t==j?"json":w.test(t)?"script":E.test(t)&&"xml")||"text"}function h(t,e){return""==e?t:(t+"&"+e).replace(/[&?]{1,2}/,"?")}function p(e){e.processData&&e.data&&"string"!=t.type(e.data)&&(e.data=t.param(e.data,e.traditional)),!e.data||e.type&&"GET"!=e.type.toUpperCase()&&"jsonp"!=e.dataType||(e.url=h(e.url,e.data),e.data=void 0)}function d(e,n,r,i){return t.isFunction(n)&&(i=r,r=n,n=void 0),t.isFunction(r)||(i=r,r=void 0),{url:e,data:n,success:r,dataType:i}}function m(e,n,r,i){var o,a=t.isArray(n),s=t.isPlainObject(n);t.each(n,function(n,u){o=t.type(u),i&&(n=r?i:i+"["+(s||"object"==o||"array"==o?n:"")+"]"),!i&&a?e.add(u.name,u.value):"array"==o||!r&&"object"==o?m(e,u,r,n):e.add(n,u)})}var v,g,y=+new Date,x=window.document,b=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,w=/^(?:text|application)\/javascript/i,E=/^(?:text|application)\/xml/i,j="application/json",T="text/html",S=/^\s*$/,C=x.createElement("a");C.href=window.location.href,t.active=0,t.ajaxJSONP=function(e,n){if(!("type"in e))return t.ajax(e);var r,i,u=e.jsonpCallback,c=(t.isFunction(u)?u():u)||"Zepto"+y++,l=x.createElement("script"),f=window[c],h=function(e){t(l).triggerHandler("error",e||"abort")},p={abort:h};return n&&n.promise(p),t(l).on("load error",function(o,u){clearTimeout(i),t(l).off().remove(),"error"!=o.type&&r?a(r[0],p,e,n):s(null,u||"error",p,e,n),window[c]=f,r&&t.isFunction(f)&&f(r[0]),f=r=void 0}),o(p,e)===!1?(h("abort"),p):(window[c]=function(){r=arguments},l.src=e.url.replace(/\?(.+)=\?/,"?$1="+c),x.head.appendChild(l),e.timeout>0&&(i=setTimeout(function(){h("timeout")},e.timeout)),p)},t.ajaxSettings={type:"GET",beforeSend:l,success:l,error:l,complete:l,context:null,global:!0,xhr:function(){return new window.XMLHttpRequest},accepts:{script:"text/javascript, application/javascript, application/x-javascript",json:j,xml:"application/xml, text/xml",html:T,text:"text/plain"},crossDomain:!1,timeout:0,processData:!0,cache:!0,dataFilter:l},t.ajax=function(e){var n,i,u=t.extend({},e||{}),d=t.Deferred&&t.Deferred();for(v in t.ajaxSettings)void 0===u[v]&&(u[v]=t.ajaxSettings[v]);r(u),u.crossDomain||(n=x.createElement("a"),n.href=u.url,n.href=n.href,u.crossDomain=C.protocol+"//"+C.host!=n.protocol+"//"+n.host),u.url||(u.url=window.location.toString()),(i=u.url.indexOf("#"))>-1&&(u.url=u.url.slice(0,i)),p(u);var m=u.dataType,y=/\?.+=\?/.test(u.url);if(y&&(m="jsonp"),u.cache!==!1&&(e&&e.cache===!0||"script"!=m&&"jsonp"!=m)||(u.url=h(u.url,"_="+Date.now())),"jsonp"==m)return y||(u.url=h(u.url,u.jsonp?u.jsonp+"=?":u.jsonp===!1?"":"callback=?")),t.ajaxJSONP(u,d);var b,w=u.accepts[m],E={},j=function(t,e){E[t.toLowerCase()]=[t,e]},T=/^([\w-]+:)\/\//.test(u.url)?RegExp.$1:window.location.protocol,N=u.xhr(),O=N.setRequestHeader;if(d&&d.promise(N),u.crossDomain||j("X-Requested-With","XMLHttpRequest"),j("Accept",w||"*/*"),(w=u.mimeType||w)&&(w.indexOf(",")>-1&&(w=w.split(",",2)[0]),N.overrideMimeType&&N.overrideMimeType(w)),(u.contentType||u.contentType!==!1&&u.data&&"GET"!=u.type.toUpperCase())&&j("Content-Type",u.contentType||"application/x-www-form-urlencoded"),u.headers)for(g in u.headers)j(g,u.headers[g]);if(N.setRequestHeader=j,N.onreadystatechange=function(){if(4==N.readyState){N.onreadystatechange=l,clearTimeout(b);var e,n=!1;if(N.status>=200&&N.status<300||304==N.status||0==N.status&&"file:"==T){if(m=m||f(u.mimeType||N.getResponseHeader("content-type")),"arraybuffer"==N.responseType||"blob"==N.responseType)e=N.response;else{e=N.responseText;try{e=c(e,m,u),"script"==m?(0,eval)(e):"xml"==m?e=N.responseXML:"json"==m&&(e=S.test(e)?null:t.parseJSON(e))}catch(r){n=r}if(n)return s(n,"parsererror",N,u,d)}a(e,N,u,d)}else s(N.statusText||null,N.status?"error":"abort",N,u,d)}},o(N,u)===!1)return N.abort(),s(null,"abort",N,u,d),N;var P=!("async"in u)||u.async;if(N.open(u.type,u.url,P,u.username,u.password),u.xhrFields)for(g in u.xhrFields)N[g]=u.xhrFields[g];for(g in E)O.apply(N,E[g]);return u.timeout>0&&(b=setTimeout(function(){N.onreadystatechange=l,N.abort(),s(null,"timeout",N,u,d)},u.timeout)),N.send(u.data?u.data:null),N},t.get=function(){return t.ajax(d.apply(null,arguments))},t.post=function(){var e=d.apply(null,arguments);return e.type="POST",t.ajax(e)},t.getJSON=function(){var e=d.apply(null,arguments);return e.dataType="json",t.ajax(e)},t.fn.load=function(e,n,r){if(!this.length)return this;var i,o=this,a=e.split(/\s/),s=d(e,n,r),u=s.success;return a.length>1&&(s.url=a[0],i=a[1]),s.success=function(e){o.html(i?t("<div>").html(e.replace(b,"")).find(i):e),u&&u.apply(o,arguments)},t.ajax(s),this};var N=encodeURIComponent;t.param=function(e,n){var r=[];return r.add=function(e,n){t.isFunction(n)&&(n=n()),null==n&&(n=""),this.push(N(e)+"="+N(n))},m(r,e,n),r.join("&").replace(/%20/g,"+")}}(e),function(t){t.fn.serializeArray=function(){var e,n,r=[],i=function(t){return t.forEach?t.forEach(i):void r.push({name:e,value:t})};return this[0]&&t.each(this[0].elements,function(r,o){n=o.type,e=o.name,e&&"fieldset"!=o.nodeName.toLowerCase()&&!o.disabled&&"submit"!=n&&"reset"!=n&&"button"!=n&&"file"!=n&&("radio"!=n&&"checkbox"!=n||o.checked)&&i(t(o).val())}),r},t.fn.serialize=function(){var t=[];return this.serializeArray().forEach(function(e){t.push(encodeURIComponent(e.name)+"="+encodeURIComponent(e.value))}),t.join("&")},t.fn.submit=function(e){if(0 in arguments)this.bind("submit",e);else if(this.length){var n=t.Event("submit");this.eq(0).trigger(n),n.isDefaultPrevented()||this.get(0).submit()}return this}}(e),function(){try{getComputedStyle(void 0)}catch(t){var e=getComputedStyle;window.getComputedStyle=function(t,n){try{return e(t,n)}catch(r){return null}}}}(),t("zepto",e)});layui.define(["layer-mobile","zepto"],function(e){"use strict";var t=layui.zepto,a=layui["layer-mobile"],i=(layui.device(),"layui-upload-enter"),n="layui-upload-iframe",r={icon:2,shift:6},o={file:"文件",video:"视频",audio:"音频"};a.msg=function(e){return a.open({content:e||"",skin:"msg",time:2})};var s=function(e){this.options=e};s.prototype.init=function(){var e=this,a=e.options,r=t("body"),s=t(a.elem||".layui-upload-file"),u=t('<iframe id="'+n+'" class="'+n+'" name="'+n+'"></iframe>');return t("#"+n)[0]||r.append(u),s.each(function(r,s){s=t(s);var u='<form target="'+n+'" method="'+(a.method||"post")+'" key="set-mine" enctype="multipart/form-data" action="'+(a.url||"")+'"></form>',l=s.attr("lay-type")||a.type;a.unwrap||(u='<div class="layui-box layui-upload-button">'+u+'<span class="layui-upload-icon"><i class="layui-icon">&#xe608;</i>'+(s.attr("lay-title")||a.title||"上传"+(o[l]||"图片"))+"</span></div>"),u=t(u),a.unwrap||u.on("dragover",function(e){e.preventDefault(),t(this).addClass(i)}).on("dragleave",function(){t(this).removeClass(i)}).on("drop",function(){t(this).removeClass(i)}),s.parent("form").attr("target")===n&&(a.unwrap?s.unwrap():(s.parent().next().remove(),s.unwrap().unwrap())),s.wrap(u),s.off("change").on("change",function(){e.action(this,l)})})},s.prototype.action=function(e,i){var o=this,s=o.options,u=e.value,l=t(e),p=l.attr("lay-ext")||s.ext||"";if(u){switch(i){case"file":if(p&&!RegExp("\\w\\.("+p+")$","i").test(escape(u)))return a.msg("不支持该文件格式",r),e.value="";break;case"video":if(!RegExp("\\w\\.("+(p||"avi|mp4|wma|rmvb|rm|flash|3gp|flv")+")$","i").test(escape(u)))return a.msg("不支持该视频格式",r),e.value="";break;case"audio":if(!RegExp("\\w\\.("+(p||"mp3|wav|mid")+")$","i").test(escape(u)))return a.msg("不支持该音频格式",r),e.value="";break;default:if(!RegExp("\\w\\.("+(p||"jpg|png|gif|bmp|jpeg")+")$","i").test(escape(u)))return a.msg("不支持该图片格式",r),e.value=""}s.before&&s.before(e),l.parent().submit();var c=t("#"+n),f=setInterval(function(){var t;try{t=c.contents().find("body").text()}catch(i){a.msg("上传接口存在跨域",r),clearInterval(f)}if(t){clearInterval(f),c.contents().find("body").html("");try{t=JSON.parse(t)}catch(i){return t={},a.msg("请对上传接口返回JSON字符",r)}"function"==typeof s.success&&s.success(t,e)}},30);e.value=""}},e("upload-mobile",function(e){var t=new s(e=e||{});t.init()})});layui.define(["laytpl","upload-mobile","layer-mobile","zepto"],function(i){var e="2.1.0",a=layui.zepto,t=layui.laytpl,n=layui["layer-mobile"],l=layui["upload-mobile"],s=layui.device(),o="layui-show",c="layim-this",d=20,r={},u=function(){this.v=e,m(a("body"),"*[layim-event]",function(i){var e=a(this),t=e.attr("layim-event");U[t]?U[t].call(this,e,i):""})},m=function(i,e,t){var n,l="function"==typeof e,s=function(i){var e=a(this);e.data("lock")||(n||t.call(this,i),n=!1,e.data("lock","true"),setTimeout(function(){e.removeAttr("data-lock")},e.data("locktime")||0))};return l&&(t=e),i="string"==typeof i?a(i):i,y?void(l?i.on("touchmove",function(){n=!0}).on("touchend",s):i.on("touchmove",e,function(){n=!0}).on("touchend",e,s)):void(l?i.on("click",s):i.on("click",e,s))},y=/Android|iPhone|SymbianOS|Windows Phone|iPad|iPod/.test(navigator.userAgent);n.popBottom=function(i){n.close(n.popBottom.index),n.popBottom.index=n.open(a.extend({type:1,content:i.content||"",shade:!1,className:"layim-layer"},i))},u.prototype.config=function(i){i=i||{},i=a.extend({title:"我的IM",isgroup:0,isNewFriend:!0,voice:"default.mp3",chatTitleColor:"#36373C"},i),k(i)},u.prototype.on=function(i,e){return"function"==typeof e&&(r[i]?r[i].push(e):r[i]=[e]),this},u.prototype.chat=function(i){if(window.JSON&&window.JSON.parse)return L(i,-1),this},u.prototype.panel=function(i){return N(i)},u.prototype.cache=function(){return C},u.prototype.getMessage=function(i){return M(i),this},u.prototype.addList=function(i){return O(i),this},u.prototype.removeList=function(i){return Y(i),this},u.prototype.setFriendStatus=function(i,e){var t=a(".layim-friend"+i);t["online"===e?"removeClass":"addClass"]("layim-list-gray")},u.prototype.setChatStatus=function(i){var e=A(),a=e.elem.find(".layim-chat-status");return a.html(i),this},u.prototype.showNew=function(i,e){I(i,e)},u.prototype.content=function(i){return layui.data.content(i)};var p=function(i){var e={friend:"该分组下暂无好友",group:"暂无群组",history:"暂无任何消息"};return i=i||{},"history"===i.type&&(i.item=i.item||"d.sortHistory"),["{{# var length = 0; layui.each("+i.item+", function(i, data){ length++; }}",'<li layim-event="chat" data-type="'+i.type+'" data-index="'+(i.index?"{{"+i.index+"}}":("history"===i.type?"{{data.type}}":i.type)+"{{data.id}}")+'" class="layim-'+("history"===i.type?"{{data.type}}":i.type)+'{{data.id}} {{ data.status === "offline" ? "layim-list-gray" : "" }}"><div><img src="{{data.avatar}}"></div><span>{{ data.username||data.groupname||data.name||"佚名" }}</span><p>{{ data.remark||data.sign||"" }}</p><span class="layim-msg-status">new</span></li>',"{{# }); if(length === 0){ }}",'<li class="layim-null">'+(e[i.type]||"暂无数据")+"</li>","{{# } }}"].join("")},f=function(i,e,a){return['<div class="layim-panel'+(e?" layui-m-anim-left":"")+'">','<div class="layim-title" style="background-color: {{d.base.chatTitleColor}};">',"<p>",a?'<i class="layui-icon layim-chat-back" layim-event="back">&#xe603;</i>':"",'{{ d.title || d.base.title }}<span class="layim-chat-status"></span>',"{{# if(d.data){ }}",'{{# if(d.data.type === "group"){ }}','<i class="layui-icon layim-chat-detail.html" layim-event="detail.html">&#xe613;</i>',"{{# } }}","{{# } }}","</p>","</div>",'<div class="layui-unselect layim-content">',i,"</div>","</div>"].join("")},h=['<div class="layui-layim">','<div class="layim-tab-content layui-show">','<ul class="layim-list-friend">','<ul class="layui-layim-list layui-show layim-list-history">',p({type:"history"}),"</ul>","</ul>","</div>",'<div class="layim-tab-content">','<ul class="layim-list-top">',"{{# if(d.base.isNewFriend){ }}",'<li layim-event="newFriend"><i class="layui-icon">&#xe654;</i>新的朋友<i class="layim-new" id="LAY_layimNewFriend"></i></li>',"{{# } if(d.base.isgroup){ }}",'<li layim-event="group"><i class="layui-icon">&#xe613;</i>群聊<i class="layim-new" id="LAY_layimNewGroup"></i></li>',"{{# } }}","</ul>",'<ul class="layim-list-friend">','{{# layui.each(d.friend, function(index, item){ var spread = d.local["spread"+index]; }}',"<li>",'<h5 layim-event="spread" lay-type="{{ spread }}"><i class="layui-icon">{{# if(spread === "true"){ }}&#xe61a;{{# } else {  }}&#xe602;{{# } }}</i><span>{{ item.groupname||"未命名分组"+index }}</span><em>(<cite class="layim-count"> {{ (item.list||[]).length }}</cite>)</em></h5>','<ul class="layui-layim-list {{# if(spread === "true"){ }}'," layui-show",'{{# } }}">',p({type:"friend",item:"item.list",index:"index"}),"</ul>","</li>","{{# }); if(d.friend.length === 0){ }}",'<li><ul class="layui-layim-list layui-show"><li class="layim-null">暂无联系人</li></ul>',"{{# } }}","</ul>","</div>",'<div class="layim-tab-content">','<ul class="layim-list-top">',"{{# layui.each(d.base.moreList, function(index, item){ }}",'<li layim-event="moreList" lay-filter="{{ item.alias }}">','<i class="layui-icon {{item.iconClass||""}}">{{item.iconUnicode||""}}</i>{{item.title}}<i class="layim-new" id="LAY_layimNew{{ item.alias }}"></i>',"</li>","{{# }); if(!d.base.copyright){ }}",'<li layim-event="about"><i class="layui-icon">&#xe60b;</i>关于<i class="layim-new" id="LAY_layimNewAbout"></i></li>',"{{# } }}","</ul>","</div>","</div>",'<ul class="layui-unselect layui-layim-tab">','<li title="消息" layim-event="tab" lay-type="message" class="layim-this"><i class="layui-icon">&#xe611;</i><span>消息</span><i class="layim-new" id="LAY_layimNewMsg"></i></li>','<li title="联系人" layim-event="tab" lay-type="friend"><i class="layui-icon">&#xe612;</i><span>联系人</span><i class="layim-new" id="LAY_layimNewList"></i></li>','<li title="更多" layim-event="tab" lay-type="more"><i class="layui-icon">&#xe670;</i><span>更多</span><i class="layim-new" id="LAY_layimNewMore"></i></li>',"</ul>"].join(""),v=['<div class="layim-chat layim-chat-{{d.data.type}}">','<div class="layim-chat-main">',"<ul></ul>","</div>",'<div class="layim-chat-footer">','<div class="layim-chat-send"><input type="text" autocomplete="off"><button class="layim-send layui-disabled" layim-event="send">发送</button></div>','<div class="layim-chat-tool" data-json="{{encodeURIComponent(JSON.stringify(d.data))}}">','<span class="layui-icon layim-tool-face" title="选择表情" layim-event="face">&#xe60c;</span>',"{{# if(d.base && d.base.uploadImage){ }}",'<span class="layui-icon layim-tool-image" title="上传图片" layim-event="image">&#xe60d;<input type="file" name="file" accept="image/*"></span>',"{{# }; }}","{{# if(d.base && d.base.uploadFile){ }}",'<span class="layui-icon layim-tool-image" title="发送文件" layim-event="image" data-type="file">&#xe61d;<input type="file" name="file"></span>',"{{# }; }}","{{# layui.each(d.base.tool, function(index, item){ }}",'<span class="layui-icon  {{item.iconClass||""}} layim-tool-{{item.alias}}" title="{{item.title}}" layim-event="extend" lay-filter="{{ item.alias }}">{{item.iconUnicode||""}}</span>',"{{# }); }}","</div>","</div>","</div>"].join(""),g=function(i){return i<10?"0"+(0|i):i};layui.data.date=function(i){var e=new Date(i||new Date);return g(e.getMonth()+1)+"-"+g(e.getDate())+" "+g(e.getHours())+":"+g(e.getMinutes())},layui.data.content=function(i){var e=function(i){return new RegExp("\\n*\\["+(i||"")+"(pre|div|p|table|thead|th|tbody|tr|td|ul|li|ol|li|dl|dt|dd|h2|h3|h4|h5)([\\s\\S]*?)\\]\\n*","g")};return i=(i||"").replace(/&(?!#?[a-zA-Z0-9]+;)/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/'/g,"&#39;").replace(/"/g,"&quot;").replace(/@(\S+)(\s+?|$)/g,'@<a href="javascript:;">$1</a>$2').replace(/face\[([^\s\[\]]+?)\]/g,function(i){var e=i.replace(/^face/g,"");return'<img alt="'+e+'" title="'+e+'" src="'+E[e]+'">'}).replace(/img\[([^\s]+?)\]/g,function(i){return'<img class="layui-layim-photos" src="'+i.replace(/(^img\[)|(\]$)/g,"")+'">'}).replace(/file\([\s\S]+?\)\[[\s\S]*?\]/g,function(i){var e=(i.match(/file\(([\s\S]+?)\)\[/)||[])[1],a=(i.match(/\)\[([\s\S]*?)\]/)||[])[1];return e?'<a class="layui-layim-file" href="'+e+'" download target="_blank"><i class="layui-icon">&#xe61e;</i><cite>'+(a||e)+"</cite></a>":i}).replace(/audio\[([^\s]+?)\]/g,function(i){return'<div class="layui-unselect layui-layim-audio" layim-event="playAudio" data-src="'+i.replace(/(^audio\[)|(\]$)/g,"")+'"><i class="layui-icon">&#xe652;</i><p>音频消息</p></div>'}).replace(/video\[([^\s]+?)\]/g,function(i){return'<div class="layui-unselect layui-layim-video" layim-event="playVideo" data-src="'+i.replace(/(^video\[)|(\]$)/g,"")+'"><i class="layui-icon">&#xe652;</i></div>'}).replace(/a\([\s\S]+?\)\[[\s\S]*?\]/g,function(i){var e=(i.match(/a\(([\s\S]+?)\)\[/)||[])[1],a=(i.match(/\)\[([\s\S]*?)\]/)||[])[1];return e?'<a href="'+e+'" target="_blank">'+(a||e)+"</a>":i}).replace(e(),"<$1 $2>").replace(e("/"),"</$1>").replace(/\n/g,"<br>")};var b,x,w=['<li class="layim-chat-li{{ d.mine ? " layim-chat-mine" : "" }}">','<div class="layim-chat-user"><img src="{{ d.avatar }}"><cite>','{{ d.username||"佚名" }}',"</cite></div>",'<div class="layim-chat-text">{{ layui.data.content(d.content||"&nbsp;") }}</div>',"</li>"].join(""),C={message:{},chat:[]},k=function(i){var e=i.init||{};return mine=e.mine||{},local=layui.data("layim-mobile")[mine.id]||{},obj={base:i,local:local,mine:mine,history:local.history||[]},create=function(e){var n=e.mine||{},l=layui.data("layim-mobile")[n.id]||{},s={base:i,local:l,mine:n,friend:e.friend||[],group:e.group||[],history:l.history||[]};s.sortHistory=j(s.history,"historyTime"),C=a.extend(C,s),S(t(f(h)).render(s)),layui.each(r.ready,function(i,e){e&&e(s)})},C=a.extend(C,obj),i.brief?layui.each(r.ready,function(i,e){e&&e(obj)}):void create(e)},S=function(i){return n.open({type:1,shade:!1,shadeClose:!1,anim:-1,content:i,success:function(i){b=a(i),T(b.find(".layui-layim")),C.base.tabIndex&&U.tab(a(".layui-layim-tab>li").eq(C.base.tabIndex))}})},N=function(i,e){i=i||{};var l=a.extend({},C,{title:i.title||"",data:i.data});return n.open({type:1,shade:!1,shadeClose:!1,anim:-1,content:t(f(i.tpl,e!==-1,!0)).render(l),success:function(e){var t=a(e);t.prev().find(".layim-panel").addClass("layui-m-anim-lout"),i.success&&i.success(e),i.isChat||T(t.find(".layim-content"))},end:i.end})},L=function(i,e,t){return i=i||{},i.id?(n.close(L.index),L.index=N({tpl:v,data:i,title:i.name,isChat:!0,success:function(e){x=a(e),B(),$(),delete C.message[i.type+i.id],I("Msg");var t=A(),n=t.elem.find(".layim-chat-main");layui.each(r.chatChange,function(i,e){e&&e(t)}),T(n),t.textarea.on("focus",function(){setTimeout(function(){n.scrollTop(n[0].scrollHeight+1e3)},500)})},end:function(){x=null,q.time=0}},e)):n.msg("非法用户")},T=function(i){s.ios&&i.on("touchmove",function(e){var a=i.scrollTop();a<=0&&(i.scrollTop(1),e.preventDefault(e)),this.scrollHeight-a-i.height()<=0&&(i.scrollTop(i.scrollTop()-1),e.preventDefault(e))})},A=function(){if(!x)return{};var i=x.find(".layim-chat"),e=JSON.parse(decodeURIComponent(i.find(".layim-chat-tool").data("json")));return{elem:i,data:e,textarea:i.find("input")}},j=function(i,e,a){var t=[],n=function(i,a){var t=i[e],n=a[e];return n<t?-1:n>t?1:0};return layui.each(i,function(i,e){t.push(e)}),t.sort(n),a&&t.reverse(),t},H=function(i){var e=layui.data("layim-mobile")[C.mine.id]||{},a={},n=e.history||{};n[i.type+i.id];if(b){var l=b.find(".layim-list-history");i.historyTime=(new Date).getTime(),i.sign=i.content,n[i.type+i.id]=i,e.history=n,layui.data("layim-mobile",{key:C.mine.id,value:e});var s=l.find(".layim-"+i.type+i.id),c=(C.message[i.type+i.id]||[]).length,d=function(){s=l.find(".layim-"+i.type+i.id),s.find("p").html(i.content),c>0&&s.find(".layim-msg-status").html(c).addClass(o)};if(s.length>0)d(),l.prepend(s.clone()),s.remove();else{a[i.type+i.id]=i;var r=t(p({type:"history",item:"d.data"})).render({data:a});l.prepend(r),d(),l.find(".layim-null").remove()}I("Msg")}},I=function(i,e){if(!e){var e;layui.each(C.message,function(){return e=!0,!1})}a("#LAY_layimNew"+i)[e?"addClass":"removeClass"](o)},q=function(){var i={username:C.mine?C.mine.username:"访客",avatar:C.mine?C.mine.avatar:layui.cache.dir+"css/pc/layim/skin/logo.jpg",id:C.mine?C.mine.id:null,mine:!0},e=A(),a=e.elem.find(".layim-chat-main ul"),l=e.data,s=C.base.maxLength||3e3,o=(new Date).getTime(),c=e.textarea;if(i.content=c.val(),""!==i.content){if(i.content.length>s)return n.msg("内容最长不能超过"+s+"个字符");o-(q.time||0)>6e4&&(a.append('<li class="layim-chat-system"><span>'+layui.data.date()+"</span></li>"),q.time=o),a.append(t(w).render(i));var d={mine:i,to:l},u={username:d.mine.username,avatar:d.mine.avatar,id:l.id,type:l.type,content:d.mine.content,timestamp:o,mine:!0};F(u),layui.each(r.sendMessage,function(i,e){e&&e(d)}),l.content=i.content,H(l),J(),c.val(""),c.next().addClass("layui-disabled")}},_=function(){var i=document.createElement("audio");i.src=layui.cache.dir+"css/modules/layim/voice/"+C.base.voice,i.play()},D={},M=function(i){i=i||{};var e={},n=A(),l=n.data||{},s=l.id==i.id&&l.type==i.type;i.timestamp=i.timestamp||(new Date).getTime(),i.system||F(i),D=JSON.parse(JSON.stringify(i)),C.base.voice&&_(),(!x&&i.content||!s)&&(C.message[i.type+i.id]?C.message[i.type+i.id].push(i):C.message[i.type+i.id]=[i]);var e={};if("friend"===i.type){var o;layui.each(C.friend,function(e,a){if(layui.each(a.list,function(e,a){if(a.id==i.id)return i.type="friend",i.name=a.username,o=!0}),o)return!0}),o||(i.temporary=!0)}else"group"===i.type?layui.each(C.group,function(a,t){if(t.id==i.id)return i.type="group",i.name=i.groupname=t.groupname,e.avatar=t.avatar,!0}):i.name=i.name||i.username||i.groupname;var c=a.extend({},i,{avatar:e.avatar||i.avatar});if("group"===i.type&&delete c.username,H(c),x&&s){var d=x.find(".layim-chat"),r=d.find(".layim-chat-main ul");i.system?r.append('<li class="layim-chat-system"><span>'+i.content+"</span></li>"):""!==i.content.replace(/\s/g,"")&&(i.timestamp-(q.time||0)>6e4&&(r.append('<li class="layim-chat-system"><span>'+layui.data.date(i.timestamp)+"</span></li>"),q.time=i.timestamp),r.append(t(w).render(i))),J()}},F=function(i){var e=layui.data("layim-mobile")[C.mine.id]||{},a=e.chatlog||{};a[i.type+i.id]?(a[i.type+i.id].push(i),a[i.type+i.id].length>d&&a[i.type+i.id].shift()):a[i.type+i.id]=[i],e.chatlog=a,layui.data("layim-mobile",{key:C.mine.id,value:e})},$=function(){var i=layui.data("layim-mobile")[C.mine.id]||{},e=A(),a=i.chatlog||{},n=e.elem.find(".layim-chat-main ul");layui.each(a[e.data.type+e.data.id],function(i,e){(new Date).getTime()>e.timestamp&&e.timestamp-(q.time||0)>6e4&&(n.append('<li class="layim-chat-system"><span>'+layui.data.date(e.timestamp)+"</span></li>"),q.time=e.timestamp),n.append(t(w).render(e))}),J()},O=function(i){var e,a={},l=b.find(".layim-list-"+i.type);if(C[i.type])if("friend"===i.type)layui.each(C.friend,function(t,l){if(i.groupid==l.id)return layui.each(C.friend[t].list,function(a,t){if(t.id==i.id)return e=!0}),e?n.msg("好友 ["+(i.username||"")+"] 已经存在列表中",{anim:6}):(C.friend[t].list=C.friend[t].list||[],a[C.friend[t].list.length]=i,i.groupIndex=t,C.friend[t].list.push(i),!0)});else if("group"===i.type){if(layui.each(C.group,function(a,t){if(t.id==i.id)return e=!0}),e)return n.msg("您已是 ["+(i.groupname||"")+"] 的群成员",{anim:6});a[C.group.length]=i,C.group.push(i)}if(!e){var s=t(p({type:i.type,item:"d.data",index:"friend"===i.type?"data.groupIndex":null})).render({data:a});if("friend"===i.type){var o=l.children("li").eq(i.groupIndex);o.find(".layui-layim-list").append(s),o.find(".layim-count").html(C.friend[i.groupIndex].list.length),o.find(".layim-null")[0]&&o.find(".layim-null").remove()}else"group"===i.type&&(l.append(s),l.find(".layim-null")[0]&&l.find(".layim-null").remove())}},Y=function(i){var e=b.find(".layim-list-"+i.type);C[i.type]&&("friend"===i.type?layui.each(C.friend,function(a,t){layui.each(t.list,function(t,n){if(i.id==n.id){var l=e.children("li").eq(a);l.find(".layui-layim-list").children("li");return l.find(".layui-layim-list").children("li").eq(t).remove(),C.friend[a].list.splice(t,1),l.find(".layim-count").html(C.friend[a].list.length),0===C.friend[a].list.length&&l.find(".layui-layim-list").html('<li class="layim-null">该分组下已无好友了</li>'),!0}})}):"group"===i.type&&layui.each(C.group,function(a,t){if(i.id==t.id)return e.children("li").eq(a).remove(),C.group.splice(a,1),0===C.group.length&&e.html('<li class="layim-null">暂无群组</li>'),!0}))},J=function(){var i=A(),e=i.elem.find(".layim-chat-main"),a=e.find("ul"),t=a.children(".layim-chat-li");if(t.length>=d){var n=t.eq(0);n.prev().remove(),a.prev().hasClass("layim-chat-system")||a.before('<div class="layim-chat-system"><span layim-event="chatLog">查看更多记录</span></div>'),n.remove()}e.scrollTop(e[0].scrollHeight+1e3)},B=function(){var i=A(),e=i.textarea,a=e.next();e.off("keyup").on("keyup",function(i){var t=i.keyCode;13===t&&(i.preventDefault(),q()),a[""===e.val()?"addClass":"removeClass"]("layui-disabled")})},E=function(){var i=["[微笑]","[嘻嘻]","[哈哈]","[可爱]","[可怜]","[挖鼻]","[吃惊]","[害羞]","[挤眼]","[闭嘴]","[鄙视]","[爱你]","[泪]","[偷笑]","[亲亲]","[生病]","[太开心]","[白眼]","[右哼哼]","[左哼哼]","[嘘]","[衰]","[委屈]","[吐]","[哈欠]","[抱抱]","[怒]","[疑问]","[馋嘴]","[拜拜]","[思考]","[汗]","[困]","[睡]","[钱]","[失望]","[酷]","[色]","[哼]","[鼓掌]","[晕]","[悲伤]","[抓狂]","[黑线]","[阴险]","[怒骂]","[互粉]","[心]","[伤心]","[猪头]","[熊猫]","[兔子]","[ok]","[耶]","[good]","[NO]","[赞]","[来]","[弱]","[草泥马]","[神马]","[囧]","[浮云]","[给力]","[围观]","[威武]","[奥特曼]","[礼物]","[钟]","[话筒]","[蜡烛]","[蛋糕]"],e={};return layui.each(i,function(i,a){e[a]=layui.cache.dir+"images/face/"+i+".gif"}),e}(),P=layui.stope,R=function(i,e,a){var t,n=i.value;a||i.focus(),document.selection?(t=document.selection.createRange(),document.selection.empty(),t.text=e):(t=[n.substring(0,i.selectionStart),e,n.substr(i.selectionEnd)],a||i.focus(),i.value=t.join(""))},U={chat:function(i){var e=layui.data("layim-mobile")[C.mine.id]||{},t=i.data("type"),n=i.data("index"),l=i.attr("data-list")||i.index(),s={};"friend"===t?s=C[t][n].list[l]:"group"===t?s=C[t][l]:"history"===t&&(s=(e.history||{})[n]||{}),s.name=s.name||s.username||s.groupname,"history"!==t&&(s.type=t),L(s,!0),a(".layim-"+s.type+s.id).find(".layim-msg-status").removeClass(o)},spread:function(i){var e=i.attr("lay-type"),a="true"===e?"false":"true",t=layui.data("layim-mobile")[C.mine.id]||{};i.next()["true"===e?"removeClass":"addClass"](o),t["spread"+i.parent().index()]=a,layui.data("layim-mobile",{key:C.mine.id,value:t}),i.attr("lay-type",a),i.find(".layui-icon").html("true"===a?"&#xe61a;":"&#xe602;")},tab:function(i){var e=i.index(),a=".layim-tab-content";i.addClass(c).siblings().removeClass(c),b.find(a).eq(e).addClass(o).siblings(a).removeClass(o)},back:function(i){var e=i.parents(".layui-m-layer").eq(0),a=e.attr("index"),t=".layim-panel";setTimeout(function(){n.close(a)},300),i.parents(t).eq(0).removeClass("layui-m-anim-left").addClass("layui-m-anim-rout"),e.prev().find(t).eq(0).removeClass("layui-m-anim-lout").addClass("layui-m-anim-right"),layui.each(r.back,function(i,e){setTimeout(function(){e&&e()},200)})},send:function(){q()},face:function(i,e){var t="",l=A(),s=l.textarea;layui.each(E,function(i,e){t+='<li title="'+i+'"><img src="'+e+'"></li>'}),t='<ul class="layui-layim-face">'+t+"</ul>",n.popBottom({content:t,success:function(i){var e=a(i).find(".layui-layim-face").children("li");m(e,function(){return R(s[0],"face"+this.title+" ",!0),s.next()[""===s.val()?"addClass":"removeClass"]("layui-disabled"),!1})}});var o=a(document);y?o.off("touchend",U.faceHide).on("touchend",U.faceHide):o.off("click",U.faceHide).on("click",U.faceHide),P(e)},faceHide:function(){n.close(n.popBottom.index),a(document).off("touchend",U.faceHide).off("click",U.faceHide)},image:function(i){var e=i.data("type")||"images",a={images:"uploadImage",file:"uploadFile"},t=A(),s=C.base[a[e]]||{};l({url:s.url||"",method:s.type,elem:i.find("input")[0],unwrap:!0,type:e,success:function(i){0==i.code?(i.data=i.data||{},"images"===e?R(t.textarea[0],"img["+(i.data.src||"")+"]"):"file"===e&&R(t.textarea[0],"file("+(i.data.src||"")+")["+(i.data.name||"下载文件")+"]"),q()):n.msg(i.msg||"上传失败")}})},extend:function(i){var e=i.attr("lay-filter"),a=A();layui.each(r["tool("+e+")"],function(e,t){t&&t.call(i,function(i){R(a.textarea[0],i)},q,a)})},newFriend:function(){layui.each(r.newFriend,function(i,e){e&&e()})},group:function(){N({title:"群聊",tpl:['<div class="layui-layim-list layim-list-group">',p({type:"group",item:"d.group"}),"</div>"].join(""),data:{}})},detail:function(){var i=A();layui.each(r.detail,function(e,a){a&&a(i.data)})},playAudio:function(i){var e=i.data("audio"),a=e||document.createElement("audio"),t=function(){a.pause(),i.removeAttr("status"),i.find("i").html("&#xe652;")};return i.data("error")?n.msg("播放音频源异常"):a.play?void(i.attr("status")?t():(e||(a.src=i.data("src")),a.play(),i.attr("status","pause"),i.data("audio",a),i.find("i").html("&#xe651;"),a.onended=function(){t()},a.onerror=function(){n.msg("播放音频源异常"),i.data("error",!0),t()})):n.msg("您的浏览器不支持audio")},playVideo:function(i){var e=i.data("src"),a=document.createElement("video");return a.play?(n.close(U.playVideo.index),void(U.playVideo.index=n.open({type:1,anim:!1,style:"width: 100%; height: 50%;",content:'<div style="background-color: #000; height: 100%;"><video style="position: absolute; width: 100%; height: 100%;" src="'+e+'" autoplay="autoplay"></video></div>'}))):n.msg("您的浏览器不支持video")},chatLog:function(i){var e=A();layui.each(r.chatlog,function(i,a){a&&a(e.data,e.elem.find(".layim-chat-main>ul"))})},moreList:function(i){var e=i.attr("lay-filter");layui.each(r.moreList,function(i,a){a&&a({alias:e})})},about:function(){n.open({content:'<p style="padding-bottom: 5px;">LayIM属于付费产品，欢迎通过官网获得授权，促进良性发展！</p><p>当前版本：layim mobile v'+e+'</p><p>版权所有：<a href="http://layim.layui.com" target="_blank">layim.layui.com</a></p>',className:"layim-about",shadeClose:!1,btn:"我知道了"})}};i("layim-mobile",new u)}).addcss("modules/layim/mobile/layim.css?v=2.10","skinlayim-mobilecss");layui["layui.mobile"]||layui.config({base:layui.cache.dir+"lay/modules/mobile/"}).extend({"layer-mobile":"layer-mobile",zepto:"zepto","upload-mobile":"upload-mobile","layim-mobile":"layim-mobile"}),layui.define(["layer-mobile","zepto","layim-mobile"],function(l){l("mobile",{layer:layui["layer-mobile"],layim:layui["layim-mobile"]})});
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/lay/modules/rate.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/lay/modules/rate.js
new file mode 100644
index 0000000..3c98909
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/lay/modules/rate.js
@@ -0,0 +1,2 @@
+/** layui-v2.3.0 MIT License By https://www.layui.com */
+ ;layui.define("jquery",function(e){"use strict";var a=layui.jquery,i={config:{},index:layui.rate?layui.rate.index+1e4:0,set:function(e){var i=this;return i.config=a.extend({},i.config,e),i},on:function(e,a){return layui.onevent.call(this,n,e,a)}},l=function(){var e=this,a=e.config;return{setvalue:function(a){e.setvalue.call(e,a)},config:a}},n="rate",t="layui-rate",o="layui-icon-rate",s="layui-icon-rate-solid",u="layui-icon-rate-half",r="layui-icon-rate-solid layui-icon-rate-half",c="layui-icon-rate-solid layui-icon-rate",f="layui-icon-rate layui-icon-rate-half",v=function(e){var l=this;l.index=++i.index,l.config=a.extend({},l.config,i.config,e),l.render()};v.prototype.config={length:5,text:!1,readonly:!1,half:!1,value:0,theme:""},v.prototype.render=function(){var e=this,i=e.config,l=i.theme?'style="color: '+i.theme+';"':"";i.elem=a(i.elem),parseInt(i.value)!==i.value&&(i.half||(i.value=Math.ceil(i.value)-i.value<.5?Math.ceil(i.value):Math.floor(i.value)));for(var n='<ul class="layui-rate" '+(i.readonly?"readonly":"")+">",u=1;u<=i.length;u++){var r='<li class="layui-inline"><i class="layui-icon '+(u>Math.floor(i.value)?o:s)+'" '+l+"></i></li>";i.half&&parseInt(i.value)!==i.value&&u==Math.ceil(i.value)?n=n+'<li><i class="layui-icon layui-icon-rate-half" '+l+"></i></li>":n+=r}n+="</ul>"+(i.text?'<span class="layui-inline">'+i.value+"星":"")+"</span>";var c=i.elem,f=c.next("."+t);f[0]&&f.remove(),e.elemTemp=a(n),i.span=e.elemTemp.next("span"),i.setText&&i.setText(i.value),c.html(e.elemTemp),c.addClass("layui-inline"),i.readonly||e.action()},v.prototype.setvalue=function(e){var a=this,i=a.config;i.value=e,a.render()},v.prototype.action=function(){var e=this,i=e.config,l=e.elemTemp,n=l.find("i").width();l.children("li").each(function(e){var t=e+1,v=a(this);v.on("click",function(e){if(i.value=t,i.half){var o=e.pageX-a(this).offset().left;o<=n/2&&(i.value=i.value-.5)}i.text&&l.next("span").text(i.value+"星"),i.choose&&i.choose(i.value),i.setText&&i.setText(i.value)}),v.on("mousemove",function(e){if(l.find("i").each(function(){a(this).addClass(o).removeClass(r)}),l.find("i:lt("+t+")").each(function(){a(this).addClass(s).removeClass(f)}),i.half){var c=e.pageX-a(this).offset().left;c<=n/2&&v.children("i").addClass(u).removeClass(s)}}),v.on("mouseleave",function(){l.find("i").each(function(){a(this).addClass(o).removeClass(r)}),l.find("i:lt("+Math.floor(i.value)+")").each(function(){a(this).addClass(s).removeClass(f)}),i.half&&parseInt(i.value)!==i.value&&l.children("li:eq("+Math.floor(i.value)+")").children("i").addClass(u).removeClass(c)})})},v.prototype.events=function(){var e=this;e.config},i.render=function(e){var a=new v(e);return l.call(a)},e(n,i)});
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/lay/modules/table.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/lay/modules/table.js
new file mode 100644
index 0000000..fe4e4ee
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/lay/modules/table.js
@@ -0,0 +1,2 @@
+/** layui-v2.3.0 MIT License By https://www.layui.com */
+ ;layui.define(["laytpl","laypage","layer","form"],function(e){"use strict";var t=layui.$,i=layui.laytpl,a=layui.laypage,l=layui.layer,n=layui.form,o=layui.hint(),r=layui.device(),d={config:{checkName:"LAY_CHECKED",indexName:"LAY_TABLE_INDEX"},cache:{},index:layui.table?layui.table.index+1e4:0,set:function(e){var i=this;return i.config=t.extend({},i.config,e),i},on:function(e,t){return layui.onevent.call(this,s,e,t)}},c=function(){var e=this,t=e.config,i=t.id;return i&&(c.config[i]=t),{reload:function(t){e.reload.call(e,t)},config:t}},s="table",u=".layui-table",h="layui-hide",f="layui-none",y="layui-table-view",p=".layui-table-header",m=".layui-table-body",v=".layui-table-main",g=".layui-table-fixed",x=".layui-table-fixed-l",b=".layui-table-fixed-r",k=".layui-table-tool",C=".layui-table-page",w=".layui-table-sort",N="layui-table-edit",T="layui-table-hover",F=function(e){var t='{{#if(item2.colspan){}} colspan="{{item2.colspan}}"{{#} if(item2.rowspan){}} rowspan="{{item2.rowspan}}"{{#}}}';return e=e||{},['<table cellspacing="0" cellpadding="0" border="0" class="layui-table" ','{{# if(d.data.skin){ }}lay-skin="{{d.data.skin}}"{{# } }} {{# if(d.data.size){ }}lay-size="{{d.data.size}}"{{# } }} {{# if(d.data.even){ }}lay-even{{# } }}>',"<thead>","{{# layui.each(d.data.cols, function(i1, item1){ }}","<tr>","{{# layui.each(item1, function(i2, item2){ }}",'{{# if(item2.fixed && item2.fixed !== "right"){ left = true; } }}','{{# if(item2.fixed === "right"){ right = true; } }}',function(){return e.fixed&&"right"!==e.fixed?'{{# if(item2.fixed && item2.fixed !== "right"){ }}':"right"===e.fixed?'{{# if(item2.fixed === "right"){ }}':""}(),'<th data-field="{{ item2.field||i2 }}" {{# if(item2.minWidth){ }}data-minwidth="{{item2.minWidth}}"{{# } }} '+t+' {{# if(item2.unresize){ }}data-unresize="true"{{# } }}>','<div class="layui-table-cell laytable-cell-',"{{# if(item2.colspan > 1){ }}","group","{{# } else { }}","{{d.index}}-{{item2.field || i2}}",'{{# if(item2.type !== "normal"){ }}'," laytable-cell-{{ item2.type }}","{{# } }}","{{# } }}",'" {{#if(item2.align){}}align="{{item2.align}}"{{#}}}>','{{# if(item2.type === "checkbox"){ }}','<input type="checkbox" name="layTableCheckbox" lay-skin="primary" lay-filter="layTableAllChoose" {{# if(item2[d.data.checkName]){ }}checked{{# }; }}>',"{{# } else { }}",'<span>{{item2.title||""}}</span>',"{{# if(!(item2.colspan > 1) && item2.sort){ }}",'<span class="layui-table-sort layui-inline"><i class="layui-edge layui-table-sort-asc"></i><i class="layui-edge layui-table-sort-desc"></i></span>',"{{# } }}","{{# } }}","</div>","</th>",e.fixed?"{{# }; }}":"","{{# }); }}","</tr>","{{# }); }}","</thead>","</table>"].join("")},W=['<table cellspacing="0" cellpadding="0" border="0" class="layui-table" ','{{# if(d.data.skin){ }}lay-skin="{{d.data.skin}}"{{# } }} {{# if(d.data.size){ }}lay-size="{{d.data.size}}"{{# } }} {{# if(d.data.even){ }}lay-even{{# } }}>',"<tbody></tbody>","</table>"].join(""),z=['<div class="layui-form layui-border-box {{d.VIEW_CLASS}}" lay-filter="LAY-table-{{d.index}}" style="{{# if(d.data.width){ }}width:{{d.data.width}}px;{{# } }} {{# if(d.data.height){ }}height:{{d.data.height}}px;{{# } }}">',"{{# if(d.data.toolbar){ }}",'<div class="layui-table-tool"></div>',"{{# } }}",'<div class="layui-table-box">',"{{# var left, right; }}",'<div class="layui-table-header">',F(),"</div>",'<div class="layui-table-body layui-table-main">',W,"</div>","{{# if(left){ }}",'<div class="layui-table-fixed layui-table-fixed-l">','<div class="layui-table-header">',F({fixed:!0}),"</div>",'<div class="layui-table-body">',W,"</div>","</div>","{{# }; }}","{{# if(right){ }}",'<div class="layui-table-fixed layui-table-fixed-r">','<div class="layui-table-header">',F({fixed:"right"}),'<div class="layui-table-mend"></div>',"</div>",'<div class="layui-table-body">',W,"</div>","</div>","{{# }; }}","</div>","{{# if(d.data.page){ }}",'<div class="layui-table-page">','<div id="layui-table-page{{d.index}}"></div>',"</div>","{{# } }}","<style>","{{# layui.each(d.data.cols, function(i1, item1){","layui.each(item1, function(i2, item2){ }}",".laytable-cell-{{d.index}}-{{item2.field||i2}}{ ","{{# if(item2.width){ }}","width: {{item2.width}}px;","{{# } }}"," }","{{# });","}); }}","</style>","</div>"].join(""),A=t(window),S=t(document),M=function(e){var i=this;i.index=++d.index,i.config=t.extend({},i.config,d.config,e),i.render()};M.prototype.config={limit:10,loading:!0,cellMinWidth:60,text:{none:"无数据"}},M.prototype.render=function(){var e=this,a=e.config;if(a.elem=t(a.elem),a.where=a.where||{},a.id=a.id||a.elem.attr("id"),a.request=t.extend({pageName:"page",limitName:"limit"},a.request),a.response=t.extend({statusName:"code",statusCode:0,msgName:"msg",dataName:"data",countName:"count"},a.response),"object"==typeof a.page&&(a.limit=a.page.limit||a.limit,a.limits=a.page.limits||a.limits,e.page=a.page.curr=a.page.curr||1,delete a.page.elem,delete a.page.jump),!a.elem[0])return e;e.setArea();var l=a.elem,n=l.next("."+y),o=e.elem=t(i(z).render({VIEW_CLASS:y,data:a,index:e.index}));if(a.index=e.index,n[0]&&n.remove(),l.after(o),e.layHeader=o.find(p),e.layMain=o.find(v),e.layBody=o.find(m),e.layFixed=o.find(g),e.layFixLeft=o.find(x),e.layFixRight=o.find(b),e.layTool=o.find(k),e.layPage=o.find(C),e.layTool.html(i(t(a.toolbar).html()||"").render(a)),a.height&&e.fullSize(),a.cols.length>1){var r=e.layFixed.find(p).find("th");r.height(e.layHeader.height()-1-parseFloat(r.css("padding-top"))-parseFloat(r.css("padding-bottom")))}e.pullData(e.page),e.events()},M.prototype.initOpts=function(e){var t=this,i=(t.config,{checkbox:48,space:15,numbers:40});e.checkbox&&(e.type="checkbox"),e.space&&(e.type="space"),e.type||(e.type="normal"),"normal"!==e.type&&(e.unresize=!0,e.width=e.width||i[e.type])},M.prototype.setArea=function(){var e=this,t=e.config,i=0,a=0,l=0,n=0,o=t.width||function(){var e=function(i){var a,l;i=i||t.elem.parent(),a=i.width();try{l="none"===i.css("display")}catch(n){}return!i[0]||a&&!l?a:e(i.parent())};return e()}();e.eachCols(function(){i++}),o-=function(){return"line"===t.skin||"nob"===t.skin?2:i+1}(),layui.each(t.cols,function(t,i){layui.each(i,function(t,l){var r;return l?(e.initOpts(l),r=l.width||0,void(l.colspan>1||(/\d+%$/.test(r)?l.width=r=Math.floor(parseFloat(r)/100*o):r||(l.width=r=0,a++),n+=r))):void i.splice(t,1)})}),e.autoColNums=a,o>n&&a&&(l=(o-n)/a),layui.each(t.cols,function(e,i){layui.each(i,function(e,i){var a=i.minWidth||t.cellMinWidth;i.colspan>1||0===i.width&&(i.width=Math.floor(l>=a?l:a))})}),t.height&&/^full-\d+$/.test(t.height)&&(e.fullHeightGap=t.height.split("-")[1],t.height=A.height()-e.fullHeightGap)},M.prototype.reload=function(e){var i=this;i.config.data&&i.config.data.constructor===Array&&delete i.config.data,i.config=t.extend({},i.config,e),i.render()},M.prototype.page=1,M.prototype.pullData=function(e,i){var a=this,n=a.config,o=n.request,r=n.response,d=function(){"object"==typeof n.initSort&&a.sort(n.initSort.field,n.initSort.type)};if(a.startTime=(new Date).getTime(),n.url){var c={};c[o.pageName]=e,c[o.limitName]=n.limit;var s=t.extend(c,n.where);n.contentType&&0==n.contentType.indexOf("application/json")&&(s=JSON.stringify(s)),t.ajax({type:n.method||"get",url:n.url,contentType:n.contentType,data:s,dataType:"json",headers:n.headers||{},success:function(t){t[r.statusName]!=r.statusCode?(a.renderForm(),a.layMain.html('<div class="'+f+'">'+(t[r.msgName]||"返回的数据状态异常")+"</div>")):(a.renderData(t,e,t[r.countName]),d(),n.time=(new Date).getTime()-a.startTime+" ms"),i&&l.close(i),"function"==typeof n.done&&n.done(t,e,t[r.countName])},error:function(e,t){a.layMain.html('<div class="'+f+'">数据接口请求异常</div>'),a.renderForm(),i&&l.close(i)}})}else if(n.data&&n.data.constructor===Array){var u={},h=e*n.limit-n.limit;u[r.dataName]=n.data.concat().splice(h,n.limit),u[r.countName]=n.data.length,a.renderData(u,e,n.data.length),d(),"function"==typeof n.done&&n.done(u,e,u[r.countName])}},M.prototype.eachCols=function(e){var i=t.extend(!0,[],this.config.cols),a=[],l=0;layui.each(i,function(e,t){layui.each(t,function(t,n){if(n.colspan>1){var o=0;l++,n.CHILD_COLS=[],layui.each(i[e+1],function(e,t){t.PARENT_COL||o==n.colspan||(t.PARENT_COL=l,n.CHILD_COLS.push(t),o+=t.colspan>1?t.colspan:1)})}n.PARENT_COL||a.push(n)})});var n=function(t){layui.each(t||a,function(t,i){return i.CHILD_COLS?n(i.CHILD_COLS):void e(t,i)})};n()},M.prototype.renderData=function(e,n,o,r){var c=this,s=c.config,u=e[s.response.dataName]||[],y=[],p=[],m=[],v=function(){return!r&&c.sortKey?c.sort(c.sortKey.field,c.sortKey.sort,!0):(layui.each(u,function(e,a){var l=[],o=[],u=[],h=e+s.limit*(n-1)+1;0!==a.length&&(r||(a[d.config.indexName]=e),c.eachCols(function(e,n){var r=n.field||e,f=a[r];c.getColElem(c.layHeader,r);if(void 0!==f&&null!==f||(f=""),!(n.colspan>1)){var y=['<td data-field="'+r+'" '+function(){var e=[];return n.edit&&e.push('data-edit="'+n.edit+'"'),n.align&&e.push('align="'+n.align+'"'),n.templet&&e.push('data-content="'+f+'"'),n.toolbar&&e.push('data-off="true"'),n.event&&e.push('lay-event="'+n.event+'"'),n.style&&e.push('style="'+n.style+'"'),n.minWidth&&e.push('data-minwidth="'+n.minWidth+'"'),e.join(" ")}()+">",'<div class="layui-table-cell laytable-cell-'+function(){var e=s.index+"-"+r;return"normal"===n.type?e:e+" laytable-cell-"+n.type}()+'">'+function(){var e=t.extend(!0,{LAY_INDEX:h},a);return"checkbox"===n.type?'<input type="checkbox" name="layTableCheckbox" lay-skin="primary" '+function(){var t=d.config.checkName;return n[t]?(a[t]=n[t],n[t]?"checked":""):e[t]?"checked":""}()+">":"numbers"===n.type?h:n.toolbar?i(t(n.toolbar).html()||"").render(e):n.templet?function(){return"function"==typeof n.templet?n.templet(e):i(t(n.templet).html()||String(f)).render(e)}():f}(),"</div></td>"].join("");l.push(y),n.fixed&&"right"!==n.fixed&&o.push(y),"right"===n.fixed&&u.push(y)}}),y.push('<tr data-index="'+e+'">'+l.join("")+"</tr>"),p.push('<tr data-index="'+e+'">'+o.join("")+"</tr>"),m.push('<tr data-index="'+e+'">'+u.join("")+"</tr>"))}),c.layBody.scrollTop(0),c.layMain.find("."+f).remove(),c.layMain.find("tbody").html(y.join("")),c.layFixLeft.find("tbody").html(p.join("")),c.layFixRight.find("tbody").html(m.join("")),c.renderForm(),c.syncCheckAll(),c.haveInit?c.scrollPatch():setTimeout(function(){c.scrollPatch()},50),c.haveInit=!0,void l.close(c.tipsIndex))};return c.key=s.id||s.index,d.cache[c.key]=u,c.layPage[0===u.length&&1==n?"addClass":"removeClass"](h),r?v():0===u.length?(c.renderForm(),c.layFixed.remove(),c.layMain.find("tbody").html(""),c.layMain.find("."+f).remove(),c.layMain.append('<div class="'+f+'">'+s.text.none+"</div>")):(v(),void(s.page&&(s.page=t.extend({elem:"layui-table-page"+s.index,count:o,limit:s.limit,limits:s.limits||[10,20,30,40,50,60,70,80,90],groups:3,layout:["prev","page","next","skip","count","limit"],prev:'<i class="layui-icon">&#xe603;</i>',next:'<i class="layui-icon">&#xe602;</i>',jump:function(e,t){t||(c.page=e.curr,s.limit=e.limit,c.pullData(e.curr,c.loading()))}},s.page),s.page.count=o,a.render(s.page))))},M.prototype.getColElem=function(e,t){var i=this,a=i.config;return e.eq(0).find(".laytable-cell-"+(a.index+"-"+t)+":eq(0)")},M.prototype.renderForm=function(e){n.render(e,"LAY-table-"+this.index)},M.prototype.sort=function(e,i,a,l){var n,r,c=this,u={},h=c.config,f=h.elem.attr("lay-filter"),y=d.cache[c.key];"string"==typeof e&&c.layHeader.find("th").each(function(i,a){var l=t(this),o=l.data("field");if(o===e)return e=l,n=o,!1});try{var n=n||e.data("field");if(c.sortKey&&!a&&n===c.sortKey.field&&i===c.sortKey.sort)return;var p=c.layHeader.find("th .laytable-cell-"+h.index+"-"+n).find(w);c.layHeader.find("th").find(w).removeAttr("lay-sort"),p.attr("lay-sort",i||null),c.layFixed.find("th")}catch(m){return o.error("Table modules: Did not match to field")}c.sortKey={field:n,sort:i},"asc"===i?r=layui.sort(y,n):"desc"===i?r=layui.sort(y,n,!0):(r=layui.sort(y,d.config.indexName),delete c.sortKey),u[h.response.dataName]=r,c.renderData(u,c.page,c.count,!0),l&&layui.event.call(e,s,"sort("+f+")",{field:n,type:i})},M.prototype.loading=function(){var e=this,t=e.config;if(t.loading&&t.url)return l.msg("数据请求中",{icon:16,offset:[e.elem.offset().top+e.elem.height()/2-35-A.scrollTop()+"px",e.elem.offset().left+e.elem.width()/2-90-A.scrollLeft()+"px"],time:-1,anim:-1,fixed:!1})},M.prototype.setCheckData=function(e,t){var i=this,a=i.config,l=d.cache[i.key];l[e]&&l[e].constructor!==Array&&(l[e][a.checkName]=t)},M.prototype.syncCheckAll=function(){var e=this,t=e.config,i=e.layHeader.find('input[name="layTableCheckbox"]'),a=function(i){return e.eachCols(function(e,a){"checkbox"===a.type&&(a[t.checkName]=i)}),i};i[0]&&(d.checkStatus(e.key).isAll?(i[0].checked||(i.prop("checked",!0),e.renderForm("checkbox")),a(!0)):(i[0].checked&&(i.prop("checked",!1),e.renderForm("checkbox")),a(!1)))},M.prototype.getCssRule=function(e,t){var i=this,a=i.elem.find("style")[0],l=a.sheet||a.styleSheet||{},n=l.cssRules||l.rules;layui.each(n,function(a,l){if(l.selectorText===".laytable-cell-"+i.index+"-"+e)return t(l),!0})},M.prototype.fullSize=function(){var e,t=this,i=t.config,a=i.height;t.fullHeightGap&&(a=A.height()-t.fullHeightGap,a<135&&(a=135),t.elem.css("height",a)),e=parseFloat(a)-parseFloat(t.layHeader.height())-1,i.toolbar&&(e-=t.layTool.outerHeight()),i.page&&(e=e-t.layPage.outerHeight()-1),t.layMain.css("height",e)},M.prototype.getScrollWidth=function(e){var t=0;return e?t=e.offsetWidth-e.clientWidth:(e=document.createElement("div"),e.style.width="100px",e.style.height="100px",e.style.overflowY="scroll",document.body.appendChild(e),t=e.offsetWidth-e.clientWidth,document.body.removeChild(e)),t},M.prototype.scrollPatch=function(){var e=this,i=e.layMain.children("table"),a=e.layMain.width()-e.layMain.prop("clientWidth"),l=e.layMain.height()-e.layMain.prop("clientHeight"),n=e.getScrollWidth(e.layMain[0]),o=i.outerWidth()-e.layMain.width();if(e.autoColNums&&o<5&&!e.scrollPatchWStatus){var r=e.layHeader.eq(0).find("thead th:last-child"),d=r.data("field");e.getCssRule(d,function(t){var i=t.style.width||r.outerWidth();t.style.width=parseFloat(i)-n-o+"px",e.layMain.height()-e.layMain.prop("clientHeight")>0&&(t.style.width=parseFloat(t.style.width)-1+"px"),e.scrollPatchWStatus=!0})}if(a&&l){if(!e.elem.find(".layui-table-patch")[0]){var c=t('<th class="layui-table-patch"><div class="layui-table-cell"></div></th>');c.find("div").css({width:a}),e.layHeader.eq(0).find("thead tr").append(c)}}else e.layHeader.eq(0).find(".layui-table-patch").remove();var s=e.layMain.height(),u=s-l;e.layFixed.find(m).css("height",i.height()>u?u:"auto"),e.layFixRight[o>0?"removeClass":"addClass"](h),e.layFixRight.css("right",a-1)},M.prototype.events=function(){var e,a=this,n=a.config,o=t("body"),c={},u=a.layHeader.find("th"),h=".layui-table-cell",f=n.elem.attr("lay-filter");u.on("mousemove",function(e){var i=t(this),a=i.offset().left,l=e.clientX-a;i.attr("colspan")>1||i.data("unresize")||c.resizeStart||(c.allowResize=i.width()-l<=10,o.css("cursor",c.allowResize?"col-resize":""))}).on("mouseleave",function(){t(this);c.resizeStart||o.css("cursor","")}).on("mousedown",function(e){var i=t(this);if(c.allowResize){var l=i.data("field");e.preventDefault(),c.resizeStart=!0,c.offset=[e.clientX,e.clientY],a.getCssRule(l,function(e){var t=e.style.width||i.outerWidth();c.rule=e,c.ruleWidth=parseFloat(t),c.minWidth=i.data("minwidth")||n.cellMinWidth})}}),S.on("mousemove",function(t){if(c.resizeStart){if(t.preventDefault(),c.rule){var i=c.ruleWidth+t.clientX-c.offset[0];i<c.minWidth&&(i=c.minWidth),c.rule.style.width=i+"px",l.close(a.tipsIndex)}e=1}}).on("mouseup",function(t){c.resizeStart&&(c={},o.css("cursor",""),a.scrollPatch()),2===e&&(e=null)}),u.on("click",function(){var i,l=t(this),n=l.find(w),o=n.attr("lay-sort");return n[0]&&1!==e?(i="asc"===o?"desc":"desc"===o?null:"asc",void a.sort(l,i,null,!0)):e=2}).find(w+" .layui-edge ").on("click",function(e){var i=t(this),l=i.index(),n=i.parents("th").eq(0).data("field");layui.stope(e),0===l?a.sort(n,"asc",null,!0):a.sort(n,"desc",null,!0)}),a.elem.on("click",'input[name="layTableCheckbox"]+',function(){var e=t(this).prev(),i=a.layBody.find('input[name="layTableCheckbox"]'),l=e.parents("tr").eq(0).data("index"),n=e[0].checked,o="layTableAllChoose"===e.attr("lay-filter");o?(i.each(function(e,t){t.checked=n,a.setCheckData(e,n)}),a.syncCheckAll(),a.renderForm("checkbox")):(a.setCheckData(l,n),a.syncCheckAll()),layui.event.call(this,s,"checkbox("+f+")",{checked:n,data:d.cache[a.key]?d.cache[a.key][l]||{}:{},type:o?"all":"one"})}),a.layBody.on("mouseenter","tr",function(){var e=t(this),i=e.index();a.layBody.find("tr:eq("+i+")").addClass(T)}).on("mouseleave","tr",function(){var e=t(this),i=e.index();a.layBody.find("tr:eq("+i+")").removeClass(T)}),a.layBody.on("change","."+N,function(){var e=t(this),i=this.value,l=e.parent().data("field"),n=e.parents("tr").eq(0).data("index"),o=d.cache[a.key][n];o[l]=i,layui.event.call(this,s,"edit("+f+")",{value:i,data:o,field:l})}).on("blur","."+N,function(){var e,l=t(this),n=l.parent().data("field"),o=l.parents("tr").eq(0).data("index"),r=d.cache[a.key][o];a.eachCols(function(t,i){i.field==n&&i.templet&&(e=i.templet)}),l.siblings(h).html(e?i(t(e).html()||this.value).render(r):this.value),l.parent().data("content",this.value),l.remove()}),a.layBody.on("click","td",function(){var e=t(this),i=(e.data("field"),e.data("edit")),o=e.children(h);if(l.close(a.tipsIndex),!e.data("off"))if(i)if("select"===i);else{var d=t('<input class="layui-input '+N+'">');d[0].value=e.data("content")||o.text(),e.find("."+N)[0]||e.append(d),d.focus()}else o.find(".layui-form-switch,.layui-form-checkbox")[0]||Math.round(o.prop("scrollWidth"))>Math.round(o.outerWidth())&&(a.tipsIndex=l.tips(['<div class="layui-table-tips-main" style="margin-top: -'+(o.height()+16)+"px;"+function(){return"sm"===n.size?"padding: 4px 15px; font-size: 12px;":"lg"===n.size?"padding: 14px 15px;":""}()+'">',o.html(),"</div>",'<i class="layui-icon layui-table-tips-c">&#x1006;</i>'].join(""),o[0],{tips:[3,""],time:-1,anim:-1,maxWidth:r.ios||r.android?300:600,isOutAnim:!1,skin:"layui-table-tips",success:function(e,t){e.find(".layui-table-tips-c").on("click",function(){l.close(t)})}}))}),a.layBody.on("click","*[lay-event]",function(){var e=t(this),l=e.parents("tr").eq(0).data("index"),n=a.layBody.find('tr[data-index="'+l+'"]'),o="layui-table-click",r=d.cache[a.key][l];layui.event.call(this,s,"tool("+f+")",{data:d.clearCacheKey(r),event:e.attr("lay-event"),tr:n,del:function(){d.cache[a.key][l]=[],n.remove(),a.scrollPatch()},update:function(e){e=e||{},layui.each(e,function(e,l){if(e in r){var o,d=n.children('td[data-field="'+e+'"]');r[e]=l,a.eachCols(function(t,i){i.field==e&&i.templet&&(o=i.templet)}),d.children(h).html(o?i(t(o).html()||l).render(r):l),d.data("content",l)}})}}),n.addClass(o).siblings("tr").removeClass(o)}),a.layMain.on("scroll",function(){var e=t(this),i=e.scrollLeft(),n=e.scrollTop();a.layHeader.scrollLeft(i),a.layFixed.find(m).scrollTop(n),l.close(a.tipsIndex)}),A.on("resize",function(){a.fullSize(),a.scrollPatch()})},d.init=function(e,i){i=i||{};var a=this,l=t(e?'table[lay-filter="'+e+'"]':u+"[lay-data]"),n="Table element property lay-data configuration item has a syntax error: ";return l.each(function(){var a=t(this),l=a.attr("lay-data");try{l=new Function("return "+l)()}catch(r){o.error(n+l)}var c=[],s=t.extend({elem:this,cols:[],data:[],skin:a.attr("lay-skin"),size:a.attr("lay-size"),even:"string"==typeof a.attr("lay-even")},d.config,i,l);e&&a.hide(),a.find("thead>tr").each(function(e){s.cols[e]=[],t(this).children().each(function(i){var a=t(this),l=a.attr("lay-data");try{l=new Function("return "+l)()}catch(r){return o.error(n+l)}var d=t.extend({title:a.text(),colspan:a.attr("colspan")||0,rowspan:a.attr("rowspan")||0},l);d.colspan<2&&c.push(d),s.cols[e].push(d)})}),a.find("tbody>tr").each(function(e){var i=t(this),a={};i.children("td").each(function(e,i){var l=t(this),n=l.data("field");if(n)return a[n]=l.html()}),layui.each(c,function(e,t){var l=i.children("td").eq(e);a[t.field]=l.html()}),s.data[e]=a}),d.render(s)}),a},d.checkStatus=function(e){var t=0,i=0,a=[],l=d.cache[e]||[];return layui.each(l,function(e,l){return l.constructor===Array?void i++:void(l[d.config.checkName]&&(t++,a.push(d.clearCacheKey(l))))}),{data:a,isAll:!!l.length&&t===l.length-i}},c.config={},d.reload=function(e,i){var a=c.config[e];return i=i||{},a?(i.data&&i.data.constructor===Array&&delete a.data,d.render(t.extend(!0,{},a,i))):o.error("The ID option was not found in the table instance")},d.render=function(e){var t=new M(e);return c.call(t)},d.clearCacheKey=function(e){return e=t.extend({},e),delete e[d.config.checkName],delete e[d.config.indexName],e},d.init(),e(s,d)});
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/lay/modules/tree.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/lay/modules/tree.js
new file mode 100644
index 0000000..c600ecf
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/lay/modules/tree.js
@@ -0,0 +1,133 @@
+/** layui-v2.3.0 MIT License By https://www.layui.com */
+;
+layui.define("jquery",
+    function(e) {
+        "use strict";
+        var o = layui.$,
+            a = layui.hint(),
+            i = "layui-tree-enter",
+            r = function(e) {
+                this.options = e
+            },
+            t = {
+                arrow: ["&#xe623;", "&#xe625;"],
+                checkbox: ["&#xe626;", "&#xe627;"],
+                radio: ["&#xe62b;", "&#xe62a;"],
+                branch: ["&#xe622;", "&#xe624;"],
+                leaf: "&#xe621;"
+            };
+        r.prototype.init = function(e) {
+            var o = this;
+            e.addClass("layui-box layui-tree"),
+            o.options.skin && e.addClass("layui-tree-skin-" + o.options.skin),
+                o.tree(e),
+                o.on(e)
+        },
+            r.prototype.tree = function(e, a) {
+                var i = this,
+                    r = i.options,
+                    n = a || r.nodes;
+                layui.each(n,
+                    function(a, n) {
+                        var l = n.children && n.children.length > 0,
+                            c = o('<ul class="' + (n.spread ? "layui-show": "") + '"></ul>'),
+                            s = o(["<li " + (n.spread ? 'data-spread="' + n.spread + '"': "") + ">",
+                                function() {
+                                    return l ? '<i class="layui-icon layui-tree-spread">' + (n.spread ? t.arrow[1] : t.arrow[0]) + "</i>": ""
+                                } (),
+                                function() {
+                                    return r.check ? '<i class="layui-icon layui-tree-check">' + ("checkbox" === r.check ? t.checkbox[0] : "radio" === r.check ? t.radio[0] : "") + "</i>": ""
+                                } (),
+                                function() {
+                                    return '<a href="' + (n.href || "javascript:;") + '" ' + (r.target && n.href ? 'target="' + r.target + '"': "") + ">" + ('<i class="layui-icon layui-tree-' + (l ? "branch": "leaf") + '">' + (l ? n.spread ? t.branch[1] : t.branch[0] : t.leaf) + "</i>") + ("<cite>" + (n.name || "未命名") + "</cite></a>")
+                                } (), "</li>"].join(""));
+                        l && (s.append(c), i.tree(c, n.children)),
+                            e.append(s),
+                        "function" == typeof r.click && i.click(s, n),
+                            i.spread(s, n),
+                        r.drag && i.drag(s, n)
+                    })
+            },
+            r.prototype.click = function(e, o) {
+                var a = this,
+                    i = a.options;
+                e.children("a").on("click",
+                    function(e) {
+                        layui.stope(e),
+                            i.click(o)
+                    })
+            },
+            r.prototype.spread = function(e, o) {
+                var a = this,
+                    i = (a.options, e.children(".layui-tree-spread")),
+                    r = e.children("ul"),
+                    n = e.children("a"),
+                    l = function() {
+                        e.data("spread") ? (e.data("spread", null), r.removeClass("layui-show"), i.html(t.arrow[0]), n.find(".layui-icon").html(t.branch[0])) : (e.data("spread", !0), r.addClass("layui-show"), i.html(t.arrow[1]), n.find(".layui-icon").html(t.branch[1]))
+                    };
+                r[0] && (i.on("click", l), n.on("dblclick", l))
+            },
+            r.prototype.on = function(e) {
+                var a = this,
+                    r = a.options,
+                    t = "layui-tree-drag";
+                e.find("i").on("selectstart",
+                    function(e) {
+                        return ! 1
+                    }),
+                r.drag && o(document).on("mousemove",
+                    function(e) {
+                        var i = a.move;
+                        if (i.from) {
+                            var r = (i.to, o('<div class="layui-box ' + t + '"></div>'));
+                            e.preventDefault(),
+                            o("." + t)[0] || o("body").append(r);
+                            var n = o("." + t)[0] ? o("." + t) : r;
+                            n.addClass("layui-show").html(i.from.elem.children("a").html()),
+                                n.css({
+                                    left: e.pageX + 10,
+                                    top: e.pageY + 10
+                                })
+                        }
+                    }).on("mouseup",
+                    function() {
+                        var e = a.move;
+                        e.from && (e.from.elem.children("a").removeClass(i), e.to && e.to.elem.children("a").removeClass(i), a.move = {},
+                            o("." + t).remove())
+                    })
+            },
+            r.prototype.move = {},
+            r.prototype.drag = function(e, a) {
+                var r = this,
+                    t = (r.options, e.children("a")),
+                    n = function() {
+                        var t = o(this),
+                            n = r.move;
+                        n.from && (n.to = {
+                            item: a,
+                            elem: e
+                        },
+                            t.addClass(i))
+                    };
+                t.on("mousedown",
+                    function() {
+                        var o = r.move;
+                        o.from = {
+                            item: a,
+                            elem: e
+                        }
+                    }),
+                    t.on("mouseenter", n).on("mousemove", n).on("mouseleave",
+                        function() {
+                            var e = o(this),
+                                a = r.move;
+                            a.from && (delete a.to, e.removeClass(i))
+                        })
+            },
+            e("tree",
+                function(e) {
+                    var i = new r(e = e || {}),
+                        t = o(e.elem);
+                    return t[0] ? void i.init(t) : a.error("layui.tree 没有找到" + e.elem + "元素")
+                })
+    });
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/lay/modules/upload.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/lay/modules/upload.js
new file mode 100644
index 0000000..fcca944
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/lay/modules/upload.js
@@ -0,0 +1,2 @@
+/** layui-v2.3.0 MIT License By https://www.layui.com */
+ ;layui.define("layer",function(e){"use strict";var i=layui.$,t=layui.layer,n=layui.hint(),a=layui.device(),o={config:{},set:function(e){var t=this;return t.config=i.extend({},t.config,e),t},on:function(e,i){return layui.onevent.call(this,r,e,i)}},l=function(){var e=this;return{upload:function(i){e.upload.call(e,i)},config:e.config}},r="upload",u="layui-upload-file",c="layui-upload-form",f="layui-upload-iframe",s="layui-upload-choose",p=function(e){var t=this;t.config=i.extend({},t.config,o.config,e),t.render()};p.prototype.config={accept:"images",exts:"",auto:!0,bindAction:"",url:"",field:"file",method:"post",data:{},drag:!0,size:0,number:0,multiple:!1},p.prototype.render=function(e){var t=this,e=t.config;e.elem=i(e.elem),e.bindAction=i(e.bindAction),t.file(),t.events()},p.prototype.file=function(){var e=this,t=e.config,n=e.elemFile=i(['<input class="'+u+'" type="file" accept="'+t.acceptMime+'" name="'+t.field+'"',t.multiple?" multiple":"",">"].join("")),o=t.elem.next();(o.hasClass(u)||o.hasClass(c))&&o.remove(),a.ie&&a.ie<10&&t.elem.wrap('<div class="layui-upload-wrap"></div>'),e.isFile()?(e.elemFile=t.elem,t.field=t.elem[0].name):t.elem.after(n),a.ie&&a.ie<10&&e.initIE()},p.prototype.initIE=function(){var e=this,t=e.config,n=i('<iframe id="'+f+'" class="'+f+'" name="'+f+'" frameborder="0"></iframe>'),a=i(['<form target="'+f+'" class="'+c+'" method="'+t.method,'" key="set-mine" enctype="multipart/form-data" action="'+t.url+'">',"</form>"].join(""));i("#"+f)[0]||i("body").append(n),t.elem.next().hasClass(c)||(e.elemFile.wrap(a),t.elem.next("."+c).append(function(){var e=[];return layui.each(t.data,function(i,t){t="function"==typeof t?t():t,e.push('<input type="hidden" name="'+i+'" value="'+t+'">')}),e.join("")}()))},p.prototype.msg=function(e){return t.msg(e,{icon:2,shift:6})},p.prototype.isFile=function(){var e=this.config.elem[0];if(e)return"input"===e.tagName.toLocaleLowerCase()&&"file"===e.type},p.prototype.preview=function(e){var i=this;window.FileReader&&layui.each(i.chooseFiles,function(i,t){var n=new FileReader;n.readAsDataURL(t),n.onload=function(){e&&e(i,t,this.result)}})},p.prototype.upload=function(e,t){var n,o=this,l=o.config,r=o.elemFile[0],u=function(){var t=0,n=0,a=e||o.files||o.chooseFiles||r.files,u=function(){l.multiple&&t+n===o.fileLength&&"function"==typeof l.allDone&&l.allDone({total:o.fileLength,successful:t,aborted:n})};layui.each(a,function(e,a){var r=new FormData;r.append(l.field,a),layui.each(l.data,function(e,i){i="function"==typeof i?i():i,r.append(e,i)}),i.ajax({url:l.url,type:l.method,data:r,contentType:!1,processData:!1,dataType:"json", xhr:l.xhr(function(e){var percent=Math.floor((e.loaded / e.total)*100);l.progress(percent);}),headers:l.headers||{},success:function(i){t++,d(e,i),u()},error:function(){n++,o.msg("请求上传接口出现异常"),m(e),u()}})})},c=function(){var e=i("#"+f);o.elemFile.parent().submit(),clearInterval(p.timer),p.timer=setInterval(function(){var i,t=e.contents().find("body");try{i=t.text()}catch(n){o.msg("获取上传后的响应信息出现异常"),clearInterval(p.timer),m()}i&&(clearInterval(p.timer),t.html(""),d(0,i))},30)},d=function(e,i){if(o.elemFile.next("."+s).remove(),r.value="","object"!=typeof i)try{i=JSON.parse(i)}catch(t){return i={},o.msg("请对上传接口返回有效JSON")}"function"==typeof l.done&&l.done(i,e||0,function(e){o.upload(e)})},m=function(e){l.auto&&(r.value=""),"function"==typeof l.error&&l.error(e||0,function(e){o.upload(e)})},h=l.exts,v=function(){var i=[];return layui.each(e||o.chooseFiles,function(e,t){i.push(t.name)}),i}(),g={preview:function(e){o.preview(e)},upload:function(e,i){var t={};t[e]=i,o.upload(t)},pushFile:function(){return o.files=o.files||{},layui.each(o.chooseFiles,function(e,i){o.files[e]=i}),o.files},resetFile:function(e,i,t){var n=new File([i],t);o.files=o.files||{},o.files[e]=n}},y=function(){if("choose"!==t&&!l.auto||(l.choose&&l.choose(g),"choose"!==t))return l.before&&l.before(g),a.ie?a.ie>9?u():c():void u()};if(v=0===v.length?r.value.match(/[^\/\\]+\..+/g)||[]||"":v,0!==v.length){switch(l.accept){case"file":if(h&&!RegExp("\\w\\.("+h+")$","i").test(escape(v)))return o.msg("选择的文件中包含不支持的格式"),r.value="";break;case"video":if(!RegExp("\\w\\.("+(h||"avi|mp4|wma|rmvb|rm|flash|3gp|flv")+")$","i").test(escape(v)))return o.msg("选择的视频中包含不支持的格式"),r.value="";break;case"audio":if(!RegExp("\\w\\.("+(h||"mp3|wav|mid")+")$","i").test(escape(v)))return o.msg("选择的音频中包含不支持的格式"),r.value="";break;default:if(layui.each(v,function(e,i){RegExp("\\w\\.("+(h||"jpg|png|gif|bmp|jpeg$")+")","i").test(escape(i))||(n=!0)}),n)return o.msg("选择的图片中包含不支持的格式"),r.value=""}if(o.fileLength=function(){var i=0,t=e||o.files||o.chooseFiles||r.files;return layui.each(t,function(){i++}),i}(),l.number&&o.fileLength>l.number)return o.msg("同时最多只能上传的数量为："+l.number);if(l.size>0&&!(a.ie&&a.ie<10)){var F;if(layui.each(o.chooseFiles,function(e,i){if(i.size>1024*l.size){var t=l.size/1024;t=t>=1?t.toFixed(2)+"MB":l.size+"KB",r.value="",F=t}}),F)return o.msg("文件不能超过"+F)}y()}},p.prototype.events=function(){var e=this,t=e.config,o=function(i){e.chooseFiles={},layui.each(i,function(i,t){var n=(new Date).getTime();e.chooseFiles[n+"-"+i]=t})},l=function(i,n){var a=e.elemFile,o=i.length>1?i.length+"个文件":(i[0]||{}).name||a[0].value.match(/[^\/\\]+\..+/g)||[]||"";a.next().hasClass(s)&&a.next().remove(),e.upload(null,"choose"),e.isFile()||t.choose||a.after('<span class="layui-inline '+s+'">'+o+"</span>")};t.elem.off("upload.start").on("upload.start",function(){var a=i(this),o=a.attr("lay-data");if(o)try{o=new Function("return "+o)(),e.config=i.extend({},t,o)}catch(l){n.error("Upload element property lay-data configuration item has a syntax error: "+o)}e.config.item=a,e.elemFile[0].click()}),a.ie&&a.ie<10||t.elem.off("upload.over").on("upload.over",function(){var e=i(this);e.attr("lay-over","")}).off("upload.leave").on("upload.leave",function(){var e=i(this);e.removeAttr("lay-over")}).off("upload.drop").on("upload.drop",function(n,a){var r=i(this),u=a.originalEvent.dataTransfer.files||[];r.removeAttr("lay-over"),o(u),t.auto?e.upload(u):l(u)}),e.elemFile.off("upload.change").on("upload.change",function(){var i=this.files||[];o(i),t.auto?e.upload():l(i)}),t.bindAction.off("upload.action").on("upload.action",function(){e.upload()}),t.elem.data("haveEvents")||(e.elemFile.on("change",function(){i(this).trigger("upload.change")}),t.elem.on("click",function(){e.isFile()||i(this).trigger("upload.start")}),t.drag&&t.elem.on("dragover",function(e){e.preventDefault(),i(this).trigger("upload.over")}).on("dragleave",function(e){i(this).trigger("upload.leave")}).on("drop",function(e){e.preventDefault(),i(this).trigger("upload.drop",e)}),t.bindAction.on("click",function(){i(this).trigger("upload.action")}),t.elem.data("haveEvents",!0))},o.render=function(e){var i=new p(e);return l.call(i)},e(r,o)});
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/lay/modules/util.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/lay/modules/util.js
new file mode 100644
index 0000000..32bffa4
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/lay/modules/util.js
@@ -0,0 +1,2 @@
+/** layui-v2.3.0 MIT License By https://www.layui.com */
+ ;layui.define("jquery",function(e){"use strict";var t=layui.$,i={fixbar:function(e){var i,a,o="layui-fixbar",r="layui-fixbar-top",l=t(document),n=t("body");e=t.extend({showHeight:200},e),e.bar1=e.bar1===!0?"&#xe606;":e.bar1,e.bar2=e.bar2===!0?"&#xe607;":e.bar2,e.bgcolor=e.bgcolor?"background-color:"+e.bgcolor:"";var c=[e.bar1,e.bar2,"&#xe604;"],g=t(['<ul class="'+o+'">',e.bar1?'<li class="layui-icon" lay-type="bar1" style="'+e.bgcolor+'">'+c[0]+"</li>":"",e.bar2?'<li class="layui-icon" lay-type="bar2" style="'+e.bgcolor+'">'+c[1]+"</li>":"",'<li class="layui-icon '+r+'" lay-type="top" style="'+e.bgcolor+'">'+c[2]+"</li>","</ul>"].join("")),u=g.find("."+r),s=function(){var t=l.scrollTop();t>=e.showHeight?i||(u.show(),i=1):i&&(u.hide(),i=0)};t("."+o)[0]||("object"==typeof e.css&&g.css(e.css),n.append(g),s(),g.find("li").on("click",function(){var i=t(this),a=i.attr("lay-type");"top"===a&&t("html,body").animate({scrollTop:0},200),e.click&&e.click.call(this,a)}),l.on("scroll",function(){clearTimeout(a),a=setTimeout(function(){s()},100)}))},countdown:function(e,t,i){var a=this,o="function"==typeof t,r=new Date(e).getTime(),l=new Date(!t||o?(new Date).getTime():t).getTime(),n=r-l,c=[Math.floor(n/864e5),Math.floor(n/36e5)%24,Math.floor(n/6e4)%60,Math.floor(n/1e3)%60];o&&(i=t);var g=setTimeout(function(){a.countdown(e,l+1e3,i)},1e3);return i&&i(n>0?c:[0,0,0,0],t,g),n<=0&&clearTimeout(g),g},timeAgo:function(e,t){var i=this,a=[[],[]],o=(new Date).getTime()-new Date(e).getTime();return o>6912e5?(o=new Date(e),a[0][0]=i.digit(o.getFullYear(),4),a[0][1]=i.digit(o.getMonth()+1),a[0][2]=i.digit(o.getDate()),t||(a[1][0]=i.digit(o.getHours()),a[1][1]=i.digit(o.getMinutes()),a[1][2]=i.digit(o.getSeconds())),a[0].join("-")+" "+a[1].join(":")):o>=864e5?(o/1e3/60/60/24|0)+"天前":o>=36e5?(o/1e3/60/60|0)+"小时前":o>=12e4?(o/1e3/60|0)+"分钟前":o<0?"未来":"刚刚"},digit:function(e,t){var i="";e=String(e),t=t||2;for(var a=e.length;a<t;a++)i+="0";return e<Math.pow(10,t)?i+(0|e):e},toDateString:function(e,t){var i=this,a=new Date(e||new Date),o=[i.digit(a.getFullYear(),4),i.digit(a.getMonth()+1),i.digit(a.getDate())],r=[i.digit(a.getHours()),i.digit(a.getMinutes()),i.digit(a.getSeconds())];return t=t||"yyyy-MM-dd HH:mm:ss",t.replace(/yyyy/g,o[0]).replace(/MM/g,o[1]).replace(/dd/g,o[2]).replace(/HH/g,r[0]).replace(/mm/g,r[1]).replace(/ss/g,r[2])},escape:function(e){return String(e||"").replace(/&(?!#?[a-zA-Z0-9]+;)/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/'/g,"&#39;").replace(/"/g,"&quot;")}};e("util",i)});
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/layui.all.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/layui.all.js
new file mode 100644
index 0000000..cc0c635
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/layui.all.js
@@ -0,0 +1,5 @@
+/** layui-v2.3.0 MIT License By https://www.layui.com */
+ ;!function(e){"use strict";var t=document,n={modules:{},status:{},timeout:10,event:{}},o=function(){this.v="2.3.0"},r=function(){var e=t.currentScript?t.currentScript.src:function(){for(var e,n=t.scripts,o=n.length-1,r=o;r>0;r--)if("interactive"===n[r].readyState){e=n[r].src;break}return e||n[o].src}();return e.substring(0,e.lastIndexOf("/")+1)}(),a=function(t){e.console&&console.error&&console.error("Layui hint: "+t)},i="undefined"!=typeof opera&&"[object Opera]"===opera.toString(),u={layer:"modules/layer",laydate:"modules/laydate",laypage:"modules/laypage",laytpl:"modules/laytpl",layim:"modules/layim",layedit:"modules/layedit",form:"modules/form",upload:"modules/upload",tree:"modules/tree",table:"modules/table",element:"modules/element",rate:"modules/rate",carousel:"modules/carousel",flow:"modules/flow",util:"modules/util",code:"modules/code",jquery:"modules/jquery",mobile:"modules/mobile","layui.all":"../layui.all"};o.prototype.cache=n,o.prototype.define=function(e,t){var o=this,r="function"==typeof e,a=function(){var e=function(e,t){layui[e]=t,n.status[e]=!0};return"function"==typeof t&&t(function(o,r){e(o,r),n.callback[o]=function(){t(e)}}),this};return r&&(t=e,e=[]),layui["layui.all"]||!layui["layui.all"]&&layui["layui.mobile"]?a.call(o):(o.use(e,a),o)},o.prototype.use=function(e,o,l){function s(e,t){var o="PLaySTATION 3"===navigator.platform?/^complete$/:/^(complete|loaded)$/;("load"===e.type||o.test((e.currentTarget||e.srcElement).readyState))&&(n.modules[d]=t,f.removeChild(v),function r(){return++m>1e3*n.timeout/4?a(d+" is not a valid module"):void(n.status[d]?c():setTimeout(r,4))}())}function c(){l.push(layui[d]),e.length>1?y.use(e.slice(1),o,l):"function"==typeof o&&o.apply(layui,l)}var y=this,p=n.dir=n.dir?n.dir:r,f=t.getElementsByTagName("head")[0];e="string"==typeof e?[e]:e,window.jQuery&&jQuery.fn.on&&(y.each(e,function(t,n){"jquery"===n&&e.splice(t,1)}),layui.jquery=layui.$=jQuery);var d=e[0],m=0;if(l=l||[],n.host=n.host||(p.match(/\/\/([\s\S]+?)\//)||["//"+location.host+"/"])[0],0===e.length||layui["layui.all"]&&u[d]||!layui["layui.all"]&&layui["layui.mobile"]&&u[d])return c(),y;if(n.modules[d])!function g(){return++m>1e3*n.timeout/4?a(d+" is not a valid module"):void("string"==typeof n.modules[d]&&n.status[d]?c():setTimeout(g,4))}();else{var v=t.createElement("script"),h=(u[d]?p+"lay/":/^\{\/\}/.test(y.modules[d])?"":n.base||"")+(y.modules[d]||d)+".js";h=h.replace(/^\{\/\}/,""),v.async=!0,v.charset="utf-8",v.src=h+function(){var e=n.version===!0?n.v||(new Date).getTime():n.version||"";return e?"?v="+e:""}(),f.appendChild(v),!v.attachEvent||v.attachEvent.toString&&v.attachEvent.toString().indexOf("[native code")<0||i?v.addEventListener("load",function(e){s(e,h)},!1):v.attachEvent("onreadystatechange",function(e){s(e,h)}),n.modules[d]=h}return y},o.prototype.getStyle=function(t,n){var o=t.currentStyle?t.currentStyle:e.getComputedStyle(t,null);return o[o.getPropertyValue?"getPropertyValue":"getAttribute"](n)},o.prototype.link=function(e,o,r){var i=this,u=t.createElement("link"),l=t.getElementsByTagName("head")[0];"string"==typeof o&&(r=o);var s=(r||e).replace(/\.|\//g,""),c=u.id="layuicss-"+s,y=0;return u.rel="stylesheet",u.href=e+(n.debug?"?v="+(new Date).getTime():""),u.media="all",t.getElementById(c)||l.appendChild(u),"function"!=typeof o?i:(function p(){return++y>1e3*n.timeout/100?a(e+" timeout"):void(1989===parseInt(i.getStyle(t.getElementById(c),"width"))?function(){o()}():setTimeout(p,100))}(),i)},n.callback={},o.prototype.factory=function(e){if(layui[e])return"function"==typeof n.callback[e]?n.callback[e]:null},o.prototype.addcss=function(e,t,o){return layui.link(n.dir+"css/"+e,t,o)},o.prototype.img=function(e,t,n){var o=new Image;return o.src=e,o.complete?t(o):(o.onload=function(){o.onload=null,"function"==typeof t&&t(o)},void(o.onerror=function(e){o.onerror=null,"function"==typeof n&&n(e)}))},o.prototype.config=function(e){e=e||{};for(var t in e)n[t]=e[t];return this},o.prototype.modules=function(){var e={};for(var t in u)e[t]=u[t];return e}(),o.prototype.extend=function(e){var t=this;e=e||{};for(var n in e)t[n]||t.modules[n]?a("模块名 "+n+" 已被占用"):t.modules[n]=e[n];return t},o.prototype.router=function(e){var t=this,e=e||location.hash,n={path:[],search:{},hash:(e.match(/[^#](#.*$)/)||[])[1]||""};return/^#\//.test(e)?(e=e.replace(/^#\//,""),n.href="/"+e,e=e.replace(/([^#])(#.*$)/,"$1").split("/")||[],t.each(e,function(e,t){/^\w+=/.test(t)?function(){t=t.split("="),n.search[t[0]]=t[1]}():n.path.push(t)}),n):n},o.prototype.data=function(t,n,o){if(t=t||"layui",o=o||localStorage,e.JSON&&e.JSON.parse){if(null===n)return delete o[t];n="object"==typeof n?n:{key:n};try{var r=JSON.parse(o[t])}catch(a){var r={}}return"value"in n&&(r[n.key]=n.value),n.remove&&delete r[n.key],o[t]=JSON.stringify(r),n.key?r[n.key]:r}},o.prototype.sessionData=function(e,t){return this.data(e,t,sessionStorage)},o.prototype.device=function(t){var n=navigator.userAgent.toLowerCase(),o=function(e){var t=new RegExp(e+"/([^\\s\\_\\-]+)");return e=(n.match(t)||[])[1],e||!1},r={os:function(){return/windows/.test(n)?"windows":/linux/.test(n)?"linux":/iphone|ipod|ipad|ios/.test(n)?"ios":/mac/.test(n)?"mac":void 0}(),ie:function(){return!!(e.ActiveXObject||"ActiveXObject"in e)&&((n.match(/msie\s(\d+)/)||[])[1]||"11")}(),weixin:o("micromessenger")};return t&&!r[t]&&(r[t]=o(t)),r.android=/android/.test(n),r.ios="ios"===r.os,r},o.prototype.hint=function(){return{error:a}},o.prototype.each=function(e,t){var n,o=this;if("function"!=typeof t)return o;if(e=e||[],e.constructor===Object){for(n in e)if(t.call(e[n],n,e[n]))break}else for(n=0;n<e.length&&!t.call(e[n],n,e[n]);n++);return o},o.prototype.sort=function(e,t,n){var o=JSON.parse(JSON.stringify(e||[]));return t?(o.sort(function(e,n){var o=/^-?\d+$/,r=e[t],a=n[t];return o.test(r)&&(r=parseFloat(r)),o.test(a)&&(a=parseFloat(a)),r&&!a?1:!r&&a?-1:r>a?1:r<a?-1:0}),n&&o.reverse(),o):o},o.prototype.stope=function(t){t=t||e.event;try{t.stopPropagation()}catch(n){t.cancelBubble=!0}},o.prototype.onevent=function(e,t,n){return"string"!=typeof e||"function"!=typeof n?this:o.event(e,t,null,n)},o.prototype.event=o.event=function(e,t,o,r){var a=this,i=null,u=t.match(/\((.*)\)$/)||[],l=(e+"."+t).replace(u[0],""),s=u[1]||"",c=function(e,t){var n=t&&t.call(a,o);n===!1&&null===i&&(i=!1)};return r?(n.event[l]=n.event[l]||{},n.event[l][s]=[r],this):(layui.each(n.event[l],function(e,t){return"{*}"===s?void layui.each(t,c):(""===e&&layui.each(t,c),void(e===s&&layui.each(t,c)))}),i)},e.layui=new o}(window);layui.define(function(a){var i=layui.cache;layui.config({dir:i.dir.replace(/lay\/dest\/$/,"")}),a("layui.all",layui.v)});layui.define(function(e){"use strict";var r={open:"{{",close:"}}"},c={exp:function(e){return new RegExp(e,"g")},query:function(e,c,t){var o=["#([\\s\\S])+?","([^{#}])*?"][e||0];return n((c||"")+r.open+o+r.close+(t||""))},escape:function(e){return String(e||"").replace(/&(?!#?[a-zA-Z0-9]+;)/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/'/g,"&#39;").replace(/"/g,"&quot;")},error:function(e,r){var c="Laytpl Error：";return"object"==typeof console&&console.error(c+e+"\n"+(r||"")),c+e}},n=c.exp,t=function(e){this.tpl=e};t.pt=t.prototype,window.errors=0,t.pt.parse=function(e,t){var o=this,p=e,a=n("^"+r.open+"#",""),l=n(r.close+"$","");e=e.replace(/\s+|\r|\t|\n/g," ").replace(n(r.open+"#"),r.open+"# ").replace(n(r.close+"}"),"} "+r.close).replace(/\\/g,"\\\\").replace(n(r.open+"!(.+?)!"+r.close),function(e){return e=e.replace(n("^"+r.open+"!"),"").replace(n("!"+r.close),"").replace(n(r.open+"|"+r.close),function(e){return e.replace(/(.)/g,"\\$1")})}).replace(/(?="|')/g,"\\").replace(c.query(),function(e){return e=e.replace(a,"").replace(l,""),'";'+e.replace(/\\/g,"")+';view+="'}).replace(c.query(1),function(e){var c='"+(';return e.replace(/\s/g,"")===r.open+r.close?"":(e=e.replace(n(r.open+"|"+r.close),""),/^=/.test(e)&&(e=e.replace(/^=/,""),c='"+_escape_('),c+e.replace(/\\/g,"")+')+"')}),e='"use strict";var view = "'+e+'";return view;';try{return o.cache=e=new Function("d, _escape_",e),e(t,c.escape)}catch(u){return delete o.cache,c.error(u,p)}},t.pt.render=function(e,r){var n,t=this;return e?(n=t.cache?t.cache(e,c.escape):t.parse(t.tpl,e),r?void r(n):n):c.error("no data")};var o=function(e){return"string"!=typeof e?c.error("Template not found"):new t(e)};o.config=function(e){e=e||{};for(var c in e)r[c]=e[c]},o.v="1.2.0",e("laytpl",o)});layui.define(function(e){"use strict";var a=document,t="getElementById",n="getElementsByTagName",i="laypage",r="layui-disabled",u=function(e){var a=this;a.config=e||{},a.config.index=++s.index,a.render(!0)};u.prototype.type=function(){var e=this.config;if("object"==typeof e.elem)return void 0===e.elem.length?2:3},u.prototype.view=function(){var e=this,a=e.config,t=a.groups="groups"in a?0|a.groups:5;a.layout="object"==typeof a.layout?a.layout:["prev","page","next"],a.count=0|a.count,a.curr=0|a.curr||1,a.limits="object"==typeof a.limits?a.limits:[10,20,30,40,50],a.limit=0|a.limit||10,a.pages=Math.ceil(a.count/a.limit)||1,a.curr>a.pages&&(a.curr=a.pages),t<0?t=1:t>a.pages&&(t=a.pages),a.prev="prev"in a?a.prev:"&#x4E0A;&#x4E00;&#x9875;",a.next="next"in a?a.next:"&#x4E0B;&#x4E00;&#x9875;";var n=a.pages>t?Math.ceil((a.curr+(t>1?1:0))/(t>0?t:1)):1,i={prev:function(){return a.prev?'<a href="javascript:;" class="layui-laypage-prev'+(1==a.curr?" "+r:"")+'" data-page="'+(a.curr-1)+'">'+a.prev+"</a>":""}(),page:function(){var e=[];if(a.count<1)return"";n>1&&a.first!==!1&&0!==t&&e.push('<a href="javascript:;" class="layui-laypage-first" data-page="1"  title="&#x9996;&#x9875;">'+(a.first||1)+"</a>");var i=Math.floor((t-1)/2),r=n>1?a.curr-i:1,u=n>1?function(){var e=a.curr+(t-i-1);return e>a.pages?a.pages:e}():t;for(u-r<t-1&&(r=u-t+1),a.first!==!1&&r>2&&e.push('<span class="layui-laypage-spr">&#x2026;</span>');r<=u;r++)r===a.curr?e.push('<span class="layui-laypage-curr"><em class="layui-laypage-em" '+(/^#/.test(a.theme)?'style="background-color:'+a.theme+';"':"")+"></em><em>"+r+"</em></span>"):e.push('<a href="javascript:;" data-page="'+r+'">'+r+"</a>");return a.pages>t&&a.pages>u&&a.last!==!1&&(u+1<a.pages&&e.push('<span class="layui-laypage-spr">&#x2026;</span>'),0!==t&&e.push('<a href="javascript:;" class="layui-laypage-last" title="&#x5C3E;&#x9875;"  data-page="'+a.pages+'">'+(a.last||a.pages)+"</a>")),e.join("")}(),next:function(){return a.next?'<a href="javascript:;" class="layui-laypage-next'+(a.curr==a.pages?" "+r:"")+'" data-page="'+(a.curr+1)+'">'+a.next+"</a>":""}(),count:'<span class="layui-laypage-count">共 '+a.count+" 条</span>",limit:function(){var e=['<span class="layui-laypage-limits"><select lay-ignore>'];return layui.each(a.limits,function(t,n){e.push('<option value="'+n+'"'+(n===a.limit?"selected":"")+">"+n+" 条/页</option>")}),e.join("")+"</select></span>"}(),refresh:['<a href="javascript:;" data-page="'+a.curr+'" class="layui-laypage-refresh">','<i class="layui-icon layui-icon-refresh"></i>',"</a>"].join(""),skip:function(){return['<span class="layui-laypage-skip">&#x5230;&#x7B2C;','<input type="text" min="1" value="'+a.curr+'" class="layui-input">','&#x9875;<button type="button" class="layui-laypage-btn">&#x786e;&#x5b9a;</button>',"</span>"].join("")}()};return['<div class="layui-box layui-laypage layui-laypage-'+(a.theme?/^#/.test(a.theme)?"molv":a.theme:"default")+'" id="layui-laypage-'+a.index+'">',function(){var e=[];return layui.each(a.layout,function(a,t){i[t]&&e.push(i[t])}),e.join("")}(),"</div>"].join("")},u.prototype.jump=function(e,a){if(e){var t=this,i=t.config,r=e.children,u=e[n]("button")[0],l=e[n]("input")[0],p=e[n]("select")[0],c=function(){var e=0|l.value.replace(/\s|\D/g,"");e&&(i.curr=e,t.render())};if(a)return c();for(var o=0,y=r.length;o<y;o++)"a"===r[o].nodeName.toLowerCase()&&s.on(r[o],"click",function(){var e=0|this.getAttribute("data-page");e<1||e>i.pages||(i.curr=e,t.render())});p&&s.on(p,"change",function(){var e=this.value;i.curr*e>i.count&&(i.curr=Math.ceil(i.count/e)),i.limit=e,t.render()}),u&&s.on(u,"click",function(){c()})}},u.prototype.skip=function(e){if(e){var a=this,t=e[n]("input")[0];t&&s.on(t,"keyup",function(t){var n=this.value,i=t.keyCode;/^(37|38|39|40)$/.test(i)||(/\D/.test(n)&&(this.value=n.replace(/\D/,"")),13===i&&a.jump(e,!0))})}},u.prototype.render=function(e){var n=this,i=n.config,r=n.type(),u=n.view();2===r?i.elem&&(i.elem.innerHTML=u):3===r?i.elem.html(u):a[t](i.elem)&&(a[t](i.elem).innerHTML=u),i.jump&&i.jump(i,e);var s=a[t]("layui-laypage-"+i.index);n.jump(s),i.hash&&!e&&(location.hash="!"+i.hash+"="+i.curr),n.skip(s)};var s={render:function(e){var a=new u(e);return a.index},index:layui.laypage?layui.laypage.index+1e4:0,on:function(e,a,t){return e.attachEvent?e.attachEvent("on"+a,function(a){a.target=a.srcElement,t.call(e,a)}):e.addEventListener(a,t,!1),this}};e(i,s)});!function(){"use strict";var e=window.layui&&layui.define,t={getPath:function(){var e=document.currentScript?document.currentScript.src:function(){for(var e,t=document.scripts,n=t.length-1,a=n;a>0;a--)if("interactive"===t[a].readyState){e=t[a].src;break}return e||t[n].src}();return e.substring(0,e.lastIndexOf("/")+1)}(),getStyle:function(e,t){var n=e.currentStyle?e.currentStyle:window.getComputedStyle(e,null);return n[n.getPropertyValue?"getPropertyValue":"getAttribute"](t)},link:function(e,a,i){if(n.path){var r=document.getElementsByTagName("head")[0],o=document.createElement("link");"string"==typeof a&&(i=a);var s=(i||e).replace(/\.|\//g,""),l="layuicss-"+s,d=0;o.rel="stylesheet",o.href=n.path+e,o.id=l,document.getElementById(l)||r.appendChild(o),"function"==typeof a&&!function c(){return++d>80?window.console&&console.error("laydate.css: Invalid"):void(1989===parseInt(t.getStyle(document.getElementById(l),"width"))?a():setTimeout(c,100))}()}}},n={v:"5.0.9",config:{},index:window.laydate&&window.laydate.v?1e5:0,path:t.getPath,set:function(e){var t=this;return t.config=w.extend({},t.config,e),t},ready:function(a){var i="laydate",r="",o=(e?"modules/laydate/":"theme/")+"default/laydate.css?v="+n.v+r;return e?layui.addcss(o,a,i):t.link(o,a,i),this}},a=function(){var e=this;return{hint:function(t){e.hint.call(e,t)},config:e.config}},i="laydate",r=".layui-laydate",o="layui-this",s="laydate-disabled",l="开始日期超出了结束日期<br>建议重新选择",d=[100,2e5],c="layui-laydate-static",m="layui-laydate-list",u="laydate-selected",h="layui-laydate-hint",y="laydate-day-prev",f="laydate-day-next",p="layui-laydate-footer",g=".laydate-btns-confirm",v="laydate-time-text",D=".laydate-btns-time",T=function(e){var t=this;t.index=++n.index,t.config=w.extend({},t.config,n.config,e),n.ready(function(){t.init()})},w=function(e){return new C(e)},C=function(e){for(var t=0,n="object"==typeof e?[e]:(this.selector=e,document.querySelectorAll(e||null));t<n.length;t++)this.push(n[t])};C.prototype=[],C.prototype.constructor=C,w.extend=function(){var e=1,t=arguments,n=function(e,t){e=e||(t.constructor===Array?[]:{});for(var a in t)e[a]=t[a]&&t[a].constructor===Object?n(e[a],t[a]):t[a];return e};for(t[0]="object"==typeof t[0]?t[0]:{};e<t.length;e++)"object"==typeof t[e]&&n(t[0],t[e]);return t[0]},w.ie=function(){var e=navigator.userAgent.toLowerCase();return!!(window.ActiveXObject||"ActiveXObject"in window)&&((e.match(/msie\s(\d+)/)||[])[1]||"11")}(),w.stope=function(e){e=e||window.event,e.stopPropagation?e.stopPropagation():e.cancelBubble=!0},w.each=function(e,t){var n,a=this;if("function"!=typeof t)return a;if(e=e||[],e.constructor===Object){for(n in e)if(t.call(e[n],n,e[n]))break}else for(n=0;n<e.length&&!t.call(e[n],n,e[n]);n++);return a},w.digit=function(e,t,n){var a="";e=String(e),t=t||2;for(var i=e.length;i<t;i++)a+="0";return e<Math.pow(10,t)?a+(0|e):e},w.elem=function(e,t){var n=document.createElement(e);return w.each(t||{},function(e,t){n.setAttribute(e,t)}),n},C.addStr=function(e,t){return e=e.replace(/\s+/," "),t=t.replace(/\s+/," ").split(" "),w.each(t,function(t,n){new RegExp("\\b"+n+"\\b").test(e)||(e=e+" "+n)}),e.replace(/^\s|\s$/,"")},C.removeStr=function(e,t){return e=e.replace(/\s+/," "),t=t.replace(/\s+/," ").split(" "),w.each(t,function(t,n){var a=new RegExp("\\b"+n+"\\b");a.test(e)&&(e=e.replace(a,""))}),e.replace(/\s+/," ").replace(/^\s|\s$/,"")},C.prototype.find=function(e){var t=this,n=0,a=[],i="object"==typeof e;return this.each(function(r,o){for(var s=i?[e]:o.querySelectorAll(e||null);n<s.length;n++)a.push(s[n]);t.shift()}),i||(t.selector=(t.selector?t.selector+" ":"")+e),w.each(a,function(e,n){t.push(n)}),t},C.prototype.each=function(e){return w.each.call(this,this,e)},C.prototype.addClass=function(e,t){return this.each(function(n,a){a.className=C[t?"removeStr":"addStr"](a.className,e)})},C.prototype.removeClass=function(e){return this.addClass(e,!0)},C.prototype.hasClass=function(e){var t=!1;return this.each(function(n,a){new RegExp("\\b"+e+"\\b").test(a.className)&&(t=!0)}),t},C.prototype.attr=function(e,t){var n=this;return void 0===t?function(){if(n.length>0)return n[0].getAttribute(e)}():n.each(function(n,a){a.setAttribute(e,t)})},C.prototype.removeAttr=function(e){return this.each(function(t,n){n.removeAttribute(e)})},C.prototype.html=function(e){return this.each(function(t,n){n.innerHTML=e})},C.prototype.val=function(e){return this.each(function(t,n){n.value=e})},C.prototype.append=function(e){return this.each(function(t,n){"object"==typeof e?n.appendChild(e):n.innerHTML=n.innerHTML+e})},C.prototype.remove=function(e){return this.each(function(t,n){e?n.removeChild(e):n.parentNode.removeChild(n)})},C.prototype.on=function(e,t){return this.each(function(n,a){a.attachEvent?a.attachEvent("on"+e,function(e){e.target=e.srcElement,t.call(a,e)}):a.addEventListener(e,t,!1)})},C.prototype.off=function(e,t){return this.each(function(n,a){a.detachEvent?a.detachEvent("on"+e,t):a.removeEventListener(e,t,!1)})},T.isLeapYear=function(e){return e%4===0&&e%100!==0||e%400===0},T.prototype.config={type:"date",range:!1,format:"yyyy-MM-dd",value:null,isInitValue:!0,min:"1900-1-1",max:"2099-12-31",trigger:"focus",show:!1,showBottom:!0,btns:["clear","now","confirm"],lang:"cn",theme:"default",position:null,calendar:!1,mark:{},zIndex:null,done:null,change:null},T.prototype.lang=function(){var e=this,t=e.config,n={cn:{weeks:["日","一","二","三","四","五","六"],time:["时","分","秒"],timeTips:"选择时间",startTime:"开始时间",endTime:"结束时间",dateTips:"返回日期",month:["一","二","三","四","五","六","七","八","九","十","十一","十二"],tools:{confirm:"确定",clear:"清空",now:"现在"}},en:{weeks:["Su","Mo","Tu","We","Th","Fr","Sa"],time:["Hours","Minutes","Seconds"],timeTips:"Select Time",startTime:"Start Time",endTime:"End Time",dateTips:"Select Date",month:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],tools:{confirm:"Confirm",clear:"Clear",now:"Now"}}};return n[t.lang]||n.cn},T.prototype.init=function(){var e=this,t=e.config,n="yyyy|y|MM|M|dd|d|HH|H|mm|m|ss|s",a="static"===t.position,i={year:"yyyy",month:"yyyy-MM",date:"yyyy-MM-dd",time:"HH:mm:ss",datetime:"yyyy-MM-dd HH:mm:ss"};t.elem=w(t.elem),t.eventElem=w(t.eventElem),t.elem[0]&&(t.range===!0&&(t.range="-"),t.format===i.date&&(t.format=i[t.type]),e.format=t.format.match(new RegExp(n+"|.","g"))||[],e.EXP_IF="",e.EXP_SPLIT="",w.each(e.format,function(t,a){var i=new RegExp(n).test(a)?"\\d{"+function(){return new RegExp(n).test(e.format[0===t?t+1:t-1]||"")?/^yyyy|y$/.test(a)?4:a.length:/^yyyy$/.test(a)?"1,4":/^y$/.test(a)?"1,308":"1,2"}()+"}":"\\"+a;e.EXP_IF=e.EXP_IF+i,e.EXP_SPLIT=e.EXP_SPLIT+"("+i+")"}),e.EXP_IF=new RegExp("^"+(t.range?e.EXP_IF+"\\s\\"+t.range+"\\s"+e.EXP_IF:e.EXP_IF)+"$"),e.EXP_SPLIT=new RegExp("^"+e.EXP_SPLIT+"$",""),e.isInput(t.elem[0])||"focus"===t.trigger&&(t.trigger="click"),t.elem.attr("lay-key")||(t.elem.attr("lay-key",e.index),t.eventElem.attr("lay-key",e.index)),t.mark=w.extend({},t.calendar&&"cn"===t.lang?{"0-1-1":"元旦","0-2-14":"情人","0-3-8":"妇女","0-3-12":"植树","0-4-1":"愚人","0-5-1":"劳动","0-5-4":"青年","0-6-1":"儿童","0-9-10":"教师","0-9-18":"国耻","0-10-1":"国庆","0-12-25":"圣诞"}:{},t.mark),w.each(["min","max"],function(e,n){var a=[],i=[];if("number"==typeof t[n]){var r=t[n],o=(new Date).getTime(),s=864e5,l=new Date(r?r<s?o+r*s:r:o);a=[l.getFullYear(),l.getMonth()+1,l.getDate()],r<s||(i=[l.getHours(),l.getMinutes(),l.getSeconds()])}else a=(t[n].match(/\d+-\d+-\d+/)||[""])[0].split("-"),i=(t[n].match(/\d+:\d+:\d+/)||[""])[0].split(":");t[n]={year:0|a[0]||(new Date).getFullYear(),month:a[1]?(0|a[1])-1:(new Date).getMonth(),date:0|a[2]||(new Date).getDate(),hours:0|i[0],minutes:0|i[1],seconds:0|i[2]}}),e.elemID="layui-laydate"+t.elem.attr("lay-key"),(t.show||a)&&e.render(),a||e.events(),t.value&&t.isInitValue&&(t.value.constructor===Date?e.setValue(e.parse(0,e.systemDate(t.value))):e.setValue(t.value)))},T.prototype.render=function(){var e=this,t=e.config,n=e.lang(),a="static"===t.position,i=e.elem=w.elem("div",{id:e.elemID,"class":["layui-laydate",t.range?" layui-laydate-range":"",a?" "+c:"",t.theme&&"default"!==t.theme&&!/^#/.test(t.theme)?" laydate-theme-"+t.theme:""].join("")}),r=e.elemMain=[],o=e.elemHeader=[],s=e.elemCont=[],l=e.table=[],d=e.footer=w.elem("div",{"class":p});if(t.zIndex&&(i.style.zIndex=t.zIndex),w.each(new Array(2),function(e){if(!t.range&&e>0)return!0;var a=w.elem("div",{"class":"layui-laydate-header"}),i=[function(){var e=w.elem("i",{"class":"layui-icon laydate-icon laydate-prev-y"});return e.innerHTML="&#xe65a;",e}(),function(){var e=w.elem("i",{"class":"layui-icon laydate-icon laydate-prev-m"});return e.innerHTML="&#xe603;",e}(),function(){var e=w.elem("div",{"class":"laydate-set-ym"}),t=w.elem("span"),n=w.elem("span");return e.appendChild(t),e.appendChild(n),e}(),function(){var e=w.elem("i",{"class":"layui-icon laydate-icon laydate-next-m"});return e.innerHTML="&#xe602;",e}(),function(){var e=w.elem("i",{"class":"layui-icon laydate-icon laydate-next-y"});return e.innerHTML="&#xe65b;",e}()],d=w.elem("div",{"class":"layui-laydate-content"}),c=w.elem("table"),m=w.elem("thead"),u=w.elem("tr");w.each(i,function(e,t){a.appendChild(t)}),m.appendChild(u),w.each(new Array(6),function(e){var t=c.insertRow(0);w.each(new Array(7),function(a){if(0===e){var i=w.elem("th");i.innerHTML=n.weeks[a],u.appendChild(i)}t.insertCell(a)})}),c.insertBefore(m,c.children[0]),d.appendChild(c),r[e]=w.elem("div",{"class":"layui-laydate-main laydate-main-list-"+e}),r[e].appendChild(a),r[e].appendChild(d),o.push(i),s.push(d),l.push(c)}),w(d).html(function(){var e=[],i=[];return"datetime"===t.type&&e.push('<span lay-type="datetime" class="laydate-btns-time">'+n.timeTips+"</span>"),w.each(t.btns,function(e,r){var o=n.tools[r]||"btn";t.range&&"now"===r||(a&&"clear"===r&&(o="cn"===t.lang?"重置":"Reset"),i.push('<span lay-type="'+r+'" class="laydate-btns-'+r+'">'+o+"</span>"))}),e.push('<div class="laydate-footer-btns">'+i.join("")+"</div>"),e.join("")}()),w.each(r,function(e,t){i.appendChild(t)}),t.showBottom&&i.appendChild(d),/^#/.test(t.theme)){var m=w.elem("style"),u=["#{{id}} .layui-laydate-header{background-color:{{theme}};}","#{{id}} .layui-this{background-color:{{theme}} !important;}"].join("").replace(/{{id}}/g,e.elemID).replace(/{{theme}}/g,t.theme);"styleSheet"in m?(m.setAttribute("type","text/css"),m.styleSheet.cssText=u):m.innerHTML=u,w(i).addClass("laydate-theme-molv"),i.appendChild(m)}e.remove(T.thisElemDate),a?t.elem.append(i):(document.body.appendChild(i),e.position()),e.checkDate().calendar(),e.changeEvent(),T.thisElemDate=e.elemID,"function"==typeof t.ready&&t.ready(w.extend({},t.dateTime,{month:t.dateTime.month+1}))},T.prototype.remove=function(e){var t=this,n=(t.config,w("#"+(e||t.elemID)));return n.hasClass(c)||t.checkDate(function(){n.remove()}),t},T.prototype.position=function(){var e=this,t=e.config,n=e.bindElem||t.elem[0],a=n.getBoundingClientRect(),i=e.elem.offsetWidth,r=e.elem.offsetHeight,o=function(e){return e=e?"scrollLeft":"scrollTop",document.body[e]|document.documentElement[e]},s=function(e){return document.documentElement[e?"clientWidth":"clientHeight"]},l=5,d=a.left,c=a.bottom;d+i+l>s("width")&&(d=s("width")-i-l),c+r+l>s()&&(c=a.top>r?a.top-r:s()-r,c-=2*l),t.position&&(e.elem.style.position=t.position),e.elem.style.left=d+("fixed"===t.position?0:o(1))+"px",e.elem.style.top=c+("fixed"===t.position?0:o())+"px"},T.prototype.hint=function(e){var t=this,n=(t.config,w.elem("div",{"class":h}));n.innerHTML=e||"",w(t.elem).find("."+h).remove(),t.elem.appendChild(n),clearTimeout(t.hinTimer),t.hinTimer=setTimeout(function(){w(t.elem).find("."+h).remove()},3e3)},T.prototype.getAsYM=function(e,t,n){return n?t--:t++,t<0&&(t=11,e--),t>11&&(t=0,e++),[e,t]},T.prototype.systemDate=function(e){var t=e||new Date;return{year:t.getFullYear(),month:t.getMonth(),date:t.getDate(),hours:e?e.getHours():0,minutes:e?e.getMinutes():0,seconds:e?e.getSeconds():0}},T.prototype.checkDate=function(e){var t,a,i=this,r=(new Date,i.config),o=r.dateTime=r.dateTime||i.systemDate(),s=i.bindElem||r.elem[0],l=(i.isInput(s)?"val":"html",i.isInput(s)?s.value:"static"===r.position?"":s.innerHTML),c=function(e){e.year>d[1]&&(e.year=d[1],a=!0),e.month>11&&(e.month=11,a=!0),e.hours>23&&(e.hours=0,a=!0),e.minutes>59&&(e.minutes=0,e.hours++,a=!0),e.seconds>59&&(e.seconds=0,e.minutes++,a=!0),t=n.getEndDate(e.month+1,e.year),e.date>t&&(e.date=t,a=!0)},m=function(e,t,n){var o=["startTime","endTime"];t=(t.match(i.EXP_SPLIT)||[]).slice(1),n=n||0,r.range&&(i[o[n]]=i[o[n]]||{}),w.each(i.format,function(s,l){var c=parseFloat(t[s]);t[s].length<l.length&&(a=!0),/yyyy|y/.test(l)?(c<d[0]&&(c=d[0],a=!0),e.year=c):/MM|M/.test(l)?(c<1&&(c=1,a=!0),e.month=c-1):/dd|d/.test(l)?(c<1&&(c=1,a=!0),e.date=c):/HH|H/.test(l)?(c<1&&(c=0,a=!0),e.hours=c,r.range&&(i[o[n]].hours=c)):/mm|m/.test(l)?(c<1&&(c=0,a=!0),e.minutes=c,r.range&&(i[o[n]].minutes=c)):/ss|s/.test(l)&&(c<1&&(c=0,a=!0),e.seconds=c,r.range&&(i[o[n]].seconds=c))}),c(e)};return"limit"===e?(c(o),i):(l=l||r.value,"string"==typeof l&&(l=l.replace(/\s+/g," ").replace(/^\s|\s$/g,"")),i.startState&&!i.endState&&(delete i.startState,i.endState=!0),"string"==typeof l&&l?i.EXP_IF.test(l)?r.range?(l=l.split(" "+r.range+" "),i.startDate=i.startDate||i.systemDate(),i.endDate=i.endDate||i.systemDate(),r.dateTime=w.extend({},i.startDate),w.each([i.startDate,i.endDate],function(e,t){m(t,l[e],e)})):m(o,l):(i.hint("日期格式不合法<br>必须遵循下述格式：<br>"+(r.range?r.format+" "+r.range+" "+r.format:r.format)+"<br>已为你重置"),a=!0):l&&l.constructor===Date?r.dateTime=i.systemDate(l):(r.dateTime=i.systemDate(),delete i.startState,delete i.endState,delete i.startDate,delete i.endDate,delete i.startTime,delete i.endTime),c(o),a&&l&&i.setValue(r.range?i.endDate?i.parse():"":i.parse()),e&&e(),i)},T.prototype.mark=function(e,t){var n,a=this,i=a.config;return w.each(i.mark,function(e,a){var i=e.split("-");i[0]!=t[0]&&0!=i[0]||i[1]!=t[1]&&0!=i[1]||i[2]!=t[2]||(n=a||t[2])}),n&&e.html('<span class="laydate-day-mark">'+n+"</span>"),a},T.prototype.limit=function(e,t,n,a){var i,r=this,o=r.config,l={},d=o[n>41?"endDate":"dateTime"],c=w.extend({},d,t||{});return w.each({now:c,min:o.min,max:o.max},function(e,t){l[e]=r.newDate(w.extend({year:t.year,month:t.month,date:t.date},function(){var e={};return w.each(a,function(n,a){e[a]=t[a]}),e}())).getTime()}),i=l.now<l.min||l.now>l.max,e&&e[i?"addClass":"removeClass"](s),i},T.prototype.calendar=function(e){var t,a,i,r=this,s=r.config,l=e||s.dateTime,c=new Date,m=r.lang(),u="date"!==s.type&&"datetime"!==s.type,h=e?1:0,y=w(r.table[h]).find("td"),f=w(r.elemHeader[h][2]).find("span");if(l.year<d[0]&&(l.year=d[0],r.hint("最低只能支持到公元"+d[0]+"年")),l.year>d[1]&&(l.year=d[1],r.hint("最高只能支持到公元"+d[1]+"年")),r.firstDate||(r.firstDate=w.extend({},l)),c.setFullYear(l.year,l.month,1),t=c.getDay(),a=n.getEndDate(l.month||12,l.year),i=n.getEndDate(l.month+1,l.year),w.each(y,function(e,n){var d=[l.year,l.month],c=0;n=w(n),n.removeAttr("class"),e<t?(c=a-t+e,n.addClass("laydate-day-prev"),d=r.getAsYM(l.year,l.month,"sub")):e>=t&&e<i+t?(c=e-t,s.range||c+1===l.date&&n.addClass(o)):(c=e-i-t,n.addClass("laydate-day-next"),d=r.getAsYM(l.year,l.month)),d[1]++,d[2]=c+1,n.attr("lay-ymd",d.join("-")).html(d[2]),r.mark(n,d).limit(n,{year:d[0],month:d[1]-1,date:d[2]},e)}),w(f[0]).attr("lay-ym",l.year+"-"+(l.month+1)),w(f[1]).attr("lay-ym",l.year+"-"+(l.month+1)),"cn"===s.lang?(w(f[0]).attr("lay-type","year").html(l.year+"年"),w(f[1]).attr("lay-type","month").html(l.month+1+"月")):(w(f[0]).attr("lay-type","month").html(m.month[l.month]),w(f[1]).attr("lay-type","year").html(l.year)),u&&(s.range&&(e?r.endDate=r.endDate||{year:l.year+("year"===s.type?1:0),month:l.month+("month"===s.type?0:-1)}:r.startDate=r.startDate||{year:l.year,month:l.month},e&&(r.listYM=[[r.startDate.year,r.startDate.month+1],[r.endDate.year,r.endDate.month+1]],r.list(s.type,0).list(s.type,1),"time"===s.type?r.setBtnStatus("时间",w.extend({},r.systemDate(),r.startTime),w.extend({},r.systemDate(),r.endTime)):r.setBtnStatus(!0))),s.range||(r.listYM=[[l.year,l.month+1]],r.list(s.type,0))),s.range&&!e){var p=r.getAsYM(l.year,l.month);r.calendar(w.extend({},l,{year:p[0],month:p[1]}))}return s.range||r.limit(w(r.footer).find(g),null,0,["hours","minutes","seconds"]),s.range&&e&&!u&&r.stampRange(),r},T.prototype.list=function(e,t){var n=this,a=n.config,i=a.dateTime,r=n.lang(),l=a.range&&"date"!==a.type&&"datetime"!==a.type,d=w.elem("ul",{"class":m+" "+{year:"laydate-year-list",month:"laydate-month-list",time:"laydate-time-list"}[e]}),c=n.elemHeader[t],u=w(c[2]).find("span"),h=n.elemCont[t||0],y=w(h).find("."+m)[0],f="cn"===a.lang,p=f?"年":"",T=n.listYM[t]||{},C=["hours","minutes","seconds"],x=["startTime","endTime"][t];if(T[0]<1&&(T[0]=1),"year"===e){var M,b=M=T[0]-7;b<1&&(b=M=1),w.each(new Array(15),function(e){var i=w.elem("li",{"lay-ym":M}),r={year:M};M==T[0]&&w(i).addClass(o),i.innerHTML=M+p,d.appendChild(i),M<n.firstDate.year?(r.month=a.min.month,r.date=a.min.date):M>=n.firstDate.year&&(r.month=a.max.month,r.date=a.max.date),n.limit(w(i),r,t),M++}),w(u[f?0:1]).attr("lay-ym",M-8+"-"+T[1]).html(b+p+" - "+(M-1+p))}else if("month"===e)w.each(new Array(12),function(e){var i=w.elem("li",{"lay-ym":e}),s={year:T[0],month:e};e+1==T[1]&&w(i).addClass(o),i.innerHTML=r.month[e]+(f?"月":""),d.appendChild(i),T[0]<n.firstDate.year?s.date=a.min.date:T[0]>=n.firstDate.year&&(s.date=a.max.date),n.limit(w(i),s,t)}),w(u[f?0:1]).attr("lay-ym",T[0]+"-"+T[1]).html(T[0]+p);else if("time"===e){var E=function(){w(d).find("ol").each(function(e,a){w(a).find("li").each(function(a,i){n.limit(w(i),[{hours:a},{hours:n[x].hours,minutes:a},{hours:n[x].hours,minutes:n[x].minutes,seconds:a}][e],t,[["hours"],["hours","minutes"],["hours","minutes","seconds"]][e])})}),a.range||n.limit(w(n.footer).find(g),n[x],0,["hours","minutes","seconds"])};a.range?n[x]||(n[x]={hours:0,minutes:0,seconds:0}):n[x]=i,w.each([24,60,60],function(e,t){var a=w.elem("li"),i=["<p>"+r.time[e]+"</p><ol>"];w.each(new Array(t),function(t){i.push("<li"+(n[x][C[e]]===t?' class="'+o+'"':"")+">"+w.digit(t,2)+"</li>")}),a.innerHTML=i.join("")+"</ol>",d.appendChild(a)}),E()}if(y&&h.removeChild(y),h.appendChild(d),"year"===e||"month"===e)w(n.elemMain[t]).addClass("laydate-ym-show"),w(d).find("li").on("click",function(){var r=0|w(this).attr("lay-ym");if(!w(this).hasClass(s)){if(0===t)i[e]=r,l&&(n.startDate[e]=r),n.limit(w(n.footer).find(g),null,0);else if(l)n.endDate[e]=r;else{var c="year"===e?n.getAsYM(r,T[1]-1,"sub"):n.getAsYM(T[0],r,"sub");w.extend(i,{year:c[0],month:c[1]})}"year"===a.type||"month"===a.type?(w(d).find("."+o).removeClass(o),w(this).addClass(o),"month"===a.type&&"year"===e&&(n.listYM[t][0]=r,l&&(n[["startDate","endDate"][t]].year=r),n.list("month",t))):(n.checkDate("limit").calendar(),n.closeList()),n.setBtnStatus(),a.range||n.done(null,"change"),w(n.footer).find(D).removeClass(s)}});else{var S=w.elem("span",{"class":v}),k=function(){w(d).find("ol").each(function(e){var t=this,a=w(t).find("li");t.scrollTop=30*(n[x][C[e]]-2),t.scrollTop<=0&&a.each(function(e,n){if(!w(this).hasClass(s))return t.scrollTop=30*(e-2),!0})})},H=w(c[2]).find("."+v);k(),S.innerHTML=a.range?[r.startTime,r.endTime][t]:r.timeTips,w(n.elemMain[t]).addClass("laydate-time-show"),H[0]&&H.remove(),c[2].appendChild(S),w(d).find("ol").each(function(e){var t=this;w(t).find("li").on("click",function(){var r=0|this.innerHTML;w(this).hasClass(s)||(a.range?n[x][C[e]]=r:i[C[e]]=r,w(t).find("."+o).removeClass(o),w(this).addClass(o),E(),k(),(n.endDate||"time"===a.type)&&n.done(null,"change"),n.setBtnStatus())})})}return n},T.prototype.listYM=[],T.prototype.closeList=function(){var e=this;e.config;w.each(e.elemCont,function(t,n){w(this).find("."+m).remove(),w(e.elemMain[t]).removeClass("laydate-ym-show laydate-time-show")}),w(e.elem).find("."+v).remove()},T.prototype.setBtnStatus=function(e,t,n){var a,i=this,r=i.config,o=w(i.footer).find(g),d=r.range&&"date"!==r.type&&"time"!==r.type;d&&(t=t||i.startDate,n=n||i.endDate,a=i.newDate(t).getTime()>i.newDate(n).getTime(),i.limit(null,t)||i.limit(null,n)?o.addClass(s):o[a?"addClass":"removeClass"](s),e&&a&&i.hint("string"==typeof e?l.replace(/日期/g,e):l))},T.prototype.parse=function(e,t){var n=this,a=n.config,i=t||(e?w.extend({},n.endDate,n.endTime):a.range?w.extend({},n.startDate,n.startTime):a.dateTime),r=n.format.concat();return w.each(r,function(e,t){/yyyy|y/.test(t)?r[e]=w.digit(i.year,t.length):/MM|M/.test(t)?r[e]=w.digit(i.month+1,t.length):/dd|d/.test(t)?r[e]=w.digit(i.date,t.length):/HH|H/.test(t)?r[e]=w.digit(i.hours,t.length):/mm|m/.test(t)?r[e]=w.digit(i.minutes,t.length):/ss|s/.test(t)&&(r[e]=w.digit(i.seconds,t.length))}),a.range&&!e?r.join("")+" "+a.range+" "+n.parse(1):r.join("")},T.prototype.newDate=function(e){return e=e||{},new Date(e.year||1,e.month||0,e.date||1,e.hours||0,e.minutes||0,e.seconds||0)},T.prototype.setValue=function(e){var t=this,n=t.config,a=t.bindElem||n.elem[0],i=t.isInput(a)?"val":"html";return"static"===n.position||w(a)[i](e||""),this},T.prototype.stampRange=function(){var e,t,n=this,a=n.config,i=w(n.elem).find("td");if(a.range&&!n.endDate&&w(n.footer).find(g).addClass(s),n.endDate)return e=n.newDate({year:n.startDate.year,month:n.startDate.month,date:n.startDate.date}).getTime(),t=n.newDate({year:n.endDate.year,month:n.endDate.month,date:n.endDate.date}).getTime(),e>t?n.hint(l):void w.each(i,function(a,i){var r=w(i).attr("lay-ymd").split("-"),s=n.newDate({year:r[0],month:r[1]-1,date:r[2]}).getTime();w(i).removeClass(u+" "+o),s!==e&&s!==t||w(i).addClass(w(i).hasClass(y)||w(i).hasClass(f)?u:o),s>e&&s<t&&w(i).addClass(u)})},T.prototype.done=function(e,t){var n=this,a=n.config,i=w.extend({},n.startDate?w.extend(n.startDate,n.startTime):a.dateTime),r=w.extend({},w.extend(n.endDate,n.endTime));return w.each([i,r],function(e,t){"month"in t&&w.extend(t,{month:t.month+1})}),e=e||[n.parse(),i,r],"function"==typeof a[t||"done"]&&a[t||"done"].apply(a,e),n},T.prototype.choose=function(e){var t=this,n=t.config,a=n.dateTime,i=w(t.elem).find("td"),r=e.attr("lay-ymd").split("-"),l=function(e){new Date;e&&w.extend(a,r),n.range&&(t.startDate?w.extend(t.startDate,r):t.startDate=w.extend({},r,t.startTime),t.startYMD=r)};if(r={year:0|r[0],month:(0|r[1])-1,date:0|r[2]},!e.hasClass(s))if(n.range){if(w.each(["startTime","endTime"],function(e,n){t[n]=t[n]||{hours:0,minutes:0,seconds:0}}),t.endState)l(),delete t.endState,delete t.endDate,t.startState=!0,i.removeClass(o+" "+u),e.addClass(o);else if(t.startState){if(e.addClass(o),t.endDate?w.extend(t.endDate,r):t.endDate=w.extend({},r,t.endTime),t.newDate(r).getTime()<t.newDate(t.startYMD).getTime()){var d=w.extend({},t.endDate,{hours:t.startDate.hours,minutes:t.startDate.minutes,seconds:t.startDate.seconds});w.extend(t.endDate,t.startDate,{hours:t.endDate.hours,minutes:t.endDate.minutes,seconds:t.endDate.seconds}),t.startDate=d}n.showBottom||t.done(),t.stampRange(),t.endState=!0,t.done(null,"change")}else e.addClass(o),l(),t.startState=!0;w(t.footer).find(g)[t.endDate?"removeClass":"addClass"](s)}else"static"===n.position?(l(!0),t.calendar().done().done(null,"change")):"date"===n.type?(l(!0),t.setValue(t.parse()).remove().done()):"datetime"===n.type&&(l(!0),t.calendar().done(null,"change"))},T.prototype.tool=function(e,t){var n=this,a=n.config,i=a.dateTime,r="static"===a.position,o={datetime:function(){w(e).hasClass(s)||(n.list("time",0),a.range&&n.list("time",1),w(e).attr("lay-type","date").html(n.lang().dateTips))},date:function(){n.closeList(),w(e).attr("lay-type","datetime").html(n.lang().timeTips)},clear:function(){n.setValue("").remove(),r&&(w.extend(i,n.firstDate),n.calendar()),a.range&&(delete n.startState,delete n.endState,delete n.endDate,delete n.startTime,delete n.endTime),n.done(["",{},{}])},now:function(){var e=new Date;w.extend(i,n.systemDate(),{hours:e.getHours(),minutes:e.getMinutes(),seconds:e.getSeconds()}),n.setValue(n.parse()).remove(),r&&n.calendar(),n.done()},confirm:function(){if(a.range){if(!n.endDate)return n.hint("请先选择日期范围");if(w(e).hasClass(s))return n.hint("time"===a.type?l.replace(/日期/g,"时间"):l)}else if(w(e).hasClass(s))return n.hint("不在有效日期或时间范围内");n.done(),n.setValue(n.parse()).remove()}};o[t]&&o[t]()},T.prototype.change=function(e){var t=this,n=t.config,a=n.dateTime,i=n.range&&("year"===n.type||"month"===n.type),r=t.elemCont[e||0],o=t.listYM[e],s=function(s){var l=["startDate","endDate"][e],d=w(r).find(".laydate-year-list")[0],c=w(r).find(".laydate-month-list")[0];return d&&(o[0]=s?o[0]-15:o[0]+15,t.list("year",e)),c&&(s?o[0]--:o[0]++,t.list("month",e)),(d||c)&&(w.extend(a,{year:o[0]}),i&&(t[l].year=o[0]),n.range||t.done(null,"change"),t.setBtnStatus(),n.range||t.limit(w(t.footer).find(g),{year:o[0]})),d||c};return{prevYear:function(){s("sub")||(a.year--,t.checkDate("limit").calendar(),n.range||t.done(null,"change"))},prevMonth:function(){var e=t.getAsYM(a.year,a.month,"sub");w.extend(a,{year:e[0],month:e[1]}),t.checkDate("limit").calendar(),n.range||t.done(null,"change")},nextMonth:function(){var e=t.getAsYM(a.year,a.month);w.extend(a,{year:e[0],month:e[1]}),t.checkDate("limit").calendar(),n.range||t.done(null,"change")},nextYear:function(){s()||(a.year++,t.checkDate("limit").calendar(),n.range||t.done(null,"change"))}}},T.prototype.changeEvent=function(){var e=this;e.config;w(e.elem).on("click",function(e){w.stope(e)}),w.each(e.elemHeader,function(t,n){w(n[0]).on("click",function(n){e.change(t).prevYear()}),w(n[1]).on("click",function(n){e.change(t).prevMonth()}),w(n[2]).find("span").on("click",function(n){var a=w(this),i=a.attr("lay-ym"),r=a.attr("lay-type");i&&(i=i.split("-"),e.listYM[t]=[0|i[0],0|i[1]],e.list(r,t),w(e.footer).find(D).addClass(s))}),w(n[3]).on("click",function(n){e.change(t).nextMonth()}),w(n[4]).on("click",function(n){e.change(t).nextYear()})}),w.each(e.table,function(t,n){var a=w(n).find("td");a.on("click",function(){e.choose(w(this))})}),w(e.footer).find("span").on("click",function(){var t=w(this).attr("lay-type");e.tool(this,t)})},T.prototype.isInput=function(e){return/input|textarea/.test(e.tagName.toLocaleLowerCase())},T.prototype.events=function(){var e=this,t=e.config,n=function(n,a){n.on(t.trigger,function(){a&&(e.bindElem=this),e.render()})};t.elem[0]&&!t.elem[0].eventHandler&&(n(t.elem,"bind"),n(t.eventElem),w(document).on("click",function(n){n.target!==t.elem[0]&&n.target!==t.eventElem[0]&&n.target!==w(t.closeStop)[0]&&e.remove()}).on("keydown",function(t){13===t.keyCode&&w("#"+e.elemID)[0]&&e.elemID===T.thisElem&&(t.preventDefault(),w(e.footer).find(g)[0].click())}),w(window).on("resize",function(){return!(!e.elem||!w(r)[0])&&void e.position()}),t.elem[0].eventHandler=!0)},n.render=function(e){var t=new T(e);return a.call(t)},n.getEndDate=function(e,t){var n=new Date;return n.setFullYear(t||n.getFullYear(),e||n.getMonth()+1,1),new Date(n.getTime()-864e5).getDate()},window.lay=window.lay||w,e?(n.ready(),layui.define(function(e){n.path=layui.cache.dir,e(i,n)})):"function"==typeof define&&define.amd?define(function(){return n}):function(){n.ready(),window.laydate=n}()}();!function(e,t){"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(e,t){function n(e){var t=!!e&&"length"in e&&e.length,n=pe.type(e);return"function"!==n&&!pe.isWindow(e)&&("array"===n||0===t||"number"==typeof t&&t>0&&t-1 in e)}function r(e,t,n){if(pe.isFunction(t))return pe.grep(e,function(e,r){return!!t.call(e,r,e)!==n});if(t.nodeType)return pe.grep(e,function(e){return e===t!==n});if("string"==typeof t){if(Ce.test(t))return pe.filter(t,e,n);t=pe.filter(t,e)}return pe.grep(e,function(e){return pe.inArray(e,t)>-1!==n})}function i(e,t){do e=e[t];while(e&&1!==e.nodeType);return e}function o(e){var t={};return pe.each(e.match(De)||[],function(e,n){t[n]=!0}),t}function a(){re.addEventListener?(re.removeEventListener("DOMContentLoaded",s),e.removeEventListener("load",s)):(re.detachEvent("onreadystatechange",s),e.detachEvent("onload",s))}function s(){(re.addEventListener||"load"===e.event.type||"complete"===re.readyState)&&(a(),pe.ready())}function u(e,t,n){if(void 0===n&&1===e.nodeType){var r="data-"+t.replace(_e,"-$1").toLowerCase();if(n=e.getAttribute(r),"string"==typeof n){try{n="true"===n||"false"!==n&&("null"===n?null:+n+""===n?+n:qe.test(n)?pe.parseJSON(n):n)}catch(i){}pe.data(e,t,n)}else n=void 0}return n}function l(e){var t;for(t in e)if(("data"!==t||!pe.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}function c(e,t,n,r){if(He(e)){var i,o,a=pe.expando,s=e.nodeType,u=s?pe.cache:e,l=s?e[a]:e[a]&&a;if(l&&u[l]&&(r||u[l].data)||void 0!==n||"string"!=typeof t)return l||(l=s?e[a]=ne.pop()||pe.guid++:a),u[l]||(u[l]=s?{}:{toJSON:pe.noop}),"object"!=typeof t&&"function"!=typeof t||(r?u[l]=pe.extend(u[l],t):u[l].data=pe.extend(u[l].data,t)),o=u[l],r||(o.data||(o.data={}),o=o.data),void 0!==n&&(o[pe.camelCase(t)]=n),"string"==typeof t?(i=o[t],null==i&&(i=o[pe.camelCase(t)])):i=o,i}}function f(e,t,n){if(He(e)){var r,i,o=e.nodeType,a=o?pe.cache:e,s=o?e[pe.expando]:pe.expando;if(a[s]){if(t&&(r=n?a[s]:a[s].data)){pe.isArray(t)?t=t.concat(pe.map(t,pe.camelCase)):t in r?t=[t]:(t=pe.camelCase(t),t=t in r?[t]:t.split(" ")),i=t.length;for(;i--;)delete r[t[i]];if(n?!l(r):!pe.isEmptyObject(r))return}(n||(delete a[s].data,l(a[s])))&&(o?pe.cleanData([e],!0):fe.deleteExpando||a!=a.window?delete a[s]:a[s]=void 0)}}}function d(e,t,n,r){var i,o=1,a=20,s=r?function(){return r.cur()}:function(){return pe.css(e,t,"")},u=s(),l=n&&n[3]||(pe.cssNumber[t]?"":"px"),c=(pe.cssNumber[t]||"px"!==l&&+u)&&Me.exec(pe.css(e,t));if(c&&c[3]!==l){l=l||c[3],n=n||[],c=+u||1;do o=o||".5",c/=o,pe.style(e,t,c+l);while(o!==(o=s()/u)&&1!==o&&--a)}return n&&(c=+c||+u||0,i=n[1]?c+(n[1]+1)*n[2]:+n[2],r&&(r.unit=l,r.start=c,r.end=i)),i}function p(e){var t=ze.split("|"),n=e.createDocumentFragment();if(n.createElement)for(;t.length;)n.createElement(t.pop());return n}function h(e,t){var n,r,i=0,o="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):void 0;if(!o)for(o=[],n=e.childNodes||e;null!=(r=n[i]);i++)!t||pe.nodeName(r,t)?o.push(r):pe.merge(o,h(r,t));return void 0===t||t&&pe.nodeName(e,t)?pe.merge([e],o):o}function g(e,t){for(var n,r=0;null!=(n=e[r]);r++)pe._data(n,"globalEval",!t||pe._data(t[r],"globalEval"))}function m(e){Be.test(e.type)&&(e.defaultChecked=e.checked)}function y(e,t,n,r,i){for(var o,a,s,u,l,c,f,d=e.length,y=p(t),v=[],x=0;x<d;x++)if(a=e[x],a||0===a)if("object"===pe.type(a))pe.merge(v,a.nodeType?[a]:a);else if(Ue.test(a)){for(u=u||y.appendChild(t.createElement("div")),l=(We.exec(a)||["",""])[1].toLowerCase(),f=Xe[l]||Xe._default,u.innerHTML=f[1]+pe.htmlPrefilter(a)+f[2],o=f[0];o--;)u=u.lastChild;if(!fe.leadingWhitespace&&$e.test(a)&&v.push(t.createTextNode($e.exec(a)[0])),!fe.tbody)for(a="table"!==l||Ve.test(a)?"<table>"!==f[1]||Ve.test(a)?0:u:u.firstChild,o=a&&a.childNodes.length;o--;)pe.nodeName(c=a.childNodes[o],"tbody")&&!c.childNodes.length&&a.removeChild(c);for(pe.merge(v,u.childNodes),u.textContent="";u.firstChild;)u.removeChild(u.firstChild);u=y.lastChild}else v.push(t.createTextNode(a));for(u&&y.removeChild(u),fe.appendChecked||pe.grep(h(v,"input"),m),x=0;a=v[x++];)if(r&&pe.inArray(a,r)>-1)i&&i.push(a);else if(s=pe.contains(a.ownerDocument,a),u=h(y.appendChild(a),"script"),s&&g(u),n)for(o=0;a=u[o++];)Ie.test(a.type||"")&&n.push(a);return u=null,y}function v(){return!0}function x(){return!1}function b(){try{return re.activeElement}catch(e){}}function w(e,t,n,r,i,o){var a,s;if("object"==typeof t){"string"!=typeof n&&(r=r||n,n=void 0);for(s in t)w(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),i===!1)i=x;else if(!i)return e;return 1===o&&(a=i,i=function(e){return pe().off(e),a.apply(this,arguments)},i.guid=a.guid||(a.guid=pe.guid++)),e.each(function(){pe.event.add(this,t,i,r,n)})}function T(e,t){return pe.nodeName(e,"table")&&pe.nodeName(11!==t.nodeType?t:t.firstChild,"tr")?e.getElementsByTagName("tbody")[0]||e.appendChild(e.ownerDocument.createElement("tbody")):e}function C(e){return e.type=(null!==pe.find.attr(e,"type"))+"/"+e.type,e}function E(e){var t=it.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function N(e,t){if(1===t.nodeType&&pe.hasData(e)){var n,r,i,o=pe._data(e),a=pe._data(t,o),s=o.events;if(s){delete a.handle,a.events={};for(n in s)for(r=0,i=s[n].length;r<i;r++)pe.event.add(t,n,s[n][r])}a.data&&(a.data=pe.extend({},a.data))}}function k(e,t){var n,r,i;if(1===t.nodeType){if(n=t.nodeName.toLowerCase(),!fe.noCloneEvent&&t[pe.expando]){i=pe._data(t);for(r in i.events)pe.removeEvent(t,r,i.handle);t.removeAttribute(pe.expando)}"script"===n&&t.text!==e.text?(C(t).text=e.text,E(t)):"object"===n?(t.parentNode&&(t.outerHTML=e.outerHTML),fe.html5Clone&&e.innerHTML&&!pe.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):"input"===n&&Be.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):"option"===n?t.defaultSelected=t.selected=e.defaultSelected:"input"!==n&&"textarea"!==n||(t.defaultValue=e.defaultValue)}}function S(e,t,n,r){t=oe.apply([],t);var i,o,a,s,u,l,c=0,f=e.length,d=f-1,p=t[0],g=pe.isFunction(p);if(g||f>1&&"string"==typeof p&&!fe.checkClone&&rt.test(p))return e.each(function(i){var o=e.eq(i);g&&(t[0]=p.call(this,i,o.html())),S(o,t,n,r)});if(f&&(l=y(t,e[0].ownerDocument,!1,e,r),i=l.firstChild,1===l.childNodes.length&&(l=i),i||r)){for(s=pe.map(h(l,"script"),C),a=s.length;c<f;c++)o=l,c!==d&&(o=pe.clone(o,!0,!0),a&&pe.merge(s,h(o,"script"))),n.call(e[c],o,c);if(a)for(u=s[s.length-1].ownerDocument,pe.map(s,E),c=0;c<a;c++)o=s[c],Ie.test(o.type||"")&&!pe._data(o,"globalEval")&&pe.contains(u,o)&&(o.src?pe._evalUrl&&pe._evalUrl(o.src):pe.globalEval((o.text||o.textContent||o.innerHTML||"").replace(ot,"")));l=i=null}return e}function A(e,t,n){for(var r,i=t?pe.filter(t,e):e,o=0;null!=(r=i[o]);o++)n||1!==r.nodeType||pe.cleanData(h(r)),r.parentNode&&(n&&pe.contains(r.ownerDocument,r)&&g(h(r,"script")),r.parentNode.removeChild(r));return e}function D(e,t){var n=pe(t.createElement(e)).appendTo(t.body),r=pe.css(n[0],"display");return n.detach(),r}function j(e){var t=re,n=lt[e];return n||(n=D(e,t),"none"!==n&&n||(ut=(ut||pe("<iframe frameborder='0' width='0' height='0'/>")).appendTo(t.documentElement),t=(ut[0].contentWindow||ut[0].contentDocument).document,t.write(),t.close(),n=D(e,t),ut.detach()),lt[e]=n),n}function L(e,t){return{get:function(){return e()?void delete this.get:(this.get=t).apply(this,arguments)}}}function H(e){if(e in Et)return e;for(var t=e.charAt(0).toUpperCase()+e.slice(1),n=Ct.length;n--;)if(e=Ct[n]+t,e in Et)return e}function q(e,t){for(var n,r,i,o=[],a=0,s=e.length;a<s;a++)r=e[a],r.style&&(o[a]=pe._data(r,"olddisplay"),n=r.style.display,t?(o[a]||"none"!==n||(r.style.display=""),""===r.style.display&&Re(r)&&(o[a]=pe._data(r,"olddisplay",j(r.nodeName)))):(i=Re(r),(n&&"none"!==n||!i)&&pe._data(r,"olddisplay",i?n:pe.css(r,"display"))));for(a=0;a<s;a++)r=e[a],r.style&&(t&&"none"!==r.style.display&&""!==r.style.display||(r.style.display=t?o[a]||"":"none"));return e}function _(e,t,n){var r=bt.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function F(e,t,n,r,i){for(var o=n===(r?"border":"content")?4:"width"===t?1:0,a=0;o<4;o+=2)"margin"===n&&(a+=pe.css(e,n+Oe[o],!0,i)),r?("content"===n&&(a-=pe.css(e,"padding"+Oe[o],!0,i)),"margin"!==n&&(a-=pe.css(e,"border"+Oe[o]+"Width",!0,i))):(a+=pe.css(e,"padding"+Oe[o],!0,i),"padding"!==n&&(a+=pe.css(e,"border"+Oe[o]+"Width",!0,i)));return a}function M(t,n,r){var i=!0,o="width"===n?t.offsetWidth:t.offsetHeight,a=ht(t),s=fe.boxSizing&&"border-box"===pe.css(t,"boxSizing",!1,a);if(re.msFullscreenElement&&e.top!==e&&t.getClientRects().length&&(o=Math.round(100*t.getBoundingClientRect()[n])),o<=0||null==o){if(o=gt(t,n,a),(o<0||null==o)&&(o=t.style[n]),ft.test(o))return o;i=s&&(fe.boxSizingReliable()||o===t.style[n]),o=parseFloat(o)||0}return o+F(t,n,r||(s?"border":"content"),i,a)+"px"}function O(e,t,n,r,i){return new O.prototype.init(e,t,n,r,i)}function R(){return e.setTimeout(function(){Nt=void 0}),Nt=pe.now()}function P(e,t){var n,r={height:e},i=0;for(t=t?1:0;i<4;i+=2-t)n=Oe[i],r["margin"+n]=r["padding"+n]=e;return t&&(r.opacity=r.width=e),r}function B(e,t,n){for(var r,i=($.tweeners[t]||[]).concat($.tweeners["*"]),o=0,a=i.length;o<a;o++)if(r=i[o].call(n,t,e))return r}function W(e,t,n){var r,i,o,a,s,u,l,c,f=this,d={},p=e.style,h=e.nodeType&&Re(e),g=pe._data(e,"fxshow");n.queue||(s=pe._queueHooks(e,"fx"),null==s.unqueued&&(s.unqueued=0,u=s.empty.fire,s.empty.fire=function(){s.unqueued||u()}),s.unqueued++,f.always(function(){f.always(function(){s.unqueued--,pe.queue(e,"fx").length||s.empty.fire()})})),1===e.nodeType&&("height"in t||"width"in t)&&(n.overflow=[p.overflow,p.overflowX,p.overflowY],l=pe.css(e,"display"),c="none"===l?pe._data(e,"olddisplay")||j(e.nodeName):l,"inline"===c&&"none"===pe.css(e,"float")&&(fe.inlineBlockNeedsLayout&&"inline"!==j(e.nodeName)?p.zoom=1:p.display="inline-block")),n.overflow&&(p.overflow="hidden",fe.shrinkWrapBlocks()||f.always(function(){p.overflow=n.overflow[0],p.overflowX=n.overflow[1],p.overflowY=n.overflow[2]}));for(r in t)if(i=t[r],St.exec(i)){if(delete t[r],o=o||"toggle"===i,i===(h?"hide":"show")){if("show"!==i||!g||void 0===g[r])continue;h=!0}d[r]=g&&g[r]||pe.style(e,r)}else l=void 0;if(pe.isEmptyObject(d))"inline"===("none"===l?j(e.nodeName):l)&&(p.display=l);else{g?"hidden"in g&&(h=g.hidden):g=pe._data(e,"fxshow",{}),o&&(g.hidden=!h),h?pe(e).show():f.done(function(){pe(e).hide()}),f.done(function(){var t;pe._removeData(e,"fxshow");for(t in d)pe.style(e,t,d[t])});for(r in d)a=B(h?g[r]:0,r,f),r in g||(g[r]=a.start,h&&(a.end=a.start,a.start="width"===r||"height"===r?1:0))}}function I(e,t){var n,r,i,o,a;for(n in e)if(r=pe.camelCase(n),i=t[r],o=e[n],pe.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),a=pe.cssHooks[r],a&&"expand"in a){o=a.expand(o),delete e[r];for(n in o)n in e||(e[n]=o[n],t[n]=i)}else t[r]=i}function $(e,t,n){var r,i,o=0,a=$.prefilters.length,s=pe.Deferred().always(function(){delete u.elem}),u=function(){if(i)return!1;for(var t=Nt||R(),n=Math.max(0,l.startTime+l.duration-t),r=n/l.duration||0,o=1-r,a=0,u=l.tweens.length;a<u;a++)l.tweens[a].run(o);return s.notifyWith(e,[l,o,n]),o<1&&u?n:(s.resolveWith(e,[l]),!1)},l=s.promise({elem:e,props:pe.extend({},t),opts:pe.extend(!0,{specialEasing:{},easing:pe.easing._default},n),originalProperties:t,originalOptions:n,startTime:Nt||R(),duration:n.duration,tweens:[],createTween:function(t,n){var r=pe.Tween(e,l.opts,t,n,l.opts.specialEasing[t]||l.opts.easing);return l.tweens.push(r),r},stop:function(t){var n=0,r=t?l.tweens.length:0;if(i)return this;for(i=!0;n<r;n++)l.tweens[n].run(1);return t?(s.notifyWith(e,[l,1,0]),s.resolveWith(e,[l,t])):s.rejectWith(e,[l,t]),this}}),c=l.props;for(I(c,l.opts.specialEasing);o<a;o++)if(r=$.prefilters[o].call(l,e,c,l.opts))return pe.isFunction(r.stop)&&(pe._queueHooks(l.elem,l.opts.queue).stop=pe.proxy(r.stop,r)),r;return pe.map(c,B,l),pe.isFunction(l.opts.start)&&l.opts.start.call(e,l),pe.fx.timer(pe.extend(u,{elem:e,anim:l,queue:l.opts.queue})),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always)}function z(e){return pe.attr(e,"class")||""}function X(e){return function(t,n){"string"!=typeof t&&(n=t,t="*");var r,i=0,o=t.toLowerCase().match(De)||[];if(pe.isFunction(n))for(;r=o[i++];)"+"===r.charAt(0)?(r=r.slice(1)||"*",(e[r]=e[r]||[]).unshift(n)):(e[r]=e[r]||[]).push(n)}}function U(e,t,n,r){function i(s){var u;return o[s]=!0,pe.each(e[s]||[],function(e,s){var l=s(t,n,r);return"string"!=typeof l||a||o[l]?a?!(u=l):void 0:(t.dataTypes.unshift(l),i(l),!1)}),u}var o={},a=e===Qt;return i(t.dataTypes[0])||!o["*"]&&i("*")}function V(e,t){var n,r,i=pe.ajaxSettings.flatOptions||{};for(r in t)void 0!==t[r]&&((i[r]?e:n||(n={}))[r]=t[r]);return n&&pe.extend(!0,e,n),e}function Y(e,t,n){for(var r,i,o,a,s=e.contents,u=e.dataTypes;"*"===u[0];)u.shift(),void 0===i&&(i=e.mimeType||t.getResponseHeader("Content-Type"));if(i)for(a in s)if(s[a]&&s[a].test(i)){u.unshift(a);break}if(u[0]in n)o=u[0];else{for(a in n){if(!u[0]||e.converters[a+" "+u[0]]){o=a;break}r||(r=a)}o=o||r}if(o)return o!==u[0]&&u.unshift(o),n[o]}function J(e,t,n,r){var i,o,a,s,u,l={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)l[a.toLowerCase()]=e.converters[a];for(o=c.shift();o;)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!u&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u=o,o=c.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(a=l[u+" "+o]||l["* "+o],!a)for(i in l)if(s=i.split(" "),s[1]===o&&(a=l[u+" "+s[0]]||l["* "+s[0]])){a===!0?a=l[i]:l[i]!==!0&&(o=s[0],c.unshift(s[1]));break}if(a!==!0)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(f){return{state:"parsererror",error:a?f:"No conversion from "+u+" to "+o}}}return{state:"success",data:t}}function G(e){return e.style&&e.style.display||pe.css(e,"display")}function K(e){for(;e&&1===e.nodeType;){if("none"===G(e)||"hidden"===e.type)return!0;e=e.parentNode}return!1}function Q(e,t,n,r){var i;if(pe.isArray(t))pe.each(t,function(t,i){n||rn.test(e)?r(e,i):Q(e+"["+("object"==typeof i&&null!=i?t:"")+"]",i,n,r)});else if(n||"object"!==pe.type(t))r(e,t);else for(i in t)Q(e+"["+i+"]",t[i],n,r)}function Z(){try{return new e.XMLHttpRequest}catch(t){}}function ee(){try{return new e.ActiveXObject("Microsoft.XMLHTTP")}catch(t){}}function te(e){return pe.isWindow(e)?e:9===e.nodeType&&(e.defaultView||e.parentWindow)}var ne=[],re=e.document,ie=ne.slice,oe=ne.concat,ae=ne.push,se=ne.indexOf,ue={},le=ue.toString,ce=ue.hasOwnProperty,fe={},de="1.12.3",pe=function(e,t){return new pe.fn.init(e,t)},he=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,ge=/^-ms-/,me=/-([\da-z])/gi,ye=function(e,t){return t.toUpperCase()};pe.fn=pe.prototype={jquery:de,constructor:pe,selector:"",length:0,toArray:function(){return ie.call(this)},get:function(e){return null!=e?e<0?this[e+this.length]:this[e]:ie.call(this)},pushStack:function(e){var t=pe.merge(this.constructor(),e);return t.prevObject=this,t.context=this.context,t},each:function(e){return pe.each(this,e)},map:function(e){return this.pushStack(pe.map(this,function(t,n){return e.call(t,n,t)}))},slice:function(){return this.pushStack(ie.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(n>=0&&n<t?[this[n]]:[])},end:function(){return this.prevObject||this.constructor()},push:ae,sort:ne.sort,splice:ne.splice},pe.extend=pe.fn.extend=function(){var e,t,n,r,i,o,a=arguments[0]||{},s=1,u=arguments.length,l=!1;for("boolean"==typeof a&&(l=a,a=arguments[s]||{},s++),"object"==typeof a||pe.isFunction(a)||(a={}),s===u&&(a=this,s--);s<u;s++)if(null!=(i=arguments[s]))for(r in i)e=a[r],n=i[r],a!==n&&(l&&n&&(pe.isPlainObject(n)||(t=pe.isArray(n)))?(t?(t=!1,o=e&&pe.isArray(e)?e:[]):o=e&&pe.isPlainObject(e)?e:{},a[r]=pe.extend(l,o,n)):void 0!==n&&(a[r]=n));return a},pe.extend({expando:"jQuery"+(de+Math.random()).replace(/\D/g,""),isReady:!0,error:function(e){throw new Error(e)},noop:function(){},isFunction:function(e){return"function"===pe.type(e)},isArray:Array.isArray||function(e){return"array"===pe.type(e)},isWindow:function(e){return null!=e&&e==e.window},isNumeric:function(e){var t=e&&e.toString();return!pe.isArray(e)&&t-parseFloat(t)+1>=0},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},isPlainObject:function(e){var t;if(!e||"object"!==pe.type(e)||e.nodeType||pe.isWindow(e))return!1;try{if(e.constructor&&!ce.call(e,"constructor")&&!ce.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(n){return!1}if(!fe.ownFirst)for(t in e)return ce.call(e,t);for(t in e);return void 0===t||ce.call(e,t)},type:function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?ue[le.call(e)]||"object":typeof e},globalEval:function(t){t&&pe.trim(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(ge,"ms-").replace(me,ye)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t){var r,i=0;if(n(e))for(r=e.length;i<r&&t.call(e[i],i,e[i])!==!1;i++);else for(i in e)if(t.call(e[i],i,e[i])===!1)break;return e},trim:function(e){return null==e?"":(e+"").replace(he,"")},makeArray:function(e,t){var r=t||[];return null!=e&&(n(Object(e))?pe.merge(r,"string"==typeof e?[e]:e):ae.call(r,e)),r},inArray:function(e,t,n){var r;if(t){if(se)return se.call(t,e,n);for(r=t.length,n=n?n<0?Math.max(0,r+n):n:0;n<r;n++)if(n in t&&t[n]===e)return n}return-1},merge:function(e,t){for(var n=+t.length,r=0,i=e.length;r<n;)e[i++]=t[r++];if(n!==n)for(;void 0!==t[r];)e[i++]=t[r++];return e.length=i,e},grep:function(e,t,n){for(var r,i=[],o=0,a=e.length,s=!n;o<a;o++)r=!t(e[o],o),r!==s&&i.push(e[o]);return i},map:function(e,t,r){var i,o,a=0,s=[];if(n(e))for(i=e.length;a<i;a++)o=t(e[a],a,r),null!=o&&s.push(o);else for(a in e)o=t(e[a],a,r),null!=o&&s.push(o);return oe.apply([],s)},guid:1,proxy:function(e,t){var n,r,i;if("string"==typeof t&&(i=e[t],t=e,e=i),pe.isFunction(e))return n=ie.call(arguments,2),r=function(){return e.apply(t||this,n.concat(ie.call(arguments)))},r.guid=e.guid=e.guid||pe.guid++,r},now:function(){return+new Date},support:fe}),"function"==typeof Symbol&&(pe.fn[Symbol.iterator]=ne[Symbol.iterator]),pe.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(e,t){ue["[object "+t+"]"]=t.toLowerCase()});var ve=function(e){function t(e,t,n,r){var i,o,a,s,u,l,f,p,h=t&&t.ownerDocument,g=t?t.nodeType:9;if(n=n||[],"string"!=typeof e||!e||1!==g&&9!==g&&11!==g)return n;if(!r&&((t?t.ownerDocument||t:B)!==H&&L(t),t=t||H,_)){if(11!==g&&(l=ye.exec(e)))if(i=l[1]){if(9===g){if(!(a=t.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(h&&(a=h.getElementById(i))&&R(t,a)&&a.id===i)return n.push(a),n}else{if(l[2])return Q.apply(n,t.getElementsByTagName(e)),n;if((i=l[3])&&w.getElementsByClassName&&t.getElementsByClassName)return Q.apply(n,t.getElementsByClassName(i)),n}if(w.qsa&&!X[e+" "]&&(!F||!F.test(e))){if(1!==g)h=t,p=e;else if("object"!==t.nodeName.toLowerCase()){for((s=t.getAttribute("id"))?s=s.replace(xe,"\\$&"):t.setAttribute("id",s=P),f=N(e),o=f.length,u=de.test(s)?"#"+s:"[id='"+s+"']";o--;)f[o]=u+" "+d(f[o]);p=f.join(","),h=ve.test(e)&&c(t.parentNode)||t}if(p)try{return Q.apply(n,h.querySelectorAll(p)),n}catch(m){}finally{s===P&&t.removeAttribute("id")}}}return S(e.replace(se,"$1"),t,n,r)}function n(){function e(n,r){return t.push(n+" ")>T.cacheLength&&delete e[t.shift()],e[n+" "]=r}var t=[];return e}function r(e){return e[P]=!0,e}function i(e){var t=H.createElement("div");try{return!!e(t)}catch(n){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function o(e,t){for(var n=e.split("|"),r=n.length;r--;)T.attrHandle[n[r]]=t}function a(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&(~t.sourceIndex||V)-(~e.sourceIndex||V);if(r)return r;if(n)for(;n=n.nextSibling;)if(n===t)return-1;return e?1:-1}function s(e){return function(t){var n=t.nodeName.toLowerCase();return"input"===n&&t.type===e}}function u(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function l(e){return r(function(t){return t=+t,r(function(n,r){for(var i,o=e([],n.length,t),a=o.length;a--;)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}function c(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}function f(){}function d(e){for(var t=0,n=e.length,r="";t<n;t++)r+=e[t].value;return r}function p(e,t,n){var r=t.dir,i=n&&"parentNode"===r,o=I++;return t.first?function(t,n,o){for(;t=t[r];)if(1===t.nodeType||i)return e(t,n,o)}:function(t,n,a){var s,u,l,c=[W,o];if(a){for(;t=t[r];)if((1===t.nodeType||i)&&e(t,n,a))return!0}else for(;t=t[r];)if(1===t.nodeType||i){if(l=t[P]||(t[P]={}),u=l[t.uniqueID]||(l[t.uniqueID]={}),(s=u[r])&&s[0]===W&&s[1]===o)return c[2]=s[2];if(u[r]=c,c[2]=e(t,n,a))return!0}}}function h(e){return e.length>1?function(t,n,r){for(var i=e.length;i--;)if(!e[i](t,n,r))return!1;return!0}:e[0]}function g(e,n,r){for(var i=0,o=n.length;i<o;i++)t(e,n[i],r);return r}function m(e,t,n,r,i){for(var o,a=[],s=0,u=e.length,l=null!=t;s<u;s++)(o=e[s])&&(n&&!n(o,r,i)||(a.push(o),l&&t.push(s)));return a}function y(e,t,n,i,o,a){return i&&!i[P]&&(i=y(i)),o&&!o[P]&&(o=y(o,a)),r(function(r,a,s,u){var l,c,f,d=[],p=[],h=a.length,y=r||g(t||"*",s.nodeType?[s]:s,[]),v=!e||!r&&t?y:m(y,d,e,s,u),x=n?o||(r?e:h||i)?[]:a:v;if(n&&n(v,x,s,u),i)for(l=m(x,p),i(l,[],s,u),c=l.length;c--;)(f=l[c])&&(x[p[c]]=!(v[p[c]]=f));if(r){if(o||e){if(o){for(l=[],c=x.length;c--;)(f=x[c])&&l.push(v[c]=f);o(null,x=[],l,u)}for(c=x.length;c--;)(f=x[c])&&(l=o?ee(r,f):d[c])>-1&&(r[l]=!(a[l]=f))}}else x=m(x===a?x.splice(h,x.length):x),o?o(null,a,x,u):Q.apply(a,x)})}function v(e){for(var t,n,r,i=e.length,o=T.relative[e[0].type],a=o||T.relative[" "],s=o?1:0,u=p(function(e){return e===t},a,!0),l=p(function(e){return ee(t,e)>-1},a,!0),c=[function(e,n,r){var i=!o&&(r||n!==A)||((t=n).nodeType?u(e,n,r):l(e,n,r));return t=null,i}];s<i;s++)if(n=T.relative[e[s].type])c=[p(h(c),n)];else{if(n=T.filter[e[s].type].apply(null,e[s].matches),n[P]){for(r=++s;r<i&&!T.relative[e[r].type];r++);return y(s>1&&h(c),s>1&&d(e.slice(0,s-1).concat({value:" "===e[s-2].type?"*":""})).replace(se,"$1"),n,s<r&&v(e.slice(s,r)),r<i&&v(e=e.slice(r)),r<i&&d(e))}c.push(n)}return h(c)}function x(e,n){var i=n.length>0,o=e.length>0,a=function(r,a,s,u,l){var c,f,d,p=0,h="0",g=r&&[],y=[],v=A,x=r||o&&T.find.TAG("*",l),b=W+=null==v?1:Math.random()||.1,w=x.length;for(l&&(A=a===H||a||l);h!==w&&null!=(c=x[h]);h++){if(o&&c){for(f=0,a||c.ownerDocument===H||(L(c),s=!_);d=e[f++];)if(d(c,a||H,s)){u.push(c);break}l&&(W=b)}i&&((c=!d&&c)&&p--,r&&g.push(c))}if(p+=h,i&&h!==p){for(f=0;d=n[f++];)d(g,y,a,s);if(r){if(p>0)for(;h--;)g[h]||y[h]||(y[h]=G.call(u));y=m(y)}Q.apply(u,y),l&&!r&&y.length>0&&p+n.length>1&&t.uniqueSort(u)}return l&&(W=b,A=v),g};return i?r(a):a}var b,w,T,C,E,N,k,S,A,D,j,L,H,q,_,F,M,O,R,P="sizzle"+1*new Date,B=e.document,W=0,I=0,$=n(),z=n(),X=n(),U=function(e,t){return e===t&&(j=!0),0},V=1<<31,Y={}.hasOwnProperty,J=[],G=J.pop,K=J.push,Q=J.push,Z=J.slice,ee=function(e,t){for(var n=0,r=e.length;n<r;n++)if(e[n]===t)return n;return-1},te="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",ne="[\\x20\\t\\r\\n\\f]",re="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",ie="\\["+ne+"*("+re+")(?:"+ne+"*([*^$|!~]?=)"+ne+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+re+"))|)"+ne+"*\\]",oe=":("+re+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+ie+")*)|.*)\\)|)",ae=new RegExp(ne+"+","g"),se=new RegExp("^"+ne+"+|((?:^|[^\\\\])(?:\\\\.)*)"+ne+"+$","g"),ue=new RegExp("^"+ne+"*,"+ne+"*"),le=new RegExp("^"+ne+"*([>+~]|"+ne+")"+ne+"*"),ce=new RegExp("="+ne+"*([^\\]'\"]*?)"+ne+"*\\]","g"),fe=new RegExp(oe),de=new RegExp("^"+re+"$"),pe={ID:new RegExp("^#("+re+")"),CLASS:new RegExp("^\\.("+re+")"),TAG:new RegExp("^("+re+"|[*])"),ATTR:new RegExp("^"+ie),PSEUDO:new RegExp("^"+oe),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+ne+"*(even|odd|(([+-]|)(\\d*)n|)"+ne+"*(?:([+-]|)"+ne+"*(\\d+)|))"+ne+"*\\)|)","i"),bool:new RegExp("^(?:"+te+")$","i"),needsContext:new RegExp("^"+ne+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+ne+"*((?:-\\d)?\\d*)"+ne+"*\\)|)(?=[^-]|$)","i")},he=/^(?:input|select|textarea|button)$/i,ge=/^h\d$/i,me=/^[^{]+\{\s*\[native \w/,ye=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ve=/[+~]/,xe=/'|\\/g,be=new RegExp("\\\\([\\da-f]{1,6}"+ne+"?|("+ne+")|.)","ig"),we=function(e,t,n){var r="0x"+t-65536;return r!==r||n?t:r<0?String.fromCharCode(r+65536):String.fromCharCode(r>>10|55296,1023&r|56320)},Te=function(){L()};try{Q.apply(J=Z.call(B.childNodes),B.childNodes),J[B.childNodes.length].nodeType}catch(Ce){Q={apply:J.length?function(e,t){K.apply(e,Z.call(t))}:function(e,t){for(var n=e.length,r=0;e[n++]=t[r++];);e.length=n-1}}}w=t.support={},E=t.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return!!t&&"HTML"!==t.nodeName},L=t.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:B;return r!==H&&9===r.nodeType&&r.documentElement?(H=r,q=H.documentElement,_=!E(H),(n=H.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",Te,!1):n.attachEvent&&n.attachEvent("onunload",Te)),w.attributes=i(function(e){return e.className="i",!e.getAttribute("className")}),w.getElementsByTagName=i(function(e){return e.appendChild(H.createComment("")),!e.getElementsByTagName("*").length}),w.getElementsByClassName=me.test(H.getElementsByClassName),w.getById=i(function(e){return q.appendChild(e).id=P,!H.getElementsByName||!H.getElementsByName(P).length}),w.getById?(T.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&_){var n=t.getElementById(e);return n?[n]:[]}},T.filter.ID=function(e){var t=e.replace(be,we);return function(e){return e.getAttribute("id")===t}}):(delete T.find.ID,T.filter.ID=function(e){var t=e.replace(be,we);return function(e){var n="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return n&&n.value===t}}),T.find.TAG=w.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):w.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){for(;n=o[i++];)1===n.nodeType&&r.push(n);return r}return o},T.find.CLASS=w.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&_)return t.getElementsByClassName(e)},M=[],F=[],(w.qsa=me.test(H.querySelectorAll))&&(i(function(e){q.appendChild(e).innerHTML="<a id='"+P+"'></a><select id='"+P+"-\r\\' msallowcapture=''><option selected=''></option></select>",e.querySelectorAll("[msallowcapture^='']").length&&F.push("[*^$]="+ne+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||F.push("\\["+ne+"*(?:value|"+te+")"),e.querySelectorAll("[id~="+P+"-]").length||F.push("~="),e.querySelectorAll(":checked").length||F.push(":checked"),e.querySelectorAll("a#"+P+"+*").length||F.push(".#.+[+~]")}),i(function(e){var t=H.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&F.push("name"+ne+"*[*^$|!~]?="),e.querySelectorAll(":enabled").length||F.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),F.push(",.*:")})),(w.matchesSelector=me.test(O=q.matches||q.webkitMatchesSelector||q.mozMatchesSelector||q.oMatchesSelector||q.msMatchesSelector))&&i(function(e){w.disconnectedMatch=O.call(e,"div"),O.call(e,"[s!='']:x"),M.push("!=",oe)}),F=F.length&&new RegExp(F.join("|")),M=M.length&&new RegExp(M.join("|")),t=me.test(q.compareDocumentPosition),R=t||me.test(q.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)for(;t=t.parentNode;)if(t===e)return!0;return!1},U=t?function(e,t){if(e===t)return j=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n?n:(n=(e.ownerDocument||e)===(t.ownerDocument||t)?e.compareDocumentPosition(t):1,1&n||!w.sortDetached&&t.compareDocumentPosition(e)===n?e===H||e.ownerDocument===B&&R(B,e)?-1:t===H||t.ownerDocument===B&&R(B,t)?1:D?ee(D,e)-ee(D,t):0:4&n?-1:1)}:function(e,t){if(e===t)return j=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,s=[e],u=[t];if(!i||!o)return e===H?-1:t===H?1:i?-1:o?1:D?ee(D,e)-ee(D,t):0;if(i===o)return a(e,t);for(n=e;n=n.parentNode;)s.unshift(n);for(n=t;n=n.parentNode;)u.unshift(n);for(;s[r]===u[r];)r++;return r?a(s[r],u[r]):s[r]===B?-1:u[r]===B?1:0},H):H},t.matches=function(e,n){return t(e,null,null,n)},t.matchesSelector=function(e,n){if((e.ownerDocument||e)!==H&&L(e),n=n.replace(ce,"='$1']"),w.matchesSelector&&_&&!X[n+" "]&&(!M||!M.test(n))&&(!F||!F.test(n)))try{var r=O.call(e,n);if(r||w.disconnectedMatch||e.document&&11!==e.document.nodeType)return r}catch(i){}return t(n,H,null,[e]).length>0},t.contains=function(e,t){return(e.ownerDocument||e)!==H&&L(e),R(e,t)},t.attr=function(e,t){(e.ownerDocument||e)!==H&&L(e);var n=T.attrHandle[t.toLowerCase()],r=n&&Y.call(T.attrHandle,t.toLowerCase())?n(e,t,!_):void 0;return void 0!==r?r:w.attributes||!_?e.getAttribute(t):(r=e.getAttributeNode(t))&&r.specified?r.value:null},t.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},t.uniqueSort=function(e){var t,n=[],r=0,i=0;if(j=!w.detectDuplicates,D=!w.sortStable&&e.slice(0),e.sort(U),j){for(;t=e[i++];)t===e[i]&&(r=n.push(i));for(;r--;)e.splice(n[r],1)}return D=null,e},C=t.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=C(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r++];)n+=C(t);return n},T=t.selectors={cacheLength:50,createPseudo:r,match:pe,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(be,we),e[3]=(e[3]||e[4]||e[5]||"").replace(be,we),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||t.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&t.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return pe.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&fe.test(n)&&(t=N(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(be,we).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=$[e+" "];return t||(t=new RegExp("(^|"+ne+")"+e+"("+ne+"|$)"))&&$(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(e,n,r){return function(i){var o=t.attr(i,e);return null==o?"!="===n:!n||(o+="","="===n?o===r:"!="===n?o!==r:"^="===n?r&&0===o.indexOf(r):"*="===n?r&&o.indexOf(r)>-1:"$="===n?r&&o.slice(-r.length)===r:"~="===n?(" "+o.replace(ae," ")+" ").indexOf(r)>-1:"|="===n&&(o===r||o.slice(0,r.length+1)===r+"-"))}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,u){var l,c,f,d,p,h,g=o!==a?"nextSibling":"previousSibling",m=t.parentNode,y=s&&t.nodeName.toLowerCase(),v=!u&&!s,x=!1;if(m){if(o){for(;g;){for(d=t;d=d[g];)if(s?d.nodeName.toLowerCase()===y:1===d.nodeType)return!1;h=g="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?m.firstChild:m.lastChild],a&&v){for(d=m,f=d[P]||(d[P]={}),c=f[d.uniqueID]||(f[d.uniqueID]={}),
+l=c[e]||[],p=l[0]===W&&l[1],x=p&&l[2],d=p&&m.childNodes[p];d=++p&&d&&d[g]||(x=p=0)||h.pop();)if(1===d.nodeType&&++x&&d===t){c[e]=[W,p,x];break}}else if(v&&(d=t,f=d[P]||(d[P]={}),c=f[d.uniqueID]||(f[d.uniqueID]={}),l=c[e]||[],p=l[0]===W&&l[1],x=p),x===!1)for(;(d=++p&&d&&d[g]||(x=p=0)||h.pop())&&((s?d.nodeName.toLowerCase()!==y:1!==d.nodeType)||!++x||(v&&(f=d[P]||(d[P]={}),c=f[d.uniqueID]||(f[d.uniqueID]={}),c[e]=[W,x]),d!==t)););return x-=i,x===r||x%r===0&&x/r>=0}}},PSEUDO:function(e,n){var i,o=T.pseudos[e]||T.setFilters[e.toLowerCase()]||t.error("unsupported pseudo: "+e);return o[P]?o(n):o.length>1?(i=[e,e,"",n],T.setFilters.hasOwnProperty(e.toLowerCase())?r(function(e,t){for(var r,i=o(e,n),a=i.length;a--;)r=ee(e,i[a]),e[r]=!(t[r]=i[a])}):function(e){return o(e,0,i)}):o}},pseudos:{not:r(function(e){var t=[],n=[],i=k(e.replace(se,"$1"));return i[P]?r(function(e,t,n,r){for(var o,a=i(e,null,r,[]),s=e.length;s--;)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,r,o){return t[0]=e,i(t,null,o,n),t[0]=null,!n.pop()}}),has:r(function(e){return function(n){return t(e,n).length>0}}),contains:r(function(e){return e=e.replace(be,we),function(t){return(t.textContent||t.innerText||C(t)).indexOf(e)>-1}}),lang:r(function(e){return de.test(e||"")||t.error("unsupported lang: "+e),e=e.replace(be,we).toLowerCase(),function(t){var n;do if(n=_?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang"))return n=n.toLowerCase(),n===e||0===n.indexOf(e+"-");while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===q},focus:function(e){return e===H.activeElement&&(!H.hasFocus||H.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!T.pseudos.empty(e)},header:function(e){return ge.test(e.nodeName)},input:function(e){return he.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:l(function(){return[0]}),last:l(function(e,t){return[t-1]}),eq:l(function(e,t,n){return[n<0?n+t:n]}),even:l(function(e,t){for(var n=0;n<t;n+=2)e.push(n);return e}),odd:l(function(e,t){for(var n=1;n<t;n+=2)e.push(n);return e}),lt:l(function(e,t,n){for(var r=n<0?n+t:n;--r>=0;)e.push(r);return e}),gt:l(function(e,t,n){for(var r=n<0?n+t:n;++r<t;)e.push(r);return e})}},T.pseudos.nth=T.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})T.pseudos[b]=s(b);for(b in{submit:!0,reset:!0})T.pseudos[b]=u(b);return f.prototype=T.filters=T.pseudos,T.setFilters=new f,N=t.tokenize=function(e,n){var r,i,o,a,s,u,l,c=z[e+" "];if(c)return n?0:c.slice(0);for(s=e,u=[],l=T.preFilter;s;){r&&!(i=ue.exec(s))||(i&&(s=s.slice(i[0].length)||s),u.push(o=[])),r=!1,(i=le.exec(s))&&(r=i.shift(),o.push({value:r,type:i[0].replace(se," ")}),s=s.slice(r.length));for(a in T.filter)!(i=pe[a].exec(s))||l[a]&&!(i=l[a](i))||(r=i.shift(),o.push({value:r,type:a,matches:i}),s=s.slice(r.length));if(!r)break}return n?s.length:s?t.error(e):z(e,u).slice(0)},k=t.compile=function(e,t){var n,r=[],i=[],o=X[e+" "];if(!o){for(t||(t=N(e)),n=t.length;n--;)o=v(t[n]),o[P]?r.push(o):i.push(o);o=X(e,x(i,r)),o.selector=e}return o},S=t.select=function(e,t,n,r){var i,o,a,s,u,l="function"==typeof e&&e,f=!r&&N(e=l.selector||e);if(n=n||[],1===f.length){if(o=f[0]=f[0].slice(0),o.length>2&&"ID"===(a=o[0]).type&&w.getById&&9===t.nodeType&&_&&T.relative[o[1].type]){if(t=(T.find.ID(a.matches[0].replace(be,we),t)||[])[0],!t)return n;l&&(t=t.parentNode),e=e.slice(o.shift().value.length)}for(i=pe.needsContext.test(e)?0:o.length;i--&&(a=o[i],!T.relative[s=a.type]);)if((u=T.find[s])&&(r=u(a.matches[0].replace(be,we),ve.test(o[0].type)&&c(t.parentNode)||t))){if(o.splice(i,1),e=r.length&&d(o),!e)return Q.apply(n,r),n;break}}return(l||k(e,f))(r,t,!_,n,!t||ve.test(e)&&c(t.parentNode)||t),n},w.sortStable=P.split("").sort(U).join("")===P,w.detectDuplicates=!!j,L(),w.sortDetached=i(function(e){return 1&e.compareDocumentPosition(H.createElement("div"))}),i(function(e){return e.innerHTML="<a href='#'></a>","#"===e.firstChild.getAttribute("href")})||o("type|href|height|width",function(e,t,n){if(!n)return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),w.attributes&&i(function(e){return e.innerHTML="<input/>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||o("value",function(e,t,n){if(!n&&"input"===e.nodeName.toLowerCase())return e.defaultValue}),i(function(e){return null==e.getAttribute("disabled")})||o(te,function(e,t,n){var r;if(!n)return e[t]===!0?t.toLowerCase():(r=e.getAttributeNode(t))&&r.specified?r.value:null}),t}(e);pe.find=ve,pe.expr=ve.selectors,pe.expr[":"]=pe.expr.pseudos,pe.uniqueSort=pe.unique=ve.uniqueSort,pe.text=ve.getText,pe.isXMLDoc=ve.isXML,pe.contains=ve.contains;var xe=function(e,t,n){for(var r=[],i=void 0!==n;(e=e[t])&&9!==e.nodeType;)if(1===e.nodeType){if(i&&pe(e).is(n))break;r.push(e)}return r},be=function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},we=pe.expr.match.needsContext,Te=/^<([\w-]+)\s*\/?>(?:<\/\1>|)$/,Ce=/^.[^:#\[\.,]*$/;pe.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?pe.find.matchesSelector(r,e)?[r]:[]:pe.find.matches(e,pe.grep(t,function(e){return 1===e.nodeType}))},pe.fn.extend({find:function(e){var t,n=[],r=this,i=r.length;if("string"!=typeof e)return this.pushStack(pe(e).filter(function(){for(t=0;t<i;t++)if(pe.contains(r[t],this))return!0}));for(t=0;t<i;t++)pe.find(e,r[t],n);return n=this.pushStack(i>1?pe.unique(n):n),n.selector=this.selector?this.selector+" "+e:e,n},filter:function(e){return this.pushStack(r(this,e||[],!1))},not:function(e){return this.pushStack(r(this,e||[],!0))},is:function(e){return!!r(this,"string"==typeof e&&we.test(e)?pe(e):e||[],!1).length}});var Ee,Ne=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,ke=pe.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||Ee,"string"==typeof e){if(r="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:Ne.exec(e),!r||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof pe?t[0]:t,pe.merge(this,pe.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:re,!0)),Te.test(r[1])&&pe.isPlainObject(t))for(r in t)pe.isFunction(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}if(i=re.getElementById(r[2]),i&&i.parentNode){if(i.id!==r[2])return Ee.find(e);this.length=1,this[0]=i}return this.context=re,this.selector=e,this}return e.nodeType?(this.context=this[0]=e,this.length=1,this):pe.isFunction(e)?"undefined"!=typeof n.ready?n.ready(e):e(pe):(void 0!==e.selector&&(this.selector=e.selector,this.context=e.context),pe.makeArray(e,this))};ke.prototype=pe.fn,Ee=pe(re);var Se=/^(?:parents|prev(?:Until|All))/,Ae={children:!0,contents:!0,next:!0,prev:!0};pe.fn.extend({has:function(e){var t,n=pe(e,this),r=n.length;return this.filter(function(){for(t=0;t<r;t++)if(pe.contains(this,n[t]))return!0})},closest:function(e,t){for(var n,r=0,i=this.length,o=[],a=we.test(e)||"string"!=typeof e?pe(e,t||this.context):0;r<i;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(n.nodeType<11&&(a?a.index(n)>-1:1===n.nodeType&&pe.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(o.length>1?pe.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?pe.inArray(this[0],pe(e)):pe.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(pe.uniqueSort(pe.merge(this.get(),pe(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),pe.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return xe(e,"parentNode")},parentsUntil:function(e,t,n){return xe(e,"parentNode",n)},next:function(e){return i(e,"nextSibling")},prev:function(e){return i(e,"previousSibling")},nextAll:function(e){return xe(e,"nextSibling")},prevAll:function(e){return xe(e,"previousSibling")},nextUntil:function(e,t,n){return xe(e,"nextSibling",n)},prevUntil:function(e,t,n){return xe(e,"previousSibling",n)},siblings:function(e){return be((e.parentNode||{}).firstChild,e)},children:function(e){return be(e.firstChild)},contents:function(e){return pe.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:pe.merge([],e.childNodes)}},function(e,t){pe.fn[e]=function(n,r){var i=pe.map(this,t,n);return"Until"!==e.slice(-5)&&(r=n),r&&"string"==typeof r&&(i=pe.filter(r,i)),this.length>1&&(Ae[e]||(i=pe.uniqueSort(i)),Se.test(e)&&(i=i.reverse())),this.pushStack(i)}});var De=/\S+/g;pe.Callbacks=function(e){e="string"==typeof e?o(e):pe.extend({},e);var t,n,r,i,a=[],s=[],u=-1,l=function(){for(i=e.once,r=t=!0;s.length;u=-1)for(n=s.shift();++u<a.length;)a[u].apply(n[0],n[1])===!1&&e.stopOnFalse&&(u=a.length,n=!1);e.memory||(n=!1),t=!1,i&&(a=n?[]:"")},c={add:function(){return a&&(n&&!t&&(u=a.length-1,s.push(n)),function r(t){pe.each(t,function(t,n){pe.isFunction(n)?e.unique&&c.has(n)||a.push(n):n&&n.length&&"string"!==pe.type(n)&&r(n)})}(arguments),n&&!t&&l()),this},remove:function(){return pe.each(arguments,function(e,t){for(var n;(n=pe.inArray(t,a,n))>-1;)a.splice(n,1),n<=u&&u--}),this},has:function(e){return e?pe.inArray(e,a)>-1:a.length>0},empty:function(){return a&&(a=[]),this},disable:function(){return i=s=[],a=n="",this},disabled:function(){return!a},lock:function(){return i=!0,n||c.disable(),this},locked:function(){return!!i},fireWith:function(e,n){return i||(n=n||[],n=[e,n.slice?n.slice():n],s.push(n),t||l()),this},fire:function(){return c.fireWith(this,arguments),this},fired:function(){return!!r}};return c},pe.extend({Deferred:function(e){var t=[["resolve","done",pe.Callbacks("once memory"),"resolved"],["reject","fail",pe.Callbacks("once memory"),"rejected"],["notify","progress",pe.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return pe.Deferred(function(n){pe.each(t,function(t,o){var a=pe.isFunction(e[t])&&e[t];i[o[1]](function(){var e=a&&a.apply(this,arguments);e&&pe.isFunction(e.promise)?e.promise().progress(n.notify).done(n.resolve).fail(n.reject):n[o[0]+"With"](this===r?n.promise():this,a?[e]:arguments)})}),e=null}).promise()},promise:function(e){return null!=e?pe.extend(e,r):r}},i={};return r.pipe=r.then,pe.each(t,function(e,o){var a=o[2],s=o[3];r[o[1]]=a.add,s&&a.add(function(){n=s},t[1^e][2].disable,t[2][2].lock),i[o[0]]=function(){return i[o[0]+"With"](this===i?r:this,arguments),this},i[o[0]+"With"]=a.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t,n,r,i=0,o=ie.call(arguments),a=o.length,s=1!==a||e&&pe.isFunction(e.promise)?a:0,u=1===s?e:pe.Deferred(),l=function(e,n,r){return function(i){n[e]=this,r[e]=arguments.length>1?ie.call(arguments):i,r===t?u.notifyWith(n,r):--s||u.resolveWith(n,r)}};if(a>1)for(t=new Array(a),n=new Array(a),r=new Array(a);i<a;i++)o[i]&&pe.isFunction(o[i].promise)?o[i].promise().progress(l(i,n,t)).done(l(i,r,o)).fail(u.reject):--s;return s||u.resolveWith(r,o),u.promise()}});var je;pe.fn.ready=function(e){return pe.ready.promise().done(e),this},pe.extend({isReady:!1,readyWait:1,holdReady:function(e){e?pe.readyWait++:pe.ready(!0)},ready:function(e){(e===!0?--pe.readyWait:pe.isReady)||(pe.isReady=!0,e!==!0&&--pe.readyWait>0||(je.resolveWith(re,[pe]),pe.fn.triggerHandler&&(pe(re).triggerHandler("ready"),pe(re).off("ready"))))}}),pe.ready.promise=function(t){if(!je)if(je=pe.Deferred(),"complete"===re.readyState||"loading"!==re.readyState&&!re.documentElement.doScroll)e.setTimeout(pe.ready);else if(re.addEventListener)re.addEventListener("DOMContentLoaded",s),e.addEventListener("load",s);else{re.attachEvent("onreadystatechange",s),e.attachEvent("onload",s);var n=!1;try{n=null==e.frameElement&&re.documentElement}catch(r){}n&&n.doScroll&&!function i(){if(!pe.isReady){try{n.doScroll("left")}catch(t){return e.setTimeout(i,50)}a(),pe.ready()}}()}return je.promise(t)},pe.ready.promise();var Le;for(Le in pe(fe))break;fe.ownFirst="0"===Le,fe.inlineBlockNeedsLayout=!1,pe(function(){var e,t,n,r;n=re.getElementsByTagName("body")[0],n&&n.style&&(t=re.createElement("div"),r=re.createElement("div"),r.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",n.appendChild(r).appendChild(t),"undefined"!=typeof t.style.zoom&&(t.style.cssText="display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1",fe.inlineBlockNeedsLayout=e=3===t.offsetWidth,e&&(n.style.zoom=1)),n.removeChild(r))}),function(){var e=re.createElement("div");fe.deleteExpando=!0;try{delete e.test}catch(t){fe.deleteExpando=!1}e=null}();var He=function(e){var t=pe.noData[(e.nodeName+" ").toLowerCase()],n=+e.nodeType||1;return(1===n||9===n)&&(!t||t!==!0&&e.getAttribute("classid")===t)},qe=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,_e=/([A-Z])/g;pe.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(e){return e=e.nodeType?pe.cache[e[pe.expando]]:e[pe.expando],!!e&&!l(e)},data:function(e,t,n){return c(e,t,n)},removeData:function(e,t){return f(e,t)},_data:function(e,t,n){return c(e,t,n,!0)},_removeData:function(e,t){return f(e,t,!0)}}),pe.fn.extend({data:function(e,t){var n,r,i,o=this[0],a=o&&o.attributes;if(void 0===e){if(this.length&&(i=pe.data(o),1===o.nodeType&&!pe._data(o,"parsedAttrs"))){for(n=a.length;n--;)a[n]&&(r=a[n].name,0===r.indexOf("data-")&&(r=pe.camelCase(r.slice(5)),u(o,r,i[r])));pe._data(o,"parsedAttrs",!0)}return i}return"object"==typeof e?this.each(function(){pe.data(this,e)}):arguments.length>1?this.each(function(){pe.data(this,e,t)}):o?u(o,e,pe.data(o,e)):void 0},removeData:function(e){return this.each(function(){pe.removeData(this,e)})}}),pe.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=pe._data(e,t),n&&(!r||pe.isArray(n)?r=pe._data(e,t,pe.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=pe.queue(e,t),r=n.length,i=n.shift(),o=pe._queueHooks(e,t),a=function(){pe.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,a,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return pe._data(e,n)||pe._data(e,n,{empty:pe.Callbacks("once memory").add(function(){pe._removeData(e,t+"queue"),pe._removeData(e,n)})})}}),pe.fn.extend({queue:function(e,t){var n=2;return"string"!=typeof e&&(t=e,e="fx",n--),arguments.length<n?pe.queue(this[0],e):void 0===t?this:this.each(function(){var n=pe.queue(this,e,t);pe._queueHooks(this,e),"fx"===e&&"inprogress"!==n[0]&&pe.dequeue(this,e)})},dequeue:function(e){return this.each(function(){pe.dequeue(this,e)})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,t){var n,r=1,i=pe.Deferred(),o=this,a=this.length,s=function(){--r||i.resolveWith(o,[o])};for("string"!=typeof e&&(t=e,e=void 0),e=e||"fx";a--;)n=pe._data(o[a],e+"queueHooks"),n&&n.empty&&(r++,n.empty.add(s));return s(),i.promise(t)}}),function(){var e;fe.shrinkWrapBlocks=function(){if(null!=e)return e;e=!1;var t,n,r;return n=re.getElementsByTagName("body")[0],n&&n.style?(t=re.createElement("div"),r=re.createElement("div"),r.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",n.appendChild(r).appendChild(t),"undefined"!=typeof t.style.zoom&&(t.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:1px;width:1px;zoom:1",t.appendChild(re.createElement("div")).style.width="5px",e=3!==t.offsetWidth),n.removeChild(r),e):void 0}}();var Fe=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,Me=new RegExp("^(?:([+-])=|)("+Fe+")([a-z%]*)$","i"),Oe=["Top","Right","Bottom","Left"],Re=function(e,t){return e=t||e,"none"===pe.css(e,"display")||!pe.contains(e.ownerDocument,e)},Pe=function(e,t,n,r,i,o,a){var s=0,u=e.length,l=null==n;if("object"===pe.type(n)){i=!0;for(s in n)Pe(e,t,s,n[s],!0,o,a)}else if(void 0!==r&&(i=!0,pe.isFunction(r)||(a=!0),l&&(a?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(pe(e),n)})),t))for(;s<u;s++)t(e[s],n,a?r:r.call(e[s],s,t(e[s],n)));return i?e:l?t.call(e):u?t(e[0],n):o},Be=/^(?:checkbox|radio)$/i,We=/<([\w:-]+)/,Ie=/^$|\/(?:java|ecma)script/i,$e=/^\s+/,ze="abbr|article|aside|audio|bdi|canvas|data|datalist|details|dialog|figcaption|figure|footer|header|hgroup|main|mark|meter|nav|output|picture|progress|section|summary|template|time|video";!function(){var e=re.createElement("div"),t=re.createDocumentFragment(),n=re.createElement("input");e.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",fe.leadingWhitespace=3===e.firstChild.nodeType,fe.tbody=!e.getElementsByTagName("tbody").length,fe.htmlSerialize=!!e.getElementsByTagName("link").length,fe.html5Clone="<:nav></:nav>"!==re.createElement("nav").cloneNode(!0).outerHTML,n.type="checkbox",n.checked=!0,t.appendChild(n),fe.appendChecked=n.checked,e.innerHTML="<textarea>x</textarea>",fe.noCloneChecked=!!e.cloneNode(!0).lastChild.defaultValue,t.appendChild(e),n=re.createElement("input"),n.setAttribute("type","radio"),n.setAttribute("checked","checked"),n.setAttribute("name","t"),e.appendChild(n),fe.checkClone=e.cloneNode(!0).cloneNode(!0).lastChild.checked,fe.noCloneEvent=!!e.addEventListener,e[pe.expando]=1,fe.attributes=!e.getAttribute(pe.expando)}();var Xe={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:fe.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]};Xe.optgroup=Xe.option,Xe.tbody=Xe.tfoot=Xe.colgroup=Xe.caption=Xe.thead,Xe.th=Xe.td;var Ue=/<|&#?\w+;/,Ve=/<tbody/i;!function(){var t,n,r=re.createElement("div");for(t in{submit:!0,change:!0,focusin:!0})n="on"+t,(fe[t]=n in e)||(r.setAttribute(n,"t"),fe[t]=r.attributes[n].expando===!1);r=null}();var Ye=/^(?:input|select|textarea)$/i,Je=/^key/,Ge=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,Ke=/^(?:focusinfocus|focusoutblur)$/,Qe=/^([^.]*)(?:\.(.+)|)/;pe.event={global:{},add:function(e,t,n,r,i){var o,a,s,u,l,c,f,d,p,h,g,m=pe._data(e);if(m){for(n.handler&&(u=n,n=u.handler,i=u.selector),n.guid||(n.guid=pe.guid++),(a=m.events)||(a=m.events={}),(c=m.handle)||(c=m.handle=function(e){return"undefined"==typeof pe||e&&pe.event.triggered===e.type?void 0:pe.event.dispatch.apply(c.elem,arguments)},c.elem=e),t=(t||"").match(De)||[""],s=t.length;s--;)o=Qe.exec(t[s])||[],p=g=o[1],h=(o[2]||"").split(".").sort(),p&&(l=pe.event.special[p]||{},p=(i?l.delegateType:l.bindType)||p,l=pe.event.special[p]||{},f=pe.extend({type:p,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&pe.expr.match.needsContext.test(i),namespace:h.join(".")},u),(d=a[p])||(d=a[p]=[],d.delegateCount=0,l.setup&&l.setup.call(e,r,h,c)!==!1||(e.addEventListener?e.addEventListener(p,c,!1):e.attachEvent&&e.attachEvent("on"+p,c))),l.add&&(l.add.call(e,f),f.handler.guid||(f.handler.guid=n.guid)),i?d.splice(d.delegateCount++,0,f):d.push(f),pe.event.global[p]=!0);e=null}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,d,p,h,g,m=pe.hasData(e)&&pe._data(e);if(m&&(c=m.events)){for(t=(t||"").match(De)||[""],l=t.length;l--;)if(s=Qe.exec(t[l])||[],p=g=s[1],h=(s[2]||"").split(".").sort(),p){for(f=pe.event.special[p]||{},p=(r?f.delegateType:f.bindType)||p,d=c[p]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),u=o=d.length;o--;)a=d[o],!i&&g!==a.origType||n&&n.guid!==a.guid||s&&!s.test(a.namespace)||r&&r!==a.selector&&("**"!==r||!a.selector)||(d.splice(o,1),a.selector&&d.delegateCount--,f.remove&&f.remove.call(e,a));u&&!d.length&&(f.teardown&&f.teardown.call(e,h,m.handle)!==!1||pe.removeEvent(e,p,m.handle),delete c[p])}else for(p in c)pe.event.remove(e,p+t[l],n,r,!0);pe.isEmptyObject(c)&&(delete m.handle,pe._removeData(e,"events"))}},trigger:function(t,n,r,i){var o,a,s,u,l,c,f,d=[r||re],p=ce.call(t,"type")?t.type:t,h=ce.call(t,"namespace")?t.namespace.split("."):[];if(s=c=r=r||re,3!==r.nodeType&&8!==r.nodeType&&!Ke.test(p+pe.event.triggered)&&(p.indexOf(".")>-1&&(h=p.split("."),p=h.shift(),h.sort()),a=p.indexOf(":")<0&&"on"+p,t=t[pe.expando]?t:new pe.Event(p,"object"==typeof t&&t),t.isTrigger=i?2:3,t.namespace=h.join("."),t.rnamespace=t.namespace?new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,t.result=void 0,t.target||(t.target=r),n=null==n?[t]:pe.makeArray(n,[t]),l=pe.event.special[p]||{},i||!l.trigger||l.trigger.apply(r,n)!==!1)){if(!i&&!l.noBubble&&!pe.isWindow(r)){for(u=l.delegateType||p,Ke.test(u+p)||(s=s.parentNode);s;s=s.parentNode)d.push(s),c=s;c===(r.ownerDocument||re)&&d.push(c.defaultView||c.parentWindow||e)}for(f=0;(s=d[f++])&&!t.isPropagationStopped();)t.type=f>1?u:l.bindType||p,o=(pe._data(s,"events")||{})[t.type]&&pe._data(s,"handle"),o&&o.apply(s,n),o=a&&s[a],o&&o.apply&&He(s)&&(t.result=o.apply(s,n),t.result===!1&&t.preventDefault());if(t.type=p,!i&&!t.isDefaultPrevented()&&(!l._default||l._default.apply(d.pop(),n)===!1)&&He(r)&&a&&r[p]&&!pe.isWindow(r)){c=r[a],c&&(r[a]=null),pe.event.triggered=p;try{r[p]()}catch(g){}pe.event.triggered=void 0,c&&(r[a]=c)}return t.result}},dispatch:function(e){e=pe.event.fix(e);var t,n,r,i,o,a=[],s=ie.call(arguments),u=(pe._data(this,"events")||{})[e.type]||[],l=pe.event.special[e.type]||{};if(s[0]=e,e.delegateTarget=this,!l.preDispatch||l.preDispatch.call(this,e)!==!1){for(a=pe.event.handlers.call(this,e,u),t=0;(i=a[t++])&&!e.isPropagationStopped();)for(e.currentTarget=i.elem,n=0;(o=i.handlers[n++])&&!e.isImmediatePropagationStopped();)e.rnamespace&&!e.rnamespace.test(o.namespace)||(e.handleObj=o,e.data=o.data,r=((pe.event.special[o.origType]||{}).handle||o.handler).apply(i.elem,s),void 0!==r&&(e.result=r)===!1&&(e.preventDefault(),e.stopPropagation()));return l.postDispatch&&l.postDispatch.call(this,e),e.result}},handlers:function(e,t){var n,r,i,o,a=[],s=t.delegateCount,u=e.target;if(s&&u.nodeType&&("click"!==e.type||isNaN(e.button)||e.button<1))for(;u!=this;u=u.parentNode||this)if(1===u.nodeType&&(u.disabled!==!0||"click"!==e.type)){for(r=[],n=0;n<s;n++)o=t[n],i=o.selector+" ",void 0===r[i]&&(r[i]=o.needsContext?pe(i,this).index(u)>-1:pe.find(i,this,null,[u]).length),r[i]&&r.push(o);r.length&&a.push({elem:u,handlers:r})}return s<t.length&&a.push({elem:this,handlers:t.slice(s)}),a},fix:function(e){if(e[pe.expando])return e;var t,n,r,i=e.type,o=e,a=this.fixHooks[i];for(a||(this.fixHooks[i]=a=Ge.test(i)?this.mouseHooks:Je.test(i)?this.keyHooks:{}),r=a.props?this.props.concat(a.props):this.props,e=new pe.Event(o),t=r.length;t--;)n=r[t],e[n]=o[n];return e.target||(e.target=o.srcElement||re),3===e.target.nodeType&&(e.target=e.target.parentNode),e.metaKey=!!e.metaKey,a.filter?a.filter(e,o):e},props:"altKey bubbles cancelable ctrlKey currentTarget detail.html eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return null==e.which&&(e.which=null!=t.charCode?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,t){var n,r,i,o=t.button,a=t.fromElement;return null==e.pageX&&null!=t.clientX&&(r=e.target.ownerDocument||re,i=r.documentElement,n=r.body,e.pageX=t.clientX+(i&&i.scrollLeft||n&&n.scrollLeft||0)-(i&&i.clientLeft||n&&n.clientLeft||0),e.pageY=t.clientY+(i&&i.scrollTop||n&&n.scrollTop||0)-(i&&i.clientTop||n&&n.clientTop||0)),!e.relatedTarget&&a&&(e.relatedTarget=a===e.target?t.toElement:a),e.which||void 0===o||(e.which=1&o?1:2&o?3:4&o?2:0),e}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==b()&&this.focus)try{return this.focus(),!1}catch(e){}},delegateType:"focusin"},blur:{trigger:function(){if(this===b()&&this.blur)return this.blur(),!1},delegateType:"focusout"},click:{trigger:function(){if(pe.nodeName(this,"input")&&"checkbox"===this.type&&this.click)return this.click(),!1},_default:function(e){return pe.nodeName(e.target,"a")}},beforeunload:{postDispatch:function(e){void 0!==e.result&&e.originalEvent&&(e.originalEvent.returnValue=e.result)}}},simulate:function(e,t,n){var r=pe.extend(new pe.Event,n,{type:e,isSimulated:!0});pe.event.trigger(r,null,t),r.isDefaultPrevented()&&n.preventDefault()}},pe.removeEvent=re.removeEventListener?function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n)}:function(e,t,n){var r="on"+t;e.detachEvent&&("undefined"==typeof e[r]&&(e[r]=null),e.detachEvent(r,n))},pe.Event=function(e,t){return this instanceof pe.Event?(e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||void 0===e.defaultPrevented&&e.returnValue===!1?v:x):this.type=e,t&&pe.extend(this,t),this.timeStamp=e&&e.timeStamp||pe.now(),void(this[pe.expando]=!0)):new pe.Event(e,t)},pe.Event.prototype={constructor:pe.Event,isDefaultPrevented:x,isPropagationStopped:x,isImmediatePropagationStopped:x,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=v,e&&(e.preventDefault?e.preventDefault():e.returnValue=!1)},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=v,e&&!this.isSimulated&&(e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0)},stopImmediatePropagation:function(){var e=this.originalEvent;this.isImmediatePropagationStopped=v,e&&e.stopImmediatePropagation&&e.stopImmediatePropagation(),this.stopPropagation()}},pe.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(e,t){pe.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,o=e.handleObj;return i&&(i===r||pe.contains(r,i))||(e.type=o.origType,n=o.handler.apply(this,arguments),e.type=t),n}}}),fe.submit||(pe.event.special.submit={setup:function(){return!pe.nodeName(this,"form")&&void pe.event.add(this,"click._submit keypress._submit",function(e){var t=e.target,n=pe.nodeName(t,"input")||pe.nodeName(t,"button")?pe.prop(t,"form"):void 0;n&&!pe._data(n,"submit")&&(pe.event.add(n,"submit._submit",function(e){e._submitBubble=!0}),pe._data(n,"submit",!0))})},postDispatch:function(e){e._submitBubble&&(delete e._submitBubble,this.parentNode&&!e.isTrigger&&pe.event.simulate("submit",this.parentNode,e))},teardown:function(){return!pe.nodeName(this,"form")&&void pe.event.remove(this,"._submit")}}),fe.change||(pe.event.special.change={setup:function(){return Ye.test(this.nodeName)?("checkbox"!==this.type&&"radio"!==this.type||(pe.event.add(this,"propertychange._change",function(e){"checked"===e.originalEvent.propertyName&&(this._justChanged=!0)}),pe.event.add(this,"click._change",function(e){this._justChanged&&!e.isTrigger&&(this._justChanged=!1),pe.event.simulate("change",this,e)})),!1):void pe.event.add(this,"beforeactivate._change",function(e){var t=e.target;Ye.test(t.nodeName)&&!pe._data(t,"change")&&(pe.event.add(t,"change._change",function(e){!this.parentNode||e.isSimulated||e.isTrigger||pe.event.simulate("change",this.parentNode,e)}),pe._data(t,"change",!0))})},handle:function(e){var t=e.target;if(this!==t||e.isSimulated||e.isTrigger||"radio"!==t.type&&"checkbox"!==t.type)return e.handleObj.handler.apply(this,arguments)},teardown:function(){return pe.event.remove(this,"._change"),!Ye.test(this.nodeName)}}),fe.focusin||pe.each({focus:"focusin",blur:"focusout"},function(e,t){var n=function(e){pe.event.simulate(t,e.target,pe.event.fix(e))};pe.event.special[t]={setup:function(){var r=this.ownerDocument||this,i=pe._data(r,t);i||r.addEventListener(e,n,!0),pe._data(r,t,(i||0)+1)},teardown:function(){var r=this.ownerDocument||this,i=pe._data(r,t)-1;i?pe._data(r,t,i):(r.removeEventListener(e,n,!0),pe._removeData(r,t))}}}),pe.fn.extend({on:function(e,t,n,r){return w(this,e,t,n,r)},one:function(e,t,n,r){return w(this,e,t,n,r,1)},off:function(e,t,n){var r,i;if(e&&e.preventDefault&&e.handleObj)return r=e.handleObj,pe(e.delegateTarget).off(r.namespace?r.origType+"."+r.namespace:r.origType,r.selector,r.handler),this;if("object"==typeof e){for(i in e)this.off(i,t,e[i]);return this}return t!==!1&&"function"!=typeof t||(n=t,t=void 0),n===!1&&(n=x),this.each(function(){pe.event.remove(this,e,n,t)})},trigger:function(e,t){return this.each(function(){pe.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];if(n)return pe.event.trigger(e,t,n,!0)}});var Ze=/ jQuery\d+="(?:null|\d+)"/g,et=new RegExp("<(?:"+ze+")[\\s/>]","i"),tt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi,nt=/<script|<style|<link/i,rt=/checked\s*(?:[^=]|=\s*.checked.)/i,it=/^true\/(.*)/,ot=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,at=p(re),st=at.appendChild(re.createElement("div"));pe.extend({htmlPrefilter:function(e){return e.replace(tt,"<$1></$2>")},clone:function(e,t,n){var r,i,o,a,s,u=pe.contains(e.ownerDocument,e);if(fe.html5Clone||pe.isXMLDoc(e)||!et.test("<"+e.nodeName+">")?o=e.cloneNode(!0):(st.innerHTML=e.outerHTML,st.removeChild(o=st.firstChild)),!(fe.noCloneEvent&&fe.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||pe.isXMLDoc(e)))for(r=h(o),s=h(e),a=0;null!=(i=s[a]);++a)r[a]&&k(i,r[a]);if(t)if(n)for(s=s||h(e),r=r||h(o),a=0;null!=(i=s[a]);a++)N(i,r[a]);else N(e,o);return r=h(o,"script"),r.length>0&&g(r,!u&&h(e,"script")),r=s=i=null,o},cleanData:function(e,t){for(var n,r,i,o,a=0,s=pe.expando,u=pe.cache,l=fe.attributes,c=pe.event.special;null!=(n=e[a]);a++)if((t||He(n))&&(i=n[s],o=i&&u[i])){if(o.events)for(r in o.events)c[r]?pe.event.remove(n,r):pe.removeEvent(n,r,o.handle);u[i]&&(delete u[i],l||"undefined"==typeof n.removeAttribute?n[s]=void 0:n.removeAttribute(s),ne.push(i))}}}),pe.fn.extend({domManip:S,detach:function(e){return A(this,e,!0)},remove:function(e){return A(this,e)},text:function(e){return Pe(this,function(e){return void 0===e?pe.text(this):this.empty().append((this[0]&&this[0].ownerDocument||re).createTextNode(e))},null,e,arguments.length)},append:function(){return S(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=T(this,e);t.appendChild(e)}})},prepend:function(){return S(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=T(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return S(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return S(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},empty:function(){for(var e,t=0;null!=(e=this[t]);t++){for(1===e.nodeType&&pe.cleanData(h(e,!1));e.firstChild;)e.removeChild(e.firstChild);e.options&&pe.nodeName(e,"select")&&(e.options.length=0)}return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map(function(){return pe.clone(this,e,t)})},html:function(e){return Pe(this,function(e){var t=this[0]||{},n=0,r=this.length;if(void 0===e)return 1===t.nodeType?t.innerHTML.replace(Ze,""):void 0;if("string"==typeof e&&!nt.test(e)&&(fe.htmlSerialize||!et.test(e))&&(fe.leadingWhitespace||!$e.test(e))&&!Xe[(We.exec(e)||["",""])[1].toLowerCase()]){e=pe.htmlPrefilter(e);try{for(;n<r;n++)t=this[n]||{},1===t.nodeType&&(pe.cleanData(h(t,!1)),t.innerHTML=e);t=0}catch(i){}}t&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var e=[];return S(this,arguments,function(t){var n=this.parentNode;pe.inArray(this,e)<0&&(pe.cleanData(h(this)),
+n&&n.replaceChild(t,this))},e)}}),pe.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){pe.fn[e]=function(e){for(var n,r=0,i=[],o=pe(e),a=o.length-1;r<=a;r++)n=r===a?this:this.clone(!0),pe(o[r])[t](n),ae.apply(i,n.get());return this.pushStack(i)}});var ut,lt={HTML:"block",BODY:"block"},ct=/^margin/,ft=new RegExp("^("+Fe+")(?!px)[a-z%]+$","i"),dt=function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];i=n.apply(e,r||[]);for(o in t)e.style[o]=a[o];return i},pt=re.documentElement;!function(){function t(){var t,c,f=re.documentElement;f.appendChild(u),l.style.cssText="-webkit-box-sizing:border-box;box-sizing:border-box;position:relative;display:block;margin:auto;border:1px;padding:1px;top:1%;width:50%",n=i=s=!1,r=a=!0,e.getComputedStyle&&(c=e.getComputedStyle(l),n="1%"!==(c||{}).top,s="2px"===(c||{}).marginLeft,i="4px"===(c||{width:"4px"}).width,l.style.marginRight="50%",r="4px"===(c||{marginRight:"4px"}).marginRight,t=l.appendChild(re.createElement("div")),t.style.cssText=l.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:0",t.style.marginRight=t.style.width="0",l.style.width="1px",a=!parseFloat((e.getComputedStyle(t)||{}).marginRight),l.removeChild(t)),l.style.display="none",o=0===l.getClientRects().length,o&&(l.style.display="",l.innerHTML="<table><tr><td></td><td>t</td></tr></table>",t=l.getElementsByTagName("td"),t[0].style.cssText="margin:0;border:0;padding:0;display:none",o=0===t[0].offsetHeight,o&&(t[0].style.display="",t[1].style.display="none",o=0===t[0].offsetHeight)),f.removeChild(u)}var n,r,i,o,a,s,u=re.createElement("div"),l=re.createElement("div");l.style&&(l.style.cssText="float:left;opacity:.5",fe.opacity="0.5"===l.style.opacity,fe.cssFloat=!!l.style.cssFloat,l.style.backgroundClip="content-box",l.cloneNode(!0).style.backgroundClip="",fe.clearCloneStyle="content-box"===l.style.backgroundClip,u=re.createElement("div"),u.style.cssText="border:0;width:8px;height:0;top:0;left:-9999px;padding:0;margin-top:1px;position:absolute",l.innerHTML="",u.appendChild(l),fe.boxSizing=""===l.style.boxSizing||""===l.style.MozBoxSizing||""===l.style.WebkitBoxSizing,pe.extend(fe,{reliableHiddenOffsets:function(){return null==n&&t(),o},boxSizingReliable:function(){return null==n&&t(),i},pixelMarginRight:function(){return null==n&&t(),r},pixelPosition:function(){return null==n&&t(),n},reliableMarginRight:function(){return null==n&&t(),a},reliableMarginLeft:function(){return null==n&&t(),s}}))}();var ht,gt,mt=/^(top|right|bottom|left)$/;e.getComputedStyle?(ht=function(t){var n=t.ownerDocument.defaultView;return n&&n.opener||(n=e),n.getComputedStyle(t)},gt=function(e,t,n){var r,i,o,a,s=e.style;return n=n||ht(e),a=n?n.getPropertyValue(t)||n[t]:void 0,""!==a&&void 0!==a||pe.contains(e.ownerDocument,e)||(a=pe.style(e,t)),n&&!fe.pixelMarginRight()&&ft.test(a)&&ct.test(t)&&(r=s.width,i=s.minWidth,o=s.maxWidth,s.minWidth=s.maxWidth=s.width=a,a=n.width,s.width=r,s.minWidth=i,s.maxWidth=o),void 0===a?a:a+""}):pt.currentStyle&&(ht=function(e){return e.currentStyle},gt=function(e,t,n){var r,i,o,a,s=e.style;return n=n||ht(e),a=n?n[t]:void 0,null==a&&s&&s[t]&&(a=s[t]),ft.test(a)&&!mt.test(t)&&(r=s.left,i=e.runtimeStyle,o=i&&i.left,o&&(i.left=e.currentStyle.left),s.left="fontSize"===t?"1em":a,a=s.pixelLeft+"px",s.left=r,o&&(i.left=o)),void 0===a?a:a+""||"auto"});var yt=/alpha\([^)]*\)/i,vt=/opacity\s*=\s*([^)]*)/i,xt=/^(none|table(?!-c[ea]).+)/,bt=new RegExp("^("+Fe+")(.*)$","i"),wt={position:"absolute",visibility:"hidden",display:"block"},Tt={letterSpacing:"0",fontWeight:"400"},Ct=["Webkit","O","Moz","ms"],Et=re.createElement("div").style;pe.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=gt(e,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":fe.cssFloat?"cssFloat":"styleFloat"},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,a,s=pe.camelCase(t),u=e.style;if(t=pe.cssProps[s]||(pe.cssProps[s]=H(s)||s),a=pe.cssHooks[t]||pe.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(e,!1,r))?i:u[t];if(o=typeof n,"string"===o&&(i=Me.exec(n))&&i[1]&&(n=d(e,t,i),o="number"),null!=n&&n===n&&("number"===o&&(n+=i&&i[3]||(pe.cssNumber[s]?"":"px")),fe.clearCloneStyle||""!==n||0!==t.indexOf("background")||(u[t]="inherit"),!(a&&"set"in a&&void 0===(n=a.set(e,n,r)))))try{u[t]=n}catch(l){}}},css:function(e,t,n,r){var i,o,a,s=pe.camelCase(t);return t=pe.cssProps[s]||(pe.cssProps[s]=H(s)||s),a=pe.cssHooks[t]||pe.cssHooks[s],a&&"get"in a&&(o=a.get(e,!0,n)),void 0===o&&(o=gt(e,t,r)),"normal"===o&&t in Tt&&(o=Tt[t]),""===n||n?(i=parseFloat(o),n===!0||isFinite(i)?i||0:o):o}}),pe.each(["height","width"],function(e,t){pe.cssHooks[t]={get:function(e,n,r){if(n)return xt.test(pe.css(e,"display"))&&0===e.offsetWidth?dt(e,wt,function(){return M(e,t,r)}):M(e,t,r)},set:function(e,n,r){var i=r&&ht(e);return _(e,n,r?F(e,t,r,fe.boxSizing&&"border-box"===pe.css(e,"boxSizing",!1,i),i):0)}}}),fe.opacity||(pe.cssHooks.opacity={get:function(e,t){return vt.test((t&&e.currentStyle?e.currentStyle.filter:e.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":t?"1":""},set:function(e,t){var n=e.style,r=e.currentStyle,i=pe.isNumeric(t)?"alpha(opacity="+100*t+")":"",o=r&&r.filter||n.filter||"";n.zoom=1,(t>=1||""===t)&&""===pe.trim(o.replace(yt,""))&&n.removeAttribute&&(n.removeAttribute("filter"),""===t||r&&!r.filter)||(n.filter=yt.test(o)?o.replace(yt,i):o+" "+i)}}),pe.cssHooks.marginRight=L(fe.reliableMarginRight,function(e,t){if(t)return dt(e,{display:"inline-block"},gt,[e,"marginRight"])}),pe.cssHooks.marginLeft=L(fe.reliableMarginLeft,function(e,t){if(t)return(parseFloat(gt(e,"marginLeft"))||(pe.contains(e.ownerDocument,e)?e.getBoundingClientRect().left-dt(e,{marginLeft:0},function(){return e.getBoundingClientRect().left}):0))+"px"}),pe.each({margin:"",padding:"",border:"Width"},function(e,t){pe.cssHooks[e+t]={expand:function(n){for(var r=0,i={},o="string"==typeof n?n.split(" "):[n];r<4;r++)i[e+Oe[r]+t]=o[r]||o[r-2]||o[0];return i}},ct.test(e)||(pe.cssHooks[e+t].set=_)}),pe.fn.extend({css:function(e,t){return Pe(this,function(e,t,n){var r,i,o={},a=0;if(pe.isArray(t)){for(r=ht(e),i=t.length;a<i;a++)o[t[a]]=pe.css(e,t[a],!1,r);return o}return void 0!==n?pe.style(e,t,n):pe.css(e,t)},e,t,arguments.length>1)},show:function(){return q(this,!0)},hide:function(){return q(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){Re(this)?pe(this).show():pe(this).hide()})}}),pe.Tween=O,O.prototype={constructor:O,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||pe.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(pe.cssNumber[n]?"":"px")},cur:function(){var e=O.propHooks[this.prop];return e&&e.get?e.get(this):O.propHooks._default.get(this)},run:function(e){var t,n=O.propHooks[this.prop];return this.options.duration?this.pos=t=pe.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):O.propHooks._default.set(this),this}},O.prototype.init.prototype=O.prototype,O.propHooks={_default:{get:function(e){var t;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(t=pe.css(e.elem,e.prop,""),t&&"auto"!==t?t:0)},set:function(e){pe.fx.step[e.prop]?pe.fx.step[e.prop](e):1!==e.elem.nodeType||null==e.elem.style[pe.cssProps[e.prop]]&&!pe.cssHooks[e.prop]?e.elem[e.prop]=e.now:pe.style(e.elem,e.prop,e.now+e.unit)}}},O.propHooks.scrollTop=O.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},pe.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},pe.fx=O.prototype.init,pe.fx.step={};var Nt,kt,St=/^(?:toggle|show|hide)$/,At=/queueHooks$/;pe.Animation=pe.extend($,{tweeners:{"*":[function(e,t){var n=this.createTween(e,t);return d(n.elem,e,Me.exec(t),n),n}]},tweener:function(e,t){pe.isFunction(e)?(t=e,e=["*"]):e=e.match(De);for(var n,r=0,i=e.length;r<i;r++)n=e[r],$.tweeners[n]=$.tweeners[n]||[],$.tweeners[n].unshift(t)},prefilters:[W],prefilter:function(e,t){t?$.prefilters.unshift(e):$.prefilters.push(e)}}),pe.speed=function(e,t,n){var r=e&&"object"==typeof e?pe.extend({},e):{complete:n||!n&&t||pe.isFunction(e)&&e,duration:e,easing:n&&t||t&&!pe.isFunction(t)&&t};return r.duration=pe.fx.off?0:"number"==typeof r.duration?r.duration:r.duration in pe.fx.speeds?pe.fx.speeds[r.duration]:pe.fx.speeds._default,null!=r.queue&&r.queue!==!0||(r.queue="fx"),r.old=r.complete,r.complete=function(){pe.isFunction(r.old)&&r.old.call(this),r.queue&&pe.dequeue(this,r.queue)},r},pe.fn.extend({fadeTo:function(e,t,n,r){return this.filter(Re).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(e,t,n,r){var i=pe.isEmptyObject(e),o=pe.speed(t,n,r),a=function(){var t=$(this,pe.extend({},e),o);(i||pe._data(this,"finish"))&&t.stop(!0)};return a.finish=a,i||o.queue===!1?this.each(a):this.queue(o.queue,a)},stop:function(e,t,n){var r=function(e){var t=e.stop;delete e.stop,t(n)};return"string"!=typeof e&&(n=t,t=e,e=void 0),t&&e!==!1&&this.queue(e||"fx",[]),this.each(function(){var t=!0,i=null!=e&&e+"queueHooks",o=pe.timers,a=pe._data(this);if(i)a[i]&&a[i].stop&&r(a[i]);else for(i in a)a[i]&&a[i].stop&&At.test(i)&&r(a[i]);for(i=o.length;i--;)o[i].elem!==this||null!=e&&o[i].queue!==e||(o[i].anim.stop(n),t=!1,o.splice(i,1));!t&&n||pe.dequeue(this,e)})},finish:function(e){return e!==!1&&(e=e||"fx"),this.each(function(){var t,n=pe._data(this),r=n[e+"queue"],i=n[e+"queueHooks"],o=pe.timers,a=r?r.length:0;for(n.finish=!0,pe.queue(this,e,[]),i&&i.stop&&i.stop.call(this,!0),t=o.length;t--;)o[t].elem===this&&o[t].queue===e&&(o[t].anim.stop(!0),o.splice(t,1));for(t=0;t<a;t++)r[t]&&r[t].finish&&r[t].finish.call(this);delete n.finish})}}),pe.each(["toggle","show","hide"],function(e,t){var n=pe.fn[t];pe.fn[t]=function(e,r,i){return null==e||"boolean"==typeof e?n.apply(this,arguments):this.animate(P(t,!0),e,r,i)}}),pe.each({slideDown:P("show"),slideUp:P("hide"),slideToggle:P("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,t){pe.fn[e]=function(e,n,r){return this.animate(t,e,n,r)}}),pe.timers=[],pe.fx.tick=function(){var e,t=pe.timers,n=0;for(Nt=pe.now();n<t.length;n++)e=t[n],e()||t[n]!==e||t.splice(n--,1);t.length||pe.fx.stop(),Nt=void 0},pe.fx.timer=function(e){pe.timers.push(e),e()?pe.fx.start():pe.timers.pop()},pe.fx.interval=13,pe.fx.start=function(){kt||(kt=e.setInterval(pe.fx.tick,pe.fx.interval))},pe.fx.stop=function(){e.clearInterval(kt),kt=null},pe.fx.speeds={slow:600,fast:200,_default:400},pe.fn.delay=function(t,n){return t=pe.fx?pe.fx.speeds[t]||t:t,n=n||"fx",this.queue(n,function(n,r){var i=e.setTimeout(n,t);r.stop=function(){e.clearTimeout(i)}})},function(){var e,t=re.createElement("input"),n=re.createElement("div"),r=re.createElement("select"),i=r.appendChild(re.createElement("option"));n=re.createElement("div"),n.setAttribute("className","t"),n.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",e=n.getElementsByTagName("a")[0],t.setAttribute("type","checkbox"),n.appendChild(t),e=n.getElementsByTagName("a")[0],e.style.cssText="top:1px",fe.getSetAttribute="t"!==n.className,fe.style=/top/.test(e.getAttribute("style")),fe.hrefNormalized="/a"===e.getAttribute("href"),fe.checkOn=!!t.value,fe.optSelected=i.selected,fe.enctype=!!re.createElement("form").enctype,r.disabled=!0,fe.optDisabled=!i.disabled,t=re.createElement("input"),t.setAttribute("value",""),fe.input=""===t.getAttribute("value"),t.value="t",t.setAttribute("type","radio"),fe.radioValue="t"===t.value}();var Dt=/\r/g,jt=/[\x20\t\r\n\f]+/g;pe.fn.extend({val:function(e){var t,n,r,i=this[0];{if(arguments.length)return r=pe.isFunction(e),this.each(function(n){var i;1===this.nodeType&&(i=r?e.call(this,n,pe(this).val()):e,null==i?i="":"number"==typeof i?i+="":pe.isArray(i)&&(i=pe.map(i,function(e){return null==e?"":e+""})),t=pe.valHooks[this.type]||pe.valHooks[this.nodeName.toLowerCase()],t&&"set"in t&&void 0!==t.set(this,i,"value")||(this.value=i))});if(i)return t=pe.valHooks[i.type]||pe.valHooks[i.nodeName.toLowerCase()],t&&"get"in t&&void 0!==(n=t.get(i,"value"))?n:(n=i.value,"string"==typeof n?n.replace(Dt,""):null==n?"":n)}}}),pe.extend({valHooks:{option:{get:function(e){var t=pe.find.attr(e,"value");return null!=t?t:pe.trim(pe.text(e)).replace(jt," ")}},select:{get:function(e){for(var t,n,r=e.options,i=e.selectedIndex,o="select-one"===e.type||i<0,a=o?null:[],s=o?i+1:r.length,u=i<0?s:o?i:0;u<s;u++)if(n=r[u],(n.selected||u===i)&&(fe.optDisabled?!n.disabled:null===n.getAttribute("disabled"))&&(!n.parentNode.disabled||!pe.nodeName(n.parentNode,"optgroup"))){if(t=pe(n).val(),o)return t;a.push(t)}return a},set:function(e,t){for(var n,r,i=e.options,o=pe.makeArray(t),a=i.length;a--;)if(r=i[a],pe.inArray(pe.valHooks.option.get(r),o)>-1)try{r.selected=n=!0}catch(s){r.scrollHeight}else r.selected=!1;return n||(e.selectedIndex=-1),i}}}}),pe.each(["radio","checkbox"],function(){pe.valHooks[this]={set:function(e,t){if(pe.isArray(t))return e.checked=pe.inArray(pe(e).val(),t)>-1}},fe.checkOn||(pe.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})});var Lt,Ht,qt=pe.expr.attrHandle,_t=/^(?:checked|selected)$/i,Ft=fe.getSetAttribute,Mt=fe.input;pe.fn.extend({attr:function(e,t){return Pe(this,pe.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){pe.removeAttr(this,e)})}}),pe.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return"undefined"==typeof e.getAttribute?pe.prop(e,t,n):(1===o&&pe.isXMLDoc(e)||(t=t.toLowerCase(),i=pe.attrHooks[t]||(pe.expr.match.bool.test(t)?Ht:Lt)),void 0!==n?null===n?void pe.removeAttr(e,t):i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:(e.setAttribute(t,n+""),n):i&&"get"in i&&null!==(r=i.get(e,t))?r:(r=pe.find.attr(e,t),null==r?void 0:r))},attrHooks:{type:{set:function(e,t){if(!fe.radioValue&&"radio"===t&&pe.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,r,i=0,o=t&&t.match(De);if(o&&1===e.nodeType)for(;n=o[i++];)r=pe.propFix[n]||n,pe.expr.match.bool.test(n)?Mt&&Ft||!_t.test(n)?e[r]=!1:e[pe.camelCase("default-"+n)]=e[r]=!1:pe.attr(e,n,""),e.removeAttribute(Ft?n:r)}}),Ht={set:function(e,t,n){return t===!1?pe.removeAttr(e,n):Mt&&Ft||!_t.test(n)?e.setAttribute(!Ft&&pe.propFix[n]||n,n):e[pe.camelCase("default-"+n)]=e[n]=!0,n}},pe.each(pe.expr.match.bool.source.match(/\w+/g),function(e,t){var n=qt[t]||pe.find.attr;Mt&&Ft||!_t.test(t)?qt[t]=function(e,t,r){var i,o;return r||(o=qt[t],qt[t]=i,i=null!=n(e,t,r)?t.toLowerCase():null,qt[t]=o),i}:qt[t]=function(e,t,n){if(!n)return e[pe.camelCase("default-"+t)]?t.toLowerCase():null}}),Mt&&Ft||(pe.attrHooks.value={set:function(e,t,n){return pe.nodeName(e,"input")?void(e.defaultValue=t):Lt&&Lt.set(e,t,n)}}),Ft||(Lt={set:function(e,t,n){var r=e.getAttributeNode(n);if(r||e.setAttributeNode(r=e.ownerDocument.createAttribute(n)),r.value=t+="","value"===n||t===e.getAttribute(n))return t}},qt.id=qt.name=qt.coords=function(e,t,n){var r;if(!n)return(r=e.getAttributeNode(t))&&""!==r.value?r.value:null},pe.valHooks.button={get:function(e,t){var n=e.getAttributeNode(t);if(n&&n.specified)return n.value},set:Lt.set},pe.attrHooks.contenteditable={set:function(e,t,n){Lt.set(e,""!==t&&t,n)}},pe.each(["width","height"],function(e,t){pe.attrHooks[t]={set:function(e,n){if(""===n)return e.setAttribute(t,"auto"),n}}})),fe.style||(pe.attrHooks.style={get:function(e){return e.style.cssText||void 0},set:function(e,t){return e.style.cssText=t+""}});var Ot=/^(?:input|select|textarea|button|object)$/i,Rt=/^(?:a|area)$/i;pe.fn.extend({prop:function(e,t){return Pe(this,pe.prop,e,t,arguments.length>1)},removeProp:function(e){return e=pe.propFix[e]||e,this.each(function(){try{this[e]=void 0,delete this[e]}catch(t){}})}}),pe.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&pe.isXMLDoc(e)||(t=pe.propFix[t]||t,i=pe.propHooks[t]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=pe.find.attr(e,"tabindex");return t?parseInt(t,10):Ot.test(e.nodeName)||Rt.test(e.nodeName)&&e.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),fe.hrefNormalized||pe.each(["href","src"],function(e,t){pe.propHooks[t]={get:function(e){return e.getAttribute(t,4)}}}),fe.optSelected||(pe.propHooks.selected={get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),pe.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){pe.propFix[this.toLowerCase()]=this}),fe.enctype||(pe.propFix.enctype="encoding");var Pt=/[\t\r\n\f]/g;pe.fn.extend({addClass:function(e){var t,n,r,i,o,a,s,u=0;if(pe.isFunction(e))return this.each(function(t){pe(this).addClass(e.call(this,t,z(this)))});if("string"==typeof e&&e)for(t=e.match(De)||[];n=this[u++];)if(i=z(n),r=1===n.nodeType&&(" "+i+" ").replace(Pt," ")){for(a=0;o=t[a++];)r.indexOf(" "+o+" ")<0&&(r+=o+" ");s=pe.trim(r),i!==s&&pe.attr(n,"class",s)}return this},removeClass:function(e){var t,n,r,i,o,a,s,u=0;if(pe.isFunction(e))return this.each(function(t){pe(this).removeClass(e.call(this,t,z(this)))});if(!arguments.length)return this.attr("class","");if("string"==typeof e&&e)for(t=e.match(De)||[];n=this[u++];)if(i=z(n),r=1===n.nodeType&&(" "+i+" ").replace(Pt," ")){for(a=0;o=t[a++];)for(;r.indexOf(" "+o+" ")>-1;)r=r.replace(" "+o+" "," ");s=pe.trim(r),i!==s&&pe.attr(n,"class",s)}return this},toggleClass:function(e,t){var n=typeof e;return"boolean"==typeof t&&"string"===n?t?this.addClass(e):this.removeClass(e):pe.isFunction(e)?this.each(function(n){pe(this).toggleClass(e.call(this,n,z(this),t),t)}):this.each(function(){var t,r,i,o;if("string"===n)for(r=0,i=pe(this),o=e.match(De)||[];t=o[r++];)i.hasClass(t)?i.removeClass(t):i.addClass(t);else void 0!==e&&"boolean"!==n||(t=z(this),t&&pe._data(this,"__className__",t),pe.attr(this,"class",t||e===!1?"":pe._data(this,"__className__")||""))})},hasClass:function(e){var t,n,r=0;for(t=" "+e+" ";n=this[r++];)if(1===n.nodeType&&(" "+z(n)+" ").replace(Pt," ").indexOf(t)>-1)return!0;return!1}}),pe.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(e,t){pe.fn[t]=function(e,n){return arguments.length>0?this.on(t,null,e,n):this.trigger(t)}}),pe.fn.extend({hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}});var Bt=e.location,Wt=pe.now(),It=/\?/,$t=/(,)|(\[|{)|(}|])|"(?:[^"\\\r\n]|\\["\\\/bfnrt]|\\u[\da-fA-F]{4})*"\s*:?|true|false|null|-?(?!0\d)\d+(?:\.\d+|)(?:[eE][+-]?\d+|)/g;pe.parseJSON=function(t){if(e.JSON&&e.JSON.parse)return e.JSON.parse(t+"");var n,r=null,i=pe.trim(t+"");return i&&!pe.trim(i.replace($t,function(e,t,i,o){return n&&t&&(r=0),0===r?e:(n=i||t,r+=!o-!i,"")}))?Function("return "+i)():pe.error("Invalid JSON: "+t)},pe.parseXML=function(t){var n,r;if(!t||"string"!=typeof t)return null;try{e.DOMParser?(r=new e.DOMParser,n=r.parseFromString(t,"text/xml")):(n=new e.ActiveXObject("Microsoft.XMLDOM"),n.async="false",n.loadXML(t))}catch(i){n=void 0}return n&&n.documentElement&&!n.getElementsByTagName("parsererror").length||pe.error("Invalid XML: "+t),n};var zt=/#.*$/,Xt=/([?&])_=[^&]*/,Ut=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Vt=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Yt=/^(?:GET|HEAD)$/,Jt=/^\/\//,Gt=/^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,Kt={},Qt={},Zt="*/".concat("*"),en=Bt.href,tn=Gt.exec(en.toLowerCase())||[];pe.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:en,type:"GET",isLocal:Vt.test(tn[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Zt,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":pe.parseJSON,"text xml":pe.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?V(V(e,pe.ajaxSettings),t):V(pe.ajaxSettings,e)},ajaxPrefilter:X(Kt),ajaxTransport:X(Qt),ajax:function(t,n){function r(t,n,r,i){var o,f,v,x,w,C=n;2!==b&&(b=2,u&&e.clearTimeout(u),c=void 0,s=i||"",T.readyState=t>0?4:0,o=t>=200&&t<300||304===t,r&&(x=Y(d,T,r)),x=J(d,x,T,o),o?(d.ifModified&&(w=T.getResponseHeader("Last-Modified"),w&&(pe.lastModified[a]=w),w=T.getResponseHeader("etag"),w&&(pe.etag[a]=w)),204===t||"HEAD"===d.type?C="nocontent":304===t?C="notmodified":(C=x.state,f=x.data,v=x.error,o=!v)):(v=C,!t&&C||(C="error",t<0&&(t=0))),T.status=t,T.statusText=(n||C)+"",o?g.resolveWith(p,[f,C,T]):g.rejectWith(p,[T,C,v]),T.statusCode(y),y=void 0,l&&h.trigger(o?"ajaxSuccess":"ajaxError",[T,d,o?f:v]),m.fireWith(p,[T,C]),l&&(h.trigger("ajaxComplete",[T,d]),--pe.active||pe.event.trigger("ajaxStop")))}"object"==typeof t&&(n=t,t=void 0),n=n||{};var i,o,a,s,u,l,c,f,d=pe.ajaxSetup({},n),p=d.context||d,h=d.context&&(p.nodeType||p.jquery)?pe(p):pe.event,g=pe.Deferred(),m=pe.Callbacks("once memory"),y=d.statusCode||{},v={},x={},b=0,w="canceled",T={readyState:0,getResponseHeader:function(e){var t;if(2===b){if(!f)for(f={};t=Ut.exec(s);)f[t[1].toLowerCase()]=t[2];t=f[e.toLowerCase()]}return null==t?null:t},getAllResponseHeaders:function(){return 2===b?s:null},setRequestHeader:function(e,t){var n=e.toLowerCase();return b||(e=x[n]=x[n]||e,v[e]=t),this},overrideMimeType:function(e){return b||(d.mimeType=e),this},statusCode:function(e){var t;if(e)if(b<2)for(t in e)y[t]=[y[t],e[t]];else T.always(e[T.status]);return this},abort:function(e){var t=e||w;return c&&c.abort(t),r(0,t),this}};if(g.promise(T).complete=m.add,T.success=T.done,T.error=T.fail,d.url=((t||d.url||en)+"").replace(zt,"").replace(Jt,tn[1]+"//"),d.type=n.method||n.type||d.method||d.type,d.dataTypes=pe.trim(d.dataType||"*").toLowerCase().match(De)||[""],null==d.crossDomain&&(i=Gt.exec(d.url.toLowerCase()),d.crossDomain=!(!i||i[1]===tn[1]&&i[2]===tn[2]&&(i[3]||("http:"===i[1]?"80":"443"))===(tn[3]||("http:"===tn[1]?"80":"443")))),d.data&&d.processData&&"string"!=typeof d.data&&(d.data=pe.param(d.data,d.traditional)),U(Kt,d,n,T),2===b)return T;l=pe.event&&d.global,l&&0===pe.active++&&pe.event.trigger("ajaxStart"),d.type=d.type.toUpperCase(),d.hasContent=!Yt.test(d.type),a=d.url,d.hasContent||(d.data&&(a=d.url+=(It.test(a)?"&":"?")+d.data,delete d.data),d.cache===!1&&(d.url=Xt.test(a)?a.replace(Xt,"$1_="+Wt++):a+(It.test(a)?"&":"?")+"_="+Wt++)),d.ifModified&&(pe.lastModified[a]&&T.setRequestHeader("If-Modified-Since",pe.lastModified[a]),pe.etag[a]&&T.setRequestHeader("If-None-Match",pe.etag[a])),(d.data&&d.hasContent&&d.contentType!==!1||n.contentType)&&T.setRequestHeader("Content-Type",d.contentType),T.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+("*"!==d.dataTypes[0]?", "+Zt+"; q=0.01":""):d.accepts["*"]);for(o in d.headers)T.setRequestHeader(o,d.headers[o]);if(d.beforeSend&&(d.beforeSend.call(p,T,d)===!1||2===b))return T.abort();w="abort";for(o in{success:1,error:1,complete:1})T[o](d[o]);if(c=U(Qt,d,n,T)){if(T.readyState=1,l&&h.trigger("ajaxSend",[T,d]),2===b)return T;d.async&&d.timeout>0&&(u=e.setTimeout(function(){T.abort("timeout")},d.timeout));try{b=1,c.send(v,r)}catch(C){if(!(b<2))throw C;r(-1,C)}}else r(-1,"No Transport");return T},getJSON:function(e,t,n){return pe.get(e,t,n,"json")},getScript:function(e,t){return pe.get(e,void 0,t,"script")}}),pe.each(["get","post"],function(e,t){pe[t]=function(e,n,r,i){return pe.isFunction(n)&&(i=i||r,r=n,n=void 0),pe.ajax(pe.extend({url:e,type:t,dataType:i,data:n,success:r},pe.isPlainObject(e)&&e))}}),pe._evalUrl=function(e){return pe.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,"throws":!0})},pe.fn.extend({wrapAll:function(e){if(pe.isFunction(e))return this.each(function(t){pe(this).wrapAll(e.call(this,t))});if(this[0]){var t=pe(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){for(var e=this;e.firstChild&&1===e.firstChild.nodeType;)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return pe.isFunction(e)?this.each(function(t){pe(this).wrapInner(e.call(this,t))}):this.each(function(){var t=pe(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=pe.isFunction(e);return this.each(function(n){pe(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){pe.nodeName(this,"body")||pe(this).replaceWith(this.childNodes)}).end()}}),pe.expr.filters.hidden=function(e){return fe.reliableHiddenOffsets()?e.offsetWidth<=0&&e.offsetHeight<=0&&!e.getClientRects().length:K(e)},pe.expr.filters.visible=function(e){return!pe.expr.filters.hidden(e)};var nn=/%20/g,rn=/\[\]$/,on=/\r?\n/g,an=/^(?:submit|button|image|reset|file)$/i,sn=/^(?:input|select|textarea|keygen)/i;pe.param=function(e,t){var n,r=[],i=function(e,t){t=pe.isFunction(t)?t():null==t?"":t,r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};if(void 0===t&&(t=pe.ajaxSettings&&pe.ajaxSettings.traditional),pe.isArray(e)||e.jquery&&!pe.isPlainObject(e))pe.each(e,function(){i(this.name,this.value)});else for(n in e)Q(n,e[n],t,i);return r.join("&").replace(nn,"+")},pe.fn.extend({serialize:function(){return pe.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=pe.prop(this,"elements");return e?pe.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!pe(this).is(":disabled")&&sn.test(this.nodeName)&&!an.test(e)&&(this.checked||!Be.test(e))}).map(function(e,t){var n=pe(this).val();return null==n?null:pe.isArray(n)?pe.map(n,function(e){return{name:t.name,value:e.replace(on,"\r\n")}}):{name:t.name,value:n.replace(on,"\r\n")}}).get()}}),pe.ajaxSettings.xhr=void 0!==e.ActiveXObject?function(){return this.isLocal?ee():re.documentMode>8?Z():/^(get|post|head|put|delete|options)$/i.test(this.type)&&Z()||ee()}:Z;var un=0,ln={},cn=pe.ajaxSettings.xhr();e.attachEvent&&e.attachEvent("onunload",function(){for(var e in ln)ln[e](void 0,!0)}),fe.cors=!!cn&&"withCredentials"in cn,cn=fe.ajax=!!cn,cn&&pe.ajaxTransport(function(t){if(!t.crossDomain||fe.cors){var n;return{send:function(r,i){var o,a=t.xhr(),s=++un;if(a.open(t.type,t.url,t.async,t.username,t.password),t.xhrFields)for(o in t.xhrFields)a[o]=t.xhrFields[o];t.mimeType&&a.overrideMimeType&&a.overrideMimeType(t.mimeType),t.crossDomain||r["X-Requested-With"]||(r["X-Requested-With"]="XMLHttpRequest");for(o in r)void 0!==r[o]&&a.setRequestHeader(o,r[o]+"");a.send(t.hasContent&&t.data||null),n=function(e,r){var o,u,l;if(n&&(r||4===a.readyState))if(delete ln[s],n=void 0,a.onreadystatechange=pe.noop,r)4!==a.readyState&&a.abort();else{l={},o=a.status,"string"==typeof a.responseText&&(l.text=a.responseText);try{u=a.statusText}catch(c){u=""}o||!t.isLocal||t.crossDomain?1223===o&&(o=204):o=l.text?200:404}l&&i(o,u,l,a.getAllResponseHeaders())},t.async?4===a.readyState?e.setTimeout(n):a.onreadystatechange=ln[s]=n:n()},abort:function(){n&&n(void 0,!0)}}}}),pe.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return pe.globalEval(e),e}}}),pe.ajaxPrefilter("script",function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET",e.global=!1)}),pe.ajaxTransport("script",function(e){if(e.crossDomain){var t,n=re.head||pe("head")[0]||re.documentElement;return{send:function(r,i){t=re.createElement("script"),t.async=!0,e.scriptCharset&&(t.charset=e.scriptCharset),t.src=e.url,t.onload=t.onreadystatechange=function(e,n){(n||!t.readyState||/loaded|complete/.test(t.readyState))&&(t.onload=t.onreadystatechange=null,t.parentNode&&t.parentNode.removeChild(t),t=null,n||i(200,"success"))},n.insertBefore(t,n.firstChild)},abort:function(){t&&t.onload(void 0,!0)}}}});var fn=[],dn=/(=)\?(?=&|$)|\?\?/;pe.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=fn.pop()||pe.expando+"_"+Wt++;return this[e]=!0,e}}),pe.ajaxPrefilter("json jsonp",function(t,n,r){var i,o,a,s=t.jsonp!==!1&&(dn.test(t.url)?"url":"string"==typeof t.data&&0===(t.contentType||"").indexOf("application/x-www-form-urlencoded")&&dn.test(t.data)&&"data");if(s||"jsonp"===t.dataTypes[0])return i=t.jsonpCallback=pe.isFunction(t.jsonpCallback)?t.jsonpCallback():t.jsonpCallback,s?t[s]=t[s].replace(dn,"$1"+i):t.jsonp!==!1&&(t.url+=(It.test(t.url)?"&":"?")+t.jsonp+"="+i),t.converters["script json"]=function(){return a||pe.error(i+" was not called"),a[0]},t.dataTypes[0]="json",o=e[i],e[i]=function(){a=arguments},r.always(function(){void 0===o?pe(e).removeProp(i):e[i]=o,t[i]&&(t.jsonpCallback=n.jsonpCallback,fn.push(i)),a&&pe.isFunction(o)&&o(a[0]),a=o=void 0}),"script"}),pe.parseHTML=function(e,t,n){if(!e||"string"!=typeof e)return null;"boolean"==typeof t&&(n=t,t=!1),t=t||re;var r=Te.exec(e),i=!n&&[];return r?[t.createElement(r[1])]:(r=y([e],t,i),i&&i.length&&pe(i).remove(),pe.merge([],r.childNodes))};var pn=pe.fn.load;return pe.fn.load=function(e,t,n){if("string"!=typeof e&&pn)return pn.apply(this,arguments);var r,i,o,a=this,s=e.indexOf(" ");return s>-1&&(r=pe.trim(e.slice(s,e.length)),e=e.slice(0,s)),pe.isFunction(t)?(n=t,t=void 0):t&&"object"==typeof t&&(i="POST"),a.length>0&&pe.ajax({url:e,type:i||"GET",dataType:"html",data:t}).done(function(e){o=arguments,a.html(r?pe("<div>").append(pe.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},pe.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){pe.fn[t]=function(e){return this.on(t,e)}}),pe.expr.filters.animated=function(e){return pe.grep(pe.timers,function(t){return e===t.elem}).length},pe.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l,c=pe.css(e,"position"),f=pe(e),d={};"static"===c&&(e.style.position="relative"),s=f.offset(),o=pe.css(e,"top"),u=pe.css(e,"left"),l=("absolute"===c||"fixed"===c)&&pe.inArray("auto",[o,u])>-1,l?(r=f.position(),a=r.top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),pe.isFunction(t)&&(t=t.call(e,n,pe.extend({},s))),null!=t.top&&(d.top=t.top-s.top+a),null!=t.left&&(d.left=t.left-s.left+i),"using"in t?t.using.call(e,d):f.css(d)}},pe.fn.extend({offset:function(e){if(arguments.length)return void 0===e?this:this.each(function(t){pe.offset.setOffset(this,e,t)});var t,n,r={top:0,left:0},i=this[0],o=i&&i.ownerDocument;if(o)return t=o.documentElement,pe.contains(t,i)?("undefined"!=typeof i.getBoundingClientRect&&(r=i.getBoundingClientRect()),n=te(o),{top:r.top+(n.pageYOffset||t.scrollTop)-(t.clientTop||0),left:r.left+(n.pageXOffset||t.scrollLeft)-(t.clientLeft||0)}):r},position:function(){if(this[0]){var e,t,n={top:0,left:0},r=this[0];return"fixed"===pe.css(r,"position")?t=r.getBoundingClientRect():(e=this.offsetParent(),t=this.offset(),pe.nodeName(e[0],"html")||(n=e.offset()),n.top+=pe.css(e[0],"borderTopWidth",!0),n.left+=pe.css(e[0],"borderLeftWidth",!0)),{top:t.top-n.top-pe.css(r,"marginTop",!0),left:t.left-n.left-pe.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){
+for(var e=this.offsetParent;e&&!pe.nodeName(e,"html")&&"static"===pe.css(e,"position");)e=e.offsetParent;return e||pt})}}),pe.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,t){var n=/Y/.test(t);pe.fn[e]=function(r){return Pe(this,function(e,r,i){var o=te(e);return void 0===i?o?t in o?o[t]:o.document.documentElement[r]:e[r]:void(o?o.scrollTo(n?pe(o).scrollLeft():i,n?i:pe(o).scrollTop()):e[r]=i)},e,r,arguments.length,null)}}),pe.each(["top","left"],function(e,t){pe.cssHooks[t]=L(fe.pixelPosition,function(e,n){if(n)return n=gt(e,t),ft.test(n)?pe(e).position()[t]+"px":n})}),pe.each({Height:"height",Width:"width"},function(e,t){pe.each({padding:"inner"+e,content:t,"":"outer"+e},function(n,r){pe.fn[r]=function(r,i){var o=arguments.length&&(n||"boolean"!=typeof r),a=n||(r===!0||i===!0?"margin":"border");return Pe(this,function(t,n,r){var i;return pe.isWindow(t)?t.document.documentElement["client"+e]:9===t.nodeType?(i=t.documentElement,Math.max(t.body["scroll"+e],i["scroll"+e],t.body["offset"+e],i["offset"+e],i["client"+e])):void 0===r?pe.css(t,n,a):pe.style(t,n,r,a)},t,o?r:void 0,o,null)}})}),pe.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)}}),pe.fn.size=function(){return this.length},pe.fn.andSelf=pe.fn.addBack,layui.define(function(e){layui.$=pe,e("jquery",pe)}),pe});!function(e,t){"use strict";var i,n,a=e.layui&&layui.define,o={getPath:function(){var e=document.currentScript?document.currentScript.src:function(){for(var e,t=document.scripts,i=t.length-1,n=i;n>0;n--)if("interactive"===t[n].readyState){e=t[n].src;break}return e||t[i].src}();return e.substring(0,e.lastIndexOf("/")+1)}(),config:{},end:{},minIndex:0,minLeft:[],btn:["&#x786E;&#x5B9A;","&#x53D6;&#x6D88;"],type:["dialog","page","iframe","loading","tips"],getStyle:function(t,i){var n=t.currentStyle?t.currentStyle:e.getComputedStyle(t,null);return n[n.getPropertyValue?"getPropertyValue":"getAttribute"](i)},link:function(t,i,n){if(r.path){var a=document.getElementsByTagName("head")[0],s=document.createElement("link");"string"==typeof i&&(n=i);var l=(n||t).replace(/\.|\//g,""),f="layuicss-"+l,c=0;s.rel="stylesheet",s.href=r.path+t,s.id=f,document.getElementById(f)||a.appendChild(s),"function"==typeof i&&!function u(){return++c>80?e.console&&console.error("layer.css: Invalid"):void(1989===parseInt(o.getStyle(document.getElementById(f),"width"))?i():setTimeout(u,100))}()}}},r={v:"3.1.1",ie:function(){var t=navigator.userAgent.toLowerCase();return!!(e.ActiveXObject||"ActiveXObject"in e)&&((t.match(/msie\s(\d+)/)||[])[1]||"11")}(),index:e.layer&&e.layer.v?1e5:0,path:o.getPath,config:function(e,t){return e=e||{},r.cache=o.config=i.extend({},o.config,e),r.path=o.config.path||r.path,"string"==typeof e.extend&&(e.extend=[e.extend]),o.config.path&&r.ready(),e.extend?(a?layui.addcss("modules/layer/"+e.extend):o.link("theme/"+e.extend),this):this},ready:function(e){var t="layer",i="",n=(a?"modules/layer/":"theme/")+"default/layer.css?v="+r.v+i;return a?layui.addcss(n,e,t):o.link(n,e,t),this},alert:function(e,t,n){var a="function"==typeof t;return a&&(n=t),r.open(i.extend({content:e,yes:n},a?{}:t))},confirm:function(e,t,n,a){var s="function"==typeof t;return s&&(a=n,n=t),r.open(i.extend({content:e,btn:o.btn,yes:n,btn2:a},s?{}:t))},msg:function(e,n,a){var s="function"==typeof n,f=o.config.skin,c=(f?f+" "+f+"-msg":"")||"layui-layer-msg",u=l.anim.length-1;return s&&(a=n),r.open(i.extend({content:e,time:3e3,shade:!1,skin:c,title:!1,closeBtn:!1,btn:!1,resize:!1,end:a},s&&!o.config.skin?{skin:c+" layui-layer-hui",anim:u}:function(){return n=n||{},(n.icon===-1||n.icon===t&&!o.config.skin)&&(n.skin=c+" "+(n.skin||"layui-layer-hui")),n}()))},load:function(e,t){return r.open(i.extend({type:3,icon:e||0,resize:!1,shade:.01},t))},tips:function(e,t,n){return r.open(i.extend({type:4,content:[e,t],closeBtn:!1,time:3e3,shade:!1,resize:!1,fixed:!1,maxWidth:210},n))}},s=function(e){var t=this;t.index=++r.index,t.config=i.extend({},t.config,o.config,e),document.body?t.creat():setTimeout(function(){t.creat()},30)};s.pt=s.prototype;var l=["layui-layer",".layui-layer-title",".layui-layer-main",".layui-layer-dialog","layui-layer-iframe","layui-layer-content","layui-layer-btn","layui-layer-close"];l.anim=["layer-anim-00","layer-anim-01","layer-anim-02","layer-anim-03","layer-anim-04","layer-anim-05","layer-anim-06"],s.pt.config={type:0,shade:.3,fixed:!0,move:l[1],title:"&#x4FE1;&#x606F;",offset:"auto",area:"auto",closeBtn:1,time:0,zIndex:19891014,maxWidth:360,anim:0,isOutAnim:!0,icon:-1,moveType:1,resize:!0,scrollbar:!0,tips:2},s.pt.vessel=function(e,t){var n=this,a=n.index,r=n.config,s=r.zIndex+a,f="object"==typeof r.title,c=r.maxmin&&(1===r.type||2===r.type),u=r.title?'<div class="layui-layer-title" style="'+(f?r.title[1]:"")+'">'+(f?r.title[0]:r.title)+"</div>":"";return r.zIndex=s,t([r.shade?'<div class="layui-layer-shade" id="layui-layer-shade'+a+'" times="'+a+'" style="'+("z-index:"+(s-1)+"; ")+'"></div>':"",'<div class="'+l[0]+(" layui-layer-"+o.type[r.type])+(0!=r.type&&2!=r.type||r.shade?"":" layui-layer-border")+" "+(r.skin||"")+'" id="'+l[0]+a+'" type="'+o.type[r.type]+'" times="'+a+'" showtime="'+r.time+'" conType="'+(e?"object":"string")+'" style="z-index: '+s+"; width:"+r.area[0]+";height:"+r.area[1]+(r.fixed?"":";position:absolute;")+'">'+(e&&2!=r.type?"":u)+'<div id="'+(r.id||"")+'" class="layui-layer-content'+(0==r.type&&r.icon!==-1?" layui-layer-padding":"")+(3==r.type?" layui-layer-loading"+r.icon:"")+'">'+(0==r.type&&r.icon!==-1?'<i class="layui-layer-ico layui-layer-ico'+r.icon+'"></i>':"")+(1==r.type&&e?"":r.content||"")+'</div><span class="layui-layer-setwin">'+function(){var e=c?'<a class="layui-layer-min" href="javascript:;"><cite></cite></a><a class="layui-layer-ico layui-layer-max" href="javascript:;"></a>':"";return r.closeBtn&&(e+='<a class="layui-layer-ico '+l[7]+" "+l[7]+(r.title?r.closeBtn:4==r.type?"1":"2")+'" href="javascript:;"></a>'),e}()+"</span>"+(r.btn?function(){var e="";"string"==typeof r.btn&&(r.btn=[r.btn]);for(var t=0,i=r.btn.length;t<i;t++)e+='<a class="'+l[6]+t+'">'+r.btn[t]+"</a>";return'<div class="'+l[6]+" layui-layer-btn-"+(r.btnAlign||"")+'">'+e+"</div>"}():"")+(r.resize?'<span class="layui-layer-resize"></span>':"")+"</div>"],u,i('<div class="layui-layer-move"></div>')),n},s.pt.creat=function(){var e=this,t=e.config,a=e.index,s=t.content,f="object"==typeof s,c=i("body");if(!t.id||!i("#"+t.id)[0]){switch("string"==typeof t.area&&(t.area="auto"===t.area?["",""]:[t.area,""]),t.shift&&(t.anim=t.shift),6==r.ie&&(t.fixed=!1),t.type){case 0:t.btn="btn"in t?t.btn:o.btn[0],r.closeAll("dialog");break;case 2:var s=t.content=f?t.content:[t.content||"http://layer.layui.com","auto"];t.content='<iframe scrolling="'+(t.content[1]||"auto")+'" allowtransparency="true" id="'+l[4]+a+'" name="'+l[4]+a+'" onload="this.className=\'\';" class="layui-layer-load" frameborder="0" src="'+t.content[0]+'"></iframe>';break;case 3:delete t.title,delete t.closeBtn,t.icon===-1&&0===t.icon,r.closeAll("loading");break;case 4:f||(t.content=[t.content,"body"]),t.follow=t.content[1],t.content=t.content[0]+'<i class="layui-layer-TipsG"></i>',delete t.title,t.tips="object"==typeof t.tips?t.tips:[t.tips,!0],t.tipsMore||r.closeAll("tips")}if(e.vessel(f,function(n,r,u){c.append(n[0]),f?function(){2==t.type||4==t.type?function(){i("body").append(n[1])}():function(){s.parents("."+l[0])[0]||(s.data("display",s.css("display")).show().addClass("layui-layer-wrap").wrap(n[1]),i("#"+l[0]+a).find("."+l[5]).before(r))}()}():c.append(n[1]),i(".layui-layer-move")[0]||c.append(o.moveElem=u),e.layero=i("#"+l[0]+a),t.scrollbar||l.html.css("overflow","hidden").attr("layer-full",a)}).auto(a),i("#layui-layer-shade"+e.index).css({"background-color":t.shade[1]||"#000",opacity:t.shade[0]||t.shade}),2==t.type&&6==r.ie&&e.layero.find("iframe").attr("src",s[0]),4==t.type?e.tips():e.offset(),t.fixed&&n.on("resize",function(){e.offset(),(/^\d+%$/.test(t.area[0])||/^\d+%$/.test(t.area[1]))&&e.auto(a),4==t.type&&e.tips()}),t.time<=0||setTimeout(function(){r.close(e.index)},t.time),e.move().callback(),l.anim[t.anim]){var u="layer-anim "+l.anim[t.anim];e.layero.addClass(u).one("webkitAnimationEnd mozAnimationEnd MSAnimationEnd oanimationend animationend",function(){i(this).removeClass(u)})}t.isOutAnim&&e.layero.data("isOutAnim",!0)}},s.pt.auto=function(e){var t=this,a=t.config,o=i("#"+l[0]+e);""===a.area[0]&&a.maxWidth>0&&(r.ie&&r.ie<8&&a.btn&&o.width(o.innerWidth()),o.outerWidth()>a.maxWidth&&o.width(a.maxWidth));var s=[o.innerWidth(),o.innerHeight()],f=o.find(l[1]).outerHeight()||0,c=o.find("."+l[6]).outerHeight()||0,u=function(e){e=o.find(e),e.height(s[1]-f-c-2*(0|parseFloat(e.css("padding-top"))))};switch(a.type){case 2:u("iframe");break;default:""===a.area[1]?a.maxHeight>0&&o.outerHeight()>a.maxHeight?(s[1]=a.maxHeight,u("."+l[5])):a.fixed&&s[1]>=n.height()&&(s[1]=n.height(),u("."+l[5])):u("."+l[5])}return t},s.pt.offset=function(){var e=this,t=e.config,i=e.layero,a=[i.outerWidth(),i.outerHeight()],o="object"==typeof t.offset;e.offsetTop=(n.height()-a[1])/2,e.offsetLeft=(n.width()-a[0])/2,o?(e.offsetTop=t.offset[0],e.offsetLeft=t.offset[1]||e.offsetLeft):"auto"!==t.offset&&("t"===t.offset?e.offsetTop=0:"r"===t.offset?e.offsetLeft=n.width()-a[0]:"b"===t.offset?e.offsetTop=n.height()-a[1]:"l"===t.offset?e.offsetLeft=0:"lt"===t.offset?(e.offsetTop=0,e.offsetLeft=0):"lb"===t.offset?(e.offsetTop=n.height()-a[1],e.offsetLeft=0):"rt"===t.offset?(e.offsetTop=0,e.offsetLeft=n.width()-a[0]):"rb"===t.offset?(e.offsetTop=n.height()-a[1],e.offsetLeft=n.width()-a[0]):e.offsetTop=t.offset),t.fixed||(e.offsetTop=/%$/.test(e.offsetTop)?n.height()*parseFloat(e.offsetTop)/100:parseFloat(e.offsetTop),e.offsetLeft=/%$/.test(e.offsetLeft)?n.width()*parseFloat(e.offsetLeft)/100:parseFloat(e.offsetLeft),e.offsetTop+=n.scrollTop(),e.offsetLeft+=n.scrollLeft()),i.attr("minLeft")&&(e.offsetTop=n.height()-(i.find(l[1]).outerHeight()||0),e.offsetLeft=i.css("left")),i.css({top:e.offsetTop,left:e.offsetLeft})},s.pt.tips=function(){var e=this,t=e.config,a=e.layero,o=[a.outerWidth(),a.outerHeight()],r=i(t.follow);r[0]||(r=i("body"));var s={width:r.outerWidth(),height:r.outerHeight(),top:r.offset().top,left:r.offset().left},f=a.find(".layui-layer-TipsG"),c=t.tips[0];t.tips[1]||f.remove(),s.autoLeft=function(){s.left+o[0]-n.width()>0?(s.tipLeft=s.left+s.width-o[0],f.css({right:12,left:"auto"})):s.tipLeft=s.left},s.where=[function(){s.autoLeft(),s.tipTop=s.top-o[1]-10,f.removeClass("layui-layer-TipsB").addClass("layui-layer-TipsT").css("border-right-color",t.tips[1])},function(){s.tipLeft=s.left+s.width+10,s.tipTop=s.top,f.removeClass("layui-layer-TipsL").addClass("layui-layer-TipsR").css("border-bottom-color",t.tips[1])},function(){s.autoLeft(),s.tipTop=s.top+s.height+10,f.removeClass("layui-layer-TipsT").addClass("layui-layer-TipsB").css("border-right-color",t.tips[1])},function(){s.tipLeft=s.left-o[0]-10,s.tipTop=s.top,f.removeClass("layui-layer-TipsR").addClass("layui-layer-TipsL").css("border-bottom-color",t.tips[1])}],s.where[c-1](),1===c?s.top-(n.scrollTop()+o[1]+16)<0&&s.where[2]():2===c?n.width()-(s.left+s.width+o[0]+16)>0||s.where[3]():3===c?s.top-n.scrollTop()+s.height+o[1]+16-n.height()>0&&s.where[0]():4===c&&o[0]+16-s.left>0&&s.where[1](),a.find("."+l[5]).css({"background-color":t.tips[1],"padding-right":t.closeBtn?"30px":""}),a.css({left:s.tipLeft-(t.fixed?n.scrollLeft():0),top:s.tipTop-(t.fixed?n.scrollTop():0)})},s.pt.move=function(){var e=this,t=e.config,a=i(document),s=e.layero,l=s.find(t.move),f=s.find(".layui-layer-resize"),c={};return t.move&&l.css("cursor","move"),l.on("mousedown",function(e){e.preventDefault(),t.move&&(c.moveStart=!0,c.offset=[e.clientX-parseFloat(s.css("left")),e.clientY-parseFloat(s.css("top"))],o.moveElem.css("cursor","move").show())}),f.on("mousedown",function(e){e.preventDefault(),c.resizeStart=!0,c.offset=[e.clientX,e.clientY],c.area=[s.outerWidth(),s.outerHeight()],o.moveElem.css("cursor","se-resize").show()}),a.on("mousemove",function(i){if(c.moveStart){var a=i.clientX-c.offset[0],o=i.clientY-c.offset[1],l="fixed"===s.css("position");if(i.preventDefault(),c.stX=l?0:n.scrollLeft(),c.stY=l?0:n.scrollTop(),!t.moveOut){var f=n.width()-s.outerWidth()+c.stX,u=n.height()-s.outerHeight()+c.stY;a<c.stX&&(a=c.stX),a>f&&(a=f),o<c.stY&&(o=c.stY),o>u&&(o=u)}s.css({left:a,top:o})}if(t.resize&&c.resizeStart){var a=i.clientX-c.offset[0],o=i.clientY-c.offset[1];i.preventDefault(),r.style(e.index,{width:c.area[0]+a,height:c.area[1]+o}),c.isResize=!0,t.resizing&&t.resizing(s)}}).on("mouseup",function(e){c.moveStart&&(delete c.moveStart,o.moveElem.hide(),t.moveEnd&&t.moveEnd(s)),c.resizeStart&&(delete c.resizeStart,o.moveElem.hide())}),e},s.pt.callback=function(){function e(){var e=a.cancel&&a.cancel(t.index,n);e===!1||r.close(t.index)}var t=this,n=t.layero,a=t.config;t.openLayer(),a.success&&(2==a.type?n.find("iframe").on("load",function(){a.success(n,t.index)}):a.success(n,t.index)),6==r.ie&&t.IE6(n),n.find("."+l[6]).children("a").on("click",function(){var e=i(this).index();if(0===e)a.yes?a.yes(t.index,n):a.btn1?a.btn1(t.index,n):r.close(t.index);else{var o=a["btn"+(e+1)]&&a["btn"+(e+1)](t.index,n);o===!1||r.close(t.index)}}),n.find("."+l[7]).on("click",e),a.shadeClose&&i("#layui-layer-shade"+t.index).on("click",function(){r.close(t.index)}),n.find(".layui-layer-min").on("click",function(){var e=a.min&&a.min(n);e===!1||r.min(t.index,a)}),n.find(".layui-layer-max").on("click",function(){i(this).hasClass("layui-layer-maxmin")?(r.restore(t.index),a.restore&&a.restore(n)):(r.full(t.index,a),setTimeout(function(){a.full&&a.full(n)},100))}),a.end&&(o.end[t.index]=a.end)},o.reselect=function(){i.each(i("select"),function(e,t){var n=i(this);n.parents("."+l[0])[0]||1==n.attr("layer")&&i("."+l[0]).length<1&&n.removeAttr("layer").show(),n=null})},s.pt.IE6=function(e){i("select").each(function(e,t){var n=i(this);n.parents("."+l[0])[0]||"none"===n.css("display")||n.attr({layer:"1"}).hide(),n=null})},s.pt.openLayer=function(){var e=this;r.zIndex=e.config.zIndex,r.setTop=function(e){var t=function(){r.zIndex++,e.css("z-index",r.zIndex+1)};return r.zIndex=parseInt(e[0].style.zIndex),e.on("mousedown",t),r.zIndex}},o.record=function(e){var t=[e.width(),e.height(),e.position().top,e.position().left+parseFloat(e.css("margin-left"))];e.find(".layui-layer-max").addClass("layui-layer-maxmin"),e.attr({area:t})},o.rescollbar=function(e){l.html.attr("layer-full")==e&&(l.html[0].style.removeProperty?l.html[0].style.removeProperty("overflow"):l.html[0].style.removeAttribute("overflow"),l.html.removeAttr("layer-full"))},e.layer=r,r.getChildFrame=function(e,t){return t=t||i("."+l[4]).attr("times"),i("#"+l[0]+t).find("iframe").contents().find(e)},r.getFrameIndex=function(e){return i("#"+e).parents("."+l[4]).attr("times")},r.iframeAuto=function(e){if(e){var t=r.getChildFrame("html",e).outerHeight(),n=i("#"+l[0]+e),a=n.find(l[1]).outerHeight()||0,o=n.find("."+l[6]).outerHeight()||0;n.css({height:t+a+o}),n.find("iframe").css({height:t})}},r.iframeSrc=function(e,t){i("#"+l[0]+e).find("iframe").attr("src",t)},r.style=function(e,t,n){var a=i("#"+l[0]+e),r=a.find(".layui-layer-content"),s=a.attr("type"),f=a.find(l[1]).outerHeight()||0,c=a.find("."+l[6]).outerHeight()||0;a.attr("minLeft");s!==o.type[3]&&s!==o.type[4]&&(n||(parseFloat(t.width)<=260&&(t.width=260),parseFloat(t.height)-f-c<=64&&(t.height=64+f+c)),a.css(t),c=a.find("."+l[6]).outerHeight(),s===o.type[2]?a.find("iframe").css({height:parseFloat(t.height)-f-c}):r.css({height:parseFloat(t.height)-f-c-parseFloat(r.css("padding-top"))-parseFloat(r.css("padding-bottom"))}))},r.min=function(e,t){var a=i("#"+l[0]+e),s=a.find(l[1]).outerHeight()||0,f=a.attr("minLeft")||181*o.minIndex+"px",c=a.css("position");o.record(a),o.minLeft[0]&&(f=o.minLeft[0],o.minLeft.shift()),a.attr("position",c),r.style(e,{width:180,height:s,left:f,top:n.height()-s,position:"fixed",overflow:"hidden"},!0),a.find(".layui-layer-min").hide(),"page"===a.attr("type")&&a.find(l[4]).hide(),o.rescollbar(e),a.attr("minLeft")||o.minIndex++,a.attr("minLeft",f)},r.restore=function(e){var t=i("#"+l[0]+e),n=t.attr("area").split(",");t.attr("type");r.style(e,{width:parseFloat(n[0]),height:parseFloat(n[1]),top:parseFloat(n[2]),left:parseFloat(n[3]),position:t.attr("position"),overflow:"visible"},!0),t.find(".layui-layer-max").removeClass("layui-layer-maxmin"),t.find(".layui-layer-min").show(),"page"===t.attr("type")&&t.find(l[4]).show(),o.rescollbar(e)},r.full=function(e){var t,a=i("#"+l[0]+e);o.record(a),l.html.attr("layer-full")||l.html.css("overflow","hidden").attr("layer-full",e),clearTimeout(t),t=setTimeout(function(){var t="fixed"===a.css("position");r.style(e,{top:t?0:n.scrollTop(),left:t?0:n.scrollLeft(),width:n.width(),height:n.height()},!0),a.find(".layui-layer-min").hide()},100)},r.title=function(e,t){var n=i("#"+l[0]+(t||r.index)).find(l[1]);n.html(e)},r.close=function(e){var t=i("#"+l[0]+e),n=t.attr("type"),a="layer-anim-close";if(t[0]){var s="layui-layer-wrap",f=function(){if(n===o.type[1]&&"object"===t.attr("conType")){t.children(":not(."+l[5]+")").remove();for(var a=t.find("."+s),r=0;r<2;r++)a.unwrap();a.css("display",a.data("display")).removeClass(s)}else{if(n===o.type[2])try{var f=i("#"+l[4]+e)[0];f.contentWindow.document.write(""),f.contentWindow.close(),t.find("."+l[5])[0].removeChild(f)}catch(c){}t[0].innerHTML="",t.remove()}"function"==typeof o.end[e]&&o.end[e](),delete o.end[e]};t.data("isOutAnim")&&t.addClass("layer-anim "+a),i("#layui-layer-moves, #layui-layer-shade"+e).remove(),6==r.ie&&o.reselect(),o.rescollbar(e),t.attr("minLeft")&&(o.minIndex--,o.minLeft.push(t.attr("minLeft"))),r.ie&&r.ie<10||!t.data("isOutAnim")?f():setTimeout(function(){f()},200)}},r.closeAll=function(e){i.each(i("."+l[0]),function(){var t=i(this),n=e?t.attr("type")===e:1;n&&r.close(t.attr("times")),n=null})};var f=r.cache||{},c=function(e){return f.skin?" "+f.skin+" "+f.skin+"-"+e:""};r.prompt=function(e,t){var a="";if(e=e||{},"function"==typeof e&&(t=e),e.area){var o=e.area;a='style="width: '+o[0]+"; height: "+o[1]+';"',delete e.area}var s,l=2==e.formType?'<textarea class="layui-layer-input"'+a+"></textarea>":function(){return'<input type="'+(1==e.formType?"password":"text")+'" class="layui-layer-input">'}(),f=e.success;return delete e.success,r.open(i.extend({type:1,btn:["&#x786E;&#x5B9A;","&#x53D6;&#x6D88;"],content:l,skin:"layui-layer-prompt"+c("prompt"),maxWidth:n.width(),success:function(t){s=t.find(".layui-layer-input"),s.val(e.value||"").focus(),"function"==typeof f&&f(t)},resize:!1,yes:function(i){var n=s.val();""===n?s.focus():n.length>(e.maxlength||500)?r.tips("&#x6700;&#x591A;&#x8F93;&#x5165;"+(e.maxlength||500)+"&#x4E2A;&#x5B57;&#x6570;",s,{tips:1}):t&&t(n,i,s)}},e))},r.tab=function(e){e=e||{};var t=e.tab||{},n="layui-this",a=e.success;return delete e.success,r.open(i.extend({type:1,skin:"layui-layer-tab"+c("tab"),resize:!1,title:function(){var e=t.length,i=1,a="";if(e>0)for(a='<span class="'+n+'">'+t[0].title+"</span>";i<e;i++)a+="<span>"+t[i].title+"</span>";return a}(),content:'<ul class="layui-layer-tabmain">'+function(){var e=t.length,i=1,a="";if(e>0)for(a='<li class="layui-layer-tabli '+n+'">'+(t[0].content||"no content")+"</li>";i<e;i++)a+='<li class="layui-layer-tabli">'+(t[i].content||"no  content")+"</li>";return a}()+"</ul>",success:function(t){var o=t.find(".layui-layer-title").children(),r=t.find(".layui-layer-tabmain").children();o.on("mousedown",function(t){t.stopPropagation?t.stopPropagation():t.cancelBubble=!0;var a=i(this),o=a.index();a.addClass(n).siblings().removeClass(n),r.eq(o).show().siblings().hide(),"function"==typeof e.change&&e.change(o)}),"function"==typeof a&&a(t)}},e))},r.photos=function(t,n,a){function o(e,t,i){var n=new Image;return n.src=e,n.complete?t(n):(n.onload=function(){n.onload=null,t(n)},void(n.onerror=function(e){n.onerror=null,i(e)}))}var s={};if(t=t||{},t.photos){var l=t.photos.constructor===Object,f=l?t.photos:{},u=f.data||[],d=f.start||0;s.imgIndex=(0|d)+1,t.img=t.img||"img";var y=t.success;if(delete t.success,l){if(0===u.length)return r.msg("&#x6CA1;&#x6709;&#x56FE;&#x7247;")}else{var p=i(t.photos),h=function(){u=[],p.find(t.img).each(function(e){var t=i(this);t.attr("layer-index",e),u.push({alt:t.attr("alt"),pid:t.attr("layer-pid"),src:t.attr("layer-src")||t.attr("src"),thumb:t.attr("src")})})};if(h(),0===u.length)return;if(n||p.on("click",t.img,function(){var e=i(this),n=e.attr("layer-index");r.photos(i.extend(t,{photos:{start:n,data:u,tab:t.tab},full:t.full}),!0),h()}),!n)return}s.imgprev=function(e){s.imgIndex--,s.imgIndex<1&&(s.imgIndex=u.length),s.tabimg(e)},s.imgnext=function(e,t){s.imgIndex++,s.imgIndex>u.length&&(s.imgIndex=1,t)||s.tabimg(e)},s.keyup=function(e){if(!s.end){var t=e.keyCode;e.preventDefault(),37===t?s.imgprev(!0):39===t?s.imgnext(!0):27===t&&r.close(s.index)}},s.tabimg=function(e){if(!(u.length<=1))return f.start=s.imgIndex-1,r.close(s.index),r.photos(t,!0,e)},s.event=function(){s.bigimg.hover(function(){s.imgsee.show()},function(){s.imgsee.hide()}),s.bigimg.find(".layui-layer-imgprev").on("click",function(e){e.preventDefault(),s.imgprev()}),s.bigimg.find(".layui-layer-imgnext").on("click",function(e){e.preventDefault(),s.imgnext()}),i(document).on("keyup",s.keyup)},s.loadi=r.load(1,{shade:!("shade"in t)&&.9,scrollbar:!1}),o(u[d].src,function(n){r.close(s.loadi),s.index=r.open(i.extend({type:1,id:"layui-layer-photos",area:function(){var a=[n.width,n.height],o=[i(e).width()-100,i(e).height()-100];if(!t.full&&(a[0]>o[0]||a[1]>o[1])){var r=[a[0]/o[0],a[1]/o[1]];r[0]>r[1]?(a[0]=a[0]/r[0],a[1]=a[1]/r[0]):r[0]<r[1]&&(a[0]=a[0]/r[1],a[1]=a[1]/r[1])}return[a[0]+"px",a[1]+"px"]}(),title:!1,shade:.9,shadeClose:!0,closeBtn:!1,move:".layui-layer-phimg img",moveType:1,scrollbar:!1,moveOut:!0,isOutAnim:!1,skin:"layui-layer-photos"+c("photos"),content:'<div class="layui-layer-phimg"><img src="'+u[d].src+'" alt="'+(u[d].alt||"")+'" layer-pid="'+u[d].pid+'"><div class="layui-layer-imgsee">'+(u.length>1?'<span class="layui-layer-imguide"><a href="javascript:;" class="layui-layer-iconext layui-layer-imgprev"></a><a href="javascript:;" class="layui-layer-iconext layui-layer-imgnext"></a></span>':"")+'<div class="layui-layer-imgbar" style="display:'+(a?"block":"")+'"><span class="layui-layer-imgtit"><a href="javascript:;">'+(u[d].alt||"")+"</a><em>"+s.imgIndex+"/"+u.length+"</em></span></div></div></div>",success:function(e,i){s.bigimg=e.find(".layui-layer-phimg"),s.imgsee=e.find(".layui-layer-imguide,.layui-layer-imgbar"),s.event(e),t.tab&&t.tab(u[d],e),"function"==typeof y&&y(e)},end:function(){s.end=!0,i(document).off("keyup",s.keyup)}},t))},function(){r.close(s.loadi),r.msg("&#x5F53;&#x524D;&#x56FE;&#x7247;&#x5730;&#x5740;&#x5F02;&#x5E38;<br>&#x662F;&#x5426;&#x7EE7;&#x7EED;&#x67E5;&#x770B;&#x4E0B;&#x4E00;&#x5F20;&#xFF1F;",{time:3e4,btn:["&#x4E0B;&#x4E00;&#x5F20;","&#x4E0D;&#x770B;&#x4E86;"],yes:function(){u.length>1&&s.imgnext(!0,!0)}})})}},o.run=function(t){i=t,n=i(e),l.html=i("html"),r.open=function(e){var t=new s(e);return t.index}},e.layui&&layui.define?(r.ready(),layui.define("jquery",function(t){r.path=layui.cache.dir,o.run(layui.$),e.layer=r,t("layer",r)})):"function"==typeof define&&define.amd?define(["jquery"],function(){return o.run(e.jQuery),r}):function(){o.run(e.jQuery),r.ready()}()}(window);layui.define("jquery",function(t){"use strict";var a=layui.$,i=(layui.hint(),layui.device()),e="element",l="layui-this",n="layui-show",s=function(){this.config={}};s.prototype.set=function(t){var i=this;return a.extend(!0,i.config,t),i},s.prototype.on=function(t,a){return layui.onevent.call(this,e,t,a)},s.prototype.tabAdd=function(t,i){var e=".layui-tab-title",l=a(".layui-tab[lay-filter="+t+"]"),n=l.children(e),s=n.children(".layui-tab-bar"),o=l.children(".layui-tab-content"),r='<li lay-id="'+(i.id||"")+'"'+(i.attr?' lay-attr="'+i.attr+'"':"")+">"+(i.title||"unnaming")+"</li>";return s[0]?s.before(r):n.append(r),o.append('<div class="layui-tab-item">'+(i.content||"")+"</div>"),f.hideTabMore(!0),f.tabAuto(),this},s.prototype.tabDelete=function(t,i){var e=".layui-tab-title",l=a(".layui-tab[lay-filter="+t+"]"),n=l.children(e),s=n.find('>li[lay-id="'+i+'"]');return f.tabDelete(null,s),this},s.prototype.tabChange=function(t,i){var e=".layui-tab-title",l=a(".layui-tab[lay-filter="+t+"]"),n=l.children(e),s=n.find('>li[lay-id="'+i+'"]');return f.tabClick.call(s[0],null,null,s),this},s.prototype.tab=function(t){t=t||{},b.on("click",t.headerElem,function(i){var e=a(this).index();f.tabClick.call(this,i,e,null,t)})},s.prototype.progress=function(t,i){var e="layui-progress",l=a("."+e+"[lay-filter="+t+"]"),n=l.find("."+e+"-bar"),s=n.find("."+e+"-text");return n.css("width",i),s.text(i),this};var o=".layui-nav",r="layui-nav-item",c="layui-nav-bar",u="layui-nav-tree",d="layui-nav-child",y="layui-nav-more",h="layui-anim layui-anim-upbit",f={tabClick:function(t,i,s,o){o=o||{};var r=s||a(this),i=i||r.parent().children("li").index(r),c=o.headerElem?r.parent():r.parents(".layui-tab").eq(0),u=o.bodyElem?a(o.bodyElem):c.children(".layui-tab-content").children(".layui-tab-item"),d=r.find("a"),y=c.attr("lay-filter");"javascript:;"!==d.attr("href")&&"_blank"===d.attr("target")||(r.addClass(l).siblings().removeClass(l),u.eq(i).addClass(n).siblings().removeClass(n)),layui.event.call(this,e,"tab("+y+")",{elem:c,index:i})},tabDelete:function(t,i){var n=i||a(this).parent(),s=n.index(),o=n.parents(".layui-tab").eq(0),r=o.children(".layui-tab-content").children(".layui-tab-item"),c=o.attr("lay-filter");n.hasClass(l)&&(n.next()[0]?f.tabClick.call(n.next()[0],null,s+1):n.prev()[0]&&f.tabClick.call(n.prev()[0],null,s-1)),n.remove(),r.eq(s).remove(),setTimeout(function(){f.tabAuto()},50),layui.event.call(this,e,"tabDelete("+c+")",{elem:o,index:s})},tabAuto:function(){var t="layui-tab-more",e="layui-tab-bar",l="layui-tab-close",n=this;a(".layui-tab").each(function(){var s=a(this),o=s.children(".layui-tab-title"),r=(s.children(".layui-tab-content").children(".layui-tab-item"),'lay-stope="tabmore"'),c=a('<span class="layui-unselect layui-tab-bar" '+r+"><i "+r+' class="layui-icon">&#xe61a;</i></span>');if(n===window&&8!=i.ie&&f.hideTabMore(!0),s.attr("lay-allowClose")&&o.find("li").each(function(){var t=a(this);if(!t.find("."+l)[0]){var i=a('<i class="layui-icon layui-unselect '+l+'">&#x1006;</i>');i.on("click",f.tabDelete),t.append(i)}}),"string"!=typeof s.attr("lay-unauto"))if(o.prop("scrollWidth")>o.outerWidth()+1){if(o.find("."+e)[0])return;o.append(c),s.attr("overflow",""),c.on("click",function(a){o[this.title?"removeClass":"addClass"](t),this.title=this.title?"":"收缩"})}else o.find("."+e).remove(),s.removeAttr("overflow")})},hideTabMore:function(t){var i=a(".layui-tab-title");t!==!0&&"tabmore"===a(t.target).attr("lay-stope")||(i.removeClass("layui-tab-more"),i.find(".layui-tab-bar").attr("title",""))},clickThis:function(){var t=a(this),i=t.parents(o),n=i.attr("lay-filter"),s=t.parent(),c=t.siblings("."+d),y="string"==typeof s.attr("lay-unselect");"javascript:;"!==t.attr("href")&&"_blank"===t.attr("target")||y||c[0]||(i.find("."+l).removeClass(l),s.addClass(l)),i.hasClass(u)&&(c.removeClass(h),c[0]&&(s["none"===c.css("display")?"addClass":"removeClass"](r+"ed"),"all"===i.attr("lay-shrink")&&s.siblings().removeClass(r+"ed"))),layui.event.call(this,e,"nav("+n+")",t)},collapse:function(){var t=a(this),i=t.find(".layui-colla-icon"),l=t.siblings(".layui-colla-content"),s=t.parents(".layui-collapse").eq(0),o=s.attr("lay-filter"),r="none"===l.css("display");if("string"==typeof s.attr("lay-accordion")){var c=s.children(".layui-colla-item").children("."+n);c.siblings(".layui-colla-title").children(".layui-colla-icon").html("&#xe602;"),c.removeClass(n)}l[r?"addClass":"removeClass"](n),i.html(r?"&#xe61a;":"&#xe602;"),layui.event.call(this,e,"collapse("+o+")",{title:t,content:l,show:r})}};s.prototype.init=function(t,e){var l=function(){return e?'[lay-filter="'+e+'"]':""}(),s={tab:function(){f.tabAuto.call({})},nav:function(){var t=200,e={},s={},p={},b=function(l,o,r){var c=a(this),f=c.find("."+d);o.hasClass(u)?l.css({top:c.position().top,height:c.children("a").outerHeight(),opacity:1}):(f.addClass(h),l.css({left:c.position().left+parseFloat(c.css("marginLeft")),top:c.position().top+c.height()-l.height()}),e[r]=setTimeout(function(){l.css({width:c.width(),opacity:1})},i.ie&&i.ie<10?0:t),clearTimeout(p[r]),"block"===f.css("display")&&clearTimeout(s[r]),s[r]=setTimeout(function(){f.addClass(n),c.find("."+y).addClass(y+"d")},300))};a(o+l).each(function(i){var l=a(this),o=a('<span class="'+c+'"></span>'),h=l.find("."+r);l.find("."+c)[0]||(l.append(o),h.on("mouseenter",function(){b.call(this,o,l,i)}).on("mouseleave",function(){l.hasClass(u)||(clearTimeout(s[i]),s[i]=setTimeout(function(){l.find("."+d).removeClass(n),l.find("."+y).removeClass(y+"d")},300))}),l.on("mouseleave",function(){clearTimeout(e[i]),p[i]=setTimeout(function(){l.hasClass(u)?o.css({height:0,top:o.position().top+o.height()/2,opacity:0}):o.css({width:0,left:o.position().left+o.width()/2,opacity:0})},t)})),h.find("a").each(function(){var t=a(this),i=(t.parent(),t.siblings("."+d));i[0]&&!t.children("."+y)[0]&&t.append('<span class="'+y+'"></span>'),t.off("click",f.clickThis).on("click",f.clickThis)})})},breadcrumb:function(){var t=".layui-breadcrumb";a(t+l).each(function(){var t=a(this),i="lay-separator",e=t.attr(i)||"/",l=t.find("a");l.next("span["+i+"]")[0]||(l.each(function(t){t!==l.length-1&&a(this).after("<span "+i+">"+e+"</span>")}),t.css("visibility","visible"))})},progress:function(){var t="layui-progress";a("."+t+l).each(function(){var i=a(this),e=i.find(".layui-progress-bar"),l=e.attr("lay-percent");e.css("width",function(){return/^.+\/.+$/.test(l)?100*new Function("return "+l)()+"%":l}()),i.attr("lay-showPercent")&&setTimeout(function(){e.html('<span class="'+t+'-text">'+l+"</span>")},350)})},collapse:function(){var t="layui-collapse";a("."+t+l).each(function(){var t=a(this).find(".layui-colla-item");t.each(function(){var t=a(this),i=t.find(".layui-colla-title"),e=t.find(".layui-colla-content"),l="none"===e.css("display");i.find(".layui-colla-icon").remove(),i.append('<i class="layui-icon layui-colla-icon">'+(l?"&#xe602;":"&#xe61a;")+"</i>"),i.off("click",f.collapse).on("click",f.collapse)})})}};return s[t]?s[t]():layui.each(s,function(t,a){a()})},s.prototype.render=s.prototype.init;var p=new s,b=a(document);p.render();var v=".layui-tab-title li";b.on("click",v,f.tabClick),b.on("click",f.hideTabMore),a(window).on("resize",f.tabAuto),t(e,p)});layui.define("layer",function(e){"use strict";var i=layui.$,t=layui.layer,n=layui.hint(),a=layui.device(),o={config:{},set:function(e){var t=this;return t.config=i.extend({},t.config,e),t},on:function(e,i){return layui.onevent.call(this,r,e,i)}},l=function(){var e=this;return{upload:function(i){e.upload.call(e,i)},config:e.config}},r="upload",u="layui-upload-file",c="layui-upload-form",f="layui-upload-iframe",s="layui-upload-choose",p=function(e){var t=this;t.config=i.extend({},t.config,o.config,e),t.render()};p.prototype.config={accept:"images",exts:"",auto:!0,bindAction:"",url:"",field:"file",method:"post",data:{},drag:!0,size:0,number:0,multiple:!1},p.prototype.render=function(e){var t=this,e=t.config;e.elem=i(e.elem),e.bindAction=i(e.bindAction),t.file(),t.events()},p.prototype.file=function(){var e=this,t=e.config,n=e.elemFile=i(['<input class="'+u+'" type="file" accept="'+t.acceptMime+'" name="'+t.field+'"',t.multiple?" multiple":"",">"].join("")),o=t.elem.next();(o.hasClass(u)||o.hasClass(c))&&o.remove(),a.ie&&a.ie<10&&t.elem.wrap('<div class="layui-upload-wrap"></div>'),e.isFile()?(e.elemFile=t.elem,t.field=t.elem[0].name):t.elem.after(n),a.ie&&a.ie<10&&e.initIE()},p.prototype.initIE=function(){var e=this,t=e.config,n=i('<iframe id="'+f+'" class="'+f+'" name="'+f+'" frameborder="0"></iframe>'),a=i(['<form target="'+f+'" class="'+c+'" method="'+t.method,'" key="set-mine" enctype="multipart/form-data" action="'+t.url+'">',"</form>"].join(""));i("#"+f)[0]||i("body").append(n),t.elem.next().hasClass(c)||(e.elemFile.wrap(a),t.elem.next("."+c).append(function(){var e=[];return layui.each(t.data,function(i,t){t="function"==typeof t?t():t,e.push('<input type="hidden" name="'+i+'" value="'+t+'">')}),e.join("")}()))},p.prototype.msg=function(e){return t.msg(e,{icon:2,shift:6})},p.prototype.isFile=function(){var e=this.config.elem[0];if(e)return"input"===e.tagName.toLocaleLowerCase()&&"file"===e.type},p.prototype.preview=function(e){var i=this;window.FileReader&&layui.each(i.chooseFiles,function(i,t){var n=new FileReader;n.readAsDataURL(t),n.onload=function(){e&&e(i,t,this.result)}})},p.prototype.upload=function(e,t){var n,o=this,l=o.config,r=o.elemFile[0],u=function(){var t=0,n=0,a=e||o.files||o.chooseFiles||r.files,u=function(){l.multiple&&t+n===o.fileLength&&"function"==typeof l.allDone&&l.allDone({total:o.fileLength,successful:t,aborted:n})};layui.each(a,function(e,a){var r=new FormData;r.append(l.field,a),layui.each(l.data,function(e,i){i="function"==typeof i?i():i,r.append(e,i)}),i.ajax({url:l.url,type:l.method,data:r,contentType:!1,processData:!1,dataType:"json",headers:l.headers||{},success:function(i){t++,d(e,i),u()},error:function(){n++,o.msg("请求上传接口出现异常"),m(e),u()}})})},c=function(){var e=i("#"+f);o.elemFile.parent().submit(),clearInterval(p.timer),p.timer=setInterval(function(){var i,t=e.contents().find("body");try{i=t.text()}catch(n){o.msg("获取上传后的响应信息出现异常"),clearInterval(p.timer),m()}i&&(clearInterval(p.timer),t.html(""),d(0,i))},30)},d=function(e,i){if(o.elemFile.next("."+s).remove(),r.value="","object"!=typeof i)try{i=JSON.parse(i)}catch(t){return i={},o.msg("请对上传接口返回有效JSON")}"function"==typeof l.done&&l.done(i,e||0,function(e){o.upload(e)})},m=function(e){l.auto&&(r.value=""),"function"==typeof l.error&&l.error(e||0,function(e){o.upload(e)})},h=l.exts,v=function(){var i=[];return layui.each(e||o.chooseFiles,function(e,t){i.push(t.name)}),i}(),g={preview:function(e){o.preview(e)},upload:function(e,i){var t={};t[e]=i,o.upload(t)},pushFile:function(){return o.files=o.files||{},layui.each(o.chooseFiles,function(e,i){o.files[e]=i}),o.files},resetFile:function(e,i,t){var n=new File([i],t);o.files=o.files||{},o.files[e]=n}},y=function(){if("choose"!==t&&!l.auto||(l.choose&&l.choose(g),"choose"!==t))return l.before&&l.before(g),a.ie?a.ie>9?u():c():void u()};if(v=0===v.length?r.value.match(/[^\/\\]+\..+/g)||[]||"":v,0!==v.length){switch(l.accept){case"file":if(h&&!RegExp("\\w\\.("+h+")$","i").test(escape(v)))return o.msg("选择的文件中包含不支持的格式"),r.value="";break;case"video":if(!RegExp("\\w\\.("+(h||"avi|mp4|wma|rmvb|rm|flash|3gp|flv")+")$","i").test(escape(v)))return o.msg("选择的视频中包含不支持的格式"),r.value="";break;case"audio":if(!RegExp("\\w\\.("+(h||"mp3|wav|mid")+")$","i").test(escape(v)))return o.msg("选择的音频中包含不支持的格式"),r.value="";break;default:if(layui.each(v,function(e,i){RegExp("\\w\\.("+(h||"jpg|png|gif|bmp|jpeg$")+")","i").test(escape(i))||(n=!0)}),n)return o.msg("选择的图片中包含不支持的格式"),r.value=""}if(o.fileLength=function(){var i=0,t=e||o.files||o.chooseFiles||r.files;return layui.each(t,function(){i++}),i}(),l.number&&o.fileLength>l.number)return o.msg("同时最多只能上传的数量为："+l.number);if(l.size>0&&!(a.ie&&a.ie<10)){var F;if(layui.each(o.chooseFiles,function(e,i){if(i.size>1024*l.size){var t=l.size/1024;t=t>=1?t.toFixed(2)+"MB":l.size+"KB",r.value="",F=t}}),F)return o.msg("文件不能超过"+F)}y()}},p.prototype.events=function(){var e=this,t=e.config,o=function(i){e.chooseFiles={},layui.each(i,function(i,t){var n=(new Date).getTime();e.chooseFiles[n+"-"+i]=t})},l=function(i,n){var a=e.elemFile,o=i.length>1?i.length+"个文件":(i[0]||{}).name||a[0].value.match(/[^\/\\]+\..+/g)||[]||"";a.next().hasClass(s)&&a.next().remove(),e.upload(null,"choose"),e.isFile()||t.choose||a.after('<span class="layui-inline '+s+'">'+o+"</span>")};t.elem.off("upload.start").on("upload.start",function(){var a=i(this),o=a.attr("lay-data");if(o)try{o=new Function("return "+o)(),e.config=i.extend({},t,o)}catch(l){n.error("Upload element property lay-data configuration item has a syntax error: "+o)}e.config.item=a,e.elemFile[0].click()}),a.ie&&a.ie<10||t.elem.off("upload.over").on("upload.over",function(){var e=i(this);e.attr("lay-over","")}).off("upload.leave").on("upload.leave",function(){var e=i(this);e.removeAttr("lay-over")}).off("upload.drop").on("upload.drop",function(n,a){var r=i(this),u=a.originalEvent.dataTransfer.files||[];r.removeAttr("lay-over"),o(u),t.auto?e.upload(u):l(u)}),e.elemFile.off("upload.change").on("upload.change",function(){var i=this.files||[];o(i),t.auto?e.upload():l(i)}),t.bindAction.off("upload.action").on("upload.action",function(){e.upload()}),t.elem.data("haveEvents")||(e.elemFile.on("change",function(){i(this).trigger("upload.change")}),t.elem.on("click",function(){e.isFile()||i(this).trigger("upload.start")}),t.drag&&t.elem.on("dragover",function(e){e.preventDefault(),i(this).trigger("upload.over")}).on("dragleave",function(e){i(this).trigger("upload.leave")}).on("drop",function(e){e.preventDefault(),i(this).trigger("upload.drop",e)}),t.bindAction.on("click",function(){i(this).trigger("upload.action")}),t.elem.data("haveEvents",!0))},o.render=function(e){var i=new p(e);return l.call(i)},e(r,o)});layui.define("layer",function(e){"use strict";var i=layui.$,t=layui.layer,a=layui.hint(),n=layui.device(),l="form",r=".layui-form",s="layui-this",o="layui-hide",c="layui-disabled",u=function(){this.config={verify:{required:[/[\S]+/,"必填项不能为空"],phone:[/^1\d{10}$/,"请输入正确的手机号"],email:[/^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/,"邮箱格式不正确"],url:[/(^#)|(^http(s*):\/\/[^\s]+\.[^\s]+)/,"链接格式不正确"],number:function(e){if(!e||isNaN(e))return"只能填写数字"},date:[/^(\d{4})[-\/](\d{1}|0\d{1}|1[0-2])([-\/](\d{1}|0\d{1}|[1-2][0-9]|3[0-1]))*$/,"日期格式不正确"],identity:[/(^\d{15}$)|(^\d{17}(x|X|\d)$)/,"请输入正确的身份证号"]}}};u.prototype.set=function(e){var t=this;return i.extend(!0,t.config,e),t},u.prototype.verify=function(e){var t=this;return i.extend(!0,t.config.verify,e),t},u.prototype.on=function(e,i){return layui.onevent.call(this,l,e,i)},u.prototype.val=function(e,t){var a=i(r+'[lay-filter="'+e+'"]');a.each(function(e,a){var n=i(this);layui.each(t,function(e,i){var t,a=n.find('[name="'+e+'"]');a[0]&&(t=a[0].type,"checkbox"===t?a[0].checked=i:"radio"===t?a.each(function(){this.value===i&&(this.checked=!0)}):a.val(i))})}),f.render(null,e)},u.prototype.render=function(e,t){var n=this,u=i(r+function(){return t?'[lay-filter="'+t+'"]':""}()),d={select:function(){var e,t="请选择",a="layui-form-select",n="layui-select-title",r="layui-select-none",d="",f=u.find("select"),v=function(t,l){i(t.target).parent().hasClass(n)&&!l||(i("."+a).removeClass(a+"ed "+a+"up"),e&&d&&e.val(d)),e=null},y=function(t,u,f){var y,p=i(this),m=t.find("."+n),k=m.find("input"),g=t.find("dl"),x=g.children("dd"),b=this.selectedIndex;if(!u){var C=function(){var e=t.offset().top+t.outerHeight()+5-h.scrollTop(),i=g.outerHeight();b=p[0].selectedIndex,t.addClass(a+"ed"),x.removeClass(o),y=null,x.eq(b).addClass(s).siblings().removeClass(s),e+i>h.height()&&e>=i&&t.addClass(a+"up")},w=function(e){t.removeClass(a+"ed "+a+"up"),k.blur(),y=null,e||$(k.val(),function(e){e&&(d=g.find("."+s).html(),k&&k.val(d))})};m.on("click",function(e){t.hasClass(a+"ed")?w():(v(e,!0),C()),g.find("."+r).remove()}),m.find(".layui-edge").on("click",function(){k.focus()}),k.on("keyup",function(e){var i=e.keyCode;9===i&&C()}).on("keydown",function(e){var i=e.keyCode;9===i&&w();var t=function(i,a){var n,l;if(e.preventDefault(),a=function(){return a&&a[0]?a:y&&y[0]?y:x.eq(b)}(),l=a[i](),n=a[i]("dd"),l[0]){if(y=a[i](),!n[0]||n.hasClass(c))return t(i,y);n.addClass(s).siblings().removeClass(s);var r=g.children("dd.layui-this"),o=r.position().top,u=g.height(),d=r.height();o>u&&g.scrollTop(o+g.scrollTop()-u+d-5),o<0&&g.scrollTop(o+g.scrollTop())}};38===i&&t("prev"),40===i&&t("next"),13===i&&(e.preventDefault(),g.children("dd."+s).trigger("click"))});var $=function(e,t,a){var n=0;layui.each(x,function(){var t=i(this),l=t.text(),r=l.indexOf(e)===-1;(""===e||"blur"===a?e!==l:r)&&n++,"keyup"===a&&t[r?"addClass":"removeClass"](o)});var l=n===x.length;return t(l),l},T=function(e){var i=this.value,t=e.keyCode;return 9!==t&&13!==t&&37!==t&&38!==t&&39!==t&&40!==t&&($(i,function(e){e?g.find("."+r)[0]||g.append('<p class="'+r+'">无匹配项</p>'):g.find("."+r).remove()},"keyup"),void(""===i&&g.find("."+r).remove()))};f&&k.on("keyup",T).on("blur",function(t){var a=p[0].selectedIndex;e=k,d=i(p[0].options[a]).html(),setTimeout(function(){$(k.val(),function(e){d||k.val("")},"blur")},200)}),x.on("click",function(){var e=i(this),a=e.attr("lay-value"),n=p.attr("lay-filter");return!e.hasClass(c)&&(e.hasClass("layui-select-tips")?k.val(""):(k.val(e.text()),e.addClass(s)),e.siblings().removeClass(s),p.val(a).removeClass("layui-form-danger"),layui.event.call(this,l,"select("+n+")",{elem:p[0],value:a,othis:t}),w(!0),!1)}),t.find("dl>dt").on("click",function(e){return!1}),i(document).off("click",v).on("click",v)}};f.each(function(e,l){var r=i(this),o=r.next("."+a),u=this.disabled,d=l.value,f=i(l.options[l.selectedIndex]),v=l.options[0];if("string"==typeof r.attr("lay-ignore"))return r.show();var h="string"==typeof r.attr("lay-search"),p=v?v.value?t:v.innerHTML||t:t,m=i(['<div class="'+(h?"":"layui-unselect ")+a,(u?" layui-select-disabled":"")+'">','<div class="'+n+'">','<input type="text" placeholder="'+p+'" '+('value="'+(d?f.html():"")+'"')+(h?"":" readonly")+' class="layui-input'+(h?"":" layui-unselect")+(u?" "+c:"")+'">','<i class="layui-edge"></i></div>','<dl class="layui-anim layui-anim-upbit'+(r.find("optgroup")[0]?" layui-select-group":"")+'">',function(e){var i=[];return layui.each(e,function(e,a){0!==e||a.value?"optgroup"===a.tagName.toLowerCase()?i.push("<dt>"+a.label+"</dt>"):i.push('<dd lay-value="'+a.value+'" class="'+(d===a.value?s:"")+(a.disabled?" "+c:"")+'">'+a.innerHTML+"</dd>"):i.push('<dd lay-value="" class="layui-select-tips">'+(a.innerHTML||t)+"</dd>")}),0===i.length&&i.push('<dd lay-value="" class="'+c+'">没有选项</dd>'),i.join("")}(r.find("*"))+"</dl>","</div>"].join(""));o[0]&&o.remove(),r.after(m),y.call(this,m,u,h)})},checkbox:function(){var e={checkbox:["layui-form-checkbox","layui-form-checked","checkbox"],_switch:["layui-form-switch","layui-form-onswitch","switch"]},t=u.find("input[type=checkbox]"),a=function(e,t){var a=i(this);e.on("click",function(){var i=a.attr("lay-filter"),n=(a.attr("lay-text")||"").split("|");a[0].disabled||(a[0].checked?(a[0].checked=!1,e.removeClass(t[1]).find("em").text(n[1])):(a[0].checked=!0,e.addClass(t[1]).find("em").text(n[0])),layui.event.call(a[0],l,t[2]+"("+i+")",{elem:a[0],value:a[0].value,othis:e}))})};t.each(function(t,n){var l=i(this),r=l.attr("lay-skin"),s=(l.attr("lay-text")||"").split("|"),o=this.disabled;"switch"===r&&(r="_"+r);var u=e[r]||e.checkbox;if("string"==typeof l.attr("lay-ignore"))return l.show();var d=l.next("."+u[0]),f=i(['<div class="layui-unselect '+u[0],n.checked?" "+u[1]:"",o?" layui-checkbox-disbaled "+c:"",'"',r?' lay-skin="'+r+'"':"",">",function(){var e=n.title.replace(/\s/g,""),i={checkbox:[e?"<span>"+n.title+"</span>":"",'<i class="layui-icon layui-icon-ok"></i>'].join(""),_switch:"<em>"+((n.checked?s[0]:s[1])||"")+"</em><i></i>"};return i[r]||i.checkbox}(),"</div>"].join(""));d[0]&&d.remove(),l.after(f),a.call(this,f,u)})},radio:function(){var e="layui-form-radio",t=["&#xe643;","&#xe63f;"],a=u.find("input[type=radio]"),n=function(a){var n=i(this),s="layui-anim-scaleSpring";a.on("click",function(){var o=n[0].name,c=n.parents(r),u=n.attr("lay-filter"),d=c.find("input[name="+o.replace(/(\.|#|\[|\])/g,"\\$1")+"]");n[0].disabled||(layui.each(d,function(){var a=i(this).next("."+e);this.checked=!1,a.removeClass(e+"ed"),a.find(".layui-icon").removeClass(s).html(t[1])}),n[0].checked=!0,a.addClass(e+"ed"),a.find(".layui-icon").addClass(s).html(t[0]),layui.event.call(n[0],l,"radio("+u+")",{elem:n[0],value:n[0].value,othis:a}))})};a.each(function(a,l){var r=i(this),s=r.next("."+e),o=this.disabled;if("string"==typeof r.attr("lay-ignore"))return r.show();s[0]&&s.remove();var u=i(['<div class="layui-unselect '+e,l.checked?" "+e+"ed":"",(o?" layui-radio-disbaled "+c:"")+'">','<i class="layui-anim layui-icon">'+t[l.checked?0:1]+"</i>","<div>"+function(){var e=l.title||"";return"string"==typeof r.next().attr("lay-radio")&&(e=r.next().html(),r.next().remove()),e}()+"</div>","</div>"].join(""));r.after(u),n.call(this,u)})}};return e?d[e]?d[e]():a.error("不支持的"+e+"表单渲染"):layui.each(d,function(e,i){i()}),n};var d=function(){var e=i(this),a=f.config.verify,s=null,o="layui-form-danger",c={},u=e.parents(r),d=u.find("*[lay-verify]"),v=e.parents("form")[0],h=u.find("input,select,textarea"),y=e.attr("lay-filter");if(layui.each(d,function(e,l){var r=i(this),c=r.attr("lay-verify").split("|"),u=r.attr("lay-verType"),d=r.val();if(r.removeClass(o),layui.each(c,function(e,i){var c,f="",v="function"==typeof a[i];if(a[i]){var c=v?f=a[i](d,l):!a[i][0].test(d);if(f=f||a[i][1],c)return"tips"===u?t.tips(f,function(){return"string"==typeof r.attr("lay-ignore")||"select"!==l.tagName.toLowerCase()&&!/^checkbox|radio$/.test(l.type)?r:r.next()}(),{tips:1}):"alert"===u?t.alert(f,{title:"提示",shadeClose:!0}):t.msg(f,{icon:5,shift:6}),n.android||n.ios||l.focus(),r.addClass(o),s=!0}}),s)return s}),s)return!1;var p={};return layui.each(h,function(e,i){if(i.name=(i.name||"").replace(/^\s*|\s*&/,""),i.name){if(/^.*\[\]$/.test(i.name)){var t=i.name.match(/^(.*)\[\]$/g)[0];p[t]=0|p[t],i.name=i.name.replace(/^(.*)\[\]$/,"$1["+p[t]++ +"]")}/^checkbox|radio$/.test(i.type)&&!i.checked||(c[i.name]=i.value)}}),layui.event.call(this,l,"submit("+y+")",{elem:this,form:v,field:c})},f=new u,v=i(document),h=i(window);f.render(),v.on("reset",r,function(){var e=i(this).attr("lay-filter");setTimeout(function(){f.render(null,e)},50)}),v.on("submit",r,d).on("click","*[lay-submit]",d),e(l,f)});layui.define("jquery",function(e){"use strict";var o=layui.$,a=layui.hint(),i="layui-tree-enter",r=function(e){this.options=e},t={arrow:["&#xe623;","&#xe625;"],checkbox:["&#xe626;","&#xe627;"],radio:["&#xe62b;","&#xe62a;"],branch:["&#xe622;","&#xe624;"],leaf:"&#xe621;"};r.prototype.init=function(e){var o=this;e.addClass("layui-box layui-tree"),o.options.skin&&e.addClass("layui-tree-skin-"+o.options.skin),o.tree(e),o.on(e)},r.prototype.tree=function(e,a){var i=this,r=i.options,n=a||r.nodes;layui.each(n,function(a,n){var l=n.children&&n.children.length>0,c=o('<ul class="'+(n.spread?"layui-show":"")+'"></ul>'),s=o(["<li "+(n.spread?'data-spread="'+n.spread+'"':"")+">",function(){return l?'<i class="layui-icon layui-tree-spread">'+(n.spread?t.arrow[1]:t.arrow[0])+"</i>":""}(),function(){return r.check?'<i class="layui-icon layui-tree-check">'+("checkbox"===r.check?t.checkbox[0]:"radio"===r.check?t.radio[0]:"")+"</i>":""}(),function(){return'<a href="'+(n.href||"javascript:;")+'" '+(r.target&&n.href?'target="'+r.target+'"':"")+">"+('<i class="layui-icon layui-tree-'+(l?"branch":"leaf")+'">'+(l?n.spread?t.branch[1]:t.branch[0]:t.leaf)+"</i>")+("<cite>"+(n.name||"未命名")+"</cite></a>")}(),"</li>"].join(""));l&&(s.append(c),i.tree(c,n.children)),e.append(s),"function"==typeof r.click&&i.click(s,n),i.spread(s,n),r.drag&&i.drag(s,n)})},r.prototype.click=function(e,o){var a=this,i=a.options;e.children("a").on("click",function(e){layui.stope(e),i.click(o)})},r.prototype.spread=function(e,o){var a=this,i=(a.options,e.children(".layui-tree-spread")),r=e.children("ul"),n=e.children("a"),l=function(){e.data("spread")?(e.data("spread",null),r.removeClass("layui-show"),i.html(t.arrow[0]),n.find(".layui-icon").html(t.branch[0])):(e.data("spread",!0),r.addClass("layui-show"),i.html(t.arrow[1]),n.find(".layui-icon").html(t.branch[1]))};r[0]&&(i.on("click",l),n.on("dblclick",l))},r.prototype.on=function(e){var a=this,r=a.options,t="layui-tree-drag";e.find("i").on("selectstart",function(e){return!1}),r.drag&&o(document).on("mousemove",function(e){var i=a.move;if(i.from){var r=(i.to,o('<div class="layui-box '+t+'"></div>'));e.preventDefault(),o("."+t)[0]||o("body").append(r);var n=o("."+t)[0]?o("."+t):r;n.addClass("layui-show").html(i.from.elem.children("a").html()),n.css({left:e.pageX+10,top:e.pageY+10})}}).on("mouseup",function(){var e=a.move;e.from&&(e.from.elem.children("a").removeClass(i),e.to&&e.to.elem.children("a").removeClass(i),a.move={},o("."+t).remove())})},r.prototype.move={},r.prototype.drag=function(e,a){var r=this,t=(r.options,e.children("a")),n=function(){var t=o(this),n=r.move;n.from&&(n.to={item:a,elem:e},t.addClass(i))};t.on("mousedown",function(){var o=r.move;o.from={item:a,elem:e}}),t.on("mouseenter",n).on("mousemove",n).on("mouseleave",function(){var e=o(this),a=r.move;a.from&&(delete a.to,e.removeClass(i))})},e("tree",function(e){var i=new r(e=e||{}),t=o(e.elem);return t[0]?void i.init(t):a.error("layui.tree 没有找到"+e.elem+"元素")})});layui.define(["laytpl","laypage","layer","form"],function(e){"use strict";var t=layui.$,i=layui.laytpl,a=layui.laypage,l=layui.layer,n=layui.form,o=layui.hint(),r=layui.device(),d={config:{checkName:"LAY_CHECKED",indexName:"LAY_TABLE_INDEX"},cache:{},index:layui.table?layui.table.index+1e4:0,set:function(e){var i=this;return i.config=t.extend({},i.config,e),i},on:function(e,t){return layui.onevent.call(this,s,e,t)}},c=function(){var e=this,t=e.config,i=t.id;return i&&(c.config[i]=t),{reload:function(t){e.reload.call(e,t)},config:t}},s="table",u=".layui-table",h="layui-hide",f="layui-none",y="layui-table-view",p=".layui-table-header",m=".layui-table-body",v=".layui-table-main",g=".layui-table-fixed",x=".layui-table-fixed-l",b=".layui-table-fixed-r",k=".layui-table-tool",C=".layui-table-page",w=".layui-table-sort",N="layui-table-edit",T="layui-table-hover",F=function(e){var t='{{#if(item2.colspan){}} colspan="{{item2.colspan}}"{{#} if(item2.rowspan){}} rowspan="{{item2.rowspan}}"{{#}}}';return e=e||{},['<table cellspacing="0" cellpadding="0" border="0" class="layui-table" ','{{# if(d.data.skin){ }}lay-skin="{{d.data.skin}}"{{# } }} {{# if(d.data.size){ }}lay-size="{{d.data.size}}"{{# } }} {{# if(d.data.even){ }}lay-even{{# } }}>',"<thead>","{{# layui.each(d.data.cols, function(i1, item1){ }}","<tr>","{{# layui.each(item1, function(i2, item2){ }}",'{{# if(item2.fixed && item2.fixed !== "right"){ left = true; } }}','{{# if(item2.fixed === "right"){ right = true; } }}',function(){return e.fixed&&"right"!==e.fixed?'{{# if(item2.fixed && item2.fixed !== "right"){ }}':"right"===e.fixed?'{{# if(item2.fixed === "right"){ }}':""}(),'<th data-field="{{ item2.field||i2 }}" {{# if(item2.minWidth){ }}data-minwidth="{{item2.minWidth}}"{{# } }} '+t+' {{# if(item2.unresize){ }}data-unresize="true"{{# } }}>','<div class="layui-table-cell laytable-cell-',"{{# if(item2.colspan > 1){ }}","group","{{# } else { }}","{{d.index}}-{{item2.field || i2}}",'{{# if(item2.type !== "normal"){ }}'," laytable-cell-{{ item2.type }}","{{# } }}","{{# } }}",'" {{#if(item2.align){}}align="{{item2.align}}"{{#}}}>','{{# if(item2.type === "checkbox"){ }}','<input type="checkbox" name="layTableCheckbox" lay-skin="primary" lay-filter="layTableAllChoose" {{# if(item2[d.data.checkName]){ }}checked{{# }; }}>',"{{# } else { }}",'<span>{{item2.title||""}}</span>',"{{# if(!(item2.colspan > 1) && item2.sort){ }}",'<span class="layui-table-sort layui-inline"><i class="layui-edge layui-table-sort-asc"></i><i class="layui-edge layui-table-sort-desc"></i></span>',"{{# } }}","{{# } }}","</div>","</th>",e.fixed?"{{# }; }}":"","{{# }); }}","</tr>","{{# }); }}","</thead>","</table>"].join("")},W=['<table cellspacing="0" cellpadding="0" border="0" class="layui-table" ','{{# if(d.data.skin){ }}lay-skin="{{d.data.skin}}"{{# } }} {{# if(d.data.size){ }}lay-size="{{d.data.size}}"{{# } }} {{# if(d.data.even){ }}lay-even{{# } }}>',"<tbody></tbody>","</table>"].join(""),z=['<div class="layui-form layui-border-box {{d.VIEW_CLASS}}" lay-filter="LAY-table-{{d.index}}" style="{{# if(d.data.width){ }}width:{{d.data.width}}px;{{# } }} {{# if(d.data.height){ }}height:{{d.data.height}}px;{{# } }}">',"{{# if(d.data.toolbar){ }}",'<div class="layui-table-tool"></div>',"{{# } }}",'<div class="layui-table-box">',"{{# var left, right; }}",'<div class="layui-table-header">',F(),"</div>",'<div class="layui-table-body layui-table-main">',W,"</div>","{{# if(left){ }}",'<div class="layui-table-fixed layui-table-fixed-l">','<div class="layui-table-header">',F({fixed:!0}),"</div>",'<div class="layui-table-body">',W,"</div>","</div>","{{# }; }}","{{# if(right){ }}",'<div class="layui-table-fixed layui-table-fixed-r">','<div class="layui-table-header">',F({fixed:"right"}),'<div class="layui-table-mend"></div>',"</div>",'<div class="layui-table-body">',W,"</div>","</div>","{{# }; }}","</div>","{{# if(d.data.page){ }}",'<div class="layui-table-page">','<div id="layui-table-page{{d.index}}"></div>',"</div>","{{# } }}","<style>","{{# layui.each(d.data.cols, function(i1, item1){","layui.each(item1, function(i2, item2){ }}",".laytable-cell-{{d.index}}-{{item2.field||i2}}{ ","{{# if(item2.width){ }}","width: {{item2.width}}px;","{{# } }}"," }","{{# });","}); }}","</style>","</div>"].join(""),A=t(window),S=t(document),M=function(e){var i=this;i.index=++d.index,i.config=t.extend({},i.config,d.config,e),i.render()};M.prototype.config={limit:10,loading:!0,cellMinWidth:60,text:{none:"无数据"}},M.prototype.render=function(){var e=this,a=e.config;if(a.elem=t(a.elem),a.where=a.where||{},a.id=a.id||a.elem.attr("id"),a.request=t.extend({pageName:"page",limitName:"limit"},a.request),a.response=t.extend({statusName:"code",statusCode:0,msgName:"msg",dataName:"data",countName:"count"},a.response),"object"==typeof a.page&&(a.limit=a.page.limit||a.limit,a.limits=a.page.limits||a.limits,e.page=a.page.curr=a.page.curr||1,delete a.page.elem,delete a.page.jump),!a.elem[0])return e;e.setArea();var l=a.elem,n=l.next("."+y),o=e.elem=t(i(z).render({VIEW_CLASS:y,data:a,index:e.index}));if(a.index=e.index,n[0]&&n.remove(),l.after(o),e.layHeader=o.find(p),e.layMain=o.find(v),e.layBody=o.find(m),e.layFixed=o.find(g),e.layFixLeft=o.find(x),e.layFixRight=o.find(b),e.layTool=o.find(k),e.layPage=o.find(C),e.layTool.html(i(t(a.toolbar).html()||"").render(a)),a.height&&e.fullSize(),a.cols.length>1){var r=e.layFixed.find(p).find("th");r.height(e.layHeader.height()-1-parseFloat(r.css("padding-top"))-parseFloat(r.css("padding-bottom")))}e.pullData(e.page),e.events()},M.prototype.initOpts=function(e){var t=this,i=(t.config,{checkbox:48,space:15,numbers:40});e.checkbox&&(e.type="checkbox"),e.space&&(e.type="space"),e.type||(e.type="normal"),"normal"!==e.type&&(e.unresize=!0,e.width=e.width||i[e.type])},M.prototype.setArea=function(){var e=this,t=e.config,i=0,a=0,l=0,n=0,o=t.width||function(){var e=function(i){var a,l;i=i||t.elem.parent(),a=i.width();try{l="none"===i.css("display")}catch(n){}return!i[0]||a&&!l?a:e(i.parent())};return e()}();e.eachCols(function(){i++}),o-=function(){return"line"===t.skin||"nob"===t.skin?2:i+1}(),layui.each(t.cols,function(t,i){layui.each(i,function(t,l){var r;return l?(e.initOpts(l),r=l.width||0,void(l.colspan>1||(/\d+%$/.test(r)?l.width=r=Math.floor(parseFloat(r)/100*o):r||(l.width=r=0,a++),n+=r))):void i.splice(t,1)})}),e.autoColNums=a,o>n&&a&&(l=(o-n)/a),layui.each(t.cols,function(e,i){layui.each(i,function(e,i){var a=i.minWidth||t.cellMinWidth;i.colspan>1||0===i.width&&(i.width=Math.floor(l>=a?l:a))})}),t.height&&/^full-\d+$/.test(t.height)&&(e.fullHeightGap=t.height.split("-")[1],t.height=A.height()-e.fullHeightGap)},M.prototype.reload=function(e){var i=this;i.config.data&&i.config.data.constructor===Array&&delete i.config.data,i.config=t.extend({},i.config,e),i.render()},M.prototype.page=1,M.prototype.pullData=function(e,i){var a=this,n=a.config,o=n.request,r=n.response,d=function(){"object"==typeof n.initSort&&a.sort(n.initSort.field,n.initSort.type)};if(a.startTime=(new Date).getTime(),n.url){var c={};c[o.pageName]=e,c[o.limitName]=n.limit;var s=t.extend(c,n.where);n.contentType&&0==n.contentType.indexOf("application/json")&&(s=JSON.stringify(s)),t.ajax({type:n.method||"get",url:n.url,contentType:n.contentType,data:s,dataType:"json",headers:n.headers||{},success:function(t){t[r.statusName]!=r.statusCode?(a.renderForm(),a.layMain.html('<div class="'+f+'">'+(t[r.msgName]||"返回的数据状态异常")+"</div>")):(a.renderData(t,e,t[r.countName]),d(),n.time=(new Date).getTime()-a.startTime+" ms"),i&&l.close(i),"function"==typeof n.done&&n.done(t,e,t[r.countName])},error:function(e,t){a.layMain.html('<div class="'+f+'">数据接口请求异常</div>'),a.renderForm(),i&&l.close(i)}})}else if(n.data&&n.data.constructor===Array){var u={},h=e*n.limit-n.limit;u[r.dataName]=n.data.concat().splice(h,n.limit),u[r.countName]=n.data.length,a.renderData(u,e,n.data.length),d(),"function"==typeof n.done&&n.done(u,e,u[r.countName])}},M.prototype.eachCols=function(e){var i=t.extend(!0,[],this.config.cols),a=[],l=0;layui.each(i,function(e,t){layui.each(t,function(t,n){if(n.colspan>1){var o=0;l++,n.CHILD_COLS=[],layui.each(i[e+1],function(e,t){t.PARENT_COL||o==n.colspan||(t.PARENT_COL=l,n.CHILD_COLS.push(t),o+=t.colspan>1?t.colspan:1)})}n.PARENT_COL||a.push(n)})});var n=function(t){layui.each(t||a,function(t,i){return i.CHILD_COLS?n(i.CHILD_COLS):void e(t,i)})};n()},M.prototype.renderData=function(e,n,o,r){var c=this,s=c.config,u=e[s.response.dataName]||[],y=[],p=[],m=[],v=function(){return!r&&c.sortKey?c.sort(c.sortKey.field,c.sortKey.sort,!0):(layui.each(u,function(e,a){var l=[],o=[],u=[],h=e+s.limit*(n-1)+1;0!==a.length&&(r||(a[d.config.indexName]=e),c.eachCols(function(e,n){var r=n.field||e,f=a[r];c.getColElem(c.layHeader,r);if(void 0!==f&&null!==f||(f=""),!(n.colspan>1)){var y=['<td data-field="'+r+'" '+function(){var e=[];return n.edit&&e.push('data-edit="'+n.edit+'"'),n.align&&e.push('align="'+n.align+'"'),n.templet&&e.push('data-content="'+f+'"'),n.toolbar&&e.push('data-off="true"'),n.event&&e.push('lay-event="'+n.event+'"'),n.style&&e.push('style="'+n.style+'"'),n.minWidth&&e.push('data-minwidth="'+n.minWidth+'"'),e.join(" ")}()+">",'<div class="layui-table-cell laytable-cell-'+function(){var e=s.index+"-"+r;return"normal"===n.type?e:e+" laytable-cell-"+n.type}()+'">'+function(){var e=t.extend(!0,{LAY_INDEX:h},a);return"checkbox"===n.type?'<input type="checkbox" name="layTableCheckbox" lay-skin="primary" '+function(){var t=d.config.checkName;return n[t]?(a[t]=n[t],n[t]?"checked":""):e[t]?"checked":""}()+">":"numbers"===n.type?h:n.toolbar?i(t(n.toolbar).html()||"").render(e):n.templet?function(){return"function"==typeof n.templet?n.templet(e):i(t(n.templet).html()||String(f)).render(e)}():f}(),"</div></td>"].join("");l.push(y),n.fixed&&"right"!==n.fixed&&o.push(y),"right"===n.fixed&&u.push(y)}}),y.push('<tr data-index="'+e+'">'+l.join("")+"</tr>"),p.push('<tr data-index="'+e+'">'+o.join("")+"</tr>"),m.push('<tr data-index="'+e+'">'+u.join("")+"</tr>"))}),c.layBody.scrollTop(0),c.layMain.find("."+f).remove(),c.layMain.find("tbody").html(y.join("")),c.layFixLeft.find("tbody").html(p.join("")),c.layFixRight.find("tbody").html(m.join("")),c.renderForm(),c.syncCheckAll(),c.haveInit?c.scrollPatch():setTimeout(function(){c.scrollPatch()},50),c.haveInit=!0,void l.close(c.tipsIndex))};return c.key=s.id||s.index,d.cache[c.key]=u,c.layPage[0===u.length&&1==n?"addClass":"removeClass"](h),r?v():0===u.length?(c.renderForm(),c.layFixed.remove(),c.layMain.find("tbody").html(""),c.layMain.find("."+f).remove(),c.layMain.append('<div class="'+f+'">'+s.text.none+"</div>")):(v(),void(s.page&&(s.page=t.extend({elem:"layui-table-page"+s.index,count:o,limit:s.limit,limits:s.limits||[10,20,30,40,50,60,70,80,90],groups:3,layout:["prev","page","next","skip","count","limit"],prev:'<i class="layui-icon">&#xe603;</i>',next:'<i class="layui-icon">&#xe602;</i>',jump:function(e,t){t||(c.page=e.curr,s.limit=e.limit,c.pullData(e.curr,c.loading()))}},s.page),s.page.count=o,a.render(s.page))))},M.prototype.getColElem=function(e,t){var i=this,a=i.config;return e.eq(0).find(".laytable-cell-"+(a.index+"-"+t)+":eq(0)")},M.prototype.renderForm=function(e){n.render(e,"LAY-table-"+this.index)},M.prototype.sort=function(e,i,a,l){var n,r,c=this,u={},h=c.config,f=h.elem.attr("lay-filter"),y=d.cache[c.key];"string"==typeof e&&c.layHeader.find("th").each(function(i,a){var l=t(this),o=l.data("field");if(o===e)return e=l,n=o,!1});try{var n=n||e.data("field");if(c.sortKey&&!a&&n===c.sortKey.field&&i===c.sortKey.sort)return;var p=c.layHeader.find("th .laytable-cell-"+h.index+"-"+n).find(w);c.layHeader.find("th").find(w).removeAttr("lay-sort"),p.attr("lay-sort",i||null),c.layFixed.find("th")}catch(m){return o.error("Table modules: Did not match to field")}c.sortKey={field:n,sort:i},"asc"===i?r=layui.sort(y,n):"desc"===i?r=layui.sort(y,n,!0):(r=layui.sort(y,d.config.indexName),delete c.sortKey),u[h.response.dataName]=r,c.renderData(u,c.page,c.count,!0),l&&layui.event.call(e,s,"sort("+f+")",{field:n,type:i})},M.prototype.loading=function(){var e=this,t=e.config;if(t.loading&&t.url)return l.msg("数据请求中",{icon:16,offset:[e.elem.offset().top+e.elem.height()/2-35-A.scrollTop()+"px",e.elem.offset().left+e.elem.width()/2-90-A.scrollLeft()+"px"],time:-1,anim:-1,fixed:!1})},M.prototype.setCheckData=function(e,t){var i=this,a=i.config,l=d.cache[i.key];l[e]&&l[e].constructor!==Array&&(l[e][a.checkName]=t)},M.prototype.syncCheckAll=function(){var e=this,t=e.config,i=e.layHeader.find('input[name="layTableCheckbox"]'),a=function(i){return e.eachCols(function(e,a){"checkbox"===a.type&&(a[t.checkName]=i)}),i};i[0]&&(d.checkStatus(e.key).isAll?(i[0].checked||(i.prop("checked",!0),e.renderForm("checkbox")),a(!0)):(i[0].checked&&(i.prop("checked",!1),e.renderForm("checkbox")),a(!1)))},M.prototype.getCssRule=function(e,t){var i=this,a=i.elem.find("style")[0],l=a.sheet||a.styleSheet||{},n=l.cssRules||l.rules;layui.each(n,function(a,l){if(l.selectorText===".laytable-cell-"+i.index+"-"+e)return t(l),!0})},M.prototype.fullSize=function(){var e,t=this,i=t.config,a=i.height;t.fullHeightGap&&(a=A.height()-t.fullHeightGap,a<135&&(a=135),t.elem.css("height",a)),e=parseFloat(a)-parseFloat(t.layHeader.height())-1,i.toolbar&&(e-=t.layTool.outerHeight()),i.page&&(e=e-t.layPage.outerHeight()-1),t.layMain.css("height",e)},M.prototype.getScrollWidth=function(e){var t=0;return e?t=e.offsetWidth-e.clientWidth:(e=document.createElement("div"),e.style.width="100px",e.style.height="100px",e.style.overflowY="scroll",document.body.appendChild(e),t=e.offsetWidth-e.clientWidth,document.body.removeChild(e)),t},M.prototype.scrollPatch=function(){var e=this,i=e.layMain.children("table"),a=e.layMain.width()-e.layMain.prop("clientWidth"),l=e.layMain.height()-e.layMain.prop("clientHeight"),n=e.getScrollWidth(e.layMain[0]),o=i.outerWidth()-e.layMain.width();if(e.autoColNums&&o<5&&!e.scrollPatchWStatus){var r=e.layHeader.eq(0).find("thead th:last-child"),d=r.data("field");e.getCssRule(d,function(t){var i=t.style.width||r.outerWidth();t.style.width=parseFloat(i)-n-o+"px",e.layMain.height()-e.layMain.prop("clientHeight")>0&&(t.style.width=parseFloat(t.style.width)-1+"px"),e.scrollPatchWStatus=!0})}if(a&&l){if(!e.elem.find(".layui-table-patch")[0]){var c=t('<th class="layui-table-patch"><div class="layui-table-cell"></div></th>');c.find("div").css({width:a}),e.layHeader.eq(0).find("thead tr").append(c)}}else e.layHeader.eq(0).find(".layui-table-patch").remove();var s=e.layMain.height(),u=s-l;e.layFixed.find(m).css("height",i.height()>u?u:"auto"),e.layFixRight[o>0?"removeClass":"addClass"](h),e.layFixRight.css("right",a-1)},M.prototype.events=function(){var e,a=this,n=a.config,o=t("body"),c={},u=a.layHeader.find("th"),h=".layui-table-cell",f=n.elem.attr("lay-filter");u.on("mousemove",function(e){var i=t(this),a=i.offset().left,l=e.clientX-a;i.attr("colspan")>1||i.data("unresize")||c.resizeStart||(c.allowResize=i.width()-l<=10,o.css("cursor",c.allowResize?"col-resize":""))}).on("mouseleave",function(){t(this);c.resizeStart||o.css("cursor","")}).on("mousedown",function(e){var i=t(this);if(c.allowResize){var l=i.data("field");e.preventDefault(),c.resizeStart=!0,c.offset=[e.clientX,e.clientY],a.getCssRule(l,function(e){var t=e.style.width||i.outerWidth();c.rule=e,c.ruleWidth=parseFloat(t),c.minWidth=i.data("minwidth")||n.cellMinWidth})}}),S.on("mousemove",function(t){if(c.resizeStart){if(t.preventDefault(),c.rule){var i=c.ruleWidth+t.clientX-c.offset[0];i<c.minWidth&&(i=c.minWidth),c.rule.style.width=i+"px",l.close(a.tipsIndex)}e=1}}).on("mouseup",function(t){c.resizeStart&&(c={},o.css("cursor",""),a.scrollPatch()),2===e&&(e=null)}),u.on("click",function(){var i,l=t(this),n=l.find(w),o=n.attr("lay-sort");return n[0]&&1!==e?(i="asc"===o?"desc":"desc"===o?null:"asc",void a.sort(l,i,null,!0)):e=2}).find(w+" .layui-edge ").on("click",function(e){var i=t(this),l=i.index(),n=i.parents("th").eq(0).data("field");layui.stope(e),0===l?a.sort(n,"asc",null,!0):a.sort(n,"desc",null,!0)}),a.elem.on("click",'input[name="layTableCheckbox"]+',function(){var e=t(this).prev(),i=a.layBody.find('input[name="layTableCheckbox"]'),l=e.parents("tr").eq(0).data("index"),n=e[0].checked,o="layTableAllChoose"===e.attr("lay-filter");o?(i.each(function(e,t){t.checked=n,a.setCheckData(e,n)}),a.syncCheckAll(),a.renderForm("checkbox")):(a.setCheckData(l,n),a.syncCheckAll()),layui.event.call(this,s,"checkbox("+f+")",{checked:n,data:d.cache[a.key]?d.cache[a.key][l]||{}:{},type:o?"all":"one"})}),a.layBody.on("mouseenter","tr",function(){var e=t(this),i=e.index();a.layBody.find("tr:eq("+i+")").addClass(T)}).on("mouseleave","tr",function(){var e=t(this),i=e.index();a.layBody.find("tr:eq("+i+")").removeClass(T)}),a.layBody.on("change","."+N,function(){var e=t(this),i=this.value,l=e.parent().data("field"),n=e.parents("tr").eq(0).data("index"),o=d.cache[a.key][n];o[l]=i,layui.event.call(this,s,"edit("+f+")",{value:i,data:o,field:l})}).on("blur","."+N,function(){var e,l=t(this),n=l.parent().data("field"),o=l.parents("tr").eq(0).data("index"),r=d.cache[a.key][o];a.eachCols(function(t,i){i.field==n&&i.templet&&(e=i.templet)}),l.siblings(h).html(e?i(t(e).html()||this.value).render(r):this.value),l.parent().data("content",this.value),l.remove()}),a.layBody.on("click","td",function(){var e=t(this),i=(e.data("field"),e.data("edit")),o=e.children(h);if(l.close(a.tipsIndex),!e.data("off"))if(i)if("select"===i);else{var d=t('<input class="layui-input '+N+'">');d[0].value=e.data("content")||o.text(),e.find("."+N)[0]||e.append(d),d.focus()}else o.find(".layui-form-switch,.layui-form-checkbox")[0]||Math.round(o.prop("scrollWidth"))>Math.round(o.outerWidth())&&(a.tipsIndex=l.tips(['<div class="layui-table-tips-main" style="margin-top: -'+(o.height()+16)+"px;"+function(){return"sm"===n.size?"padding: 4px 15px; font-size: 12px;":"lg"===n.size?"padding: 14px 15px;":""}()+'">',o.html(),"</div>",'<i class="layui-icon layui-table-tips-c">&#x1006;</i>'].join(""),o[0],{tips:[3,""],time:-1,anim:-1,maxWidth:r.ios||r.android?300:600,isOutAnim:!1,skin:"layui-table-tips",success:function(e,t){e.find(".layui-table-tips-c").on("click",function(){l.close(t)})}}))}),a.layBody.on("click","*[lay-event]",function(){var e=t(this),l=e.parents("tr").eq(0).data("index"),n=a.layBody.find('tr[data-index="'+l+'"]'),o="layui-table-click",r=d.cache[a.key][l];layui.event.call(this,s,"tool("+f+")",{data:d.clearCacheKey(r),event:e.attr("lay-event"),tr:n,del:function(){d.cache[a.key][l]=[],n.remove(),a.scrollPatch()},update:function(e){e=e||{},layui.each(e,function(e,l){if(e in r){var o,d=n.children('td[data-field="'+e+'"]');r[e]=l,a.eachCols(function(t,i){i.field==e&&i.templet&&(o=i.templet)}),d.children(h).html(o?i(t(o).html()||l).render(r):l),d.data("content",l)}})}}),n.addClass(o).siblings("tr").removeClass(o)}),a.layMain.on("scroll",function(){var e=t(this),i=e.scrollLeft(),n=e.scrollTop();a.layHeader.scrollLeft(i),a.layFixed.find(m).scrollTop(n),l.close(a.tipsIndex)}),A.on("resize",function(){a.fullSize(),a.scrollPatch()})},d.init=function(e,i){i=i||{};var a=this,l=t(e?'table[lay-filter="'+e+'"]':u+"[lay-data]"),n="Table element property lay-data configuration item has a syntax error: ";return l.each(function(){var a=t(this),l=a.attr("lay-data");try{l=new Function("return "+l)()}catch(r){o.error(n+l)}var c=[],s=t.extend({elem:this,cols:[],data:[],skin:a.attr("lay-skin"),size:a.attr("lay-size"),even:"string"==typeof a.attr("lay-even")},d.config,i,l);e&&a.hide(),a.find("thead>tr").each(function(e){s.cols[e]=[],t(this).children().each(function(i){var a=t(this),l=a.attr("lay-data");try{l=new Function("return "+l)()}catch(r){return o.error(n+l)}var d=t.extend({title:a.text(),colspan:a.attr("colspan")||0,rowspan:a.attr("rowspan")||0},l);d.colspan<2&&c.push(d),s.cols[e].push(d)})}),a.find("tbody>tr").each(function(e){var i=t(this),a={};i.children("td").each(function(e,i){var l=t(this),n=l.data("field");if(n)return a[n]=l.html()}),layui.each(c,function(e,t){var l=i.children("td").eq(e);a[t.field]=l.html()}),s.data[e]=a}),d.render(s)}),a},d.checkStatus=function(e){var t=0,i=0,a=[],l=d.cache[e]||[];return layui.each(l,function(e,l){return l.constructor===Array?void i++:void(l[d.config.checkName]&&(t++,a.push(d.clearCacheKey(l))))}),{data:a,isAll:!!l.length&&t===l.length-i}},c.config={},d.reload=function(e,i){var a=c.config[e];return i=i||{},a?(i.data&&i.data.constructor===Array&&delete a.data,d.render(t.extend(!0,{},a,i))):o.error("The ID option was not found in the table instance")},d.render=function(e){var t=new M(e);return c.call(t)},d.clearCacheKey=function(e){return e=t.extend({},e),delete e[d.config.checkName],delete e[d.config.indexName],e},d.init(),e(s,d)});layui.define("jquery",function(e){"use strict";var i=layui.$,n=(layui.hint(),layui.device(),{config:{},set:function(e){var n=this;return n.config=i.extend({},n.config,e),n},on:function(e,i){return layui.onevent.call(this,t,e,i)}}),t="carousel",a="layui-this",l=">*[carousel-item]>*",o="layui-carousel-left",r="layui-carousel-right",d="layui-carousel-prev",s="layui-carousel-next",u="layui-carousel-arrow",c="layui-carousel-ind",m=function(e){var t=this;t.config=i.extend({},t.config,n.config,e),t.render()};m.prototype.config={width:"600px",height:"280px",full:!1,arrow:"hover",indicator:"inside",autoplay:!0,interval:3e3,anim:"",trigger:"click",index:0},m.prototype.render=function(){var e=this,n=e.config;n.elem=i(n.elem),n.elem[0]&&(e.elemItem=n.elem.find(l),n.index<0&&(n.index=0),n.index>=e.elemItem.length&&(n.index=e.elemItem.length-1),n.interval<800&&(n.interval=800),n.full?n.elem.css({position:"fixed",width:"100%",height:"100%",zIndex:9999}):n.elem.css({width:n.width,height:n.height}),n.elem.attr("lay-anim",n.anim),e.elemItem.eq(n.index).addClass(a),e.elemItem.length<=1||(e.indicator(),e.arrow(),e.autoplay(),e.events()))},m.prototype.reload=function(e){var n=this;clearInterval(n.timer),n.config=i.extend({},n.config,e),n.render()},m.prototype.prevIndex=function(){var e=this,i=e.config,n=i.index-1;return n<0&&(n=e.elemItem.length-1),n},m.prototype.nextIndex=function(){var e=this,i=e.config,n=i.index+1;return n>=e.elemItem.length&&(n=0),n},m.prototype.addIndex=function(e){var i=this,n=i.config;e=e||1,n.index=n.index+e,n.index>=i.elemItem.length&&(n.index=0)},m.prototype.subIndex=function(e){var i=this,n=i.config;e=e||1,n.index=n.index-e,n.index<0&&(n.index=i.elemItem.length-1)},m.prototype.autoplay=function(){var e=this,i=e.config;i.autoplay&&(e.timer=setInterval(function(){e.slide()},i.interval))},m.prototype.arrow=function(){var e=this,n=e.config,t=i(['<button class="layui-icon '+u+'" lay-type="sub">'+("updown"===n.anim?"&#xe619;":"&#xe603;")+"</button>",'<button class="layui-icon '+u+'" lay-type="add">'+("updown"===n.anim?"&#xe61a;":"&#xe602;")+"</button>"].join(""));n.elem.attr("lay-arrow",n.arrow),n.elem.find("."+u)[0]&&n.elem.find("."+u).remove(),n.elem.append(t),t.on("click",function(){var n=i(this),t=n.attr("lay-type");e.slide(t)})},m.prototype.indicator=function(){var e=this,n=e.config,t=e.elemInd=i(['<div class="'+c+'"><ul>',function(){var i=[];return layui.each(e.elemItem,function(e){i.push("<li"+(n.index===e?' class="layui-this"':"")+"></li>")}),i.join("")}(),"</ul></div>"].join(""));n.elem.attr("lay-indicator",n.indicator),n.elem.find("."+c)[0]&&n.elem.find("."+c).remove(),n.elem.append(t),"updown"===n.anim&&t.css("margin-top",-(t.height()/2)),t.find("li").on("hover"===n.trigger?"mouseover":n.trigger,function(){var t=i(this),a=t.index();a>n.index?e.slide("add",a-n.index):a<n.index&&e.slide("sub",n.index-a)})},m.prototype.slide=function(e,i){var n=this,l=n.elemItem,u=n.config,c=u.index,m=u.elem.attr("lay-filter");n.haveSlide||("sub"===e?(n.subIndex(i),l.eq(u.index).addClass(d),setTimeout(function(){l.eq(c).addClass(r),l.eq(u.index).addClass(r)},50)):(n.addIndex(i),l.eq(u.index).addClass(s),setTimeout(function(){l.eq(c).addClass(o),l.eq(u.index).addClass(o)},50)),setTimeout(function(){l.removeClass(a+" "+d+" "+s+" "+o+" "+r),l.eq(u.index).addClass(a),n.haveSlide=!1},300),n.elemInd.find("li").eq(u.index).addClass(a).siblings().removeClass(a),n.haveSlide=!0,layui.event.call(this,t,"change("+m+")",{index:u.index,prevIndex:c,item:l.eq(u.index)}))},m.prototype.events=function(){var e=this,i=e.config;i.elem.data("haveEvents")||(i.elem.on("mouseenter",function(){clearInterval(e.timer)}).on("mouseleave",function(){e.autoplay()}),i.elem.data("haveEvents",!0))},n.render=function(e){var i=new m(e);return i},e(t,n)});layui.define("jquery",function(e){"use strict";var a=layui.jquery,i={config:{},index:layui.rate?layui.rate.index+1e4:0,set:function(e){var i=this;return i.config=a.extend({},i.config,e),i},on:function(e,a){return layui.onevent.call(this,n,e,a)}},l=function(){var e=this,a=e.config;return{setvalue:function(a){e.setvalue.call(e,a)},config:a}},n="rate",t="layui-rate",o="layui-icon-rate",s="layui-icon-rate-solid",u="layui-icon-rate-half",r="layui-icon-rate-solid layui-icon-rate-half",c="layui-icon-rate-solid layui-icon-rate",f="layui-icon-rate layui-icon-rate-half",v=function(e){var l=this;l.index=++i.index,l.config=a.extend({},l.config,i.config,e),l.render()};v.prototype.config={length:5,text:!1,readonly:!1,half:!1,value:0,theme:""},v.prototype.render=function(){var e=this,i=e.config,l=i.theme?'style="color: '+i.theme+';"':"";i.elem=a(i.elem),parseInt(i.value)!==i.value&&(i.half||(i.value=Math.ceil(i.value)-i.value<.5?Math.ceil(i.value):Math.floor(i.value)));for(var n='<ul class="layui-rate" '+(i.readonly?"readonly":"")+">",u=1;u<=i.length;u++){var r='<li class="layui-inline"><i class="layui-icon '+(u>Math.floor(i.value)?o:s)+'" '+l+"></i></li>";i.half&&parseInt(i.value)!==i.value&&u==Math.ceil(i.value)?n=n+'<li><i class="layui-icon layui-icon-rate-half" '+l+"></i></li>":n+=r}n+="</ul>"+(i.text?'<span class="layui-inline">'+i.value+"星":"")+"</span>";var c=i.elem,f=c.next("."+t);f[0]&&f.remove(),e.elemTemp=a(n),i.span=e.elemTemp.next("span"),i.setText&&i.setText(i.value),c.html(e.elemTemp),c.addClass("layui-inline"),i.readonly||e.action()},v.prototype.setvalue=function(e){var a=this,i=a.config;i.value=e,a.render()},v.prototype.action=function(){var e=this,i=e.config,l=e.elemTemp,n=l.find("i").width();l.children("li").each(function(e){var t=e+1,v=a(this);v.on("click",function(e){if(i.value=t,i.half){var o=e.pageX-a(this).offset().left;o<=n/2&&(i.value=i.value-.5)}i.text&&l.next("span").text(i.value+"星"),i.choose&&i.choose(i.value),i.setText&&i.setText(i.value)}),v.on("mousemove",function(e){if(l.find("i").each(function(){a(this).addClass(o).removeClass(r)}),l.find("i:lt("+t+")").each(function(){a(this).addClass(s).removeClass(f)}),i.half){var c=e.pageX-a(this).offset().left;c<=n/2&&v.children("i").addClass(u).removeClass(s)}}),v.on("mouseleave",function(){l.find("i").each(function(){a(this).addClass(o).removeClass(r)}),l.find("i:lt("+Math.floor(i.value)+")").each(function(){a(this).addClass(s).removeClass(f)}),i.half&&parseInt(i.value)!==i.value&&l.children("li:eq("+Math.floor(i.value)+")").children("i").addClass(u).removeClass(c)})})},v.prototype.events=function(){var e=this;e.config},i.render=function(e){var a=new v(e);return l.call(a)},e(n,i)});layui.define("jquery",function(e){"use strict";var t=layui.$,i={fixbar:function(e){var i,a,o="layui-fixbar",r="layui-fixbar-top",l=t(document),n=t("body");e=t.extend({showHeight:200},e),e.bar1=e.bar1===!0?"&#xe606;":e.bar1,e.bar2=e.bar2===!0?"&#xe607;":e.bar2,e.bgcolor=e.bgcolor?"background-color:"+e.bgcolor:"";var c=[e.bar1,e.bar2,"&#xe604;"],g=t(['<ul class="'+o+'">',e.bar1?'<li class="layui-icon" lay-type="bar1" style="'+e.bgcolor+'">'+c[0]+"</li>":"",e.bar2?'<li class="layui-icon" lay-type="bar2" style="'+e.bgcolor+'">'+c[1]+"</li>":"",'<li class="layui-icon '+r+'" lay-type="top" style="'+e.bgcolor+'">'+c[2]+"</li>","</ul>"].join("")),u=g.find("."+r),s=function(){var t=l.scrollTop();t>=e.showHeight?i||(u.show(),i=1):i&&(u.hide(),i=0)};t("."+o)[0]||("object"==typeof e.css&&g.css(e.css),n.append(g),s(),g.find("li").on("click",function(){var i=t(this),a=i.attr("lay-type");"top"===a&&t("html,body").animate({scrollTop:0},200),e.click&&e.click.call(this,a)}),l.on("scroll",function(){clearTimeout(a),a=setTimeout(function(){s()},100)}))},countdown:function(e,t,i){var a=this,o="function"==typeof t,r=new Date(e).getTime(),l=new Date(!t||o?(new Date).getTime():t).getTime(),n=r-l,c=[Math.floor(n/864e5),Math.floor(n/36e5)%24,Math.floor(n/6e4)%60,Math.floor(n/1e3)%60];o&&(i=t);var g=setTimeout(function(){a.countdown(e,l+1e3,i)},1e3);return i&&i(n>0?c:[0,0,0,0],t,g),n<=0&&clearTimeout(g),g},timeAgo:function(e,t){var i=this,a=[[],[]],o=(new Date).getTime()-new Date(e).getTime();return o>6912e5?(o=new Date(e),a[0][0]=i.digit(o.getFullYear(),4),a[0][1]=i.digit(o.getMonth()+1),a[0][2]=i.digit(o.getDate()),t||(a[1][0]=i.digit(o.getHours()),a[1][1]=i.digit(o.getMinutes()),a[1][2]=i.digit(o.getSeconds())),a[0].join("-")+" "+a[1].join(":")):o>=864e5?(o/1e3/60/60/24|0)+"天前":o>=36e5?(o/1e3/60/60|0)+"小时前":o>=12e4?(o/1e3/60|0)+"分钟前":o<0?"未来":"刚刚"},digit:function(e,t){var i="";e=String(e),t=t||2;for(var a=e.length;a<t;a++)i+="0";return e<Math.pow(10,t)?i+(0|e):e},toDateString:function(e,t){var i=this,a=new Date(e||new Date),o=[i.digit(a.getFullYear(),4),i.digit(a.getMonth()+1),i.digit(a.getDate())],r=[i.digit(a.getHours()),i.digit(a.getMinutes()),i.digit(a.getSeconds())];return t=t||"yyyy-MM-dd HH:mm:ss",t.replace(/yyyy/g,o[0]).replace(/MM/g,o[1]).replace(/dd/g,o[2]).replace(/HH/g,r[0]).replace(/mm/g,r[1]).replace(/ss/g,r[2])},escape:function(e){return String(e||"").replace(/&(?!#?[a-zA-Z0-9]+;)/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/'/g,"&#39;").replace(/"/g,"&quot;")}};e("util",i)});layui.define("jquery",function(e){"use strict";var l=layui.$,o=function(e){},t='<i class="layui-anim layui-anim-rotate layui-anim-loop layui-icon ">&#xe63e;</i>';o.prototype.load=function(e){var o,i,n,r,a=this,c=0;e=e||{};var f=l(e.elem);if(f[0]){var m=l(e.scrollElem||document),u=e.mb||50,s=!("isAuto"in e)||e.isAuto,v=e.end||"没有更多了",y=e.scrollElem&&e.scrollElem!==document,d="<cite>加载更多</cite>",h=l('<div class="layui-flow-more"><a href="javascript:;">'+d+"</a></div>");f.find(".layui-flow-more")[0]||f.append(h);var p=function(e,t){e=l(e),h.before(e),t=0==t||null,t?h.html(v):h.find("a").html(d),i=t,o=null,n&&n()},g=function(){o=!0,h.find("a").html(t),"function"==typeof e.done&&e.done(++c,p)};if(g(),h.find("a").on("click",function(){l(this);i||o||g()}),e.isLazyimg)var n=a.lazyimg({elem:e.elem+" img",scrollElem:e.scrollElem});return s?(m.on("scroll",function(){var e=l(this),t=e.scrollTop();r&&clearTimeout(r),i||(r=setTimeout(function(){var i=y?e.height():l(window).height(),n=y?e.prop("scrollHeight"):document.documentElement.scrollHeight;n-t-i<=u&&(o||g())},100))}),a):a}},o.prototype.lazyimg=function(e){var o,t=this,i=0;e=e||{};var n=l(e.scrollElem||document),r=e.elem||"img",a=e.scrollElem&&e.scrollElem!==document,c=function(e,l){var o=n.scrollTop(),r=o+l,c=a?function(){return e.offset().top-n.offset().top+o}():e.offset().top;if(c>=o&&c<=r&&!e.attr("src")){var m=e.attr("lay-src");layui.img(m,function(){var l=t.lazyimg.elem.eq(i);e.attr("src",m).removeAttr("lay-src"),l[0]&&f(l),i++})}},f=function(e,o){var f=a?(o||n).height():l(window).height(),m=n.scrollTop(),u=m+f;if(t.lazyimg.elem=l(r),e)c(e,f);else for(var s=0;s<t.lazyimg.elem.length;s++){var v=t.lazyimg.elem.eq(s),y=a?function(){return v.offset().top-n.offset().top+m}():v.offset().top;if(c(v,f),i=s,y>u)break}};if(f(),!o){var m;n.on("scroll",function(){var e=l(this);m&&clearTimeout(m),m=setTimeout(function(){f(null,e)},50)}),o=!0}return f},e("flow",new o)});layui.define(["layer","form"],function(t){"use strict";var e=layui.$,i=layui.layer,a=layui.form,l=(layui.hint(),layui.device()),n="layedit",o="layui-show",r="layui-disabled",c=function(){var t=this;t.index=0,t.config={tool:["strong","italic","underline","del","|","left","center","right","|","link","unlink","face","image"],hideTool:[],height:280}};c.prototype.set=function(t){var i=this;return e.extend(!0,i.config,t),i},c.prototype.on=function(t,e){return layui.onevent(n,t,e)},c.prototype.build=function(t,i){i=i||{};var a=this,n=a.config,r="layui-layedit",c=e("string"==typeof t?"#"+t:t),u="LAY_layedit_"+ ++a.index,d=c.next("."+r),y=e.extend({},n,i),f=function(){var t=[],e={};return layui.each(y.hideTool,function(t,i){e[i]=!0}),layui.each(y.tool,function(i,a){C[a]&&!e[a]&&t.push(C[a])}),t.join("")}(),m=e(['<div class="'+r+'">','<div class="layui-unselect layui-layedit-tool">'+f+"</div>",'<div class="layui-layedit-iframe">','<iframe id="'+u+'" name="'+u+'" textarea="'+t+'" frameborder="0"></iframe>',"</div>","</div>"].join(""));return l.ie&&l.ie<8?c.removeClass("layui-hide").addClass(o):(d[0]&&d.remove(),s.call(a,m,c[0],y),c.addClass("layui-hide").after(m),a.index)},c.prototype.getContent=function(t){var e=u(t);if(e[0])return d(e[0].document.body.innerHTML)},c.prototype.getText=function(t){var i=u(t);if(i[0])return e(i[0].document.body).text()},c.prototype.setContent=function(t,i,a){var l=u(t);l[0]&&(a?e(l[0].document.body).append(i):e(l[0].document.body).html(i),layedit.sync(t))},c.prototype.sync=function(t){var i=u(t);if(i[0]){var a=e("#"+i[1].attr("textarea"));a.val(d(i[0].document.body.innerHTML))}},c.prototype.getSelection=function(t){var e=u(t);if(e[0]){var i=m(e[0].document);return document.selection?i.text:i.toString()}};var s=function(t,i,a){var l=this,n=t.find("iframe");n.css({height:a.height}).on("load",function(){var o=n.contents(),r=n.prop("contentWindow"),c=o.find("head"),s=e(["<style>","*{margin: 0; padding: 0;}","body{padding: 10px; line-height: 20px; overflow-x: hidden; word-wrap: break-word; font: 14px Helvetica Neue,Helvetica,PingFang SC,Microsoft YaHei,Tahoma,Arial,sans-serif; -webkit-box-sizing: border-box !important; -moz-box-sizing: border-box !important; box-sizing: border-box !important;}","a{color:#01AAED; text-decoration:none;}a:hover{color:#c00}","p{margin-bottom: 10px;}","img{display: inline-block; border: none; vertical-align: middle;}","pre{margin: 10px 0; padding: 10px; line-height: 20px; border: 1px solid #ddd; border-left-width: 6px; background-color: #F2F2F2; color: #333; font-family: Courier New; font-size: 12px;}","</style>"].join("")),u=o.find("body");c.append(s),u.attr("contenteditable","true").css({"min-height":a.height}).html(i.value||""),y.apply(l,[r,n,i,a]),g.call(l,r,t,a)})},u=function(t){var i=e("#LAY_layedit_"+t),a=i.prop("contentWindow");return[a,i]},d=function(t){return 8==l.ie&&(t=t.replace(/<.+>/g,function(t){return t.toLowerCase()})),t},y=function(t,a,n,o){var r=t.document,c=e(r.body);c.on("keydown",function(t){var e=t.keyCode;if(13===e){var a=m(r),l=p(a),n=l.parentNode;if("pre"===n.tagName.toLowerCase()){if(t.shiftKey)return;return i.msg("请暂时用shift+enter"),!1}r.execCommand("formatBlock",!1,"<p>")}}),e(n).parents("form").on("submit",function(){var t=c.html();8==l.ie&&(t=t.replace(/<.+>/g,function(t){return t.toLowerCase()})),n.value=t}),c.on("paste",function(e){r.execCommand("formatBlock",!1,"<p>"),setTimeout(function(){f.call(t,c),n.value=c.html()},100)})},f=function(t){var i=this;i.document;t.find("*[style]").each(function(){var t=this.style.textAlign;this.removeAttribute("style"),e(this).css({"text-align":t||""})}),t.find("table").addClass("layui-table"),t.find("script,link").remove()},m=function(t){return t.selection?t.selection.createRange():t.getSelection().getRangeAt(0)},p=function(t){return t.endContainer||t.parentElement().childNodes[0]},v=function(t,i,a){var l=this.document,n=document.createElement(t);for(var o in i)n.setAttribute(o,i[o]);if(n.removeAttribute("text"),l.selection){var r=a.text||i.text;if("a"===t&&!r)return;r&&(n.innerHTML=r),a.pasteHTML(e(n).prop("outerHTML")),a.select()}else{var r=a.toString()||i.text;if("a"===t&&!r)return;r&&(n.innerHTML=r),a.deleteContents(),a.insertNode(n)}},h=function(t,i){var a=this.document,l="layedit-tool-active",n=p(m(a)),o=function(e){return t.find(".layedit-tool-"+e)};i&&i[i.hasClass(l)?"removeClass":"addClass"](l),t.find(">i").removeClass(l),o("unlink").addClass(r),e(n).parents().each(function(){var t=this.tagName.toLowerCase(),e=this.style.textAlign;"b"!==t&&"strong"!==t||o("b").addClass(l),"i"!==t&&"em"!==t||o("i").addClass(l),"u"===t&&o("u").addClass(l),"strike"===t&&o("d").addClass(l),"p"===t&&("center"===e?o("center").addClass(l):"right"===e?o("right").addClass(l):o("left").addClass(l)),"a"===t&&(o("link").addClass(l),o("unlink").removeClass(r))})},g=function(t,a,l){var n=t.document,o=e(n.body),c={link:function(i){var a=p(i),l=e(a).parent();b.call(o,{href:l.attr("href"),target:l.attr("target")},function(e){var a=l[0];"A"===a.tagName?a.href=e.url:v.call(t,"a",{target:e.target,href:e.url,text:e.url},i)})},unlink:function(t){n.execCommand("unlink")},face:function(e){x.call(this,function(i){v.call(t,"img",{src:i.src,alt:i.alt},e)})},image:function(a){var n=this;layui.use("upload",function(o){var r=l.uploadImage||{};o.render({url:r.url,method:r.type,elem:e(n).find("input")[0],done:function(e){0==e.code?(e.data=e.data||{},v.call(t,"img",{src:e.data.src,alt:e.data.title},a)):i.msg(e.msg||"上传失败")}})})},code:function(e){k.call(o,function(i){v.call(t,"pre",{text:i.code,"lay-lang":i.lang},e)})},help:function(){i.open({type:2,title:"帮助",area:["600px","380px"],shadeClose:!0,shade:.1,skin:"layui-layer-msg",content:["http://www.layui.com/about/layedit/help.html","no"]})}},s=a.find(".layui-layedit-tool"),u=function(){var i=e(this),a=i.attr("layedit-event"),l=i.attr("lay-command");if(!i.hasClass(r)){o.focus();var u=m(n);u.commonAncestorContainer;l?(n.execCommand(l),/justifyLeft|justifyCenter|justifyRight/.test(l)&&n.execCommand("formatBlock",!1,"<p>"),setTimeout(function(){o.focus()},10)):c[a]&&c[a].call(this,u),h.call(t,s,i)}},d=/image/;s.find(">i").on("mousedown",function(){var t=e(this),i=t.attr("layedit-event");d.test(i)||u.call(this)}).on("click",function(){var t=e(this),i=t.attr("layedit-event");d.test(i)&&u.call(this)}),o.on("click",function(){h.call(t,s),i.close(x.index)})},b=function(t,e){var l=this,n=i.open({type:1,id:"LAY_layedit_link",area:"350px",shade:.05,shadeClose:!0,moveType:1,title:"超链接",skin:"layui-layer-msg",content:['<ul class="layui-form" style="margin: 15px;">','<li class="layui-form-item">','<label class="layui-form-label" style="width: 60px;">URL</label>','<div class="layui-input-block" style="margin-left: 90px">','<input name="url" lay-verify="url" value="'+(t.href||"")+'" autofocus="true" autocomplete="off" class="layui-input">',"</div>","</li>",'<li class="layui-form-item">','<label class="layui-form-label" style="width: 60px;">打开方式</label>','<div class="layui-input-block" style="margin-left: 90px">','<input type="radio" name="target" value="_self" class="layui-input" title="当前窗口"'+("_self"!==t.target&&t.target?"":"checked")+">",'<input type="radio" name="target" value="_blank" class="layui-input" title="新窗口" '+("_blank"===t.target?"checked":"")+">","</div>","</li>",'<li class="layui-form-item" style="text-align: center;">','<button type="button" lay-submit lay-filter="layedit-link-yes" class="layui-btn"> 确定 </button>','<button style="margin-left: 20px;" type="button" class="layui-btn layui-btn-primary"> 取消 </button>',"</li>","</ul>"].join(""),success:function(t,n){var o="submit(layedit-link-yes)";a.render("radio"),t.find(".layui-btn-primary").on("click",function(){i.close(n),l.focus()}),a.on(o,function(t){i.close(b.index),e&&e(t.field)})}});b.index=n},x=function(t){var a=function(){var t=["[微笑]","[嘻嘻]","[哈哈]","[可爱]","[可怜]","[挖鼻]","[吃惊]","[害羞]","[挤眼]","[闭嘴]","[鄙视]","[爱你]","[泪]","[偷笑]","[亲亲]","[生病]","[太开心]","[白眼]","[右哼哼]","[左哼哼]","[嘘]","[衰]","[委屈]","[吐]","[哈欠]","[抱抱]","[怒]","[疑问]","[馋嘴]","[拜拜]","[思考]","[汗]","[困]","[睡]","[钱]","[失望]","[酷]","[色]","[哼]","[鼓掌]","[晕]","[悲伤]","[抓狂]","[黑线]","[阴险]","[怒骂]","[互粉]","[心]","[伤心]","[猪头]","[熊猫]","[兔子]","[ok]","[耶]","[good]","[NO]","[赞]","[来]","[弱]","[草泥马]","[神马]","[囧]","[浮云]","[给力]","[围观]","[威武]","[奥特曼]","[礼物]","[钟]","[话筒]","[蜡烛]","[蛋糕]"],e={};return layui.each(t,function(t,i){e[i]=layui.cache.dir+"images/face/"+t+".gif"}),e}();return x.hide=x.hide||function(t){"face"!==e(t.target).attr("layedit-event")&&i.close(x.index)},x.index=i.tips(function(){var t=[];return layui.each(a,function(e,i){t.push('<li title="'+e+'"><img src="'+i+'" alt="'+e+'"></li>')}),'<ul class="layui-clear">'+t.join("")+"</ul>"}(),this,{tips:1,time:0,skin:"layui-box layui-util-face",maxWidth:500,success:function(l,n){l.css({marginTop:-4,marginLeft:-10}).find(".layui-clear>li").on("click",function(){t&&t({src:a[this.title],alt:this.title}),i.close(n)}),e(document).off("click",x.hide).on("click",x.hide)}})},k=function(t){var e=this,l=i.open({type:1,id:"LAY_layedit_code",area:"550px",shade:.05,shadeClose:!0,moveType:1,title:"插入代码",skin:"layui-layer-msg",content:['<ul class="layui-form layui-form-pane" style="margin: 15px;">','<li class="layui-form-item">','<label class="layui-form-label">请选择语言</label>','<div class="layui-input-block">','<select name="lang">','<option value="JavaScript">JavaScript</option>','<option value="HTML">HTML</option>','<option value="CSS">CSS</option>','<option value="Java">Java</option>','<option value="PHP">PHP</option>','<option value="C#">C#</option>','<option value="Python">Python</option>','<option value="Ruby">Ruby</option>','<option value="Go">Go</option>',"</select>","</div>","</li>",'<li class="layui-form-item layui-form-text">','<label class="layui-form-label">代码</label>','<div class="layui-input-block">','<textarea name="code" lay-verify="required" autofocus="true" class="layui-textarea" style="height: 200px;"></textarea>',"</div>","</li>",'<li class="layui-form-item" style="text-align: center;">','<button type="button" lay-submit lay-filter="layedit-code-yes" class="layui-btn"> 确定 </button>','<button style="margin-left: 20px;" type="button" class="layui-btn layui-btn-primary"> 取消 </button>',"</li>","</ul>"].join(""),success:function(l,n){var o="submit(layedit-code-yes)";a.render("select"),l.find(".layui-btn-primary").on("click",function(){i.close(n),e.focus()}),a.on(o,function(e){i.close(k.index),t&&t(e.field)})}});k.index=l},C={html:'<i class="layui-icon layedit-tool-html" title="HTML源代码" lay-command="html" layedit-event="html"">&#xe64b;</i><span class="layedit-tool-mid"></span>',strong:'<i class="layui-icon layedit-tool-b" title="加粗" lay-command="Bold" layedit-event="b"">&#xe62b;</i>',italic:'<i class="layui-icon layedit-tool-i" title="斜体" lay-command="italic" layedit-event="i"">&#xe644;</i>',underline:'<i class="layui-icon layedit-tool-u" title="下划线" lay-command="underline" layedit-event="u"">&#xe646;</i>',del:'<i class="layui-icon layedit-tool-d" title="删除线" lay-command="strikeThrough" layedit-event="d"">&#xe64f;</i>',"|":'<span class="layedit-tool-mid"></span>',left:'<i class="layui-icon layedit-tool-left" title="左对齐" lay-command="justifyLeft" layedit-event="left"">&#xe649;</i>',center:'<i class="layui-icon layedit-tool-center" title="居中对齐" lay-command="justifyCenter" layedit-event="center"">&#xe647;</i>',right:'<i class="layui-icon layedit-tool-right" title="右对齐" lay-command="justifyRight" layedit-event="right"">&#xe648;</i>',link:'<i class="layui-icon layedit-tool-link" title="插入链接" layedit-event="link"">&#xe64c;</i>',unlink:'<i class="layui-icon layedit-tool-unlink layui-disabled" title="清除链接" lay-command="unlink" layedit-event="unlink"">&#xe64d;</i>',face:'<i class="layui-icon layedit-tool-face" title="表情" layedit-event="face"">&#xe650;</i>',image:'<i class="layui-icon layedit-tool-image" title="图片" layedit-event="image">&#xe64a;<input type="file" name="file"></i>',code:'<i class="layui-icon layedit-tool-code" title="插入代码" layedit-event="code">&#xe64e;</i>',help:'<i class="layui-icon layedit-tool-help" title="帮助" layedit-event="help">&#xe607;</i>'},w=new c;t(n,w)});layui.define("jquery",function(e){"use strict";var a=layui.$,l="http://www.layui.com/doc/modules/code.html";e("code",function(e){var t=[];e=e||{},e.elem=a(e.elem||".layui-code"),e.about=!("about"in e)||e.about,e.elem.each(function(){t.push(this)}),layui.each(t.reverse(),function(t,i){var c=a(i),o=c.html();(c.attr("lay-encode")||e.encode)&&(o=o.replace(/&(?!#?[a-zA-Z0-9]+;)/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/'/g,"&#39;").replace(/"/g,"&quot;")),c.html('<ol class="layui-code-ol"><li>'+o.replace(/[\r\t\n]+/g,"</li><li>")+"</li></ol>"),c.find(">.layui-code-h3")[0]||c.prepend('<h3 class="layui-code-h3">'+(c.attr("lay-title")||e.title||"code")+(e.about?'<a href="'+l+'" target="_blank">layui.code</a>':"")+"</h3>");var d=c.find(">.layui-code-ol");c.addClass("layui-box layui-code-view"),(c.attr("lay-skin")||e.skin)&&c.addClass("layui-code-"+(c.attr("lay-skin")||e.skin)),(d.find("li").length/100|0)>0&&d.css("margin-left",(d.find("li").length/100|0)+"px"),(c.attr("lay-height")||e.height)&&d.css("max-height",c.attr("lay-height")||e.height)})})}).addcss("modules/code.css","skincodecss");
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/layui.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/layui.js
new file mode 100644
index 0000000..1a5e4e2
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/layui/layui.js
@@ -0,0 +1,5 @@
+/*! MIT Licensed */;!function(t){"use strict";var e=t.document,n={modules:{},status:{},timeout:10,event:{}},r=function(){this.v="2.6.8"},o=t.LAYUI_GLOBAL||{},a=function(){var t=e.currentScript?e.currentScript.src:function(){for(var t,n=e.scripts,r=n.length-1,o=r;o>0;o--)if("interactive"===n[o].readyState){t=n[o].src;break}return t||n[r].src}();return n.dir=o.dir||t.substring(0,t.lastIndexOf("/")+1)}(),i=function(e,n){n=n||"log",t.console&&console[n]&&console[n]("layui error hint: "+e)},u="undefined"!=typeof opera&&"[object Opera]"===opera.toString(),l=n.builtin={lay:"lay",layer:"layer",laydate:"laydate",laypage:"laypage",laytpl:"laytpl",layedit:"layedit",form:"form",upload:"upload",dropdown:"dropdown",transfer:"transfer",tree:"tree",table:"table",element:"element",rate:"rate",colorpicker:"colorpicker",slider:"slider",carousel:"carousel",flow:"flow",util:"util",code:"code",jquery:"jquery",all:"all","layui.all":"layui.all"};r.prototype.cache=n,r.prototype.define=function(t,e){var r=this,o="function"==typeof t,a=function(){var t=function(t,e){layui[t]=e,n.status[t]=!0};return"function"==typeof e&&e(function(r,o){t(r,o),n.callback[r]=function(){e(t)}}),this};return o&&(e=t,t=[]),r.use(t,a,null,"define"),r},r.prototype.use=function(r,o,c,s){function p(t,e){var r="PLaySTATION 3"===navigator.platform?/^complete$/:/^(complete|loaded)$/;("load"===t.type||r.test((t.currentTarget||t.srcElement).readyState))&&(n.modules[h]=e,v.removeChild(b),function o(){return++m>1e3*n.timeout/4?i(h+" is not a valid module","error"):void(n.status[h]?f():setTimeout(o,4))}())}function f(){c.push(layui[h]),r.length>1?y.use(r.slice(1),o,c,s):"function"==typeof o&&function(){return layui.jquery&&"function"==typeof layui.jquery&&"define"!==s?layui.jquery(function(){o.apply(layui,c)}):void o.apply(layui,c)}()}var y=this,d=n.dir=n.dir?n.dir:a,v=e.getElementsByTagName("head")[0];r=function(){return"string"==typeof r?[r]:"function"==typeof r?(o=r,["all"]):r}(),t.jQuery&&jQuery.fn.on&&(y.each(r,function(t,e){"jquery"===e&&r.splice(t,1)}),layui.jquery=layui.$=jQuery);var h=r[0],m=0;if(c=c||[],n.host=n.host||(d.match(/\/\/([\s\S]+?)\//)||["//"+location.host+"/"])[0],0===r.length||layui["layui.all"]&&l[h])return f(),y;var g=(l[h]?d+"modules/":/^\{\/\}/.test(y.modules[h])?"":n.base||"")+(y.modules[h]||h)+".js";if(g=g.replace(/^\{\/\}/,""),!n.modules[h]&&layui[h]&&(n.modules[h]=g),n.modules[h])!function S(){return++m>1e3*n.timeout/4?i(h+" is not a valid module","error"):void("string"==typeof n.modules[h]&&n.status[h]?f():setTimeout(S,4))}();else{var b=e.createElement("script");b.async=!0,b.charset="utf-8",b.src=g+function(){var t=n.version===!0?n.v||(new Date).getTime():n.version||"";return t?"?v="+t:""}(),v.appendChild(b),!b.attachEvent||b.attachEvent.toString&&b.attachEvent.toString().indexOf("[native code")<0||u?b.addEventListener("load",function(t){p(t,g)},!1):b.attachEvent("onreadystatechange",function(t){p(t,g)}),n.modules[h]=g}return y},r.prototype.getStyle=function(e,n){var r=e.currentStyle?e.currentStyle:t.getComputedStyle(e,null);return r[r.getPropertyValue?"getPropertyValue":"getAttribute"](n)},r.prototype.link=function(t,r,o){var a=this,u=e.getElementsByTagName("head")[0],l=e.createElement("link");"string"==typeof r&&(o=r);var c=(o||t).replace(/\.|\//g,""),s=l.id="layuicss-"+c,p="creating",f=0;return l.rel="stylesheet",l.href=t+(n.debug?"?v="+(new Date).getTime():""),l.media="all",e.getElementById(s)||u.appendChild(l),"function"!=typeof r?a:(function y(o){var u=100,l=e.getElementById(s);return++f>1e3*n.timeout/u?i(t+" timeout"):void(1989===parseInt(a.getStyle(l,"width"))?(o===p&&l.removeAttribute("lay-status"),l.getAttribute("lay-status")===p?setTimeout(y,u):r()):(l.setAttribute("lay-status",p),setTimeout(function(){y(p)},u)))}(),a)},r.prototype.addcss=function(t,e,r){return layui.link(n.dir+"css/"+t,e,r)},n.callback={},r.prototype.factory=function(t){if(layui[t])return"function"==typeof n.callback[t]?n.callback[t]:null},r.prototype.img=function(t,e,n){var r=new Image;return r.src=t,r.complete?e(r):(r.onload=function(){r.onload=null,"function"==typeof e&&e(r)},void(r.onerror=function(t){r.onerror=null,"function"==typeof n&&n(t)}))},r.prototype.config=function(t){t=t||{};for(var e in t)n[e]=t[e];return this},r.prototype.modules=function(){var t={};for(var e in l)t[e]=l[e];return t}(),r.prototype.extend=function(t){var e=this;t=t||{};for(var n in t)e[n]||e.modules[n]?i(n+" Module already exists","error"):e.modules[n]=t[n];return e},r.prototype.router=function(t){var e=this,t=t||location.hash,n={path:[],search:{},hash:(t.match(/[^#](#.*$)/)||[])[1]||""};return/^#\//.test(t)?(t=t.replace(/^#\//,""),n.href="/"+t,t=t.replace(/([^#])(#.*$)/,"$1").split("/")||[],e.each(t,function(t,e){/^\w+=/.test(e)?function(){e=e.split("="),n.search[e[0]]=e[1]}():n.path.push(e)}),n):n},r.prototype.url=function(t){var e=this,n={pathname:function(){var e=t?function(){var e=(t.match(/\.[^.]+?\/.+/)||[])[0]||"";return e.replace(/^[^\/]+/,"").replace(/\?.+/,"")}():location.pathname;return e.replace(/^\//,"").split("/")}(),search:function(){var n={},r=(t?function(){var e=(t.match(/\?.+/)||[])[0]||"";return e.replace(/\#.+/,"")}():location.search).replace(/^\?+/,"").split("&");return e.each(r,function(t,e){var r=e.indexOf("="),o=function(){return r<0?e.substr(0,e.length):0!==r&&e.substr(0,r)}();o&&(n[o]=r>0?e.substr(r+1):null)}),n}(),hash:e.router(function(){return t?(t.match(/#.+/)||[])[0]||"/":location.hash}())};return n},r.prototype.data=function(e,n,r){if(e=e||"layui",r=r||localStorage,t.JSON&&t.JSON.parse){if(null===n)return delete r[e];n="object"==typeof n?n:{key:n};try{var o=JSON.parse(r[e])}catch(a){var o={}}return"value"in n&&(o[n.key]=n.value),n.remove&&delete o[n.key],r[e]=JSON.stringify(o),n.key?o[n.key]:o}},r.prototype.sessionData=function(t,e){return this.data(t,e,sessionStorage)},r.prototype.device=function(e){var n=navigator.userAgent.toLowerCase(),r=function(t){var e=new RegExp(t+"/([^\\s\\_\\-]+)");return t=(n.match(e)||[])[1],t||!1},o={os:function(){return/windows/.test(n)?"windows":/linux/.test(n)?"linux":/iphone|ipod|ipad|ios/.test(n)?"ios":/mac/.test(n)?"mac":void 0}(),ie:function(){return!!(t.ActiveXObject||"ActiveXObject"in t)&&((n.match(/msie\s(\d+)/)||[])[1]||"11")}(),weixin:r("micromessenger")};return e&&!o[e]&&(o[e]=r(e)),o.android=/android/.test(n),o.ios="ios"===o.os,o.mobile=!(!o.android&&!o.ios),o},r.prototype.hint=function(){return{error:i}},r.prototype._typeof=function(t){return null===t?String(t):"object"==typeof t||"function"==typeof t?function(){var e=Object.prototype.toString.call(t).match(/\s(.+)\]$/)||[],n="Function|Array|Date|RegExp|Object|Error|Symbol";return e=e[1]||"Object",new RegExp("\\b("+n+")\\b").test(e)?e.toLowerCase():"object"}():typeof t},r.prototype._isArray=function(e){var n,r=this,o=r._typeof(e);return!(!e||"object"!=typeof e||e===t)&&(n="length"in e&&e.length,"array"===o||0===n||"number"==typeof n&&n>0&&n-1 in e)},r.prototype.each=function(t,e){var n,r=this,o=function(t,n){return e.call(n[t],t,n[t])};if("function"!=typeof e)return r;if(t=t||[],r._isArray(t))for(n=0;n<t.length&&!o(n,t);n++);else for(n in t)if(o(n,t))break;return r},r.prototype.sort=function(t,e,n){var r=JSON.parse(JSON.stringify(t||[]));return e?(r.sort(function(t,n){var r=t[e],o=n[e],a=[!isNaN(r),!isNaN(o)];return a[0]&&a[1]?r&&!o&&0!==o?1:!r&&0!==r&&o?-1:r-o:a[0]||a[1]?a[0]||!a[1]?-1:!a[0]||a[1]?1:void 0:r>o?1:r<o?-1:0}),n&&r.reverse(),r):r},r.prototype.stope=function(e){e=e||t.event;try{e.stopPropagation()}catch(n){e.cancelBubble=!0}};var c="LAYUI-EVENT-REMOVE";r.prototype.onevent=function(t,e,n){return"string"!=typeof t||"function"!=typeof n?this:r.event(t,e,null,n)},r.prototype.event=r.event=function(t,e,r,o){var a=this,i=null,u=(e||"").match(/\((.*)\)$/)||[],l=(t+"."+e).replace(u[0],""),s=u[1]||"",p=function(t,e){var n=e&&e.call(a,r);n===!1&&null===i&&(i=!1)};return r===c?(delete(a.cache.event[l]||{})[s],a):o?(n.event[l]=n.event[l]||{},n.event[l][s]=[o],this):(layui.each(n.event[l],function(t,e){return"{*}"===s?void layui.each(e,p):(""===t&&layui.each(e,p),void(s&&t===s&&layui.each(e,p)))}),i)},r.prototype.on=function(t,e,n){var r=this;return r.onevent.call(r,e,t,n)},r.prototype.off=function(t,e){var n=this;return n.event.call(n,e,t,c)},t.layui=new r}(window);layui.define(function(a){var i=layui.cache;layui.config({dir:i.dir.replace(/lay\/dest\/$/,"")}),a("layui.all",layui.v)});!function(t){"use strict";var e="lay",n=t.document,r=function(t){return new o(t)},o=function(t){for(var e=0,r="object"==typeof t?[t]:(this.selector=t,n.querySelectorAll(t||null));e<r.length;e++)this.push(r[e])};o.prototype=[],o.prototype.constructor=o,r.extend=function(){var t=1,e=arguments,n=function(t,e){t=t||("array"===layui._typeof(e)?[]:{});for(var r in e)t[r]=e[r]&&e[r].constructor===Object?n(t[r],e[r]):e[r];return t};for(e[0]="object"==typeof e[0]?e[0]:{};t<e.length;t++)"object"==typeof e[t]&&n(e[0],e[t]);return e[0]},r.v="1.0.8",r.ie=function(){var e=navigator.userAgent.toLowerCase();return!!(t.ActiveXObject||"ActiveXObject"in t)&&((e.match(/msie\s(\d+)/)||[])[1]||"11")}(),r.layui=layui||{},r.getPath=layui.cache.dir,r.stope=layui.stope,r.each=function(){return layui.each.apply(layui,arguments),this},r.digit=function(t,e,n){var r="";t=String(t),e=e||2;for(var o=t.length;o<e;o++)r+="0";return t<Math.pow(10,e)?r+(0|t):t},r.elem=function(t,e){var o=n.createElement(t);return r.each(e||{},function(t,e){o.setAttribute(t,e)}),o},r.hasScrollbar=function(){return n.body.scrollHeight>(t.innerHeight||n.documentElement.clientHeight)},r.position=function(e,o,i){if(o){i=i||{},e!==n&&e!==r("body")[0]||(i.clickType="right");var c="right"===i.clickType?function(){var e=i.e||t.event||{};return{left:e.clientX,top:e.clientY,right:e.clientX,bottom:e.clientY}}():e.getBoundingClientRect(),u=o.offsetWidth,a=o.offsetHeight,f=function(t){return t=t?"scrollLeft":"scrollTop",n.body[t]|n.documentElement[t]},s=function(t){return n.documentElement[t?"clientWidth":"clientHeight"]},l=5,h=c.left,p=c.bottom;"center"===i.align?h-=(u-e.offsetWidth)/2:"right"===i.align&&(h=h-u+e.offsetWidth),h+u+l>s("width")&&(h=s("width")-u-l),h<l&&(h=l),p+a+l>s()&&(c.top>a+l?p=c.top-a-2*l:"right"===i.clickType&&(p=s()-a-2*l,p<0&&(p=0)));var y=i.position;if(y&&(o.style.position=y),o.style.left=h+("fixed"===y?0:f(1))+"px",o.style.top=p+("fixed"===y?0:f())+"px",!r.hasScrollbar()){var d=o.getBoundingClientRect();!i.SYSTEM_RELOAD&&d.bottom+l>s()&&(i.SYSTEM_RELOAD=!0,setTimeout(function(){r.position(e,o,i)},50))}}},r.options=function(t,e){var n=r(t),o=e||"lay-options";try{return new Function("return "+(n.attr(o)||"{}"))()}catch(i){return hint.error("parseerror\uff1a"+i,"error"),{}}},r.isTopElem=function(t){var e=[n,r("body")[0]],o=!1;return r.each(e,function(e,n){if(n===t)return o=!0}),o},o.addStr=function(t,e){return t=t.replace(/\s+/," "),e=e.replace(/\s+/," ").split(" "),r.each(e,function(e,n){new RegExp("\\b"+n+"\\b").test(t)||(t=t+" "+n)}),t.replace(/^\s|\s$/,"")},o.removeStr=function(t,e){return t=t.replace(/\s+/," "),e=e.replace(/\s+/," ").split(" "),r.each(e,function(e,n){var r=new RegExp("\\b"+n+"\\b");r.test(t)&&(t=t.replace(r,""))}),t.replace(/\s+/," ").replace(/^\s|\s$/,"")},o.prototype.find=function(t){var e=this,n=0,o=[],i="object"==typeof t;return this.each(function(r,c){for(var u=i?c.contains(t):c.querySelectorAll(t||null);n<u.length;n++)o.push(u[n]);e.shift()}),i||(e.selector=(e.selector?e.selector+" ":"")+t),r.each(o,function(t,n){e.push(n)}),e},o.prototype.each=function(t){return r.each.call(this,this,t)},o.prototype.addClass=function(t,e){return this.each(function(n,r){r.className=o[e?"removeStr":"addStr"](r.className,t)})},o.prototype.removeClass=function(t){return this.addClass(t,!0)},o.prototype.hasClass=function(t){var e=!1;return this.each(function(n,r){new RegExp("\\b"+t+"\\b").test(r.className)&&(e=!0)}),e},o.prototype.css=function(t,e){var n=this,o=function(t){return isNaN(t)?t:t+"px"};return"string"==typeof t&&void 0===e?function(){if(n.length>0)return n[0].style[t]}():n.each(function(n,i){"object"==typeof t?r.each(t,function(t,e){i.style[t]=o(e)}):i.style[t]=o(e)})},o.prototype.width=function(t){var e=this;return void 0===t?function(){if(e.length>0)return e[0].offsetWidth}():e.each(function(n,r){e.css("width",t)})},o.prototype.height=function(t){var e=this;return void 0===t?function(){if(e.length>0)return e[0].offsetHeight}():e.each(function(n,r){e.css("height",t)})},o.prototype.attr=function(t,e){var n=this;return void 0===e?function(){if(n.length>0)return n[0].getAttribute(t)}():n.each(function(n,r){r.setAttribute(t,e)})},o.prototype.removeAttr=function(t){return this.each(function(e,n){n.removeAttribute(t)})},o.prototype.html=function(t){var e=this;return void 0===t?function(){if(e.length>0)return e[0].innerHTML}():this.each(function(e,n){n.innerHTML=t})},o.prototype.val=function(t){var e=this;return void 0===t?function(){if(e.length>0)return e[0].value}():this.each(function(e,n){n.value=t})},o.prototype.append=function(t){return this.each(function(e,n){"object"==typeof t?n.appendChild(t):n.innerHTML=n.innerHTML+t})},o.prototype.remove=function(t){return this.each(function(e,n){t?n.removeChild(t):n.parentNode.removeChild(n)})},o.prototype.on=function(t,e){return this.each(function(n,r){r.attachEvent?r.attachEvent("on"+t,function(t){t.target=t.srcElement,e.call(r,t)}):r.addEventListener(t,e,!1)})},o.prototype.off=function(t,e){return this.each(function(n,r){r.detachEvent?r.detachEvent("on"+t,e):r.removeEventListener(t,e,!1)})},t.lay=r,t.layui&&layui.define&&layui.define(function(t){t(e,r)})}(window,window.document);layui.define(function(e){"use strict";var r={open:"{{",close:"}}"},c={exp:function(e){return new RegExp(e,"g")},query:function(e,c,t){var o=["#([\\s\\S])+?","([^{#}])*?"][e||0];return n((c||"")+r.open+o+r.close+(t||""))},escape:function(e){return String(e||"").replace(/&(?!#?[a-zA-Z0-9]+;)/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/'/g,"&#39;").replace(/"/g,"&quot;")},error:function(e,r){var c="Laytpl Error: ";return"object"==typeof console&&console.error(c+e+"\n"+(r||"")),c+e}},n=c.exp,t=function(e){this.tpl=e};t.pt=t.prototype,window.errors=0,t.pt.parse=function(e,t){var o=this,p=e,a=n("^"+r.open+"#",""),l=n(r.close+"$","");e=e.replace(/\s+|\r|\t|\n/g," ").replace(n(r.open+"#"),r.open+"# ").replace(n(r.close+"}"),"} "+r.close).replace(/\\/g,"\\\\").replace(n(r.open+"!(.+?)!"+r.close),function(e){return e=e.replace(n("^"+r.open+"!"),"").replace(n("!"+r.close),"").replace(n(r.open+"|"+r.close),function(e){return e.replace(/(.)/g,"\\$1")})}).replace(/(?="|')/g,"\\").replace(c.query(),function(e){return e=e.replace(a,"").replace(l,""),'";'+e.replace(/\\(.)/g,"$1")+';view+="'}).replace(c.query(1),function(e){var c='"+(';return e.replace(/\s/g,"")===r.open+r.close?"":(e=e.replace(n(r.open+"|"+r.close),""),/^=/.test(e)&&(e=e.replace(/^=/,""),c='"+_escape_('),c+e.replace(/\\(.)/g,"$1")+')+"')}),e='"use strict";var view = "'+e+'";return view;';try{return o.cache=e=new Function("d, _escape_",e),e(t,c.escape)}catch(u){return delete o.cache,c.error(u,p)}},t.pt.render=function(e,r){var n,t=this;return e?(n=t.cache?t.cache(e,c.escape):t.parse(t.tpl,e),r?void r(n):n):c.error("no data")};var o=function(e){return"string"!=typeof e?c.error("Template not found"):new t(e)};o.config=function(e){e=e||{};for(var c in e)r[c]=e[c]},o.v="1.2.0",e("laytpl",o)});layui.define(function(e){"use strict";var a=document,t="getElementById",n="getElementsByTagName",i="laypage",r="layui-disabled",u=function(e){var a=this;a.config=e||{},a.config.index=++s.index,a.render(!0)};u.prototype.type=function(){var e=this.config;if("object"==typeof e.elem)return void 0===e.elem.length?2:3},u.prototype.view=function(){var e=this,a=e.config,t=a.groups="groups"in a?0|a.groups:5;a.layout="object"==typeof a.layout?a.layout:["prev","page","next"],a.count=0|a.count,a.curr=0|a.curr||1,a.limits="object"==typeof a.limits?a.limits:[10,20,30,40,50],a.limit=0|a.limit||10,a.pages=Math.ceil(a.count/a.limit)||1,a.curr>a.pages&&(a.curr=a.pages),t<0?t=1:t>a.pages&&(t=a.pages),a.prev="prev"in a?a.prev:"&#x4E0A;&#x4E00;&#x9875;",a.next="next"in a?a.next:"&#x4E0B;&#x4E00;&#x9875;";var n=a.pages>t?Math.ceil((a.curr+(t>1?1:0))/(t>0?t:1)):1,i={prev:function(){return a.prev?'<a href="javascript:;" class="layui-laypage-prev'+(1==a.curr?" "+r:"")+'" data-page="'+(a.curr-1)+'">'+a.prev+"</a>":""}(),page:function(){var e=[];if(a.count<1)return"";n>1&&a.first!==!1&&0!==t&&e.push('<a href="javascript:;" class="layui-laypage-first" data-page="1"  title="&#x9996;&#x9875;">'+(a.first||1)+"</a>");var i=Math.floor((t-1)/2),r=n>1?a.curr-i:1,u=n>1?function(){var e=a.curr+(t-i-1);return e>a.pages?a.pages:e}():t;for(u-r<t-1&&(r=u-t+1),a.first!==!1&&r>2&&e.push('<span class="layui-laypage-spr">&#x2026;</span>');r<=u;r++)r===a.curr?e.push('<span class="layui-laypage-curr"><em class="layui-laypage-em" '+(/^#/.test(a.theme)?'style="background-color:'+a.theme+';"':"")+"></em><em>"+r+"</em></span>"):e.push('<a href="javascript:;" data-page="'+r+'">'+r+"</a>");return a.pages>t&&a.pages>u&&a.last!==!1&&(u+1<a.pages&&e.push('<span class="layui-laypage-spr">&#x2026;</span>'),0!==t&&e.push('<a href="javascript:;" class="layui-laypage-last" title="&#x5C3E;&#x9875;"  data-page="'+a.pages+'">'+(a.last||a.pages)+"</a>")),e.join("")}(),next:function(){return a.next?'<a href="javascript:;" class="layui-laypage-next'+(a.curr==a.pages?" "+r:"")+'" data-page="'+(a.curr+1)+'">'+a.next+"</a>":""}(),count:'<span class="layui-laypage-count">\u5171 '+a.count+" \u6761</span>",limit:function(){var e=['<span class="layui-laypage-limits"><select lay-ignore>'];return layui.each(a.limits,function(t,n){e.push('<option value="'+n+'"'+(n===a.limit?"selected":"")+">"+n+" \u6761/\u9875</option>")}),e.join("")+"</select></span>"}(),refresh:['<a href="javascript:;" data-page="'+a.curr+'" class="layui-laypage-refresh">','<i class="layui-icon layui-icon-refresh"></i>',"</a>"].join(""),skip:function(){return['<span class="layui-laypage-skip">&#x5230;&#x7B2C;','<input type="text" min="1" value="'+a.curr+'" class="layui-input">','&#x9875;<button type="button" class="layui-laypage-btn">&#x786e;&#x5b9a;</button>',"</span>"].join("")}()};return['<div class="layui-box layui-laypage layui-laypage-'+(a.theme?/^#/.test(a.theme)?"molv":a.theme:"default")+'" id="layui-laypage-'+a.index+'">',function(){var e=[];return layui.each(a.layout,function(a,t){i[t]&&e.push(i[t])}),e.join("")}(),"</div>"].join("")},u.prototype.jump=function(e,a){if(e){var t=this,i=t.config,r=e.children,u=e[n]("button")[0],l=e[n]("input")[0],p=e[n]("select")[0],c=function(){var e=0|l.value.replace(/\s|\D/g,"");e&&(i.curr=e,t.render())};if(a)return c();for(var o=0,y=r.length;o<y;o++)"a"===r[o].nodeName.toLowerCase()&&s.on(r[o],"click",function(){var e=0|this.getAttribute("data-page");e<1||e>i.pages||(i.curr=e,t.render())});p&&s.on(p,"change",function(){var e=this.value;i.curr*e>i.count&&(i.curr=Math.ceil(i.count/e)),i.limit=e,t.render()}),u&&s.on(u,"click",function(){c()})}},u.prototype.skip=function(e){if(e){var a=this,t=e[n]("input")[0];t&&s.on(t,"keyup",function(t){var n=this.value,i=t.keyCode;/^(37|38|39|40)$/.test(i)||(/\D/.test(n)&&(this.value=n.replace(/\D/,"")),13===i&&a.jump(e,!0))})}},u.prototype.render=function(e){var n=this,i=n.config,r=n.type(),u=n.view();2===r?i.elem&&(i.elem.innerHTML=u):3===r?i.elem.html(u):a[t](i.elem)&&(a[t](i.elem).innerHTML=u),i.jump&&i.jump(i,e);var s=a[t]("layui-laypage-"+i.index);n.jump(s),i.hash&&!e&&(location.hash="!"+i.hash+"="+i.curr),n.skip(s)};var s={render:function(e){var a=new u(e);return a.index},index:layui.laypage?layui.laypage.index+1e4:0,on:function(e,a,t){return e.attachEvent?e.attachEvent("on"+a,function(a){a.target=a.srcElement,t.call(e,a)}):e.addEventListener(a,t,!1),this}};e(i,s)});!function(e,t){"use strict";var a=e.layui&&layui.define,n={getPath:e.lay&&lay.getPath?lay.getPath:"",link:function(t,a,n){l.path&&e.lay&&lay.layui&&lay.layui.link(l.path+t,a,n)}},i=e.LAYUI_GLOBAL||{},l={v:"5.3.1",config:{},index:e.laydate&&e.laydate.v?1e5:0,path:i.laydate_dir||n.getPath,set:function(e){var t=this;return t.config=lay.extend({},t.config,e),t},ready:function(e){var t="laydate",i="",r=(a?"modules/laydate/":"theme/")+"default/laydate.css?v="+l.v+i;return a?layui.addcss(r,e,t):n.link(r,e,t),this}},r=function(){var e=this,t=e.config,a=t.id;return r.that[a]=e,{hint:function(t){e.hint.call(e,t)},config:e.config}},o="laydate",s=".layui-laydate",y="layui-this",d="laydate-disabled",m=[100,2e5],c="layui-laydate-static",u="layui-laydate-list",h="layui-laydate-hint",f="layui-laydate-footer",p=".laydate-btns-confirm",g="laydate-time-text",v="laydate-btns-time",T="layui-laydate-preview",D=function(e){var t=this;t.index=++l.index,t.config=lay.extend({},t.config,l.config,e),e=t.config,e.id="id"in e?e.id:t.index,l.ready(function(){t.init()})},w="yyyy|y|MM|M|dd|d|HH|H|mm|m|ss|s";r.formatArr=function(e){return(e||"").match(new RegExp(w+"|.","g"))||[]},D.isLeapYear=function(e){return e%4===0&&e%100!==0||e%400===0},D.prototype.config={type:"date",range:!1,format:"yyyy-MM-dd",value:null,isInitValue:!0,min:"1900-1-1",max:"2099-12-31",trigger:"click",show:!1,showBottom:!0,isPreview:!0,btns:["clear","now","confirm"],lang:"cn",theme:"default",position:null,calendar:!1,mark:{},zIndex:null,done:null,change:null},D.prototype.lang=function(){var e=this,t=e.config,a={cn:{weeks:["\u65e5","\u4e00","\u4e8c","\u4e09","\u56db","\u4e94","\u516d"],time:["\u65f6","\u5206","\u79d2"],timeTips:"\u9009\u62e9\u65f6\u95f4",startTime:"\u5f00\u59cb\u65f6\u95f4",endTime:"\u7ed3\u675f\u65f6\u95f4",dateTips:"\u8fd4\u56de\u65e5\u671f",month:["\u4e00","\u4e8c","\u4e09","\u56db","\u4e94","\u516d","\u4e03","\u516b","\u4e5d","\u5341","\u5341\u4e00","\u5341\u4e8c"],tools:{confirm:"\u786e\u5b9a",clear:"\u6e05\u7a7a",now:"\u73b0\u5728"},timeout:"\u7ed3\u675f\u65f6\u95f4\u4e0d\u80fd\u65e9\u4e8e\u5f00\u59cb\u65f6\u95f4<br>\u8bf7\u91cd\u65b0\u9009\u62e9",invalidDate:"\u4e0d\u5728\u6709\u6548\u65e5\u671f\u6216\u65f6\u95f4\u8303\u56f4\u5185",formatError:["\u65e5\u671f\u683c\u5f0f\u4e0d\u5408\u6cd5<br>\u5fc5\u987b\u9075\u5faa\u4e0b\u8ff0\u683c\u5f0f\uff1a<br>","<br>\u5df2\u4e3a\u4f60\u91cd\u7f6e"],preview:"\u5f53\u524d\u9009\u4e2d\u7684\u7ed3\u679c"},en:{weeks:["Su","Mo","Tu","We","Th","Fr","Sa"],time:["Hours","Minutes","Seconds"],timeTips:"Select Time",startTime:"Start Time",endTime:"End Time",dateTips:"Select Date",month:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],tools:{confirm:"Confirm",clear:"Clear",now:"Now"},timeout:"End time cannot be less than start Time<br>Please re-select",invalidDate:"Invalid date",formatError:["The date format error<br>Must be followed\uff1a<br>","<br>It has been reset"],preview:"The selected result"}};return a[t.lang]||a.cn},D.prototype.init=function(){var t=this,a=t.config,n="static"===a.position,i={year:"yyyy",month:"yyyy-MM",date:"yyyy-MM-dd",time:"HH:mm:ss",datetime:"yyyy-MM-dd HH:mm:ss"};a.elem=lay(a.elem),a.eventElem=lay(a.eventElem),a.elem[0]&&(t.rangeStr=a.range?"string"==typeof a.range?a.range:"-":"","array"===layui._typeof(a.range)&&(t.rangeElem=[lay(a.range[0]),lay(a.range[1])]),i[a.type]||(e.console&&console.error&&console.error("laydate type error:'"+a.type+"' is not supported"),a.type="date"),a.format===i.date&&(a.format=i[a.type]||i.date),t.format=r.formatArr(a.format),t.EXP_IF="",t.EXP_SPLIT="",lay.each(t.format,function(e,a){var n=new RegExp(w).test(a)?"\\d{"+function(){return new RegExp(w).test(t.format[0===e?e+1:e-1]||"")?/^yyyy|y$/.test(a)?4:a.length:/^yyyy$/.test(a)?"1,4":/^y$/.test(a)?"1,308":"1,2"}()+"}":"\\"+a;t.EXP_IF=t.EXP_IF+n,t.EXP_SPLIT=t.EXP_SPLIT+"("+n+")"}),t.EXP_IF_ONE=new RegExp("^"+t.EXP_IF+"$"),t.EXP_IF=new RegExp("^"+(a.range?t.EXP_IF+"\\s\\"+t.rangeStr+"\\s"+t.EXP_IF:t.EXP_IF)+"$"),t.EXP_SPLIT=new RegExp("^"+t.EXP_SPLIT+"$",""),t.isInput(a.elem[0])||"focus"===a.trigger&&(a.trigger="click"),a.elem.attr("lay-key")||(a.elem.attr("lay-key",t.index),a.eventElem.attr("lay-key",t.index)),a.mark=lay.extend({},a.calendar&&"cn"===a.lang?{"0-1-1":"\u5143\u65e6","0-2-14":"\u60c5\u4eba","0-3-8":"\u5987\u5973","0-3-12":"\u690d\u6811","0-4-1":"\u611a\u4eba","0-5-1":"\u52b3\u52a8","0-5-4":"\u9752\u5e74","0-6-1":"\u513f\u7ae5","0-9-10":"\u6559\u5e08","0-9-18":"\u56fd\u803b","0-10-1":"\u56fd\u5e86","0-12-25":"\u5723\u8bde"}:{},a.mark),lay.each(["min","max"],function(e,t){var n=[],i=[];if("number"==typeof a[t]){var l=a[t],r=(new Date).getTime(),o=864e5,s=new Date(l?l<o?r+l*o:l:r);n=[s.getFullYear(),s.getMonth()+1,s.getDate()],l<o||(i=[s.getHours(),s.getMinutes(),s.getSeconds()])}else n=(a[t].match(/\d+-\d+-\d+/)||[""])[0].split("-"),i=(a[t].match(/\d+:\d+:\d+/)||[""])[0].split(":");a[t]={year:0|n[0]||(new Date).getFullYear(),month:n[1]?(0|n[1])-1:(new Date).getMonth(),date:0|n[2]||(new Date).getDate(),hours:0|i[0],minutes:0|i[1],seconds:0|i[2]}}),t.elemID="layui-laydate"+a.elem.attr("lay-key"),(a.show||n)&&t.render(),n||t.events(),a.value&&a.isInitValue&&("date"===layui._typeof(a.value)?t.setValue(t.parse(0,t.systemDate(a.value))):t.setValue(a.value)))},D.prototype.render=function(){var e=this,a=e.config,n=e.lang(),i="static"===a.position,r=e.elem=lay.elem("div",{id:e.elemID,"class":["layui-laydate",a.range?" layui-laydate-range":"",i?" "+c:"",a.theme&&"default"!==a.theme&&!/^#/.test(a.theme)?" laydate-theme-"+a.theme:""].join("")}),o=e.elemMain=[],s=e.elemHeader=[],y=e.elemCont=[],d=e.table=[],m=e.footer=lay.elem("div",{"class":f});if(a.zIndex&&(r.style.zIndex=a.zIndex),lay.each(new Array(2),function(e){if(!a.range&&e>0)return!0;var t=lay.elem("div",{"class":"layui-laydate-header"}),i=[function(){var e=lay.elem("i",{"class":"layui-icon laydate-icon laydate-prev-y"});return e.innerHTML="&#xe65a;",e}(),function(){var e=lay.elem("i",{"class":"layui-icon laydate-icon laydate-prev-m"});return e.innerHTML="&#xe603;",e}(),function(){var e=lay.elem("div",{"class":"laydate-set-ym"}),t=lay.elem("span"),a=lay.elem("span");return e.appendChild(t),e.appendChild(a),e}(),function(){var e=lay.elem("i",{"class":"layui-icon laydate-icon laydate-next-m"});return e.innerHTML="&#xe602;",e}(),function(){var e=lay.elem("i",{"class":"layui-icon laydate-icon laydate-next-y"});return e.innerHTML="&#xe65b;",e}()],l=lay.elem("div",{"class":"layui-laydate-content"}),r=lay.elem("table"),m=lay.elem("thead"),c=lay.elem("tr");lay.each(i,function(e,a){t.appendChild(a)}),m.appendChild(c),lay.each(new Array(6),function(e){var t=r.insertRow(0);lay.each(new Array(7),function(a){if(0===e){var i=lay.elem("th");i.innerHTML=n.weeks[a],c.appendChild(i)}t.insertCell(a)})}),r.insertBefore(m,r.children[0]),l.appendChild(r),o[e]=lay.elem("div",{"class":"layui-laydate-main laydate-main-list-"+e}),o[e].appendChild(t),o[e].appendChild(l),s.push(i),y.push(l),d.push(r)}),lay(m).html(function(){var e=[],t=[];return"datetime"===a.type&&e.push('<span lay-type="datetime" class="'+v+'">'+n.timeTips+"</span>"),(a.range||"datetime"!==a.type)&&e.push('<span class="'+T+'" title="'+n.preview+'"></span>'),lay.each(a.btns,function(e,l){var r=n.tools[l]||"btn";a.range&&"now"===l||(i&&"clear"===l&&(r="cn"===a.lang?"\u91cd\u7f6e":"Reset"),t.push('<span lay-type="'+l+'" class="laydate-btns-'+l+'">'+r+"</span>"))}),e.push('<div class="laydate-footer-btns">'+t.join("")+"</div>"),e.join("")}()),lay.each(o,function(e,t){r.appendChild(t)}),a.showBottom&&r.appendChild(m),/^#/.test(a.theme)){var u=lay.elem("style"),h=["#{{id}} .layui-laydate-header{background-color:{{theme}};}","#{{id}} .layui-this{background-color:{{theme}} !important;}"].join("").replace(/{{id}}/g,e.elemID).replace(/{{theme}}/g,a.theme);"styleSheet"in u?(u.setAttribute("type","text/css"),u.styleSheet.cssText=h):u.innerHTML=h,lay(r).addClass("laydate-theme-molv"),r.appendChild(u)}l.thisId=a.id,e.remove(D.thisElemDate),i?a.elem.append(r):(t.body.appendChild(r),e.position()),e.checkDate().calendar(null,0,"init"),e.changeEvent(),D.thisElemDate=e.elemID,"function"==typeof a.ready&&a.ready(lay.extend({},a.dateTime,{month:a.dateTime.month+1})),e.preview()},D.prototype.remove=function(e){var t=this,a=(t.config,lay("#"+(e||t.elemID)));return a[0]?(a.hasClass(c)||t.checkDate(function(){a.remove()}),t):t},D.prototype.position=function(){var e=this,t=e.config;return lay.position(e.bindElem||t.elem[0],e.elem,{position:t.position}),e},D.prototype.hint=function(e){var t=this,a=(t.config,lay.elem("div",{"class":h}));t.elem&&(a.innerHTML=e||"",lay(t.elem).find("."+h).remove(),t.elem.appendChild(a),clearTimeout(t.hinTimer),t.hinTimer=setTimeout(function(){lay(t.elem).find("."+h).remove()},3e3))},D.prototype.getAsYM=function(e,t,a){return a?t--:t++,t<0&&(t=11,e--),t>11&&(t=0,e++),[e,t]},D.prototype.systemDate=function(e){var t=e||new Date;return{year:t.getFullYear(),month:t.getMonth(),date:t.getDate(),hours:e?e.getHours():0,minutes:e?e.getMinutes():0,seconds:e?e.getSeconds():0}},D.prototype.checkDate=function(e){var t,a,n=this,i=(new Date,n.config),r=n.lang(),o=i.dateTime=i.dateTime||n.systemDate(),s=n.bindElem||i.elem[0],y=(n.isInput(s)?"val":"html",function(){if(n.rangeElem){var e=[n.rangeElem[0].val(),n.rangeElem[1].val()];if(e[0]&&e[1])return e.join(" "+n.rangeStr+" ")}return n.isInput(s)?s.value:"static"===i.position?"":lay(s).attr("lay-date")}()),d=function(e){e.year>m[1]&&(e.year=m[1],a=!0),e.month>11&&(e.month=11,a=!0),e.hours>23&&(e.hours=0,a=!0),e.minutes>59&&(e.minutes=0,e.hours++,a=!0),e.seconds>59&&(e.seconds=0,e.minutes++,a=!0),t=l.getEndDate(e.month+1,e.year),e.date>t&&(e.date=t,a=!0)},c=function(e,t,l){var r=["startTime","endTime"];t=(t.match(n.EXP_SPLIT)||[]).slice(1),l=l||0,i.range&&(n[r[l]]=n[r[l]]||{}),lay.each(n.format,function(o,s){var y=parseFloat(t[o]);t[o].length<s.length&&(a=!0),/yyyy|y/.test(s)?(y<m[0]&&(y=m[0],a=!0),e.year=y):/MM|M/.test(s)?(y<1&&(y=1,a=!0),e.month=y-1):/dd|d/.test(s)?(y<1&&(y=1,a=!0),e.date=y):/HH|H/.test(s)?(y<1&&(y=0,a=!0),e.hours=y,i.range&&(n[r[l]].hours=y)):/mm|m/.test(s)?(y<1&&(y=0,a=!0),e.minutes=y,i.range&&(n[r[l]].minutes=y)):/ss|s/.test(s)&&(y<1&&(y=0,a=!0),e.seconds=y,i.range&&(n[r[l]].seconds=y))}),d(e)};if("limit"===e)return d(o),n;y=y||i.value,"string"==typeof y&&(y=y.replace(/\s+/g," ").replace(/^\s|\s$/g,""));var u=function(){i.range&&(n.endDate=n.endDate||lay.extend({},i.dateTime,function(){var e={},t=i.dateTime,a=n.getAsYM(t.year,t.month);return"year"===i.type?e.year=t.year+1:"time"!==i.type&&(e.year=a[0],e.month=a[1]),"datetime"!==i.type&&"time"!==i.type||(e.hours=23,e.minutes=e.seconds=59),e}()))};u(),"string"==typeof y&&y?n.EXP_IF.test(y)?i.range?(y=y.split(" "+n.rangeStr+" "),lay.each([i.dateTime,n.endDate],function(e,t){c(t,y[e],e)})):c(o,y):(n.hint(r.formatError[0]+(i.range?i.format+" "+n.rangeStr+" "+i.format:i.format)+r.formatError[1]),a=!0):y&&"date"===layui._typeof(y)?i.dateTime=n.systemDate(y):(i.dateTime=n.systemDate(),delete n.startTime,delete n.endDate,u(),delete n.endTime),function(){if(n.rangeElem){var e=[n.rangeElem[0].val(),n.rangeElem[1].val()],t=[i.dateTime,n.endDate];lay.each(e,function(e,a){n.EXP_IF_ONE.test(a)&&c(t[e],a,e)})}}(),d(o),i.range&&d(n.endDate),a&&y&&n.setValue(i.range?n.endDate?n.parse():"":n.parse());var h=function(e){return n.newDate(e).getTime()};return(h(o)>h(i.max)||h(o)<h(i.min))&&(o=i.dateTime=lay.extend({},i.min)),i.range&&(h(n.endDate)<h(i.min)||h(n.endDate)>h(i.max))&&(n.endDate=lay.extend({},i.max)),e&&e(),n},D.prototype.mark=function(e,t){var a,n=this,i=n.config;return lay.each(i.mark,function(e,n){var i=e.split("-");i[0]!=t[0]&&0!=i[0]||i[1]!=t[1]&&0!=i[1]||i[2]!=t[2]||(a=n||t[2])}),a&&e.html('<span class="laydate-day-mark">'+a+"</span>"),n},D.prototype.limit=function(e,t,a,n){var i,l=this,r=l.config,o={},s=r[a>41?"endDate":"dateTime"],y=lay.extend({},s,t||{});return lay.each({now:y,min:r.min,max:r.max},function(e,t){o[e]=l.newDate(lay.extend({year:t.year,month:t.month,date:t.date},function(){var e={};return lay.each(n,function(a,n){e[n]=t[n]}),e}())).getTime()}),i=o.now<o.min||o.now>o.max,e&&e[i?"addClass":"removeClass"](d),i},D.prototype.thisDateTime=function(e){var t=this,a=t.config;return e?t.endDate:a.dateTime},D.prototype.calendar=function(e,t,a){var n,i,r,o=this,s=o.config,t=t?1:0,d=e||o.thisDateTime(t),c=new Date,u=o.lang(),h="date"!==s.type&&"datetime"!==s.type,f=lay(o.table[t]).find("td"),g=lay(o.elemHeader[t][2]).find("span");return d.year<m[0]&&(d.year=m[0],o.hint(u.invalidDate)),d.year>m[1]&&(d.year=m[1],o.hint(u.invalidDate)),o.firstDate||(o.firstDate=lay.extend({},d)),c.setFullYear(d.year,d.month,1),n=c.getDay(),i=l.getEndDate(d.month||12,d.year),r=l.getEndDate(d.month+1,d.year),lay.each(f,function(e,t){var a=[d.year,d.month],l=0;t=lay(t),t.removeAttr("class"),e<n?(l=i-n+e,t.addClass("laydate-day-prev"),a=o.getAsYM(d.year,d.month,"sub")):e>=n&&e<r+n?(l=e-n,l+1===d.date&&t.addClass(y)):(l=e-r-n,t.addClass("laydate-day-next"),a=o.getAsYM(d.year,d.month)),a[1]++,a[2]=l+1,t.attr("lay-ymd",a.join("-")).html(a[2]),o.mark(t,a).limit(t,{year:a[0],month:a[1]-1,date:a[2]},e)}),lay(g[0]).attr("lay-ym",d.year+"-"+(d.month+1)),lay(g[1]).attr("lay-ym",d.year+"-"+(d.month+1)),"cn"===s.lang?(lay(g[0]).attr("lay-type","year").html(d.year+" \u5e74"),lay(g[1]).attr("lay-type","month").html(d.month+1+" \u6708")):(lay(g[0]).attr("lay-type","month").html(u.month[d.month]),lay(g[1]).attr("lay-type","year").html(d.year)),h&&(s.range?e&&(o.listYM=[[s.dateTime.year,s.dateTime.month+1],[o.endDate.year,o.endDate.month+1]],o.list(s.type,0).list(s.type,1),"time"===s.type?o.setBtnStatus("\u65f6\u95f4",lay.extend({},o.systemDate(),o.startTime),lay.extend({},o.systemDate(),o.endTime)):o.setBtnStatus(!0)):(o.listYM=[[d.year,d.month+1]],o.list(s.type,0))),s.range&&"init"===a&&!e&&o.calendar(o.endDate,1),s.range||o.limit(lay(o.footer).find(p),null,0,["hours","minutes","seconds"]),o.setBtnStatus(),o},D.prototype.list=function(e,t){var a=this,n=a.config,i=n.dateTime,l=a.lang(),r=n.range&&"date"!==n.type&&"datetime"!==n.type,o=lay.elem("ul",{"class":u+" "+{year:"laydate-year-list",month:"laydate-month-list",time:"laydate-time-list"}[e]}),s=a.elemHeader[t],m=lay(s[2]).find("span"),c=a.elemCont[t||0],h=lay(c).find("."+u)[0],f="cn"===n.lang,T=f?"\u5e74":"",D=a.listYM[t]||{},w=["hours","minutes","seconds"],x=["startTime","endTime"][t];if(D[0]<1&&(D[0]=1),"year"===e){var M,E=M=D[0]-7;E<1&&(E=M=1),lay.each(new Array(15),function(e){var i=lay.elem("li",{"lay-ym":M}),l={year:M};M==D[0]&&lay(i).addClass(y),i.innerHTML=M+T,o.appendChild(i),M<a.firstDate.year?(l.month=n.min.month,l.date=n.min.date):M>=a.firstDate.year&&(l.month=n.max.month,l.date=n.max.date),a.limit(lay(i),l,t),M++}),lay(m[f?0:1]).attr("lay-ym",M-8+"-"+D[1]).html(E+T+" - "+(M-1+T))}else if("month"===e)lay.each(new Array(12),function(e){var i=lay.elem("li",{"lay-ym":e}),r={year:D[0],month:e};e+1==D[1]&&lay(i).addClass(y),i.innerHTML=l.month[e]+(f?"\u6708":""),o.appendChild(i),D[0]<a.firstDate.year?r.date=n.min.date:D[0]>=a.firstDate.year&&(r.date=n.max.date),a.limit(lay(i),r,t)}),lay(m[f?0:1]).attr("lay-ym",D[0]+"-"+D[1]).html(D[0]+T);else if("time"===e){var C=function(){lay(o).find("ol").each(function(e,n){lay(n).find("li").each(function(n,i){a.limit(lay(i),[{hours:n},{hours:a[x].hours,minutes:n},{hours:a[x].hours,minutes:a[x].minutes,seconds:n}][e],t,[["hours"],["hours","minutes"],["hours","minutes","seconds"]][e])})}),n.range||a.limit(lay(a.footer).find(p),a[x],0,["hours","minutes","seconds"])};n.range?a[x]||(a[x]="startTime"===x?i:a.endDate):a[x]=i,lay.each([24,60,60],function(e,t){var n=lay.elem("li"),i=["<p>"+l.time[e]+"</p><ol>"];lay.each(new Array(t),function(t){i.push("<li"+(a[x][w[e]]===t?' class="'+y+'"':"")+">"+lay.digit(t,2)+"</li>")}),n.innerHTML=i.join("")+"</ol>",o.appendChild(n)}),C()}if(h&&c.removeChild(h),c.appendChild(o),"year"===e||"month"===e)lay(a.elemMain[t]).addClass("laydate-ym-show"),lay(o).find("li").on("click",function(){var l=0|lay(this).attr("lay-ym");if(!lay(this).hasClass(d)){0===t?(i[e]=l,a.limit(lay(a.footer).find(p),null,0)):a.endDate[e]=l;var s="year"===n.type||"month"===n.type;s?(lay(o).find("."+y).removeClass(y),lay(this).addClass(y),"month"===n.type&&"year"===e&&(a.listYM[t][0]=l,r&&((t?a.endDate:i).year=l),a.list("month",t))):(a.checkDate("limit").calendar(null,t),a.closeList()),a.setBtnStatus(),n.range||("month"===n.type&&"month"===e||"year"===n.type&&"year"===e)&&a.setValue(a.parse()).remove().done(),a.done(null,"change"),lay(a.footer).find("."+v).removeClass(d)}});else{var I=lay.elem("span",{"class":g}),k=function(){lay(o).find("ol").each(function(e){var t=this,n=lay(t).find("li");t.scrollTop=30*(a[x][w[e]]-2),t.scrollTop<=0&&n.each(function(e,a){if(!lay(this).hasClass(d))return t.scrollTop=30*(e-2),!0})})},b=lay(s[2]).find("."+g);k(),I.innerHTML=n.range?[l.startTime,l.endTime][t]:l.timeTips,lay(a.elemMain[t]).addClass("laydate-time-show"),b[0]&&b.remove(),s[2].appendChild(I),lay(o).find("ol").each(function(e){var t=this;lay(t).find("li").on("click",function(){var l=0|this.innerHTML;lay(this).hasClass(d)||(n.range?a[x][w[e]]=l:i[w[e]]=l,lay(t).find("."+y).removeClass(y),lay(this).addClass(y),C(),k(),(a.endDate||"time"===n.type)&&a.done(null,"change"),a.setBtnStatus())})})}return a},D.prototype.listYM=[],D.prototype.closeList=function(){var e=this;e.config;lay.each(e.elemCont,function(t,a){lay(this).find("."+u).remove(),lay(e.elemMain[t]).removeClass("laydate-ym-show laydate-time-show")}),lay(e.elem).find("."+g).remove()},D.prototype.setBtnStatus=function(e,t,a){var n,i=this,l=i.config,r=i.lang(),o=lay(i.footer).find(p);l.range&&"time"!==l.type&&(t=t||l.dateTime,a=a||i.endDate,n=i.newDate(t).getTime()>i.newDate(a).getTime(),i.limit(null,t)||i.limit(null,a)?o.addClass(d):o[n?"addClass":"removeClass"](d),e&&n&&i.hint("string"==typeof e?r.timeout.replace(/\u65e5\u671f/g,e):r.timeout))},D.prototype.parse=function(e,t){var a=this,n=a.config,i=t||("end"==e?lay.extend({},a.endDate,a.endTime):n.range?lay.extend({},n.dateTime,a.startTime):n.dateTime),r=l.parse(i,a.format,1);return n.range&&void 0===e?r+" "+a.rangeStr+" "+a.parse("end"):r},D.prototype.newDate=function(e){return e=e||{},new Date(e.year||1,e.month||0,e.date||1,e.hours||0,e.minutes||0,e.seconds||0)},D.prototype.setValue=function(e){var t=this,a=t.config,n=t.bindElem||a.elem[0];return"static"===a.position?t:(e=e||"",t.isInput(n)?lay(n).val(e):t.rangeElem?(t.rangeElem[0].val(e?t.parse("start"):""),t.rangeElem[1].val(e?t.parse("end"):"")):(0===lay(n).find("*").length&&lay(n).html(e),lay(n).attr("lay-date",e)),t)},D.prototype.preview=function(){var e=this,t=e.config;if(t.isPreview){var a=lay(e.elem).find("."+T),n=t.range?e.endDate?e.parse():"":e.parse();a.html(n).css({color:"#5FB878"}),setTimeout(function(){a.css({color:"#666"})},300)}},D.prototype.done=function(e,t){var a=this,n=a.config,i=lay.extend({},lay.extend(n.dateTime,a.startTime)),l=lay.extend({},lay.extend(a.endDate,a.endTime));return lay.each([i,l],function(e,t){"month"in t&&lay.extend(t,{month:t.month+1})}),a.preview(),e=e||[a.parse(),i,l],"function"==typeof n[t||"done"]&&n[t||"done"].apply(n,e),a},D.prototype.choose=function(e,t){var a=this,n=a.config,i=a.thisDateTime(t),l=(lay(a.elem).find("td"),e.attr("lay-ymd").split("-"));l={year:0|l[0],month:(0|l[1])-1,date:0|l[2]},e.hasClass(d)||(lay.extend(i,l),n.range?(lay.each(["startTime","endTime"],function(e,t){a[t]=a[t]||{hours:0,minutes:0,seconds:0}}),a.calendar(null,t).done(null,"change")):"static"===n.position?a.calendar().done().done(null,"change"):"date"===n.type?a.setValue(a.parse()).remove().done():"datetime"===n.type&&a.calendar().done(null,"change"))},D.prototype.tool=function(e,t){var a=this,n=a.config,i=a.lang(),l=n.dateTime,r="static"===n.position,o={datetime:function(){lay(e).hasClass(d)||(a.list("time",0),n.range&&a.list("time",1),lay(e).attr("lay-type","date").html(a.lang().dateTips))},date:function(){a.closeList(),lay(e).attr("lay-type","datetime").html(a.lang().timeTips)},clear:function(){r&&(lay.extend(l,a.firstDate),a.calendar()),n.range&&(delete n.dateTime,delete a.endDate,delete a.startTime,delete a.endTime),a.setValue("").remove(),a.done(["",{},{}])},now:function(){var e=new Date;lay.extend(l,a.systemDate(),{hours:e.getHours(),minutes:e.getMinutes(),seconds:e.getSeconds()}),a.setValue(a.parse()).remove(),r&&a.calendar(),a.done()},confirm:function(){if(n.range){if(lay(e).hasClass(d))return a.hint("time"===n.type?i.timeout.replace(/\u65e5\u671f/g,"\u65f6\u95f4"):i.timeout)}else if(lay(e).hasClass(d))return a.hint(i.invalidDate);a.done(),a.setValue(a.parse()).remove()}};o[t]&&o[t]()},D.prototype.change=function(e){var t=this,a=t.config,n=t.thisDateTime(e),i=a.range&&("year"===a.type||"month"===a.type),l=t.elemCont[e||0],r=t.listYM[e],o=function(o){var s=lay(l).find(".laydate-year-list")[0],y=lay(l).find(".laydate-month-list")[0];return s&&(r[0]=o?r[0]-15:r[0]+15,t.list("year",e)),y&&(o?r[0]--:r[0]++,t.list("month",e)),(s||y)&&(lay.extend(n,{year:r[0]}),i&&(n.year=r[0]),a.range||t.done(null,"change"),a.range||t.limit(lay(t.footer).find(p),{year:r[0]})),t.setBtnStatus(),s||y};return{prevYear:function(){o("sub")||(n.year--,t.checkDate("limit").calendar(null,e),t.done(null,"change"))},prevMonth:function(){var a=t.getAsYM(n.year,n.month,"sub");lay.extend(n,{year:a[0],month:a[1]}),t.checkDate("limit").calendar(null,e),t.done(null,"change")},nextMonth:function(){var a=t.getAsYM(n.year,n.month);lay.extend(n,{year:a[0],month:a[1]}),t.checkDate("limit").calendar(null,e),t.done(null,"change")},nextYear:function(){o()||(n.year++,t.checkDate("limit").calendar(null,e),t.done(null,"change"))}}},D.prototype.changeEvent=function(){var e=this;e.config;lay(e.elem).on("click",function(e){lay.stope(e)}).on("mousedown",function(e){lay.stope(e)}),lay.each(e.elemHeader,function(t,a){lay(a[0]).on("click",function(a){e.change(t).prevYear()}),lay(a[1]).on("click",function(a){e.change(t).prevMonth()}),lay(a[2]).find("span").on("click",function(a){var n=lay(this),i=n.attr("lay-ym"),l=n.attr("lay-type");i&&(i=i.split("-"),e.listYM[t]=[0|i[0],0|i[1]],e.list(l,t),lay(e.footer).find("."+v).addClass(d))}),lay(a[3]).on("click",function(a){e.change(t).nextMonth()}),lay(a[4]).on("click",function(a){e.change(t).nextYear()})}),lay.each(e.table,function(t,a){var n=lay(a).find("td");n.on("click",function(){e.choose(lay(this),t)})}),lay(e.footer).find("span").on("click",function(){var t=lay(this).attr("lay-type");e.tool(this,t)})},D.prototype.isInput=function(e){return/input|textarea/.test(e.tagName.toLocaleLowerCase())},D.prototype.events=function(){var e=this,t=e.config,a=function(a,n){a.on(t.trigger,function(){n&&(e.bindElem=this),e.render()})};t.elem[0]&&!t.elem[0].eventHandler&&(a(t.elem,"bind"),a(t.eventElem),t.elem[0].eventHandler=!0)},r.that={},r.getThis=function(e){var t=r.that[e];return!t&&a&&layui.hint().error(e?o+" instance with ID '"+e+"' not found":"ID argument required"),t},n.run=function(a){a(t).on("mousedown",function(e){if(l.thisId){var t=r.getThis(l.thisId);if(t){var n=t.config;e.target!==n.elem[0]&&e.target!==n.eventElem[0]&&e.target!==a(n.closeStop)[0]&&t.remove()}}}).on("keydown",function(e){if(l.thisId){var t=r.getThis(l.thisId);t&&13===e.keyCode&&a("#"+t.elemID)[0]&&t.elemID===D.thisElemDate&&(e.preventDefault(),a(t.footer).find(p)[0].click())}}),a(e).on("resize",function(){if(l.thisId){var e=r.getThis(l.thisId);if(e)return!(!e.elem||!a(s)[0])&&void e.position()}})},l.render=function(e){var t=new D(e);return r.call(t)},l.parse=function(e,t,a){return e=e||{},"string"==typeof t&&(t=r.formatArr(t)),t=(t||[]).concat(),lay.each(t,function(n,i){/yyyy|y/.test(i)?t[n]=lay.digit(e.year,i.length):/MM|M/.test(i)?t[n]=lay.digit(e.month+(a||0),i.length):/dd|d/.test(i)?t[n]=lay.digit(e.date,i.length):/HH|H/.test(i)?t[n]=lay.digit(e.hours,i.length):/mm|m/.test(i)?t[n]=lay.digit(e.minutes,i.length):/ss|s/.test(i)&&(t[n]=lay.digit(e.seconds,i.length))}),t.join("")},l.getEndDate=function(e,t){var a=new Date;return a.setFullYear(t||a.getFullYear(),e||a.getMonth()+1,1),new Date(a.getTime()-864e5).getDate()},a?(l.ready(),layui.define("lay",function(e){l.path=layui.cache.dir,n.run(lay),e(o,l)})):"function"==typeof define&&define.amd?define(function(){return n.run(lay),l}):function(){l.ready(),n.run(e.lay),e.laydate=l}()}(window,window.document);!function(e,t){"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(e,t){function n(e){var t=!!e&&"length"in e&&e.length,n=pe.type(e);return"function"!==n&&!pe.isWindow(e)&&("array"===n||0===t||"number"==typeof t&&t>0&&t-1 in e)}function r(e,t,n){if(pe.isFunction(t))return pe.grep(e,function(e,r){return!!t.call(e,r,e)!==n});if(t.nodeType)return pe.grep(e,function(e){return e===t!==n});if("string"==typeof t){if(Ce.test(t))return pe.filter(t,e,n);t=pe.filter(t,e)}return pe.grep(e,function(e){return pe.inArray(e,t)>-1!==n})}function i(e,t){do e=e[t];while(e&&1!==e.nodeType);return e}function o(e){var t={};return pe.each(e.match(De)||[],function(e,n){t[n]=!0}),t}function a(){re.addEventListener?(re.removeEventListener("DOMContentLoaded",s),e.removeEventListener("load",s)):(re.detachEvent("onreadystatechange",s),e.detachEvent("onload",s))}function s(){(re.addEventListener||"load"===e.event.type||"complete"===re.readyState)&&(a(),pe.ready())}function u(e,t,n){if(void 0===n&&1===e.nodeType){var r="data-"+t.replace(_e,"-$1").toLowerCase();if(n=e.getAttribute(r),"string"==typeof n){try{n="true"===n||"false"!==n&&("null"===n?null:+n+""===n?+n:qe.test(n)?pe.parseJSON(n):n)}catch(i){}pe.data(e,t,n)}else n=void 0}return n}function l(e){var t;for(t in e)if(("data"!==t||!pe.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}function c(e,t,n,r){if(He(e)){var i,o,a=pe.expando,s=e.nodeType,u=s?pe.cache:e,l=s?e[a]:e[a]&&a;if(l&&u[l]&&(r||u[l].data)||void 0!==n||"string"!=typeof t)return l||(l=s?e[a]=ne.pop()||pe.guid++:a),u[l]||(u[l]=s?{}:{toJSON:pe.noop}),"object"!=typeof t&&"function"!=typeof t||(r?u[l]=pe.extend(u[l],t):u[l].data=pe.extend(u[l].data,t)),o=u[l],r||(o.data||(o.data={}),o=o.data),void 0!==n&&(o[pe.camelCase(t)]=n),"string"==typeof t?(i=o[t],null==i&&(i=o[pe.camelCase(t)])):i=o,i}}function f(e,t,n){if(He(e)){var r,i,o=e.nodeType,a=o?pe.cache:e,s=o?e[pe.expando]:pe.expando;if(a[s]){if(t&&(r=n?a[s]:a[s].data)){pe.isArray(t)?t=t.concat(pe.map(t,pe.camelCase)):t in r?t=[t]:(t=pe.camelCase(t),t=t in r?[t]:t.split(" ")),i=t.length;for(;i--;)delete r[t[i]];if(n?!l(r):!pe.isEmptyObject(r))return}(n||(delete a[s].data,l(a[s])))&&(o?pe.cleanData([e],!0):fe.deleteExpando||a!=a.window?delete a[s]:a[s]=void 0)}}}function d(e,t,n,r){var i,o=1,a=20,s=r?function(){return r.cur()}:function(){return pe.css(e,t,"")},u=s(),l=n&&n[3]||(pe.cssNumber[t]?"":"px"),c=(pe.cssNumber[t]||"px"!==l&&+u)&&Me.exec(pe.css(e,t));if(c&&c[3]!==l){l=l||c[3],n=n||[],c=+u||1;do o=o||".5",c/=o,pe.style(e,t,c+l);while(o!==(o=s()/u)&&1!==o&&--a)}return n&&(c=+c||+u||0,i=n[1]?c+(n[1]+1)*n[2]:+n[2],r&&(r.unit=l,r.start=c,r.end=i)),i}function p(e){var t=ze.split("|"),n=e.createDocumentFragment();if(n.createElement)for(;t.length;)n.createElement(t.pop());return n}function h(e,t){var n,r,i=0,o="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):void 0;if(!o)for(o=[],n=e.childNodes||e;null!=(r=n[i]);i++)!t||pe.nodeName(r,t)?o.push(r):pe.merge(o,h(r,t));return void 0===t||t&&pe.nodeName(e,t)?pe.merge([e],o):o}function g(e,t){for(var n,r=0;null!=(n=e[r]);r++)pe._data(n,"globalEval",!t||pe._data(t[r],"globalEval"))}function m(e){Be.test(e.type)&&(e.defaultChecked=e.checked)}function y(e,t,n,r,i){for(var o,a,s,u,l,c,f,d=e.length,y=p(t),v=[],x=0;x<d;x++)if(a=e[x],a||0===a)if("object"===pe.type(a))pe.merge(v,a.nodeType?[a]:a);else if(Ue.test(a)){for(u=u||y.appendChild(t.createElement("div")),l=(We.exec(a)||["",""])[1].toLowerCase(),f=Xe[l]||Xe._default,u.innerHTML=f[1]+pe.htmlPrefilter(a)+f[2],o=f[0];o--;)u=u.lastChild;if(!fe.leadingWhitespace&&$e.test(a)&&v.push(t.createTextNode($e.exec(a)[0])),!fe.tbody)for(a="table"!==l||Ve.test(a)?"<table>"!==f[1]||Ve.test(a)?0:u:u.firstChild,o=a&&a.childNodes.length;o--;)pe.nodeName(c=a.childNodes[o],"tbody")&&!c.childNodes.length&&a.removeChild(c);for(pe.merge(v,u.childNodes),u.textContent="";u.firstChild;)u.removeChild(u.firstChild);u=y.lastChild}else v.push(t.createTextNode(a));for(u&&y.removeChild(u),fe.appendChecked||pe.grep(h(v,"input"),m),x=0;a=v[x++];)if(r&&pe.inArray(a,r)>-1)i&&i.push(a);else if(s=pe.contains(a.ownerDocument,a),u=h(y.appendChild(a),"script"),s&&g(u),n)for(o=0;a=u[o++];)Ie.test(a.type||"")&&n.push(a);return u=null,y}function v(){return!0}function x(){return!1}function b(){try{return re.activeElement}catch(e){}}function w(e,t,n,r,i,o){var a,s;if("object"==typeof t){"string"!=typeof n&&(r=r||n,n=void 0);for(s in t)w(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),i===!1)i=x;else if(!i)return e;return 1===o&&(a=i,i=function(e){return pe().off(e),a.apply(this,arguments)},i.guid=a.guid||(a.guid=pe.guid++)),e.each(function(){pe.event.add(this,t,i,r,n)})}function T(e,t){return pe.nodeName(e,"table")&&pe.nodeName(11!==t.nodeType?t:t.firstChild,"tr")?e.getElementsByTagName("tbody")[0]||e.appendChild(e.ownerDocument.createElement("tbody")):e}function C(e){return e.type=(null!==pe.find.attr(e,"type"))+"/"+e.type,e}function E(e){var t=it.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function N(e,t){if(1===t.nodeType&&pe.hasData(e)){var n,r,i,o=pe._data(e),a=pe._data(t,o),s=o.events;if(s){delete a.handle,a.events={};for(n in s)for(r=0,i=s[n].length;r<i;r++)pe.event.add(t,n,s[n][r])}a.data&&(a.data=pe.extend({},a.data))}}function k(e,t){var n,r,i;if(1===t.nodeType){if(n=t.nodeName.toLowerCase(),!fe.noCloneEvent&&t[pe.expando]){i=pe._data(t);for(r in i.events)pe.removeEvent(t,r,i.handle);t.removeAttribute(pe.expando)}"script"===n&&t.text!==e.text?(C(t).text=e.text,E(t)):"object"===n?(t.parentNode&&(t.outerHTML=e.outerHTML),fe.html5Clone&&e.innerHTML&&!pe.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):"input"===n&&Be.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):"option"===n?t.defaultSelected=t.selected=e.defaultSelected:"input"!==n&&"textarea"!==n||(t.defaultValue=e.defaultValue)}}function S(e,t,n,r){t=oe.apply([],t);var i,o,a,s,u,l,c=0,f=e.length,d=f-1,p=t[0],g=pe.isFunction(p);if(g||f>1&&"string"==typeof p&&!fe.checkClone&&rt.test(p))return e.each(function(i){var o=e.eq(i);g&&(t[0]=p.call(this,i,o.html())),S(o,t,n,r)});if(f&&(l=y(t,e[0].ownerDocument,!1,e,r),i=l.firstChild,1===l.childNodes.length&&(l=i),i||r)){for(s=pe.map(h(l,"script"),C),a=s.length;c<f;c++)o=l,c!==d&&(o=pe.clone(o,!0,!0),a&&pe.merge(s,h(o,"script"))),n.call(e[c],o,c);if(a)for(u=s[s.length-1].ownerDocument,pe.map(s,E),c=0;c<a;c++)o=s[c],Ie.test(o.type||"")&&!pe._data(o,"globalEval")&&pe.contains(u,o)&&(o.src?pe._evalUrl&&pe._evalUrl(o.src):pe.globalEval((o.text||o.textContent||o.innerHTML||"").replace(ot,"")));l=i=null}return e}function A(e,t,n){for(var r,i=t?pe.filter(t,e):e,o=0;null!=(r=i[o]);o++)n||1!==r.nodeType||pe.cleanData(h(r)),r.parentNode&&(n&&pe.contains(r.ownerDocument,r)&&g(h(r,"script")),r.parentNode.removeChild(r));return e}function D(e,t){var n=pe(t.createElement(e)).appendTo(t.body),r=pe.css(n[0],"display");return n.detach(),r}function j(e){var t=re,n=lt[e];return n||(n=D(e,t),"none"!==n&&n||(ut=(ut||pe("<iframe frameborder='0' width='0' height='0'/>")).appendTo(t.documentElement),t=(ut[0].contentWindow||ut[0].contentDocument).document,t.write(),t.close(),n=D(e,t),ut.detach()),lt[e]=n),n}function L(e,t){return{get:function(){return e()?void delete this.get:(this.get=t).apply(this,arguments)}}}function H(e){if(e in Et)return e;for(var t=e.charAt(0).toUpperCase()+e.slice(1),n=Ct.length;n--;)if(e=Ct[n]+t,e in Et)return e}function q(e,t){for(var n,r,i,o=[],a=0,s=e.length;a<s;a++)r=e[a],r.style&&(o[a]=pe._data(r,"olddisplay"),n=r.style.display,t?(o[a]||"none"!==n||(r.style.display=""),""===r.style.display&&Re(r)&&(o[a]=pe._data(r,"olddisplay",j(r.nodeName)))):(i=Re(r),(n&&"none"!==n||!i)&&pe._data(r,"olddisplay",i?n:pe.css(r,"display"))));for(a=0;a<s;a++)r=e[a],r.style&&(t&&"none"!==r.style.display&&""!==r.style.display||(r.style.display=t?o[a]||"":"none"));return e}function _(e,t,n){var r=bt.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function F(e,t,n,r,i){for(var o=n===(r?"border":"content")?4:"width"===t?1:0,a=0;o<4;o+=2)"margin"===n&&(a+=pe.css(e,n+Oe[o],!0,i)),r?("content"===n&&(a-=pe.css(e,"padding"+Oe[o],!0,i)),"margin"!==n&&(a-=pe.css(e,"border"+Oe[o]+"Width",!0,i))):(a+=pe.css(e,"padding"+Oe[o],!0,i),"padding"!==n&&(a+=pe.css(e,"border"+Oe[o]+"Width",!0,i)));return a}function M(e,t,n){var r=!0,i="width"===t?e.offsetWidth:e.offsetHeight,o=ht(e),a=fe.boxSizing&&"border-box"===pe.css(e,"boxSizing",!1,o);if(i<=0||null==i){if(i=gt(e,t,o),(i<0||null==i)&&(i=e.style[t]),ft.test(i))return i;r=a&&(fe.boxSizingReliable()||i===e.style[t]),i=parseFloat(i)||0}return i+F(e,t,n||(a?"border":"content"),r,o)+"px"}function O(e,t,n,r,i){return new O.prototype.init(e,t,n,r,i)}function R(){return e.setTimeout(function(){Nt=void 0}),Nt=pe.now()}function P(e,t){var n,r={height:e},i=0;for(t=t?1:0;i<4;i+=2-t)n=Oe[i],r["margin"+n]=r["padding"+n]=e;return t&&(r.opacity=r.width=e),r}function B(e,t,n){for(var r,i=($.tweeners[t]||[]).concat($.tweeners["*"]),o=0,a=i.length;o<a;o++)if(r=i[o].call(n,t,e))return r}function W(e,t,n){var r,i,o,a,s,u,l,c,f=this,d={},p=e.style,h=e.nodeType&&Re(e),g=pe._data(e,"fxshow");n.queue||(s=pe._queueHooks(e,"fx"),null==s.unqueued&&(s.unqueued=0,u=s.empty.fire,s.empty.fire=function(){s.unqueued||u()}),s.unqueued++,f.always(function(){f.always(function(){s.unqueued--,pe.queue(e,"fx").length||s.empty.fire()})})),1===e.nodeType&&("height"in t||"width"in t)&&(n.overflow=[p.overflow,p.overflowX,p.overflowY],l=pe.css(e,"display"),c="none"===l?pe._data(e,"olddisplay")||j(e.nodeName):l,"inline"===c&&"none"===pe.css(e,"float")&&(fe.inlineBlockNeedsLayout&&"inline"!==j(e.nodeName)?p.zoom=1:p.display="inline-block")),n.overflow&&(p.overflow="hidden",fe.shrinkWrapBlocks()||f.always(function(){p.overflow=n.overflow[0],p.overflowX=n.overflow[1],p.overflowY=n.overflow[2]}));for(r in t)if(i=t[r],St.exec(i)){if(delete t[r],o=o||"toggle"===i,i===(h?"hide":"show")){if("show"!==i||!g||void 0===g[r])continue;h=!0}d[r]=g&&g[r]||pe.style(e,r)}else l=void 0;if(pe.isEmptyObject(d))"inline"===("none"===l?j(e.nodeName):l)&&(p.display=l);else{g?"hidden"in g&&(h=g.hidden):g=pe._data(e,"fxshow",{}),o&&(g.hidden=!h),h?pe(e).show():f.done(function(){pe(e).hide()}),f.done(function(){var t;pe._removeData(e,"fxshow");for(t in d)pe.style(e,t,d[t])});for(r in d)a=B(h?g[r]:0,r,f),r in g||(g[r]=a.start,h&&(a.end=a.start,a.start="width"===r||"height"===r?1:0))}}function I(e,t){var n,r,i,o,a;for(n in e)if(r=pe.camelCase(n),i=t[r],o=e[n],pe.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),a=pe.cssHooks[r],a&&"expand"in a){o=a.expand(o),delete e[r];for(n in o)n in e||(e[n]=o[n],t[n]=i)}else t[r]=i}function $(e,t,n){var r,i,o=0,a=$.prefilters.length,s=pe.Deferred().always(function(){delete u.elem}),u=function(){if(i)return!1;for(var t=Nt||R(),n=Math.max(0,l.startTime+l.duration-t),r=n/l.duration||0,o=1-r,a=0,u=l.tweens.length;a<u;a++)l.tweens[a].run(o);return s.notifyWith(e,[l,o,n]),o<1&&u?n:(s.resolveWith(e,[l]),!1)},l=s.promise({elem:e,props:pe.extend({},t),opts:pe.extend(!0,{specialEasing:{},easing:pe.easing._default},n),originalProperties:t,originalOptions:n,startTime:Nt||R(),duration:n.duration,tweens:[],createTween:function(t,n){var r=pe.Tween(e,l.opts,t,n,l.opts.specialEasing[t]||l.opts.easing);return l.tweens.push(r),r},stop:function(t){var n=0,r=t?l.tweens.length:0;if(i)return this;for(i=!0;n<r;n++)l.tweens[n].run(1);return t?(s.notifyWith(e,[l,1,0]),s.resolveWith(e,[l,t])):s.rejectWith(e,[l,t]),this}}),c=l.props;for(I(c,l.opts.specialEasing);o<a;o++)if(r=$.prefilters[o].call(l,e,c,l.opts))return pe.isFunction(r.stop)&&(pe._queueHooks(l.elem,l.opts.queue).stop=pe.proxy(r.stop,r)),r;return pe.map(c,B,l),pe.isFunction(l.opts.start)&&l.opts.start.call(e,l),pe.fx.timer(pe.extend(u,{elem:e,anim:l,queue:l.opts.queue})),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always)}function z(e){return pe.attr(e,"class")||""}function X(e){return function(t,n){"string"!=typeof t&&(n=t,t="*");var r,i=0,o=t.toLowerCase().match(De)||[];if(pe.isFunction(n))for(;r=o[i++];)"+"===r.charAt(0)?(r=r.slice(1)||"*",(e[r]=e[r]||[]).unshift(n)):(e[r]=e[r]||[]).push(n)}}function U(e,t,n,r){function i(s){var u;return o[s]=!0,pe.each(e[s]||[],function(e,s){var l=s(t,n,r);return"string"!=typeof l||a||o[l]?a?!(u=l):void 0:(t.dataTypes.unshift(l),i(l),!1)}),u}var o={},a=e===Qt;return i(t.dataTypes[0])||!o["*"]&&i("*")}function V(e,t){var n,r,i=pe.ajaxSettings.flatOptions||{};for(r in t)void 0!==t[r]&&((i[r]?e:n||(n={}))[r]=t[r]);return n&&pe.extend(!0,e,n),e}function Y(e,t,n){for(var r,i,o,a,s=e.contents,u=e.dataTypes;"*"===u[0];)u.shift(),void 0===i&&(i=e.mimeType||t.getResponseHeader("Content-Type"));if(i)for(a in s)if(s[a]&&s[a].test(i)){u.unshift(a);break}if(u[0]in n)o=u[0];else{for(a in n){if(!u[0]||e.converters[a+" "+u[0]]){o=a;break}r||(r=a)}o=o||r}if(o)return o!==u[0]&&u.unshift(o),n[o]}function J(e,t,n,r){var i,o,a,s,u,l={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)l[a.toLowerCase()]=e.converters[a];for(o=c.shift();o;)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!u&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u=o,o=c.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(a=l[u+" "+o]||l["* "+o],!a)for(i in l)if(s=i.split(" "),s[1]===o&&(a=l[u+" "+s[0]]||l["* "+s[0]])){a===!0?a=l[i]:l[i]!==!0&&(o=s[0],c.unshift(s[1]));break}if(a!==!0)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(f){return{state:"parsererror",error:a?f:"No conversion from "+u+" to "+o}}}return{state:"success",data:t}}function G(e){return e.style&&e.style.display||pe.css(e,"display")}function K(e){if(!pe.contains(e.ownerDocument||re,e))return!0;for(;e&&1===e.nodeType;){if("none"===G(e)||"hidden"===e.type)return!0;e=e.parentNode}return!1}function Q(e,t,n,r){var i;if(pe.isArray(t))pe.each(t,function(t,i){n||rn.test(e)?r(e,i):Q(e+"["+("object"==typeof i&&null!=i?t:"")+"]",i,n,r)});else if(n||"object"!==pe.type(t))r(e,t);else for(i in t)Q(e+"["+i+"]",t[i],n,r)}function Z(){try{return new e.XMLHttpRequest}catch(t){}}function ee(){try{return new e.ActiveXObject("Microsoft.XMLHTTP")}catch(t){}}function te(e){return pe.isWindow(e)?e:9===e.nodeType&&(e.defaultView||e.parentWindow)}var ne=[],re=e.document,ie=ne.slice,oe=ne.concat,ae=ne.push,se=ne.indexOf,ue={},le=ue.toString,ce=ue.hasOwnProperty,fe={},de="1.12.4",pe=function(e,t){return new pe.fn.init(e,t)},he=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,ge=/^-ms-/,me=/-([\da-z])/gi,ye=function(e,t){return t.toUpperCase()};pe.fn=pe.prototype={jquery:de,constructor:pe,selector:"",length:0,toArray:function(){return ie.call(this)},get:function(e){return null!=e?e<0?this[e+this.length]:this[e]:ie.call(this)},pushStack:function(e){var t=pe.merge(this.constructor(),e);return t.prevObject=this,t.context=this.context,t},each:function(e){return pe.each(this,e)},map:function(e){return this.pushStack(pe.map(this,function(t,n){return e.call(t,n,t)}))},slice:function(){return this.pushStack(ie.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(n>=0&&n<t?[this[n]]:[])},end:function(){return this.prevObject||this.constructor()},push:ae,sort:ne.sort,splice:ne.splice},pe.extend=pe.fn.extend=function(){var e,t,n,r,i,o,a=arguments[0]||{},s=1,u=arguments.length,l=!1;for("boolean"==typeof a&&(l=a,a=arguments[s]||{},s++),"object"==typeof a||pe.isFunction(a)||(a={}),s===u&&(a=this,s--);s<u;s++)if(null!=(i=arguments[s]))for(r in i)e=a[r],n=i[r],a!==n&&(l&&n&&(pe.isPlainObject(n)||(t=pe.isArray(n)))?(t?(t=!1,o=e&&pe.isArray(e)?e:[]):o=e&&pe.isPlainObject(e)?e:{},a[r]=pe.extend(l,o,n)):void 0!==n&&(a[r]=n));return a},pe.extend({expando:"jQuery"+(de+Math.random()).replace(/\D/g,""),isReady:!0,error:function(e){throw new Error(e)},noop:function(){},isFunction:function(e){return"function"===pe.type(e)},isArray:Array.isArray||function(e){return"array"===pe.type(e)},isWindow:function(e){return null!=e&&e==e.window},isNumeric:function(e){var t=e&&e.toString();return!pe.isArray(e)&&t-parseFloat(t)+1>=0},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},isPlainObject:function(e){var t;if(!e||"object"!==pe.type(e)||e.nodeType||pe.isWindow(e))return!1;try{if(e.constructor&&!ce.call(e,"constructor")&&!ce.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(n){return!1}if(!fe.ownFirst)for(t in e)return ce.call(e,t);for(t in e);return void 0===t||ce.call(e,t)},type:function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?ue[le.call(e)]||"object":typeof e},globalEval:function(t){t&&pe.trim(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(ge,"ms-").replace(me,ye)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t){var r,i=0;if(n(e))for(r=e.length;i<r&&t.call(e[i],i,e[i])!==!1;i++);else for(i in e)if(t.call(e[i],i,e[i])===!1)break;return e},trim:function(e){return null==e?"":(e+"").replace(he,"")},makeArray:function(e,t){var r=t||[];return null!=e&&(n(Object(e))?pe.merge(r,"string"==typeof e?[e]:e):ae.call(r,e)),r},inArray:function(e,t,n){var r;if(t){if(se)return se.call(t,e,n);for(r=t.length,n=n?n<0?Math.max(0,r+n):n:0;n<r;n++)if(n in t&&t[n]===e)return n}return-1},merge:function(e,t){for(var n=+t.length,r=0,i=e.length;r<n;)e[i++]=t[r++];if(n!==n)for(;void 0!==t[r];)e[i++]=t[r++];return e.length=i,e},grep:function(e,t,n){for(var r,i=[],o=0,a=e.length,s=!n;o<a;o++)r=!t(e[o],o),r!==s&&i.push(e[o]);return i},map:function(e,t,r){var i,o,a=0,s=[];if(n(e))for(i=e.length;a<i;a++)o=t(e[a],a,r),null!=o&&s.push(o);else for(a in e)o=t(e[a],a,r),null!=o&&s.push(o);return oe.apply([],s)},guid:1,proxy:function(e,t){var n,r,i;if("string"==typeof t&&(i=e[t],t=e,e=i),pe.isFunction(e))return n=ie.call(arguments,2),r=function(){return e.apply(t||this,n.concat(ie.call(arguments)))},r.guid=e.guid=e.guid||pe.guid++,r},now:function(){return+new Date},support:fe}),"function"==typeof Symbol&&(pe.fn[Symbol.iterator]=ne[Symbol.iterator]),pe.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(e,t){ue["[object "+t+"]"]=t.toLowerCase()});var ve=function(e){function t(e,t,n,r){var i,o,a,s,u,l,f,p,h=t&&t.ownerDocument,g=t?t.nodeType:9;if(n=n||[],"string"!=typeof e||!e||1!==g&&9!==g&&11!==g)return n;if(!r&&((t?t.ownerDocument||t:B)!==H&&L(t),t=t||H,_)){if(11!==g&&(l=ye.exec(e)))if(i=l[1]){if(9===g){if(!(a=t.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(h&&(a=h.getElementById(i))&&R(t,a)&&a.id===i)return n.push(a),n}else{if(l[2])return Q.apply(n,t.getElementsByTagName(e)),n;if((i=l[3])&&w.getElementsByClassName&&t.getElementsByClassName)return Q.apply(n,t.getElementsByClassName(i)),n}if(w.qsa&&!X[e+" "]&&(!F||!F.test(e))){if(1!==g)h=t,p=e;else if("object"!==t.nodeName.toLowerCase()){for((s=t.getAttribute("id"))?s=s.replace(xe,"\\$&"):t.setAttribute("id",s=P),f=N(e),o=f.length,u=de.test(s)?"#"+s:"[id='"+s+"']";o--;)f[o]=u+" "+d(f[o]);p=f.join(","),h=ve.test(e)&&c(t.parentNode)||t}if(p)try{return Q.apply(n,h.querySelectorAll(p)),n}catch(m){}finally{s===P&&t.removeAttribute("id")}}}return S(e.replace(se,"$1"),t,n,r)}function n(){function e(n,r){return t.push(n+" ")>T.cacheLength&&delete e[t.shift()],e[n+" "]=r}var t=[];return e}function r(e){return e[P]=!0,e}function i(e){var t=H.createElement("div");try{return!!e(t)}catch(n){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function o(e,t){for(var n=e.split("|"),r=n.length;r--;)T.attrHandle[n[r]]=t}function a(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&(~t.sourceIndex||V)-(~e.sourceIndex||V);if(r)return r;if(n)for(;n=n.nextSibling;)if(n===t)return-1;return e?1:-1}function s(e){return function(t){var n=t.nodeName.toLowerCase();return"input"===n&&t.type===e}}function u(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function l(e){return r(function(t){return t=+t,r(function(n,r){for(var i,o=e([],n.length,t),a=o.length;a--;)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}function c(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}function f(){}function d(e){for(var t=0,n=e.length,r="";t<n;t++)r+=e[t].value;return r}function p(e,t,n){var r=t.dir,i=n&&"parentNode"===r,o=I++;return t.first?function(t,n,o){for(;t=t[r];)if(1===t.nodeType||i)return e(t,n,o)}:function(t,n,a){var s,u,l,c=[W,o];if(a){for(;t=t[r];)if((1===t.nodeType||i)&&e(t,n,a))return!0}else for(;t=t[r];)if(1===t.nodeType||i){if(l=t[P]||(t[P]={}),u=l[t.uniqueID]||(l[t.uniqueID]={}),(s=u[r])&&s[0]===W&&s[1]===o)return c[2]=s[2];if(u[r]=c,c[2]=e(t,n,a))return!0}}}function h(e){return e.length>1?function(t,n,r){for(var i=e.length;i--;)if(!e[i](t,n,r))return!1;return!0}:e[0]}function g(e,n,r){for(var i=0,o=n.length;i<o;i++)t(e,n[i],r);return r}function m(e,t,n,r,i){for(var o,a=[],s=0,u=e.length,l=null!=t;s<u;s++)(o=e[s])&&(n&&!n(o,r,i)||(a.push(o),l&&t.push(s)));return a}function y(e,t,n,i,o,a){return i&&!i[P]&&(i=y(i)),o&&!o[P]&&(o=y(o,a)),r(function(r,a,s,u){var l,c,f,d=[],p=[],h=a.length,y=r||g(t||"*",s.nodeType?[s]:s,[]),v=!e||!r&&t?y:m(y,d,e,s,u),x=n?o||(r?e:h||i)?[]:a:v;if(n&&n(v,x,s,u),i)for(l=m(x,p),i(l,[],s,u),c=l.length;c--;)(f=l[c])&&(x[p[c]]=!(v[p[c]]=f));if(r){if(o||e){if(o){for(l=[],c=x.length;c--;)(f=x[c])&&l.push(v[c]=f);o(null,x=[],l,u)}for(c=x.length;c--;)(f=x[c])&&(l=o?ee(r,f):d[c])>-1&&(r[l]=!(a[l]=f))}}else x=m(x===a?x.splice(h,x.length):x),o?o(null,a,x,u):Q.apply(a,x)})}function v(e){for(var t,n,r,i=e.length,o=T.relative[e[0].type],a=o||T.relative[" "],s=o?1:0,u=p(function(e){return e===t},a,!0),l=p(function(e){return ee(t,e)>-1},a,!0),c=[function(e,n,r){var i=!o&&(r||n!==A)||((t=n).nodeType?u(e,n,r):l(e,n,r));return t=null,i}];s<i;s++)if(n=T.relative[e[s].type])c=[p(h(c),n)];else{if(n=T.filter[e[s].type].apply(null,e[s].matches),n[P]){for(r=++s;r<i&&!T.relative[e[r].type];r++);return y(s>1&&h(c),s>1&&d(e.slice(0,s-1).concat({value:" "===e[s-2].type?"*":""})).replace(se,"$1"),n,s<r&&v(e.slice(s,r)),r<i&&v(e=e.slice(r)),r<i&&d(e))}c.push(n)}return h(c)}function x(e,n){var i=n.length>0,o=e.length>0,a=function(r,a,s,u,l){var c,f,d,p=0,h="0",g=r&&[],y=[],v=A,x=r||o&&T.find.TAG("*",l),b=W+=null==v?1:Math.random()||.1,w=x.length;for(l&&(A=a===H||a||l);h!==w&&null!=(c=x[h]);h++){if(o&&c){for(f=0,a||c.ownerDocument===H||(L(c),s=!_);d=e[f++];)if(d(c,a||H,s)){u.push(c);break}l&&(W=b)}i&&((c=!d&&c)&&p--,r&&g.push(c))}if(p+=h,i&&h!==p){for(f=0;d=n[f++];)d(g,y,a,s);if(r){if(p>0)for(;h--;)g[h]||y[h]||(y[h]=G.call(u));y=m(y)}Q.apply(u,y),l&&!r&&y.length>0&&p+n.length>1&&t.uniqueSort(u)}return l&&(W=b,A=v),g};return i?r(a):a}var b,w,T,C,E,N,k,S,A,D,j,L,H,q,_,F,M,O,R,P="sizzle"+1*new Date,B=e.document,W=0,I=0,$=n(),z=n(),X=n(),U=function(e,t){return e===t&&(j=!0),0},V=1<<31,Y={}.hasOwnProperty,J=[],G=J.pop,K=J.push,Q=J.push,Z=J.slice,ee=function(e,t){for(var n=0,r=e.length;n<r;n++)if(e[n]===t)return n;return-1},te="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",ne="[\\x20\\t\\r\\n\\f]",re="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",ie="\\["+ne+"*("+re+")(?:"+ne+"*([*^$|!~]?=)"+ne+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+re+"))|)"+ne+"*\\]",oe=":("+re+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+ie+")*)|.*)\\)|)",ae=new RegExp(ne+"+","g"),se=new RegExp("^"+ne+"+|((?:^|[^\\\\])(?:\\\\.)*)"+ne+"+$","g"),ue=new RegExp("^"+ne+"*,"+ne+"*"),le=new RegExp("^"+ne+"*([>+~]|"+ne+")"+ne+"*"),ce=new RegExp("="+ne+"*([^\\]'\"]*?)"+ne+"*\\]","g"),fe=new RegExp(oe),de=new RegExp("^"+re+"$"),pe={ID:new RegExp("^#("+re+")"),CLASS:new RegExp("^\\.("+re+")"),TAG:new RegExp("^("+re+"|[*])"),ATTR:new RegExp("^"+ie),PSEUDO:new RegExp("^"+oe),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+ne+"*(even|odd|(([+-]|)(\\d*)n|)"+ne+"*(?:([+-]|)"+ne+"*(\\d+)|))"+ne+"*\\)|)","i"),bool:new RegExp("^(?:"+te+")$","i"),needsContext:new RegExp("^"+ne+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+ne+"*((?:-\\d)?\\d*)"+ne+"*\\)|)(?=[^-]|$)","i")},he=/^(?:input|select|textarea|button)$/i,ge=/^h\d$/i,me=/^[^{]+\{\s*\[native \w/,ye=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ve=/[+~]/,xe=/'|\\/g,be=new RegExp("\\\\([\\da-f]{1,6}"+ne+"?|("+ne+")|.)","ig"),we=function(e,t,n){var r="0x"+t-65536;return r!==r||n?t:r<0?String.fromCharCode(r+65536):String.fromCharCode(r>>10|55296,1023&r|56320)},Te=function(){L()};try{Q.apply(J=Z.call(B.childNodes),B.childNodes),J[B.childNodes.length].nodeType}catch(Ce){Q={apply:J.length?function(e,t){K.apply(e,Z.call(t))}:function(e,t){for(var n=e.length,r=0;e[n++]=t[r++];);e.length=n-1}}}w=t.support={},E=t.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return!!t&&"HTML"!==t.nodeName},L=t.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:B;return r!==H&&9===r.nodeType&&r.documentElement?(H=r,q=H.documentElement,_=!E(H),(n=H.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",Te,!1):n.attachEvent&&n.attachEvent("onunload",Te)),w.attributes=i(function(e){return e.className="i",!e.getAttribute("className")}),w.getElementsByTagName=i(function(e){return e.appendChild(H.createComment("")),!e.getElementsByTagName("*").length}),w.getElementsByClassName=me.test(H.getElementsByClassName),w.getById=i(function(e){return q.appendChild(e).id=P,!H.getElementsByName||!H.getElementsByName(P).length}),w.getById?(T.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&_){var n=t.getElementById(e);return n?[n]:[]}},T.filter.ID=function(e){var t=e.replace(be,we);return function(e){return e.getAttribute("id")===t}}):(delete T.find.ID,T.filter.ID=function(e){var t=e.replace(be,we);return function(e){var n="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return n&&n.value===t}}),T.find.TAG=w.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):w.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){for(;n=o[i++];)1===n.nodeType&&r.push(n);return r}return o},T.find.CLASS=w.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&_)return t.getElementsByClassName(e)},M=[],F=[],(w.qsa=me.test(H.querySelectorAll))&&(i(function(e){q.appendChild(e).innerHTML="<a id='"+P+"'></a><select id='"+P+"-\r\\' msallowcapture=''><option selected=''></option></select>",e.querySelectorAll("[msallowcapture^='']").length&&F.push("[*^$]="+ne+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||F.push("\\["+ne+"*(?:value|"+te+")"),e.querySelectorAll("[id~="+P+"-]").length||F.push("~="),e.querySelectorAll(":checked").length||F.push(":checked"),e.querySelectorAll("a#"+P+"+*").length||F.push(".#.+[+~]")}),i(function(e){var t=H.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&F.push("name"+ne+"*[*^$|!~]?="),e.querySelectorAll(":enabled").length||F.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),F.push(",.*:")})),(w.matchesSelector=me.test(O=q.matches||q.webkitMatchesSelector||q.mozMatchesSelector||q.oMatchesSelector||q.msMatchesSelector))&&i(function(e){w.disconnectedMatch=O.call(e,"div"),O.call(e,"[s!='']:x"),M.push("!=",oe)}),F=F.length&&new RegExp(F.join("|")),M=M.length&&new RegExp(M.join("|")),t=me.test(q.compareDocumentPosition),R=t||me.test(q.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)for(;t=t.parentNode;)if(t===e)return!0;return!1},U=t?function(e,t){if(e===t)return j=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n?n:(n=(e.ownerDocument||e)===(t.ownerDocument||t)?e.compareDocumentPosition(t):1,1&n||!w.sortDetached&&t.compareDocumentPosition(e)===n?e===H||e.ownerDocument===B&&R(B,e)?-1:t===H||t.ownerDocument===B&&R(B,t)?1:D?ee(D,e)-ee(D,t):0:4&n?-1:1)}:function(e,t){if(e===t)return j=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,s=[e],u=[t];if(!i||!o)return e===H?-1:t===H?1:i?-1:o?1:D?ee(D,e)-ee(D,t):0;if(i===o)return a(e,t);for(n=e;n=n.parentNode;)s.unshift(n);for(n=t;n=n.parentNode;)u.unshift(n);for(;s[r]===u[r];)r++;return r?a(s[r],u[r]):s[r]===B?-1:u[r]===B?1:0},H):H},t.matches=function(e,n){return t(e,null,null,n)},t.matchesSelector=function(e,n){if((e.ownerDocument||e)!==H&&L(e),n=n.replace(ce,"='$1']"),w.matchesSelector&&_&&!X[n+" "]&&(!M||!M.test(n))&&(!F||!F.test(n)))try{var r=O.call(e,n);if(r||w.disconnectedMatch||e.document&&11!==e.document.nodeType)return r}catch(i){}return t(n,H,null,[e]).length>0},t.contains=function(e,t){return(e.ownerDocument||e)!==H&&L(e),R(e,t)},t.attr=function(e,t){(e.ownerDocument||e)!==H&&L(e);var n=T.attrHandle[t.toLowerCase()],r=n&&Y.call(T.attrHandle,t.toLowerCase())?n(e,t,!_):void 0;return void 0!==r?r:w.attributes||!_?e.getAttribute(t):(r=e.getAttributeNode(t))&&r.specified?r.value:null},t.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},t.uniqueSort=function(e){var t,n=[],r=0,i=0;if(j=!w.detectDuplicates,D=!w.sortStable&&e.slice(0),e.sort(U),j){for(;t=e[i++];)t===e[i]&&(r=n.push(i));for(;r--;)e.splice(n[r],1)}return D=null,e},C=t.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=C(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r++];)n+=C(t);return n},T=t.selectors={cacheLength:50,createPseudo:r,match:pe,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(be,we),e[3]=(e[3]||e[4]||e[5]||"").replace(be,we),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||t.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&t.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return pe.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&fe.test(n)&&(t=N(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(be,we).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=$[e+" "];return t||(t=new RegExp("(^|"+ne+")"+e+"("+ne+"|$)"))&&$(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(e,n,r){return function(i){var o=t.attr(i,e);return null==o?"!="===n:!n||(o+="","="===n?o===r:"!="===n?o!==r:"^="===n?r&&0===o.indexOf(r):"*="===n?r&&o.indexOf(r)>-1:"$="===n?r&&o.slice(-r.length)===r:"~="===n?(" "+o.replace(ae," ")+" ").indexOf(r)>-1:"|="===n&&(o===r||o.slice(0,r.length+1)===r+"-"))}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,u){var l,c,f,d,p,h,g=o!==a?"nextSibling":"previousSibling",m=t.parentNode,y=s&&t.nodeName.toLowerCase(),v=!u&&!s,x=!1;if(m){if(o){for(;g;){for(d=t;d=d[g];)if(s?d.nodeName.toLowerCase()===y:1===d.nodeType)return!1;h=g="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?m.firstChild:m.lastChild],a&&v){for(d=m,f=d[P]||(d[P]={}),c=f[d.uniqueID]||(f[d.uniqueID]={}),l=c[e]||[],p=l[0]===W&&l[1],x=p&&l[2],
+d=p&&m.childNodes[p];d=++p&&d&&d[g]||(x=p=0)||h.pop();)if(1===d.nodeType&&++x&&d===t){c[e]=[W,p,x];break}}else if(v&&(d=t,f=d[P]||(d[P]={}),c=f[d.uniqueID]||(f[d.uniqueID]={}),l=c[e]||[],p=l[0]===W&&l[1],x=p),x===!1)for(;(d=++p&&d&&d[g]||(x=p=0)||h.pop())&&((s?d.nodeName.toLowerCase()!==y:1!==d.nodeType)||!++x||(v&&(f=d[P]||(d[P]={}),c=f[d.uniqueID]||(f[d.uniqueID]={}),c[e]=[W,x]),d!==t)););return x-=i,x===r||x%r===0&&x/r>=0}}},PSEUDO:function(e,n){var i,o=T.pseudos[e]||T.setFilters[e.toLowerCase()]||t.error("unsupported pseudo: "+e);return o[P]?o(n):o.length>1?(i=[e,e,"",n],T.setFilters.hasOwnProperty(e.toLowerCase())?r(function(e,t){for(var r,i=o(e,n),a=i.length;a--;)r=ee(e,i[a]),e[r]=!(t[r]=i[a])}):function(e){return o(e,0,i)}):o}},pseudos:{not:r(function(e){var t=[],n=[],i=k(e.replace(se,"$1"));return i[P]?r(function(e,t,n,r){for(var o,a=i(e,null,r,[]),s=e.length;s--;)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,r,o){return t[0]=e,i(t,null,o,n),t[0]=null,!n.pop()}}),has:r(function(e){return function(n){return t(e,n).length>0}}),contains:r(function(e){return e=e.replace(be,we),function(t){return(t.textContent||t.innerText||C(t)).indexOf(e)>-1}}),lang:r(function(e){return de.test(e||"")||t.error("unsupported lang: "+e),e=e.replace(be,we).toLowerCase(),function(t){var n;do if(n=_?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang"))return n=n.toLowerCase(),n===e||0===n.indexOf(e+"-");while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===q},focus:function(e){return e===H.activeElement&&(!H.hasFocus||H.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!T.pseudos.empty(e)},header:function(e){return ge.test(e.nodeName)},input:function(e){return he.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:l(function(){return[0]}),last:l(function(e,t){return[t-1]}),eq:l(function(e,t,n){return[n<0?n+t:n]}),even:l(function(e,t){for(var n=0;n<t;n+=2)e.push(n);return e}),odd:l(function(e,t){for(var n=1;n<t;n+=2)e.push(n);return e}),lt:l(function(e,t,n){for(var r=n<0?n+t:n;--r>=0;)e.push(r);return e}),gt:l(function(e,t,n){for(var r=n<0?n+t:n;++r<t;)e.push(r);return e})}},T.pseudos.nth=T.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})T.pseudos[b]=s(b);for(b in{submit:!0,reset:!0})T.pseudos[b]=u(b);return f.prototype=T.filters=T.pseudos,T.setFilters=new f,N=t.tokenize=function(e,n){var r,i,o,a,s,u,l,c=z[e+" "];if(c)return n?0:c.slice(0);for(s=e,u=[],l=T.preFilter;s;){r&&!(i=ue.exec(s))||(i&&(s=s.slice(i[0].length)||s),u.push(o=[])),r=!1,(i=le.exec(s))&&(r=i.shift(),o.push({value:r,type:i[0].replace(se," ")}),s=s.slice(r.length));for(a in T.filter)!(i=pe[a].exec(s))||l[a]&&!(i=l[a](i))||(r=i.shift(),o.push({value:r,type:a,matches:i}),s=s.slice(r.length));if(!r)break}return n?s.length:s?t.error(e):z(e,u).slice(0)},k=t.compile=function(e,t){var n,r=[],i=[],o=X[e+" "];if(!o){for(t||(t=N(e)),n=t.length;n--;)o=v(t[n]),o[P]?r.push(o):i.push(o);o=X(e,x(i,r)),o.selector=e}return o},S=t.select=function(e,t,n,r){var i,o,a,s,u,l="function"==typeof e&&e,f=!r&&N(e=l.selector||e);if(n=n||[],1===f.length){if(o=f[0]=f[0].slice(0),o.length>2&&"ID"===(a=o[0]).type&&w.getById&&9===t.nodeType&&_&&T.relative[o[1].type]){if(t=(T.find.ID(a.matches[0].replace(be,we),t)||[])[0],!t)return n;l&&(t=t.parentNode),e=e.slice(o.shift().value.length)}for(i=pe.needsContext.test(e)?0:o.length;i--&&(a=o[i],!T.relative[s=a.type]);)if((u=T.find[s])&&(r=u(a.matches[0].replace(be,we),ve.test(o[0].type)&&c(t.parentNode)||t))){if(o.splice(i,1),e=r.length&&d(o),!e)return Q.apply(n,r),n;break}}return(l||k(e,f))(r,t,!_,n,!t||ve.test(e)&&c(t.parentNode)||t),n},w.sortStable=P.split("").sort(U).join("")===P,w.detectDuplicates=!!j,L(),w.sortDetached=i(function(e){return 1&e.compareDocumentPosition(H.createElement("div"))}),i(function(e){return e.innerHTML="<a href='#'></a>","#"===e.firstChild.getAttribute("href")})||o("type|href|height|width",function(e,t,n){if(!n)return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),w.attributes&&i(function(e){return e.innerHTML="<input/>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||o("value",function(e,t,n){if(!n&&"input"===e.nodeName.toLowerCase())return e.defaultValue}),i(function(e){return null==e.getAttribute("disabled")})||o(te,function(e,t,n){var r;if(!n)return e[t]===!0?t.toLowerCase():(r=e.getAttributeNode(t))&&r.specified?r.value:null}),t}(e);pe.find=ve,pe.expr=ve.selectors,pe.expr[":"]=pe.expr.pseudos,pe.uniqueSort=pe.unique=ve.uniqueSort,pe.text=ve.getText,pe.isXMLDoc=ve.isXML,pe.contains=ve.contains;var xe=function(e,t,n){for(var r=[],i=void 0!==n;(e=e[t])&&9!==e.nodeType;)if(1===e.nodeType){if(i&&pe(e).is(n))break;r.push(e)}return r},be=function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},we=pe.expr.match.needsContext,Te=/^<([\w-]+)\s*\/?>(?:<\/\1>|)$/,Ce=/^.[^:#\[\.,]*$/;pe.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?pe.find.matchesSelector(r,e)?[r]:[]:pe.find.matches(e,pe.grep(t,function(e){return 1===e.nodeType}))},pe.fn.extend({find:function(e){var t,n=[],r=this,i=r.length;if("string"!=typeof e)return this.pushStack(pe(e).filter(function(){for(t=0;t<i;t++)if(pe.contains(r[t],this))return!0}));for(t=0;t<i;t++)pe.find(e,r[t],n);return n=this.pushStack(i>1?pe.unique(n):n),n.selector=this.selector?this.selector+" "+e:e,n},filter:function(e){return this.pushStack(r(this,e||[],!1))},not:function(e){return this.pushStack(r(this,e||[],!0))},is:function(e){return!!r(this,"string"==typeof e&&we.test(e)?pe(e):e||[],!1).length}});var Ee,Ne=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,ke=pe.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||Ee,"string"==typeof e){if(r="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:Ne.exec(e),!r||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof pe?t[0]:t,pe.merge(this,pe.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:re,!0)),Te.test(r[1])&&pe.isPlainObject(t))for(r in t)pe.isFunction(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}if(i=re.getElementById(r[2]),i&&i.parentNode){if(i.id!==r[2])return Ee.find(e);this.length=1,this[0]=i}return this.context=re,this.selector=e,this}return e.nodeType?(this.context=this[0]=e,this.length=1,this):pe.isFunction(e)?"undefined"!=typeof n.ready?n.ready(e):e(pe):(void 0!==e.selector&&(this.selector=e.selector,this.context=e.context),pe.makeArray(e,this))};ke.prototype=pe.fn,Ee=pe(re);var Se=/^(?:parents|prev(?:Until|All))/,Ae={children:!0,contents:!0,next:!0,prev:!0};pe.fn.extend({has:function(e){var t,n=pe(e,this),r=n.length;return this.filter(function(){for(t=0;t<r;t++)if(pe.contains(this,n[t]))return!0})},closest:function(e,t){for(var n,r=0,i=this.length,o=[],a=we.test(e)||"string"!=typeof e?pe(e,t||this.context):0;r<i;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(n.nodeType<11&&(a?a.index(n)>-1:1===n.nodeType&&pe.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(o.length>1?pe.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?pe.inArray(this[0],pe(e)):pe.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(pe.uniqueSort(pe.merge(this.get(),pe(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),pe.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return xe(e,"parentNode")},parentsUntil:function(e,t,n){return xe(e,"parentNode",n)},next:function(e){return i(e,"nextSibling")},prev:function(e){return i(e,"previousSibling")},nextAll:function(e){return xe(e,"nextSibling")},prevAll:function(e){return xe(e,"previousSibling")},nextUntil:function(e,t,n){return xe(e,"nextSibling",n)},prevUntil:function(e,t,n){return xe(e,"previousSibling",n)},siblings:function(e){return be((e.parentNode||{}).firstChild,e)},children:function(e){return be(e.firstChild)},contents:function(e){return pe.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:pe.merge([],e.childNodes)}},function(e,t){pe.fn[e]=function(n,r){var i=pe.map(this,t,n);return"Until"!==e.slice(-5)&&(r=n),r&&"string"==typeof r&&(i=pe.filter(r,i)),this.length>1&&(Ae[e]||(i=pe.uniqueSort(i)),Se.test(e)&&(i=i.reverse())),this.pushStack(i)}});var De=/\S+/g;pe.Callbacks=function(e){e="string"==typeof e?o(e):pe.extend({},e);var t,n,r,i,a=[],s=[],u=-1,l=function(){for(i=e.once,r=t=!0;s.length;u=-1)for(n=s.shift();++u<a.length;)a[u].apply(n[0],n[1])===!1&&e.stopOnFalse&&(u=a.length,n=!1);e.memory||(n=!1),t=!1,i&&(a=n?[]:"")},c={add:function(){return a&&(n&&!t&&(u=a.length-1,s.push(n)),function r(t){pe.each(t,function(t,n){pe.isFunction(n)?e.unique&&c.has(n)||a.push(n):n&&n.length&&"string"!==pe.type(n)&&r(n)})}(arguments),n&&!t&&l()),this},remove:function(){return pe.each(arguments,function(e,t){for(var n;(n=pe.inArray(t,a,n))>-1;)a.splice(n,1),n<=u&&u--}),this},has:function(e){return e?pe.inArray(e,a)>-1:a.length>0},empty:function(){return a&&(a=[]),this},disable:function(){return i=s=[],a=n="",this},disabled:function(){return!a},lock:function(){return i=!0,n||c.disable(),this},locked:function(){return!!i},fireWith:function(e,n){return i||(n=n||[],n=[e,n.slice?n.slice():n],s.push(n),t||l()),this},fire:function(){return c.fireWith(this,arguments),this},fired:function(){return!!r}};return c},pe.extend({Deferred:function(e){var t=[["resolve","done",pe.Callbacks("once memory"),"resolved"],["reject","fail",pe.Callbacks("once memory"),"rejected"],["notify","progress",pe.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return pe.Deferred(function(n){pe.each(t,function(t,o){var a=pe.isFunction(e[t])&&e[t];i[o[1]](function(){var e=a&&a.apply(this,arguments);e&&pe.isFunction(e.promise)?e.promise().progress(n.notify).done(n.resolve).fail(n.reject):n[o[0]+"With"](this===r?n.promise():this,a?[e]:arguments)})}),e=null}).promise()},promise:function(e){return null!=e?pe.extend(e,r):r}},i={};return r.pipe=r.then,pe.each(t,function(e,o){var a=o[2],s=o[3];r[o[1]]=a.add,s&&a.add(function(){n=s},t[1^e][2].disable,t[2][2].lock),i[o[0]]=function(){return i[o[0]+"With"](this===i?r:this,arguments),this},i[o[0]+"With"]=a.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t,n,r,i=0,o=ie.call(arguments),a=o.length,s=1!==a||e&&pe.isFunction(e.promise)?a:0,u=1===s?e:pe.Deferred(),l=function(e,n,r){return function(i){n[e]=this,r[e]=arguments.length>1?ie.call(arguments):i,r===t?u.notifyWith(n,r):--s||u.resolveWith(n,r)}};if(a>1)for(t=new Array(a),n=new Array(a),r=new Array(a);i<a;i++)o[i]&&pe.isFunction(o[i].promise)?o[i].promise().progress(l(i,n,t)).done(l(i,r,o)).fail(u.reject):--s;return s||u.resolveWith(r,o),u.promise()}});var je;pe.fn.ready=function(e){return pe.ready.promise().done(e),this},pe.extend({isReady:!1,readyWait:1,holdReady:function(e){e?pe.readyWait++:pe.ready(!0)},ready:function(e){(e===!0?--pe.readyWait:pe.isReady)||(pe.isReady=!0,e!==!0&&--pe.readyWait>0||(je.resolveWith(re,[pe]),pe.fn.triggerHandler&&(pe(re).triggerHandler("ready"),pe(re).off("ready"))))}}),pe.ready.promise=function(t){if(!je)if(je=pe.Deferred(),"complete"===re.readyState||"loading"!==re.readyState&&!re.documentElement.doScroll)e.setTimeout(pe.ready);else if(re.addEventListener)re.addEventListener("DOMContentLoaded",s),e.addEventListener("load",s);else{re.attachEvent("onreadystatechange",s),e.attachEvent("onload",s);var n=!1;try{n=null==e.frameElement&&re.documentElement}catch(r){}n&&n.doScroll&&!function i(){if(!pe.isReady){try{n.doScroll("left")}catch(t){return e.setTimeout(i,50)}a(),pe.ready()}}()}return je.promise(t)},pe.ready.promise();var Le;for(Le in pe(fe))break;fe.ownFirst="0"===Le,fe.inlineBlockNeedsLayout=!1,pe(function(){var e,t,n,r;n=re.getElementsByTagName("body")[0],n&&n.style&&(t=re.createElement("div"),r=re.createElement("div"),r.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",n.appendChild(r).appendChild(t),"undefined"!=typeof t.style.zoom&&(t.style.cssText="display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1",fe.inlineBlockNeedsLayout=e=3===t.offsetWidth,e&&(n.style.zoom=1)),n.removeChild(r))}),function(){var e=re.createElement("div");fe.deleteExpando=!0;try{delete e.test}catch(t){fe.deleteExpando=!1}e=null}();var He=function(e){var t=pe.noData[(e.nodeName+" ").toLowerCase()],n=+e.nodeType||1;return(1===n||9===n)&&(!t||t!==!0&&e.getAttribute("classid")===t)},qe=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,_e=/([A-Z])/g;pe.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(e){return e=e.nodeType?pe.cache[e[pe.expando]]:e[pe.expando],!!e&&!l(e)},data:function(e,t,n){return c(e,t,n)},removeData:function(e,t){return f(e,t)},_data:function(e,t,n){return c(e,t,n,!0)},_removeData:function(e,t){return f(e,t,!0)}}),pe.fn.extend({data:function(e,t){var n,r,i,o=this[0],a=o&&o.attributes;if(void 0===e){if(this.length&&(i=pe.data(o),1===o.nodeType&&!pe._data(o,"parsedAttrs"))){for(n=a.length;n--;)a[n]&&(r=a[n].name,0===r.indexOf("data-")&&(r=pe.camelCase(r.slice(5)),u(o,r,i[r])));pe._data(o,"parsedAttrs",!0)}return i}return"object"==typeof e?this.each(function(){pe.data(this,e)}):arguments.length>1?this.each(function(){pe.data(this,e,t)}):o?u(o,e,pe.data(o,e)):void 0},removeData:function(e){return this.each(function(){pe.removeData(this,e)})}}),pe.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=pe._data(e,t),n&&(!r||pe.isArray(n)?r=pe._data(e,t,pe.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=pe.queue(e,t),r=n.length,i=n.shift(),o=pe._queueHooks(e,t),a=function(){pe.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,a,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return pe._data(e,n)||pe._data(e,n,{empty:pe.Callbacks("once memory").add(function(){pe._removeData(e,t+"queue"),pe._removeData(e,n)})})}}),pe.fn.extend({queue:function(e,t){var n=2;return"string"!=typeof e&&(t=e,e="fx",n--),arguments.length<n?pe.queue(this[0],e):void 0===t?this:this.each(function(){var n=pe.queue(this,e,t);pe._queueHooks(this,e),"fx"===e&&"inprogress"!==n[0]&&pe.dequeue(this,e)})},dequeue:function(e){return this.each(function(){pe.dequeue(this,e)})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,t){var n,r=1,i=pe.Deferred(),o=this,a=this.length,s=function(){--r||i.resolveWith(o,[o])};for("string"!=typeof e&&(t=e,e=void 0),e=e||"fx";a--;)n=pe._data(o[a],e+"queueHooks"),n&&n.empty&&(r++,n.empty.add(s));return s(),i.promise(t)}}),function(){var e;fe.shrinkWrapBlocks=function(){if(null!=e)return e;e=!1;var t,n,r;return n=re.getElementsByTagName("body")[0],n&&n.style?(t=re.createElement("div"),r=re.createElement("div"),r.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",n.appendChild(r).appendChild(t),"undefined"!=typeof t.style.zoom&&(t.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:1px;width:1px;zoom:1",t.appendChild(re.createElement("div")).style.width="5px",e=3!==t.offsetWidth),n.removeChild(r),e):void 0}}();var Fe=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,Me=new RegExp("^(?:([+-])=|)("+Fe+")([a-z%]*)$","i"),Oe=["Top","Right","Bottom","Left"],Re=function(e,t){return e=t||e,"none"===pe.css(e,"display")||!pe.contains(e.ownerDocument,e)},Pe=function(e,t,n,r,i,o,a){var s=0,u=e.length,l=null==n;if("object"===pe.type(n)){i=!0;for(s in n)Pe(e,t,s,n[s],!0,o,a)}else if(void 0!==r&&(i=!0,pe.isFunction(r)||(a=!0),l&&(a?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(pe(e),n)})),t))for(;s<u;s++)t(e[s],n,a?r:r.call(e[s],s,t(e[s],n)));return i?e:l?t.call(e):u?t(e[0],n):o},Be=/^(?:checkbox|radio)$/i,We=/<([\w:-]+)/,Ie=/^$|\/(?:java|ecma)script/i,$e=/^\s+/,ze="abbr|article|aside|audio|bdi|canvas|data|datalist|details|dialog|figcaption|figure|footer|header|hgroup|main|mark|meter|nav|output|picture|progress|section|summary|template|time|video";!function(){var e=re.createElement("div"),t=re.createDocumentFragment(),n=re.createElement("input");e.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",fe.leadingWhitespace=3===e.firstChild.nodeType,fe.tbody=!e.getElementsByTagName("tbody").length,fe.htmlSerialize=!!e.getElementsByTagName("link").length,fe.html5Clone="<:nav></:nav>"!==re.createElement("nav").cloneNode(!0).outerHTML,n.type="checkbox",n.checked=!0,t.appendChild(n),fe.appendChecked=n.checked,e.innerHTML="<textarea>x</textarea>",fe.noCloneChecked=!!e.cloneNode(!0).lastChild.defaultValue,t.appendChild(e),n=re.createElement("input"),n.setAttribute("type","radio"),n.setAttribute("checked","checked"),n.setAttribute("name","t"),e.appendChild(n),fe.checkClone=e.cloneNode(!0).cloneNode(!0).lastChild.checked,fe.noCloneEvent=!!e.addEventListener,e[pe.expando]=1,fe.attributes=!e.getAttribute(pe.expando)}();var Xe={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:fe.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]};Xe.optgroup=Xe.option,Xe.tbody=Xe.tfoot=Xe.colgroup=Xe.caption=Xe.thead,Xe.th=Xe.td;var Ue=/<|&#?\w+;/,Ve=/<tbody/i;!function(){var t,n,r=re.createElement("div");for(t in{submit:!0,change:!0,focusin:!0})n="on"+t,(fe[t]=n in e)||(r.setAttribute(n,"t"),fe[t]=r.attributes[n].expando===!1);r=null}();var Ye=/^(?:input|select|textarea)$/i,Je=/^key/,Ge=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,Ke=/^(?:focusinfocus|focusoutblur)$/,Qe=/^([^.]*)(?:\.(.+)|)/;pe.event={global:{},add:function(e,t,n,r,i){var o,a,s,u,l,c,f,d,p,h,g,m=pe._data(e);if(m){for(n.handler&&(u=n,n=u.handler,i=u.selector),n.guid||(n.guid=pe.guid++),(a=m.events)||(a=m.events={}),(c=m.handle)||(c=m.handle=function(e){return"undefined"==typeof pe||e&&pe.event.triggered===e.type?void 0:pe.event.dispatch.apply(c.elem,arguments)},c.elem=e),t=(t||"").match(De)||[""],s=t.length;s--;)o=Qe.exec(t[s])||[],p=g=o[1],h=(o[2]||"").split(".").sort(),p&&(l=pe.event.special[p]||{},p=(i?l.delegateType:l.bindType)||p,l=pe.event.special[p]||{},f=pe.extend({type:p,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&pe.expr.match.needsContext.test(i),namespace:h.join(".")},u),(d=a[p])||(d=a[p]=[],d.delegateCount=0,l.setup&&l.setup.call(e,r,h,c)!==!1||(e.addEventListener?e.addEventListener(p,c,!1):e.attachEvent&&e.attachEvent("on"+p,c))),l.add&&(l.add.call(e,f),f.handler.guid||(f.handler.guid=n.guid)),i?d.splice(d.delegateCount++,0,f):d.push(f),pe.event.global[p]=!0);e=null}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,d,p,h,g,m=pe.hasData(e)&&pe._data(e);if(m&&(c=m.events)){for(t=(t||"").match(De)||[""],l=t.length;l--;)if(s=Qe.exec(t[l])||[],p=g=s[1],h=(s[2]||"").split(".").sort(),p){for(f=pe.event.special[p]||{},p=(r?f.delegateType:f.bindType)||p,d=c[p]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),u=o=d.length;o--;)a=d[o],!i&&g!==a.origType||n&&n.guid!==a.guid||s&&!s.test(a.namespace)||r&&r!==a.selector&&("**"!==r||!a.selector)||(d.splice(o,1),a.selector&&d.delegateCount--,f.remove&&f.remove.call(e,a));u&&!d.length&&(f.teardown&&f.teardown.call(e,h,m.handle)!==!1||pe.removeEvent(e,p,m.handle),delete c[p])}else for(p in c)pe.event.remove(e,p+t[l],n,r,!0);pe.isEmptyObject(c)&&(delete m.handle,pe._removeData(e,"events"))}},trigger:function(t,n,r,i){var o,a,s,u,l,c,f,d=[r||re],p=ce.call(t,"type")?t.type:t,h=ce.call(t,"namespace")?t.namespace.split("."):[];if(s=c=r=r||re,3!==r.nodeType&&8!==r.nodeType&&!Ke.test(p+pe.event.triggered)&&(p.indexOf(".")>-1&&(h=p.split("."),p=h.shift(),h.sort()),a=p.indexOf(":")<0&&"on"+p,t=t[pe.expando]?t:new pe.Event(p,"object"==typeof t&&t),t.isTrigger=i?2:3,t.namespace=h.join("."),t.rnamespace=t.namespace?new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,t.result=void 0,t.target||(t.target=r),n=null==n?[t]:pe.makeArray(n,[t]),l=pe.event.special[p]||{},i||!l.trigger||l.trigger.apply(r,n)!==!1)){if(!i&&!l.noBubble&&!pe.isWindow(r)){for(u=l.delegateType||p,Ke.test(u+p)||(s=s.parentNode);s;s=s.parentNode)d.push(s),c=s;c===(r.ownerDocument||re)&&d.push(c.defaultView||c.parentWindow||e)}for(f=0;(s=d[f++])&&!t.isPropagationStopped();)t.type=f>1?u:l.bindType||p,o=(pe._data(s,"events")||{})[t.type]&&pe._data(s,"handle"),o&&o.apply(s,n),o=a&&s[a],o&&o.apply&&He(s)&&(t.result=o.apply(s,n),t.result===!1&&t.preventDefault());if(t.type=p,!i&&!t.isDefaultPrevented()&&(!l._default||l._default.apply(d.pop(),n)===!1)&&He(r)&&a&&r[p]&&!pe.isWindow(r)){c=r[a],c&&(r[a]=null),pe.event.triggered=p;try{r[p]()}catch(g){}pe.event.triggered=void 0,c&&(r[a]=c)}return t.result}},dispatch:function(e){e=pe.event.fix(e);var t,n,r,i,o,a=[],s=ie.call(arguments),u=(pe._data(this,"events")||{})[e.type]||[],l=pe.event.special[e.type]||{};if(s[0]=e,e.delegateTarget=this,!l.preDispatch||l.preDispatch.call(this,e)!==!1){for(a=pe.event.handlers.call(this,e,u),t=0;(i=a[t++])&&!e.isPropagationStopped();)for(e.currentTarget=i.elem,n=0;(o=i.handlers[n++])&&!e.isImmediatePropagationStopped();)e.rnamespace&&!e.rnamespace.test(o.namespace)||(e.handleObj=o,e.data=o.data,r=((pe.event.special[o.origType]||{}).handle||o.handler).apply(i.elem,s),void 0!==r&&(e.result=r)===!1&&(e.preventDefault(),e.stopPropagation()));return l.postDispatch&&l.postDispatch.call(this,e),e.result}},handlers:function(e,t){var n,r,i,o,a=[],s=t.delegateCount,u=e.target;if(s&&u.nodeType&&("click"!==e.type||isNaN(e.button)||e.button<1))for(;u!=this;u=u.parentNode||this)if(1===u.nodeType&&(u.disabled!==!0||"click"!==e.type)){for(r=[],n=0;n<s;n++)o=t[n],i=o.selector+" ",void 0===r[i]&&(r[i]=o.needsContext?pe(i,this).index(u)>-1:pe.find(i,this,null,[u]).length),r[i]&&r.push(o);r.length&&a.push({elem:u,handlers:r})}return s<t.length&&a.push({elem:this,handlers:t.slice(s)}),a},fix:function(e){if(e[pe.expando])return e;var t,n,r,i=e.type,o=e,a=this.fixHooks[i];for(a||(this.fixHooks[i]=a=Ge.test(i)?this.mouseHooks:Je.test(i)?this.keyHooks:{}),r=a.props?this.props.concat(a.props):this.props,e=new pe.Event(o),t=r.length;t--;)n=r[t],e[n]=o[n];return e.target||(e.target=o.srcElement||re),3===e.target.nodeType&&(e.target=e.target.parentNode),e.metaKey=!!e.metaKey,a.filter?a.filter(e,o):e},props:"altKey bubbles cancelable ctrlKey currentTarget detail.html eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return null==e.which&&(e.which=null!=t.charCode?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,t){var n,r,i,o=t.button,a=t.fromElement;return null==e.pageX&&null!=t.clientX&&(r=e.target.ownerDocument||re,i=r.documentElement,n=r.body,e.pageX=t.clientX+(i&&i.scrollLeft||n&&n.scrollLeft||0)-(i&&i.clientLeft||n&&n.clientLeft||0),e.pageY=t.clientY+(i&&i.scrollTop||n&&n.scrollTop||0)-(i&&i.clientTop||n&&n.clientTop||0)),!e.relatedTarget&&a&&(e.relatedTarget=a===e.target?t.toElement:a),e.which||void 0===o||(e.which=1&o?1:2&o?3:4&o?2:0),e}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==b()&&this.focus)try{return this.focus(),!1}catch(e){}},delegateType:"focusin"},blur:{trigger:function(){if(this===b()&&this.blur)return this.blur(),!1},delegateType:"focusout"},click:{trigger:function(){if(pe.nodeName(this,"input")&&"checkbox"===this.type&&this.click)return this.click(),!1},_default:function(e){return pe.nodeName(e.target,"a")}},beforeunload:{postDispatch:function(e){void 0!==e.result&&e.originalEvent&&(e.originalEvent.returnValue=e.result)}}},simulate:function(e,t,n){var r=pe.extend(new pe.Event,n,{type:e,isSimulated:!0});pe.event.trigger(r,null,t),r.isDefaultPrevented()&&n.preventDefault()}},pe.removeEvent=re.removeEventListener?function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n)}:function(e,t,n){var r="on"+t;e.detachEvent&&("undefined"==typeof e[r]&&(e[r]=null),e.detachEvent(r,n))},pe.Event=function(e,t){return this instanceof pe.Event?(e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||void 0===e.defaultPrevented&&e.returnValue===!1?v:x):this.type=e,t&&pe.extend(this,t),this.timeStamp=e&&e.timeStamp||pe.now(),void(this[pe.expando]=!0)):new pe.Event(e,t)},pe.Event.prototype={constructor:pe.Event,isDefaultPrevented:x,isPropagationStopped:x,isImmediatePropagationStopped:x,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=v,e&&(e.preventDefault?e.preventDefault():e.returnValue=!1)},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=v,e&&!this.isSimulated&&(e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0)},stopImmediatePropagation:function(){var e=this.originalEvent;this.isImmediatePropagationStopped=v,e&&e.stopImmediatePropagation&&e.stopImmediatePropagation(),this.stopPropagation()}},pe.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(e,t){pe.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,o=e.handleObj;return i&&(i===r||pe.contains(r,i))||(e.type=o.origType,n=o.handler.apply(this,arguments),e.type=t),n}}}),fe.submit||(pe.event.special.submit={setup:function(){return!pe.nodeName(this,"form")&&void pe.event.add(this,"click._submit keypress._submit",function(e){var t=e.target,n=pe.nodeName(t,"input")||pe.nodeName(t,"button")?pe.prop(t,"form"):void 0;n&&!pe._data(n,"submit")&&(pe.event.add(n,"submit._submit",function(e){e._submitBubble=!0}),pe._data(n,"submit",!0))})},postDispatch:function(e){e._submitBubble&&(delete e._submitBubble,this.parentNode&&!e.isTrigger&&pe.event.simulate("submit",this.parentNode,e))},teardown:function(){return!pe.nodeName(this,"form")&&void pe.event.remove(this,"._submit")}}),fe.change||(pe.event.special.change={setup:function(){return Ye.test(this.nodeName)?("checkbox"!==this.type&&"radio"!==this.type||(pe.event.add(this,"propertychange._change",function(e){"checked"===e.originalEvent.propertyName&&(this._justChanged=!0)}),pe.event.add(this,"click._change",function(e){this._justChanged&&!e.isTrigger&&(this._justChanged=!1),pe.event.simulate("change",this,e)})),!1):void pe.event.add(this,"beforeactivate._change",function(e){var t=e.target;Ye.test(t.nodeName)&&!pe._data(t,"change")&&(pe.event.add(t,"change._change",function(e){!this.parentNode||e.isSimulated||e.isTrigger||pe.event.simulate("change",this.parentNode,e)}),pe._data(t,"change",!0))})},handle:function(e){var t=e.target;if(this!==t||e.isSimulated||e.isTrigger||"radio"!==t.type&&"checkbox"!==t.type)return e.handleObj.handler.apply(this,arguments)},teardown:function(){return pe.event.remove(this,"._change"),!Ye.test(this.nodeName)}}),fe.focusin||pe.each({focus:"focusin",blur:"focusout"},function(e,t){var n=function(e){pe.event.simulate(t,e.target,pe.event.fix(e))};pe.event.special[t]={setup:function(){var r=this.ownerDocument||this,i=pe._data(r,t);i||r.addEventListener(e,n,!0),pe._data(r,t,(i||0)+1)},teardown:function(){var r=this.ownerDocument||this,i=pe._data(r,t)-1;i?pe._data(r,t,i):(r.removeEventListener(e,n,!0),pe._removeData(r,t))}}}),pe.fn.extend({on:function(e,t,n,r){return w(this,e,t,n,r)},one:function(e,t,n,r){return w(this,e,t,n,r,1)},off:function(e,t,n){var r,i;if(e&&e.preventDefault&&e.handleObj)return r=e.handleObj,pe(e.delegateTarget).off(r.namespace?r.origType+"."+r.namespace:r.origType,r.selector,r.handler),this;if("object"==typeof e){for(i in e)this.off(i,t,e[i]);return this}return t!==!1&&"function"!=typeof t||(n=t,t=void 0),n===!1&&(n=x),this.each(function(){pe.event.remove(this,e,n,t)})},trigger:function(e,t){return this.each(function(){pe.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];if(n)return pe.event.trigger(e,t,n,!0)}});var Ze=/ jQuery\d+="(?:null|\d+)"/g,et=new RegExp("<(?:"+ze+")[\\s/>]","i"),tt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi,nt=/<script|<style|<link/i,rt=/checked\s*(?:[^=]|=\s*.checked.)/i,it=/^true\/(.*)/,ot=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,at=p(re),st=at.appendChild(re.createElement("div"));pe.extend({htmlPrefilter:function(e){return e.replace(tt,"<$1></$2>")},clone:function(e,t,n){var r,i,o,a,s,u=pe.contains(e.ownerDocument,e);if(fe.html5Clone||pe.isXMLDoc(e)||!et.test("<"+e.nodeName+">")?o=e.cloneNode(!0):(st.innerHTML=e.outerHTML,st.removeChild(o=st.firstChild)),!(fe.noCloneEvent&&fe.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||pe.isXMLDoc(e)))for(r=h(o),s=h(e),a=0;null!=(i=s[a]);++a)r[a]&&k(i,r[a]);if(t)if(n)for(s=s||h(e),r=r||h(o),a=0;null!=(i=s[a]);a++)N(i,r[a]);else N(e,o);return r=h(o,"script"),r.length>0&&g(r,!u&&h(e,"script")),r=s=i=null,o},cleanData:function(e,t){for(var n,r,i,o,a=0,s=pe.expando,u=pe.cache,l=fe.attributes,c=pe.event.special;null!=(n=e[a]);a++)if((t||He(n))&&(i=n[s],o=i&&u[i])){if(o.events)for(r in o.events)c[r]?pe.event.remove(n,r):pe.removeEvent(n,r,o.handle);u[i]&&(delete u[i],l||"undefined"==typeof n.removeAttribute?n[s]=void 0:n.removeAttribute(s),ne.push(i))}}}),pe.fn.extend({domManip:S,detach:function(e){return A(this,e,!0)},remove:function(e){return A(this,e)},text:function(e){return Pe(this,function(e){return void 0===e?pe.text(this):this.empty().append((this[0]&&this[0].ownerDocument||re).createTextNode(e))},null,e,arguments.length)},append:function(){return S(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=T(this,e);t.appendChild(e)}})},prepend:function(){return S(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=T(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return S(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return S(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},empty:function(){for(var e,t=0;null!=(e=this[t]);t++){for(1===e.nodeType&&pe.cleanData(h(e,!1));e.firstChild;)e.removeChild(e.firstChild);e.options&&pe.nodeName(e,"select")&&(e.options.length=0)}return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map(function(){return pe.clone(this,e,t)})},html:function(e){return Pe(this,function(e){var t=this[0]||{},n=0,r=this.length;if(void 0===e)return 1===t.nodeType?t.innerHTML.replace(Ze,""):void 0;if("string"==typeof e&&!nt.test(e)&&(fe.htmlSerialize||!et.test(e))&&(fe.leadingWhitespace||!$e.test(e))&&!Xe[(We.exec(e)||["",""])[1].toLowerCase()]){e=pe.htmlPrefilter(e);try{for(;n<r;n++)t=this[n]||{},1===t.nodeType&&(pe.cleanData(h(t,!1)),t.innerHTML=e);t=0}catch(i){}}t&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var e=[];return S(this,arguments,function(t){var n=this.parentNode;pe.inArray(this,e)<0&&(pe.cleanData(h(this)),n&&n.replaceChild(t,this));
+},e)}}),pe.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){pe.fn[e]=function(e){for(var n,r=0,i=[],o=pe(e),a=o.length-1;r<=a;r++)n=r===a?this:this.clone(!0),pe(o[r])[t](n),ae.apply(i,n.get());return this.pushStack(i)}});var ut,lt={HTML:"block",BODY:"block"},ct=/^margin/,ft=new RegExp("^("+Fe+")(?!px)[a-z%]+$","i"),dt=function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];i=n.apply(e,r||[]);for(o in t)e.style[o]=a[o];return i},pt=re.documentElement;!function(){function t(){var t,c,f=re.documentElement;f.appendChild(u),l.style.cssText="-webkit-box-sizing:border-box;box-sizing:border-box;position:relative;display:block;margin:auto;border:1px;padding:1px;top:1%;width:50%",n=i=s=!1,r=a=!0,e.getComputedStyle&&(c=e.getComputedStyle(l),n="1%"!==(c||{}).top,s="2px"===(c||{}).marginLeft,i="4px"===(c||{width:"4px"}).width,l.style.marginRight="50%",r="4px"===(c||{marginRight:"4px"}).marginRight,t=l.appendChild(re.createElement("div")),t.style.cssText=l.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:0",t.style.marginRight=t.style.width="0",l.style.width="1px",a=!parseFloat((e.getComputedStyle(t)||{}).marginRight),l.removeChild(t)),l.style.display="none",o=0===l.getClientRects().length,o&&(l.style.display="",l.innerHTML="<table><tr><td></td><td>t</td></tr></table>",l.childNodes[0].style.borderCollapse="separate",t=l.getElementsByTagName("td"),t[0].style.cssText="margin:0;border:0;padding:0;display:none",o=0===t[0].offsetHeight,o&&(t[0].style.display="",t[1].style.display="none",o=0===t[0].offsetHeight)),f.removeChild(u)}var n,r,i,o,a,s,u=re.createElement("div"),l=re.createElement("div");l.style&&(l.style.cssText="float:left;opacity:.5",fe.opacity="0.5"===l.style.opacity,fe.cssFloat=!!l.style.cssFloat,l.style.backgroundClip="content-box",l.cloneNode(!0).style.backgroundClip="",fe.clearCloneStyle="content-box"===l.style.backgroundClip,u=re.createElement("div"),u.style.cssText="border:0;width:8px;height:0;top:0;left:-9999px;padding:0;margin-top:1px;position:absolute",l.innerHTML="",u.appendChild(l),fe.boxSizing=""===l.style.boxSizing||""===l.style.MozBoxSizing||""===l.style.WebkitBoxSizing,pe.extend(fe,{reliableHiddenOffsets:function(){return null==n&&t(),o},boxSizingReliable:function(){return null==n&&t(),i},pixelMarginRight:function(){return null==n&&t(),r},pixelPosition:function(){return null==n&&t(),n},reliableMarginRight:function(){return null==n&&t(),a},reliableMarginLeft:function(){return null==n&&t(),s}}))}();var ht,gt,mt=/^(top|right|bottom|left)$/;e.getComputedStyle?(ht=function(t){var n=t.ownerDocument.defaultView;return n&&n.opener||(n=e),n.getComputedStyle(t)},gt=function(e,t,n){var r,i,o,a,s=e.style;return n=n||ht(e),a=n?n.getPropertyValue(t)||n[t]:void 0,""!==a&&void 0!==a||pe.contains(e.ownerDocument,e)||(a=pe.style(e,t)),n&&!fe.pixelMarginRight()&&ft.test(a)&&ct.test(t)&&(r=s.width,i=s.minWidth,o=s.maxWidth,s.minWidth=s.maxWidth=s.width=a,a=n.width,s.width=r,s.minWidth=i,s.maxWidth=o),void 0===a?a:a+""}):pt.currentStyle&&(ht=function(e){return e.currentStyle},gt=function(e,t,n){var r,i,o,a,s=e.style;return n=n||ht(e),a=n?n[t]:void 0,null==a&&s&&s[t]&&(a=s[t]),ft.test(a)&&!mt.test(t)&&(r=s.left,i=e.runtimeStyle,o=i&&i.left,o&&(i.left=e.currentStyle.left),s.left="fontSize"===t?"1em":a,a=s.pixelLeft+"px",s.left=r,o&&(i.left=o)),void 0===a?a:a+""||"auto"});var yt=/alpha\([^)]*\)/i,vt=/opacity\s*=\s*([^)]*)/i,xt=/^(none|table(?!-c[ea]).+)/,bt=new RegExp("^("+Fe+")(.*)$","i"),wt={position:"absolute",visibility:"hidden",display:"block"},Tt={letterSpacing:"0",fontWeight:"400"},Ct=["Webkit","O","Moz","ms"],Et=re.createElement("div").style;pe.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=gt(e,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":fe.cssFloat?"cssFloat":"styleFloat"},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,a,s=pe.camelCase(t),u=e.style;if(t=pe.cssProps[s]||(pe.cssProps[s]=H(s)||s),a=pe.cssHooks[t]||pe.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(e,!1,r))?i:u[t];if(o=typeof n,"string"===o&&(i=Me.exec(n))&&i[1]&&(n=d(e,t,i),o="number"),null!=n&&n===n&&("number"===o&&(n+=i&&i[3]||(pe.cssNumber[s]?"":"px")),fe.clearCloneStyle||""!==n||0!==t.indexOf("background")||(u[t]="inherit"),!(a&&"set"in a&&void 0===(n=a.set(e,n,r)))))try{u[t]=n}catch(l){}}},css:function(e,t,n,r){var i,o,a,s=pe.camelCase(t);return t=pe.cssProps[s]||(pe.cssProps[s]=H(s)||s),a=pe.cssHooks[t]||pe.cssHooks[s],a&&"get"in a&&(o=a.get(e,!0,n)),void 0===o&&(o=gt(e,t,r)),"normal"===o&&t in Tt&&(o=Tt[t]),""===n||n?(i=parseFloat(o),n===!0||isFinite(i)?i||0:o):o}}),pe.each(["height","width"],function(e,t){pe.cssHooks[t]={get:function(e,n,r){if(n)return xt.test(pe.css(e,"display"))&&0===e.offsetWidth?dt(e,wt,function(){return M(e,t,r)}):M(e,t,r)},set:function(e,n,r){var i=r&&ht(e);return _(e,n,r?F(e,t,r,fe.boxSizing&&"border-box"===pe.css(e,"boxSizing",!1,i),i):0)}}}),fe.opacity||(pe.cssHooks.opacity={get:function(e,t){return vt.test((t&&e.currentStyle?e.currentStyle.filter:e.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":t?"1":""},set:function(e,t){var n=e.style,r=e.currentStyle,i=pe.isNumeric(t)?"alpha(opacity="+100*t+")":"",o=r&&r.filter||n.filter||"";n.zoom=1,(t>=1||""===t)&&""===pe.trim(o.replace(yt,""))&&n.removeAttribute&&(n.removeAttribute("filter"),""===t||r&&!r.filter)||(n.filter=yt.test(o)?o.replace(yt,i):o+" "+i)}}),pe.cssHooks.marginRight=L(fe.reliableMarginRight,function(e,t){if(t)return dt(e,{display:"inline-block"},gt,[e,"marginRight"])}),pe.cssHooks.marginLeft=L(fe.reliableMarginLeft,function(e,t){if(t)return(parseFloat(gt(e,"marginLeft"))||(pe.contains(e.ownerDocument,e)?e.getBoundingClientRect().left-dt(e,{marginLeft:0},function(){return e.getBoundingClientRect().left}):0))+"px"}),pe.each({margin:"",padding:"",border:"Width"},function(e,t){pe.cssHooks[e+t]={expand:function(n){for(var r=0,i={},o="string"==typeof n?n.split(" "):[n];r<4;r++)i[e+Oe[r]+t]=o[r]||o[r-2]||o[0];return i}},ct.test(e)||(pe.cssHooks[e+t].set=_)}),pe.fn.extend({css:function(e,t){return Pe(this,function(e,t,n){var r,i,o={},a=0;if(pe.isArray(t)){for(r=ht(e),i=t.length;a<i;a++)o[t[a]]=pe.css(e,t[a],!1,r);return o}return void 0!==n?pe.style(e,t,n):pe.css(e,t)},e,t,arguments.length>1)},show:function(){return q(this,!0)},hide:function(){return q(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){Re(this)?pe(this).show():pe(this).hide()})}}),pe.Tween=O,O.prototype={constructor:O,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||pe.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(pe.cssNumber[n]?"":"px")},cur:function(){var e=O.propHooks[this.prop];return e&&e.get?e.get(this):O.propHooks._default.get(this)},run:function(e){var t,n=O.propHooks[this.prop];return this.options.duration?this.pos=t=pe.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):O.propHooks._default.set(this),this}},O.prototype.init.prototype=O.prototype,O.propHooks={_default:{get:function(e){var t;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(t=pe.css(e.elem,e.prop,""),t&&"auto"!==t?t:0)},set:function(e){pe.fx.step[e.prop]?pe.fx.step[e.prop](e):1!==e.elem.nodeType||null==e.elem.style[pe.cssProps[e.prop]]&&!pe.cssHooks[e.prop]?e.elem[e.prop]=e.now:pe.style(e.elem,e.prop,e.now+e.unit)}}},O.propHooks.scrollTop=O.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},pe.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},pe.fx=O.prototype.init,pe.fx.step={};var Nt,kt,St=/^(?:toggle|show|hide)$/,At=/queueHooks$/;pe.Animation=pe.extend($,{tweeners:{"*":[function(e,t){var n=this.createTween(e,t);return d(n.elem,e,Me.exec(t),n),n}]},tweener:function(e,t){pe.isFunction(e)?(t=e,e=["*"]):e=e.match(De);for(var n,r=0,i=e.length;r<i;r++)n=e[r],$.tweeners[n]=$.tweeners[n]||[],$.tweeners[n].unshift(t)},prefilters:[W],prefilter:function(e,t){t?$.prefilters.unshift(e):$.prefilters.push(e)}}),pe.speed=function(e,t,n){var r=e&&"object"==typeof e?pe.extend({},e):{complete:n||!n&&t||pe.isFunction(e)&&e,duration:e,easing:n&&t||t&&!pe.isFunction(t)&&t};return r.duration=pe.fx.off?0:"number"==typeof r.duration?r.duration:r.duration in pe.fx.speeds?pe.fx.speeds[r.duration]:pe.fx.speeds._default,null!=r.queue&&r.queue!==!0||(r.queue="fx"),r.old=r.complete,r.complete=function(){pe.isFunction(r.old)&&r.old.call(this),r.queue&&pe.dequeue(this,r.queue)},r},pe.fn.extend({fadeTo:function(e,t,n,r){return this.filter(Re).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(e,t,n,r){var i=pe.isEmptyObject(e),o=pe.speed(t,n,r),a=function(){var t=$(this,pe.extend({},e),o);(i||pe._data(this,"finish"))&&t.stop(!0)};return a.finish=a,i||o.queue===!1?this.each(a):this.queue(o.queue,a)},stop:function(e,t,n){var r=function(e){var t=e.stop;delete e.stop,t(n)};return"string"!=typeof e&&(n=t,t=e,e=void 0),t&&e!==!1&&this.queue(e||"fx",[]),this.each(function(){var t=!0,i=null!=e&&e+"queueHooks",o=pe.timers,a=pe._data(this);if(i)a[i]&&a[i].stop&&r(a[i]);else for(i in a)a[i]&&a[i].stop&&At.test(i)&&r(a[i]);for(i=o.length;i--;)o[i].elem!==this||null!=e&&o[i].queue!==e||(o[i].anim.stop(n),t=!1,o.splice(i,1));!t&&n||pe.dequeue(this,e)})},finish:function(e){return e!==!1&&(e=e||"fx"),this.each(function(){var t,n=pe._data(this),r=n[e+"queue"],i=n[e+"queueHooks"],o=pe.timers,a=r?r.length:0;for(n.finish=!0,pe.queue(this,e,[]),i&&i.stop&&i.stop.call(this,!0),t=o.length;t--;)o[t].elem===this&&o[t].queue===e&&(o[t].anim.stop(!0),o.splice(t,1));for(t=0;t<a;t++)r[t]&&r[t].finish&&r[t].finish.call(this);delete n.finish})}}),pe.each(["toggle","show","hide"],function(e,t){var n=pe.fn[t];pe.fn[t]=function(e,r,i){return null==e||"boolean"==typeof e?n.apply(this,arguments):this.animate(P(t,!0),e,r,i)}}),pe.each({slideDown:P("show"),slideUp:P("hide"),slideToggle:P("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,t){pe.fn[e]=function(e,n,r){return this.animate(t,e,n,r)}}),pe.timers=[],pe.fx.tick=function(){var e,t=pe.timers,n=0;for(Nt=pe.now();n<t.length;n++)e=t[n],e()||t[n]!==e||t.splice(n--,1);t.length||pe.fx.stop(),Nt=void 0},pe.fx.timer=function(e){pe.timers.push(e),e()?pe.fx.start():pe.timers.pop()},pe.fx.interval=13,pe.fx.start=function(){kt||(kt=e.setInterval(pe.fx.tick,pe.fx.interval))},pe.fx.stop=function(){e.clearInterval(kt),kt=null},pe.fx.speeds={slow:600,fast:200,_default:400},pe.fn.delay=function(t,n){return t=pe.fx?pe.fx.speeds[t]||t:t,n=n||"fx",this.queue(n,function(n,r){var i=e.setTimeout(n,t);r.stop=function(){e.clearTimeout(i)}})},function(){var e,t=re.createElement("input"),n=re.createElement("div"),r=re.createElement("select"),i=r.appendChild(re.createElement("option"));n=re.createElement("div"),n.setAttribute("className","t"),n.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",e=n.getElementsByTagName("a")[0],t.setAttribute("type","checkbox"),n.appendChild(t),e=n.getElementsByTagName("a")[0],e.style.cssText="top:1px",fe.getSetAttribute="t"!==n.className,fe.style=/top/.test(e.getAttribute("style")),fe.hrefNormalized="/a"===e.getAttribute("href"),fe.checkOn=!!t.value,fe.optSelected=i.selected,fe.enctype=!!re.createElement("form").enctype,r.disabled=!0,fe.optDisabled=!i.disabled,t=re.createElement("input"),t.setAttribute("value",""),fe.input=""===t.getAttribute("value"),t.value="t",t.setAttribute("type","radio"),fe.radioValue="t"===t.value}();var Dt=/\r/g,jt=/[\x20\t\r\n\f]+/g;pe.fn.extend({val:function(e){var t,n,r,i=this[0];{if(arguments.length)return r=pe.isFunction(e),this.each(function(n){var i;1===this.nodeType&&(i=r?e.call(this,n,pe(this).val()):e,null==i?i="":"number"==typeof i?i+="":pe.isArray(i)&&(i=pe.map(i,function(e){return null==e?"":e+""})),t=pe.valHooks[this.type]||pe.valHooks[this.nodeName.toLowerCase()],t&&"set"in t&&void 0!==t.set(this,i,"value")||(this.value=i))});if(i)return t=pe.valHooks[i.type]||pe.valHooks[i.nodeName.toLowerCase()],t&&"get"in t&&void 0!==(n=t.get(i,"value"))?n:(n=i.value,"string"==typeof n?n.replace(Dt,""):null==n?"":n)}}}),pe.extend({valHooks:{option:{get:function(e){var t=pe.find.attr(e,"value");return null!=t?t:pe.trim(pe.text(e)).replace(jt," ")}},select:{get:function(e){for(var t,n,r=e.options,i=e.selectedIndex,o="select-one"===e.type||i<0,a=o?null:[],s=o?i+1:r.length,u=i<0?s:o?i:0;u<s;u++)if(n=r[u],(n.selected||u===i)&&(fe.optDisabled?!n.disabled:null===n.getAttribute("disabled"))&&(!n.parentNode.disabled||!pe.nodeName(n.parentNode,"optgroup"))){if(t=pe(n).val(),o)return t;a.push(t)}return a},set:function(e,t){for(var n,r,i=e.options,o=pe.makeArray(t),a=i.length;a--;)if(r=i[a],pe.inArray(pe.valHooks.option.get(r),o)>-1)try{r.selected=n=!0}catch(s){r.scrollHeight}else r.selected=!1;return n||(e.selectedIndex=-1),i}}}}),pe.each(["radio","checkbox"],function(){pe.valHooks[this]={set:function(e,t){if(pe.isArray(t))return e.checked=pe.inArray(pe(e).val(),t)>-1}},fe.checkOn||(pe.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})});var Lt,Ht,qt=pe.expr.attrHandle,_t=/^(?:checked|selected)$/i,Ft=fe.getSetAttribute,Mt=fe.input;pe.fn.extend({attr:function(e,t){return Pe(this,pe.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){pe.removeAttr(this,e)})}}),pe.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return"undefined"==typeof e.getAttribute?pe.prop(e,t,n):(1===o&&pe.isXMLDoc(e)||(t=t.toLowerCase(),i=pe.attrHooks[t]||(pe.expr.match.bool.test(t)?Ht:Lt)),void 0!==n?null===n?void pe.removeAttr(e,t):i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:(e.setAttribute(t,n+""),n):i&&"get"in i&&null!==(r=i.get(e,t))?r:(r=pe.find.attr(e,t),null==r?void 0:r))},attrHooks:{type:{set:function(e,t){if(!fe.radioValue&&"radio"===t&&pe.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,r,i=0,o=t&&t.match(De);if(o&&1===e.nodeType)for(;n=o[i++];)r=pe.propFix[n]||n,pe.expr.match.bool.test(n)?Mt&&Ft||!_t.test(n)?e[r]=!1:e[pe.camelCase("default-"+n)]=e[r]=!1:pe.attr(e,n,""),e.removeAttribute(Ft?n:r)}}),Ht={set:function(e,t,n){return t===!1?pe.removeAttr(e,n):Mt&&Ft||!_t.test(n)?e.setAttribute(!Ft&&pe.propFix[n]||n,n):e[pe.camelCase("default-"+n)]=e[n]=!0,n}},pe.each(pe.expr.match.bool.source.match(/\w+/g),function(e,t){var n=qt[t]||pe.find.attr;Mt&&Ft||!_t.test(t)?qt[t]=function(e,t,r){var i,o;return r||(o=qt[t],qt[t]=i,i=null!=n(e,t,r)?t.toLowerCase():null,qt[t]=o),i}:qt[t]=function(e,t,n){if(!n)return e[pe.camelCase("default-"+t)]?t.toLowerCase():null}}),Mt&&Ft||(pe.attrHooks.value={set:function(e,t,n){return pe.nodeName(e,"input")?void(e.defaultValue=t):Lt&&Lt.set(e,t,n)}}),Ft||(Lt={set:function(e,t,n){var r=e.getAttributeNode(n);if(r||e.setAttributeNode(r=e.ownerDocument.createAttribute(n)),r.value=t+="","value"===n||t===e.getAttribute(n))return t}},qt.id=qt.name=qt.coords=function(e,t,n){var r;if(!n)return(r=e.getAttributeNode(t))&&""!==r.value?r.value:null},pe.valHooks.button={get:function(e,t){var n=e.getAttributeNode(t);if(n&&n.specified)return n.value},set:Lt.set},pe.attrHooks.contenteditable={set:function(e,t,n){Lt.set(e,""!==t&&t,n)}},pe.each(["width","height"],function(e,t){pe.attrHooks[t]={set:function(e,n){if(""===n)return e.setAttribute(t,"auto"),n}}})),fe.style||(pe.attrHooks.style={get:function(e){return e.style.cssText||void 0},set:function(e,t){return e.style.cssText=t+""}});var Ot=/^(?:input|select|textarea|button|object)$/i,Rt=/^(?:a|area)$/i;pe.fn.extend({prop:function(e,t){return Pe(this,pe.prop,e,t,arguments.length>1)},removeProp:function(e){return e=pe.propFix[e]||e,this.each(function(){try{this[e]=void 0,delete this[e]}catch(t){}})}}),pe.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&pe.isXMLDoc(e)||(t=pe.propFix[t]||t,i=pe.propHooks[t]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=pe.find.attr(e,"tabindex");return t?parseInt(t,10):Ot.test(e.nodeName)||Rt.test(e.nodeName)&&e.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),fe.hrefNormalized||pe.each(["href","src"],function(e,t){pe.propHooks[t]={get:function(e){return e.getAttribute(t,4)}}}),fe.optSelected||(pe.propHooks.selected={get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),pe.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){pe.propFix[this.toLowerCase()]=this}),fe.enctype||(pe.propFix.enctype="encoding");var Pt=/[\t\r\n\f]/g;pe.fn.extend({addClass:function(e){var t,n,r,i,o,a,s,u=0;if(pe.isFunction(e))return this.each(function(t){pe(this).addClass(e.call(this,t,z(this)))});if("string"==typeof e&&e)for(t=e.match(De)||[];n=this[u++];)if(i=z(n),r=1===n.nodeType&&(" "+i+" ").replace(Pt," ")){for(a=0;o=t[a++];)r.indexOf(" "+o+" ")<0&&(r+=o+" ");s=pe.trim(r),i!==s&&pe.attr(n,"class",s)}return this},removeClass:function(e){var t,n,r,i,o,a,s,u=0;if(pe.isFunction(e))return this.each(function(t){pe(this).removeClass(e.call(this,t,z(this)))});if(!arguments.length)return this.attr("class","");if("string"==typeof e&&e)for(t=e.match(De)||[];n=this[u++];)if(i=z(n),r=1===n.nodeType&&(" "+i+" ").replace(Pt," ")){for(a=0;o=t[a++];)for(;r.indexOf(" "+o+" ")>-1;)r=r.replace(" "+o+" "," ");s=pe.trim(r),i!==s&&pe.attr(n,"class",s)}return this},toggleClass:function(e,t){var n=typeof e;return"boolean"==typeof t&&"string"===n?t?this.addClass(e):this.removeClass(e):pe.isFunction(e)?this.each(function(n){pe(this).toggleClass(e.call(this,n,z(this),t),t)}):this.each(function(){var t,r,i,o;if("string"===n)for(r=0,i=pe(this),o=e.match(De)||[];t=o[r++];)i.hasClass(t)?i.removeClass(t):i.addClass(t);else void 0!==e&&"boolean"!==n||(t=z(this),t&&pe._data(this,"__className__",t),pe.attr(this,"class",t||e===!1?"":pe._data(this,"__className__")||""))})},hasClass:function(e){var t,n,r=0;for(t=" "+e+" ";n=this[r++];)if(1===n.nodeType&&(" "+z(n)+" ").replace(Pt," ").indexOf(t)>-1)return!0;return!1}}),pe.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(e,t){pe.fn[t]=function(e,n){return arguments.length>0?this.on(t,null,e,n):this.trigger(t)}}),pe.fn.extend({hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}});var Bt=e.location,Wt=pe.now(),It=/\?/,$t=/(,)|(\[|{)|(}|])|"(?:[^"\\\r\n]|\\["\\\/bfnrt]|\\u[\da-fA-F]{4})*"\s*:?|true|false|null|-?(?!0\d)\d+(?:\.\d+|)(?:[eE][+-]?\d+|)/g;pe.parseJSON=function(t){if(e.JSON&&e.JSON.parse)return e.JSON.parse(t+"");var n,r=null,i=pe.trim(t+"");return i&&!pe.trim(i.replace($t,function(e,t,i,o){return n&&t&&(r=0),0===r?e:(n=i||t,r+=!o-!i,"")}))?Function("return "+i)():pe.error("Invalid JSON: "+t)},pe.parseXML=function(t){var n,r;if(!t||"string"!=typeof t)return null;try{e.DOMParser?(r=new e.DOMParser,n=r.parseFromString(t,"text/xml")):(n=new e.ActiveXObject("Microsoft.XMLDOM"),n.async="false",n.loadXML(t))}catch(i){n=void 0}return n&&n.documentElement&&!n.getElementsByTagName("parsererror").length||pe.error("Invalid XML: "+t),n};var zt=/#.*$/,Xt=/([?&])_=[^&]*/,Ut=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Vt=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Yt=/^(?:GET|HEAD)$/,Jt=/^\/\//,Gt=/^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,Kt={},Qt={},Zt="*/".concat("*"),en=Bt.href,tn=Gt.exec(en.toLowerCase())||[];pe.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:en,type:"GET",isLocal:Vt.test(tn[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Zt,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":pe.parseJSON,"text xml":pe.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?V(V(e,pe.ajaxSettings),t):V(pe.ajaxSettings,e)},ajaxPrefilter:X(Kt),ajaxTransport:X(Qt),ajax:function(t,n){function r(t,n,r,i){var o,f,v,x,w,C=n;2!==b&&(b=2,u&&e.clearTimeout(u),c=void 0,s=i||"",T.readyState=t>0?4:0,o=t>=200&&t<300||304===t,r&&(x=Y(d,T,r)),x=J(d,x,T,o),o?(d.ifModified&&(w=T.getResponseHeader("Last-Modified"),w&&(pe.lastModified[a]=w),w=T.getResponseHeader("etag"),w&&(pe.etag[a]=w)),204===t||"HEAD"===d.type?C="nocontent":304===t?C="notmodified":(C=x.state,f=x.data,v=x.error,o=!v)):(v=C,!t&&C||(C="error",t<0&&(t=0))),T.status=t,T.statusText=(n||C)+"",o?g.resolveWith(p,[f,C,T]):g.rejectWith(p,[T,C,v]),T.statusCode(y),y=void 0,l&&h.trigger(o?"ajaxSuccess":"ajaxError",[T,d,o?f:v]),m.fireWith(p,[T,C]),l&&(h.trigger("ajaxComplete",[T,d]),--pe.active||pe.event.trigger("ajaxStop")))}"object"==typeof t&&(n=t,t=void 0),n=n||{};var i,o,a,s,u,l,c,f,d=pe.ajaxSetup({},n),p=d.context||d,h=d.context&&(p.nodeType||p.jquery)?pe(p):pe.event,g=pe.Deferred(),m=pe.Callbacks("once memory"),y=d.statusCode||{},v={},x={},b=0,w="canceled",T={readyState:0,getResponseHeader:function(e){var t;if(2===b){if(!f)for(f={};t=Ut.exec(s);)f[t[1].toLowerCase()]=t[2];t=f[e.toLowerCase()]}return null==t?null:t},getAllResponseHeaders:function(){return 2===b?s:null},setRequestHeader:function(e,t){var n=e.toLowerCase();return b||(e=x[n]=x[n]||e,v[e]=t),this},overrideMimeType:function(e){return b||(d.mimeType=e),this},statusCode:function(e){var t;if(e)if(b<2)for(t in e)y[t]=[y[t],e[t]];else T.always(e[T.status]);return this},abort:function(e){var t=e||w;return c&&c.abort(t),r(0,t),this}};if(g.promise(T).complete=m.add,T.success=T.done,T.error=T.fail,d.url=((t||d.url||en)+"").replace(zt,"").replace(Jt,tn[1]+"//"),d.type=n.method||n.type||d.method||d.type,d.dataTypes=pe.trim(d.dataType||"*").toLowerCase().match(De)||[""],null==d.crossDomain&&(i=Gt.exec(d.url.toLowerCase()),d.crossDomain=!(!i||i[1]===tn[1]&&i[2]===tn[2]&&(i[3]||("http:"===i[1]?"80":"443"))===(tn[3]||("http:"===tn[1]?"80":"443")))),d.data&&d.processData&&"string"!=typeof d.data&&(d.data=pe.param(d.data,d.traditional)),U(Kt,d,n,T),2===b)return T;l=pe.event&&d.global,l&&0===pe.active++&&pe.event.trigger("ajaxStart"),d.type=d.type.toUpperCase(),d.hasContent=!Yt.test(d.type),a=d.url,d.hasContent||(d.data&&(a=d.url+=(It.test(a)?"&":"?")+d.data,delete d.data),d.cache===!1&&(d.url=Xt.test(a)?a.replace(Xt,"$1_="+Wt++):a+(It.test(a)?"&":"?")+"_="+Wt++)),d.ifModified&&(pe.lastModified[a]&&T.setRequestHeader("If-Modified-Since",pe.lastModified[a]),pe.etag[a]&&T.setRequestHeader("If-None-Match",pe.etag[a])),(d.data&&d.hasContent&&d.contentType!==!1||n.contentType)&&T.setRequestHeader("Content-Type",d.contentType),T.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+("*"!==d.dataTypes[0]?", "+Zt+"; q=0.01":""):d.accepts["*"]);for(o in d.headers)T.setRequestHeader(o,d.headers[o]);if(d.beforeSend&&(d.beforeSend.call(p,T,d)===!1||2===b))return T.abort();w="abort";for(o in{success:1,error:1,complete:1})T[o](d[o]);if(c=U(Qt,d,n,T)){if(T.readyState=1,l&&h.trigger("ajaxSend",[T,d]),2===b)return T;d.async&&d.timeout>0&&(u=e.setTimeout(function(){T.abort("timeout")},d.timeout));try{b=1,c.send(v,r)}catch(C){if(!(b<2))throw C;r(-1,C)}}else r(-1,"No Transport");return T},getJSON:function(e,t,n){return pe.get(e,t,n,"json")},getScript:function(e,t){return pe.get(e,void 0,t,"script")}}),pe.each(["get","post"],function(e,t){pe[t]=function(e,n,r,i){return pe.isFunction(n)&&(i=i||r,r=n,n=void 0),pe.ajax(pe.extend({url:e,type:t,dataType:i,data:n,success:r},pe.isPlainObject(e)&&e))}}),pe._evalUrl=function(e){return pe.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,"throws":!0})},pe.fn.extend({wrapAll:function(e){if(pe.isFunction(e))return this.each(function(t){pe(this).wrapAll(e.call(this,t))});if(this[0]){var t=pe(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){for(var e=this;e.firstChild&&1===e.firstChild.nodeType;)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return pe.isFunction(e)?this.each(function(t){pe(this).wrapInner(e.call(this,t))}):this.each(function(){var t=pe(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=pe.isFunction(e);return this.each(function(n){pe(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){pe.nodeName(this,"body")||pe(this).replaceWith(this.childNodes)}).end()}}),pe.expr.filters.hidden=function(e){return fe.reliableHiddenOffsets()?e.offsetWidth<=0&&e.offsetHeight<=0&&!e.getClientRects().length:K(e)},pe.expr.filters.visible=function(e){return!pe.expr.filters.hidden(e)};var nn=/%20/g,rn=/\[\]$/,on=/\r?\n/g,an=/^(?:submit|button|image|reset|file)$/i,sn=/^(?:input|select|textarea|keygen)/i;pe.param=function(e,t){var n,r=[],i=function(e,t){t=pe.isFunction(t)?t():null==t?"":t,r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};if(void 0===t&&(t=pe.ajaxSettings&&pe.ajaxSettings.traditional),pe.isArray(e)||e.jquery&&!pe.isPlainObject(e))pe.each(e,function(){i(this.name,this.value)});else for(n in e)Q(n,e[n],t,i);return r.join("&").replace(nn,"+")},pe.fn.extend({serialize:function(){return pe.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=pe.prop(this,"elements");return e?pe.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!pe(this).is(":disabled")&&sn.test(this.nodeName)&&!an.test(e)&&(this.checked||!Be.test(e))}).map(function(e,t){var n=pe(this).val();return null==n?null:pe.isArray(n)?pe.map(n,function(e){return{name:t.name,value:e.replace(on,"\r\n")}}):{name:t.name,value:n.replace(on,"\r\n")}}).get()}}),pe.ajaxSettings.xhr=void 0!==e.ActiveXObject?function(){return this.isLocal?ee():re.documentMode>8?Z():/^(get|post|head|put|delete|options)$/i.test(this.type)&&Z()||ee()}:Z;var un=0,ln={},cn=pe.ajaxSettings.xhr();e.attachEvent&&e.attachEvent("onunload",function(){for(var e in ln)ln[e](void 0,!0)}),fe.cors=!!cn&&"withCredentials"in cn,cn=fe.ajax=!!cn,cn&&pe.ajaxTransport(function(t){if(!t.crossDomain||fe.cors){var n;return{send:function(r,i){var o,a=t.xhr(),s=++un;if(a.open(t.type,t.url,t.async,t.username,t.password),t.xhrFields)for(o in t.xhrFields)a[o]=t.xhrFields[o];t.mimeType&&a.overrideMimeType&&a.overrideMimeType(t.mimeType),t.crossDomain||r["X-Requested-With"]||(r["X-Requested-With"]="XMLHttpRequest");for(o in r)void 0!==r[o]&&a.setRequestHeader(o,r[o]+"");a.send(t.hasContent&&t.data||null),n=function(e,r){var o,u,l;if(n&&(r||4===a.readyState))if(delete ln[s],n=void 0,a.onreadystatechange=pe.noop,r)4!==a.readyState&&a.abort();else{l={},o=a.status,"string"==typeof a.responseText&&(l.text=a.responseText);try{u=a.statusText}catch(c){u=""}o||!t.isLocal||t.crossDomain?1223===o&&(o=204):o=l.text?200:404}l&&i(o,u,l,a.getAllResponseHeaders())},t.async?4===a.readyState?e.setTimeout(n):a.onreadystatechange=ln[s]=n:n()},abort:function(){n&&n(void 0,!0)}}}}),pe.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return pe.globalEval(e),e}}}),pe.ajaxPrefilter("script",function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET",e.global=!1)}),pe.ajaxTransport("script",function(e){if(e.crossDomain){var t,n=re.head||pe("head")[0]||re.documentElement;return{send:function(r,i){t=re.createElement("script"),t.async=!0,e.scriptCharset&&(t.charset=e.scriptCharset),t.src=e.url,t.onload=t.onreadystatechange=function(e,n){(n||!t.readyState||/loaded|complete/.test(t.readyState))&&(t.onload=t.onreadystatechange=null,t.parentNode&&t.parentNode.removeChild(t),t=null,n||i(200,"success"))},n.insertBefore(t,n.firstChild)},abort:function(){t&&t.onload(void 0,!0)}}}});var fn=[],dn=/(=)\?(?=&|$)|\?\?/;pe.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=fn.pop()||pe.expando+"_"+Wt++;return this[e]=!0,e}}),pe.ajaxPrefilter("json jsonp",function(t,n,r){var i,o,a,s=t.jsonp!==!1&&(dn.test(t.url)?"url":"string"==typeof t.data&&0===(t.contentType||"").indexOf("application/x-www-form-urlencoded")&&dn.test(t.data)&&"data");if(s||"jsonp"===t.dataTypes[0])return i=t.jsonpCallback=pe.isFunction(t.jsonpCallback)?t.jsonpCallback():t.jsonpCallback,s?t[s]=t[s].replace(dn,"$1"+i):t.jsonp!==!1&&(t.url+=(It.test(t.url)?"&":"?")+t.jsonp+"="+i),t.converters["script json"]=function(){return a||pe.error(i+" was not called"),a[0]},t.dataTypes[0]="json",o=e[i],e[i]=function(){a=arguments},r.always(function(){void 0===o?pe(e).removeProp(i):e[i]=o,t[i]&&(t.jsonpCallback=n.jsonpCallback,fn.push(i)),a&&pe.isFunction(o)&&o(a[0]),a=o=void 0}),"script"}),pe.parseHTML=function(e,t,n){if(!e||"string"!=typeof e)return null;"boolean"==typeof t&&(n=t,t=!1),t=t||re;var r=Te.exec(e),i=!n&&[];return r?[t.createElement(r[1])]:(r=y([e],t,i),i&&i.length&&pe(i).remove(),pe.merge([],r.childNodes))};var pn=pe.fn.load;return pe.fn.load=function(e,t,n){if("string"!=typeof e&&pn)return pn.apply(this,arguments);var r,i,o,a=this,s=e.indexOf(" ");return s>-1&&(r=pe.trim(e.slice(s,e.length)),e=e.slice(0,s)),pe.isFunction(t)?(n=t,t=void 0):t&&"object"==typeof t&&(i="POST"),a.length>0&&pe.ajax({url:e,type:i||"GET",dataType:"html",data:t}).done(function(e){o=arguments,a.html(r?pe("<div>").append(pe.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},pe.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){pe.fn[t]=function(e){return this.on(t,e)}}),pe.expr.filters.animated=function(e){return pe.grep(pe.timers,function(t){return e===t.elem}).length},pe.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l,c=pe.css(e,"position"),f=pe(e),d={};"static"===c&&(e.style.position="relative"),s=f.offset(),o=pe.css(e,"top"),u=pe.css(e,"left"),l=("absolute"===c||"fixed"===c)&&pe.inArray("auto",[o,u])>-1,l?(r=f.position(),a=r.top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),pe.isFunction(t)&&(t=t.call(e,n,pe.extend({},s))),null!=t.top&&(d.top=t.top-s.top+a),null!=t.left&&(d.left=t.left-s.left+i),"using"in t?t.using.call(e,d):f.css(d)}},pe.fn.extend({offset:function(e){if(arguments.length)return void 0===e?this:this.each(function(t){pe.offset.setOffset(this,e,t)});var t,n,r={top:0,left:0},i=this[0],o=i&&i.ownerDocument;if(o)return t=o.documentElement,pe.contains(t,i)?("undefined"!=typeof i.getBoundingClientRect&&(r=i.getBoundingClientRect()),n=te(o),{top:r.top+(n.pageYOffset||t.scrollTop)-(t.clientTop||0),left:r.left+(n.pageXOffset||t.scrollLeft)-(t.clientLeft||0)}):r},position:function(){if(this[0]){var e,t,n={top:0,left:0},r=this[0];return"fixed"===pe.css(r,"position")?t=r.getBoundingClientRect():(e=this.offsetParent(),t=this.offset(),pe.nodeName(e[0],"html")||(n=e.offset()),n.top+=pe.css(e[0],"borderTopWidth",!0),n.left+=pe.css(e[0],"borderLeftWidth",!0)),{top:t.top-n.top-pe.css(r,"marginTop",!0),left:t.left-n.left-pe.css(r,"marginLeft",!0)}}},offsetParent:function(){
+return this.map(function(){for(var e=this.offsetParent;e&&!pe.nodeName(e,"html")&&"static"===pe.css(e,"position");)e=e.offsetParent;return e||pt})}}),pe.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,t){var n=/Y/.test(t);pe.fn[e]=function(r){return Pe(this,function(e,r,i){var o=te(e);return void 0===i?o?t in o?o[t]:o.document.documentElement[r]:e[r]:void(o?o.scrollTo(n?pe(o).scrollLeft():i,n?i:pe(o).scrollTop()):e[r]=i)},e,r,arguments.length,null)}}),pe.each(["top","left"],function(e,t){pe.cssHooks[t]=L(fe.pixelPosition,function(e,n){if(n)return n=gt(e,t),ft.test(n)?pe(e).position()[t]+"px":n})}),pe.each({Height:"height",Width:"width"},function(e,t){pe.each({padding:"inner"+e,content:t,"":"outer"+e},function(n,r){pe.fn[r]=function(r,i){var o=arguments.length&&(n||"boolean"!=typeof r),a=n||(r===!0||i===!0?"margin":"border");return Pe(this,function(t,n,r){var i;return pe.isWindow(t)?t.document.documentElement["client"+e]:9===t.nodeType?(i=t.documentElement,Math.max(t.body["scroll"+e],i["scroll"+e],t.body["offset"+e],i["offset"+e],i["client"+e])):void 0===r?pe.css(t,n,a):pe.style(t,n,r,a)},t,o?r:void 0,o,null)}})}),pe.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)}}),pe.fn.size=function(){return this.length},pe.fn.andSelf=pe.fn.addBack,layui.define(function(e){layui.$=pe,e("jquery",pe)}),pe});!function(e,t){"use strict";var i,n,a=e.layui&&layui.define,o={getPath:function(){var t=document.currentScript?document.currentScript.src:function(){for(var e,t=document.scripts,i=t.length-1,n=i;n>0;n--)if("interactive"===t[n].readyState){e=t[n].src;break}return e||t[i].src}(),i=e.LAYUI_GLOBAL||{};return i.layer_dir||t.substring(0,t.lastIndexOf("/")+1)}(),config:{},end:{},minIndex:0,minLeft:[],btn:["&#x786E;&#x5B9A;","&#x53D6;&#x6D88;"],type:["dialog","page","iframe","loading","tips"],getStyle:function(t,i){var n=t.currentStyle?t.currentStyle:e.getComputedStyle(t,null);return n[n.getPropertyValue?"getPropertyValue":"getAttribute"](i)},link:function(t,i,n){if(r.path){var a=document.getElementsByTagName("head")[0],s=document.createElement("link");"string"==typeof i&&(n=i);var l=(n||t).replace(/\.|\//g,""),f="layuicss-"+l,c="creating",u=0;s.rel="stylesheet",s.href=r.path+t,s.id=f,document.getElementById(f)||a.appendChild(s),"function"==typeof i&&!function d(t){var n=100,a=document.getElementById(f);return++u>1e4/n?e.console&&console.error(l+".css: Invalid"):void(1989===parseInt(o.getStyle(a,"width"))?(t===c&&a.removeAttribute("lay-status"),a.getAttribute("lay-status")===c?setTimeout(d,n):i()):(a.setAttribute("lay-status",c),setTimeout(function(){d(c)},n)))}()}}},r={v:"3.5.1",ie:function(){var t=navigator.userAgent.toLowerCase();return!!(e.ActiveXObject||"ActiveXObject"in e)&&((t.match(/msie\s(\d+)/)||[])[1]||"11")}(),index:e.layer&&e.layer.v?1e5:0,path:o.getPath,config:function(e,t){return e=e||{},r.cache=o.config=i.extend({},o.config,e),r.path=o.config.path||r.path,"string"==typeof e.extend&&(e.extend=[e.extend]),o.config.path&&r.ready(),e.extend?(a?layui.addcss("modules/layer/"+e.extend):o.link("theme/"+e.extend),this):this},ready:function(e){var t="layer",i="",n=(a?"modules/layer/":"theme/")+"default/layer.css?v="+r.v+i;return a?layui.addcss(n,e,t):o.link(n,e,t),this},alert:function(e,t,n){var a="function"==typeof t;return a&&(n=t),r.open(i.extend({content:e,yes:n},a?{}:t))},confirm:function(e,t,n,a){var s="function"==typeof t;return s&&(a=n,n=t),r.open(i.extend({content:e,btn:o.btn,yes:n,btn2:a},s?{}:t))},msg:function(e,n,a){var s="function"==typeof n,f=o.config.skin,c=(f?f+" "+f+"-msg":"")||"layui-layer-msg",u=l.anim.length-1;return s&&(a=n),r.open(i.extend({content:e,time:3e3,shade:!1,skin:c,title:!1,closeBtn:!1,btn:!1,resize:!1,end:a},s&&!o.config.skin?{skin:c+" layui-layer-hui",anim:u}:function(){return n=n||{},(n.icon===-1||n.icon===t&&!o.config.skin)&&(n.skin=c+" "+(n.skin||"layui-layer-hui")),n}()))},load:function(e,t){return r.open(i.extend({type:3,icon:e||0,resize:!1,shade:.01},t))},tips:function(e,t,n){return r.open(i.extend({type:4,content:[e,t],closeBtn:!1,time:3e3,shade:!1,resize:!1,fixed:!1,maxWidth:260},n))}},s=function(e){var t=this,a=function(){t.creat()};t.index=++r.index,t.config.maxWidth=i(n).width()-30,t.config=i.extend({},t.config,o.config,e),document.body?a():setTimeout(function(){a()},30)};s.pt=s.prototype;var l=["layui-layer",".layui-layer-title",".layui-layer-main",".layui-layer-dialog","layui-layer-iframe","layui-layer-content","layui-layer-btn","layui-layer-close"];l.anim=["layer-anim-00","layer-anim-01","layer-anim-02","layer-anim-03","layer-anim-04","layer-anim-05","layer-anim-06"],l.SHADE="layui-layer-shade",l.MOVE="layui-layer-move",s.pt.config={type:0,shade:.3,fixed:!0,move:l[1],title:"&#x4FE1;&#x606F;",offset:"auto",area:"auto",closeBtn:1,time:0,zIndex:19891014,maxWidth:360,anim:0,isOutAnim:!0,minStack:!0,icon:-1,moveType:1,resize:!0,scrollbar:!0,tips:2},s.pt.vessel=function(e,t){var n=this,a=n.index,r=n.config,s=r.zIndex+a,f="object"==typeof r.title,c=r.maxmin&&(1===r.type||2===r.type),u=r.title?'<div class="layui-layer-title" style="'+(f?r.title[1]:"")+'">'+(f?r.title[0]:r.title)+"</div>":"";return r.zIndex=s,t([r.shade?'<div class="'+l.SHADE+'" id="'+l.SHADE+a+'" times="'+a+'" style="'+("z-index:"+(s-1)+"; ")+'"></div>':"",'<div class="'+l[0]+(" layui-layer-"+o.type[r.type])+(0!=r.type&&2!=r.type||r.shade?"":" layui-layer-border")+" "+(r.skin||"")+'" id="'+l[0]+a+'" type="'+o.type[r.type]+'" times="'+a+'" showtime="'+r.time+'" conType="'+(e?"object":"string")+'" style="z-index: '+s+"; width:"+r.area[0]+";height:"+r.area[1]+";position:"+(r.fixed?"fixed;":"absolute;")+'">'+(e&&2!=r.type?"":u)+'<div id="'+(r.id||"")+'" class="layui-layer-content'+(0==r.type&&r.icon!==-1?" layui-layer-padding":"")+(3==r.type?" layui-layer-loading"+r.icon:"")+'">'+(0==r.type&&r.icon!==-1?'<i class="layui-layer-ico layui-layer-ico'+r.icon+'"></i>':"")+(1==r.type&&e?"":r.content||"")+'</div><span class="layui-layer-setwin">'+function(){var e=c?'<a class="layui-layer-min" href="javascript:;"><cite></cite></a><a class="layui-layer-ico layui-layer-max" href="javascript:;"></a>':"";return r.closeBtn&&(e+='<a class="layui-layer-ico '+l[7]+" "+l[7]+(r.title?r.closeBtn:4==r.type?"1":"2")+'" href="javascript:;"></a>'),e}()+"</span>"+(r.btn?function(){var e="";"string"==typeof r.btn&&(r.btn=[r.btn]);for(var t=0,i=r.btn.length;t<i;t++)e+='<a class="'+l[6]+t+'">'+r.btn[t]+"</a>";return'<div class="'+l[6]+" layui-layer-btn-"+(r.btnAlign||"")+'">'+e+"</div>"}():"")+(r.resize?'<span class="layui-layer-resize"></span>':"")+"</div>"],u,i('<div class="'+l.MOVE+'" id="'+l.MOVE+'"></div>')),n},s.pt.creat=function(){var e=this,t=e.config,a=e.index,s=t.content,f="object"==typeof s,c=i("body");if(!t.id||!i("#"+t.id)[0]){switch("string"==typeof t.area&&(t.area="auto"===t.area?["",""]:[t.area,""]),t.shift&&(t.anim=t.shift),6==r.ie&&(t.fixed=!1),t.type){case 0:t.btn="btn"in t?t.btn:o.btn[0],r.closeAll("dialog");break;case 2:var s=t.content=f?t.content:[t.content||"","auto"];t.content='<iframe scrolling="'+(t.content[1]||"auto")+'" allowtransparency="true" id="'+l[4]+a+'" name="'+l[4]+a+'" onload="this.className=\'\';" class="layui-layer-load" frameborder="0" src="'+t.content[0]+'"></iframe>';break;case 3:delete t.title,delete t.closeBtn,t.icon===-1&&0===t.icon,r.closeAll("loading");break;case 4:f||(t.content=[t.content,"body"]),t.follow=t.content[1],t.content=t.content[0]+'<i class="layui-layer-TipsG"></i>',delete t.title,t.tips="object"==typeof t.tips?t.tips:[t.tips,!0],t.tipsMore||r.closeAll("tips")}if(e.vessel(f,function(n,r,u){c.append(n[0]),f?function(){2==t.type||4==t.type?function(){i("body").append(n[1])}():function(){s.parents("."+l[0])[0]||(s.data("display",s.css("display")).show().addClass("layui-layer-wrap").wrap(n[1]),i("#"+l[0]+a).find("."+l[5]).before(r))}()}():c.append(n[1]),i("#"+l.MOVE)[0]||c.append(o.moveElem=u),e.layero=i("#"+l[0]+a),e.shadeo=i("#"+l.SHADE+a),t.scrollbar||l.html.css("overflow","hidden").attr("layer-full",a)}).auto(a),e.shadeo.css({"background-color":t.shade[1]||"#000",opacity:t.shade[0]||t.shade}),2==t.type&&6==r.ie&&e.layero.find("iframe").attr("src",s[0]),4==t.type?e.tips():function(){e.offset(),parseInt(o.getStyle(document.getElementById(l.MOVE),"z-index"))||function(){e.layero.css("visibility","hidden"),r.ready(function(){e.offset(),e.layero.css("visibility","visible")})}()}(),t.fixed&&n.on("resize",function(){e.offset(),(/^\d+%$/.test(t.area[0])||/^\d+%$/.test(t.area[1]))&&e.auto(a),4==t.type&&e.tips()}),t.time<=0||setTimeout(function(){r.close(e.index)},t.time),e.move().callback(),l.anim[t.anim]){var u="layer-anim "+l.anim[t.anim];e.layero.addClass(u).one("webkitAnimationEnd mozAnimationEnd MSAnimationEnd oanimationend animationend",function(){i(this).removeClass(u)})}t.isOutAnim&&e.layero.data("isOutAnim",!0)}},s.pt.auto=function(e){var t=this,a=t.config,o=i("#"+l[0]+e);""===a.area[0]&&a.maxWidth>0&&(r.ie&&r.ie<8&&a.btn&&o.width(o.innerWidth()),o.outerWidth()>a.maxWidth&&o.width(a.maxWidth));var s=[o.innerWidth(),o.innerHeight()],f=o.find(l[1]).outerHeight()||0,c=o.find("."+l[6]).outerHeight()||0,u=function(e){e=o.find(e),e.height(s[1]-f-c-2*(0|parseFloat(e.css("padding-top"))))};switch(a.type){case 2:u("iframe");break;default:""===a.area[1]?a.maxHeight>0&&o.outerHeight()>a.maxHeight?(s[1]=a.maxHeight,u("."+l[5])):a.fixed&&s[1]>=n.height()&&(s[1]=n.height(),u("."+l[5])):u("."+l[5])}return t},s.pt.offset=function(){var e=this,t=e.config,i=e.layero,a=[i.outerWidth(),i.outerHeight()],o="object"==typeof t.offset;e.offsetTop=(n.height()-a[1])/2,e.offsetLeft=(n.width()-a[0])/2,o?(e.offsetTop=t.offset[0],e.offsetLeft=t.offset[1]||e.offsetLeft):"auto"!==t.offset&&("t"===t.offset?e.offsetTop=0:"r"===t.offset?e.offsetLeft=n.width()-a[0]:"b"===t.offset?e.offsetTop=n.height()-a[1]:"l"===t.offset?e.offsetLeft=0:"lt"===t.offset?(e.offsetTop=0,e.offsetLeft=0):"lb"===t.offset?(e.offsetTop=n.height()-a[1],e.offsetLeft=0):"rt"===t.offset?(e.offsetTop=0,e.offsetLeft=n.width()-a[0]):"rb"===t.offset?(e.offsetTop=n.height()-a[1],e.offsetLeft=n.width()-a[0]):e.offsetTop=t.offset),t.fixed||(e.offsetTop=/%$/.test(e.offsetTop)?n.height()*parseFloat(e.offsetTop)/100:parseFloat(e.offsetTop),e.offsetLeft=/%$/.test(e.offsetLeft)?n.width()*parseFloat(e.offsetLeft)/100:parseFloat(e.offsetLeft),e.offsetTop+=n.scrollTop(),e.offsetLeft+=n.scrollLeft()),i.attr("minLeft")&&(e.offsetTop=n.height()-(i.find(l[1]).outerHeight()||0),e.offsetLeft=i.css("left")),i.css({top:e.offsetTop,left:e.offsetLeft})},s.pt.tips=function(){var e=this,t=e.config,a=e.layero,o=[a.outerWidth(),a.outerHeight()],r=i(t.follow);r[0]||(r=i("body"));var s={width:r.outerWidth(),height:r.outerHeight(),top:r.offset().top,left:r.offset().left},f=a.find(".layui-layer-TipsG"),c=t.tips[0];t.tips[1]||f.remove(),s.autoLeft=function(){s.left+o[0]-n.width()>0?(s.tipLeft=s.left+s.width-o[0],f.css({right:12,left:"auto"})):s.tipLeft=s.left},s.where=[function(){s.autoLeft(),s.tipTop=s.top-o[1]-10,f.removeClass("layui-layer-TipsB").addClass("layui-layer-TipsT").css("border-right-color",t.tips[1])},function(){s.tipLeft=s.left+s.width+10,s.tipTop=s.top,f.removeClass("layui-layer-TipsL").addClass("layui-layer-TipsR").css("border-bottom-color",t.tips[1])},function(){s.autoLeft(),s.tipTop=s.top+s.height+10,f.removeClass("layui-layer-TipsT").addClass("layui-layer-TipsB").css("border-right-color",t.tips[1])},function(){s.tipLeft=s.left-o[0]-10,s.tipTop=s.top,f.removeClass("layui-layer-TipsR").addClass("layui-layer-TipsL").css("border-bottom-color",t.tips[1])}],s.where[c-1](),1===c?s.top-(n.scrollTop()+o[1]+16)<0&&s.where[2]():2===c?n.width()-(s.left+s.width+o[0]+16)>0||s.where[3]():3===c?s.top-n.scrollTop()+s.height+o[1]+16-n.height()>0&&s.where[0]():4===c&&o[0]+16-s.left>0&&s.where[1](),a.find("."+l[5]).css({"background-color":t.tips[1],"padding-right":t.closeBtn?"30px":""}),a.css({left:s.tipLeft-(t.fixed?n.scrollLeft():0),top:s.tipTop-(t.fixed?n.scrollTop():0)})},s.pt.move=function(){var e=this,t=e.config,a=i(document),s=e.layero,l=s.find(t.move),f=s.find(".layui-layer-resize"),c={};return t.move&&l.css("cursor","move"),l.on("mousedown",function(e){e.preventDefault(),t.move&&(c.moveStart=!0,c.offset=[e.clientX-parseFloat(s.css("left")),e.clientY-parseFloat(s.css("top"))],o.moveElem.css("cursor","move").show())}),f.on("mousedown",function(e){e.preventDefault(),c.resizeStart=!0,c.offset=[e.clientX,e.clientY],c.area=[s.outerWidth(),s.outerHeight()],o.moveElem.css("cursor","se-resize").show()}),a.on("mousemove",function(i){if(c.moveStart){var a=i.clientX-c.offset[0],o=i.clientY-c.offset[1],l="fixed"===s.css("position");if(i.preventDefault(),c.stX=l?0:n.scrollLeft(),c.stY=l?0:n.scrollTop(),!t.moveOut){var f=n.width()-s.outerWidth()+c.stX,u=n.height()-s.outerHeight()+c.stY;a<c.stX&&(a=c.stX),a>f&&(a=f),o<c.stY&&(o=c.stY),o>u&&(o=u)}s.css({left:a,top:o})}if(t.resize&&c.resizeStart){var a=i.clientX-c.offset[0],o=i.clientY-c.offset[1];i.preventDefault(),r.style(e.index,{width:c.area[0]+a,height:c.area[1]+o}),c.isResize=!0,t.resizing&&t.resizing(s)}}).on("mouseup",function(e){c.moveStart&&(delete c.moveStart,o.moveElem.hide(),t.moveEnd&&t.moveEnd(s)),c.resizeStart&&(delete c.resizeStart,o.moveElem.hide())}),e},s.pt.callback=function(){function e(){var e=a.cancel&&a.cancel(t.index,n);e===!1||r.close(t.index)}var t=this,n=t.layero,a=t.config;t.openLayer(),a.success&&(2==a.type?n.find("iframe").on("load",function(){a.success(n,t.index,t)}):a.success(n,t.index,t)),6==r.ie&&t.IE6(n),n.find("."+l[6]).children("a").on("click",function(){var e=i(this).index();if(0===e)a.yes?a.yes(t.index,n):a.btn1?a.btn1(t.index,n):r.close(t.index);else{var o=a["btn"+(e+1)]&&a["btn"+(e+1)](t.index,n);o===!1||r.close(t.index)}}),n.find("."+l[7]).on("click",e),a.shadeClose&&t.shadeo.on("click",function(){r.close(t.index)}),n.find(".layui-layer-min").on("click",function(){var e=a.min&&a.min(n,t.index);e===!1||r.min(t.index,a)}),n.find(".layui-layer-max").on("click",function(){i(this).hasClass("layui-layer-maxmin")?(r.restore(t.index),a.restore&&a.restore(n,t.index)):(r.full(t.index,a),setTimeout(function(){a.full&&a.full(n,t.index)},100))}),a.end&&(o.end[t.index]=a.end)},o.reselect=function(){i.each(i("select"),function(e,t){var n=i(this);n.parents("."+l[0])[0]||1==n.attr("layer")&&i("."+l[0]).length<1&&n.removeAttr("layer").show(),n=null})},s.pt.IE6=function(e){i("select").each(function(e,t){var n=i(this);n.parents("."+l[0])[0]||"none"===n.css("display")||n.attr({layer:"1"}).hide(),n=null})},s.pt.openLayer=function(){var e=this;r.zIndex=e.config.zIndex,r.setTop=function(e){var t=function(){r.zIndex++,e.css("z-index",r.zIndex+1)};return r.zIndex=parseInt(e[0].style.zIndex),e.on("mousedown",t),r.zIndex}},o.record=function(e){var t=[e.width(),e.height(),e.position().top,e.position().left+parseFloat(e.css("margin-left"))];e.find(".layui-layer-max").addClass("layui-layer-maxmin"),e.attr({area:t})},o.rescollbar=function(e){l.html.attr("layer-full")==e&&(l.html[0].style.removeProperty?l.html[0].style.removeProperty("overflow"):l.html[0].style.removeAttribute("overflow"),l.html.removeAttr("layer-full"))},e.layer=r,r.getChildFrame=function(e,t){return t=t||i("."+l[4]).attr("times"),i("#"+l[0]+t).find("iframe").contents().find(e)},r.getFrameIndex=function(e){return i("#"+e).parents("."+l[4]).attr("times")},r.iframeAuto=function(e){if(e){var t=r.getChildFrame("html",e).outerHeight(),n=i("#"+l[0]+e),a=n.find(l[1]).outerHeight()||0,o=n.find("."+l[6]).outerHeight()||0;n.css({height:t+a+o}),n.find("iframe").css({height:t})}},r.iframeSrc=function(e,t){i("#"+l[0]+e).find("iframe").attr("src",t)},r.style=function(e,t,n){var a=i("#"+l[0]+e),r=a.find(".layui-layer-content"),s=a.attr("type"),f=a.find(l[1]).outerHeight()||0,c=a.find("."+l[6]).outerHeight()||0;a.attr("minLeft");s!==o.type[3]&&s!==o.type[4]&&(n||(parseFloat(t.width)<=260&&(t.width=260),parseFloat(t.height)-f-c<=64&&(t.height=64+f+c)),a.css(t),c=a.find("."+l[6]).outerHeight(),s===o.type[2]?a.find("iframe").css({height:parseFloat(t.height)-f-c}):r.css({height:parseFloat(t.height)-f-c-parseFloat(r.css("padding-top"))-parseFloat(r.css("padding-bottom"))}))},r.min=function(e,t){t=t||{};var a=i("#"+l[0]+e),s=i("#"+l.SHADE+e),f=a.find(l[1]).outerHeight()||0,c=a.attr("minLeft")||181*o.minIndex+"px",u=a.css("position"),d={width:180,height:f,position:"fixed",overflow:"hidden"};o.record(a),o.minLeft[0]&&(c=o.minLeft[0],o.minLeft.shift()),t.minStack&&(d.left=c,d.top=n.height()-f,a.attr("minLeft")||o.minIndex++,a.attr("minLeft",c)),a.attr("position",u),r.style(e,d,!0),a.find(".layui-layer-min").hide(),"page"===a.attr("type")&&a.find(l[4]).hide(),o.rescollbar(e),s.hide()},r.restore=function(e){var t=i("#"+l[0]+e),n=i("#"+l.SHADE+e),a=t.attr("area").split(",");t.attr("type");r.style(e,{width:parseFloat(a[0]),height:parseFloat(a[1]),top:parseFloat(a[2]),left:parseFloat(a[3]),position:t.attr("position"),overflow:"visible"},!0),t.find(".layui-layer-max").removeClass("layui-layer-maxmin"),t.find(".layui-layer-min").show(),"page"===t.attr("type")&&t.find(l[4]).show(),o.rescollbar(e),n.show()},r.full=function(e){var t,a=i("#"+l[0]+e);o.record(a),l.html.attr("layer-full")||l.html.css("overflow","hidden").attr("layer-full",e),clearTimeout(t),t=setTimeout(function(){var t="fixed"===a.css("position");r.style(e,{top:t?0:n.scrollTop(),left:t?0:n.scrollLeft(),width:n.width(),height:n.height()},!0),a.find(".layui-layer-min").hide()},100)},r.title=function(e,t){var n=i("#"+l[0]+(t||r.index)).find(l[1]);n.html(e)},r.close=function(e,t){var n=i("#"+l[0]+e),a=n.attr("type"),s="layer-anim-close";if(n[0]){var f="layui-layer-wrap",c=function(){if(a===o.type[1]&&"object"===n.attr("conType")){n.children(":not(."+l[5]+")").remove();for(var r=n.find("."+f),s=0;s<2;s++)r.unwrap();r.css("display",r.data("display")).removeClass(f)}else{if(a===o.type[2])try{var c=i("#"+l[4]+e)[0];c.contentWindow.document.write(""),c.contentWindow.close(),n.find("."+l[5])[0].removeChild(c)}catch(u){}n[0].innerHTML="",n.remove()}"function"==typeof o.end[e]&&o.end[e](),delete o.end[e],"function"==typeof t&&t()};n.data("isOutAnim")&&n.addClass("layer-anim "+s),i("#layui-layer-moves, #"+l.SHADE+e).remove(),6==r.ie&&o.reselect(),o.rescollbar(e),n.attr("minLeft")&&(o.minIndex--,o.minLeft.push(n.attr("minLeft"))),r.ie&&r.ie<10||!n.data("isOutAnim")?c():setTimeout(function(){c()},200)}},r.closeAll=function(e,t){"function"==typeof e&&(t=e,e=null);var n=i("."+l[0]);i.each(n,function(a){var o=i(this),s=e?o.attr("type")===e:1;s&&r.close(o.attr("times"),a===n.length-1?t:null),s=null}),0===n.length&&"function"==typeof t&&t()};var f=r.cache||{},c=function(e){return f.skin?" "+f.skin+" "+f.skin+"-"+e:""};r.prompt=function(e,t){var a="";if(e=e||{},"function"==typeof e&&(t=e),e.area){var o=e.area;a='style="width: '+o[0]+"; height: "+o[1]+';"',delete e.area}var s,l=2==e.formType?'<textarea class="layui-layer-input"'+a+"></textarea>":function(){return'<input type="'+(1==e.formType?"password":"text")+'" class="layui-layer-input">'}(),f=e.success;return delete e.success,r.open(i.extend({type:1,btn:["&#x786E;&#x5B9A;","&#x53D6;&#x6D88;"],content:l,skin:"layui-layer-prompt"+c("prompt"),maxWidth:n.width(),success:function(t){s=t.find(".layui-layer-input"),s.val(e.value||"").focus(),"function"==typeof f&&f(t)},resize:!1,yes:function(i){var n=s.val();""===n?s.focus():n.length>(e.maxlength||500)?r.tips("&#x6700;&#x591A;&#x8F93;&#x5165;"+(e.maxlength||500)+"&#x4E2A;&#x5B57;&#x6570;",s,{tips:1}):t&&t(n,i,s)}},e))},r.tab=function(e){e=e||{};var t=e.tab||{},n="layui-this",a=e.success;return delete e.success,r.open(i.extend({type:1,skin:"layui-layer-tab"+c("tab"),resize:!1,title:function(){var e=t.length,i=1,a="";if(e>0)for(a='<span class="'+n+'">'+t[0].title+"</span>";i<e;i++)a+="<span>"+t[i].title+"</span>";return a}(),content:'<ul class="layui-layer-tabmain">'+function(){var e=t.length,i=1,a="";if(e>0)for(a='<li class="layui-layer-tabli '+n+'">'+(t[0].content||"no content")+"</li>";i<e;i++)a+='<li class="layui-layer-tabli">'+(t[i].content||"no  content")+"</li>";return a}()+"</ul>",success:function(t){var o=t.find(".layui-layer-title").children(),r=t.find(".layui-layer-tabmain").children();o.on("mousedown",function(t){t.stopPropagation?t.stopPropagation():t.cancelBubble=!0;var a=i(this),o=a.index();a.addClass(n).siblings().removeClass(n),r.eq(o).show().siblings().hide(),"function"==typeof e.change&&e.change(o)}),"function"==typeof a&&a(t)}},e))},r.photos=function(t,n,a){function o(e,t,i){var n=new Image;return n.src=e,n.complete?t(n):(n.onload=function(){n.onload=null,t(n)},void(n.onerror=function(e){n.onerror=null,i(e)}))}var s={};if(t=t||{},t.photos){var l=!("string"==typeof t.photos||t.photos instanceof i),f=l?t.photos:{},u=f.data||[],d=f.start||0;s.imgIndex=(0|d)+1,t.img=t.img||"img";var y=t.success;if(delete t.success,l){if(0===u.length)return r.msg("&#x6CA1;&#x6709;&#x56FE;&#x7247;")}else{var p=i(t.photos),h=function(){u=[],p.find(t.img).each(function(e){var t=i(this);t.attr("layer-index",e),u.push({alt:t.attr("alt"),pid:t.attr("layer-pid"),src:t.attr("layer-src")||t.attr("src"),thumb:t.attr("src")})})};if(h(),0===u.length)return;if(n||p.on("click",t.img,function(){h();var e=i(this),n=e.attr("layer-index");r.photos(i.extend(t,{photos:{start:n,data:u,tab:t.tab},full:t.full}),!0)}),!n)return}s.imgprev=function(e){s.imgIndex--,s.imgIndex<1&&(s.imgIndex=u.length),s.tabimg(e)},s.imgnext=function(e,t){s.imgIndex++,s.imgIndex>u.length&&(s.imgIndex=1,t)||s.tabimg(e)},s.keyup=function(e){if(!s.end){var t=e.keyCode;e.preventDefault(),37===t?s.imgprev(!0):39===t?s.imgnext(!0):27===t&&r.close(s.index)}},s.tabimg=function(e){if(!(u.length<=1))return f.start=s.imgIndex-1,r.close(s.index),r.photos(t,!0,e)},s.event=function(){s.bigimg.find(".layui-layer-imgprev").on("click",function(e){e.preventDefault(),s.imgprev(!0)}),s.bigimg.find(".layui-layer-imgnext").on("click",function(e){e.preventDefault(),s.imgnext(!0)}),i(document).on("keyup",s.keyup)},s.loadi=r.load(1,{shade:!("shade"in t)&&.9,scrollbar:!1}),o(u[d].src,function(n){r.close(s.loadi),a&&(t.anim=-1),s.index=r.open(i.extend({type:1,id:"layui-layer-photos",area:function(){var a=[n.width,n.height],o=[i(e).width()-100,i(e).height()-100];if(!t.full&&(a[0]>o[0]||a[1]>o[1])){var r=[a[0]/o[0],a[1]/o[1]];r[0]>r[1]?(a[0]=a[0]/r[0],a[1]=a[1]/r[0]):r[0]<r[1]&&(a[0]=a[0]/r[1],a[1]=a[1]/r[1])}return[a[0]+"px",a[1]+"px"]}(),title:!1,shade:.9,shadeClose:!0,closeBtn:!1,move:".layui-layer-phimg img",moveType:1,scrollbar:!1,moveOut:!0,anim:5,isOutAnim:!1,skin:"layui-layer-photos"+c("photos"),content:'<div class="layui-layer-phimg"><img src="'+u[d].src+'" alt="'+(u[d].alt||"")+'" layer-pid="'+u[d].pid+'">'+function(){return u.length>1?'<div class="layui-layer-imgsee"><span class="layui-layer-imguide"><a href="javascript:;" class="layui-layer-iconext layui-layer-imgprev"></a><a href="javascript:;" class="layui-layer-iconext layui-layer-imgnext"></a></span><div class="layui-layer-imgbar" style="display:'+(a?"block":"")+'"><span class="layui-layer-imgtit"><a href="javascript:;">'+(u[d].alt||"")+"</a><em>"+s.imgIndex+" / "+u.length+"</em></span></div></div>":""}()+"</div>",success:function(e,i){s.bigimg=e.find(".layui-layer-phimg"),s.imgsee=e.find(".layui-layer-imgbar"),s.event(e),t.tab&&t.tab(u[d],e),"function"==typeof y&&y(e)},end:function(){s.end=!0,i(document).off("keyup",s.keyup)}},t))},function(){r.close(s.loadi),r.msg("&#x5F53;&#x524D;&#x56FE;&#x7247;&#x5730;&#x5740;&#x5F02;&#x5E38;<br>&#x662F;&#x5426;&#x7EE7;&#x7EED;&#x67E5;&#x770B;&#x4E0B;&#x4E00;&#x5F20;&#xFF1F;",{time:3e4,btn:["&#x4E0B;&#x4E00;&#x5F20;","&#x4E0D;&#x770B;&#x4E86;"],yes:function(){u.length>1&&s.imgnext(!0,!0)}})})}},o.run=function(t){i=t,n=i(e),l.html=i("html"),r.open=function(e){var t=new s(e);return t.index}},e.layui&&layui.define?(r.ready(),layui.define("jquery",function(t){r.path=layui.cache.dir,o.run(layui.$),e.layer=r,t("layer",r)})):"function"==typeof define&&define.amd?define(["jquery"],function(){return o.run(e.jQuery),r}):function(){r.ready(),o.run(e.jQuery)}()}(window);layui.define("jquery",function(e){"use strict";var t=layui.$,i=layui.hint(),n={fixbar:function(e){var i,n,r="layui-fixbar",a="layui-fixbar-top",o=t(document),l=t("body");e=t.extend({showHeight:200},e),e.bar1=e.bar1===!0?"&#xe606;":e.bar1,e.bar2=e.bar2===!0?"&#xe607;":e.bar2,e.bgcolor=e.bgcolor?"background-color:"+e.bgcolor:"";var c=[e.bar1,e.bar2,"&#xe604;"],g=t(['<ul class="'+r+'">',e.bar1?'<li class="layui-icon" lay-type="bar1" style="'+e.bgcolor+'">'+c[0]+"</li>":"",e.bar2?'<li class="layui-icon" lay-type="bar2" style="'+e.bgcolor+'">'+c[1]+"</li>":"",'<li class="layui-icon '+a+'" lay-type="top" style="'+e.bgcolor+'">'+c[2]+"</li>","</ul>"].join("")),u=g.find("."+a),s=function(){var t=o.scrollTop();t>=e.showHeight?i||(u.show(),i=1):i&&(u.hide(),i=0)};t("."+r)[0]||("object"==typeof e.css&&g.css(e.css),l.append(g),s(),g.find("li").on("click",function(){var i=t(this),n=i.attr("lay-type");"top"===n&&t("html,body").animate({scrollTop:0},200),e.click&&e.click.call(this,n)}),o.on("scroll",function(){clearTimeout(n),n=setTimeout(function(){s()},100)}))},countdown:function(e,t,i){var n=this,r="function"==typeof t,a=new Date(e).getTime(),o=new Date(!t||r?(new Date).getTime():t).getTime(),l=a-o,c=[Math.floor(l/864e5),Math.floor(l/36e5)%24,Math.floor(l/6e4)%60,Math.floor(l/1e3)%60];r&&(i=t);var g=setTimeout(function(){n.countdown(e,o+1e3,i)},1e3);return i&&i(l>0?c:[0,0,0,0],t,g),l<=0&&clearTimeout(g),g},timeAgo:function(e,t){var i=this,n=[[],[]],r=(new Date).getTime()-new Date(e).getTime();return r>26784e5?(r=new Date(e),n[0][0]=i.digit(r.getFullYear(),4),n[0][1]=i.digit(r.getMonth()+1),n[0][2]=i.digit(r.getDate()),t||(n[1][0]=i.digit(r.getHours()),n[1][1]=i.digit(r.getMinutes()),n[1][2]=i.digit(r.getSeconds())),n[0].join("-")+" "+n[1].join(":")):r>=864e5?(r/1e3/60/60/24|0)+"\u5929\u524d":r>=36e5?(r/1e3/60/60|0)+"\u5c0f\u65f6\u524d":r>=18e4?(r/1e3/60|0)+"\u5206\u949f\u524d":r<0?"\u672a\u6765":"\u521a\u521a"},digit:function(e,t){var i="";e=String(e),t=t||2;for(var n=e.length;n<t;n++)i+="0";return e<Math.pow(10,t)?i+(0|e):e},toDateString:function(e,t){if(null===e||""===e)return"";var n=this,r=new Date(function(){if(e)return isNaN(e)?e:"string"==typeof e?parseInt(e):e}()||new Date),a=[n.digit(r.getFullYear(),4),n.digit(r.getMonth()+1),n.digit(r.getDate())],o=[n.digit(r.getHours()),n.digit(r.getMinutes()),n.digit(r.getSeconds())];return r.getDate()?(t=t||"yyyy-MM-dd HH:mm:ss",t.replace(/yyyy/g,a[0]).replace(/MM/g,a[1]).replace(/dd/g,a[2]).replace(/HH/g,o[0]).replace(/mm/g,o[1]).replace(/ss/g,o[2])):(i.error('Invalid Msec for "util.toDateString(Msec)"'),"")},escape:function(e){return String(e||"").replace(/&(?!#?[a-zA-Z0-9]+;)/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/'/g,"&#39;").replace(/"/g,"&quot;")},unescape:function(e){return String(e||"").replace(/\&amp;/g,"&").replace(/\&lt;/g,"<").replace(/\&gt;/g,">").replace(/\&#39;/,"'").replace(/\&quot;/,'"')},toVisibleArea:function(e){if(e=t.extend({margin:160,duration:200,type:"y"},e),e.scrollElem[0]&&e.thisElem[0]){var i=e.scrollElem,n=e.thisElem,r="y"===e.type,a=r?"scrollTop":"scrollLeft",o=r?"top":"left",l=i[a](),c=i[r?"height":"width"](),g=i.offset()[o],u=n.offset()[o]-g,s={};(u>c-e.margin||u<e.margin)&&(s[a]=u-c/2+l,i.animate(s,e.duration))}},event:function(e,i,r){var a=t("body");return r=r||"click",i=n.event[e]=t.extend(!0,n.event[e],i)||{},n.event.UTIL_EVENT_CALLBACK=n.event.UTIL_EVENT_CALLBACK||{},a.off(r,"*["+e+"]",n.event.UTIL_EVENT_CALLBACK[e]),n.event.UTIL_EVENT_CALLBACK[e]=function(){var n=t(this),r=n.attr(e);"function"==typeof i[r]&&i[r].call(this,n)},a.on(r,"*["+e+"]",n.event.UTIL_EVENT_CALLBACK[e]),i}};e("util",n)});layui.define("jquery",function(t){"use strict";var i=layui.$,a=(layui.hint(),layui.device()),e="element",l="layui-this",n="layui-show",s=function(){this.config={}};s.prototype.set=function(t){var a=this;return i.extend(!0,a.config,t),a},s.prototype.on=function(t,i){return layui.onevent.call(this,e,t,i)},s.prototype.tabAdd=function(t,a){var e=".layui-tab-title",l=i(".layui-tab[lay-filter="+t+"]"),n=l.children(e),s=n.children(".layui-tab-bar"),o=l.children(".layui-tab-content"),r="<li"+function(){var t=[];return layui.each(a,function(i,a){/^(title|content)$/.test(i)||t.push("lay-"+i+'="'+a+'"')}),t.length>0&&t.unshift(""),t.join(" ")}()+">"+(a.title||"unnaming")+"</li>";return s[0]?s.before(r):n.append(r),o.append('<div class="layui-tab-item">'+(a.content||"")+"</div>"),b.hideTabMore(!0),b.tabAuto(),this},s.prototype.tabDelete=function(t,a){var e=".layui-tab-title",l=i(".layui-tab[lay-filter="+t+"]"),n=l.children(e),s=n.find('>li[lay-id="'+a+'"]');return b.tabDelete(null,s),this},s.prototype.tabChange=function(t,a){var e=".layui-tab-title",l=i(".layui-tab[lay-filter="+t+"]"),n=l.children(e),s=n.find('>li[lay-id="'+a+'"]');return b.tabClick.call(s[0],null,null,s),this},s.prototype.tab=function(t){t=t||{},m.on("click",t.headerElem,function(a){var e=i(this).index();b.tabClick.call(this,a,e,null,t)})},s.prototype.progress=function(t,a){var e="layui-progress",l=i("."+e+"[lay-filter="+t+"]"),n=l.find("."+e+"-bar"),s=n.find("."+e+"-text");return n.css("width",a).attr("lay-percent",a),s.text(a),this};var o=".layui-nav",r="layui-nav-item",c="layui-nav-bar",u="layui-nav-tree",y="layui-nav-child",d="layui-nav-child-c",f="layui-nav-more",h="layui-icon-down",p="layui-anim layui-anim-upbit",b={tabClick:function(t,a,s,o){o=o||{};var r=s||i(this),a=a||r.parent().children("li").index(r),c=o.headerElem?r.parent():r.parents(".layui-tab").eq(0),u=o.bodyElem?i(o.bodyElem):c.children(".layui-tab-content").children(".layui-tab-item"),y=r.find("a"),d="javascript:;"!==y.attr("href")&&"_blank"===y.attr("target"),f="string"==typeof r.attr("lay-unselect"),h=c.attr("lay-filter");d||f||(r.addClass(l).siblings().removeClass(l),u.eq(a).addClass(n).siblings().removeClass(n)),layui.event.call(this,e,"tab("+h+")",{elem:c,index:a})},tabDelete:function(t,a){var n=a||i(this).parent(),s=n.index(),o=n.parents(".layui-tab").eq(0),r=o.children(".layui-tab-content").children(".layui-tab-item"),c=o.attr("lay-filter");n.hasClass(l)&&(n.next()[0]?b.tabClick.call(n.next()[0],null,s+1):n.prev()[0]&&b.tabClick.call(n.prev()[0],null,s-1)),n.remove(),r.eq(s).remove(),setTimeout(function(){b.tabAuto()},50),layui.event.call(this,e,"tabDelete("+c+")",{elem:o,index:s})},tabAuto:function(){var t="layui-tab-more",e="layui-tab-bar",l="layui-tab-close",n=this;i(".layui-tab").each(function(){var s=i(this),o=s.children(".layui-tab-title"),r=(s.children(".layui-tab-content").children(".layui-tab-item"),'lay-stope="tabmore"'),c=i('<span class="layui-unselect layui-tab-bar" '+r+"><i "+r+' class="layui-icon">&#xe61a;</i></span>');if(n===window&&8!=a.ie&&b.hideTabMore(!0),s.attr("lay-allowClose")&&o.find("li").each(function(){var t=i(this);if(!t.find("."+l)[0]){var a=i('<i class="layui-icon layui-icon-close layui-unselect '+l+'"></i>');a.on("click",b.tabDelete),t.append(a)}}),"string"!=typeof s.attr("lay-unauto"))if(o.prop("scrollWidth")>o.outerWidth()+1){if(o.find("."+e)[0])return;o.append(c),s.attr("overflow",""),c.on("click",function(i){o[this.title?"removeClass":"addClass"](t),this.title=this.title?"":"\u6536\u7f29"})}else o.find("."+e).remove(),s.removeAttr("overflow")})},hideTabMore:function(t){var a=i(".layui-tab-title");t!==!0&&"tabmore"===i(t.target).attr("lay-stope")||(a.removeClass("layui-tab-more"),a.find(".layui-tab-bar").attr("title",""))},clickThis:function(){var t=i(this),a=t.parents(o),n=a.attr("lay-filter"),s=t.parent(),c=t.siblings("."+y),d="string"==typeof s.attr("lay-unselect");"javascript:;"!==t.attr("href")&&"_blank"===t.attr("target")||d||c[0]||(a.find("."+l).removeClass(l),s.addClass(l)),a.hasClass(u)&&(c.removeClass(p),c[0]&&(s["none"===c.css("display")?"addClass":"removeClass"](r+"ed"),"all"===a.attr("lay-shrink")&&s.siblings().removeClass(r+"ed"))),layui.event.call(this,e,"nav("+n+")",t)},collapse:function(){var t=i(this),a=t.find(".layui-colla-icon"),l=t.siblings(".layui-colla-content"),s=t.parents(".layui-collapse").eq(0),o=s.attr("lay-filter"),r="none"===l.css("display");if("string"==typeof s.attr("lay-accordion")){var c=s.children(".layui-colla-item").children("."+n);c.siblings(".layui-colla-title").children(".layui-colla-icon").html("&#xe602;"),c.removeClass(n)}l[r?"addClass":"removeClass"](n),a.html(r?"&#xe61a;":"&#xe602;"),layui.event.call(this,e,"collapse("+o+")",{title:t,content:l,show:r})}};s.prototype.init=function(t,e){var l=function(){return e?'[lay-filter="'+e+'"]':""}(),s={tab:function(){b.tabAuto.call({})},nav:function(){var t=200,e={},s={},v={},m="layui-nav-title",C=function(l,o,r){var c=i(this),h=c.find("."+y);if(o.hasClass(u)){if(!h[0]){var b=c.children("."+m);l.css({top:c.offset().top-o.offset().top,height:(b[0]?b:c).outerHeight(),opacity:1})}}else h.addClass(p),h.hasClass(d)&&h.css({left:-(h.outerWidth()-c.width())/2}),h[0]?l.css({left:l.position().left+l.width()/2,width:0,opacity:0}):l.css({left:c.position().left+parseFloat(c.css("marginLeft")),top:c.position().top+c.height()-l.height()}),e[r]=setTimeout(function(){l.css({width:h[0]?0:c.width(),opacity:h[0]?0:1})},a.ie&&a.ie<10?0:t),clearTimeout(v[r]),"block"===h.css("display")&&clearTimeout(s[r]),s[r]=setTimeout(function(){h.addClass(n),c.find("."+f).addClass(f+"d")},300)};i(o+l).each(function(a){var l=i(this),o=i('<span class="'+c+'"></span>'),d=l.find("."+r);l.find("."+c)[0]||(l.append(o),(l.hasClass(u)?d.find("dd,>."+m):d).on("mouseenter",function(){C.call(this,o,l,a)}).on("mouseleave",function(){l.hasClass(u)?o.css({height:0,opacity:0}):(clearTimeout(s[a]),s[a]=setTimeout(function(){l.find("."+y).removeClass(n),l.find("."+f).removeClass(f+"d")},300))}),l.on("mouseleave",function(){clearTimeout(e[a]),v[a]=setTimeout(function(){l.hasClass(u)||o.css({width:0,left:o.position().left+o.width()/2,opacity:0})},t)})),d.find("a").each(function(){var t=i(this),a=(t.parent(),t.siblings("."+y));a[0]&&!t.children("."+f)[0]&&t.append('<i class="layui-icon '+h+" "+f+'"></i>'),t.off("click",b.clickThis).on("click",b.clickThis)})})},breadcrumb:function(){var t=".layui-breadcrumb";i(t+l).each(function(){var t=i(this),a="lay-separator",e=t.attr(a)||"/",l=t.find("a");l.next("span["+a+"]")[0]||(l.each(function(t){t!==l.length-1&&i(this).after("<span "+a+">"+e+"</span>")}),t.css("visibility","visible"))})},progress:function(){var t="layui-progress";i("."+t+l).each(function(){var a=i(this),e=a.find(".layui-progress-bar"),l=e.attr("lay-percent");e.css("width",function(){return/^.+\/.+$/.test(l)?100*new Function("return "+l)()+"%":l}()),a.attr("lay-showPercent")&&setTimeout(function(){e.html('<span class="'+t+'-text">'+l+"</span>")},350)})},collapse:function(){var t="layui-collapse";i("."+t+l).each(function(){var t=i(this).find(".layui-colla-item");t.each(function(){var t=i(this),a=t.find(".layui-colla-title"),e=t.find(".layui-colla-content"),l="none"===e.css("display");a.find(".layui-colla-icon").remove(),a.append('<i class="layui-icon layui-colla-icon">'+(l?"&#xe602;":"&#xe61a;")+"</i>"),a.off("click",b.collapse).on("click",b.collapse)})})}};return s[t]?s[t]():layui.each(s,function(t,i){i()})},s.prototype.render=s.prototype.init;var v=new s,m=i(document);i(function(){v.render()});var C=".layui-tab-title li";m.on("click",C,b.tabClick),m.on("click",b.hideTabMore),i(window).on("resize",b.tabAuto),t(e,v)});layui.define("layer",function(e){"use strict";var t=layui.$,i=layui.layer,n=layui.hint(),o=layui.device(),a={config:{},set:function(e){var i=this;return i.config=t.extend({},i.config,e),i},on:function(e,t){return layui.onevent.call(this,r,e,t)}},l=function(){var e=this;return{upload:function(t){e.upload.call(e,t)},reload:function(t){e.reload.call(e,t)},config:e.config}},r="upload",u="layui-upload-file",c="layui-upload-form",f="layui-upload-iframe",s="layui-upload-choose",p=function(e){var i=this;i.config=t.extend({},i.config,a.config,e),i.render()};p.prototype.config={accept:"images",exts:"",auto:!0,bindAction:"",url:"",field:"file",acceptMime:"",method:"post",data:{},drag:!0,size:0,number:0,multiple:!1},p.prototype.render=function(e){var i=this,e=i.config;e.elem=t(e.elem),e.bindAction=t(e.bindAction),i.file(),i.events()},p.prototype.file=function(){var e=this,i=e.config,n=e.elemFile=t(['<input class="'+u+'" type="file" accept="'+i.acceptMime+'" name="'+i.field+'"',i.multiple?" multiple":"",">"].join("")),a=i.elem.next();(a.hasClass(u)||a.hasClass(c))&&a.remove(),o.ie&&o.ie<10&&i.elem.wrap('<div class="layui-upload-wrap"></div>'),e.isFile()?(e.elemFile=i.elem,i.field=i.elem[0].name):i.elem.after(n),o.ie&&o.ie<10&&e.initIE()},p.prototype.initIE=function(){var e=this,i=e.config,n=t('<iframe id="'+f+'" class="'+f+'" name="'+f+'" frameborder="0"></iframe>'),o=t(['<form target="'+f+'" class="'+c+'" method="post" key="set-mine" enctype="multipart/form-data" action="'+i.url+'">',"</form>"].join(""));t("#"+f)[0]||t("body").append(n),i.elem.next().hasClass(c)||(e.elemFile.wrap(o),i.elem.next("."+c).append(function(){var e=[];return layui.each(i.data,function(t,i){i="function"==typeof i?i():i,e.push('<input type="hidden" name="'+t+'" value="'+i+'">')}),e.join("")}()))},p.prototype.msg=function(e){return i.msg(e,{icon:2,shift:6})},p.prototype.isFile=function(){var e=this.config.elem[0];if(e)return"input"===e.tagName.toLocaleLowerCase()&&"file"===e.type},p.prototype.preview=function(e){var t=this;window.FileReader&&layui.each(t.chooseFiles,function(t,i){var n=new FileReader;n.readAsDataURL(i),n.onload=function(){e&&e(t,i,this.result)}})},p.prototype.upload=function(e,i){var n,a=this,l=a.config,r=a.elemFile[0],u=function(){var i=0,n=0,o=e||a.files||a.chooseFiles||r.files,u=function(){l.multiple&&i+n===a.fileLength&&"function"==typeof l.allDone&&l.allDone({total:a.fileLength,successful:i,aborted:n})};layui.each(o,function(e,o){var r=new FormData;layui.each(l.data,function(e,t){t="function"==typeof t?t():t,r.append(e,t)}),r.append(l.field,o);var c={url:l.url,type:"post",data:r,contentType:!1,processData:!1,dataType:"json",headers:l.headers||{},success:function(t){i++,d(e,t),u()},error:function(){n++,a.msg("\u8bf7\u6c42\u4e0a\u4f20\u63a5\u53e3\u51fa\u73b0\u5f02\u5e38"),m(e),u()}};"function"==typeof l.progress&&(c.xhr=function(){var i=t.ajaxSettings.xhr();return i.upload.addEventListener("progress",function(t){if(t.lengthComputable){var i=Math.floor(t.loaded/t.total*100);l.progress(i,l.item?l.item[0]:l.elem[0],t,e)}}),i}),t.ajax(c)})},c=function(){var e=t("#"+f);a.elemFile.parent().submit(),clearInterval(p.timer),p.timer=setInterval(function(){var t,i=e.contents().find("body");try{t=i.text()}catch(n){a.msg("\u83b7\u53d6\u4e0a\u4f20\u540e\u7684\u54cd\u5e94\u4fe1\u606f\u51fa\u73b0\u5f02\u5e38"),clearInterval(p.timer),m()}t&&(clearInterval(p.timer),i.html(""),d(0,t))},30)},d=function(e,t){if(a.elemFile.next("."+s).remove(),r.value="","object"!=typeof t)try{t=JSON.parse(t)}catch(i){return t={},a.msg("\u8bf7\u5bf9\u4e0a\u4f20\u63a5\u53e3\u8fd4\u56de\u6709\u6548JSON")}"function"==typeof l.done&&l.done(t,e||0,function(e){a.upload(e)})},m=function(e){l.auto&&(r.value=""),"function"==typeof l.error&&l.error(e||0,function(e){a.upload(e)})},h=l.exts,v=function(){var t=[];return layui.each(e||a.chooseFiles,function(e,i){t.push(i.name)}),t}(),g={preview:function(e){a.preview(e)},upload:function(e,t){var i={};i[e]=t,a.upload(i)},pushFile:function(){return a.files=a.files||{},layui.each(a.chooseFiles,function(e,t){a.files[e]=t}),a.files},resetFile:function(e,t,i){var n=new File([t],i);a.files=a.files||{},a.files[e]=n}},y=function(){if(!(("choose"===i||l.auto)&&(l.choose&&l.choose(g),"choose"===i)||l.before&&l.before(g)===!1))return o.ie?o.ie>9?u():c():void u()};if(v=0===v.length?r.value.match(/[^\/\\]+\..+/g)||[]||"":v,0!==v.length){switch(l.accept){case"file":if(h&&!RegExp("\\w\\.("+h+")$","i").test(escape(v)))return a.msg("\u9009\u62e9\u7684\u6587\u4ef6\u4e2d\u5305\u542b\u4e0d\u652f\u6301\u7684\u683c\u5f0f"),r.value="";break;case"video":if(!RegExp("\\w\\.("+(h||"avi|mp4|wma|rmvb|rm|flash|3gp|flv")+")$","i").test(escape(v)))return a.msg("\u9009\u62e9\u7684\u89c6\u9891\u4e2d\u5305\u542b\u4e0d\u652f\u6301\u7684\u683c\u5f0f"),r.value="";break;case"audio":if(!RegExp("\\w\\.("+(h||"mp3|wav|mid")+")$","i").test(escape(v)))return a.msg("\u9009\u62e9\u7684\u97f3\u9891\u4e2d\u5305\u542b\u4e0d\u652f\u6301\u7684\u683c\u5f0f"),r.value="";break;default:if(layui.each(v,function(e,t){RegExp("\\w\\.("+(h||"jpg|png|gif|bmp|jpeg$")+")","i").test(escape(t))||(n=!0)}),n)return a.msg("\u9009\u62e9\u7684\u56fe\u7247\u4e2d\u5305\u542b\u4e0d\u652f\u6301\u7684\u683c\u5f0f"),r.value=""}if(a.fileLength=function(){var t=0,i=e||a.files||a.chooseFiles||r.files;return layui.each(i,function(){t++}),t}(),l.number&&a.fileLength>l.number)return a.msg("\u540c\u65f6\u6700\u591a\u53ea\u80fd\u4e0a\u4f20\u7684\u6570\u91cf\u4e3a\uff1a"+l.number);if(l.size>0&&!(o.ie&&o.ie<10)){var F;if(layui.each(a.chooseFiles,function(e,t){if(t.size>1024*l.size){var i=l.size/1024;i=i>=1?i.toFixed(2)+"MB":l.size+"KB",r.value="",F=i}}),F)return a.msg("\u6587\u4ef6\u4e0d\u80fd\u8d85\u8fc7"+F)}y()}},p.prototype.reload=function(e){e=e||{},delete e.elem,delete e.bindAction;var i=this,e=i.config=t.extend({},i.config,a.config,e),n=e.elem.next();n.attr({name:e.name,accept:e.acceptMime,multiple:e.multiple})},p.prototype.events=function(){var e=this,i=e.config,a=function(t){e.chooseFiles={},layui.each(t,function(t,i){var n=(new Date).getTime();e.chooseFiles[n+"-"+t]=i})},l=function(t,n){var o=e.elemFile,a=(i.item?i.item:i.elem,t.length>1?t.length+"\u4e2a\u6587\u4ef6":(t[0]||{}).name||o[0].value.match(/[^\/\\]+\..+/g)||[]||"");o.next().hasClass(s)&&o.next().remove(),e.upload(null,"choose"),e.isFile()||i.choose||o.after('<span class="layui-inline '+s+'">'+a+"</span>")};i.elem.off("upload.start").on("upload.start",function(){var o=t(this),a=o.attr("lay-data");if(a)try{a=new Function("return "+a)(),e.config=t.extend({},i,a)}catch(l){n.error("Upload element property lay-data configuration item has a syntax error: "+a)}e.config.item=o,e.elemFile[0].click()}),o.ie&&o.ie<10||i.elem.off("upload.over").on("upload.over",function(){var e=t(this);e.attr("lay-over","")}).off("upload.leave").on("upload.leave",function(){var e=t(this);e.removeAttr("lay-over")}).off("upload.drop").on("upload.drop",function(n,o){var r=t(this),u=o.originalEvent.dataTransfer.files||[];r.removeAttr("lay-over"),a(u),i.auto?e.upload(u):l(u)}),e.elemFile.off("upload.change").on("upload.change",function(){var t=this.files||[];a(t),i.auto?e.upload():l(t)}),i.bindAction.off("upload.action").on("upload.action",function(){e.upload()}),i.elem.data("haveEvents")||(e.elemFile.on("change",function(){t(this).trigger("upload.change")}),i.elem.on("click",function(){e.isFile()||t(this).trigger("upload.start")}),i.drag&&i.elem.on("dragover",function(e){e.preventDefault(),t(this).trigger("upload.over")}).on("dragleave",function(e){t(this).trigger("upload.leave")}).on("drop",function(e){e.preventDefault(),t(this).trigger("upload.drop",e)}),i.bindAction.on("click",function(){t(this).trigger("upload.action")}),i.elem.data("haveEvents",!0))},a.render=function(e){var t=new p(e);return l.call(t)},e(r,a)});layui.define(["jquery","laytpl","lay"],function(e){"use strict";var i=layui.$,n=layui.laytpl,t=layui.hint(),a=layui.device(),l=a.mobile?"click":"mousedown",r="dropdown",o="layui_"+r+"_index",u={config:{},index:layui[r]?layui[r].index+1e4:0,set:function(e){var n=this;return n.config=i.extend({},n.config,e),n},on:function(e,i){return layui.onevent.call(this,r,e,i)}},d=function(){var e=this,i=e.config,n=i.id;return d.that[n]=e,{config:i,reload:function(i){e.reload.call(e,i)}}},s="layui-dropdown",m="layui-menu-item-up",c="layui-menu-item-down",p="layui-menu-body-title",y="layui-menu-item-group",f="layui-menu-item-parent",v="layui-menu-item-divider",g="layui-menu-item-checked",h="layui-menu-item-checked2",w="layui-menu-body-panel",C="layui-menu-body-panel-left",V="."+y+">."+p,k=function(e){var n=this;n.index=++u.index,n.config=i.extend({},n.config,u.config,e),n.init()};k.prototype.config={trigger:"click",content:"",className:"",style:"",show:!1,isAllowSpread:!0,isSpreadItem:!0,data:[],delay:300},k.prototype.reload=function(e){var n=this;n.config=i.extend({},n.config,e),n.init(!0)},k.prototype.init=function(e){var n=this,t=n.config,a=t.elem=i(t.elem);if(a.length>1)return layui.each(a,function(){u.render(i.extend({},t,{elem:this}))}),n;if(!e&&a[0]&&a.data(o)){var l=d.getThis(a.data(o));if(!l)return;return l.reload(t)}t.id="id"in t?t.id:n.index,t.show&&n.render(e),n.events()},k.prototype.render=function(e){var t=this,a=t.config,r=i("body"),s=function(){var e=i('<ul class="layui-menu layui-dropdown-menu"></ul>');return a.data.length>0?m(e,a.data):e.html('<li class="layui-menu-item-none">no menu</li>'),e},m=function(e,t){return layui.each(t,function(t,l){var r=l.child&&l.child.length>0,o="isSpreadItem"in l?l.isSpreadItem:a.isSpreadItem,u=l.templet?n(l.templet).render(l):a.templet?n(a.templet).render(l):l.title,d=function(){return r&&(l.type=l.type||"parent"),l.type?{group:"group",parent:"parent","-":"-"}[l.type]||"parent":""}();if("-"===d||l.title||l.id||r){var s=i(["<li"+function(){var e={group:"layui-menu-item-group"+(a.isAllowSpread?o?" layui-menu-item-down":" layui-menu-item-up":""),parent:f,"-":"layui-menu-item-divider"};return r||d?' class="'+e[d]+'"':""}()+">",function(){var e="href"in l?'<a href="'+l.href+'" target="'+(l.target||"_self")+'">'+u+"</a>":u;return r?'<div class="'+p+'">'+e+function(){return"parent"===d?'<i class="layui-icon layui-icon-right"></i>':"group"===d&&a.isAllowSpread?'<i class="layui-icon layui-icon-'+(o?"up":"down")+'"></i>':""}()+"</div>":'<div class="'+p+'">'+e+"</div>"}(),"</li>"].join(""));if(s.data("item",l),r){var c=i('<div class="layui-panel layui-menu-body-panel"></div>'),y=i("<ul></ul>");"parent"===d?(c.append(m(y,l.child)),s.append(c)):s.append(m(y,l.child))}e.append(s)}}),e},c=['<div class="layui-dropdown layui-border-box layui-panel layui-anim layui-anim-downbit">',"</div>"].join("");("contextmenu"===a.trigger||lay.isTopElem(a.elem[0]))&&(e=!0),!e&&a.elem.data(o+"_opened")||(t.elemView=i(c),t.elemView.append(a.content||s()),a.className&&t.elemView.addClass(a.className),a.style&&t.elemView.attr("style",a.style),u.thisId=a.id,t.remove(),r.append(t.elemView),a.elem.data(o+"_opened",!0),t.position(),d.prevElem=t.elemView,d.prevElem.data("prevElem",a.elem),t.elemView.find(".layui-menu").on(l,function(e){layui.stope(e)}),t.elemView.find(".layui-menu li").on("click",function(e){var n=i(this),l=n.data("item")||{},r=l.child&&l.child.length>0;r||"-"===l.type||(t.remove(),"function"==typeof a.click&&a.click(l,n))}),t.elemView.find(V).on("click",function(e){var n=i(this),t=n.parent(),l=t.data("item")||{};"group"===l.type&&a.isAllowSpread&&d.spread(t)}),"mouseenter"===a.trigger&&t.elemView.on("mouseenter",function(){clearTimeout(d.timer)}).on("mouseleave",function(){t.delayRemove()}))},k.prototype.position=function(e){var i=this,n=i.config;lay.position(n.elem[0],i.elemView[0],{position:n.position,e:i.e,clickType:"contextmenu"===n.trigger?"right":null,align:n.align||null})},k.prototype.remove=function(){var e=this,i=(e.config,d.prevElem);i&&(i.data("prevElem")&&i.data("prevElem").data(o+"_opened",!1),i.remove())},k.prototype.delayRemove=function(){var e=this,i=e.config;clearTimeout(d.timer),d.timer=setTimeout(function(){e.remove()},i.delay)},k.prototype.events=function(){var e=this,i=e.config;"hover"===i.trigger&&(i.trigger="mouseenter"),e.prevElem&&e.prevElem.off(i.trigger,e.prevElemCallback),e.prevElem=i.elem,e.prevElemCallback=function(n){clearTimeout(d.timer),e.e=n,e.render(),n.preventDefault(),"function"==typeof i.ready&&i.ready(e.elemView,i.elem,e.e.target)},i.elem.on(i.trigger,e.prevElemCallback),"mouseenter"===i.trigger&&i.elem.on("mouseleave",function(){e.delayRemove()})},d.that={},d.getThis=function(e){var i=d.that[e];return i||t.error(e?r+" instance with ID '"+e+"' not found":"ID argument required"),i},d.spread=function(e){var i=e.children("."+p).find(".layui-icon");e.hasClass(m)?(e.removeClass(m).addClass(c),i.removeClass("layui-icon-down").addClass("layui-icon-up")):(e.removeClass(c).addClass(m),i.removeClass("layui-icon-up").addClass("layui-icon-down"))},!function(){var e=i(window),n=i(document);e.on("resize",function(){if(u.thisId){var e=d.getThis(u.thisId);if(e){if(!e.elemView[0]||!i("."+s)[0])return!1;var n=e.config;"contextmenu"===n.trigger?e.remove():e.position()}}}),n.on(l,function(e){if(u.thisId){var i=d.getThis(u.thisId);if(i){var n=i.config;!lay.isTopElem(n.elem[0])&&"contextmenu"!==n.trigger&&(e.target===n.elem[0]||n.elem.find(e.target)[0]||e.target===i.elemView[0]||i.elemView&&i.elemView.find(e.target)[0])||i.remove()}}});var t=".layui-menu:not(.layui-dropdown-menu) li";n.on("click",t,function(e){var n=i(this),t=n.parents(".layui-menu").eq(0),a=n.hasClass(y)||n.hasClass(f),l=t.attr("lay-filter")||t.attr("id"),o=lay.options(this);n.hasClass(v)||a||(t.find("."+g).removeClass(g),t.find("."+h).removeClass(h),n.addClass(g),n.parents("."+f).addClass(h),layui.event.call(this,r,"click("+l+")",o))}),n.on("click",t+V,function(e){var n=i(this),t=n.parents("."+y+":eq(0)"),a=lay.options(t[0]);"isAllowSpread"in a&&!a.isAllowSpread||d.spread(t)});var a=".layui-menu ."+f;n.on("mouseenter",a,function(n){var t=i(this),a=t.find("."+w);if(a[0]){var l=a[0].getBoundingClientRect();l.right>e.width()&&(a.addClass(C),l=a[0].getBoundingClientRect(),l.left<0&&a.removeClass(C)),l.bottom>e.height()&&a.eq(0).css("margin-top",-(l.bottom-e.height()))}}).on("mouseleave",a,function(e){var n=i(this),t=n.children("."+w);t.removeClass(C),t.css("margin-top",0)})}(),u.reload=function(e,i){var n=d.getThis(e);return n?(n.reload(i),d.call(n)):this},u.render=function(e){var i=new k(e);return d.call(i)},e(r,u)});layui.define("jquery",function(e){"use strict";var i=layui.jquery,t={config:{},index:layui.slider?layui.slider.index+1e4:0,set:function(e){var t=this;return t.config=i.extend({},t.config,e),t},on:function(e,i){return layui.onevent.call(this,n,e,i)}},a=function(){var e=this,i=e.config;return{setValue:function(t,a){return i.value=t,e.slide("set",t,a||0)},config:i}},n="slider",l="layui-disabled",s="layui-slider",r="layui-slider-bar",o="layui-slider-wrap",u="layui-slider-wrap-btn",d="layui-slider-tips",v="layui-slider-input",c="layui-slider-input-txt",p="layui-slider-input-btn",m="layui-slider-hover",f=function(e){var a=this;a.index=++t.index,a.config=i.extend({},a.config,t.config,e),a.render()};f.prototype.config={type:"default",min:0,max:100,value:0,step:1,showstep:!1,tips:!0,input:!1,range:!1,height:200,disabled:!1,theme:"#009688"},f.prototype.render=function(){var e=this,t=e.config;if(t.step<1&&(t.step=1),t.max<t.min&&(t.max=t.min+t.step),t.range){t.value="object"==typeof t.value?t.value:[t.min,t.value];var a=Math.min(t.value[0],t.value[1]),n=Math.max(t.value[0],t.value[1]);t.value[0]=a>t.min?a:t.min,t.value[1]=n>t.min?n:t.min,t.value[0]=t.value[0]>t.max?t.max:t.value[0],t.value[1]=t.value[1]>t.max?t.max:t.value[1];var r=Math.floor((t.value[0]-t.min)/(t.max-t.min)*100),v=Math.floor((t.value[1]-t.min)/(t.max-t.min)*100),p=v-r+"%";r+="%",v+="%"}else{"object"==typeof t.value&&(t.value=Math.min.apply(null,t.value)),t.value<t.min&&(t.value=t.min),t.value>t.max&&(t.value=t.max);var p=Math.floor((t.value-t.min)/(t.max-t.min)*100)+"%"}var m=t.disabled?"#c2c2c2":t.theme,f='<div class="layui-slider '+("vertical"===t.type?"layui-slider-vertical":"")+'">'+(t.tips?'<div class="layui-slider-tips"></div>':"")+'<div class="layui-slider-bar" style="background:'+m+"; "+("vertical"===t.type?"height":"width")+":"+p+";"+("vertical"===t.type?"bottom":"left")+":"+(r||0)+';"></div><div class="layui-slider-wrap" style="'+("vertical"===t.type?"bottom":"left")+":"+(r||p)+';"><div class="layui-slider-wrap-btn" style="border: 2px solid '+m+';"></div></div>'+(t.range?'<div class="layui-slider-wrap" style="'+("vertical"===t.type?"bottom":"left")+":"+v+';"><div class="layui-slider-wrap-btn" style="border: 2px solid '+m+';"></div></div>':"")+"</div>",h=i(t.elem),y=h.next("."+s);if(y[0]&&y.remove(),e.elemTemp=i(f),t.range?(e.elemTemp.find("."+o).eq(0).data("value",t.value[0]),e.elemTemp.find("."+o).eq(1).data("value",t.value[1])):e.elemTemp.find("."+o).data("value",t.value),h.html(e.elemTemp),"vertical"===t.type&&e.elemTemp.height(t.height+"px"),t.showstep){for(var g=(t.max-t.min)/t.step,b="",x=1;x<g+1;x++){var T=100*x/g;T<100&&(b+='<div class="layui-slider-step" style="'+("vertical"===t.type?"bottom":"left")+":"+T+'%"></div>')}e.elemTemp.append(b)}if(t.input&&!t.range){var w=i('<div class="layui-slider-input layui-input"><div class="layui-slider-input-txt"><input type="text" class="layui-input"></div><div class="layui-slider-input-btn"><i class="layui-icon layui-icon-up"></i><i class="layui-icon layui-icon-down"></i></div></div>');h.css("position","relative"),h.append(w),h.find("."+c).children("input").val(t.value),"vertical"===t.type?w.css({left:0,top:-48}):e.elemTemp.css("margin-right",w.outerWidth()+15)}t.disabled?(e.elemTemp.addClass(l),e.elemTemp.find("."+u).addClass(l)):e.slide(),e.elemTemp.find("."+u).on("mouseover",function(){var a="vertical"===t.type?t.height:e.elemTemp[0].offsetWidth,n=e.elemTemp.find("."+o),l="vertical"===t.type?a-i(this).parent()[0].offsetTop-n.height():i(this).parent()[0].offsetLeft,s=l/a*100,r=i(this).parent().data("value"),u=t.setTips?t.setTips(r):r;e.elemTemp.find("."+d).html(u),"vertical"===t.type?e.elemTemp.find("."+d).css({bottom:s+"%","margin-bottom":"20px",display:"inline-block"}):e.elemTemp.find("."+d).css({left:s+"%",display:"inline-block"})}).on("mouseout",function(){e.elemTemp.find("."+d).css("display","none")})},f.prototype.slide=function(e,t,a){var n=this,l=n.config,s=n.elemTemp,f=function(){return"vertical"===l.type?l.height:s[0].offsetWidth},h=s.find("."+o),y=s.next("."+v),g=y.children("."+c).children("input").val(),b=100/((l.max-l.min)/Math.ceil(l.step)),x=function(e,i){e=Math.ceil(e)*b>100?Math.ceil(e)*b:Math.round(e)*b,e=e>100?100:e,h.eq(i).css("vertical"===l.type?"bottom":"left",e+"%");var t=T(h[0].offsetLeft),a=l.range?T(h[1].offsetLeft):0;"vertical"===l.type?(s.find("."+d).css({bottom:e+"%","margin-bottom":"20px"}),t=T(f()-h[0].offsetTop-h.height()),a=l.range?T(f()-h[1].offsetTop-h.height()):0):s.find("."+d).css("left",e+"%"),t=t>100?100:t,a=a>100?100:a;var n=Math.min(t,a),o=Math.abs(t-a);"vertical"===l.type?s.find("."+r).css({height:o+"%",bottom:n+"%"}):s.find("."+r).css({width:o+"%",left:n+"%"});var u=l.min+Math.round((l.max-l.min)*e/100);if(g=u,y.children("."+c).children("input").val(g),h.eq(i).data("value",u),s.find("."+d).html(l.setTips?l.setTips(u):u),l.range){var v=[h.eq(0).data("value"),h.eq(1).data("value")];v[0]>v[1]&&v.reverse()}l.change&&l.change(l.range?v:u)},T=function(e){var i=e/f()*100/b,t=Math.round(i)*b;return e==f()&&(t=Math.ceil(i)*b),t},w=i(['<div class="layui-auxiliar-moving" id="LAY-slider-moving"></div'].join("")),M=function(e,t){var a=function(){t&&t(),w.remove()};i("#LAY-slider-moving")[0]||i("body").append(w),w.on("mousemove",e),w.on("mouseup",a).on("mouseleave",a)};if("set"===e)return x(t,a);s.find("."+u).each(function(e){var t=i(this);t.on("mousedown",function(i){i=i||window.event;var a=t.parent()[0].offsetLeft,n=i.clientX;"vertical"===l.type&&(a=f()-t.parent()[0].offsetTop-h.height(),n=i.clientY);var r=function(i){i=i||window.event;var r=a+("vertical"===l.type?n-i.clientY:i.clientX-n);r<0&&(r=0),r>f()&&(r=f());var o=r/f()*100/b;x(o,e),t.addClass(m),s.find("."+d).show(),i.preventDefault()},o=function(){t.removeClass(m),s.find("."+d).hide()};M(r,o)})}),s.on("click",function(e){var t=i("."+u);if(!t.is(event.target)&&0===t.has(event.target).length&&t.length){var a,n="vertical"===l.type?f()-e.clientY+i(this).offset().top:e.clientX-i(this).offset().left;n<0&&(n=0),n>f()&&(n=f());var s=n/f()*100/b;a=l.range?"vertical"===l.type?Math.abs(n-parseInt(i(h[0]).css("bottom")))>Math.abs(n-parseInt(i(h[1]).css("bottom")))?1:0:Math.abs(n-h[0].offsetLeft)>Math.abs(n-h[1].offsetLeft)?1:0:0,x(s,a),e.preventDefault()}}),y.children("."+p).children("i").each(function(e){i(this).on("click",function(){g=y.children("."+c).children("input").val(),g=1==e?g-l.step<l.min?l.min:Number(g)-l.step:Number(g)+l.step>l.max?l.max:Number(g)+l.step;var i=(g-l.min)/(l.max-l.min)*100/b;x(i,0)})});var q=function(){var e=this.value;e=isNaN(e)?0:e,e=e<l.min?l.min:e,e=e>l.max?l.max:e,this.value=e;var i=(e-l.min)/(l.max-l.min)*100/b;x(i,0)};y.children("."+c).children("input").on("keydown",function(e){13===e.keyCode&&(e.preventDefault(),q.call(this))}).on("change",q)},f.prototype.events=function(){var e=this;e.config},t.render=function(e){var i=new f(e);return a.call(i)},e(n,t)});layui.define(["jquery","lay"],function(e){"use strict";var i=layui.jquery,r=layui.lay,o=layui.device(),n=o.mobile?"click":"mousedown",l={config:{},index:layui.colorpicker?layui.colorpicker.index+1e4:0,set:function(e){var r=this;return r.config=i.extend({},r.config,e),r},on:function(e,i){return layui.onevent.call(this,"colorpicker",e,i)}},t=function(){var e=this,i=e.config;return{config:i}},c="colorpicker",a="layui-show",s="layui-colorpicker",f=".layui-colorpicker-main",d="layui-icon-down",u="layui-icon-close",p="layui-colorpicker-trigger-span",g="layui-colorpicker-trigger-i",v="layui-colorpicker-side",h="layui-colorpicker-side-slider",b="layui-colorpicker-basis",k="layui-colorpicker-alpha-bgcolor",y="layui-colorpicker-alpha-slider",m="layui-colorpicker-basis-cursor",x="layui-colorpicker-main-input",P=function(e){var i={h:0,s:0,b:0},r=Math.min(e.r,e.g,e.b),o=Math.max(e.r,e.g,e.b),n=o-r;return i.b=o,i.s=0!=o?255*n/o:0,0!=i.s?e.r==o?i.h=(e.g-e.b)/n:e.g==o?i.h=2+(e.b-e.r)/n:i.h=4+(e.r-e.g)/n:i.h=-1,o==r&&(i.h=0),i.h*=60,i.h<0&&(i.h+=360),i.s*=100/255,i.b*=100/255,i},C=function(e){var e=e.indexOf("#")>-1?e.substring(1):e;if(3==e.length){var i=e.split("");e=i[0]+i[0]+i[1]+i[1]+i[2]+i[2]}e=parseInt(e,16);var r={r:e>>16,g:(65280&e)>>8,b:255&e};return P(r)},B=function(e){var i={},r=e.h,o=255*e.s/100,n=255*e.b/100;if(0==o)i.r=i.g=i.b=n;else{var l=n,t=(255-o)*n/255,c=(l-t)*(r%60)/60;360==r&&(r=0),r<60?(i.r=l,i.b=t,i.g=t+c):r<120?(i.g=l,i.b=t,i.r=l-c):r<180?(i.g=l,i.r=t,i.b=t+c):r<240?(i.b=l,i.r=t,i.g=l-c):r<300?(i.b=l,i.g=t,i.r=t+c):r<360?(i.r=l,i.g=t,i.b=l-c):(i.r=0,i.g=0,i.b=0)}return{r:Math.round(i.r),g:Math.round(i.g),b:Math.round(i.b)}},w=function(e){var r=B(e),o=[r.r.toString(16),r.g.toString(16),r.b.toString(16)];return i.each(o,function(e,i){1==i.length&&(o[e]="0"+i)}),o.join("")},D=function(e){var i=/[0-9]{1,3}/g,r=e.match(i)||[];return{r:r[0],g:r[1],b:r[2]}},j=i(window),E=i(document),F=function(e){var r=this;r.index=++l.index,r.config=i.extend({},r.config,l.config,e),r.render()};F.prototype.config={color:"",size:null,alpha:!1,format:"hex",predefine:!1,colors:["#009688","#5FB878","#1E9FFF","#FF5722","#FFB800","#01AAED","#999","#c00","#ff8c00","#ffd700","#90ee90","#00ced1","#1e90ff","#c71585","rgb(0, 186, 189)","rgb(255, 120, 0)","rgb(250, 212, 0)","#393D49","rgba(0,0,0,.5)","rgba(255, 69, 0, 0.68)","rgba(144, 240, 144, 0.5)","rgba(31, 147, 255, 0.73)"]},F.prototype.render=function(){var e=this,r=e.config,o=i(['<div class="layui-unselect layui-colorpicker">',"<span "+("rgb"==r.format&&r.alpha?'class="layui-colorpicker-trigger-bgcolor"':"")+">",'<span class="layui-colorpicker-trigger-span" ','lay-type="'+("rgb"==r.format?r.alpha?"rgba":"torgb":"")+'" ','style="'+function(){var e="";return r.color?(e=r.color,(r.color.match(/[0-9]{1,3}/g)||[]).length>3&&(r.alpha&&"rgb"==r.format||(e="#"+w(P(D(r.color))))),"background: "+e):e}()+'">','<i class="layui-icon layui-colorpicker-trigger-i '+(r.color?d:u)+'"></i>',"</span>","</span>","</div>"].join("")),n=i(r.elem);r.size&&o.addClass("layui-colorpicker-"+r.size),n.addClass("layui-inline").html(e.elemColorBox=o),e.color=e.elemColorBox.find("."+p)[0].style.background,e.events()},F.prototype.renderPicker=function(){var e=this,r=e.config,o=e.elemColorBox[0],n=e.elemPicker=i(['<div id="layui-colorpicker'+e.index+'" data-index="'+e.index+'" class="layui-anim layui-anim-downbit layui-colorpicker-main">','<div class="layui-colorpicker-main-wrapper">','<div class="layui-colorpicker-basis">','<div class="layui-colorpicker-basis-white"></div>','<div class="layui-colorpicker-basis-black"></div>','<div class="layui-colorpicker-basis-cursor"></div>',"</div>",'<div class="layui-colorpicker-side">','<div class="layui-colorpicker-side-slider"></div>',"</div>","</div>",'<div class="layui-colorpicker-main-alpha '+(r.alpha?a:"")+'">','<div class="layui-colorpicker-alpha-bgcolor">','<div class="layui-colorpicker-alpha-slider"></div>',"</div>","</div>",function(){if(r.predefine){var e=['<div class="layui-colorpicker-main-pre">'];return layui.each(r.colors,function(i,r){e.push(['<div class="layui-colorpicker-pre'+((r.match(/[0-9]{1,3}/g)||[]).length>3?" layui-colorpicker-pre-isalpha":"")+'">','<div style="background:'+r+'"></div>',"</div>"].join(""))}),e.push("</div>"),e.join("")}return""}(),'<div class="layui-colorpicker-main-input">','<div class="layui-inline">','<input type="text" class="layui-input">',"</div>",'<div class="layui-btn-container">','<button class="layui-btn layui-btn-primary layui-btn-sm" colorpicker-events="clear">\u6e05\u7a7a</button>','<button class="layui-btn layui-btn-sm" colorpicker-events="confirm">\u786e\u5b9a</button>',"</div","</div>","</div>"].join(""));e.elemColorBox.find("."+p)[0];i(f)[0]&&i(f).data("index")==e.index?e.removePicker(F.thisElemInd):(e.removePicker(F.thisElemInd),i("body").append(n)),F.thisElemInd=e.index,F.thisColor=o.style.background,e.position(),e.pickerEvents()},F.prototype.removePicker=function(e){var r=this;r.config;return i("#layui-colorpicker"+(e||r.index)).remove(),r},F.prototype.position=function(){var e=this,i=e.config;return r.position(e.bindElem||e.elemColorBox[0],e.elemPicker[0],{position:i.position,align:"center"}),e},F.prototype.val=function(){var e=this,i=(e.config,e.elemColorBox.find("."+p)),r=e.elemPicker.find("."+x),o=i[0],n=o.style.backgroundColor;if(n){var l=P(D(n)),t=i.attr("lay-type");if(e.select(l.h,l.s,l.b),"torgb"===t&&r.find("input").val(n),"rgba"===t){var c=D(n);if(3==(n.match(/[0-9]{1,3}/g)||[]).length)r.find("input").val("rgba("+c.r+", "+c.g+", "+c.b+", 1)"),e.elemPicker.find("."+y).css("left",280);else{r.find("input").val(n);var a=280*n.slice(n.lastIndexOf(",")+1,n.length-1);e.elemPicker.find("."+y).css("left",a)}e.elemPicker.find("."+k)[0].style.background="linear-gradient(to right, rgba("+c.r+", "+c.g+", "+c.b+", 0), rgb("+c.r+", "+c.g+", "+c.b+"))"}}else e.select(0,100,100),r.find("input").val(""),e.elemPicker.find("."+k)[0].style.background="",e.elemPicker.find("."+y).css("left",280)},F.prototype.side=function(){var e=this,r=e.config,o=e.elemColorBox.find("."+p),n=o.attr("lay-type"),l=e.elemPicker.find("."+v),t=e.elemPicker.find("."+h),c=e.elemPicker.find("."+b),a=e.elemPicker.find("."+m),s=e.elemPicker.find("."+k),f=e.elemPicker.find("."+y),C=t[0].offsetTop/180*360,w=100-(a[0].offsetTop+3)/180*100,E=(a[0].offsetLeft+3)/260*100,F=Math.round(f[0].offsetLeft/280*100)/100,H=e.elemColorBox.find("."+g),M=e.elemPicker.find(".layui-colorpicker-pre").children("div"),Y=function(i,l,t,c){e.select(i,l,t);var a=B({h:i,s:l,b:t});if(H.addClass(d).removeClass(u),o[0].style.background="rgb("+a.r+", "+a.g+", "+a.b+")","torgb"===n&&e.elemPicker.find("."+x).find("input").val("rgb("+a.r+", "+a.g+", "+a.b+")"),"rgba"===n){var p=0;p=280*c,f.css("left",p),e.elemPicker.find("."+x).find("input").val("rgba("+a.r+", "+a.g+", "+a.b+", "+c+")"),o[0].style.background="rgba("+a.r+", "+a.g+", "+a.b+", "+c+")",s[0].style.background="linear-gradient(to right, rgba("+a.r+", "+a.g+", "+a.b+", 0), rgb("+a.r+", "+a.g+", "+a.b+"))"}r.change&&r.change(e.elemPicker.find("."+x).find("input").val())},I=i(['<div class="layui-auxiliar-moving" id="LAY-colorpicker-moving"></div>'].join("")),L=function(e){i("#LAY-colorpicker-moving")[0]||i("body").append(I),I.on("mousemove",e),I.on("mouseup",function(){I.remove()}).on("mouseleave",function(){I.remove()})};t.on("mousedown",function(e){var i=this.offsetTop,r=e.clientY,o=function(e){var o=i+(e.clientY-r),n=l[0].offsetHeight;o<0&&(o=0),o>n&&(o=n);var t=o/180*360;C=t,Y(t,E,w,F),e.preventDefault()};L(o),e.preventDefault()}),l.on("click",function(e){var r=e.clientY-i(this).offset().top;r<0&&(r=0),r>this.offsetHeight&&(r=this.offsetHeight);var o=r/180*360;C=o,Y(o,E,w,F),e.preventDefault()}),a.on("mousedown",function(e){var i=this.offsetTop,r=this.offsetLeft,o=e.clientY,n=e.clientX,l=function(e){var l=i+(e.clientY-o),t=r+(e.clientX-n),a=c[0].offsetHeight-3,s=c[0].offsetWidth-3;l<-3&&(l=-3),l>a&&(l=a),t<-3&&(t=-3),t>s&&(t=s);var f=(t+3)/260*100,d=100-(l+3)/180*100;w=d,E=f,Y(C,f,d,F),e.preventDefault()};layui.stope(e),L(l),e.preventDefault()}),c.on("mousedown",function(e){var r=e.clientY-i(this).offset().top-3+j.scrollTop(),o=e.clientX-i(this).offset().left-3+j.scrollLeft();r<-3&&(r=-3),r>this.offsetHeight-3&&(r=this.offsetHeight-3),o<-3&&(o=-3),o>this.offsetWidth-3&&(o=this.offsetWidth-3);var n=(o+3)/260*100,l=100-(r+3)/180*100;w=l,E=n,Y(C,n,l,F),layui.stope(e),e.preventDefault(),a.trigger(e,"mousedown")}),f.on("mousedown",function(e){var i=this.offsetLeft,r=e.clientX,o=function(e){var o=i+(e.clientX-r),n=s[0].offsetWidth;o<0&&(o=0),o>n&&(o=n);var l=Math.round(o/280*100)/100;F=l,Y(C,E,w,l),e.preventDefault()};L(o),e.preventDefault()}),s.on("click",function(e){var r=e.clientX-i(this).offset().left;r<0&&(r=0),r>this.offsetWidth&&(r=this.offsetWidth);var o=Math.round(r/280*100)/100;F=o,Y(C,E,w,o),e.preventDefault()}),M.each(function(){i(this).on("click",function(){i(this).parent(".layui-colorpicker-pre").addClass("selected").siblings().removeClass("selected");var e,r=this.style.backgroundColor,o=P(D(r)),n=r.slice(r.lastIndexOf(",")+1,r.length-1);C=o.h,E=o.s,w=o.b,3==(r.match(/[0-9]{1,3}/g)||[]).length&&(n=1),F=n,e=280*n,Y(o.h,o.s,o.b,n)})})},F.prototype.select=function(e,i,r,o){var n=this,l=(n.config,w({h:e,s:100,b:100})),t=w({h:e,s:i,b:r}),c=e/360*180,a=180-r/100*180-3,s=i/100*260-3;n.elemPicker.find("."+h).css("top",c),n.elemPicker.find("."+b)[0].style.background="#"+l,n.elemPicker.find("."+m).css({top:a,left:s}),"change"!==o&&n.elemPicker.find("."+x).find("input").val("#"+t)},F.prototype.pickerEvents=function(){var e=this,r=e.config,o=e.elemColorBox.find("."+p),n=e.elemPicker.find("."+x+" input"),l={clear:function(i){o[0].style.background="",e.elemColorBox.find("."+g).removeClass(d).addClass(u),e.color="",r.done&&r.done(""),e.removePicker()},confirm:function(i,l){var t=n.val(),c=t,a={};if(t.indexOf(",")>-1){if(a=P(D(t)),e.select(a.h,a.s,a.b),o[0].style.background=c="#"+w(a),(t.match(/[0-9]{1,3}/g)||[]).length>3&&"rgba"===o.attr("lay-type")){var s=280*t.slice(t.lastIndexOf(",")+1,t.length-1);e.elemPicker.find("."+y).css("left",s),o[0].style.background=t,c=t}}else a=C(t),o[0].style.background=c="#"+w(a),e.elemColorBox.find("."+g).removeClass(u).addClass(d);return"change"===l?(e.select(a.h,a.s,a.b,l),void(r.change&&r.change(c))):(e.color=t,r.done&&r.done(t),void e.removePicker())}};e.elemPicker.on("click","*[colorpicker-events]",function(){var e=i(this),r=e.attr("colorpicker-events");l[r]&&l[r].call(this,e)}),n.on("keyup",function(e){var r=i(this);l.confirm.call(this,r,13===e.keyCode?null:"change")})},F.prototype.events=function(){var e=this,r=e.config,o=e.elemColorBox.find("."+p);e.elemColorBox.on("click",function(){e.renderPicker(),i(f)[0]&&(e.val(),e.side())}),r.elem[0]&&!e.elemColorBox[0].eventHandler&&(E.on(n,function(r){if(!i(r.target).hasClass(s)&&!i(r.target).parents("."+s)[0]&&!i(r.target).hasClass(f.replace(/\./g,""))&&!i(r.target).parents(f)[0]&&e.elemPicker){if(e.color){var n=P(D(e.color));e.select(n.h,n.s,n.b)}else e.elemColorBox.find("."+g).removeClass(d).addClass(u);o[0].style.background=e.color||"",e.removePicker()}}),j.on("resize",function(){return!(!e.elemPicker||!i(f)[0])&&void e.position()}),e.elemColorBox[0].eventHandler=!0)},l.render=function(e){var i=new F(e);return t.call(i)},e(c,l)});layui.define("layer",function(e){"use strict";var t=layui.$,i=layui.layer,a=layui.hint(),n=layui.device(),l="form",r=".layui-form",o="layui-this",s="layui-hide",c="layui-disabled",u=function(){this.config={verify:{required:[/[\S]+/,"\u5fc5\u586b\u9879\u4e0d\u80fd\u4e3a\u7a7a"],phone:[/^1\d{10}$/,"\u8bf7\u8f93\u5165\u6b63\u786e\u7684\u624b\u673a\u53f7"],email:[/^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/,"\u90ae\u7bb1\u683c\u5f0f\u4e0d\u6b63\u786e"],url:[/^(#|(http(s?)):\/\/|\/\/)[^\s]+\.[^\s]+$/,"\u94fe\u63a5\u683c\u5f0f\u4e0d\u6b63\u786e"],number:function(e){if(!e||isNaN(e))return"\u53ea\u80fd\u586b\u5199\u6570\u5b57"},date:[/^(\d{4})[-\/](\d{1}|0\d{1}|1[0-2])([-\/](\d{1}|0\d{1}|[1-2][0-9]|3[0-1]))*$/,"\u65e5\u671f\u683c\u5f0f\u4e0d\u6b63\u786e"],identity:[/(^\d{15}$)|(^\d{17}(x|X|\d)$)/,"\u8bf7\u8f93\u5165\u6b63\u786e\u7684\u8eab\u4efd\u8bc1\u53f7"]},autocomplete:null}};u.prototype.set=function(e){var i=this;return t.extend(!0,i.config,e),i},u.prototype.verify=function(e){var i=this;return t.extend(!0,i.config.verify,e),i},u.prototype.on=function(e,t){return layui.onevent.call(this,l,e,t)},u.prototype.val=function(e,i){var a=this,n=t(r+'[lay-filter="'+e+'"]');return n.each(function(e,a){var n=t(this);layui.each(i,function(e,t){var i,a=n.find('[name="'+e+'"]');a[0]&&(i=a[0].type,"checkbox"===i?a[0].checked=t:"radio"===i?a.each(function(){this.value==t&&(this.checked=!0)}):a.val(t))})}),f.render(null,e),a.getValue(e)},u.prototype.getValue=function(e,i){i=i||t(r+'[lay-filter="'+e+'"]').eq(0);var a={},n={},l=i.find("input,select,textarea");return layui.each(l,function(e,i){var l;t(this);if(i.name=(i.name||"").replace(/^\s*|\s*&/,""),i.name){if(/^.*\[\]$/.test(i.name)){var r=i.name.match(/^(.*)\[\]$/g)[0];a[r]=0|a[r],l=i.name.replace(/^(.*)\[\]$/,"$1["+a[r]++ +"]")}/^checkbox|radio$/.test(i.type)&&!i.checked||(n[l||i.name]=i.value)}}),n},u.prototype.render=function(e,i){var n=this,u=n.config,d=t(r+function(){return i?'[lay-filter="'+i+'"]':""}()),f={input:function(){var e=d.find("input,textarea");u.autocomplete&&e.attr("autocomplete",u.autocomplete)},select:function(){var e,i="\u8bf7\u9009\u62e9",a="layui-form-select",n="layui-select-title",r="layui-select-none",u="",f=d.find("select"),v=function(i,l){t(i.target).parent().hasClass(n)&&!l||(t("."+a).removeClass(a+"ed "+a+"up"),e&&u&&e.val(u)),e=null},y=function(i,d,f){var y,p=t(this),m=i.find("."+n),g=m.find("input"),k=i.find("dl"),x=k.children("dd"),b=this.selectedIndex;if(!d){var C=function(){var e=i.offset().top+i.outerHeight()+5-h.scrollTop(),t=k.outerHeight();b=p[0].selectedIndex,i.addClass(a+"ed"),x.removeClass(s),y=null,x.eq(b).addClass(o).siblings().removeClass(o),e+t>h.height()&&e>=t&&i.addClass(a+"up"),T()},w=function(e){i.removeClass(a+"ed "+a+"up"),g.blur(),y=null,e||$(g.val(),function(e){var i=p[0].selectedIndex;e&&(u=t(p[0].options[i]).html(),0===i&&u===g.attr("placeholder")&&(u=""),g.val(u||""))})},T=function(){var e=k.children("dd."+o);if(e[0]){var t=e.position().top,i=k.height(),a=e.height();t>i&&k.scrollTop(t+k.scrollTop()-i+a-5),t<0&&k.scrollTop(t+k.scrollTop()-5)}};m.on("click",function(e){i.hasClass(a+"ed")?w():(v(e,!0),C()),k.find("."+r).remove()}),m.find(".layui-edge").on("click",function(){g.focus()}),g.on("keyup",function(e){var t=e.keyCode;9===t&&C()}).on("keydown",function(e){var t=e.keyCode;9===t&&w();var i=function(t,a){var n,l;e.preventDefault();var r=function(){var e=k.children("dd."+o);if(k.children("dd."+s)[0]&&"next"===t){var i=k.children("dd:not(."+s+",."+c+")"),n=i.eq(0).index();if(n>=0&&n<e.index()&&!i.hasClass(o))return i.eq(0).prev()[0]?i.eq(0).prev():k.children(":last")}return a&&a[0]?a:y&&y[0]?y:e}();return l=r[t](),n=r[t]("dd:not(."+s+")"),l[0]?(y=r[t](),n[0]&&!n.hasClass(c)||!y[0]?(n.addClass(o).siblings().removeClass(o),void T()):i(t,y)):y=null};38===t&&i("prev"),40===t&&i("next"),13===t&&(e.preventDefault(),k.children("dd."+o).trigger("click"))});var $=function(e,i,a){var n=0;layui.each(x,function(){var i=t(this),l=i.text(),r=l.indexOf(e)===-1;(""===e||"blur"===a?e!==l:r)&&n++,"keyup"===a&&i[r?"addClass":"removeClass"](s)});var l=n===x.length;return i(l),l},q=function(e){var t=this.value,i=e.keyCode;return 9!==i&&13!==i&&37!==i&&38!==i&&39!==i&&40!==i&&($(t,function(e){e?k.find("."+r)[0]||k.append('<p class="'+r+'">\u65e0\u5339\u914d\u9879</p>'):k.find("."+r).remove()},"keyup"),""===t&&k.find("."+r).remove(),void T())};f&&g.on("keyup",q).on("blur",function(i){var a=p[0].selectedIndex;e=g,u=t(p[0].options[a]).html(),0===a&&u===g.attr("placeholder")&&(u=""),setTimeout(function(){$(g.val(),function(e){u||g.val("")},"blur")},200)}),x.on("click",function(){var e=t(this),a=e.attr("lay-value"),n=p.attr("lay-filter");return!e.hasClass(c)&&(e.hasClass("layui-select-tips")?g.val(""):(g.val(e.text()),e.addClass(o)),e.siblings().removeClass(o),p.val(a).removeClass("layui-form-danger"),layui.event.call(this,l,"select("+n+")",{elem:p[0],value:a,othis:i}),w(!0),!1)}),i.find("dl>dt").on("click",function(e){return!1}),t(document).off("click",v).on("click",v)}};f.each(function(e,l){var r=t(this),s=r.next("."+a),u=this.disabled,d=l.value,f=t(l.options[l.selectedIndex]),v=l.options[0];if("string"==typeof r.attr("lay-ignore"))return r.show();var h="string"==typeof r.attr("lay-search"),p=v?v.value?i:v.innerHTML||i:i,m=t(['<div class="'+(h?"":"layui-unselect ")+a,(u?" layui-select-disabled":"")+'">','<div class="'+n+'">','<input type="text" placeholder="'+t.trim(p)+'" '+('value="'+t.trim(d?f.html():"")+'"')+(!u&&h?"":" readonly")+' class="layui-input'+(h?"":" layui-unselect")+(u?" "+c:"")+'">','<i class="layui-edge"></i></div>','<dl class="layui-anim layui-anim-upbit'+(r.find("optgroup")[0]?" layui-select-group":"")+'">',function(e){var a=[];return layui.each(e,function(e,n){0!==e||n.value?"optgroup"===n.tagName.toLowerCase()?a.push("<dt>"+n.label+"</dt>"):a.push('<dd lay-value="'+n.value+'" class="'+(d===n.value?o:"")+(n.disabled?" "+c:"")+'">'+t.trim(n.innerHTML)+"</dd>"):a.push('<dd lay-value="" class="layui-select-tips">'+t.trim(n.innerHTML||i)+"</dd>")}),0===a.length&&a.push('<dd lay-value="" class="'+c+'">\u6ca1\u6709\u9009\u9879</dd>'),a.join("")}(r.find("*"))+"</dl>","</div>"].join(""));s[0]&&s.remove(),r.after(m),y.call(this,m,u,h)})},checkbox:function(){var e={checkbox:["layui-form-checkbox","layui-form-checked","checkbox"],_switch:["layui-form-switch","layui-form-onswitch","switch"]},i=d.find("input[type=checkbox]"),a=function(e,i){var a=t(this);e.on("click",function(){var t=a.attr("lay-filter"),n=(a.attr("lay-text")||"").split("|");a[0].disabled||(a[0].checked?(a[0].checked=!1,e.removeClass(i[1]).find("em").text(n[1])):(a[0].checked=!0,e.addClass(i[1]).find("em").text(n[0])),layui.event.call(a[0],l,i[2]+"("+t+")",{elem:a[0],value:a[0].value,othis:e}))})};i.each(function(i,n){var l=t(this),r=l.attr("lay-skin"),o=(l.attr("lay-text")||"").split("|"),s=this.disabled;"switch"===r&&(r="_"+r);var u=e[r]||e.checkbox;if("string"==typeof l.attr("lay-ignore"))return l.show();var d=l.next("."+u[0]),f=t(['<div class="layui-unselect '+u[0],n.checked?" "+u[1]:"",s?" layui-checkbox-disabled "+c:"",'"',r?' lay-skin="'+r+'"':"",">",function(){var e=n.title.replace(/\s/g,""),t={checkbox:[e?"<span>"+n.title+"</span>":"",'<i class="layui-icon layui-icon-ok"></i>'].join(""),_switch:"<em>"+((n.checked?o[0]:o[1])||"")+"</em><i></i>"};return t[r]||t.checkbox}(),"</div>"].join(""));d[0]&&d.remove(),l.after(f),a.call(this,f,u)})},radio:function(){var e="layui-form-radio",i=["&#xe643;","&#xe63f;"],a=d.find("input[type=radio]"),n=function(a){var n=t(this),o="layui-anim-scaleSpring";a.on("click",function(){var s=n[0].name,c=n.parents(r),u=n.attr("lay-filter"),d=c.find("input[name="+s.replace(/(\.|#|\[|\])/g,"\\$1")+"]");n[0].disabled||(layui.each(d,function(){var a=t(this).next("."+e);this.checked=!1,a.removeClass(e+"ed"),a.find(".layui-icon").removeClass(o).html(i[1])}),n[0].checked=!0,a.addClass(e+"ed"),a.find(".layui-icon").addClass(o).html(i[0]),layui.event.call(n[0],l,"radio("+u+")",{elem:n[0],value:n[0].value,othis:a}))})};a.each(function(a,l){var r=t(this),o=r.next("."+e),s=this.disabled;if("string"==typeof r.attr("lay-ignore"))return r.show();o[0]&&o.remove();var u=t(['<div class="layui-unselect '+e,l.checked?" "+e+"ed":"",(s?" layui-radio-disabled "+c:"")+'">','<i class="layui-anim layui-icon">'+i[l.checked?0:1]+"</i>","<div>"+function(){var e=l.title||"";return"string"==typeof r.next().attr("lay-radio")&&(e=r.next().html()),e}()+"</div>","</div>"].join(""));r.after(u),n.call(this,u)})}};return e?f[e]?f[e]():a.error('\u4e0d\u652f\u6301\u7684 "'+e+'" \u8868\u5355\u6e32\u67d3'):layui.each(f,function(e,t){t()}),n};var d=function(){var e=null,a=f.config.verify,o="layui-form-danger",s={},c=t(this),u=c.parents(r).eq(0),d=u.find("*[lay-verify]"),h=c.parents("form")[0],y=c.attr("lay-filter");return layui.each(d,function(l,r){var s=t(this),c=s.attr("lay-verify").split("|"),u=s.attr("lay-verType"),d=s.val();if(s.removeClass(o),layui.each(c,function(t,l){var c,f="",h="function"==typeof a[l];if(a[l]){var c=h?f=a[l](d,r):!a[l][0].test(d),y="select"===r.tagName.toLowerCase()||/^checkbox|radio$/.test(r.type);if(f=f||a[l][1],"required"===l&&(f=s.attr("lay-reqText")||f),c)return"tips"===u?i.tips(f,function(){return"string"!=typeof s.attr("lay-ignore")&&y?s.next():s}(),{tips:1}):"alert"===u?i.alert(f,{title:"\u63d0\u793a",shadeClose:!0}):/\bstring|number\b/.test(typeof f)&&i.msg(f,{icon:5,shift:6}),n.mobile?v.scrollTop(function(){try{return(y?s.next():s).offset().top-15}catch(e){return 0}}()):setTimeout(function(){(y?s.next().find("input"):r).focus()},7),s.addClass(o),e=!0}}),e)return e}),!e&&(s=f.getValue(null,u),layui.event.call(this,l,"submit("+y+")",{elem:this,form:h,field:s}))},f=new u,v=t(document),h=t(window);t(function(){f.render()}),v.on("reset",r,function(){var e=t(this).attr("lay-filter");setTimeout(function(){f.render(null,e)},50)}),v.on("submit",r,d).on("click","*[lay-submit]",d),e(l,f)});layui.define("form",function(e){"use strict";var i=layui.$,a=layui.form,n=layui.layer,t="tree",r={config:{},index:layui[t]?layui[t].index+1e4:0,set:function(e){var a=this;return a.config=i.extend({},a.config,e),a},on:function(e,i){return layui.onevent.call(this,t,e,i)}},l=function(){var e=this,i=e.config,a=i.id||e.index;return l.that[a]=e,l.config[a]=i,{config:i,reload:function(i){e.reload.call(e,i)},getChecked:function(){return e.getChecked.call(e)},setChecked:function(i){return e.setChecked.call(e,i)}}},c="layui-hide",d="layui-disabled",s="layui-tree-set",o="layui-tree-iconClick",h="layui-icon-addition",u="layui-icon-subtraction",p="layui-tree-entry",f="layui-tree-main",y="layui-tree-txt",v="layui-tree-pack",C="layui-tree-spread",k="layui-tree-setLineShort",m="layui-tree-showLine",x="layui-tree-lineExtend",b=function(e){var a=this;a.index=++r.index,a.config=i.extend({},a.config,r.config,e),a.render()};b.prototype.config={data:[],showCheckbox:!1,showLine:!0,accordion:!1,onlyIconControl:!1,isJump:!1,edit:!1,text:{defaultNodeName:"\u672a\u547d\u540d",none:"\u65e0\u6570\u636e"}},b.prototype.reload=function(e){var a=this;layui.each(e,function(e,i){"array"===layui._typeof(i)&&delete a.config[e]}),a.config=i.extend(!0,{},a.config,e),a.render()},b.prototype.render=function(){var e=this,a=e.config;e.checkids=[];var n=i('<div class="layui-tree'+(a.showCheckbox?" layui-form":"")+(a.showLine?" layui-tree-line":"")+'" lay-filter="LAY-tree-'+e.index+'"></div>');e.tree(n);var t=a.elem=i(a.elem);if(t[0]){if(e.key=a.id||e.index,e.elem=n,e.elemNone=i('<div class="layui-tree-emptyText">'+a.text.none+"</div>"),t.html(e.elem),0==e.elem.find(".layui-tree-set").length)return e.elem.append(e.elemNone);a.showCheckbox&&e.renderForm("checkbox"),e.elem.find(".layui-tree-set").each(function(){var e=i(this);e.parent(".layui-tree-pack")[0]||e.addClass("layui-tree-setHide"),!e.next()[0]&&e.parents(".layui-tree-pack").eq(1).hasClass("layui-tree-lineExtend")&&e.addClass(k),e.next()[0]||e.parents(".layui-tree-set").eq(0).next()[0]||e.addClass(k)}),e.events()}},b.prototype.renderForm=function(e){a.render(e,"LAY-tree-"+this.index)},b.prototype.tree=function(e,a){var n=this,t=n.config,r=a||t.data;layui.each(r,function(a,r){var l=r.children&&r.children.length>0,o=i('<div class="layui-tree-pack" '+(r.spread?'style="display: block;"':"")+"></div>"),h=i(['<div data-id="'+r.id+'" class="layui-tree-set'+(r.spread?" layui-tree-spread":"")+(r.checked?" layui-tree-checkedFirst":"")+'">','<div class="layui-tree-entry">','<div class="layui-tree-main">',function(){return t.showLine?l?'<span class="layui-tree-iconClick layui-tree-icon"><i class="layui-icon '+(r.spread?"layui-icon-subtraction":"layui-icon-addition")+'"></i></span>':'<span class="layui-tree-iconClick"><i class="layui-icon layui-icon-file"></i></span>':'<span class="layui-tree-iconClick"><i class="layui-tree-iconArrow '+(l?"":c)+'"></i></span>'}(),function(){return t.showCheckbox?'<input type="checkbox" name="'+(r.field||"layuiTreeCheck_"+r.id)+'" same="layuiTreeCheck" lay-skin="primary" '+(r.disabled?"disabled":"")+' value="'+r.id+'">':""}(),function(){return t.isJump&&r.href?'<a href="'+r.href+'" target="_blank" class="'+y+'">'+(r.title||r.label||t.text.defaultNodeName)+"</a>":'<span class="'+y+(r.disabled?" "+d:"")+'">'+(r.title||r.label||t.text.defaultNodeName)+"</span>"}(),"</div>",function(){if(!t.edit)return"";var e={add:'<i class="layui-icon layui-icon-add-1"  data-type="add"></i>',update:'<i class="layui-icon layui-icon-edit" data-type="update"></i>',del:'<i class="layui-icon layui-icon-delete" data-type="del"></i>'},i=['<div class="layui-btn-group layui-tree-btnGroup">'];return t.edit===!0&&(t.edit=["update","del"]),"object"==typeof t.edit?(layui.each(t.edit,function(a,n){i.push(e[n]||"")}),i.join("")+"</div>"):void 0}(),"</div></div>"].join(""));l&&(h.append(o),n.tree(o,r.children)),e.append(h),h.prev("."+s)[0]&&h.prev().children(".layui-tree-pack").addClass("layui-tree-showLine"),l||h.parent(".layui-tree-pack").addClass("layui-tree-lineExtend"),n.spread(h,r),t.showCheckbox&&(r.checked&&n.checkids.push(r.id),n.checkClick(h,r)),t.edit&&n.operate(h,r)})},b.prototype.spread=function(e,a){var n=this,t=n.config,r=e.children("."+p),l=r.children("."+f),c=r.find("."+o),k=r.find("."+y),m=t.onlyIconControl?c:l,x="";m.on("click",function(i){var a=e.children("."+v),n=m.children(".layui-icon")[0]?m.children(".layui-icon"):m.find(".layui-tree-icon").children(".layui-icon");if(a[0]){if(e.hasClass(C))e.removeClass(C),a.slideUp(200),n.removeClass(u).addClass(h);else if(e.addClass(C),a.slideDown(200),n.addClass(u).removeClass(h),t.accordion){var r=e.siblings("."+s);r.removeClass(C),r.children("."+v).slideUp(200),r.find(".layui-tree-icon").children(".layui-icon").removeClass(u).addClass(h)}}else x="normal"}),k.on("click",function(){var n=i(this);n.hasClass(d)||(x=e.hasClass(C)?t.onlyIconControl?"open":"close":t.onlyIconControl?"close":"open",t.click&&t.click({elem:e,state:x,data:a}))})},b.prototype.setCheckbox=function(e,i,a){var n=this,t=(n.config,a.prop("checked"));if(!a.prop("disabled")){if("object"==typeof i.children||e.find("."+v)[0]){var r=e.find("."+v).find('input[same="layuiTreeCheck"]');r.each(function(){this.disabled||(this.checked=t)})}var l=function(e){if(e.parents("."+s)[0]){var i,a=e.parent("."+v),n=a.parent(),r=a.prev().find('input[same="layuiTreeCheck"]');t?r.prop("checked",t):(a.find('input[same="layuiTreeCheck"]').each(function(){this.checked&&(i=!0)}),i||r.prop("checked",!1)),l(n)}};l(e),n.renderForm("checkbox")}},b.prototype.checkClick=function(e,a){var n=this,t=n.config,r=e.children("."+p),l=r.children("."+f);l.on("click",'input[same="layuiTreeCheck"]+',function(r){layui.stope(r);var l=i(this).prev(),c=l.prop("checked");l.prop("disabled")||(n.setCheckbox(e,a,l),t.oncheck&&t.oncheck({elem:e,checked:c,data:a}))})},b.prototype.operate=function(e,a){var t=this,r=t.config,l=e.children("."+p),d=l.children("."+f);l.children(".layui-tree-btnGroup").on("click",".layui-icon",function(l){layui.stope(l);var f=i(this).data("type"),b=e.children("."+v),g={data:a,type:f,elem:e};if("add"==f){b[0]||(r.showLine?(d.find("."+o).addClass("layui-tree-icon"),d.find("."+o).children(".layui-icon").addClass(h).removeClass("layui-icon-file")):d.find(".layui-tree-iconArrow").removeClass(c),e.append('<div class="layui-tree-pack"></div>'));var w=r.operate&&r.operate(g),N={};if(N.title=r.text.defaultNodeName,N.id=w,t.tree(e.children("."+v),[N]),r.showLine)if(b[0])b.hasClass(x)||b.addClass(x),e.find("."+v).each(function(){i(this).children("."+s).last().addClass(k)}),b.children("."+s).last().prev().hasClass(k)?b.children("."+s).last().prev().removeClass(k):b.children("."+s).last().removeClass(k),!e.parent("."+v)[0]&&e.next()[0]&&b.children("."+s).last().removeClass(k);else{var T=e.siblings("."+s),L=1,I=e.parent("."+v);layui.each(T,function(e,a){i(a).children("."+v)[0]||(L=0)}),1==L?(T.children("."+v).addClass(m),T.children("."+v).children("."+s).removeClass(k),e.children("."+v).addClass(m),I.removeClass(x),I.children("."+s).last().children("."+v).children("."+s).last().addClass(k)):e.children("."+v).children("."+s).addClass(k)}if(!r.showCheckbox)return;if(d.find('input[same="layuiTreeCheck"]')[0].checked){var A=e.children("."+v).children("."+s).last();A.find('input[same="layuiTreeCheck"]')[0].checked=!0}t.renderForm("checkbox")}else if("update"==f){var F=d.children("."+y).html();d.children("."+y).html(""),d.append('<input type="text" class="layui-tree-editInput">'),d.children(".layui-tree-editInput").val(F).focus();var j=function(e){var i=e.val().trim();i=i?i:r.text.defaultNodeName,e.remove(),d.children("."+y).html(i),g.data.title=i,r.operate&&r.operate(g)};d.children(".layui-tree-editInput").blur(function(){j(i(this))}),d.children(".layui-tree-editInput").on("keydown",function(e){13===e.keyCode&&(e.preventDefault(),j(i(this)))})}else n.confirm('\u786e\u8ba4\u5220\u9664\u8be5\u8282\u70b9 "<span style="color: #999;">'+(a.title||"")+'</span>" \u5417\uff1f',function(a){if(r.operate&&r.operate(g),g.status="remove",n.close(a),!e.prev("."+s)[0]&&!e.next("."+s)[0]&&!e.parent("."+v)[0])return e.remove(),void t.elem.append(t.elemNone);if(e.siblings("."+s).children("."+p)[0]){if(r.showCheckbox){var l=function(e){if(e.parents("."+s)[0]){var a=e.siblings("."+s).children("."+p),n=e.parent("."+v).prev(),r=n.find('input[same="layuiTreeCheck"]')[0],c=1,d=0;0==r.checked&&(a.each(function(e,a){var n=i(a).find('input[same="layuiTreeCheck"]')[0];0!=n.checked||n.disabled||(c=0),n.disabled||(d=1)}),1==c&&1==d&&(r.checked=!0,t.renderForm("checkbox"),l(n.parent("."+s))))}};l(e)}if(r.showLine){var d=e.siblings("."+s),h=1,f=e.parent("."+v);layui.each(d,function(e,a){i(a).children("."+v)[0]||(h=0)}),1==h?(b[0]||(f.removeClass(x),d.children("."+v).addClass(m),d.children("."+v).children("."+s).removeClass(k)),e.next()[0]?f.children("."+s).last().children("."+v).children("."+s).last().addClass(k):e.prev().children("."+v).children("."+s).last().addClass(k),e.next()[0]||e.parents("."+s)[1]||e.parents("."+s).eq(0).next()[0]||e.prev("."+s).addClass(k)):!e.next()[0]&&e.hasClass(k)&&e.prev().addClass(k)}}else{var y=e.parent("."+v).prev();if(r.showLine){y.find("."+o).removeClass("layui-tree-icon"),y.find("."+o).children(".layui-icon").removeClass(u).addClass("layui-icon-file");var w=y.parents("."+v).eq(0);w.addClass(x),w.children("."+s).each(function(){i(this).children("."+v).children("."+s).last().addClass(k)})}else y.find(".layui-tree-iconArrow").addClass(c);e.parents("."+s).eq(0).removeClass(C),e.parent("."+v).remove()}e.remove()})})},b.prototype.events=function(){var e=this,a=e.config;e.elem.find(".layui-tree-checkedFirst");e.setChecked(e.checkids),e.elem.find(".layui-tree-search").on("keyup",function(){var n=i(this),t=n.val(),r=n.nextAll(),l=[];r.find("."+y).each(function(){var e=i(this).parents("."+p);if(i(this).html().indexOf(t)!=-1){l.push(i(this).parent());var a=function(e){e.addClass("layui-tree-searchShow"),e.parent("."+v)[0]&&a(e.parent("."+v).parent("."+s))};a(e.parent("."+s))}}),r.find("."+p).each(function(){var e=i(this).parent("."+s);e.hasClass("layui-tree-searchShow")||e.addClass(c)}),0==r.find(".layui-tree-searchShow").length&&e.elem.append(e.elemNone),a.onsearch&&a.onsearch({elem:l})}),e.elem.find(".layui-tree-search").on("keydown",function(){i(this).nextAll().find("."+p).each(function(){var e=i(this).parent("."+s);e.removeClass("layui-tree-searchShow "+c)}),i(".layui-tree-emptyText")[0]&&i(".layui-tree-emptyText").remove()})},b.prototype.getChecked=function(){var e=this,a=e.config,n=[],t=[];e.elem.find(".layui-form-checked").each(function(){n.push(i(this).prev()[0].value)});var r=function(e,a){layui.each(e,function(e,t){layui.each(n,function(e,n){if(t.id==n){var l=i.extend({},t);return delete l.children,a.push(l),t.children&&(l.children=[],r(t.children,l.children)),!0}})})};return r(i.extend({},a.data),t),t},b.prototype.setChecked=function(e){var a=this;a.config;a.elem.find("."+s).each(function(a,n){var t=i(this).data("id"),r=i(n).children("."+p).find('input[same="layuiTreeCheck"]'),l=r.next();if("number"==typeof e){if(t==e)return r[0].checked||l.click(),!1}else"object"==typeof e&&layui.each(e,function(e,i){if(i==t&&!r[0].checked)return l.click(),!0})})},l.that={},l.config={},r.reload=function(e,i){var a=l.that[e];return a.reload(i),l.call(a)},r.getChecked=function(e){var i=l.that[e];return i.getChecked()},r.setChecked=function(e,i){var a=l.that[e];return a.setChecked(i)},r.render=function(e){var i=new b(e);return l.call(i)},e(t,r)});layui.define(["laytpl","form"],function(e){"use strict";var a=layui.$,t=layui.laytpl,i=layui.form,n="transfer",l={config:{},index:layui[n]?layui[n].index+1e4:0,set:function(e){var t=this;return t.config=a.extend({},t.config,e),t},on:function(e,a){return layui.onevent.call(this,n,e,a)}},r=function(){var e=this,a=e.config,t=a.id||e.index;return r.that[t]=e,r.config[t]=a,{config:a,reload:function(a){e.reload.call(e,a)},getData:function(){return e.getData.call(e)}}},c="layui-hide",o="layui-btn-disabled",d="layui-none",s="layui-transfer-box",u="layui-transfer-header",h="layui-transfer-search",f="layui-transfer-active",y="layui-transfer-data",p=function(e){return e=e||{},['<div class="layui-transfer-box" data-index="'+e.index+'">','<div class="layui-transfer-header">','<input type="checkbox" name="'+e.checkAllName+'" lay-filter="layTransferCheckbox" lay-type="all" lay-skin="primary" title="{{ d.data.title['+e.index+"] || 'list"+(e.index+1)+"' }}\">","</div>","{{# if(d.data.showSearch){ }}",'<div class="layui-transfer-search">','<i class="layui-icon layui-icon-search"></i>','<input type="input" class="layui-input" placeholder="\u5173\u952e\u8bcd\u641c\u7d22">',"</div>","{{# } }}",'<ul class="layui-transfer-data"></ul>',"</div>"].join("")},v=['<div class="layui-transfer layui-form layui-border-box" lay-filter="LAY-transfer-{{ d.index }}">',p({index:0,checkAllName:"layTransferLeftCheckAll"}),'<div class="layui-transfer-active">','<button type="button" class="layui-btn layui-btn-sm layui-btn-primary layui-btn-disabled" data-index="0">','<i class="layui-icon layui-icon-next"></i>',"</button>",'<button type="button" class="layui-btn layui-btn-sm layui-btn-primary layui-btn-disabled" data-index="1">','<i class="layui-icon layui-icon-prev"></i>',"</button>","</div>",p({index:1,checkAllName:"layTransferRightCheckAll"}),"</div>"].join(""),x=function(e){var t=this;t.index=++l.index,t.config=a.extend({},t.config,l.config,e),t.render()};x.prototype.config={title:["\u5217\u8868\u4e00","\u5217\u8868\u4e8c"],width:200,height:360,data:[],value:[],showSearch:!1,id:"",text:{none:"\u65e0\u6570\u636e",searchNone:"\u65e0\u5339\u914d\u6570\u636e"}},x.prototype.reload=function(e){var t=this;t.config=a.extend({},t.config,e),t.render()},x.prototype.render=function(){var e=this,i=e.config,n=e.elem=a(t(v).render({data:i,index:e.index})),l=i.elem=a(i.elem);l[0]&&(i.data=i.data||[],i.value=i.value||[],e.key=i.id||e.index,l.html(e.elem),e.layBox=e.elem.find("."+s),e.layHeader=e.elem.find("."+u),e.laySearch=e.elem.find("."+h),e.layData=n.find("."+y),e.layBtn=n.find("."+f+" .layui-btn"),e.layBox.css({width:i.width,height:i.height}),e.layData.css({height:function(){return i.height-e.layHeader.outerHeight()-e.laySearch.outerHeight()-2}()}),e.renderData(),e.events())},x.prototype.renderData=function(){var e=this,a=(e.config,[{checkName:"layTransferLeftCheck",views:[]},{checkName:"layTransferRightCheck",views:[]}]);e.parseData(function(e){var t=e.selected?1:0,i=["<li>",'<input type="checkbox" name="'+a[t].checkName+'" lay-skin="primary" lay-filter="layTransferCheckbox" title="'+e.title+'"'+(e.disabled?" disabled":"")+(e.checked?" checked":"")+' value="'+e.value+'">',"</li>"].join("");a[t].views.push(i),delete e.selected}),e.layData.eq(0).html(a[0].views.join("")),e.layData.eq(1).html(a[1].views.join("")),e.renderCheckBtn()},x.prototype.renderForm=function(e){i.render(e,"LAY-transfer-"+this.index)},x.prototype.renderCheckBtn=function(e){var t=this,i=t.config;e=e||{},t.layBox.each(function(n){var l=a(this),r=l.find("."+y),d=l.find("."+u).find('input[type="checkbox"]'),s=r.find('input[type="checkbox"]'),h=0,f=!1;if(s.each(function(){var e=a(this).data("hide");(this.checked||this.disabled||e)&&h++,this.checked&&!e&&(f=!0)}),d.prop("checked",f&&h===s.length),t.layBtn.eq(n)[f?"removeClass":"addClass"](o),!e.stopNone){var p=r.children("li:not(."+c+")").length;t.noneView(r,p?"":i.text.none)}}),t.renderForm("checkbox")},x.prototype.noneView=function(e,t){var i=a('<p class="layui-none">'+(t||"")+"</p>");e.find("."+d)[0]&&e.find("."+d).remove(),t.replace(/\s/g,"")&&e.append(i)},x.prototype.setValue=function(){var e=this,t=e.config,i=[];return e.layBox.eq(1).find("."+y+' input[type="checkbox"]').each(function(){var e=a(this).data("hide");e||i.push(this.value)}),t.value=i,e},x.prototype.parseData=function(e){var t=this,i=t.config,n=[];return layui.each(i.data,function(t,l){l=("function"==typeof i.parseData?i.parseData(l):l)||l,n.push(l=a.extend({},l)),layui.each(i.value,function(e,a){a==l.value&&(l.selected=!0)}),e&&e(l)}),i.data=n,t},x.prototype.getData=function(e){var a=this,t=a.config,i=[];return a.setValue(),layui.each(e||t.value,function(e,a){layui.each(t.data,function(e,t){delete t.selected,a==t.value&&i.push(t)})}),i},x.prototype.events=function(){var e=this,t=e.config;e.elem.on("click",'input[lay-filter="layTransferCheckbox"]+',function(){var t=a(this).prev(),i=t[0].checked,n=t.parents("."+s).eq(0).find("."+y);t[0].disabled||("all"===t.attr("lay-type")&&n.find('input[type="checkbox"]').each(function(){this.disabled||(this.checked=i)}),e.renderCheckBtn({stopNone:!0}))}),e.layBtn.on("click",function(){var i=a(this),n=i.data("index"),l=e.layBox.eq(n),r=[];if(!i.hasClass(o)){e.layBox.eq(n).each(function(t){var i=a(this),n=i.find("."+y);n.children("li").each(function(){var t=a(this),i=t.find('input[type="checkbox"]'),n=i.data("hide");i[0].checked&&!n&&(i[0].checked=!1,l.siblings("."+s).find("."+y).append(t.clone()),t.remove(),r.push(i[0].value)),e.setValue()})}),e.renderCheckBtn();var c=l.siblings("."+s).find("."+h+" input");""===c.val()||c.trigger("keyup"),t.onchange&&t.onchange(e.getData(r),n)}}),e.laySearch.find("input").on("keyup",function(){var i=this.value,n=a(this).parents("."+h).eq(0).siblings("."+y),l=n.children("li");l.each(function(){var e=a(this),t=e.find('input[type="checkbox"]'),n=t[0].title.indexOf(i)!==-1;e[n?"removeClass":"addClass"](c),t.data("hide",!n)}),e.renderCheckBtn();var r=l.length===n.children("li."+c).length;e.noneView(n,r?t.text.searchNone:"")})},r.that={},r.config={},l.reload=function(e,a){var t=r.that[e];return t.reload(a),r.call(t)},l.getData=function(e){var a=r.that[e];return a.getData()},l.render=function(e){var a=new x(e);return r.call(a)},e(n,l)});layui.define(["laytpl","laypage","layer","form","util"],function(e){"use strict";var t=layui.$,i=layui.laytpl,a=layui.laypage,l=layui.layer,n=layui.form,o=layui.util,r=layui.hint(),c=layui.device(),d={config:{checkName:"LAY_CHECKED",indexName:"LAY_TABLE_INDEX"},cache:{},index:layui.table?layui.table.index+1e4:0,set:function(e){var i=this;return i.config=t.extend({},i.config,e),i},on:function(e,t){return layui.onevent.call(this,h,e,t)}},s=function(){var e=this,t=e.config,i=t.id||t.index;return i&&(s.that[i]=e,s.config[i]=t),{config:t,reload:function(t,i){e.reload.call(e,t,i)},setColsWidth:function(){e.setColsWidth.call(e)},resize:function(){e.resize.call(e)}}},u=function(e){var t=s.config[e];return t||r.error(e?"The table instance with ID '"+e+"' not found":"ID argument required"),t||null},y=function(e,a,l,n){var r=this.config||{};r.escape&&(a=o.escape(a));var c=e.templet?function(){return"function"==typeof e.templet?e.templet(l):i(t(e.templet).html()||String(a)).render(l)}():a;return n?t("<div>"+c+"</div>").text():c},h="table",f=".layui-table",p="layui-hide",v="layui-none",m="layui-table-view",g=".layui-table-tool",b=".layui-table-box",x=".layui-table-init",k=".layui-table-header",C=".layui-table-body",w=".layui-table-main",T=".layui-table-fixed",N=".layui-table-fixed-l",L=".layui-table-fixed-r",_=".layui-table-total",S=".layui-table-page",A=".layui-table-sort",R="layui-table-edit",W="layui-table-hover",z=function(e){var t='{{#if(item2.colspan){}} colspan="{{item2.colspan}}"{{#} if(item2.rowspan){}} rowspan="{{item2.rowspan}}"{{#}}}';return e=e||{},['<table cellspacing="0" cellpadding="0" border="0" class="layui-table" ','{{# if(d.data.skin){ }}lay-skin="{{d.data.skin}}"{{# } }} {{# if(d.data.size){ }}lay-size="{{d.data.size}}"{{# } }} {{# if(d.data.even){ }}lay-even{{# } }}>',"<thead>","{{# layui.each(d.data.cols, function(i1, item1){ }}","<tr>","{{# layui.each(item1, function(i2, item2){ }}",'{{# if(item2.fixed && item2.fixed !== "right"){ left = true; } }}','{{# if(item2.fixed === "right"){ right = true; } }}',function(){return e.fixed&&"right"!==e.fixed?'{{# if(item2.fixed && item2.fixed !== "right"){ }}':"right"===e.fixed?'{{# if(item2.fixed === "right"){ }}':""}(),"{{# var isSort = !(item2.colGroup) && item2.sort; }}",'<th data-field="{{ item2.field||i2 }}" data-key="{{d.index}}-{{i1}}-{{i2}}" {{# if( item2.parentKey){ }}data-parentkey="{{ item2.parentKey }}"{{# } }} {{# if(item2.minWidth){ }}data-minwidth="{{item2.minWidth}}"{{# } }} '+t+' {{# if(item2.unresize || item2.colGroup){ }}data-unresize="true"{{# } }} class="{{# if(item2.hide){ }}layui-hide{{# } }}{{# if(isSort){ }} layui-unselect{{# } }}{{# if(!item2.field){ }} layui-table-col-special{{# } }}">','<div class="layui-table-cell laytable-cell-',"{{# if(item2.colGroup){ }}","group","{{# } else { }}","{{d.index}}-{{i1}}-{{i2}}",'{{# if(item2.type !== "normal"){ }}'," laytable-cell-{{ item2.type }}","{{# } }}","{{# } }}",'" {{#if(item2.align){}}align="{{item2.align}}"{{#}}}>','{{# if(item2.type === "checkbox"){ }}','<input type="checkbox" name="layTableCheckbox" lay-skin="primary" lay-filter="layTableAllChoose" {{# if(item2[d.data.checkName]){ }}checked{{# }; }}>',"{{# } else { }}",'<span>{{item2.title||""}}</span>',"{{# if(isSort){ }}",'<span class="layui-table-sort layui-inline"><i class="layui-edge layui-table-sort-asc" title="\u5347\u5e8f"></i><i class="layui-edge layui-table-sort-desc" title="\u964d\u5e8f"></i></span>',"{{# } }}","{{# } }}","</div>","</th>",e.fixed?"{{# }; }}":"","{{# }); }}","</tr>","{{# }); }}","</thead>","</table>"].join("")},E=['<table cellspacing="0" cellpadding="0" border="0" class="layui-table" ','{{# if(d.data.skin){ }}lay-skin="{{d.data.skin}}"{{# } }} {{# if(d.data.size){ }}lay-size="{{d.data.size}}"{{# } }} {{# if(d.data.even){ }}lay-even{{# } }}>',"<tbody></tbody>","</table>"].join(""),j=['<div class="layui-form layui-border-box {{d.VIEW_CLASS}}{{# if(d.data.className){ }} {{ d.data.className }}{{# } }}" lay-filter="LAY-table-{{d.index}}" lay-id="{{ d.data.id }}" style="{{# if(d.data.width){ }}width:{{d.data.width}}px;{{# } }} {{# if(d.data.height){ }}height:{{d.data.height}}px;{{# } }}">',"{{# if(d.data.toolbar){ }}",'<div class="layui-table-tool">','<div class="layui-table-tool-temp"></div>','<div class="layui-table-tool-self"></div>',"</div>","{{# } }}",'<div class="layui-table-box">',"{{# if(d.data.loading){ }}",'<div class="layui-table-init" style="background-color: #fff;">','<i class="layui-icon layui-icon-loading layui-anim layui-anim-rotate layui-anim-loop"></i>',"</div>","{{# } }}","{{# var left, right; }}",'<div class="layui-table-header">',z(),"</div>",'<div class="layui-table-body layui-table-main">',E,"</div>","{{# if(left){ }}",'<div class="layui-table-fixed layui-table-fixed-l">','<div class="layui-table-header">',z({fixed:!0}),"</div>",'<div class="layui-table-body">',E,"</div>","</div>","{{# }; }}","{{# if(right){ }}",'<div class="layui-table-fixed layui-table-fixed-r">','<div class="layui-table-header">',z({fixed:"right"}),'<div class="layui-table-mend"></div>',"</div>",'<div class="layui-table-body">',E,"</div>","</div>","{{# }; }}","</div>","{{# if(d.data.totalRow){ }}",'<div class="layui-table-total">','<table cellspacing="0" cellpadding="0" border="0" class="layui-table" ','{{# if(d.data.skin){ }}lay-skin="{{d.data.skin}}"{{# } }} {{# if(d.data.size){ }}lay-size="{{d.data.size}}"{{# } }} {{# if(d.data.even){ }}lay-even{{# } }}>','<tbody><tr><td><div class="layui-table-cell" style="visibility: hidden;">Total</div></td></tr></tbody>',"</table>","</div>","{{# } }}","{{# if(d.data.page){ }}",'<div class="layui-table-page">','<div id="layui-table-page{{d.index}}"></div>',"</div>","{{# } }}","<style>","{{# layui.each(d.data.cols, function(i1, item1){","layui.each(item1, function(i2, item2){ }}",".laytable-cell-{{d.index}}-{{i1}}-{{i2}}{ ","{{# if(item2.width){ }}","width: {{item2.width}}px;","{{# } }}"," }","{{# });","}); }}","</style>","</div>"].join(""),F=t(window),I=t(document),H=function(e){var i=this;i.index=++d.index,i.config=t.extend({},i.config,d.config,e),i.render()};H.prototype.config={limit:10,loading:!0,cellMinWidth:60,defaultToolbar:["filter","exports","print"],autoSort:!0,text:{none:"\u65e0\u6570\u636e"}},H.prototype.render=function(){var e=this,a=e.config;if(a.elem=t(a.elem),a.where=a.where||{},a.id=a.id||a.elem.attr("id")||e.index,a.request=t.extend({pageName:"page",limitName:"limit"},a.request),a.response=t.extend({statusName:"code",statusCode:0,msgName:"msg",dataName:"data",totalRowName:"totalRow",countName:"count"},a.response),"object"==typeof a.page&&(a.limit=a.page.limit||a.limit,a.limits=a.page.limits||a.limits,e.page=a.page.curr=a.page.curr||1,delete a.page.elem,delete a.page.jump),!a.elem[0])return e;a.height&&/^full-\d+$/.test(a.height)&&(e.fullHeightGap=a.height.split("-")[1],a.height=F.height()-e.fullHeightGap),e.setInit();var l=a.elem,n=l.next("."+m),o=e.elem=t(i(j).render({VIEW_CLASS:m,data:a,index:e.index}));if(a.index=e.index,e.key=a.id||a.index,n[0]&&n.remove(),l.after(o),e.layTool=o.find(g),e.layBox=o.find(b),e.layHeader=o.find(k),e.layMain=o.find(w),e.layBody=o.find(C),e.layFixed=o.find(T),e.layFixLeft=o.find(N),e.layFixRight=o.find(L),e.layTotal=o.find(_),e.layPage=o.find(S),e.renderToolbar(),e.fullSize(),a.cols.length>1){var r=e.layFixed.find(k).find("th");r.height(e.layHeader.height()-1-parseFloat(r.css("padding-top"))-parseFloat(r.css("padding-bottom")))}e.pullData(e.page),e.events()},H.prototype.initOpts=function(e){var t=this,i=(t.config,{checkbox:48,radio:48,space:15,numbers:40});e.checkbox&&(e.type="checkbox"),e.space&&(e.type="space"),e.type||(e.type="normal"),"normal"!==e.type&&(e.unresize=!0,e.width=e.width||i[e.type])},H.prototype.setInit=function(e){var t=this,i=t.config;return i.clientWidth=i.width||function(){var e=function(t){var a,l;t=t||i.elem.parent(),a=t.width();try{l="none"===t.css("display")}catch(n){}return!t[0]||a&&!l?a:e(t.parent())};return e()}(),"width"===e?i.clientWidth:void layui.each(i.cols,function(e,a){layui.each(a,function(l,n){if(!n)return void a.splice(l,1);if(n.key=e+"-"+l,n.hide=n.hide||!1,n.colGroup||n.colspan>1){var o=0;layui.each(i.cols[e+1],function(t,i){i.HAS_PARENT||o>1&&o==n.colspan||(i.HAS_PARENT=!0,i.parentKey=e+"-"+l,o+=parseInt(i.colspan>1?i.colspan:1))}),n.colGroup=!0}t.initOpts(n)})})},H.prototype.renderToolbar=function(){var e=this,a=e.config,l=['<div class="layui-inline" lay-event="add"><i class="layui-icon layui-icon-add-1"></i></div>','<div class="layui-inline" lay-event="update"><i class="layui-icon layui-icon-edit"></i></div>','<div class="layui-inline" lay-event="delete"><i class="layui-icon layui-icon-delete"></i></div>'].join(""),n=e.layTool.find(".layui-table-tool-temp");if("default"===a.toolbar)n.html(l);else if("string"==typeof a.toolbar){var o=t(a.toolbar).html()||"";o&&n.html(i(o).render(a))}var r={filter:{title:"\u7b5b\u9009\u5217",layEvent:"LAYTABLE_COLS",icon:"layui-icon-cols"},exports:{title:"\u5bfc\u51fa",layEvent:"LAYTABLE_EXPORT",icon:"layui-icon-export"},print:{title:"\u6253\u5370",layEvent:"LAYTABLE_PRINT",icon:"layui-icon-print"}},c=[];"object"==typeof a.defaultToolbar&&layui.each(a.defaultToolbar,function(e,t){var i="string"==typeof t?r[t]:t;i&&c.push('<div class="layui-inline" title="'+i.title+'" lay-event="'+i.layEvent+'"><i class="layui-icon '+i.icon+'"></i></div>')}),e.layTool.find(".layui-table-tool-self").html(c.join(""))},H.prototype.setParentCol=function(e,t){var i=this,a=i.config,l=i.layHeader.find('th[data-key="'+a.index+"-"+t+'"]'),n=parseInt(l.attr("colspan"))||0;if(l[0]){var o=t.split("-"),r=a.cols[o[0]][o[1]];e?n--:n++,l.attr("colspan",n),l[n<1?"addClass":"removeClass"](p),r.colspan=n,r.hide=n<1;var c=l.data("parentkey");c&&i.setParentCol(e,c)}},H.prototype.setColsPatch=function(){var e=this,t=e.config;layui.each(t.cols,function(t,i){layui.each(i,function(t,i){i.hide&&e.setParentCol(i.hide,i.parentKey)})})},H.prototype.setColsWidth=function(){var e=this,t=e.config,i=0,a=0,l=0,n=0,o=e.setInit("width");e.eachCols(function(e,t){t.hide||i++}),o=o-function(){return"line"===t.skin||"nob"===t.skin?2:i+1}()-e.getScrollWidth(e.layMain[0])-1;var r=function(e){layui.each(t.cols,function(i,r){layui.each(r,function(i,c){var d=0,s=c.minWidth||t.cellMinWidth;return c?void(c.colGroup||c.hide||(e?l&&l<s&&(a--,d=s):(d=c.width||0,/\d+%$/.test(d)?(d=Math.floor(parseFloat(d)/100*o),d<s&&(d=s)):d||(c.width=d=0,a++)),c.hide&&(d=0),n+=d)):void r.splice(i,1)})}),o>n&&a&&(l=(o-n)/a)};r(),r(!0),e.autoColNums=a,e.eachCols(function(i,a){var n=a.minWidth||t.cellMinWidth;a.colGroup||a.hide||(0===a.width?e.getCssRule(t.index+"-"+a.key,function(e){e.style.width=Math.floor(l>=n?l:n)+"px"}):/\d+%$/.test(a.width)&&e.getCssRule(t.index+"-"+a.key,function(e){e.style.width=Math.floor(parseFloat(a.width)/100*o)+"px"}))});var c=e.layMain.width()-e.getScrollWidth(e.layMain[0])-e.layMain.children("table").outerWidth();if(e.autoColNums&&c>=-i&&c<=i){var d=function(t){var i;return t=t||e.layHeader.eq(0).find("thead th:last-child"),i=t.data("field"),!i&&t.prev()[0]?d(t.prev()):t},s=d(),u=s.data("key");e.getCssRule(u,function(t){var i=t.style.width||s.outerWidth();t.style.width=parseFloat(i)+c+"px",e.layMain.height()-e.layMain.prop("clientHeight")>0&&(t.style.width=parseFloat(t.style.width)-1+"px")})}e.loading(!0)},H.prototype.resize=function(){var e=this;e.fullSize(),e.setColsWidth(),e.scrollPatch()},H.prototype.reload=function(e,i){var a=this;e=e||{},delete a.haveInit,layui.each(e,function(e,t){"array"===layui._typeof(t)&&delete a.config[e]}),a.config=t.extend(i,{},a.config,e),a.render()},H.prototype.errorView=function(e){var i=this,a=i.layMain.find("."+v),l=t('<div class="'+v+'">'+(e||"Error")+"</div>");a[0]&&(i.layNone.remove(),a.remove()),i.layFixed.addClass(p),i.layMain.find("tbody").html(""),i.layMain.append(i.layNone=l),d.cache[i.key]=[]},H.prototype.page=1,H.prototype.pullData=function(e){var i=this,a=i.config,l=a.request,n=a.response,o=function(){"object"==typeof a.initSort&&i.sort(a.initSort.field,a.initSort.type)};if(i.startTime=(new Date).getTime(),a.url){var r={};r[l.pageName]=e,r[l.limitName]=a.limit;var c=t.extend(r,a.where);a.contentType&&0==a.contentType.indexOf("application/json")&&(c=JSON.stringify(c)),i.loading(),t.ajax({type:a.method||"get",url:a.url,contentType:a.contentType,data:c,dataType:"json",headers:a.headers||{},success:function(t){"function"==typeof a.parseData&&(t=a.parseData(t)||t),t[n.statusName]!=n.statusCode?(i.renderForm(),i.errorView(t[n.msgName]||'\u8fd4\u56de\u7684\u6570\u636e\u4e0d\u7b26\u5408\u89c4\u8303\uff0c\u6b63\u786e\u7684\u6210\u529f\u72b6\u6001\u7801\u5e94\u4e3a\uff1a"'+n.statusName+'": '+n.statusCode)):(i.renderData(t,e,t[n.countName]),o(),a.time=(new Date).getTime()-i.startTime+" ms"),i.setColsWidth(),"function"==typeof a.done&&a.done(t,e,t[n.countName])},error:function(e,t){i.errorView("\u8bf7\u6c42\u5f02\u5e38\uff0c\u9519\u8bef\u63d0\u793a\uff1a"+t),i.renderForm(),i.setColsWidth(),"function"==typeof a.error&&a.error(e,t)}})}else if("array"===layui._typeof(a.data)){var d={},s=e*a.limit-a.limit;d[n.dataName]=a.data.concat().splice(s,a.limit),d[n.countName]=a.data.length,"object"==typeof a.totalRow&&(d[n.totalRowName]=t.extend({},a.totalRow)),i.renderData(d,e,d[n.countName]),o(),i.setColsWidth(),"function"==typeof a.done&&a.done(d,e,d[n.countName])}},H.prototype.eachCols=function(e){var t=this;return d.eachCols(null,e,t.config.cols),t},H.prototype.renderData=function(e,n,o,r){var c=this,s=c.config,u=e[s.response.dataName]||[],h=e[s.response.totalRowName],f=[],m=[],g=[],b=function(){var e;return!r&&c.sortKey?c.sort(c.sortKey.field,c.sortKey.sort,!0):(layui.each(u,function(a,l){var o=[],u=[],h=[],v=a+s.limit*(n-1)+1;"array"===layui._typeof(l)&&0===l.length||(r||(l[d.config.indexName]=a),c.eachCols(function(n,r){var f=r.field||n,m=s.index+"-"+r.key,g=l[f];if(void 0!==g&&null!==g||(g=""),!r.colGroup){var b=['<td data-field="'+f+'" data-key="'+m+'" '+function(){var e=[];return r.edit&&e.push('data-edit="'+r.edit+'"'),r.align&&e.push('align="'+r.align+'"'),r.templet&&e.push('data-content="'+g+'"'),r.toolbar&&e.push('data-off="true"'),r.event&&e.push('lay-event="'+r.event+'"'),r.style&&e.push('style="'+r.style+'"'),r.minWidth&&e.push('data-minwidth="'+r.minWidth+'"'),e.join(" ")}()+' class="'+function(){var e=[];return r.hide&&e.push(p),r.field||e.push("layui-table-col-special"),e.join(" ")}()+'">','<div class="layui-table-cell laytable-cell-'+function(){return"normal"===r.type?m:m+" laytable-cell-"+r.type}()+'">'+function(){var n=t.extend(!0,{LAY_INDEX:v,LAY_COL:r},l),o=d.config.checkName;switch(r.type){case"checkbox":return'<input type="checkbox" name="layTableCheckbox" lay-skin="primary" '+function(){return r[o]?(l[o]=r[o],r[o]?"checked":""):n[o]?"checked":""}()+">";case"radio":return n[o]&&(e=a),'<input type="radio" name="layTableRadio_'+s.index+'" '+(n[o]?"checked":"")+' lay-type="layTableRadio">';case"numbers":return v}return r.toolbar?i(t(r.toolbar).html()||"").render(n):y.call(c,r,g,n)}(),"</div></td>"].join("");o.push(b),r.fixed&&"right"!==r.fixed&&u.push(b),"right"===r.fixed&&h.push(b)}}),f.push('<tr data-index="'+a+'">'+o.join("")+"</tr>"),m.push('<tr data-index="'+a+'">'+u.join("")+"</tr>"),g.push('<tr data-index="'+a+'">'+h.join("")+"</tr>"))}),c.layBody.scrollTop(0),c.layMain.find("."+v).remove(),c.layMain.find("tbody").html(f.join("")),c.layFixLeft.find("tbody").html(m.join("")),c.layFixRight.find("tbody").html(g.join("")),c.renderForm(),"number"==typeof e&&c.setThisRowChecked(e),c.syncCheckAll(),c.haveInit?c.scrollPatch():setTimeout(function(){c.scrollPatch()},50),c.haveInit=!0,l.close(c.tipsIndex),s.HAS_SET_COLS_PATCH||c.setColsPatch(),void(s.HAS_SET_COLS_PATCH=!0))};return d.cache[c.key]=u,c.layPage[0==o||0===u.length&&1==n?"addClass":"removeClass"](p),0===u.length?(c.renderForm(),c.errorView(s.text.none)):(c.layFixed.removeClass(p),r?b():(b(),c.renderTotal(u,h),void(s.page&&(s.page=t.extend({elem:"layui-table-page"+s.index,count:o,limit:s.limit,limits:s.limits||[10,20,30,40,50,60,70,80,90],groups:3,layout:["prev","page","next","skip","count","limit"],prev:'<i class="layui-icon">&#xe603;</i>',next:'<i class="layui-icon">&#xe602;</i>',jump:function(e,t){t||(c.page=e.curr,s.limit=e.limit,c.pullData(e.curr))}},s.page),s.page.count=o,a.render(s.page)))))},H.prototype.renderTotal=function(e,a){var l=this,n=l.config,o={};if(n.totalRow){layui.each(e,function(e,t){"array"===layui._typeof(t)&&0===t.length||l.eachCols(function(e,i){var a=i.field||e,l=t[a];i.totalRow&&(o[a]=(o[a]||0)+(parseFloat(l)||0))})}),l.dataTotal={};var r=[];l.eachCols(function(e,c){var d=c.field||e,s=function(){var e,t=c.totalRowText||"",i=parseFloat(o[d]).toFixed(2),n={};return n[d]=i,e=c.totalRow?y.call(l,c,i,n)||t:t,a?a[c.field]||e:e}(),u=['<td data-field="'+d+'" data-key="'+n.index+"-"+c.key+'" '+function(){var e=[];return c.align&&e.push('align="'+c.align+'"'),c.style&&e.push('style="'+c.style+'"'),c.minWidth&&e.push('data-minwidth="'+c.minWidth+'"'),e.join(" ")}()+' class="'+function(){var e=[];return c.hide&&e.push(p),c.field||e.push("layui-table-col-special"),e.join(" ")}()+'">','<div class="layui-table-cell laytable-cell-'+function(){var e=n.index+"-"+c.key;return"normal"===c.type?e:e+" laytable-cell-"+c.type}()+'">'+function(){var e=c.totalRow||n.totalRow;return"string"==typeof e?i(e).render(t.extend({TOTAL_NUMS:s},c)):s}(),"</div></td>"].join("");c.field&&(l.dataTotal[d]=s),r.push(u)}),l.layTotal.find("tbody").html("<tr>"+r.join("")+"</tr>")}},H.prototype.getColElem=function(e,t){var i=this,a=i.config;return e.eq(0).find(".laytable-cell-"+(a.index+"-"+t)+":eq(0)")},H.prototype.renderForm=function(e){n.render(e,"LAY-table-"+this.index)},H.prototype.setThisRowChecked=function(e){var t=this,i=(t.config,"layui-table-click"),a=t.layBody.find('tr[data-index="'+e+'"]');a.addClass(i).siblings("tr").removeClass(i)},H.prototype.sort=function(e,i,a,l){var n,o,c=this,s={},u=c.config,y=u.elem.attr("lay-filter"),f=d.cache[c.key];"string"==typeof e&&(n=e,c.layHeader.find("th").each(function(i,a){var l=t(this),o=l.data("field");if(o===e)return e=l,n=o,!1}));try{var n=n||e.data("field"),p=e.data("key");if(c.sortKey&&!a&&n===c.sortKey.field&&i===c.sortKey.sort)return;var v=c.layHeader.find("th .laytable-cell-"+p).find(A);c.layHeader.find("th").find(A).removeAttr("lay-sort"),v.attr("lay-sort",i||null),c.layFixed.find("th")}catch(m){r.error("Table modules: sort field '"+n+"' not matched")}c.sortKey={field:n,sort:i},u.autoSort&&("asc"===i?o=layui.sort(f,n):"desc"===i?o=layui.sort(f,n,!0):(o=layui.sort(f,d.config.indexName),delete c.sortKey)),s[u.response.dataName]=o||f,c.renderData(s,c.page,c.count,!0),l&&layui.event.call(e,h,"sort("+y+")",{field:n,type:i})},H.prototype.loading=function(e){var i=this,a=i.config;a.loading&&(e?(i.layInit&&i.layInit.remove(),delete i.layInit,i.layBox.find(x).remove()):(i.layInit=t(['<div class="layui-table-init">','<i class="layui-icon layui-icon-loading layui-anim layui-anim-rotate layui-anim-loop"></i>',"</div>"].join("")),i.layBox.append(i.layInit)))},H.prototype.setCheckData=function(e,t){var i=this,a=i.config,l=d.cache[i.key];l[e]&&"array"!==layui._typeof(l[e])&&(l[e][a.checkName]=t)},H.prototype.syncCheckAll=function(){var e=this,t=e.config,i=e.layHeader.find('input[name="layTableCheckbox"]'),a=function(i){return e.eachCols(function(e,a){"checkbox"===a.type&&(a[t.checkName]=i)}),i};i[0]&&(d.checkStatus(e.key).isAll?(i[0].checked||(i.prop("checked",!0),e.renderForm("checkbox")),a(!0)):(i[0].checked&&(i.prop("checked",!1),e.renderForm("checkbox")),a(!1)))},H.prototype.getCssRule=function(e,t){var i=this,a=i.elem.find("style")[0],l=a.sheet||a.styleSheet||{},n=l.cssRules||l.rules;layui.each(n,function(i,a){if(a.selectorText===".laytable-cell-"+e)return t(a),!0})},H.prototype.fullSize=function(){var e,t=this,i=t.config,a=i.height;t.fullHeightGap&&(a=F.height()-t.fullHeightGap,a<135&&(a=135),t.elem.css("height",a)),a&&(e=parseFloat(a)-(t.layHeader.outerHeight()||38),i.toolbar&&(e-=t.layTool.outerHeight()||50),i.totalRow&&(e-=t.layTotal.outerHeight()||40),i.page&&(e-=t.layPage.outerHeight()||41),t.layMain.css("height",e-2))},H.prototype.getScrollWidth=function(e){var t=0;return e?t=e.offsetWidth-e.clientWidth:(e=document.createElement("div"),e.style.width="100px",e.style.height="100px",e.style.overflowY="scroll",document.body.appendChild(e),t=e.offsetWidth-e.clientWidth,document.body.removeChild(e)),t},H.prototype.scrollPatch=function(){var e=this,i=e.layMain.children("table"),a=e.layMain.width()-e.layMain.prop("clientWidth"),l=e.layMain.height()-e.layMain.prop("clientHeight"),n=(e.getScrollWidth(e.layMain[0]),i.outerWidth()-e.layMain.width()),o=function(e){if(a&&l){if(e=e.eq(0),!e.find(".layui-table-patch")[0]){var i=t('<th class="layui-table-patch"><div class="layui-table-cell"></div></th>');i.find("div").css({width:a}),e.find("tr").append(i)}}else e.find(".layui-table-patch").remove()};o(e.layHeader),o(e.layTotal);var r=e.layMain.height(),c=r-l;e.layFixed.find(C).css("height",i.height()>=c?c:"auto"),e.layFixRight[n>0?"removeClass":"addClass"](p),e.layFixRight.css("right",a-1)},H.prototype.events=function(){var e,i=this,a=i.config,o=t("body"),r={},s=i.layHeader.find("th"),u=".layui-table-cell",f=a.elem.attr("lay-filter");i.layTool.on("click","*[lay-event]",function(e){var o=t(this),r=o.attr("lay-event"),s=function(e){var l=t(e.list),n=t('<ul class="layui-table-tool-panel"></ul>');n.html(l),a.height&&n.css("max-height",a.height-(i.layTool.outerHeight()||50)),o.find(".layui-table-tool-panel")[0]||o.append(n),i.renderForm(),n.on("click",function(e){layui.stope(e)}),e.done&&e.done(n,l)};switch(layui.stope(e),I.trigger("table.tool.panel.remove"),l.close(i.tipsIndex),r){case"LAYTABLE_COLS":s({list:function(){var e=[];return i.eachCols(function(t,i){i.field&&"normal"==i.type&&e.push('<li><input type="checkbox" name="'+i.field+'" data-key="'+i.key+'" data-parentkey="'+(i.parentKey||"")+'" lay-skin="primary" '+(i.hide?"":"checked")+' title="'+(i.title||i.field)+'" lay-filter="LAY_TABLE_TOOL_COLS"></li>')}),e.join("")}(),done:function(){n.on("checkbox(LAY_TABLE_TOOL_COLS)",function(e){var l=t(e.elem),n=this.checked,o=l.data("key"),r=l.data("parentkey");layui.each(a.cols,function(e,t){layui.each(t,function(t,l){if(e+"-"+t===o){var c=l.hide;l.hide=!n,i.elem.find('*[data-key="'+a.index+"-"+o+'"]')[n?"removeClass":"addClass"](p),c!=l.hide&&i.setParentCol(!n,r),i.resize()}})})})}});break;case"LAYTABLE_EXPORT":c.ie?l.tips("\u5bfc\u51fa\u529f\u80fd\u4e0d\u652f\u6301 IE\uff0c\u8bf7\u7528 Chrome \u7b49\u9ad8\u7ea7\u6d4f\u89c8\u5668\u5bfc\u51fa",this,{tips:3}):s({list:function(){return['<li data-type="csv">\u5bfc\u51fa\u5230 Csv \u6587\u4ef6</li>','<li data-type="xls">\u5bfc\u51fa\u5230 Excel \u6587\u4ef6</li>'].join("")}(),done:function(e,l){l.on("click",function(){var e=t(this).data("type");d.exportFile.call(i,a.id,null,e)})}});break;case"LAYTABLE_PRINT":var u=window.open("\u6253\u5370\u7a97\u53e3","_blank"),y=["<style>","body{font-size: 12px; color: #666;}","table{width: 100%; border-collapse: collapse; border-spacing: 0;}","th,td{line-height: 20px; padding: 9px 15px; border: 1px solid #ccc; text-align: left; font-size: 12px; color: #666;}","a{color: #666; text-decoration:none;}","*.layui-hide{display: none}","</style>"].join(""),v=t(i.layHeader.html());v.append(i.layMain.find("table").html()),v.append(i.layTotal.find("table").html()),v.find("th.layui-table-patch").remove(),v.find(".layui-table-col-special").remove(),u.document.write(y+v.prop("outerHTML")),u.document.close(),u.print(),u.close()}layui.event.call(this,h,"toolbar("+f+")",t.extend({event:r,config:a},{}))}),s.on("mousemove",function(e){var i=t(this),a=i.offset().left,l=e.clientX-a;i.data("unresize")||r.resizeStart||(r.allowResize=i.width()-l<=10,o.css("cursor",r.allowResize?"col-resize":""))}).on("mouseleave",function(){t(this);r.resizeStart||o.css("cursor","")}).on("mousedown",function(e){var l=t(this);if(r.allowResize){var n=l.data("key");e.preventDefault(),r.resizeStart=!0,r.offset=[e.clientX,e.clientY],i.getCssRule(n,function(e){var t=e.style.width||l.outerWidth();r.rule=e,r.ruleWidth=parseFloat(t),r.minWidth=l.data("minwidth")||a.cellMinWidth})}}),I.on("mousemove",function(t){if(r.resizeStart){if(t.preventDefault(),r.rule){var a=r.ruleWidth+t.clientX-r.offset[0];a<r.minWidth&&(a=r.minWidth),r.rule.style.width=a+"px",l.close(i.tipsIndex)}e=1}}).on("mouseup",function(t){r.resizeStart&&(r={},o.css("cursor",""),i.scrollPatch()),2===e&&(e=null)}),s.on("click",function(a){var l,n=t(this),o=n.find(A),r=o.attr("lay-sort");return o[0]&&1!==e?(l="asc"===r?"desc":"desc"===r?null:"asc",void i.sort(n,l,null,!0)):e=2}).find(A+" .layui-edge ").on("click",function(e){var a=t(this),l=a.index(),n=a.parents("th").eq(0).data("field");layui.stope(e),0===l?i.sort(n,"asc",null,!0):i.sort(n,"desc",null,!0)});var v=function(e){var a=t(this),l=a.parents("tr").eq(0).data("index"),n=i.layBody.find('tr[data-index="'+l+'"]'),o=d.cache[i.key]||[];return o=o[l]||{},t.extend({tr:n,data:d.clearCacheKey(o),del:function(){d.cache[i.key][l]=[],n.remove(),i.scrollPatch()},update:function(e){e=e||{},layui.each(e,function(e,t){if(e in o){var a,l=n.children('td[data-field="'+e+'"]');o[e]=t,i.eachCols(function(t,i){i.field==e&&i.templet&&(a=i.templet)}),l.children(u).html(y.call(i,{templet:a},t,o)),l.data("content",t)}})}},e)};i.elem.on("click",'input[name="layTableCheckbox"]+',function(){var e=t(this).prev(),a=i.layBody.find('input[name="layTableCheckbox"]'),l=e.parents("tr").eq(0).data("index"),n=e[0].checked,o="layTableAllChoose"===e.attr("lay-filter");o?(a.each(function(e,t){t.checked=n,i.setCheckData(e,n)}),i.syncCheckAll(),i.renderForm("checkbox")):(i.setCheckData(l,n),i.syncCheckAll()),layui.event.call(e[0],h,"checkbox("+f+")",v.call(e[0],{checked:n,type:o?"all":"one"}))}),i.elem.on("click",'input[lay-type="layTableRadio"]+',function(){var e=t(this).prev(),l=e[0].checked,n=d.cache[i.key],o=e.parents("tr").eq(0).data("index");layui.each(n,function(e,t){o===e?t[a.checkName]=!0:delete t[a.checkName]}),i.setThisRowChecked(o),layui.event.call(this,h,"radio("+f+")",v.call(this,{checked:l}))}),i.layBody.on("mouseenter","tr",function(){var e=t(this),a=e.index();e.data("off")||i.layBody.find("tr:eq("+a+")").addClass(W)}).on("mouseleave","tr",function(){var e=t(this),a=e.index();e.data("off")||i.layBody.find("tr:eq("+a+")").removeClass(W)}).on("click","tr",function(){m.call(this,"row")}).on("dblclick","tr",function(){m.call(this,"rowDouble")});var m=function(e){var i=t(this);i.data("off")||layui.event.call(this,h,e+"("+f+")",v.call(i.children("td")[0]))};i.layBody.on("change","."+R,function(){var e=t(this),a=this.value,l=e.parent().data("field"),n=e.parents("tr").eq(0).data("index"),o=d.cache[i.key][n];o[l]=a,layui.event.call(this,h,"edit("+f+")",v.call(this,{value:a,field:l}))}).on("blur","."+R,function(){var e,a=t(this),l=this,n=a.parent().data("field"),o=a.parents("tr").eq(0).data("index"),r=d.cache[i.key][o];i.eachCols(function(t,i){i.field==n&&i.templet&&(e=i.templet)}),a.siblings(u).html(function(t){return y.call(i,{templet:e},t,r)}(l.value)),a.parent().data("content",l.value),a.remove()}),i.layBody.on("click","td",function(e){var i=t(this),a=(i.data("field"),i.data("edit")),l=i.children(u);if(!i.data("off")&&a){var n=t('<input class="layui-input '+R+'">');return n[0].value=i.data("content")||l.text(),i.find("."+R)[0]||i.append(n),n.focus(),void layui.stope(e)}}).on("mouseenter","td",function(){b.call(this)}).on("mouseleave","td",function(){b.call(this,"hide")});var g="layui-table-grid-down",b=function(e){var i=t(this),a=i.children(u);if(!i.data("off"))if(e)i.find(".layui-table-grid-down").remove();else if(a.prop("scrollWidth")>a.outerWidth()){if(a.find("."+g)[0])return;i.append('<div class="'+g+'"><i class="layui-icon layui-icon-down"></i></div>')}};i.layBody.on("click","."+g,function(e){var n=t(this),o=n.parent(),r=o.children(u);i.tipsIndex=l.tips(['<div class="layui-table-tips-main" style="margin-top: -'+(r.height()+16)+"px;"+function(){return"sm"===a.size?"padding: 4px 15px; font-size: 12px;":"lg"===a.size?"padding: 14px 15px;":""}()+'">',r.html(),"</div>",'<i class="layui-icon layui-table-tips-c layui-icon-close"></i>'].join(""),r[0],{tips:[3,""],time:-1,anim:-1,maxWidth:c.ios||c.android?300:i.elem.width()/2,isOutAnim:!1,skin:"layui-table-tips",success:function(e,t){e.find(".layui-table-tips-c").on("click",function(){l.close(t)})}}),layui.stope(e)}),i.layBody.on("click","*[lay-event]",function(){var e=t(this),a=e.parents("tr").eq(0).data("index");layui.event.call(this,h,"tool("+f+")",v.call(this,{event:e.attr("lay-event")})),i.setThisRowChecked(a)}),i.layMain.on("scroll",function(){var e=t(this),a=e.scrollLeft(),n=e.scrollTop();i.layHeader.scrollLeft(a),i.layTotal.scrollLeft(a),i.layFixed.find(C).scrollTop(n),l.close(i.tipsIndex)}),F.on("resize",function(){i.resize()})},function(){I.on("click",function(){I.trigger("table.remove.tool.panel")}),I.on("table.remove.tool.panel",function(){t(".layui-table-tool-panel").remove()})}(),d.init=function(e,i){i=i||{};var a=this,l=t(e?'table[lay-filter="'+e+'"]':f+"[lay-data]"),n="Table element property lay-data configuration item has a syntax error: ";return l.each(function(){var a=t(this),l=a.attr("lay-data");try{l=new Function("return "+l)()}catch(o){r.error(n+l,"error")}var c=[],s=t.extend({elem:this,cols:[],data:[],skin:a.attr("lay-skin"),size:a.attr("lay-size"),even:"string"==typeof a.attr("lay-even")},d.config,i,l);e&&a.hide(),a.find("thead>tr").each(function(e){s.cols[e]=[],t(this).children().each(function(i){var a=t(this),l=a.attr("lay-data");try{l=new Function("return "+l)()}catch(o){return r.error(n+l)}var d=t.extend({title:a.text(),colspan:a.attr("colspan")||0,rowspan:a.attr("rowspan")||0},l);d.colspan<2&&c.push(d),s.cols[e].push(d)})}),a.find("tbody>tr").each(function(e){var i=t(this),a={};i.children("td").each(function(e,i){var l=t(this),n=l.data("field");if(n)return a[n]=l.html()}),layui.each(c,function(e,t){var l=i.children("td").eq(e);a[t.field]=l.html()}),s.data[e]=a}),d.render(s)}),a},s.that={},s.config={},d.eachCols=function(e,i,a){var l=s.config[e]||{},n=[],o=0;a=t.extend(!0,[],a||l.cols),layui.each(a,function(e,t){layui.each(t,function(t,i){if(i.colGroup){var l=0;o++,i.CHILD_COLS=[],layui.each(a[e+1],function(e,t){t.PARENT_COL_INDEX||l>1&&l==i.colspan||(t.PARENT_COL_INDEX=o,i.CHILD_COLS.push(t),l+=parseInt(t.colspan>1?t.colspan:1))})}i.PARENT_COL_INDEX||n.push(i)})});var r=function(e){layui.each(e||n,function(e,t){return t.CHILD_COLS?r(t.CHILD_COLS):void("function"==typeof i&&i(e,t))})};r()},d.checkStatus=function(e){var t=0,i=0,a=[],l=d.cache[e]||[];return layui.each(l,function(e,l){return"array"===layui._typeof(l)?void i++:void(l[d.config.checkName]&&(t++,a.push(d.clearCacheKey(l))))}),{data:a,isAll:!!l.length&&t===l.length-i}},d.getData=function(e){var t=[],i=d.cache[e]||[];return layui.each(i,function(e,i){"array"!==layui._typeof(i)&&t.push(d.clearCacheKey(i))}),t},d.exportFile=function(e,t,i){var a=this;t=t||d.clearCacheKey(d.cache[e]),i=i||"csv";var l=s.that[e],n=s.config[e]||{},o={csv:"text/csv",xls:"application/vnd.ms-excel"}[i],u=document.createElement("a");return c.ie?r.error("IE_NOT_SUPPORT_EXPORTS"):(u.href="data:"+o+";charset=utf-8,\ufeff"+encodeURIComponent(function(){var i=[],n=[],o=[];return layui.each(t,function(t,a){var o=[];"object"==typeof e?(layui.each(e,function(e,a){0==t&&i.push(a||"")}),layui.each(d.clearCacheKey(a),function(e,t){o.push('"'+(t||"")+'"')})):d.eachCols(e,function(e,n){if(n.field&&"normal"==n.type&&!n.hide){var r=a[n.field];void 0!==r&&null!==r||(r=""),0==t&&i.push(n.title||""),o.push('"'+y.call(l,n,r,a,"text")+'"')}}),n.push(o.join(","))}),layui.each(a.dataTotal,function(e,t){o.push(t)}),i.join(",")+"\r\n"+n.join("\r\n")+"\r\n"+o.join(",")}()),u.download=(n.title||"table_"+(n.index||""))+"."+i,document.body.appendChild(u),u.click(),void document.body.removeChild(u))},d.resize=function(e){if(e){var t=u(e);if(!t)return;s.that[e].resize()}else layui.each(s.that,function(){
+this.resize()})},d.reload=function(e,t,i){var a=u(e);if(a){var l=s.that[e];return l.reload(t,i),s.call(l)}},d.render=function(e){var t=new H(e);return s.call(t)},d.clearCacheKey=function(e){return e=t.extend({},e),delete e[d.config.checkName],delete e[d.config.indexName],e},t(function(){d.init()}),e(h,d)});layui.define("jquery",function(e){"use strict";var i=layui.$,n=(layui.hint(),layui.device(),{config:{},set:function(e){var n=this;return n.config=i.extend({},n.config,e),n},on:function(e,i){return layui.onevent.call(this,t,e,i)}}),t="carousel",a="layui-this",l=">*[carousel-item]>*",o="layui-carousel-left",r="layui-carousel-right",d="layui-carousel-prev",s="layui-carousel-next",u="layui-carousel-arrow",c="layui-carousel-ind",m=function(e){var t=this;t.config=i.extend({},t.config,n.config,e),t.render()};m.prototype.config={width:"600px",height:"280px",full:!1,arrow:"hover",indicator:"inside",autoplay:!0,interval:3e3,anim:"",trigger:"click",index:0},m.prototype.render=function(){var e=this,n=e.config;n.elem=i(n.elem),n.elem[0]&&(e.elemItem=n.elem.find(l),n.index<0&&(n.index=0),n.index>=e.elemItem.length&&(n.index=e.elemItem.length-1),n.interval<800&&(n.interval=800),n.full?n.elem.css({position:"fixed",width:"100%",height:"100%",zIndex:9999}):n.elem.css({width:n.width,height:n.height}),n.elem.attr("lay-anim",n.anim),e.elemItem.eq(n.index).addClass(a),e.elemItem.length<=1||(e.indicator(),e.arrow(),e.autoplay(),e.events()))},m.prototype.reload=function(e){var n=this;clearInterval(n.timer),n.config=i.extend({},n.config,e),n.render()},m.prototype.prevIndex=function(){var e=this,i=e.config,n=i.index-1;return n<0&&(n=e.elemItem.length-1),n},m.prototype.nextIndex=function(){var e=this,i=e.config,n=i.index+1;return n>=e.elemItem.length&&(n=0),n},m.prototype.addIndex=function(e){var i=this,n=i.config;e=e||1,n.index=n.index+e,n.index>=i.elemItem.length&&(n.index=0)},m.prototype.subIndex=function(e){var i=this,n=i.config;e=e||1,n.index=n.index-e,n.index<0&&(n.index=i.elemItem.length-1)},m.prototype.autoplay=function(){var e=this,i=e.config;i.autoplay&&(clearInterval(e.timer),e.timer=setInterval(function(){e.slide()},i.interval))},m.prototype.arrow=function(){var e=this,n=e.config,t=i(['<button class="layui-icon '+u+'" lay-type="sub">'+("updown"===n.anim?"&#xe619;":"&#xe603;")+"</button>",'<button class="layui-icon '+u+'" lay-type="add">'+("updown"===n.anim?"&#xe61a;":"&#xe602;")+"</button>"].join(""));n.elem.attr("lay-arrow",n.arrow),n.elem.find("."+u)[0]&&n.elem.find("."+u).remove(),n.elem.append(t),t.on("click",function(){var n=i(this),t=n.attr("lay-type");e.slide(t)})},m.prototype.indicator=function(){var e=this,n=e.config,t=e.elemInd=i(['<div class="'+c+'"><ul>',function(){var i=[];return layui.each(e.elemItem,function(e){i.push("<li"+(n.index===e?' class="layui-this"':"")+"></li>")}),i.join("")}(),"</ul></div>"].join(""));n.elem.attr("lay-indicator",n.indicator),n.elem.find("."+c)[0]&&n.elem.find("."+c).remove(),n.elem.append(t),"updown"===n.anim&&t.css("margin-top",-(t.height()/2)),t.find("li").on("hover"===n.trigger?"mouseover":n.trigger,function(){var t=i(this),a=t.index();a>n.index?e.slide("add",a-n.index):a<n.index&&e.slide("sub",n.index-a)})},m.prototype.slide=function(e,i){var n=this,l=n.elemItem,u=n.config,c=u.index,m=u.elem.attr("lay-filter");n.haveSlide||("sub"===e?(n.subIndex(i),l.eq(u.index).addClass(d),setTimeout(function(){l.eq(c).addClass(r),l.eq(u.index).addClass(r)},50)):(n.addIndex(i),l.eq(u.index).addClass(s),setTimeout(function(){l.eq(c).addClass(o),l.eq(u.index).addClass(o)},50)),setTimeout(function(){l.removeClass(a+" "+d+" "+s+" "+o+" "+r),l.eq(u.index).addClass(a),n.haveSlide=!1},300),n.elemInd.find("li").eq(u.index).addClass(a).siblings().removeClass(a),n.haveSlide=!0,layui.event.call(this,t,"change("+m+")",{index:u.index,prevIndex:c,item:l.eq(u.index)}))},m.prototype.events=function(){var e=this,i=e.config;i.elem.data("haveEvents")||(i.elem.on("mouseenter",function(){clearInterval(e.timer)}).on("mouseleave",function(){e.autoplay()}),i.elem.data("haveEvents",!0))},n.render=function(e){var i=new m(e);return i},e(t,n)});layui.define("jquery",function(e){"use strict";var a=layui.jquery,l={config:{},index:layui.rate?layui.rate.index+1e4:0,set:function(e){var l=this;return l.config=a.extend({},l.config,e),l},on:function(e,a){return layui.onevent.call(this,n,e,a)}},i=function(){var e=this,a=e.config;return{setvalue:function(a){e.setvalue.call(e,a)},config:a}},n="rate",t="layui-rate",o="layui-icon-rate",u="layui-icon-rate-solid",s="layui-icon-rate-half",r="layui-icon-rate-solid layui-icon-rate-half",c="layui-icon-rate-solid layui-icon-rate",f="layui-icon-rate layui-icon-rate-half",v=function(e){var i=this;i.index=++l.index,i.config=a.extend({},i.config,l.config,e),i.render()};v.prototype.config={length:5,text:!1,readonly:!1,half:!1,value:0,theme:""},v.prototype.render=function(){var e=this,l=e.config,i=l.theme?'style="color: '+l.theme+';"':"";l.elem=a(l.elem),l.value>l.length&&(l.value=l.length),parseInt(l.value)!==l.value&&(l.half||(l.value=Math.ceil(l.value)-l.value<.5?Math.ceil(l.value):Math.floor(l.value)));for(var n='<ul class="layui-rate" '+(l.readonly?"readonly":"")+">",s=1;s<=l.length;s++){var r='<li class="layui-inline"><i class="layui-icon '+(s>Math.floor(l.value)?o:u)+'" '+i+"></i></li>";l.half&&parseInt(l.value)!==l.value&&s==Math.ceil(l.value)?n=n+'<li><i class="layui-icon layui-icon-rate-half" '+i+"></i></li>":n+=r}n+="</ul>"+(l.text?'<span class="layui-inline">'+l.value+"\u661f":"")+"</span>";var c=l.elem,f=c.next("."+t);f[0]&&f.remove(),e.elemTemp=a(n),l.span=e.elemTemp.next("span"),l.setText&&l.setText(l.value),c.html(e.elemTemp),c.addClass("layui-inline"),l.readonly||e.action()},v.prototype.setvalue=function(e){var a=this,l=a.config;l.value=e,a.render()},v.prototype.action=function(){var e=this,l=e.config,i=e.elemTemp,n=i.find("i").width();i.children("li").each(function(e){var t=e+1,v=a(this);v.on("click",function(e){if(l.value=t,l.half){var o=e.pageX-a(this).offset().left;o<=n/2&&(l.value=l.value-.5)}l.text&&i.next("span").text(l.value+"\u661f"),l.choose&&l.choose(l.value),l.setText&&l.setText(l.value)}),v.on("mousemove",function(e){if(i.find("i").each(function(){a(this).addClass(o).removeClass(r)}),i.find("i:lt("+t+")").each(function(){a(this).addClass(u).removeClass(f)}),l.half){var c=e.pageX-a(this).offset().left;c<=n/2&&v.children("i").addClass(s).removeClass(u)}}),v.on("mouseleave",function(){i.find("i").each(function(){a(this).addClass(o).removeClass(r)}),i.find("i:lt("+Math.floor(l.value)+")").each(function(){a(this).addClass(u).removeClass(f)}),l.half&&parseInt(l.value)!==l.value&&i.children("li:eq("+Math.floor(l.value)+")").children("i").addClass(s).removeClass(c)})})},v.prototype.events=function(){var e=this;e.config},l.render=function(e){var a=new v(e);return i.call(a)},e(n,l)});layui.define("jquery",function(e){"use strict";var l=layui.$,o=function(e){},t='<i class="layui-anim layui-anim-rotate layui-anim-loop layui-icon ">&#xe63e;</i>';o.prototype.load=function(e){var o,i,n,r,a=this,c=0;e=e||{};var m=l(e.elem);if(m[0]){var f=l(e.scrollElem||document),u=e.mb||50,s=!("isAuto"in e)||e.isAuto,y=e.end||"\u6ca1\u6709\u66f4\u591a\u4e86",v=e.scrollElem&&e.scrollElem!==document,d="<cite>\u52a0\u8f7d\u66f4\u591a</cite>",h=l('<div class="layui-flow-more"><a href="javascript:;">'+d+"</a></div>");m.find(".layui-flow-more")[0]||m.append(h);var p=function(e,t){e=l(e),h.before(e),t=0==t||null,t?h.html(y):h.find("a").html(d),i=t,o=null,n&&n()},g=function(){o=!0,h.find("a").html(t),"function"==typeof e.done&&e.done(++c,p)};if(g(),h.find("a").on("click",function(){l(this);i||o||g()}),e.isLazyimg)var n=a.lazyimg({elem:e.elem+" img",scrollElem:e.scrollElem});return s?(f.on("scroll",function(){var e=l(this),t=e.scrollTop();r&&clearTimeout(r),!i&&m.width()&&(r=setTimeout(function(){var i=v?e.height():l(window).height(),n=v?e.prop("scrollHeight"):document.documentElement.scrollHeight;n-t-i<=u&&(o||g())},100))}),a):a}},o.prototype.lazyimg=function(e){var o,t=this,i=0;e=e||{};var n=l(e.scrollElem||document),r=e.elem||"img",a=e.scrollElem&&e.scrollElem!==document,c=function(e,l){var o=n.scrollTop(),r=o+l,c=a?function(){return e.offset().top-n.offset().top+o}():e.offset().top;if(c>=o&&c<=r&&e.attr("lay-src")){var f=e.attr("lay-src");layui.img(f,function(){var l=t.lazyimg.elem.eq(i);e.attr("src",f).removeAttr("lay-src"),l[0]&&m(l),i++},function(){t.lazyimg.elem.eq(i);e.removeAttr("lay-src")})}},m=function(e,o){var m=a?(o||n).height():l(window).height(),f=n.scrollTop(),u=f+m;if(t.lazyimg.elem=l(r),e)c(e,m);else for(var s=0;s<t.lazyimg.elem.length;s++){var y=t.lazyimg.elem.eq(s),v=a?function(){return y.offset().top-n.offset().top+f}():y.offset().top;if(c(y,m),i=s,v>u)break}};if(m(),!o){var f;n.on("scroll",function(){var e=l(this);f&&clearTimeout(f),f=setTimeout(function(){m(null,e)},50)}),o=!0}return m},e("flow",new o)});layui.define(["layer","form"],function(t){"use strict";var e=layui.$,i=layui.layer,a=layui.form,l=(layui.hint(),layui.device()),n="layedit",o="layui-show",r="layui-disabled",c=function(){var t=this;t.index=0,t.config={tool:["strong","italic","underline","del","|","left","center","right","|","link","unlink","face","image"],hideTool:[],height:280}};c.prototype.set=function(t){var i=this;return e.extend(!0,i.config,t),i},c.prototype.on=function(t,e){return layui.onevent(n,t,e)},c.prototype.build=function(t,i){i=i||{};var a=this,n=a.config,r="layui-layedit",c=e("string"==typeof t?"#"+t:t),u="LAY_layedit_"+ ++a.index,d=c.next("."+r),y=e.extend({},n,i),f=function(){var t=[],e={};return layui.each(y.hideTool,function(t,i){e[i]=!0}),layui.each(y.tool,function(i,a){C[a]&&!e[a]&&t.push(C[a])}),t.join("")}(),m=e(['<div class="'+r+'">','<div class="layui-unselect layui-layedit-tool">'+f+"</div>",'<div class="layui-layedit-iframe">','<iframe id="'+u+'" name="'+u+'" textarea="'+t+'" frameborder="0"></iframe>',"</div>","</div>"].join(""));return l.ie&&l.ie<8?c.removeClass("layui-hide").addClass(o):(d[0]&&d.remove(),s.call(a,m,c[0],y),c.addClass("layui-hide").after(m),a.index)},c.prototype.getContent=function(t){var e=u(t);if(e[0])return d(e[0].document.body.innerHTML)},c.prototype.getText=function(t){var i=u(t);if(i[0])return e(i[0].document.body).text()},c.prototype.setContent=function(t,i,a){var l=u(t);l[0]&&(a?e(l[0].document.body).append(i):e(l[0].document.body).html(i),layedit.sync(t))},c.prototype.sync=function(t){var i=u(t);if(i[0]){var a=e("#"+i[1].attr("textarea"));a.val(d(i[0].document.body.innerHTML))}},c.prototype.getSelection=function(t){var e=u(t);if(e[0]){var i=m(e[0].document);return document.selection?i.text:i.toString()}};var s=function(t,i,a){var l=this,n=t.find("iframe");n.css({height:a.height}).on("load",function(){var o=n.contents(),r=n.prop("contentWindow"),c=o.find("head"),s=e(["<style>","*{margin: 0; padding: 0;}","body{padding: 10px; line-height: 20px; overflow-x: hidden; word-wrap: break-word; font: 14px Helvetica Neue,Helvetica,PingFang SC,Microsoft YaHei,Tahoma,Arial,sans-serif; -webkit-box-sizing: border-box !important; -moz-box-sizing: border-box !important; box-sizing: border-box !important;}","a{color:#01AAED; text-decoration:none;}a:hover{color:#c00}","p{margin-bottom: 10px;}","img{display: inline-block; border: none; vertical-align: middle;}","pre{margin: 10px 0; padding: 10px; line-height: 20px; border: 1px solid #ddd; border-left-width: 6px; background-color: #F2F2F2; color: #333; font-family: Courier New; font-size: 12px;}","</style>"].join("")),u=o.find("body");c.append(s),u.attr("contenteditable","true").css({"min-height":a.height}).html(i.value||""),y.apply(l,[r,n,i,a]),g.call(l,r,t,a)})},u=function(t){var i=e("#LAY_layedit_"+t),a=i.prop("contentWindow");return[a,i]},d=function(t){return 8==l.ie&&(t=t.replace(/<.+>/g,function(t){return t.toLowerCase()})),t},y=function(t,a,n,o){var r=t.document,c=e(r.body);c.on("keydown",function(t){var e=t.keyCode;if(13===e){var a=m(r),l=p(a),n=l.parentNode;if("pre"===n.tagName.toLowerCase()){if(t.shiftKey)return;return i.msg("\u8bf7\u6682\u65f6\u7528shift+enter"),!1}r.execCommand("formatBlock",!1,"<p>")}}),e(n).parents("form").on("submit",function(){var t=c.html();8==l.ie&&(t=t.replace(/<.+>/g,function(t){return t.toLowerCase()})),n.value=t}),c.on("paste",function(e){r.execCommand("formatBlock",!1,"<p>"),setTimeout(function(){f.call(t,c),n.value=c.html()},100)})},f=function(t){var i=this;i.document;t.find("*[style]").each(function(){var t=this.style.textAlign;this.removeAttribute("style"),e(this).css({"text-align":t||""})}),t.find("table").addClass("layui-table"),t.find("script,link").remove()},m=function(t){return t.selection?t.selection.createRange():t.getSelection().getRangeAt(0)},p=function(t){return t.endContainer||t.parentElement().childNodes[0]},v=function(t,i,a){var l=this.document,n=document.createElement(t);for(var o in i)n.setAttribute(o,i[o]);if(n.removeAttribute("text"),l.selection){var r=a.text||i.text;if("a"===t&&!r)return;r&&(n.innerHTML=r),a.pasteHTML(e(n).prop("outerHTML")),a.select()}else{var r=a.toString()||i.text;if("a"===t&&!r)return;r&&(n.innerHTML=r),a.deleteContents(),a.insertNode(n)}},h=function(t,i){var a=this.document,l="layedit-tool-active",n=p(m(a)),o=function(e){return t.find(".layedit-tool-"+e)};i&&i[i.hasClass(l)?"removeClass":"addClass"](l),t.find(">i").removeClass(l),o("unlink").addClass(r),e(n).parents().each(function(){var t=this.tagName.toLowerCase(),e=this.style.textAlign;"b"!==t&&"strong"!==t||o("b").addClass(l),"i"!==t&&"em"!==t||o("i").addClass(l),"u"===t&&o("u").addClass(l),"strike"===t&&o("d").addClass(l),"p"===t&&("center"===e?o("center").addClass(l):"right"===e?o("right").addClass(l):o("left").addClass(l)),"a"===t&&(o("link").addClass(l),o("unlink").removeClass(r))})},g=function(t,a,l){var n=t.document,o=e(n.body),c={link:function(i){var a=p(i),l=e(a).parent();b.call(o,{href:l.attr("href"),target:l.attr("target")},function(e){var a=l[0];"A"===a.tagName?a.href=e.url:v.call(t,"a",{target:e.target,href:e.url,text:e.url},i)})},unlink:function(t){n.execCommand("unlink")},face:function(e){x.call(this,function(i){v.call(t,"img",{src:i.src,alt:i.alt},e)})},image:function(a){var n=this;layui.use("upload",function(o){var r=l.uploadImage||{};o.render({url:r.url,method:r.type,elem:e(n).find("input")[0],done:function(e){0==e.code?(e.data=e.data||{},v.call(t,"img",{src:e.data.src,alt:e.data.title},a)):i.msg(e.msg||"\u4e0a\u4f20\u5931\u8d25")}})})},code:function(e){k.call(o,function(i){v.call(t,"pre",{text:i.code,"lay-lang":i.lang},e)})},help:function(){i.open({type:2,title:"\u5e2e\u52a9",area:["600px","380px"],shadeClose:!0,shade:.1,skin:"layui-layer-msg",content:["","no"]})}},s=a.find(".layui-layedit-tool"),u=function(){var i=e(this),a=i.attr("layedit-event"),l=i.attr("lay-command");if(!i.hasClass(r)){o.focus();var u=m(n);u.commonAncestorContainer;l?(n.execCommand(l),/justifyLeft|justifyCenter|justifyRight/.test(l)&&n.execCommand("formatBlock",!1,"<p>"),setTimeout(function(){o.focus()},10)):c[a]&&c[a].call(this,u),h.call(t,s,i)}},d=/image/;s.find(">i").on("mousedown",function(){var t=e(this),i=t.attr("layedit-event");d.test(i)||u.call(this)}).on("click",function(){var t=e(this),i=t.attr("layedit-event");d.test(i)&&u.call(this)}),o.on("click",function(){h.call(t,s),i.close(x.index)})},b=function(t,e){var l=this,n=i.open({type:1,id:"LAY_layedit_link",area:"350px",shade:.05,shadeClose:!0,moveType:1,title:"\u8d85\u94fe\u63a5",skin:"layui-layer-msg",content:['<ul class="layui-form" style="margin: 15px;">','<li class="layui-form-item">','<label class="layui-form-label" style="width: 60px;">URL</label>','<div class="layui-input-block" style="margin-left: 90px">','<input name="url" lay-verify="url" value="'+(t.href||"")+'" autofocus="true" autocomplete="off" class="layui-input">',"</div>","</li>",'<li class="layui-form-item">','<label class="layui-form-label" style="width: 60px;">\u6253\u5f00\u65b9\u5f0f</label>','<div class="layui-input-block" style="margin-left: 90px">','<input type="radio" name="target" value="_self" class="layui-input" title="\u5f53\u524d\u7a97\u53e3"'+("_self"!==t.target&&t.target?"":"checked")+">",'<input type="radio" name="target" value="_blank" class="layui-input" title="\u65b0\u7a97\u53e3" '+("_blank"===t.target?"checked":"")+">","</div>","</li>",'<li class="layui-form-item" style="text-align: center;">','<button type="button" lay-submit lay-filter="layedit-link-yes" class="layui-btn"> \u786e\u5b9a </button>','<button style="margin-left: 20px;" type="button" class="layui-btn layui-btn-primary"> \u53d6\u6d88 </button>',"</li>","</ul>"].join(""),success:function(t,n){var o="submit(layedit-link-yes)";a.render("radio"),t.find(".layui-btn-primary").on("click",function(){i.close(n),l.focus()}),a.on(o,function(t){i.close(b.index),e&&e(t.field)})}});b.index=n},x=function(t){var a=function(){var t=["[\u5fae\u7b11]","[\u563b\u563b]","[\u54c8\u54c8]","[\u53ef\u7231]","[\u53ef\u601c]","[\u6316\u9f3b]","[\u5403\u60ca]","[\u5bb3\u7f9e]","[\u6324\u773c]","[\u95ed\u5634]","[\u9119\u89c6]","[\u7231\u4f60]","[\u6cea]","[\u5077\u7b11]","[\u4eb2\u4eb2]","[\u751f\u75c5]","[\u592a\u5f00\u5fc3]","[\u767d\u773c]","[\u53f3\u54fc\u54fc]","[\u5de6\u54fc\u54fc]","[\u5618]","[\u8870]","[\u59d4\u5c48]","[\u5410]","[\u54c8\u6b20]","[\u62b1\u62b1]","[\u6012]","[\u7591\u95ee]","[\u998b\u5634]","[\u62dc\u62dc]","[\u601d\u8003]","[\u6c57]","[\u56f0]","[\u7761]","[\u94b1]","[\u5931\u671b]","[\u9177]","[\u8272]","[\u54fc]","[\u9f13\u638c]","[\u6655]","[\u60b2\u4f24]","[\u6293\u72c2]","[\u9ed1\u7ebf]","[\u9634\u9669]","[\u6012\u9a82]","[\u4e92\u7c89]","[\u5fc3]","[\u4f24\u5fc3]","[\u732a\u5934]","[\u718a\u732b]","[\u5154\u5b50]","[ok]","[\u8036]","[good]","[NO]","[\u8d5e]","[\u6765]","[\u5f31]","[\u8349\u6ce5\u9a6c]","[\u795e\u9a6c]","[\u56e7]","[\u6d6e\u4e91]","[\u7ed9\u529b]","[\u56f4\u89c2]","[\u5a01\u6b66]","[\u5965\u7279\u66fc]","[\u793c\u7269]","[\u949f]","[\u8bdd\u7b52]","[\u8721\u70db]","[\u86cb\u7cd5]"],e={};return layui.each(t,function(t,i){e[i]=layui.cache.dir+"images/face/"+t+".gif"}),e}();return x.hide=x.hide||function(t){"face"!==e(t.target).attr("layedit-event")&&i.close(x.index)},x.index=i.tips(function(){var t=[];return layui.each(a,function(e,i){t.push('<li title="'+e+'"><img src="'+i+'" alt="'+e+'"></li>')}),'<ul class="layui-clear">'+t.join("")+"</ul>"}(),this,{tips:1,time:0,skin:"layui-box layui-util-face",maxWidth:500,success:function(l,n){l.css({marginTop:-4,marginLeft:-10}).find(".layui-clear>li").on("click",function(){t&&t({src:a[this.title],alt:this.title}),i.close(n)}),e(document).off("click",x.hide).on("click",x.hide)}})},k=function(t){var e=this,l=i.open({type:1,id:"LAY_layedit_code",area:"550px",shade:.05,shadeClose:!0,moveType:1,title:"\u63d2\u5165\u4ee3\u7801",skin:"layui-layer-msg",content:['<ul class="layui-form layui-form-pane" style="margin: 15px;">','<li class="layui-form-item">','<label class="layui-form-label">\u8bf7\u9009\u62e9\u8bed\u8a00</label>','<div class="layui-input-block">','<select name="lang">','<option value="JavaScript">JavaScript</option>','<option value="HTML">HTML</option>','<option value="CSS">CSS</option>','<option value="Java">Java</option>','<option value="PHP">PHP</option>','<option value="C#">C#</option>','<option value="Python">Python</option>','<option value="Ruby">Ruby</option>','<option value="Go">Go</option>',"</select>","</div>","</li>",'<li class="layui-form-item layui-form-text">','<label class="layui-form-label">\u4ee3\u7801</label>','<div class="layui-input-block">','<textarea name="code" lay-verify="required" autofocus="true" class="layui-textarea" style="height: 200px;"></textarea>',"</div>","</li>",'<li class="layui-form-item" style="text-align: center;">','<button type="button" lay-submit lay-filter="layedit-code-yes" class="layui-btn"> \u786e\u5b9a </button>','<button style="margin-left: 20px;" type="button" class="layui-btn layui-btn-primary"> \u53d6\u6d88 </button>',"</li>","</ul>"].join(""),success:function(l,n){var o="submit(layedit-code-yes)";a.render("select"),l.find(".layui-btn-primary").on("click",function(){i.close(n),e.focus()}),a.on(o,function(e){i.close(k.index),t&&t(e.field)})}});k.index=l},C={html:'<i class="layui-icon layedit-tool-html" title="HTML\u6e90\u4ee3\u7801" lay-command="html" layedit-event="html"">&#xe64b;</i><span class="layedit-tool-mid"></span>',strong:'<i class="layui-icon layedit-tool-b" title="\u52a0\u7c97" lay-command="Bold" layedit-event="b"">&#xe62b;</i>',italic:'<i class="layui-icon layedit-tool-i" title="\u659c\u4f53" lay-command="italic" layedit-event="i"">&#xe644;</i>',underline:'<i class="layui-icon layedit-tool-u" title="\u4e0b\u5212\u7ebf" lay-command="underline" layedit-event="u"">&#xe646;</i>',del:'<i class="layui-icon layedit-tool-d" title="\u5220\u9664\u7ebf" lay-command="strikeThrough" layedit-event="d"">&#xe64f;</i>',"|":'<span class="layedit-tool-mid"></span>',left:'<i class="layui-icon layedit-tool-left" title="\u5de6\u5bf9\u9f50" lay-command="justifyLeft" layedit-event="left"">&#xe649;</i>',center:'<i class="layui-icon layedit-tool-center" title="\u5c45\u4e2d\u5bf9\u9f50" lay-command="justifyCenter" layedit-event="center"">&#xe647;</i>',right:'<i class="layui-icon layedit-tool-right" title="\u53f3\u5bf9\u9f50" lay-command="justifyRight" layedit-event="right"">&#xe648;</i>',link:'<i class="layui-icon layedit-tool-link" title="\u63d2\u5165\u94fe\u63a5" layedit-event="link"">&#xe64c;</i>',unlink:'<i class="layui-icon layedit-tool-unlink layui-disabled" title="\u6e05\u9664\u94fe\u63a5" lay-command="unlink" layedit-event="unlink"">&#xe64d;</i>',face:'<i class="layui-icon layedit-tool-face" title="\u8868\u60c5" layedit-event="face"">&#xe650;</i>',image:'<i class="layui-icon layedit-tool-image" title="\u56fe\u7247" layedit-event="image">&#xe64a;<input type="file" name="file"></i>',code:'<i class="layui-icon layedit-tool-code" title="\u63d2\u5165\u4ee3\u7801" layedit-event="code">&#xe64e;</i>',help:'<i class="layui-icon layedit-tool-help" title="\u5e2e\u52a9" layedit-event="help">&#xe607;</i>'},L=new c;t(n,L)});layui.define("jquery",function(a){"use strict";var e=layui.$;a("code",function(a){var l=[];a=a||{},a.elem=e(a.elem||".layui-code"),a.lang="lang"in a?a.lang:"code",a.elem.each(function(){l.push(this)}),layui.each(l.reverse(),function(l,i){var t=e(i),c=t.html();(t.attr("lay-encode")||a.encode)&&(c=c.replace(/&(?!#?[a-zA-Z0-9]+;)/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/'/g,"&#39;").replace(/"/g,"&quot;")),t.html('<ol class="layui-code-ol"><li>'+c.replace(/[\r\t\n]+/g,"</li><li>")+"</li></ol>"),t.find(">.layui-code-h3")[0]||t.prepend('<h3 class="layui-code-h3">'+(t.attr("lay-title")||a.title||"&lt;/&gt;")+'<a href="javascript:;">'+(t.attr("lay-lang")||a.lang||"")+"</a></h3>");var n=t.find(">.layui-code-ol");t.addClass("layui-box layui-code-view"),(t.attr("lay-skin")||a.skin)&&t.addClass("layui-code-"+(t.attr("lay-skin")||a.skin)),(n.find("li").length/100|0)>0&&n.css("margin-left",(n.find("li").length/100|0)+"px"),(t.attr("lay-height")||a.height)&&n.css("max-height",t.attr("lay-height")||a.height)})})}).addcss("modules/code.css?v=2","skincodecss");
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/lib/admin.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/lib/admin.js
new file mode 100644
index 0000000..2e45c81
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/lib/admin.js
@@ -0,0 +1,499 @@
+/** layuiAdmin.std-v1.0.0 LPPL License By http://www.layui.com/admin/ */
+;
+layui.define("view",
+    function(e) {
+        var a = layui.jquery,
+            i = layui.laytpl,
+            t = layui.element,
+            l = layui.setter,
+            n = layui.view,
+            s = layui.device(),
+            r = a(window),
+            o = a("body"),
+            u = a("#" + l.container),
+            d = "layui-show",
+            c = "layui-hide",
+            y = "layui-this",
+            f = "layui-disabled",
+            h = "#LAY_app_body",
+            m = "LAY_app_flexible",
+            p = "layadmin-layout-tabs",
+            v = "layadmin-side-spread-sm",
+            b = "layadmin-tabsbody-item",
+            g = "layui-icon-shrink-right",
+            x = "layui-icon-spread-left",
+            C = "layadmin-side-shrink",
+            k = "LAY-system-side-menu",
+            F = {
+                v: "1.0.0 std",
+                req: n.req,
+                sendAuthCode: function(e) {
+                    e = a.extend({
+                            seconds: 60,
+                            elemPhone: "#LAY_phone",
+                            elemVercode: "#LAY_vercode"
+                        },
+                        e);
+                    var i, t = e.seconds,
+                        l = a(e.elem),
+                        n = function(a) {
+                            t--,
+                                t < 0 ? (l.removeClass(f).html("获取验证码"), t = e.seconds, clearInterval(i)) : l.addClass(f).html(t + "秒后重获"),
+                            a || (i = setInterval(function() {
+                                    n(!0)
+                                },
+                                1e3))
+                        };
+                    e.elemPhone = a(e.elemPhone),
+                        e.elemVercode = a(e.elemVercode),
+                        l.on("click",
+                            function() {
+                                var i = e.elemPhone,
+                                    l = i.val();
+                                if (t === e.seconds && !a(this).hasClass(f)) {
+                                    if (!/^1\d{10}$/.test(l)) return i.focus(),
+                                        layer.msg("请输入正确的手机号");
+                                    if ("object" == typeof e.ajax) {
+                                        var s = e.ajax.success;
+                                        delete e.ajax.success
+                                    }
+                                    F.req(a.extend(!0, {
+                                            url: "/auth/code",
+                                            type: "get",
+                                            data: {
+                                                phone: l
+                                            },
+                                            success: function(a) {
+                                                layer.msg("验证码已发送至你的手机，请注意查收", {
+                                                    icon: 1,
+                                                    shade: 0
+                                                }),
+                                                    e.elemVercode.focus(),
+                                                    n(),
+                                                s && s(a)
+                                            }
+                                        },
+                                        e.ajax))
+                                }
+                            })
+                },
+                screen: function() {
+                    var e = r.width();
+                    return e >= 1200 ? 3 : e >= 992 ? 2 : e >= 768 ? 1 : 0
+                },
+                exit: n.exit,
+                sideFlexible: function(e) {
+                    var i = u,
+                        t = a("#" + m),
+                        n = F.screen();
+                    "spread" === e ? (t.removeClass(x).addClass(g), n < 2 ? i.addClass(v) : i.removeClass(v), i.removeClass(C)) : (t.removeClass(g).addClass(x), n < 2 ? i.removeClass(C) : i.addClass(C), i.removeClass(v)),
+                        layui.event.call(this, l.MOD_NAME, "side({*})", {
+                            status: e
+                        })
+                },
+                escape: function(e) {
+                    return String(e || "").replace(/&(?!#?[a-zA-Z0-9]+;)/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/'/g, "&#39;").replace(/"/g, "&quot;")
+                },
+                on: function(e, a) {
+                    return layui.onevent.call(this, l.MOD_NAME, e, a)
+                },
+                popup: n.popup,
+                popupRight: function(e) {
+                    return F.popup.index = layer.open(a.extend({
+                            type: 1,
+                            id: "LAY_adminPopupR",
+                            anim: -1,
+                            title: !1,
+                            closeBtn: !1,
+                            offset: "r",
+                            shade: .1,
+                            shadeClose: !0,
+                            skin: "layui-anim layui-anim-rl layui-layer-adminRight",
+                            area: "300px"
+                        },
+                        e))
+                },
+                theme: function(e) {
+                    var t = (l.theme, layui.data(l.tableName)),
+                        n = "LAY_layadmin_theme",
+                        s = document.createElement("style"),
+                        r = i([".layui-side-menu,", ".layadmin-pagetabs .layui-tab-title li:after,", ".layadmin-pagetabs .layui-tab-title li.layui-this:after,", ".layui-layer-admin .layui-layer-title,", ".layadmin-side-shrink .layui-side-menu .layui-nav>.layui-nav-item>.layui-nav-child", "{background-color:{{d.color.main}} !important;}", ".layui-nav-tree .layui-this,", ".layui-nav-tree .layui-this>a,", ".layui-nav-tree .layui-nav-child dd.layui-this,", ".layui-nav-tree .layui-nav-child dd.layui-this a", "{background-color:{{d.color.selected}} !important;}", ".layui-layout-admin .layui-logo{background-color:{{d.color.logo || d.color.main}} !important;}", "{{# if(d.color.header){ }}", ".layui-layout-admin .layui-header{background-color:{{ d.color.header }};}", ".layui-layout-admin .layui-header a,", ".layui-layout-admin .layui-header a cite{color: #f8f8f8;}", ".layui-layout-admin .layui-header a:hover{color: #fff;}", ".layui-layout-admin .layui-header .layui-nav .layui-nav-more{border-top-color: #fbfbfb;}", ".layui-layout-admin .layui-header .layui-nav .layui-nav-mored{border-color: transparent; border-bottom-color: #fbfbfb;}", ".layui-layout-admin .layui-header .layui-nav .layui-this:after, .layui-layout-admin .layui-header .layui-nav-bar{background-color: #fff; background-color: rgba(255,255,255,.5);}", ".layadmin-pagetabs .layui-tab-title li:after{display: none;}", "{{# } }}"].join("")).render(e = a.extend({},
+                            t.theme, e)),
+                        u = document.getElementById(n);
+                    "styleSheet" in s ? (s.setAttribute("type", "text/css"), s.styleSheet.cssText = r) : s.innerHTML = r,
+                        s.id = n,
+                    u && o[0].removeChild(u),
+                        o[0].appendChild(s),
+                        o.attr("layadmin-themealias", e.color.alias),
+                        t.theme = t.theme || {},
+                        layui.each(e,
+                            function(e, a) {
+                                t.theme[e] = a
+                            }),
+                        layui.data(l.tableName, {
+                            key: "theme",
+                            value: t.theme
+                        })
+                },
+                initTheme: function(e) {
+                    var a = l.theme;
+                    e = e || 0,
+                    a.color[e] && (a.color[e].index = e, F.theme({
+                        color: a.color[e]
+                    }))
+                },
+                tabsPage: {},
+                tabsBody: function(e) {
+                    return a(h).find("." + b).eq(e || 0)
+                },
+                tabsBodyChange: function(e, a) {
+                    a = a || {},
+                        F.tabsBody(e).addClass(d).siblings().removeClass(d),
+                        P.rollPage("auto", e),
+                        layui.event.call(this, l.MOD_NAME, "tabsPage({*})", {
+                            url: a.url,
+                            text: a.text
+                        })
+                },
+                resize: function(e) {
+                    var a = layui.router(),
+                        i = a.path.join("-");
+                    r.off("resize", F.resizeFn[i]),
+                        e(),
+                        F.resizeFn[i] = e,
+                        r.on("resize", F.resizeFn[i])
+                },
+                resizeFn: {},
+                runResize: function() {
+                    var e = layui.router(),
+                        a = e.path.join("-");
+                    F.resizeFn[a] && F.resizeFn[a]()
+                },
+                delResize: function() {
+                    var e = layui.router(),
+                        a = e.path.join("-");
+                    r.off("resize", F.resizeFn[a]),
+                        delete F.resizeFn[a]
+                },
+                closeThisTabs: function() {
+                    F.tabsPage.index && a(z).eq(F.tabsPage.index).find(".layui-tab-close").trigger("click")
+                }
+            },
+            P = F.events = {
+                flexible: function(e) {
+                    var a = e.find("#" + m),
+                        i = a.hasClass(x);
+                    F.sideFlexible(i ? "spread": null)
+                },
+                refresh: function() {
+                    var e = ".layadmin-iframe",
+                        i = a("." + b).length;
+                    F.tabsPage.index >= i && (F.tabsPage.index = i - 1);
+                    var t = F.tabsBody(F.tabsPage.index).find(e);
+                    t[0].contentWindow.location.reload(!0)
+                },
+                serach: function(e) {
+                    e.off("keypress").on("keypress",
+                        function(a) {
+                            if (this.value.replace(/\s/g, "") && 13 === a.keyCode) {
+                                var i = e.attr("lay-action"),
+                                    t = e.attr("lay-text") || "搜索";
+                                i += this.value,
+                                    t = t + ' <span style="color: #FF5722;">' + F.escape(this.value) + "</span>",
+                                    layui.index.openTabsPage(i, t),
+                                P.serach.keys || (P.serach.keys = {}),
+                                    P.serach.keys[F.tabsPage.index] = this.value,
+                                this.value === P.serach.keys[F.tabsPage.index] && P.refresh(e),
+                                    this.value = ""
+                            }
+                        })
+                },
+                message: function(e) {
+                    e.find(".layui-badge-dot").hide()
+                },
+                theme: function() {
+                    F.popupRight({
+                        id: "LAY_adminPopupTheme",
+                        success: function() {
+                            n(this.id).render("system/theme")
+                        }
+                    })
+                },
+                note: function(e) {
+                    var a = F.screen() < 2,
+                        i = layui.data(l.tableName).note;
+                    P.note.index = F.popup({
+                        title: "便签",
+                        shade: 0,
+                        offset: ["41px", a ? null: e.offset().left - 250 + "px"],
+                        anim: -1,
+                        id: "LAY_adminNote",
+                        skin: "layadmin-note layui-anim layui-anim-upbit",
+                        content: '<textarea placeholder="内容"></textarea>',
+                        resize: !1,
+                        success: function(e, a) {
+                            var t = e.find("textarea"),
+                                n = void 0 === i ? "便签中的内容会存储在本地，这样即便你关掉了浏览器，在下次打开时，依然会读取到上一次的记录。是个非常小巧实用的本地备忘录": i;
+                            t.val(n).focus().on("keyup",
+                                function() {
+                                    layui.data(l.tableName, {
+                                        key: "note",
+                                        value: this.value
+                                    })
+                                })
+                        }
+                    })
+                },
+                fullscreen: function(e) {
+                    var a = "layui-icon-screen-full",
+                        i = "layui-icon-screen-restore",
+                        t = e.children("i");
+                    if (t.hasClass(a)) {
+                        var l = document.body;
+                        l.webkitRequestFullScreen ? l.webkitRequestFullScreen() : l.mozRequestFullScreen ? l.mozRequestFullScreen() : l.requestFullScreen && l.requestFullscreen(),
+                            t.addClass(i).removeClass(a)
+                    } else {
+                        var l = document;
+                        l.webkitCancelFullScreen ? l.webkitCancelFullScreen() : l.mozCancelFullScreen ? l.mozCancelFullScreen() : l.cancelFullScreen ? l.cancelFullScreen() : l.exitFullscreen && l.exitFullscreen(),
+                            t.addClass(a).removeClass(i)
+                    }
+                },
+                about: function() {
+                    F.popupRight({
+                        id: "LAY_adminPopupAbout",
+                        success: function() {
+                            n(this.id).render("system/about")
+                        }
+                    })
+                },
+                more: function() {
+                    F.popupRight({
+                        id: "LAY_adminPopupMore",
+                        success: function() {
+                            n(this.id).render("system/more")
+                        }
+                    })
+                },
+                back: function() {
+                    history.back()
+                },
+                setTheme: function(e) {
+                    var a = e.data("index");
+                    e.siblings(".layui-this").data("index");
+                    e.hasClass(y) || (e.addClass(y).siblings(".layui-this").removeClass(y), F.initTheme(a))
+                },
+                rollPage: function(e, i) {
+                    var t = a("#LAY_app_tabsheader"),
+                        l = t.children("li"),
+                        n = (t.prop("scrollWidth"), t.outerWidth()),
+                        s = parseFloat(t.css("left"));
+                    if ("left" === e) {
+                        if (!s && s <= 0) return;
+                        var r = -s - n;
+                        l.each(function(e, i) {
+                            var l = a(i),
+                                n = l.position().left;
+                            if (n >= r) return t.css("left", -n),
+                                !1
+                        })
+                    } else "auto" === e ? !
+                        function() {
+                            var e, r = l.eq(i);
+                            if (r[0]) {
+                                if (e = r.position().left, e < -s) return t.css("left", -e);
+                                if (e + r.outerWidth() >= n - s) {
+                                    var o = e + r.outerWidth() - (n - s);
+                                    l.each(function(e, i) {
+                                        var l = a(i),
+                                            n = l.position().left;
+                                        if (n + s > 0 && n - s > o) return t.css("left", -n),
+                                            !1
+                                    })
+                                }
+                            }
+                        } () : l.each(function(e, i) {
+                        var l = a(i),
+                            r = l.position().left;
+                        if (r + l.outerWidth() >= n - s) return t.css("left", -r),
+                            !1
+                    })
+                },
+                leftPage: function() {
+                    P.rollPage("left")
+                },
+                rightPage: function() {
+                    P.rollPage()
+                },
+                closeThisTabs: function() {
+                    F.closeThisTabs()
+                },
+                closeOtherTabs: function(e) {
+                    var i = "LAY-system-pagetabs-remove";
+                    "all" === e ? (a(z + ":gt(0)").remove(), a(h).find("." + b + ":gt(0)").remove(), a(z).eq(0).trigger("click")) : (a(z).each(function(e, t) {
+                        e && e != F.tabsPage.index && (a(t).addClass(i), F.tabsBody(e).addClass(i))
+                    }), a("." + i).remove())
+                },
+                closeAllTabs: function() {
+                    P.closeOtherTabs("all")
+                },
+                shade: function() {
+                    F.sideFlexible()
+                },
+                im: function() {
+                    F.popup({
+                        id: "LAY-popup-layim-demo",
+                        shade: 0,
+                        area: ["800px", "300px"],
+                        title: "面板外的操作示例",
+                        offset: "lb",
+                        success: function() {
+                            layui.view(this.id).render("layim/demo").then(function() {
+                                layui.use("im")
+                            })
+                        }
+                    })
+                }
+            }; !
+            function() {
+                var e = layui.data(l.tableName);
+                e.theme ? F.theme(e.theme) : l.theme && F.initTheme(l.theme.initColorIndex),
+                "pageTabs" in layui.setter || (layui.setter.pageTabs = !0),
+                l.pageTabs || (a("#LAY_app_tabs").addClass(c), u.addClass("layadmin-tabspage-none")),
+                s.ie && s.ie < 10 && n.error("IE" + s.ie + "下访问可能不佳，推荐使用：Chrome / Firefox / Edge 等高级浏览器", {
+                    offset: "auto",
+                    id: "LAY_errorIE"
+                })
+            } (),
+            t.on("tab(" + p + ")",
+                function(e) {
+                    F.tabsPage.index = e.index
+                }),
+            F.on("tabsPage(setMenustatus)",
+                function(e) {
+                    var i = e.url,
+                        t = function(e) {
+                            return {
+                                list: e.children(".layui-nav-child"),
+                                a: e.children("*[lay-href]")
+                            }
+                        },
+                        l = a("#" + k),
+                        n = "layui-nav-itemed",
+                        s = function(e) {
+                            e.each(function(e, l) {
+                                var s = a(l),
+                                    r = t(s),
+                                    o = r.list.children("dd"),
+                                    u = i === r.a.attr("lay-href");
+                                if (o.each(function(e, l) {
+                                    var s = a(l),
+                                        r = t(s),
+                                        o = r.list.children("dd"),
+                                        u = i === r.a.attr("lay-href");
+                                    if (o.each(function(e, l) {
+                                        var s = a(l),
+                                            r = t(s),
+                                            o = i === r.a.attr("lay-href");
+                                        if (o) {
+                                            var u = r.list[0] ? n: y;
+                                            return s.addClass(u).siblings().removeClass(u),
+                                                !1
+                                        }
+                                    }), u) {
+                                        var d = r.list[0] ? n: y;
+                                        return s.addClass(d).siblings().removeClass(d),
+                                            !1
+                                    }
+                                }), u) {
+                                    var d = r.list[0] ? n: y;
+                                    return s.addClass(d).siblings().removeClass(d),
+                                        !1
+                                }
+                            })
+                        };
+                    l.find("." + y).removeClass(y),
+                    F.screen() < 2 && F.sideFlexible(),
+                        s(l.children("li"))
+                }),
+            t.on("nav(layadmin-system-side-menu)",
+                function(e) {
+                    e.siblings(".layui-nav-child")[0] && u.hasClass(C) && (F.sideFlexible("spread"), layer.close(e.data("index"))),
+                        F.tabsPage.type = "nav"
+                }),
+            t.on("nav(layadmin-pagetabs-nav)",
+                function(e) {
+                    var a = e.parent();
+                    a.removeClass(y),
+                        a.parent().removeClass(d)
+                });
+        var A = function(e) {
+                var a = (e.attr("lay-id"), e.attr("lay-attr")),
+                    i = e.index();
+                F.tabsBodyChange(i, {
+                    url: a
+                })
+            },
+            z = "#LAY_app_tabsheader>li";
+        o.on("click", z,
+            function() {
+                var e = a(this),
+                    i = e.index();
+                F.tabsPage.type = "tab",
+                    F.tabsPage.index = i,
+                    A(e)
+            }),
+            t.on("tabDelete(" + p + ")",
+                function(e) {
+                    var i = a(z + ".layui-this");
+                    e.index && F.tabsBody(e.index).remove(),
+                        A(i),
+                        F.delResize()
+                }),
+            o.on("click", "*[lay-href]",
+                function() {
+                    var e = a(this),
+                        i = e.attr("lay-href"),
+                        t = e.attr("lay-text");
+                    layui.router();
+                    F.tabsPage.elem = e;
+                    var l = parent === self ? layui: top.layui;
+                    l.index.openTabsPage(i, t || e.text())
+                }),
+            o.on("click", "*[layadmin-event]",
+                function() {
+                    var e = a(this),
+                        i = e.attr("layadmin-event");
+                    P[i] && P[i].call(this, e)
+                }),
+            o.on("mouseenter", "*[lay-tips]",
+                function() {
+                    var e = a(this);
+                    if (!e.parent().hasClass("layui-nav-item") || u.hasClass(C)) {
+                        var i = e.attr("lay-tips"),
+                            t = e.attr("lay-offset"),
+                            l = e.attr("lay-direction"),
+                            n = layer.tips(i, this, {
+                                tips: l || 1,
+                                time: -1,
+                                success: function(e, a) {
+                                    t && e.css("margin-left", t + "px")
+                                }
+                            });
+                        e.data("index", n)
+                    }
+                }).on("mouseleave", "*[lay-tips]",
+                function() {
+                    layer.close(a(this).data("index"))
+                });
+        var _ = layui.data.resizeSystem = function() {
+            layer.closeAll("tips"),
+            _.lock || setTimeout(function() {
+                    F.sideFlexible(F.screen() < 2 ? "": "spread"),
+                        delete _.lock
+                },
+                100),
+                _.lock = !0
+        };
+        r.on("resize", layui.data.resizeSystem),
+            e("admin", F)
+    });
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/lib/extend/echarts.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/lib/extend/echarts.js
new file mode 100644
index 0000000..c9b0fc7
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/lib/extend/echarts.js
@@ -0,0 +1,34100 @@
+!function(e) {
+      var t, i; !
+          function() {
+            function e(e, t) {
+              if (!t) return e;
+              if (0 === e.indexOf(".")) {
+                var i = t.split("/"),
+                    n = e.split("/"),
+                    a = i.length - 1,
+                    o = n.length,
+                    r = 0,
+                    s = 0;
+                e: for (var l = 0; o > l; l++) switch (n[l]) {
+                  case "..":
+                    if (! (a > r)) break e;
+                    r++,
+                        s++;
+                    break;
+                  case ".":
+                    s++;
+                    break;
+                  default:
+                    break e
+                }
+                return i.length = a - r,
+                    n = n.slice(s),
+                    i.concat(n).join("/")
+              }
+              return e
+            }
+            function n(t) {
+              function i(i, r) {
+                if ("string" == typeof i) {
+                  var s = n[i];
+                  return s || (s = o(e(i, t)), n[i] = s),
+                      s
+                }
+                i instanceof Array && (r = r ||
+                    function() {},
+                    r.apply(this, a(i, r, t)))
+              }
+              var n = {};
+              return i
+            }
+            function a(i, n, a) {
+              for (var s = [], l = r[a], h = 0, m = Math.min(i.length, n.length); m > h; h++) {
+                var V, U = e(i[h], a);
+                switch (U) {
+                  case "require":
+                    V = l && l.require || t;
+                    break;
+                  case "exports":
+                    V = l.exports;
+                    break;
+                  case "module":
+                    V = l;
+                    break;
+                  default:
+                    V = o(U)
+                }
+                s.push(V)
+              }
+              return s
+            }
+            function o(e) {
+              var t = r[e];
+              if (!t) throw new Error("No " + e);
+              if (!t.defined) {
+                var i = t.factory,
+                    n = i.apply(this, a(t.deps || [], i, e));
+                "undefined" != typeof n && (t.exports = n),
+                    t.defined = 1
+              }
+              return t.exports
+            }
+            var r = {};
+            i = function(e, t, i) {
+              r[e] = {
+                id: e,
+                deps: t,
+                factory: i,
+                defined: 0,
+                exports: {},
+                require: n(e)
+              }
+            },
+                t = n("")
+          } (),
+          i("echarts", ["echarts/echarts"],
+              function(e) {
+                return e
+              }),
+          i("echarts/echarts", ["require", "./config", "zrender/tool/util", "zrender/tool/event", "zrender/tool/env", "zrender", "zrender/config", "./chart/island", "./component/toolbox", "./component", "./component/title", "./component/tooltip", "./component/legend", "./util/ecData", "./chart", "zrender/tool/color", "./component/timeline", "zrender/shape/Image", "zrender/loadingEffect/Bar", "zrender/loadingEffect/Bubble", "zrender/loadingEffect/DynamicLine", "zrender/loadingEffect/Ring", "zrender/loadingEffect/Spin", "zrender/loadingEffect/Whirling", "./theme/macarons", "./theme/infographic"],
+              function(e) {
+                function t() {
+                  r.Dispatcher.call(this)
+                }
+                function i(e) {
+                  e.innerHTML = "",
+                      this._themeConfig = {},
+                      this.dom = e,
+                      this._connected = !1,
+                      this._status = {
+                        dragIn: !1,
+                        dragOut: !1,
+                        needRefresh: !1
+                      },
+                      this._curEventType = !1,
+                      this._chartList = [],
+                      this._messageCenter = new t,
+                      this._messageCenterOutSide = new t,
+                      this.resize = this.resize(),
+                      this._init()
+                }
+                function n(e, t, i, n, a) {
+                  for (var o = e._chartList,
+                           r = o.length; r--;) {
+                    var s = o[r];
+                    "function" == typeof s[t] && s[t](i, n, a)
+                  }
+                }
+                var a = e("./config"),
+                    o = e("zrender/tool/util"),
+                    r = e("zrender/tool/event"),
+                    s = {},
+                    l = e("zrender/tool/env").canvasSupported,
+                    h = new Date - 0,
+                    m = {},
+                    V = "_echarts_instance_";
+                s.version = "2.2.7",
+                    s.dependencies = {
+                      zrender: "2.1.1"
+                    },
+                    s.init = function(t, n) {
+                      var a = e("zrender");
+                      a.version.replace(".", "") - 0 < s.dependencies.zrender.replace(".", "") - 0 && console.error("ZRender " + a.version + " is too old for ECharts " + s.version + ". Current version need ZRender " + s.dependencies.zrender + "+"),
+                          t = t instanceof Array ? t[0] : t;
+                      var o = t.getAttribute(V);
+                      return o || (o = h++, t.setAttribute(V, o)),
+                      m[o] && m[o].dispose(),
+                          m[o] = new i(t),
+                          m[o].id = o,
+                          m[o].canvasSupported = l,
+                          m[o].setTheme(n),
+                          m[o]
+                    },
+                    s.getInstanceById = function(e) {
+                      return m[e]
+                    },
+                    o.merge(t.prototype, r.Dispatcher.prototype, !0);
+                var U = e("zrender/config").EVENT,
+                    d = ["CLICK", "DBLCLICK", "MOUSEOVER", "MOUSEOUT", "DRAGSTART", "DRAGEND", "DRAGENTER", "DRAGOVER", "DRAGLEAVE", "DROP"];
+                return i.prototype = {
+                  _init: function() {
+                    var t = this,
+                        i = e("zrender").init(this.dom);
+                    this._zr = i,
+                        this._messageCenter.dispatch = function(e, i, n, a) {
+                          n = n || {},
+                              n.type = e,
+                              n.event = i,
+                              t._messageCenter.dispatchWithContext(e, n, a),
+                              t._messageCenterOutSide.dispatchWithContext(e, n, a)
+                        },
+                        this._onevent = function(e) {
+                          return t.__onevent(e)
+                        };
+                    for (var n in a.EVENT)"CLICK" != n && "DBLCLICK" != n && "HOVER" != n && "MOUSEOUT" != n && "MAP_ROAM" != n && this._messageCenter.bind(a.EVENT[n], this._onevent, this);
+                    var o = {};
+                    this._onzrevent = function(e) {
+                      return t[o[e.type]](e)
+                    };
+                    for (var r = 0,
+                             s = d.length; s > r; r++) {
+                      var l = d[r],
+                          h = U[l];
+                      o[h] = "_on" + l.toLowerCase(),
+                          i.on(h, this._onzrevent)
+                    }
+                    this.chart = {},
+                        this.component = {};
+                    var m = e("./chart/island");
+                    this._island = new m(this._themeConfig, this._messageCenter, i, {},
+                        this),
+                        this.chart.island = this._island;
+                    var V = e("./component/toolbox");
+                    this._toolbox = new V(this._themeConfig, this._messageCenter, i, {},
+                        this),
+                        this.component.toolbox = this._toolbox;
+                    var p = e("./component");
+                    p.define("title", e("./component/title")),
+                        p.define("tooltip", e("./component/tooltip")),
+                        p.define("legend", e("./component/legend")),
+                    (0 === i.getWidth() || 0 === i.getHeight()) && console.error("Dom’s width & height should be ready before init.")
+                  },
+                  __onevent: function(e) {
+                    e.__echartsId = e.__echartsId || this.id;
+                    var t = e.__echartsId === this.id;
+                    switch (this._curEventType || (this._curEventType = e.type), e.type) {
+                      case a.EVENT.LEGEND_SELECTED:
+                        this._onlegendSelected(e);
+                        break;
+                      case a.EVENT.DATA_ZOOM:
+                        if (!t) {
+                          var i = this.component.dataZoom;
+                          i && (i.silence(!0), i.absoluteZoom(e.zoom), i.silence(!1))
+                        }
+                        this._ondataZoom(e);
+                        break;
+                      case a.EVENT.DATA_RANGE:
+                        t && this._ondataRange(e);
+                        break;
+                      case a.EVENT.MAGIC_TYPE_CHANGED:
+                        if (!t) {
+                          var n = this.component.toolbox;
+                          n && (n.silence(!0), n.setMagicType(e.magicType), n.silence(!1))
+                        }
+                        this._onmagicTypeChanged(e);
+                        break;
+                      case a.EVENT.DATA_VIEW_CHANGED:
+                        t && this._ondataViewChanged(e);
+                        break;
+                      case a.EVENT.TOOLTIP_HOVER:
+                        t && this._tooltipHover(e);
+                        break;
+                      case a.EVENT.RESTORE:
+                        this._onrestore();
+                        break;
+                      case a.EVENT.REFRESH:
+                        t && this._onrefresh(e);
+                        break;
+                      case a.EVENT.TOOLTIP_IN_GRID:
+                      case a.EVENT.TOOLTIP_OUT_GRID:
+                        if (t) {
+                          if (this._connected) {
+                            var o = this.component.grid;
+                            o && (e.x = (e.event.zrenderX - o.getX()) / o.getWidth(), e.y = (e.event.zrenderY - o.getY()) / o.getHeight())
+                          }
+                        } else {
+                          var o = this.component.grid;
+                          o && this._zr.trigger("mousemove", {
+                            connectTrigger: !0,
+                            zrenderX: o.getX() + e.x * o.getWidth(),
+                            zrenderY: o.getY() + e.y * o.getHeight()
+                          })
+                        }
+                    }
+                    if (this._connected && t && this._curEventType === e.type) {
+                      for (var r in this._connected) this._connected[r].connectedEventHandler(e);
+                      this._curEventType = null
+                    } (!t || !this._connected && t) && (this._curEventType = null)
+                  },
+                  _onclick: function(e) {
+                    if (n(this, "onclick", e), e.target) {
+                      var t = this._eventPackage(e.target);
+                      t && null != t.seriesIndex && this._messageCenter.dispatch(a.EVENT.CLICK, e.event, t, this)
+                    }
+                  },
+                  _ondblclick: function(e) {
+                    if (n(this, "ondblclick", e), e.target) {
+                      var t = this._eventPackage(e.target);
+                      t && null != t.seriesIndex && this._messageCenter.dispatch(a.EVENT.DBLCLICK, e.event, t, this)
+                    }
+                  },
+                  _onmouseover: function(e) {
+                    if (e.target) {
+                      var t = this._eventPackage(e.target);
+                      t && null != t.seriesIndex && this._messageCenter.dispatch(a.EVENT.HOVER, e.event, t, this)
+                    }
+                  },
+                  _onmouseout: function(e) {
+                    if (e.target) {
+                      var t = this._eventPackage(e.target);
+                      t && null != t.seriesIndex && this._messageCenter.dispatch(a.EVENT.MOUSEOUT, e.event, t, this)
+                    }
+                  },
+                  _ondragstart: function(e) {
+                    this._status = {
+                      dragIn: !1,
+                      dragOut: !1,
+                      needRefresh: !1
+                    },
+                        n(this, "ondragstart", e)
+                  },
+                  _ondragenter: function(e) {
+                    n(this, "ondragenter", e)
+                  },
+                  _ondragover: function(e) {
+                    n(this, "ondragover", e)
+                  },
+                  _ondragleave: function(e) {
+                    n(this, "ondragleave", e)
+                  },
+                  _ondrop: function(e) {
+                    n(this, "ondrop", e, this._status),
+                        this._island.ondrop(e, this._status)
+                  },
+                  _ondragend: function(e) {
+                    if (n(this, "ondragend", e, this._status), this._timeline && this._timeline.ondragend(e, this._status), this._island.ondragend(e, this._status), this._status.needRefresh) {
+                      this._syncBackupData(this._option);
+                      var t = this._messageCenter;
+                      t.dispatch(a.EVENT.DATA_CHANGED, e.event, this._eventPackage(e.target), this),
+                          t.dispatch(a.EVENT.REFRESH, null, null, this)
+                    }
+                  },
+                  _onlegendSelected: function(e) {
+                    this._status.needRefresh = !1,
+                        n(this, "onlegendSelected", e, this._status),
+                    this._status.needRefresh && this._messageCenter.dispatch(a.EVENT.REFRESH, null, null, this)
+                  },
+                  _ondataZoom: function(e) {
+                    this._status.needRefresh = !1,
+                        n(this, "ondataZoom", e, this._status),
+                    this._status.needRefresh && this._messageCenter.dispatch(a.EVENT.REFRESH, null, null, this)
+                  },
+                  _ondataRange: function(e) {
+                    this._clearEffect(),
+                        this._status.needRefresh = !1,
+                        n(this, "ondataRange", e, this._status),
+                    this._status.needRefresh && this._zr.refreshNextFrame()
+                  },
+                  _onmagicTypeChanged: function() {
+                    this._clearEffect(),
+                        this._render(this._toolbox.getMagicOption())
+                  },
+                  _ondataViewChanged: function(e) {
+                    this._syncBackupData(e.option),
+                        this._messageCenter.dispatch(a.EVENT.DATA_CHANGED, null, e, this),
+                        this._messageCenter.dispatch(a.EVENT.REFRESH, null, null, this)
+                  },
+                  _tooltipHover: function(e) {
+                    var t = [];
+                    n(this, "ontooltipHover", e, t)
+                  },
+                  _onrestore: function() {
+                    this.restore()
+                  },
+                  _onrefresh: function(e) {
+                    this._refreshInside = !0,
+                        this.refresh(e),
+                        this._refreshInside = !1
+                  },
+                  _syncBackupData: function(e) {
+                    this.component.dataZoom && this.component.dataZoom.syncBackupData(e)
+                  },
+                  _eventPackage: function(t) {
+                    if (t) {
+                      var i = e("./util/ecData"),
+                          n = i.get(t, "seriesIndex"),
+                          a = i.get(t, "dataIndex");
+                      return a = -1 != n && this.component.dataZoom ? this.component.dataZoom.getRealDataIndex(n, a) : a,
+                          {
+                            seriesIndex: n,
+                            seriesName: (i.get(t, "series") || {}).name,
+                            dataIndex: a,
+                            data: i.get(t, "data"),
+                            name: i.get(t, "name"),
+                            value: i.get(t, "value"),
+                            special: i.get(t, "special")
+                          }
+                    }
+                  },
+                  _noDataCheck: function(e) {
+                    for (var t = e.series,
+                             i = 0,
+                             n = t.length; n > i; i++) if (t[i].type == a.CHART_TYPE_MAP || t[i].data && t[i].data.length > 0 || t[i].markPoint && t[i].markPoint.data && t[i].markPoint.data.length > 0 || t[i].markLine && t[i].markLine.data && t[i].markLine.data.length > 0 || t[i].nodes && t[i].nodes.length > 0 || t[i].links && t[i].links.length > 0 || t[i].matrix && t[i].matrix.length > 0 || t[i].eventList && t[i].eventList.length > 0) return ! 1;
+                    var o = this._option && this._option.noDataLoadingOption || this._themeConfig.noDataLoadingOption || a.noDataLoadingOption || {
+                      text: this._option && this._option.noDataText || this._themeConfig.noDataText || a.noDataText,
+                      effect: this._option && this._option.noDataEffect || this._themeConfig.noDataEffect || a.noDataEffect
+                    };
+                    return this.clear(),
+                        this.showLoading(o),
+                        !0
+                  },
+                  _render: function(t) {
+                    if (this._mergeGlobalConifg(t), !this._noDataCheck(t)) {
+                      var i = t.backgroundColor;
+                      if (i) if (l || -1 == i.indexOf("rgba")) this.dom.style.backgroundColor = i;
+                      else {
+                        var n = i.split(",");
+                        this.dom.style.filter = "alpha(opacity=" + 100 * n[3].substring(0, n[3].lastIndexOf(")")) + ")",
+                            n.length = 3,
+                            n[0] = n[0].replace("a", ""),
+                            this.dom.style.backgroundColor = n.join(",") + ")"
+                      }
+                      this._zr.clearAnimation(),
+                          this._chartList = [];
+                      var o = e("./chart"),
+                          r = e("./component"); (t.xAxis || t.yAxis) && (t.grid = t.grid || {},
+                          t.dataZoom = t.dataZoom || {});
+                      for (var s, h, m, V = ["title", "legend", "tooltip", "dataRange", "roamController", "grid", "dataZoom", "xAxis", "yAxis", "polar"], U = 0, d = V.length; d > U; U++) h = V[U],
+                          m = this.component[h],
+                          t[h] ? (m ? m.refresh && m.refresh(t) : (s = r.get(/^[xy]Axis$/.test(h) ? "axis": h), m = new s(this._themeConfig, this._messageCenter, this._zr, t, this, h), this.component[h] = m), this._chartList.push(m)) : m && (m.dispose(), this.component[h] = null, delete this.component[h]);
+                      for (var p, c, u, y = {},
+                               U = 0,
+                               d = t.series.length; d > U; U++) c = t.series[U].type,
+                          c ? y[c] || (y[c] = !0, p = o.get(c), p ? (this.chart[c] ? (u = this.chart[c], u.refresh(t)) : u = new p(this._themeConfig, this._messageCenter, this._zr, t, this), this._chartList.push(u), this.chart[c] = u) : console.error(c + " has not been required.")) : console.error("series[" + U + "] chart type has not been defined.");
+                      for (c in this.chart) c == a.CHART_TYPE_ISLAND || y[c] || (this.chart[c].dispose(), this.chart[c] = null, delete this.chart[c]);
+                      this.component.grid && this.component.grid.refixAxisShape(this.component),
+                          this._island.refresh(t),
+                          this._toolbox.refresh(t),
+                          t.animation && !t.renderAsImage ? this._zr.refresh() : this._zr.render();
+                      var g = "IMG" + this.id,
+                          b = document.getElementById(g);
+                      t.renderAsImage && l ? (b ? b.src = this.getDataURL(t.renderAsImage) : (b = this.getImage(t.renderAsImage), b.id = g, b.style.position = "absolute", b.style.left = 0, b.style.top = 0, this.dom.firstChild.appendChild(b)), this.un(), this._zr.un(), this._disposeChartList(), this._zr.clear()) : b && b.parentNode.removeChild(b),
+                          b = null,
+                          this._option = t
+                    }
+                  },
+                  restore: function() {
+                    this._clearEffect(),
+                        this._option = o.clone(this._optionRestore),
+                        this._disposeChartList(),
+                        this._island.clear(),
+                        this._toolbox.reset(this._option, !0),
+                        this._render(this._option)
+                  },
+                  refresh: function(e) {
+                    this._clearEffect(),
+                        e = e || {};
+                    var t = e.option; ! this._refreshInside && t && (t = this.getOption(), o.merge(t, e.option, !0), o.merge(this._optionRestore, e.option, !0), this._toolbox.reset(t)),
+                        this._island.refresh(t),
+                        this._toolbox.refresh(t),
+                        this._zr.clearAnimation();
+                    for (var i = 0,
+                             n = this._chartList.length; n > i; i++) this._chartList[i].refresh && this._chartList[i].refresh(t);
+                    this.component.grid && this.component.grid.refixAxisShape(this.component),
+                        this._zr.refresh()
+                  },
+                  _disposeChartList: function() {
+                    this._clearEffect(),
+                        this._zr.clearAnimation();
+                    for (var e = this._chartList.length; e--;) {
+                      var t = this._chartList[e];
+                      if (t) {
+                        var i = t.type;
+                        this.chart[i] && delete this.chart[i],
+                        this.component[i] && delete this.component[i],
+                        t.dispose && t.dispose()
+                      }
+                    }
+                    this._chartList = []
+                  },
+                  _mergeGlobalConifg: function(t) {
+                    for (var i = ["backgroundColor", "calculable", "calculableColor", "calculableHolderColor", "nameConnector", "valueConnector", "animation", "animationThreshold", "animationDuration", "animationDurationUpdate", "animationEasing", "addDataAnimation", "symbolList", "DRAG_ENABLE_TIME"], n = i.length; n--;) {
+                      var o = i[n];
+                      null == t[o] && (t[o] = null != this._themeConfig[o] ? this._themeConfig[o] : a[o])
+                    }
+                    var r = t.color;
+                    r && r.length || (r = this._themeConfig.color || a.color),
+                        this._zr.getColor = function(t) {
+                          var i = e("zrender/tool/color");
+                          return i.getColor(t, r)
+                        },
+                    l || (t.animation = !1, t.addDataAnimation = !1)
+                  },
+                  setOption: function(e, t) {
+                    return e.timeline ? this._setTimelineOption(e) : this._setOption(e, t)
+                  },
+                  _setOption: function(e, t, i) {
+                    return ! t && this._option ? this._option = o.merge(this.getOption(), o.clone(e), !0) : (this._option = o.clone(e), !i && this._timeline && this._timeline.dispose()),
+                        this._optionRestore = o.clone(this._option),
+                        this._option.series && 0 !== this._option.series.length ? (this.component.dataZoom && (this._option.dataZoom || this._option.toolbox && this._option.toolbox.feature && this._option.toolbox.feature.dataZoom && this._option.toolbox.feature.dataZoom.show) && this.component.dataZoom.syncOption(this._option), this._toolbox.reset(this._option), this._render(this._option), this) : void this._zr.clear()
+                  },
+                  getOption: function() {
+                    function e(e) {
+                      var n = i._optionRestore[e];
+                      if (n) if (n instanceof Array) for (var a = n.length; a--;) t[e][a].data = o.clone(n[a].data);
+                      else t[e].data = o.clone(n.data)
+                    }
+                    var t = o.clone(this._option),
+                        i = this;
+                    return e("xAxis"),
+                        e("yAxis"),
+                        e("series"),
+                        t
+                  },
+                  setSeries: function(e, t) {
+                    return t ? (this._option.series = e, this.setOption(this._option, t)) : this.setOption({
+                      series: e
+                    }),
+                        this
+                  },
+                  getSeries: function() {
+                    return this.getOption().series
+                  },
+                  _setTimelineOption: function(t) {
+                    this._timeline && this._timeline.dispose();
+                    var i = e("./component/timeline"),
+                        n = new i(this._themeConfig, this._messageCenter, this._zr, t, this);
+                    return this._timeline = n,
+                        this.component.timeline = this._timeline,
+                        this
+                  },
+                  addData: function(e, t, i, n, r) {
+                    function s() {
+                      if (V._zr) {
+                        V._zr.clearAnimation();
+                        for (var e = 0,
+                                 t = X.length; t > e; e++) X[e].motionlessOnce = h.addDataAnimation && X[e].addDataAnimation;
+                        V._messageCenter.dispatch(a.EVENT.REFRESH, null, {
+                              option: h
+                            },
+                            V)
+                      }
+                    }
+                    for (var l = e instanceof Array ? e: [[e, t, i, n, r]], h = this.getOption(), m = this._optionRestore, V = this, U = 0, d = l.length; d > U; U++) {
+                      e = l[U][0],
+                          t = l[U][1],
+                          i = l[U][2],
+                          n = l[U][3],
+                          r = l[U][4];
+                      var p = m.series[e],
+                          c = i ? "unshift": "push",
+                          u = i ? "pop": "shift";
+                      if (p) {
+                        var y = p.data,
+                            g = h.series[e].data;
+                        if (y[c](t), g[c](t), n || (y[u](), t = g[u]()), null != r) {
+                          var b, f;
+                          if (p.type === a.CHART_TYPE_PIE && (b = m.legend) && (f = b.data)) {
+                            var k = h.legend.data;
+                            if (f[c](r), k[c](r), !n) {
+                              var x = o.indexOf(f, t.name); - 1 != x && f.splice(x, 1),
+                                  x = o.indexOf(k, t.name),
+                              -1 != x && k.splice(x, 1)
+                            }
+                          } else if (null != m.xAxis && null != m.yAxis) {
+                            var _, L, W = p.xAxisIndex || 0; (null == m.xAxis[W].type || "category" === m.xAxis[W].type) && (_ = m.xAxis[W].data, L = h.xAxis[W].data, _[c](r), L[c](r), n || (_[u](), L[u]())),
+                                W = p.yAxisIndex || 0,
+                            "category" === m.yAxis[W].type && (_ = m.yAxis[W].data, L = h.yAxis[W].data, _[c](r), L[c](r), n || (_[u](), L[u]()))
+                          }
+                        }
+                        this._option.series[e].data = h.series[e].data
+                      }
+                    }
+                    this._zr.clearAnimation();
+                    for (var X = this._chartList,
+                             v = 0,
+                             w = function() {
+                               v--,
+                               0 === v && s()
+                             },
+                             U = 0, d = X.length; d > U; U++) h.addDataAnimation && X[U].addDataAnimation && (v++, X[U].addDataAnimation(l, w));
+                    return this.component.dataZoom && this.component.dataZoom.syncOption(h),
+                        this._option = h,
+                    h.addDataAnimation || setTimeout(s, 0),
+                        this
+                  },
+                  addMarkPoint: function(e, t) {
+                    return this._addMark(e, t, "markPoint")
+                  },
+                  addMarkLine: function(e, t) {
+                    return this._addMark(e, t, "markLine")
+                  },
+                  _addMark: function(e, t, i) {
+                    var n, a = this._option.series;
+                    if (a && (n = a[e])) {
+                      var r = this._optionRestore.series,
+                          s = r[e],
+                          l = n[i],
+                          h = s[i];
+                      l = n[i] = l || {
+                        data: []
+                      },
+                          h = s[i] = h || {
+                            data: []
+                          };
+                      for (var m in t)"data" === m ? (l.data = l.data.concat(t.data), h.data = h.data.concat(t.data)) : "object" != typeof t[m] || null == l[m] ? l[m] = h[m] = t[m] : (o.merge(l[m], t[m], !0), o.merge(h[m], t[m], !0));
+                      var V = this.chart[n.type];
+                      V && V.addMark(e, t, i)
+                    }
+                    return this
+                  },
+                  delMarkPoint: function(e, t) {
+                    return this._delMark(e, t, "markPoint")
+                  },
+                  delMarkLine: function(e, t) {
+                    return this._delMark(e, t, "markLine")
+                  },
+                  _delMark: function(e, t, i) {
+                    var n, a, o, r = this._option.series;
+                    if (! (r && (n = r[e]) && (a = n[i]) && (o = a.data))) return this;
+                    t = t.split(" > ");
+                    for (var s = -1,
+                             l = 0,
+                             h = o.length; h > l; l++) {
+                      var m = o[l];
+                      if (m instanceof Array) {
+                        if (m[0].name === t[0] && m[1].name === t[1]) {
+                          s = l;
+                          break
+                        }
+                      } else if (m.name === t[0]) {
+                        s = l;
+                        break
+                      }
+                    }
+                    if (s > -1) {
+                      o.splice(s, 1),
+                          this._optionRestore.series[e][i].data.splice(s, 1);
+                      var V = this.chart[n.type];
+                      V && V.delMark(e, t.join(" > "), i)
+                    }
+                    return this
+                  },
+                  getDom: function() {
+                    return this.dom
+                  },
+                  getZrender: function() {
+                    return this._zr
+                  },
+                  getDataURL: function(e) {
+                    if (!l) return "";
+                    if (0 === this._chartList.length) {
+                      var t = "IMG" + this.id,
+                          i = document.getElementById(t);
+                      if (i) return i.src
+                    }
+                    var n = this.component.tooltip;
+                    switch (n && n.hideTip(), e) {
+                      case "jpeg":
+                        break;
+                      default:
+                        e = "png"
+                    }
+                    var a = this._option.backgroundColor;
+                    return a && "rgba(0,0,0,0)" === a.replace(" ", "") && (a = "#fff"),
+                        this._zr.toDataURL("image/" + e, a)
+                  },
+                  getImage: function(e) {
+                    var t = this._optionRestore.title,
+                        i = document.createElement("img");
+                    return i.src = this.getDataURL(e),
+                        i.title = t && t.text || "ECharts",
+                        i
+                  },
+                  getConnectedDataURL: function(t) {
+                    if (!this.isConnected()) return this.getDataURL(t);
+                    var i = this.dom,
+                        n = {
+                          self: {
+                            img: this.getDataURL(t),
+                            left: i.offsetLeft,
+                            top: i.offsetTop,
+                            right: i.offsetLeft + i.offsetWidth,
+                            bottom: i.offsetTop + i.offsetHeight
+                          }
+                        },
+                        a = n.self.left,
+                        o = n.self.top,
+                        r = n.self.right,
+                        s = n.self.bottom;
+                    for (var l in this._connected) i = this._connected[l].getDom(),
+                        n[l] = {
+                          img: this._connected[l].getDataURL(t),
+                          left: i.offsetLeft,
+                          top: i.offsetTop,
+                          right: i.offsetLeft + i.offsetWidth,
+                          bottom: i.offsetTop + i.offsetHeight
+                        },
+                        a = Math.min(a, n[l].left),
+                        o = Math.min(o, n[l].top),
+                        r = Math.max(r, n[l].right),
+                        s = Math.max(s, n[l].bottom);
+                    var h = document.createElement("div");
+                    h.style.position = "absolute",
+                        h.style.left = "-4000px",
+                        h.style.width = r - a + "px",
+                        h.style.height = s - o + "px",
+                        document.body.appendChild(h);
+                    var m = e("zrender").init(h),
+                        V = e("zrender/shape/Image");
+                    for (var l in n) m.addShape(new V({
+                      style: {
+                        x: n[l].left - a,
+                        y: n[l].top - o,
+                        image: n[l].img
+                      }
+                    }));
+                    m.render();
+                    var U = this._option.backgroundColor;
+                    U && "rgba(0,0,0,0)" === U.replace(/ /g, "") && (U = "#fff");
+                    var d = m.toDataURL("image/png", U);
+                    return setTimeout(function() {
+                          m.dispose(),
+                              h.parentNode.removeChild(h),
+                              h = null
+                        },
+                        100),
+                        d
+                  },
+                  getConnectedImage: function(e) {
+                    var t = this._optionRestore.title,
+                        i = document.createElement("img");
+                    return i.src = this.getConnectedDataURL(e),
+                        i.title = t && t.text || "ECharts",
+                        i
+                  },
+                  on: function(e, t) {
+                    return this._messageCenterOutSide.bind(e, t, this),
+                        this
+                  },
+                  un: function(e, t) {
+                    return this._messageCenterOutSide.unbind(e, t),
+                        this
+                  },
+                  connect: function(e) {
+                    if (!e) return this;
+                    if (this._connected || (this._connected = {}), e instanceof Array) for (var t = 0,
+                                                                                                i = e.length; i > t; t++) this._connected[e[t].id] = e[t];
+                    else this._connected[e.id] = e;
+                    return this
+                  },
+                  disConnect: function(e) {
+                    if (!e || !this._connected) return this;
+                    if (e instanceof Array) for (var t = 0,
+                                                     i = e.length; i > t; t++) delete this._connected[e[t].id];
+                    else delete this._connected[e.id];
+                    for (var n in this._connected) return this;
+                    return this._connected = !1,
+                        this
+                  },
+                  connectedEventHandler: function(e) {
+                    e.__echartsId != this.id && this._onevent(e)
+                  },
+                  isConnected: function() {
+                    return !! this._connected
+                  },
+                  showLoading: function(t) {
+                    var i = {
+                      bar: e("zrender/loadingEffect/Bar"),
+                      bubble: e("zrender/loadingEffect/Bubble"),
+                      dynamicLine: e("zrender/loadingEffect/DynamicLine"),
+                      ring: e("zrender/loadingEffect/Ring"),
+                      spin: e("zrender/loadingEffect/Spin"),
+                      whirling: e("zrender/loadingEffect/Whirling")
+                    };
+                    this._toolbox.hideDataView(),
+                        t = t || {};
+                    var n = t.textStyle || {};
+                    t.textStyle = n;
+                    var r = o.merge(o.merge(o.clone(n), this._themeConfig.textStyle), a.textStyle);
+                    n.textFont = r.fontStyle + " " + r.fontWeight + " " + r.fontSize + "px " + r.fontFamily,
+                        n.text = t.text || this._option && this._option.loadingText || this._themeConfig.loadingText || a.loadingText,
+                    null != t.x && (n.x = t.x),
+                    null != t.y && (n.y = t.y),
+                        t.effectOption = t.effectOption || {},
+                        t.effectOption.textStyle = n;
+                    var s = t.effect;
+                    return ("string" == typeof s || null == s) && (s = i[t.effect || this._option && this._option.loadingEffect || this._themeConfig.loadingEffect || a.loadingEffect] || i.spin),
+                        this._zr.showLoading(new s(t.effectOption)),
+                        this
+                  },
+                  hideLoading: function() {
+                    return this._zr.hideLoading(),
+                        this
+                  },
+                  setTheme: function(t) {
+                    if (t) {
+                      if ("string" == typeof t) switch (t) {
+                        case "macarons":
+                          t = e("./theme/macarons");
+                          break;
+                        case "infographic":
+                          t = e("./theme/infographic");
+                          break;
+                        default:
+                          t = {}
+                      } else t = t || {};
+                      this._themeConfig = t
+                    }
+                    if (!l) {
+                      var i = this._themeConfig.textStyle;
+                      i && i.fontFamily && i.fontFamily2 && (i.fontFamily = i.fontFamily2),
+                          i = a.textStyle,
+                          i.fontFamily = i.fontFamily2
+                    }
+                    this._timeline && this._timeline.setTheme(!0),
+                    this._optionRestore && this.restore()
+                  },
+                  resize: function() {
+                    var e = this;
+                    return function() {
+                      if (e._clearEffect(), e._zr.resize(), e._option && e._option.renderAsImage && l) return e._render(e._option),
+                          e;
+                      e._zr.clearAnimation(),
+                          e._island.resize(),
+                          e._toolbox.resize(),
+                      e._timeline && e._timeline.resize();
+                      for (var t = 0,
+                               i = e._chartList.length; i > t; t++) e._chartList[t].resize && e._chartList[t].resize();
+                      return e.component.grid && e.component.grid.refixAxisShape(e.component),
+                          e._zr.refresh(),
+                          e._messageCenter.dispatch(a.EVENT.RESIZE, null, null, e),
+                          e
+                    }
+                  },
+                  _clearEffect: function() {
+                    this._zr.modLayer(a.EFFECT_ZLEVEL, {
+                      motionBlur: !1
+                    }),
+                        this._zr.painter.clearLayer(a.EFFECT_ZLEVEL)
+                  },
+                  clear: function() {
+                    return this._disposeChartList(),
+                        this._zr.clear(),
+                        this._option = {},
+                        this._optionRestore = {},
+                        this.dom.style.backgroundColor = null,
+                        this
+                  },
+                  dispose: function() {
+                    var e = this.dom.getAttribute(V);
+                    e && delete m[e],
+                        this._island.dispose(),
+                        this._toolbox.dispose(),
+                    this._timeline && this._timeline.dispose(),
+                        this._messageCenter.unbind(),
+                        this.clear(),
+                        this._zr.dispose(),
+                        this._zr = null
+                  }
+                },
+                    s
+              }),
+          i("echarts/config", [],
+              function() {
+                var e = {
+                  CHART_TYPE_LINE: "line",
+                  CHART_TYPE_BAR: "bar",
+                  CHART_TYPE_SCATTER: "scatter",
+                  CHART_TYPE_PIE: "pie",
+                  CHART_TYPE_RADAR: "radar",
+                  CHART_TYPE_VENN: "venn",
+                  CHART_TYPE_TREEMAP: "treemap",
+                  CHART_TYPE_TREE: "tree",
+                  CHART_TYPE_MAP: "map",
+                  CHART_TYPE_K: "k",
+                  CHART_TYPE_ISLAND: "island",
+                  CHART_TYPE_FORCE: "force",
+                  CHART_TYPE_CHORD: "chord",
+                  CHART_TYPE_GAUGE: "gauge",
+                  CHART_TYPE_FUNNEL: "funnel",
+                  CHART_TYPE_EVENTRIVER: "eventRiver",
+                  CHART_TYPE_WORDCLOUD: "wordCloud",
+                  CHART_TYPE_HEATMAP: "heatmap",
+                  COMPONENT_TYPE_TITLE: "title",
+                  COMPONENT_TYPE_LEGEND: "legend",
+                  COMPONENT_TYPE_DATARANGE: "dataRange",
+                  COMPONENT_TYPE_DATAVIEW: "dataView",
+                  COMPONENT_TYPE_DATAZOOM: "dataZoom",
+                  COMPONENT_TYPE_TOOLBOX: "toolbox",
+                  COMPONENT_TYPE_TOOLTIP: "tooltip",
+                  COMPONENT_TYPE_GRID: "grid",
+                  COMPONENT_TYPE_AXIS: "axis",
+                  COMPONENT_TYPE_POLAR: "polar",
+                  COMPONENT_TYPE_X_AXIS: "xAxis",
+                  COMPONENT_TYPE_Y_AXIS: "yAxis",
+                  COMPONENT_TYPE_AXIS_CATEGORY: "categoryAxis",
+                  COMPONENT_TYPE_AXIS_VALUE: "valueAxis",
+                  COMPONENT_TYPE_TIMELINE: "timeline",
+                  COMPONENT_TYPE_ROAMCONTROLLER: "roamController",
+                  backgroundColor: "rgba(0,0,0,0)",
+                  color: ["#ff7f50", "#87cefa", "#da70d6", "#32cd32", "#6495ed", "#ff69b4", "#ba55d3", "#cd5c5c", "#ffa500", "#40e0d0", "#1e90ff", "#ff6347", "#7b68ee", "#00fa9a", "#ffd700", "#6699FF", "#ff6666", "#3cb371", "#b8860b", "#30e0e0"],
+                  markPoint: {
+                    clickable: !0,
+                    symbol: "pin",
+                    symbolSize: 10,
+                    large: !1,
+                    effect: {
+                      show: !1,
+                      loop: !0,
+                      period: 15,
+                      type: "scale",
+                      scaleSize: 2,
+                      bounceDistance: 10
+                    },
+                    itemStyle: {
+                      normal: {
+                        borderWidth: 2,
+                        label: {
+                          show: !0,
+                          position: "inside"
+                        }
+                      },
+                      emphasis: {
+                        label: {
+                          show: !0
+                        }
+                      }
+                    }
+                  },
+                  markLine: {
+                    clickable: !0,
+                    symbol: ["circle", "arrow"],
+                    symbolSize: [2, 4],
+                    smoothness: .2,
+                    precision: 2,
+                    effect: {
+                      show: !1,
+                      loop: !0,
+                      period: 15,
+                      scaleSize: 2
+                    },
+                    bundling: {
+                      enable: !1,
+                      maxTurningAngle: 45
+                    },
+                    itemStyle: {
+                      normal: {
+                        borderWidth: 1.5,
+                        label: {
+                          show: !0,
+                          position: "end"
+                        },
+                        lineStyle: {
+                          type: "dashed"
+                        }
+                      },
+                      emphasis: {
+                        label: {
+                          show: !1
+                        },
+                        lineStyle: {}
+                      }
+                    }
+                  },
+                  textStyle: {
+                    decoration: "none",
+                    fontFamily: "Arial, Verdana, sans-serif",
+                    fontFamily2: "微软雅黑",
+                    fontSize: 12,
+                    fontStyle: "normal",
+                    fontWeight: "normal"
+                  },
+                  EVENT: {
+                    REFRESH: "refresh",
+                    RESTORE: "restore",
+                    RESIZE: "resize",
+                    CLICK: "click",
+                    DBLCLICK: "dblclick",
+                    HOVER: "hover",
+                    MOUSEOUT: "mouseout",
+                    DATA_CHANGED: "dataChanged",
+                    DATA_ZOOM: "dataZoom",
+                    DATA_RANGE: "dataRange",
+                    DATA_RANGE_SELECTED: "dataRangeSelected",
+                    DATA_RANGE_HOVERLINK: "dataRangeHoverLink",
+                    LEGEND_SELECTED: "legendSelected",
+                    LEGEND_HOVERLINK: "legendHoverLink",
+                    MAP_SELECTED: "mapSelected",
+                    PIE_SELECTED: "pieSelected",
+                    MAGIC_TYPE_CHANGED: "magicTypeChanged",
+                    DATA_VIEW_CHANGED: "dataViewChanged",
+                    TIMELINE_CHANGED: "timelineChanged",
+                    MAP_ROAM: "mapRoam",
+                    FORCE_LAYOUT_END: "forceLayoutEnd",
+                    TOOLTIP_HOVER: "tooltipHover",
+                    TOOLTIP_IN_GRID: "tooltipInGrid",
+                    TOOLTIP_OUT_GRID: "tooltipOutGrid",
+                    ROAMCONTROLLER: "roamController"
+                  },
+                  DRAG_ENABLE_TIME: 120,
+                  EFFECT_ZLEVEL: 10,
+                  effectBlendAlpha: .95,
+                  symbolList: ["circle", "rectangle", "triangle", "diamond", "emptyCircle", "emptyRectangle", "emptyTriangle", "emptyDiamond"],
+                  loadingEffect: "spin",
+                  loadingText: "数据读取中...",
+                  noDataEffect: "bubble",
+                  noDataText: "暂无数据",
+                  calculable: !1,
+                  calculableColor: "rgba(255,165,0,0.6)",
+                  calculableHolderColor: "#ccc",
+                  nameConnector: " & ",
+                  valueConnector: ": ",
+                  animation: !0,
+                  addDataAnimation: !0,
+                  animationThreshold: 2e3,
+                  animationDuration: 2e3,
+                  animationDurationUpdate: 500,
+                  animationEasing: "ExponentialOut"
+                };
+                return e
+              }),
+          i("zrender/tool/util", ["require", "../dep/excanvas"],
+              function(e) {
+                function t(e) {
+                  return e && 1 === e.nodeType && "string" == typeof e.nodeName
+                }
+                function i(e) {
+                  if ("object" == typeof e && null !== e) {
+                    var n = e;
+                    if (e instanceof Array) {
+                      n = [];
+                      for (var a = 0,
+                               o = e.length; o > a; a++) n[a] = i(e[a])
+                    } else if (!y[g.call(e)] && !t(e)) {
+                      n = {};
+                      for (var r in e) e.hasOwnProperty(r) && (n[r] = i(e[r]))
+                    }
+                    return n
+                  }
+                  return e
+                }
+                function n(e, i, n, o) {
+                  if (i.hasOwnProperty(n)) {
+                    var r = e[n];
+                    "object" != typeof r || y[g.call(r)] || t(r) ? !o && n in e || (e[n] = i[n]) : a(e[n], i[n], o)
+                  }
+                }
+                function a(e, t, i) {
+                  for (var a in t) n(e, t, a, i);
+                  return e
+                }
+                function o() {
+                  if (!U) if (e("../dep/excanvas"), window.G_vmlCanvasManager) {
+                    var t = document.createElement("div");
+                    t.style.position = "absolute",
+                        t.style.top = "-1000px",
+                        document.body.appendChild(t),
+                        U = G_vmlCanvasManager.initElement(t).getContext("2d")
+                  } else U = document.createElement("canvas").getContext("2d");
+                  return U
+                }
+                function r(e, t) {
+                  if (e.indexOf) return e.indexOf(t);
+                  for (var i = 0,
+                           n = e.length; n > i; i++) if (e[i] === t) return i;
+                  return - 1
+                }
+                function s(e, t) {
+                  function i() {}
+                  var n = e.prototype;
+                  i.prototype = t.prototype,
+                      e.prototype = new i;
+                  for (var a in n) e.prototype[a] = n[a];
+                  e.constructor = e
+                }
+                function l(e, t, i) {
+                  if (e && t) if (e.forEach && e.forEach === p) e.forEach(t, i);
+                  else if (e.length === +e.length) for (var n = 0,
+                                                            a = e.length; a > n; n++) t.call(i, e[n], n, e);
+                  else for (var o in e) e.hasOwnProperty(o) && t.call(i, e[o], o, e)
+                }
+                function h(e, t, i) {
+                  if (e && t) {
+                    if (e.map && e.map === c) return e.map(t, i);
+                    for (var n = [], a = 0, o = e.length; o > a; a++) n.push(t.call(i, e[a], a, e));
+                    return n
+                  }
+                }
+                function m(e, t, i) {
+                  if (e && t) {
+                    if (e.filter && e.filter === u) return e.filter(t, i);
+                    for (var n = [], a = 0, o = e.length; o > a; a++) t.call(i, e[a], a, e) && n.push(e[a]);
+                    return n
+                  }
+                }
+                function V(e, t) {
+                  return function() {
+                    e.apply(t, arguments)
+                  }
+                }
+                var U, d = Array.prototype,
+                    p = d.forEach,
+                    c = d.map,
+                    u = d.filter,
+                    y = {
+                      "[object Function]": 1,
+                      "[object RegExp]": 1,
+                      "[object Date]": 1,
+                      "[object Error]": 1,
+                      "[object CanvasGradient]": 1
+                    },
+                    g = Object.prototype.toString;
+                return {
+                  inherits: s,
+                  clone: i,
+                  merge: a,
+                  getContext: o,
+                  indexOf: r,
+                  each: l,
+                  map: h,
+                  filter: m,
+                  bind: V
+                }
+              }),
+          i("zrender/tool/event", ["require", "../mixin/Eventful"],
+              function(e) {
+                "use strict";
+                function t(e) {
+                  return "undefined" != typeof e.zrenderX && e.zrenderX || "undefined" != typeof e.offsetX && e.offsetX || "undefined" != typeof e.layerX && e.layerX || "undefined" != typeof e.clientX && e.clientX
+                }
+                function i(e) {
+                  return "undefined" != typeof e.zrenderY && e.zrenderY || "undefined" != typeof e.offsetY && e.offsetY || "undefined" != typeof e.layerY && e.layerY || "undefined" != typeof e.clientY && e.clientY
+                }
+                function n(e) {
+                  return "undefined" != typeof e.zrenderDelta && e.zrenderDelta || "undefined" != typeof e.wheelDelta && e.wheelDelta || "undefined" != typeof e.detail && -e.detail
+                }
+                var a = e("../mixin/Eventful"),
+                    o = "function" == typeof window.addEventListener ?
+                        function(e) {
+                          e.preventDefault(),
+                              e.stopPropagation(),
+                              e.cancelBubble = !0
+                        }: function(e) {
+                          e.returnValue = !1,
+                              e.cancelBubble = !0
+                        };
+                return {
+                  getX: t,
+                  getY: i,
+                  getDelta: n,
+                  stop: o,
+                  Dispatcher: a
+                }
+              }),
+          i("zrender/tool/env", [],
+              function() {
+                function e(e) {
+                  var t = this.os = {},
+                      i = this.browser = {},
+                      n = e.match(/Web[kK]it[\/]{0,1}([\d.]+)/),
+                      a = e.match(/(Android);?[\s\/]+([\d.]+)?/),
+                      o = e.match(/(iPad).*OS\s([\d_]+)/),
+                      r = e.match(/(iPod)(.*OS\s([\d_]+))?/),
+                      s = !o && e.match(/(iPhone\sOS)\s([\d_]+)/),
+                      l = e.match(/(webOS|hpwOS)[\s\/]([\d.]+)/),
+                      h = l && e.match(/TouchPad/),
+                      m = e.match(/Kindle\/([\d.]+)/),
+                      V = e.match(/Silk\/([\d._]+)/),
+                      U = e.match(/(BlackBerry).*Version\/([\d.]+)/),
+                      d = e.match(/(BB10).*Version\/([\d.]+)/),
+                      p = e.match(/(RIM\sTablet\sOS)\s([\d.]+)/),
+                      c = e.match(/PlayBook/),
+                      u = e.match(/Chrome\/([\d.]+)/) || e.match(/CriOS\/([\d.]+)/),
+                      y = e.match(/Firefox\/([\d.]+)/),
+                      g = e.match(/MSIE ([\d.]+)/),
+                      b = n && e.match(/Mobile\//) && !u,
+                      f = e.match(/(iPhone|iPod|iPad).*AppleWebKit(?!.*Safari)/) && !u,
+                      g = e.match(/MSIE\s([\d.]+)/);
+                  return (i.webkit = !!n) && (i.version = n[1]),
+                  a && (t.android = !0, t.version = a[2]),
+                  s && !r && (t.ios = t.iphone = !0, t.version = s[2].replace(/_/g, ".")),
+                  o && (t.ios = t.ipad = !0, t.version = o[2].replace(/_/g, ".")),
+                  r && (t.ios = t.ipod = !0, t.version = r[3] ? r[3].replace(/_/g, ".") : null),
+                  l && (t.webos = !0, t.version = l[2]),
+                  h && (t.touchpad = !0),
+                  U && (t.blackberry = !0, t.version = U[2]),
+                  d && (t.bb10 = !0, t.version = d[2]),
+                  p && (t.rimtabletos = !0, t.version = p[2]),
+                  c && (i.playbook = !0),
+                  m && (t.kindle = !0, t.version = m[1]),
+                  V && (i.silk = !0, i.version = V[1]),
+                  !V && t.android && e.match(/Kindle Fire/) && (i.silk = !0),
+                  u && (i.chrome = !0, i.version = u[1]),
+                  y && (i.firefox = !0, i.version = y[1]),
+                  g && (i.ie = !0, i.version = g[1]),
+                  b && (e.match(/Safari/) || t.ios) && (i.safari = !0),
+                  f && (i.webview = !0),
+                  g && (i.ie = !0, i.version = g[1]),
+                      t.tablet = !!(o || c || a && !e.match(/Mobile/) || y && e.match(/Tablet/) || g && !e.match(/Phone/) && e.match(/Touch/)),
+                      t.phone = !(t.tablet || t.ipod || !(a || s || l || U || d || u && e.match(/Android/) || u && e.match(/CriOS\/([\d.]+)/) || y && e.match(/Mobile/) || g && e.match(/Touch/))),
+                      {
+                        browser: i,
+                        os: t,
+                        canvasSupported: document.createElement("canvas").getContext ? !0 : !1
+                      }
+                }
+                return e(navigator.userAgent)
+              }),
+          i("zrender", ["zrender/zrender"],
+              function(e) {
+                return e
+              }),
+          i("zrender/zrender", ["require", "./dep/excanvas", "./tool/util", "./tool/log", "./tool/guid", "./Handler", "./Painter", "./Storage", "./animation/Animation", "./tool/env"],
+              function(e) {
+                function t(e) {
+                  return function() {
+                    e._needsRefreshNextFrame && e.refresh()
+                  }
+                }
+                e("./dep/excanvas");
+                var i = e("./tool/util"),
+                    n = e("./tool/log"),
+                    a = e("./tool/guid"),
+                    o = e("./Handler"),
+                    r = e("./Painter"),
+                    s = e("./Storage"),
+                    l = e("./animation/Animation"),
+                    h = {},
+                    m = {};
+                m.version = "2.1.1",
+                    m.init = function(e) {
+                      var t = new V(a(), e);
+                      return h[t.id] = t,
+                          t
+                    },
+                    m.dispose = function(e) {
+                      if (e) e.dispose();
+                      else {
+                        for (var t in h) h[t].dispose();
+                        h = {}
+                      }
+                      return m
+                    },
+                    m.getInstance = function(e) {
+                      return h[e]
+                    },
+                    m.delInstance = function(e) {
+                      return delete h[e],
+                          m
+                    };
+                var V = function(i, n) {
+                  this.id = i,
+                      this.env = e("./tool/env"),
+                      this.storage = new s,
+                      this.painter = new r(n, this.storage),
+                      this.handler = new o(n, this.storage, this.painter),
+                      this.animation = new l({
+                        stage: {
+                          update: t(this)
+                        }
+                      }),
+                      this.animation.start();
+                  var a = this;
+                  this.painter.refreshNextFrame = function() {
+                    a.refreshNextFrame()
+                  },
+                      this._needsRefreshNextFrame = !1;
+                  var a = this,
+                      h = this.storage,
+                      m = h.delFromMap;
+                  h.delFromMap = function(e) {
+                    var t = h.get(e);
+                    a.stopAnimation(t),
+                        m.call(h, e)
+                  }
+                };
+                return V.prototype.getId = function() {
+                  return this.id
+                },
+                    V.prototype.addShape = function(e) {
+                      return this.addElement(e),
+                          this
+                    },
+                    V.prototype.addGroup = function(e) {
+                      return this.addElement(e),
+                          this
+                    },
+                    V.prototype.delShape = function(e) {
+                      return this.delElement(e),
+                          this
+                    },
+                    V.prototype.delGroup = function(e) {
+                      return this.delElement(e),
+                          this
+                    },
+                    V.prototype.modShape = function(e, t) {
+                      return this.modElement(e, t),
+                          this
+                    },
+                    V.prototype.modGroup = function(e, t) {
+                      return this.modElement(e, t),
+                          this
+                    },
+                    V.prototype.addElement = function(e) {
+                      return this.storage.addRoot(e),
+                          this._needsRefreshNextFrame = !0,
+                          this
+                    },
+                    V.prototype.delElement = function(e) {
+                      return this.storage.delRoot(e),
+                          this._needsRefreshNextFrame = !0,
+                          this
+                    },
+                    V.prototype.modElement = function(e, t) {
+                      return this.storage.mod(e, t),
+                          this._needsRefreshNextFrame = !0,
+                          this
+                    },
+                    V.prototype.modLayer = function(e, t) {
+                      return this.painter.modLayer(e, t),
+                          this._needsRefreshNextFrame = !0,
+                          this
+                    },
+                    V.prototype.addHoverShape = function(e) {
+                      return this.storage.addHover(e),
+                          this
+                    },
+                    V.prototype.render = function(e) {
+                      return this.painter.render(e),
+                          this._needsRefreshNextFrame = !1,
+                          this
+                    },
+                    V.prototype.refresh = function(e) {
+                      return this.painter.refresh(e),
+                          this._needsRefreshNextFrame = !1,
+                          this
+                    },
+                    V.prototype.refreshNextFrame = function() {
+                      return this._needsRefreshNextFrame = !0,
+                          this
+                    },
+                    V.prototype.refreshHover = function(e) {
+                      return this.painter.refreshHover(e),
+                          this
+                    },
+                    V.prototype.refreshShapes = function(e, t) {
+                      return this.painter.refreshShapes(e, t),
+                          this
+                    },
+                    V.prototype.resize = function() {
+                      return this.painter.resize(),
+                          this
+                    },
+                    V.prototype.animate = function(e, t, a) {
+                      var o = this;
+                      if ("string" == typeof e && (e = this.storage.get(e)), e) {
+                        var r;
+                        if (t) {
+                          for (var s = t.split("."), l = e, h = 0, m = s.length; m > h; h++) l && (l = l[s[h]]);
+                          l && (r = l)
+                        } else r = e;
+                        if (!r) return void n('Property "' + t + '" is not existed in element ' + e.id);
+
+                        null == e.__animators && (e.__animators = []);
+                        var V = e.__animators,
+                            U = this.animation.animate(r, {
+                              loop: a
+                            }).during(function() {
+                              o.modShape(e)
+                            }).done(function() {
+                              var t = i.indexOf(e.__animators, U);
+                              t >= 0 && V.splice(t, 1)
+                            });
+                        return V.push(U),
+                            U
+                      }
+                      n("Element not existed")
+                    },
+                    V.prototype.stopAnimation = function(e) {
+                      if (e.__animators) {
+                        for (var t = e.__animators,
+                                 i = t.length,
+                                 n = 0; i > n; n++) t[n].stop();
+                        t.length = 0
+                      }
+                      return this
+                    },
+                    V.prototype.clearAnimation = function() {
+                      return this.animation.clear(),
+                          this
+                    },
+                    V.prototype.showLoading = function(e) {
+                      return this.painter.showLoading(e),
+                          this
+                    },
+                    V.prototype.hideLoading = function() {
+                      return this.painter.hideLoading(),
+                          this
+                    },
+                    V.prototype.getWidth = function() {
+                      return this.painter.getWidth()
+                    },
+                    V.prototype.getHeight = function() {
+                      return this.painter.getHeight()
+                    },
+                    V.prototype.toDataURL = function(e, t, i) {
+                      return this.painter.toDataURL(e, t, i)
+                    },
+                    V.prototype.shapeToImage = function(e, t, i) {
+                      var n = a();
+                      return this.painter.shapeToImage(n, e, t, i)
+                    },
+                    V.prototype.on = function(e, t, i) {
+                      return this.handler.on(e, t, i),
+                          this
+                    },
+                    V.prototype.un = function(e, t) {
+                      return this.handler.un(e, t),
+                          this
+                    },
+                    V.prototype.trigger = function(e, t) {
+                      return this.handler.trigger(e, t),
+                          this
+                    },
+                    V.prototype.clear = function() {
+                      return this.storage.delRoot(),
+                          this.painter.clear(),
+                          this
+                    },
+                    V.prototype.dispose = function() {
+                      this.animation.stop(),
+                          this.clear(),
+                          this.storage.dispose(),
+                          this.painter.dispose(),
+                          this.handler.dispose(),
+                          this.animation = this.storage = this.painter = this.handler = null,
+                          m.delInstance(this.id)
+                    },
+                    m
+              }),
+          i("zrender/config", [],
+              function() {
+                var e = {
+                  EVENT: {
+                    RESIZE: "resize",
+                    CLICK: "click",
+                    DBLCLICK: "dblclick",
+                    MOUSEWHEEL: "mousewheel",
+                    MOUSEMOVE: "mousemove",
+                    MOUSEOVER: "mouseover",
+                    MOUSEOUT: "mouseout",
+                    MOUSEDOWN: "mousedown",
+                    MOUSEUP: "mouseup",
+                    GLOBALOUT: "globalout",
+                    DRAGSTART: "dragstart",
+                    DRAGEND: "dragend",
+                    DRAGENTER: "dragenter",
+                    DRAGOVER: "dragover",
+                    DRAGLEAVE: "dragleave",
+                    DROP: "drop",
+                    touchClickDelay: 300
+                  },
+                  elementClassName: "zr-element",
+                  catchBrushException: !1,
+                  debugMode: 0,
+                  devicePixelRatio: Math.max(window.devicePixelRatio || 1, 1)
+                };
+                return e
+              }),
+          i("echarts/chart/island", ["require", "./base", "zrender/shape/Circle", "../config", "../util/ecData", "zrender/tool/util", "zrender/tool/event", "zrender/tool/color", "../util/accMath", "../chart"],
+              function(e) {
+                function t(e, t, n, a, r) {
+                  i.call(this, e, t, n, a, r),
+                      this._nameConnector,
+                      this._valueConnector,
+                      this._zrHeight = this.zr.getHeight(),
+                      this._zrWidth = this.zr.getWidth();
+                  var l = this;
+                  l.shapeHandler.onmousewheel = function(e) {
+                    var t = e.target,
+                        i = e.event,
+                        n = s.getDelta(i);
+                    n = n > 0 ? -1 : 1,
+                        t.style.r -= n,
+                        t.style.r = t.style.r < 5 ? 5 : t.style.r;
+                    var a = o.get(t, "value"),
+                        r = a * l.option.island.calculateStep;
+                    a = r > 1 ? Math.round(a - r * n) : +(a - r * n).toFixed(2);
+                    var h = o.get(t, "name");
+                    t.style.text = h + ":" + a,
+                        o.set(t, "value", a),
+                        o.set(t, "name", h),
+                        l.zr.modShape(t.id),
+                        l.zr.refreshNextFrame(),
+                        s.stop(i)
+                  }
+                }
+                var i = e("./base"),
+                    n = e("zrender/shape/Circle"),
+                    a = e("../config");
+                a.island = {
+                  zlevel: 0,
+                  z: 5,
+                  r: 15,
+                  calculateStep: .1
+                };
+                var o = e("../util/ecData"),
+                    r = e("zrender/tool/util"),
+                    s = e("zrender/tool/event");
+                return t.prototype = {
+                  type: a.CHART_TYPE_ISLAND,
+                  _combine: function(t, i) {
+                    var n = e("zrender/tool/color"),
+                        a = e("../util/accMath"),
+                        r = a.accAdd(o.get(t, "value"), o.get(i, "value")),
+                        s = o.get(t, "name") + this._nameConnector + o.get(i, "name");
+                    t.style.text = s + this._valueConnector + r,
+                        o.set(t, "value", r),
+                        o.set(t, "name", s),
+                        t.style.r = this.option.island.r,
+                        t.style.color = n.mix(t.style.color, i.style.color)
+                  },
+                  refresh: function(e) {
+                    e && (e.island = this.reformOption(e.island), this.option = e, this._nameConnector = this.option.nameConnector, this._valueConnector = this.option.valueConnector)
+                  },
+                  getOption: function() {
+                    return this.option
+                  },
+                  resize: function() {
+                    var e = this.zr.getWidth(),
+                        t = this.zr.getHeight(),
+                        i = e / (this._zrWidth || e),
+                        n = t / (this._zrHeight || t);
+                    if (1 !== i || 1 !== n) {
+                      this._zrWidth = e,
+                          this._zrHeight = t;
+                      for (var a = 0,
+                               o = this.shapeList.length; o > a; a++) this.zr.modShape(this.shapeList[a].id, {
+                        style: {
+                          x: Math.round(this.shapeList[a].style.x * i),
+                          y: Math.round(this.shapeList[a].style.y * n)
+                        }
+                      })
+                    }
+                  },
+                  add: function(e) {
+                    var t = o.get(e, "name"),
+                        i = o.get(e, "value"),
+                        a = null != o.get(e, "series") ? o.get(e, "series").name: "",
+                        r = this.getFont(this.option.island.textStyle),
+                        s = this.option.island,
+                        l = {
+                          zlevel: s.zlevel,
+                          z: s.z,
+                          style: {
+                            x: e.style.x,
+                            y: e.style.y,
+                            r: this.option.island.r,
+                            color: e.style.color || e.style.strokeColor,
+                            text: t + this._valueConnector + i,
+                            textFont: r
+                          },
+                          draggable: !0,
+                          hoverable: !0,
+                          onmousewheel: this.shapeHandler.onmousewheel,
+                          _type: "island"
+                        };
+                    "#fff" === l.style.color && (l.style.color = e.style.strokeColor),
+                        this.setCalculable(l),
+                        l.dragEnableTime = 0,
+                        o.pack(l, {
+                              name: a
+                            },
+                            -1, i, -1, t),
+                        l = new n(l),
+                        this.shapeList.push(l),
+                        this.zr.addShape(l)
+                  },
+                  del: function(e) {
+                    this.zr.delShape(e.id);
+                    for (var t = [], i = 0, n = this.shapeList.length; n > i; i++) this.shapeList[i].id != e.id && t.push(this.shapeList[i]);
+                    this.shapeList = t
+                  },
+                  ondrop: function(e, t) {
+                    if (this.isDrop && e.target) {
+                      var i = e.target,
+                          n = e.dragged;
+                      this._combine(i, n),
+                          this.zr.modShape(i.id),
+                          t.dragIn = !0,
+                          this.isDrop = !1
+                    }
+                  },
+                  ondragend: function(e, t) {
+                    var i = e.target;
+                    this.isDragend ? t.dragIn && (this.del(i), t.needRefresh = !0) : t.dragIn || (i.style.x = s.getX(e.event), i.style.y = s.getY(e.event), this.add(i), t.needRefresh = !0),
+                        this.isDragend = !1
+                  }
+                },
+                    r.inherits(t, i),
+                    e("../chart").define("island", t),
+                    t
+              }),
+          i("echarts/component/toolbox", ["require", "./base", "zrender/shape/Line", "zrender/shape/Image", "zrender/shape/Rectangle", "../util/shape/Icon", "../config", "zrender/tool/util", "zrender/config", "zrender/tool/event", "./dataView", "../component"],
+              function(e) {
+                function t(e, t, n, a, o) {
+                  i.call(this, e, t, n, a, o),
+                      this.dom = o.dom,
+                      this._magicType = {},
+                      this._magicMap = {},
+                      this._isSilence = !1,
+                      this._iconList,
+                      this._iconShapeMap = {},
+                      this._featureTitle = {},
+                      this._featureIcon = {},
+                      this._featureColor = {},
+                      this._featureOption = {},
+                      this._enableColor = "red",
+                      this._disableColor = "#ccc",
+                      this._markShapeList = [];
+                  var r = this;
+                  r._onMark = function(e) {
+                    r.__onMark(e)
+                  },
+                      r._onMarkUndo = function(e) {
+                        r.__onMarkUndo(e)
+                      },
+                      r._onMarkClear = function(e) {
+                        r.__onMarkClear(e)
+                      },
+                      r._onDataZoom = function(e) {
+                        r.__onDataZoom(e)
+                      },
+                      r._onDataZoomReset = function(e) {
+                        r.__onDataZoomReset(e)
+                      },
+                      r._onDataView = function(e) {
+                        r.__onDataView(e)
+                      },
+                      r._onRestore = function(e) {
+                        r.__onRestore(e)
+                      },
+                      r._onSaveAsImage = function(e) {
+                        r.__onSaveAsImage(e)
+                      },
+                      r._onMagicType = function(e) {
+                        r.__onMagicType(e)
+                      },
+                      r._onCustomHandler = function(e) {
+                        r.__onCustomHandler(e)
+                      },
+                      r._onmousemove = function(e) {
+                        return r.__onmousemove(e)
+                      },
+                      r._onmousedown = function(e) {
+                        return r.__onmousedown(e)
+                      },
+                      r._onmouseup = function(e) {
+                        return r.__onmouseup(e)
+                      },
+                      r._onclick = function(e) {
+                        return r.__onclick(e)
+                      }
+                }
+                var i = e("./base"),
+                    n = e("zrender/shape/Line"),
+                    a = e("zrender/shape/Image"),
+                    o = e("zrender/shape/Rectangle"),
+                    r = e("../util/shape/Icon"),
+                    s = e("../config");
+                s.toolbox = {
+                  zlevel: 0,
+                  z: 6,
+                  show: !1,
+                  orient: "horizontal",
+                  x: "right",
+                  y: "top",
+                  color: ["#1e90ff", "#22bb22", "#4b0082", "#d2691e"],
+                  disableColor: "#ddd",
+                  effectiveColor: "red",
+                  backgroundColor: "rgba(0,0,0,0)",
+                  borderColor: "#ccc",
+                  borderWidth: 0,
+                  padding: 5,
+                  itemGap: 10,
+                  itemSize: 16,
+                  showTitle: !0,
+                  feature: {
+                    mark: {
+                      show: !1,
+                      title: {
+                        mark: "辅助线开关",
+                        markUndo: "删除辅助线",
+                        markClear: "清空辅助线"
+                      },
+                      lineStyle: {
+                        width: 1,
+                        color: "#1e90ff",
+                        type: "dashed"
+                      }
+                    },
+                    dataZoom: {
+                      show: !1,
+                      title: {
+                        dataZoom: "区域缩放",
+                        dataZoomReset: "区域缩放后退"
+                      }
+                    },
+                    dataView: {
+                      show: !1,
+                      title: "数据视图",
+                      readOnly: !1,
+                      lang: ["数据视图", "关闭", "刷新"]
+                    },
+                    magicType: {
+                      show: !1,
+                      title: {
+                        line: "折线图切换",
+                        bar: "柱形图切换",
+                        stack: "堆积",
+                        tiled: "平铺",
+                        force: "力导向布局图切换",
+                        chord: "和弦图切换",
+                        pie: "饼图切换",
+                        funnel: "漏斗图切换"
+                      },
+                      type: []
+                    },
+                    restore: {
+                      show: !1,
+                      title: "还原"
+                    },
+                    saveAsImage: {
+                      show: !1,
+                      title: "保存为图片",
+                      type: "png",
+                      lang: ["点击保存"]
+                    }
+                  }
+                };
+                var l = e("zrender/tool/util"),
+                    h = e("zrender/config"),
+                    m = e("zrender/tool/event"),
+                    V = "stack",
+                    U = "tiled";
+                return t.prototype = {
+                  type: s.COMPONENT_TYPE_TOOLBOX,
+                  _buildShape: function() {
+                    this._iconList = [];
+                    var e = this.option.toolbox;
+                    this._enableColor = e.effectiveColor,
+                        this._disableColor = e.disableColor;
+                    var t = e.feature,
+                        i = [];
+                    for (var n in t) if (t[n].show) switch (n) {
+                      case "mark":
+                        i.push({
+                          key:
+                          n,
+                          name: "mark"
+                        }),
+                            i.push({
+                              key: n,
+                              name: "markUndo"
+                            }),
+                            i.push({
+                              key: n,
+                              name: "markClear"
+                            });
+                        break;
+                      case "magicType":
+                        for (var a = 0,
+                                 o = t[n].type.length; o > a; a++) t[n].title[t[n].type[a] + "Chart"] = t[n].title[t[n].type[a]],
+                        t[n].option && (t[n].option[t[n].type[a] + "Chart"] = t[n].option[t[n].type[a]]),
+                            i.push({
+                              key: n,
+                              name: t[n].type[a] + "Chart"
+                            });
+                        break;
+                      case "dataZoom":
+                        i.push({
+                          key:
+                          n,
+                          name: "dataZoom"
+                        }),
+                            i.push({
+                              key: n,
+                              name: "dataZoomReset"
+                            });
+                        break;
+                      case "saveAsImage":
+                        this.canvasSupported && i.push({
+                          key: n,
+                          name: "saveAsImage"
+                        });
+                        break;
+                      default:
+                        i.push({
+                          key:
+                          n,
+                          name: n
+                        })
+                    }
+                    if (i.length > 0) {
+                      for (var r, n, a = 0,
+                               o = i.length; o > a; a++) r = i[a].name,
+                          n = i[a].key,
+                          this._iconList.push(r),
+                          this._featureTitle[r] = t[n].title[r] || t[n].title,
+                      t[n].icon && (this._featureIcon[r] = t[n].icon[r] || t[n].icon),
+                      t[n].color && (this._featureColor[r] = t[n].color[r] || t[n].color),
+                      t[n].option && (this._featureOption[r] = t[n].option[r] || t[n].option);
+                      this._itemGroupLocation = this._getItemGroupLocation(),
+                          this._buildBackground(),
+                          this._buildItem();
+                      for (var a = 0,
+                               o = this.shapeList.length; o > a; a++) this.zr.addShape(this.shapeList[a]);
+                      this._iconShapeMap.mark && (this._iconDisable(this._iconShapeMap.markUndo), this._iconDisable(this._iconShapeMap.markClear)),
+                      this._iconShapeMap.dataZoomReset && 0 === this._zoomQueue.length && this._iconDisable(this._iconShapeMap.dataZoomReset)
+                    }
+                  },
+                  _buildItem: function() {
+                    var t, i, n, o, s = this.option.toolbox,
+                        l = this._iconList.length,
+                        h = this._itemGroupLocation.x,
+                        m = this._itemGroupLocation.y,
+                        V = s.itemSize,
+                        U = s.itemGap,
+                        d = s.color instanceof Array ? s.color: [s.color],
+                        p = this.getFont(s.textStyle);
+                    "horizontal" === s.orient ? (i = this._itemGroupLocation.y / this.zr.getHeight() < .5 ? "bottom": "top", n = this._itemGroupLocation.x / this.zr.getWidth() < .5 ? "left": "right", o = this._itemGroupLocation.y / this.zr.getHeight() < .5 ? "top": "bottom") : i = this._itemGroupLocation.x / this.zr.getWidth() < .5 ? "right": "left",
+                        this._iconShapeMap = {};
+                    for (var c = this,
+                             u = 0; l > u; u++) {
+                      switch (t = {
+                        type: "icon",
+                        zlevel: this.getZlevelBase(),
+                        z: this.getZBase(),
+                        style: {
+                          x: h,
+                          y: m,
+                          width: V,
+                          height: V,
+                          iconType: this._iconList[u],
+                          lineWidth: 1,
+                          strokeColor: this._featureColor[this._iconList[u]] || d[u % d.length],
+                          brushType: "stroke"
+                        },
+                        highlightStyle: {
+                          lineWidth: 1,
+                          text: s.showTitle ? this._featureTitle[this._iconList[u]] : void 0,
+                          textFont: p,
+                          textPosition: i,
+                          strokeColor: this._featureColor[this._iconList[u]] || d[u % d.length]
+                        },
+                        hoverable: !0,
+                        clickable: !0
+                      },
+                      this._featureIcon[this._iconList[u]] && (t.style.image = this._featureIcon[this._iconList[u]].replace(new RegExp("^image:\\/\\/"), ""), t.style.opacity = .8, t.highlightStyle.opacity = 1, t.type = "image"), "horizontal" === s.orient && (0 === u && "left" === n && (t.highlightStyle.textPosition = "specific", t.highlightStyle.textAlign = n, t.highlightStyle.textBaseline = o, t.highlightStyle.textX = h, t.highlightStyle.textY = "top" === o ? m + V + 10 : m - 10), u === l - 1 && "right" === n && (t.highlightStyle.textPosition = "specific", t.highlightStyle.textAlign = n, t.highlightStyle.textBaseline = o, t.highlightStyle.textX = h + V, t.highlightStyle.textY = "top" === o ? m + V + 10 : m - 10)), this._iconList[u]) {
+                        case "mark":
+                          t.onclick = c._onMark;
+                          break;
+                        case "markUndo":
+                          t.onclick = c._onMarkUndo;
+                          break;
+                        case "markClear":
+                          t.onclick = c._onMarkClear;
+                          break;
+                        case "dataZoom":
+                          t.onclick = c._onDataZoom;
+                          break;
+                        case "dataZoomReset":
+                          t.onclick = c._onDataZoomReset;
+                          break;
+                        case "dataView":
+                          if (!this._dataView) {
+                            var y = e("./dataView");
+                            this._dataView = new y(this.ecTheme, this.messageCenter, this.zr, this.option, this.myChart)
+                          }
+                          t.onclick = c._onDataView;
+                          break;
+                        case "restore":
+                          t.onclick = c._onRestore;
+                          break;
+                        case "saveAsImage":
+                          t.onclick = c._onSaveAsImage;
+                          break;
+                        default:
+                          this._iconList[u].match("Chart") ? (t._name = this._iconList[u].replace("Chart", ""), t.onclick = c._onMagicType) : t.onclick = c._onCustomHandler
+                      }
+                      "icon" === t.type ? t = new r(t) : "image" === t.type && (t = new a(t)),
+                          this.shapeList.push(t),
+                          this._iconShapeMap[this._iconList[u]] = t,
+                          "horizontal" === s.orient ? h += V + U: m += V + U
+                    }
+                  },
+                  _buildBackground: function() {
+                    var e = this.option.toolbox,
+                        t = this.reformCssArray(this.option.toolbox.padding);
+                    this.shapeList.push(new o({
+                      zlevel: this.getZlevelBase(),
+                      z: this.getZBase(),
+                      hoverable: !1,
+                      style: {
+                        x: this._itemGroupLocation.x - t[3],
+                        y: this._itemGroupLocation.y - t[0],
+                        width: this._itemGroupLocation.width + t[3] + t[1],
+                        height: this._itemGroupLocation.height + t[0] + t[2],
+                        brushType: 0 === e.borderWidth ? "fill": "both",
+                        color: e.backgroundColor,
+                        strokeColor: e.borderColor,
+                        lineWidth: e.borderWidth
+                      }
+                    }))
+                  },
+                  _getItemGroupLocation: function() {
+                    var e = this.option.toolbox,
+                        t = this.reformCssArray(this.option.toolbox.padding),
+                        i = this._iconList.length,
+                        n = e.itemGap,
+                        a = e.itemSize,
+                        o = 0,
+                        r = 0;
+                    "horizontal" === e.orient ? (o = (a + n) * i - n, r = a) : (r = (a + n) * i - n, o = a);
+                    var s, l = this.zr.getWidth();
+                    switch (e.x) {
+                      case "center":
+                        s = Math.floor((l - o) / 2);
+                        break;
+                      case "left":
+                        s = t[3] + e.borderWidth;
+                        break;
+                      case "right":
+                        s = l - o - t[1] - e.borderWidth;
+                        break;
+                      default:
+                        s = e.x - 0,
+                            s = isNaN(s) ? 0 : s
+                    }
+                    var h, m = this.zr.getHeight();
+                    switch (e.y) {
+                      case "top":
+                        h = t[0] + e.borderWidth;
+                        break;
+                      case "bottom":
+                        h = m - r - t[2] - e.borderWidth;
+                        break;
+                      case "center":
+                        h = Math.floor((m - r) / 2);
+                        break;
+                      default:
+                        h = e.y - 0,
+                            h = isNaN(h) ? 0 : h
+                    }
+                    return {
+                      x: s,
+                      y: h,
+                      width: o,
+                      height: r
+                    }
+                  },
+                  __onmousemove: function(e) {
+                    this._marking && (this._markShape.style.xEnd = m.getX(e.event), this._markShape.style.yEnd = m.getY(e.event), this.zr.addHoverShape(this._markShape)),
+                    this._zooming && (this._zoomShape.style.width = m.getX(e.event) - this._zoomShape.style.x, this._zoomShape.style.height = m.getY(e.event) - this._zoomShape.style.y, this.zr.addHoverShape(this._zoomShape), this.dom.style.cursor = "crosshair", m.stop(e.event)),
+                    this._zoomStart && "pointer" != this.dom.style.cursor && "move" != this.dom.style.cursor && (this.dom.style.cursor = "crosshair")
+                  },
+                  __onmousedown: function(e) {
+                    if (!e.target) {
+                      this._zooming = !0;
+                      var t = m.getX(e.event),
+                          i = m.getY(e.event),
+                          n = this.option.dataZoom || {};
+                      return this._zoomShape = new o({
+                        zlevel: this.getZlevelBase(),
+                        z: this.getZBase(),
+                        style: {
+                          x: t,
+                          y: i,
+                          width: 1,
+                          height: 1,
+                          brushType: "both"
+                        },
+                        highlightStyle: {
+                          lineWidth: 2,
+                          color: n.fillerColor || s.dataZoom.fillerColor,
+                          strokeColor: n.handleColor || s.dataZoom.handleColor,
+                          brushType: "both"
+                        }
+                      }),
+                          this.zr.addHoverShape(this._zoomShape),
+                          !0
+                    }
+                  },
+                  __onmouseup: function() {
+                    if (!this._zoomShape || Math.abs(this._zoomShape.style.width) < 10 || Math.abs(this._zoomShape.style.height) < 10) return this._zooming = !1,
+                        !0;
+                    if (this._zooming && this.component.dataZoom) {
+                      this._zooming = !1;
+                      var e = this.component.dataZoom.rectZoom(this._zoomShape.style);
+                      e && (this._zoomQueue.push({
+                        start: e.start,
+                        end: e.end,
+                        start2: e.start2,
+                        end2: e.end2
+                      }), this._iconEnable(this._iconShapeMap.dataZoomReset), this.zr.refreshNextFrame())
+                    }
+                    return ! 0
+                  },
+                  __onclick: function(e) {
+                    if (!e.target) if (this._marking) this._marking = !1,
+                        this._markShapeList.push(this._markShape),
+                        this._iconEnable(this._iconShapeMap.markUndo),
+                        this._iconEnable(this._iconShapeMap.markClear),
+                        this.zr.addShape(this._markShape),
+                        this.zr.refreshNextFrame();
+                    else if (this._markStart) {
+                      this._marking = !0;
+                      var t = m.getX(e.event),
+                          i = m.getY(e.event);
+                      this._markShape = new n({
+                        zlevel: this.getZlevelBase(),
+                        z: this.getZBase(),
+                        style: {
+                          xStart: t,
+                          yStart: i,
+                          xEnd: t,
+                          yEnd: i,
+                          lineWidth: this.query(this.option, "toolbox.feature.mark.lineStyle.width"),
+                          strokeColor: this.query(this.option, "toolbox.feature.mark.lineStyle.color"),
+                          lineType: this.query(this.option, "toolbox.feature.mark.lineStyle.type")
+                        }
+                      }),
+                          this.zr.addHoverShape(this._markShape)
+                    }
+                  },
+                  __onMark: function(e) {
+                    var t = e.target;
+                    if (this._marking || this._markStart) this._resetMark(),
+                        this.zr.refreshNextFrame();
+                    else {
+                      this._resetZoom(),
+                          this.zr.modShape(t.id, {
+                            style: {
+                              strokeColor: this._enableColor
+                            }
+                          }),
+                          this.zr.refreshNextFrame(),
+                          this._markStart = !0;
+                      var i = this;
+                      setTimeout(function() {
+                            i.zr && i.zr.on(h.EVENT.CLICK, i._onclick) && i.zr.on(h.EVENT.MOUSEMOVE, i._onmousemove)
+                          },
+                          10)
+                    }
+                    return ! 0
+                  },
+                  __onMarkUndo: function() {
+                    if (this._marking) this._marking = !1;
+                    else {
+                      var e = this._markShapeList.length;
+                      if (e >= 1) {
+                        var t = this._markShapeList[e - 1];
+                        this.zr.delShape(t.id),
+                            this.zr.refreshNextFrame(),
+                            this._markShapeList.pop(),
+                        1 === e && (this._iconDisable(this._iconShapeMap.markUndo), this._iconDisable(this._iconShapeMap.markClear))
+                      }
+                    }
+                    return ! 0
+                  },
+                  __onMarkClear: function() {
+                    this._marking && (this._marking = !1);
+                    var e = this._markShapeList.length;
+                    if (e > 0) {
+                      for (; e--;) this.zr.delShape(this._markShapeList.pop().id);
+                      this._iconDisable(this._iconShapeMap.markUndo),
+                          this._iconDisable(this._iconShapeMap.markClear),
+                          this.zr.refreshNextFrame()
+                    }
+                    return ! 0
+                  },
+                  __onDataZoom: function(e) {
+                    var t = e.target;
+                    if (this._zooming || this._zoomStart) this._resetZoom(),
+                        this.zr.refreshNextFrame(),
+                        this.dom.style.cursor = "default";
+                    else {
+                      this._resetMark(),
+                          this.zr.modShape(t.id, {
+                            style: {
+                              strokeColor: this._enableColor
+                            }
+                          }),
+                          this.zr.refreshNextFrame(),
+                          this._zoomStart = !0;
+                      var i = this;
+                      setTimeout(function() {
+                            i.zr && i.zr.on(h.EVENT.MOUSEDOWN, i._onmousedown) && i.zr.on(h.EVENT.MOUSEUP, i._onmouseup) && i.zr.on(h.EVENT.MOUSEMOVE, i._onmousemove)
+                          },
+                          10),
+                          this.dom.style.cursor = "crosshair"
+                    }
+                    return ! 0
+                  },
+                  __onDataZoomReset: function() {
+                    return this._zooming && (this._zooming = !1),
+                        this._zoomQueue.pop(),
+                        this._zoomQueue.length > 0 ? this.component.dataZoom.absoluteZoom(this._zoomQueue[this._zoomQueue.length - 1]) : (this.component.dataZoom.rectZoom(), this._iconDisable(this._iconShapeMap.dataZoomReset), this.zr.refreshNextFrame()),
+                        !0
+                  },
+                  _resetMark: function() {
+                    this._marking = !1,
+                    this._markStart && (this._markStart = !1, this._iconShapeMap.mark && this.zr.modShape(this._iconShapeMap.mark.id, {
+                      style: {
+                        strokeColor: this._iconShapeMap.mark.highlightStyle.strokeColor
+                      }
+                    }), this.zr.un(h.EVENT.CLICK, this._onclick), this.zr.un(h.EVENT.MOUSEMOVE, this._onmousemove))
+                  },
+                  _resetZoom: function() {
+                    this._zooming = !1,
+                    this._zoomStart && (this._zoomStart = !1, this._iconShapeMap.dataZoom && this.zr.modShape(this._iconShapeMap.dataZoom.id, {
+                      style: {
+                        strokeColor: this._iconShapeMap.dataZoom.highlightStyle.strokeColor
+                      }
+                    }), this.zr.un(h.EVENT.MOUSEDOWN, this._onmousedown), this.zr.un(h.EVENT.MOUSEUP, this._onmouseup), this.zr.un(h.EVENT.MOUSEMOVE, this._onmousemove))
+                  },
+                  _iconDisable: function(e) {
+                    "image" != e.type ? this.zr.modShape(e.id, {
+                      hoverable: !1,
+                      clickable: !1,
+                      style: {
+                        strokeColor: this._disableColor
+                      }
+                    }) : this.zr.modShape(e.id, {
+                      hoverable: !1,
+                      clickable: !1,
+                      style: {
+                        opacity: .3
+                      }
+                    })
+                  },
+                  _iconEnable: function(e) {
+                    "image" != e.type ? this.zr.modShape(e.id, {
+                      hoverable: !0,
+                      clickable: !0,
+                      style: {
+                        strokeColor: e.highlightStyle.strokeColor
+                      }
+                    }) : this.zr.modShape(e.id, {
+                      hoverable: !0,
+                      clickable: !0,
+                      style: {
+                        opacity: .8
+                      }
+                    })
+                  },
+                  __onDataView: function() {
+                    return this._dataView.show(this.option),
+                        !0
+                  },
+                  __onRestore: function() {
+                    return this._resetMark(),
+                        this._resetZoom(),
+                        this.messageCenter.dispatch(s.EVENT.RESTORE, null, null, this.myChart),
+                        !0
+                  },
+                  __onSaveAsImage: function() {
+                    var e = this.option.toolbox.feature.saveAsImage,
+                        t = e.type || "png";
+                    "png" != t && "jpeg" != t && (t = "png");
+                    var i;
+                    i = this.myChart.isConnected() ? this.myChart.getConnectedDataURL(t) : this.zr.toDataURL("image/" + t, this.option.backgroundColor && "rgba(0,0,0,0)" === this.option.backgroundColor.replace(" ", "") ? "#fff": this.option.backgroundColor);
+                    var n = document.createElement("div");
+                    n.id = "__echarts_download_wrap__",
+                        n.style.cssText = "position:fixed;z-index:99999;display:block;top:0;left:0;background-color:rgba(33,33,33,0.5);text-align:center;width:100%;height:100%;line-height:" + document.documentElement.clientHeight + "px;";
+                    var a = document.createElement("a");
+                    a.href = i,
+                        a.setAttribute("download", (e.name ? e.name: this.option.title && (this.option.title.text || this.option.title.subtext) ? this.option.title.text || this.option.title.subtext: "ECharts") + "." + t),
+                        a.innerHTML = '<img style="vertical-align:middle" src="' + i + '" title="' + (window.ActiveXObject || "ActiveXObject" in window ? "右键->图片另存为": e.lang ? e.lang[0] : "点击保存") + '"/>',
+                        n.appendChild(a),
+                        document.body.appendChild(n),
+                        a = null,
+                        n = null,
+                        setTimeout(function() {
+                              var e = document.getElementById("__echarts_download_wrap__");
+                              e && (e.onclick = function() {
+                                var e = document.getElementById("__echarts_download_wrap__");
+                                e.onclick = null,
+                                    e.innerHTML = "",
+                                    document.body.removeChild(e),
+                                    e = null
+                              },
+                                  e = null)
+                            },
+                            500)
+                  },
+                  __onMagicType: function(e) {
+                    this._resetMark();
+                    var t = e.target._name;
+                    return this._magicType[t] || (this._magicType[t] = !0, t === s.CHART_TYPE_LINE ? this._magicType[s.CHART_TYPE_BAR] = !1 : t === s.CHART_TYPE_BAR && (this._magicType[s.CHART_TYPE_LINE] = !1), t === s.CHART_TYPE_PIE ? this._magicType[s.CHART_TYPE_FUNNEL] = !1 : t === s.CHART_TYPE_FUNNEL && (this._magicType[s.CHART_TYPE_PIE] = !1), t === s.CHART_TYPE_FORCE ? this._magicType[s.CHART_TYPE_CHORD] = !1 : t === s.CHART_TYPE_CHORD && (this._magicType[s.CHART_TYPE_FORCE] = !1), t === V ? this._magicType[U] = !1 : t === U && (this._magicType[V] = !1), this.messageCenter.dispatch(s.EVENT.MAGIC_TYPE_CHANGED, e.event, {
+                          magicType: this._magicType
+                        },
+                        this.myChart)),
+                        !0
+                  },
+                  setMagicType: function(e) {
+                    this._resetMark(),
+                        this._magicType = e,
+                    !this._isSilence && this.messageCenter.dispatch(s.EVENT.MAGIC_TYPE_CHANGED, null, {
+                          magicType: this._magicType
+                        },
+                        this.myChart)
+                  },
+                  __onCustomHandler: function(e) {
+                    var t = e.target.style.iconType,
+                        i = this.option.toolbox.feature[t].onclick;
+                    "function" == typeof i && i.call(this, this.option)
+                  },
+                  reset: function(e, t) {
+                    if (t && this.clear(), this.query(e, "toolbox.show") && this.query(e, "toolbox.feature.magicType.show")) {
+                      var i = e.toolbox.feature.magicType.type,
+                          n = i.length;
+                      for (this._magicMap = {}; n--;) this._magicMap[i[n]] = !0;
+                      n = e.series.length;
+                      for (var a, o; n--;) a = e.series[n].type,
+                      this._magicMap[a] && (o = e.xAxis instanceof Array ? e.xAxis[e.series[n].xAxisIndex || 0] : e.xAxis, o && "category" === (o.type || "category") && (o.__boundaryGap = null != o.boundaryGap ? o.boundaryGap: !0), o = e.yAxis instanceof Array ? e.yAxis[e.series[n].yAxisIndex || 0] : e.yAxis, o && "category" === o.type && (o.__boundaryGap = null != o.boundaryGap ? o.boundaryGap: !0), e.series[n].__type = a, e.series[n].__itemStyle = l.clone(e.series[n].itemStyle || {})),
+                      (this._magicMap[V] || this._magicMap[U]) && (e.series[n].__stack = e.series[n].stack)
+                    }
+                    this._magicType = t ? {}: this._magicType || {};
+                    for (var r in this._magicType) if (this._magicType[r]) {
+                      this.option = e,
+                          this.getMagicOption();
+                      break
+                    }
+                    var s = e.dataZoom;
+                    if (s && s.show) {
+                      var h = null != s.start && s.start >= 0 && s.start <= 100 ? s.start: 0,
+                          m = null != s.end && s.end >= 0 && s.end <= 100 ? s.end: 100;
+                      h > m && (h += m, m = h - m, h -= m),
+                          this._zoomQueue = [{
+                            start: h,
+                            end: m,
+                            start2: 0,
+                            end2: 100
+                          }]
+                    } else this._zoomQueue = []
+                  },
+                  getMagicOption: function() {
+                    var e, t;
+                    if (this._magicType[s.CHART_TYPE_LINE] || this._magicType[s.CHART_TYPE_BAR]) {
+                      for (var i = this._magicType[s.CHART_TYPE_LINE] ? !1 : !0, n = 0, a = this.option.series.length; a > n; n++) t = this.option.series[n].type,
+                      (t == s.CHART_TYPE_LINE || t == s.CHART_TYPE_BAR) && (e = this.option.xAxis instanceof Array ? this.option.xAxis[this.option.series[n].xAxisIndex || 0] : this.option.xAxis, e && "category" === (e.type || "category") && (e.boundaryGap = i ? !0 : e.__boundaryGap), e = this.option.yAxis instanceof Array ? this.option.yAxis[this.option.series[n].yAxisIndex || 0] : this.option.yAxis, e && "category" === e.type && (e.boundaryGap = i ? !0 : e.__boundaryGap));
+                      this._defaultMagic(s.CHART_TYPE_LINE, s.CHART_TYPE_BAR)
+                    }
+                    if (this._defaultMagic(s.CHART_TYPE_CHORD, s.CHART_TYPE_FORCE), this._defaultMagic(s.CHART_TYPE_PIE, s.CHART_TYPE_FUNNEL), this._magicType[V] || this._magicType[U]) for (var n = 0,
+                                                                                                                                                                                                  a = this.option.series.length; a > n; n++) this._magicType[V] ? (this.option.series[n].stack = "_ECHARTS_STACK_KENER_2014_", t = V) : this._magicType[U] && (this.option.series[n].stack = null, t = U),
+                    this._featureOption[t + "Chart"] && l.merge(this.option.series[n], this._featureOption[t + "Chart"] || {},
+                        !0);
+                    return this.option
+                  },
+                  _defaultMagic: function(e, t) {
+                    if (this._magicType[e] || this._magicType[t]) for (var i = 0,
+                                                                           n = this.option.series.length; n > i; i++) {
+                      var a = this.option.series[i].type; (a == e || a == t) && (this.option.series[i].type = this._magicType[e] ? e: t, this.option.series[i].itemStyle = l.clone(this.option.series[i].__itemStyle), a = this.option.series[i].type, this._featureOption[a + "Chart"] && l.merge(this.option.series[i], this._featureOption[a + "Chart"] || {},
+                          !0))
+                    }
+                  },
+                  silence: function(e) {
+                    this._isSilence = e
+                  },
+                  resize: function() {
+                    this._resetMark(),
+                        this.clear(),
+                    this.option && this.option.toolbox && this.option.toolbox.show && this._buildShape(),
+                    this._dataView && this._dataView.resize()
+                  },
+                  hideDataView: function() {
+                    this._dataView && this._dataView.hide()
+                  },
+                  clear: function(e) {
+                    this.zr && (this.zr.delShape(this.shapeList), this.shapeList = [], e || (this.zr.delShape(this._markShapeList), this._markShapeList = []))
+                  },
+                  onbeforDispose: function() {
+                    this._dataView && (this._dataView.dispose(), this._dataView = null),
+                        this._markShapeList = null
+                  },
+                  refresh: function(e) {
+                    e && (this._resetMark(), this._resetZoom(), e.toolbox = this.reformOption(e.toolbox), this.option = e, this.clear(!0), e.toolbox.show && this._buildShape(), this.hideDataView())
+                  }
+                },
+                    l.inherits(t, i),
+                    e("../component").define("toolbox", t),
+                    t
+              }),
+          i("echarts/component", [],
+              function() {
+                var e = {},
+                    t = {};
+                return e.define = function(i, n) {
+                  return t[i] = n,
+                      e
+                },
+                    e.get = function(e) {
+                      return t[e]
+                    },
+                    e
+              }),
+          i("echarts/component/title", ["require", "./base", "zrender/shape/Text", "zrender/shape/Rectangle", "../config", "zrender/tool/util", "zrender/tool/area", "zrender/tool/color", "../component"],
+              function(e) {
+                function t(e, t, n, a, o) {
+                  i.call(this, e, t, n, a, o),
+                      this.refresh(a)
+                }
+                var i = e("./base"),
+                    n = e("zrender/shape/Text"),
+                    a = e("zrender/shape/Rectangle"),
+                    o = e("../config");
+                o.title = {
+                  zlevel: 0,
+                  z: 6,
+                  show: !0,
+                  text: "",
+                  subtext: "",
+                  x: "left",
+                  y: "top",
+                  backgroundColor: "rgba(0,0,0,0)",
+                  borderColor: "#ccc",
+                  borderWidth: 0,
+                  padding: 5,
+                  itemGap: 5,
+                  textStyle: {
+                    fontSize: 18,
+                    fontWeight: "bolder",
+                    color: "#333"
+                  },
+                  subtextStyle: {
+                    color: "#aaa"
+                  }
+                };
+                var r = e("zrender/tool/util"),
+                    s = e("zrender/tool/area"),
+                    l = e("zrender/tool/color");
+                return t.prototype = {
+                  type: o.COMPONENT_TYPE_TITLE,
+                  _buildShape: function() {
+                    if (this.titleOption.show) {
+                      this._itemGroupLocation = this._getItemGroupLocation(),
+                          this._buildBackground(),
+                          this._buildItem();
+                      for (var e = 0,
+                               t = this.shapeList.length; t > e; e++) this.zr.addShape(this.shapeList[e])
+                    }
+                  },
+                  _buildItem: function() {
+                    var e = this.titleOption.text,
+                        t = this.titleOption.link,
+                        i = this.titleOption.target,
+                        a = this.titleOption.subtext,
+                        o = this.titleOption.sublink,
+                        r = this.titleOption.subtarget,
+                        s = this.getFont(this.titleOption.textStyle),
+                        h = this.getFont(this.titleOption.subtextStyle),
+                        m = this._itemGroupLocation.x,
+                        V = this._itemGroupLocation.y,
+                        U = this._itemGroupLocation.width,
+                        d = this._itemGroupLocation.height,
+                        p = {
+                          zlevel: this.getZlevelBase(),
+                          z: this.getZBase(),
+                          style: {
+                            y: V,
+                            color: this.titleOption.textStyle.color,
+                            text: e,
+                            textFont: s,
+                            textBaseline: "top"
+                          },
+                          highlightStyle: {
+                            color: l.lift(this.titleOption.textStyle.color, 1),
+                            brushType: "fill"
+                          },
+                          hoverable: !1
+                        };
+                    t && (p.hoverable = !0, p.clickable = !0, p.onclick = function() {
+                      i && "self" == i ? window.location = t: window.open(t)
+                    });
+                    var c = {
+                      zlevel: this.getZlevelBase(),
+                      z: this.getZBase(),
+                      style: {
+                        y: V + d,
+                        color: this.titleOption.subtextStyle.color,
+                        text: a,
+                        textFont: h,
+                        textBaseline: "bottom"
+                      },
+                      highlightStyle: {
+                        color: l.lift(this.titleOption.subtextStyle.color, 1),
+                        brushType: "fill"
+                      },
+                      hoverable: !1
+                    };
+                    switch (o && (c.hoverable = !0, c.clickable = !0, c.onclick = function() {
+                      r && "self" == r ? window.location = o: window.open(o)
+                    }), this.titleOption.x) {
+                      case "center":
+                        p.style.x = c.style.x = m + U / 2,
+                            p.style.textAlign = c.style.textAlign = "center";
+                        break;
+                      case "left":
+                        p.style.x = c.style.x = m,
+                            p.style.textAlign = c.style.textAlign = "left";
+                        break;
+                      case "right":
+                        p.style.x = c.style.x = m + U,
+                            p.style.textAlign = c.style.textAlign = "right";
+                        break;
+                      default:
+                        m = this.titleOption.x - 0,
+                            m = isNaN(m) ? 0 : m,
+                            p.style.x = c.style.x = m
+                    }
+                    this.titleOption.textAlign && (p.style.textAlign = c.style.textAlign = this.titleOption.textAlign),
+                        this.shapeList.push(new n(p)),
+                    "" !== a && this.shapeList.push(new n(c))
+                  },
+                  _buildBackground: function() {
+                    var e = this.reformCssArray(this.titleOption.padding);
+                    this.shapeList.push(new a({
+                      zlevel: this.getZlevelBase(),
+                      z: this.getZBase(),
+                      hoverable: !1,
+                      style: {
+                        x: this._itemGroupLocation.x - e[3],
+                        y: this._itemGroupLocation.y - e[0],
+                        width: this._itemGroupLocation.width + e[3] + e[1],
+                        height: this._itemGroupLocation.height + e[0] + e[2],
+                        brushType: 0 === this.titleOption.borderWidth ? "fill": "both",
+                        color: this.titleOption.backgroundColor,
+                        strokeColor: this.titleOption.borderColor,
+                        lineWidth: this.titleOption.borderWidth
+                      }
+                    }))
+                  },
+                  _getItemGroupLocation: function() {
+                    var e, t = this.reformCssArray(this.titleOption.padding),
+                        i = this.titleOption.text,
+                        n = this.titleOption.subtext,
+                        a = this.getFont(this.titleOption.textStyle),
+                        o = this.getFont(this.titleOption.subtextStyle),
+                        r = Math.max(s.getTextWidth(i, a), s.getTextWidth(n, o)),
+                        l = s.getTextHeight(i, a) + ("" === n ? 0 : this.titleOption.itemGap + s.getTextHeight(n, o)),
+                        h = this.zr.getWidth();
+                    switch (this.titleOption.x) {
+                      case "center":
+                        e = Math.floor((h - r) / 2);
+                        break;
+                      case "left":
+                        e = t[3] + this.titleOption.borderWidth;
+                        break;
+                      case "right":
+                        e = h - r - t[1] - this.titleOption.borderWidth;
+                        break;
+                      default:
+                        e = this.titleOption.x - 0,
+                            e = isNaN(e) ? 0 : e
+                    }
+                    var m, V = this.zr.getHeight();
+                    switch (this.titleOption.y) {
+                      case "top":
+                        m = t[0] + this.titleOption.borderWidth;
+                        break;
+                      case "bottom":
+                        m = V - l - t[2] - this.titleOption.borderWidth;
+                        break;
+                      case "center":
+                        m = Math.floor((V - l) / 2);
+                        break;
+                      default:
+                        m = this.titleOption.y - 0,
+                            m = isNaN(m) ? 0 : m
+                    }
+                    return {
+                      x: e,
+                      y: m,
+                      width: r,
+                      height: l
+                    }
+                  },
+                  refresh: function(e) {
+                    e && (this.option = e, this.option.title = this.reformOption(this.option.title), this.titleOption = this.option.title, this.titleOption.textStyle = this.getTextStyle(this.titleOption.textStyle), this.titleOption.subtextStyle = this.getTextStyle(this.titleOption.subtextStyle)),
+                        this.clear(),
+                        this._buildShape()
+                  }
+                },
+                    r.inherits(t, i),
+                    e("../component").define("title", t),
+                    t
+              }),
+          i("echarts/component/tooltip", ["require", "./base", "../util/shape/Cross", "zrender/shape/Line", "zrender/shape/Rectangle", "../config", "../util/ecData", "zrender/config", "zrender/tool/event", "zrender/tool/area", "zrender/tool/color", "zrender/tool/util", "zrender/shape/Base", "../component"],
+              function(e) {
+                function t(e, t, o, r, s) {
+                  i.call(this, e, t, o, r, s),
+                      this.dom = s.dom;
+                  var l = this;
+                  l._onmousemove = function(e) {
+                    return l.__onmousemove(e)
+                  },
+                      l._onglobalout = function(e) {
+                        return l.__onglobalout(e)
+                      },
+                      this.zr.on(h.EVENT.MOUSEMOVE, l._onmousemove),
+                      this.zr.on(h.EVENT.GLOBALOUT, l._onglobalout),
+                      l._hide = function(e) {
+                        return l.__hide(e)
+                      },
+                      l._tryShow = function(e) {
+                        return l.__tryShow(e)
+                      },
+                      l._refixed = function(e) {
+                        return l.__refixed(e)
+                      },
+                      l._setContent = function(e, t) {
+                        return l.__setContent(e, t)
+                      },
+                      this._tDom = this._tDom || document.createElement("div"),
+                      this._tDom.onselectstart = function() {
+                        return ! 1
+                      },
+                      this._tDom.onmouseover = function() {
+                        l._mousein = !0
+                      },
+                      this._tDom.onmouseout = function() {
+                        l._mousein = !1
+                      },
+                      this._tDom.className = "echarts-tooltip",
+                      this._tDom.style.position = "absolute",
+                      this.hasAppend = !1,
+                  this._axisLineShape && this.zr.delShape(this._axisLineShape.id),
+                      this._axisLineShape = new a({
+                        zlevel: this.getZlevelBase(),
+                        z: this.getZBase(),
+                        invisible: !0,
+                        hoverable: !1
+                      }),
+                      this.shapeList.push(this._axisLineShape),
+                      this.zr.addShape(this._axisLineShape),
+                  this._axisShadowShape && this.zr.delShape(this._axisShadowShape.id),
+                      this._axisShadowShape = new a({
+                        zlevel: this.getZlevelBase(),
+                        z: 1,
+                        invisible: !0,
+                        hoverable: !1
+                      }),
+                      this.shapeList.push(this._axisShadowShape),
+                      this.zr.addShape(this._axisShadowShape),
+                  this._axisCrossShape && this.zr.delShape(this._axisCrossShape.id),
+                      this._axisCrossShape = new n({
+                        zlevel: this.getZlevelBase(),
+                        z: this.getZBase(),
+                        invisible: !0,
+                        hoverable: !1
+                      }),
+                      this.shapeList.push(this._axisCrossShape),
+                      this.zr.addShape(this._axisCrossShape),
+                      this.showing = !1,
+                      this.refresh(r)
+                }
+                var i = e("./base"),
+                    n = e("../util/shape/Cross"),
+                    a = e("zrender/shape/Line"),
+                    o = e("zrender/shape/Rectangle"),
+                    r = new o({}),
+                    s = e("../config");
+                s.tooltip = {
+                  zlevel: 1,
+                  z: 8,
+                  show: !0,
+                  showContent: !0,
+                  trigger: "item",
+                  islandFormatter: "{a} <br/>{b} : {c}",
+                  showDelay: 20,
+                  hideDelay: 100,
+                  transitionDuration: .4,
+                  enterable: !1,
+                  backgroundColor: "rgba(0,0,0,0.7)",
+                  borderColor: "#333",
+                  borderRadius: 4,
+                  borderWidth: 0,
+                  padding: 5,
+                  axisPointer: {
+                    type: "line",
+                    lineStyle: {
+                      color: "#48b",
+                      width: 2,
+                      type: "solid"
+                    },
+                    crossStyle: {
+                      color: "#1e90ff",
+                      width: 1,
+                      type: "dashed"
+                    },
+                    shadowStyle: {
+                      color: "rgba(150,150,150,0.3)",
+                      width: "auto",
+                      type: "default"
+                    }
+                  },
+                  textStyle: {
+                    color: "#fff"
+                  }
+                };
+                var l = e("../util/ecData"),
+                    h = e("zrender/config"),
+                    m = e("zrender/tool/event"),
+                    V = e("zrender/tool/area"),
+                    U = e("zrender/tool/color"),
+                    d = e("zrender/tool/util"),
+                    p = e("zrender/shape/Base");
+                return t.prototype = {
+                  type: s.COMPONENT_TYPE_TOOLTIP,
+                  _gCssText: "position:absolute;display:block;border-style:solid;white-space:nowrap;",
+                  _style: function(e) {
+                    if (!e) return "";
+                    var t = [];
+                    if (e.transitionDuration) {
+                      var i = "left " + e.transitionDuration + "s,top " + e.transitionDuration + "s";
+                      t.push("transition:" + i),
+                          t.push("-moz-transition:" + i),
+                          t.push("-webkit-transition:" + i),
+                          t.push("-o-transition:" + i)
+                    }
+                    e.backgroundColor && (t.push("background-Color:" + U.toHex(e.backgroundColor)), t.push("filter:alpha(opacity=70)"), t.push("background-Color:" + e.backgroundColor)),
+                    null != e.borderWidth && t.push("border-width:" + e.borderWidth + "px"),
+                    null != e.borderColor && t.push("border-color:" + e.borderColor),
+                    null != e.borderRadius && (t.push("border-radius:" + e.borderRadius + "px"), t.push("-moz-border-radius:" + e.borderRadius + "px"), t.push("-webkit-border-radius:" + e.borderRadius + "px"), t.push("-o-border-radius:" + e.borderRadius + "px"));
+                    var n = e.textStyle;
+                    n && (n.color && t.push("color:" + n.color), n.decoration && t.push("text-decoration:" + n.decoration), n.align && t.push("text-align:" + n.align), n.fontFamily && t.push("font-family:" + n.fontFamily), n.fontSize && t.push("font-size:" + n.fontSize + "px"), n.fontSize && t.push("line-height:" + Math.round(3 * n.fontSize / 2) + "px"), n.fontStyle && t.push("font-style:" + n.fontStyle), n.fontWeight && t.push("font-weight:" + n.fontWeight));
+                    var a = e.padding;
+                    return null != a && (a = this.reformCssArray(a), t.push("padding:" + a[0] + "px " + a[1] + "px " + a[2] + "px " + a[3] + "px")),
+                        t = t.join(";") + ";"
+                  },
+                  __hide: function() {
+                    this._lastDataIndex = -1,
+                        this._lastSeriesIndex = -1,
+                        this._lastItemTriggerId = -1,
+                    this._tDom && (this._tDom.style.display = "none");
+                    var e = !1;
+                    this._axisLineShape.invisible || (this._axisLineShape.invisible = !0, this.zr.modShape(this._axisLineShape.id), e = !0),
+                    this._axisShadowShape.invisible || (this._axisShadowShape.invisible = !0, this.zr.modShape(this._axisShadowShape.id), e = !0),
+                    this._axisCrossShape.invisible || (this._axisCrossShape.invisible = !0, this.zr.modShape(this._axisCrossShape.id), e = !0),
+                    this._lastTipShape && this._lastTipShape.tipShape.length > 0 && (this.zr.delShape(this._lastTipShape.tipShape), this._lastTipShape = !1, this.shapeList.length = 2),
+                    e && this.zr.refreshNextFrame(),
+                        this.showing = !1
+                  },
+                  _show: function(e, t, i, n) {
+                    var a = this._tDom.offsetHeight,
+                        o = this._tDom.offsetWidth;
+                    e && ("function" == typeof e && (e = e([t, i])), e instanceof Array && (t = e[0], i = e[1])),
+                    t + o > this._zrWidth && (t -= o + 40),
+                    i + a > this._zrHeight && (i -= a - 20),
+                    20 > i && (i = 0),
+                        this._tDom.style.cssText = this._gCssText + this._defaultCssText + (n ? n: "") + "left:" + t + "px;top:" + i + "px;",
+                    (10 > a || 10 > o) && setTimeout(this._refixed, 20),
+                        this.showing = !0
+                  },
+                  __refixed: function() {
+                    if (this._tDom) {
+                      var e = "",
+                          t = this._tDom.offsetHeight,
+                          i = this._tDom.offsetWidth;
+                      this._tDom.offsetLeft + i > this._zrWidth && (e += "left:" + (this._zrWidth - i - 20) + "px;"),
+                      this._tDom.offsetTop + t > this._zrHeight && (e += "top:" + (this._zrHeight - t - 10) + "px;"),
+                      "" !== e && (this._tDom.style.cssText += e)
+                    }
+                  },
+                  __tryShow: function() {
+                    var e, t;
+                    if (this._curTarget) {
+                      if ("island" === this._curTarget._type && this.option.tooltip.show) return void this._showItemTrigger();
+                      var i = l.get(this._curTarget, "series"),
+                          n = l.get(this._curTarget, "data");
+                      e = this.deepQuery([n, i, this.option], "tooltip.show"),
+                          null != i && null != n && e ? (t = this.deepQuery([n, i, this.option], "tooltip.trigger"), "axis" === t ? this._showAxisTrigger(i.xAxisIndex, i.yAxisIndex, l.get(this._curTarget, "dataIndex")) : this._showItemTrigger()) : (clearTimeout(this._hidingTicket), clearTimeout(this._showingTicket), this._hidingTicket = setTimeout(this._hide, this._hideDelay))
+                    } else this._findPolarTrigger() || this._findAxisTrigger()
+                  },
+                  _findAxisTrigger: function() {
+                    if (!this.component.xAxis || !this.component.yAxis) return void(this._hidingTicket = setTimeout(this._hide, this._hideDelay));
+                    for (var e, t, i = this.option.series,
+                             n = 0,
+                             a = i.length; a > n; n++) if ("axis" === this.deepQuery([i[n], this.option], "tooltip.trigger")) return e = i[n].xAxisIndex || 0,
+                        t = i[n].yAxisIndex || 0,
+                        this.component.xAxis.getAxis(e) && this.component.xAxis.getAxis(e).type === s.COMPONENT_TYPE_AXIS_CATEGORY ? void this._showAxisTrigger(e, t, this._getNearestDataIndex("x", this.component.xAxis.getAxis(e))) : this.component.yAxis.getAxis(t) && this.component.yAxis.getAxis(t).type === s.COMPONENT_TYPE_AXIS_CATEGORY ? void this._showAxisTrigger(e, t, this._getNearestDataIndex("y", this.component.yAxis.getAxis(t))) : void this._showAxisTrigger(e, t, -1);
+                    "cross" === this.option.tooltip.axisPointer.type && this._showAxisTrigger( - 1, -1, -1)
+                  },
+                  _findPolarTrigger: function() {
+                    if (!this.component.polar) return ! 1;
+                    var e, t = m.getX(this._event),
+                        i = m.getY(this._event),
+                        n = this.component.polar.getNearestIndex([t, i]);
+                    return n ? (e = n.valueIndex, n = n.polarIndex) : n = -1,
+                        -1 != n ? this._showPolarTrigger(n, e) : !1
+                  },
+                  _getNearestDataIndex: function(e, t) {
+                    var i = -1,
+                        n = m.getX(this._event),
+                        a = m.getY(this._event);
+                    if ("x" === e) {
+                      for (var o, r, s = this.component.grid.getXend(), l = t.getCoordByIndex(i); s > l && (r = l, n >= l);) o = l,
+                          l = t.getCoordByIndex(++i);
+                      return 0 >= i ? i = 0 : r - n >= n - o ? i -= 1 : null == t.getNameByIndex(i) && (i -= 1),
+                          i
+                    }
+                    for (var h, V, U = this.component.grid.getY(), l = t.getCoordByIndex(i); l > U && (h = l, l >= a);) V = l,
+                        l = t.getCoordByIndex(++i);
+                    return 0 >= i ? i = 0 : a - h >= V - a ? i -= 1 : null == t.getNameByIndex(i) && (i -= 1),
+                        i
+                  },
+                  _showAxisTrigger: function(e, t, i) {
+                    if (!this._event.connectTrigger && this.messageCenter.dispatch(s.EVENT.TOOLTIP_IN_GRID, this._event, null, this.myChart), null == this.component.xAxis || null == this.component.yAxis || null == e || null == t) return clearTimeout(this._hidingTicket),
+                        clearTimeout(this._showingTicket),
+                        void(this._hidingTicket = setTimeout(this._hide, this._hideDelay));
+                    var n, a, o, r, l = this.option.series,
+                        h = [],
+                        V = [],
+                        U = "";
+                    if ("axis" === this.option.tooltip.trigger) {
+                      if (!this.option.tooltip.show) return;
+                      a = this.option.tooltip.formatter,
+                          o = this.option.tooltip.position
+                    }
+                    var d, p, c = -1 != e && this.component.xAxis.getAxis(e).type === s.COMPONENT_TYPE_AXIS_CATEGORY ? "xAxis": -1 != t && this.component.yAxis.getAxis(t).type === s.COMPONENT_TYPE_AXIS_CATEGORY ? "yAxis": !1;
+                    if (c) {
+                      var u = "xAxis" == c ? e: t;
+                      n = this.component[c].getAxis(u);
+                      for (var y = 0,
+                               g = l.length; g > y; y++) this._isSelected(l[y].name) && l[y][c + "Index"] === u && "axis" === this.deepQuery([l[y], this.option], "tooltip.trigger") && (r = this.query(l[y], "tooltip.showContent") || r, a = this.query(l[y], "tooltip.formatter") || a, o = this.query(l[y], "tooltip.position") || o, U += this._style(this.query(l[y], "tooltip")), null != l[y].stack && "xAxis" == c ? (h.unshift(l[y]), V.unshift(y)) : (h.push(l[y]), V.push(y)));
+                      this.messageCenter.dispatch(s.EVENT.TOOLTIP_HOVER, this._event, {
+                            seriesIndex: V,
+                            dataIndex: i
+                          },
+                          this.myChart);
+                      var b;
+                      "xAxis" == c ? (d = this.subPixelOptimize(n.getCoordByIndex(i), this._axisLineWidth), p = m.getY(this._event), b = [d, this.component.grid.getY(), d, this.component.grid.getYend()]) : (d = m.getX(this._event), p = this.subPixelOptimize(n.getCoordByIndex(i), this._axisLineWidth), b = [this.component.grid.getX(), p, this.component.grid.getXend(), p]),
+                          this._styleAxisPointer(h, b[0], b[1], b[2], b[3], n.getGap(), d, p)
+                    } else d = m.getX(this._event),
+                        p = m.getY(this._event),
+                        this._styleAxisPointer(l, this.component.grid.getX(), p, this.component.grid.getXend(), p, 0, d, p),
+                        i >= 0 ? this._showItemTrigger(!0) : (clearTimeout(this._hidingTicket), clearTimeout(this._showingTicket), this._tDom.style.display = "none");
+                    if (h.length > 0) {
+                      if (this._lastItemTriggerId = -1, this._lastDataIndex != i || this._lastSeriesIndex != V[0]) {
+                        this._lastDataIndex = i,
+                            this._lastSeriesIndex = V[0];
+                        var f, k;
+                        if ("function" == typeof a) {
+                          for (var x = [], y = 0, g = h.length; g > y; y++) f = h[y].data[i],
+                              k = this.getDataFromOption(f, "-"),
+                              x.push({
+                                seriesIndex: V[y],
+                                seriesName: h[y].name || "",
+                                series: h[y],
+                                dataIndex: i,
+                                data: f,
+                                name: n.getNameByIndex(i),
+                                value: k,
+                                0 : h[y].name || "",
+                                1 : n.getNameByIndex(i),
+                                2 : k,
+                                3 : f
+                              });
+                          this._curTicket = "axis:" + i,
+                              this._tDom.innerHTML = a.call(this.myChart, x, this._curTicket, this._setContent)
+                        } else if ("string" == typeof a) {
+                          this._curTicket = 0 / 0,
+                              a = a.replace("{a}", "{a0}").replace("{b}", "{b0}").replace("{c}", "{c0}");
+                          for (var y = 0,
+                                   g = h.length; g > y; y++) a = a.replace("{a" + y + "}", this._encodeHTML(h[y].name || "")),
+                              a = a.replace("{b" + y + "}", this._encodeHTML(n.getNameByIndex(i))),
+                              f = h[y].data[i],
+                              f = this.getDataFromOption(f, "-"),
+                              a = a.replace("{c" + y + "}", f instanceof Array ? f: this.numAddCommas(f));
+                          this._tDom.innerHTML = a
+                        } else {
+                          this._curTicket = 0 / 0,
+                              a = this._encodeHTML(n.getNameByIndex(i));
+                          for (var y = 0,
+                                   g = h.length; g > y; y++) a += "<br/>" + this._encodeHTML(h[y].name || "") + " : ",
+                              f = h[y].data[i],
+                              f = this.getDataFromOption(f, "-"),
+                              a += f instanceof Array ? f: this.numAddCommas(f);
+                          this._tDom.innerHTML = a
+                        }
+                      }
+                      if (r === !1 || !this.option.tooltip.showContent) return;
+                      this.hasAppend || (this._tDom.style.left = this._zrWidth / 2 + "px", this._tDom.style.top = this._zrHeight / 2 + "px", this.dom.firstChild.appendChild(this._tDom), this.hasAppend = !0),
+                          this._show(o, d + 10, p + 10, U)
+                    }
+                  },
+                  _showPolarTrigger: function(e, t) {
+                    if (null == this.component.polar || null == e || null == t || 0 > t) return ! 1;
+                    var i, n, a, o = this.option.series,
+                        r = [],
+                        s = [],
+                        l = "";
+                    if ("axis" === this.option.tooltip.trigger) {
+                      if (!this.option.tooltip.show) return ! 1;
+                      i = this.option.tooltip.formatter,
+                          n = this.option.tooltip.position
+                    }
+                    for (var h = this.option.polar[e].indicator[t].text, V = 0, U = o.length; U > V; V++) this._isSelected(o[V].name) && o[V].polarIndex === e && "axis" === this.deepQuery([o[V], this.option], "tooltip.trigger") && (a = this.query(o[V], "tooltip.showContent") || a, i = this.query(o[V], "tooltip.formatter") || i, n = this.query(o[V], "tooltip.position") || n, l += this._style(this.query(o[V], "tooltip")), r.push(o[V]), s.push(V));
+                    if (r.length > 0) {
+                      for (var d, p, c, u = [], V = 0, U = r.length; U > V; V++) {
+                        d = r[V].data;
+                        for (var y = 0,
+                                 g = d.length; g > y; y++) p = d[y],
+                        this._isSelected(p.name) && (p = null != p ? p: {
+                          name: "",
+                          value: {
+                            dataIndex: "-"
+                          }
+                        },
+                            c = this.getDataFromOption(p.value[t]), u.push({
+                          seriesIndex: s[V],
+                          seriesName: r[V].name || "",
+                          series: r[V],
+                          dataIndex: t,
+                          data: p,
+                          name: p.name,
+                          indicator: h,
+                          value: c,
+                          0 : r[V].name || "",
+                          1 : p.name,
+                          2 : c,
+                          3 : h
+                        }))
+                      }
+                      if (u.length <= 0) return;
+                      if (this._lastItemTriggerId = -1, this._lastDataIndex != t || this._lastSeriesIndex != s[0]) if (this._lastDataIndex = t, this._lastSeriesIndex = s[0], "function" == typeof i) this._curTicket = "axis:" + t,
+                          this._tDom.innerHTML = i.call(this.myChart, u, this._curTicket, this._setContent);
+                      else if ("string" == typeof i) {
+                        i = i.replace("{a}", "{a0}").replace("{b}", "{b0}").replace("{c}", "{c0}").replace("{d}", "{d0}");
+                        for (var V = 0,
+                                 U = u.length; U > V; V++) i = i.replace("{a" + V + "}", this._encodeHTML(u[V].seriesName)),
+                            i = i.replace("{b" + V + "}", this._encodeHTML(u[V].name)),
+                            i = i.replace("{c" + V + "}", this.numAddCommas(u[V].value)),
+                            i = i.replace("{d" + V + "}", this._encodeHTML(u[V].indicator));
+                        this._tDom.innerHTML = i
+                      } else {
+                        i = this._encodeHTML(u[0].name) + "<br/>" + this._encodeHTML(u[0].indicator) + " : " + this.numAddCommas(u[0].value);
+                        for (var V = 1,
+                                 U = u.length; U > V; V++) i += "<br/>" + this._encodeHTML(u[V].name) + "<br/>",
+                            i += this._encodeHTML(u[V].indicator) + " : " + this.numAddCommas(u[V].value);
+                        this._tDom.innerHTML = i
+                      }
+                      if (a === !1 || !this.option.tooltip.showContent) return;
+                      return this.hasAppend || (this._tDom.style.left = this._zrWidth / 2 + "px", this._tDom.style.top = this._zrHeight / 2 + "px", this.dom.firstChild.appendChild(this._tDom), this.hasAppend = !0),
+                          this._show(n, m.getX(this._event), m.getY(this._event), l),
+                          !0
+                    }
+                  },
+                  _showItemTrigger: function(e) {
+                    if (this._curTarget) {
+                      var t, i, n, a = l.get(this._curTarget, "series"),
+                          o = l.get(this._curTarget, "seriesIndex"),
+                          r = l.get(this._curTarget, "data"),
+                          h = l.get(this._curTarget, "dataIndex"),
+                          V = l.get(this._curTarget, "name"),
+                          U = l.get(this._curTarget, "value"),
+                          d = l.get(this._curTarget, "special"),
+                          p = l.get(this._curTarget, "special2"),
+                          c = [r, a, this.option],
+                          u = "";
+                      if ("island" != this._curTarget._type) {
+                        var y = e ? "axis": "item";
+                        this.option.tooltip.trigger === y && (t = this.option.tooltip.formatter, i = this.option.tooltip.position),
+                        this.query(a, "tooltip.trigger") === y && (n = this.query(a, "tooltip.showContent") || n, t = this.query(a, "tooltip.formatter") || t, i = this.query(a, "tooltip.position") || i, u += this._style(this.query(a, "tooltip"))),
+                            n = this.query(r, "tooltip.showContent") || n,
+                            t = this.query(r, "tooltip.formatter") || t,
+                            i = this.query(r, "tooltip.position") || i,
+                            u += this._style(this.query(r, "tooltip"))
+                      } else this._lastItemTriggerId = 0 / 0,
+                          n = this.deepQuery(c, "tooltip.showContent"),
+                          t = this.deepQuery(c, "tooltip.islandFormatter"),
+                          i = this.deepQuery(c, "tooltip.islandPosition");
+                      this._lastDataIndex = -1,
+                          this._lastSeriesIndex = -1,
+                      this._lastItemTriggerId !== this._curTarget.id && (this._lastItemTriggerId = this._curTarget.id, "function" == typeof t ? (this._curTicket = (a.name || "") + ":" + h, this._tDom.innerHTML = t.call(this.myChart, {
+                            seriesIndex: o,
+                            seriesName: a.name || "",
+                            series: a,
+                            dataIndex: h,
+                            data: r,
+                            name: V,
+                            value: U,
+                            percent: d,
+                            indicator: d,
+                            value2: p,
+                            indicator2: p,
+                            0 : a.name || "",
+                            1 : V,
+                            2 : U,
+                            3 : d,
+                            4 : p,
+                            5 : r,
+                            6 : o,
+                            7 : h
+                          },
+                          this._curTicket, this._setContent)) : "string" == typeof t ? (this._curTicket = 0 / 0, t = t.replace("{a}", "{a0}").replace("{b}", "{b0}").replace("{c}", "{c0}"), t = t.replace("{a0}", this._encodeHTML(a.name || "")).replace("{b0}", this._encodeHTML(V)).replace("{c0}", U instanceof Array ? U: this.numAddCommas(U)), t = t.replace("{d}", "{d0}").replace("{d0}", d || ""), t = t.replace("{e}", "{e0}").replace("{e0}", l.get(this._curTarget, "special2") || ""), this._tDom.innerHTML = t) : (this._curTicket = 0 / 0, this._tDom.innerHTML = a.type === s.CHART_TYPE_RADAR && d ? this._itemFormatter.radar.call(this, a, V, U, d) : a.type === s.CHART_TYPE_EVENTRIVER ? this._itemFormatter.eventRiver.call(this, a, V, U, r) : "" + (null != a.name ? this._encodeHTML(a.name) + "<br/>": "") + ("" === V ? "": this._encodeHTML(V) + " : ") + (U instanceof Array ? U: this.numAddCommas(U))));
+                      var g = m.getX(this._event),
+                          b = m.getY(this._event);
+                      this.deepQuery(c, "tooltip.axisPointer.show") && this.component.grid ? this._styleAxisPointer([a], this.component.grid.getX(), b, this.component.grid.getXend(), b, 0, g, b) : this._hide(),
+                      n !== !1 && this.option.tooltip.showContent && (this.hasAppend || (this._tDom.style.left = this._zrWidth / 2 + "px", this._tDom.style.top = this._zrHeight / 2 + "px", this.dom.firstChild.appendChild(this._tDom), this.hasAppend = !0), this._show(i, g + 20, b - 20, u))
+                    }
+                  },
+                  _itemFormatter: {
+                    radar: function(e, t, i, n) {
+                      var a = "";
+                      a += this._encodeHTML("" === t ? e.name || "": t),
+                          a += "" === a ? "": "<br />";
+                      for (var o = 0; o < n.length; o++) a += this._encodeHTML(n[o].text) + " : " + this.numAddCommas(i[o]) + "<br />";
+                      return a
+                    },
+                    chord: function(e, t, i, n, a) {
+                      if (null == a) return this._encodeHTML(t) + " (" + this.numAddCommas(i) + ")";
+                      var o = this._encodeHTML(t),
+                          r = this._encodeHTML(n);
+                      return "" + (null != e.name ? this._encodeHTML(e.name) + "<br/>": "") + o + " -> " + r + " (" + this.numAddCommas(i) + ")<br />" + r + " -> " + o + " (" + this.numAddCommas(a) + ")"
+                    },
+                    eventRiver: function(e, t, i, n) {
+                      var a = "";
+                      a += this._encodeHTML("" === e.name ? "": e.name + " : "),
+                          a += this._encodeHTML(t),
+                          a += "" === a ? "": "<br />",
+                          n = n.evolution;
+                      for (var o = 0,
+                               r = n.length; r > o; o++) a += '<div style="padding-top:5px;">',
+                      n[o].detail && (n[o].detail.img && (a += '<img src="' + n[o].detail.img + '" style="float:left;width:40px;height:40px;">'), a += '<div style="margin-left:45px;">' + n[o].time + "<br/>", a += '<a href="' + n[o].detail.link + '" target="_blank">', a += n[o].detail.text + "</a></div>", a += "</div>");
+                      return a
+                    }
+                  },
+                  _styleAxisPointer: function(e, t, i, n, a, o, r, s) {
+                    if (e.length > 0) {
+                      var l, h, m = this.option.tooltip.axisPointer,
+                          V = m.type,
+                          U = {
+                            line: {},
+                            cross: {},
+                            shadow: {}
+                          };
+                      for (var d in U) U[d].color = m[d + "Style"].color,
+                          U[d].width = m[d + "Style"].width,
+                          U[d].type = m[d + "Style"].type;
+                      for (var p = 0,
+                               c = e.length; c > p; p++) l = e[p],
+                          h = this.query(l, "tooltip.axisPointer.type"),
+                          V = h || V,
+                      h && (U[h].color = this.query(l, "tooltip.axisPointer." + h + "Style.color") || U[h].color, U[h].width = this.query(l, "tooltip.axisPointer." + h + "Style.width") || U[h].width, U[h].type = this.query(l, "tooltip.axisPointer." + h + "Style.type") || U[h].type);
+                      if ("line" === V) {
+                        var u = U.line.width,
+                            y = t == n;
+                        this._axisLineShape.style = {
+                          xStart: y ? this.subPixelOptimize(t, u) : t,
+                          yStart: y ? i: this.subPixelOptimize(i, u),
+                          xEnd: y ? this.subPixelOptimize(n, u) : n,
+                          yEnd: y ? a: this.subPixelOptimize(a, u),
+                          strokeColor: U.line.color,
+                          lineWidth: u,
+                          lineType: U.line.type
+                        },
+                            this._axisLineShape.invisible = !1,
+                            this.zr.modShape(this._axisLineShape.id)
+                      } else if ("cross" === V) {
+                        var g = U.cross.width;
+                        this._axisCrossShape.style = {
+                          brushType: "stroke",
+                          rect: this.component.grid.getArea(),
+                          x: this.subPixelOptimize(r, g),
+                          y: this.subPixelOptimize(s, g),
+                          text: ("( " + this.component.xAxis.getAxis(0).getValueFromCoord(r) + " , " + this.component.yAxis.getAxis(0).getValueFromCoord(s) + " )").replace("  , ", " ").replace(" ,  ", " "),
+                          textPosition: "specific",
+                          strokeColor: U.cross.color,
+                          lineWidth: g,
+                          lineType: U.cross.type
+                        },
+                            this.component.grid.getXend() - r > 100 ? (this._axisCrossShape.style.textAlign = "left", this._axisCrossShape.style.textX = r + 10) : (this._axisCrossShape.style.textAlign = "right", this._axisCrossShape.style.textX = r - 10),
+                            s - this.component.grid.getY() > 50 ? (this._axisCrossShape.style.textBaseline = "bottom", this._axisCrossShape.style.textY = s - 10) : (this._axisCrossShape.style.textBaseline = "top", this._axisCrossShape.style.textY = s + 10),
+                            this._axisCrossShape.invisible = !1,
+                            this.zr.modShape(this._axisCrossShape.id)
+                      } else "shadow" === V && ((null == U.shadow.width || "auto" === U.shadow.width || isNaN(U.shadow.width)) && (U.shadow.width = o), t === n ? Math.abs(this.component.grid.getX() - t) < 2 ? (U.shadow.width /= 2, t = n += U.shadow.width / 2) : Math.abs(this.component.grid.getXend() - t) < 2 && (U.shadow.width /= 2, t = n -= U.shadow.width / 2) : i === a && (Math.abs(this.component.grid.getY() - i) < 2 ? (U.shadow.width /= 2, i = a += U.shadow.width / 2) : Math.abs(this.component.grid.getYend() - i) < 2 && (U.shadow.width /= 2, i = a -= U.shadow.width / 2)), this._axisShadowShape.style = {
+                        xStart: t,
+                        yStart: i,
+                        xEnd: n,
+                        yEnd: a,
+                        strokeColor: U.shadow.color,
+                        lineWidth: U.shadow.width
+                      },
+                          this._axisShadowShape.invisible = !1, this.zr.modShape(this._axisShadowShape.id));
+                      this.zr.refreshNextFrame()
+                    }
+                  },
+                  __onmousemove: function(e) {
+                    if (clearTimeout(this._hidingTicket), clearTimeout(this._showingTicket), !this._mousein || !this._enterable) {
+                      var t = e.target,
+                          i = m.getX(e.event),
+                          n = m.getY(e.event);
+                      if (t) {
+                        this._curTarget = t,
+                            this._event = e.event,
+                            this._event.zrenderX = i,
+                            this._event.zrenderY = n;
+                        var a;
+                        if (this._needAxisTrigger && this.component.polar && -1 != (a = this.component.polar.isInside([i, n]))) for (var o = this.option.series,
+                                                                                                                                         l = 0,
+                                                                                                                                         h = o.length; h > l; l++) if (o[l].polarIndex === a && "axis" === this.deepQuery([o[l], this.option], "tooltip.trigger")) {
+                          this._curTarget = null;
+                          break
+                        }
+                        this._showingTicket = setTimeout(this._tryShow, this._showDelay)
+                      } else this._curTarget = !1,
+                          this._event = e.event,
+                          this._event.zrenderX = i,
+                          this._event.zrenderY = n,
+                          this._needAxisTrigger && this.component.grid && V.isInside(r, this.component.grid.getArea(), i, n) ? this._showingTicket = setTimeout(this._tryShow, this._showDelay) : this._needAxisTrigger && this.component.polar && -1 != this.component.polar.isInside([i, n]) ? this._showingTicket = setTimeout(this._tryShow, this._showDelay) : (!this._event.connectTrigger && this.messageCenter.dispatch(s.EVENT.TOOLTIP_OUT_GRID, this._event, null, this.myChart), this._hidingTicket = setTimeout(this._hide, this._hideDelay))
+                    }
+                  },
+                  __onglobalout: function() {
+                    clearTimeout(this._hidingTicket),
+                        clearTimeout(this._showingTicket),
+                        this._hidingTicket = setTimeout(this._hide, this._hideDelay)
+                  },
+                  __setContent: function(e, t) {
+                    this._tDom && (e === this._curTicket && (this._tDom.innerHTML = t), setTimeout(this._refixed, 20))
+                  },
+                  ontooltipHover: function(e, t) {
+                    if (!this._lastTipShape || this._lastTipShape && this._lastTipShape.dataIndex != e.dataIndex) {
+                      this._lastTipShape && this._lastTipShape.tipShape.length > 0 && (this.zr.delShape(this._lastTipShape.tipShape), this.shapeList.length = 2);
+                      for (var i = 0,
+                               n = t.length; n > i; i++) t[i].zlevel = this.getZlevelBase(),
+                          t[i].z = this.getZBase(),
+                          t[i].style = p.prototype.getHighlightStyle(t[i].style, t[i].highlightStyle),
+                          t[i].draggable = !1,
+                          t[i].hoverable = !1,
+                          t[i].clickable = !1,
+                          t[i].ondragend = null,
+                          t[i].ondragover = null,
+                          t[i].ondrop = null,
+                          this.shapeList.push(t[i]),
+                          this.zr.addShape(t[i]);
+                      this._lastTipShape = {
+                        dataIndex: e.dataIndex,
+                        tipShape: t
+                      }
+                    }
+                  },
+                  ondragend: function() {
+                    this._hide()
+                  },
+                  onlegendSelected: function(e) {
+                    this._selectedMap = e.selected
+                  },
+                  _setSelectedMap: function() {
+                    this._selectedMap = this.component.legend ? d.clone(this.component.legend.getSelectedMap()) : {}
+                  },
+                  _isSelected: function(e) {
+                    return null != this._selectedMap[e] ? this._selectedMap[e] : !0
+                  },
+                  showTip: function(e) {
+                    if (e) {
+                      var t, i = this.option.series;
+                      if (null != e.seriesIndex) t = e.seriesIndex;
+                      else for (var n = e.seriesName,
+                                    a = 0,
+                                    o = i.length; o > a; a++) if (i[a].name === n) {
+                        t = a;
+                        break
+                      }
+                      var r = i[t];
+                      if (null != r) {
+                        var m = this.myChart.chart[r.type],
+                            V = "axis" === this.deepQuery([r, this.option], "tooltip.trigger");
+                        if (m) if (V) {
+                          var U = e.dataIndex;
+                          switch (m.type) {
+                            case s.CHART_TYPE_LINE:
+                            case s.CHART_TYPE_BAR:
+                            case s.CHART_TYPE_K:
+                            case s.CHART_TYPE_RADAR:
+                              if (null == this.component.polar || r.data[0].value.length <= U) return;
+                              var d = r.polarIndex || 0,
+                                  p = this.component.polar.getVector(d, U, "max");
+                              this._event = {
+                                zrenderX: p[0],
+                                zrenderY: p[1]
+                              },
+                                  this._showPolarTrigger(d, U)
+                          }
+                        } else {
+                          var c, u, y = m.shapeList;
+                          switch (m.type) {
+                            case s.CHART_TYPE_LINE:
+                            case s.CHART_TYPE_BAR:
+                            case s.CHART_TYPE_K:
+                            case s.CHART_TYPE_TREEMAP:
+                            case s.CHART_TYPE_SCATTER:
+                              for (var U = e.dataIndex,
+                                       a = 0,
+                                       o = y.length; o > a; a++) if (null == y[a]._mark && l.get(y[a], "seriesIndex") == t && l.get(y[a], "dataIndex") == U) {
+                                this._curTarget = y[a],
+                                    c = y[a].style.x,
+                                    u = m.type != s.CHART_TYPE_K ? y[a].style.y: y[a].style.y[0];
+                                break
+                              }
+                              break;
+                            case s.CHART_TYPE_RADAR:
+                              for (var U = e.dataIndex,
+                                       a = 0,
+                                       o = y.length; o > a; a++) if ("polygon" === y[a].type && l.get(y[a], "seriesIndex") == t && l.get(y[a], "dataIndex") == U) {
+                                this._curTarget = y[a];
+                                var p = this.component.polar.getCenter(r.polarIndex || 0);
+                                c = p[0],
+                                    u = p[1];
+                                break
+                              }
+                              break;
+                            case s.CHART_TYPE_PIE:
+                              for (var g = e.name,
+                                       a = 0,
+                                       o = y.length; o > a; a++) if ("sector" === y[a].type && l.get(y[a], "seriesIndex") == t && l.get(y[a], "name") == g) {
+                                this._curTarget = y[a];
+                                var b = this._curTarget.style,
+                                    f = (b.startAngle + b.endAngle) / 2 * Math.PI / 180;
+                                c = this._curTarget.style.x + Math.cos(f) * b.r / 1.5,
+                                    u = this._curTarget.style.y - Math.sin(f) * b.r / 1.5;
+                                break
+                              }
+                              break;
+                            case s.CHART_TYPE_MAP:
+                              for (var g = e.name,
+                                       k = r.mapType,
+                                       a = 0,
+                                       o = y.length; o > a; a++) if ("text" === y[a].type && y[a]._mapType === k && y[a].style._name === g) {
+                                this._curTarget = y[a],
+                                    c = this._curTarget.style.x + this._curTarget.position[0],
+                                    u = this._curTarget.style.y + this._curTarget.position[1];
+                                break
+                              }
+                              break;
+                            case s.CHART_TYPE_CHORD:
+                              for (var g = e.name,
+                                       a = 0,
+                                       o = y.length; o > a; a++) if ("sector" === y[a].type && l.get(y[a], "name") == g) {
+                                this._curTarget = y[a];
+                                var b = this._curTarget.style,
+                                    f = (b.startAngle + b.endAngle) / 2 * Math.PI / 180;
+                                return c = this._curTarget.style.x + Math.cos(f) * (b.r - 2),
+                                    u = this._curTarget.style.y - Math.sin(f) * (b.r - 2),
+                                    void this.zr.trigger(h.EVENT.MOUSEMOVE, {
+                                      zrenderX: c,
+                                      zrenderY: u
+                                    })
+                              }
+                              break;
+                            case s.CHART_TYPE_FORCE:
+                              for (var g = e.name,
+                                       a = 0,
+                                       o = y.length; o > a; a++) if ("circle" === y[a].type && l.get(y[a], "name") == g) {
+                                this._curTarget = y[a],
+                                    c = this._curTarget.position[0],
+                                    u = this._curTarget.position[1];
+                                break
+                              }
+                          }
+                          null != c && null != u && (this._event = {
+                            zrenderX: c,
+                            zrenderY: u
+                          },
+                              this.zr.addHoverShape(this._curTarget), this.zr.refreshHover(), this._showItemTrigger())
+                        }
+                      }
+                    }
+                  },
+                  hideTip: function() {
+                    this._hide()
+                  },
+                  refresh: function(e) {
+                    if (this._zrHeight = this.zr.getHeight(), this._zrWidth = this.zr.getWidth(), this._lastTipShape && this._lastTipShape.tipShape.length > 0 && this.zr.delShape(this._lastTipShape.tipShape), this._lastTipShape = !1, this.shapeList.length = 2, this._lastDataIndex = -1, this._lastSeriesIndex = -1, this._lastItemTriggerId = -1, e) {
+                      this.option = e,
+                          this.option.tooltip = this.reformOption(this.option.tooltip),
+                          this.option.tooltip.textStyle = d.merge(this.option.tooltip.textStyle, this.ecTheme.textStyle),
+                          this._needAxisTrigger = !1,
+                      "axis" === this.option.tooltip.trigger && (this._needAxisTrigger = !0);
+                      for (var t = this.option.series,
+                               i = 0,
+                               n = t.length; n > i; i++) if ("axis" === this.query(t[i], "tooltip.trigger")) {
+                        this._needAxisTrigger = !0;
+                        break
+                      }
+                      this._showDelay = this.option.tooltip.showDelay,
+                          this._hideDelay = this.option.tooltip.hideDelay,
+                          this._defaultCssText = this._style(this.option.tooltip),
+                          this._setSelectedMap(),
+                          this._axisLineWidth = this.option.tooltip.axisPointer.lineStyle.width,
+                          this._enterable = this.option.tooltip.enterable,
+                      !this._enterable && this._tDom.className.indexOf(h.elementClassName) < 0 && (this._tDom.className += " " + h.elementClassName)
+                    }
+                    if (this.showing) {
+                      var a = this;
+                      setTimeout(function() {
+                            a.zr.trigger(h.EVENT.MOUSEMOVE, a.zr.handler._event)
+                          },
+                          50)
+                    }
+                  },
+                  onbeforDispose: function() {
+                    this._lastTipShape && this._lastTipShape.tipShape.length > 0 && this.zr.delShape(this._lastTipShape.tipShape),
+                        clearTimeout(this._hidingTicket),
+                        clearTimeout(this._showingTicket),
+                        this.zr.un(h.EVENT.MOUSEMOVE, this._onmousemove),
+                        this.zr.un(h.EVENT.GLOBALOUT, this._onglobalout),
+                    this.hasAppend && this.dom.firstChild && this.dom.firstChild.removeChild(this._tDom),
+                        this._tDom = null
+                  },
+                  _encodeHTML: function(e) {
+                    return String(e).replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#39;")
+                  }
+                },
+                    d.inherits(t, i),
+                    e("../component").define("tooltip", t),
+                    t
+              }),
+          i("echarts/component/legend", ["require", "./base", "zrender/shape/Text", "zrender/shape/Rectangle", "zrender/shape/Sector", "../util/shape/Icon", "../util/shape/Candle", "../config", "zrender/tool/util", "zrender/tool/area", "../component"],
+              function(e) {
+                function t(e, t, n, a, o) {
+                  if (!this.query(a, "legend.data")) return void console.error("option.legend.data has not been defined.");
+                  i.call(this, e, t, n, a, o);
+                  var r = this;
+                  r._legendSelected = function(e) {
+                    r.__legendSelected(e)
+                  },
+                      r._dispatchHoverLink = function(e) {
+                        return r.__dispatchHoverLink(e)
+                      },
+                      this._colorIndex = 0,
+                      this._colorMap = {},
+                      this._selectedMap = {},
+                      this._hasDataMap = {},
+                      this.refresh(a)
+                }
+                var i = e("./base"),
+                    n = e("zrender/shape/Text"),
+                    a = e("zrender/shape/Rectangle"),
+                    o = e("zrender/shape/Sector"),
+                    r = e("../util/shape/Icon"),
+                    s = e("../util/shape/Candle"),
+                    l = e("../config");
+                l.legend = {
+                  zlevel: 0,
+                  z: 4,
+                  show: !0,
+                  orient: "horizontal",
+                  x: "center",
+                  y: "top",
+                  backgroundColor: "rgba(0,0,0,0)",
+                  borderColor: "#ccc",
+                  borderWidth: 0,
+                  padding: 5,
+                  itemGap: 10,
+                  itemWidth: 20,
+                  itemHeight: 14,
+                  textStyle: {
+                    color: "#333"
+                  },
+                  selectedMode: !0
+                };
+                var h = e("zrender/tool/util"),
+                    m = e("zrender/tool/area");
+                t.prototype = {
+                  type: l.COMPONENT_TYPE_LEGEND,
+                  _buildShape: function() {
+                    if (this.legendOption.show) {
+                      this._itemGroupLocation = this._getItemGroupLocation(),
+                          this._buildBackground(),
+                          this._buildItem();
+                      for (var e = 0,
+                               t = this.shapeList.length; t > e; e++) this.zr.addShape(this.shapeList[e])
+                    }
+                  },
+                  _buildItem: function() {
+                    var e, t, i, a, o, s, l, V, U = this.legendOption.data,
+                        d = U.length,
+                        p = this.legendOption.textStyle,
+                        c = this.zr.getWidth(),
+                        u = this.zr.getHeight(),
+                        y = this._itemGroupLocation.x,
+                        g = this._itemGroupLocation.y,
+                        b = this.legendOption.itemWidth,
+                        f = this.legendOption.itemHeight,
+                        k = this.legendOption.itemGap;
+                    "vertical" === this.legendOption.orient && "right" === this.legendOption.x && (y = this._itemGroupLocation.x + this._itemGroupLocation.width - b);
+                    for (var x = 0; d > x; x++) o = h.merge(U[x].textStyle || {},
+                        p),
+                        s = this.getFont(o),
+                        e = this._getName(U[x]),
+                        l = this._getFormatterName(e),
+                        "" !== e ? (t = U[x].icon || this._getSomethingByName(e).type, V = this.getColor(e), "horizontal" === this.legendOption.orient ? 200 > c - y && b + 5 + m.getTextWidth(l, s) + (x === d - 1 || "" === U[x + 1] ? 0 : k) >= c - y && (y = this._itemGroupLocation.x, g += f + k) : 200 > u - g && f + (x === d - 1 || "" === U[x + 1] ? 0 : k) >= u - g && ("right" === this.legendOption.x ? y -= this._itemGroupLocation.maxWidth + k: y += this._itemGroupLocation.maxWidth + k, g = this._itemGroupLocation.y), i = this._getItemShapeByType(y, g, b, f, this._selectedMap[e] && this._hasDataMap[e] ? V: "#ccc", t, V), i._name = e, i = new r(i), a = {
+                          zlevel: this.getZlevelBase(),
+                          z: this.getZBase(),
+                          style: {
+                            x: y + b + 5,
+                            y: g + f / 2,
+                            color: this._selectedMap[e] ? "auto" === o.color ? V: o.color: "#ccc",
+                            text: l,
+                            textFont: s,
+                            textBaseline: "middle"
+                          },
+                          highlightStyle: {
+                            color: V,
+                            brushType: "fill"
+                          },
+                          hoverable: !!this.legendOption.selectedMode,
+                          clickable: !!this.legendOption.selectedMode
+                        },
+                        "vertical" === this.legendOption.orient && "right" === this.legendOption.x && (a.style.x -= b + 10, a.style.textAlign = "right"), a._name = e, a = new n(a), this.legendOption.selectedMode && (i.onclick = a.onclick = this._legendSelected, i.onmouseover = a.onmouseover = this._dispatchHoverLink, i.hoverConnect = a.id, a.hoverConnect = i.id), this.shapeList.push(i), this.shapeList.push(a), "horizontal" === this.legendOption.orient ? y += b + 5 + m.getTextWidth(l, s) + k: g += f + k) : "horizontal" === this.legendOption.orient ? (y = this._itemGroupLocation.x, g += f + k) : ("right" === this.legendOption.x ? y -= this._itemGroupLocation.maxWidth + k: y += this._itemGroupLocation.maxWidth + k, g = this._itemGroupLocation.y);
+                    "horizontal" === this.legendOption.orient && "center" === this.legendOption.x && g != this._itemGroupLocation.y && this._mLineOptimize()
+                  },
+                  _getName: function(e) {
+                    return "undefined" != typeof e.name ? e.name: e
+                  },
+                  _getFormatterName: function(e) {
+                    var t, i = this.legendOption.formatter;
+                    return t = "function" == typeof i ? i.call(this.myChart, e) : "string" == typeof i ? i.replace("{name}", e) : e
+                  },
+                  _getFormatterNameFromData: function(e) {
+                    var t = this._getName(e);
+                    return this._getFormatterName(t)
+                  },
+                  _mLineOptimize: function() {
+                    for (var e = [], t = this._itemGroupLocation.x, i = 2, n = this.shapeList.length; n > i; i++) this.shapeList[i].style.x === t ? e.push((this._itemGroupLocation.width - (this.shapeList[i - 1].style.x + m.getTextWidth(this.shapeList[i - 1].style.text, this.shapeList[i - 1].style.textFont) - t)) / 2) : i === n - 1 && e.push((this._itemGroupLocation.width - (this.shapeList[i].style.x + m.getTextWidth(this.shapeList[i].style.text, this.shapeList[i].style.textFont) - t)) / 2);
+                    for (var a = -1,
+                             i = 1,
+                             n = this.shapeList.length; n > i; i++) this.shapeList[i].style.x === t && a++,
+                    0 !== e[a] && (this.shapeList[i].style.x += e[a])
+                  },
+                  _buildBackground: function() {
+                    var e = this.reformCssArray(this.legendOption.padding);
+                    this.shapeList.push(new a({
+                      zlevel: this.getZlevelBase(),
+                      z: this.getZBase(),
+                      hoverable: !1,
+                      style: {
+                        x: this._itemGroupLocation.x - e[3],
+                        y: this._itemGroupLocation.y - e[0],
+                        width: this._itemGroupLocation.width + e[3] + e[1],
+                        height: this._itemGroupLocation.height + e[0] + e[2],
+                        brushType: 0 === this.legendOption.borderWidth ? "fill": "both",
+                        color: this.legendOption.backgroundColor,
+                        strokeColor: this.legendOption.borderColor,
+                        lineWidth: this.legendOption.borderWidth
+                      }
+                    }))
+                  },
+                  _getItemGroupLocation: function() {
+                    var e = this.legendOption.data,
+                        t = e.length,
+                        i = this.legendOption.itemGap,
+                        n = this.legendOption.itemWidth + 5,
+                        a = this.legendOption.itemHeight,
+                        o = this.legendOption.textStyle,
+                        r = this.getFont(o),
+                        s = 0,
+                        l = 0,
+                        V = this.reformCssArray(this.legendOption.padding),
+                        U = this.zr.getWidth() - V[1] - V[3],
+                        d = this.zr.getHeight() - V[0] - V[2],
+                        p = 0,
+                        c = 0;
+                    if ("horizontal" === this.legendOption.orient) {
+                      l = a;
+                      for (var u = 0; t > u; u++) if ("" !== this._getName(e[u])) {
+                        var y = m.getTextWidth(this._getFormatterNameFromData(e[u]), e[u].textStyle ? this.getFont(h.merge(e[u].textStyle || {},
+                            o)) : r);
+                        p + n + y + i > U ? (p -= i, s = Math.max(s, p), l += a + i, p = 0) : (p += n + y + i, s = Math.max(s, p - i))
+                      } else p -= i,
+                          s = Math.max(s, p),
+                          l += a + i,
+                          p = 0
+                    } else {
+                      for (var u = 0; t > u; u++) c = Math.max(c, m.getTextWidth(this._getFormatterNameFromData(e[u]), e[u].textStyle ? this.getFont(h.merge(e[u].textStyle || {},
+                          o)) : r));
+                      c += n,
+                          s = c;
+                      for (var u = 0; t > u; u++)"" !== this._getName(e[u]) ? p + a + i > d ? (s += c + i, p -= i, l = Math.max(l, p), p = 0) : (p += a + i, l = Math.max(l, p - i)) : (s += c + i, p -= i, l = Math.max(l, p), p = 0)
+                    }
+                    U = this.zr.getWidth(),
+                        d = this.zr.getHeight();
+                    var g;
+                    switch (this.legendOption.x) {
+                      case "center":
+                        g = Math.floor((U - s) / 2);
+                        break;
+                      case "left":
+                        g = V[3] + this.legendOption.borderWidth;
+                        break;
+                      case "right":
+                        g = U - s - V[1] - V[3] - 2 * this.legendOption.borderWidth;
+                        break;
+                      default:
+                        g = this.parsePercent(this.legendOption.x, U)
+                    }
+                    var b;
+                    switch (this.legendOption.y) {
+                      case "top":
+                        b = V[0] + this.legendOption.borderWidth;
+                        break;
+                      case "bottom":
+                        b = d - l - V[0] - V[2] - 2 * this.legendOption.borderWidth;
+                        break;
+                      case "center":
+                        b = Math.floor((d - l) / 2);
+                        break;
+                      default:
+                        b = this.parsePercent(this.legendOption.y, d)
+                    }
+                    return {
+                      x: g,
+                      y: b,
+                      width: s,
+                      height: l,
+                      maxWidth: c
+                    }
+                  },
+                  _getSomethingByName: function(e) {
+                    for (var t, i = this.option.series,
+                             n = 0,
+                             a = i.length; a > n; n++) {
+                      if (i[n].name === e) return {
+                        type: i[n].type,
+                        series: i[n],
+                        seriesIndex: n,
+                        data: null,
+                        dataIndex: -1
+                      };
+                      if (i[n].type === l.CHART_TYPE_PIE || i[n].type === l.CHART_TYPE_RADAR || i[n].type === l.CHART_TYPE_CHORD || i[n].type === l.CHART_TYPE_FORCE || i[n].type === l.CHART_TYPE_FUNNEL || i[n].type === l.CHART_TYPE_TREEMAP) {
+                        t = i[n].categories || i[n].data || i[n].nodes;
+                        for (var o = 0,
+                                 r = t.length; r > o; o++) if (t[o].name === e) return {
+                          type: i[n].type,
+                          series: i[n],
+                          seriesIndex: n,
+                          data: t[o],
+                          dataIndex: o
+                        }
+                      }
+                    }
+                    return {
+                      type: "bar",
+                      series: null,
+                      seriesIndex: -1,
+                      data: null,
+                      dataIndex: -1
+                    }
+                  },
+                  _getItemShapeByType: function(e, t, i, n, a, o, r) {
+                    var s, h = "#ccc" === a ? r: a,
+                        m = {
+                          zlevel: this.getZlevelBase(),
+                          z: this.getZBase(),
+                          style: {
+                            iconType: "legendicon" + o,
+                            x: e,
+                            y: t,
+                            width: i,
+                            height: n,
+                            color: a,
+                            strokeColor: a,
+                            lineWidth: 2
+                          },
+                          highlightStyle: {
+                            color: h,
+                            strokeColor: h,
+                            lineWidth: 1
+                          },
+                          hoverable: this.legendOption.selectedMode,
+                          clickable: this.legendOption.selectedMode
+                        };
+                    if (o.match("image")) {
+                      var s = o.replace(new RegExp("^image:\\/\\/"), "");
+                      o = "image"
+                    }
+                    switch (o) {
+                      case "line":
+                        m.style.brushType = "stroke",
+                            m.highlightStyle.lineWidth = 3;
+                        break;
+                      case "radar":
+                      case "venn":
+                      case "tree":
+                      case "treemap":
+                      case "scatter":
+                        m.highlightStyle.lineWidth = 3;
+                        break;
+                      case "k":
+                        m.style.brushType = "both",
+                            m.highlightStyle.lineWidth = 3,
+                            m.highlightStyle.color = m.style.color = this.deepQuery([this.ecTheme, l], "k.itemStyle.normal.color") || "#fff",
+                            m.style.strokeColor = "#ccc" != a ? this.deepQuery([this.ecTheme, l], "k.itemStyle.normal.lineStyle.color") || "#ff3200": a;
+                        break;
+                      case "image":
+                        m.style.iconType = "image",
+                            m.style.image = s,
+                        "#ccc" === a && (m.style.opacity = .5)
+                    }
+                    return m
+                  },
+                  __legendSelected: function(e) {
+                    var t = e.target._name;
+                    if ("single" === this.legendOption.selectedMode) for (var i in this._selectedMap) this._selectedMap[i] = !1;
+                    this._selectedMap[t] = !this._selectedMap[t],
+                        this.messageCenter.dispatch(l.EVENT.LEGEND_SELECTED, e.event, {
+                              selected: this._selectedMap,
+                              target: t
+                            },
+                            this.myChart)
+                  },
+                  __dispatchHoverLink: function(e) {
+                    this.messageCenter.dispatch(l.EVENT.LEGEND_HOVERLINK, e.event, {
+                          target: e.target._name
+                        },
+                        this.myChart)
+                  },
+                  refresh: function(e) {
+                    if (e) {
+                      this.option = e || this.option,
+                          this.option.legend = this.reformOption(this.option.legend),
+                          this.legendOption = this.option.legend;
+                      var t, i, n, a, o = this.legendOption.data || [];
+                      if (this.legendOption.selected) for (var r in this.legendOption.selected) this._selectedMap[r] = "undefined" != typeof this._selectedMap[r] ? this._selectedMap[r] : this.legendOption.selected[r];
+                      for (var s = 0,
+                               h = o.length; h > s; s++) t = this._getName(o[s]),
+                      "" !== t && (i = this._getSomethingByName(t), i.series ? (this._hasDataMap[t] = !0, a = !i.data || i.type !== l.CHART_TYPE_PIE && i.type !== l.CHART_TYPE_FORCE && i.type !== l.CHART_TYPE_FUNNEL ? [i.series] : [i.data, i.series], n = this.getItemStyleColor(this.deepQuery(a, "itemStyle.normal.color"), i.seriesIndex, i.dataIndex, i.data), n && i.type != l.CHART_TYPE_K && this.setColor(t, n), this._selectedMap[t] = null != this._selectedMap[t] ? this._selectedMap[t] : !0) : this._hasDataMap[t] = !1)
+                    }
+                    this.clear(),
+                        this._buildShape()
+                  },
+                  getRelatedAmount: function(e) {
+                    for (var t, i = 0,
+                             n = this.option.series,
+                             a = 0,
+                             o = n.length; o > a; a++) if (n[a].name === e && i++, n[a].type === l.CHART_TYPE_PIE || n[a].type === l.CHART_TYPE_RADAR || n[a].type === l.CHART_TYPE_CHORD || n[a].type === l.CHART_TYPE_FORCE || n[a].type === l.CHART_TYPE_FUNNEL) {
+                      t = n[a].type != l.CHART_TYPE_FORCE ? n[a].data: n[a].categories;
+                      for (var r = 0,
+                               s = t.length; s > r; r++) t[r].name === e && "-" != t[r].value && i++
+                    }
+                    return i
+                  },
+                  setColor: function(e, t) {
+                    this._colorMap[e] = t
+                  },
+                  getColor: function(e) {
+                    return this._colorMap[e] || (this._colorMap[e] = this.zr.getColor(this._colorIndex++)),
+                        this._colorMap[e]
+                  },
+                  hasColor: function(e) {
+                    return this._colorMap[e] ? this._colorMap[e] : !1
+                  },
+                  add: function(e, t) {
+                    for (var i = this.legendOption.data,
+                             n = 0,
+                             a = i.length; a > n; n++) if (this._getName(i[n]) === e) return;
+                    this.legendOption.data.push(e),
+                        this.setColor(e, t),
+                        this._selectedMap[e] = !0,
+                        this._hasDataMap[e] = !0
+                  },
+                  del: function(e) {
+                    for (var t = this.legendOption.data,
+                             i = 0,
+                             n = t.length; n > i; i++) if (this._getName(t[i]) === e) return this.legendOption.data.splice(i, 1)
+                  },
+                  getItemShape: function(e) {
+                    if (null != e) for (var t, i = 0,
+                                            n = this.shapeList.length; n > i; i++) if (t = this.shapeList[i], t._name === e && "text" != t.type) return t
+                  },
+                  setItemShape: function(e, t) {
+                    for (var i, n = 0,
+                             a = this.shapeList.length; a > n; n++) i = this.shapeList[n],
+                    i._name === e && "text" != i.type && (this._selectedMap[e] || (t.style.color = "#ccc", t.style.strokeColor = "#ccc"), this.zr.modShape(i.id, t))
+                  },
+                  isSelected: function(e) {
+                    return "undefined" != typeof this._selectedMap[e] ? this._selectedMap[e] : !0
+                  },
+                  getSelectedMap: function() {
+                    return this._selectedMap
+                  },
+                  setSelected: function(e, t) {
+                    if ("single" === this.legendOption.selectedMode) for (var i in this._selectedMap) this._selectedMap[i] = !1;
+                    this._selectedMap[e] = t,
+                        this.messageCenter.dispatch(l.EVENT.LEGEND_SELECTED, null, {
+                              selected: this._selectedMap,
+                              target: e
+                            },
+                            this.myChart)
+                  },
+                  onlegendSelected: function(e, t) {
+                    var i = e.selected;
+                    for (var n in i) this._selectedMap[n] != i[n] && (t.needRefresh = !0),
+                        this._selectedMap[n] = i[n]
+                  }
+                };
+                var V = {
+                  line: function(e, t) {
+                    var i = t.height / 2;
+                    e.moveTo(t.x, t.y + i),
+                        e.lineTo(t.x + t.width, t.y + i)
+                  },
+                  pie: function(e, t) {
+                    var i = t.x,
+                        n = t.y,
+                        a = t.width,
+                        r = t.height;
+                    o.prototype.buildPath(e, {
+                      x: i + a / 2,
+                      y: n + r + 2,
+                      r: r,
+                      r0: 6,
+                      startAngle: 45,
+                      endAngle: 135
+                    })
+                  },
+                  eventRiver: function(e, t) {
+                    var i = t.x,
+                        n = t.y,
+                        a = t.width,
+                        o = t.height;
+                    e.moveTo(i, n + o),
+                        e.bezierCurveTo(i + a, n + o, i, n + 4, i + a, n + 4),
+                        e.lineTo(i + a, n),
+                        e.bezierCurveTo(i, n, i + a, n + o - 4, i, n + o - 4),
+                        e.lineTo(i, n + o)
+                  },
+                  k: function(e, t) {
+                    var i = t.x,
+                        n = t.y,
+                        a = t.width,
+                        o = t.height;
+                    s.prototype.buildPath(e, {
+                      x: i + a / 2,
+                      y: [n + 1, n + 1, n + o - 6, n + o],
+                      width: a - 6
+                    })
+                  },
+                  bar: function(e, t) {
+                    var i = t.x,
+                        n = t.y + 1,
+                        a = t.width,
+                        o = t.height - 2,
+                        r = 3;
+                    e.moveTo(i + r, n),
+                        e.lineTo(i + a - r, n),
+                        e.quadraticCurveTo(i + a, n, i + a, n + r),
+                        e.lineTo(i + a, n + o - r),
+                        e.quadraticCurveTo(i + a, n + o, i + a - r, n + o),
+                        e.lineTo(i + r, n + o),
+                        e.quadraticCurveTo(i, n + o, i, n + o - r),
+                        e.lineTo(i, n + r),
+                        e.quadraticCurveTo(i, n, i + r, n)
+                  },
+                  force: function(e, t) {
+                    r.prototype.iconLibrary.circle(e, t)
+                  },
+                  radar: function(e, t) {
+                    var i = 6,
+                        n = t.x + t.width / 2,
+                        a = t.y + t.height / 2,
+                        o = t.height / 2,
+                        r = 2 * Math.PI / i,
+                        s = -Math.PI / 2,
+                        l = n + o * Math.cos(s),
+                        h = a + o * Math.sin(s);
+                    e.moveTo(l, h),
+                        s += r;
+                    for (var m = 0,
+                             V = i - 1; V > m; m++) e.lineTo(n + o * Math.cos(s), a + o * Math.sin(s)),
+                        s += r;
+                    e.lineTo(l, h)
+                  }
+                };
+                V.chord = V.pie,
+                    V.map = V.bar;
+                for (var U in V) r.prototype.iconLibrary["legendicon" + U] = V[U];
+                return h.inherits(t, i),
+                    e("../component").define("legend", t),
+                    t
+              }),
+          i("echarts/util/ecData", [],
+              function() {
+                function e(e, t, i, n, a, o, r, s) {
+                  var l;
+                  return "undefined" != typeof n && (l = null == n.value ? n: n.value),
+                      e._echartsData = {
+                        _series: t,
+                        _seriesIndex: i,
+                        _data: n,
+                        _dataIndex: a,
+                        _name: o,
+                        _value: l,
+                        _special: r,
+                        _special2: s
+                      },
+                      e._echartsData
+                }
+                function t(e, t) {
+                  var i = e._echartsData;
+                  if (!t) return i;
+                  switch (t) {
+                    case "series":
+                    case "seriesIndex":
+                    case "data":
+                    case "dataIndex":
+                    case "name":
+                    case "value":
+                    case "special":
+                    case "special2":
+                      return i && i["_" + t]
+                  }
+                  return null
+                }
+                function i(e, t, i) {
+                  switch (e._echartsData = e._echartsData || {},
+                      t) {
+                    case "series":
+                    case "seriesIndex":
+                    case "data":
+                    case "dataIndex":
+                    case "name":
+                    case "value":
+                    case "special":
+                    case "special2":
+                      e._echartsData["_" + t] = i
+                  }
+                }
+                function n(e, t) {
+                  t._echartsData = {
+                    _series: e._echartsData._series,
+                    _seriesIndex: e._echartsData._seriesIndex,
+                    _data: e._echartsData._data,
+                    _dataIndex: e._echartsData._dataIndex,
+                    _name: e._echartsData._name,
+                    _value: e._echartsData._value,
+                    _special: e._echartsData._special,
+                    _special2: e._echartsData._special2
+                  }
+                }
+                return {
+                  pack: e,
+                  set: i,
+                  get: t,
+                  clone: n
+                }
+              }),
+          i("echarts/chart", [],
+              function() {
+                var e = {},
+                    t = {};
+                return e.define = function(i, n) {
+                  return t[i] = n,
+                      e
+                },
+                    e.get = function(e) {
+                      return t[e]
+                    },
+                    e
+              }),
+          i("zrender/tool/color", ["require", "../tool/util"],
+              function(e) {
+                function t(e) {
+                  D = e
+                }
+                function i() {
+                  D = N
+                }
+                function n(e, t) {
+                  return e = 0 | e,
+                      t = t || D,
+                      t[e % t.length]
+                }
+                function a(e) {
+                  B = e
+                }
+                function o() {
+                  H = B
+                }
+                function r() {
+                  return B
+                }
+                function s(e, t, i, n, a, o, r) {
+                  O || (O = P.getContext());
+                  for (var s = O.createRadialGradient(e, t, i, n, a, o), l = 0, h = r.length; h > l; l++) s.addColorStop(r[l][0], r[l][1]);
+                  return s.__nonRecursion = !0,
+                      s
+                }
+                function l(e, t, i, n, a) {
+                  O || (O = P.getContext());
+                  for (var o = O.createLinearGradient(e, t, i, n), r = 0, s = a.length; s > r; r++) o.addColorStop(a[r][0], a[r][1]);
+                  return o.__nonRecursion = !0,
+                      o
+                }
+                function h(e, t, i) {
+                  e = p(e),
+                      t = p(t),
+                      e = I(e),
+                      t = I(t);
+                  for (var n = [], a = (t[0] - e[0]) / i, o = (t[1] - e[1]) / i, r = (t[2] - e[2]) / i, s = (t[3] - e[3]) / i, l = 0, h = e[0], m = e[1], U = e[2], d = e[3]; i > l; l++) n[l] = V([S(Math.floor(h), [0, 255]), S(Math.floor(m), [0, 255]), S(Math.floor(U), [0, 255]), d.toFixed(4) - 0], "rgba"),
+                      h += a,
+                      m += o,
+                      U += r,
+                      d += s;
+                  return h = t[0],
+                      m = t[1],
+                      U = t[2],
+                      d = t[3],
+                      n[l] = V([h, m, U, d], "rgba"),
+                      n
+                }
+                function m(e, t) {
+                  var i = [],
+                      n = e.length;
+                  if (void 0 === t && (t = 20), 1 === n) i = h(e[0], e[0], t);
+                  else if (n > 1) for (var a = 0,
+                                           o = n - 1; o > a; a++) {
+                    var r = h(e[a], e[a + 1], t);
+                    o - 1 > a && r.pop(),
+                        i = i.concat(r)
+                  }
+                  return i
+                }
+                function V(e, t) {
+                  if (t = t || "rgb", e && (3 === e.length || 4 === e.length)) {
+                    if (e = C(e,
+                        function(e) {
+                          return e > 1 ? Math.ceil(e) : e
+                        }), t.indexOf("hex") > -1) return "#" + ((1 << 24) + (e[0] << 16) + (e[1] << 8) + +e[2]).toString(16).slice(1);
+                    if (t.indexOf("hs") > -1) {
+                      var i = C(e.slice(1, 3),
+                          function(e) {
+                            return e + "%"
+                          });
+                      e[1] = i[0],
+                          e[2] = i[1]
+                    }
+                    return t.indexOf("a") > -1 ? (3 === e.length && e.push(1), e[3] = S(e[3], [0, 1]), t + "(" + e.slice(0, 4).join(",") + ")") : t + "(" + e.slice(0, 3).join(",") + ")"
+                  }
+                }
+                function U(e) {
+                  e = L(e),
+                  e.indexOf("rgba") < 0 && (e = p(e));
+                  var t = [],
+                      i = 0;
+                  return e.replace(/[\d.]+/g,
+                      function(e) {
+                        e = 3 > i ? 0 | e: +e,
+                            t[i++] = e
+                      }),
+                      t
+                }
+                function d(e, t) {
+                  if (!E(e)) return e;
+                  var i = I(e),
+                      n = i[3];
+                  return "undefined" == typeof n && (n = 1),
+                      e.indexOf("hsb") > -1 ? i = F(i) : e.indexOf("hsl") > -1 && (i = T(i)),
+                      t.indexOf("hsb") > -1 || t.indexOf("hsv") > -1 ? i = A(i) : t.indexOf("hsl") > -1 && (i = M(i)),
+                      i[3] = n,
+                      V(i, t)
+                }
+                function p(e) {
+                  return d(e, "rgba")
+                }
+                function c(e) {
+                  return d(e, "rgb")
+                }
+                function u(e) {
+                  return d(e, "hex")
+                }
+                function y(e) {
+                  return d(e, "hsva")
+                }
+                function g(e) {
+                  return d(e, "hsv")
+                }
+                function b(e) {
+                  return d(e, "hsba")
+                }
+                function f(e) {
+                  return d(e, "hsb")
+                }
+                function k(e) {
+                  return d(e, "hsla")
+                }
+                function x(e) {
+                  return d(e, "hsl")
+                }
+                function _(e) {
+                  for (var t in G) if (u(G[t]) === u(e)) return t;
+                  return null
+                }
+                function L(e) {
+                  return String(e).replace(/\s+/g, "")
+                }
+                function W(e) {
+                  if (G[e] && (e = G[e]), e = L(e), e = e.replace(/hsv/i, "hsb"), /^#[\da-f]{3}$/i.test(e)) {
+                    e = parseInt(e.slice(1), 16);
+                    var t = (3840 & e) << 8,
+                        i = (240 & e) << 4,
+                        n = 15 & e;
+                    e = "#" + ((1 << 24) + (t << 4) + t + (i << 4) + i + (n << 4) + n).toString(16).slice(1)
+                  }
+                  return e
+                }
+                function X(e, t) {
+                  if (!E(e)) return e;
+                  var i = t > 0 ? 1 : -1;
+                  "undefined" == typeof t && (t = 0),
+                      t = Math.abs(t) > 1 ? 1 : Math.abs(t),
+                      e = c(e);
+                  for (var n = I(e), a = 0; 3 > a; a++) n[a] = 1 === i ? n[a] * (1 - t) | 0 : (255 - n[a]) * t + n[a] | 0;
+                  return "rgb(" + n.join(",") + ")"
+                }
+                function v(e) {
+                  if (!E(e)) return e;
+                  var t = I(p(e));
+                  return t = C(t,
+                      function(e) {
+                        return 255 - e
+                      }),
+                      V(t, "rgb")
+                }
+                function w(e, t, i) {
+                  if (!E(e) || !E(t)) return e;
+                  "undefined" == typeof i && (i = .5),
+                      i = 1 - S(i, [0, 1]);
+                  for (var n = 2 * i - 1,
+                           a = I(p(e)), o = I(p(t)), r = a[3] - o[3], s = ((n * r === -1 ? n: (n + r) / (1 + n * r)) + 1) / 2, l = 1 - s, h = [], m = 0; 3 > m; m++) h[m] = a[m] * s + o[m] * l;
+                  var U = a[3] * i + o[3] * (1 - i);
+                  return U = Math.max(0, Math.min(1, U)),
+                      1 === a[3] && 1 === o[3] ? V(h, "rgb") : (h[3] = U, V(h, "rgba"))
+                }
+                function K() {
+                  return "#" + (Math.random().toString(16) + "0000").slice(2, 8)
+                }
+                function I(e) {
+                  e = W(e);
+                  var t = e.match(R);
+                  if (null === t) throw new Error("The color format error");
+                  var i, n, a, o = [];
+                  if (t[2]) i = t[2].replace("#", "").split(""),
+                      a = [i[0] + i[1], i[2] + i[3], i[4] + i[5]],
+                      o = C(a,
+                          function(e) {
+                            return S(parseInt(e, 16), [0, 255])
+                          });
+                  else if (t[4]) {
+                    var r = t[4].split(",");
+                    n = r[3],
+                        a = r.slice(0, 3),
+                        o = C(a,
+                            function(e) {
+                              return e = Math.floor(e.indexOf("%") > 0 ? 2.55 * parseInt(e, 0) : e),
+                                  S(e, [0, 255])
+                            }),
+                    "undefined" != typeof n && o.push(S(parseFloat(n), [0, 1]))
+                  } else if (t[5] || t[6]) {
+                    var s = (t[5] || t[6]).split(","),
+                        l = parseInt(s[0], 0) / 360,
+                        h = s[1],
+                        m = s[2];
+                    n = s[3],
+                        o = C([h, m],
+                            function(e) {
+                              return S(parseFloat(e) / 100, [0, 1])
+                            }),
+                        o.unshift(l),
+                    "undefined" != typeof n && o.push(S(parseFloat(n), [0, 1]))
+                  }
+                  return o
+                }
+                function J(e, t) {
+                  if (!E(e)) return e;
+                  null === t && (t = 1);
+                  var i = I(p(e));
+                  return i[3] = S(Number(t).toFixed(4), [0, 1]),
+                      V(i, "rgba")
+                }
+                function C(e, t) {
+                  if ("function" != typeof t) throw new TypeError;
+                  for (var i = e ? e.length: 0, n = 0; i > n; n++) e[n] = t(e[n]);
+                  return e
+                }
+                function S(e, t) {
+                  return e <= t[0] ? e = t[0] : e >= t[1] && (e = t[1]),
+                      e
+                }
+                function E(e) {
+                  return e instanceof Array || "string" == typeof e
+                }
+                function F(e) {
+                  var t, i, n, a = e[0],
+                      o = e[1],
+                      r = e[2];
+                  if (0 === o) t = 255 * r,
+                      i = 255 * r,
+                      n = 255 * r;
+                  else {
+                    var s = 6 * a;
+                    6 === s && (s = 0);
+                    var l = 0 | s,
+                        h = r * (1 - o),
+                        m = r * (1 - o * (s - l)),
+                        V = r * (1 - o * (1 - (s - l))),
+                        U = 0,
+                        d = 0,
+                        p = 0;
+                    0 === l ? (U = r, d = V, p = h) : 1 === l ? (U = m, d = r, p = h) : 2 === l ? (U = h, d = r, p = V) : 3 === l ? (U = h, d = m, p = r) : 4 === l ? (U = V, d = h, p = r) : (U = r, d = h, p = m),
+                        t = 255 * U,
+                        i = 255 * d,
+                        n = 255 * p
+                  }
+                  return [t, i, n]
+                }
+                function T(e) {
+                  var t, i, n, a = e[0],
+                      o = e[1],
+                      r = e[2];
+                  if (0 === o) t = 255 * r,
+                      i = 255 * r,
+                      n = 255 * r;
+                  else {
+                    var s;
+                    s = .5 > r ? r * (1 + o) : r + o - o * r;
+                    var l = 2 * r - s;
+                    t = 255 * z(l, s, a + 1 / 3),
+                        i = 255 * z(l, s, a),
+                        n = 255 * z(l, s, a - 1 / 3)
+                  }
+                  return [t, i, n]
+                }
+                function z(e, t, i) {
+                  return 0 > i && (i += 1),
+                  i > 1 && (i -= 1),
+                      1 > 6 * i ? e + 6 * (t - e) * i: 1 > 2 * i ? t: 2 > 3 * i ? e + (t - e) * (2 / 3 - i) * 6 : e
+                }
+                function A(e) {
+                  var t, i, n = e[0] / 255,
+                      a = e[1] / 255,
+                      o = e[2] / 255,
+                      r = Math.min(n, a, o),
+                      s = Math.max(n, a, o),
+                      l = s - r,
+                      h = s;
+                  if (0 === l) t = 0,
+                      i = 0;
+                  else {
+                    i = l / s;
+                    var m = ((s - n) / 6 + l / 2) / l,
+                        V = ((s - a) / 6 + l / 2) / l,
+                        U = ((s - o) / 6 + l / 2) / l;
+                    n === s ? t = U - V: a === s ? t = 1 / 3 + m - U: o === s && (t = 2 / 3 + V - m),
+                    0 > t && (t += 1),
+                    t > 1 && (t -= 1)
+                  }
+                  return t = 360 * t,
+                      i = 100 * i,
+                      h = 100 * h,
+                      [t, i, h]
+                }
+                function M(e) {
+                  var t, i, n = e[0] / 255,
+                      a = e[1] / 255,
+                      o = e[2] / 255,
+                      r = Math.min(n, a, o),
+                      s = Math.max(n, a, o),
+                      l = s - r,
+                      h = (s + r) / 2;
+                  if (0 === l) t = 0,
+                      i = 0;
+                  else {
+                    i = .5 > h ? l / (s + r) : l / (2 - s - r);
+                    var m = ((s - n) / 6 + l / 2) / l,
+                        V = ((s - a) / 6 + l / 2) / l,
+                        U = ((s - o) / 6 + l / 2) / l;
+                    n === s ? t = U - V: a === s ? t = 1 / 3 + m - U: o === s && (t = 2 / 3 + V - m),
+                    0 > t && (t += 1),
+                    t > 1 && (t -= 1)
+                  }
+                  return t = 360 * t,
+                      i = 100 * i,
+                      h = 100 * h,
+                      [t, i, h]
+                }
+                var O, P = e("../tool/util"),
+                    D = ["#ff9277", " #dddd00", " #ffc877", " #bbe3ff", " #d5ffbb", "#bbbbff", " #ddb000", " #b0dd00", " #e2bbff", " #ffbbe3", "#ff7777", " #ff9900", " #83dd00", " #77e3ff", " #778fff", "#c877ff", " #ff77ab", " #ff6600", " #aa8800", " #77c7ff", "#ad77ff", " #ff77ff", " #dd0083", " #777700", " #00aa00", "#0088aa", " #8400dd", " #aa0088", " #dd0000", " #772e00"],
+                    N = D,
+                    B = "rgba(255,255,0,0.5)",
+                    H = B,
+                    R = /^\s*((#[a-f\d]{6})|(#[a-f\d]{3})|rgba?\(\s*([\d\.]+%?\s*,\s*[\d\.]+%?\s*,\s*[\d\.]+%?(?:\s*,\s*[\d\.]+%?)?)\s*\)|hsba?\(\s*([\d\.]+(?:deg|\xb0|%)?\s*,\s*[\d\.]+%?\s*,\s*[\d\.]+%?(?:\s*,\s*[\d\.]+)?)%?\s*\)|hsla?\(\s*([\d\.]+(?:deg|\xb0|%)?\s*,\s*[\d\.]+%?\s*,\s*[\d\.]+%?(?:\s*,\s*[\d\.]+)?)%?\s*\))\s*$/i,
+                    G = {
+                      aliceblue: "#f0f8ff",
+                      antiquewhite: "#faebd7",
+                      aqua: "#0ff",
+                      aquamarine: "#7fffd4",
+                      azure: "#f0ffff",
+                      beige: "#f5f5dc",
+                      bisque: "#ffe4c4",
+                      black: "#000",
+                      blanchedalmond: "#ffebcd",
+                      blue: "#00f",
+                      blueviolet: "#8a2be2",
+                      brown: "#a52a2a",
+                      burlywood: "#deb887",
+                      cadetblue: "#5f9ea0",
+                      chartreuse: "#7fff00",
+                      chocolate: "#d2691e",
+                      coral: "#ff7f50",
+                      cornflowerblue: "#6495ed",
+                      cornsilk: "#fff8dc",
+                      crimson: "#dc143c",
+                      cyan: "#0ff",
+                      darkblue: "#00008b",
+                      darkcyan: "#008b8b",
+                      darkgoldenrod: "#b8860b",
+                      darkgray: "#a9a9a9",
+                      darkgrey: "#a9a9a9",
+                      darkgreen: "#006400",
+                      darkkhaki: "#bdb76b",
+                      darkmagenta: "#8b008b",
+                      darkolivegreen: "#556b2f",
+                      darkorange: "#ff8c00",
+                      darkorchid: "#9932cc",
+                      darkred: "#8b0000",
+                      darksalmon: "#e9967a",
+                      darkseagreen: "#8fbc8f",
+                      darkslateblue: "#483d8b",
+                      darkslategray: "#2f4f4f",
+                      darkslategrey: "#2f4f4f",
+                      darkturquoise: "#00ced1",
+                      darkviolet: "#9400d3",
+                      deeppink: "#ff1493",
+                      deepskyblue: "#00bfff",
+                      dimgray: "#696969",
+                      dimgrey: "#696969",
+                      dodgerblue: "#1e90ff",
+                      firebrick: "#b22222",
+                      floralwhite: "#fffaf0",
+                      forestgreen: "#228b22",
+                      fuchsia: "#f0f",
+                      gainsboro: "#dcdcdc",
+                      ghostwhite: "#f8f8ff",
+                      gold: "#ffd700",
+                      goldenrod: "#daa520",
+                      gray: "#808080",
+                      grey: "#808080",
+                      green: "#008000",
+                      greenyellow: "#adff2f",
+                      honeydew: "#f0fff0",
+                      hotpink: "#ff69b4",
+                      indianred: "#cd5c5c",
+                      indigo: "#4b0082",
+                      ivory: "#fffff0",
+                      khaki: "#f0e68c",
+                      lavender: "#e6e6fa",
+                      lavenderblush: "#fff0f5",
+                      lawngreen: "#7cfc00",
+                      lemonchiffon: "#fffacd",
+                      lightblue: "#add8e6",
+                      lightcoral: "#f08080",
+                      lightcyan: "#e0ffff",
+                      lightgoldenrodyellow: "#fafad2",
+                      lightgray: "#d3d3d3",
+                      lightgrey: "#d3d3d3",
+                      lightgreen: "#90ee90",
+                      lightpink: "#ffb6c1",
+                      lightsalmon: "#ffa07a",
+                      lightseagreen: "#20b2aa",
+                      lightskyblue: "#87cefa",
+                      lightslategray: "#789",
+                      lightslategrey: "#789",
+                      lightsteelblue: "#b0c4de",
+                      lightyellow: "#ffffe0",
+                      lime: "#0f0",
+                      limegreen: "#32cd32",
+                      linen: "#faf0e6",
+                      magenta: "#f0f",
+                      maroon: "#800000",
+                      mediumaquamarine: "#66cdaa",
+                      mediumblue: "#0000cd",
+                      mediumorchid: "#ba55d3",
+                      mediumpurple: "#9370d8",
+                      mediumseagreen: "#3cb371",
+                      mediumslateblue: "#7b68ee",
+                      mediumspringgreen: "#00fa9a",
+                      mediumturquoise: "#48d1cc",
+                      mediumvioletred: "#c71585",
+                      midnightblue: "#191970",
+                      mintcream: "#f5fffa",
+                      mistyrose: "#ffe4e1",
+                      moccasin: "#ffe4b5",
+                      navajowhite: "#ffdead",
+                      navy: "#000080",
+                      oldlace: "#fdf5e6",
+                      olive: "#808000",
+                      olivedrab: "#6b8e23",
+                      orange: "#ffa500",
+                      orangered: "#ff4500",
+                      orchid: "#da70d6",
+                      palegoldenrod: "#eee8aa",
+                      palegreen: "#98fb98",
+                      paleturquoise: "#afeeee",
+                      palevioletred: "#d87093",
+                      papayawhip: "#ffefd5",
+                      peachpuff: "#ffdab9",
+                      peru: "#cd853f",
+                      pink: "#ffc0cb",
+                      plum: "#dda0dd",
+                      powderblue: "#b0e0e6",
+                      purple: "#800080",
+                      red: "#f00",
+                      rosybrown: "#bc8f8f",
+                      royalblue: "#4169e1",
+                      saddlebrown: "#8b4513",
+                      salmon: "#fa8072",
+                      sandybrown: "#f4a460",
+                      seagreen: "#2e8b57",
+                      seashell: "#fff5ee",
+                      sienna: "#a0522d",
+                      silver: "#c0c0c0",
+                      skyblue: "#87ceeb",
+                      slateblue: "#6a5acd",
+                      slategray: "#708090",
+                      slategrey: "#708090",
+                      snow: "#fffafa",
+                      springgreen: "#00ff7f",
+                      steelblue: "#4682b4",
+                      tan: "#d2b48c",
+                      teal: "#008080",
+                      thistle: "#d8bfd8",
+                      tomato: "#ff6347",
+                      turquoise: "#40e0d0",
+                      violet: "#ee82ee",
+                      wheat: "#f5deb3",
+                      white: "#fff",
+                      whitesmoke: "#f5f5f5",
+                      yellow: "#ff0",
+                      yellowgreen: "#9acd32"
+                    };
+                return {
+                  customPalette: t,
+                  resetPalette: i,
+                  getColor: n,
+                  getHighlightColor: r,
+                  customHighlight: a,
+                  resetHighlight: o,
+                  getRadialGradient: s,
+                  getLinearGradient: l,
+                  getGradientColors: m,
+                  getStepColors: h,
+                  reverse: v,
+                  mix: w,
+                  lift: X,
+                  trim: L,
+                  random: K,
+                  toRGB: c,
+                  toRGBA: p,
+                  toHex: u,
+                  toHSL: x,
+                  toHSLA: k,
+                  toHSB: f,
+                  toHSBA: b,
+                  toHSV: g,
+                  toHSVA: y,
+                  toName: _,
+                  toColor: V,
+                  toArray: U,
+                  alpha: J,
+                  getData: I
+                }
+              }),
+          i("echarts/component/timeline", ["require", "./base", "zrender/shape/Rectangle", "../util/shape/Icon", "../util/shape/Chain", "../config", "zrender/tool/util", "zrender/tool/area", "zrender/tool/event", "../component"],
+              function(e) {
+                function t(e, t, i, a, o) {
+                  n.call(this, e, t, i, a, o);
+                  var r = this;
+                  if (r._onclick = function(e) {
+                    return r.__onclick(e)
+                  },
+                      r._ondrift = function(e, t) {
+                        return r.__ondrift(this, e, t)
+                      },
+                      r._ondragend = function() {
+                        return r.__ondragend()
+                      },
+                      r._setCurrentOption = function() {
+                        var e = r.timelineOption;
+                        r.currentIndex %= e.data.length;
+                        var t = r.options[r.currentIndex] || {};
+                        r.myChart._setOption(t, e.notMerge, !0),
+                            r.messageCenter.dispatch(s.EVENT.TIMELINE_CHANGED, null, {
+                                  currentIndex: r.currentIndex,
+                                  data: null != e.data[r.currentIndex].name ? e.data[r.currentIndex].name: e.data[r.currentIndex]
+                                },
+                                r.myChart)
+                      },
+                      r._onFrame = function() {
+                        r._setCurrentOption(),
+                            r._syncHandleShape(),
+                        r.timelineOption.autoPlay && (r.playTicket = setTimeout(function() {
+                              return r.currentIndex += 1,
+                                  !r.timelineOption.loop && r.currentIndex >= r.timelineOption.data.length ? (r.currentIndex = r.timelineOption.data.length - 1, void r.stop()) : void r._onFrame()
+                            },
+                            r.timelineOption.playInterval))
+                      },
+                      this.setTheme(!1), this.options = this.option.options, this.currentIndex = this.timelineOption.currentIndex % this.timelineOption.data.length, this.timelineOption.notMerge || 0 === this.currentIndex || (this.options[this.currentIndex] = l.merge(this.options[this.currentIndex], this.options[0])), this.timelineOption.show && (this._buildShape(), this._syncHandleShape()), this._setCurrentOption(), this.timelineOption.autoPlay) {
+                    var r = this;
+                    this.playTicket = setTimeout(function() {
+                          r.play()
+                        },
+                        null != this.ecTheme.animationDuration ? this.ecTheme.animationDuration: s.animationDuration)
+                  }
+                }
+                function i(e, t) {
+                  var i = 2,
+                      n = t.x + i,
+                      a = t.y + i + 2,
+                      r = t.width - i,
+                      s = t.height - i,
+                      l = t.symbol;
+                  if ("last" === l) e.moveTo(n + r - 2, a + s / 3),
+                      e.lineTo(n + r - 2, a),
+                      e.lineTo(n + 2, a + s / 2),
+                      e.lineTo(n + r - 2, a + s),
+                      e.lineTo(n + r - 2, a + s / 3 * 2),
+                      e.moveTo(n, a),
+                      e.lineTo(n, a);
+                  else if ("next" === l) e.moveTo(n + 2, a + s / 3),
+                      e.lineTo(n + 2, a),
+                      e.lineTo(n + r - 2, a + s / 2),
+                      e.lineTo(n + 2, a + s),
+                      e.lineTo(n + 2, a + s / 3 * 2),
+                      e.moveTo(n, a),
+                      e.lineTo(n, a);
+                  else if ("play" === l) if ("stop" === t.status) e.moveTo(n + 2, a),
+                      e.lineTo(n + r - 2, a + s / 2),
+                      e.lineTo(n + 2, a + s),
+                      e.lineTo(n + 2, a);
+                  else {
+                    var h = "both" === t.brushType ? 2 : 3;
+                    e.rect(n + 2, a, h, s),
+                        e.rect(n + r - h - 2, a, h, s)
+                  } else if (l.match("image")) {
+                    var m = "";
+                    m = l.replace(new RegExp("^image:\\/\\/"), ""),
+                        l = o.prototype.iconLibrary.image,
+                        l(e, {
+                          x: n,
+                          y: a,
+                          width: r,
+                          height: s,
+                          image: m
+                        })
+                  }
+                }
+                var n = e("./base"),
+                    a = e("zrender/shape/Rectangle"),
+                    o = e("../util/shape/Icon"),
+                    r = e("../util/shape/Chain"),
+                    s = e("../config");
+                s.timeline = {
+                  zlevel: 0,
+                  z: 4,
+                  show: !0,
+                  type: "time",
+                  notMerge: !1,
+                  realtime: !0,
+                  x: 80,
+                  x2: 80,
+                  y2: 0,
+                  height: 50,
+                  backgroundColor: "rgba(0,0,0,0)",
+                  borderColor: "#ccc",
+                  borderWidth: 0,
+                  padding: 5,
+                  controlPosition: "left",
+                  autoPlay: !1,
+                  loop: !0,
+                  playInterval: 2e3,
+                  lineStyle: {
+                    width: 1,
+                    color: "#666",
+                    type: "dashed"
+                  },
+                  label: {
+                    show: !0,
+                    interval: "auto",
+                    rotate: 0,
+                    textStyle: {
+                      color: "#333"
+                    }
+                  },
+                  checkpointStyle: {
+                    symbol: "auto",
+                    symbolSize: "auto",
+                    color: "auto",
+                    borderColor: "auto",
+                    borderWidth: "auto",
+                    label: {
+                      show: !1,
+                      textStyle: {
+                        color: "auto"
+                      }
+                    }
+                  },
+                  controlStyle: {
+                    itemSize: 15,
+                    itemGap: 5,
+                    normal: {
+                      color: "#333"
+                    },
+                    emphasis: {
+                      color: "#1e90ff"
+                    }
+                  },
+                  symbol: "emptyDiamond",
+                  symbolSize: 4,
+                  currentIndex: 0
+                };
+                var l = e("zrender/tool/util"),
+                    h = e("zrender/tool/area"),
+                    m = e("zrender/tool/event");
+                return t.prototype = {
+                  type: s.COMPONENT_TYPE_TIMELINE,
+                  _buildShape: function() {
+                    if (this._location = this._getLocation(), this._buildBackground(), this._buildControl(), this._chainPoint = this._getChainPoint(), this.timelineOption.label.show) for (var e = this._getInterval(), t = 0, i = this._chainPoint.length; i > t; t += e) this._chainPoint[t].showLabel = !0;
+                    this._buildChain(),
+                        this._buildHandle();
+                    for (var t = 0,
+                             n = this.shapeList.length; n > t; t++) this.zr.addShape(this.shapeList[t])
+                  },
+                  _getLocation: function() {
+                    var e, t = this.timelineOption,
+                        i = this.reformCssArray(this.timelineOption.padding),
+                        n = this.zr.getWidth(),
+                        a = this.parsePercent(t.x, n),
+                        o = this.parsePercent(t.x2, n);
+                    null == t.width ? (e = n - a - o, o = n - o) : (e = this.parsePercent(t.width, n), o = a + e);
+                    var r, s, l = this.zr.getHeight(),
+                        h = this.parsePercent(t.height, l);
+                    return null != t.y ? (r = this.parsePercent(t.y, l), s = r + h) : (s = l - this.parsePercent(t.y2, l), r = s - h),
+                        {
+                          x: a + i[3],
+                          y: r + i[0],
+                          x2: o - i[1],
+                          y2: s - i[2],
+                          width: e - i[1] - i[3],
+                          height: h - i[0] - i[2]
+                        }
+                  },
+                  _getReformedLabel: function(e) {
+                    var t = this.timelineOption,
+                        i = null != t.data[e].name ? t.data[e].name: t.data[e],
+                        n = t.data[e].formatter || t.label.formatter;
+                    return n && ("function" == typeof n ? i = n.call(this.myChart, i) : "string" == typeof n && (i = n.replace("{value}", i))),
+                        i
+                  },
+                  _getInterval: function() {
+                    var e = this._chainPoint,
+                        t = this.timelineOption,
+                        i = t.label.interval;
+                    if ("auto" === i) {
+                      var n = t.label.textStyle.fontSize,
+                          a = t.data,
+                          o = t.data.length;
+                      if (o > 3) {
+                        var r, s, l = !1;
+                        for (i = 0; ! l && o > i;) {
+                          i++,
+                              l = !0;
+                          for (var m = i; o > m; m += i) {
+                            if (r = e[m].x - e[m - i].x, 0 !== t.label.rotate) s = n;
+                            else if (a[m].textStyle) s = h.getTextWidth(e[m].name, e[m].textFont);
+                            else {
+                              var V = e[m].name + "",
+                                  U = (V.match(/\w/g) || "").length,
+                                  d = V.length - U;
+                              s = U * n * 2 / 3 + d * n
+                            }
+                            if (s > r) {
+                              l = !1;
+                              break
+                            }
+                          }
+                        }
+                      } else i = 1
+                    } else i = i - 0 + 1;
+                    return i
+                  },
+                  _getChainPoint: function() {
+                    function e(e) {
+                      return null != h[e].name ? h[e].name: h[e] + ""
+                    }
+                    var t, i = this.timelineOption,
+                        n = i.symbol.toLowerCase(),
+                        a = i.symbolSize,
+                        o = i.label.rotate,
+                        r = i.label.textStyle,
+                        s = this.getFont(r),
+                        h = i.data,
+                        m = this._location.x,
+                        V = this._location.y + this._location.height / 4 * 3,
+                        U = this._location.x2 - this._location.x,
+                        d = h.length,
+                        p = [];
+                    if (d > 1) {
+                      var c = U / d;
+                      if (c = c > 50 ? 50 : 20 > c ? 5 : c, U -= 2 * c, "number" === i.type) for (var u = 0; d > u; u++) p.push(m + c + U / (d - 1) * u);
+                      else {
+                        p[0] = new Date(e(0).replace(/-/g, "/")),
+                            p[d - 1] = new Date(e(d - 1).replace(/-/g, "/")) - p[0];
+                        for (var u = 1; d > u; u++) p[u] = m + c + U * (new Date(e(u).replace(/-/g, "/")) - p[0]) / p[d - 1];
+                        p[0] = m + c
+                      }
+                    } else p.push(m + U / 2);
+                    for (var y, g, b, f, k, x = [], u = 0; d > u; u++) m = p[u],
+                        y = h[u].symbol && h[u].symbol.toLowerCase() || n,
+                        y.match("empty") ? (y = y.replace("empty", ""), b = !0) : b = !1,
+                    y.match("star") && (g = y.replace("star", "") - 0 || 5, y = "star"),
+                        t = h[u].textStyle ? l.merge(h[u].textStyle || {},
+                            r) : r,
+                        f = t.align || "center",
+                        o ? (f = o > 0 ? "right": "left", k = [o * Math.PI / 180, m, V - 5]) : k = !1,
+                        x.push({
+                          x: m,
+                          n: g,
+                          isEmpty: b,
+                          symbol: y,
+                          symbolSize: h[u].symbolSize || a,
+                          color: h[u].color,
+                          borderColor: h[u].borderColor,
+                          borderWidth: h[u].borderWidth,
+                          name: this._getReformedLabel(u),
+                          textColor: t.color,
+                          textAlign: f,
+                          textBaseline: t.baseline || "middle",
+                          textX: m,
+                          textY: V - (o ? 5 : 0),
+                          textFont: h[u].textStyle ? this.getFont(t) : s,
+                          rotation: k,
+                          showLabel: !1
+                        });
+                    return x
+                  },
+                  _buildBackground: function() {
+                    var e = this.timelineOption,
+                        t = this.reformCssArray(this.timelineOption.padding),
+                        i = this._location.width,
+                        n = this._location.height; (0 !== e.borderWidth || "rgba(0,0,0,0)" != e.backgroundColor.replace(/\s/g, "")) && this.shapeList.push(new a({
+                      zlevel: this.getZlevelBase(),
+                      z: this.getZBase(),
+                      hoverable: !1,
+                      style: {
+                        x: this._location.x - t[3],
+                        y: this._location.y - t[0],
+                        width: i + t[1] + t[3],
+                        height: n + t[0] + t[2],
+                        brushType: 0 === e.borderWidth ? "fill": "both",
+                        color: e.backgroundColor,
+                        strokeColor: e.borderColor,
+                        lineWidth: e.borderWidth
+                      }
+                    }))
+                  },
+                  _buildControl: function() {
+                    var e = this,
+                        t = this.timelineOption,
+                        i = t.lineStyle,
+                        n = t.controlStyle;
+                    if ("none" !== t.controlPosition) {
+                      var a, r = n.itemSize,
+                          s = n.itemGap;
+                      "left" === t.controlPosition ? (a = this._location.x, this._location.x += 3 * (r + s)) : (a = this._location.x2 - (3 * (r + s) - s), this._location.x2 -= 3 * (r + s));
+                      var h = this._location.y,
+                          m = {
+                            zlevel: this.getZlevelBase(),
+                            z: this.getZBase() + 1,
+                            style: {
+                              iconType: "timelineControl",
+                              symbol: "last",
+                              x: a,
+                              y: h,
+                              width: r,
+                              height: r,
+                              brushType: "stroke",
+                              color: n.normal.color,
+                              strokeColor: n.normal.color,
+                              lineWidth: i.width
+                            },
+                            highlightStyle: {
+                              color: n.emphasis.color,
+                              strokeColor: n.emphasis.color,
+                              lineWidth: i.width + 1
+                            },
+                            clickable: !0
+                          };
+                      this._ctrLastShape = new o(m),
+                          this._ctrLastShape.onclick = function() {
+                            e.last()
+                          },
+                          this.shapeList.push(this._ctrLastShape),
+                          a += r + s,
+                          this._ctrPlayShape = new o(l.clone(m)),
+                          this._ctrPlayShape.style.brushType = "fill",
+                          this._ctrPlayShape.style.symbol = "play",
+                          this._ctrPlayShape.style.status = this.timelineOption.autoPlay ? "playing": "stop",
+                          this._ctrPlayShape.style.x = a,
+                          this._ctrPlayShape.onclick = function() {
+                            "stop" === e._ctrPlayShape.style.status ? e.play() : e.stop()
+                          },
+                          this.shapeList.push(this._ctrPlayShape),
+                          a += r + s,
+                          this._ctrNextShape = new o(l.clone(m)),
+                          this._ctrNextShape.style.symbol = "next",
+                          this._ctrNextShape.style.x = a,
+                          this._ctrNextShape.onclick = function() {
+                            e.next()
+                          },
+                          this.shapeList.push(this._ctrNextShape)
+                    }
+                  },
+                  _buildChain: function() {
+                    var e = this.timelineOption,
+                        t = e.lineStyle;
+                    this._timelineShae = {
+                      zlevel: this.getZlevelBase(),
+                      z: this.getZBase(),
+                      style: {
+                        x: this._location.x,
+                        y: this.subPixelOptimize(this._location.y, t.width),
+                        width: this._location.x2 - this._location.x,
+                        height: this._location.height,
+                        chainPoint: this._chainPoint,
+                        brushType: "both",
+                        strokeColor: t.color,
+                        lineWidth: t.width,
+                        lineType: t.type
+                      },
+                      hoverable: !1,
+                      clickable: !0,
+                      onclick: this._onclick
+                    },
+                        this._timelineShae = new r(this._timelineShae),
+                        this.shapeList.push(this._timelineShae)
+                  },
+                  _buildHandle: function() {
+                    var e = this._chainPoint[this.currentIndex],
+                        t = e.symbolSize + 1;
+                    t = 5 > t ? 5 : t,
+                        this._handleShape = {
+                          zlevel: this.getZlevelBase(),
+                          z: this.getZBase() + 1,
+                          hoverable: !1,
+                          draggable: !0,
+                          style: {
+                            iconType: "diamond",
+                            n: e.n,
+                            x: e.x - t,
+                            y: this._location.y + this._location.height / 4 - t,
+                            width: 2 * t,
+                            height: 2 * t,
+                            brushType: "both",
+                            textPosition: "specific",
+                            textX: e.x,
+                            textY: this._location.y - this._location.height / 4,
+                            textAlign: "center",
+                            textBaseline: "middle"
+                          },
+                          highlightStyle: {},
+                          ondrift: this._ondrift,
+                          ondragend: this._ondragend
+                        },
+                        this._handleShape = new o(this._handleShape),
+                        this.shapeList.push(this._handleShape)
+                  },
+                  _syncHandleShape: function() {
+                    if (this.timelineOption.show) {
+                      var e = this.timelineOption,
+                          t = e.checkpointStyle,
+                          i = this._chainPoint[this.currentIndex];
+                      this._handleShape.style.text = t.label.show ? i.name: "",
+                          this._handleShape.style.textFont = i.textFont,
+                          this._handleShape.style.n = i.n,
+                          "auto" === t.symbol ? this._handleShape.style.iconType = "none" != i.symbol ? i.symbol: "diamond": (this._handleShape.style.iconType = t.symbol, t.symbol.match("star") && (this._handleShape.style.n = t.symbol.replace("star", "") - 0 || 5, this._handleShape.style.iconType = "star"));
+                      var n;
+                      "auto" === t.symbolSize ? (n = i.symbolSize + 2, n = 5 > n ? 5 : n) : n = t.symbolSize - 0,
+                          this._handleShape.style.color = "auto" === t.color ? i.color ? i.color: e.controlStyle.emphasis.color: t.color,
+                          this._handleShape.style.textColor = "auto" === t.label.textStyle.color ? this._handleShape.style.color: t.label.textStyle.color,
+                          this._handleShape.highlightStyle.strokeColor = this._handleShape.style.strokeColor = "auto" === t.borderColor ? i.borderColor ? i.borderColor: "#fff": t.borderColor,
+                          this._handleShape.style.lineWidth = "auto" === t.borderWidth ? i.borderWidth ? i.borderWidth: 0 : t.borderWidth - 0,
+                          this._handleShape.highlightStyle.lineWidth = this._handleShape.style.lineWidth + 1,
+                          this.zr.animate(this._handleShape.id, "style").when(500, {
+                            x: i.x - n,
+                            textX: i.x,
+                            y: this._location.y + this._location.height / 4 - n,
+                            width: 2 * n,
+                            height: 2 * n
+                          }).start("ExponentialOut")
+                    }
+                  },
+                  _findChainIndex: function(e) {
+                    var t = this._chainPoint,
+                        i = t.length;
+                    if (e <= t[0].x) return 0;
+                    if (e >= t[i - 1].x) return i - 1;
+                    for (var n = 0; i - 1 > n; n++) if (e >= t[n].x && e <= t[n + 1].x) return Math.abs(e - t[n].x) < Math.abs(e - t[n + 1].x) ? n: n + 1
+                  },
+                  __onclick: function(e) {
+                    var t = m.getX(e.event),
+                        i = this._findChainIndex(t);
+                    return i === this.currentIndex ? !0 : (this.currentIndex = i, this.timelineOption.autoPlay && this.stop(), clearTimeout(this.playTicket), void this._onFrame())
+                  },
+                  __ondrift: function(e, t) {
+                    this.timelineOption.autoPlay && this.stop();
+                    var i, n = this._chainPoint,
+                        a = n.length;
+                    e.style.x + t <= n[0].x - n[0].symbolSize ? (e.style.x = n[0].x - n[0].symbolSize, i = 0) : e.style.x + t >= n[a - 1].x - n[a - 1].symbolSize ? (e.style.x = n[a - 1].x - n[a - 1].symbolSize, i = a - 1) : (e.style.x += t, i = this._findChainIndex(e.style.x));
+                    var o = n[i],
+                        r = o.symbolSize + 2;
+                    if (e.style.iconType = o.symbol, e.style.n = o.n, e.style.textX = e.style.x + r / 2, e.style.y = this._location.y + this._location.height / 4 - r, e.style.width = 2 * r, e.style.height = 2 * r, e.style.text = o.name, i === this.currentIndex) return ! 0;
+                    if (this.currentIndex = i, this.timelineOption.realtime) {
+                      clearTimeout(this.playTicket);
+                      var s = this;
+                      this.playTicket = setTimeout(function() {
+                            s._setCurrentOption()
+                          },
+                          200)
+                    }
+                    return ! 0
+                  },
+                  __ondragend: function() {
+                    this.isDragend = !0
+                  },
+                  ondragend: function(e, t) {
+                    this.isDragend && e.target && (!this.timelineOption.realtime && this._setCurrentOption(), t.dragOut = !0, t.dragIn = !0, t.needRefresh = !1, this.isDragend = !1, this._syncHandleShape())
+                  },
+                  last: function() {
+                    return this.timelineOption.autoPlay && this.stop(),
+                        this.currentIndex -= 1,
+                    this.currentIndex < 0 && (this.currentIndex = this.timelineOption.data.length - 1),
+                        this._onFrame(),
+                        this.currentIndex
+                  },
+                  next: function() {
+                    return this.timelineOption.autoPlay && this.stop(),
+                        this.currentIndex += 1,
+                    this.currentIndex >= this.timelineOption.data.length && (this.currentIndex = 0),
+                        this._onFrame(),
+                        this.currentIndex
+                  },
+                  play: function(e, t) {
+                    return this._ctrPlayShape && "playing" != this._ctrPlayShape.style.status && (this._ctrPlayShape.style.status = "playing", this.zr.modShape(this._ctrPlayShape.id), this.zr.refreshNextFrame()),
+                        this.timelineOption.autoPlay = null != t ? t: !0,
+                    this.timelineOption.autoPlay || clearTimeout(this.playTicket),
+                        this.currentIndex = null != e ? e: this.currentIndex + 1,
+                    this.currentIndex >= this.timelineOption.data.length && (this.currentIndex = 0),
+                        this._onFrame(),
+                        this.currentIndex
+                  },
+                  stop: function() {
+                    return this._ctrPlayShape && "stop" != this._ctrPlayShape.style.status && (this._ctrPlayShape.style.status = "stop", this.zr.modShape(this._ctrPlayShape.id), this.zr.refreshNextFrame()),
+                        this.timelineOption.autoPlay = !1,
+                        clearTimeout(this.playTicket),
+                        this.currentIndex
+                  },
+                  resize: function() {
+                    this.timelineOption.show && (this.clear(), this._buildShape(), this._syncHandleShape())
+                  },
+                  setTheme: function(e) {
+                    this.timelineOption = this.reformOption(l.clone(this.option.timeline)),
+                        this.timelineOption.label.textStyle = this.getTextStyle(this.timelineOption.label.textStyle),
+                        this.timelineOption.checkpointStyle.label.textStyle = this.getTextStyle(this.timelineOption.checkpointStyle.label.textStyle),
+                    this.myChart.canvasSupported || (this.timelineOption.realtime = !1),
+                    this.timelineOption.show && e && (this.clear(), this._buildShape(), this._syncHandleShape())
+                  },
+                  onbeforDispose: function() {
+                    clearTimeout(this.playTicket)
+                  }
+                },
+                    o.prototype.iconLibrary.timelineControl = i,
+                    l.inherits(t, n),
+                    e("../component").define("timeline", t),
+                    t
+              }),
+          i("zrender/shape/Image", ["require", "./Base", "../tool/util"],
+              function(e) {
+                var t = e("./Base"),
+                    i = function(e) {
+                      t.call(this, e)
+                    };
+                return i.prototype = {
+                  type: "image",
+                  brush: function(e, t, i) {
+                    var n = this.style || {};
+                    t && (n = this.getHighlightStyle(n, this.highlightStyle || {}));
+                    var a = n.image,
+                        o = this;
+                    if (this._imageCache || (this._imageCache = {}), "string" == typeof a) {
+                      var r = a;
+                      this._imageCache[r] ? a = this._imageCache[r] : (a = new Image, a.onload = function() {
+                        a.onload = null,
+                            o.modSelf(),
+                            i()
+                      },
+                          a.src = r, this._imageCache[r] = a)
+                    }
+                    if (a) {
+                      if ("IMG" == a.nodeName.toUpperCase()) if (window.ActiveXObject) {
+                        if ("complete" != a.readyState) return
+                      } else if (!a.complete) return;
+                      var s = n.width || a.width,
+                          l = n.height || a.height,
+                          h = n.x,
+                          m = n.y;
+                      if (!a.width || !a.height) return;
+                      if (e.save(), this.doClip(e), this.setContext(e, n), this.setTransform(e), n.sWidth && n.sHeight) {
+                        var V = n.sx || 0,
+                            U = n.sy || 0;
+                        e.drawImage(a, V, U, n.sWidth, n.sHeight, h, m, s, l)
+                      } else if (n.sx && n.sy) {
+                        var V = n.sx,
+                            U = n.sy,
+                            d = s - V,
+                            p = l - U;
+                        e.drawImage(a, V, U, d, p, h, m, s, l)
+                      } else e.drawImage(a, h, m, s, l);
+                      n.width || (n.width = s),
+                      n.height || (n.height = l),
+                      this.style.width || (this.style.width = s),
+                      this.style.height || (this.style.height = l),
+                          this.drawText(e, n, this.style),
+                          e.restore()
+                    }
+                  },
+                  getRect: function(e) {
+                    return {
+                      x: e.x,
+                      y: e.y,
+                      width: e.width,
+                      height: e.height
+                    }
+                  },
+                  clearCache: function() {
+                    this._imageCache = {}
+                  }
+                },
+                    e("../tool/util").inherits(i, t),
+                    i
+              }),
+          i("zrender/loadingEffect/Bar", ["require", "./Base", "../tool/util", "../tool/color", "../shape/Rectangle"],
+              function(e) {
+                function t(e) {
+                  i.call(this, e)
+                }
+                var i = e("./Base"),
+                    n = e("../tool/util"),
+                    a = e("../tool/color"),
+                    o = e("../shape/Rectangle");
+                return n.inherits(t, i),
+                    t.prototype._start = function(e, t) {
+                      var i = n.merge(this.options, {
+                            textStyle: {
+                              color: "#888"
+                            },
+                            backgroundColor: "rgba(250, 250, 250, 0.8)",
+                            effectOption: {
+                              x: 0,
+                              y: this.canvasHeight / 2 - 30,
+                              width: this.canvasWidth,
+                              height: 5,
+                              brushType: "fill",
+                              timeInterval: 100
+                            }
+                          }),
+                          r = this.createTextShape(i.textStyle),
+                          s = this.createBackgroundShape(i.backgroundColor),
+                          l = i.effectOption,
+                          h = new o({
+                            highlightStyle: n.clone(l)
+                          });
+                      return h.highlightStyle.color = l.color || a.getLinearGradient(l.x, l.y, l.x + l.width, l.y + l.height, [[0, "#ff6400"], [.5, "#ffe100"], [1, "#b1ff00"]]),
+                          null != i.progress ? (e(s), h.highlightStyle.width = this.adjust(i.progress, [0, 1]) * i.effectOption.width, e(h), e(r), void t()) : (h.highlightStyle.width = 0, setInterval(function() {
+                                e(s),
+                                    h.highlightStyle.width < l.width ? h.highlightStyle.width += 8 : h.highlightStyle.width = 0,
+                                    e(h),
+                                    e(r),
+                                    t()
+                              },
+                              l.timeInterval))
+                    },
+                    t
+              }),
+          i("zrender/loadingEffect/Bubble", ["require", "./Base", "../tool/util", "../tool/color", "../shape/Circle"],
+              function(e) {
+                function t(e) {
+                  i.call(this, e)
+                }
+                var i = e("./Base"),
+                    n = e("../tool/util"),
+                    a = e("../tool/color"),
+                    o = e("../shape/Circle");
+                return n.inherits(t, i),
+                    t.prototype._start = function(e, t) {
+                      for (var i = n.merge(this.options, {
+                        textStyle: {
+                          color: "#888"
+                        },
+                        backgroundColor: "rgba(250, 250, 250, 0.8)",
+                        effect: {
+                          n: 50,
+                          lineWidth: 2,
+                          brushType: "stroke",
+                          color: "random",
+                          timeInterval: 100
+                        }
+                      }), r = this.createTextShape(i.textStyle), s = this.createBackgroundShape(i.backgroundColor), l = i.effect, h = l.n, m = l.brushType, V = l.lineWidth, U = [], d = this.canvasWidth, p = this.canvasHeight, c = 0; h > c; c++) {
+                        var u = "random" == l.color ? a.alpha(a.random(), .3) : l.color;
+                        U[c] = new o({
+                          highlightStyle: {
+                            x: Math.ceil(Math.random() * d),
+                            y: Math.ceil(Math.random() * p),
+                            r: Math.ceil(40 * Math.random()),
+                            brushType: m,
+                            color: u,
+                            strokeColor: u,
+                            lineWidth: V
+                          },
+                          animationY: Math.ceil(20 * Math.random())
+                        })
+                      }
+                      return setInterval(function() {
+                            e(s);
+                            for (var i = 0; h > i; i++) {
+                              var n = U[i].highlightStyle;
+                              n.y - U[i].animationY + n.r <= 0 && (U[i].highlightStyle.y = p + n.r, U[i].highlightStyle.x = Math.ceil(Math.random() * d)),
+                                  U[i].highlightStyle.y -= U[i].animationY,
+                                  e(U[i])
+                            }
+                            e(r),
+                                t()
+                          },
+                          l.timeInterval)
+                    },
+                    t
+              }),
+          i("zrender/loadingEffect/DynamicLine", ["require", "./Base", "../tool/util", "../tool/color", "../shape/Line"],
+              function(e) {
+                function t(e) {
+                  i.call(this, e)
+                }
+                var i = e("./Base"),
+                    n = e("../tool/util"),
+                    a = e("../tool/color"),
+                    o = e("../shape/Line");
+                return n.inherits(t, i),
+                    t.prototype._start = function(e, t) {
+                      for (var i = n.merge(this.options, {
+                        textStyle: {
+                          color: "#fff"
+                        },
+                        backgroundColor: "rgba(0, 0, 0, 0.8)",
+                        effectOption: {
+                          n: 30,
+                          lineWidth: 1,
+                          color: "random",
+                          timeInterval: 100
+                        }
+                      }), r = this.createTextShape(i.textStyle), s = this.createBackgroundShape(i.backgroundColor), l = i.effectOption, h = l.n, m = l.lineWidth, V = [], U = this.canvasWidth, d = this.canvasHeight, p = 0; h > p; p++) {
+                        var c = -Math.ceil(1e3 * Math.random()),
+                            u = Math.ceil(400 * Math.random()),
+                            y = Math.ceil(Math.random() * d),
+                            g = "random" == l.color ? a.random() : l.color;
+                        V[p] = new o({
+                          highlightStyle: {
+                            xStart: c,
+                            yStart: y,
+                            xEnd: c + u,
+                            yEnd: y,
+                            strokeColor: g,
+                            lineWidth: m
+                          },
+                          animationX: Math.ceil(100 * Math.random()),
+                          len: u
+                        })
+                      }
+                      return setInterval(function() {
+                            e(s);
+                            for (var i = 0; h > i; i++) {
+                              var n = V[i].highlightStyle;
+                              n.xStart >= U && (V[i].len = Math.ceil(400 * Math.random()), n.xStart = -400, n.xEnd = -400 + V[i].len, n.yStart = Math.ceil(Math.random() * d), n.yEnd = n.yStart),
+                                  n.xStart += V[i].animationX,
+                                  n.xEnd += V[i].animationX,
+                                  e(V[i])
+                            }
+                            e(r),
+                                t()
+                          },
+                          l.timeInterval)
+                    },
+                    t
+              }),
+          i("zrender/loadingEffect/Ring", ["require", "./Base", "../tool/util", "../tool/color", "../shape/Ring", "../shape/Sector"],
+              function(e) {
+                function t(e) {
+                  i.call(this, e)
+                }
+                var i = e("./Base"),
+                    n = e("../tool/util"),
+                    a = e("../tool/color"),
+                    o = e("../shape/Ring"),
+                    r = e("../shape/Sector");
+                return n.inherits(t, i),
+                    t.prototype._start = function(e, t) {
+                      var i = n.merge(this.options, {
+                            textStyle: {
+                              color: "#07a"
+                            },
+                            backgroundColor: "rgba(250, 250, 250, 0.8)",
+                            effect: {
+                              x: this.canvasWidth / 2,
+                              y: this.canvasHeight / 2,
+                              r0: 60,
+                              r: 100,
+                              color: "#bbdcff",
+                              brushType: "fill",
+                              textPosition: "inside",
+                              textFont: "normal 30px verdana",
+                              textColor: "rgba(30, 144, 255, 0.6)",
+                              timeInterval: 100
+                            }
+                          }),
+                          s = i.effect,
+                          l = i.textStyle;
+
+                      null == l.x && (l.x = s.x),
+                      null == l.y && (l.y = s.y + (s.r0 + s.r) / 2 - 5);
+                      for (var h = this.createTextShape(i.textStyle), m = this.createBackgroundShape(i.backgroundColor), V = s.x, U = s.y, d = s.r0 + 6, p = s.r - 6, c = s.color, u = a.lift(c, .1), y = new o({
+                        highlightStyle: n.clone(s)
+                      }), g = [], b = a.getGradientColors(["#ff6400", "#ffe100", "#97ff00"], 25), f = 15, k = 240, x = 0; 16 > x; x++) g.push(new r({
+                        highlightStyle: {
+                          x: V,
+                          y: U,
+                          r0: d,
+                          r: p,
+                          startAngle: k - f,
+                          endAngle: k,
+                          brushType: "fill",
+                          color: u
+                        },
+                        _color: a.getLinearGradient(V + d * Math.cos(k, !0), U - d * Math.sin(k, !0), V + d * Math.cos(k - f, !0), U - d * Math.sin(k - f, !0), [[0, b[2 * x]], [1, b[2 * x + 1]]])
+                      })),
+                          k -= f;
+                      k = 360;
+                      for (var x = 0; 4 > x; x++) g.push(new r({
+                        highlightStyle: {
+                          x: V,
+                          y: U,
+                          r0: d,
+                          r: p,
+                          startAngle: k - f,
+                          endAngle: k,
+                          brushType: "fill",
+                          color: u
+                        },
+                        _color: a.getLinearGradient(V + d * Math.cos(k, !0), U - d * Math.sin(k, !0), V + d * Math.cos(k - f, !0), U - d * Math.sin(k - f, !0), [[0, b[2 * x + 32]], [1, b[2 * x + 33]]])
+                      })),
+                          k -= f;
+                      var _ = 0;
+                      if (null != i.progress) {
+                        e(m),
+                            _ = 100 * this.adjust(i.progress, [0, 1]).toFixed(2) / 5,
+                            y.highlightStyle.text = 5 * _ + "%",
+                            e(y);
+                        for (var x = 0; 20 > x; x++) g[x].highlightStyle.color = _ > x ? g[x]._color: u,
+                            e(g[x]);
+                        return e(h),
+                            void t()
+                      }
+                      return setInterval(function() {
+                            e(m),
+                                _ += _ >= 20 ? -20 : 1,
+                                e(y);
+                            for (var i = 0; 20 > i; i++) g[i].highlightStyle.color = _ > i ? g[i]._color: u,
+                                e(g[i]);
+                            e(h),
+                                t()
+                          },
+                          s.timeInterval)
+                    },
+                    t
+              }),
+          i("zrender/loadingEffect/Spin", ["require", "./Base", "../tool/util", "../tool/color", "../tool/area", "../shape/Sector"],
+              function(e) {
+                function t(e) {
+                  i.call(this, e)
+                }
+                var i = e("./Base"),
+                    n = e("../tool/util"),
+                    a = e("../tool/color"),
+                    o = e("../tool/area"),
+                    r = e("../shape/Sector");
+                return n.inherits(t, i),
+                    t.prototype._start = function(e, t) {
+                      var i = n.merge(this.options, {
+                            textStyle: {
+                              color: "#fff",
+                              textAlign: "start"
+                            },
+                            backgroundColor: "rgba(0, 0, 0, 0.8)"
+                          }),
+                          s = this.createTextShape(i.textStyle),
+                          l = 10,
+                          h = o.getTextWidth(s.highlightStyle.text, s.highlightStyle.textFont),
+                          m = o.getTextHeight(s.highlightStyle.text, s.highlightStyle.textFont),
+                          V = n.merge(this.options.effect || {},
+                              {
+                                r0: 9,
+                                r: 15,
+                                n: 18,
+                                color: "#fff",
+                                timeInterval: 100
+                              }),
+                          U = this.getLocation(this.options.textStyle, h + l + 2 * V.r, Math.max(2 * V.r, m));
+                      V.x = U.x + V.r,
+                          V.y = s.highlightStyle.y = U.y + U.height / 2,
+                          s.highlightStyle.x = V.x + V.r + l;
+                      for (var d = this.createBackgroundShape(i.backgroundColor), p = V.n, c = V.x, u = V.y, y = V.r0, g = V.r, b = V.color, f = [], k = Math.round(180 / p), x = 0; p > x; x++) f[x] = new r({
+                        highlightStyle: {
+                          x: c,
+                          y: u,
+                          r0: y,
+                          r: g,
+                          startAngle: k * x * 2,
+                          endAngle: k * x * 2 + k,
+                          color: a.alpha(b, (x + 1) / p),
+                          brushType: "fill"
+                        }
+                      });
+                      var _ = [0, c, u];
+                      return setInterval(function() {
+                            e(d),
+                                _[0] -= .3;
+                            for (var i = 0; p > i; i++) f[i].rotation = _,
+                                e(f[i]);
+                            e(s),
+                                t()
+                          },
+                          V.timeInterval)
+                    },
+                    t
+              }),
+          i("zrender/loadingEffect/Whirling", ["require", "./Base", "../tool/util", "../tool/area", "../shape/Ring", "../shape/Droplet", "../shape/Circle"],
+              function(e) {
+                function t(e) {
+                  i.call(this, e)
+                }
+                var i = e("./Base"),
+                    n = e("../tool/util"),
+                    a = e("../tool/area"),
+                    o = e("../shape/Ring"),
+                    r = e("../shape/Droplet"),
+                    s = e("../shape/Circle");
+                return n.inherits(t, i),
+                    t.prototype._start = function(e, t) {
+                      var i = n.merge(this.options, {
+                            textStyle: {
+                              color: "#888",
+                              textAlign: "start"
+                            },
+                            backgroundColor: "rgba(250, 250, 250, 0.8)"
+                          }),
+                          l = this.createTextShape(i.textStyle),
+                          h = 10,
+                          m = a.getTextWidth(l.highlightStyle.text, l.highlightStyle.textFont),
+                          V = a.getTextHeight(l.highlightStyle.text, l.highlightStyle.textFont),
+                          U = n.merge(this.options.effect || {},
+                              {
+                                r: 18,
+                                colorIn: "#fff",
+                                colorOut: "#555",
+                                colorWhirl: "#6cf",
+                                timeInterval: 50
+                              }),
+                          d = this.getLocation(this.options.textStyle, m + h + 2 * U.r, Math.max(2 * U.r, V));
+                      U.x = d.x + U.r,
+                          U.y = l.highlightStyle.y = d.y + d.height / 2,
+                          l.highlightStyle.x = U.x + U.r + h;
+                      var p = this.createBackgroundShape(i.backgroundColor),
+                          c = new r({
+                            highlightStyle: {
+                              a: Math.round(U.r / 2),
+                              b: Math.round(U.r - U.r / 6),
+                              brushType: "fill",
+                              color: U.colorWhirl
+                            }
+                          }),
+                          u = new s({
+                            highlightStyle: {
+                              r: Math.round(U.r / 6),
+                              brushType: "fill",
+                              color: U.colorIn
+                            }
+                          }),
+                          y = new o({
+                            highlightStyle: {
+                              r0: Math.round(U.r - U.r / 3),
+                              r: U.r,
+                              brushType: "fill",
+                              color: U.colorOut
+                            }
+                          }),
+                          g = [0, U.x, U.y];
+                      return c.highlightStyle.x = u.highlightStyle.x = y.highlightStyle.x = g[1],
+                          c.highlightStyle.y = u.highlightStyle.y = y.highlightStyle.y = g[2],
+                          setInterval(function() {
+                                e(p),
+                                    e(y),
+                                    g[0] -= .3,
+                                    c.rotation = g,
+                                    e(c),
+                                    e(u),
+                                    e(l),
+                                    t()
+                              },
+                              U.timeInterval)
+                    },
+                    t
+              }),
+          i("echarts/theme/macarons", [],
+              function() {
+                var e = {
+                  color: ["#2ec7c9", "#b6a2de", "#5ab1ef", "#ffb980", "#d87a80", "#8d98b3", "#e5cf0d", "#97b552", "#95706d", "#dc69aa", "#07a2a4", "#9a7fd1", "#588dd5", "#f5994e", "#c05050", "#59678c", "#c9ab00", "#7eb00a", "#6f5553", "#c14089"],
+                  title: {
+                    textStyle: {
+                      fontWeight: "normal",
+                      color: "#008acd"
+                    }
+                  },
+                  dataRange: {
+                    itemWidth: 15,
+                    color: ["#5ab1ef", "#e0ffff"]
+                  },
+                  toolbox: {
+                    color: ["#1e90ff", "#1e90ff", "#1e90ff", "#1e90ff"],
+                    effectiveColor: "#ff4500"
+                  },
+                  tooltip: {
+                    backgroundColor: "rgba(50,50,50,0.5)",
+                    axisPointer: {
+                      type: "line",
+                      lineStyle: {
+                        color: "#008acd"
+                      },
+                      crossStyle: {
+                        color: "#008acd"
+                      },
+                      shadowStyle: {
+                        color: "rgba(200,200,200,0.2)"
+                      }
+                    }
+                  },
+                  dataZoom: {
+                    dataBackgroundColor: "#efefff",
+                    fillerColor: "rgba(182,162,222,0.2)",
+                    handleColor: "#008acd"
+                  },
+                  grid: {
+                    borderColor: "#eee"
+                  },
+                  categoryAxis: {
+                    axisLine: {
+                      lineStyle: {
+                        color: "#008acd"
+                      }
+                    },
+                    splitLine: {
+                      lineStyle: {
+                        color: ["#eee"]
+                      }
+                    }
+                  },
+                  valueAxis: {
+                    axisLine: {
+                      lineStyle: {
+                        color: "#008acd"
+                      }
+                    },
+                    splitArea: {
+                      show: !0,
+                      areaStyle: {
+                        color: ["rgba(250,250,250,0.1)", "rgba(200,200,200,0.1)"]
+                      }
+                    },
+                    splitLine: {
+                      lineStyle: {
+                        color: ["#eee"]
+                      }
+                    }
+                  },
+                  polar: {
+                    axisLine: {
+                      lineStyle: {
+                        color: "#ddd"
+                      }
+                    },
+                    splitArea: {
+                      show: !0,
+                      areaStyle: {
+                        color: ["rgba(250,250,250,0.2)", "rgba(200,200,200,0.2)"]
+                      }
+                    },
+                    splitLine: {
+                      lineStyle: {
+                        color: "#ddd"
+                      }
+                    }
+                  },
+                  timeline: {
+                    lineStyle: {
+                      color: "#008acd"
+                    },
+                    controlStyle: {
+                      normal: {
+                        color: "#008acd"
+                      },
+                      emphasis: {
+                        color: "#008acd"
+                      }
+                    },
+                    symbol: "emptyCircle",
+                    symbolSize: 3
+                  },
+                  bar: {
+                    itemStyle: {
+                      normal: {
+                        barBorderRadius: 5
+                      },
+                      emphasis: {
+                        barBorderRadius: 5
+                      }
+                    }
+                  },
+                  line: {
+                    smooth: !0,
+                    symbol: "emptyCircle",
+                    symbolSize: 3
+                  },
+                  k: {
+                    itemStyle: {
+                      normal: {
+                        color: "#d87a80",
+                        color0: "#2ec7c9",
+                        lineStyle: {
+                          color: "#d87a80",
+                          color0: "#2ec7c9"
+                        }
+                      }
+                    }
+                  },
+                  scatter: {
+                    symbol: "circle",
+                    symbolSize: 4
+                  },
+                  radar: {
+                    symbol: "emptyCircle",
+                    symbolSize: 3
+                  },
+                  map: {
+                    itemStyle: {
+                      normal: {
+                        areaStyle: {
+                          color: "#ddd"
+                        },
+                        label: {
+                          textStyle: {
+                            color: "#d87a80"
+                          }
+                        }
+                      },
+                      emphasis: {
+                        areaStyle: {
+                          color: "#fe994e"
+                        }
+                      }
+                    }
+                  },
+                  force: {
+                    itemStyle: {
+                      normal: {
+                        linkStyle: {
+                          color: "#1e90ff"
+                        }
+                      }
+                    }
+                  },
+                  chord: {
+                    itemStyle: {
+                      normal: {
+                        borderWidth: 1,
+                        borderColor: "rgba(128, 128, 128, 0.5)",
+                        chordStyle: {
+                          lineStyle: {
+                            color: "rgba(128, 128, 128, 0.5)"
+                          }
+                        }
+                      },
+                      emphasis: {
+                        borderWidth: 1,
+                        borderColor: "rgba(128, 128, 128, 0.5)",
+                        chordStyle: {
+                          lineStyle: {
+                            color: "rgba(128, 128, 128, 0.5)"
+                          }
+                        }
+                      }
+                    }
+                  },
+                  gauge: {
+                    axisLine: {
+                      lineStyle: {
+                        color: [[.2, "#2ec7c9"], [.8, "#5ab1ef"], [1, "#d87a80"]],
+                        width: 10
+                      }
+                    },
+                    axisTick: {
+                      splitNumber: 10,
+                      length: 15,
+                      lineStyle: {
+                        color: "auto"
+                      }
+                    },
+                    splitLine: {
+                      length: 22,
+                      lineStyle: {
+                        color: "auto"
+                      }
+                    },
+                    pointer: {
+                      width: 5
+                    }
+                  },
+                  textStyle: {
+                    fontFamily: "微软雅黑, Arial, Verdana, sans-serif"
+                  }
+                };
+                return e
+              }),
+          i("echarts/theme/infographic", [],
+              function() {
+                var e = {
+                  color: ["#C1232B", "#B5C334", "#FCCE10", "#E87C25", "#27727B", "#FE8463", "#9BCA63", "#FAD860", "#F3A43B", "#60C0DD", "#D7504B", "#C6E579", "#F4E001", "#F0805A", "#26C0C0"],
+                  title: {
+                    textStyle: {
+                      fontWeight: "normal",
+                      color: "#27727B"
+                    }
+                  },
+                  dataRange: {
+                    x: "right",
+                    y: "center",
+                    itemWidth: 5,
+                    itemHeight: 25,
+                    color: ["#C1232B", "#FCCE10"]
+                  },
+                  toolbox: {
+                    color: ["#C1232B", "#B5C334", "#FCCE10", "#E87C25", "#27727B", "#FE8463", "#9BCA63", "#FAD860", "#F3A43B", "#60C0DD"],
+                    effectiveColor: "#ff4500"
+                  },
+                  tooltip: {
+                    backgroundColor: "rgba(50,50,50,0.5)",
+                    axisPointer: {
+                      type: "line",
+                      lineStyle: {
+                        color: "#27727B",
+                        type: "dashed"
+                      },
+                      crossStyle: {
+                        color: "#27727B"
+                      },
+                      shadowStyle: {
+                        color: "rgba(200,200,200,0.3)"
+                      }
+                    }
+                  },
+                  dataZoom: {
+                    dataBackgroundColor: "rgba(181,195,52,0.3)",
+                    fillerColor: "rgba(181,195,52,0.2)",
+                    handleColor: "#27727B"
+                  },
+                  grid: {
+                    borderWidth: 0
+                  },
+                  categoryAxis: {
+                    axisLine: {
+                      lineStyle: {
+                        color: "#27727B"
+                      }
+                    },
+                    splitLine: {
+                      show: !1
+                    }
+                  },
+                  valueAxis: {
+                    axisLine: {
+                      show: !1
+                    },
+                    splitArea: {
+                      show: !1
+                    },
+                    splitLine: {
+                      lineStyle: {
+                        color: ["#ccc"],
+                        type: "dashed"
+                      }
+                    }
+                  },
+                  polar: {
+                    axisLine: {
+                      lineStyle: {
+                        color: "#ddd"
+                      }
+                    },
+                    splitArea: {
+                      show: !0,
+                      areaStyle: {
+                        color: ["rgba(250,250,250,0.2)", "rgba(200,200,200,0.2)"]
+                      }
+                    },
+                    splitLine: {
+                      lineStyle: {
+                        color: "#ddd"
+                      }
+                    }
+                  },
+                  timeline: {
+                    lineStyle: {
+                      color: "#27727B"
+                    },
+                    controlStyle: {
+                      normal: {
+                        color: "#27727B"
+                      },
+                      emphasis: {
+                        color: "#27727B"
+                      }
+                    },
+                    symbol: "emptyCircle",
+                    symbolSize: 3
+                  },
+                  line: {
+                    itemStyle: {
+                      normal: {
+                        borderWidth: 2,
+                        borderColor: "#fff",
+                        lineStyle: {
+                          width: 3
+                        }
+                      },
+                      emphasis: {
+                        borderWidth: 0
+                      }
+                    },
+                    symbol: "circle",
+                    symbolSize: 3.5
+                  },
+                  k: {
+                    itemStyle: {
+                      normal: {
+                        color: "#C1232B",
+                        color0: "#B5C334",
+                        lineStyle: {
+                          width: 1,
+                          color: "#C1232B",
+                          color0: "#B5C334"
+                        }
+                      }
+                    }
+                  },
+                  scatter: {
+                    itemStyle: {
+                      normal: {
+                        borderWidth: 1,
+                        borderColor: "rgba(200,200,200,0.5)"
+                      },
+                      emphasis: {
+                        borderWidth: 0
+                      }
+                    },
+                    symbol: "star4",
+                    symbolSize: 4
+                  },
+                  radar: {
+                    symbol: "emptyCircle",
+                    symbolSize: 3
+                  },
+                  map: {
+                    itemStyle: {
+                      normal: {
+                        areaStyle: {
+                          color: "#ddd"
+                        },
+                        label: {
+                          textStyle: {
+                            color: "#C1232B"
+                          }
+                        }
+                      },
+                      emphasis: {
+                        areaStyle: {
+                          color: "#fe994e"
+                        },
+                        label: {
+                          textStyle: {
+                            color: "rgb(100,0,0)"
+                          }
+                        }
+                      }
+                    }
+                  },
+                  force: {
+                    itemStyle: {
+                      normal: {
+                        linkStyle: {
+                          color: "#27727B"
+                        }
+                      }
+                    }
+                  },
+                  chord: {
+                    itemStyle: {
+                      normal: {
+                        borderWidth: 1,
+                        borderColor: "rgba(128, 128, 128, 0.5)",
+                        chordStyle: {
+                          lineStyle: {
+                            color: "rgba(128, 128, 128, 0.5)"
+                          }
+                        }
+                      },
+                      emphasis: {
+                        borderWidth: 1,
+                        borderColor: "rgba(128, 128, 128, 0.5)",
+                        chordStyle: {
+                          lineStyle: {
+                            color: "rgba(128, 128, 128, 0.5)"
+                          }
+                        }
+                      }
+                    }
+                  },
+                  gauge: {
+                    center: ["50%", "80%"],
+                    radius: "100%",
+                    startAngle: 180,
+                    endAngle: 0,
+                    axisLine: {
+                      show: !0,
+                      lineStyle: {
+                        color: [[.2, "#B5C334"], [.8, "#27727B"], [1, "#C1232B"]],
+                        width: "40%"
+                      }
+                    },
+                    axisTick: {
+                      splitNumber: 2,
+                      length: 5,
+                      lineStyle: {
+                        color: "#fff"
+                      }
+                    },
+                    axisLabel: {
+                      textStyle: {
+                        color: "#fff",
+                        fontWeight: "bolder"
+                      }
+                    },
+                    splitLine: {
+                      length: "5%",
+                      lineStyle: {
+                        color: "#fff"
+                      }
+                    },
+                    pointer: {
+                      width: "40%",
+                      length: "80%",
+                      color: "#fff"
+                    },
+                    title: {
+                      offsetCenter: [0, -20],
+                      textStyle: {
+                        color: "auto",
+                        fontSize: 20
+                      }
+                    },
+                    detail: {
+                      offsetCenter: [0, 0],
+                      textStyle: {
+                        color: "auto",
+                        fontSize: 40
+                      }
+                    }
+                  },
+                  textStyle: {
+                    fontFamily: "微软雅黑, Arial, Verdana, sans-serif"
+                  }
+                };
+                return e
+              }),
+          i("zrender/dep/excanvas", ["require"],
+              function() {
+                return document.createElement("canvas").getContext ? G_vmlCanvasManager = !1 : !
+                    function() {
+                      function e() {
+                        return this.context_ || (this.context_ = new f(this))
+                      }
+                      function t(e, t) {
+                        var i = O.call(arguments, 2);
+                        return function() {
+                          return e.apply(t, i.concat(O.call(arguments)))
+                        }
+                      }
+                      function i(e) {
+                        return String(e).replace(/&/g, "&amp;").replace(/"/g, "&quot;")
+                      }
+                      function n(e, t, i) {
+                        e.namespaces[t] || e.namespaces.add(t, i, "#default#VML")
+                      }
+                      function a(e) {
+                        if (n(e, "g_vml_", "urn:schemas-microsoft-com:vml"), n(e, "g_o_", "urn:schemas-microsoft-com:office:office"), !e.styleSheets.ex_canvas_) {
+                          var t = e.createStyleSheet();
+                          t.owningElement.id = "ex_canvas_",
+                              t.cssText = "canvas{display:inline-block;overflow:hidden;text-align:left;width:300px;height:150px}"
+                        }
+                      }
+                      function o(e) {
+                        var t = e.srcElement;
+                        switch (e.propertyName) {
+                          case "width":
+                            t.getContext().clearRect(),
+                                t.style.width = t.attributes.width.nodeValue + "px",
+                                t.firstChild.style.width = t.clientWidth + "px";
+                            break;
+                          case "height":
+                            t.getContext().clearRect(),
+                                t.style.height = t.attributes.height.nodeValue + "px",
+                                t.firstChild.style.height = t.clientHeight + "px"
+                        }
+                      }
+                      function r(e) {
+                        var t = e.srcElement;
+                        t.firstChild && (t.firstChild.style.width = t.clientWidth + "px", t.firstChild.style.height = t.clientHeight + "px")
+                      }
+                      function s() {
+                        return [[1, 0, 0], [0, 1, 0], [0, 0, 1]]
+                      }
+                      function l(e, t) {
+                        for (var i = s(), n = 0; 3 > n; n++) for (var a = 0; 3 > a; a++) {
+                          for (var o = 0,
+                                   r = 0; 3 > r; r++) o += e[n][r] * t[r][a];
+                          i[n][a] = o
+                        }
+                        return i
+                      }
+                      function h(e, t) {
+                        t.fillStyle = e.fillStyle,
+                            t.lineCap = e.lineCap,
+                            t.lineJoin = e.lineJoin,
+                            t.lineWidth = e.lineWidth,
+                            t.miterLimit = e.miterLimit,
+                            t.shadowBlur = e.shadowBlur,
+                            t.shadowColor = e.shadowColor,
+                            t.shadowOffsetX = e.shadowOffsetX,
+                            t.shadowOffsetY = e.shadowOffsetY,
+                            t.strokeStyle = e.strokeStyle,
+                            t.globalAlpha = e.globalAlpha,
+                            t.font = e.font,
+                            t.textAlign = e.textAlign,
+                            t.textBaseline = e.textBaseline,
+                            t.scaleX_ = e.scaleX_,
+                            t.scaleY_ = e.scaleY_,
+                            t.lineScale_ = e.lineScale_
+                      }
+                      function m(e) {
+                        var t = e.indexOf("(", 3),
+                            i = e.indexOf(")", t + 1),
+                            n = e.substring(t + 1, i).split(",");
+                        return (4 != n.length || "a" != e.charAt(3)) && (n[3] = 1),
+                            n
+                      }
+                      function V(e) {
+                        return parseFloat(e) / 100
+                      }
+                      function U(e, t, i) {
+                        return Math.min(i, Math.max(t, e))
+                      }
+                      function d(e) {
+                        var t, i, n, a, o, r;
+                        if (a = parseFloat(e[0]) / 360 % 360, 0 > a && a++, o = U(V(e[1]), 0, 1), r = U(V(e[2]), 0, 1), 0 == o) t = i = n = r;
+                        else {
+                          var s = .5 > r ? r * (1 + o) : r + o - r * o,
+                              l = 2 * r - s;
+                          t = p(l, s, a + 1 / 3),
+                              i = p(l, s, a),
+                              n = p(l, s, a - 1 / 3)
+                        }
+                        return "#" + D[Math.floor(255 * t)] + D[Math.floor(255 * i)] + D[Math.floor(255 * n)]
+                      }
+                      function p(e, t, i) {
+                        return 0 > i && i++,
+                        i > 1 && i--,
+                            1 > 6 * i ? e + 6 * (t - e) * i: 1 > 2 * i ? t: 2 > 3 * i ? e + (t - e) * (2 / 3 - i) * 6 : e
+                      }
+                      function c(e) {
+                        if (e in R) return R[e];
+                        var t, i = 1;
+                        if (e = String(e), "#" == e.charAt(0)) t = e;
+                        else if (/^rgb/.test(e)) {
+                          for (var n, a = m(e), t = "#", o = 0; 3 > o; o++) n = -1 != a[o].indexOf("%") ? Math.floor(255 * V(a[o])) : +a[o],
+                              t += D[U(n, 0, 255)];
+                          i = +a[3]
+                        } else if (/^hsl/.test(e)) {
+                          var a = m(e);
+                          t = d(a),
+                              i = a[3]
+                        } else t = H[e] || e;
+                        return R[e] = {
+                          color: t,
+                          alpha: i
+                        }
+                      }
+                      function u(e) {
+                        if (Y[e]) return Y[e];
+                        var t, i = document.createElement("div"),
+                            n = i.style;
+                        try {
+                          n.font = e,
+                              t = n.fontFamily.split(",")[0]
+                        } catch(a) {}
+                        return Y[e] = {
+                          style: n.fontStyle || G.style,
+                          variant: n.fontVariant || G.variant,
+                          weight: n.fontWeight || G.weight,
+                          size: n.fontSize || G.size,
+                          family: t || G.family
+                        }
+                      }
+                      function y(e, t) {
+                        var i = {};
+                        for (var n in e) i[n] = e[n];
+                        var a = parseFloat(t.currentStyle.fontSize),
+                            o = parseFloat(e.size);
+                        return i.size = "number" == typeof e.size ? e.size: -1 != e.size.indexOf("px") ? o: -1 != e.size.indexOf("em") ? a * o: -1 != e.size.indexOf("%") ? a / 100 * o: -1 != e.size.indexOf("pt") ? o / .75 : a,
+                            i
+                      }
+                      function g(e) {
+                        return e.style + " " + e.variant + " " + e.weight + " " + e.size + "px '" + e.family + "'"
+                      }
+                      function b(e) {
+                        return Q[e] || "square"
+                      }
+                      function f(e) {
+                        this.m_ = s(),
+                            this.mStack_ = [],
+                            this.aStack_ = [],
+                            this.currentPath_ = [],
+                            this.strokeStyle = "#000",
+                            this.fillStyle = "#000",
+                            this.lineWidth = 1,
+                            this.lineJoin = "miter",
+                            this.lineCap = "butt",
+                            this.miterLimit = 1 * A,
+                            this.globalAlpha = 1,
+                            this.font = "12px 微软雅黑",
+                            this.textAlign = "left",
+                            this.textBaseline = "alphabetic",
+                            this.canvas = e;
+                        var t = "width:" + e.clientWidth + "px;height:" + e.clientHeight + "px;overflow:hidden;position:absolute",
+                            i = e.ownerDocument.createElement("div");
+                        i.style.cssText = t,
+                            e.appendChild(i);
+                        var n = i.cloneNode(!1);
+                        n.style.backgroundColor = "#fff",
+                            n.style.filter = "alpha(opacity=0)",
+                            e.appendChild(n),
+                            this.element_ = i,
+                            this.scaleX_ = 1,
+                            this.scaleY_ = 1,
+                            this.lineScale_ = 1
+                      }
+                      function k(e, t, i, n) {
+                        e.currentPath_.push({
+                          type: "bezierCurveTo",
+                          cp1x: t.x,
+                          cp1y: t.y,
+                          cp2x: i.x,
+                          cp2y: i.y,
+                          x: n.x,
+                          y: n.y
+                        }),
+                            e.currentX_ = n.x,
+                            e.currentY_ = n.y
+                      }
+                      function x(e, t) {
+                        var i = c(e.strokeStyle),
+                            n = i.color,
+                            a = i.alpha * e.globalAlpha,
+                            o = e.lineScale_ * e.lineWidth;
+                        1 > o && (a *= o),
+                            t.push("<g_vml_:stroke", ' opacity="', a, '"', ' joinstyle="', e.lineJoin, '"', ' miterlimit="', e.miterLimit, '"', ' endcap="', b(e.lineCap), '"', ' weight="', o, 'px"', ' color="', n, '" />')
+                      }
+                      function _(e, t, i, n) {
+                        var a = e.fillStyle,
+                            o = e.scaleX_,
+                            r = e.scaleY_,
+                            s = n.x - i.x,
+                            l = n.y - i.y;
+                        if (a instanceof v) {
+                          var h = 0,
+                              m = {
+                                x: 0,
+                                y: 0
+                              },
+                              V = 0,
+                              U = 1;
+                          if ("gradient" == a.type_) {
+                            var d = a.x0_ / o,
+                                p = a.y0_ / r,
+                                u = a.x1_ / o,
+                                y = a.y1_ / r,
+                                g = L(e, d, p),
+                                b = L(e, u, y),
+                                f = b.x - g.x,
+                                k = b.y - g.y;
+                            h = 180 * Math.atan2(f, k) / Math.PI,
+                            0 > h && (h += 360),
+                            1e-6 > h && (h = 0)
+                          } else {
+                            var g = L(e, a.x0_, a.y0_);
+                            m = {
+                              x: (g.x - i.x) / s,
+                              y: (g.y - i.y) / l
+                            },
+                                s /= o * A,
+                                l /= r * A;
+                            var x = C.max(s, l);
+                            V = 2 * a.r0_ / x,
+                                U = 2 * a.r1_ / x - V
+                          }
+                          var _ = a.colors_;
+                          _.sort(function(e, t) {
+                            return e.offset - t.offset
+                          });
+                          for (var W = _.length,
+                                   X = _[0].color, K = _[W - 1].color, I = _[0].alpha * e.globalAlpha, J = _[W - 1].alpha * e.globalAlpha, S = [], E = 0; W > E; E++) {
+                            var F = _[E];
+                            S.push(F.offset * U + V + " " + F.color)
+                          }
+                          t.push('<g_vml_:fill type="', a.type_, '"', ' method="none" focus="100%"', ' color="', X, '"', ' color2="', K, '"', ' colors="', S.join(","), '"', ' opacity="', J, '"', ' g_o_:opacity2="', I, '"', ' angle="', h, '"', ' focusposition="', m.x, ",", m.y, '" />')
+                        } else if (a instanceof w) {
+                          if (s && l) {
+                            var T = -i.x,
+                                z = -i.y;
+                            t.push("<g_vml_:fill", ' position="', T / s * o * o, ",", z / l * r * r, '"', ' type="tile"', ' src="', a.src_, '" />')
+                          }
+                        } else {
+                          var M = c(e.fillStyle),
+                              O = M.color,
+                              P = M.alpha * e.globalAlpha;
+                          t.push('<g_vml_:fill color="', O, '" opacity="', P, '" />')
+                        }
+                      }
+                      function L(e, t, i) {
+                        var n = e.m_;
+                        return {
+                          x: A * (t * n[0][0] + i * n[1][0] + n[2][0]) - M,
+                          y: A * (t * n[0][1] + i * n[1][1] + n[2][1]) - M
+                        }
+                      }
+                      function W(e) {
+                        return isFinite(e[0][0]) && isFinite(e[0][1]) && isFinite(e[1][0]) && isFinite(e[1][1]) && isFinite(e[2][0]) && isFinite(e[2][1])
+                      }
+                      function X(e, t, i) {
+                        if (W(t) && (e.m_ = t, e.scaleX_ = Math.sqrt(t[0][0] * t[0][0] + t[0][1] * t[0][1]), e.scaleY_ = Math.sqrt(t[1][0] * t[1][0] + t[1][1] * t[1][1]), i)) {
+                          var n = t[0][0] * t[1][1] - t[0][1] * t[1][0];
+                          e.lineScale_ = z(T(n))
+                        }
+                      }
+                      function v(e) {
+                        this.type_ = e,
+                            this.x0_ = 0,
+                            this.y0_ = 0,
+                            this.r0_ = 0,
+                            this.x1_ = 0,
+                            this.y1_ = 0,
+                            this.r1_ = 0,
+                            this.colors_ = []
+                      }
+                      function w(e, t) {
+                        switch (I(e), t) {
+                          case "repeat":
+                          case null:
+                          case "":
+                            this.repetition_ = "repeat";
+                            break;
+                          case "repeat-x":
+                          case "repeat-y":
+                          case "no-repeat":
+                            this.repetition_ = t;
+                            break;
+                          default:
+                            K("SYNTAX_ERR")
+                        }
+                        this.src_ = e.src,
+                            this.width_ = e.width,
+                            this.height_ = e.height
+                      }
+                      function K(e) {
+                        throw new J(e)
+                      }
+                      function I(e) {
+                        e && 1 == e.nodeType && "IMG" == e.tagName || K("TYPE_MISMATCH_ERR"),
+                        "complete" != e.readyState && K("INVALID_STATE_ERR")
+                      }
+                      function J(e) {
+                        this.code = this[e],
+                            this.message = e + ": DOM Exception " + this.code
+                      }
+                      var C = Math,
+                          S = C.round,
+                          E = C.sin,
+                          F = C.cos,
+                          T = C.abs,
+                          z = C.sqrt,
+                          A = 10,
+                          M = A / 2,
+                          O = ( + navigator.userAgent.match(/MSIE ([\d.]+)?/)[1], Array.prototype.slice);
+                      a(document);
+                      var P = {
+                        init: function(e) {
+                          var i = e || document;
+                          i.createElement("canvas"),
+                              i.attachEvent("onreadystatechange", t(this.init_, this, i))
+                        },
+                        init_: function(e) {
+                          for (var t = e.getElementsByTagName("canvas"), i = 0; i < t.length; i++) this.initElement(t[i])
+                        },
+                        initElement: function(t) {
+                          if (!t.getContext) {
+                            t.getContext = e,
+                                a(t.ownerDocument),
+                                t.innerHTML = "",
+                                t.attachEvent("onpropertychange", o),
+                                t.attachEvent("onresize", r);
+                            var i = t.attributes;
+                            i.width && i.width.specified ? t.style.width = i.width.nodeValue + "px": t.width = t.clientWidth,
+                                i.height && i.height.specified ? t.style.height = i.height.nodeValue + "px": t.height = t.clientHeight
+                          }
+                          return t
+                        }
+                      };
+                      P.init();
+                      for (var D = [], N = 0; 16 > N; N++) for (var B = 0; 16 > B; B++) D[16 * N + B] = N.toString(16) + B.toString(16);
+                      var H = {
+                            aliceblue: "#F0F8FF",
+                            antiquewhite: "#FAEBD7",
+                            aquamarine: "#7FFFD4",
+                            azure: "#F0FFFF",
+                            beige: "#F5F5DC",
+                            bisque: "#FFE4C4",
+                            black: "#000000",
+                            blanchedalmond: "#FFEBCD",
+                            blueviolet: "#8A2BE2",
+                            brown: "#A52A2A",
+                            burlywood: "#DEB887",
+                            cadetblue: "#5F9EA0",
+                            chartreuse: "#7FFF00",
+                            chocolate: "#D2691E",
+                            coral: "#FF7F50",
+                            cornflowerblue: "#6495ED",
+                            cornsilk: "#FFF8DC",
+                            crimson: "#DC143C",
+                            cyan: "#00FFFF",
+                            darkblue: "#00008B",
+                            darkcyan: "#008B8B",
+                            darkgoldenrod: "#B8860B",
+                            darkgray: "#A9A9A9",
+                            darkgreen: "#006400",
+                            darkgrey: "#A9A9A9",
+                            darkkhaki: "#BDB76B",
+                            darkmagenta: "#8B008B",
+                            darkolivegreen: "#556B2F",
+                            darkorange: "#FF8C00",
+                            darkorchid: "#9932CC",
+                            darkred: "#8B0000",
+                            darksalmon: "#E9967A",
+                            darkseagreen: "#8FBC8F",
+                            darkslateblue: "#483D8B",
+                            darkslategray: "#2F4F4F",
+                            darkslategrey: "#2F4F4F",
+                            darkturquoise: "#00CED1",
+                            darkviolet: "#9400D3",
+                            deeppink: "#FF1493",
+                            deepskyblue: "#00BFFF",
+                            dimgray: "#696969",
+                            dimgrey: "#696969",
+                            dodgerblue: "#1E90FF",
+                            firebrick: "#B22222",
+                            floralwhite: "#FFFAF0",
+                            forestgreen: "#228B22",
+                            gainsboro: "#DCDCDC",
+                            ghostwhite: "#F8F8FF",
+                            gold: "#FFD700",
+                            goldenrod: "#DAA520",
+                            grey: "#808080",
+                            greenyellow: "#ADFF2F",
+                            honeydew: "#F0FFF0",
+                            hotpink: "#FF69B4",
+                            indianred: "#CD5C5C",
+                            indigo: "#4B0082",
+                            ivory: "#FFFFF0",
+                            khaki: "#F0E68C",
+                            lavender: "#E6E6FA",
+                            lavenderblush: "#FFF0F5",
+                            lawngreen: "#7CFC00",
+                            lemonchiffon: "#FFFACD",
+                            lightblue: "#ADD8E6",
+                            lightcoral: "#F08080",
+                            lightcyan: "#E0FFFF",
+                            lightgoldenrodyellow: "#FAFAD2",
+                            lightgreen: "#90EE90",
+                            lightgrey: "#D3D3D3",
+                            lightpink: "#FFB6C1",
+                            lightsalmon: "#FFA07A",
+                            lightseagreen: "#20B2AA",
+                            lightskyblue: "#87CEFA",
+                            lightslategray: "#778899",
+                            lightslategrey: "#778899",
+                            lightsteelblue: "#B0C4DE",
+                            lightyellow: "#FFFFE0",
+                            limegreen: "#32CD32",
+                            linen: "#FAF0E6",
+                            magenta: "#FF00FF",
+                            mediumaquamarine: "#66CDAA",
+                            mediumblue: "#0000CD",
+                            mediumorchid: "#BA55D3",
+                            mediumpurple: "#9370DB",
+                            mediumseagreen: "#3CB371",
+                            mediumslateblue: "#7B68EE",
+                            mediumspringgreen: "#00FA9A",
+                            mediumturquoise: "#48D1CC",
+                            mediumvioletred: "#C71585",
+                            midnightblue: "#191970",
+                            mintcream: "#F5FFFA",
+                            mistyrose: "#FFE4E1",
+                            moccasin: "#FFE4B5",
+                            navajowhite: "#FFDEAD",
+                            oldlace: "#FDF5E6",
+                            olivedrab: "#6B8E23",
+                            orange: "#FFA500",
+                            orangered: "#FF4500",
+                            orchid: "#DA70D6",
+                            palegoldenrod: "#EEE8AA",
+                            palegreen: "#98FB98",
+                            paleturquoise: "#AFEEEE",
+                            palevioletred: "#DB7093",
+                            papayawhip: "#FFEFD5",
+                            peachpuff: "#FFDAB9",
+                            peru: "#CD853F",
+                            pink: "#FFC0CB",
+                            plum: "#DDA0DD",
+                            powderblue: "#B0E0E6",
+                            rosybrown: "#BC8F8F",
+                            royalblue: "#4169E1",
+                            saddlebrown: "#8B4513",
+                            salmon: "#FA8072",
+                            sandybrown: "#F4A460",
+                            seagreen: "#2E8B57",
+                            seashell: "#FFF5EE",
+                            sienna: "#A0522D",
+                            skyblue: "#87CEEB",
+                            slateblue: "#6A5ACD",
+                            slategray: "#708090",
+                            slategrey: "#708090",
+                            snow: "#FFFAFA",
+                            springgreen: "#00FF7F",
+                            steelblue: "#4682B4",
+                            tan: "#D2B48C",
+                            thistle: "#D8BFD8",
+                            tomato: "#FF6347",
+                            turquoise: "#40E0D0",
+                            violet: "#EE82EE",
+                            wheat: "#F5DEB3",
+                            whitesmoke: "#F5F5F5",
+                            yellowgreen: "#9ACD32"
+                          },
+                          R = {},
+                          G = {
+                            style: "normal",
+                            variant: "normal",
+                            weight: "normal",
+                            size: 12,
+                            family: "微软雅黑"
+                          },
+                          Y = {},
+                          Q = {
+                            butt: "flat",
+                            round: "round"
+                          },
+                          Z = f.prototype;
+                      Z.clearRect = function() {
+                        this.textMeasureEl_ && (this.textMeasureEl_.removeNode(!0), this.textMeasureEl_ = null),
+                            this.element_.innerHTML = ""
+                      },
+                          Z.beginPath = function() {
+                            this.currentPath_ = []
+                          },
+                          Z.moveTo = function(e, t) {
+                            var i = L(this, e, t);
+                            this.currentPath_.push({
+                              type: "moveTo",
+                              x: i.x,
+                              y: i.y
+                            }),
+                                this.currentX_ = i.x,
+                                this.currentY_ = i.y
+                          },
+                          Z.lineTo = function(e, t) {
+                            var i = L(this, e, t);
+                            this.currentPath_.push({
+                              type: "lineTo",
+                              x: i.x,
+                              y: i.y
+                            }),
+                                this.currentX_ = i.x,
+                                this.currentY_ = i.y
+                          },
+                          Z.bezierCurveTo = function(e, t, i, n, a, o) {
+                            var r = L(this, a, o),
+                                s = L(this, e, t),
+                                l = L(this, i, n);
+                            k(this, s, l, r)
+                          },
+                          Z.quadraticCurveTo = function(e, t, i, n) {
+                            var a = L(this, e, t),
+                                o = L(this, i, n),
+                                r = {
+                                  x: this.currentX_ + 2 / 3 * (a.x - this.currentX_),
+                                  y: this.currentY_ + 2 / 3 * (a.y - this.currentY_)
+                                },
+                                s = {
+                                  x: r.x + (o.x - this.currentX_) / 3,
+                                  y: r.y + (o.y - this.currentY_) / 3
+                                };
+                            k(this, r, s, o)
+                          },
+                          Z.arc = function(e, t, i, n, a, o) {
+                            i *= A;
+                            var r = o ? "at": "wa",
+                                s = e + F(n) * i - M,
+                                l = t + E(n) * i - M,
+                                h = e + F(a) * i - M,
+                                m = t + E(a) * i - M;
+                            s != h || o || (s += .125);
+                            var V = L(this, e, t),
+                                U = L(this, s, l),
+                                d = L(this, h, m);
+                            this.currentPath_.push({
+                              type: r,
+                              x: V.x,
+                              y: V.y,
+                              radius: i,
+                              xStart: U.x,
+                              yStart: U.y,
+                              xEnd: d.x,
+                              yEnd: d.y
+                            })
+                          },
+                          Z.rect = function(e, t, i, n) {
+                            this.moveTo(e, t),
+                                this.lineTo(e + i, t),
+                                this.lineTo(e + i, t + n),
+                                this.lineTo(e, t + n),
+                                this.closePath()
+                          },
+                          Z.strokeRect = function(e, t, i, n) {
+                            var a = this.currentPath_;
+                            this.beginPath(),
+                                this.moveTo(e, t),
+                                this.lineTo(e + i, t),
+                                this.lineTo(e + i, t + n),
+                                this.lineTo(e, t + n),
+                                this.closePath(),
+                                this.stroke(),
+                                this.currentPath_ = a
+                          },
+                          Z.fillRect = function(e, t, i, n) {
+                            var a = this.currentPath_;
+                            this.beginPath(),
+                                this.moveTo(e, t),
+                                this.lineTo(e + i, t),
+                                this.lineTo(e + i, t + n),
+                                this.lineTo(e, t + n),
+                                this.closePath(),
+                                this.fill(),
+                                this.currentPath_ = a
+                          },
+                          Z.createLinearGradient = function(e, t, i, n) {
+                            var a = new v("gradient");
+                            return a.x0_ = e,
+                                a.y0_ = t,
+                                a.x1_ = i,
+                                a.y1_ = n,
+                                a
+                          },
+                          Z.createRadialGradient = function(e, t, i, n, a, o) {
+                            var r = new v("gradientradial");
+                            return r.x0_ = e,
+                                r.y0_ = t,
+                                r.r0_ = i,
+                                r.x1_ = n,
+                                r.y1_ = a,
+                                r.r1_ = o,
+                                r
+                          },
+                          Z.drawImage = function(e) {
+                            var t, i, n, a, o, r, s, l, h = e.runtimeStyle.width,
+                                m = e.runtimeStyle.height;
+                            e.runtimeStyle.width = "auto",
+                                e.runtimeStyle.height = "auto";
+                            var V = e.width,
+                                U = e.height;
+                            if (e.runtimeStyle.width = h, e.runtimeStyle.height = m, 3 == arguments.length) t = arguments[1],
+                                i = arguments[2],
+                                o = r = 0,
+                                s = n = V,
+                                l = a = U;
+                            else if (5 == arguments.length) t = arguments[1],
+                                i = arguments[2],
+                                n = arguments[3],
+                                a = arguments[4],
+                                o = r = 0,
+                                s = V,
+                                l = U;
+                            else {
+                              if (9 != arguments.length) throw Error("Invalid number of arguments");
+                              o = arguments[1],
+                                  r = arguments[2],
+                                  s = arguments[3],
+                                  l = arguments[4],
+                                  t = arguments[5],
+                                  i = arguments[6],
+                                  n = arguments[7],
+                                  a = arguments[8]
+                            }
+                            var d = L(this, t, i),
+                                p = [],
+                                c = 10,
+                                u = 10,
+                                y = b = 1;
+                            if (p.push(" <g_vml_:group", ' coordsize="', A * c, ",", A * u, '"', ' coordorigin="0,0"', ' style="width:', c, "px;height:", u, "px;position:absolute;"), 1 != this.m_[0][0] || this.m_[0][1] || 1 != this.m_[1][1] || this.m_[1][0]) {
+                              var g = [],
+                                  y = this.scaleX_,
+                                  b = this.scaleY_;
+                              g.push("M11=", this.m_[0][0] / y, ",", "M12=", this.m_[1][0] / b, ",", "M21=", this.m_[0][1] / y, ",", "M22=", this.m_[1][1] / b, ",", "Dx=", S(d.x / A), ",", "Dy=", S(d.y / A), "");
+                              var f = d,
+                                  k = L(this, t + n, i),
+                                  x = L(this, t, i + a),
+                                  _ = L(this, t + n, i + a);
+                              f.x = C.max(f.x, k.x, x.x, _.x),
+                                  f.y = C.max(f.y, k.y, x.y, _.y),
+                                  p.push("padding:0 ", S(f.x / A), "px ", S(f.y / A), "px 0;filter:progid:DXImageTransform.Microsoft.Matrix(", g.join(""), ", SizingMethod='clip');")
+                            } else p.push("top:", S(d.y / A), "px;left:", S(d.x / A), "px;");
+                            p.push(' ">'),
+                            (o || r) && p.push('<div style="overflow: hidden; width:', Math.ceil((n + o * n / s) * y), "px;", " height:", Math.ceil((a + r * a / l) * b), "px;", " filter:progid:DxImageTransform.Microsoft.Matrix(Dx=", -o * n / s * y, ",Dy=", -r * a / l * b, ');">'),
+                                p.push('<div style="width:', Math.round(y * V * n / s), "px;", " height:", Math.round(b * U * a / l), "px;", " filter:"),
+                            this.globalAlpha < 1 && p.push(" progid:DXImageTransform.Microsoft.Alpha(opacity=" + 100 * this.globalAlpha + ")"),
+                                p.push(" progid:DXImageTransform.Microsoft.AlphaImageLoader(src=", e.src, ',sizingMethod=scale)">'),
+                            (o || r) && p.push("</div>"),
+                                p.push("</div></div>"),
+                                this.element_.insertAdjacentHTML("BeforeEnd", p.join(""))
+                          },
+                          Z.stroke = function(e) {
+                            var t = [],
+                                i = 10,
+                                n = 10;
+                            t.push("<g_vml_:shape", ' filled="', !!e, '"', ' style="position:absolute;width:', i, "px;height:", n, 'px;"', ' coordorigin="0,0"', ' coordsize="', A * i, ",", A * n, '"', ' stroked="', !e, '"', ' path="');
+                            for (var a = {
+                                  x: null,
+                                  y: null
+                                },
+                                     o = {
+                                       x: null,
+                                       y: null
+                                     },
+                                     r = 0; r < this.currentPath_.length; r++) {
+                              var s, l = this.currentPath_[r];
+                              switch (l.type) {
+                                case "moveTo":
+                                  s = l,
+                                      t.push(" m ", S(l.x), ",", S(l.y));
+                                  break;
+                                case "lineTo":
+                                  t.push(" l ", S(l.x), ",", S(l.y));
+                                  break;
+                                case "close":
+                                  t.push(" x "),
+                                      l = null;
+                                  break;
+                                case "bezierCurveTo":
+                                  t.push(" c ", S(l.cp1x), ",", S(l.cp1y), ",", S(l.cp2x), ",", S(l.cp2y), ",", S(l.x), ",", S(l.y));
+                                  break;
+                                case "at":
+                                case "wa":
+                                  t.push(" ", l.type, " ", S(l.x - this.scaleX_ * l.radius), ",", S(l.y - this.scaleY_ * l.radius), " ", S(l.x + this.scaleX_ * l.radius), ",", S(l.y + this.scaleY_ * l.radius), " ", S(l.xStart), ",", S(l.yStart), " ", S(l.xEnd), ",", S(l.yEnd))
+                              }
+                              l && ((null == a.x || l.x < a.x) && (a.x = l.x), (null == o.x || l.x > o.x) && (o.x = l.x), (null == a.y || l.y < a.y) && (a.y = l.y), (null == o.y || l.y > o.y) && (o.y = l.y))
+                            }
+                            t.push(' ">'),
+                                e ? _(this, t, a, o) : x(this, t),
+                                t.push("</g_vml_:shape>"),
+                                this.element_.insertAdjacentHTML("beforeEnd", t.join(""))
+                          },
+                          Z.fill = function() {
+                            this.stroke(!0)
+                          },
+                          Z.closePath = function() {
+                            this.currentPath_.push({
+                              type: "close"
+                            })
+                          },
+                          Z.save = function() {
+                            var e = {};
+                            h(this, e),
+                                this.aStack_.push(e),
+                                this.mStack_.push(this.m_),
+                                this.m_ = l(s(), this.m_)
+                          },
+                          Z.restore = function() {
+                            this.aStack_.length && (h(this.aStack_.pop(), this), this.m_ = this.mStack_.pop())
+                          },
+                          Z.translate = function(e, t) {
+                            var i = [[1, 0, 0], [0, 1, 0], [e, t, 1]];
+                            X(this, l(i, this.m_), !1)
+                          },
+                          Z.rotate = function(e) {
+                            var t = F(e),
+                                i = E(e),
+                                n = [[t, i, 0], [ - i, t, 0], [0, 0, 1]];
+                            X(this, l(n, this.m_), !1)
+                          },
+                          Z.scale = function(e, t) {
+                            var i = [[e, 0, 0], [0, t, 0], [0, 0, 1]];
+                            X(this, l(i, this.m_), !0)
+                          },
+                          Z.transform = function(e, t, i, n, a, o) {
+                            var r = [[e, t, 0], [i, n, 0], [a, o, 1]];
+                            X(this, l(r, this.m_), !0)
+                          },
+                          Z.setTransform = function(e, t, i, n, a, o) {
+                            var r = [[e, t, 0], [i, n, 0], [a, o, 1]];
+                            X(this, r, !0)
+                          },
+                          Z.drawText_ = function(e, t, n, a, o) {
+                            var r = this.m_,
+                                s = 1e3,
+                                l = 0,
+                                h = s,
+                                m = {
+                                  x: 0,
+                                  y: 0
+                                },
+                                V = [],
+                                U = y(u(this.font), this.element_),
+                                d = g(U),
+                                p = this.element_.currentStyle,
+                                c = this.textAlign.toLowerCase();
+                            switch (c) {
+                              case "left":
+                              case "center":
+                              case "right":
+                                break;
+                              case "end":
+                                c = "ltr" == p.direction ? "right": "left";
+                                break;
+                              case "start":
+                                c = "rtl" == p.direction ? "right": "left";
+                                break;
+                              default:
+                                c = "left"
+                            }
+                            switch (this.textBaseline) {
+                              case "hanging":
+                              case "top":
+                                m.y = U.size / 1.75;
+                                break;
+                              case "middle":
+                                break;
+                              default:
+                              case null:
+                              case "alphabetic":
+                              case "ideographic":
+                              case "bottom":
+                                m.y = -U.size / 2.25
+                            }
+                            switch (c) {
+                              case "right":
+                                l = s,
+                                    h = .05;
+                                break;
+                              case "center":
+                                l = h = s / 2
+                            }
+                            var b = L(this, t + m.x, n + m.y);
+                            V.push('<g_vml_:line from="', -l, ' 0" to="', h, ' 0.05" ', ' coordsize="100 100" coordorigin="0 0"', ' filled="', !o, '" stroked="', !!o, '" style="position:absolute;width:1px;height:1px;">'),
+                                o ? x(this, V) : _(this, V, {
+                                      x: -l,
+                                      y: 0
+                                    },
+                                    {
+                                      x: h,
+                                      y: U.size
+                                    });
+                            var f = r[0][0].toFixed(3) + "," + r[1][0].toFixed(3) + "," + r[0][1].toFixed(3) + "," + r[1][1].toFixed(3) + ",0,0",
+                                k = S(b.x / A) + "," + S(b.y / A);
+                            V.push('<g_vml_:skew on="t" matrix="', f, '" ', ' offset="', k, '" origin="', l, ' 0" />', '<g_vml_:path textpathok="true" />', '<g_vml_:textpath on="true" string="', i(e), '" style="v-text-align:', c, ";font:", i(d), '" /></g_vml_:line>'),
+                                this.element_.insertAdjacentHTML("beforeEnd", V.join(""))
+                          },
+                          Z.fillText = function(e, t, i, n) {
+                            this.drawText_(e, t, i, n, !1)
+                          },
+                          Z.strokeText = function(e, t, i, n) {
+                            this.drawText_(e, t, i, n, !0)
+                          },
+                          Z.measureText = function(e) {
+                            if (!this.textMeasureEl_) {
+                              var t = '<span style="position:absolute;top:-20000px;left:0;padding:0;margin:0;border:none;white-space:pre;"></span>';
+                              this.element_.insertAdjacentHTML("beforeEnd", t),
+                                  this.textMeasureEl_ = this.element_.lastChild
+                            }
+                            var i = this.element_.ownerDocument;
+                            this.textMeasureEl_.innerHTML = "";
+                            try {
+                              this.textMeasureEl_.style.font = this.font
+                            } catch(n) {}
+                            return this.textMeasureEl_.appendChild(i.createTextNode(e)),
+                                {
+                                  width: this.textMeasureEl_.offsetWidth
+                                }
+                          },
+                          Z.clip = function() {},
+                          Z.arcTo = function() {},
+                          Z.createPattern = function(e, t) {
+                            return new w(e, t)
+                          },
+                          v.prototype.addColorStop = function(e, t) {
+                            t = c(t),
+                                this.colors_.push({
+                                  offset: e,
+                                  color: t.color,
+                                  alpha: t.alpha
+                                })
+                          };
+                      var q = J.prototype = new Error;
+                      q.INDEX_SIZE_ERR = 1,
+                          q.DOMSTRING_SIZE_ERR = 2,
+                          q.HIERARCHY_REQUEST_ERR = 3,
+                          q.WRONG_DOCUMENT_ERR = 4,
+                          q.INVALID_CHARACTER_ERR = 5,
+                          q.NO_DATA_ALLOWED_ERR = 6,
+                          q.NO_MODIFICATION_ALLOWED_ERR = 7,
+                          q.NOT_FOUND_ERR = 8,
+                          q.NOT_SUPPORTED_ERR = 9,
+                          q.INUSE_ATTRIBUTE_ERR = 10,
+                          q.INVALID_STATE_ERR = 11,
+                          q.SYNTAX_ERR = 12,
+                          q.INVALID_MODIFICATION_ERR = 13,
+                          q.NAMESPACE_ERR = 14,
+                          q.INVALID_ACCESS_ERR = 15,
+                          q.VALIDATION_ERR = 16,
+                          q.TYPE_MISMATCH_ERR = 17,
+                          G_vmlCanvasManager = P,
+                          CanvasRenderingContext2D = f,
+                          CanvasGradient = v,
+                          CanvasPattern = w,
+                          DOMException = J
+                    } (),
+                    G_vmlCanvasManager
+              }),
+          i("zrender/mixin/Eventful", ["require"],
+              function() {
+                var e = function() {
+                  this._handlers = {}
+                };
+                return e.prototype.one = function(e, t, i) {
+                  var n = this._handlers;
+                  return t && e ? (n[e] || (n[e] = []), n[e].push({
+                    h: t,
+                    one: !0,
+                    ctx: i || this
+                  }), this) : this
+                },
+                    e.prototype.bind = function(e, t, i) {
+                      var n = this._handlers;
+                      return t && e ? (n[e] || (n[e] = []), n[e].push({
+                        h: t,
+                        one: !1,
+                        ctx: i || this
+                      }), this) : this
+                    },
+                    e.prototype.unbind = function(e, t) {
+                      var i = this._handlers;
+                      if (!e) return this._handlers = {},
+                          this;
+                      if (t) {
+                        if (i[e]) {
+                          for (var n = [], a = 0, o = i[e].length; o > a; a++) i[e][a].h != t && n.push(i[e][a]);
+                          i[e] = n
+                        }
+                        i[e] && 0 === i[e].length && delete i[e]
+                      } else delete i[e];
+                      return this
+                    },
+                    e.prototype.dispatch = function(e) {
+                      if (this._handlers[e]) {
+                        var t = arguments,
+                            i = t.length;
+                        i > 3 && (t = Array.prototype.slice.call(t, 1));
+                        for (var n = this._handlers[e], a = n.length, o = 0; a > o;) {
+                          switch (i) {
+                            case 1:
+                              n[o].h.call(n[o].ctx);
+                              break;
+                            case 2:
+                              n[o].h.call(n[o].ctx, t[1]);
+                              break;
+                            case 3:
+                              n[o].h.call(n[o].ctx, t[1], t[2]);
+                              break;
+                            default:
+                              n[o].h.apply(n[o].ctx, t)
+                          }
+                          n[o].one ? (n.splice(o, 1), a--) : o++
+                        }
+                      }
+                      return this
+                    },
+                    e.prototype.dispatchWithContext = function(e) {
+                      if (this._handlers[e]) {
+                        var t = arguments,
+                            i = t.length;
+                        i > 4 && (t = Array.prototype.slice.call(t, 1, t.length - 1));
+                        for (var n = t[t.length - 1], a = this._handlers[e], o = a.length, r = 0; o > r;) {
+                          switch (i) {
+                            case 1:
+                              a[r].h.call(n);
+                              break;
+                            case 2:
+                              a[r].h.call(n, t[1]);
+                              break;
+                            case 3:
+                              a[r].h.call(n, t[1], t[2]);
+                              break;
+                            default:
+                              a[r].h.apply(n, t)
+                          }
+                          a[r].one ? (a.splice(r, 1), o--) : r++
+                        }
+                      }
+                      return this
+                    },
+                    e
+              }),
+          i("zrender/tool/log", ["require", "../config"],
+              function(e) {
+                var t = e("../config");
+                return function() {
+                  if (0 !== t.debugMode) if (1 == t.debugMode) for (var e in arguments) throw new Error(arguments[e]);
+                  else if (t.debugMode > 1) for (var e in arguments) console.log(arguments[e])
+                }
+              }),
+          i("zrender/tool/guid", [],
+              function() {
+                var e = 2311;
+                return function() {
+                  return "zrender__" + e++
+                }
+              }),
+          i("zrender/Handler", ["require", "./config", "./tool/env", "./tool/event", "./tool/util", "./tool/vector", "./tool/matrix", "./mixin/Eventful"],
+              function(e) {
+                "use strict";
+                function t(e, t) {
+                  return function(i, n) {
+                    return e.call(t, i, n)
+                  }
+                }
+                function i(e, t) {
+                  return function(i, n, a) {
+                    return e.call(t, i, n, a)
+                  }
+                }
+                function n(e) {
+                  for (var i = d.length; i--;) {
+                    var n = d[i];
+                    e["_" + n + "Handler"] = t(c[n], e)
+                  }
+                }
+                function a(e, t, i) {
+                  if (this._draggingTarget && this._draggingTarget.id == e.id || e.isSilent()) return ! 1;
+                  var n = this._event;
+                  if (e.isCover(t, i)) {
+                    e.hoverable && this.storage.addHover(e);
+                    for (var a = e.parent; a;) {
+                      if (a.clipShape && !a.clipShape.isCover(this._mouseX, this._mouseY)) return ! 1;
+                      a = a.parent
+                    }
+                    return this._lastHover != e && (this._processOutShape(n), this._processDragLeave(n), this._lastHover = e, this._processDragEnter(n)),
+                        this._processOverShape(n),
+                        this._processDragOver(n),
+                        this._hasfound = 1,
+                        !0
+                  }
+                  return ! 1
+                }
+                var o = e("./config"),
+                    r = e("./tool/env"),
+                    s = e("./tool/event"),
+                    l = e("./tool/util"),
+                    h = e("./tool/vector"),
+                    m = e("./tool/matrix"),
+                    V = o.EVENT,
+                    U = e("./mixin/Eventful"),
+                    d = ["resize", "click", "dblclick", "mousewheel", "mousemove", "mouseout", "mouseup", "mousedown", "touchstart", "touchend", "touchmove"],
+                    p = function(e) {
+                      if (window.G_vmlCanvasManager) return ! 0;
+                      e = e || window.event;
+                      var t = e.toElement || e.relatedTarget || e.srcElement || e.target;
+                      return t && t.className.match(o.elementClassName)
+                    },
+                    c = {
+                      resize: function(e) {
+                        e = e || window.event,
+                            this._lastHover = null,
+                            this._isMouseDown = 0,
+                            this.dispatch(V.RESIZE, e)
+                      },
+                      click: function(e, t) {
+                        if (p(e) || t) {
+                          e = this._zrenderEventFixed(e);
+                          var i = this._lastHover; (i && i.clickable || !i) && this._clickThreshold < 5 && this._dispatchAgency(i, V.CLICK, e),
+                              this._mousemoveHandler(e)
+                        }
+                      },
+                      dblclick: function(e, t) {
+                        if (p(e) || t) {
+                          e = e || window.event,
+                              e = this._zrenderEventFixed(e);
+                          var i = this._lastHover; (i && i.clickable || !i) && this._clickThreshold < 5 && this._dispatchAgency(i, V.DBLCLICK, e),
+                              this._mousemoveHandler(e)
+                        }
+                      },
+                      mousewheel: function(e, t) {
+                        if (p(e) || t) {
+                          e = this._zrenderEventFixed(e);
+                          var i = e.wheelDelta || -e.detail,
+                              n = i > 0 ? 1.1 : 1 / 1.1,
+                              a = !1,
+                              o = this._mouseX,
+                              r = this._mouseY;
+                          this.painter.eachBuildinLayer(function(t) {
+                            var i = t.position;
+                            if (t.zoomable) {
+                              t.__zoom = t.__zoom || 1;
+                              var l = t.__zoom;
+                              l *= n,
+                                  l = Math.max(Math.min(t.maxZoom, l), t.minZoom),
+                                  n = l / t.__zoom,
+                                  t.__zoom = l,
+                                  i[0] -= (o - i[0]) * (n - 1),
+                                  i[1] -= (r - i[1]) * (n - 1),
+                                  t.scale[0] *= n,
+                                  t.scale[1] *= n,
+                                  t.dirty = !0,
+                                  a = !0,
+                                  s.stop(e)
+                            }
+                          }),
+                          a && this.painter.refresh(),
+                              this._dispatchAgency(this._lastHover, V.MOUSEWHEEL, e),
+                              this._mousemoveHandler(e)
+                        }
+                      },
+                      mousemove: function(e, t) {
+                        if ((p(e) || t) && !this.painter.isLoading()) {
+                          e = this._zrenderEventFixed(e),
+                              this._lastX = this._mouseX,
+                              this._lastY = this._mouseY,
+                              this._mouseX = s.getX(e),
+                              this._mouseY = s.getY(e);
+                          var i = this._mouseX - this._lastX,
+                              n = this._mouseY - this._lastY;
+                          this._processDragStart(e),
+                              this._hasfound = 0,
+                              this._event = e,
+                              this._iterateAndFindHover(),
+                          this._hasfound || ((!this._draggingTarget || this._lastHover && this._lastHover != this._draggingTarget) && (this._processOutShape(e), this._processDragLeave(e)), this._lastHover = null, this.storage.delHover(), this.painter.clearHover());
+                          var a = "default";
+                          if (this._draggingTarget) this.storage.drift(this._draggingTarget.id, i, n),
+                              this._draggingTarget.modSelf(),
+                              this.storage.addHover(this._draggingTarget),
+                              this._clickThreshold++;
+                          else if (this._isMouseDown) {
+                            var o = !1;
+                            this.painter.eachBuildinLayer(function(e) {
+                              e.panable && (a = "move", e.position[0] += i, e.position[1] += n, o = !0, e.dirty = !0)
+                            }),
+                            o && this.painter.refresh()
+                          }
+                          this._draggingTarget || this._hasfound && this._lastHover.draggable ? a = "move": this._hasfound && this._lastHover.clickable && (a = "pointer"),
+                              this.root.style.cursor = a,
+                              this._dispatchAgency(this._lastHover, V.MOUSEMOVE, e),
+                          (this._draggingTarget || this._hasfound || this.storage.hasHoverShape()) && this.painter.refreshHover()
+                        }
+                      },
+                      mouseout: function(e, t) {
+                        if (p(e) || t) {
+                          e = this._zrenderEventFixed(e);
+                          var i = e.toElement || e.relatedTarget;
+                          if (i != this.root) for (; i && 9 != i.nodeType;) {
+                            if (i == this.root) return void this._mousemoveHandler(e);
+                            i = i.parentNode
+                          }
+                          e.zrenderX = this._lastX,
+                              e.zrenderY = this._lastY,
+                              this.root.style.cursor = "default",
+                              this._isMouseDown = 0,
+                              this._processOutShape(e),
+                              this._processDrop(e),
+                              this._processDragEnd(e),
+                          this.painter.isLoading() || this.painter.refreshHover(),
+                              this.dispatch(V.GLOBALOUT, e)
+                        }
+                      },
+                      mousedown: function(e, t) {
+                        if (p(e) || t) {
+                          if (this._clickThreshold = 0, 2 == this._lastDownButton) return this._lastDownButton = e.button,
+                              void(this._mouseDownTarget = null);
+                          this._lastMouseDownMoment = new Date,
+                              e = this._zrenderEventFixed(e),
+                              this._isMouseDown = 1,
+                              this._mouseDownTarget = this._lastHover,
+                              this._dispatchAgency(this._lastHover, V.MOUSEDOWN, e),
+                              this._lastDownButton = e.button
+                        }
+                      },
+                      mouseup: function(e, t) { (p(e) || t) && (e = this._zrenderEventFixed(e), this.root.style.cursor = "default", this._isMouseDown = 0, this._mouseDownTarget = null, this._dispatchAgency(this._lastHover, V.MOUSEUP, e), this._processDrop(e), this._processDragEnd(e))
+                      },
+                      touchstart: function(e, t) { (p(e) || t) && (e = this._zrenderEventFixed(e, !0), this._lastTouchMoment = new Date, this._mobileFindFixed(e), this._mousedownHandler(e))
+                      },
+                      touchmove: function(e, t) { (p(e) || t) && (e = this._zrenderEventFixed(e, !0), this._mousemoveHandler(e), this._isDragging && s.stop(e))
+                      },
+                      touchend: function(e, t) {
+                        if (p(e) || t) {
+                          e = this._zrenderEventFixed(e, !0),
+                              this._mouseupHandler(e);
+                          var i = new Date;
+                          i - this._lastTouchMoment < V.touchClickDelay && (this._mobileFindFixed(e), this._clickHandler(e), i - this._lastClickMoment < V.touchClickDelay / 2 && (this._dblclickHandler(e), this._lastHover && this._lastHover.clickable && s.stop(e)), this._lastClickMoment = i),
+                              this.painter.clearHover()
+                        }
+                      }
+                    },
+                    u = function(e, t, o) {
+                      U.call(this),
+                          this.root = e,
+                          this.storage = t,
+                          this.painter = o,
+                          this._lastX = this._lastY = this._mouseX = this._mouseY = 0,
+                          this._findHover = i(a, this),
+                          this._domHover = o.getDomHover(),
+                          n(this),
+                          window.addEventListener ? (window.addEventListener("resize", this._resizeHandler), r.os.tablet || r.os.phone ? (e.addEventListener("touchstart", this._touchstartHandler), e.addEventListener("touchmove", this._touchmoveHandler), e.addEventListener("touchend", this._touchendHandler)) : (e.addEventListener("click", this._clickHandler), e.addEventListener("dblclick", this._dblclickHandler), e.addEventListener("mousewheel", this._mousewheelHandler), e.addEventListener("mousemove", this._mousemoveHandler), e.addEventListener("mousedown", this._mousedownHandler), e.addEventListener("mouseup", this._mouseupHandler)), e.addEventListener("DOMMouseScroll", this._mousewheelHandler), e.addEventListener("mouseout", this._mouseoutHandler)) : (window.attachEvent("onresize", this._resizeHandler), e.attachEvent("onclick", this._clickHandler), e.ondblclick = this._dblclickHandler, e.attachEvent("onmousewheel", this._mousewheelHandler), e.attachEvent("onmousemove", this._mousemoveHandler), e.attachEvent("onmouseout", this._mouseoutHandler), e.attachEvent("onmousedown", this._mousedownHandler), e.attachEvent("onmouseup", this._mouseupHandler))
+                    };
+                u.prototype.on = function(e, t, i) {
+                  return this.bind(e, t, i),
+                      this
+                },
+                    u.prototype.un = function(e, t) {
+                      return this.unbind(e, t),
+                          this
+                    },
+                    u.prototype.trigger = function(e, t) {
+                      switch (e) {
+                        case V.RESIZE:
+                        case V.CLICK:
+                        case V.DBLCLICK:
+                        case V.MOUSEWHEEL:
+                        case V.MOUSEMOVE:
+                        case V.MOUSEDOWN:
+                        case V.MOUSEUP:
+                        case V.MOUSEOUT:
+                          this["_" + e + "Handler"](t, !0)
+                      }
+                    },
+                    u.prototype.dispose = function() {
+                      var e = this.root;
+                      window.removeEventListener ? (window.removeEventListener("resize", this._resizeHandler), r.os.tablet || r.os.phone ? (e.removeEventListener("touchstart", this._touchstartHandler), e.removeEventListener("touchmove", this._touchmoveHandler), e.removeEventListener("touchend", this._touchendHandler)) : (e.removeEventListener("click", this._clickHandler), e.removeEventListener("dblclick", this._dblclickHandler), e.removeEventListener("mousewheel", this._mousewheelHandler), e.removeEventListener("mousemove", this._mousemoveHandler), e.removeEventListener("mousedown", this._mousedownHandler), e.removeEventListener("mouseup", this._mouseupHandler)), e.removeEventListener("DOMMouseScroll", this._mousewheelHandler), e.removeEventListener("mouseout", this._mouseoutHandler)) : (window.detachEvent("onresize", this._resizeHandler), e.detachEvent("onclick", this._clickHandler), e.detachEvent("dblclick", this._dblclickHandler), e.detachEvent("onmousewheel", this._mousewheelHandler), e.detachEvent("onmousemove", this._mousemoveHandler), e.detachEvent("onmouseout", this._mouseoutHandler), e.detachEvent("onmousedown", this._mousedownHandler), e.detachEvent("onmouseup", this._mouseupHandler)),
+                          this.root = this._domHover = this.storage = this.painter = null,
+                          this.un()
+                    },
+                    u.prototype._processDragStart = function(e) {
+                      var t = this._lastHover;
+                      if (this._isMouseDown && t && t.draggable && !this._draggingTarget && this._mouseDownTarget == t) {
+                        if (t.dragEnableTime && new Date - this._lastMouseDownMoment < t.dragEnableTime) return;
+                        var i = t;
+                        this._draggingTarget = i,
+                            this._isDragging = 1,
+                            i.invisible = !0,
+                            this.storage.mod(i.id),
+                            this._dispatchAgency(i, V.DRAGSTART, e),
+                            this.painter.refresh()
+                      }
+                    },
+                    u.prototype._processDragEnter = function(e) {
+                      this._draggingTarget && this._dispatchAgency(this._lastHover, V.DRAGENTER, e, this._draggingTarget)
+                    },
+                    u.prototype._processDragOver = function(e) {
+                      this._draggingTarget && this._dispatchAgency(this._lastHover, V.DRAGOVER, e, this._draggingTarget)
+                    },
+                    u.prototype._processDragLeave = function(e) {
+                      this._draggingTarget && this._dispatchAgency(this._lastHover, V.DRAGLEAVE, e, this._draggingTarget)
+                    },
+                    u.prototype._processDrop = function(e) {
+                      this._draggingTarget && (this._draggingTarget.invisible = !1, this.storage.mod(this._draggingTarget.id), this.painter.refresh(), this._dispatchAgency(this._lastHover, V.DROP, e, this._draggingTarget))
+                    },
+                    u.prototype._processDragEnd = function(e) {
+                      this._draggingTarget && (this._dispatchAgency(this._draggingTarget, V.DRAGEND, e), this._lastHover = null),
+                          this._isDragging = 0,
+                          this._draggingTarget = null
+                    },
+                    u.prototype._processOverShape = function(e) {
+                      this._dispatchAgency(this._lastHover, V.MOUSEOVER, e)
+                    },
+                    u.prototype._processOutShape = function(e) {
+                      this._dispatchAgency(this._lastHover, V.MOUSEOUT, e)
+                    },
+                    u.prototype._dispatchAgency = function(e, t, i, n) {
+                      var a = "on" + t,
+                          o = {
+                            type: t,
+                            event: i,
+                            target: e,
+                            cancelBubble: !1
+                          },
+                          r = e;
+                      for (n && (o.dragged = n); r && (r[a] && (o.cancelBubble = r[a](o)), r.dispatch(t, o), r = r.parent, !o.cancelBubble););
+                      if (e) o.cancelBubble || this.dispatch(t, o);
+                      else if (!n) {
+                        var s = {
+                          type: t,
+                          event: i
+                        };
+                        this.dispatch(t, s),
+                            this.painter.eachOtherLayer(function(e) {
+                              "function" == typeof e[a] && e[a](s),
+                              e.dispatch && e.dispatch(t, s)
+                            })
+                      }
+                    },
+                    u.prototype._iterateAndFindHover = function() {
+                      var e = m.create();
+                      return function() {
+                        for (var t, i, n = this.storage.getShapeList(), a = [0, 0], o = n.length - 1; o >= 0; o--) {
+                          var r = n[o];
+                          if (t !== r.zlevel && (i = this.painter.getLayer(r.zlevel, i), a[0] = this._mouseX, a[1] = this._mouseY, i.needTransform && (m.invert(e, i.transform), h.applyTransform(a, a, e))), this._findHover(r, a[0], a[1])) break
+                        }
+                      }
+                    } ();
+                var y = [{
+                  x: 10
+                },
+                  {
+                    x: -20
+                  },
+                  {
+                    x: 10,
+                    y: 10
+                  },
+                  {
+                    y: -20
+                  }];
+                return u.prototype._mobileFindFixed = function(e) {
+                  this._lastHover = null,
+                      this._mouseX = e.zrenderX,
+                      this._mouseY = e.zrenderY,
+                      this._event = e,
+                      this._iterateAndFindHover();
+                  for (var t = 0; ! this._lastHover && t < y.length; t++) {
+                    var i = y[t];
+                    i.x && (this._mouseX += i.x),
+                    i.y && (this._mouseY += i.y),
+                        this._iterateAndFindHover()
+                  }
+                  this._lastHover && (e.zrenderX = this._mouseX, e.zrenderY = this._mouseY)
+                },
+                    u.prototype._zrenderEventFixed = function(e, t) {
+                      if (e.zrenderFixed) return e;
+                      if (t) {
+                        var i = "touchend" != e.type ? e.targetTouches[0] : e.changedTouches[0];
+                        if (i) {
+                          var n = this.painter._domRoot.getBoundingClientRect();
+                          e.zrenderX = i.clientX - n.left,
+                              e.zrenderY = i.clientY - n.top
+                        }
+                      } else {
+                        e = e || window.event;
+                        var a = e.toElement || e.relatedTarget || e.srcElement || e.target;
+                        a && a != this._domHover && (e.zrenderX = ("undefined" != typeof e.offsetX ? e.offsetX: e.layerX) + a.offsetLeft, e.zrenderY = ("undefined" != typeof e.offsetY ? e.offsetY: e.layerY) + a.offsetTop)
+                      }
+                      return e.zrenderFixed = 1,
+                          e
+                    },
+                    l.merge(u.prototype, U.prototype, !0),
+                    u
+              }),
+          i("zrender/Painter", ["require", "./config", "./tool/util", "./tool/log", "./loadingEffect/Base", "./Layer", "./shape/Image"],
+              function(e) {
+                "use strict";
+                function t() {
+                  return ! 1
+                }
+                function i() {}
+                function n(e) {
+                  return e ? e.isBuildin ? !0 : "function" != typeof e.resize || "function" != typeof e.refresh ? !1 : !0 : !1
+                }
+                var a = e("./config"),
+                    o = e("./tool/util"),
+                    r = e("./tool/log"),
+                    s = e("./loadingEffect/Base"),
+                    l = e("./Layer"),
+                    h = function(e, i) {
+                      this.root = e,
+                          e.style["-webkit-tap-highlight-color"] = "transparent",
+                          e.style["-webkit-user-select"] = "none",
+                          e.style["user-select"] = "none",
+                          e.style["-webkit-touch-callout"] = "none",
+                          this.storage = i,
+                          e.innerHTML = "",
+                          this._width = this._getWidth(),
+                          this._height = this._getHeight();
+                      var n = document.createElement("div");
+                      this._domRoot = n,
+                          n.style.position = "relative",
+                          n.style.overflow = "hidden",
+                          n.style.width = this._width + "px",
+                          n.style.height = this._height + "px",
+                          e.appendChild(n),
+                          this._layers = {},
+                          this._zlevelList = [],
+                          this._layerConfig = {},
+                          this._loadingEffect = new s({}),
+                          this.shapeToImage = this._createShapeToImageProcessor(),
+                          this._bgDom = document.createElement("div"),
+                          this._bgDom.style.cssText = ["position:absolute;left:0px;top:0px;width:", this._width, "px;height:", this._height + "px;", "-webkit-user-select:none;user-select;none;", "-webkit-touch-callout:none;"].join(""),
+                          this._bgDom.setAttribute("data-zr-dom-id", "bg"),
+                          this._bgDom.className = a.elementClassName,
+                          n.appendChild(this._bgDom),
+                          this._bgDom.onselectstart = t;
+                      var o = new l("_zrender_hover_", this);
+                      this._layers.hover = o,
+                          n.appendChild(o.dom),
+                          o.initContext(),
+                          o.dom.onselectstart = t,
+                          o.dom.style["-webkit-user-select"] = "none",
+                          o.dom.style["user-select"] = "none",
+                          o.dom.style["-webkit-touch-callout"] = "none",
+                          this.refreshNextFrame = null
+                    };
+                return h.prototype.render = function(e) {
+                  return this.isLoading() && this.hideLoading(),
+                      this.refresh(e, !0),
+                      this
+                },
+                    h.prototype.refresh = function(e, t) {
+                      var i = this.storage.getShapeList(!0);
+                      this._paintList(i, t);
+                      for (var n = 0; n < this._zlevelList.length; n++) {
+                        var a = this._zlevelList[n],
+                            o = this._layers[a]; ! o.isBuildin && o.refresh && o.refresh()
+                      }
+                      return "function" == typeof e && e(),
+                          this
+                    },
+                    h.prototype._preProcessLayer = function(e) {
+                      e.unusedCount++,
+                          e.updateTransform()
+                    },
+                    h.prototype._postProcessLayer = function(e) {
+                      e.dirty = !1,
+                      1 == e.unusedCount && e.clear()
+                    },
+                    h.prototype._paintList = function(e, t) {
+                      "undefined" == typeof t && (t = !1),
+                          this._updateLayerStatus(e);
+                      var i, n, o;
+                      this.eachBuildinLayer(this._preProcessLayer);
+                      for (var s = 0,
+                               l = e.length; l > s; s++) {
+                        var h = e[s];
+                        if (n !== h.zlevel && (i && (i.needTransform && o.restore(), o.flush && o.flush()), n = h.zlevel, i = this.getLayer(n), i.isBuildin || r("ZLevel " + n + " has been used by unkown layer " + i.id), o = i.ctx, i.unusedCount = 0, (i.dirty || t) && i.clear(), i.needTransform && (o.save(), i.setTransform(o))), (i.dirty || t) && !h.invisible && (!h.onbrush || h.onbrush && !h.onbrush(o, !1))) if (a.catchBrushException) try {
+                          h.brush(o, !1, this.refreshNextFrame)
+                        } catch(m) {
+                          r(m, "brush error of " + h.type, h)
+                        } else h.brush(o, !1, this.refreshNextFrame);
+                        h.__dirty = !1
+                      }
+                      i && (i.needTransform && o.restore(), o.flush && o.flush()),
+                          this.eachBuildinLayer(this._postProcessLayer)
+                    },
+                    h.prototype.getLayer = function(e) {
+                      var t = this._layers[e];
+                      return t || (t = new l(e, this), t.isBuildin = !0, this._layerConfig[e] && o.merge(t, this._layerConfig[e], !0), t.updateTransform(), this.insertLayer(e, t), t.initContext()),
+                          t
+                    },
+                    h.prototype.insertLayer = function(e, t) {
+                      if (this._layers[e]) return void r("ZLevel " + e + " has been used already");
+                      if (!n(t)) return void r("Layer of zlevel " + e + " is not valid");
+                      var i = this._zlevelList.length,
+                          a = null,
+                          o = -1;
+                      if (i > 0 && e > this._zlevelList[0]) {
+                        for (o = 0; i - 1 > o && !(this._zlevelList[o] < e && this._zlevelList[o + 1] > e); o++);
+                        a = this._layers[this._zlevelList[o]]
+                      }
+                      this._zlevelList.splice(o + 1, 0, e);
+                      var s = a ? a.dom: this._bgDom;
+                      s.nextSibling ? s.parentNode.insertBefore(t.dom, s.nextSibling) : s.parentNode.appendChild(t.dom),
+                          this._layers[e] = t
+                    },
+                    h.prototype.eachLayer = function(e, t) {
+                      for (var i = 0; i < this._zlevelList.length; i++) {
+                        var n = this._zlevelList[i];
+                        e.call(t, this._layers[n], n)
+                      }
+                    },
+                    h.prototype.eachBuildinLayer = function(e, t) {
+                      for (var i = 0; i < this._zlevelList.length; i++) {
+                        var n = this._zlevelList[i],
+                            a = this._layers[n];
+                        a.isBuildin && e.call(t, a, n)
+                      }
+                    },
+                    h.prototype.eachOtherLayer = function(e, t) {
+                      for (var i = 0; i < this._zlevelList.length; i++) {
+                        var n = this._zlevelList[i],
+                            a = this._layers[n];
+                        a.isBuildin || e.call(t, a, n)
+                      }
+                    },
+                    h.prototype.getLayers = function() {
+                      return this._layers
+                    },
+                    h.prototype._updateLayerStatus = function(e) {
+                      var t = this._layers,
+                          i = {};
+                      this.eachBuildinLayer(function(e, t) {
+                        i[t] = e.elCount,
+                            e.elCount = 0
+                      });
+                      for (var n = 0,
+                               a = e.length; a > n; n++) {
+                        var o = e[n],
+                            r = o.zlevel,
+                            s = t[r];
+                        if (s) {
+                          if (s.elCount++, s.dirty) continue;
+                          s.dirty = o.__dirty
+                        }
+                      }
+                      this.eachBuildinLayer(function(e, t) {
+                        i[t] !== e.elCount && (e.dirty = !0)
+                      })
+                    },
+                    h.prototype.refreshShapes = function(e, t) {
+                      for (var i = 0,
+                               n = e.length; n > i; i++) {
+                        var a = e[i];
+                        a.modSelf()
+                      }
+                      return this.refresh(t),
+                          this
+                    },
+                    h.prototype.setLoadingEffect = function(e) {
+                      return this._loadingEffect = e,
+                          this
+                    },
+                    h.prototype.clear = function() {
+                      return this.eachBuildinLayer(this._clearLayer),
+                          this
+                    },
+                    h.prototype._clearLayer = function(e) {
+                      e.clear()
+                    },
+                    h.prototype.modLayer = function(e, t) {
+                      if (t) {
+                        this._layerConfig[e] ? o.merge(this._layerConfig[e], t, !0) : this._layerConfig[e] = t;
+                        var i = this._layers[e];
+                        i && o.merge(i, this._layerConfig[e], !0)
+                      }
+                    },
+                    h.prototype.delLayer = function(e) {
+                      var t = this._layers[e];
+                      t && (this.modLayer(e, {
+                        position: t.position,
+                        rotation: t.rotation,
+                        scale: t.scale
+                      }), t.dom.parentNode.removeChild(t.dom), delete this._layers[e], this._zlevelList.splice(o.indexOf(this._zlevelList, e), 1))
+                    },
+                    h.prototype.refreshHover = function() {
+                      this.clearHover();
+                      for (var e = this.storage.getHoverShapes(!0), t = 0, i = e.length; i > t; t++) this._brushHover(e[t]);
+                      var n = this._layers.hover.ctx;
+                      return n.flush && n.flush(),
+                          this.storage.delHover(),
+                          this
+                    },
+                    h.prototype.clearHover = function() {
+                      var e = this._layers.hover;
+                      return e && e.clear(),
+                          this
+                    },
+                    h.prototype.showLoading = function(e) {
+                      return this._loadingEffect && this._loadingEffect.stop(),
+                      e && this.setLoadingEffect(e),
+                          this._loadingEffect.start(this),
+                          this.loading = !0,
+                          this
+                    },
+                    h.prototype.hideLoading = function() {
+                      return this._loadingEffect.stop(),
+                          this.clearHover(),
+                          this.loading = !1,
+                          this
+                    },
+                    h.prototype.isLoading = function() {
+                      return this.loading
+                    },
+                    h.prototype.resize = function() {
+                      var e = this._domRoot;
+                      e.style.display = "none";
+                      var t = this._getWidth(),
+                          i = this._getHeight();
+                      if (e.style.display = "", this._width != t || i != this._height) {
+                        this._width = t,
+                            this._height = i,
+                            e.style.width = t + "px",
+                            e.style.height = i + "px";
+                        for (var n in this._layers) this._layers[n].resize(t, i);
+                        this.refresh(null, !0)
+                      }
+                      return this
+                    },
+                    h.prototype.clearLayer = function(e) {
+                      var t = this._layers[e];
+                      t && t.clear()
+                    },
+                    h.prototype.dispose = function() {
+                      this.isLoading() && this.hideLoading(),
+                          this.root.innerHTML = "",
+                          this.root = this.storage = this._domRoot = this._layers = null
+                    },
+                    h.prototype.getDomHover = function() {
+                      return this._layers.hover.dom
+                    },
+                    h.prototype.toDataURL = function(e, t, i) {
+                      if (window.G_vmlCanvasManager) return null;
+                      var n = new l("image", this);
+                      this._bgDom.appendChild(n.dom),
+                          n.initContext();
+                      var o = n.ctx;
+                      n.clearColor = t || "#fff",
+                          n.clear();
+                      var s = this;
+                      this.storage.iterShape(function(e) {
+                            if (!e.invisible && (!e.onbrush || e.onbrush && !e.onbrush(o, !1))) if (a.catchBrushException) try {
+                              e.brush(o, !1, s.refreshNextFrame)
+                            } catch(t) {
+                              r(t, "brush error of " + e.type, e)
+                            } else e.brush(o, !1, s.refreshNextFrame)
+                          },
+                          {
+                            normal: "up",
+                            update: !0
+                          });
+                      var h = n.dom.toDataURL(e, i);
+                      return o = null,
+                          this._bgDom.removeChild(n.dom),
+                          h
+                    },
+                    h.prototype.getWidth = function() {
+                      return this._width
+                    },
+                    h.prototype.getHeight = function() {
+                      return this._height
+                    },
+                    h.prototype._getWidth = function() {
+                      var e = this.root,
+                          t = e.currentStyle || document.defaultView.getComputedStyle(e);
+                      return ((e.clientWidth || parseInt(t.width, 10)) - parseInt(t.paddingLeft, 10) - parseInt(t.paddingRight, 10)).toFixed(0) - 0
+                    },
+                    h.prototype._getHeight = function() {
+                      var e = this.root,
+                          t = e.currentStyle || document.defaultView.getComputedStyle(e);
+                      return ((e.clientHeight || parseInt(t.height, 10)) - parseInt(t.paddingTop, 10) - parseInt(t.paddingBottom, 10)).toFixed(0) - 0
+                    },
+                    h.prototype._brushHover = function(e) {
+                      var t = this._layers.hover.ctx;
+                      if (!e.onbrush || e.onbrush && !e.onbrush(t, !0)) {
+                        var i = this.getLayer(e.zlevel);
+                        if (i.needTransform && (t.save(), i.setTransform(t)), a.catchBrushException) try {
+                          e.brush(t, !0, this.refreshNextFrame)
+                        } catch(n) {
+                          r(n, "hoverBrush error of " + e.type, e)
+                        } else e.brush(t, !0, this.refreshNextFrame);
+                        i.needTransform && t.restore()
+                      }
+                    },
+                    h.prototype._shapeToImage = function(t, i, n, a, o) {
+                      var r = document.createElement("canvas"),
+                          s = r.getContext("2d");
+                      r.style.width = n + "px",
+                          r.style.height = a + "px",
+                          r.setAttribute("width", n * o),
+                          r.setAttribute("height", a * o),
+                          s.clearRect(0, 0, n * o, a * o);
+                      var l = {
+                        position: i.position,
+                        rotation: i.rotation,
+                        scale: i.scale
+                      };
+                      i.position = [0, 0, 0],
+                          i.rotation = 0,
+                          i.scale = [1, 1],
+                      i && i.brush(s, !1);
+                      var h = e("./shape/Image"),
+                          m = new h({
+                            id: t,
+                            style: {
+                              x: 0,
+                              y: 0,
+                              image: r
+                            }
+                          });
+                      return null != l.position && (m.position = i.position = l.position),
+                      null != l.rotation && (m.rotation = i.rotation = l.rotation),
+                      null != l.scale && (m.scale = i.scale = l.scale),
+                          m
+                    },
+                    h.prototype._createShapeToImageProcessor = function() {
+                      if (window.G_vmlCanvasManager) return i;
+                      var e = this;
+                      return function(t, i, n, o) {
+                        return e._shapeToImage(t, i, n, o, a.devicePixelRatio)
+                      }
+                    },
+                    h
+              }),
+          i("zrender/Storage", ["require", "./tool/util", "./Group"],
+              function(e) {
+                "use strict";
+                function t(e, t) {
+                  return e.zlevel == t.zlevel ? e.z == t.z ? e.__renderidx - t.__renderidx: e.z - t.z: e.zlevel - t.zlevel
+                }
+                var i = e("./tool/util"),
+                    n = e("./Group"),
+                    a = {
+                      hover: !1,
+                      normal: "down",
+                      update: !1
+                    },
+                    o = function() {
+                      this._elements = {},
+                          this._hoverElements = [],
+                          this._roots = [],
+                          this._shapeList = [],
+                          this._shapeListOffset = 0
+                    };
+                return o.prototype.iterShape = function(e, t) {
+                  if (t || (t = a), t.hover) for (var i = 0,
+                                                      n = this._hoverElements.length; n > i; i++) {
+                    var o = this._hoverElements[i];
+                    if (o.updateTransform(), e(o)) return this
+                  }
+                  switch (t.update && this.updateShapeList(), t.normal) {
+                    case "down":
+                      for (var n = this._shapeList.length; n--;) if (e(this._shapeList[n])) return this;
+                      break;
+                    default:
+                      for (var i = 0,
+                               n = this._shapeList.length; n > i; i++) if (e(this._shapeList[i])) return this
+                  }
+                  return this
+                },
+                    o.prototype.getHoverShapes = function(e) {
+                      for (var i = [], n = 0, a = this._hoverElements.length; a > n; n++) {
+                        i.push(this._hoverElements[n]);
+                        var o = this._hoverElements[n].hoverConnect;
+                        if (o) {
+                          var r;
+                          o = o instanceof Array ? o: [o];
+                          for (var s = 0,
+                                   l = o.length; l > s; s++) r = o[s].id ? o[s] : this.get(o[s]),
+                          r && i.push(r)
+                        }
+                      }
+                      if (i.sort(t), e) for (var n = 0,
+                                                 a = i.length; a > n; n++) i[n].updateTransform();
+                      return i
+                    },
+                    o.prototype.getShapeList = function(e) {
+                      return e && this.updateShapeList(),
+                          this._shapeList
+                    },
+                    o.prototype.updateShapeList = function() {
+                      this._shapeListOffset = 0;
+                      for (var e = 0,
+                               i = this._roots.length; i > e; e++) {
+                        var n = this._roots[e];
+                        this._updateAndAddShape(n)
+                      }
+                      this._shapeList.length = this._shapeListOffset;
+                      for (var e = 0,
+                               i = this._shapeList.length; i > e; e++) this._shapeList[e].__renderidx = e;
+                      this._shapeList.sort(t)
+                    },
+                    o.prototype._updateAndAddShape = function(e, t) {
+                      if (!e.ignore) if (e.updateTransform(), e.clipShape && (e.clipShape.parent = e, e.clipShape.updateTransform(), t ? (t = t.slice(), t.push(e.clipShape)) : t = [e.clipShape]), "group" == e.type) {
+                        for (var i = 0; i < e._children.length; i++) {
+                          var n = e._children[i];
+                          n.__dirty = e.__dirty || n.__dirty,
+                              this._updateAndAddShape(n, t)
+                        }
+                        e.__dirty = !1
+                      } else e.__clipShapes = t,
+                          this._shapeList[this._shapeListOffset++] = e
+                    },
+                    o.prototype.mod = function(e, t) {
+                      if ("string" == typeof e && (e = this._elements[e]), e && (e.modSelf(), t)) if (t.parent || t._storage || t.__clipShapes) {
+                        var n = {};
+                        for (var a in t)"parent" !== a && "_storage" !== a && "__clipShapes" !== a && t.hasOwnProperty(a) && (n[a] = t[a]);
+                        i.merge(e, n, !0)
+                      } else i.merge(e, t, !0);
+                      return this
+                    },
+                    o.prototype.drift = function(e, t, i) {
+                      var n = this._elements[e];
+                      return n && (n.needTransform = !0, "horizontal" === n.draggable ? i = 0 : "vertical" === n.draggable && (t = 0), (!n.ondrift || n.ondrift && !n.ondrift(t, i)) && n.drift(t, i)),
+                          this
+                    },
+                    o.prototype.addHover = function(e) {
+                      return e.updateNeedTransform(),
+                          this._hoverElements.push(e),
+                          this
+                    },
+                    o.prototype.delHover = function() {
+                      return this._hoverElements = [],
+                          this
+                    },
+                    o.prototype.hasHoverShape = function() {
+                      return this._hoverElements.length > 0
+                    },
+                    o.prototype.addRoot = function(e) {
+                      this._elements[e.id] || (e instanceof n && e.addChildrenToStorage(this), this.addToMap(e), this._roots.push(e))
+                    },
+                    o.prototype.delRoot = function(e) {
+                      if ("undefined" == typeof e) {
+                        for (var t = 0; t < this._roots.length; t++) {
+                          var a = this._roots[t];
+                          a instanceof n && a.delChildrenFromStorage(this)
+                        }
+                        return this._elements = {},
+                            this._hoverElements = [],
+                            this._roots = [],
+                            this._shapeList = [],
+                            void(this._shapeListOffset = 0)
+                      }
+                      if (e instanceof Array) for (var t = 0,
+                                                       o = e.length; o > t; t++) this.delRoot(e[t]);
+                      else {
+                        var r;
+                        r = "string" == typeof e ? this._elements[e] : e;
+                        var s = i.indexOf(this._roots, r);
+                        s >= 0 && (this.delFromMap(r.id), this._roots.splice(s, 1), r instanceof n && r.delChildrenFromStorage(this))
+                      }
+                    },
+                    o.prototype.addToMap = function(e) {
+                      return e instanceof n && (e._storage = this),
+                          e.modSelf(),
+                          this._elements[e.id] = e,
+                          this
+                    },
+                    o.prototype.get = function(e) {
+                      return this._elements[e]
+                    },
+                    o.prototype.delFromMap = function(e) {
+                      var t = this._elements[e];
+                      return t && (delete this._elements[e], t instanceof n && (t._storage = null)),
+                          this
+                    },
+                    o.prototype.dispose = function() {
+                      this._elements = this._renderList = this._roots = this._hoverElements = null
+                    },
+                    o
+              }),
+          i("zrender/animation/Animation", ["require", "./Clip", "../tool/color", "../tool/util", "../tool/event"],
+              function(e) {
+                "use strict";
+                function t(e, t) {
+                  return e[t]
+                }
+                function i(e, t, i) {
+                  e[t] = i
+                }
+                function n(e, t, i) {
+                  return (t - e) * i + e
+                }
+                function a(e, t, i, a, o) {
+                  var r = e.length;
+                  if (1 == o) for (var s = 0; r > s; s++) a[s] = n(e[s], t[s], i);
+                  else for (var l = e[0].length, s = 0; r > s; s++) for (var h = 0; l > h; h++) a[s][h] = n(e[s][h], t[s][h], i)
+                }
+                function o(e) {
+                  switch (typeof e) {
+                    case "undefined":
+                    case "string":
+                      return ! 1
+                  }
+                  return "undefined" != typeof e.length
+                }
+                function r(e, t, i, n, a, o, r, l, h) {
+                  var m = e.length;
+                  if (1 == h) for (var V = 0; m > V; V++) l[V] = s(e[V], t[V], i[V], n[V], a, o, r);
+                  else for (var U = e[0].length, V = 0; m > V; V++) for (var d = 0; U > d; d++) l[V][d] = s(e[V][d], t[V][d], i[V][d], n[V][d], a, o, r)
+                }
+                function s(e, t, i, n, a, o, r) {
+                  var s = .5 * (i - e),
+                      l = .5 * (n - t);
+                  return (2 * (t - i) + s + l) * r + ( - 3 * (t - i) - 2 * s - l) * o + s * a + t
+                }
+                function l(e) {
+                  if (o(e)) {
+                    var t = e.length;
+                    if (o(e[0])) {
+                      for (var i = [], n = 0; t > n; n++) i.push(c.call(e[n]));
+                      return i
+                    }
+                    return c.call(e)
+                  }
+                  return e
+                }
+                function h(e) {
+                  return e[0] = Math.floor(e[0]),
+                      e[1] = Math.floor(e[1]),
+                      e[2] = Math.floor(e[2]),
+                  "rgba(" + e.join(",") + ")"
+                }
+                var m = e("./Clip"),
+                    V = e("../tool/color"),
+                    U = e("../tool/util"),
+                    d = e("../tool/event").Dispatcher,
+                    p = window.requestAnimationFrame || window.msRequestAnimationFrame || window.mozRequestAnimationFrame || window.webkitRequestAnimationFrame ||
+                        function(e) {
+                          setTimeout(e, 16)
+                        },
+                    c = Array.prototype.slice,
+                    u = function(e) {
+                      e = e || {},
+                          this.stage = e.stage || {},
+                          this.onframe = e.onframe ||
+                              function() {},
+                          this._clips = [],
+                          this._running = !1,
+                          this._time = 0,
+                          d.call(this)
+                    };
+                u.prototype = {
+                  add: function(e) {
+                    this._clips.push(e)
+                  },
+                  remove: function(e) {
+                    if (e.__inStep) e.__needsRemove = !0;
+                    else {
+                      var t = U.indexOf(this._clips, e);
+                      t >= 0 && this._clips.splice(t, 1)
+                    }
+                  },
+                  _update: function() {
+                    for (var e = (new Date).getTime(), t = e - this._time, i = this._clips, n = i.length, a = [], o = [], r = 0; n > r; r++) {
+                      var s = i[r];
+                      s.__inStep = !0;
+                      var l = s.step(e);
+                      s.__inStep = !1,
+                      l && (a.push(l), o.push(s))
+                    }
+                    for (var r = 0; n > r;) i[r].__needsRemove ? (i[r] = i[n - 1], i.pop(), n--) : r++;
+                    n = a.length;
+                    for (var r = 0; n > r; r++) o[r].fire(a[r]);
+                    this._time = e,
+                        this.onframe(t),
+                        this.dispatch("frame", t),
+                    this.stage.update && this.stage.update()
+                  },
+                  start: function() {
+                    function e() {
+                      t._running && (p(e), t._update())
+                    }
+                    var t = this;
+                    this._running = !0,
+                        this._time = (new Date).getTime(),
+                        p(e)
+                  },
+                  stop: function() {
+                    this._running = !1
+                  },
+                  clear: function() {
+                    this._clips = []
+                  },
+                  animate: function(e, t) {
+                    t = t || {};
+                    var i = new y(e, t.loop, t.getter, t.setter);
+                    return i.animation = this,
+                        i
+                  },
+                  constructor: u
+                },
+                    U.merge(u.prototype, d.prototype, !0);
+                var y = function(e, n, a, o) {
+                  this._tracks = {},
+                      this._target = e,
+                      this._loop = n || !1,
+                      this._getter = a || t,
+                      this._setter = o || i,
+                      this._clipCount = 0,
+                      this._delay = 0,
+                      this._doneList = [],
+                      this._onframeList = [],
+                      this._clipList = []
+                };
+                return y.prototype = {
+                  when: function(e, t) {
+                    for (var i in t) this._tracks[i] || (this._tracks[i] = [], 0 !== e && this._tracks[i].push({
+                      time: 0,
+                      value: l(this._getter(this._target, i))
+                    })),
+                        this._tracks[i].push({
+                          time: parseInt(e, 10),
+                          value: t[i]
+                        });
+                    return this
+                  },
+                  during: function(e) {
+                    return this._onframeList.push(e),
+                        this
+                  },
+                  start: function(e) {
+                    var t = this,
+                        i = this._setter,
+                        l = this._getter,
+                        U = "spline" === e,
+                        d = function() {
+                          if (t._clipCount--, 0 === t._clipCount) {
+                            t._tracks = {};
+                            for (var e = t._doneList.length,
+                                     i = 0; e > i; i++) t._doneList[i].call(t)
+                          }
+                        },
+                        p = function(p, c) {
+                          var u = p.length;
+                          if (u) {
+                            var y = p[0].value,
+                                g = o(y),
+                                b = !1,
+                                f = g && o(y[0]) ? 2 : 1;
+                            p.sort(function(e, t) {
+                              return e.time - t.time
+                            });
+                            var k;
+                            if (u) {
+                              k = p[u - 1].time;
+                              for (var x = [], _ = [], L = 0; u > L; L++) {
+                                x.push(p[L].time / k);
+                                var W = p[L].value;
+                                "string" == typeof W && (W = V.toArray(W), 0 === W.length && (W[0] = W[1] = W[2] = 0, W[3] = 1), b = !0),
+                                    _.push(W)
+                              }
+                              var X, L, v, w, K, I, J, C = 0,
+                                  S = 0;
+                              if (b) var E = [0, 0, 0, 0];
+                              var F = function(e, o) {
+                                    if (S > o) {
+                                      for (X = Math.min(C + 1, u - 1), L = X; L >= 0 && !(x[L] <= o); L--);
+                                      L = Math.min(L, u - 2)
+                                    } else {
+                                      for (L = C; u > L && !(x[L] > o); L++);
+                                      L = Math.min(L - 1, u - 2)
+                                    }
+                                    C = L,
+                                        S = o;
+                                    var m = x[L + 1] - x[L];
+                                    if (0 !== m) {
+                                      if (v = (o - x[L]) / m, U) if (K = _[L], w = _[0 === L ? L: L - 1], I = _[L > u - 2 ? u - 1 : L + 1], J = _[L > u - 3 ? u - 1 : L + 2], g) r(w, K, I, J, v, v * v, v * v * v, l(e, c), f);
+                                      else {
+                                        var V;
+                                        b ? (V = r(w, K, I, J, v, v * v, v * v * v, E, 1), V = h(E)) : V = s(w, K, I, J, v, v * v, v * v * v),
+                                            i(e, c, V)
+                                      } else if (g) a(_[L], _[L + 1], v, l(e, c), f);
+                                      else {
+                                        var V;
+                                        b ? (a(_[L], _[L + 1], v, E, 1), V = h(E)) : V = n(_[L], _[L + 1], v),
+                                            i(e, c, V)
+                                      }
+                                      for (L = 0; L < t._onframeList.length; L++) t._onframeList[L](e, o)
+                                    }
+                                  },
+                                  T = new m({
+                                    target: t._target,
+                                    life: k,
+                                    loop: t._loop,
+                                    delay: t._delay,
+                                    onframe: F,
+                                    ondestroy: d
+                                  });
+                              e && "spline" !== e && (T.easing = e),
+                                  t._clipList.push(T),
+                                  t._clipCount++,
+                                  t.animation.add(T)
+                            }
+                          }
+                        };
+                    for (var c in this._tracks) p(this._tracks[c], c);
+                    return this
+                  },
+                  stop: function() {
+                    for (var e = 0; e < this._clipList.length; e++) {
+                      var t = this._clipList[e];
+                      this.animation.remove(t)
+                    }
+                    this._clipList = []
+                  },
+                  delay: function(e) {
+                    return this._delay = e,
+                        this
+                  },
+                  done: function(e) {
+                    return e && this._doneList.push(e),
+                        this
+                  }
+                },
+                    u
+              }),
+          i("zrender/tool/vector", [],
+              function() {
+                var e = "undefined" == typeof Float32Array ? Array: Float32Array,
+                    t = {
+                      create: function(t, i) {
+                        var n = new e(2);
+                        return n[0] = t || 0,
+                            n[1] = i || 0,
+                            n
+                      },
+                      copy: function(e, t) {
+                        return e[0] = t[0],
+                            e[1] = t[1],
+                            e
+                      },
+                      clone: function(t) {
+                        var i = new e(2);
+                        return i[0] = t[0],
+                            i[1] = t[1],
+                            i
+                      },
+                      set: function(e, t, i) {
+                        return e[0] = t,
+                            e[1] = i,
+                            e
+                      },
+                      add: function(e, t, i) {
+                        return e[0] = t[0] + i[0],
+                            e[1] = t[1] + i[1],
+                            e
+                      },
+                      scaleAndAdd: function(e, t, i, n) {
+                        return e[0] = t[0] + i[0] * n,
+                            e[1] = t[1] + i[1] * n,
+                            e
+                      },
+                      sub: function(e, t, i) {
+                        return e[0] = t[0] - i[0],
+                            e[1] = t[1] - i[1],
+                            e
+                      },
+                      len: function(e) {
+                        return Math.sqrt(this.lenSquare(e))
+                      },
+                      lenSquare: function(e) {
+                        return e[0] * e[0] + e[1] * e[1]
+                      },
+                      mul: function(e, t, i) {
+                        return e[0] = t[0] * i[0],
+                            e[1] = t[1] * i[1],
+                            e
+                      },
+                      div: function(e, t, i) {
+                        return e[0] = t[0] / i[0],
+                            e[1] = t[1] / i[1],
+                            e
+                      },
+                      dot: function(e, t) {
+                        return e[0] * t[0] + e[1] * t[1]
+                      },
+                      scale: function(e, t, i) {
+                        return e[0] = t[0] * i,
+                            e[1] = t[1] * i,
+                            e
+                      },
+                      normalize: function(e, i) {
+                        var n = t.len(i);
+                        return 0 === n ? (e[0] = 0, e[1] = 0) : (e[0] = i[0] / n, e[1] = i[1] / n),
+                            e
+                      },
+                      distance: function(e, t) {
+                        return Math.sqrt((e[0] - t[0]) * (e[0] - t[0]) + (e[1] - t[1]) * (e[1] - t[1]))
+                      },
+                      distanceSquare: function(e, t) {
+                        return (e[0] - t[0]) * (e[0] - t[0]) + (e[1] - t[1]) * (e[1] - t[1])
+                      },
+                      negate: function(e, t) {
+                        return e[0] = -t[0],
+                            e[1] = -t[1],
+                            e
+                      },
+                      lerp: function(e, t, i, n) {
+                        return e[0] = t[0] + n * (i[0] - t[0]),
+                            e[1] = t[1] + n * (i[1] - t[1]),
+                            e
+                      },
+                      applyTransform: function(e, t, i) {
+                        var n = t[0],
+                            a = t[1];
+                        return e[0] = i[0] * n + i[2] * a + i[4],
+                            e[1] = i[1] * n + i[3] * a + i[5],
+                            e
+                      },
+                      min: function(e, t, i) {
+                        return e[0] = Math.min(t[0], i[0]),
+                            e[1] = Math.min(t[1], i[1]),
+                            e
+                      },
+                      max: function(e, t, i) {
+                        return e[0] = Math.max(t[0], i[0]),
+                            e[1] = Math.max(t[1], i[1]),
+                            e
+                      }
+                    };
+                return t.length = t.len,
+                    t.lengthSquare = t.lenSquare,
+                    t.dist = t.distance,
+                    t.distSquare = t.distanceSquare,
+                    t
+              }),
+          i("zrender/tool/matrix", [],
+              function() {
+                var e = "undefined" == typeof Float32Array ? Array: Float32Array,
+                    t = {
+                      create: function() {
+                        var i = new e(6);
+                        return t.identity(i),
+                            i
+                      },
+                      identity: function(e) {
+                        return e[0] = 1,
+                            e[1] = 0,
+                            e[2] = 0,
+                            e[3] = 1,
+                            e[4] = 0,
+                            e[5] = 0,
+                            e
+                      },
+                      copy: function(e, t) {
+                        return e[0] = t[0],
+                            e[1] = t[1],
+                            e[2] = t[2],
+                            e[3] = t[3],
+                            e[4] = t[4],
+                            e[5] = t[5],
+                            e
+                      },
+                      mul: function(e, t, i) {
+                        return e[0] = t[0] * i[0] + t[2] * i[1],
+                            e[1] = t[1] * i[0] + t[3] * i[1],
+                            e[2] = t[0] * i[2] + t[2] * i[3],
+                            e[3] = t[1] * i[2] + t[3] * i[3],
+                            e[4] = t[0] * i[4] + t[2] * i[5] + t[4],
+                            e[5] = t[1] * i[4] + t[3] * i[5] + t[5],
+                            e
+                      },
+                      translate: function(e, t, i) {
+                        return e[0] = t[0],
+                            e[1] = t[1],
+                            e[2] = t[2],
+                            e[3] = t[3],
+                            e[4] = t[4] + i[0],
+                            e[5] = t[5] + i[1],
+                            e
+                      },
+                      rotate: function(e, t, i) {
+                        var n = t[0],
+                            a = t[2],
+                            o = t[4],
+                            r = t[1],
+                            s = t[3],
+                            l = t[5],
+                            h = Math.sin(i),
+                            m = Math.cos(i);
+                        return e[0] = n * m + r * h,
+                            e[1] = -n * h + r * m,
+                            e[2] = a * m + s * h,
+                            e[3] = -a * h + m * s,
+                            e[4] = m * o + h * l,
+                            e[5] = m * l - h * o,
+                            e
+                      },
+                      scale: function(e, t, i) {
+                        var n = i[0],
+                            a = i[1];
+                        return e[0] = t[0] * n,
+                            e[1] = t[1] * a,
+                            e[2] = t[2] * n,
+                            e[3] = t[3] * a,
+                            e[4] = t[4] * n,
+                            e[5] = t[5] * a,
+                            e
+                      },
+                      invert: function(e, t) {
+                        var i = t[0],
+                            n = t[2],
+                            a = t[4],
+                            o = t[1],
+                            r = t[3],
+                            s = t[5],
+                            l = i * r - o * n;
+                        return l ? (l = 1 / l, e[0] = r * l, e[1] = -o * l, e[2] = -n * l, e[3] = i * l, e[4] = (n * s - r * a) * l, e[5] = (o * a - i * s) * l, e) : null
+                      }
+                    };
+                return t
+              }),
+          i("zrender/loadingEffect/Base", ["require", "../tool/util", "../shape/Text", "../shape/Rectangle"],
+              function(e) {
+                function t(e) {
+                  this.setOptions(e)
+                }
+                var i = e("../tool/util"),
+                    n = e("../shape/Text"),
+                    a = e("../shape/Rectangle"),
+                    o = "Loading...",
+                    r = "normal 16px Arial";
+                return t.prototype.createTextShape = function(e) {
+                  return new n({
+                    highlightStyle: i.merge({
+                          x: this.canvasWidth / 2,
+                          y: this.canvasHeight / 2,
+                          text: o,
+                          textAlign: "center",
+                          textBaseline: "middle",
+                          textFont: r,
+                          color: "#333",
+                          brushType: "fill"
+                        },
+                        e, !0)
+                  })
+                },
+                    t.prototype.createBackgroundShape = function(e) {
+                      return new a({
+                        highlightStyle: {
+                          x: 0,
+                          y: 0,
+                          width: this.canvasWidth,
+                          height: this.canvasHeight,
+                          brushType: "fill",
+                          color: e
+                        }
+                      })
+                    },
+                    t.prototype.start = function(e) {
+                      function t(t) {
+                        e.storage.addHover(t)
+                      }
+                      function i() {
+                        e.refreshHover()
+                      }
+                      this.canvasWidth = e._width,
+                          this.canvasHeight = e._height,
+                          this.loadingTimer = this._start(t, i)
+                    },
+                    t.prototype._start = function() {
+                      return setInterval(function() {},
+                          1e4)
+                    },
+                    t.prototype.stop = function() {
+                      clearInterval(this.loadingTimer)
+                    },
+                    t.prototype.setOptions = function(e) {
+                      this.options = e || {}
+                    },
+                    t.prototype.adjust = function(e, t) {
+                      return e <= t[0] ? e = t[0] : e >= t[1] && (e = t[1]),
+                          e
+                    },
+                    t.prototype.getLocation = function(e, t, i) {
+                      var n = null != e.x ? e.x: "center";
+                      switch (n) {
+                        case "center":
+                          n = Math.floor((this.canvasWidth - t) / 2);
+                          break;
+                        case "left":
+                          n = 0;
+                          break;
+                        case "right":
+                          n = this.canvasWidth - t
+                      }
+                      var a = null != e.y ? e.y: "center";
+                      switch (a) {
+                        case "center":
+                          a = Math.floor((this.canvasHeight - i) / 2);
+                          break;
+                        case "top":
+                          a = 0;
+                          break;
+                        case "bottom":
+                          a = this.canvasHeight - i
+                      }
+                      return {
+                        x: n,
+                        y: a,
+                        width: t,
+                        height: i
+                      }
+                    },
+                    t
+              }),
+          i("zrender/Layer", ["require", "./mixin/Transformable", "./tool/util", "./config"],
+              function(e) {
+                function t() {
+                  return ! 1
+                }
+                function i(e, t, i) {
+                  var n = document.createElement(t),
+                      a = i.getWidth(),
+                      o = i.getHeight();
+                  return n.style.position = "absolute",
+                      n.style.left = 0,
+                      n.style.top = 0,
+                      n.style.width = a + "px",
+                      n.style.height = o + "px",
+                      n.width = a * r.devicePixelRatio,
+                      n.height = o * r.devicePixelRatio,
+                      n.setAttribute("data-zr-dom-id", e),
+                      n
+                }
+                var n = e("./mixin/Transformable"),
+                    a = e("./tool/util"),
+                    o = window.G_vmlCanvasManager,
+                    r = e("./config"),
+                    s = function(e, a) {
+                      this.id = e,
+                          this.dom = i(e, "canvas", a),
+                          this.dom.onselectstart = t,
+                          this.dom.style["-webkit-user-select"] = "none",
+                          this.dom.style["user-select"] = "none",
+                          this.dom.style["-webkit-touch-callout"] = "none",
+                          this.dom.style["-webkit-tap-highlight-color"] = "rgba(0,0,0,0)",
+                          this.dom.className = r.elementClassName,
+                      o && o.initElement(this.dom),
+                          this.domBack = null,
+                          this.ctxBack = null,
+                          this.painter = a,
+                          this.unusedCount = 0,
+                          this.config = null,
+                          this.dirty = !0,
+                          this.elCount = 0,
+                          this.clearColor = 0,
+                          this.motionBlur = !1,
+                          this.lastFrameAlpha = .7,
+                          this.zoomable = !1,
+                          this.panable = !1,
+                          this.maxZoom = 1 / 0,
+                          this.minZoom = 0,
+                          n.call(this)
+                    };
+                return s.prototype.initContext = function() {
+                  this.ctx = this.dom.getContext("2d");
+                  var e = r.devicePixelRatio;
+                  1 != e && this.ctx.scale(e, e)
+                },
+                    s.prototype.createBackBuffer = function() {
+                      if (!o) {
+                        this.domBack = i("back-" + this.id, "canvas", this.painter),
+                            this.ctxBack = this.domBack.getContext("2d");
+                        var e = r.devicePixelRatio;
+                        1 != e && this.ctxBack.scale(e, e)
+                      }
+                    },
+                    s.prototype.resize = function(e, t) {
+                      var i = r.devicePixelRatio;
+                      this.dom.style.width = e + "px",
+                          this.dom.style.height = t + "px",
+                          this.dom.setAttribute("width", e * i),
+                          this.dom.setAttribute("height", t * i),
+                      1 != i && this.ctx.scale(i, i),
+                      this.domBack && (this.domBack.setAttribute("width", e * i), this.domBack.setAttribute("height", t * i), 1 != i && this.ctxBack.scale(i, i))
+                    },
+                    s.prototype.clear = function() {
+                      var e = this.dom,
+                          t = this.ctx,
+                          i = e.width,
+                          n = e.height,
+                          a = this.clearColor && !o,
+                          s = this.motionBlur && !o,
+                          l = this.lastFrameAlpha,
+                          h = r.devicePixelRatio;
+                      if (s && (this.domBack || this.createBackBuffer(), this.ctxBack.globalCompositeOperation = "copy", this.ctxBack.drawImage(e, 0, 0, i / h, n / h)), t.clearRect(0, 0, i / h, n / h), a && (t.save(), t.fillStyle = this.clearColor, t.fillRect(0, 0, i / h, n / h), t.restore()), s) {
+                        var m = this.domBack;
+                        t.save(),
+                            t.globalAlpha = l,
+                            t.drawImage(m, 0, 0, i / h, n / h),
+                            t.restore()
+                      }
+                    },
+                    a.merge(s.prototype, n.prototype),
+                    s
+              }),
+          i("zrender/shape/Text", ["require", "../tool/area", "./Base", "../tool/util"],
+              function(e) {
+                var t = e("../tool/area"),
+                    i = e("./Base"),
+                    n = function(e) {
+                      i.call(this, e)
+                    };
+                return n.prototype = {
+                  type: "text",
+                  brush: function(e, i) {
+                    var n = this.style;
+                    if (i && (n = this.getHighlightStyle(n, this.highlightStyle || {})), "undefined" != typeof n.text && n.text !== !1) {
+                      e.save(),
+                          this.doClip(e),
+                          this.setContext(e, n),
+                          this.setTransform(e),
+                      n.textFont && (e.font = n.textFont),
+                          e.textAlign = n.textAlign || "start",
+                          e.textBaseline = n.textBaseline || "middle";
+                      var a, o = (n.text + "").split("\n"),
+                          r = t.getTextHeight("国", n.textFont),
+                          s = this.getRect(n),
+                          l = n.x;
+                      a = "top" == n.textBaseline ? s.y: "bottom" == n.textBaseline ? s.y + r: s.y + r / 2;
+                      for (var h = 0,
+                               m = o.length; m > h; h++) {
+                        if (n.maxWidth) switch (n.brushType) {
+                          case "fill":
+                            e.fillText(o[h], l, a, n.maxWidth);
+                            break;
+                          case "stroke":
+                            e.strokeText(o[h], l, a, n.maxWidth);
+                            break;
+                          case "both":
+                            e.fillText(o[h], l, a, n.maxWidth),
+                                e.strokeText(o[h], l, a, n.maxWidth);
+                            break;
+                          default:
+                            e.fillText(o[h], l, a, n.maxWidth)
+                        } else switch (n.brushType) {
+                          case "fill":
+                            e.fillText(o[h], l, a);
+                            break;
+                          case "stroke":
+                            e.strokeText(o[h], l, a);
+                            break;
+                          case "both":
+                            e.fillText(o[h], l, a),
+                                e.strokeText(o[h], l, a);
+                            break;
+                          default:
+                            e.fillText(o[h], l, a)
+                        }
+                        a += r
+                      }
+                      e.restore()
+                    }
+                  },
+                  getRect: function(e) {
+                    if (e.__rect) return e.__rect;
+                    var i = t.getTextWidth(e.text, e.textFont),
+                        n = t.getTextHeight(e.text, e.textFont),
+                        a = e.x;
+                    "end" == e.textAlign || "right" == e.textAlign ? a -= i: "center" == e.textAlign && (a -= i / 2);
+                    var o;
+                    return o = "top" == e.textBaseline ? e.y: "bottom" == e.textBaseline ? e.y - n: e.y - n / 2,
+                        e.__rect = {
+                          x: a,
+                          y: o,
+                          width: i,
+                          height: n
+                        },
+                        e.__rect
+                  }
+                },
+                    e("../tool/util").inherits(n, i),
+                    n
+              }),
+          i("zrender/shape/Rectangle", ["require", "./Base", "../tool/util"],
+              function(e) {
+                var t = e("./Base"),
+                    i = function(e) {
+                      t.call(this, e)
+                    };
+                return i.prototype = {
+                  type: "rectangle",
+                  _buildRadiusPath: function(e, t) {
+                    var i, n, a, o, r = t.x,
+                        s = t.y,
+                        l = t.width,
+                        h = t.height,
+                        m = t.radius;
+                    "number" == typeof m ? i = n = a = o = m: m instanceof Array ? 1 === m.length ? i = n = a = o = m[0] : 2 === m.length ? (i = a = m[0], n = o = m[1]) : 3 === m.length ? (i = m[0], n = o = m[1], a = m[2]) : (i = m[0], n = m[1], a = m[2], o = m[3]) : i = n = a = o = 0;
+                    var V;
+                    i + n > l && (V = i + n, i *= l / V, n *= l / V),
+                    a + o > l && (V = a + o, a *= l / V, o *= l / V),
+                    n + a > h && (V = n + a, n *= h / V, a *= h / V),
+                    i + o > h && (V = i + o, i *= h / V, o *= h / V),
+                        e.moveTo(r + i, s),
+                        e.lineTo(r + l - n, s),
+                    0 !== n && e.quadraticCurveTo(r + l, s, r + l, s + n),
+                        e.lineTo(r + l, s + h - a),
+                    0 !== a && e.quadraticCurveTo(r + l, s + h, r + l - a, s + h),
+                        e.lineTo(r + o, s + h),
+                    0 !== o && e.quadraticCurveTo(r, s + h, r, s + h - o),
+                        e.lineTo(r, s + i),
+                    0 !== i && e.quadraticCurveTo(r, s, r + i, s)
+                  },
+                  buildPath: function(e, t) {
+                    t.radius ? this._buildRadiusPath(e, t) : (e.moveTo(t.x, t.y), e.lineTo(t.x + t.width, t.y), e.lineTo(t.x + t.width, t.y + t.height), e.lineTo(t.x, t.y + t.height), e.lineTo(t.x, t.y)),
+                        e.closePath()
+                  },
+                  getRect: function(e) {
+                    if (e.__rect) return e.__rect;
+                    var t;
+                    return t = "stroke" == e.brushType || "fill" == e.brushType ? e.lineWidth || 1 : 0,
+                        e.__rect = {
+                          x: Math.round(e.x - t / 2),
+                          y: Math.round(e.y - t / 2),
+                          width: e.width + t,
+                          height: e.height + t
+                        },
+                        e.__rect
+                  }
+                },
+                    e("../tool/util").inherits(i, t),
+                    i
+              }),
+          i("zrender/tool/area", ["require", "./util", "./curve"],
+              function(e) {
+                "use strict";
+                function t(e) {
+                  return e %= C,
+                  0 > e && (e += C),
+                      e
+                }
+                function i(e, t, i, o) {
+                  if (!t || !e) return ! 1;
+                  var r = e.type;
+                  L = L || W.getContext();
+                  var s = n(e, t, i, o);
+                  if ("undefined" != typeof s) return s;
+                  if (e.buildPath && L.isPointInPath) return a(e, L, t, i, o);
+                  switch (r) {
+                    case "ellipse":
+                      return ! 0;
+                    case "trochoid":
+                      var l = "out" == t.location ? t.r1 + t.r2 + t.d: t.r1 - t.r2 + t.d;
+                      return d(t, i, o, l);
+                    case "rose":
+                      return d(t, i, o, t.maxr);
+                    default:
+                      return ! 1
+                  }
+                }
+                function n(e, t, i, n) {
+                  var a = e.type;
+                  switch (a) {
+                    case "bezier-curve":
+                      return "undefined" == typeof t.cpX2 ? l(t.xStart, t.yStart, t.cpX1, t.cpY1, t.xEnd, t.yEnd, t.lineWidth, i, n) : s(t.xStart, t.yStart, t.cpX1, t.cpY1, t.cpX2, t.cpY2, t.xEnd, t.yEnd, t.lineWidth, i, n);
+                    case "line":
+                      return r(t.xStart, t.yStart, t.xEnd, t.yEnd, t.lineWidth, i, n);
+                    case "polyline":
+                      return m(t.pointList, t.lineWidth, i, n);
+                    case "ring":
+                      return V(t.x, t.y, t.r0, t.r, i, n);
+                    case "circle":
+                      return d(t.x, t.y, t.r, i, n);
+                    case "sector":
+                      var o = t.startAngle * Math.PI / 180,
+                          h = t.endAngle * Math.PI / 180;
+                      return t.clockWise || (o = -o, h = -h),
+                          p(t.x, t.y, t.r0, t.r, o, h, !t.clockWise, i, n);
+                    case "path":
+                      return t.pathArray && k(t.pathArray, Math.max(t.lineWidth, 5), t.brushType, i, n);
+                    case "polygon":
+                    case "star":
+                    case "isogon":
+                      return c(t.pointList, i, n);
+                    case "text":
+                      var u = t.__rect || e.getRect(t);
+                      return U(u.x, u.y, u.width, u.height, i, n);
+                    case "rectangle":
+                    case "image":
+                      return U(t.x, t.y, t.width, t.height, i, n)
+                  }
+                }
+                function a(e, t, i, n, a) {
+                  return t.beginPath(),
+                      e.buildPath(t, i),
+                      t.closePath(),
+                      t.isPointInPath(n, a)
+                }
+                function o(e, t, n, a) {
+                  return ! i(e, t, n, a)
+                }
+                function r(e, t, i, n, a, o, r) {
+                  if (0 === a) return ! 1;
+                  var s = Math.max(a, 5),
+                      l = 0,
+                      h = e;
+                  if (r > t + s && r > n + s || t - s > r && n - s > r || o > e + s && o > i + s || e - s > o && i - s > o) return ! 1;
+                  if (e === i) return Math.abs(o - e) <= s / 2;
+                  l = (t - n) / (e - i),
+                      h = (e * n - i * t) / (e - i);
+                  var m = l * o - r + h,
+                      V = m * m / (l * l + 1);
+                  return s / 2 * s / 2 >= V
+                }
+                function s(e, t, i, n, a, o, r, s, l, h, m) {
+                  if (0 === l) return ! 1;
+                  var V = Math.max(l, 5);
+                  if (m > t + V && m > n + V && m > o + V && m > s + V || t - V > m && n - V > m && o - V > m && s - V > m || h > e + V && h > i + V && h > a + V && h > r + V || e - V > h && i - V > h && a - V > h && r - V > h) return ! 1;
+                  var U = X.cubicProjectPoint(e, t, i, n, a, o, r, s, h, m, null);
+                  return V / 2 >= U
+                }
+                function l(e, t, i, n, a, o, r, s, l) {
+                  if (0 === r) return ! 1;
+                  var h = Math.max(r, 5);
+                  if (l > t + h && l > n + h && l > o + h || t - h > l && n - h > l && o - h > l || s > e + h && s > i + h && s > a + h || e - h > s && i - h > s && a - h > s) return ! 1;
+                  var m = X.quadraticProjectPoint(e, t, i, n, a, o, s, l, null);
+                  return h / 2 >= m
+                }
+                function h(e, i, n, a, o, r, s, l, h) {
+                  if (0 === s) return ! 1;
+                  var m = Math.max(s, 5);
+                  l -= e,
+                      h -= i;
+                  var V = Math.sqrt(l * l + h * h);
+                  if (V - m > n || n > V + m) return ! 1;
+                  if (Math.abs(a - o) >= C) return ! 0;
+                  if (r) {
+                    var U = a;
+                    a = t(o),
+                        o = t(U)
+                  } else a = t(a),
+                      o = t(o);
+                  a > o && (o += C);
+                  var d = Math.atan2(h, l);
+                  return 0 > d && (d += C),
+                  d >= a && o >= d || d + C >= a && o >= d + C
+                }
+                function m(e, t, i, n) {
+                  for (var t = Math.max(t, 10), a = 0, o = e.length - 1; o > a; a++) {
+                    var s = e[a][0],
+                        l = e[a][1],
+                        h = e[a + 1][0],
+                        m = e[a + 1][1];
+                    if (r(s, l, h, m, t, i, n)) return ! 0
+                  }
+                  return ! 1
+                }
+                function V(e, t, i, n, a, o) {
+                  var r = (a - e) * (a - e) + (o - t) * (o - t);
+                  return n * n > r && r > i * i
+                }
+                function U(e, t, i, n, a, o) {
+                  return a >= e && e + i >= a && o >= t && t + n >= o
+                }
+                function d(e, t, i, n, a) {
+                  return i * i > (n - e) * (n - e) + (a - t) * (a - t)
+                }
+                function p(e, t, i, n, a, o, r, s, l) {
+                  return h(e, t, (i + n) / 2, a, o, r, n - i, s, l)
+                }
+                function c(e, t, i) {
+                  for (var n = e.length,
+                           a = 0,
+                           o = 0,
+                           r = n - 1; n > o; o++) {
+                    var s = e[r][0],
+                        l = e[r][1],
+                        h = e[o][0],
+                        m = e[o][1];
+                    a += u(s, l, h, m, t, i),
+                        r = o
+                  }
+                  return 0 !== a
+                }
+                function u(e, t, i, n, a, o) {
+                  if (o > t && o > n || t > o && n > o) return 0;
+                  if (n == t) return 0;
+                  var r = t > n ? 1 : -1,
+                      s = (o - t) / (n - t),
+                      l = s * (i - e) + e;
+                  return l > a ? r: 0
+                }
+                function y() {
+                  var e = E[0];
+                  E[0] = E[1],
+                      E[1] = e
+                }
+                function g(e, t, i, n, a, o, r, s, l, h) {
+                  if (h > t && h > n && h > o && h > s || t > h && n > h && o > h && s > h) return 0;
+                  var m = X.cubicRootAt(t, n, o, s, h, S);
+                  if (0 === m) return 0;
+                  for (var V, U, d = 0,
+                           p = -1,
+                           c = 0; m > c; c++) {
+                    var u = S[c],
+                        g = X.cubicAt(e, i, a, r, u);
+                    l > g || (0 > p && (p = X.cubicExtrema(t, n, o, s, E), E[1] < E[0] && p > 1 && y(), V = X.cubicAt(t, n, o, s, E[0]), p > 1 && (U = X.cubicAt(t, n, o, s, E[1]))), d += 2 == p ? u < E[0] ? t > V ? 1 : -1 : u < E[1] ? V > U ? 1 : -1 : U > s ? 1 : -1 : u < E[0] ? t > V ? 1 : -1 : V > s ? 1 : -1)
+                  }
+                  return d
+                }
+                function b(e, t, i, n, a, o, r, s) {
+                  if (s > t && s > n && s > o || t > s && n > s && o > s) return 0;
+                  var l = X.quadraticRootAt(t, n, o, s, S);
+                  if (0 === l) return 0;
+                  var h = X.quadraticExtremum(t, n, o);
+                  if (h >= 0 && 1 >= h) {
+                    for (var m = 0,
+                             V = X.quadraticAt(t, n, o, h), U = 0; l > U; U++) {
+                      var d = X.quadraticAt(e, i, a, S[U]);
+                      r > d || (m += S[U] < h ? t > V ? 1 : -1 : V > o ? 1 : -1)
+                    }
+                    return m
+                  }
+                  var d = X.quadraticAt(e, i, a, S[0]);
+                  return r > d ? 0 : t > o ? 1 : -1
+                }
+                function f(e, i, n, a, o, r, s, l) {
+                  if (l -= i, l > n || -n > l) return 0;
+                  var h = Math.sqrt(n * n - l * l);
+                  if (S[0] = -h, S[1] = h, Math.abs(a - o) >= C) {
+                    a = 0,
+                        o = C;
+                    var m = r ? 1 : -1;
+                    return s >= S[0] + e && s <= S[1] + e ? m: 0
+                  }
+                  if (r) {
+                    var h = a;
+                    a = t(o),
+                        o = t(h)
+                  } else a = t(a),
+                      o = t(o);
+                  a > o && (o += C);
+                  for (var V = 0,
+                           U = 0; 2 > U; U++) {
+                    var d = S[U];
+                    if (d + e > s) {
+                      var p = Math.atan2(l, d),
+                          m = r ? 1 : -1;
+                      0 > p && (p = C + p),
+                      (p >= a && o >= p || p + C >= a && o >= p + C) && (p > Math.PI / 2 && p < 1.5 * Math.PI && (m = -m), V += m)
+                    }
+                  }
+                  return V
+                }
+                function k(e, t, i, n, a) {
+                  var o = 0,
+                      m = 0,
+                      V = 0,
+                      U = 0,
+                      d = 0,
+                      p = !0,
+                      c = !0;
+                  i = i || "fill";
+                  for (var y = "stroke" === i || "both" === i,
+                           k = "fill" === i || "both" === i,
+                           x = 0; x < e.length; x++) {
+                    var _ = e[x],
+                        L = _.points;
+                    if (p || "M" === _.command) {
+                      if (x > 0 && (k && (o += u(m, V, U, d, n, a)), 0 !== o)) return ! 0;
+                      U = L[L.length - 2],
+                          d = L[L.length - 1],
+                          p = !1,
+                      c && "A" !== _.command && (c = !1, m = U, V = d)
+                    }
+                    switch (_.command) {
+                      case "M":
+                        m = L[0],
+                            V = L[1];
+                        break;
+                      case "L":
+                        if (y && r(m, V, L[0], L[1], t, n, a)) return ! 0;
+                        k && (o += u(m, V, L[0], L[1], n, a)),
+                            m = L[0],
+                            V = L[1];
+                        break;
+                      case "C":
+                        if (y && s(m, V, L[0], L[1], L[2], L[3], L[4], L[5], t, n, a)) return ! 0;
+                        k && (o += g(m, V, L[0], L[1], L[2], L[3], L[4], L[5], n, a)),
+                            m = L[4],
+                            V = L[5];
+                        break;
+                      case "Q":
+                        if (y && l(m, V, L[0], L[1], L[2], L[3], t, n, a)) return ! 0;
+                        k && (o += b(m, V, L[0], L[1], L[2], L[3], n, a)),
+                            m = L[2],
+                            V = L[3];
+                        break;
+                      case "A":
+                        var W = L[0],
+                            X = L[1],
+                            v = L[2],
+                            w = L[3],
+                            K = L[4],
+                            I = L[5],
+                            J = Math.cos(K) * v + W,
+                            C = Math.sin(K) * w + X;
+                        c ? (c = !1, U = J, d = C) : o += u(m, V, J, C);
+                        var S = (n - W) * w / v + W;
+                        if (y && h(W, X, w, K, K + I, 1 - L[7], t, S, a)) return ! 0;
+                        k && (o += f(W, X, w, K, K + I, 1 - L[7], S, a)),
+                            m = Math.cos(K + I) * v + W,
+                            V = Math.sin(K + I) * w + X;
+                        break;
+                      case "z":
+                        if (y && r(m, V, U, d, t, n, a)) return ! 0;
+                        p = !0
+                    }
+                  }
+                  return k && (o += u(m, V, U, d, n, a)),
+                  0 !== o
+                }
+                function x(e, t) {
+                  var i = e + ":" + t;
+                  if (v[i]) return v[i];
+                  L = L || W.getContext(),
+                      L.save(),
+                  t && (L.font = t),
+                      e = (e + "").split("\n");
+                  for (var n = 0,
+                           a = 0,
+                           o = e.length; o > a; a++) n = Math.max(L.measureText(e[a]).width, n);
+                  return L.restore(),
+                      v[i] = n,
+                  ++K > J && (K = 0, v = {}),
+                      n
+                }
+                function _(e, t) {
+                  var i = e + ":" + t;
+                  if (w[i]) return w[i];
+                  L = L || W.getContext(),
+                      L.save(),
+                  t && (L.font = t),
+                      e = (e + "").split("\n");
+                  var n = (L.measureText("国").width + 2) * e.length;
+                  return L.restore(),
+                      w[i] = n,
+                  ++I > J && (I = 0, w = {}),
+                      n
+                }
+                var L, W = e("./util"),
+                    X = e("./curve"),
+                    v = {},
+                    w = {},
+                    K = 0,
+                    I = 0,
+                    J = 5e3,
+                    C = 2 * Math.PI,
+                    S = [ - 1, -1, -1],
+                    E = [ - 1, -1];
+                return {
+                  isInside: i,
+                  isOutside: o,
+                  getTextWidth: x,
+                  getTextHeight: _,
+                  isInsidePath: k,
+                  isInsidePolygon: c,
+                  isInsideSector: p,
+                  isInsideCircle: d,
+                  isInsideLine: r,
+                  isInsideRect: U,
+                  isInsidePolyline: m,
+                  isInsideCubicStroke: s,
+                  isInsideQuadraticStroke: l
+                }
+              }),
+          i("zrender/shape/Base", ["require", "../tool/matrix", "../tool/guid", "../tool/util", "../tool/log", "../mixin/Transformable", "../mixin/Eventful", "../tool/area", "../tool/color"],
+              function(e) {
+                function t(t, n, a, o, r, s, l) {
+                  r && (t.font = r),
+                      t.textAlign = s,
+                      t.textBaseline = l;
+                  var h = i(n, a, o, r, s, l);
+                  n = (n + "").split("\n");
+                  var m = e("../tool/area").getTextHeight("国", r);
+                  switch (l) {
+                    case "top":
+                      o = h.y;
+                      break;
+                    case "bottom":
+                      o = h.y + m;
+                      break;
+                    default:
+                      o = h.y + m / 2
+                  }
+                  for (var V = 0,
+                           U = n.length; U > V; V++) t.fillText(n[V], a, o),
+                      o += m
+                }
+                function i(t, i, n, a, o, r) {
+                  var s = e("../tool/area"),
+                      l = s.getTextWidth(t, a),
+                      h = s.getTextHeight("国", a);
+                  switch (t = (t + "").split("\n"), o) {
+                    case "end":
+                    case "right":
+                      i -= l;
+                      break;
+                    case "center":
+                      i -= l / 2
+                  }
+                  switch (r) {
+                    case "top":
+                      break;
+                    case "bottom":
+                      n -= h * t.length;
+                      break;
+                    default:
+                      n -= h * t.length / 2
+                  }
+                  return {
+                    x: i,
+                    y: n,
+                    width: l,
+                    height: h * t.length
+                  }
+                }
+                var n = window.G_vmlCanvasManager,
+                    a = e("../tool/matrix"),
+                    o = e("../tool/guid"),
+                    r = e("../tool/util"),
+                    s = e("../tool/log"),
+                    l = e("../mixin/Transformable"),
+                    h = e("../mixin/Eventful"),
+                    m = function(e) {
+                      e = e || {},
+                          this.id = e.id || o();
+                      for (var t in e) this[t] = e[t];
+                      this.style = this.style || {},
+                          this.highlightStyle = this.highlightStyle || null,
+                          this.parent = null,
+                          this.__dirty = !0,
+                          this.__clipShapes = [],
+                          l.call(this),
+                          h.call(this)
+                    };
+                m.prototype.invisible = !1,
+                    m.prototype.ignore = !1,
+                    m.prototype.zlevel = 0,
+                    m.prototype.draggable = !1,
+                    m.prototype.clickable = !1,
+                    m.prototype.hoverable = !0,
+                    m.prototype.z = 0,
+                    m.prototype.brush = function(e, t) {
+                      var i = this.beforeBrush(e, t);
+                      switch (e.beginPath(), this.buildPath(e, i), i.brushType) {
+                        case "both":
+                          e.fill();
+                        case "stroke":
+                          i.lineWidth > 0 && e.stroke();
+                          break;
+                        default:
+                          e.fill()
+                      }
+                      this.drawText(e, i, this.style),
+                          this.afterBrush(e)
+                    },
+                    m.prototype.beforeBrush = function(e, t) {
+                      var i = this.style;
+                      return this.brushTypeOnly && (i.brushType = this.brushTypeOnly),
+                      t && (i = this.getHighlightStyle(i, this.highlightStyle || {},
+                          this.brushTypeOnly)),
+                      "stroke" == this.brushTypeOnly && (i.strokeColor = i.strokeColor || i.color),
+                          e.save(),
+                          this.doClip(e),
+                          this.setContext(e, i),
+                          this.setTransform(e),
+                          i
+                    },
+                    m.prototype.afterBrush = function(e) {
+                      e.restore()
+                    };
+                var V = [["color", "fillStyle"], ["strokeColor", "strokeStyle"], ["opacity", "globalAlpha"], ["lineCap", "lineCap"], ["lineJoin", "lineJoin"], ["miterLimit", "miterLimit"], ["lineWidth", "lineWidth"], ["shadowBlur", "shadowBlur"], ["shadowColor", "shadowColor"], ["shadowOffsetX", "shadowOffsetX"], ["shadowOffsetY", "shadowOffsetY"]];
+                m.prototype.setContext = function(e, t) {
+                  for (var i = 0,
+                           n = V.length; n > i; i++) {
+                    var a = V[i][0],
+                        o = t[a],
+                        r = V[i][1];
+                    "undefined" != typeof o && (e[r] = o)
+                  }
+                };
+                var U = a.create();
+                return m.prototype.doClip = function(e) {
+                  if (this.__clipShapes && !n) for (var t = 0; t < this.__clipShapes.length; t++) {
+                    var i = this.__clipShapes[t];
+                    if (i.needTransform) {
+                      var o = i.transform;
+                      a.invert(U, o),
+                          e.transform(o[0], o[1], o[2], o[3], o[4], o[5])
+                    }
+                    if (e.beginPath(), i.buildPath(e, i.style), e.clip(), i.needTransform) {
+                      var o = U;
+                      e.transform(o[0], o[1], o[2], o[3], o[4], o[5])
+                    }
+                  }
+                },
+                    m.prototype.getHighlightStyle = function(t, i, n) {
+                      var a = {};
+                      for (var o in t) a[o] = t[o];
+                      var r = e("../tool/color"),
+                          s = r.getHighlightColor();
+                      "stroke" != t.brushType ? (a.strokeColor = s, a.lineWidth = (t.lineWidth || 1) + this.getHighlightZoom(), a.brushType = "both") : "stroke" != n ? (a.strokeColor = s, a.lineWidth = (t.lineWidth || 1) + this.getHighlightZoom()) : a.strokeColor = i.strokeColor || r.mix(t.strokeColor, r.toRGB(s));
+                      for (var o in i)"undefined" != typeof i[o] && (a[o] = i[o]);
+                      return a
+                    },
+                    m.prototype.getHighlightZoom = function() {
+                      return "text" != this.type ? 6 : 2
+                    },
+                    m.prototype.drift = function(e, t) {
+                      this.position[0] += e,
+                          this.position[1] += t
+                    },
+                    m.prototype.buildPath = function() {
+                      s("buildPath not implemented in " + this.type)
+                    },
+                    m.prototype.getRect = function() {
+                      s("getRect not implemented in " + this.type)
+                    },
+                    m.prototype.isCover = function(t, i) {
+                      var n = this.transformCoordToLocal(t, i);
+                      return t = n[0],
+                          i = n[1],
+                          this.isCoverRect(t, i) ? e("../tool/area").isInside(this, this.style, t, i) : !1
+                    },
+                    m.prototype.isCoverRect = function(e, t) {
+                      var i = this.style.__rect;
+                      return i || (i = this.style.__rect = this.getRect(this.style)),
+                      e >= i.x && e <= i.x + i.width && t >= i.y && t <= i.y + i.height
+                    },
+                    m.prototype.drawText = function(e, i, n) {
+                      if ("undefined" != typeof i.text && i.text !== !1) {
+                        var a = i.textColor || i.color || i.strokeColor;
+                        e.fillStyle = a;
+                        var o, r, s, l, h = 10,
+                            m = i.textPosition || this.textPosition || "top";
+                        switch (m) {
+                          case "inside":
+                          case "top":
+                          case "bottom":
+                          case "left":
+                          case "right":
+                            if (this.getRect) {
+                              var V = (n || i).__rect || this.getRect(n || i);
+                              switch (m) {
+                                case "inside":
+                                  s = V.x + V.width / 2,
+                                      l = V.y + V.height / 2,
+                                      o = "center",
+                                      r = "middle",
+                                  "stroke" != i.brushType && a == i.color && (e.fillStyle = "#fff");
+                                  break;
+                                case "left":
+                                  s = V.x - h,
+                                      l = V.y + V.height / 2,
+                                      o = "end",
+                                      r = "middle";
+                                  break;
+                                case "right":
+                                  s = V.x + V.width + h,
+                                      l = V.y + V.height / 2,
+                                      o = "start",
+                                      r = "middle";
+                                  break;
+                                case "top":
+                                  s = V.x + V.width / 2,
+                                      l = V.y - h,
+                                      o = "center",
+                                      r = "bottom";
+                                  break;
+                                case "bottom":
+                                  s = V.x + V.width / 2,
+                                      l = V.y + V.height + h,
+                                      o = "center",
+                                      r = "top"
+                              }
+                            }
+                            break;
+                          case "start":
+                          case "end":
+                            var U = i.pointList || [[i.xStart || 0, i.yStart || 0], [i.xEnd || 0, i.yEnd || 0]],
+                                d = U.length;
+                            if (2 > d) return;
+                            var p, c, u, y;
+                            switch (m) {
+                              case "start":
+                                p = U[1][0],
+                                    c = U[0][0],
+                                    u = U[1][1],
+                                    y = U[0][1];
+                                break;
+                              case "end":
+                                p = U[d - 2][0],
+                                    c = U[d - 1][0],
+                                    u = U[d - 2][1],
+                                    y = U[d - 1][1]
+                            }
+                            s = c,
+                                l = y;
+                            var g = Math.atan((u - y) / (c - p)) / Math.PI * 180;
+                            0 > c - p ? g += 180 : 0 > u - y && (g += 360),
+                                h = 5,
+                                g >= 30 && 150 >= g ? (o = "center", r = "bottom", l -= h) : g > 150 && 210 > g ? (o = "right", r = "middle", s -= h) : g >= 210 && 330 >= g ? (o = "center", r = "top", l += h) : (o = "left", r = "middle", s += h);
+                            break;
+                          case "specific":
+                            s = i.textX || 0,
+                                l = i.textY || 0,
+                                o = "start",
+                                r = "middle"
+                        }
+                        null != s && null != l && t(e, i.text, s, l, i.textFont, i.textAlign || o, i.textBaseline || r)
+                      }
+                    },
+                    m.prototype.modSelf = function() {
+                      this.__dirty = !0,
+                      this.style && (this.style.__rect = null),
+                      this.highlightStyle && (this.highlightStyle.__rect = null)
+                    },
+                    m.prototype.isSilent = function() {
+                      return ! (this.hoverable || this.draggable || this.clickable || this.onmousemove || this.onmouseover || this.onmouseout || this.onmousedown || this.onmouseup || this.onclick || this.ondragenter || this.ondragover || this.ondragleave || this.ondrop)
+                    },
+                    r.merge(m.prototype, l.prototype, !0),
+                    r.merge(m.prototype, h.prototype, !0),
+                    m
+              }),
+          i("zrender/tool/curve", ["require", "./vector"],
+              function(e) {
+                function t(e) {
+                  return e > -u && u > e
+                }
+                function i(e) {
+                  return e > u || -u > e
+                }
+                function n(e, t, i, n, a) {
+                  var o = 1 - a;
+                  return o * o * (o * e + 3 * a * t) + a * a * (a * n + 3 * o * i)
+                }
+                function a(e, t, i, n, a) {
+                  var o = 1 - a;
+                  return 3 * (((t - e) * o + 2 * (i - t) * a) * o + (n - i) * a * a)
+                }
+                function o(e, i, n, a, o, r) {
+                  var s = a + 3 * (i - n) - e,
+                      l = 3 * (n - 2 * i + e),
+                      h = 3 * (i - e),
+                      m = e - o,
+                      V = l * l - 3 * s * h,
+                      U = l * h - 9 * s * m,
+                      d = h * h - 3 * l * m,
+                      p = 0;
+                  if (t(V) && t(U)) if (t(l)) r[0] = 0;
+                  else {
+                    var c = -h / l;
+                    c >= 0 && 1 >= c && (r[p++] = c)
+                  } else {
+                    var u = U * U - 4 * V * d;
+                    if (t(u)) {
+                      var b = U / V,
+                          c = -l / s + b,
+                          f = -b / 2;
+                      c >= 0 && 1 >= c && (r[p++] = c),
+                      f >= 0 && 1 >= f && (r[p++] = f)
+                    } else if (u > 0) {
+                      var k = Math.sqrt(u),
+                          x = V * l + 1.5 * s * ( - U + k),
+                          _ = V * l + 1.5 * s * ( - U - k);
+                      x = 0 > x ? -Math.pow( - x, g) : Math.pow(x, g),
+                          _ = 0 > _ ? -Math.pow( - _, g) : Math.pow(_, g);
+                      var c = ( - l - (x + _)) / (3 * s);
+                      c >= 0 && 1 >= c && (r[p++] = c)
+                    } else {
+                      var L = (2 * V * l - 3 * s * U) / (2 * Math.sqrt(V * V * V)),
+                          W = Math.acos(L) / 3,
+                          X = Math.sqrt(V),
+                          v = Math.cos(W),
+                          c = ( - l - 2 * X * v) / (3 * s),
+                          f = ( - l + X * (v + y * Math.sin(W))) / (3 * s),
+                          w = ( - l + X * (v - y * Math.sin(W))) / (3 * s);
+                      c >= 0 && 1 >= c && (r[p++] = c),
+                      f >= 0 && 1 >= f && (r[p++] = f),
+                      w >= 0 && 1 >= w && (r[p++] = w)
+                    }
+                  }
+                  return p
+                }
+                function r(e, n, a, o, r) {
+                  var s = 6 * a - 12 * n + 6 * e,
+                      l = 9 * n + 3 * o - 3 * e - 9 * a,
+                      h = 3 * n - 3 * e,
+                      m = 0;
+                  if (t(l)) {
+                    if (i(s)) {
+                      var V = -h / s;
+                      V >= 0 && 1 >= V && (r[m++] = V)
+                    }
+                  } else {
+                    var U = s * s - 4 * l * h;
+                    if (t(U)) r[0] = -s / (2 * l);
+                    else if (U > 0) {
+                      var d = Math.sqrt(U),
+                          V = ( - s + d) / (2 * l),
+                          p = ( - s - d) / (2 * l);
+                      V >= 0 && 1 >= V && (r[m++] = V),
+                      p >= 0 && 1 >= p && (r[m++] = p)
+                    }
+                  }
+                  return m
+                }
+                function s(e, t, i, n, a, o) {
+                  var r = (t - e) * a + e,
+                      s = (i - t) * a + t,
+                      l = (n - i) * a + i,
+                      h = (s - r) * a + r,
+                      m = (l - s) * a + s,
+                      V = (m - h) * a + h;
+                  o[0] = e,
+                      o[1] = r,
+                      o[2] = h,
+                      o[3] = V,
+                      o[4] = V,
+                      o[5] = m,
+                      o[6] = l,
+                      o[7] = n
+                }
+                function l(e, t, i, a, o, r, s, l, h, m, V) {
+                  var U, d = .005,
+                      p = 1 / 0;
+                  b[0] = h,
+                      b[1] = m;
+                  for (var y = 0; 1 > y; y += .05) {
+                    f[0] = n(e, i, o, s, y),
+                        f[1] = n(t, a, r, l, y);
+                    var g = c.distSquare(b, f);
+                    p > g && (U = y, p = g)
+                  }
+                  p = 1 / 0;
+                  for (var x = 0; 32 > x && !(u > d); x++) {
+                    var _ = U - d,
+                        L = U + d;
+                    f[0] = n(e, i, o, s, _),
+                        f[1] = n(t, a, r, l, _);
+                    var g = c.distSquare(f, b);
+                    if (_ >= 0 && p > g) U = _,
+                        p = g;
+                    else {
+                      k[0] = n(e, i, o, s, L),
+                          k[1] = n(t, a, r, l, L);
+                      var W = c.distSquare(k, b);
+                      1 >= L && p > W ? (U = L, p = W) : d *= .5
+                    }
+                  }
+                  return V && (V[0] = n(e, i, o, s, U), V[1] = n(t, a, r, l, U)),
+                      Math.sqrt(p)
+                }
+                function h(e, t, i, n) {
+                  var a = 1 - n;
+                  return a * (a * e + 2 * n * t) + n * n * i
+                }
+                function m(e, t, i, n) {
+                  return 2 * ((1 - n) * (t - e) + n * (i - t))
+                }
+                function V(e, n, a, o, r) {
+                  var s = e - 2 * n + a,
+                      l = 2 * (n - e),
+                      h = e - o,
+                      m = 0;
+                  if (t(s)) {
+                    if (i(l)) {
+                      var V = -h / l;
+                      V >= 0 && 1 >= V && (r[m++] = V)
+                    }
+                  } else {
+                    var U = l * l - 4 * s * h;
+                    if (t(U)) {
+                      var V = -l / (2 * s);
+                      V >= 0 && 1 >= V && (r[m++] = V)
+                    } else if (U > 0) {
+                      var d = Math.sqrt(U),
+                          V = ( - l + d) / (2 * s),
+                          p = ( - l - d) / (2 * s);
+                      V >= 0 && 1 >= V && (r[m++] = V),
+                      p >= 0 && 1 >= p && (r[m++] = p)
+                    }
+                  }
+                  return m
+                }
+                function U(e, t, i) {
+                  var n = e + i - 2 * t;
+                  return 0 === n ? .5 : (e - t) / n
+                }
+                function d(e, t, i, n, a) {
+                  var o = (t - e) * n + e,
+                      r = (i - t) * n + t,
+                      s = (r - o) * n + o;
+                  a[0] = e,
+                      a[1] = o,
+                      a[2] = s,
+                      a[3] = s,
+                      a[4] = r,
+                      a[5] = i
+                }
+                function p(e, t, i, n, a, o, r, s, l) {
+                  var m, V = .005,
+                      U = 1 / 0;
+                  b[0] = r,
+                      b[1] = s;
+                  for (var d = 0; 1 > d; d += .05) {
+                    f[0] = h(e, i, a, d),
+                        f[1] = h(t, n, o, d);
+                    var p = c.distSquare(b, f);
+                    U > p && (m = d, U = p)
+                  }
+                  U = 1 / 0;
+                  for (var y = 0; 32 > y && !(u > V); y++) {
+                    var g = m - V,
+                        x = m + V;
+                    f[0] = h(e, i, a, g),
+                        f[1] = h(t, n, o, g);
+                    var p = c.distSquare(f, b);
+                    if (g >= 0 && U > p) m = g,
+                        U = p;
+                    else {
+                      k[0] = h(e, i, a, x),
+                          k[1] = h(t, n, o, x);
+                      var _ = c.distSquare(k, b);
+                      1 >= x && U > _ ? (m = x, U = _) : V *= .5
+                    }
+                  }
+                  return l && (l[0] = h(e, i, a, m), l[1] = h(t, n, o, m)),
+                      Math.sqrt(U)
+                }
+                var c = e("./vector"),
+                    u = 1e-4,
+                    y = Math.sqrt(3),
+                    g = 1 / 3,
+                    b = c.create(),
+                    f = c.create(),
+                    k = c.create();
+                return {
+                  cubicAt: n,
+                  cubicDerivativeAt: a,
+                  cubicRootAt: o,
+                  cubicExtrema: r,
+                  cubicSubdivide: s,
+                  cubicProjectPoint: l,
+                  quadraticAt: h,
+                  quadraticDerivativeAt: m,
+                  quadraticRootAt: V,
+                  quadraticExtremum: U,
+                  quadraticSubdivide: d,
+                  quadraticProjectPoint: p
+                }
+              }),
+          i("zrender/mixin/Transformable", ["require", "../tool/matrix", "../tool/vector"],
+              function(e) {
+                "use strict";
+                function t(e) {
+                  return e > -s && s > e
+                }
+                function i(e) {
+                  return e > s || -s > e
+                }
+                var n = e("../tool/matrix"),
+                    a = e("../tool/vector"),
+                    o = [0, 0],
+                    r = n.translate,
+                    s = 5e-5,
+                    l = function() {
+                      this.position || (this.position = [0, 0]),
+                      "undefined" == typeof this.rotation && (this.rotation = [0, 0, 0]),
+                      this.scale || (this.scale = [1, 1, 0, 0]),
+                          this.needLocalTransform = !1,
+                          this.needTransform = !1
+                    };
+                return l.prototype = {
+                  constructor: l,
+                  updateNeedTransform: function() {
+                    this.needLocalTransform = i(this.rotation[0]) || i(this.position[0]) || i(this.position[1]) || i(this.scale[0] - 1) || i(this.scale[1] - 1)
+                  },
+                  updateTransform: function() {
+                    this.updateNeedTransform();
+                    var e = this.parent && this.parent.needTransform;
+                    if (this.needTransform = this.needLocalTransform || e, this.needTransform) {
+                      var t = this.transform || n.create();
+                      if (n.identity(t), this.needLocalTransform) {
+                        var a = this.scale;
+                        if (i(a[0]) || i(a[1])) {
+                          o[0] = -a[2] || 0,
+                              o[1] = -a[3] || 0;
+                          var s = i(o[0]) || i(o[1]);
+                          s && r(t, t, o),
+                              n.scale(t, t, a),
+                          s && (o[0] = -o[0], o[1] = -o[1], r(t, t, o))
+                        }
+                        if (this.rotation instanceof Array) {
+                          if (0 !== this.rotation[0]) {
+                            o[0] = -this.rotation[1] || 0,
+                                o[1] = -this.rotation[2] || 0;
+                            var s = i(o[0]) || i(o[1]);
+                            s && r(t, t, o),
+                                n.rotate(t, t, this.rotation[0]),
+                            s && (o[0] = -o[0], o[1] = -o[1], r(t, t, o))
+                          }
+                        } else 0 !== this.rotation && n.rotate(t, t, this.rotation); (i(this.position[0]) || i(this.position[1])) && r(t, t, this.position)
+                      }
+                      e && (this.needLocalTransform ? n.mul(t, this.parent.transform, t) : n.copy(t, this.parent.transform)),
+                          this.transform = t,
+                          this.invTransform = this.invTransform || n.create(),
+                          n.invert(this.invTransform, t)
+                    }
+                  },
+                  setTransform: function(e) {
+                    if (this.needTransform) {
+                      var t = this.transform;
+                      e.transform(t[0], t[1], t[2], t[3], t[4], t[5])
+                    }
+                  },
+                  lookAt: function() {
+                    var e = a.create();
+                    return function(i) {
+                      this.transform || (this.transform = n.create());
+                      var o = this.transform;
+                      if (a.sub(e, i, this.position), !t(e[0]) || !t(e[1])) {
+                        a.normalize(e, e);
+                        var r = this.scale;
+                        o[2] = e[0] * r[1],
+                            o[3] = e[1] * r[1],
+                            o[0] = e[1] * r[0],
+                            o[1] = -e[0] * r[0],
+                            o[4] = this.position[0],
+                            o[5] = this.position[1],
+                            this.decomposeTransform()
+                      }
+                    }
+                  } (),
+                  decomposeTransform: function() {
+                    if (this.transform) {
+                      var e = this.transform,
+                          t = e[0] * e[0] + e[1] * e[1],
+                          n = this.position,
+                          a = this.scale,
+                          o = this.rotation;
+                      i(t - 1) && (t = Math.sqrt(t));
+                      var r = e[2] * e[2] + e[3] * e[3];
+                      i(r - 1) && (r = Math.sqrt(r)),
+                          n[0] = e[4],
+                          n[1] = e[5],
+                          a[0] = t,
+                          a[1] = r,
+                          a[2] = a[3] = 0,
+                          o[0] = Math.atan2( - e[1] / r, e[0] / t),
+                          o[1] = o[2] = 0
+                    }
+                  },
+                  transformCoordToLocal: function(e, t) {
+                    var i = [e, t];
+                    return this.needTransform && this.invTransform && a.applyTransform(i, i, this.invTransform),
+                        i
+                  }
+                },
+                    l
+              }),
+          i("zrender/Group", ["require", "./tool/guid", "./tool/util", "./mixin/Transformable", "./mixin/Eventful"],
+              function(e) {
+                var t = e("./tool/guid"),
+                    i = e("./tool/util"),
+                    n = e("./mixin/Transformable"),
+                    a = e("./mixin/Eventful"),
+                    o = function(e) {
+                      e = e || {},
+                          this.id = e.id || t();
+                      for (var i in e) this[i] = e[i];
+                      this.type = "group",
+                          this.clipShape = null,
+                          this._children = [],
+                          this._storage = null,
+                          this.__dirty = !0,
+                          n.call(this),
+                          a.call(this)
+                    };
+                return o.prototype.ignore = !1,
+                    o.prototype.children = function() {
+                      return this._children.slice()
+                    },
+                    o.prototype.childAt = function(e) {
+                      return this._children[e]
+                    },
+                    o.prototype.addChild = function(e) {
+                      e != this && e.parent != this && (e.parent && e.parent.removeChild(e), this._children.push(e), e.parent = this, this._storage && this._storage !== e._storage && (this._storage.addToMap(e), e instanceof o && e.addChildrenToStorage(this._storage)))
+                    },
+                    o.prototype.removeChild = function(e) {
+                      var t = i.indexOf(this._children, e);
+                      t >= 0 && this._children.splice(t, 1),
+                          e.parent = null,
+                      this._storage && (this._storage.delFromMap(e.id), e instanceof o && e.delChildrenFromStorage(this._storage))
+                    },
+                    o.prototype.clearChildren = function() {
+                      for (var e = 0; e < this._children.length; e++) {
+                        var t = this._children[e];
+                        this._storage && (this._storage.delFromMap(t.id), t instanceof o && t.delChildrenFromStorage(this._storage))
+                      }
+                      this._children.length = 0
+                    },
+                    o.prototype.eachChild = function(e, t) {
+                      for (var i = !!t,
+                               n = 0; n < this._children.length; n++) {
+                        var a = this._children[n];
+                        i ? e.call(t, a) : e(a)
+                      }
+                    },
+                    o.prototype.traverse = function(e, t) {
+                      for (var i = !!t,
+                               n = 0; n < this._children.length; n++) {
+                        var a = this._children[n];
+                        i ? e.call(t, a) : e(a),
+                        "group" === a.type && a.traverse(e, t)
+                      }
+                    },
+                    o.prototype.addChildrenToStorage = function(e) {
+                      for (var t = 0; t < this._children.length; t++) {
+                        var i = this._children[t];
+                        e.addToMap(i),
+                        i instanceof o && i.addChildrenToStorage(e)
+                      }
+                    },
+                    o.prototype.delChildrenFromStorage = function(e) {
+                      for (var t = 0; t < this._children.length; t++) {
+                        var i = this._children[t];
+                        e.delFromMap(i.id),
+                        i instanceof o && i.delChildrenFromStorage(e)
+                      }
+                    },
+                    o.prototype.modSelf = function() {
+                      this.__dirty = !0
+                    },
+                    i.merge(o.prototype, n.prototype, !0),
+                    i.merge(o.prototype, a.prototype, !0),
+                    o
+              }),
+          i("zrender/animation/Clip", ["require", "./easing"],
+              function(e) {
+                function t(e) {
+                  this._targetPool = e.target || {},
+                  this._targetPool instanceof Array || (this._targetPool = [this._targetPool]),
+                      this._life = e.life || 1e3,
+                      this._delay = e.delay || 0,
+                      this._startTime = (new Date).getTime() + this._delay,
+                      this._endTime = this._startTime + 1e3 * this._life,
+                      this.loop = "undefined" == typeof e.loop ? !1 : e.loop,
+                      this.gap = e.gap || 0,
+                      this.easing = e.easing || "Linear",
+                      this.onframe = e.onframe,
+                      this.ondestroy = e.ondestroy,
+                      this.onrestart = e.onrestart
+                }
+                var i = e("./easing");
+                return t.prototype = {
+                  step: function(e) {
+                    var t = (e - this._startTime) / this._life;
+                    if (! (0 > t)) {
+                      t = Math.min(t, 1);
+                      var n = "string" == typeof this.easing ? i[this.easing] : this.easing,
+                          a = "function" == typeof n ? n(t) : t;
+                      return this.fire("frame", a),
+                          1 == t ? this.loop ? (this.restart(), "restart") : (this.__needsRemove = !0, "destroy") : null
+                    }
+                  },
+                  restart: function() {
+                    var e = (new Date).getTime(),
+                        t = (e - this._startTime) % this._life;
+                    this._startTime = (new Date).getTime() - t + this.gap,
+                        this.__needsRemove = !1
+                  },
+                  fire: function(e, t) {
+                    for (var i = 0,
+                             n = this._targetPool.length; n > i; i++) this["on" + e] && this["on" + e](this._targetPool[i], t)
+                  },
+                  constructor: t
+                },
+                    t
+              }),
+          i("zrender/animation/easing", [],
+              function() {
+                var e = {
+                  Linear: function(e) {
+                    return e
+                  },
+                  QuadraticIn: function(e) {
+                    return e * e
+                  },
+                  QuadraticOut: function(e) {
+                    return e * (2 - e)
+                  },
+                  QuadraticInOut: function(e) {
+                    return (e *= 2) < 1 ? .5 * e * e: -.5 * (--e * (e - 2) - 1)
+                  },
+                  CubicIn: function(e) {
+                    return e * e * e
+                  },
+                  CubicOut: function(e) {
+                    return--e * e * e + 1
+                  },
+                  CubicInOut: function(e) {
+                    return (e *= 2) < 1 ? .5 * e * e * e: .5 * ((e -= 2) * e * e + 2)
+                  },
+                  QuarticIn: function(e) {
+                    return e * e * e * e
+                  },
+                  QuarticOut: function(e) {
+                    return 1 - --e * e * e * e
+                  },
+                  QuarticInOut: function(e) {
+                    return (e *= 2) < 1 ? .5 * e * e * e * e: -.5 * ((e -= 2) * e * e * e - 2)
+                  },
+                  QuinticIn: function(e) {
+                    return e * e * e * e * e
+                  },
+                  QuinticOut: function(e) {
+                    return--e * e * e * e * e + 1
+                  },
+                  QuinticInOut: function(e) {
+                    return (e *= 2) < 1 ? .5 * e * e * e * e * e: .5 * ((e -= 2) * e * e * e * e + 2)
+                  },
+                  SinusoidalIn: function(e) {
+                    return 1 - Math.cos(e * Math.PI / 2)
+                  },
+                  SinusoidalOut: function(e) {
+                    return Math.sin(e * Math.PI / 2)
+                  },
+                  SinusoidalInOut: function(e) {
+                    return.5 * (1 - Math.cos(Math.PI * e))
+                  },
+                  ExponentialIn: function(e) {
+                    return 0 === e ? 0 : Math.pow(1024, e - 1)
+                  },
+                  ExponentialOut: function(e) {
+                    return 1 === e ? 1 : 1 - Math.pow(2, -10 * e)
+                  },
+                  ExponentialInOut: function(e) {
+                    return 0 === e ? 0 : 1 === e ? 1 : (e *= 2) < 1 ? .5 * Math.pow(1024, e - 1) : .5 * ( - Math.pow(2, -10 * (e - 1)) + 2)
+                  },
+                  CircularIn: function(e) {
+                    return 1 - Math.sqrt(1 - e * e)
+                  },
+                  CircularOut: function(e) {
+                    return Math.sqrt(1 - --e * e)
+                  },
+                  CircularInOut: function(e) {
+                    return (e *= 2) < 1 ? -.5 * (Math.sqrt(1 - e * e) - 1) : .5 * (Math.sqrt(1 - (e -= 2) * e) + 1)
+                  },
+                  ElasticIn: function(e) {
+                    var t, i = .1,
+                        n = .4;
+                    return 0 === e ? 0 : 1 === e ? 1 : (!i || 1 > i ? (i = 1, t = n / 4) : t = n * Math.asin(1 / i) / (2 * Math.PI), -(i * Math.pow(2, 10 * (e -= 1)) * Math.sin(2 * (e - t) * Math.PI / n)))
+                  },
+                  ElasticOut: function(e) {
+                    var t, i = .1,
+                        n = .4;
+                    return 0 === e ? 0 : 1 === e ? 1 : (!i || 1 > i ? (i = 1, t = n / 4) : t = n * Math.asin(1 / i) / (2 * Math.PI), i * Math.pow(2, -10 * e) * Math.sin(2 * (e - t) * Math.PI / n) + 1)
+                  },
+                  ElasticInOut: function(e) {
+                    var t, i = .1,
+                        n = .4;
+                    return 0 === e ? 0 : 1 === e ? 1 : (!i || 1 > i ? (i = 1, t = n / 4) : t = n * Math.asin(1 / i) / (2 * Math.PI), (e *= 2) < 1 ? -.5 * i * Math.pow(2, 10 * (e -= 1)) * Math.sin(2 * (e - t) * Math.PI / n) : i * Math.pow(2, -10 * (e -= 1)) * Math.sin(2 * (e - t) * Math.PI / n) * .5 + 1)
+                  },
+                  BackIn: function(e) {
+                    var t = 1.70158;
+                    return e * e * ((t + 1) * e - t)
+                  },
+                  BackOut: function(e) {
+                    var t = 1.70158;
+                    return--e * e * ((t + 1) * e + t) + 1
+                  },
+                  BackInOut: function(e) {
+                    var t = 2.5949095;
+                    return (e *= 2) < 1 ? .5 * e * e * ((t + 1) * e - t) : .5 * ((e -= 2) * e * ((t + 1) * e + t) + 2)
+                  },
+                  BounceIn: function(t) {
+                    return 1 - e.BounceOut(1 - t)
+                  },
+                  BounceOut: function(e) {
+                    return 1 / 2.75 > e ? 7.5625 * e * e: 2 / 2.75 > e ? 7.5625 * (e -= 1.5 / 2.75) * e + .75 : 2.5 / 2.75 > e ? 7.5625 * (e -= 2.25 / 2.75) * e + .9375 : 7.5625 * (e -= 2.625 / 2.75) * e + .984375
+                  },
+                  BounceInOut: function(t) {
+                    return.5 > t ? .5 * e.BounceIn(2 * t) : .5 * e.BounceOut(2 * t - 1) + .5
+                  }
+                };
+                return e
+              }),
+          i("echarts/chart/base", ["require", "zrender/shape/Image", "../util/shape/Icon", "../util/shape/MarkLine", "../util/shape/Symbol", "zrender/shape/Polyline", "zrender/shape/ShapeBundle", "../config", "../util/ecData", "../util/ecAnimation", "../util/ecEffect", "../util/accMath", "../component/base", "../layout/EdgeBundling", "zrender/tool/util", "zrender/tool/area"],
+              function(e) {
+                function t(e) {
+                  return null != e.x && null != e.y
+                }
+                function i(e, t, i, n, a) {
+                  p.call(this, e, t, i, n, a);
+                  var o = this;
+                  this.selectedMap = {},
+                      this.lastShapeList = [],
+                      this.shapeHandler = {
+                        onclick: function() {
+                          o.isClick = !0
+                        },
+                        ondragover: function(e) {
+                          var t = e.target;
+                          t.highlightStyle = t.highlightStyle || {};
+                          var i = t.highlightStyle,
+                              n = i.brushTyep,
+                              a = i.strokeColor,
+                              r = i.lineWidth;
+                          i.brushType = "stroke",
+                              i.strokeColor = o.ecTheme.calculableColor || h.calculableColor,
+                              i.lineWidth = "icon" === t.type ? 30 : 10,
+                              o.zr.addHoverShape(t),
+                              setTimeout(function() {
+                                    i && (i.brushType = n, i.strokeColor = a, i.lineWidth = r)
+                                  },
+                                  20)
+                        },
+                        ondrop: function(e) {
+                          null != m.get(e.dragged, "data") && (o.isDrop = !0)
+                        },
+                        ondragend: function() {
+                          o.isDragend = !0
+                        }
+                      }
+                }
+                var n = e("zrender/shape/Image"),
+                    a = e("../util/shape/Icon"),
+                    o = e("../util/shape/MarkLine"),
+                    r = e("../util/shape/Symbol"),
+                    s = e("zrender/shape/Polyline"),
+                    l = e("zrender/shape/ShapeBundle"),
+                    h = e("../config"),
+                    m = e("../util/ecData"),
+                    V = e("../util/ecAnimation"),
+                    U = e("../util/ecEffect"),
+                    d = e("../util/accMath"),
+                    p = e("../component/base"),
+                    c = e("../layout/EdgeBundling"),
+                    u = e("zrender/tool/util"),
+                    y = e("zrender/tool/area");
+                return i.prototype = {
+                  setCalculable: function(e) {
+                    return e.dragEnableTime = this.ecTheme.DRAG_ENABLE_TIME || h.DRAG_ENABLE_TIME,
+                        e.ondragover = this.shapeHandler.ondragover,
+                        e.ondragend = this.shapeHandler.ondragend,
+                        e.ondrop = this.shapeHandler.ondrop,
+                        e
+                  },
+                  ondrop: function(e, t) {
+                    if (this.isDrop && e.target && !t.dragIn) {
+                      var i, n = e.target,
+                          a = e.dragged,
+                          o = m.get(n, "seriesIndex"),
+                          r = m.get(n, "dataIndex"),
+                          s = this.series,
+                          l = this.component.legend;
+                      if ( - 1 === r) {
+                        if (m.get(a, "seriesIndex") == o) return t.dragOut = t.dragIn = t.needRefresh = !0,
+                            void(this.isDrop = !1);
+                        i = {
+                          value: m.get(a, "value"),
+                          name: m.get(a, "name")
+                        },
+                        this.type === h.CHART_TYPE_PIE && i.value < 0 && (i.value = 0);
+                        for (var V = !1,
+                                 U = s[o].data, p = 0, c = U.length; c > p; p++) U[p].name === i.name && "-" === U[p].value && (s[o].data[p].value = i.value, V = !0); ! V && s[o].data.push(i),
+                        l && l.add(i.name, a.style.color || a.style.strokeColor)
+                      } else i = s[o].data[r] || "-",
+                          null != i.value ? (s[o].data[r].value = "-" != i.value ? d.accAdd(s[o].data[r].value, m.get(a, "value")) : m.get(a, "value"), (this.type === h.CHART_TYPE_FUNNEL || this.type === h.CHART_TYPE_PIE) && (l && 1 === l.getRelatedAmount(i.name) && this.component.legend.del(i.name), i.name += this.option.nameConnector + m.get(a, "name"), l && l.add(i.name, a.style.color || a.style.strokeColor))) : s[o].data[r] = "-" != i ? d.accAdd(s[o].data[r], m.get(a, "value")) : m.get(a, "value");
+                      t.dragIn = t.dragIn || !0,
+                          this.isDrop = !1;
+                      var u = this;
+                      setTimeout(function() {
+                            u.zr.trigger("mousemove", e.event)
+                          },
+                          300)
+                    }
+                  },
+                  ondragend: function(e, t) {
+                    if (this.isDragend && e.target && !t.dragOut) {
+                      var i = e.target,
+                          n = m.get(i, "seriesIndex"),
+                          a = m.get(i, "dataIndex"),
+                          o = this.series;
+                      if (null != o[n].data[a].value) {
+                        o[n].data[a].value = "-";
+                        var r = o[n].data[a].name,
+                            s = this.component.legend;
+                        s && 0 === s.getRelatedAmount(r) && s.del(r)
+                      } else o[n].data[a] = "-";
+                      t.dragOut = !0,
+                          t.needRefresh = !0,
+                          this.isDragend = !1
+                    }
+                  },
+                  onlegendSelected: function(e, t) {
+                    var i = e.selected;
+                    for (var n in this.selectedMap) this.selectedMap[n] != i[n] && (t.needRefresh = !0),
+                        this.selectedMap[n] = i[n]
+                  },
+                  _buildPosition: function() {
+                    this._symbol = this.option.symbolList,
+                        this._sIndex2ShapeMap = {},
+                        this._sIndex2ColorMap = {},
+                        this.selectedMap = {},
+                        this.xMarkMap = {};
+                    for (var e, t, i, n, a = this.series,
+                             o = {
+                               top: [],
+                               bottom: [],
+                               left: [],
+                               right: [],
+                               other: []
+                             },
+                             r = 0, s = a.length; s > r; r++) a[r].type === this.type && (a[r] = this.reformOption(a[r]), this.legendHoverLink = a[r].legendHoverLink || this.legendHoverLink, e = a[r].xAxisIndex, t = a[r].yAxisIndex, i = this.component.xAxis.getAxis(e), n = this.component.yAxis.getAxis(t), i.type === h.COMPONENT_TYPE_AXIS_CATEGORY ? o[i.getPosition()].push(r) : n.type === h.COMPONENT_TYPE_AXIS_CATEGORY ? o[n.getPosition()].push(r) : o.other.push(r));
+                    for (var l in o) o[l].length > 0 && this._buildSinglePosition(l, o[l]);
+                    this.addShapeList()
+                  },
+                  _buildSinglePosition: function(e, t) {
+                    var i = this._mapData(t),
+                        n = i.locationMap,
+                        a = i.maxDataLength;
+                    if (0 !== a && 0 !== n.length) {
+                      switch (e) {
+                        case "bottom":
+                        case "top":
+                          this._buildHorizontal(t, a, n, this.xMarkMap);
+                          break;
+                        case "left":
+                        case "right":
+                          this._buildVertical(t, a, n, this.xMarkMap);
+                          break;
+                        case "other":
+                          this._buildOther(t, a, n, this.xMarkMap)
+                      }
+                      for (var o = 0,
+                               r = t.length; r > o; o++) this.buildMark(t[o])
+                    }
+                  },
+                  _mapData: function(e) {
+                    for (var t, i, n, a, o = this.series,
+                             r = 0,
+                             s = {},
+                             l = "__kener__stack__",
+                             m = this.component.legend,
+                             V = [], U = 0, d = 0, p = e.length; p > d; d++) {
+                      if (t = o[e[d]], n = t.name, this._sIndex2ShapeMap[e[d]] = this._sIndex2ShapeMap[e[d]] || this.query(t, "symbol") || this._symbol[d % this._symbol.length], m) {
+                        if (this.selectedMap[n] = m.isSelected(n), this._sIndex2ColorMap[e[d]] = m.getColor(n), a = m.getItemShape(n)) {
+                          var c = a.style;
+                          if (this.type == h.CHART_TYPE_LINE) c.iconType = "legendLineIcon",
+                              c.symbol = this._sIndex2ShapeMap[e[d]];
+                          else if (t.itemStyle.normal.barBorderWidth > 0) {
+                            var u = a.highlightStyle;
+                            c.brushType = "both",
+                                c.x += 1,
+                                c.y += 1,
+                                c.width -= 2,
+                                c.height -= 2,
+                                c.strokeColor = u.strokeColor = t.itemStyle.normal.barBorderColor,
+                                u.lineWidth = 3
+                          }
+                          m.setItemShape(n, a)
+                        }
+                      } else this.selectedMap[n] = !0,
+                          this._sIndex2ColorMap[e[d]] = this.zr.getColor(e[d]);
+                      this.selectedMap[n] && (i = t.stack || l + e[d], null == s[i] ? (s[i] = r, V[r] = [e[d]], r++) : V[s[i]].push(e[d])),
+                          U = Math.max(U, t.data.length)
+                    }
+                    return {
+                      locationMap: V,
+                      maxDataLength: U
+                    }
+                  },
+                  _calculMarkMapXY: function(e, t, i) {
+                    for (var n = this.series,
+                             a = 0,
+                             o = t.length; o > a; a++) for (var r = 0,
+                                                                s = t[a].length; s > r; r++) {
+                      var l = t[a][r],
+                          h = "xy" == i ? 0 : "",
+                          m = this.component.grid,
+                          V = e[l];
+                      if ("-1" != i.indexOf("x")) {
+                        V["counter" + h] > 0 && (V["average" + h] = V["sum" + h] / V["counter" + h]);
+                        var U = this.component.xAxis.getAxis(n[l].xAxisIndex || 0).getCoord(V["average" + h]);
+                        V["averageLine" + h] = [[U, m.getYend()], [U, m.getY()]],
+                            V["minLine" + h] = [[V["minX" + h], m.getYend()], [V["minX" + h], m.getY()]],
+                            V["maxLine" + h] = [[V["maxX" + h], m.getYend()], [V["maxX" + h], m.getY()]],
+                            V.isHorizontal = !1
+                      }
+                      if (h = "xy" == i ? 1 : "", "-1" != i.indexOf("y")) {
+                        V["counter" + h] > 0 && (V["average" + h] = V["sum" + h] / V["counter" + h]);
+                        var d = this.component.yAxis.getAxis(n[l].yAxisIndex || 0).getCoord(V["average" + h]);
+                        V["averageLine" + h] = [[m.getX(), d], [m.getXend(), d]],
+                            V["minLine" + h] = [[m.getX(), V["minY" + h]], [m.getXend(), V["minY" + h]]],
+                            V["maxLine" + h] = [[m.getX(), V["maxY" + h]], [m.getXend(), V["maxY" + h]]],
+                            V.isHorizontal = !0
+                      }
+                    }
+                  },
+                  addLabel: function(e, t, i, n, a) {
+                    var o = [i, t],
+                        r = this.deepMerge(o, "itemStyle.normal.label"),
+                        s = this.deepMerge(o, "itemStyle.emphasis.label"),
+                        l = r.textStyle || {},
+                        h = s.textStyle || {};
+
+                    if (r.show) {
+                      var m = e.style;
+                      m.text = this._getLabelText(t, i, n, "normal"),
+                          m.textPosition = null == r.position ? "horizontal" === a ? "right": "top": r.position,
+                          m.textColor = l.color,
+                          m.textFont = this.getFont(l),
+                          m.textAlign = l.align,
+                          m.textBaseline = l.baseline
+                    }
+                    if (s.show) {
+                      var V = e.highlightStyle;
+                      V.text = this._getLabelText(t, i, n, "emphasis"),
+                          V.textPosition = r.show ? e.style.textPosition: null == s.position ? "horizontal" === a ? "right": "top": s.position,
+                          V.textColor = h.color,
+                          V.textFont = this.getFont(h),
+                          V.textAlign = h.align,
+                          V.textBaseline = h.baseline
+                    }
+                    return e
+                  },
+                  _getLabelText: function(e, t, i, n) {
+                    var a = this.deepQuery([t, e], "itemStyle." + n + ".label.formatter");
+                    a || "emphasis" !== n || (a = this.deepQuery([t, e], "itemStyle.normal.label.formatter"));
+                    var o = this.getDataFromOption(t, "-");
+                    return a ? "function" == typeof a ? a.call(this.myChart, {
+                      seriesName: e.name,
+                      series: e,
+                      name: i,
+                      value: o,
+                      data: t,
+                      status: n
+                    }) : "string" == typeof a ? a = a.replace("{a}", "{a0}").replace("{b}", "{b0}").replace("{c}", "{c0}").replace("{a0}", e.name).replace("{b0}", i).replace("{c0}", this.numAddCommas(o)) : void 0 : o instanceof Array ? null != o[2] ? this.numAddCommas(o[2]) : o[0] + " , " + o[1] : this.numAddCommas(o)
+                  },
+                  buildMark: function(e) {
+                    var t = this.series[e];
+                    this.selectedMap[t.name] && (t.markLine && this._buildMarkLine(e), t.markPoint && this._buildMarkPoint(e))
+                  },
+                  _buildMarkPoint: function(e) {
+                    for (var t, i, n = (this.markAttachStyle || {})[e], a = this.series[e], o = u.clone(a.markPoint), r = 0, s = o.data.length; s > r; r++) t = o.data[r],
+                        i = this.getMarkCoord(e, t),
+                        t.x = null != t.x ? t.x: i[0],
+                        t.y = null != t.y ? t.y: i[1],
+                    !t.type || "max" !== t.type && "min" !== t.type || (t.value = i[3], t.name = t.name || t.type, t.symbolSize = t.symbolSize || y.getTextWidth(i[3], this.getFont()) / 2 + 5);
+                    for (var l = this._markPoint(e, o), r = 0, s = l.length; s > r; r++) {
+                      var m = l[r];
+                      m.zlevel = a.zlevel,
+                          m.z = a.z + 1;
+                      for (var V in n) m[V] = u.clone(n[V]);
+                      this.shapeList.push(m)
+                    }
+                    if (this.type === h.CHART_TYPE_FORCE || this.type === h.CHART_TYPE_CHORD) for (var r = 0,
+                                                                                                       s = l.length; s > r; r++) this.zr.addShape(l[r])
+                  },
+                  _buildMarkLine: function(e) {
+                    for (var t, i = (this.markAttachStyle || {})[e], n = this.series[e], a = u.clone(n.markLine), o = 0, r = a.data.length; r > o; o++) {
+                      var s = a.data[o]; ! s.type || "max" !== s.type && "min" !== s.type && "average" !== s.type ? t = [this.getMarkCoord(e, s[0]), this.getMarkCoord(e, s[1])] : (t = this.getMarkCoord(e, s), a.data[o] = [u.clone(s), {}], a.data[o][0].name = s.name || s.type, a.data[o][0].value = "average" !== s.type ? t[3] : +t[3].toFixed(null != a.precision ? a.precision: this.deepQuery([this.ecTheme, h], "markLine.precision")), t = t[2], s = [{},
+                        {}]),
+                      null != t && null != t[0] && null != t[1] && (a.data[o][0].x = null != s[0].x ? s[0].x: t[0][0], a.data[o][0].y = null != s[0].y ? s[0].y: t[0][1], a.data[o][1].x = null != s[1].x ? s[1].x: t[1][0], a.data[o][1].y = null != s[1].y ? s[1].y: t[1][1])
+                    }
+                    var m = this._markLine(e, a),
+                        V = a.large;
+                    if (V) {
+                      var U = new l({
+                            style: {
+                              shapeList: m
+                            }
+                          }),
+                          d = m[0];
+                      if (d) {
+                        u.merge(U.style, d.style),
+                            u.merge(U.highlightStyle = {},
+                                d.highlightStyle),
+                            U.style.brushType = "stroke",
+                            U.zlevel = n.zlevel,
+                            U.z = n.z + 1,
+                            U.hoverable = !1;
+                        for (var p in i) U[p] = u.clone(i[p])
+                      }
+                      this.shapeList.push(U),
+                          this.zr.addShape(U),
+                          U._mark = "largeLine";
+                      var c = a.effect;
+                      c.show && (U.effect = c)
+                    } else {
+                      for (var o = 0,
+                               r = m.length; r > o; o++) {
+                        var y = m[o];
+                        y.zlevel = n.zlevel,
+                            y.z = n.z + 1;
+                        for (var p in i) y[p] = u.clone(i[p]);
+                        this.shapeList.push(y)
+                      }
+                      if (this.type === h.CHART_TYPE_FORCE || this.type === h.CHART_TYPE_CHORD) for (var o = 0,
+                                                                                                         r = m.length; r > o; o++) this.zr.addShape(m[o])
+                    }
+                  },
+                  _markPoint: function(e, t) {
+                    var i = this.series[e],
+                        n = this.component;
+                    u.merge(u.merge(t, u.clone(this.ecTheme.markPoint || {})), u.clone(h.markPoint)),
+                        t.name = i.name;
+                    var a, o, r, s, l, V, U, d = [],
+                        p = t.data,
+                        c = n.dataRange,
+                        y = n.legend,
+                        g = this.zr.getWidth(),
+                        b = this.zr.getHeight();
+                    if (t.large) a = this.getLargeMarkPointShape(e, t),
+                        a._mark = "largePoint",
+                    a && d.push(a);
+                    else for (var f = 0,
+                                  k = p.length; k > f; f++) null != p[f].x && null != p[f].y && (r = null != p[f].value ? p[f].value: "", y && (o = y.getColor(i.name)), c && (o = isNaN(r) ? o: c.getColor(r), s = [p[f], t], l = this.deepQuery(s, "itemStyle.normal.color") || o, V = this.deepQuery(s, "itemStyle.emphasis.color") || l, null == l && null == V) || (o = null == o ? this.zr.getColor(e) : o, p[f].tooltip = p[f].tooltip || t.tooltip || {
+                      trigger: "item"
+                    },
+                        p[f].name = null != p[f].name ? p[f].name: "", p[f].value = r, a = this.getSymbolShape(t, e, p[f], f, p[f].name, this.parsePercent(p[f].x, g), this.parsePercent(p[f].y, b), "pin", o, "rgba(0,0,0,0)", "horizontal"), a._mark = "point", U = this.deepMerge([p[f], t], "effect"), U.show && (a.effect = U), i.type === h.CHART_TYPE_MAP && (a._geo = this.getMarkGeo(p[f])), m.pack(a, i, e, p[f], f, p[f].name, r), d.push(a)));
+                    return d
+                  },
+                  _markLine: function() {
+                    function e(e, t) {
+                      e[t] = e[t] instanceof Array ? e[t].length > 1 ? e[t] : [e[t][0], e[t][0]] : [e[t], e[t]]
+                    }
+                    return function(i, n) {
+                      var a = this.series[i],
+                          o = this.component,
+                          r = o.dataRange,
+                          s = o.legend;
+                      u.merge(u.merge(n, u.clone(this.ecTheme.markLine || {})), u.clone(h.markLine));
+                      var l = s ? s.getColor(a.name) : this.zr.getColor(i);
+                      e(n, "symbol"),
+                          e(n, "symbolSize"),
+                          e(n, "symbolRotate");
+                      for (var V = n.data,
+                               U = [], d = this.zr.getWidth(), p = this.zr.getHeight(), y = 0; y < V.length; y++) {
+                        var g = V[y];
+                        if (t(g[0]) && t(g[1])) {
+                          var b = this.deepMerge(g),
+                              f = [b, n],
+                              k = l,
+                              x = null != b.value ? b.value: "";
+                          if (r) {
+                            k = isNaN(x) ? k: r.getColor(x);
+                            var _ = this.deepQuery(f, "itemStyle.normal.color") || k,
+                                L = this.deepQuery(f, "itemStyle.emphasis.color") || _;
+                            if (null == _ && null == L) continue
+                          }
+                          g[0].tooltip = b.tooltip || n.tooltip || {
+                            trigger: "item"
+                          },
+                              g[0].name = g[0].name || "",
+                              g[1].name = g[1].name || "",
+                              g[0].value = x,
+                              U.push({
+                                points: [[this.parsePercent(g[0].x, d), this.parsePercent(g[0].y, p)], [this.parsePercent(g[1].x, d), this.parsePercent(g[1].y, p)]],
+                                rawData: g,
+                                color: k
+                              })
+                        }
+                      }
+                      var W = this.query(n, "bundling.enable");
+                      if (W) {
+                        var X = new c;
+                        X.maxTurningAngle = this.query(n, "bundling.maxTurningAngle") / 180 * Math.PI,
+                            U = X.run(U)
+                      }
+                      n.name = a.name;
+                      for (var v = [], y = 0, w = U.length; w > y; y++) {
+                        var K = U[y],
+                            I = K.rawEdge || K,
+                            g = I.rawData,
+                            x = null != g.value ? g.value: "",
+                            J = this.getMarkLineShape(n, i, g, y, K.points, W, I.color);
+                        J._mark = "line";
+                        var C = this.deepMerge([g[0], g[1], n], "effect");
+                        C.show && (J.effect = C, J.effect.large = n.large),
+                        a.type === h.CHART_TYPE_MAP && (J._geo = [this.getMarkGeo(g[0]), this.getMarkGeo(g[1])]),
+                            m.pack(J, a, i, g[0], y, g[0].name + ("" !== g[1].name ? " > " + g[1].name: ""), x),
+                            v.push(J)
+                      }
+                      return v
+                    }
+                  } (),
+                  getMarkCoord: function() {
+                    return [0, 0]
+                  },
+                  getSymbolShape: function(e, t, i, o, r, s, l, h, V, U, d) {
+                    var p = [i, e],
+                        c = this.getDataFromOption(i, "-");
+                    h = this.deepQuery(p, "symbol") || h;
+                    var u = this.deepQuery(p, "symbolSize");
+                    u = "function" == typeof u ? u(c) : u,
+                    "number" == typeof u && (u = [u, u]);
+                    var y = this.deepQuery(p, "symbolRotate"),
+                        g = this.deepMerge(p, "itemStyle.normal"),
+                        b = this.deepMerge(p, "itemStyle.emphasis"),
+                        f = null != g.borderWidth ? g.borderWidth: g.lineStyle && g.lineStyle.width;
+                    null == f && (f = h.match("empty") ? 2 : 0);
+                    var k = null != b.borderWidth ? b.borderWidth: b.lineStyle && b.lineStyle.width;
+                    null == k && (k = f + 2);
+                    var x = this.getItemStyleColor(g.color, t, o, i),
+                        _ = this.getItemStyleColor(b.color, t, o, i),
+                        L = u[0],
+                        W = u[1],
+                        X = new a({
+                          style: {
+                            iconType: h.replace("empty", "").toLowerCase(),
+                            x: s - L,
+                            y: l - W,
+                            width: 2 * L,
+                            height: 2 * W,
+                            brushType: "both",
+                            color: h.match("empty") ? U: x || V,
+                            strokeColor: g.borderColor || x || V,
+                            lineWidth: f
+                          },
+                          highlightStyle: {
+                            color: h.match("empty") ? U: _ || x || V,
+                            strokeColor: b.borderColor || g.borderColor || _ || x || V,
+                            lineWidth: k
+                          },
+                          clickable: this.deepQuery(p, "clickable")
+                        });
+                    return h.match("image") && (X.style.image = h.replace(new RegExp("^image:\\/\\/"), ""), X = new n({
+                      style: X.style,
+                      highlightStyle: X.highlightStyle,
+                      clickable: this.deepQuery(p, "clickable")
+                    })),
+                    null != y && (X.rotation = [y * Math.PI / 180, s, l]),
+                    h.match("star") && (X.style.iconType = "star", X.style.n = h.replace("empty", "").replace("star", "") - 0 || 5),
+                    "none" === h && (X.invisible = !0, X.hoverable = !1),
+                        X = this.addLabel(X, e, i, r, d),
+                    h.match("empty") && (null == X.style.textColor && (X.style.textColor = X.style.strokeColor), null == X.highlightStyle.textColor && (X.highlightStyle.textColor = X.highlightStyle.strokeColor)),
+                        m.pack(X, e, t, i, o, r),
+                        X._x = s,
+                        X._y = l,
+                        X._dataIndex = o,
+                        X._seriesIndex = t,
+                        X
+                  },
+                  getMarkLineShape: function(e, t, i, n, a, r, l) {
+                    var h = null != i[0].value ? i[0].value: "-",
+                        m = null != i[1].value ? i[1].value: "-",
+                        V = [i[0].symbol || e.symbol[0], i[1].symbol || e.symbol[1]],
+                        U = [i[0].symbolSize || e.symbolSize[0], i[1].symbolSize || e.symbolSize[1]];
+                    U[0] = "function" == typeof U[0] ? U[0](h) : U[0],
+                        U[1] = "function" == typeof U[1] ? U[1](m) : U[1];
+                    var d = [this.query(i[0], "symbolRotate") || e.symbolRotate[0], this.query(i[1], "symbolRotate") || e.symbolRotate[1]],
+                        p = [i[0], i[1], e],
+                        c = this.deepMerge(p, "itemStyle.normal");
+                    c.color = this.getItemStyleColor(c.color, t, n, i);
+                    var u = this.deepMerge(p, "itemStyle.emphasis");
+                    u.color = this.getItemStyleColor(u.color, t, n, i);
+                    var y = c.lineStyle,
+                        g = u.lineStyle,
+                        b = y.width;
+                    null == b && (b = c.borderWidth);
+                    var f = g.width;
+                    null == f && (f = null != u.borderWidth ? u.borderWidth: b + 2);
+                    var k = this.deepQuery(p, "smoothness");
+                    this.deepQuery(p, "smooth") || (k = 0);
+                    var x = r ? s: o,
+                        _ = new x({
+                          style: {
+                            symbol: V,
+                            symbolSize: U,
+                            symbolRotate: d,
+                            brushType: "both",
+                            lineType: y.type,
+                            shadowColor: y.shadowColor || y.color || c.borderColor || c.color || l,
+                            shadowBlur: y.shadowBlur,
+                            shadowOffsetX: y.shadowOffsetX,
+                            shadowOffsetY: y.shadowOffsetY,
+                            color: c.color || l,
+                            strokeColor: y.color || c.borderColor || c.color || l,
+                            lineWidth: b,
+                            symbolBorderColor: c.borderColor || c.color || l,
+                            symbolBorder: c.borderWidth
+                          },
+                          highlightStyle: {
+                            shadowColor: g.shadowColor,
+                            shadowBlur: g.shadowBlur,
+                            shadowOffsetX: g.shadowOffsetX,
+                            shadowOffsetY: g.shadowOffsetY,
+                            color: u.color || c.color || l,
+                            strokeColor: g.color || y.color || u.borderColor || c.borderColor || u.color || c.color || l,
+                            lineWidth: f,
+                            symbolBorderColor: u.borderColor || c.borderColor || u.color || c.color || l,
+                            symbolBorder: null == u.borderWidth ? c.borderWidth + 2 : u.borderWidth
+                          },
+                          clickable: this.deepQuery(p, "clickable")
+                        }),
+                        L = _.style;
+                    return r ? (L.pointList = a, L.smooth = k) : (L.xStart = a[0][0], L.yStart = a[0][1], L.xEnd = a[1][0], L.yEnd = a[1][1], L.curveness = k, _.updatePoints(_.style)),
+                        _ = this.addLabel(_, e, i[0], i[0].name + " : " + i[1].name)
+                  },
+                  getLargeMarkPointShape: function(e, t) {
+                    var i, n, a, o, s, l, h = this.series[e],
+                        m = this.component,
+                        V = t.data,
+                        U = m.dataRange,
+                        d = m.legend,
+                        p = [V[0], t];
+                    if (d && (n = d.getColor(h.name)), !U || (a = null != V[0].value ? V[0].value: "", n = isNaN(a) ? n: U.getColor(a), o = this.deepQuery(p, "itemStyle.normal.color") || n, s = this.deepQuery(p, "itemStyle.emphasis.color") || o, null != o || null != s)) {
+                      n = this.deepMerge(p, "itemStyle.normal").color || n;
+                      var c = this.deepQuery(p, "symbol") || "circle";
+                      c = c.replace("empty", "").replace(/\d/g, ""),
+                          l = this.deepMerge([V[0], t], "effect");
+                      var u = window.devicePixelRatio || 1;
+                      return i = new r({
+                        style: {
+                          pointList: V,
+                          color: n,
+                          strokeColor: n,
+                          shadowColor: l.shadowColor || n,
+                          shadowBlur: (null != l.shadowBlur ? l.shadowBlur: 8) * u,
+                          size: this.deepQuery(p, "symbolSize"),
+                          iconType: c,
+                          brushType: "fill",
+                          lineWidth: 1
+                        },
+                        draggable: !1,
+                        hoverable: !1
+                      }),
+                      l.show && (i.effect = l),
+                          i
+                    }
+                  },
+                  backupShapeList: function() {
+                    this.shapeList && this.shapeList.length > 0 ? (this.lastShapeList = this.shapeList, this.shapeList = []) : this.lastShapeList = []
+                  },
+                  addShapeList: function() {
+                    var e, t, i = this.option.animationThreshold / (this.canvasSupported ? 2 : 4),
+                        n = this.lastShapeList,
+                        a = this.shapeList,
+                        o = n.length > 0,
+                        r = o ? this.query(this.option, "animationDurationUpdate") : this.query(this.option, "animationDuration"),
+                        s = this.query(this.option, "animationEasing"),
+                        l = {},
+                        m = {};
+                    if (this.option.animation && !this.option.renderAsImage && a.length < i && !this.motionlessOnce) {
+                      for (var V = 0,
+                               U = n.length; U > V; V++) t = this._getAnimationKey(n[V]),
+                          t.match("undefined") ? this.zr.delShape(n[V].id) : (t += n[V].type, l[t] ? this.zr.delShape(n[V].id) : l[t] = n[V]);
+                      for (var V = 0,
+                               U = a.length; U > V; V++) t = this._getAnimationKey(a[V]),
+                          t.match("undefined") ? this.zr.addShape(a[V]) : (t += a[V].type, m[t] = a[V]);
+                      for (t in l) m[t] || this.zr.delShape(l[t].id);
+                      for (t in m) l[t] ? (this.zr.delShape(l[t].id), this._animateMod(l[t], m[t], r, s, 0, o)) : (e = this.type != h.CHART_TYPE_LINE && this.type != h.CHART_TYPE_RADAR || 0 === t.indexOf("icon") ? 0 : r / 2, this._animateMod(!1, m[t], r, s, e, o));
+                      this.zr.refresh(),
+                          this.animationEffect()
+                    } else {
+                      this.motionlessOnce = !1,
+                          this.zr.delShape(n);
+                      for (var V = 0,
+                               U = a.length; U > V; V++) this.zr.addShape(a[V])
+                    }
+                  },
+                  _getAnimationKey: function(e) {
+                    return this.type != h.CHART_TYPE_MAP && this.type != h.CHART_TYPE_TREEMAP && this.type != h.CHART_TYPE_VENN && this.type != h.CHART_TYPE_TREE ? m.get(e, "seriesIndex") + "_" + m.get(e, "dataIndex") + (e._mark ? e._mark: "") + (this.type === h.CHART_TYPE_RADAR ? m.get(e, "special") : "") : m.get(e, "seriesIndex") + "_" + m.get(e, "dataIndex") + (e._mark ? e._mark: "undefined")
+                  },
+                  _animateMod: function(e, t, i, n, a, o) {
+                    switch (t.type) {
+                      case "polyline":
+                      case "half-smooth-polygon":
+                        V.pointList(this.zr, e, t, i, n);
+                        break;
+                      case "rectangle":
+                        V.rectangle(this.zr, e, t, i, n);
+                        break;
+                      case "image":
+                      case "icon":
+                        V.icon(this.zr, e, t, i, n, a);
+                        break;
+                      case "candle":
+                        o ? this.zr.addShape(t) : V.candle(this.zr, e, t, i, n);
+                        break;
+                      case "ring":
+                      case "sector":
+                      case "circle":
+                        o ? "sector" === t.type ? V.sector(this.zr, e, t, i, n) : this.zr.addShape(t) : V.ring(this.zr, e, t, i + (m.get(t, "dataIndex") || 0) % 20 * 100, n);
+                        break;
+                      case "text":
+                        V.text(this.zr, e, t, i, n);
+                        break;
+                      case "polygon":
+                        o ? V.pointList(this.zr, e, t, i, n) : V.polygon(this.zr, e, t, i, n);
+                        break;
+                      case "ribbon":
+                        V.ribbon(this.zr, e, t, i, n);
+                        break;
+                      case "gauge-pointer":
+                        V.gaugePointer(this.zr, e, t, i, n);
+                        break;
+                      case "mark-line":
+                        V.markline(this.zr, e, t, i, n);
+                        break;
+                      case "bezier-curve":
+                      case "line":
+                        V.line(this.zr, e, t, i, n);
+                        break;
+                      default:
+                        this.zr.addShape(t)
+                    }
+                  },
+                  animationMark: function(e, t, i) {
+                    for (var i = i || this.shapeList,
+                             n = 0,
+                             a = i.length; a > n; n++) i[n]._mark && this._animateMod(!1, i[n], e, t, 0, !0);
+                    this.animationEffect(i)
+                  },
+                  animationEffect: function(e) {
+                    if (!e && this.clearEffectShape(), e = e || this.shapeList, null != e) {
+                      var t = h.EFFECT_ZLEVEL;
+                      this.canvasSupported && this.zr.modLayer(t, {
+                        motionBlur: !0,
+                        lastFrameAlpha: this.option.effectBlendAlpha || h.effectBlendAlpha
+                      });
+                      for (var i, n = 0,
+                               a = e.length; a > n; n++) i = e[n],
+                      i._mark && i.effect && i.effect.show && U[i._mark] && (U[i._mark](this.zr, this.effectList, i, t), this.effectList[this.effectList.length - 1]._mark = i._mark)
+                    }
+                  },
+                  clearEffectShape: function(e) {
+                    var t = this.effectList;
+                    if (this.zr && t && t.length > 0) {
+                      e && this.zr.modLayer(h.EFFECT_ZLEVEL, {
+                        motionBlur: !1
+                      }),
+                          this.zr.delShape(t);
+                      for (var i = 0; i < t.length; i++) t[i].effectAnimator && t[i].effectAnimator.stop()
+                    }
+                    this.effectList = []
+                  },
+                  addMark: function(e, t, i) {
+                    var n = this.series[e];
+                    if (this.selectedMap[n.name]) {
+                      var a = this.query(this.option, "animationDurationUpdate"),
+                          o = this.query(this.option, "animationEasing"),
+                          r = n[i].data,
+                          s = this.shapeList.length;
+                      if (n[i].data = t.data, this["_build" + i.replace("m", "M")](e), this.option.animation && !this.option.renderAsImage) this.animationMark(a, o, this.shapeList.slice(s));
+                      else {
+                        for (var l = s,
+                                 h = this.shapeList.length; h > l; l++) this.zr.addShape(this.shapeList[l]);
+                        this.zr.refreshNextFrame()
+                      }
+                      n[i].data = r
+                    }
+                  },
+                  delMark: function(e, t, i) {
+                    i = i.replace("mark", "").replace("large", "").toLowerCase();
+                    var n = this.series[e];
+                    if (this.selectedMap[n.name]) {
+                      for (var a = !1,
+                               o = [this.shapeList, this.effectList], r = 2; r--;) for (var s = 0,
+                                                                                            l = o[r].length; l > s; s++) if (o[r][s]._mark == i && m.get(o[r][s], "seriesIndex") == e && m.get(o[r][s], "name") == t) {
+                        this.zr.delShape(o[r][s].id),
+                            o[r].splice(s, 1),
+                            a = !0;
+                        break
+                      }
+                      a && this.zr.refreshNextFrame()
+                    }
+                  }
+                },
+                    u.inherits(i, p),
+                    i
+              }),
+          i("zrender/shape/Circle", ["require", "./Base", "../tool/util"],
+              function(e) {
+                "use strict";
+                var t = e("./Base"),
+                    i = function(e) {
+                      t.call(this, e)
+                    };
+                return i.prototype = {
+                  type: "circle",
+                  buildPath: function(e, t) {
+                    e.moveTo(t.x + t.r, t.y),
+                        e.arc(t.x, t.y, t.r, 0, 2 * Math.PI, !0)
+                  },
+                  getRect: function(e) {
+                    if (e.__rect) return e.__rect;
+                    var t;
+                    return t = "stroke" == e.brushType || "fill" == e.brushType ? e.lineWidth || 1 : 0,
+                        e.__rect = {
+                          x: Math.round(e.x - e.r - t / 2),
+                          y: Math.round(e.y - e.r - t / 2),
+                          width: 2 * e.r + t,
+                          height: 2 * e.r + t
+                        },
+                        e.__rect
+                  }
+                },
+                    e("../tool/util").inherits(i, t),
+                    i
+              }),
+          i("echarts/util/accMath", [],
+              function() {
+                function e(e, t) {
+                  var i = e.toString(),
+                      n = t.toString(),
+                      a = 0;
+                  try {
+                    a = n.split(".")[1].length
+                  } catch(o) {}
+                  try {
+                    a -= i.split(".")[1].length
+                  } catch(o) {}
+                  return (i.replace(".", "") - 0) / (n.replace(".", "") - 0) * Math.pow(10, a)
+                }
+                function t(e, t) {
+                  var i = e.toString(),
+                      n = t.toString(),
+                      a = 0;
+                  try {
+                    a += i.split(".")[1].length
+                  } catch(o) {}
+                  try {
+                    a += n.split(".")[1].length
+                  } catch(o) {}
+                  return (i.replace(".", "") - 0) * (n.replace(".", "") - 0) / Math.pow(10, a)
+                }
+                function i(e, t) {
+                  var i = 0,
+                      n = 0;
+                  try {
+                    i = e.toString().split(".")[1].length
+                  } catch(a) {}
+                  try {
+                    n = t.toString().split(".")[1].length
+                  } catch(a) {}
+                  var o = Math.pow(10, Math.max(i, n));
+                  return (Math.round(e * o) + Math.round(t * o)) / o
+                }
+                function n(e, t) {
+                  return i(e, -t)
+                }
+                return {
+                  accDiv: e,
+                  accMul: t,
+                  accAdd: i,
+                  accSub: n
+                }
+              }),
+          i("echarts/util/shape/Icon", ["require", "zrender/tool/util", "zrender/shape/Star", "zrender/shape/Heart", "zrender/shape/Droplet", "zrender/shape/Image", "zrender/shape/Base"],
+              function(e) {
+                function t(e, t) {
+                  var i = t.x,
+                      n = t.y,
+                      a = t.width / 16,
+                      o = t.height / 16;
+                  e.moveTo(i, n + t.height),
+                      e.lineTo(i + 5 * a, n + 14 * o),
+                      e.lineTo(i + t.width, n + 3 * o),
+                      e.lineTo(i + 13 * a, n),
+                      e.lineTo(i + 2 * a, n + 11 * o),
+                      e.lineTo(i, n + t.height),
+                      e.moveTo(i + 6 * a, n + 10 * o),
+                      e.lineTo(i + 14 * a, n + 2 * o),
+                      e.moveTo(i + 10 * a, n + 13 * o),
+                      e.lineTo(i + t.width, n + 13 * o),
+                      e.moveTo(i + 13 * a, n + 10 * o),
+                      e.lineTo(i + 13 * a, n + t.height)
+                }
+                function i(e, t) {
+                  var i = t.x,
+                      n = t.y,
+                      a = t.width / 16,
+                      o = t.height / 16;
+                  e.moveTo(i, n + t.height),
+                      e.lineTo(i + 5 * a, n + 14 * o),
+                      e.lineTo(i + t.width, n + 3 * o),
+                      e.lineTo(i + 13 * a, n),
+                      e.lineTo(i + 2 * a, n + 11 * o),
+                      e.lineTo(i, n + t.height),
+                      e.moveTo(i + 6 * a, n + 10 * o),
+                      e.lineTo(i + 14 * a, n + 2 * o),
+                      e.moveTo(i + 10 * a, n + 13 * o),
+                      e.lineTo(i + t.width, n + 13 * o)
+                }
+                function n(e, t) {
+                  var i = t.x,
+                      n = t.y,
+                      a = t.width / 16,
+                      o = t.height / 16;
+                  e.moveTo(i + 4 * a, n + 15 * o),
+                      e.lineTo(i + 9 * a, n + 13 * o),
+                      e.lineTo(i + 14 * a, n + 8 * o),
+                      e.lineTo(i + 11 * a, n + 5 * o),
+                      e.lineTo(i + 6 * a, n + 10 * o),
+                      e.lineTo(i + 4 * a, n + 15 * o),
+                      e.moveTo(i + 5 * a, n),
+                      e.lineTo(i + 11 * a, n),
+                      e.moveTo(i + 5 * a, n + o),
+                      e.lineTo(i + 11 * a, n + o),
+                      e.moveTo(i, n + 2 * o),
+                      e.lineTo(i + t.width, n + 2 * o),
+                      e.moveTo(i, n + 5 * o),
+                      e.lineTo(i + 3 * a, n + t.height),
+                      e.lineTo(i + 13 * a, n + t.height),
+                      e.lineTo(i + t.width, n + 5 * o)
+                }
+                function a(e, t) {
+                  var i = t.x,
+                      n = t.y,
+                      a = t.width / 16,
+                      o = t.height / 16;
+                  e.moveTo(i, n + 3 * o),
+                      e.lineTo(i + 6 * a, n + 3 * o),
+                      e.moveTo(i + 3 * a, n),
+                      e.lineTo(i + 3 * a, n + 6 * o),
+                      e.moveTo(i + 3 * a, n + 8 * o),
+                      e.lineTo(i + 3 * a, n + t.height),
+                      e.lineTo(i + t.width, n + t.height),
+                      e.lineTo(i + t.width, n + 3 * o),
+                      e.lineTo(i + 8 * a, n + 3 * o)
+                }
+                function o(e, t) {
+                  var i = t.x,
+                      n = t.y,
+                      a = t.width / 16,
+                      o = t.height / 16;
+                  e.moveTo(i + 6 * a, n),
+                      e.lineTo(i + 2 * a, n + 3 * o),
+                      e.lineTo(i + 6 * a, n + 6 * o),
+                      e.moveTo(i + 2 * a, n + 3 * o),
+                      e.lineTo(i + 14 * a, n + 3 * o),
+                      e.lineTo(i + 14 * a, n + 11 * o),
+                      e.moveTo(i + 2 * a, n + 5 * o),
+                      e.lineTo(i + 2 * a, n + 13 * o),
+                      e.lineTo(i + 14 * a, n + 13 * o),
+                      e.moveTo(i + 10 * a, n + 10 * o),
+                      e.lineTo(i + 14 * a, n + 13 * o),
+                      e.lineTo(i + 10 * a, n + t.height)
+                }
+                function r(e, t) {
+                  var i = t.x,
+                      n = t.y,
+                      a = t.width / 16,
+                      o = t.height / 16,
+                      r = t.width / 2;
+                  e.lineWidth = 1.5,
+                      e.arc(i + r, n + r, r - a, 0, 2 * Math.PI / 3),
+                      e.moveTo(i + 3 * a, n + t.height),
+                      e.lineTo(i + 0 * a, n + 12 * o),
+                      e.lineTo(i + 5 * a, n + 11 * o),
+                      e.moveTo(i, n + 8 * o),
+                      e.arc(i + r, n + r, r - a, Math.PI, 5 * Math.PI / 3),
+                      e.moveTo(i + 13 * a, n),
+                      e.lineTo(i + t.width, n + 4 * o),
+                      e.lineTo(i + 11 * a, n + 5 * o)
+                }
+                function s(e, t) {
+                  var i = t.x,
+                      n = t.y,
+                      a = t.width / 16,
+                      o = t.height / 16;
+                  e.moveTo(i, n),
+                      e.lineTo(i, n + t.height),
+                      e.lineTo(i + t.width, n + t.height),
+                      e.moveTo(i + 2 * a, n + 14 * o),
+                      e.lineTo(i + 7 * a, n + 6 * o),
+                      e.lineTo(i + 11 * a, n + 11 * o),
+                      e.lineTo(i + 15 * a, n + 2 * o)
+                }
+                function l(e, t) {
+                  var i = t.x,
+                      n = t.y,
+                      a = t.width / 16,
+                      o = t.height / 16;
+                  e.moveTo(i, n),
+                      e.lineTo(i, n + t.height),
+                      e.lineTo(i + t.width, n + t.height),
+                      e.moveTo(i + 3 * a, n + 14 * o),
+                      e.lineTo(i + 3 * a, n + 6 * o),
+                      e.lineTo(i + 4 * a, n + 6 * o),
+                      e.lineTo(i + 4 * a, n + 14 * o),
+                      e.moveTo(i + 7 * a, n + 14 * o),
+                      e.lineTo(i + 7 * a, n + 2 * o),
+                      e.lineTo(i + 8 * a, n + 2 * o),
+                      e.lineTo(i + 8 * a, n + 14 * o),
+                      e.moveTo(i + 11 * a, n + 14 * o),
+                      e.lineTo(i + 11 * a, n + 9 * o),
+                      e.lineTo(i + 12 * a, n + 9 * o),
+                      e.lineTo(i + 12 * a, n + 14 * o)
+                }
+                function h(e, t) {
+                  var i = t.x,
+                      n = t.y,
+                      a = t.width - 2,
+                      o = t.height - 2,
+                      r = Math.min(a, o) / 2;
+                  n += 2,
+                      e.moveTo(i + r + 3, n + r - 3),
+                      e.arc(i + r + 3, n + r - 3, r - 1, 0, -Math.PI / 2, !0),
+                      e.lineTo(i + r + 3, n + r - 3),
+                      e.moveTo(i + r, n),
+                      e.lineTo(i + r, n + r),
+                      e.arc(i + r, n + r, r, -Math.PI / 2, 2 * Math.PI, !0),
+                      e.lineTo(i + r, n + r),
+                      e.lineWidth = 1.5
+                }
+                function m(e, t) {
+                  var i = t.x,
+                      n = t.y,
+                      a = t.width / 16,
+                      o = t.height / 16;
+                  n -= o,
+                      e.moveTo(i + 1 * a, n + 2 * o),
+                      e.lineTo(i + 15 * a, n + 2 * o),
+                      e.lineTo(i + 14 * a, n + 3 * o),
+                      e.lineTo(i + 2 * a, n + 3 * o),
+                      e.moveTo(i + 3 * a, n + 6 * o),
+                      e.lineTo(i + 13 * a, n + 6 * o),
+                      e.lineTo(i + 12 * a, n + 7 * o),
+                      e.lineTo(i + 4 * a, n + 7 * o),
+                      e.moveTo(i + 5 * a, n + 10 * o),
+                      e.lineTo(i + 11 * a, n + 10 * o),
+                      e.lineTo(i + 10 * a, n + 11 * o),
+                      e.lineTo(i + 6 * a, n + 11 * o),
+                      e.moveTo(i + 7 * a, n + 14 * o),
+                      e.lineTo(i + 9 * a, n + 14 * o),
+                      e.lineTo(i + 8 * a, n + 15 * o),
+                      e.lineTo(i + 7 * a, n + 15 * o)
+                }
+                function V(e, t) {
+                  var i = t.x,
+                      n = t.y,
+                      a = t.width,
+                      o = t.height,
+                      r = a / 16,
+                      s = o / 16,
+                      l = 2 * Math.min(r, s);
+                  e.moveTo(i + r + l, n + s + l),
+                      e.arc(i + r, n + s, l, Math.PI / 4, 3 * Math.PI),
+                      e.lineTo(i + 7 * r - l, n + 6 * s - l),
+                      e.arc(i + 7 * r, n + 6 * s, l, Math.PI / 4 * 5, 4 * Math.PI),
+                      e.arc(i + 7 * r, n + 6 * s, l / 2, Math.PI / 4 * 5, 4 * Math.PI),
+                      e.moveTo(i + 7 * r - l / 2, n + 6 * s + l),
+                      e.lineTo(i + r + l, n + 14 * s - l),
+                      e.arc(i + r, n + 14 * s, l, -Math.PI / 4, 2 * Math.PI),
+                      e.moveTo(i + 7 * r + l / 2, n + 6 * s),
+                      e.lineTo(i + 14 * r - l, n + 10 * s - l / 2),
+                      e.moveTo(i + 16 * r, n + 10 * s),
+                      e.arc(i + 14 * r, n + 10 * s, l, 0, 3 * Math.PI),
+                      e.lineWidth = 1.5
+                }
+                function U(e, t) {
+                  var i = t.x,
+                      n = t.y,
+                      a = t.width,
+                      o = t.height,
+                      r = Math.min(a, o) / 2;
+                  e.moveTo(i + a, n + o / 2),
+                      e.arc(i + r, n + r, r, 0, 2 * Math.PI),
+                      e.arc(i + r, n, r, Math.PI / 4, Math.PI / 5 * 4),
+                      e.arc(i, n + r, r, -Math.PI / 3, Math.PI / 3),
+                      e.arc(i + a, n + o, r, Math.PI, Math.PI / 2 * 3),
+                      e.lineWidth = 1.5
+                }
+                function d(e, t) {
+                  for (var i = t.x,
+                           n = t.y,
+                           a = t.width,
+                           o = t.height,
+                           r = Math.round(o / 3), s = Math.round((r - 2) / 2), l = 3; l--;) e.rect(i, n + r * l + s, a, 2)
+                }
+                function p(e, t) {
+                  for (var i = t.x,
+                           n = t.y,
+                           a = t.width,
+                           o = t.height,
+                           r = Math.round(a / 3), s = Math.round((r - 2) / 2), l = 3; l--;) e.rect(i + r * l + s, n, 2, o)
+                }
+                function c(e, t) {
+                  var i = t.x,
+                      n = t.y,
+                      a = t.width / 16;
+                  e.moveTo(i + a, n),
+                      e.lineTo(i + a, n + t.height),
+                      e.lineTo(i + 15 * a, n + t.height),
+                      e.lineTo(i + 15 * a, n),
+                      e.lineTo(i + a, n),
+                      e.moveTo(i + 3 * a, n + 3 * a),
+                      e.lineTo(i + 13 * a, n + 3 * a),
+                      e.moveTo(i + 3 * a, n + 6 * a),
+                      e.lineTo(i + 13 * a, n + 6 * a),
+                      e.moveTo(i + 3 * a, n + 9 * a),
+                      e.lineTo(i + 13 * a, n + 9 * a),
+                      e.moveTo(i + 3 * a, n + 12 * a),
+                      e.lineTo(i + 9 * a, n + 12 * a)
+                }
+                function u(e, t) {
+                  var i = t.x,
+                      n = t.y,
+                      a = t.width / 16,
+                      o = t.height / 16;
+                  e.moveTo(i, n),
+                      e.lineTo(i, n + t.height),
+                      e.lineTo(i + t.width, n + t.height),
+                      e.lineTo(i + t.width, n),
+                      e.lineTo(i, n),
+                      e.moveTo(i + 4 * a, n),
+                      e.lineTo(i + 4 * a, n + 8 * o),
+                      e.lineTo(i + 12 * a, n + 8 * o),
+                      e.lineTo(i + 12 * a, n),
+                      e.moveTo(i + 6 * a, n + 11 * o),
+                      e.lineTo(i + 6 * a, n + 13 * o),
+                      e.lineTo(i + 10 * a, n + 13 * o),
+                      e.lineTo(i + 10 * a, n + 11 * o),
+                      e.lineTo(i + 6 * a, n + 11 * o)
+                }
+                function y(e, t) {
+                  var i = t.x,
+                      n = t.y,
+                      a = t.width,
+                      o = t.height;
+                  e.moveTo(i, n + o / 2),
+                      e.lineTo(i + a, n + o / 2),
+                      e.moveTo(i + a / 2, n),
+                      e.lineTo(i + a / 2, n + o)
+                }
+                function g(e, t) {
+                  var i = t.width / 2,
+                      n = t.height / 2,
+                      a = Math.min(i, n);
+                  e.moveTo(t.x + i + a, t.y + n),
+                      e.arc(t.x + i, t.y + n, a, 0, 2 * Math.PI),
+                      e.closePath()
+                }
+                function b(e, t) {
+                  e.rect(t.x, t.y, t.width, t.height),
+                      e.closePath()
+                }
+                function f(e, t) {
+                  var i = t.width / 2,
+                      n = t.height / 2,
+                      a = t.x + i,
+                      o = t.y + n,
+                      r = Math.min(i, n);
+                  e.moveTo(a, o - r),
+                      e.lineTo(a + r, o + r),
+                      e.lineTo(a - r, o + r),
+                      e.lineTo(a, o - r),
+                      e.closePath()
+                }
+                function k(e, t) {
+                  var i = t.width / 2,
+                      n = t.height / 2,
+                      a = t.x + i,
+                      o = t.y + n,
+                      r = Math.min(i, n);
+                  e.moveTo(a, o - r),
+                      e.lineTo(a + r, o),
+                      e.lineTo(a, o + r),
+                      e.lineTo(a - r, o),
+                      e.lineTo(a, o - r),
+                      e.closePath()
+                }
+                function x(e, t) {
+                  var i = t.x,
+                      n = t.y,
+                      a = t.width / 16;
+                  e.moveTo(i + 8 * a, n),
+                      e.lineTo(i + a, n + t.height),
+                      e.lineTo(i + 8 * a, n + t.height / 4 * 3),
+                      e.lineTo(i + 15 * a, n + t.height),
+                      e.lineTo(i + 8 * a, n),
+                      e.closePath()
+                }
+                function _(t, i) {
+                  var n = e("zrender/shape/Star"),
+                      a = i.width / 2,
+                      o = i.height / 2;
+                  n.prototype.buildPath(t, {
+                    x: i.x + a,
+                    y: i.y + o,
+                    r: Math.min(a, o),
+                    n: i.n || 5
+                  })
+                }
+                function L(t, i) {
+                  var n = e("zrender/shape/Heart");
+                  n.prototype.buildPath(t, {
+                    x: i.x + i.width / 2,
+                    y: i.y + .2 * i.height,
+                    a: i.width / 2,
+                    b: .8 * i.height
+                  })
+                }
+                function W(t, i) {
+                  var n = e("zrender/shape/Droplet");
+                  n.prototype.buildPath(t, {
+                    x: i.x + .5 * i.width,
+                    y: i.y + .5 * i.height,
+                    a: .5 * i.width,
+                    b: .8 * i.height
+                  })
+                }
+                function X(e, t) {
+                  var i = t.x,
+                      n = t.y - t.height / 2 * 1.5,
+                      a = t.width / 2,
+                      o = t.height / 2,
+                      r = Math.min(a, o);
+                  e.arc(i + a, n + o, r, Math.PI / 5 * 4, Math.PI / 5),
+                      e.lineTo(i + a, n + o + 1.5 * r),
+                      e.closePath()
+                }
+                function v(t, i, n) {
+                  var a = e("zrender/shape/Image");
+                  this._imageShape = this._imageShape || new a({
+                    style: {}
+                  });
+                  for (var o in i) this._imageShape.style[o] = i[o];
+                  this._imageShape.brush(t, !1, n)
+                }
+                function w(e) {
+                  I.call(this, e)
+                }
+                var K = e("zrender/tool/util"),
+                    I = e("zrender/shape/Base");
+                return w.prototype = {
+                  type: "icon",
+                  iconLibrary: {
+                    mark: t,
+                    markUndo: i,
+                    markClear: n,
+                    dataZoom: a,
+                    dataZoomReset: o,
+                    restore: r,
+                    lineChart: s,
+                    barChart: l,
+                    pieChart: h,
+                    funnelChart: m,
+                    forceChart: V,
+                    chordChart: U,
+                    stackChart: d,
+                    tiledChart: p,
+                    dataView: c,
+                    saveAsImage: u,
+                    cross: y,
+                    circle: g,
+                    rectangle: b,
+                    triangle: f,
+                    diamond: k,
+                    arrow: x,
+                    star: _,
+                    heart: L,
+                    droplet: W,
+                    pin: X,
+                    image: v
+                  },
+                  brush: function(t, i, n) {
+                    var a = i ? this.highlightStyle: this.style;
+                    a = a || {};
+                    var o = a.iconType || this.style.iconType;
+                    if ("image" === o) {
+                      var r = e("zrender/shape/Image");
+                      r.prototype.brush.call(this, t, i, n)
+                    } else {
+                      var a = this.beforeBrush(t, i);
+                      switch (t.beginPath(), this.buildPath(t, a, n), a.brushType) {
+                        case "both":
+                          t.fill();
+                        case "stroke":
+                          a.lineWidth > 0 && t.stroke();
+                          break;
+                        default:
+                          t.fill()
+                      }
+                      this.drawText(t, a, this.style),
+                          this.afterBrush(t)
+                    }
+                  },
+                  buildPath: function(e, t, i) {
+                    this.iconLibrary[t.iconType] ? this.iconLibrary[t.iconType].call(this, e, t, i) : (e.moveTo(t.x, t.y), e.lineTo(t.x + t.width, t.y), e.lineTo(t.x + t.width, t.y + t.height), e.lineTo(t.x, t.y + t.height), e.lineTo(t.x, t.y), e.closePath())
+                  },
+                  getRect: function(e) {
+                    return e.__rect ? e.__rect: (e.__rect = {
+                      x: Math.round(e.x),
+                      y: Math.round(e.y - ("pin" == e.iconType ? e.height / 2 * 1.5 : 0)),
+                      width: e.width,
+                      height: e.height * ("pin" === e.iconType ? 1.25 : 1)
+                    },
+                        e.__rect)
+                  },
+                  isCover: function(e, t) {
+                    var i = this.transformCoordToLocal(e, t);
+                    e = i[0],
+                        t = i[1];
+                    var n = this.style.__rect;
+                    n || (n = this.style.__rect = this.getRect(this.style));
+                    var a = n.height < 8 || n.width < 8 ? 4 : 0;
+                    return e >= n.x - a && e <= n.x + n.width + a && t >= n.y - a && t <= n.y + n.height + a
+                  }
+                },
+                    K.inherits(w, I),
+                    w
+              }),
+          i("echarts/util/shape/MarkLine", ["require", "zrender/shape/Base", "./Icon", "zrender/shape/Line", "zrender/shape/BezierCurve", "zrender/tool/area", "zrender/shape/util/dashedLineTo", "zrender/tool/util", "zrender/tool/curve"],
+              function(e) {
+                function t(e) {
+                  i.call(this, e),
+                  this.style.curveness > 0 && this.updatePoints(this.style),
+                  this.highlightStyle.curveness > 0 && this.updatePoints(this.highlightStyle)
+                }
+                var i = e("zrender/shape/Base"),
+                    n = e("./Icon"),
+                    a = e("zrender/shape/Line"),
+                    o = new a({}),
+                    r = e("zrender/shape/BezierCurve"),
+                    s = new r({}),
+                    l = e("zrender/tool/area"),
+                    h = e("zrender/shape/util/dashedLineTo"),
+                    m = e("zrender/tool/util"),
+                    V = e("zrender/tool/curve");
+                return t.prototype = {
+                  type: "mark-line",
+                  brush: function(e, t) {
+                    var i = this.style;
+                    t && (i = this.getHighlightStyle(i, this.highlightStyle || {})),
+                        e.save(),
+                        this.setContext(e, i),
+                        this.setTransform(e),
+                        e.save(),
+                        e.beginPath(),
+                        this.buildPath(e, i),
+                        e.stroke(),
+                        e.restore(),
+                        this.brushSymbol(e, i, 0),
+                        this.brushSymbol(e, i, 1),
+                        this.drawText(e, i, this.style),
+                        e.restore()
+                  },
+                  buildPath: function(e, t) {
+                    var i = t.lineType || "solid";
+                    if (e.moveTo(t.xStart, t.yStart), t.curveness > 0) {
+                      var n = null;
+                      switch (i) {
+                        case "dashed":
+                          n = [5, 5];
+                          break;
+                        case "dotted":
+                          n = [1, 1]
+                      }
+                      n && e.setLineDash && e.setLineDash(n),
+                          e.quadraticCurveTo(t.cpX1, t.cpY1, t.xEnd, t.yEnd)
+                    } else if ("solid" == i) e.lineTo(t.xEnd, t.yEnd);
+                    else {
+                      var a = (t.lineWidth || 1) * ("dashed" == t.lineType ? 5 : 1);
+                      h(e, t.xStart, t.yStart, t.xEnd, t.yEnd, a)
+                    }
+                  },
+                  updatePoints: function(e) {
+                    var t = e.curveness || 0,
+                        i = 1,
+                        n = e.xStart,
+                        a = e.yStart,
+                        o = e.xEnd,
+                        r = e.yEnd,
+                        s = (n + o) / 2 - i * (a - r) * t,
+                        l = (a + r) / 2 - i * (o - n) * t;
+                    e.cpX1 = s,
+                        e.cpY1 = l
+                  },
+                  brushSymbol: function(e, t, i) {
+                    if ("none" != t.symbol[i]) {
+                      e.save(),
+                          e.beginPath(),
+                          e.lineWidth = t.symbolBorder,
+                          e.strokeStyle = t.symbolBorderColor;
+                      var a = t.symbol[i].replace("empty", "").toLowerCase();
+                      t.symbol[i].match("empty") && (e.fillStyle = "#fff");
+                      var o = t.xStart,
+                          r = t.yStart,
+                          s = t.xEnd,
+                          l = t.yEnd,
+                          h = 0 === i ? o: s,
+                          m = 0 === i ? r: l,
+                          U = t.curveness || 0,
+                          d = null != t.symbolRotate[i] ? t.symbolRotate[i] - 0 : 0;
+                      if (d = d / 180 * Math.PI, "arrow" == a && 0 === d) if (0 === U) {
+                        var p = 0 === i ? -1 : 1;
+                        d = Math.PI / 2 + Math.atan2(p * (l - r), p * (s - o))
+                      } else {
+                        var c = t.cpX1,
+                            u = t.cpY1,
+                            y = V.quadraticDerivativeAt,
+                            g = y(o, c, s, i),
+                            b = y(r, u, l, i);
+                        d = Math.PI / 2 + Math.atan2(b, g)
+                      }
+                      e.translate(h, m),
+                      0 !== d && e.rotate(d);
+                      var f = t.symbolSize[i];
+                      n.prototype.buildPath(e, {
+                        x: -f,
+                        y: -f,
+                        width: 2 * f,
+                        height: 2 * f,
+                        iconType: a
+                      }),
+                          e.closePath(),
+                          e.fill(),
+                          e.stroke(),
+                          e.restore()
+                    }
+                  },
+                  getRect: function(e) {
+                    return e.curveness > 0 ? s.getRect(e) : o.getRect(e),
+                        e.__rect
+                  },
+                  isCover: function(e, t) {
+                    var i = this.transformCoordToLocal(e, t);
+                    return e = i[0],
+                        t = i[1],
+                        this.isCoverRect(e, t) ? this.style.curveness > 0 ? l.isInside(s, this.style, e, t) : l.isInside(o, this.style, e, t) : !1
+                  }
+                },
+                    m.inherits(t, i),
+                    t
+              }),
+          i("echarts/util/shape/Symbol", ["require", "zrender/shape/Base", "zrender/shape/Polygon", "zrender/tool/util", "./normalIsCover"],
+              function(e) {
+                function t(e) {
+                  i.call(this, e)
+                }
+                var i = e("zrender/shape/Base"),
+                    n = e("zrender/shape/Polygon"),
+                    a = new n({}),
+                    o = e("zrender/tool/util");
+                return t.prototype = {
+                  type: "symbol",
+                  buildPath: function(e, t) {
+                    var i = t.pointList,
+                        n = i.length;
+                    if (0 !== n) for (var a, o, r, s, l, h = 1e4,
+                                          m = Math.ceil(n / h), V = i[0] instanceof Array, U = t.size ? t.size: 2, d = U, p = U / 2, c = 2 * Math.PI, u = 0; m > u; u++) {
+                      e.beginPath(),
+                          a = u * h,
+                          o = a + h,
+                          o = o > n ? n: o;
+                      for (var y = a; o > y; y++) if (t.random && (r = t["randomMap" + y % 20] / 100, d = U * r * r, p = d / 2), V ? (s = i[y][0], l = i[y][1]) : (s = i[y].x, l = i[y].y), 3 > d) e.rect(s - p, l - p, d, d);
+                      else switch (t.iconType) {
+                          case "circle":
+                            e.moveTo(s, l),
+                                e.arc(s, l, p, 0, c, !0);
+                            break;
+                          case "diamond":
+                            e.moveTo(s, l - p),
+                                e.lineTo(s + p / 3, l - p / 3),
+                                e.lineTo(s + p, l),
+                                e.lineTo(s + p / 3, l + p / 3),
+                                e.lineTo(s, l + p),
+                                e.lineTo(s - p / 3, l + p / 3),
+                                e.lineTo(s - p, l),
+                                e.lineTo(s - p / 3, l - p / 3),
+                                e.lineTo(s, l - p);
+                            break;
+                          default:
+                            e.rect(s - p, l - p, d, d)
+                        }
+                      if (e.closePath(), m - 1 > u) switch (t.brushType) {
+                        case "both":
+                          e.fill(),
+                          t.lineWidth > 0 && e.stroke();
+                          break;
+                        case "stroke":
+                          t.lineWidth > 0 && e.stroke();
+                          break;
+                        default:
+                          e.fill()
+                      }
+                    }
+                  },
+                  getRect: function(e) {
+                    return e.__rect || a.getRect(e)
+                  },
+                  isCover: e("./normalIsCover")
+                },
+                    o.inherits(t, i),
+                    t
+              }),
+          i("zrender/shape/Polyline", ["require", "./Base", "./util/smoothSpline", "./util/smoothBezier", "./util/dashedLineTo", "./Polygon", "../tool/util"],
+              function(e) {
+                var t = e("./Base"),
+                    i = e("./util/smoothSpline"),
+                    n = e("./util/smoothBezier"),
+                    a = e("./util/dashedLineTo"),
+                    o = function(e) {
+                      this.brushTypeOnly = "stroke",
+                          this.textPosition = "end",
+                          t.call(this, e)
+                    };
+                return o.prototype = {
+                  type: "polyline",
+                  buildPath: function(e, t) {
+                    var n = t.pointList;
+                    if (! (n.length < 2)) {
+                      var o = Math.min(t.pointList.length, Math.round(t.pointListLength || t.pointList.length));
+                      if (t.smooth && "spline" !== t.smooth) {
+                        t.controlPointList || this.updateControlPoints(t);
+                        var r = t.controlPointList;
+                        e.moveTo(n[0][0], n[0][1]);
+                        for (var s, l, h, m = 0; o - 1 > m; m++) s = r[2 * m],
+                            l = r[2 * m + 1],
+                            h = n[m + 1],
+                            e.bezierCurveTo(s[0], s[1], l[0], l[1], h[0], h[1])
+                      } else if ("spline" === t.smooth && (n = i(n), o = n.length), t.lineType && "solid" != t.lineType) {
+                        if ("dashed" == t.lineType || "dotted" == t.lineType) {
+                          var V = (t.lineWidth || 1) * ("dashed" == t.lineType ? 5 : 1);
+                          e.moveTo(n[0][0], n[0][1]);
+                          for (var m = 1; o > m; m++) a(e, n[m - 1][0], n[m - 1][1], n[m][0], n[m][1], V)
+                        }
+                      } else {
+                        e.moveTo(n[0][0], n[0][1]);
+                        for (var m = 1; o > m; m++) e.lineTo(n[m][0], n[m][1])
+                      }
+                    }
+                  },
+                  updateControlPoints: function(e) {
+                    e.controlPointList = n(e.pointList, e.smooth, !1, e.smoothConstraint)
+                  },
+                  getRect: function(t) {
+                    return e("./Polygon").prototype.getRect(t)
+                  }
+                },
+                    e("../tool/util").inherits(o, t),
+                    o
+              }),
+          i("zrender/shape/ShapeBundle", ["require", "./Base", "../tool/util"],
+              function(e) {
+                var t = e("./Base"),
+                    i = function(e) {
+                      t.call(this, e)
+                    };
+                return i.prototype = {
+                  constructor: i,
+                  type: "shape-bundle",
+                  brush: function(e, t) {
+                    var i = this.beforeBrush(e, t);
+                    e.beginPath();
+                    for (var n = 0; n < i.shapeList.length; n++) {
+                      var a = i.shapeList[n],
+                          o = a.style;
+                      t && (o = a.getHighlightStyle(o, a.highlightStyle || {},
+                          a.brushTypeOnly)),
+                          a.buildPath(e, o)
+                    }
+                    switch (i.brushType) {
+                      case "both":
+                        e.fill();
+                      case "stroke":
+                        i.lineWidth > 0 && e.stroke();
+                        break;
+                      default:
+                        e.fill()
+                    }
+                    this.drawText(e, i, this.style),
+                        this.afterBrush(e)
+                  },
+                  getRect: function(e) {
+                    if (e.__rect) return e.__rect;
+                    for (var t = 1 / 0,
+                             i = -(1 / 0), n = 1 / 0, a = -(1 / 0), o = 0; o < e.shapeList.length; o++) var r = e.shapeList[o],
+                             s = r.getRect(r.style),
+                             t = Math.min(s.x, t),
+                             n = Math.min(s.y, n),
+                             i = Math.max(s.x + s.width, i),
+                             a = Math.max(s.y + s.height, a);
+                    return e.__rect = {
+                      x: t,
+                      y: n,
+                      width: i - t,
+                      height: a - n
+                    },
+                        e.__rect
+                  },
+                  isCover: function(e, t) {
+                    var i = this.transformCoordToLocal(e, t);
+                    if (e = i[0], t = i[1], this.isCoverRect(e, t)) for (var n = 0; n < this.style.shapeList.length; n++) {
+                      var a = this.style.shapeList[n];
+                      if (a.isCover(e, t)) return ! 0
+                    }
+                    return ! 1
+                  }
+                },
+                    e("../tool/util").inherits(i, t),
+                    i
+              }),
+          i("echarts/util/ecAnimation", ["require", "zrender/tool/util", "zrender/tool/curve", "zrender/shape/Polygon"],
+              function(e) {
+                function t(e, t, i, n, a) {
+                  var o, r = i.style.pointList,
+                      s = r.length;
+                  if (!t) {
+                    if (o = [], "vertical" != i._orient) for (var l = r[0][1], h = 0; s > h; h++) o[h] = [r[h][0], l];
+                    else for (var m = r[0][0], h = 0; s > h; h++) o[h] = [m, r[h][1]];
+                    "half-smooth-polygon" == i.type && (o[s - 1] = p.clone(r[s - 1]), o[s - 2] = p.clone(r[s - 2])),
+                        t = {
+                          style: {
+                            pointList: o
+                          }
+                        }
+                  }
+                  o = t.style.pointList;
+                  var V = o.length;
+                  i.style.pointList = V == s ? o: s > V ? o.concat(r.slice(V)) : o.slice(0, s),
+                      e.addShape(i),
+                      i.__animating = !0,
+                      e.animate(i.id, "style").when(n, {
+                        pointList: r
+                      }).during(function() {
+                        i.updateControlPoints && i.updateControlPoints(i.style)
+                      }).done(function() {
+                        i.__animating = !1
+                      }).start(a)
+                }
+                function i(e, t) {
+                  for (var i = arguments.length,
+                           n = 2; i > n; n++) {
+                    var a = arguments[n];
+                    e.style[a] = t.style[a]
+                  }
+                }
+                function n(e, t, n, a, o) {
+                  var r = n.style;
+                  t || (t = {
+                    position: n.position,
+                    style: {
+                      x: r.x,
+                      y: "vertical" == n._orient ? r.y + r.height: r.y,
+                      width: "vertical" == n._orient ? r.width: 0,
+                      height: "vertical" != n._orient ? r.height: 0
+                    }
+                  });
+                  var s = r.x,
+                      l = r.y,
+                      h = r.width,
+                      m = r.height,
+                      V = [n.position[0], n.position[1]];
+                  i(n, t, "x", "y", "width", "height"),
+                      n.position = t.position,
+                      e.addShape(n),
+                  (V[0] != t.position[0] || V[1] != t.position[1]) && e.animate(n.id, "").when(a, {
+                    position: V
+                  }).start(o),
+                      n.__animating = !0,
+                      e.animate(n.id, "style").when(a, {
+                        x: s,
+                        y: l,
+                        width: h,
+                        height: m
+                      }).done(function() {
+                        n.__animating = !1
+                      }).start(o)
+                }
+                function a(e, t, i, n, a) {
+                  if (!t) {
+                    var o = i.style.y;
+                    t = {
+                      style: {
+                        y: [o[0], o[0], o[0], o[0]]
+                      }
+                    }
+                  }
+                  var r = i.style.y;
+                  i.style.y = t.style.y,
+                      e.addShape(i),
+                      i.__animating = !0,
+                      e.animate(i.id, "style").when(n, {
+                        y: r
+                      }).done(function() {
+                        i.__animating = !1
+                      }).start(a)
+                }
+                function o(e, t, i, n, a) {
+                  var o = i.style.x,
+                      r = i.style.y,
+                      s = i.style.r0,
+                      l = i.style.r;
+                  i.__animating = !0,
+                      "r" != i._animationAdd ? (i.style.r0 = 0, i.style.r = 0, i.rotation = [2 * Math.PI, o, r], e.addShape(i), e.animate(i.id, "style").when(n, {
+                        r0: s,
+                        r: l
+                      }).done(function() {
+                        i.__animating = !1
+                      }).start(a), e.animate(i.id, "").when(n, {
+                        rotation: [0, o, r]
+                      }).start(a)) : (i.style.r0 = i.style.r, e.addShape(i), e.animate(i.id, "style").when(n, {
+                        r0: s
+                      }).done(function() {
+                        i.__animating = !1
+                      }).start(a))
+                }
+                function r(e, t, n, a, o) {
+                  t || (t = "r" != n._animationAdd ? {
+                    style: {
+                      startAngle: n.style.startAngle,
+                      endAngle: n.style.startAngle
+                    }
+                  }: {
+                    style: {
+                      r0: n.style.r
+                    }
+                  });
+                  var r = n.style.startAngle,
+                      s = n.style.endAngle;
+                  i(n, t, "startAngle", "endAngle"),
+                      e.addShape(n),
+                      n.__animating = !0,
+                      e.animate(n.id, "style").when(a, {
+                        startAngle: r,
+                        endAngle: s
+                      }).done(function() {
+                        n.__animating = !1
+                      }).start(o)
+                }
+                function s(e, t, n, a, o) {
+                  t || (t = {
+                    style: {
+                      x: "left" == n.style.textAlign ? n.style.x + 100 : n.style.x - 100,
+                      y: n.style.y
+                    }
+                  });
+                  var r = n.style.x,
+                      s = n.style.y;
+                  i(n, t, "x", "y"),
+                      e.addShape(n),
+                      n.__animating = !0,
+                      e.animate(n.id, "style").when(a, {
+                        x: r,
+                        y: s
+                      }).done(function() {
+                        n.__animating = !1
+                      }).start(o)
+                }
+                function l(t, i, n, a, o) {
+                  var r = e("zrender/shape/Polygon").prototype.getRect(n.style),
+                      s = r.x + r.width / 2,
+                      l = r.y + r.height / 2;
+                  n.scale = [.1, .1, s, l],
+                      t.addShape(n),
+                      n.__animating = !0,
+                      t.animate(n.id, "").when(a, {
+                        scale: [1, 1, s, l]
+                      }).done(function() {
+                        n.__animating = !1
+                      }).start(o)
+                }
+                function h(e, t, n, a, o) {
+                  t || (t = {
+                    style: {
+                      source0: 0,
+                      source1: n.style.source1 > 0 ? 360 : -360,
+                      target0: 0,
+                      target1: n.style.target1 > 0 ? 360 : -360
+                    }
+                  });
+                  var r = n.style.source0,
+                      s = n.style.source1,
+                      l = n.style.target0,
+                      h = n.style.target1;
+                  t.style && i(n, t, "source0", "source1", "target0", "target1"),
+                      e.addShape(n),
+                      n.__animating = !0,
+                      e.animate(n.id, "style").when(a, {
+                        source0: r,
+                        source1: s,
+                        target0: l,
+                        target1: h
+                      }).done(function() {
+                        n.__animating = !1
+                      }).start(o)
+                }
+                function m(e, t, i, n, a) {
+                  t || (t = {
+                    style: {
+                      angle: i.style.startAngle
+                    }
+                  });
+                  var o = i.style.angle;
+                  i.style.angle = t.style.angle,
+                      e.addShape(i),
+                      i.__animating = !0,
+                      e.animate(i.id, "style").when(n, {
+                        angle: o
+                      }).done(function() {
+                        i.__animating = !1
+                      }).start(a)
+                }
+                function V(e, t, i, a, o, r) {
+                  if (i.style._x = i.style.x, i.style._y = i.style.y, i.style._width = i.style.width, i.style._height = i.style.height, t) n(e, t, i, a, o);
+                  else {
+                    var s = i._x || 0,
+                        l = i._y || 0;
+                    i.scale = [.01, .01, s, l],
+                        e.addShape(i),
+                        i.__animating = !0,
+                        e.animate(i.id, "").delay(r).when(a, {
+                          scale: [1, 1, s, l]
+                        }).done(function() {
+                          i.__animating = !1
+                        }).start(o || "QuinticOut")
+                  }
+                }
+                function U(e, t, n, a, o) {
+                  t || (t = {
+                    style: {
+                      xStart: n.style.xStart,
+                      yStart: n.style.yStart,
+                      xEnd: n.style.xStart,
+                      yEnd: n.style.yStart
+                    }
+                  });
+                  var r = n.style.xStart,
+                      s = n.style.xEnd,
+                      l = n.style.yStart,
+                      h = n.style.yEnd;
+                  i(n, t, "xStart", "xEnd", "yStart", "yEnd"),
+                      e.addShape(n),
+                      n.__animating = !0,
+                      e.animate(n.id, "style").when(a, {
+                        xStart: r,
+                        xEnd: s,
+                        yStart: l,
+                        yEnd: h
+                      }).done(function() {
+                        n.__animating = !1
+                      }).start(o)
+                }
+                function d(e, t, i, n, a) {
+                  a = a || "QuinticOut",
+                      i.__animating = !0,
+                      e.addShape(i);
+                  var o = i.style,
+                      r = function() {
+                        i.__animating = !1
+                      },
+                      s = o.xStart,
+                      l = o.yStart,
+                      h = o.xEnd,
+                      m = o.yEnd;
+                  if (o.curveness > 0) {
+                    i.updatePoints(o);
+                    var V = {
+                          p: 0
+                        },
+                        U = o.cpX1,
+                        d = o.cpY1,
+                        p = [],
+                        u = [],
+                        y = c.quadraticSubdivide;
+                    e.animation.animate(V).when(n, {
+                      p: 1
+                    }).during(function() {
+                      y(s, U, h, V.p, p),
+                          y(l, d, m, V.p, u),
+                          o.cpX1 = p[1],
+                          o.cpY1 = u[1],
+                          o.xEnd = p[2],
+                          o.yEnd = u[2],
+                          e.modShape(i)
+                    }).done(r).start(a)
+                  } else e.animate(i.id, "style").when(0, {
+                    xEnd: s,
+                    yEnd: l
+                  }).when(n, {
+                    xEnd: h,
+                    yEnd: m
+                  }).done(r).start(a)
+                }
+                var p = e("zrender/tool/util"),
+                    c = e("zrender/tool/curve");
+                return {
+                  pointList: t,
+                  rectangle: n,
+                  candle: a,
+                  ring: o,
+                  sector: r,
+                  text: s,
+                  polygon: l,
+                  ribbon: h,
+                  gaugePointer: m,
+                  icon: V,
+                  line: U,
+                  markline: d
+                }
+              }),
+          i("echarts/util/ecEffect", ["require", "../util/ecData", "zrender/shape/Circle", "zrender/shape/Image", "zrender/tool/curve", "../util/shape/Icon", "../util/shape/Symbol", "zrender/shape/ShapeBundle", "zrender/shape/Polyline", "zrender/tool/vector", "zrender/tool/env"],
+              function(e) {
+                function t(e, t, i, n) {
+                  var a, r = i.effect,
+                      l = r.color || i.style.strokeColor || i.style.color,
+                      m = r.shadowColor || l,
+                      V = r.scaleSize,
+                      U = r.bounceDistance,
+                      d = "undefined" != typeof r.shadowBlur ? r.shadowBlur: V;
+                  "image" !== i.type ? (a = new h({
+                    zlevel: n,
+                    style: {
+                      brushType: "stroke",
+                      iconType: "droplet" != i.style.iconType ? i.style.iconType: "circle",
+                      x: d + 1,
+                      y: d + 1,
+                      n: i.style.n,
+                      width: i.style._width * V,
+                      height: i.style._height * V,
+                      lineWidth: 1,
+                      strokeColor: l,
+                      shadowColor: m,
+                      shadowBlur: d
+                    },
+                    draggable: !1,
+                    hoverable: !1
+                  }), "pin" == i.style.iconType && (a.style.y += a.style.height / 2 * 1.5), p && (a.style.image = e.shapeToImage(a, a.style.width + 2 * d + 2, a.style.height + 2 * d + 2).style.image, a = new s({
+                    zlevel: a.zlevel,
+                    style: a.style,
+                    draggable: !1,
+                    hoverable: !1
+                  }))) : a = new s({
+                    zlevel: n,
+                    style: i.style,
+                    draggable: !1,
+                    hoverable: !1
+                  }),
+                      o.clone(i, a),
+                      a.position = i.position,
+                      t.push(a),
+                      e.addShape(a);
+                  var c = "image" !== i.type ? window.devicePixelRatio || 1 : 1,
+                      u = (a.style.width / c - i.style._width) / 2;
+                  a.style.x = i.style._x - u,
+                      a.style.y = i.style._y - u,
+                  "pin" == i.style.iconType && (a.style.y -= i.style.height / 2 * 1.5);
+                  var y = 100 * (r.period + 10 * Math.random());
+                  e.modShape(i.id, {
+                    invisible: !0
+                  });
+                  var g = a.style.x + a.style.width / 2 / c,
+                      b = a.style.y + a.style.height / 2 / c;
+                  "scale" === r.type ? (e.modShape(a.id, {
+                    scale: [.1, .1, g, b]
+                  }), e.animate(a.id, "", r.loop).when(y, {
+                    scale: [1, 1, g, b]
+                  }).done(function() {
+                    i.effect.show = !1,
+                        e.delShape(a.id)
+                  }).start()) : e.animate(a.id, "style", r.loop).when(y, {
+                    y: a.style.y - U
+                  }).when(2 * y, {
+                    y: a.style.y
+                  }).done(function() {
+                    i.effect.show = !1,
+                        e.delShape(a.id)
+                  }).start()
+                }
+                function i(e, t, i, n) {
+                  var a = i.effect,
+                      o = a.color || i.style.strokeColor || i.style.color,
+                      r = a.scaleSize,
+                      s = a.shadowColor || o,
+                      l = "undefined" != typeof a.shadowBlur ? a.shadowBlur: 2 * r,
+                      h = window.devicePixelRatio || 1,
+                      V = new m({
+                        zlevel: n,
+                        position: i.position,
+                        scale: i.scale,
+                        style: {
+                          pointList: i.style.pointList,
+                          iconType: i.style.iconType,
+                          color: o,
+                          strokeColor: o,
+                          shadowColor: s,
+                          shadowBlur: l * h,
+                          random: !0,
+                          brushType: "fill",
+                          lineWidth: 1,
+                          size: i.style.size
+                        },
+                        draggable: !1,
+                        hoverable: !1
+                      });
+                  t.push(V),
+                      e.addShape(V),
+                      e.modShape(i.id, {
+                        invisible: !0
+                      });
+                  for (var U = Math.round(100 * a.period), d = {},
+                           p = {},
+                           c = 0; 20 > c; c++) V.style["randomMap" + c] = 0,
+                      d = {},
+                      d["randomMap" + c] = 100,
+                      p = {},
+                      p["randomMap" + c] = 0,
+                      V.style["randomMap" + c] = 100 * Math.random(),
+                      e.animate(V.id, "style", !0).when(U, d).when(2 * U, p).when(3 * U, d).when(4 * U, d).delay(Math.random() * U * c).start()
+                }
+                function n(e, t, i, n, a) {
+                  var s = i.effect,
+                      h = i.style,
+                      m = s.color || h.strokeColor || h.color,
+                      V = s.shadowColor || h.strokeColor || m,
+                      c = h.lineWidth * s.scaleSize,
+                      u = "undefined" != typeof s.shadowBlur ? s.shadowBlur: c,
+                      y = new r({
+                        zlevel: n,
+                        style: {
+                          x: u,
+                          y: u,
+                          r: c,
+                          color: m,
+                          shadowColor: V,
+                          shadowBlur: u
+                        },
+                        hoverable: !1
+                      }),
+                      g = 0;
+                  if (p && !a) {
+                    var n = y.zlevel;
+                    y = e.shapeToImage(y, 2 * (c + u), 2 * (c + u)),
+                        y.zlevel = n,
+                        y.hoverable = !1,
+                        g = u
+                  }
+                  a || (o.clone(i, y), y.position = i.position, t.push(y), e.addShape(y));
+                  var b = function() {
+                    a || (i.effect.show = !1, e.delShape(y.id)),
+                        y.effectAnimator = null
+                  };
+                  if (i instanceof U) {
+                    for (var f = [0], k = 0, x = h.pointList, _ = h.controlPointList, L = 1; L < x.length; L++) {
+                      if (_) {
+                        var W = _[2 * (L - 1)],
+                            X = _[2 * (L - 1) + 1];
+                        k += d.dist(x[L - 1], W) + d.dist(W, X) + d.dist(X, x[L])
+                      } else k += d.dist(x[L - 1], x[L]);
+                      f.push(k)
+                    }
+                    for (var v = {
+                          p: 0
+                        },
+                             w = e.animation.animate(v, {
+                               loop: s.loop
+                             }), L = 0; L < f.length; L++) w.when(f[L] * s.period, {
+                      p: L
+                    });
+                    w.during(function() {
+                      var t, i, n = Math.floor(v.p);
+                      if (n == x.length - 1) t = x[n][0],
+                          i = x[n][1];
+                      else {
+                        var o = v.p - n,
+                            r = x[n],
+                            s = x[n + 1];
+                        if (_) {
+                          var h = _[2 * n],
+                              m = _[2 * n + 1];
+                          t = l.cubicAt(r[0], h[0], m[0], s[0], o),
+                              i = l.cubicAt(r[1], h[1], m[1], s[1], o)
+                        } else t = (s[0] - r[0]) * o + r[0],
+                            i = (s[1] - r[1]) * o + r[1]
+                      }
+                      y.style.x = t,
+                          y.style.y = i,
+                      a || e.modShape(y)
+                    }).done(b).start(),
+                        w.duration = k * s.period,
+                        y.effectAnimator = w
+                  } else {
+                    var K = h.xStart - g,
+                        I = h.yStart - g,
+                        J = h.xEnd - g,
+                        C = h.yEnd - g;
+                    y.style.x = K,
+                        y.style.y = I;
+                    var S = (J - K) * (J - K) + (C - I) * (C - I),
+                        E = Math.round(Math.sqrt(Math.round(S * s.period * s.period)));
+                    if (i.style.curveness > 0) {
+                      var F = h.cpX1 - g,
+                          T = h.cpY1 - g;
+                      y.effectAnimator = e.animation.animate(y, {
+                        loop: s.loop
+                      }).when(E, {
+                        p: 1
+                      }).during(function(t, i) {
+                        y.style.x = l.quadraticAt(K, F, J, i),
+                            y.style.y = l.quadraticAt(I, T, C, i),
+                        a || e.modShape(y)
+                      }).done(b).start()
+                    } else y.effectAnimator = e.animation.animate(y.style, {
+                      loop: s.loop
+                    }).when(E, {
+                      x: J,
+                      y: C
+                    }).during(function() {
+                      a || e.modShape(y)
+                    }).done(b).start();
+                    y.effectAnimator.duration = E
+                  }
+                  return y
+                }
+                function a(e, t, i, a) {
+                  var o = new V({
+                        style: {
+                          shapeList: []
+                        },
+                        zlevel: a,
+                        hoverable: !1
+                      }),
+                      r = i.style.shapeList,
+                      s = i.effect;
+                  o.position = i.position;
+                  for (var l = 0,
+                           h = [], m = 0; m < r.length; m++) {
+                    r[m].effect = s;
+                    var U = n(e, null, r[m], a, !0),
+                        d = U.effectAnimator;
+                    o.style.shapeList.push(U),
+                    d.duration > l && (l = d.duration),
+                    0 === m && (o.style.color = U.style.color, o.style.shadowBlur = U.style.shadowBlur, o.style.shadowColor = U.style.shadowColor),
+                        h.push(d)
+                  }
+                  t.push(o),
+                      e.addShape(o);
+                  var p = function() {
+                    for (var e = 0; e < h.length; e++) h[e].stop()
+                  };
+                  if (l) {
+                    o.__dummy = 0;
+                    var c = e.animate(o.id, "", s.loop).when(l, {
+                          __dummy: 1
+                        }).during(function() {
+                          e.modShape(o)
+                        }).done(function() {
+                          i.effect.show = !1,
+                              e.delShape(o.id)
+                        }).start(),
+                        u = c.stop;
+                    c.stop = function() {
+                      p(),
+                          u.call(this)
+                    }
+                  }
+                }
+                var o = e("../util/ecData"),
+                    r = e("zrender/shape/Circle"),
+                    s = e("zrender/shape/Image"),
+                    l = e("zrender/tool/curve"),
+                    h = e("../util/shape/Icon"),
+                    m = e("../util/shape/Symbol"),
+                    V = e("zrender/shape/ShapeBundle"),
+                    U = e("zrender/shape/Polyline"),
+                    d = e("zrender/tool/vector"),
+                    p = e("zrender/tool/env").canvasSupported;
+                return {
+                  point: t,
+                  largePoint: i,
+                  line: n,
+                  largeLine: a
+                }
+              }),
+          i("echarts/component/base", ["require", "../config", "../util/ecData", "../util/ecQuery", "../util/number", "zrender/tool/util", "zrender/tool/env"],
+              function(e) {
+                function t(e, t, a, o, r) {
+                  this.ecTheme = e,
+                      this.messageCenter = t,
+                      this.zr = a,
+                      this.option = o,
+                      this.series = o.series,
+                      this.myChart = r,
+                      this.component = r.component,
+                      this.shapeList = [],
+                      this.effectList = [];
+                  var s = this;
+                  s._onlegendhoverlink = function(e) {
+                    if (s.legendHoverLink) for (var t, a = e.target,
+                                                    o = s.shapeList.length - 1; o >= 0; o--) t = s.type == i.CHART_TYPE_PIE || s.type == i.CHART_TYPE_FUNNEL ? n.get(s.shapeList[o], "name") : (n.get(s.shapeList[o], "series") || {}).name,
+                    t != a || s.shapeList[o].invisible || s.shapeList[o].__animating || s.zr.addHoverShape(s.shapeList[o])
+                  },
+                  t && t.bind(i.EVENT.LEGEND_HOVERLINK, this._onlegendhoverlink)
+                }
+                var i = e("../config"),
+                    n = e("../util/ecData"),
+                    a = e("../util/ecQuery"),
+                    o = e("../util/number"),
+                    r = e("zrender/tool/util");
+                return t.prototype = {
+                  canvasSupported: e("zrender/tool/env").canvasSupported,
+                  _getZ: function(e) {
+                    if (null != this[e]) return this[e];
+                    var t = this.ecTheme[this.type];
+                    return t && null != t[e] ? t[e] : (t = i[this.type], t && null != t[e] ? t[e] : 0)
+                  },
+                  getZlevelBase: function() {
+                    return this._getZ("zlevel")
+                  },
+                  getZBase: function() {
+                    return this._getZ("z")
+                  },
+                  reformOption: function(e) {
+                    return e = r.merge(r.merge(e || {},
+                        r.clone(this.ecTheme[this.type] || {})), r.clone(i[this.type] || {})),
+                        this.z = e.z,
+                        this.zlevel = e.zlevel,
+                        e
+                  },
+                  reformCssArray: function(e) {
+                    if (! (e instanceof Array)) return [e, e, e, e];
+                    switch (e.length + "") {
+                      case "4":
+                        return e;
+                      case "3":
+                        return [e[0], e[1], e[2], e[1]];
+                      case "2":
+                        return [e[0], e[1], e[0], e[1]];
+                      case "1":
+                        return [e[0], e[0], e[0], e[0]];
+                      case "0":
+                        return [0, 0, 0, 0]
+                    }
+                  },
+                  getShapeById: function(e) {
+                    for (var t = 0,
+                             i = this.shapeList.length; i > t; t++) if (this.shapeList[t].id === e) return this.shapeList[t];
+                    return null
+                  },
+                  getFont: function(e) {
+                    var t = this.getTextStyle(r.clone(e));
+                    return t.fontStyle + " " + t.fontWeight + " " + t.fontSize + "px " + t.fontFamily
+                  },
+                  getTextStyle: function(e) {
+                    return r.merge(r.merge(e || {},
+                        this.ecTheme.textStyle), i.textStyle)
+                  },
+                  getItemStyleColor: function(e, t, i, n) {
+                    return "function" == typeof e ? e.call(this.myChart, {
+                      seriesIndex: t,
+                      series: this.series[t],
+                      dataIndex: i,
+                      data: n
+                    }) : e
+                  },
+                  getDataFromOption: function(e, t) {
+                    return null != e ? null != e.value ? e.value: e: t
+                  },
+                  subPixelOptimize: function(e, t) {
+                    return e = t % 2 === 1 ? Math.floor(e) + .5 : Math.round(e)
+                  },
+                  resize: function() {
+                    this.refresh && this.refresh(),
+                    this.clearEffectShape && this.clearEffectShape(!0);
+                    var e = this;
+                    setTimeout(function() {
+                          e.animationEffect && e.animationEffect()
+                        },
+                        200)
+                  },
+                  clear: function() {
+                    this.clearEffectShape && this.clearEffectShape(),
+                    this.zr && this.zr.delShape(this.shapeList),
+                        this.shapeList = []
+                  },
+                  dispose: function() {
+                    this.onbeforDispose && this.onbeforDispose(),
+                        this.clear(),
+                        this.shapeList = null,
+                        this.effectList = null,
+                    this.messageCenter && this.messageCenter.unbind(i.EVENT.LEGEND_HOVERLINK, this._onlegendhoverlink),
+                    this.onafterDispose && this.onafterDispose()
+                  },
+                  query: a.query,
+                  deepQuery: a.deepQuery,
+                  deepMerge: a.deepMerge,
+                  parsePercent: o.parsePercent,
+                  parseCenter: o.parseCenter,
+                  parseRadius: o.parseRadius,
+                  numAddCommas: o.addCommas,
+                  getPrecision: o.getPrecision
+                },
+                    t
+              }),
+          i("echarts/layout/EdgeBundling", ["require", "../data/KDTree", "zrender/tool/vector"],
+              function(e) {
+                function t(e, t) {
+                  e = e.array,
+                      t = t.array;
+                  var i = t[0] - e[0],
+                      n = t[1] - e[1],
+                      a = t[2] - e[2],
+                      o = t[3] - e[3];
+                  return i * i + n * n + a * a + o * o
+                }
+                function i(e) {
+                  this.points = [e.mp0, e.mp1],
+                      this.group = e
+                }
+                function n(e) {
+                  var t = e.points;
+                  t[0][1] < t[1][1] || e instanceof i ? (this.array = [t[0][0], t[0][1], t[1][0], t[1][1]], this._startPoint = t[0], this._endPoint = t[1]) : (this.array = [t[1][0], t[1][1], t[0][0], t[0][1]], this._startPoint = t[1], this._endPoint = t[0]),
+                      this.ink = m(t[0], t[1]),
+                      this.edge = e,
+                      this.group = null
+                }
+                function a() {
+                  this.edgeList = [],
+                      this.mp0 = l(),
+                      this.mp1 = l(),
+                      this.ink = 0
+                }
+                function o() {
+                  this.maxNearestEdge = 6,
+                      this.maxTurningAngle = Math.PI / 4,
+                      this.maxIteration = 20
+                }
+                var r = e("../data/KDTree"),
+                    s = e("zrender/tool/vector"),
+                    l = s.create,
+                    h = s.distSquare,
+                    m = s.dist,
+                    V = s.copy,
+                    U = s.clone;
+                return n.prototype.getStartPoint = function() {
+                  return this._startPoint
+                },
+                    n.prototype.getEndPoint = function() {
+                      return this._endPoint
+                    },
+                    a.prototype.addEdge = function(e) {
+                      e.group = this,
+                          this.edgeList.push(e)
+                    },
+                    a.prototype.removeEdge = function(e) {
+                      e.group = null,
+                          this.edgeList.splice(this.edgeList.indexOf(e), 1)
+                    },
+                    o.prototype = {
+                      constructor: o,
+                      run: function(e) {
+                        function t(e, t) {
+                          return h(e, t) < 1e-10
+                        }
+                        function n(e, i) {
+                          for (var n = [], a = 0, o = 0; o < e.length; o++) a > 0 && t(e[o], n[a - 1]) || (n[a++] = U(e[o]));
+                          return i[0] && !t(n[0], i[0]) && (n = n.reverse()),
+                              n
+                        }
+                        for (var a = this._iterate(e), o = 0; o++<this.maxIteration;) {
+                          for (var r = [], s = 0; s < a.groups.length; s++) r.push(new i(a.groups[s]));
+                          var l = this._iterate(r);
+                          if (l.savedInk <= 0) break;
+                          a = l
+                        }
+                        var m = [],
+                            V = function(e, t) {
+                              for (var a, o = 0; o < e.length; o++) {
+                                var r = e[o];
+                                if (r.edgeList[0] && r.edgeList[0].edge instanceof i) {
+                                  for (var s = [], l = 0; l < r.edgeList.length; l++) s.push(r.edgeList[l].edge.group);
+                                  a = t ? t.slice() : [],
+                                      a.unshift(r.mp0),
+                                      a.push(r.mp1),
+                                      V(s, a)
+                                } else for (var l = 0; l < r.edgeList.length; l++) {
+                                  var h = r.edgeList[l];
+                                  a = t ? t.slice() : [],
+                                      a.unshift(r.mp0),
+                                      a.push(r.mp1),
+                                      a.unshift(h.getStartPoint()),
+                                      a.push(h.getEndPoint()),
+                                      m.push({
+                                        points: n(a, h.edge.points),
+                                        rawEdge: h.edge
+                                      })
+                                }
+                              }
+                            };
+                        return V(a.groups),
+                            m
+                      },
+                      _iterate: function(e) {
+                        for (var i = [], o = [], s = 0, h = 0; h < e.length; h++) {
+                          var m = new n(e[h]);
+                          i.push(m)
+                        }
+                        for (var U = new r(i, 4), d = [], p = l(), c = l(), u = 0, y = l(), g = l(), b = 0, h = 0; h < i.length; h++) {
+                          var m = i[h];
+                          if (!m.group) {
+                            U.nearestN(m, this.maxNearestEdge, t, d);
+                            for (var f = 0,
+                                     k = null,
+                                     x = null,
+                                     _ = 0; _ < d.length; _++) {
+                              var L = d[_],
+                                  W = 0;
+                              L.group ? L.group !== x && (x = L.group, u = this._calculateGroupEdgeInk(L.group, m, p, c), W = L.group.ink + m.ink - u) : (u = this._calculateEdgeEdgeInk(m, L, p, c), W = L.ink + m.ink - u),
+                              W > f && (f = W, k = L, V(g, c), V(y, p), b = u)
+                            }
+                            if (k) {
+                              s += f;
+                              var X;
+                              k.group || (X = new a, o.push(X), X.addEdge(k)),
+                                  X = k.group,
+                                  V(X.mp0, y),
+                                  V(X.mp1, g),
+                                  X.ink = b,
+                                  k.group.addEdge(m)
+                            } else {
+                              var X = new a;
+                              o.push(X),
+                                  V(X.mp0, m.getStartPoint()),
+                                  V(X.mp1, m.getEndPoint()),
+                                  X.ink = m.ink,
+                                  X.addEdge(m)
+                            }
+                          }
+                        }
+                        return {
+                          groups: o,
+                          edges: i,
+                          savedInk: s
+                        }
+                      },
+                      _calculateEdgeEdgeInk: function() {
+                        var e = [],
+                            t = [];
+                        return function(i, n, a, o) {
+                          e[0] = i.getStartPoint(),
+                              e[1] = n.getStartPoint(),
+                              t[0] = i.getEndPoint(),
+                              t[1] = n.getEndPoint(),
+                              this._calculateMeetPoints(e, t, a, o);
+                          var r = m(e[0], a) + m(a, o) + m(o, t[0]) + m(e[1], a) + m(o, t[1]);
+                          return r
+                        }
+                      } (),
+                      _calculateGroupEdgeInk: function(e, t, i, n) {
+                        for (var a = [], o = [], r = 0; r < e.edgeList.length; r++) {
+                          var s = e.edgeList[r];
+                          a.push(s.getStartPoint()),
+                              o.push(s.getEndPoint())
+                        }
+                        a.push(t.getStartPoint()),
+                            o.push(t.getEndPoint()),
+                            this._calculateMeetPoints(a, o, i, n);
+                        for (var l = m(i, n), r = 0; r < a.length; r++) l += m(a[r], i) + m(o[r], n);
+                        return l
+                      },
+                      _calculateMeetPoints: function() {
+                        var e = l(),
+                            t = l();
+                        return function(i, n, a, o) {
+                          s.set(e, 0, 0),
+                              s.set(t, 0, 0);
+                          for (var r = i.length,
+                                   l = 0; r > l; l++) s.add(e, e, i[l]);
+                          s.scale(e, e, 1 / r),
+                              r = n.length;
+                          for (var l = 0; r > l; l++) s.add(t, t, n[l]);
+                          s.scale(t, t, 1 / r),
+                              this._limitTurningAngle(i, e, t, a),
+                              this._limitTurningAngle(n, t, e, o)
+                        }
+                      } (),
+                      _limitTurningAngle: function() {
+                        var e = l(),
+                            t = l(),
+                            i = l(),
+                            n = l();
+                        return function(a, o, r, l) {
+                          var V = Math.cos(this.maxTurningAngle),
+                              U = Math.tan(this.maxTurningAngle);
+                          s.sub(e, o, r),
+                              s.normalize(e, e),
+                              s.copy(l, o);
+                          for (var d = 0,
+                                   p = 0; p < a.length; p++) {
+                            var c = a[p];
+                            s.sub(t, c, o);
+                            var u = s.len(t);
+                            s.scale(t, t, 1 / u);
+                            var y = s.dot(t, e);
+                            if (V > y) {
+                              s.scaleAndAdd(i, o, e, u * y);
+                              var g = m(i, c),
+                                  b = g / U;
+                              s.scaleAndAdd(n, i, e, -b);
+                              var f = h(n, o);
+                              f > d && (d = f, s.copy(l, n))
+                            }
+                          }
+                        }
+                      } ()
+                    },
+                    o
+              }),
+          i("zrender/shape/Star", ["require", "../tool/math", "./Base", "../tool/util"],
+              function(e) {
+                var t = e("../tool/math"),
+                    i = t.sin,
+                    n = t.cos,
+                    a = Math.PI,
+                    o = e("./Base"),
+                    r = function(e) {
+                      o.call(this, e)
+                    };
+                return r.prototype = {
+                  type: "star",
+                  buildPath: function(e, t) {
+                    var o = t.n;
+                    if (o && !(2 > o)) {
+                      var r = t.x,
+                          s = t.y,
+                          l = t.r,
+                          h = t.r0;
+                      null == h && (h = o > 4 ? l * n(2 * a / o) / n(a / o) : l / 3);
+                      var m = a / o,
+                          V = -a / 2,
+                          U = r + l * n(V),
+                          d = s + l * i(V);
+                      V += m;
+                      var p = t.pointList = [];
+                      p.push([U, d]);
+                      for (var c, u = 0,
+                               y = 2 * o - 1; y > u; u++) c = u % 2 === 0 ? h: l,
+                          p.push([r + c * n(V), s + c * i(V)]),
+                          V += m;
+                      p.push([U, d]),
+                          e.moveTo(p[0][0], p[0][1]);
+                      for (var u = 0; u < p.length; u++) e.lineTo(p[u][0], p[u][1]);
+                      e.closePath()
+                    }
+                  },
+                  getRect: function(e) {
+                    if (e.__rect) return e.__rect;
+                    var t;
+                    return t = "stroke" == e.brushType || "fill" == e.brushType ? e.lineWidth || 1 : 0,
+                        e.__rect = {
+                          x: Math.round(e.x - e.r - t / 2),
+                          y: Math.round(e.y - e.r - t / 2),
+                          width: 2 * e.r + t,
+                          height: 2 * e.r + t
+                        },
+                        e.__rect
+                  }
+                },
+                    e("../tool/util").inherits(r, o),
+                    r
+              }),
+          i("zrender/shape/Heart", ["require", "./Base", "./util/PathProxy", "../tool/area", "../tool/util"],
+              function(e) {
+                "use strict";
+                var t = e("./Base"),
+                    i = e("./util/PathProxy"),
+                    n = e("../tool/area"),
+                    a = function(e) {
+                      t.call(this, e),
+                          this._pathProxy = new i
+                    };
+                return a.prototype = {
+                  type: "heart",
+                  buildPath: function(e, t) {
+                    var n = this._pathProxy || new i;
+                    n.begin(e),
+                        n.moveTo(t.x, t.y),
+                        n.bezierCurveTo(t.x + t.a / 2, t.y - 2 * t.b / 3, t.x + 2 * t.a, t.y + t.b / 3, t.x, t.y + t.b),
+                        n.bezierCurveTo(t.x - 2 * t.a, t.y + t.b / 3, t.x - t.a / 2, t.y - 2 * t.b / 3, t.x, t.y),
+                        n.closePath()
+                  },
+                  getRect: function(e) {
+                    return e.__rect ? e.__rect: (this._pathProxy.isEmpty() || this.buildPath(null, e), this._pathProxy.fastBoundingRect())
+                  },
+                  isCover: function(e, t) {
+                    var i = this.transformCoordToLocal(e, t);
+                    return e = i[0],
+                        t = i[1],
+                        this.isCoverRect(e, t) ? n.isInsidePath(this._pathProxy.pathCommands, this.style.lineWidth, this.style.brushType, e, t) : void 0
+                  }
+                },
+                    e("../tool/util").inherits(a, t),
+                    a
+              }),
+          i("zrender/shape/Droplet", ["require", "./Base", "./util/PathProxy", "../tool/area", "../tool/util"],
+              function(e) {
+                "use strict";
+                var t = e("./Base"),
+                    i = e("./util/PathProxy"),
+                    n = e("../tool/area"),
+                    a = function(e) {
+                      t.call(this, e),
+                          this._pathProxy = new i
+                    };
+                return a.prototype = {
+                  type: "droplet",
+                  buildPath: function(e, t) {
+                    var n = this._pathProxy || new i;
+                    n.begin(e),
+                        n.moveTo(t.x, t.y + t.a),
+                        n.bezierCurveTo(t.x + t.a, t.y + t.a, t.x + 3 * t.a / 2, t.y - t.a / 3, t.x, t.y - t.b),
+                        n.bezierCurveTo(t.x - 3 * t.a / 2, t.y - t.a / 3, t.x - t.a, t.y + t.a, t.x, t.y + t.a),
+                        n.closePath()
+                  },
+                  getRect: function(e) {
+                    return e.__rect ? e.__rect: (this._pathProxy.isEmpty() || this.buildPath(null, e), this._pathProxy.fastBoundingRect())
+                  },
+                  isCover: function(e, t) {
+                    var i = this.transformCoordToLocal(e, t);
+                    return e = i[0],
+                        t = i[1],
+                        this.isCoverRect(e, t) ? n.isInsidePath(this._pathProxy.pathCommands, this.style.lineWidth, this.style.brushType, e, t) : void 0
+                  }
+                },
+                    e("../tool/util").inherits(a, t),
+                    a
+              }),
+          i("zrender/tool/math", [],
+              function() {
+                function e(e, t) {
+                  return Math.sin(t ? e * a: e)
+                }
+                function t(e, t) {
+                  return Math.cos(t ? e * a: e)
+                }
+                function i(e) {
+                  return e * a
+                }
+                function n(e) {
+                  return e / a
+                }
+                var a = Math.PI / 180;
+                return {
+                  sin: e,
+                  cos: t,
+                  degreeToRadian: i,
+                  radianToDegree: n
+                }
+              }),
+          i("zrender/shape/util/PathProxy", ["require", "../../tool/vector"],
+              function(e) {
+                var t = e("../../tool/vector"),
+                    i = function(e, t) {
+                      this.command = e,
+                          this.points = t || null
+                    },
+                    n = function() {
+                      this.pathCommands = [],
+                          this._ctx = null,
+                          this._min = [],
+                          this._max = []
+                    };
+                return n.prototype.fastBoundingRect = function() {
+                  var e = this._min,
+                      i = this._max;
+                  e[0] = e[1] = 1 / 0,
+                      i[0] = i[1] = -(1 / 0);
+                  for (var n = 0; n < this.pathCommands.length; n++) {
+                    var a = this.pathCommands[n],
+                        o = a.points;
+                    switch (a.command) {
+                      case "M":
+                        t.min(e, e, o),
+                            t.max(i, i, o);
+                        break;
+                      case "L":
+                        t.min(e, e, o),
+                            t.max(i, i, o);
+                        break;
+                      case "C":
+                        for (var r = 0; 6 > r; r += 2) e[0] = Math.min(e[0], e[0], o[r]),
+                            e[1] = Math.min(e[1], e[1], o[r + 1]),
+                            i[0] = Math.max(i[0], i[0], o[r]),
+                            i[1] = Math.max(i[1], i[1], o[r + 1]);
+                        break;
+                      case "Q":
+                        for (var r = 0; 4 > r; r += 2) e[0] = Math.min(e[0], e[0], o[r]),
+                            e[1] = Math.min(e[1], e[1], o[r + 1]),
+                            i[0] = Math.max(i[0], i[0], o[r]),
+                            i[1] = Math.max(i[1], i[1], o[r + 1]);
+                        break;
+                      case "A":
+                        var s = o[0],
+                            l = o[1],
+                            h = o[2],
+                            m = o[3];
+                        e[0] = Math.min(e[0], e[0], s - h),
+                            e[1] = Math.min(e[1], e[1], l - m),
+                            i[0] = Math.max(i[0], i[0], s + h),
+                            i[1] = Math.max(i[1], i[1], l + m)
+                    }
+                  }
+                  return {
+                    x: e[0],
+                    y: e[1],
+                    width: i[0] - e[0],
+                    height: i[1] - e[1]
+                  }
+                },
+                    n.prototype.begin = function(e) {
+                      return this._ctx = e || null,
+                          this.pathCommands.length = 0,
+                          this
+                    },
+                    n.prototype.moveTo = function(e, t) {
+                      return this.pathCommands.push(new i("M", [e, t])),
+                      this._ctx && this._ctx.moveTo(e, t),
+                          this
+                    },
+                    n.prototype.lineTo = function(e, t) {
+                      return this.pathCommands.push(new i("L", [e, t])),
+                      this._ctx && this._ctx.lineTo(e, t),
+                          this
+                    },
+                    n.prototype.bezierCurveTo = function(e, t, n, a, o, r) {
+                      return this.pathCommands.push(new i("C", [e, t, n, a, o, r])),
+                      this._ctx && this._ctx.bezierCurveTo(e, t, n, a, o, r),
+                          this
+                    },
+                    n.prototype.quadraticCurveTo = function(e, t, n, a) {
+                      return this.pathCommands.push(new i("Q", [e, t, n, a])),
+                      this._ctx && this._ctx.quadraticCurveTo(e, t, n, a),
+                          this
+                    },
+                    n.prototype.arc = function(e, t, n, a, o, r) {
+                      return this.pathCommands.push(new i("A", [e, t, n, n, a, o - a, 0, r ? 0 : 1])),
+                      this._ctx && this._ctx.arc(e, t, n, a, o, r),
+                          this
+                    },
+                    n.prototype.arcTo = function(e, t, i, n, a) {
+                      return this._ctx && this._ctx.arcTo(e, t, i, n, a),
+                          this
+                    },
+                    n.prototype.rect = function(e, t, i, n) {
+                      return this._ctx && this._ctx.rect(e, t, i, n),
+                          this
+                    },
+                    n.prototype.closePath = function() {
+                      return this.pathCommands.push(new i("z")),
+                      this._ctx && this._ctx.closePath(),
+                          this
+                    },
+                    n.prototype.isEmpty = function() {
+                      return 0 === this.pathCommands.length
+                    },
+                    n.PathSegment = i,
+                    n
+              }),
+          i("zrender/shape/Line", ["require", "./Base", "./util/dashedLineTo", "../tool/util"],
+              function(e) {
+                var t = e("./Base"),
+                    i = e("./util/dashedLineTo"),
+                    n = function(e) {
+                      this.brushTypeOnly = "stroke",
+                          this.textPosition = "end",
+                          t.call(this, e)
+                    };
+                return n.prototype = {
+                  type: "line",
+                  buildPath: function(e, t) {
+                    if (t.lineType && "solid" != t.lineType) {
+                      if ("dashed" == t.lineType || "dotted" == t.lineType) {
+                        var n = (t.lineWidth || 1) * ("dashed" == t.lineType ? 5 : 1);
+                        i(e, t.xStart, t.yStart, t.xEnd, t.yEnd, n)
+                      }
+                    } else e.moveTo(t.xStart, t.yStart),
+                        e.lineTo(t.xEnd, t.yEnd)
+                  },
+                  getRect: function(e) {
+                    if (e.__rect) return e.__rect;
+                    var t = e.lineWidth || 1;
+                    return e.__rect = {
+                      x: Math.min(e.xStart, e.xEnd) - t,
+                      y: Math.min(e.yStart, e.yEnd) - t,
+                      width: Math.abs(e.xStart - e.xEnd) + t,
+                      height: Math.abs(e.yStart - e.yEnd) + t
+                    },
+                        e.__rect
+                  }
+                },
+                    e("../tool/util").inherits(n, t),
+                    n
+              }),
+          i("zrender/shape/BezierCurve", ["require", "./Base", "../tool/util"],
+              function(e) {
+                "use strict";
+                var t = e("./Base"),
+                    i = function(e) {
+                      this.brushTypeOnly = "stroke",
+                          this.textPosition = "end",
+                          t.call(this, e)
+                    };
+                return i.prototype = {
+                  type: "bezier-curve",
+                  buildPath: function(e, t) {
+                    e.moveTo(t.xStart, t.yStart),
+                        "undefined" != typeof t.cpX2 && "undefined" != typeof t.cpY2 ? e.bezierCurveTo(t.cpX1, t.cpY1, t.cpX2, t.cpY2, t.xEnd, t.yEnd) : e.quadraticCurveTo(t.cpX1, t.cpY1, t.xEnd, t.yEnd)
+                  },
+                  getRect: function(e) {
+                    if (e.__rect) return e.__rect;
+                    var t = Math.min(e.xStart, e.xEnd, e.cpX1),
+                        i = Math.min(e.yStart, e.yEnd, e.cpY1),
+                        n = Math.max(e.xStart, e.xEnd, e.cpX1),
+                        a = Math.max(e.yStart, e.yEnd, e.cpY1),
+                        o = e.cpX2,
+                        r = e.cpY2;
+                    "undefined" != typeof o && "undefined" != typeof r && (t = Math.min(t, o), i = Math.min(i, r), n = Math.max(n, o), a = Math.max(a, r));
+                    var s = e.lineWidth || 1;
+                    return e.__rect = {
+                      x: t - s,
+                      y: i - s,
+                      width: n - t + s,
+                      height: a - i + s
+                    },
+                        e.__rect
+                  }
+                },
+                    e("../tool/util").inherits(i, t),
+                    i
+              }),
+          i("zrender/shape/util/dashedLineTo", [],
+              function() {
+                var e = [5, 5];
+                return function(t, i, n, a, o, r) {
+                  if (t.setLineDash) return e[0] = e[1] = r,
+                      t.setLineDash(e),
+                      t.moveTo(i, n),
+                      void t.lineTo(a, o);
+                  r = "number" != typeof r ? 5 : r;
+                  var s = a - i,
+                      l = o - n,
+                      h = Math.floor(Math.sqrt(s * s + l * l) / r);
+                  s /= h,
+                      l /= h;
+                  for (var m = !0,
+                           V = 0; h > V; ++V) m ? t.moveTo(i, n) : t.lineTo(i, n),
+                      m = !m,
+                      i += s,
+                      n += l;
+                  t.lineTo(a, o)
+                }
+              }),
+          i("zrender/shape/Polygon", ["require", "./Base", "./util/smoothSpline", "./util/smoothBezier", "./util/dashedLineTo", "../tool/util"],
+              function(e) {
+                var t = e("./Base"),
+                    i = e("./util/smoothSpline"),
+                    n = e("./util/smoothBezier"),
+                    a = e("./util/dashedLineTo"),
+                    o = function(e) {
+                      t.call(this, e)
+                    };
+                return o.prototype = {
+                  type: "polygon",
+                  buildPath: function(e, t) {
+                    var o = t.pointList;
+                    if (! (o.length < 2)) {
+                      if (t.smooth && "spline" !== t.smooth) {
+                        var r = n(o, t.smooth, !0, t.smoothConstraint);
+                        e.moveTo(o[0][0], o[0][1]);
+                        for (var s, l, h, m = o.length,
+                                 V = 0; m > V; V++) s = r[2 * V],
+                            l = r[2 * V + 1],
+                            h = o[(V + 1) % m],
+                            e.bezierCurveTo(s[0], s[1], l[0], l[1], h[0], h[1])
+                      } else if ("spline" === t.smooth && (o = i(o, !0)), t.lineType && "solid" != t.lineType) {
+                        if ("dashed" == t.lineType || "dotted" == t.lineType) {
+                          var U = t._dashLength || (t.lineWidth || 1) * ("dashed" == t.lineType ? 5 : 1);
+                          t._dashLength = U,
+                              e.moveTo(o[0][0], o[0][1]);
+                          for (var V = 1,
+                                   d = o.length; d > V; V++) a(e, o[V - 1][0], o[V - 1][1], o[V][0], o[V][1], U);
+                          a(e, o[o.length - 1][0], o[o.length - 1][1], o[0][0], o[0][1], U)
+                        }
+                      } else {
+                        e.moveTo(o[0][0], o[0][1]);
+                        for (var V = 1,
+                                 d = o.length; d > V; V++) e.lineTo(o[V][0], o[V][1]);
+                        e.lineTo(o[0][0], o[0][1])
+                      }
+                      e.closePath()
+                    }
+                  },
+                  getRect: function(e) {
+                    if (e.__rect) return e.__rect;
+                    for (var t = Number.MAX_VALUE,
+                             i = Number.MIN_VALUE,
+                             n = Number.MAX_VALUE,
+                             a = Number.MIN_VALUE,
+                             o = e.pointList,
+                             r = 0,
+                             s = o.length; s > r; r++) o[r][0] < t && (t = o[r][0]),
+                    o[r][0] > i && (i = o[r][0]),
+                    o[r][1] < n && (n = o[r][1]),
+                    o[r][1] > a && (a = o[r][1]);
+                    var l;
+                    return l = "stroke" == e.brushType || "fill" == e.brushType ? e.lineWidth || 1 : 0,
+                        e.__rect = {
+                          x: Math.round(t - l / 2),
+                          y: Math.round(n - l / 2),
+                          width: i - t + l,
+                          height: a - n + l
+                        },
+                        e.__rect
+                  }
+                },
+                    e("../tool/util").inherits(o, t),
+                    o
+              }),
+          i("echarts/util/shape/normalIsCover", [],
+              function() {
+                return function(e, t) {
+                  var i = this.transformCoordToLocal(e, t);
+                  return e = i[0],
+                      t = i[1],
+                      this.isCoverRect(e, t)
+                }
+              }),
+          i("zrender/shape/util/smoothSpline", ["require", "../../tool/vector"],
+              function(e) {
+                function t(e, t, i, n, a, o, r) {
+                  var s = .5 * (i - e),
+                      l = .5 * (n - t);
+                  return (2 * (t - i) + s + l) * r + ( - 3 * (t - i) - 2 * s - l) * o + s * a + t
+                }
+                var i = e("../../tool/vector");
+                return function(e, n) {
+                  for (var a = e.length,
+                           o = [], r = 0, s = 1; a > s; s++) r += i.distance(e[s - 1], e[s]);
+                  var l = r / 5;
+                  l = a > l ? a: l;
+                  for (var s = 0; l > s; s++) {
+                    var h, m, V, U = s / (l - 1) * (n ? a: a - 1),
+                        d = Math.floor(U),
+                        p = U - d,
+                        c = e[d % a];
+                    n ? (h = e[(d - 1 + a) % a], m = e[(d + 1) % a], V = e[(d + 2) % a]) : (h = e[0 === d ? d: d - 1], m = e[d > a - 2 ? a - 1 : d + 1], V = e[d > a - 3 ? a - 1 : d + 2]);
+                    var u = p * p,
+                        y = p * u;
+                    o.push([t(h[0], c[0], m[0], V[0], p, u, y), t(h[1], c[1], m[1], V[1], p, u, y)])
+                  }
+                  return o
+                }
+              }),
+          i("zrender/shape/util/smoothBezier", ["require", "../../tool/vector"],
+              function(e) {
+                var t = e("../../tool/vector");
+                return function(e, i, n, a) {
+                  var o, r, s, l, h = [],
+                      m = [],
+                      V = [],
+                      U = [],
+                      d = !!a;
+                  if (d) {
+                    s = [1 / 0, 1 / 0],
+                        l = [ - (1 / 0), -(1 / 0)];
+                    for (var p = 0,
+                             c = e.length; c > p; p++) t.min(s, s, e[p]),
+                        t.max(l, l, e[p]);
+                    t.min(s, s, a[0]),
+                        t.max(l, l, a[1])
+                  }
+                  for (var p = 0,
+                           c = e.length; c > p; p++) {
+                    var o, r, u = e[p];
+                    if (n) o = e[p ? p - 1 : c - 1],
+                        r = e[(p + 1) % c];
+                    else {
+                      if (0 === p || p === c - 1) {
+                        h.push(t.clone(e[p]));
+                        continue
+                      }
+                      o = e[p - 1],
+                          r = e[p + 1]
+                    }
+                    t.sub(m, r, o),
+                        t.scale(m, m, i);
+                    var y = t.distance(u, o),
+                        g = t.distance(u, r),
+                        b = y + g;
+                    0 !== b && (y /= b, g /= b),
+                        t.scale(V, m, -y),
+                        t.scale(U, m, g);
+                    var f = t.add([], u, V),
+                        k = t.add([], u, U);
+                    d && (t.max(f, f, s), t.min(f, f, l), t.max(k, k, s), t.min(k, k, l)),
+                        h.push(f),
+                        h.push(k)
+                  }
+                  return n && h.push(t.clone(h.shift())),
+                      h
+                }
+              }),
+          i("echarts/util/ecQuery", ["require", "zrender/tool/util"],
+              function(e) {
+                function t(e, t) {
+                  if ("undefined" != typeof e) {
+                    if (!t) return e;
+                    t = t.split(".");
+                    for (var i = t.length,
+                             n = 0; i > n;) {
+                      if (e = e[t[n]], "undefined" == typeof e) return;
+                      n++
+                    }
+                    return e
+                  }
+                }
+                function i(e, i) {
+                  for (var n, a = 0,
+                           o = e.length; o > a; a++) if (n = t(e[a], i), "undefined" != typeof n) return n
+                }
+                function n(e, i) {
+                  for (var n, o = e.length; o--;) {
+                    var r = t(e[o], i);
+                    "undefined" != typeof r && ("undefined" == typeof n ? n = a.clone(r) : a.merge(n, r, !0))
+                  }
+                  return n
+                }
+                var a = e("zrender/tool/util");
+                return {
+                  query: t,
+                  deepQuery: i,
+                  deepMerge: n
+                }
+              }),
+          i("echarts/util/number", [],
+              function() {
+                function e(e) {
+                  return e.replace(/^\s+/, "").replace(/\s+$/, "")
+                }
+                function t(t, i) {
+                  return "string" == typeof t ? e(t).match(/%$/) ? parseFloat(t) / 100 * i: parseFloat(t) : t
+                }
+                function i(e, i) {
+                  return [t(i[0], e.getWidth()), t(i[1], e.getHeight())]
+                }
+                function n(e, i) {
+                  i instanceof Array || (i = [0, i]);
+                  var n = Math.min(e.getWidth(), e.getHeight()) / 2;
+                  return [t(i[0], n), t(i[1], n)]
+                }
+                function a(e) {
+                  return isNaN(e) ? "-": (e = (e + "").split("."), e[0].replace(/(\d{1,3})(?=(?:\d{3})+(?!\d))/g, "$1,") + (e.length > 1 ? "." + e[1] : ""))
+                }
+                function o(e) {
+                  for (var t = 1,
+                           i = 0; Math.round(e * t) / t !== e;) t *= 10,
+                      i++;
+                  return i
+                }
+                return {
+                  parsePercent: t,
+                  parseCenter: i,
+                  parseRadius: n,
+                  addCommas: a,
+                  getPrecision: o
+                }
+              }),
+          i("echarts/data/KDTree", ["require", "./quickSelect"],
+              function(e) {
+                function t(e, t) {
+                  this.left = null,
+                      this.right = null,
+                      this.axis = e,
+                      this.data = t
+                }
+                var i = e("./quickSelect"),
+                    n = function(e, t) {
+                      e.length && (t || (t = e[0].array.length), this.dimension = t, this.root = this._buildTree(e, 0, e.length - 1, 0), this._stack = [], this._nearstNList = [])
+                    };
+                return n.prototype._buildTree = function(e, n, a, o) {
+                  if (n > a) return null;
+                  var r = Math.floor((n + a) / 2);
+                  r = i(e, n, a, r,
+                      function(e, t) {
+                        return e.array[o] - t.array[o]
+                      });
+                  var s = e[r],
+                      l = new t(o, s);
+                  return o = (o + 1) % this.dimension,
+                  a > n && (l.left = this._buildTree(e, n, r - 1, o), l.right = this._buildTree(e, r + 1, a, o)),
+                      l
+                },
+                    n.prototype.nearest = function(e, t) {
+                      var i = this.root,
+                          n = this._stack,
+                          a = 0,
+                          o = 1 / 0,
+                          r = null;
+                      for (i.data !== e && (o = t(i.data, e), r = i), e.array[i.axis] < i.data.array[i.axis] ? (i.right && (n[a++] = i.right), i.left && (n[a++] = i.left)) : (i.left && (n[a++] = i.left), i.right && (n[a++] = i.right)); a--;) {
+                        i = n[a];
+                        var s = e.array[i.axis] - i.data.array[i.axis],
+                            l = 0 > s,
+                            h = !1;
+                        s *= s,
+                        o > s && (s = t(i.data, e), o > s && i.data !== e && (o = s, r = i), h = !0),
+                            l ? (h && i.right && (n[a++] = i.right), i.left && (n[a++] = i.left)) : (h && i.left && (n[a++] = i.left), i.right && (n[a++] = i.right))
+                      }
+                      return r.data
+                    },
+                    n.prototype._addNearest = function(e, t, i) {
+                      for (var n = this._nearstNList,
+                               a = e - 1; a > 0 && !(t >= n[a - 1].dist); a--) n[a].dist = n[a - 1].dist,
+                          n[a].node = n[a - 1].node;
+                      n[a].dist = t,
+                          n[a].node = i
+                    },
+                    n.prototype.nearestN = function(e, t, i, n) {
+                      if (0 >= t) return n.length = 0,
+                          n;
+                      for (var a = this.root,
+                               o = this._stack,
+                               r = 0,
+                               s = this._nearstNList,
+                               l = 0; t > l; l++) s[l] || (s[l] = {}),
+                          s[l].dist = 0,
+                          s[l].node = null;
+                      var h = i(a.data, e),
+                          m = 0;
+                      for (a.data !== e && (m++, this._addNearest(m, h, a)), e.array[a.axis] < a.data.array[a.axis] ? (a.right && (o[r++] = a.right), a.left && (o[r++] = a.left)) : (a.left && (o[r++] = a.left), a.right && (o[r++] = a.right)); r--;) {
+                        a = o[r];
+                        var h = e.array[a.axis] - a.data.array[a.axis],
+                            V = 0 > h,
+                            U = !1;
+                        h *= h,
+                        (t > m || h < s[m - 1].dist) && (h = i(a.data, e), (t > m || h < s[m - 1].dist) && a.data !== e && (t > m && m++, this._addNearest(m, h, a)), U = !0),
+                            V ? (U && a.right && (o[r++] = a.right), a.left && (o[r++] = a.left)) : (U && a.left && (o[r++] = a.left), a.right && (o[r++] = a.right))
+                      }
+                      for (var l = 0; m > l; l++) n[l] = s[l].node.data;
+                      return n.length = m,
+                          n
+                    },
+                    n
+              }),
+          i("echarts/data/quickSelect", ["require"],
+              function() {
+                function e(e, t) {
+                  return e - t
+                }
+                function t(e, t, i) {
+                  var n = e[t];
+                  e[t] = e[i],
+                      e[i] = n
+                }
+                function i(e, i, n, a, o) {
+                  for (var r = i; n > i;) {
+                    var r = Math.round((n + i) / 2),
+                        s = e[r];
+                    t(e, r, n),
+                        r = i;
+                    for (var l = i; n - 1 >= l; l++) o(s, e[l]) >= 0 && (t(e, l, r), r++);
+                    if (t(e, n, r), r === a) return r;
+                    a > r ? i = r + 1 : n = r - 1
+                  }
+                  return i
+                }
+                function n(t, n, a, o, r) {
+                  return arguments.length <= 3 && (o = n, r = 2 == arguments.length ? e: a, n = 0, a = t.length - 1),
+                      i(t, n, a, o, r)
+                }
+                return n
+              }),
+          i("echarts/component/dataView", ["require", "./base", "../config", "zrender/tool/util", "../component"],
+              function(e) {
+                function t(e, t, n, a, o) {
+                  i.call(this, e, t, n, a, o),
+                      this.dom = o.dom,
+                      this._tDom = document.createElement("div"),
+                      this._textArea = document.createElement("textArea"),
+                      this._buttonRefresh = document.createElement("button"),
+                      this._buttonRefresh.setAttribute("type", "button"),
+                      this._buttonClose = document.createElement("button"),
+                      this._buttonClose.setAttribute("type", "button"),
+                      this._hasShow = !1,
+                      this._zrHeight = n.getHeight(),
+                      this._zrWidth = n.getWidth(),
+                      this._tDom.className = "echarts-dataview",
+                      this.hide(),
+                      this.dom.firstChild.appendChild(this._tDom),
+                      window.addEventListener ? (this._tDom.addEventListener("click", this._stop), this._tDom.addEventListener("mousewheel", this._stop), this._tDom.addEventListener("mousemove", this._stop), this._tDom.addEventListener("mousedown", this._stop), this._tDom.addEventListener("mouseup", this._stop), this._tDom.addEventListener("touchstart", this._stop), this._tDom.addEventListener("touchmove", this._stop), this._tDom.addEventListener("touchend", this._stop)) : (this._tDom.attachEvent("onclick", this._stop), this._tDom.attachEvent("onmousewheel", this._stop), this._tDom.attachEvent("onmousemove", this._stop), this._tDom.attachEvent("onmousedown", this._stop), this._tDom.attachEvent("onmouseup", this._stop))
+                }
+                var i = e("./base"),
+                    n = e("../config"),
+                    a = e("zrender/tool/util");
+                return t.prototype = {
+                  type: n.COMPONENT_TYPE_DATAVIEW,
+                  _lang: ["Data View", "close", "refresh"],
+                  _gCssText: "position:absolute;display:block;overflow:hidden;transition:height 0.8s,background-color 1s;-moz-transition:height 0.8s,background-color 1s;-webkit-transition:height 0.8s,background-color 1s;-o-transition:height 0.8s,background-color 1s;z-index:1;left:0;top:0;",
+                  hide: function() {
+                    this._sizeCssText = "width:" + this._zrWidth + "px;height:0px;background-color:#f0ffff;",
+                        this._tDom.style.cssText = this._gCssText + this._sizeCssText
+                  },
+                  show: function(e) {
+                    this._hasShow = !0;
+                    var t = this.query(this.option, "toolbox.feature.dataView.lang") || this._lang;
+                    this.option = e,
+                        this._tDom.innerHTML = '<p style="padding:8px 0;margin:0 0 10px 0;border-bottom:1px solid #eee">' + (t[0] || this._lang[0]) + "</p>";
+                    var i = this.query(this.option, "toolbox.feature.dataView.optionToContent");
+                    "function" != typeof i ? this._textArea.value = this._optionToContent() : (this._textArea = document.createElement("div"), this._textArea.innerHTML = i(this.option)),
+                        this._textArea.style.cssText = "display:block;margin:0 0 8px 0;padding:4px 6px;overflow:auto;width:100%;height:" + (this._zrHeight - 100) + "px;",
+                        this._tDom.appendChild(this._textArea),
+                        this._buttonClose.style.cssText = "float:right;padding:1px 6px;",
+                        this._buttonClose.innerHTML = t[1] || this._lang[1];
+                    var n = this;
+                    this._buttonClose.onclick = function() {
+                      n.hide()
+                    },
+                        this._tDom.appendChild(this._buttonClose),
+                        this.query(this.option, "toolbox.feature.dataView.readOnly") === !1 ? (this._buttonRefresh.style.cssText = "float:right;margin-right:10px;padding:1px 6px;", this._buttonRefresh.innerHTML = t[2] || this._lang[2], this._buttonRefresh.onclick = function() {
+                          n._save()
+                        },
+                            this._textArea.readOnly = !1, this._textArea.style.cursor = "default") : (this._buttonRefresh.style.cssText = "display:none", this._textArea.readOnly = !0, this._textArea.style.cursor = "text"),
+                        this._tDom.appendChild(this._buttonRefresh),
+                        this._sizeCssText = "width:" + this._zrWidth + "px;height:" + this._zrHeight + "px;background-color:#fff;",
+                        this._tDom.style.cssText = this._gCssText + this._sizeCssText
+                  },
+                  _optionToContent: function() {
+                    var e, t, i, a, o, r, s = [],
+                        l = "";
+                    if (this.option.xAxis) for (s = this.option.xAxis instanceof Array ? this.option.xAxis: [this.option.xAxis], e = 0, a = s.length; a > e; e++) if ("category" == (s[e].type || "category")) {
+                      for (r = [], t = 0, i = s[e].data.length; i > t; t++) r.push(this.getDataFromOption(s[e].data[t]));
+                      l += r.join(", ") + "\n\n"
+                    }
+                    if (this.option.yAxis) for (s = this.option.yAxis instanceof Array ? this.option.yAxis: [this.option.yAxis], e = 0, a = s.length; a > e; e++) if ("category" == s[e].type) {
+                      for (r = [], t = 0, i = s[e].data.length; i > t; t++) r.push(this.getDataFromOption(s[e].data[t]));
+                      l += r.join(", ") + "\n\n"
+                    }
+                    var h, m = this.option.series;
+                    for (e = 0, a = m.length; a > e; e++) {
+                      for (r = [], t = 0, i = m[e].data.length; i > t; t++) o = m[e].data[t],
+                          h = m[e].type == n.CHART_TYPE_PIE || m[e].type == n.CHART_TYPE_MAP ? (o.name || "-") + ":": "",
+                      m[e].type == n.CHART_TYPE_SCATTER && (o = this.getDataFromOption(o).join(", ")),
+                          r.push(h + this.getDataFromOption(o));
+                      l += (m[e].name || "-") + " : \n",
+                          l += r.join(m[e].type == n.CHART_TYPE_SCATTER ? "\n": ", "),
+                          l += "\n\n"
+                    }
+                    return l
+                  },
+                  _save: function() {
+                    var e = this.query(this.option, "toolbox.feature.dataView.contentToOption");
+                    if ("function" != typeof e) {
+                      for (var t = this._textArea.value.split("\n"), i = [], a = 0, o = t.length; o > a; a++) t[a] = this._trim(t[a]),
+                      "" !== t[a] && i.push(t[a]);
+                      this._contentToOption(i)
+                    } else e(this._textArea, this.option);
+                    this.hide();
+                    var r = this;
+                    setTimeout(function() {
+                          r.messageCenter && r.messageCenter.dispatch(n.EVENT.DATA_VIEW_CHANGED, null, {
+                                option: r.option
+                              },
+                              r.myChart)
+                        },
+                        r.canvasSupported ? 800 : 100)
+                  },
+                  _contentToOption: function(e) {
+                    var t, i, a, o, r, s, l, h = [],
+                        m = 0;
+                    if (this.option.xAxis) for (h = this.option.xAxis instanceof Array ? this.option.xAxis: [this.option.xAxis], t = 0, o = h.length; o > t; t++) if ("category" == (h[t].type || "category")) {
+                      for (s = e[m].split(","), i = 0, a = h[t].data.length; a > i; i++) l = this._trim(s[i] || ""),
+                          r = h[t].data[i],
+                          "undefined" != typeof h[t].data[i].value ? h[t].data[i].value = l: h[t].data[i] = l;
+                      m++
+                    }
+                    if (this.option.yAxis) for (h = this.option.yAxis instanceof Array ? this.option.yAxis: [this.option.yAxis], t = 0, o = h.length; o > t; t++) if ("category" == h[t].type) {
+                      for (s = e[m].split(","), i = 0, a = h[t].data.length; a > i; i++) l = this._trim(s[i] || ""),
+                          r = h[t].data[i],
+                          "undefined" != typeof h[t].data[i].value ? h[t].data[i].value = l: h[t].data[i] = l;
+                      m++
+                    }
+                    var V = this.option.series;
+                    for (t = 0, o = V.length; o > t; t++) if (m++, V[t].type == n.CHART_TYPE_SCATTER) for (var i = 0,
+                                                                                                               a = V[t].data.length; a > i; i++) s = e[m],
+                        l = s.replace(" ", "").split(","),
+                        "undefined" != typeof V[t].data[i].value ? V[t].data[i].value = l: V[t].data[i] = l,
+                        m++;
+                    else {
+                      s = e[m].split(",");
+                      for (var i = 0,
+                               a = V[t].data.length; a > i; i++) l = (s[i] || "").replace(/.*:/, ""),
+                          l = this._trim(l),
+                          l = "-" != l && "" !== l ? l - 0 : "-",
+                          "undefined" != typeof V[t].data[i].value ? V[t].data[i].value = l: V[t].data[i] = l;
+                      m++
+                    }
+                  },
+                  _trim: function(e) {
+                    var t = new RegExp("(^[\\s\\t\\xa0\\u3000]+)|([\\u3000\\xa0\\s\\t]+$)", "g");
+                    return e.replace(t, "")
+                  },
+                  _stop: function(e) {
+                    e = e || window.event,
+                        e.stopPropagation ? e.stopPropagation() : e.cancelBubble = !0
+                  },
+                  resize: function() {
+                    this._zrHeight = this.zr.getHeight(),
+                        this._zrWidth = this.zr.getWidth(),
+                    this._tDom.offsetHeight > 10 && (this._sizeCssText = "width:" + this._zrWidth + "px;height:" + this._zrHeight + "px;background-color:#fff;", this._tDom.style.cssText = this._gCssText + this._sizeCssText, this._textArea.style.cssText = "display:block;margin:0 0 8px 0;padding:4px 6px;overflow:auto;width:100%;height:" + (this._zrHeight - 100) + "px;")
+                  },
+                  dispose: function() {
+                    window.removeEventListener ? (this._tDom.removeEventListener("click", this._stop), this._tDom.removeEventListener("mousewheel", this._stop), this._tDom.removeEventListener("mousemove", this._stop), this._tDom.removeEventListener("mousedown", this._stop), this._tDom.removeEventListener("mouseup", this._stop), this._tDom.removeEventListener("touchstart", this._stop), this._tDom.removeEventListener("touchmove", this._stop), this._tDom.removeEventListener("touchend", this._stop)) : (this._tDom.detachEvent("onclick", this._stop), this._tDom.detachEvent("onmousewheel", this._stop), this._tDom.detachEvent("onmousemove", this._stop), this._tDom.detachEvent("onmousedown", this._stop), this._tDom.detachEvent("onmouseup", this._stop)),
+                        this._buttonRefresh.onclick = null,
+                        this._buttonClose.onclick = null,
+                    this._hasShow && (this._tDom.removeChild(this._textArea), this._tDom.removeChild(this._buttonRefresh), this._tDom.removeChild(this._buttonClose)),
+                        this._textArea = null,
+                        this._buttonRefresh = null,
+                        this._buttonClose = null,
+                        this.dom.firstChild.removeChild(this._tDom),
+                        this._tDom = null
+                  }
+                },
+                    a.inherits(t, i),
+                    e("../component").define("dataView", t),
+                    t
+              }),
+          i("echarts/util/shape/Cross", ["require", "zrender/shape/Base", "zrender/shape/Line", "zrender/tool/util", "./normalIsCover"],
+              function(e) {
+                function t(e) {
+                  i.call(this, e)
+                }
+                var i = e("zrender/shape/Base"),
+                    n = e("zrender/shape/Line"),
+                    a = e("zrender/tool/util");
+                return t.prototype = {
+                  type: "cross",
+                  buildPath: function(e, t) {
+                    var i = t.rect;
+                    t.xStart = i.x,
+                        t.xEnd = i.x + i.width,
+                        t.yStart = t.yEnd = t.y,
+                        n.prototype.buildPath(e, t),
+                        t.xStart = t.xEnd = t.x,
+                        t.yStart = i.y,
+                        t.yEnd = i.y + i.height,
+                        n.prototype.buildPath(e, t)
+                  },
+                  getRect: function(e) {
+                    return e.rect
+                  },
+                  isCover: e("./normalIsCover")
+                },
+                    a.inherits(t, i),
+                    t
+              }),
+          i("zrender/shape/Sector", ["require", "../tool/math", "../tool/computeBoundingBox", "../tool/vector", "./Base", "../tool/util"],
+              function(e) {
+                var t = e("../tool/math"),
+                    i = e("../tool/computeBoundingBox"),
+                    n = e("../tool/vector"),
+                    a = e("./Base"),
+                    o = n.create(),
+                    r = n.create(),
+                    s = n.create(),
+                    l = n.create(),
+                    h = function(e) {
+                      a.call(this, e)
+                    };
+                return h.prototype = {
+                  type: "sector",
+                  buildPath: function(e, i) {
+                    var n = i.x,
+                        a = i.y,
+                        o = i.r0 || 0,
+                        r = i.r,
+                        s = i.startAngle,
+                        l = i.endAngle,
+                        h = i.clockWise || !1;
+                    s = t.degreeToRadian(s),
+                        l = t.degreeToRadian(l),
+                    h || (s = -s, l = -l);
+                    var m = t.cos(s),
+                        V = t.sin(s);
+                    e.moveTo(m * o + n, V * o + a),
+                        e.lineTo(m * r + n, V * r + a),
+                        e.arc(n, a, r, s, l, !h),
+                        e.lineTo(t.cos(l) * o + n, t.sin(l) * o + a),
+                    0 !== o && e.arc(n, a, o, l, s, h),
+                        e.closePath()
+                  },
+                  getRect: function(e) {
+                    if (e.__rect) return e.__rect;
+                    var a = e.x,
+                        h = e.y,
+                        m = e.r0 || 0,
+                        V = e.r,
+                        U = t.degreeToRadian(e.startAngle),
+                        d = t.degreeToRadian(e.endAngle),
+                        p = e.clockWise;
+                    return p || (U = -U, d = -d),
+                        m > 1 ? i.arc(a, h, m, U, d, !p, o, s) : (o[0] = s[0] = a, o[1] = s[1] = h),
+                        i.arc(a, h, V, U, d, !p, r, l),
+                        n.min(o, o, r),
+                        n.max(s, s, l),
+                        e.__rect = {
+                          x: o[0],
+                          y: o[1],
+                          width: s[0] - o[0],
+                          height: s[1] - o[1]
+                        },
+                        e.__rect
+                  }
+                },
+                    e("../tool/util").inherits(h, a),
+                    h
+              }),
+          i("echarts/util/shape/Candle", ["require", "zrender/shape/Base", "zrender/tool/util", "./normalIsCover"],
+              function(e) {
+                function t(e) {
+                  i.call(this, e)
+                }
+                var i = e("zrender/shape/Base"),
+                    n = e("zrender/tool/util");
+                return t.prototype = {
+                  type: "candle",
+                  _numberOrder: function(e, t) {
+                    return t - e
+                  },
+                  buildPath: function(e, t) {
+                    var i = n.clone(t.y).sort(this._numberOrder);
+                    e.moveTo(t.x, i[3]),
+                        e.lineTo(t.x, i[2]),
+                        e.moveTo(t.x - t.width / 2, i[2]),
+                        e.rect(t.x - t.width / 2, i[2], t.width, i[1] - i[2]),
+                        e.moveTo(t.x, i[1]),
+                        e.lineTo(t.x, i[0])
+                  },
+                  getRect: function(e) {
+                    if (!e.__rect) {
+                      var t = 0; ("stroke" == e.brushType || "fill" == e.brushType) && (t = e.lineWidth || 1);
+                      var i = n.clone(e.y).sort(this._numberOrder);
+                      e.__rect = {
+                        x: Math.round(e.x - e.width / 2 - t / 2),
+                        y: Math.round(i[3] - t / 2),
+                        width: e.width + t,
+                        height: i[0] - i[3] + t
+                      }
+                    }
+                    return e.__rect
+                  },
+                  isCover: e("./normalIsCover")
+                },
+                    n.inherits(t, i),
+                    t
+              }),
+          i("zrender/tool/computeBoundingBox", ["require", "./vector", "./curve"],
+              function(e) {
+                function t(e, t, i) {
+                  if (0 !== e.length) {
+                    for (var n = e[0][0], a = e[0][0], o = e[0][1], r = e[0][1], s = 1; s < e.length; s++) {
+                      var l = e[s];
+                      l[0] < n && (n = l[0]),
+                      l[0] > a && (a = l[0]),
+                      l[1] < o && (o = l[1]),
+                      l[1] > r && (r = l[1])
+                    }
+                    t[0] = n,
+                        t[1] = o,
+                        i[0] = a,
+                        i[1] = r
+                  }
+                }
+                function i(e, t, i, n, a, r) {
+                  var s = [];
+                  o.cubicExtrema(e[0], t[0], i[0], n[0], s);
+                  for (var l = 0; l < s.length; l++) s[l] = o.cubicAt(e[0], t[0], i[0], n[0], s[l]);
+                  var h = [];
+                  o.cubicExtrema(e[1], t[1], i[1], n[1], h);
+                  for (var l = 0; l < h.length; l++) h[l] = o.cubicAt(e[1], t[1], i[1], n[1], h[l]);
+                  s.push(e[0], n[0]),
+                      h.push(e[1], n[1]);
+                  var m = Math.min.apply(null, s),
+                      V = Math.max.apply(null, s),
+                      U = Math.min.apply(null, h),
+                      d = Math.max.apply(null, h);
+                  a[0] = m,
+                      a[1] = U,
+                      r[0] = V,
+                      r[1] = d
+                }
+                function n(e, t, i, n, a) {
+                  var r = o.quadraticExtremum(e[0], t[0], i[0]),
+                      s = o.quadraticExtremum(e[1], t[1], i[1]);
+                  r = Math.max(Math.min(r, 1), 0),
+                      s = Math.max(Math.min(s, 1), 0);
+                  var l = 1 - r,
+                      h = 1 - s,
+                      m = l * l * e[0] + 2 * l * r * t[0] + r * r * i[0],
+                      V = l * l * e[1] + 2 * l * r * t[1] + r * r * i[1],
+                      U = h * h * e[0] + 2 * h * s * t[0] + s * s * i[0],
+                      d = h * h * e[1] + 2 * h * s * t[1] + s * s * i[1];
+                  n[0] = Math.min(e[0], i[0], m, U),
+                      n[1] = Math.min(e[1], i[1], V, d),
+                      a[0] = Math.max(e[0], i[0], m, U),
+                      a[1] = Math.max(e[1], i[1], V, d)
+                }
+                var a = e("./vector"),
+                    o = e("./curve"),
+                    r = a.create(),
+                    s = a.create(),
+                    l = a.create(),
+                    h = function(e, t, i, n, o, h, m, V) {
+                      if (Math.abs(n - o) >= 2 * Math.PI) return m[0] = e - i,
+                          m[1] = t - i,
+                          V[0] = e + i,
+                          void(V[1] = t + i);
+                      if (r[0] = Math.cos(n) * i + e, r[1] = Math.sin(n) * i + t, s[0] = Math.cos(o) * i + e, s[1] = Math.sin(o) * i + t, a.min(m, r, s), a.max(V, r, s), n %= 2 * Math.PI, 0 > n && (n += 2 * Math.PI), o %= 2 * Math.PI, 0 > o && (o += 2 * Math.PI), n > o && !h ? o += 2 * Math.PI: o > n && h && (n += 2 * Math.PI), h) {
+                        var U = o;
+                        o = n,
+                            n = U
+                      }
+                      for (var d = 0; o > d; d += Math.PI / 2) d > n && (l[0] = Math.cos(d) * i + e, l[1] = Math.sin(d) * i + t, a.min(m, l, m), a.max(V, l, V))
+                    };
+                return t.cubeBezier = i,
+                    t.quadraticBezier = n,
+                    t.arc = h,
+                    t
+              }),
+          i("echarts/util/shape/Chain", ["require", "zrender/shape/Base", "./Icon", "zrender/shape/util/dashedLineTo", "zrender/tool/util", "zrender/tool/matrix"],
+              function(e) {
+                function t(e) {
+                  i.call(this, e)
+                }
+                var i = e("zrender/shape/Base"),
+                    n = e("./Icon"),
+                    a = e("zrender/shape/util/dashedLineTo"),
+                    o = e("zrender/tool/util"),
+                    r = e("zrender/tool/matrix");
+                return t.prototype = {
+                  type: "chain",
+                  brush: function(e, t) {
+                    var i = this.style;
+                    t && (i = this.getHighlightStyle(i, this.highlightStyle || {})),
+                        e.save(),
+                        this.setContext(e, i),
+                        this.setTransform(e),
+                        e.save(),
+                        e.beginPath(),
+                        this.buildLinePath(e, i),
+                        e.stroke(),
+                        e.restore(),
+                        this.brushSymbol(e, i),
+                        e.restore()
+                  },
+                  buildLinePath: function(e, t) {
+                    var i = t.x,
+                        n = t.y + 5,
+                        o = t.width,
+                        r = t.height / 2 - 10;
+                    if (e.moveTo(i, n), e.lineTo(i, n + r), e.moveTo(i + o, n), e.lineTo(i + o, n + r), e.moveTo(i, n + r / 2), t.lineType && "solid" != t.lineType) {
+                      if ("dashed" == t.lineType || "dotted" == t.lineType) {
+                        var s = (t.lineWidth || 1) * ("dashed" == t.lineType ? 5 : 1);
+                        a(e, i, n + r / 2, i + o, n + r / 2, s)
+                      }
+                    } else e.lineTo(i + o, n + r / 2)
+                  },
+                  brushSymbol: function(e, t) {
+                    var i = t.y + t.height / 4;
+                    e.save();
+                    for (var a, o = t.chainPoint,
+                             r = 0,
+                             s = o.length; s > r; r++) {
+                      if (a = o[r], "none" != a.symbol) {
+                        e.beginPath();
+                        var l = a.symbolSize;
+                        n.prototype.buildPath(e, {
+                          iconType: a.symbol,
+                          x: a.x - l,
+                          y: i - l,
+                          width: 2 * l,
+                          height: 2 * l,
+                          n: a.n
+                        }),
+                            e.fillStyle = a.isEmpty ? "#fff": t.strokeColor,
+                            e.closePath(),
+                            e.fill(),
+                            e.stroke()
+                      }
+                      a.showLabel && (e.font = a.textFont, e.fillStyle = a.textColor, e.textAlign = a.textAlign, e.textBaseline = a.textBaseline, a.rotation ? (e.save(), this._updateTextTransform(e, a.rotation), e.fillText(a.name, a.textX, a.textY), e.restore()) : e.fillText(a.name, a.textX, a.textY))
+                    }
+                    e.restore()
+                  },
+                  _updateTextTransform: function(e, t) {
+                    var i = r.create();
+                    if (r.identity(i), 0 !== t[0]) {
+                      var n = t[1] || 0,
+                          a = t[2] || 0; (n || a) && r.translate(i, i, [ - n, -a]),
+                          r.rotate(i, i, t[0]),
+                      (n || a) && r.translate(i, i, [n, a])
+                    }
+                    e.transform.apply(e, i)
+                  },
+                  isCover: function(e, t) {
+                    var i = this.style;
+                    return e >= i.x && e <= i.x + i.width && t >= i.y && t <= i.y + i.height ? !0 : !1
+                  }
+                },
+                    o.inherits(t, i),
+                    t
+              }),
+          i("zrender/shape/Ring", ["require", "./Base", "../tool/util"],
+              function(e) {
+                var t = e("./Base"),
+                    i = function(e) {
+                      t.call(this, e)
+                    };
+                return i.prototype = {
+                  type: "ring",
+                  buildPath: function(e, t) {
+                    e.arc(t.x, t.y, t.r, 0, 2 * Math.PI, !1),
+                        e.moveTo(t.x + t.r0, t.y),
+                        e.arc(t.x, t.y, t.r0, 0, 2 * Math.PI, !0)
+                  },
+                  getRect: function(e) {
+                    if (e.__rect) return e.__rect;
+                    var t;
+                    return t = "stroke" == e.brushType || "fill" == e.brushType ? e.lineWidth || 1 : 0,
+                        e.__rect = {
+                          x: Math.round(e.x - e.r - t / 2),
+                          y: Math.round(e.y - e.r - t / 2),
+                          width: 2 * e.r + t,
+                          height: 2 * e.r + t
+                        },
+                        e.__rect
+                  }
+                },
+                    e("../tool/util").inherits(i, t),
+                    i
+              }),
+          i("echarts/component/axis", ["require", "./base", "zrender/shape/Line", "../config", "../util/ecData", "zrender/tool/util", "zrender/tool/color", "./categoryAxis", "./valueAxis", "../component"],
+              function(e) {
+                function t(e, t, n, a, o, r) {
+                  i.call(this, e, t, n, a, o),
+                      this.axisType = r,
+                      this._axisList = [],
+                      this.refresh(a)
+                }
+                var i = e("./base"),
+                    n = e("zrender/shape/Line"),
+                    a = e("../config"),
+                    o = e("../util/ecData"),
+                    r = e("zrender/tool/util"),
+                    s = e("zrender/tool/color");
+                return t.prototype = {
+                  type: a.COMPONENT_TYPE_AXIS,
+                  axisBase: {
+                    _buildAxisLine: function() {
+                      var e = this.option.axisLine.lineStyle.width,
+                          t = e / 2,
+                          i = {
+                            _axisShape: "axisLine",
+                            zlevel: this.getZlevelBase(),
+                            z: this.getZBase() + 3,
+                            hoverable: !1
+                          },
+                          a = this.grid;
+                      switch (this.option.position) {
+                        case "left":
+                          i.style = {
+                            xStart: a.getX() - t,
+                            yStart: a.getYend(),
+                            xEnd: a.getX() - t,
+                            yEnd: a.getY(),
+                            lineCap: "round"
+                          };
+                          break;
+                        case "right":
+                          i.style = {
+                            xStart: a.getXend() + t,
+                            yStart: a.getYend(),
+                            xEnd: a.getXend() + t,
+                            yEnd: a.getY(),
+                            lineCap: "round"
+                          };
+                          break;
+                        case "bottom":
+                          i.style = {
+                            xStart: a.getX(),
+                            yStart: a.getYend() + t,
+                            xEnd: a.getXend(),
+                            yEnd: a.getYend() + t,
+                            lineCap: "round"
+                          };
+                          break;
+                        case "top":
+                          i.style = {
+                            xStart: a.getX(),
+                            yStart: a.getY() - t,
+                            xEnd: a.getXend(),
+                            yEnd: a.getY() - t,
+                            lineCap: "round"
+                          }
+                      }
+                      var o = i.style;
+                      "" !== this.option.name && (o.text = this.option.name, o.textPosition = this.option.nameLocation, o.textFont = this.getFont(this.option.nameTextStyle), this.option.nameTextStyle.align && (o.textAlign = this.option.nameTextStyle.align), this.option.nameTextStyle.baseline && (o.textBaseline = this.option.nameTextStyle.baseline), this.option.nameTextStyle.color && (o.textColor = this.option.nameTextStyle.color)),
+                          o.strokeColor = this.option.axisLine.lineStyle.color,
+                          o.lineWidth = e,
+                          this.isHorizontal() ? o.yStart = o.yEnd = this.subPixelOptimize(o.yEnd, e) : o.xStart = o.xEnd = this.subPixelOptimize(o.xEnd, e),
+                          o.lineType = this.option.axisLine.lineStyle.type,
+                          i = new n(i),
+                          this.shapeList.push(i)
+                    },
+                    _axisLabelClickable: function(e, t) {
+                      return e ? (o.pack(t, void 0, -1, void 0, -1, t.style.text), t.hoverable = !0, t.clickable = !0, t.highlightStyle = {
+                        color: s.lift(t.style.color, 1),
+                        brushType: "fill"
+                      },
+                          t) : t
+                    },
+                    refixAxisShape: function(e, t) {
+                      if (this.option.axisLine.onZero) {
+                        var i;
+                        if (this.isHorizontal() && null != t) for (var n = 0,
+                                                                       a = this.shapeList.length; a > n; n++)"axisLine" === this.shapeList[n]._axisShape ? (this.shapeList[n].style.yStart = this.shapeList[n].style.yEnd = this.subPixelOptimize(t, this.shapeList[n].stylelineWidth), this.zr.modShape(this.shapeList[n].id)) : "axisTick" === this.shapeList[n]._axisShape && (i = this.shapeList[n].style.yEnd - this.shapeList[n].style.yStart, this.shapeList[n].style.yStart = t - i, this.shapeList[n].style.yEnd = t, this.zr.modShape(this.shapeList[n].id));
+                        if (!this.isHorizontal() && null != e) for (var n = 0,
+                                                                        a = this.shapeList.length; a > n; n++)"axisLine" === this.shapeList[n]._axisShape ? (this.shapeList[n].style.xStart = this.shapeList[n].style.xEnd = this.subPixelOptimize(e, this.shapeList[n].stylelineWidth), this.zr.modShape(this.shapeList[n].id)) : "axisTick" === this.shapeList[n]._axisShape && (i = this.shapeList[n].style.xEnd - this.shapeList[n].style.xStart, this.shapeList[n].style.xStart = e, this.shapeList[n].style.xEnd = e + i, this.zr.modShape(this.shapeList[n].id))
+                      }
+                    },
+                    getPosition: function() {
+                      return this.option.position
+                    },
+                    isHorizontal: function() {
+                      return "bottom" === this.option.position || "top" === this.option.position
+                    }
+                  },
+                  reformOption: function(e) {
+                    if (!e || e instanceof Array && 0 === e.length ? e = [{
+                      type: a.COMPONENT_TYPE_AXIS_VALUE
+                    }] : e instanceof Array || (e = [e]), e.length > 2 && (e = [e[0], e[1]]), "xAxis" === this.axisType) { (!e[0].position || "bottom" != e[0].position && "top" != e[0].position) && (e[0].position = "bottom"),
+                    e.length > 1 && (e[1].position = "bottom" === e[0].position ? "top": "bottom");
+                      for (var t = 0,
+                               i = e.length; i > t; t++) e[t].type = e[t].type || "category",
+                          e[t].xAxisIndex = t,
+                          e[t].yAxisIndex = -1
+                    } else { (!e[0].position || "left" != e[0].position && "right" != e[0].position) && (e[0].position = "left"),
+                    e.length > 1 && (e[1].position = "left" === e[0].position ? "right": "left");
+                      for (var t = 0,
+                               i = e.length; i > t; t++) e[t].type = e[t].type || "value",
+                          e[t].xAxisIndex = -1,
+                          e[t].yAxisIndex = t
+                    }
+                    return e
+                  },
+                  refresh: function(t) {
+                    var i;
+                    t && (this.option = t, "xAxis" === this.axisType ? (this.option.xAxis = this.reformOption(t.xAxis), i = this.option.xAxis) : (this.option.yAxis = this.reformOption(t.yAxis), i = this.option.yAxis), this.series = t.series);
+                    for (var n = e("./categoryAxis"), a = e("./valueAxis"), o = Math.max(i && i.length || 0, this._axisList.length), r = 0; o > r; r++) ! this._axisList[r] || !t || i[r] && this._axisList[r].type == i[r].type || (this._axisList[r].dispose && this._axisList[r].dispose(), this._axisList[r] = !1),
+                        this._axisList[r] ? this._axisList[r].refresh && this._axisList[r].refresh(i ? i[r] : !1, this.series) : i && i[r] && (this._axisList[r] = "category" === i[r].type ? new n(this.ecTheme, this.messageCenter, this.zr, i[r], this.myChart, this.axisBase) : new a(this.ecTheme, this.messageCenter, this.zr, i[r], this.myChart, this.axisBase, this.series))
+                  },
+                  getAxis: function(e) {
+                    return this._axisList[e]
+                  },
+                  getAxisCount: function() {
+                    return this._axisList.length
+                  },
+                  clear: function() {
+                    for (var e = 0,
+                             t = this._axisList.length; t > e; e++) this._axisList[e].dispose && this._axisList[e].dispose();
+                    this._axisList = []
+                  }
+                },
+                    r.inherits(t, i),
+                    e("../component").define("axis", t),
+                    t
+              }),
+          i("echarts/component/grid", ["require", "./base", "zrender/shape/Rectangle", "../config", "zrender/tool/util", "../component"],
+              function(e) {
+                function t(e, t, n, a, o) {
+                  i.call(this, e, t, n, a, o),
+                      this.refresh(a)
+                }
+                var i = e("./base"),
+                    n = e("zrender/shape/Rectangle"),
+                    a = e("../config");
+                a.grid = {
+                  zlevel: 0,
+                  z: 0,
+                  x: 80,
+                  y: 60,
+                  x2: 80,
+                  y2: 60,
+                  backgroundColor: "rgba(0,0,0,0)",
+                  borderWidth: 1,
+                  borderColor: "#ccc"
+                };
+                var o = e("zrender/tool/util");
+                return t.prototype = {
+                  type: a.COMPONENT_TYPE_GRID,
+                  getX: function() {
+                    return this._x
+                  },
+                  getY: function() {
+                    return this._y
+                  },
+                  getWidth: function() {
+                    return this._width
+                  },
+                  getHeight: function() {
+                    return this._height
+                  },
+                  getXend: function() {
+                    return this._x + this._width
+                  },
+                  getYend: function() {
+                    return this._y + this._height
+                  },
+                  getArea: function() {
+                    return {
+                      x: this._x,
+                      y: this._y,
+                      width: this._width,
+                      height: this._height
+                    }
+                  },
+                  getBbox: function() {
+                    return [[this._x, this._y], [this.getXend(), this.getYend()]]
+                  },
+                  refixAxisShape: function(e) {
+                    for (var t, i, n, o = e.xAxis._axisList.concat(e.yAxis ? e.yAxis._axisList: []), r = o.length; r--;) n = o[r],
+                    n.type == a.COMPONENT_TYPE_AXIS_VALUE && n._min < 0 && n._max >= 0 && (n.isHorizontal() ? t = n.getCoord(0) : i = n.getCoord(0));
+                    if ("undefined" != typeof t || "undefined" != typeof i) for (r = o.length; r--;) o[r].refixAxisShape(t, i)
+                  },
+                  refresh: function(e) {
+                    if (e || this._zrWidth != this.zr.getWidth() || this._zrHeight != this.zr.getHeight()) {
+                      this.clear(),
+                          this.option = e || this.option,
+                          this.option.grid = this.reformOption(this.option.grid);
+                      var t = this.option.grid;
+                      this._zrWidth = this.zr.getWidth(),
+                          this._zrHeight = this.zr.getHeight(),
+                          this._x = this.parsePercent(t.x, this._zrWidth),
+                          this._y = this.parsePercent(t.y, this._zrHeight);
+                      var i = this.parsePercent(t.x2, this._zrWidth),
+                          a = this.parsePercent(t.y2, this._zrHeight);
+                      this._width = "undefined" == typeof t.width ? this._zrWidth - this._x - i: this.parsePercent(t.width, this._zrWidth),
+                          this._width = this._width <= 0 ? 10 : this._width,
+                          this._height = "undefined" == typeof t.height ? this._zrHeight - this._y - a: this.parsePercent(t.height, this._zrHeight),
+                          this._height = this._height <= 0 ? 10 : this._height,
+                          this._x = this.subPixelOptimize(this._x, t.borderWidth),
+                          this._y = this.subPixelOptimize(this._y, t.borderWidth),
+                          this.shapeList.push(new n({
+                            zlevel: this.getZlevelBase(),
+                            z: this.getZBase(),
+                            hoverable: !1,
+                            style: {
+                              x: this._x,
+                              y: this._y,
+                              width: this._width,
+                              height: this._height,
+                              brushType: t.borderWidth > 0 ? "both": "fill",
+                              color: t.backgroundColor,
+                              strokeColor: t.borderColor,
+                              lineWidth: t.borderWidth
+                            }
+                          })),
+                          this.zr.addShape(this.shapeList[0])
+                    }
+                  }
+                },
+                    o.inherits(t, i),
+                    e("../component").define("grid", t),
+                    t
+              }),
+          i("echarts/component/dataZoom", ["require", "./base", "zrender/shape/Rectangle", "zrender/shape/Polygon", "../util/shape/Icon", "../config", "../util/date", "zrender/tool/util", "../component"],
+              function(e) {
+                function t(e, t, n, a, o) {
+                  i.call(this, e, t, n, a, o);
+                  var r = this;
+                  r._ondrift = function(e, t) {
+                    return r.__ondrift(this, e, t)
+                  },
+                      r._ondragend = function() {
+                        return r.__ondragend()
+                      },
+                      this._fillerSize = 30,
+                      this._isSilence = !1,
+                      this._zoom = {},
+                      this.option.dataZoom = this.reformOption(this.option.dataZoom),
+                      this.zoomOption = this.option.dataZoom,
+                      this._handleSize = this.zoomOption.handleSize,
+                  this.myChart.canvasSupported || (this.zoomOption.realtime = !1),
+                      this._location = this._getLocation(),
+                      this._zoom = this._getZoom(),
+                      this._backupData(),
+                  this.option.dataZoom.show && this._buildShape(),
+                      this._syncData()
+                }
+                var i = e("./base"),
+                    n = e("zrender/shape/Rectangle"),
+                    a = e("zrender/shape/Polygon"),
+                    o = e("../util/shape/Icon"),
+                    r = e("../config");
+                r.dataZoom = {
+                  zlevel: 0,
+                  z: 4,
+                  show: !1,
+                  orient: "horizontal",
+                  backgroundColor: "rgba(0,0,0,0)",
+                  dataBackgroundColor: "#eee",
+                  fillerColor: "rgba(144,197,237,0.2)",
+                  handleColor: "rgba(70,130,180,0.8)",
+                  handleSize: 8,
+                  showDetail: !0,
+                  realtime: !0
+                };
+                var s = e("../util/date"),
+                    l = e("zrender/tool/util");
+                return t.prototype = {
+                  type: r.COMPONENT_TYPE_DATAZOOM,
+                  _buildShape: function() {
+                    this._buildBackground(),
+                        this._buildFiller(),
+                        this._buildHandle(),
+                        this._buildFrame();
+                    for (var e = 0,
+                             t = this.shapeList.length; t > e; e++) this.zr.addShape(this.shapeList[e]);
+                    this._syncFrameShape()
+                  },
+                  _getLocation: function() {
+                    var e, t, i, n, a = this.component.grid;
+                    return "horizontal" == this.zoomOption.orient ? (i = this.zoomOption.width || a.getWidth(), n = this.zoomOption.height || this._fillerSize, e = null != this.zoomOption.x ? this.zoomOption.x: a.getX(), t = null != this.zoomOption.y ? this.zoomOption.y: this.zr.getHeight() - n - 2) : (i = this.zoomOption.width || this._fillerSize, n = this.zoomOption.height || a.getHeight(), e = null != this.zoomOption.x ? this.zoomOption.x: 2, t = null != this.zoomOption.y ? this.zoomOption.y: a.getY()),
+                        {
+                          x: e,
+                          y: t,
+                          width: i,
+                          height: n
+                        }
+                  },
+                  _getZoom: function() {
+                    var e = this.option.series,
+                        t = this.option.xAxis; ! t || t instanceof Array || (t = [t], this.option.xAxis = t);
+                    var i = this.option.yAxis; ! i || i instanceof Array || (i = [i], this.option.yAxis = i);
+                    var n, a, o = [],
+                        s = this.zoomOption.xAxisIndex;
+                    if (t && null == s) {
+                      n = [];
+                      for (var l = 0,
+                               h = t.length; h > l; l++)("category" == t[l].type || null == t[l].type) && n.push(l)
+                    } else n = s instanceof Array ? s: null != s ? [s] : [];
+                    if (s = this.zoomOption.yAxisIndex, i && null == s) {
+                      a = [];
+                      for (var l = 0,
+                               h = i.length; h > l; l++)"category" == i[l].type && a.push(l)
+                    } else a = s instanceof Array ? s: null != s ? [s] : [];
+                    for (var m, l = 0,
+                             h = e.length; h > l; l++) if (m = e[l], m.type == r.CHART_TYPE_LINE || m.type == r.CHART_TYPE_BAR || m.type == r.CHART_TYPE_SCATTER || m.type == r.CHART_TYPE_K) {
+                      for (var V = 0,
+                               U = n.length; U > V; V++) if (n[V] == (m.xAxisIndex || 0)) {
+                        o.push(l);
+                        break
+                      }
+                      for (var V = 0,
+                               U = a.length; U > V; V++) if (a[V] == (m.yAxisIndex || 0)) {
+                        o.push(l);
+                        break
+                      }
+                      null == this.zoomOption.xAxisIndex && null == this.zoomOption.yAxisIndex && m.data && this.getDataFromOption(m.data[0]) instanceof Array && (m.type == r.CHART_TYPE_SCATTER || m.type == r.CHART_TYPE_LINE || m.type == r.CHART_TYPE_BAR) && o.push(l)
+                    }
+                    var d = null != this._zoom.start ? this._zoom.start: null != this.zoomOption.start ? this.zoomOption.start: 0,
+                        p = null != this._zoom.end ? this._zoom.end: null != this.zoomOption.end ? this.zoomOption.end: 100;
+                    d > p && (d += p, p = d - p, d -= p);
+                    var c = Math.round((p - d) / 100 * ("horizontal" == this.zoomOption.orient ? this._location.width: this._location.height));
+                    return {
+                      start: d,
+                      end: p,
+                      start2: 0,
+                      end2: 100,
+                      size: c,
+                      xAxisIndex: n,
+                      yAxisIndex: a,
+                      seriesIndex: o,
+                      scatterMap: this._zoom.scatterMap || {}
+                    }
+                  },
+                  _backupData: function() {
+                    this._originalData = {
+                      xAxis: {},
+                      yAxis: {},
+                      series: {}
+                    };
+                    for (var e = this.option.xAxis,
+                             t = this._zoom.xAxisIndex,
+                             i = 0,
+                             n = t.length; n > i; i++) this._originalData.xAxis[t[i]] = e[t[i]].data;
+                    for (var a = this.option.yAxis,
+                             o = this._zoom.yAxisIndex,
+                             i = 0,
+                             n = o.length; n > i; i++) this._originalData.yAxis[o[i]] = a[o[i]].data;
+                    for (var s, l = this.option.series,
+                             h = this._zoom.seriesIndex,
+                             i = 0,
+                             n = h.length; n > i; i++) s = l[h[i]],
+                        this._originalData.series[h[i]] = s.data,
+                    s.data && this.getDataFromOption(s.data[0]) instanceof Array && (s.type == r.CHART_TYPE_SCATTER || s.type == r.CHART_TYPE_LINE || s.type == r.CHART_TYPE_BAR) && (this._backupScale(), this._calculScatterMap(h[i]))
+                  },
+                  _calculScatterMap: function(t) {
+                    this._zoom.scatterMap = this._zoom.scatterMap || {},
+                        this._zoom.scatterMap[t] = this._zoom.scatterMap[t] || {};
+                    var i = e("../component"),
+                        n = i.get("axis"),
+                        a = l.clone(this.option.xAxis);
+                    "category" == a[0].type && (a[0].type = "value"),
+                    a[1] && "category" == a[1].type && (a[1].type = "value");
+                    var o = new n(this.ecTheme, null, !1, {
+                          xAxis: a,
+                          series: this.option.series
+                        },
+                        this, "xAxis"),
+                        r = this.option.series[t].xAxisIndex || 0;
+                    this._zoom.scatterMap[t].x = o.getAxis(r).getExtremum(),
+                        o.dispose(),
+                        a = l.clone(this.option.yAxis),
+                    "category" == a[0].type && (a[0].type = "value"),
+                    a[1] && "category" == a[1].type && (a[1].type = "value"),
+                        o = new n(this.ecTheme, null, !1, {
+                              yAxis: a,
+                              series: this.option.series
+                            },
+                            this, "yAxis"),
+                        r = this.option.series[t].yAxisIndex || 0,
+                        this._zoom.scatterMap[t].y = o.getAxis(r).getExtremum(),
+                        o.dispose()
+                  },
+                  _buildBackground: function() {
+                    var e = this._location.width,
+                        t = this._location.height;
+                    this.shapeList.push(new n({
+                      zlevel: this.getZlevelBase(),
+                      z: this.getZBase(),
+                      hoverable: !1,
+                      style: {
+                        x: this._location.x,
+                        y: this._location.y,
+                        width: e,
+                        height: t,
+                        color: this.zoomOption.backgroundColor
+                      }
+                    }));
+                    for (var i = 0,
+                             o = this._originalData.xAxis,
+                             s = this._zoom.xAxisIndex,
+                             l = 0,
+                             h = s.length; h > l; l++) i = Math.max(i, o[s[l]].length);
+                    for (var m = this._originalData.yAxis,
+                             V = this._zoom.yAxisIndex,
+                             l = 0,
+                             h = V.length; h > l; l++) i = Math.max(i, m[V[l]].length);
+                    for (var U, d = this._zoom.seriesIndex[0], p = this._originalData.series[d], c = Number.MIN_VALUE, u = Number.MAX_VALUE, l = 0, h = p.length; h > l; l++) U = this.getDataFromOption(p[l], 0),
+                    this.option.series[d].type == r.CHART_TYPE_K && (U = U[1]),
+                    isNaN(U) && (U = 0),
+                        c = Math.max(c, U),
+                        u = Math.min(u, U);
+                    var y = c - u,
+                        g = [],
+                        b = e / (i - (i > 1 ? 1 : 0)),
+                        f = t / (i - (i > 1 ? 1 : 0)),
+                        k = 1;
+                    "horizontal" == this.zoomOption.orient && 1 > b ? k = Math.floor(3 * i / e) : "vertical" == this.zoomOption.orient && 1 > f && (k = Math.floor(3 * i / t));
+                    for (var l = 0,
+                             h = i; h > l; l += k) U = this.getDataFromOption(p[l], 0),
+                    this.option.series[d].type == r.CHART_TYPE_K && (U = U[1]),
+                    isNaN(U) && (U = 0),
+                        g.push("horizontal" == this.zoomOption.orient ? [this._location.x + b * l, this._location.y + t - 1 - Math.round((U - u) / y * (t - 10))] : [this._location.x + 1 + Math.round((U - u) / y * (e - 10)), this._location.y + f * (h - l - 1)]);
+                    "horizontal" == this.zoomOption.orient ? (g.push([this._location.x + e, this._location.y + t]), g.push([this._location.x, this._location.y + t])) : (g.push([this._location.x, this._location.y]), g.push([this._location.x, this._location.y + t])),
+                        this.shapeList.push(new a({
+                          zlevel: this.getZlevelBase(),
+                          z: this.getZBase(),
+                          style: {
+                            pointList: g,
+                            color: this.zoomOption.dataBackgroundColor
+                          },
+                          hoverable: !1
+                        }))
+                  },
+                  _buildFiller: function() {
+                    this._fillerShae = {
+                      zlevel: this.getZlevelBase(),
+                      z: this.getZBase(),
+                      draggable: !0,
+                      ondrift: this._ondrift,
+                      ondragend: this._ondragend,
+                      _type: "filler"
+                    },
+                        this._fillerShae.style = "horizontal" == this.zoomOption.orient ? {
+                          x: this._location.x + Math.round(this._zoom.start / 100 * this._location.width) + this._handleSize,
+                          y: this._location.y,
+                          width: this._zoom.size - 2 * this._handleSize,
+                          height: this._location.height,
+                          color: this.zoomOption.fillerColor,
+                          text: ":::",
+                          textPosition: "inside"
+                        }: {
+                          x: this._location.x,
+                          y: this._location.y + Math.round(this._zoom.start / 100 * this._location.height) + this._handleSize,
+                          width: this._location.width,
+                          height: this._zoom.size - 2 * this._handleSize,
+                          color: this.zoomOption.fillerColor,
+                          text: "::",
+                          textPosition: "inside"
+                        },
+                        this._fillerShae.highlightStyle = {
+                          brushType: "fill",
+                          color: "rgba(0,0,0,0)"
+                        },
+                        this._fillerShae = new n(this._fillerShae),
+                        this.shapeList.push(this._fillerShae)
+                  },
+                  _buildHandle: function() {
+                    var e = this.zoomOption.showDetail ? this._getDetail() : {
+                      start: "",
+                      end: ""
+                    };
+                    this._startShape = {
+                      zlevel: this.getZlevelBase(),
+                      z: this.getZBase(),
+                      draggable: !0,
+                      style: {
+                        iconType: "rectangle",
+                        x: this._location.x,
+                        y: this._location.y,
+                        width: this._handleSize,
+                        height: this._handleSize,
+                        color: this.zoomOption.handleColor,
+                        text: "=",
+                        textPosition: "inside"
+                      },
+                      highlightStyle: {
+                        text: e.start,
+                        brushType: "fill",
+                        textPosition: "left"
+                      },
+                      ondrift: this._ondrift,
+                      ondragend: this._ondragend
+                    },
+                        "horizontal" == this.zoomOption.orient ? (this._startShape.style.height = this._location.height, this._endShape = l.clone(this._startShape), this._startShape.style.x = this._fillerShae.style.x - this._handleSize, this._endShape.style.x = this._fillerShae.style.x + this._fillerShae.style.width, this._endShape.highlightStyle.text = e.end, this._endShape.highlightStyle.textPosition = "right") : (this._startShape.style.width = this._location.width, this._endShape = l.clone(this._startShape), this._startShape.style.y = this._fillerShae.style.y + this._fillerShae.style.height, this._startShape.highlightStyle.textPosition = "bottom", this._endShape.style.y = this._fillerShae.style.y - this._handleSize, this._endShape.highlightStyle.text = e.end, this._endShape.highlightStyle.textPosition = "top"),
+                        this._startShape = new o(this._startShape),
+                        this._endShape = new o(this._endShape),
+                        this.shapeList.push(this._startShape),
+                        this.shapeList.push(this._endShape)
+                  },
+                  _buildFrame: function() {
+                    var e = this.subPixelOptimize(this._location.x, 1),
+                        t = this.subPixelOptimize(this._location.y, 1);
+                    this._startFrameShape = {
+                      zlevel: this.getZlevelBase(),
+                      z: this.getZBase(),
+                      hoverable: !1,
+                      style: {
+                        x: e,
+                        y: t,
+                        width: this._location.width - (e > this._location.x ? 1 : 0),
+                        height: this._location.height - (t > this._location.y ? 1 : 0),
+                        lineWidth: 1,
+                        brushType: "stroke",
+                        strokeColor: this.zoomOption.handleColor
+                      }
+                    },
+                        this._endFrameShape = l.clone(this._startFrameShape),
+                        this._startFrameShape = new n(this._startFrameShape),
+                        this._endFrameShape = new n(this._endFrameShape),
+                        this.shapeList.push(this._startFrameShape),
+                        this.shapeList.push(this._endFrameShape)
+                  },
+                  _syncHandleShape: function() {
+                    "horizontal" == this.zoomOption.orient ? (this._startShape.style.x = this._fillerShae.style.x - this._handleSize, this._endShape.style.x = this._fillerShae.style.x + this._fillerShae.style.width, this._zoom.start = (this._startShape.style.x - this._location.x) / this._location.width * 100, this._zoom.end = (this._endShape.style.x + this._handleSize - this._location.x) / this._location.width * 100) : (this._startShape.style.y = this._fillerShae.style.y + this._fillerShae.style.height, this._endShape.style.y = this._fillerShae.style.y - this._handleSize, this._zoom.start = (this._location.y + this._location.height - this._startShape.style.y) / this._location.height * 100, this._zoom.end = (this._location.y + this._location.height - this._endShape.style.y - this._handleSize) / this._location.height * 100),
+                        this.zr.modShape(this._startShape.id),
+                        this.zr.modShape(this._endShape.id),
+                        this._syncFrameShape(),
+                        this.zr.refreshNextFrame()
+                  },
+                  _syncFillerShape: function() {
+                    var e, t;
+                    "horizontal" == this.zoomOption.orient ? (e = this._startShape.style.x, t = this._endShape.style.x, this._fillerShae.style.x = Math.min(e, t) + this._handleSize, this._fillerShae.style.width = Math.abs(e - t) - this._handleSize, this._zoom.start = (Math.min(e, t) - this._location.x) / this._location.width * 100, this._zoom.end = (Math.max(e, t) + this._handleSize - this._location.x) / this._location.width * 100) : (e = this._startShape.style.y, t = this._endShape.style.y, this._fillerShae.style.y = Math.min(e, t) + this._handleSize, this._fillerShae.style.height = Math.abs(e - t) - this._handleSize, this._zoom.start = (this._location.y + this._location.height - Math.max(e, t)) / this._location.height * 100, this._zoom.end = (this._location.y + this._location.height - Math.min(e, t) - this._handleSize) / this._location.height * 100),
+                        this.zr.modShape(this._fillerShae.id),
+                        this._syncFrameShape(),
+                        this.zr.refreshNextFrame()
+                  },
+                  _syncFrameShape: function() {
+                    "horizontal" == this.zoomOption.orient ? (this._startFrameShape.style.width = this._fillerShae.style.x - this._location.x, this._endFrameShape.style.x = this._fillerShae.style.x + this._fillerShae.style.width, this._endFrameShape.style.width = this._location.x + this._location.width - this._endFrameShape.style.x) : (this._startFrameShape.style.y = this._fillerShae.style.y + this._fillerShae.style.height, this._startFrameShape.style.height = this._location.y + this._location.height - this._startFrameShape.style.y, this._endFrameShape.style.height = this._fillerShae.style.y - this._location.y),
+                        this.zr.modShape(this._startFrameShape.id),
+                        this.zr.modShape(this._endFrameShape.id)
+                  },
+                  _syncShape: function() {
+                    this.zoomOption.show && ("horizontal" == this.zoomOption.orient ? (this._startShape.style.x = this._location.x + this._zoom.start / 100 * this._location.width, this._endShape.style.x = this._location.x + this._zoom.end / 100 * this._location.width - this._handleSize, this._fillerShae.style.x = this._startShape.style.x + this._handleSize, this._fillerShae.style.width = this._endShape.style.x - this._startShape.style.x - this._handleSize) : (this._startShape.style.y = this._location.y + this._location.height - this._zoom.start / 100 * this._location.height, this._endShape.style.y = this._location.y + this._location.height - this._zoom.end / 100 * this._location.height - this._handleSize, this._fillerShae.style.y = this._endShape.style.y + this._handleSize, this._fillerShae.style.height = this._startShape.style.y - this._endShape.style.y - this._handleSize), this.zr.modShape(this._startShape.id), this.zr.modShape(this._endShape.id), this.zr.modShape(this._fillerShae.id), this._syncFrameShape(), this.zr.refresh())
+                  },
+                  _syncData: function(e) {
+                    var t, i, n, a, o;
+                    for (var s in this._originalData) {
+                      t = this._originalData[s];
+                      for (var l in t) o = t[l],
+                      null != o && (a = o.length, i = Math.floor(this._zoom.start / 100 * a), n = Math.ceil(this._zoom.end / 100 * a), this.getDataFromOption(o[0]) instanceof Array && this.option[s][l].type != r.CHART_TYPE_K ? (this._setScale(), this.option[s][l].data = this._synScatterData(l, o)) : this.option[s][l].data = o.slice(i, n))
+                    }
+                    this._isSilence || !this.zoomOption.realtime && !e || this.messageCenter.dispatch(r.EVENT.DATA_ZOOM, null, {
+                          zoom: this._zoom
+                        },
+                        this.myChart)
+                  },
+                  _synScatterData: function(e, t) {
+                    if (0 === this._zoom.start && 100 == this._zoom.end && 0 === this._zoom.start2 && 100 == this._zoom.end2) return t;
+                    var i, n, a, o, r, s = [],
+                        l = this._zoom.scatterMap[e];
+
+                    "horizontal" == this.zoomOption.orient ? (i = l.x.max - l.x.min, n = this._zoom.start / 100 * i + l.x.min, a = this._zoom.end / 100 * i + l.x.min, i = l.y.max - l.y.min, o = this._zoom.start2 / 100 * i + l.y.min, r = this._zoom.end2 / 100 * i + l.y.min) : (i = l.x.max - l.x.min, n = this._zoom.start2 / 100 * i + l.x.min, a = this._zoom.end2 / 100 * i + l.x.min, i = l.y.max - l.y.min, o = this._zoom.start / 100 * i + l.y.min, r = this._zoom.end / 100 * i + l.y.min);
+                    var h; (h = l.x.dataMappingMethods) && (n = h.coord2Value(n), a = h.coord2Value(a)),
+                    (h = l.y.dataMappingMethods) && (o = h.coord2Value(o), r = h.coord2Value(r));
+                    for (var m, V = 0,
+                             U = t.length; U > V; V++) m = t[V].value || t[V],
+                    m[0] >= n && m[0] <= a && m[1] >= o && m[1] <= r && s.push(t[V]);
+                    return s
+                  },
+                  _setScale: function() {
+                    var e = 0 !== this._zoom.start || 100 !== this._zoom.end || 0 !== this._zoom.start2 || 100 !== this._zoom.end2,
+                        t = {
+                          xAxis: this.option.xAxis,
+                          yAxis: this.option.yAxis
+                        };
+                    for (var i in t) for (var n = 0,
+                                              a = t[i].length; a > n; n++) t[i][n].scale = e || t[i][n]._scale
+                  },
+                  _backupScale: function() {
+                    var e = {
+                      xAxis: this.option.xAxis,
+                      yAxis: this.option.yAxis
+                    };
+                    for (var t in e) for (var i = 0,
+                                              n = e[t].length; n > i; i++) e[t][i]._scale = e[t][i].scale
+                  },
+                  _getDetail: function() {
+                    for (var e = ["xAxis", "yAxis"], t = 0, i = e.length; i > t; t++) {
+                      var n = this._originalData[e[t]];
+                      for (var a in n) {
+                        var o = n[a];
+                        if (null != o) {
+                          var r = o.length,
+                              l = Math.floor(this._zoom.start / 100 * r),
+                              h = Math.ceil(this._zoom.end / 100 * r);
+                          return h -= h > 0 ? 1 : 0,
+                              {
+                                start: this.getDataFromOption(o[l]),
+                                end: this.getDataFromOption(o[h])
+                              }
+                        }
+                      }
+                    }
+                    e = "horizontal" == this.zoomOption.orient ? "xAxis": "yAxis";
+                    var m = this._zoom.seriesIndex[0],
+                        V = this.option.series[m][e + "Index"] || 0,
+                        U = this.option[e][V].type,
+                        d = this._zoom.scatterMap[m][e.charAt(0)].min,
+                        p = this._zoom.scatterMap[m][e.charAt(0)].max,
+                        c = p - d;
+                    if ("value" == U) return {
+                      start: d + c * this._zoom.start / 100,
+                      end: d + c * this._zoom.end / 100
+                    };
+                    if ("time" == U) {
+                      p = d + c * this._zoom.end / 100,
+                          d += c * this._zoom.start / 100;
+                      var u = s.getAutoFormatter(d, p).formatter;
+                      return {
+                        start: s.format(u, d),
+                        end: s.format(u, p)
+                      }
+                    }
+                    return {
+                      start: "",
+                      end: ""
+                    }
+                  },
+                  __ondrift: function(e, t, i) {
+                    this.zoomOption.zoomLock && (e = this._fillerShae);
+                    var n = "filler" == e._type ? this._handleSize: 0;
+                    if ("horizontal" == this.zoomOption.orient ? e.style.x + t - n <= this._location.x ? e.style.x = this._location.x + n: e.style.x + t + e.style.width + n >= this._location.x + this._location.width ? e.style.x = this._location.x + this._location.width - e.style.width - n: e.style.x += t: e.style.y + i - n <= this._location.y ? e.style.y = this._location.y + n: e.style.y + i + e.style.height + n >= this._location.y + this._location.height ? e.style.y = this._location.y + this._location.height - e.style.height - n: e.style.y += i, "filler" == e._type ? this._syncHandleShape() : this._syncFillerShape(), this.zoomOption.realtime && this._syncData(), this.zoomOption.showDetail) {
+                      var a = this._getDetail();
+                      this._startShape.style.text = this._startShape.highlightStyle.text = a.start,
+                          this._endShape.style.text = this._endShape.highlightStyle.text = a.end,
+                          this._startShape.style.textPosition = this._startShape.highlightStyle.textPosition,
+                          this._endShape.style.textPosition = this._endShape.highlightStyle.textPosition
+                    }
+                    return ! 0
+                  },
+                  __ondragend: function() {
+                    this.zoomOption.showDetail && (this._startShape.style.text = this._endShape.style.text = "=", this._startShape.style.textPosition = this._endShape.style.textPosition = "inside", this.zr.modShape(this._startShape.id), this.zr.modShape(this._endShape.id), this.zr.refreshNextFrame()),
+                        this.isDragend = !0
+                  },
+                  ondragend: function(e, t) {
+                    this.isDragend && e.target && (!this.zoomOption.realtime && this._syncData(), t.dragOut = !0, t.dragIn = !0, this._isSilence || this.zoomOption.realtime || this.messageCenter.dispatch(r.EVENT.DATA_ZOOM, null, {
+                          zoom: this._zoom
+                        },
+                        this.myChart), t.needRefresh = !1, this.isDragend = !1)
+                  },
+                  ondataZoom: function(e, t) {
+                    t.needRefresh = !0
+                  },
+                  absoluteZoom: function(e) {
+                    this._zoom.start = e.start,
+                        this._zoom.end = e.end,
+                        this._zoom.start2 = e.start2,
+                        this._zoom.end2 = e.end2,
+                        this._syncShape(),
+                        this._syncData(!0)
+                  },
+                  rectZoom: function(e) {
+                    if (!e) return this._zoom.start = this._zoom.start2 = 0,
+                        this._zoom.end = this._zoom.end2 = 100,
+                        this._syncShape(),
+                        this._syncData(!0),
+                        this._zoom;
+                    var t = this.component.grid.getArea(),
+                        i = {
+                          x: e.x,
+                          y: e.y,
+                          width: e.width,
+                          height: e.height
+                        };
+                    if (i.width < 0 && (i.x += i.width, i.width = -i.width), i.height < 0 && (i.y += i.height, i.height = -i.height), i.x > t.x + t.width || i.y > t.y + t.height) return ! 1;
+                    i.x < t.x && (i.x = t.x),
+                    i.x + i.width > t.x + t.width && (i.width = t.x + t.width - i.x),
+                    i.y + i.height > t.y + t.height && (i.height = t.y + t.height - i.y);
+                    var n, a = (i.x - t.x) / t.width,
+                        o = 1 - (i.x + i.width - t.x) / t.width,
+                        r = 1 - (i.y + i.height - t.y) / t.height,
+                        s = (i.y - t.y) / t.height;
+                    return "horizontal" == this.zoomOption.orient ? (n = this._zoom.end - this._zoom.start, this._zoom.start += n * a, this._zoom.end -= n * o, n = this._zoom.end2 - this._zoom.start2, this._zoom.start2 += n * r, this._zoom.end2 -= n * s) : (n = this._zoom.end - this._zoom.start, this._zoom.start += n * r, this._zoom.end -= n * s, n = this._zoom.end2 - this._zoom.start2, this._zoom.start2 += n * a, this._zoom.end2 -= n * o),
+                        this._syncShape(),
+                        this._syncData(!0),
+                        this._zoom
+                  },
+                  syncBackupData: function(e) {
+                    for (var t, i, n = this._originalData.series,
+                             a = e.series,
+                             o = 0,
+                             r = a.length; r > o; o++) {
+                      i = a[o].data || a[o].eventList,
+                          t = n[o] ? Math.floor(this._zoom.start / 100 * n[o].length) : 0;
+                      for (var s = 0,
+                               l = i.length; l > s; s++) n[o] && (n[o][s + t] = i[s])
+                    }
+                  },
+                  syncOption: function(e) {
+                    this.silence(!0),
+                        this.option = e,
+                        this.option.dataZoom = this.reformOption(this.option.dataZoom),
+                        this.zoomOption = this.option.dataZoom,
+                    this.myChart.canvasSupported || (this.zoomOption.realtime = !1),
+                        this.clear(),
+                        this._location = this._getLocation(),
+                        this._zoom = this._getZoom(),
+                        this._backupData(),
+                    this.option.dataZoom && this.option.dataZoom.show && this._buildShape(),
+                        this._syncData(),
+                        this.silence(!1)
+                  },
+                  silence: function(e) {
+                    this._isSilence = e
+                  },
+                  getRealDataIndex: function(e, t) {
+                    if (!this._originalData || 0 === this._zoom.start && 100 == this._zoom.end) return t;
+                    var i = this._originalData.series;
+                    return i[e] ? Math.floor(this._zoom.start / 100 * i[e].length) + t: -1
+                  },
+                  resize: function() {
+                    this.clear(),
+                        this._location = this._getLocation(),
+                        this._zoom = this._getZoom(),
+                    this.option.dataZoom.show && this._buildShape()
+                  }
+                },
+                    l.inherits(t, i),
+                    e("../component").define("dataZoom", t),
+                    t
+              }),
+          i("echarts/component/categoryAxis", ["require", "./base", "zrender/shape/Text", "zrender/shape/Line", "zrender/shape/Rectangle", "../config", "zrender/tool/util", "zrender/tool/area", "../component"],
+              function(e) {
+                function t(e, t, n, a, o, r) {
+                  if (a.data.length < 1) return void console.error("option.data.length < 1.");
+                  i.call(this, e, t, n, a, o),
+                      this.grid = this.component.grid;
+                  for (var s in r) this[s] = r[s];
+                  this.refresh(a)
+                }
+                var i = e("./base"),
+                    n = e("zrender/shape/Text"),
+                    a = e("zrender/shape/Line"),
+                    o = e("zrender/shape/Rectangle"),
+                    r = e("../config");
+                r.categoryAxis = {
+                  zlevel: 0,
+                  z: 0,
+                  show: !0,
+                  position: "bottom",
+                  name: "",
+                  nameLocation: "end",
+                  nameTextStyle: {},
+                  boundaryGap: !0,
+                  axisLine: {
+                    show: !0,
+                    onZero: !0,
+                    lineStyle: {
+                      color: "#48b",
+                      width: 2,
+                      type: "solid"
+                    }
+                  },
+                  axisTick: {
+                    show: !0,
+                    interval: "auto",
+                    inside: !1,
+                    length: 5,
+                    lineStyle: {
+                      color: "#333",
+                      width: 1
+                    }
+                  },
+                  axisLabel: {
+                    show: !0,
+                    interval: "auto",
+                    rotate: 0,
+                    margin: 8,
+                    textStyle: {
+                      color: "#333"
+                    }
+                  },
+                  splitLine: {
+                    show: !0,
+                    lineStyle: {
+                      color: ["#ccc"],
+                      width: 1,
+                      type: "solid"
+                    }
+                  },
+                  splitArea: {
+                    show: !1,
+                    areaStyle: {
+                      color: ["rgba(250,250,250,0.3)", "rgba(200,200,200,0.3)"]
+                    }
+                  }
+                };
+                var s = e("zrender/tool/util"),
+                    l = e("zrender/tool/area");
+                return t.prototype = {
+                  type: r.COMPONENT_TYPE_AXIS_CATEGORY,
+                  _getReformedLabel: function(e) {
+                    var t = this.getDataFromOption(this.option.data[e]),
+                        i = this.option.data[e].formatter || this.option.axisLabel.formatter;
+                    return i && ("function" == typeof i ? t = i.call(this.myChart, t) : "string" == typeof i && (t = i.replace("{value}", t))),
+                        t
+                  },
+                  _getInterval: function() {
+                    var e = this.option.axisLabel.interval;
+                    if ("auto" == e) {
+                      var t = this.option.axisLabel.textStyle.fontSize,
+                          i = this.option.data,
+                          n = this.option.data.length;
+                      if (this.isHorizontal()) if (n > 3) {
+                        var a, o, r = this.getGap(),
+                            h = !1,
+                            m = Math.floor(.5 / r);
+                        for (m = 1 > m ? 1 : m, e = Math.floor(15 / r); ! h && n > e;) {
+                          e += m,
+                              h = !0,
+                              a = Math.floor(r * e);
+                          for (var V = Math.floor((n - 1) / e) * e; V >= 0; V -= e) {
+                            if (0 !== this.option.axisLabel.rotate) o = t;
+                            else if (i[V].textStyle) o = l.getTextWidth(this._getReformedLabel(V), this.getFont(s.merge(i[V].textStyle, this.option.axisLabel.textStyle)));
+                            else {
+                              var U = this._getReformedLabel(V) + "",
+                                  d = (U.match(/\w/g) || "").length,
+                                  p = U.length - d;
+                              o = d * t * 2 / 3 + p * t
+                            }
+                            if (o > a) {
+                              h = !1;
+                              break
+                            }
+                          }
+                        }
+                      } else e = 1;
+                      else if (n > 3) {
+                        var r = this.getGap();
+                        for (e = Math.floor(11 / r); t > r * e - 6 && n > e;) e++
+                      } else e = 1
+                    } else e = "function" == typeof e ? 1 : e - 0 + 1;
+                    return e
+                  },
+                  _buildShape: function() {
+                    if (this._interval = this._getInterval(), this.option.show) {
+                      this.option.splitArea.show && this._buildSplitArea(),
+                      this.option.splitLine.show && this._buildSplitLine(),
+                      this.option.axisLine.show && this._buildAxisLine(),
+                      this.option.axisTick.show && this._buildAxisTick(),
+                      this.option.axisLabel.show && this._buildAxisLabel();
+                      for (var e = 0,
+                               t = this.shapeList.length; t > e; e++) this.zr.addShape(this.shapeList[e])
+                    }
+                  },
+                  _buildAxisTick: function() {
+                    var e, t = this.option.data,
+                        i = this.option.data.length,
+                        n = this.option.axisTick,
+                        o = n.length,
+                        r = n.lineStyle.color,
+                        s = n.lineStyle.width,
+                        l = "function" == typeof n.interval ? n.interval: "auto" == n.interval && "function" == typeof this.option.axisLabel.interval ? this.option.axisLabel.interval: !1,
+                        h = l ? 1 : "auto" == n.interval ? this._interval: n.interval - 0 + 1,
+                        m = n.onGap,
+                        V = m ? this.getGap() / 2 : "undefined" == typeof m && this.option.boundaryGap ? this.getGap() / 2 : 0,
+                        U = V > 0 ? -h: 0;
+                    if (this.isHorizontal()) for (var d, p = "bottom" == this.option.position ? n.inside ? this.grid.getYend() - o - 1 : this.grid.getYend() + 1 : n.inside ? this.grid.getY() + 1 : this.grid.getY() - o - 1, c = U; i > c; c += h)(!l || l(c, t[c])) && (d = this.subPixelOptimize(this.getCoordByIndex(c) + (c >= 0 ? V: 0), s), e = {
+                      _axisShape: "axisTick",
+                      zlevel: this.getZlevelBase(),
+                      z: this.getZBase(),
+                      hoverable: !1,
+                      style: {
+                        xStart: d,
+                        yStart: p,
+                        xEnd: d,
+                        yEnd: p + o,
+                        strokeColor: r,
+                        lineWidth: s
+                      }
+                    },
+                        this.shapeList.push(new a(e)));
+                    else for (var u, y = "left" == this.option.position ? n.inside ? this.grid.getX() + 1 : this.grid.getX() - o - 1 : n.inside ? this.grid.getXend() - o - 1 : this.grid.getXend() + 1, c = U; i > c; c += h)(!l || l(c, t[c])) && (u = this.subPixelOptimize(this.getCoordByIndex(c) - (c >= 0 ? V: 0), s), e = {
+                      _axisShape: "axisTick",
+                      zlevel: this.getZlevelBase(),
+                      z: this.getZBase(),
+                      hoverable: !1,
+                      style: {
+                        xStart: y,
+                        yStart: u,
+                        xEnd: y + o,
+                        yEnd: u,
+                        strokeColor: r,
+                        lineWidth: s
+                      }
+                    },
+                        this.shapeList.push(new a(e)))
+                  },
+                  _buildAxisLabel: function() {
+                    var e, t, i = this.option.data,
+                        a = this.option.data.length,
+                        o = this.option.axisLabel,
+                        r = o.rotate,
+                        l = o.margin,
+                        h = o.clickable,
+                        m = o.textStyle,
+                        V = "function" == typeof o.interval ? o.interval: !1;
+                    if (this.isHorizontal()) {
+                      var U, d;
+                      "bottom" == this.option.position ? (U = this.grid.getYend() + l, d = "top") : (U = this.grid.getY() - l, d = "bottom");
+                      for (var p = 0; a > p; p += this._interval) V && !V(p, i[p]) || "" === this._getReformedLabel(p) || (t = s.merge(i[p].textStyle || {},
+                          m), e = {
+                        zlevel: this.getZlevelBase(),
+                        z: this.getZBase() + 3,
+                        hoverable: !1,
+                        style: {
+                          x: this.getCoordByIndex(p),
+                          y: U,
+                          color: t.color,
+                          text: this._getReformedLabel(p),
+                          textFont: this.getFont(t),
+                          textAlign: t.align || "center",
+                          textBaseline: t.baseline || d
+                        }
+                      },
+                      r && (e.style.textAlign = r > 0 ? "bottom" == this.option.position ? "right": "left": "bottom" == this.option.position ? "left": "right", e.rotation = [r * Math.PI / 180, e.style.x, e.style.y]), this.shapeList.push(new n(this._axisLabelClickable(h, e))))
+                    } else {
+                      var c, u;
+                      "left" == this.option.position ? (c = this.grid.getX() - l, u = "right") : (c = this.grid.getXend() + l, u = "left");
+                      for (var p = 0; a > p; p += this._interval) V && !V(p, i[p]) || "" === this._getReformedLabel(p) || (t = s.merge(i[p].textStyle || {},
+                          m), e = {
+                        zlevel: this.getZlevelBase(),
+                        z: this.getZBase() + 3,
+                        hoverable: !1,
+                        style: {
+                          x: c,
+                          y: this.getCoordByIndex(p),
+                          color: t.color,
+                          text: this._getReformedLabel(p),
+                          textFont: this.getFont(t),
+                          textAlign: t.align || u,
+                          textBaseline: t.baseline || 0 === p && "" !== this.option.name ? "bottom": p == a - 1 && "" !== this.option.name ? "top": "middle"
+                        }
+                      },
+                      r && (e.rotation = [r * Math.PI / 180, e.style.x, e.style.y]), this.shapeList.push(new n(this._axisLabelClickable(h, e))))
+                    }
+                  },
+                  _buildSplitLine: function() {
+                    var e, t = this.option.data,
+                        i = this.option.data.length,
+                        n = this.option.splitLine,
+                        o = n.lineStyle.type,
+                        r = n.lineStyle.width,
+                        s = n.lineStyle.color;
+                    s = s instanceof Array ? s: [s];
+                    var l = s.length,
+                        h = "function" == typeof this.option.axisLabel.interval ? this.option.axisLabel.interval: !1,
+                        m = n.onGap,
+                        V = m ? this.getGap() / 2 : "undefined" == typeof m && this.option.boundaryGap ? this.getGap() / 2 : 0;
+                    if (i -= m || "undefined" == typeof m && this.option.boundaryGap ? 1 : 0, this.isHorizontal()) for (var U, d = this.grid.getY(), p = this.grid.getYend(), c = 0; i > c; c += this._interval)(!h || h(c, t[c])) && (U = this.subPixelOptimize(this.getCoordByIndex(c) + V, r), e = {
+                      zlevel: this.getZlevelBase(),
+                      z: this.getZBase(),
+                      hoverable: !1,
+                      style: {
+                        xStart: U,
+                        yStart: d,
+                        xEnd: U,
+                        yEnd: p,
+                        strokeColor: s[c / this._interval % l],
+                        lineType: o,
+                        lineWidth: r
+                      }
+                    },
+                        this.shapeList.push(new a(e)));
+                    else for (var u, y = this.grid.getX(), g = this.grid.getXend(), c = 0; i > c; c += this._interval)(!h || h(c, t[c])) && (u = this.subPixelOptimize(this.getCoordByIndex(c) - V, r), e = {
+                      zlevel: this.getZlevelBase(),
+                      z: this.getZBase(),
+                      hoverable: !1,
+                      style: {
+                        xStart: y,
+                        yStart: u,
+                        xEnd: g,
+                        yEnd: u,
+                        strokeColor: s[c / this._interval % l],
+                        lineType: o,
+                        lineWidth: r
+                      }
+                    },
+                        this.shapeList.push(new a(e)))
+                  },
+                  _buildSplitArea: function() {
+                    var e, t = this.option.data,
+                        i = this.option.splitArea,
+                        n = i.areaStyle.color;
+                    if (n instanceof Array) {
+                      var a = n.length,
+                          r = this.option.data.length,
+                          s = "function" == typeof this.option.axisLabel.interval ? this.option.axisLabel.interval: !1,
+                          l = i.onGap,
+                          h = l ? this.getGap() / 2 : "undefined" == typeof l && this.option.boundaryGap ? this.getGap() / 2 : 0;
+                      if (this.isHorizontal()) for (var m, V = this.grid.getY(), U = this.grid.getHeight(), d = this.grid.getX(), p = 0; r >= p; p += this._interval) s && !s(p, t[p]) && r > p || (m = r > p ? this.getCoordByIndex(p) + h: this.grid.getXend(), e = {
+                        zlevel: this.getZlevelBase(),
+                        z: this.getZBase(),
+                        hoverable: !1,
+                        style: {
+                          x: d,
+                          y: V,
+                          width: m - d,
+                          height: U,
+                          color: n[p / this._interval % a]
+                        }
+                      },
+                          this.shapeList.push(new o(e)), d = m);
+                      else for (var c, u = this.grid.getX(), y = this.grid.getWidth(), g = this.grid.getYend(), p = 0; r >= p; p += this._interval) s && !s(p, t[p]) && r > p || (c = r > p ? this.getCoordByIndex(p) - h: this.grid.getY(), e = {
+                        zlevel: this.getZlevelBase(),
+                        z: this.getZBase(),
+                        hoverable: !1,
+                        style: {
+                          x: u,
+                          y: c,
+                          width: y,
+                          height: g - c,
+                          color: n[p / this._interval % a]
+                        }
+                      },
+                          this.shapeList.push(new o(e)), g = c)
+                    } else e = {
+                      zlevel: this.getZlevelBase(),
+                      z: this.getZBase(),
+                      hoverable: !1,
+                      style: {
+                        x: this.grid.getX(),
+                        y: this.grid.getY(),
+                        width: this.grid.getWidth(),
+                        height: this.grid.getHeight(),
+                        color: n
+                      }
+                    },
+                        this.shapeList.push(new o(e))
+                  },
+                  refresh: function(e) {
+                    e && (this.option = this.reformOption(e), this.option.axisLabel.textStyle = this.getTextStyle(this.option.axisLabel.textStyle)),
+                        this.clear(),
+                        this._buildShape()
+                  },
+                  getGap: function() {
+                    var e = this.option.data.length,
+                        t = this.isHorizontal() ? this.grid.getWidth() : this.grid.getHeight();
+                    return this.option.boundaryGap ? t / e: t / (e > 1 ? e - 1 : 1)
+                  },
+                  getCoord: function(e) {
+                    for (var t = this.option.data,
+                             i = t.length,
+                             n = this.getGap(), a = this.option.boundaryGap ? n / 2 : 0, o = 0; i > o; o++) {
+                      if (this.getDataFromOption(t[o]) == e) return a = this.isHorizontal() ? this.grid.getX() + a: this.grid.getYend() - a;
+                      a += n
+                    }
+                  },
+                  getCoordByIndex: function(e) {
+                    if (0 > e) return this.isHorizontal() ? this.grid.getX() : this.grid.getYend();
+                    if (e > this.option.data.length - 1) return this.isHorizontal() ? this.grid.getXend() : this.grid.getY();
+                    var t = this.getGap(),
+                        i = this.option.boundaryGap ? t / 2 : 0;
+                    return i += e * t,
+                        i = this.isHorizontal() ? this.grid.getX() + i: this.grid.getYend() - i
+                  },
+                  getNameByIndex: function(e) {
+                    return this.getDataFromOption(this.option.data[e])
+                  },
+                  getIndexByName: function(e) {
+                    for (var t = this.option.data,
+                             i = t.length,
+                             n = 0; i > n; n++) if (this.getDataFromOption(t[n]) == e) return n;
+                    return - 1
+                  },
+                  getValueFromCoord: function() {
+                    return ""
+                  },
+                  isMainAxis: function(e) {
+                    return e % this._interval === 0
+                  }
+                },
+                    s.inherits(t, i),
+                    e("../component").define("categoryAxis", t),
+                    t
+              }),
+          i("echarts/component/valueAxis", ["require", "./base", "zrender/shape/Text", "zrender/shape/Line", "zrender/shape/Rectangle", "../config", "../util/date", "zrender/tool/util", "../util/smartSteps", "../util/accMath", "../util/smartLogSteps", "../component"],
+              function(e) {
+                function t(e, t, n, a, o, r, s) {
+                  if (!s || 0 === s.length) return void console.err("option.series.length == 0.");
+                  i.call(this, e, t, n, a, o),
+                      this.series = s,
+                      this.grid = this.component.grid;
+                  for (var l in r) this[l] = r[l];
+                  this.refresh(a, s)
+                }
+                var i = e("./base"),
+                    n = e("zrender/shape/Text"),
+                    a = e("zrender/shape/Line"),
+                    o = e("zrender/shape/Rectangle"),
+                    r = e("../config");
+                r.valueAxis = {
+                  zlevel: 0,
+                  z: 0,
+                  show: !0,
+                  position: "left",
+                  name: "",
+                  nameLocation: "end",
+                  nameTextStyle: {},
+                  boundaryGap: [0, 0],
+                  axisLine: {
+                    show: !0,
+                    onZero: !0,
+                    lineStyle: {
+                      color: "#48b",
+                      width: 2,
+                      type: "solid"
+                    }
+                  },
+                  axisTick: {
+                    show: !1,
+                    inside: !1,
+                    length: 5,
+                    lineStyle: {
+                      color: "#333",
+                      width: 1
+                    }
+                  },
+                  axisLabel: {
+                    show: !0,
+                    rotate: 0,
+                    margin: 8,
+                    textStyle: {
+                      color: "#333"
+                    }
+                  },
+                  splitLine: {
+                    show: !0,
+                    lineStyle: {
+                      color: ["#ccc"],
+                      width: 1,
+                      type: "solid"
+                    }
+                  },
+                  splitArea: {
+                    show: !1,
+                    areaStyle: {
+                      color: ["rgba(250,250,250,0.3)", "rgba(200,200,200,0.3)"]
+                    }
+                  }
+                };
+                var s = e("../util/date"),
+                    l = e("zrender/tool/util");
+                return t.prototype = {
+                  type: r.COMPONENT_TYPE_AXIS_VALUE,
+                  _buildShape: function() {
+                    if (this._hasData = !1, this._calculateValue(), this._hasData && this.option.show) {
+                      this.option.splitArea.show && this._buildSplitArea(),
+                      this.option.splitLine.show && this._buildSplitLine(),
+                      this.option.axisLine.show && this._buildAxisLine(),
+                      this.option.axisTick.show && this._buildAxisTick(),
+                      this.option.axisLabel.show && this._buildAxisLabel();
+                      for (var e = 0,
+                               t = this.shapeList.length; t > e; e++) this.zr.addShape(this.shapeList[e])
+                    }
+                  },
+                  _buildAxisTick: function() {
+                    var e, t = this._valueList,
+                        i = this._valueList.length,
+                        n = this.option.axisTick,
+                        o = n.length,
+                        r = n.lineStyle.color,
+                        s = n.lineStyle.width;
+                    if (this.isHorizontal()) for (var l, h = "bottom" === this.option.position ? n.inside ? this.grid.getYend() - o - 1 : this.grid.getYend() + 1 : n.inside ? this.grid.getY() + 1 : this.grid.getY() - o - 1, m = 0; i > m; m++) l = this.subPixelOptimize(this.getCoord(t[m]), s),
+                        e = {
+                          _axisShape: "axisTick",
+                          zlevel: this.getZlevelBase(),
+                          z: this.getZBase(),
+                          hoverable: !1,
+                          style: {
+                            xStart: l,
+                            yStart: h,
+                            xEnd: l,
+                            yEnd: h + o,
+                            strokeColor: r,
+                            lineWidth: s
+                          }
+                        },
+                        this.shapeList.push(new a(e));
+                    else for (var V, U = "left" === this.option.position ? n.inside ? this.grid.getX() + 1 : this.grid.getX() - o - 1 : n.inside ? this.grid.getXend() - o - 1 : this.grid.getXend() + 1, m = 0; i > m; m++) V = this.subPixelOptimize(this.getCoord(t[m]), s),
+                        e = {
+                          _axisShape: "axisTick",
+                          zlevel: this.getZlevelBase(),
+                          z: this.getZBase(),
+                          hoverable: !1,
+                          style: {
+                            xStart: U,
+                            yStart: V,
+                            xEnd: U + o,
+                            yEnd: V,
+                            strokeColor: r,
+                            lineWidth: s
+                          }
+                        },
+                        this.shapeList.push(new a(e))
+                  },
+                  _buildAxisLabel: function() {
+                    var e, t = this._valueList,
+                        i = this._valueList.length,
+                        a = this.option.axisLabel.rotate,
+                        o = this.option.axisLabel.margin,
+                        r = this.option.axisLabel.clickable,
+                        s = this.option.axisLabel.textStyle;
+                    if (this.isHorizontal()) {
+                      var l, h;
+                      "bottom" === this.option.position ? (l = this.grid.getYend() + o, h = "top") : (l = this.grid.getY() - o, h = "bottom");
+                      for (var m = 0; i > m; m++) e = {
+                        zlevel: this.getZlevelBase(),
+                        z: this.getZBase() + 3,
+                        hoverable: !1,
+                        style: {
+                          x: this.getCoord(t[m]),
+                          y: l,
+                          color: "function" == typeof s.color ? s.color(t[m]) : s.color,
+                          text: this._valueLabel[m],
+                          textFont: this.getFont(s),
+                          textAlign: s.align || "center",
+                          textBaseline: s.baseline || h
+                        }
+                      },
+                      a && (e.style.textAlign = a > 0 ? "bottom" === this.option.position ? "right": "left": "bottom" === this.option.position ? "left": "right", e.rotation = [a * Math.PI / 180, e.style.x, e.style.y]),
+                          this.shapeList.push(new n(this._axisLabelClickable(r, e)))
+                    } else {
+                      var V, U;
+                      "left" === this.option.position ? (V = this.grid.getX() - o, U = "right") : (V = this.grid.getXend() + o, U = "left");
+                      for (var m = 0; i > m; m++) e = {
+                        zlevel: this.getZlevelBase(),
+                        z: this.getZBase() + 3,
+                        hoverable: !1,
+                        style: {
+                          x: V,
+                          y: this.getCoord(t[m]),
+                          color: "function" == typeof s.color ? s.color(t[m]) : s.color,
+                          text: this._valueLabel[m],
+                          textFont: this.getFont(s),
+                          textAlign: s.align || U,
+                          textBaseline: s.baseline || (0 === m && "" !== this.option.name ? "bottom": m === i - 1 && "" !== this.option.name ? "top": "middle")
+                        }
+                      },
+                      a && (e.rotation = [a * Math.PI / 180, e.style.x, e.style.y]),
+                          this.shapeList.push(new n(this._axisLabelClickable(r, e)))
+                    }
+                  },
+                  _buildSplitLine: function() {
+                    var e, t = this._valueList,
+                        i = this._valueList.length,
+                        n = this.option.splitLine,
+                        o = n.lineStyle.type,
+                        r = n.lineStyle.width,
+                        s = n.lineStyle.color;
+                    s = s instanceof Array ? s: [s];
+                    var l = s.length;
+                    if (this.isHorizontal()) for (var h, m = this.grid.getY(), V = this.grid.getYend(), U = 0; i > U; U++) h = this.subPixelOptimize(this.getCoord(t[U]), r),
+                        e = {
+                          zlevel: this.getZlevelBase(),
+                          z: this.getZBase(),
+                          hoverable: !1,
+                          style: {
+                            xStart: h,
+                            yStart: m,
+                            xEnd: h,
+                            yEnd: V,
+                            strokeColor: s[U % l],
+                            lineType: o,
+                            lineWidth: r
+                          }
+                        },
+                        this.shapeList.push(new a(e));
+                    else for (var d, p = this.grid.getX(), c = this.grid.getXend(), U = 0; i > U; U++) d = this.subPixelOptimize(this.getCoord(t[U]), r),
+                        e = {
+                          zlevel: this.getZlevelBase(),
+                          z: this.getZBase(),
+                          hoverable: !1,
+                          style: {
+                            xStart: p,
+                            yStart: d,
+                            xEnd: c,
+                            yEnd: d,
+                            strokeColor: s[U % l],
+                            lineType: o,
+                            lineWidth: r
+                          }
+                        },
+                        this.shapeList.push(new a(e))
+                  },
+                  _buildSplitArea: function() {
+                    var e, t = this.option.splitArea.areaStyle.color;
+                    if (t instanceof Array) {
+                      var i = t.length,
+                          n = this._valueList,
+                          a = this._valueList.length;
+                      if (this.isHorizontal()) for (var r, s = this.grid.getY(), l = this.grid.getHeight(), h = this.grid.getX(), m = 0; a >= m; m++) r = a > m ? this.getCoord(n[m]) : this.grid.getXend(),
+                          e = {
+                            zlevel: this.getZlevelBase(),
+                            z: this.getZBase(),
+                            hoverable: !1,
+                            style: {
+                              x: h,
+                              y: s,
+                              width: r - h,
+                              height: l,
+                              color: t[m % i]
+                            }
+                          },
+                          this.shapeList.push(new o(e)),
+                          h = r;
+                      else for (var V, U = this.grid.getX(), d = this.grid.getWidth(), p = this.grid.getYend(), m = 0; a >= m; m++) V = a > m ? this.getCoord(n[m]) : this.grid.getY(),
+                          e = {
+                            zlevel: this.getZlevelBase(),
+                            z: this.getZBase(),
+                            hoverable: !1,
+                            style: {
+                              x: U,
+                              y: V,
+                              width: d,
+                              height: p - V,
+                              color: t[m % i]
+                            }
+                          },
+                          this.shapeList.push(new o(e)),
+                          p = V
+                    } else e = {
+                      zlevel: this.getZlevelBase(),
+                      z: this.getZBase(),
+                      hoverable: !1,
+                      style: {
+                        x: this.grid.getX(),
+                        y: this.grid.getY(),
+                        width: this.grid.getWidth(),
+                        height: this.grid.getHeight(),
+                        color: t
+                      }
+                    },
+                        this.shapeList.push(new o(e))
+                  },
+                  _calculateValue: function() {
+                    if (isNaN(this.option.min - 0) || isNaN(this.option.max - 0)) {
+                      for (var e, t, i = {},
+                               n = this.component.legend,
+                               a = 0,
+                               o = this.series.length; o > a; a++) ! (this.series[a].type != r.CHART_TYPE_LINE && this.series[a].type != r.CHART_TYPE_BAR && this.series[a].type != r.CHART_TYPE_SCATTER && this.series[a].type != r.CHART_TYPE_K && this.series[a].type != r.CHART_TYPE_EVENTRIVER || n && !n.isSelected(this.series[a].name) || (e = this.series[a].xAxisIndex || 0, t = this.series[a].yAxisIndex || 0, this.option.xAxisIndex != e && this.option.yAxisIndex != t || !this._calculSum(i, a)));
+                      var s;
+                      for (var a in i) {
+                        s = i[a];
+                        for (var l = 0,
+                                 h = s.length; h > l; l++) if (!isNaN(s[l])) {
+                          this._hasData = !0,
+                              this._min = s[l],
+                              this._max = s[l];
+                          break
+                        }
+                        if (this._hasData) break
+                      }
+                      for (var a in i) {
+                        s = i[a];
+                        for (var l = 0,
+                                 h = s.length; h > l; l++) isNaN(s[l]) || (this._min = Math.min(this._min, s[l]), this._max = Math.max(this._max, s[l]))
+                      }
+                      var m = "log" !== this.option.type ? this.option.boundaryGap: [0, 0],
+                          V = Math.abs(this._max - this._min);
+                      this._min = isNaN(this.option.min - 0) ? this._min - Math.abs(V * m[0]) : this.option.min - 0,
+                          this._max = isNaN(this.option.max - 0) ? this._max + Math.abs(V * m[1]) : this.option.max - 0,
+                      this._min === this._max && (0 === this._max ? this._max = 1 : this._max > 0 ? this._min = this._max / this.option.splitNumber != null ? this.option.splitNumber: 5 : this._max = this._max / this.option.splitNumber != null ? this.option.splitNumber: 5),
+                          "time" === this.option.type ? this._reformTimeValue() : "log" === this.option.type ? this._reformLogValue() : this._reformValue(this.option.scale)
+                    } else this._hasData = !0,
+                        this._min = this.option.min - 0,
+                        this._max = this.option.max - 0,
+                        "time" === this.option.type ? this._reformTimeValue() : "log" === this.option.type ? this._reformLogValue() : this._customerValue()
+                  },
+                  _calculSum: function(e, t) {
+                    var i, n, a = this.series[t].name || "kener";
+                    if (this.series[t].stack) {
+                      var o = "__Magic_Key_Positive__" + this.series[t].stack,
+                          l = "__Magic_Key_Negative__" + this.series[t].stack;
+                      e[o] = e[o] || [],
+                          e[l] = e[l] || [],
+                          e[a] = e[a] || [],
+                          n = this.series[t].data;
+                      for (var h = 0,
+                               m = n.length; m > h; h++) i = this.getDataFromOption(n[h]),
+                      "-" !== i && (i -= 0, i >= 0 ? null != e[o][h] ? e[o][h] += i: e[o][h] = i: null != e[l][h] ? e[l][h] += i: e[l][h] = i, this.option.scale && e[a].push(i))
+                    } else if (e[a] = e[a] || [], this.series[t].type != r.CHART_TYPE_EVENTRIVER) {
+                      n = this.series[t].data;
+                      for (var h = 0,
+                               m = n.length; m > h; h++) i = this.getDataFromOption(n[h]),
+                          this.series[t].type === r.CHART_TYPE_K ? (e[a].push(i[0]), e[a].push(i[1]), e[a].push(i[2]), e[a].push(i[3])) : i instanceof Array ? ( - 1 != this.option.xAxisIndex && e[a].push("time" != this.option.type ? i[0] : s.getNewDate(i[0])), -1 != this.option.yAxisIndex && e[a].push("time" != this.option.type ? i[1] : s.getNewDate(i[1]))) : e[a].push(i)
+                    } else {
+                      n = this.series[t].data;
+                      for (var h = 0,
+                               m = n.length; m > h; h++) for (var V = n[h].evolution, U = 0, d = V.length; d > U; U++) e[a].push(s.getNewDate(V[U].time))
+                    }
+                  },
+                  _reformValue: function(t) {
+                    var i = e("../util/smartSteps"),
+                        n = this.option.splitNumber; ! t && this._min >= 0 && this._max >= 0 && (this._min = 0),
+                    !t && this._min <= 0 && this._max <= 0 && (this._max = 0);
+                    var a = i(this._min, this._max, n);
+                    n = null != n ? n: a.secs,
+                        this._min = a.min,
+                        this._max = a.max,
+                        this._valueList = a.pnts,
+                        this._reformLabelData()
+                  },
+                  _reformTimeValue: function() {
+                    var e = null != this.option.splitNumber ? this.option.splitNumber: 5,
+                        t = s.getAutoFormatter(this._min, this._max, e),
+                        i = t.formatter,
+                        n = t.gapValue;
+                    this._valueList = [s.getNewDate(this._min)];
+                    var a;
+                    switch (i) {
+                      case "week":
+                        a = s.nextMonday(this._min);
+                        break;
+                      case "month":
+                        a = s.nextNthOnMonth(this._min, 1);
+                        break;
+                      case "quarter":
+                        a = s.nextNthOnQuarterYear(this._min, 1);
+                        break;
+                      case "half-year":
+                        a = s.nextNthOnHalfYear(this._min, 1);
+                        break;
+                      case "year":
+                        a = s.nextNthOnYear(this._min, 1);
+                        break;
+                      default:
+                        72e5 >= n ? a = (Math.floor(this._min / n) + 1) * n: (a = s.getNewDate(this._min - -n), a.setHours(6 * Math.round(a.getHours() / 6)), a.setMinutes(0), a.setSeconds(0))
+                    }
+                    for (a - this._min < n / 2 && (a -= -n), t = s.getNewDate(a), e *= 1.5; e-->=0 && (("month" == i || "quarter" == i || "half-year" == i || "year" == i) && t.setDate(1), !(this._max - t < n / 2));) this._valueList.push(t),
+                        t = s.getNewDate(t - -n);
+                    this._valueList.push(s.getNewDate(this._max)),
+                        this._reformLabelData(function(e) {
+                          return function(t) {
+                            return s.format(e, t)
+                          }
+                        } (i))
+                  },
+                  _customerValue: function() {
+                    var t = e("../util/accMath"),
+                        i = null != this.option.splitNumber ? this.option.splitNumber: 5,
+                        n = (this._max - this._min) / i;
+                    this._valueList = [];
+                    for (var a = 0; i >= a; a++) this._valueList.push(t.accAdd(this._min, t.accMul(n, a)));
+                    this._reformLabelData()
+                  },
+                  _reformLogValue: function() {
+                    var t = this.option,
+                        i = e("../util/smartLogSteps")({
+                          dataMin: this._min,
+                          dataMax: this._max,
+                          logPositive: t.logPositive,
+                          logLabelBase: t.logLabelBase,
+                          splitNumber: t.splitNumber
+                        });
+                    this._min = i.dataMin,
+                        this._max = i.dataMax,
+                        this._valueList = i.tickList,
+                        this._dataMappingMethods = i.dataMappingMethods,
+                        this._reformLabelData(i.labelFormatter)
+                  },
+                  _reformLabelData: function(e) {
+                    this._valueLabel = [];
+                    var t = this.option.axisLabel.formatter;
+                    if (t) for (var i = 0,
+                                    n = this._valueList.length; n > i; i++)"function" == typeof t ? this._valueLabel.push(e ? t.call(this.myChart, this._valueList[i], e) : t.call(this.myChart, this._valueList[i])) : "string" == typeof t && this._valueLabel.push(e ? s.format(t, this._valueList[i]) : t.replace("{value}", this._valueList[i]));
+                    else for (var i = 0,
+                                  n = this._valueList.length; n > i; i++) this._valueLabel.push(e ? e(this._valueList[i]) : this.numAddCommas(this._valueList[i]))
+                  },
+                  getExtremum: function() {
+                    this._calculateValue();
+                    var e = this._dataMappingMethods;
+                    return {
+                      min: this._min,
+                      max: this._max,
+                      dataMappingMethods: e ? l.merge({},
+                          e) : null
+                    }
+                  },
+                  refresh: function(e, t) {
+                    e && (this.option = this.reformOption(e), this.option.axisLabel.textStyle = l.merge(this.option.axisLabel.textStyle || {},
+                        this.ecTheme.textStyle), this.series = t),
+                    this.zr && (this.clear(), this._buildShape())
+                  },
+                  getCoord: function(e) {
+                    this._dataMappingMethods && (e = this._dataMappingMethods.value2Coord(e)),
+                        e = e < this._min ? this._min: e,
+                        e = e > this._max ? this._max: e;
+                    var t;
+                    return t = this.isHorizontal() ? this.grid.getX() + (e - this._min) / (this._max - this._min) * this.grid.getWidth() : this.grid.getYend() - (e - this._min) / (this._max - this._min) * this.grid.getHeight()
+                  },
+                  getCoordSize: function(e) {
+                    return Math.abs(this.isHorizontal() ? e / (this._max - this._min) * this.grid.getWidth() : e / (this._max - this._min) * this.grid.getHeight())
+                  },
+                  getValueFromCoord: function(e) {
+                    var t;
+                    return this.isHorizontal() ? (e = e < this.grid.getX() ? this.grid.getX() : e, e = e > this.grid.getXend() ? this.grid.getXend() : e, t = this._min + (e - this.grid.getX()) / this.grid.getWidth() * (this._max - this._min)) : (e = e < this.grid.getY() ? this.grid.getY() : e, e = e > this.grid.getYend() ? this.grid.getYend() : e, t = this._max - (e - this.grid.getY()) / this.grid.getHeight() * (this._max - this._min)),
+                    this._dataMappingMethods && (t = this._dataMappingMethods.coord2Value(t)),
+                    t.toFixed(2) - 0
+                  },
+                  isMaindAxis: function(e) {
+                    for (var t = 0,
+                             i = this._valueList.length; i > t; t++) if (this._valueList[t] === e) return ! 0;
+                    return ! 1
+                  }
+                },
+                    l.inherits(t, i),
+                    e("../component").define("valueAxis", t),
+                    t
+              }),
+          i("echarts/util/date", [],
+              function() {
+                function e(e, t, i) {
+                  i = i > 1 ? i: 2;
+                  for (var n, a, o, r, s = 0,
+                           l = m.length; l > s; s++) if (n = m[s].value, a = Math.ceil(t / n) * n - Math.floor(e / n) * n, Math.round(a / n) <= 1.2 * i) {
+                    o = m[s].formatter,
+                        r = m[s].value;
+                    break
+                  }
+                  return null == o && (o = "year", n = 317088e5, a = Math.ceil(t / n) * n - Math.floor(e / n) * n, r = Math.round(a / (i - 1) / n) * n),
+                      {
+                        formatter: o,
+                        gapValue: r
+                      }
+                }
+                function t(e) {
+                  return 10 > e ? "0" + e: e
+                }
+                function i(e, i) { ("week" == e || "month" == e || "quarter" == e || "half-year" == e || "year" == e) && (e = "MM - dd\nyyyy");
+                  var n = h(i),
+                      a = n.getFullYear(),
+                      o = n.getMonth() + 1,
+                      r = n.getDate(),
+                      s = n.getHours(),
+                      l = n.getMinutes(),
+                      m = n.getSeconds();
+                  return e = e.replace("MM", t(o)),
+                      e = e.toLowerCase(),
+                      e = e.replace("yyyy", a),
+                      e = e.replace("yy", a % 100),
+                      e = e.replace("dd", t(r)),
+                      e = e.replace("d", r),
+                      e = e.replace("hh", t(s)),
+                      e = e.replace("h", s),
+                      e = e.replace("mm", t(l)),
+                      e = e.replace("m", l),
+                      e = e.replace("ss", t(m)),
+                      e = e.replace("s", m)
+                }
+                function n(e) {
+                  return e = h(e),
+                      e.setDate(e.getDate() + 8 - e.getDay()),
+                      e
+                }
+                function a(e, t, i) {
+                  return e = h(e),
+                      e.setMonth(Math.ceil((e.getMonth() + 1) / i) * i),
+                      e.setDate(t),
+                      e
+                }
+                function o(e, t) {
+                  return a(e, t, 1)
+                }
+                function r(e, t) {
+                  return a(e, t, 3)
+                }
+                function s(e, t) {
+                  return a(e, t, 6)
+                }
+                function l(e, t) {
+                  return a(e, t, 12)
+                }
+                function h(e) {
+                  return e instanceof Date ? e: new Date("string" == typeof e ? e.replace(/-/g, "/") : e)
+                }
+                var m = [{
+                  formatter: "hh : mm : ss",
+                  value: 1e3
+                },
+                  {
+                    formatter: "hh : mm : ss",
+                    value: 5e3
+                  },
+                  {
+                    formatter: "hh : mm : ss",
+                    value: 1e4
+                  },
+                  {
+                    formatter: "hh : mm : ss",
+                    value: 15e3
+                  },
+                  {
+                    formatter: "hh : mm : ss",
+                    value: 3e4
+                  },
+                  {
+                    formatter: "hh : mm\nMM - dd",
+                    value: 6e4
+                  },
+                  {
+                    formatter: "hh : mm\nMM - dd",
+                    value: 3e5
+                  },
+                  {
+                    formatter: "hh : mm\nMM - dd",
+                    value: 6e5
+                  },
+                  {
+                    formatter: "hh : mm\nMM - dd",
+                    value: 9e5
+                  },
+                  {
+                    formatter: "hh : mm\nMM - dd",
+                    value: 18e5
+                  },
+                  {
+                    formatter: "hh : mm\nMM - dd",
+                    value: 36e5
+                  },
+                  {
+                    formatter: "hh : mm\nMM - dd",
+                    value: 72e5
+                  },
+                  {
+                    formatter: "hh : mm\nMM - dd",
+                    value: 216e5
+                  },
+                  {
+                    formatter: "hh : mm\nMM - dd",
+                    value: 432e5
+                  },
+                  {
+                    formatter: "MM - dd\nyyyy",
+                    value: 864e5
+                  },
+                  {
+                    formatter: "week",
+                    value: 6048e5
+                  },
+                  {
+                    formatter: "month",
+                    value: 26784e5
+                  },
+                  {
+                    formatter: "quarter",
+                    value: 8208e6
+                  },
+                  {
+                    formatter: "half-year",
+                    value: 16416e6
+                  },
+                  {
+                    formatter: "year",
+                    value: 32832e6
+                  }];
+                return {
+                  getAutoFormatter: e,
+                  getNewDate: h,
+                  format: i,
+                  nextMonday: n,
+                  nextNthPerNmonth: a,
+                  nextNthOnMonth: o,
+                  nextNthOnQuarterYear: r,
+                  nextNthOnHalfYear: s,
+                  nextNthOnYear: l
+                }
+              }),
+          i("echarts/util/smartSteps", [],
+              function() {
+                function e(e) {
+                  return X.log(I(e)) / X.LN10
+                }
+                function t(e) {
+                  return X.pow(10, e)
+                }
+                function i(e) {
+                  return e === w(e)
+                }
+                function n(e, t, n, a) {
+                  b = a || {},
+                      f = b.steps || L,
+                      k = b.secs || W,
+                      n = v( + n || 0) % 99,
+                      e = +e || 0,
+                      t = +t || 0,
+                      x = _ = 0,
+                  "min" in b && (e = +b.min || 0, x = 1),
+                  "max" in b && (t = +b.max || 0, _ = 1),
+                  e > t && (t = [e, e = t][0]);
+                  var o = t - e;
+                  if (x && _) return g(e, t, n);
+                  if ((n || 5) > o) {
+                    if (i(e) && i(t)) return d(e, t, n);
+                    if (0 === o) return p(e, t, n)
+                  }
+                  return h(e, t, n)
+                }
+                function a(e, i, n, a) {
+                  a = a || 0;
+                  var s = o((i - e) / n, -1),
+                      l = o(e, -1, 1),
+                      h = o(i, -1),
+                      m = X.min(s.e, l.e, h.e);
+                  0 === l.c ? m = X.min(s.e, h.e) : 0 === h.c && (m = X.min(s.e, l.e)),
+                      r(s, {
+                        c: 0,
+                        e: m
+                      }),
+                      r(l, s, 1),
+                      r(h, s),
+                      a += m,
+                      e = l.c,
+                      i = h.c;
+                  for (var V = (i - e) / n, U = t(a), d = 0, p = [], c = n + 1; c--;) p[c] = (e + V * c) * U;
+                  if (0 > a) {
+                    d = u(U),
+                        V = +(V * U).toFixed(d),
+                        e = +(e * U).toFixed(d),
+                        i = +(i * U).toFixed(d);
+                    for (var c = p.length; c--;) p[c] = p[c].toFixed(d),
+                    0 === +p[c] && (p[c] = "0")
+                  } else e *= U,
+                      i *= U,
+                      V *= U;
+                  return k = 0,
+                      f = 0,
+                      b = 0,
+                      {
+                        min: e,
+                        max: i,
+                        secs: n,
+                        step: V,
+                        fix: d,
+                        exp: a,
+                        pnts: p
+                      }
+                }
+                function o(n, a, o) {
+                  a = v(a % 10) || 2,
+                  0 > a && (i(n) ? a = ("" + I(n)).replace(/0+$/, "").length || 1 : (n = n.toFixed(15).replace(/0+$/, ""), a = n.replace(".", "").replace(/^[-0]+/, "").length, n = +n));
+                  var r = w(e(n)) - a + 1,
+                      s = +(n * t( - r)).toFixed(15) || 0;
+                  return s = o ? w(s) : K(s),
+                  !s && (r = 0),
+                  ("" + I(s)).length > a && (r += 1, s /= 10),
+                      {
+                        c: s,
+                        e: r
+                      }
+                }
+                function r(e, i, n) {
+                  var a = i.e - e.e;
+                  a && (e.e += a, e.c *= t( - a), e.c = n ? w(e.c) : K(e.c))
+                }
+                function s(e, t, i) {
+                  e.e < t.e ? r(t, e, i) : r(e, t, i)
+                }
+                function l(e, t) {
+                  t = t || L,
+                      e = o(e);
+                  for (var i = e.c,
+                           n = 0; i > t[n];) n++;
+                  if (!t[n]) for (i /= 10, e.e += 1, n = 0; i > t[n];) n++;
+                  return e.c = t[n],
+                      e
+                }
+                function h(e, t, n) {
+                  var s, h = n || +k.slice( - 1),
+                      p = l((t - e) / h, f),
+                      u = o(t - e),
+                      g = o(e, -1, 1),
+                      b = o(t, -1);
+                  if (r(u, p), r(g, p, 1), r(b, p), n ? s = V(g, b, h) : h = m(g, b), i(e) && i(t) && e * t >= 0) {
+                    if (h > t - e) return d(e, t, h);
+                    h = U(e, t, n, g, b, h)
+                  }
+                  var L = c(e, t, g.c, b.c);
+                  return g.c = L[0],
+                      b.c = L[1],
+                  (x || _) && y(e, t, g, b),
+                      a(g.c, b.c, h, b.e)
+                }
+                function m(e, i) {
+                  for (var n, a, o, r, s = [], h = k.length; h--;) n = k[h],
+                      a = l((i.c - e.c) / n, f),
+                      a = a.c * t(a.e),
+                      o = w(e.c / a) * a,
+                      r = K(i.c / a) * a,
+                      s[h] = {
+                        min: o,
+                        max: r,
+                        step: a,
+                        span: r - o
+                      };
+                  return s.sort(function(e, t) {
+                    var i = e.span - t.span;
+                    return 0 === i && (i = e.step - t.step),
+                        i
+                  }),
+                      s = s[0],
+                      n = s.span / s.step,
+                      e.c = s.min,
+                      i.c = s.max,
+                      3 > n ? 2 * n: n
+                }
+                function V(e, i, n) {
+                  for (var a, o, r = i.c,
+                           s = (i.c - e.c) / n - 1; r > e.c;) s = l(s + 1, f),
+                      s = s.c * t(s.e),
+                      a = s * n,
+                      o = K(i.c / s) * s,
+                      r = o - a;
+                  var h = e.c - r,
+                      m = o - i.c,
+                      V = h - m;
+                  return V > 1.1 * s && (V = v(V / s / 2) * s, r += V, o += V),
+                      e.c = r,
+                      i.c = o,
+                      s
+                }
+                function U(e, n, a, o, r, s) {
+                  var l = r.c - o.c,
+                      h = l / s * t(r.e);
+                  if (!i(h) && (h = w(h), l = h * s, n - e > l && (h += 1, l = h * s, !a && h * (s - 1) >= n - e && (s -= 1, l = h * s)), l >= n - e)) {
+                    var m = l - (n - e);
+                    o.c = v(e - m / 2),
+                        r.c = v(n + m / 2),
+                        o.e = 0,
+                        r.e = 0
+                  }
+                  return s
+                }
+                function d(e, t, i) {
+                  if (i = i || 5, x) t = e + i;
+                  else if (_) e = t - i;
+                  else {
+                    var n = i - (t - e),
+                        o = v(e - n / 2),
+                        r = v(t + n / 2),
+                        s = c(e, t, o, r);
+                    e = s[0],
+                        t = s[1]
+                  }
+                  return a(e, t, i)
+                }
+                function p(e, t, i) {
+                  i = i || 5;
+                  var n = X.min(I(t / i), i) / 2.1;
+                  return x ? t = e + n: _ ? e = t - n: (e -= n, t += n),
+                      h(e, t, i)
+                }
+                function c(e, t, i, n) {
+                  return e >= 0 && 0 > i ? (n -= i, i = 0) : 0 >= t && n > 0 && (i -= n, n = 0),
+                      [i, n]
+                }
+                function u(e) {
+                  return e = ( + e).toFixed(15).split("."),
+                      e.pop().replace(/0+$/, "").length
+                }
+                function y(e, t, i, n) {
+                  if (x) {
+                    var a = o(e, 4, 1);
+                    i.e - a.e > 6 && (a = {
+                      c: 0,
+                      e: i.e
+                    }),
+                        s(i, a),
+                        s(n, a),
+                        n.c += a.c - i.c,
+                        i.c = a.c
+                  } else if (_) {
+                    var r = o(t, 4);
+                    n.e - r.e > 6 && (r = {
+                      c: 0,
+                      e: n.e
+                    }),
+                        s(i, r),
+                        s(n, r),
+                        i.c += r.c - n.c,
+                        n.c = r.c
+                  }
+                }
+                function g(e, t, i) {
+                  var n = i ? [i] : k,
+                      s = t - e;
+                  if (0 === s) return t = o(t, 3),
+                      i = n[0],
+                      t.c = v(t.c + i / 2),
+                      a(t.c - i, t.c, i, t.e);
+                  I(t / s) < 1e-6 && (t = 0),
+                  I(e / s) < 1e-6 && (e = 0);
+                  var l, h, m, V = [[5, 10], [10, 2], [50, 10], [100, 2]],
+                      U = [],
+                      d = [],
+                      p = o(t - e, 3),
+                      c = o(e, -1, 1),
+                      u = o(t, -1);
+                  r(c, p, 1),
+                      r(u, p),
+                      s = u.c - c.c,
+                      p.c = s;
+                  for (var y = n.length; y--;) {
+                    i = n[y],
+                        l = K(s / i),
+                        h = l * i - s,
+                        m = 3 * (h + 3),
+                        m += 2 * (i - n[0] + 2),
+                    i % 5 === 0 && (m -= 10);
+                    for (var g = V.length; g--;) l % V[g][0] === 0 && (m /= V[g][1]);
+                    d[y] = [i, l, h, m].join(),
+                        U[y] = {
+                          secs: i,
+                          step: l,
+                          delta: h,
+                          score: m
+                        }
+                  }
+                  return U.sort(function(e, t) {
+                    return e.score - t.score
+                  }),
+                      U = U[0],
+                      c.c = v(c.c - U.delta / 2),
+                      u.c = v(u.c + U.delta / 2),
+                      a(c.c, u.c, U.secs, p.e)
+                }
+                var b, f, k, x, _, L = [10, 20, 25, 50],
+                    W = [4, 5, 6],
+                    X = Math,
+                    v = X.round,
+                    w = X.floor,
+                    K = X.ceil,
+                    I = X.abs;
+                return n
+              }),
+          i("echarts/util/smartLogSteps", ["require", "./number"],
+              function(e) {
+                function t(e) {
+                  return i(),
+                      u = e || {},
+                      n(),
+                      a(),
+                      [o(), i()][0]
+                }
+                function i() {
+                  U = u = g = c = b = f = y = k = d = p = null
+                }
+                function n() {
+                  d = u.logLabelBase,
+                      null == d ? (p = "plain", d = 10, c = I) : (d = +d, 1 > d && (d = 10), p = "exponent", c = L(d)),
+                      y = u.splitNumber,
+                  null == y && (y = E);
+                  var e = parseFloat(u.dataMin),
+                      t = parseFloat(u.dataMax);
+                  isFinite(e) || isFinite(t) ? isFinite(e) ? isFinite(t) ? e > t && (t = [e, e = t][0]) : t = e: e = t: e = t = 1,
+                      U = u.logPositive,
+                  null == U && (U = t > 0 || 0 === e),
+                      b = U ? e: -t,
+                      f = U ? t: -e,
+                  S > b && (b = S),
+                  S > f && (f = S)
+                }
+                function a() {
+                  function e() {
+                    y > m && (y = m);
+                    var e = w(l(m / y)),
+                        t = v(l(m / e)),
+                        i = e * t,
+                        n = (i - U) / 2,
+                        a = w(l(r - n));
+                    V(a - r) && (a -= 1),
+                        g = -a * c;
+                    for (var s = a; o >= s - e; s += e) k.push(W(d, s))
+                  }
+                  function t() {
+                    for (var e = i(h, 0), t = e + 2; t > e && a(e + 1) + n(e + 1) * C < r;) e++;
+                    for (var l = i(s, 0), t = l - 2; l > t && a(l - 1) + n(l - 1) * C > o;) l--;
+                    g = -(a(e) * I + n(e) * J);
+                    for (var m = e; l >= m; m++) {
+                      var V = a(m),
+                          U = n(m);
+                      k.push(W(10, V) * W(2, U))
+                    }
+                  }
+                  function i(e, t) {
+                    return 3 * e + t
+                  }
+                  function n(e) {
+                    return e - 3 * a(e)
+                  }
+                  function a(e) {
+                    return w(l(e / 3))
+                  }
+                  k = [];
+                  var o = l(L(f) / c),
+                      r = l(L(b) / c),
+                      s = v(o),
+                      h = w(r),
+                      m = s - h,
+                      U = o - r;
+                  "exponent" === p ? e() : F >= m && y > F ? t() : e()
+                }
+                function o() {
+                  for (var e = [], t = 0, i = k.length; i > t; t++) e[t] = (U ? 1 : -1) * k[t]; ! U && e.reverse();
+                  var n = s(),
+                      a = n.value2Coord,
+                      o = a(e[0]),
+                      l = a(e[e.length - 1]);
+                  return o === l && (o -= 1, l += 1),
+                      {
+                        dataMin: o,
+                        dataMax: l,
+                        tickList: e,
+                        logPositive: U,
+                        labelFormatter: r(),
+                        dataMappingMethods: n
+                      }
+                }
+                function r() {
+                  if ("exponent" === p) {
+                    var e = d,
+                        t = c;
+                    return function(i) {
+                      if (!isFinite(parseFloat(i))) return "";
+                      var n = "";
+                      return 0 > i && (i = -i, n = "-"),
+                      n + e + m(L(i) / t)
+                    }
+                  }
+                  return function(e) {
+                    return isFinite(parseFloat(e)) ? x.addCommas(h(e)) : ""
+                  }
+                }
+                function s() {
+                  var e = U,
+                      t = g;
+                  return {
+                    value2Coord: function(i) {
+                      return null == i || isNaN(i) || !isFinite(i) ? i: (i = parseFloat(i), isFinite(i) ? e && S > i ? i = S: !e && i > -S && (i = -S) : i = S, i = X(i), (e ? 1 : -1) * (L(i) + t))
+                    },
+                    coord2Value: function(i) {
+                      return null == i || isNaN(i) || !isFinite(i) ? i: (i = parseFloat(i), isFinite(i) || (i = S), e ? W(K, i - t) : -W(K, -i + t))
+                    }
+                  }
+                }
+                function l(e) {
+                  return + Number( + e).toFixed(14)
+                }
+                function h(e) {
+                  return Number(e).toFixed(15).replace(/\.?0*$/, "")
+                }
+                function m(e) {
+                  e = h(Math.round(e));
+                  for (var t = [], i = 0, n = e.length; n > i; i++) {
+                    var a = e.charAt(i);
+                    t.push(T[a] || "")
+                  }
+                  return t.join("")
+                }
+                function V(e) {
+                  return e > -S && S > e
+                }
+                var U, d, p, c, u, y, g, b, f, k, x = e("./number"),
+                    _ = Math,
+                    L = _.log,
+                    W = _.pow,
+                    X = _.abs,
+                    v = _.ceil,
+                    w = _.floor,
+                    K = _.E,
+                    I = _.LN10,
+                    J = _.LN2,
+                    C = J / I,
+                    S = 1e-9,
+                    E = 5,
+                    F = 2,
+                    T = {
+                      0 : "⁰",
+                      1 : "¹",
+                      2 : "²",
+                      3 : "³",
+                      4 : "⁴",
+                      5 : "⁵",
+                      6 : "⁶",
+                      7 : "⁷",
+                      8 : "⁸",
+                      9 : "⁹",
+                      "-": "⁻"
+                    };
+                return t
+              }),
+          i("echarts/chart/line", ["require", "./base", "zrender/shape/Polyline", "../util/shape/Icon", "../util/shape/HalfSmoothPolygon", "../component/axis", "../component/grid", "../component/dataZoom", "../config", "../util/ecData", "zrender/tool/util", "zrender/tool/color", "../chart"],
+              function(e) {
+                function t(e, t, i, a, o) {
+                  n.call(this, e, t, i, a, o),
+                      this.refresh(a)
+                }
+                function i(e, t, i) {
+                  var n = t.x,
+                      a = t.y,
+                      r = t.width,
+                      s = t.height,
+                      l = s / 2;
+                  t.symbol.match("empty") && (e.fillStyle = "#fff"),
+                      t.brushType = "both";
+                  var h = t.symbol.replace("empty", "").toLowerCase();
+                  h.match("star") ? (l = h.replace("star", "") - 0 || 5, a -= 1, h = "star") : ("rectangle" === h || "arrow" === h) && (n += (r - s) / 2, r = s);
+                  var m = "";
+                  if (h.match("image") && (m = h.replace(new RegExp("^image:\\/\\/"), ""), h = "image", n += Math.round((r - s) / 2) - 1, r = s += 2), h = o.prototype.iconLibrary[h]) {
+                    var V = t.x,
+                        U = t.y;
+                    e.moveTo(V, U + l),
+                        e.lineTo(V + 5, U + l),
+                        e.moveTo(V + t.width - 5, U + l),
+                        e.lineTo(V + t.width, U + l);
+                    var d = this;
+                    h(e, {
+                          x: n + 4,
+                          y: a + 4,
+                          width: r - 8,
+                          height: s - 8,
+                          n: l,
+                          image: m
+                        },
+                        function() {
+                          d.modSelf(),
+                              i()
+                        })
+                  } else e.moveTo(n, a + l),
+                      e.lineTo(n + r, a + l)
+                }
+                var n = e("./base"),
+                    a = e("zrender/shape/Polyline"),
+                    o = e("../util/shape/Icon"),
+                    r = e("../util/shape/HalfSmoothPolygon");
+                e("../component/axis"),
+                    e("../component/grid"),
+                    e("../component/dataZoom");
+                var s = e("../config");
+                s.line = {
+                  zlevel: 0,
+                  z: 2,
+                  clickable: !0,
+                  legendHoverLink: !0,
+                  xAxisIndex: 0,
+                  yAxisIndex: 0,
+                  dataFilter: "nearest",
+                  itemStyle: {
+                    normal: {
+                      label: {
+                        show: !1
+                      },
+                      lineStyle: {
+                        width: 2,
+                        type: "solid",
+                        shadowColor: "rgba(0,0,0,0)",
+                        shadowBlur: 0,
+                        shadowOffsetX: 0,
+                        shadowOffsetY: 0
+                      }
+                    },
+                    emphasis: {
+                      label: {
+                        show: !1
+                      }
+                    }
+                  },
+                  symbolSize: 2,
+                  showAllSymbol: !1
+                };
+                var l = e("../util/ecData"),
+                    h = e("zrender/tool/util"),
+                    m = e("zrender/tool/color");
+                return t.prototype = {
+                  type: s.CHART_TYPE_LINE,
+                  _buildShape: function() {
+                    this.finalPLMap = {},
+                        this._buildPosition()
+                  },
+                  _buildHorizontal: function(e, t, i, n) {
+                    for (var a, o, r, s, l, h, m, V, U, d = this.series,
+                             p = i[0][0], c = d[p], u = this.component.xAxis.getAxis(c.xAxisIndex || 0), y = {},
+                             g = 0, b = t; b > g && null != u.getNameByIndex(g); g++) {
+                      o = u.getCoordByIndex(g);
+                      for (var f = 0,
+                               k = i.length; k > f; f++) {
+                        a = this.component.yAxis.getAxis(d[i[f][0]].yAxisIndex || 0),
+                            l = s = m = h = a.getCoord(0);
+                        for (var x = 0,
+                                 _ = i[f].length; _ > x; x++) p = i[f][x],
+                            c = d[p],
+                            V = c.data[g],
+                            U = this.getDataFromOption(V, "-"),
+                            y[p] = y[p] || [],
+                            n[p] = n[p] || {
+                              min: Number.POSITIVE_INFINITY,
+                              max: Number.NEGATIVE_INFINITY,
+                              sum: 0,
+                              counter: 0,
+                              average: 0
+                            },
+                            "-" !== U ? (U >= 0 ? (s -= x > 0 ? a.getCoordSize(U) : l - a.getCoord(U), r = s) : 0 > U && (h += x > 0 ? a.getCoordSize(U) : a.getCoord(U) - m, r = h), y[p].push([o, r, g, u.getNameByIndex(g), o, l]), n[p].min > U && (n[p].min = U, n[p].minY = r, n[p].minX = o), n[p].max < U && (n[p].max = U, n[p].maxY = r, n[p].maxX = o), n[p].sum += U, n[p].counter++) : y[p].length > 0 && (this.finalPLMap[p] = this.finalPLMap[p] || [], this.finalPLMap[p].push(y[p]), y[p] = [])
+                      }
+                      s = this.component.grid.getY();
+                      for (var L, f = 0,
+                               k = i.length; k > f; f++) for (var x = 0,
+                                                                  _ = i[f].length; _ > x; x++) p = i[f][x],
+                          c = d[p],
+                          V = c.data[g],
+                          U = this.getDataFromOption(V, "-"),
+                      "-" == U && this.deepQuery([V, c, this.option], "calculable") && (L = this.deepQuery([V, c], "symbolSize"), s += 2 * L + 5, r = s, this.shapeList.push(this._getCalculableItem(p, g, u.getNameByIndex(g), o, r, "horizontal")))
+                    }
+                    for (var W in y) y[W].length > 0 && (this.finalPLMap[W] = this.finalPLMap[W] || [], this.finalPLMap[W].push(y[W]), y[W] = []);
+                    this._calculMarkMapXY(n, i, "y"),
+                        this._buildBorkenLine(e, this.finalPLMap, u, "horizontal")
+                  },
+                  _buildVertical: function(e, t, i, n) {
+                    for (var a, o, r, s, l, h, m, V, U, d = this.series,
+                             p = i[0][0], c = d[p], u = this.component.yAxis.getAxis(c.yAxisIndex || 0), y = {},
+                             g = 0, b = t; b > g && null != u.getNameByIndex(g); g++) {
+                      r = u.getCoordByIndex(g);
+                      for (var f = 0,
+                               k = i.length; k > f; f++) {
+                        a = this.component.xAxis.getAxis(d[i[f][0]].xAxisIndex || 0),
+                            l = s = m = h = a.getCoord(0);
+                        for (var x = 0,
+                                 _ = i[f].length; _ > x; x++) p = i[f][x],
+                            c = d[p],
+                            V = c.data[g],
+                            U = this.getDataFromOption(V, "-"),
+                            y[p] = y[p] || [],
+                            n[p] = n[p] || {
+                              min: Number.POSITIVE_INFINITY,
+                              max: Number.NEGATIVE_INFINITY,
+                              sum: 0,
+                              counter: 0,
+                              average: 0
+                            },
+                            "-" !== U ? (U >= 0 ? (s += x > 0 ? a.getCoordSize(U) : a.getCoord(U) - l, o = s) : 0 > U && (h -= x > 0 ? a.getCoordSize(U) : m - a.getCoord(U), o = h), y[p].push([o, r, g, u.getNameByIndex(g), l, r]), n[p].min > U && (n[p].min = U, n[p].minX = o, n[p].minY = r), n[p].max < U && (n[p].max = U, n[p].maxX = o, n[p].maxY = r), n[p].sum += U, n[p].counter++) : y[p].length > 0 && (this.finalPLMap[p] = this.finalPLMap[p] || [], this.finalPLMap[p].push(y[p]), y[p] = [])
+                      }
+                      s = this.component.grid.getXend();
+                      for (var L, f = 0,
+                               k = i.length; k > f; f++) for (var x = 0,
+                                                                  _ = i[f].length; _ > x; x++) p = i[f][x],
+                          c = d[p],
+                          V = c.data[g],
+                          U = this.getDataFromOption(V, "-"),
+                      "-" == U && this.deepQuery([V, c, this.option], "calculable") && (L = this.deepQuery([V, c], "symbolSize"), s -= 2 * L + 5, o = s, this.shapeList.push(this._getCalculableItem(p, g, u.getNameByIndex(g), o, r, "vertical")))
+                    }
+                    for (var W in y) y[W].length > 0 && (this.finalPLMap[W] = this.finalPLMap[W] || [], this.finalPLMap[W].push(y[W]), y[W] = []);
+                    this._calculMarkMapXY(n, i, "x"),
+                        this._buildBorkenLine(e, this.finalPLMap, u, "vertical")
+                  },
+                  _buildOther: function(e, t, i, n) {
+                    for (var a, o = this.series,
+                             r = {},
+                             s = 0,
+                             l = i.length; l > s; s++) for (var h = 0,
+                                                                m = i[s].length; m > h; h++) {
+                      var V = i[s][h],
+                          U = o[V];
+                      a = this.component.xAxis.getAxis(U.xAxisIndex || 0);
+                      var d = this.component.yAxis.getAxis(U.yAxisIndex || 0),
+                          p = d.getCoord(0);
+                      r[V] = r[V] || [],
+                          n[V] = n[V] || {
+                            min0: Number.POSITIVE_INFINITY,
+                            min1: Number.POSITIVE_INFINITY,
+                            max0: Number.NEGATIVE_INFINITY,
+                            max1: Number.NEGATIVE_INFINITY,
+                            sum0: 0,
+                            sum1: 0,
+                            counter0: 0,
+                            counter1: 0,
+                            average0: 0,
+                            average1: 0
+                          };
+                      for (var c = 0,
+                               u = U.data.length; u > c; c++) {
+                        var y = U.data[c],
+                            g = this.getDataFromOption(y, "-");
+                        if (g instanceof Array) {
+                          var b = a.getCoord(g[0]),
+                              f = d.getCoord(g[1]);
+                          r[V].push([b, f, c, g[0], b, p]),
+                          n[V].min0 > g[0] && (n[V].min0 = g[0], n[V].minY0 = f, n[V].minX0 = b),
+                          n[V].max0 < g[0] && (n[V].max0 = g[0], n[V].maxY0 = f, n[V].maxX0 = b),
+                              n[V].sum0 += g[0],
+                              n[V].counter0++,
+                          n[V].min1 > g[1] && (n[V].min1 = g[1], n[V].minY1 = f, n[V].minX1 = b),
+                          n[V].max1 < g[1] && (n[V].max1 = g[1], n[V].maxY1 = f, n[V].maxX1 = b),
+                              n[V].sum1 += g[1],
+                              n[V].counter1++
+                        }
+                      }
+                    }
+                    for (var k in r) r[k].length > 0 && (this.finalPLMap[k] = this.finalPLMap[k] || [], this.finalPLMap[k].push(r[k]), r[k] = []);
+                    this._calculMarkMapXY(n, i, "xy"),
+                        this._buildBorkenLine(e, this.finalPLMap, a, "other")
+                  },
+                  _buildBorkenLine: function(e, t, i, n) {
+                    for (var o, s = "other" == n ? "horizontal": n, V = this.series, U = e.length - 1; U >= 0; U--) {
+                      var d = e[U],
+                          p = V[d],
+                          c = t[d];
+                      if (p.type === this.type && null != c) for (var u = this._getBbox(d, s), y = this._sIndex2ColorMap[d], g = this.query(p, "itemStyle.normal.lineStyle.width"), b = this.query(p, "itemStyle.normal.lineStyle.type"), f = this.query(p, "itemStyle.normal.lineStyle.color"), k = this.getItemStyleColor(this.query(p, "itemStyle.normal.color"), d, -1), x = null != this.query(p, "itemStyle.normal.areaStyle"), _ = this.query(p, "itemStyle.normal.areaStyle.color"), L = 0, W = c.length; W > L; L++) {
+                        var X = c[L],
+                            v = "other" != n && this._isLarge(s, X);
+                        if (v) X = this._getLargePointList(s, X, p.dataFilter);
+                        else for (var w = 0,
+                                      K = X.length; K > w; w++) o = p.data[X[w][2]],
+                        (this.deepQuery([o, p, this.option], "calculable") || this.deepQuery([o, p], "showAllSymbol") || "categoryAxis" === i.type && i.isMainAxis(X[w][2]) && "none" != this.deepQuery([o, p], "symbol")) && this.shapeList.push(this._getSymbol(d, X[w][2], X[w][3], X[w][0], X[w][1], s));
+                        var I = new a({
+                          zlevel: p.zlevel,
+                          z: p.z,
+                          style: {
+                            miterLimit: g,
+                            pointList: X,
+                            strokeColor: f || k || y,
+                            lineWidth: g,
+                            lineType: b,
+                            smooth: this._getSmooth(p.smooth),
+                            smoothConstraint: u,
+                            shadowColor: this.query(p, "itemStyle.normal.lineStyle.shadowColor"),
+                            shadowBlur: this.query(p, "itemStyle.normal.lineStyle.shadowBlur"),
+                            shadowOffsetX: this.query(p, "itemStyle.normal.lineStyle.shadowOffsetX"),
+                            shadowOffsetY: this.query(p, "itemStyle.normal.lineStyle.shadowOffsetY")
+                          },
+                          hoverable: !1,
+                          _main: !0,
+                          _seriesIndex: d,
+                          _orient: s
+                        });
+                        if (l.pack(I, V[d], d, 0, L, V[d].name), this.shapeList.push(I), x) {
+                          var J = new r({
+                            zlevel: p.zlevel,
+                            z: p.z,
+                            style: {
+                              miterLimit: g,
+                              pointList: h.clone(X).concat([[X[X.length - 1][4], X[X.length - 1][5]], [X[0][4], X[0][5]]]),
+                              brushType: "fill",
+                              smooth: this._getSmooth(p.smooth),
+                              smoothConstraint: u,
+                              color: _ ? _: m.alpha(y, .5)
+                            },
+                            highlightStyle: {
+                              brushType: "fill"
+                            },
+                            hoverable: !1,
+                            _main: !0,
+                            _seriesIndex: d,
+                            _orient: s
+                          });
+                          l.pack(J, V[d], d, 0, L, V[d].name),
+                              this.shapeList.push(J)
+                        }
+                      }
+                    }
+                  },
+                  _getBbox: function(e, t) {
+                    var i = this.component.grid.getBbox(),
+                        n = this.xMarkMap[e];
+                    return null != n.minX0 ? [[Math.min(n.minX0, n.maxX0, n.minX1, n.maxX1), Math.min(n.minY0, n.maxY0, n.minY1, n.maxY1)], [Math.max(n.minX0, n.maxX0, n.minX1, n.maxX1), Math.max(n.minY0, n.maxY0, n.minY1, n.maxY1)]] : ("horizontal" === t ? (i[0][1] = Math.min(n.minY, n.maxY), i[1][1] = Math.max(n.minY, n.maxY)) : (i[0][0] = Math.min(n.minX, n.maxX), i[1][0] = Math.max(n.minX, n.maxX)), i)
+                  },
+                  _isLarge: function(e, t) {
+                    return t.length < 2 ? !1 : "horizontal" === e ? Math.abs(t[0][0] - t[1][0]) < .5 : Math.abs(t[0][1] - t[1][1]) < .5
+                  },
+                  _getLargePointList: function(e, t, i) {
+                    var n;
+                    n = "horizontal" === e ? this.component.grid.getWidth() : this.component.grid.getHeight();
+                    var a = t.length,
+                        o = [];
+                    if ("function" != typeof i) switch (i) {
+                      case "min":
+                        i = function(e) {
+                          return Math.max.apply(null, e)
+                        };
+                        break;
+                      case "max":
+                        i = function(e) {
+                          return Math.min.apply(null, e)
+                        };
+                        break;
+                      case "average":
+                        i = function(e) {
+                          for (var t = 0,
+                                   i = 0; i < e.length; i++) t += e[i];
+                          return t / e.length
+                        };
+                        break;
+                      default:
+                        i = function(e) {
+                          return e[0]
+                        }
+                    }
+                    for (var r = [], s = 0; n > s; s++) {
+                      var l = Math.floor(a / n * s),
+                          h = Math.min(Math.floor(a / n * (s + 1)), a);
+                      if (! (l >= h)) {
+                        for (var m = l; h > m; m++) r[m - l] = "horizontal" === e ? t[m][1] : t[m][0];
+                        r.length = h - l;
+                        for (var V = i(r), U = -1, d = 1 / 0, m = l; h > m; m++) {
+                          var p = "horizontal" === e ? t[m][1] : t[m][0],
+                              c = Math.abs(p - V);
+                          d > c && (U = m, d = c)
+                        }
+                        var u = t[U].slice();
+                        "horizontal" === e ? u[1] = V: u[0] = V,
+                            o.push(u)
+                      }
+                    }
+                    return o
+                  },
+                  _getSmooth: function(e) {
+                    return e ? .3 : 0
+                  },
+                  _getCalculableItem: function(e, t, i, n, a, o) {
+                    var r = this.series,
+                        l = r[e].calculableHolderColor || this.ecTheme.calculableHolderColor || s.calculableHolderColor,
+                        h = this._getSymbol(e, t, i, n, a, o);
+                    return h.style.color = l,
+                        h.style.strokeColor = l,
+                        h.rotation = [0, 0],
+                        h.hoverable = !1,
+                        h.draggable = !1,
+                        h.style.text = void 0,
+                        h
+                  },
+                  _getSymbol: function(e, t, i, n, a, o) {
+                    var r = this.series,
+                        s = r[e],
+                        l = s.data[t],
+                        h = this.getSymbolShape(s, e, l, t, i, n, a, this._sIndex2ShapeMap[e], this._sIndex2ColorMap[e], "#fff", "vertical" === o ? "horizontal": "vertical");
+                    return h.zlevel = s.zlevel,
+                        h.z = s.z + 1,
+                    this.deepQuery([l, s, this.option], "calculable") && (this.setCalculable(h), h.draggable = !0),
+                        h
+                  },
+                  getMarkCoord: function(e, t) {
+                    var i = this.series[e],
+                        n = this.xMarkMap[e],
+                        a = this.component.xAxis.getAxis(i.xAxisIndex),
+                        o = this.component.yAxis.getAxis(i.yAxisIndex);
+                    if (t.type && ("max" === t.type || "min" === t.type || "average" === t.type)) {
+                      var r = null != t.valueIndex ? t.valueIndex: null != n.maxX0 ? "1": "";
+                      return [n[t.type + "X" + r], n[t.type + "Y" + r], n[t.type + "Line" + r], n[t.type + r]]
+                    }
+                    return ["string" != typeof t.xAxis && a.getCoordByIndex ? a.getCoordByIndex(t.xAxis || 0) : a.getCoord(t.xAxis || 0), "string" != typeof t.yAxis && o.getCoordByIndex ? o.getCoordByIndex(t.yAxis || 0) : o.getCoord(t.yAxis || 0)]
+                  },
+                  refresh: function(e) {
+                    e && (this.option = e, this.series = e.series),
+                        this.backupShapeList(),
+                        this._buildShape()
+                  },
+                  ontooltipHover: function(e, t) {
+                    for (var i, n, a = e.seriesIndex,
+                             o = e.dataIndex,
+                             r = a.length; r--;) if (i = this.finalPLMap[a[r]]) for (var s = 0,
+                                                                                         l = i.length; l > s; s++) {
+                      n = i[s];
+                      for (var h = 0,
+                               m = n.length; m > h; h++) o === n[h][2] && t.push(this._getSymbol(a[r], n[h][2], n[h][3], n[h][0], n[h][1], "horizontal"))
+                    }
+                  },
+                  addDataAnimation: function(e, t) {
+                    function i() {
+                      c--,
+                      0 === c && t && t()
+                    }
+                    function n(e) {
+                      e.style.controlPointList = null
+                    }
+                    for (var a = this.series,
+                             o = {},
+                             r = 0,
+                             s = e.length; s > r; r++) o[e[r][0]] = e[r];
+                    for (var l, h, m, V, U, d, p, c = 0,
+                             r = this.shapeList.length - 1; r >= 0; r--) if (U = this.shapeList[r]._seriesIndex, o[U] && !o[U][3]) {
+                      if (this.shapeList[r]._main && this.shapeList[r].style.pointList.length > 1) {
+                        if (d = this.shapeList[r].style.pointList, h = Math.abs(d[0][0] - d[1][0]), V = Math.abs(d[0][1] - d[1][1]), p = "horizontal" === this.shapeList[r]._orient, o[U][2]) {
+                          if ("half-smooth-polygon" === this.shapeList[r].type) {
+                            var u = d.length;
+                            this.shapeList[r].style.pointList[u - 3] = d[u - 2],
+                                this.shapeList[r].style.pointList[u - 3][p ? 0 : 1] = d[u - 4][p ? 0 : 1],
+                                this.shapeList[r].style.pointList[u - 2] = d[u - 1]
+                          }
+                          this.shapeList[r].style.pointList.pop(),
+                              p ? (l = h, m = 0) : (l = 0, m = -V)
+                        } else {
+                          if (this.shapeList[r].style.pointList.shift(), "half-smooth-polygon" === this.shapeList[r].type) {
+                            var y = this.shapeList[r].style.pointList.pop();
+                            p ? y[0] = d[0][0] : y[1] = d[0][1],
+                                this.shapeList[r].style.pointList.push(y)
+                          }
+                          p ? (l = -h, m = 0) : (l = 0, m = V)
+                        }
+                        this.shapeList[r].style.controlPointList = null,
+                            this.zr.modShape(this.shapeList[r])
+                      } else {
+                        if (o[U][2] && this.shapeList[r]._dataIndex === a[U].data.length - 1) {
+                          this.zr.delShape(this.shapeList[r].id);
+                          continue
+                        }
+                        if (!o[U][2] && 0 === this.shapeList[r]._dataIndex) {
+                          this.zr.delShape(this.shapeList[r].id);
+                          continue
+                        }
+                      }
+                      this.shapeList[r].position = [0, 0],
+                          c++,
+                          this.zr.animate(this.shapeList[r].id, "").when(this.query(this.option, "animationDurationUpdate"), {
+                            position: [l, m]
+                          }).during(n).done(i).start()
+                    }
+                    c || t && t()
+                  }
+                },
+                    o.prototype.iconLibrary.legendLineIcon = i,
+                    h.inherits(t, n),
+                    e("../chart").define("line", t),
+                    t
+              }),
+          i("echarts/util/shape/HalfSmoothPolygon", ["require", "zrender/shape/Base", "zrender/shape/util/smoothBezier", "zrender/tool/util", "zrender/shape/Polygon"],
+              function(e) {
+                function t(e) {
+                  i.call(this, e)
+                }
+                var i = e("zrender/shape/Base"),
+                    n = e("zrender/shape/util/smoothBezier"),
+                    a = e("zrender/tool/util");
+                return t.prototype = {
+                  type: "half-smooth-polygon",
+                  buildPath: function(t, i) {
+                    var a = i.pointList;
+                    if (! (a.length < 2)) if (i.smooth) {
+                      var o = n(a.slice(0, -2), i.smooth, !1, i.smoothConstraint);
+                      t.moveTo(a[0][0], a[0][1]);
+                      for (var r, s, l, h = a.length,
+                               m = 0; h - 3 > m; m++) r = o[2 * m],
+                          s = o[2 * m + 1],
+                          l = a[m + 1],
+                          t.bezierCurveTo(r[0], r[1], s[0], s[1], l[0], l[1]);
+                      t.lineTo(a[h - 2][0], a[h - 2][1]),
+                          t.lineTo(a[h - 1][0], a[h - 1][1]),
+                          t.lineTo(a[0][0], a[0][1])
+                    } else e("zrender/shape/Polygon").prototype.buildPath(t, i)
+                  }
+                },
+                    a.inherits(t, i),
+                    t
+              }),
+          i("echarts/chart/bar", ["require", "./base", "zrender/shape/Rectangle", "../component/axis", "../component/grid", "../component/dataZoom", "../config", "../util/ecData", "zrender/tool/util", "zrender/tool/color", "../chart"],
+              function(e) {
+                function t(e, t, n, a, o) {
+                  i.call(this, e, t, n, a, o),
+                      this.refresh(a)
+                }
+                var i = e("./base"),
+                    n = e("zrender/shape/Rectangle");
+                e("../component/axis"),
+                    e("../component/grid"),
+                    e("../component/dataZoom");
+                var a = e("../config");
+                a.bar = {
+                  zlevel: 0,
+                  z: 2,
+                  clickable: !0,
+                  legendHoverLink: !0,
+                  xAxisIndex: 0,
+                  yAxisIndex: 0,
+                  barMinHeight: 0,
+                  barGap: "30%",
+                  barCategoryGap: "20%",
+                  itemStyle: {
+                    normal: {
+                      barBorderColor: "#fff",
+                      barBorderRadius: 0,
+                      barBorderWidth: 0,
+                      label: {
+                        show: !1
+                      }
+                    },
+                    emphasis: {
+                      barBorderColor: "#fff",
+                      barBorderRadius: 0,
+                      barBorderWidth: 0,
+                      label: {
+                        show: !1
+                      }
+                    }
+                  }
+                };
+                var o = e("../util/ecData"),
+                    r = e("zrender/tool/util"),
+                    s = e("zrender/tool/color");
+                return t.prototype = {
+                  type: a.CHART_TYPE_BAR,
+                  _buildShape: function() {
+                    this._buildPosition()
+                  },
+                  _buildNormal: function(e, t, i, o, r) {
+                    for (var s, l, h, m, V, U, d, p, c, u, y, g, b = this.series,
+                             f = i[0][0], k = b[f], x = "horizontal" == r, _ = this.component.xAxis, L = this.component.yAxis, W = x ? _.getAxis(k.xAxisIndex) : L.getAxis(k.yAxisIndex), X = this._mapSize(W, i), v = X.gap, w = X.barGap, K = X.barWidthMap, I = X.barMaxWidthMap, J = X.barWidth, C = X.barMinHeightMap, S = X.interval, E = this.deepQuery([this.ecTheme, a], "island.r"), F = 0, T = t; T > F && null != W.getNameByIndex(F); F++) {
+                      x ? m = W.getCoordByIndex(F) - v / 2 : V = W.getCoordByIndex(F) + v / 2;
+                      for (var z = 0,
+                               A = i.length; A > z; z++) {
+                        var M = b[i[z][0]].yAxisIndex || 0,
+                            O = b[i[z][0]].xAxisIndex || 0;
+                        s = x ? L.getAxis(M) : _.getAxis(O),
+                            d = U = c = p = s.getCoord(0);
+                        for (var P = 0,
+                                 D = i[z].length; D > P; P++) f = i[z][P],
+                            k = b[f],
+                            y = k.data[F],
+                            g = this.getDataFromOption(y, "-"),
+                            o[f] = o[f] || {
+                              min: Number.POSITIVE_INFINITY,
+                              max: Number.NEGATIVE_INFINITY,
+                              sum: 0,
+                              counter: 0,
+                              average: 0
+                            },
+                            h = Math.min(I[f] || Number.MAX_VALUE, K[f] || J),
+                        "-" !== g && (g > 0 ? (l = P > 0 ? s.getCoordSize(g) : x ? d - s.getCoord(g) : s.getCoord(g) - d, 1 === D && C[f] > l && (l = C[f]), x ? (U -= l, V = U) : (m = U, U += l)) : 0 > g ? (l = P > 0 ? s.getCoordSize(g) : x ? s.getCoord(g) - c: c - s.getCoord(g), 1 === D && C[f] > l && (l = C[f]), x ? (V = p, p += l) : (p -= l, m = p)) : (l = 0, x ? (U -= l, V = U) : (m = U, U += l)), o[f][F] = x ? m + h / 2 : V - h / 2, o[f].min > g && (o[f].min = g, x ? (o[f].minY = V, o[f].minX = o[f][F]) : (o[f].minX = m + l, o[f].minY = o[f][F])), o[f].max < g && (o[f].max = g, x ? (o[f].maxY = V, o[f].maxX = o[f][F]) : (o[f].maxX = m + l, o[f].maxY = o[f][F])), o[f].sum += g, o[f].counter++, F % S === 0 && (u = this._getBarItem(f, F, W.getNameByIndex(F), m, V - (x ? 0 : h), x ? h: l, x ? l: h, x ? "vertical": "horizontal"), this.shapeList.push(new n(u))));
+                        for (var P = 0,
+                                 D = i[z].length; D > P; P++) f = i[z][P],
+                            k = b[f],
+                            y = k.data[F],
+                            g = this.getDataFromOption(y, "-"),
+                            h = Math.min(I[f] || Number.MAX_VALUE, K[f] || J),
+                        "-" == g && this.deepQuery([y, k, this.option], "calculable") && (x ? (U -= E, V = U) : (m = U, U += E), u = this._getBarItem(f, F, W.getNameByIndex(F), m, V - (x ? 0 : h), x ? h: E, x ? E: h, x ? "vertical": "horizontal"), u.hoverable = !1, u.draggable = !1, u.style.lineWidth = 1, u.style.brushType = "stroke", u.style.strokeColor = k.calculableHolderColor || this.ecTheme.calculableHolderColor || a.calculableHolderColor, this.shapeList.push(new n(u)));
+                        x ? m += h + w: V -= h + w
+                      }
+                    }
+                    this._calculMarkMapXY(o, i, x ? "y": "x")
+                  },
+                  _buildHorizontal: function(e, t, i, n) {
+                    return this._buildNormal(e, t, i, n, "horizontal")
+                  },
+                  _buildVertical: function(e, t, i, n) {
+                    return this._buildNormal(e, t, i, n, "vertical")
+                  },
+                  _buildOther: function(e, t, i, a) {
+                    for (var o = this.series,
+                             r = 0,
+                             s = i.length; s > r; r++) for (var l = 0,
+                                                                h = i[r].length; h > l; l++) {
+                      var m = i[r][l],
+                          V = o[m],
+                          U = V.xAxisIndex || 0,
+                          d = this.component.xAxis.getAxis(U),
+                          p = d.getCoord(0),
+                          c = V.yAxisIndex || 0,
+                          u = this.component.yAxis.getAxis(c),
+                          y = u.getCoord(0);
+                      a[m] = a[m] || {
+                        min0: Number.POSITIVE_INFINITY,
+                        min1: Number.POSITIVE_INFINITY,
+                        max0: Number.NEGATIVE_INFINITY,
+                        max1: Number.NEGATIVE_INFINITY,
+                        sum0: 0,
+                        sum1: 0,
+                        counter0: 0,
+                        counter1: 0,
+                        average0: 0,
+                        average1: 0
+                      };
+                      for (var g = 0,
+                               b = V.data.length; b > g; g++) {
+                        var f = V.data[g],
+                            k = this.getDataFromOption(f, "-");
+                        if (k instanceof Array) {
+                          var x, _, L = d.getCoord(k[0]),
+                              W = u.getCoord(k[1]),
+                              X = [f, V],
+                              v = this.deepQuery(X, "barWidth") || 10,
+                              w = this.deepQuery(X, "barHeight");
+                          null != w ? (x = "horizontal", k[0] > 0 ? (v = L - p, L -= v) : v = k[0] < 0 ? p - L: 0, _ = this._getBarItem(m, g, k[0], L, W - w / 2, v, w, x)) : (x = "vertical", k[1] > 0 ? w = y - W: k[1] < 0 ? (w = W - y, W -= w) : w = 0, _ = this._getBarItem(m, g, k[0], L - v / 2, W, v, w, x)),
+                              this.shapeList.push(new n(_)),
+                              L = d.getCoord(k[0]),
+                              W = u.getCoord(k[1]),
+                          a[m].min0 > k[0] && (a[m].min0 = k[0], a[m].minY0 = W, a[m].minX0 = L),
+                          a[m].max0 < k[0] && (a[m].max0 = k[0], a[m].maxY0 = W, a[m].maxX0 = L),
+                              a[m].sum0 += k[0],
+                              a[m].counter0++,
+                          a[m].min1 > k[1] && (a[m].min1 = k[1], a[m].minY1 = W, a[m].minX1 = L),
+                          a[m].max1 < k[1] && (a[m].max1 = k[1], a[m].maxY1 = W, a[m].maxX1 = L),
+                              a[m].sum1 += k[1],
+                              a[m].counter1++
+                        }
+                      }
+                    }
+                    this._calculMarkMapXY(a, i, "xy")
+                  },
+                  _mapSize: function(e, t, i) {
+                    var n, a, o = this._findSpecialBarSzie(t, i),
+                        r = o.barWidthMap,
+                        s = o.barMaxWidthMap,
+                        l = o.barMinHeightMap,
+                        h = o.sBarWidthCounter,
+                        m = o.sBarWidthTotal,
+                        V = o.barGap,
+                        U = o.barCategoryGap,
+                        d = 1;
+                    if (t.length != h) {
+                      if (i) n = e.getGap(),
+                          V = 0,
+                          a = +(n / t.length).toFixed(2),
+                      0 >= a && (d = Math.floor(t.length / n), a = 1);
+                      else if (n = "string" == typeof U && U.match(/%$/) ? (e.getGap() * (100 - parseFloat(U)) / 100).toFixed(2) - 0 : e.getGap() - U, "string" == typeof V && V.match(/%$/) ? (V = parseFloat(V) / 100, a = +((n - m) / ((t.length - 1) * V + t.length - h)).toFixed(2), V = a * V) : (V = parseFloat(V), a = +((n - m - V * (t.length - 1)) / (t.length - h)).toFixed(2)), 0 >= a) return this._mapSize(e, t, !0)
+                    } else if (n = h > 1 ? "string" == typeof U && U.match(/%$/) ? +(e.getGap() * (100 - parseFloat(U)) / 100).toFixed(2) : e.getGap() - U: m, a = 0, V = h > 1 ? +((n - m) / (h - 1)).toFixed(2) : 0, 0 > V) return this._mapSize(e, t, !0);
+                    return this._recheckBarMaxWidth(t, r, s, l, n, a, V, d)
+                  },
+                  _findSpecialBarSzie: function(e, t) {
+                    for (var i, n, a, o, r = this.series,
+                             s = {},
+                             l = {},
+                             h = {},
+                             m = 0,
+                             V = 0,
+                             U = 0,
+                             d = e.length; d > U; U++) for (var p = {
+                          barWidth: !1,
+                          barMaxWidth: !1
+                        },
+                                                                c = 0, u = e[U].length; u > c; c++) {
+                      var y = e[U][c],
+                          g = r[y];
+                      if (!t) {
+                        if (p.barWidth) s[y] = i;
+                        else if (i = this.query(g, "barWidth"), null != i) {
+                          s[y] = i,
+                              V += i,
+                              m++,
+                              p.barWidth = !0;
+                          for (var b = 0,
+                                   f = c; f > b; b++) {
+                            var k = e[U][b];
+                            s[k] = i
+                          }
+                        }
+                        if (p.barMaxWidth) l[y] = n;
+                        else if (n = this.query(g, "barMaxWidth"), null != n) {
+                          l[y] = n,
+                              p.barMaxWidth = !0;
+                          for (var b = 0,
+                                   f = c; f > b; b++) {
+                            var k = e[U][b];
+                            l[k] = n
+                          }
+                        }
+                      }
+                      h[y] = this.query(g, "barMinHeight"),
+                          a = null != a ? a: this.query(g, "barGap"),
+                          o = null != o ? o: this.query(g, "barCategoryGap")
+                    }
+                    return {
+                      barWidthMap: s,
+                      barMaxWidthMap: l,
+                      barMinHeightMap: h,
+                      sBarWidth: i,
+                      sBarMaxWidth: n,
+                      sBarWidthCounter: m,
+                      sBarWidthTotal: V,
+                      barGap: a,
+                      barCategoryGap: o
+                    }
+                  },
+                  _recheckBarMaxWidth: function(e, t, i, n, a, o, r, s) {
+                    for (var l = 0,
+                             h = e.length; h > l; l++) {
+                      var m = e[l][0];
+                      i[m] && i[m] < o && (a -= o - i[m])
+                    }
+                    return {
+                      barWidthMap: t,
+                      barMaxWidthMap: i,
+                      barMinHeightMap: n,
+                      gap: a,
+                      barWidth: o,
+                      barGap: r,
+                      interval: s
+                    }
+                  },
+                  _getBarItem: function(e, t, i, n, a, r, l, h) {
+                    var m, V = this.series,
+                        U = V[e],
+                        d = U.data[t],
+                        p = this._sIndex2ColorMap[e],
+                        c = [d, U],
+                        u = this.deepMerge(c, "itemStyle.normal"),
+                        y = this.deepMerge(c, "itemStyle.emphasis"),
+                        g = u.barBorderWidth;
+                    m = {
+                      zlevel: U.zlevel,
+                      z: U.z,
+                      clickable: this.deepQuery(c, "clickable"),
+                      style: {
+                        x: n,
+                        y: a,
+                        width: r,
+                        height: l,
+                        brushType: "both",
+                        color: this.getItemStyleColor(this.deepQuery(c, "itemStyle.normal.color") || p, e, t, d),
+                        radius: u.barBorderRadius,
+                        lineWidth: g,
+                        strokeColor: u.barBorderColor
+                      },
+                      highlightStyle: {
+                        color: this.getItemStyleColor(this.deepQuery(c, "itemStyle.emphasis.color"), e, t, d),
+                        radius: y.barBorderRadius,
+                        lineWidth: y.barBorderWidth,
+                        strokeColor: y.barBorderColor
+                      },
+                      _orient: h
+                    };
+                    var b = m.style;
+                    m.highlightStyle.color = m.highlightStyle.color || ("string" == typeof b.color ? s.lift(b.color, -.3) : b.color),
+                        b.x = Math.floor(b.x),
+                        b.y = Math.floor(b.y),
+                        b.height = Math.ceil(b.height),
+                        b.width = Math.ceil(b.width),
+                        g > 0 && b.height > g && b.width > g ? (b.y += g / 2, b.height -= g, b.x += g / 2, b.width -= g) : b.brushType = "fill",
+                        m.highlightStyle.textColor = m.highlightStyle.color,
+                        m = this.addLabel(m, U, d, i, h);
+                    for (var f = [b, m.highlightStyle], k = 0, x = f.length; x > k; k++) {
+                      var _ = f[k].textPosition;
+                      if ("insideLeft" === _ || "insideRight" === _ || "insideTop" === _ || "insideBottom" === _) {
+                        var L = 5;
+                        switch (_) {
+                          case "insideLeft":
+                            f[k].textX = b.x + L,
+                                f[k].textY = b.y + b.height / 2,
+                                f[k].textAlign = "left",
+                                f[k].textBaseline = "middle";
+                            break;
+                          case "insideRight":
+                            f[k].textX = b.x + b.width - L,
+                                f[k].textY = b.y + b.height / 2,
+                                f[k].textAlign = "right",
+                                f[k].textBaseline = "middle";
+                            break;
+                          case "insideTop":
+                            f[k].textX = b.x + b.width / 2,
+                                f[k].textY = b.y + L / 2,
+                                f[k].textAlign = "center",
+                                f[k].textBaseline = "top";
+                            break;
+                          case "insideBottom":
+                            f[k].textX = b.x + b.width / 2,
+                                f[k].textY = b.y + b.height - L / 2,
+                                f[k].textAlign = "center",
+                                f[k].textBaseline = "bottom"
+                        }
+                        f[k].textPosition = "specific",
+                            f[k].textColor = f[k].textColor || "#fff"
+                      }
+                    }
+                    return this.deepQuery([d, U, this.option], "calculable") && (this.setCalculable(m), m.draggable = !0),
+                        o.pack(m, V[e], e, V[e].data[t], t, i),
+                        m
+                  },
+                  getMarkCoord: function(e, t) {
+                    var i, n, a = this.series[e],
+                        o = this.xMarkMap[e],
+                        r = this.component.xAxis.getAxis(a.xAxisIndex),
+                        s = this.component.yAxis.getAxis(a.yAxisIndex);
+                    if (!t.type || "max" !== t.type && "min" !== t.type && "average" !== t.type) if (o.isHorizontal) {
+                      i = "string" == typeof t.xAxis && r.getIndexByName ? r.getIndexByName(t.xAxis) : t.xAxis || 0;
+                      var l = o[i];
+                      l = null != l ? l: "string" != typeof t.xAxis && r.getCoordByIndex ? r.getCoordByIndex(t.xAxis || 0) : r.getCoord(t.xAxis || 0),
+                          n = [l, s.getCoord(t.yAxis || 0)]
+                    } else {
+                      i = "string" == typeof t.yAxis && s.getIndexByName ? s.getIndexByName(t.yAxis) : t.yAxis || 0;
+                      var h = o[i];
+                      h = null != h ? h: "string" != typeof t.yAxis && s.getCoordByIndex ? s.getCoordByIndex(t.yAxis || 0) : s.getCoord(t.yAxis || 0),
+                          n = [r.getCoord(t.xAxis || 0), h]
+                    } else {
+                      var m = null != t.valueIndex ? t.valueIndex: null != o.maxX0 ? "1": "";
+                      n = [o[t.type + "X" + m], o[t.type + "Y" + m], o[t.type + "Line" + m], o[t.type + m]]
+                    }
+                    return n
+                  },
+                  refresh: function(e) {
+                    e && (this.option = e, this.series = e.series),
+                        this.backupShapeList(),
+                        this._buildShape()
+                  },
+                  addDataAnimation: function(e, t) {
+                    function i() {
+                      c--,
+                      0 === c && t && t()
+                    }
+                    for (var n = this.series,
+                             a = {},
+                             r = 0,
+                             s = e.length; s > r; r++) a[e[r][0]] = e[r];
+                    for (var l, h, m, V, U, d, p, c = 0,
+                             r = this.shapeList.length - 1; r >= 0; r--) if (d = o.get(this.shapeList[r], "seriesIndex"), a[d] && !a[d][3] && "rectangle" === this.shapeList[r].type) {
+                      if (p = o.get(this.shapeList[r], "dataIndex"), U = n[d], a[d][2] && p === U.data.length - 1) {
+                        this.zr.delShape(this.shapeList[r].id);
+                        continue
+                      }
+                      if (!a[d][2] && 0 === p) {
+                        this.zr.delShape(this.shapeList[r].id);
+                        continue
+                      }
+                      "horizontal" === this.shapeList[r]._orient ? (V = this.component.yAxis.getAxis(U.yAxisIndex || 0).getGap(), m = a[d][2] ? -V: V, l = 0) : (h = this.component.xAxis.getAxis(U.xAxisIndex || 0).getGap(), l = a[d][2] ? h: -h, m = 0),
+                          this.shapeList[r].position = [0, 0],
+                          c++,
+                          this.zr.animate(this.shapeList[r].id, "").when(this.query(this.option, "animationDurationUpdate"), {
+                            position: [l, m]
+                          }).done(i).start()
+                    }
+                    c || t && t()
+                  }
+                },
+                    r.inherits(t, i),
+                    e("../chart").define("bar", t),
+                    t
+              }),
+          i("echarts/chart/scatter", ["require", "./base", "../util/shape/Symbol", "../component/axis", "../component/grid", "../component/dataZoom", "../component/dataRange", "../config", "zrender/tool/util", "zrender/tool/color", "../chart"],
+              function(e) {
+                function t(e, t, n, a, o) {
+                  i.call(this, e, t, n, a, o),
+                      this.refresh(a)
+                }
+                var i = e("./base"),
+                    n = e("../util/shape/Symbol");
+                e("../component/axis"),
+                    e("../component/grid"),
+                    e("../component/dataZoom"),
+                    e("../component/dataRange");
+                var a = e("../config");
+                a.scatter = {
+                  zlevel: 0,
+                  z: 2,
+                  clickable: !0,
+                  legendHoverLink: !0,
+                  xAxisIndex: 0,
+                  yAxisIndex: 0,
+                  symbolSize: 4,
+                  large: !1,
+                  largeThreshold: 2e3,
+                  itemStyle: {
+                    normal: {
+                      label: {
+                        show: !1
+                      }
+                    },
+                    emphasis: {
+                      label: {
+                        show: !1
+                      }
+                    }
+                  }
+                };
+                var o = e("zrender/tool/util"),
+                    r = e("zrender/tool/color");
+                return t.prototype = {
+                  type: a.CHART_TYPE_SCATTER,
+                  _buildShape: function() {
+                    var e = this.series;
+                    this._sIndex2ColorMap = {},
+                        this._symbol = this.option.symbolList,
+                        this._sIndex2ShapeMap = {},
+                        this.selectedMap = {},
+                        this.xMarkMap = {};
+                    for (var t, i, n, o, s = this.component.legend,
+                             l = [], h = 0, m = e.length; m > h; h++) if (t = e[h], i = t.name, t.type === a.CHART_TYPE_SCATTER) {
+                      if (e[h] = this.reformOption(e[h]), this.legendHoverLink = e[h].legendHoverLink || this.legendHoverLink, this._sIndex2ShapeMap[h] = this.query(t, "symbol") || this._symbol[h % this._symbol.length], s) {
+                        if (this.selectedMap[i] = s.isSelected(i), this._sIndex2ColorMap[h] = r.alpha(s.getColor(i), .5), n = s.getItemShape(i)) {
+                          var o = this._sIndex2ShapeMap[h];
+                          n.style.brushType = o.match("empty") ? "stroke": "both",
+                              o = o.replace("empty", "").toLowerCase(),
+                          o.match("rectangle") && (n.style.x += Math.round((n.style.width - n.style.height) / 2), n.style.width = n.style.height),
+                          o.match("star") && (n.style.n = o.replace("star", "") - 0 || 5, o = "star"),
+                          o.match("image") && (n.style.image = o.replace(new RegExp("^image:\\/\\/"), ""), n.style.x += Math.round((n.style.width - n.style.height) / 2), n.style.width = n.style.height, o = "image"),
+                              n.style.iconType = o,
+                              s.setItemShape(i, n)
+                        }
+                      } else this.selectedMap[i] = !0,
+                          this._sIndex2ColorMap[h] = r.alpha(this.zr.getColor(h), .5);
+                      this.selectedMap[i] && l.push(h)
+                    }
+                    this._buildSeries(l),
+                        this.addShapeList()
+                  },
+                  _buildSeries: function(e) {
+                    if (0 !== e.length) {
+                      for (var t, i, n, a, o, r, s, l, h = this.series,
+                               m = {},
+                               V = 0,
+                               U = e.length; U > V; V++) if (t = e[V], i = h[t], 0 !== i.data.length) {
+                        o = this.component.xAxis.getAxis(i.xAxisIndex || 0),
+                            r = this.component.yAxis.getAxis(i.yAxisIndex || 0),
+                            m[t] = [];
+                        for (var d = 0,
+                                 p = i.data.length; p > d; d++) n = i.data[d],
+                            a = this.getDataFromOption(n, "-"),
+                        "-" === a || a.length < 2 || (s = o.getCoord(a[0]), l = r.getCoord(a[1]), m[t].push([s, l, d, n.name || ""]));
+                        this.xMarkMap[t] = this._markMap(o, r, i.data, m[t]),
+                            this.buildMark(t)
+                      }
+                      this._buildPointList(m)
+                    }
+                  },
+                  _markMap: function(e, t, i, n) {
+                    for (var a, o = {
+                          min0: Number.POSITIVE_INFINITY,
+                          max0: Number.NEGATIVE_INFINITY,
+                          sum0: 0,
+                          counter0: 0,
+                          average0: 0,
+                          min1: Number.POSITIVE_INFINITY,
+                          max1: Number.NEGATIVE_INFINITY,
+                          sum1: 0,
+                          counter1: 0,
+                          average1: 0
+                        },
+                             r = 0, s = n.length; s > r; r++) a = i[n[r][2]].value || i[n[r][2]],
+                    o.min0 > a[0] && (o.min0 = a[0], o.minY0 = n[r][1], o.minX0 = n[r][0]),
+                    o.max0 < a[0] && (o.max0 = a[0], o.maxY0 = n[r][1], o.maxX0 = n[r][0]),
+                        o.sum0 += a[0],
+                        o.counter0++,
+                    o.min1 > a[1] && (o.min1 = a[1], o.minY1 = n[r][1], o.minX1 = n[r][0]),
+                    o.max1 < a[1] && (o.max1 = a[1], o.maxY1 = n[r][1], o.maxX1 = n[r][0]),
+                        o.sum1 += a[1],
+                        o.counter1++;
+                    var l = this.component.grid.getX(),
+                        h = this.component.grid.getXend(),
+                        m = this.component.grid.getY(),
+                        V = this.component.grid.getYend();
+                    o.average0 = o.sum0 / o.counter0;
+                    var U = e.getCoord(o.average0);
+                    o.averageLine0 = [[U, V], [U, m]],
+                        o.minLine0 = [[o.minX0, V], [o.minX0, m]],
+                        o.maxLine0 = [[o.maxX0, V], [o.maxX0, m]],
+                        o.average1 = o.sum1 / o.counter1;
+                    var d = t.getCoord(o.average1);
+                    return o.averageLine1 = [[l, d], [h, d]],
+                        o.minLine1 = [[l, o.minY1], [h, o.minY1]],
+                        o.maxLine1 = [[l, o.maxY1], [h, o.maxY1]],
+                        o
+                  },
+                  _buildPointList: function(e) {
+                    var t, i, n, a, o = this.series;
+                    for (var r in e) if (t = o[r], i = e[r], t.large && t.data.length > t.largeThreshold) this.shapeList.push(this._getLargeSymbol(t, i, this.getItemStyleColor(this.query(t, "itemStyle.normal.color"), r, -1) || this._sIndex2ColorMap[r]));
+                    else for (var s = 0,
+                                  l = i.length; l > s; s++) n = i[s],
+                          a = this._getSymbol(r, n[2], n[3], n[0], n[1]),
+                      a && this.shapeList.push(a)
+                  },
+                  _getSymbol: function(e, t, i, n, a) {
+                    var o, r = this.series,
+                        s = r[e],
+                        l = s.data[t],
+                        h = this.component.dataRange;
+                    if (h) {
+                      if (o = isNaN(l[2]) ? this._sIndex2ColorMap[e] : h.getColor(l[2]), !o) return null
+                    } else o = this._sIndex2ColorMap[e];
+                    var m = this.getSymbolShape(s, e, l, t, i, n, a, this._sIndex2ShapeMap[e], o, "rgba(0,0,0,0)", "vertical");
+                    return m.zlevel = s.zlevel,
+                        m.z = s.z,
+                        m._main = !0,
+                        m
+                  },
+                  _getLargeSymbol: function(e, t, i) {
+                    return new n({
+                      zlevel: e.zlevel,
+                      z: e.z,
+                      _main: !0,
+                      hoverable: !1,
+                      style: {
+                        pointList: t,
+                        color: i,
+                        strokeColor: i
+                      },
+                      highlightStyle: {
+                        pointList: []
+                      }
+                    })
+                  },
+                  getMarkCoord: function(e, t) {
+                    var i, n = this.series[e],
+                        a = this.xMarkMap[e],
+                        o = this.component.xAxis.getAxis(n.xAxisIndex),
+                        r = this.component.yAxis.getAxis(n.yAxisIndex);
+                    if (!t.type || "max" !== t.type && "min" !== t.type && "average" !== t.type) i = ["string" != typeof t.xAxis && o.getCoordByIndex ? o.getCoordByIndex(t.xAxis || 0) : o.getCoord(t.xAxis || 0), "string" != typeof t.yAxis && r.getCoordByIndex ? r.getCoordByIndex(t.yAxis || 0) : r.getCoord(t.yAxis || 0)];
+                    else {
+                      var s = null != t.valueIndex ? t.valueIndex: 1;
+                      i = [a[t.type + "X" + s], a[t.type + "Y" + s], a[t.type + "Line" + s], a[t.type + s]]
+                    }
+                    return i
+                  },
+                  refresh: function(e) {
+                    e && (this.option = e, this.series = e.series),
+                        this.backupShapeList(),
+                        this._buildShape()
+                  },
+                  ondataRange: function(e, t) {
+                    this.component.dataRange && (this.refresh(), t.needRefresh = !0)
+                  }
+                },
+                    o.inherits(t, i),
+                    e("../chart").define("scatter", t),
+                    t
+              }),
+          i("echarts/component/dataRange", ["require", "./base", "zrender/shape/Text", "zrender/shape/Rectangle", "../util/shape/HandlePolygon", "../config", "zrender/tool/util", "zrender/tool/event", "zrender/tool/area", "zrender/tool/color", "../component"],
+              function(e) {
+                function t(e, t, n, a, o) {
+                  i.call(this, e, t, n, a, o);
+                  var s = this;
+                  s._ondrift = function(e, t) {
+                    return s.__ondrift(this, e, t)
+                  },
+                      s._ondragend = function() {
+                        return s.__ondragend()
+                      },
+                      s._dataRangeSelected = function(e) {
+                        return s.__dataRangeSelected(e)
+                      },
+                      s._dispatchHoverLink = function(e) {
+                        return s.__dispatchHoverLink(e)
+                      },
+                      s._onhoverlink = function(e) {
+                        return s.__onhoverlink(e);
+
+                      },
+                      this._selectedMap = {},
+                      this._range = {},
+                      this.refresh(a),
+                      t.bind(r.EVENT.HOVER, this._onhoverlink)
+                }
+                var i = e("./base"),
+                    n = e("zrender/shape/Text"),
+                    a = e("zrender/shape/Rectangle"),
+                    o = e("../util/shape/HandlePolygon"),
+                    r = e("../config");
+                r.dataRange = {
+                  zlevel: 0,
+                  z: 4,
+                  show: !0,
+                  orient: "vertical",
+                  x: "left",
+                  y: "bottom",
+                  backgroundColor: "rgba(0,0,0,0)",
+                  borderColor: "#ccc",
+                  borderWidth: 0,
+                  padding: 5,
+                  itemGap: 10,
+                  itemWidth: 20,
+                  itemHeight: 14,
+                  precision: 0,
+                  splitNumber: 5,
+                  splitList: null,
+                  calculable: !1,
+                  selectedMode: !0,
+                  hoverLink: !0,
+                  realtime: !0,
+                  color: ["#006edd", "#e0ffff"],
+                  textStyle: {
+                    color: "#333"
+                  }
+                };
+                var s = e("zrender/tool/util"),
+                    l = e("zrender/tool/event"),
+                    h = e("zrender/tool/area"),
+                    m = e("zrender/tool/color");
+                return t.prototype = {
+                  type: r.COMPONENT_TYPE_DATARANGE,
+                  _textGap: 10,
+                  _buildShape: function() {
+                    if (this._itemGroupLocation = this._getItemGroupLocation(), this._buildBackground(), this._isContinuity() ? this._buildGradient() : this._buildItem(), this.dataRangeOption.show) for (var e = 0,
+                                                                                                                                                                                                               t = this.shapeList.length; t > e; e++) this.zr.addShape(this.shapeList[e]);
+                    this._syncShapeFromRange()
+                  },
+                  _buildItem: function() {
+                    var e, t, i, o, r = this._valueTextList,
+                        s = r.length,
+                        l = this.getFont(this.dataRangeOption.textStyle),
+                        m = this._itemGroupLocation.x,
+                        V = this._itemGroupLocation.y,
+                        U = this.dataRangeOption.itemWidth,
+                        d = this.dataRangeOption.itemHeight,
+                        p = this.dataRangeOption.itemGap,
+                        c = h.getTextHeight("国", l);
+                    "vertical" == this.dataRangeOption.orient && "right" == this.dataRangeOption.x && (m = this._itemGroupLocation.x + this._itemGroupLocation.width - U);
+                    var u = !0;
+                    this.dataRangeOption.text && (u = !1, this.dataRangeOption.text[0] && (i = this._getTextShape(m, V, this.dataRangeOption.text[0]), "horizontal" == this.dataRangeOption.orient ? m += h.getTextWidth(this.dataRangeOption.text[0], l) + this._textGap: (V += c + this._textGap, i.style.y += c / 2 + this._textGap, i.style.textBaseline = "bottom"), this.shapeList.push(new n(i))));
+                    for (var y = 0; s > y; y++) e = r[y],
+                        o = this.getColorByIndex(y),
+                        t = this._getItemShape(m, V, U, d, this._selectedMap[y] ? o: "#ccc"),
+                        t._idx = y,
+                        t.onmousemove = this._dispatchHoverLink,
+                    this.dataRangeOption.selectedMode && (t.clickable = !0, t.onclick = this._dataRangeSelected),
+                        this.shapeList.push(new a(t)),
+                    u && (i = {
+                      zlevel: this.getZlevelBase(),
+                      z: this.getZBase(),
+                      style: {
+                        x: m + U + 5,
+                        y: V,
+                        color: this._selectedMap[y] ? this.dataRangeOption.textStyle.color: "#ccc",
+                        text: r[y],
+                        textFont: l,
+                        textBaseline: "top"
+                      },
+                      highlightStyle: {
+                        brushType: "fill"
+                      }
+                    },
+                    "vertical" == this.dataRangeOption.orient && "right" == this.dataRangeOption.x && (i.style.x -= U + 10, i.style.textAlign = "right"), i._idx = y, i.onmousemove = this._dispatchHoverLink, this.dataRangeOption.selectedMode && (i.clickable = !0, i.onclick = this._dataRangeSelected), this.shapeList.push(new n(i))),
+                        "horizontal" == this.dataRangeOption.orient ? m += U + (u ? 5 : 0) + (u ? h.getTextWidth(e, l) : 0) + p: V += d + p; ! u && this.dataRangeOption.text[1] && ("horizontal" == this.dataRangeOption.orient ? m = m - p + this._textGap: V = V - p + this._textGap, i = this._getTextShape(m, V, this.dataRangeOption.text[1]), "horizontal" != this.dataRangeOption.orient && (i.style.y -= 5, i.style.textBaseline = "top"), this.shapeList.push(new n(i)))
+                  },
+                  _buildGradient: function() {
+                    var t, i, o = this.getFont(this.dataRangeOption.textStyle),
+                        r = this._itemGroupLocation.x,
+                        s = this._itemGroupLocation.y,
+                        l = this.dataRangeOption.itemWidth,
+                        m = this.dataRangeOption.itemHeight,
+                        V = h.getTextHeight("国", o),
+                        U = 10,
+                        d = !0;
+                    this.dataRangeOption.text && (d = !1, this.dataRangeOption.text[0] && (i = this._getTextShape(r, s, this.dataRangeOption.text[0]), "horizontal" == this.dataRangeOption.orient ? r += h.getTextWidth(this.dataRangeOption.text[0], o) + this._textGap: (s += V + this._textGap, i.style.y += V / 2 + this._textGap, i.style.textBaseline = "bottom"), this.shapeList.push(new n(i))));
+                    for (var p = e("zrender/tool/color"), c = 1 / (this.dataRangeOption.color.length - 1), u = [], y = 0, g = this.dataRangeOption.color.length; g > y; y++) u.push([y * c, this.dataRangeOption.color[y]]);
+                    "horizontal" == this.dataRangeOption.orient ? (t = {
+                      zlevel: this.getZlevelBase(),
+                      z: this.getZBase(),
+                      style: {
+                        x: r,
+                        y: s,
+                        width: l * U,
+                        height: m,
+                        color: p.getLinearGradient(r, s, r + l * U, s, u)
+                      },
+                      hoverable: !1
+                    },
+                        r += l * U + this._textGap) : (t = {
+                      zlevel: this.getZlevelBase(),
+                      z: this.getZBase(),
+                      style: {
+                        x: r,
+                        y: s,
+                        width: l,
+                        height: m * U,
+                        color: p.getLinearGradient(r, s, r, s + m * U, u)
+                      },
+                      hoverable: !1
+                    },
+                        s += m * U + this._textGap),
+                        this.shapeList.push(new a(t)),
+                        this._calculableLocation = t.style,
+                    this.dataRangeOption.calculable && (this._buildFiller(), this._bulidMask(), this._bulidHandle()),
+                        this._buildIndicator(),
+                    !d && this.dataRangeOption.text[1] && (i = this._getTextShape(r, s, this.dataRangeOption.text[1]), this.shapeList.push(new n(i)))
+                  },
+                  _buildIndicator: function() {
+                    var e, t, i = this._calculableLocation.x,
+                        n = this._calculableLocation.y,
+                        a = this._calculableLocation.width,
+                        r = this._calculableLocation.height,
+                        s = 5;
+                    "horizontal" == this.dataRangeOption.orient ? "bottom" != this.dataRangeOption.y ? (e = [[i, n + r], [i - s, n + r + s], [i + s, n + r + s]], t = "bottom") : (e = [[i, n], [i - s, n - s], [i + s, n - s]], t = "top") : "right" != this.dataRangeOption.x ? (e = [[i + a, n], [i + a + s, n - s], [i + a + s, n + s]], t = "right") : (e = [[i, n], [i - s, n - s], [i - s, n + s]], t = "left"),
+                        this._indicatorShape = {
+                          style: {
+                            pointList: e,
+                            color: "#fff",
+                            __rect: {
+                              x: Math.min(e[0][0], e[1][0]),
+                              y: Math.min(e[0][1], e[1][1]),
+                              width: s * ("horizontal" == this.dataRangeOption.orient ? 2 : 1),
+                              height: s * ("horizontal" == this.dataRangeOption.orient ? 1 : 2)
+                            }
+                          },
+                          highlightStyle: {
+                            brushType: "fill",
+                            textPosition: t,
+                            textColor: this.dataRangeOption.textStyle.color
+                          },
+                          hoverable: !1
+                        },
+                        this._indicatorShape = new o(this._indicatorShape)
+                  },
+                  _buildFiller: function() {
+                    this._fillerShape = {
+                      zlevel: this.getZlevelBase(),
+                      z: this.getZBase() + 1,
+                      style: {
+                        x: this._calculableLocation.x,
+                        y: this._calculableLocation.y,
+                        width: this._calculableLocation.width,
+                        height: this._calculableLocation.height,
+                        color: "rgba(255,255,255,0)"
+                      },
+                      highlightStyle: {
+                        strokeColor: "rgba(255,255,255,0.5)",
+                        lineWidth: 1
+                      },
+                      draggable: !0,
+                      ondrift: this._ondrift,
+                      ondragend: this._ondragend,
+                      onmousemove: this._dispatchHoverLink,
+                      _type: "filler"
+                    },
+                        this._fillerShape = new a(this._fillerShape),
+                        this.shapeList.push(this._fillerShape)
+                  },
+                  _bulidHandle: function() {
+                    var e, t, i, n, a, r, s, l, m = this._calculableLocation.x,
+                        V = this._calculableLocation.y,
+                        U = this._calculableLocation.width,
+                        d = this._calculableLocation.height,
+                        p = this.getFont(this.dataRangeOption.textStyle),
+                        c = h.getTextHeight("国", p),
+                        u = Math.max(h.getTextWidth(this._textFormat(this.dataRangeOption.max), p), h.getTextWidth(this._textFormat(this.dataRangeOption.min), p)) + 2;
+                    "horizontal" == this.dataRangeOption.orient ? "bottom" != this.dataRangeOption.y ? (e = [[m, V], [m, V + d + c], [m - c, V + d + c], [m - 1, V + d], [m - 1, V]], t = m - u / 2 - c, i = V + d + c / 2 + 2, n = {
+                      x: m - u - c,
+                      y: V + d,
+                      width: u + c,
+                      height: c
+                    },
+                        a = [[m + U, V], [m + U, V + d + c], [m + U + c, V + d + c], [m + U + 1, V + d], [m + U + 1, V]], r = m + U + u / 2 + c, s = i, l = {
+                      x: m + U,
+                      y: V + d,
+                      width: u + c,
+                      height: c
+                    }) : (e = [[m, V + d], [m, V - c], [m - c, V - c], [m - 1, V], [m - 1, V + d]], t = m - u / 2 - c, i = V - c / 2 - 2, n = {
+                      x: m - u - c,
+                      y: V - c,
+                      width: u + c,
+                      height: c
+                    },
+                        a = [[m + U, V + d], [m + U, V - c], [m + U + c, V - c], [m + U + 1, V], [m + U + 1, V + d]], r = m + U + u / 2 + c, s = i, l = {
+                      x: m + U,
+                      y: V - c,
+                      width: u + c,
+                      height: c
+                    }) : (u += c, "right" != this.dataRangeOption.x ? (e = [[m, V], [m + U + c, V], [m + U + c, V - c], [m + U, V - 1], [m, V - 1]], t = m + U + u / 2 + c / 2, i = V - c / 2, n = {
+                      x: m + U,
+                      y: V - c,
+                      width: u + c,
+                      height: c
+                    },
+                        a = [[m, V + d], [m + U + c, V + d], [m + U + c, V + c + d], [m + U, V + 1 + d], [m, V + d + 1]], r = t, s = V + d + c / 2, l = {
+                      x: m + U,
+                      y: V + d,
+                      width: u + c,
+                      height: c
+                    }) : (e = [[m + U, V], [m - c, V], [m - c, V - c], [m, V - 1], [m + U, V - 1]], t = m - u / 2 - c / 2, i = V - c / 2, n = {
+                      x: m - u - c,
+                      y: V - c,
+                      width: u + c,
+                      height: c
+                    },
+                        a = [[m + U, V + d], [m - c, V + d], [m - c, V + c + d], [m, V + 1 + d], [m + U, V + d + 1]], r = t, s = V + d + c / 2, l = {
+                      x: m - u - c,
+                      y: V + d,
+                      width: u + c,
+                      height: c
+                    })),
+                        this._startShape = {
+                          style: {
+                            pointList: e,
+                            text: this._textFormat(this.dataRangeOption.max),
+                            textX: t,
+                            textY: i,
+                            textFont: p,
+                            color: this.getColor(this.dataRangeOption.max),
+                            rect: n,
+                            x: e[0][0],
+                            y: e[0][1],
+                            _x: e[0][0],
+                            _y: e[0][1]
+                          }
+                        },
+                        this._startShape.highlightStyle = {
+                          strokeColor: this._startShape.style.color,
+                          lineWidth: 1
+                        },
+                        this._endShape = {
+                          style: {
+                            pointList: a,
+                            text: this._textFormat(this.dataRangeOption.min),
+                            textX: r,
+                            textY: s,
+                            textFont: p,
+                            color: this.getColor(this.dataRangeOption.min),
+                            rect: l,
+                            x: a[0][0],
+                            y: a[0][1],
+                            _x: a[0][0],
+                            _y: a[0][1]
+                          }
+                        },
+                        this._endShape.highlightStyle = {
+                          strokeColor: this._endShape.style.color,
+                          lineWidth: 1
+                        },
+                        this._startShape.zlevel = this._endShape.zlevel = this.getZlevelBase(),
+                        this._startShape.z = this._endShape.z = this.getZBase() + 1,
+                        this._startShape.draggable = this._endShape.draggable = !0,
+                        this._startShape.ondrift = this._endShape.ondrift = this._ondrift,
+                        this._startShape.ondragend = this._endShape.ondragend = this._ondragend,
+                        this._startShape.style.textColor = this._endShape.style.textColor = this.dataRangeOption.textStyle.color,
+                        this._startShape.style.textAlign = this._endShape.style.textAlign = "center",
+                        this._startShape.style.textPosition = this._endShape.style.textPosition = "specific",
+                        this._startShape.style.textBaseline = this._endShape.style.textBaseline = "middle",
+                        this._startShape.style.width = this._endShape.style.width = 0,
+                        this._startShape.style.height = this._endShape.style.height = 0,
+                        this._startShape.style.textPosition = this._endShape.style.textPosition = "specific",
+                        this._startShape = new o(this._startShape),
+                        this._endShape = new o(this._endShape),
+                        this.shapeList.push(this._startShape),
+                        this.shapeList.push(this._endShape)
+                  },
+                  _bulidMask: function() {
+                    var e = this._calculableLocation.x,
+                        t = this._calculableLocation.y,
+                        i = this._calculableLocation.width,
+                        n = this._calculableLocation.height;
+                    this._startMask = {
+                      zlevel: this.getZlevelBase(),
+                      z: this.getZBase() + 1,
+                      style: {
+                        x: e,
+                        y: t,
+                        width: "horizontal" == this.dataRangeOption.orient ? 0 : i,
+                        height: "horizontal" == this.dataRangeOption.orient ? n: 0,
+                        color: "#ccc"
+                      },
+                      hoverable: !1
+                    },
+                        this._endMask = {
+                          zlevel: this.getZlevelBase(),
+                          z: this.getZBase() + 1,
+                          style: {
+                            x: "horizontal" == this.dataRangeOption.orient ? e + i: e,
+                            y: "horizontal" == this.dataRangeOption.orient ? t: t + n,
+                            width: "horizontal" == this.dataRangeOption.orient ? 0 : i,
+                            height: "horizontal" == this.dataRangeOption.orient ? n: 0,
+                            color: "#ccc"
+                          },
+                          hoverable: !1
+                        },
+                        this._startMask = new a(this._startMask),
+                        this._endMask = new a(this._endMask),
+                        this.shapeList.push(this._startMask),
+                        this.shapeList.push(this._endMask)
+                  },
+                  _buildBackground: function() {
+                    var e = this.reformCssArray(this.dataRangeOption.padding);
+                    this.shapeList.push(new a({
+                      zlevel: this.getZlevelBase(),
+                      z: this.getZBase(),
+                      hoverable: !1,
+                      style: {
+                        x: this._itemGroupLocation.x - e[3],
+                        y: this._itemGroupLocation.y - e[0],
+                        width: this._itemGroupLocation.width + e[3] + e[1],
+                        height: this._itemGroupLocation.height + e[0] + e[2],
+                        brushType: 0 === this.dataRangeOption.borderWidth ? "fill": "both",
+                        color: this.dataRangeOption.backgroundColor,
+                        strokeColor: this.dataRangeOption.borderColor,
+                        lineWidth: this.dataRangeOption.borderWidth
+                      }
+                    }))
+                  },
+                  _getItemGroupLocation: function() {
+                    var e = this._valueTextList,
+                        t = e.length,
+                        i = this.dataRangeOption.itemGap,
+                        n = this.dataRangeOption.itemWidth,
+                        a = this.dataRangeOption.itemHeight,
+                        o = 0,
+                        r = 0,
+                        s = this.getFont(this.dataRangeOption.textStyle),
+                        l = h.getTextHeight("国", s),
+                        m = 10;
+                    if ("horizontal" == this.dataRangeOption.orient) {
+                      if (this.dataRangeOption.text || this._isContinuity()) o = (this._isContinuity() ? n * m + i: t * (n + i)) + (this.dataRangeOption.text && "undefined" != typeof this.dataRangeOption.text[0] ? h.getTextWidth(this.dataRangeOption.text[0], s) + this._textGap: 0) + (this.dataRangeOption.text && "undefined" != typeof this.dataRangeOption.text[1] ? h.getTextWidth(this.dataRangeOption.text[1], s) + this._textGap: 0);
+                      else {
+                        n += 5;
+                        for (var V = 0; t > V; V++) o += n + h.getTextWidth(e[V], s) + i
+                      }
+                      o -= i,
+                          r = Math.max(l, a)
+                    } else {
+                      var U;
+                      if (this.dataRangeOption.text || this._isContinuity()) r = (this._isContinuity() ? a * m + i: t * (a + i)) + (this.dataRangeOption.text && "undefined" != typeof this.dataRangeOption.text[0] ? this._textGap + l: 0) + (this.dataRangeOption.text && "undefined" != typeof this.dataRangeOption.text[1] ? this._textGap + l: 0),
+                          U = Math.max(h.getTextWidth(this.dataRangeOption.text && this.dataRangeOption.text[0] || "", s), h.getTextWidth(this.dataRangeOption.text && this.dataRangeOption.text[1] || "", s)),
+                          o = Math.max(n, U);
+                      else {
+                        r = (a + i) * t,
+                            n += 5,
+                            U = 0;
+                        for (var V = 0; t > V; V++) U = Math.max(U, h.getTextWidth(e[V], s));
+                        o = n + U
+                      }
+                      r -= i
+                    }
+                    var d, p = this.reformCssArray(this.dataRangeOption.padding),
+                        c = this.zr.getWidth();
+                    switch (this.dataRangeOption.x) {
+                      case "center":
+                        d = Math.floor((c - o) / 2);
+                        break;
+                      case "left":
+                        d = p[3] + this.dataRangeOption.borderWidth;
+                        break;
+                      case "right":
+                        d = c - o - p[1] - this.dataRangeOption.borderWidth;
+                        break;
+                      default:
+                        d = this.parsePercent(this.dataRangeOption.x, c),
+                            d = isNaN(d) ? 0 : d
+                    }
+                    var u, y = this.zr.getHeight();
+                    switch (this.dataRangeOption.y) {
+                      case "top":
+                        u = p[0] + this.dataRangeOption.borderWidth;
+                        break;
+                      case "bottom":
+                        u = y - r - p[2] - this.dataRangeOption.borderWidth;
+                        break;
+                      case "center":
+                        u = Math.floor((y - r) / 2);
+                        break;
+                      default:
+                        u = this.parsePercent(this.dataRangeOption.y, y),
+                            u = isNaN(u) ? 0 : u
+                    }
+                    if (this.dataRangeOption.calculable) {
+                      var g = Math.max(h.getTextWidth(this.dataRangeOption.max, s), h.getTextWidth(this.dataRangeOption.min, s)) + l;
+                      "horizontal" == this.dataRangeOption.orient ? (g > d && (d = g), d + o + g > c && (d -= g)) : (l > u && (u = l), u + r + l > y && (u -= l))
+                    }
+                    return {
+                      x: d,
+                      y: u,
+                      width: o,
+                      height: r
+                    }
+                  },
+                  _getTextShape: function(e, t, i) {
+                    return {
+                      zlevel: this.getZlevelBase(),
+                      z: this.getZBase(),
+                      style: {
+                        x: "horizontal" == this.dataRangeOption.orient ? e: this._itemGroupLocation.x + this._itemGroupLocation.width / 2,
+                        y: "horizontal" == this.dataRangeOption.orient ? this._itemGroupLocation.y + this._itemGroupLocation.height / 2 : t,
+                        color: this.dataRangeOption.textStyle.color,
+                        text: i,
+                        textFont: this.getFont(this.dataRangeOption.textStyle),
+                        textBaseline: "horizontal" == this.dataRangeOption.orient ? "middle": "top",
+                        textAlign: "horizontal" == this.dataRangeOption.orient ? "left": "center"
+                      },
+                      hoverable: !1
+                    }
+                  },
+                  _getItemShape: function(e, t, i, n, a) {
+                    return {
+                      zlevel: this.getZlevelBase(),
+                      z: this.getZBase(),
+                      style: {
+                        x: e,
+                        y: t + 1,
+                        width: i,
+                        height: n - 2,
+                        color: a
+                      },
+                      highlightStyle: {
+                        strokeColor: a,
+                        lineWidth: 1
+                      }
+                    }
+                  },
+                  __ondrift: function(e, t, i) {
+                    var n = this._calculableLocation.x,
+                        a = this._calculableLocation.y,
+                        o = this._calculableLocation.width,
+                        r = this._calculableLocation.height;
+                    return "horizontal" == this.dataRangeOption.orient ? e.style.x + t <= n ? e.style.x = n: e.style.x + t + e.style.width >= n + o ? e.style.x = n + o - e.style.width: e.style.x += t: e.style.y + i <= a ? e.style.y = a: e.style.y + i + e.style.height >= a + r ? e.style.y = a + r - e.style.height: e.style.y += i,
+                        "filler" == e._type ? this._syncHandleShape() : this._syncFillerShape(e),
+                    this.dataRangeOption.realtime && this._dispatchDataRange(),
+                        !0
+                  },
+                  __ondragend: function() {
+                    this.isDragend = !0
+                  },
+                  ondragend: function(e, t) {
+                    this.isDragend && e.target && (t.dragOut = !0, t.dragIn = !0, this.dataRangeOption.realtime || this._dispatchDataRange(), t.needRefresh = !1, this.isDragend = !1)
+                  },
+                  _syncShapeFromRange: function() {
+                    var e = this.dataRangeOption.range || {},
+                        t = e.start,
+                        i = e.end;
+                    if (t > i && (t = [i, i = t][0]), this._range.end = null != t ? t: null != this._range.end ? this._range.end: 0, this._range.start = null != i ? i: null != this._range.start ? this._range.start: 100, 100 != this._range.start || 0 !== this._range.end) {
+                      if ("horizontal" == this.dataRangeOption.orient) {
+                        var n = this._fillerShape.style.width;
+                        this._fillerShape.style.x += n * (100 - this._range.start) / 100,
+                            this._fillerShape.style.width = n * (this._range.start - this._range.end) / 100
+                      } else {
+                        var a = this._fillerShape.style.height;
+                        this._fillerShape.style.y += a * (100 - this._range.start) / 100,
+                            this._fillerShape.style.height = a * (this._range.start - this._range.end) / 100
+                      }
+                      this.zr.modShape(this._fillerShape.id),
+                          this._syncHandleShape()
+                    }
+                  },
+                  _syncHandleShape: function() {
+                    var e = this._calculableLocation.x,
+                        t = this._calculableLocation.y,
+                        i = this._calculableLocation.width,
+                        n = this._calculableLocation.height;
+                    "horizontal" == this.dataRangeOption.orient ? (this._startShape.style.x = this._fillerShape.style.x, this._startMask.style.width = this._startShape.style.x - e, this._endShape.style.x = this._fillerShape.style.x + this._fillerShape.style.width, this._endMask.style.x = this._endShape.style.x, this._endMask.style.width = e + i - this._endShape.style.x, this._range.start = Math.ceil(100 - (this._startShape.style.x - e) / i * 100), this._range.end = Math.floor(100 - (this._endShape.style.x - e) / i * 100)) : (this._startShape.style.y = this._fillerShape.style.y, this._startMask.style.height = this._startShape.style.y - t, this._endShape.style.y = this._fillerShape.style.y + this._fillerShape.style.height, this._endMask.style.y = this._endShape.style.y, this._endMask.style.height = t + n - this._endShape.style.y, this._range.start = Math.ceil(100 - (this._startShape.style.y - t) / n * 100), this._range.end = Math.floor(100 - (this._endShape.style.y - t) / n * 100)),
+                        this._syncShape()
+                  },
+                  _syncFillerShape: function(e) {
+                    var t, i, n = this._calculableLocation.x,
+                        a = this._calculableLocation.y,
+                        o = this._calculableLocation.width,
+                        r = this._calculableLocation.height;
+                    "horizontal" == this.dataRangeOption.orient ? (t = this._startShape.style.x, i = this._endShape.style.x, e.id == this._startShape.id && t >= i ? (i = t, this._endShape.style.x = t) : e.id == this._endShape.id && t >= i && (t = i, this._startShape.style.x = t), this._fillerShape.style.x = t, this._fillerShape.style.width = i - t, this._startMask.style.width = t - n, this._endMask.style.x = i, this._endMask.style.width = n + o - i, this._range.start = Math.ceil(100 - (t - n) / o * 100), this._range.end = Math.floor(100 - (i - n) / o * 100)) : (t = this._startShape.style.y, i = this._endShape.style.y, e.id == this._startShape.id && t >= i ? (i = t, this._endShape.style.y = t) : e.id == this._endShape.id && t >= i && (t = i, this._startShape.style.y = t), this._fillerShape.style.y = t, this._fillerShape.style.height = i - t, this._startMask.style.height = t - a, this._endMask.style.y = i, this._endMask.style.height = a + r - i, this._range.start = Math.ceil(100 - (t - a) / r * 100), this._range.end = Math.floor(100 - (i - a) / r * 100)),
+                        this._syncShape()
+                  },
+                  _syncShape: function() {
+                    this._startShape.position = [this._startShape.style.x - this._startShape.style._x, this._startShape.style.y - this._startShape.style._y],
+                        this._startShape.style.text = this._textFormat(this._gap * this._range.start + this.dataRangeOption.min),
+                        this._startShape.style.color = this._startShape.highlightStyle.strokeColor = this.getColor(this._gap * this._range.start + this.dataRangeOption.min),
+                        this._endShape.position = [this._endShape.style.x - this._endShape.style._x, this._endShape.style.y - this._endShape.style._y],
+                        this._endShape.style.text = this._textFormat(this._gap * this._range.end + this.dataRangeOption.min),
+                        this._endShape.style.color = this._endShape.highlightStyle.strokeColor = this.getColor(this._gap * this._range.end + this.dataRangeOption.min),
+                        this.zr.modShape(this._startShape.id),
+                        this.zr.modShape(this._endShape.id),
+                        this.zr.modShape(this._startMask.id),
+                        this.zr.modShape(this._endMask.id),
+                        this.zr.modShape(this._fillerShape.id),
+                        this.zr.refreshNextFrame()
+                  },
+                  _dispatchDataRange: function() {
+                    this.messageCenter.dispatch(r.EVENT.DATA_RANGE, null, {
+                          range: {
+                            start: this._range.end,
+                            end: this._range.start
+                          }
+                        },
+                        this.myChart)
+                  },
+                  __dataRangeSelected: function(e) {
+                    if ("single" === this.dataRangeOption.selectedMode) for (var t in this._selectedMap) this._selectedMap[t] = !1;
+                    var i = e.target._idx;
+                    this._selectedMap[i] = !this._selectedMap[i];
+                    var n, a;
+                    this._useCustomizedSplit() ? (n = this._splitList[i].max, a = this._splitList[i].min) : (n = (this._colorList.length - i) * this._gap + this.dataRangeOption.min, a = n - this._gap),
+                        this.messageCenter.dispatch(r.EVENT.DATA_RANGE_SELECTED, e.event, {
+                              selected: this._selectedMap,
+                              target: i,
+                              valueMax: n,
+                              valueMin: a
+                            },
+                            this.myChart),
+                        this.messageCenter.dispatch(r.EVENT.REFRESH, null, null, this.myChart)
+                  },
+                  __dispatchHoverLink: function(e) {
+                    var t, i;
+                    if (this.dataRangeOption.calculable) {
+                      var n, a = this.dataRangeOption.max - this.dataRangeOption.min;
+                      n = "horizontal" == this.dataRangeOption.orient ? (1 - (l.getX(e.event) - this._calculableLocation.x) / this._calculableLocation.width) * a: (1 - (l.getY(e.event) - this._calculableLocation.y) / this._calculableLocation.height) * a,
+                          t = n - .05 * a,
+                          i = n + .05 * a
+                    } else if (this._useCustomizedSplit()) {
+                      var o = e.target._idx;
+                      i = this._splitList[o].max,
+                          t = this._splitList[o].min
+                    } else {
+                      var o = e.target._idx;
+                      i = (this._colorList.length - o) * this._gap + this.dataRangeOption.min,
+                          t = i - this._gap
+                    }
+                    this.messageCenter.dispatch(r.EVENT.DATA_RANGE_HOVERLINK, e.event, {
+                          valueMin: t,
+                          valueMax: i
+                        },
+                        this.myChart)
+                  },
+                  __onhoverlink: function(e) {
+                    if (this.dataRangeOption.show && this.dataRangeOption.hoverLink && this._indicatorShape && e && null != e.seriesIndex && null != e.dataIndex) {
+                      var t = e.value;
+                      if ("" === t || isNaN(t)) return;
+                      t < this.dataRangeOption.min ? t = this.dataRangeOption.min: t > this.dataRangeOption.max && (t = this.dataRangeOption.max),
+                          this._indicatorShape.position = "horizontal" == this.dataRangeOption.orient ? [(this.dataRangeOption.max - t) / (this.dataRangeOption.max - this.dataRangeOption.min) * this._calculableLocation.width, 0] : [0, (this.dataRangeOption.max - t) / (this.dataRangeOption.max - this.dataRangeOption.min) * this._calculableLocation.height],
+                          this._indicatorShape.style.text = this._textFormat(e.value),
+                          this._indicatorShape.style.color = this.getColor(t),
+                          this.zr.addHoverShape(this._indicatorShape)
+                    }
+                  },
+                  _textFormat: function(e, t) {
+                    var i = this.dataRangeOption;
+                    if (e !== -Number.MAX_VALUE && (e = ( + e).toFixed(i.precision)), null != t && t !== Number.MAX_VALUE && (t = ( + t).toFixed(i.precision)), i.formatter) {
+                      if ("string" == typeof i.formatter) return i.formatter.replace("{value}", e === -Number.MAX_VALUE ? "min": e).replace("{value2}", t === Number.MAX_VALUE ? "max": t);
+                      if ("function" == typeof i.formatter) return i.formatter.call(this.myChart, e, t)
+                    }
+                    return null == t ? e: e === -Number.MAX_VALUE ? "< " + t: t === Number.MAX_VALUE ? "> " + e: e + " - " + t
+                  },
+                  _isContinuity: function() {
+                    var e = this.dataRangeOption;
+                    return ! (e.splitList ? e.splitList.length > 0 : e.splitNumber > 0) || e.calculable
+                  },
+                  _useCustomizedSplit: function() {
+                    var e = this.dataRangeOption;
+                    return e.splitList && e.splitList.length > 0
+                  },
+                  _buildColorList: function(e) {
+                    if (this._colorList = m.getGradientColors(this.dataRangeOption.color, Math.max((e - this.dataRangeOption.color.length) / (this.dataRangeOption.color.length - 1), 0) + 1), this._colorList.length > e) {
+                      for (var t = this._colorList.length,
+                               i = [this._colorList[0]], n = t / (e - 1), a = 1; e - 1 > a; a++) i.push(this._colorList[Math.floor(a * n)]);
+                      i.push(this._colorList[t - 1]),
+                          this._colorList = i
+                    }
+                    if (this._useCustomizedSplit()) for (var o = this._splitList,
+                                                             a = 0,
+                                                             t = o.length; t > a; a++) o[a].color && (this._colorList[a] = o[a].color)
+                  },
+                  _buildGap: function(e) {
+                    if (!this._useCustomizedSplit()) {
+                      var t = this.dataRangeOption.precision;
+                      for (this._gap = (this.dataRangeOption.max - this.dataRangeOption.min) / e; this._gap.toFixed(t) - 0 != this._gap && 5 > t;) t++;
+                      this.dataRangeOption.precision = t,
+                          this._gap = ((this.dataRangeOption.max - this.dataRangeOption.min) / e).toFixed(t) - 0
+                    }
+                  },
+                  _buildDataList: function(e) {
+                    for (var t = this._valueTextList = [], i = this.dataRangeOption, n = this._useCustomizedSplit(), a = 0; e > a; a++) {
+                      this._selectedMap[a] = !0;
+                      var o = "";
+                      if (n) {
+                        var r = this._splitList[e - 1 - a];
+                        o = null != r.label ? r.label: null != r.single ? this._textFormat(r.single) : this._textFormat(r.min, r.max)
+                      } else o = this._textFormat(a * this._gap + i.min, (a + 1) * this._gap + i.min);
+                      t.unshift(o)
+                    }
+                  },
+                  _buildSplitList: function() {
+                    if (this._useCustomizedSplit()) for (var e = this.dataRangeOption.splitList,
+                                                             t = this._splitList = [], i = 0, n = e.length; n > i; i++) {
+                      var a = e[i];
+                      if (!a || null == a.start && null == a.end) throw new Error("Empty item exists in splitList!");
+                      var o = {
+                        label: a.label,
+                        color: a.color
+                      };
+                      o.min = a.start,
+                          o.max = a.end,
+                      o.min > o.max && (o.min = [o.max, o.max = o.min][0]),
+                      o.min === o.max && (o.single = o.max),
+                      null == o.min && (o.min = -Number.MAX_VALUE),
+                      null == o.max && (o.max = Number.MAX_VALUE),
+                          t.push(o)
+                    }
+                  },
+                  refresh: function(e) {
+                    if (e) {
+                      this.option = e,
+                          this.option.dataRange = this.reformOption(this.option.dataRange);
+                      var t = this.dataRangeOption = this.option.dataRange;
+                      if (!this._useCustomizedSplit() && (null == t.min || null == t.max)) throw new Error("option.dataRange.min or option.dataRange.max has not been defined.");
+                      this.myChart.canvasSupported || (t.realtime = !1);
+                      var i = this._isContinuity() ? 100 : this._useCustomizedSplit() ? t.splitList.length: t.splitNumber;
+                      this._buildSplitList(),
+                          this._buildColorList(i),
+                          this._buildGap(i),
+                          this._buildDataList(i)
+                    }
+                    this.clear(),
+                        this._buildShape()
+                  },
+                  getColor: function(e) {
+                    if (isNaN(e)) return null;
+                    var t;
+                    if (this._useCustomizedSplit()) {
+                      for (var i = this._splitList,
+                               n = 0,
+                               a = i.length; a > n; n++) if (i[n].min <= e && i[n].max >= e) {
+                        t = n;
+                        break
+                      }
+                    } else {
+                      if (this.dataRangeOption.min == this.dataRangeOption.max) return this._colorList[0];
+                      if (e < this.dataRangeOption.min ? e = this.dataRangeOption.min: e > this.dataRangeOption.max && (e = this.dataRangeOption.max), this.dataRangeOption.calculable && (e - (this._gap * this._range.start + this.dataRangeOption.min) > 5e-5 || e - (this._gap * this._range.end + this.dataRangeOption.min) < -5e-5)) return null;
+                      t = this._colorList.length - Math.ceil((e - this.dataRangeOption.min) / (this.dataRangeOption.max - this.dataRangeOption.min) * this._colorList.length),
+                      t == this._colorList.length && t--
+                    }
+                    return this._selectedMap[t] ? this._colorList[t] : null
+                  },
+                  getColorByIndex: function(e) {
+                    return e >= this._colorList.length ? e = this._colorList.length - 1 : 0 > e && (e = 0),
+                        this._colorList[e]
+                  },
+                  onbeforDispose: function() {
+                    this.messageCenter.unbind(r.EVENT.HOVER, this._onhoverlink)
+                  }
+                },
+                    s.inherits(t, i),
+                    e("../component").define("dataRange", t),
+                    t
+              }),
+          i("echarts/util/shape/HandlePolygon", ["require", "zrender/shape/Base", "zrender/shape/Polygon", "zrender/tool/util"],
+              function(e) {
+                function t(e) {
+                  i.call(this, e)
+                }
+                var i = e("zrender/shape/Base"),
+                    n = e("zrender/shape/Polygon"),
+                    a = e("zrender/tool/util");
+                return t.prototype = {
+                  type: "handle-polygon",
+                  buildPath: function(e, t) {
+                    n.prototype.buildPath(e, t)
+                  },
+                  isCover: function(e, t) {
+                    var i = this.transformCoordToLocal(e, t);
+                    e = i[0],
+                        t = i[1];
+                    var n = this.style.rect;
+                    return e >= n.x && e <= n.x + n.width && t >= n.y && t <= n.y + n.height ? !0 : !1
+                  }
+                },
+                    a.inherits(t, i),
+                    t
+              }),
+          i("echarts/chart/k", ["require", "./base", "../util/shape/Candle", "../component/axis", "../component/grid", "../component/dataZoom", "../config", "../util/ecData", "zrender/tool/util", "../chart"],
+              function(e) {
+                function t(e, t, n, a, o) {
+                  i.call(this, e, t, n, a, o),
+                      this.refresh(a)
+                }
+                var i = e("./base"),
+                    n = e("../util/shape/Candle");
+                e("../component/axis"),
+                    e("../component/grid"),
+                    e("../component/dataZoom");
+                var a = e("../config");
+                a.k = {
+                  zlevel: 0,
+                  z: 2,
+                  clickable: !0,
+                  hoverable: !0,
+                  legendHoverLink: !1,
+                  xAxisIndex: 0,
+                  yAxisIndex: 0,
+                  itemStyle: {
+                    normal: {
+                      color: "#fff",
+                      color0: "#00aa11",
+                      lineStyle: {
+                        width: 1,
+                        color: "#ff3200",
+                        color0: "#00aa11"
+                      },
+                      label: {
+                        show: !1
+                      }
+                    },
+                    emphasis: {
+                      label: {
+                        show: !1
+                      }
+                    }
+                  }
+                };
+                var o = e("../util/ecData"),
+                    r = e("zrender/tool/util");
+                return t.prototype = {
+                  type: a.CHART_TYPE_K,
+                  _buildShape: function() {
+                    var e = this.series;
+                    this.selectedMap = {};
+                    for (var t, i = {
+                          top: [],
+                          bottom: []
+                        },
+                             n = 0, o = e.length; o > n; n++) e[n].type === a.CHART_TYPE_K && (e[n] = this.reformOption(e[n]), this.legendHoverLink = e[n].legendHoverLink || this.legendHoverLink, t = this.component.xAxis.getAxis(e[n].xAxisIndex), t.type === a.COMPONENT_TYPE_AXIS_CATEGORY && i[t.getPosition()].push(n));
+                    for (var r in i) i[r].length > 0 && this._buildSinglePosition(r, i[r]);
+                    this.addShapeList()
+                  },
+                  _buildSinglePosition: function(e, t) {
+                    var i = this._mapData(t),
+                        n = i.locationMap,
+                        a = i.maxDataLength;
+                    if (0 !== a && 0 !== n.length) {
+                      this._buildHorizontal(t, a, n);
+                      for (var o = 0,
+                               r = t.length; r > o; o++) this.buildMark(t[o])
+                    }
+                  },
+                  _mapData: function(e) {
+                    for (var t, i, n = this.series,
+                             a = this.component.legend,
+                             o = [], r = 0, s = 0, l = e.length; l > s; s++) t = n[e[s]],
+                        i = t.name,
+                        this.selectedMap[i] = a ? a.isSelected(i) : !0,
+                    this.selectedMap[i] && o.push(e[s]),
+                        r = Math.max(r, t.data.length);
+                    return {
+                      locationMap: o,
+                      maxDataLength: r
+                    }
+                  },
+                  _buildHorizontal: function(e, t, i) {
+                    for (var n, a, o, r, s, l, h, m, V, U, d = this.series,
+                             p = {},
+                             c = 0,
+                             u = i.length; u > c; c++) {
+                      n = i[c],
+                          a = d[n],
+                          o = a.xAxisIndex || 0,
+                          r = this.component.xAxis.getAxis(o),
+                          h = a.barWidth || Math.floor(r.getGap() / 2),
+                          U = a.barMaxWidth,
+                      U && h > U && (h = U),
+                          s = a.yAxisIndex || 0,
+                          l = this.component.yAxis.getAxis(s),
+                          p[n] = [];
+                      for (var y = 0,
+                               g = t; g > y && null != r.getNameByIndex(y); y++) m = a.data[y],
+                          V = this.getDataFromOption(m, "-"),
+                      "-" !== V && 4 == V.length && p[n].push([r.getCoordByIndex(y), h, l.getCoord(V[0]), l.getCoord(V[1]), l.getCoord(V[2]), l.getCoord(V[3]), y, r.getNameByIndex(y)])
+                    }
+                    this._buildKLine(e, p)
+                  },
+                  _buildKLine: function(e, t) {
+                    for (var i, n, o, r, s, l, h, m, V, U, d, p, c, u, y, g, b, f = this.series,
+                             k = 0,
+                             x = e.length; x > k; k++) if (b = e[k], d = f[b], u = t[b], this._isLarge(u) && (u = this._getLargePointList(u)), d.type === a.CHART_TYPE_K && null != u) {
+                      p = d,
+                          i = this.query(p, "itemStyle.normal.lineStyle.width"),
+                          n = this.query(p, "itemStyle.normal.lineStyle.color"),
+                          o = this.query(p, "itemStyle.normal.lineStyle.color0"),
+                          r = this.query(p, "itemStyle.normal.color"),
+                          s = this.query(p, "itemStyle.normal.color0"),
+                          l = this.query(p, "itemStyle.emphasis.lineStyle.width"),
+                          h = this.query(p, "itemStyle.emphasis.lineStyle.color"),
+                          m = this.query(p, "itemStyle.emphasis.lineStyle.color0"),
+                          V = this.query(p, "itemStyle.emphasis.color"),
+                          U = this.query(p, "itemStyle.emphasis.color0");
+                      for (var _ = 0,
+                               L = u.length; L > _; _++) y = u[_],
+                          c = d.data[y[6]],
+                          p = c,
+                          g = y[3] < y[2],
+                          this.shapeList.push(this._getCandle(b, y[6], y[7], y[0], y[1], y[2], y[3], y[4], y[5], g ? this.query(p, "itemStyle.normal.color") || r: this.query(p, "itemStyle.normal.color0") || s, this.query(p, "itemStyle.normal.lineStyle.width") || i, g ? this.query(p, "itemStyle.normal.lineStyle.color") || n: this.query(p, "itemStyle.normal.lineStyle.color0") || o, g ? this.query(p, "itemStyle.emphasis.color") || V || r: this.query(p, "itemStyle.emphasis.color0") || U || s, this.query(p, "itemStyle.emphasis.lineStyle.width") || l || i, g ? this.query(p, "itemStyle.emphasis.lineStyle.color") || h || n: this.query(p, "itemStyle.emphasis.lineStyle.color0") || m || o))
+                    }
+                  },
+                  _isLarge: function(e) {
+                    return e[0][1] < .5
+                  },
+                  _getLargePointList: function(e) {
+                    for (var t = this.component.grid.getWidth(), i = e.length, n = [], a = 0; t > a; a++) n[a] = e[Math.floor(i / t * a)];
+                    return n
+                  },
+                  _getCandle: function(e, t, i, a, r, s, l, h, m, V, U, d, p, c, u) {
+                    var y = this.series,
+                        g = y[e],
+                        b = g.data[t],
+                        f = [b, g],
+                        k = {
+                          zlevel: g.zlevel,
+                          z: g.z,
+                          clickable: this.deepQuery(f, "clickable"),
+                          hoverable: this.deepQuery(f, "hoverable"),
+                          style: {
+                            x: a,
+                            y: [s, l, h, m],
+                            width: r,
+                            color: V,
+                            strokeColor: d,
+                            lineWidth: U,
+                            brushType: "both"
+                          },
+                          highlightStyle: {
+                            color: p,
+                            strokeColor: u,
+                            lineWidth: c
+                          },
+                          _seriesIndex: e
+                        };
+                    return k = this.addLabel(k, g, b, i),
+                        o.pack(k, g, e, b, t, i),
+                        k = new n(k)
+                  },
+                  getMarkCoord: function(e, t) {
+                    var i = this.series[e],
+                        n = this.component.xAxis.getAxis(i.xAxisIndex),
+                        a = this.component.yAxis.getAxis(i.yAxisIndex);
+                    return ["string" != typeof t.xAxis && n.getCoordByIndex ? n.getCoordByIndex(t.xAxis || 0) : n.getCoord(t.xAxis || 0), "string" != typeof t.yAxis && a.getCoordByIndex ? a.getCoordByIndex(t.yAxis || 0) : a.getCoord(t.yAxis || 0)]
+                  },
+                  refresh: function(e) {
+                    e && (this.option = e, this.series = e.series),
+                        this.backupShapeList(),
+                        this._buildShape()
+                  },
+                  addDataAnimation: function(e, t) {
+                    function i() {
+                      p--,
+                      0 === p && t && t()
+                    }
+                    for (var n = this.series,
+                             a = {},
+                             r = 0,
+                             s = e.length; s > r; r++) a[e[r][0]] = e[r];
+                    for (var l, h, m, V, U, d, p = 0,
+                             r = 0,
+                             s = this.shapeList.length; s > r; r++) if (U = this.shapeList[r]._seriesIndex, a[U] && !a[U][3] && "candle" === this.shapeList[r].type) {
+                      if (d = o.get(this.shapeList[r], "dataIndex"), V = n[U], a[U][2] && d === V.data.length - 1) {
+                        this.zr.delShape(this.shapeList[r].id);
+                        continue
+                      }
+                      if (!a[U][2] && 0 === d) {
+                        this.zr.delShape(this.shapeList[r].id);
+                        continue
+                      }
+                      h = this.component.xAxis.getAxis(V.xAxisIndex || 0).getGap(),
+                          l = a[U][2] ? h: -h,
+                          m = 0,
+                          p++,
+                          this.zr.animate(this.shapeList[r].id, "").when(this.query(this.option, "animationDurationUpdate"), {
+                            position: [l, m]
+                          }).done(i).start()
+                    }
+                    p || t && t()
+                  }
+                },
+                    r.inherits(t, i),
+                    e("../chart").define("k", t),
+                    t
+              }),
+          i("echarts/chart/pie", ["require", "./base", "zrender/shape/Text", "zrender/shape/Ring", "zrender/shape/Circle", "zrender/shape/Sector", "zrender/shape/Polyline", "../config", "../util/ecData", "zrender/tool/util", "zrender/tool/math", "zrender/tool/color", "../chart"],
+              function(e) {
+                function t(e, t, n, a, o) {
+                  i.call(this, e, t, n, a, o);
+                  var r = this;
+                  r.shapeHandler.onmouseover = function(e) {
+                    var t = e.target,
+                        i = h.get(t, "seriesIndex"),
+                        n = h.get(t, "dataIndex"),
+                        a = h.get(t, "special"),
+                        o = [t.style.x, t.style.y],
+                        s = t.style.startAngle,
+                        l = t.style.endAngle,
+                        m = ((l + s) / 2 + 360) % 360,
+                        V = t.highlightStyle.color,
+                        U = r.getLabel(i, n, a, o, m, V, !0);
+                    U && r.zr.addHoverShape(U);
+                    var d = r.getLabelLine(i, n, o, t.style.r0, t.style.r, m, V, !0);
+                    d && r.zr.addHoverShape(d)
+                  },
+                      this.refresh(a)
+                }
+                var i = e("./base"),
+                    n = e("zrender/shape/Text"),
+                    a = e("zrender/shape/Ring"),
+                    o = e("zrender/shape/Circle"),
+                    r = e("zrender/shape/Sector"),
+                    s = e("zrender/shape/Polyline"),
+                    l = e("../config");
+                l.pie = {
+                  zlevel: 0,
+                  z: 2,
+                  clickable: !0,
+                  legendHoverLink: !0,
+                  center: ["50%", "50%"],
+                  radius: [0, "75%"],
+                  clockWise: !0,
+                  startAngle: 90,
+                  minAngle: 0,
+                  selectedOffset: 10,
+                  itemStyle: {
+                    normal: {
+                      borderColor: "rgba(0,0,0,0)",
+                      borderWidth: 1,
+                      label: {
+                        show: !0,
+                        position: "outer"
+                      },
+                      labelLine: {
+                        show: !0,
+                        length: 20,
+                        lineStyle: {
+                          width: 1,
+                          type: "solid"
+                        }
+                      }
+                    },
+                    emphasis: {
+                      borderColor: "rgba(0,0,0,0)",
+                      borderWidth: 1,
+                      label: {
+                        show: !1
+                      },
+                      labelLine: {
+                        show: !1,
+                        length: 20,
+                        lineStyle: {
+                          width: 1,
+                          type: "solid"
+                        }
+                      }
+                    }
+                  }
+                };
+                var h = e("../util/ecData"),
+                    m = e("zrender/tool/util"),
+                    V = e("zrender/tool/math"),
+                    U = e("zrender/tool/color");
+                return t.prototype = {
+                  type: l.CHART_TYPE_PIE,
+                  _buildShape: function() {
+                    var e = this.series,
+                        t = this.component.legend;
+                    this.selectedMap = {},
+                        this._selected = {};
+                    var i, n, r;
+                    this._selectedMode = !1;
+                    for (var s, m = 0,
+                             V = e.length; V > m; m++) if (e[m].type === l.CHART_TYPE_PIE) {
+                      if (e[m] = this.reformOption(e[m]), this.legendHoverLink = e[m].legendHoverLink || this.legendHoverLink, s = e[m].name || "", this.selectedMap[s] = t ? t.isSelected(s) : !0, !this.selectedMap[s]) continue;
+                      i = this.parseCenter(this.zr, e[m].center),
+                          n = this.parseRadius(this.zr, e[m].radius),
+                          this._selectedMode = this._selectedMode || e[m].selectedMode,
+                          this._selected[m] = [],
+                      this.deepQuery([e[m], this.option], "calculable") && (r = {
+                        zlevel: e[m].zlevel,
+                        z: e[m].z,
+                        hoverable: !1,
+                        style: {
+                          x: i[0],
+                          y: i[1],
+                          r0: n[0] <= 10 ? 0 : n[0] - 10,
+                          r: n[1] + 10,
+                          brushType: "stroke",
+                          lineWidth: 1,
+                          strokeColor: e[m].calculableHolderColor || this.ecTheme.calculableHolderColor || l.calculableHolderColor
+                        }
+                      },
+                          h.pack(r, e[m], m, void 0, -1), this.setCalculable(r), r = n[0] <= 10 ? new o(r) : new a(r), this.shapeList.push(r)),
+                          this._buildSinglePie(m),
+                          this.buildMark(m)
+                    }
+                    this.addShapeList()
+                  },
+                  _buildSinglePie: function(e) {
+                    for (var t, i = this.series,
+                             n = i[e], a = n.data, o = this.component.legend, r = 0, s = 0, l = 0, h = Number.NEGATIVE_INFINITY, m = [], V = 0, U = a.length; U > V; V++) t = a[V].name,
+                        this.selectedMap[t] = o ? o.isSelected(t) : !0,
+                    this.selectedMap[t] && !isNaN(a[V].value) && (0 !== +a[V].value ? r++:s++, l += +a[V].value, h = Math.max(h, +a[V].value));
+                    if (0 !== l) {
+                      for (var d, p, c, u, y, g, b = 100,
+                               f = n.clockWise,
+                               k = (n.startAngle.toFixed(2) - 0 + 360) % 360, x = n.minAngle || .01, _ = 360 - x * r - .01 * s, L = n.roseType, V = 0, U = a.length; U > V; V++) if (t = a[V].name, this.selectedMap[t] && !isNaN(a[V].value)) {
+                        if (p = o ? o.getColor(t) : this.zr.getColor(V), b = a[V].value / l, d = "area" != L ? f ? k - b * _ - (0 !== b ? x: .01) : b * _ + k + (0 !== b ? x: .01) : f ? k - 360 / U: 360 / U + k, d = d.toFixed(2) - 0, b = (100 * b).toFixed(2), c = this.parseCenter(this.zr, n.center), u = this.parseRadius(this.zr, n.radius), y = +u[0], g = +u[1], "radius" === L ? g = a[V].value / h * (g - y) * .8 + .2 * (g - y) + y: "area" === L && (g = Math.sqrt(a[V].value / h) * (g - y) + y), f) {
+                          var W;
+                          W = k,
+                              k = d,
+                              d = W
+                        }
+                        this._buildItem(m, e, V, b, a[V].selected, c, y, g, k, d, p),
+                        f || (k = d)
+                      }
+                      this._autoLabelLayout(m, c, g);
+                      for (var V = 0,
+                               U = m.length; U > V; V++) this.shapeList.push(m[V]);
+                      m = null
+                    }
+                  },
+                  _buildItem: function(e, t, i, n, a, o, r, s, l, m, V) {
+                    var U = this.series,
+                        d = ((m + l) / 2 + 360) % 360,
+                        p = this.getSector(t, i, n, a, o, r, s, l, m, V);
+                    h.pack(p, U[t], t, U[t].data[i], i, U[t].data[i].name, n),
+                        e.push(p);
+                    var c = this.getLabel(t, i, n, o, d, V, !1),
+                        u = this.getLabelLine(t, i, o, r, s, d, V, !1);
+                    u && (h.pack(u, U[t], t, U[t].data[i], i, U[t].data[i].name, n), e.push(u)),
+                    c && (h.pack(c, U[t], t, U[t].data[i], i, U[t].data[i].name, n), c._labelLine = u, e.push(c))
+                  },
+                  getSector: function(e, t, i, n, a, o, s, l, h, m) {
+                    var d = this.series,
+                        p = d[e],
+                        c = p.data[t],
+                        u = [c, p],
+                        y = this.deepMerge(u, "itemStyle.normal") || {},
+                        g = this.deepMerge(u, "itemStyle.emphasis") || {},
+                        b = this.getItemStyleColor(y.color, e, t, c) || m,
+                        f = this.getItemStyleColor(g.color, e, t, c) || ("string" == typeof b ? U.lift(b, -.2) : b),
+                        k = {
+                          zlevel: p.zlevel,
+                          z: p.z,
+                          clickable: this.deepQuery(u, "clickable"),
+                          style: {
+                            x: a[0],
+                            y: a[1],
+                            r0: o,
+                            r: s,
+                            startAngle: l,
+                            endAngle: h,
+                            brushType: "both",
+                            color: b,
+                            lineWidth: y.borderWidth,
+                            strokeColor: y.borderColor,
+                            lineJoin: "round"
+                          },
+                          highlightStyle: {
+                            color: f,
+                            lineWidth: g.borderWidth,
+                            strokeColor: g.borderColor,
+                            lineJoin: "round"
+                          },
+                          _seriesIndex: e,
+                          _dataIndex: t
+                        };
+                    if (n) {
+                      var x = ((k.style.startAngle + k.style.endAngle) / 2).toFixed(2) - 0;
+                      k.style._hasSelected = !0,
+                          k.style._x = k.style.x,
+                          k.style._y = k.style.y;
+                      var _ = this.query(p, "selectedOffset");
+                      k.style.x += V.cos(x, !0) * _,
+                          k.style.y -= V.sin(x, !0) * _,
+                          this._selected[e][t] = !0
+                    } else this._selected[e][t] = !1;
+                    return this._selectedMode && (k.onclick = this.shapeHandler.onclick),
+                    this.deepQuery([c, p, this.option], "calculable") && (this.setCalculable(k), k.draggable = !0),
+                    (this._needLabel(p, c, !0) || this._needLabelLine(p, c, !0)) && (k.onmouseover = this.shapeHandler.onmouseover),
+                        k = new r(k)
+                  },
+                  getLabel: function(e, t, i, a, o, r, s) {
+                    var l = this.series,
+                        h = l[e],
+                        U = h.data[t];
+                    if (this._needLabel(h, U, s)) {
+                      var d, p, c, u = s ? "emphasis": "normal",
+                          y = m.merge(m.clone(U.itemStyle) || {},
+                              h.itemStyle),
+                          g = y[u].label,
+                          b = g.textStyle || {},
+                          f = a[0],
+                          k = a[1],
+                          x = this.parseRadius(this.zr, h.radius),
+                          _ = "middle";
+                      g.position = g.position || y.normal.label.position,
+                          "center" === g.position ? (d = f, p = k, c = "center") : "inner" === g.position || "inside" === g.position ? (x = (x[0] + x[1]) * (g.distance || .5), d = Math.round(f + x * V.cos(o, !0)), p = Math.round(k - x * V.sin(o, !0)), r = "#fff", c = "center") : (x = x[1] - -y[u].labelLine.length, d = Math.round(f + x * V.cos(o, !0)), p = Math.round(k - x * V.sin(o, !0)), c = o >= 90 && 270 >= o ? "right": "left"),
+                      "center" != g.position && "inner" != g.position && "inside" != g.position && (d += "left" === c ? 20 : -20),
+                          U.__labelX = d - ("left" === c ? 5 : -5),
+                          U.__labelY = p;
+                      var L = new n({
+                        zlevel: h.zlevel,
+                        z: h.z + 1,
+                        hoverable: !1,
+                        style: {
+                          x: d,
+                          y: p,
+                          color: b.color || r,
+                          text: this.getLabelText(e, t, i, u),
+                          textAlign: b.align || c,
+                          textBaseline: b.baseline || _,
+                          textFont: this.getFont(b)
+                        },
+                        highlightStyle: {
+                          brushType: "fill"
+                        }
+                      });
+                      return L._radius = x,
+                          L._labelPosition = g.position || "outer",
+                          L._rect = L.getRect(L.style),
+                          L._seriesIndex = e,
+                          L._dataIndex = t,
+                          L
+                    }
+                  },
+                  getLabelText: function(e, t, i, n) {
+                    var a = this.series,
+                        o = a[e],
+                        r = o.data[t],
+                        s = this.deepQuery([r, o], "itemStyle." + n + ".label.formatter");
+                    return s ? "function" == typeof s ? s.call(this.myChart, {
+                      seriesIndex: e,
+                      seriesName: o.name || "",
+                      series: o,
+                      dataIndex: t,
+                      data: r,
+                      name: r.name,
+                      value: r.value,
+                      percent: i
+                    }) : "string" == typeof s ? (s = s.replace("{a}", "{a0}").replace("{b}", "{b0}").replace("{c}", "{c0}").replace("{d}", "{d0}"), s = s.replace("{a0}", o.name).replace("{b0}", r.name).replace("{c0}", r.value).replace("{d0}", i)) : void 0 : r.name
+                  },
+                  getLabelLine: function(e, t, i, n, a, o, r, l) {
+                    var h = this.series,
+                        U = h[e],
+                        d = U.data[t];
+                    if (this._needLabelLine(U, d, l)) {
+                      var p = l ? "emphasis": "normal",
+                          c = m.merge(m.clone(d.itemStyle) || {},
+                              U.itemStyle),
+                          u = c[p].labelLine,
+                          y = u.lineStyle || {},
+                          g = i[0],
+                          b = i[1],
+                          f = a,
+                          k = this.parseRadius(this.zr, U.radius)[1] - -u.length,
+                          x = V.cos(o, !0),
+                          _ = V.sin(o, !0);
+                      return new s({
+                        zlevel: U.zlevel,
+                        z: U.z + 1,
+                        hoverable: !1,
+                        style: {
+                          pointList: [[g + f * x, b - f * _], [g + k * x, b - k * _], [d.__labelX, d.__labelY]],
+                          strokeColor: y.color || r,
+                          lineType: y.type,
+                          lineWidth: y.width
+                        },
+                        _seriesIndex: e,
+                        _dataIndex: t
+                      })
+                    }
+                  },
+                  _needLabel: function(e, t, i) {
+                    return this.deepQuery([t, e], "itemStyle." + (i ? "emphasis": "normal") + ".label.show")
+                  },
+                  _needLabelLine: function(e, t, i) {
+                    return this.deepQuery([t, e], "itemStyle." + (i ? "emphasis": "normal") + ".labelLine.show")
+                  },
+                  _autoLabelLayout: function(e, t, i) {
+                    for (var n = [], a = [], o = 0, r = e.length; r > o; o++)("outer" === e[o]._labelPosition || "outside" === e[o]._labelPosition) && (e[o]._rect._y = e[o]._rect.y, e[o]._rect.x < t[0] ? n.push(e[o]) : a.push(e[o]));
+                    this._layoutCalculate(n, t, i, -1),
+                        this._layoutCalculate(a, t, i, 1)
+                  },
+                  _layoutCalculate: function(e, t, i, n) {
+                    function a(t, i, n) {
+                      for (var a = t; i > a; a++) if (e[a]._rect.y += n, e[a].style.y += n, e[a]._labelLine && (e[a]._labelLine.style.pointList[1][1] += n, e[a]._labelLine.style.pointList[2][1] += n), a > t && i > a + 1 && e[a + 1]._rect.y > e[a]._rect.y + e[a]._rect.height) return void o(a, n / 2);
+                      o(i - 1, n / 2)
+                    }
+                    function o(t, i) {
+                      for (var n = t; n >= 0 && (e[n]._rect.y -= i, e[n].style.y -= i, e[n]._labelLine && (e[n]._labelLine.style.pointList[1][1] -= i, e[n]._labelLine.style.pointList[2][1] -= i), !(n > 0 && e[n]._rect.y > e[n - 1]._rect.y + e[n - 1]._rect.height)); n--);
+                    }
+                    function r(e, t, i, n, a) {
+                      for (var o, r, s, l = i[0], h = i[1], m = a > 0 ? t ? Number.MAX_VALUE: 0 : t ? Number.MAX_VALUE: 0, V = 0, U = e.length; U > V; V++) r = Math.abs(e[V]._rect.y - h),
+                          s = e[V]._radius - n,
+                          o = n + s > r ? Math.sqrt((n + s + 20) * (n + s + 20) - Math.pow(e[V]._rect.y - h, 2)) : Math.abs(e[V]._rect.x + (a > 0 ? 0 : e[V]._rect.width) - l),
+                      t && o >= m && (o = m - 10),
+                      !t && m >= o && (o = m + 10),
+                          e[V]._rect.x = e[V].style.x = l + o * a,
+                      e[V]._labelLine && (e[V]._labelLine.style.pointList[2][0] = l + (o - 5) * a, e[V]._labelLine.style.pointList[1][0] = l + (o - 20) * a),
+                          m = o
+                    }
+                    e.sort(function(e, t) {
+                      return e._rect.y - t._rect.y
+                    });
+                    for (var s, l = 0,
+                             h = e.length,
+                             m = [], V = [], U = 0; h > U; U++) s = e[U]._rect.y - l,
+                    0 > s && a(U, h, -s, n),
+                        l = e[U]._rect.y + e[U]._rect.height;
+                    this.zr.getHeight() - l < 0 && o(h - 1, l - this.zr.getHeight());
+                    for (var U = 0; h > U; U++) e[U]._rect.y >= t[1] ? V.push(e[U]) : m.push(e[U]);
+                    r(V, !0, t, i, n),
+                        r(m, !1, t, i, n)
+                  },
+                  reformOption: function(e) {
+                    var t = m.merge;
+                    return e = t(t(e || {},
+                        m.clone(this.ecTheme.pie || {})), m.clone(l.pie)),
+                        e.itemStyle.normal.label.textStyle = this.getTextStyle(e.itemStyle.normal.label.textStyle),
+                        e.itemStyle.emphasis.label.textStyle = this.getTextStyle(e.itemStyle.emphasis.label.textStyle),
+                        this.z = e.z,
+                        this.zlevel = e.zlevel,
+                        e
+                  },
+                  refresh: function(e) {
+                    e && (this.option = e, this.series = e.series),
+                        this.backupShapeList(),
+                        this._buildShape()
+                  },
+                  addDataAnimation: function(e, t) {
+                    function i() {
+                      s--,
+                      0 === s && t && t()
+                    }
+                    for (var n = this.series,
+                             a = {},
+                             o = 0,
+                             r = e.length; r > o; o++) a[e[o][0]] = e[o];
+                    var s = 0,
+                        h = {},
+                        m = {},
+                        V = {},
+                        U = this.shapeList;
+                    this.shapeList = [];
+                    for (var d, p, c, u = {},
+                             o = 0,
+                             r = e.length; r > o; o++) d = e[o][0],
+                        p = e[o][2],
+                        c = e[o][3],
+                    n[d] && n[d].type === l.CHART_TYPE_PIE && (p ? (c || (h[d + "_" + n[d].data.length] = "delete"), u[d] = 1) : c ? u[d] = 0 : (h[d + "_-1"] = "delete", u[d] = -1), this._buildSinglePie(d));
+                    for (var y, g, o = 0,
+                             r = this.shapeList.length; r > o; o++) switch (d = this.shapeList[o]._seriesIndex, y = this.shapeList[o]._dataIndex, g = d + "_" + y, this.shapeList[o].type) {
+                      case "sector":
+                        h[g] = this.shapeList[o];
+                        break;
+                      case "text":
+                        m[g] = this.shapeList[o];
+                        break;
+                      case "polyline":
+                        V[g] = this.shapeList[o]
+                    }
+                    this.shapeList = [];
+                    for (var b, o = 0,
+                             r = U.length; r > o; o++) if (d = U[o]._seriesIndex, a[d]) {
+                      if (y = U[o]._dataIndex + u[d], g = d + "_" + y, b = h[g], !b) continue;
+                      if ("sector" === U[o].type)"delete" != b ? (s++, this.zr.animate(U[o].id, "style").when(400, {
+                        startAngle: b.style.startAngle,
+                        endAngle: b.style.endAngle
+                      }).done(i).start()) : (s++, this.zr.animate(U[o].id, "style").when(400, u[d] < 0 ? {
+                        startAngle: U[o].style.startAngle
+                      }: {
+                        endAngle: U[o].style.endAngle
+                      }).done(i).start());
+                      else if ("text" === U[o].type || "polyline" === U[o].type) if ("delete" === b) this.zr.delShape(U[o].id);
+                      else switch (U[o].type) {
+                          case "text":
+                            s++,
+                                b = m[g],
+                                this.zr.animate(U[o].id, "style").when(400, {
+                                  x: b.style.x,
+                                  y: b.style.y
+                                }).done(i).start();
+                            break;
+                          case "polyline":
+                            s++,
+                                b = V[g],
+                                this.zr.animate(U[o].id, "style").when(400, {
+                                  pointList: b.style.pointList
+                                }).done(i).start()
+                        }
+                    }
+                    this.shapeList = U,
+                    s || t && t()
+                  },
+                  onclick: function(e) {
+                    var t = this.series;
+                    if (this.isClick && e.target) {
+                      this.isClick = !1;
+                      for (var i, n = e.target,
+                               a = n.style,
+                               o = h.get(n, "seriesIndex"), r = h.get(n, "dataIndex"), s = 0, m = this.shapeList.length; m > s; s++) if (this.shapeList[s].id === n.id) {
+                        if (o = h.get(n, "seriesIndex"), r = h.get(n, "dataIndex"), a._hasSelected) n.style.x = n.style._x,
+                            n.style.y = n.style._y,
+                            n.style._hasSelected = !1,
+                            this._selected[o][r] = !1;
+                        else {
+                          var U = ((a.startAngle + a.endAngle) / 2).toFixed(2) - 0;
+                          n.style._hasSelected = !0,
+                              this._selected[o][r] = !0,
+                              n.style._x = n.style.x,
+                              n.style._y = n.style.y,
+                              i = this.query(t[o], "selectedOffset"),
+                              n.style.x += V.cos(U, !0) * i,
+                              n.style.y -= V.sin(U, !0) * i
+                        }
+                        this.zr.modShape(n.id)
+                      } else this.shapeList[s].style._hasSelected && "single" === this._selectedMode && (o = h.get(this.shapeList[s], "seriesIndex"), r = h.get(this.shapeList[s], "dataIndex"), this.shapeList[s].style.x = this.shapeList[s].style._x, this.shapeList[s].style.y = this.shapeList[s].style._y, this.shapeList[s].style._hasSelected = !1, this._selected[o][r] = !1, this.zr.modShape(this.shapeList[s].id));
+                      this.messageCenter.dispatch(l.EVENT.PIE_SELECTED, e.event, {
+                            selected: this._selected,
+                            target: h.get(n, "name")
+                          },
+                          this.myChart),
+                          this.zr.refreshNextFrame()
+                    }
+                  }
+                },
+                    m.inherits(t, i),
+                    e("../chart").define("pie", t),
+                    t
+              }),
+      i("echarts/chart/radar", ["require", "./base", "zrender/shape/Polygon", "../component/polar", "../config", "../util/ecData", "zrender/tool/util", "zrender/tool/color", "../util/accMath", "../chart"],
+          function(e) {
+            function t(e, t, n, a, o) {
+              i.call(this, e, t, n, a, o),
+                  this.refresh(a)
+            }
+            var i = e("./base"),
+                n = e("zrender/shape/Polygon");
+            e("../component/polar");
+            var a = e("../config");
+            a.radar = {
+              zlevel: 0,
+              z: 2,
+              clickable: !0,
+              legendHoverLink: !0,
+              polarIndex: 0,
+              itemStyle: {
+                normal: {
+                  label: {
+                    show: !1
+                  },
+                  lineStyle: {
+                    width: 2,
+                    type: "solid"
+                  }
+                },
+                emphasis: {
+                  label: {
+                    show: !1
+                  }
+                }
+              },
+              symbolSize: 2
+            };
+            var o = e("../util/ecData"),
+                r = e("zrender/tool/util"),
+                s = e("zrender/tool/color");
+            return t.prototype = {
+              type: a.CHART_TYPE_RADAR,
+              _buildShape: function() {
+                this.selectedMap = {},
+                    this._symbol = this.option.symbolList,
+                    this._queryTarget,
+                    this._dropBoxList = [],
+                    this._radarDataCounter = 0;
+                for (var e, t = this.series,
+                         i = this.component.legend,
+                         n = 0,
+                         o = t.length; o > n; n++) t[n].type === a.CHART_TYPE_RADAR && (this.serie = this.reformOption(t[n]), this.legendHoverLink = t[n].legendHoverLink || this.legendHoverLink, e = this.serie.name || "", this.selectedMap[e] = i ? i.isSelected(e) : !0, this.selectedMap[e] && (this._queryTarget = [this.serie, this.option], this.deepQuery(this._queryTarget, "calculable") && this._addDropBox(n), this._buildSingleRadar(n), this.buildMark(n)));
+                this.addShapeList()
+              },
+              _buildSingleRadar: function(e) {
+                for (var t, i, n, a, o = this.component.legend,
+                         r = this.serie.data,
+                         s = this.deepQuery(this._queryTarget, "calculable"), l = 0; l < r.length; l++) n = r[l].name || "",
+                    this.selectedMap[n] = o ? o.isSelected(n) : !0,
+                this.selectedMap[n] && (o ? (i = o.getColor(n), t = o.getItemShape(n), t && (t.style.brushType = this.deepQuery([r[l], this.serie], "itemStyle.normal.areaStyle") ? "both": "stroke", o.setItemShape(n, t))) : i = this.zr.getColor(l), a = this._getPointList(this.serie.polarIndex, r[l]), this._addSymbol(a, i, l, e, this.serie.polarIndex), this._addDataShape(a, i, r[l], e, l, s), this._radarDataCounter++)
+              },
+              _getPointList: function(e, t) {
+                for (var i, n, a = [], o = this.component.polar, r = 0, s = t.value.length; s > r; r++) n = this.getDataFromOption(t.value[r]),
+                    i = "-" != n ? o.getVector(e, r, n) : !1,
+                i && a.push(i);
+                return a
+              },
+              _addSymbol: function(e, t, i, n, a) {
+                for (var r, s = this.series,
+                         l = this.component.polar,
+                         h = 0,
+                         m = e.length; m > h; h++) r = this.getSymbolShape(this.deepMerge([s[n].data[i], s[n]]), n, s[n].data[i].value[h], h, l.getIndicatorText(a, h), e[h][0], e[h][1], this._symbol[this._radarDataCounter % this._symbol.length], t, "#fff", "vertical"),
+                    r.zlevel = this.getZlevelBase(),
+                    r.z = this.getZBase() + 1,
+                    o.set(r, "data", s[n].data[i]),
+                    o.set(r, "value", s[n].data[i].value),
+                    o.set(r, "dataIndex", i),
+                    o.set(r, "special", h),
+                    this.shapeList.push(r)
+              },
+              _addDataShape: function(e, t, i, a, r, l) {
+                var h = this.series,
+                    m = [i, this.serie],
+                    V = this.getItemStyleColor(this.deepQuery(m, "itemStyle.normal.color"), a, r, i),
+                    U = this.deepQuery(m, "itemStyle.normal.lineStyle.width"),
+                    d = this.deepQuery(m, "itemStyle.normal.lineStyle.type"),
+                    p = this.deepQuery(m, "itemStyle.normal.areaStyle.color"),
+                    c = this.deepQuery(m, "itemStyle.normal.areaStyle"),
+                    u = {
+                      zlevel: this.getZlevelBase(),
+                      z: this.getZBase(),
+                      style: {
+                        pointList: e,
+                        brushType: c ? "both": "stroke",
+                        color: p || V || ("string" == typeof t ? s.alpha(t, .5) : t),
+                        strokeColor: V || t,
+                        lineWidth: U,
+                        lineType: d
+                      },
+                      highlightStyle: {
+                        brushType: this.deepQuery(m, "itemStyle.emphasis.areaStyle") || c ? "both": "stroke",
+                        color: this.deepQuery(m, "itemStyle.emphasis.areaStyle.color") || p || V || ("string" == typeof t ? s.alpha(t, .5) : t),
+                        strokeColor: this.getItemStyleColor(this.deepQuery(m, "itemStyle.emphasis.color"), a, r, i) || V || t,
+                        lineWidth: this.deepQuery(m, "itemStyle.emphasis.lineStyle.width") || U,
+                        lineType: this.deepQuery(m, "itemStyle.emphasis.lineStyle.type") || d
+                      }
+                    };
+                o.pack(u, h[a], a, i, r, i.name, this.component.polar.getIndicator(h[a].polarIndex)),
+                l && (u.draggable = !0, this.setCalculable(u)),
+                    u = new n(u),
+                    this.shapeList.push(u)
+              },
+              _addDropBox: function(e) {
+                var t = this.series,
+                    i = this.deepQuery(this._queryTarget, "polarIndex");
+                if (!this._dropBoxList[i]) {
+                  var n = this.component.polar.getDropBox(i);
+                  n.zlevel = this.getZlevelBase(),
+                      n.z = this.getZBase(),
+                      this.setCalculable(n),
+                      o.pack(n, t, e, void 0, -1),
+                      this.shapeList.push(n),
+                      this._dropBoxList[i] = !0
+                }
+              },
+              ondragend: function(e, t) {
+                var i = this.series;
+                if (this.isDragend && e.target) {
+                  var n = e.target,
+                      a = o.get(n, "seriesIndex"),
+                      r = o.get(n, "dataIndex");
+                  this.component.legend && this.component.legend.del(i[a].data[r].name),
+                      i[a].data.splice(r, 1),
+                      t.dragOut = !0,
+                      t.needRefresh = !0,
+                      this.isDragend = !1
+                }
+              },
+              ondrop: function(t, i) {
+                var n = this.series;
+                if (this.isDrop && t.target) {
+                  var a, r, s = t.target,
+                      l = t.dragged,
+                      h = o.get(s, "seriesIndex"),
+                      m = o.get(s, "dataIndex"),
+                      V = this.component.legend;
+                  if ( - 1 === m) a = {
+                    value: o.get(l, "value"),
+                    name: o.get(l, "name")
+                  },
+                      n[h].data.push(a),
+                  V && V.add(a.name, l.style.color || l.style.strokeColor);
+                  else {
+                    var U = e("../util/accMath");
+                    a = n[h].data[m],
+                    V && V.del(a.name),
+                        a.name += this.option.nameConnector + o.get(l, "name"),
+                        r = o.get(l, "value");
+                    for (var d = 0; d < r.length; d++) a.value[d] = U.accAdd(a.value[d], r[d]);
+                    V && V.add(a.name, l.style.color || l.style.strokeColor)
+                  }
+                  i.dragIn = i.dragIn || !0,
+                      this.isDrop = !1
+                }
+              },
+              refresh: function(e) {
+                e && (this.option = e, this.series = e.series),
+                    this.backupShapeList(),
+                    this._buildShape()
+              }
+            },
+                r.inherits(t, i),
+                e("../chart").define("radar", t),
+                t
+          }),
+      i("echarts/component/polar", ["require", "./base", "zrender/shape/Text", "zrender/shape/Line", "zrender/shape/Polygon", "zrender/shape/Circle", "zrender/shape/Ring", "../config", "zrender/tool/util", "../util/coordinates", "../util/accMath", "../util/smartSteps", "../component"],
+          function(e) {
+            function t(e, t, n, a, o) {
+              i.call(this, e, t, n, a, o),
+                  this.refresh(a)
+            }
+            var i = e("./base"),
+                n = e("zrender/shape/Text"),
+                a = e("zrender/shape/Line"),
+                o = e("zrender/shape/Polygon"),
+                r = e("zrender/shape/Circle"),
+                s = e("zrender/shape/Ring"),
+                l = e("../config");
+            l.polar = {
+              zlevel: 0,
+              z: 0,
+              center: ["50%", "50%"],
+              radius: "75%",
+              startAngle: 90,
+              boundaryGap: [0, 0],
+              splitNumber: 5,
+              name: {
+                show: !0,
+                textStyle: {
+                  color: "#333"
+                }
+              },
+              axisLine: {
+                show: !0,
+                lineStyle: {
+                  color: "#ccc",
+                  width: 1,
+                  type: "solid"
+                }
+              },
+              axisLabel: {
+                show: !1,
+                textStyle: {
+                  color: "#333"
+                }
+              },
+              splitArea: {
+                show: !0,
+                areaStyle: {
+                  color: ["rgba(250,250,250,0.3)", "rgba(200,200,200,0.3)"]
+                }
+              },
+              splitLine: {
+                show: !0,
+                lineStyle: {
+                  width: 1,
+                  color: "#ccc"
+                }
+              },
+              type: "polygon"
+            };
+            var h = e("zrender/tool/util"),
+                m = e("../util/coordinates");
+            return t.prototype = {
+              type: l.COMPONENT_TYPE_POLAR,
+              _buildShape: function() {
+                for (var e = 0; e < this.polar.length; e++) this._index = e,
+                    this.reformOption(this.polar[e]),
+                    this._queryTarget = [this.polar[e], this.option],
+                    this._createVector(e),
+                    this._buildSpiderWeb(e),
+                    this._buildText(e),
+                    this._adjustIndicatorValue(e),
+                    this._addAxisLabel(e);
+                for (var e = 0; e < this.shapeList.length; e++) this.zr.addShape(this.shapeList[e])
+              },
+              _createVector: function(e) {
+                for (var t, i = this.polar[e], n = this.deepQuery(this._queryTarget, "indicator"), a = n.length, o = i.startAngle, r = 2 * Math.PI / a, s = this._getRadius(), l = i.__ecIndicator = [], h = 0; a > h; h++) t = m.polar2cartesian(s, o * Math.PI / 180 + r * h),
+                    l.push({
+                      vector: [t[1], -t[0]]
+                    })
+              },
+              _getRadius: function() {
+                var e = this.polar[this._index];
+                return this.parsePercent(e.radius, Math.min(this.zr.getWidth(), this.zr.getHeight()) / 2)
+              },
+              _buildSpiderWeb: function(e) {
+                var t = this.polar[e],
+                    i = t.__ecIndicator,
+                    n = t.splitArea,
+                    a = t.splitLine,
+                    o = this.getCenter(e),
+                    r = t.splitNumber,
+                    s = a.lineStyle.color,
+                    l = a.lineStyle.width,
+                    h = a.show,
+                    m = this.deepQuery(this._queryTarget, "axisLine");
+                this._addArea(i, r, o, n, s, l, h),
+                m.show && this._addLine(i, o, m)
+              },
+              _addAxisLabel: function(t) {
+                for (var i, a, o, r, a, s, l, m, V, U, d = e("../util/accMath"), p = this.polar[t], c = this.deepQuery(this._queryTarget, "indicator"), u = p.__ecIndicator, y = this.deepQuery(this._queryTarget, "splitNumber"), g = this.getCenter(t), b = 0; b < c.length; b++) if (i = this.deepQuery([c[b], p, this.option], "axisLabel"), i.show) {
+                  var f = this.deepQuery([i, p, this.option], "textStyle"),
+                      k = this.deepQuery([i, p], "formatter");
+                  if (o = {},
+                      o.textFont = this.getFont(f), o.color = f.color, o = h.merge(o, i), o.lineWidth = o.width, a = u[b].vector, s = u[b].value, m = b / c.length * 2 * Math.PI, V = i.offset || 10, U = i.interval || 0, !s) return;
+                  for (var x = 1; y >= x; x += U + 1) r = h.merge({},
+                      o),
+                      l = d.accAdd(s.min, d.accMul(s.step, x)),
+                      l = "function" == typeof k ? k(l) : "string" == typeof k ? k.replace("{a}", "{a0}").replace("{a0}", l) : this.numAddCommas(l),
+                      r.text = l,
+                      r.x = x * a[0] / y + Math.cos(m) * V + g[0],
+                      r.y = x * a[1] / y + Math.sin(m) * V + g[1],
+                      this.shapeList.push(new n({
+                        zlevel: this.getZlevelBase(),
+                        z: this.getZBase(),
+                        style: r,
+                        draggable: !1,
+                        hoverable: !1
+                      }))
+                }
+              },
+              _buildText: function(e) {
+                for (var t, i, a, o, r, s, l, h = this.polar[e], m = h.__ecIndicator, V = this.deepQuery(this._queryTarget, "indicator"), U = this.getCenter(e), d = 0, p = 0, c = 0; c < V.length; c++) o = this.deepQuery([V[c], h, this.option], "name"),
+                o.show && (l = this.deepQuery([o, h, this.option], "textStyle"), i = {},
+                    i.textFont = this.getFont(l), i.color = l.color, i.text = "function" == typeof o.formatter ? o.formatter.call(this.myChart, V[c].text, c) : "string" == typeof o.formatter ? o.formatter.replace("{value}", V[c].text) : V[c].text, m[c].text = i.text, t = m[c].vector, a = Math.round(t[0]) > 0 ? "left": Math.round(t[0]) < 0 ? "right": "center", null == o.margin ? t = this._mapVector(t, U, 1.1) : (s = o.margin, d = t[0] > 0 ? s: -s, p = t[1] > 0 ? s: -s, d = 0 === t[0] ? 0 : d, p = 0 === t[1] ? 0 : p, t = this._mapVector(t, U, 1)), i.textAlign = a, i.x = t[0] + d, i.y = t[1] + p, r = o.rotate ? [o.rotate / 180 * Math.PI, t[0], t[1]] : [0, 0, 0], this.shapeList.push(new n({
+                  zlevel: this.getZlevelBase(),
+                  z: this.getZBase(),
+                  style: i,
+                  draggable: !1,
+                  hoverable: !1,
+                  rotation: r
+                })))
+              },
+              getIndicatorText: function(e, t) {
+                return this.polar[e] && this.polar[e].__ecIndicator[t] && this.polar[e].__ecIndicator[t].text
+              },
+              getDropBox: function(e) {
+                var t, i, e = e || 0,
+                    n = this.polar[e],
+                    a = this.getCenter(e),
+                    o = n.__ecIndicator,
+                    r = o.length,
+                    s = [],
+                    l = n.type;
+                if ("polygon" == l) {
+                  for (var h = 0; r > h; h++) t = o[h].vector,
+                      s.push(this._mapVector(t, a, 1.2));
+                  i = this._getShape(s, "fill", "rgba(0,0,0,0)", "", 1)
+                } else "circle" == l && (i = this._getCircle("", 1, 1.2, a, "fill", "rgba(0,0,0,0)"));
+                return i
+              },
+              _addArea: function(e, t, i, n, a, o, r) {
+                for (var s, l, h, m, V = this.deepQuery(this._queryTarget, "type"), U = 0; t > U; U++) l = (t - U) / t,
+                r && ("polygon" == V ? (m = this._getPointList(e, l, i), s = this._getShape(m, "stroke", "", a, o)) : "circle" == V && (s = this._getCircle(a, o, l, i, "stroke")), this.shapeList.push(s)),
+                n.show && (h = (t - U - 1) / t, this._addSplitArea(e, n, l, h, i, U))
+              },
+              _getCircle: function(e, t, i, n, a, o) {
+                var s = this._getRadius();
+                return new r({
+                  zlevel: this.getZlevelBase(),
+                  z: this.getZBase(),
+                  style: {
+                    x: n[0],
+                    y: n[1],
+                    r: s * i,
+                    brushType: a,
+                    strokeColor: e,
+                    lineWidth: t,
+                    color: o
+                  },
+                  hoverable: !1,
+                  draggable: !1
+                })
+              },
+              _getRing: function(e, t, i, n) {
+                var a = this._getRadius();
+                return new s({
+                  zlevel: this.getZlevelBase(),
+                  z: this.getZBase(),
+                  style: {
+                    x: n[0],
+                    y: n[1],
+                    r: t * a,
+                    r0: i * a,
+                    color: e,
+                    brushType: "fill"
+                  },
+                  hoverable: !1,
+                  draggable: !1
+                })
+              },
+              _getPointList: function(e, t, i) {
+                for (var n, a = [], o = e.length, r = 0; o > r; r++) n = e[r].vector,
+                    a.push(this._mapVector(n, i, t));
+                return a
+              },
+              _getShape: function(e, t, i, n, a) {
+                return new o({
+                  zlevel: this.getZlevelBase(),
+                  z: this.getZBase(),
+                  style: {
+                    pointList: e,
+                    brushType: t,
+                    color: i,
+                    strokeColor: n,
+                    lineWidth: a
+                  },
+                  hoverable: !1,
+                  draggable: !1
+                })
+              },
+              _addSplitArea: function(e, t, i, n, a, o) {
+                var r, s, l, h, m, V = e.length,
+                    U = t.areaStyle.color,
+                    d = [],
+                    V = e.length,
+                    p = this.deepQuery(this._queryTarget, "type");
+                if ("string" == typeof U && (U = [U]), s = U.length, r = U[o % s], "polygon" == p) for (var c = 0; V > c; c++) d = [],
+                    l = e[c].vector,
+                    h = e[(c + 1) % V].vector,
+                    d.push(this._mapVector(l, a, i)),
+                    d.push(this._mapVector(l, a, n)),
+                    d.push(this._mapVector(h, a, n)),
+                    d.push(this._mapVector(h, a, i)),
+                    m = this._getShape(d, "fill", r, "", 1),
+                    this.shapeList.push(m);
+                else "circle" == p && (m = this._getRing(r, i, n, a), this.shapeList.push(m))
+              },
+              _mapVector: function(e, t, i) {
+                return [e[0] * i + t[0], e[1] * i + t[1]]
+              },
+              getCenter: function(e) {
+                var e = e || 0;
+                return this.parseCenter(this.zr, this.polar[e].center)
+              },
+              _addLine: function(e, t, i) {
+                for (var n, a, o = e.length,
+                         r = i.lineStyle,
+                         s = r.color,
+                         l = r.width,
+                         h = r.type,
+                         m = 0; o > m; m++) a = e[m].vector,
+                    n = this._getLine(t[0], t[1], a[0] + t[0], a[1] + t[1], s, l, h),
+                    this.shapeList.push(n)
+              },
+              _getLine: function(e, t, i, n, o, r, s) {
+                return new a({
+                  zlevel: this.getZlevelBase(),
+                  z: this.getZBase(),
+                  style: {
+                    xStart: e,
+                    yStart: t,
+                    xEnd: i,
+                    yEnd: n,
+                    strokeColor: o,
+                    lineWidth: r,
+                    lineType: s
+                  },
+                  hoverable: !1
+                })
+              },
+              _adjustIndicatorValue: function(t) {
+                for (var i, n, a, o = this.polar[t], r = this.deepQuery(this._queryTarget, "indicator"), s = r.length, l = o.__ecIndicator, h = this._getSeriesData(t), m = o.boundaryGap, V = o.splitNumber, U = o.scale, d = e("../util/smartSteps"), p = 0; s > p; p++) {
+                  if ("number" == typeof r[p].max) i = r[p].max,
+                      n = r[p].min || 0,
+                      a = {
+                        max: i,
+                        min: n
+                      };
+                  else {
+                    var c = this._findValue(h, p, V, m);
+                    n = c.min,
+                        i = c.max
+                  } ! U && n >= 0 && i >= 0 && (n = 0),
+                  !U && 0 >= n && 0 >= i && (i = 0);
+                  var u = d(n, i, V, a);
+                  l[p].value = {
+                    min: u.min,
+                    max: u.max,
+                    step: u.step
+                  }
+                }
+              },
+              _getSeriesData: function(e) {
+                for (var t, i, n, a = [], o = this.component.legend, r = 0; r < this.series.length; r++) if (t = this.series[r], t.type == l.CHART_TYPE_RADAR) {
+                  i = t.data || [];
+                  for (var s = 0; s < i.length; s++) n = this.deepQuery([i[s], t, this.option], "polarIndex") || 0,
+                  n != e || o && !o.isSelected(i[s].name) || a.push(i[s])
+                }
+                return a
+              },
+              _findValue: function(e, t, i, n) {
+                function a(e) { (e > o || void 0 === o) && (o = e),
+                (r > e || void 0 === r) && (r = e)
+                }
+                var o, r, s;
+                if (e && 0 !== e.length) {
+                  if (1 == e.length && (r = 0), 1 != e.length) for (var l = 0; l < e.length; l++) a(this.getDataFromOption(e[l].value[t]));
+                  else {
+                    s = e[0];
+                    for (var l = 0; l < s.value.length; l++) a(this.getDataFromOption(s.value[l]))
+                  }
+                  var h = Math.abs(o - r);
+                  return r -= Math.abs(h * n[0]),
+                      o += Math.abs(h * n[1]),
+                  r === o && (0 === o ? o = 1 : o > 0 ? r = o / i: o /= i),
+                      {
+                        max: o,
+                        min: r
+                      }
+                }
+              },
+              getVector: function(e, t, i) {
+                e = e || 0,
+                    t = t || 0;
+                var n = this.polar[e].__ecIndicator;
+                if (! (t >= n.length)) {
+                  var a, o = this.polar[e].__ecIndicator[t],
+                      r = this.getCenter(e),
+                      s = o.vector,
+                      l = o.value.max,
+                      h = o.value.min;
+                  if ("undefined" == typeof i) return r;
+                  switch (i) {
+                    case "min":
+                      i = h;
+                      break;
+                    case "max":
+                      i = l;
+                      break;
+                    case "center":
+                      i = (l + h) / 2
+                  }
+                  return a = l != h ? (i - h) / (l - h) : .5,
+                      this._mapVector(s, r, a)
+                }
+              },
+              isInside: function(e) {
+                var t = this.getNearestIndex(e);
+                return t ? t.polarIndex: -1
+              },
+              getNearestIndex: function(e) {
+                for (var t, i, n, a, o, r, s, l, h, V = 0; V < this.polar.length; V++) {
+                  if (t = this.polar[V], i = this.getCenter(V), e[0] == i[0] && e[1] == i[1]) return {
+                    polarIndex: V,
+                    valueIndex: 0
+                  };
+                  if (n = this._getRadius(), o = t.startAngle, r = t.indicator, s = r.length, l = 2 * Math.PI / s, a = m.cartesian2polar(e[0] - i[0], i[1] - e[1]), e[0] - i[0] < 0 && (a[1] += Math.PI), a[1] < 0 && (a[1] += 2 * Math.PI), h = a[1] - o / 180 * Math.PI + 2 * Math.PI, Math.abs(Math.cos(h % (l / 2))) * n > a[0]) return {
+                    polarIndex: V,
+                    valueIndex: Math.floor((h + l / 2) / l) % s
+                  }
+                }
+              },
+              getIndicator: function(e) {
+                var e = e || 0;
+                return this.polar[e].indicator
+              },
+              refresh: function(e) {
+                e && (this.option = e, this.polar = this.option.polar, this.series = this.option.series),
+                    this.clear(),
+                    this._buildShape()
+              }
+            },
+                h.inherits(t, i),
+                e("../component").define("polar", t),
+                t
+          }),
+      i("echarts/util/coordinates", ["require", "zrender/tool/math"],
+          function(e) {
+            function t(e, t) {
+              return [e * n.sin(t), e * n.cos(t)]
+            }
+            function i(e, t) {
+              return [Math.sqrt(e * e + t * t), Math.atan(t / e)]
+            }
+            var n = e("zrender/tool/math");
+            return {
+              polar2cartesian: t,
+              cartesian2polar: i
+            }
+          }),
+      i("echarts/chart/chord", ["require", "./base", "zrender/shape/Text", "zrender/shape/Line", "zrender/shape/Sector", "../util/shape/Ribbon", "../util/shape/Icon", "zrender/shape/BezierCurve", "../config", "../util/ecData", "zrender/tool/util", "zrender/tool/vector", "../data/Graph", "../layout/Chord", "../chart"],
+          function(e) {
+            "use strict";
+            function t(e, t, n, a, o) {
+              i.call(this, e, t, n, a, o),
+                  this.scaleLineLength = 4,
+                  this.scaleUnitAngle = 4,
+                  this.refresh(a)
+            }
+            var i = e("./base"),
+                n = e("zrender/shape/Text"),
+                a = e("zrender/shape/Line"),
+                o = e("zrender/shape/Sector"),
+                r = e("../util/shape/Ribbon"),
+                s = e("../util/shape/Icon"),
+                l = e("zrender/shape/BezierCurve"),
+                h = e("../config");
+            h.chord = {
+              zlevel: 0,
+              z: 2,
+              clickable: !0,
+              radius: ["65%", "75%"],
+              center: ["50%", "50%"],
+              padding: 2,
+              sort: "none",
+              sortSub: "none",
+              startAngle: 90,
+              clockWise: !0,
+              ribbonType: !0,
+              minRadius: 10,
+              maxRadius: 20,
+              symbol: "circle",
+              showScale: !1,
+              showScaleText: !1,
+              itemStyle: {
+                normal: {
+                  borderWidth: 0,
+                  borderColor: "#000",
+                  label: {
+                    show: !0,
+                    rotate: !1,
+                    distance: 5
+                  },
+                  chordStyle: {
+                    width: 1,
+                    color: "black",
+                    borderWidth: 1,
+                    borderColor: "#999",
+                    opacity: .5
+                  }
+                },
+                emphasis: {
+                  borderWidth: 0,
+                  borderColor: "#000",
+                  chordStyle: {
+                    width: 1,
+                    color: "black",
+                    borderWidth: 1,
+                    borderColor: "#999"
+                  }
+                }
+              }
+            };
+            var m = e("../util/ecData"),
+                V = e("zrender/tool/util"),
+                U = e("zrender/tool/vector"),
+                d = e("../data/Graph"),
+                p = e("../layout/Chord");
+            return t.prototype = {
+              type: h.CHART_TYPE_CHORD,
+              _init: function() {
+                var e = this.series;
+                this.selectedMap = {};
+                for (var t = {},
+                         i = {},
+                         n = 0,
+                         a = e.length; a > n; n++) if (e[n].type === this.type) {
+                  var o = this.isSelected(e[n].name);
+                  this.selectedMap[e[n].name] = o,
+                  o && this.buildMark(n),
+                      this.reformOption(e[n]),
+                      t[e[n].name] = e[n]
+                }
+                for (var n = 0,
+                         a = e.length; a > n; n++) if (e[n].type === this.type) if (e[n].insertToSerie) {
+                  var r = t[e[n].insertToSerie];
+                  e[n]._referenceSerie = r
+                } else i[e[n].name] = [e[n]];
+                for (var n = 0,
+                         a = e.length; a > n; n++) if (e[n].type === this.type && e[n].insertToSerie) {
+                  for (var s = e[n]._referenceSerie; s && s._referenceSerie;) s = s._referenceSerie;
+                  i[s.name] && this.selectedMap[e[n].name] && i[s.name].push(e[n])
+                }
+                for (var l in i) this._buildChords(i[l]);
+                this.addShapeList()
+              },
+              _getNodeCategory: function(e, t) {
+                return e.categories && e.categories[t.category || 0]
+              },
+              _getNodeQueryTarget: function(e, t) {
+                var i = this._getNodeCategory(e, t);
+                return [t, i, e]
+              },
+              _getEdgeQueryTarget: function(e, t, i) {
+                return i = i || "normal",
+                    [t.itemStyle && t.itemStyle[i], e.itemStyle[i].chordStyle]
+              },
+              _buildChords: function(e) {
+                for (var t = [], i = e[0], n = function(e) {
+                      return e.layout.size > 0
+                    },
+                         a = function(e) {
+                           return function(t) {
+                             return e.getEdge(t.node2, t.node1)
+                           }
+                         },
+                         o = 0; o < e.length; o++) {
+                  var r = e[o];
+                  if (this.selectedMap[r.name]) {
+                    var s;
+                    r.matrix ? s = this._getSerieGraphFromDataMatrix(r, i) : r.links && (s = this._getSerieGraphFromNodeLinks(r, i)),
+                        s.filterNode(n, this),
+                    r.ribbonType && s.filterEdge(a(s)),
+                        t.push(s),
+                        s.__serie = r
+                  }
+                }
+                if (t.length) {
+                  var l = t[0];
+                  if (!i.ribbonType) {
+                    var h = i.minRadius,
+                        m = i.maxRadius,
+                        V = 1 / 0,
+                        U = -(1 / 0);
+                    l.eachNode(function(e) {
+                      U = Math.max(e.layout.size, U),
+                          V = Math.min(e.layout.size, V)
+                    });
+                    var d = (m - h) / (U - V);
+                    l.eachNode(function(e) {
+                          var t = this._getNodeQueryTarget(i, e),
+                              n = this.query(t, "symbolSize");
+                          e.layout.size = U === V ? n || V: n || (e.layout.size - V) * d + h
+                        },
+                        this)
+                  }
+                  var c = new p;
+                  c.clockWise = i.clockWise,
+                      c.startAngle = i.startAngle * Math.PI / 180,
+                  c.clockWise || (c.startAngle = -c.startAngle),
+                      c.padding = i.padding * Math.PI / 180,
+                      c.sort = i.sort,
+                      c.sortSub = i.sortSub,
+                      c.directed = i.ribbonType,
+                      c.run(t);
+                  var u = this.query(i, "itemStyle.normal.label.show");
+                  if (i.ribbonType) {
+                    this._buildSectors(i, 0, l, i, t),
+                    u && this._buildLabels(i, 0, l, i, t);
+                    for (var o = 0,
+                             y = 0; o < e.length; o++) this.selectedMap[e[o].name] && this._buildRibbons(e, o, t[y++], i);
+                    i.showScale && this._buildScales(i, 0, l)
+                  } else {
+                    this._buildNodeIcons(i, 0, l, i, t),
+                    u && this._buildLabels(i, 0, l, i, t);
+                    for (var o = 0,
+                             y = 0; o < e.length; o++) this.selectedMap[e[o].name] && this._buildEdgeCurves(e, o, t[y++], i, l)
+                  }
+                  this._initHoverHandler(e, t)
+                }
+              },
+              _getSerieGraphFromDataMatrix: function(e, t) {
+                for (var i = [], n = 0, a = [], o = 0; o < e.matrix.length; o++) a[o] = e.matrix[o].slice();
+                for (var r = e.data || e.nodes,
+                         o = 0; o < r.length; o++) {
+                  var s = {},
+                      l = r[o];
+                  l.rawIndex = o;
+                  for (var h in l)"name" === h ? s.id = l.name: s[h] = l[h];
+                  var m = this._getNodeCategory(t, l),
+                      V = m ? m.name: l.name;
+                  if (this.selectedMap[V] = this.isSelected(V), this.selectedMap[V]) i.push(s),
+                      n++;
+                  else {
+                    a.splice(n, 1);
+                    for (var U = 0; U < a.length; U++) a[U].splice(n, 1)
+                  }
+                }
+                var p = d.fromMatrix(i, a, !0);
+                return p.eachNode(function(e) {
+                  e.layout = {
+                    size: e.data.outValue
+                  },
+                      e.rawIndex = e.data.rawIndex
+                }),
+                    p.eachEdge(function(e) {
+                      e.layout = {
+                        weight: e.data.weight
+                      }
+                    }),
+                    p
+              },
+              _getSerieGraphFromNodeLinks: function(e, t) {
+                for (var i = new d(!0), n = e.data || e.nodes, a = 0, o = n.length; o > a; a++) {
+                  var r = n[a];
+                  if (r && !r.ignore) {
+                    var s = this._getNodeCategory(t, r),
+                        l = s ? s.name: r.name;
+                    if (this.selectedMap[l] = this.isSelected(l), this.selectedMap[l]) {
+                      var h = i.addNode(r.name, r);
+                      h.rawIndex = a
+                    }
+                  }
+                }
+                for (var a = 0,
+                         o = e.links.length; o > a; a++) {
+                  var m = e.links[a],
+                      V = m.source,
+                      U = m.target;
+                  "number" == typeof V && (V = n[V], V && (V = V.name)),
+                  "number" == typeof U && (U = n[U], U && (U = U.name));
+                  var p = i.addEdge(V, U, m);
+                  p && (p.rawIndex = a)
+                }
+                return i.eachNode(function(e) {
+                  var i = e.data.value;
+                  if (null == i) if (i = 0, t.ribbonType) for (var n = 0; n < e.outEdges.length; n++) i += e.outEdges[n].data.weight || 0;
+                  else for (var n = 0; n < e.edges.length; n++) i += e.edges[n].data.weight || 0;
+                  e.layout = {
+                    size: i
+                  }
+                }),
+                    i.eachEdge(function(e) {
+                      e.layout = {
+                        weight: null == e.data.weight ? 1 : e.data.weight
+                      }
+                    }),
+                    i
+              },
+              _initHoverHandler: function(e, t) {
+                var i = e[0],
+                    n = t[0],
+                    a = this;
+                n.eachNode(function(e) {
+                  e.shape.onmouseover = function() {
+                    n.eachNode(function(e) {
+                      e.shape.style.opacity = .1,
+                      e.labelShape && (e.labelShape.style.opacity = .1, e.labelShape.modSelf()),
+                          e.shape.modSelf()
+                    });
+                    for (var i = 0; i < t.length; i++) for (var o = 0; o < t[i].edges.length; o++) {
+                      var r = t[i].edges[o],
+                          s = a._getEdgeQueryTarget(t[i].__serie, r.data);
+                      r.shape.style.opacity = .1 * a.deepQuery(s, "opacity"),
+                          r.shape.modSelf()
+                    }
+                    e.shape.style.opacity = 1,
+                    e.labelShape && (e.labelShape.style.opacity = 1);
+                    for (var i = 0; i < t.length; i++) {
+                      var l = t[i].getNodeById(e.id);
+                      if (l) for (var o = 0; o < l.outEdges.length; o++) {
+                        var r = l.outEdges[o],
+                            s = a._getEdgeQueryTarget(t[i].__serie, r.data);
+                        r.shape.style.opacity = a.deepQuery(s, "opacity");
+                        var h = t[0].getNodeById(r.node2.id);
+                        h && (h.shape && (h.shape.style.opacity = 1), h.labelShape && (h.labelShape.style.opacity = 1))
+                      }
+                    }
+                    a.zr.refreshNextFrame()
+                  },
+                      e.shape.onmouseout = function() {
+                        n.eachNode(function(e) {
+                          e.shape.style.opacity = 1,
+                          e.labelShape && (e.labelShape.style.opacity = 1, e.labelShape.modSelf()),
+                              e.shape.modSelf()
+                        });
+                        for (var e = 0; e < t.length; e++) for (var o = 0; o < t[e].edges.length; o++) {
+                          var r = t[e].edges[o],
+                              s = [r.data, i];
+                          r.shape.style.opacity = a.deepQuery(s, "itemStyle.normal.chordStyle.opacity"),
+                              r.shape.modSelf()
+                        }
+                        a.zr.refreshNextFrame()
+                      }
+                })
+              },
+              _buildSectors: function(e, t, i, n) {
+                var a = this.parseCenter(this.zr, n.center),
+                    r = this.parseRadius(this.zr, n.radius),
+                    s = n.clockWise,
+                    l = s ? 1 : -1;
+                i.eachNode(function(i) {
+                      var h = this._getNodeCategory(n, i.data),
+                          V = this.getColor(h ? h.name: i.id),
+                          U = i.layout.startAngle / Math.PI * 180 * l,
+                          d = i.layout.endAngle / Math.PI * 180 * l,
+                          p = new o({
+                            zlevel: e.zlevel,
+                            z: e.z,
+                            style: {
+                              x: a[0],
+                              y: a[1],
+                              r0: r[0],
+                              r: r[1],
+                              startAngle: U,
+                              endAngle: d,
+                              brushType: "fill",
+                              opacity: 1,
+                              color: V,
+                              clockWise: s
+                            },
+                            clickable: n.clickable,
+                            highlightStyle: {
+                              brushType: "fill"
+                            }
+                          });
+                      p.style.lineWidth = this.deepQuery([i.data, n], "itemStyle.normal.borderWidth"),
+                          p.highlightStyle.lineWidth = this.deepQuery([i.data, n], "itemStyle.emphasis.borderWidth"),
+                          p.style.strokeColor = this.deepQuery([i.data, n], "itemStyle.normal.borderColor"),
+                          p.highlightStyle.strokeColor = this.deepQuery([i.data, n], "itemStyle.emphasis.borderColor"),
+                      p.style.lineWidth > 0 && (p.style.brushType = "both"),
+                      p.highlightStyle.lineWidth > 0 && (p.highlightStyle.brushType = "both"),
+                          m.pack(p, e, t, i.data, i.rawIndex, i.id, i.category),
+                          this.shapeList.push(p),
+                          i.shape = p
+                    },
+                    this)
+              },
+              _buildNodeIcons: function(e, t, i, n) {
+                var a = this.parseCenter(this.zr, n.center),
+                    o = this.parseRadius(this.zr, n.radius),
+                    r = o[1];
+                i.eachNode(function(i) {
+                      var o = i.layout.startAngle,
+                          l = i.layout.endAngle,
+                          h = (o + l) / 2,
+                          V = r * Math.cos(h),
+                          U = r * Math.sin(h),
+                          d = this._getNodeQueryTarget(n, i.data),
+                          p = this._getNodeCategory(n, i.data),
+                          c = this.deepQuery(d, "itemStyle.normal.color");
+                      c || (c = this.getColor(p ? p.name: i.id));
+                      var u = new s({
+                        zlevel: e.zlevel,
+                        z: e.z + 1,
+                        style: {
+                          x: -i.layout.size,
+                          y: -i.layout.size,
+                          width: 2 * i.layout.size,
+                          height: 2 * i.layout.size,
+                          iconType: this.deepQuery(d, "symbol"),
+                          color: c,
+                          brushType: "both",
+                          lineWidth: this.deepQuery(d, "itemStyle.normal.borderWidth"),
+                          strokeColor: this.deepQuery(d, "itemStyle.normal.borderColor")
+                        },
+                        highlightStyle: {
+                          color: this.deepQuery(d, "itemStyle.emphasis.color"),
+                          lineWidth: this.deepQuery(d, "itemStyle.emphasis.borderWidth"),
+                          strokeColor: this.deepQuery(d, "itemStyle.emphasis.borderColor")
+                        },
+                        clickable: n.clickable,
+                        position: [V + a[0], U + a[1]]
+                      });
+                      m.pack(u, e, t, i.data, i.rawIndex, i.id, i.category),
+                          this.shapeList.push(u),
+                          i.shape = u
+                    },
+                    this)
+              },
+              _buildLabels: function(e, t, i, a) {
+                var o = this.query(a, "itemStyle.normal.label.rotate"),
+                    r = this.query(a, "itemStyle.normal.label.distance"),
+                    s = this.parseCenter(this.zr, a.center),
+                    l = this.parseRadius(this.zr, a.radius),
+                    h = a.clockWise,
+                    m = h ? 1 : -1;
+
+                i.eachNode(function(t) {
+                      var i = t.layout.startAngle / Math.PI * 180 * m,
+                          h = t.layout.endAngle / Math.PI * 180 * m,
+                          V = (i * -m + h * -m) / 2;
+                      V %= 360,
+                      0 > V && (V += 360);
+                      var d = 90 >= V || V >= 270;
+                      V = V * Math.PI / 180;
+                      var p = [Math.cos(V), -Math.sin(V)],
+                          c = 0;
+                      c = a.ribbonType ? a.showScaleText ? 35 + r: r: r + t.layout.size;
+                      var u = U.scale([], p, l[1] + c);
+                      U.add(u, u, s);
+                      var y = {
+                        zlevel: e.zlevel,
+                        z: e.z + 1,
+                        hoverable: !1,
+                        style: {
+                          text: null == t.data.label ? t.id: t.data.label,
+                          textAlign: d ? "left": "right"
+                        }
+                      };
+                      o ? (y.rotation = d ? V: Math.PI + V, y.style.x = d ? l[1] + c: -l[1] - c, y.style.y = 0, y.position = s.slice()) : (y.style.x = u[0], y.style.y = u[1]),
+                          y.style.color = this.deepQuery([t.data, a], "itemStyle.normal.label.textStyle.color") || "#000000",
+                          y.style.textFont = this.getFont(this.deepQuery([t.data, a], "itemStyle.normal.label.textStyle")),
+                          y = new n(y),
+                          this.shapeList.push(y),
+                          t.labelShape = y
+                    },
+                    this)
+              },
+              _buildRibbons: function(e, t, i, n) {
+                var a = e[t],
+                    o = this.parseCenter(this.zr, n.center),
+                    s = this.parseRadius(this.zr, n.radius);
+                i.eachEdge(function(l, h) {
+                      var V, U = i.getEdge(l.node2, l.node1);
+                      if (U && !l.shape) {
+                        if (U.shape) return void(l.shape = U.shape);
+                        var d = l.layout.startAngle / Math.PI * 180,
+                            p = l.layout.endAngle / Math.PI * 180,
+                            c = U.layout.startAngle / Math.PI * 180,
+                            u = U.layout.endAngle / Math.PI * 180;
+                        V = this.getColor(1 === e.length ? l.layout.weight <= U.layout.weight ? l.node1.id: l.node2.id: a.name);
+                        var y, g, b = this._getEdgeQueryTarget(a, l.data),
+                            f = this._getEdgeQueryTarget(a, l.data, "emphasis"),
+                            k = new r({
+                              zlevel: a.zlevel,
+                              z: a.z,
+                              style: {
+                                x: o[0],
+                                y: o[1],
+                                r: s[0],
+                                source0: d,
+                                source1: p,
+                                target0: c,
+                                target1: u,
+                                brushType: "both",
+                                opacity: this.deepQuery(b, "opacity"),
+                                color: V,
+                                lineWidth: this.deepQuery(b, "borderWidth"),
+                                strokeColor: this.deepQuery(b, "borderColor"),
+                                clockWise: n.clockWise
+                              },
+                              clickable: n.clickable,
+                              highlightStyle: {
+                                brushType: "both",
+                                opacity: this.deepQuery(f, "opacity"),
+                                lineWidth: this.deepQuery(f, "borderWidth"),
+                                strokeColor: this.deepQuery(f, "borderColor")
+                              }
+                            });
+                        l.layout.weight <= U.layout.weight ? (y = U.node1, g = U.node2) : (y = l.node1, g = l.node2),
+                            m.pack(k, a, t, l.data, null == l.rawIndex ? h: l.rawIndex, l.data.name || y.id + "-" + g.id, y.id, g.id),
+                            this.shapeList.push(k),
+                            l.shape = k
+                      }
+                    },
+                    this)
+              },
+              _buildEdgeCurves: function(e, t, i, n, a) {
+                var o = e[t],
+                    r = this.parseCenter(this.zr, n.center);
+                i.eachEdge(function(e, i) {
+                      var n = a.getNodeById(e.node1.id),
+                          s = a.getNodeById(e.node2.id),
+                          h = n.shape,
+                          V = s.shape,
+                          U = this._getEdgeQueryTarget(o, e.data),
+                          d = this._getEdgeQueryTarget(o, e.data, "emphasis"),
+                          p = new l({
+                            zlevel: o.zlevel,
+                            z: o.z,
+                            style: {
+                              xStart: h.position[0],
+                              yStart: h.position[1],
+                              xEnd: V.position[0],
+                              yEnd: V.position[1],
+                              cpX1: r[0],
+                              cpY1: r[1],
+                              lineWidth: this.deepQuery(U, "width"),
+                              strokeColor: this.deepQuery(U, "color"),
+                              opacity: this.deepQuery(U, "opacity")
+                            },
+                            highlightStyle: {
+                              lineWidth: this.deepQuery(d, "width"),
+                              strokeColor: this.deepQuery(d, "color"),
+                              opacity: this.deepQuery(d, "opacity")
+                            }
+                          });
+                      m.pack(p, o, t, e.data, null == e.rawIndex ? i: e.rawIndex, e.data.name || e.node1.id + "-" + e.node2.id, e.node1.id, e.node2.id),
+                          this.shapeList.push(p),
+                          e.shape = p
+                    },
+                    this)
+              },
+              _buildScales: function(e, t, i) {
+                var o, r, s = e.clockWise,
+                    l = this.parseCenter(this.zr, e.center),
+                    h = this.parseRadius(this.zr, e.radius),
+                    m = s ? 1 : -1,
+                    V = 0,
+                    d = -(1 / 0);
+                e.showScaleText && (i.eachNode(function(e) {
+                  var t = e.data.value;
+                  t > d && (d = t),
+                      V += t
+                }), d > 1e10 ? (o = "b", r = 1e-9) : d > 1e7 ? (o = "m", r = 1e-6) : d > 1e4 ? (o = "k", r = .001) : (o = "", r = 1));
+                var p = V / (360 - e.padding);
+                i.eachNode(function(t) {
+                      for (var i = t.layout.startAngle / Math.PI * 180,
+                               V = t.layout.endAngle / Math.PI * 180,
+                               d = i;;) {
+                        if (s && d > V || !s && V > d) break;
+                        var c = d / 180 * Math.PI,
+                            u = [Math.cos(c), Math.sin(c)],
+                            y = U.scale([], u, h[1] + 1);
+                        U.add(y, y, l);
+                        var g = U.scale([], u, h[1] + this.scaleLineLength);
+                        U.add(g, g, l);
+                        var b = new a({
+                          zlevel: e.zlevel,
+                          z: e.z - 1,
+                          hoverable: !1,
+                          style: {
+                            xStart: y[0],
+                            yStart: y[1],
+                            xEnd: g[0],
+                            yEnd: g[1],
+                            lineCap: "round",
+                            brushType: "stroke",
+                            strokeColor: "#666",
+                            lineWidth: 1
+                          }
+                        });
+                        this.shapeList.push(b),
+                            d += m * this.scaleUnitAngle
+                      }
+                      if (e.showScaleText) for (var f = i,
+                                                    k = 5 * p * this.scaleUnitAngle,
+                                                    x = 0;;) {
+                        if (s && f > V || !s && V > f) break;
+                        var c = f;
+                        c %= 360,
+                        0 > c && (c += 360);
+                        var _ = 90 >= c || c >= 270,
+                            L = new n({
+                              zlevel: e.zlevel,
+                              z: e.z - 1,
+                              hoverable: !1,
+                              style: {
+                                x: _ ? h[1] + this.scaleLineLength + 4 : -h[1] - this.scaleLineLength - 4,
+                                y: 0,
+                                text: Math.round(10 * x) / 10 + o,
+                                textAlign: _ ? "left": "right"
+                              },
+                              position: l.slice(),
+                              rotation: _ ? [ - c / 180 * Math.PI, 0, 0] : [ - (c + 180) / 180 * Math.PI, 0, 0]
+                            });
+                        this.shapeList.push(L),
+                            x += k * r,
+                            f += m * this.scaleUnitAngle * 5
+                      }
+                    },
+                    this)
+              },
+              refresh: function(e) {
+                if (e && (this.option = e, this.series = e.series), this.legend = this.component.legend, this.legend) this.getColor = function(e) {
+                  return this.legend.getColor(e)
+                },
+                    this.isSelected = function(e) {
+                      return this.legend.isSelected(e)
+                    };
+                else {
+                  var t = {},
+                      i = 0;
+                  this.getColor = function(e) {
+                    return t[e] ? t[e] : (t[e] || (t[e] = this.zr.getColor(i++)), t[e])
+                  },
+                      this.isSelected = function() {
+                        return ! 0
+                      }
+                }
+                this.backupShapeList(),
+                    this._init()
+              },
+              reformOption: function(e) {
+                var t = V.merge;
+                e = t(t(e || {},
+                    this.ecTheme.chord), h.chord),
+                    e.itemStyle.normal.label.textStyle = this.getTextStyle(e.itemStyle.normal.label.textStyle),
+                    this.z = e.z,
+                    this.zlevel = e.zlevel
+              }
+            },
+                V.inherits(t, i),
+                e("../chart").define("chord", t),
+                t
+          }),
+      i("echarts/util/shape/Ribbon", ["require", "zrender/shape/Base", "zrender/shape/util/PathProxy", "zrender/tool/util", "zrender/tool/area"],
+          function(e) {
+            function t(e) {
+              i.call(this, e),
+                  this._pathProxy = new n
+            }
+            var i = e("zrender/shape/Base"),
+                n = e("zrender/shape/util/PathProxy"),
+                a = e("zrender/tool/util"),
+                o = e("zrender/tool/area");
+            return t.prototype = {
+              type: "ribbon",
+              buildPath: function(e, t) {
+                var i = t.clockWise || !1,
+                    n = this._pathProxy;
+                n.begin(e);
+                var a = t.x,
+                    o = t.y,
+                    r = t.r,
+                    s = t.source0 / 180 * Math.PI,
+                    l = t.source1 / 180 * Math.PI,
+                    h = t.target0 / 180 * Math.PI,
+                    m = t.target1 / 180 * Math.PI,
+                    V = a + Math.cos(s) * r,
+                    U = o + Math.sin(s) * r,
+                    d = a + Math.cos(l) * r,
+                    p = o + Math.sin(l) * r,
+                    c = a + Math.cos(h) * r,
+                    u = o + Math.sin(h) * r,
+                    y = a + Math.cos(m) * r,
+                    g = o + Math.sin(m) * r;
+                n.moveTo(V, U),
+                    n.arc(a, o, t.r, s, l, !i),
+                    n.bezierCurveTo(.7 * (a - d) + d, .7 * (o - p) + p, .7 * (a - c) + c, .7 * (o - u) + u, c, u),
+                (t.source0 !== t.target0 || t.source1 !== t.target1) && (n.arc(a, o, t.r, h, m, !i), n.bezierCurveTo(.7 * (a - y) + y, .7 * (o - g) + g, .7 * (a - V) + V, .7 * (o - U) + U, V, U))
+              },
+              getRect: function(e) {
+                return e.__rect ? e.__rect: (this._pathProxy.isEmpty() || this.buildPath(null, e), this._pathProxy.fastBoundingRect())
+              },
+              isCover: function(e, t) {
+                var i = this.getRect(this.style);
+                return e >= i.x && e <= i.x + i.width && t >= i.y && t <= i.y + i.height ? o.isInsidePath(this._pathProxy.pathCommands, 0, "fill", e, t) : void 0
+              }
+            },
+                a.inherits(t, i),
+                t
+          }),
+      i("echarts/data/Graph", ["require", "zrender/tool/util"],
+          function(e) {
+            var t = e("zrender/tool/util"),
+                i = function(e) {
+                  this._directed = e || !1,
+                      this.nodes = [],
+                      this.edges = [],
+                      this._nodesMap = {},
+                      this._edgesMap = {}
+                };
+            i.prototype.isDirected = function() {
+              return this._directed
+            },
+                i.prototype.addNode = function(e, t) {
+                  if (this._nodesMap[e]) return this._nodesMap[e];
+                  var n = new i.Node(e, t);
+                  return this.nodes.push(n),
+                      this._nodesMap[e] = n,
+                      n
+                },
+                i.prototype.getNodeById = function(e) {
+                  return this._nodesMap[e]
+                },
+                i.prototype.addEdge = function(e, t, n) {
+                  if ("string" == typeof e && (e = this._nodesMap[e]), "string" == typeof t && (t = this._nodesMap[t]), e && t) {
+                    var a = e.id + "-" + t.id;
+                    if (this._edgesMap[a]) return this._edgesMap[a];
+                    var o = new i.Edge(e, t, n);
+                    return this._directed && (e.outEdges.push(o), t.inEdges.push(o)),
+                        e.edges.push(o),
+                    e !== t && t.edges.push(o),
+                        this.edges.push(o),
+                        this._edgesMap[a] = o,
+                        o
+                  }
+                },
+                i.prototype.removeEdge = function(e) {
+                  var i = e.node1,
+                      n = e.node2,
+                      a = i.id + "-" + n.id;
+                  this._directed && (i.outEdges.splice(t.indexOf(i.outEdges, e), 1), n.inEdges.splice(t.indexOf(n.inEdges, e), 1)),
+                      i.edges.splice(t.indexOf(i.edges, e), 1),
+                  i !== n && n.edges.splice(t.indexOf(n.edges, e), 1),
+                      delete this._edgesMap[a],
+                      this.edges.splice(t.indexOf(this.edges, e), 1)
+                },
+                i.prototype.getEdge = function(e, t) {
+                  return "string" != typeof e && (e = e.id),
+                  "string" != typeof t && (t = t.id),
+                      this._directed ? this._edgesMap[e + "-" + t] : this._edgesMap[e + "-" + t] || this._edgesMap[t + "-" + e]
+                },
+                i.prototype.removeNode = function(e) {
+                  if ("string" != typeof e || (e = this._nodesMap[e])) {
+                    delete this._nodesMap[e.id],
+                        this.nodes.splice(t.indexOf(this.nodes, e), 1);
+                    for (var i = 0; i < this.edges.length;) {
+                      var n = this.edges[i];
+                      n.node1 === e || n.node2 === e ? this.removeEdge(n) : i++
+                    }
+                  }
+                },
+                i.prototype.filterNode = function(e, t) {
+                  for (var i = this.nodes.length,
+                           n = 0; i > n;) e.call(t, this.nodes[n], n) ? n++:(this.removeNode(this.nodes[n]), i--)
+                },
+                i.prototype.filterEdge = function(e, t) {
+                  for (var i = this.edges.length,
+                           n = 0; i > n;) e.call(t, this.edges[n], n) ? n++:(this.removeEdge(this.edges[n]), i--)
+                },
+                i.prototype.eachNode = function(e, t) {
+                  for (var i = this.nodes.length,
+                           n = 0; i > n; n++) this.nodes[n] && e.call(t, this.nodes[n], n)
+                },
+                i.prototype.eachEdge = function(e, t) {
+                  for (var i = this.edges.length,
+                           n = 0; i > n; n++) this.edges[n] && e.call(t, this.edges[n], n)
+                },
+                i.prototype.clear = function() {
+                  this.nodes.length = 0,
+                      this.edges.length = 0,
+                      this._nodesMap = {},
+                      this._edgesMap = {}
+                },
+                i.prototype.breadthFirstTraverse = function(e, t, i, n) {
+                  if ("string" == typeof t && (t = this._nodesMap[t]), t) {
+                    var a = "edges";
+                    "out" === i ? a = "outEdges": "in" === i && (a = "inEdges");
+                    for (var o = 0; o < this.nodes.length; o++) this.nodes[o].__visited = !1;
+                    if (!e.call(n, t, null)) for (var r = [t]; r.length;) for (var s = r.shift(), l = s[a], o = 0; o < l.length; o++) {
+                      var h = l[o],
+                          m = h.node1 === s ? h.node2: h.node1;
+                      if (!m.__visited) {
+                        if (e.call(m, m, s)) return;
+                        r.push(m),
+                            m.__visited = !0
+                      }
+                    }
+                  }
+                },
+                i.prototype.clone = function() {
+                  for (var e = new i(this._directed), t = 0; t < this.nodes.length; t++) e.addNode(this.nodes[t].id, this.nodes[t].data);
+                  for (var t = 0; t < this.edges.length; t++) {
+                    var n = this.edges[t];
+                    e.addEdge(n.node1.id, n.node2.id, n.data)
+                  }
+                  return e
+                };
+            var n = function(e, t) {
+              this.id = e,
+                  this.data = t || null,
+                  this.inEdges = [],
+                  this.outEdges = [],
+                  this.edges = []
+            };
+            n.prototype.degree = function() {
+              return this.edges.length
+            },
+                n.prototype.inDegree = function() {
+                  return this.inEdges.length
+                },
+                n.prototype.outDegree = function() {
+                  return this.outEdges.length
+                };
+            var a = function(e, t, i) {
+              this.node1 = e,
+                  this.node2 = t,
+                  this.data = i || null
+            };
+            return i.Node = n,
+                i.Edge = a,
+                i.fromMatrix = function(e, t, n) {
+                  if (t && t.length && t[0].length === t.length && e.length === t.length) {
+                    for (var a = t.length,
+                             o = new i(n), r = 0; a > r; r++) {
+                      var s = o.addNode(e[r].id, e[r]);
+                      s.data.value = 0,
+                      n && (s.data.outValue = s.data.inValue = 0)
+                    }
+                    for (var r = 0; a > r; r++) for (var l = 0; a > l; l++) {
+                      var h = t[r][l];
+                      n && (o.nodes[r].data.outValue += h, o.nodes[l].data.inValue += h),
+                          o.nodes[r].data.value += h,
+                          o.nodes[l].data.value += h
+                    }
+                    for (var r = 0; a > r; r++) for (var l = r; a > l; l++) {
+                      var h = t[r][l];
+                      if (0 !== h) {
+                        var m = o.nodes[r],
+                            V = o.nodes[l],
+                            U = o.addEdge(m, V, {});
+                        if (U.data.weight = h, r !== l && n && t[l][r]) {
+                          var d = o.addEdge(V, m, {});
+                          d.data.weight = t[l][r]
+                        }
+                      }
+                    }
+                    return o
+                  }
+                },
+                i
+          }),
+      i("echarts/layout/Chord", ["require"],
+          function() {
+            var e = function(e) {
+              e = e || {},
+                  this.sort = e.sort || null,
+                  this.sortSub = e.sortSub || null,
+                  this.padding = .05,
+                  this.startAngle = e.startAngle || 0,
+                  this.clockWise = null == e.clockWise ? !1 : e.clockWise,
+                  this.center = e.center || [0, 0],
+                  this.directed = !0
+            };
+            e.prototype.run = function(e) {
+              e instanceof Array || (e = [e]);
+              var n = e.length;
+              if (n) {
+                for (var a = e[0], o = a.nodes.length, r = [], s = 0, l = 0; o > l; l++) {
+                  var h = a.nodes[l],
+                      m = {
+                        size: 0,
+                        subGroups: [],
+                        node: h
+                      };
+                  r.push(m);
+                  for (var V = 0,
+                           U = 0; U < e.length; U++) {
+                    var d = e[U],
+                        p = d.getNodeById(h.id);
+                    if (p) {
+                      m.size += p.layout.size;
+                      for (var c = this.directed ? p.outEdges: p.edges, u = 0; u < c.length; u++) {
+                        var y = c[u],
+                            g = y.layout.weight;
+                        m.subGroups.push({
+                          weight: g,
+                          edge: y,
+                          graph: d
+                        }),
+                            V += g
+                      }
+                    }
+                  }
+                  s += m.size;
+                  for (var b = m.size / V,
+                           u = 0; u < m.subGroups.length; u++) m.subGroups[u].weight *= b;
+                  "ascending" === this.sortSub ? m.subGroups.sort(t) : "descending" === this.sort && (m.subGroups.sort(t), m.subGroups.reverse())
+                }
+                "ascending" === this.sort ? r.sort(i) : "descending" === this.sort && (r.sort(i), r.reverse());
+                for (var b = (2 * Math.PI - this.padding * o) / s, f = this.startAngle, k = this.clockWise ? 1 : -1, l = 0; o > l; l++) {
+                  var m = r[l];
+                  m.node.layout.startAngle = f,
+                      m.node.layout.endAngle = f + k * m.size * b,
+                      m.node.layout.subGroups = [];
+                  for (var u = 0; u < m.subGroups.length; u++) {
+                    var x = m.subGroups[u];
+                    x.edge.layout.startAngle = f,
+                        f += k * x.weight * b,
+                        x.edge.layout.endAngle = f
+                  }
+                  f = m.node.layout.endAngle + k * this.padding
+                }
+              }
+            };
+            var t = function(e, t) {
+                  return e.weight - t.weight
+                },
+                i = function(e, t) {
+                  return e.size - t.size
+                };
+            return e
+          }),
+      i("echarts/chart/force", ["require", "./base", "../data/Graph", "../layout/Force", "zrender/shape/Line", "zrender/shape/BezierCurve", "zrender/shape/Image", "../util/shape/Icon", "../config", "../util/ecData", "zrender/tool/util", "zrender/config", "zrender/tool/vector", "../chart"],
+          function(e) {
+            "use strict";
+            function t(e, t, o, h, m) {
+              var V = this;
+              r.call(this, e, t, o, h, m),
+                  this.__nodePositionMap = {},
+                  this._graph = new s(!0),
+                  this._layout = new l,
+                  this._layout.onupdate = function() {
+                    V._step()
+                  },
+                  this._steps = 1,
+                  this.ondragstart = function() {
+                    i.apply(V, arguments)
+                  },
+                  this.ondragend = function() {
+                    a.apply(V, arguments)
+                  },
+                  this.ondrop = function() {},
+                  this.shapeHandler.ondragstart = function() {
+                    V.isDragstart = !0
+                  },
+                  this.onmousemove = function() {
+                    n.apply(V, arguments)
+                  },
+                  this.refresh(h)
+            }
+            function i(e) {
+              if (this.isDragstart && e.target) {
+                var t = e.target;
+                t.fixed = !0,
+                    this.isDragstart = !1,
+                    this.zr.on(u.EVENT.MOUSEMOVE, this.onmousemove)
+              }
+            }
+            function n() {
+              this._layout.temperature = .8,
+                  this._step()
+            }
+            function a(e, t) {
+              if (this.isDragend && e.target) {
+                var i = e.target;
+                i.fixed = !1,
+                    t.dragIn = !0,
+                    t.needRefresh = !1,
+                    this.isDragend = !1,
+                    this.zr.un(u.EVENT.MOUSEMOVE, this.onmousemove)
+              }
+            }
+            function o(e, t, i) {
+              var n = y.create();
+              return n[0] = (Math.random() - .5) * i + e,
+                  n[1] = (Math.random() - .5) * i + t,
+                  n
+            }
+            var r = e("./base"),
+                s = e("../data/Graph"),
+                l = e("../layout/Force"),
+                h = e("zrender/shape/Line"),
+                m = e("zrender/shape/BezierCurve"),
+                V = e("zrender/shape/Image"),
+                U = e("../util/shape/Icon"),
+                d = e("../config");
+            d.force = {
+              zlevel: 1,
+              z: 2,
+              center: ["50%", "50%"],
+              size: "100%",
+              preventOverlap: !1,
+              coolDown: .99,
+              minRadius: 10,
+              maxRadius: 20,
+              ratioScaling: !1,
+              large: !1,
+              useWorker: !1,
+              steps: 1,
+              scaling: 1,
+              gravity: 1,
+              symbol: "circle",
+              symbolSize: 0,
+              linkSymbol: null,
+              linkSymbolSize: [10, 15],
+              draggable: !0,
+              clickable: !0,
+              roam: !1,
+              itemStyle: {
+                normal: {
+                  label: {
+                    show: !1,
+                    position: "inside"
+                  },
+                  nodeStyle: {
+                    brushType: "both",
+                    borderColor: "#5182ab",
+                    borderWidth: 1
+                  },
+                  linkStyle: {
+                    color: "#5182ab",
+                    width: 1,
+                    type: "line"
+                  }
+                },
+                emphasis: {
+                  label: {
+                    show: !1
+                  },
+                  nodeStyle: {},
+                  linkStyle: {
+                    opacity: 0
+                  }
+                }
+              }
+            };
+            var p = e("../util/ecData"),
+                c = e("zrender/tool/util"),
+                u = e("zrender/config"),
+                y = e("zrender/tool/vector");
+            return t.prototype = {
+              constructor: t,
+              type: d.CHART_TYPE_FORCE,
+              _init: function() {
+                this.selectedMap = {};
+                var e, t = this.component.legend,
+                    i = this.series;
+                this.clear();
+                for (var n = 0,
+                         a = i.length; a > n; n++) {
+                  var o = i[n];
+                  if (o.type === d.CHART_TYPE_FORCE) {
+                    if (i[n] = this.reformOption(i[n]), e = i[n].name || "", this.selectedMap[e] = t ? t.isSelected(e) : !0, !this.selectedMap[e]) continue;
+                    this.buildMark(n),
+                        this._initSerie(o, n);
+                    break
+                  }
+                }
+                this.animationEffect()
+              },
+              _getNodeCategory: function(e, t) {
+                return e.categories && e.categories[t.category || 0]
+              },
+              _getNodeQueryTarget: function(e, t, i) {
+                i = i || "normal";
+                var n = this._getNodeCategory(e, t) || {};
+                return [t.itemStyle && t.itemStyle[i], n && n.itemStyle && n.itemStyle[i], e.itemStyle[i].nodeStyle]
+              },
+              _getEdgeQueryTarget: function(e, t, i) {
+                return i = i || "normal",
+                    [t.itemStyle && t.itemStyle[i], e.itemStyle[i].linkStyle]
+              },
+              _initSerie: function(e, t) {
+                this._temperature = 1,
+                    e.matrix ? this._graph = this._getSerieGraphFromDataMatrix(e) : e.links && (this._graph = this._getSerieGraphFromNodeLinks(e)),
+                    this._buildLinkShapes(e, t),
+                    this._buildNodeShapes(e, t);
+                var i = e.roam === !0 || "move" === e.roam,
+                    n = e.roam === !0 || "scale" === e.roam;
+                this.zr.modLayer(this.getZlevelBase(), {
+                  panable: i,
+                  zoomable: n
+                }),
+                (this.query("markPoint.effect.show") || this.query("markLine.effect.show")) && this.zr.modLayer(d.EFFECT_ZLEVEL, {
+                  panable: i,
+                  zoomable: n
+                }),
+                    this._initLayout(e),
+                    this._step()
+              },
+              _getSerieGraphFromDataMatrix: function(e) {
+                for (var t = [], i = 0, n = [], a = 0; a < e.matrix.length; a++) n[a] = e.matrix[a].slice();
+                for (var o = e.data || e.nodes,
+                         a = 0; a < o.length; a++) {
+                  var r = {},
+                      l = o[a];
+                  for (var h in l)"name" === h ? r.id = l.name: r[h] = l[h];
+                  var m = this._getNodeCategory(e, l),
+                      V = m ? m.name: l.name;
+                  if (this.selectedMap[V] = this.isSelected(V), this.selectedMap[V]) t.push(r),
+                      i++;
+                  else {
+                    n.splice(i, 1);
+                    for (var U = 0; U < n.length; U++) n[U].splice(i, 1)
+                  }
+                }
+                var d = s.fromMatrix(t, n, !0);
+                return d.eachNode(function(e, t) {
+                  e.layout = {
+                    size: e.data.value,
+                    mass: 0
+                  },
+                      e.rawIndex = t
+                }),
+                    d.eachEdge(function(e) {
+                      e.layout = {
+                        weight: e.data.weight
+                      }
+                    }),
+                    d
+              },
+              _getSerieGraphFromNodeLinks: function(e) {
+                for (var t = new s(!0), i = e.data || e.nodes, n = 0, a = i.length; a > n; n++) {
+                  var o = i[n];
+                  if (o && !o.ignore) {
+                    var r = this._getNodeCategory(e, o),
+                        l = r ? r.name: o.name;
+                    if (this.selectedMap[l] = this.isSelected(l), this.selectedMap[l]) {
+                      var h = t.addNode(o.name, o);
+                      h.rawIndex = n
+                    }
+                  }
+                }
+                for (var n = 0,
+                         a = e.links.length; a > n; n++) {
+                  var m = e.links[n],
+                      V = m.source,
+                      U = m.target;
+                  "number" == typeof V && (V = i[V], V && (V = V.name)),
+                  "number" == typeof U && (U = i[U], U && (U = U.name));
+                  var d = t.addEdge(V, U, m);
+                  d && (d.rawIndex = n)
+                }
+                return t.eachNode(function(e) {
+                  var t = e.data.value;
+                  if (null == t) {
+                    t = 0;
+                    for (var i = 0; i < e.edges.length; i++) t += e.edges[i].data.weight || 0
+                  }
+                  e.layout = {
+                    size: t,
+                    mass: 0
+                  }
+                }),
+                    t.eachEdge(function(e) {
+                      e.layout = {
+                        weight: null == e.data.weight ? 1 : e.data.weight
+                      }
+                    }),
+                    t
+              },
+              _initLayout: function(e) {
+                var t = this._graph,
+                    i = t.nodes.length,
+                    n = this.query(e, "minRadius"),
+                    a = this.query(e, "maxRadius");
+                this._steps = e.steps || 1;
+                var r = this._layout;
+                r.center = this.parseCenter(this.zr, e.center),
+                    r.width = this.parsePercent(e.size, this.zr.getWidth()),
+                    r.height = this.parsePercent(e.size, this.zr.getHeight()),
+                    r.large = e.large,
+                    r.scaling = e.scaling,
+                    r.ratioScaling = e.ratioScaling,
+                    r.gravity = e.gravity,
+                    r.temperature = 1,
+                    r.coolDown = e.coolDown,
+                    r.preventNodeEdgeOverlap = e.preventOverlap,
+                    r.preventNodeOverlap = e.preventOverlap;
+                for (var s = 1 / 0,
+                         l = -(1 / 0), h = 0; i > h; h++) {
+                  var m = t.nodes[h];
+                  l = Math.max(m.layout.size, l),
+                      s = Math.min(m.layout.size, s)
+                }
+                for (var V = l - s,
+                         h = 0; i > h; h++) {
+                  var m = t.nodes[h];
+                  V > 0 ? (m.layout.size = (m.layout.size - s) * (a - n) / V + n, m.layout.mass = m.layout.size / a) : (m.layout.size = (a - n) / 2, m.layout.mass = .5)
+                }
+                for (var h = 0; i > h; h++) {
+                  var m = t.nodes[h];
+                  if ("undefined" != typeof this.__nodePositionMap[m.id]) m.layout.position = y.create(),
+                      y.copy(m.layout.position, this.__nodePositionMap[m.id]);
+                  else if ("undefined" != typeof m.data.initial) m.layout.position = y.create(),
+                      y.copy(m.layout.position, m.data.initial);
+                  else {
+                    var U = this._layout.center,
+                        d = Math.min(this._layout.width, this._layout.height);
+                    m.layout.position = o(U[0], U[1], .8 * d)
+                  }
+                  var p = m.shape.style,
+                      c = m.layout.size;
+                  p.width = p.width || 2 * c,
+                      p.height = p.height || 2 * c,
+                      p.x = -p.width / 2,
+                      p.y = -p.height / 2,
+                      y.copy(m.shape.position, m.layout.position)
+                }
+                i = t.edges.length,
+                    l = -(1 / 0);
+                for (var h = 0; i > h; h++) {
+                  var u = t.edges[h];
+                  u.layout.weight > l && (l = u.layout.weight)
+                }
+                for (var h = 0; i > h; h++) {
+                  var u = t.edges[h];
+                  u.layout.weight /= l
+                }
+                this._layout.init(t, e.useWorker)
+              },
+              _buildNodeShapes: function(e, t) {
+                var i = this._graph,
+                    n = this.query(e, "categories");
+                i.eachNode(function(i) {
+                      var a = this._getNodeCategory(e, i.data),
+                          o = [i.data, a, e],
+                          r = this._getNodeQueryTarget(e, i.data),
+                          s = this._getNodeQueryTarget(e, i.data, "emphasis"),
+                          l = new U({
+                            style: {
+                              x: 0,
+                              y: 0,
+                              color: this.deepQuery(r, "color"),
+                              brushType: "both",
+                              strokeColor: this.deepQuery(r, "strokeColor") || this.deepQuery(r, "borderColor"),
+                              lineWidth: this.deepQuery(r, "lineWidth") || this.deepQuery(r, "borderWidth")
+                            },
+                            highlightStyle: {
+                              color: this.deepQuery(s, "color"),
+                              strokeColor: this.deepQuery(s, "strokeColor") || this.deepQuery(s, "borderColor"),
+                              lineWidth: this.deepQuery(s, "lineWidth") || this.deepQuery(s, "borderWidth")
+                            },
+                            clickable: e.clickable,
+                            zlevel: this.getZlevelBase(),
+                            z: this.getZBase()
+                          });
+                      l.style.color || (l.style.color = this.getColor(a ? a.name: i.id)),
+                          l.style.iconType = this.deepQuery(o, "symbol");
+                      var h = this.deepQuery(o, "symbolSize") || 0;
+                      "number" == typeof h && (h = [h, h]),
+                          l.style.width = 2 * h[0],
+                          l.style.height = 2 * h[1],
+                      l.style.iconType.match("image") && (l.style.image = l.style.iconType.replace(new RegExp("^image:\\/\\/"), ""), l = new V({
+                        style: l.style,
+                        highlightStyle: l.highlightStyle,
+                        clickable: l.clickable,
+                        zlevel: this.getZlevelBase(),
+                        z: this.getZBase()
+                      })),
+                      this.deepQuery(o, "itemStyle.normal.label.show") && (l.style.text = null == i.data.label ? i.id: i.data.label, l.style.textPosition = this.deepQuery(o, "itemStyle.normal.label.position"), l.style.textColor = this.deepQuery(o, "itemStyle.normal.label.textStyle.color"), l.style.textFont = this.getFont(this.deepQuery(o, "itemStyle.normal.label.textStyle") || {})),
+                      this.deepQuery(o, "itemStyle.emphasis.label.show") && (l.highlightStyle.textPosition = this.deepQuery(o, "itemStyle.emphasis.label.position"), l.highlightStyle.textColor = this.deepQuery(o, "itemStyle.emphasis.label.textStyle.color"), l.highlightStyle.textFont = this.getFont(this.deepQuery(o, "itemStyle.emphasis.label.textStyle") || {})),
+                      this.deepQuery(o, "draggable") && (this.setCalculable(l), l.dragEnableTime = 0, l.draggable = !0, l.ondragstart = this.shapeHandler.ondragstart, l.ondragover = null);
+                      var m = "";
+                      if ("undefined" != typeof i.category) {
+                        var a = n[i.category];
+                        m = a && a.name || ""
+                      }
+                      p.pack(l, e, t, i.data, i.rawIndex, i.data.name || "", i.category),
+                          this.shapeList.push(l),
+                          this.zr.addShape(l),
+                          i.shape = l
+                    },
+                    this)
+              },
+              _buildLinkShapes: function(e, t) {
+                for (var i = this._graph,
+                         n = i.edges.length,
+                         a = 0; n > a; a++) {
+                  var o = i.edges[a],
+                      r = o.data,
+                      s = o.node1,
+                      l = o.node2,
+                      V = i.getEdge(l, s),
+                      d = this._getEdgeQueryTarget(e, r),
+                      u = this.deepQuery(d, "type");
+                  e.linkSymbol && "none" !== e.linkSymbol && (u = "line");
+                  var y = "line" === u ? h: m,
+                      g = new y({
+                        style: {
+                          xStart: 0,
+                          yStart: 0,
+                          xEnd: 0,
+                          yEnd: 0
+                        },
+                        clickable: this.query(e, "clickable"),
+                        highlightStyle: {},
+                        zlevel: this.getZlevelBase(),
+                        z: this.getZBase()
+                      });
+                  if (V && V.shape && (g.style.offset = 4, V.shape.style.offset = 4), c.merge(g.style, this.query(e, "itemStyle.normal.linkStyle"), !0), c.merge(g.highlightStyle, this.query(e, "itemStyle.emphasis.linkStyle"), !0), "undefined" != typeof r.itemStyle && (r.itemStyle.normal && c.merge(g.style, r.itemStyle.normal, !0), r.itemStyle.emphasis && c.merge(g.highlightStyle, r.itemStyle.emphasis, !0)), g.style.lineWidth = g.style.lineWidth || g.style.width, g.style.strokeColor = g.style.strokeColor || g.style.color, g.highlightStyle.lineWidth = g.highlightStyle.lineWidth || g.highlightStyle.width, g.highlightStyle.strokeColor = g.highlightStyle.strokeColor || g.highlightStyle.color, p.pack(g, e, t, o.data, null == o.rawIndex ? a: o.rawIndex, o.data.name || s.id + " - " + l.id, s.id, l.id), this.shapeList.push(g), this.zr.addShape(g), o.shape = g, e.linkSymbol && "none" !== e.linkSymbol) {
+                    var b = new U({
+                      style: {
+                        x: -5,
+                        y: 0,
+                        width: e.linkSymbolSize[0],
+                        height: e.linkSymbolSize[1],
+                        iconType: e.linkSymbol,
+                        brushType: "fill",
+                        color: g.style.strokeColor
+                      },
+                      highlightStyle: {
+                        brushType: "fill"
+                      },
+                      position: [0, 0],
+                      rotation: 0,
+                      zlevel: this.getZlevelBase(),
+                      z: this.getZBase()
+                    });
+                    g._symbolShape = b,
+                        this.shapeList.push(b),
+                        this.zr.addShape(b)
+                  }
+                }
+              },
+              _updateLinkShapes: function() {
+                for (var e = y.create(), t = y.create(), i = y.create(), n = y.create(), a = this._graph.edges, o = 0, r = a.length; r > o; o++) {
+                  var s = a[o],
+                      l = s.node1.shape,
+                      h = s.node2.shape;
+                  y.copy(i, l.position),
+                      y.copy(n, h.position);
+                  var m = s.shape.style;
+                  if (y.sub(e, i, n), y.normalize(e, e), m.offset ? (t[0] = e[1], t[1] = -e[0], y.scaleAndAdd(i, i, t, m.offset), y.scaleAndAdd(n, n, t, m.offset)) : "bezier-curve" === s.shape.type && (m.cpX1 = (i[0] + n[0]) / 2 - (n[1] - i[1]) / 4, m.cpY1 = (i[1] + n[1]) / 2 - (i[0] - n[0]) / 4), m.xStart = i[0], m.yStart = i[1], m.xEnd = n[0], m.yEnd = n[1], s.shape.modSelf(), s.shape._symbolShape) {
+                    var V = s.shape._symbolShape;
+                    y.copy(V.position, n),
+                        y.scaleAndAdd(V.position, V.position, e, h.style.width / 2 + 2);
+                    var U = Math.atan2(e[1], e[0]);
+                    V.rotation = Math.PI / 2 - U,
+                        V.modSelf()
+                  }
+                }
+              },
+              _syncNodePositions: function() {
+                for (var e = this._graph,
+                         t = 0; t < e.nodes.length; t++) {
+                  var i = e.nodes[t],
+                      n = i.layout.position,
+                      a = i.data,
+                      o = i.shape,
+                      r = o.fixed || a.fixX,
+                      s = o.fixed || a.fixY;
+                  r === !0 ? r = 1 : isNaN(r) && (r = 0),
+                      s === !0 ? s = 1 : isNaN(s) && (s = 0),
+                      o.position[0] += (n[0] - o.position[0]) * (1 - r),
+                      o.position[1] += (n[1] - o.position[1]) * (1 - s),
+                      y.copy(n, o.position);
+                  var l = a.name;
+                  if (l) {
+                    var h = this.__nodePositionMap[l];
+                    h || (h = this.__nodePositionMap[l] = y.create()),
+                        y.copy(h, n)
+                  }
+                  o.modSelf()
+                }
+              },
+              _step: function() {
+                this._syncNodePositions(),
+                    this._updateLinkShapes(),
+                    this.zr.refreshNextFrame(),
+                    this._layout.temperature > .01 ? this._layout.step(this._steps) : this.messageCenter.dispatch(d.EVENT.FORCE_LAYOUT_END, {},
+                        {},
+                        this.myChart)
+              },
+              refresh: function(e) {
+                if (e && (this.option = e, this.series = this.option.series), this.legend = this.component.legend, this.legend) this.getColor = function(e) {
+                  return this.legend.getColor(e)
+                },
+                    this.isSelected = function(e) {
+                      return this.legend.isSelected(e)
+                    };
+                else {
+                  var t = {},
+                      i = 0;
+                  this.getColor = function(e) {
+                    return t[e] ? t[e] : (t[e] || (t[e] = this.zr.getColor(i++)), t[e])
+                  },
+                      this.isSelected = function() {
+                        return ! 0
+                      }
+                }
+                this._init()
+              },
+              dispose: function() {
+                this.clear(),
+                    this.shapeList = null,
+                    this.effectList = null,
+                    this._layout.dispose(),
+                    this._layout = null,
+                    this.__nodePositionMap = {}
+              },
+              getPosition: function() {
+                var e = [];
+                return this._graph.eachNode(function(t) {
+                  t.layout && e.push({
+                    name: t.data.name,
+                    position: Array.prototype.slice.call(t.layout.position)
+                  })
+                }),
+                    e
+              }
+            },
+                c.inherits(t, r),
+                e("../chart").define("force", t),
+                t
+          }),
+      i("echarts/layout/Force", ["require", "./forceLayoutWorker", "zrender/tool/vector"],
+          function(e) {
+            function t() {
+              if ("undefined" != typeof Worker && "undefined" != typeof Blob) try {
+                var e = new Blob([n.getWorkerCode()]);
+                i = window.URL.createObjectURL(e)
+              } catch(t) {
+                i = ""
+              }
+              return i
+            }
+            var i, n = e("./forceLayoutWorker"),
+                a = e("zrender/tool/vector"),
+                o = window.requestAnimationFrame || window.msRequestAnimationFrame || window.mozRequestAnimationFrame || window.webkitRequestAnimationFrame ||
+                    function(e) {
+                      setTimeout(e, 16)
+                    },
+                r = "undefined" == typeof Float32Array ? Array: Float32Array,
+                s = function(e) {
+                  "undefined" == typeof i && t(),
+                      e = e || {},
+                      this.width = e.width || 500,
+                      this.height = e.height || 500,
+                      this.center = e.center || [this.width / 2, this.height / 2],
+                      this.ratioScaling = e.ratioScaling || !1,
+                      this.scaling = e.scaling || 1,
+                      this.gravity = "undefined" != typeof e.gravity ? e.gravity: 1,
+                      this.large = e.large || !1,
+                      this.preventNodeOverlap = e.preventNodeOverlap || !1,
+                      this.preventNodeEdgeOverlap = e.preventNodeEdgeOverlap || !1,
+                      this.maxSpeedIncrease = e.maxSpeedIncrease || 1,
+                      this.onupdate = e.onupdate ||
+                          function() {},
+                      this.temperature = e.temperature || 1,
+                      this.coolDown = e.coolDown || .99,
+                      this._layout = null,
+                      this._layoutWorker = null;
+                  var n = this,
+                      a = this._$onupdate;
+                  this._$onupdate = function(e) {
+                    a.call(n, e)
+                  }
+                };
+            return s.prototype.updateConfig = function() {
+              var e = this.width,
+                  t = this.height,
+                  i = Math.min(e, t),
+                  n = {
+                    center: this.center,
+                    width: this.ratioScaling ? e: i,
+                    height: this.ratioScaling ? t: i,
+                    scaling: this.scaling || 1,
+                    gravity: this.gravity || 1,
+                    barnesHutOptimize: this.large,
+                    preventNodeOverlap: this.preventNodeOverlap,
+                    preventNodeEdgeOverlap: this.preventNodeEdgeOverlap,
+                    maxSpeedIncrease: this.maxSpeedIncrease
+                  };
+              if (this._layoutWorker) this._layoutWorker.postMessage({
+                cmd: "updateConfig",
+                config: n
+              });
+              else for (var a in n) this._layout[a] = n[a]
+            },
+                s.prototype.init = function(e, t) {
+                  if (this._layoutWorker && (this._layoutWorker.terminate(), this._layoutWorker = null), i && t) try {
+                    this._layoutWorker || (this._layoutWorker = new Worker(i), this._layoutWorker.onmessage = this._$onupdate),
+                        this._layout = null
+                  } catch(a) {
+                    this._layoutWorker = null,
+                    this._layout || (this._layout = new n)
+                  } else this._layout || (this._layout = new n);
+                  this.temperature = 1,
+                      this.graph = e;
+                  for (var o = e.nodes.length,
+                           s = new r(2 * o), l = new r(o), h = new r(o), m = 0; o > m; m++) {
+                    var V = e.nodes[m];
+                    s[2 * m] = V.layout.position[0],
+                        s[2 * m + 1] = V.layout.position[1],
+                        l[m] = "undefined" == typeof V.layout.mass ? 1 : V.layout.mass,
+                        h[m] = "undefined" == typeof V.layout.size ? 1 : V.layout.size,
+                        V.layout.__index = m
+                  }
+                  o = e.edges.length;
+                  for (var U = new r(2 * o), d = new r(o), m = 0; o > m; m++) {
+                    var p = e.edges[m];
+                    U[2 * m] = p.node1.layout.__index,
+                        U[2 * m + 1] = p.node2.layout.__index,
+                        d[m] = p.layout.weight || 1
+                  }
+                  this._layoutWorker ? this._layoutWorker.postMessage({
+                    cmd: "init",
+                    nodesPosition: s,
+                    nodesMass: l,
+                    nodesSize: h,
+                    edges: U,
+                    edgesWeight: d
+                  }) : (this._layout.initNodes(s, l, h), this._layout.initEdges(U, d)),
+                      this.updateConfig()
+                },
+                s.prototype.step = function(e) {
+                  var t = this.graph.nodes;
+                  if (this._layoutWorker) {
+                    for (var i = new r(2 * t.length), n = 0; n < t.length; n++) {
+                      var s = t[n];
+                      i[2 * n] = s.layout.position[0],
+                          i[2 * n + 1] = s.layout.position[1]
+                    }
+                    this._layoutWorker.postMessage(i.buffer, [i.buffer]),
+                        this._layoutWorker.postMessage({
+                          cmd: "update",
+                          steps: e,
+                          temperature: this.temperature,
+                          coolDown: this.coolDown
+                        });
+                    for (var n = 0; e > n; n++) this.temperature *= this.coolDown
+                  } else {
+                    o(this._$onupdate);
+                    for (var n = 0; n < t.length; n++) {
+                      var s = t[n];
+                      a.copy(this._layout.nodes[n].position, s.layout.position)
+                    }
+                    for (var n = 0; e > n; n++) this._layout.temperature = this.temperature,
+                        this._layout.update(),
+                        this.temperature *= this.coolDown
+                  }
+                },
+                s.prototype._$onupdate = function(e) {
+                  if (this._layoutWorker) {
+                    for (var t = new Float32Array(e.data), i = 0; i < this.graph.nodes.length; i++) {
+                      var n = this.graph.nodes[i];
+                      n.layout.position[0] = t[2 * i],
+                          n.layout.position[1] = t[2 * i + 1]
+                    }
+                    this.onupdate && this.onupdate()
+                  } else if (this._layout) {
+                    for (var i = 0; i < this.graph.nodes.length; i++) {
+                      var n = this.graph.nodes[i];
+                      a.copy(n.layout.position, this._layout.nodes[i].position)
+                    }
+                    this.onupdate && this.onupdate()
+                  }
+                },
+                s.prototype.dispose = function() {
+                  this._layoutWorker && this._layoutWorker.terminate(),
+                      this._layoutWorker = null,
+                      this._layout = null
+                },
+                s
+          }),
+      i("echarts/layout/forceLayoutWorker", ["require", "zrender/tool/vector"],
+          function o(e) {
+            "use strict";
+            function t() {
+              this.subRegions = [],
+                  this.nSubRegions = 0,
+                  this.node = null,
+                  this.mass = 0,
+                  this.centerOfMass = null,
+                  this.bbox = new l(4),
+                  this.size = 0
+            }
+            function i() {
+              this.position = r.create(),
+                  this.force = r.create(),
+                  this.forcePrev = r.create(),
+                  this.speed = r.create(),
+                  this.speedPrev = r.create(),
+                  this.mass = 1,
+                  this.inDegree = 0,
+                  this.outDegree = 0
+            }
+            function n(e, t) {
+              this.node1 = e,
+                  this.node2 = t,
+                  this.weight = 1
+            }
+            function a() {
+              this.barnesHutOptimize = !1,
+                  this.barnesHutTheta = 1.5,
+                  this.repulsionByDegree = !1,
+                  this.preventNodeOverlap = !1,
+                  this.preventNodeEdgeOverlap = !1,
+                  this.strongGravity = !0,
+                  this.gravity = 1,
+                  this.scaling = 1,
+                  this.edgeWeightInfluence = 1,
+                  this.center = [0, 0],
+                  this.width = 500,
+                  this.height = 500,
+                  this.maxSpeedIncrease = 1,
+                  this.nodes = [],
+                  this.edges = [],
+                  this.bbox = new l(4),
+                  this._rootRegion = new t,
+                  this._rootRegion.centerOfMass = r.create(),
+                  this._massArr = null,
+                  this._k = 0
+            }
+            var r, s = "undefined" == typeof window && "undefined" == typeof e;
+            r = s ? {
+              create: function(e, t) {
+                var i = new Float32Array(2);
+                return i[0] = e || 0,
+                    i[1] = t || 0,
+                    i
+              },
+              dist: function(e, t) {
+                var i = t[0] - e[0],
+                    n = t[1] - e[1];
+                return Math.sqrt(i * i + n * n)
+              },
+              len: function(e) {
+                var t = e[0],
+                    i = e[1];
+                return Math.sqrt(t * t + i * i)
+              },
+              scaleAndAdd: function(e, t, i, n) {
+                return e[0] = t[0] + i[0] * n,
+                    e[1] = t[1] + i[1] * n,
+                    e
+              },
+              scale: function(e, t, i) {
+                return e[0] = t[0] * i,
+                    e[1] = t[1] * i,
+                    e
+              },
+              add: function(e, t, i) {
+                return e[0] = t[0] + i[0],
+                    e[1] = t[1] + i[1],
+                    e
+              },
+              sub: function(e, t, i) {
+                return e[0] = t[0] - i[0],
+                    e[1] = t[1] - i[1],
+                    e
+              },
+              dot: function(e, t) {
+                return e[0] * t[0] + e[1] * t[1]
+              },
+              normalize: function(e, t) {
+                var i = t[0],
+                    n = t[1],
+                    a = i * i + n * n;
+                return a > 0 && (a = 1 / Math.sqrt(a), e[0] = t[0] * a, e[1] = t[1] * a),
+                    e
+              },
+              negate: function(e, t) {
+                return e[0] = -t[0],
+                    e[1] = -t[1],
+                    e
+              },
+              copy: function(e, t) {
+                return e[0] = t[0],
+                    e[1] = t[1],
+                    e
+              },
+              set: function(e, t, i) {
+                return e[0] = t,
+                    e[1] = i,
+                    e
+              }
+            }: e("zrender/tool/vector");
+            var l = "undefined" == typeof Float32Array ? Array: Float32Array;
+            if (t.prototype.beforeUpdate = function() {
+              for (var e = 0; e < this.nSubRegions; e++) this.subRegions[e].beforeUpdate();
+              this.mass = 0,
+              this.centerOfMass && (this.centerOfMass[0] = 0, this.centerOfMass[1] = 0),
+                  this.nSubRegions = 0,
+                  this.node = null
+            },
+                t.prototype.afterUpdate = function() {
+                  this.subRegions.length = this.nSubRegions;
+                  for (var e = 0; e < this.nSubRegions; e++) this.subRegions[e].afterUpdate()
+                },
+                t.prototype.addNode = function(e) {
+                  if (0 === this.nSubRegions) {
+                    if (null == this.node) return void(this.node = e);
+                    this._addNodeToSubRegion(this.node),
+                        this.node = null
+                  }
+                  this._addNodeToSubRegion(e),
+                      this._updateCenterOfMass(e)
+                },
+                t.prototype.findSubRegion = function(e, t) {
+                  for (var i = 0; i < this.nSubRegions; i++) {
+                    var n = this.subRegions[i];
+                    if (n.contain(e, t)) return n
+                  }
+                },
+                t.prototype.contain = function(e, t) {
+                  return this.bbox[0] <= e && this.bbox[2] >= e && this.bbox[1] <= t && this.bbox[3] >= t
+                },
+                t.prototype.setBBox = function(e, t, i, n) {
+                  this.bbox[0] = e,
+                      this.bbox[1] = t,
+                      this.bbox[2] = i,
+                      this.bbox[3] = n,
+                      this.size = (i - e + n - t) / 2
+                },
+                t.prototype._newSubRegion = function() {
+                  var e = this.subRegions[this.nSubRegions];
+                  return e || (e = new t, this.subRegions[this.nSubRegions] = e),
+                      this.nSubRegions++,
+                      e
+                },
+                t.prototype._addNodeToSubRegion = function(e) {
+                  var t = this.findSubRegion(e.position[0], e.position[1]),
+                      i = this.bbox;
+                  if (!t) {
+                    var n = (i[0] + i[2]) / 2,
+                        a = (i[1] + i[3]) / 2,
+                        o = (i[2] - i[0]) / 2,
+                        r = (i[3] - i[1]) / 2,
+                        s = e.position[0] >= n ? 1 : 0,
+                        l = e.position[1] >= a ? 1 : 0,
+                        t = this._newSubRegion();
+                    t.setBBox(s * o + i[0], l * r + i[1], (s + 1) * o + i[0], (l + 1) * r + i[1])
+                  }
+                  t.addNode(e)
+                },
+                t.prototype._updateCenterOfMass = function(e) {
+                  null == this.centerOfMass && (this.centerOfMass = r.create());
+                  var t = this.centerOfMass[0] * this.mass,
+                      i = this.centerOfMass[1] * this.mass;
+                  t += e.position[0] * e.mass,
+                      i += e.position[1] * e.mass,
+                      this.mass += e.mass,
+                      this.centerOfMass[0] = t / this.mass,
+                      this.centerOfMass[1] = i / this.mass
+                },
+                a.prototype.nodeToNodeRepulsionFactor = function(e, t, i) {
+                  return i * i * e / t
+                },
+                a.prototype.edgeToNodeRepulsionFactor = function(e, t, i) {
+                  return i * e / t
+                },
+                a.prototype.attractionFactor = function(e, t, i) {
+                  return e * t / i
+                },
+                a.prototype.initNodes = function(e, t, n) {
+                  this.temperature = 1;
+                  var a = e.length / 2;
+                  this.nodes.length = 0;
+                  for (var o = "undefined" != typeof n,
+                           r = 0; a > r; r++) {
+                    var s = new i;
+                    s.position[0] = e[2 * r],
+                        s.position[1] = e[2 * r + 1],
+                        s.mass = t[r],
+                    o && (s.size = n[r]),
+                        this.nodes.push(s)
+                  }
+                  this._massArr = t,
+                  o && (this._sizeArr = n)
+                },
+                a.prototype.initEdges = function(e, t) {
+                  var i = e.length / 2;
+                  this.edges.length = 0;
+                  for (var a = "undefined" != typeof t,
+                           o = 0; i > o; o++) {
+                    var r = e[2 * o],
+                        s = e[2 * o + 1],
+                        l = this.nodes[r],
+                        h = this.nodes[s];
+                    if (l && h) {
+                      l.outDegree++,
+                          h.inDegree++;
+                      var m = new n(l, h);
+                      a && (m.weight = t[o]),
+                          this.edges.push(m)
+                    }
+                  }
+                },
+                a.prototype.update = function() {
+                  var e = this.nodes.length;
+                  if (this.updateBBox(), this._k = .4 * this.scaling * Math.sqrt(this.width * this.height / e), this.barnesHutOptimize) {
+                    this._rootRegion.setBBox(this.bbox[0], this.bbox[1], this.bbox[2], this.bbox[3]),
+                        this._rootRegion.beforeUpdate();
+                    for (var t = 0; e > t; t++) this._rootRegion.addNode(this.nodes[t]);
+                    this._rootRegion.afterUpdate()
+                  } else {
+                    var i = 0,
+                        n = this._rootRegion.centerOfMass;
+                    r.set(n, 0, 0);
+                    for (var t = 0; e > t; t++) {
+                      var a = this.nodes[t];
+                      i += a.mass,
+                          r.scaleAndAdd(n, n, a.position, a.mass);
+
+                    }
+                    i > 0 && r.scale(n, n, 1 / i)
+                  }
+                  this.updateForce(),
+                      this.updatePosition()
+                },
+                a.prototype.updateForce = function() {
+                  for (var e = this.nodes.length,
+                           t = 0; e > t; t++) {
+                    var i = this.nodes[t];
+                    r.copy(i.forcePrev, i.force),
+                        r.copy(i.speedPrev, i.speed),
+                        r.set(i.force, 0, 0)
+                  }
+                  this.updateNodeNodeForce(),
+                  this.gravity > 0 && this.updateGravityForce(),
+                      this.updateEdgeForce(),
+                  this.preventNodeEdgeOverlap && this.updateNodeEdgeForce()
+                },
+                a.prototype.updatePosition = function() {
+                  for (var e = this.nodes.length,
+                           t = r.create(), i = 0; e > i; i++) {
+                    var n = this.nodes[i],
+                        a = n.speed;
+                    r.scale(n.force, n.force, 1 / 30);
+                    var o = r.len(n.force) + .1,
+                        s = Math.min(o, 500) / o;
+                    r.scale(n.force, n.force, s),
+                        r.add(a, a, n.force),
+                        r.scale(a, a, this.temperature),
+                        r.sub(t, a, n.speedPrev);
+                    var l = r.len(t);
+                    if (l > 0) {
+                      r.scale(t, t, 1 / l);
+                      var h = r.len(n.speedPrev);
+                      h > 0 && (l = Math.min(l / h, this.maxSpeedIncrease) * h, r.scaleAndAdd(a, n.speedPrev, t, l))
+                    }
+                    var m = r.len(a),
+                        s = Math.min(m, 100) / (m + .1);
+                    r.scale(a, a, s),
+                        r.add(n.position, n.position, a)
+                  }
+                },
+                a.prototype.updateNodeNodeForce = function() {
+                  for (var e = this.nodes.length,
+                           t = 0; e > t; t++) {
+                    var i = this.nodes[t];
+                    if (this.barnesHutOptimize) this.applyRegionToNodeRepulsion(this._rootRegion, i);
+                    else for (var n = t + 1; e > n; n++) {
+                      var a = this.nodes[n];
+                      this.applyNodeToNodeRepulsion(i, a, !1)
+                    }
+                  }
+                },
+                a.prototype.updateGravityForce = function() {
+                  for (var e = 0; e < this.nodes.length; e++) this.applyNodeGravity(this.nodes[e])
+                },
+                a.prototype.updateEdgeForce = function() {
+                  for (var e = 0; e < this.edges.length; e++) this.applyEdgeAttraction(this.edges[e])
+                },
+                a.prototype.updateNodeEdgeForce = function() {
+                  for (var e = 0; e < this.nodes.length; e++) for (var t = 0; t < this.edges.length; t++) this.applyEdgeToNodeRepulsion(this.edges[t], this.nodes[e])
+                },
+                a.prototype.applyRegionToNodeRepulsion = function() {
+                  var e = r.create();
+                  return function(t, i) {
+                    if (t.node) this.applyNodeToNodeRepulsion(t.node, i, !0);
+                    else {
+                      if (0 === t.mass && 0 === i.mass) return;
+                      r.sub(e, i.position, t.centerOfMass);
+                      var n = e[0] * e[0] + e[1] * e[1];
+                      if (n > this.barnesHutTheta * t.size * t.size) {
+                        var a = this._k * this._k * (i.mass + t.mass) / (n + 1);
+                        r.scaleAndAdd(i.force, i.force, e, 2 * a)
+                      } else for (var o = 0; o < t.nSubRegions; o++) this.applyRegionToNodeRepulsion(t.subRegions[o], i)
+                    }
+                  }
+                } (), a.prototype.applyNodeToNodeRepulsion = function() {
+              var e = r.create();
+              return function(t, i, n) {
+                if (t !== i && (0 !== t.mass || 0 !== i.mass)) {
+                  r.sub(e, t.position, i.position);
+                  var a = e[0] * e[0] + e[1] * e[1];
+                  if (0 !== a) {
+                    var o, s = t.mass + i.mass,
+                        l = Math.sqrt(a);
+                    r.scale(e, e, 1 / l),
+                        this.preventNodeOverlap ? (l = l - t.size - i.size, l > 0 ? o = this.nodeToNodeRepulsionFactor(s, l, this._k) : 0 >= l && (o = this._k * this._k * 10 * s)) : o = this.nodeToNodeRepulsionFactor(s, l, this._k),
+                    n || r.scaleAndAdd(t.force, t.force, e, 2 * o),
+                        r.scaleAndAdd(i.force, i.force, e, 2 * -o)
+                  }
+                }
+              }
+            } (), a.prototype.applyEdgeAttraction = function() {
+              var e = r.create();
+              return function(t) {
+                var i = t.node1,
+                    n = t.node2;
+                r.sub(e, i.position, n.position);
+                var a, o = r.len(e);
+                a = 0 === this.edgeWeightInfluence ? 1 : 1 == this.edgeWeightInfluence ? t.weight: Math.pow(t.weight, this.edgeWeightInfluence);
+                var s;
+                if (! (this.preventOverlap && (o = o - i.size - n.size, 0 >= o))) {
+                  var s = this.attractionFactor(a, o, this._k);
+                  r.scaleAndAdd(i.force, i.force, e, -s),
+                      r.scaleAndAdd(n.force, n.force, e, s)
+                }
+              }
+            } (), a.prototype.applyNodeGravity = function() {
+              var e = r.create();
+              return function(t) {
+                r.sub(e, this.center, t.position),
+                    this.width > this.height ? e[1] *= this.width / this.height: e[0] *= this.height / this.width;
+                var i = r.len(e) / 100;
+                this.strongGravity ? r.scaleAndAdd(t.force, t.force, e, i * this.gravity * t.mass) : r.scaleAndAdd(t.force, t.force, e, this.gravity * t.mass / (i + 1))
+              }
+            } (), a.prototype.applyEdgeToNodeRepulsion = function() {
+              var e = r.create(),
+                  t = r.create(),
+                  i = r.create();
+              return function(n, a) {
+                var o = n.node1,
+                    s = n.node2;
+                if (o !== a && s !== a) {
+                  r.sub(e, s.position, o.position),
+                      r.sub(t, a.position, o.position);
+                  var l = r.len(e);
+                  r.scale(e, e, 1 / l);
+                  var h = r.dot(e, t);
+                  if (! (0 > h || h > l)) {
+                    r.scaleAndAdd(i, o.position, e, h);
+                    var m = r.dist(i, a.position) - a.size,
+                        V = this.edgeToNodeRepulsionFactor(a.mass, Math.max(m, .1), 100);
+                    r.sub(e, a.position, i),
+                        r.normalize(e, e),
+                        r.scaleAndAdd(a.force, a.force, e, V),
+                        r.scaleAndAdd(o.force, o.force, e, -V),
+                        r.scaleAndAdd(s.force, s.force, e, -V)
+                  }
+                }
+              }
+            } (), a.prototype.updateBBox = function() {
+              for (var e = 1 / 0,
+                       t = 1 / 0,
+                       i = -(1 / 0), n = -(1 / 0), a = 0; a < this.nodes.length; a++) {
+                var o = this.nodes[a].position;
+                e = Math.min(e, o[0]),
+                    t = Math.min(t, o[1]),
+                    i = Math.max(i, o[0]),
+                    n = Math.max(n, o[1])
+              }
+              this.bbox[0] = e,
+                  this.bbox[1] = t,
+                  this.bbox[2] = i,
+                  this.bbox[3] = n
+            },
+                a.getWorkerCode = function() {
+                  var e = o.toString();
+                  return e.slice(e.indexOf("{") + 1, e.lastIndexOf("return"))
+                },
+                s) {
+              var h = null;
+              self.onmessage = function(e) {
+                if (e.data instanceof ArrayBuffer) {
+                  if (!h) return;
+                  for (var t = new Float32Array(e.data), i = t.length / 2, n = 0; i > n; n++) {
+                    var o = h.nodes[n];
+                    o.position[0] = t[2 * n],
+                        o.position[1] = t[2 * n + 1]
+                  }
+                } else switch (e.data.cmd) {
+                  case "init":
+                    h || (h = new a),
+                        h.initNodes(e.data.nodesPosition, e.data.nodesMass, e.data.nodesSize),
+                        h.initEdges(e.data.edges, e.data.edgesWeight);
+                    break;
+                  case "updateConfig":
+                    if (h) for (var r in e.data.config) h[r] = e.data.config[r];
+                    break;
+                  case "update":
+                    var s = e.data.steps;
+                    if (h) {
+                      var i = h.nodes.length,
+                          t = new Float32Array(2 * i);
+                      h.temperature = e.data.temperature;
+                      for (var n = 0; s > n; n++) h.update(),
+                          h.temperature *= e.data.coolDown;
+                      for (var n = 0; i > n; n++) {
+                        var o = h.nodes[n];
+                        t[2 * n] = o.position[0],
+                            t[2 * n + 1] = o.position[1]
+                      }
+                      self.postMessage(t.buffer, [t.buffer])
+                    } else {
+                      var l = new Float32Array;
+                      self.postMessage(l.buffer, [l.buffer])
+                    }
+                }
+              }
+            }
+            return a
+          }),
+      i("echarts/chart/map", ["require", "./base", "zrender/shape/Text", "zrender/shape/Path", "zrender/shape/Circle", "zrender/shape/Rectangle", "zrender/shape/Line", "zrender/shape/Polygon", "zrender/shape/Ellipse", "zrender/shape/Image", "../component/dataRange", "../component/roamController", "../layer/heatmap", "../config", "../util/ecData", "zrender/tool/util", "zrender/config", "zrender/tool/event", "../util/mapData/params", "../util/mapData/textFixed", "../util/mapData/geoCoord", "../util/projection/svg", "../util/projection/normal", "../chart"],
+          function(e) {
+            function t(e, t, n, a, o) {
+              i.call(this, e, t, n, a, o);
+              var r = this;
+              r._onmousewheel = function(e) {
+                return r.__onmousewheel(e)
+              },
+                  r._onmousedown = function(e) {
+                    return r.__onmousedown(e)
+                  },
+                  r._onmousemove = function(e) {
+                    return r.__onmousemove(e)
+                  },
+                  r._onmouseup = function(e) {
+                    return r.__onmouseup(e)
+                  },
+                  r._onroamcontroller = function(e) {
+                    return r.__onroamcontroller(e)
+                  },
+                  r._ondrhoverlink = function(e) {
+                    return r.__ondrhoverlink(e)
+                  },
+                  this._isAlive = !0,
+                  this._selectedMode = {},
+                  this._activeMapType = {},
+                  this._clickable = {},
+                  this._hoverable = {},
+                  this._showLegendSymbol = {},
+                  this._selected = {},
+                  this._mapTypeMap = {},
+                  this._mapDataMap = {},
+                  this._nameMap = {},
+                  this._specialArea = {},
+                  this._refreshDelayTicket,
+                  this._mapDataRequireCounter,
+                  this._markAnimation = !1,
+                  this._hoverLinkMap = {},
+                  this._roamMap = {},
+                  this._scaleLimitMap = {},
+                  this._mx,
+                  this._my,
+                  this._mousedown,
+                  this._justMove,
+                  this._curMapType,
+                  this.refresh(a),
+                  this.zr.on(c.EVENT.MOUSEWHEEL, this._onmousewheel),
+                  this.zr.on(c.EVENT.MOUSEDOWN, this._onmousedown),
+                  t.bind(U.EVENT.ROAMCONTROLLER, this._onroamcontroller),
+                  t.bind(U.EVENT.DATA_RANGE_HOVERLINK, this._ondrhoverlink)
+            }
+            var i = e("./base"),
+                n = e("zrender/shape/Text"),
+                a = e("zrender/shape/Path"),
+                o = e("zrender/shape/Circle"),
+                r = e("zrender/shape/Rectangle"),
+                s = e("zrender/shape/Line"),
+                l = e("zrender/shape/Polygon"),
+                h = e("zrender/shape/Ellipse"),
+                m = e("zrender/shape/Image");
+            e("../component/dataRange"),
+                e("../component/roamController");
+            var V = e("../layer/heatmap"),
+                U = e("../config");
+            U.map = {
+              zlevel: 0,
+              z: 2,
+              mapType: "china",
+              showLegendSymbol: !0,
+              dataRangeHoverLink: !0,
+              hoverable: !0,
+              clickable: !0,
+              itemStyle: {
+                normal: {
+                  borderColor: "rgba(0,0,0,0)",
+                  borderWidth: 1,
+                  areaStyle: {
+                    color: "#ccc"
+                  },
+                  label: {
+                    show: !1,
+                    textStyle: {
+                      color: "rgb(139,69,19)"
+                    }
+                  }
+                },
+                emphasis: {
+                  borderColor: "rgba(0,0,0,0)",
+                  borderWidth: 1,
+                  areaStyle: {
+                    color: "rgba(255,215,0,0.8)"
+                  },
+                  label: {
+                    show: !1,
+                    textStyle: {
+                      color: "rgb(100,0,0)"
+                    }
+                  }
+                }
+              }
+            };
+            var d = e("../util/ecData"),
+                p = e("zrender/tool/util"),
+                c = e("zrender/config"),
+                u = e("zrender/tool/event"),
+                y = e("../util/mapData/params").params,
+                g = e("../util/mapData/textFixed"),
+                b = e("../util/mapData/geoCoord");
+            return t.prototype = {
+              type: U.CHART_TYPE_MAP,
+              _buildShape: function() {
+                var e = this.series;
+                this.selectedMap = {},
+                    this._activeMapType = {};
+                for (var t, i, n, a, o = this.component.legend,
+                         r = {},
+                         s = {},
+                         l = {},
+                         h = {},
+                         m = 0,
+                         V = e.length; V > m; m++) if (e[m].type == U.CHART_TYPE_MAP && (e[m] = this.reformOption(e[m]), i = e[m].mapType, s[i] = s[i] || {},
+                    s[i][m] = !0, l[i] = l[i] || e[m].mapValuePrecision, this._scaleLimitMap[i] = this._scaleLimitMap[i] || {},
+                e[m].scaleLimit && p.merge(this._scaleLimitMap[i], e[m].scaleLimit, !0), this._roamMap[i] = e[m].roam || this._roamMap[i], (null == this._hoverLinkMap[i] || this._hoverLinkMap[i]) && (this._hoverLinkMap[i] = e[m].dataRangeHoverLink), this._nameMap[i] = this._nameMap[i] || {},
+                e[m].nameMap && p.merge(this._nameMap[i], e[m].nameMap, !0), this._activeMapType[i] = !0, e[m].textFixed && p.merge(g, e[m].textFixed, !0), e[m].geoCoord && p.merge(b, e[m].geoCoord, !0), this._selectedMode[i] = this._selectedMode[i] || e[m].selectedMode, (null == this._hoverable[i] || this._hoverable[i]) && (this._hoverable[i] = e[m].hoverable), (null == this._clickable[i] || this._clickable[i]) && (this._clickable[i] = e[m].clickable), (null == this._showLegendSymbol[i] || this._showLegendSymbol[i]) && (this._showLegendSymbol[i] = e[m].showLegendSymbol), h[i] = h[i] || e[m].mapValueCalculation, t = e[m].name, this.selectedMap[t] = o ? o.isSelected(t) : !0, this.selectedMap[t])) {
+                  r[i] = r[i] || {},
+                      n = e[m].data;
+                  for (var d = 0,
+                           c = n.length; c > d; d++) {
+                    a = this._nameChange(i, n[d].name),
+                        r[i][a] = r[i][a] || {
+                          seriesIndex: [],
+                          valueMap: {},
+                          precision: 0
+                        };
+                    for (var u in n[d])"value" != u ? r[i][a][u] = n[d][u] : isNaN(n[d].value) || (null == r[i][a].value && (r[i][a].value = 0), r[i][a].precision = Math.max(this.getPrecision( + n[d].value), r[i][a].precision), r[i][a].value += +n[d].value, r[i][a].valueMap[m] = +n[d].value);
+                    r[i][a].seriesIndex.push(m)
+                  }
+                }
+                this._mapDataRequireCounter = 0;
+                for (var f in r) this._mapDataRequireCounter++;
+                this._clearSelected(),
+                0 === this._mapDataRequireCounter && (this.clear(), this.zr && this.zr.delShape(this.lastShapeList), this.lastShapeList = []);
+                for (var f in r) {
+                  for (var c in r[f]) {
+                    "average" == h[f] && (r[f][c].value /= r[f][c].seriesIndex.length);
+                    var k = r[f][c].value;
+                    null != k && (r[f][c].value = k.toFixed(null == l[f] ? r[f][c].precision: l[f]) - 0)
+                  }
+                  this._mapDataMap[f] = this._mapDataMap[f] || {},
+                      this._mapDataMap[f].mapData ? this._mapDataCallback(f, r[f], s[f])(this._mapDataMap[f].mapData) : y[f.replace(/\|.*/, "")].getGeoJson && (this._specialArea[f] = y[f.replace(/\|.*/, "")].specialArea || this._specialArea[f], y[f.replace(/\|.*/, "")].getGeoJson(this._mapDataCallback(f, r[f], s[f])))
+                }
+              },
+              _mapDataCallback: function(t, i, n) {
+                var a = this;
+                return function(o) {
+                  a._isAlive && null != a._activeMapType[t] && ( - 1 != t.indexOf("|") && (o = a._getSubMapData(t, o)), a._mapDataMap[t].mapData = o, o.firstChild ? (a._mapDataMap[t].rate = 1, a._mapDataMap[t].projection = e("../util/projection/svg")) : (a._mapDataMap[t].rate = .75, a._mapDataMap[t].projection = e("../util/projection/normal")), a._buildMap(t, a._getProjectionData(t, o, n), i, n), a._buildMark(t, n), --a._mapDataRequireCounter <= 0 && (a.addShapeList(), a.zr.refreshNextFrame()), a._buildHeatmap(t))
+                }
+              },
+              _clearSelected: function() {
+                for (var e in this._selected) this._activeMapType[this._mapTypeMap[e]] || (delete this._selected[e], delete this._mapTypeMap[e])
+              },
+              _getSubMapData: function(e, t) {
+                for (var i = e.replace(/^.*\|/, ""), n = t.features, a = 0, o = n.length; o > a; a++) if (n[a].properties && n[a].properties.name == i) {
+                  n = n[a],
+                  "United States of America" == i && n.geometry.coordinates.length > 1 && (n = {
+                    geometry: {
+                      coordinates: n.geometry.coordinates.slice(5, 6),
+                      type: n.geometry.type
+                    },
+                    id: n.id,
+                    properties: n.properties,
+                    type: n.type
+                  });
+                  break
+                }
+                return {
+                  type: "FeatureCollection",
+                  features: [n]
+                }
+              },
+              _getProjectionData: function(e, t, i) {
+                var n, a = this._mapDataMap[e].projection,
+                    o = [],
+                    r = this._mapDataMap[e].bbox || a.getBbox(t, this._specialArea[e]);
+                n = this._mapDataMap[e].hasRoam ? this._mapDataMap[e].transform: this._getTransform(r, i, this._mapDataMap[e].rate);
+                var s, l = this._mapDataMap[e].lastTransform || {
+                  scale: {}
+                };
+                n.left != l.left || n.top != l.top || n.scale.x != l.scale.x || n.scale.y != l.scale.y ? (s = a.geoJson2Path(t, n, this._specialArea[e]), l = p.clone(n)) : (n = this._mapDataMap[e].transform, s = this._mapDataMap[e].pathArray),
+                    this._mapDataMap[e].bbox = r,
+                    this._mapDataMap[e].transform = n,
+                    this._mapDataMap[e].lastTransform = l,
+                    this._mapDataMap[e].pathArray = s;
+                for (var h = [n.left, n.top], m = 0, V = s.length; V > m; m++) o.push(this._getSingleProvince(e, s[m], h));
+                if (this._specialArea[e]) for (var U in this._specialArea[e]) o.push(this._getSpecialProjectionData(e, t, U, this._specialArea[e][U], h));
+                if ("china" == e) {
+                  var d = this.geo2pos(e, b["南海诸岛"] || y["南海诸岛"].textCoord),
+                      c = n.scale.x / 10.5,
+                      u = [32 * c + d[0], 83 * c + d[1]];
+                  g["南海诸岛"] && (u[0] += g["南海诸岛"][0], u[1] += g["南海诸岛"][1]),
+                      o.push({
+                        name: this._nameChange(e, "南海诸岛"),
+                        path: y["南海诸岛"].getPath(d, c),
+                        position: h,
+                        textX: u[0],
+                        textY: u[1]
+                      })
+                }
+                return o
+              },
+              _getSpecialProjectionData: function(t, i, n, a, o) {
+                i = this._getSubMapData("x|" + n, i);
+                var r = e("../util/projection/normal"),
+                    s = r.getBbox(i),
+                    l = this.geo2pos(t, [a.left, a.top]),
+                    h = this.geo2pos(t, [a.left + a.width, a.top + a.height]),
+                    m = Math.abs(h[0] - l[0]),
+                    V = Math.abs(h[1] - l[1]),
+                    U = s.width,
+                    d = s.height,
+                    p = m / .75 / U,
+                    c = V / d;
+                p > c ? (p = .75 * c, m = U * p) : (c = p, p = .75 * c, V = d * c);
+                var u = {
+                      OffsetLeft: l[0],
+                      OffsetTop: l[1],
+                      scale: {
+                        x: p,
+                        y: c
+                      }
+                    },
+                    y = r.geoJson2Path(i, u);
+                return this._getSingleProvince(t, y[0], o)
+              },
+              _getSingleProvince: function(e, t, i) {
+                var n, a = t.properties.name,
+                    o = g[a] || [0, 0];
+                if (b[a]) n = this.geo2pos(e, b[a]);
+                else if (t.cp) n = [t.cp[0] + o[0], t.cp[1] + o[1]];
+                else {
+                  var r = this._mapDataMap[e].bbox;
+                  n = this.geo2pos(e, [r.left + r.width / 2, r.top + r.height / 2]),
+                      n[0] += o[0],
+                      n[1] += o[1]
+                }
+                return t.name = this._nameChange(e, a),
+                    t.position = i,
+                    t.textX = n[0],
+                    t.textY = n[1],
+                    t
+              },
+              _getTransform: function(e, t, i) {
+                var n, a, o, r, s, l, h, m = this.series,
+                    V = this.zr.getWidth(),
+                    U = this.zr.getHeight(),
+                    d = Math.round(.02 * Math.min(V, U));
+                for (var p in t) n = m[p].mapLocation || {},
+                    o = n.x || o,
+                    s = n.y || s,
+                    l = n.width || l,
+                    h = n.height || h;
+                a = this.parsePercent(o, V),
+                    a = isNaN(a) ? d: a,
+                    r = this.parsePercent(s, U),
+                    r = isNaN(r) ? d: r,
+                    l = null == l ? V - a - 2 * d: this.parsePercent(l, V),
+                    h = null == h ? U - r - 2 * d: this.parsePercent(h, U);
+                var c = e.width,
+                    u = e.height,
+                    y = l / i / c,
+                    g = h / u;
+                if (y > g ? (y = g * i, l = c * y) : (g = y, y = g * i, h = u * g), isNaN(o)) switch (o = o || "center", o + "") {
+                  case "center":
+                    a = Math.floor((V - l) / 2);
+                    break;
+                  case "right":
+                    a = V - l
+                }
+                if (isNaN(s)) switch (s = s || "center", s + "") {
+                  case "center":
+                    r = Math.floor((U - h) / 2);
+                    break;
+                  case "bottom":
+                    r = U - h
+                }
+                return {
+                  left: a,
+                  top: r,
+                  width: l,
+                  height: h,
+                  baseScale: 1,
+                  scale: {
+                    x: y,
+                    y: g
+                  }
+                }
+              },
+              _buildMap: function(e, t, i, m) {
+                for (var V, c, u, y, g, b, f, k, x, _, L, W = this.series,
+                         X = this.component.legend,
+                         v = this.component.dataRange,
+                         w = 0,
+                         K = t.length; K > w; w++) {
+                  if (k = p.clone(t[w]), x = {
+                    name: k.name,
+                    path: k.path,
+                    position: p.clone(k.position)
+                  },
+                      c = k.name, u = i[c]) {
+                    g = [u],
+                        V = "";
+                    for (var I = 0,
+                             J = u.seriesIndex.length; J > I; I++) {
+                      var C = W[u.seriesIndex[I]];
+                      g.push(C),
+                          V += C.name + " ",
+                      X && this._showLegendSymbol[e] && X.hasColor(C.name) && this.shapeList.push(new o({
+                        zlevel: C.zlevel,
+                        z: C.z + 1,
+                        position: p.clone(k.position),
+                        _mapType: e,
+                        style: {
+                          x: k.textX + 3 + 7 * I,
+                          y: k.textY - 10,
+                          r: 3,
+                          color: X.getColor(C.name)
+                        },
+                        hoverable: !1
+                      }))
+                    }
+                    y = u.value
+                  } else {
+                    u = {
+                      name: c,
+                      value: "-"
+                    },
+                        V = "",
+                        g = [];
+                    for (var S in m) g.push(W[S]);
+                    y = "-"
+                  }
+                  switch (this.ecTheme.map && g.push(this.ecTheme.map), g.push(U.map), b = v && !isNaN(y) ? v.getColor(y) : null, k.color = k.color || b || this.getItemStyleColor(this.deepQuery(g, "itemStyle.normal.color"), u.seriesIndex, -1, u) || this.deepQuery(g, "itemStyle.normal.areaStyle.color"), k.strokeColor = k.strokeColor || this.deepQuery(g, "itemStyle.normal.borderColor"), k.lineWidth = k.lineWidth || this.deepQuery(g, "itemStyle.normal.borderWidth"), x.color = this.getItemStyleColor(this.deepQuery(g, "itemStyle.emphasis.color"), u.seriesIndex, -1, u) || this.deepQuery(g, "itemStyle.emphasis.areaStyle.color") || k.color, x.strokeColor = this.deepQuery(g, "itemStyle.emphasis.borderColor") || k.strokeColor, x.lineWidth = this.deepQuery(g, "itemStyle.emphasis.borderWidth") || k.lineWidth, k.brushType = x.brushType = k.brushType || "both", k.lineJoin = x.lineJoin = "round", k._name = x._name = c, f = this.deepQuery(g, "itemStyle.normal.label.textStyle"), L = {
+                    zlevel: this.getZlevelBase(),
+                    z: this.getZBase() + 1,
+                    position: p.clone(k.position),
+                    _mapType: e,
+                    _geo: this.pos2geo(e, [k.textX, k.textY]),
+                    style: {
+                      brushType: "fill",
+                      x: k.textX,
+                      y: k.textY,
+                      text: this.getLabelText(c, y, g, "normal"),
+                      _name: c,
+                      textAlign: "center",
+                      color: this.deepQuery(g, "itemStyle.normal.label.show") ? this.deepQuery(g, "itemStyle.normal.label.textStyle.color") : "rgba(0,0,0,0)",
+                      textFont: this.getFont(f)
+                    }
+                  },
+                      L._style = p.clone(L.style), L.highlightStyle = p.clone(L.style), this.deepQuery(g, "itemStyle.emphasis.label.show") ? (L.highlightStyle.text = this.getLabelText(c, y, g, "emphasis"), L.highlightStyle.color = this.deepQuery(g, "itemStyle.emphasis.label.textStyle.color") || L.style.color, f = this.deepQuery(g, "itemStyle.emphasis.label.textStyle") || f, L.highlightStyle.textFont = this.getFont(f)) : L.highlightStyle.color = "rgba(0,0,0,0)", _ = {
+                    zlevel: this.getZlevelBase(),
+                    z: this.getZBase(),
+                    position: p.clone(k.position),
+                    style: k,
+                    highlightStyle: x,
+                    _style: p.clone(k),
+                    _mapType: e
+                  },
+                  null != k.scale && (_.scale = p.clone(k.scale)), L = new n(L), _.style.shapeType) {
+                    case "rectangle":
+                      _ = new r(_);
+                      break;
+                    case "line":
+                      _ = new s(_);
+                      break;
+                    case "circle":
+                      _ = new o(_);
+                      break;
+                    case "polygon":
+                      _ = new l(_);
+                      break;
+                    case "ellipse":
+                      _ = new h(_);
+                      break;
+                    default:
+                      _ = new a(_),
+                      _.buildPathArray && (_.style.pathArray = _.buildPathArray(_.style.path))
+                  } (this._selectedMode[e] && this._selected[c] && u.selected !== !1 || u.selected === !0) && (L.style = L.highlightStyle, _.style = _.highlightStyle),
+                      L.clickable = _.clickable = this._clickable[e] && (null == u.clickable || u.clickable),
+                  this._selectedMode[e] && (this._selected[c] = null != this._selected[c] ? this._selected[c] : u.selected, this._mapTypeMap[c] = e, (null == u.selectable || u.selectable) && (_.clickable = L.clickable = !0, _.onclick = L.onclick = this.shapeHandler.onclick)),
+                      this._hoverable[e] && (null == u.hoverable || u.hoverable) ? (L.hoverable = _.hoverable = !0, _.hoverConnect = L.id, L.hoverConnect = _.id) : L.hoverable = _.hoverable = !1,
+                      d.pack(L, {
+                            name: V,
+                            tooltip: this.deepQuery(g, "tooltip")
+                          },
+                          0, u, 0, c),
+                      this.shapeList.push(L),
+                      d.pack(_, {
+                            name: V,
+                            tooltip: this.deepQuery(g, "tooltip")
+                          },
+                          0, u, 0, c),
+                      this.shapeList.push(_)
+                }
+              },
+              _buildMark: function(e, t) {
+                this._seriesIndexToMapType = this._seriesIndexToMapType || {},
+                    this.markAttachStyle = this.markAttachStyle || {};
+                var i = [this._mapDataMap[e].transform.left, this._mapDataMap[e].transform.top];
+                "none" == e && (i = [0, 0]);
+                for (var n in t) this._seriesIndexToMapType[n] = e,
+                    this.markAttachStyle[n] = {
+                      position: i,
+                      _mapType: e
+                    },
+                    this.buildMark(n)
+              },
+              _buildHeatmap: function(e) {
+                for (var t = this.series,
+                         i = 0,
+                         n = t.length; n > i; i++) if (t[i].heatmap) {
+                  var a = t[i].heatmap.data;
+                  if (t[i].heatmap.needsTransform === !1) {
+                    for (var o = [], r = 0, s = a.length; s > r; ++r) o.push([a[r][3], a[r][4], a[r][2]]);
+                    var l = [0, 0]
+                  } else {
+                    var h = t[i].heatmap._geoData;
+                    if (void 0 === h) {
+                      t[i].heatmap._geoData = [];
+                      for (var r = 0,
+                               s = a.length; s > r; ++r) t[i].heatmap._geoData[r] = a[r];
+                      h = t[i].heatmap._geoData
+                    }
+                    for (var s = a.length,
+                             U = 0; s > U; ++U) a[U] = this.geo2pos(e, [h[U][0], h[U][1]]);
+                    var l = [this._mapDataMap[e].transform.left, this._mapDataMap[e].transform.top]
+                  }
+                  var d = new V(t[i].heatmap),
+                      p = d.getCanvas(a[0][3] ? o: a, this.zr.getWidth(), this.zr.getHeight()),
+                      c = new m({
+                        zlevel: this.getZlevelBase(),
+                        z: this.getZBase() + 1,
+                        position: l,
+                        scale: [1, 1],
+                        hoverable: !1,
+                        style: {
+                          x: 0,
+                          y: 0,
+                          image: p,
+                          width: p.width,
+                          height: p.height
+                        }
+                      });
+                  c.type = "heatmap",
+                      c._mapType = e,
+                      this.shapeList.push(c),
+                      this.zr.addShape(c)
+                }
+              },
+              getMarkCoord: function(e, t) {
+                return t.geoCoord || b[t.name] ? this.geo2pos(this._seriesIndexToMapType[e], t.geoCoord || b[t.name]) : [0, 0]
+              },
+              getMarkGeo: function(e) {
+                return e.geoCoord || b[e.name]
+              },
+              _nameChange: function(e, t) {
+                return this._nameMap[e][t] || t
+              },
+              getLabelText: function(e, t, i, n) {
+                var a = this.deepQuery(i, "itemStyle." + n + ".label.formatter");
+                return a ? "function" == typeof a ? a.call(this.myChart, e, t) : "string" == typeof a ? (a = a.replace("{a}", "{a0}").replace("{b}", "{b0}"), a = a.replace("{a0}", e).replace("{b0}", t)) : void 0 : e
+              },
+              _findMapTypeByPos: function(e, t) {
+                var i, n, a, o, r;
+                for (var s in this._mapDataMap) if (i = this._mapDataMap[s].transform, i && this._roamMap[s] && this._activeMapType[s] && (n = i.left, a = i.top, o = i.width, r = i.height, e >= n && n + o >= e && t >= a && a + r >= t)) return s
+              },
+              __onmousewheel: function(e) {
+                function t(e, t) {
+                  for (var i = 0; i < e.pointList.length; i++) {
+                    var n = e.pointList[i];
+                    n[0] *= t,
+                        n[1] *= t
+                  }
+                  var a = e.controlPointList;
+                  if (a) for (var i = 0; i < a.length; i++) {
+                    var n = a[i];
+                    n[0] *= t,
+                        n[1] *= t
+                  }
+                }
+                function i(e, t) {
+                  e.xStart *= t,
+                      e.yStart *= t,
+                      e.xEnd *= t,
+                      e.yEnd *= t,
+                  null != e.cpX1 && (e.cpX1 *= t, e.cpY1 *= t)
+                }
+                if (! (this.shapeList.length <= 0)) {
+                  for (var n = 0,
+                           a = this.shapeList.length; a > n; n++) {
+                    var o = this.shapeList[n];
+                    if (o.__animating) return
+                  }
+                  var r, s, l = e.event,
+                      h = u.getX(l),
+                      m = u.getY(l),
+                      V = u.getDelta(l),
+                      d = e.mapTypeControl;
+                  d || (d = {},
+                      s = this._findMapTypeByPos(h, m), s && this._roamMap[s] && "move" != this._roamMap[s] && (d[s] = !0));
+                  var p = !1;
+                  for (s in d) if (d[s]) {
+                    p = !0;
+                    var c = this._mapDataMap[s].transform,
+                        y = c.left,
+                        g = c.top,
+                        b = c.width,
+                        f = c.height,
+                        k = this.pos2geo(s, [h - y, m - g]);
+                    if (V > 0) {
+                      if (r = 1.2, null != this._scaleLimitMap[s].max && c.baseScale >= this._scaleLimitMap[s].max) continue
+                    } else if (r = 1 / 1.2, null != this._scaleLimitMap[s].min && c.baseScale <= this._scaleLimitMap[s].min) continue;
+                    c.baseScale *= r,
+                        c.scale.x *= r,
+                        c.scale.y *= r,
+                        c.width = b * r,
+                        c.height = f * r,
+                        this._mapDataMap[s].hasRoam = !0,
+                        this._mapDataMap[s].transform = c,
+                        k = this.geo2pos(s, k),
+                        c.left -= k[0] - (h - y),
+                        c.top -= k[1] - (m - g),
+                        this._mapDataMap[s].transform = c,
+                        this.clearEffectShape(!0);
+                    for (var n = 0,
+                             a = this.shapeList.length; a > n; n++) {
+                      var o = this.shapeList[n];
+                      if (o._mapType == s) {
+                        var x = o.type,
+                            _ = o.style;
+                        switch (o.position[0] = c.left, o.position[1] = c.top, x) {
+                          case "path":
+                          case "symbol":
+                          case "circle":
+                          case "rectangle":
+                          case "polygon":
+                          case "line":
+                          case "ellipse":
+                          case "heatmap":
+                            o.scale[0] *= r,
+                                o.scale[1] *= r;
+                            break;
+                          case "mark-line":
+                            i(_, r);
+                            break;
+                          case "polyline":
+                            t(_, r);
+                            break;
+                          case "shape-bundle":
+                            for (var L = 0; L < _.shapeList.length; L++) {
+                              var W = _.shapeList[L];
+                              "mark-line" == W.type ? i(W.style, r) : "polyline" == W.type && t(W.style, r)
+                            }
+                            break;
+                          case "icon":
+                          case "image":
+                            k = this.geo2pos(s, o._geo),
+                                _.x = _._x = k[0] - _.width / 2,
+                                _.y = _._y = k[1] - _.height / 2;
+                            break;
+                          default:
+                            k = this.geo2pos(s, o._geo),
+                                _.x = k[0],
+                                _.y = k[1],
+                            "text" == x && (o._style.x = o.highlightStyle.x = k[0], o._style.y = o.highlightStyle.y = k[1])
+                        }
+                        this.zr.modShape(o.id)
+                      }
+                    }
+                  }
+                  if (p) {
+                    u.stop(l),
+                        this.zr.refreshNextFrame();
+                    var X = this;
+                    clearTimeout(this._refreshDelayTicket),
+                        this._refreshDelayTicket = setTimeout(function() {
+                              X && X.shapeList && X.animationEffect()
+                            },
+                            100),
+                        this.messageCenter.dispatch(U.EVENT.MAP_ROAM, e.event, {
+                              type: "scale"
+                            },
+                            this.myChart)
+                  }
+                }
+              },
+              __onmousedown: function(e) {
+                if (! (this.shapeList.length <= 0)) {
+                  var t = e.target;
+                  if (!t || !t.draggable) {
+                    var i = e.event,
+                        n = u.getX(i),
+                        a = u.getY(i),
+                        o = this._findMapTypeByPos(n, a);
+                    if (o && this._roamMap[o] && "scale" != this._roamMap[o]) {
+                      this._mousedown = !0,
+                          this._mx = n,
+                          this._my = a,
+                          this._curMapType = o,
+                          this.zr.on(c.EVENT.MOUSEUP, this._onmouseup);
+                      var r = this;
+                      setTimeout(function() {
+                            r.zr.on(c.EVENT.MOUSEMOVE, r._onmousemove)
+                          },
+                          100)
+                    }
+                  }
+                }
+              },
+              __onmousemove: function(e) {
+                if (this._mousedown && this._isAlive) {
+                  var t = e.event,
+                      i = u.getX(t),
+                      n = u.getY(t),
+                      a = this._mapDataMap[this._curMapType].transform;
+                  a.hasRoam = !0,
+                      a.left -= this._mx - i,
+                      a.top -= this._my - n,
+                      this._mx = i,
+                      this._my = n,
+                      this._mapDataMap[this._curMapType].transform = a;
+                  for (var o = 0,
+                           r = this.shapeList.length; r > o; o++) this.shapeList[o]._mapType == this._curMapType && (this.shapeList[o].position[0] = a.left, this.shapeList[o].position[1] = a.top, this.zr.modShape(this.shapeList[o].id));
+                  this.messageCenter.dispatch(U.EVENT.MAP_ROAM, e.event, {
+                        type: "move"
+                      },
+                      this.myChart),
+                      this.clearEffectShape(!0),
+                      this.zr.refreshNextFrame(),
+                      this._justMove = !0,
+                      u.stop(t)
+                }
+              },
+              __onmouseup: function(e) {
+                var t = e.event;
+                this._mx = u.getX(t),
+                    this._my = u.getY(t),
+                    this._mousedown = !1;
+                var i = this;
+                setTimeout(function() {
+                      i._justMove && i.animationEffect(),
+                          i._justMove = !1,
+                          i.zr.un(c.EVENT.MOUSEMOVE, i._onmousemove),
+                          i.zr.un(c.EVENT.MOUSEUP, i._onmouseup)
+                    },
+                    120)
+              },
+              __onroamcontroller: function(e) {
+                var t = e.event;
+                t.zrenderX = this.zr.getWidth() / 2,
+                    t.zrenderY = this.zr.getHeight() / 2;
+                var i = e.mapTypeControl,
+                    n = 0,
+                    a = 0,
+                    o = e.step;
+                switch (e.roamType) {
+                  case "scaleUp":
+                    return t.zrenderDelta = 1,
+                        void this.__onmousewheel({
+                          event: t,
+                          mapTypeControl: i
+                        });
+                  case "scaleDown":
+                    return t.zrenderDelta = -1,
+                        void this.__onmousewheel({
+                          event: t,
+                          mapTypeControl: i
+                        });
+                  case "up":
+                    n = -o;
+                    break;
+                  case "down":
+                    n = o;
+                    break;
+                  case "left":
+                    a = -o;
+                    break;
+                  case "right":
+                    a = o
+                }
+                var r, s;
+                for (s in i) this._mapDataMap[s] && this._activeMapType[s] && (r = this._mapDataMap[s].transform, r.hasRoam = !0, r.left -= a, r.top -= n, this._mapDataMap[s].transform = r);
+                for (var l = 0,
+                         h = this.shapeList.length; h > l; l++) s = this.shapeList[l]._mapType,
+                i[s] && this._activeMapType[s] && (r = this._mapDataMap[s].transform, this.shapeList[l].position[0] = r.left, this.shapeList[l].position[1] = r.top, this.zr.modShape(this.shapeList[l].id));
+                this.messageCenter.dispatch(U.EVENT.MAP_ROAM, e.event, {
+                      type: "move"
+                    },
+                    this.myChart),
+                    this.clearEffectShape(!0),
+                    this.zr.refreshNextFrame(),
+                    clearTimeout(this.dircetionTimer);
+                var m = this;
+                this.dircetionTimer = setTimeout(function() {
+                      m.animationEffect()
+                    },
+                    150)
+              },
+              __ondrhoverlink: function(e) {
+                for (var t, i, n = 0,
+                         a = this.shapeList.length; a > n; n++) t = this.shapeList[n]._mapType,
+                this._hoverLinkMap[t] && this._activeMapType[t] && (i = d.get(this.shapeList[n], "value"), null != i && i >= e.valueMin && i <= e.valueMax && this.zr.addHoverShape(this.shapeList[n]))
+              },
+              onclick: function(e) {
+                if (this.isClick && e.target && !this._justMove && "icon" != e.target.type) {
+                  this.isClick = !1;
+                  var t = e.target,
+                      i = t.style._name,
+                      n = this.shapeList.length,
+                      a = t._mapType || "";
+                  if ("single" == this._selectedMode[a]) for (var o in this._selected) if (this._selected[o] && this._mapTypeMap[o] == a) {
+                    for (var r = 0; n > r; r++) this.shapeList[r].style._name == o && this.shapeList[r]._mapType == a && (this.shapeList[r].style = this.shapeList[r]._style, this.zr.modShape(this.shapeList[r].id));
+                    o != i && (this._selected[o] = !1)
+                  }
+                  this._selected[i] = !this._selected[i];
+                  for (var r = 0; n > r; r++) this.shapeList[r].style._name == i && this.shapeList[r]._mapType == a && (this.shapeList[r].style = this._selected[i] ? this.shapeList[r].highlightStyle: this.shapeList[r]._style, this.zr.modShape(this.shapeList[r].id));
+                  this.messageCenter.dispatch(U.EVENT.MAP_SELECTED, e.event, {
+                        selected: this._selected,
+                        target: i
+                      },
+                      this.myChart),
+                      this.zr.refreshNextFrame();
+                  var s = this;
+                  setTimeout(function() {
+                        s.zr.trigger(c.EVENT.MOUSEMOVE, e.event)
+                      },
+                      100)
+                }
+              },
+              refresh: function(e) {
+                e && (this.option = e, this.series = e.series),
+                    this._mapDataRequireCounter > 0 ? this.clear() : this.backupShapeList(),
+                    this._buildShape(),
+                    this.zr.refreshHover()
+              },
+              ondataRange: function(e, t) {
+                this.component.dataRange && (this.refresh(), t.needRefresh = !0)
+              },
+              pos2geo: function(e, t) {
+                return this._mapDataMap[e].transform ? this._mapDataMap[e].projection.pos2geo(this._mapDataMap[e].transform, t) : null
+              },
+              getGeoByPos: function(e, t) {
+                if (!this._mapDataMap[e].transform) return null;
+                var i = [this._mapDataMap[e].transform.left, this._mapDataMap[e].transform.top];
+                return t instanceof Array ? (t[0] -= i[0], t[1] -= i[1]) : (t.x -= i[0], t.y -= i[1]),
+                    this.pos2geo(e, t)
+              },
+              geo2pos: function(e, t) {
+                return this._mapDataMap[e].transform ? this._mapDataMap[e].projection.geo2pos(this._mapDataMap[e].transform, t) : null
+              },
+              getPosByGeo: function(e, t) {
+                if (!this._mapDataMap[e].transform) return null;
+                var i = this.geo2pos(e, t);
+                return i[0] += this._mapDataMap[e].transform.left,
+                    i[1] += this._mapDataMap[e].transform.top,
+                    i
+              },
+              getMapPosition: function(e) {
+                return this._mapDataMap[e].transform ? [this._mapDataMap[e].transform.left, this._mapDataMap[e].transform.top] : null
+              },
+              onbeforDispose: function() {
+                this._isAlive = !1,
+                    this.zr.un(c.EVENT.MOUSEWHEEL, this._onmousewheel),
+                    this.zr.un(c.EVENT.MOUSEDOWN, this._onmousedown),
+                    this.messageCenter.unbind(U.EVENT.ROAMCONTROLLER, this._onroamcontroller),
+                    this.messageCenter.unbind(U.EVENT.DATA_RANGE_HOVERLINK, this._ondrhoverlink)
+              }
+            },
+                p.inherits(t, i),
+                e("../chart").define("map", t),
+                t
+          }),
+      i("zrender/shape/Path", ["require", "./Base", "./util/PathProxy", "../tool/util"],
+          function(e) {
+            var t = e("./Base"),
+                i = e("./util/PathProxy"),
+                n = i.PathSegment,
+                a = function(e) {
+                  return Math.sqrt(e[0] * e[0] + e[1] * e[1])
+                },
+                o = function(e, t) {
+                  return (e[0] * t[0] + e[1] * t[1]) / (a(e) * a(t))
+                },
+                r = function(e, t) {
+                  return (e[0] * t[1] < e[1] * t[0] ? -1 : 1) * Math.acos(o(e, t))
+                },
+                s = function(e) {
+                  t.call(this, e)
+                };
+            return s.prototype = {
+              type: "path",
+              buildPathArray: function(e, t, i) {
+                if (!e) return [];
+                t = t || 0,
+                    i = i || 0;
+                var a = e,
+                    o = ["m", "M", "l", "L", "v", "V", "h", "H", "z", "Z", "c", "C", "q", "Q", "t", "T", "s", "S", "a", "A"];
+                a = a.replace(/-/g, " -"),
+                    a = a.replace(/  /g, " "),
+                    a = a.replace(/ /g, ","),
+                    a = a.replace(/,,/g, ",");
+                var r;
+                for (r = 0; r < o.length; r++) a = a.replace(new RegExp(o[r], "g"), "|" + o[r]);
+                var s = a.split("|"),
+                    l = [],
+                    h = 0,
+                    m = 0;
+                for (r = 1; r < s.length; r++) {
+                  var V = s[r],
+                      U = V.charAt(0);
+                  V = V.slice(1),
+                      V = V.replace(new RegExp("e,-", "g"), "e-");
+                  var d = V.split(",");
+                  d.length > 0 && "" === d[0] && d.shift();
+                  for (var p = 0; p < d.length; p++) d[p] = parseFloat(d[p]);
+                  for (; d.length > 0 && !isNaN(d[0]);) {
+                    var c, u, y, g, b, f, k, x, _ = null,
+                        L = [],
+                        W = h,
+                        X = m;
+                    switch (U) {
+                      case "l":
+                        h += d.shift(),
+                            m += d.shift(),
+                            _ = "L",
+                            L.push(h, m);
+                        break;
+                      case "L":
+                        h = d.shift(),
+                            m = d.shift(),
+                            L.push(h, m);
+                        break;
+                      case "m":
+                        h += d.shift(),
+                            m += d.shift(),
+                            _ = "M",
+                            L.push(h, m),
+                            U = "l";
+                        break;
+                      case "M":
+                        h = d.shift(),
+                            m = d.shift(),
+                            _ = "M",
+                            L.push(h, m),
+                            U = "L";
+                        break;
+                      case "h":
+                        h += d.shift(),
+                            _ = "L",
+                            L.push(h, m);
+                        break;
+                      case "H":
+                        h = d.shift(),
+                            _ = "L",
+                            L.push(h, m);
+                        break;
+                      case "v":
+                        m += d.shift(),
+                            _ = "L",
+                            L.push(h, m);
+                        break;
+                      case "V":
+                        m = d.shift(),
+                            _ = "L",
+                            L.push(h, m);
+                        break;
+                      case "C":
+                        L.push(d.shift(), d.shift(), d.shift(), d.shift()),
+                            h = d.shift(),
+                            m = d.shift(),
+                            L.push(h, m);
+                        break;
+                      case "c":
+                        L.push(h + d.shift(), m + d.shift(), h + d.shift(), m + d.shift()),
+                            h += d.shift(),
+                            m += d.shift(),
+                            _ = "C",
+                            L.push(h, m);
+                        break;
+                      case "S":
+                        c = h,
+                            u = m,
+                            y = l[l.length - 1],
+                        "C" === y.command && (c = h + (h - y.points[2]), u = m + (m - y.points[3])),
+                            L.push(c, u, d.shift(), d.shift()),
+                            h = d.shift(),
+                            m = d.shift(),
+                            _ = "C",
+                            L.push(h, m);
+                        break;
+                      case "s":
+                        c = h,
+                            u = m,
+                            y = l[l.length - 1],
+                        "C" === y.command && (c = h + (h - y.points[2]), u = m + (m - y.points[3])),
+                            L.push(c, u, h + d.shift(), m + d.shift()),
+                            h += d.shift(),
+                            m += d.shift(),
+                            _ = "C",
+                            L.push(h, m);
+                        break;
+                      case "Q":
+                        L.push(d.shift(), d.shift()),
+                            h = d.shift(),
+                            m = d.shift(),
+                            L.push(h, m);
+                        break;
+                      case "q":
+                        L.push(h + d.shift(), m + d.shift()),
+                            h += d.shift(),
+                            m += d.shift(),
+                            _ = "Q",
+                            L.push(h, m);
+                        break;
+                      case "T":
+                        c = h,
+                            u = m,
+                            y = l[l.length - 1],
+                        "Q" === y.command && (c = h + (h - y.points[0]), u = m + (m - y.points[1])),
+                            h = d.shift(),
+                            m = d.shift(),
+                            _ = "Q",
+                            L.push(c, u, h, m);
+                        break;
+                      case "t":
+                        c = h,
+                            u = m,
+                            y = l[l.length - 1],
+                        "Q" === y.command && (c = h + (h - y.points[0]), u = m + (m - y.points[1])),
+                            h += d.shift(),
+                            m += d.shift(),
+                            _ = "Q",
+                            L.push(c, u, h, m);
+                        break;
+                      case "A":
+                        g = d.shift(),
+                            b = d.shift(),
+                            f = d.shift(),
+                            k = d.shift(),
+                            x = d.shift(),
+                            W = h,
+                            X = m,
+                            h = d.shift(),
+                            m = d.shift(),
+                            _ = "A",
+                            L = this._convertPoint(W, X, h, m, k, x, g, b, f);
+                        break;
+                      case "a":
+                        g = d.shift(),
+                            b = d.shift(),
+                            f = d.shift(),
+                            k = d.shift(),
+                            x = d.shift(),
+                            W = h,
+                            X = m,
+                            h += d.shift(),
+                            m += d.shift(),
+                            _ = "A",
+                            L = this._convertPoint(W, X, h, m, k, x, g, b, f)
+                    }
+                    for (var v = 0,
+                             w = L.length; w > v; v += 2) L[v] += t,
+                        L[v + 1] += i;
+                    l.push(new n(_ || U, L))
+                  } ("z" === U || "Z" === U) && l.push(new n("z", []))
+                }
+                return l
+              },
+              _convertPoint: function(e, t, i, n, a, s, l, h, m) {
+                var V = m * (Math.PI / 180),
+                    U = Math.cos(V) * (e - i) / 2 + Math.sin(V) * (t - n) / 2,
+                    d = -1 * Math.sin(V) * (e - i) / 2 + Math.cos(V) * (t - n) / 2,
+                    p = U * U / (l * l) + d * d / (h * h);
+                p > 1 && (l *= Math.sqrt(p), h *= Math.sqrt(p));
+                var c = Math.sqrt((l * l * h * h - l * l * d * d - h * h * U * U) / (l * l * d * d + h * h * U * U));
+                a === s && (c *= -1),
+                isNaN(c) && (c = 0);
+                var u = c * l * d / h,
+                    y = c * -h * U / l,
+                    g = (e + i) / 2 + Math.cos(V) * u - Math.sin(V) * y,
+                    b = (t + n) / 2 + Math.sin(V) * u + Math.cos(V) * y,
+                    f = r([1, 0], [(U - u) / l, (d - y) / h]),
+                    k = [(U - u) / l, (d - y) / h],
+                    x = [( - 1 * U - u) / l, ( - 1 * d - y) / h],
+                    _ = r(k, x);
+                return o(k, x) <= -1 && (_ = Math.PI),
+                o(k, x) >= 1 && (_ = 0),
+                0 === s && _ > 0 && (_ -= 2 * Math.PI),
+                1 === s && 0 > _ && (_ += 2 * Math.PI),
+                    [g, b, l, h, f, _, V, s]
+              },
+              buildPath: function(e, t) {
+                var i = t.path,
+                    n = t.x || 0,
+                    a = t.y || 0;
+                t.pathArray = t.pathArray || this.buildPathArray(i, n, a);
+                for (var o = t.pathArray,
+                         r = t.pointList = [], s = [], l = 0, h = o.length; h > l; l++) {
+                  "M" == o[l].command.toUpperCase() && (s.length > 0 && r.push(s), s = []);
+                  for (var m = o[l].points, V = 0, U = m.length; U > V; V += 2) s.push([m[V], m[V + 1]])
+                }
+                s.length > 0 && r.push(s);
+                for (var l = 0,
+                         h = o.length; h > l; l++) {
+                  var d = o[l].command,
+                      m = o[l].points;
+                  switch (d) {
+                    case "L":
+                      e.lineTo(m[0], m[1]);
+                      break;
+                    case "M":
+                      e.moveTo(m[0], m[1]);
+                      break;
+                    case "C":
+                      e.bezierCurveTo(m[0], m[1], m[2], m[3], m[4], m[5]);
+                      break;
+                    case "Q":
+                      e.quadraticCurveTo(m[0], m[1], m[2], m[3]);
+                      break;
+                    case "A":
+                      var p = m[0],
+                          c = m[1],
+                          u = m[2],
+                          y = m[3],
+                          g = m[4],
+                          b = m[5],
+                          f = m[6],
+                          k = m[7],
+                          x = u > y ? u: y,
+                          _ = u > y ? 1 : u / y,
+                          L = u > y ? y / u: 1;
+                      e.translate(p, c),
+                          e.rotate(f),
+                          e.scale(_, L),
+                          e.arc(0, 0, x, g, g + b, 1 - k),
+                          e.scale(1 / _, 1 / L),
+                          e.rotate( - f),
+                          e.translate( - p, -c);
+                      break;
+                    case "z":
+                      e.closePath()
+                  }
+                }
+              },
+              getRect: function(e) {
+                if (e.__rect) return e.__rect;
+                var t;
+                t = "stroke" == e.brushType || "fill" == e.brushType ? e.lineWidth || 1 : 0;
+                for (var i = Number.MAX_VALUE,
+                         n = Number.MIN_VALUE,
+                         a = Number.MAX_VALUE,
+                         o = Number.MIN_VALUE,
+                         r = e.x || 0,
+                         s = e.y || 0,
+                         l = e.pathArray || this.buildPathArray(e.path), h = 0; h < l.length; h++) for (var m = l[h].points, V = 0; V < m.length; V++) V % 2 === 0 ? (m[V] + r < i && (i = m[V]), m[V] + r > n && (n = m[V])) : (m[V] + s < a && (a = m[V]), m[V] + s > o && (o = m[V]));
+                var U;
+                return U = i === Number.MAX_VALUE || n === Number.MIN_VALUE || a === Number.MAX_VALUE || o === Number.MIN_VALUE ? {
+                  x: 0,
+                  y: 0,
+                  width: 0,
+                  height: 0
+                }: {
+                  x: Math.round(i - t / 2),
+                  y: Math.round(a - t / 2),
+                  width: n - i + t,
+                  height: o - a + t
+                },
+                    e.__rect = U,
+                    U
+              }
+            },
+                e("../tool/util").inherits(s, t),
+                s
+          }),
+      i("zrender/shape/Ellipse", ["require", "./Base", "../tool/util"],
+          function(e) {
+            var t = e("./Base"),
+                i = function(e) {
+                  t.call(this, e)
+                };
+            return i.prototype = {
+              type: "ellipse",
+              buildPath: function(e, t) {
+                var i = .5522848,
+                    n = t.x,
+                    a = t.y,
+                    o = t.a,
+                    r = t.b,
+                    s = o * i,
+                    l = r * i;
+                e.moveTo(n - o, a),
+                    e.bezierCurveTo(n - o, a - l, n - s, a - r, n, a - r),
+                    e.bezierCurveTo(n + s, a - r, n + o, a - l, n + o, a),
+                    e.bezierCurveTo(n + o, a + l, n + s, a + r, n, a + r),
+                    e.bezierCurveTo(n - s, a + r, n - o, a + l, n - o, a),
+                    e.closePath()
+              },
+              getRect: function(e) {
+                if (e.__rect) return e.__rect;
+                var t;
+                return t = "stroke" == e.brushType || "fill" == e.brushType ? e.lineWidth || 1 : 0,
+                    e.__rect = {
+                      x: Math.round(e.x - e.a - t / 2),
+                      y: Math.round(e.y - e.b - t / 2),
+                      width: 2 * e.a + t,
+                      height: 2 * e.b + t
+                    },
+                    e.__rect
+              }
+            },
+                e("../tool/util").inherits(i, t),
+                i
+          }),
+      i("echarts/component/roamController", ["require", "./base", "zrender/shape/Rectangle", "zrender/shape/Sector", "zrender/shape/Circle", "../config", "zrender/tool/util", "zrender/tool/color", "zrender/tool/event", "../component"],
+          function(e) {
+            function t(e, t, n, a, o) {
+              if (this.rcOption = {},
+              a.roamController && a.roamController.show) {
+                if (!a.roamController.mapTypeControl) return void console.error("option.roamController.mapTypeControl has not been defined.");
+                i.call(this, e, t, n, a, o),
+                    this.rcOption = a.roamController;
+                var r = this;
+                this._drictionMouseDown = function(e) {
+                  return r.__drictionMouseDown(e)
+                },
+                    this._drictionMouseUp = function(e) {
+                      return r.__drictionMouseUp(e)
+                    },
+                    this._drictionMouseMove = function(e) {
+                      return r.__drictionMouseMove(e)
+                    },
+                    this._drictionMouseOut = function(e) {
+                      return r.__drictionMouseOut(e)
+                    },
+                    this._scaleHandler = function(e) {
+                      return r.__scaleHandler(e)
+                    },
+                    this.refresh(a)
+              }
+            }
+            var i = e("./base"),
+                n = e("zrender/shape/Rectangle"),
+                a = e("zrender/shape/Sector"),
+                o = e("zrender/shape/Circle"),
+                r = e("../config");
+            r.roamController = {
+              zlevel: 0,
+              z: 4,
+              show: !0,
+              x: "left",
+              y: "top",
+              width: 80,
+              height: 120,
+              backgroundColor: "rgba(0,0,0,0)",
+              borderColor: "#ccc",
+              borderWidth: 0,
+              padding: 5,
+              handleColor: "#6495ed",
+              fillerColor: "#fff",
+              step: 15,
+              mapTypeControl: null
+            };
+            var s = e("zrender/tool/util"),
+                l = e("zrender/tool/color"),
+                h = e("zrender/tool/event");
+            return t.prototype = {
+              type: r.COMPONENT_TYPE_ROAMCONTROLLER,
+              _buildShape: function() {
+                if (this.rcOption.show) {
+                  this._itemGroupLocation = this._getItemGroupLocation(),
+                      this._buildBackground(),
+                      this._buildItem();
+                  for (var e = 0,
+                           t = this.shapeList.length; t > e; e++) this.zr.addShape(this.shapeList[e])
+                }
+              },
+              _buildItem: function() {
+                this.shapeList.push(this._getDirectionShape("up")),
+                    this.shapeList.push(this._getDirectionShape("down")),
+                    this.shapeList.push(this._getDirectionShape("left")),
+                    this.shapeList.push(this._getDirectionShape("right")),
+                    this.shapeList.push(this._getScaleShape("scaleUp")),
+                    this.shapeList.push(this._getScaleShape("scaleDown"))
+              },
+              _getDirectionShape: function(e) {
+                var t = this._itemGroupLocation.r,
+                    i = this._itemGroupLocation.x + t,
+                    n = this._itemGroupLocation.y + t,
+                    o = {
+                      zlevel: this.getZlevelBase(),
+                      z: this.getZBase(),
+                      style: {
+                        x: i,
+                        y: n,
+                        r: t,
+                        startAngle: -45,
+                        endAngle: 45,
+                        color: this.rcOption.handleColor,
+                        text: ">",
+                        textX: i + t / 2 + 4,
+                        textY: n - .5,
+                        textAlign: "center",
+                        textBaseline: "middle",
+                        textPosition: "specific",
+                        textColor: this.rcOption.fillerColor,
+                        textFont: Math.floor(t / 2) + "px arial"
+                      },
+                      highlightStyle: {
+                        color: l.lift(this.rcOption.handleColor, -.2),
+                        brushType: "fill"
+                      },
+                      clickable: !0
+                    };
+                switch (e) {
+                  case "up":
+                    o.rotation = [Math.PI / 2, i, n];
+                    break;
+                  case "left":
+                    o.rotation = [Math.PI, i, n];
+                    break;
+                  case "down":
+                    o.rotation = [ - Math.PI / 2, i, n]
+                }
+                return o = new a(o),
+                    o._roamType = e,
+                    o.onmousedown = this._drictionMouseDown,
+                    o.onmouseup = this._drictionMouseUp,
+                    o.onmousemove = this._drictionMouseMove,
+                    o.onmouseout = this._drictionMouseOut,
+                    o
+              },
+              _getScaleShape: function(e) {
+                var t = this._itemGroupLocation.width,
+                    i = this._itemGroupLocation.height - t;
+                i = 0 > i ? 20 : i;
+                var n = Math.min(t / 2 - 5, i) / 2,
+                    a = this._itemGroupLocation.x + ("scaleDown" === e ? t - n: n),
+                    r = this._itemGroupLocation.y + this._itemGroupLocation.height - n,
+                    s = {
+                      zlevel: this.getZlevelBase(),
+                      z: this.getZBase(),
+                      style: {
+                        x: a,
+                        y: r,
+                        r: n,
+                        color: this.rcOption.handleColor,
+                        text: "scaleDown" === e ? "-": "+",
+                        textX: a,
+                        textY: r - 2,
+                        textAlign: "center",
+                        textBaseline: "middle",
+                        textPosition: "specific",
+                        textColor: this.rcOption.fillerColor,
+                        textFont: Math.floor(n) + "px verdana"
+                      },
+                      highlightStyle: {
+                        color: l.lift(this.rcOption.handleColor, -.2),
+                        brushType: "fill"
+                      },
+                      clickable: !0
+                    };
+                return s = new o(s),
+                    s._roamType = e,
+                    s.onmousedown = this._scaleHandler,
+                    s
+              },
+              _buildBackground: function() {
+                var e = this.reformCssArray(this.rcOption.padding);
+                this.shapeList.push(new n({
+                  zlevel: this.getZlevelBase(),
+                  z: this.getZBase(),
+                  hoverable: !1,
+                  style: {
+                    x: this._itemGroupLocation.x - e[3],
+                    y: this._itemGroupLocation.y - e[0],
+                    width: this._itemGroupLocation.width + e[3] + e[1],
+                    height: this._itemGroupLocation.height + e[0] + e[2],
+                    brushType: 0 === this.rcOption.borderWidth ? "fill": "both",
+                    color: this.rcOption.backgroundColor,
+                    strokeColor: this.rcOption.borderColor,
+                    lineWidth: this.rcOption.borderWidth
+                  }
+                }))
+              },
+              _getItemGroupLocation: function() {
+                var e, t = this.reformCssArray(this.rcOption.padding),
+                    i = this.rcOption.width,
+                    n = this.rcOption.height,
+                    a = this.zr.getWidth(),
+                    o = this.zr.getHeight();
+                switch (this.rcOption.x) {
+                  case "center":
+                    e = Math.floor((a - i) / 2);
+                    break;
+                  case "left":
+                    e = t[3] + this.rcOption.borderWidth;
+                    break;
+                  case "right":
+                    e = a - i - t[1] - t[3] - 2 * this.rcOption.borderWidth;
+                    break;
+                  default:
+                    e = this.parsePercent(this.rcOption.x, a)
+                }
+                var r;
+                switch (this.rcOption.y) {
+                  case "top":
+                    r = t[0] + this.rcOption.borderWidth;
+                    break;
+                  case "bottom":
+                    r = o - n - t[0] - t[2] - 2 * this.rcOption.borderWidth;
+                    break;
+                  case "center":
+                    r = Math.floor((o - n) / 2);
+                    break;
+                  default:
+                    r = this.parsePercent(this.rcOption.y, o)
+                }
+                return {
+                  x: e,
+                  y: r,
+                  r: i / 2,
+                  width: i,
+                  height: n
+                }
+              },
+              __drictionMouseDown: function(e) {
+                this.mousedown = !0,
+                    this._drictionHandlerOn(e)
+              },
+              __drictionMouseUp: function(e) {
+                this.mousedown = !1,
+                    this._drictionHandlerOff(e)
+              },
+              __drictionMouseMove: function(e) {
+                this.mousedown && this._drictionHandlerOn(e)
+              },
+              __drictionMouseOut: function(e) {
+                this._drictionHandlerOff(e)
+              },
+              _drictionHandlerOn: function(e) {
+                this._dispatchEvent(e.event, e.target._roamType),
+                    clearInterval(this.dircetionTimer);
+                var t = this;
+                this.dircetionTimer = setInterval(function() {
+                      t._dispatchEvent(e.event, e.target._roamType)
+                    },
+                    100),
+                    h.stop(e.event)
+              },
+              _drictionHandlerOff: function() {
+                clearInterval(this.dircetionTimer)
+              },
+              __scaleHandler: function(e) {
+                this._dispatchEvent(e.event, e.target._roamType),
+                    h.stop(e.event)
+              },
+              _dispatchEvent: function(e, t) {
+                this.messageCenter.dispatch(r.EVENT.ROAMCONTROLLER, e, {
+                      roamType: t,
+                      mapTypeControl: this.rcOption.mapTypeControl,
+                      step: this.rcOption.step
+                    },
+                    this.myChart)
+              },
+              refresh: function(e) {
+                e && (this.option = e || this.option, this.option.roamController = this.reformOption(this.option.roamController), this.rcOption = this.option.roamController),
+                    this.clear(),
+                    this._buildShape()
+              }
+            },
+                s.inherits(t, i),
+                e("../component").define("roamController", t),
+                t
+          }),
+      i("echarts/layer/heatmap", ["require"],
+          function() {
+            function e(e) {
+              if (this.option = e, e) for (var i in t) this.option[i] = void 0 !== e[i] ? e[i] : t[i];
+              else this.option = t
+            }
+            var t = {
+                  blurSize: 30,
+                  gradientColors: ["blue", "cyan", "lime", "yellow", "red"],
+                  minAlpha: .05,
+                  valueScale: 1,
+                  opacity: 1
+                },
+                i = 20,
+                n = 256;
+            return e.prototype = {
+              getCanvas: function(e, t, a) {
+                var o = this._getBrush(),
+                    r = this._getGradient(),
+                    s = i + this.option.blurSize,
+                    l = document.createElement("canvas");
+                l.width = t,
+                    l.height = a;
+                for (var h = l.getContext("2d"), m = e.length, V = 0; m > V; ++V) {
+                  var U = e[V],
+                      d = U[0],
+                      p = U[1],
+                      c = U[2],
+                      u = Math.min(1, Math.max(c * this.option.valueScale || this.option.minAlpha, this.option.minAlpha));
+                  h.globalAlpha = u,
+                      h.drawImage(o, d - s, p - s)
+                }
+                for (var y = h.getImageData(0, 0, l.width, l.height), g = y.data, m = g.length / 4; m--;) {
+                  var b = 4 * m + 3,
+                      u = g[b] / 256,
+                      f = Math.floor(u * (n - 1));
+                  g[b - 3] = r[4 * f],
+                      g[b - 2] = r[4 * f + 1],
+                      g[b - 1] = r[4 * f + 2],
+                      g[b] *= this.option.opacity
+                }
+                return h.putImageData(y, 0, 0),
+                    l
+              },
+              _getBrush: function() {
+                if (!this._brushCanvas) {
+                  this._brushCanvas = document.createElement("canvas");
+                  var e = i + this.option.blurSize,
+                      t = 2 * e;
+                  this._brushCanvas.width = t,
+                      this._brushCanvas.height = t;
+                  var n = this._brushCanvas.getContext("2d");
+                  n.shadowOffsetX = t,
+                      n.shadowBlur = this.option.blurSize,
+                      n.shadowColor = "black",
+                      n.beginPath(),
+                      n.arc( - e, e, i, 0, 2 * Math.PI, !0),
+                      n.closePath(),
+                      n.fill()
+                }
+                return this._brushCanvas
+              },
+              _getGradient: function() {
+                if (!this._gradientPixels) {
+                  var e = n,
+                      t = document.createElement("canvas");
+                  t.width = 1,
+                      t.height = e;
+                  for (var i = t.getContext("2d"), a = i.createLinearGradient(0, 0, 0, e), o = this.option.gradientColors.length, r = 0; o > r; ++r)"string" == typeof this.option.gradientColors[r] ? a.addColorStop((r + 1) / o, this.option.gradientColors[r]) : a.addColorStop(this.option.gradientColors[r].offset, this.option.gradientColors[r].color);
+                  i.fillStyle = a,
+                      i.fillRect(0, 0, 1, e),
+                      this._gradientPixels = i.getImageData(0, 0, 1, e).data
+                }
+                return this._gradientPixels
+              }
+            },
+                e
+          }),
+      i("echarts/util/mapData/params", ["require"],
+          function(e) {
+            function t(e) {
+              if (!e.UTF8Encoding) return e;
+              for (var t = e.features,
+                       n = 0; n < t.length; n++) for (var a = t[n], o = a.geometry.coordinates, r = a.geometry.encodeOffsets, s = 0; s < o.length; s++) {
+                var l = o[s];
+                if ("Polygon" === a.geometry.type) o[s] = i(l, r[s]);
+                else if ("MultiPolygon" === a.geometry.type) for (var h = 0; h < l.length; h++) {
+                  var m = l[h];
+                  l[h] = i(m, r[s][h])
+                }
+              }
+              return e.UTF8Encoding = !1,
+                  e
+            }
+            function i(e, t) {
+              for (var i = [], n = t[0], a = t[1], o = 0; o < e.length; o += 2) {
+                var r = e.charCodeAt(o) - 64,
+                    s = e.charCodeAt(o + 1) - 64;
+                r = r >> 1 ^ -(1 & r),
+                    s = s >> 1 ^ -(1 & s),
+                    r += n,
+                    s += a,
+                    n = r,
+                    a = s,
+                    i.push([r / 1024, s / 1024])
+              }
+              return i
+            }
+            var n = {
+              none: {
+                getGeoJson: function(e) {
+                  e({
+                    type: "FeatureCollection",
+                    features: [{
+                      type: "Feature",
+                      geometry: {
+                        coordinates: [],
+                        encodeOffsets: [],
+                        type: "Polygon"
+                      },
+                      properties: {}
+                    }]
+                  })
+                }
+              },
+              world: {
+                getGeoJson: function(i) {
+                  e(["./geoJson/world_geo"],
+                      function(e) {
+                        i(t(e))
+                      })
+                }
+              },
+              china: {
+                getGeoJson: function(i) {
+                  e(["./geoJson/china_geo"],
+                      function(e) {
+                        i(t(e))
+                      })
+                }
+              },
+              "南海诸岛": {
+                textCoord: [126, 25],
+                getPath: function(e, t) {
+                  for (var i = [[[0, 3.5], [7, 11.2], [15, 11.9], [30, 7], [42, .7], [52, .7], [56, 7.7], [59, .7], [64, .7], [64, 0], [5, 0], [0, 3.5]], [[13, 16.1], [19, 14.7], [16, 21.7], [11, 23.1], [13, 16.1]], [[12, 32.2], [14, 38.5], [15, 38.5], [13, 32.2], [12, 32.2]], [[16, 47.6], [12, 53.2], [13, 53.2], [18, 47.6], [16, 47.6]], [[6, 64.4], [8, 70], [9, 70], [8, 64.4], [6, 64.4]], [[23, 82.6], [29, 79.8], [30, 79.8], [25, 82.6], [23, 82.6]], [[37, 70.7], [43, 62.3], [44, 62.3], [39, 70.7], [37, 70.7]], [[48, 51.1], [51, 45.5], [53, 45.5], [50, 51.1], [48, 51.1]], [[51, 35], [51, 28.7], [53, 28.7], [53, 35], [51, 35]], [[52, 22.4], [55, 17.5], [56, 17.5], [53, 22.4], [52, 22.4]], [[58, 12.6], [62, 7], [63, 7], [60, 12.6], [58, 12.6]], [[0, 3.5], [0, 93.1], [64, 93.1], [64, 0], [63, 0], [63, 92.4], [1, 92.4], [1, 3.5], [0, 3.5]]], n = "", a = e[0], o = e[1], r = 0, s = i.length; s > r; r++) {
+                    n += "M " + ((i[r][0][0] * t + a).toFixed(2) - 0) + " " + ((i[r][0][1] * t + o).toFixed(2) - 0) + " ";
+                    for (var l = 1,
+                             h = i[r].length; h > l; l++) n += "L " + ((i[r][l][0] * t + a).toFixed(2) - 0) + " " + ((i[r][l][1] * t + o).toFixed(2) - 0) + " "
+                  }
+                  return n + " Z"
+                }
+              },
+              "新疆": {
+                getGeoJson: function(i) {
+                  e(["./geoJson/xin_jiang_geo"],
+                      function(e) {
+                        i(t(e))
+                      })
+                }
+              },
+              "西藏": {
+                getGeoJson: function(i) {
+                  e(["./geoJson/xi_zang_geo"],
+                      function(e) {
+                        i(t(e))
+                      })
+                }
+              },
+              "内蒙古": {
+                getGeoJson: function(i) {
+                  e(["./geoJson/nei_meng_gu_geo"],
+                      function(e) {
+                        i(t(e))
+                      })
+                }
+              },
+              "青海": {
+                getGeoJson: function(i) {
+                  e(["./geoJson/qing_hai_geo"],
+                      function(e) {
+                        i(t(e))
+                      })
+                }
+              },
+              "四川": {
+                getGeoJson: function(i) {
+                  e(["./geoJson/si_chuan_geo"],
+                      function(e) {
+                        i(t(e))
+                      })
+                }
+              },
+              "黑龙江": {
+                getGeoJson: function(i) {
+                  e(["./geoJson/hei_long_jiang_geo"],
+                      function(e) {
+                        i(t(e))
+                      })
+                }
+              },
+              "甘肃": {
+                getGeoJson: function(i) {
+                  e(["./geoJson/gan_su_geo"],
+                      function(e) {
+                        i(t(e))
+                      })
+                }
+              },
+              "云南": {
+                getGeoJson: function(i) {
+                  e(["./geoJson/yun_nan_geo"],
+                      function(e) {
+                        i(t(e))
+                      })
+                }
+              },
+              "广西": {
+                getGeoJson: function(i) {
+                  e(["./geoJson/guang_xi_geo"],
+                      function(e) {
+                        i(t(e))
+                      })
+                }
+              },
+              "湖南": {
+                getGeoJson: function(i) {
+                  e(["./geoJson/hu_nan_geo"],
+                      function(e) {
+                        i(t(e))
+                      })
+                }
+              },
+              "陕西": {
+                getGeoJson: function(i) {
+                  e(["./geoJson/shan_xi_1_geo"],
+                      function(e) {
+                        i(t(e))
+                      })
+                }
+              },
+              "广东": {
+                getGeoJson: function(i) {
+                  e(["./geoJson/guang_dong_geo"],
+                      function(e) {
+                        i(t(e))
+                      })
+                }
+              },
+              "吉林": {
+                getGeoJson: function(i) {
+                  e(["./geoJson/ji_lin_geo"],
+                      function(e) {
+                        i(t(e))
+                      })
+                }
+              },
+              "河北": {
+                getGeoJson: function(i) {
+                  e(["./geoJson/he_bei_geo"],
+                      function(e) {
+                        i(t(e))
+                      })
+                }
+              },
+              "湖北": {
+                getGeoJson: function(i) {
+                  e(["./geoJson/hu_bei_geo"],
+                      function(e) {
+                        i(t(e))
+                      })
+                }
+              },
+              "贵州": {
+                getGeoJson: function(i) {
+                  e(["./geoJson/gui_zhou_geo"],
+                      function(e) {
+                        i(t(e))
+                      })
+                }
+              },
+              "山东": {
+                getGeoJson: function(i) {
+                  e(["./geoJson/shan_dong_geo"],
+                      function(e) {
+                        i(t(e))
+                      })
+                }
+              },
+              "江西": {
+                getGeoJson: function(i) {
+                  e(["./geoJson/jiang_xi_geo"],
+                      function(e) {
+                        i(t(e))
+                      })
+                }
+              },
+              "河南": {
+                getGeoJson: function(i) {
+                  e(["./geoJson/he_nan_geo"],
+                      function(e) {
+                        i(t(e))
+                      })
+                }
+              },
+              "辽宁": {
+                getGeoJson: function(i) {
+                  e(["./geoJson/liao_ning_geo"],
+                      function(e) {
+                        i(t(e))
+                      })
+                }
+              },
+              "山西": {
+                getGeoJson: function(i) {
+                  e(["./geoJson/shan_xi_2_geo"],
+                      function(e) {
+                        i(t(e))
+                      })
+                }
+              },
+              "安徽": {
+                getGeoJson: function(i) {
+                  e(["./geoJson/an_hui_geo"],
+                      function(e) {
+                        i(t(e))
+                      })
+                }
+              },
+              "福建": {
+                getGeoJson: function(i) {
+                  e(["./geoJson/fu_jian_geo"],
+                      function(e) {
+                        i(t(e))
+                      })
+                }
+              },
+              "浙江": {
+                getGeoJson: function(i) {
+                  e(["./geoJson/zhe_jiang_geo"],
+                      function(e) {
+                        i(t(e))
+                      })
+                }
+              },
+              "江苏": {
+                getGeoJson: function(i) {
+                  e(["./geoJson/jiang_su_geo"],
+                      function(e) {
+                        i(t(e))
+                      })
+                }
+              },
+              "重庆": {
+                getGeoJson: function(i) {
+                  e(["./geoJson/chong_qing_geo"],
+                      function(e) {
+                        i(t(e))
+                      })
+                }
+              },
+              "宁夏": {
+                getGeoJson: function(i) {
+                  e(["./geoJson/ning_xia_geo"],
+                      function(e) {
+                        i(t(e))
+                      })
+                }
+              },
+              "海南": {
+                getGeoJson: function(i) {
+                  e(["./geoJson/hai_nan_geo"],
+                      function(e) {
+                        i(t(e))
+                      })
+                }
+              },
+              "台湾": {
+                getGeoJson: function(i) {
+                  e(["./geoJson/tai_wan_geo"],
+                      function(e) {
+                        i(t(e))
+                      })
+                }
+              },
+              "北京": {
+                getGeoJson: function(i) {
+                  e(["./geoJson/bei_jing_geo"],
+                      function(e) {
+                        i(t(e))
+                      })
+                }
+              },
+              "天津": {
+                getGeoJson: function(i) {
+                  e(["./geoJson/tian_jin_geo"],
+                      function(e) {
+                        i(t(e))
+                      })
+                }
+              },
+              "上海": {
+                getGeoJson: function(i) {
+                  e(["./geoJson/shang_hai_geo"],
+                      function(e) {
+                        i(t(e))
+                      })
+                }
+              },
+              "香港": {
+                getGeoJson: function(i) {
+                  e(["./geoJson/xiang_gang_geo"],
+                      function(e) {
+                        i(t(e))
+                      })
+                }
+              },
+              "澳门": {
+                getGeoJson: function(i) {
+                  e(["./geoJson/ao_men_geo"],
+                      function(e) {
+                        i(t(e))
+                      })
+                }
+              }
+            };
+            return {
+              decode: t,
+              params: n
+            }
+          }),
+      i("echarts/util/mapData/textFixed", [],
+          function() {
+            return {
+              "广东": [0, -10],
+              "香港": [10, 10],
+              "澳门": [ - 10, 18],
+              "黑龙江": [0, 20],
+              "天津": [5, 5],
+              "深圳市": [ - 35, 0],
+              "红河哈尼族彝族自治州": [0, 20],
+              "楚雄彝族自治州": [ - 5, 15],
+              "石河子市": [ - 5, 5],
+              "五家渠市": [0, -10],
+              "昌吉回族自治州": [10, 10],
+              "昌江黎族自治县": [0, 20],
+              "陵水黎族自治县": [0, 20],
+              "东方市": [0, 20],
+              "渭南市": [0, 20]
+            }
+          }),
+      i("echarts/util/mapData/geoCoord", [],
+          function() {
+            return {
+              Russia: [100, 60],
+              "United States of America": [ - 99, 38]
+            }
+          }),
+      i("echarts/util/projection/svg", ["require", "zrender/shape/Path"],
+          function(e) {
+            function t(e) {
+              return parseFloat(e || 0)
+            }
+            function i(e) {
+              for (var i = e.firstChild;
+                   "svg" != i.nodeName.toLowerCase() || 1 != i.nodeType;) i = i.nextSibling;
+              var n = t(i.getAttribute("x")),
+                  a = t(i.getAttribute("y")),
+                  o = t(i.getAttribute("width")),
+                  r = t(i.getAttribute("height"));
+              return {
+                left: n,
+                top: a,
+                width: o,
+                height: r
+              }
+            }
+            function n(e, t) {
+              function i(e) {
+                var t = e.tagName;
+                if (m[t]) {
+                  var o = m[t](e, n);
+                  o && (o.scale = n, o.properties = {
+                    name: e.getAttribute("name") || ""
+                  },
+                      o.id = e.id, s(o, e), a.push(o))
+                }
+                for (var r = e.childNodes,
+                         l = 0,
+                         h = r.length; h > l; l++) i(r[l])
+              }
+              var n = [t.scale.x, t.scale.y],
+                  a = [];
+              return i(e),
+                  a
+            }
+            function a(e, t) {
+              var i = t instanceof Array ? [1 * t[0], 1 * t[1]] : [1 * t.x, 1 * t.y];
+              return [i[0] / e.scale.x, i[1] / e.scale.y]
+            }
+            function o(e, t) {
+              var i = t instanceof Array ? [1 * t[0], 1 * t[1]] : [1 * t.x, 1 * t.y];
+              return [i[0] * e.scale.x, i[1] * e.scale.y]
+            }
+            function r(e) {
+              return e.replace(/^\s\s*/, "").replace(/\s\s*$/, "")
+            }
+            function s(e, t) {
+              var i = t.getAttribute("fill"),
+                  n = t.getAttribute("stroke"),
+                  a = t.getAttribute("stroke-width"),
+                  o = t.getAttribute("opacity");
+              i && "none" != i ? (e.color = i, n ? (e.brushType = "both", e.strokeColor = n) : e.brushType = "fill") : n && "none" != n && (e.strokeColor = n, e.brushType = "stroke"),
+              a && "none" != a && (e.lineWidth = parseFloat(a)),
+              o && "none" != o && (e.opacity = parseFloat(o))
+            }
+            function l(e) {
+              for (var t = r(e).replace(/,/g, " ").split(/\s+/), i = [], n = 0; n < t.length;) {
+                var a = parseFloat(t[n++]),
+                    o = parseFloat(t[n++]);
+                i.push([a, o])
+              }
+              return i
+            }
+            var h = e("zrender/shape/Path"),
+                m = {
+                  path: function(e, t) {
+                    var i = e.getAttribute("d"),
+                        n = h.prototype.getRect({
+                          path: i
+                        });
+                    return {
+                      shapeType: "path",
+                      path: i,
+                      cp: [(n.x + n.width / 2) * t[0], (n.y + n.height / 2) * t[1]]
+                    }
+                  },
+                  rect: function(e, i) {
+                    var n = t(e.getAttribute("x")),
+                        a = t(e.getAttribute("y")),
+                        o = t(e.getAttribute("width")),
+                        r = t(e.getAttribute("height"));
+                    return {
+                      shapeType: "rectangle",
+                      x: n,
+                      y: a,
+                      width: o,
+                      height: r,
+                      cp: [(n + o / 2) * i[0], (a + r / 2) * i[1]]
+                    }
+                  },
+                  line: function(e, i) {
+                    var n = t(e.getAttribute("x1")),
+                        a = t(e.getAttribute("y1")),
+                        o = t(e.getAttribute("x2")),
+                        r = t(e.getAttribute("y2"));
+                    return {
+                      shapeType: "line",
+                      xStart: n,
+                      yStart: a,
+                      xEnd: o,
+                      yEnd: r,
+                      cp: [.5 * (n + o) * i[0], .5 * (a + r) * i[1]]
+                    }
+                  },
+                  circle: function(e, i) {
+                    var n = t(e.getAttribute("cx")),
+                        a = t(e.getAttribute("cy")),
+                        o = t(e.getAttribute("r"));
+                    return {
+                      shapeType: "circle",
+                      x: n,
+                      y: a,
+                      r: o,
+                      cp: [n * i[0], a * i[1]]
+                    }
+                  },
+                  ellipse: function(e, t) {
+                    var i = parseFloat(e.getAttribute("cx") || 0),
+                        n = parseFloat(e.getAttribute("cy") || 0),
+                        a = parseFloat(e.getAttribute("rx") || 0),
+                        o = parseFloat(e.getAttribute("ry") || 0);
+                    return {
+                      shapeType: "ellipse",
+                      x: i,
+                      y: n,
+                      a: a,
+                      b: o,
+                      cp: [i * t[0], n * t[1]]
+                    }
+                  },
+                  polygon: function(e, t) {
+                    var i = e.getAttribute("points"),
+                        n = [1 / 0, 1 / 0],
+                        a = [ - (1 / 0), -(1 / 0)];
+                    if (i) {
+                      i = l(i);
+                      for (var o = 0; o < i.length; o++) {
+                        var r = i[o];
+                        n[0] = Math.min(r[0], n[0]),
+                            n[1] = Math.min(r[1], n[1]),
+                            a[0] = Math.max(r[0], a[0]),
+                            a[1] = Math.max(r[1], a[1])
+                      }
+                      return {
+                        shapeType: "polygon",
+                        pointList: i,
+                        cp: [(n[0] + a[0]) / 2 * t[0], (n[1] + a[1]) / 2 * t[0]]
+                      }
+                    }
+                  },
+                  polyline: function(e, t) {
+                    var i = m.polygon(e, t);
+                    return i
+                  }
+                };
+            return {
+              getBbox: i,
+              geoJson2Path: n,
+              pos2geo: a,
+              geo2pos: o
+            }
+          }),
+      i("echarts/util/projection/normal", [],
+          function() {
+            function e(e, i) {
+              return i = i || {},
+              e.srcSize || t(e, i),
+                  e.srcSize
+            }
+            function t(e, t) {
+              t = t || {},
+                  r.xmin = 360,
+                  r.xmax = -360,
+                  r.ymin = 180,
+                  r.ymax = -180;
+              for (var i, n, a = e.features,
+                       o = 0,
+                       s = a.length; s > o; o++) if (n = a[o], !n.properties.name || !t[n.properties.name]) switch (n.type) {
+                case "Feature":
+                  r[n.geometry.type](n.geometry.coordinates);
+                  break;
+                case "GeometryCollection":
+                  i = n.geometries;
+                  for (var l = 0,
+                           h = i.length; h > l; l++) r[i[l].type](i[l].coordinates)
+              }
+              return e.srcSize = {
+                left: 1 * r.xmin.toFixed(4),
+                top: 1 * r.ymin.toFixed(4),
+                width: 1 * (r.xmax - r.xmin).toFixed(4),
+                height: 1 * (r.ymax - r.ymin).toFixed(4)
+              },
+                  e
+            }
+            function i(e, i, n) {
+              function a(e, t) {
+                c = e.type,
+                    u = e.coordinates,
+                    o._bbox = {
+                      xmin: 360,
+                      xmax: -360,
+                      ymin: 180,
+                      ymax: -180
+                    },
+                    y = o[c](u),
+                    m.push({
+                      path: y,
+                      cp: o.makePoint(t.properties.cp ? t.properties.cp: [(o._bbox.xmin + o._bbox.xmax) / 2, (o._bbox.ymin + o._bbox.ymax) / 2]),
+                      properties: t.properties,
+                      id: t.id
+                    })
+              }
+              n = n || {},
+                  o.scale = null,
+                  o.offset = null,
+              e.srcSize || t(e, n),
+                  i.offset = {
+                    x: e.srcSize.left,
+                    y: e.srcSize.top,
+                    left: i.OffsetLeft || 0,
+                    top: i.OffsetTop || 0
+                  },
+                  o.scale = i.scale,
+                  o.offset = i.offset;
+              for (var r, s, l, h = e.features,
+                       m = [], V = 0, U = h.length; U > V; V++) if (l = h[V], !l.properties.name || !n[l.properties.name]) if ("Feature" == l.type) a(l.geometry, l);
+              else if ("GeometryCollection" == l.type) {
+                r = l.geometries;
+                for (var d = 0,
+                         p = r.length; p > d; d++) s = r[d],
+                    a(s, s)
+              }
+              var c, u, y;
+              return m
+            }
+            function n(e, t) {
+              var i, n;
+              return t instanceof Array ? (i = 1 * t[0], n = 1 * t[1]) : (i = 1 * t.x, n = 1 * t.y),
+                  i = i / e.scale.x + e.offset.x - 168.5,
+                  i = i > 180 ? i - 360 : i,
+                  n = 90 - (n / e.scale.y + e.offset.y),
+                  [i, n]
+            }
+            function a(e, t) {
+              return o.offset = e.offset,
+                  o.scale = e.scale,
+                  o.makePoint(t instanceof Array ? [1 * t[0], 1 * t[1]] : [1 * t.x, 1 * t.y])
+            }
+            var o = {
+                  formatPoint: function(e) {
+                    return [(e[0] < -168.5 && e[1] > 63.8 ? e[0] + 360 : e[0]) + 168.5, 90 - e[1]]
+                  },
+                  makePoint: function(e) {
+                    var t = this,
+                        i = t.formatPoint(e);
+                    t._bbox.xmin > e[0] && (t._bbox.xmin = e[0]),
+                    t._bbox.xmax < e[0] && (t._bbox.xmax = e[0]),
+                    t._bbox.ymin > e[1] && (t._bbox.ymin = e[1]),
+                    t._bbox.ymax < e[1] && (t._bbox.ymax = e[1]);
+                    var n = (i[0] - o.offset.x) * o.scale.x + o.offset.left,
+                        a = (i[1] - o.offset.y) * o.scale.y + o.offset.top;
+                    return [n, a]
+                  },
+                  Point: function(e) {
+                    return e = this.makePoint(e),
+                        e.join(",")
+                  },
+                  LineString: function(e) {
+                    for (var t, i = "",
+                             n = 0,
+                             a = e.length; a > n; n++) t = o.makePoint(e[n]),
+                        i = 0 === n ? "M" + t.join(",") : i + "L" + t.join(",");
+                    return i
+                  },
+                  Polygon: function(e) {
+                    for (var t = "",
+                             i = 0,
+                             n = e.length; n > i; i++) t = t + o.LineString(e[i]) + "z";
+                    return t
+                  },
+                  MultiPoint: function(e) {
+                    for (var t = [], i = 0, n = e.length; n > i; i++) t.push(o.Point(e[i]));
+                    return t
+                  },
+                  MultiLineString: function(e) {
+                    for (var t = "",
+                             i = 0,
+                             n = e.length; n > i; i++) t += o.LineString(e[i]);
+                    return t
+                  },
+                  MultiPolygon: function(e) {
+                    for (var t = "",
+                             i = 0,
+                             n = e.length; n > i; i++) t += o.Polygon(e[i]);
+                    return t
+                  }
+                },
+                r = {
+                  formatPoint: o.formatPoint,
+                  makePoint: function(e) {
+                    var t = this,
+                        i = t.formatPoint(e),
+                        n = i[0],
+                        a = i[1];
+                    t.xmin > n && (t.xmin = n),
+                    t.xmax < n && (t.xmax = n),
+                    t.ymin > a && (t.ymin = a),
+                    t.ymax < a && (t.ymax = a)
+                  },
+                  Point: function(e) {
+                    this.makePoint(e)
+                  },
+                  LineString: function(e) {
+                    for (var t = 0,
+                             i = e.length; i > t; t++) this.makePoint(e[t])
+                  },
+                  Polygon: function(e) {
+                    for (var t = 0,
+                             i = e.length; i > t; t++) this.LineString(e[t])
+                  },
+                  MultiPoint: function(e) {
+                    for (var t = 0,
+                             i = e.length; i > t; t++) this.Point(e[t])
+                  },
+                  MultiLineString: function(e) {
+                    for (var t = 0,
+                             i = e.length; i > t; t++) this.LineString(e[t])
+                  },
+                  MultiPolygon: function(e) {
+                    for (var t = 0,
+                             i = e.length; i > t; t++) this.Polygon(e[t])
+                  }
+                };
+            return {
+              getBbox: e,
+              geoJson2Path: i,
+              pos2geo: n,
+              geo2pos: a
+            }
+          }),
+      i("echarts/util/mapData/geoJson/an_hui_geo", [],
+          function() {
+            return {
+              type: "FeatureCollection",
+              features: [{
+                type: "Feature",
+                id: "3415",
+                properties: {
+                  name: "六安市",
+                  cp: [116.3123, 31.8329],
+                  childNum: 6
+                },
+                geometry: {
+                  type: "Polygon",
+                  coordinates: ["@@„„nJ‚UXUVƒ°U„ÑnU@mlLVaVln@@bn@VU@xlb@lšLnKlšƒVI„JšUVxnI@lVL@b„Ž°VX@˜b„x„nVVUnVVnU‚›@kX@VwV@„al¥UUnUWa@ƒ@wĸU„LU¥lKUa@aUI@alLVaUƒ¯anƒWkUKm@XV@VaXlW@aU_UWVUƒI¯@ma¯W¯™™I@UU@WWU@U@@UU@VkV@@WUUm@UaU@„lK@IUK„L@KWmXUWaXI@ƒ@a@a@U@U@KV¥lw„k°b²JVIVKlV@UX„la„Ul`œUVLVVVUšJ„U@Lnm@_VK@KUIW@™J@Xk@WW@U—ƒmm™XmWk@kK@aUUƒVmmkUwUmWL™@WmU@™UJmUULkKWakLWVkIƒlƒwULƒW@X°lUJ@°ULƒWV—wmJ@bmb¯Vkm@@WkWm¯wƒL@lkXƒWmXym¯UImJUbkV™@Vn¯„@V@lUbƒ@mk@maUxmlUbULWn@J—LmKUkWKkwUKƒbm„X„WxkVUKmLkVV@JUUWL@xkJUUƒV@X@VVlUbVX@xk¤šx‚¼œxWxn„‚nn@Þ¼„JVb°aVn„@šmlnXU„JlbVlkz@‚lUŽlXJmxVxXnWxXÈWlUŽ@šUxU@VX@xUL@šUÆmLnV@lWXk@@JlbXblnlJ"],
+                  encodeOffsets: [[118710, 33351]]
+                }
+              },
+                {
+                  type: "Feature",
+                  id: "3408",
+                  properties: {
+                    name: "安庆市",
+                    cp: [116.7517, 30.5255],
+                    childNum: 9
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@n°‚znW„XlW@k„K°xXn‚l@Xn@l‚°Una@anI˜xXU„ŽVK@¯VIkW¯X@‚„VK„x„klJXUlKXblLVKnVVIšŽV@Xn‚@šŽXKVnVxlŽnn„UlmV@²óUkV™lW„b„lƒšƒn@VVVIn@lw@WVIXblV„@Èx‚aUaVIVVnKVLšK„ƒln@b²K@»U£ƒÑķƒġÝÅb™K™a@Im@ۍ„@kWÓkkmKÅnóJƒUÅ£›W@w„ĕ@wĉţ¯¯ƒUkK±l¯Uƒ¥UÑkÝUķ»Ý¥¯™JƒIUŽVbUl¯ÈV¼VJU¼Vb@bkLUl@„VJ@bUXǚ@lkVmXmKkLVxš‚Ž„VƒL@VkVVVlzW˜kbmLUUUbVbUV™šlÒnJlUnLllUL@bU„Vx„l‚LXVƦÈVU¦WJ"],
+                    encodeOffsets: [[118834, 31759]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3411",
+                  properties: {
+                    name: "滁州市",
+                    cp: [118.1909, 32.536],
+                    childNum: 7
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@š„@`nnl@„xšK@X°KXV˜IXVlbXVWnX‚lL@šÈ»‚LVan@VJ„êVVn@‚X@laÞbVaƒyn@„_‚xnWVXnWl@VnUVkI@l‚nXKVLVV@V@kW@LlVô„@J@bVnnKnkVa@»lç@ƒnwšKma™UUUVњ@n™mWXalI@alVn@VwUaVU„@„nlaôJnU„VVXlJšaXXVK@UšV@VWx@nXVWšXVšUlLUbV‚ULVVnUVbUbVbš@@a„KÆnnKVK@U@UU@@a„@Vƒ°¯ÈJVIlķ@aa˜UaVKU_@mkxUI@aƒUlyU@@™wkKWmUbUnUVWbkJW_J@bƒn@Vm@@KULk@V@@bVbÅm@LW@UVVbkK@UkKWL@VULUKWIUJUbkK@_WVXU›Jka@XƒVa@kšy@aVIUUW@@m„UlLœKWÑUKVan@UkVmmIXKƒaVaUwVU@UmykU¯@±UUL@WUIVUU@KkIWaƒaU@kUUaǃUó»mKƒk¯@y@kWK@bkI¯`mn™l¯XWlkVUzUJlbUbVJl@nnm„@VULV`XnWƗbmUUn™JmUknƒJ¯km@ƒyk@kU›xL@VUbmnn¤lX@`™z@JmaULUVl@Xn@xllkXWa—aW@UVmUbƒ@mVXšWxXbWbUŽƒÒnVVnVVUL"],
+                    encodeOffsets: [[120004, 33520]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3418",
+                  properties: {
+                    name: "宣城市",
+                    cp: [118.8062, 30.6244],
+                    childNum: 7
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@Vb@„XL˜JXxlIXxlVlV@I²¤šnlUnVšU@VULWVUJ@Lnb@lV@UnV@@VVVlLnbnJ‚UVkUUVWn@@anUVnVJVIV‚@@nUJVbUb‚„@VUbVK@bn@VbnIlxkllXVlXKWUXUlL°¤UVVb@bš„UlkXW‚ƒxXz@‚„Ila„UlƒnUlJVInVÆJ„U„LVUnV„K°@VnlVnxV@XLlK@wVL@KnUlJXU˜bnKVLX„lUw@VWlLXKm@@a„@VLnmlIVVnKn@škVašVlwk@@a@k@ƒVIUa™@maUa@wna@kmWƒ™UUmVUIVǗ@aƒKm™aƒ™kU™J@InmUUaVa„k‚lX@Vk@m@VU@wnK@alKVUkUkKƒbmUkmƒ@U£WVk@@UÝbbƒaÇx@b@WVUa¯ƒ@wVwUUV@VwnK@KWaŁ@KšIUyUI@WmXó™UbWaKm™@km@IUyƒIUaWKƒx@zUKUL@llVUnkLVVkJWX@VUKUVƒIkVWakb@VWb@n@JkXUlmL@xkL@`VxšLUÈUJ@Vm@@bmIUlUL@VUVVbknm@mKUw™KVÈ@J@LV±kkJUIƒl"],
+                    encodeOffsets: [[120803, 31247]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3412",
+                  properties: {
+                    name: "阜阳市",
+                    cp: [115.7629, 32.9919],
+                    childNum: 6
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@V™nƒš@ša„k°aš±@‚¥@UUI@aUmlwUUx›b@¥XU@mmI@a@Kn@@_W@@W„I@mšUVVXUl@XaV@‚K@I@a„LX@aVI°K@KVL„UUw‚yXkšK@kšKÆbXnlK@k@a„JlU@w@U@»@aXKWƒn_‚JXkVKnƒ@°LlKXƒW@¯Uƒ@aUK@kmJUw™VƒIUJ™„kŽmL™K@kka@wUVm@@am@UkUbkK@nmVƒÒ¯VU„WVVmIƒƒULk@ƒƒma@kkKƒƒ@nUbUamU™`UUVUkKVkkƒW@@bkmƒnƒmUXVKXVƒL@VƒbU„m‚™bVXJ@nmKÅI@KWKUXVJUL@VUKUX@KUKWL@LUJmaXXm@kVVV@L@VUL@VlK@L@V@LUK@VUb@UUU@°@nVxU`‚Lkn@`@XVJ@X™Vm„k@UKmV¯LVVn±Wm@Ub@JlLUl„@VLk„@lmVVn@bnV@V°IV™šaVJXI°K°V@XXVlVVU„nšKVlUš„bWXnV@bV`U„„@@m@@‚ƒ@nxmn@bXVlL@¤nb„Ul¦šVVUnJVU„Vl@@bÞL"],
+                    encodeOffsets: [[118418, 34392]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3413",
+                  properties: {
+                    name: "宿州市",
+                    cp: [117.5208, 33.6841],
+                    childNum: 5
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@@UWU@bkW@aWU@aUIkWV™lLXb„lVIUVV@‚mn@V_n@VaUK@I‚@UašanJVU„@lV„UVnnKVVlaUa„I@wnK‚Lnll@nVlk@wVKXkl@@b„bUJ@V‚U@U„UUyVk@aVUXwlWXX‚WU¹@aU™@WUI@mlUšn„J@Il@šaXbV@VKl@XxVL@W„IšJlb„@„al@„IUUm@@aVK@¥¯—@mUķ¯bWƒk£Vm@akm@VaÅ@UVWaƒ@UJWkƒJ—UƒbWbU@UlƒXk@ƒamV@K¯nk@ƒlU@Uxmz@bU`ÇbUbÅVm£U@Ww™x@akLUK@UlakwUJWVkLmaUal@n_ƒmVUnKVUUmÅXWa™@kJmx@XUJ@bVLXxl@VVUVV„UbkLWbU@@lUVV„VVX„›K@XkJ@nU@@bV@VxUVlb„U@xXLWŽn@UxVbVĊ„V@b@XV`mnkJ@kUKmbƒaU@VbnbÆx@XU@@`k@@bl„™@@bkL@WƒakXWaU@Vmkx@XWW@@wUUUbƒJ™U¯V™@¯ÞU@WxXŽlL@bkb@ŽlVlnb™JW@kkU@mbkaWJ—IVlmz¯`UnU@mb™@@„ƒ`@bkVlœnV@b@šV@„aVxn@Vx‚KXnl@nbVK„bVK@a„_V@Vƒ„w@W„LlwnK@UmIU@VWš@šUÈ@lKnal„wš@@V°@šaUmlUUw@„ƒV@@UXK"],
+                    encodeOffsets: [[119836, 35061]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3410",
+                  properties: {
+                    name: "黄山市",
+                    cp: [118.0481, 29.9542],
+                    childNum: 5
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@lXnlWX@VUJVnUJVzXJVx„kVJlI²l‚U@K@IUǚLVxnLn@lmUaVU@UVKVknJ@an@@UVIVǙKUw@_lK@wnKVklW@I@mXa@UlaXblU„JVUVL@UXWlIUUlKVmkU@kVKVL@y„wXLVb„JVz@Jlnš@nŽ‚LXbVaôšnW@la@UVWUa@@a@mk@WIk@VwUa¯¥m@UUVK@ImK@aX£ƒkK›ÅV™a™™ƒ_@±ƒakXWW—LƒƒƒnU@@a@¯mK@L™JUWwUV™VmbXX@lWLn`mzUJUb™Lƒ„k@makVWmkX™ambkKknƒaƒ@ƒaƒb@‚U@Unm@—ƒWVƒ@VbUbUJWIk@@lmL@°UVUVm„nš™@@kmWkb@xƒ_m@@aU@b@JlŽUz™lWxXn„@‚b²@l`„IVl„UlL@VšK„nVbUl@VlIn@@b„bVWUk‚@@bX@Valb@bnb°Vn@„xVKlbVnV@V‚x„L@ln@UXVV‚L˜"],
+                    encodeOffsets: [[120747, 31095]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3414",
+                  properties: {
+                    name: "巢湖市",
+                    cp: [117.7734, 31.4978],
+                    childNum: 5
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@VV@blL@ŽXlWnnšnŽ˜„@VXXl@@WšIX@VJ@LšxŎxlnšŽ@bXJVblX@VVbUVn@VbUVlb@LnJVbVLV‚XLšÒVL„ÒšV„bVIVylUXk°Wšknm°_lJ@aXL@l‚z°@„lnLô¼V‚È„VUUaVKU@WW@@UUa@knmVLlaV@„a@kšak±@UmwkKmk™lj™ÝUUkL@mlIVmnÝWkkUÝ@KƑĉ™a@»ƒmma@mX™¤¯Uƒw@ƒ@UU@bU±±L@akmƒ„™LUKmLUUUJVbbÇwƒ@kUWaUJ@Xkxm@UJUUm@™„k„ƒ‚ƒakXUšVl±ôU@kn"],
+                    encodeOffsets: [[119847, 32007]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3416",
+                  properties: {
+                    name: "亳州市",
+                    cp: [116.1914, 33.4698],
+                    childNum: 4
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@lU@Un@@anUlw@KVmUwlaX_lKna@KU@@kWKUU@ankW™XK˜@@V²VVIÈU@al@VaÈamK@wU™@klaUƒV@XƒVUU»WUUbkmUkVmk@aÈw@mWU@VkIkVWKUÑķXȭºU¯lƒ@kkLWmÅa™L@l™LWlzVxƒVUK@L¯LUJ@bWƒK@b@JLU@Wbk@WVUU™V@nƒJ@XX@@`m@@L@bnJ@nWV@¦œa‚wVVkxVn@bVJ@V¦@Ž™²¯bƒl™b™@m„UšUŽƒŽ@¼ƒ¦Xb‚UV`@nnxUxWLkUkVWKkV@XV@@VVL@VX„@lVV@L@blL@`šL@xXKVL‚@„VnUš@lwnU@ml@XnV@@UVW°LnalƒUI@aUK@a‚a@U„kXW@I@mWL@UXK@UVW@U‚@@k„Wn‚@@V„@XblaVxšL@bVKXb„IlJ"],
+                    encodeOffsets: [[119183, 34594]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3417",
+                  properties: {
+                    name: "池州市",
+                    cp: [117.3889, 30.2014],
+                    childNum: 4
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@„V°°ĊŤ@xƒĖ@xœXƤ„VôIÆmnLllXÔ@lƒÜŽn@@JšbšLÆaĢÞĸ„°VVUUKVanK@UV@VL„VVn„ln@‚xnklxXamk@WV@Xa˜@naVk„Klk™@mkUWwkJWw—IWK@ƒUaUwWIUyVIUmVI@UXWmkkW‚—KUUVWm@@kƒKw@U‚UUmkaULƒwm@¯Uma@akaUbW@@a@VlUXƒa@am@kJ@UVkUaƒm™L@UkKƒVUkƒJk_±@aƒ@WmXwÇkkaVaUa±ƒœwV@VkƒwnyUaW@UU¯amLk@m™@kmmU™™¯K@L@lUX¯ƒWlkXƒŽVb„bƒVUL@J@LVKnlJXnlb@`nXlalV@bnL@Vnb˜¼@lXbWlkL™K@zUJmIUxUVUVmX", "@@llUL@VlxšL@a@UƒwXa¯@"],
+                    encodeOffsets: [[119543, 30781], [120061, 31152]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3401",
+                  properties: {
+                    name: "合肥市",
+                    cp: [117.29, 32.0581],
+                    childNum: 4
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@„L„xV‚ĊLÞkšVlVVXaWaXwW™nU„@‚anVVUX@˜bXblWkk@wWmk@VUVKnb@Išy@_kWm£nmVa@U‚KœwlVl@„zn@°l„IlmnVšIVmnV˜aXÅWmU_VK@Unƒmmk@UIVakaƒa™UƒÑUK™ÑWKUUKUamI@KkaVUUam@VUUa@UkWUaWI@a™kmōw™wUL@`mn@KƒV™IUVUUUK›Vk_ƒVkbWƒ@VkUULUJ±I¯aƒlkxU¦@L@V@V@b@b@„WJXbWVXn@LƒKVL@JkLƒŽV@Vbn@VV@XU@UlV@@VV@V@XXV@@VšJ°š°Xnb°@„JUVVXV`@bkXWŽUbU@WŽn@VLXlm„°bV„UbkK@bVJ@bVbkLV¦ƒKķV@x@„XbmVVVk¦"],
+                    encodeOffsets: [[119678, 33323]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3403",
+                  properties: {
+                    name: "蚌埠市",
+                    cp: [117.4109, 33.1073],
+                    childNum: 4
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@VÒXLlUlJ@UXV@nÇx@bnlUVllnVaXVV¼UVW„U@V„²wVV@Vl@„VnwlIš@XbÆWVnUVmLUV„nm`k@VbnblKXUVIlxkb@VVLlK@bšwXxV@n¤ÆUVaÈaV_@anyVwV@„kl@°m@LnU„bl@„WVkV@Xa„a˜V„IXl‚IV‚„@XbVUÆ@XKWwUkmW@_UmnIlJXkWKXmV@‚w@_XV@Kl@kU@KlX@@UUUUKWLm@klJVUUmk@mXUWmXwƒ`m@„zUbÝakbW@m@UUƒéUIm@UbKǼ@™kKWXmWUkaWU—JWU¯L@W™Lƒwk@mm@_™ƒÅl™UVkmWUnV@VWLUb™bƑĬ¯l"],
+                    encodeOffsets: [[119543, 33722]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3402",
+                  properties: {
+                    name: "芜湖市",
+                    cp: [118.3557, 31.0858],
+                    childNum: 4
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@„bVaV@XllLXU°ŽlL@V@VUnVl¯Ikš›VUVU@@b@lUXUWmb„n@¼šbƒĊ‚LÞ@lVXlmÞUnkJ@nlKVVšÞXklWVaVI@aUKn»lL@Kn@‚XXwlm@mn°@„V@Wy„wXlWVk™ƒ@aUaVU¯£kKWVXVWLUkkWlkkwmJUam@@aULVa@UƒVaUaVI@m‚@UUJUIUmmV@bm@UXVVUlVmImakKUU@UU@VmU@@kma@KVIXUVK@U™VmUkV™m±£@JkU@nlšk‚ƒLUlmb—@WbU@@XnlWb"],
+                    encodeOffsets: [[120814, 31585]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3406",
+                  properties: {
+                    name: "淮北市",
+                    cp: [116.6968, 33.6896],
+                    childNum: 3
+                  },
+                  geometry: {
+                    type: "MultiPolygon",
+                    coordinates: [["@@lnnK@¦n@@V‚V„@@VV@nIV„V@VW²a@b@bVnUVVV@V™z@lš@°UšV„IVaVV@x@ŽXX@WlwUnV@XblW„b@XlK@aš@kƒ@al@@_V@@WÅwmaUaV@„bnaVL@llInmU_@W@aƒUUĉUaVwm@XWK@wƒVkaVUUwU@@aV@@mlI@WœLWƒUUUƒVU@kV@XalKVaUƒVUUUk@WwUK@aVI@WƒUk@@UUU±xkb@lVš@xnLÇbUbk@@bÇVUJ±U@U—@WLXšml@bVVXL@lV@@LmbkLW`kbVxUn@LkxmV@bm@@VkV"], ["@@VVVkV@¥@UV@U@VUUJƒkWakKUšlXVJ@bXV@blX@aXV@V"]],
+                    encodeOffsets: [[[119183, 34594]], [[119836, 35061]]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3404",
+                  properties: {
+                    name: "淮南市",
+                    cp: [116.7847, 32.7722],
+                    childNum: 2
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@°kƒīšaVaXK@U‚UVmnXUlšVÆkVKUUUmmU„ÑkU™UÝlĉKUƒwƒKƒbU@UxW@@lœmVUUVmUUƒmƒw—aW„kL¯K@Žm„ULWlIm`X„WL@b@¼@V@xkVƒI@b@l@lk„V°Ȯ¹ĸW"],
+                    encodeOffsets: [[119543, 33722]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3405",
+                  properties: {
+                    name: "马鞍山市",
+                    cp: [118.6304, 31.5363],
+                    childNum: 2
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@šNJnllLnxV@laXLVKma„aXbVI„bVKVVVIVyn@n_ƒƒW@@ƒ„UnJlUVVXlLnaUWlV@VV„IXW@_W@XK@K@UVUUwVamÑXmmwƒw™KUnUK™çU@ƒJƒU¯@mŽ@nknWxWm@@LkKm¼VL@bUJUbkXWl"],
+                    encodeOffsets: [[121219, 32288]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3407",
+                  properties: {
+                    name: "铜陵市",
+                    cp: [117.9382, 30.9375],
+                    childNum: 3
+                  },
+                  geometry: {
+                    type: "MultiPolygon",
+                    coordinates: [["@@„ÒV¤@¼V²@aVV@Ž@„„x°Vš£nW‚@nbnaVXVW@k@aV@VUœUl™°JUkVm@U@UkK¯WVkKWkU@Ubƒakwmlwm@ƒkUmƒUUKU@@VmLUbVLUV¯U"], ["@@LllUL@VlxšL@a@UƒwXamK"]],
+                    encodeOffsets: [[[120522, 31529]], [[120094, 31146]]]
+                  }
+                }],
+              UTF8Encoding: !0
+            }
+          }),
+      i("echarts/util/mapData/geoJson/ao_men_geo", [],
+          function() {
+            return {
+              type: "FeatureCollection",
+              features: [{
+                type: "Feature",
+                id: "8200",
+                properties: {
+                  name: "澳门",
+                  cp: [113.5715, 22.1583],
+                  childNum: 1
+                },
+                geometry: {
+                  type: "Polygon",
+                  coordinates: ["@@HQFMDIDGBI@E@EEKEGCEIGGEKEMGSEU@CBEDAJAP@F@LBT@JCHMPOdADCFADAB@LFLDFFP@DAB@@AF@D@B@@FBD@FADHBBHAD@FAJ@JEDCJI`gFIJW"],
+                  encodeOffsets: [[116325, 22699]]
+                }
+              }],
+              UTF8Encoding: !0
+            }
+          }),
+      i("echarts/util/mapData/geoJson/bei_jing_geo", [],
+          function() {
+            return {
+              type: "FeatureCollection",
+              features: [{
+                type: "Feature",
+                id: "110228",
+                properties: {
+                  name: "密云县",
+                  cp: [117.0923, 40.5121],
+                  childNum: 1
+                },
+                geometry: {
+                  type: "Polygon",
+                  coordinates: ["@@vIHZDZQtDLNMXIbHRCXXITbJ@H`LGPRDDJNCLHTOCWFGvGBUJMKGFO^IHWXITQCI’Y^AXGfRˆDXF`DJOLB~G\\DZIHHpErUVMhHb]\\M†BVF@FTP`@zTbD\\@~M\\K`H^EVODWICAakAQXoIcCOCIgGYNWFWNGGKKGaJEGMEIKYJUT_J_Go@_SyQaSFMEGTcYOQLIIi@EKAUPCV[EEXQCW|aMUMAaYCYNIDGGACIMGGSKDQGaF_C[GaB@GOIiOKAYL“mI@CN]F[SWWAcKKI@HMUimEKbeYQYISNUOcBKPIFBNgvDPGZYFSf]CMSIWGEUFgDIQ[MeDMJS@RR@LphFPCHaBAJKF@J]IBJO@HlO@@RKAMPJHCNDJTHFP@ZGNANBRFH@J_fM^ONJNF\\VTDJHDON@XRND\\XRCPVETCLBVKDFJINHRGPRV@\\CLJN@VbXbLVT"],
+                  encodeOffsets: [[119561, 41684]]
+                }
+              },
+                {
+                  type: "Feature",
+                  id: "110116",
+                  properties: {
+                    name: "怀柔区",
+                    cp: [116.6377, 40.6219],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@JHTVHXCHPfnDJGHNDJSB[JSBGVSAOH@PMPuDEHHXZN@PHF@ZLJ@LHVYJA\\OFWP]BMtMBSRGV[JeVAPQVIFENMD¡–@^NV\\JH@NNL@NM\\kTQ\\I^FNIpBHGTBFFAZQfKDIXQTLXFXNNVMVHRGpCFLlRLEVBBH`IVO\\G`RDPAXLXBXORHZEHTDLLN@VGTMrQNFPeASKG@GMOAKBYMK@GTUHUXSHMVDNMOUEOZMJML@^KRACMZEZMRQLUHE@OFENPR@DI\\ChMHIDG\\GJMDWHCKGMDCIQCHO_K@GaIJSWWQDaGWJMNCKRsCYGYuJUSaKaW@UIMDK@[QUHOGQJMEILCAUDKFSOUQD[WMC‚Q@WPMGCCIUSE[IMPMN]`e@IEGAQBMHM@YEOSGCIDMIGNOLB@QP@GkP@AI^J@ILEBIbADGEOog@KQQWSekWQQUOFKZLF@PUNmIaHIUeBCTSHENcJa@_IWSaGu`GLSBKJQFOXGDXVQVOBIHcDSJWBEFGTMH[^mLaXcHiKElTRKtFXZ`MHMPCNRDxZˆB\\ICIHK@KŽHbIVFZ@BPnGTGbDXRDJaZKRiGEFSFEJhjFNZFjn"],
+                    encodeOffsets: [[119314, 41552]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "110111",
+                  properties: {
+                    name: "房山区",
+                    cp: [115.8453, 39.7163],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@h@bl@HRJDZ``TA\\VVD^H`\\pF\\JŒ`JGv@ZO\\GPSTEjPTR`FnEbDTDHEhLFMTK@ETSPULKEI@OVISKSJACEQNQbV˜IXGDIN@dMB[IIBcN]ZHNLP@XOWCFWŠCNRHTpATD@^NVNLED@Rh@jCEF}E[OOHUEW]W@QGGDIQSH_MmFmCUT_K]i@MHCMW—FCF‹E{BMHMPOHKS]CFNGBELDH_@BcAKOACESAOBELaXAROB@FODMEDWJAG[aE@UM@DImEWJMC@OeCA{aE[@{L@MINUCQXKfUJORCHqJBF@TCXWNQX]M[EAJO@@KMBQJIC]EWMCCUBEBFHKDOTMBGNGF]MWDBRDdMDQVyE@LPVHDCP@JVVMTG~HNSH[CmRUvHPHBbA\\PTNRC\\YNJ€PRARPJDDR"],
+                    encodeOffsets: [[118343, 40770]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "110229",
+                  properties: {
+                    name: "延庆县",
+                    cp: [116.1543, 40.5286],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@^AXOPEB[ZIGU@KKI@YGE@OYMGWFGvCNO@OPGTBHUTA\\ITACIGMIHmCOeDGGWSUIGimYEEMgiFITEFEjHLQbYCIWQaCSHmHAOY@UEaJG@LGLDJ[J‡AwYQCDMNONGY_EWLsSQFkMO[NWAIGaIYL@HMBOKiOQDWEUDMQSF_QIUBWdg@[NaAKQ@M]OQ@WhgLUMMFYQDIRCEUZOOCIOJ[KIUMKL@HIDKVEBM`HJAJSJUdBLGNEdMBMO[BYEWJSNKNaD]PE\\SjOT_RQVEZPpƒNQXfŠNA~lNG`@PNLp¼RFLfbdKbATUh@FSNWjGFZVLFHVA~X¨PPROfFJbNJPLFbENJPrEFNPFRHDDJdENJLVEPBJTVTHGHFRFH@PXP\\ORQHW\\BjWFDERLPPBbB\\E`B\\D\\L`@F]FCnJ^AZL"],
+                    encodeOffsets: [[119262, 41751]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "110109",
+                  properties: {
+                    name: "门头沟区",
+                    cp: [115.8, 39.9957],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@V@XMnGPY²‰JQNEhH\\AZMPDVTTDZCPiJkHSHCjIdFtEHITCNITQEKUAMCEIKCECABYESKFWAKBEIIHABGDCKCAIHMHALKEI\\CFIBILIJQZS]BBEECS@E@@C]COKI@CABAAEEDMGƒCH]A[M@CJWH—JaUMRFRBDTITLUJ@PFJKLOVST@FSLENgKGFSCaCmF_ESQiOSFOT[HYPu@IH‹_[IoE_[]GUC[USB__CYQI@Gakg@qZeHQNMNV\\FVLPgJAFJPRLCH[XcPELUT[JiV_EELFTADBXRTRLJC@fHXHHbPd`fR@NfT`@TLplHMpCEJHJBVLFŽ@JT‚VnG^KXDXHNVGRLRXFJVdDHSNWLGfEzA"],
+                    encodeOffsets: [[118635, 41113]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "110114",
+                  properties: {
+                    name: "昌平区",
+                    cp: [116.1777, 40.2134],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@VNLJI\\JPPDYPFVQDCJZRNEVNhKXgR@^P@NLRbB\\Mh@XcVARJE`RTCNFV€XRCjPPLNA@GZKbJJHXB\\MNPjLdGbWnK\\]NGHSFEXATIdCJGPARUWUHCPWRELITAHKv_E@iYCaW_BQ\\Y@QIO@QDCIGZCEMWGFMFAFgHEDOCSqKCCFGAMKEAC@ODGCGs@WH@KQA@EE@CE@GEA@EH@GGUEEJEAYD@JM@@DAA@FHD@FTJEHUC@JUBKCKG@G[CIIQReAYhO@OXGDO@@FF@IHJFCPEBACBIAAKDOABXARHPNEHGbQAAKQFGIAM[C@WHKaGiCEGOA‹HUKCIokSCUSOCYN[BgGMFIR±ŠOZmHWNU@ShbbXDHVXXGJ^lZ@PZ\\Nb@\\FHJAD"],
+                    encodeOffsets: [[118750, 41232]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "110115",
+                  properties: {
+                    name: "大兴区",
+                    cp: [116.4716, 39.6352],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@F\\E~DFN@BDFEpHFCHBBEGCDCJBHUDSBB@ELCPbF@B\\J@BJVAFJ\\ADKTCBGECFMT@BMN@@FH@DaNBEnvB@FPBATK@FHEFIAKFBFL@@PKBFJHC@FXBRAFCDMPDTOL@JIVFDHH@DDH@BGRFCDLD@N^@@CNA@KNOAEBCECFEGCFGMGFIPMOEJOLBADBBHGG@GCHIECY@INC@DMGS\\AIOZAAEYA@GT@KKMBEETCGMVINFxA@MJADB@FlA@HJA@NND@DFA@DVAZBBOFKH_JA@K^GBC@EFE„G@gAENMXKJigC@IbSJMqGOP£RGSMGE@kbQFDPEFiBSGGSBK]I{CDWCIDOic[C_G@SuSO@EWKCO@MNY@\\uZOPENQD[LKESSKGBKEG@EJGAGHoH¥CqhifeJkX_XFFGHFNEDFPENKHM^IFIVL^S`DVEnNnG`RTCJHH@R^XFXGVPP"],
+                    encodeOffsets: [[119042, 40704]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "110113",
+                  properties: {
+                    name: "顺义区",
+                    cp: [116.7242, 40.1619],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@EhEBENXHFNYDJHCD@RJP@R[ZARX`DbjZF@bHXT`Jb@dIFMTGDSfAJVbGnJVM@OKELYPERVXRflXTT@NIfC\\NJRhCVEHFJXNT^DTeZEHYCOhuAMJELOdAVPTMOWBWNMNEJgl]@WGUFIC[T{EEDEHGCIGMI@SECUQI[D{A{GQESPUH]CsiMCmHUeoHENcAaDGCMDGMQCACCBaCGLMAHB@DIEQLOAAEEJ@CW@CDINGAAGKQOCgV@LG@BEGDKNeREFBNCFIDOPKD[@YRW@GFWDAFE@EHDDrLDTCPGF", "@@KrJEH[\\B@FF@CHFBHUN‹AJKADGECBCMAG^E@EbI@BEGP"],
+                    encodeOffsets: [[119283, 41084], [119377, 41046]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "110117",
+                  properties: {
+                    name: "平谷区",
+                    cp: [117.1706, 40.2052],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ZJZRafFLjn€VGNJ@LLBdXX\\T^EDMJ@”nZKLBjPPJ@HbA\\H`DbERHLCFK^BZaFWXQLAGMHa\\OLO@SBIpBdCLƒVQfElO@GSAKEDQTC@GEBKG@ORIJBDAPDFA@CaOq@GGQAAEJK@KMUGAAGEAa@MGMBGCGSIIW@WSUCMDOJeWOM@IUF{WMWaDIMgIoRoCOKeEOEAG_I[cg@wLIFENQFDVTFJ@HNDJGHCFFFS|D\\EJHV@Xk^IhMFMNAXPX"],
+                    encodeOffsets: [[119748, 41190]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "110112",
+                  properties: {
+                    name: "通州区",
+                    cp: [116.7297, 39.8131],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@FDAJTGDNDCTDDEDBBE@DT@@EHCDGJ@EIZ@@FDBR@ATFBBVFFE@@HNA\\VE@CLIFNJFNJBCP]A@LJFA@HJEDD\\C@DBCHLAEPF@@DH@APHAERDF\\GIxDTM@CFLBBFJ@CNUPMHECGDBF]BMFPDLRBHHBJMDCX@@DFIBFPBRKJF@CGANBHKbDDABDRDHNNCHDbCdBFMpGHiOYMefKJMC}HWAUNW\\NNBNA„kNU|]HMTMN@MZBLFFF@RIRUT‘BMFIEGaAGGAOIIUGTSFcYKS@MSLYPKRUBU]EWDOI]CKGASgW@MTWKIMCS@uMAKKADMECGAKVUTSDy@IjWLMNBF@hƒHEF@FAD]H@LIBG`ELAPYAUB@CEB@CMC@MIB@GkB@ECAIB@NwBMEUJHNSDFFNALLS@@HZBBFYBJP[BHTCND@JMZ@FDGJHDH@GHAABCKAIPPFONEJNHEHHDEFFDADBFMP@L"],
+                    encodeOffsets: [[119329, 40782]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "110105",
+                  properties: {
+                    name: "朝阳区",
+                    cp: [116.4977, 39.949],
+                    childNum: 2
+                  },
+                  geometry: {
+                    type: "MultiPolygon",
+                    coordinates: [["@@bFGHBHFBFIVFHHG@@FFB@HDFF@@FRB@LXGt@DHCH@PBDLFBNF@BEXCHEX@ZQ\\@LCPOJCDEAMFEfQLMHCAFH@@KhUNE^AAEHCFDNGVODMI@AEKADEN@CSJw[HCEFQGBBOG@@CE@FOKBDGCAD@C[FCGIB@IE@K^BDOIAEMMIJEDKF@[UMB@GF@EEAUEABSQ@CA@EY@FJI@CHGD@FS@@CAFCACFSCCDCMSHBIECMB@D]@@MKCDCQEAHG@CCG@CGUEIJK@SPOCCNEDQBDNDB@DJCDLFCBBALJB@BVGPBKVO@KHCCCD@FE@BNA@FNCTDDJA@FGB@NBDW@CL@hT@@ZHHQDDDAFSAANBC@HG@EFS@@DE@@PCB@Ue@CADNJB@FCBWA@LI^ix@FIHrH"], ["@@HUN‹AJKADGECBCMAG^E@EbI@BEGPKrJEH[\\B@FF@CHFB"]],
+                    encodeOffsets: [[[119169, 40992]], [[119398, 41063]]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "110108",
+                  properties: {
+                    name: "海淀区",
+                    cp: [116.2202, 40.0239],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@plDJVLŒGPBFHjDbHGL@X\\DBNHJREBLRBHaFGŽMGOBQAWPBLCBBAJBDFADOIEJGE@@EP@HCPWP@ZgfBRQJJ\\D@HLHLDVA@IVDFGSI@EGC@EBB@CN@@IZCAGHGaEqGJG@EjwJ]@K@GSA@e_I@NE@CA@Kg@KC@ENCFƒAKQAW@WIMK@V‹@I@@F@^EDFB@HcIaDYCBRRDCHD@EFLN@FE@CJUPEJOJMTBPEDIFCMIAKNOGMRFJNDVBFLSRMJSDGJsFcEiJGDGTIlOjYD"],
+                    encodeOffsets: [[118834, 41050]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "110106",
+                  properties: {
+                    name: "丰台区",
+                    cp: [116.2683, 39.8309],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@hMN@NFTQCFRCBJFA@HJ@@HJ@HJ\\FTACDŒ@@UNLXJX@@MA@@IECAQlDFEHBDI~D@GXCFMVDFCH@@NF@ANJC@FnAB@AMF@@EDCDDLGP@LUOAUH@AIABKAAEDCKID@CCACMWA@EGDEILA@OK@AELEJBFEEGL@BSOA@EuAFmMACbG@@EM@ANS@ENFDAHSDCL[BEIUBAII@A[E@OaKD@FAACTGVIACDHDAFGAEDoGEFACM@i€g@@QFCMKMU@]SCoBGSMQ‰DEXXDWPO@MKYGM^AdJJA\\cNB\\G^„DNHFCBFABDBJ@PL^D@DF@T@FDAF^A"],
+                    encodeOffsets: [[118958, 40846]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "110107",
+                  properties: {
+                    name: "石景山区",
+                    cp: [116.1887, 39.9346],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@NQPHLMJBDNJEFCAONSPIFIVODIF@@EKMFEC@DGQCAQZDbCdJ@GEAFC@]@EJ@DCSB[EGII@@GI@@GEBAIQDDESRMEM@gNYTIRKJAJEJ[DFJKLGBGNBJLDCDAHGBJJAFBLEXTLZFBAFDLD"],
+                    encodeOffsets: [[118940, 40953]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "110102",
+                  properties: {
+                    name: "西城区",
+                    cp: [116.3631, 39.9353],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@XBDA@EIACM@IJAD]BC@SFABISAD]H@@OAEDQEW@BLE„MD@FLDh@@LDBF@@M`J@fTB@H"],
+                    encodeOffsets: [[119175, 40932]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "110101",
+                  properties: {
+                    name: "东城区",
+                    cp: [116.418, 39.9367],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@DBf@@VDA@OF@@CT@FEH@@GADBMTBBECCRCGG@YS@@gDK@A‘C@PG@C^TBAJEB@TADC^IB@J"],
+                    encodeOffsets: [[119182, 40921]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "110104",
+                  properties: {
+                    name: "宣武区",
+                    cp: [116.3603, 39.8852],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@RBX@RFFCŽBFU@aK@WA}CCJGAEFkCBRFD@JB@@N"],
+                    encodeOffsets: [[119118, 40855]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "110103",
+                  properties: {
+                    name: "崇文区",
+                    cp: [116.4166, 39.8811],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@XBL@@bEV’D@BX@AC@MHA@EIBCCDSEMmB@EIDBME@@MG@EDUCENWD@H"],
+                    encodeOffsets: [[119175, 40829]]
+                  }
+                }],
+              UTF8Encoding: !0
+            }
+          }),
+      i("echarts/util/mapData/geoJson/china_geo", [],
+          function() {
+            return {
+              type: "FeatureCollection",
+              features: [{
+                type: "Feature",
+                id: "xin_jiang",
+                properties: {
+                  name: "新疆",
+                  cp: [84.9023, 41.748],
+                  childNum: 18
+                },
+                geometry: {
+                  type: "Polygon",
+                  coordinates: ["@@@›ρȁôƧƦóəʵסʵóƪԫʵѵͩƧͩړ›υࡓɛʵ@ȃ@óᇑѵƨɝɚôóНѺͩɜ̏ԭʵôƧɞñ@υƩ—݇ȂóƩƧ@ѵȂυœƥŌਗ—॥ɛóʵѵƧѹ˜݇̍ࢯ˜əɞυ˜ρͩ̏óਙƨƧŋôōóš̍ͩóʵן›óŋړͪƧѶ@ɜԭ—ԫƦɛȄ̍›ɝȄöςƩȂ̏œñȀ̏œƩóóŎə˜@Ő̎@ɞȀɝŎôƨóנѵȄƧ@óŏɝœóɜôŎ̍ͨςŎ@ƨóôƨɞ݈ʶóƨφó̎Ȁƨ̍ԮòѸԮמ@ѺȀ@ƪၬֆòȂñ̐òȂɜ˜óƨ̒Ŏ̑߼@φρȀ@Ő๐ς̎Ƨφ@ɝφڔ೦Ԯǿࢰ@ƦŏԮƨƨȄƧ۬ɜʶڔŐɚɚóŐôƨ߼˜ôƧƧó̐ƥóŏѺǿƦȁφƧς˜ƨƧ̒@ɜƥƦυ̐ɛƪͩƩəƪʷ̑ə@ȃƨʵנŋྸōਚԭԪ—@ɝƨŋ̒օςʵôƧ"],
+                  encodeOffsets: [[98730, 43786]]
+                }
+              },
+                {
+                  type: "Feature",
+                  id: "xi_zang",
+                  properties: {
+                    name: "西藏",
+                    cp: [88.7695, 31.6846],
+                    childNum: 7
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ôŌנœôʶ̎ͪô™óŎƨŌਚƧ̐ôςͪφ—ɚɝࢰ—݈̎Ѻ—Ѷƨôʶ०ɜਘ˜Ʀŋφ›Ѷȁ̍—ôŏɚŋ@̑ə—@ŏò̍ɜ›óƥôʷƧ̍φѹԪ̍ע@Ѹʷɜ@ôñנ@Ѷɛɞô̐ŏѶƨѸƧƥōƦœôŏô—@ƧôƩ̒ŋƨŌƦǿô̎ɜȁ̒—óʶѶôôО̒›ςƥɜНφσɛȁ̎υƨఱƧŏ@ʵƥœ@ŌóóóͩƨƧóŋ̑õóɞóɝԩͪɝρôƧ̍ƧѹͨڑŎ̑ōóƧࢭͩ̏ѵɝóఱóóԪυô@̒ƥŌ̏Ƨ̑Ȅ݇ŎƧ›ѵӏ@ɛõŏɛȄôӒƧŌѵǿɝ˜Ƨŋԫ@̏ʴƥ@óǿ̑Ȁóǿ̍ςóóυô@ʶɛñρƦƩŐó̎óœѵó̑ͪࢯОóɜן˜Ƨ̏ƥȄ߻̎̏̐ןŎɝɜöɞƩȀôöɛȀóͪ̐ƨƪ̍̎ȂƥԪυО@φɞ˜ôƪ"],
+                    encodeOffsets: [[80911, 35146]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "nei_meng_gu",
+                  properties: {
+                    name: "内蒙古",
+                    cp: [117.5977, 44.3408],
+                    childNum: 12
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ኊȁ૊ö߼ƩɜɛנñԮɛѶóԮô@ȁѸóמ̎ගѺၬ@߼ʶԮӒ߼̎@ŐѹӒ̒Ԫƨöග̑ѶȄ̒ς।œѶɚöɞɜʴڔôôȂ̎—ѺȀς—ƨ˜ƪóԪ—ɜôɛОਕڔԭ˜ѵ̍ѹȂԫ›ɛƥ̍Ȃóɜ̎ô@ʶ݊ੲࢮʵږͪנƨôȂƧ˜̐ͪ@ŐƦƨφԬѶɜôƦ@ŐƧôôƦəŐ̏›@ŐڒѶԬô̐ʳԩНςōôŏɞ@ƨȂѶəóƧ̒ػ̎ó̐Őנóƨô̒@ƨɚɚ@עԫɛɛ@ȁυͩƥʳòևρ—̑ࡗƧͪ༃ॣԮփ̎Ʀ@ôô@ôō@š@ȁѵóƨ̍υȃóʵɛƨƥóυȂóəƪ›̐ρƧͩɜԭڔȄ̎عƧȁ̐ŏó̍ɛ›ƥƧ̑óρŐ@Ƨ̏˜ɝəɛ˜߻ͩ̍ͩɝО̍ƪƧóóӓƨóƧʳ݇@ɝςƪœ@ʴƩ—ƧƦôƨɛȄə›Ƨŋυ›óͩѵ@ɝǿóŌן̍ɛ˜óО̍œ̑̏ôȁ̍ŏòȁñóƦͩ@ǿə@ɛƧ̑˜ρȁυô̍օѹœóȃə™@ȂσʵѷƪòƩ̍—ôó߻ۯôʳƧ™óšõʵѵóѹɜ̍ȂѹôɛŌφֈƩͨρóυӑóޟఱ̑݇ͪóƪƨŌóȄڔԬƩςםñ̑ȃѵŐԭŏƨȁɛǿρôõɚɛóƧОə@ѹ̐ѵöԪͨôͪɛ̒ןŏƧƥóôƥƧɛŌôóɝó@̒݇Ӓ̒Ō@Ŏԭࢰ"],
+                    encodeOffsets: [[99540, 43830]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "qing_hai",
+                  properties: {
+                    name: "青海",
+                    cp: [96.2402, 35.4199],
+                    childNum: 8
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ƨ@ôƪ݈ȁƪ˜@φɝòóƨԮʶɛ̐ѹͪôОəóƧɞᇒѶ@ôږô@ǿѶ›ƪȁςœɜͩφ˜ςŋɞôѶɛƨŌɞ—@ɚςŐñԪॢͩƨȂɞóƨŐ̎ŏעӏ̎óƧƦôœ̒ȁɜ›ςͩ̒œɚɛƨôƨɝφɛóȁƨŋóóɚͩƨóóƩ@ƧəŋƦƩ̍@ƧƧôǿυ̑@ȁɞǿõŏρƥסɚƧóτԫɞœôƧƦ@ñȃòñƥóυôôѹѵ—@ŏ̏Ȅɝó@ȂəŌóəѹƦ@Ő̍Ōυ݈ԩŐƧóôƧ̑›ôʵɞƧ̑ѵôƩɞƧ̑œóНѵóôʵ̑˜ɛȂó̍ƥȀƧŋ̑Ōóƪ@ƨó˜óŐƥ›ƦŎѷƨѵƧ̏Őɝóѵɜן@óòɛ@ѷʸס@ԩ̎υѺƨ̎óʸôƦɛœñ̎@Őɚ˜@̒əŌóŐ̎˜"],
+                    encodeOffsets: [[91890, 36945]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "si_chuan",
+                  properties: {
+                    name: "四川",
+                    cp: [102.9199, 30.1904],
+                    childNum: 21
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ô˜ôŋó̑Ԯ̒ɛОמͪƨōöͫ߼ƥôȃƨóóñôƧóƧôōڔŏƨŐ@Ŏô˜òƥѺŎ@ōɜóנ˜ôǿô›ƦôԮ̍ɜôɚ›Ƨ—ñɛɚȁ̍Ƨɛևυ@óóôŋρԭɝ@Ƨʸ̍ŏυɜƧƧóƧƨȁρ̍ƨȃɚ—ôʵφóô̑̏Ȃ̑ʵɜʵɞ@ƨʳסƩóŎə—óɜƧôƩƧρ˜óôôô@ŎƧƨƨƪѹ˜ó̍̍Ʃ@̏ѹНôޟ̍Ʃóƪυɝɛ—əƨôŎɛȀ@Ȃ@ñɝʶ@Ōρנ̏—õóɛͨƨȂѵОɛʵ@̏ƩŐó߼Ƨల̍φɜȂυτɛОρƦɝƨóƪ̒Ѷɝƨóʶ̒œóƨƨôԪŏφ݇̎ŋ@ŏѺƥôɚɚŋ@ȁɞô̐ȃ@ŐѶ˜óѺφóƦôñòòȄ"],
+                    encodeOffsets: [[104220, 34336]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "hei_long_jiang",
+                  properties: {
+                    name: "黑龙江",
+                    cp: [128.1445, 48.5156],
+                    childNum: 13
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ᇔȂਚНƨŐѶŏöƥςŏñƧƦóƨȁ@óƨ—óȁφӑóóƨ˜óǿ̎̑ôНɞ—ó̑ɜə߼›̎ǿ̒ôڒӑφ@Ƨȁ̎̏ƥƩ̎ρశ˜ôȂςƨφ@נɞ݈˜̑ƥƧɛƨʵƧȃƥ@Ƨƥ@ŏ̑ԩôɝρρóɛƧ›ƩͩƧó߻ʸ̍ʷѹƥɞڕõ̍öɝυ—̍ȂƧ̐̑ŏóƨñŋѹóóȁ̍›̏Ԭõʸ̏ŏ@ǿ̍@ƧОυ@ñƨòȀƥŎ̑ŐѵóɛŌóȂԫōƧŎѹñ̍ʶóОן@Ƨ̎Ѷô@Ȃ@™óŎó@@ó̍ƥԭք༄।ƨͩ̒ࡘς˜ñֈƦʴφͪ@ȂɜɜסԬə@Ƨə̑@Ƨóןô̏ŏ̍ô̑ؼôƨѵɚƧȁɝ@óŐρŎԪО̏ʴ"],
+                    encodeOffsets: [[124380, 54630]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "gan_su",
+                  properties: {
+                    name: "甘肃",
+                    cp: [95.7129, 40.166],
+                    childNum: 14
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ڔôԮࢯ@ō̑ŋ݈ӑ@̑ɞôóôɜŋƦƨôóƨƦנŐɜ̑óͩԩͧѶõѺ̏ɚ@ƨНɜôöəςóɜȀƧȂԮŐѶŏ̒ȄמòƪρړԫôȃƧŋôƩ݈ͩɚ@@ǿɜ@φͩóŏɜӑƧōôǿ̎›ôƥƪóõ›ö@ô—ƨ˜ôƧƦôó̒ɜ@ɞŌõʶ̏Ő@ȀóôƨȂ@ʶע@@ƥ୾ӑó̑óŋôʵóɛړ@@ƩöóƩóρ—ɛƨ̑@óʷƥƥ̎ɛƧ›ôōƧǿôͩѵôɝȃɞȁõƧρóó—@ōƧŏړŐóŎôƨóƨôòƧôóȄ߻ƦõͬƧŎםͩɜНԭ̑ô̒óŌó—ƥ@óƨɝ›σԬƨôעəςƦöŐɝȀ@Ȃφ̒óȀƨƨ̎@ƥƪɚŌ@ƨôƪƧôəͪôôƧŌôȂυɜƧɞƧóəɜ̑›ρͪɛœ̑Ȃó›ƨƥ̍ôסӐ̍ŐƧŏɝôƧȁॡͪòԩρŏ@əɝ˜ƧŋѵɜɝóρŌυ—ɛͪρ›ƩȂѵœ@Ȁڕó@ȄɜʶφࡔڔœƨͪѶͪԬʶôƩעʶɚʶƥôóƨςȂ"],
+                    encodeOffsets: [[98730, 43740]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "yun_nan",
+                  properties: {
+                    name: "云南",
+                    cp: [101.8652, 25.1807],
+                    childNum: 16
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ôɞôɝ̒öôŌƧƨôͪôô@ŋƦ›@ʶƨŐô߻ƪŏ@̐ɜʶѶНƧȁɜͧöô̐˜ςן@ŋɞʵ@ò@ȁɜǿóōɚƧɜ˜φɞôƩ̎ƪóޠѺО@̐̎ƪô̎Ѻ—ƧƩƨƧ@ōóóôóς—ƪƨƨóôɛó̑ԭ—ƥŌɛǿɝƨɛͩô›@ǿƨȁѺŌɚɛ̍ןѶНɛƧôóƥȁƦͩôŎɞ—ƨ̑ɜ—òôφ@ƨʵ@ɛѹōóȃəƨυǿóʵρƧƧŌƩɛ̏ȄñƧƧȀɝ̍ԩʶƧ̑υ—óŌƥʳɚӑóНƥô̑›óӒѵʵѹœƧӐןôƪφõŌƪ̒ԫŌƧؼƨƨס›ρȁƧœƨȂóʶó@@ʴƨôôφ̎Ŏ@Ȁƨ—ƪɚƨœóƨôôôςóޤƧŌƩŋƧԪ"],
+                    encodeOffsets: [[100530, 28800]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "guang_xi",
+                  properties: {
+                    name: "广西",
+                    cp: [108.2813, 23.6426],
+                    childNum: 14
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ƦŋѺ̎ڔʵƨŐ@ƦמȄƪôóȂɜŌɚͩɜ@öóɜôôȂƦôɜȁ@ɞφ›óȄ̎›ƨʶɞŋƨʴɚǿ̐̎Ԭ@ôñ@̏ƨ›ρ۫ô›ɚƨƨНƪŐ̎›ƥóƦʵƥŋ@ȃóƥƧ@@ŏɝǿôυƧȁѵɛ@əóŏ̑@@ə̍›óƧó—@ȁƩ˜ρóòНƥô@Ӓ̑@óŎ̍ƥσŎυ@̍ƨ@Ō̑ôóͪƨ̒óŌړœ̏Ŏ@ŌôȄѺŎ@ɜƧʶυ@ñóɛ˜Ƨ̒ɝ˜óōƥͪ"],
+                    encodeOffsets: [[107011, 25335]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "hu_nan",
+                  properties: {
+                    name: "湖南",
+                    cp: [111.5332, 27.3779],
+                    childNum: 14
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@@քɜОƨ@öŐמóƪôƩɚ̒Ő߼ȁςͩɜòƪ—ɜȀò—ñɝò—Ѻͪ@ŏƨŋóɝôǿƨ™ɚȃóəƨȃѵͩó̍@ȃƨóóƥƨƧ@ʵƦ›óͩɜ—ɛóñԭɛōυȂ̍ƧƦō@ɛƥ—ɛȀ̑œóʷóō̍œƩŏƧОəƧóœς۬Ƨœ@̐óòԫ@̏̍əȀƧʳɝŌóɞƧ˜ƨɜóŐƨò@ȄƧŌρŋóôԪОóʶ@̎óȄ"],
+                    encodeOffsets: [[111870, 29161]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "shan_xi_1",
+                  properties: {
+                    name: "陕西",
+                    cp: [109.5996, 35.6396],
+                    childNum: 10
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ςôöƨɝȂɞȄѶóóͪƨȀóŎƨœ̍ɜƦƦôʸ̒@ɜƧς˜ƪôõô@ƪڔ@ôɜóʶôŌô̒୽Ӓ@Ʀ@Ѻ̎ɜѺɛѶôöʶô™ƨšóʴ߼۰óô̎˜ñƪѸƩτʶ@ȁòŋəѹóǿ̑ʵ@ȁ̒ʷυփô݉ôН̏ط@ȁƨóô̏ƪõ@ʳ̐ʵ@ɝɛŋƩŌɛóןôƧŋ̒ó@ŏ̐ƥ@ŏυ@ƧƧôן̏@ƥȂѹɜəœɛóԭ̎ƥóóœóȀן—ɛô@ŎѹōñƦ"],
+                    encodeOffsets: [[108001, 33705]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "guang_dong",
+                  properties: {
+                    name: "广东",
+                    cp: [113.4668, 22.8076],
+                    childNum: 21
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@@Ȃô˜ôƨ̎œ@ɚ̒@ôŐ@ɚѶɜƨȂóφɞȀ@Őƨ@ôƦ@ȄƦŌƥʶƦôôŎôʸ̒›ɜǿƦ˜@ɜƥŎ̎ƨφȁɜŎòƥԮŎƨōóŏɛƧɝəɞƧ߼ɜςȃñȄƦŎ̒ōôòƨəƨ˜ɚН@əƨ̏ƪʵυŌəɛóəԭŏəœóŏѹœρʵɝƦ̏™ƥʳѶ›öō̑óóŋρȀυƧƥɛѹōƧôן—ɛŏѵ@óŋôʵɝ›ƪԩõ@Ƨō̍@Ƨ@@ƦɝԮƪО@@", "@@X¯aWĀ„@l"],
+                    encodeOffsets: [[112411, 21916], [116325, 22697]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "ji_lin",
+                  properties: {
+                    name: "吉林",
+                    cp: [126.4746, 43.5938],
+                    childNum: 9
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@נ@ôН̎ʵѺòƨōԬŎôȁɜŋѶô̒ŏƦōñǿòƧφ@ƨН̎@@Ȁ̐Őöʷ̐ԫ̎œôȂѺôòŌôƧ̒Őƨ̏̎ȁφ˜@ŋƩͩםȃƨ—@ȁ̑ʶ@Ōóôɛœƥѹ̑—συ݇@ɜρƧȃࢯƨôœəȂɛōƩɛ̏υρóõœƪʴυφ@ʶôŌóœρք@ɜƧ@ɝǿƧͪρȀƩó̏ŐƨȂ̍غړȃɛԮƨͪ̏ςƩœôɚφȁƦôɜƧôʶφȄ"],
+                    encodeOffsets: [[126181, 47341]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "he_bei",
+                  properties: {
+                    name: "河北",
+                    cp: [115.4004, 37.9688],
+                    childNum: 11
+                  },
+                  geometry: {
+                    type: "MultiPolygon",
+                    coordinates: [["@@Ʃ̒̏ŌѺ̒Ʃ˜óȄƧŌƥͪòôñȂ̎ŐóȂ̒̐̎›ôНɜ—נ̎ôŋɞȀѶ@ôͪφœƨŌɚœɜȃóƧƨƥƪ˜@ʳƩ›ɞρ݈@υНφʵɜ˜ƦρƨƧ̍ɝóɛѹ̍ρŏ̑ôóƨ@œƧƦôƨɛ@ƥƨ@ȂƦ@@ôəŐƧʶƨŌυœ̍̎ɛŋôōɝ@óƧ̍›ƦʵѵʳôʵɜŏςôƪŋƨŌɚ@ôНƥƧ@ōѸɛ̐ô̎ʵѵНԭ@̍̍Ƨò@ȁɝ@əρυͩƪ̏ƩõƧŎƧōóšॡȄɛʶɜȀ@ɞςѶƧœƥςɛŐ@ɚɜɜ@Ŏôôςœƪς"], ["@@õə@Ƨɛ˜@ŐóƦφô"]],
+                    encodeOffsets: [[[117271, 40455]], [[120061, 41040]]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "hu_bei",
+                  properties: {
+                    name: "湖北",
+                    cp: [112.2363, 31.1572],
+                    childNum: 17
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ñȄυƦöŐƩ˜óנƨƨφ@@Ő̏Ʀ@Ő̑ôƨŌנóɜôƪŋɜŌѶօڔə݈òɞōɜŎôӏƦóƨô̒óôȃƨó̎ŐôƧƪ@ƨȁςƧə̑̎Н@̍Ƨŏρôԭͩԫ—̍ʵƧšóȀôɞƧŌ@Őѹͩñ˜òɞñ˜ɛǿƩ˜ɛñρͪ߻Ȃ̑ŏƪəƩóםôõŏƧ@ɛНƥȄó›̑ѺƧ›ôφóƨƨƦƪóɜŐôóòôƨóφ̐ƨóƦ̎"],
+                    encodeOffsets: [[112860, 31905]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "gui_zhou",
+                  properties: {
+                    name: "贵州",
+                    cp: [106.6113, 26.9385],
+                    childNum: 9
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ɜȀƦŋԮ˜ô̒ɚ˜ôōעƪƧʴɝ@ɛʶ̒ʶ̐ȁƦœóȂô@ôŏ@ōô—ƨʶѸô@ʶƨ˜ɞó@ōτöòυƨ@@əƨô@ɛ̒@Ʀɜôȃ@̍ôʵԩНôóςŌƨŋ@ȃƧñôŏƧɛƨ—ôɝƧʵ̍œôȃυœ@ɝɛȂƥóóȁɛóõôɛ@əͪɛŋôȁƩóםȃ@ƥƧŏړʶѹ̍ƥŌƦȂóôɜƨѵО̎נəɜѹŋƧȂ@ȀóœɜͪɞƧ"],
+                    encodeOffsets: [[106651, 27901]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "shan_dong",
+                  properties: {
+                    name: "山东",
+                    cp: [118.7402, 36.4307],
+                    childNum: 17
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@Ʃ̐φͪɚςɞ@@Ȃƨñ̎̎Ԯ@ѶОƨƧڔ@φН̑ŋ@Ʃ̒ǿ̎@ƨɜԬςôʶ̐ʶöԫƨƧנƥɜŎôō̎@ôŏóρƧŏԫôóƧԩó@ƥɜƧԭóƨʵɛƨ߻ӑɜНԩ˜óô̑óƧʳə™óɛƧ@õȀƧœ̍ȃɛŐóŏυО̍—óɝƩ—ԩ@ƧɚԫȄɚʶƨ˜ɞʶԪ̐ړɛƪ̒"],
+                    encodeOffsets: [[118261, 37036]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "jiang_xi",
+                  properties: {
+                    name: "江西",
+                    cp: [116.0156, 27.29],
+                    childNum: 11
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ƧȄôɚəȄ̎ʶԬ˜ԮͪςóƨŐƪ›τɞƦōƥƧ@ŏςôóŐôô̒ʷѶ—ƪƩƩǿ@ō̒ɛôυ@—Ƨȁѹɛəƨѹ̑ƨ̏óƥѵʷô̍ɛȁôŏɝǿƧԫƧ›ôʳƥōòȃρȄ߻ɛɝƨɞɚɜƨôŐƧŎԭōñƦòԮɜôɛ˜ôͪƥœ@ʶƧƨôƦƧô@Ȅô̎Ѷͪ"],
+                    encodeOffsets: [[117e3, 29025]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "he_nan",
+                  properties: {
+                    name: "河南",
+                    cp: [113.4668, 33.8818],
+                    childNum: 17
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@φ˜̎ƪ̐˜ɞȄɚ@@Ȃעó̎ŌѺ̒ôֆॢȃô™ƨŎƨōƪöƩ̑ڔɜԩ̏ɝʵƧ—əʵԬȃƨəԪ@@Ƨ̒ŏô̍υȁƧɚ̍ôóŋ@ɝƧŋõ̑σ—@ŏɜŋôɝ̒ƧɚôôطρóóɛƩ@óƨ̍ŏƧôóȄ̑ôƧóƥôóӐɛōɝŎ݇ñړɚѵֆ@ɞ̏ʶ@ʴƩöó̐"],
+                    encodeOffsets: [[113040, 35416]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "liao_ning",
+                  properties: {
+                    name: "辽宁",
+                    cp: [122.3438, 41.0889],
+                    childNum: 14
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ƨʴƧôôӔƨô̎ƩɞН̎ͪ߼ͪɜ—ɞɚ̐—@ƨςŏ̒ôƦƨɜœô̎ƪôςǿƨͩɞȀƨ@@ɛςփô›óŋ@ʵφυƩʳö›॥փρѹס@əɛ@ͩࢯ@ѹʵρ—ƩʶφȀƧ݈̒۬óʸɝŎѵ@ԭԫןɛƧƨƥςɛ—υʶφО"],
+                    encodeOffsets: [[122131, 42301]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "shan_xi_2",
+                  properties: {
+                    name: "山西",
+                    cp: [112.4121, 37.6611],
+                    childNum: 11
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ɚѺñŌɚšôȄѺ›̎ֆφóςȂ̒—ɜƨɚ@@Ȁƨŋôȃƪ—ѹ̑̐ŋƪ̑Ʃρρ›óó@ōɛɛ@əɜŏƦρƨ›ρѵ@ɝɛǿɜʵóօѹ̑̍ŋסô@ȁə@ɝȃ̏—̍Ʃυ—Ƨô@Ȃ̐ظóОó݊φք̑ʸ@Ȃ̒ʶôȀ"],
+                    encodeOffsets: [[113581, 39645]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "an_hui",
+                  properties: {
+                    name: "安徽",
+                    cp: [117.2461, 32.0361],
+                    childNum: 17
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ó̎̑Ő@ƨƪ˜Ѷǿɜ̑φ—Ʀʵ̐˜Ƨѵôóƪôôυς—ƨȂɞŏ@̍ԫôò̑ƥ—óȃѶͩƧƥôŏѺœôŏƦ—@›ƥͩƧ—ôȁυó@̑ƧɛѵʵƩƪѵ˜̑ʸóóôŏρó@ŐƦƨƥŎσɝƩœ@̎̍Оɚ̒ρƨƧȂôɜςôóظəó̑ƨóɞɛŌ@Őτ˜ö̒ƨŌ@ɞôŌ̎óƨəφȂ"],
+                    encodeOffsets: [[119431, 34741]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "fu_jian",
+                  properties: {
+                    name: "福建",
+                    cp: [118.3008, 25.9277],
+                    childNum: 9
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@̎›óȁƨӑ̒—̎ɚƨͩφŐƨɝ̎ŋóŏρ—@ōƨ›òʳəóƨō̏˜õɛƧ@ƨѵƧōəŏóŋƧô̑ɝɛʳƥ@@óɛõ@Ƨ̑ƧóȁəƧ̑—Ƨ̐@ɚəОƧ—Ƨɚóñ̑ŎóʴƨœƨԬɞȀóŐɜȂó̎ѶʸôƦƧ̐Ѻ̒ɚƧѺɜƨȂ"],
+                    encodeOffsets: [[121321, 28981]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "zhe_jiang",
+                  properties: {
+                    name: "浙江",
+                    cp: [120.498, 29.0918],
+                    childNum: 11
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@Ѷʶƨɜ@̒φôóȂƨ˜Ʀͪ@œ̐˜Ѹ̍τȂ̒̑נŐמôƪƧôӑ̑›@ƥρͩƨօ̏@@υɝó@ŋɛ@ôƩəóƧѵυó@ƩɜŋƧ@̍ŌƧɞυŏƧͪ̍ə̑˜ƧӒôȂ̍œ@˜óφ̑ɜ@ŎƪȀ"],
+                    encodeOffsets: [[121051, 30105]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "jiang_su",
+                  properties: {
+                    name: "江苏",
+                    cp: [120.0586, 32.915],
+                    childNum: 13
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ôɞ̎˜φНôŐɜŏ̎Ȅƨ›öǿƨ@ôɜɚšƨʴ̒ôôó@Ƨ̎əԮȃԪૉöͩ̐ƧòʵφƧôʵ@óړɜóŏɜǿƧ›ɝρσȁѷ̎̏—ƥ˜óŐѹ›óŐƨƦѵͪôȄƦ˜ñ̒Ԭó@̎ɝŐƧȁρ˜óφƩóóôƨѶ̏—ƥʶυ˜ɛ̒ѵȀ"],
+                    encodeOffsets: [[119161, 35460]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "chong_qing",
+                  properties: {
+                    name: "重庆",
+                    cp: [107.7539, 30.1904],
+                    childNum: 40
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@əȂòɜƨ˜ѺɛƦȁ̐@ƪ—õŏφƥòȃƥ̍Ƨôυ̏ƧôñóóôɛŏƩôƧƥôƧóυƨœ̒ѹôœƦȃ@փƥɛ̑@@ɜƧó@ɚƧ@ñφσõ@ŎɝôƧ—@ʵѷóƧʵó˜@ŎóŐó@ôȁƥ›ó̒υôóʶə˜ƧȄς̎ƧȂôƨƨƨφɛ̎Őƨʷɞ@ςԮóŌôôφ@ɜֈ̎ƨ"],
+                    encodeOffsets: [[111150, 32446]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "ning_xia",
+                  properties: {
+                    name: "宁夏",
+                    cp: [105.9961, 37.3096],
+                    childNum: 5
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ల̒ôޠφӒςôƪͧυևɜŋѺó̎ȁ̍ɛ@ѹס@@ʵƧȁôó@ǿ̐ŏöʵɝŋɛ@ô̑ƥóóƨƧ—ó˜ôœó@ƩôóƦ̍œóȀƨŎɛӒôŐυͪɛ@@Ȁə@"],
+                    encodeOffsets: [[106831, 38340]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "hai_nan",
+                  properties: {
+                    name: "海南",
+                    cp: [109.9512, 19.2041],
+                    childNum: 18
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@φɜƦʶ̐ôφô̎@ƨŎö@τʵƦ˜ԩ۫õН̏óƥȃƧ@Ʃəםƨ̑Ʀ@ޤ"],
+                    encodeOffsets: [[111240, 19846]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "tai_wan",
+                  properties: {
+                    name: "台湾",
+                    cp: [121.0254, 23.5986],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ô—ƩɝöƧɝѵəޣ̏ρƩԭóōóͪρɞƧОôԪ݈ଦѶɜ̒ɛ"],
+                    encodeOffsets: [[124831, 25650]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "bei_jing",
+                  properties: {
+                    name: "北京",
+                    cp: [116.4551, 40.2539],
+                    childNum: 19
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@óóó›υóôƥ@ŏóóə@ƧŋƩŌρóɛŐóʶѶʴƥʶ̎œôƨɞ@óŎɜŌ̎̍φ›Ƨŋƨʵ"],
+                    encodeOffsets: [[120241, 41176]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "tian_jin",
+                  properties: {
+                    name: "天津",
+                    cp: [117.4219, 39.4189],
+                    childNum: 18
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ôôɜ—@ƨöɚôœôôɚŏ@óƥ@@ȁƦƧɜ@óƧƨƥ@›ƧóəН̏óѷɜ@ŎƦƨóО"],
+                    encodeOffsets: [[119610, 40545]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "shang_hai",
+                  properties: {
+                    name: "上海",
+                    cp: [121.4648, 31.2891],
+                    childNum: 19
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ɞςƨœɛȀôŐڔɛóυô̍ןŏ̑̒"],
+                    encodeOffsets: [[123840, 31771]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "xiang_gang",
+                  properties: {
+                    name: "香港",
+                    cp: [114.2578, 22.3242],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@óɛƩ@ρ@óœôȀɚŎƨ@ö@@ōƨ@"],
+                    encodeOffsets: [[117361, 22950]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "ao_men",
+                  properties: {
+                    name: "澳门",
+                    cp: [113.5547, 22.1484],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@X¯aWĀ„@l"],
+                    encodeOffsets: [[116325, 22697]]
+                  }
+                }],
+              UTF8Encoding: !0
+            }
+          }),
+      i("echarts/util/mapData/geoJson/chong_qing_geo", [],
+          function() {
+            return {
+              type: "FeatureCollection",
+              features: [{
+                type: "Feature",
+                id: "500242",
+                properties: {
+                  name: "酉阳土家族苗族自治县",
+                  cp: [108.8196, 28.8666],
+                  childNum: 1
+                },
+                geometry: {
+                  type: "Polygon",
+                  coordinates: ["@@XJ°œlJX@lbl@XbV@VLnJlxnbšƒUU@IVK@lVIVwnJlU@n@J@L@Jn@l_nWVLVln@@blLšmV@@xœÔ‚`nœ™xV‚ÈLlx„LVxVVšƒV_U»VWn_m¥XwVmnX°ƒlmUUVwÞaVƒk@a@mmIUa@™mwk@™ƒm@@U¯a@UV@@K™@ykkmwkV@kU@ƒÑƒVkKWLÅamaUm@kyU@WkU@Ua™IUašVaUUmUUa@aVLXKWa¯UUbmJXnWnX`l@@xkzWÆ@V„LU¦‚x@b@JkIkJ@LmbUamJwm@óxƒnk@V„@x„ŽVnUVmVUVŽUbVlUbkXWŽ"],
+                  encodeOffsets: [[110914, 29695]]
+                }
+              },
+                {
+                  type: "Feature",
+                  id: "500236",
+                  properties: {
+                    name: "奉节县",
+                    cp: [109.3909, 30.9265],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@WVXb‚UnK@x@b‚²kxmKkl¯_ƒVV°™VU@bnKVVV@@nkŽ@n›bn‚@š°@VLČUš@°WV@V™nU@InKVl@nU„b˜KnX„WlknLlKUwnalLša„VlUXmWk@UU@UWWIUyķ¹XaWW@X™ƒKUIVm„U@W@UVU@KV@n»VkUkÇmUmVIUmULUbm@ƒwUaƒKkkm¯ÑUL@bWVnx@VmxUI@„klmkkK@aƒK@IlJ@I¯ƒk@mak@mnkJVL@bV@Ub„„W`UUUV™I@VƒU@VVbUJVLUVVbUX„VVxk¦VJUnVxnVVUšJV@Ubl@@bXV@L"],
+                    encodeOffsets: [[111781, 31658]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "500238",
+                  properties: {
+                    name: "巫溪县",
+                    cp: [109.3359, 31.4813],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@nLWbX‚VLVU„V@KšIVl@b„@lbšU„VnU@JÆU@V@n°KĢUl@VbÞKšVš@„_„V‚KXU‚U@KXƒ@wlkkU@mWKUU@UôJ@XV@œaVmÞIVaVLƒƒ@»kmƒ@ƒUkL™U@aU@WWƒLUUU™™KkbƒwWa@KU@kaƒXmW—LƒamVk@UmL@JmVUšU@¯X™@ċVUK¯@ÅnWK™LkKULWK@UXK@wW@™LkV@bVLƒlXn›`¯xU„°LnŽlV@n°Lnl"],
+                    encodeOffsets: [[111488, 32361]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "500234",
+                  properties: {
+                    name: "开县",
+                    cp: [108.4131, 31.2561],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@n@na‚I„wš@@VVK„LVbVxnVÆUnanKWXamKmk¯K@mkUm¯KVƒ°w@Wm@UIUUlKUU@a¯KWanwmUXamKkUWUnU@KƒkUwWKXaWLUWkImaUUUƒƒKka±k@lƒ¯w™wmbUƒ™ƒkXm@UJkIW‚XXƒbƒmƒ„UJ™XUV@°šKlšlVXV@xmbnV@blV@VšœU`UL@V™a@bULlb°VXbܚ@V@bƒL@J„xnLVb@lVb@V@@z˜bXWšX„KVLV‚š@@bUVVL@b„„lVna@ll@„zl@@J"],
+                    encodeOffsets: [[111150, 32434]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "500243",
+                  properties: {
+                    name: "彭水苗族土家族自治县",
+                    cp: [108.2043, 29.3994],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@„Jlb@nVV@bXb@ÆlL„Ul`nVKU¼VxkbW„nlUxlXX‚@°°WnnJ@VUn@J„k°L@VlV@nUJ„x@bVVVz@VnLla„KnalVlIUŽ„¼@nV@@anKUwVal@UlJœƒlI@akU@UWXKVI‚¯Uak@@KmkXWÜkXWykIWwXw@laXamkVUUym_XmlkkmmakwmIUKU@Wak@kaW@kI¯›WIk¦VŽƒUUƒmaUV@XkVUV±aUb¯b¯¥m@@ImJ—@mƒmL@kUKUkkJƒbV¦"],
+                    encodeOffsets: [[110408, 29729]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "500235",
+                  properties: {
+                    name: "云阳县",
+                    cp: [108.8306, 31.0089],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@lb„LV„VVnblJVXXKWbXLVx„l@LmVXVVl‚nLWbnVmxXb°L@bVVkLVVVJn@@X‚‚œ_Wm„kUK@alUšKX@@xWL@VXLVKlLšKXLÆm@™mœa@ml@mU@UUmL@aVšUU¯„U°`lknLlw±@a@wmLVWaXU@KWU@ak@VaU@™IUVmUUwVmUIl¥UwƒUVWUaVUUKVIUa@UUUUJƒUUm™kƒ„nl@„@VWV@L¯aUb™Ulxƒ@@b@VULUx@VUxVV™U@bU@mxU„U@mUVŽklkkƒ@WxknlxK@amLƒKU„K"],
+                    encodeOffsets: [[111016, 31742]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "500101",
+                  properties: {
+                    name: "万州区",
+                    cp: [108.3911, 30.6958],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ĸĊVI„ƒ„n„aWWXlJVIn@lWš„V„našx°xk„l@²Ž‚LVƒ„LnK@b‚LkwlmXw„@lllkUnVV@VƒnwV@@ašVUUVw@UVwVK@U@a„@kwšVVa°b@KXU@U@ƒmk„ƒÇсaml™kUVmn@VULU˜m@kUVkUaƒwUWm@Uw¯„mKUUmVUUULUKU„W@XbWVkaWwkUU™ƒ™k@maUbmbVlk¦ƒxUVUIWVU„kJVVkL@UmJ™UUVU@lLUVU„lx„@@VbƒJ™U™L¯¤@Vƒ„"],
+                    encodeOffsets: [[110464, 31551]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "500229",
+                  properties: {
+                    name: "城口县",
+                    cp: [108.7756, 31.9098],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@VK@w¯L@m@UÅV@ImVƒU™Vkaƒ@@aUk™J@LƒUUVUKmLmbÅVmUUwUaƒKUL@U™@ƒxJmbm@nVJ@X@VkV‚n™lƒLXx™@ƒb@bUVƒLU`UnƒbU@@ŽmVVX@JX@VLVVšklV—„‚`@bUL@V„LVKn@‚U@„UJkn@lmLmK@X@Jn@mb„nÞWVXnJ‚k„KČÑÆ@VK@knaÜmXlUČW°kôÇƁ@a@yÞ_VmƒUnU@K"],
+                    encodeOffsets: [[111893, 32513]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "500116",
+                  properties: {
+                    name: "江津区",
+                    cp: [106.2158, 28.9874],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@„InWUUlU@LVašlX@°²lÒXxlK@Ul@@Un@UaVJ@I@W@UƒUUVUwVIUKUa‚UUVwn@Üx@XUlnn‚bœJ@¥VklKUUlk@ynU@kVƒUUVWnI@¥V£VWVIUKU@UVƒa@n@Vm@@nlUaVkUwƒJ@blLkLW@XWmXkmmLn™@m@U@UVm@™„UVUUlakUVa„ƒVkV@@wnaWUk@VwkƒlmVIkUUxmJ@U„™@KƒIkx±V@IUm@K@IUKkbWKUbn„m„@bmVnbmb@xkxUJ@ULW`@bX@WVXL@Vƒš¯„mk¯@UJ@VmLUaWnX@WJ@nkKkxW@UIV@@KkImmkK@UW@XaWIU@U‚ƒIkbWb„xXŽlLVbnV@bWlX@VxVLnl@nÆÞVÜ"],
+                    encodeOffsets: [[108585, 30032]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "500240",
+                  properties: {
+                    name: "石柱土家族自治县",
+                    cp: [108.2813, 30.1025],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@„š@kl@š¼UbmVXJ@bV@nxVIVJULVVk@@LWbnJVU@bVbUJ@blLXnWV—@mbnV‚@V„„bn@VJVLnaVanbl@„šVšlVXxlbXUWaX@VƒUUVwUUVm@I@WmI@a„mlLœ™lK@alwnUV@kóVaƒÝk@UlbVK@™VU»VUUVWUƒ@U`ULkwm@@KmU@knKƒ»VkJkUmbƒLkbmK@UUyUU@aƒwm@@XXJ@VVLVVUbVnUJVX@K„„k`WXXJWXUbmW@bkL™Um`Xnƒb@JVL@LU@™°VVXKVnUxVLUbmJ"],
+                    encodeOffsets: [[110588, 30769]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "500237",
+                  properties: {
+                    name: "巫山县",
+                    cp: [109.8853, 31.1188],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@kVƒU™bkKmbVxkLmKkllbV@@LXb„xlašLVšVV„KXXV@@bšVlK„V„@ln@¼°KXa„U@Ulw°JXalIUa„ÝWXW@kVU@ƒVUVWUUUamUw@aVamwn@VUUƒlLXWm£@wÇĉkKklmLUÒ¯ƒWn™@ğ±kwmaWm¼U@@LUV@V@XƒVUnVJ„LWš@‚XXWbĸºVzXJVXV@@VXlWn"],
+                    encodeOffsets: [[112399, 31917]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "500102",
+                  properties: {
+                    name: "涪陵区",
+                    cp: [107.3364, 29.6796],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@nèVblĖVVnLšŽ„@šx‚V„n@nšJ@L„UVVX@lbUJV@@nn@VVVK@z„˜V@nzVJVUlmX@@_VVVbnaVal@@knW@wnaƒVK@aVI„J@£kUVW@‚wXUVJ„amƒ@Ikƒƒƒƒ_X¥ƒ@WwkKkwmŽ™šƒkUxƒnÅmm¥™WV@Um@UlVL@JU@@Xƒ@UVkKVk™KVk™Kkb@bmJVXU„VVUbU@@`W_UV¯b"],
+                    encodeOffsets: [[109508, 30207]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "500230",
+                  properties: {
+                    name: "丰都县",
+                    cp: [107.8418, 29.9048],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@Þè@XUK@LlV@blbUJ@„„V@bnV‚@VVVXU@ƒlbXal@VXnKV@maXUރ@amk@aVKXV‚anbš£°mnIVaUKVwUmWLUUš¯V@@KUK@I„aWmn_šVlK@anXVaXWWIXWl_ƒƒ@LUWVIUmVaUUUK@UWI@Wn@VI@mkU@U¯Kƒl@ImVÅLƒwU¤óbUU@wWXkmm@LU@@VUIWVUL@JUnƒaƒx@Jn„ƒbUIWVx@ŽUXlV@¤ƒIUJ@bUL„Žmb@xmX@lk@UbmbUaUU@`W@kn"],
+                    encodeOffsets: [[110048, 30713]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "500232",
+                  properties: {
+                    name: "武隆县",
+                    cp: [107.655, 29.35],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@l„„w„bVm@IVKXUVJ@UV@@KnnWlX@xVVôaV£„xÆKnUVm@UmIXm¯¯@WkWVwmkXƒlaUwV»ULmk_ƒVkK@ÅWa@aUU@mkaƒIƒb@‚n¼ƒnm‚_@mmK@UƒLUVVmI@aUJ@XWJ@U`UIkm±kk@@lULmUmKUnVšnlUVmI@VkVlx™bkIƒVmLUxkKUŽ‚Xš‚n¦Æn„mVw„lš™nlxlLXx„@W¦„`„„"],
+                    encodeOffsets: [[110262, 30291]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "500119",
+                  properties: {
+                    name: "南川区",
+                    cp: [107.1716, 29.1302],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@VšUbVJVUn@VLX@WVXVVI@VUVWxU@mš@ĊX@@¼V°aVUX`@_V@VaUUVƒUWnI@alašLUlšLUllLVU„@@WV@@IUKVkn@@VlLVwnK„UlJšakwlU@UnJVUmkU™VmXa@wVK@UUw™@VƒVI@akƒ@alInwlKXUmaUW@wWLk™™KVak_ÇaUƒƒV@šXbƒLVxUlWIk@UK@V™@ƒkU@VbUVUlVnƒLUV@lVXmxkV@L@V@Vk@WbUwmL@JUI@xVxkx"],
+                    encodeOffsets: [[109463, 29830]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "500241",
+                  properties: {
+                    name: "秀山土家族苗族自治县",
+                    cp: [109.0173, 28.5205],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@XlV@lzn@VŽnbÆbXKlL„U„ÒV@@llUnxll@zšŽ@LU@@V°b@Vn@š„l@VÑUƒnK@UšU@aUaƒkVm@K¯wƒklmnn„Ul`nI@almkIUwmWVkUaƒkkJmUUa@K@aU@@_m@@wUyVUUa@Umƒ@awl@Wka±„UkUykIWV™b@bUVk@›aU@UXU‚UIWakUWmUxUV@nUVWbšŽ@XXVVŽmXXŽ@VƒbVLkVWx"],
+                    encodeOffsets: [[111330, 29183]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "500114",
+                  properties: {
+                    name: "黔江区",
+                    cp: [108.7207, 29.4708],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@VX@V@LV@VJUL@lVnnxlb@VXV‚XV@@W„@UIVK@kUKna@£VWUaVUUalIVJVIUW„_lm@bXKV@mn@J„UUw@KnIVll@VanLVmUkVKXLVKUIVamw@UaU_lw„KlwUWV_Ua@aUa@KUšwm›_›Ó@wU@™nkK@am@UkUKmXk`m@@I@K@I@mkVmIUxUJ@kUL@JVV™„lnklWnn`VzUVnlWbkb@WxXxlJXzWŽÛlWXnl@Ll@Vb°UJWLX@VlV@bkJ"],
+                    encodeOffsets: [[111106, 30420]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "500117",
+                  properties: {
+                    name: "合川区",
+                    cp: [106.3257, 30.108],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@XKVXlK„ƒVL@UnV@aValXXK„U@WVwUaVU@IV@@aVW„L@U@anVV@@bVK@UVL@bnJWL@VnUnb˜@@JnIlVl‚@@bXIWbn@UKVLVKXLlaV@VVnK@bVL„m„IVƒ@KmknUUWVI@aVJ@_„WU_VmUwƒU@K™ƒVak@am¯mJU_UJUkU@WkIV`UI@JV@LmmU@@mƒbUzś™@„VK@nUKƒ„ƒb™akb@UWK@bkVVbV„Û@@`ƒXk@WŽ@n@lXL@bmb@VVJUn@JnUlnUlmX@`XLlbkJW@kzlb@`@b@b"],
+                    encodeOffsets: [[108529, 31101]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "500222",
+                  properties: {
+                    name: "綦江县",
+                    cp: [106.6553, 28.8171],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@@¦‚@X„lVX@@UVKl„VUX@lanVlUVbXWVXVƒ„VVUnKVUlwUwU@UJ@nmVkUV™lwXam@VaUUUw@W@kk»mV@UmKkwVKVUU@@LUKVI@mV@XVWxnXVKUUUK@wWU@UUWnUlLXa‚mUI„am@wI@K@amIm‚UUkI@m‚akUkKWUUanƒ@wƒamLVxk@UVmUUL@Vm@kV@I@ak@@bWVXJlLVbVL@š@bn@@`Un„@WbUKULWVXbƒ@UVmbX„WVƒb@bVmxUKUƒV@šUn@V@V@nmšnKlnnWWXX@lKkK@a„IVxUlVb‚k@mn@@U@m„bVUV@VLUJUXU¤"],
+                    encodeOffsets: [[109137, 29779]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "500233",
+                  properties: {
+                    name: "忠县",
+                    cp: [107.8967, 30.3223],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@VLÞĊ„U@Wš@¼V‚„@lk@w²mlšVUœ„llšVnI@VlKUUlIVƒXUVJVU„wl¥UkUKUIm@ƒaUƒ@mUna˜@XUWmkK@aVIUa@aUVmIXa@Kl@UUVKUIUJmwU@@aWInUVa™»k@@lƒ™¯n™¤mabWUUL@bnl@b݄WVnbU@mLUWk@Wbka@„WVUU@UmUmVkUULV„lVUx„l@L@VƒbÈÒlb"],
+                    encodeOffsets: [[110239, 31146]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "500228",
+                  properties: {
+                    name: "梁平县",
+                    cp: [107.7429, 30.6519],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@XLV@VV@b°°nšƒnkb@bƒšnJWVXblIUVšxWnUJnVVLVU„JlUnLVK@UnUVJš²nKVbVKla@aXlJ„k„Klb„ƒ@U°£šKšV„IUa@ƒ@kwVƒVUkKV@VUkk›ƒUVk™±n@xklƒ@U@»™‚@XƒVÝĉUJnxWb@UX›KkVUbUKWUkVmkkLU`›b"],
+                    encodeOffsets: [[109980, 31247]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "500113",
+                  properties: {
+                    name: "巴南区",
+                    cp: [106.7322, 29.4214],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@nxnVlJlUXLƒ¦@x@Vl@nKVVX@V_V@@KlVXU„@lKlxXIl@ÈĊ@Vl@n_VJlŽnVlnb„²VVVJVVmUUkĕUamçU@»W@@ĉn™V@XwVU@UUJWUXUW@UKm@UVUIVaU™UVmLUVƒUU„UWWXUakVmUkbW@UVkƒUL@VW@kUWƒ@mJUXVVU„@lmV@zklVVkLUl@¦›I"],
+                    encodeOffsets: [[108990, 30061]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "500223",
+                  properties: {
+                    name: "潼南县",
+                    cp: [105.7764, 30.1135],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@@a@a@_kalyX@lIkaWK@_nWVkkmmV@IVmUI@Una@aWK@k@mkbWaknmJUk@mk@@kUal@Uaš@Wa@aXLlwUKlkkƒ@KmI@VUJ@Lk@@VUUmL@amJU£kKUaWakLmU@bVVUbnbWV@xkL@bUb‚xUxVbXJVbUVWIUVU@kLWxkKWV@n¯VUbU@@VVX@VmaUL@VUK@VVbn@lVnI‚@@lnLULm@Ub@Žl@na„@lK@XVVkJ@b@zl@@VnV@bVb@J@bnXV`lXXmVI@W@InbV@@aVKUblKVLUanLlmnLlK"],
+                    encodeOffsets: [[108529, 31101]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "500118",
+                  properties: {
+                    name: "永川区",
+                    cp: [105.8643, 29.2566],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@@b܄nWVLX„lxV„VxXxlVn@@bVblK@a@UnLVJV@@UnLVU@VXaVKVXš@n`WUÿ@IUKlaUUUkWyUÛÅÝ@mmkUKUwW@Xk@amUUakKWƒwXaƒK@VVLklƒXVlkxV„UL@bm@Vxn`ƒIVxUVkLVšUšl@@lkXmmƒVUn@VV@Xb"],
+                    encodeOffsets: [[108192, 30038]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "500231",
+                  properties: {
+                    name: "垫江县",
+                    cp: [107.4573, 30.2454],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@šĊ°¤nҘ¼œaV_lKnllUXVVLValUœLVW‚@XamwVIUKkaÇфa@U@KƒkVwkUUƒVKlVnU@aƒU@ƒVIka@akU@KVL@WÝçUV@Vmbů@L™KƒnnJW„ƒVkxlL@VX@VxmnXVWxUb@bkn"],
+                    encodeOffsets: [[109812, 30961]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "500112",
+                  properties: {
+                    name: "渝北区",
+                    cp: [106.7212, 29.8499],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@@bVVXL‚a@lnbWn@L„@XVlK@VVLUVlbkLUKVVVL@VšnX‚VL@VV@UbVb@x@¦UxVb@bUJƒL@L„VVxlK@™nk@U@W„UVLlKXV„@VblU@UUKVU@wn@VJVanLlkX@VaVK™¯@a@U@U@ƒVaUK„kUUƒ±maUkm@UUkbm@@Vk@@JƒwU@Ub@I@JmwUL@aƒ@@KkVÇLkƒWkƒ@kUU@@xUVmKUnllUb"],
+                    encodeOffsets: [[109013, 30381]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "500115",
+                  properties: {
+                    name: "长寿区",
+                    cp: [107.1606, 29.9762],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@VVšU„bX‚lX„¥l@XnVmlxUx„@@blVnnôĀlm@aVaXwWUnmUwW@@UkKlw„UXƒmI„mšL@KÆ°na@UUImyU@ƒ—@yULUUm@@mU@VIkaW@UUƒV@K™I@mƒmU™wƒ@™mKUnU‚UIƒlVLUb@„@V@V@bš°ULUbW@klmKUbUIm@@xUVVL"],
+                    encodeOffsets: [[109429, 30747]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "500225",
+                  properties: {
+                    name: "大足县",
+                    cp: [105.7544, 29.6136],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@XUmaVaUU@anVlKXbValU@aV@@IXKš@@bV@VxVK@UXLlUšJXa@_‚@@aVK—ÅWVkwWaƒƒwUa@am@kUWLU@kWmX@ykI@W@UV@na@LlLV@UƒkwWƒUKmXX`mIVl@bXLWVkbkkƒx@`VXm@@J@U@UUKUxk@WbUIVl@VXLW„ƒJUkUlUImxXlmb@X@VUJUnVbšW@UV@@VVX@bnW@LVxUnlJUV@n„@VxVIn@l`„UVVVL"],
+                    encodeOffsets: [[108270, 30578]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "500224",
+                  properties: {
+                    name: "铜梁县",
+                    cp: [106.0291, 29.8059],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@VblLV¤nI@bnKVV@Ul@@KVI@UnJ@Ll„klVLkxWK@bXb™@Vbk@Vb@ll@@nVlnIlmXblaXl@„W@_Ü@UƒUalU@aXL@Vlašb„a„ƒVL@mUL@ƒUUƒƒÇXUW›X_WaƒƒUƒ»m_™@UWULWb@UUVmK@VU@UImK@V@bkL„x‚„XblxXU˜ÆUL@b@@`Wb™IkVWK@VULUwU@@a™@WL@JU@@bkVUb"],
+                    encodeOffsets: [[108316, 30527]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "500226",
+                  properties: {
+                    name: "荣昌县",
+                    cp: [105.5127, 29.4708],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@VI@U@WnaWknwVJVkVl„IXƒWK@UUkVJXal@VwVL@V@V@In@UW@_„wlllaXUWK@aUknJW_ۃ@aWaU@@UVm„UUaUImJVnÅUmVUm`kUUVWLnVU@VVmXƒK@„nxmŽULkx™ImJ@nU`@X@Vkn@`@nlV@nVJVaX„VLnK@bVV@nV@lbXWš@"],
+                    encodeOffsets: [[108012, 30392]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "500227",
+                  properties: {
+                    name: "璧山县",
+                    cp: [106.2048, 29.5807],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@XzVlVVkbVL@JVĀXŽ‚¼V„„„XbW`XœWVȎ„„VVšŽVkV@@UXa@alK@IƒƒU@UKWUyUI@wVUUWVak@VUkƒW¹@WXI@yVIUK@kWwkѯ±W@™kUb@KkVVVmXƒJ"],
+                    encodeOffsets: [[108585, 30032]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "500109",
+                  properties: {
+                    name: "北碚区",
+                    cp: [106.5674, 29.8883],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@X‚VLV@„„@JkL@bWb@VU@UlƜVy„a@nV@nn@KU@IVJU_lJXV@VlVIV`nIn°@b‚lUbš„„KVI@aUaVw@¥@wUaVaU@@UUKW™m@UUKUUVLlKkaVUUK@UkLWUƒ@@KXmma@kbWKUU@aUamLnÞ@VWLk@@Wm@ULU@@U™KUVWI"],
+                    encodeOffsets: [[108855, 30449]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "500110",
+                  properties: {
+                    name: "万盛区",
+                    cp: [106.908, 28.9325],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@VIV@@wVJ@InKVxXal@@U@U@KlUnwUW@kVU„KUmVkUa@I@KW@@bk@@mƒU@m@k@a@aƒIUxmJk@ƒwULƒwkKmVVX@VXV@xVLVVULmWXwWUU@@nUJVL@KV@UVULlxnL@VnUl¼@l@XVxVVUbn@WbkxUšlVnU@m"],
+                    encodeOffsets: [[109452, 29779]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "500107",
+                  properties: {
+                    name: "九龙坡区",
+                    cp: [106.3586, 29.4049],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@XK‚L@Vš@XbV@lW@UV@@VXIV@U™VKlL@KnnJ@VV@VU@I„@@mVUVWUUmL@V¯LUK@UV@UU@a@U@yU@WLUK@X@KUVmL@ƒ@aXI@w@ammVk@WÛwm@UxVVVbVLUJVxVU„V@V@X@JUIVbm@@Vk@@VkL@lVLUJ@zWJ@X"],
+                    encodeOffsets: [[108799, 30241]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "500106",
+                  properties: {
+                    name: "沙坪坝区",
+                    cp: [106.3696, 29.6191],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@Xºl„UVl@UbVXUV@xVJVzXJVUšL@VV@VKn@@Xl@XK@UmÝnKVbVakkVm@k„ƒUK@UmIm@LkKULVšU@WJ@UU@@VkXU@Wa™@@UKWL"],
+                    encodeOffsets: [[108799, 30241]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "500108",
+                  properties: {
+                    name: "南岸区",
+                    cp: [106.6663, 29.5367],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@VV„JVL@bUVVnl`XIlwXJlw°nnl‚IXW@UÇĉk@WJkwkLƒ@WVkU@LU@U`W@UXUV@n"],
+                    encodeOffsets: [[109092, 30241]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "500105",
+                  properties: {
+                    name: "江北区",
+                    cp: [106.8311, 29.6191],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@nLVU@wV@lV„@Xll„ÈKlU@L„@@bVKnx@I@JVaV@„x@Il@@Un@laVVn@mkUIm`k@WXJmk¯mkxWIkxWJk_UmVUUKƒ@UU™@ƒ„@l"],
+                    encodeOffsets: [[109013, 30319]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "500104",
+                  properties: {
+                    name: "大渡口区",
+                    cp: [106.4905, 29.4214],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@k@@U@w„¥WKkVkImUmwa@b@xWJ@b@„nKVU@L@WVLXKV@@z@V@bVVU@@VVL°K@U"],
+                    encodeOffsets: [[109080, 30190]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "500111",
+                  properties: {
+                    name: "双桥区",
+                    cp: [105.7874, 29.4928],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@WwUwU@kK@KmbU@@V@XlJ@znWlXV@XK"],
+                    encodeOffsets: [[108372, 30235]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "500103",
+                  properties: {
+                    name: "渝中区",
+                    cp: [106.5344, 29.5477],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@VLš@VV„@VL@aUKƒIUUƒ@@JUVU@"],
+                    encodeOffsets: [[109036, 30257]]
+                  }
+                }],
+              UTF8Encoding: !0
+            }
+          }),
+      i("echarts/util/mapData/geoJson/fu_jian_geo", [],
+          function() {
+            return {
+              type: "FeatureCollection",
+              features: [{
+                type: "Feature",
+                id: "3507",
+                properties: {
+                  name: "南平市",
+                  cp: [118.136, 27.2845],
+                  childNum: 10
+                },
+                geometry: {
+                  type: "Polygon",
+                  coordinates: ["@@@knyƒk@ƒKU¥šwV@nkƒWƒzUmk@@lKUa@aVI@UƒKUamKUUVaUI‚@Xƒ@UV@K±IUVVlUbUbUL@KWUXmWk@KkXmmkŃKUƒ™a@amUƒbkUkKWUnwUƒÇwV™UUƒÝUKV£U™@ƒnKWwXLVKm¥@wUXkmWk@ƒ@wX@lU„@šyVImaXwVƒƒ@kŽƒnU@mbk@mlUXƒmU@mV@n@bnW@bUIWJ—ImVUKWbUK@nkKƒaU@W_VUUmWmL@UU@™bUWUL@V@bmVUz@`mUUVVbXL@V™L@lmLUxmVamXkW@xWbU„VbUxkU±@ÅUmmkLUbW@@`kLknVlV@lbXxlVUXVV™ŽU„U@UbWŽkIWVUUUJkI@llbUxVL@V™VƒUU°ULUmWXUV@VULWb@™xm@UaVLVKUa@ƒw@V›bkmVambUUm@@VkK@„@b„xlxX@‚„n¤@Xƒ@@lkLWV@Žn„V„kb@bWJXLWx@nkxmm™bXn@VWVUn@VnJ@bVXl@„™VJXnWbX`lL„UlJVI@Žœ@VXV@Vl@bn@@Æmn@VšxXU@mVIlxšVššnI„l@nVJ‚aXI@mlU@aXkVm°klmnVV_naš°@V@xܦXK„V‚nnUlVXbVK‚LXKV@naV@@VVl@@lXblXšWnLlbVK²nš@@‚VLUnlV@lƒXxô°‚V@UnaUUlKXLVUVVUbVVlUnJVX„@VW@an@lb„@nl@VU@anƒšUVW@kƒaUm@InVVKVU@kUW@Uam@km@kVa@a@™nwšU@WlI@mVI@WXaW_nƒ@™nƒlkkW@U‚¥@kV@Uw@wUƒ@@IXK‚¥VIn@nU@`@Xl@VV„LnašW‚bVaUwnU„@VIšKlV"],
+                  encodeOffsets: [[122119, 28086]]
+                }
+              },
+                {
+                  type: "Feature",
+                  id: "3504",
+                  properties: {
+                    name: "三明市",
+                    cp: [117.5317, 26.3013],
+                    childNum: 11
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@lL@Un@VVna‚bnUlœa@U‚x@„VbULUKVbn@šw‚@XaVK@UVUXWVnVKV¯„VšU@UUKVwka@klJVIVVXUlJXVaV@VƒšUUVWkUWwkaU@UklmlK@_X@ValKnnÆV²@lVVwUaVƒXa@wlXnW‚bnUVwnK@kšK@UWKUaVUnV@_VynU@a@UVKVXšaV@@VnKnXVV‚UX`V@„blL@mVLXaVLnU˜JXIVJ@amX@a@mnUV@„nVWnkl@naV@„ml„@@KmKUam@UU@ƒ@UlKU™Vk™U™K@aVaUwV™U¥UIkJ@wmI@‚mbkwkVW@UXƒKULU`™IVKUa@LƒkkVmUU@WlULUWÅU@I@ƒWW™nU@@w@a@ƒUam_XyVIVWkkƒ@mwVKXUV@nw˜VXkWƒÅ™U@ƒaƒU¯KUnƒK@ƒ¯šmUƒLXŽVLnWVbVbUVm@Ub¯¼W@amƒ`kb™amLUUUƒ™aUXV`@x@XmJ@n@L@xkJUU@kU@mWm@kUUwUUVWl@VUkIƒy@kkaVUUm™IWVXbWxU@k„mVkK@nWVX¦WxU@@bkx@VU@WŽk@™kUbmJUUmkUW@_kKWKƒ@knV¤kIUKWLUbV‚@Wbk@@VWL@VkI@lUXVxUVU@@mWIƒV@a¯nUaƒaUV@„ƒJ™b@bÞ°VbUš@X™aUVmL@‚VXblŽnV„°˜n@Vnx„@VUUUlK@InJVb@„Vlnn@V™L@VWJU„x@XlJUVVVl@LUUUJ@Lƒ„@lUL°¦k˜V„VnV@„xV„„l@blLnlšLVaXll@šnVUn@‚xn@nml°‚X@lb"],
+                    encodeOffsets: [[119858, 27754]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3508",
+                  properties: {
+                    name: "龙岩市",
+                    cp: [116.8066, 25.2026],
+                    childNum: 7
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ša„I@ƒVU„bVb°m@b„UXJ@nV@VUUwVW@klJ@UXK@Ul@Xa‚@UVaXKVLlJU£lm„@XLlL@`VXnlVVnIVašll@XV@@Ulw@aV@XwW¥XU@mlLnUlƒV@XwWaXUšJVnUVlb@l„zlJUVk@UXVVVxlVn@nXV@@lVVlI@w@K@mnI@W@wU_VWšbV„VVnKšbla„_n‚bX@°»Van@VUUaUamXUKW„K@a@Ukƒ@wWkXƒWW@wUU™Kw@_lyƒwUkU@@Uƒ@kamVmƒXašUVUka@Wk@»UUUVƒKkbWU™VUbk@mkƒxkƒƒKnIVUmW@kUKmXUmVaU@kU@m@KUWVkIWJ@ŽU@UI@wUUUa@KW»nU@mVkUmm@XwWU@ƒUUmL@ƒw@mnƒVUU@aWak@@amxU@UxULWVXbVLU`mbUImVU„ƒbn‚V@@bVn@bnVWxLmyUbƒIUKƒ@aƒVm™akbV‚UXW„UlKWbkV@„WLUlk@@nšbƒb@lkKmU@ƒUIWJkw¯UUVVxm@@XkbWx—›XKƒlUzWJkUUL@bmKkVƒ@@VUIUlWV@X„K@VkbWx°xUb@LUbk@@VWb@LXJ@VWXU@@bUVV„VVn@VVlLn„@l„@‚xk¦Vx@bVJXbƒn@JlnXxV@@„nJ@X@V@lmx„bUn@xVL@VVKlL@l„„nLVaVL@xkl@LƒxVl°š„X„WVX„Vl„œJWnxlJ"],
+                    encodeOffsets: [[119194, 26657]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3509",
+                  properties: {
+                    name: "宁德市",
+                    cp: [119.6521, 26.9824],
+                    childNum: 9
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@@LVKVaVaUkVU²J@LVU„@@W‚VJUbVVnLVb„L@VUJ@bVbkL@Žl@Vn„y„XmlU@™xV¦„L@Ž„lmz@lnL@bVVšbVb@l„nšKVk„Vl¤@zXV@šl@XJVLVKnXVK‚VnU@wUm@šKUƒ@UlVlw@U@U@ƒUaUKlU@kXKlmXIWKXaVIVUVK@KU@@k„JVUnLVJUL@V‚IVa@VnLšKUnl`Vb„V„V@š‚Vbn@Vzn@lKnVlI„VVKUalkXJl@XXVWVLVUUmVU@Unm„£lK@Uk@WUXK@U@WVwVkšƒĠkĢÇ°aUÅUwmaţƒɱUÇa™w„±V¹XalKôx„@„UVaÜʓͿVóbÅLƒJm„¯Vk¦ƒŽk@mamXkKUƒUL›akbk@mV@LkJWb@Vk„mXk@UVmaUV@amLUKUamI@KUaU@WbU@UUUƒUIWJUkm@šƒw™Kk„VJm@kxǁVƒUK@mUVUkmlkkVm@amwƒLVWU@UbVLkšUbƒ@VƒmK@XaVWU_VJnwV@@kUmWakxƒ@kwWakIWxnbUJ™zƒ@kVW@@x@„XllnVW@xn¦ULWKXxmL@„VšU¤VL„ÞVVUšÈxV„mxXVlLlV„anV@bšbV„„LlÆnnlW@LXlWnXV"],
+                    encodeOffsets: [[121816, 27816]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3501",
+                  properties: {
+                    name: "福州市",
+                    cp: [119.4543, 25.9222],
+                    childNum: 9
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@lxna@nJ@xlIVJV¦UšVxUb@bšLšVUlVškL@V@„VVn@Vb‚Ln‚@LU„lJXblx„@lwXbVn@lU@mxUIV`UXWb@‚nLU„„@Val™UKVaV@UX„Knx‚bn@lUkllnUVnV‚@VLU„È‚lwn@UIlƒšL„x‚™n@VlXIVJV„VVV@XaV@Vb@LnJVbVLnK@bVUnbVUl@nWlƒ@UXalI@KnUl@laœbVKV„lLnWnbl@„l¥°Unƒ„IÆKôa΀U„a@UUwÇWǓIUWUÅVkƨm@ƒ@£@KmLU¤ULˣJ™kUƒVǟUUķ@ĉVƒKUk@Ñ°wôǚç@īšé@Åţ¥mīÛkm¼Å@ƒVķVó°ō¦U°ƒn@bVJXVVL@bUŽƒakLmx@xmxXzW`XbWnXV@bWLÛ@™aƒ@ƒaXbWVkaÝwU@mlWKkLWWkLUKULW@kVmVUU݁UamV—¤›n@xUVUzkJV¦lJU„"],
+                    encodeOffsets: [[121253, 26511]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3506",
+                  properties: {
+                    name: "漳州市",
+                    cp: [117.5757, 24.3732],
+                    childNum: 10
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@@bl@Xb@bVVUŽm„@n„x‚@nKVV@„XVWxn@VnUl@nmVX¼@LVbVV@xVJV@@XIlJXU‚V@Ln‚@lVV@UbVnnWVL@lnXUVmJ„Ll„„wnll@VašUXVla„LVUVV@¼Xl@lbUV™VWbn„nUlb„@@VV@„aVUšmlUašUny@kU@Wkk@WaUVk@@ammk@@U@UlU@aUa@wl@šmXLllnL‚U@anVnU@L@VVV@KlXnWVnVanUšw@w@wm›nÅ@wƒaUam@Uk„mUl@@a„a@U@¥škôK‚wȯ°w@ŻkwǕaK›ÑÛk@ĕōřċ£ĵƒUKW»kÅŻLU@Ulġw@¤Vz™VUbkKUbmLmlULU¼UxmbXl@bWVƒb@bUnV‚UšVbULU@@VkbVL@`U@WX@ŽXV@b°„@b¯š@¤@Xm@@b@`U„VVUL"],
+                    encodeOffsets: [[119712, 24953]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3505",
+                  properties: {
+                    name: "泉州市",
+                    cp: [118.3228, 25.1147],
+                    childNum: 9
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@Vl„xkz@`‚xšLVV@xXXW„Xl@xl„@V@bnV°™@„„LVm°L„V„bV@ƚX„Wl—UmxU@WVULnx„@llUXUJWzn`Vb@„@b@xV@šmXX@„@JÆVVXVKXkV@nVlU„l@KVbULšJV_VK„LVWX@lUVƒkIU¥lIVyVU@wœm˜£nUVWU@aƒm@UmWw@UX@@am™VUn@@aUUlUVanaWUXWmUnkšK@VšUlVVUUwš@XLWWX™ma@knm‚bVb„VXbVL‚@XJlInlšL„w˜mXóšw@çV»ÇçŋaķƧóƅóKġ°nÅUķƑUÇW@—¯xÇ°öÆlV„n@llšaš@„Lšbƒ`™@™„VšXVƒVx@V@bULVJUk‚Ç@ƒ¼ƒXUKk@mmULkaWbk@ƒx@UkL@a@K@U@UmKmbU@kV@UmVUbUmmXkW@LUU@U@KmVmU@bVmKkkWK™nk@@xVb@bkV@V@Vl@nn@bl@VUXbl@XlV@@lmz™VVbkŽ™nUVƒb"],
+                    encodeOffsets: [[120398, 25797]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3503",
+                  properties: {
+                    name: "莆田市",
+                    cp: [119.0918, 25.3455],
+                    childNum: 2
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@VbނVVnUlUX@VKVLlKXXlKXL‚‚nkV@ÞxlbXUWa„b„@šbÜ@XK@aWUXmWaX_Wynw@wnwlK„bV@aUKWUUI@a„mV¯Ŏ¥ô¯ĸU„UÆ@n»¯aƿé@ţ¯nĉĬÝK™óó@™ÑU¼@è™xWô—nƒx™KmkkJWI@UKWaƒUUaamn@lnbWšXXWK™@VxUVkU™V@U™LmlnVWXXVmbUbkVVV@bm@UVnš@bW@@VXx‚n@V„n@bV‚UX"],
+                    encodeOffsets: [[121388, 26264]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3502",
+                  properties: {
+                    name: "厦门市",
+                    cp: [118.1689, 24.6478],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@@VlUV@nanL@V@V@L@blK@V„wl@XalbVKnnl@VL„W„»È@lVUIVK@a@UUw„WUU™šƒš@„_™aƒK™@™bkkm@UƒkõŁxóL™l@¦@Vƒb@bk@VŽƒnVln@Vb„b@xmÆnœ@x@x™x"],
+                    encodeOffsets: [[120747, 25465]]
+                  }
+                }],
+              UTF8Encoding: !0
+            }
+          }),
+      i("echarts/util/mapData/geoJson/gan_su_geo", [],
+          function() {
+            return {
+              type: "FeatureCollection",
+              features: [{
+                type: "Feature",
+                id: "6209",
+                properties: {
+                  name: "酒泉市",
+                  cp: [96.2622, 40.4517],
+                  childNum: 8
+                },
+                geometry: {
+                  type: "Polygon",
+                  coordinates: ["@@ÇnÅaĉ@ƒU¯¥›UŹ‚ƒ£™WUýUU±JkkUw‚yÞIČxĊĕĊ¯š¥ÆUkţ™UÅÓ±¼™IUx¯UƒÒƑ‚ݐŰƒKÝnğ°ÅU@Žƒ@Vn@þš¼¯šWnŎ°XLWlnVnbWnƒVXxmbƒa—bóUƒlǕUUa™IUmlU™ƒš¥™kƒ¥ĉwkkƒÝɛa@¯™™U¯°mVƒkVnKlƒōÑÇÑU@kl™UġŽkUŻnUW™@š¯ƒk»šmWV£UKnUƒmUw‚w@ƒUIVaX™šwm»Èmmwn¯ċ™¯LĉŽUƒJUalka±Va@U‚k@ƒÛф¯WmnUaɝ¤Ûmƒn¯m±x@wóxÛLġÒUx¯VƒÈ™JUbóz݃ÇKĉ¯ōlÝUŎWl¯nťbÝ@¯ǩLġmV@ƯĢkÆm™ĊkVťLɃmÝXó°@„ĢbVŽóVݦɱ@Ƨaġ„UV„ĠÇÈV¼UVţwmbJÇwˋa™XmǯKkkmŽƒbXšm¼V¼ǬŚ²¤ôŰÆƴô̐ŤǪnɆӨ¼ɆLÆłUĊšxŎƞȘǔˎǬǪnƨŮǬö°»šġ„„ÞÜÆĸÒĊ„ǀbƾèôÈ@¼¯þŤĸƧ°VĀ¯b@lÈĊ‚šʠń̐„ȘKǀŽֲॗţÿǕý@ʊǓƨóÆÑǖŃôw@΋ʈƆÅÈVVĊV„óĊÅ@ÞƒĬV@Þīš@°Ž„V@ĸĢƒ°XτƜĠ@ÈaÜ¥Őƅ‚™nğóĕVġUůƿŋ—ĕƒa±V—UťÇğÑ"],
+                  encodeOffsets: [[101892, 40821]]
+                }
+              },
+                {
+                  type: "Feature",
+                  id: "6207",
+                  properties: {
+                    name: "张掖市",
+                    cp: [99.7998, 38.7433],
+                    childNum: 9
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ÈÒŎÒk„mLUŽlŽU„¯nV°šš@°ɜb„ÞĠaÈ»ĸl‚š„LVUÈ@Ċ@ýUm„@@ÆVĠ¯Þm„LƯޏƒ„Ñ°VVwšJ²»ÆԚVlŤÅV™¦ĉ°ĉĖċwÝJzVxll²IVVVþšX„¤źœV°¦„VĊ@ÆbÈmǔLĸĠ¯Ģaô¯ĸmÆÛUƒlÇĸk°XyĊUǔV„ǩnmV»ƒa@ýnK°n@l¥@»ż„Ċ¤m皃@£ČU@mƒmVkÞUƐ±²¹°‚ĠwÅƑŃU¯™›V¯aÈŁšƒÇ»™ġn_°xŎKlxœklx„@Þw‚„„@Æm²b‚DzLlkšWXať¯ĊaœÑšK±w@wƒUÅçV±Uk™@@„¯š¯xƒU™±±UU°ōxVxÅÔō°ó¯UÝ¦óbÝþƒ@ĉÈóUV‚Ux„„@VŽUVÝwÅÈǎóVkk¯JǐkmmL@„™KÇx@bkš™@U°ķ²ó`ƒš™šmn¯°ƒUwlÅkUƒ`™¦ɛô™Žķz@ŽÅnÇ°U¼¯KmVk²ƒJƒ¼ƏÞķôš¤ULƒ@mnğ`™šÇnUxÇ@Ûÿ™U@ƒƒkŻŽ@x@móJkŃ¥VŹĉóÒĉlċ°ķ„Uƽ܃@›x"],
+                    encodeOffsets: [[99720, 40090]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "6230",
+                  properties: {
+                    name: "甘南藏族自治州",
+                    cp: [102.9199, 34.6893],
+                    childNum: 9
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ލš™nKlnšwX¥WÝXk˜xÞUnƒ°aĊVnUUKlÞĶWXnĠ¥ô»„™@nmVL@¤°™Vz„JšanU@aÆwna@k›ƒU¯šyX_›aĉb™ƒ„wƒéXkWwÅaš¯V¥mƒ¯UƒƒI@ƒš@„mšb°aÈçšUš¥@»‚knwɜƇ°I°ÑÈmVU™¯Xa@w‚W@wšV¯Č¥l¯Uwnm@k˜aUaóKkk@™Ça™b@ŽÒWa¯IÇxÛam¼™VUƒxÒl‚@zÝÒ¯bÝaĉVĉwDŽW›zJ™mJn²mܯUƒ¯ĉ@ġ¤Åb@²nšmlƒ@@Ž„„U„ƒLVxšV™„U¼Ålma™b@ƒ°™l@WIUƒ¯@mƒ™@™™ó„™„@U›zţyƒXÇU™ÇVUUVLkbWakVWmUbkkƒKUÆ»nƒ°Knk@aƒUVmšnk»l¯Ģ›lw@_kKVU@ƒnaƒ@lUk@¯¥mV@kmbW™b¯Åõa@mkU@kƒÇŽkU@›`@™óó—bl¼Uxƒn„¼šlVȄx@blVkVVnƒ`XÈġÈ@ǃK£ÝJmUUnUĖmlU„mKUn™VÅaUw›Uĉ`¯n¯wW¼nxVŽ™š@bĉnƒ‚kIċŘkXUŽ±Ò™xšÈ@ŽX°`l„œV˜IȯĊV„ƒšVVan@VašUVażVmšblkÈW„ƒWIXa„alL@wVb„„V„¦lL@lĠ™n҄U‚nk‚šL@ÆÞkšÞšK‚bñþW¦Û„ċVƒ„ULUºkÈlŎUxÆxÞUUxšÒ‚x„@XbšL@lÆ@„ÒlXVln@„bm¼ƒJ@„Ån„šƒx@bnšĠm„xVXmbÈè@ŽĊ£ČW˜w"],
+                    encodeOffsets: [[105210, 36349]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "6206",
+                  properties: {
+                    name: "武威市",
+                    cp: [103.0188, 38.1061],
+                    childNum: 4
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@±¯¥@klwU»ƒƒÞÝmwKm¯™™ç@™kVÇUL¯lVUKġ„ġm@a@U„@X£°l°LŎÇ@aōVÝw™ÔƒKUŽÅš„WJ¯lm@ÛVWa™@klĉUmaƒLUanaƒ™ƒk¯J„™™±KkXóÜÅxƒ²Ç‚@„„nUÒĊb°@™ÆkL™Ž™XÇÆ@xÝn—xWxţ„¯¤ƒI@Æn„ƒVV„VlU²Æè„V@x²x™L›ÒĉbŦ°Wb™Xklބš@l¤šXĊ`„wl@ĢÈŎm@bšnV‚Ubƒ„@șÆÛLƒèǚUÒŦlĸ™`°ĮʟÆǓbĉôϚĊƚĢnŤé΀ÑĸĀĊ¦„@@l°lœ¦Ȯ¦ɆÞĊKŤ™ĵĸů„»mŁyġ™ķŭ@Çɱȭ¯mƧUĊķnŁŻ»UaU™˜ƛɞÝƨů"],
+                    encodeOffsets: [[106336, 38543]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "6212",
+                  properties: {
+                    name: "陇南市",
+                    cp: [105.304, 33.5632],
+                    childNum: 9
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@šÈÞ@l`UmVƒ¼œŽ‚@nnÆwVlnVVa„LVƒÈ_‚ÿރ@n„a„xÆ@„lš_š@VxnK@llLnxmÈŎJnbUxšI°Žl@n¦‚lÈIlmX¥„k°@šk‚J„k²é˜@klaUaVaU@@ÝnIWnmnx‚k„ºÞ„„aV™°„V@nw‚KšxôbÞ£šVšU„bšþšLn»mƒVw„IšJ°Ž@„nb@°°I„ġUkÇKVƒ™™@ů»lƒ„Lnmƒ£@anK@Ñ܍n@»mL@£™yk„UUmbUÞÝ@kyÇbó»™XUxƒWVzb±mÝbXaƒwUamL¯»@wUKVwm¯ĵJ°ÅUWVk„KVk°wÈVšVуlUšƒ¥škmVamknƒUw¯¯ƒbċ¥ÅKƒk™Kk„™VċVk£kKVw‚Ñ„a@kóyÛ¯ÇVk™ów›š—Xō¥Ç¼ów™Ž¯U±‚k„ƒ@x›IĉÒÅVmÈnšÜ@n°„bUbÝV‚ŽUnnJ¯Į@‚m¦nV܃@„„L°JXb‚Ñ@šaÈb@šllôLVb—b@lmnVxk°ċ¦U°™Ž@xX@xWbš°UVÇn¯Ò¯Jɛƈmxl@¼"],
+                    encodeOffsets: [[106527, 34943]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "6210",
+                  properties: {
+                    name: "庆阳市",
+                    cp: [107.5342, 36.2],
+                    childNum: 8
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@kw‚ĉ—»VamƒƒV¯wƒIóVkl¯™Km™Vō¯ÝWkL@bÝKō¦@Ž™„@š™Lx›@b@l™a@km@@l¯nm@UaÅ@ƒ„óWUXm¥™nƒw`@UUxķôÇ°ğ¦@„VJš_n‚‚IVŽnalxkX„JWn¯šnVƒLšxl¤nnVbklVX@xnxmV@bUK@nm@@xƒV—°±aÅnƒŽkUWnUaƒx@m™n@ƒ¯LƒššmUĀlU@lV@blLUblxklkIÇx¯°‚UXbšaVŽUnšV@°‚LUlnbšX@`°nVmbnÆmV‚kLmK™¦UŽ@X„y@kl@U„°K@¼XbW„ƒš@b„WnLVa„VšƒVz@xlVČ¥lbUxލlV„U@nÆWôn²™VJlU„Ƨ„LnmÜLXa˜n@mœw@wlUlV²mšblwšVȃlLލ„±@lVnUlxnkma@mškšJ@kXV‚U@mn@š¼VXUƒVƒlLnmVbôaVnWV»ÈUl°È¯ÆIn›ÆU@kk»mKkÆġk¯@»mƒk—¯@óÇlÇ@—Vykkl™Uml¯Þ™@w"],
+                    encodeOffsets: [[111229, 36383]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "6204",
+                  properties: {
+                    name: "白银市",
+                    cp: [104.8645, 36.5076],
+                    childNum: 6
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@VKUȚl@šè°šnŽ‚LnxÝބ„V¼kx@l‚¦²°ĊóĠ„™Ċ»š@ÈxšaĊxlwÈVŤa@¯²aÇ£ƒJk£lƒnUÞ@°šô™@y„wl»lIX¥Ǫnw@ÑÞWla„ÅlL@ƒUwĉakƒl@ƒš¯mwna°J„V¯nUVÓÞÑm£²óWaUƒÇ@óÝUçV»ÈkkW@¯‚xV@XlK@wX@Vmm_@wÈݙKU¯ÇwVwÅK¯VƒkƒJ™™™XkWVaƒImŽ¯Uk„ÇlVšœĀV°mxóšk„@¼ó„WxĉÜU@Ub‚zÛJÇk@‚ÆnVlԙ@kŽ„x™ô@ĬWL¯ƒƒK@aÛImm™@ƒIUaƒ@™™UŽÇêU¤VÒÇx¯ÒV„šš™lk@Wbĉ¦UbkWV_‚y¯Lƒaó„kŽ@b@nmbkx„°"],
+                    encodeOffsets: [[106077, 37885]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "6211",
+                  properties: {
+                    name: "定西市",
+                    cp: [104.5569, 35.0848],
+                    childNum: 7
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@„a‚V²wVJV_@„LlanÅllŦçÜӚ_šlnƒWaôk„xUš„bmV@È°lèšnk°l¦„`@nnL‚@ÈlÜIyVaV@ĊÛXwôƒ@»lƒô™nwU¯›ÿU™Èklƒ°Vn„JUblXšWšš„I„l°U„ƒVƒš—@aVVVmnL@„lƒ„UUw‚mkƒš£„bV¥VUVwۂƒlaÇÝރmk£ƒLUy¯L@WlkKW_XaWƒ—mƒ„ġU@a™k™‚ƒakXkmVwmŹVƒU™b™WƒónmwnWW£„KÈnV¥ƒ¥„ƒÆ_k™lW„bU¯„V°aôbnaVwmaōInÇmwkK@kmLUw™@™`ƒkÅ@ƒwƒb@m݄ĀÇ`U„ƒKUbmUUkÅxmm@›„»nUVk_Ý@™Ç™¦™VÇè¯b™aƒn™@@„„JV„°Žn„U¦™°ÆbXxWl„êƒxš„ĊaœbW`™zV°œ„@lmbÅx@bmV™bƒI™`™¦@ÒUVUI@ƃL@bš¼@ššŽ@„šlmxnL„°ULƒŽƒÞğޛ°kLUŽƒL™°™xVŽ„n„KVƒl@šzX@"],
+                    encodeOffsets: [[106122, 36794]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "6205",
+                  properties: {
+                    name: "天水市",
+                    cp: [105.6445, 34.6289],
+                    childNum: 6
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@UyȍVƒVUnn@ƒVU„`UblzšJnk‚@Vb„KU„°l„wš„„W°„nkVŽ‚UÈlš£°V@n¥šV„kl™kU˜±U„ƒn™ƒlw¯UkwmKUlmkUmnkym@ō@U„mWÈU°l°anlJškUKlU„¯Èm@kmWV»kkÝLUWUx±b™@¯ma@ƒ¯™IƒJUxn„m¼™K™ýƒa™V™Uݤóa™wLmxU@¯ƒUšƒb݃ƒ¹lmwmnXŽmJ@ÞV@UbVbkblŽ—@±êƒlI™l¯@ƒlW¦knÇJkm¥k@¯™Jmbóa¯bƒUV°ƒakXlšÅ`ƒ„„¦U¦ÇmƒLX¤mXnxm‚„ôšXša„VźUnŽUxlnlW„bššl@bĢV„ƒ˜nX„WbX`lLXk@Ž°KVz„Kl¤„nÞ݂Èkb„‚܁"],
+                    encodeOffsets: [[108180, 35984]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "6201",
+                  properties: {
+                    name: "兰州市",
+                    cp: [103.5901, 36.3043],
+                    childNum: 5
+                  },
+                  geometry: {
+                    type: "MultiPolygon",
+                    coordinates: [["@@lW²LššƒŽ°I„l„šmbVb„KnbĊVlkš@XbÜU@Žkn°‚XIƒÆ™V„LšÓÞxŎUlôƒ„b°KzU`lXVaĊ¥Xal@šk™™Uƒ°ÑÈwUтV£ÈéVšš„@Vb„Jš@nnÜJ@b„L°„XK@īšóƒwlš@kÓmUÅmK@mƒ_k¥l¯™mkçǯ@nUƒaV™ƒwólXbm„™k™`ÛÔťèkkmÆkbƒK@U`UI±xUƒbWlX„mbVbÅÒólkƒƒIWJkšƒ@ƒz—KŻ¼™@™xUx󎃄¯LWb@ŽÅ҄„±¦U`nbťĀUšVb„LšŽ„U"], ["@@ƒ¯lwna@mōȯK¯kW¤ƒ@@V@bĢnĢƒVLU‚°k"]],
+                    encodeOffsets: [[[105188, 37649]], [[106077, 37885]]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "6208",
+                  properties: {
+                    name: "平凉市",
+                    cp: [107.0728, 35.321],
+                    childNum: 7
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ÆLUxÈxV°šLÇÞ@xn`Ü@X@nĊŽÆwnJmwUx‚aUkšw@V@w„aVmlLXÝl@X‚VĢmV°@nl@UUUWK@w„ÿVI²Òlmš@nÝĊýVV@nšJ°„„šUłm@kV¼nK›ĢȤôK„blnKllVk²aĠ¥È¯ĸóVw@V‚_„xšmn¦VWôX„ƒÆ@Vbn@°m@kn@@lšb@k‚aœ@‚wšK@™šƒ@UlKVaƒWX™W²¹lӄw@_°›n@@_lKōķW™@ŽmLUWƒn™»Û@›l_Ç`ƒÛmm°ÅbWb@š—VWbƒUUKDŽÅaġlmkUġlƒ»—Lƒl™Um¦@Ž¯U™¤ÇkVUml¯ƒƒX™ƒƒx¯kVƒƒLUa@ml™IkyVaƒ_UV@„mmUVU„ÇŽVzUxUVU¦ƒa™¤l„nVxƒVk„@ƒmKUnUU@b™˜U„ƒ„", "@@@Žż@™mlkƒġk"],
+                    encodeOffsets: [[107877, 36338], [108439, 36265]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "6229",
+                  properties: {
+                    name: "临夏回族自治州",
+                    cp: [103.2715, 35.5737],
+                    childNum: 8
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@š@ż»˜L„y„@l™XI„Jl„ôkÆÑUanaWƒXkW@™yk@U„ƒLƒmUšwš¯„KVlKœ¯Ġ݄݄VKƒ¯mKnw™k@ƒ™@™™»@a„K@ÅVJVU@њ¥š_Uy¯š@£UKmn@‚ƒšó¼ğ¦WmĵXݎkŽVLmVĉU¯bm„ÝV—wWlXÞW¦™xkmmL™šÝŽœ„±U@Vގ™š@„ÅÈW°X„ܼƨyUĮnŽWŽnXÝxUx°lVXJlôV"],
+                    encodeOffsets: [[105548, 37075]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "6203",
+                  properties: {
+                    name: "金昌市",
+                    cp: [102.074, 38.5126],
+                    childNum: 2
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@šĢȼ™„Çł°bœU°šV‚ƒń‚ÆǖŰnšÆ„ōĬǔaʠůĭš_kķÆ¥VÑș„çÜKšÅ@DŽƒVaU™m@aōnġÇk@ƒxĉ_™Wk£™@݃±KÈ±aÅnƒ@ƒÝxƒ@kw›lkwōL¯wm`"],
+                    encodeOffsets: [[103849, 38970]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "6202",
+                  properties: {
+                    name: "嘉峪关市",
+                    cp: [98.1738, 39.8035],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@llĊx„¦šl™¦š„kVVnšJVbǖV„kôV˜a„bnaWw„UXmmamUXkWKō¯Xm°™™»ĉÇ@UVƒK™ķkǼğb"],
+                    encodeOffsets: [[100182, 40664]]
+                  }
+                }],
+              UTF8Encoding: !0
+            }
+          }),
+      i("echarts/util/mapData/geoJson/guang_dong_geo", [],
+          function() {
+            return {
+              type: "FeatureCollection",
+              features: [{
+                type: "Feature",
+                id: "4418",
+                properties: {
+                  name: "清远市",
+                  cp: [112.9175, 24.3292],
+                  childNum: 8
+                },
+                geometry: {
+                  type: "Polygon",
+                  coordinates: ["@@lǯkÿƒaV¯™VaÈU„¥ÆDŽIlxšmnb‚Uœxl™„Uôl°kš„„Wl„š@ô™VwUanUl@„xVkšaX¥‚kU»„aš¯±@kka@ƒUwmUkwƒJk™˜„±k@ƒ™™L@ÝWUwV݃—xÇU¯ŽÇX@m™Åƒ@@yĉ£VmUwȗ»ÇšUn„lUnWU¯`Ukƒ@@„™x„Ž@bÇxX¼ƒVVš¯LšĀk‚ÝLƒ„¯@VŽƒĀ¯lnĊW¦kVÇôkUDŽUK@ţ™U@a™™ó܃UU»ƒ@™¦k@Vx„KVb„n‚š@„Æ™„l„@xšƒbWšnlU„lxÈlV„È°Æ„@¼™„@x„šWxœŎ‚V„šK°„š¥ššnƒÆkŎ@ÈÑm™„K@¥šk@™ô@„nôV"],
+                  encodeOffsets: [[115707, 25527]]
+                }
+              },
+                {
+                  type: "Feature",
+                  id: "4402",
+                  properties: {
+                    name: "韶关市",
+                    cp: [113.7964, 24.7028],
+                    childNum: 8
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@W™Xk±Ñ@ƒUw™mUwĉwlmn@Æwn£mkIš¥ÇÅ@¥šaƒón£nWWwš£V`Þ@šnVml@xô¼„IV¥ƒkUmkamUkVWwÛ»móƒ£UVÅKmn@x™@kbmm¯a™Xka›VĉaUb݃ƒ²—‚lš„IlxnVVx@„lb@l²™°ƒbV¼lW¦™bUlƒwk@mVVbUxóš™@kƒƒX™ƒ¯lókƒVkš›wVma™nkwƒJÅȃ¦ÇVUbšŽU°„blĀ°ŽkÈ@x™¦Æܙ°@„°„¦óa™VUôlUlbXl@nÜV„„nKlŽnIVÞ°Wš„°U@bnm@¥šIVƒ²Ulƒ°VnalzXyl_Vyƒ¦lƒœLlxš„@ŽÞbšKm„knVWanwƒÑVwČº˜@n_ÞV„aVŽÜIœl@„˜KȚ„VJ@aš£È@˜™@km™„aV¯W@_ƒa¯KmbkÇkLmwƒ@Å¥"],
+                    encodeOffsets: [[117147, 25549]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4408",
+                  properties: {
+                    name: "湛江市",
+                    cp: [110.3577, 20.9894],
+                    childNum: 6
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@@ƒkXƒ™@a„UUċlk„Jƒk„™@wVJXUWk°W@nKnwlUlš²ƒ„blU@‚lI„l@„XbW„šxnm@lW@w„wU‚JX¯VU°`ŎóˋkÝÝkÅ@ÇmğÈřmw™aĵV›xUہ»°™ĠǷnýmóX¥ɅĵҏÇ@°²ĊUĖ±ĮU¤Ç°™Ā¯ɐnżUĊĊĬV@脎@ԃÒU¼l¤nƒĠb„êVĠ°Èy„zVaV‚nUÆL„ašbVl„wÆ@"],
+                    encodeOffsets: [[113040, 22416]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4414",
+                  properties: {
+                    name: "梅州市",
+                    cp: [116.1255, 24.1534],
+                    childNum: 8
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@„‚nԚlW¼x‚¦@lœVl™lLkè„a@zš¤ƒĖ„¼UxlnUKUbÝlU¼lb@„Vx„V„klJÈwV¯š@ĠlÛĖšnƒbkšÆźÞƒUÈôklmšL„¥‚LœW˜„„™nKUkVa°V„x@IVV@x°bUk„a™a@mV@„@y„w‚L„ÑUwVUšV„‚„U‚bÞVVann‚@XwÇÿš¯²aVamkXaÆ»@»nw@¥›UXaƒkbWa¯KUw@¥m@kwmLU»UU™J@kmU@UUWUƒ@ƒyƒanwmçÛl¯ƒŽ¯UƒmKUmƒwVkmÝXbW@XWÝbƒk¯@±‚w@»U@W¯Å@ƒÇ¥UƒU@ƒƒ™IU™ƒakJƒĀ„ꃰšþƒXkamŽ@Žƒ_J°m‚@X"],
+                    encodeOffsets: [[118125, 24419]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4416",
+                  properties: {
+                    name: "河源市",
+                    cp: [114.917, 23.9722],
+                    childNum: 6
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@°VlmX¹laĢÒlm„@„„šVš£‚‚@¦Ģklynn¼lW°z„W„„°VbÈV@lÆbnn‚JškX„šVÆašÅ„W@™ƒUUw@ƒkaV»ÞkVaVLkmVwƒ»„ĕ™£@yƒblçkKkš›U@k¥‚wX»™kmӃ@Wn¯‚I„`@nlb„W™ý„¯ƒé„ÿlI@™XUmWUwƒ@@UJU„Ç„mKUV@x™„ţk¯¯LWƒƒnUxK@ű»Vwa¯š@¤WX@ŽÛ¦@¤ÇIȼWxXŽƒ@Wx—w›ŽUnVbÅèmVa±²UWl@Žk„lȄ¤nôܼXxlUnVlbVn„lU¦ƒJó»@wnkmU™‚Ý@U_™¤XxmXm¤„ô™b@¦Èƙ¦lJn"],
+                    encodeOffsets: [[117057, 25167]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4412",
+                  properties: {
+                    name: "肇庆市",
+                    cp: [112.1265, 23.5822],
+                    childNum: 7
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@l@š¥„@V¼„Vôۚš@bšV@ŤVLȃlVÈólUX¥mĉ°k„ÿU°@„ƒÞKl™ÿ°KU™„UW»Èw@aƒšw@ƒ„@nm@w›£kÓVUVn„Kš™k¥™£Vamƒ@nkKkbÆǫma—kmLU¥™UmƒÛwmVU™mUƒJ—ÇaUxÇIn`mb@Þ¯b@„nJ@nl„U‚V„lVU„L›W¯—Û`Ç_¯`mš¯I™bĉWċzx±J™xš¯ÆUƒƒ_k@™šƒJ@Umb„šXôlLš˜n¦@¼ĊxlUXŽ˜xUbL‚Ġ„UnVĊwlšUš„b@lW„X„‚m²˜@ÞWxXš‚Unb"],
+                    encodeOffsets: [[114627, 24818]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4413",
+                  properties: {
+                    name: "惠州市",
+                    cp: [114.6204, 23.1647],
+                    childNum: 4
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@lbšW°bnnlaš@@wnmÆLVUkÇlƒ@Xk‚V²±‚bnUÆçUaVmœ˜xXw„@WXwÇ»ÈJ@£Ü¥@XW@£°™‚bUx²¼@ƂLVw„mX„°K°Ťlšƒ@wVUnLȃVƒVIky±wkƒKU¯ƒÅkƒ™XġÑۃlwUwlm@m„nKWašÅm›¯óÇmğb¯alĉUwķbmb@lÞÒVn—šmĀŹ@VŽƒbVŽUnmakLm`@xĉkklVÔVJVn—lV„UnmJmaLUbl‚™zmŽkL™a™‚ō@@zš‚V¦UŽV²kJ„nÜU@˜VXUŽL@„lJƒL@bݤUnVŽ—b@xVnlK²„Vx°V„xlI„lkVl²k¤@n"],
+                    encodeOffsets: [[116776, 24492]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4409",
+                  properties: {
+                    name: "茂名市",
+                    cp: [111.0059, 22.0221],
+                    childNum: 5
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@‚LnÇlk„KnkÆL„ƒUm™ÈxlUœJló°n@ššanŽš„„a@ƒ˜@X_@mÝóóU@a™aU¯mL¯ƒƒkV¯™ÇVwkw@V±Ŏ£@™™@šalw±Vk@m„Åm¯™ÿŃƧIÇ`ōô¯_UVW°IV‚ƒx@xkX@Žmn™wXƒWa@ƒƒkkJ@kVƒa±„k™kVmxmL@‚¯XXlWVUI@xƒš„lƒIklVȃV@b„šlW@„@nUxVblVxkôlx™n„‚y„šnIƻư„aXwlK„bVnƒŽXb‚L„¤„k‚L—èƒVV¼ƒŽ²IlĠVX„ynz°KVx°@VlœLlblKœš"],
+                    encodeOffsets: [[113761, 23237]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4407",
+                  properties: {
+                    name: "江门市",
+                    cp: [112.6318, 22.1484],
+                    childNum: 5
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@lUXx°JWnnƚXVš„W„X@„šºVLV¯nU‚Vnb™ô„x‚aXmW™XIšŽUb°xlK„l¯œK˜xXÞ°ŽšXÈ¥Ü@„ĉޏU™‚çš»nóƒVma—x‚¯UÅU¥Ý¯@ƒƒç@ș@çĉÅUmU籃ĉKÝxÝ_ÅJƒk¯»ó¯nmèkǀšŽWxœ¼mnUÜġ°@¦@ƒxƒLkŽÇaVnUxV„™šVlnIlbnÆÆKX¦"],
+                    encodeOffsets: [[114852, 22928]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4417",
+                  properties: {
+                    name: "阳江市",
+                    cp: [111.8298, 22.0715],
+                    childNum: 4
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@°„nKV°šb@bôVÞô@n„VlÒôÆUnlnn@lmkmVkƒaÈkÆƄ™k¥‚ÅÞ»ÆKXkW¥ÅLmÅkamJUkš™UƒVwUmÈbl„K„w‚@@¥Ģ¯VÛnm›»Xw™lƿ™@kbW™—aʵ@óL›l¯ƽ@™ƒƒLn°ƒÆ@nUl‚²kx™b@‚š@šō¤U²@ŽlxUxšÈU°lŽ„"],
+                    encodeOffsets: [[114053, 22782]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4453",
+                  properties: {
+                    name: "云浮市",
+                    cp: [111.7859, 22.8516],
+                    childNum: 5
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@@V„Iš™l@„`V„°Å™šw²I‚wČyĊXša°Jn™°_È`Ü_°˜œX‚KVƒkUUƒVkƒ@mmI@ƒ°a@Ýnam_ÈJVwlĉX@„šlUšómaUmVU°UK™¹@ƒƒWƒXU™™WmÅXm¯IWwkVWlÅLݼÆl¦ƒšÅÅÇl„bUllnknm@kmVmóÅkуUW`—@@„ƒb™ƒm™b@™¯mkô›IkVÇwnš„VƒÅKmlƒLklmȁKƒšVĊK°²„`n˜¤n„U„bWl„xVx™LUx@°nXm`VklVxmnnx"],
+                    encodeOffsets: [[114053, 23873]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4401",
+                  properties: {
+                    name: "广州市",
+                    cp: [113.5107, 23.2196],
+                    childNum: 13
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@Ș¼VxUnĊ¤@z„@šÆ@nÈW°ÈV˜w„ŽUÞVxÞX@ŽšK„šl@ބVaĊbœU@ml£k±lUƒkkJƒw¯UUw±ƒkLUm@w˜aUVmÞ£@a„KkI@ƒ‚KVUW@—ÛVƒmlIU±VU¥™@yğzƧǃƒšƽĠřšÅnī±m@ƒ²¯lƒ°@nÝÆóUll@XnÝVU¦mVV°—„V¼™Jƒn„b@°mbn„ƒ‚@²¯‚¯wVwƒ@@nmxX¤¯L@ŽVLU„m@@l"],
+                    encodeOffsets: [[115673, 24019]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4415",
+                  properties: {
+                    name: "汕尾市",
+                    cp: [115.5762, 23.0438],
+                    childNum: 4
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@@‚„@VxnXWV@š„bVššJ„„V@ÞÅU¥Ċxš£UWU‚wÅUU¥WVUkĊÇnkV`°LV™„wƒƒnU@™„ƒlbĊ¯„Vnalšš@@çkUÝ¥ġaó¯ÅaÅLŻÆUýmy¯ó@ĉÆó„ȯw™ÆXbmLƒ‚@nknVxkx܄ĢҚW„Æl„V°„Ll‚²xlz"],
+                    encodeOffsets: [[118193, 23806]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4452",
+                  properties: {
+                    name: "揭阳市",
+                    cp: [116.1255, 23.313],
+                    childNum: 5
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@V„Ȧ„Æ@X°V@@¼‚x²°@„lÞaWXX@‚aÞWlnUŽ„xVnnL„‚°V„@k‚mĢl@„ak™@mlk°aXƒ±„nwm±™²¯JV²@ƒwW˜—_mƒa„V»ƒU@m¯ĉUф™šJl™„ašbVn„lĸLlƅÛDZwÝ@ĉxó@è™@k™mbƒUĉ°kaƒ„@šmV„„ƒxUš¯KU_mlĉÈVlXUV¦ÆVxVŽVX™¤ĉwV¦ÝÆ"],
+                    encodeOffsets: [[118384, 24036]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4404",
+                  properties: {
+                    name: "珠海市",
+                    cp: [113.7305, 22.1155],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@„è@„Þ°V¦VƁ°˜wnb„UÆ»nçƏ@nxܤ²llU°VnÈJސ°UôéšķUklƒô£VVˌKÞV°£n¥ƒ£ȗ™Ýy¯¯mÅkw¯bÇĔğ@Ýn¯ĊƒVğōŁŻƒķJ@Ț", "@@X¯kmèVbnJ‚™"],
+                    encodeOffsets: [[115774, 22602], [116325, 22697]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4406",
+                  properties: {
+                    name: "佛山市",
+                    cp: [112.8955, 23.1097],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@Èb˜Ž„InVVšnUÜxn„šVV¦nK˜lnbÅǬlalL@mn„Ubš¤l¦™šƒLUmUVlԜ¤@xmnVl°_XVVmƒkVmș@kn@VƒUK@°KW£nw@m„@Ux°x°@±„mƒna@¯ƒa„mšIU»˜ƒU¯nUV¥ÞUWmk@Vk¯™Ukn›ÑWݐƒĊÛ@Ǧ™W¯Wݗw›Lk°ƒkL¯wVa™WJXšWnbƒwkVƒ™W@kĊ"],
+                    encodeOffsets: [[115088, 23316]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4451",
+                  properties: {
+                    name: "潮州市",
+                    cp: [116.7847, 23.8293],
+                    childNum: 3
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@°ŽÜknèmx„b„z„@V‚VX@VnV@lšIVVV¼nKlxn@@¦Vx°LXbla„ŽWbœV°£¯™W@nW@™‚aUñVœwWš»@¥ŤÅUÝǓÝóV@ńǎkUVmƒIUwÅVWÇX¹›—@W„¯bkl@nlšƒb@‚kġŽn@l"],
+                    encodeOffsets: [[119161, 24306]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4405",
+                  properties: {
+                    name: "汕头市",
+                    cp: [117.1692, 23.3405],
+                    childNum: 2
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@‚@U±°Iš±n²mx²ƒ˜@œWºXÈÆUVx„JUnlVȍ@ŃôUǔÞVçn»VyĢÛVm@»kaÝUǼóšÛÈķKċ¥X„¥Wwğk™ƒ¯@ƒwķKƒkUm™aƒbkš™IƒšVÒ°Ċ@n„VU¼ƒ‚„bn˜`X—„x"],
+                    encodeOffsets: [[119251, 24059]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4403",
+                  properties: {
+                    name: "深圳市",
+                    cp: [114.5435, 22.5439],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ÞLš„@xšbV„šVšK°™X°Kô¥Vw@anU„胐š‚lkĊl@wn_lKnbVmU„aUź@nÿ˜™UmÝѯUƒbk„@ÆkxŻ@™aÇX—wƒJƒƒ¯LķÝUĕ™ó™ĸóêWº@b²nmĬ™Æ"],
+                    encodeOffsets: [[116404, 23265]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4419",
+                  properties: {
+                    name: "东莞市",
+                    cp: [113.8953, 22.901],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@Ŏ@ššblKnšykVa‚KnbnIVmUƒ˜kUmUIUә„ƒçmV@bUxó¦¯LW‚¯š™L™UUƒ™a@w™ƒÝKğŚ™ƾ„„ƨÈĠy"],
+                    encodeOffsets: [[116573, 23670]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4420",
+                  properties: {
+                    name: "中山市",
+                    cp: [113.4229, 22.478],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@‚XœÒlmšV°ôÞÅ@m„¯°k„±‚@@aX¹¯VݏÇIUmV¯kk‚±Û£mw@‚Őmèżmô™¼èVš"],
+                    encodeOffsets: [[115887, 23209]]
+                  }
+                }],
+              UTF8Encoding: !0
+            }
+          }),
+      i("echarts/util/mapData/geoJson/guang_xi_geo", [],
+          function() {
+            return {
+              type: "FeatureCollection",
+              features: [{
+                type: "Feature",
+                id: "4510",
+                properties: {
+                  name: "百色市",
+                  cp: [106.6003, 23.9227],
+                  childNum: 12
+                },
+                geometry: {
+                  type: "Polygon",
+                  coordinates: ["@@lklWXL@VšI‚l@XnJn@VUUalk@mK@kny@UlU@a°™„ƒUU@VmaU@Ua@UWw@ƒn@KmLm@alkšmnI‚m@an@VIUamWÅImwU@@a@K„X@JVL„UVmUaVkUa@m„@@Ulmkk°ƒUaVUlKXbVwVIkaVmUk@KVk@a„aW¯m@w„¥laœX@KmaškVmnUl@nxVKšInU@yVaVIV@na°KlxX@@_lmXšUV`VIV™V@„n@lšbn@@WUkValK@²yl@„„VUV@@K°L@KU@@UVaXIVVV@naVkVa@K@UUK@UUa™LWa—w@m@K@UVVƒ@mVUUVKnL„mVL„K‚bVK@UUIk›mI@mUIVK@IUK@VkLƒ@WU@mU@WmUk@ƒI@VƒJk@WwX_@amK@UUWkIƒ„ƒK@LVb@mVmakL@J@bU@Ux@xƒbmI@`ƒIwm@UbmKUaUWa¯UkJWV@XƒJUU¯LUmV@ma@kkamKwƒLUUmWVkkm@aVUUkVKnVVUmXK@UW@km@Ukkm@@W@U™kUy@I@aUUmbƒ¤U@kUmL@bmJU@Ua@wkLWWkL@Uƒ@VaU@ƒLUakKWbkUWVkKkLVLUV@JVbƒz@Vƒ„@ƒVmUU@kVmK¯@VƒU_™VWakVmIUKUaU@@bml@XU@@V@LmKUV„mVUKƒƒKƒbkaUXƒKUL@x@V@l@„mxU¦„V@ŽlL@V@Ln@@VV@„nlKUaV@nLUbmJnL@VWLkbmV„@@L„W‚„XLlx„VVIVV@x@V²blUVm„LVUœK@kWWXUlV@Xl`„LX„l@@VšŽƒn@VnbVš@lVUVUÈVbš@@`UXU`l@@XUVm@kš@xmVknUJVXUbmKULmbx@VlJ@LVbkKUbVLÇUUVƒUVmU@VaUkUKƒVUwmLkUUVVlƒbka™XmwƒKUšVVU@@V±Uk@VWUUm»XamU™bƒKk™`ƒ„™U@UnWW_kKmbUVUVmnUV@„nJVUlšUbU@UV@n@JmI@VmbnVUXlx¯ŽkKmnVV@L@V™bkV™Umm™@Ub¯LmlUƒL@VWLkmkLmmn£WmnKU_mW™š™bnbmxƒ@U¦UJU„@Xmlk¦@‚mnUUm@@Jn@lV„ÔVJnIVW„I@a„ƒÆK@I@aVK„IlŽÞnnl@nl`nbÆX²l@xV„@llbVn²ŽVVl@nn„V@IlW@Un@@kVa°KšnÈmVaVXUlaVƒÈU„VlwôUlynIVašan@lVXb‚Iš@n¥la@Kš_n‚@bÆx@XnJV„nKVz@`VXVšU`@bƒ¦UV@VšIlx„UnV‚K„XÈbšVllšbVbnVn@"],
+                  encodeOffsets: [[109126, 25684]]
+                }
+              },
+                {
+                  type: "Feature",
+                  id: "4512",
+                  properties: {
+                    name: "河池市",
+                    cp: [107.8638, 24.5819],
+                    childNum: 11
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@lLVl„bVV@nXVlI@JVX„mšn„W°b„IVV@‚ln„@nalVUb„nW‚@kVkÒlbVKn²°bUŽlV²@˜X@`nb„aUI@ƒ°wlU@aXJVI@aVK@wUamIXm‚@XUV@@bV@Vm„ImnUUwVaVKXU‚nVK@akƒVwV@nL@UV`n@@X‚lnIUJl@X¦˜V@aUIVm@anƒV@UwnL@VlbVL@KVVXUWƒ„wUUVUka@UVJnUlbnalbVVn@°„„LV`Þ@šXVxV@@bVlUVVbXnWlXnmlš@XXWVXJmbUI@V„llUVkn@@VWV@Vnb„@VXUJVnn`lLVk„a„»lVšLnw@WV@lInw@WnU@U@m‚knUVó„K‚wUmUXUƒU@@wVJVIl@XKVVVbVI„J@Un@lŽVLnm„b@U@Ul@nUš°VUVJnnVJV@„@mVU@ƒ@wkUVwkKWk™yUUkU@alkÈ@lJ@x„Ilƒ@UUWVkUw@Kn@@kmaƒVUl™UUL™ÇƒUUKl@UUmL@aXU@mlUUwmKkUUVKVUƒaƒKUnK@U@Vl@XUWU„KlwX@šb@K‚@XkV@UwWJka@aUwmV@U™@@U@wUm@»kLWVkIWŽXnmV@VkbmKƒLUbk™Va@aƒa@@aVU@aVak£@ƒ±UkVU¯V™UUƒJVƒUIƒ@kxmUmWUbL›w@K@aU@@aVU@Kma@aka@_VWkk@UWVUKULWKULUš@KUnƒwVaUKƒxU@UmaƒL—m@kVmVa@UkƒmI@ƒ@KmIkxU@@K™U@mmakI@VƒLkmWkkJ™_U‚@V@L@n˜xXbšKVb@VVL@V@LUbUlmbU@UUWJUb@VV@@L¯K@LU@UVƒƒk@±z@‚kLUbVl@Xm@™akm@ƒU@UšUJU_™VWŽkn@`W@kw¯LmbU@UJUb@zmV™JULmwk@mVUn™lnb@L›Wkbƒ¦@x°nXŽƒb@bUl@LVlUnlbUJUxWakLUVVb¯„llkn@Vƒ@@nVbUlVbUnƒVUK@IƒW@L@bV@nxÆJnXVbUJm@@bnmJ™nkl@b‚nnK@L„m‚@Xx@VVbV@nb@UVVƒ„¯š@bkV@Vmz@lnLl@kŽVbUVm@mI@Wk™J@UWKkXkl"],
+                    encodeOffsets: [[109126, 25684]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4503",
+                  properties: {
+                    name: "桂林市",
+                    cp: [110.5554, 25.318],
+                    childNum: 13
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@nU@J‚X@`XLm¦Vb`lšVXXWš@VblČnVšŽlanLnmVLšK@_Vaƒ¥@kUa„@VmVb„aV@XVVzlVVK@knKVmX£VKšLlbnš@b@llL@xĊôXaV@°È@¤„bn„V@@Wl_„V„U@W„nVamw„wVbn@„K‚VšLX@VmVUxlV@šnVV_nK@m‚I@Wn@@IšUĊ@@wVWX@@I°VVm@wmU@m@IUƒV™kƒlkUmmkÅV@@aV@@Wn_UKla@kšaV„šlVanb@k„@@KlVn@@aV@nIWW™UUaVU@™kKmwU@UImKk@UU@w@W@‚™k@™UkWƒ@mk_W@Ua@a™ƒƒ@—¯ƒmV£@mƒUUam@—kWakƒVama@UUm@nw@alaUmnUlVlIœV‚™šLVyk£Vm@k@UUJkƒK@kmKUw™KkWK@UXImyVwnI@m‚ƒkUlkUKkUVmƒw@kkJWUÈm@_k@@aƒaW@U„UJUwU@@IWKkƒmUUV@nVl@bVb@bU‚UXƒakw@ƒWUkbkKƒbm@™xUlkLm@@wmKUX@‚™UaVW™XVmU@@UUUƒxkmWXkKkUWaUaUb™L@`UL@LV`UXmK@VmakLVbkL‚xUJUIVbUVVb¯KƒV@Xnl@lVXbmÒnV@L@VWKkVUIWJkIƒŽUamUUbm@U„kU@JUbW@X„WxUam@kbVVUnUJmUUV@bƒU@UUV™@ƒVk@ƒbƒmULV¦U@V„U`VLUL@xVbn@UJ@nWJXXVŽVV@bkxVbUx‚Lšš@x„¦@šU‚lXUVVlULV@@šnŽU„ƒb@xl„nJVnlVknUlVUbmŽU@ƒbVš„x"],
+                    encodeOffsets: [[112399, 26500]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4501",
+                  properties: {
+                    name: "南宁市",
+                    cp: [108.479, 23.1152],
+                    childNum: 7
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@lKnbnU‚@Ua@K„L„ƒlJVX@VnL@bW`Xxl@„I@U„Jl@nV@X‚V@nXV„@lK@UVL@JULVJ@nnJlœVJ@VULaƒLUKƒnmKULVVUŽ@nU„š`lIXlln„K@UlJnb@nšV@LV@lwnJ@L@„nJl„@VUbUn@l˜n„KnbVŽV@„wVLUb„xVm@LV™VKXLVKVLXU@VllUX@`lb@bnb‚L@ŽUV@bV@@b@Lœx‚KVanXVƒUUmVUUUaVUky‚UUa„ImK@mUUVUkKU_@W@UVVVIUW„UVaVU@UUKnƒ@k@al@ll@bnL@b„VUV˜X@Vœ@@b‚Knblmn@V_@aUalL@a@akK@kVKUKlwUUnV¥VmU_VWVIVaX@Va„alńK@LVJnalL@LnK„wlVUw‚mX@VXšƒlLUVnblaUmVUVwXU@Wm¯Va@ÞKnw@w™mšk„»‚UVW²a@_mW@U@I„y„LVUUKW@@™„LX@VUV@@yVU@UV@nwUUmJka@IU@ƒmƒVkaW@UwUX@`ƒ@kLWUk@mƒkUUm@k‚UUWkUƒkWxk@@VƒK@nV@UVaƒUUJmIkVƒ@UamLUbkVmamLka™@ƒ‚kmL¯WI@wJmwƒx@akU@aUKmbkaW_nW@_U@Wm@a@wkwUKmƒk@ƒbkb›w@mKUkkU@J@bW@kVWz@bVUa›VUx@„ULkJWbXVVXƒ`@œmJUVU@@Lk@WbU@UJlnXlm„Vx@Ln@‚b@K„LX„WJUUW@kƒaUVUbmV@nnV@n@lVLƒVmLX‚mXkV±@kxÅL›šUbJWIÅJ@I‚mXalkUamKkškL±aVwKƒUU@mÞnbWJX„m„@lbmKULWUUVkaƒbnn@Vl@VVV@VƒbVbnLWLXJWxXLV@@VV"],
+                    encodeOffsets: [[109958, 23806]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4502",
+                  properties: {
+                    name: "柳州市",
+                    cp: [109.3799, 24.9774],
+                    childNum: 7
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ƒwU™„aV@nVaUVklmkUUmmIkƒ@w„aVƒm@™U@VKUkVUkWV@™ƒ¥@w™™KVwUalw@aUUUWWXI@mVIm@Ua@wVKUKV_UƒV@U¥VK„n„al@„Uš@VU@V„V@aVUnVVIVmUUlan@VbXwWƒX@Va@IlVVƒn@VanVVb„lJXIVJlUXL@U@KmUnÑWakU@mkƒJUI@mk™@wUmmUV@JXaWIXWmaUIƒJƒkk@W„nJ@„ƒaUak@›kkJ@kUKU_ƒ@myUóWUkm¥kUmL@KUKm@k_UmVa@ƒk@@UmU@mm_—JWIUVUŽWLUlbVUJÇVUIVwƒKUVk@mU@n@lUL@Km@@l@L™VƒzJmUU¤m@UbV²U`U@@¼Vn@x@Vš@@VnUVx@blbXIVxU@Wl@@L™aW@kxƒLXVWVk@@U@VmLVŽ„L„bUVULVV‚lnLVxkV@nWV@bnKVVk@VL„VšÈVKšVVk„Unb@lm@@LVxUlVX@Vk„ƒJ@wkIÇ@kl@blVVVšzXllLUxlV@x@„UV@nƒ‚U@UImmUIUV™¯mVk@@V@VƒamnUKkm@@VƒIUJUaUUWLk@UJUI@xV@V„VWVnxƒLUômVV„@VkVVVUnV@UVkL@VVV@bVxla@bkXVJVn„`nU@bƒb@bVL@VnJ@„l@šV„aU@@_lW@UUU@Unƒlll@XLl@@UX@°bVWVanLlknVV@VVX@VVƒnUŽVLmbXJ@nllXX@`VXƒlmaXVWk@Wkƒw—J@„VL@J‚bnU@bn@@bVKUnVJVIVVVL²a@bV@@Vl@nUVakalmš„UL@VUL@V‚a@mXl@nK@UlK„L@Vl@@nkllb@š„Vnn@‚šnV„™V°l„šVInwlKXxlU°Žn@@ƒ‚I@UnVlakUJWkUK@anUWK@_ÞJ@U"],
+                    encodeOffsets: [[112399, 26500]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4514",
+                  properties: {
+                    name: "崇左市",
+                    cp: [107.3364, 22.4725],
+                    childNum: 7
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@@JVzšl@V@Xn@ll@VlnX@@VWLnŽUVmUULVlUV@blnUlnXVV„K‚xnLlb@lnbU@Vn°KVV„I@WXUlI°VXb‚VVbnLVan@‚x„J@_nJ„a@wVwV@@a@IU@UU@WKXwWIXKmKUa„a@U‚UUUk@@Umm„albVUXVVKnL‚a@knƒWƒXImanÝV@„V‚LUx²blKl™nLVbklWbn@JÆIXJ‚IVaœ™ÆKlw²@lUnWWnK„UUK@k@mmU@mnUVaVU„b@lVXVXIWƒƒK@Lam@@KUwnƒWkkmVIV@Xal@@KV@VUnI@›„_UWWUkam@kkm@ka@mƒk@wkJWIUU@WXkW™XkWWLUUƒ@UakLƒW™XV±VIVWUU@anUWaUK@IU@Vak@@UUKWaƒ@m@ak@@wUkla@mUaUklakwVƒ¯¯@WWUkLkKmaƒ™kLUnV`UxWX@Jkn@bmlƒakkk@ƒb@l¯bm„ƒbJ›b@VXn„bVV@„ƒbƒJUkkKWVU@mœÛVUUW@UVUJWXkVkKmUL@WW@U„Vl@XXKW„XJ@XVlmbUxnnm@UlVnV@XVm¦VJb@šmLkKÇbXblVkn@l@bWnX`V@@IVV@ŽV„V°n@@_naÆVVbUVVbUJnzlVUl‚XkV@Vlx@X„VnxƒbƒKUK@b¯VVUV™L"],
+                    encodeOffsets: [[109227, 23440]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4513",
+                  properties: {
+                    name: "来宾市",
+                    cp: [109.7095, 23.8403],
+                    childNum: 6
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@nVlw„@VJU„„IVVUšV°lU²V@„l¤Ub@bUV@b‚@„b@bUblšVa„KnLla@UnUWmXlJXUlKV@V_U±Van@V£nV‚I„yšU@K@kn@@LVK@k@mnVl@VU„LUxVJÈUVIU‚aVkXKVVUXJ˜In`@nnV@Vl@@„UbVnl`n@VL@LnKlVn¦VlôXV‚nz„@V`VL@llIœll@Vb„b@ƒmIXƒl@„l„IVJnbWXXJWb@IU‚nVVn@xlš@nVJ„I@W„U°LUaVUUaVJVIwlKUalKnb@UnLVWU_@KVK@_šKVa„@VKU¯VLVKn@la„aUkU@maVU„J@k™@Um@XmbkyVaUIUU@KV@laVn@KXKWUkUk@ƒaW™UUVw@aXKmƒVaUUkšmIƒlUU@wUa™xUmmU™¯™U@WƒLUmVIUym@UVmUa@wmw@çm@aWLU„™JUIUamKmL@™aƒx¯¥ƒkU¥U@±„k„UVmKU_mJUbkKm„ƒLÅǙ_@WWUXUmaVUkK™„UWW@nVxkUƒxmL@KkKmbUI@KƒLkƃbUbW@UbUJUXV`UnU¦mŽVVkxVLUL@llL@b@bkKVb@bU`m@knmaL@a›@@U—WVUƒU@amK@akkk@@b@lm„VL@VUVUbƒVVXUJUU@V@XV`lLUVVV@nnLƒJVbVlzUVVbVVnUVVU„"],
+                    encodeOffsets: [[111083, 24599]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4509",
+                  properties: {
+                    name: "玉林市",
+                    cp: [110.2148, 22.3792],
+                    childNum: 6
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@VJUXVVXlWX@V™xVnX@@`ššULWŽUXÅbWK@mULUUmJ@n¯b@l@VULVx„x‚XU`VXXJVI„V@nm`@nUŽVXn@lWVn@b@Jn@nU@Lm`@Xn@WJƒ¦U@@VnL„lV@@Xl`nIlJnkVL„w@KVK@UšaVL@bVKX™lUUKVK@I„VšL„a@U@WšLUlVL@bU@@blb@VlbUxVbXUVJ@xVL„U„lV@VU„bVLnKl„XJ@L‚b@an@VanL@`VLšKV_UWl@U_„a@WVInlVUUUVm@I@W@wVakIWm@U@ƒXwlaVbnI@ƒm»Va@aXaVLšU„»@aVa@k™KkL@KmU@WƒzUK@wU@VWUUVUUKUa@mKmbUK@_nWVaUkVaUaVUVLXKVƒVUVmVI@UkKkLm`UkW@UwWW_„UaU@WakXmK@xUXƒJkƒUUWUk@Wl—mJ@km@@aUKzmyVk„a@kkWVUU¯lmU@@w‚kkmV@Vk@mÅIƒ‚Ukƒaƒ@Ub@m@UUU`mUbWaWmb™X™XKWIXUWm@љ@y@UkIUJUUWLUWƒL@UkVUxW@kaWbKWnXxW¦n„m`XLVlUbVbUx™I@JmLUKUb@VW@@bkL@b@VlU@xkš@L@lƒxXxWXX°V@VVVbUVV@UVVbULVnVJUb²b‚aUb@VVVVInlV@VnXaVUšlI„VUb"],
+                    encodeOffsets: [[112478, 22872]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4504",
+                  properties: {
+                    name: "梧州市",
+                    cp: [110.9949, 23.5052],
+                    childNum: 6
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@VbXblVlLXWln„wVV@VV@UnšWUXVbš‚@VWXa@kVK„UaVaVkšUlyX@Vaƒ—VmUwUaVU@UÈymI@aU°@š™nWV@VaVaw@IV@VmnLVK@kmmna@™„™VbVI@aV@XbW`U„„LUVVx„@VbUV@bl@VLXblJn¦lL„°°@n™@K@UlLnK„a°LWbnJ„¦UÒV„UllLlVnKnbWnn„V`„w‚@@Xa±™n™l@XKV_„WVkVa@kVyUa@wU£UW@UIVW‚@@a—wWaX_WKkVmUULmak@UJUI@±m»™—k@m»VyUIm™nmmwnkUmVaVIUn_mW@»Vk„@VwkmmUXa@IƒaVm—mƒ@Wm_U@mIUWóLmUk@laXmmkUK@UmKULUUmWULƒ@VakU™@Ub@bƒ¼™VUKWb@bUbn¼@„mJUakbWx@„@VXnlJUb@x@X@JUnVVUVmkUJ@XƒbV`k@VXU`™LUK@_mKUbm@@b@„U`@nlV@b„UnbVbn@@`VbUbVV¯bm@@mJXb@bVnUllVXUlbUl@LU¦VVmŽkLVb@b™l@V@XlK@V@nUJUz„°mŽwmLmlXbWVU@UUUlƒIU@VVmV@@¦‚bXbWxX„WlXVWL@LUmkbU@@LVVVJUblzna@WVnš@@lƒIUVnbV@Vlƒbkbm@ULUKV°ULƒ@"],
+                    encodeOffsets: [[112973, 24863]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4511",
+                  properties: {
+                    name: "贺州市",
+                    cp: [111.3135, 24.4006],
+                    childNum: 4
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@nL@xn@lKVkšwn@„alLlaXV@„lx„bVWV@aUa@aUk@mVUnVl„XL@JV@VxVIVƒX@„b@bl@@`ÇnXVlI@l„xUnlVVLkllV„@nmJUxnzWJ@VXLlŽšLVxnL@l„LlŽVI@V@lUnl¤Uz™Kš@„Vl@š„L‚l„Lnš‚b@VnVVU@k„a‚Knxn@VkVJ@ńUlakmWIUaVanm@_UK@UVWUa@klXam™U@Vmƒ™VIXW„@lUVknVlKVLXŽVXšW@b@VlšnnVL@KXL‚Kn@lb@UnW°@Va„X„WVb°aVa@I¯aUkUaVKVwƒaXk@a„a‚™@wkm@alanUVw@alK@Umkw@UƒaUmU@WXUaUK@UW@UaVWI@¥Xa@w@WWšVƒXwƒU@mKUXUWVU@a¯kl@akU@UULmK¯VUVW@U_m`U@@xVbUz@lUbUlƒXU`WLk@mš²šWb@Ž@ƒxU_mƒXmmamLkUkKVkUƒVу¥mIXa¯KƒbmLkK@V@Lmš¯@ƒ¯kKm¥kIWaUKk@@aVUUaƒ@UwVUƒKVƒX_WaU@@bUJUaƒš@šmbnn@lULmKUnU@@J‚xUbUbU@mX™š¯@VŽ@bnJÇz@VUVVbVxUn„˜UbW@kz™VUlUbVbƒŽUL@lWb"],
+                    encodeOffsets: [[113220, 24947]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4507",
+                  properties: {
+                    name: "钦州市",
+                    cp: [109.0283, 22.0935],
+                    childNum: 3
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@@IlVVlnL‚@œxla„al@n„VLlx@x@bXnV@@`mXX`lbnaVL@blV@b„wnx‚I@xXJ°nK‚l„š@lbnKnblUVanKVb„@lUnJVI„VUb@V‚U@m„L@Ul@Xw„llVVXV@lVnlVn„l@XVlK„@@_VWVxX@lb„U„nV@@JlbnIlmnVV@UwVK@U@k°a@mnIVVVK@nXLÆaVWXVK™™@_W@Umšw@UXWWkUUVWUIVaƒUkJ™UVWbUmU@mkUJUU@UVab±aVaUIUmVKUaVUU@VUUaUUU@W¯XWWw„w@k@Kl™@wkV@U@alK@aX@@UmIUWUIƒ@mmkXU`U_WJUnUJmUk@@amLU@UVW@UkU@@VƒbUWVUk@@wmKkUWLUWX@JmIƒlUkkKWKkLWU@UKWa@bU@@a@_UKWƒUUUmJmw@nV_@ġğKóLmbU¼VÆ@xUXƒ@Um@wklVnUn›lkaUV@„lV²WVklWXXbWlkVkIm`UUƒLƒUU@UWƒx@XU@@lWLU@kbUbV`UXllUV@bmb@LnKVbULm‚šnVVIV`X@"],
+                    encodeOffsets: [[110881, 22742]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4508",
+                  properties: {
+                    name: "贵港市",
+                    cp: [109.9402, 23.3459],
+                    childNum: 3
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@n@VzUJ‚nVŽ„K@XšVš°nVVnšwVb@xVV„knJl™VVUbn„WL@bUxVVXš„bl@lVXkWƒXwWaa@¥‚@nUUUV@„JVkVVV@XUWanknK‚xnƒ¯VyVI@m@UkL@W@Ušk@aUalKnUUV¥@KVkkaWVkUVkUm@aWanI@n@°aUUVaUa@_m@UamaƒV@akU@mV_@ƒa@KWIkƒmLUKƒaUVU@ƒkƒVUK@wUIWVUaVwka@Uka@aV@@aUKVk™K@X@Vƒb™KƒU@JULVLkVWšUL@aUK™b@VUL@LƒxUKmlkImJk_@WU@ƒkmK@UV@„¥XIm@@Wn_@KmVm@@I@aUmkXm@UWV@mn_@mƒUUJWIUWV_WƒwU@mUknVVmxU@@VUV@zU@UVW@ƒK@šX@VLUVƒKƒz@J@VnX@`±bUXVƒ¼™lšn@xmxÝL@‚Ubn°@XWVUxUVVnkbWVXV@Xš`ÆȄKnƒlLVanIV`nLVUlƒ²ƒV@V¦„l°¦„w‚b@šnKnLVbVJšIVƒXK@b‚n@ènx@xVbUnV‚"],
+                    encodeOffsets: [[112568, 24255]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4506",
+                  properties: {
+                    name: "防城港市",
+                    cp: [108.0505, 21.9287],
+                    childNum: 3
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@XV@X°°U„lxkbVlVb@nkbVl@xl@@b@n„‚XbVL@Vl@UbV@@JVLXbmV@bVVUXUJU²šW„XlKVb„@VVXKlXšWlXXWV@VXJlI@x„l@nlbn@lln@lbXalIVK@ƒVwœUVb‚U@aXylUX@@aW@U_UJmU™nVKUamL@Kna@aVUkkVWU_ValaV@XK@kV@@W„wVXV@„V„KVVn_lJlUXkWaXWlkXU‚±kU@ƒVUlbœkVmUmlk™¯Ý™™W@mb@¦VxULm™kJUU@ma¯wƒmkX@VóJ±bUVUXÝWk™lWXXlƒxUaƒbƒIğ™Ç@U@mVUKkkm@UJm@XnWV@x"],
+                    encodeOffsets: [[110070, 22174]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4505",
+                  properties: {
+                    name: "北海市",
+                    cp: [109.314, 21.6211],
+                    childNum: 2
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@VaVLnK@IšJVwUaVaUkWKn_mƒX¥WwXm‚LXalbU£UyV„Å@ݙwm@™°l›LÅUƒmk™mwÛaƑLÝUUm@ȣƃV_„Ó@£UƒƒUVƒ„™¼U°W̄™ÞVbXbôx@b@bmV@ǃ™UÝ@@ĢU`m@ŽnxnIVV‚VX„VL@`@bV@@aXbVL‚@XVlKXLlLVl„knJ@I‚WVXXKlVnL@xl@UVVX„a@UV@VlX@VUV@nK@bl@nVVIVmXIV`V_lWnn„@VJVXnJ"],
+                    encodeOffsets: [[112242, 22444]]
+                  }
+                }],
+              UTF8Encoding: !0
+            }
+          }),
+      i("echarts/util/mapData/geoJson/gui_zhou_geo", [],
+          function() {
+            return {
+              type: "FeatureCollection",
+              features: [{
+                type: "Feature",
+                id: "5203",
+                properties: {
+                  name: "遵义市",
+                  cp: [106.908, 28.1744],
+                  childNum: 14
+                },
+                geometry: {
+                  type: "MultiPolygon",
+                  coordinates: [["@@@UnUlJn„w‚JU°VL@bnVšU„wlJ@XƒŽXVlU@klVUJknl„UllL@bUJ@xULUlƒ„UblVkblbnw‚UXmla@„wV@VK@L@UXaVKVLXWƒUVa@U@Im@@W@£UKUakKWIXU@al@@llUnL@W@Un@@VlUV@VIUanKl@Xb@lmxVb@b°bb@nlJVVnnJ@b@L‚V@ln„@LmV@Vx@blnVK„nlJXIlw„J@҄b@nlK@Un@UL@VVVVUUUVK„l„@VUVL„J@UVUUw„@Wm@™„UV„ÈVlbUb@JšLlŽX@@x„„ƒLmŽk@@nlx@bUJUzVJ„@@LVxUV@bWxnLnVVK@_‚K²xVbV@n¥@aVI@b„@l@Va„Knb@n‚`n„mmý„W@ƒU_šwV@VlVV@Vn@n„˜@nI@Jn@°¦VaUU@™„mVVWVaUńU@aVKnƒVbVUmmU@a@kUw™m@aUUmUUJ¯lakU‚aXaWUUaVƒkk„amkmUnVlULƒVlJ@XU@UJWUUw„k@aU@WbkWƒL@U@WU@@XUKmV@aUVwUĕUJUamUUVUÑm™nIVJ@kl@XalJVn@KVLœ¥@UWIXWmU@mVUKnUWLUKUaWUUKVU@U@anUny@UlUkK@w@a@aVUƒ»UkVw@Wmk—JƒÅmUUVmwXalLXWWUnam@XkƒJ@UVU@U@W„@@U@I@Wl@Ènlw@KXLWb„lVUkalKUU„VVaV@@wnIlaUmkUƒKWU@KkUkLWaƒKUUWUn@VƒK@LnnWJUIƒVkUWVnV@V™@@XƒK@VUIUJ@IWJkX@VVJ™IƒVkK@I@UVaUWk@m„@wnUWKk@mxk@@„lV@b„xmb@x@VUmLkUƒJ@nVV@b@VkLVbU`¯I›l@™U_UW@UU@™™ƒK¯wm@™xƒL¯¥kIƒ™ƒ‚@bkbƒ@Ua@ƒm@kkW@XVbmV@ŽkV@bWbUbV@„¦ƒxXlmVk@ƒ¦™bkaWL@KUImK@wUK@VUI™b@bmK@LÅy@akXW@kbWlXblL@ŽULUbƒ`@U™kUymX¯@mšUJUUJƒL@Lm@@WX@lU„VlšXll„@l@Èk°V°Ž„X@VU@UVll@XUJVXUVm@@VXLWlnV@Xƒšk@mVULnxV@@bm‚kL@VWLUbU@UVm@ƒb@ķ¥UnmJ@UUVƒkkJUšlÔU`UIW@ƒ°kLUlUI@WVI™U@mWKkXk@ƒ‚WU@bXšW„@J@xX@l@LVl@xšLVxXX@x‚KnxVknb‚KVV@U„L„WlXU`@nUlšX@llVXšVU„KlkUKlI@anKVLXKVaUIVWV_VK@VnLlU„»VKVL„m"], ["@@@KlKkUUVVX"]],
+                  encodeOffsets: [[[108799, 29239]], [[110532, 27822]]]
+                }
+              },
+                {
+                  type: "Feature",
+                  id: "5226",
+                  properties: {
+                    name: "黔东南苗族侗族自治州",
+                    cp: [108.4241, 26.4166],
+                    childNum: 17
+                  },
+                  geometry: {
+                    type: "MultiPolygon",
+                    coordinates: [["@@VV@XkV@bUbWJU¼Vb@Vnb@bš„@J@bƒL@LV@UVƒlUI@a™KULVb@bkJmx„šlLVxknVJk„‚xnKmnnL@bn`WIXlWLU@UxVbUVmKV„XI@JVIVJ@U„L@Wš@@UmUXUlV„UVJXImm@K„L@UVmVXV‚„LXblKlV@LXV„LlVVnkbmJ@xnXl@šbXa‚@Vana„ÒšL„m‚VnIl‚Þ¦°k@b„@@lV„nJlUnš‚VX_„@lVlK„šV„UUxVLVWVIXJšUlnnWlI@KUaUUVKn@VaVXV@na@ƒmw¯@mUkJUamI@lk@@am@@I„ƒUmVImUUw˜™@anUVaUU@LU@WaWUXWW„wV@VwnU@L@ynbl@@X@a„J@nW@@Vn@„lVLlxnI„lš@@UWKUƒnIlJXIVllIVVš¼XK@aVI„V‚@@bn@VKXLVKVVVInw„J@UWI@mX@WKnI@KmU„UVJUL@V„KW@@k„@aU@@W@InJWUXwWI@Wƒ@¯wkaVaUIl@nŽValIXWWI@UUm@anwWkXWWIUbk@UJmIUamKVUUUVVama¯VkIVVUlKnXVwX@@WVaUUVa@IlƒaVmƒkna›wk™UU@ƒU@mUVƒšUVwœl°LVbnJVU™¯la@mX@@UWKXU@aV_V@@JlkUƒ¯@V™nK@km¯k„U@ƒWUW@mmƒU@™kmlU@wkL@WƒUkL@VmLƒJ@b@V@bknUUVK@UVKUK@Uk@Wa@LUVVnUbmVk@@UU@@aƒV¯K@U@UU@WmUL@aU@WV—w@ƒ˜I„xXll@UX‚K@KXXVJna@wWaƒ£naUKV„m@UU@mUmalm@@XkVm@U@VƒLmWU@kkWxU@@bVV@VkXVlƒVƒ@UUk@@ƒmI@KUw„m@UmVƒUUwU@lwkV@IUa@mUaVIVKVa@w@U@™UJkb@n@bmJ@XmlVUxWXkJmUkUUVW™xUlU@ƒaULUšmbU@@‚WXkmƒL@xUV@nUxÇm@„XLWbnlƒnV‚nnUV˜U‚nVVz„@lbUVVlULVb@V@nUJkwm@Ux@bWbUK@UULka›JbƒU™U@U@lUK@XUJmn™J@bU@UwWa™x@zkJWnUJUUVšVV@bXn@xVb@J™L™m@X™w@`@bkb@VmXUV¯L@mW@@n@V@‚ƒL@K—IW@@aƒaUx¯@U„m@XbW@@L„V@bnVWVkKUzlV@bÆa@lnI@VV@@LnVVKUaV_VJVbnU@bn@‚‚nX@yVIVxXKVLlUVaXU°J", "@@@KlKkUUVVX"], ["@@UUVUkUmV@ln@VXVK@K"]],
+                    encodeOffsets: [[[110318, 27214], [110532, 27822]], [[112219, 27394]]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "5224",
+                  properties: {
+                    name: "毕节地区",
+                    cp: [105.1611, 27.0648],
+                    childNum: 8
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@UkVƒ@k‚W@Xn@@K„KVIVVIn™°@nWVzšl@V„_VaVK@kKWaXklaX@lW@bÆz@KnL@ašaVJ@UVL@xnLVJ@LXKlbša„¥l@nUWk„wƒ¥U@VaXa@amLkUƒKmƒ¯kƒmkIUaƒKUIWƒkKm@anw@mlwXIƒmƒUk¯@a@amUƒ`kkKWVkxmUUak_mJmw@w„mXUW¯X›_@WnI@aVwkWWýŃU@WLkU™aUbVV@lUVVnm@kUmV¯™kK™LƒwmVUUaWV™aaWw¯wƒÈ@VULUVUUƒK@nWJkI™l@Umxnbm@kbUJƒa¯bUbVxmLUV™aU@VUUWxkVVV@bUV@XWbnlUbƒbUJlbUV¯b@z„`WbXnmbƒaƒwUwVWUƒbUxmbU@Uam™@Vƒk™VaƒwVaUƒWI@mUKóz@lUlÅ@WIƒb@xXxml@XklULWKUmwUa¯KUXWJkaULmKkLWbkKUVƒImƒƒWa@kUaULƒW¯LƒK¯@kbƒL@b™x@J@bmnnlUšlzU`U@@Uƒb@„m‚n¦°bU„Vx@bkVm¼mx@mk™mVV@bkxVn„aVV@bU@mL@b²`lIVV@lXLlš„bVxn@@bl@XllIVšnbVšn°°wlbXw@mVa°lVnU@mš™VLVbn@@b„@@WVnUV@Xlxn`VznJVb@L@bV`V@šUnwšU„@WUXKV@UUlmUUlaXalLšm„bšIVbnJVIlVVaUUnWVXn‚VL‚k@ƒnWnblnlb²x„xVKVXlVXLVW„LlUVJna@wVL„¼@JVX@`@nnx@nWJU@Vx@XXKšŽUblxUš°„LVKVVlL@KnbVUnJ„IlUšƒnKl£VW„x„IlJ@nšVÞUVVnb‚VX@V_°lnK", "@@@UmWUwkU@Um@@VkL@V@„„‚V„VkV@nbVa@ƒ"],
+                    encodeOffsets: [[108552, 28412], [107213, 27445]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "5227",
+                  properties: {
+                    name: "黔南布依族苗族自治州",
+                    cp: [107.2485, 25.8398],
+                    childNum: 12
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@‚V@IöalK@UV@@KUaVIVVœLlaVbVWnX@‚@LnUlxl@naVLXVVaVU„J@lUUanWWI„@VlV@Xbƒb@V„n@VmVVbk@kU@V›V@X„J@zn`ULW@kK@_WVUK@LUb@Jlxn@nnWlU@@b„x@XVVU@UbVb‚@n`VI@VVLUlUIUV@KmL@VV@XIV@@lVLVmXV„@WLXLW@U`šnkb@Vl@UL@VVV„L„llX@`lIXb„J˜IXW„L‚aVL@ŽXXW‚Ģ™b@bmK@L@°@Vnxmxšn„K@xVn@VkL@V™Lƒakbl`VnnxVnUlššV@@VVXV`@šœk°JV_UalK@U@aUU@m„IlVnK‚V@U@wnaƒw@akU@ƒl@nwl@XLmV@xnƒl@VXUb@V@JlL„UšJUI@UlWUƒnLVUUaVwV@XKWkXJm_@amKnmmLwlƒUIlmUwkKƒ™nwlI@aUaVKšL@bVJ„kVUU@@K„K@a@I™ƒ@ama@UUaV»XIVa@alU@WUU¯IWVUbkVUKWLUwUJ@zmWm@@amVUaUIU`VbULmU@KU@@UmJ@kÅb@akUVylLXUmU@aƒU@KX@Wan@Vƒ°@Vw„b@bX@˜J@L„K@@U@mX@@n°KVUnW@Ula@a@_šx@WšnšK@IUa@wWm@aUUU™VVVIXmlI@yšwXbVxV@@ašInmVI@WVL@k@VšV„V‚aœIlbVK@VVLXa@aVwn@lxVI@m@UUaVKUkVUkaƒ@UymUV—VUmmU„mmkXaWK@ƒÈnVw@mVU@w„KlnXW@V@naV™VKUk@KVIUWƒ@mk@KXU@Um@@lVƒk@UVJna@UWaƒL@a@ƒXa@kmmVUUk@mkkƒamJ—ImJUUmIm±aUUkambkamVUU@VlbUbVVƒxX„WVUU@VUakU@UmUV‚U@mnUVVnUbVJ@b—UW¥kLVamVkUaWJU_UVWKk@@nl„UVVJUXm@Vm@UnVlmbnmJUbULU@@UUKWVIWxnJVb@xUL@bUJWIkxƒbkb@xVJƒbmU@kW±LkKUkVa@a¯am¥ULkalÑlKXUWƒXƒaVakImVƒ@ka@UUƒJ¯aƒX™mmb—KWU@wUUƒaUa™KmU@UXlWb—¼WLUKUb°„UlVbkbVL@VƒšƒJ@nVlUbUXmJ@VX@lbUbU@@bWb@VnLVJ@bVVUz„ŽVL@lnL@b™VVVULmKUk™Jkbm@ƒxVb@V—kƒKVnnV@b@ŽWXU‚„nV„l‚VVXVJUXlVXbWV@VU@Ubk@@KWbUUmL@JnXV°XJ@_‚`UbkXVVlÆkbƒ@VLXVV@‚V@k„KXX@`V@@n"],
+                    encodeOffsets: [[108912, 26905]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "5222",
+                  properties: {
+                    name: "铜仁地区",
+                    cp: [108.6218, 28.0096],
+                    childNum: 10
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@°a@aÈbVUlU@aVKnVV„VUlyX¹lWVa@U™VƒnUVU@m™@mUl@„mÞw„@‚xnIVbna@KVI‚J@kwV¥ƒUXÇVkVW@kkKWU@aXUWmnIVa°VXbmL@VVbnVVVUb™VbšJVbVKXkVKVanU@aWnWUWa@U™nk@mVIVK@wXxlLXbVJVlKœbl@VI@mšaXalVV„VbX@@ašalnkx@b@V‚b@Vnx@bVVUXn¤WXn@Vl@Vlzn@š`@I@KUU@ƒV£namVkXa@aVK‚nnU@anVlKƒa@UUU@amk@»kƒU¯@aš„VWnkWmkImU@akaVm@»VUV@UKnkW¯XWlkUKnIWaš@nmlIXmWUnwUwWm@wULmaUJkIUaƒaWa—klwkwmJmU@bkJ@XUJ¯W@XbWbUKUkWJUUVKnn@UmmXUWa@mU@@UI@WmXVykwm@kaULWwU@¯ƒlKUUVU@mU@UkmaUbmV@b—š‚xVnVUJVnƒ„@Jn@@bl@@knJVblInV°@nx@„mbU@UWUbm@ULVVVb@LkJmXkm™VWIUJUXUKVwƒV™UƒŽkLkUƒ@W`Um™kVmIUƒ@kƒ@@a¯lÝ¥kmJUƒn™KƒÑmbUb@Wb™ak@mWU@UbƒUVVkLlbUVƒkXaWK@LkxÇmk@@X@J@Vƒ@@X@VUV@V„IWln@mbXVWXkKWbnxVUnV„ƘInl@XUxVl„¼UV@b@b@xlLkV@VmzmV@b@VUVVLXVVbVLXKmVVLU‚@nnVWXXJ@V›¦UK@LUmkIWbk@@lUImJnšVÒVUnVVbVIVĖUxV‚@bnUVL@WV@@X@V„KlXXaV@@bƒlVxXVVIV@@WkI„UVKUkVmlnnŽƒbllU„VbXVWbblVkb°ŽVInVVV@bšnVx@l@bnVVnUŽUam„UL@bƒVVÆUbUXU‚ƒn@šVVUb"],
+                    encodeOffsets: [[110667, 29785]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "5223",
+                  properties: {
+                    name: "黔西南布依族苗族自治州",
+                    cp: [105.5347, 25.3949],
+                    childNum: 8
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@VL@Vl@@IXW@kVUVbnW@XlKVVnU„VlL@b„aVbƒb@xX‚°ÔUxV@kbm@VxkxWJœ„V¦ƒŽ@ÈnšVKšxWXJmV@n„Ò@xVbn@@blLk`VX@bššla²JVUlnn@U±lw@wnw@mlwVIX@@m@klKnk‚a„KnwmmXkƍVm„Uš¥l@nb°n@„aVwVmVIVnI@a„¯@mšU°ƒl@@VnI@JV@UV@b@IUbVJmXöºƒzllUbVa@aXUl@„U@llLnKVaUa@UmK@UšwV„bnKV@VwVK@UXƒV@Vbn@‚w@U„WnX‚@„a@m„I„™@UUKlaUaVk¯ƒVaVLXK˜»XaWk¯mƒkğwmW@mIƒVkwƒJUIšÇVwU™UkVKkƒm@UkmU@WÅwm£Vƒ„m¤¯IkJWa™_™lUbmJzÝJk„ƒUÇVU„ƒ‚@bU„Ýn™m¯LUb@`mL@VkL@VƒUmmk@UU±Umka@kUƒ@ķymUkk@mmkÝmUaUakImV@V@VÅLƒ¦ƒJUXmJXšWb@n°Æœx‚¼nV@LlbUŽUbmL¯@ÞbV¤nbVx@bUVlblIœ™@KVVUnVJUn@VlLUlmLUUUxmK@I@@VW@@bU@UJmUkLVVUl@b@V"],
+                    encodeOffsets: [[107157, 25965]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "5202",
+                  properties: {
+                    name: "六盘水市",
+                    cp: [104.7546, 26.0925],
+                    childNum: 5
+                  },
+                  geometry: {
+                    type: "MultiPolygon",
+                    coordinates: [["@@ôyVL@nXJV„Ub„x‚bUŽlšU„@ŽšnŽVbV@naVw„a‚VUXVx„x„bnaWmXaƒ_@y°aVUkaVI„aVamkXa@WVU@aUUlUXwVV@UVšbVUnKUwVa°a„bVIlan@manw@VšklJXI@m„LVVVUVK@U„ǃk@KUa@UkaVU@UVWV_XWVXVWlLXKlLXaÆKšwVL@akKm@Uwƒ@@XUVk@VUI@wWK@aUV™I@UkK@ƒmL™Wƒ@kImJƒUÅVmkXUW@UJkx@nmx@xkxV²m@kmUV±Ikb™™@aUWl_kK@am@Ua@wƒÑ@mnUWIX™wULm™@DŽU¥›ƒXIlwUwn@laU@Vw¯ÓW@w„aUaƒb@akKƒUmVUUkL@WmXUaUV@lWX@Jk@@UUKULmLUJmzkKmVX°VšUnWKUL™ƒƒL@mU@UnVJ@b@„UV@Xƒ`m_@l@@bmbXJmnnš@°˜wnn@ŽVLX@V‚@nVl@nk@@b‚l@nn°WlXzW`XXVKnUlxVbUb@‚V„Xb@Ž‚VxÈbVlnbmn@ŽkVUL@„ƒŽmLUVVL"], ["@@@ƒ@UmWUwkU@Um@@VkL@V@„„‚@„V@VkV@nbVa"]],
+                    encodeOffsets: [[[107089, 27181]], [[107213, 27479]]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "5204",
+                  properties: {
+                    name: "安顺市",
+                    cp: [105.9082, 25.9882],
+                    childNum: 6
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@lL@bUK™xÅLWbkKWLkKUXUWWXU`UX@VUVlb@VVb@L„l°xXx‚bšbXUVb‚VnU„xšKlL°šnUlVn@UmVU@kUUVašblVXKV@ƄXþlXUxnU@mVK@_@ml@UU„@šblU@KnLVyUw„@@UmkšWVw@UVK@VXzVK@n„VVUUW@kVJnlaš@nKW™kaWL@U—™õb@JU@mU@@_WWƒL@lUU@WUUK„@lakÅUUlWVa_@`WIU¯mW@InKVVXa@Ll@VaV@@UXUWakUVWUIUW‚UkUƒƒmVXW@@amUUm„L˜l@UUa„wn@lašIVlnLVKUUšU@amK@kUKƒVyUU@aUImK@UXa@aV@VakaW@@UnIVWVaUkƒb@mWƒX@Vxm@UaU@W„@VULUxU@mLƒaUŽ™x@VnL@VVbUbmLkK@kƒVk@WV@bUbVakk„yõ¹nWUIVa@J@aVUU@@ImJ@Uk@¯„™V@nƒ°@bmJUUJUnUxƒbm@¯Žmak@™¦ƒVUnŎWlnnmxƒLbmlkL@l@nWVnlÆU„VnIlJ„@šXnK@„lL@VšJVU@bXL@xVJUl@VU@W„@Vxn@"],
+                    encodeOffsets: [[108237, 26792]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "5201",
+                  properties: {
+                    name: "贵阳市",
+                    cp: [106.6992, 26.7682],
+                    childNum: 5
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@nŽlLX„VJ„LVblJ„n°ln„„LlVnKlU@nUUa@WlX@l„n@‚Vb„@la@a„„šlJ°¦„Kšwn@°x„LVkUmmwUmk_la„bšK@UlK@UUm@wƒL™mnwmw@U@¯@KnL@aša‚ġXWW@UKbƒKWX—JƒIWakJ@_kWƒkƒKUU@UVKk@@Ula™mV_X@WKXKƒ@WUUnUK@kU@WJU@@UnK@LVUVJVkUK@UUJm_@UaVaV@UU@Wƒw@aV@Xkmmm@kw@IVa@KVLXU@`lLX@VKm_@yƒI@WœU@UlVl@UanU@Uƒm@U„aWaU@Ukƒ@XJmXVbkV@ŽƒIUVUbWUUKmbk@kwmV@K@mWUXUakb›KUUUJVb@LU@@VkL˜š@VXKlbXšmL™@kbm‚UI@lVXUVƒU@mULWy@UUL@VUx™Xnl@Vƒ@VxUzmK@LkV™aƒ@VVk@@n@`UL@nmV@bmJ@Xœ`WX°WVƒn@xnxnIl`VbnVlwXUlLl‚„_nV@b@bl°„V„nWJkx@nmx@b"],
+                    encodeOffsets: [[108945, 27760]]
+                  }
+                }],
+              UTF8Encoding: !0
+            }
+          }),
+      i("echarts/util/mapData/geoJson/hai_nan_geo", [],
+          function() {
+            return {
+              type: "FeatureCollection",
+              features: [{
+                type: "Feature",
+                id: "469003",
+                properties: {
+                  name: "儋州市",
+                  cp: [109.3291, 19.5653],
+                  childNum: 1
+                },
+                geometry: {
+                  type: "Polygon",
+                  coordinates: ["@@஼jpnr’``ŽpRVHʘ̤žZt^JÖA˜[†CâlTébQhRPOhMBcRSQiROE[FYdGNOEIH]MgEAMLLIAG_WMCSL@ED]PCLYC[ZIHgjSxJTMbHNEFCMEE_HSDFHSLECRNSFDRICHNADGPI\\RZGIJTIAHLDQOHG`GTNCOIC@eIGDWHIS[kiE[FMbECZS@KKS[FDWsCeRuU_DUQNOE[LKGUBM¨EDQP@HWHGDImXƒCog_~‹I_fGDG|QDUWKBC\\ore|}[KLsISBHVXHCN`lNdQLOnFJSXcUEJMCKSHOUMDIm_‹DI`kNDIGEYFM\\YPEEIPMSGLIKOVAU_EBGQ@CIk`WGGDUM_XcIOLCJphHT_NCISG_R@V]\\OjSGAQSAKF]@q^mGFKSW^cQUC[]T}SGD@^_ˆaRUTO@OHATŸ”"],
+                  encodeOffsets: [[111506, 20018]]
+                }
+              },
+                {
+                  type: "Feature",
+                  id: "469005",
+                  properties: {
+                    name: "文昌市",
+                    cp: [110.8905, 19.7823],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@€hIJ¤Ī¯LQDaFßL[VQìw€G‚F~Z^Ab[€¹ZYöpFº lN®D´INQQk]U‘[GSU©S_­c‹}aoSiA£cŁ¡©EiQeU­qWoESKSSOmwŸćõWkàmJMAAMMCWHGoM]gA[FGZLZCTURFNBncVOXCdGB@TSbk\\gDOKMNKWQHIvXDJ\\VDTXPERHJMFNj@OwX@LOTGzL^GHN^@RPHPE^KTDhhtBjZL[Pg@MNGLEdHV[HbRb@JHEV_NKLBRTPZhERHJcH^HDRlZJOPGdDJPOpXTETaV[GOZXTARQTRLBLWDa^QAF`ENUPBP…\\Eji`yºEvåà"],
+                    encodeOffsets: [[113115, 20665]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "469033",
+                  properties: {
+                    name: "乐东黎族自治县",
+                    cp: [109.0283, 18.6301],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ªVLP`@PEdNRAHOPEAKHEVL`GZBJfvdTAXNNTZJFPrHHNpKTD\\ILHbEVd^J‚OHLh@NNBnHP`\\xH@NBRLJTlŽNv_^CTLd@bNDVFbxdFV€UPBTKOGEOUO@OEBXQP[H_EI\\EbeYa@UO_J‹MEJ_IEDKJUGMDcNUd_FMTEJSGoZ]EIYGO[YW‘gEQ]a@WHEDQKUSDUGAbYBUpSCYNiWqOSQEoF[UcQISWWNMSDe_cLQ_UBiKQOOASQAWgS­ā]ZaŽSPÝZ]XMXSŒ[^oVËNgNKlE RôEø"],
+                    encodeOffsets: [[111263, 19164]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4602",
+                  properties: {
+                    name: "三亚市",
+                    cp: [109.3716, 18.3698],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@®ĂhTBXTRPBRPjLVAR`dKf`TC‚NXMTXRJVdE\\FpTRrPjXZMTDVoZABaVHTCLVCRGF@X^bFR’hZXP\\ZHHMA[^wBWXJlW¤EJ[bCTOF‹WWMm@ILMGWQ@DQ^QNWFSHEbF`OXNbO„VNKTEPDTLTCCVTREfvfEHNbRAENH^RJXCFHNFRpVGHWISDOTMVCZeGamaLoLÛD¹¹ėgsia{OųE—Tt‰lɂwr}jŸR±E{L}j]HąKÃT[P"],
+                    encodeOffsets: [[111547, 18737]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "469036",
+                  properties: {
+                    name: "琼中黎族苗族自治县",
+                    cp: [109.8413, 19.0736],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@bRFnHNbHŒgN@NPEnbXP@bND`NT\\@\\QZb@`@J]V@XhžDpW„nCJGHGXO@CR§FANHVKLF\\MPVR`CvVfQtDPKpGHG@S`WJP~^dSTHWX\\RHTFACQTIAUPOU@MG__IaYSFQK‘NSbORHXCZeTFJg„B`YBMNMFi~IVDV[tGJWXGDQRGF]ˆJrALgESLSAYDGIaFeXQLS\\MKSLSQYJY}eKO[EHiGSaK[Yw[bmdURgEK^_kcSGEOHKIAS]aFSU@Y]IWFUTYlkP_CUOUEkmYbSQK@EMWUuAU\\M@EpK^_ZMDQ^OXwC_ZODBrERURGVVZ\\DTXcFWNIAWJWAYUUFYEWLQQaCIZeDM`cLKRGpanJZQd"],
+                    encodeOffsets: [[112153, 19488]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "469007",
+                  properties: {
+                    name: "东方市",
+                    cp: [108.8498, 19.0414],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ºŸx‹JYZQ”IŠYXLl@dR\\WZEn]bA\\S~F`KXaDeTiNO^EEKWEDQXITBXaWaDQMUJOIaTWf@NJV@dSxGZ‰Fu_@WMKAUˆ}AQ@MwG_[GOAmMMg@GKP]IUcaFKG[JSCoLGMqGEOYIMSWMSBucIeYA_HUKGFBLOFGPQBcMOF_@KO©UAtERadwZQ\\@ÊJÒgòUĪRlR°KĮVŽLJ"],
+                    encodeOffsets: [[111208, 19833]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4601",
+                  properties: {
+                    name: "海口市",
+                    cp: [110.3893, 19.8516],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ńZƂtĢ¬æßFuz¹j_Fi†[AOVOFME_RBb]XCAKQKRSBQWSPY\\HbUFSWSPoIOcCOHIPkYCQ]GdGGIFQYgSOAQLK`MFUIGa@aQ\\GGUFcHKNMh@\\OYKAigsCgLSF]GOQO]@GM]HyKSHKPW@Pxi@EMINYREXWRQ@MQcFGWIAwXGRH\\yDI`KJIdOCGRNPNtd\\UTMbQYi@]JeYOWaL[EcICMUJqWGDNZEXGJWFEXNbZRELFV]XQbAZFrYVUBCLNFCHmJaMIDDHXHEhQNXZ_TARFHVB@DTQIRR@YHAJVnAbKFUEMLd\\c^ÍÞ"],
+                    encodeOffsets: [[112711, 20572]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "469006",
+                  properties: {
+                    name: "万宁市",
+                    cp: [110.3137, 18.8388],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@^J@ZTVbET^JBGLFPTHld]`FLQhcVanx\\\\ZbLHTGj\\FLP~fIZRZPVTQFSVAFJE^NDLEE[~LjsxVTG\\NZZNGlLRRGLJTV@hPZANN^@T\\NEPPbDZXO`d^HSvcJDIV\\XZAJUFCLNP@PQ¤@[ïKLÑIÏ]ÇE±I{uƒ­YśUćFcYUmsVeBSVgB[RO@aYYPO^]@UVaNeDShMLG\\EfFVE\\F`"],
+                    encodeOffsets: [[112657, 19182]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "469027",
+                  properties: {
+                    name: "澄迈县",
+                    cp: [109.9937, 19.7314],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@T\\GJCXJH@fJDDPNCNJENN^NLHBNSx@DDYbBLLDRbjZTj@`XXTlG^Xr@PJLW\\WLTlWR@HDJTD@X_PO@STMDNTMVV@NLDM`M\\XM\\JNBH[PYZ‡úYzŸ`Ċ\\ÎÝd]c[NKVFLEBaUmBIZGQ@JQSR@CUAEGBQ`SWYRMFgWGCGJCbNnIDGMEDKVAZUEqBYRa^WEUFKYQMaFWXEHIFWMYHCrXVIIiaK@aMCUYNSIISTwXALKH@XWXIEIJQCG[IEQDE_XSBaa[AIPW@]RS[FWS[CD]PEBYNGFSaSyJG]@ugEUDQlGHiBKHUIoNSKqHFaPMICK]UUHIPDJMuCA[SCPIDIOILGAEmU[POPBVSJDREBGS[QXWSGcT}]IO_X@TGHoHOLCX\\ELT@LYTD‚aFENF\\lj"],
+                    encodeOffsets: [[112385, 19987]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "469030",
+                  properties: {
+                    name: "白沙黎族自治县",
+                    cp: [109.3703, 19.211],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@D\\RV]dTXELnHr]^@LETBBRTHPi^[@U`QTHDJ`MGSogDIPKdJ`WVNHCXHl_DJR@AH`FBVPUJLHKNTJOFFZON[ZEHFCJlMJ_ŒCn`CJVNGPLTNDFIdVTWEIPmRKMc_kDMWGGUTAtJLK~\\f{pqD[LAVXRCH{HC`eŒJ`}@W^U@I@_Ya[R[@MSC_aMO@aWFmMOM@‹haGGMEmaQ[@MESHaIQJQ……MckBIw[AOSKKAMPSDSLOAV_@@`KJRbKRDfMdHZERgAWVsDMTUHqOUr@VQXTT@Tƒfg‚L^NH\\@heTCZaESNObHPƒHeZF\\X^ElM^F^"],
+                    encodeOffsets: [[111665, 19890]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "469002",
+                  properties: {
+                    name: "琼海市",
+                    cp: [110.4208, 19.224],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@TP\\pATHTGlZDJGAQjE\\Rb@jVBDCN`JZ[NCNHNXbULPrP\\KNbMTLjJJRFP`“pNLZz^FLRHjVPZ@hxVKbHBHMNNJFRlLzGPnNHhIrHHADcPWdUAmEMVQDSKYHY\\EhBN^HpXGNDBNNBnIß‹Å_g{³So]ã@ORO@KMEDIVYB[WJUICudGTc]P_YWaCOOMFS[]@MMYBgOU@ISHKQQkKMHYY[MSHwUit}KF\\KFMCF]EIUBETSROUKTLT[NKTWREfJbCHBZKTFTKh"],
+                    encodeOffsets: [[112763, 19595]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "469031",
+                  properties: {
+                    name: "昌江黎族自治县",
+                    cp: [109.0407, 19.2137],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@`ZĤd–`òüˆ˜ “BSPGP@VSbQ`‡@]HC~T^SE]N]FkW]E[fY„GGOPaTMbFDYfS@g[MGK]h„e@SSSRW@UVqrPVGNStCXUhBFQGYNcCeLQQaLI@_`@EUwcEaCUaMc@SK]Du`MSkKI‡~BVNL@X`‚EvYŠwHcTU@MIe@SXJbIPNVCRXbWbSAWJCRXFFL]FMPSjCfWb_L}E[TaBm^YF[XcQk@WK‰Z“JYRIZwŒ¹ "],
+                    encodeOffsets: [[111208, 19833]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "469028",
+                  properties: {
+                    name: "临高县",
+                    cp: [109.6957, 19.8063],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@jD`hNd\\^dZädĒH´Op@ˆùZY\\OAGIMN[[W_NCNMKU@NUMSNCTSP@`O@WSCCI@GXQSkXKX[IK@OWqH]SkWW@_SiiYQaKCAKZaCCw@MTGAMKM]FMMIMDSM_HGHRPKCBGSJJIYH[QOJCHMBDGQJECMTDQKFGTCEGTF`NFEDMFaGSNwIiTGhYJD\\KZODC^@FTKND`XBHKJNKFBNhG^FJMPcHEZF\\QPRjQTAdgNOPgQaRSê"],
+                    encodeOffsets: [[112122, 20431]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "469034",
+                  properties: {
+                    name: "陵水黎族自治县",
+                    cp: [109.9924, 18.5415],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@R]NC`YL]FoN@V[vBXVFNL@TRZalnVFVP`DlOZkVSXEE_F[EUFeH[NKTgfCbMVU^@P]ZObZP@\\QhATUfAtUasñiāEoI]eYǯ@aKmaeƒWuCºKÜKpnbHbYfUDSNCPJTRAHJTDJSfDNLHXC``VBNGTYCQDIXMDSP@xLNEFRNXBIpVNLXah@RgF@`qOML@LJNSPLbaHAh@Jdj"],
+                    encodeOffsets: [[112409, 19261]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "469026",
+                  properties: {
+                    name: "屯昌县",
+                    cp: [110.0377, 19.362],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@\\OnVBFKHPJCJOJTDB\\vDINOCGJVVL^JDONEbrGTLpMVJLGjAHGRkVChF@vH^zIbTETMHAZOFC^\\DXT\\EffAP\\PdAV@UIYfS|S@YPICMeM@sC[_A]VQEwyHSMuNcAUlQJMVGMS@mVBZPFO\\CSFQK[LqDMACiUa@[QiFBRIHYCHkGSBS[oSOqB‡IE^QHCRWHIXsHU\\UC}JEjMNAN_ZƒAIhSEYfWDQGaPMTL’ERZTJb``NHV@"],
+                    encodeOffsets: [[112513, 19852]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "469025",
+                  properties: {
+                    name: "定安县",
+                    cp: [110.3384, 19.4698],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@JjDNdJ\\FbKPXfZ^Ij@RZNaVSc[MsMOHQPDJcLIJ_zCG[HQxWJBHXdENRR@XQFWZQQGOFSWUCI[WCJuRGLXNMPLhCl[Ta@SqGgJMGOmyHkKEQMINMAGaGULgwY@UOGiKQ]EYyMK”oO_QEIIKiNSMa[LqOKOaVMWMGMDY\\_IKrL\\ERT[DEPYOUA@nNTUHINkRBVMdNvGTxzRF^U`BD\\@tfNDNOJ@Z{TeTJZ@VU€cB[OBOeeQT@^OXBJb\\AbWTF`RCJFH\\RDJIJFXW@WLGBKxWTSJJMTVZND@bbL"],
+                    encodeOffsets: [[112903, 20139]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "469035",
+                  properties: {
+                    name: "保亭黎族苗族自治县",
+                    cp: [109.6284, 18.6108],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@FJp@fxpQ\\ApN\\GNPNBM`HLMrXLXj\\PEHnI@WUCEM\\GTc\\GZYHTPBHRCPTd€H\\K\\@HXi–BJILJJAVNTOZJNtFPC`YxDPWci@IBgbGKaTOIM@KNKrP@_hE@QbgKWUMJoWAQMFEKM@wTONCJWRCZDHSAM_UD_GWMKeCITSCGIQBGXUHQoMEEGWDQIG]FMQBMaFGueFeSQDUSDSKOCSFMLƒUaPWM_PaEGFETMX]RCRR@HXKN@JNnXXEŒSPaDI\\£FkXWIAX]xB\\GN"],
+                    encodeOffsets: [[112031, 19071]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "469001",
+                  properties: {
+                    name: "五指山市",
+                    cp: [109.5282, 18.8299],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@TCNOLBTLBPx\\AJdl†NR†RIbJTGNF\\@RcIYbmHoLQdKN_fCJYbDRRXKZFVEZVXBXIJBXMdESW[CUYHUVQFQAqsEIMPYMSBUIIJKAIj•GW[@[LGScDOGQOAGSYZ[HSd[HFNVD@XmJFG[OWiWKNqGKN_MAMO[HoM[BoRewo@Y^HpITSFENc`MVCdHNIVCLJFI`NFIŒP`@VZbaf[FFJG`O\\WRFA@PVPFPPH"],
+                    encodeOffsets: [[111973, 19401]]
+                  }
+                }],
+              UTF8Encoding: !0
+            }
+          }),
+      i("echarts/util/mapData/geoJson/hei_long_jiang_geo", [],
+          function() {
+            return {
+              type: "FeatureCollection",
+              features: [{
+                type: "Feature",
+                id: "2311",
+                properties: {
+                  name: "黑河市",
+                  cp: [127.1448, 49.2957],
+                  childNum: 6
+                },
+                geometry: {
+                  type: "Polygon",
+                  coordinates: ["@@VÈÞ@Žkx˜nXŽ°VÈa°V@kôw„b‚š„JVškXlVUx„„@ŽlL@xkVV°ƒ„VbxlVUnVxk@ƒ„ƒKkŽVb„Il„@°kVl„@„™lÆnkll@@V„VXƒŽš@V„²bUlƒVlV„U„VÇn@nkJšŽlkVbœ@›x²V@n°VUnlKU„n`@n°bWLnVUblVUVVbknV`°kkŽl@@V°@nz„J@XšxlWXb°n@bƒĠlbXb™bVbƒJ@Všb„a@„„@lbUbšVmnœ@lšVmnIW‚œ@WbÞ@„n@x°@š„ĢaƐéϚnœ„‚lČ¯ĠŻÈwm@ôçU™mm£Xy°UV™›@wÈ£Ǫ¯kõÝçUњ™Uķ‚ƒĢkVфÆšÞU°nŎ¥ČUĊx°m°¦żVƐœx°ƒÇ£@y„UônރÆ@Èĉ°Kô¦šW„kWU—bÇ»@™ÈĕWÇÈ£ŤU@›n£ÆUUKVamanwŃmÝJ¯k@JƒIkaVaUUÇbkaÆÑkWmÝUۙ™Ý@™ƒwnU±ƒ@kkV¯KUkƒJƒ¼U¦ƒšÅ@ówķaķůV¥Uaó@Åwmƒƒ_kVƒwĉ‚ĉmmn_V»™a@U™ƒVwķóƒ‚U¦LǫéóXÇmōLǓÇķxÝkƒƒĉ™kmakbUĶ°@W¼„@bƒšÈÆ@Ė™L„l@„°J¯„mkl¯L݃±L—amJ@¼ƒ„™VƧUó„™UX˜ċb¯ńVbkÆÝI@llx„k°V²šV@Uxގ˜L@b„@b™`ƒšÇzkókݤ@ğ¯Wƒ™LĉǙLmmnċVkbUaƒL@Ž¯„‚bU°ğL݂Ý@"],
+                  encodeOffsets: [[127744, 50102]]
+                }
+              },
+                {
+                  type: "Feature",
+                  id: "2327",
+                  properties: {
+                    name: "大兴安岭地区",
+                    cp: [124.1016, 52.2345],
+                    childNum: 3
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@k›ƒϙmƏêġb™ƒ¯@@wƒmÝ@XV@IlŽl@bUxl¯VlV™bV@ULVlUV™_kx™VVV™ÈÝJ@„¯šU„™lm¯x@xóÒĉ¼m„¯Wƒxţ@Uz¯ƒWwnUwťƒ@knƒWƒ£óVƒUUwğyó¦WI—Vmm™I@±kwÇ@@bƒ@ĉ¼ó@¯wó@¯aó¼›KՃaUwmWUwÅI@aƒKó@Ua™LƒaƒVÅwō¼UUÝl±I—¤VxÇx@zkJmnn‚mbnz™xlŽƒl¯ČkJl™°@„kb„Žmx@x™@kêmVnŽWxôXšxU°„bWLóJnÇWĵ„V¦™ŽƒUUb™b™ÆġK™šk¯™VU±aXmċÑUwĉKġ„k„™ŽVxk„ÇKkbƒIƒ‚ÛXWl¯bƒŽ™X¯K™bĊš„„ÞVƚnŽĸ²lxUŽ°n°òÈb‚¦—xVbƒŽƒ@¯„Vx@¯VķÞČlĊ°KĸŽȘI°¤ČIôŽò»ƨnȰKǬ¦ôWŎÈƨwlƒnKVXmbX`lbšwkVW‚XXŽ„L°a„ƾaĊ£nƒ°@°¥ŎzÞ¥‚»œalwôkƒJ„a@ĶK„£„bU°ĊxźVÈUĠ¥ƨ™VI@XU°x°Ln¥šw°UmwXm݁V¥ĢŽ°@nU@mÆ£š¯lKœšÜw@aÅU‚¥UaÝIkmV²‚nn@Ķ»@Uk¥VKÞ@ÞÛ@ƒkVmĢa@_ƒJómƒǖ¯Æw—óÇa@alƒUwšwĢřšk@wÆWXUWXƒWa™m@_ƒ»ÇéXaĸwVa@ÝKkUWkX‚kšKXxƒn@lĊV@¯m¯nřÆwš¥"],
+                    encodeOffsets: [[130084, 52206]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "2301",
+                  properties: {
+                    name: "哈尔滨市",
+                    cp: [127.9688, 45.368],
+                    childNum: 11
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@°`„_šJlUšŽ@„„@V¦°JUšŽnLôlnŤ@@šÈaUÒVbkbl¤ƒzk°ÇVÛô°IlVUVôU„xÆU„Ž@bźĀ„º@¦šb@l²‚UVlœ@°ÒĠxšnXxÆVô¼Þ@Üx²KލlƒVÑ°UȰôlwô@²ƒĸ°„lanV@„šVŎUll@bÈnÜm„wĢ@la@ÝÞb°UXb˜lŎ²ÆškšV‚I@ŽnJnĠŽ°knƒÜbĢwna@a˜kÞKƒĀ„a‚™œ‚‚IVbU¥wĠwkô˜xnLƒċVçkaUƒ±IUmnġW„°WôĉšalƒÞÅĵ¯@W¹XÝaƒb¯a±X¯ºLƒaVƒmkLóƒƒbkaƒVUKVkkKV_@aÝykk±L@ƒÅU@yV_™aU¥ówÇx™@UkVƒn@lƒkÅlwšWVwUkĉmkklW@šašbVwnWWƒ—wWL™™@Ušƒ™UƒÇLšÇmƒ„@wƒJĉƒL¥@ƒÝ_@a¯y„UWw¯ƒ¯Uġx¯aÝXVmaU£ó±›¯nwƒa¯óÅVƒXman™„Uƒ›lUXkWa@mkI„›ğaƒm™IklÇU™„kĊƒƒzkKƒš„lU„ōĬlš™„@ŽnX°@llUxŹ²mKĉVWwk@UbUK@bmVmI—ƒVmwaWxXlWȁšmºšÞÆbUxV@ĵńWÆĉLkWUbƒaWzkbĉ`U„±LklōwUVÝ£™UW`Uwk@mk¯VkaõVX@WbL™K@XƧºWzxƒK@lmX@bkVVÆk¼Vbk@Vn"],
+                    encodeOffsets: [[128712, 46604]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "2302",
+                  properties: {
+                    name: "齐齐哈尔市",
+                    cp: [124.541, 47.5818],
+                    childNum: 11
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@Þ@ށĠKV¯a°ƒ@„KVblaČU‚mnnšKĊȚKX„°ŽĠ@Þ£ôllÈy„™š_@a‚ƒ@a—KݍVwU@±™¯Uƒlkw@kÞJlÅUa°ŃČaW—šVôƒƨVšU„ƒ@»nI˜b²Kބ°Klkn°ƒ¯I@ƒƒkšK@ĕÇń™@aƒX»¯@VĵlaÿVamI@aÅÝउýƒĊȗJƒôȁÅkmƑۃ@kxġ@@l™aVk¯»ƒīŹaƒkƒ¥Å¯™JUaWU@@w™aƒ»„KUkÆkUm„UmwÛ±±UUbUŽUXƒwWwÆÝk™lkUanaWwnKl™kal¯ka™ƽa›kÅx™a¯@™amb¯V™lÇwÛĀ™V@x™šmêVƜVV‚aôV„wÈx@šˌx„¦VÞ¯VšlmX@‚ƒL@¯Ua¯LmV@„„°X„ċK™V™ƒ@UƒÈ@‚¥@w—ƒġIU™km¥Źwƒ¦¯lmn@°kxVV@¦óam„n¦l@nx™lĉVóšmx™n™ÒĉĀĊ¼„þ„šǔêÞ°ˌĠÞÒ°ĀɲĀƨźˤȤƨĊ°w@£nymwnkUUV¥ôÑVmkÆmUUVa™mVIkmô„lxkXÞþƒbl„ƒl@kV„ƆƒV„xV@š¼VÒ@šŽUŽšnnނJ"],
+                    encodeOffsets: [[127744, 50102]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "2310",
+                  properties: {
+                    name: "牡丹江市",
+                    cp: [129.7815, 44.7089],
+                    childNum: 7
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@U`lLUlVL„Ulb„aô„lKnŽU„„b‚K°¹²W°b„aÞb˜knyUlUkamř²L@m°@lšmš²n`ôÅlK„x„ÜKnxV@„l@œƒ›ÅXyW_k@™wm™ŹĕmƒX™»‚ƒÛ™l°ƒôšÈ„»š—ô˜ô_WW@Uœal»šwU@@wšUVƒš@VƒXI@w‚Ģ͑ÞȻ›aU_@mUkly@¯óV»XmWUXUWmnm¥nUUaWLk»Æ²IÇa™wÅaÝ°¯nUa±a™ƒ™@¦õÆğ„@„™@Åb›xU܁nÇłlb¯¦„ôó»mƒ—@±ƒUk@Wwƒa¯xU„V°ƒxXbǎŁUV™™ƒK@¹ƒKUaȯ@ōݙXƒal™ƒlÛkalÇUǫÇńÇakbÝƆ¯nlš¯Ž@¼™VUx@x¯W¼™Æ¯šmĖ„Ĭ¯ČƒVk‚ķÅmxœ°ô²V¤‚bUnÞW°bĢw°V°„XxƒV°z@bÞ`@„‚¦„KĊŽ„I@xƒŽn„™ÈÈK‚„šV™„@VššXK˜xX„mXUx™a™b@‚kXllĊnVlUx™XkxlÆk„m@U„Vlš@ÈwôxV¦šbU`@zÆV@„²KllÞz@b"],
+                    encodeOffsets: [[132672, 46936]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "2312",
+                  properties: {
+                    name: "绥化市",
+                    cp: [126.7163, 46.8018],
+                    childNum: 10
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ऊþÆÞ@bnJUb‚ĀnblŽĊš„„ÞlĸwǔÈŎKÈnôWǬê‚KV¥„ĸôUxš„@VšbU¼m`nnĊŽĊ„xlUšmkaVÿšLšwš@°»UmbKmݙUšwUmVknKUUl¯ƒKU™ƒUȃ‚™nK@ĠkX±lX„°„L@¯¥@wV_m›ĵ¯Ww™L¯ƒUkōƒÇVU™l›w—V󁱃¯aƒVka°wVk°mÞ¯Ŧřƙl™²™Ŏk™U@ƒmUkb¯ƒķŽ±„ó@kxȯó¯VUÒk„ÝŽ±LÛwÝ@ó»ÅUWw™mğw¯Ñ›@UkV±@k™a@¥ƒ¹Źÿ@aƒÅVƒwóVVUkU¯JÜóÈUl¯„yk£laUaVÑÇb@™ţ@kmómK™V¯IU¥ƒ@@ƒ™kV™Iƒ`@ô™¼„blU„lƒ™bÈb@xÇKkĢɳaÅɆō@ƒŽVƒK@z™@@¥ÆKnÜ@@aۏUw›wnU‚ķ@ƒ_ƒV°Ž@„klVššnULVVÞbVl@°™@nx™n°LŚÆlV„ȃmU²@VmĠLƒx„n¯xkWƒzšJ‚wnLmbXbW°šÆ‚™²™@™Žšx@JVx„L‚Ā²Æ°I¯º‚È@ÒnÈ"],
+                    encodeOffsets: [[128352, 48421]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "2307",
+                  properties: {
+                    name: "伊春市",
+                    cp: [129.1992, 47.9608],
+                    childNum: 3
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ƒKƒ¯kWW²ğl@ŽmLšÇ„„VVš„Lk°VVmLUlVn™xšVnނLnaVŽ¯¼™@™x™KUĀlb™n„`n„Æxô@VbU¦ĸŰĸbôxÆ@„™V¥„»„IVl°LUŽll@²„mV„x@ššÞܚÞVnŽlXÅÒlbÈaVVUblb„J@I°lÞIn‚Æ„mxnbUbVLÅVm¤@œţVǤXÈÇĖ@šÈ¼˜aXVÜaXbWŽnzŎašř„KôbšUlw@¯naÆKnUU¯Üa@mkkVUĊm„™żÝ‚ǖŽ‚K„™°L²lÆI@ƒ¯¥ĉƛVaÞk@ÝVaĠlnUVwƒœómaƒ@™wĉ@™a™VƒxamX@aƒ@UaÅLƒaVWƒ_nWm£nWm_ÅV¯ƒm@m„󤁚ݦƒ¯ÅalmX£ƒ™VWUŚw™mÇ@@IV™„WUw@ašI@„k@wŎ»Wƒ„ƒ™ÅVaœK›Ika@¥lUkUlwÅwVyÈwWU@a¯U°m—Ç@UçƒaVa¯mV»ÅwÝUlƒUk™V@k„mUk‚X£šw°@@ǃaÝIƒƒam™Ûam„¯lğmmI@J™U™l±ÅōŽ—kWa¯VÝa@Þkbġ@ƒxÛnÇm@akkōVōl±škšÅšťŚÝ°¯nUl¯xlb„U°b²„ô‚˜Uœxšk‚VÈUŎ„Vl°„šKXxĶ°nœU`@x°¦@"],
+                    encodeOffsets: [[131637, 48556]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "2308",
+                  properties: {
+                    name: "佳木斯市",
+                    cp: [133.0005, 47.5763],
+                    childNum: 7
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@nš„b‚„ÞJ„b@ȯ@™xW¤Vlƒn@lšUVlk„ÞVÆxU¼°nUb„bVèÈ@˜ŽnIn‚@šĢmlUw°™żƒ‚VUn@lnL@VôbšwĊ‚lœ„JķĸĢl„wôwƨxVVUƒŦšxšLź™Èš°`nnĠwŎJސĶwôJ„@¤Xn܄ĸlšn°¼È°lŽ„„Uš‚b„xš@„l@ÞÞÈm°„lôwšL°¼ĸ‚°Þ²nĠ@ôwÞ`ŤI„V„ÒĠU„„@„VJĸbƄ²@°ŽĊKšœ„JĶaĢȰ@ô¥°nš¤‚bČUš@Vx„mUw@a݁ţƒÇ™ķƒ@ĕķīU¯²@ÆmVÑô¯X¥ċç@™ĉ»U¥ÝţKWVÅkUVÝŎUmǍÝx¯aķxÛUóL¯a±óōb¯™ƒÑŃVÿƒ_Åķ„a@UƒK@wm@Van@UmmLVa—@VImmXUWƒÝUřƒKUwÝUUƒkVƒk@l¯X›‚Å_ƒJ¯k™Jm„ÅLƒa@¥U@¯Vƒz¯@ƒ`@¼šmxƥšŏKÛk@±laÛ@@Xm@™ƒ@xƽ@WŎnšˣĕÅ@@aÅ@@nÝbǏ¯@ƒ_U›kUWƒkb™wÝU@ç„Wlw@anIƒ¯lyœX°m°VšašÛšm@„mVwÞK°ƒšXlaXmm_ƒ@UƒkwÝK@ƒVI™ƒXmV»ƒI@aƒ¯ğW™bġaU_¯JU¯ġŽƒ„ĉ„k„ō`±nÝÆk„™bóĊ¯Xƒ‚ĢX‚mVn²JV„lbUè„ČmK—wlóğx‚xV¦UaJ›šƒbƑÿÝL—l@bmbġx"],
+                    encodeOffsets: [[132615, 47740]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "2303",
+                  properties: {
+                    name: "鸡西市",
+                    cp: [132.7917, 45.7361],
+                    childNum: 4
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@‚LšKVVnkšbVšÈb‚²U°VnklVlaÈL@anU°ÜmXV`œnôLƒèšxlŽšLX„˜L²ašVVmÈX@ķ˜lnU„Èl`ȹš@ŤŽ°U@x„KnnV„mlnnUl‚lVnnaŎwlVÞ҄@n¦šLVŽ°lšwVk„Lšaގl„n҄š@xmLÞ¤Wnœ¼‚WÈLVVUxlÈô„„WVaU_VKšKXUÆbn™‚nôK„bÞw°bÆWXamVwœK˜™Uw¯WUk„UlJUwVUa™@@kmyzm›ĉw@kVwškƒW¯ÅKU_Vmƒƒ™xU@aW@@kK@w„a@Kƒ@@kVUƒaky°_Vm™kna¯K@™ƒL™wġk@@IÇóX™ƒwVakmV@mwXUWanƒlĉ@ǙUw™KƒƒóšܛNJۄm°@›w—Å@ƒ±b¯Wƒ¹„WVwŹĕ¯kVmōb¯w@aƒwmV™UUb™V™IkaVwķ™xk¼›b@VXXó`󗙘ƒ¼Çó™¯„kŽÜš„š¼WŽn„źĖnššxl@X`WzœÆ"],
+                    encodeOffsets: [[133921, 46716]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "2305",
+                  properties: {
+                    name: "双鸭山市",
+                    cp: [133.5938, 46.7523],
+                    childNum: 5
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@™UƒƒUwó™mÑÞÑUÝÝUkmmŃyV¯ī„¥ƒUÿĉ¯mÇkaWbÅX¯aÝxƒaóLmmšÅaWV™LULV`UbƒXóƒkÇVwUUÇKX›»XmÝ£nK@wƒ™mÑkƒÝ™bƒKUl™x¯kU™Km¥ƒ@ÝÑkUōxmbUmkVkmmnkUƒmmƒL@w¯Vţ™@Ǻk_ƒÇmV—k@ĸVx‚VÈ°lLkllšUbōwƒnVW¼nlUx¯XmWUnÝ@™xÝUó¼¯J@LVbkJWnkb™W¯„ÝLUxƒn@‚™n™Ü™b¯U¯n›Wkz„°mJ@bkxƒX@èÞVšxlaX„lVVœ„`°@ȐÞa@mÆ@@bÆ@ˤĖm™Xōƾ@@wš„n@@WÜ@kb@²ÜlŐLƦ™nw™@»„_°@„y°UV@@¦„bÆKnƒšI°l„IÆ`œ°W@k„llUV„ÞVVx„LƚÞVX„WVnnUJ˜@UbnKVnm@Ubn@@x„L@VƒbÆĸ„`UĀƄ„Ò°šŎa²ô°bôKÜVĸw°bÞwȎVnÞōVUÆlXU"],
+                    encodeOffsets: [[137577, 48578]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "2306",
+                  properties: {
+                    name: "大庆市",
+                    cp: [124.7717, 46.4282],
+                    childNum: 5
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@mÇ@сǰ¹¯J±ÅÿƒKUw‚I@™wšš@š±Å‚™X¯WanamKx™I„ylX°wƒm„wğKUn±@nVDŽUƒÅkƙ¯Kšmmwš@@¯UkÝaUUVK™mU™lk@ƒ¯„U„`ĸ@V‚mœxVxܐ@bÛ@m‚ÅL@¦š@@y„L‚U„Ŏ@ÆɅɴblġÈL@wÇaša„ƒkkVƒaš»@ó¯_ÝJ™wÇaÅXny›U¯¥Å„@w™bÝa™Lmm@@ƒVUŽlbğVmš™¯Xƒm_ƒ`¯_Ux™m™L™a¯b@mƒaó¦Çk™¤V„@bóJknVx™VXx±aƒLUbVxkLVlLWlƒ@nX@VÅbWlÈnƒx„bWšÅbmŽ@xœbml°b™„XbW„XVmnn`ƒLmšnbmb@šk@mwU@@š¯Jlbk°lbkšmLXxmbVbkllšÅނxX„xVWVVa²VܲnxƒVVnÅlVlƒL„¼šb@xV@XŽVbšIÆ°„¦„lźb„Ĭ°¼Ulšb@kĢ@lw„@ƒÜlnȂƄóȘI„ĉ"],
+                    encodeOffsets: [[128352, 48421]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "2304",
+                  properties: {
+                    name: "鹤岗市",
+                    cp: [130.4407, 47.7081],
+                    childNum: 3
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@Þ¥‚™ô£nƒn@°„ÆUn`mXn¤mX„`UX„bÆKVb„@@bnW‚b„wšUšbĊ@šx„@nbšWVmƒ_mm@ó»Um„ŘWXkĠ»²¯‚¯nķšwŎ@ĊšŎK°bĸUnјKȦĠÈbÆknJššÆUĢV°IšŽšVƾƒwaV™ƒƒkÇ¯¯»™mķkۃWm@£ƒóIĵxݏōIğxmm¯_ǙŹš™K™wťŽ„UVUŽƧwóxƒxġkĸķƒIk›ĉ™xóa@UmK@kVmUŻ„¯šVxkŽġn™‚@mmJ¯n°V@bXVÇxUzÆxkxlVkV@¦lbœJ›LUbšÆƒ„X„ō¼@xƒl@™J@bVxƒXUš@JÈ@šn™xVÆUXš‚„W¤knÆb„°"],
+                    encodeOffsets: [[132998, 49478]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "2309",
+                  properties: {
+                    name: "七台河市",
+                    cp: [131.2756, 45.9558],
+                    childNum: 2
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@²mŎ_lƒĊƒ„ƒĢV°°IV`ĢbšaĠX„°@b„JU¼Wnš„UJ@„ÞLlxV„„@n`lIUa@K°Iô»ÞVšwÞ@VmnX°WVwmkX»‚U„mŎxVak™lkkKǯUUwÇWUn™U±b—KWƒ™Kk™w„çóK›mU_nW¯ÛmV@bÇKkbkUml¯U±VÇaU™™amlUU™LK›„k@ƒU@mwÛLƒŽƒwkLóÆm_™±™nkŽ¯@@n±KnŚlbkVV‚mz—lWXº@Ķ°"],
+                    encodeOffsets: [[133369, 47228]]
+                  }
+                }],
+              UTF8Encoding: !0
+            }
+          }),
+      i("echarts/util/mapData/geoJson/he_bei_geo", [],
+          function() {
+            return {
+              type: "FeatureCollection",
+              features: [{
+                type: "Feature",
+                id: "1308",
+                properties: {
+                  name: "承德市",
+                  cp: [117.5757, 41.4075],
+                  childNum: 11
+                },
+                geometry: {
+                  type: "Polygon",
+                  coordinates: ["@@lLnlmxn„„IVVlUnb@VVxXJWL@LގVnnV„J˜_@wkmšK„b‚x„wXk˜WXXšKlb²K@nVVVb„L@WlU²„lKVnUJVz@VVb@lżmVUVnbôaVX@°Ub@lWbXš@b@bVb°x„@VxÈLVlšaÆ@Þb²k°@lVUŽ@Xn@VW‚LXb@¤VXšKVVVLnm°_ƨ¤@aUIVa„alkX›°k„™V@„alwUVy„U@k󙰃na°UVUUmUÆw@mkLVUƒWVI„WšLnn@xlVnK„myU@ƒU°UXaV@U¥ƒU@Uƙ@aVUkWU¯ƒaU@WLUV@bkbmKULmKkUVUkmVIUwlWV²™Uml°U@W„LUwVm@UUK@_ƒKUUÜaXw@ƒVKUU@mVIUUlmnIVVVbÈVlKnbVKš@nI˜@nVnwVLVK„K„„˜Vnb@aUIVW@In™°@lVnIš@lWĢ@°UVL@b„@VyUUƒa@w@WUnU@Wǯ™K@UkkJWaÛbmk@mVaÞU@amkWƒ@mXUKkÿƒ£@a„kl@Um°UXwla„al@nmlXnW°znW@aƒwV™@ƒakbĉ¥VmU@ƒIƒVƒUƒJkUmWU™KbmkUaƒKkUVU@KV@@klw—™WaU@kmƒXVènbmlUUƒKƒX¯JkbƒI@JmIUWU@ƒLml@XkJ@U™kƒK@aVKwWa—IWwƒmUƒ@mU@J@UaċU™aUUƒVkI±ƒk@UUƒ@UbVVm@UVKƒLƒlkIWaULUWƒXUJU„ƒ@WbUb@lkXUxm@@JVn@J@b„nƒb@Vkx@bšLU‚Æn„JšaVXnKVVmzX‚°V@_lJXxWXƒK¯bÅamUƒ@lUI›bñJ@LÇKkIÇ`kxWL@„ƒ@@bUVUb¯xWKk„Å„VlULW@ƒŽn¦Ul@I™lmUUUVm@kWƒnkKma¯XUKWmnwVwÝL„mŽ™VUbUVWb@Lnxm„xVŽmbXx›¦@„nb@`™„ƒVƒ@kbƒLU„mVUlkbVXkºmnm@@xk¦šbĢÜlš"],
+                  encodeOffsets: [[118868, 42784]]
+                }
+              },
+                {
+                  type: "Feature",
+                  id: "1307",
+                  properties: {
+                    name: "张家口市",
+                    cp: [115.1477, 40.8527],
+                    childNum: 15
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@k™ġۙal¥@wn@nml¹UWlaVknUVƒ„Kla„@„Ušƒ@_ma@ƒœ¥WwnaU‚wnƒmw@KXaVUVašUnmWUk°™lƒnUVUXWVw™IWVóKUI@WXƒxUU@mma@kUKWLkw@yk@ƒaVkUUċaUU@Wk@Unm@UVmLm±IUƒkJ™kWƒ@a„I@m@U„ƒVƒ„Ula„@VXVƒXmVwnkWKƒKU_k@m¥ƒmX_™JmnU@km@U@KmU™VƒU@U™@Umk@@LƒmW@Û£Wƒka@wk™@aƒI@mmk@mUa@UmUƒIƒwW@aWUƒbU@kbÇ@kwƒ@makVUk™U@aƒm@aU@mxkUƒbƒKUXUƒ±KXVWLUK@wkU@V™@WXUa@WbUxƒJIƒŽ@¦VèVVX@±ê¯KUIƒ`¯UULVx@Vƒ@UKƒIƒVkLmVkKmš@nUJÝbkIUJVXšVVxVbU„VJ„Un™°bV„mlU°„XnK@Ul@lVÈVUXšx@W„@VXšV‚KÞb„n@VnbV„m`ƒUx™kW@UVkL™Km¼@lUnUJVnV„XV@Vm@@LV„klƒIkl@VƒWlŽULWKUL@mJ„@blbUVUlmzUJUxm@UUbċÜk@Ub@VšLVV„¦ôbVŽmšUKUkU@m„„@VlVn¼WbUJ¯@@„°šnIllÈl˜@nXšWlLœk‚J@bkxlxkxlXUlklJƒšXL@bW„n`@nƎXxlL@xl@Xb‚LœKlVlIXblVUbUJW@lX@VL@VVŽšXšJšw„n@WnL°K„bVbl@VI@K„@U@nmVmV@XUWI@aXm@™VUUkWmn@lmUUk@mUmK@UnwVĉ@ƒƒmU_V@XJôVVUšLVUn@šllUnJl_n@šml@XŽlLlw²LVJUL@VmbVblVXmVnlš@Ť¦„nn@܎@bšl„@@XV`„Unb@VlLVb²J‚Xn¥ÆÑ@¥Þ@"],
+                    encodeOffsets: [[118868, 42784]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "1306",
+                  properties: {
+                    name: "保定市",
+                    cp: [115.0488, 39.0948],
+                    childNum: 23
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@VbXWš@@UlV@xVLXKWU²LV„VW„L„alVnwV@@b„n@bšVVllUnb„@lxÈ@laV@„aXV@b‚X„x„J‚nV@VVb@nnl@n„J@blšl@„ašƒU_VWUwVUškUm™Ukb±mVwœU@VIUW@UWk„@VU@ynL„m@IV@‚bnK„LVaVmnIlaXwV@@WVL°@@xnX„@V`V@VbUVVLVKnwnL@ll@@_V@VVnaÆ@œKVXÆ@nƒ@wƒKmU—™Wm@km@kÜKXU@ÑW±nIUwVƒ„Kla@I°wU±kškmm¯mƒ_ƒJnƒaƒwW@IVaUama@wƒUƒmU@mVw@aXk@mWa@£km@aƒ_kVmUnWW@¯bƒkUmk@ƒVÇm@@kUU™KUU™@UVUamVUaWIkb@xU@@amUkKƒVkam@@kVUkUWmKmUkLUb@xmJƒ™U@UImVÛVmnUwƒJƒU@VƒX@UWm@Ub°¦UšmxklmX@`ULU@@UW@@xkn¯@makV™UmxUb™°ƒlUšƒbUbƒnUJƒUUVƒa™LkbUU›JUU@mUUUƒJkaƒ@™xUIWJƒUnƒJ@V™zƒ@kb@`@bln@l™bƒŽ@X@š@š„@Xl‚bnbVb„@„„VJlInlšbVw@U„K„l@lbnan@Vb‚JôLn‚UzlV@lÈLVbVK@LVx—VWXX`WxXz‚bV`UXV¤nx@„bVlVnVlUL"],
+                    encodeOffsets: [[117304, 40512]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "1302",
+                  properties: {
+                    name: "唐山市",
+                    cp: [118.4766, 39.6826],
+                    childNum: 11
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@„@VVl@²„lJ„UVVšbČVVb‚@@InV„@‚V„nXx˜JXb‚xUL@b„Lšl@VlI@Wnk„KV@VXnJ@I„Jla°I„W„LVVnkmaUç„WVkôaܯ„@nV°wnJlaV@VUnUUaW¯wXWWwna@£UaWKU¯ƒ¯@aVUkKUamUUƒn»‚an™„IVwUWlkš@„LlWVakU@K„_lƒšbÞU°@šy°n„@„KÈkWW™ţ¥ĉōƒkġWUw¯£¯ƒÇwţwƒ@kK@kƒ¥ÝwÅbǤېťV™lW°@ĸ™x@VVVULVLkl@V@Xƒ`Ub@Xm@UWbƒk@ÆVbnLWV@lnXUbl‚@X¯lmU™VkKWLkK@_UK@U@UmmUxmVXLWVULkU@`W@ULUK@XlJXzV@@xml@VU@UX@Kk@WbUK@Xn`ƒXmJnšmškxUVbUVlVVxUbV@nKlL„kVKÞbVKXI°KVšmVUIUKULVxVJVLkV@Vƒ@UbU@WUU@UbUK@b@nƒV@VkLmb@b"],
+                    encodeOffsets: [[120398, 41159]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "1309",
+                  properties: {
+                    name: "沧州市",
+                    cp: [116.8286, 38.2104],
+                    childNum: 15
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@@ln@UȄŽl@Vn„l°aX@mXnVlU„`@bln@¤Xb@nWl@bUx@nnV‚„„V@xnbVbUb@J‚X„x„b‚mXa@k„UVwlW„k„KôVm@w™kkK@kl»Èƒm™VKXkla°@XVV@VI@ml@@Vn@VX@V@J„@VxUzVVšš²blVk¦@šĠ@@»š@VK@VÈLlK@XnJ@alIUl„a„VVbš@„n@a„U@WUIV@mUn@mKXml@lL@LnWšb@XV@@a„VVb„V„@VV„IVWÈb˜IÈ»ƒǟlWšaVUÅUƒƒ™Um@kVU™WVkaUwmaóUƒJUU¯ÑU¥mk™¯UaƒKÅnÇyóXmWÛX¯aċbÛa›J—W™ÝU¯»ƒaóóUm@IƒšVVl@bƒLUJWLX@@xšXUxl¤V@V„nVUV„XVbVš@Ž„@@VVn„°VŽ@ţU¯VƒUmƒUWV@mUXƒaƒbUKUwUaÇKn„ƒVk¦Wb@VnLmV@bkV@n„xW`Å_UVƒV@bƒUklVX@VmlUƒx@VVL@x—VWVL@VW@UUm@"],
+                    encodeOffsets: [[118485, 39280]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "1301",
+                  properties: {
+                    name: "石家庄市",
+                    cp: [114.4995, 38.1006],
+                    childNum: 19
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@la„@šy@U„I‚m„VXIVJšw„@lb„IVVnV‚@VVœIVVlašK„bVU„VVI„mVa„aV™„kš¯VanwšVlUnb°@lm@wX@@VV@VK@_nWlknwV™¯¥Van@VX‚@„W@U„V„IVxnmÜUnUVJV@„šnI@wValKnV@k‚mU£na@mVk°K„LVa@UU@UƒmknWWkXU@aWW@@km@UaU@@klK@UkaWaUnamm@U„a¯wWU@UkƒL@ŽUn@x™V™lUXVJUb™LmU@aUWUkmKkLUUm@mW—XƒaƒmmkkWUm@@U¯JUUm™kU¯@mKĉxÝwÝ¥LƒUóŽmwkUUUWVkKm™kKmLX„lxVLVxXJ@nVJnz@VWL@`nX@šƒxƒ@kVUUmJmIXx„JV„ƒnUVƒ@UVV„@LUšƒ`UXVVƒ„ƒlXL@l@b@VmX@b™xn°™UƒbkKWLXlW@@bƒK„mKULmakLUlmb@šXb@xmXU`V„b@`lLx@nWVXL@‚°WlXnlb„KVK„XVb@˜X@l_lJ@V@XnŽ„I"],
+                    encodeOffsets: [[116562, 39691]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "1305",
+                  properties: {
+                    name: "邢台市",
+                    cp: [114.8071, 37.2821],
+                    childNum: 18
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@nKlLnšlLXUVVlVnxô„V‚KÞ¦ÞxĊwnL°@lVnšVV°I@Vn@V‚lXnl„n„b˜WnXn@VVlKnLVlVX@bnVšKVaUIVWškšU@wVm@¯@U¥VmU_°lšK„k‚w@LX‚Va„U@wšUƒUUKlUóW@UVUœUlƒ°K„wlKU_na„KVnlKkkšWWa@IœJVa@IlJnU@„KVUUmVlaXUl@lm@kXWÝÑnkƒ™±™k@wğ›@@U@mKĉLmVJ@zmlnŽWLUÝJU_ƒ@@šmJkXUVlbklÝ@Ýa™b¯@¯±JÅwġaUU@ƒkU™@mVI±bUKƒL™WUXƒJkaƒLóKULWbUVkKmnk@@bmLUŽƒl@b@mnmJkUULƒaƒbnŽmn@lVV@¦n@„l@b‚znx@`Vz@b„xnV@xl„lbnKVx"],
+                    encodeOffsets: [[116764, 38346]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "1304",
+                  properties: {
+                    name: "邯郸市",
+                    cp: [114.4775, 36.535],
+                    childNum: 18
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@„bVKlVnInm‚@@a„kVnK@al@nmlLVUXaVKôL„Klb„IVWšX„KVL²a‚JnUš@lV@„VVĢbÆx²I°Ž°@šaÞbÞ@lkkaVUlWnI@™„@V`ÞI‚VXKmnk@y‚InUĊKƒÇkUUamUUkƒƒ@aU@U™ƒk@WUwVkVJVkkw°a@„mK@UX@VV„LVW@wšwVa@¯Xm@@lUIWaU@UWkXWmU@UwmUkKmn@lkVƒ²™VƒaULUVmJUUUwƒLma@™UmkIUm›L—mVšmx@b™LUamKÅL@VmbkU¯KÝamzkJUb±Vkb™L@lU@WIkJƒzkKmKƒnUalWkkKW@@nkbk@WW¯XUVUJ@XlJ@Xƒ@XlWLkUƒ`VUnaWa„UV@UVIƒaUxUUmVƒK@I@W@DŽU@@U@bƒ‚@nmKXmx™@UxkVWUX„@`VLlL@`™zX‚Ýb@b‚„@VUVkIUJVz°KVlnLlKnL„xlLVVUVlXUJ@nn‚„I@mVUlbn@@Žm„@bV„nV"],
+                    encodeOffsets: [[116528, 37885]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "1303",
+                  properties: {
+                    name: "秦皇岛市",
+                    cp: [119.2126, 40.0232],
+                    childNum: 5
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@lnV@Xb˜škx@lU@@LUVlV„LVbnl‚ašLXVVn‚l„I„V„U„JV@UnĊ¦la„bš@nJ°UmƒV@„wn@VU„JVI°bnWlXnWVLVK²b‚akk„lI@aUaVƒUwVUUalaVwnUVak¥šX@W‚kœLVÓm„mUK@_lWš@n_UK@alÅ@ğÅƑŃݍmƒ@їţÇlƒLƒ@¯m™z¯@ÝV™ak„ƒ`@LlVUbkXƒK™@klVXUxƒJmšbm¼V„nVVblLUV@b„°V°XLVb@¤mbXxWX°xXŽVbmVUVU@kbmI¯xmUƒ@Û°óbUl"],
+                    encodeOffsets: [[121411, 41254]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "1311",
+                  properties: {
+                    name: "衡水市",
+                    cp: [115.8838, 37.7161],
+                    childNum: 11
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@„KVlV@X°xƒb@VnnmbVŽXblb@VkL@lV@Vbn@@l‚@XX@bWVXlmXnlV„V@@VUbƒK¯LUl@nmbV¤n@l‚LXnlVUV@ln@lb„UlLnV@bV@@wlaXJVbnUVbVUš@VVšLVVn@VVX@@U‚KXU˜U@wUK@U„wVnk@UUWlk„V@a„UVUÆ`X_ƒw@mlU@anUmK@UXal¥„UmƒÈLVbVxVL„a„bVW@nXU‚Vn„„V°UŤV@Uƒ¯Um@Uƒ@@U™UaƒWVUmUUƒU@k£Vw™W@wW@XKƒIUa@wU@@al@UK@_mKXKƒbUU@aVKmš@Xmƒƒ±@kbÇakLğVaUw@a@ƒmkUJƒk@ykw@£ƒWX@lknk@WVkbUŽVnUVƒL@‚mVkI@JUb›I@JXb™XllkLUmƒLmbV`kLƒx¯Lk„›VUV@VôXkVVL„V™V@xƒVUbW@Kxƒl™L¯kV`UnV¦°@"],
+                    encodeOffsets: [[118024, 38549]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "1310",
+                  properties: {
+                    name: "廊坊市",
+                    cp: [116.521, 39.0509],
+                    childNum: 9
+                  },
+                  geometry: {
+                    type: "MultiPolygon",
+                    coordinates: [["@@la„Ušš@šUnL@VWbklWxnIVV„V@X„JlbUlšXVbn@@K„mV@@X°WVInJmn²@lmVbnL@amKV_kwlmX@@LVamaXaƒaVU@UnJVanLlUkaW@UaVakK@IlKUU@an@ln@alKUƒkIVa@a@klaUKUV@UkUV¯šKVƒV@kUmƒU@@a¯ImJUU@VV@UL@Uƒ@@WXUWa@Ukwm™@ƒX@@w@al@@aVIUmVUUUVWUknK@I@™l¥kU±a™™UUVyUwƒ@@I@UUWm@@Uk@@nUJU@WU¯@kbWlULnšÇ„k¼@llLšl@xUnóŽƒLƒlkXUxƒV@lWb„I„`°nnn™llŽV²¯x@JkbƒLU„VxmJX²@ÒWVÛL@lln@‚Xn˜šnV„L"], ["@@@kX@Valaa@KWI@UXW@WanaUIW@UaUKķŽk_W@UVUKUš@bƒ@UamxVXnJUbWVXLVbn@W°kb@U@Wó¼mIU¼k`V„@bVbl@„lX@lUôVlUœIV`lX„Vn@lUlVn@„l@UVaƒIUWl£Um™VWU@@UUKlUUUnƒVL@KšUnLVWUa›@™U"]],
+                    encodeOffsets: [[[119037, 40467]], [[119970, 40776]]]
+                  }
+                }],
+              UTF8Encoding: !0
+            }
+          }),
+      i("echarts/util/mapData/geoJson/he_nan_geo", [],
+          function() {
+            return {
+              type: "FeatureCollection",
+              features: [{
+                type: "Feature",
+                id: "4113",
+                properties: {
+                  name: "南阳市",
+                  cp: [112.4011, 33.0359],
+                  childNum: 12
+                },
+                geometry: {
+                  type: "Polygon",
+                  coordinates: ["@@lKl@nVV@„bn„@VVnm‚nL‚LXx@š„‚VLlKVU„IXWÜ@șlbl@XUĊUlwnW„LÞw‚m@ÞUVmnVl@nX‚JXLm@VnnJla„I@VkxVb„@VŽln„J@knKVn„@°aVanal@XK°b„‚@š¯VJXIš„VK@al@nV„k‚@nK„a‚b„@XL@blVVKVLXK„@VaVI°mVaX@V_@a@yUkVw„VšIVašJ°™@anIlaV@nKnXÆm@wUUV±UUWUKnaWwXUWmŁ¯Vƒam@kakImƒUKƒ»lan@VXXa˜W@@UlUUa@a@UlwUƒV@Xal@@anIVaUK@V™XmwVmUmV„LXl‚@nalLnal@„šnKlkV@@UnJ‚UXnl@nVl¦V@@VnJ@nUVVVVIn@Va„JƗn@@K@m„kƒa@kmWVaUI@a@™k@@aUL@mmaVIUKUVƒ@@IU@mƒUmmL@K@UUUU@mW@@nU@ğ»mVmbk@klW@UXnV@LƒJm„™lUnUJ™UUUWƒƒ@UnkKƒxmLa@ƒ@@lUU™bmUVWk@@nkUmam@UakJU_ƒVm@ÅlÇLUVmVUwULƒKU@ƒk@UƒVUlU@@Uƒ@UaUUWaŎƒzJƒaWLkl™b@bmL@„kKƒabWŽUVƒ_@mV@b¯JmXUbUK™¤ÇLUU@b@JkLWmkUWIkJ@VmX@JUbVXU`¯VV¯blK@LXKl„UV@Um@@Uk@kxWŽkbƒL@KkbmL@‚UXmaU@@l@x@blX@xUJ@bULUlULÇ@@VšnU`W@@nÛ¼U@@VmKUkm@VVX@@xǚ@bUbVb@VX@@x‚LUb@lƒ¼XLlbUlVVU„Ub@n"],
+                  encodeOffsets: [[113671, 34364]]
+                }
+              },
+                {
+                  type: "Feature",
+                  id: "4115",
+                  properties: {
+                    name: "信阳市",
+                    cp: [114.8291, 32.0197],
+                    childNum: 9
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@VllInJlknJVkVU@mXlUÞ`VnV™VU@U@y„@nXlKV„nJVkXKWaXI‚b@yVk„VUkVwn@‚K@nW@k„KlUXVVUlbnUV`n@V_V@llX@@V„b@bV@@nlVUb¯‚WLnbmb@ŽnLnK˜b„U„bVWnLlaX@VVUX@Vln@`kL@ll@VXVJÈIVl@XÞJ°Una„LlylU@UXKlnn@lanLWWnbVI@KXKVL@LVWVL@UVKUIVWX@@XÆJ@In`@lJVI@a„WšÛnK@UlK@UU@VK„nlm„nXal„UllLUbVVšknJ@nV@Vm@a„l@@xnV„„lJVUU@™w@aƒk„@XW@_mWnUlŁUmVKV@VXwW»XƒWaUwnkWUkVUƒU@@@WlaUkkaƒIWVkm¯xmIUmƒLUVƒaUIó»m@mmwXk@a›mk¯¯l™@wƒmkLmmU@UbkUWJ@XUbƒJ@b@l@znÆmK@Xk@Ub@lm@ƒI@akmVKUUVUkU@U±JUbkƒ@IWmkxƒa@UUV™UWVkIUaW@UlLWn@VkJƒI@VkK@L@bmKƒkJmUUaUKWXk¼VxnJ@„V@@VULV¼ƒ@@UkaUlWL@U@W@IkKmL@KULUWULWKUXUJmIƒb—KƒŽƒ²UW™nWKUUkLUƒmUUam@UU™@ƒmUL@xkV@„VV@bmV@Vk@mwkUƒVUx@mbX‚ÇnVb„‚UL¯šWŽnUVLVb@xnlWnU@UVUVVUbVVlVkn@llVUXUWUXVbUJ@bmLUJnb@nVK@bl@@š@bVJUbnX@l„b"],
+                    encodeOffsets: [[116551, 33385]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4103",
+                  properties: {
+                    name: "洛阳市",
+                    cp: [112.0605, 34.3158],
+                    childNum: 11
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@VVUllLXl@LWn@J„@bƒKUVmnL@`VblLnbV@„b@JmL@LnV@VV@¯„VJVnXL˜@nm@aÞ@‚a„k@m„IšmVbXL‚ynLšk°@°aVJnUV@UVVXk@WJ@VXLlUnJVnnƒ°U@»°U„wl@šb„WmUXƒÆ@VLXU@m@U„a@I›mkb™a@naWW@_@WXUV@@U‚ƒ²@„K@I±U@¥kKWLóLlƒa@£Um@kWKXU@mlLXUVKUU±J¯_@`UL¯Wmk@Wa„kkƒlUnƒVUVaU@KUU@mmK@_ƒa@KX@VaUIm±™k„aVKVUkw™@kaƒƒW@kbkL±UUaƒK@UUKVak£ƒ@UmmL@lƒIkmUƒ@Ualw@UƒJkbmIUmn@WKImWk@mUUnÝV@ŽnÝxƒKmXkxĉVWVk@kaċšÛ@WXƒJUV@zŽm„VWnbUbVbšLlUnŽ‚lUÒnWV—VWnk@@Vm@kxm@Un™l@Ll@@V@šXnƒškJV„šV@nlVXx˜U@l„n@aš@VLnWĊ¦nxš@lbVKXLl@ރVLƒ„XJl@XXl`lIXVl@Xl‚XUVšK„wV@lanx„zUbVJ@VVX@b"],
+                    encodeOffsets: [[114683, 35551]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4117",
+                  properties: {
+                    name: "驻马店市",
+                    cp: [114.1589, 32.9041],
+                    childNum: 10
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@n@„b°UƂXnVlnLÜ@VLœm@n˜@na@J„„m@k„@lVšVxXX@„V`lLV„XVV@VVÞLVV°„²@lašbnxV@@b„Lšmlm„_VWnIWUna@lšLšbnV°ƒVL@KšV„LVUVaVLXK@mÆXna@wVm„a‚@Xw@KlL@a„@Va@wUkaWnIVƒla@Kn@Vn@VUl@nKVn„J@LnK@aVkVUUWƒ@VakUVanI‚²X‚W@UUU°KnUVLl@XaVK@ašU@KUI@W@_lm@KkLUKV_Uƒ@»@UVJ@XV@@mVL@K@U@Kk@VwUUm@kmWL@VkVkzƒKmb¯VÝI@WUkÇJUIUWk@@klK@_km@UVWUUW@kbmKUXƒaƒV—amLmK@namaXK°VakU@mU@@aƒa@UW@kkU@U`m@U_mVkaUVWUkVƒL@lmX@ŽLm@UxVlƒUUl@zaWJXbWLUlmIUƒkLmWƒ@@z@VUVUšUmÝ_kVWŽ@nUVUlmIklmIkJUkƒl@n@Lm@؃IUbm@UJUUVU@mmI@UU@k¥mUk@WmVmI@VU@klmLƒ™k@mbkKmb@WkƒKUŽVnUnnxšW@UVLUbmJ@bk@WbU@V„kx@V@bVbkV@V‚@‚—XWbUWm@kb„¼VLn„lJlb"],
+                    encodeOffsets: [[115920, 33863]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4116",
+                  properties: {
+                    name: "周口市",
+                    cp: [114.873, 33.6951],
+                    childNum: 10
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@lšnb@xlJ@UnLlKXUlJl_„KnV@xVL@bkbVVUè@šWb@„Ubmš„ŽkšVšmbX„VJnUl@„a°@@b„LVbƒlXx˜InmnLVw‚anJÆw²IlmnXVl°VVbÈaVb„@lkn@VWnLlUVmÞUUklƒkƒVkUaVaVaUw™K@kkaVWmw„_„‚l@nU„VVb@b„aV@VV@zXJl@@kl@šlœk°WVnÆbnbUšVJ„Iš@VKVm@k™K@_kK@a@aU@@wW@@k@aUW@IUWVUnLlUlVXKVwmk@W@—VWa„¥@k@lnƒUIÇKUaU@ƒUUVmIUV™Uk¥ƒVma@¯k@Wanwmƒ„@@n@@m@UIVƒkUVamUXWƒaV™U_™@ƒmUVUImW@aUIĉK@VmI™b@lU@@n™JƒkU™@KƒIUmmLk@UVm@UŽm@@LkbU„mJXlbV‚@xUbƒ@@bkK@LWx@ƒbUn@xmbÅW@nWLUKUbUVƒK™U@LUK¯„mU@šVV@xULUŽVL@bU`WšUz¯aUamKUaƒ@@xkX@x"],
+                    encodeOffsets: [[116832, 34527]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4114",
+                  properties: {
+                    name: "商丘市",
+                    cp: [115.741, 34.2828],
+                    childNum: 8
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@XVl@lLȃ„@VkV@V»UanƒWX@VaÆÇô@ÈaVX@xVJXUÞU‚aVLĸbXKl„V@šm°Vn_ny˜XX»mUk¥lK@a„_@yšInaVKVa°_@WXI@ƒ@K‚VnIlbnaV@„l„@‚a@_w@ƒlwUKm™Xa@UV@š»Vƒšw@kUKVUUm@w±VUXUKUwmJUUƒ@km@@±mXkmUI™@mm™KUwkbWakLWaUIkJmŽƒX@l@@VUX@JWbX@VbULWbƒlUVULknlV@bVJk„mb¯KknWmk@@nmVkx™@ƒVmU¯KUnUL™@ƒJUIV™maÅaUm¯X›l™kk@@lk@WI@yUUU@ƒb@aUaƒUmVk@ƒƒ`nxUXlb@lšLVxUbUbVbUll„k„VlÝVUnkVmKUXm@klƒ@ƒnUx@xnxƒn@`VX@V²x@V@b@„Wl@zU`VUVVb„L@Vƒb™W@bkXllkLWV@V„@VVÈwlVœ@@X˜K²Llb„WnnÆL@VnJWn"],
+                    encodeOffsets: [[118024, 35680]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4112",
+                  properties: {
+                    name: "三门峡市",
+                    cp: [110.8301, 34.3158],
+                    childNum: 6
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@WKUmUI°ƒU@@UmU@KnK@IƒaU@makKUa@_‚KnmVU„L@a‚ƒ@IXm@KWkkKVkUU@aUW@UUIVaƒymwkbU@ƒx™LVUWWkk@WUkJk_WWk@WI„ƒUK݄k@WKULka™@mwĉ¥mXUK™@@bƒm@k—VWwkU@m™UUƒlI„™Wm@™@Uk@@KškVmn@lwn@@Ul@Xm˜UXUmVсkmkV™KUaVamaUXnƒ‚@ykLUKƒ@™WwKmKnUm@UmƒƒaU@mUk@kL@lƒxċxUnkVmnXxWb@`kzWJ@V—LmVUn™lmUL@lW@Ub@VšXUbš`VLUbUJ@nmnUlUUm@@bUJlnU„š‚U@lxkbƒ@@XƒJUnƒ@kb¯VVVmlXXlJlzn@VlkVW@bkK™bmškŽUbVb„lƒXVxšKÈnšwÞlĊKlšVnKlwX@lL@xlUnVn„@šl@lmX@ƄÈb°¼ÈwVJlx„_°xšašlšUÈxlUnbVxnL@lllšbm„n@nb‚@@V„L@V„@@„VLšJnIVVlKnV„_"],
+                    encodeOffsets: [[114661, 35911]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4107",
+                  properties: {
+                    name: "新乡市",
+                    cp: [114.2029, 35.3595],
+                    childNum: 9
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@XVlL„K°bUblbUbšl@nX@W„XVVKVkš@@Žmb@„Ubn„W`kL„LƒV@VVLnKlVXIlVš@@a„@l£nWlƒkVa„@°bnUlLVlna‚bnUVUXKlU@ƒ@lk@a„I°y„@ôkUU@wšmôšnkWakml™UkVmkUlmUUm@nkUKWanamU„LXW@U‚VnUln„`l„œblL°KXV@ĠJ@L°„šJšUVw„anK@UUImmƒkK@¯±Um@IVmUmmÅnWaUK¯aUk„w@W±kVƒx™U™VƒwƒnÅJUIWaÝJóI—bm`ÝbÅImJUI¯¥¯@mU¯UƒJmnUVóUkl±V@zXl„bWVXL@bm„mº@@XmJUXU°llk„@nWJk@U„@¦U`m¯ŽWx"],
+                    encodeOffsets: [[116100, 36349]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4104",
+                  properties: {
+                    name: "平顶山市",
+                    cp: [112.9724, 33.739],
+                    childNum: 8
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@l¤UbVL@V„LVb²VlKlaX@„„lbš@lxUVULƒbšln²VJUbW@@L„b@`nL@nVV@LVŽUbUVm„kVl„ƒlXbl@Xn°ŽVK@_°`²IVVV@VUVJnInaWK@Uš@„K„LÆ@nmlXXWVUUw@klKVa@knyVkVanI‚JXUl@XbVUl@@aša@mXk‚bnK@UlK@UUUVaXaWmkUm¥n—WmXaWaœkl@VmÞb„KVL@aVI@mUwVm„@KōméUL™KVaUk@kUK@U˜WXI@VlKXU‚@VVnInVV@VLlK@UUƒkKU_@ƒWWUwU™@klƒn@ƒƒ@Imb—@@m›nUKÛ@mKUkWVXxmbVLXŽVVU²VV@xÅnmWmLU@kbmJ@b¯š™IUb™JƒUUxVl@z@bU`W@Ub¯nUJUbƒ@WLUKULkU@aWKƒ@aƒbmL@ƒlmUk@@bUL™ƒWJUI™°@ƒŽ¯aWLk@mbUb¯b"],
+                    encodeOffsets: [[114942, 34527]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4101",
+                  properties: {
+                    name: "郑州市",
+                    cp: [113.4668, 34.6234],
+                    childNum: 8
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@@nWVUKÅ@W„nVnI‚ŽV@œkƂšwV@šnn@lxÞlnôJ˜zXJl@nalUČVlƒl@²UlkôVVUnm„I°VnV°@°¦VJnIÆJÞan_VmU@ama™@kU˜¥kaUklw@UIV¥kVUI@ƒmmUÅmUlƒwVU@amU—JWbUakVƒ—Vé¯Im`ƒk—@ƒwVWmLkU¯ŽƒXkWmLmx@UUƒbm@@x™J@LbW@UUVWUkVKƒ@ka™IUamKUkkmmLƒUkJUVWXkWmnÅ@ƒKƒL™@@VXLmbmJUIUVU@ULWVkK@nWVXL@lVn@¤„b‚kôKXKlL@¦²V@JƒL±@„@VU@WV@X@`XXmb@Žšblaœn@Jƒb@V"],
+                    encodeOffsets: [[115617, 35584]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4105",
+                  properties: {
+                    name: "安阳市",
+                    cp: [114.5325, 36.0022],
+                    childNum: 6
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@°kVaV¥kVmUkWkWVkVKUwkkmKUU@a„wWWXWakKWkXmlašIVmX¥ƒU@a„@WnK@kƒƒ™V™I¯ƒ@KğI@WU¯LkK›akƒƒ_kmmVU@VWXƒKnVmbXbVLmln@VVknlVUnVlkšlnXbmlmlXblnÈlWbn@@nšK@V„L„bVV°VVzšlnš@V™xƒI™b™ŽU@WLUa¯V™UkWõ@¯kkmxk¼l‚„XUlVbVLnlULmU@lƒLkVUlƒX@xW@¯mUƒ@UmIUW™L@aXa˜kU™¯anƒWk°@k™kKmmUIWaambUkkKmV¯aƒ@UblŽk„mXk¤ƒ@@b™@UbULWVnb@lUVVnmšnVVU„J@bWXX@WJkL@blVU°UV@XlWnXUbW@UVkVšVWbnLUJWLUK@Lnn@blVU‚„nUblxVUVJXU„a˜@Ub„LnUVV@mVIVVn@UbV@‚XbmbUV„_lVXUWanJVI@WkI@WVIVU°WXXl@la@mX@lLXl‚kVbœm‚X„ylIXJV@@kšKla²UVa„IVyÞb°LlVna@UÆKnLVbšK@anwU™"],
+                    encodeOffsets: [[117676, 36917]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4102",
+                  properties: {
+                    name: "开封市",
+                    cp: [114.5764, 34.6124],
+                    childNum: 6
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@lUVbXa˜InV@bUV„x‚knVVÆnn@„VJlUU¦VJ@kxVllb—¦lVš@nb@bVŽUn˜aôJÞIXbVJÆI„m„xšUšV„w‚U²l@XƒxVl°bVLXb‚`XklUnmVblLœ@lmšx°LVK@UXIVašWlL@Ukƒ°KkVaVUXmmI@UÅKmmƒXka±K—L@W›@kUÇxUUƒ@@UXUlKkklW@ašX„a@UƒKUaVUUV_@yXk@ƒ@a@U±w@UUW@_„mmw@wVw„mUaÇbUa¯UUkmWkn±JÅxmIbUxmKmn—JWw„kUaƒK@a¯@ƒbk@mVUIWƒ—Lmwm@Ua@WJUb@LUl™@UUmLUbWJ@VL@VmXWWzUJUꄘ"],
+                    encodeOffsets: [[116641, 35280]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4108",
+                  properties: {
+                    name: "焦作市",
+                    cp: [112.8406, 35.1508],
+                    childNum: 8
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@V@VL@x@bXŽWV@XkššlUŽWX@J„@nI@KlL„KšUVaV@œJlL@KUk@KÞL‚l²_‚@nWlL„UVVš@nLWVUJVn@anV@a„wÞUVLVx„b„@lW„@lbXn‚Vn@@¼šL°mšKVn@bnl@nVK@blb„L„W„U@VWLXV@nlKn@lVVbXw°nV_@¥Vƒl@XI@mlƒkkV¯VWnI@W‚@n¹nƒ@aWKXUƒaWk@yk@k„ċUkVmbk@WI—yóImÝkkwm@™mU@™xŁ›lU@mJƒX™ak@ƒx¯V@¼¯Vm„UmmIkVWK@UXIl@UWVUU@mVUI¯b¯@™lmKzWKUa™nƒJ@nƒlbÝ@@b"],
+                    encodeOffsets: [[114728, 35888]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4110",
+                  properties: {
+                    name: "许昌市",
+                    cp: [113.6975, 34.0466],
+                    childNum: 6
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@lI„VnKlnVlnLVbšJlb„@ULVlUXVVX@‚a@KšI@wn@„aVV‚@nwnKlX„W°lVnKUX„x˜@„ln_°JVIXy‚XnW@U‚K@UXIVanKVVš@Vk@KVaXI‚@Vbn@nx˜KnaU™l™ƒn™Va@ƒXa@™VçUUla@aUK@wmUƒLk`kIWVkLmK@V@XUlƒn@JXV@nm„™bU‚óIƒmUa±@@ÑóVUUk@UlKVU@akWVUUlUUaUK@UUKWbUkÅJ@XWaƒ@XbmJ@nUJ@bUKƒLÝaUnk@›lXbWbXnm˜n¦lVXnWbUbVV@VkL@VmLaWl@n™b@bk@UVWak@WVImJUbUlmz@lUbkL@lVx"],
+                    encodeOffsets: [[115797, 35089]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4109",
+                  properties: {
+                    name: "濮阳市",
+                    cp: [115.1917, 35.799],
+                    childNum: 6
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@lLXbW‚XXƒx@bVVnLllVxULUl‚XXlVlUnlŽU¦Ub¯l˜nœK@V‚bVb@šXbVL„KVxVVnIlašb„a„¥lU@wnalLnVVlVLXnlWVXn@@lVI@WnU@mƒÅW¥—aW_k@WwXy@kmƒ@wU„mš„š¦šlUxVLV@UwšJ°xš@VX„@Vb„@š`VX@VX@llšIVbnJlI„bšV„l„˜J@ƒmѯLóa@ƒƒKUa„k™ƒ™Xƒ@UK@wU@ƒlWUUݯImW¯aƒLUKU@ƒkƒ»k@mƒwƒa@UnKWI@ƒUU@akVWK—k@a±ƒbóUWKXUmk™KUmLƒbUx„„@lmLXŽƒ@@b„VW¦Un™JkbWnXl"],
+                    encodeOffsets: [[117642, 36501]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4111",
+                  properties: {
+                    name: "漯河市",
+                    cp: [113.8733, 33.6951],
+                    childNum: 3
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@@Lƒ‚UnVxnIWa„@Xb@WÆIVlXaVL@VVLVbkVVŽUVlX@bUVkLV‚l@VVôU@Ò²@Vb„nôJVšanƒ@mWU@I„mVk@WkI@wmak™@wlW@w„@VbnLVb°bVyX™V_@aUKVVK@wUU@™™a™K@kmbXVmJUXƒ`kn™nƒK@aU@mw™akb±@¯ƒUUÝKUUU@WU@VkLUKU@mUmJUU@WVkL@UWJ—X@VVL@lVlUbšLVKnêƎ"],
+                    encodeOffsets: [[116348, 34431]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4106",
+                  properties: {
+                    name: "鹤壁市",
+                    cp: [114.3787, 35.744],
+                    childNum: 3
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ó™™n@xVVólƒ@¯zƒJ@bkl@@„kVWLUVmVXbVJnnlLlš¯@Xlm„°bVš—lWb@bšKVXnJ@VV„°nX@@w„WVklU„K@knVVKmkUKUaVkƒWkl»nwlŽ°lö@lXšV°UVbXKV@šša„Jšw@Um™™kUy¯UUUƒaƒK@U™L@mm@XaÇkkmWank"],
+                    encodeOffsets: [[117158, 36338]]
+                  }
+                }],
+              UTF8Encoding: !0
+            }
+          }),
+      i("echarts/util/mapData/geoJson/hu_bei_geo", [],
+          function() {
+            return {
+              type: "FeatureCollection",
+              features: [{
+                type: "Feature",
+                id: "4228",
+                properties: {
+                  name: "恩施土家族苗族自治州",
+                  cp: [109.5007, 30.2563],
+                  childNum: 8
+                },
+                geometry: {
+                  type: "Polygon",
+                  coordinates: ["@@VK‚bX@lbUVnL°„@VlVnUl@VUX@„aVƒmaXƒlašUUU@wmaVUn@Vƒnmmk@m™U@kna™aU¥Vam™X_@WƒU™mW@_kƒVaVKnL‚lœ@VVal@k¥@kUW@kUKVUlUVсW@kÇaU»ValmkUVUVak™@aƒV¯_@W‚UkmVUlU@aœƒƒalI@akkVWUaWXUWwœWVbÆ@„„l„alIVK@U™m@UU„W@al²a‚¯UağÇm@ƒbkk@wƒ@@W™aULmxƒIU‚™ƒb¯@U`UX™JmL¯aƒKX›WUL@aknmK™@aWUXaWm@I@UÅmVU@™™aUV@b™VƒI@WkU›bXkm@VakwUKULWKXmJ@XUK@ƒmL@KUwVaUI@KU@mmn™mXka@»V@@UUaƒw¯yVk@ƒUUVmmkÛÈU@mWUnmx„šmlUbV¦UlbWVUL@UUƒ™IUmÇKV„VbUVVxkn™LUxV`VX@š„„kJVVUXWaUVVlUnmKUbkI@WULmK@L@LVlƒLnmUIWV@aknƒ`VXUJIVlUVVbUX@¤mbnLm‚m@UXk@mm@Ukaƒ¥@kV@@KkU@aUKWbkLWVkIVŽk@UbVlmX@bU@@mmL@bn`@Ln@llVLVk„@XVVU@`VXUš‚¼k`VULka@VllVIn¤VU@@bl܃bkx@bkL›škKƒn@bn@@b@JUnV`UnVbVKlVXUlbn@°ƒVx„@@b„nVbUllVn@V—VK@UnW@UVUšlnk‚VÈޚxVb„VVI„xVaÆ@@aka@UVaU@@a„k@Wl@nbVIƎ@Jk@„L@VlXnlla@VJnw@UmwXU@aVK°ÒnllnLlb„xnKVaV@l¦²nVl@llL„x@XVVœ‚Ķš@našx@U@al™XUVa‚LÈþV°XxWXkK@šmLnlUb@b‚xnLVlVVkb@UJ@xWXXš"],
+                  encodeOffsets: [[112816, 32052]]
+                }
+              },
+                {
+                  type: "Feature",
+                  id: "4203",
+                  properties: {
+                    name: "十堰市",
+                    cp: [110.5115, 32.3877],
+                    childNum: 9
+                  },
+                  geometry: {
+                    type: "MultiPolygon",
+                    coordinates: [["@@@a@w@kV@nbVK@ƒnUla„@la„Ål@nlVakwWX@WkLšaVmšwV@anK@UlIXmWkk@@mmLkWlwk@U_mKXwWK@U¯K@UU@ƒVUa™kmƒkI™yUUVUmanU@mlwkƒ@_mWXaƒUWU@ǃ@U@aUaVwUKUIƒVkK@UWIXƒmaV@k@Vm@UnwlƒUamk@V@„ULUamxUJkU@Iƒ`WkkK¯XWak@@W@IUV™LWJkXkaÇVUKƒ@kUmbmUUƒUKƒbkKWUkI@ƒkKÝ@@aƒUm»nI@mƒU@UnWV_@aUmWbkLUl¯b@a›kkk@WkkJm_k@UV±@J@b›nU@@WÝIUJVbXL@nlJkx@„Wn@VkJmb—LmUƒ`VbUL@xVn„@XVƒŽ@„mVVnnJVbU„ƒx@„V„nVUbVVƒx@šn„™bUK@bƒ„@bƒJ„šm²„VU‚lbXzVJV„„JVbn@@Xmb@V@bVJÈ@‚Vnkn@°aVVV@šX„KnalLVmšUnnVKVlnLWlXX„Klk°š™šXŽWškLUVVV@nU@ml¯nmbk@W`Å@mb—LWm¯UƒxnêVèk@mbƒVƒnUK™@kKmXk@@JUI›lÛLllnbVnlJ@LULnlÆaVLnŽV@nkVJ„@lkô@²bÆm°w„L„WV@VXšKšVXI@W°ÆVšK„b°U„JVIVV„¦XKVL@l‚InaVÝnUl@@bX@‚™nmVL@lVL„lVLVUnbVW@xXn˜bœU°¤V@š™„a@kWKUUn@VlnL@UV@Ü»@mX@V_ƒakaÞ@VK‚¯@kkW"], ["@@mUkUUm@nllVKXXVK"]],
+                    encodeOffsets: [[[113918, 33739]], [[113817, 32811]]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4205",
+                  properties: {
+                    name: "宜昌市",
+                    cp: [111.1707, 30.7617],
+                    childNum: 9
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@°`„U@blšUbUVlVkn‚ŽUbV¼Èb@l‚XUÒkVUVVL@lVX@ll¦k@UbU‚›@kmKULUbl„@`nXšŽ„V@XW`nšUbV¦šbmb@lšV@nnlmnU„m@UVnb@xVV™VkbW„nb‚VnVa@an@UaVU‚JXnWlXX@l„¦@ŽlKÆX„bX‚V@VV„@°¯°xXx‚XV@nV°UVWU_VWXkmaVnWVkn@lln@lb@UVLXWlnX@˜aXUmaVK@UXU„U@WVI‚W„XXV‚U@¥VKœ@‚Uގ„„‚a²LlV@kV@UanKma@UVUnK@UVLXyVL‚knJ@UV@@UXKWUXaV@Vb@mVLnKW„m@aUUm@@UkK@Ula„LXKWaXI@alKlmUk@wVKXL@m@WWn@UVa@K@wna@aW_XWWkXbVW@k@U¯WWwka@UUaVIVƒkU@m±@U@@wVKkaš_@VV@XUVwU¥‚šyUkm@V±ÈUKk»ÇL„m˜mLk@ó£kmWwƒm@U„IkWKXwWU@ƒkLƒwkbmaƒbkK@VƒLkmWIUKkUUƒÇIǫJ™XÅJULVŽÇLUVƒ@UK™@kI@WVI@UaƒWmXVVUL`±kÅLmKkƒƒkƒÅ@Ua›XXxWVXŽVbUXll@bkJ„b›„@bkVUVlnV@X"],
+                    encodeOffsets: [[112906, 30961]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4206",
+                  properties: {
+                    name: "襄樊市",
+                    cp: [111.9397, 31.9263],
+                    childNum: 7
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@@Xl@Xb°WlLXl„_@JlVVInwVbVK@ƒ@UnlVbk„mx@VUnl@U@nbW„XJ@VlL„UVJVLUxVb@b@VȄ‚@XV„VWbnX@`l„kx@nmVnbUVVVšzlJn„šlVb„UV@@V°L@VXLWxnLV`l@kxlXnK@nl@XlWn„`Xnl@@UVa@VÈKš£VLVanW°U@UVU„@„`VIn‚mV@„nV@Xa@aVW@UšalkXKšblI„yƍXnlJXbl@@VV@nklU@`„nVK„LVKVb@V„U@UÈK„UVKšIlUX@V`lIVbn@nblVVmV@@XXJšUVV@knKVn@`@X‚VnK„wlLVmUUU@ƒU@aXL@WlU@UUW@UmU@KkLWaXkWmXUWm@U@ƒnk@UmK@U@UaUVUUKV_@al@namWUI@KUƒK@aV@WUIƒbƒ¥ULUJkIm™ƒK@U@K™V@U@a@UkU@K@wVaUwlU@mUƒULmKUkV@@anIWmUK@I¯„mKkl@LUb±lUakLmk@WwUKÝVUIm`¯n@Uk@makJU_@ƒƒJma¯ImwUVkKƒb™aUÅ@wWaU@VU@mXIVmmUkJkwm@mIlUKWzUK@VmLUV@VnbmLVbU@@lkU±KbƒƒÝV›@UL@¦VWUƒWXUJ@XƒVWV@VULnbWV—bW@kmWXUK@Vkam@kkm@UlmXUŽnbWlUXV`UX¯VmUU@Ul@Lll@nnJ@LƒnWmbmš@b™`ƒš", "@@kUUm@nllVKXXVKmU"],
+                    encodeOffsets: [[113423, 32597], [113794, 32800]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4211",
+                  properties: {
+                    name: "黄冈市",
+                    cp: [115.2686, 30.6628],
+                    childNum: 10
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@VVUnWVXnVJ@„‚U@V@VXŽV@@IVJUnŽ@V@L@KlIVlVanLVbnVlI„ƒn@@a@Kl@@I„JlI@aXU@KlK„kVblJXU„VlU@V„bVkVKXn@VlxVa²I@VlVUxln@bšJXklaVWnLmÅ@y@k@ašI@W@aXIlVVaV@nnlKnLVW@IUa@a@K„UVVlI@wXKVV@IUƒla„@lUXwWƒnƒnalLlxXLll°@XwVKVaXIl™nb˜@nln@Va@U@k°ƒUmÆUVaXI„JV¯ÇUmmkU@WaKmakVm@U@aVKkkmKkVmIkÇ°£@aUUVaVVnKlkX‚mkƒ@ƒlUVaX@@Um@‚™UmlUXV„UVU@w‚K²¥Ua@I@UV™l@U™V±UIUÇ°»VkUmVI@a@U™m™ĉ™¯V±bŹĖğaÇL¯lmŽkX@‚óĀ@ŽmšÝêb±WkLƒn@xXx@Ž@b@V@LW@UbƒlţXƒ`kxWnXô¯¦ÆV@L@JVLƒxkK@V@bkz°l‚lXz@J„UlVla@XUV„bVKXnW`XXV@laVV@V„X@V¯xƒx@xULVbUJ@n@LU@VmmakbUK@b™IWWUUVkUmkLm@VJkb@nUJƒ@`V@kX™aUaVmmLkUmJ@Uk@U„±lkzmJUb@b„VUxVXU¤ƒL@JƒX@VlL@JkLUVU@mnUl„¦@V"],
+                    encodeOffsets: [[117181, 32063]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4210",
+                  properties: {
+                    name: "荆州市",
+                    cp: [113.291, 30.0092],
+                    childNum: 7
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ÈJV„lVVLXJln„K@UlL„anbla„xlK@„XVWxXLlƒJ@V„nXxlnô¤l@nKn—‚ƒÈKl¼VL²Ç‚Un@Vl™zŽV¦UxWVU@@U™`lbUL@xV@²@@nlVU„UJVb@VlbXx°XVWX_VKUwVKVa@UVKUUVk@KnblaUU@wnWl@UX@lÆ@@a„IVmUk„™šxVJ„U„bܙ@Uk@WWnk@Vƒ„™Vm@I@m@Un@m™XUlVlUnJ@knJVU°@@aÆLX@ƒllL@¦nJV@XblLVa²U@UlWš@VX@`@LV@@bXJlIXml_lJœU°b„KÆLnVVl‚@ö—Vƒ‚mXaVIĢllUlVnLVlX@@b‚ašnnxšV„L‚bn@°ÆXmmkĉƒ¯w±™™™Uċ@KÝÅƧŃÝ癙Uw¯ƒm™¯k@W‚kV@¯UIUJW¼kb™Uƒwk@W`@¦Uônb@VƚlÈ@VU@ƒƒ£UWWnUÆUnmJkUÇ£VWUI@aUU@WkI@Uƒa@JW@k£kaWVUKmnkKƒb™kkVWb—VmUUmwU@kk›@UakUUa@V@nlx@lUb±lUbnnWLUyk@UamœUK™@mlk@Wb@VXL@x@xWI@a¯Ž¯V@bVn@LkKmL@`XmKmVU@@bkL@V±bk@Uaƒa™L™KUVƒIƒ„™W™XamVVbUK@b@Lm@UWkxULWVUnm@UlUX"],
+                    encodeOffsets: [[113918, 30764]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4208",
+                  properties: {
+                    name: "荆门市",
+                    cp: [112.6758, 30.9979],
+                    childNum: 4
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@n@lxlInVUnWJ@nUVV@Xb@xVƚb„alLVUnx°Jnb„I@„V`lInbl@@V°mn_VJÞUVLXx‚@nllKVb²kVa@KlknL°ƒ@JVLXnmJ@bU@VlnLVKV„@nX@lUšKVaXal@VKn@¥°L@Unw˜bnašV@KV@VUX@lVXI@KW@@IXWV@laVL„„KlaXUVVnkVWV@lwXblIXWVkVmšaU£VaUmVIkU@y@WakKUamU@UUK@kmK@w@@mK@LƒV¯™U@WwkmULƒamVVUU@ƒƒIƒbUKUa™kmƒm@UakLmxU@UÒWlULţÿmwkIUm@a‚kÈblW@UVƒUUk@JW@XkWWUkUKUIlw@aUWknWUUmnIWƒ™aUwVaۚƒaƒVUI™wƒšVlUnƒJ@bÅ@@kVWk@mX@xVVkbma@LUlVVUL@VUbULVxULW`UX@V@lUXWaXlWXX`@bmb@x@LUb@VmŽXX@‚@nWKUL@xVlknkL@bWJXbWLƒKkb@VlL@Vn@VV@bƒnX‚mLUK@nUaU@WbXVWL@VU@@V"],
+                    encodeOffsets: [[114548, 31984]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4212",
+                  properties: {
+                    name: "咸宁市",
+                    cp: [114.2578, 29.6631],
+                    childNum: 6
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ÞƂLČ@šV‚š²š°xĊ„nlWnŎ¯m@aƒK@„„°‚n„Jšwn™VIUaÆJšÅ@wšwV™XW@aV_l@²V°lĊwlaXLšwlUkalVVaX@lVXI@a˜UXJ@U°UU¥VIVKVklanLVa@VÈIVV@nk@aVa@mV_@a„K@klKUa@UnKWk@@lU@@UW@@nUWUwmaVIXƒ„lV@mLXblJ@kV@kk@KU@WƒkUWVÅwkLmW@UmL@lUL™KULƒak@maUUÝwUJƒIb›KUUƒ@š™aWK@kUWVkUwVw@™mÝ@™I@wkW@a›ww@LU¥™kƒJ@nVJƒIkVVnkV›UkyUIUl@xWUkaW@@°kz„ŽWxkLUWmzk@@bVVVš„b@‚@XlVœ@Vl@bVbUn™`Wn—@Wb„VVI@`„LVbXLV`mnU@@lƒL@LUŽƒak@ƒLk@WbUJn¦@lVb@xVb@n"],
+                    encodeOffsets: [[116303, 30567]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4213",
+                  properties: {
+                    name: "随州市",
+                    cp: [113.4338, 31.8768],
+                    childNum: 2
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@„@nš`lw„k„ƒ„UmUVWX@lk„@VanUĠ¼V@@mX@@nVV‚VXLmJVLnK@b„V@@J„@VUn@VaVUUUVWVLV@@Kk_@almaVkUU@WVƒVUVLXmmk@wUaUKUV@°™@kmaUaÈmW„mUƒVklaX@lVnxl@@UnaUk@ƒVUVwVK„nš@VVn@VbVJUknUmmVmk_Vw„KUUm™Vak¥@UVKVIkW@UmIVWkIVƒkmmLkwmVUƒ@LƒUU@VVXL@JmLUbmK@UUKmkKUUmVUaUnÇlk¯™mJUnmLUaUJUaWL@UkJ™ƒUƒ@ƒaklkU@¯@KWLUmUUWVkbƒLƒŽUKkbU@WX@JX@@LWJkUW@UVU@@L™Umb—amx@V¯K@¦mŽULk@WbUb™LkVW@kVVxUb@x@LlV@V@b@VšU@L@V„LnšlJVIVK„¦„aVJ@XUŽ@b„LV‚@LVJnXmbk@@bU`VLUVV‚b@V@VnL@Vml@„@VXnWVXnWlXblK@LnV@VVX@VkV@XWK@b„VV@VV"],
+                    encodeOffsets: [[115830, 33154]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4209",
+                  properties: {
+                    name: "孝感市",
+                    cp: [113.9502, 31.1188],
+                    childNum: 7
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@VnXK@L@°lVlk„b„@„VšlI@VXKVbVIVbnKVmnI°šlŽÈkVmVbnUVVlLnVL@VnLVanK@IWKUUV@„V@KV„nUlxnKlnU„lJUXnJ@VlXUJUL@Vl¦UbnšVVƒLUxl`UnnnmVVlnVK„bšmVX@a°Ý°LšaXJV@VUnKVXVK@LnKlLUbVVX@VwVJVn„@@UU¥V@@UUK@ƒmaUVUkkJ@L@K@UmVUI@JU@W@U@UV@ƒUIWmXUVmUUÇ@UVmIlmnmakK@akaW@UwVUkKVnUlKVwk™ƒVU_WKUkVW@UXaWkUa@w@VU@XaW±@IkbƒKƒb¯L@WƒXkWƒ@UakL@UV@UmVUmL@UXWVL@ašUƒVUUUVU@yUUƒIUa@wUKWVU@kƒ™™Wk¯UkwVKƒLUx™K@nVxUlUUWVUmw@wƒUUyXWlX¦WbUV@„U‚@blbUVVbXXƒl@lVL@bk@lxkVVnVx™¦ƒ`UnkL@V@L@Ž‚@@xnL@lVL@VnVVblLXb@‚@zlVUJVnUbV¤™bUnUlWXkJWakxU@UXml"],
+                    encodeOffsets: [[116033, 32091]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4201",
+                  properties: {
+                    name: "武汉市",
+                    cp: [114.3896, 30.6628],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@nbnm‚knJVUÈ@@Uƒ¥VknmV@VUlK@IkK@U„W@I„KV£UWVwƒU@aVanIly²kVƒl@@VnIlVnKUnVbšblWU@@_„‚VI@mlaUIn@lKVnUlVVXXšJ@aVLlanbUnV@@K@mVIUaVK@w„w°w@UƒW@UUUkbU@WWX_WmULƒaVU@WkbkUƒV@IWyk¯kly@a@UlL„wUK@I@KÅUW@ѱUm@wl¥kaƒ@@_Vw@ķƒa@akw@ƒkKW£XVUVwVwUaU@VUU™™xWKkbĉx¯k±Uk@U`@bWXUš™x@x™ÆÅIVbUJmš™xƒImƒ¯@ƒ™Umx™nUVVbnJV„@Lƒ@@ŽkV@bVnƒ@UVULlx°VXlššl„V@XUVL@xVb„JVV@zUVVVUV„™V@bUKWX@VnKUVVnU@@VlKVb„@lX„W@X°K„a„Lla@JX²Wb@ŽUV@@xVbXlWb@VUXVlXLV`Uš„lŽUxkLmVUŽlLUVVxX@lb@blL"],
+                    encodeOffsets: [[117e3, 32097]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4202",
+                  properties: {
+                    name: "黄石市",
+                    cp: [115.0159, 29.9213],
+                    childNum: 3
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@VšUVV@VbUx„aWUœblUVmnKlX@bXJVIlVUxVVVIU‚zlx¯š@‚VbnL@x‚x@UVaXK„b˜@Xk‚WU_Vm²klW„XVK„Žl@nXV@@w„mlK²X‚aÞén™@ôÿ@lWn°kUKmmUљUmm@ƒwkImWU@UakL@bVLUVċ@™bUK@alIXKWK@™nXnKmkUVwƒ@¯b@L„lUL±W™n@KULUaW@kL@lƒL@bU`@nUb@bmlU@UÇJ@UUbmKkblŽUULUJV¦¯V@VWI—V@bWJkUW@UbkUlbkV"],
+                    encodeOffsets: [[117282, 30685]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "429021",
+                  properties: {
+                    name: "神农架林区",
+                    cp: [110.4565, 31.5802],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@n`lIXll@lœl@b°aVklKXaVn@bU`mX@V„V@nmJn¼„V@bÞ@lL@„lJXVlL„aVLV„nVnalV„@VLÈUlblWXIšKVU@J„™š_‚@an™na‚X„m@KmI@mkk@KVkWWw¯w¯°ƒ@UUU@WƒaÅWkL@ƒ¥@kWWXkWmIUVVbm@@bUbmUU„ƒbW@UVk@mVkU@U¯ƒmKVUkaW@aULƒÆVbƒb@VÅ@Un@VƒLWl¯Lš„"],
+                    encodeOffsets: [[112624, 32266]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "429006",
+                  properties: {
+                    name: "天门市",
+                    cp: [113.0273, 30.6409],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@@K@UlKVm„_š¥UwUmlUkwl@@aUK@k„kWWUaVUka@aV@ƒVUXaW¥Xk@WWIklm@ÅxmI™VÝUkxkaƒ„@bWJaUL@„W@™l¯UULU‚ƒbƒkV™Ua¯bm¤UnÇUkmUšUx˜b@VkXÇal@bVnlJnxŤĀVKXkVÑV@nwlKVbn@n„šlVbVL„a„J@„VV‚UnU„bVKlnXxV@°š„U@KnL"],
+                    encodeOffsets: [[116056, 31636]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "429004",
+                  properties: {
+                    name: "仙桃市",
+                    cp: [113.3789, 30.3003],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@VK°VškX@@ƒVK‚bXI@a„ƒlblwÞVšUnJÆwn@lkXJ@X‚WVz„V@xnx‚VXUVVVkUw@mšLVw„KVU„@Um@alU@„@@KUƒmIUaVUšmnwmw™mb@aW@UkmKkUkVġkUJWbnU„õ˜@UkmUÅKƒL¯a›VkIk`WnkJƒ@xVLUVVbUbk@WlXbm„VxnxUblbUV™@@VUV@nVL"],
+                    encodeOffsets: [[115662, 31259]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "429005",
+                  properties: {
+                    name: "潜江市",
+                    cp: [112.7637, 30.3607],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@UbVxšbX„mJVnXVlmVX@bkxVJVLVlXXWlX@@IVl„V‚U—aVwV™lnÈVVmn£°aVbUš„l„aVUK@mVU@Uš@VUkaVamwUwnƒWaXkl@VaUaVUUK@w„WI@aU@@K@_UW™@kX@V±VUbkKWaU@mI@¥kK„kW@ÅK@b¯@UVmI@lmIkVkUWVnšm@@V@n@JUnƒšU„@ŽmlXXl@@V"],
+                    encodeOffsets: [[115234, 31118]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4207",
+                  properties: {
+                    name: "鄂州市",
+                    cp: [114.7302, 30.4102],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@°¥WóXmlw„_ŤW„kVaX@@K@U@a@WwU@mWk@ƒULƒWkX±lUnV`XWl—@ƒaWLUb@Vw@wmKUa@°™kw‚yVUJUUVwkUUJWI@akWmLUnkV›aXVƒbUxUVWX¤lL@„lx@b„b@ĸUx@`„@lbk¦@x‚n²VƄX@"],
+                    encodeOffsets: [[117541, 31349]]
+                  }
+                }],
+              UTF8Encoding: !0
+            }
+          }),
+      i("echarts/util/mapData/geoJson/hu_nan_geo", [],
+          function() {
+            return {
+              type: "FeatureCollection",
+              features: [{
+                type: "Feature",
+                id: "4312",
+                properties: {
+                  name: "怀化市",
+                  cp: [109.9512, 27.4438],
+                  childNum: 12
+                },
+                geometry: {
+                  type: "Polygon",
+                  coordinates: ["@@@n„‚@b@XnJ@k°x@aVUnl‚UXnV@@VnJWUJV„nIVV°ŽUbVVVL@Ž²LUVa°V@aV@nm‚UXblLXWVXVmVLVK@an_„`@X@l°„VlXXW`nX@Jmn@b„@nV@Lm`„bUb‚n@VUVl@nIVbUlƒV@LkJUnVV@xVblVUbU@ƒzUKU@mx@xUnn@@WV@lbUb@šnVWXX‚V@VIV@VUnJ@VUz@JWbXllI@VXVVL@ŽVn@„„Wlb@„Žl„XVlL„aV@VJ@XX`„kVwVl@bk„‚bUŽlVXIlƒnLVa„mVwV@@nV@XaVJVbX@lwV@n„@nV@VWnIVVUŽÆ@Xx‚a@I„UUKmk@mVƒ„IXmWUš™VJnUVU@anaVwk™›U@UXa@W™@m_@a¯@@K@UVƒ„bnK@blIlbXa@WW_n@VƒU@¯bmyƒUkUJÇÅ@WU@kWKÅwƒnm°KVkmankVWnXVWV@UƒƒwXkV@mƒ„UlLnaƒVaX@VUn@VnVK@xlnXWšU@a™@@klak™Vw™mUaV@™wmIÛ`m—@mVUXmlIXƒV‚I@K@aU@UaV_UK@wkUmmUKWXŽmVkUƒL@mƒƒU_nK‚™@aVU@Ukak»@U™™@ymUƒ„¯™ƒUUƒVKkam@™nka@ƒmwkLWb¯mkaƒ_VaVKUƒ™IUw@kKmU@WK@UnƒmaULkU@wUalWV¹U@@WUI@WU@‚_@W@U@mƒU@WbbUK@Um@@UmbUwWWkk@WU„a@anUUwlWUwUU@wlJVUnnV@@mnI@m‚K@U@w„a@wUm@_mƒVUUaVUkƒƒƒ_kċUk™VWLƒ@mlU@kn¥W@UwUWV@VÝU@lXLWVUbVLXlVIl‚knmU@VUJk@@„ƒ@™kVmwmVkxU@@XmVUb@xnKVLl@VxUxkIU`@bWVXX@JWL@bkb„¤@bmUUU¯Kƒkmb@V™VU„VVn@@„Vb@`lnœxmb„lUn‚bk„@xU„mV@bmWbUV@VJ„Il@nVUb‚K@nn@VbnJVIlJVkXJ@X@lmx@bnnWVXJWXU@UlU@mk@@llb°x„IUbnJ@VWbXVmI@JVX@bk‚@bWL@JUXUK@U@Uƒ`n@@Xm@XVW@@nX@@`ƒImxU@@JUI@KƒLmK@UÅUUV@VW@™¯kUU@UamVUUmJ@n„xmLKƒkmJkwkKm_mKXU@aƒU@b@Wk@ma@zUJVUmbUlU@™xnXlWlXXblK„¤V@@nUVVLkVš„l@Xb@VVK‚nXKVx@znW@X‚@@lVK@X@JXbWbnn@JUamLVVXIVxnK@aWUX@˜x@VnI@WlI@anV„IVxk‚l@lbXXšxVVVJVInbV@@ln¦ml@XXVWbkJWb", "@@XLVKVXVKUa@UUUmV@l"],
+                  encodeOffsets: [[112050, 28384], [112174, 27394]]
+                }
+              },
+                {
+                  type: "Feature",
+                  id: "4311",
+                  properties: {
+                    name: "永州市",
+                    cp: [111.709, 25.752],
+                    childNum: 10
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@lxUXV‚lXUVnlVĢ„JVbUXVJV@XUW¯„VIUK@klW@Un@„nl@V`XUVL@l@šVx@„XXW`UnUbšxUlVnUšV„lb@VnJšUVVVInJlUšVnwVklKnw„LVJVšV@nIV@nbVa@KVVVUUa„KV_nVVJ@_VW„nV@n¥lI@anƒl¥X_VKlwVlULUVVVš@šU@VXL˜ƒ@IUmn@VU@wmKXUWU@m²šl@VIXWWkWUkWlkIVamUXamUnmWUU@@Un™lK@XJl@kVUk@mWKXkl@@aVU@UVWUUVa„In`VUVLnw@U@K@Uƒƒ@w@UVmUUƒ™°K@UnV@bV@Xk@KVm@amk„aU£VWUUmUUwm`UbULka›KXU@kVmU™@aV_UWVIn@˜y„XXK@klmV„V_kWVUn@WUU@UƒmaU@™wnwWanUmmXkƒam@UakLmK@b™xUUUU@Km¥Vaƒ¯@ƒkUaVUlm„UU@mUUÇmUk™Uyƒb™bUa™XUWWbÅLmL@V™aL@WWXUKmmk@a@UUK™XW¥kU@VƒUkxmVkUWbUJnVJ@nVJXzWxkŽ@lVbUX@VVL@`mbUnšŽUn™VV¼k@Ulm@mwLƒb@lmLUK@UamƒWkƒK@£Ua@ƒ›UkJkUmbVlkX@bWbUŽVŽnnUVl„@bšbVK@VX@lb„V@nU¤šx‚²„Knblb@x„V„ô@šlŽ@b@l@XWxnVl@„VV@XLVl‚LUŽUXV`šbXXmJU@@bm@UUkLW@UlUKWUUb™wUm™L@nklVVmVXXm@@bUKlÆn„‚XkllVUVVL@nUbV‚@V@nnV@xUn¯U@JW@UX@xĉ@™`m@@LV@b"],
+                    encodeOffsets: [[113671, 26989]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4305",
+                  properties: {
+                    name: "邵阳市",
+                    cp: [110.9619, 26.8121],
+                    childNum: 10
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@XIlJšI„VVK@n@VVVKnLVwVmnLVK@U„@šw„J@wVIƚ°X@ÜȄUÈxll@kn@VwVaXJWXn@@WVL@UUKVKV_U@@aVK„x@U„aV@lk„@XylbUaV_šVnal@W„U@a„I@aV@@aVUl@Xm‚UXWaXml@@kk@ma@V_UnUV™UUWJUa@kkaWLUmk@@LUVWUkJWkK@¼UnWJƒIkV@b@JUIm@Ul™V™m@Uw@a@kWƒXWKUknW@ƒWUU@k™mx™UkVmIUJUU™VmI@UkaUƒV™UmVk™wVaVmX_WW@ƒUw@™@kUKWVU_k@ƒmm@@VkX@lVLUJƒX°WVU@UIVWUaƒIUġmkVUkWUVWkwWXk`mI@¥kUVƒUƒUn±@m›XkWknV„UVmmU@@XƒVƒUk`@Xƒƒƒk@¥¯»mbĉó@mkU@kU™ƒƒ™KmX@˜UnmL@lULkKUƒWUU@ƒbUaUnƒ@Vb@l„¦Ub@l™@UKmnƒKUnl„UVVbUVn„@`Vn@xƒb@x@VL@nmJ@nU@mmUVkI@xVVVxkXVxmV@bƒbXVl@Xl‚XVxna@Vn@@VVL‚aXaV@n„‚@@V@X`V@@XVJ@XV@UºkXVb@xlVVKnbm„@VXLV@n‚lL@VxšJV„ULUb„`lb°nXalKnx@„lbšmn@lbULV„„V°š„ƒnV@zšš@Vl¼lb@VUV@bšmLV`„„@n„KlVnU‚XWVLnnlV@xVLU`VbV@"],
+                    encodeOffsets: [[113535, 28322]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4310",
+                  properties: {
+                    name: "郴州市",
+                    cp: [113.2361, 25.8673],
+                    childNum: 10
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@²zVaVlnVl@nšVk„Jl_XJlIVmnL@mV@VXn@lV@‚XzV@lyV¯²U@UlJ@XVKnVVIXl@UVLV`@n@J„I@mlI„KVLnUlVUVVLXašKVLl@nb@ŽW„XV°KUnVV„L@xVJ„L@b@LUVVVU„˜VXbmbVbn@@lUbm@x@XVVVŽ@@˜@bkImx@Vm@Xbƒb@l°XU¤„a‚L„mnL@bl@@™VUX@VxnV˜anLnƒWƒ¥XKVwnUWXmVIUWÆLVx„L„w@wVmlU@¥XƒWUkwlÇn_Uw„WV@VU°wnU—ƒy@aVškVlnL@lVn„w@VlJ@b„X„x@bVKnb@U@WVUl@@Vnbl@XLlK@aVLVKnxÞn@a„LlmUaVU™ƒm@ÅknUmaUKmVk@m™kk@UlWUkVm@w@kUU@W™U¯™¥@w„Ç@aVIlUV@kUWU@UUm»@k@mKVkUKUwƒaUaUa›@k„kUWJkImaU@UK™@maUzk`@zƒy@XmJkL@UUJmUkV@z›@kŽkVmK@¦UbWL@a@UbmKmwUK™Xk›VUUkmVkw@UUKmL@WUIWa—JW_k@@WmI@mk@WkWULUUVKUUVm@šU„bš@‚nUǃ@U@w„™V@Ua@aƒL@ak„›l@k™UƒJƒwó@@L@V@„™`@œƒJ@xnn™šmV@bkJmUó@ƒn—JW„UUmƒU@UV@Lk„WlnnmVXbmxšxV@nbV„V@XVm@UVlXU`ƒUŽkn@lWLƒW—zm@UJVXU`@bVšUn@lWVœLlbVKVan_VxnVVVUXV¤ƒbnl@bUn@LWlU@@amU@V¯L„šVVUn@V@x„„@V@L@VmxUKUVm_ƒJUbVV"],
+                    encodeOffsets: [[114930, 26747]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4307",
+                  properties: {
+                    name: "常德市",
+                    cp: [111.4014, 29.2676],
+                    childNum: 8
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@l™U™mkUwUyV™@VW@¯Va—VmUU@KVUVUVLnaWƒnkUÓV_@mVU@݄w@ƒka@kVmƒUmK@IkaUamKkXWaUW@WUk„™@@KVU@aU@™L@J@XÇVUKVak_mWkLWakVUbmLUUmlUVKUU@kUWW@UImJ@xkLkKm@@Xƒ@ó݃@UUk@UKƒV™ƒULƒKƒXkWWbkaƒIUƒWU@mUk@WLaUJġ™ƒ@@XÈÆVIl‚„Vnz°aV@U„m@X`@XWbkakJ@amLƒaU„@V@L°@@bn`š@@XWb@VœVlšUxmb@bUVmVUI™šXVWnƒJU„@nnlVLƒV@JbWzk`m@UVK²V‚x„k„LVl„@Vn@V„„°xVKVkœVVlUblx@bU„‚Æœ@@nVnUll„kx@VW@@VkLWxUL@bÝ@kKkVõV@bkXVVUVƒ@ƒVkUkV›LkV™a™@@™ƒ¯xUxmX@JVb°WXkK@Vm@k„Vb™bn¤‚xUXkJƒblxnXÆK²l‚_@Wnašn@ŽUL@b‚JnIlV„@lUœ@@¯ô@lWȂIVKVm„U@aXaV@lwVXn@@K@UVKUUnU‚bn@lWšX„ƒlJnUšLšKV@„„l@²a@UlK@aV@naVX„WV_nKlL@KUm@a°U°@VXL@a@wWmXal@„k„@VLn›V@@bl@VnX@mwVa²aVU@mk@"],
+                    encodeOffsets: [[114976, 30201]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4331",
+                  properties: {
+                    name: "湘西土家族苗族自治州",
+                    cp: [109.7864, 28.6743],
+                    childNum: 8
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@@KšL@wnK±nƒnm‚—@WUk„ƒÜÈn@n»@mVamk„mšU„„l@V™nmmU@wUan¯VKšLn„VWlInyWUœI@WWk@KXU˜n@mnUmU@WœƒmkV@ƒkXašaVaUm‚Ikƒƒ@kaƒX@ƒUm@UKWU@UkJWkXa@IVy@UmIUVU@UJU@WXWmU@™VakaU@@Xm@Vm@wnwV@VL„yV@VakUUa@wUUVmlI@K„UVkUamJk@VU@UmVaƒan_@KmUƒ@@anm@ImWX_WWUk¯ƒ@k@Wƒ_m`@bULUKUnUWWXkKWaVmnU@@b¯UUbVŽ±K@UKUUVa¯UUmJUƒVIXmI@UU@WmVmkUV@b¯w@lmI@W@aƒ@m¯LXbmJVLklWL@V@XXŽmbVVU@@VU²Ul@VlX@bš`Xx›zUmkUVÒlŽ@bXLWxXVlš@V„bkLma@nmVmULVbmVUb@lnzmbUÒVl@°nLV„lJkn@bmJk_ƒVmmkblxÈx@LUb„xVb@V™n@JmLVŽUš@„nV@¦VbnJ@lVVbkx™bm@UxVLV@n`UnVVV„kl°z„xVb@VU@@ÆlXnWm¦nbVK@XVVUVVl@X„KUV@nVL@WnIWŽXLVKVLlxUbVKXVWbn@@UnKVLVb„JšU@aVU°b"],
+                    encodeOffsets: [[112354, 30325]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4304",
+                  properties: {
+                    name: "衡阳市",
+                    cp: [112.4121, 26.7902],
+                    childNum: 9
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@lšV@XV@„mXVlXL„W‚X@l@bVxn@šŽšUVkn@VJ@I@alU„JXIVm@»‚LXllIXVVU@Kl@VnXKlb@lVbXIVVUšmVVU`@nbl@@lXLVVVKVbnXWJ@VXbWxXb„Ul™VK„¦nLVVUVVbšb„K@U˜LnK@Un@VxlUV`UnnL@VVL@JV@VUnxnKVbV@@VšIVUnJUVUl@nW„XllIUa„KVbÞLV¼²`V@VIUwlaVmXa@IWanK@U@m„kVƒVUVaX@lšnaVLÈ@‚¥@kkJUWJUaƒXkaUm‚wVXJ@_lWUU@¥n_‚KkamUK„™@amKƒnKƒbV£¯W@k„aWan@@UnwlJ@a@—@UUU@W‚wn@Va@km@UanaWa—UVƒUUVU@K@aƒKUI@wƒKUUVm¯LWUXƒ@mak@UK™LWbUKVUkUmVUKƒLkJ@nƒJ@I@mU_UK@VWkUJmUUL@WkI@V±VU°kzU@Wy@kUm@UWU@@nmKUnkJWIk`ƒIUlm™k@mUUkUb±yUX@VUV@bk@WlXL@nVlUl‚k@WI@ŽkLmš@VV@XVmnnVWbnVUblJXkVl‚XXlWXUJk@±™@nXVWVnL@xUVm@Vn@J—„WK@U™V™@UUVUVKUkkxULW`k¦m„@bkJm¦U@ƒmUX@`UImUU`ƒLVbUVUU@LUbmaU@mJU@U™UIƒKmxkLUl"],
+                    encodeOffsets: [[114222, 27484]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4306",
+                  properties: {
+                    name: "岳阳市",
+                    cp: [113.2361, 29.1357],
+                    childNum: 7
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@@wUklmUUmU@@UVm@wUaV_mmUKmwkIkJmUUnm@™™@UUƒbUKUƒmÛamm¯xVLkbÇƃUƒVUzkVUlƒUUKWLX¦W@ƒVUUUaƒKUbmLKm„@akU@aƒmVaUUVIVWkk@wkƒƒ@@xmLlmÅwmbVlXlÝIWVkK@kkVƒL@VWKU@Ublnaƒƒm@b@bšnW`@XUJk@UUWKƒk@UKƒnn‚@xmLUVm@kbVbV„nV@V„b‚@KnV„LWšXŽÆVĢ¦VblŽš„n„UJWz@ƙVóUVbkV™aÅx@¦lVUbVVknWKƒ„k@ƒwƒK™VU„Å„ƒl@zkb@`m_mJ@xX„mbVbœ@llV@n„@llbXL˜UXalUšl„alVnwnLVKlšVbX@@I„V@blJ@bVL@VVVUXȤ‚VnkVÑXmlbnš‚„VKkÑř@UmaVç@±XUlI„xlV„@VaX¯lUVVUšVJn—V@°°nŽ°„Vxĸł°¦šb²¦lJ@U@aUK@kUm@_m±VIXal@„Kl@„bV@K„K@k„m@UmUUaƒK@_UJƒaXU˜@Xmš_VmUk@WUk›@kU@a@m@UƒaUUU@al@ny‚XXWWwkly@¯n@@bnV@k@mVI‚„œVlUUmlU„JUw„I‚bXƒVaUal@K„b@ƒVKVkXVl@VkUU@ylUœVVaVL"],
+                    encodeOffsets: [[116888, 29526]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4309",
+                  properties: {
+                    name: "益阳市",
+                    cp: [111.731, 28.3832],
+                    childNum: 5
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@„ŽÆxXL@l‚V„@ĢšVI‚bXKl@nVV@„XVŽ„JlbXalX„W„LVKš„„UVLl@VV„@ôބ@@Wn@lLlK@wnIVJX@VX@lVVUL‚VnkVVnKValUXblKnXl`UbVLÈU@W@IšKV@@bUV@Lš@lƒXV‚@VXXblWnLVblb@JnL„VUn@llb@„ƒx@ÞUV@nU`VÔmlX„mbUKUVUV@LVVUn˜ŽUb@°UXš@U‚VzVxnlVškšVnlVnaWƒ@wnIn`@_la@y„kƃVƒšU„L„xl@„ƒXLlmUUVakU@¥ÆwšblUUaôVšU@ÅXyVImƒ™ƒkUaġ¥ÅUWX™ƒKmU@Lƒa@UmUUƒUalan@VUnK@wm„m‚L@V„lXLVVl@VI@WX_™m@a™¯mKUkwW¥UK@_UWWLUVkUWL@WUIkVƒU@JƒwkLUUmJVI@WkXm@VmkKUIU@mmm_@VUV™@™„kJċwUU@KUWkkW@IWW@km@klwkWVkkU™V¯m@kWLU`mIkmkXm@@`@L@xUKWkU@VL@JUU@mbUKVa¯WVnL@`lXUVkU@xW@UbUWVU@UJ@„lnU@m‚nÈmVƒa@bUL™wUb™@@VkxmUUƒ™UV›K@IƒUƒmk@akm@wmIƒŽkK@b™VWXkm@wULUmm@UVW@Ub„mbkKƒVn„U@Wl„xV„U@UXmWUXmlnbUl¯Lmn"],
+                    encodeOffsets: [[113378, 28981]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4301",
+                  properties: {
+                    name: "长沙市",
+                    cp: [113.0823, 28.2568],
+                    childNum: 5
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@lVUllXkx@lln@‚XX@JlXXl‚V@LVVČxlIšƒš@VU@Un`nnV@VJlLUnn@lW@XUJnIVVlK„x@I„VlUVJ@XXKlVVUXKVX@`VLX¦lxVŽnLš°‚an@„„‚bkmVaV@XL@U„KlU@llLXUÞJWkUknaÆxnŽ‚knK@w„@l„@xllUXUJVVUb„n@blV@bnƒ‚LnKVa„LVbVV„UX@W¥XKVL„VVklUVy„U„VÈÅlaUK°wnnÜbn‚V„VL„aVVš@šn@VmnVlIlJna„@Valkn@na@amwm@„UXw˜K@aUUVUUaVa—wWK@kU@UaW@kKUUƒƒ@k™W¯XWan@k„™mmÅ@@I@U@KmLkaVUƒKkLWVUƒk@UVmU@am@kkk¥ƒUƒVUK™„maUb@ŽUb™I@aƒKkkWm@W¯K¯b@VmaULVxUXlVk@UxVJVbUb@xULƒ@ULWW—LƒĕmxVVL@šVb™KUwƒaŲWwX@@WƒUWLU@VbkV@aU@@VUnmJ@VUn@VƒLUK@U‚mUIk@UÇmU@@UW@J@LƒbUmVI@aUmW@@bkXUx@lmLUbm@UbkJ@V@XmlUbkKm@ma@kUaVU@aUK@mImJUIkVƒUƒVUakbWwka@UWKkLUamKUXm`Å_U˜ƒULmaU@@lUV@X"],
+                    encodeOffsets: [[114582, 28694]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4302",
+                  properties: {
+                    name: "株洲市",
+                    cp: [113.5327, 27.0319],
+                    childNum: 6
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@X‚‚Unw„Ė˜KXXVK„@VK@wVaUaUIVwl@kUVWUwVKnb@U°a°LXŽ‚@Xnll„L@bšJVa@VanbšƒVL„U„V@al@@UV¯ÅÇ@Ummk™w@¯ƒyVwnUVVVUkmWV—nKVUƒa@WXkVKn@lUVU„VVVXIlV°VnI@VlKnV@mwVm@LXKWkU¥wWwƒƒ@k@m„X@KX¯V@VUVa@VnKWkœƒV@VUkm@aWa@wkUWwkmV£VÿXUVL@mVIXaò@nW@ašUš@@am™@aUU„UmXmWUk@ƒƒnUW@_maVm™wUkamaUL@aƒwƒW@akI@UƒxUm@kmKUk™lUŽ@b„zV˜m¯xUVU@ƒXVxm`kÈlxXVW„@¦kVUn@xƒxƒKUwÅKVXUJWnXŽmVUxWL„¦XŽm„mK—bmUUwW@UV@šk@ƒšVLnŽlbLm`@¦VVkX@`WIUŽxVnlb„WVbXIV‚lI@l¦Ç@UKmbk™W@UbUVU„ƒl@n@VmLXb@JWbUnkbVxUJUxWXXlWL@V@V@XXJWx„zUVVVVKnXW`@bkIUl‚„nLVJUbUIWVXlWV@XklVbnn@xlš"],
+                    encodeOffsets: [[115774, 28587]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4308",
+                  properties: {
+                    name: "张家界市",
+                    cp: [110.5115, 29.328],
+                    childNum: 3
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@@InWVw°wš„@š@šblUœKlUlV„U„@VUUUlW@aöUlUlLÞ@@aVKXwlK@UX@@UlwkƒVkUm@m›@ÅVƒ@akwVaUk›UUlUL¯wƒƒ@UUmƒ@UkƒKƒlw±UULVn@l_XyWwÅ@VUUmJUXU@@mmƒU@kxW@UaUIWbU@@mU@UxƒnUbmKk„WJkUValƒ@aUkUxƒlW_@WUIU@ƒbkKWUJVnUb™bWb„lU@nl›„@XnVmV@n—mWV@LXl@X›JXVmzkJUXmƒ™KULm°Vb@xnVmnUšk@ƒƒ™VƒnnlUb@nm¼m@Ûǃ„Vl@X˜mnm„²ŽmL@x™K@LUl@nULÆx@V@VXVWbXX˜l„@nLlm@bVKœX‚W„L°bnUš@VaVUš@šmšVw„JnwVK°zn@V‚Vb„a„@Ċ¼"],
+                    encodeOffsets: [[113288, 30471]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4313",
+                  properties: {
+                    name: "娄底市",
+                    cp: [111.6431, 27.7185],
+                    childNum: 5
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@lL„nJ@xln@bnlV„‚„@JœLVUšŽV„nVlw@Uš@VašxVK@a„bnUmÇnV@km@ƒ‚I@VUVVXVaX@@wlVVUkW@_mKXU°‚UbVLnaV@‚V@IUKV@XlVL@w@K@_n@lWlnnJV_XK@l°nšU@WVU@kV@nbVK„V—lƒ@nLlƒ„LXU@ƒlmkw@nW@UKVa¯IVn@@aVUUKl@nXVKVn²a˜ŽXblKnLlmVI@KUU@akLUaVa‚UXm@aƒ@wVUVKnLnWlXl‚n@@U@anUVm@U‚Inm@IUK@UmKVmU_kVUwm@@VmL—K@VƒL™aUaVUUUmKƒ¥ULkšƒVWaXwWa@UXImWUaULUUWKk@WnXbWŽVWnk@UV@bU@@bƒJ@bƒV@XkŽmb™UU`VbkaWzƒ@klU@ƒb@VƒwUL@bV@U`ULVL@VUK@Xm@XWWIUbUxm@@lkkÇwƒVÛÇW@¯Å™UJ@xƒI™xƒ@@VULmKUnUxmKULUUm@@‚ULƒU™JkIWJ@b@LJUW„kJWnUV@nn˜Ü_nJšxU@VbšnUxlškb@lš@"],
+                    encodeOffsets: [[113682, 28699]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "4303",
+                  properties: {
+                    name: "湘潭市",
+                    cp: [112.5439, 27.7075],
+                    childNum: 4
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@Æ`n_VWnLVblKXL@VlbXxlaVb„U„VlUVJnInJ‚@VL@bUVVb@lnbn@lLVank@W@UlIVan@VanK@kVwlW@aX@Vn@bUJVn„a@K‚IX@@VV@nŽVÈl@VJn@VVL„K@UVm@UnIVm@UV@@blUUaV@XK„V@XW@XxƱ„bVxšLUa@™UKWk™@wmmUalk@WXUWkXUVJVaUImKƒVklJ@aX_mWULUUVUƒyXwWI@W@U@UXKWkXWVwU@±_U»ÝKUaƒLVbkJkƒWmXk@UVVŽmIUV™J@UU@UamLmwUVU@mnJ@VUnmV@b@Vm@kkWmXmKULUV@x„Ž@bWnVUbVblK@bVV@LUJknmKkLWa—±bUmULmWk@VLUV@bm@U°JUbVLX@@mlxkn@„WVƒKk„mK@k„"],
+                    encodeOffsets: [[114683, 28576]]
+                  }
+                }],
+              UTF8Encoding: !0
+            }
+          }),
+      i("echarts/util/mapData/geoJson/jiang_su_geo", [],
+          function() {
+            return {
+              type: "FeatureCollection",
+              features: [{
+                type: "Feature",
+                id: "3209",
+                properties: {
+                  name: "盐城市",
+                  cp: [120.2234, 33.5577],
+                  childNum: 8
+                },
+                geometry: {
+                  type: "Polygon",
+                  coordinates: ["@@„n@‚°ĀÞ°@¦ULWKkx@bkLWb@lUlVXXJVbƒnUKmxXV@bm@@Xš‚„LޚܦXlVnš‚mzVJ@n@‚²ÞôkƃÞaȰĉ‚wnljÜó„éVÛnĊīČlj‚ĉ@ō@KÞUlU@ƒkklÇÈњÑlġXɛ@UġƒƒaU@U_ƒW@n™@kaUL@VW@kKmkUV@bkbWW@bkzma@ƒJWI@KUKULƒ@U¦™`@XUJ™U@KmXƒw¯KXkmy@aUIWJXXmV@K¯UU@@bVL@¤VLXbV@@JVXVK@„„JVn@bkKmakVVXUVVVlI@`U@nzVVƒb@¤n@@UlKXLVVšI@V@nV@V‚@ÈUx@šóVōšƒkÅWó@mU@bk@Ýwk@WbXxm@@J@zV@kVƒbV‚nLWVUX™WUXUŽWLUŽ@Wl°z@VkxU@UVWIxWJkbƒĬ„nW@@bUl"],
+                  encodeOffsets: [[122344, 34504]]
+                }
+              },
+                {
+                  type: "Feature",
+                  id: "3203",
+                  properties: {
+                    name: "徐州市",
+                    cp: [117.5208, 34.3268],
+                    childNum: 7
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@XKVX@WnIVx@K°Lnll@@I°K„nVašU°x²mlxš@VanU@aƒk@akmV@@w™@Ua@aUwVwUw@w›@UK@£kaĉlóIÇVkŽ±@@kUKmVkIkxW@Ua¯UUm@UVI@WVI„JV@ƒ@Um@Uana„U@m‚I@J@XV@XaVlkXƒVaUUWLUyVIXmWak@ƒXkJókƒJUL@KWkk@ULU@Wa™lUIkJmI™mk„VbVš@lV°kXUKWKULU„mb@VUlVnƒb@VV@IVKUUmU@ak@@bmV@xklƒUƒU@UKmV@nƒJVbkXƒKUamLUJ¯UUVmI™bVV—Ll`@LƒLU`m@kXUVU@V„lxUK@xkIWbUKƒx@V‚kVVn™b¯@@U™@ƒxk‚mbkLÇK™b™@@XnJ@LmVklƒ@@XƒlUƒVkxƒakVVb@bVnUbU@@x˜VUšVb@š„ŽnIĊ`šXVVôJš_„K@xlU²Klk„U„@VaVVÈm@kVUVmnamUUaVƒXIVJ„@‚ç@¥nkVLn›„@@XVK@VUX@JVUV@UnVJVLUJVLUVlšnI„b‚KnU@m°™VanI@anV‚KVL„an„lK„blš„KÞk@¦@¤@„VKnLVK„L„KVzlWšLX@VmV@VbnU°@Ualk™˜WXLVU„KWkUUWšƒ@£Wa"],
+                    encodeOffsets: [[121005, 35213]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3206",
+                  properties: {
+                    name: "南通市",
+                    cp: [121.1023, 32.1625],
+                    childNum: 7
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@VJ@bnzWl°L„xnW@LšVVI@Wš_V¥„@VKVL@LXJ„I‚@nbly@aXXla@aVUnllLX@@UVKlbš@@m„XV`V@„bĢ„lkČÇƃȘ¯šwnĕVĉVÿšUƒUĠƒŦğlXÑVǵ@±ōLʵĖ¯lÇbÝÞ¯xk@Çkķé™n¯@ğŽġƴǫ@kVVlUbƒL@xULǂóLUl¤@nkVV°VLkxVb@l™aUXUKWĖklVX@¤UšƒUkb"],
+                    encodeOffsets: [[123087, 33385]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3208",
+                  properties: {
+                    name: "淮安市",
+                    cp: [118.927, 33.4039],
+                    childNum: 5
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@šnźUôÒɴ胚l¦nĖV‚kbmš„X@xVlVL@xUb@bUJVnUx‚šœ„lKVLÈx‚m„zXV@lW@XV‚b@bȚVxnb‚ƒVIXa°L„aÆVVaXUlK@aXIƄVlXKVUlIXalK@alwXLVK@¥Ý¯¯ÿ@ƒmVk@aX@ƒm„īlaXI‚wXJVUV@lw@U¯yb›UaƒUġUÅaUKVknaġm@kUm@wÆIV±nLÆw„ÇnUUkƒ@ƅÝU¯JÝI¯¦Ul@bƒ@@VVL@l@LƒLÅmƒL@b™@UaVaUWmLUKV¹KƒLWKX¥WI@mXk@UmaUVUU@VmL@W™bkIUWƒUmVóIkbmm™@UbVLUxmJkU@bkJWbnXU`Wz™KUÞÈlVb™Lmx@„kè@Æ"],
+                    encodeOffsets: [[121062, 33975]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3205",
+                  properties: {
+                    name: "苏州市",
+                    cp: [120.6519, 31.3989],
+                    childNum: 6
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ôèĊVnX°¤²„lxƒÈÜ@²x@J@b@X‚`nIUƙUUV@bl@VVnL@L@xƒJ@X@blJXnW@@`XbW„kVƒ@UbVxƒXUxkV@LóxVbUVWš²šVJĸklUǬ@ĢƳĠ°@šmƒī°»ÈÇ¥ULUU±a@bU@¯ƒU@KnImUVWUk™mXUVU@lIVaUUVWKUbUkWKU¥n£WakJUkUL›K¯L™KkƒVIn@VaUƒVUUƒ›UkVk@ƒU@amUkJƒ@UUlwX¥W@@UkVmk@JUakL›@kk¯ÝmJUn@nmVXlmbVVkn@„UJ@±WUxV¯a¯KōbżÇxUxƒšUUlWL"],
+                    encodeOffsets: [[122794, 31917]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3213",
+                  properties: {
+                    name: "宿迁市",
+                    cp: [118.5535, 33.7775],
+                    childNum: 4
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@XbWnUJVzXKVVUbW„klUWbU@@W@IJ@nƒVmbVbn@@V@„UŽƒIUJ@XUJ@VVn°VVbX@lwlJnUVL@l²@lÈUôJĊklb@¤VLœ@@xVxUxVx@bVbš@@xU@ln„mnX˜mXLVmV@X@lxVnVJôL„LXa‚x@b„@@KVL@bn@@m@™@alLUUVaU¥nIV±‚I@mXI@aWWXU@LlUXWW_XWmaUwǙ@aaWUX@@kWUƒynÇwUKkL›ƒ™VwUmVI@aVa@wUKUk@wƒWn™laUmĕk¥„™ɳçóÑŹV™mmzkVmm@a@Ióƒk@@LWU@`—„WbXLWlkImJVn@`nXVbXŽmL@Vn@‚l@nUVl°Xx°U@LVĠ@z°˜@¦UV@Xn@VJmV"],
+                    encodeOffsets: [[121005, 34560]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3207",
+                  properties: {
+                    name: "连云港市",
+                    cp: [119.1248, 34.552],
+                    childNum: 5
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@@‚lzXxmÆV„„@@¦„@l`XnlKšXXm‚KnLla„b„@„xmbm@kL@V@Vl@@VUXšJX„mbš@@„°Æ@èÈzlW°XĢJlÈ`lInbšWV_@mš™@UUķnƒôw°ÆmnaVƒVÛVmĸ»Ģw±Ý@@mUIny™UmWkۥݙƒK™@Wn@@aWUnwVL„mUaWIUWVk@kkJUVWLUkŃWJ@bkLWVUbÅUƒb¯KWbUJ„WXX`WXkV@KWVXX@bWJ@nJU²mJV¦UbVVkK@b@š@nm@@aUK@Lƒ@@awWbƒKóKUIUmkwW@U@UnWK—nmWƒn@b„l@bmVUb™@kw±n¯w™VUb"],
+                    encodeOffsets: [[121253, 35264]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3210",
+                  properties: {
+                    name: "扬州市",
+                    cp: [119.4653, 32.8162],
+                    childNum: 5
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@VUXblVVV„b@xV@kz„V@l‚wVLUbVV@VU@VbUbl‚b@nkĶ°IÞV@Ɔ„VlmVƒÈÅxmKU²ÅJ@xVn@lĢnmbUlVLÆbĢV„V‚bœV‚aXk‚@VXKVVWšXVWXUmKU„aWaU@™¥@£XW‚UUV@@ynam_VWkUVUna@ÆV@mnkWmXkWU„W@k„@@akklƒlWUI@UnKl¥™I@VVma@a@I@U@a@anK@UmK@ÅVUnJl™kI@aVwka@mVIUW@UWL@WÅbmIƒƒULka™UWƒUxkLUKWlXL@VƒImƒÅVƒU™mĉL™Uól¯I±l@ÒUbVbUVVXUJUnVV@lnbl@"],
+                    encodeOffsets: [[121928, 33244]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3201",
+                  properties: {
+                    name: "南京市",
+                    cp: [118.8062, 31.9208],
+                    childNum: 3
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@k@ma@kUUVmVIUWVUUaVa@Ѳk°Jôk@Wmk¯KmX¯aUakKƒƒWU„@XU‚LXaV@@mUaVUUl@VmkaUXm@ƒWUUna°IlmV™m™IUW‚@Uk@@aV@VVX@„V‚I°»nm„U@VKVan@m»UaU@U_@WlIUa™aVaUala@¯n@‚ƒkaUkUUWKU@mwkUUmmL@K@ƒLmUUVƒKƒVÅImU—JƒƒVkVVLšèVLVU@W„L„V„š@nVÜULVŽUL@bW@XbWbkJƒUUVUxVXmVk@WUUkVmIƒV@„nbnVWbƒJU„kUULƒa@Jma@XkK@VVL@L@JƒLUVU@V¼ƒnXlƒbm@kbUKmn@lVb@VXXV‚UV@b@LVbÆxXbl@@lV@U„VV@XVK²VlIš`„UbVbUlVVn@WXn@@VUV@„@KmbVLXқLkKƒV@nX@VVUV@b™nVllbšmnb„IWVXU@`lLlknVnmlLlbUmVInK°nUƒU@l@VU@Vn@„ƒ@alI„`VIXaVaVa"],
+                    encodeOffsets: [[121928, 33244]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3212",
+                  properties: {
+                    name: "泰州市",
+                    cp: [120.0586, 32.5525],
+                    childNum: 5
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@lUU@@y@In@WwXal@Þxl@@anVô@ÆX„lŎ™ôU@™Vw@ÇUU@@m@U™JUUWKkL@Vm@@£„aUUmyV@@_kJUUVUUWlUnblL@aUmƒI@ƒULUW@IU@WaUK@£UK@aV@°V@LnUWWXIla„VV™@£UWlkXĕVLVWšb@kUalwUKU¯lU@mk£VôKȁVK@w„KVaUkķlUI±™ğ¥ÝUŹš™Ž¯ôm¦ƒĸ™‚@XXK@VVXUJ@nlbUx@blJkšmIUV@ÆnL@VmL@b@b@V@J@bnb‚U@UšJk¦mL@VVJkXk„ll@bƒ@@lƒXXVWlXnml@nÅU@ŽmbUVlVUXn`mb@zU@V‚VWX@¤š¦V@Xb"],
+                    encodeOffsets: [[122592, 34015]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3202",
+                  properties: {
+                    name: "无锡市",
+                    cp: [120.3442, 31.5527],
+                    childNum: 3
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@nLƒÒlxUVkL™am@™ƒkVWUULUxVVVbUV@bVLU‚nnź™ÞVĠ¦X™VUUaôw@KlUVw„WUwVa„@lUXƒWa@_X@WmkI@a@W„I@w@KmKUUk@@aVUšVVÅmJ_@W@a@I±wÛ@ƑÇkw±ƒ¯£mWĉUóçƒK¯VkUWK@XkV¯UWabƒmUa™UUb™lln@b@xƒbXŽWX`@„VxUblL@bn@Vb@`m@XbWnn@l¤„n@xnVlU„™VLÆWœkV@VbÞJ‚_nƒl@nKVU@aU™U@mVk°WVLUV¯bVXŽ˜bXlVn@VmL@x—V@bl„š‚@œnW@X@VVJ@²VJVU"],
+                    encodeOffsets: [[123064, 32513]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3204",
+                  properties: {
+                    name: "常州市",
+                    cp: [119.4543, 31.5582],
+                    childNum: 3
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@„L˜ŽnxUbVVƒL@xnnW‚nn@VVXn@‚yœImx„„°ƒšL„a‚¥n@VkšKVw„W@nX„VJ@b‚@UVn„ƒ@UnUV@L‚b@`VLklVÞn„Æ@VaXLl™ÈJšmmVUK@aVUUaUUVwVKXVlUš„n@šblKVUkw„ÑmKUVUI@±UI@U@WmX@›™kƒ@a˜U@wnK@UUmWk—aWU°aVUUK¯XUl@nVŽVš@bUVmLk@m„`ÝIUaU@›lÅXUKƒškVmU@wƒmk£m@XmWan@@_Uam@@akKVaUw@ƒW_XW„a@w@akmm@mL@UJmnUKƒ@@XnJWLkKUb@„Vxk„WƒL—aWVUImVULUK@L@lkLVVVllb„m@@°kbVbUbšbVbkJ@XV`V@Vbn¼"],
+                    encodeOffsets: [[122097, 32389]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3211",
+                  properties: {
+                    name: "镇江市",
+                    cp: [119.4763, 31.9702],
+                    childNum: 4
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@šVĊKšn„VÆUn„„J@UWKXkVLlKVwX„šVlbVK„„nJÆaš„ķn¥°óÇIkšWKUbÅ@mƒUÝlkUK@_a@KVUVm„@mƒVU@@aUIWƒ@mƒXUx™LUlm@¦ƒb™K¯„ƒƒnw›Jzm@UW@UmmXmm@w„KUUVamw—ƒKm@UbUL@ŽƒVmn¯¼JƒUW@UUU@@bl@@VŽVXšJšnnU‚‚k¯JmbVV„Xn@VWlbUnk@VVUŽVb@nU@WbKWVƒ@XV„„lLVb°bnW°Lnl@X"],
+                    encodeOffsets: [[122097, 32997]]
+                  }
+                }],
+              UTF8Encoding: !0
+            }
+          }),
+      i("echarts/util/mapData/geoJson/jiang_xi_geo", [],
+          function() {
+            return {
+              type: "FeatureCollection",
+              features: [{
+                type: "Feature",
+                id: "3607",
+                properties: {
+                  name: "赣州市",
+                  cp: [115.2795, 25.8124],
+                  childNum: 18
+                },
+                geometry: {
+                  type: "Polygon",
+                  coordinates: ["@@„`l@Èbln„@„KVLl@„V@bȎlnšKXkVlVL@„lJnb„¦VKVVnX„W@w°@VU„mln„UV`šU„bVUV@„xnKVI°KXKVkVL@al@Xa„LVlULWV™VVL@b„x@VXVmb@x@V™VV@nn¤„šlb°b°KXXWbX`lbXx‚z@x„`VIVUnK„L‚x„WXLVKVbVLVU@wnW°b„@nalX„‚mXVJn@U²mKkVl„U@@xlnœaVmlKnœ@JVLlŽnVššl@XXÆèVlUX@xVLXVšb°W@wnUWmXk@K‚LVwUmUkUKUw@wVaVK@kƒ@WnkUKWkwlmXL@KVUlLVKXmWU„L@ašL@malaVk@aa‚ašƒnXš@VVUblb„Jn˜ƒXa„V‚wn£„K@UWmUk@ƒUaWIV@b™JW@KmmU@aUUUkmKkVKlUU™nKVU„lVaV£Å¥WUUK@UkUUw@m@mIkƒƒUUWƒLƒK¯Uw°¯@wUKUbƒKmƒ@kkKUL@UUKV¥U@manw@k@U@Wm@@U@Wwkm„wWaUU@UUmV¯kwƒ@@kmƒkKkUW@UK@ÅV@XWWkXa@Ul@Va@KVaUUU@ƒaXwla@UkVWaXk@K@lmkUmV@Vmbk@ƒ»XIƒ¥VUkƒVUVU@anKVUƒKUalU@wX@˜™@a@K—@ÝwƒL@ŽUnÇlUIkJmn@ŽƒbVVb@VmnkLƒV¯U@ƒ±l—IWmƒ@kaUI@aÇU@K@KUIkbWbƒJUIUyƒX¯ƒUbU@méUUmUk„WK—xWIkJm@V¥U_UJUwmVkšƒUU@ƒƒƒ@knƒwm@UmkWJkL@n@VW@@‚U@knm@kUml@xÅxƒ@@XUJlb„@VX„JVxn@lbV„@lULnV@VlnV@bWV@bXL@lVLVb„V@blLn@Vl„K@xln@bX@lašLVbnKUVVb„KlXVVkxƒV@nnVUb‚lV@@z—°WWkbƒIk‚WL@LUJ@bUI@b™`@UmI@mkK¯XW™™mUV¯@UUVUUam@@VULWUJƒIm`IUJ›KUkW@Uxn‚WbnnmlXbmIUVmV@Vnb@V™LUKWLnÒVVV@V„UL@„kJUV@bƒÈ@ŽšV°šŽ@XVV@l@xUz"],
+                  encodeOffsets: [[116753, 26596]]
+                }
+              },
+                {
+                  type: "Feature",
+                  id: "3608",
+                  properties: {
+                    name: "吉安市",
+                    cp: [114.884, 26.9659],
+                    childNum: 12
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@lxnb@V@bV@ln@‚n„‚lInš@blVXK‚nk¼@VUKWL@b™L@`UXU`ƒ@V¦XLĠ@lJ„¦@„nV@l°nn@‚mVXnaš@nb‚K„n@l„IVƒš@VanJ@_lKVVnš„L@L‚K@Vn@VbšUVanKlLnbnJVbšnWVnVVanI@‚Vb@L„bVKVanXVbVJVU@aXLll„bôlƼXxVLVK@Xn@ƒxnVVVmb@LnVVKVXV@@mnaVXUVnV˜K@_UaUmšwnKV_‚anKVLš»„K@¯ÝU@›™U@kWlUn™lknK‚VnaUkma@ƒUIUwl»Åw@ƒVwV@n™‚n@ÈXlKVmna@kVw@anm‚@n_WWk@™™mUkUK@Im›kLUn›bkm@wV@kƒlUnLV±m@UInWƒkWmbƒ@¯amX@xUVUKUaULWKƒXwƒKmLUVUJƒ_@wyWwkaW_XaWW¯L¯akaƒ™m£@mUUš@U@wnaWU@Uƒw@aUKšUXUVKUkƒKWbk@@bUKUlWL¯LUJmLƒwU@UVƒa™VU_ƒVkmƒnUV¯@@xƒXmWUUULƒ¥makI@ƒUKUkWl™LkmǍ@aƒUk@UKƒLƒ@kmÇak@ƒ_VlkL@`lbnšlLVanLnbmVÆln@škJlbknmKUbÝmmwULUK@bkLWKULUUma@Kk@UV@L@llbVzšxUxnl@bVLmŽšŽ@IVJXœVlƒLV`@bn²@J™@™V@Xmbñ@WbUJ@bm@@LUĬU‚„¦lV@xXb@blnUV"],
+                    encodeOffsets: [[116652, 27608]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3611",
+                  properties: {
+                    name: "上饶市",
+                    cp: [117.8613, 28.7292],
+                    childNum: 12
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@„„@„V‚š„„I°`nm¤²@bVJUVVXUl@Vmb@xV@XbmVVœ@lkLmbn`VbnU‚@Va„UnbVllUXV„a@w°VW@_VWšLššnVlbšLVbnl„KšnVK@IUW@_@am@™‚ÑUólK@U@WU@VwU@UI@aUU‚aXƒƒ@kwmJV@yX@k‚anƒƒ@mkwVmmI@aUU@aUUW@kVkV@@anKš»„XVWnIVUl`@_„W@wlUœV@UWKnU‚bnŽ°InJl„UV@VnI‚b„Wn@VklL@l@Vn²m@U`kI@bWJƒnV@°VXnJm„XVmx@VVL@bkLmWULUmU@ƒbWXb@llnX@‚xkxVV„nVV@¤nL‚nVxnJVXX@˜ššbn`VI„b„@„blmlLnaV@„blWXnlUnbl@„ƒšKVanUVmm_XK@kWWnašU@UnaWUXa›ƒXamUkKmXUWƒLX¯WakKm™nUWwXa@KW_„aXWW_@WnIVl@XU‚LnWVknK@ImyUUÆbXK„Û@W@IÆUnƒVÝlkVK@mUIVwkUVaUm@aVIVyXIƒaÈwmmk@UnanVUmÅaó»lwšW@kkUVmUK@WKLƒUmWULkamK™Lk@Wa@wk@UU@U@mbUIWVKUXWmkUmVm›U@LkakKƒw@w@U™¯ƒ‚ƒUUn¯l@bmn@xkJWxkL@VkI@mƒkmJUI@V@b@VVxnbWlkÈkVƒLƒbkKmVƒL@V@²nxW‚kLUL@xlKVx„bXmVnšWJ@ޙ°@n™xUKUw±`UImVmnU@kalm@akwƒU@UUJmxU@@Uƒ@kU@Um@@Kn™ƒVm@k™KmkU@@WUnkLWxkVUwmKmLkU™bmKUbVŽ@xUnkJ@n±ŽšUxVXUšWJ@LUb™lUnm@ƒW@nknUJUVm@kXllknVbÆK„VVbš¼V„@šUl"],
+                    encodeOffsets: [[119194, 29751]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3604",
+                  properties: {
+                    name: "九江市",
+                    cp: [115.4224, 29.3774],
+                    childNum: 12
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@WUkVUkmaƒVUb@mVUam_nalK@kU›nUWaU@@wna@UVkUWVUUI@a‚±n£m¯_ƒJ™ƒU@ƒƒƒĉ¦Ul@UV™Km™mLlm@ğ¹m`Uk¯@@UVK¯™@UUK@amkmKkVVUa@UkUƒKƒŽUa™L@VVXUJ™@ƒnƒ@™š™WUbƒnVb¯V@LÅlÝIƒJÅkݙm@Ua™WUU@UmUXmmwVUUKWUX±mUam@kWƒzUaVmÇw@aÅLmKXƒ‚UWKkL@W¯IƒwVw™lkUƒJ@Um@ÛÈWŽKUxWkƒaUU@KkLVl@„UKUX±KUb@nVVUbUVmaUlUL@„ƒaUL@‚@nUlWzX`@„V@lx²„@Vlb@bšVÞ@°nl@UxVL@lUbVV@n²xVUVmnUÞb‚a„J@IšV°xnbl@nbÆ@VwnK@VnXlK°xnUlVX„V@Vl@L@lk@W_XK@KƒkWxUL@J„nVx@aX@VVUa˜IXlmL@bVVX@VbnK‚a²XVWƒk°a„@UnV¤nbmLmW@XbmJUbVL„aÞK„L@K@U@aVKlbV@nXlJœxV@VnšŽVȚ„ÞKôbźĕČmV@ĊšŽ²xÆIšV@Þ¦ĸ¼ÞVlŽVÞnxln°Jœk‚LXWVUVUVwnJVI@yn@lXlaXmWI@w—»ma@UmK@akKkXmW@_kaWakKWk@@K@IšWƒkUa„ƒ"],
+                    encodeOffsets: [[119487, 30319]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3610",
+                  properties: {
+                    name: "抚州市",
+                    cp: [116.4441, 27.4933],
+                    childNum: 11
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@°V°UnÜ@n@lnLlV@bšV°L„lnLllVzVVXlV„V@@L@xX@WlX„m@UVƒL@V@n„°škVmVUnKlaXxVbšnlU@lVVnaVI@aX@V„šJš@V„@b„b@šVbš‚@X@lUL@Ž@VlIVm@wUVanLšalVnKnLVxlUXwlKVm@k@Una@mWIXKWUÛVƒk@a@UVWn@@kl@@W„XlW@_Um@UVK@a„LnalInWV@@xnI@¥‚K„—šm@kKmƒnk@mlI„¤laXbVblknV@U‚KXVlUXa‚@@Unw@±mU@ak_±a@ƒUJUIƒVKW_Xa@aWU™šK@mmUVa@IXa@UWmšannlmX¯WKXwVUVwƒ@XUlK@klJXa@kƒkmm@Uwƒw@¯ƒW¯kw@WmbULƒaUUU@mVUU™WmkUb™KmkkK@aƒkUƒ¯¥Uƒl—ƒm@akU@mš@KVIVV@KUkUVUkaƒUWb—„mƒIkaVaUU™@mW™„b‚b@bUlkb‚b@n™K@bƒKXVWnULkKUV@LWKknlxXŽVLml@X„Ž@lULUb@xVxVLVlVnUxK@LWlXnmV@x¯X™aWUUK@wVWUkÅçm`@mn@bUx@lmbUnkLÇWm@mšU@Ux@„Æxk¼VxVJ@„nbVlmbUmLklmškVlX@‚VœšV@°Þ"],
+                    encodeOffsets: [[118508, 28396]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3609",
+                  properties: {
+                    name: "宜春市",
+                    cp: [115.0159, 28.3228],
+                    childNum: 10
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@@VlbnK@b@JšLlUnx±ĀXxÆW„X@lš@V„@@blJ@nX@˜xUbVVUbVV@b—VmnmJœ„@bmbm@klUbƒLmbœš@lVb@xUX@bVVVbV¤@LVV„bXlVw‚LXÜÇn@@V„IlVškUx„x°J@XlKXLV„‚WnLÆK@bÈxUnVb„ylXn@Vbn‚W²XV‚LVVUŽnxWnnV@VVVšXVbn@ޚÆl„IÞJÆk@K°UUa„mVa@UUUš»@wV@VƒkkUKUVW£U@UmW@@aXkVUnVlKVV„UUkVmU™@kWaUanU„VVamIX¥W@@aUaUVW@_mW@UnIVVn@VbVm@bVL@anKVUkƒWK„UXV‚Ikx‚@na„bVK„b@nVJ„_V›@Vw„‚VUVVXUlUUaV@X@VblašbnKlkVaXaƒ¯@m@U„KVUn@WƒXkW@@w@KU@UƒWkUUUykkmKƒk¯K™U@akUmK@k@mmÛ¯V¯U@‚ƒL™¼UKmLbU`mL™xVnVb@`—LmUVUUWmb@nU@UWULmU@KnaUUmU„wmJ¯IUJWIkVkaWVUIUlWaUIUVkKmbUIƒÒlVUnnŽ@VlLUJ@bUX¯@ƒaWVUKUXƒKUbm@UwKWa@a@VkUWn™@Uak@mbX„WJXbm@mL—aWVk@™wƒL@WmanU@knwWmkaWL—KWUXaƒU@¥l„UVVVbnwƒ¥nKV™»@aUk@a@UƒJ@kƒmLma™@mbUWnm@ULǺ@LXnmxUŽm@UbkbW@@akLmWk@UXmJmUkV@VUXVlULmKUxkL@lmXnJ@X‚l°Vnb@bU@WbKUX@VmKUX"],
+                    encodeOffsets: [[116652, 28666]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3601",
+                  properties: {
+                    name: "南昌市",
+                    cp: [116.0046, 28.6633],
+                    childNum: 6
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@šXš™„@„mš@VIUW@UšKVb„„LlV@VVbUŽlUnLnl@bVL@V°šUL@V°@Vln_Ġºn@‚knKnššLVU@VkĊ¥Vk@™Uƒ™»UaƒUÅLUalmkklWn@VUVIlm@m„Xn@VmškVa@KXIV™UWVw‚™²@m@U@VK@k@W™Ua@™ƒa@aUƒ™@™IUƒW@@bUJmbUU@kkV™mUaWwkbmLUVUn™lWbUbklmL™akbUaW@U@VbkVWVUUUVƒUx@‚Uœƒ`UI@mƒaULƒamb@lwJWUƒVXLl„UVmL@bUK@aUnUam@UUmJ@VnX@`UXVŽVb@bX@W¦nJUbƒUmVVbXb@lVšUnVlƒVUUkLmUUVWl@bX@VnV@X¤VUVLllU„U@@x™¼VV@V"],
+                    encodeOffsets: [[118249, 29700]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3602",
+                  properties: {
+                    name: "景德镇市",
+                    cp: [117.334, 29.3225],
+                    childNum: 3
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@VVX@Vbmz„xUlU@mbmL@V²xVbUVVblbX@šVškVykValKVI@bn@n`lVWnX@l„L@™WKnƒVIVa@¯nK@alIXJVIVWUw‚ƒn@nU˜„nK@alI@a@anKm_™a—™W@UWmIUwmmK@£UUƒmUUlwwW@km@kWaX„aV@VnVKnXlK@aUK@UnwWUnƒmIUW@¯mU„XI@alJV_n@m±@U@kkKUlm@ƒXamJ@UVUkƒmI¯JmamVXL@V›UkV@xƒX@`k_UVmJUXƒW™¼mL@bU@UllX@VV@bVV@bnJUnlx@n„Žm„b@lWŽ@zU‚nIlx„@W„bVV@bVJV@UxV@@X@VkLVôÒ‚šn@@b@`VX@J"],
+                    encodeOffsets: [[119903, 30409]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3603",
+                  properties: {
+                    name: "萍乡市",
+                    cp: [113.9282, 27.4823],
+                    childNum: 4
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@VWnL@UVW‚LXaV@@ama¯Uk@WmInW@klKVwnLVKUkVW@UlUnVnIVWl@nXlK@bX@laVan@VnwWm@KȹVK¯m@kmU@ƒƒ¥kIğ@WKU¥„@V_VW@_šK@aXKVL@Ul»mWLkU@am™kJƒm@kmU@@a@UmakwU@›„Xlƒ@VXk`UIW¼kWWX@‚œ@l‚xV¦XlW@Ubn„@ŽmUkL@UmJ¯UkUWVUaƒUlm@UXWl„nUJ@LmLU˜nXll@bUVUUmVUn„Ž@¦šxlŽnn@VÆÈU°kbV„VxllnL@VnVVUl@V„„anL"],
+                    encodeOffsets: [[116652, 28666]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3606",
+                  properties: {
+                    name: "鹰潭市",
+                    cp: [117.0813, 28.2349],
+                    childNum: 3
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@@XV@nlšL@lUnš„mŽ@Ln@@VlV„@@VV@nwVI@V„Vlx@bknlbV@nmnUVJ‚_²‚VxVLšw@mš¯@ÝXIm™nUWƒaUwkL@wVKlKXmw@±@U„KnUlL„a„KlUlÇXkmaUw@U@a@Uƒ™UkwUJ@zWJ™w@WbkVWUL@VmUklUaWakbƒ£kJ@nmln„lL@Ž™nƒ˜L@¦mJ@wU@mXkJmbƒK@bUL@VVn@`kXƒW@Xk@@lm@UX@V@b„lÜUXVWLXJ@nmb@V@l"],
+                    encodeOffsets: [[119599, 29025]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3605",
+                  properties: {
+                    name: "新余市",
+                    cp: [114.95, 27.8174],
+                    childNum: 2
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@m@@WULUKWwÅ»ókƒakkWK@bUVUIUamWUbULƒa@KUa@mJUbmUXU™mUamImakKmLUb™VUam@@UL@KƒKm™UUkL@`mIUb™@U„@V@bVl@bš¼UŽmL„¦mxUaUUƒVkŽ@¦„VWbXV˜LXKlbXnmx@lmVnb@X„Kšxl@XU˜bnKn@WaXIWƒnal@Vbš@XmlV@U@bXb‚LVxn@Va„LVWVLXU„b°@VW@aVIkK@UmVmkU„ÑVJnalLVUVJXbVkVJXUlblUXJVI°JnI"],
+                    encodeOffsets: [[118182, 28542]]
+                  }
+                }],
+              UTF8Encoding: !0
+            }
+          }),
+      i("echarts/util/mapData/geoJson/ji_lin_geo", [],
+          function() {
+            return {
+              type: "FeatureCollection",
+              features: [{
+                type: "Feature",
+                id: "2224",
+                properties: {
+                  name: "延边朝鲜族自治州",
+                  cp: [129.397, 43.2587],
+                  childNum: 8
+                },
+                geometry: {
+                  type: "Polygon",
+                  coordinates: ["@@Wxĵ„mš@„ó¤VX@@xܼƨš²xWxƒV„V@„XVƒ„„„ƒbWšXllaÞU°Ċ„@ô¼„LôÝWanV¥ƒÑnĉ°¥šÅX¥°¯@w°w@»°k£°mÈŹ‚mÈbƃŎ¦„K°z@Žkxl¦UbU¤šššklV„KŤÞȰ@@bšV@nVVUlÞ¦lUllœVlU°ÑU¯Vƒ°w„bXxl@VŽ²„˜@n„ô¼ƒó°™kmVk²ĕ‚w@wV™ÞÞ@@Ġƒö»˜¯œ@‚„šbnb°mÞ¯°V°„ÈJmX¥mam™UřƒUƒlaU¯™ƒ@w™Kk—l±n@@wƒkÝVUUl±¯I¯b™a™lƒ@™kLmakbƒ@ġƒŹé°™Þb°šékƒƒLm™„wX™‚aÅb@bVlƒbVb—ÒVbUb›UUanwƒakbVŽUV›ak„¯„UŽƒLmxV°UxnôŻX@J„Xkl‚bkbĉaƒbƒWU„ƒ@ƒk„WUU¯@@klmƒ@@™Å@aƒwWXlKkI@WbUaVIUanUƒƒ@ĕƒ¯K™„mUnWUwm@£ċèkUmbUmm@@nkJUalwk@@nmWUan_óaWmnw±KœIƒwl@UmƒI@an@@mlUÅmV_™KUkƒ@U`@_ƒKUmU™@U¯™mmb¯@kb™ImV¯ƒƒLkbƒKƒƒÛ@ÇnɱJóaÝĢkb@„›x—ÒÇllœ@‚Ž²V‚„ÆUVV„UÇ°X„óxlV¯„lV@bƒV@n—x›@—¤@„șŎnxV¼knšJ‚nšKX°˜¦UlnVbUbÆVnÞWVX¦llšb@l°œVJôÒnLVbšbXŽ"],
+                  encodeOffsets: [[131086, 44798]]
+                }
+              },
+                {
+                  type: "Feature",
+                  id: "2202",
+                  properties: {
+                    name: "吉林市",
+                    cp: [126.8372, 43.6047],
+                    childNum: 6
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ôl‚zšaÈV°„šK@„mŽ—LWl™nšVxUV‚È@ŽÝĬUÈn‚ôLša‚„²VmĀkV@„ĠĊnU@b„V@b˜@nl°UVnÞaôJ@bš™V„¦mlkššbmVXx¯@Vxm„nbƒ„šbÈK‚V@bÈL„wĠyônšmnbÜ@nn„V˜x@n²K‚„„J@k„al@nxÞU„Lź±Vwkw¯LWWUš™kŎīVwƒw„°y„Vĕ°wÈVlkÛ»@wW@Uô£@ƒn™ĶƒXwW™aUamKóÑUI¯›@k™akkW¥XUmÝÅUVaUa‚mVk—¥W¯™Lm™IlmU»mwȚō@ƒ˜£kJUÇk@am¯y¯UVwƒa@wġx¦ƒKƒƒ¯X°Ċ¯¦U°ċWULÅa±b¯@UkÅWmVƒ™ƒkIUlóŽċ¹™`óIƒlX„WŽXxmbUƒLݏƒbƧ@ƒx¯bƒÈ—l@xƒš¯zƒaݤ@nšm„VWb²bmn¯J¯Ò@n„š"],
+                    encodeOffsets: [[128701, 44303]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "2208",
+                  properties: {
+                    name: "白城市",
+                    cp: [123.0029, 45.2637],
+                    childNum: 5
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ó™ǩŁ@WlwUaƑwÛÅÇéĉamKƒōÇ@Iƒ™ôġVƒȁÑŹçƒ™ÝUƧċĉwóóÝ@Ƒ»ğL¯ll²@ƆÅV@¦m‚Åb@nmlU²VxšlUn™@VbnW„bÇbk҃š„n@èlnlšU҄Ž°Lšx@¼ĉb@҄šUŽċxՃènLVxƒÒƒbÅJ±a@_ÅJÅnƒŽVb„Kl„nUÜĊ@„Uš™xXVÆn„mšVššJÞ¯V™ĠwšƒXw°xWL„x„KV¦ôU„wVÝǬóÞޙ¼‚‚„ÞkŽVôȘxބU„lVn¦ÞšĊa°w„b°@šbÆw„lŤL²`„z°@V@@™nJVnl@@¥nUmmn„@mwnmmUnk@mlwUaƒLnƒ›wn¯°anƒWakI„ƒÇmXwÆamUXUlJXa‚UUklKUknmÞV@‚K@VWÞ@VkUwVƒ"],
+                    encodeOffsets: [[127350, 46553]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "2207",
+                  properties: {
+                    name: "松原市",
+                    cp: [124.0906, 44.7198],
+                    childNum: 5
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@„šźèȂÒU„óĢ„š@JŎȄ‚‚LnŽĊbÈêÜƃxVbkx@XǪłôš„kÞ`„šW„b@n°ašbšKšnVw°`š_X`W„š¦„ĊIkmVšakw‚K„x°UÞb„U@lšƒl@°¦œVW„šaÞbšxÞI@mVI@ƒVkŚUWK„¥nL‚a@ƒ„@ȍ„@°ƒÆ@nU@KÞalkUwVékUWw„™kU›VkkƒJk¯@»ókƒV¯ÆÇI@bĉô¯@™ķw¯nmmÅL¯wƒVƒUÞy@UówÇLkmm@@UóxkkĉmL¯wVwkWWX™mLõm@kűV_ƒƒô»ÛƒÆ¯@™Va™VšaĠVlmğwķUóÝƽ£ÇJkbǫaƽLW@nxݤkzƒy¯XɅm@VšôÇX¯Ė¯ºÝnUŽnLVlUÔmV"],
+                    encodeOffsets: [[126068, 45580]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "2201",
+                  properties: {
+                    name: "长春市",
+                    cp: [125.8154, 44.2584],
+                    childNum: 5
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@„U°xÆKnn°mĸxš°@Ċó@aÈJ°Å„Uôl@¼l°„IllœUlVƒšXxlVUêVxkllnÈUVll@Vx²IÞ¤VUlVnIôlރlwô_„›„bVaĶLXÅÞÇ@K˜¯@wÛaƒçn¥š¯WXyW¯XwƒUmmÛ@ma™nómğzƒxÇK@aUÇL™a„ƒmanƒUw°@WwnU™al™nkƒ¥šU™@aóIÝbUm¯Vmk—@@aƒU@amVğĉ@ƒlUnÿ±Uƒ™bóKmVÇÞī@ÇVUUw‚™šmXk˜Kn@ƒ™L¯ƒÇU™byókōè@b‚n@lÝX@x¯ô@ƙUV_maXm@aóƒJWxnX@ŽVVnĖVnUJ@nōÆǼV¼kxƒLklÝw@xƒx@zV`ÅbmxU±xU„nnm‚kn‚ŽğU™bUŽ‚šUb@šÅ°Ü„󼄄U`Ʋ@lön‚KšnXWlXUx°xnKĊllôw@Vn@lnÈKôx@VÝz„V"],
+                    encodeOffsets: [[128262, 45940]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "2206",
+                  properties: {
+                    name: "白山市",
+                    cp: [127.2217, 42.0941],
+                    childNum: 5
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@Ušl¦kÒÆ°„IlÒU¤ôz„¼lJš„U„n‚ÆXVl°@²aÆbVKČXV¯°¥¯ĉ°W„„„L‚¥Ģw@x„bUx°V°zn‚‚b@ÈlVŽlIœ@˜w@m„U@akU°ƒkUôwWƒÈ¯VUƒVUƒÅ±U›@kÈk˜Ñœw@ƒlaÞġƒUÞ£@ƅ‚KnÑĢ¯@W‚aUaVUVkkw@a¯@¯™Ý™ƒVXnW@@WkXmK@xkKUb@bW@Uw¯„mmb@WKUbmUbUaWbƒJĉIVW@I—l±LkšmU™bUm™@ƒnkKWa¯n™@„`Ubma™„ĉL@bƚ—@W`ƒL@n¯‚Xb‚@kb@x™Lƒ„™@V‚kL±™™mlUIU¥mL@lÅx@_laƒƒ@U—aƒV@kmmƒK„£ƒƒLƒƒmKUnÅKVbmXVlèĉUUbml„ĢŤƒIlŽ¯bǦœl‚@ô¼Ģ„@x°„l¤„n„a„l@x™b"],
+                    encodeOffsets: [[129567, 43262]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "2205",
+                  properties: {
+                    name: "通化市",
+                    cp: [125.9583, 41.8579],
+                    childNum: 7
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ÆlXnĠxĢ°lÈ°š„K„°kXm‚@¦Vbk„ŤJšnݤk„VÞVVkȄb°y„™@w˜k„Ç°a„wƨ@„aސ„K‚VnaWwXWƒ„kôJš_ČºôVkƒ»óyV£kуJůlÑk¥V™ša@wƒkƒbƒmk£¯ƒ@wġƒó»@›kÈ¥°ak„JÆ£ƒġnkVaĊVkçWUnUaÆLVmnL„„‚KU™±@—„m@a¯U„bmV¯m@_ƒK™™U™ƒaƒÅ™Wó¹ƒ@UanmWak@@wmI@y™@mk„JVa™@UaƒIkJ@n™@Um±kkxƒm™Ik„ƒbÇm@Ž°bXn„V@Ž°ÈmlÞ¼¯XVº¯Lm„kWWXLmVVlknƒ@@lnWƙ„Vxbmšnšm„¯lÝaVȁè@¼V„„b™„ÆŽ°ÞUVšJ„„kx›I—xƒƒƒIV¤™ÒXxmn"],
+                    encodeOffsets: [[128273, 43330]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "2203",
+                  properties: {
+                    name: "四平市",
+                    cp: [124.541, 43.4894],
+                    childNum: 5
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@Ɇn°W„zlyÞ£mwX@ƾKǬblaÈIƾ¤ôÞĸVĠxnmmVƒ²w‚VnwÆaU_@y„w@wÞxlk„KlwU»È»ŎÅ@mVIUmmĕUU@mWXw„Iô‚@bWnnbU`‚šV@Å°ó@wÞW@km@aŎ烙@m°Ñ°Inm±aXaƒU™n@mƑšU¦@šÇŽ¯aU£šaU™ġ¦ÅҙJōUŻókUÇ@™¥¯ak¯mUVak@@aċçÅaUƒm¦Ý`XbƄ@n`ƒI™xĊÞōÞml@šUb@Wl™_¯JkšÇUÝÆÅb@n™„llUb¯„±a@ƒ—ƒWĉJġĀ¯™Unóšm¤œxôaVnƒxôI@x„V@bmƙ„@lnLmޯޙxVb¯þ"],
+                    encodeOffsets: [[126293, 45124]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "2204",
+                  properties: {
+                    name: "辽源市",
+                    cp: [125.343, 42.7643],
+                    childNum: 3
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@żôŎVšIÆÑĢ¥Vš™bV¤°bȍ@™V¥ƒ™Þ£lÇUUUÝlƒÞ£™mţIlƒUa@¥nlWƒ¯ƒL¯™kÇġ¯ğwWmÅk¯UƒVU„„bWlXlmnƒbUx¯xVVknlŽUbV„ÇKUb@„™VnbmlnzUº±bmJUbWÈnèm҄š@X`WL"],
+                    encodeOffsets: [[127879, 44168]]
+                  }
+                }],
+              UTF8Encoding: !0
+            }
+          }),
+      i("echarts/util/mapData/geoJson/liao_ning_geo", [],
+          function() {
+            return {
+              type: "FeatureCollection",
+              features: [{
+                type: "Feature",
+                id: "2102",
+                properties: {
+                  name: "大连市",
+                  cp: [122.2229, 39.4409],
+                  childNum: 5
+                },
+                geometry: {
+                  type: "Polygon",
+                  coordinates: ["@@‚IÞmVk@wXWÜbnwlLnU„@‚nLlbXW@a‚wnbl@XL‚aš@Ċ¥@LULnJ@xVnmV@VXXV@VJkn@VÜKXXôJlb„xl@„IVbnJVLUbn‚lnVw„JVU@ƒXU‚aUUlwn@°ƒn„VKnV°_VJšwl@nwlV„IXWlIVVnK@IWmkIVaVU@WÈUlmU@U„WUalkXġŻ@kIƒ»mm™akUm›ĉUŁV»²ġVĕ@aUU؍IɃ`ȃ@kƒw@ƒUƒmwĉ™@ƒWķсIĉÇbÝLkymbIƒwÇmÛbmbU„¯ÜõÈkÆVbŎxnXVÆnšǪ¦„bš¤Uš™xÝnĉÒmĊVȄ¤Èš„bƼ„Ā„„ÆÆބźb„VVbX„‚°²¤"],
+                  encodeOffsets: [[124786, 41102]]
+                }
+              },
+                {
+                  type: "Feature",
+                  id: "2113",
+                  properties: {
+                    name: "朝阳市",
+                    cp: [120.0696, 41.4899],
+                    childNum: 6
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@na@UVI@m„ÑW™kaV¥UI@wl@„aÈbšm@wVašk„@@K@kƒ™@a@UUmƒUUalmU@KÇUű¯@±kUKVkUaƒaU@¥m@@¯k@WLUmkn@mmIkm@amU@wVmkU@Klk@U—m˜aXIWWUL™aULVbƒmk@UUmUk±™_Uym@mbkImaX¯WW™xWKzU@WƒkJWwkV™@Um@UbVVVVXb@VWX—@WŽ@Vkb@V™nUK±aUUlwX™ÇWKknU@mmUkƒLUVƒVUUVƒUaƒw™bkKmwnIƒ™kJ@nmbƒ`kmVkLWwUm@UUU™K@UmaUa@UUaWK@mUƒ¯Wkk¯VmUUŽ„xVXUVmL¯ymXkWUbmXUKƒVknWx¯JVnkLƒl@VVxnxlĀVL²WlX„l@bÝVUn@bnlÜaXblIVl@šš@Ȧ@VmbXV‚@@x„VVnUn@`°@VnXU@K@„VV@VmbnVn@ln@b„xƒ°Ub@bšLV`Ånƒ„W@@lUšnnWVU@Vbkl@Xl`XxV„UblŽkX@Ž°¦V„UVVbUlkV›@UbVbkLUxmJkXšš@b‚bœxVKÆlXX˜bnŽnala@ƒUk@U„VVklKVUXKVU°KVan@VUnLšKVL„WVaU_@mmUXa@m˜wXwVkVWXk‚k@›„k@klm@wXKl@U@KVUUUVaUƒV@„alL„xUx@b°°VnnVšxlIXJmx„LUVlV@bnX@Všb„aVx‚@XJ@b‚n@VŽVXȄl@llX@lU„Vô°°@ބVbn@‚V„k„@VW"],
+                    encodeOffsets: [[123919, 43262]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "2106",
+                  properties: {
+                    name: "丹东市",
+                    cp: [124.541, 40.4242],
+                    childNum: 4
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@lzXJ‚U@š²x‚@@Vš„@bUVmKUn„°n@lnVK„„nV@n@VlV„°WbXn@‚VzƒJ@¦@bkb‚bUl@bkbƒJ¯zƒWULWbklV„nb™¦VJ@„„K°U„kl@@W„bVn°@„Všm²U˜nX`„UÜLXmVXlKVbUVVnUbn˜ƒX@VUL@lUbWxš@²kl`n@Vlb„@nUVWVLVU@aV@²bl@ÈmšxWX„VÈU„JV„l@„„la„WnX‚KÈkÈ@Va°bÆm„@XV°IVV°UnalƒVUn@UwVU„@@VVJ„I@bl@XK@wWmXU‚UVbkJVXnJVI@mƒknwlKXL@`l@VI@UUaVKÞn„aVm@aÇ£XW„U@aÇUU@mbkKm£™@WW™ƒL@@Kk@kl›U—bWKUkUU¯UõÛƒmUUaVU„U@WU_W@kVkJƒ_WKkV@bUL™¯¯ƒ±mk¯ġƒğÑ@UmwƒKUakƒ™ƒa@a„m¥ÝƒIUWmk@w™mţ—L›KʝbȗKWĢklVbƒX@VV‚knÇV@XUVUblJXn@J"],
+                    encodeOffsets: [[126372, 40967]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "2112",
+                  properties: {
+                    name: "铁岭市",
+                    cp: [124.2773, 42.7423],
+                    childNum: 7
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@XJm@¯šmXUlnVbUJƒU@bV@UJWL@VXLmJVbkXlJXxVL@b@V@n@b@`Vbk@lxknV@VV™V@bUL@bV@@bVK@VXLWLXJ@LV@nbWJ@IUV„x@LVJUXVxVx@VV@@LXJWL@VU@@L@VnL@bVVmVX@@VVInJmbnLWVnVULVVU@VVmX@@JVz‚l@„nVVKVXރ@mk_lm„UUWV_nJlUÞÑÞVVUVƒVL„UVJ@I„Vna‚@@KV@XwWknwnKlalU„w„aĉݚwšJl_@aUaƒKUUU@WU@WXUÆ@@UVK@n@UnVVšblK@bœllb@b„bW@Xbl@UlnLl°°bš¦nKlVnI„V@UWU@WXkƒw@am@nm@aVw@I@KUaVIm±XÑlknJVnVJšaX_VaUaVKmwnkmmn@lU@U@mnašXlKUmUIVmklaUK@UlUVUW@U™kVm™a@UUU@JmUU@@bmb—KWV¯XUKm@ka@UVKVk@aUKmLkKUUÝUmbXbÇJ@k@WU_@m™™@klm@UXKVaUI@KWUXaƒÇWk™aWUkWUL±U@lUU@ƒUJƒI@V¯JmIm@@aU@Uwƒa™@UV@VkI›V¯aUkƒWkb@bVL„@@VVVUXW@Uaƒ@@b—‚ÝbUV݄@ŽƒLmUkVUbVllLUV@LššXŽWbUXm@U`@„kxlnnJlbnIllšLX„lVlUXmVK„n‚V@L"],
+                    encodeOffsets: [[126720, 43572]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "2101",
+                  properties: {
+                    name: "沈阳市",
+                    cp: [123.1238, 42.1216],
+                    childNum: 5
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ȚĊÜ°„b„L‚lÞxUbUn±‚@ÈnVÆL@xnLšlUVƒbƒxkImJkn@V±LUxkV@bšbšKVKnzVl@L°@Va„xÞUlbôxVVœ@@V±bnŽ@llXL˜ŽöXĶŽnal@nkVJVI@aU@@aVK@ašUUUU@lmkwl@Ua@_@a@m@U@aUKWwkIlWUanIWK@UXKVIU@@a„VVIUa‚mVknW°™n@WI@KUƒmULWnkVkUWƒ™KkkmJkamIkmlw@ƒV_n@VWXaW™™@KVUkKUkValUnV„K@ÞƒVUÞa˜@a„@VbX@VWUU@Uƒ@UK@ala@IkKmUUa@U@ƒVƒkk™WVwU_@KÜUXbl@V¥XUVmƒƒƒXa‚kŃlUUkIm`UIUJW@UIKmkm@UUJƒImmU@ƒVUXU`mIUbUK@LƒJUU™l@Xƒ@UbƒJ™kU@ƒŽn„m@Uam@@ƒ™aUmLKƒwƒ™mWXUK@kUaÇa@JUIUa@aƒKVUƒUXmƒUy™_@lmbkLUKWLX`‚n@bVL@JXL„‚WX@Vnb@Vm@UbnVmL@V@x@LUbVV@V@LƒUVl@mb¯U@xU@UVVV@X@VVblJ@bn„VKUn„x@llnL±¤™b@k`VXÆK@„kV@¼kl@bWIUl@VmLnbm@@JXXmb"],
+                    encodeOffsets: [[125359, 43139]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "2104",
+                  properties: {
+                    name: "抚顺市",
+                    cp: [124.585, 41.8579],
+                    childNum: 4
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@„XVl°bœUlJ@UVUš@„bVxV@@bn@nJ°I@U„J‚I„VV@V@k²VVKlXXVšb‚lÈX„ŽWbXV@LVJUbWL@Vkn@lšš@nV`@X@lÈIWanaÞVVVlLnKVL@bUlUL@Vlbn@VL°WXU˜Lna@aV@nV@IVV@VšbUnšl@V‚XnKVa@U„UnyWkXaƒaVk@ašašbnm@_WKXmWanU@alaU—l@XJVLVxX@˜wnKnVlwƒƒ™@V_@a¯¥@UkKWUaUU‚anK@IƒaU@WUaVw@klUVyUUVUUÇ@Iôbša@mnUma@kXa@UWak@Wa—l@a›@WUƒLmU@U`mIUU™`mUk@@UUK±nkJƒbUam@kwm@@a@UU@Ua@@K@ƒVK@kmKU_UKƒUUaĉWmkkL@`™LƒnmlkLkbmK@k™@Ulmb@b™„@Ž„xUVƒIUlmVXXƒxm@™JUUk@WUk@ƒakx±@¯x¯Umb™KUUVmUU¯UmVVn™WkÆ„lWb„„„ŽUnWVU¦k@WaÛV@LV`UxšXllU„@„@VVbnVlL@J"],
+                    encodeOffsets: [[126754, 42992]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "2114",
+                  properties: {
+                    name: "葫芦岛市",
+                    cp: [120.1575, 40.578],
+                    childNum: 4
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ll°X„ŽnV‚@XLVb@VVbnb@VšLVV@VVnXxlKnU‚l„_na@mlI„šmJnxlLša„xVbU„VV„UVU„KVlnnV@lmXLšÈWŽkxVV²bVLšm@Ula@UX˜@XW@UWaUUUUVan@V‚š@lUXxlIX„V@‚yXLšw‚ŽXXW°nblJnan@Vzš`l²nVVVl@„nUaVKšbVKnXVaUaVUšyšnXK@kVK‚@X@m@m‚LXa„LWƒU¯„w@™ƒa@UVw„¥°™ó¯¯y¯ƒUǯ»›w¯Iƒm—¯Ç™UUl™¯»ţKċÑţķm¯w@mU_ómk¼VnU`±IkbVlƒnnŽU¼±Lk`@X™Wl¦UbmVUxkXVlkbllU„Vb@bkVmx@XVV@Jb±aULkKWXkWmX¯aUJmIkVm@ƒxU@n„"],
+                    encodeOffsets: [[122097, 41575]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "2109",
+                  properties: {
+                    name: "阜新市",
+                    cp: [122.0032, 42.2699],
+                    childNum: 4
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@šXnb°lš„VlnXVJ„LlVnl@zÆxnK@b„blKVLn@@V„aVLVK@L@Vl@XVVInVVKVwlUXwlKšL„ššVVb@aV@X„lUXbVW@n„lWnXKV@@V@XUVVLUVV@@bVVV@@ln@VbVUXV‚I„xVanJ@UšIVWšL@UV@@¤V@nInw˜W„k„lnIVx‚lnzUVÇJ¦VVÜLĸUnW@aV_šWĊXXa‚Knkl@nm™L™a@alUVw²K@UlmnIlJ„w„aVU™kmK@wÅKmU@DzVmVaÝwkƒKƒaÛ¯șĉķ¥ğ¥ƒ@kUWkƏī݃ƒ@@akU„K@KWIUm¯nƒU¯JmwUVmIkJÇLm@™UImJUU@aW@U@@nUb™JƒaƒbXVWn@UVmX@V@b„š@l@Lƒ@™lUb@x™nÇaƒbk@@xVJU¦lbXšƒÒ@nUJ@Vmb"],
+                    encodeOffsets: [[123919, 43262]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "2107",
+                  properties: {
+                    name: "锦州市",
+                    cp: [121.6626, 41.4294],
+                    childNum: 5
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@nJ@nlmVnXKl@@°n@@¦‚V„bVbUlVL²l°@ƲÈV@LV‚knVb„VVnnWVU‚@XmWU„a„bšIVa@mV@X@@bVVnIVJ@š‚nÈKlInJVUnx°I„V°mVnXJ@LƒLlV@b„@ބƐĬXllV„@Ġ¦ĸ¦naWW@In@manK@UVkXJ@alk@»lU@ƒÅLUWl_@ša²£‚Kkm@kƒwVmULmƒ@akIUa@U@WUUVU™aÝ@ğ›wkƒƒmĉ£UWƒ@@bÇL@m—a@_mKƒlƒXUwKƒLţÓ@UWw@K@U„I@m™U@UV¥„@°UnJ°@@_™KUwƒW@UnaWUmmI@m™ķwUaÇLóVĵwݙUUW™¯šƒ¦Ux@V„b@šƒxV°X„ƒKWbK@n@nW‚@UL@lWL™m™zUVVbUbmWXXWJ—b˜n@Vkl@LlVUn@xnV@bln"],
+                    encodeOffsets: [[123694, 42391]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "2103",
+                  properties: {
+                    name: "鞍山市",
+                    cp: [123.0798, 40.6055],
+                    childNum: 4
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@l„œxĠŽÞ@šbV@@w°Vna‚@Uk„V@K@UUUVa@K@w@UnKmUVan@@Uma@UXWƒWK@IUK@amW_XKVLlKna@kmKVak@VU„@VmšU@anIÆan@‚a„šUVnb@blLV`ÞLlU„bna‚Kn@naVU@¥°IVK@anUUKVaƒUVak™@mJƒkXƒ™UVwkƒVUUa°U@Wƒ@WlkXWlIXUlJlaœx‚IVVXLšll@nLV@lLXl„KĊzš¥maUƒlkXaVK„X°y„Ila@aVkala@a@¥„IUy@WmXaƒ¯kU@U@mmUƒƒULkmm@ƒ¯VmnLVU@a™ƒ@U@±w@™VWIkymLUUkJWXƒJkUmxk@™xUI¯`mUULmƒ¯„m@kxVVbWV@„UVƒIUx@bkšVšVVšxUbVV@V@zšJVXU‚lnk@@lkLƒlƒLUU±Jkšm@UIUVƒLUVU@™K@UƒnnV@l@Ll„ƒaUJ@zn`@nWlƒIUVUUUV±Ln‚@nmL@VUVkLVlUxVLVlÅXma™@@akLmWUX@JUnVJVkXJ@X@`WX„VUVUIlb„W@bVUVL@`Un@¦U`@bUV@z@Jm@@XV`„LUL¯J@IVKmKÅI@J™nWVnLnšVxV¤™z@bmV@VUV@bUL"],
+                    encodeOffsets: [[125123, 42447]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "2105",
+                  properties: {
+                    name: "本溪市",
+                    cp: [124.1455, 41.1987],
+                    childNum: 3
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@lb@Vn„lnVVUb@šVJ@nnJ@bmXUx@xVbkbkŽWLUxnl@Ul@„xWx@nUV@¼Ull„knkK@bmbnl‚LVJX@VIVJn_lJVVšXUmnU°VVVUnVVšLna°V°w²@lw„bl@XVl@VVšIn@„wWWnUVk„JVUƒw@šƒ@anaVkš@@lnLlalKnk„mšK@_lKnlĊXVb„VVLV`nL@lUL@„@L@‚VbV@@V@bn@lxn@Vb„alI²mVL@Vl@nVš_VVnJV_‚@nV„K‚V@Xœ‚@b˜kXbl@XblylUUkš™@Xa@UVIlK@UUWVU„Llm@UUUnKWU@K@UXm„XVa@U°KVUUWUk@ašUVKkaWkƒKUknaWa@U—@m@mk@ƒaUJk@@_WKkLmx„l@nUJmIUWlIUaVWVXn@xWLk@@aƒJUI@Uƒ@UVVxm@UVk„mb¯VUU¯JWUƒ@Ån¯aUbÇ@ÇlLmWƒXkbƒƒk@UƒƒIÇVƒUXW™wÇnk@±aU@@bUVUKUXmVƒ@kaUm@k_±l™@XwVa@kVK@U„Wm—VaUmVUUakLUWWnÛKƒVW_—m±V™nƒU¯@Umƒa@Xk@ƒl¯V"],
+                    encodeOffsets: [[126552, 41839]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "2108",
+                  properties: {
+                    name: "营口市",
+                    cp: [122.4316, 40.4297],
+                    childNum: 4
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ĊĖƐn¤„„°Ċ¯ŎWšô„@xXb‚wnKl@nX@VUVƒKmL@VU@Ux݄@Vlb„x„U@VUb@b‚kœ`‚IUlVUn„V@@UV@@JnXlK@bš@nbÆWUkUKVwUklKVU@UnK@mm²KVUVVVU„JXk@mm_@yVI„bkƒ@K@kmU„m@VšLV@VU„KVUVJn@l™²IVV„K„klK@kl@kmVUW™I@y@UUUVa™wUUU™l™@akmmVaUKmIUaƒJk@ƒwkaóIWWÛL@UlmUIU@WW@UnUUm@wmIVK@Kĉ¦™@bWKk@max@bWXkamKƒ@mVkKmxÛaWX@xUlÝnJ"],
+                    encodeOffsets: [[124786, 41102]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "2110",
+                  properties: {
+                    name: "辽阳市",
+                    cp: [123.4094, 41.1383],
+                    childNum: 5
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@š`Vz„‚Wn„VUV„L@bVbVJ@IÈbVb@lVLXW‚n„š„x‚LnKVŽšb@„n@Vbn@mƒ„V@šl„IVa„@@WškVV„I@KVLVanJV_VW„UV@nn„JVI‚Vn@na@alLlmkƒVk@»VU@mXwƒwk@@VmkVwXKllaUa@wVwnW@amI@mUI@™VaUUkmmƒ@UkaƒL@ƒUIĉyƒLWkkKU@mKk@™kWKUUJ›wkbkIWVkJWXkl@X„‚@X¯VVbUVl„UxšVW„„lnIš@l‚Ub„VUbVLmV@bUL¯J@¦UVmbm@LmbƒakVÝKU_kK@amaVUƒ™bm@ÅbmJ@b™VUnƒ@UVl@UbnL"],
+                    encodeOffsets: [[125562, 42194]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "2111",
+                  properties: {
+                    name: "盘锦市",
+                    cp: [121.9482, 41.0449],
+                    childNum: 3
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@Vbĸx‚š@nnJVnXŽmb@V„XVxšL@`¯@mI¯Vƒ@U¦@VšV@nƒJ@V@LXx@VŤÔ„K‚LVx„W„knL@`˜b@nÈK@a„@VXĊ¤„nVK@aVU@UnU@ašyU£Uwm™mKXUšm@IÆJnLUL@J°IVKƒKU_@Wn@@I@yVU@aV_@¥Vm@_UKUV@aƒXkaVJVUƒUXW@_@WWIUlUIVm@IVW@IU@@VU@mƒUVVkJ›_l@aVa@UƒVƒwka@UރVwV@@UnK„LVU@UmWk@mLxWa@wóƒUVUIÇÆĉ¦¯¦¯xʟJ"],
+                    encodeOffsets: [[124392, 41822]]
+                  }
+                }],
+              UTF8Encoding: !0
+            }
+          }),
+      i("echarts/util/mapData/geoJson/nei_meng_gu_geo", [],
+          function() {
+            return {
+              type: "FeatureCollection",
+              features: [{
+                type: "Feature",
+                id: "1507",
+                properties: {
+                  name: "呼伦贝尔市",
+                  cp: [120.8057, 50.2185],
+                  childNum: 13
+                },
+                geometry: {
+                  type: "Polygon",
+                  coordinates: ["@@„m@Łkƒ™Žƒklƒôƒ@£kJ°ý™ɅķÑó¤ğLĉÅlÇğŁW¯¯›™ƥóÿlwkţÈéÝƛó™°ÞÅxV¤ĉĖWƒ¯lȭţυ̃ɱÿķƅˋğɱřÝţϙȍƧĊţ@¯kWKUKm¹Å@ķJU@ƧÑƧ„ō¥˹Ɔ@L@„Þ‚VLnš@VōČWJX¦@JŻbU@ţÞmVU@ȁýóbkWWLƒƒÅ™¯UWġkmóƒ±UŹôV¼ƽ¼ƒł̥ĖƽǬʉxĉŽŻȗKΕ̛ʵƨʟÞ˹»Ƨţ»Ǖō˷Ȍ±ȚʊĠUɾɜɨmÜ֞߼˸ƅȂ¯ǖKˢğÈÒǔnƾŎՂ@šĊbôô̐¼ƒ@ĊôĊŽÞĀ™xšĖƧL±ŽœŽ‚Uš°U„°ĬƒČ°ÜƒêɴȂVł°@ƒ„nxŎèƒbȄÞȌ΀ǸlŽ²IlxĊl²ÒmšôĖ™Èl„ĵºm„ÈêVþ„xɛČʉÇĵVmš„ÒƒÈɆôƐŰǀĊ°ÆǬĮƾb„yĊ@ĠšƒXǀċm»ôw°Ûk¥Çm¯ç™kkÇǫţǕéX_ĶWǖīŎaÆĵĸĊ@ȚȘ‚™ĊLĢĉ„VÆĉʊÇĕóaU¥šĉ°mkÅ°ġUĠřk°mƒÑČÿ˜ÛƒWĸ£ʠšÆxÈÞŎÞ»ʈ²ĊÇČalÒ°Ť±ĸz„ŽĊKȲm¤Ŏ@Ò°¼nyȂUźīǖƳÈē°@šÝĶƒ@ƒÈkl¥Ççkxk™›JXÇƒUÅ@˜£k»„óƿīÛ@lÅJl¥óý@¯ƽġƍÅan™ċ™°é¯¹"],
+                  encodeOffsets: [[128194, 51014]]
+                }
+              },
+                {
+                  type: "Feature",
+                  id: "1529",
+                  properties: {
+                    name: "阿拉善盟",
+                    cp: [102.019, 40.1001],
+                    childNum: 3
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@™ƏnǟƨʫšŹɆÿ°¯ÆV²ˢ™żÿ@ÝÆŁȰ¯ȀƳĉó™™@ğkyš¹@īš›ƒwl£Źƒƒ¯Ŧé@™ÇÇxŋĉƩUUŃōL™Ç™ĵóÝnƒóç@™™ó@ġƒƱ„¥ƒç™WUçÆōƒ@é—çťK™çȭVһƽ̻aW¥ȁ£ʵNJǓƲɳޗǔlżÞmĠóĬȂɲȮ@ÈĢŮźÔnĶŻǠšŎȭœгŃċóȭţΗÆƑÞƧÅΫóȘǫɱȁġlÛkÇ°ȁÈnšõl¯ô„ÞɛÝkĢóWĊ„zÇɼʝ@ÇÈķlUČÅÜķnέƒǓKȮŎŎb°ĢǀŌ@ȼôĬmĠğŰōĖƧbЇƧōx@ķó£Ål±ĀƧīXÝġƃêĉK°Ýʇƅ@ΌʉżÅÒϱʈ@˺ƾ֛।࡬ţશóЈèʞUš¤Ґ_޸Ƒʠɽ̦ÝɜL׈ɛϜóȂJϚÈ@ǟͪaÞ»Ȯź"],
+                    encodeOffsets: [[107764, 42750]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "1525",
+                  properties: {
+                    name: "锡林郭勒盟",
+                    cp: [115.6421, 44.176],
+                    childNum: 12
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ʶĬĊIȘƨƨŽ@ĬÛĢșŤĉĬƒĀóšU‚ÈŚÜènŦƐȤȄłϰUƨťƾÑ܆ğɲƜǔÈèʈƲĊƞƒšɆ¯̼V˺Ò˺ȂŤVĢêU܃x„Āˌ˘ƨ„Æ°ѢmÞżU¼ÆlŎ@ĊçŎnÈÒͪŎźƒĸU°lżwUb°°°Vš£ÞlĠĉĊLޏɆnźÞ„n¦ĊaȂīġŃ¯Iĉůl»kƒ„™Çý„¥Ŏ¯ƒén£ġљÝȭxƒÇ™@Åçķ»óƱŎ¥™çWÿmlóa£Çb™yVÅČÇV»ÝU¯™KĉýǕċţnġ¯»ÇōUm»ğƒÑ™wƏbċÇŎċwˋÈÛÿʉÑ°Łkw@óÇ»ĉw™¥VÑŹU™mW»ğğljVÿŤÅźī@ř¯ğnõƐ@ÞÅnŁVljóJƒwĊÑkĕÝw¯nk¥ŏaó¦ĉƒV¦Å`ğуÑÝ@mwn¯m±@óƒÛKˍƏǓ±UšÝ™a¯lƒōšșk„èƒĬގn@ŤġŰk°ċx@œĉ`Ƨĕ°@ţÒĉwmĉ@ƒƒnƒƒa„™¥ķnƒÞĉVóÆókĉŽķ@ÝkƧƧÛaƒ°Ç@ÝÈU˜óbݼ@„ÛÒV°™@V¼ˋL™ÞɅŤŹǠVÞȗŤÇĖŚōbȁƜ"],
+                    encodeOffsets: [[113817, 44421]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "1506",
+                  properties: {
+                    name: "鄂尔多斯市",
+                    cp: [108.9734, 39.2487],
+                    childNum: 8
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ĶL²ĬVłƑkkl@Ȏ™ŘWńÈĬȗ¯™ºlz@ĠššĊôŦô„ÒĠ°kÞܚ™n@¤„UĸèĸbŌÈXŽĸLlÒĢxɲÆ¤ÈÛƾJÈÝ°UšÅĶ»²VW¯ĸJôšbk‚V@ôlbnĊyÈzVôašb@ĸ‚ÞUl°yǬ²Ǭm°ššk„±lbn°@È»˜JX„VŎÑÆJ@k„LšƒÆl²™Ġ²ʊůĊġ‚řóƛÞÅ@m„ƒmLUÿóĉƧ@™»L@„›`ČĸmšȗÑţů±ĉğl¯Ā™wǎƒçƧŤÛI@±ÜĉǓçō°Uwô™ǫůķƳř±bÅ£™ÓÇwnÑó@ȁƽ@™ƒÇƧĢón»ŏĕóĊ¯b„Å™™VȯÅImƒōKU„™LǓ±Ýxċ—ŋ˜V±Āȗ°™„Źl±šÛ@WÒȁŚŹНŚÅèŌô„¼°ȰɞȂVĊ"],
+                    encodeOffsets: [[109542, 39983]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "1504",
+                  properties: {
+                    name: "赤峰市",
+                    cp: [118.6743, 43.2642],
+                    childNum: 10
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ɲŁĢljĊwƾōÞĭ°_ŎŃźȹƒUČÿl»¯ôķVÿǬƽ™ɅġÅÑǫ»̐ʟȣU™¯wVWݍÈġW»Þ¹m݃ɛŎÿŎōͩůV¹›ō™éċ™óŹÅVVĢǩʈ@Ėċ@ķšÛšV°¯xÇÅţ¥™»°Ûô™ĉʟ„¥WýČ¥™w‚灻±mnÅķ¥ˋVƒbUÒġ»ÅxğLƧ™ƒbWĖÅxš¦U°ÝVóŰlô²@š¥ÜÞÛô„V@²±`š¦™„™¯Ý@„ŽÅ„VÒō¼ôš™¤V²ŹĬÇĊƑƒţxƒç¯Lk»ʟlƽýmłÝÆƏ@mö°Ġ@ŚŹĬţÆUĀĠNJĠŽX¼šnźVUҚ¦Ċxȼ@ôlx¯łʊÒÜĀˌÇČxƍČÈƐašx„ÒĠŽn¼ŎVȐ‚¼Ģ°ŤmǖČĊþšLV°ÞŽU¼ċÈUƚzÈa‚¤ôbkŽ‚nXĀšè"],
+                    encodeOffsets: [[122232, 46328]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "1508",
+                  properties: {
+                    name: "巴彦淖尔市",
+                    cp: [107.5562, 41.3196],
+                    childNum: 7
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@²@Ζǀݴʶհĸ„˜ƒ¦Ķ™̒Uˌ¼ӾÇƾ¼̨UÞĉ˜Ƨ—éÝ»ƒĕĉ—ƐȍœōǪakó‚ó¯a@™ôţ™aV¯Þ¯°@²él¥ĵğťwōxó¯k±š—Vó@™aóbUÇyĉzmŽkaóŽU@l™aó‚ķIX°±Uĵ¼™Æ¯VÇÞƽIÇÜÅ£ɱŽġwkÑķKWŋÇķaķçƒV@£šmۙlÝğ¯ƒÑťóǿƴȯ°Åł@ÞŻĀˡš±ŽÅU¯°ɅĀ™źƧʬmǠšƐ"],
+                    encodeOffsets: [[107764, 42750]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "1505",
+                  properties: {
+                    name: "通辽市",
+                    cp: [121.4758, 43.9673],
+                    childNum: 8
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ôƲĸ¼Æèš@„ÈȮwƾ»ʠĢ¥VÆ@²¥@»Ŏњ¯ĊJŤ£k»ÆÇX¯̼ōšī°aX£ôƒƾȁź¥„ƒ™aôŤ™ĢL°ƒĸ@Ȯ¼ÈÒʈŚôVXůÆaĠƛÈKƒķšĉôÿ@ğÈĉ™»ÇVn™ĉV›wXĠÝ°šČÿĸwVƒ™¯¯ǵ±™ĉ‚ǫ™ÅÅm»²Ż±ƽIm¥ţÈķ@¯šƧJV»ÞUÝç¯UġºU£ţŽóaÅÅlƒƒ™Ƨī¯K¯Þ݃ğL̑ȍƽ@ōŎōĀƑɜnÞݺX¼ÇĢގUX°xVšʠȤ̏Ǭ¼ÆÒɆĢšŽǫƾUĀóĸ°‚k¼ċĀƑVŹȺōń¯`ÝĮƽŎĉxġNJɱłō¦"],
+                    encodeOffsets: [[122097, 46379]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "1509",
+                  properties: {
+                    name: "乌兰察布市",
+                    cp: [112.5769, 41.77],
+                    childNum: 11
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ʠǠÞĸɲȺƒÒȂƛŎaƙÈĕȘţUÝźǟɆţšÝˌKU»š@U¯ÜÑ@ƒÞ»ôaV—ÞÇÈ@„¯ÜbƨƨÞlĸ@ĊôlôÅĊU„Ýĸmš¦ƒŽ„bm„„„Ċ@n‚ĊxŤÑ@¯‚ƨĖĊ_@›Čwl¯™ƒȭL›Ý„»ƽ¯ķů„Ǔ@ÇǓbċ™ÅÅÆwÿĠÇU£óaƒ¥¯aŎğĠţkw°»¯ůlÝĵkǻݰɱƧǫaóôɱ»Çk¯ŃóƒʇŐŻ›ĉNJŻĢ„Ž¯ÒÈUl°ƒx°n„Ò™Ĭón™Ċğ°ÇŚĉ¦ʵVƒ°°ĬÛżÇJȁńʇʹó˂ƽŎ›Æţ¦"],
+                    encodeOffsets: [[112984, 43763]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "1522",
+                  properties: {
+                    name: "兴安盟",
+                    cp: [121.3879, 46.1426],
+                    childNum: 6
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ÆXnlŎ°@LVLĠþœxĊUȮĊnU„ĠV@żaW¯XIŎġƒ¥Ý@K@w@K@I˺ŻŎ¦ƨƒƨÒŎIÆ@X@VºnX°lŎ@ƾĉˤƒȘǷȘÑÝݚÞbVţĸÿŤxÈĖƐŽêÇKnĸ¥ô@›ķÞUnÒl@UŚaƒīˋƒ¯ÑƧx@±kXřƐƏÛéV™ˋ»lō¯ĉ„ÅÇÓǫޗĖġV@ğ»›°ĵ„ÇÞǓ¼¯m˜ÛÅŃĉĠÇƾb²çƒ™šéż¯VƒƒğÞml»ōÑV痻V¯™¯šĕÆU¯y°k¯¯V»ôDŽѰa@Źk™ġKţšóŽšbƒ„Ź¦ƽȂó„W¤¯b™Ĭ̻ŎW°ÅÈl¼ţ¤ĉI™°ōÒ@¼±¦Å@UŽġ¦ʟŽƽ¼šÞĢÒm¤„êō°ƒ¦Èþƒšl„k¼ĊŰ°JĢńȁĬ„°ƒżn‚ÇbV„ݼ@¼óĸţ¤@°Ånšl"],
+                    encodeOffsets: [[122412, 48482]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "1502",
+                  properties: {
+                    name: "包头市",
+                    cp: [110.3467, 41.4899],
+                    childNum: 5
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@źxżĀǔÆǬVȘĀŤ¥œÅƾōôˁʈͳȂŃÈIÜŻ¯ī„¯ōm™¯ɱĖ¯ƒķÒÝIÝ»ÅV™ƒlÅôфġ™ğVmÞnnƒWçkW܁XƝÆwU»Șĕš£ĉÑ𱱚Åk™„ƒK@lÅIō҃UW‚—IǼ¯@m‚kaƒ²™l¯™ǫnǫ±¯zkŽÝVķUô™˜l²ô°ŎwŦxĶĠk¦±ê¯@Ý°U°šbóŤ@š°bôlôǩb›ŎƏȎĊ˜„ĖÞ¼˜ê—ƨÝĊ"],
+                    encodeOffsets: [[112017, 43465]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "1501",
+                  properties: {
+                    name: "呼和浩特市",
+                    cp: [111.4124, 40.4901],
+                    childNum: 6
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ʶUĊ¥ÈřĠ¯šĉômšīƒÑ¯m„wk¯ÇV°ÑƒżġĊljǓɱţǓ›ƝóX¯ƒɛÒóa@nÝÆôƜŚĉĢʉŰĊҙ¤ȗĖV¼ÅxWƞۂlXXèm„ÝmUnšĠƒĢóÒkƚ„ÆUÞ¼ÞJĸÑ°„ɲĕš°Ŏn"],
+                    encodeOffsets: [[114098, 42312]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "1503",
+                  properties: {
+                    name: "乌海市",
+                    cp: [106.886, 39.4739],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@Ș°ÇīXњŗ@ȍlkƒlUŁ±īĵKō¼VŽÇôXĸ¯Ž@šťê„°ź„k¤„x™œ@Ĭ"],
+                    encodeOffsets: [[109317, 40799]]
+                  }
+                }],
+              UTF8Encoding: !0
+            }
+          }),
+      i("echarts/util/mapData/geoJson/ning_xia_geo", [],
+          function() {
+            return {
+              type: "FeatureCollection",
+              features: [{
+                type: "Feature",
+                id: "6403",
+                properties: {
+                  name: "吴忠市",
+                  cp: [106.853, 37.3755],
+                  childNum: 4
+                },
+                geometry: {
+                  type: "Polygon",
+                  coordinates: ["@@nLV‚@šVLšaÞbn@@l˜š@bUVlUV„zVx™¤kÞVèšXnš‚@nm°a@UƒÑ„@VŽXnV@Va„UšŽVKUUU@@U‚@@KVa@U²@‚wXkWnk„±lLnU@UmmVKnIVWnI@UK›@UK@@UVKXkmWLWUXmlkVwUyVa@w„w@aVI„K@aVÈw„KlLVV@LnV„VVnU‚ܲ°WÈIUÆ@nÞ¼‚‚@¦™@UÞUVW@UxUxVn„b„K‚b¯ÞU`VbǬ™V@XXÆVVl°InmnUôƒ°¯‚anam£œWVX‚KXmškôaVU@ƒVak@@wmaƒn@K@UÛUWKXUƒÇƒ@UI™b@alW@akLUKV@@Ukw±Iš›nL@kmwkWmk@JUIƒůVmnnU@m@UƒK„VKlkUwkƒƒnVUKmbkI±š—KƒkmVkKƒb@U@aƒVkUmn™`kIlaUK@UUKmbUIݚUa@mUa@aƒ„m@UUULUK@bmKkbWI@WXwlkXƒWa@k@kKƒLVkkK@L@JUVmzUKlwUUnW˜£XVlKUwVU@aXI@aWaUw@W@_nam@¯‚UkWVkUWaU@nwmJkUVkWVUmUkJ@ImbUaƒ@@WÅ_mJknmak@@mƒXƒaUV@„ƒxUšƒ„@‚ƒ„@VUnkVƒ@Vn@`ULUbWLXVW@kbUJ@XW`@ƒnÅĖWJƒ@—m°@xƒxšbnUa‚w²lƒÞ°xŤIVVULۂWbšbkVVXÆ`UbVL„@kx°LlV@Vœ„WbƒJn@bl¤ULV„°@lmL@ƒƒ£U@@aUwmKULVxUVVx@„™@kU™@mK¯LÇa¯@"],
+                  encodeOffsets: [[108124, 38605]]
+                }
+              },
+                {
+                  type: "Feature",
+                  id: "6405",
+                  properties: {
+                    name: "中卫市",
+                    cp: [105.4028, 36.9525],
+                    childNum: 3
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@°@Èb°KnLš@lVš@@ƒUwVUUwVKnLVx@bV@„¤@„nK@k‚¯UƒVKk£@a‚m„IXa›ƒ@UkU¯Klwƒ@UKVaÅ_UWlU™aXa܁VKUUţJ¯w„ݱkxVbmŽ™a„w@wn¯˜„@XIÆĕ„m‚@X_@WVIlaX@WUXKVaVK@_Um„@lUVm@U„ƒ@„ƒV™„w@ƒVUÛwm@@W@ImKUkU@Ua‚aXƒ@wWaUKkw@UVaUamLU™nk@»±`¯@k—W@Ua™ykbƒI„„@VWJkLWUkJƒwU@ƒn¤mL¯wm@Umƒ²XVWbnV@bmxƒVkxUblLUV@kVWKU¼ƒŽkUƒ@mn@JnV@bUnmJUn@„k‚@XlxšLVVnKlLVV@š@LkKULVbk`WL@lkXW@kVƒ@UÞUlÇX™lkaUbmV¯@@L@šƒV@bkb@xƒlW„—bƒbW@—±@UJ@IU@mVk„VxV@@l„Illœn@Vm@ƒVUbl„@JLmKÛXmVkU›KULU`@LĉwƒKUX„lVUl@Vb„JX¦̼bÞxŎxɜĖĠ„Ŏaô@"],
+                    encodeOffsets: [[108124, 38605]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "6404",
+                  properties: {
+                    name: "固原市",
+                    cp: [106.1389, 35.9363],
+                    childNum: 6
+                  },
+                  geometry: {
+                    type: "MultiPolygon",
+                    coordinates: [["@@Vnn@°xnK‚£„mV@„xlIXVlKXI@Uƒƒ„JlašzVbX@l˜°@²_@¼mlVšnKVbUb@VlxVLXb@xW„bVbV@VlnL@J@Xn@Üx„b„W@nl@nblmnIÆ`@X„@Vbna@aVUUWVkƒ@kbWakbU@VwšW@_l@nmn@@alVlk@UkmVak@@a‚UXaƒL@¯@KVa@axWI@KnkVaVJn_lJ@„X@‚m@nVanUVb@mXLlJ„VWnLla„VVaVX@KXVVkVKlknKVa@aVU@KXb@klJUknUmƒ@K@_UW@alIUamaU¯kJma@IUK@U„@@UW@@aXLVƒVJVaXIƒKlaUkUV@ambUUJkIWJ@wUI™V@JU@UwV@@Um@™nU`@UkUmVUxWUUV@aÅb@aWXkKUUƒUUaWK@wnm@IVU@aXwm@UmVaUalk@anKUwlƒUwlkK@wmaƒUkmmIk@VmkUUbW@UVUnW@kV@xkVmbVnU‚™@UbUV@a›k@kkW@„kLW¤@„nV@VU@W_UV™UU`VLUV@IUVõVULU@UUUJ@wmkUJ@šWI@l@bkKkbVVƒbVbUL@UUJ@Vm@@L@xbVVVLVlVwX@Vb@bmUkbk@@JWIUVÅw@Km@UkWKXxWLÅ@UVUnWK@xkVW„@KULwWVXVWzXVVKVXkV›V@VUbV@U„VV@š@LXxVL@V„b‚Ž„LnKVLVxXVmb@l"], ["@@@J@aƒU@LWK¯UUxVVn@Ġ„„LUW@UbUUUa@KUX"]],
+                    encodeOffsets: [[[108023, 37052]], [[108541, 36299]]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "6401",
+                  properties: {
+                    name: "银川市",
+                    cp: [106.3586, 38.1775],
+                    childNum: 4
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@šUšwVK@UVWÞUšbšw„V@knV˜@@KU_VK@K„ƒn@W_XWlL@Vn@Ċw@Ulaœ@Wanamī@aƒ»ŋó@aÆÅɲÿUaV_°ÝaƒLƒaUmVwVwX@VUVݚ@@¥Ý»@mVÅÇJ¯XÛ±VUmƒUmU@KUUkKƒLÇxUŽ@bƒLUJ@bƒx@xUbVzUxklWnXV‚KnXWlUL@V@ŽVLœ@VL@ŽmJUXmJULnn@VmVkKƒ²mlXWlx±@@VUb@L@@VV@VVUL™ƒVUbU@WmUƒ@„Ò@V¯bmn@VŽƒ„@lVnUšnVWŽXVl@¦VVUn@x‚š@‚XL@¦‚lXxš„Vb"],
+                    encodeOffsets: [[108563, 39803]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "6402",
+                  properties: {
+                    name: "石嘴山市",
+                    cp: [106.4795, 39.0015],
+                    childNum: 2
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@U¯ķó±ÇÛ¯™ķmbXb›@kb@Vĉxm@@UkKWXX`m@ƒ„@LULV`@L—@mU@lƒU™x™aÝVUX@VUL™x™VkLWVšš@J„nVLXVlŽUV@zl‚VL@V@b„„n@lU²WVLlLVbUŽVxUx@xǀL˜xôҜk‚K²ŽVa‚U@wXa@W™ÈĉUa@‚bÈk„m@¯"],
+                    encodeOffsets: [[109542, 39938]]
+                  }
+                }],
+              UTF8Encoding: !0
+            }
+          }),
+      i("echarts/util/mapData/geoJson/qing_hai_geo", [],
+          function() {
+            return {
+              type: "FeatureCollection",
+              features: [{
+                type: "Feature",
+                id: "6328",
+                properties: {
+                  name: "海西蒙古族藏族自治州",
+                  cp: [94.9768, 37.1118],
+                  childNum: 7
+                },
+                geometry: {
+                  type: "MultiPolygon",
+                  coordinates: [["@@„V£°š@laœXô±źwš™ô@„Ulƒża܍n™Kƒw@U„aƒ™ša²L‚mÈLƚÈxlaUa„wÞmÜbÞUšnJ°a„kôƒ‚ÑkwÝVğwÇ@ÝkkV¯¥@ò„»„nŤ¥XImw@mVwša@Åw™mLkaW—wƒ¥l»kçƒó„»@ƒWÑĉŽğ@ĉ„™‚Ń„UwóřVómĵ»™™Ý@VǕ¯kšÝĊÅk™°ÓUklkU±šI„ÇÞkƒ±@šƽJƒ™@UġIk@W¦™VÑșÓÅnťKULnŽ¯X›ƒ@¯mUÛ@WřmóKknōbƒxÝ@ƒŽU@kw@ÿÇLţšÝUkšmwƒŽk™lċVŚU¦™ŽƒLkUWlÅÑ@aƒ@ÅѱUóġŹ¼ƒÈĉmŻ@@wkw™Kl¯U™ġ@—„lÇU™Ó¯_ƒ‚Waĉ²Åló¼VbknƒKǎÅ@ƧĢō°Ý@ğ„W™ÅxUUm@™‚ÝXۂW„ULUè¯@mbUaƒLƒbUWġxIUJWz™a¯b™y™@ōÈóLU`ÇXUl™UĉV¯n›mÛbǕLklƒUĉVƒšóaġ„ƏbġKţnkbÝmmnÝWȭȃŽÝXţWókUÇl¯U¯‚ġUɅĀ@°¯„„š¯„VÆnmJ@ĊķnóJUbÝXUlVškL@lVxnnmb@¤Vzš`ÞÞŤ@„VnÆJV„°b„UôJkzlŽkl@²óš@ÆÇ°kĖƒšÇbÛU@lmb™XV˜kzƒV™ŽɅĀXˢlń„ĬŹ@›éÅ@ĉńÆ°ğbUšlŽɜ_°‚@xŦ˜škbVbƒKĢ„ŤVŎŽ°@żÈźlĊ„ôKôb@nôxŦ„Æ@ôŽŎL@þÆb@šnnšWˌbÈx‚InaŎxlU@Ѳ±ƒğVUĢƒƨbɲ@Þ¥ôUUķWVô¯ĊWʶnôaŤˁ@£nmnIôŽǪK°xUXô@Ŧa°m‚kXÆÞVŎkĊ°ÞLȄôyVašIlwX°UVwĢÑÜKôw@nV@œm°nmŽn„Ü‚ɞ£VbmŽXnƒ°ÜÒ@xx@V‚b²UlbkxVnšJUnVVĊ°KȚm°nxÇnn¤±¦@ŽUXVV@„lV„„bmVVȁŽVxšÒ™°šIšbźaȃšbVwš@šƒVL„™ƾÑ@ƒŦô¯ĊkôÑ"], ["@@„@šƒ„@n„òVœa‚w²bVxšxÜaČVô_ĊJšIVmšL„a°@Ŏ¥XlK@ƒšk„l„KVbUb˜@nUĢn‚aÈ@lmǬ»Ġ¯œn‚mnƒƨVy™Ñǖ™Ġ»ɲInŽ‚@@ÅĢƳ@¯°™ôV„KÈbVIÇ¥¯@Ýó„™@ÑnīWKšƒk™‚k@¥š™¯™Åa™Xƒ±VÅw@±Ġ¯@»™š™n™Wmw@ƒ™@¯ƒVƒUUWçƒKĉ„a±VkkƒV¯w™x@šUJ‚x@bknÇb™mÅ@Uw±U¯¦UŽ™Kmš¯I¯Žť¼ğĊ™@ǃŹÈ¯@Ý»ÇnˡJƒbÛèÇnƒ„ÅK¯„ġĠŹW¼Ålm„@¤n²ƒŽÝb@b„š¯lƒ¯@ƒšÅ¤W„™¼nV@x„„°@Vx„@lbUblbX¼W‚œšÇ²lšUŽ@¼ŽV¦@bÇlVxUbVxÞbVšœbm¦ƒVV„"]],
+                  encodeOffsets: [[[100452, 39719]], [[91980, 35742]]]
+                }
+              },
+                {
+                  type: "Feature",
+                  id: "6327",
+                  properties: {
+                    name: "玉树藏族自治州",
+                    cp: [93.5925, 33.9368],
+                    childNum: 6
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ɆÿĢV°°VÈklVôŤXÞW„ȮÇÞXnmÞnlaŤmĢLƐaĢƒôb„™ĊU„VlkǖKÜaœn°mĊUšVVkÈWV_ôKŎǚ@šz°ašbXyVI‚JĢwVX„a„KVbna°@VçVKXƒÜÞWšn@VVÆwXšĠƒÞ@Ŏ¯ƨġÆ@ȍ„LlmUaô»ÆkĊ±Xb„°`šÔV‚kȘƒĢ@Všk°šLlx@xż@Ċn„Çź»ôĢ²VÆ҄@@bÆÒXklV„KšV¥Æ™ČUšk‚l„nxl™çƒ¥ċç@±m¥ƒwÅJƒ@™™™Vƒ„mÈIléÈa°U¥™™@kÞV‚K²ÑWƒ°w²Ñ‚K²ñšyƐ„ÝšVmw„»kkWĉ—JWUƒVÅwƒL™mÅ@@ƒmw„kn¥Vу»°™°@@»„¯„Lla„JônV‚UůƒU@W¯Umѯ¯k@WykU@¯„wV¥ƒkVwţƒk»šwWǜĉĶçšK„ƒÞ™ÇaĉbƒI™lUƒ@kwƒWƒXUƒ°w™±@UšKn£Wĉ—KWxƒkĕVƒšamwXw™@™„Wmnk@aƒVkƒ™bĉLƒl™Imm„wUÇ‚Wx™nÝJn@¥Æ™kwƒaXƒÜĉ™¯ÅV¯¤mkƒx¯kķܙ²VWôŹVUƒƒ@V£™¥@ƒ°wn@™m@¯@UbUôķŽmn@ÆÛ@ÇýVaUÇĊVƒ@Çlğ—¯xÝŤ™lVÈÈVƒx„ƒ¤Vx™„kK@™@ƒx@„kVƒĖġ¥kIWbXŽŎx@nƒxÅUW`ƒ_—@±ŽUa™LUxƒK¯„WbkVlb—bmŽƒLÛÆWIUwƒWkwÝV@kI›ŽéUb›UUk™V¯Km¯k@Umݐ¯m¯›m—L›Þĉ‚ÛUm™ġ£UxkKm°™Lw›šk@kšƒVm„ƒKVUk›@¯a¯Ģ™móKUU™x™ImlÅn™™ÇbXèVVU„°„@ŽšŽ@„‚xXnmš™ššŽ@¼ğ°@²ÆxU‚„²šWÆb°š™š@¦llš™„XLmĬ@҃šÞô°@ȦUJÇaƒLóU¯š@°ġƴ@Ɓ@mɱJğ¼ǕššÒUzƧ‚m„n›mğ°ǫ¼knÇ@bġmmV—@VaUaƒLƒk™l@„kLW‚ō¦¯@ƒb™KUn™JĉIó`ċUÛb™wUw±ax›bñUmƒƒ@™„ƒ@—bƒaƒbǏÅXm˜„ƒÝ„ÅôVbގ™bl„UšÞVޚ„U‚°„VUxƒ@U„V„@l`™¼nL@Ċ„LW„„¤kXķWġXUVVVķ„UbVb@°kVVxÈa‚@ȦĊbšaźJ„U@Ț„„˜Vœƒlš@XkôaWƒĢ™Þ@laĸUÆb²mÞLĠ™ÞÑôbšÒĊa„JVbm¦"],
+                    encodeOffsets: [[93285, 37030]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "6326",
+                  properties: {
+                    name: "果洛藏族自治州",
+                    cp: [99.3823, 34.0466],
+                    childNum: 6
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ÞVŤ™ÈK@ĀlxV@„Þ@„wŎalmôLšnXÆÜ@nV‚°@œ„°WmVKŦLÆmȚԂҚUX¥l@ĢJVš@„ŽƾI@w™W°™™Ån¥›kÅÝVwôƒÈç„@lÑĊĕša„JnaÆLVw°kny°UnkÆVȍĊll¦„Vƾ@@™nUźƒÈǂIn°X„wÞKô¦VWV£„@£°ókċ±I™™am¯Va™»ČĉV¥°™@m„k„¥l@„Ċm@ašU™mwXƒ@wÆxšmĢ_„`VnÆbšKVw„@@ƒnUVğVmVVöIlŽl@@çÛmƒ£UDŽw°@VUƒ¯»m¯ƒJōĖÅLƒa@»ĉĢ±`U_k`ÇçšóƒkX™lK@ƒakÝރš£WċkÝ™kxƒJݯÅw™xķxmIÅx„@k±J@ýŋš›¤UœkŽmV™°ÅÝxkwmġƒnÝVU„š¦ƒŤlmšóXk¤™UKƒç™@mVkK@klīƒ£mš¯VUbƒW¯¼ċb¯ĵam¼mVX„m@k¤ÇX‚ÇbƒUƒ„¯J¯„¯È@˜™bVXVҙ¤V¼kxݚV„@l‚V—„WxÛ¦Wš¯šmKnlŽkŽ‚šU‚@nƑUĉ„Ý@ǺۄċUĉ¥™UƒÞŏ™z±òL±Ò¯xX„±ÒLÝU@lššV¦¯‚ÇbkêÇJƒnU„šš@š„‚ÆI„xn¦‚‚@²Č脦‚è"],
+                    encodeOffsets: [[99709, 36130]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "6325",
+                  properties: {
+                    name: "海南藏族自治州",
+                    cp: [100.3711, 35.9418],
+                    childNum: 5
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@VxƒŽńƒš@ĊĠŽĊXÒ°UƾĕÞm°£nb@‚@LUUW„Ûº@nlÆǬšĠ£ÞV°UXb‚VȂǵ„éƒ@kWanm°@™x„z„K°¯ĠVšƒVƒkw™Lnm°kÞxÆa„¥@‚wnĉƏ@™œ_l›š_VwšmĸèŤÅČU@™˜Wn@ÑmKU™nğƒK@ƒ°¯UÿV£nmšLl™„UƒUÛé±óókkmƒnƒakV@Ç°óÝXƒWəÞťIţxmm™VÛUVȂÓnWyȁĉkƒVš°WnkĊa„¥‚_œK°ÿWna@ƒmU¯wƒlÝIU¤UXó¥ÝLƒx¯WmJÇÈŹ„mV@šƽ@ƒUk¥ĉkċŽÅUml¯Vmz¯lUxÅKmbƒI™bĉĖk҃@Çèó„UxÆޜlm¦šÆ¯ššX@x™Ž@Ž„²ÝlƒÈ™JV²klVl¯ÔlšĉƙްlUǖÞ@ššĶ¼nŽUôôŚ"],
+                    encodeOffsets: [[101712, 37632]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "6322",
+                  properties: {
+                    name: "海北藏族自治州",
+                    cp: [100.3711, 37.9138],
+                    childNum: 4
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ōmġxƽUm±Lǿþġԙ@kxmWƒb¯I¯‚mIUx@bƒbŹVǎƒkĵbƒlĉI¯¥ƒUšm@ƒÆ¯È@šašóšUlƒČ»@w›œ»›wXaƒƒó°ţç݄kUƒaV¥ÅbÝw¯lmnšKlxU„™„ğU¯°ƒLƒyšw¯@mnXb‚l„@ƒêȁǶUWa¯VÝUğ¤ǫ™kÅ@mܹXƒVV@K@ma¯¤ÝnƽĖ¯V@„ƒ¼„ôlèk¼„¦˜xXŽlbnKšÆx@Ž™bUx@nnxWJţ¦ƒmƒ¼ñ@Ž°¦lUÞlÈ@ĠxÞUlxÒó„ƒl¯bmI™ŽÝVÛaÝnƒxVbkbÇwřÇKn±K™b„šƒb@V„xšLmŽÛŽŻbk„ƒVó@™šŹxó²›Wkb™@¯U¤ƒźĊ@lUX„°lÆôU„ƒlLX‚aœV°wšxUb°xÜôÈKVkÈmlwškÈKšwšK™™VUŤĉŎ»„»„Il¥na°LV»²¯Üy@wĢƒ°ĸwlwĢw°±„_lVkš@°ƒbƒÆ¯zƒ‚„š„@l_„@Ģ±lŚVlUaރ„LVƒnKlnȏ°IllČa˜wÞÑ°x„UU™@wƒVkmĠLô»„KÞýôaÞ¥ôĀÞmƁ„™‚mUƒŎV¥Èl°²°a²¥V„@@w„amm@Ñn@Æ£żƒVƒĠ£@W„¯Þƒšl@š»@Uk@"],
+                    encodeOffsets: [[105087, 37992]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "6323",
+                  properties: {
+                    name: "黄南藏族自治州",
+                    cp: [101.5686, 35.1178],
+                    childNum: 4
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ôl²ôÜê„VƒVkš™KmnU¤VĀ¯°@„„LmĠVšnLÈL@alb@al@n°Vš_XmWUÈamaVIn@n‚aV£œóVWƒ™U£°ašxÈ¥@™‚aĊwȹ@óša™ƒğbm@k„w@mƒaÆw@ƒ„In¯mmƒ@UkkWƒÑÅ@@kċÅçVkÝJÅkVykŹl¥@¯š™ĢU܃X¥òý—mmX™ÝÅlmU@£™Wly™XW»Åbƒl@aI›»k@klm@UxUUƒVƒ¼¯Xƒl™aUnķ‚ƒI@x™@¯„ƒK™„ĉUU`óšlČ¯ô@¤ƒÞJ„k°xVŽ„n@ŽmbXŽ¯Ā›L`ƒ¦ĉbml¯X™ŽUŽl„ȂĊXzm‚ȁÔU‚ÜVšUnnŤwŦJɚ݄XÞW¯ô@ÈlU„b„mln"],
+                    encodeOffsets: [[103984, 36344]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "6321",
+                  properties: {
+                    name: "海东地区",
+                    cp: [102.3706, 36.2988],
+                    childNum: 6
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@@҄bš¤ÆI°ôU¼š°UŽnnWx™š@b¯L@lUUWbXxWl„ƨnxVUllš„XVŽUŽnL@lȀý²KVnƾ‚ĢwV»ƒ@mÞ£nÆƒÞÑmL™ƒKUaVżĕƒWVk²ƒƒÆÝ@ƒXw°@„ô™@a°wóUUmIk™™aVmÞwmknyƒ¹VÿƧnŏm£X»˜™naV±„Ýw@ašb@aƒm¯„ĉVó¦kÝWKUU@WanU™b@ôǺĉxb@šÇ¦™w¯bV¤„šUX›ôU¤bmm@UJnbÇbXVWn™`¯Umk@@bka@bÇK"],
+                    encodeOffsets: [[104108, 37030]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "6301",
+                  properties: {
+                    name: "西宁市",
+                    cp: [101.4038, 36.8207],
+                    childNum: 4
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@@kmKVUƒWk™VkUmwƒƧXkWwXaVV@k°K@aš™XwmmV™¯V»¯óÅJ™£ƒamŽ—X@šċVţÆķç™nUx™`kœ›`@šÅmĊx@Žƒ¦U¦„blVރŤèô¯„„Wbœx›¼œŽ@xċ¼k„™V™ô™bÇ@Å°@„™n„V°¦ĊJ„kĶa„lȍźU„a@aVwnJ°°J„anXlwš@ĢÓ"],
+                    encodeOffsets: [[104356, 38042]]
+                  }
+                }],
+              UTF8Encoding: !0
+            }
+          }),
+      i("echarts/util/mapData/geoJson/shang_hai_geo", [],
+          function() {
+            return {
+              type: "FeatureCollection",
+              features: [{
+                type: "Feature",
+                id: "310230",
+                properties: {
+                  name: "崇明县",
+                  cp: [121.5637, 31.5383],
+                  childNum: 1
+                },
+                geometry: {
+                  type: "Polygon",
+                  coordinates: ["@@uŏu»GPIV±ÐɃŜ{\\qJmC[W\\t„¾ÕjÕp‡nα|ěÔe`²„ †nZzZ~V|B^IpUbU†{bs\\a\\OvQ’Kªs†Mň£RAhQĤ‹lA`GĂA@ĥWĝO“"],
+                  encodeOffsets: [[124908, 32105]]
+                }
+              },
+                {
+                  type: "Feature",
+                  id: "310119",
+                  properties: {
+                    name: "南汇区",
+                    cp: [121.8755, 30.954],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@`y”ĉNǕDwǏ»ƒÖLxCdJ`HB@LBTD@CPFXANC@@PGBKNECCBB@EBFHEDDDSNKAUNBDMNqf[HcDCCcF…@EFGLEBa@ACoCCDDD@LGHD@DJFBBJED@BGAEGGFKIGDBDLBAD@FHBEF@RFDMLE@SGANFFJBANPH@@E@FJjRIACDMDOEKLFD@DbDAJI@AP@BGHFBCBGDCC@DCA@CECGH@FKCEHFJGBFDIHACEDNJDCVFBDCRKRLDLITB@CjNJI^DBCfNVDHDFKHAFGDIICDWBIF@@CFAjFJNJBBHD@CJ@AEFJ@@DH@BFBCPDBMFEQGDIFCNDHIP@HDABFACBJFHEBSZC@DP@@JDBƤ~"],
+                    encodeOffsets: [[124854, 31907]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "310120",
+                  properties: {
+                    name: "奉贤区",
+                    cp: [121.5747, 30.8475],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@~T~JjZdDbLXDLCB_J@@FHFZJJIAGH@HGR@BENBLID@@LFCDF\\FpDBDb@FAHKFE†@dEDDdC\\GreNMACVMLBTMCCFCEGFAA@DAFDLMHA@OD@BMEWDOC@AS@KGAI_DcKw„ÕísƝ‘åĆctKbMBQ@EGEBEJ@@MBKL@BJB@FIBGKE@ABG@@FMFCPL@AjCD@ZOFCJIDICIlKJHNGJALH@@FPDCTJDGDBNCn"],
+                    encodeOffsets: [[124274, 31722]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "310115",
+                  properties: {
+                    name: "浦东新区",
+                    cp: [121.6928, 31.2561],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@EN@JJLNHjLJNR^GRYVBNZJRBV@PDvbLNDN@LGNER@nCNQNuT_TIVFV\\Z\\XnDrI|[Ʉś²ÏJUHOƣ}CA@IO@@CYDATGFIEDAEBBAGCO@GJMCEDCJRHEFANOCADAEG@@CI@FE@BDIC@AGIAIMiEEB@DE@AJCXJDCJEHGBELGCUCeMAD]CIJiM@DSAKJKCLQDQACUECDMIFCBDJGECHAEIWCK@GLMCCGEACNKCEJG@MMBMC@@CIJUINT@JAJSTEPZZCP"],
+                    encodeOffsets: [[124383, 31915]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "310116",
+                  properties: {
+                    name: "金山区",
+                    cp: [121.2657, 30.8112],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@L@BIHFN@@EE@@EFBDGDAADVDD@@EF@CA@IIsRE@GDAF@BF@CV@|FBCHBLCNHAFCADBMDCFZXHILBVEEQA@MWFARJJ@DCX@@TEFBLHAAERE@AJABRPBNK\\BrJ\\VHGND@CNADKDADQjGAGNC@GJ@FCFFHC@JF@@dLBDSFADHVG\\DTEPDDHJALIJkJDJCDIPE@YDCBiK@DONE@EH@BAF@HLJA@EIA@ALKNA@@FIFAFHR@NALadsæąyQY@ƒA±DʼnXUVI^BF@FFF@HBJEDFFGFEBSRkVEXGHFBMFIVW@GAEEFOIAIPKABGWEKFSCQLQBSEIBC\\FdBLRR@JGACFDDEF@AWB@LJJYNABBA@CUEGPaO_AIE@MYMFIGAEFECHSAAKAO\\[JEDB@E@MMA@@AGBKMGDFFCDDFEDFJF@NPBAFLHFH@EDDHBADDC@DDCDHHCDDFDABDAD@FEFOBCJ[D@HEDDNJBDDHABJIBBvGLBJAH"],
+                    encodeOffsets: [[123901, 31695]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "310118",
+                  properties: {
+                    name: "青浦区",
+                    cp: [121.1751, 31.1909],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@RUNKdOFDJCbRFMLAHPLDN@JGL@@APBWYCKN@TU@SHGCEJIDIJKVIZVNM`iNY@CIE@CA@KBOEGEUFCCSADEIEFCDDDIDDHC@CKIeDCG@IG@DHWFEEGCH@@GO@@O]CNpeEQDBFME[JC]DGF@CKOA@QSB@GB@@GW@@ED@AQIJIAAFE@@DO@CFI@KNG@CDACAFEGKGBEGBDCCAIFCCLIECFI@MBCLDHGNAHSF@DMB@EEKBA@@C]DEICFG@ADBHGFKCDAKKHKD@@FHGAANGEEFCHKCECBCKG@ADKCNE\\[A[I@@mGBDQQEO@BCE@AI[AML@JGACLOAFKEMM@EQKC@CUCBCCBCHEA@FF@@FM@GEAJK@GNF@EXPH@FD@M^@HIADJCFDBER@DK@@DE@CAKFOCCBDHIBCNSB@GFC@GQEEOWFICGDUAEJIDBTAHJHEB@DIF@NE@H|HBDBEH@DKBAHEF@HEEUB@FGFGCCCE@AHOB@NH@PRLVNNFBX@RC€PbAvMtBfH@DJF@ELBFA@EH@HNED@FFB@HLC@CJ@@DJ@PIRf@HE@CFF@GPHD@DKE@FFBEFFD@DEFCA@DD@IjCRFBAHFDKD@HF@@PM@H@BlbDJDBFEF@DLXB@HCD@@IFCBIFEJD@FDC@FBALLF@PAACJERACAJCBD@EL@JD"],
+                    encodeOffsets: [[124061, 32028]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "310117",
+                  properties: {
+                    name: "松江区",
+                    cp: [121.1984, 31.0268],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@@DLDFRN@FNELPBDKHB@INK\\BBJF@ADP@RFCRHA@nJ@B\\[\\MFLDBCH@DLDADFGLEDFFMHBBGH@EC@GLLLCBLDHEAGBCH@DEFJ^C@DB@LAFFA@CNE@GTMBGHKCAD@NEJFDKJDDJEDBCDHAAFLHFHBEBDDCH@LMJ@DEP@@CF@BEJBJIBRC@@FX@@HA@@HTA@RPBDLE@CHD^\\INFAERCfFMo^D@PP@@HG@HDFFXECGH@@JDHfCLJ@DGDCCCJCCEDJFCFTBDDVEHFPFLAB@NBFCFKFC@CHIACNOHWHCAAFIDD@CDAGEI@ACFMF@R@R_@GQED@EGFEQEDE_IAHKAEXCQUOQCUDEN@ZI\\DDmAMHCICDSOC@EG@BKHIGMIBCGOCSF[CUHCGEBCTKA@cE@@IGDEEEDI@@HMDBHiHCRCBCLMB@DMCGH[UqI[AMLOAAQIB@BQFBFGBAKFE@SW@CDI@QIEBNXB@FRUFKAGJYWDENCCADBBEMGKDGAAD{EU@@DAEE@CB@HQFJt@JDBE@@FC@"],
+                    encodeOffsets: [[123933, 31687]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "310114",
+                  properties: {
+                    name: "嘉定区",
+                    cp: [121.2437, 31.3625],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@F@LI@IDKJADKIEJICADGACFECCJ@HKCAFOHAJI@aCBEE@ICAEB[GFGCKL@FGEIFADMLCAEJM@ELQECEIG@BE^QKKLQCA@EHBIGQ[GEHOMGGDHKH@JOECFCjCBEFDNCACMBCILGTABDLEEOEIG@GFIMM@CGKFBFCDE@@GEAGEEACIcGaHMFITIHDN[AKF@FS@OA@BK@IHM@KCGOKBENaQIDECcPMLQVFHFB@BFBKLGD@FAJOVGIACQ@A`LPCB@JEF@RU@ANS@@RCL\\HIFpRBFRBBDKLLDADJDGBFDABHBEDNF@DGBBBADKDAHC@\\JJFBDEH[DEFDH\\LX@XLBLbT@DNJLDCEL@VJABJNDHB@HBHYFBAA@GNFB@@AFB@AFABFLFBHFCL@HJBAFBLC@DN@HN"],
+                    encodeOffsets: [[124213, 32254]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "310113",
+                  properties: {
+                    name: "宝山区",
+                    cp: [121.4346, 31.4051],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ˆmÖoÖiƒ½[s[YEUJU`SCIEBCCWJY_LIICDWU@@FaBCJIB[ICH[@@CDKEE@MK@@IMCAEBCH@AMFI@SMGEFGB@FK@BHCAIFJNQD@FEBDFMBKGACG@ECWH@@CDDTOEEBGEK@GC@EE@GPHFR\\JHGA@FDBKRLL]RAFH@FJFDKR@FINBFKDCNEBFJEHK@DLEH\\HFADB@JFFDA@bIJGBEPDBGLI@DDEFBDCHDBIJJFCLIBCL@JKJE@ADHDBHJ@HIBBDFHBBAEIJ@BJFAVL¢ˆ"],
+                    encodeOffsets: [[124300, 32302]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "310112",
+                  properties: {
+                    name: "闵行区",
+                    cp: [121.4992, 31.0838],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@T@@ELE\\BCMJGJSNEbGdHDJFBJAFIEIFCEWG@@gMENSFCVJFAxR~B@IH@AIiI@GE@FGEAFQPDRiV[\\DFSGMHAXHDOMCJCDETBBNVJJI@DD@ANNNH@FILDDMFBDHNDHKL@XDFGLD@EHGFD@DDB@CDDHCDAEAHG@ABOJ@BIaC@CECLKPFNCDCJBiQEIF@@@OGBMIAEEBMTHF@NKEC@QFEGA@EBCKAACHCLJHEFHHB@AFCAIEACIC@HG@KCCDC[ECEED@KC@KJMAAFQ@GHG@BHIJYIGE@EI@A`KDWCaKcCiY}I}S[CYJM@CFDVPRRVWDFžLBBG`JCFRFEFFHC@RF@HQ`Q@E@ENBDJ@HFCB@DCCEJBBGDGXMPBDGJ@DEDELEDMA@DJF@DMZ_jMNYUUJILCJIJDFGH@TSVM@DLXZ"],
+                    encodeOffsets: [[124165, 32010]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "310110",
+                  properties: {
+                    name: "杨浦区",
+                    cp: [121.528, 31.2966],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@V@CXJDKJZ`XIDDFADJvSRMDM@mFQHM@KCMKMuaOCU@BDAJSX@HKJGD@PNJCJWAGT@R"],
+                    encodeOffsets: [[124402, 32064]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "310107",
+                  properties: {
+                    name: "普陀区",
+                    cp: [121.3879, 31.2602],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@F@@FHDL@HFFAPFCSDC@@XGFDH@BDLHNACEFA@ERCIMJEDBAGL@@EHAFENHHJ\\ONQBQCIBC[MKACKI@GGGH@I_G@CW@[DMHCDIBMTDHN@JNHEH@FJFPKFACSBKHDJNABDMDECAFiDEDFDIPG@GLHCNH"],
+                    encodeOffsets: [[124248, 32045]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "310104",
+                  properties: {
+                    name: "徐汇区",
+                    cp: [121.4333, 31.1607],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@RADL\\NCPHFfLJaJ@FWLGMGIK@IFMDOYYFOTSBI@IMSAMSACFIDNDCPWGGBHNET[CU\\QjOCERFBEHF@@HjJBJG@@J"],
+                    encodeOffsets: [[124327, 31941]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "310105",
+                  properties: {
+                    name: "长宁区",
+                    cp: [121.3852, 31.2115],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@HFFB@HF@DCAELENSJADCNG\\CX@@D`H@JHGHHJ@BINBFUGEDO[MCKQB}AwQEBUIEDMTNF@hH@FXEDFJEJIB"],
+                    encodeOffsets: [[124250, 31987]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "310108",
+                  properties: {
+                    name: "闸北区",
+                    cp: [121.4511, 31.2794],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@CSG@BQGODUPWTOBQAAFMECKBGEMFKEOHADDJARMR[PGI@TEJBNG@ADBFND@JL@@NFFCL@D\\@DG\\JJADI"],
+                    encodeOffsets: [[124385, 32068]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "310109",
+                  properties: {
+                    name: "虹口区",
+                    cp: [121.4882, 31.2788],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@bA@E@QHSXBDIMI@OHCLI@GTWBIACQAYIOFGCENBBARSPOXCVHPARH@DT"],
+                    encodeOffsets: [[124385, 32068]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "310101",
+                  properties: {
+                    name: "黄浦区",
+                    cp: [121.4868, 31.219],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@NEHFLAFDHDPEAMZUHQQ]IMKJG@EPERABHBGRUCCNGV"],
+                    encodeOffsets: [[124379, 31992]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "310103",
+                  properties: {
+                    name: "卢湾区",
+                    cp: [121.4758, 31.2074],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@VDHQGABAFQFOH@LIiKKHEXI@IbAFZB"],
+                    encodeOffsets: [[124385, 31974]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "310106",
+                  properties: {
+                    name: "静安区",
+                    cp: [121.4484, 31.2286],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@DLLB\\NPGLFHUDMYABEeKEVMAAJ"],
+                    encodeOffsets: [[124343, 31979]]
+                  }
+                }],
+              UTF8Encoding: !0
+            }
+          }),
+      i("echarts/util/mapData/geoJson/shan_dong_geo", [],
+          function() {
+            return {
+              type: "FeatureCollection",
+              features: [{
+                type: "Feature",
+                id: "3706",
+                properties: {
+                  name: "烟台市",
+                  cp: [120.7397, 37.5128],
+                  childNum: 9
+                },
+                geometry: {
+                  type: "Polygon",
+                  coordinates: ["@@ŤLšLllVń²è°xżĢĠÆl҄šŤbœ„V¤ĊXnŽlĢVĊ„Òš„È°ĊŰÞè˜L„±@џn»VUźċ²»ÆkôVɆkĊŃ²kŤVVwUUVmUaƒ@KkU@ƒmUmmk@UwUkmW@UVIXa@ƒmw@a™KULƒaƒx@Uk@UbWU@yULmK¯@kXƒVUwm@@JUUknWKUVƒLUbU@™wWykIƒa@w@mUI@ašUVynIWa„k„@@W„bl@@knmƒK@wnIl™°Kna@V¥ğ@ġUķ»™¥@UōJƒX¯¤k@™wmI¯‚k@mwƒak@@šlX@bUJ@VƒbknWxkLkxlŽšLVlkLmŽšb@bU@ƒbU@VbU`Vb@n„L@Žmb—U@˜VnUVmnU@mm™@kIUWVIUK›VkkUJUnmL@VmLUaVWaXamU@™™U@KUUmVƒU—JƒU™VÇwğn™mƒ@mXĉV@l¯xnô"],
+                  encodeOffsets: [[122446, 38042]]
+                }
+              },
+                {
+                  type: "Feature",
+                  id: "3713",
+                  properties: {
+                    name: "临沂市",
+                    cp: [118.3118, 35.2936],
+                    childNum: 10
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@˜bXlƒl@zlV@lXXmŽkbVVlš„U@Vn@@Vmb@XšKšVX„WJ@XXl@„‚ŽÈbVLšUl`„@XXV@VVUxVbUxVbš¦„@‚WnXVJ@bnVUzl@„°Æx„U„KlU@mUUnUlUVWVUnVV@XX°V@Všll@Vk„aXVl@Ux@bmbXLlKlb@b@bUJn@@„„b@n°x°K@an@@UlLVKVbXb@bVVnK°LVa@UVa@™Xw‚KVxnLšU°@naV@UWUkWƒULmV—wÝKUUla@aó_@mƒK@aUU@ƒWUkwVm@aVI°W„@@IUw@a±¯@¥kUVUm@a‚wkw™@ƒK@kVKk@maXalI@alL„WXblaVLVU„V@LnKš@„l@w˜aXašLlnUl„LšmV@n°J@_VmnIVym£UKmI@WnIVm@anUVmÇ_kġIÅWUXÇm@U@ݯÅ@ƒ™@naWƒ™IVW@IkK@klKn@naWIƒmk@ƒaƒbkKkLWn™WkLWmk_ƒ@UaVƒUKmLUw@mn£WwUmU™ƒaóV@UkUm@UKULUwmJUX@WW@XҙzVblJXŽWXk@UVWK—X‚¤UL@xU@ƒ@ƒVUaU@@XmVkLmWkXUyÝLmKXnVŽ@n@l™x@bWLnVVn™`knULmxUl„„WLXŽVb@VƒK@z¯x¯¼Wx™KUn@bk@ƒlƒVVVz"],
+                    encodeOffsets: [[120241, 36119]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3707",
+                  properties: {
+                    name: "潍坊市",
+                    cp: [119.0918, 36.524],
+                    childNum: 9
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@l@@UšK@Ž@L@bX@@VlL@JƒLUVnX@`ÜXn`V²mJ@bU@@n„b@l°xnnĸVƚ°@„ƒĊ£Þ@lWnÑnkʶJmó°w@kk»V@»ƒ¥k@V@kw@wVm„a˜Å„mšaô£ŎƒXI@mln„Kla@mV_UKƒ@kUkw@alW™IU»™mƒ—@WUIl±UUÅU›bkJƒ@a@wUKUaVIÆmXIWaka@m@Ul£XKVw@ƒUIƒJUkmJ™ƒVkU@a„ƒWK—ImVƒ@UxmL@bX`WXU@U`ÇkUak@@°UblXk‚mLUKmL@VULóƒƒVk@@Vlbn@Ub@ċaUJUbƒIUlVLUVVbVKX„VlVXU@mb¯@™VmKUwLWx@šUb@VUb¯KmLUU@aWaUaULkK@Vm@@b¯L¯w@mƒa@ƒm@UUU@U¦lJUXƒVƒmkb@nm„XVWŽkb™IVxUV@VUbWLXVƒLW`Ux@nk@Vn@x@VkJ@œV`mXkŽ@V„xV@lVššI@VULš˜VU„IV`°bVXXx„V@VWVnL@xV„Ub"],
+                    encodeOffsets: [[121332, 37840]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3702",
+                  properties: {
+                    name: "青岛市",
+                    cp: [120.4651, 36.3373],
+                    childNum: 6
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@„@nU˜JXLƒ„@blVU‚š„nIVl„IVJ@„UxWLk¤@V@nlbXbWJÅnUJVbVL@x@b„ŽlIœaÆVVVk²VJ@X„˜šnV¼šJkX@blxlV„@VLU`@nkbƒLkm@nWJō„ó¤™bƒn—ƃbUn@xlxU@l@„¦@¼UŽl¼ĊUnW„@šnĠmÈxšU„V˜I„VnUVV@LšV@šnVWbXb‚UVbnK@UnKVmVIllœUVLUJVXlJš@nnV@nmVUUm@—˜Vna@ƒK@mUaV_UaV@„aV@@a™anlKUk™KklwlKXwlm„a@UVI@akW@™l@„bnxl@°nJšxl@°£„WŎIUÑn»lašmô¹Ŏ¥VaUUkƒmkġWɱIUUŹ`›@kk@ĉƨřV¥_Ç@™Ĭƒ¤ÝL¯m¯£ƽóķwUW±ī¯kōaĉĕ™kğmó°ƒbW@UKkLUaƒVmz@V@ŽUxVn"],
+                    encodeOffsets: [[122389, 36580]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3717",
+                  properties: {
+                    name: "菏泽市",
+                    cp: [115.6201, 35.2057],
+                    childNum: 9
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@@¥šIVUÈmÞ»@UlU@Un@VW@UVmkk@aVUUKVÝ@UVknK@UV@VVnIVƒ@wnƒmwmKXaWaXI@UV@Vy²blkVKkam™U@kb@Um@VmUkmƒKmkXKWwkU@Ulƒ@UnK@UVUUm‚KXwšUVL„w‚K„U„@@Wl@@wUkV¥—@@I@W@_V@VWUw@UUa@aƒaWa—@@_mKUw™l¯amzmV—@WK™nU@kƒWLķaUKbÝVmV@UWÇbÛ@ƒX™°UbW@XŽm„Vlk²UJUbmLÇxÅWUzl‚¯Ll„@VkK™XUbWJ@bU@¯@™ƒkbƒLmKka™„@l™_WšXºVbUz@J‚n²V@¤lX„Ž„nV°šLn`WbXLôVlKVUšxXn˜lXLlU@bVV@„XJWLUVnVV@„„@n‚l„°nn‚V„KÈbVXÆJU°VnXV„kV@@xVL„@šWlb"],
+                    encodeOffsets: [[118654, 36726]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3708",
+                  properties: {
+                    name: "济宁市",
+                    cp: [116.8286, 35.3375],
+                    childNum: 11
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@nam_nKlVLXa„Il`š_@KVVXI@m@w‚ƒ„@@k@Kšnô@n`VbV@@L„L@KVVn@VX@‚VL„Jl„š@VUUƒU@Uam@Uk„wšKWaXamkJmIUVUÈblašUnV@kVKl@@lXL°kVJ@VÈnVJUX@V‚LXl@xVLnU‚@VK„V@a„IUaV@„bĊU„x„K‚kVJXUlV„ƒ„UVašI@WUI@KlUnw„mWk@WXIWƒ™U™L@Wna@Um@@UƒVk™UUlanWW@kkU@y„kWk—aWVUlÝbUU@kƒJUIU@@ƒ™JmaókƒLKǃUUkKWLk@WbkUUaƒbmKn¯°¥V@XwV@VanaVaU_@Wlk@WÈ@VUÈVVۂm„aklKȯlLVUX@lK@aX@@kV@VmV@VwnJV_UWUwƒX™am@kW@wVUkKVIUUVmU@UV@IVK@aUL@aƒV@Lm„UKmx@ŽômLkUWJ@šnXmlUxUL@Vkn›VUšU„@V™L™`Ub±LkV@kUKÇbÛ@ƒU™Wó_mJƒ@Wk@@Xƒ@ƒVLƒxUK™VWxLVnUV@VmL@Vk„@VlVXxWLnl‚Ln„VlUnn@@VlaV@nšlbULkl±aUzU@@VWJXbWbnLnxm„@xU„mJUUU@@VmLUl@VUÞVLUV@bllUn@VUXm@@VkV@VݼÇnUV™J@¦nnƒlnVlL@„Þb°KVV"],
+                    encodeOffsets: [[118834, 36844]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3714",
+                  properties: {
+                    name: "德州市",
+                    cp: [116.6858, 37.2107],
+                    childNum: 11
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@„¤@VmbVXnVVbVJššX@Žll@z„lVInl@„@bVxUbĠ‚l@Èbla„IšxXVWb@L™@n‚ULWVXXšWWLnL@`@LUVVL@lVn„JšU@UUk‚a„™nš‚Vôô„b°¼V‚ސXš˜‚œIÜbČa˜bôW„XÞWÈzÆmnLVJ°ÈnlV²lbnW@™@UƒUV™šmnwmkkKWƒkla@mVIUKUa™aUwmn™JU@@amIk@@bVlkX@mmUklUUƒƒa@_UaUUƒV@wƒw™WkXmW@I@WUaÝU@UXaWUU@UUVW@UUUWUn¥nUVa@m@k@alU@wk™LWa@UUm@@wnmU™wla@anKn_@alK@ݙ_ƒ@@WUUUmlkaƒIƒyU@UwU_Wa¯yU_mWUwkImm@InWWUk@@UVWV—kW¯U@VƒL@b¯b@l±¦@šVV@lUbV„@škxVnUšl¼XV@b@lV@nIWxnbƒ‚™@UU™LƒxÅxm¯ƒaUƒ™wU@mUÅVÝKULm@bmKUXó@"],
+                    encodeOffsets: [[118542, 37801]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3716",
+                  properties: {
+                    name: "滨州市",
+                    cp: [117.8174, 37.4963],
+                    childNum: 7
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@Vb@`„bV„kVlnV@nlWUk@al@nJ@bV@šInmVxšbVbVLUJ@nkb‚lX„lLnlmx™nUš„V@V@šmXn˜lbĸ@nnVx‚b@lnXV@UJ@nVxšxnxVbÆVn¯ƒĕ‚@@wÈçUÇlķVIœb‚@„Çmk@¥k@UkUK@aWakUóJW_UW@wkkWK@U@Kš@XUƒƒUkmUUalKXala@U@kkWlkÈl@kšV„mVIVmU_‚a„ƒƒwnwVW@wƒwUƒ@wU£ƒwkJWIyUI±bk‚VUJ@nmV™Ukl„Xmx@lnbW„kVƒUkLWŽƒxkKUUmUkb™J±—LÇxUKmkUmkkW™™a„mUaVkšJÆ_²KĠ@U„W@w„U‚¥nUWwK@aÝUkÅVaVK@akLWƒƒƒ¯I@bnbVx¯JW„ñšWbUL@šƒŽnV@VmbkUUV@IÇak@@bWak@WJUœJWL@bXV@„‚@„V„Jlb@zUlUŽUImšnbV‚mz@°UV@V™bV@@V@L@xLmKUnmJVX„J@VkLW@UVUL@b"],
+                    encodeOffsets: [[120083, 38442]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3715",
+                  properties: {
+                    name: "聊城市",
+                    cp: [115.9167, 36.4032],
+                    childNum: 8
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ô@VWnL‚an@VKÞLÆUnVV@šxV„„bn°Æw„wšKVVš@„maXwmJU@@k@aWUk»V™Umlw@™UƒVa@kUU@™²¥@k°a@a„K@U›ƒU@mmm@ów—ѱ¥¯@@w™Kmw—I›¥kU¯UmakJmIUaƒVkKUkm@VUUa™Uƒ@UaƒKUK¯@™w™UVŽUIUKVw™k™¥™wƒbVŽ@xn„@lWnXxlL@`„XlJX¦l°XxW¦@¦Ul™n@Ž™@@Um@@VXVmx@¯bllUnUJ@VULVn@b„xV‚VL@b„„VlnVVblV„ÈnVlIVJœLô„lJ@xl²„"],
+                    encodeOffsets: [[118542, 37801]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3705",
+                  properties: {
+                    name: "东营市",
+                    cp: [118.7073, 37.5513],
+                    childNum: 5
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ͬUǪlô@°Uœw°ōĠ¯š»Ģ炻XÇ@w™wƑa™ÇƒkwVƑ¯@řķUmm¯w@kƒa@mV@@anIU±m_ÛW@_mWVU„K@IkK@UW@@a@K@™L@Vk@±U@UV@lm@mUU@kLm„„xV¤@xV„„x@xUXmx„xƒ„bV`UnUJƒn™U@lÇkkllX@l@VkbWbkLVbnVVl„„WV™@@L@VXLll@xVXX`ôIlVXb@bVLVll@@¦nlƒÈ@›aUJkĸVÈÇè@x"],
+                    encodeOffsets: [[121005, 39066]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3701",
+                  properties: {
+                    name: "济南市",
+                    cp: [117.1582, 36.8701],
+                    childNum: 5
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@²¦˜Òôxn@nn‚@V‚œ„°VlXU˜UX@Vl@XVmX@JnnlJVxnXV`°zXbV`VxV@„z„JlbkŽVnVV@X„@š`@ÞkL@bm`mL@bkbšxnVm@xn@VV‚@XbšKl@xkV@b@l@nUbmVm¦XVVV@VUXVVV@XVWb@VÞVVb@X@JnXlWšX„x@x„UVV@aVKVUX@lK@UƒIUWnIVmnL‚K@w@K@UU@ša@UVU@¯nyUman™VJVVk@ykaƒIƒU@@ƒWU@aXK‚IV›XIl@Xb@al@Èb@JVUlVna@UmU„@™VKXaò™Xƒ°IUwma@aU@UU@wVW@фw@a™I±`kbƒUkw™UmJ@UkmÇUUkmKknUVƒ@mJUkaWkƒa@KmKkUƒLmyXa¯_@WmImmbƒLmUkVUbUVƒJ™bƒUkkWJkUƒl™IUm™k™Lƒ›„lK@knaVmkI@mWaƒLUK™UU@@VmLUVLWK@UUUƒWUkkVmx@„Vl™¦"],
+                    encodeOffsets: [[119014, 37041]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3709",
+                  properties: {
+                    name: "泰安市",
+                    cp: [117.0264, 36.0516],
+                    childNum: 5
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@n¼šŽW„nxšL@x°@š¥Uk@ƒnwlUVl„XVV@VXL‚KVUnK@UV@šVVL„KXb@nlJUnmb@lkLƒ‚„œšKšlVnšJ„klVXIll„Vša„IVUValUnV„K‚annnJ@X°`Wbnz„KlVnL‚Ž@L„bXl‚bVlnI„@VUU@UmVƒ@U@Uš¥@VmV@@_Ua@m°@@ƒ„kmUUm@UVmn@nX‚@@a„anJVUVL„mlIVJn@nkVLVa@KVmVLXVVLš@@U°bn@VaV@@K@aVkœbWaXUVymU@aUImWXƒ@™¥UaVwUaVwUUU@WWƒ@k_™VUKÇa@ƒƒnmxkV@LVJ@X™JUbƒVƒ„kUWVUIlƒLƒwĉVƒaU@VbƒJ@bƒUUL@mVUK@wWkK@UVWUIÇm@UUI¯lWK@kk@UL@lmU™VkbÇaUVVnJlIn‚WbXb™LƒxVln@VbV@V„UV™@kƒƒIUK@UWm@UU@LƒK@KU@Uam_ó@™m@L@lƒ@„@x@nWJUU@L™`k_ƒJWbUKkmLn`mb"],
+                    encodeOffsets: [[118834, 36844]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3710",
+                  properties: {
+                    name: "威海市",
+                    cp: [121.9482, 37.1393],
+                    childNum: 4
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@VbUnVVUxĊ¼š¼ô@Þф¯‚WǬLŎUÆW„¹Uǃō¯ÑƒÝkţ™™ţóġ™óL™ł̥U™wm¥kÝmkkKóbÝ@U¦@‚mb¯LkšmJ@x„Lmn@lk@ƒa@Xƒ@ƒlXbmJUz™V@bVJ@n@x„blJXzšxV@Va„KVUXLlmVV@In@Vx„UlW°@nLVK@zXVVal@@V„w„bVKšL@bnx@„WbUJ@VnXVlVxl@nnnV@„lV@L„‚"],
+                    encodeOffsets: [[124842, 38312]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3711",
+                  properties: {
+                    name: "日照市",
+                    cp: [119.2786, 35.5023],
+                    childNum: 3
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@UaVUUKVk„JVaVIČb@Vam@ka@Ul@„Uô„VK@UnKVLnKlkWVa@¯l@VbÈlV_V@XWW_@anKVwUmVw@@Uny„UVblKVLX@„aô¯ó¥mÛĊÿÈ¥š™Þ¹lUīƒ¯Kĉ¼ʟbÇV™U™ŽUŽ™XmakJUnmV@bUnmJ@XnJVLn¤UzmJUn@`¯ImŽU@™nƒKVkkm™KWb—b@xƒk™@mL@KƒUUVUKkbWaƒXkK@bkJWbnbl@UL@l„Lš@lxx@b‚nUVlV@¦²°@bVx@Jƒ@¯XUJ@bUnlxVŽ„X@‚VV@b„L@nô`@bkbVVÞL˜xnU"],
+                    encodeOffsets: [[121883, 36895]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3703",
+                  properties: {
+                    name: "淄博市",
+                    cp: [118.0371, 36.6064],
+                    childNum: 4
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@nƒlKV@nVn@@kVU‚@²VVaUƒ@wmKXU@UƒUWwUW¯aU_ƒJUV™—VK@U™JU™@kUƒw@UlnWU_@›lI@U@wUml@@mVwX_„KWUXKVa@UVUUwšJlaXWUnƒ@mla„n„UVWkIV¥V@VVVI@a@akakLWKna@aVwk@WUƒbUlk@™k@U¯UWWU@mUUVUXkVmVVV@nkVƒLƒVÅwƒ¯k@WVXb›aUl@bV@@b@xkVVXVxkJ@nk@@ŽVLUlVb‚VXUVVUzV‚™LVbUbV„VWVkLmškJ@n±@UxU„VVkV@bƒx@ÒUX@xVVV@°J„„X„lK@bULUblÆÞV@b‚LXxmV¦ƒV@xƒXVŽğ@±LÅ`™IUlVbƒnšbXšllVnnlVLÈw˜K²ŽšIlanVVVlL„wXlK„VlUXƒma@knwƒWlkšVnU@mVIUl²aVJ‚zXJlI"],
+                    encodeOffsets: [[121129, 37891]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3704",
+                  properties: {
+                    name: "枣庄市",
+                    cp: [117.323, 34.8926],
+                    childNum: 2
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@‚yUU„U„kl@@aVmšLXw°»°w@y„L@UUaWXKƒƒVknwVKlmš_UmmUXK@ašw@k@mUWmUL@ƒ@™@£@KƒbÝV@akw™aULmƒƒbUK™LUU@lm@—°mL@nUJVxVXU`mIUxU@UnU@@lW@@bkLW@UVkKÇ°kLlŽƒbnUÜÇUUVÇ@@Xkl@XV`UbmbUbU@WxU@¯¦m°nL„aVblVXal@XKlLVVȄ‚L„KôlnbšI@„V@VJ„I@lVVÞaVkXU"],
+                    encodeOffsets: [[120241, 36119]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3712",
+                  properties: {
+                    name: "莱芜市",
+                    cp: [117.6526, 36.2714],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@lmnLVlÈVln@VnIšVlx„Vla²_šJlUUUVƒVw²@@mlIn™lKXU‚UUƒVaUašKUVyUUWVUUaVkUK@l@@mlIUwUWlU@w@aU@@LU@Ubm@¯a@V™@UKWUUKUn@LUbUKmlm@UIkJƒnUKUVmIƒb@b@mWm@Un@VVnnVƒl@„¯@@nVb@`U@Un@Ž™¦@V@VU„VnV@"],
+                    encodeOffsets: [[120173, 37334]]
+                  }
+                }],
+              UTF8Encoding: !0
+            }
+          }),
+      i("echarts/util/mapData/geoJson/shan_xi_1_geo", [],
+          function() {
+            return {
+              type: "FeatureCollection",
+              features: [{
+                type: "Feature",
+                id: "6108",
+                properties: {
+                  name: "榆林市",
+                  cp: [109.8743, 38.205],
+                  childNum: 12
+                },
+                geometry: {
+                  type: "Polygon",
+                  coordinates: ["@@™ýVƒnIW»ƒW@»kUÇL—݃U¯¥ÇIUWWїUWwX¯mƒ@»n@ÜÈķô™@a±kȱƒw„ÑmwçċmU»ÆkkVyIm™ĉÿ@ƒÝ¹ƒWnwÇVš™Åaƒzmmĉ¦ó™kVmx™xU¼VškVm_UlVlk„°IV‚kmJa›¦k™™LmmV@XmKnšlUô›VXbƒbƒ@UaÇLğܙ™Åwƒ£mKnmċwÅ@UkƒbmaVƒƒƒn@m¯aU™Jm_k˜@kWXyl@@kÅamw™LU™Þ™ƒ™mWÅzUKƒš™Uk±@™b@nnK‚bX¤mzVšŽVxÇn„‚¯„@ÒknWƒƒVUbkķÈÑWkk@Va™™U@„mUkbƒÝÅ@Ý¥ÇbkĬ™XV`kLǍVmalUUa™nV±nwmkƒJ@Inƒ°KVw¯UnÅ@¥™ƒ™U±bUU˜±œmWbÛKWnUm`UƒVK@bmnœm‚Èż@V„L@xƒxmš„Ť°nŽ@VmK™²VlšlKk„ô@„êÜV@VXLlmš¦UššV°Ș¯²ÿ@¥š@ƁĊ˜²IšmĶnnb°b„KVƒĸLl„Þ@UȮš™Ü°IVƒÞÝސlŽœx@ŽķĀWŽ„Ux„èƐ@š°ŽXnšlĊĖ°m„nƒšV„²V°ÒƦ„aބ„˜@zll@bÞĀšlš¼nKĊ¼óȂb²±šIǪÒ¯ĖV@„lxnVlk„JlaXwŌĉ„„@VnŽššlÆĕ„UÆLœèŌŤôxȚlUœ@šxlaUċĕXm„IWmnkšVVƒ„VW_@aÈWUUmk@ƒ¯çVm»™±W¯n¥V™mkXw±ÇVwƒ"],
+                  encodeOffsets: [[113592, 39645]]
+                }
+              },
+                {
+                  type: "Feature",
+                  id: "6106",
+                  properties: {
+                    name: "延安市",
+                    cp: [109.1052, 36.4252],
+                    childNum: 13
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@@kkÇmIšmUwVkUƒƒU²WmšVkm@m`mIĢĕUƒVa@™mXƒƒÿVVkyUýšĕ@l_UmnƒW„KVkţ™™¥™aƒwğ@™@aôƒ„ƒWa„kUmƒa¯¯™a±£kx™mmxUwÝ@xmU™b¯K™wó„Ý@kmm¹Ub@lklVbmnnVUV@x›UknƧJUX@ŽƒLÇWkw™LķƧÅwWJk„ƒLkþĉxWz™JUnǚkš@Ɛk¼ÜÔÈKšè@°lșÆk¦l„n@l¼@l¯L™°UU™VÇ°ƒ¹—`m¼mXk‚™bUaƒV@U¯x@¦™Ç™„UUmlmUVm„nnmlkw™@@šƒ¦Å‚ÇLmx¯Iklš„@¦mÆ°VUx¯Lm„@J„InlmxU²šmVbkV‚bUnȎlKU_šWlīÈaÞ¦Æ@„ÞlanV@ƒšVšUbl@XlÇÒĸlŽVa„UX„lm@Ñ°ƒƒÈmUw‚U™nyW£amL@mša²@lšV„™VLÆynX„šÝšVššKnxÆb@lk@WzXŽ@ll—n`šIV‚°b@n„m„„‚Unb„aVlÆ@ČxmnnL„¤ÆxššĠÛÈKVb„@„aWaœU‚ókVm™nL@W‚UnnšKlšœ¥‚bnIlU¯JlƒUkVkn`lUU™V»šwnwlUôšĊ¥nn„yÆb"],
+                    encodeOffsets: [[113074, 37862]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "6107",
+                  properties: {
+                    name: "汉中市",
+                    cp: [106.886, 33.0139],
+                    childNum: 11
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@lKnb@n„lWb°bkxĸwVb@ł„nlŽ„ƒĊ¥šL@XŽl™ÈƒVblÈK‚b„akVwôml²`‚nœ@‚nVKœl˜k²xŎƒ°¦VU„JĊw@çnWçރVkUóÛ@¥kwš™šUmƒX¯WšÑkƒ@UymIUwlUn¥‚mUk²a°¯V»@™ÝVș„ÝċÅÅVl»@l@a°±@_kammÅb™a@ƒƒm@ż™KknõĠ—@mšƒ„¯LÅw›‚—LVxmb@¼kV™@mw¯wVakKW»X±¼¯Vkxƒb„¼WŽ@nx@x±bóakbƒ@ÝmU™@ķÓÛL™kƒVUm™k¯¤ÝLUlÝ@Ýz™š„x@x™°™™™bƒmƒX¯aUJW¯—k@bÇWƒwÛwWxƒ@XWlb@Žƒ„VŽÈUlwšLnl°VlUô¦œU°¤VšUxVXUxlbkVVlƒI„°„ÅVlU°m@k„ÇU¯xUlƒLUlVL@b™°ĠInĠ°ÈnK‚„@xÞa²n‚aUyšXUKVkšWô¼Èa‚z°JXUVÇV_„JVƒšz@Žnb"],
+                    encodeOffsets: [[109137, 34392]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "6109",
+                  properties: {
+                    name: "安康市",
+                    cp: [109.1162, 32.7722],
+                    childNum: 10
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@„bĊaƨèšwôô„¼šb°ašXVƒÞVUÞ@‚aXƒm¥kImx¯¯ƒV@anU@UÇéğL@ƒ¯¥V£mƒ@ÝÈb„K‚™„X°wČÿ˜ƒ„b@xÈblxȯĊ„„mÆUVƒ„nÈ@ƨÜLĢ¥ƒŹnƒ°Vnn˜K„aô_ȃšwU‚aXmnW‚¯kl›LXƒÇ™ō¦ÝaÅVmbğUn¥±wÅéVƒan¥ƒ„U„»°am¥„£ƒÝ@ƒ„wVw™¥nU„уUmmVwmķIÅaóVWxkblb@ból@œğÒĉ¤ċXƒ˜¯X™xk„Ç@óÆÅx@š™xķ_kmݎǣkblb@`¯²@bk‚‚@k¼ÆUČƃÞǚÞU@šU¼¯°±bVlnm¦kVVxnJVz@‚l„™ÒXW°n„™V™šlx@¦ôÜVUl݄Xèm@è"],
+                    encodeOffsets: [[110644, 34521]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "6110",
+                  properties: {
+                    name: "商洛市",
+                    cp: [109.8083, 33.761],
+                    childNum: 7
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@²nl‚ôbš„°aVwnKÞIš`°wšXôw°VĊ°@ŽÅš„ÞÆV„zÞK@xšŽ@a‚LŚ@b@ŽnLlƒ@šln„mnLVw„a„bVƒ‚VnbU¼„Vƒ°„bl„šbÈ@ĶŦb˜@nÇ@amIyUI@ĠVmôƒU™ƒVwkwlanJ„¯lwó¥@an°Jš_„‚@š™nóƒó@£l¥UwmašÑ@ƒUm±V_ƒJ—£›J—UW¥¯@ƒ_k¯¼mUƒVUè¯b@wmL™»ğVmağI¯¤ċIUW™XƒKĵ¦ķaƒJUb™IƒlUóVmk@WÅÅÇ@ƒmU„ÅVƒnĉƒÇ°kwÇa@wƒa—„ċĀ¯xƒWšƒLÇa@Þn„U¤°¦@„ĠKÈê@VmV@b„U°°nwlJn¦W„bÝ@VŽ"],
+                    encodeOffsets: [[111454, 34628]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "6103",
+                  properties: {
+                    name: "宝鸡市",
+                    cp: [107.1826, 34.3433],
+                    childNum: 10
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@@ƒ„£@›°Išb@¯°ynŹƒaUƒlƒU£„Umšĵĉ@@ylUÞ@@£kWU¯WaU£¯ÇV¥ƒ@kb¯wƒn™¥ÇkUÇnUƒ@¯±›kULm›@m±_kŽónUxlŽƒbaÇLkŽUaDŽkšW@™Kĉ¦ƒ„kƒm@ŁUaķxlw¯aXaƒk@mmakL@šmšÛŽ@¼m„@l„XV`ƒn™KUš°°@²š¤UÈ@VxmôƒxKl„VV²aVw„Xla„Vlx@UVnŽÇnk°ƒVVL™lkI™šƒJÇk¯V@šknƘn@lznmlVkzVŽ„VVxš@Ux„z@x±¼VxxU„l‚kb˜@„¼Čk˜VXlĠkôV²w‚LUKlwœJ@a‚IV¥Þƒn¯Ün„‚„@nk˜l²kÆ@š°„aVbnI@™š‚Ťn"],
+                    encodeOffsets: [[110408, 35815]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "6105",
+                  properties: {
+                    name: "渭南市",
+                    cp: [109.7864, 35.0299],
+                    childNum: 11
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@@ÈôL„xUŽ°„Þ@mŽÈnl¤nUôL‚wX`@ÞÝL™ŽUšmLô„„ŽôbVbnºlnÞ@ôƒšx°LšanV‚wÞ@Vxnwšnlw²¤šb°°„bVnƒlXbƒ„ó„@bš‚Ġ@„xšbš¦ŤšV™Xġ„£W¥ƽɽƒó@ýóƝÝ»„£X™mƅšĊkUƒ„@™™šó„kťaĵŽÇ@™akƒƒa„¯ƒUV»maUU„ƒaƒbUxmKƒnkm@™k„mK@ƒxó@¯n¯KǦ@ôÅèlxkx°nƒƾ¯KU¯WķL@VÝIUb™yWbX¼Ç°"],
+                    encodeOffsets: [[111589, 35657]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "6104",
+                  properties: {
+                    name: "咸阳市",
+                    cp: [108.4131, 34.8706],
+                    childNum: 14
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@šIXyĊwlý„KlƒXIVaķƒ™»a›£„¯aVU@a™‚wÈō‚ašL²»‚VœUln°WȯW»XašzVaÞJ@Uƒ»@¯Ýbğwly@£kÑţ±Wу@ka™IUƒƒnƒ@¯ƒómţU™b™U¯lÇIÝb@¤Ý@kV@zĊ@™ĶnƒVV¤k„V„„bmź¯z@°™a¯J@œƒ¤@„„bUx™bƒ„@`™xUÔ±ºVXœW‚„UnUJ‚LĢ¯ÈKlblmÈXŎ°šU„°LšŽlkÞKš@Èxl_°ĶUÒkblš"],
+                    encodeOffsets: [[111229, 36394]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "6101",
+                  properties: {
+                    name: "西安市",
+                    cp: [109.1162, 34.2004],
+                    childNum: 5
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@°²@‚„mVVÈÈlš¦„m°xla„@U¦°ÈV¤XbV°lXÞaÈJ°kšVšaŤVôn°„„@„mV„šJlb„@XÒŤ²lÒ@¤kzĠxÞa@°„¼ĸK°XV‚°L„ƽ¯mlwkwÆç@óÈ¥°L°mô@„w@aƙK@b™@wÝLƒyÅUƒÝƙ@ĉ¯¯Uóx™W¯x™_ÝJmLUx¯b™ƒóak±mÝUU„™W¯b™aƒ»óó™xƧçĉbƒaĉxƒIUV¯¥ō„±w—l"],
+                    encodeOffsets: [[110206, 34532]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "6102",
+                  properties: {
+                    name: "铜川市",
+                    cp: [109.0393, 35.1947],
+                    childNum: 2
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ÆxĸƨšKlxÈX„K@VWƨIlmœV@wVUmUnmUalk@kVaUaóaƒóƒnKV™šÞK@ÝW_xóKmVk£ÇmnÝ@¯ƒVƒwóK@ǯXkm›VU±¼™KbÇŎx‚š@bUV°bƒœ¤‚bš¼ĸ„Ub"],
+                    encodeOffsets: [[111477, 36192]]
+                  }
+                }],
+              UTF8Encoding: !0
+            }
+          }),
+      i("echarts/util/mapData/geoJson/shan_xi_2_geo", [],
+          function() {
+            return {
+              type: "FeatureCollection",
+              features: [{
+                type: "Feature",
+                id: "1409",
+                properties: {
+                  name: "忻州市",
+                  cp: [112.4561, 38.8971],
+                  childNum: 14
+                },
+                geometry: {
+                  type: "Polygon",
+                  coordinates: ["@@Vx@lnbn¦WlnnUšmš°š²VšV‚VVVnUn„ºlz@l„„@Jƒ@kXWVXl@Lƒa@„ƒKUL„ŽlbnKlLnK‚LnKÆXn°šbVV@bUVl°Un@LnaVJUbW@UX²l‚@ČwlVVIšWnkÆa°„„anV‚Kn°™UW¯@™aVUVk@Un@„aV@ValwUanmWU„k@WVUUanaVwnLVl°@nk@mVU@UVK@w„LVKVU@ƒ„K@UUKVUV@@bnL„a‚V„aôšlIXmlKX_°KVV@bVV„@šzV`kblI„V„Ul‚šL@bnV@V„Ċll„„VlIXW@k„a‚U²blKšVnIlJ„albXXlWVn°JnšnL@l@XlJlaX@„X˜W²@l_VmnKšU„blU@mnkVK„¯@U@ƒma@kX¥VƒmakkƒLƒa@aƒ@WIUUVXWWnk@a°a@kkm@kUUmJm@WUUUIk`m@V—kaWWkX™KmƒXk¯ƒ@WKƒLkak@±bƒw@ƒaƒa@akaƒ@ma¯@ƒL—KÇÅkKWbkmġ™±ÅUƒLUK™VVkƒm¯LUVVbƒ„UwUW¯bm„ƒULƒxWJ—@ƒklmkUm@@KnwVkVK@akwƒ@@a¯bƒKkn›VUI™b¯mmbk@UbmKUL@xUUƒ@klmLUŽlVXI‚VVVUVUœU`mLXVWbXnW`Ų°xmŽxU@mĉƒƒwU@mbU@UƒmbkVW¦kJ™@ƒX@`¯Im@UlUVVnb@bWJXnmbƒJUU™UUaƒ@UamIkaƒxƒ@@x@b"],
+                  encodeOffsets: [[113614, 39657]]
+                }
+              },
+                {
+                  type: "Feature",
+                  id: "1411",
+                  properties: {
+                    name: "吕梁市",
+                    cp: [111.3574, 37.7325],
+                    childNum: 13
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@@a@w„@„wlbnJVb„@VbšVVV„InaWmXI@a‚aUmVUVkn@°J@_„Wš@lIX¥lUnaV„V@naV@„xĊ„n‚V@‚wn¯wƱX_WmXaWUnKV_V›VUUUUWJkUVnKlk¯™@@kmKUaŁ±KkU@WmI@WUIlUUmVwXƒ‚w@ƒUlUVwœV‚@„Lnb‚W@anU@UšaVkô@l»n@na˜JnUÈLVaƃUUVm„VKVƒ²L@mU_lK@UVWkU‚a@a@U¯aUaƒÑóÑUb™„ƒKk@@aƒk¯mVaUwVƒÑkWUmK@UUKmXUWÝwUa™LUU@aWJUUU@Ua݄U@WL@VKVaVI@WnU@alIVKƒƒ@kIƒmIkJ@™m@ƒ™@@_™K@xƒ@kaW@U„@Vmn@ŽUK@mIƒJUXV¤XXWlkKƒkkK@XmJVakImJU@ó™¯LWKUV@nUVƒLkxmKkLma@kXKmmƒLƒab™LmK@V@mXVÆUxƒX@`nL„aV@@VmLUVnLlLš˜„b@„šŽ°²nx@b‚VUxlb@V¯bUV@zV‚XVĊXVx@lVn@VnnmŽUš@LlJXVƒz¯VWVXbšV@bmn™VUVk„Çþń@XVxmbUlV„Uln„W„@„Xl‚@VLXÒ@bÞJ°¦„L˜ò„@nU‚b@°„X@ŽXbmVU„V„nb@x‚x"],
+                    encodeOffsets: [[113614, 39657]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "1410",
+                  properties: {
+                    name: "临汾市",
+                    cp: [111.4783, 36.1615],
+                    childNum: 17
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@nW‚@@UnLšK‚a„b„KnnWL@lnblKnLlw„KVU@mVUXL°KôšV@nIlJUbnI@WlL„llLXkWWU£VW„InJ‚@VL@nm@UVƒX@lb„@@wšL@`‚@„šn@V@lw„@n„VmVX„WmwnUlƒœa@_lK„wVlUn°xVKVXXWlUšVVI@K@K„n°KœwlVlU@kna@V_„Wn‚m„UVm@kXml_@m„LlKXw°m@_ôJVUV@X™l@UaV@Va°I„lk»VwUkVmwUmmVn@V¯@KƒU—wmK@U¯wUVÝ@mJƒU—nWK™@@UnKVa„_lykUmKÛnm@™x@ƒUUlwVk™ƒXW@ƒa@Uƒ@@K@ƒkIV™nammVakUlƒ@wX@@kƒ™¯@ƒVVbml@„„°UbULmlVbnbÅK±VƒKVXUJWa@ULWaUU@@U@aWK@UkxUKƒLUUUJ±UkL@V±kk@kam@UV@l@LWl@n@VVUx„LlUUx@VUV™U@aƒIUl™L@°mLU‚ƒbkUUaWUUaUU@aWK—LWJ@bUL@VUVVbU@m@a@kmKmnĉlUK™XƒWUblb—xmIkƒƒU@xWb@lkšVx™LXŽmzVV@bklVVUzm˜@bk„@Vx@xlŽU„@lUbVnl@„Wxnl@n@ŽUbV„mL‚mƒb@`X@lUX@@xlnkLWaUJnnWV™Vn@l„@bULVV@l™V@XnJVX"],
+                    encodeOffsets: [[113063, 37784]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "1407",
+                  properties: {
+                    name: "晋中市",
+                    cp: [112.7747, 37.37],
+                    childNum: 11
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@@šlInJ„lJ„@‚„ULkJ@bmV@XUJUb‚L@UXKV@ރVbV@VVXI@bVVšKVbÞxVXnWVL@VnLV‚lX„ÒUŽVxUb°n„l@bl@„LšƒVaô҄ÒVb°b@VnLnnV@lmn@lb„U„V@„‚JœUVV‚Xkl@lUzmJ@xšXkl‚bUn„JVšUb„nU‚lb„V@nlLX@lakšV`Ub°š@XVJnU‚L²KlxnI@KV@lbUbVV„KnVl@„zlm@Uš@nŽšI@WUaVl@@mVU„@XkW@ƒnkVKVƒ„_Vw„y@knwVa‚@XalU„@šVnml@„X@V„L‚KVaÞbnnlJšI„mVKn„VVVInVlU„@„m@™mXK@UmyUI@mWUUakamw@wUwmLkakwVƒmK™w@wUam£y@am_ƒW@™UU@knmm„amU@WUa@knw@ƒUUUUV@nƒJm@mVUkKVUUUkKmwƒKULƒKUImV@lUn™nŽm@mbUK@°™bUnmbUmkkƒWUb@am@UXkK@a±@™V™@ĉř„V‚UXVxUVkLWl¯@@bULUlm@@nm`—XƒlWakIkm›VUbUL@Vm@kIƒ@@Kšm@—VaX‚I@W@aU@kUƒVU_™KƒbƒJkkǎ™b@nkKmL™wÅW@kVUUƒVU@WUIƒJmIXmma@_kyVaUUlkUm@ƒkU›x¯Lƒm@L@LUJ™UkVWXUWUL¯wVmUkƒxkL@`›bk„mVnxƒXUWUnmƒƒ@kxU@"],
+                    encodeOffsets: [[114087, 37682]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "1408",
+                  properties: {
+                    name: "运城市",
+                    cp: [111.1487, 35.2002],
+                    childNum: 13
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@„Vl„nJ˜wkaVa„XšWVLĊknmnL‚l@@bn‚V@UaVU@UVK@aXI˜KXL@bVVVbXVVblV„aVnK@¯šKVk„J@bšVVU@UVwkVƒKVwUUm@@Xk@K@kVUn@lbl@²l@UlK²VVIVV„KVLlw@VXL@b@VV@VŽXbVK‚@XbVIUW„L‚U²ÆLmaUankVKVaƒ¯@ƒnkUa„U°@„š‚n@@kWa„UVaXUW@IXKVw@U™ƒ„™WU@W@@UUƒU@mn@ƒ`m@UUULkUmJ™IUƒ@@UƒK@U@›anƒ™ak_@wmKUwmakV™kmK™V™k¯b™wƒ`kwUIÇx¯»ÇaŃmn@@™mƒmUkV@wkKW@kxmL™UkĉLÝk™xÝw¯lóVU„mV@ĀVVX¦W¤kz@`Vx°„²ĸ‚š@„Ul@x„êĸNJ°¤V„VlXLWnXxmV@nUl@„"],
+                    encodeOffsets: [[113232, 36597]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "1402",
+                  properties: {
+                    name: "大同市",
+                    cp: [113.7854, 39.8035],
+                    childNum: 8
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@²£šyl@Ȑ˜Ė@bĸŽĢbĸ„˜X„a‚KŤnn@ŎôllÈx„nVnÞDŽV@b‚nXllL°KšbVb@J@b—„‚„@ŽU„„xlKXLlKlXk„@Ulk„JlkUƒVKXUƒÇVIVm@_nǚLšašl‚w„VnU@UUwma@aƒaÝaLmUk@@Wƒ@U@@X™wVWÝUUUk@@VmLƒKV»nwUw™aUL@`mzƒJUIVƒUaUw™KUaVIlJôanÑlLVUn@ša„@VV„@@UUwVK°Vn_lJÆLœéW@UUUÅ@»lm@aÞIVwXW˜UUkkm@U@aƒU@mwU£VWU_kWmƒXwW_°yUkkK@UÇK@kkUVymóK—U@KWIƒbUak@mJ@bkbmLkŽ™UmƒkVU„W¦@lnb@„@Vƒ°ULml@nkVƒa™VmLUnk`±@—XƒWW@kbǦXŽ¯„WxI@xmbmxXlWV„„@bŎUz@J‚b@bÞb™ŽU@Wbk@ƒxk@WX¯VۙƒWÝbÝUkVUU@alI@a@akLWa™m@U¯UUmÇL@K@aU@¯VUkƒKmX@`@œkJ@nV‚Ub@lbVÆXVW„ULU`VbkLUV@XWl@bXJ˜@VbV@Vl"],
+                    encodeOffsets: [[115335, 41209]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "1404",
+                  properties: {
+                    name: "长治市",
+                    cp: [112.8625, 36.4746],
+                    childNum: 12
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@Uk™Lky@I‚JVa@mÞaWšy@_W@_WƒXVlUVwš@nw°K@m„UƒVaƒmVkU@mmmnLVUmKXa™U@IlKVUnK@UmWkX@WV_Vƒ@akU@a„KWIXyƒIUVmUn™Ua@WaXUVKVmkUWVkUƒLU@@VƒbƒKbƒIUmƒ@mbVL—x›WUUkn±V¯wƒbÅJUbmLkbmKÅKƒbVnUbƒV™KUb™KUbmLKmƒb™aƒKkUm@UŽnn‚VnxUVlUxl¼ƒk¯JUbU@Vbk@WšU@UVóI@`¯nWxkLƒK@nk`Wn@lUnƒVnm‚ƒXU`@mb@lkV@„VnklVVUblz@`nbWnnJ„IVJ@XUVV„UV@lÆXšxnKlL@mšaȍll„I„ašLV`„UlVV@@b@XJWUb@˜™n@L„@lJn@@UVKVaœUlnlJXb„k˜Wn_@mn@VkVK@a°@XklKVUUwVWUšƒĊƚ@šU²@@blLVWn@@bVa„XllVnnaVmša@¯VLnan@‚šmVm@knUVJ"],
+                    encodeOffsets: [[116269, 37637]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "1406",
+                  properties: {
+                    name: "朔州市",
+                    cp: [113.0713, 39.6991],
+                    childNum: 5
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@XXWVXVWnnlnn@èƼ@„„xlš„ŽV„nblšššVŽÈUVl‚š@„blnœL܃ĊmUkU@Ua‚—@WI@aXk@WVUlKUaV_VKXƒWUUÅka@VaU@mlI@›@_nW„LVl°UV@@b@LÈKVn°V@VšnXblK@b@bkJ@bVVlUÞVÞa„Xܚ°UXWl@„wl@XaV@šÝa@aa@IVyƍ@aƒƒXUWknwna@w‚JXw°ƒWÈ¥kI@W@kmKm™¯IUmkXWWkaƒbkImJ™UkL±aVƒb@lWXkJƒUkƒĉkƒ@UmU@a™KkƒVƒUkJlaU_™yƒ@UU@aUU¯LW`kLWnkJó™ƒbUƒbmK@aU@UVVL@VƒL@„UVULƒK@xUL@VUV@nml¯@UkmKUxmbVbUV@XƒlXVmnVbkxUbU@ƒbm@@VUlUVšb°@VX¯šm‚"],
+                    encodeOffsets: [[114615, 40562]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "1405",
+                  properties: {
+                    name: "晋城市",
+                    cp: [112.7856, 35.6342],
+                    childNum: 6
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@lV„Lšb„an‚LnKVašLVašL„UVaUm„aÆLnLlanKVaÆI„a°x²UlmVVœX˜wUKna„@Vn„J‚a„L„a@UV@@alUkKVKnkmmVwUk„w@ƒ™@kxWUXƒW@@mƒk@aUa@a¯aƒLkKmwkUm@kL@K@aWIXmƒVƒXƒWkUVakL@UVKƒw@aUK@UUKmLU@¯n™KUwVƒUIWJUWmka™@UXƒJƒk@UkmW@kLWKVƒx@bmI@VUaVU@a¯@UUmVKmX@±`kÝKVxUL±akL@V™bƒLkKmVƒ@XWVUbƒVXb@lm@@lW@@xk„lVUbnnmbUšlJ@„@L„@@V„b@‚WXš„UlkxVV@„šwn@ÜmnLlVkzƒ`UbmL@Vš@XL˜m„VnIÞ@VU°x@VnL˜x„V@LU°"],
+                    encodeOffsets: [[115223, 36895]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "1401",
+                  properties: {
+                    name: "太原市",
+                    cp: [112.3352, 37.9413],
+                    childNum: 5
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@„@VV@wVKnLVal@na°nšaVJœUlm„L°a@b„@lx@bULUlmx@Ln@lVkn„l˜@XI„w‚K„Vnƒ°aVXVx„ƒUaVU°K„nUlšUVL„KÆVš²Ģ‚lnXalLÈƘL„KUaVkUanmWU™a@WwkUWU¯y¯Ñ@anIl@@aVU„m„I„ymUƒLUUVakaU@@LmJkw±LKmVUI@W¯™VaU_l™kbW@kK@mƒUkaVƒmVaU™ƒIVmalk™W@wnIVy@klkWUU›VI@ƒƒUƒVkam@knU@mmmK@bblVUX@VkLV`@n±KU„ULƒ‚UnVVńUbÇKmV—Imbm@k¼ó@Ul™b@VmV@bXmaƒK@›UUxkV‚V@„xW„UxVnkVVJ@XnJ@XlV²LƂVbnL@lš@°"],
+                    encodeOffsets: [[114503, 39134]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "1403",
+                  properties: {
+                    name: "阳泉市",
+                    cp: [113.4778, 38.0951],
+                    childNum: 3
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@°@nb„@lb@b„b„b‚@„x²al@lb„KXU@m‚kUWkkmUUƒVwV@XUW@™naVklKXblKnL‚ƒnLVanImaXKlL„ašV@U@KUKW„alƒXK@£WKXUV@VU„ƒUUVW„_V™@W@@K„@šƒUƒƒIWmXUmƒULƒn™JkImmÝaUbLƒK@UƒWk@mn™Uƒ@kVWb@Ubmx@lƒzUxƒ`U„ULml@„XWlƒ@UV@nk@U‚Vb@X™Jm™@@Vknƒyk@ƒzƒJƒnUV@bk@mJ@b°Ò°zXVlVXx‚@šbXVmnVbUlVb"],
+                    encodeOffsets: [[115864, 39336]]
+                  }
+                }],
+              UTF8Encoding: !0
+            }
+          }),
+      i("echarts/util/mapData/geoJson/si_chuan_geo", [],
+          function() {
+            return {
+              type: "FeatureCollection",
+              features: [{
+                type: "Feature",
+                id: "5133",
+                properties: {
+                  name: "甘孜藏族自治州",
+                  cp: [99.9207, 31.0803],
+                  childNum: 18
+                },
+                geometry: {
+                  type: "Polygon",
+                  coordinates: ["@@ƒaXamƒ¯wm@±°wUwV@UaVw²Kš™„U@UƒU„¥‚a„ƒ@£Þ™ôx‚Knkm™X¥™IUƒÝUwlk°V„@ƒÈ™‚KUwlkUyV¹„mšx²Xll„ÑW»š„l„w°UŎ„nƒ„„˜Jœƒl¯°V@wôIVÇn™nUllšLšVǚLô¼XW£@±„@¥k_ÇJƒkUéƒkšƒƒwXa@ƒšLlw²™Vx„b‚mš¼ÈxlLȃ„VWÞn¯mǙÑUÝlÛkwlĉmƒULmwUJ™ç@wkm@ÑlUX™ƒÑôġƒVa™ƒUф¯@wķÓkbV„mnU@@y¯IķKƒV@¹šaƒé@k„mÞU°¥@a¯@anKlblU„¥@óğç@Çw@wkla„çݱk¯±@ğÝUÛmݯwƒ@kb±¯akXWÜkXUÆÇUš¤X_Ɛw„V@¤ƒXU‚ƒbUƒŽƒIUlÇUkŽġ@™aXČmlUlèUV@„mVk¦Vxš@¦±š¯ƒƒ¯¯anlWš¯nƒƒÅw@w°KVak£m@klƒKknÇU™»óKšīlaUaV£@™™¯@ƙU™VƒÛÝÇXƒÇl—ÓlŹ„»WUğJ¯£mx™Lĵô›ºX„VlUll²bl„„lŽƒxónn°ÝšU¼mJUš¯nƒƒƒV@êĉ°Uĸ™w™@mƒ@¯kmXamѯaUwÝKU¥„mÅn¥Wmn™ƒ¹n±ƑƆÇôXê±NJnšƒ‚UôlĖkȂVÒ¯¼VnƒȮ¯ĀnƆ˜Ģ@Žk°V°¯ĢVlkšVxm¼X²™Ŏ@ŽVxknWÜ°U‚¯n™Æݜ@`„ôݲÒƒ‚Çzn‚mX@x„è°K°Å„UČĬóĖ݄ƒ˜ó¼ÅêƒÒƒbmšk@V„Ž˜„@ҁl@nĉܛê—x@Ėml՛J¯¦óxȭ°ÝmŽ¯Lĵè›Ā@Ɓ„l°żƒ‚šX@xmŽkV@z@‚„°blŽnÞ°J@bn@ƼUVƒUóŽóLƒ°X°ÝLƒxUn„°ƒĬƒn@lnL@ŽÆ@šn„KÆxnUnV˜InĬmÆnxŎ¼ĊIĢóÞ@ĊƒƨbUƒ‚mV¥lkƒ‚wnL„mšÅÆ¥Xƒ˜wU@w‚wUÞ™@alUUŚU™Vkkm°aU—°Ó°w°U„ƒ„b°aš²K˜¯œĕ˜@ÈbޏĊaš»„XVm°In„‚Ĭk¼Vb„ašJšôš£VĊan™‚k„ů™™nƒÜU@anKnĮ‚bÈmƎš»nI‚霣Ġ™"],
+                  encodeOffsets: [[103073, 33295]]
+                }
+              },
+                {
+                  type: "Feature",
+                  id: "5132",
+                  properties: {
+                    name: "阿坝藏族羌族自治州",
+                    cp: [102.4805, 32.4536],
+                    childNum: 13
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@l@@þ²I@lƒ„VL°wnJ°Uĸ™Ŏè„Ilw„V°¤nĮ™¤Ý„lè„L@„ƒ„@x„l™è²ôĊ_ĊġVÈôJżīlbXšÆÈVŽkxÇVƒ„n°„¦Üb@è@nn@@°šUÈ¥WDŽ_Uala¯¯UǙkƒ»„mVwk»˜k²°VxlL@¤œ_@x‚`ȍ‚Ėöb˜š@l²alX„a@bnK°¦VK@nnWmx@nUnl@@lƒlĉk°l°UXkmW@Unš`k„ÇL„ŽW„ÛÈVxšVVlVk@l„IXb@ylXÈW˜Į„WŤzœy@šmIƒŽ²šJ‚š@nŽ°@V„„J°a„Å@ƒŎkVǚk™aUw„KVw™™Vƒ„@nkm™@±ôkô™ĊJš¼šInÑm±nIššÞ‚XȃĊxĊUÈbÜyÈ£Vkw@kVUV™„m@ša„»ÜbÈmƒUXwÝxƒUn¥@°ġ™Å‚aœJVk™aW¯Û@W¥—UŏĶ™@¯kUƒŃ@ašI@mmanwސ‚W@œ™mw°»Uřk¹±W„xVx¯¦U°ƒzţW™w@°ÇVÑk¯@„y°aš£š@šmšnl¼„ašÝÝakwUƒ±aĉImlĵn@ƒm@kkVƒ¯Ñm™ĸ™°x„l™œ@˜ƒXVÞmlÛݙĉUÅ¥mwÅ¥VaUw›™XġċaVůÛŹlwU¯U™ó±™xÛV±¯¯n¯mċƒLmnĊm‚™@™_kJWaXmwUƒĉK™»™@mwX݃UDŽkKÇw™»nƒaUw±škx™K@„Wb„x™„„lVê„lÈIl`@¦ƒŽ@²X¤Wó»™KUșŽ™KkkmVmšUÈóJ@x¯Uk°›„—Iƒƒm„ōƒ¯Vƒxƒk™ŽX¼ƒÒkk±W™wƒnUºVzklVxLǚ@„ƒŽ¯UklVxސV„šJW¦nšmlLówݚ@¤ƒ„bƒ¦„V@VƒV™š±LUxVbU@Vx¯x@²n‚°xn„Wb„b"],
+                    encodeOffsets: [[103073, 33295]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "5134",
+                  properties: {
+                    name: "凉山彝族自治州",
+                    cp: [101.9641, 27.6746],
+                    childNum: 17
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ĶóšKnw°¤ĠIXVƒ¼kź˜Ôk‚„ÈWŽÞȄÜUVšÅš°@šš‚@U¤Vbkb™ĬôLš¼ÈVlm„Llkn@l¤Ub¯L@xÆx„„°mX™mk°b„°°„²™@¥‚™Uwl¥nU@ƒVUkçVnkWċšbĢ@lÈVVk„J„‚V„aV„W@£ƒUƏxW`™£ÈVVÅlWXÛlW°b²la„@°xnÞVÜĠÞ²@l°Þ²ƒèkblŽ@xÈx@Ġènal£nU‚Dz@‚ÞK„nn¤@¼˜°U¼„nV‚šXU‚šbn™ĠUVbUlVš°LX„@lV„èÜUnK@_ƒyXVyUwmIU»Vƒ„kÇ¥šÿkkV¯m±n@ƒn¯ÜanVVƄz@Ž‚bœwÜb„m@wša@kƒmk»@™a@VUUó„w˜@nb°mš„XŽmnVbގVôanwšJ‚ak£lw„˜šLšÅnÝ@wl¥IÇӃ@U™™Lƒ¼kVǃÅó¯kVmmw@ƒn_‚Vn»°LÅ»@éÇçŹīVÇÝ@ÝğU™ƒaVݙ™š¯ķlŭġlƒ@óÞۂċ@¯nkUӄ—m±™IVġUwóKUn±¯—K›w»ƒKݐV„nl@„óxUwţ›£ĉƒUmŗÇ݃K™„ÝUlmKƒ£UVŽ@ÞȎW¦„Ò@Ĭšnny‚@nÒmœVŽ—¼@°Vbl@VlnUUwl™°a@„œ„@llnk°lbnKWĀnŽU„VxUŽ‚²Å‚m¦Û›ÇŚƒaU„Vbš@¦m`móX™Umm™xÅ@±Þn虲™U¯»m™ƒV—m@wƒU@wݚÝmLƒa@„™VÇUk„l°¯„VlkVƒ¦UšmxƒaULUèVx@„kIUxmWV¼¯VmȯšU„nl›È—@m»Å™ƒVWxÅbÅğW@kƒm@kVV¦mlnn@‚ō„l¦Åƙxkœ"],
+                    encodeOffsets: [[102466, 28756]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "5107",
+                  properties: {
+                    name: "绵阳市",
+                    cp: [104.7327, 31.8713],
+                    childNum: 8
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@„ńlV°š@Őĵ˜VX»ÆUĊќJ‚w„@È»m»š£°Kšk@ÇnÑƍš@„w°JUwnw@wšbVbš@VlźLUw„aƒ»„aUklyUUVakwWXwWƒUxkLƒmn¥mšwk™˜UX™lJ„w@aƒIk°X„¥Wƒ²l¥šaU™„IlmkklƒÈL@m°nlWU™aW—š@Vƒ„@UaV¥@ašk@Çk¹ƒK@a™K@kƒKkšÇX@VU@kx±V™èkIWwUVUkkKÇ@ƒa@wkml¯@kUWn£Wa„aVwnaV݃w¯@UaWx—n›JńUxUšma@L@„mbUŽU±VVnkxUƙ„VŽm@kkKW°„X@¤ÇUkÆÇnU¦¯ŽkƒmLVwÅK@UóbÇƁVƒ¦™L@‚±êX¦mVޚkÜÝnWU—„›@kšƒŽ¯wķšnš°ÒU„lln@@„ĶmnkĊJ²bV„lxÞb™Þƒbk»™m™n™@™¤¯bƒz@Žl°UÒ¯È@ŽšxŤX„yV¯°¥Uwƒw²XlºVŚ¯¼nx›š@ŽXݏmxnb@n™J@b"],
+                    encodeOffsets: [[106448, 33694]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "5117",
+                  properties: {
+                    name: "达州市",
+                    cp: [107.6111, 31.333],
+                    childNum: 7
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@Uxn°‚bnŽlUnÒƃnn@n‚¤„LnxlU„ššV@„Æl„x°XXxl`XœƒVW‚œL˜è—„±nÈbƒŽ°b@š²x°Kܼ°ĉ„V¦lJnU@¦šÞ‚JÞğ„mšLÞ»šxU„lb„VÆann„alŽ„VƍX@lnŎV„mU™maÅXƒa@aWmœ@‚£@wĉJVƒkk‚kkmƒnk@ƒmna@šal„Kš™‚J@Þwm‚ÅŃ@ambkUƒƒ@™™KUġKU@m‚ak¯±ƒ„a@aĉÑÅaVwšXlwƒ±—V¥l@@a™kƒ›@@£šmƒĉÝónWV@ŽnÝÇÇx—UmbƒaVkkk@m„@m°ƒÝýXm›akÅīƒ@@ƒmb@@xmšnbƒ@mxšŽkWL@ƒ¯b@WUXmWœWKkbm@kx™Xmm@LUl„xlêóK™nUš„all™LƒlLó°m¯JVšU„K„„@x˜K²Āô¦l°"],
+                    encodeOffsets: [[109519, 31917]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "5108",
+                  properties: {
+                    name: "广元市",
+                    cp: [105.6885, 32.2284],
+                    childNum: 5
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ÆL„Ċx°»Ŧ¦˜W„™šLȄ@xÞKÜ°ÞnVxÅĀlÒnJ°a@w„V¯l@XWknKnw˜VȚ°XXa˜lX°VI°b„W„nšaššš¥@ƒw°™n@šyÆ@nkÞ@°¯lJn„°IÈl‚UšlXÅ@ķlUV¥VUUÝޙUUƒ@UwƒJUkĉm@ýƒƒlk™WUwVwWJk@VUK™lUkaVƒUƒmLk„m@ƒƒ@Uƒ›Ik`@„™UmlUkV¯ÇXKÝ_mm¯@Uƒ`kwmƒl¼±KV¯—¯Vk±Vk±kzma™KUnDZ™bk¦±ŽX„ƒ¦¯Wl„J@bƒxkIWš—Vlš™xnŽm¦„nlKVwX„WxXŽlxUbVVkzVlƒb„¼ƒbVxŹKUk™@Ua™a@xmxVx¯Iƒx™@ŎmÒ@șl¯L™¤n¼"],
+                    encodeOffsets: [[107146, 33452]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "5118",
+                  properties: {
+                    name: "雅安市",
+                    cp: [102.6672, 29.8938],
+                    childNum: 8
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ln@xšèVInxVKn„‚ĊklxkÜVޚÒnÈm°nxš@š¼ĊLV„nx‚WXblIš`š@nmĉn‚KȄôÅlUÑmU„K²¹@ÇÅVÓůVýÞW„‚UVmX„ÆbnwšKUÿ‚™@UmmIUb¯¥Uwƒ™¯™Çmš™„çmanUm»UUƒl—kƒ¤ƒa¯bV™U_WĕmÇŚ±ĢUlƒUl™ÛVƒçkUƒ@WŽ¯KU™VkUağVmš™aV™WUƒmV»—¯@»m£ƒmÝLŽ±@ÈmVk¤mb@ôƒ¦kVkamL@b°‚@b¯¦ÝVƒn@l„ê™b@º„UĸL°J@zV@nmUƒlaĸÔ@xƒ°VҚ„Ub„‚óĢ„ÒWškV@Ò"],
+                    encodeOffsets: [[104727, 30797]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "5115",
+                  properties: {
+                    name: "宜宾市",
+                    cp: [104.6558, 28.548],
+                    childNum: 10
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@VlÈnl‚XnWLX`m„²nV‚@b°xĢçlnšVm‚nn„@@„°‚UzšlV°nޘÒkxl„w„`UnVb„mšL@albÞKÈۚmܼ°@Xǚ@wmW@ńKĊL„lV„šLVŎçÞL²±‚ğkw@Uƒy@¹lKX™lKVa@w™™Č@‚w@a˜ÇU¯n™@@wġak—™aō‚ƒƒK@Å»VakUWmķwkbğ¥mL™akš™@ġރ°¯xVVÞ@VšxVš—VWx„XlxU‚™@k²WVŃULmèULVĊklĠ„VœJVx±nŃ¯¦mwğ@mƒƒlğkkl±@kšUk@¯±Ç™Kƒ—kxl¤b™Imx"],
+                    encodeOffsets: [[106099, 29279]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "5111",
+                  properties: {
+                    name: "乐山市",
+                    cp: [103.5791, 29.1742],
+                    childNum: 9
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@kšVŽk„ššÆkšV²UlºÈIlxƒLXèÜlU„„XU‚mkƒbVè„x°@„@¼°Knnn@m˜ÆIUbnJ@bVI°b°±@nK@mVakkƒKl¯nbšmĸ„èl@VnÈl‚UUw„wmwnm°¥„L„™lLnU@Va™ImbkƒmK„ƒƒnk@mƒb™ƒƒLV„JVUUƒ„VnkVmb@a¯JUaÆkk¥„IW¥„Klw—ÑmÝU¯™kVy¯@ƒƒ@mmn™Ukmġè¯w@aU±mnƒW_XKWmkÇmUkóbUÝUanmW™ƒ¯nma—@ƒxVôUV@šb@‚l¼„n@l™b@xƒnÛa›xa@ƒyUÅmUÛbm°@„m‚n²U°ll™ĀȦƒlU„V¼nJVxUz‚W„z@`mL"],
+                    encodeOffsets: [[105480, 29993]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "5113",
+                  properties: {
+                    name: "南充市",
+                    cp: [106.2048, 31.1517],
+                    childNum: 7
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ȲVmšLnblyl²²UUl˜°U°²L‚»„knlx„_VŽ°@nnÞ`WL°ÈUŽVlnkšV@ƒl_œJV„‚@„„n@lƒnKV£™Çšƒ„UV¯šm„@laX˜U„‚UbVx„@VkôJU°Jn™@™‚wUk°wnUƒV_nJmknmm¯Vwk¯ó¥±ÿ—L@wƒƒƒLVU™kU›bX¯mykI@a±Kk¦ULmaXƒƒVm¯ƒK—z±ƒklUIVbÇJšƒkL¯™l™ƒU™ÿ™UƒlUkJƒUmŽUUkVVklKk@@a™U@„™J„²ƒxƒ¦kĬ@¼±ºXnWb—xƒU@xƒx@lšL@b„Llº@șl@bU¦Vbƒ@U„™@X˜‚bVškX¯m@nÇKk„llknƒJVš"],
+                    encodeOffsets: [[107989, 32282]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "5119",
+                  properties: {
+                    name: "巴中市",
+                    cp: [107.0618, 31.9977],
+                    childNum: 4
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@V„U„lbkVšŽVLUŽl@XI‚ŽUxVxšXkl„„@þĊnVl„IVx„@VVݚVÞUVU¦kV@ĸWÆô²š@VÞnš@Vaôb²W@‚K@XUmÑUW°¯°Ina@y„_lWn¼lLUbô¼„Kla@™nkUyô—Æx°@šn£™Ý@¥mVkIU¥Ċƒ‚¯Û»¯L±w@™¯a„Ça²m˜ƒ—ç›KX„UW›k_Ww¯WƒwÅk@ƒ™Uƒ™kVmwƒK£@mmmńmÑkVmamnnlmIU`V„m¯xVlx@šmš¯IV‚óIUlƒ@UwVaƒ—VW‚kbƒ@™nU°ƒV™„šÈU¤"],
+                    encodeOffsets: [[108957, 32569]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "5105",
+                  properties: {
+                    name: "泸州市",
+                    cp: [105.4578, 28.493],
+                    childNum: 5
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@VVXwVKn„˜wnVƒn„l@b¯xmKUbVn°°X°@blLšènV„@Vn‚l@U„LnmmUna„VV_ĶV@wnJ„„l@@kkKVólaUwnJm„wUlm@ašUaôKVnJWbޚ@VšwVLX¥VVš_Þ`šw„WƒÞŹmmnIn¥Wƒ@k„WV¯@ƒ°kI™ŽƒLk¼Ç@k¤±Xk˜™nmݯUlÅÛKWV¯kƒlUwkLƒÓ™@U—@ƒ‚w@ġXV„˜WX„š@UbVbšV›š_kÇV™lU°lnwŎ¦ÞaƯnmm¯šU„™m¥nkVmkƒl_ó¥¯UÇl¯@™ƒ™L™kƒ`¯ķLUy¯@mw—¼ķ°ġ_řU°mlšnÇVUޚ„@‚ƒš_ƒJUnV‚UXšbl˜Ģb@x@mšV°—È‚b@‚xċ@šš@xUbkLWškL@º„zV‚@lxĠ±²"],
+                    encodeOffsets: [[107674, 29639]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "5101",
+                  properties: {
+                    name: "成都市",
+                    cp: [103.9526, 30.7617],
+                    childNum: 11
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@°n°m²°ÜUšw²ŽôVš°ŽVkxÜźUŰČb‚ŽĢlaÈL„»ƒ@k„wVǂ@„ƒnÛƻșUÝ°Kl_„V°Uš`Vbn@VbÈLšaVU@ƨ»V™nIl™šUUa„±lIk±š@VnKmÅ@WaƒK¦™lVōškK™Ý@maXÇmw¯IU‚@kƒVƒwUmVIƒƒƒç—ÿƒU±ŽÅ@¯È@xƒK@wƒLUbÇKō@mÝ£@yóUóóUxkI@WlIUaƒbƒaŽVĀ™LmxÅaWƒUnVƒÝXUþÆ°UÔÈÆ@±ºƒLnVVÒkóÆ"],
+                    encodeOffsets: [[105492, 31534]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "5120",
+                  properties: {
+                    name: "资阳市",
+                    cp: [104.9744, 30.1575],
+                    childNum: 4
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@„è„„UJVn„x„U@lV°JnxWÈnbÞ@šŽlLŎ™Ušk‚¥„LXbÆ@nŽmLU‚@zlbXmlnVynL„çšJVb‚UnómUnamU„an¥lKV_²aValWô„n@nƒ‚bVœK°¯VblW@kkƒlUnlV£°W@w„UXk°KVwƒmVkwVyVI@wkmƒVÅ_Umm@Uÿmbk£™xUaVw±V¼V¤kLWxU@Uk™bƒyƒXšómƒ°V@@zÝÒkKƒn™±U@@_VVkƒÇaVwnLWalm@@kkVVl™¦kIV`±n@w„Kƒƒk²™aƒVUUV¤™nkxmUkVWVnLUbVbƒ`kUU„mLU‚mX@`ÅbǚXbWLXŽ›n"],
+                    encodeOffsets: [[106695, 31062]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "5104",
+                  properties: {
+                    name: "攀枝花市",
+                    cp: [101.6895, 26.7133],
+                    childNum: 3
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@„b‚KÞnޙ@x„V@x˜n„Unš°¼šVš±mç²ÝÆ@šwnnšVWŽnôn_@¥‚™UaVƒ„bƙœÈ܎n¥Æ±VUwVƒmXÿmLkal¯km@k›ƒ@ƒ¯bkšVxmVUkk@Ua@¯˜»Un›mс@mz™m@īƒÑX¥Ç@ݙxU¦ƒšÅŽÇUkx@šlb„UWVX„mV@xĵĖ±@@Ž¯xUšÆLnÆm„šx@nXL±lUUVwKWak@WxkbšÞƒŽĉbUn@‚ƒ@@xó¦„Ŏ"],
+                    encodeOffsets: [[103602, 27816]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "5114",
+                  properties: {
+                    name: "眉山市",
+                    cp: [103.8098, 30.0146],
+                    childNum: 6
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@„šVx°¦VanJVnš@„b„aVbkJ@XlJVwôôôV@zÞ¤@nƎÈLVa„K@x„L@w°ÇÆ@²„V˜ĀœmWXKWașÆa@_nWVnKVƒlV„_UaVamKXUWwnmmwœÑm£@ynUƒkWƒĉUkWVkkV±çkJmkKƒšƒK¯¦mnnxƒxVxVÇkUmk@ƒçķ™nmak°„LllUb@nmL@‚¯²¯aUJ@amIVaÅJn—m@mm¯L@»ƒŽ¯@ƒwUç„anlVƒWVƒÛkWç„KkwÇJk¹±V™UÅl™™ġV™²ÈƂnXĖV`Uš°a„b„£˜l„kVVn¼mVnbƒè™šÈn°š"],
+                    encodeOffsets: [[105683, 30685]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "5116",
+                  properties: {
+                    name: "广安市",
+                    cp: [106.6333, 30.4376],
+                    childNum: 5
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@„VlIV‚„kšVšĀ„Vkš°šlK™„ÈIUaVJlk²„˜y„Ln°„UW„nbVKl¥²L@blJnzW°œalV°Inô¯‚K„kšKkkƒbV™šmôLkéƒwVk@KnnšWlwn@laXL›ŽnXVW@X°a@„XKl™nw„@man™@w‚@na@„„@ƒw™ĕġġ™wUkUWb@mk@™¦ƒ¥mUÛb±yÅn@bml@kV@„ƒlknVbmVnlmš—bÇk¯bWyk@V_UamJ@I—@WaƒVXamIVWkUkbVaƒUUxƒ@VnkVU¼›bkKUxmK™„@WšƒxnV@n"],
+                    encodeOffsets: [[108518, 31208]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "5106",
+                  properties: {
+                    name: "德阳市",
+                    cp: [104.48, 31.1133],
+                    childNum: 6
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@nUW¥²é@šK„¥‚UÈÅôa@VÆLUxnKl„°V¥ÈmlÅÈV@£ƒWX¯lLln@UšƒVÅlwUm²U‚VVna@ƒ@KnbV™VwƃœI˜mXwWƒkIVwÝĕVUa™IƒèmKUzkmWnka@y™@l²kJƒ²Vb™VkšmJUšƧ¼@UV™bÇKUam@Ua™_¯VƒUk`¯LVÞǚżm܃„@Uȃx@l„ƒ¼ÇKkbWŽœšVxUbƦnxƦĊV"],
+                    encodeOffsets: [[106594, 32457]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "5110",
+                  properties: {
+                    name: "内江市",
+                    cp: [104.8535, 29.6136],
+                    childNum: 4
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@²èlUUllXĊVX„„lmV@zn¤›ÒnxmnXxlUnVlwšmU£VV„Ušbl±„„ƒL@x²mU_lJš¥UklU@ln@‚kXbmKUxÈbl„UU@`V@š²„mlLÞÑ@yU@„¯ôn‚™„W„zšaVlV@XwlKU£‚»—aVaUwm@mwUVUwkƒlVDzLlƒ„KV™m_@ykUmƒ@mU™çkKmxkIU‚Ý„@LUJ@n±„kº‚LXb™¼@mmIXa™@mamnkW™ƒKUƒƒxƒ_U`UklwUw™mUbƒV™²ƒakbƒmkn@`„UmҙšVxUb™I™`UƒaÝÈ"],
+                    encodeOffsets: [[106774, 30342]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "5109",
+                  properties: {
+                    name: "遂宁市",
+                    cp: [105.5347, 30.6683],
+                    childNum: 4
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ÞĖUxlJX„Vb°@„xUÞmbUxƒbXbm¤VX@lk°ln@x„bÈ@lLVlVUXxlJšç²UlwV@@UÈWl™„L„w@w„V˜wXaWm²¹@»lī„¥„wƒ±šI@ƒšV@bl@kLUllUVVn@mmU„wX™ċbVb@VUkbmamšW@kƒa@™™k@ƒlaUa™@¯b@šmmwó@@lkXUa¯°›LU‚am„m@óƒkXUb±bU`kLm¦ƒbnVmbnVmô"],
+                    encodeOffsets: [[107595, 31270]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "5103",
+                  properties: {
+                    name: "自贡市",
+                    cp: [104.6667, 29.2786],
+                    childNum: 3
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@lIÞDŽbVŽš_šJVaUwš™nуV@_lm„nla„bš±„UVašnVxkxVlV_„`„wV„„LšlXnmnbš@WbnJ@nš»WaKl¹²ƒ@mVI@KރVlJnw@aW¯¯¯UmVanL°w@aƒk„mmU—xmƒULWxUUÝKōèU™KUƒƒkĉKƒL@ÆnX@x™‚Wȯ@Û»™nÇÜÝLka@b™KƒnUaVmƒ_ƒxkƒLX¦ƒJl¦ÅlVb°I@bnaUŽmlƒUV„UVƒIUŽ„Kš„„a@nml„„ƒŽnLl„našJUbV@"],
+                    encodeOffsets: [[106752, 30347]]
+                  }
+                }],
+              UTF8Encoding: !0
+            }
+          }),
+      i("echarts/util/mapData/geoJson/tai_wan_geo", [],
+          function() {
+            return {
+              type: "FeatureCollection",
+              features: [{
+                type: "Feature",
+                id: "7100",
+                properties: {
+                  name: "台湾",
+                  cp: [121.0295, 23.6082],
+                  childNum: 1
+                },
+                geometry: {
+                  type: "Polygon",
+                  coordinates: ["@@\\sŽ@pS}aekgKSu™SsMß`¡CqZ·be@Q^o@‹gieMp‹‰]}•}Ľc_Kk…{™ù“A¡r‰[uom@эĥJiq©mʼnq¯Bq]ÙYgSåk_gwU­isTE…“‘ĕiqiUEkue_‰OSsZ‹aWKo¡­q“ycY£w}‹ĩ™ĕS§Z©S™N¥SyLÑ¡±Ks^IY‰PdƒY[Uo†Fp}´\\¬\\j]ˆe܍ò‹¤¡–ā a\\bn™U㺹Ìs¼j®[cíȈEŽĝĆ`ļf¶Š®K|VØDdKGpVnU‚FjpH—F`†B’[pMºxÖjbpÎxp€¬‚|ΟÜÒCŠ²®‚ÜAp„ZG~€Šd˜ÞàV¨|¸€`|Œ²tx~\\~|dFf^zG€ĄŚhœdL\\hĸž¼†ŠOªP®lV`p\\]Xpll˜æ¤œCpQ|oF}fMRi†NSon_²qämœM„NM‹\\•"],
+                  encodeOffsets: [[124853, 25650]]
+                }
+              }],
+              UTF8Encoding: !0
+            }
+          }),
+      i("echarts/util/mapData/geoJson/tian_jin_geo", [],
+          function() {
+            return {
+              type: "FeatureCollection",
+              features: [{
+                type: "Feature",
+                id: "120225",
+                properties: {
+                  name: "蓟县",
+                  cp: [117.4672, 40.004],
+                  childNum: 1
+                },
+                geometry: {
+                  type: "Polygon",
+                  coordinates: ["@@EUDAEI@WNMNCBFAHFFNACDJDPBD@@GD@DIFFHEFGDBDEQOFG@EI_KG@OcJQM]RMEKBGPG@[LaCIICBWKCEEG@WBQHCDFD@HSLEJI@IHWECFGAAEKCGDBFCBSBIDCKKHEADMJMFABKOKEQAA@IEEG@GIQAEK@OZEESMOL“lu@SLUTYFQCMG@@SQUAYKAACA@IB@BDB@B@DC@@BGAEFAA@BEGKJCC@AGAIHA@@JC@QEIP@@A@EGIDC@O@C@@@@CJCWKABFLBBEBSQGBAAMIEM@AKBcJEN@BEBCFMAEFEF@J@BG@BFABECKFG@AFQ@@F@BEB@@A@@AAAKAE@GFGDECEFEECBKIKDELDFEDYH@EIACDCHKBEB@BAAC@ADBHABKJIAIJICEDGDCD@@A@A@DHCHJHDFEFGBKRKBGIK@GIMHSBCH_BOJECCJCFKKMD@DNJEDEGC@OJCJHRUL@HRJ@H[DCNKDZHCTFDHCFFKR`TANVDFZRDLFARB@HPAPG`ILAR@TERNDFNHDLCLDDCXDYbHF@FEB@LDDVE@JPNfXPINCVDJJD@NJPAJHLXHDNANHhB@DPNLRMTBFRBHHr@`NBFEBOCCBIAQJDHCHLHFA@HSDCRLFTB@HEFLNF@PELBDJALFLTC@EPFLLP@tUHQJDfIHGTB^JTCPDLKAIBATFPADIEGECEMJ@JIAIHGECFEAGDI\\SPOXAFCL@BQTQBBTMZECYGAHA@GJAE@HCAEME@IECFKJADDBABLTHHG@ILEAMNDJCDHEBF@@JNFJELDFKTOT@JETBFFHBHEHKI@@IJEJ@XKEOUMS@AF@CEB"],
+                  encodeOffsets: [[120575, 41009]]
+                }
+              },
+                {
+                  type: "Feature",
+                  id: "120114",
+                  properties: {
+                    name: "武清区",
+                    cp: [117.0621, 39.4121],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@FWôµ@IFCLIB@EHNBp]AGEAKAEDMGZKFGBGME@ILGP@HEFB@BXMEAHUGC@IHCLOD@X[NWHWPKAEF[@EKIOL@EKGBNMJ@EIEHKBIC@BAKMIACCFQZCF]DB@ERAKADIHGEIBCGIIECFaGLZO@EFCNGAGDGAKL@BMG@IE@ADSDEH[JGC@CGA@BMDeK@EIACFE@@GG@FIAMM@CCGC@EM@ADE@CFMAAGHBDKIEAJG@DOGCDEKAGIS@KFCHKAEHIE]BeKNO[IFIOELC@A]GMBKVYCDDgGAICARc@MW@AQE@DGI@@AQ@@BKBAIQQYEFW@CEADIGGBCEIiMEMF_LGEKMBBDWEBGRC@E_CHYGCH_IAED@FFBQh@FGJaJ}AHRAREF@bE\\C@CT`FHC@\\BBF@BID@HGDDJ@@FAHKBARECKDAZBJIVNHCTA@EREAMLHDAFFBVFFC@RNRETHD@FOJMACH@CAB@P@DF@@FGDWE@FFSIEMKQDYCCHKb^JADOCIDGNDBdBCFJB@EC\\A@BJEA@JAAAD@HHD@LFBCFF@BERDHNhZQHMBGHOACCEBWEGD@PSJKCGEUD@CINLFGHE@AJK@HDABBHTB@F`DBFLBBHEDARCFG@ABJBAPVFE^FBGLGCFG_BMLEXGAAFE@@JNRVJHFALFBEHQJCTbNDHCF@PlFLJSXCHFHfVBTNJ\\BPJXC^FAVNFCHFB@FFH@JF@\\ABCFD\\BDMCAAJKQBGAILOEGHILECQLWFENJHADC@QxNHFJNLDFA@CBA@D˜UÂmR@FBL@BD"],
+                    encodeOffsets: [[119959, 40574]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "120115",
+                  properties: {
+                    name: "宝坻区",
+                    cp: [117.4274, 39.5913],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@TZbB@JHD@DODCLM@AP@LL@BNH@ETFN@`E@DNG@CHLBCJA@AICFKDDBKA@\\N@AFNAGRBFjFFFL@DHLBLFQPcXAZMJ]GAVHAIZJFNE@JpDRRDCLFDGXA@EFF@CFFPDfEBDB@DCHCFCJDJIJBLI@I@CB@@ADBB@FALADGDC@@H@BB@FZGFCCE@@FMLALJDAFFFEFDFCB@@AHCF@L@@BBB@BB@FC@E@@R@BEL@HEFD@G@AH@AIB@@@FEFEBALDDEFAFO^IF@JCBBFPNJJ@D@PRDCEKBAXL@BIFD@T@JE@BHHJORFDI@@B@JGH@@B@BDDLIFFHCD@D@DEE@BAAAB@DAF@B@H@NGLJLMRDNMfGIEPMI@GDAKK@KIDIJ@GE@CFDN@FE@GFEPGV@TCDFKHBBF@RW@DD@@ID@TJFKIKLI@EP@IGBCLAEKLEN@KSHIGYACSD@SEAMBBMGEBMQBCMIGKFB[D@HDLPHDBC@IFITDLG@IIIFGVBNJDLN@VIRI@YIAIHIC@CLKZCBEE@JECEIHEAKGDGECBGEEM@@DA@CCCBBEGA[GEDBBoNAAH]MKiIAWKQoIIPMFQAEEDMH@FMSUYIeF@EK@BIOEKJEBICFKaKPFAFSE@LWCCFMHDDEKESBOGBKIEIODLG@CCDEQCEDWEMDIEIB@EHGEEDAEAa@@HqDEJGF[AECCFa@WCEIKAAEQB@FCAE^YDERDDJBLNABD@AJGLJF@FNIAMLH@FPKLJ@FE\\BFOLGXMXW\\C@KPGD@JHDGVFBWN@AEAGFO@KH@JNFAHEHYLNHFCLBFBBHo^MAFGA@KJED@Jó¶EX"],
+                    encodeOffsets: [[119959, 40574]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "120223",
+                  properties: {
+                    name: "静海县",
+                    cp: [116.9824, 38.8312],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@NGFMDATCNDR@CCbINEHNJA@C\\EEGVE@IhE–[˜w”epc¢·²›^QEKIEKIgiQDkehY£uSDBMkUDOJDHC@GF@CAFBFEN@C‹Q@BeP@@G@HD@@MHQKi@[IGCOCESE@GMA_OcCGDu`aˆ@VZzKDkJBLNXGDqKEWE@cFEFA@ƒISIi@@KMABJGBcMuFEzGVH\\ATSEUBeALCEMG@CEBUHUCGXaBPtUBBFIBFTDFF@DDKBFNGBJPHXDDMDCLJ^mBIHIL@LR\\@LCR[@@z@NFD@LLBNb@RHDBNTPT\\F@BJF@BXCFBHHBDLFB@HODADE@@JHVXCPDHCFTLBBFNCDCCCU@@GAABEHHZHBCAEdEjFDD@GfD@DXFCHF@ERFDLBH@"],
+                    encodeOffsets: [[119688, 40010]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "120221",
+                  properties: {
+                    name: "宁河县",
+                    cp: [117.6801, 39.3853],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@BFLBFJXDb@DEFD\\BHEFIrC@Gb@FBCBFFGH@FJAJFNCXFFCRDCFDDH@CKJPJFALPHTALFCFGCENDDKXF@ETEBO‚bLELJDFALIPFAJL@@FfEZJTVENG@CNFFRBNEJOpJLRBXjJNLG^BBpMAAFC\\HHBAFDADDB@@CN@FFAHFDCHLHFBJGFCFUNKJJTD\\XUXF\\^F@DDDQXXBRLRCBDFEVCDLVDpUl@LEDJHAPRFGL@CETGPBTCDDVI@CFF@GFDCCVGLKEK[Y@MECISG@BKNSCGCKWEAaEBEKNGFSECO@GGM@GYI@DÅCMLHPTF@DJHAVVNKEGDETJ^[TJNNd@NOAMFYJ@@GFANDPEJB^aOadSTQSI@MHBDIEOKCG@EEFCKCqXO@@DMFENCDDHCCGJ]AKFoDaGGHYFDHKJiCMFGC@EQ@AEHGAC@IEAATKOHGIC@IXIFEoƒGE[JCFCDHNmRADFZMF[EEBMO{GU@AOW@@]ZeHBDEHBKEfQkuIWBs‡@EC@d[@[^EDMTKCEEcI@cDAB@FCBCACmOCG{PYHeBgPwPFDDALFFFCHQGSD@BHFAR[TaFYXMASUiGFL@DQNCJI@@D@PLDN`ETEFIGMCGBCE‘~CAIFDPEHGEQPHJADFJGHCJLB"],
+                    encodeOffsets: [[120145, 40295]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "120109",
+                  properties: {
+                    name: "大港区",
+                    cp: [117.3875, 38.757],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@JFFL°_`ONJKDDFIFZN xlb~yFVNRŒrdJGzDPVFBCTNND\\UR@E`F@@Ip@IWGUoawOEE@ÏDgK{İEEMFëC—b…™@—KwOCDHHKBDJCDEEEAGHOABFABMCgDLSQ@CFEB‰MgYIDQINE@AUSwSAdYEHQMEyK[KI@GRMLE@@OqOoBOnpJ@BmEAFHL^FDB[C@BBDVFAHFJENB@sNEjQAMYsUgCSBGDJH@\\LjGR@NC@@G@HO@AfR@DŒM@EFEADBE@@HGDICCPlVANTC¤vgZlfRChjLJ"],
+                    encodeOffsets: [[120065, 39771]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "120107",
+                  properties: {
+                    name: "塘沽区",
+                    cp: [117.6801, 38.9987],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@|ODHnPBDADEDA@CB@ddJFFLDNSFC\\]\\@@cFDˆ@nACOMW@M@ITURBRZNHNWRQšoO•j½f‡cqŸAqeiDÿÍyÓįFL|Ch@ÐFFxPpbHVJXo@@JCTR^BPABQA]^MB@bE@@FQBFVJRH@FXtPNZSBAja@@NƒDTŽLJrQTHFXZFB`"],
+                    encodeOffsets: [[120391, 40118]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "120111",
+                  properties: {
+                    name: "西青区",
+                    cp: [117.1829, 39.0022],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@@LHAHRHATh`LHNHDG`HDGZ`D@FQDAHXFACNAFLVRTBFOfHDCVBFQH@HSXHEPFB@LDBF[bDbLFKJBFLADBDjLvCPEI]FGEIGCBEUSjcFiBIVWfaHCjN^HtwBBFGPBJGjFBEGECGDONMFAP]TDHQOWCMGAMHKIJEIGQ]aDlUG]VGEGDC„{PEbBZmE@@GH@BCA@FMQCFMYMJECELCMI_P¯`]R±œ¡¸od“f—x•\\gF@JUFFH[F@DIBGMMFaJDDQ@MCSDCBENMH"],
+                    encodeOffsets: [[119688, 40010]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "120113",
+                  properties: {
+                    name: "北辰区",
+                    cp: [117.1761, 39.2548],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ROHFFGCOJEDB’}DFHANDJHFEFSM_KC@O@CJ@DIRM@CEKKA…L…FKACHoLSJSIBETDJaEIIE]E]K[MYUYQILC@GF[MGNKEK@A@BCWECAIFEFYAGFOMI[OFuDiKACBCEKIAELaKaCE\\CA@KEAFOWGGTG@ERUACDeGEPSAUQKHE`FNjNFJADHHCJFB@DEXZFRRBJLA@AR@@BJ@CHF@BRX@@NQdDBBJhHCCZDLUNA^H@BKDPFEJ\\JMPfL^AJFFGLBDGLET@HJLBCFHDCPH@BIJFCLGABHNBDEF@BCN@@FHDDDN@BNEJH@@HF@DEJB@FfLNC@AHB@DHD\\IFGTCBCF@@JNH@ALKHBHCHBDMFEP@KYbHDEJF"],
+                    encodeOffsets: [[120139, 40273]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "120110",
+                  properties: {
+                    name: "东丽区",
+                    cp: [117.4013, 39.1223],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ZV\\N^L^FJFFJIbSCAFTJTIpKDGLB†E†KLBjHTVNBZWbE\\SBQGE@ATCRHDGEEKECBECxOhOfAZGA_YEEWSGqRKIS„C@Mb@BiTAMYsOEWG@IQEURA@EF@@acUOXQRYCUDCHDTEF[SUEgAYDcVGJM`iAWDWLQRMHUHgDsDBLHJFCFDFGHBFFVEAGHCJN@RJF‡PIhBD\\FENCPWA@LFBAFHBEJUEARCDIAEDQBRNa^"],
+                    encodeOffsets: [[120048, 40134]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "120108",
+                  properties: {
+                    name: "汉沽区",
+                    cp: [117.8888, 39.2191],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@LMEI\\MTABKN@FCDMH@COAcH[AoēA™M¡Wa[Meq™pQRMXMGQYQASV@J@NNXDPmBAtJXlveRLFGACFGAYf@^X@BPV@|HNPFA\\FNEEYBCnQGMDCDE\\IHFp„EFWJ@JJDGHLPBSFB@JBDGHBFR@@FHDNEjDLICGZEHGbHpCLE^BHIDDCGDCFMNE@CP@rWLDEDFFH@"],
+                    encodeOffsets: [[120859, 40235]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "120112",
+                  properties: {
+                    name: "津南区",
+                    cp: [117.3958, 38.9603],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@TLv@CNHFFBHGZFETNPhCVGNGRQXKXCjBN_HIdUZChBVF\\TFECSDGVCZDRQPWdVNA^]RBBAAOQ]DSE@F_Q@[VMCSMADUECOHycI‹qMQEU}zkaŸwENRDENB@ADG@@HF@YnaAOFƒ|CDFHUHH^kVbCR^JHIFLJNGHBDNPXGRSCO^EBMNCPDHHFAFiEIHOAEH"],
+                    encodeOffsets: [[120045, 39982]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "120103",
+                  properties: {
+                    name: "河西区",
+                    cp: [117.2365, 39.0804],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@d@hZNFdcLYXKRCtCMOFSYEGHEAGEDMu@SKAAsx]GMTGt"],
+                    encodeOffsets: [[119992, 40041]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "120102",
+                  properties: {
+                    name: "河东区",
+                    cp: [117.2571, 39.1209],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ZBVFFIGABEEA@KXBDOFM[EACJgˆOIE@QIMGDBHUFEEGAEHECEDGIAKQDWLKZcdQPEP@FOFBJTJ@HNORJf@DBCN"],
+                    encodeOffsets: [[120063, 40098]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "120104",
+                  properties: {
+                    name: "南开区",
+                    cp: [117.1527, 39.1065],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@NMVDCG\\E^B@HlB@YEDS@C…HsNSiMGDebUXAJEjidVTAFHDFJ"],
+                    encodeOffsets: [[119940, 40093]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "120105",
+                  properties: {
+                    name: "河北区",
+                    cp: [117.2145, 39.1615],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@DBXFADB@L@LFHM\\NHED@JKZRb]QMRAFCJBDCBQYADMCAe@QIMP@GSIAIPE@E[EGH@ZEF]^HJAXK@KF"],
+                    encodeOffsets: [[119980, 40125]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "120106",
+                  properties: {
+                    name: "红桥区",
+                    cp: [117.1596, 39.1663],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@J\\PNHEZBFEJELEL@BWGI^]FEkA@G]A[FDHUCMNEHJ^"],
+                    encodeOffsets: [[119942, 40112]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "120101",
+                  properties: {
+                    name: "和平区",
+                    cp: [117.2008, 39.1189],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@D†T@FCHG\\FFOROMEgYc@"],
+                    encodeOffsets: [[119992, 40041]]
+                  }
+                }],
+              UTF8Encoding: !0
+            }
+          }),
+      i("echarts/util/mapData/geoJson/world_geo", [],
+          function() {
+            return {
+              type: "FeatureCollection",
+              offset: {
+                x: 170,
+                y: 90
+              },
+              features: [{
+                type: "Feature",
+                id: "AFG",
+                properties: {
+                  name: "Afghanistan"
+                },
+                geometry: {
+                  type: "Polygon",
+                  coordinates: ["@@ࡪ͇وŐǬϠڐŶӂʮǚڦ۾njƀ̚ІɣʪҴMوǯʲĹ،˒˰Nj˖ϪԈiżŬĘͺβ̈Ҕȏĝʱʪ¡ý۷ͪ˟̊ǰώĊԼϖׂ×ࢀAƬʋӧĥяƹ७ĭࣗǭӫλȤΣĪллΛ–͑ɳ̡ߛ€ͦ։՗ɅΥԕ²ԋ͡ɿ̳þٝŋğɻسDҵӇ‡܍થΓבôǝȁԇņ࠿űටіހހåզُƚßՔ˟ڢάҢιŮɲؒ΂ਸ"],
+                  encodeOffsets: [[62680, 36506]]
+                }
+              },
+                {
+                  type: "Feature",
+                  id: "AGO",
+                  properties: {
+                    name: "Angola"
+                  },
+                  geometry: {
+                    type: "MultiPolygon",
+                    coordinates: [["@@ȸصʌԋȘ˕͐ѯ֊æˤŠҬşŲɀɂӨԶ®ƤіHñ̡৴RfՉǞ͕ūԑÖԫ˪̷­ৃȼüκsԴŴϦ¹ĘʹĩСƨϿů̿î́ყZᦵ֤ۋպԽ໳΁᎝Š׋Ж₭—ŵÏԃϞկ~ԉƝЙDžÿՈŜ݊̂ޒªΰ˚ݶȨΆӘռːϐĘج«ӊʣ̜ɡԚȵԎ®Ǩʶͬʭ߼ǣ֚сՐĄǎΌŔʒg̎ĸៜ["], ["@@ɉėɣلͼδʪƘ̀˽̩ǯƍɍλ"]],
+                    encodeOffsets: [[[16719, -6018]], [[12736, -5820]]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "ALB",
+                  properties: {
+                    name: "Albania"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@Ń˷ŢέΒȳiə˗ŧ»˙ϷСƛÐgȂү˰ñАîֶŖʼƗƂÉˌθаÂƿɨôǴɥȪďȨ̂"],
+                    encodeOffsets: [[21085, 42860]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "ARE",
+                  properties: {
+                    name: "United Arab Emirates"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@Ƭ¤ŒɱڂƂ۞uԖ{ֺ֪ظՠՎԮdž˹ŖڑѕGçճƪŝϝǑE΅ʓΏuͷǝDZᡋъ͏࡚Ț"],
+                    encodeOffsets: [[52818, 24828]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "ARG",
+                  properties: {
+                    name: "Argentina"
+                  },
+                  geometry: {
+                    type: "MultiPolygon",
+                    coordinates: [["@@ߗ§ѓ̔ԑx࣑@Aሞ͒ϵрؿનԋ୲ȿϙп"], ["@@Ӵ؇͠ڰॠ“ƊǷ໶ോۊŷਆاࡾ͡Ŧχࠡ౧ࡒɭ़ŷڔƈނ٢ƎݐжLjфӝiڣۻҩ֟΁ॅࠃ૭ଧȽڥɣࡹT࠷ǽȇÝիËѫ੨ܙŗ׃Հν§Ч߯ઁఛ҉။ǩउĎǰԅǣػƺщԋ̏ࡱř̪͕߱ɗŜ࠳֨ʧҠˆʢѧޛʻڭԹūࡋȣ҇ߏEڃљʋؿؙࠞߦǝ˿ݭ঳Ӄձটލͧ΅Ͽ˔ࢍ֔ӡΟ¨ީƀ᎓ŒΑӪhؾ֓Ą̃̏óࢺ٤φˈՒĭьѾܔ̬૘ěӲξDŽę̈́ϵǚˢΜϛ͈ȝॺ͸Ǣƙ਀ȠࡲɤݢԊ̨ʭࠐEޚَոo۰ӒࠎDޜɓƶϭฐԬࡺÿࠀ̜ބռ߂צԺʥ͢Ǭ˔ඔࣶд̀ࢎĹɂ۬ݺશȱ"]],
+                    encodeOffsets: [[[ - 67072, -56524]], [[ - 66524, -22605]]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "ARM",
+                  properties: {
+                    name: "Armenia"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@୞ƀǨə͌ƣǛɁ҄˽ʁˋΦɫϘƏl׋̣}΃ӢHżχCʝɤǩuͧʖرȼĄФƛ̒"],
+                    encodeOffsets: [[44629, 42079]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "ATF",
+                  properties: {
+                    name: "French Southern and Antarctic Lands"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ը˃ߐĿˆDžɽϣಇÃq҂ŮΎÊǢ"],
+                    encodeOffsets: [[70590, -49792]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "AUS",
+                  properties: {
+                    name: "Australia"
+                  },
+                  geometry: {
+                    type: "MultiPolygon",
+                    coordinates: [["@@ߺ́ҜŘپNJԎÉÐঽ˽́ēگ̉ɰ׍בǧ®ԫ€ԭܘŗֈӝܸtϬռõ"], ["@@̢ڇբ̈́˦ΡЖ͟đϋǴܛŸнɄĹɬܕąѥ˖֭࣬ѭצЋ֞λŋȯӔՃࣧ͜ͲȂ;ηȴźƢࢹ׬ԩϸ͋ڀڹʀڭtӏËԳА܋µݓơϵɩݡjӕǕ׻χއثЭ̫ٱ˫гʝܧ͕нɅػʼnׁªˇӕ̇व‰ޡ·ϫ͙ԕέ۟ψԥƪżѬҝǃ݁؉ܩɪӉƄӑÔ߿ʐիԮƻْțьЭ;߱ĸˢРȯزЧ׉ݝƷѮҬŶӞ͘ЬãجہܑԿ˽͏ڛٽΊ~ҀԿ،ѹ̀ǂȘઃԚןz߯Цຓāછ̝ख़˫ߡÈࢻљܯȗljѱ̳Ϳ܉qՅõݑƶ׿ğֽԁ҃ʕœуʁЗˋؕ֛Bࢽ՜ҋDŽlӖкŘƚȒ‡̠ĺאģӼѻࡖƏӒ˜ӎͭնsʚϋͰĽڄӓڔřΪτε˳ެиʑʞ͗aјеڎă˄țʦĠӠǢȸŘрęӮΎ؀Úٕ΢׀ۀˬЦΪٜ̰ϤàɴĻڎ̺ԚĤŶȀɞüҬoࢨʖҚώɊ҆ӲѐœͲvҘט܎ΠܩΦǚ̗Ј˂ТψǻĸٖҠаȮͨцƜ`ɼτĭdɂτŦОŔبϫҲӽՂMՖÿDZҦДڪϜɘſȾκӒԘ̒јıۺǂeі؛ˢ҂Ū֎ȻҀ·ۼɋʈĐԶʵӬʊ͂ñȠNJϬеɡ͉҇ͻ˿ƒĮͱʙп̗ЭÔʁڜҫ٨ˏѠ́؈ӻʂBѰɍŶʷߤ˵ֈ˼ǐҊǠόľҤʰڞŝОÔʔīӔŌنLjǠŽˬȮѾdžҦtʈ̸̾ʂЩÎՃȾķ˜Λ̨ёÚӇ‡̥"]],
+                    encodeOffsets: [[[148888, -41771]], [[147008, -14093]]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "AUT",
+                  properties: {
+                    name: "Austria"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@Û΃ӁCǎǻ˧էLJƗܽsщȏۛÞயɐȉ̊ࠧƣĭDžԗŢѕxϝƶźȴƬʪ²ьɹŤɜݎ•׸ƮЖ}ˀǣþƜšո̠ń̒ϰز˓ӀΆ̐ÚٶʱЂªϰǁãŃČ̅"],
+                    encodeOffsets: [[17388, 49279]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "AZE",
+                  properties: {
+                    name: "Azerbaijan"
+                  },
+                  geometry: {
+                    type: "MultiPolygon",
+                    coordinates: [["@@ʞɣψDGŻ΄ӡֽŒщϰƃ͆Ǫv"], ["@@ϊËƞɈԈͺѴѵђ׭ϺŸʸɧۗãƣٵƟ̭̍ȝvзȽ¥ԻѲ̂дʝʚ̿×যإk׌ϗƐΥɬʂˌ҃˾ǜɂ͋ƤǧɚȶƎضʍҐ¹ŘIJбҔɔŚʀ…׀ԙ"]],
+                    encodeOffsets: [[[46083, 40694]], [[48511, 42210]]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "BDI",
+                  properties: {
+                    name: "Burundi"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@Á০ɃϢԜßʲӎҀŸͧǸȏT˗ȹǭ͛ѫ̧̥΍Ÿ"],
+                    encodeOffsets: [[30045, -4607]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "BEL",
+                  properties: {
+                    name: "Belgium"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@؜áުǪՐοҦȝħ֧ɕĝһܿϦћßדІϷͶϷ`ũ̒ڪǔ"],
+                    encodeOffsets: [[3395, 52579]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "BEN",
+                  properties: {
+                    name: "Benin"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ۛįȹ׆žኞǛǦЮ̇̌ʱʞņѶ̀ĨǠξЪĀȀʤˮʘ̠F٘ә˩ȎӽǓͷĘɧСԳʵʳǁՉt՗µണ"],
+                    encodeOffsets: [[2757, 6410]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "BFA",
+                  properties: {
+                    name: "Burkina Faso"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ֹɐϽ‹̍Ƀϗǰƥ˦ϙǾÅӦɮΤo˴ښۢŬּɲȴОœΚǢŘɎٴϖdžˀ޼ΒҦŢɀLJՠJáСŔϣӀչ€НॺȏmֻǿʣЩÿǟν˿ħ݁lϳâ˓ƉωÖร¡qӉŘم"],
+                    encodeOffsets: [[ - 2895, 9874]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "BGD",
+                  properties: {
+                    name: "Bangladesh"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@i׽̉ŶÆگʉѬµєDžКΕӨޟ’ü΋˃ҳΧǠũƵʃĠ͗øŽۖ̅لƜԒԫɤȆ̪Հ̼؅Ѽ֮̔ږεВ£ô׏ߞřު^Ӟƛϯ܅ϕµʷӍҢѥƎ՞ɶFѶ೯"],
+                    encodeOffsets: [[94897, 22571]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "BGR",
+                  properties: {
+                    name: "Bulgaria"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ʎΉ͚Ö٦ſ௾«иɌবȜ̩ؒӴĕѥΏ̫׹˔ӏܣŒࡥ˃Uлޅÿס̊ڧɱة|Ñ֊сːƒŢĝĴƘˌ͌ˀСδ÷̬ȸȐ"],
+                    encodeOffsets: [[23201, 45297]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "BHS",
+                  properties: {
+                    name: "The Bahamas"
+                  },
+                  geometry: {
+                    type: "MultiPolygon",
+                    coordinates: [["@@ȵ£ɇӜ̿ʐǾՔʨ‘ۣ̎Jӥ"], ["@@ࣷƅÏ̴Ђäֈ{~ɕ"], ["@@ƟׯƷņ`ѮϓͪCĪڐϗ"]],
+                    encodeOffsets: [[[ - 79395, 24330]], [[ - 79687, 27218]], [[ - 78848, 27229]]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "BIH",
+                  properties: {
+                    name: "Bosnia and Herzegovina"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@̦FȿσМ͓ūЃȡ™ƽû˙țūҥݓ͈ͅΘ͋Ȅϭ̾ǻʺЩϾǬΒ̞ȕǼǨϾnܠƓ׈\\Ϟȅ"],
+                    encodeOffsets: [[19462, 45937]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "BLR",
+                  properties: {
+                    name: "Belarus"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@߼Mࣰ̈́ȚӄېːÿϔԜƚ͖ࣘࢮɁŢȻѲĴࠒȧĊЁǷɧՄս΂Ƴ»Ʊ֦Ʃʎɡ͝ǿڳˆljÿȠ˧ȸ՝ܝ¹ʵȁÃхͭĆݷ¡əȞ̿ƥ́ŨڍjफȬࡕàٱmҡɩГeϐʷϴԌǢLͰɷ͌™ϊ"],
+                    encodeOffsets: [[24048, 55207]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "BLZ",
+                  properties: {
+                    name: "Belize"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@OŮĸžƴı̞ԔDŽZHūDŽGaɭƋεôŻĕ̝ÀăīщǓɟƱǓ̅ʣ@àॆPژ"],
+                    encodeOffsets: [[ - 91282, 18236]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "BMU",
+                  properties: {
+                    name: "Bermuda"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@OEMA]NOGNG\\Q^McMOI_OK@CQSGa@WNLVWHFLJXVFGJ`ZRTDLeeWKIHGIK@@[MQNi`]VDTBHCJAPBJLVFjT^LV\\RJZRn^RH`TfJjZHHOTTFJP_NOX[EYQQKMEJOLANJH@HQHAARF@ZEPS[U_IcRQXE@EEKKOCGGCQCOGISKYGUC"],
+                    encodeOffsets: [[ - 66334, 33083]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "BOL",
+                  properties: {
+                    name: "Bolivia"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@य़”͟گӳ؈વȲ۫ݹ؅ŗ͡୆ҋऺˆ߾ѳ΢ŏ؆ЫֲՌ࣢αۺȖ˰ƭ̶͠рh܎¤נǸ˶ܩഠزíѠnȈʪ݀;Ѷ͂સƚęؽļ͓ãࣰ֛ݫऴƑ̻ͦ֨ǕΐʑՈTӦʟšӟǐʕZγʓa͒এྖ“ūӟĜͧҞɽȤԹƫڋɯρĄӏʿǥaʶ޳јޭ^ัʓЕ݋sҋͥ৕ƉǸ"],
+                    encodeOffsets: [[ - 64354, -22563]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "BRA",
+                  properties: {
+                    name: "Brazil"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@૮ନॆࠄ֠΂ۼҪjڤуӞеLJǒӜŖӼBҦ̡ƴ̿Ƌ̻œį͔ýޔƿʤ֥ɪ΃ǏࢱLjÈଜʝҴˀǦăӐɰςƬڌȣԺҝɾěͨŬӠྕ”͑ঐʔbYδǏʖ™ӠӥʠՇSΏʒ֧ǖ̼ͥळƒ࣯ݬä֜Ļ͔Ěؾષƙѵ́ܿͽȇʩџmرîӃƟϡĪÈ౨ۏӷݏv҄ͅ֏¶DzΰұԞΓݴɜƶA΢ԖʎċҔɊ̈Ôϼ०ֲێNJŔŴݴŸϚᘰpθſӔύ̬LؐӀƒǚē†͐ӯĔYՀ࿖k˦̂ɸˉǐӷǂļҨѻٸÆnjʲشȞΊƐĮΤ׸ʆ¯Ǯ܅ðśՊ’֞ϓɒǀþجŅڜȿʐȤ؀žल̮͎̾ŏʂѪšȜȗʼnσ̀ŵȖϷɷ̏ƅ܏ɌыÔϳԬϿЮ¥Ģǒˆ˜ϠƦ˚ɢҬíȲŠҚçøǢƗǘĎʐͺõЈĒӔDZξǥʺɪȊ•ŘɿДÒ͒͊ʴؤӼޒ˺¢ȺҫҼ฽҈Ƒxׅمەʾʩ๤ƁŠࡃٔր੐̟ඊԡШӱƏҫ঎ʶ࿐ѹఴŽఔ۝੸व٪ʏܖ‘̦˅˸੭Ɣԗͯ൹ёշஅୡՙोثܯȿgɻءÒ༽ɹಓęօˇͧƫ૱࡛઱ƛࢁڹηȟԋ࣯Fೕ͓סύवʗ঩ڝ܅࠯ũطƔҫƽࡓȏЧחҥट๕݉ڗ֯Ͻϥߛ։ӑɷӈψЊӟֲڇҬࡹՠ̹{ࡅٰձę"],
+                    encodeOffsets: [[ - 59008, -30941]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "BRN",
+                  properties: {
+                    name: "Brunei"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ͬ̾܎Ң›Я·՛Б€ǭ˹ϥѦ"],
+                    encodeOffsets: [[116945, 4635]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "BTN",
+                  properties: {
+                    name: "Bhutan"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@΂ˍÏԩۇ{ۿÈՇſޅ͊kǚ֌زҒɈ׸șѺqπɥ"],
+                    encodeOffsets: [[93898, 28439]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "BWA",
+                  properties: {
+                    name: "Botswana"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ǜƭ˄ӡॎइήĝD̑ʚՑٰŹ՚ϝ஑أݭع˩֓ʧ́ҙãƧГďʽ՝țہ¤БɾΟĸХșȵГЉʧпϑ׻đȇ̐üԠӽߚɧŲAរࠤˆ|Ჾش„ಖ͎̎΍՜ͤʮDӂȎưÙ͔ڣ"],
+                    encodeOffsets: [[26265, -18980]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "CAF",
+                  properties: {
+                    name: "Central African Republic"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ۜÚƺɎƔgȾȏ੔͐Τ͠Ѭ̌ĉ̐ʂüߺ½߆ϴ؊ࣺю;ՐƜĪΫӜԿF΃ƋΓÄʻ̆ʍٖοҢͻT˗֠ѫΖεɆԋغͩƊˉˣęաpكĘ̹ïųȱ˕}ͧDzधнϥĎŗÝʥԕطǐؙĊ՗̴ۓ˸҉˓͛яùדգ²֩Ƙԅѻѯޱėʐ›Ϧϧ˔̳Ѡï̠ЇѮæʢċΞÞٴȬƴц࡜"],
+                    encodeOffsets: [[15647, 7601]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "CAN",
+                  properties: {
+                    name: "Canada"
+                  },
+                  geometry: {
+                    type: "MultiPolygon",
+                    coordinates: [["@@؎œުxЯ΅̵Å੥Φȿˬ͆ʸ̎С"], ["@@Хcઝ˂ޯІ̄î૆Ɂ࡮Η|Ʒ"], ["@@хŝൡϢʥ̘ݩ̌Ưʈࡻư͕ҜðȚࢨǿԨŵ߄ė˺̃дЋ࠼΍Όҩ"], ["@@։ܿո˴֠ǵ̏̉ݚɱϰȴ࠼ʵʹ؛טƞņѿʼԷΝ݉ϝ‹փǂǾیɻńইܯԅ†צЂ߫Ȳࣙ¹࿅~ŹʠԼ̐λɬ۸Ԓࢄ೾Զӎܲ̂϶™Njɫ҅Չ"], ["@@@@@@@@߰äʥ॓ܶگͯDԑϪ̵ϮчʾƻτºˎЂŋ"], ["@@͡ѳχîəʢ Î͖ʦΆkɈǣ"], ["@@ঝҧץnǿɪزϲ଼SiǍ"], ["@@ƼυјżӨɗं˽४ʽöЍؤÞ׶˥ݙ˃ಳȬҽϚ࠭ҁ஡ѣ˿Ӯଗăܴдņڌ˺ޔ؈å"], ["@@ष¥ȿЪΦҼޖŜپɷXέħřձʛ"], ["@@Է̍ଉʬۃğଫϘ݊ʼטζࢼʃԎƯʦDžԠ͍"], ["@@G࡭૰ڄ৐եʡح߾֥࢚؈ؖܨ°ईஞÝఔūૼй¼зس҃פ҇ŃУ࿩חୡŻࢃʨʣуߵ۽ʓοই֩ளÇڏΡÇձ঍Ŀਉڻ࣭ु͙ڏ±উంƕϜ޻ϼّ୲ǔ༞εࡀ͋׺Ѕ੆ɳࢸΟ൶µࣴąƍܫʼࡋ،ळనߗ٨˚ҔࡺѭೢףѶഎЀ॒לҮהç֭֘܌৷لলࢤνݾ˫ಾגȘ෸ɫࡸć۠ɚ޴˵ਚӣʮ͙ຄÛ}۷˪ਜ਼ގſ،ӵ௖Ұߦऔ֌ϸٺݣબੳघ৙͵Յ૤Ӂݰӓംɏբˍͬ܃ټŏͶͅÖऻ؍́׽̏൯̗੏ۑ෇ƋᅛǮుPࢇÍ۱׽ੳω௉૗ॵޡ܌Ɛഘૄᄈ۪సČݔЫߍ֟ˊࣟ˜هતп൸ŨࡆीÎ؍ժ̥ਣսᇷԁ࠯ͽय؁ٓ֍܆ฤ۞഍ƒणĹջӆBନύʐ֛ƛ˧ɚٙىʱٹ̕ϡΥŽˏ¥čȹ໽A౥MϛƷࢵ؃Ŀßˍ͝ޗBࠛGϛƅƊǑøʯeďષлࡽſউ҅Ɂ@˷ƂĥŦnĔȂ̎ЂҦʘӺǙܴǵނ࢕ЂľƬūĺɳ@ǛƆ¥ȤǍēɥ€¾ĊȡĊćɚٵːڹ˪ࠑ͘߁̨ݧʃ˝Sਕɔڻʼnࠁʺ࡫Ɔו¾ʻƜƫҤ˳IE͓჏BᮝA᭯@ᡃ@ᠿ@៙@ᢡ@ࠛ@᠁@ᛷ@őF྽ࠜ׵δຽΐҳݖŤԨ੻ΨƧڴ৭؎iѠҲКwՌෙ՘࡭ॠՁ׾ޑϚ֣ΈѿѢࡇ˕ࠇҹݛւדπࠋɸࠟ|JⷎNᷲ༬ȭ೘Й࢘û݆ΖৰˀఢĹ఼τ൘Ⱦ־ΑظȠȊЄ׈ęෆݫ૦֬ŖّਔƐ͆ʖৰ·౼Λዸ̭ୄƛࠖÄଊэ஁зຶǷᗘIJܒƦࣆԋࣴьࡩΦժ˼৾žڦĎڴȩࡊҗरä๢ϛಬƄ௬oĭԺݞƦದ˵KߑՖڠڰuϞࡊ࣑԰কͺäघশ؎ૌƇࡘχଞॅݗЭ༠ǝ"], ["@@нϿሎʬୠщॊіސ˟یࠛфΒ׭ࡰ݊Ŭ࠲Ƈश͹ՆࠉʼץථеະЉĝσൡã՚͓˱ູ̯Ƃฃɪঋ»ཅ˷ᒃű๻āҕІଫɮݙģਛږ֔ĚಘƜஈ›રƦྷȞᅗã஗jѷ̴ዎͲಗ[ืɚ۶ـגͮᖬԠ࡬Nj"], ["@@݉ևಹך˸Ş૸’ٔȁ"], ["@@öɵࢿ|ࣟjࣿőʑ¼ऍѾ˜̠ИÈነěชң"], ["@@ڎԽޤڴᒆΈ෺ࢅůջဒʒߒͮሀыୄЏŊν༚Ȑ࢘՗᎐ܸͩ͹ߐ޻໯ϹጘչೲȁீޙೖÇʽכ้ঋਗά೓߲ઙĿŁӕࢪӥଜϯΌɟմࠩ́׿੕ɪᑏڨஎܣ࢔ԕƎ̉ᗱͲᅩӤ৳Ц̌ʂయќ௥Т`ʑᝡƅ܃˾ֆؤ཈dႸņ˫̜̊оચࠊɳϊ͕˾౿Рၳ˺՞ɆࢷԺ݋´ڏ˸҇ʛ຿ŅᵝȈᄫʚഹŴۥ̐࢞Ϧ஝Hˉ࡚٦ݨࡺ΄ᓪɢأի"], ["@@৊ǯຄńɖʑ޷Е౜αƱݳ൝͗߳ê׉͎ᐡٮjˎ႖ĽएռসР"], ["@@࣓عय़ŒԽ݆`кѮΨ࠰ɮც‡ྈȱళݟ৉Ǎ"], ["@@ᕍЙѷςኹѺήΤ׌ؘܰւࠑԦᭊƀ஬ǧᒰ±ࠄʑࣖΝ੍ɃᏝןਫי@ν"], ["@@ҙ͙௝Øৱɖ҂Ϛீɨܼ̬̍ˇ"], ["@@ٞϵ€љϣس൱đࣗƈjӬ൝ÝÁٮࣜౌ˺ஂµÜŎ"], ["@@̙͢ݠƘࢢ™ƪЩԝЋ᭗Žᑯη౩mŅ˜პϊ④ij୯Ʈପࠐ߈ɾᛄ˳๶ӻฺÛறߨޔ̪ࢄĭ˲Џ"], ["@@ढ˓ကFܨˡȑ́८ȍՔȧଊ™௬ë೸ǼႊðീÏ࣒ͅȊ΍ԽɟభǷ੽ĸᜱŻႫcഫļᖁ˔̃ҦĹжࡇξ჋ĺঅʼ͂ΈႾÁ"], ["@@ŗ٣٩̇޹£༝Ϋ഍ŹଗǼ@@ුؼႮծಆ[ସŬ"], ["@@ϣy༽Âɡɼၜ]מƻĵĩ"], ["@@༩ʋఝ˔ڼˎ௮Đஈſ˩ʥ"], ["@@৽ǏඉBbŤࡴʦҌદǝ"], ["@@కǥۃȚέ͂áΎજ‘ӪÅ৐̇ɫ̣"], ["@@͜Ε൏Ĥ൩˘ሏŒߺʠ৫ȮÕ͐࿶ŕᗢ̫ٞЍ"], ["@@০˕ଽʟ༇ك๥Óდņࣗ΄^̦ڔɢ໡Oए˨ՑϠ׌ώ׊ʲࡴÎοȖዜ¨੶҅මǵ൞ǃڒև"], ["@@ᖢßᅮŅ໤ɫ™ɡᏅη᎙ǟݻȉᆬJጡԙേʃ෯ۇႿƓՙǡᡷěୈĿׇƭ۞бߙ˽ಛʃЋ͡୫ʣŞȏ෬lȳᖟԋᔧɴឿŻధĸཟªĿЖ༊Ȑб؆ԢÐᖤγ଩բഹLjڼ͘๰Ȩʄ̊஋͠ΥѠᘞ—ڒĝ಼̪ቃĬ᰽Á๣˸۩ͼগʘȁ˺దLjঘ‚࿲ƌం̺ਬ©ࣤɽٔҒૐƈບĢᢲ–Ҁĝ᝚ƚᆔÁᆒÁ"]],
+                    encodeOffsets: [[[ - 65192, 47668]], [[ - 63289, 50284]], [[ - 126474, 49675]], [[ - 57481, 51904]], [[ - 135895, 55337]], [[ - 81168, 63651]], [[ - 83863, 64216]], [[ - 87205, 67234]], [[ - 77686, 68761]], [[ - 97943, 70767]], [[ - 92720, 71166]], [[ - 116907, 74877]], [[ - 107008, 75183]], [[ - 78172, 74858]], [[ - 88639, 74914]], [[ - 102764, 75617]], [[ - 95433, 74519]], [[ - 123351, 73097]], [[ - 95859, 76780]], [[ - 100864, 78562]], [[ - 110808, 78031]], [[ - 96956, 78949]], [[ - 118987, 79509]], [[ - 96092, 79381]], [[ - 112831, 79562]], [[ - 112295, 80489]], [[ - 98130, 79931]], [[ - 102461, 80205]], [[ - 89108, 81572]], [[ - 70144, 85101]]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "CHE",
+                  properties: {
+                    name: "Switzerland"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ƫŹȳϞƵіwá΅χƙةŀǻ͹ЏơƄһ˵Л¡αǶ˽ςБſ^ϠؚҾɈϤûɲƞ܎MǦǼ࣒ʱ"],
+                    encodeOffsets: [[9825, 48666]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "CHL",
+                  properties: {
+                    name: "Chile"
+                  },
+                  geometry: {
+                    type: "MultiPolygon",
+                    coordinates: [["@@Bም࣒@Ԓw˧ͻܛʻЭ‚ӻä؏ʨ࢟ŨੑҸ࡫Ҏୃशۘǭ୼֗૜̟ѢϬ˘ֺޠΎװı"], ["@@͢୅؆ŘĺɁ˿ࢍࣵг€ඓǫ˓ʦ͡ץԹջ߁̛ރĀ߿ԫࡹϮฏɔƵCޛӑࠍpۯٍշFޙʮࠏԉ̧ɣݡȟࡱƚ৿ͷǡȞॹϜ͇ˡΛ϶ǙĚ̓νǃĜӱ̫૗ѽܓĮыˇՑ٣υôࢹ̧̐֔ÄgؽΒө᎔őުſݝPЙȷݷ̣Ɖ޹Σoॅ˚१ג@@ਲ਼ӔˁՒʄӰх֒Ņ෤Φ߰ࢴٰౣʔߞݒ˸ඊत̏Ѯგ֝ɠʿ਻ՉŠ˂ல˺༒ϮָʍࠎéूΠ„Ԩപ׈എΤబȗ఼ʤۚĵਞӮਆưྺ˒ნˀሤÕ൘ǩ஄ќɌɦњЬֱŐ؅ѴΡ˅߽Ҍह"]],
+                    encodeOffsets: [[[ - 70281, -53899]], [[ - 69857, -22010]]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "CHN",
+                  properties: {
+                    name: "China"
+                  },
+                  geometry: {
+                    type: "MultiPolygon",
+                    coordinates: [["@@ԑഓΫۏѷ܂ĩخӶࠜڦَϨʡƣԓ", "@@ܩЗۏʺyܢаϠࣾɾӚoȊ͍σσșӟ"], ["@@ฬˍ঺ׯͼ߃౨Cܰͨ൸ʜѳݱ͙̭˽ः֡ࠇ৵ƪܝ̑ɜܙť঳ѕwLяթӺͯһಙαƀѹܩŒЍ˂ֽ׭ऑҋۃա୭ʑأϽࣝɭ҂ϴǭ͞ږ֠ѹѲܷ̓ॉ׏ԫթ࠙¡ѓϻѸ֩یƏ„ϕڔʕस׶ݚ͝լuƌѱஓɻϻҏࠇућיࣜҥͦࠝԞޓ֮٥_دՅɯȪ҃ӶʻŻۃɇڗҷ÷ؗࣧڹિޭোିޡୟۻृĩԣύ̃˘Ӈй୭сࢵŹ˻ࢱҭ·ə؎Ȧ͘ૻːЇƍࡍɔЏ΀ƄӜޏƶЙܑ̀҃ࠇīڡJ҉ȳѥūŶ॥҃x÷Ȣ}Ύ؝ʓεƸر͂ʔۤՏǎȧޜࢱƓĴাߔۮ”ۚ{٠νȨ˭ӶӭÙࣟŲ˴ΜϿԺ׳Ν۵ȸॷ՗އسڳĿοɦѹr׷Țґɇ֋رëڌԟǭওĈोȖڿτٵǔ˯ЖҽŦࡓոکʴΑȩଢ଼טࠛՒɽऐ׾ő‚іͭјĐۆࣙঠ൧ͼʝ٦ةϼƫʌųӎˆ͜ԛȔ˟ďɇިʈȔśȠߤЈ׈ǐࢸő͆՜ંIJͮ̚೜ҔŠȐãӐּɔݱฦဘͲјȈ؆ຒဠˡҲϞ¢ࡆۦĀٖ֔͢èɚו۸ѽப̿׆ڱ͕ঙ̢ηূƝଆŝ৪ԻԲġϤޟӲӿऒnჄȉ૤Ŝࠦůఔԛ৮BόʽঐҌബ̈ాŒঘ̒׾҈ך˰Ƌˤˍ͔ѴըӀùࡺǝ࠸Ѿ౲͚؞֊נʆ௠ŐڐĥĠ̘ݿזګː٥̳ࠣžӇŃɏΆר࠾Цو৚̓ஆՎQτݸࢾҲːWҪңȦۜмਰƲ૜vసʡ݈̱԰ࡏ̀α̊ԩ̶ࠕ"]],
+                    encodeOffsets: [[[124701, 24980], [112988, 19127]], [[130722, 50955]]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "CIV",
+                  properties: {
+                    name: "Ivory Coast"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ϣUוǒ՟Wহƥ׍ʍ̯ࠫNjvÞۖĄŀ}ͨΣΚˉÈʕɲǾώčО ʔƄB¸ξÝnjĄŜ̸ĶȹڨȗΎæ˸ǘÞŊúɸųٮOƸʖƢgʎĦžΫȞłΌŰϚǽƦ˥Ϙǯ̎ɄϾŒֺɏɠ஡Ο۷ɕेθܣ›ͧ"],
+                    encodeOffsets: [[ - 2924, 5115]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "CMR",
+                  properties: {
+                    name: "Cameroon"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@Ľ°ӻŇԝŒЋÅ൅nŬڒ͟֊ϧƚǟϖɋŦXɶɎתЎ߸ʒRԄӮ͈bҾΉ־˲ĀΔȌͺžь҆ΊǞךDzȊŢѨɜ՚۾ٲ¬˨ĠƲͫͰ‚ˌʂ¶ͮ՟Ê֏‹֏ҜޅҷTʁÏϥČǻЅӸөμƛŠΏˆ׃ſɩх࡛ȫƳÝٳČΝåʡЈѭð̴̟џϨ˓œϥĘʏÓґڛȤڷɜ੗"],
+                    encodeOffsets: [[13390, 2322]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "COD",
+                  properties: {
+                    name: "Democratic Republic of the Congo"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@»ঙͶŕˑ̗͓ɟ͍ѫǯϷ±ګț͍Oهʍɹ‹ԃŗÝýҟɄϡÂ৥ưޝċѧǘӣӤҹҒ੕ͥĒ૿ƙɣĵʇՙȊχƫষĻࡇɨƫט͝ɲƴìٟࣟR·Ҧ̳ΨٟŠȋѰԣ˅ڧŞ˫ϢՕüϽqµʾ́rϥºԳųιtȻû®ৄ˩̸ÕԬŬԒǝ͖eՊ৳Qò̢ѕG­ƣԵɁӧűȿҫŠˣş։å͏Ѱȗ˖ʋԌȷض៛\\̍ķʑh΋œşʼɊʀμƎɎ̪ǰɚđ˼͐ҜSÄʃ̼ƩӶՄӨШɆːƒ۔θࠆϬўքМĪˌt̰Ǝ̆«ӊŀݖǐԾʦ҈¸Ԕúה͜ѐҊ˔۔˷՘ؚ̳ĉظǏʦԖŘÞϦčनоͨDZ˖~ŴȲ̺ðلėբoˤĚԘۙϘķɤƖϲÅҶDzȦΫ݊֏"],
+                    encodeOffsets: [[31574, 3594]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "COG",
+                  properties: {
+                    name: "Republic of the Congo"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@̿˾ʩƗͻγۏࢸٖҪ̓֌˾ɂ֦ĺäό҆Зݐ•ʴЈł֒ĝڀЉӺζ঄ȽǘسçɻѢÔξ੘ڸɛڜȣÔҒѰ޲ԆѼ֪Ɨդ±·ԓʥ҇ǏԽĿݕ¬Ӊƍ̅s̯ĩˋփЛϫѝηࠅ„ۓɅˏӧЧӵՃ̻ƪÃʄқT˻͏əĒ"],
+                    encodeOffsets: [[13308, -4895]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "COL",
+                  properties: {
+                    name: "Colombia"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ΫȤЭ˨ʅƅ܉Ŝȱΰƽ_࠿Ӓŕʺ̼ڛтȢ̦иÊΞՆ͐Ѵ̳ȦDŽӦȏސǸɚƃ܄ͻ҄ņТ˔ÑǂʠțӶĺŬѢـהΌĚT˦ƺ܂ӖϸՊfäǪڂéڌъ͞ȊОК̖»ɚɛǍ˱գƕɇп͗ʋʓ̷Ĺ׵ɷӭѢÇņϭȄȁâ͹ij̵ˆǫȸéȨ̉ઊĄӦŃעܡͼĚ؂­ӐĪ̔ƟƱҍȇ˯ß׻ǜ֑ʆʟ†ȉэл̨ȃɠ̋ʰ࠹ǁĻǏӸɷˊ˥́࿕lZԿӰē…͏ǙĔҿƑK؏ώ̫ƀӓoηϙᘯп҂ʣpժࡤٟϾԍị̈ƤҧɝصŀӵࢤϳɐˍІ֑Њɡā"],
+                    encodeOffsets: [[ - 77182, -155]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "CRI",
+                  properties: {
+                    name: "Costa Rica"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@җȆǟǮĬƤ‰ȄɷȪͥǔ́ņÅʖəƮÄʑǗȩȓɸˑĊŗǞLʮŎˆʁŠȖnjŴňֆɝȖŊˊéƔǥʜÇȪDzɈҙ͖ͷЂΩ͗õLͷǪűűıƱëǟ©Ǖ"],
+                    encodeOffsets: [[ - 84956, 8423]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "CUB",
+                  properties: {
+                    name: "Cuba"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ܨÑڊW߄˹̭ͮ޺Ĩ̔ȡ܈ԳԺϛˢ\\ԆǟÕʁئ“ٌ΅ıȟ֑Ń֡¥׃âளą֜Ҷ΁ɔէÈ̃ʐȥӎӃ޵ɦʥǬભž̋ǐ̀ɀࠗ¨׿ѧΏ[ťȳеğΫĂѺʸǼ̤ϞȈіǎَĄȰĢ"],
+                    encodeOffsets: [[ - 84242, 23746]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "-99",
+                  properties: {
+                    name: "Northern Cyprus"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ÐJŨȮ؄Yކʢ֧ΧÔƿęˆLJÙűj¥iĎѾNjVɫïƿ¬"],
+                    encodeOffsets: [[33518, 35984]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "CYP",
+                  properties: {
+                    name: "Cyprus"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@€ãࡱͿЩŊȟͶЎŒǀ«ɬðnjUÒ½j覎ŲiLjÚ̇"],
+                    encodeOffsets: [[34789, 35900]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "CZE",
+                  properties: {
+                    name: "Czech Republic"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ϯǂЁ©ٵʲ̏Ùҿ΅ر˔ӃΰѕȬėΠƧʠؒǾ̸Ⱦ׾ǎɂdžɜīϒĖЊ˓ؼñ¿ɳҘǧŲɒּĥĄʿز»ϮЯʡCŽƯȕ—ÅȑLJ¡wý˹ēϋbšȁ"],
+                    encodeOffsets: [[17368, 49764]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "DEU",
+                  properties: {
+                    name: "Germany"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@d͗ࡔțS̗ࡢǂҾɰॊͧІˋȞёɹɣ̨̙Ⱥ҅ß́Έ՛ϑĕɛĬɁDž׽Ǎ̷ȽؑǽƨʟĘΟіȫӄί̑ϯ̟ŃŢշýƛʿǤЕ~׷ƭݍ–ţɛыɺʩ±࣑ʲǥǻ܍Nń״ьֺ௅ƸЇɘ´ςǗȐĨ֨ƗࢢԎ@Ɉ͂Ⱦޔƿ˴ǐDz۰°Ƽȃ֮вȓ̀ӈٌōՠŸ"],
+                    encodeOffsets: [[10161, 56303]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "DJI",
+                  properties: {
+                    name: "Djibouti"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ȤʹΑӏȩήɯ̱҇ȅƬȭÏҷb_ʮßɶ˴Ѐ̐ϊήñʪȴ"],
+                    encodeOffsets: [[44116, 13005]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "DNK",
+                  properties: {
+                    name: "Denmark"
+                  },
+                  geometry: {
+                    type: "MultiPolygon",
+                    coordinates: [["@@ԋڹ࢟ӄŝΒ௼˨ˎу"], ["@@ȵ̓ʡĞ؁؁ɮХ՟ŷًŎͽҲ}࡬Ɣɪʌʦ݌À̐ɴڮʂƒѝʟ˙ĶɽҘŵ"]],
+                    encodeOffsets: [[[12995, 56945]], [[11175, 57814]]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "DOM",
+                  properties: {
+                    name: "Dominican Republic"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ŀƞپIӾɏɜtƴ̕Ҡhʡϐ‰Ю̷̯ͿЍǼϫ•ˡ¢ƱƵ͑½ŷȲˣťͳֻɏƆ§ʎjɬɍʦȲƚÞ͒óҜ"],
+                    encodeOffsets: [[ - 73433, 20188]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "DZA",
+                  properties: {
+                    name: "Algeria"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ᮩཽᝩ࿷இϑटćU՘ϵƌԹʊȧЀᬻᆴᬻᆴṕᎠfnj@ÊQ঺ബب࠼Ÿێɦ͎тচͪ˜جӢòϞ̶સƚƸ͜ɛDz̃ࢲ¹Ԟ́ՠ߰ҠࣦƢՌΎ߶ʰ෎Ƭർæшůߊͨ࣌P΀ȝֺ¾ǟћƄߟȡۙԭҵôمۊԃRȯԮ͹Ϊຝ˖ݏ°ϵƧۇÔϥŃҟòՇͫΗӺؓŽέ̘ҵϼƸڒϷςՃ"],
+                    encodeOffsets: [[12288, 24035]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "ECU",
+                  properties: {
+                    name: "Ecuador"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@҂غǻξ͍ϵԉςǞʀƙބ̎ŴƺԼ͆զÍ΄ҢǸ׀Ͱࡀӑƾ`Ȳί܊śʆƆЮ˧άȣŞٓʽճࣷ࢟য়ͧԥܵǃ֣Ӆ΋ΙъͻĞ΍áw̮ʈȨıΔ"],
+                    encodeOffsets: [[ - 82229, -3486]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "EGY",
+                  properties: {
+                    name: "Egypt"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ɽͷǹىɫѩȝƥ˩˔ϛϒ׵ஸđùΐࢯԪࡋٌವ̴ҙ˒ӃݮछǗƣ‚ճ঒ݭƨǣΏ@Ὁ@⁩@@ᶶ@Ჴʥڲɐ԰Żά̤Ж૦b߲ɝ࠲ʛϴſ٨ˊΌʊݎêװŃɮеȜ˜ڨȣټ³аɄւ෽"],
+                    encodeOffsets: [[35761, 30210]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "ERI",
+                  properties: {
+                    name: "Eritrea"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@˻˖ΉӰϋ˒ɏܷ̄ͶֻXȭǬӯȡԛϢʽط঑ǬęʹβఀĊ֒ˆʴؤƐьӒӦঃɴޗҢУବߏҲӍҖӝˀ˿аʧʩȳέò"],
+                    encodeOffsets: [[43368, 12844]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "ESP",
+                  properties: {
+                    name: "Spain"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@¦״΃θஒ؆ਊƱ૾NࣂƝۦªമƒͰ͛໺ϡ̨ǺीϝআŊ®ӥߓ֓ઁǯõ˱ԩү͕ہ͞ӑӟϑǹճىǗש٥੧_ߟhՃ͍̓ͅЩê̵˴ʃӚ޷žé˦̶̀Śɬ̃ʢɶրͳԌδè’ЈƎŬZپϲɪɻфөˆƝŁӹCɁЬ΃ū̥ɇ"],
+                    encodeOffsets: [[ - 9251, 42886]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "EST",
+                  properties: {
+                    name: "Estonia"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ĮӸ̱ŁՓ̘ñӘਫ਼ɼ੔Ũ࣮Ƒࢂ|Ŵƣׯӝʞ޵ΫˉۙDܡ̸ρļ܏Ʃ"],
+                    encodeOffsets: [[24897, 59181]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "ETH",
+                  properties: {
+                    name: "Ethiopia"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ԜϡӰȢȮǫּWܸ͵ɐ̃όˑΊӯ˼˕̏ω˳Ͽàɵ`ʭҸaȮÐȆƫǽ̴̕ҧ̴Й̛͎ᩨঽۺNᛛᡃફ™ݟףաeɯ˅ַB͹˴ލΙʝΓ֕àȃĬȟwˇT੟܌ב@˹ˢ@ҾѧƘӻࣴϥȚƧʹэЦԧÒ˸ӐҀrŲʰ[ݲʞࢠЊɾĎ΄ήٜԔи΀ࠠƆܠ঒ǫʾظ"],
+                    encodeOffsets: [[38816, 15319]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "FIN",
+                  properties: {
+                    name: "Finland"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ūיಀ֓ޡى঎ख़֡ܛݴس΅յఘֻ́ѓޭӟᅡੵໃá๑̯ൃǯӡҞ߿ˠȈࠢСݶАӪނՆ኎࣮֖Ǭē΢ୟЈ˳͜uಒ಻ֲ૩ЪԊɞतѻલ¦ࣘȭߠϊЬ؞ಬ˶઄ͯΡכ"],
+                    encodeOffsets: [[29279, 70723]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "FJI",
+                  properties: {
+                    name: "Fiji"
+                  },
+                  geometry: {
+                    type: "MultiPolygon",
+                    coordinates: [["@@̂ʍƓѭԳŗҩļąτ͖̀ϤĻȼƐ"], ["@@՛ǯŅ̼оǤˊ°Ӱˀ@ЧՕȷ"], ["@@é­@ШǨžĽЗ"]],
+                    encodeOffsets: [[[182655, -17756]], [[183669, -17204]], [[ - 184235, -16897]]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "FLK",
+                  properties: {
+                    name: "Falkland Islands"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@৘Ԍ܎ȿԌʹڦϙʥ̋ଋʥϙ̌܋ϙпϚ"],
+                    encodeOffsets: [[ - 62668, -53094]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "FRA",
+                  properties: {
+                    name: "France"
+                  },
+                  geometry: {
+                    type: "MultiPolygon",
+                    coordinates: [["@@ˣ٭ϡǠș֢ǜ̺ը͎Ɯܛ"], ["@@הЅќà݀ϥȊñʎjЈɗெƷыֹŃ׳ɱƝϣü‚ɇؙҽ]ϟВƀ˾ρ“ʁʚ̿̅ʯɐٱҖŃĩηݿӅစɬ௧˗ĩԑঅʼnिϞ̧ǹ໹Ϣͯ͜ѢԎdžူࢁࢤإю౹͒čؖઠǾථɏˇॎߌέዠپʨێܾǞŪ̑ϸ_ϸ͵"]],
+                    encodeOffsets: [[[9790, 43165]], [[3675, 51589]]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "GAB",
+                  properties: {
+                    name: "Gabon"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ࡹࡔ։ۚԙࢄ‚˨ǾˎȲؔǜخ˴¶௢SOৠЌÆԞőӼňľ¯ÓνɼѡشèȾǗεঃЊӹĞٿŁ֑ʳЇݏ–҅Иãϋ֥Ĺ˽Ɂ̈́֋ٕҩ"],
+                    encodeOffsets: [[11361, -4074]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "GBR",
+                  properties: {
+                    name: "United Kingdom"
+                  },
+                  geometry: {
+                    type: "MultiPolygon",
+                    coordinates: [["@@҉ֽًǦԱ[ǦҊǥ҈۴–ࣔԳ"], ["@@࣋ࣧࡦŘऄIɕۅݯݩࢄÃäĕݠ঱ֺƇԬढ़ʈͧৰDžķ՝ѓʗͲѣݱѯ૳Rෝɱϻǒ։ϿޥĪם͍ҁǘ௼ࢨݪǺOBಽƔʃͰ࢜ʺҡҐdžռఢ÷D@ŮӤ֛Ԯ_\\৵ƨȧɬ̨ϒˡɴҍЇ·߶щє̨ࢆٶھڤá০ì"]],
+                    encodeOffsets: [[[ - 5797, 55864]], [[ - 3077, 60043]]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "GEO",
+                  properties: {
+                    name: "Georgia"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@Ųάȿִӟ̲ҭĬ̯ʴĺIJ܄ƝఆƋଦЕƦƻԚƂ޶ǭʴ·Նșɓřвғŗıҏºصʎȵƍଢ଼ſ߳Юࣅ¡"],
+                    encodeOffsets: [[42552, 42533]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "GHA",
+                  properties: {
+                    name: "Ghana"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@೉ӯҳ˽ݳʑݡʆœͨηܤɖैΠ۸ɟ஢ŗنrӊฤ¢ϊÕ˔ƊϴáÕʿΖџC؍Ąڍɂ̫ȅݳäйɢՓȈ̍"],
+                    encodeOffsets: [[1086, 6072]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "GIN",
+                  properties: {
+                    name: "Guinea"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ʃtǡͷʁJǏǴÈͶΗԨɕħǵmɳ³V̮Ƈɘ‚ʔǻΜɹ̜ڥDțǁɵoƝǷīɹ҅σρӼ͛͢ɋŊȿǖħϊūȂʓƐώЦʮeɖƘȄDƄŎï˨ĢĖd˶МU؀ȱȄlÚĤҜáŨ´¶̭ƆBɖŒƔƒɸɇάãɲǺ˖ŒȬŠǚuȈȁĴɳΆΙǣɏ˙ǴĊŀį«ʡʲʍǗÝå˷Ș΍Ⱥڧ̷ĵăśÞNj·νƃA"],
+                    encodeOffsets: [[ - 8641, 7871]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "GMB",
+                  properties: {
+                    name: "Gambia"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ņόࣶzȎȦˊ`ͨȷʼIˢƚǞʏεȋιdέǰ̷ȗƭQȫŝއl"],
+                    encodeOffsets: [[ - 17245, 13468]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "GNB",
+                  properties: {
+                    name: "Guinea Bissau"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@҅ΘΝÈȕʀLŸʯǴÁǶѼƌ˦ɦĨ༈•c˵ġĕð˧ƃōȃCɕƗʭfύХ"],
+                    encodeOffsets: [[ - 15493, 11306]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "GNQ",
+                  properties: {
+                    name: "Equatorial Guinea"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ƿŴ़̀െmPয়௡T˳µ"],
+                    encodeOffsets: [[9721, 1035]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "GRC",
+                  properties: {
+                    name: "Greece"
+                  },
+                  geometry: {
+                    type: "MultiPolygon",
+                    coordinates: [["@@Ҡ˱ٺ¶شÑqƣҜĶĿʛ௃íTƒਁǎƺΦ"], ["@@ʹՁȥĥԟ|ѫĀৱɓ׌ҿяƋҳAѻўƿȁȊԅрЁ̓ǿҴϯжʑ^ӅޥɠʜѕՓĕ͈ݏ֏Yۍμ̿ڦƧ֒͝ϮљӐÉʆϸТ¼˚˘Ũjɚռö͌ȀҖgƒƦdž„ت{ڨɲע̉ކĀVмЦɝ"]],
+                    encodeOffsets: [[[24269, 36562]], [[27243, 42560]]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "GRL",
+                  properties: {
+                    name: "Greenland"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ᬜԆ᱒›ੴ̴ᲈĄ䀦Ŀ㉊ڗ༅͕ộ™⭏ćшƫᲐĠᡚ́࿈ʴۦ̝इӧᒞ̺✘͚ᠼNjҾΫ⃝ױӃȕ᧑ơወ¡ছؕگկ€ध৚շಽ“൧ˇ༂ѽȢ܋࣍ýઞܡህÑঈ΁˟̑இŽ୥E੆֩\\Ϗပΐћɣଌȿ઼ԣ͈ڱກlj٫͖ਣӘ˼֭উѵᕖ•୆¯ᖯܵᗿڏឧ́ओIࢅ͓ୟࢱᅵכׅ“૧ȷ஽ȝܛԱ[כыտോڧͺٿϗ۝љࠍஅ½఍ۈဿLࠁҢ֕ࠐฝਲэոŗݮ୓ޢ̢ئ֗̒ࠪচొ̺ͨΘǬڀॡ̕қůݯţਏ˜Éְ͢҂ެ\\႔ɟ෿Քݩ˾࠷ş۫ȼम޴ԝ̺ڗ׈ৡࢼ੯͚XΚᖷӮᄻÖᖟ‘Ꮕ×ইˌวՈᕂ˄ၚ¬≹ɖ቉΄Ś͜ẊИᶎИ̪͘ᗗ̠ܺͰ᯲ז௢ĚΓϘጲɜᣚƂᣖRࣺʽᕺҨፘ̽୺áპ˙ፅҐŘή"],
+                    encodeOffsets: [[ - 47886, 84612]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "GTM",
+                  properties: {
+                    name: "Guatemala"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ћƦԻfϩǖҍΌrʖĮȠšƾКۆ઄Ft˸Ƌ¾ġǺ̵Ț̹ˬϜDBӂ޸BަUOڗßॅʤ@˚ƱòŰʘŃϥ͍ЉɻÏljâǑǧɇȟ½¬ıƿġ˽Ƀ}ŭ"],
+                    encodeOffsets: [[ - 92257, 14065]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "GUF",
+                  properties: {
+                    name: "French Guiana"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@͉͑ГÑŗʀȉ–ʹɩνǦɈΪòϤƢή͛ӸáֺѪܠ˸ğؤȥࢸۿƔ·ӻޑʳأ"],
+                    encodeOffsets: [[ - 53817, 2565]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "GUY",
+                  properties: {
+                    name: "Guyana"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ր̯Դյzџ̈́o҈Чͪ̇Ƈݱԛɕ°ȣƹџϊ؏ːAŎӃԢܳȱ‰ҫî˙ɡϟƥ˅—ġǑЭ¦ԫЀÓϴɋьƆܐɸ̐ȕϸ˿ŶŊτțȘѩ™ْ֩ɬɲiϲԬƊȾƾ˽̸ô̬ږӲ"],
+                    encodeOffsets: [[ - 61192, 8568]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "HND",
+                  properties: {
+                    name: "Honduras"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ơˀʭòÐʹŗĞǣÒσij‹ŔʩƈǷǚʛìǨɈáǒÐNJЊɼϦ͎ĔȂƨʊ\\þ垦ϸùϲv˒ĢİĦˎ©ȪÉɘnǖòϨśƄkʲƿʐį̏Źɜɳ˽jśŕ̇ŋɃAȅŃǙœƛźĕ{ŇȩăRaǥ̉ɳƹıđĽʛǞǹɣǫPȟqlЭūQĿȓʽ“"],
+                    encodeOffsets: [[ - 89412, 13297]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "HRV",
+                  properties: {
+                    name: "Croatia"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@Ȳ͗ˊʇ͓̓ϝȆׇ[ܟƔϽmǻǧ̝ȖǫΑЪϽǼʹϮ̽͌ȃ͆Ηݔ͇ġƛ߃̶ӣ̢ޑʠ۹ؤǞØϥΞe˲եƄʱγʝˮn̆Šbג…Ƹƚ˸ƍͤgGɼ̈ĒĈͺڞɠˊĻؼέۜlj̼Ų"],
+                    encodeOffsets: [[19282, 47011]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "HTI",
+                  properties: {
+                    name: "Haiti"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@Ԣ™ܰƁôқÝ͑ȱƙɎʥiɫ֏ƜЅÍԡÔϽƿ҉ʾö˔ޜśيã̢ȈϧθP͎ՋžȌɶ"],
+                    encodeOffsets: [[ - 74946, 20394]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "HUN",
+                  properties: {
+                    name: "Hungary"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@˨ըǍǼӂDÜ΄ђɋ̲ğ۸ļäǚͮ~ЦžĜÃЂŀȠȢˠ¼࣒ʭǴĒҲɭÎɣԡǭЉ֫ԕ֭کǁԽš١ə̻űۛNJػήˉļǍ˴ƗV"],
+                    encodeOffsets: [[16592, 47977]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "IDN",
+                  properties: {
+                    name: "Indonesia"
+                  },
+                  geometry: {
+                    type: "MultiPolygon",
+                    coordinates: [["@@Λe૝ך޴ǒѴʭ̎ʭ»ɩ"], ["@@ܙȁijĶø˸ΰԢࠨͬĐǓfʫշع"], ["@@̢ɣԲèȼΥॿǛ׉őҍP̀ӚҤPɤ̖"], ["@@ūұ౅ʅૣľE̬ښǪՂʥ֔Üݬ̮"], ["@@ྔċȂΌ༘З̪կీƵਐӿय़͋ऍ͸ݻwࢍØ޻ưঅ͎؝ČΓŁ໕ΌƣΰޑØּߤ৶·ڴ͡ΒÛŘ̗"], ["@@ѝֱćنƬ̠Ǭ˴ȒʗCЏ"], ["@@̿˥ׅƸǏΰࡘ¢Ⱦˣ"], ["@@̨ٝۿΌۯìӃÅׇˆȦҦਠ”ऎʕ"], ["@@ɼയ࢈ԉ۰ࢼ८ԔݜBܘ̉خ̛ࣘLJbᩑbᩑݟې࡟ǜȷʇ੡}ΦۂՈɺɕࣲЕ۸࿃܆ۗêృަʛУ͑óȏ̮GκٛЮ̢ࣞ״gëɠ௵DͩԄݥƺΡдଈȰњ˜ഘ·Ƃ̹"], ["@@ڭ࠭كlj߱ǐඓ¥ܽŧţٍݪݛҒϠ༪˸çϯλŪιӯ͙݉ߒ੿Ƶ˿ݲॻQտ҅ʙ̐͡Мی࠙͗ȻɶŊ͖؅ӲØࠌ֕ʭîও”றՓũίʚʌޜŽ߸ΛPʻֺΎվŤښф౎ǮΎ܎ذپʛ੖śॴ–ࠨ؎Ʀȉ"], ["@@©ܽџĈŷԝΌѷɽĵ͹Ւʟ੺ǚڤ˨̨ÔҝӸóĀ΃"], ["@@सާহį˫ֵšݿַ߱u࠷͕౻ŭ̚ॕϙͫԤ׳´лːৃ̟̩Оս¯ۗĬŹૺнɺЕܘŝ݀ĮުԂ֐Ɩָ֗ӅըǠ՜ÑӪъЖôߒɽۆǶњୠ͔̈̆क़ॲ@ܰƙӍݷآߓơϭ"], ["@@छkۻ۰અۊέԚٍۄзؾٕ୴۪݅ʙܠ̳ڀݵՊѭܘمҺࢗऒóђզ‘ಢNjݔࠓٮ֫ҪΓߔࣙࡢ_ۺֹӠ۳٘ϥͳۉӖ̞̅sƜו̊ҵؠõФՏɁ਱‘ಟ"]],
+                    encodeOffsets: [[[123613, -10485]], [[127423, -10383]], [[120730, -8289]], [[125854, -8288]], [[111231, -6940]], [[137959, -6363]], [[130304, -3542]], [[133603, -3168]], [[137363, -1179]], [[128247, 1454]], [[131777, 1160]], [[120705, 1872]], [[108358, -5992]]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "IND",
+                  properties: {
+                    name: "India"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ࣚটďۅͮїѕ׽ŒɾएࠜՑ୞חՑϟ͛޻ࠀͅߊЭરһସʼnӜёٮāৠȝ۪bĪͪŋՖÞβԠǮìڋlǙކ͉Ոƀ܀Çۈ|ÐԪ΁ˎڴŀވشॸ՘۶ȷ״ΞЀԹ˳Λ࣠űÜ͇̍Ʒèԫ׷Ʋછׅ~ӓҩ۵§ХϏۗځȒࢇȏ˹ĚΣгȥѵ೰ɵEƍ՝ҡѦʸӎϖ¶ϰ܆ӝƜީ]ߝŚóאБ¤ڕζ֭̓؆ѻԿ̻ȅ̩Ԭɣƛԑ̆كžەţֱ̫Zਛǩ´ك҃ӻ௃֡ळ঩كՋ࠷ջCϭлȹݳ̝Ͻ«ʥٙǪધ®ۡΣߙI෗ѣ¡ϣٙʰˣދʃ˱֯͵ʍߑ޸ϳ୴͑ࡒ̍Јѿ߰ȻੂơՀޅ଼Α࿀ʣ੾HৰǍ޾௣ԉףĶ઱৲И̤ʝͤড܊֖֔ᇜCǗܞҽюĩ٨ջϘऒࢢঊÙ࢞ࢢՄ࡞ࠄࡈ_״ܒӠڳд֪݂̇̕Ьβ౤ȱपŰߺ۸"],
+                    encodeOffsets: [[79706, 36346]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "IRL",
+                  properties: {
+                    name: "Ireland"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ƒ׷ًݣ๯ӹ஑Ŷڼ࢚ѭࡢତڄٌϼǦ҇ǥ҉Բ\\ٌǥ"],
+                    encodeOffsets: [[ - 6346, 55161]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "IRN",
+                  properties: {
+                    name: "Iran"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@݈njװӔ֚{τƾװýघэڤğ।ݓظ‰òۻ΁਷ɱؑκŭΫҡˠڡàՓِƙæեݿݿжѵ͸ԓߦυx݉ДƋêϯ௉ѡ̓উཌྷʪࣷȖेŊΧਐЕƪ٣ƭࡑНਇ˦ࡑ٦߳ʈ֗ߘا૪ҍƋՕ˦̻͝ҭѴS҂ˍ@Ɛ،ѝٔ਍Ң׉ߜȜپц̂ÙӬտʨխ৊ҟڨǐʼʿ६ּʈƄͅъϯ־ő̤~রئ̀Øʞʙ́гԼѱȾ¦ˈإߖǩ׎у஠ƟಾɞĄȞ"],
+                    encodeOffsets: [[55216, 38092]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "IRQ",
+                  properties: {
+                    name: "Iraq"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@րʧÚӫх́țٽ׊ߛ਎ҡўٓƏ؋ˎ@TҁҮѳӿ¤֟ê؝߭༟äᛍၖఫךৡɪ͹৾ᇶ࢔͆৬āؘҢȺјԾΰž঎Ň̐ɉЖƚծ৉"],
+                    encodeOffsets: [[46511, 36842]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "ISL",
+                  properties: {
+                    name: "Iceland"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@șիॊֵથٙᝓֹܣƵૉŮᚑˈࠠψᆧЪ๪ǎ—ʘᄋȜ֨նౠŰಸ֭౨Ҝ੒ʃൌ҄ආÑ"],
+                    encodeOffsets: [[ - 14856, 68051]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "ISR",
+                  properties: {
+                    name: "Israel"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ƥ˅̣Ŝǫ֓ɂĥɋř—ɛЄŖp͛нഉց෾ʔˢ˶ɞϼǠيŤɆzVˬCþƦɤ\\`·ŕŵhM"],
+                    encodeOffsets: [[36578, 33495]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "ITA",
+                  properties: {
+                    name: "Italy"
+                  },
+                  geometry: {
+                    type: "MultiPolygon",
+                    coordinates: [["@@̟ڋŲʹǭѝٝ̈́ёĞ୩ѐŞќজûࡪĠْò"], ["@@Ԍ׭ş૕ϣÂ΁˫͇ɞ‘২ȓӒҨ¥рʼ"], ["@@ரɏĝЯȬΧڝŪہ̗²зĻʇˠё߀чцۛदڱچLȲȃɽǗݪ̥ؠʩܜѫĔƿƽ̛үϼܳƐΝի؈̷ıѫΗ¹҅ܛΕÝHʲǢҊǼǶ͝ӤʱшΑŀʛδգƴεͶثÆٿϜޑմ֯ӜʿࠪйĮہˤϯŕӝϵΓÕĪθҕńɏٲ̆ʰʙ̀”ʂβǵМ¢Ҽ˶ƢƃА€ǼͺتĿψƚâΆԘšĮdžࠨƤȊ̉"]],
+                    encodeOffsets: [[[15893, 39149]], [[9432, 42200]], [[12674, 47890]]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "JAM",
+                  properties: {
+                    name: "Jamaica"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@֢÷ҀȫƔɯןeʭƗҹƊӑ̪ĶȔΜÎȒƒ"],
+                    encodeOffsets: [[ - 79431, 18935]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "JOR",
+                  properties: {
+                    name: "Jordan"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@Ʀˆपͫ࿪ࣆͺ৽Džų၅у࠸࠿ˣƛƑ˭ٙřȩ̡εʵधƆƒŨоഊo͜Ůʚ@Ԥ"],
+                    encodeOffsets: [[36399, 33172]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "JPN",
+                  properties: {
+                    name: "Japan"
+                  },
+                  geometry: {
+                    type: "MultiPolygon",
+                    coordinates: [["@@ņ˽ҿԕΉːљțɝӭշʈRЊҬԆӌīΊΜؠǹ"], ["@@́ڡƤсѩף੹Ѓ๏½ணॡ͔֡“غษȃষЃঝe࡞أ֗෗իΝН͜ȶݶՏʒͿ־ߐʶѲՈࡌѢ؞ָာʤ࣎ǣࢠ๺֔Б௾ࡀӌ͜ՈਈƟा΢ՎࣀƸҞୗ}ڻޥࡍbࢁ"], ["@@נǵרΤȈहఝɯ݁࠱೓ָқँण]ř࠴д٨࣌²ʖ୐ʜټন࢓٤˯"]],
+                    encodeOffsets: [[[137870, 34969]], [[144360, 38034]], [[147365, 45235]]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "KAZ",
+                  properties: {
+                    name: "Kazakhstan"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ӕƹ્דο׹̹KɱЊ੫‚ǡێХNÚࡆ৓ؘ෷ßডũߣݶۋ͆ಥ׼ƽðᓗӹᶽљ£יچ֧ɼॕǩχ˧±ȲȶΖDž̊অ˺ϛݮҩɆ…˜ࠊāŽؘ܎ƎܼűƲࠎƭԲ࠿£܍ȴঃσ޵ǭяƌĐўՙ֘دw܉֬ӞِʕǢڢऊࡺӣŀؘჄࣴಾtᇢ׉঺ͻࢼΠ೰j੺ѥʔʠ୼—ɂЊഷ׀߮Цƿɮ߮ɔ؅ֺϬ˼Ḯ̈ШȺᑆ̴ݰΒຢǹ˄ࢉ࢚Ȳઆ˹éҝ߮´ᑌߎ̭ˁ੶٭ሠᒑ҄ѰୄӛீɎҪƯКӟטNjΨΥ઎ŒѾԣٕ֓ۥÿ¡ࡅұϝဟˢ؅ຑїȇဗͱݲลֻɓäӏԭŬу̠ఝĖඃx̧ġ஥ΞӉǧŽӹ൩̂փşȉρ"],
+                    encodeOffsets: [[72666, 43281]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "KEN",
+                  properties: {
+                    name: "Kenya"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ӾۙיͱȹΕ̿Õšףˑ͹Ǐ֑ͷ˥஻ࡀËӤᵁႌƙĢSࢺʊ;а֌̨ؔσ॰įтЉ׎ԬԈ֬ֆѨƗ@ҽ˺ˡג@੠܋ˈSȠxȄī֖ßʞΔގΚͺ˳ָAܽ॑Xᵣ"],
+                    encodeOffsets: [[41977, -878]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "KGZ",
+                  properties: {
+                    name: "Kyrgyzstan"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ȊςքŠ൪́žӺӊǨ஦Ν̨Ģ඄wఞĕф̟Ԯūşȏ೛ғ̙ͭઁıͅ՛ࢷŒׇǏߣЇŜȟʇȓཟŵਡ˘࣫ÝĂӜࣴƕ̮ʸٖĉ੾؂঻ѸױȽإ͂۶ծʟĊ"],
+                    encodeOffsets: [[72666, 43281]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "KHM",
+                  properties: {
+                    name: "Cambodia"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@΁Ѭыࢄȣ২ՠۨઘdž߀ťۚ͡Ϟׄݖ̱Ȝ֕Ļ৕ඳ٧τԙࢥÓܫͷ۱Ū"],
+                    encodeOffsets: [[105982, 10888]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "KOR",
+                  properties: {
+                    name: "South Korea"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ܨযȺխPॷ̓ҥݽljڥΏݳïĥҚƼـχ࢔ذƚֻܘÂúϒ‡͞Ϝצ¢ΨÈŨȮ"],
+                    encodeOffsets: [[131431, 39539]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "CS-KM",
+                  properties: {
+                    name: "Kosovo"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@›ǣŃPĘ́ȩĐdzɦƾȌȪÒŜ˨ư²Ţşƾ¿ŌƅƒŸǎƻŢLĥȳijij„×ȉӹŻ"],
+                    encodeOffsets: [[21261, 43062]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "KWT",
+                  properties: {
+                    name: "Kuwait"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@Ǭχõȓ˔هשuȽАݟĆ؞߮֠é"],
+                    encodeOffsets: [[49126, 30696]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "LAO",
+                  properties: {
+                    name: "Laos"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@˚Ϝœ܆ڹܸ¿ٕࠦھٍÎǛ̉ӯyʣƨࢯԅoݬȸࢮ֧ž³ԎηʸǴ̲ܐնøȡ҄wŵ०ѦŬӮڏϖޅਚO͚ܹ՝ɗʉ̟৔ԉۦ঳Ռ݋َ׏ɄץƵ࠿ݕ̲ϝ׃ۙ͢"],
+                    encodeOffsets: [[107745, 14616]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "LBN",
+                  properties: {
+                    name: "Lebanon"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ɣ[ýƥ˫D̘ۄмעfˆϘ§Ɛͣқ̓ȷҟ"],
+                    encodeOffsets: [[36681, 34077]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "LBR",
+                  properties: {
+                    name: "Liberia"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ɗQࡽАޅٖ܏Ң֣ըȪː¬ʔϜҘϺϺǶnɖĨΘԧÇ͵ǐdzʂIǢ͸ʄsŸʓĎНǽύʖɱˊÇΤΙ~ͧăĿÝە"],
+                    encodeOffsets: [[ - 7897, 4470]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "LBY",
+                  properties: {
+                    name: "Libya"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ק̷ҿҤ೧βρՄڑϸϻƷ̗ҶήӹؔͬΘñՈńҠÓϦƨۈ¯϶˕ݐШȜðΠėΒ־͔ʶːЦʌ´٦দ́ΜðۮƓ૞ϓЀݛݮǍஆΙࣆйЦɔЖϮț٠˂Ф؄ЀׂŘ଒ǣ˺ϑ̺Iˌƛ࠴ıȲˣ̣ЕżΫɏԯʦڱ@Ჳ@ᶵ@့ॱGYΙ‧ྐ‧ྒࡓҟ"],
+                    encodeOffsets: [[15208, 23412]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "LKA",
+                  properties: {
+                    name: "Sri Lanka"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ų࢓ΙʇܵȓЍڜƫீϠ഼׆ұϺסО࢓"],
+                    encodeOffsets: [[83751, 7704]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "LSO",
+                  properties: {
+                    name: "Lesotho"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@̆ʩʳУƛ˛ҳſƹˍ̛ċؿ٨҄ՐҖ͢ϼǠξʵ"],
+                    encodeOffsets: [[29674, -29650]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "LTU",
+                  properties: {
+                    name: "Lithuania"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ãɊĚɲχƄࢡƨDZ۸२ʴඬÁࠜĊŞǩ҂Ã߲СĀϓۏˏșӃ࣯̓߻NȫʶљĜ"],
+                    encodeOffsets: [[23277, 55632]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "LUX",
+                  properties: {
+                    name: "Luxembourg"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ǘȏ³ρʍiȉòĞҼɖŽ"],
+                    encodeOffsets: [[6189, 51332]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "LVA",
+                  properties: {
+                    name: "Latvia"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@†نЮՆߊ˼ڜعڪhNJ٤ܐƪςĻܢ̷ۚCКȕîС˒ӷ͕ࣗԛƙ߱ТҁÄŝǪࠛĉණÂ१ʳ"],
+                    encodeOffsets: [[21562, 57376]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "MAR",
+                  properties: {
+                    name: "Morocco"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ԒΥߜÎࢊȃκU͂՟ºԝ̄ࢱɜDZƷ͛ષƙϝ̵ӡñ—ثঙ͍ͩсۍɥ࠻ŷഫاRহŷ@@@p҉Ա˓ȑϡ@̥Ŋ۹ě˛ٻʿÕЁ੕ୟ࣡ˣୋ΅ϗĵ̡ቅãaD ϶͒ɮ˞ѪÃ˶̀פҴՖ˲ƊɞӬp҂̤Բ̪֔Ւ࡬f\\ц͔ްĢڎָтɠۮۮȿਸ਼͊ܢŔѶդ֨ࡈϦخΐ֘࢈˄ԪؤI"],
+                    encodeOffsets: [[ - 5318, 36614]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "MDA",
+                  properties: {
+                    name: "Moldova"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ȨŮ֒ĊؤʽΊϞɥÑ˵̪ƏŨΗ̊ɇÏűƾčɝ×ӷ|ĉŜǫãÒƭɱˍƥ˽ɁĝƯϦĘΪςӝԂˉΠʹʠʯĈ"],
+                    encodeOffsets: [[27259, 49379]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "MDG",
+                  properties: {
+                    name: "Madagascar"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ɠΥȺ։Ɗঢ়ɒϽĉЗƩʙ˷ӰǁʝLjثõΥɵȗ¿܅ͧওб୅ԯཧ͑ୟϛইہȣܻΡӛɊڙ̜ɳѺÇݘ̑ڠù؂Ʈ؄ϰƢD˪Дِø՚șЈǃՌãޠ̊ҺŔՒмŒҶǤ̶Ʋτ\\ӐӎۖԮʦцŗάΦĵҪ׎fԐ˦ϔ̊ί"],
+                    encodeOffsets: [[50733, -12769]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "MEX",
+                  properties: {
+                    name: "Mexico"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@͙݅ƥ؁Õ૷ąЧƤқʺЧǚٳ֎سȞӏ͢бࢾɝΐΙ݄ɾٚĎؼưՊƠՖ΂ȨӬè۸Ƣʖ֬ɚࢶȚݔ‡ԚîȬDZ…ЙҋԁȥԝƸƥűγɁٽɅɎǭcǃY̝ԓƳIJķPŭޥV޷AAӁϛC̺˫̶șĢǹƌ½s˷ઃEЙۅŢƽĭȟqʕ्ࣞџ˘ۇɖҷÓګ́чĉץɜؿDŽ޹ϬؿŠ्ϸ۱ВɃɤҹº࡯ˈΓϦࣗӊсՌȧЦ˪ĈđʈȖɔJ̄˱Ϙùͮ˭ъ݋࠴ࡋڀУԼܝ΄ƷȴŸԲѓȞӹФȽהҍæӣѸϿФ™ˀҍو̓٠^͔؇ͬ˫™ӑɴƇͿƔЕĆف̀΋خׁƒȡŸÓŎ˽Ƭ\\ǜթʮɇǴ̕Նё˨ޯʠρɸϿ²ѷКƒͶϡ̨ϑqƭΝ̱ƫJɛԞջӎ؃РїɈ„ؚŵҖЏʺֿϒŏŇɃɖԭȰӷӦÖÚΊ³̸̼ŽϜ٩׶ӱɶ̱Հ̷վϳڦͿݲॖÞ੪ĞÿǑ౔СኀףဪPژ@DΌผ@̪̕јˇԀσ˨ѭȾҥѢʩۤʥՊڒۊhפͱфֹ̄ӯӸӏȂחɾЃپʹ׮ȁ͞|"],
+                    encodeOffsets: [[ - 99471, 26491]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "MKD",
+                  properties: {
+                    name: "Macedonia"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ńOœǤӺżȊ˺¶ϴbтˏÒ։DžƒƑƥҕh͋ǿջõΑȴšήń˸"],
+                    encodeOffsets: [[21085, 42860]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "MLI",
+                  properties: {
+                    name: "Mali"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@˰ƶƘӶˊpזɻӄǖ͖ÇŴȈ⁚^ȈךƣļЛ⋈Л⋆౾dᬼᆳᬼᆳȨϿԺʉ϶ƋV՗ठĈFካҟ֗íԭݛƃ଩ï̳̗ա՟IȿLjҥš޻ΑDžʿٳϕŗɍΙǡНŔɱȳūֻڙۡp˳ɭΣÆӥ΋ůȝŁŽάʍĥơhƷʕ٭PɷŴʼnùʱʎ¬ʢĿİdzĉ˚Ǥɐ΅ΚijɴȇȂǙvȫş˕őɱǹΫäɷɈƓ„ɕőƅAµ̮žʾí̽͘ʀǓӔԺ"],
+                    encodeOffsets: [[ - 12462, 14968]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "MMR",
+                  properties: {
+                    name: "Myanmar"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ӫηץ›ϥࣥΟƳО݅ՔؗΈօ̭ܵ̃ƹȪу֖ڙĪҷ_ϵ͠ދң޵Сࡷăذʴ٠˯ӼæࣸͽѤ˛৔Ʊਗ਼εۢօуॕ׳ҽöԳȠ̂ਪǫ޾څॺļ̢ӭņ׭ۆÅڰ̊ŵj׾дȦęΤȐ˺Ž࢈ڂȑϐۘ¨ЦҪ۶}Ӕજ׆׸ƱçԬ̎ƸÛ͈ӮÚˮӵξȧ|ٟ“ۙߓۭijঽࢲƔȨޛՐǍʓۣز́ζƷ؞ʔ~΍܏յdẕӓȗ"],
+                    encodeOffsets: [[101933, 20672]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "MNE",
+                  properties: {
+                    name: "Montenegro"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ÁǀηЯÊˋǫÞɽ˞εǖĢƜŬҦ˚ȜƾüɠƟŬśˠě͌ǧçïƽȋɧó"],
+                    encodeOffsets: [[20277, 43521]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "MNG",
+                  properties: {
+                    name: "Mongolia"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ࢮƢ྄ܤ౬Єܴʳ࢚]֘Ͻ࠼‰ௐɁࠈגͿӶࢊࢊश΍ނįনɍLjؿஜΛߐƺਫ਼ŌࡆōࠖЗԚѕެT੒Ƌޜȼૈƒ௸פԌĝѰ˭ৌêХهק࠽ɐ΅ӈńࠤŽ٦̴ڬˏހוğ̗ڏĦ௟ŏןʅ؝։౱͙࠷ѽࡹǞҿúѳէˎ͓ƌˣי˯׽҇গ̑ఽ‹ഫ̇এҋϋʾ৭AఓԜࠥŰૣśჃȊऑmӱԀϣޠԱĢ৩ԼଅŞুƞ̡θ͖চׅڲன̀۷Ѿəז"],
+                    encodeOffsets: [[89858, 50481]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "MOZ",
+                  properties: {
+                    name: "Mozambique"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@لæ৞ʁɖńגt̚ʦԌaऀ͜ڞӤƊϕ“࠷ľ݅ಿƨЫʣ׷͙׍՗Եޏ͉ृСॉ͓ࣕƵוׯ΋ȗí׳ЌُǔӱZʣƪ¦{ࠗƋϷȤƝűΓΗ̗ۗ˳য়ҕρ̳ðΟɊÉíѵّRïϊůϖí̠ƬपɓװГஂࢬ॔ɜ؆ŶúĨӶƉʞ˜غǐ׌E੠ѥ˒ЏÔǹȼϳǰ۫gÅ̼āװᢈۘӚЕɴüͨɅ¸͵ǯϷØסոԱʲ׌ζǰíઊΙ؈̣˖̅]ɽદɾٔ"],
+                    encodeOffsets: [[35390, -11796]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "MRT",
+                  properties: {
+                    name: "Mauritania"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@և־ԗؤ֍ɞГʚҵUЧǽйð˽ˏïҐɺаŀߊģࠨĵкČмɑЎѵδǾˬᾔMǃ௎ȴќ߀øᒸ᪂©F౞Ṗ᎟౽cМ⋅М⋇ƤĻȇי⁙]ųȇ͕ÈӃǕוɼˉoƗӵ˯Ƶ"],
+                    encodeOffsets: [[ - 12462, 14968]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "MWI",
+                  properties: {
+                    name: "Malawi"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ɽٓɾથ̆^̤˕Κ؇îઉεǯʱ׋շԲ×עǰϸ·ͶͧɆɳûәЖѵɔʮޮ˄̈LJۢǚڼƞɪɉ܌Ѕϐ࠘ƽǜɵ˶Ϲɾଡ"],
+                    encodeOffsets: [[35390, -11796]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "MYS",
+                  properties: {
+                    name: "Malaysia"
+                  },
+                  geometry: {
+                    type: "MultiPolygon",
+                    coordinates: [["@@àћֈĶ˞ΈȘýӸԓΜ֛¶֣ęϡĆ˿Öӻ̒ɵͤݑe˳׫Éߑخ঵ښįђӟ֚ś̡۠ҜĠؔȃΤƤƮۈρ"], ["@@أ˹ܯƚॱ@̅ॗ͓̇љୟۅǵߑɾЕóөщ՛Òէǟַӆƕ֘؜˽ٮǀǜ܆άǂ৖Ǻ׾ڔЬՐϦѥǮ˺В¸՜œа٪אшڀͼHќыžιֆɻ۬ʧÑ֝͡¥ƮЧ"]],
+                    encodeOffsets: [[[103502, 6354]], [[121466, 4586]]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "NAM",
+                  properties: {
+                    name: "Namibia"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@رٌؖ͡ȃࠊȷ،˯ಒm৒ŅҞ͛Όѡۜѳ৘ǽՆۃࠐ»٢КdžԊƞհ}ԄϝŶÐ₮˜׌Е᎞ş໴΂یȒհµͨȍPéӁȍʭC՛͍ͣΎಕ̍سƒ{Ჽࠣ‡BយA᷋ݣѕҋÕՇDŽϗÔƗάͩɰГг"],
+                    encodeOffsets: [[16738, -29262]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "NCL",
+                  properties: {
+                    name: "New Caledonia"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ېԵѨϭ͉ȫҥɪ׹ϚէѼ։פś˶β[Һ˹φ˷ˎɻ"],
+                    encodeOffsets: [[169759, -21585]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "NER",
+                  properties: {
+                    name: "Niger"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@nּॹȐОҿպœϤâТբ̴̘ପðݜƄîԮҠ֘Eኬஈϒᝪ࿸᮪ཾ೨αӀңר̸ȸಯ̾ɓ`ˋΔ˽ǻί͕ၻ«ધੳߋγૉΔ̵CեբmčЃʁµˋƻm֩ंȟ’ځҷٱʔҍ¸ʏşӯ~ӷΧѓq৯ѢЉȵѓb̿͆ࡅ̼ࣗıɕǻşӗʋ͹ÍݣٗӚ̟E˭ʗ"],
+                    encodeOffsets: [[2207, 12227]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "NGA",
+                  properties: {
+                    name: "Nigeria"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ࢍ̡͉¬͓ȉڥl҇Ղˡ؊שֆكYݍB¶തs՘ǂՊʶʴТԴėɨǔ͸ȍӾ˪ÎݤʌͺŠӘɖǼࣘIJࡆ̻̀ͅєaЊȶৰѡєrӸΨӰ}ʐŠҎ·ٲʓڂҸȠ‘֪ँƼnͬͯğƱ«˧۽ٱɛՙšѧDZȉǝי҅ΉŽыȋ͹ÿΓֽ˱ҽΊ͇aԃӭʑQЍ߷ɍש"],
+                    encodeOffsets: [[8705, 4887]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "NIC",
+                  properties: {
+                    name: "Nicaragua"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@̃ˆϽͺȁ˲Ο˄сϜĤžƒŵÚÒʾ”ŀȔŬRkЮȠrǬOǺɤʜǝĒľƺIJ̊ɴbǦĄQňȪĖ|ƜŹǚ›ȆńɄB̈ŌŜŖ˾iïă§ȉĐ̫ȗ˹ěͷυ®ɏtϙŹĉýΫÌɛǣɋ ɩźƏȩDZʛÈƓǦˉêȕʼnօɞųŇ"],
+                    encodeOffsets: [[ - 87769, 11355]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "NLD",
+                  properties: {
+                    name: "Netherlands"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ۦyǀ˳Ƚޓɇ́ԍ@ƘࢡҥȞՏπީǩ؛âѠɲ݀ఆଲΘ"],
+                    encodeOffsets: [[6220, 54795]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "NOR",
+                  properties: {
+                    name: "Norway"
+                  },
+                  geometry: {
+                    type: "MultiPolygon",
+                    coordinates: [["@@᥆ؙઍɣऄՅෛ͵ڵû΢לઃͰಫ˵Ы؝ߟωࣗȮ઱¥णѼԉɝԷ“ūփནƊɝҵ߭Hևױ࠿झಫ஁̨˹̇ͫ࠯bձ޿¾૟՞э˥ধֻۧυӛ֝Ԫဋঁ૫ȟ୏є̛ࣚˇ኶ޞզᕠ۶ဌࢂ໤୦፺ྴඦلᘼ੊ᇎπ൪­౮ۢ໖›ພǘ"], ["@@ም΅๝Ȝ׆ɐԕˎეǚͮ̿ொȍ"], ["@@᪖صᑟͥұأ݅ǁЍۡৣᅵԢނ̘ఽʐ࿕܂ٷڄᘎ̜Ң̋஦\\͊˼௾ˆ੖̋"], ["@@࿮̏ఝҍ᝱ı៙ƖƫɴஹdँϬᣴɼ௞ȫࡘʤᑺȽ"]],
+                    encodeOffsets: [[[28842, 72894]], [[25318, 79723]], [[18690, 81615]], [[26059, 82338]]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "NPL",
+                  properties: {
+                    name: "Nepal"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ÝαŌՕĩͩ۩aয়Ȟ٭ĂӛђଷŊયҼ߉Ю߿͆͜޼ՒϠΒȪڪʳࡔշҾť˰ЕٶǓۀσौȕঔć"],
+                    encodeOffsets: [[90236, 28546]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "NZL",
+                  properties: {
+                    name: "New Zealand"
+                  },
+                  geometry: {
+                    type: "MultiPolygon",
+                    coordinates: [["@@Ȓ΋װ;ʐΡBΝ̹ϳչإїͷ̴З٭Yܗ̓ɣջӋࡗڇϓнʇޝlխˢࣱÐƗ̰Ҍذ੐ࠦժǀ׾͌ܜѰԎѦώظ͈ɆŰҶלϴȆΧ"], ["@@،ࢫlָϜɯŲًڰ˛֨ãӒ͎юĭȯݗʯӫٛjɡʭþαūƻͅҏзֹ٭ͯƟɘΕŨӞ۔˟ҨࣛͲz̦؈̌ƚ٨Ÿլͻ֜vƪБΎڋݔΗת̸àҚұٺɑʂݡ"]],
+                    encodeOffsets: [[[177173, -41901]], [[178803, -37024]]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "OMN",
+                  properties: {
+                    name: "Oman"
+                  },
+                  geometry: {
+                    type: "MultiPolygon",
+                    coordinates: [["@@ֹ̻ϟªǩȧƉэļ֗ÿĻϯFԽ̻ćХȓǯԹP͡ɃJͻПɷҩĂ֗˳ϱ³˝טٿ൴ᠾ࠾֖၂ϩתv͸ʔΐFΆϞǒƩŞèմіHϖֵҸ̧؞ŋӼƳϜӕɨ˧̞ŃCȉ̩ԃƅɽΟˏ"], ["@@ʼnƳDž˺ʔ˺ľñā΍"]],
+                    encodeOffsets: [[[60274, 21621]], [[57745, 26518]]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "PAK",
+                  properties: {
+                    name: "Pakistan"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@تϻʞ٥൨ͻ߹۷ऩůౣȲЫα̖݁̈֩ڴгܑӟ`׳ࠃࡇՃ࡝࢝ࢡউÚऑࢡռϗĪ٧ҾэǘܝᇛD֓֕؛Ɇʣ؀٭٘໻ǁിeஃŝ̈́ঊொѢéϰГƌw݊ߥφͷԔеѶඨѕࡀŲԈŅǞȂגóદĈ܎ҶӈشCĠɼٞŌ̴ý͢ʀ±ԌΦԖ՘Ɇͥ֊ߜɴ̢•͒мΜĩмȣΤӬμࣘǮ८ĮѐƺӨĦ"],
+                    encodeOffsets: [[76962, 38025]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "PAN",
+                  properties: {
+                    name: "Panama"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@˫ʎǵҒȺɢɅÎƿˤлɸοÁǝ̇ͻɁǽ‡ĉǩВҗɯŅŧŭϷ©ơԈŋƛˡ¸ǝ͸·ÈɓİέCǻĩŶªǖìǠƲŲIJǩŲK͸͘ö̠̝iDZͲ›ĀæɴȵЮÔΨɄԜǞ˺ʤҬ·‹ĉҶ…ώơ˜ʧ̈́ɵĹūȜӵǁʟ˓ÒŅС"],
+                    encodeOffsets: [[ - 79750, 7398]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "PER",
+                  properties: {
+                    name: "Peru"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ɥљћɋࡅӘñΈရࡊທࣾ٫԰ΏۜƐʎ܅ાࠣ༄ߍီ΅Ϥ˃ؤٷպױͼ˖ϒПߢʼךڢՎIJΓʇȧx̭ΎâͼĝΚщӆΌDŽ֤ԦܶৠͨࣸࢠʾմŝٔɢĂ֒ЉˎЅϴɏӶࢣضĿҨɞ̤ƣԎð٠Ͻթࡣʤoрҁݳ œųۍlj॥ֱÓϻɉ̇ČғԕʍBΡɛƵΔݳҲԝDZί֐µ͆҃ݐuېӸÇ౧ϢĩӄƠܪടǷ˵£ןg܍͟пƮ̵ȕ˯β۹Ջ࣡"],
+                    encodeOffsets: [[ - 71260, -18001]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "PHL",
+                  properties: {
+                    name: "Philippines"
+                  },
+                  geometry: {
+                    type: "MultiPolygon",
+                    coordinates: [["@@Đ֏ºҽ˹ޑ̫ࡨϽэˎإʉϿ঩Ӧɿ؊ʰЎՑЈˁΑЃثҵƑʖ͢۾ՌʀҜ̈́̔ϝٔɰƎϒרv·ٰڼЋêхÐ̱"], ["@@̟ˡˁՍ˃ʝԫ׈ǦɤɂɾĢԸҨ¸Ɖ֣جߺāߡ"], ["@@ૣߕЬט؈԰Ԏ׊Ѱ࠲Ʈۅևҧѳֿ"], ["@@Ԏʹ՘BgΗϳΣՕʧ‡ϸÒєŽА"], ["@@ʀभ٫ɞj˭ȶԯЍȋ•עʧªƁԘӶãY͈ԣٜ߮mɴ̻"], ["@@ɟܩέоѓ٘ܚ‰̡̈"], ["@@ԮʉʶɖüɇƍΑ˼׻ɛۥӷ˥ƁڳȊڝѾġϊIJਾүăҙ˜ȫēϯٻЮ̵Ѵɍ̯՗ԊރůлȆ¨ΎˀɊʣȘŇ̡бӚűμߨͺˡĔೄ˜ހԘA"]],
+                    encodeOffsets: [[[129410, 8617]], [[126959, 10526]], [[121349, 9540]], [[124809, 12178]], [[128515, 12455]], [[124445, 13384]], [[124234, 18949]]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "PNG",
+                  properties: {
+                    name: "Papua New Guinea"
+                  },
+                  geometry: {
+                    type: "MultiPolygon",
+                    coordinates: [["@@ɽčε͔ρՔǷ٘ŜĆĜʡʬȏРՑЈ˵ŝɽ"], ["@@ѯçƃɽҟȱћȟѽBۏʔӑɺêʺݬũҠàŶЖŦrĆѽӐÜʂ˼Ҹ̚ġӸԌfǜƏgү˯ԡ"], ["@@ݤտղࢻӖ„‘ω٬ƛʥǁࣀΝġʏ֋ÏȷɔܟĦࡕŴٷ՚ӉҦѧ݀ભπ܇ʇԡˣńإڇ˿һƖࢅ–aᩒaᩒภ׃༊ӓׄїҴхŸӵඔԱȲѽޛěȄ֕"], ["@@ʿɡǁӸȝ͘ϝ˞ӍΪ؇ʚɺȮҒɻ˸ȁΜȫʹΛ͊ˏĶѧ"]],
+                    encodeOffsets: [[[159622, -6983]], [[155631, -5609]], [[150725, -7565]], [[156816, -4607]]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "POL",
+                  properties: {
+                    name: "Poland"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@·՜à̂ȹ̧҆̚ɺɤȝђָʘ಼ϴ੒˴࠼ƙÚȱ߸Yਚħ໶^њěȬʵšωɸ͋KͯԋǡʸϳfϏцܻěɽзįރۥɒϗǿ¶ߙ͔؁šЇĒӹǵч̖Ήŕ³¼ϭаر¼ăˀֻĦűɑҗǨÀɴػòЉ˔"],
+                    encodeOffsets: [[15378, 52334]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "PRI",
+                  properties: {
+                    name: "Puerto Rico"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@јõưǕɋɃمLӫ‡·άŢŬیK"],
+                    encodeOffsets: [[ - 67873, 18960]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "PRK",
+                  properties: {
+                    name: "North Korea"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@Şƥ͉ºη˵ʣ˷Ž׽ѣȅƫƧ̓ʝ֓ƏηɥηįġͰƋӈσŧȭΧÇץ¡͝ϛϑˆÁùСdžĵƿʙé‡ǀɑüɥƆɰφȤİõƶɆҒÅƎөĠЇɤۄբऒҌ־׮Ўˁܪ‹ſѺಚβͰҼժӹ"],
+                    encodeOffsets: [[133776, 43413]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "PRT",
+                  properties: {
+                    name: "Portugal"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@̦Ɉ΄ŬɂЫӺDƞłӪ‡ɼуϱɩYٽƍū‘Їγçʹԋɵտ̄ʡřɫ̵̿ê˥ͷɓѷŠџġŸڂÿԬϓþȩ͈äռͰ̨ÒͼǪԎkΤǙ̠™˲"],
+                    encodeOffsets: [[ - 9251, 42886]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "PRY",
+                  properties: {
+                    name: "Paraguay"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ͦ৖tҌЖ݌าʔޮ]޴їbʵʞҳÇଛࢲLJ΄ǐ֦ɩǀʣþޓİ͓̼›̀ƌ̢ƳAҥŕӻǑӛƍݏށ١ړƇऻŸࡑɮࠢ౨ťψࡽ͢ਅبۉŸ໵ൌ"],
+                    encodeOffsets: [[ - 64189, -22783]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "QAT",
+                  properties: {
+                    name: "Qatar"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ÇؔɨѲɰĜʬˁdӯǽӳɵÑʫǖ"],
+                    encodeOffsets: [[52030, 25349]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "ROU",
+                  properties: {
+                    name: "Romania"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@δǶԴġՠGϸȳ˺źبĄɄȠΠ@ʰćʺʟˊΟӞԁ€ρėΩưϥϒƹЂƊϠƟpɏПǹʯĀɻ৥ӳĖ̪ؑফțзɋ௽¬٥ƀ͙ÕʍΊƵƦȚƘȷŀ˃ȋөʔßΌԟȢĥˌҕͤڪǂԖ֮Њ֬ԢǮ"],
+                    encodeOffsets: [[23256, 49032]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "RUS",
+                  properties: {
+                    name: "Russia"
+                  },
+                  geometry: {
+                    type: "MultiPolygon",
+                    coordinates: [["@@ࡌ๫కˤԫ்ࠌࡳyוُԒսٱƻ۸Ĥࠊħ࣢Țٌš૴ӯࠜôରަϮͭϴϐŠɔ։̆ߵuࠟΎࡑ"], ["@@໵]ਙĨȒτ୊˚ࢢƧψƃęɱäɉ"], ["@@֦Ƚțؐᗸű࿨޻࠭λ൛ēsࠑͳǩ޽~ٗ̊ૣʖȉθ࡟Ǝॗʼnҗ̎Ǽ̸৓ȥϚЃӉΣ@„Ꮪٛᔺ࠳ïԷ"], ["@@ः©ƭˌੲΖ@ַ"], ["@@ળ»@ָň–܈E௒ʉïŗࡽȩ"], ["@@ౡMႣĤƧ¬ߘͪੀþஞ͏ĸə"], ["@@ॿͩഉø༛ͨȪ˖༨ųᑔɗ"], ["@@ډرᶽzඃȣမղҎ׀૎ǂᕞ™ᴬѽ"], ["@@ӹóᩣŊɟώູɦūҒ࡮Ƕ…Ҟသܒޙĺ፨݆ɩϢሤѺ᪪բ᫠ǀ෴̸࿐Ŋאͩ֟ʻᲗз᢭Џᤙߝఫࠍ೉߱Ǡۥྎۏ"], ["@@ɨгސȲឤYቈЧڬ̿ȽѧङʝᕅүفʟਬşఖɃݴDŽєաτɔഊƂ᧪ƑȴϽ↲ů´ٜᄼƥഄLബѷϮ՝ӹΙੌڋ೔Ϳ߸ࢦഖϙ෢ɦྼʵؤʀൖş؅ޮૐζ䢀ձܐӿᔲٛ₎DŽာƑ۪΍Ĺؙਜʇ૴Ǥ๰vཚǑཪĢะݛਪˎڷ՞ϐώᧆɻფºᝂБ୲ν@”MKઇσઝÖݶҁԄەϲɧĮΏɑɝ༧Ǿ᚝مݛĭ౽ן௛ԧ̱ϣய׊ᔗڇϣ̸ߵΫ૱Ř˓ց৙߽Šͻड़ȋő௣ޭ‹Ϋ۱Δα฽ѕ̅ॡభȳʥ࡟ே޳ׂ̳έ௬ҵለИ୘܀ԆªϾರȊຊ੒คࡺຢڢڮஆ৷ëԍۗᒉइۍਖᓧ˷ᑃටۚԧሙɕಝēÔ؊ಯŶ਩ЭᢵƠ᪏ʟᨩ࿛ủጝ೚ŁаՃࠄȅ՞оईÃௌऍ†܍ځ࠽ë্ϛഉ్௓˯ׇଙ঑ଇॻթӹ૩ӱՉYՇФૻؙſ˩ŝƦKѐіxŦ঴ɛܚܞ̒৶Ʃ֢ࠈ˾ऄ͚̮Ѵݲ൷ʛܯͧ౧Dͻ߄হװหˎ̵ࠖ̉Ԫ̿βԯࡐ̲݇షʢ૛uਯƱۛлҤȥXҩұˑݷࢻRσஅՍ৙̈́োéѯˮԋĞ௷ףેƑޛȻੑƌޫSԙіࠕИࡅŎ੝ŋߏƹ஛ΜLJـধɎށİवΎࢉࢉ΀ӵࠇב௏ɂ࠻Š֗Ͼ࢙^ܳʴ౫Ѓྃܣࢭơ͡çѽԤઍőΧΦחnjЙӠҩưிɍୃӜ҃ѯሟᒒੵٮ̮˂ᑋߍ߭³êҞઅ˺࢙ȱ˃ࢊມǺݯΑᑅ̳Чȹḭ̇ϫ˻؆ֹ߭ɓǀɭ߭ХസֿɁЉ୻˜ʓʟ੹Ѧ೯iࢻΟহͼᇡ׊ಽsჃࣳĿؗࡹӤڡउʖǡӝُ܊֫ذx՚֗ďѝѐƋϥӽ߿Ƒ࠳ࢁކߕĉ֣ࣼফԇ͹ƝɇωÌֿԚɿ†ՅȚʳΈ޵ǮԙƁƥƼଥЖఅƌ܃ƞĹıੱ܂य़̈́ܩӴؒƈۤ۰ҹͪఌ΄uȀݯƉ‚ώѠɼ߼ÖƄ˪ȅҪ΀ѰWʚఉ˚ӭUԯЀ١ƃ੩̐lǒ̗θڟ¤éʼɀǞ՝ӈࢋąʭ¦Ƀȑ̽”ȷ՞ȟ˨NJĀڴ‡͞Ȁʍɢ֥ƪ¼Ʋ΁ƴՃվǸɨĉЂࠑȨѱijšȼࢭɂˑӸíТЙȖάˊʝ޶װӞųƤक़ҬࢡЎᅢ੶ޮӠ͂єగּΆնݳش֢ܜ঍ग़ޢي౿֔ŬךڶüොͶࢀ̈൦ԕᘨȧṺो٤ЋÆ֓टѳ൏ɡ⏷ٔ؟Ńൌ؛ÂϵÆ࡫ઌʯڂɓňРԑΰ՘͈᎖Թ۾Ȳ֣؜ዦࠖޢµ޸̋Ӫ׀۫ԄЪԊءԶᚠˑӔҹ੡ĻNҳڌ˽ಜǼȶ՚ჶАᰪܞي£ࠣԙਬĕ׼˼༾xఢΐफ़ԏॖ֌ࢡӢѪˤ២ʫ୒ʿᴾॣ֚ѰࡡѺ{ǴৣĈˢЌ҅ټ}ː༄ݾրކزǒᕮɛǬұߕڽԺˋ˒חȏଵऒԧέ֕࿫஝०ŭ̢ͮऎɎɞжܮЎөӌϼֈࣿêȫҲڢࡈણۆຒ֦șװмnѴүͧ߷࣐Ƶϥ؄ඤͦლ¬༈ӏݛ۪ċࣆศǞ፾™ᆘŌہѮংւॲx࿎иᕠŐ˪ɲᕂþیȋሴҀ໲aɶδߤΨጤΈ෸˗ଥȷበŹ"], ["@@ⵙ͕ໞીےĦقÃᒈӋʟͿ"], ["@@૽ōݱÛśƏঙƑ࣫ȦӐʾል~࿞ƶ౨XǢɧӘȬߊƐఞǿ͗ŷ"], ["@@ᆳĿᚉʎඅ͎٣׾଩ǔᔆָᆎȎ࿌чኬ߻ȹݯ"]],
+                    encodeOffsets: [[[147096, 51966]], [[23277, 55632]], [[ - 179214, 68183]], [[184320, 72533]], [[ - 182982, 72595]], [[147051, 74970]], [[154350, 76887]], [[148569, 77377]], [[58917, 72418]], [[109538, 78822]], [[107598, 80187]], [[52364, 82481]], [[102339, 80775]]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "RWA",
+                  properties: {
+                    name: "Rwanda"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ͬӃµӵʏŁѿÆʱӍԛàþҠŘތԄʎɺȰďԈʸ"],
+                    encodeOffsets: [[31150, -1161]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "ESH",
+                  properties: {
+                    name: "Western Sahara"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@oҊŸ@@ÉeNjEౝ᪁ª‚ᒷ޿÷ȳћDŽ்ᾓNǽ˫˜΢bCቆäĶ̢ΆϘˤୌୠ࣢Ђ੖ˀÖ˜ټۺĜ̦ʼnϢ@˔ȒԲ‚"],
+                    encodeOffsets: [[ - 9005, 27772]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "SAU",
+                  properties: {
+                    name: "Saudi Arabia"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ʼnΪʩʨÝͲѡ̞҃۴ʁۆׇ׀ϑƐ֋ߠīא–ӾӕञϿ͠ґǨˡӖ°ȎɹѦʕȊ͝زԟڴѓ־лIžҦœ̌ļͲनƅζʶȪ̢ٚŚƒˮˤƜ࠷ࡀ၆фdžŴৢɩబיᛎၕ༠ãݠąȾЏתv͠ܥаȓƠִ̏Λ¼΍ċ˩ł˯ʎɽŐ˟ŲȵʬǕɶÒdž͍Žș࡙͐ᡌщǞDzϪש֕၁ᠽ࠽ᝑ͑޷ϙ׻ࢥϹƕɁˬ͏§߻ĎƷČॹmɫùΉɔɝЭĒΟρˋ"],
+                    encodeOffsets: [[43807, 16741]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "SDN",
+                  properties: {
+                    name: "Sudan"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@śhdмĵ̀џͨĵ؄ĶبϳÌÍȇԍ©Ȭʕðԍңңл؅џđ۹Ӫͅǥđʓџǃ…ǥ࠵@řǦ؃†̡ƝɳîѝӬƟɲ؃ŗɱϵɏݣ˿ǁʳğå ̅ʎÃʼƌΔE΄ӛՀĩάZȰ̱ʜUӦǭ͖̍µĎ̰ɒΖħΐˢʴǫȞɞ԰ϨئܦÏ¥ ZΚॲH@း@Ὂ@ῼ@˔ࠗȁƳŪࡻ্̰͌ȷҠ̳ыӑأƏ˅ʳĉ֑α௿ĚͳƅܟͿࠟԓзέٛč΃Љɽʝ࢟Dij"],
+                    encodeOffsets: [[34779, 9692]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "SDS",
+                  properties: {
+                    name: "South Sudan"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@Xٽűʯѿq˷ӏԨÑюХƨͳϦșӼࣳ֫օԫԇԫϭסFگȟՕȊ΋ɭ݉֐ȥάҵDZϱÆɣƕϗĸԗۚƉˊعͪɅԌΕζ֟ѬS˘ҡͼ֯͠ʴĠ̀ǂɐݤɲ϶؄ŘƠɱўӫɴí̢ƞ؄…Śǥ࠶@†ǦѠDŽĒʔ͆ǦۺөѠĒм؆ҤҤïԎȫʖԎªÎȈϴËĵاĶ؃ѠͧĶ˿cлŜg"],
+                    encodeOffsets: [[34779, 9692]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "SEN",
+                  properties: {
+                    name: "Senegal"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@΍ٺн̚φDŽРמȦќ˾ːкïШǾҶVДʙ֎ɝԘأֈֽžԹǔӓ̾ɿî͗ʽŧ³қâÙģȃk׿ȲЛV༇–ɥħ˥‚ѻƋƏ٢ވkȬŞƮR̸ȘήǯκcζȌǝʐˡƙʻJͧȸˉ_ȍȥࣵy"],
+                    encodeOffsets: [[ - 17114, 13922]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "SLB",
+                  properties: {
+                    name: "Solomon Islands"
+                  },
+                  geometry: {
+                    type: "MultiPolygon",
+                    coordinates: [["@@ɾ˿חN͉ԬԈȯǜ‰"], ["@@͝mԧĎǫżÀͮֈƁ˜ǭƎə"], ["@@ųƹحܰǫԈ˺@̠ڥʹЗ"], ["@@–ǛڅΦҟ̠̿˪ŰĐϮȫېϭȢˉ"], ["@@Ǘ³οȒ·Ί¨ƖԈΡͰ˛"]],
+                    encodeOffsets: [[[166010, -10734]], [[164713, -10109]], [[165561, -9830]], [[163713, -8537]], [[161320, -7524]]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "SLE",
+                  properties: {
+                    name: "Sierra Leone"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ɧØ؁ͺѩ҈Ƨ̬Ĺت҆τĬɺƞǸɶpȜǂڦCɺ̛ǼˁʓƈɗṶɴ´ϹϹϛҗ«ʓȩˏ"],
+                    encodeOffsets: [[ - 11713, 6949]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "SLV",
+                  properties: {
+                    name: "El Salvador"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ġȡӡ^̡Ą΍ǘұÀʃǶ~Ů˾ɄǀĢ«IJȠ¾ʜëǸǙʪƇŒœτĴǤÑŘĝÏͳ"],
+                    encodeOffsets: [[ - 89900, 13706]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "-99",
+                  properties: {
+                    name: "Somaliland"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ϛԩד۫۹Mᩧা͍̜̳К̳ҨǾ̖̲҈˚ƹǒΏϜΗкGߊɌࣴĴ݌ʼиÆ̚ƶӎˆKaE΋Aࡑ@ѫ"],
+                    encodeOffsets: [[50113, 9679]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "SOM",
+                  properties: {
+                    name: "Somalia"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ѼĎЊ˾͈FpɵýӧHѳǯ̣ʁࣥЙयԱ੷ܝ௷ܓवধ଩ࡁڹష࠯޳ٕँৱȗѷȍȣӽۚWᵤܾ॒ɰˆբfݠפબšᛜᡄה۬ϜԪ@ѬBࡒFΌLbːhϰŰ"],
+                    encodeOffsets: [[50923, 11857]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "SRB",
+                  properties: {
+                    name: "Republic of Serbia"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@Ԡȡà΋Ӫʓ˄ȌȸĿșƗƶƥȷȏø̫Тγ͋ʿƗˋĞijƑšϳa˹µƒØĴĴĦȴšKǍƼƑ ŋƆƽÀšŠƯ±ś˧ȩÑèð͋Ǩ˟ĜūŜɟƠȢšŬЄЛ͔ɀτ̥Ë͔́ˉʈȱ͘٢ɚԾ™ҖͣĦˋ"],
+                    encodeOffsets: [[21376, 46507]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "SUR",
+                  properties: {
+                    name: "Suriname"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@৔ǙĞưڶÔࣚɥѩܟâֹͤӽƥίóϩɉΛӓDzЇđ͹öčʏƘǗ÷ǡҙèԡܴōӄˏBωؐƺѠ¯ȤԜɖƈݲ"],
+                    encodeOffsets: [[ - 58518, 6117]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "SVK",
+                  properties: {
+                    name: "Slovakia"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@´»ΊŖш̕ӺǶЈđ؂Ţߚ͓ɷɓǏ͹dzđ࣑ʮ˟»ȟȡЁĿěÄХŽͭ}ãǙ۷Ļ̱ĠёɌċ̆äńŢȂόa˺ĔxþLj¢ÆȒȖ˜žưʢD"],
+                    encodeOffsets: [[19306, 50685]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "SVN",
+                  properties: {
+                    name: "Slovenia"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ۜÝъȐܾtLjƘƘUǎ˳ڝɟć͹̇đHɻͣh˷ƎƷƙב†ȈúȫΨĞа"],
+                    encodeOffsets: [[14138, 47626]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "SWE",
+                  properties: {
+                    name: "Sweden"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ࠁוƀԥ೹ڭྱܡؓஃײףߦүޗॅ࢑ȝ͍තӋ޿৳ĆӅڗঃˉߐ۳॔ٓஐφӜּۨ˦ন՝ю½ૠղ߀࠰ä̧ͬ˺ಬஂࡀञֈײ߮GɞҶཔƉŬքԸ”૪Щ಼ֱv಑˴͛ฃʃ"],
+                    encodeOffsets: [[22716, 67302]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "SWZ",
+                  properties: {
+                    name: "Swaziland"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ǡύӭěԅҖS̄ɰ̀ĂʔʐÒшƵŰϕðω"],
+                    encodeOffsets: [[32842, -27375]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "SYR",
+                  properties: {
+                    name: "Syria"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@࿩ࣅऩͬgNŖŶ_ΈȸҠҜ̈́Əͤϗ¨ÿٞȶΌɤȀɤȀ°Ҹ˞Ǐऎɺ҂ƿۖFॴ̀Ґaक़žїԽҡȹĂؗͅ৫ᇵ࢓"],
+                    encodeOffsets: [[39724, 34180]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "TCD",
+                  properties: {
+                    name: "Chad"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ĎЄաnDզΓ̶δ૊ੴߌ¬ન͖ၼǼΰΓ˾_ˌ̽ɔȷರࡔҠ…ྑ…ྏ¦ ܥÐϧإɝԯǬȝˡʳĨΏɑΕč̯̎¶Ǯ͕Vӥ̲ʛYȯՏƛэͽ؉ࣹ߅ϳ߹¾ʁûĊ̏ѫ̋Σ͟੓͏ȽȐƓhƹɍۛÙƀɪ˅ׄşΐλƜӷӪǼІϦċʂÐҸSқކŒ֐É֐ͭՠ"],
+                    encodeOffsets: [[14844, 13169]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "TGO",
+                  properties: {
+                    name: "Togo"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ڱdzȇ̎ɡՔãкȆݴɁ̬ăڎD؎ΕѠÖˀ݂kŅѵʲʝ̈̋ŽЭǜǥኝȺׅ"],
+                    encodeOffsets: [[1911, 6290]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "THA",
+                  properties: {
+                    name: "Thailand"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ݭϬܗeŬڈ݉Káऋґ௯˙ݏÌ؋ն΀ދưܭҶӓԚĭѤѧ˝·ևĵßќۇςƣƭͧ͒ƝжҁӄПЌƏӳǃҲĠԾʚ߬ТࡸҤ޶͟ތ`϶ĩҸ֕ښȩф̄ƺ̮ܶ·ֆՓؘН݆ΠƴϦࣦצœӬθӔȘθʷ´ԍ֨ȷࢭpݫࢰԆʤƧӰzǜَ̊ÍٖڽÀࠥںܷ›܅˙ϛ޿ŦગDž՟ۧȤ১"],
+                    encodeOffsets: [[105047, 12480]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "TJK",
+                  properties: {
+                    name: "Tajikistan"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@̭ʷࣳƖāӛ࣬Þਢ˗འŶɈާˠĐԜȓ‡͛ŴӍࡿBׁØԻϕύĉ̉ǯͩˠþ۸ʩ¢ĞʲғȐα̇ė͹Żūԇj˕ϩ˯nj؋ˑʱĺӀࡘǹض؟ȨɔφۮŸЌҬˌբ૲ȜǩϵŤɹΎv"],
+                    encodeOffsets: [[72719, 41211]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "TKM",
+                  properties: {
+                    name: "Turkmenistan"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ñۼطŠॣݔڣĠगюׯþσƽ֙|ׯӓ݇NjƻרŪ࢞ٽ˶Ɏֺ֏¸Ȇ۾ߊȵ݈ˎؓԎʉӔڱɋď؛ʿհψ˨ॖǪ֨ɻךڅњ¤ॆ\\Əцܖ̂۾ӦଆѹĜڡ͐ǣࣦžˮƳаࡽ०ׇոЃ࢞Щ૤Ϋwԥʩ€Ѕɤſ̙۽NjǙڥӁʭڏŵǫϟهŏࡩ͈"],
+                    encodeOffsets: [[62680, 36506]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "TLS",
+                  properties: {
+                    name: "East Timor"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@IJȤܢȌז†ˀŀ͆Ľ̯ɫ࢕ο۳ʋeʬďǔ"],
+                    encodeOffsets: [[127968, -9106]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "TTO",
+                  properties: {
+                    name: "Trinidad and Tobago"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ӚŊǮ‡‘صۭġƯúʒɲiͪ"],
+                    encodeOffsets: [[ - 63160, 11019]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "TUN",
+                  properties: {
+                    name: "Tunisia"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ΩພԭͺQȰۉԄóنԮҶȢۚƃߠǠќࣶͺךĵ}ы܊̲ÒljпЫMϱ̆ȽōܫփхDŽқѤaɄЍ͊ſ³٥Хʋʵˏֽ͓ĘΑïΟЧț"],
+                    encodeOffsets: [[9710, 31035]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "TUR",
+                  properties: {
+                    name: "Turkey"
+                  },
+                  geometry: {
+                    type: "MultiPolygon",
+                    coordinates: [["@@஺͗ঐżܤõলѬࣆ¢ߴЭƜ̑ăУزȻͨʕֻʇˀ५ǏʻҠڧЕƙ̏Ɋ঍ňίŽॗŽҏbॳ̿ەEҁǀऍɹ˝ǐ¯ҷɣǿɣǿ̱Ϡ͈͂ԟí۱ȖֿәౣĥڹҊࣟ†ȗΑׇij߻҄ࣻeӽ࠶ؗҰЦٸՓВठߨಒ’Μྀٔŏ৞հ঒ʄർlุף"], ["@@۫ҏ˃Ϻ\\ǦȦĦʺՂХɞࡦ˄ܤőĴ͓ܼ˓Ƶȵি±Ωʷ"]],
+                    encodeOffsets: [[[37800, 42328]], [[27845, 41668]]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "TZA",
+                  properties: {
+                    name: "United Republic of Tanzania"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ƚġᵂႋÌӣ஼࠿ϱਙ¸Ӊՠ̩~ɓɳԓ¶ʭÇГ̌Ճΐ̰ࠡǿڝӣࣿ͛ԋb̙ʥבsɕŃঢ়ʂكåɽଢ˵ϺǛɶࠗƾӉʨՕƘͯƘΗɈґ੖ӣҺǗӤČѨƯޞΎ ̨̦͜ѬȺǮS˘ǷȐ·ͨʐł¶Ӷͫӄ̎Ķऄ[ႎà"],
+                    encodeOffsets: [[34718, -972]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "UGA",
+                  properties: {
+                    name: "Uganda"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ः\\̍ĵԇʷȯĐPوȜ͎²ڬǰϸ͎Ѭ͔ɠ˒̘͵Ŗ¼চΌɮՖȉڰȠעEԬϮЊ׍İсτ९̧ؓЯ֋ʉͽTࢹႍß"],
+                    encodeOffsets: [[32631, -1052]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "UKR",
+                  properties: {
+                    name: "Ukraine"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@̾“ɄȒʮ¥ࢌĆ՞Ӈȿǝêʻڠ£̘ηkǑ੪̏٢Ƅ԰ϿӮVఊ˙XʙͿѯȆҩƃ˩߻Õџɻύڡã֑˕޽«ܣ̻¸ԹЪȭࡨ¼Ǐ̛ँơଛӟұǠȄЂࣽʘƨLjߪ˪ʑȔಯɆË̼ީĻ̷ҧٱةϟƠЁƉϑƺɂĞƦ˾ɲˎÑƮǬäĊśӸ{ɞØƽĎÐŲ̉ɈŧΘ̩ƐÒ˶ϝɦΉŽأʾ֑ĉȧŭΟ@Ƀȟاă˹ŹϷȴ՟HԳĢγǵÍɤұɮǐͺɸɔȀµɑϘބۦиİĜɾхܼДҢɪٲnࡖßबȫڎi͂ŧ̀Ʀɚȝݸ¢ͮąÄцʶȂܞº"],
+                    encodeOffsets: [[32549, 53353]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "URY",
+                  properties: {
+                    name: "Uruguay"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ղĚࡆٯ̺|ࡺ՟ڈҫӠֱχЉɸӇεՇॉұاǚғěޥΰ֫ԟҬÞլǾȈS࠸ɤࡺȾڦ"],
+                    encodeOffsets: [[ - 59008, -30941]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "USA",
+                  properties: {
+                    name: "United States of America"
+                  },
+                  geometry: {
+                    type: "MultiPolygon",
+                    coordinates: [["@@ũƕȽŤ|ɾƓ̨¦ĤƤƎÍǔ¸þÜe͐ƙƬñƌőɊ̍q¯͟ǵˏſ"], ["@@˭ÑƟǮīèQÀĈî̘āɘŹëĵ"], ["@@ĝ҉|Úĸа•"], ["@@­µÓŻˆŃȒ’ɤŚêÃʐ˥"], ["@@ıĉ˱ƴªÖŸĈȘijȝ"], ["@@Ƭңʼƛז½࡬ƅࠂʹڼŊਖɓ˞Tݨʄ߂̧ࠒ͗ں˩ٶˏĈəȢĉ½ĉɦǎĔ¦ȣǜƅɴ@ŬĹĽƫ࢖ЁǶށǚܳʗӹЁҥȁ̍mēĦť˸Ɓɂ@ঊ҆ࡾƀસмfĐ÷ʰƉǒϜƆࠜHޘAˎ͞ŀàࢶ؄ϜƸ౦N໾BĎȺː¦Φž̖Ϣʲٺٚي˨ə֜ƜώʏAଧռӅƢ˝࣋Пࡷ̃ࢱʝѻӿƛȋSѽˤѽΒsė̬ʦȇãʇ֥ƋЗhةƥλ¥ӥ¥۫ʏఀǂʠǃ୳ʥ՗C|ĺʭɷʚǹ׽ؑ٧×Ɏȁª˟ɀǪҍȼƭ^ͅˏ͛ҿڡûʺֲѕ͎įۦljεǴՑևƀׂ˓˜ߛʊÍĖ̃ŠࡁՕدࢇʝցӱнÁэ̱ţ˭इձӁЍЅӽŻׯƪ׍ˬܗώשLεЊঅ֥—͛ȿԡʣŃЯĺƁς͋ȖѻܢϹٞű͢Ǥ֐ɽҦٻ۲͟źࡑϡƭ¦СϼՃȺोŁݗĤٙÍΏſƲɟaͽǴǓLJō̵Ů́ǃ؍€طѺܻĿ؏ȚԹÏۻȝއح࠳γҝБȕϗUׅ¨ЕDŽ˹͝{׭ȂٽʺɽЄȁטӷӐ̃ӰуֺףͲۉgՉڑۣʦѡʪȽҦ˧Ѯӿτїˈ̩̖ป@C΋ڗ@ဩOቿפ౓ТĀǒ੩ĝॕÝƙіխӚϻĴğʌһ¦̝ɪޭĊɉƌĹҢࠁࡊ۩ୠˆȚχˤٯ۴řۆ҃ҞȀۢ…ܜˍ٢͠ߊĸނĺނƱૼˇܘʓ϶ĸǐ௒˷҂ߋȺɜƇې˷ێᛸ@᠂@ࠜ@ᢢ@៚@ᡀ@ᡄ@᭰@ᮞBაAF͔˴J"], ["@@࠽͋ѕɐŽЀބ̘҆Ÿ֐ÉΤʻܫЍ"], ["@@ԧŽսƾԛɮࠦƞښùĂ͑"], ["@@԰DžԾĒڸɛ࠲őéĝُDZٕǾ͋Ʋݍµȧôº̈́"], ["@@؊ϛώnjහ»¹ȕ౾ƛࡨČᄚ˅ྤā٨ʼn૦Ǝౢʧࣲŝ@@MᷱIⷍࠠ{ࠌɵהρݜցࠈҺࡈ˖Ҁѡ֤·ޒϙՂ׽࡮य़ේ՗xՋұЙҥ͂ݍˌʃܺએںҍߎ߯Ä೷rটʌ჉ࢎߩDŽ฽̜୑í࿻ϬৃΨटǯǦ׏ҫÁঁǫ݉˱झdzťӶϚࠚࣀʶɱɂੱҵֵ֑௅ױؚСߏ׿ࣗΗࡁʱȻωಽѡ˅ϿছΫֽÞ޷ɻ࡝˹ۧ˫෹ʉſƘऀϾࠔʸࣆҠਬĨвΈ୘ԊȈǚب̒ƢْђӸॹʫ˓Ơҕ̧շюɧ̝̽м࠿ͳԩBïԄƲ̮ե̚થLJ܁ЀַȬIӈ٩Ϊ͘ӘۆҸ̚њںÖ־ƇڴМ؎ï٘ʼƻϨҹưج͖ԩWࢻǽʯȃڏȄஏĥ௷ȬΛ͸੟Ӧ୾ΘመШ۔@ŕнᄢŽڽԶਕ͌ױр߫ΨଽˈҺѲ๰‚ਗ਼ϦȨФ࡬ЎࠊĪཪώޜÉಐ҄ౚǭ"]],
+                    encodeOffsets: [[[ - 159275, 19542]], [[ - 159825, 21140]], [[ - 160520, 21686]], [[ - 161436, 21834]], [[ - 163169, 22510]], [[ - 97093, 50575]], [[ - 156678, 58487]], [[ - 169553, 61348]], [[ - 175853, 65314]], [[ - 158789, 72856]]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "UZB",
+                  properties: {
+                    name: "Uzbekistan"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@xԦૣά࢝ЪշЄ॥׈Яࡾ˭ƴࣥ͏ǤěڢଅѺ۽ӥܕ́Ɛхॅ[ᶾᓘӺƾïದ׻یͅߤݵঢŪ෸à৔ؗÙࡅЦMǢۍ੬ɲЉ̺Lπ׺૎הӖƺʠĉ۵խئ́ײȾ়ѷ੽؁ٕĊ΍uţɺǪ϶૱țˋաЋҫۭ ɓυؠȧǺصҿࡗهǰҳN"],
+                    encodeOffsets: [[68116, 38260]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "VEN",
+                  properties: {
+                    name: "Venezuela"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@yȣӱĭ˜ϡYѭυӥ͆ڙδÆȌ؈ʻ̒§َਸ਼΀řІ̎ˆ̞ןל_մҵ˧ݮQ࣌ĔӖϕٞĻҼʾXɄਨ¼৖\\܉ʛ˼Їڦ×ِЯƆڧѬn͢ȣڕӱó̫˾̷ȽƽԫƉjϱɫɱّ֪Őʁ̭͍ऱ̽׿Žʏȣڛɀثņƿýϔɑ‘֝ŜՉ܆ï°ǭ׷ʅĭΣΉƏسȝNjʱٷÅҧѼʯ࠺ɟ̧̌Ȅюм…ȊʅʠǛ֒à׼Ȉ˰ƲҎ̓Ơӏĩ؁®ͻęסܢӥńઉăȧ̊ȷê‡ǬĴ̶áͺȃȂŅϮѡÈɸӮĺ׶ʔ̸͘ʌɈрդƖ"],
+                    encodeOffsets: [[ - 73043, 12059]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "VNM",
+                  properties: {
+                    name: "Vietnam"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@૭ܗ۫ߍȁ׍٠ࢭ޺ળނԱԞګϪ།ŕ๓۫փ१եۇ۫਷ޱ̧ՠʀ֬دӌܬ͸ࢦÔσԚප٨ļ৖ț֖ƶࡀɃצٍאՋ݌ۥ঴৓Ԋʊ̠՞ɘ͙ܺਙPϕކӭڐҊȴڢIࠈĬܒ҄К̿ސƵƃӛАͿࡎɓ"],
+                    encodeOffsets: [[110644, 22070]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "VUT",
+                  properties: {
+                    name: "Vanuatu"
+                  },
+                  geometry: {
+                    type: "MultiPolygon",
+                    coordinates: [["@@ˣō˭ςŒɤՆӗ"], ["@@ƌڱɥŀǩ­ťɴi٢Дʵ"]],
+                    encodeOffsets: [[[171874, -16861]], [[171119, -15292]]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "PSE",
+                  properties: {
+                    name: "West Bank"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@@ԣŭʙЃŕ˜ɜɌŚɁĦǬ̤֔ś"],
+                    encodeOffsets: [[36399, 33172]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "YEM",
+                  properties: {
+                    name: "Yemen"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@؉ɥNjύo˹࠷Οഇϻݩףυ±ʥºӭΑ՗lj۷©ɃµǿɛəÕŻɇеlˍœ׉¨ɓӬzҠƍʜǑتʋΊǚ¤đϨĸNJ™ξςˌđΠɞЮΊɓɬúॺnƸċ߼č͐¨ɂ˫ϺƖ׼ࢦ޸Ϛᝒ͒ڀ൳˞ח"],
+                    encodeOffsets: [[54384, 17051]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "ZAF",
+                  properties: {
+                    name: "South Africa"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ǏŧΣяɻћӇ׻ोࢁףԋًϣ࢛͙ѓ«ŇɷԛŰеDž࣫NJԙĹΏ¬ࡿͩܓƃԱͅϡoΣ̚˳fαϒŸśŏɦLӰ˙֞˔ƴs٤ս޼х܈AF׽તДдͪɯƘΫϘÓՈǃҌÖݤіB᷌ɨűӾߙûԟȈ̏׼ĒрϒЊʨȶДЦȚΠķВɽۂ£՞ȜĐʾƨДҚäʨ͂˪֔ݮغஒؤ΂UОƛ˲Ķ҂ċД஁ɔׯƫऩî̟чƶʏÑāʓɯ̿T̃ԆҕӮĜǢώْQȿؑıۥɑϛֵщ", "@@νʶϻǟҕ҃͡Տـ٧̜ČƺˎҴƀƜ˜ʴФ̅ʪ"],
+                    encodeOffsets: [[32278, -29959], [29674, -29650]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "ZMB",
+                  properties: {
+                    name: "Zambia"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ІϏɊ܋ƝɩǙڻLjۡ˃̇ʭޭѶɓᢇۗĂׯٍřӍͯĹ̛̅ßܵۓҭխ˳o˗ĬऱĠƯÚOêͧȎկ¶ۋȑչԾ֣یžᦶშYí̂Ű̀ƧЀĪТėʺ̂q¶ʽϾrՖûˬϡڨŝԤˆȌѯ٠ş̴ΧΈҥ٠Që࣠ɱƳח͞ɧƬļࡈƬসȉψʈ՚ɤĶ଀ƚͦđΘɇͰƗՖƗӊʧ"],
+                    encodeOffsets: [[33546, -9452]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "ZWE",
+                  properties: {
+                    name: "Zimbabwe"
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ҁČ˱ĵНƜ΁VՙϞٯźʙՒC̒έĞ्ई˃ӢǛƮ͓ڤलğ˘ī˴pҮծܶ۔̜àĺ̆ӎͰَŚÆ̻۬hϴǯǺȻАÓѦˑF੟Ǐ׋—عƊʝħӵŵùɛ؅ࢫ॓"],
+                    encodeOffsets: [[31941, -22785]]
+                  }
+                }],
+              UTF8Encoding: !0
+            }
+          }),
+      i("echarts/util/mapData/geoJson/xiang_gang_geo", [],
+          function() {
+            return {
+              type: "FeatureCollection",
+              features: [{
+                type: "Feature",
+                id: "8100",
+                properties: {
+                  name: "香港",
+                  cp: [114.2784, 22.3057],
+                  childNum: 1
+                },
+                geometry: {
+                  type: "Polygon",
+                  coordinates: ["@@™@}ScTʟ@cWuJÁ–]„l¦RLj¼BĄà˜ ŽH@TOHCTDDDHDNAT@PEHDDNJLX@BABALHFF@DKHADBBLDHHFBLEJB@GDBBFBADDB@@KFAFBBJJA@BB@@FFDDADFF@FADDDBJC@AFBD@@DDD@DAA@D@DB@DHHBFJBBFEHDFAN@DGDC@DLCBDDCFDlAFBFCBEF@BC@GDAB@FD@DZJ‚X´HĐMja@Ý`p_PCZ@lLnRGSDMFK|a\\Y}­ƒ§™Mën"],
+                  encodeOffsets: [[117078, 22678]]
+                }
+              }],
+              UTF8Encoding: !0
+            }
+          }),
+      i("echarts/util/mapData/geoJson/xin_jiang_geo", [],
+          function() {
+            return {
+              type: "FeatureCollection",
+              features: [{
+                type: "Feature",
+                id: "6528",
+                properties: {
+                  name: "巴音郭楞蒙古自治州",
+                  cp: [88.1653, 39.6002],
+                  childNum: 9
+                },
+                geometry: {
+                  type: "Polygon",
+                  coordinates: ["@@˜@ÈÒĊanwŎV„™Ȯ¦ͪŃĢ„ÜōȂçČéƐżLɆóĊ‚ĊaʊŁ±¯²Um»ˌmÈ»V™ʠţWÑůǓ郙ôƑƒğÆīŎī@Ƿ™wô™˺LÞ¯ƨVǪуšĢ™ȘV°wĢŽôk°¯ƒ»΀@Ȃ»ĸŽǔ@΀ƒ͔ôôLɆó̐ÝɜLɲōͪƒƨóŤK@ī@IU܃ÛmȻţǩÝ˹ÛljťǓǫō@Ɲ²¯VçōKͿŁΗÇţ»ƽ™ɅƑLÓŏÅÅɱV@ÝĊU¯ÑĊĭÞLšÞŎJ±̃XȣˌōlƒUÈ¯ŎKÆƅ°™XÑܱnŗġV¯™óaUƒƧUōŁ„Ñ™±„çɲ¥lĉkğ°ƒk¥˜ƒnğţL¯ÝÝUƽĬ΁lķ°@„ō„XÿݯV»ŹLʉÞɱŤĉó°ÝJ™¦ÝKÝ£ţܙÈĉ@ƒxǩUċƑ@ky͓¹™`U²ĉVġ»ğa¯¥ť@ĉ™‚ó@ŻÛÛJƒw¯nó¯ġWƽʩķÝɛwĉĕݼȭÞķō@ó£Å΀ƑŽ¯ôȯÞ¯Ȱ™ÆōèĉXǼó@ݚnºƒĸ„ÞVƜĸȚUʶõˀĵĖɱŎÝĖVࢰӒѢ°˘nϚVˌ™ÈmɼĵŦW¤öʊõʔ@°ÈXVŽ™ènŎȁb¯ǫĉ„±Èğ`ġwōÔğ»mVVŽ„Ý¥ó@™ĸķô@ššbX„ĶmV²²`Þ_˜˜ɴbͪÈ°„ÞWĸÈŌmބškɲŽÈUÆ»n¼ǬVķĸźô¯°n¦ɄǜÈ"],
+                  encodeOffsets: [[86986, 44534]]
+                }
+              },
+                {
+                  type: "Feature",
+                  id: "6532",
+                  properties: {
+                    name: "和田地区",
+                    cp: [81.167, 36.9855],
+                    childNum: 8
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ƨ¥šèź٨ΘƑᩄbUࢯÞĕɲōĶĕöʿVʵķșUƛƒÝ„ķm¹Þ™ô@È»ĊWŎçšÅ°ȯȰÝ°óƒÆͿĉ»̽çnƒmɱĵƧºóU™™ƽ@±wóL¯°̻L±Æ¯Vƴķb¯VÇ¥ğ²Ǖbk¥ÇKlÅɱġ@у™óK@™ÇaÝXğţxĉČǫķê¯K@уaŹ„ƑKƒ¼¯Vóaónġw™óÞéU™ġbóĉğÇl¹™aUóğKW„Vůn›ÇŋƑ›ķnʇ»óxĉw™çÇ°Åw™°ċ„XŽ™„ób±ƒkÈÇJ—ƒm²ţx@ÒݎšŦǺn„ó¼n°ÇbUÒ±¼XĸĠłƽXmwĉºƒzÈÜmnxmx²ĖmҚbnŽƧêUºĊêÆVóĖóUĉ¼ÅĬƑ°ɆƆŻŚlłÞLš¼nĠƒ¼@ޙšÞź@ŎÞ°VšɄɴжϼِ͈Ŏ„"],
+                    encodeOffsets: [[81293, 39764]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "6522",
+                  properties: {
+                    name: "哈密地区",
+                    cp: [93.7793, 42.9236],
+                    childNum: 3
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@WnŐÆĶLĢ¦ţºź„lxÅĸƽŚ‚Ʉ—Į˜è@ô²ÞUĔƐńV°¯ĸX¦Ɛm̐bƒ»Ɇa΀šĢ™ƐLˤ™ȘÑnƒІljĸÿn¯ĶaŎ¯ĢĕȘ¯°΂œla¯¥™ǕǔwˤӱlťО̻nŻmɃĕċţUw°WUóƨÅţķ°ýV±óÅǓéʉ¯ƽŁƒéōǖȁÝƏůǕw˹ǫȗǓƧǕVý™é@ĬţLƧôͩ„ɱŎɛK̏ÞɅôóK@²@°ōؚ¼lŦ¯ŰóƜÛlV¼ķ¼ƒ°kȰ™Ű„ĠƒǬ™ŚÝŎmĖ`@ÇÜn„"],
+                    encodeOffsets: [[93387, 44539]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "6529",
+                  properties: {
+                    name: "阿克苏地区",
+                    cp: [82.9797, 41.0229],
+                    childNum: 10
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@VƚxˌŎÞŎƒ°n„ȂÒ°²VĊ¯VğƾˍǬƨÞÞKÈÞĊVźôɆÞĢèŌôWČ²ŤVÞĸʶbl‚¯ôn_VÆĸlmÞnVź_ĸ¼Ȯmǖ„šéĸW°°„ĸJ„kʠ¼Æw°¤ÈƒlxɆzČºĶI²ÆǔUš°ô@Þ¦‚ƒUnUĠ¼ŎÓĢxĠ_²ÇĊƒǬ°ŽȂamōšçUÇW@¯öʓõʉX£ĶťnɻšÇUˋmϙ¯˗ӑѡᩃaΗƒœɜ°xWƴUxɃÒˣ¤Ʌwğ„ʉōóÝŹ±°ȗ@¯„ƃ²¼", "@@ō™гwȁ¥Ƨ°ŹÑķV™¼ÞêĊ»‚lĵšm¦ÅW@ĀôÈźaɜxÈbÞÆĶIОŘnIÇŃÛÝĊÑĠƏ"],
+                    encodeOffsets: [[80022, 41294], [83914, 41474]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "6543",
+                  properties: {
+                    name: "阿勒泰地区",
+                    cp: [88.2971, 47.0929],
+                    childNum: 7
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ɲˣĊIÈ¥‚ÅU±Ċýkō°ƒĉƽó»ĶƽXóʵʵ™ȯƑÅȁɅ¯ĉ@ÇሗK֛@@ˤV֜ʵрƒǬVĸƑŎ@ƆϯÑóŽķ@ʇ»ķ¦έmlÈĸĊX¼WźÛÞÝѸ‚ĢČþ„ĀĊôάVö¼ĊUƨ°°èŎČUÜƐóôVôôŽ²êȘlˌç°`n²ǬŽĊaš™ƒÛ°±kğmm»š@°ÝɆÛÅÇVaݍVm͔ğôÝÈb‚„@„ƒ™n¯š™ÜUĢÑĊ@źīżWŤÈǖWôŁÆI²ÓƨL@ŽĊX„mmÑÆ»ȰÑkƒĶō@ý°m—¯"],
+                    encodeOffsets: [[92656, 48460]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "6531",
+                  properties: {
+                    name: "喀什地区",
+                    cp: [77.168, 37.8534],
+                    childNum: 13
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@Č@°ƒĠ„ôÓô@Ŏĉ@Ƴĸ@Ť£ĢlVôWVóřXĉŤêÞ@ƐÒĢÑlèÈV@šĠIk°ÆŘ@ÈÈĀ@ǶťÒğ@š„@ÒĉlŻ_@šƧĖÅĬōÆ@bźÞnƒƒlVœÝĬšWƼʇ„ƒÝÅ@ÇÅÈwWóĉ±ğz‚ĬČƨƂÝIĉݯbÇÑĉƒ¯ʈV°xUŰĊ¤ƪ_ôÓɚI@lȚXȮ™ŎlɴȘ՘š„¦ɲÆʈ_ɴŽźŽôÞʊŎĠƒɆxˤ£ɄÑVwXƳ¯w›ɛŹ٧™çƧ¦ōƒُ͇еϻɃɳU™Ý¯@ōÝŹš™@݄»mğ™»ÝKkŁżřɅƅƒ¯ÆīĊ»ôVôĕÅUĉéV¹ƨém™anѱĕnwmwnÇۄyĉ¹ŹlŏkĵèķmōÞġKñÔċKÅèĉzƒŽ„ômxȗÿƿI@þÅČÝKÝ°@¼ÈVºš@ÅĢšÆUċłn„ÝÆǕČĵJm£ÝJ¦@ĊƒxV°ƏLċ¼ǩ™@™m@ÅĢómÇÆğ¹Çš™ÆšĖÞKšx„wô¦ÆÑÆL²ÆƾŽU„Ž±ŚÅŻĖ@ĬŤÈñ„@ǔÇx„Èǃ", "@@VÇ™ţ°ğUĠ¯mk¯ó¥ķIġÿƏbƒ„ĉa±ÒĸĀlKU„_m»nwšŽ„m@ÈŤ¦ĉbÞ°±Þżł̦°ĢŁVé"],
+                    encodeOffsets: [[76624, 39196], [81507, 40877]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "6542",
+                  properties: {
+                    name: "塔城地区",
+                    cp: [86.6272, 45.8514],
+                    childNum: 7
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ήnĸ¥ʈ¼ĸ@ôϰÒ@ƅƒōUķƑǫʶпU֛܃LګK@΋ĸ@Æ£ÞġÅĠċšLV݄»™@Å»Ýnm¯š»nŻĊ@nķŃ@¯ómóÛÝǟ¯aÝóȭ¥ƒšōUmxĉbÇї@›bUº¯X¯ÆƧbVÒĉnǕw¯°ƑŽV„—ŽÇ@kx±Uƒšɱn™ŽÅKƒ„¯ƒĠǠU°ɜL@°ƒxnĬ‚ĀŋŎÇLƒŽğšϱÞέƜkôÅĀǕłƒĸĊŤUŰĢ°„¦ȂϰÜɨ°x@°żǠÆƈČVĠ»ČL°ÇšbĊÑ̐óÞlĶwބɆVÞwǬxǪţȼÜLŐĶˢ@", "@@óKĵĀV͈ĉłƾNJÆŤƒzXl°ƒÆL²¼źŽôÈĢǔ™¦l„ô°ɜÞʊĠğŃm»ʵƳƑʝȗīV¥¯ĉ°Ñ@ŃÅI™»ĉmğn™ƒašƒċƨbš™Vğ—w›ġ¯@Uōa™ĉÝJğÑÆŎkŎÞĀlźƒ¦"],
+                    encodeOffsets: [[87593, 48184], [86884, 45760]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "6523",
+                  properties: {
+                    name: "昌吉回族自治州",
+                    cp: [89.6814, 44.4507],
+                    childNum: 7
+                  },
+                  geometry: {
+                    type: "MultiPolygon",
+                    coordinates: [["@@መL@È°ĊȂɆƒÆĊ£„ťôWÓɆbĢÅŎƒÆ¦ČÑW¥°ķU¯ƏŃVē±Ý@ó—ç˜ĭɃƾřÆķkwŹƒŤ¹ġ¥ĵKŏÅXmˍщwǓ¤Ƒ@wóōVķ£ɱšġôÛa±Òȁ„óèţIVŽƽ¼k¤ó¹ġJmx—»ÝUƒ²™@ÅƃĸǫŎ„ĊmŎǬ՘"], ["@@Þô°bÞǠôÜôn@°ĸń˜Ƕkłƒ¼UޙKğȂÆÝĢŤķ@@ΌڬL܄K@ˣȂ˭lĉńW¥ĵVÆý@ŃÞēUŃȗƅ@ŹƩǕĉ»k»Ç™VğóřX™ŻKƏŽċêȁèÛŎġƒͩń"]],
+                    encodeOffsets: [[[90113, 46080]], [[87638, 44579]]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "6530",
+                  properties: {
+                    name: "克孜勒苏柯尔克孜自治州",
+                    cp: [74.6301, 39.5233],
+                    childNum: 4
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ˎǫĠƽ°UUĉ¯±ȁÑmƒ„¯Ýōˋō™wUű»ÅƑ°ƒȘ@²¯ɳʇ`ɱŃ¥՗™ɳȗōkȭšșW@kəJóÔƩ`ĉ£Vů¯wU°ʇĊ„ÈÒ°aĊÞÞJŁċƧīĠyĊ²XôÇxÈÆÆ@„ÞʈƒÅ»™XÞīU›Ƒkm„ŹÝ@aŎÅÆīƨĕ@™ż`Ċk@љƒĠ@ŦÑ@ǵÇÿ@ÇÅŗl¯ğJ@™ÇUkçġÒƏÑÝ@ţéWĊôŚUŽóXUġkţ¤ķ@@ƴōĊó@óÔğƒ¯„ċ@@Қ¤kôˣŰ͓„k»ƒKX¯ċwƧôğɐšÒôIVƙš¯UķǬķšnŽ™¼ôb°ÒȰVVÈÞ°ƒĸó¤V¼°„V°²êƒlĢ҂Uƨ¦ôȰƴĊVV¼ǖIċĊ„ÞɜéšnČW˸Ǹša„řÈw±īšçĸ¤ĊšôšwšŽĸUĢ¦˜éǖĬ„Āô¼lÞkÒ°x°ƆÞx„šÆV²ǔ»„b°wގȘ¥°n„šŎV@°„„ʠè‚ŰȂb"],
+                    encodeOffsets: [[80269, 42396]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "6521",
+                  properties: {
+                    name: "吐鲁番地区",
+                    cp: [89.6375, 42.4127],
+                    childNum: 3
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ôK„ĉǪa²¼lÜô@ʠê°Ĭ™ôȂƒ²ÑÜbĢóɲ™ĸ¤ŎUô@xƒŽǔ£ъxˎmƒÈÛ@‚_nĕÞōšř„ǫƒğšůlȯ„¯ĸ»U»Ükôƛ°ůkť™»Ŏŗ@¯@±͓óͿ„Ǔ@ķȁ¼Ϳ@Ƒ¼¯°ólġ¯xȗUġšƑ™ǩÒƧUÝ°˹Kóššx@ǸōĬÅĬƑĠ󃄚ǔêÆ°XÒʟŤUšÇ¼ˋnn¼±V²°ȂUŌݜbʟǔɅô@żǬaҎÈ"],
+                    encodeOffsets: [[90248, 44371]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "6540",
+                  properties: {
+                    name: "伊犁哈萨克自治州",
+                    cp: [82.5513, 43.5498],
+                    childNum: 10
+                  },
+                  geometry: {
+                    type: "MultiPolygon",
+                    coordinates: [["@@ĉ„ÆŘȁ̐mÞ¯ĀX°±¼@ƾ¯ƴ°ŎÝþŋ¦WÜÞbȂĉźUœÇmwVUȂóô@ȰÝ΀nÆJn™ƾ™ʠ™ŌLČóǪ¯œ¥ǔaǖšŌaôÝĢLšx„ƒÆLšɲm„™²VlwÈ@˜Uƒƒ°¯ǖxĊmUÑƨa°Å°WV¹œa›ÇɃÈm¥°¯ŹóĸķǫUm»Å¼ÇVɱ™l݃ŋnķÇÝX¯ƒͩÇɳa——Ý`±_U±ĵnWƒ™a@™ĸóšķ™¯ǓV±ÅĵJċ¹ɅykwDŽ¯£Åxʟ»ƒlķI¯ƒX¯ķ‚™êǕƒȭnķ»Ź`±„kÞ@Žš„Ýô@Þ°xšŤŎIƨÆUxōš¯²ǔĬǬlUŚ"], ["@@ÞĀlźƒ¦¯ĸŤKޙšƒċƨbš™Vğ—w›ġ¯@ţƽJ"]],
+                    encodeOffsets: [[[82722, 44337]], [[86817, 45456]]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "6527",
+                  properties: {
+                    name: "博尔塔拉蒙古自治州",
+                    cp: [81.8481, 44.6979],
+                    childNum: 3
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ήƛϲÝĠ™„ÈKŌōÿmī„w@¯ɛKV¯ğǟ°Ƒ™wġKóÞŋbǕ™Ǔb›¦ǩ°ċôŋKʟšƽšmšÅImŽͿŽȯÞó@ȁôUVnx›ÈŹVȁĊÝabŻ£¯°l„óxȂŤĸkĊšÞyĊêĊmĢxV„ƨÈŽĠX„ŽΘÆĠÔź‚Ɇţ°LXƾŤŤb"],
+                    encodeOffsets: [[84555, 46311]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "6501",
+                  properties: {
+                    name: "乌鲁木齐市",
+                    cp: [87.9236, 43.5883],
+                    childNum: 4
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@šŽWŽôŚUĠȚl¼Ċ¼ƪǖ@źȘƆ@ýlܚXVŘޙš¦V¼kĖó҃èkĊȁˮ֜@ǫ՗nōƒĉǬō„ķÆŚ@„±ÞV˜¼nwĢIôºl£ƾ»UŤJôçšó¯īʟéó@kÛ±»ǩbƒĊóLҍÇǫb@ŻɆóʠǓ›aŋÞȁVʉłĉbĉɅô"],
+                    encodeOffsets: [[88887, 44146]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "6502",
+                  properties: {
+                    name: "克拉玛依市",
+                    cp: [85.2869, 45.5054],
+                    childNum: 2
+                  },
+                  geometry: {
+                    type: "MultiPolygon",
+                    coordinates: [["@@ɜÞʊĊýVaŃm»ʵƳƑʝȗīV¥¯ĉ°Ñ@ŃÅI™»ĉmğn™ƒaݚţL°ķóKĵĀV͈ĉłƾNJÆŤƒzXl°ƒÆL²¼źŽôÈĢǔ™¦l„ô°"], ["@@ƾIŤ@UUwōa™ĉÝJğÑÆŎkŎ"]],
+                    encodeOffsets: [[[87424, 47245]], [[86817, 45456]]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "659002",
+                  properties: {
+                    name: "阿拉尔市",
+                    cp: [81.2769, 40.6549],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@nIÇŃÛÝĊÑĠƏō™гwȁ¥Ƨ°ŹÑķV™¼ÞêĊ»‚lĵšm¦ÅW@ĀôÈźaɜxÈbÞÆĶIОŘ"],
+                    encodeOffsets: [[83824, 41929]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "659003",
+                  properties: {
+                    name: "图木舒克市",
+                    cp: [79.1345, 39.8749],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@VéVÇ™ţ°ğUĠ¯mk¯ó¥ķIġÿƏbƒ„ĉa±ÒĸĀlKU„_m»nwšŽ„m@ÈŤ¦ĉbÞ°±Þżł̦°ĢŁ"],
+                    encodeOffsets: [[81496, 40962]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "659004",
+                  properties: {
+                    name: "五家渠市",
+                    cp: [87.5391, 44.3024],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@„çôÑlĕU»™¥ÝšUŗ™WkÛ@þVńÝĔ@ńÅþĶUX¦Æƒ"],
+                    encodeOffsets: [[89674, 45636]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "659001",
+                  properties: {
+                    name: "石河子市",
+                    cp: [86.0229, 44.2914],
+                    childNum: 1
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@lŁ—ǵm‚ĉ@mż™¼n°ÞmƼš@"],
+                    encodeOffsets: [[88178, 45529]]
+                  }
+                }],
+              UTF8Encoding: !0
+            }
+          }),
+      i("echarts/util/mapData/geoJson/xi_zang_geo", [],
+          function() {
+            return {
+              type: "FeatureCollection",
+              features: [{
+                type: "Feature",
+                id: "5424",
+                properties: {
+                  name: "那曲地区",
+                  cp: [88.1982, 33.3215],
+                  childNum: 10
+                },
+                geometry: {
+                  type: "Polygon",
+                  coordinates: ["@@ƨʔĸbܺÞwnxźbÞ°ô@„ĶŽĸIȼĊJŎÈôUšÝƒ¤ǔLސŎ@ĢŽȘblƒôL„ÇźçȤôLš¥ÞIÞ¯Ķxʊťƨ™ƿÑĉXVķŦ¯ȂKÇǕšÑ¯IUš£¯Óƿ£VĕōÞÿÆwƒƑ„£ǖxÞĕ±ÇÝaUÑȃU¯‚UōÈ݃wWŁĵ™±Ý„óĢÿ°IÞ±mÅĢ¯mÿ„¥°UnÑŤĢĕĶwǬŻͪwŎ¼źÇĢ„ĠĕˎŁ°óƨ¼Èa‚m@¥°wǔ„ǖ°ŽƨÇŤœšġƨ„ŎŃôbÈÛŎĊ°@Ġw²ÑÞJƃÆb²ƒ°êĊUނlȲƒV„ÈKĊÒĸĉ›»ÅôťUÅǃk¯@ǂÑklǁÅl™Ģ™VÑóƒ@°@„ÛĸƒV¯ƒÇĊ™n¯Uĕšƽ¯m›¯b™È@Ò°Ĭƒbĵ›¼„‚kxķýÇJk£ÝaUÑÅóĶǟkÓʉnĉƒÝ¼Ƒ„ó»Þmn£m™Č¯@ƒȮÿV¯ĸƒ™k@Ýówƒ»ğ„ġ±ǓLō„ƒšV¼Əèķĉ™è±b@Òţ„UÑóakƒl£™Ó@¯L@™ÇlUóȁš¯aġÈÅĕÝLķ¯Ė¯@WĬ—x‚ÒÈnW°ţôU²ǓÓġ²V°¯ôƒǔÝL—ċšk™š»Ý»Ýš¯ÞƒVƒwۄÝÇōͩÈĉċ»ĉm¯£W¥ţKkóġƏW@¯±kōŽÈ›b@җšÇaƒÆ¯a™„ƒkóŽÛƒÇ¦Ýa¯šÝ™ĉ@ǻۄmƒǓxķƛ¯lVĀÅÞġb™™ÇJUÅV™ĖƑW™zō»ōšƒW™n@è¯ÞóVkwƩnkźÇބҙޯƒƒýğÇUxÆÈnè±bĉÝ»ÈуwšwÞ@m»ÈV@ýÇ°ķ™xƒa„ݯXċ¥ƒÈóW@ôkxlnxVÈóĊkŤġ¼@°¯ŰƑL̻۱ŎÝV—Þ›VƒÇÞŎÇakƞ‚š@èğŎĸżšƾ°ÒšLÞôĠKȰĖźVÈÒĠ„¤™VôšŽU„ÈþťL@ôǬÞlÜÈnÇÒUŚ™@šĊƨW°™°Xƒ‚@ČÇþ„ƴĉÒķ¦@ŽĢôWĀôłUÞĢǬ™ź°¼š@ƒôV°„bUÆnzm¤ƽĸƒÈ"],
+                  encodeOffsets: [[88133, 36721]]
+                }
+              },
+                {
+                  type: "Feature",
+                  id: "5425",
+                  properties: {
+                    name: "阿里地区",
+                    cp: [82.3645, 32.7667],
+                    childNum: 7
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@„Çƾķn£myVŃaU¯„ó™@¯»šŹġǫVÝóŁXÿġó@ĸ¥ĊуƳÈý@ċ„Wš¯X¯ĉƧ‚™š@VřÈÑÇmkÛǫÝ@óŦKÇýVƒ™U󚏃£ğÇÑŹUȯĕğLÝó™K¯Ñ™ƽķŻĠō@灙lƝÈbƍÈ݂„œU˜ÝÞU²ō̼ůƒK°ů@¯UK±—ĊƧbōÇmçÈġƒóšÅób™™źóš¥kīƯól™ç™KôĵUƒÅ„VŃķ¥nÅŏm¯¹Å‚™»@ÑǍóxÝkʇȤU¤ķb@ƒ¯ĊÇx¯ĸĉKm°šĀk¦l„„KnĬȀƾÛ¦WÆŐmNJĉ°ōUţ¤UšŎ°šŎKÞłÆ„Ǔ¦ƒÞ™‚™„ř¯bmUÝl¯Um™ğl¯£șwŎǫaÝnĉĶƒk@¯™K™šō»ĉn™aÞ»ťnkml™ĸ¥UŚŻkÑťƒĉV™ôó°LôīĠU„ÿĉǕÅz±Kƒ¤„²ō¤¯Ė¯UÝ¥Vĵ™óÈťÝwķșÑk¤ó„™ƒWýĵĕ™„VĠƒV󍃎Ǔ„ķ°k±VU±ţ¦UǟÝřJVљ¥XUċUŎlÛƆǕÆȗƆ¯wŏÞÅ@™šĉl݁óŽƒÒ™nUôńlxólÝôێ±™™LÛôÝL@‚ġ¯X¯ÇUżóa󤛼XÒġŎóLk¦‚ôżĸĠ™¼™KġƆô¦„ÆƑÔĉĶ¯ImÒ°¦n°¯Þl˜ÝČn„ƒÒšKĠޚĕkƒlýƾťœšôI‚ĖŤÒnƜm¼¯lnżóÞ@Ůó¦™ôƽĖċŚn°Ý°ôÈUƜƒblÞóŽ@Žǖô°UÈƆ°X„þôŽô‚lѢšŽ²Ėm¦°š@¤™XŽĊblܚzkºƒĖmX„šŎWVšóÞn°lĠxȚa°»żLźƒ„b@Æ°XĠÝȚxĊĕŤaȚ‚°È@„„@èŤ¦Ü¼œW˜ÞkŽÈ@V°lŤkŎ±²¦ƐUšlj°aÈÑŎbĢƒŎbÆ¥ÞIȘlššôVÈU‚™šb„kɲĶn„mnXb̼òƾĖŎ@ĢȂÑôÓĠĖʊšĊÔ"],
+                    encodeOffsets: [[88133, 36721]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "5423",
+                  properties: {
+                    name: "日喀则地区",
+                    cp: [86.2427, 29.5093],
+                    childNum: 18
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ĶĖXþš„ôƒl£šÒĸÇÞxÇŦšôUĶÞ¦°V°ĕŎ£ƒ±„£²LÆyĊǖƒĀğVóĬ¯KóôUš‚ĊŦ„lҙżVÆķ¦kšlnŦmݼšbĊmŎ¼š™šL@°„lĊĵÞmǬbƍȚx°¤Ġknš°VÞkVn°aƒŚš‚š„Ýǔ¥ÅƒÝŁōL¯™ōV™Ť£ŎVĊ¯nljƏXÅÜ¥ǿƽmīƒLkƒl¥™ÿn¯ĊL°ķÈw°ĉ@ƑĸaV£ʈȣÞlôwȎ@Қ¼Æ°ºŐnmÆĸ¦UńƃV„óĶšLšèôkÅ°lĬ™¦Źôššôa™Æ„ôÇĢnèŎÈƨa˜ĉ²‚VLĢ»lţôĉUǂwkmlw@óôX„ÇȦ°WƒÞ„b‚wĸšÈ¯@þÇUn¼Ý@™x„xÇńÞ¼ĊŽ²amçÅÇVwĠȄþ°„šÝƒÑÈÝlŹƪmlxôU°Ý@çšm„XŎ™Ŏ¼šyƒXšĕÆUVÈIššĢaÆÝUÿ°kĸƜǔwn„܃ȼĊ@ޚ°™Þbȥ܄ô„lšƒ°b„ÅÈb˜™@ќa‚ǯUU¯Vġš»ƒ™¯aV¯Ç°Å™mnÑŤçǬVǬ™±ĉ¯¥Vĕ¯Ýk£˜ō—w@±ġÛ°ÇVїƒ@ۘa@ČL™Ƴ™„ƒÇa¯¤ÝIĵ¼U¥ƿōķÅţŻókÝóĕ‚¥¯™U»Æ£X¯ġŃÛkÝ°V°ó¼¯èWôÞĖ„ȎƒŽkĀƧĀówm¥¯JŹÝJݙōVVŁaݐƑ@ƒ˜ğŭǂ¯_ƒ˜ĵ—›VnxŃón›ƒĵxÇĖĉVÝÈğV™Ò󃯐±Żĉ£ķÆÅL™Ljĉý˜ţۃ¯VƒnV¤ÝÈ@°ÅÞݤ™ŰğŁm¦ÝxóKƒ¥ɱÈUĠôêVôÛ¼ÇWÝçĵaō¦óĖƧlÇĢƑŽnŎDŽV¼¼‚ºÛ@m¦ƽ„ĉmm¯ÝKÛç¯bŏłĬ™bƒ¼ÅLmŽ„xť°ÅU™šÝXkŽÝmĉ¦W„¯K„ÒknÝaV„Ýè¯KɅńÝKnÞ¯¼"],
+                    encodeOffsets: [[84117, 30927]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "5426",
+                  properties: {
+                    name: "林芝地区",
+                    cp: [95.4602, 29.1138],
+                    childNum: 7
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@‚VÈłVôÈk@š°K@ŽšÔk¤l„ôbVÒŤƒ@ѲašçĸĊƐçU»„™ŎƒǔKĢ²Ġƒ„¼ôx@ޚlƨĬ„Ul¯ÈLV‚šÞJ„°Ünʊ„wÜbXê‚VÞ¯°ššanaU°wƼɴÑWÑ°mÈýÈam¥Þ£Ť@„¥ôblÞĢ„ź¥ôxÈÅmݚ™ƒĕŃV»ĉōŤōnóƒ»ÈīķIUƒĠÑ°ġĸLÞ¯VÒƂ@Ābš¼WôÈ@V¼ôóŤKÈÑU»šwVǫżnWÒÈx™¼‚lŦ£ĊōŤx²¯@ƒÆƒU¯šçÆ@„¤°£„é°k°lšůÈó@¯ŤÇÈĉƒkkÿó¥ÝXķљÜ@ÒóŚÝ¯°ĉówÇ±¦ÅJUÒĉĀķw¯°mĖ¯„±akxÝÅnƒ™»lуK@¯lU™¯UVѯóĊ¯mōğVǓƅƒÞƒWÝÈÛ@ƿô¯ÜġzÅþ¯ólmôʇġĊÅUͿřŏȁˋŁóÇˡōƧƒÇb™w°Ķôk¦šÒƒnUþġҙÔkǔķèó@ƒ²@ŘōńĵyƒzġaݤÅIƒ¤Ƀť¦ğѯ¤ķbóš¯ó±ŽU²°¤ČÜVnÈƂ„ŚŎ°ôĢ„þÆzèVĀǎĀǘƒXŹÑ¯¤ówċķk¦šłUÒġzÇ@ƒ™ÆÝx@²Þ@Ƥ„Uô¦Uš°x„U"],
+                    encodeOffsets: [[94737, 30809]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "5421",
+                  properties: {
+                    name: "昌都地区",
+                    cp: [97.0203, 30.7068],
+                    childNum: 11
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@™ŽVĖm°ĉš„ÈU°ķ„ƒÜ¯@@ô„UÒġškš‚ÆkÈlŽÒ@Èl°È„VÆóŦƂœ¼‚a„ÅĢ™Ʉwnōw@¥Ŏ¦°ŹÞmVš°wnÿƒw„wÝw@¯šmÞŗ°wĠ˜ĸkÞğlĔ²¦°@„ĕĸwVóšal@nĢÇĊn°@¦šŽźUXçǔůĸVš™ÆK„ÈÝĠš²ÅĔô@lšŽÈ_m˜„zǖl„šaU¼ôwV°¯¦‚ĬÈa„l@Čǎ„¼™„nŽ˜I„xô»ɜ@ƨ¥ɆŁ„ŃǪȁkƛƨȍʊȡóĭ›@—ÈÇVƒůރĸƅmēƨť™ÅÈʉVǵ°ġVŭÅɧ°ÿnɛš£mƒķ²ŃóÑUĉ°mÇ»¯@mxUĀ¯èţ°ȁÝç„ġU¯ÆÇţÈ@°Çô™Ű¯k¯lƒê¯¤ƒ£Å@™èV°Å„@„±°ţwĉŎť¤kš»ÇwXÑŻmUǬ™xV¼ÇÒţLóôU»Ç@X󙻂a@ÿŁUÑÝ°ķK¯ĢğÒV„ĸJÇĬ„¼môţŎĊŎU¼Æ„„Ė™šnÞÇÆówŹ¦ġƒkÝóaƒ¦ţ@ݤn¦ÇbÇþ¯nXÒɳÒÅ»¯xVmb™b¯™Ý°UWéÛaƒxʉÛmƒ¯ÝI™‚UÇKk°ƒVƧīķ„U°ȭĀ@„ċ°nšm¤Ýnô¼ƒƒÞ»Ċ„ʊmlÔĵǠÆôVÒÞbl¤ÈIĸþlwƒœ»ĶŽ„a¯ī@њǰanœƾ°"],
+                    encodeOffsets: [[97302, 31917]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "5422",
+                  properties: {
+                    name: "山南地区",
+                    cp: [92.2083, 28.3392],
+                    childNum: 12
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@°ÞUĖ°¦²ĊôÇÜLǖĀɜŽȘŰÞLĸźêÞ@UÜUŤ°ɞ¯Ü„°WŦĀmŎ„¦ĢyVљŁl¥Čĸôx°£źÒ„Wȗ‚ÿȍUÿ‚çÅyƒýóġō¯ƒřŁmÇÛUċŽ¯£V±²°ôô™ĸa°£ĠÒŦ¥ɄŽ„£ÆJÞ£Ģb„yĶzŎŃ@ŗ„±ô@ĸçlǓšÓĢÑVý„m™Ñl¥ĵó‚¯̻̥™ƛǫÝһÇƧĉyţ¼ҍēVĶĉŎ°ĸmšÞVÝĸ™ÒÛaċ„ó™ŹĖƒèÈÈl¼k¤ÝX@`ސŏ¼Æō¼ÇçĉKUÝÝ£ğ¤@¦ġl¯Òġĉ¯óš™móxÝÞğVšƴċK@—b@ܘ„UÒ¯ÈĢÜ@²˜x—Ŏl¤"],
+                    encodeOffsets: [[92363, 29672]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "5401",
+                  properties: {
+                    name: "拉萨市",
+                    cp: [91.1865, 30.1465],
+                    childNum: 8
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@Ŏ²l@°‚XĢƐlôŤLX¦°¤ĊnČ¼ÇĊŎͪÞÈ܃„x„U°Ýޙ޼™¼lšČ™˜ŽÞK„Ǔ°óU¯Ģ±ǔÔV±ŤóX¯ÇmÑ˜wXī°@°ĕĸÞKÆĖĢÇ°bȂ™ÇŁUƒV¯wV™ó¥ƒVÅ£Ý@@±ÞwšÅ‚„È@ƒ¥nōťÿ¯Xۃɝ°ţ¯ÛVVÝ@ŹéķÝKȗůɛǕÿÛKóÈǫšǫUţèmҚn¯Æ°ÈU‚°b„š™¼UĢV°°V"],
+                    encodeOffsets: [[92059, 30696]]
+                  }
+                }],
+              UTF8Encoding: !0
+            }
+          }),
+      i("echarts/util/mapData/geoJson/yun_nan_geo", [],
+          function() {
+            return {
+              type: "FeatureCollection",
+              features: [{
+                type: "Feature",
+                id: "5308",
+                properties: {
+                  name: "普洱市",
+                  cp: [100.7446, 23.4229],
+                  childNum: 10
+                },
+                geometry: {
+                  type: "Polygon",
+                  coordinates: ["@@U‚ô²‚a@Ž²²Ķ¥œV°šĶ²bl¤kVxl‚@œ°‚Ś²@˜„„y„@ô¦¯„@xƒxVxU„VššbVšÜm¼Ŏ„„ĢmºXXWÆ@ĀœšmŽmXU°ÅÒm¼Þx°w„@°‚XêĠ°»nV°U„l@k„@V±ôī@£‚ƒČŃÆ£„KÞý@¥‚k@y„a@—nWV„UVƒšwƒmƒ£Jƒknm@wmkn‚X„˜šX„¥mUUlUnbš¯°ŽnkƒVInlIUw°n™mk@@mlanXlanmšk@wVWUw™_@éĠašnmUaÜ£ƒmXƒ¥¯@@„óUmݯ¯ÞÝlKnxô£š»„»Ġ„J°aV„UÝÿV¥ÛbƒI@wmŽón¯yÛL@ƒWkŎmș`IWa¯K@¯mUnmaXm™bmak„¯ŽƒĢ™ÒÝm¯mV¯KÇb¯KۜWW™X@a™V™knċLUWV™kXóW@k™a@ƒób¯Uƒwmb¥UUlaU¥U£maķšƒKXkƒmÝ@kwmѯk±ċbUUVakaġ¦ƒƒkL@`ƒœ™a¯xƒm™Åƒ™LUWƒ@ċnŎUV°LkL@b°°@¤š²ƒ‚šnôôk„l°kè›ÒÈzV¤È„WôôƒnV@„ƒ¦@¼Ux"],
+                  encodeOffsets: [[101903, 23637]]
+                }
+              },
+                {
+                  type: "Feature",
+                  id: "5325",
+                  properties: {
+                    name: "红河哈尼族彝族自治州",
+                    cp: [103.0408, 23.6041],
+                    childNum: 13
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@°°nÞôV@ƒ°@„¦WŽ„nÛ¤Vbmn™ğb@êš`VxUX@xš„ƏÞUnn˜WÞĸĢƒšÈ@ŽÇè@zÛÜWšÅêlš²„˜KnV¯ĖĊx@bk@@„°JÆ£Èbl„nnm°nlUkVUUwVm„Kn„‚nVŽÞxVLX¥laX@@xl@VzȎVmšk@b°šÈĸmŽV¦`W„XšƒbUb‚bX¼°x@ašVVkn@lþnXUlVxŤÅ„y‚IUƒka‚IŎĊ@lXx@b„z@‚ô„ƒ¥„_V@l‚n@„ôy@al_l`nmƒÈ»@kƒmXwWK™U¯»™a™Å@wƒmUÝKUa™UUƒ™wWƒ@w²»@kƃV£—mm£VKkÑV@@»nwƒ¥™ƒ@kƙnllIVlnLVakalknJšWmnaUaVÑVVލn¥m@ƒ„¯Uÿl™@™™™VçƒaXaV¯UyVLVkš@nJlšXLlŽkxlbla²Òl@nVJVkšx„KlkUaVķÝÑU@Åm¯@±™Uó°ğńķĠmU™Ñ@ǯ¯Å¼@nml@°¯¯`@w™£@¯Çƒk@ƒ»nmċ¯U»™I™Ž¯LÇĶÛn@bó°™U›šwmŽ¯„™Umǯa„™ƒ™ƒI@ykIƒVUŽ¯bƒIğŽƒ¼™¼ó¤mwkLÝÞ"],
+                    encodeOffsets: [[104243, 23429]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "5326",
+                  properties: {
+                    name: "文山壮族苗族自治州",
+                    cp: [104.8865, 23.5712],
+                    childNum: 8
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@šwô„š@²¯maUmôUÆxš@Xš˜bÞInlVUVw„JVaU„K°¥„xmÞXnlKlnna°@ĊČ„ÆwUmnkl@°ƒƒ£nyn@VV@Vak™ƒ@@kÞ݄bmx°Vnw°klÞInĖÞVlKl™@Xa°„„KlV„U@šJnx‚U@ÈĢbUKlm@ak_‚wšanWUk°ƒl»„k@Wk@lwU_ƒ@UalóU¥ƒÇnƒ™kJWƒ@mVXx±bƒK@nV±a@™Åa™£ÝK²ƒWknamKknǏk¯ƒaV™™V¯ĀƒU™„™Ò¥ƒI@mm¯¯xōW@@`k@ó»ƒUU¯lm£ÅWlĵ„w@mmwÅmWU@y±U—xmwU„¯Uƒ¥Ý¥¯£m@kŽÇVUV°VbklƒL™wUlUIm‚k@±ÑkbkalwkWKk™mI™@UlUKVzU°Wb„bU蚚@škšVĀƒ°@„n‚m¦ÝŽUUUÒVbmbXn™‚mIkllbUbmKUkkJmkŚ@lš„„¦mx@¼U@lÒULn¤˜nU¤Å„@l±¼@xX„šxV„šVVbÞLVŽ„n@xšÆšb°¼šV"],
+                    encodeOffsets: [[106504, 25037]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "5303",
+                  properties: {
+                    name: "曲靖市",
+                    cp: [103.9417, 25.7025],
+                    childNum: 9
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ȦlKÞĕUV¯Um¯„ÇVUnVVUƒĉn™ĊÇƾLn°°È„JÆw„@lbÞa„¦V„XJ°¯W¯„aÞJVkUša„ƒ@lKnÅmWUk¯a¯»@m±@уkkbWWX_WÓU»_l™kÑm@U»m@l@IWċn¯l@VanV„UV™UVwVx„KȄVmUē‚@„ƒn@VÝÆL„w„VVwnVlmkUVÑÇ°ka@k™ÿÝaÞUl£™›—ċĕX±±ĉƒa@UnVnalónk@wl™UVmkÝJ—aW™™@ÅwóVVnnb±°™@óƒ™xXLWx„n@lǼn„m‚k_k`@bózƒ‚m@kU@ƒ`„¦óƒ@nWš@ÜÅXWw@ƒyƒb¦@ÒlnUb@x™lܐk‚@²Ç@Uƒ¯bmy@kV@bƒb„¦U`lLVx@b—Ll¼Þ¤@„°VVބU@WސUb›J@nnš@lnnm„šxUŽƒUUbƒK@šÇwklkUƒVWakn@ŽlbU@@„ULVxkKUn‚°¯Ò@¼™„kmƒ¦m@kl™Ȱ@lU„l¦„@Vl°wšnnþĊUÆbUx™b„ŽV„šĖU°„a‚nnašV„al@@b"],
+                    encodeOffsets: [[106099, 27653]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "5323",
+                  properties: {
+                    name: "楚雄彝族自治州",
+                    cp: [101.6016, 25.3619],
+                    childNum: 10
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@mҁXU`Wnšš™@Xl±¦š„Uxnbl°knmKUx„„ƒxVôUx°¼ôÒȄ°JlnÞKĠœW°¦ƒ„Vx²JVwš_°¥@UV@@wnymknK¯I@‚™²b°ƒš£V¥šwU‚V„¤nLškÆJÈwôô°„l»Č¯ƒġVƒUU@@ƒ°ƒƒÝXl@U»°Å„@U„¯@w±¯VmUUlm@m™„ÑnIVyUwmak£Vwm±—@Çw@nƒ@UxkwlÇnL‚mkř@±Žk™ka@kóJV¯Ç»U£lw¯™Xalbl¥¯UXƒ@a˜™UaÈL@ÇVIVƒkaU¯mm™akLWkUJ¯Umxnšƒ@ƒkUx¯xƒ„mWÅīÝkkbƒŤƒbkxWmXwWk¯wƒKkƒƒLŤċń„@¤óĬU²ƒ@@lƒk¯VmU¯¼@xV@k°l°kbUš°nm‚VnUš@°„š„UVèރÆbUÒÞnU¦›V—¼lô„@Vl"],
+                    encodeOffsets: [[103433, 26196]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "5329",
+                  properties: {
+                    name: "大理白族自治州",
+                    cp: [99.9536, 25.6805],
+                    childNum: 12
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@lbœKVIUa˜@²m@b™xôÒÜxXLmbnšl@š„„K°šš¼k„Uô‚xôlV¦nJ„Uš™Ænšm„@šx„ÆwšbXšÆôô„LUVwôK@wlmšaVwœ@WknmƒIUmlnJla@_™@kÝmKUašÑm¯Xw°aUaVl»²JV„bÆJkôĶĀ²VVk„mšbVwUó„wƒƒVwnLlmk¯maVw™ƒ²¥Wkš@™™XmV_‚WnÑUkƒ@k󘻜UV¥ÝmVÑÅa݄UçƒVƒ™@¯V™Umn¯mV™lak¯l¯U@@wğŽW鯁ƒ@¯xÝw¯š¯Jċa¯U¥mLU¤„bÞȤƒbÇLWUwmIUVW¼kbš`U„Vb¯L±ĊÛkƒÿÝKkwƒKţê™UĉþƒÈƒV¯ÞVbUŽ°KVšk²Ý‚mI—ƒmV@kƒm™UkšVxm„¯KXÈķJU¦V°ULWxšL@môƒšb@bkx±LnVUŽVLnkÜWnwlLŃmW@kkJU_ƒV„šWĊ„Þ"],
+                    encodeOffsets: [[101408, 26770]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "5309",
+                  properties: {
+                    name: "临沧市",
+                    cp: [99.613, 24.0546],
+                    childNum: 8
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@‚xĢ„l`²X°ŽV„šx@x°Þ°KXašğUњW‚bnIl`X²°b„xl°„„šV@xVxk¦mb„l@xšXV‚ÆzX¤™Æ˜k°„kx@lźêlaX»VUnJVx‚XÈK„aÝȣƒaV£nKV¦°‚Čb°I°™n»ÆÑV¯nWn›™@ÿXÅWWn¹ƒġōƒn»‚ÛU™™aU™VƒUw„w@w°ƒó¥ƒ@ƒz—ƒ±@ř›¯@kUwlk£±aĵŽ¯™›Uĵ¦±±@bó±VÝ@ó¤ƒw¯I@mńóm±XŽ¯IólƒK@š°Ullb™zkKlln@@ԙºƒUmVk²ôҙx™ŎUVóLƒb„ŽmÈnŽmbnl‚a„x@z„@Ǝ„¦kš"],
+                    encodeOffsets: [[101251, 24734]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "5334",
+                  properties: {
+                    name: "迪庆藏族自治州",
+                    cp: [99.4592, 27.9327],
+                    childNum: 3
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@W™Xwƒ™@akk@y›—k°īX¥›Uóķ¯w@n»UaVaUۃ¯ƒmV¼k‚™Þċô@n¯xÛÒm„V‚¯Ô@xƒ‚@šk™wm™Åa@ƒUa‚݁¯VŃyV„a@ÿšn»ÝVmank™mmÞÅôƒ@n£±›ğzÇmU¦™Vm„nÜmbn@°nV@xmzÅ@mºV¦k°ln¤š¼õô„n@xkƃIUxUš@Ťƒ¦VšmVkmkXW¤XzVx@ƚx™¼ƒÞ¯b@lVš™ĸގV„m¼XŽm¦V„ŽÞ@Ǝš¹Vón¥ÆKn„‚KX¯x@èĊȱłXšaÆxnlV@UÛlȻkğV¥„m²ljmÅÞĕƒƛm°„ÆmX¤mznƃŽV¦ÞVVb°bnÞWbnŽ°l@V„È@„‚VĵĊ±@ó„InxÆw„¥@£Þ›W¯ĸ£UƒUK‚ƒk±akkkbmWmÈķ„aÆÇU—ȃÆW@wmknmU¯"],
+                    encodeOffsets: [[102702, 28401]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "5306",
+                  properties: {
+                    name: "昭通市",
+                    cp: [104.0955, 27.6031],
+                    childNum: 11
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@mƒnK@wmƒUř¥mšóXǓŏmX@Ž—VƒmL@xţ™nk@mlUšŻÒğŋ@ƒL@mmLkm™š@b™XŎW¼ka¯lÇŹ¯aÇ»™ÝÝ_@m„@@a™@UklwUm@ak@ƒb™UmbmƒbV¯™ĕUƒƒšaVwÅaĉVmý™m¯xUkƒ@k¥VƒUXƒ¤VÈm`@„—ńÇÜ@Ākn‚ĔkƞÆĠ„™Þš‚U„VôƆÞI@ŽUxƦn„l@ĊĊnxUÒ°¦Vb¯WUnWŽIml@xn„Ubô¤‚¼ÈxlI„»šKVš„@ÈԂJkšUĖ±ÆVb@nœ„VÜVUVƒšL„wĠl„kn„Ġ@nx°¥Æ„²mUwƒ@m™mÅUl¯UњÑUm„Lll„Il±š@VkwƒW@w°@U»™kUóI°ƒ„»ĢтL„™š`nUĠ²lm„bôV@n„JUxƦX¦l@š‚ŎUƒV„@lV„KVřV£UaÞU™ƒnW@¯VU@ó™"],
+                    encodeOffsets: [[107787, 28244]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "5301",
+                  properties: {
+                    name: "昆明市",
+                    cp: [102.9199, 25.4663],
+                    childNum: 11
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@n@Vk‚VUn²°@xƒ°Vƒ@¯ÆV¼k@WŽ„Þ¯„@„@‚VVU„„Ģċ°k¼V„Ċxœ¤Ōœx°mVkƒÑȏšL‚°„x°Xœ°VmĊLVxUĖ°bX¦VW@kšȯlkn@„¥lnšƒ@»°Ñ¯VmlLUwVK@ƒV@ka@lmXb„UlVlkÈx@™„LVa„VV™wnƒmm@km™@mœIVaݏ@XƒVUݯU@ƒÝ£k»˜K@aUwkKV_ƒ¥„a@alU@nz°aV„È@@±lÛšk@wVakm@т¥„a„z‚@XxÆW@ÛX™@m@ƒy@aWw@kōĉJlbV„JƒzţÆUwVkmWkým@Ul™U@b¯wVºƒU™VUêšĠƒXUaUbVĊUŽWXUmkK™™WnUUU™V™ƒƒVV™Ý@kk±‚™¯ƒƒLkƒš±WkXlVklƒ@ƒwXbmLƒ›VUIVmk@Ubma@kkaVKUƒ™kmlXLWn™J¯ÒĊ°@zkºlLUŤn@@n›ô@lƁnmKkÈlxVw„@@mÈx˜@n²Uxl¤nbVxUzmJƒÒnš"],
+                    encodeOffsets: [[104828, 25999]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "5307",
+                  properties: {
+                    name: "丽江市",
+                    cp: [100.448, 26.955],
+                    childNum: 5
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@l@™„@w°ÓUnƒÜÑ°w@mČóšÝlU»n°„„VÜUbVbm¼@Ž°xôĸœVW¦¯Ĭlœ˜@zll@b„šWxXš‚a„X@ÆĠÆaXwl@XaƦn¼˜Jn@mnKW¯È»V¯°ak™VanXVwl@VyUĕVU„bÈīlaUk°ƒk¯lƒ²V˜Ukƛô@ƒ„I@mVwĊa„™ƒVaka„™ÆbUŽVLšaXIWKUw™ƒ„aWÑÅKUaVk°ƒ@Uw„ƒ¯¥›XğÝLkm¯Iǃóѯ»™aƒnUl±UĵÿlóÅIƒaU‚±Ik¼UŽVb¯bWxn°™ÒVbnLlޚ@@`kbmIkŽVn„JmnXl›@Ux™bkn@xóLUxVŽƒKóóŐW™™aÅxƒŽ™wƒ@™nÅm™šƒV™„ƒôX„ƒLlVU¤ƒb¦m¼™Ž@ĀƒbU‚„zUƂ°ÞVb@„Æbnššx"],
+                    encodeOffsets: [[101937, 28227]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "5328",
+                  properties: {
+                    name: "西双版纳傣族自治州",
+                    cp: [100.8984, 21.8628],
+                    childNum: 3
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@l²°ŽnÒlxÞ@„nWl„Lĸ™nbV¤V¦kbVV‚¦na„x°Vôa@„šb@lôXlWUšVXČKlmššU@bšWXXܛ°LÈa°LnU°‚ÞnšÑ„ġ°lƒnbšaƒ¯¯KWƒœó@kmK@UšĉV@k°„VV¹„a@y‚_ċl_nÓlL@anI@ƒóWl£VU—ƒl™kĕl™šKVw„U@™kVƒam¯ÅL@bƒ‚Ýk@Vn„UbÇbÝwÅ@ċ¥¯lk‚¼ÅŽ™Ò°b@¦nlUn@ŽÇV„mƁbWôU@ÝÅōm™¯ƒaU™™mk™WWw—@±ƒ™n¯U™è™a™Lƒ¯mƒL™škwƒl@°mnÈÒ¯šów@V™xƒĀU¤°Įƒ°Xl"],
+                    encodeOffsets: [[102376, 22579]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "5305",
+                  properties: {
+                    name: "保山市",
+                    cp: [99.0637, 24.9884],
+                    childNum: 5
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@X°„Il‚@¦ƒŽÈ¼m¼ÞaÞÅl„ÈxV¼šlVôÈÆlLޣȺlkUƒ‚ƒUw„¯UĕVwĊ@n¦mlnVĸIWÇ°LnƒUwl™šV„n@lnU˜„nJށl±U™¯LVUa°Ý„U„ÇĊýšVŤé„LlxÞL„ĀÜl²ĉ°KUaVƒ™_Źé@klw¯ƒlÅ—šW£ÅyU™W@wƒknal¥Uw@w™Uƒƒk¯ƒw¯aW±k_mJa™XVҙĠWb¯L¯Ý@w™wUƒ¯±Wk_ġƒwƒwōKmb@¤„bk°lĖƒô„UJƒšVnÅlťUš¯°VbnbWxX„m„ÞššWUĀ™L™yWzÛKmbUxVKkn݃kŽVšĀċ¤Ux„@Ž¯Žm@ƒ¦"],
+                    encodeOffsets: [[100440, 25943]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "5304",
+                  properties: {
+                    name: "玉溪市",
+                    cp: [101.9312, 23.8898],
+                    childNum: 9
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@l„„L°xXlWxXnlw„a„ţlaÞlÆĬnX„ƒ°wVw„l„@m™nw°VVIXllKšbnnV°lbU„UJ@ÈÇKVb—š@bW„°Vk¦kaWb°škxV¤È¼U°ôI@llblš²š@‚@œó@mm@VţkKl¹@yĉ¯°ÑšIXmWKnkšlV„ULlb@lnbVal@UnVJœU‚„nKWa„x„@lkkUlW²X„™‚l„K°„šl²@lšÞUŽ„U‚„UšVšVVXmššlLVnXWVUĉVaVb„W™ğVéšU„VU¹W»aVa„aW™Xƒ‚_U¥nÇķ¯™@a™lUnǍUyk@@wW@kbW¦UKÝwUmmƒƒLUnVxUVVlk¯mmnƒmkÇaŤ¯I@ƒl@@aĉw°ĕmU—L±ƒk™ÆéX™ÜÛ@yÈç@™Çġ„Ýķ—XmmÝVՙƒ™lmnkbmWkb@nl@nŽmš¯VxkJmUJ„ml¯™°makVVnVƒ¦™Wƒ—Wmnl@xmn„l‚I„¤„n™xU„ƒVUŽmX@˜ƒb@zl@¦Ýþ"],
+                    encodeOffsets: [[103703, 24874]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "5333",
+                  properties: {
+                    name: "怒江傈僳族自治州",
+                    cp: [99.1516, 26.5594],
+                    childNum: 4
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@WyX£lWlnnUU™„¥@ţV™Vw„JlÅ@wƒmö󙻂£kml¯U¥n¹Æ@ny@wmU@¯mnamÛnƒšUV¥ÈnĠy²œm¤„@ÆónݚnmlnbÞU‚¥„aV£kU„KWƒ„óšƒmIU¥ókwVólƒ™»¯™ƒL™ƒk@m™naWKÛwóњw@a±n—@VbUJ›LkaƒÝXĉƒ™„UV`lI@lnXÆƑkKmxÛXmlUKVmU²Klw@a™aó„@n™KXwVKU¯V¥mUnkm¥ĉ@UxVĖƒ°Vx„V„klmޙkKWĀkVWšnl°Lnm@°ŽUxlV@nk¦™JVÈ°ŽVÒ@nX°@ÆlUômlnôƒ²nxmłnVV„¯x@Èm°XblVUšl°@xkXU¤WXX‚W„Xƃ„mkÅJmށw±bƒxUīkKmÅVUĖÝèV„kx@š›lX„lnk¤ƒLkŽ‚Ėk¦‚xUššL°‚¯Ė@LnK@b°xVI„¥Ua°Ñ@»nm@¹‚KŎÞÈWln²n"],
+                    encodeOffsets: [[101071, 28891]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "5331",
+                  properties: {
+                    name: "德宏傣族景颇族自治州",
+                    cp: [98.1299, 24.5874],
+                    childNum: 5
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@„¥n@°@ƒVwČ£™ÿUlÞ„lmULVwnaÜLXyšzšKVÿ™XݙnƒWƒXwmaUa°¯V™ŦŽÆkUm„™VIƒ„ókĕl¯ƒa@£nama™@¯m¯œó@óyţbġkÅm±ÛammVkƒLwU`Wk@VƒkUmŃlUUKmbkkUVUwƒ¦óŽ°¼šbn°ô¦lºƒz@xšŽ¯„™@UŽ°nƒšU¤ţU„°VƆ@ÈmlnzÞl°¦Æa„xUxƒLkxWƒn@‚š²ŰšW„™‚@°ÈXl°Llx"],
+                    encodeOffsets: [[100440, 25943]]
+                  }
+                }],
+              UTF8Encoding: !0
+            }
+          }),
+      i("echarts/util/mapData/geoJson/zhe_jiang_geo", [],
+          function() {
+            return {
+              type: "FeatureCollection",
+              features: [{
+                type: "Feature",
+                id: "3311",
+                properties: {
+                  name: "丽水市",
+                  cp: [119.5642, 28.1854],
+                  childNum: 9
+                },
+                geometry: {
+                  type: "Polygon",
+                  coordinates: ["@@@V‚bVl@Xn‚UXƒKVŽ@¦nxlUXV‚n„KVmnL‚UV@bn¤lLXK˜²„`nnlJXIVJ‚I„Vnn°KnnVll@VLXWV@UkVaVK„zV@„ƒšVVaUK@U»VUl@@WnUUƒ@wVLn@Vwl@XW°LVbn@VU‚@X„l`@XnKVbkl@XVJlUnlV„„xlL@lnXl„@VšUnV°°„@a„UVLXblWVXn@VVUV@Lš¤VLV„U‚VbnalLUUVX_laVa„WVzXKV@@a@KUmImmXama@kU@yVIUK‚aVa@kXK@aWU@VIUmW@kkVm„Uš@VwUa@K@k@Uƒ`@kUKVk@UV@VaUm²Vy@klUUWUkVmUa@_ƒKVaXa›XmƒU@mUlWkaUXƒ@mmkL@w™JƒnVVÅbWKXa™@@I@aƒJUUÇ@V„UL™W@akLmb@K@a™XXw@mƒVmUVkUy@£@aU@@VkUWm@kUKƒXUWU_mW@wkkmJUUkLWWUXƒW@IkJ@k@mW_kӃ_Ul™Lƒm@I@aUa¯m@kƒa¯LUJƒ@mVVxUb™a@LUKkXƒbm@Uak@@a@Um`ƒIUbUJ@nUVW@@LnVV@lšUbVlUX@`š@blXklW„Ušm„Xlm¦U@@V¯bml@š@nUb@llnn@VbX@lV@ŽUVULmU@JVn„bVbkb™VWxU@@nUVk@"],
+                  encodeOffsets: [[121546, 28992]]
+                }
+              },
+                {
+                  type: "Feature",
+                  id: "3301",
+                  properties: {
+                    name: "杭州市",
+                    cp: [119.5313, 29.8773],
+                    childNum: 6
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@X@l„°KXXlW„b@²„`šššb‚I„šX`l@„@bWl@n@VnLUV@V„@°¦@šl@XVlU@š@xVbUb@Vkb@‚@XVJVz™J@Lޚ@VmLUxUJ@LU„Vx‚b„xXUl@VaÈw„b‚aÞa@Vl@XUVx@V@V„LlbnV„al@lb„Vnn‚LnKnL@VlbVJXalIšb@KUU@mVInJ˜„U„Vl@xUšVLnUš@UÞaV@lkV@UanK„L@UlKVUnbÆmn@@nUlVnVJl@@UXU„L@WVIVJVxVLXV@IÜKnbn@V¥V@@I@ƒƒ„y°b@UUwnk°ÆƨVlUšçXm›£aƒÇ™IkVƒ@WV@@aWIUWUIkb@WW@UnƒK@UU@kaWVkƒVIVVnU@UWVUV@VmVkKkWIkVWaULU`UImJUImm—U@ƒƒwmwUV™IUWVkUamaU@mV—kƒb@KVU@aVU@anKULVJ‚U@kÛU™JUV›kkƒVakU@ƒaVwkW@UWkXmWaULUaUK@XƒJUUmƒVU@UVƒUkJ@ImwmKU@k„@lU„W@@akKm„kamIkWl_UwVm@UkaVUUaƒ@UamakbWlkL@aUalU@mkL@U@U™lmK@XkKm@Ýakb@xƒnXbƒ`ƒnUUU@›™U@™wU@@ƒmKkkƒV¯U@lULUbVbUb@V‚a@L™ºÝb@bLmK™x@VUL@bk@mxULWl"],
+                    encodeOffsets: [[121185, 30184]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3303",
+                  properties: {
+                    name: "温州市",
+                    cp: [120.498, 27.8119],
+                    childNum: 9
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@ll@xnXV`VX„WVL@lXnlV@UV@@b@¤VzUlnV„U@nWxšW@b@LnalK@bšXVKUƒÈ@VV„I@b@Jš@WbXLÆaUU„mšI@xlKnn„@VWlbkXV‚@n„VWnœ‚WbUb„L@`VbUnVlVXkV@lUz±‚VnUbU@@VUlVL@l„_@V@l@LVbV@XLV`VÈlxn@lU@aœaVV‚k„@XJ@nl@@LU`°LVb„L°a@a„UVy@anI@a„a‚nV@²wÜJX@VšVV°k„na@WVk„aWwU@m@™ƒkƒaUĕ™ÝšÝŤnÈa„aóI›»@±X™WkUķ@kV±kw™ƒUkWw„™UƒÝ»ÛkɳlImaUaWóXÿǬk‚UnWVmmk™KţnŏÞğl™„UlUx@XWb„V@JkXƒ°mb@VULVxUVk@@LWWk@WIkšƒUkJmUkVmI@yƒ@Ua™kLm‚U@mUUUkaVk™@mK@UlUU@UmKmbUUUJ@n@KVLUL@VkJWXX`mnULWlkL@JVLVb@°kxkU@LVŽ™V@„VLV`UL@VUX"],
+                    encodeOffsets: [[122502, 28334]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3302",
+                  properties: {
+                    name: "宁波市",
+                    cp: [121.5967, 29.6466],
+                    childNum: 6
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@Ċ¦ĸĀ°‚nXÞVšKškƨƑźÿ°»n„@wô¥ÜbœU°ÆXÞWóçĉݱIUƒÈ¥@U°wÆ»²mm_@aXƒVKÞVlk@akk›̅@£X»VwƏXWa¯aȗb™KƽۃĊ™xƒLóŽk@ƒƒƒ@¯nƒKUL@xkL›ÑkWULUUmJUXVŽU@mŽUX¯@V`mbXbV@@nn¤WXšx@škJ@nVVUVl²UbÝVUVk@Wx@V@„ƒVXzmlaƒL@VlLU`„XUVVVUnl@VbnJlnUVVnƒlUKkbmnn„VxlJnxmbU@UL@KUV™X@xmb@lk@mnVVUš™è"],
+                    encodeOffsets: [[123784, 30977]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3309",
+                  properties: {
+                    name: "舟山市",
+                    cp: [122.2559, 30.2234],
+                    childNum: 3
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@l΢ƒʠþÆVĢLĊƒǬXĊ܄XôV„ÑÆw„ƒlšƏÈóVĭVǓ@ƒĉwɛkmK@ĉXīWaĉUĵÝmƒ¯ĉƒwĉ±±nż¯x@VǦV„²JĊÞôèÝXÅW¯›VÛaó¦@xƒŽmŽ¯¼ŹĀ"],
+                    encodeOffsets: [[124437, 30983]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3310",
+                  properties: {
+                    name: "台州市",
+                    cp: [121.1353, 28.6688],
+                    childNum: 7
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@lV„IVWVz@bXJl@Xal@°„nLll@nVxnV„K@UJVbƒ¦°„k`UIWJXnƚ@bUJ„Xl@lb„Wn@UzVV@bVVšmVnnJVXna‚bšKUKnUVVUnVLlKVLXa„Jm£@mU@WanaU_°@VWnV@UVWnIVVVKlXœÒlK@wVK„L°m„@„„l@ô„Kšw„ĉƾůUƒl£@»UƒVk„m@ƅUƒƒaÛIŏmUk@m„w@a™£ƒWk@ţšƒIm±@ankôUlaU™Uw¯ƒōaƒbÇbţm™ÞšÞVĖ„b„l@š@n‚VXxƒbUl@XmbƒŽ¯lUUU™W@ÛI±xU@mƒb@bmJ@bUzƒV@b¯bƒKUa¯KV_@Kk@@mWIƒ@lUU›b@bkVm@kwUÇU_WKU@Ux™@ƒVUnllX@Vn‚J@UXV@bWL@lUbbVLUJ@z‚V@lnbWbnnnJVŽ@L"],
+                    encodeOffsets: [[123312, 29526]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3307",
+                  properties: {
+                    name: "金华市",
+                    cp: [120.0037, 29.1028],
+                    childNum: 8
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@nbVb„@VbUVlb@VUnVxk`lXnJlbnƒlL@bX@Vƒ@klƒV@nLnx@JlI„V‚U@VUVn„VV„I@WVLVbVKXbWnXl@VlXUx„b@ŽlVUbl„œlVUšIÜVnalKX@@bV@@aUUlUƒwUw„@naWW„UVaUUšaVb„LlxXJVk°ƒUƒlkU¥@k„a@LVlXLVlšVWznVn@lxšJl_@WX_@mVa„a@alU@kVVna„KVLlK„b@UUaVašbnUWmXU@k@yVI@ařWmXIVJl_¯ƒ„¥UaVI@ƒLmUUw@mkkmK¯ƒk@Wbk@WI@aUyUXƒJkU@bU@WLUyƒXUbkbW`UVVkKmbUaVUƒUK™£@KVUUUm@UWkXWaUKƒV@b¯ƒ¯mU™V@UkƒmW@kkKƒwUƒmkkVUI@WlkUamL@Wk_Wƒ@UVm@Ua¯KWXk@Uxm@UK@xV„mV@Xk@UVV¼@‚VLUb™Uƒ„U@ƒyULUbVlU@@XlVUVVbƒU@lXXVW@XUVl@@VUVƒÈn@VVU„@lVa@„U„mL@`X@`WL@VUX@lUL@xlx"],
+                    encodeOffsets: [[122119, 29948]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3308",
+                  properties: {
+                    name: "衢州市",
+                    cp: [118.6853, 28.8666],
+                    childNum: 5
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@XkVKnwl@@aVK@UšwnL‚K@aÞaš¹@Kb@UVaUaVaVK@k°V„UllnL@„V@šxV@œšV@VV„m„_Wa„m@wlaÞbn@lL@WnLšk@V@VlK@nkVVb@blKXklakw@wVK@kVW@UXK@_‚W@_nKVƒ@ƒUb@kVƒUUm@„ÇVU@Uk@VU@WUXWW@k„VUaVUkU@WWXUKk@Ukmm¯LmmƒUJUIWJkImmƒ_—±WLkKm£@aVUmKUnƒLmWUkVmw@¥U„LVWm@WUka@UmmLmm@@bUX™@@WUIm@UVUK@UVUUU™VVJmb@b„Xn‚mVƒ¼nnn¦mJUVƒL„V@VW@UzUlVnUbl`UnVl@XU@kl@bmÈUx™Vk@@J@„ƒ¼W@ÅaVVnzmVƒ„@WJk@kWJ@ƒlXbWbXxmVnšlLXb@°lKVXnWšbWV„„X„mbV@Xl‚bšI@Kn@@x@šVLlm"],
+                    encodeOffsets: [[121185, 30184]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3306",
+                  properties: {
+                    name: "绍兴市",
+                    cp: [120.564, 29.7565],
+                    childNum: 6
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@„x@„˜VnnVJnIVJV_VKXblUXJlŽlLUŽUnU@UVVX@ŽmVUUUJl„XUlbV@@V„LVmX@@XlaVJVXXJ@b‚@XU„@lUšJ„È‚bœ¤Ō„JšçV™UUnml@@kna@wšWVU@LVKV@namwkIUwmƒnmlaVL„kUmVUkmmIUak@VmUUVUƒWV_kK@U„K‚bnkWy„U@ƒ@UXwl@VUÞUVak±VUUU@mlI@™™wXWƒIWbUKkLUKVmUUmVVL™LambUWmIUm™nUU@aUUVym@ƒXkak@ƒW@z@lWVXnmV™aUbVb@VƒakLUKƒLmbUU@lkV@bƒbUb@nW`@Xk`™Ikwm@mUXy™UUkWKUk@Kƒb@lV¦klV„¯„UlWIkwƒKUa™bVVUbƒVXXmbƒ@Vx„xkVVV@bU@@aW@kLmb@lVUIVKmL@bUV@bUV@L„a˜lnUV@nbVbUlVXšJVUnx"],
+                    encodeOffsets: [[122997, 30561]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3304",
+                  properties: {
+                    name: "嘉兴市",
+                    cp: [120.9155, 30.6354],
+                    childNum: 6
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@@blIX@@VÜVUnn@l‚k„lKnI°Þl`²LVKVbnbVaVLUVn@W¦@VkVVb„@VI„`@blLnL‚aX@„VVb@U‚@XlVa„@@kVaUKV»U_lWXUƒƒ@alb„k@VllnLVKn@@UVIUw@y°IVVXU@VV@lw„m@wVkƾaœJ‚LkΡƧƒ™l™LÝUmW¯ķÿĉ¥ƒIŋŽWn™èkVƧU¯ÅmlVx@V¯aƒz„Ž@„@JU@U¦m@@šnVmn@V„LV‚"],
+                    encodeOffsets: [[123233, 31382]]
+                  }
+                },
+                {
+                  type: "Feature",
+                  id: "3305",
+                  properties: {
+                    name: "湖州市",
+                    cp: [119.8608, 30.7782],
+                    childNum: 4
+                  },
+                  geometry: {
+                    type: "Polygon",
+                    coordinates: ["@@kLlƒkm@VmÛU@UW@kJ@aUƒK@UnmmU@™maÛL@JWUUKUwUIUJ@XƒKWV@Vk@UIUmVk@mm@ÅnmaUVkL@VƒKmLVbU@klU@ÝbV™@mVUKV™@wUkVƒ—ƒmIUJ@nVV@L™akJWbUIka@UmKmLKmmƒUUVk@@nmLX`WXUV@Ž@nUl™kmlU@Ub„„ƒxVVšIlV„Žšnn„@@n˜„UҚ@„°n@@xmb@„VbnV@šš„@b@`@L@L@x@blVklVbnnV@‚aXb°VlU@W„b°U„LXWVUV™„™VwÈwÜ»ĸaĠnUVw²X@V@lVU@wlaUUVm@knUV›"],
+                    encodeOffsets: [[123379, 31500]]
+                  }
+                }],
+              UTF8Encoding: !0
+            }
+          }),
+      i("echarts/chart/gauge", ["require", "./base", "../util/shape/GaugePointer", "zrender/shape/Text", "zrender/shape/Line", "zrender/shape/Rectangle", "zrender/shape/Circle", "zrender/shape/Sector", "../config", "../util/ecData", "../util/accMath", "zrender/tool/util", "../chart"],
+          function(e) {
+            function t(e, t, n, a, o) {
+              i.call(this, e, t, n, a, o),
+                  this.refresh(a)
+            }
+            var i = e("./base"),
+                n = e("../util/shape/GaugePointer"),
+                a = e("zrender/shape/Text"),
+                o = e("zrender/shape/Line"),
+                r = e("zrender/shape/Rectangle"),
+                s = e("zrender/shape/Circle"),
+                l = e("zrender/shape/Sector"),
+                h = e("../config");
+            h.gauge = {
+              zlevel: 0,
+              z: 2,
+              center: ["50%", "50%"],
+              clickable: !0,
+              legendHoverLink: !0,
+              radius: "75%",
+              startAngle: 225,
+              endAngle: -45,
+              min: 0,
+              max: 100,
+              splitNumber: 10,
+              axisLine: {
+                show: !0,
+                lineStyle: {
+                  color: [[.2, "#228b22"], [.8, "#48b"], [1, "#ff4500"]],
+                  width: 30
+                }
+              },
+              axisTick: {
+                show: !0,
+                splitNumber: 5,
+                length: 8,
+                lineStyle: {
+                  color: "#eee",
+                  width: 1,
+                  type: "solid"
+                }
+              },
+              axisLabel: {
+                show: !0,
+                textStyle: {
+                  color: "auto"
+                }
+              },
+              splitLine: {
+                show: !0,
+                length: 30,
+                lineStyle: {
+                  color: "#eee",
+                  width: 2,
+                  type: "solid"
+                }
+              },
+              pointer: {
+                show: !0,
+                length: "80%",
+                width: 8,
+                color: "auto"
+              },
+              title: {
+                show: !0,
+                offsetCenter: [0, "-40%"],
+                textStyle: {
+                  color: "#333",
+                  fontSize: 15
+                }
+              },
+              detail: {
+                show: !0,
+                backgroundColor: "rgba(0,0,0,0)",
+                borderWidth: 0,
+                borderColor: "#ccc",
+                width: 100,
+                height: 40,
+                offsetCenter: [0, "40%"],
+                textStyle: {
+                  color: "auto",
+                  fontSize: 30
+                }
+              }
+            };
+            var m = e("../util/ecData"),
+                V = e("../util/accMath"),
+                U = e("zrender/tool/util");
+            return t.prototype = {
+              type: h.CHART_TYPE_GAUGE,
+              _buildShape: function() {
+                var e = this.series;
+                this._paramsMap = {},
+                    this.selectedMap = {};
+                for (var t = 0,
+                         i = e.length; i > t; t++) e[t].type === h.CHART_TYPE_GAUGE && (this.selectedMap[e[t].name] = !0, e[t] = this.reformOption(e[t]), this.legendHoverLink = e[t].legendHoverLink || this.legendHoverLink, this._buildSingleGauge(t), this.buildMark(t));
+                this.addShapeList()
+              },
+              _buildSingleGauge: function(e) {
+                var t = this.series[e];
+                this._paramsMap[e] = {
+                  center: this.parseCenter(this.zr, t.center),
+                  radius: this.parseRadius(this.zr, t.radius),
+                  startAngle: t.startAngle.toFixed(2) - 0,
+                  endAngle: t.endAngle.toFixed(2) - 0
+                },
+                    this._paramsMap[e].totalAngle = this._paramsMap[e].startAngle - this._paramsMap[e].endAngle,
+                    this._colorMap(e),
+                    this._buildAxisLine(e),
+                    this._buildSplitLine(e),
+                    this._buildAxisTick(e),
+                    this._buildAxisLabel(e),
+                    this._buildPointer(e),
+                    this._buildTitle(e),
+                    this._buildDetail(e)
+              },
+              _buildAxisLine: function(e) {
+                var t = this.series[e];
+                if (t.axisLine.show) for (var i, n, a = t.min,
+                                              o = t.max - a,
+                                              r = this._paramsMap[e], s = r.center, l = r.startAngle, h = r.totalAngle, V = r.colorArray, U = t.axisLine.lineStyle, d = this.parsePercent(U.width, r.radius[1]), p = r.radius[1], c = p - d, u = l, y = 0, g = V.length; g > y; y++) n = l - h * (V[y][0] - a) / o,
+                    i = this._getSector(s, c, p, n, u, V[y][1], U, t.zlevel, t.z),
+                    u = n,
+                    i._animationAdd = "r",
+                    m.set(i, "seriesIndex", e),
+                    m.set(i, "dataIndex", y),
+                    this.shapeList.push(i)
+              },
+              _buildSplitLine: function(e) {
+                var t = this.series[e];
+                if (t.splitLine.show) for (var i, n, a, r = this._paramsMap[e], s = t.splitNumber, l = t.min, h = t.max - l, m = t.splitLine, V = this.parsePercent(m.length, r.radius[1]), U = m.lineStyle, d = U.color, p = r.center, c = r.startAngle * Math.PI / 180, u = r.totalAngle * Math.PI / 180, y = r.radius[1], g = y - V, b = 0; s >= b; b++) i = c - u / s * b,
+                    n = Math.sin(i),
+                    a = Math.cos(i),
+                    this.shapeList.push(new o({
+                      zlevel: t.zlevel,
+                      z: t.z + 1,
+                      hoverable: !1,
+                      style: {
+                        xStart: p[0] + a * y,
+                        yStart: p[1] - n * y,
+                        xEnd: p[0] + a * g,
+                        yEnd: p[1] - n * g,
+                        strokeColor: "auto" === d ? this._getColor(e, l + h / s * b) : d,
+                        lineType: U.type,
+                        lineWidth: U.width,
+                        shadowColor: U.shadowColor,
+                        shadowBlur: U.shadowBlur,
+                        shadowOffsetX: U.shadowOffsetX,
+                        shadowOffsetY: U.shadowOffsetY
+                      }
+                    }))
+              },
+              _buildAxisTick: function(e) {
+                var t = this.series[e];
+                if (t.axisTick.show) for (var i, n, a, r = this._paramsMap[e], s = t.splitNumber, l = t.min, h = t.max - l, m = t.axisTick, V = m.splitNumber, U = this.parsePercent(m.length, r.radius[1]), d = m.lineStyle, p = d.color, c = r.center, u = r.startAngle * Math.PI / 180, y = r.totalAngle * Math.PI / 180, g = r.radius[1], b = g - U, f = 0, k = s * V; k >= f; f++) f % V !== 0 && (i = u - y / k * f, n = Math.sin(i), a = Math.cos(i), this.shapeList.push(new o({
+                  zlevel: t.zlevel,
+                  z: t.z + 1,
+                  hoverable: !1,
+                  style: {
+                    xStart: c[0] + a * g,
+                    yStart: c[1] - n * g,
+                    xEnd: c[0] + a * b,
+                    yEnd: c[1] - n * b,
+                    strokeColor: "auto" === p ? this._getColor(e, l + h / k * f) : p,
+                    lineType: d.type,
+                    lineWidth: d.width,
+                    shadowColor: d.shadowColor,
+                    shadowBlur: d.shadowBlur,
+                    shadowOffsetX: d.shadowOffsetX,
+                    shadowOffsetY: d.shadowOffsetY
+                  }
+                })))
+              },
+              _buildAxisLabel: function(e) {
+                var t = this.series[e];
+                if (t.axisLabel.show) for (var i, n, o, r, s = t.splitNumber,
+                                               l = t.min,
+                                               h = t.max - l,
+                                               m = t.axisLabel.textStyle,
+                                               U = this.getFont(m), d = m.color, p = this._paramsMap[e], c = p.center, u = p.startAngle, y = p.totalAngle, g = p.radius[1] - this.parsePercent(t.splitLine.length, p.radius[1]) - 5, b = 0; s >= b; b++) r = V.accAdd(l, V.accMul(V.accDiv(h, s), b)),
+                    i = u - y / s * b,
+                    n = Math.sin(i * Math.PI / 180),
+                    o = Math.cos(i * Math.PI / 180),
+                    i = (i + 360) % 360,
+                    this.shapeList.push(new a({
+                      zlevel: t.zlevel,
+                      z: t.z + 1,
+                      hoverable: !1,
+                      style: {
+                        x: c[0] + o * g,
+                        y: c[1] - n * g,
+                        color: "auto" === d ? this._getColor(e, r) : d,
+                        text: this._getLabelText(t.axisLabel.formatter, r),
+                        textAlign: i >= 110 && 250 >= i ? "left": 70 >= i || i >= 290 ? "right": "center",
+                        textBaseline: i >= 10 && 170 >= i ? "top": i >= 190 && 350 >= i ? "bottom": "middle",
+                        textFont: U,
+                        shadowColor: m.shadowColor,
+                        shadowBlur: m.shadowBlur,
+                        shadowOffsetX: m.shadowOffsetX,
+                        shadowOffsetY: m.shadowOffsetY
+                      }
+                    }))
+              },
+              _buildPointer: function(e) {
+                var t = this.series[e];
+                if (t.pointer.show) {
+                  var i = t.max - t.min,
+                      a = t.pointer,
+                      o = this._paramsMap[e],
+                      r = this.parsePercent(a.length, o.radius[1]),
+                      l = this.parsePercent(a.width, o.radius[1]),
+                      h = o.center,
+                      V = this._getValue(e);
+                  V = V < t.max ? V: t.max;
+                  var U = (o.startAngle - o.totalAngle / i * (V - t.min)) * Math.PI / 180,
+                      d = "auto" === a.color ? this._getColor(e, V) : a.color,
+                      p = new n({
+                        zlevel: t.zlevel,
+                        z: t.z + 1,
+                        clickable: this.query(t, "clickable"),
+                        style: {
+                          x: h[0],
+                          y: h[1],
+                          r: r,
+                          startAngle: o.startAngle * Math.PI / 180,
+                          angle: U,
+                          color: d,
+                          width: l,
+                          shadowColor: a.shadowColor,
+                          shadowBlur: a.shadowBlur,
+                          shadowOffsetX: a.shadowOffsetX,
+                          shadowOffsetY: a.shadowOffsetY
+                        },
+                        highlightStyle: {
+                          brushType: "fill",
+                          width: l > 2 ? 2 : l / 2,
+                          color: "#fff"
+                        }
+                      });
+                  m.pack(p, this.series[e], e, this.series[e].data[0], 0, this.series[e].data[0].name, V),
+                      this.shapeList.push(p),
+                      this.shapeList.push(new s({
+                        zlevel: t.zlevel,
+                        z: t.z + 2,
+                        hoverable: !1,
+                        style: {
+                          x: h[0],
+                          y: h[1],
+                          r: a.width / 2.5,
+                          color: "#fff"
+                        }
+                      }))
+                }
+              },
+              _buildTitle: function(e) {
+                var t = this.series[e];
+                if (t.title.show) {
+                  var i = t.data[0],
+                      n = null != i.name ? i.name: "";
+                  if ("" !== n) {
+                    var o = t.title,
+                        r = o.offsetCenter,
+                        s = o.textStyle,
+                        l = s.color,
+                        h = this._paramsMap[e],
+                        m = h.center[0] + this.parsePercent(r[0], h.radius[1]),
+                        V = h.center[1] + this.parsePercent(r[1], h.radius[1]);
+                    this.shapeList.push(new a({
+                      zlevel: t.zlevel,
+                      z: t.z + (Math.abs(m - h.center[0]) + Math.abs(V - h.center[1]) < 2 * s.fontSize ? 2 : 1),
+                      hoverable: !1,
+                      style: {
+                        x: m,
+                        y: V,
+                        color: "auto" === l ? this._getColor(e) : l,
+                        text: n,
+                        textAlign: "center",
+                        textFont: this.getFont(s),
+                        shadowColor: s.shadowColor,
+                        shadowBlur: s.shadowBlur,
+                        shadowOffsetX: s.shadowOffsetX,
+                        shadowOffsetY: s.shadowOffsetY
+                      }
+                    }))
+                  }
+                }
+              },
+              _buildDetail: function(e) {
+                var t = this.series[e];
+                if (t.detail.show) {
+                  var i = t.detail,
+                      n = i.offsetCenter,
+                      a = i.backgroundColor,
+                      o = i.textStyle,
+                      s = o.color,
+                      l = this._paramsMap[e],
+                      h = this._getValue(e),
+                      m = l.center[0] - i.width / 2 + this.parsePercent(n[0], l.radius[1]),
+                      V = l.center[1] + this.parsePercent(n[1], l.radius[1]);
+                  this.shapeList.push(new r({
+                    zlevel: t.zlevel,
+                    z: t.z + (Math.abs(m + i.width / 2 - l.center[0]) + Math.abs(V + i.height / 2 - l.center[1]) < o.fontSize ? 2 : 1),
+                    hoverable: !1,
+                    style: {
+                      x: m,
+                      y: V,
+                      width: i.width,
+                      height: i.height,
+                      brushType: "both",
+                      color: "auto" === a ? this._getColor(e, h) : a,
+                      lineWidth: i.borderWidth,
+                      strokeColor: i.borderColor,
+                      shadowColor: i.shadowColor,
+                      shadowBlur: i.shadowBlur,
+                      shadowOffsetX: i.shadowOffsetX,
+                      shadowOffsetY: i.shadowOffsetY,
+                      text: this._getLabelText(i.formatter, h),
+                      textFont: this.getFont(o),
+                      textPosition: "inside",
+                      textColor: "auto" === s ? this._getColor(e, h) : s
+                    }
+                  }))
+                }
+              },
+              _getValue: function(e) {
+                return this.getDataFromOption(this.series[e].data[0])
+              },
+              _colorMap: function(e) {
+                var t = this.series[e],
+                    i = t.min,
+                    n = t.max - i,
+                    a = t.axisLine.lineStyle.color;
+                a instanceof Array || (a = [[1, a]]);
+                for (var o = [], r = 0, s = a.length; s > r; r++) o.push([a[r][0] * n + i, a[r][1]]);
+                this._paramsMap[e].colorArray = o
+              },
+              _getColor: function(e, t) {
+                null == t && (t = this._getValue(e));
+                for (var i = this._paramsMap[e].colorArray, n = 0, a = i.length; a > n; n++) if (i[n][0] >= t) return i[n][1];
+                return i[i.length - 1][1]
+              },
+              _getSector: function(e, t, i, n, a, o, r, s, h) {
+                return new l({
+                  zlevel: s,
+                  z: h,
+                  hoverable: !1,
+                  style: {
+                    x: e[0],
+                    y: e[1],
+                    r0: t,
+                    r: i,
+                    startAngle: n,
+                    endAngle: a,
+                    brushType: "fill",
+                    color: o,
+                    shadowColor: r.shadowColor,
+                    shadowBlur: r.shadowBlur,
+                    shadowOffsetX: r.shadowOffsetX,
+                    shadowOffsetY: r.shadowOffsetY
+                  }
+                })
+              },
+              _getLabelText: function(e, t) {
+                if (e) {
+                  if ("function" == typeof e) return e.call(this.myChart, t);
+                  if ("string" == typeof e) return e.replace("{value}", t)
+                }
+                return t
+              },
+              refresh: function(e) {
+                e && (this.option = e, this.series = e.series),
+                    this.backupShapeList(),
+                    this._buildShape()
+              }
+            },
+                U.inherits(t, i),
+                e("../chart").define("gauge", t),
+                t
+          }),
+      i("echarts/util/shape/GaugePointer", ["require", "zrender/shape/Base", "zrender/tool/util", "./normalIsCover"],
+          function(e) {
+            function t(e) {
+              i.call(this, e)
+            }
+            var i = e("zrender/shape/Base"),
+                n = e("zrender/tool/util");
+            return t.prototype = {
+              type: "gauge-pointer",
+              buildPath: function(e, t) {
+                var i = t.r,
+                    n = t.width,
+                    a = t.angle,
+                    o = t.x - Math.cos(a) * n * (n >= i / 3 ? 1 : 2),
+                    r = t.y + Math.sin(a) * n * (n >= i / 3 ? 1 : 2);
+                a = t.angle - Math.PI / 2,
+                    e.moveTo(o, r),
+                    e.lineTo(t.x + Math.cos(a) * n, t.y - Math.sin(a) * n),
+                    e.lineTo(t.x + Math.cos(t.angle) * i, t.y - Math.sin(t.angle) * i),
+                    e.lineTo(t.x - Math.cos(a) * n, t.y + Math.sin(a) * n),
+                    e.lineTo(o, r)
+              },
+              getRect: function(e) {
+                if (e.__rect) return e.__rect;
+                var t = 2 * e.width,
+                    i = e.x,
+                    n = e.y,
+                    a = i + Math.cos(e.angle) * e.r,
+                    o = n - Math.sin(e.angle) * e.r;
+                return e.__rect = {
+                  x: Math.min(i, a) - t,
+                  y: Math.min(n, o) - t,
+                  width: Math.abs(i - a) + t,
+                  height: Math.abs(n - o) + t
+                },
+                    e.__rect
+              },
+              isCover: e("./normalIsCover")
+            },
+                n.inherits(t, i),
+                t
+          }),
+      i("echarts/chart/funnel", ["require", "./base", "zrender/shape/Text", "zrender/shape/Line", "zrender/shape/Polygon", "../config", "../util/ecData", "../util/number", "zrender/tool/util", "zrender/tool/color", "zrender/tool/area", "../chart"],
+          function(e) {
+            function t(e, t, n, a, o) {
+              i.call(this, e, t, n, a, o),
+                  this.refresh(a)
+            }
+            var i = e("./base"),
+                n = e("zrender/shape/Text"),
+                a = e("zrender/shape/Line"),
+                o = e("zrender/shape/Polygon"),
+                r = e("../config");
+            r.funnel = {
+              zlevel: 0,
+              z: 2,
+              clickable: !0,
+              legendHoverLink: !0,
+              x: 80,
+              y: 60,
+              x2: 80,
+              y2: 60,
+              min: 0,
+              max: 100,
+              minSize: "0%",
+              maxSize: "100%",
+              sort: "descending",
+              gap: 0,
+              funnelAlign: "center",
+              itemStyle: {
+                normal: {
+                  borderColor: "#fff",
+                  borderWidth: 1,
+                  label: {
+                    show: !0,
+                    position: "outer"
+                  },
+                  labelLine: {
+                    show: !0,
+                    length: 10,
+                    lineStyle: {
+                      width: 1,
+                      type: "solid"
+                    }
+                  }
+                },
+                emphasis: {
+                  borderColor: "rgba(0,0,0,0)",
+                  borderWidth: 1,
+                  label: {
+                    show: !0
+                  },
+                  labelLine: {
+                    show: !0
+                  }
+                }
+              }
+            };
+            var s = e("../util/ecData"),
+                l = e("../util/number"),
+                h = e("zrender/tool/util"),
+                m = e("zrender/tool/color"),
+                V = e("zrender/tool/area");
+            return t.prototype = {
+              type: r.CHART_TYPE_FUNNEL,
+              _buildShape: function() {
+                var e = this.series,
+                    t = this.component.legend;
+                this._paramsMap = {},
+                    this._selected = {},
+                    this.selectedMap = {};
+                for (var i, n = 0,
+                         a = e.length; a > n; n++) if (e[n].type === r.CHART_TYPE_FUNNEL) {
+                  if (e[n] = this.reformOption(e[n]), this.legendHoverLink = e[n].legendHoverLink || this.legendHoverLink, i = e[n].name || "", this.selectedMap[i] = t ? t.isSelected(i) : !0, !this.selectedMap[i]) continue;
+                  this._buildSingleFunnel(n),
+                      this.buildMark(n)
+                }
+                this.addShapeList()
+              },
+              _buildSingleFunnel: function(e) {
+                var t = this.component.legend,
+                    i = this.series[e],
+                    n = this._mapData(e),
+                    a = this._getLocation(e);
+                this._paramsMap[e] = {
+                  location: a,
+                  data: n
+                };
+                for (var o, r = 0,
+                         s = [], h = 0, m = n.length; m > h; h++) o = n[h].name,
+                    this.selectedMap[o] = t ? t.isSelected(o) : !0,
+                this.selectedMap[o] && !isNaN(n[h].value) && (s.push(n[h]), r++);
+                if (0 !== r) {
+                  for (var V, U, d, p, c = this._buildFunnelCase(e), u = i.funnelAlign, y = i.gap, g = r > 1 ? (a.height - (r - 1) * y) / r: a.height, b = a.y, f = "descending" === i.sort ? this._getItemWidth(e, s[0].value) : l.parsePercent(i.minSize, a.width), k = "descending" === i.sort ? 1 : 0, x = a.centerX, _ = [], h = 0, m = s.length; m > h; h++) if (o = s[h].name, this.selectedMap[o] && !isNaN(s[h].value)) {
+                    switch (V = m - 2 >= h ? this._getItemWidth(e, s[h + k].value) : "descending" === i.sort ? l.parsePercent(i.minSize, a.width) : l.parsePercent(i.maxSize, a.width), u) {
+                      case "left":
+                        U = a.x;
+                        break;
+                      case "right":
+                        U = a.x + a.width - f;
+                        break;
+                      default:
+                        U = x - f / 2
+                    }
+                    d = this._buildItem(e, s[h]._index, t ? t.getColor(o) : this.zr.getColor(s[h]._index), U, b, f, V, g, u),
+                        b += g + y,
+                        p = d.style.pointList,
+                        _.unshift([p[0][0] - 10, p[0][1]]),
+                        _.push([p[1][0] + 10, p[1][1]]),
+                    0 === h && (0 === f ? (p = _.pop(), "center" == u && (_[0][0] += 10), "right" == u && (_[0][0] = p[0]), _[0][1] -= "center" == u ? 10 : 15, 1 == m && (p = d.style.pointList)) : (_[_.length - 1][1] -= 5, _[0][1] -= 5)),
+                        f = V
+                  }
+                  c && (_.unshift([p[3][0] - 10, p[3][1]]), _.push([p[2][0] + 10, p[2][1]]), 0 === f ? (p = _.pop(), "center" == u && (_[0][0] += 10), "right" == u && (_[0][0] = p[0]), _[0][1] += "center" == u ? 10 : 15) : (_[_.length - 1][1] += 5, _[0][1] += 5), c.style.pointList = _)
+                }
+              },
+              _buildFunnelCase: function(e) {
+                var t = this.series[e];
+                if (this.deepQuery([t, this.option], "calculable")) {
+                  var i = this._paramsMap[e].location,
+                      n = 10,
+                      a = {
+                        hoverable: !1,
+                        style: {
+                          pointListd: [[i.x - n, i.y - n], [i.x + i.width + n, i.y - n], [i.x + i.width + n, i.y + i.height + n], [i.x - n, i.y + i.height + n]],
+                          brushType: "stroke",
+                          lineWidth: 1,
+                          strokeColor: t.calculableHolderColor || this.ecTheme.calculableHolderColor || r.calculableHolderColor
+                        }
+                      };
+                  return s.pack(a, t, e, void 0, -1),
+                      this.setCalculable(a),
+                      a = new o(a),
+                      this.shapeList.push(a),
+                      a
+                }
+              },
+              _getLocation: function(e) {
+                var t = this.series[e],
+                    i = this.zr.getWidth(),
+                    n = this.zr.getHeight(),
+                    a = this.parsePercent(t.x, i),
+                    o = this.parsePercent(t.y, n),
+                    r = null == t.width ? i - a - this.parsePercent(t.x2, i) : this.parsePercent(t.width, i);
+                return {
+                  x: a,
+                  y: o,
+                  width: r,
+                  height: null == t.height ? n - o - this.parsePercent(t.y2, n) : this.parsePercent(t.height, n),
+                  centerX: a + r / 2
+                }
+              },
+              _mapData: function(e) {
+                function t(e, t) {
+                  return "-" === e.value ? 1 : "-" === t.value ? -1 : t.value - e.value
+                }
+                function i(e, i) {
+                  return - t(e, i)
+                }
+                for (var n = this.series[e], a = h.clone(n.data), o = 0, r = a.length; r > o; o++) a[o]._index = o;
+                return "none" != n.sort && a.sort("descending" === n.sort ? t: i),
+                    a
+              },
+              _buildItem: function(e, t, i, n, a, o, r, l, h) {
+                var m = this.series,
+                    V = m[e],
+                    U = V.data[t],
+                    d = this.getPolygon(e, t, i, n, a, o, r, l, h);
+                s.pack(d, m[e], e, m[e].data[t], t, m[e].data[t].name),
+                    this.shapeList.push(d);
+                var p = this.getLabel(e, t, i, n, a, o, r, l, h);
+                s.pack(p, m[e], e, m[e].data[t], t, m[e].data[t].name),
+                    this.shapeList.push(p),
+                this._needLabel(V, U, !1) || (p.invisible = !0);
+                var c = this.getLabelLine(e, t, i, n, a, o, r, l, h);
+                this.shapeList.push(c),
+                this._needLabelLine(V, U, !1) || (c.invisible = !0);
+                var u = [],
+                    y = [];
+                return this._needLabelLine(V, U, !0) && (u.push(c.id), y.push(c.id)),
+                this._needLabel(V, U, !0) && (u.push(p.id), y.push(d.id)),
+                    d.hoverConnect = u,
+                    p.hoverConnect = y,
+                    d
+              },
+              _getItemWidth: function(e, t) {
+                var i = this.series[e],
+                    n = this._paramsMap[e].location,
+                    a = i.min,
+                    o = i.max,
+                    r = l.parsePercent(i.minSize, n.width),
+                    s = l.parsePercent(i.maxSize, n.width);
+                return (t - a) * (s - r) / (o - a) + r
+              },
+              getPolygon: function(e, t, i, n, a, r, s, l, h) {
+                var V, U = this.series[e],
+                    d = U.data[t],
+                    p = [d, U],
+                    c = this.deepMerge(p, "itemStyle.normal") || {},
+                    u = this.deepMerge(p, "itemStyle.emphasis") || {},
+                    y = this.getItemStyleColor(c.color, e, t, d) || i,
+                    g = this.getItemStyleColor(u.color, e, t, d) || ("string" == typeof y ? m.lift(y, -.2) : y);
+                switch (h) {
+                  case "left":
+                    V = n;
+                    break;
+                  case "right":
+                    V = n + (r - s);
+                    break;
+                  default:
+                    V = n + (r - s) / 2
+                }
+                var b = {
+                  zlevel: U.zlevel,
+                  z: U.z,
+                  clickable: this.deepQuery(p, "clickable"),
+                  style: {
+                    pointList: [[n, a], [n + r, a], [V + s, a + l], [V, a + l]],
+                    brushType: "both",
+                    color: y,
+                    lineWidth: c.borderWidth,
+                    strokeColor: c.borderColor
+                  },
+                  highlightStyle: {
+                    color: g,
+                    lineWidth: u.borderWidth,
+                    strokeColor: u.borderColor
+                  }
+                };
+                return this.deepQuery([d, U, this.option], "calculable") && (this.setCalculable(b), b.draggable = !0),
+                    new o(b)
+              },
+              getLabel: function(e, t, i, a, o, r, s, l, U) {
+                var d, p = this.series[e],
+                    c = p.data[t],
+                    u = this._paramsMap[e].location,
+                    y = h.merge(h.clone(c.itemStyle) || {},
+                        p.itemStyle),
+                    g = "normal",
+                    b = y[g].label,
+                    f = b.textStyle || {},
+                    k = y[g].labelLine.length,
+                    x = this.getLabelText(e, t, g),
+                    _ = this.getFont(f),
+                    L = i;
+                b.position = b.position || y.normal.label.position,
+                    "inner" === b.position || "inside" === b.position || "center" === b.position ? (d = U, L = Math.max(r, s) / 2 > V.getTextWidth(x, _) ? "#fff": m.reverse(i)) : d = "left" === b.position ? "right": "left";
+                var W = {
+                  zlevel: p.zlevel,
+                  z: p.z + 1,
+                  style: {
+                    x: this._getLabelPoint(b.position, a, u, r, s, k, U),
+                    y: o + l / 2,
+                    color: f.color || L,
+                    text: x,
+                    textAlign: f.align || d,
+                    textBaseline: f.baseline || "middle",
+                    textFont: _
+                  }
+                };
+                return g = "emphasis",
+                    b = y[g].label || b,
+                    f = b.textStyle || f,
+                    k = y[g].labelLine.length || k,
+                    b.position = b.position || y.normal.label.position,
+                    x = this.getLabelText(e, t, g),
+                    _ = this.getFont(f),
+                    L = i,
+                    "inner" === b.position || "inside" === b.position || "center" === b.position ? (d = U, L = Math.max(r, s) / 2 > V.getTextWidth(x, _) ? "#fff": m.reverse(i)) : d = "left" === b.position ? "right": "left",
+                    W.highlightStyle = {
+                      x: this._getLabelPoint(b.position, a, u, r, s, k, U),
+                      color: f.color || L,
+                      text: x,
+                      textAlign: f.align || d,
+                      textFont: _,
+                      brushType: "fill"
+                    },
+                    new n(W)
+              },
+              getLabelText: function(e, t, i) {
+                var n = this.series,
+                    a = n[e],
+                    o = a.data[t],
+                    r = this.deepQuery([o, a], "itemStyle." + i + ".label.formatter");
+                return r ? "function" == typeof r ? r.call(this.myChart, {
+                  seriesIndex: e,
+                  seriesName: a.name || "",
+                  series: a,
+                  dataIndex: t,
+                  data: o,
+                  name: o.name,
+                  value: o.value
+                }) : "string" == typeof r ? r = r.replace("{a}", "{a0}").replace("{b}", "{b0}").replace("{c}", "{c0}").replace("{a0}", a.name).replace("{b0}", o.name).replace("{c0}", o.value) : void 0 : o.name
+              },
+              getLabelLine: function(e, t, i, n, o, r, s, l, m) {
+                var V = this.series[e],
+                    U = V.data[t],
+                    d = this._paramsMap[e].location,
+                    p = h.merge(h.clone(U.itemStyle) || {},
+                        V.itemStyle),
+                    c = "normal",
+                    u = p[c].labelLine,
+                    y = p[c].labelLine.length,
+                    g = u.lineStyle || {},
+                    b = p[c].label;
+                b.position = b.position || p.normal.label.position;
+                var f = {
+                  zlevel: V.zlevel,
+                  z: V.z + 1,
+                  hoverable: !1,
+                  style: {
+                    xStart: this._getLabelLineStartPoint(n, d, r, s, m),
+                    yStart: o + l / 2,
+                    xEnd: this._getLabelPoint(b.position, n, d, r, s, y, m),
+                    yEnd: o + l / 2,
+                    strokeColor: g.color || i,
+                    lineType: g.type,
+                    lineWidth: g.width
+                  }
+                };
+                return c = "emphasis",
+                    u = p[c].labelLine || u,
+                    y = p[c].labelLine.length || y,
+                    g = u.lineStyle || g,
+                    b = p[c].label || b,
+                    b.position = b.position,
+                    f.highlightStyle = {
+                      xEnd: this._getLabelPoint(b.position, n, d, r, s, y, m),
+                      strokeColor: g.color || i,
+                      lineType: g.type,
+                      lineWidth: g.width
+                    },
+                    new a(f)
+              },
+              _getLabelPoint: function(e, t, i, n, a, o, r) {
+                switch (e = "inner" === e || "inside" === e ? "center": e) {
+                  case "center":
+                    return "center" == r ? t + n / 2 : "left" == r ? t + 10 : t + n - 10;
+                  case "left":
+                    return "auto" === o ? i.x - 10 : "center" == r ? i.centerX - Math.max(n, a) / 2 - o: "right" == r ? t - (a > n ? a - n: 0) - o: i.x - o;
+                  default:
+                    return "auto" === o ? i.x + i.width + 10 : "center" == r ? i.centerX + Math.max(n, a) / 2 + o: "right" == r ? i.x + i.width + o: t + Math.max(n, a) + o
+                }
+              },
+              _getLabelLineStartPoint: function(e, t, i, n, a) {
+                return "center" == a ? t.centerX: n > i ? e + Math.min(i, n) / 2 : e + Math.max(i, n) / 2
+              },
+              _needLabel: function(e, t, i) {
+                return this.deepQuery([t, e], "itemStyle." + (i ? "emphasis": "normal") + ".label.show")
+              },
+              _needLabelLine: function(e, t, i) {
+                return this.deepQuery([t, e], "itemStyle." + (i ? "emphasis": "normal") + ".labelLine.show")
+              },
+              refresh: function(e) {
+                e && (this.option = e, this.series = e.series),
+                    this.backupShapeList(),
+                    this._buildShape()
+              }
+            },
+                h.inherits(t, i),
+                e("../chart").define("funnel", t),
+                t
+          }),
+      i("echarts/chart/eventRiver", ["require", "./base", "../layout/eventRiver", "zrender/shape/Polygon", "../component/axis", "../component/grid", "../component/dataZoom", "../config", "../util/ecData", "../util/date", "zrender/tool/util", "zrender/tool/color", "../chart"],
+          function(e) {
+            function t(e, t, n, a, o) {
+              i.call(this, e, t, n, a, o);
+              var r = this;
+              r._ondragend = function() {
+                r.isDragend = !0
+              },
+                  this.refresh(a)
+            }
+            var i = e("./base"),
+                n = e("../layout/eventRiver"),
+                a = e("zrender/shape/Polygon");
+            e("../component/axis"),
+                e("../component/grid"),
+                e("../component/dataZoom");
+            var o = e("../config");
+            o.eventRiver = {
+              zlevel: 0,
+              z: 2,
+              clickable: !0,
+              legendHoverLink: !0,
+              itemStyle: {
+                normal: {
+                  borderColor: "rgba(0,0,0,0)",
+                  borderWidth: 1,
+                  label: {
+                    show: !0,
+                    position: "inside",
+                    formatter: "{b}"
+                  }
+                },
+                emphasis: {
+                  borderColor: "rgba(0,0,0,0)",
+                  borderWidth: 1,
+                  label: {
+                    show: !0
+                  }
+                }
+              }
+            };
+            var r = e("../util/ecData"),
+                s = e("../util/date"),
+                l = e("zrender/tool/util"),
+                h = e("zrender/tool/color");
+            return t.prototype = {
+              type: o.CHART_TYPE_EVENTRIVER,
+              _buildShape: function() {
+                var e = this.series;
+                this.selectedMap = {},
+                    this._dataPreprocessing();
+                for (var t = this.component.legend,
+                         i = [], a = 0; a < e.length; a++) if (e[a].type === this.type) {
+                  e[a] = this.reformOption(e[a]),
+                      this.legendHoverLink = e[a].legendHoverLink || this.legendHoverLink;
+                  var o = e[a].name || "";
+                  if (this.selectedMap[o] = t ? t.isSelected(o) : !0, !this.selectedMap[o]) continue;
+                  this.buildMark(a),
+                      i.push(this.series[a])
+                }
+                n(i, this._intervalX, this.component.grid.getArea()),
+                    this._drawEventRiver(),
+                    this.addShapeList()
+              },
+              _dataPreprocessing: function() {
+                for (var e, t, i = this.series,
+                         n = 0,
+                         a = i.length; a > n; n++) if (i[n].type === this.type) {
+                  e = this.component.xAxis.getAxis(i[n].xAxisIndex || 0);
+                  for (var o = 0,
+                           r = i[n].data.length; r > o; o++) {
+                    t = i[n].data[o].evolution;
+                    for (var l = 0,
+                             h = t.length; h > l; l++) t[l].timeScale = e.getCoord(s.getNewDate(t[l].time) - 0),
+                        t[l].valueScale = Math.pow(t[l].value, .8)
+                  }
+                }
+                this._intervalX = Math.round(this.component.grid.getWidth() / 40)
+              },
+              _drawEventRiver: function() {
+                for (var e = this.series,
+                         t = 0; t < e.length; t++) {
+                  var i = e[t].name || "";
+                  if (e[t].type === this.type && this.selectedMap[i]) for (var n = 0; n < e[t].data.length; n++) this._drawEventBubble(e[t].data[n], t, n)
+                }
+              },
+              _drawEventBubble: function(e, t, i) {
+                var n = this.series,
+                    o = n[t],
+                    s = o.name || "",
+                    l = o.data[i],
+                    m = [l, o],
+                    V = this.component.legend,
+                    U = V ? V.getColor(s) : this.zr.getColor(t),
+                    d = this.deepMerge(m, "itemStyle.normal") || {},
+                    p = this.deepMerge(m, "itemStyle.emphasis") || {},
+                    c = this.getItemStyleColor(d.color, t, i, l) || U,
+                    u = this.getItemStyleColor(p.color, t, i, l) || ("string" == typeof c ? h.lift(c, -.2) : c),
+                    y = this._calculateControlPoints(e),
+                    g = {
+                      zlevel: o.zlevel,
+                      z: o.z,
+                      clickable: this.deepQuery(m, "clickable"),
+                      style: {
+                        pointList: y,
+                        smooth: "spline",
+                        brushType: "both",
+                        lineJoin: "round",
+                        color: c,
+                        lineWidth: d.borderWidth,
+                        strokeColor: d.borderColor
+                      },
+                      highlightStyle: {
+                        color: u,
+                        lineWidth: p.borderWidth,
+                        strokeColor: p.borderColor
+                      },
+                      draggable: "vertical",
+                      ondragend: this._ondragend
+                    };
+                g = new a(g),
+                    this.addLabel(g, o, l, e.name),
+                    r.pack(g, n[t], t, n[t].data[i], i, n[t].data[i].name),
+                    this.shapeList.push(g)
+              },
+              _calculateControlPoints: function(e) {
+                var t = this._intervalX,
+                    i = e.y,
+                    n = e.evolution,
+                    a = n.length;
+                if (! (1 > a)) {
+                  for (var o = [], r = [], s = 0; a > s; s++) o.push(n[s].timeScale),
+                      r.push(n[s].valueScale);
+                  var l = [];
+                  l.push([o[0], i]);
+                  var s = 0;
+                  for (s = 0; a - 1 > s; s++) l.push([(o[s] + o[s + 1]) / 2, r[s] / -2 + i]);
+                  for (l.push([(o[s] + (o[s] + t)) / 2, r[s] / -2 + i]), l.push([o[s] + t, i]), l.push([(o[s] + (o[s] + t)) / 2, r[s] / 2 + i]), s = a - 1; s > 0; s--) l.push([(o[s] + o[s - 1]) / 2, r[s - 1] / 2 + i]);
+                  return l
+                }
+              },
+              ondragend: function(e, t) {
+                this.isDragend && e.target && (t.dragOut = !0, t.dragIn = !0, t.needRefresh = !1, this.isDragend = !1)
+              },
+              refresh: function(e) {
+                e && (this.option = e, this.series = e.series),
+                    this.backupShapeList(),
+                    this._buildShape()
+              }
+            },
+                l.inherits(t, i),
+                e("../chart").define("eventRiver", t),
+                t
+          }),
+      i("echarts/layout/eventRiver", ["require"],
+          function() {
+            function e(e, i, o) {
+              function r(e, t) {
+                var i = e.importance,
+                    n = t.importance;
+                return i > n ? -1 : n > i ? 1 : 0
+              }
+              for (var s = 4,
+                       l = 0; l < e.length; l++) {
+                for (var h = 0; h < e[l].data.length; h++) {
+                  null == e[l].data[h].weight && (e[l].data[h].weight = 1);
+                  for (var m = 0,
+                           V = 0; V < e[l].data[h].evolution.length; V++) m += e[l].data[h].evolution[V].valueScale;
+                  e[l].data[h].importance = m * e[l].data[h].weight
+                }
+                e[l].data.sort(r)
+              }
+              for (var l = 0; l < e.length; l++) {
+                null == e[l].weight && (e[l].weight = 1);
+                for (var m = 0,
+                         h = 0; h < e[l].data.length; h++) m += e[l].data[h].weight;
+                e[l].importance = m * e[l].weight
+              }
+              e.sort(r);
+              for (var U = Number.MAX_VALUE,
+                       d = 0,
+                       l = 0; l < e.length; l++) for (var h = 0; h < e[l].data.length; h++) for (var V = 0; V < e[l].data[h].evolution.length; V++) {
+                var p = e[l].data[h].evolution[V].timeScale;
+                U = Math.min(U, p),
+                    d = Math.max(d, p)
+              }
+              U = ~~U,
+                  d = ~~d;
+              for (var c = function() {
+                var e = d - U + 1 + ~~i;
+                if (0 >= e) return [0];
+                for (var t = []; e--;) t.push(0);
+                return t
+              } (), u = c.slice(0), y = [], g = 0, b = 0, l = 0; l < e.length; l++) for (var h = 0; h < e[l].data.length; h++) {
+                var f = e[l].data[h];
+                f.time = [],
+                    f.value = [];
+                for (var k, x = 0,
+                         V = 0; V < e[l].data[h].evolution.length; V++) k = e[l].data[h].evolution[V],
+                    f.time.push(k.timeScale),
+                    f.value.push(k.valueScale),
+                    x = Math.max(x, k.valueScale);
+                n(f, i, U),
+                    f.y = a(u, f,
+                        function(e, t) {
+                          return e.ypx[t]
+                        }),
+                    f._offset = a(c, f,
+                        function() {
+                          return s
+                        }),
+                    g = Math.max(g, f.y + x),
+                    b = Math.max(b, f._offset),
+                    y.push(f)
+              }
+              t(y, o, g, b)
+            }
+            function t(e, t, i, n) {
+              for (var a = t.height,
+                       o = n / a > .5 ? .5 : 1, r = t.y, s = (t.height - n) / i, l = 0, h = e.length; h > l; l++) {
+                var m = e[l];
+                m.y = r + s * m.y + m._offset * o,
+                    delete m.time,
+                    delete m.value,
+                    delete m.xpx,
+                    delete m.ypx,
+                    delete m._offset;
+                for (var V = m.evolution,
+                         U = 0,
+                         d = V.length; d > U; U++) V[U].valueScale *= s
+              }
+            }
+            function i(e, t, i, n) {
+              if (e === i) throw new Error("x0 is equal with x1!!!");
+              if (t === n) return function() {
+                return t
+              };
+              var a = (t - n) / (e - i),
+                  o = (n * e - t * i) / (e - i);
+              return function(e) {
+                return a * e + o
+              }
+            }
+            function n(e, t, n) {
+              var a = ~~t,
+                  o = e.time.length;
+              e.xpx = [],
+                  e.ypx = [];
+              for (var r, s = 0,
+                       l = 0,
+                       h = 0,
+                       m = 0,
+                       V = 0; o > s; s++) {
+                l = ~~e.time[s],
+                    m = e.value[s] / 2,
+                    s === o - 1 ? (h = l + a, V = 0) : (h = ~~e.time[s + 1], V = e.value[s + 1] / 2),
+                    r = i(l, m, h, V);
+                for (var U = l; h > U; U++) e.xpx.push(U - n),
+                    e.ypx.push(r(U))
+              }
+              e.xpx.push(h - n),
+                  e.ypx.push(V)
+            }
+            function a(e, t, i) {
+              for (var n, a = 0,
+                       o = t.xpx.length,
+                       r = 0; o > r; r++) n = i(t, r),
+                  a = Math.max(a, n + e[t.xpx[r]]);
+              for (r = 0; o > r; r++) n = i(t, r),
+                  e[t.xpx[r]] = a + n;
+              return a
+            }
+            return e
+          }),
+      i("echarts/chart/venn", ["require", "./base", "zrender/shape/Text", "zrender/shape/Circle", "zrender/shape/Path", "../config", "../util/ecData", "zrender/tool/util", "../chart"],
+          function(e) {
+            function t(e, t, n, a, o) {
+              i.call(this, e, t, n, a, o),
+                  this.refresh(a)
+            }
+            var i = e("./base"),
+                n = e("zrender/shape/Text"),
+                a = e("zrender/shape/Circle"),
+                o = e("zrender/shape/Path"),
+                r = e("../config");
+            r.venn = {
+              zlevel: 0,
+              z: 1,
+              calculable: !1
+            };
+            var s = e("../util/ecData"),
+                l = e("zrender/tool/util");
+            return t.prototype = {
+              type: r.CHART_TYPE_VENN,
+              _buildShape: function() {
+                this.selectedMap = {},
+                    this._symbol = this.option.symbolList,
+                    this._queryTarget,
+                    this._dropBoxList = [],
+                    this._vennDataCounter = 0;
+                for (var e = this.series,
+                         t = this.component.legend,
+                         i = 0; i < e.length; i++) if (e[i].type === r.CHART_TYPE_VENN) {
+                  e[i] = this.reformOption(e[i]);
+                  var n = e[i].name || "";
+                  if (this.selectedMap[n] = t ? t.isSelected(n) : !0, !this.selectedMap[n]) continue;
+                  this._buildVenn(i)
+                }
+                this.addShapeList()
+              },
+              _buildVenn: function(e) {
+                var t, i, n = this.series[e],
+                    a = n.data;
+                a[0].value > a[1].value ? (t = this.zr.getHeight() / 3, i = t * Math.sqrt(a[1].value) / Math.sqrt(a[0].value)) : (i = this.zr.getHeight() / 3, t = i * Math.sqrt(a[0].value) / Math.sqrt(a[1].value));
+                var o = this.zr.getWidth() / 2 - t,
+                    r = (t + i) / 2 * Math.sqrt(a[2].value) / Math.sqrt((a[0].value + a[1].value) / 2),
+                    s = t + i;
+                0 !== a[2].value && (s = this._getCoincideLength(a[0].value, a[1].value, a[2].value, t, i, r, Math.abs(t - i), t + i));
+                var l = o + s,
+                    h = this.zr.getHeight() / 2;
+                if (this._buildItem(e, 0, a[0], o, h, t), this._buildItem(e, 1, a[1], l, h, i), 0 !== a[2].value && a[2].value !== a[0].value && a[2].value !== a[1].value) {
+                  var m = (t * t - i * i) / (2 * s) + s / 2,
+                      V = s / 2 - (t * t - i * i) / (2 * s),
+                      U = Math.sqrt(t * t - m * m),
+                      d = 0,
+                      p = 0;
+                  a[0].value > a[1].value && o + m > l && (p = 1),
+                  a[0].value < a[1].value && o + V > l && (d = 1),
+                      this._buildCoincideItem(e, 2, a[2], o + m, h - U, h + U, t, i, d, p)
+                }
+              },
+              _getCoincideLength: function(e, t, i, n, a, o, r, s) {
+                var l = (n * n - a * a) / (2 * o) + o / 2,
+                    h = o / 2 - (n * n - a * a) / (2 * o),
+                    m = Math.acos(l / n),
+                    V = Math.acos(h / a),
+                    U = n * n * Math.PI,
+                    d = m * n * n - l * n * Math.sin(m) + V * a * a - h * a * Math.sin(V),
+                    p = d / U,
+                    c = i / e,
+                    u = Math.abs(p / c);
+                return u > .999 && 1.001 > u ? o: .999 >= u ? (s = o, o = (o + r) / 2, this._getCoincideLength(e, t, i, n, a, o, r, s)) : (r = o, o = (o + s) / 2, this._getCoincideLength(e, t, i, n, a, o, r, s))
+              },
+              _buildItem: function(e, t, i, n, a, o) {
+                var r = this.series,
+                    l = r[e],
+                    h = this.getCircle(e, t, i, n, a, o);
+                if (s.pack(h, l, e, i, t, i.name), this.shapeList.push(h), l.itemStyle.normal.label.show) {
+                  var m = this.getLabel(e, t, i, n, a, o);
+                  s.pack(m, l, e, l.data[t], t, l.data[t].name),
+                      this.shapeList.push(m)
+                }
+              },
+              _buildCoincideItem: function(e, t, i, n, a, r, l, h, m, V) {
+                var U = this.series,
+                    d = U[e],
+                    p = [i, d],
+                    c = this.deepMerge(p, "itemStyle.normal") || {},
+                    u = this.deepMerge(p, "itemStyle.emphasis") || {},
+                    y = c.color || this.zr.getColor(t),
+                    g = u.color || this.zr.getColor(t),
+                    b = "M" + n + "," + a + "A" + l + "," + l + ",0," + m + ",1," + n + "," + r + "A" + h + "," + h + ",0," + V + ",1," + n + "," + a,
+                    f = {
+                      color: y,
+                      path: b
+                    },
+                    k = {
+                      zlevel: d.zlevel,
+                      z: d.z,
+                      style: f,
+                      highlightStyle: {
+                        color: g,
+                        lineWidth: u.borderWidth,
+                        strokeColor: u.borderColor
+                      }
+                    };
+                k = new o(k),
+                k.buildPathArray && (k.style.pathArray = k.buildPathArray(f.path)),
+                    s.pack(k, U[e], 0, i, t, i.name),
+                    this.shapeList.push(k)
+              },
+              getCircle: function(e, t, i, n, o, r) {
+                var s = this.series[e],
+                    l = [i, s],
+                    h = this.deepMerge(l, "itemStyle.normal") || {},
+                    m = this.deepMerge(l, "itemStyle.emphasis") || {},
+                    V = h.color || this.zr.getColor(t),
+                    U = m.color || this.zr.getColor(t),
+                    d = {
+                      zlevel: s.zlevel,
+                      z: s.z,
+                      clickable: !0,
+                      style: {
+                        x: n,
+                        y: o,
+                        r: r,
+                        brushType: "fill",
+                        opacity: 1,
+                        color: V
+                      },
+                      highlightStyle: {
+                        color: U,
+                        lineWidth: m.borderWidth,
+                        strokeColor: m.borderColor
+                      }
+                    };
+                return this.deepQuery([i, s, this.option], "calculable") && (this.setCalculable(d), d.draggable = !0),
+                    new a(d)
+              },
+              getLabel: function(e, t, i, a, o, r) {
+                var s = this.series[e],
+                    l = s.itemStyle,
+                    h = [i, s],
+                    m = this.deepMerge(h, "itemStyle.normal") || {},
+                    V = "normal",
+                    U = l[V].label,
+                    d = U.textStyle || {},
+                    p = this.getLabelText(t, i, V),
+                    c = this.getFont(d),
+                    u = m.color || this.zr.getColor(t),
+                    y = d.fontSize || 12,
+                    g = {
+                      zlevel: s.zlevel,
+                      z: s.z,
+                      style: {
+                        x: a,
+                        y: o - r - y,
+                        color: d.color || u,
+                        text: p,
+                        textFont: c,
+                        textAlign: "center"
+                      }
+                    };
+                return new n(g)
+              },
+              getLabelText: function(e, t, i) {
+                var n = this.series,
+                    a = n[0],
+                    o = this.deepQuery([t, a], "itemStyle." + i + ".label.formatter");
+                return o ? "function" == typeof o ? o(a.name, t.name, t.value) : "string" == typeof o ? (o = o.replace("{a}", "{a0}").replace("{b}", "{b0}").replace("{c}", "{c0}"), o = o.replace("{a0}", a.name).replace("{b0}", t.name).replace("{c0}", t.value)) : void 0 : t.name
+              },
+              refresh: function(e) {
+                e && (this.option = e, this.series = e.series),
+                    this._buildShape()
+              }
+            },
+                l.inherits(t, i),
+                e("../chart").define("venn", t),
+                t
+          }),
+      i("echarts/chart/treemap", ["require", "./base", "zrender/tool/area", "zrender/shape/Rectangle", "zrender/shape/Text", "zrender/shape/Line", "../layout/TreeMap", "../data/Tree", "../config", "../util/ecData", "zrender/config", "zrender/tool/event", "zrender/tool/util", "zrender/tool/color", "../chart"],
+          function(e) {
+            function t(e, t, n, a, o) {
+              i.call(this, e, t, n, a, o),
+                  this.refresh(a);
+              var r = this;
+              r._onclick = function(e) {
+                return r.__onclick(e)
+              },
+                  r.zr.on(V.EVENT.CLICK, r._onclick)
+            }
+            var i = e("./base"),
+                n = e("zrender/tool/area"),
+                a = e("zrender/shape/Rectangle"),
+                o = e("zrender/shape/Text"),
+                r = e("zrender/shape/Line"),
+                s = e("../layout/TreeMap"),
+                l = e("../data/Tree"),
+                h = e("../config");
+            h.treemap = {
+              zlevel: 0,
+              z: 1,
+              calculable: !1,
+              clickable: !0,
+              center: ["50%", "50%"],
+              size: ["80%", "80%"],
+              root: "",
+              itemStyle: {
+                normal: {
+                  label: {
+                    show: !0,
+                    x: 5,
+                    y: 12,
+                    textStyle: {
+                      align: "left",
+                      color: "#000",
+                      fontFamily: "Arial",
+                      fontSize: 13,
+                      fontStyle: "normal",
+                      fontWeight: "normal"
+                    }
+                  },
+                  breadcrumb: {
+                    show: !0,
+                    textStyle: {}
+                  },
+                  borderWidth: 1,
+                  borderColor: "#ccc",
+                  childBorderWidth: 1,
+                  childBorderColor: "#ccc"
+                },
+                emphasis: {}
+              }
+            };
+            var m = e("../util/ecData"),
+                V = e("zrender/config"),
+                U = (e("zrender/tool/event"), e("zrender/tool/util")),
+                d = e("zrender/tool/color");
+            return t.prototype = {
+              type: h.CHART_TYPE_TREEMAP,
+              refresh: function(e) {
+                this.clear(),
+                e && (this.option = e, this.series = this.option.series),
+                    this._treesMap = {};
+                for (var t = this.series,
+                         i = this.component.legend,
+                         n = 0; n < t.length; n++) if (t[n].type === h.CHART_TYPE_TREEMAP) {
+                  t[n] = this.reformOption(t[n]);
+                  var a = t[n].name || "";
+                  if (this.selectedMap[a] = i ? i.isSelected(a) : !0, !this.selectedMap[a]) continue;
+                  this._buildSeries(t[n], n)
+                }
+              },
+              _buildSeries: function(e, t) {
+                var i = l.fromOptionData(e.name, e.data);
+                this._treesMap[t] = i;
+                var n = e.root && i.getNodeById(e.root) || i.root;
+                this._buildTreemap(n, t)
+              },
+              _buildTreemap: function(e, t) {
+                for (var i = this.shapeList,
+                         n = 0; n < i.length;) {
+                  var a = i[n];
+                  m.get(a, "seriesIndex") === t ? (this.zr.delShape(i[n]), i.splice(n, 1)) : n++
+                }
+                for (var o = i.length,
+                         r = this.series[t], l = r.itemStyle, h = this.parsePercent(r.size[0], this.zr.getWidth()) || 400, V = this.parsePercent(r.size[1], this.zr.getHeight()) || 500, U = this.parseCenter(this.zr, r.center), d = U[0] - .5 * h, p = U[1] - .5 * V, c = h * V, u = 0, y = [], g = e.children, n = 0; n < g.length; n++) u += g[n].data.value;
+                for (var b = 0; b < g.length; b++) y.push(g[b].data.value * c / u);
+                for (var f = new s({
+                  x: d,
+                  y: p,
+                  width: h,
+                  height: V
+                }), k = f.run(y), x = 0; x < k.length; x++) {
+                  var _ = g[x].data,
+                      L = k[x],
+                      W = [_.itemStyle, l],
+                      X = this.deepMerge(W);
+                  X.normal.color || (X.normal.color = this.zr.getColor(x)),
+                  X.emphasis.color || (X.emphasis.color = X.normal.color),
+                      this._buildItem(_, X, L, t, x),
+                  _.children && this._buildChildrenTreemap(_.children, X, L, t)
+                }
+                this.query(r, "itemStyle.normal.breadcrumb.show") && this._buildBreadcrumb(e, t, d, p + V);
+                for (var n = o; n < i.length; n++) this.zr.addShape(i[n])
+              },
+              _buildItem: function(e, t, i, n, a) {
+                var o = this.series,
+                    r = this.getRectangle(e, t, i);
+                m.pack(r, o[n], n, e, a, e.name),
+                    this.shapeList.push(r)
+              },
+              getRectangle: function(e, t, i) {
+                var n = t.emphasis,
+                    o = t.normal,
+                    r = this.getLabel(t, i, e.name, e.value),
+                    s = this.option.hoverable,
+                    l = {
+                      zlevel: this.getZlevelBase(),
+                      z: this.getZBase(),
+                      hoverable: s,
+                      clickable: !0,
+                      style: U.merge({
+                            x: i.x,
+                            y: i.y,
+                            width: i.width,
+                            height: i.height,
+                            brushType: "both",
+                            color: o.color,
+                            lineWidth: o.borderWidth,
+                            strokeColor: o.borderColor
+                          },
+                          r.style, !0),
+                      highlightStyle: U.merge({
+                            color: n.color,
+                            lineWidth: n.borderWidth,
+                            strokeColor: n.borderColor
+                          },
+                          r.highlightStyle, !0)
+                    };
+                return new a(l)
+              },
+              getLabel: function(e, t, i, a) {
+                var o = e.normal.label.textStyle,
+                    r = [e.emphasis.label.textStyle, o],
+                    s = this.deepMerge(r),
+                    l = e.normal.label.formatter,
+                    h = this.getLabelText(i, a, l),
+                    m = this.getFont(o),
+                    V = n.getTextWidth(h, m),
+                    U = n.getTextHeight(h, m),
+                    d = this.deepQuery([e.emphasis, e.normal], "label.formatter"),
+                    p = this.getLabelText(i, a, d),
+                    c = this.getFont(s),
+                    u = n.getTextWidth(h, c),
+                    y = n.getTextHeight(h, c);
+                e.normal.label.show ? (e.normal.label.x + V > t.width || e.normal.label.y + U > t.height) && (h = "") : h = "",
+                    e.emphasis.label.show ? (s.x + u > t.width || s.y + y > t.height) && (p = "") : p = "";
+                var g = {
+                  style: {
+                    textX: t.x + e.normal.label.x,
+                    textY: t.y + e.normal.label.y,
+                    text: h,
+                    textPosition: "specific",
+                    textColor: o.color,
+                    textFont: m
+                  },
+                  highlightStyle: {
+                    textX: t.x + e.emphasis.label.x,
+                    textY: t.y + e.emphasis.label.y,
+                    text: p,
+                    textColor: s.color,
+                    textPosition: "specific"
+                  }
+                };
+                return g
+              },
+              getLabelText: function(e, t, i) {
+                return i ? "function" == typeof i ? i.call(this.myChart, e, t) : "string" == typeof i ? (i = i.replace("{b}", "{b0}").replace("{c}", "{c0}"), i = i.replace("{b0}", e).replace("{c0}", t)) : void 0 : e
+              },
+              _buildChildrenTreemap: function(e, t, i, n) {
+                for (var a = i.width * i.height,
+                         o = 0,
+                         r = [], l = 0; l < e.length; l++) o += e[l].value;
+                for (var h = 0; h < e.length; h++) r.push(e[h].value * a / o);
+                for (var V = new s({
+                  x: i.x,
+                  y: i.y,
+                  width: i.width,
+                  height: i.height
+                }), U = V.run(r), d = t.normal.childBorderWidth, p = t.normal.childBorderColor, c = 0; c < U.length; c++) {
+                  var u = U[c],
+                      y = [];
+                  i.y.toFixed(2) !== u.y.toFixed(2) && y.push(this._getLine(u.x, u.y, u.x + u.width, u.y, d, p)),
+                  i.x.toFixed(2) !== u.x.toFixed(2) && y.push(this._getLine(u.x, u.y, u.x, u.y + u.height, d, p)),
+                  (i.y + i.height).toFixed(2) !== (u.y + u.height).toFixed(2) && y.push(this._getLine(u.x, u.y + u.height, u.x + u.width, u.y + u.height, d, p)),
+                  (i.x + i.width).toFixed(2) !== (u.x + u.width).toFixed(2) && y.push(this._getLine(u.x + u.width, u.y, u.x + u.width, u.y + u.height, d, p));
+                  for (var g = 0; g < y.length; g++) m.set(y[g], "seriesIndex", n),
+                      this.shapeList.push(y[g])
+                }
+              },
+              _getLine: function(e, t, i, n, a, o) {
+                var s = {
+                  zlevel: this.getZlevelBase(),
+                  z: this.getZBase(),
+                  hoverable: !1,
+                  style: {
+                    xStart: e,
+                    yStart: t,
+                    xEnd: i,
+                    yEnd: n,
+                    lineWidth: a,
+                    strokeColor: o
+                  }
+                };
+                return new r(s)
+              },
+              _buildBreadcrumb: function(e, t, i, n) {
+                for (var a = [], r = e; r;) a.unshift(r.data.name),
+                    r = r.parent;
+                for (var s = this.series[t], l = this.query(s, "itemStyle.normal.breadcrumb.textStyle") || {},
+                         h = this.query(s, "itemStyle.emphasis.breadcrumb.textStyle") || {},
+                         V = {
+                           y: n + 10,
+                           textBaseline: "top",
+                           textAlign: "left",
+                           color: l.color,
+                           textFont: this.getFont(l)
+                         },
+                         p = {
+                           brushType: "fill",
+                           color: h.color || d.lift(l.color, -.3),
+                           textFont: this.getFont(h)
+                         },
+                         c = 0; c < a.length; c++) {
+                  var u = new o({
+                    zlevel: this.getZlevelBase(),
+                    z: this.getZBase(),
+                    style: U.merge({
+                          x: i,
+                          text: a[c] + (a.length - 1 - c ? " > ": "")
+                        },
+                        V),
+                    clickable: !0,
+                    highlightStyle: p
+                  });
+                  m.set(u, "seriesIndex", t),
+                      m.set(u, "name", a[c]),
+                      i += u.getRect(u.style).width,
+                      this.shapeList.push(u)
+                }
+              },
+              __onclick: function(e) {
+                var t = e.target;
+                if (t) {
+                  var i = m.get(t, "seriesIndex"),
+                      n = m.get(t, "name"),
+                      a = this._treesMap[i],
+                      o = a.getNodeById(n);
+                  o && o.children.length && this._buildTreemap(o, i)
+                }
+              }
+            },
+                U.inherits(t, i),
+                e("../chart").define("treemap", t),
+                t
+          }),
+      i("echarts/layout/TreeMap", ["require"],
+          function() {
+            function e(e) { ({
+              x: e.x,
+              y: e.y,
+              width: e.width,
+              height: e.height
+            });
+              this.x = e.x,
+                  this.y = e.y,
+                  this.width = e.width,
+                  this.height = e.height
+            }
+            return e.prototype.run = function(e) {
+              var t = [];
+              return this._squarify(e, {
+                    x: this.x,
+                    y: this.y,
+                    width: this.width,
+                    height: this.height
+                  },
+                  t),
+                  t
+            },
+                e.prototype._squarify = function(e, t, i) {
+                  var n = "VERTICAL",
+                      a = t.width,
+                      o = t.height;
+                  t.width < t.height && (n = "HORIZONTAL", a = t.height, o = t.width);
+                  for (var r = this._getShapeListInAbstractRow(e, a, o), s = 0; s < r.length; s++) {
+                    r[s].x = 0,
+                        r[s].y = 0;
+                    for (var l = 0; s > l; l++) r[s].y += r[l].height
+                  }
+                  var h = {};
+                  if ("VERTICAL" == n) {
+                    for (var m = 0; m < r.length; m++) i.push({
+                      x: r[m].x + t.x,
+                      y: r[m].y + t.y,
+                      width: r[m].width,
+                      height: r[m].height
+                    });
+                    h = {
+                      x: r[0].width + t.x,
+                      y: t.y,
+                      width: t.width - r[0].width,
+                      height: t.height
+                    }
+                  } else {
+                    for (var V = 0; V < r.length; V++) i.push({
+                      x: r[V].y + t.x,
+                      y: r[V].x + t.y,
+                      width: r[V].height,
+                      height: r[V].width
+                    });
+                    h = {
+                      x: t.x,
+                      y: t.y + r[0].width,
+                      width: t.width,
+                      height: t.height - r[0].width
+                    }
+                  }
+                  var U = e.slice(r.length);
+                  0 !== U.length && this._squarify(U, h, i)
+                },
+                e.prototype._getShapeListInAbstractRow = function(e, t, i) {
+                  if (1 === e.length) return [{
+                    width: t,
+                    height: i
+                  }];
+                  for (var n = 1; n < e.length; n++) {
+                    var a = this._placeFixedNumberRectangles(e.slice(0, n), t, i),
+                        o = this._placeFixedNumberRectangles(e.slice(0, n + 1), t, i);
+                    if (this._isFirstBetter(a, o)) return a
+                  }
+                },
+                e.prototype._placeFixedNumberRectangles = function(e, t, i) {
+                  for (var n = e.length,
+                           a = [], o = 0, r = 0; r < e.length; r++) o += e[r];
+                  for (var s = o / i,
+                           l = 0; n > l; l++) {
+                    var h = i * e[l] / o;
+                    a.push({
+                      width: s,
+                      height: h
+                    })
+                  }
+                  return a
+                },
+                e.prototype._isFirstBetter = function(e, t) {
+                  var i = e[0].height / e[0].width;
+                  i = i > 1 ? 1 / i: i;
+                  var n = t[0].height / t[0].width;
+                  return n = n > 1 ? 1 / n: n,
+                      Math.abs(i - 1) <= Math.abs(n - 1) ? !0 : !1
+                },
+                e
+          }),
+      i("echarts/data/Tree", ["require", "zrender/tool/util"],
+          function(e) {
+            function t(e, t) {
+              this.id = e,
+                  this.depth = 0,
+                  this.height = 0,
+                  this.children = [],
+                  this.parent = null,
+                  this.data = t || null
+            }
+            function i(e) {
+              this.root = new t(e)
+            }
+            var n = e("zrender/tool/util");
+            return t.prototype.add = function(e) {
+              var t = this.children;
+              e.parent !== this && (t.push(e), e.parent = this)
+            },
+                t.prototype.remove = function(e) {
+                  var t = this.children,
+                      i = n.indexOf(t, e);
+                  i >= 0 && (t.splice(i, 1), e.parent = null)
+                },
+                t.prototype.traverse = function(e, t) {
+                  e.call(t, this);
+                  for (var i = 0; i < this.children.length; i++) this.children[i].traverse(e, t)
+                },
+                t.prototype.updateDepthAndHeight = function(e) {
+                  var t = 0;
+                  this.depth = e;
+                  for (var i = 0; i < this.children.length; i++) {
+                    var n = this.children[i];
+                    n.updateDepthAndHeight(e + 1),
+                    n.height > t && (t = n.height)
+                  }
+                  this.height = t + 1
+                },
+                t.prototype.getNodeById = function(e) {
+                  if (this.id === e) return this;
+                  for (var t = 0; t < this.children.length; t++) {
+                    var i = this.children[t].getNodeById(e);
+                    if (i) return i
+                  }
+                },
+                i.prototype.traverse = function(e, t) {
+                  this.root.traverse(e, t)
+                },
+                i.prototype.getSubTree = function(e) {
+                  var t = this.getNodeById(e);
+                  if (t) {
+                    var n = new i(t.id);
+                    return n.root = t,
+                        n
+                  }
+                },
+                i.prototype.getNodeById = function(e) {
+                  return this.root.getNodeById(e)
+                },
+                i.fromOptionData = function(e, n) {
+                  function a(e, i) {
+                    var n = new t(e.name, e);
+                    i.add(n);
+                    var o = e.children;
+                    if (o) for (var r = 0; r < o.length; r++) a(o[r], n)
+                  }
+                  var o = new i(e),
+                      r = o.root;
+                  r.data = {
+                    name: e,
+                    children: n
+                  };
+                  for (var s = 0; s < n.length; s++) a(n[s], r);
+                  return o.root.updateDepthAndHeight(0),
+                      o
+                },
+                i.fromGraph = function(e) {
+                  function n(t) {
+                    for (var i = e.getNodeById(t.id), a = 0; a < i.outEdges.length; a++) {
+                      var r = i.outEdges[a],
+                          s = o[r.node2.id];
+                      t.children.push(s),
+                          n(s)
+                    }
+                  }
+                  for (var a = {},
+                           o = {},
+                           r = 0; r < e.nodes.length; r++) {
+                    var s, l = e.nodes[r];
+                    0 === l.inDegree() ? (a[l.id] = new i(l.id), s = a[l.id].root) : s = new t(l.id),
+                        s.data = l.data,
+                        o[l.id] = s
+                  }
+                  var h = [];
+                  for (var m in a) n(a[m].root),
+                      a[m].root.updateDepthAndHeight(0),
+                      h.push(a[m]);
+                  return h
+                },
+                i
+          }),
+      i("echarts/chart/tree", ["require", "./base", "../util/shape/Icon", "zrender/shape/Image", "zrender/shape/Line", "zrender/shape/BezierCurve", "../layout/Tree", "../data/Tree", "../config", "../util/ecData", "zrender/config", "zrender/tool/event", "zrender/tool/util", "../chart"],
+          function(e) {
+            function t(e, t, n, a, o) {
+              i.call(this, e, t, n, a, o),
+                  this.refresh(a)
+            }
+            var i = e("./base"),
+                n = .618,
+                a = e("../util/shape/Icon"),
+                o = e("zrender/shape/Image"),
+                r = e("zrender/shape/Line"),
+                s = e("zrender/shape/BezierCurve"),
+                l = e("../layout/Tree"),
+                h = e("../data/Tree"),
+                m = e("../config");
+            m.tree = {
+              zlevel: 1,
+              z: 2,
+              calculable: !1,
+              clickable: !0,
+              rootLocation: {},
+              orient: "vertical",
+              symbol: "circle",
+              symbolSize: 20,
+              nodePadding: 30,
+              layerPadding: 100,
+              itemStyle: {
+                normal: {
+                  label: {
+                    show: !0
+                  },
+                  lineStyle: {
+                    width: 1,
+                    color: "#777",
+                    type: "curve"
+                  }
+                },
+                emphasis: {}
+              }
+            };
+            var V = e("../util/ecData"),
+                U = (e("zrender/config"), e("zrender/tool/event"), e("zrender/tool/util"));
+            return t.prototype = {
+              type: m.CHART_TYPE_TREE,
+              _buildShape: function(e, t) {
+                var i = e.data[0];
+                this.tree = h.fromOptionData(i.name, i.children),
+                    this.tree.root.data = i,
+                    this._setTreeShape(e),
+                    this.tree.traverse(function(i) {
+                          this._buildItem(i, e, t),
+                          i.children.length > 0 && this._buildLink(i, e)
+                        },
+                        this);
+                var n = e.roam === !0 || "move" === e.roam,
+                    a = e.roam === !0 || "scale" === e.roam;
+                this.zr.modLayer(this.getZlevelBase(), {
+                  panable: n,
+                  zoomable: a
+                }),
+                (this.query("markPoint.effect.show") || this.query("markLine.effect.show")) && this.zr.modLayer(m.EFFECT_ZLEVEL, {
+                  panable: n,
+                  zoomable: a
+                }),
+                    this.addShapeList()
+              },
+              _buildItem: function(e, t, i) {
+                var n = [e.data, t],
+                    r = this.deepQuery(n, "symbol"),
+                    s = this.deepMerge(n, "itemStyle.normal") || {},
+                    l = this.deepMerge(n, "itemStyle.emphasis") || {},
+                    h = s.color || this.zr.getColor(),
+                    m = l.color || this.zr.getColor(),
+                    U = -e.layout.angle || 0;
+                e.id === this.tree.root.id && (U = 0);
+                var d = "right";
+                Math.abs(U) >= Math.PI / 2 && Math.abs(U) < 3 * Math.PI / 2 && (U += Math.PI, d = "left");
+                var p = [U, e.layout.position[0], e.layout.position[1]],
+                    c = new a({
+                      zlevel: this.getZlevelBase(),
+                      z: this.getZBase() + 1,
+                      rotation: p,
+                      clickable: this.deepQuery(n, "clickable"),
+                      style: {
+                        x: e.layout.position[0] - .5 * e.layout.width,
+                        y: e.layout.position[1] - .5 * e.layout.height,
+                        width: e.layout.width,
+                        height: e.layout.height,
+                        iconType: r,
+                        color: h,
+                        brushType: "both",
+                        lineWidth: s.borderWidth,
+                        strokeColor: s.borderColor
+                      },
+                      highlightStyle: {
+                        color: m,
+                        lineWidth: l.borderWidth,
+                        strokeColor: l.borderColor
+                      }
+                    });
+                c.style.iconType.match("image") && (c.style.image = c.style.iconType.replace(new RegExp("^image:\\/\\/"), ""), c = new o({
+                  rotation: p,
+                  style: c.style,
+                  highlightStyle: c.highlightStyle,
+                  clickable: c.clickable,
+                  zlevel: this.getZlevelBase(),
+                  z: this.getZBase()
+                })),
+                this.deepQuery(n, "itemStyle.normal.label.show") && (c.style.text = null == e.data.label ? e.id: e.data.label, c.style.textPosition = this.deepQuery(n, "itemStyle.normal.label.position"), "radial" === t.orient && "inside" !== c.style.textPosition && (c.style.textPosition = d), c.style.textColor = this.deepQuery(n, "itemStyle.normal.label.textStyle.color"), c.style.textFont = this.getFont(this.deepQuery(n, "itemStyle.normal.label.textStyle") || {})),
+                this.deepQuery(n, "itemStyle.emphasis.label.show") && (c.highlightStyle.textPosition = this.deepQuery(n, "itemStyle.emphasis.label.position"), c.highlightStyle.textColor = this.deepQuery(n, "itemStyle.emphasis.label.textStyle.color"), c.highlightStyle.textFont = this.getFont(this.deepQuery(n, "itemStyle.emphasis.label.textStyle") || {})),
+                    V.pack(c, t, i, e.data, 0, e.id),
+                    this.shapeList.push(c)
+              },
+              _buildLink: function(e, t) {
+                var i = t.itemStyle.normal.lineStyle;
+                if ("broken" === i.type) return void this._buildBrokenLine(e, i, t);
+                for (var n = 0; n < e.children.length; n++) {
+                  var a = e.layout.position[0],
+                      o = e.layout.position[1],
+                      r = e.children[n].layout.position[0],
+                      s = e.children[n].layout.position[1];
+                  switch (i.type) {
+                    case "curve":
+                      this._buildBezierCurve(e, e.children[n], i, t);
+                      break;
+                    case "broken":
+                      break;
+                    default:
+                      var l = this._getLine(a, o, r, s, i);
+                      this.shapeList.push(l)
+                  }
+                }
+              },
+              _buildBrokenLine: function(e, t, i) {
+                var a = U.clone(t);
+                a.type = "solid";
+                var o = [],
+                    r = e.layout.position[0],
+                    s = e.layout.position[1],
+                    l = i.orient,
+                    h = e.children[0].layout.position[1],
+                    m = r,
+                    V = s + (h - s) * (1 - n),
+                    d = e.children[0].layout.position[0],
+                    p = V,
+                    c = e.children[e.children.length - 1].layout.position[0],
+                    u = V;
+                if ("horizontal" === l) {
+                  var y = e.children[0].layout.position[0];
+                  m = r + (y - r) * (1 - n),
+                      V = s,
+                      d = m,
+                      p = e.children[0].layout.position[1],
+                      c = m,
+                      u = e.children[e.children.length - 1].layout.position[1]
+                }
+                o.push(this._getLine(r, s, m, V, a)),
+                    o.push(this._getLine(d, p, c, u, a));
+                for (var g = 0; g < e.children.length; g++) y = e.children[g].layout.position[0],
+                    h = e.children[g].layout.position[1],
+                    "horizontal" === l ? p = h: d = y,
+                    o.push(this._getLine(d, p, y, h, a));
+                this.shapeList = this.shapeList.concat(o)
+              },
+              _getLine: function(e, t, i, n, a) {
+                return e === i && (e = i = this.subPixelOptimize(e, a.width)),
+                t === n && (t = n = this.subPixelOptimize(t, a.width)),
+                    new r({
+                      zlevel: this.getZlevelBase(),
+                      hoverable: !1,
+                      style: U.merge({
+                            xStart: e,
+                            yStart: t,
+                            xEnd: i,
+                            yEnd: n,
+                            lineType: a.type,
+                            strokeColor: a.color,
+                            lineWidth: a.width
+                          },
+                          a, !0)
+                    })
+              },
+              _buildBezierCurve: function(e, t, i, a) {
+                var o = n,
+                    r = a.orient,
+                    l = e.layout.position[0],
+                    h = e.layout.position[1],
+                    m = t.layout.position[0],
+                    V = t.layout.position[1],
+                    d = l,
+                    p = (V - h) * o + h,
+                    c = m,
+                    u = (V - h) * (1 - o) + h;
+                if ("horizontal" === r) d = (m - l) * o + l,
+                    p = h,
+                    c = (m - l) * (1 - o) + l,
+                    u = V;
+                else if ("radial" === r) if (e.id === this.tree.root.id) d = (m - l) * o + l,
+                    p = (V - h) * o + h,
+                    c = (m - l) * (1 - o) + l,
+                    u = (V - h) * (1 - o) + h;
+                else {
+                  var y = e.layout.originPosition[0],
+                      g = e.layout.originPosition[1],
+                      b = t.layout.originPosition[0],
+                      f = t.layout.originPosition[1],
+                      k = this.tree.root.layout.position[0],
+                      x = this.tree.root.layout.position[1];
+                  d = y,
+                      p = (f - g) * o + g,
+                      c = b,
+                      u = (f - g) * (1 - o) + g;
+                  var _ = (d - this.minX) / this.width * Math.PI * 2;
+                  d = p * Math.cos(_) + k,
+                      p = p * Math.sin(_) + x,
+                      _ = (c - this.minX) / this.width * Math.PI * 2,
+                      c = u * Math.cos(_) + k,
+                      u = u * Math.sin(_) + x
+                }
+                var L = new s({
+                  zlevel: this.getZlevelBase(),
+                  hoverable: !1,
+                  style: U.merge({
+                        xStart: l,
+                        yStart: h,
+                        cpX1: d,
+                        cpY1: p,
+                        cpX2: c,
+                        cpY2: u,
+                        xEnd: m,
+                        yEnd: V,
+                        strokeColor: i.color,
+                        lineWidth: i.width
+                      },
+                      i, !0)
+                });
+                this.shapeList.push(L)
+              },
+              _setTreeShape: function(e) {
+                var t = new l({
+                  nodePadding: e.nodePadding,
+                  layerPadding: e.layerPadding
+                });
+                this.tree.traverse(function(t) {
+                      var i = [t.data, e],
+                          n = this.deepQuery(i, "symbolSize");
+                      "number" == typeof n && (n = [n, n]),
+                          t.layout = {
+                            width: n[0],
+                            height: n[1]
+                          }
+                    },
+                    this),
+                    t.run(this.tree);
+                var i = e.orient,
+                    n = e.rootLocation.x,
+                    a = e.rootLocation.y,
+                    o = this.zr.getWidth(),
+                    r = this.zr.getHeight();
+                n = "center" === n ? .5 * o: this.parsePercent(n, o),
+                    a = "center" === a ? .5 * r: this.parsePercent(a, r),
+                    a = this.parsePercent(a, r),
+                "horizontal" === i && (n = isNaN(n) ? 10 : n, a = isNaN(a) ? .5 * r: a),
+                    "radial" === i ? (n = isNaN(n) ? .5 * o: n, a = isNaN(a) ? .5 * r: a) : (n = isNaN(n) ? .5 * o: n, a = isNaN(a) ? 10 : a);
+                var s = this.tree.root.layout.position[0];
+                if ("radial" === i) {
+                  var h = 1 / 0,
+                      m = 0,
+                      V = 0;
+                  this.tree.traverse(function(e) {
+                    m = Math.max(m, e.layout.position[0]),
+                        h = Math.min(h, e.layout.position[0]),
+                        V = Math.max(V, e.layout.width)
+                  }),
+                      this.width = m - h + 2 * V,
+                      this.minX = h
+                }
+                this.tree.traverse(function(t) {
+                      var o, r;
+                      if ("vertical" === i && "inverse" === e.direction) o = t.layout.position[0] - s + n,
+                          r = a - t.layout.position[1];
+                      else if ("vertical" === i) o = t.layout.position[0] - s + n,
+                          r = t.layout.position[1] + a;
+                      else if ("horizontal" === i && "inverse" === e.direction) r = t.layout.position[0] - s + a,
+                          o = n - t.layout.position[1];
+                      else if ("horizontal" === i) r = t.layout.position[0] - s + a,
+                          o = t.layout.position[1] + n;
+                      else {
+                        o = t.layout.position[0],
+                            r = t.layout.position[1],
+                            t.layout.originPosition = [o, r];
+                        var l = r,
+                            m = (o - h) / this.width * Math.PI * 2;
+                        o = l * Math.cos(m) + n,
+                            r = l * Math.sin(m) + a,
+                            t.layout.angle = m
+                      }
+                      t.layout.position[0] = o,
+                          t.layout.position[1] = r
+                    },
+                    this)
+              },
+              refresh: function(e) {
+                this.clear(),
+                e && (this.option = e, this.series = this.option.series);
+                for (var t = this.series,
+                         i = this.component.legend,
+                         n = 0; n < t.length; n++) if (t[n].type === m.CHART_TYPE_TREE) {
+                  t[n] = this.reformOption(t[n]);
+                  var a = t[n].name || "";
+                  if (this.selectedMap[a] = i ? i.isSelected(a) : !0, !this.selectedMap[a]) continue;
+                  this._buildSeries(t[n], n)
+                }
+              },
+              _buildSeries: function(e, t) {
+                this._buildShape(e, t)
+              }
+            },
+                U.inherits(t, i),
+                e("../chart").define("tree", t),
+                t
+          }),
+      i("echarts/layout/Tree", ["require", "zrender/tool/vector"],
+          function(e) {
+            function t(e) {
+              e = e || {},
+                  this.nodePadding = e.nodePadding || 30,
+                  this.layerPadding = e.layerPadding || 100,
+                  this._layerOffsets = [],
+                  this._layers = []
+            }
+            var i = e("zrender/tool/vector");
+            return t.prototype.run = function(e) {
+              this._layerOffsets.length = 0;
+              for (var t = 0; t < e.root.height + 1; t++) this._layerOffsets[t] = 0,
+                  this._layers[t] = [];
+              this._updateNodeXPosition(e.root);
+              var i = e.root;
+              this._updateNodeYPosition(i, 0, i.layout.height)
+            },
+                t.prototype._updateNodeXPosition = function(e) {
+                  var t = 1 / 0,
+                      n = -(1 / 0);
+                  e.layout.position = e.layout.position || i.create();
+                  for (var a = 0; a < e.children.length; a++) {
+                    var o = e.children[a];
+                    this._updateNodeXPosition(o);
+                    var r = o.layout.position[0];
+                    t > r && (t = r),
+                    r > n && (n = r)
+                  }
+                  e.layout.position[0] = e.children.length > 0 ? (t + n) / 2 : 0;
+                  var s = this._layerOffsets[e.depth] || 0;
+                  if (s > e.layout.position[0]) {
+                    var l = s - e.layout.position[0];
+                    this._shiftSubtree(e, l);
+                    for (var a = e.depth + 1; a < e.height + e.depth; a++) this._layerOffsets[a] += l
+                  }
+                  this._layerOffsets[e.depth] = e.layout.position[0] + e.layout.width + this.nodePadding,
+                      this._layers[e.depth].push(e)
+                },
+                t.prototype._shiftSubtree = function(e, t) {
+                  e.layout.position[0] += t;
+                  for (var i = 0; i < e.children.length; i++) this._shiftSubtree(e.children[i], t)
+                },
+                t.prototype._updateNodeYPosition = function(e, t, i) {
+                  e.layout.position[1] = t;
+                  for (var n = 0,
+                           a = 0; a < e.children.length; a++) n = Math.max(e.children[a].layout.height, n);
+                  var o = this.layerPadding;
+                  "function" == typeof o && (o = o(e.depth));
+                  for (var a = 0; a < e.children.length; a++) this._updateNodeYPosition(e.children[a], t + o + i, n)
+                },
+                t
+          }),
+      i("echarts/chart/wordCloud", ["require", "./base", "zrender/shape/Text", "../layout/WordCloud", "../component/grid", "../component/dataRange", "../config", "../util/ecData", "zrender/tool/util", "zrender/tool/color", "../chart"],
+          function(e) {
+            function t(e, t, n, a, o) {
+              i.call(this, e, t, n, a, o),
+                  this.refresh(a)
+            }
+            var i = e("./base"),
+                n = e("zrender/shape/Text"),
+                a = e("../layout/WordCloud");
+            e("../component/grid"),
+                e("../component/dataRange");
+            var o = e("../config"),
+                r = e("../util/ecData"),
+                s = e("zrender/tool/util"),
+                l = e("zrender/tool/color");
+            return o.wordCloud = {
+              zlevel: 0,
+              z: 2,
+              clickable: !0,
+              center: ["50%", "50%"],
+              size: ["40%", "40%"],
+              textRotation: [0, 90],
+              textPadding: 0,
+              autoSize: {
+                enable: !0,
+                minSize: 12
+              },
+              itemStyle: {
+                normal: {
+                  textStyle: {
+                    fontSize: function(e) {
+                      return e.value
+                    }
+                  }
+                }
+              }
+            },
+                t.prototype = {
+                  type: o.CHART_TYPE_WORDCLOUD,
+                  refresh: function(e) {
+                    e && (this.option = e, this.series = e.series),
+                        this._init()
+                  },
+                  _init: function() {
+                    var e = this.series;
+                    this.backupShapeList();
+                    for (var t = this.component.legend,
+                             i = 0; i < e.length; i++) if (e[i].type === o.CHART_TYPE_WORDCLOUD) {
+                      e[i] = this.reformOption(e[i]);
+                      var n = e[i].name || "";
+                      if (this.selectedMap[n] = t ? t.isSelected(n) : !0, !this.selectedMap[n]) continue;
+                      this.buildMark(i),
+                          this._initSerie(e[i])
+                    }
+                  },
+                  _initSerie: function(e) {
+                    var t = e.itemStyle.normal.textStyle,
+                        i = [this.parsePercent(e.size[0], this.zr.getWidth()) || 200, this.parsePercent(e.size[1], this.zr.getHeight()) || 200],
+                        n = this.parseCenter(this.zr, e.center),
+                        o = {
+                          size: i,
+                          wordletype: {
+                            autoSizeCal: e.autoSize
+                          },
+                          center: n,
+                          rotate: e.textRotation,
+                          padding: e.textPadding,
+                          font: t.fontFamily,
+                          fontSize: t.fontSize,
+                          fontWeight: t.fontWeight,
+                          fontStyle: t.fontStyle,
+                          text: function(e) {
+                            return e.name
+                          },
+                          data: e.data
+                        },
+                        r = new a(o),
+                        s = this;
+                    r.end(function(e) {
+                      s._buildShapes(e)
+                    }),
+                        r.start()
+                  },
+                  _buildShapes: function(e) {
+                    for (var t = e.length,
+                             i = 0; t > i; i++) this._buildTextShape(e[i], 0, i);
+                    this.addShapeList()
+                  },
+                  _buildTextShape: function(e, t, i) {
+                    var a = this.series,
+                        o = a[t],
+                        s = o.name || "",
+                        h = o.data[i],
+                        m = [h, o],
+                        V = this.component.legend,
+                        U = V ? V.getColor(s) : this.zr.getColor(t),
+                        d = this.deepMerge(m, "itemStyle.normal") || {},
+                        p = this.deepMerge(m, "itemStyle.emphasis") || {},
+                        c = this.getItemStyleColor(d.color, t, i, h) || U,
+                        u = this.getItemStyleColor(p.color, t, i, h) || ("string" == typeof c ? l.lift(c, -.2) : c),
+                        y = new n({
+                          zlevel: o.zlevel,
+                          z: o.z,
+                          hoverable: !0,
+                          clickable: this.deepQuery(m, "clickable"),
+                          style: {
+                            x: 0,
+                            y: 0,
+                            text: e.text,
+                            color: c,
+                            textFont: [e.style, e.weight, e.size + "px", e.font].join(" "),
+                            textBaseline: "alphabetic",
+                            textAlign: "center"
+                          },
+                          highlightStyle: {
+                            brushType: p.borderWidth ? "both": "fill",
+                            color: u,
+                            lineWidth: p.borderWidth || 0,
+                            strokeColor: p.borderColor
+                          },
+                          position: [e.x, e.y],
+                          rotation: [ - e.rotate / 180 * Math.PI, 0, 0]
+                        });
+                    r.pack(y, o, t, h, i, h.name),
+                        this.shapeList.push(y)
+                  }
+                },
+                s.inherits(t, i),
+                e("../chart").define("wordCloud", t),
+                t
+          }),
+      i("echarts/layout/WordCloud", ["require", "../layout/WordCloudRectZero", "zrender/tool/util"],
+          function(e) {
+            function t(e) {
+              this._init(e)
+            }
+            var i = e("../layout/WordCloudRectZero"),
+                n = e("zrender/tool/util");
+            return t.prototype = {
+              start: function() {
+                function e() {
+                  p.totalArea = r,
+                  U.autoSizeCal.enable && p._autoCalTextSize(m, r, a, o, U.autoSizeCal.minSize),
+                  V.timer && clearInterval(V.timer),
+                      V.timer = setInterval(t, 0),
+                      t()
+                }
+                function t() {
+                  for (var e, t = +new Date,
+                           i = m.length; + new Date - t < V.timeInterval && ++s < i && V.timer;) e = m[s],
+                      e.x = d[0] >> 1,
+                      e.y = d[1] >> 1,
+                      p._cloudSprite(e, m, s),
+                  e.hasText && p._place(n, e, h) && (l.push(e), e.x -= d[0] >> 1, e.y -= d[1] >> 1);
+                  s >= i && (p.stop(), p._fixTagPosition(l), V.endcallback(l))
+                }
+                var n = null,
+                    a = 0,
+                    o = 0,
+                    r = 0,
+                    s = -1,
+                    l = [],
+                    h = null,
+                    m = this.wordsdata,
+                    V = this.defaultOption,
+                    U = V.wordletype,
+                    d = V.size,
+                    p = this,
+                    c = new i({
+                      type: U.type,
+                      width: d[0],
+                      height: d[1]
+                    });
+                return c.calculate(function(t) {
+                      n = t.initarr,
+                          a = t.maxWit,
+                          o = t.maxHit,
+                          r = t.area,
+                          h = t.imgboard,
+                          e()
+                    },
+                    this),
+                    this
+              },
+              _fixTagPosition: function(e) {
+                for (var t = this.defaultOption.center,
+                         i = 0,
+                         n = e.length; n > i; i++) e[i].x += t[0],
+                    e[i].y += t[1]
+              },
+              stop: function() {
+                return this.defaultOption.timer && (clearInterval(this.defaultOption.timer), this.defaultOption.timer = null),
+                    this
+              },
+              end: function(e) {
+                return e && (this.defaultOption.endcallback = e),
+                    this
+              },
+              _init: function(e) {
+                this.defaultOption = {},
+                    this._initProperty(e),
+                    this._initMethod(e),
+                    this._initCanvas(),
+                    this._initData(e.data)
+              },
+              _initData: function(e) {
+                var t = this,
+                    i = t.defaultOption;
+                this.wordsdata = e.map(function(e, n) {
+                  return e.text = i.text.call(t, e, n),
+                      e.font = i.font.call(t, e, n),
+                      e.style = i.fontStyle.call(t, e, n),
+                      e.weight = i.fontWeight.call(t, e, n),
+                      e.rotate = i.rotate.call(t, e, n),
+                      e.size = ~~i.fontSize.call(t, e, n),
+                      e.padding = i.padding.call(t, e, n),
+                      e
+                }).sort(function(e, t) {
+                  return t.value - e.value
+                })
+              },
+              _initMethod: function(e) {
+                function t(e) {
+                  return e.name
+                }
+                function i() {
+                  return "sans-serif"
+                }
+                function n() {
+                  return "normal"
+                }
+                function a(e) {
+                  return e.value
+                }
+                function o() {
+                  return 0
+                }
+                function r(e) {
+                  return function() {
+                    return e[Math.round(Math.random() * (e.length - 1))]
+                  }
+                }
+                function s() {
+                  return 0
+                }
+                function l(e) {
+                  var t = e[0] / e[1];
+                  return function(e) {
+                    return [t * (e *= .1) * Math.cos(e), e * Math.sin(e)]
+                  }
+                }
+                function h(e) {
+                  var t = 4,
+                      i = t * e[0] / e[1],
+                      n = 0,
+                      a = 0;
+                  return function(e) {
+                    var o = 0 > e ? -1 : 1;
+                    switch (Math.sqrt(1 + 4 * o * e) - o & 3) {
+                      case 0:
+                        n += i;
+                        break;
+                      case 1:
+                        a += t;
+                        break;
+                      case 2:
+                        n -= i;
+                        break;
+                      default:
+                        a -= t
+                    }
+                    return [n, a]
+                  }
+                }
+                function m(e) {
+                  return "function" == typeof e ? e: function() {
+                    return e
+                  }
+                }
+                var V = this.defaultOption;
+                V.text = e.text ? m(e.text) : t,
+                    V.font = e.font ? m(e.font) : i,
+                    V.fontSize = e.fontSize ? m(e.fontSize) : a,
+                    V.fontStyle = e.fontStyle ? m(e.fontStyle) : n,
+                    V.fontWeight = e.fontWeight ? m(e.fontWeight) : n,
+                    V.rotate = e.rotate ? r(e.rotate) : o,
+                    V.padding = e.padding ? m(e.padding) : s,
+                    V.center = e.center,
+                    V.spiral = l,
+                    V.endcallback = function() {},
+                    V.rectangularSpiral = h,
+                    V.archimedeanSpiral = l
+              },
+              _initProperty: function(e) {
+                var t = this.defaultOption;
+                t.size = e.size || [256, 256],
+                    t.wordletype = e.wordletype,
+                    t.words = e.words || [],
+                    t.timeInterval = 1 / 0,
+                    t.timer = null,
+                    t.spirals = {
+                      archimedean: t.archimedeanSpiral,
+                      rectangular: t.rectangularSpiral
+                    },
+                    n.merge(t, {
+                      size: [256, 256],
+                      wordletype: {
+                        type: "RECT",
+                        areaPresent: .058,
+                        autoSizeCal: {
+                          enable: !0,
+                          minSize: 12
+                        }
+                      }
+                    })
+              },
+              _initCanvas: function() {
+                var e, t = Math.PI / 180,
+                    i = 64,
+                    n = 2048,
+                    a = 1;
+                "undefined" != typeof document ? (e = document.createElement("canvas"), e.width = 1, e.height = 1, a = Math.sqrt(e.getContext("2d").getImageData(0, 0, 1, 1).data.length >> 2), e.width = (i << 5) / a, e.height = n / a) : e = new Canvas(i << 5, n);
+                var o = e.getContext("2d");
+                o.fillStyle = o.strokeStyle = "red",
+                    o.textAlign = "center",
+                    this.defaultOption.c = o,
+                    this.defaultOption.cw = i,
+                    this.defaultOption.ch = n,
+                    this.defaultOption.ratio = a,
+                    this.defaultOption.cloudRadians = t
+              },
+              _cloudSprite: function(e, t, i) {
+                if (!e.sprite) {
+                  var n = this.defaultOption.cw,
+                      a = this.defaultOption.ch,
+                      o = this.defaultOption.c,
+                      r = this.defaultOption.ratio,
+                      s = this.defaultOption.cloudRadians;
+                  o.clearRect(0, 0, (n << 5) / r, a / r);
+                  var l = 0,
+                      h = 0,
+                      m = 0,
+                      V = t.length;
+                  for (--i; ++i < V;) {
+                    e = t[i],
+                        o.save(),
+                        o.font = e.style + " " + e.weight + " " + ~~ ((e.size + 1) / r) + "px " + e.font;
+                    var U = o.measureText(e.text + "m").width * r,
+                        d = e.size << 1;
+                    if (e.rotate) {
+                      var p = Math.sin(e.rotate * s),
+                          c = Math.cos(e.rotate * s),
+                          u = U * c,
+                          y = U * p,
+                          g = d * c,
+                          b = d * p;
+                      U = Math.max(Math.abs(u + b), Math.abs(u - b)) + 31 >> 5 << 5,
+                          d = ~~Math.max(Math.abs(y + g), Math.abs(y - g))
+                    } else U = U + 31 >> 5 << 5;
+                    if (d > m && (m = d), l + U >= n << 5 && (l = 0, h += m, m = 0), h + d >= a) break;
+                    o.translate((l + (U >> 1)) / r, (h + (d >> 1)) / r),
+                    e.rotate && o.rotate(e.rotate * s),
+                        o.fillText(e.text, 0, 0),
+                    e.padding && (o.lineWidth = 2 * e.padding, o.strokeText(e.text, 0, 0)),
+                        o.restore(),
+                        e.width = U,
+                        e.height = d,
+                        e.xoff = l,
+                        e.yoff = h,
+                        e.x1 = U >> 1,
+                        e.y1 = d >> 1,
+                        e.x0 = -e.x1,
+                        e.y0 = -e.y1,
+                        e.hasText = !0,
+                        l += U
+                  }
+                  for (var f = o.getImageData(0, 0, (n << 5) / r, a / r).data, k = []; --i >= 0;) if (e = t[i], e.hasText) {
+                    for (var U = e.width,
+                             x = U >> 5,
+                             d = e.y1 - e.y0,
+                             _ = 0; d * x > _; _++) k[_] = 0;
+                    if (l = e.xoff, null == l) return;
+                    h = e.yoff;
+                    for (var L = 0,
+                             W = -1,
+                             X = 0; d > X; X++) {
+                      for (var _ = 0; U > _; _++) {
+                        var v = x * X + (_ >> 5),
+                            w = f[(h + X) * (n << 5) + (l + _) << 2] ? 1 << 31 - _ % 32 : 0;
+                        k[v] |= w,
+                            L |= w
+                      }
+                      L ? W = X: (e.y0++, d--, X--, h++)
+                    }
+                    e.y1 = e.y0 + W,
+                        e.sprite = k.slice(0, (e.y1 - e.y0) * x)
+                  }
+                }
+              },
+              _place: function(e, t, i) {
+                function n(e, t, i) {
+                  i >>= 5;
+                  for (var n, a = e.sprite,
+                           o = e.width >> 5,
+                           r = e.x - (o << 4), s = 127 & r, l = 32 - s, h = e.y1 - e.y0, m = (e.y + e.y0) * i + (r >> 5), V = 0; h > V; V++) {
+                    n = 0;
+                    for (var U = 0; o >= U; U++) if ((n << l | (o > U ? (n = a[V * o + U]) >>> s: 0)) & t[m + U]) return ! 0;
+                    m += i
+                  }
+                  return ! 1
+                }
+                function a(e, t) {
+                  return t.row[e.y] && t.cloumn[e.x] && e.x >= t.row[e.y].start && e.x <= t.row[e.y].end && e.y >= t.cloumn[e.x].start && e.y <= t.cloumn[e.x].end
+                }
+                for (var o, r, s, l = this.defaultOption.size,
+                         h = ([{
+                           x: 0,
+                           y: 0
+                         },
+                           {
+                             x: l[0],
+                             y: l[1]
+                           }], t.x), m = t.y, V = Math.sqrt(l[0] * l[0] + l[1] * l[1]), U = this.defaultOption.spiral(l), d = Math.random() < .5 ? 1 : -1, p = -d; (o = U(p += d)) && (r = ~~o[0], s = ~~o[1], !(Math.min(r, s) > V));) if (t.x = h + r, t.y = m + s, !(t.x + t.x0 < 0 || t.y + t.y0 < 0 || t.x + t.x1 > l[0] || t.y + t.y1 > l[1]) && !n(t, e, l[0]) && a(t, i)) {
+                  for (var c, u = t.sprite,
+                           y = t.width >> 5,
+                           g = l[0] >> 5, b = t.x - (y << 4), f = 127 & b, k = 32 - f, x = t.y1 - t.y0, _ = (t.y + t.y0) * g + (b >> 5), L = 0; x > L; L++) {
+                    c = 0;
+                    for (var W = 0; y >= W; W++) e[_ + W] |= c << k | (y > W ? (c = u[L * y + W]) >>> f: 0);
+                    _ += g
+                  }
+                  return delete t.sprite,
+                      !0
+                }
+                return ! 1
+              },
+              _autoCalTextSize: function(e, t, i, n, a) {
+                function o(e) {
+                  c.clearRect(0, 0, (d << 5) / u, p / u),
+                      c.save(),
+                      c.font = e.style + " " + e.weight + " " + ~~ ((e.size + 1) / u) + "px " + e.font;
+                  var t = c.measureText(e.text + "m").width * u,
+                      r = e.size << 1;
+                  t = t + 31 >> 5 << 5,
+                      c.restore(),
+                      e.aw = t,
+                      e.ah = r;
+                  var s, l, h;
+                  if (e.rotate) {
+                    var m = Math.sin(e.rotate * y),
+                        V = Math.cos(e.rotate * y),
+                        g = t * V,
+                        b = t * m,
+                        f = r * V,
+                        k = r * m;
+                    l = Math.max(Math.abs(g + k), Math.abs(g - k)) + 31 >> 5 << 5,
+                        h = ~~Math.max(Math.abs(b + f), Math.abs(b - f))
+                  }
+                  return e.size <= U || e.rotate && t * r <= e.area && i >= l && n >= h || t * r <= e.area && i >= t && n >= r ? void(e.area = t * r) : (s = e.rotate && l > i && h > n ? Math.min(i / l, n / h) : t > i || r > n ? Math.min(i / t, n / r) : Math.sqrt(e.area / (e.aw * e.ah)), e.size = ~~ (s * e.size), e.size < a ? void(e.size = a) : o(e))
+                }
+                function r(e, t) {
+                  for (var i = e.length,
+                           n = 0; i--;) n += t(e[i]);
+                  return n
+                }
+                for (var s, l, h = r(e,
+                    function(e) {
+                      return e.size
+                    }), m = e.length, V = .25, U = a, d = this.defaultOption.cw, p = this.defaultOption.ch, c = this.defaultOption.c, u = this.defaultOption.ratio, y = this.defaultOption.cloudRadians; m--;) s = e[m],
+                    l = s.size / h,
+                    s.areapre = V ? V > l ? l: V: l,
+                    s.area = t * s.areapre,
+                    s.totalarea = t,
+                    o(s)
+              }
+            },
+                t
+          }),
+      i("echarts/layout/WordCloudRectZero", ["require"],
+          function() {
+            function e(e) {
+              this.defaultOption = {
+                type: "RECT"
+              },
+                  this._init(e)
+            }
+            return e.prototype = {
+              RECT: "_calculateRect",
+              _init: function(e) {
+                this._initOption(e),
+                    this._initCanvas()
+              },
+              _initOption: function(e) {
+                for (k in e) this.defaultOption[k] = e[k]
+              },
+              _initCanvas: function() {
+                var e = document.createElement("canvas");
+                e.width = 1,
+                    e.height = 1;
+                var t = Math.sqrt(e.getContext("2d").getImageData(0, 0, 1, 1).data.length >> 2);
+                if (e.width = this.defaultOption.width, e.height = this.defaultOption.height, e.getContext) var i = e.getContext("2d");
+                this.canvas = e,
+                    this.ctx = i,
+                    this.ratio = t
+              },
+              calculate: function(e, t) {
+                var i = this.defaultOption.type,
+                    n = this[i];
+                this[n].call(this, e, t)
+              },
+              _calculateReturn: function(e, t, i) {
+                t.call(i, e)
+              },
+              _calculateRect: function(e, t) {
+                var i = {},
+                    n = this.defaultOption.width >> 5 << 5,
+                    a = this.defaultOption.height;
+                i.initarr = this._rectZeroArray(n * a),
+                    i.area = n * a,
+                    i.maxHit = a,
+                    i.maxWit = n,
+                    i.imgboard = this._rectBoard(n, a),
+                    this._calculateReturn(i, e, t)
+              },
+              _rectBoard: function(e, t) {
+                for (var i = [], n = 0; t > n; n++) i.push({
+                  y: n,
+                  start: 0,
+                  end: e
+                });
+                for (var a = [], n = 0; e > n; n++) a.push({
+                  x: n,
+                  start: 0,
+                  end: t
+                });
+                return {
+                  row: i,
+                  cloumn: a
+                }
+              },
+              _rectZeroArray: function(e) {
+                for (var t = [], i = e, n = -1; ++n < i;) t[n] = 0;
+                return t
+              }
+            },
+                e
+          }),
+      i("echarts/chart/heatmap", ["require", "./base", "../layer/heatmap", "../config", "../util/ecData", "zrender/tool/util", "zrender/tool/color", "zrender/shape/Image", "../chart"],
+          function(e) {
+            function t(e, t, n, a, o) {
+              i.call(this, e, t, n, a, o),
+                  this.refresh(a)
+            }
+            var i = e("./base"),
+                n = e("../layer/heatmap"),
+                a = e("../config"),
+                o = (e("../util/ecData"), e("zrender/tool/util")),
+                r = (e("zrender/tool/color"), e("zrender/shape/Image"));
+            return a.heatmap = {
+              zlevel: 0,
+              z: 2,
+              clickable: !0
+            },
+                t.prototype = {
+                  type: a.CHART_TYPE_HEATMAP,
+                  refresh: function(e) {
+                    this.clear(),
+                    e && (this.option = e, this.series = e.series),
+                        this._init()
+                  },
+                  _init: function() {
+                    var e = this.series;
+                    this.backupShapeList();
+                    for (var t = e.length,
+                             i = 0; t > i; ++i) if (e[i].type === a.CHART_TYPE_HEATMAP) {
+                      e[i] = this.reformOption(e[i]);
+                      var o = new n(e[i]),
+                          s = o.getCanvas(e[i].data, this.zr.getWidth(), this.zr.getHeight()),
+                          l = new r({
+                            position: [0, 0],
+                            scale: [1, 1],
+                            hoverable: this.option.hoverable,
+                            style: {
+                              x: 0,
+                              y: 0,
+                              image: s,
+                              width: s.width,
+                              height: s.height
+                            }
+                          });
+                      this.shapeList.push(l)
+                    }
+                    this.addShapeList()
+                  }
+                },
+                o.inherits(t, i),
+                e("../chart").define("heatmap", t),
+                t
+          });
+      var n = t("zrender");
+      n.tool = {
+        color: t("zrender/tool/color"),
+        math: t("zrender/tool/math"),
+        util: t("zrender/tool/util"),
+        vector: t("zrender/tool/vector"),
+        area: t("zrender/tool/area"),
+        event: t("zrender/tool/event")
+      },
+          n.animation = {
+            Animation: t("zrender/animation/Animation"),
+            Cip: t("zrender/animation/Clip"),
+            easing: t("zrender/animation/easing")
+          };
+      var a = t("echarts");
+      a.config = t("echarts/config"),
+          a.util = {
+            mapData: {
+              params: t("echarts/util/mapData/params")
+            }
+          },
+          t("echarts/chart/line"),
+          t("echarts/chart/bar"),
+          t("echarts/chart/scatter"),
+          t("echarts/chart/k"),
+          t("echarts/chart/pie"),
+          t("echarts/chart/radar"),
+          t("echarts/chart/chord"),
+          t("echarts/chart/force"),
+          t("echarts/chart/map"),
+          t("echarts/chart/gauge"),
+          t("echarts/chart/funnel"),
+          t("echarts/chart/eventRiver"),
+          t("echarts/chart/venn"),
+          t("echarts/chart/treemap"),
+          t("echarts/chart/tree"),
+          t("echarts/chart/wordCloud"),
+          t("echarts/chart/heatmap"),
+          e.echarts = a,
+          e.zrender = n
+    } (window);
+
+layui.define('echartsTheme',
+    function(exports) {
+      exports('echarts', echarts);
+    });
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/lib/extend/echartsTheme.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/lib/extend/echartsTheme.js
new file mode 100644
index 0000000..093075d
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/lib/extend/echartsTheme.js
@@ -0,0 +1,2 @@
+/** layuiAdmin.std-v1.0.0 LPPL License By http://www.layui.com/admin/ */
+ ;layui.define(function(e){e("echartsTheme",{color:["#009688","#1E9FFF","#5FB878","#FFB980","#D87A80","#8d98b3","#e5cf0d","#97b552","#95706d","#dc69aa","#07a2a4","#9a7fd1","#588dd5","#f5994e","#c05050","#59678c","#c9ab00","#7eb00a","#6f5553","#c14089"],title:{textStyle:{fontWeight:"normal",color:"#666"}},dataRange:{itemWidth:15,color:["#009688","#e0ffff"]},toolbox:{color:["#1e90ff","#1e90ff","#1e90ff","#1e90ff"],effectiveColor:"#ff4500"},tooltip:{backgroundColor:"rgba(50,50,50,0.5)",axisPointer:{type:"line",lineStyle:{color:"#009688"},crossStyle:{color:"#008acd"},shadowStyle:{color:"rgba(200,200,200,0.2)"}}},dataZoom:{dataBackgroundColor:"#efefff",fillerColor:"rgba(182,162,222,0.2)",handleColor:"#008acd"},grid:{borderColor:"#eee"},categoryAxis:{axisLine:{lineStyle:{color:"#009688"}},axisTick:{show:!1},splitLine:{lineStyle:{color:["#eee"]}}},valueAxis:{axisLine:{lineStyle:{color:"#009688"}},splitArea:{show:!0,areaStyle:{color:["rgba(250,250,250,0.1)","rgba(200,200,200,0.1)"]}},splitLine:{lineStyle:{color:["#eee"]}}},polar:{axisLine:{lineStyle:{color:"#ddd"}},splitArea:{show:!0,areaStyle:{color:["rgba(250,250,250,0.2)","rgba(200,200,200,0.2)"]}},splitLine:{lineStyle:{color:"#ddd"}}},timeline:{lineStyle:{color:"#009688"},controlStyle:{normal:{color:"#009688"},emphasis:{color:"#009688"}},symbol:"emptyCircle",symbolSize:3},bar:{itemStyle:{normal:{barBorderRadius:2},emphasis:{barBorderRadius:2}}},line:{smooth:!0,symbol:"emptyCircle",symbolSize:3},k:{itemStyle:{normal:{color:"#d87a80",color0:"#2ec7c9",lineStyle:{color:"#d87a80",color0:"#2ec7c9"}}}},scatter:{symbol:"circle",symbolSize:4},radar:{symbol:"emptyCircle",symbolSize:3},map:{itemStyle:{normal:{areaStyle:{color:"#ddd"},label:{textStyle:{color:"#d87a80"}}},emphasis:{areaStyle:{color:"#fe994e"}}}},force:{itemStyle:{normal:{linkStyle:{color:"#1e90ff"}}}},chord:{itemStyle:{normal:{borderWidth:1,borderColor:"rgba(128, 128, 128, 0.5)",chordStyle:{lineStyle:{color:"rgba(128, 128, 128, 0.5)"}}},emphasis:{borderWidth:1,borderColor:"rgba(128, 128, 128, 0.5)",chordStyle:{lineStyle:{color:"rgba(128, 128, 128, 0.5)"}}}}},gauge:{axisLine:{lineStyle:{color:[[.2,"#2ec7c9"],[.8,"#5ab1ef"],[1,"#d87a80"]],width:10}},axisTick:{splitNumber:10,length:15,lineStyle:{color:"auto"}},splitLine:{length:22,lineStyle:{color:"auto"}},pointer:{width:5}},textStyle:{fontFamily:"微软雅黑, Arial, Verdana, sans-serif"}})});
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/lib/index.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/lib/index.js
new file mode 100644
index 0000000..87cc3cd
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/lib/index.js
@@ -0,0 +1,2 @@
+/** layuiAdmin.std-v1.0.0 LPPL License By http://www.layui.com/admin/ */
+ ;layui.extend({setter:"config",admin:"lib/admin",view:"lib/view"}).define(["setter","admin"],function(a){var e=layui.setter,i=layui.element,n=layui.admin,t=n.tabsPage,d=layui.view,l=function(a,d){var l,b=r("#LAY_app_tabsheader>li"),y=a.replace(/(^http(s*):)|(\?[\s\S]*$)/g,"");if(b.each(function(e){var i=r(this),n=i.attr("lay-id");n===a&&(l=!0,t.index=e)}),d=d||"新标签页",e.pageTabs)l||(r(s).append(['<div class="layadmin-tabsbody-item layui-show">','<iframe src="'+a+'" frameborder="0" class="layadmin-iframe"></iframe>',"</div>"].join("")),t.index=b.length,i.tabAdd(o,{title:"<span>"+d+"</span>",id:a,attr:y}));else{var u=n.tabsBody(n.tabsPage.index).find(".layadmin-iframe");u[0].contentWindow.location.href=a}i.tabChange(o,a),n.tabsBodyChange(t.index,{url:a,text:d})},s="#LAY_app_body",o="layadmin-layout-tabs",r=layui.$;r(window);n.screen()<2&&n.sideFlexible(),layui.config({base:e.base+"modules/"}),layui.each(e.extend,function(a,i){var n={};n[i]="{/}"+e.base+"lib/extend/"+i,layui.extend(n)}),d().autoRender(),layui.use("common"),a("index",{openTabsPage:l})});
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/lib/view.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/lib/view.js
new file mode 100644
index 0000000..6be2dc8
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/lib/view.js
@@ -0,0 +1,2 @@
+/** layuiAdmin.std-v1.0.0 LPPL License By http://www.layui.com/admin/ */
+ ;layui.define(["laytpl","layer"],function(e){var t=layui.jquery,n=layui.laytpl,a=layui.layer,r=layui.setter,o=(layui.device(),layui.hint()),i=function(e){return new d(e)},s="LAY_app_body",d=function(e){this.id=e,this.container=t("#"+(e||s))};i.loading=function(e){e.append(this.elemLoad=t('<i class="layui-anim layui-anim-rotate layui-anim-loop layui-icon layui-icon-loading layadmin-loading"></i>'))},i.removeLoad=function(){this.elemLoad&&this.elemLoad.remove()},i.exit=function(e){layui.data(r.tableName,{key:r.request.tokenName,remove:!0}),e&&e()},i.req=function(e){var n=e.success,a=(e.error,r.request),o=r.response,s=function(){return r.debug?"<br><cite>URL：</cite>"+e.url:""};return e.data=e.data||{},e.headers=e.headers||{},a.tokenName&&(e.data[a.tokenName]=a.tokenName in e.data?e.data[a.tokenName]:layui.data(r.tableName)[a.tokenName]||"",e.headers[a.tokenName]=a.tokenName in e.headers?e.headers[a.tokenName]:layui.data(r.tableName)[a.tokenName]||""),delete e.success,delete e.error,t.ajax(t.extend({type:"get",dataType:"json",success:function(t){var a=o.statusCode;if(t[o.statusName]==a.ok)"function"==typeof e.done&&e.done(t);else if(t[o.statusName]==a.logout)i.exit();else{var r=["<cite>Error：</cite> "+(t[o.msgName]||"返回状态码异常"),s()].join("");i.error(r)}"function"==typeof n&&n(t)},error:function(e,t){var n=["请求异常，请重试<br><cite>错误信息：</cite>"+t,s()].join("");i.error(n),"function"==typeof n&&n(res)}},e))},i.popup=function(e){var n=e.success,r=e.skin;return delete e.success,delete e.skin,a.open(t.extend({type:1,title:"提示",content:"",id:"LAY-system-view-popup",skin:"layui-layer-admin"+(r?" "+r:""),shadeClose:!0,closeBtn:!1,success:function(e,r){var o=t('<i class="layui-icon" close>&#x1006;</i>');e.append(o),o.on("click",function(){a.close(r)}),"function"==typeof n&&n.apply(this,arguments)}},e))},i.error=function(e,n){return i.popup(t.extend({content:e,maxWidth:300,offset:"t",anim:6,id:"LAY_adminError"},n))},d.prototype.render=function(e,n){var a=this;layui.router();return e=r.views+e+r.engine,t("#"+s).children(".layadmin-loading").remove(),i.loading(a.container),t.ajax({url:e,type:"get",dataType:"html",data:{v:layui.cache.version},success:function(e){e="<div>"+e+"</div>";var r=t(e).find("title"),o=r.text()||(e.match(/\<title\>([\s\S]*)\<\/title>/)||[])[1],s={title:o,body:e};r.remove(),a.params=n||{},a.then&&(a.then(s),delete a.then),a.parse(e),i.removeLoad(),a.done&&(a.done(s),delete a.done)},error:function(e){return i.removeLoad(),a.render.isError?i.error("请求视图文件异常，状态："+e.status):(404===e.status?a.render("template/tips/404"):a.render("template/tips/error"),void(a.render.isError=!0))}}),a},d.prototype.parse=function(e,a,r){var s=this,d="object"==typeof e,l=d?e:t(e),u=d?e:l.find("*[template]"),c=function(e){var a=n(e.dataElem.html());e.dataElem.after(a.render(t.extend({params:y.params},e.res))),"function"==typeof r&&r();try{e.done&&new Function("d",e.done)(e.res)}catch(o){console.error(e.dataElem[0],"\n存在错误回调脚本\n\n",o)}},y=layui.router();l.find("title").remove(),s.container[a?"after":"html"](l.children()),y.params=s.params||{};for(var p=u.length;p>0;p--)!function(){var e=u.eq(p-1),t=e.attr("lay-done")||e.attr("lay-then"),a=n(e.attr("lay-url")||"").render(y),r=n(e.attr("lay-data")||"").render(y),s=n(e.attr("lay-headers")||"").render(y);try{r=new Function("return "+r+";")()}catch(d){o.error("lay-data: "+d.message),r={}}try{s=new Function("return "+s+";")()}catch(d){o.error("lay-headers: "+d.message),s=s||{}}a?i.req({type:e.attr("lay-type")||"get",url:a,data:r,dataType:"json",headers:s,success:function(n){c({dataElem:e,res:n,done:t})}}):c({dataElem:e,done:t})}();return s},d.prototype.autoRender=function(e,n){var a=this;t(e||"body").find("*[template]").each(function(e,n){var r=t(this);a.container=r,a.parse(r,"refresh")})},d.prototype.send=function(e,t){var a=n(e||this.container.html()).render(t||{});return this.container.html(a),this},d.prototype.refresh=function(e){var t=this,n=t.container.next(),a=n.attr("lay-templateid");return t.id!=a?t:(t.parse(t.container,"refresh",function(){t.container.siblings('[lay-templateid="'+t.id+'"]:last').remove(),"function"==typeof e&&e()}),t)},d.prototype.then=function(e){return this.then=e,this},d.prototype.done=function(e){return this.done=e,this},e("view",i)});
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/modules/common.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/modules/common.js
new file mode 100644
index 0000000..ba7e6b0
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/modules/common.js
@@ -0,0 +1,33 @@
+/** layuiAdmin.std-v1.0.0 LPPL License By http://www.layui.com/admin/ */
+;
+layui.define(function(e) {
+    var i = (layui.$, layui.layer, layui.laytpl, layui.setter, layui.view, layui.admin);
+    i.events.logout = function() {
+        i.req({
+            url: ctx + "/platform/logout",
+            type: "post",
+            data: {},
+            done: function(e) {
+                i.exit(function() {
+                    location.href = ctx + "/login"
+                })
+            }
+        })
+    };
+    window.localStorage.setItem("status","0");
+    i.events.openVideo = function() {
+        let status = window.localStorage.getItem("status") == null ? 0 : window.localStorage.getItem("status");
+        if(status == 0){
+            layer.msg("开启成功！",{icon:1});
+            layui.$("#video-icon").removeClass("layui-icon-mute").addClass("layui-icon-speaker");
+            window.localStorage.setItem("status","1");
+            layui.$("#au")[0].play();
+        }else{
+            layer.msg("关闭成功！",{icon:1});
+            layui.$("#video-icon").removeClass("layui-icon-speaker").addClass("layui-icon-mute");
+            window.localStorage.setItem("status","0");
+            layui.$("#au")[0].pause();
+        }
+    };
+    e("common", {})
+});
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/modules/console.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/modules/console.js
new file mode 100644
index 0000000..f490440
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/modules/console.js
@@ -0,0 +1,2 @@
+/** layuiAdmin.std-v1.0.0 LPPL License By http://www.layui.com/admin/ */
+ ;layui.define(function(e){layui.use(["admin","carousel"],function(){var e=layui.$,t=(layui.admin,layui.carousel),a=layui.element,i=layui.device();e(".layadmin-carousel").each(function(){var a=e(this);t.render({elem:this,width:"100%",arrow:"none",interval:a.data("interval"),autoplay:a.data("autoplay")===!0,trigger:i.ios||i.android?"click":"hover",anim:a.data("anim")})}),a.render("progress")}),layui.use(["carousel","echarts"],function(){var e=layui.$,t=layui.carousel,a=layui.echarts,i=[],l=[{title:{text:"今日流量趋势",x:"center",textStyle:{fontSize:14}},tooltip:{trigger:"axis"},legend:{data:["",""]},xAxis:[{type:"category",boundaryGap:!1,data:["06:00","06:30","07:00","07:30","08:00","08:30","09:00","09:30","10:00","11:30","12:00","12:30","13:00","13:30","14:00","14:30","15:00","15:30","16:00","16:30","17:00","17:30","18:00","18:30","19:00","19:30","20:00","20:30","21:00","21:30","22:00","22:30","23:00","23:30"]}],yAxis:[{type:"value"}],series:[{name:"PV",type:"line",smooth:!0,itemStyle:{normal:{areaStyle:{type:"default"}}},data:[111,222,333,444,555,666,3333,33333,55555,66666,33333,3333,6666,11888,26666,38888,56666,42222,39999,28888,17777,9666,6555,5555,3333,2222,3111,6999,5888,2777,1666,999,888,777]},{name:"UV",type:"line",smooth:!0,itemStyle:{normal:{areaStyle:{type:"default"}}},data:[11,22,33,44,55,66,333,3333,5555,12666,3333,333,666,1188,2666,3888,6666,4222,3999,2888,1777,966,655,555,333,222,311,699,588,277,166,99,88,77]}]},{title:{text:"访客浏览器分布",x:"center",textStyle:{fontSize:14}},tooltip:{trigger:"item",formatter:"{a} <br/>{b} : {c} ({d}%)"},legend:{orient:"vertical",x:"left",data:["Chrome","Firefox","IE 8.0","Safari","其它浏览器"]},series:[{name:"访问来源",type:"pie",radius:"55%",center:["50%","50%"],data:[{value:9052,name:"Chrome"},{value:1610,name:"Firefox"},{value:3200,name:"IE 8.0"},{value:535,name:"Safari"},{value:1700,name:"其它浏览器"}]}]},{title:{text:"最近一周新增的用户量",x:"center",textStyle:{fontSize:14}},tooltip:{trigger:"axis",formatter:"{b}<br>新增用户：{c}"},xAxis:[{type:"category",data:["11-07","11-08","11-09","11-10","11-11","11-12","11-13"]}],yAxis:[{type:"value"}],series:[{type:"line",data:[200,300,400,610,150,270,380]}]}],n=e("#LAY-index-dataview").children("div"),r=function(e){i[e]=a.init(n[e],layui.echartsTheme),i[e].setOption(l[e]),window.onresize=i[e].resize};if(n[0]){r(0);var o=0;t.on("change(LAY-index-dataview)",function(e){r(o=e.index)}),layui.admin.on("side",function(){setTimeout(function(){r(o)},300)}),layui.admin.on("hash(tab)",function(){layui.router().path.join("")||r(o)})}}),layui.use("table",function(){var e=(layui.$,layui.table);e.render({elem:"#LAY-index-topSearch",url:layui.setter.base+"json/console/top-search.js",page:!0,cols:[[{type:"numbers",fixed:"left"},{field:"keywords",title:"关键词",minWidth:300,templet:'<div><a href="https://www.baidu.com/s?wd={{ d.keywords }}" target="_blank" class="layui-table-link">{{ d.keywords }}</div>'},{field:"frequency",title:"搜索次数",minWidth:120,sort:!0},{field:"userNums",title:"用户数",sort:!0}]],skin:"line"}),e.render({elem:"#LAY-index-topCard",url:layui.setter.base+"json/console/top-card.js",page:!0,cellMinWidth:120,cols:[[{type:"numbers",fixed:"left"},{field:"title",title:"标题",minWidth:300,templet:'<div><a href="{{ d.href }}" target="_blank" class="layui-table-link">{{ d.title }}</div>'},{field:"username",title:"发帖者"},{field:"channel",title:"类别"},{field:"crt",title:"点击率",sort:!0}]],skin:"line"})}),e("console",{})});
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/modules/contlist.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/modules/contlist.js
new file mode 100644
index 0000000..fa69474
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/modules/contlist.js
@@ -0,0 +1,2 @@
+/** layuiAdmin.std-v1.0.0 LPPL License By http://www.layui.com/admin/ */
+ ;layui.define(["table","form"],function(t){var e=layui.$,i=layui.table,n=layui.form;i.render({elem:"#LAY-app-content-list",url:layui.setter.base+"json/content/list.js",cols:[[{type:"checkbox",fixed:"left"},{field:"id",width:100,title:"文章ID",sort:!0},{field:"label",title:"文章标签",minWidth:100},{field:"title",title:"文章标题"},{field:"author",title:"作者"},{field:"uploadtime",title:"上传时间",sort:!0},{field:"status",title:"发布状态",templet:"#buttonTpl",minWidth:80,align:"center"},{title:"操作",minWidth:150,align:"center",fixed:"right",toolbar:"#table-content-list"}]],page:!0,limit:10,limits:[10,15,20,25,30],text:"对不起，加载出现异常！"}),i.on("tool(LAY-app-content-list)",function(t){var e=t.data;"del"===t.event?layer.confirm("确定删除此文章？",function(e){t.del(),layer.close(e)}):"edit"===t.event&&layer.open({type:2,title:"编辑文章",content:"../../../views/app/content/listform.html?id="+e.id,maxmin:!0,area:["550px","550px"],btn:["确定","取消"],yes:function(e,i){var l=window["layui-layer-iframe"+e],a=i.find("iframe").contents().find("#layuiadmin-app-form-edit");l.layui.form.on("submit(layuiadmin-app-form-edit)",function(i){var l=i.field;t.update({label:l.label,title:l.title,author:l.author,status:l.status}),n.render(),layer.close(e)}),a.trigger("click")}})}),i.render({elem:"#LAY-app-content-tags",url:layui.setter.base+"json/content/tags.js",cols:[[{type:"numbers",fixed:"left"},{field:"id",width:100,title:"ID",sort:!0},{field:"tags",title:"分类名",minWidth:100},{title:"操作",width:150,align:"center",fixed:"right",toolbar:"#layuiadmin-app-cont-tagsbar"}]],text:"对不起，加载出现异常！"}),i.on("tool(LAY-app-content-tags)",function(t){var i=t.data;if("del"===t.event)layer.confirm("确定删除此分类？",function(e){t.del(),layer.close(e)});else if("edit"===t.event){e(t.tr);layer.open({type:2,title:"编辑分类",content:"../../../views/app/content/tagsform.html?id="+i.id,area:["450px","200px"],btn:["确定","取消"],yes:function(e,i){var n=i.find("iframe").contents().find("#layuiadmin-app-form-tags"),l=n.find('input[name="tags"]').val();l.replace(/\s/g,"")&&(t.update({tags:l}),layer.close(e))},success:function(t,e){var n=t.find("iframe").contents().find("#layuiadmin-app-form-tags").click();n.find('input[name="tags"]').val(i.tags)}})}}),i.render({elem:"#LAY-app-content-comm",url:layui.setter.base+"json/content/comment.js",cols:[[{type:"checkbox",fixed:"left"},{field:"id",width:100,title:"ID",sort:!0},{field:"reviewers",title:"评论者",minWidth:100},{field:"content",title:"评论内容",minWidth:100},{field:"commtime",title:"评论时间",minWidth:100,sort:!0},{title:"操作",width:150,align:"center",fixed:"right",toolbar:"#table-content-com"}]],page:!0,limit:10,limits:[10,15,20,25,30],text:"对不起，加载出现异常！"}),i.on("tool(LAY-app-content-comm)",function(t){t.data;"del"===t.event?layer.confirm("确定删除此条评论？",function(e){t.del(),layer.close(e)}):"edit"===t.event&&layer.open({type:2,title:"编辑评论",content:"../../../views/app/content/contform.html",area:["450px","300px"],btn:["确定","取消"],yes:function(t,e){var n=window["layui-layer-iframe"+t],l="layuiadmin-app-comm-submit",a=e.find("iframe").contents().find("#"+l);n.layui.form.on("submit("+l+")",function(e){e.field;i.reload("LAY-app-content-comm"),layer.close(t)}),a.trigger("click")},success:function(t,e){}})}),t("contlist",{})});
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/modules/forum.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/modules/forum.js
new file mode 100644
index 0000000..8c8bb12
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/modules/forum.js
@@ -0,0 +1,2 @@
+/** layuiAdmin.std-v1.0.0 LPPL License By http://www.layui.com/admin/ */
+ ;layui.define(["table","form"],function(e){var t=layui.$,i=layui.table;layui.form;i.render({elem:"#LAY-app-forum-list",url:layui.setter.base+"json/forum/list.js",cols:[[{type:"checkbox",fixed:"left"},{field:"id",width:100,title:"ID",sort:!0},{field:"poster",title:"发帖人"},{field:"avatar",title:"头像",width:100,templet:"#imgTpl"},{field:"content",title:"发帖内容"},{field:"posttime",title:"发帖时间",sort:!0},{field:"top",title:"置顶",templet:"#buttonTpl",minWidth:80,align:"center"},{title:"操作",width:150,align:"center",fixed:"right",toolbar:"#table-forum-list"}]],page:!0,limit:10,limits:[10,15,20,25,30],text:"对不起，加载出现异常！"}),i.on("tool(LAY-app-forum-list)",function(e){e.data;if("del"===e.event)layer.confirm("确定删除此条帖子？",function(t){e.del(),layer.close(t)});else if("edit"===e.event){t(e.tr);layer.open({type:2,title:"编辑帖子",content:"../../../views/app/forum/listform.html",area:["550px","400px"],btn:["确定","取消"],resize:!1,yes:function(e,t){var l=window["layui-layer-iframe"+e],r="LAY-app-forum-submit",o=t.find("iframe").contents().find("#"+r);l.layui.form.on("submit("+r+")",function(t){t.field;i.reload("LAY-app-forum-list"),layer.close(e)}),o.trigger("click")},success:function(e,t){}})}}),i.render({elem:"#LAY-app-forumreply-list",url:layui.setter.base+"json/forum/replys.js",cols:[[{type:"checkbox",fixed:"left"},{field:"id",width:100,title:"ID",sort:!0},{field:"replyer",title:"回帖人"},{field:"cardid",title:"回帖ID",sort:!0},{field:"avatar",title:"头像",width:100,templet:"#imgTpl"},{field:"content",title:"回帖内容",width:200},{field:"replytime",title:"回帖时间",sort:!0},{title:"操作",width:150,align:"center",fixed:"right",toolbar:"#table-forum-replys"}]],page:!0,limit:10,limits:[10,15,20,25,30],text:"对不起，加载出现异常！"}),i.on("tool(LAY-app-forumreply-list)",function(e){e.data;if("del"===e.event)layer.confirm("确定删除此条评论？",function(t){e.del(),layer.close(t)});else if("edit"===e.event){t(e.tr);layer.open({type:2,title:"编辑评论",content:"../../../views/app/forum/replysform.html",area:["550px","350px"],btn:["确定","取消"],resize:!1,yes:function(t,i){var l=i.find("iframe").contents().find("#layuiadmin-form-replys"),r=l.find('textarea[name="content"]').val();e.update({content:r}),layer.close(t)},success:function(e,t){}})}}),e("forum",{})});
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/modules/im.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/modules/im.js
new file mode 100644
index 0000000..dc7672d
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/modules/im.js
@@ -0,0 +1,2 @@
+/** layuiAdmin.std-v1.0.0 LPPL License By http://www.layui.com/admin/ */
+ ;layui.define(["index","layim"],function(e){var a=layui.$,t=(layui.admin,layui.element,layui.router(),layui.layim),n=["您好，我现在有事不在，一会再和您联系。","你没发错吧？face[微笑] ","洗澡中，请勿打扰，偷窥请购票，个体四十，团体八折，订票电话：一般人我不告诉他！face[哈哈] ","你好，我是主人的美女秘书，有什么事就跟我说吧，等他回来我会转告他的。face[心] face[心] face[心] ","face[威武] face[威武] face[威武] face[威武] ","<（@￣︶￣@）>","你要和我说话？你真的要和我说话？你确定自己想说吗？你一定非说不可吗？那你说吧，这是自动回复。","face[黑线]  你慢慢说，别急……","(*^__^*) face[嘻嘻] ，是贤心吗？"];t.config({init:{url:layui.setter.base+"json/layim/getList.js",data:{}},members:{url:layui.setter.base+"json/layim/getMembers.js",data:{}},uploadImage:{url:"",type:""},uploadFile:{url:"",type:""},isAudio:!0,isVideo:!0,tool:[{alias:"code",title:"代码",icon:"&#xe64e;"}],initSkin:"3.jpg",msgbox:"/layim/demo/msgbox.html",find:"/layim/demo/find.html",chatLog:"/layim/demo/chatlog.html"}),t.on("online",function(e){layer.msg(e)}),t.on("sign",function(e){layer.msg(e)}),t.on("tool(code)",function(e){layer.prompt({title:"插入代码 - 工具栏扩展示例",formType:2,shade:0},function(a,t){layer.close(t),e("[pre class=layui-code]"+a+"[/pre]")})}),t.on("ready",function(e){t.msgbox(5)}),t.on("sendMessage",function(e){var a=e.to;"friend"===a.type&&t.setChatStatus('<span style="color:#FF5722;">对方正在输入。。。</span>'),setTimeout(function(){var e={};"group"===a.type?e={username:"模拟群员"+(100*Math.random()|0),avatar:layui.cache.dir+"images/face/"+(72*Math.random()|0)+".gif",id:a.id,type:a.type,content:n[9*Math.random()|0]}:(e={username:a.name,avatar:a.avatar,id:a.id,type:a.type,content:n[9*Math.random()|0]},t.setChatStatus('<span style="color:#FF5722;">在线</span>')),t.getMessage(e)},1e3)}),t.on("members",function(e){}),t.on("chatChange",function(e){var a=e.data.type;console.log(e.data.id),"friend"===a||"group"===a&&t.getMessage({system:!0,id:e.data.id,type:"group",content:"模拟群员"+(100*Math.random()|0)+"加入群聊"})});var a=layui.jquery,i={chat:function(){t.chat({name:"小闲",type:"friend",avatar:"//tva3.sinaimg.cn/crop.0.0.180.180.180/7f5f6861jw1e8qgp5bmzyj2050050aa8.jpg",id:1008612}),layer.msg("也就是说，此人可以不在好友面板里")},message:function(){t.getMessage({username:"贤心",avatar:"//tp1.sinaimg.cn/1571889140/180/40030060651/1",id:"100001",type:"friend",content:"嗨，你好！欢迎体验LayIM。演示标记："+(new Date).getTime(),timestamp:(new Date).getTime()})},messageAudio:function(){t.getMessage({username:"林心如",avatar:"//tp3.sinaimg.cn/1223762662/180/5741707953/0",id:"76543",type:"friend",content:"audio[http://gddx.sc.chinaz.com/Files/DownLoad/sound1/201510/6473.mp3]",timestamp:(new Date).getTime()})},messageVideo:function(){t.getMessage({username:"林心如",avatar:"//tp3.sinaimg.cn/1223762662/180/5741707953/0",id:"76543",type:"friend",content:"video[http://www.w3school.com.cn//i/movie.ogg]",timestamp:(new Date).getTime()})},messageTemp:function(){t.getMessage({username:"小酱",avatar:"//tva1.sinaimg.cn/crop.7.0.736.736.50/bd986d61jw8f5x8bqtp00j20ku0kgabx.jpg",id:"198909151014",type:"friend",content:"临时："+(new Date).getTime()})},add:function(){t.add({type:"friend",username:"麻花疼",avatar:"//tva1.sinaimg.cn/crop.0.0.720.720.180/005JKVuPjw8ers4osyzhaj30k00k075e.jpg",submit:function(e,a,t){layer.msg("好友申请已发送，请等待对方确认",{icon:1,shade:.5},function(){layer.close(t)})}})},addqun:function(){t.add({type:"group",username:"LayIM会员群",avatar:"//tva2.sinaimg.cn/crop.0.0.180.180.50/6ddfa27bjw1e8qgp5bmzyj2050050aa8.jpg",submit:function(e,a,t){layer.msg("申请已发送，请等待管理员确认",{icon:1,shade:.5},function(){layer.close(t)})}})},addFriend:function(){var e={type:"friend",id:1234560,username:"李彦宏",avatar:"//tva4.sinaimg.cn/crop.0.0.996.996.180/8b2b4e23jw8f14vkwwrmjj20ro0rpjsq.jpg",sign:"全球最大的中文搜索引擎"};t.setFriendGroup({type:e.type,username:e.username,avatar:e.avatar,group:t.cache().friend,submit:function(a,n){t.addList({type:e.type,username:e.username,avatar:e.avatar,groupid:a,id:e.id,sign:e.sign}),layer.close(n)}})},addGroup:function(){layer.msg("已成功把[Angular开发]添加到群组里",{icon:1}),t.addList({type:"group",avatar:"//tva3.sinaimg.cn/crop.64.106.361.361.50/7181dbb3jw8evfbtem8edj20ci0dpq3a.jpg",groupname:"Angular开发",id:"12333333",members:0})},removeFriend:function(){layer.msg("已成功删除[凤姐]",{icon:1}),t.removeList({id:121286,type:"friend"})},removeGroup:function(){layer.msg("已成功删除[前端群]",{icon:1}),t.removeList({id:101,type:"group"})},setGray:function(){t.setFriendStatus(168168,"offline"),layer.msg("已成功将好友[马小云]置灰",{icon:1})},unGray:function(){t.setFriendStatus(168168,"online"),layer.msg("成功取消好友[马小云]置灰状态",{icon:1})},kefu1:function(){t.chat({name:"在线客服一",type:"kefu",avatar:"//tp1.sinaimg.cn/5619439268/180/40030060651/1",id:1111111})},kefu2:function(){t.chat({name:"在线客服二",type:"kefu",avatar:"//tp1.sinaimg.cn/5619439268/180/40030060651/1",id:2222222})},mobile:function(){var e=layui.device(),a="/layim/demo/mobile.html";if(e.android||e.ios)return location.href=a;var t=layer.open({type:2,title:"移动版演示 （或手机扫右侧二维码预览）",content:a,area:["375px","667px"],shadeClose:!0,shade:.8,end:function(){layer.close(t+2)}});layer.photos({photos:{data:[{src:"http://cdn.layui.com/upload/2016_12/168_1481056358469_50288.png"}]},anim:0,shade:!1,success:function(e){e.css("margin-left","350px")}})}};a(".LAY-senior-im-chat-demo .layui-btn").on("click",function(){var e=a(this).data("type");i[e]?i[e].call(this):""}),e("im",{})});
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/modules/message.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/modules/message.js
new file mode 100644
index 0000000..7b811f0
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/modules/message.js
@@ -0,0 +1,2 @@
+/** layuiAdmin.std-v1.0.0 LPPL License By http://www.layui.com/admin/ */
+ ;layui.define(["admin","table","util"],function(e){var t=layui.$,i=(layui.admin,layui.table),l=(layui.element,{all:{text:"全部消息",id:"LAY-app-message-all"},notice:{text:"通知",id:"LAY-app-message-notice"},direct:{text:"私信",id:"LAY-app-message-direct"}}),a=function(e){return'<a href="roleDetail.html?id='+e.id+'">'+e.title};i.render({elem:"#LAY-app-message-all",url:layui.setter.base+"json/message/all.js",page:!0,cols:[[{type:"checkbox",fixed:"left"},{field:"title",title:"标题内容",minWidth:300,templet:a},{field:"time",title:"时间",width:170,templet:"<div>{{ layui.util.timeAgo(d.time) }}</div>"}]],skin:"line"}),i.render({elem:"#LAY-app-message-notice",url:layui.setter.base+"json/message/notice.js",page:!0,cols:[[{type:"checkbox",fixed:"left"},{field:"title",title:"标题内容",minWidth:300,templet:a},{field:"time",title:"时间",width:170,templet:"<div>{{ layui.util.timeAgo(d.time) }}</div>"}]],skin:"line"}),i.render({elem:"#LAY-app-message-direct",url:layui.setter.base+"json/message/direct.js",page:!0,cols:[[{type:"checkbox",fixed:"left"},{field:"title",title:"标题内容",minWidth:300,templet:a},{field:"time",title:"时间",width:170,templet:"<div>{{ layui.util.timeAgo(d.time) }}</div>"}]],skin:"line"});var d={del:function(e,t){var a=l[t],d=i.checkStatus(a.id),s=d.data;return 0===s.length?layer.msg("未选中行"):void layer.confirm("确定删除选中的数据吗？",function(){layer.msg("删除成功",{icon:1}),i.reload(a.id)})},ready:function(e,t){var a=l[t],d=i.checkStatus(a.id),s=d.data;return 0===s.length?layer.msg("未选中行"):(layer.msg("标记已读成功",{icon:1}),void i.reload(a.id))},readyAll:function(e,t){var i=l[t];layer.msg(i.text+"：全部已读",{icon:1})}};t(".LAY-app-message-btns .layui-btn").on("click",function(){var e=t(this),i=e.data("events"),l=e.data("type");d[i]&&d[i].call(this,e,l)}),e("message",{})});
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/modules/sample.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/modules/sample.js
new file mode 100644
index 0000000..9dc7b36
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/modules/sample.js
@@ -0,0 +1,2 @@
+/** layuiAdmin.std-v1.0.0 LPPL License By http://www.layui.com/admin/ */
+ ;layui.define(function(e){var a=layui.admin;layui.use(["admin","carousel"],function(){var e=layui.$,a=(layui.admin,layui.carousel),l=layui.element,t=layui.device();e(".layadmin-carousel").each(function(){var l=e(this);a.render({elem:this,width:"100%",arrow:"none",interval:l.data("interval"),autoplay:l.data("autoplay")===!0,trigger:t.ios||t.android?"click":"hover",anim:l.data("anim")})}),l.render("progress")}),layui.use(["carousel","echarts"],function(){var e=layui.$,a=(layui.carousel,layui.echarts),l=[],t=[{title:{subtext:"完全实况球员数据",textStyle:{fontSize:14}},tooltip:{trigger:"axis"},legend:{x:"left",data:["罗纳尔多","舍普琴科"]},polar:[{indicator:[{text:"进攻",max:100},{text:"防守",max:100},{text:"体能",max:100},{text:"速度",max:100},{text:"力量",max:100},{text:"技巧",max:100}],radius:130}],series:[{type:"radar",center:["50%","50%"],itemStyle:{normal:{areaStyle:{type:"default"}}},data:[{value:[97,42,88,94,90,86],name:"舍普琴科"},{value:[97,32,74,95,88,92],name:"罗纳尔多"}]}]}],i=e("#LAY-index-pageone").children("div"),n=function(e){l[e]=a.init(i[e],layui.echartsTheme),l[e].setOption(t[e]),window.onresize=l[e].resize};i[0]&&n(0)}),layui.use(["carousel","echarts"],function(){var e=layui.$,a=(layui.carousel,layui.echarts),l=[],t=[{tooltip:{trigger:"axis"},calculable:!0,legend:{data:["访问量","下载量","平均访问量"]},xAxis:[{type:"category",data:["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"]}],yAxis:[{type:"value",name:"访问量",axisLabel:{formatter:"{value} 万"}},{type:"value",name:"下载量",axisLabel:{formatter:"{value} 万"}}],series:[{name:"访问量",type:"line",data:[900,850,950,1e3,1100,1050,1e3,1150,1250,1370,1250,1100]},{name:"下载量",type:"line",yAxisIndex:1,data:[850,850,800,950,1e3,950,950,1150,1100,1240,1e3,950]},{name:"平均访问量",type:"line",data:[870,850,850,950,1050,1e3,980,1150,1e3,1300,1150,1e3]}]}],i=e("#LAY-index-pagetwo").children("div"),n=function(e){l[e]=a.init(i[e],layui.echartsTheme),l[e].setOption(t[e]),window.onresize=l[e].resize};i[0]&&n(0)}),layui.use(["carousel","echarts"],function(){var e=layui.$,a=(layui.carousel,layui.echarts),l=[],t=[{title:{text:"全国的 layui 用户分布",subtext:"不完全统计"},tooltip:{trigger:"item"},dataRange:{orient:"horizontal",min:0,max:6e4,text:["高","低"],splitNumber:0},series:[{name:"全国的 layui 用户分布",type:"map",mapType:"china",selectedMode:"multiple",itemStyle:{normal:{label:{show:!0}},emphasis:{label:{show:!0}}},data:[{name:"西藏",value:60},{name:"青海",value:167},{name:"宁夏",value:210},{name:"海南",value:252},{name:"甘肃",value:502},{name:"贵州",value:570},{name:"新疆",value:661},{name:"云南",value:8890},{name:"重庆",value:10010},{name:"吉林",value:5056},{name:"山西",value:2123},{name:"天津",value:9130},{name:"江西",value:10170},{name:"广西",value:6172},{name:"陕西",value:9251},{name:"黑龙江",value:5125},{name:"内蒙古",value:1435},{name:"安徽",value:9530},{name:"北京",value:51919},{name:"福建",value:3756},{name:"上海",value:59190},{name:"湖北",value:37109},{name:"湖南",value:8966},{name:"四川",value:31020},{name:"辽宁",value:7222},{name:"河北",value:3451},{name:"河南",value:9693},{name:"浙江",value:62310},{name:"山东",value:39231},{name:"江苏",value:35911},{name:"广东",value:55891}]}]}],i=e("#LAY-index-pagethree").children("div"),n=function(e){l[e]=a.init(i[e],layui.echartsTheme),l[e].setOption(t[e]),window.onresize=l[e].resize};i[0]&&n(0)}),layui.use("table",function(){var e=(layui.$,layui.table);e.render({elem:"#LAY-index-prograss",url:layui.setter.base+"json/console/prograss.js",cols:[[{type:"checkbox",fixed:"left"},{field:"prograss",title:"任务"},{field:"time",title:"所需时间"},{field:"complete",title:"完成情况",templet:function(e){return"已完成"==e.complete?'<del style="color: #5FB878;">'+e.complete+"</del>":"进行中"==e.complete?'<span style="color: #FFB800;">'+e.complete+"</span>":'<span style="color: #FF5722;">'+e.complete+"</span>"}}]],skin:"line"})}),a.events.replyNote=function(e){var a=e.data("id");layer.prompt({title:"回复留言 ID:"+a,formType:2},function(e,a){layer.msg("得到："+e),layer.close(a)})},e("sample",{})});
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/modules/senior.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/modules/senior.js
new file mode 100644
index 0000000..7a59e00
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/modules/senior.js
@@ -0,0 +1,4 @@
+/** layuiAdmin.std-v1.0.0 LPPL License By http://www.layui.com/admin/ */
+ ;layui.define(function(e){layui.use(["admin","carousel"],function(){var e=layui.$,a=(layui.admin,layui.carousel),t=layui.element,i=layui.device();e(".layadmin-carousel").each(function(){var t=e(this);a.render({elem:this,width:"100%",arrow:"none",interval:t.data("interval"),autoplay:t.data("autoplay")===!0,trigger:i.ios||i.android?"click":"hover",anim:t.data("anim")})}),t.render("progress")}),layui.use(["carousel","echarts"],function(){var e=layui.$,a=(layui.carousel,layui.echarts),t=[],i=[{title:{text:"未来一周气温变化",subtext:"纯属虚构"},tooltip:{trigger:"axis"},legend:{data:["最高气温","最低气温"]},calculable:!0,xAxis:[{type:"category",boundaryGap:!1,data:["周一","周二","周三","周四","周五","周六","周日"]}],yAxis:[{type:"value",axisLabel:{formatter:"{value} °C"}}],series:[{name:"最高气温",type:"line",data:[11,11,15,13,12,13,10],markPoint:{data:[{type:"max",name:"最大值"},{type:"min",name:"最小值"}]},markLine:{data:[{type:"average",name:"平均值"}]}},{name:"最低气温",type:"line",data:[1,-2,2,5,3,2,0],markPoint:{data:[{name:"周最低",value:-2,xAxis:1,yAxis:-1.5}]},markLine:{data:[{type:"average",name:"平均值"}]}}]}],n=e("#LAY-index-normline").children("div"),l=function(e){t[e]=a.init(n[e],layui.echartsTheme),t[e].setOption(i[e]),window.onresize=t[e].resize};if(n[0]){l(0);var r=[],o=[{tooltip:{trigger:"axis"},legend:{data:["邮件营销","联盟广告","视频广告","直接访问","搜索引擎"]},calculable:!0,xAxis:[{type:"category",boundaryGap:!1,data:["周一","周二","周三","周四","周五","周六","周日"]}],yAxis:[{type:"value"}],series:[{name:"邮件营销",type:"line",stack:"总量",data:[120,132,101,134,90,230,210]},{name:"联盟广告",type:"line",stack:"总量",data:[220,182,191,234,290,330,310]},{name:"视频广告",type:"line",stack:"总量",data:[150,232,201,154,190,330,410]},{name:"直接访问",type:"line",stack:"总量",data:[320,332,301,334,390,330,320]},{name:"搜索引擎",type:"line",stack:"总量",data:[820,932,901,934,1290,1330,1320]}]}],m=e("#LAY-index-heapline").children("div"),s=function(e){r[e]=a.init(m[e],layui.echartsTheme),r[e].setOption(o[e]),window.onresize=r[e].resize};if(m[0]){s(0);var y=[],d=[{title:{text:"双数值轴折线",subtext:"纯属虚构"},tooltip:{trigger:"axis",axisPointer:{show:!0,type:"cross",lineStyle:{type:"dashed",width:1}},formatter:function(e){return e.seriesName+" : [ "+e.value[0]+", "+e.value[1]+" ]"}},legend:{data:["数据1","数据2"]},calculable:!0,xAxis:[{type:"value"}],yAxis:[{type:"value",axisLine:{lineStyle:{color:"#dc143c"}}}],series:[{name:"数据1",type:"line",data:[[1.5,10],[5,7],[8,8],[12,6],[11,12],[16,9],[14,6],[17,4],[19,9]],markPoint:{data:[{type:"max",name:"最大值",symbol:"emptyCircle",itemStyle:{normal:{color:"#dc143c",label:{position:"top"}}}},{type:"min",name:"最小值",symbol:"emptyCircle",itemStyle:{normal:{color:"#dc143c",label:{position:"bottom"}}}},{type:"max",name:"最大值",valueIndex:0,symbol:"emptyCircle",itemStyle:{normal:{color:"#1e90ff",label:{position:"right"}}}},{type:"min",name:"最小值",valueIndex:0,symbol:"emptyCircle",itemStyle:{normal:{color:"#1e90ff",label:{position:"left"}}}}]},markLine:{data:[{type:"max",name:"最大值",itemStyle:{normal:{color:"#dc143c"}}},{type:"min",name:"最小值",itemStyle:{normal:{color:"#dc143c"}}},{type:"average",name:"平均值",itemStyle:{normal:{color:"#dc143c"}}},{type:"max",name:"最大值",valueIndex:0,itemStyle:{normal:{color:"#1e90ff"}}},{type:"min",name:"最小值",valueIndex:0,itemStyle:{normal:{color:"#1e90ff"}}},{type:"average",name:"平均值",valueIndex:0,itemStyle:{normal:{color:"#1e90ff"}}}]}},{name:"数据2",type:"line",data:[[1,2],[2,3],[4,2],[7,5],[11,2],[18,3]]}]}],c=e("#LAY-index-diffline").children("div"),p=function(e){y[e]=a.init(c[e],layui.echartsTheme),y[e].setOption(d[e]),window.onresize=y[e].resize};if(c[0]){p(0);var u=[],x=[{tooltip:{trigger:"axis"},legend:{data:["邮件营销","联盟广告","视频广告","直接访问","搜索引擎"]},calculable:!0,xAxis:[{type:"category",boundaryGap:!1,data:["周一","周二","周三","周四","周五","周六","周日"]}],yAxis:[{type:"value"}],series:[{name:"邮件营销",type:"line",stack:"总量",itemStyle:{normal:{areaStyle:{type:"default"}}},data:[120,132,101,134,90,230,210]},{name:"联盟广告",type:"line",stack:"总量",itemStyle:{normal:{areaStyle:{type:"default"}}},data:[220,182,191,234,290,330,310]},{name:"视频广告",type:"line",stack:"总量",itemStyle:{normal:{areaStyle:{type:"default"}}},data:[150,232,201,154,190,330,410]},{name:"直接访问",type:"line",stack:"总量",itemStyle:{normal:{areaStyle:{type:"default"}}},data:[320,332,301,334,390,330,320]},{name:"搜索引擎",type:"line",stack:"总量",itemStyle:{normal:{areaStyle:{type:"default"}}},data:[820,932,901,934,1290,1330,1320]}]}],v=e("#LAY-index-heaparea").children("div"),b=function(e){u[e]=a.init(v[e],layui.echartsTheme),u[e].setOption(x[e]),window.onresize=u[e].resize};if(v[0]){b(0);var h=[],f=[{title:{text:"雨量流量关系图",x:"center"},tooltip:{trigger:"axis",formatter:function(e){return e[0].name+"<br/>"+e[0].seriesName+" : "+e[0].value+" (m^3/s)<br/>"+e[1].seriesName+" : "+-e[1].value+" (mm)"}},legend:{data:["流量","降雨量"],x:"left"},dataZoom:{show:!0,realtime:!0,start:0,end:100},xAxis:[{type:"category",boundaryGap:!1,axisLine:{onZero:!1},data:["2009/6/12 2:00","2009/6/12 3:00","2009/6/12 4:00","2009/6/12 5:00","2009/6/12 6:00","2009/6/12 7:00","2009/6/12 8:00","2009/6/12 9:00","2009/6/12 10:00","2009/6/12 11:00","2009/6/12 12:00","2009/6/12 13:00","2009/6/12 14:00","2009/6/12 15:00","2009/6/12 16:00","2009/6/12 17:00","2009/6/12 18:00","2009/6/12 19:00","2009/6/12 20:00","2009/6/12 21:00","2009/6/12 22:00","2009/6/12 23:00","2009/6/13 0:00","2009/6/13 1:00","2009/6/13 2:00","2009/6/13 3:00","2009/6/13 4:00","2009/6/13 5:00","2009/6/13 6:00","2009/6/13 7:00","2009/6/13 8:00","2009/6/13 9:00","2009/6/13 10:00","2009/6/13 11:00","2009/6/13 12:00","2009/6/13 13:00","2009/6/13 14:00","2009/6/13 15:00","2009/6/13 16:00","2009/6/13 17:00","2009/6/13 18:00","2009/6/13 19:00","2009/6/13 20:00","2009/6/13 21:00","2009/6/13 22:00","2009/6/13 23:00","2009/6/14 0:00","2009/6/14 1:00","2009/6/14 2:00","2009/6/14 3:00","2009/6/14 4:00","2009/6/14 5:00","2009/6/14 6:00","2009/6/14 7:00","2009/6/14 8:00","2009/6/14 9:00","2009/6/14 10:00","2009/6/14 11:00","2009/6/14 12:00","2009/6/14 13:00","2009/6/14 14:00","2009/6/14 15:00","2009/6/14 16:00","2009/6/14 17:00","2009/6/14 18:00","2009/6/14 19:00","2009/6/14 20:00","2009/6/14 21:00","2009/6/14 22:00","2009/6/14 23:00","2009/6/15 0:00","2009/6/15 1:00","2009/6/15 2:00","2009/6/15 3:00","2009/6/15 4:00","2009/6/15 5:00","2009/6/15 6:00","2009/6/15 7:00","2009/6/15 8:00","2009/6/15 9:00","2009/6/15 10:00","2009/6/15 11:00","2009/6/15 12:00","2009/6/15 13:00","2009/6/15 14:00","2009/6/15 15:00","2009/6/15 16:00","2009/6/15 17:00","2009/6/15 18:00","2009/6/15 19:00","2009/6/15 20:00","2009/6/15 21:00","2009/6/15 22:00","2009/6/15 23:00","2009/6/15 0:00","2009/6/16 1:00","2009/6/16 2:00","2009/6/16 3:00","2009/6/16 4:00","2009/6/16 5:00","2009/6/16 6:00","2009/6/16 7:00","2009/6/16 8:00","2009/6/16 9:00","2009/6/16 10:00","2009/6/16 11:00","2009/6/16 12:00","2009/6/16 13:00","2009/6/16 14:00","2009/6/16 15:00","2009/6/16 16:00","2009/6/16 17:00","2009/6/16 18:00","2009/6/16 19:00","2009/6/16 20:00","2009/6/16 21:00","2009/6/16 22:00","2009/6/16 23:00","2009/6/15 0:00","2009/6/17 1:00","2009/6/17 2:00","2009/6/17 3:00","2009/6/17 4:00","2009/6/17 5:00","2009/6/17 6:00","2009/6/17 7:00","2009/6/17 8:00","2009/6/17 9:00","2009/6/17 10:00","2009/6/17 11:00","2009/6/17 12:00","2009/6/17 13:00","2009/6/17 14:00","2009/6/17 15:00","2009/6/17 16:00","2009/6/17 17:00","2009/6/17 18:00","2009/6/17 19:00","2009/6/17 20:00","2009/6/17 21:00","2009/6/17 22:00","2009/6/17 23:00","2009/6/18 0:00","2009/6/18 1:00","2009/6/18 2:00","2009/6/18 3:00","2009/6/18 4:00","2009/6/18 5:00","2009/6/18 6:00","2009/6/18 7:00","2009/6/18 8:00","2009/6/18 9:00","2009/6/18 10:00","2009/6/18 11:00","2009/6/18 12:00","2009/6/18 13:00","2009/6/18 14:00","2009/6/18 15:00","2009/6/18 16:00","2009/6/18 17:00","2009/6/18 18:00","2009/6/18 19:00","2009/6/18 20:00","2009/6/18 21:00","2009/6/18 22:00","2009/6/18 23:00","2009/6/15 0:00","2009/6/19 1:00","2009/6/19 2:00","2009/6/19 3:00","2009/6/19 4:00","2009/6/19 5:00","2009/6/19 6:00","2009/6/19 7:00","2009/6/19 8:00","2009/6/19 9:00","2009/6/19 10:00","2009/6/19 11:00","2009/6/19 12:00","2009/6/19 13:00","2009/6/19 14:00","2009/6/19 15:00","2009/6/19 16:00","2009/6/19 17:00","2009/6/19 18:00","2009/6/19 19:00","2009/6/19 20:00","2009/6/19 21:00","2009/6/19 22:00","2009/6/19 23:00","2009/6/20 0:00","2009/6/20 1:00","2009/6/20 2:00","2009/6/20 3:00","2009/6/20 4:00","2009/6/20 5:00","2009/6/20 6:00","2009/6/20 7:00","2009/6/20 8:00","2009/6/20 9:00","2009/6/20 10:00","2009/6/20 11:00","2009/6/20 12:00","2009/6/20 13:00","2009/6/20 14:00","2009/6/20 15:00","2009/6/20 16:00","2009/6/20 17:00","2009/6/20 18:00","2009/6/20 19:00","2009/6/20 20:00","2009/6/20 21:00","2009/6/20 22:00","2009/6/20 23:00","2009/6/21 0:00","2009/6/21 1:00","2009/6/21 2:00","2009/6/21 3:00","2009/6/21 4:00","2009/6/21 5:00","2009/6/21 6:00","2009/6/21 7:00","2009/6/21 8:00","2009/6/21 9:00","2009/6/21 10:00","2009/6/21 11:00","2009/6/21 12:00","2009/6/21 13:00","2009/6/21 14:00","2009/6/21 15:00","2009/6/21 16:00","2009/6/21 17:00","2009/6/21 18:00","2009/6/21 19:00","2009/6/21 20:00","2009/6/21 21:00","2009/6/21 22:00","2009/6/21 23:00","2009/6/22 0:00","2009/6/22 1:00","2009/6/22 2:00","2009/6/22 3:00","2009/6/22 4:00","2009/6/22 5:00","2009/6/22 6:00","2009/6/22 7:00","2009/6/22 8:00","2009/6/22 9:00","2009/6/22 10:00","2009/6/22 11:00","2009/6/22 12:00","2009/6/22 13:00","2009/6/22 14:00","2009/6/22 15:00","2009/6/22 16:00","2009/6/22 17:00","2009/6/22 18:00","2009/6/22 19:00","2009/6/22 20:00","2009/6/22 21:00","2009/6/22 22:00","2009/6/22 23:00","2009/6/23 0:00","2009/6/23 1:00","2009/6/23 2:00","2009/6/23 3:00","2009/6/23 4:00","2009/6/23 5:00","2009/6/23 6:00","2009/6/23 7:00","2009/6/23 8:00","2009/6/23 9:00","2009/6/23 10:00","2009/6/23 11:00","2009/6/23 12:00","2009/6/23 13:00","2009/6/23 14:00","2009/6/23 15:00","2009/6/23 16:00","2009/6/23 17:00","2009/6/23 18:00","2009/6/23 19:00","2009/6/23 20:00","2009/6/23 21:00","2009/6/23 22:00","2009/6/23 23:00","2009/6/24 0:00","2009/6/24 1:00","2009/6/24 2:00","2009/6/24 3:00","2009/6/24 4:00","2009/6/24 5:00","2009/6/24 6:00","2009/6/24 7:00","2009/6/24 8:00","2009/6/24 9:00","2009/6/24 10:00","2009/6/24 11:00","2009/6/24 12:00","2009/6/24 13:00","2009/6/24 14:00","2009/6/24 15:00","2009/6/24 16:00","2009/6/24 17:00","2009/6/24 18:00","2009/6/24 19:00","2009/6/24 20:00","2009/6/24 21:00","2009/6/24 22:00","2009/6/24 23:00","2009/6/25 0:00","2009/6/25 1:00","2009/6/25 2:00","2009/6/25 3:00","2009/6/25 4:00","2009/6/25 5:00","2009/6/25 6:00","2009/6/25 7:00","2009/6/25 8:00","2009/6/25 9:00","2009/6/25 10:00","2009/6/25 11:00","2009/6/25 12:00","2009/6/25 13:00","2009/6/25 14:00","2009/6/25 15:00","2009/6/25 16:00","2009/6/25 17:00","2009/6/25 18:00","2009/6/25 19:00","2009/6/25 20:00","2009/6/25 21:00","2009/6/25 22:00","2009/6/25 23:00","2009/6/26 0:00","2009/6/26 1:00","2009/6/26 2:00","2009/6/26 3:00","2009/6/26 4:00","2009/6/26 5:00","2009/6/26 6:00","2009/6/26 7:00","2009/6/26 8:00","2009/6/26 9:00","2009/6/26 10:00","2009/6/26 11:00","2009/6/26 12:00","2009/6/26 13:00","2009/6/26 14:00","2009/6/26 15:00","2009/6/26 16:00","2009/6/26 17:00","2009/6/26 18:00","2009/6/26 19:00","2009/6/26 20:00","2009/6/26 21:00","2009/6/26 22:00","2009/6/26 23:00","2009/6/27 0:00","2009/6/27 1:00","2009/6/27 2:00","2009/6/27 3:00","2009/6/27 4:00","2009/6/27 5:00","2009/6/27 6:00","2009/6/27 7:00","2009/6/27 8:00","2009/6/27 9:00","2009/6/27 10:00","2009/6/27 11:00","2009/6/27 12:00","2009/6/27 13:00","2009/6/27 14:00","2009/6/27 15:00","2009/6/27 16:00","2009/6/27 17:00","2009/6/27 18:00","2009/6/27 19:00","2009/6/27 20:00","2009/6/27 21:00","2009/6/27 22:00","2009/6/27 23:00","2009/6/28 0:00","2009/6/28 1:00","2009/6/28 2:00","2009/6/28 3:00","2009/6/28 4:00","2009/6/28 5:00","2009/6/28 6:00","2009/6/28 7:00","2009/6/28 8:00","2009/6/28 9:00","2009/6/28 10:00","2009/6/28 11:00","2009/6/28 12:00","2009/6/28 13:00","2009/6/28 14:00","2009/6/28 15:00","2009/6/28 16:00","2009/6/28 17:00","2009/6/28 18:00","2009/6/28 19:00","2009/6/28 20:00","2009/6/28 21:00","2009/6/28 22:00","2009/6/28 23:00","2009/6/29 0:00","2009/6/29 1:00","2009/6/29 2:00","2009/6/29 3:00","2009/6/29 4:00","2009/6/29 5:00","2009/6/29 6:00","2009/6/29 7:00","2009/6/29 8:00","2009/6/29 9:00","2009/6/29 10:00","2009/6/29 11:00","2009/6/29 12:00","2009/6/29 13:00","2009/6/29 14:00","2009/6/29 15:00","2009/6/29 16:00","2009/6/29 17:00","2009/6/29 18:00","2009/6/29 19:00","2009/6/29 20:00","2009/6/29 21:00","2009/6/29 22:00","2009/6/29 23:00","2009/6/30 0:00","2009/6/30 1:00","2009/6/30 2:00","2009/6/30 3:00","2009/6/30 4:00","2009/6/30 5:00","2009/6/30 6:00","2009/6/30 7:00","2009/6/30 8:00","2009/6/30 9:00","2009/6/30 10:00","2009/6/30 11:00","2009/6/30 12:00","2009/6/30 13:00","2009/6/30 14:00","2009/6/30 15:00","2009/6/30 16:00","2009/6/30 17:00","2009/6/30 18:00","2009/6/30 19:00","2009/6/30 20:00","2009/6/30 21:00","2009/6/30 22:00","2009/6/30 23:00","2009/7/1 0:00","2009/7/1 1:00","2009/7/1 2:00","2009/7/1 3:00","2009/7/1 4:00","2009/7/1 5:00","2009/7/1 6:00","2009/7/1 7:00","2009/7/1 8:00","2009/7/1 9:00","2009/7/1 10:00","2009/7/1 11:00","2009/7/1 12:00","2009/7/1 13:00","2009/7/1 14:00","2009/7/1 15:00","2009/7/1 16:00","2009/7/1 17:00","2009/7/1 18:00","2009/7/1 19:00","2009/7/1 20:00","2009/7/1 21:00","2009/7/1 22:00","2009/7/1 23:00","2009/7/2 0:00","2009/7/2 1:00","2009/7/2 2:00","2009/7/2 3:00","2009/7/2 4:00","2009/7/2 5:00","2009/7/2 6:00","2009/7/2 7:00","2009/7/2 8:00","2009/7/2 9:00","2009/7/2 10:00","2009/7/2 11:00","2009/7/2 12:00","2009/7/2 13:00","2009/7/2 14:00","2009/7/2 15:00","2009/7/2 16:00","2009/7/2 17:00","2009/7/2 18:00","2009/7/2 19:00","2009/7/2 20:00","2009/7/2 21:00","2009/7/2 22:00","2009/7/2 23:00","2009/7/3 0:00","2009/7/3 1:00","2009/7/3 2:00","2009/7/3 3:00","2009/7/3 4:00","2009/7/3 5:00","2009/7/3 6:00","2009/7/3 7:00","2009/7/3 8:00","2009/7/3 9:00","2009/7/3 10:00","2009/7/3 11:00","2009/7/3 12:00","2009/7/3 13:00","2009/7/3 14:00","2009/7/3 15:00","2009/7/3 16:00","2009/7/3 17:00","2009/7/3 18:00","2009/7/3 19:00","2009/7/3 20:00","2009/7/3 21:00","2009/7/3 22:00","2009/7/3 23:00","2009/7/4 0:00","2009/7/4 1:00","2009/7/4 2:00","2009/7/4 3:00","2009/7/4 4:00","2009/7/4 5:00","2009/7/4 6:00","2009/7/4 7:00","2009/7/4 8:00","2009/7/4 9:00","2009/7/4 10:00","2009/7/4 11:00","2009/7/4 12:00","2009/7/4 13:00","2009/7/4 14:00","2009/7/4 15:00","2009/7/4 16:00","2009/7/4 17:00","2009/7/4 18:00","2009/7/4 19:00","2009/7/4 20:00","2009/7/4 21:00","2009/7/4 22:00","2009/7/4 23:00","2009/7/5 0:00","2009/7/5 1:00","2009/7/5 2:00","2009/7/5 3:00","2009/7/5 4:00","2009/7/5 5:00","2009/7/5 6:00","2009/7/5 7:00","2009/7/5 8:00","2009/7/5 9:00","2009/7/5 10:00","2009/7/5 11:00","2009/7/5 12:00","2009/7/5 13:00","2009/7/5 14:00","2009/7/5 15:00","2009/7/5 16:00","2009/7/5 17:00","2009/7/5 18:00","2009/7/5 19:00","2009/7/5 20:00","2009/7/5 21:00","2009/7/5 22:00","2009/7/5 23:00","2009/7/6 0:00","2009/7/6 1:00","2009/7/6 2:00","2009/7/6 3:00","2009/7/6 4:00","2009/7/6 5:00","2009/7/6 6:00","2009/7/6 7:00","2009/7/6 8:00","2009/7/6 9:00","2009/7/6 10:00","2009/7/6 11:00","2009/7/6 12:00","2009/7/6 13:00","2009/7/6 14:00","2009/7/6 15:00","2009/7/6 16:00","2009/7/6 17:00","2009/7/6 18:00","2009/7/6 19:00","2009/7/6 20:00","2009/7/6 21:00","2009/7/6 22:00","2009/7/6 23:00","2009/7/7 0:00","2009/7/7 1:00","2009/7/7 2:00","2009/7/7 3:00","2009/7/7 4:00","2009/7/7 5:00","2009/7/7 6:00","2009/7/7 7:00","2009/7/7 8:00","2009/7/7 9:00","2009/7/7 10:00","2009/7/7 11:00","2009/7/7 12:00","2009/7/7 13:00","2009/7/7 14:00","2009/7/7 15:00","2009/7/7 16:00","2009/7/7 17:00","2009/7/7 18:00","2009/7/7 19:00","2009/7/7 20:00","2009/7/7 21:00","2009/7/7 22:00","2009/7/7 23:00","2009/7/8 0:00","2009/7/8 1:00","2009/7/8 2:00","2009/7/8 3:00","2009/7/8 4:00","2009/7/8 5:00","2009/7/8 6:00","2009/7/8 7:00","2009/7/8 8:00","2009/7/8 9:00","2009/7/8 10:00","2009/7/8 11:00","2009/7/8 12:00","2009/7/8 13:00","2009/7/8 14:00","2009/7/8 15:00","2009/7/8 16:00","2009/7/8 17:00","2009/7/8 18:00","2009/7/8 19:00","2009/7/8 20:00","2009/7/8 21:00","2009/7/8 22:00","2009/7/8 23:00","2009/7/9 0:00","2009/7/9 1:00","2009/7/9 2:00","2009/7/9 3:00","2009/7/9 4:00","2009/7/9 5:00","2009/7/9 6:00","2009/7/9 7:00","2009/7/9 8:00","2009/7/9 9:00","2009/7/9 10:00","2009/7/9 11:00","2009/7/9 12:00","2009/7/9 13:00","2009/7/9 14:00","2009/7/9 15:00","2009/7/9 16:00","2009/7/9 17:00","2009/7/9 18:00","2009/7/9 19:00","2009/7/9 20:00","2009/7/9 21:00","2009/7/9 22:00","2009/7/9 23:00","2009/7/10 0:00","2009/7/10 1:00","2009/7/10 2:00","2009/7/10 3:00","2009/7/10 4:00","2009/7/10 5:00","2009/7/10 6:00","2009/7/10 7:00","2009/7/10 8:00","2009/7/10 9:00","2009/7/10 10:00","2009/7/10 11:00","2009/7/10 12:00","2009/7/10 13:00","2009/7/10 14:00","2009/7/10 15:00","2009/7/10 16:00","2009/7/10 17:00","2009/7/10 18:00","2009/7/10 19:00","2009/7/10 20:00","2009/7/10 21:00","2009/7/10 22:00","2009/7/10 23:00","2009/7/11 0:00","2009/7/11 1:00","2009/7/11 2:00","2009/7/11 3:00","2009/7/11 4:00","2009/7/11 5:00","2009/7/11 6:00","2009/7/11 7:00","2009/7/11 8:00","2009/7/11 9:00","2009/7/11 10:00","2009/7/11 11:00","2009/7/11 12:00","2009/7/11 13:00","2009/7/11 14:00","2009/7/11 15:00","2009/7/11 16:00","2009/7/11 17:00","2009/7/11 18:00","2009/7/11 19:00","2009/7/11 20:00","2009/7/11 21:00","2009/7/11 22:00","2009/7/11 23:00","2009/7/12 0:00","2009/7/12 1:00","2009/7/12 2:00","2009/7/12 3:00","2009/7/12 4:00","2009/7/12 5:00","2009/7/12 6:00","2009/7/12 7:00","2009/7/12 8:00","2009/7/12 9:00","2009/7/12 10:00","2009/7/12 11:00","2009/7/12 12:00","2009/7/12 13:00","2009/7/12 14:00","2009/7/12 15:00","2009/7/12 16:00","2009/7/12 17:00","2009/7/12 18:00","2009/7/12 19:00","2009/7/12 20:00","2009/7/12 21:00","2009/7/12 22:00","2009/7/12 23:00","2009/7/13 0:00","2009/7/13 1:00","2009/7/13 2:00","2009/7/13 3:00","2009/7/13 4:00","2009/7/13 5:00","2009/7/13 6:00","2009/7/13 7:00","2009/7/13 8:00","2009/7/13 9:00","2009/7/13 10:00","2009/7/13 11:00","2009/7/13 12:00","2009/7/13 13:00","2009/7/13 14:00","2009/7/13 15:00","2009/7/13 16:00","2009/7/13 17:00","2009/7/13 18:00","2009/7/13 19:00","2009/7/13 20:00","2009/7/13 21:00","2009/7/13 22:00","2009/7/13 23:00","2009/7/14 0:00","2009/7/14 1:00","2009/7/14 2:00","2009/7/14 3:00","2009/7/14 4:00","2009/7/14 5:00","2009/7/14 6:00","2009/7/14 7:00","2009/7/14 8:00","2009/7/14 9:00","2009/7/14 10:00","2009/7/14 11:00","2009/7/14 12:00","2009/7/14 13:00","2009/7/14 14:00","2009/7/14 15:00","2009/7/14 16:00","2009/7/14 17:00","2009/7/14 18:00","2009/7/14 19:00","2009/7/14 20:00","2009/7/14 21:00","2009/7/14 22:00","2009/7/14 23:00","2009/7/15 0:00","2009/7/15 1:00","2009/7/15 2:00","2009/7/15 3:00","2009/7/15 4:00","2009/7/15 5:00","2009/7/15 6:00","2009/7/15 7:00","2009/7/15 8:00","2009/7/15 9:00","2009/7/15 10:00","2009/7/15 11:00","2009/7/15 12:00","2009/7/15 13:00","2009/7/15 14:00","2009/7/15 15:00","2009/7/15 16:00","2009/7/15 17:00","2009/7/15 18:00","2009/7/15 19:00","2009/7/15 20:00","2009/7/15 21:00","2009/7/15 22:00","2009/7/15 23:00","2009/7/16 0:00","2009/7/16 1:00","2009/7/16 2:00","2009/7/16 3:00","2009/7/16 4:00","2009/7/16 5:00","2009/7/16 6:00","2009/7/16 7:00","2009/7/16 8:00","2009/7/16 9:00","2009/7/16 10:00","2009/7/16 11:00","2009/7/16 12:00","2009/7/16 13:00","2009/7/16 14:00","2009/7/16 15:00","2009/7/16 16:00","2009/7/16 17:00","2009/7/16 18:00","2009/7/16 19:00","2009/7/16 20:00","2009/7/16 21:00","2009/7/16 22:00","2009/7/16 23:00","2009/7/17 0:00","2009/7/17 1:00","2009/7/17 2:00","2009/7/17 3:00","2009/7/17 4:00","2009/7/17 5:00","2009/7/17 6:00","2009/7/17 7:00","2009/7/17 8:00","2009/7/17 9:00","2009/7/17 10:00","2009/7/17 11:00","2009/7/17 12:00","2009/7/17 13:00","2009/7/17 14:00","2009/7/17 15:00","2009/7/17 16:00","2009/7/17 17:00","2009/7/17 18:00","2009/7/17 19:00","2009/7/17 20:00","2009/7/17 21:00","2009/7/17 22:00","2009/7/17 23:00","2009/7/18 0:00","2009/7/18 1:00","2009/7/18 2:00","2009/7/18 3:00","2009/7/18 4:00","2009/7/18 5:00","2009/7/18 6:00","2009/7/18 7:00","2009/7/18 8:00","2009/7/18 9:00","2009/7/18 10:00","2009/7/18 11:00","2009/7/18 12:00","2009/7/18 13:00","2009/7/18 14:00","2009/7/18 15:00","2009/7/18 16:00","2009/7/18 17:00","2009/7/18 18:00","2009/7/18 19:00","2009/7/18 20:00","2009/7/18 21:00","2009/7/18 22:00","2009/7/18 23:00","2009/7/19 0:00","2009/7/19 1:00","2009/7/19 2:00","2009/7/19 3:00","2009/7/19 4:00","2009/7/19 5:00","2009/7/19 6:00","2009/7/19 7:00","2009/7/19 8:00","2009/7/19 9:00","2009/7/19 10:00","2009/7/19 11:00","2009/7/19 12:00","2009/7/19 13:00","2009/7/19 14:00","2009/7/19 15:00","2009/7/19 16:00","2009/7/19 17:00","2009/7/19 18:00","2009/7/19 19:00","2009/7/19 20:00","2009/7/19 21:00","2009/7/19 22:00","2009/7/19 23:00","2009/7/20 0:00","2009/7/20 1:00","2009/7/20 2:00","2009/7/20 3:00","2009/7/20 4:00","2009/7/20 5:00","2009/7/20 6:00","2009/7/20 7:00","2009/7/20 8:00","2009/7/20 9:00","2009/7/20 10:00","2009/7/20 11:00","2009/7/20 12:00","2009/7/20 13:00","2009/7/20 14:00","2009/7/20 15:00","2009/7/20 16:00","2009/7/20 17:00","2009/7/20 18:00","2009/7/20 19:00","2009/7/20 20:00","2009/7/20 21:00","2009/7/20 22:00","2009/7/20 23:00","2009/7/21 0:00","2009/7/21 1:00","2009/7/21 2:00","2009/7/21 3:00","2009/7/21 4:00","2009/7/21 5:00","2009/7/21 6:00","2009/7/21 7:00","2009/7/21 8:00","2009/7/21 9:00","2009/7/21 10:00","2009/7/21 11:00","2009/7/21 12:00","2009/7/21 13:00","2009/7/21 14:00","2009/7/21 15:00","2009/7/21 16:00","2009/7/21 17:00","2009/7/21 18:00","2009/7/21 19:00","2009/7/21 20:00","2009/7/21 21:00","2009/7/21 22:00","2009/7/21 23:00","2009/7/22 0:00","2009/7/22 1:00","2009/7/22 2:00","2009/7/22 3:00","2009/7/22 4:00","2009/7/22 5:00","2009/7/22 6:00","2009/7/22 7:00","2009/7/22 8:00","2009/7/22 9:00","2009/7/22 10:00","2009/7/22 11:00","2009/7/22 12:00","2009/7/22 13:00","2009/7/22 14:00","2009/7/22 15:00","2009/7/22 16:00","2009/7/22 17:00","2009/7/22 18:00","2009/7/22 19:00","2009/7/22 20:00","2009/7/22 21:00","2009/7/22 22:00","2009/7/22 23:00","2009/7/23 0:00","2009/7/23 1:00","2009/7/23 2:00","2009/7/23 3:00","2009/7/23 4:00","2009/7/23 5:00","2009/7/23 6:00","2009/7/23 7:00","2009/7/23 8:00","2009/7/23 9:00","2009/7/23 10:00","2009/7/23 11:00","2009/7/23 12:00","2009/7/23 13:00","2009/7/23 14:00","2009/7/23 15:00","2009/7/23 16:00","2009/7/23 17:00","2009/7/23 18:00","2009/7/23 19:00","2009/7/23 20:00","2009/7/23 21:00","2009/7/23 22:00","2009/7/23 23:00","2009/7/24 0:00","2009/7/24 1:00","2009/7/24 2:00","2009/7/24 3:00","2009/7/24 4:00","2009/7/24 5:00","2009/7/24 6:00","2009/7/24 7:00","2009/7/24 8:00","2009/7/24 9:00","2009/7/24 10:00","2009/7/24 11:00","2009/7/24 12:00","2009/7/24 13:00","2009/7/24 14:00","2009/7/24 15:00","2009/7/24 16:00","2009/7/24 17:00","2009/7/24 18:00","2009/7/24 19:00","2009/7/24 20:00","2009/7/24 21:00","2009/7/24 22:00","2009/7/24 23:00","2009/7/25 0:00","2009/7/25 1:00","2009/7/25 2:00","2009/7/25 3:00","2009/7/25 4:00","2009/7/25 5:00","2009/7/25 6:00","2009/7/25 7:00","2009/7/25 8:00","2009/7/25 9:00","2009/7/25 10:00","2009/7/25 11:00","2009/7/25 12:00","2009/7/25 13:00","2009/7/25 14:00","2009/7/25 15:00","2009/7/25 16:00","2009/7/25 17:00","2009/7/25 18:00","2009/7/25 19:00","2009/7/25 20:00","2009/7/25 21:00","2009/7/25 22:00","2009/7/25 23:00","2009/7/26 0:00","2009/7/26 1:00","2009/7/26 2:00","2009/7/26 3:00","2009/7/26 4:00","2009/7/26 5:00","2009/7/26 6:00","2009/7/26 7:00","2009/7/26 8:00","2009/7/26 9:00","2009/7/26 10:00","2009/7/26 11:00","2009/7/26 12:00","2009/7/26 13:00","2009/7/26 14:00","2009/7/26 15:00","2009/7/26 16:00","2009/7/26 17:00","2009/7/26 18:00","2009/7/26 19:00","2009/7/26 20:00","2009/7/26 21:00","2009/7/26 22:00","2009/7/26 23:00","2009/7/27 0:00","2009/7/27 1:00","2009/7/27 2:00","2009/7/27 3:00","2009/7/27 4:00","2009/7/27 5:00","2009/7/27 6:00","2009/7/27 7:00","2009/7/27 8:00","2009/7/27 9:00","2009/7/27 10:00","2009/7/27 11:00","2009/7/27 12:00","2009/7/27 13:00","2009/7/27 14:00","2009/7/27 15:00","2009/7/27 16:00","2009/7/27 17:00","2009/7/27 18:00","2009/7/27 19:00","2009/7/27 20:00","2009/7/27 21:00","2009/7/27 22:00","2009/7/27 23:00","2009/7/28 0:00","2009/7/28 1:00","2009/7/28 2:00","2009/7/28 3:00","2009/7/28 4:00","2009/7/28 5:00","2009/7/28 6:00","2009/7/28 7:00","2009/7/28 8:00","2009/7/28 9:00","2009/7/28 10:00","2009/7/28 11:00","2009/7/28 12:00","2009/7/28 13:00","2009/7/28 14:00","2009/7/28 15:00","2009/7/28 16:00","2009/7/28 17:00","2009/7/28 18:00","2009/7/28 19:00","2009/7/28 20:00","2009/7/28 21:00","2009/7/28 22:00","2009/7/28 23:00","2009/7/29 0:00","2009/7/29 1:00","2009/7/29 2:00","2009/7/29 3:00","2009/7/29 4:00","2009/7/29 5:00","2009/7/29 6:00","2009/7/29 7:00","2009/7/29 8:00","2009/7/29 9:00","2009/7/29 10:00","2009/7/29 11:00","2009/7/29 12:00","2009/7/29 13:00","2009/7/29 14:00","2009/7/29 15:00","2009/7/29 16:00","2009/7/29 17:00","2009/7/29 18:00","2009/7/29 19:00","2009/7/29 20:00","2009/7/29 21:00","2009/7/29 22:00","2009/7/29 23:00","2009/7/30 0:00","2009/7/30 1:00","2009/7/30 2:00","2009/7/30 3:00","2009/7/30 4:00","2009/7/30 5:00","2009/7/30 6:00","2009/7/30 7:00","2009/7/30 8:00","2009/7/30 9:00","2009/7/30 10:00","2009/7/30 11:00","2009/7/30 12:00","2009/7/30 13:00","2009/7/30 14:00","2009/7/30 15:00","2009/7/30 16:00","2009/7/30 17:00","2009/7/30 18:00","2009/7/30 19:00","2009/7/30 20:00","2009/7/30 21:00","2009/7/30 22:00","2009/7/30 23:00","2009/7/31 0:00","2009/7/31 1:00","2009/7/31 2:00","2009/7/31 3:00","2009/7/31 4:00","2009/7/31 5:00","2009/7/31 6:00","2009/7/31 7:00","2009/7/31 8:00","2009/7/31 9:00","2009/7/31 10:00","2009/7/31 11:00","2009/7/31 12:00","2009/7/31 13:00","2009/7/31 14:00","2009/7/31 15:00","2009/7/31 16:00","2009/7/31 17:00","2009/7/31 18:00","2009/7/31 19:00","2009/7/31 20:00","2009/7/31 21:00","2009/7/31 22:00","2009/7/31 23:00","2009/8/1 0:00","2009/8/1 1:00","2009/8/1 2:00","2009/8/1 3:00","2009/8/1 4:00","2009/8/1 5:00","2009/8/1 6:00","2009/8/1 7:00","2009/8/1 8:00","2009/8/1 9:00","2009/8/1 10:00","2009/8/1 11:00","2009/8/1 12:00","2009/8/1 13:00","2009/8/1 14:00","2009/8/1 15:00","2009/8/1 16:00","2009/8/1 17:00","2009/8/1 18:00","2009/8/1 19:00","2009/8/1 20:00","2009/8/1 21:00","2009/8/1 22:00","2009/8/1 23:00","2009/8/2 0:00","2009/8/2 1:00","2009/8/2 2:00","2009/8/2 3:00","2009/8/2 4:00","2009/8/2 5:00","2009/8/2 6:00","2009/8/2 7:00","2009/8/2 8:00","2009/8/2 9:00","2009/8/2 10:00","2009/8/2 11:00","2009/8/2 12:00","2009/8/2 13:00","2009/8/2 14:00","2009/8/2 15:00","2009/8/2 16:00","2009/8/2 17:00","2009/8/2 18:00","2009/8/2 19:00","2009/8/2 20:00","2009/8/2 21:00","2009/8/2 22:00","2009/8/2 23:00","2009/8/3 0:00","2009/8/3 1:00","2009/8/3 2:00","2009/8/3 3:00","2009/8/3 4:00","2009/8/3 5:00","2009/8/3 6:00","2009/8/3 7:00","2009/8/3 8:00","2009/8/3 9:00","2009/8/3 10:00","2009/8/3 11:00","2009/8/3 12:00","2009/8/3 13:00","2009/8/3 14:00","2009/8/3 15:00","2009/8/3 16:00","2009/8/3 17:00","2009/8/3 18:00","2009/8/3 19:00","2009/8/3 20:00","2009/8/3 21:00","2009/8/3 22:00","2009/8/3 23:00","2009/8/4 0:00","2009/8/4 1:00","2009/8/4 2:00","2009/8/4 3:00","2009/8/4 4:00","2009/8/4 5:00","2009/8/4 6:00","2009/8/4 7:00","2009/8/4 8:00","2009/8/4 9:00","2009/8/4 10:00","2009/8/4 11:00","2009/8/4 12:00","2009/8/4 13:00","2009/8/4 14:00","2009/8/4 15:00","2009/8/4 16:00","2009/8/4 17:00","2009/8/4 18:00","2009/8/4 19:00","2009/8/4 20:00","2009/8/4 21:00","2009/8/4 22:00","2009/8/4 23:00","2009/8/5 0:00","2009/8/5 1:00","2009/8/5 2:00","2009/8/5 3:00","2009/8/5 4:00","2009/8/5 5:00","2009/8/5 6:00","2009/8/5 7:00","2009/8/5 8:00","2009/8/5 9:00","2009/8/5 10:00","2009/8/5 11:00","2009/8/5 12:00","2009/8/5 13:00","2009/8/5 14:00","2009/8/5 15:00","2009/8/5 16:00","2009/8/5 17:00","2009/8/5 18:00","2009/8/5 19:00","2009/8/5 20:00","2009/8/5 21:00","2009/8/5 22:00","2009/8/5 23:00","2009/8/6 0:00","2009/8/6 1:00","2009/8/6 2:00","2009/8/6 3:00","2009/8/6 4:00","2009/8/6 5:00","2009/8/6 6:00","2009/8/6 7:00","2009/8/6 8:00","2009/8/6 9:00","2009/8/6 10:00","2009/8/6 11:00","2009/8/6 12:00","2009/8/6 13:00","2009/8/6 14:00","2009/8/6 15:00","2009/8/6 16:00","2009/8/6 17:00","2009/8/6 18:00","2009/8/6 19:00","2009/8/6 20:00","2009/8/6 21:00","2009/8/6 22:00","2009/8/6 23:00","2009/8/7 0:00","2009/8/7 1:00","2009/8/7 2:00","2009/8/7 3:00","2009/8/7 4:00","2009/8/7 5:00","2009/8/7 6:00","2009/8/7 7:00","2009/8/7 8:00","2009/8/7 9:00","2009/8/7 10:00","2009/8/7 11:00","2009/8/7 12:00","2009/8/7 13:00","2009/8/7 14:00","2009/8/7 15:00","2009/8/7 16:00","2009/8/7 17:00","2009/8/7 18:00","2009/8/7 19:00","2009/8/7 20:00","2009/8/7 21:00","2009/8/7 22:00","2009/8/7 23:00","2009/8/8 0:00","2009/8/8 1:00","2009/8/8 2:00","2009/8/8 3:00","2009/8/8 4:00","2009/8/8 5:00","2009/8/8 6:00","2009/8/8 7:00","2009/8/8 8:00","2009/8/8 9:00","2009/8/8 10:00","2009/8/8 11:00","2009/8/8 12:00","2009/8/8 13:00","2009/8/8 14:00","2009/8/8 15:00","2009/8/8 16:00","2009/8/8 17:00","2009/8/8 18:00","2009/8/8 19:00","2009/8/8 20:00","2009/8/8 21:00","2009/8/8 22:00","2009/8/8 23:00","2009/8/9 0:00","2009/8/9 1:00","2009/8/9 2:00","2009/8/9 3:00","2009/8/9 4:00","2009/8/9 5:00","2009/8/9 6:00","2009/8/9 7:00","2009/8/9 8:00","2009/8/9 9:00","2009/8/9 10:00","2009/8/9 11:00","2009/8/9 12:00","2009/8/9 13:00","2009/8/9 14:00","2009/8/9 15:00","2009/8/9 16:00","2009/8/9 17:00","2009/8/9 18:00","2009/8/9 19:00","2009/8/9 20:00","2009/8/9 21:00","2009/8/9 22:00","2009/8/9 23:00","2009/8/10 0:00","2009/8/10 1:00","2009/8/10 2:00","2009/8/10 3:00","2009/8/10 4:00","2009/8/10 5:00","2009/8/10 6:00","2009/8/10 7:00","2009/8/10 8:00","2009/8/10 9:00","2009/8/10 10:00","2009/8/10 11:00","2009/8/10 12:00","2009/8/10 13:00","2009/8/10 14:00","2009/8/10 15:00","2009/8/10 16:00","2009/8/10 17:00","2009/8/10 18:00","2009/8/10 19:00","2009/8/10 20:00","2009/8/10 21:00","2009/8/10 22:00","2009/8/10 23:00","2009/8/11 0:00","2009/8/11 1:00","2009/8/11 2:00","2009/8/11 3:00","2009/8/11 4:00","2009/8/11 5:00","2009/8/11 6:00","2009/8/11 7:00","2009/8/11 8:00","2009/8/11 9:00","2009/8/11 10:00","2009/8/11 11:00","2009/8/11 12:00","2009/8/11 13:00","2009/8/11 14:00","2009/8/11 15:00","2009/8/11 16:00","2009/8/11 17:00","2009/8/11 18:00","2009/8/11 19:00","2009/8/11 20:00","2009/8/11 21:00","2009/8/11 22:00","2009/8/11 23:00","2009/8/12 0:00","2009/8/12 1:00","2009/8/12 2:00","2009/8/12 3:00","2009/8/12 4:00","2009/8/12 5:00","2009/8/12 6:00","2009/8/12 7:00","2009/8/12 8:00","2009/8/12 9:00","2009/8/12 10:00","2009/8/12 11:00","2009/8/12 12:00","2009/8/12 13:00","2009/8/12 14:00","2009/8/12 15:00","2009/8/12 16:00","2009/8/12 17:00","2009/8/12 18:00","2009/8/12 19:00","2009/8/12 20:00","2009/8/12 21:00","2009/8/12 22:00","2009/8/12 23:00","2009/8/13 0:00","2009/8/13 1:00","2009/8/13 2:00","2009/8/13 3:00","2009/8/13 4:00","2009/8/13 5:00","2009/8/13 6:00","2009/8/13 7:00","2009/8/13 8:00","2009/8/13 9:00","2009/8/13 10:00","2009/8/13 11:00","2009/8/13 12:00","2009/8/13 13:00","2009/8/13 14:00","2009/8/13 15:00","2009/8/13 16:00","2009/8/13 17:00","2009/8/13 18:00","2009/8/13 19:00","2009/8/13 20:00","2009/8/13 21:00","2009/8/13 22:00","2009/8/13 23:00","2009/8/14 0:00","2009/8/14 1:00","2009/8/14 2:00","2009/8/14 3:00","2009/8/14 4:00","2009/8/14 5:00","2009/8/14 6:00","2009/8/14 7:00","2009/8/14 8:00","2009/8/14 9:00","2009/8/14 10:00","2009/8/14 11:00","2009/8/14 12:00","2009/8/14 13:00","2009/8/14 14:00","2009/8/14 15:00","2009/8/14 16:00","2009/8/14 17:00","2009/8/14 18:00","2009/8/14 19:00","2009/8/14 20:00","2009/8/14 21:00","2009/8/14 22:00","2009/8/14 23:00","2009/8/15 0:00","2009/8/15 1:00","2009/8/15 2:00","2009/8/15 3:00","2009/8/15 4:00","2009/8/15 5:00","2009/8/15 6:00","2009/8/15 7:00","2009/8/15 8:00","2009/8/15 9:00","2009/8/15 10:00","2009/8/15 11:00","2009/8/15 12:00","2009/8/15 13:00","2009/8/15 14:00","2009/8/15 15:00","2009/8/15 16:00","2009/8/15 17:00","2009/8/15 18:00","2009/8/15 19:00","2009/8/15 20:00","2009/8/15 21:00","2009/8/15 22:00","2009/8/15 23:00","2009/8/16 0:00","2009/8/16 1:00","2009/8/16 2:00","2009/8/16 3:00","2009/8/16 4:00","2009/8/16 5:00","2009/8/16 6:00","2009/8/16 7:00","2009/8/16 8:00","2009/8/16 9:00","2009/8/16 10:00","2009/8/16 11:00","2009/8/16 12:00","2009/8/16 13:00","2009/8/16 14:00","2009/8/16 15:00","2009/8/16 16:00","2009/8/16 17:00","2009/8/16 18:00","2009/8/16 19:00","2009/8/16 20:00","2009/8/16 21:00","2009/8/16 22:00","2009/8/16 23:00","2009/8/17 0:00","2009/8/17 1:00","2009/8/17 2:00","2009/8/17 3:00","2009/8/17 4:00","2009/8/17 5:00","2009/8/17 6:00","2009/8/17 7:00","2009/8/17 8:00","2009/8/17 9:00","2009/8/17 10:00","2009/8/17 11:00","2009/8/17 12:00","2009/8/17 13:00","2009/8/17 14:00","2009/8/17 15:00","2009/8/17 16:00","2009/8/17 17:00","2009/8/17 18:00","2009/8/17 19:00","2009/8/17 20:00","2009/8/17 21:00","2009/8/17 22:00","2009/8/17 23:00","2009/8/18 0:00","2009/8/18 1:00","2009/8/18 2:00","2009/8/18 3:00","2009/8/18 4:00","2009/8/18 5:00","2009/8/18 6:00","2009/8/18 7:00","2009/8/18 8:00","2009/8/18 9:00","2009/8/18 10:00","2009/8/18 11:00","2009/8/18 12:00","2009/8/18 13:00","2009/8/18 14:00","2009/8/18 15:00","2009/8/18 16:00","2009/8/18 17:00","2009/8/18 18:00","2009/8/18 19:00","2009/8/18 20:00","2009/8/18 21:00","2009/8/18 22:00","2009/8/18 23:00","2009/8/19 0:00","2009/8/19 1:00","2009/8/19 2:00","2009/8/19 3:00","2009/8/19 4:00","2009/8/19 5:00","2009/8/19 6:00","2009/8/19 7:00","2009/8/19 8:00","2009/8/19 9:00","2009/8/19 10:00","2009/8/19 11:00","2009/8/19 12:00","2009/8/19 13:00","2009/8/19 14:00","2009/8/19 15:00","2009/8/19 16:00","2009/8/19 17:00","2009/8/19 18:00","2009/8/19 19:00","2009/8/19 20:00","2009/8/19 21:00","2009/8/19 22:00","2009/8/19 23:00","2009/8/20 0:00","2009/8/20 1:00","2009/8/20 2:00","2009/8/20 3:00","2009/8/20 4:00","2009/8/20 5:00","2009/8/20 6:00","2009/8/20 7:00","2009/8/20 8:00","2009/8/20 9:00","2009/8/20 10:00","2009/8/20 11:00","2009/8/20 12:00","2009/8/20 13:00","2009/8/20 14:00","2009/8/20 15:00","2009/8/20 16:00","2009/8/20 17:00","2009/8/20 18:00","2009/8/20 19:00","2009/8/20 20:00","2009/8/20 21:00","2009/8/20 22:00","2009/8/20 23:00","2009/8/21 0:00","2009/8/21 1:00","2009/8/21 2:00","2009/8/21 3:00","2009/8/21 4:00","2009/8/21 5:00","2009/8/21 6:00","2009/8/21 7:00","2009/8/21 8:00","2009/8/21 9:00","2009/8/21 10:00","2009/8/21 11:00","2009/8/21 12:00","2009/8/21 13:00","2009/8/21 14:00","2009/8/21 15:00","2009/8/21 16:00","2009/8/21 17:00","2009/8/21 18:00","2009/8/21 19:00","2009/8/21 20:00","2009/8/21 21:00","2009/8/21 22:00","2009/8/21 23:00","2009/8/22 0:00","2009/8/22 1:00","2009/8/22 2:00","2009/8/22 3:00","2009/8/22 4:00","2009/8/22 5:00","2009/8/22 6:00","2009/8/22 7:00","2009/8/22 8:00","2009/8/22 9:00","2009/8/22 10:00","2009/8/22 11:00","2009/8/22 12:00","2009/8/22 13:00","2009/8/22 14:00","2009/8/22 15:00","2009/8/22 16:00","2009/8/22 17:00","2009/8/22 18:00","2009/8/22 19:00","2009/8/22 20:00","2009/8/22 21:00","2009/8/22 22:00","2009/8/22 23:00","2009/8/23 0:00","2009/8/23 1:00","2009/8/23 2:00","2009/8/23 3:00","2009/8/23 4:00","2009/8/23 5:00","2009/8/23 6:00","2009/8/23 7:00","2009/8/23 8:00","2009/8/23 9:00","2009/8/23 10:00","2009/8/23 11:00","2009/8/23 12:00","2009/8/23 13:00","2009/8/23 14:00","2009/8/23 15:00","2009/8/23 16:00","2009/8/23 17:00","2009/8/23 18:00","2009/8/23 19:00","2009/8/23 20:00","2009/8/23 21:00","2009/8/23 22:00","2009/8/23 23:00","2009/8/24 0:00","2009/8/24 1:00","2009/8/24 2:00","2009/8/24 3:00","2009/8/24 4:00","2009/8/24 5:00","2009/8/24 6:00","2009/8/24 7:00","2009/8/24 8:00","2009/8/24 9:00","2009/8/24 10:00","2009/8/24 11:00","2009/8/24 12:00","2009/8/24 13:00","2009/8/24 14:00","2009/8/24 15:00","2009/8/24 16:00","2009/8/24 17:00","2009/8/24 18:00","2009/8/24 19:00","2009/8/24 20:00","2009/8/24 21:00","2009/8/24 22:00","2009/8/24 23:00","2009/8/25 0:00","2009/8/25 1:00","2009/8/25 2:00","2009/8/25 3:00","2009/8/25 4:00","2009/8/25 5:00","2009/8/25 6:00","2009/8/25 7:00","2009/8/25 8:00","2009/8/25 9:00","2009/8/25 10:00","2009/8/25 11:00","2009/8/25 12:00","2009/8/25 13:00","2009/8/25 14:00","2009/8/25 15:00","2009/8/25 16:00","2009/8/25 17:00","2009/8/25 18:00","2009/8/25 19:00","2009/8/25 20:00","2009/8/25 21:00","2009/8/25 22:00","2009/8/25 23:00","2009/8/26 0:00","2009/8/26 1:00","2009/8/26 2:00","2009/8/26 3:00","2009/8/26 4:00","2009/8/26 5:00","2009/8/26 6:00","2009/8/26 7:00","2009/8/26 8:00","2009/8/26 9:00","2009/8/26 10:00","2009/8/26 11:00","2009/8/26 12:00","2009/8/26 13:00","2009/8/26 14:00","2009/8/26 15:00","2009/8/26 16:00","2009/8/26 17:00","2009/8/26 18:00","2009/8/26 19:00","2009/8/26 20:00","2009/8/26 21:00","2009/8/26 22:00","2009/8/26 23:00","2009/8/27 0:00","2009/8/27 1:00","2009/8/27 2:00","2009/8/27 3:00","2009/8/27 4:00","2009/8/27 5:00","2009/8/27 6:00","2009/8/27 7:00","2009/8/27 8:00","2009/8/27 9:00","2009/8/27 10:00","2009/8/27 11:00","2009/8/27 12:00","2009/8/27 13:00","2009/8/27 14:00","2009/8/27 15:00","2009/8/27 16:00","2009/8/27 17:00","2009/8/27 18:00","2009/8/27 19:00","2009/8/27 20:00","2009/8/27 21:00","2009/8/27 22:00","2009/8/27 23:00","2009/8/28 0:00","2009/8/28 1:00","2009/8/28 2:00","2009/8/28 3:00","2009/8/28 4:00","2009/8/28 5:00","2009/8/28 6:00","2009/8/28 7:00","2009/8/28 8:00","2009/8/28 9:00","2009/8/28 10:00","2009/8/28 11:00","2009/8/28 12:00","2009/8/28 13:00","2009/8/28 14:00","2009/8/28 15:00","2009/8/28 16:00","2009/8/28 17:00","2009/8/28 18:00","2009/8/28 19:00","2009/8/28 20:00","2009/8/28 21:00","2009/8/28 22:00","2009/8/28 23:00","2009/8/29 0:00","2009/8/29 1:00","2009/8/29 2:00","2009/8/29 3:00","2009/8/29 4:00","2009/8/29 5:00","2009/8/29 6:00","2009/8/29 7:00","2009/8/29 8:00","2009/8/29 9:00","2009/8/29 10:00","2009/8/29 11:00","2009/8/29 12:00","2009/8/29 13:00","2009/8/29 14:00","2009/8/29 15:00","2009/8/29 16:00","2009/8/29 17:00","2009/8/29 18:00","2009/8/29 19:00","2009/8/29 20:00","2009/8/29 21:00","2009/8/29 22:00","2009/8/29 23:00","2009/8/30 0:00","2009/8/30 1:00","2009/8/30 2:00","2009/8/30 3:00","2009/8/30 4:00","2009/8/30 5:00","2009/8/30 6:00","2009/8/30 7:00","2009/8/30 8:00","2009/8/30 9:00","2009/8/30 10:00","2009/8/30 11:00","2009/8/30 12:00","2009/8/30 13:00","2009/8/30 14:00","2009/8/30 15:00","2009/8/30 16:00","2009/8/30 17:00","2009/8/30 18:00","2009/8/30 19:00","2009/8/30 20:00","2009/8/30 21:00","2009/8/30 22:00","2009/8/30 23:00","2009/8/31 0:00","2009/8/31 1:00","2009/8/31 2:00","2009/8/31 3:00","2009/8/31 4:00","2009/8/31 5:00","2009/8/31 6:00","2009/8/31 7:00","2009/8/31 8:00","2009/8/31 9:00","2009/8/31 10:00","2009/8/31 11:00","2009/8/31 12:00","2009/8/31 13:00","2009/8/31 14:00","2009/8/31 15:00","2009/8/31 16:00","2009/8/31 17:00","2009/8/31 18:00","2009/8/31 19:00","2009/8/31 20:00","2009/8/31 21:00","2009/8/31 22:00","2009/8/31 23:00","2009/9/1 0:00","2009/9/1 1:00","2009/9/1 2:00","2009/9/1 3:00","2009/9/1 4:00","2009/9/1 5:00","2009/9/1 6:00","2009/9/1 7:00","2009/9/1 8:00","2009/9/1 9:00","2009/9/1 10:00","2009/9/1 11:00","2009/9/1 12:00","2009/9/1 13:00","2009/9/1 14:00","2009/9/1 15:00","2009/9/1 16:00","2009/9/1 17:00","2009/9/1 18:00","2009/9/1 19:00","2009/9/1 20:00","2009/9/1 21:00","2009/9/1 22:00","2009/9/1 23:00","2009/9/2 0:00","2009/9/2 1:00","2009/9/2 2:00","2009/9/2 3:00","2009/9/2 4:00","2009/9/2 5:00","2009/9/2 6:00","2009/9/2 7:00","2009/9/2 8:00","2009/9/2 9:00","2009/9/2 10:00","2009/9/2 11:00","2009/9/2 12:00","2009/9/2 13:00","2009/9/2 14:00","2009/9/2 15:00","2009/9/2 16:00","2009/9/2 17:00","2009/9/2 18:00","2009/9/2 19:00","2009/9/2 20:00","2009/9/2 21:00","2009/9/2 22:00","2009/9/2 23:00","2009/9/3 0:00","2009/9/3 1:00","2009/9/3 2:00","2009/9/3 3:00","2009/9/3 4:00","2009/9/3 5:00","2009/9/3 6:00","2009/9/3 7:00","2009/9/3 8:00","2009/9/3 9:00","2009/9/3 10:00","2009/9/3 11:00","2009/9/3 12:00","2009/9/3 13:00","2009/9/3 14:00","2009/9/3 15:00","2009/9/3 16:00","2009/9/3 17:00","2009/9/3 18:00","2009/9/3 19:00","2009/9/3 20:00","2009/9/3 21:00","2009/9/3 22:00","2009/9/3 23:00","2009/9/4 0:00","2009/9/4 1:00","2009/9/4 2:00","2009/9/4 3:00","2009/9/4 4:00","2009/9/4 5:00","2009/9/4 6:00","2009/9/4 7:00","2009/9/4 8:00","2009/9/4 9:00","2009/9/4 10:00","2009/9/4 11:00","2009/9/4 12:00","2009/9/4 13:00","2009/9/4 14:00","2009/9/4 15:00","2009/9/4 16:00","2009/9/4 17:00","2009/9/4 18:00","2009/9/4 19:00","2009/9/4 20:00","2009/9/4 21:00","2009/9/4 22:00","2009/9/4 23:00","2009/9/5 0:00","2009/9/5 1:00","2009/9/5 2:00","2009/9/5 3:00","2009/9/5 4:00","2009/9/5 5:00","2009/9/5 6:00","2009/9/5 7:00","2009/9/5 8:00","2009/9/5 9:00","2009/9/5 10:00","2009/9/5 11:00","2009/9/5 12:00","2009/9/5 13:00","2009/9/5 14:00","2009/9/5 15:00","2009/9/5 16:00","2009/9/5 17:00","2009/9/5 18:00","2009/9/5 19:00","2009/9/5 20:00","2009/9/5 21:00","2009/9/5 22:00","2009/9/5 23:00","2009/9/6 0:00","2009/9/6 1:00","2009/9/6 2:00","2009/9/6 3:00","2009/9/6 4:00","2009/9/6 5:00","2009/9/6 6:00","2009/9/6 7:00","2009/9/6 8:00","2009/9/6 9:00","2009/9/6 10:00","2009/9/6 11:00","2009/9/6 12:00","2009/9/6 13:00","2009/9/6 14:00","2009/9/6 15:00","2009/9/6 16:00","2009/9/6 17:00","2009/9/6 18:00","2009/9/6 19:00","2009/9/6 20:00","2009/9/6 21:00","2009/9/6 22:00","2009/9/6 23:00","2009/9/7 0:00","2009/9/7 1:00","2009/9/7 2:00","2009/9/7 3:00","2009/9/7 4:00","2009/9/7 5:00","2009/9/7 6:00","2009/9/7 7:00","2009/9/7 8:00","2009/9/7 9:00","2009/9/7 10:00","2009/9/7 11:00","2009/9/7 12:00","2009/9/7 13:00","2009/9/7 14:00","2009/9/7 15:00","2009/9/7 16:00","2009/9/7 17:00","2009/9/7 18:00","2009/9/7 19:00","2009/9/7 20:00","2009/9/7 21:00","2009/9/7 22:00","2009/9/7 23:00","2009/9/8 0:00","2009/9/8 1:00","2009/9/8 2:00","2009/9/8 3:00","2009/9/8 4:00","2009/9/8 5:00","2009/9/8 6:00","2009/9/8 7:00","2009/9/8 8:00","2009/9/8 9:00","2009/9/8 10:00","2009/9/8 11:00","2009/9/8 12:00","2009/9/8 13:00","2009/9/8 14:00","2009/9/8 15:00","2009/9/8 16:00","2009/9/8 17:00","2009/9/8 18:00","2009/9/8 19:00","2009/9/8 20:00","2009/9/8 21:00","2009/9/8 22:00","2009/9/8 23:00","2009/9/9 0:00","2009/9/9 1:00","2009/9/9 2:00","2009/9/9 3:00","2009/9/9 4:00","2009/9/9 5:00","2009/9/9 6:00","2009/9/9 7:00","2009/9/9 8:00","2009/9/9 9:00","2009/9/9 10:00","2009/9/9 11:00","2009/9/9 12:00","2009/9/9 13:00","2009/9/9 14:00","2009/9/9 15:00","2009/9/9 16:00","2009/9/9 17:00","2009/9/9 18:00","2009/9/9 19:00","2009/9/9 20:00","2009/9/9 21:00","2009/9/9 22:00","2009/9/9 23:00","2009/9/10 0:00","2009/9/10 1:00","2009/9/10 2:00","2009/9/10 3:00","2009/9/10 4:00","2009/9/10 5:00","2009/9/10 6:00","2009/9/10 7:00","2009/9/10 8:00","2009/9/10 9:00","2009/9/10 10:00","2009/9/10 11:00","2009/9/10 12:00","2009/9/10 13:00","2009/9/10 14:00","2009/9/10 15:00","2009/9/10 16:00","2009/9/10 17:00","2009/9/10 18:00","2009/9/10 19:00","2009/9/10 20:00","2009/9/10 21:00","2009/9/10 22:00","2009/9/10 23:00","2009/9/11 0:00","2009/9/11 1:00","2009/9/11 2:00","2009/9/11 3:00","2009/9/11 4:00","2009/9/11 5:00","2009/9/11 6:00","2009/9/11 7:00","2009/9/11 8:00","2009/9/11 9:00","2009/9/11 10:00","2009/9/11 11:00","2009/9/11 12:00","2009/9/11 13:00","2009/9/11 14:00","2009/9/11 15:00","2009/9/11 16:00","2009/9/11 17:00","2009/9/11 18:00","2009/9/11 19:00","2009/9/11 20:00","2009/9/11 21:00","2009/9/11 22:00","2009/9/11 23:00","2009/9/12 0:00","2009/9/12 1:00","2009/9/12 2:00","2009/9/12 3:00","2009/9/12 4:00","2009/9/12 5:00","2009/9/12 6:00","2009/9/12 7:00","2009/9/12 8:00","2009/9/12 9:00","2009/9/12 10:00","2009/9/12 11:00","2009/9/12 12:00","2009/9/12 13:00","2009/9/12 14:00","2009/9/12 15:00","2009/9/12 16:00","2009/9/12 17:00","2009/9/12 18:00","2009/9/12 19:00","2009/9/12 20:00","2009/9/12 21:00","2009/9/12 22:00","2009/9/12 23:00","2009/9/13 0:00","2009/9/13 1:00","2009/9/13 2:00","2009/9/13 3:00","2009/9/13 4:00","2009/9/13 5:00","2009/9/13 6:00","2009/9/13 7:00","2009/9/13 8:00","2009/9/13 9:00","2009/9/13 10:00","2009/9/13 11:00","2009/9/13 12:00","2009/9/13 13:00","2009/9/13 14:00","2009/9/13 15:00","2009/9/13 16:00","2009/9/13 17:00","2009/9/13 18:00","2009/9/13 19:00","2009/9/13 20:00","2009/9/13 21:00","2009/9/13 22:00","2009/9/13 23:00","2009/9/14 0:00","2009/9/14 1:00","2009/9/14 2:00","2009/9/14 3:00","2009/9/14 4:00","2009/9/14 5:00","2009/9/14 6:00","2009/9/14 7:00","2009/9/14 8:00","2009/9/14 9:00","2009/9/14 10:00","2009/9/14 11:00","2009/9/14 12:00","2009/9/14 13:00","2009/9/14 14:00","2009/9/14 15:00","2009/9/14 16:00","2009/9/14 17:00","2009/9/14 18:00","2009/9/14 19:00","2009/9/14 20:00","2009/9/14 21:00","2009/9/14 22:00","2009/9/14 23:00","2009/9/15 0:00","2009/9/15 1:00","2009/9/15 2:00","2009/9/15 3:00","2009/9/15 4:00","2009/9/15 5:00","2009/9/15 6:00","2009/9/15 7:00","2009/9/15 8:00","2009/9/15 9:00","2009/9/15 10:00","2009/9/15 11:00","2009/9/15 12:00","2009/9/15 13:00","2009/9/15 14:00","2009/9/15 15:00","2009/9/15 16:00","2009/9/15 17:00","2009/9/15 18:00","2009/9/15 19:00","2009/9/15 20:00","2009/9/15 21:00","2009/9/15 22:00","2009/9/15 23:00","2009/9/16 0:00","2009/9/16 1:00","2009/9/16 2:00","2009/9/16 3:00","2009/9/16 4:00","2009/9/16 5:00","2009/9/16 6:00","2009/9/16 7:00","2009/9/16 8:00","2009/9/16 9:00","2009/9/16 10:00","2009/9/16 11:00","2009/9/16 12:00","2009/9/16 13:00","2009/9/16 14:00","2009/9/16 15:00","2009/9/16 16:00","2009/9/16 17:00","2009/9/16 18:00","2009/9/16 19:00","2009/9/16 20:00","2009/9/16 21:00","2009/9/16 22:00","2009/9/16 23:00","2009/9/17 0:00","2009/9/17 1:00","2009/9/17 2:00","2009/9/17 3:00","2009/9/17 4:00","2009/9/17 5:00","2009/9/17 6:00","2009/9/17 7:00","2009/9/17 8:00","2009/9/17 9:00","2009/9/17 10:00","2009/9/17 11:00","2009/9/17 12:00","2009/9/17 13:00","2009/9/17 14:00","2009/9/17 15:00","2009/9/17 16:00","2009/9/17 17:00","2009/9/17 18:00","2009/9/17 19:00","2009/9/17 20:00","2009/9/17 21:00","2009/9/17 22:00","2009/9/17 23:00","2009/9/18 0:00","2009/9/18 1:00","2009/9/18 2:00","2009/9/18 3:00","2009/9/18 4:00","2009/9/18 5:00","2009/9/18 6:00","2009/9/18 7:00","2009/9/18 8:00","2009/9/18 9:00","2009/9/18 10:00","2009/9/18 11:00","2009/9/18 12:00","2009/9/18 13:00","2009/9/18 14:00","2009/9/18 15:00","2009/9/18 16:00","2009/9/18 17:00","2009/9/18 18:00","2009/9/18 19:00","2009/9/18 20:00","2009/9/18 21:00","2009/9/18 22:00","2009/9/18 23:00","2009/9/19 0:00","2009/9/19 1:00","2009/9/19 2:00","2009/9/19 3:00","2009/9/19 4:00","2009/9/19 5:00","2009/9/19 6:00","2009/9/19 7:00","2009/9/19 8:00","2009/9/19 9:00","2009/9/19 10:00","2009/9/19 11:00","2009/9/19 12:00","2009/9/19 13:00","2009/9/19 14:00","2009/9/19 15:00","2009/9/19 16:00","2009/9/19 17:00","2009/9/19 18:00","2009/9/19 19:00","2009/9/19 20:00","2009/9/19 21:00","2009/9/19 22:00","2009/9/19 23:00","2009/9/20 0:00","2009/9/20 1:00","2009/9/20 2:00","2009/9/20 3:00","2009/9/20 4:00","2009/9/20 5:00","2009/9/20 6:00","2009/9/20 7:00","2009/9/20 8:00","2009/9/20 9:00","2009/9/20 10:00","2009/9/20 11:00","2009/9/20 12:00","2009/9/20 13:00","2009/9/20 14:00","2009/9/20 15:00","2009/9/20 16:00","2009/9/20 17:00","2009/9/20 18:00","2009/9/20 19:00","2009/9/20 20:00","2009/9/20 21:00","2009/9/20 22:00","2009/9/20 23:00","2009/9/21 0:00","2009/9/21 1:00","2009/9/21 2:00","2009/9/21 3:00","2009/9/21 4:00","2009/9/21 5:00","2009/9/21 6:00","2009/9/21 7:00","2009/9/21 8:00","2009/9/21 9:00","2009/9/21 10:00","2009/9/21 11:00","2009/9/21 12:00","2009/9/21 13:00","2009/9/21 14:00","2009/9/21 15:00","2009/9/21 16:00","2009/9/21 17:00","2009/9/21 18:00","2009/9/21 19:00","2009/9/21 20:00","2009/9/21 21:00","2009/9/21 22:00","2009/9/21 23:00","2009/9/22 0:00","2009/9/22 1:00","2009/9/22 2:00","2009/9/22 3:00","2009/9/22 4:00","2009/9/22 5:00","2009/9/22 6:00","2009/9/22 7:00","2009/9/22 8:00","2009/9/22 9:00","2009/9/22 10:00","2009/9/22 11:00","2009/9/22 12:00","2009/9/22 13:00","2009/9/22 14:00","2009/9/22 15:00","2009/9/22 16:00","2009/9/22 17:00","2009/9/22 18:00","2009/9/22 19:00","2009/9/22 20:00","2009/9/22 21:00","2009/9/22 22:00","2009/9/22 23:00","2009/9/23 0:00","2009/9/23 1:00","2009/9/23 2:00","2009/9/23 3:00","2009/9/23 4:00","2009/9/23 5:00","2009/9/23 6:00","2009/9/23 7:00","2009/9/23 8:00","2009/9/23 9:00","2009/9/23 10:00","2009/9/23 11:00","2009/9/23 12:00","2009/9/23 13:00","2009/9/23 14:00","2009/9/23 15:00","2009/9/23 16:00","2009/9/23 17:00","2009/9/23 18:00","2009/9/23 19:00","2009/9/23 20:00","2009/9/23 21:00","2009/9/23 22:00","2009/9/23 23:00","2009/9/24 0:00","2009/9/24 1:00","2009/9/24 2:00","2009/9/24 3:00","2009/9/24 4:00","2009/9/24 5:00","2009/9/24 6:00","2009/9/24 7:00","2009/9/24 8:00","2009/9/24 9:00","2009/9/24 10:00","2009/9/24 11:00","2009/9/24 12:00","2009/9/24 13:00","2009/9/24 14:00","2009/9/24 15:00","2009/9/24 16:00","2009/9/24 17:00","2009/9/24 18:00","2009/9/24 19:00","2009/9/24 20:00","2009/9/24 21:00","2009/9/24 22:00","2009/9/24 23:00","2009/9/25 0:00","2009/9/25 1:00","2009/9/25 2:00","2009/9/25 3:00","2009/9/25 4:00","2009/9/25 5:00","2009/9/25 6:00","2009/9/25 7:00","2009/9/25 8:00","2009/9/25 9:00","2009/9/25 10:00","2009/9/25 11:00","2009/9/25 12:00","2009/9/25 13:00","2009/9/25 14:00","2009/9/25 15:00","2009/9/25 16:00","2009/9/25 17:00","2009/9/25 18:00","2009/9/25 19:00","2009/9/25 20:00","2009/9/25 21:00","2009/9/25 22:00","2009/9/25 23:00","2009/9/26 0:00","2009/9/26 1:00","2009/9/26 2:00","2009/9/26 3:00","2009/9/26 4:00","2009/9/26 5:00","2009/9/26 6:00","2009/9/26 7:00","2009/9/26 8:00","2009/9/26 9:00","2009/9/26 10:00","2009/9/26 11:00","2009/9/26 12:00","2009/9/26 13:00","2009/9/26 14:00","2009/9/26 15:00","2009/9/26 16:00","2009/9/26 17:00","2009/9/26 18:00","2009/9/26 19:00","2009/9/26 20:00","2009/9/26 21:00","2009/9/26 22:00","2009/9/26 23:00","2009/9/27 0:00","2009/9/27 1:00","2009/9/27 2:00","2009/9/27 3:00","2009/9/27 4:00","2009/9/27 5:00","2009/9/27 6:00","2009/9/27 7:00","2009/9/27 8:00","2009/9/27 9:00","2009/9/27 10:00","2009/9/27 11:00","2009/9/27 12:00","2009/9/27 13:00","2009/9/27 14:00","2009/9/27 15:00","2009/9/27 16:00","2009/9/27 17:00","2009/9/27 18:00","2009/9/27 19:00","2009/9/27 20:00","2009/9/27 21:00","2009/9/27 22:00","2009/9/27 23:00","2009/9/28 0:00","2009/9/28 1:00","2009/9/28 2:00","2009/9/28 3:00","2009/9/28 4:00","2009/9/28 5:00","2009/9/28 6:00","2009/9/28 7:00","2009/9/28 8:00","2009/9/28 9:00","2009/9/28 10:00","2009/9/28 11:00","2009/9/28 12:00","2009/9/28 13:00","2009/9/28 14:00","2009/9/28 15:00","2009/9/28 16:00","2009/9/28 17:00","2009/9/28 18:00","2009/9/28 19:00","2009/9/28 20:00","2009/9/28 21:00","2009/9/28 22:00","2009/9/28 23:00","2009/9/29 0:00","2009/9/29 1:00","2009/9/29 2:00","2009/9/29 3:00","2009/9/29 4:00","2009/9/29 5:00","2009/9/29 6:00","2009/9/29 7:00","2009/9/29 8:00","2009/9/29 9:00","2009/9/29 10:00","2009/9/29 11:00","2009/9/29 12:00","2009/9/29 13:00","2009/9/29 14:00","2009/9/29 15:00","2009/9/29 16:00","2009/9/29 17:00","2009/9/29 18:00","2009/9/29 19:00","2009/9/29 20:00","2009/9/29 21:00","2009/9/29 22:00","2009/9/29 23:00","2009/9/30 0:00","2009/9/30 1:00","2009/9/30 2:00","2009/9/30 3:00","2009/9/30 4:00","2009/9/30 5:00","2009/9/30 6:00","2009/9/30 7:00","2009/9/30 8:00","2009/9/30 9:00","2009/9/30 10:00","2009/9/30 11:00","2009/9/30 12:00","2009/9/30 13:00","2009/9/30 14:00","2009/9/30 15:00","2009/9/30 16:00","2009/9/30 17:00","2009/9/30 18:00","2009/9/30 19:00","2009/9/30 20:00","2009/9/30 21:00","2009/9/30 22:00","2009/9/30 23:00","2009/10/1 0:00","2009/10/1 1:00","2009/10/1 2:00","2009/10/1 3:00","2009/10/1 4:00","2009/10/1 5:00","2009/10/1 6:00","2009/10/1 7:00","2009/10/1 8:00","2009/10/1 9:00","2009/10/1 10:00","2009/10/1 11:00","2009/10/1 12:00","2009/10/1 13:00","2009/10/1 14:00","2009/10/1 15:00","2009/10/1 16:00","2009/10/1 17:00","2009/10/1 18:00","2009/10/1 19:00","2009/10/1 20:00","2009/10/1 21:00","2009/10/1 22:00","2009/10/1 23:00","2009/10/2 0:00","2009/10/2 1:00","2009/10/2 2:00","2009/10/2 3:00","2009/10/2 4:00","2009/10/2 5:00","2009/10/2 6:00","2009/10/2 7:00","2009/10/2 8:00","2009/10/2 9:00","2009/10/2 10:00","2009/10/2 11:00","2009/10/2 12:00","2009/10/2 13:00","2009/10/2 14:00","2009/10/2 15:00","2009/10/2 16:00","2009/10/2 17:00","2009/10/2 18:00","2009/10/2 19:00","2009/10/2 20:00","2009/10/2 21:00","2009/10/2 22:00","2009/10/2 23:00","2009/10/3 0:00","2009/10/3 1:00","2009/10/3 2:00","2009/10/3 3:00","2009/10/3 4:00","2009/10/3 5:00","2009/10/3 6:00","2009/10/3 7:00","2009/10/3 8:00","2009/10/3 9:00","2009/10/3 10:00","2009/10/3 11:00","2009/10/3 12:00","2009/10/3 13:00","2009/10/3 14:00","2009/10/3 15:00","2009/10/3 16:00","2009/10/3 17:00","2009/10/3 18:00","2009/10/3 19:00","2009/10/3 20:00","2009/10/3 21:00","2009/10/3 22:00","2009/10/3 23:00","2009/10/4 0:00","2009/10/4 1:00","2009/10/4 2:00","2009/10/4 3:00","2009/10/4 4:00","2009/10/4 5:00","2009/10/4 6:00","2009/10/4 7:00","2009/10/4 8:00","2009/10/4 9:00","2009/10/4 10:00","2009/10/4 11:00","2009/10/4 12:00","2009/10/4 13:00","2009/10/4 14:00","2009/10/4 15:00","2009/10/4 16:00","2009/10/4 17:00","2009/10/4 18:00","2009/10/4 19:00","2009/10/4 20:00","2009/10/4 21:00","2009/10/4 22:00","2009/10/4 23:00","2009/10/5 0:00","2009/10/5 1:00","2009/10/5 2:00","2009/10/5 3:00","2009/10/5 4:00","2009/10/5 5:00","2009/10/5 6:00","2009/10/5 7:00","2009/10/5 8:00","2009/10/5 9:00","2009/10/5 10:00","2009/10/5 11:00","2009/10/5 12:00","2009/10/5 13:00","2009/10/5 14:00","2009/10/5 15:00","2009/10/5 16:00","2009/10/5 17:00","2009/10/5 18:00","2009/10/5 19:00","2009/10/5 20:00","2009/10/5 21:00","2009/10/5 22:00","2009/10/5 23:00","2009/10/6 0:00","2009/10/6 1:00","2009/10/6 2:00","2009/10/6 3:00","2009/10/6 4:00","2009/10/6 5:00","2009/10/6 6:00","2009/10/6 7:00","2009/10/6 8:00","2009/10/6 9:00","2009/10/6 10:00","2009/10/6 11:00","2009/10/6 12:00","2009/10/6 13:00","2009/10/6 14:00","2009/10/6 15:00","2009/10/6 16:00","2009/10/6 17:00","2009/10/6 18:00","2009/10/6 19:00","2009/10/6 20:00","2009/10/6 21:00","2009/10/6 22:00","2009/10/6 23:00","2009/10/7 0:00","2009/10/7 1:00","2009/10/7 2:00","2009/10/7 3:00","2009/10/7 4:00","2009/10/7 5:00","2009/10/7 6:00","2009/10/7 7:00","2009/10/7 8:00","2009/10/7 9:00","2009/10/7 10:00","2009/10/7 11:00","2009/10/7 12:00","2009/10/7 13:00","2009/10/7 14:00","2009/10/7 15:00","2009/10/7 16:00","2009/10/7 17:00","2009/10/7 18:00","2009/10/7 19:00","2009/10/7 20:00","2009/10/7 21:00","2009/10/7 22:00","2009/10/7 23:00","2009/10/8 0:00","2009/10/8 1:00","2009/10/8 2:00","2009/10/8 3:00","2009/10/8 4:00","2009/10/8 5:00","2009/10/8 6:00","2009/10/8 7:00","2009/10/8 8:00","2009/10/8 9:00","2009/10/8 10:00","2009/10/8 11:00","2009/10/8 12:00","2009/10/8 13:00","2009/10/8 14:00","2009/10/8 15:00","2009/10/8 16:00","2009/10/8 17:00","2009/10/8 18:00","2009/10/8 19:00","2009/10/8 20:00","2009/10/8 21:00","2009/10/8 22:00","2009/10/8 23:00","2009/10/9 0:00","2009/10/9 1:00","2009/10/9 2:00","2009/10/9 3:00","2009/10/9 4:00","2009/10/9 5:00","2009/10/9 6:00","2009/10/9 7:00","2009/10/9 8:00","2009/10/9 9:00","2009/10/9 10:00","2009/10/9 11:00","2009/10/9 12:00","2009/10/9 13:00","2009/10/9 14:00","2009/10/9 15:00","2009/10/9 16:00","2009/10/9 17:00","2009/10/9 18:00","2009/10/9 19:00","2009/10/9 20:00","2009/10/9 21:00","2009/10/9 22:00","2009/10/9 23:00","2009/10/10 0:00","2009/10/10 1:00","2009/10/10 2:00","2009/10/10 3:00","2009/10/10 4:00","2009/10/10 5:00","2009/10/10 6:00","2009/10/10 7:00","2009/10/10 8:00","2009/10/10 9:00","2009/10/10 10:00","2009/10/10 11:00","2009/10/10 12:00","2009/10/10 13:00","2009/10/10 14:00","2009/10/10 15:00","2009/10/10 16:00","2009/10/10 17:00","2009/10/10 18:00","2009/10/10 19:00","2009/10/10 20:00","2009/10/10 21:00","2009/10/10 22:00","2009/10/10 23:00","2009/10/11 0:00","2009/10/11 1:00","2009/10/11 2:00","2009/10/11 3:00","2009/10/11 4:00","2009/10/11 5:00","2009/10/11 6:00","2009/10/11 7:00","2009/10/11 8:00","2009/10/11 9:00","2009/10/11 10:00","2009/10/11 11:00","2009/10/11 12:00","2009/10/11 13:00","2009/10/11 14:00","2009/10/11 15:00","2009/10/11 16:00","2009/10/11 17:00","2009/10/11 18:00","2009/10/11 19:00","2009/10/11 20:00","2009/10/11 21:00","2009/10/11 22:00","2009/10/11 23:00","2009/10/12 0:00","2009/10/12 1:00","2009/10/12 2:00","2009/10/12 3:00","2009/10/12 4:00","2009/10/12 5:00","2009/10/12 6:00","2009/10/12 7:00","2009/10/12 8:00","2009/10/12 9:00","2009/10/12 10:00","2009/10/12 11:00","2009/10/12 12:00","2009/10/12 13:00","2009/10/12 14:00","2009/10/12 15:00","2009/10/12 16:00","2009/10/12 17:00","2009/10/12 18:00","2009/10/12 19:00","2009/10/12 20:00","2009/10/12 21:00","2009/10/12 22:00","2009/10/12 23:00","2009/10/13 0:00","2009/10/13 1:00","2009/10/13 2:00","2009/10/13 3:00","2009/10/13 4:00","2009/10/13 5:00","2009/10/13 6:00","2009/10/13 7:00","2009/10/13 8:00","2009/10/13 9:00","2009/10/13 10:00","2009/10/13 11:00","2009/10/13 12:00","2009/10/13 13:00","2009/10/13 14:00","2009/10/13 15:00","2009/10/13 16:00","2009/10/13 17:00","2009/10/13 18:00","2009/10/13 19:00","2009/10/13 20:00","2009/10/13 21:00","2009/10/13 22:00","2009/10/13 23:00","2009/10/14 0:00","2009/10/14 1:00","2009/10/14 2:00","2009/10/14 3:00","2009/10/14 4:00","2009/10/14 5:00","2009/10/14 6:00","2009/10/14 7:00","2009/10/14 8:00","2009/10/14 9:00","2009/10/14 10:00","2009/10/14 11:00","2009/10/14 12:00","2009/10/14 13:00","2009/10/14 14:00","2009/10/14 15:00","2009/10/14 16:00","2009/10/14 17:00","2009/10/14 18:00","2009/10/14 19:00","2009/10/14 20:00","2009/10/14 21:00","2009/10/14 22:00","2009/10/14 23:00","2009/10/15 0:00","2009/10/15 1:00","2009/10/15 2:00","2009/10/15 3:00","2009/10/15 4:00","2009/10/15 5:00","2009/10/15 6:00","2009/10/15 7:00","2009/10/15 8:00","2009/10/15 9:00","2009/10/15 10:00","2009/10/15 11:00","2009/10/15 12:00","2009/10/15 13:00","2009/10/15 14:00","2009/10/15 15:00","2009/10/15 16:00","2009/10/15 17:00","2009/10/15 18:00","2009/10/15 19:00","2009/10/15 20:00","2009/10/15 21:00","2009/10/15 22:00","2009/10/15 23:00","2009/10/16 0:00","2009/10/16 1:00","2009/10/16 2:00","2009/10/16 3:00","2009/10/16 4:00","2009/10/16 5:00","2009/10/16 6:00","2009/10/16 7:00","2009/10/16 8:00","2009/10/16 9:00","2009/10/16 10:00","2009/10/16 11:00","2009/10/16 12:00","2009/10/16 13:00","2009/10/16 14:00","2009/10/16 15:00","2009/10/16 16:00","2009/10/16 17:00","2009/10/16 18:00","2009/10/16 19:00","2009/10/16 20:00","2009/10/16 21:00","2009/10/16 22:00","2009/10/16 23:00","2009/10/17 0:00","2009/10/17 1:00","2009/10/17 2:00","2009/10/17 3:00","2009/10/17 4:00","2009/10/17 5:00","2009/10/17 6:00","2009/10/17 7:00","2009/10/17 8:00","2009/10/17 9:00","2009/10/17 10:00","2009/10/17 11:00","2009/10/17 12:00","2009/10/17 13:00","2009/10/17 14:00","2009/10/17 15:00","2009/10/17 16:00","2009/10/17 17:00","2009/10/17 18:00","2009/10/17 19:00","2009/10/17 20:00","2009/10/17 21:00","2009/10/17 22:00","2009/10/17 23:00","2009/10/18 0:00","2009/10/18 1:00","2009/10/18 2:00","2009/10/18 3:00","2009/10/18 4:00","2009/10/18 5:00","2009/10/18 6:00","2009/10/18 7:00","2009/10/18 8:00"]
+}],yAxis:[{name:"流量(m^3/s)",type:"value",max:500},{name:"降雨量(mm)",type:"value",axisLabel:{formatter:function(e){return-e}}}],series:[{name:"流量",type:"line",itemStyle:{normal:{areaStyle:{type:"default"}}},data:[.97,.96,.96,.95,.95,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.93,.92,.91,.9,.89,.88,.87,.87,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.87,.88,.9,.93,.96,.99,1.03,1.06,1.1,1.14,1.17,1.2,1.23,1.26,1.29,1.33,1.36,1.4,1.43,1.45,1.48,1.49,1.51,1.51,1.5,1.49,1.47,1.44,1.41,1.37,1.34,1.3,1.27,1.24,1.22,1.2,1.19,1.18,1.16,1.15,1.14,1.13,1.12,1.11,1.11,1.1,1.1,1.1,1.1,1.1,1.1,1.1,1.1,1.1,1.1,1.1,1.1,1.1,1.1,1.1,1.1,1.1,1.09,1.09,1.08,1.07,1.06,1.05,1.04,1.03,1.03,1.02,1.01,1.01,1,.99,.98,.97,.96,.96,.95,.95,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.93,.92,.91,.9,.89,.88,.87,.87,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.85,.84,.83,.82,.81,.8,.8,.79,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.77,.75,.73,.71,.68,.65,.63,.61,.59,.58,.58,.58,.58,.58,.58,.58,.58,.58,.58,.58,.58,.58,.58,.58,.58,.58,.58,.58,.58,.58,.58,.58,.58,.58,.58,.58,.58,.58,.58,.58,.58,.58,.58,.58,.58,.58,.58,.58,.58,.58,.58,.58,.58,.58,.58,.58,.58,.58,.58,.58,.57,.57,.57,.56,.55,.55,.54,.54,.53,.52,.52,.51,.51,.5,.5,.49,.48,.48,.47,.47,.47,.46,.46,.46,.46,.46,.46,.46,.46,.46,.46,.46,.46,.46,.46,.46,.46,.46,.46,.46,.46,.46,.46,.46,.46,.46,.46,.46,.46,.46,.46,.46,.46,.46,.46,.46,.46,.46,.46,.52,.67,.9,1.19,1.52,1.87,2.22,2.55,2.84,3.07,3.22,3.28,3.28,3.28,3.28,3.28,3.28,3.28,3.28,3.28,3.28,3.28,3.28,3.28,3.24,3.13,2.97,2.77,2.54,2.3,2.05,1.82,1.62,1.46,1.35,1.31,1.31,1.31,1.31,1.31,1.31,1.31,1.31,1.31,1.31,1.31,1.31,1.31,1.31,1.31,1.31,1.31,1.31,1.31,1.31,1.31,1.31,1.31,1.31,1.31,1.31,1.31,1.31,1.31,1.31,1.31,1.31,1.31,1.31,1.31,1.31,1.31,1.3,1.26,1.21,1.14,1.06,.97,.89,.81,.74,.69,.65,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.63,.63,.62,.62,.61,.6,.59,.59,.58,.58,.58,.58,.58,.58,.58,.58,.58,.58,.58,.58,.58,.58,.58,.58,.59,.61,.63,.65,.68,.71,.73,.75,.77,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.77,.75,.73,.71,.68,.65,.63,.61,.59,.58,.58,.58,.58,.58,.58,.58,.58,.58,.58,.58,.58,.58,.58,.58,.58,.59,.59,.6,.61,.62,.62,.63,.63,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.65,.66,.68,.69,.71,.73,.74,.76,.77,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.78,.79,.81,.82,.84,.86,.88,.9,.92,.93,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.94,.93,.92,.91,.9,.89,.88,.87,.87,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.86,.85,.84,.82,.8,.78,.76,.75,.73,.72,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.72,.73,.74,.76,.78,.79,.82,.84,.86,.89,.91,.94,.97,1,1.02,1.05,1.08,1.11,1.14,1.17,1.19,1.22,1.25,1.27,1.29,1.31,1.33,1.35,1.36,1.38,1.39,1.39,1.4,1.4,1.4,1.39,1.37,1.35,1.32,1.29,1.26,1.22,1.18,1.14,1.1,1.05,1.01,.97,.93,.89,.85,.82,.78,.76,.74,.72,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.72,.73,.74,.75,.77,.78,.8,.82,.84,.87,.89,.92,.94,.97,.99,1.02,1.05,1.08,1.1,1.13,1.16,1.18,1.21,1.23,1.26,1.28,1.3,1.32,1.34,1.35,1.37,1.38,1.39,1.4,1.41,1.41,1.42,1.42,1.43,1.43,1.43,1.44,1.44,1.44,1.44,1.45,1.45,1.45,1.46,1.46,1.46,1.47,1.47,1.48,1.48,1.49,1.5,1.51,1.54,1.62,1.73,1.88,2.05,2.24,2.45,2.67,2.89,3.11,3.31,3.51,3.69,3.86,4.03,4.18,4.33,4.48,4.62,4.76,4.89,5.02,5.16,5.29,5.43,5.57,5.71,5.86,6.02,6.18,6.36,6.54,6.73,6.93,7.15,7.38,7.62,7.88,8.16,8.46,8.77,9.11,9.46,9.84,10.24,10.67,11.12,11.6,12.3,13.66,16,38.43,82.21,146.6,218.7,226,225.23,223.08,219.78,212,199.82,184.6,168,151.65,137.21,126.31,119.94,115.52,112.06,108.92,105.44,101,94.56,86.36,77.67,69.76,63.9,60.38,57.41,54.84,52.57,50.56,48.71,46.97,45.25,43.48,41.6,39.5,37.19,34.81,32.46,30.27,28.36,26.85,25.86,25.5,25.5,25.5,25.5,25.5,25.5,25.5,25.5,25.5,25.5,25.5,25.5,25.5,25.27,24.65,23.7,22.52,21.17,19.75,18.33,16.98,15.8,14.85,14.23,14,14.02,14.08,14.17,14.29,14.44,14.61,14.8,15.01,15.23,15.47,15.71,15.95,16.19,16.43,16.67,16.89,17.1,17.29,17.46,17.61,17.73,17.82,17.88,17.9,17.63,16.88,15.75,14.33,12.71,10.98,9.23,7.56,6.05,4.81,3.92,3.47,3.28,3.1,2.93,2.76,2.61,2.46,2.32,2.19,2.07,1.96,1.85,1.75,1.66,1.58,1.51,1.44,1.39,1.34,1.29,1.26,1.23,1.22,1.2,1.2,1.2,1.2,1.2,1.2,1.21,1.21,1.21,1.21,1.22,1.22,1.22,1.23,1.23,1.23,1.24,1.24,1.25,1.25,1.25,1.26,1.26,1.27,1.27,1.27,1.28,1.28,1.28,1.29,1.29,1.29,1.29,1.3,1.3,1.3,1.3,1.3,1.3,1.3,1.3,1.3,1.3,1.3,1.29,1.29,1.29,1.29,1.28,1.28,1.28,1.27,1.27,1.26,1.25,1.25,1.24,1.23,1.23,1.22,1.21,1.2,1.16,1.06,.95,.83,.74,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.71,.7,.7,.7,.7,.7,.7,.7,.7,.7,.7,.7,.69,.69,.69,.69,.69,.69,.69,.69,.68,.68,.68,.68,.68,.68,.67,.67,.67,.67,.67,.67,.67,.66,.66,.66,.66,.66,.66,.66,.65,.65,.65,.65,.65,.65,.65,.65,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.65,.66,.68,.69,.71,.73,.74,.76,.77,.78,.78,.78,.78,.78,.78,.78,.78,.8,.86,.95,1.08,1.25,1.46,1.7,1.97,2.28,2.63,3.01,3.42,3.87,4.35,4.86,5.4,5.98,6.59,7.92,10.49,14.04,18.31,23.04,27.98,32.87,37.45,41.46,44.64,46.74,47.5,46.86,45.16,42.77,40.04,37.33,35,32.74,30.21,27.7,25.5,23.9,23.2,23.06,22.94,22.84,22.77,22.72,22.7,22.8,23.23,23.95,24.91,26.04,27.3,28.76,30.7,33.39,37.12,42.15,48.77,65.22,252.1,257,237.32,221.19,212,208.67,206.89,205.2,202.15,189.82,172,165.3,160.49,156.8,153.44,149.62,144.6,138.27,131,123.11,114.9,106.69,98.79,91.5,85.13,80,75.53,71.03,66.65,62.54,58.85,55.73,53.31,51.75,51.2,56.53,68.25,80,91.01,102.03,109,112.37,115.29,117.68,119.48,120.61,121,119.45,115.57,110.52,105.47,101.58,100,99.97,99.94,99.92,99.9,99.88,99.86,99.85,99.84,99.83,99.82,99.81,99.81,99.8,99.8,99.8,122.15,163.65,186,182.96,175.15,164.56,153.18,143,136,131.37,126.98,122.81,118.85,115.09,111.52,108.13,104.9,101.83,98.9,96.11,93.44,90.87,88.41,86.04,83.74,81.51,79.33,77.2,75.1,73.02,70.95,68.88,66.8,64.87,63.14,61.4,59.53,57.67,56,54.6,53.36,52.2,51.05,49.85,48.5,46.87,44.92,42.74,40.42,38.04,35.69,33.46,31.44,29.72,28.38,27.51,27.2,27.2,27.2,27.2,27.2,27.2,27.2,27.2,27.2,27.2,27.2,27.2,27.2,27.14,26.97,26.7,26.35,25.95,25.49,25.02,24.53,24.04,23.58,23.16,22.8,22.46,22.11,21.75,21.39,21.03,20.69,20.36,20.05,19.78,19.54,19.35,19.2,19.09,19,18.92,18.85,18.79,18.74,18.68,18.62,18.56,18.49,18.4,18.3,18.17,18.02,17.83,17.63,17.41,17.18,16.93,16.68,16.43,16.18,15.93,15.7,15.47,15.22,14.97,14.71,14.45,14.18,13.93,13.68,13.44,13.21,13,12.8,12.62,12.46,12.31,12.16,12.03,11.89,11.76,11.62,11.48,11.33,11.17,11,10.81,10.59,10.36,10.12,9.86,9.61,9.36,9.12,8.89,8.68,8.5,8.35,8.21,8.08,7.94,7.81,7.68,7.56,7.46,7.36,7.29,7.23,7.19,7.18,7.51,8.42,9.81,11.58,13.63,15.86,18.16,20.44,22.58,24.49,26.06,27.2,28.08,28.95,29.81,30.65,31.48,32.28,33.07,33.82,34.55,35.25,35.92,36.56,37.15,37.71,38.23,38.7,39.13,39.5,39.83,40.1,40.31,40.47,40.57,40.6,40.49,40.16,39.64,38.94,38.09,37.1,36,34.79,33.51,32.17,30.79,29.39,27.99,26.6,25.25,23.96,22.75,21.63,20.63,19.76,19.04,18.49,18.14,18,17.97,17.95,17.94,17.92,17.91,17.9,17.89,17.88,17.87,17.85,17.83,17.8,17.7,17.46,17.13,16.7,16.21,15.68,15.13,14.57,14.04,13.56,13.14,12.8,12.52,12.27,12.02,11.79,11.57,11.37,11.16,10.97,10.78,10.59,10.39,10.2,10.01,9.81,9.63,9.44,9.26,9.08,8.9,8.73,8.56,8.39,8.22,8.06,7.9,7.73,7.57,7.41,7.25,7.09,6.94,6.79,6.65,6.52,6.4,6.28,6.17,6.08,5.98,5.9,5.81,5.73,5.65,5.57,5.49,5.41,5.32,5.23,5.14,5.04,4.94,4.84,4.74,4.63,4.53,4.43,4.33,4.23,4.13,4.03,3.93,3.81,3.69,3.57,3.45,3.33,3.22,3.12,3.04,2.98,2.93,2.92,2.92,2.92,2.92,2.92,2.92,2.92,2.92,2.92,2.92,2.92,2.92,2.92,2.9,2.86,2.8,2.71,2.62,2.52,2.42,2.33,2.24,2.18,2.14,2.12,2.12,2.12,2.12,2.12,2.12,2.12,2.12,2.12,2.12,2.12,2.12,2.12,2.1,2.06,2,1.91,1.82,1.71,1.61,1.5,1.4,1.32,1.25,1.2,1.16,1.13,1.1,1.06,1.03,1,.97,.93,.9,.87,.85,.82,.79,.77,.74,.72,.69,.67,.65,.63,.61,.59,.58,.56,.54,.53,.52,.51,.5,.49,.48,.48,.47,.47,.46,.46,.47,.48,.5,.53,.56,.59,.62,.64,.67,.69,.7,.71,.71,.71,.71,.7,.7,.7,.69,.69,.69,.68,.68,.67,.67,.67,.66,.66,.65,.65,.65,.65,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.64,.65,.65,.65,.66,.66,.67,.68,.69,.69,.7,.71,.73,.74,.75,.76,.78,.8,.81,.83,.85,.87,.89,.92,.94,.97,.99,1.02,1.05,1.08,1.11,1.15,1.18,1.32,1.66,2.21,2.97,3.94,5.11,6.5,8.1,9.9,11.92,14.15,16.6,22.3,22.8,24.48,30.38,35.74,42.4,57.14,94.04,112.9,123.4,130.4,130,119.4,120.7,116.8,118.1,119.4,124.8,143.5,204,294,319.2,328.4,365,350.8,347.6,347.6,325,331.6,319.2,308,308,308,308,296.8,300,281,278.4,270.6,271,253.6,233.5,219.2,207.8,205.9,204,189.6,178.8,173.4,160,154.4,146,145,140.5,130.4,126.2,116.8,112.9,106.5,101.6,98.51,82.67,67.3,80.05,76.12,72.3,71.02,69.78,67.3,67.3,68.54,57.6,71.02,66.06,59.12,57.14,55.16,55.16,52.19,52.19,51.2,48.56,44.16,43,45.92,49.44,44.16,36.48,35.74,35,32.36,37.22,32.36,32.36,32.36,33.68,32.36,31.7,35.74,29.72,32.36,30.38,29.72,28.4,28.4,28.4,27.28,25.6,25.04,23.92,22.3,21.8,21.8,21.8,22.8,21.8,25.6,22.8,22.8,17.8,16.04,16.04,16.04,16.04,16.04,16.04,16.04,16.04,16.04,16.04,15.02,14,14.03,14.11,14.25,14.45,14.72,15.06,15.46,15.95,16.51,17.15,17.87,18.69,19.59,20.59,21.69,22.88,24.18,25.59,27.1,28.73,30.48,32.34,34.33,36.44,38.69,41.06,43.57,46.22,49.01,51.95,55.04,58.27,61.66,65.21,68.92,72.8,88.09,104.9,105.7,110.3,111.6,110.3,106.5,105.7,103.3,100,97.02,98.8,91.07,83.98,88.09,81.36,78.74,77.43,77.43,73.5,74.81,72.63,68.58,66.4,68.54,69.78,67.3,64.82,61.1,59.12,56.15,53.18,50.32,49.44,44.16,36.5,42.4,37.96,37.22,33.68,36.48,35.74,35,35,37.22,37.22,39.44,32.6,34.54,36.48,35.74,34.34,33.68,33.02,31.04,29.72,29.72,29.72,26.16,25.6,29.72,18.3,22.3,21.3,21.8,21.8,20.3,20.8,25.04,25.04,25.6,25.6,25.04,25.6,25.04,25.6,23.92,25.04,21.3,21.8,22.3,21.8,20.8,16.1,20.3,18.3,13.22,19.3,19.3,18.3,14.4,13.86,13.36,12.9,12.48,12.1,11.75,11.43,11.15,10.9,10.67,10.48,10.31,10.16,10.04,9.93,9.85,9.78,9.73,9.69,9.67,9.65,9.65,12.08,8.67,11.7,11.38,10.65,9.84,9.32,9.07,8.85,8.66,8.49,8.35,8.22,8.1,7.98,7.86,7.74,7.61,7.47,7.31,7.14,6.96,6.78,6.58,6.39,6.19,5.99,5.78,5.58,5.39,5.2,5.01,4.83,4.67,4.51,4.37,4.24,4.12,4.02,3.95,3.89,3.85,3.84,4.41,5.77,7.39,8.75,9.32,9.18,9,8.94,8.88,8.83,8.78,8.73,8.68,8.64,8.6,8.56,8.53,8.5,8.47,8.45,8.42,8.4,8.39,8.37,8.36,8.35,8.35,8.34,8.34,8.67,9.65,9.62,9.53,9.4,9.21,8.98,8.7,8.4,8.06,7.69,7.3,6.89,6.47,6.03,5.59,5.14,4.7,4.26,3.83,3.42,3.02,2.65,2.3,1.98,1.7,1.45,1.25,1.09,.99,.94,.92,.91,.89,.87,.85,.84,.82,.81,.79,.78,.77,.75,.74,.73,.72,.71,.7,.69,.68,.67,.66,.65,.64,.64,.63,.63,.62,.62,.61,.61,.61,.6,.6,.6,.6,.6,.6,.6,.6,.6,.6,.6,.6,.6,.6,.6,.6,.6,.6,.6,.6,.6,.6,.6,.6,.6,.6,.6,.6,.6,.6,.6,.6,.6,.6,.6,.6,.6,.6,.6,.6,.6,.6,.6,.6,.6,.6,.6,.61,.61,.61,.61,.61,.61,.62,.62,.62,.62,.63,.63,.63,.63,.63,.64,.64,.64,.64,.64,.65,.65,.65,.65,.65,.65,.65,.65,.65,.65,.65,.65,.65,.65,.65,.65,.65,.65,.65,.65,.65,.65,.65,.64,.63,.62,.6,.59,.57,.55,.54,.53,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.51,.51,.51,.5,.5,.49,.48,.47,.47,.46,.45,.45,.44,.43,.42,.42,.41,.41,.41,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.41,.42,.43,.44,.46,.48,.5,.53,.55,.58,.61,.64,.67,.7,.73,.77,.8,.83,.87,.9,.93,.96,.99,1.02,1.05,1.08,1.1,1.12,1.14,1.16,1.17,1.18,1.19,1.2,1.2,1.2,1.19,1.17,1.15,1.12,1.09,1.06,1.02,.98,.94,.9,.86,.82,.78,.74,.7,.66,.63,.6,.57,.55,.53,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.52,.51,.51,.5,.5,.49,.49,.48,.47,.47,.47,.46,.46,.45,.45,.45,.44,.44,.44,.43,.43,.43,.42,.42,.42,.41,.41,.41,.41,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.4,.41,.41,.41,.41,.41,.41,.41,.41,.41,.41,.41,.41,.41,.41,.41,.42,.42,.42,.42,.42,.42,.42,.42,.42,.43,.43,.43,.43,.43,.43,.44,.44,.44,.44,.44,.44,.45,.45,.45]},{name:"降雨量",type:"line",yAxisIndex:1,itemStyle:{normal:{areaStyle:{type:"default"}}},data:function(){for(var e=[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,.005,.017,.017,.017,.017,.011,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,.021,.026,.03,.036,.036,.195,.221,.019,.013,.017,.03,.03,.03,.046,.045,.038,.084,.045,.045,.037,.034,.035,.036,.044,.052,.048,.109,.033,.029,.04,.042,.042,.042,.073,.076,.062,.066,.066,.075,.096,.128,.121,.128,.14,.226,.143,.097,.018,0,0,0,0,0,.018,.047,.054,.054,.054,.036,.185,.009,.038,.061,.077,.091,.126,.69,.182,.349,.231,.146,.128,.167,.1,.075,.071,.071,.117,.01,.002,.002,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,.005,.026,.038,.038,.038,.076,.086,.109,.213,.276,.288,.297,.642,1.799,1.236,2.138,.921,.497,.685,.828,.41,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,.018,.024,.024,.024,.024,.006,.003,.046,.046,.046,.046,.043,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,.204,.303,1.028,1.328,1.524,1.41,1.362,1.292,1.191,.529,.501,.944,1.81,2.899,.859,.126,.087,.047,0,0,0,0,.011,.028,.028,.028,.028,.017,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,.099,.159,.297,.309,.309,.614,.818,1.436,1.195,.553,.542,.955,.898,.466,.386,.556,.388,.221,.192,.192,.187,.166,.18,.302,.158,.009,.009,.009,.009,.009,.007,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,.004,.032,.032,.032,.032,.082,.149,.204,.247,.262,.49,.51,.533,.746,.847,2.393,1.188,1.114,.475,.043,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,.017,.017,.021,.042,.079,.111,.126,.122,.133,.846,.102,.077,.067,.056,.005,0,0,0,0,0,0,0,0,0,0,0,0,0,.011,.017,.017,.017,.017,.006,0,0,0,0,0,.01,.03,.054,.067,.07,.25,.251,.494,.065,.054,.054,.064,.084,.077,.101,.132,.248,.069,.117,.115,.087,.326,.036,.009,.009,.009,.009,.009,.004,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,.02,.039,.04,.04,.04,.229,.079,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,.023,.069,.082,.082,.082,.503,.774,.038,.012,.012,.012,.016,.02,.028,.051,.06,.064,.19,.15,.164,.139,.13,.085,.031,.023,.022,.007,.005,.005,.001,0,.02,.048,.048,.053,.056,.036,.008,.008,.004,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,.013,.017,.036,.068,.095,.233,.272,.377,.722,1.494,3.756,.954,.439,.442,.462,.373,.249,.214,.1,.044,.037,.023,.002,0,0,0,0,0,0,.02,.024,.024,.024,.024,.004,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,.008,.017,.017,.045,.186,.308,.241,.241,.893,4.067,4.494,5.015,3.494,2.057,1.411,.718,.407,.313,.339,1.537,1.105,.218,.136,.03,.005,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,.037,.448,1.2,1.309,1.309,1.425,1.223,.471,.767,.423,.273,.412,.646,.481,.239,.131,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,.044,.15,.223,.388,.513,.883,2.828,4.786,5.959,4.95,6.434,6.319,3.35,2.806,4.204,1.395,1.015,1.015,.836,.74,.72,.615,.477,.192,.046,.007,.007,.007,.007,.007,.007,.007,.008,.005,.005,.005,.005,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,.001,.012,.012,.012,.012,.011,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,.002,.012,.028,.028,.028,.138,.092,.082,.082,.096,.719,.155,.042,.047,.129,.021,.021,.014,.009,.029,.067,.088,.095,.095,.138,.091,.032,.025,.025,.003,0,0,0,0,0,0,0,0,0,0,0,0,.002,.045,.228,.297,.325,.339,.581,1.244,.796,.517,.227,.053,.006,0,0,0,0,0,0,0,0,0,.003,.005,.005,.005,.005,.081,.129,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,.014,.041,.041,.041,.041,.027,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,.009,.017,.017,.017,.017,.355,.174,.009,.009,.012,.136,.208,.208,.208,.215,7.359,1.858,.458,.053,.053,.047,.045,.045,.059,.136,.188,.206,.21,.588,1.517,6.02,4.688,4.42,.624,.326,.359,.553,.899,.94,2.95,9.415,5.752,1.092,.096,.035,.026,.018,.015,.011,.011,.011,0,0,0,0,0,0,0,0,0,0,0,.056,.27,.314,.351,.354,.609,.796,1.857,.848,.538,.214,.178,.178,.201,.231,.227,.272,.397,.45,1.014,2.917,1.675,.081,.059,.059,.148,.075,.075,.078,.236,.784,.784,.784,.784,.741,.115,.058,.058,.058,.029,.015,.015,.015,.015,.012,.008,.604,.985,1.305,2.273,2.528,2.336,2.496,2.281,1.397,1.713,3.259,1.167,.745,.548,1.058,.684,.728,.392,.179,.283,.283,.46,.08,.099,.099,.099,.1,.143,.137,.238,.317,.262,.225,.792,.426,.332,.261,.11,.093,.102,.171,.292,.504,.605,1.745,2.485,1.964,.33,.171,.259,.242,.215,.366,.354,.205,.203,.262,.153,.13,.137,.362,.691,.295,.433,.154,.056,.053,.053,.053,.051,.047,.065,.078,.091,.206,.813,.102,.151,.05,.024,.004,.001,0,0,0,.021,.021,.021,.021,.021,.013,.013,.013,.013,.013,.013,.013,.013,.01,.01,.01,.01,.01,.01,.01,.01,.01,.01,.008,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,.018,.021,.021,.021,.021,.003,0,0,0,0,0,0,0,0,0,.024,.173,.261,.267,.267,.534,1.354,1.772,.72,.218,.018,.018,.028,.036,.032,.194,.082,.035,.286,.027,.038,.038,.027,.021,.014,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,.016,.017,.017,.031,.047,.043,.056,.104,.149,.179,.205,.328,.998,.522,1.851,3.727,3.273,2.204,1.169,1.006,1.179,.74,.741,1.065,.925,.671,.497,.431,.327,.277,.126,.581,.207,.359,2.485,.038,.036,.003,.003,.003,.003,.004,.098,.023,.021,.021,.022,.041,.041,.043,.045,.043,.014,.014,.014,.014,.014,.014,.014,.031,.046,.063,.119,.107,.092,.085,.065,.06,.054,.042,.039,.046,.044,.028,.028,.02,.013,.013,.013,.013,.016,.032,.031,.031,.031,.028,.011,.011,.011,.011,.011,.023,.024,.024,.024,.019,.015,.015,.015,.015,.015,.015,.013,.01,.01,.01,.01,.01,.01,.01,.01,.01,.01,.001,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,.011,.017,.024,.026,.061,.172,.206,.213,.267,.511,.668,.157,.017,.017,.017,.046,.054,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,.001,.017,.017,.017,.017,.016,0,0,0,0,0,0,0,0,0,.01,.017,.017,.017,.017,.012,.017,.017,.017,.017,.012,0,0,0,0,0,.003,.031,.066,.093,.112,.122,.202,.068,.041,.022,.011,0,0,0,0,0,0,0,0,0,0,0,.002,.005,.012,.021,.021,.019,.033,.03,.026,.026,.034,.095,.024,.024,.024,.023,.019,.018,.018,.018,.011,.03,.045,.044,.044,.044,.022,.009,.024,.033,.033,.033,.024,.009,0,0,0,0,0,0,.003,.017,.017,.017,.017,.014,0,0,0,0,0,.032,.032,.032,.032,.032,.005,.008,.009,.014,.014,.009,.005,.004,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,.007,.009,.009,.009,.009,.043,.063,.084,.098,.101,.213,.334,.383,.43,.448,.511,.801,.835,1.642,1.614,1.496,1.496,1.476,1.068,.481,.22,.119,.099,.07,.072,.063,.076,.14,.205,.28,.297,.3,.479,.877,1.098,1.611,1.629,1.686,1.686,1.631,1.528,1.862,1.703,1.531,2.196,.395,.416,.453,.728,.917,.986,1.17,2.171,3.011,2.909,3.301,1.377,.778,.799,.947,1.039,.879,.76,1.372,1.674,1.674,1.68,1.823,1.793,1.162,.783,.216,.152,.152,.152,.049,0,0,0,.117,.127,.127,.127,.127,.127,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,.003,.005,.005,.005,.005,.003,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,.309,.364,.364,.364,.364,.063,.01,.01,.01,.012,.015,.015,.11,.55,.824,.825,.829,1.39,1.429,1.342,1.43,1.636,1.717,2.135,2.203,3.191,3.022,1.589,.86,.807,.645,.595,.588,.557,.552,1.271,.708,.677,.629,.714,.203,.133,.061,.062,.018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,.001,.072,.29,.438,.53,.557,.873,1.039,1.04,.208,.049,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,.03,.039,.039,.039,.039,.098,.008,.007,.007,.007,.007,.007,.007,.007,.007,.007,.056,.062,.065,.065,.065,.047,.216,.256,.315,.4,.502,.449,.47,.571,.814,1.153,.774,.202,.086,.075,.071,.032,.019,.003,.004,.004,.004,.004,.004,.004,.007,.072,.153,.256,.306,.404,.698,.733,.823,.715,.563,.404,.293,.217,.213,.202,.202,.294,.704,.797,1.359,1.101,.72,.514,.539,.434,.389,.387,.386,.375,.369,.319,.239,.183,.136,.062,.052,.096,.119,.119,.114,.127,.132,.139,.169,.191,.278,.254,.214,.237,.221,.143,.129,.125,.109,.1,.087,.06,.038,.029,.029,.028,.048,.053,.053,.111,.125,.102,.097,.097,.039,.02,.02,.02,.014,.004,.031,.043,.047,.052,.08,.144,.182,.176,.171,.149,.112,.025,0,0,0,0,0,0,0,.016,.031,.031,.031,.031,.015,0,0,0,0,0,.005,.005,.005,.005,.005,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,.005,.005,.005,.005,.005,.001,0,0,0],a=e.length;a--;)e[a]*=-1;return e}()}]}],g=e("#LAY-index-area").children("div"),S=function(e){h[e]=a.init(g[e],layui.echartsTheme),h[e].setOption(f[e]),window.onresize=h[e].resize};if(g[0]){S(0);var A=[],w=[{title:{text:"对数轴示例",x:"center"},tooltip:{trigger:"item",formatter:"{a} <br/>{b} : {c}"},legend:{x:"left",data:["2的指数","3的指数"]},xAxis:[{type:"category",name:"x",splitLine:{show:!1},data:["一","二","三","四","五","六","七","八","九"]}],yAxis:[{type:"log",name:"y"}],calculable:!0,series:[{name:"3的指数",type:"line",data:[1,3,9,27,81,247,741,2223,6669]},{name:"2的指数",type:"line",data:[1,2,4,8,16,32,64,128,256]}]}],k=e("#LAY-index-logline").children("div"),z=function(e){A[e]=a.init(k[e],layui.echartsTheme),A[e].setOption(w[e]),window.onresize=A[e].resize};k[0]&&z(0)}}}}}}),layui.use(["carousel","echarts"],function(){var e=layui.$,a=(layui.carousel,layui.echarts),t=[],i=[{title:{text:"某地区蒸发量和降水量",subtext:"纯属虚构"},tooltip:{trigger:"axis"},legend:{data:["蒸发量","降水量"]},calculable:!0,xAxis:[{type:"category",data:["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"]}],yAxis:[{type:"value"}],series:[{name:"蒸发量",type:"bar",data:[2,4.9,7,23.2,25.6,76.7,135.6,162.2,32.6,20,6.4,3.3],markPoint:{data:[{type:"max",name:"最大值"},{type:"min",name:"最小值"}]},markLine:{data:[{type:"average",name:"平均值"}]}},{name:"降水量",type:"bar",data:[2.6,5.9,9,26.4,28.7,70.7,175.6,182.2,48.7,18.8,6,2.3],markPoint:{data:[{name:"年最高",value:182.2,xAxis:7,yAxis:183,symbolSize:18},{name:"年最低",value:2.3,xAxis:11,yAxis:3}]},markLine:{data:[{type:"average",name:"平均值"}]}}]}],n=e("#LAY-index-normcol").children("div"),l=function(e){t[e]=a.init(n[e],layui.echartsTheme),t[e].setOption(i[e]),window.onresize=t[e].resize};if(n[0]){l(0);var r=[],o=[{tooltip:{trigger:"axis",axisPointer:{type:"shadow"}},legend:{data:["直接访问","邮件营销","联盟广告","视频广告","搜索引擎","百度","谷歌","必应","其他"]},calculable:!0,xAxis:[{type:"category",data:["周一","周二","周三","周四","周五","周六","周日"]}],yAxis:[{type:"value"}],series:[{name:"直接访问",type:"bar",data:[320,332,301,334,390,330,320]},{name:"邮件营销",type:"bar",stack:"广告",data:[120,132,101,134,90,230,210]},{name:"联盟广告",type:"bar",stack:"广告",data:[220,182,191,234,290,330,310]},{name:"视频广告",type:"bar",stack:"广告",data:[150,232,201,154,190,330,410]},{name:"搜索引擎",type:"bar",data:[862,1018,964,1026,1679,1600,1570],markLine:{itemStyle:{normal:{lineStyle:{type:"dashed"}}},data:[[{type:"min"},{type:"max"}]]}},{name:"百度",type:"bar",barWidth:5,stack:"搜索引擎",data:[620,732,701,734,1090,1130,1120]},{name:"谷歌",type:"bar",stack:"搜索引擎",data:[120,132,101,134,290,230,220]},{name:"必应",type:"bar",stack:"搜索引擎",data:[60,72,71,74,190,130,110]},{name:"其他",type:"bar",stack:"搜索引擎",data:[62,82,91,84,109,110,120]}]}],m=e("#LAY-index-heapcol").children("div"),s=function(e){r[e]=a.init(m[e],layui.echartsTheme),r[e].setOption(o[e]),window.onresize=r[e].resize};if(m[0]){s(0);var y=[],d=[{title:{text:"双数值柱形图",subtext:"纯属虚构"},tooltip:{trigger:"axis",axisPointer:{show:!0,type:"cross",lineStyle:{type:"dashed",width:1}},formatter:function(e){return e.seriesName+" : [ "+e.value[0]+", "+e.value[1]+" ]"}},legend:{data:["数据1","数据2"]},calculable:!0,xAxis:[{type:"value"}],yAxis:[{type:"value",axisLine:{lineStyle:{color:"#dc143c"}}}],series:[{name:"数据1",type:"bar",data:[[1.5,10],[5,7],[8,8],[12,6],[11,12],[16,9],[14,6],[17,4],[19,9]],markPoint:{data:[{type:"max",name:"最大值",symbol:"emptyCircle",itemStyle:{normal:{color:"#dc143c",label:{position:"top"}}}},{type:"min",name:"最小值",symbol:"emptyCircle",itemStyle:{normal:{color:"#dc143c",label:{position:"bottom"}}}},{type:"max",name:"最大值",valueIndex:0,symbol:"emptyCircle",itemStyle:{normal:{color:"#1e90ff",label:{position:"right"}}}},{type:"min",name:"最小值",valueIndex:0,symbol:"emptyCircle",itemStyle:{normal:{color:"#1e90ff",label:{position:"left"}}}}]},markLine:{data:[{type:"max",name:"最大值",itemStyle:{normal:{color:"#dc143c"}}},{type:"min",name:"最小值",itemStyle:{normal:{color:"#dc143c"}}},{type:"average",name:"平均值",itemStyle:{normal:{color:"#dc143c"}}},{type:"max",name:"最大值",valueIndex:0,itemStyle:{normal:{color:"#1e90ff"}}},{type:"min",name:"最小值",valueIndex:0,itemStyle:{normal:{color:"#1e90ff"}}},{type:"average",name:"平均值",valueIndex:0,itemStyle:{normal:{color:"#1e90ff"}}}]}},{name:"数据2",type:"bar",barHeight:10,data:[[1,2],[2,3],[4,4],[7,5],[11,11],[18,15]]}]}],c=e("#LAY-index-diffcol").children("div"),p=function(e){y[e]=a.init(c[e],layui.echartsTheme),y[e].setOption(d[e]),window.onresize=y[e].resize};if(c[0]){p(0);var u=[],x=[{title:{x:"center",text:"ECharts例子个数统计",subtext:"Rainbow bar example",link:"http://echarts.baidu.com/doc/example.html"},tooltip:{trigger:"item"},calculable:!0,grid:{borderWidth:0,y:80,y2:60},xAxis:[{type:"category",show:!1,data:["Line","Bar","Scatter","K","Pie","Radar","Chord","Force","Map","Gauge","Funnel"]}],yAxis:[{type:"value",show:!1}],series:[{name:"ECharts例子个数统计",type:"bar",itemStyle:{normal:{color:function(e){var a=["#C1232B","#B5C334","#FCCE10","#E87C25","#27727B","#FE8463","#9BCA63","#FAD860","#F3A43B","#60C0DD","#D7504B","#C6E579","#F4E001","#F0805A","#26C0C0"];return a[e.dataIndex]},label:{show:!0,position:"top",formatter:"{b}\n{c}"}}},data:[12,21,10,4,12,5,6,5,25,23,7],markPoint:{tooltip:{trigger:"item",backgroundColor:"rgba(0,0,0,0)",formatter:function(e){return'<img src="'+e.data.symbol.replace("image://","")+'"/>'}},data:[{xAxis:0,y:350,name:"Line",symbolSize:20},{xAxis:1,y:350,name:"Bar",symbolSize:20},{xAxis:2,y:350,name:"Scatter",symbolSize:20},{xAxis:3,y:350,name:"K",symbolSize:20},{xAxis:4,y:350,name:"Pie",symbolSize:20},{xAxis:5,y:350,name:"Radar",symbolSize:20},{xAxis:6,y:350,name:"Chord",symbolSize:20},{xAxis:7,y:350,name:"Force",symbolSize:20},{xAxis:8,y:350,name:"Map",symbolSize:20},{xAxis:9,y:350,name:"Gauge",symbolSize:20},{xAxis:10,y:350,name:"Funnel",symbolSize:20}]}}]}],v=e("#LAY-index-colorline").children("div"),b=function(e){u[e]=a.init(v[e],layui.echartsTheme),u[e].setOption(x[e]),window.onresize=u[e].resize};if(v[0]){b(0);var h=[],f=[{title:{text:"世界人口总量",subtext:"数据来自网络"},tooltip:{trigger:"axis"},legend:{data:["2011年","2012年"]},calculable:!0,xAxis:[{type:"value",boundaryGap:[0,.01]}],yAxis:[{type:"category",data:["巴西","印尼","美国","印度","中国","世界人口(万)"]}],series:[{name:"2011年",type:"bar",data:[18203,23489,29034,104970,131744,630230]},{name:"2012年",type:"bar",data:[19325,23438,31e3,121594,134141,681807]}]}],g=e("#LAY-index-normbar").children("div"),S=function(e){h[e]=a.init(g[e],layui.echartsTheme),h[e].setOption(f[e]),window.onresize=h[e].resize};if(g[0]){S(0);var A=[],w=[{tooltip:{trigger:"axis",axisPointer:{type:"shadow"}},legend:{data:["直接访问","邮件营销","联盟广告","视频广告","搜索引擎"]},calculable:!0,xAxis:[{type:"value"}],yAxis:[{type:"category",data:["周一","周二","周三","周四","周五","周六","周日"]}],series:[{name:"直接访问",type:"bar",stack:"总量",itemStyle:{normal:{label:{show:!0,position:"insideRight"}}},data:[320,302,301,334,390,330,320]},{name:"邮件营销",type:"bar",stack:"总量",itemStyle:{normal:{label:{show:!0,position:"insideRight"}}},data:[120,132,101,134,90,230,210]},{name:"联盟广告",type:"bar",stack:"总量",itemStyle:{normal:{label:{show:!0,position:"insideRight"}}},data:[220,182,191,234,290,330,310]},{name:"视频广告",type:"bar",stack:"总量",itemStyle:{normal:{label:{show:!0,position:"insideRight"}}},data:[150,212,201,154,190,330,410]},{name:"搜索引擎",type:"bar",stack:"总量",itemStyle:{normal:{label:{show:!0,position:"insideRight"}}},data:[820,832,901,934,1290,1330,1320]}]}],k=e("#LAY-index-heapbar").children("div"),z=function(e){A[e]=a.init(k[e],layui.echartsTheme),A[e].setOption(w[e]),window.onresize=A[e].resize};if(k[0]){z(0);var L=[],C={normal:{label:{position:"right"}}},P=[{title:{text:"交错正负轴标签",subtext:"From ExcelHome",sublink:"http://e.weibo.com/1341556070/AjwF2AgQm"},tooltip:{trigger:"axis",axisPointer:{type:"shadow"}},grid:{y:80,y2:30},xAxis:[{type:"value",position:"top",splitLine:{lineStyle:{type:"dashed"}}}],yAxis:[{type:"category",axisLine:{show:!1},axisLabel:{show:!1},axisTick:{show:!1},splitLine:{show:!1},data:["ten","nine","eight","seven","six","five","four","three","two","one"]
+}],series:[{name:"生活费",type:"bar",stack:"总量",itemStyle:{normal:{color:"orange",borderRadius:5,label:{show:!0,position:"left",formatter:"{b}"}}},data:[{value:-.07,itemStyle:C},{value:-.09,itemStyle:C},.2,.44,{value:-.23,itemStyle:C},.08,{value:-.17,itemStyle:C},.47,{value:-.36,itemStyle:C},.18]}]}],T=e("#LAY-index-windline").children("div"),O=function(e){L[e]=a.init(T[e],layui.echartsTheme),L[e].setOption(P[e]),window.onresize=L[e].resize};T[0]&&O(0)}}}}}}}),layui.use(["carousel","echarts"],function(){var e=layui.$,a=(layui.carousel,layui.echarts),t=[],i=[{title:{text:"2011全国GDP（亿元）",subtext:"数据来自国家统计局"},tooltip:{trigger:"item"},dataRange:{orient:"horizontal",min:0,max:55e3,text:["高","低"],splitNumber:0},series:[{name:"2011全国GDP分布",type:"map",mapType:"china",mapLocation:{x:"center"},selectedMode:"multiple",itemStyle:{normal:{label:{show:!0}},emphasis:{label:{show:!0}}},data:[{name:"西藏",value:605.83},{name:"青海",value:1670.44},{name:"宁夏",value:2102.21},{name:"海南",value:2522.66},{name:"甘肃",value:5020.37},{name:"贵州",value:5701.84},{name:"新疆",value:6610.05},{name:"云南",value:8893.12},{name:"重庆",value:10011.37},{name:"吉林",value:10568.83},{name:"山西",value:11237.55},{name:"天津",value:11307.28},{name:"江西",value:11702.82},{name:"广西",value:11720.87},{name:"陕西",value:12512.3},{name:"黑龙江",value:12582},{name:"内蒙古",value:14359.88},{name:"安徽",value:15300.65},{name:"北京",value:16251.93,selected:!0},{name:"福建",value:17560.18},{name:"上海",value:19195.69,selected:!0},{name:"湖北",value:19632.26},{name:"湖南",value:19669.56},{name:"四川",value:21026.68},{name:"辽宁",value:22226.7},{name:"河北",value:24515.76},{name:"河南",value:26931.03},{name:"浙江",value:32318.85},{name:"山东",value:45361.85},{name:"江苏",value:49110.27},{name:"广东",value:53210.28,selected:!0}]}]}],n=e("#LAY-index-plat").children("div"),l=function(e){t[e]=a.init(n[e],layui.echartsTheme),t[e].setOption(i[e]),window.onresize=t[e].resize};n[0]&&l(0)}),e("senior",{})});
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/modules/set.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/modules/set.js
new file mode 100644
index 0000000..1072439
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/modules/set.js
@@ -0,0 +1,2 @@
+/** layuiAdmin.std-v1.0.0 LPPL License By http://www.layui.com/admin/ */
+ ;layui.define(["form","upload"],function(t){var i=layui.$,e=layui.layer,a=(layui.laytpl,layui.setter,layui.view,layui.admin),n=layui.form,s=layui.upload;i("body");n.verify({nickname:function(t,i){return new RegExp("^[a-zA-Z0-9_一-龥\\s·]+$").test(t)?/(^\_)|(\__)|(\_+$)/.test(t)?"用户名首尾不能出现下划线'_'":/^\d+\d+\d$/.test(t)?"用户名不能全为数字":void 0:"用户名不能有特殊字符"},pass:[/^[\S]{6,12}$/,"密码必须6到12位，且不能出现空格"],repass:function(t){if(t!==i("#LAY_password").val())return"两次密码输入不一致"}}),n.on("submit(set_website)",function(t){return e.msg(JSON.stringify(t.field)),!1}),n.on("submit(set_system_email)",function(t){return e.msg(JSON.stringify(t.field)),!1}),n.on("submit(setmyinfo)",function(t){return e.msg(JSON.stringify(t.field)),!1});var r=i("#LAY_avatarSrc");s.render({url:"/api/upload/",elem:"#LAY_avatarUpload",done:function(t){0==t.status?r.val(t.url):e.msg(t.msg,{icon:5})}}),a.events.avartatPreview=function(t){var i=r.val();e.photos({photos:{title:"查看头像",data:[{src:i}]},shade:.01,closeBtn:1,anim:5})},n.on("submit(setmypass)",function(t){return e.msg(JSON.stringify(t.field)),!1}),t("set",{})});
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/modules/user.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/modules/user.js
new file mode 100644
index 0000000..adfcc2e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/modules/user.js
@@ -0,0 +1,2 @@
+/** layuiAdmin.std-v1.0.0 LPPL License By http://www.layui.com/admin/ */
+ ;layui.define("form",function(e){var s=layui.$,t=(layui.layer,layui.laytpl,layui.setter,layui.view,layui.admin),i=layui.form,a=s("body");i.verify({nickname:function(e,s){return new RegExp("^[a-zA-Z0-9_一-龥\\s·]+$").test(e)?/(^\_)|(\__)|(\_+$)/.test(e)?"用户名首尾不能出现下划线'_'":/^\d+\d+\d$/.test(e)?"用户名不能全为数字":void 0:"用户名不能有特殊字符"},pass:[/^[\S]{6,12}$/,"密码必须6到12位，且不能出现空格"]}),t.sendAuthCode({elem:"#LAY-user-getsmscode",elemPhone:"#LAY-user-login-cellphone",elemVercode:"#LAY-user-login-vercode",ajax:{url:layui.setter.base+"json/user/sms.js"}}),a.on("click","#LAY-user-get-vercode",function(){s(this);this.src="https://www.oschina.net/action/user/captcha?t="+(new Date).getTime()}),e("user",{})});
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/modules/useradmin.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/modules/useradmin.js
new file mode 100644
index 0000000..1de5b91
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/modules/useradmin.js
@@ -0,0 +1,2 @@
+/** layuiAdmin.std-v1.0.0 LPPL License By http://www.layui.com/admin/ */
+ ;layui.define(["table","form"],function(e){var t=layui.$,i=layui.table;layui.form;i.render({elem:"#LAY-user-manage",url:layui.setter.base+"json/useradmin/webuser.js",cols:[[{type:"checkbox",fixed:"left"},{field:"id",width:100,title:"ID",sort:!0},{field:"username",title:"用户名",minWidth:100},{field:"avatar",title:"头像",width:100,templet:"#imgTpl"},{field:"phone",title:"手机"},{field:"email",title:"邮箱"},{field:"sex",width:80,title:"性别"},{field:"ip",title:"IP"},{field:"jointime",title:"加入时间",sort:!0},{title:"操作",width:150,align:"center",fixed:"right",toolbar:"#table-useradmin-webuser"}]],page:!0,limit:30,height:"full-220",text:"对不起，加载出现异常！"}),i.on("tool(LAY-user-manage)",function(e){e.data;if("del"===e.event)layer.prompt({formType:1,title:"敏感操作，请验证口令"},function(t,i){layer.close(i),layer.confirm("真的删除行么",function(t){e.del(),layer.close(t)})});else if("edit"===e.event){t(e.tr);layer.open({type:2,title:"编辑用户",content:"../../../views/user/user/userform.html",maxmin:!0,area:["500px","450px"],btn:["确定","取消"],yes:function(e,t){var l=window["layui-layer-iframe"+e],r="LAY-user-front-submit",n=t.find("iframe").contents().find("#"+r);l.layui.form.on("submit("+r+")",function(t){t.field;i.reload("LAY-user-front-submit"),layer.close(e)}),n.trigger("click")},success:function(e,t){}})}}),i.render({elem:"#LAY-user-back-manage",url:layui.setter.base+"json/useradmin/mangadmin.js",cols:[[{type:"checkbox",fixed:"left"},{field:"id",width:80,title:"ID",sort:!0},{field:"loginname",title:"登录名"},{field:"telphone",title:"手机"},{field:"email",title:"邮箱"},{field:"role",title:"角色"},{field:"jointime",title:"加入时间",sort:!0},{field:"check",title:"审核状态",templet:"#buttonTpl",minWidth:80,align:"center"},{title:"操作",width:150,align:"center",fixed:"right",toolbar:"#table-useradmin-admin"}]],text:"对不起，加载出现异常！"}),i.on("tool(LAY-user-back-manage)",function(e){e.data;if("del"===e.event)layer.prompt({formType:1,title:"敏感操作，请验证口令"},function(t,i){layer.close(i),layer.confirm("确定删除此管理员？",function(t){console.log(e),e.del(),layer.close(t)})});else if("edit"===e.event){t(e.tr);layer.open({type:2,title:"编辑管理员",content:"../../../views/user/administrators/adminform.html",area:["420px","420px"],btn:["确定","取消"],yes:function(e,t){var l=window["layui-layer-iframe"+e],r="LAY-user-back-submit",n=t.find("iframe").contents().find("#"+r);l.layui.form.on("submit("+r+")",function(t){t.field;i.reload("LAY-user-front-submit"),layer.close(e)}),n.trigger("click")},success:function(e,t){}})}}),i.render({elem:"#LAY-user-back-role",url:layui.setter.base+"json/useradmin/role.js",cols:[[{type:"checkbox",fixed:"left"},{field:"id",width:80,title:"ID",sort:!0},{field:"rolename",title:"角色名"},{field:"limits",title:"拥有权限"},{field:"descr",title:"具体描述"},{title:"操作",width:150,align:"center",fixed:"right",toolbar:"#table-useradmin-admin"}]],text:"对不起，加载出现异常！"}),i.on("tool(LAY-user-back-role)",function(e){e.data;if("del"===e.event)layer.confirm("确定删除此角色？",function(t){e.del(),layer.close(t)});else if("edit"===e.event){t(e.tr);layer.open({type:2,title:"编辑角色",content:"../../../views/user/administrators/roleform.html",area:["500px","480px"],btn:["确定","取消"],yes:function(e,t){var l=window["layui-layer-iframe"+e],r=t.find("iframe").contents().find("#LAY-user-role-submit");l.layui.form.on("submit(LAY-user-role-submit)",function(t){t.field;i.reload("LAY-user-back-role"),layer.close(e)}),r.trigger("click")},success:function(e,t){}})}}),e("useradmin",{})});
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/modules/workorder.js b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/modules/workorder.js
new file mode 100644
index 0000000..5463bb2
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/modules/workorder.js
@@ -0,0 +1,2 @@
+/** layuiAdmin.std-v1.0.0 LPPL License By http://www.layui.com/admin/ */
+ ;layui.define(["table","form","element"],function(e){var t=layui.$,i=layui.table,r=(layui.form,layui.element);i.render({elem:"#LAY-app-system-order",url:layui.setter.base+"json/workorder/demo.js",cols:[[{type:"numbers",fixed:"left"},{field:"orderid",width:100,title:"工单号",sort:!0},{field:"attr",width:100,title:"业务性质"},{field:"title",width:100,title:"工单标题",width:300},{field:"progress",title:"进度",width:200,align:"center",templet:"#progressTpl"},{field:"submit",width:100,title:"提交者"},{field:"accept",width:100,title:"受理人员"},{field:"state",title:"工单状态",templet:"#buttonTpl",minWidth:80,align:"center"},{title:"操作",align:"center",fixed:"right",toolbar:"#table-system-order"}]],page:!0,limit:10,limits:[10,15,20,25,30],text:"对不起，加载出现异常！",done:function(){r.render("progress")}}),i.on("tool(LAY-app-system-order)",function(e){e.data;if("edit"===e.event){t(e.tr);layer.open({type:2,title:"编辑工单",content:"../../../views/app/workorder/listform.html",area:["450px","450px"],btn:["确定","取消"],yes:function(e,t){var r=window["layui-layer-iframe"+e],l="LAY-app-workorder-submit",o=t.find("iframe").contents().find("#"+l);r.layui.form.on("submit("+l+")",function(t){t.field;i.reload("LAY-user-front-submit"),layer.close(e)}),o.trigger("click")},success:function(e,t){}})}}),e("workorder",{})});
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/style/admin.css b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/style/admin.css
new file mode 100644
index 0000000..2badf0e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/style/admin.css
@@ -0,0 +1,2 @@
+/** layuiAdmin.std-v1.0.0 LPPL License By http://www.layui.com/admin/ */
+ html #layuicss-layuiAdmin{display:none;position:absolute;width:1989px}::-webkit-input-placeholder{color:#ccc}html{background-color:#f2f2f2;color:#666}.layadmin-tabsbody-item,[template]{display:none}[lay-href],[lay-tips],[layadmin-event]{cursor:pointer}.layui-layout-admin .layui-header{position:fixed;top:0;left:0;width:100%;height:50px}.layui-layout-admin .layui-header .layui-nav .layui-nav-child a{color:#333}.layui-layout-admin .layui-side{width:220px;top:0;z-index:1001}.layui-layout-admin .layui-header .layui-nav .layui-nav-item,.layui-layout-admin .layui-logo{height:50px;line-height:50px}.layui-layout-admin .layui-logo{position:fixed;left:0;top:0;z-index:1002;width:220px;height:49px;padding:0 15px;box-sizing:border-box;overflow:hidden;font-weight:300;background-repeat:no-repeat;background-position:center center}.layadmin-pagetabs,.layui-layout-admin .layui-body,.layui-layout-admin .layui-footer,.layui-layout-admin .layui-layout-left{left:220px}.layadmin-pagetabs{position:fixed;top:50px;right:0;z-index:999}.layadmin-pagetabs .layui-breadcrumb{padding:0 15px}.layui-layout-admin .layui-body{top:90px;bottom:0}.layui-layout-admin .layui-body .layadmin-tabsbody-item{position:absolute;top:0;bottom:0;left:0;right:0;overflow:hidden}.layui-layout-admin .layui-header .layui-nav-img{width:26px;height:26px}.layui-layout-admin .layui-header .layui-nav-child{top:55px}.layui-layout-admin .layui-header .layui-layout-right .layui-nav-child{left:auto;right:0}.layui-layout-admin .layui-header .layui-nav .layui-nav-child dd.layui-this,.layui-layout-admin .layui-header .layui-nav .layui-nav-child dd.layui-this a{background:0 0}.layadmin-pagetabs,.layui-layout-admin .layui-body,.layui-layout-admin .layui-footer,.layui-layout-admin .layui-header .layui-layout-right,.layui-layout-admin .layui-header .layui-nav .layui-nav-item,.layui-layout-admin .layui-layout-left,.layui-layout-admin .layui-logo,.layui-layout-admin .layui-side{transition:all .3s;-webkit-transition:all .3s}.layui-icon-login-qq{color:#3492ED}.layui-icon-login-wechat{color:#4DAF29}.layui-icon-login-weibo{color:#CF1900}.layui-form[wid100] .layui-form-label{width:100px}.layui-form[wid100] .layui-input-block{margin-left:130px}@media screen and (max-width:450px){.layui-form[wid100] .layui-form-item .layui-input-inline{margin-left:132px}.layui-form[wid100] .layui-form-item .layui-input-inline+.layui-form-mid{margin-left:130px}}.layui-form-item .layui-input-company{width:auto;padding-right:10px;line-height:38px}.layui-bg-white{background-color:#fff}.layadmin-loading{position:absolute;left:50%;top:50%;margin:-16px -15px;font-size:30px;color:#c2c2c2}.layadmin-fixed{position:fixed;left:0;top:0;z-index:999}.layadmin-link{color:#029789!important}.layadmin-link:hover{opacity:.8}.layui-layer-admin .layui-layer-title{height:50px;line-height:50px;border:0;background-color:#20222A;color:#fff}.layui-layer-admin i[close]{position:absolute;padding:5px;right:10px;top:12px;color:#fff;cursor:pointer}.layui-layer-admin .layui-layer-content{padding:20px;line-height:22px}.layui-layer-admin .layui-layer-content cite{font-style:normal;color:#FF5722}.layui-layer-adminRight{top:50px!important;bottom:0;box-shadow:1px 1px 10px rgba(0,0,0,.1);border-radius:0;overflow:auto}.layadmin-note .layui-layer-content{padding:0}.layadmin-note textarea{display:block;width:300px;height:132px;min-width:300px;min-height:132px;line-height:20px;padding:10px 20px;border:none;box-sizing:border-box;color:#666;word-wrap:break-word}.layui-layout-admin .layui-layout-left{padding:0 10px}.layui-layout-admin .layui-layout-left .layui-nav-item{margin:0 20px}.layui-layout-admin .layui-input-search{display:inline-block;vertical-align:middle;height:32px;border:none;cursor:text}.layui-layout-admin .layui-layout-left a,.layui-layout-admin .layui-layout-right{padding:0}.layui-header .layui-nav-item .layui-icon{position:relative;top:1px;font-size:16px}.layui-header .layui-layout-right .layui-badge-dot{margin-left:11px}.layui-header .layui-nav .layui-this:after,.layui-layout-admin .layui-header .layui-nav-bar{top:0!important;bottom:auto;height:3px;background-color:#fff;background-color:rgba(255,255,255,.3)}.layadmin-body-shade{position:fixed;display:none;left:0;right:0;top:0;bottom:0;background-color:rgba(0,0,0,.3);z-index:1000}.layui-side-menu .layui-side-scroll{width:240px}.layui-side-menu .layui-nav{width:220px;margin-top:50px;background:0 0}.layui-side-menu .layui-nav .layui-nav-item a{height:40px;line-height:40px;padding-left:45px;padding-right:30px}.layui-side-menu .layui-nav .layui-nav-item>a{padding-top:8px;padding-bottom:8px}.layui-side-menu .layui-nav .layui-nav-item a:hover{background:0 0}.layui-side-menu .layui-nav .layui-nav-itemed>.layui-nav-child{padding:5px 0}.layui-side-menu .layui-nav .layui-nav-item .layui-icon{position:absolute;top:50%;left:20px;margin-top:-26px}.layui-side-menu .layui-nav .layui-nav-child .layui-nav-child{background:0 0!important}.layui-side-menu .layui-nav .layui-nav-child .layui-nav-child a{padding-left:60px}.layui-side-menu .layui-nav .layui-nav-more{right:15px}@media screen and (max-width:992px){.layui-layout-admin .layui-side{transform:translate3d(-220px,0,0);-webkit-transform:translate3d(-220px,0,0);width:220px}.layadmin-pagetabs,.layui-layout-admin .layui-body,.layui-layout-admin .layui-footer,.layui-layout-admin .layui-layout-left{left:0}}.layadmin-side-shrink .layui-layout-admin .layui-logo{width:60px;background:url(../../images/logo.png) no-repeat center / 30px 30px;}.layadmin-side-shrink .layui-layout-admin .layui-logo span{display:none}.layadmin-side-shrink .layui-side{left:0;width:60px}.layadmin-side-shrink .layadmin-pagetabs,.layadmin-side-shrink .layui-layout-admin .layui-body,.layadmin-side-shrink .layui-layout-admin .layui-footer,.layadmin-side-shrink .layui-layout-admin .layui-layout-left{left:60px}.layadmin-side-shrink .layui-side-menu .layui-nav{position:static;width:60px}.layadmin-side-shrink .layui-side-menu .layui-nav-item{position:static}.layadmin-side-shrink .layui-side-menu .layui-nav-item>a{padding-right:0}.layadmin-side-shrink .layui-side-menu .layui-nav-item cite,.layadmin-side-shrink .layui-side-menu .layui-nav>.layui-nav-item>.layui-nav-child,.layadmin-side-shrink .layui-side-menu .layui-nav>.layui-nav-item>a .layui-nav-more{display:none;padding:8px 0;width:200px}.layadmin-side-shrink .layui-side-menu .layui-nav>.layui-nav-itemed>a{background:rgba(0,0,0,.3)}.layadmin-side-spread-sm .layadmin-pagetabs,.layadmin-side-spread-sm .layui-layout-admin .layui-body,.layadmin-side-spread-sm .layui-layout-admin .layui-footer,.layadmin-side-spread-sm .layui-layout-admin .layui-layout-left{left:0;transform:translate3d(220px,0,0);-webkit-transform:translate3d(220px,0,0)}.layadmin-side-spread-sm .layui-layout-admin .layui-layout-right{transform:translate3d(220px,0,0);-webkit-transform:translate3d(220px,0,0)}.layadmin-side-spread-sm .layui-side{transform:translate3d(0,0,0);-webkit-transform:translate3d(0,0,0)}.layadmin-side-spread-sm .layadmin-body-shade{display:block}.layadmin-pagetabs .layui-tab-title li:first-child .layui-tab-close,.layadmin-tabs-select.layui-nav .layui-nav-bar,.layadmin-tabs-select.layui-nav .layui-nav-more{display:none}.layadmin-pagetabs{height:40px;line-height:40px;padding:0 80px 0 40px;background-color:#fff;box-sizing:border-box;box-shadow:0 1px 2px 0 rgba(0,0,0,.1)}.layadmin-pagetabs .layadmin-tabs-control{position:absolute;top:0;width:40px;height:100%;text-align:center;cursor:pointer;transition:all .3s;-webkit-transition:all .3s;box-sizing:border-box;border-left:1px solid #f6f6f6}.layadmin-pagetabs .layadmin-tabs-control:hover{background-color:#f6f6f6}.layadmin-pagetabs .layui-icon-prev{left:0;border-left:none;border-right:1px solid #f6f6f6}.layadmin-pagetabs .layui-icon-next{right:40px}.layadmin-pagetabs .layui-icon-down{right:0}.layadmin-tabs-select.layui-nav{position:absolute;left:0;top:0;width:100%;height:100%;padding:0;background:0 0}.layadmin-tabs-select.layui-nav .layui-nav-item{line-height:40px}.layadmin-tabs-select.layui-nav .layui-nav-item>a{height:40px}.layadmin-tabs-select.layui-nav .layui-nav-item a{color:#666}.layadmin-tabs-select.layui-nav .layui-nav-child{top:40px;left:auto;right:0}.layadmin-tabs-select.layui-nav .layui-nav-child dd.layui-this,.layadmin-tabs-select.layui-nav .layui-nav-child dd.layui-this a{background-color:#f2f2f2!important;color:#333}.layadmin-pagetabs .layui-tab{margin:0;overflow:hidden}.layadmin-pagetabs .layui-tab-title{height:40px;border:none}.layadmin-pagetabs .layui-tab-title li{min-width:0;line-height:40px;max-width:160px;text-overflow:ellipsis;padding-right:40px;overflow:hidden;border-right:1px solid #f6f6f6;vertical-align:top}.layadmin-pagetabs .layui-tab-title li:first-child{padding-right:15px}.layadmin-pagetabs .layui-tab-title li .layui-tab-close{position:absolute;right:8px;top:50%;margin:-7px 0 0;width:16px;height:16px;line-height:16px;border-radius:50%;font-size:12px}.layadmin-pagetabs .layui-tab-title li:after{content:'';position:absolute;top:0;left:0;width:0;height:2px;border-radius:0;background-color:#292B34;transition:all .3s;-webkit-transition:all .3s}.layadmin-pagetabs .layui-tab-title li:hover:after{width:100%}.layadmin-pagetabs .layui-tab-title li.layui-this,.layadmin-pagetabs .layui-tab-title li:hover{background-color:#f6f6f6}.layadmin-pagetabs .layui-tab-title li.layui-this:after{width:100%;border:none;height:2px;background-color:#292B34}.layadmin-tabspage-none .layui-layout-admin .layui-header{border-bottom:none;box-shadow:0 1px 2px 0 rgba(0,0,0,.05)}.layadmin-tabspage-none .layui-layout-admin .layui-body{top:50px}.layadmin-tabspage-none .layadmin-header{display:block}.layadmin-tabspage-none .layadmin-header .layui-breadcrumb{border-top:1px solid #f6f6f6}.layui-layout-admin .layui-header{border-bottom:1px solid #f6f6f6;box-sizing:border-box;background-color:#fff}.layui-layout-admin .layui-header a,.layui-layout-admin .layui-header a cite{color:#333}.layui-layout-admin .layui-header a:hover{color:#000}.layui-layout-admin .layui-header .layui-nav .layui-nav-more{border-top-color:#666}.layui-layout-admin .layui-header .layui-nav .layui-nav-mored{border-color:transparent transparent #666}.layui-layout-admin .layui-header .layui-nav .layui-this:after,.layui-layout-admin .layui-header .layui-nav-bar{height:2px;background-color:#20222A}.layui-layout-admin .layui-logo{background-color:#20222A;box-shadow:0 1px 2px 0 rgba(0,0,0,.15)}.layui-layout-admin .layui-logo,.layui-layout-admin .layui-logo a{color:#fff;color:rgba(255,255,255,.8)}.layui-side-menu{box-shadow:1px 0 2px 0 rgba(0,0,0,.05)}.layui-layout-admin .layui-footer{padding:10px 0;text-align:center;box-shadow:0 -1px 2px 0 rgba(0,0,0,.05)}.layadmin-setTheme-side,.layui-side-menu{background-color:#20222A;color:#fff}.layadmin-setTheme-header,.layui-layout-admin .layui-footer{background-color:#fff}.layui-tab-admin .layui-tab-title{background-color:#393D49;color:#fff}.layui-fluid{padding:15px}.layadmin-header{display:none;height:50px;line-height:50px;margin-bottom:0;border-radius:0}.layadmin-header .layui-breadcrumb{padding:0 15px}.layui-card-header{position:relative}.layui-card-header .layui-icon{line-height:initial;position:absolute;right:15px;top:50%;margin-top:-7px}.layadmin-iframe{position:absolute;width:100%;height:100%;left:0;top:0;right:0;bottom:0}.layadmin-carousel{height:185px!important;background-color:#fff}.layadmin-carousel .layui-carousel-ind li{background-color:#e2e2e2}.layadmin-carousel .layui-carousel-ind li:hover{background-color:#c2c2c2}.layadmin-carousel .layui-carousel-ind li.layui-this{background-color:#999}.layadmin-carousel .layui-carousel,.layadmin-carousel>[carousel-item]>*{background-color:#fff}.layadmin-carousel .layui-col-space10{margin:0}.layadmin-carousel .layui-carousel-ind{position:absolute;top:-41px;text-align:right}.layadmin-carousel .layui-carousel-ind ul{background:0 0}.layui-card .layui-tab-brief .layui-tab-title{height:42px;border-bottom-color:#f6f6f6}.layui-card .layui-tab-brief .layui-tab-title li{margin:0 15px;padding:0;line-height:42px}.layui-card .layui-tab-brief .layui-tab-title li.layui-this{color:#333}.layui-card .layui-tab-brief .layui-tab-title .layui-this:after{height:43px}.layui-card .layui-tab-brief .layui-tab-content{padding:15px}.layui-card .layui-table-view{margin:0}.layadmin-shortcut li{text-align:center}.layadmin-shortcut li .layui-icon{display:inline-block;width:100%;height:60px;line-height:60px;text-align:center;border-radius:2px;font-size:30px;background-color:#F8F8F8;color:#333;transition:all .3s;-webkit-transition:all .3s}.layadmin-shortcut li cite{position:relative;top:2px;display:block;color:#666;text-overflow:ellipsis;overflow:hidden;white-space:nowrap;font-size:14px}.layadmin-shortcut li:hover .layui-icon{background-color:#f2f2f2}.layadmin-backlog .layadmin-backlog-body{display:block;padding:10px 15px;background-color:#f8f8f8;color:#999;border-radius:2px;transition:all .3s;-webkit-transition:all .3s}.layadmin-backlog-body h3{padding-bottom:10px;font-size:12px}.layadmin-backlog-body p cite{font-style:normal;font-size:30px;font-weight:300;color:#009688}.layadmin-backlog-body:hover{background-color:#f2f2f2;color:#888}.layadmin-dataview{height:332px!important}.layadmin-dataview>[carousel-item]:before{display:none}.layadmin-dataview>[carousel-item]>div{height:332px}.layadmin-takerates{padding-top:5px}.layadmin-takerates .layui-progress{margin:50px 0 60px}.layadmin-takerates .layui-progress:last-child{margin-bottom:10px}.layadmin-takerates .layui-progress h3{position:absolute;right:0;top:-35px;color:#999;font-size:14px}.layadmin-takerates .layui-progress-bar{text-align:left}.layadmin-takerates .layui-progress-text{top:-35px;line-height:26px;font-size:26px}.layadmin-news{height:60px!important;padding:5px 0}.layadmin-news a{display:block;line-height:60px;text-align:center}.layadmin-news .layui-carousel-ind{height:45px}.layadmin-list li{margin-bottom:6px;padding-bottom:6px;border-bottom-color:#f6f6f6;list-style-position:inside;list-style-type:disc;text-overflow:ellipsis;overflow:hidden;white-space:nowrap}.layadmin-list li a{color:#666}.layadmin-list li a:hover{color:#009688}.layadmin-list li:last-child{border:none;padding:0;margin:0}.layadmin-text p{margin-bottom:10px;text-indent:2em}.layadmin-text p:last-child{margin:0}.layadmin-font-em{font-size:13px;color:#758697}.layui-card-header .layui-a-tips{position:absolute;right:15px;color:#01AAED}.layuiadmin-card-text{background-color:#f8f8f8;color:#777;padding:24px}.layuiadmin-card-text .layui-text-top{padding-bottom:10px}.layuiadmin-card-text .layui-text-top i{margin-right:10px;font-size:24px;color:#009688}.layuiadmin-card-text .layui-text-top a{line-height:24px;font-size:16px;vertical-align:top}.layuiadmin-card-text .layui-text-center{height:44px;line-height:22px;margin-bottom:10px;overflow:hidden}.layuiadmin-card-text .layui-text-bottom{position:relative}.layuiadmin-card-text .layui-text-bottom a{color:#777;font-size:12px;text-overflow:ellipsis;word-break:break-all}.layuiadmin-card-text .layui-text-bottom span{color:#CCC;font-size:12px;position:absolute;right:0}.layuiadmin-badge,.layuiadmin-btn-group,.layuiadmin-span-color{position:absolute;right:15px}.layuiadmin-card-link a:hover,.layuiadmin-card-team li a:hover,.layuiadmin-card-text a:hover{color:#01AAED;transition:all .3s}.layuiadmin-card-status{padding:0 10px 10px}.layuiadmin-card-status dd{padding:15px 0;border-bottom:1px solid #EEE;display:-webkit-flex;display:flex}.layuiadmin-card-status dd:last-child{border:none}.layuiadmin-card-status dd div.layui-status-img,.layuiadmin-card-team .layui-team-img{width:32px;height:32px;border-radius:50%;background-color:#009688;margin-right:15px}.layuiadmin-card-status dd div.layui-status-img a{width:100%;height:100%;display:inline-block;text-align:center;line-height:32px}.layuiadmin-card-status dd div.layui-status-img img,.layuiadmin-card-team .layui-team-img img{width:50%;height:50%}.layuiadmin-card-status dd div a{color:#01AAED}.layuiadmin-card-status dd div span{color:#BBB}.layuiadmin-card-link{padding-left:10px;font-size:0}.layuiadmin-card-link a{display:inline-block;width:25%;color:#666;font-size:14px;margin-bottom:12px}.layuiadmin-card-link button{vertical-align:top}.layuiadmin-card-link button:hover{color:#009688}.layuiadmin-card-team li{padding:10px 0 10px 10px}.layuiadmin-card-team .layui-team-img{display:inline-block;margin-right:8px;width:24px;height:24px;text-align:center;line-height:24px}.layuiadmin-card-team span{color:#777}.layuiadmin-badge{top:50%;margin-top:-9px;color:#01AAED}.layuiadmin-card-list{padding:15px}.layuiadmin-card-list p.layuiadmin-big-font{font-size:36px;color:#666;line-height:36px;padding:5px 0 10px;overflow:hidden;text-overflow:ellipsis;word-break:break-all;white-space:nowrap}.layuiadmin-card-list p.layuiadmin-normal-font{padding-bottom:10px;font-size:20px;color:#666;line-height:24px}.layuiadmin-span-color{font-size:14px}.layuiadmin-span-color i{padding-left:5px}.layuiadmin-card-status li{position:relative;padding:10px 0;border-bottom:1px solid #EEE}.layuiadmin-card-status li h3{padding-bottom:5px;font-weight:700}.layuiadmin-card-status li p{padding-bottom:10px}.layuiadmin-card-status li>span{color:#999}.layuiadmin-home2-usernote .layuiadmin-reply{display:none;position:absolute;right:0;bottom:12px}.layuiadmin-home2-usernote li:hover .layuiadmin-reply{display:block}.layuiadmin-page-table td span{color:#2F4056}.layuiadmin-page-table td span.first{color:#FF5722}.layuiadmin-page-table td span.second{color:#FFB800}.layuiadmin-page-table td span.third{color:#5FB878}.layuiAdmin-msg-detail h1{font-size:16px}.layuiAdmin-msg-detail .layui-card-header{height:auto;line-height:30px;padding:15px}.layuiAdmin-msg-detail .layui-card-header span{padding:0 5px;color:#999}.layuiAdmin-msg-detail .layui-card-header span:first-child{padding-left:0}.layuiAdmin-msg-detail .layui-card-body{padding:15px}.layuiadmin-content-bread{padding-bottom:20px}.layuiadmin-order-progress{position:relative;top:12px}.layui-card-header.layuiadmin-card-header-auto{padding-top:15px;padding-bottom:15px;height:auto}.layuiadmin-card-header-auto i.layuiadmin-button-btn{position:relative;right:0;top:0;vertical-align:middle}.layuiadmin-card-header-auto .layui-form-item:last-child{margin-bottom:0}.layadmin-setTheme{padding:15px;overflow-x:hidden}.layadmin-setTheme>h5{padding:20px 0 10px;color:#000}.layadmin-setTheme>h5:first-child{padding-top:0}.layadmin-setTheme-color{width:330px;font-size:0}.layadmin-setTheme-color li{position:relative;display:inline-block;vertical-align:top;width:80px;height:50px;margin:0 15px 15px 0;background-color:#f2f2f2;cursor:pointer;font-size:12px;color:#666}.layadmin-setTheme-color li:after{content:'';position:absolute;z-index:20;top:50%;left:50%;width:1px;height:0;border:1px solid #f2f2f2;transition:all .3s;-webkit-transition:all .3s;opacity:0}.layadmin-setTheme-color li.layui-this:after,.layadmin-setTheme-color li:hover:after{width:100%;height:100%;padding:4px;top:-5px;left:-5px;border-color:#5FB878;opacity:1}.layadmin-setTheme-header{position:relative;z-index:10;height:10px;border-top:1px solid #f2f2f2;border-right:1px solid #f2f2f2}.layadmin-setTheme-side{position:absolute;left:0;top:0;width:20px;height:100%;z-index:11;box-shadow:1px 0 2px 0 rgba(0,0,0,.05)}.layadmin-setTheme-logo{position:absolute;left:0;top:0;width:100%;height:10px;box-shadow:0 1px 2px 0 rgba(0,0,0,.15)}.layadmin-form-right{text-align:right}.layadmin-about p{margin-bottom:10px}.layadmin-menu-list .layui-card-header{height:50px;line-height:50px;font-size:16px}.layadmin-menu-list .layui-card-header:active{background-color:#f2f2f2}.layadmin-menu-list .layui-card-header .layui-icon{position:relative;top:1px;left:0;display:inline-block;margin:0 10px;font-size:18px}@-webkit-keyframes layui-rl{from{-webkit-transform:translate3d(100%,0,0)}to{-webkit-transform:translate3d(0,0,0)}}@keyframes layui-rl{from{transform:translate3d(100%,0,0)}to{transform:translate3d(0,0,0)}}.layui-anim-rl{-webkit-animation-name:layui-rl;animation-name:layui-rl}@-webkit-keyframes layui-lr{from{-webkit-transform:translate3d(0 0,0);opacity:1}to{-webkit-transform:translate3d(100%,0,0);opacity:1}}@keyframes layui-lr{from{transform:translate3d(0,0,0)}to{transform:translate3d(100%,0,0)}}.layui-anim-lr,.layui-anim-rl.layer-anim-close{-webkit-animation-name:layui-lr;animation-name:layui-lr}.layadmin-tips{margin-top:30px;text-align:center}.layadmin-tips .layui-icon[face]{display:inline-block;font-size:300px;color:#393D49}.layadmin-tips .layui-text{width:500px;margin:30px auto;padding-top:20px;border-top:5px solid #009688;font-size:16px}.layadmin-tips h1{font-size:100px;line-height:100px;color:#009688}.layadmin-tips .layui-text .layui-anim{display:inline-block}@media screen and (max-width:768px){.layadmin-panel-selection{margin:0;width:auto}.layui-body .layui-nav .layui-nav-item{display:block}.layui-layout-admin .layui-body .layadmin-tabsbody-item{-webkit-overflow-scrolling:touch;overflow:auto}}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/style/login.css b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/style/login.css
new file mode 100644
index 0000000..c6ce714
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/style/login.css
@@ -0,0 +1,2 @@
+/** layuiAdmin.std-v1.0.0 LPPL License By http://www.layui.com/admin/ */
+ #LAY_app,body,html{height:100%}.layui-layout-body{overflow:auto}#LAY-user-login,.layadmin-user-display-show{display:block!important}.layadmin-user-login{position:relative;left:0;top:0;padding:110px 0;min-height:100%;box-sizing:border-box}.layadmin-user-login-main{width:375px;margin:0 auto;box-sizing:border-box}.layadmin-user-login-box{padding:20px}.layadmin-user-login-header{text-align:center}.layadmin-user-login-header h2{margin-bottom:10px;font-weight:300;font-size:30px;color:#000}.layadmin-user-login-header p{font-weight:300;color:#999}.layadmin-user-login-body .layui-form-item{position:relative}.layadmin-user-login-icon{position:absolute;left:1px;top:1px;width:38px;line-height:36px;text-align:center;color:#d2d2d2}.layadmin-user-login-body .layui-form-item .layui-input{padding-left:38px}.layadmin-user-login-codeimg{max-height:38px;width:100%;cursor:pointer;box-sizing:border-box}.layadmin-user-login-other{position:relative;font-size:0;line-height:38px;padding-top:20px}.layadmin-user-login-other>*{display:inline-block;vertical-align:middle;margin-right:10px;font-size:14px}.layadmin-user-login-other .layui-icon{position:relative;top:2px;font-size:26px}.layadmin-user-login-other a:hover{opacity:.8}.layadmin-user-jump-change{float:right}.layadmin-user-login-footer{position:absolute;left:0;bottom:0;width:100%;line-height:30px;padding:20px;text-align:center;box-sizing:border-box;color:rgba(0,0,0,.5)}.layadmin-user-login-footer span{padding:0 5px}.layadmin-user-login-footer a{padding:0 5px;color:rgba(0,0,0,.5)}.layadmin-user-login-footer a:hover{color:rgba(0,0,0,1)}.layadmin-user-login-main[bgimg]{background-color:#fff;box-shadow:0 0 5px rgba(0,0,0,.05)}.ladmin-user-login-theme{position:fixed;bottom:0;left:0;width:100%;text-align:center}.ladmin-user-login-theme ul{display:inline-block;padding:5px;background-color:#fff}.ladmin-user-login-theme ul li{display:inline-block;vertical-align:top;width:64px;height:43px;cursor:pointer;transition:all .3s;-webkit-transition:all .3s;background-color:#f2f2f2}.ladmin-user-login-theme ul li:hover{opacity:.9}@media screen and (max-width:768px){.layadmin-user-login{padding-top:60px}.layadmin-user-login-main{width:300px}.layadmin-user-login-box{padding:10px}}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/style/res/bg-none.jpg b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/style/res/bg-none.jpg
new file mode 100644
index 0000000..b7c9e7b
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/style/res/bg-none.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/style/res/layui-logo.jpg b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/style/res/layui-logo.jpg
new file mode 100644
index 0000000..da24fdf
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/style/res/layui-logo.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/style/res/logo-black.png b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/style/res/logo-black.png
new file mode 100644
index 0000000..73e5ebc
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/style/res/logo-black.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/style/res/logo.png b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/style/res/logo.png
new file mode 100644
index 0000000..ac1e00b
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/style/res/logo.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/style/res/template/character.jpg b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/style/res/template/character.jpg
new file mode 100644
index 0000000..ba5e4d1
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/style/res/template/character.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/style/res/template/huge.jpg b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/style/res/template/huge.jpg
new file mode 100644
index 0000000..ce8acbd
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/style/res/template/huge.jpg differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/style/res/template/portrait.png b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/style/res/template/portrait.png
new file mode 100644
index 0000000..a6760af
Binary files /dev/null and b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/style/res/template/portrait.png differ
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/style/template.css b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/style/template.css
new file mode 100644
index 0000000..9bcbc5b
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/style/template.css
@@ -0,0 +1,2 @@
+/** layuiAdmin.std-v1.0.0 LPPL License By http://www.layui.com/admin/ */
+ .layadmin-panel-selection{width:768px;margin:30px auto}.layadmin-panel-selection .layui-panel-window{padding:30px 50px;border-top-color:#ddd;text-align:center}.layadmin-panel-selection .layui-panel-window h2{padding-bottom:15px;font-size:18px}.layadmin-panel-selection .layui-panel-window ul{margin-top:15px;text-align:left}.layadmin-homepage-panel .text-center,.layadmin-maillist-fluid .layadmin-text-center{text-align:center}.layadmin-panel-selection .layui-btn-container{margin-top:30px}.layadmin-panel-selection .layui-btn-container .layui-btn{width:100%}.layadmin-maillist-fluid .layadmin-contact-box{padding:20px;background-color:#fff;border:1px solid #e7eaec;overflow:hidden}.layadmin-maillist-fluid .layadmin-text-center img{max-width:80%;border-radius:50%;margin-top:5px}.layadmin-maillist-fluid .layadmin-font-blod{font-weight:600}.layadmin-maillist-fluid .layadmin-maillist-img{margin-top:5px}.layadmin-maillist-fluid .layadmin-title{margin:5px 0 10px}.layadmin-maillist-fluid .layadmin-textimg{line-height:25px;margin-bottom:10px}.layadmin-maillist-fluid .layadmin-address{line-height:1.5;margin-bottom:20px}.layadmin-maillist-fluid .layadmin-padding-left20{padding-left:20px}.layadmin-homepage-shadow{box-shadow:0 1px 1px rgba(0,0,0,.05);background-color:#fff;border-radius:0;border:1px solid #e7ecf3}.layadmin-homepage-panel{margin-bottom:15px}.layadmin-homepage-information{padding:15px;border-bottom:1px solid #e9e9e9}.layadmin-homepage-pad-ver{padding-top:15px;padding-bottom:15px}.layadmin-homepage-pad-img{box-shadow:0 0 0 4px rgba(0,0,0,.1);border-radius:50%}.layadmin-homepage-font{font-weight:600;color:#2b425b;font-size:1.2em}.layadmin-homepage-min-font{margin:5px 0 10px;font-size:.9em;color:#afb9c3}.layadmin-homepage-pad-ver a{line-height:1.1em;font-size:1.3em;vertical-align:middle;cursor:pointer;background-color:transparent;color:inherit;padding:6px 12px}.layadmin-homepage-pad-ver a:hover{background:#5FB878;color:#fff}.layadmin-homepage-about{padding:15px;font-weight:600;color:#2b425b}.layadmin-homepage-list-group{font-size:.9em;line-height:1.25;margin-bottom:5px}.layadmin-homepage-list-group li{padding:5px 15px;border:1px solid transparent;margin-bottom:-1px;border-width:1px 0;border-radius:0;background-color:transparent;color:inherit}.layadmin-homepage-list-group li i{font-size:1.333em;line-height:1.095em;vertical-align:middle;margin-right:4px}.layadmin-homepage-list-group li a.color{color:#337ab7}.layadmin-homepage-pad-hor{padding-left:15px;padding-right:15px;border-bottom:15px;color:#758697;text-indent:20px}.layadmin-homepage-list-inline{margin-left:15px;margin-right:15px;padding-bottom:20px}.layadmin-homepage-list-inline a{display:inline-block}.layadmin-homepage-list-inline .layui-btn{font-size:.9em;line-height:1.42857;vertical-align:middle;height:auto;padding:4px 7px;margin:0 10px 10px 0}.layadmin-homepage-text-center{text-align:center;margin-bottom:15px}.layadmin-homepage-padding15{padding:15px;margin-bottom:15px}.layadmin-homepage-padding8{padding:0 8px}.layadmin-homepage-paddingmb{margin:0 -7.5px}.layadmin-homepage-content{margin-left:15px;padding:0}.layadmin-homepage-content .new-section-xs{margin:12px 0;color:inherit;border:0!important;height:0;box-sizing:content-box}.layadmin-homepage-content .h4{font-size:16px;font-weight:600;color:#2b425b}.layadmin-homepage-content small{color:#afb9c3}.layadmin-homepage-text-center .layui-icon{color:#FFB800;padding-right:5px}.layadmin-homepage-padding15 .layui-col-sm5 a{font-size:11px;height:auto;line-height:1.5;padding:5px 10px;float:right}.layadmin-homepage-padding15 .layui-btn-normal{margin:0 15px}.layadmin-homepage-list-imgtxt .layui-col-sm10,.layadmin-homepage-list-imgtxt .layui-col-sm2{background:0 0}.layadmin-homepage-list-imgtxt .panel-body{padding:15px 20px 25px;overflow:hidden;margin-bottom:15px}.layadmin-homepage-list-imgtxt .panel-body .media-left{display:block;float:left;vertical-align:top;padding-right:10px}.layadmin-homepage-list-imgtxt .panel-body .media-left img{border-radius:50%}.layadmin-homepage-list-imgtxt .media-body{width:auto;display:block;overflow:hidden}.layadmin-homepage-list-imgtxt .media-body .pad-btm{padding-bottom:15px}.layadmin-homepage-list-imgtxt .media-body .pad-btm p:first-child{padding-bottom:5px}.layadmin-homepage-list-imgtxt .media-body .min-font{margin-bottom:10px}.layadmin-homepage-list-imgtxt .media-body .min-font .layui-breadcrumb a{font-size:11px}.layui-breadcrumb span[lay-separator]{margin:0 5px}.layadmin-homepage-list-imgtxt .media-body .pad-btm .fontColor a{font-weight:600;color:#337ab7}.layadmin-homepage-list-imgtxt .media-body .pad-btm .fontColor span{color:#758697;font-weight:600}.layadmin-homepage-list-imgtxt .media-body .h-img{display:block;max-width:100%;height:auto;margin-top:10px}.layadmin-homepage-list-imgtxt .img-xs{width:32px;height:32px;border-radius:50%}.layadmin-homepage-list-imgtxt .media-body .media{margin-top:15px;overflow:hidden}.layadmin-homepage-list-imgtxt .media-body .media .media-right{float:right;padding-top:10px}.layadmin-homepage-list-imgtxt .media-body .media .media-right .list-inline{margin-bottom:10px}.layadmin-homepage-list-imgtxt .media-body .media .list-inline li{padding:0 5px;display:inline-block}.layadmin-homepage-list-imgtxt .media-body .media .media-right .list-inline li span{font-weight:600}.layadmin-homepage-list-imgtxt .media-body .media .media-left{display:block;overflow:hidden;width:auto}.layadmin-homepage-list-imgtxt .media-body .media .media-left .font-blod{font-weight:700;color:#758697}.layadmin-homepage-list-imgtxt .media-body .media-list{padding-top:15px;margin-top:15px;border-top:1px solid #e9e9e9}.layadmin-homepage-list-imgtxt .media-body .media-list .media-item{padding-bottom:15px;margin-top:15px}.layadmin-homepage-list-imgtxt .media-body .media-list .media-item-left{display:inline-block;padding-right:10px;margin-bottom:5px}.layadmin-homepage-list-imgtxt .media-body .media-list .media-item-left img{display:block;float:left}.layadmin-homepage-list-imgtxt .media-body .media-list .media-text{overflow:hidden;width:auto;display:inline-block}.layadmin-homepage-list-imgtxt .media-body .media-list .media-text a{margin-right:10px;font-weight:600;display:inline-block}.layadmin-homepage-list-imgtxt .media-body .media-list .media-text div:nth-child(2){margin-top:5px}.layadmin-homepage-list-imgtxt .media-body .media-list .layui-btn{height:24px;line-height:24px;font-size:12px;padding:0 20px;margin-bottom:10px}.homepage-top .layui-card-body img{width:100%}.homepage-top .layui-card-body .margin-top10{margin-top:10px}.homepage-top .layui-card-body .layui-btn{width:100%;display:block}.homepage-top{padding-bottom:20px}.layadmin-privateletterlist-item{position:relative;display:block;padding:10px 15px}.homepage-bottom .layui-card-body{padding:0}.homepage-bottom .layui-card-body img{width:32px;height:32px;border-radius:50%;margin-top:10px}.homepage-bottom .layui-card-body .meida-left{display:table-cell;padding-right:10px}.homepage-bottom .layui-card-body .meida-right{display:table-cell;vertical-align:top}.homepage-bottom .layui-card-body a:hover{background:#F2F2F2}.homepage-bottom .layui-card-body{background:#fff}.layui-card-header .panel-title .layui-icon{position:relative;left:0;right:0}.layadmin-cmdlist-fluid{padding-bottom:60px}.cmdlist-container{background:#fff;border:1px solid transparent}.cmdlist-container:hover{border:1px solid #e8e8e8}.cmdlist-container img{width:100%}.cmdlist-text{padding:20px}.cmdlist-text .info{height:40px;font-size:14px;line-height:20px;width:100%;overflow:hidden;color:#666;margin-bottom:10px}.cmdlist-text .price{font-size:14px}.cmdlist-text .price b{margin-right:20px}.cmdlist-text .price p{display:inline-block}.cmdlist-text .flow{text-align:right;float:right}#demo0{text-align:center}.layadmin-message-fluid .layui-col-md12{background:#fff;height:auto;padding-bottom:50px}.layadmin-message-fluid .layui-input-block{margin-left:0}.layadmin-message-fluid .layui-form{padding:45px 40px 0}.layadmin-message-fluid .layui-form-label{text-align:left;font-size:18px;padding-left:10px}.layadmin-message-fluid .layui-textarea{min-height:100px;font-size:16px}.layadmin-message-fluid .layui-input-right{float:right}.layadmin-messag-icon{overflow:hidden;float:left;margin-top:4px}.layadmin-messag-icon .layui-icon{font-size:24px;line-height:30px;margin-right:15px;color:#C4CBCF}.message-content{padding:0 40px}.message-content .media-body{margin-bottom:60px}.message-content .media-body .pad-btm{padding-bottom:0}.message-content .media-left{float:left;margin-right:10px}.message-content .media-left img{border-radius:50%}.message-text{padding-top:10px}.message-content-btn{text-align:center}.message-content .layui-btn{height:auto;line-height:26px;padding:5px 30px;font-size:16px}.layadmin-serach-main .layui-card-header{height:auto;line-height:24px;padding:15px}.layadmin-serach-list{margin-bottom:10px;padding:10px 0;border-bottom:1px solid #f6f6f6}.layadmin-serach-list h3{padding:10px 0}.layadmin-serach-list h3 .layui-badge{top:-2px}.layadmin-serach-list p{color:#666}.layadmin-serach-list li{margin-bottom:20px;padding-bottom:20px;clear:both}.layui-serachlist-cover{float:left;margin-right:15px}.layui-serachlist-cover img{width:90px;height:90px}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/tpl/layim/demo.html b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/tpl/layim/demo.html
new file mode 100644
index 0000000..249bc79
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/tpl/layim/demo.html
@@ -0,0 +1,25 @@
+<div class="layui-btn-container LAY-senior-im-chat-demo">
+  <button class="layui-btn" data-type="chat">自定义会话</button>
+  <button class="layui-btn" data-type="message">接受好友的消息</button>
+  <button class="layui-btn" data-type="messageAudio">接受音频消息</button>
+  <button class="layui-btn" data-type="messageVideo">接受视频消息</button>
+  <button class="layui-btn" data-type="messageTemp">接受临时会话消息</button>
+  
+  <br>
+  
+  <button class="layui-btn" data-type="add">申请好友</button>
+  <button class="layui-btn" data-type="addqun">申请加群</button>
+  <button class="layui-btn" data-type="addFriend">同意好友</button>
+  <button class="layui-btn" data-type="addGroup">增加群组到主面板</button>
+  <button class="layui-btn" data-type="removeFriend">删除主面板好友</button>
+  <button class="layui-btn" data-type="removeGroup">删除主面板群组</button>
+  
+  <br>
+  <button class="layui-btn" data-type="setGray">置灰离线好友</button>
+  <button class="layui-btn" data-type="unGray">取消好友置灰</button>
+  
+  <button class="layui-btn" data-type="kefu1">在线客服一</button>
+  <button class="layui-btn" data-type="kefu2">在线客服二</button>
+  
+  <button class="layui-btn" data-type="mobile">移动端版本</button>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/tpl/system/about.html b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/tpl/system/about.html
new file mode 100644
index 0000000..5b71f33
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/tpl/system/about.html
@@ -0,0 +1,21 @@
+
+<div class="layui-card-header">版本信息</div>
+<div class="layui-card-body layui-text layadmin-about">
+  <script type="text/html" template>
+    <p>当前版本：layuiAdmin-v{{ layui.admin.v }}</p>
+    <p>基于框架：layui-v{{ layui.v }}</p>
+  </script>
+  <div class="layui-btn-container">
+    <a href="http://www.layui.com/admin/" target="_blank" class="layui-btn layui-btn-danger">获取授权</a>
+    <a href="http://fly.layui.com/download/layuiAdmin/" target="_blank" class="layui-btn">下载新版</a>
+  </div>
+</div>
+
+<div class="layui-card-header">关于版权</div>
+<div class="layui-card-body layui-text layadmin-about">
+  
+  <blockquote class="layui-elem-quote" style="border: none;">
+    layuiAdmin 受国家计算机软件著作权保护（登记号：2018SR410669），未经官网正规渠道授权擅自公开产品源文件、以及直接对产品二次出售的，我们将保留追究法律责任的权利。
+  </blockquote>
+  <p>© 2018 <a href="http://www.layui.com/">layui.com</a> 版权所有</p>
+</div>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/tpl/system/get.html b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/tpl/system/get.html
new file mode 100644
index 0000000..7585a7e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/tpl/system/get.html
@@ -0,0 +1,61 @@
+
+
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>授权获得 layuiAdmin</title>
+  <meta name="renderer" content="webkit">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+  <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
+  <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
+</head>
+<body>
+
+  <div class="layui-fluid"> 
+    <div class="layui-row layadmin-panel-selection">
+      <div class="layui-col-sm12">
+        <div class="layui-panel-window layui-text">
+          <h2>专业版</h2>
+          <ul>
+            <li>始终基于全新的 layui 版本</li>
+            <li>单页面应用，所有操作无需跳转</li>
+            <li>支持前后端分离开发模式</li>
+            <li>面向全屏幕尺寸的响应式适配能力</li>
+            <li>灵活的主题色配置</li>
+            <li>专属的开发者文档，助你快速掌握</li>
+            <li>版本的持续更新，集大众之所需</li>
+            <li>专属的会员群，与同道中人隔空交流</li>
+            <li>layui 社区 VIP 标识</li>
+            <li>不限制域名、不限制应用的项目数量</li>
+          </ul>
+          <div class="layui-row layui-col-space10 layui-btn-container">
+            <div class="layui-col-sm6">
+              <a href="http://fly.layui.com/order/bill?itemid=3" target="_blank" class="layui-btn">一年授权</a>
+            </div>
+            <div class="layui-col-sm6">
+              <a href="http://fly.layui.com/order/bill?itemid=4" target="_blank" class="layui-btn">
+                永久授权 
+                <span class="layui-badge">hot</span>
+              </a>
+            </div>
+          </div>
+        </div>
+      </div>
+      <blockquote class="layui-col-sm12 layui-elem-quote" style="margin-top: 15px;">
+        你所获得的不仅仅是一款高精品的后台管理模板系统，更是一项关于时间与效率的高收益回报
+      </blockquote>
+    </div>
+  </div>
+  
+  <script src="../../layuiadmin/layui/layui.js"></script>  
+  <script>
+  layui.config({
+    base: '../../layuiadmin/' //静态资源所在路径
+  }).extend({
+    index: 'lib/index' //主入口模块
+  }).use(['index']);
+  </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/tpl/system/more.html b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/tpl/system/more.html
new file mode 100644
index 0000000..cd8c193
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/tpl/system/more.html
@@ -0,0 +1,22 @@
+
+<!-- 更多面板的模板 -->
+<div class="layadmin-menu-list">
+<!--  <div class="layui-card-header" layadmin-event="about">-->
+<!--    <a href="javascript:;">-->
+<!--      <i class="layui-icon layui-icon-about" style="font-size: 20px;"></i>-->
+<!--      获得产品-->
+<!--    </a>-->
+<!--  </div>-->
+  <div class="layui-card-header" layadmin-event="theme">
+    <a href="javascript:;">
+      <i class="layui-icon layui-icon-theme"></i>
+      设置主题
+    </a>
+  </div>
+  <div class="layui-card-header" layadmin-event="note">
+    <a href="javascript:;">
+      <i class="layui-icon layui-icon-note"></i>
+      本地便签
+    </a>
+  </div>
+</div>
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/tpl/system/theme.html b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/tpl/system/theme.html
new file mode 100644
index 0000000..9c497fa
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/tpl/system/theme.html
@@ -0,0 +1,43 @@
+
+<!-- 主题设置模板 -->
+
+<script type="text/html" template lay-done="layui.data.theme();">
+  {{# 
+    var local = layui.data(layui.setter.tableName)
+    ,theme = local.theme || {}
+    ,themeColorIndex =  parseInt((theme && theme.color) ? theme.color.index : 0) || 0;
+  }}
+
+  <div class="layui-card-header">
+    配色方案
+  </div>
+  <div class="layui-card-body layadmin-setTheme">
+    <ul class="layadmin-setTheme-color">
+      {{# layui.each(layui.setter.theme.color, function(index, item){ }}
+        <li layadmin-event="setTheme" data-index="{{ index }}" data-alias="{{ item.alias }}" 
+        {{ index === themeColorIndex ? 'class="layui-this"' : '' }} title="{{ item.alias }}">
+          <div class="layadmin-setTheme-header" style="background-color: {{ item.header }};"></div>
+          <div class="layadmin-setTheme-side" style="background-color: {{ item.main }};">
+            <div class="layadmin-setTheme-logo" style="background-color: {{ item.logo }};"></div>
+          </div>
+        </li>
+      {{# }); }}
+    </ul>
+  </div>
+</script>
+
+<script>
+layui.data.theme = function(){
+  layui.use('form', function(){
+    var form = layui.form
+    ,admin = layui.admin;
+    
+    //监听隐藏开关
+    form.on('switch(system-theme-sideicon)', function(){
+      admin.theme({
+        hideSideIcon: this.checked
+      })
+    });
+  });
+};
+</script>
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/tpl/system/说明.txt b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/tpl/system/说明.txt
new file mode 100644
index 0000000..e9d0a23
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/tpl/system/说明.txt
@@ -0,0 +1,3 @@
+
+注意：
+该目录存放的是 layuiAdmin 的系统模板碎片，很多界面需要依赖到它，切勿随意剔除。
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/layuiadmin/tpl/说明.txt b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/tpl/说明.txt
new file mode 100644
index 0000000..d4d4a31
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/layuiadmin/tpl/说明.txt
@@ -0,0 +1,3 @@
+
+注意：
+该目录存放的是 layuiAdmin 的动态模板碎片
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/level/levelDetails.js b/pluss-manage-page/src/main/resources/static/resources/level/levelDetails.js
new file mode 100644
index 0000000..fa1d581
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/level/levelDetails.js
@@ -0,0 +1,96 @@
+/**
+ * create by robot 
+ * date Thu Sep 12 16:16:36 CST 2019 
+ */ 
+
+$(document).ready(function(){
+	//form表单样式
+	layui.use(['layer', 'form'], function() {
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+	//li 切换事件
+	$(".nav-tabs>li").click(function() {
+		var index = $(".nav-tabs>li").index(this);
+		$(this).addClass("active").siblings("li").removeClass("active");
+		
+	})
+	//弹出一个提示层
+	$('.fa-save').on('click', function() {
+		saveLevel();
+	});
+
+	//绑定标签栏事件
+	$(document).on('click','.nav-tabs li',function(){
+
+		var action =$(this).data('action');
+		 switch (action) {
+			case "base"://基本资料
+				goBase();
+				break;  
+			case "functions"://多功能
+				goFunctions();
+				break;
+			case "extends"://扩展    
+				goExtends();         
+				break;           
+		 }
+	})
+
+	//加载第一个标签
+	$('.nav-tabs li').eq(0).click();
+	
+});
+
+
+//跳转基本信息 
+function goBase(){
+	var url=ctx+'/level/queryLevelBaseInfo?id='+$('#levelId').val();
+	$('.tab-content').load(url);
+	              
+}
+//跳转多功能输入
+function goFunctions(){ 
+	var url=ctx+'/level/queryLevelFunctionsInfo?id='+$('#levelId').val();
+	$('.tab-content').load(url);  
+	
+}
+//跳转到扩展   
+function goExtends(){
+	
+	var url=ctx+'/level/queryLevelExtendsInfo?id='+$('#levelId').val();
+	$('.tab-content').load(url);          
+}  
+  
+
+ 
+//保存
+function saveLevel(){
+	 
+	$(".fa-save").attr("disabled","disabled");
+	$('.fa-save').html('正在保存...')
+	$.ajax({
+		url:ctx+"/level/saveLevel",
+		type:"POST",
+		dataType:'json',
+		data:$("#data_form").serializeArray(),
+		complete:function(){
+			$(".fa-save").removeAttr("disabled");
+			$('.fa-save').html('保存')
+		},        
+		success:function(service){ 
+		
+			layer.confirm('保存成功,是否前往列表？', {
+				  btn: ['确认','取消'] //按钮
+				}, function(){
+					$('#goback span').trigger('click'); 
+				}, function(){         
+					layer.closeAll();
+			});  
+			
+		}
+	});  
+}
+ 
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/level/levelList.js b/pluss-manage-page/src/main/resources/static/resources/level/levelList.js
new file mode 100644
index 0000000..c0d7bb8
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/level/levelList.js
@@ -0,0 +1,268 @@
+/**
+ * create by robot 
+ * date Thu Sep 12 16:16:36 CST 2019 
+ */ 
+
+var pageIndex=1;
+$(document).ready(function(){
+	//调用查询
+	pageIndex=StringUtil.getQueryString('pageIndex');
+	if(pageIndex==undefined||pageIndex==null){
+		pageIndex=1;
+	}
+	queryLevel(pageIndex);
+	//绑定hover操作
+	$(document).on('mouseenter','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").show();
+		var width=15;
+		$(this).children('div').find('li').each(function(){
+			//获取li宽度
+			width+=$(this).width();
+		});
+		$(this).children('div').width(width);
+	})
+	$(document).on('mouseleave','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").hide();
+	});
+
+	//日历控件
+	layui.use(['layer', 'laydate'], function() {
+		var layer = layui.layer;
+		laydate = layui.laydate;
+		laydate.render({
+		elem: '#date1' //指定元素
+		});
+		laydate.render({
+			elem: '#date2' //指定元素
+		});
+	});
+
+	//行选中事件
+	$("#allCheck").find("span").click(function() {
+		$(this).toggleClass('checked');
+		if($(this).hasClass('checked')){
+			//所有列选中
+		  $(".checker").find("span").each(function () {
+		         $(this).addClass("checked");
+		    })
+		}else{
+			//所有列取消选中
+			$(".checker").find("span").each(function () {
+				 $(this).removeClass("checked");
+		    })
+		}
+	});
+
+	//单个选中
+	$(document).on('click','.checkeBox span',function() {
+		$(this).toggleClass('checked');
+		//设置头部事件
+		var length=$('.checkeBox span').length;
+		var count=0;
+		$(".checkeBox").find("span").each(function () {
+	        if($(this).hasClass("checked")){
+	        	count++;
+	        }
+	   })
+		//全选
+	   if(count==length){
+		   $("#allCheck").find("span").addClass('checked');
+	   }else{
+		   $("#allCheck").find("span").removeClass('checked');
+	   }
+	})
+	//左右div高度相等
+	var left_content_height = $(".right-content").height();
+	$(".left-content").height(left_content_height+35);
+	var sub_left_height=$(".res-menu").height(left_content_height-60);
+});
+
+//查询
+function queryLevel(index){
+	if(typeof(index)=='undefined'){
+		index=1;
+	}
+	var url=ctx+'/level/queryLevelByPage';
+	$.ajax({  
+        url:url,  
+        type:"post", 
+        dataType:"json",  
+        data:{  
+        	"currPage":index,
+        	"id":$('#searchId').val()
+        },  
+        success:function(result){  
+        	//渲染数据
+        	$('#data_content').empty();
+        	var header='';
+        	$.each(result.levelList,function(i){
+        		var level=result.levelList[i];
+        		var data='';
+        		data+='<tr class="odd">';
+        		data+='<td class="textc">';
+				data+='		 <div class="checker checkeBox">';        		data+='		 <span class=""  data-id="'+level.id+'"><input type="checkbox"  value=""></span>';
+        		data+='		</div>';
+        		data+='</td>';
+        		data+='<td class="textc">'+level.id+'</td>';
+        		data+='<td class="textc">'+level.level+'</td>';
+        		data+='<td class="textc">'+level.tradeMoney+'</td>';
+        		data+='<td class="textc">'+level.authCount+'</td>';
+        		data+='<td class="textc">'+level.levelName+'</td>';
+        		data+='<td class="textc">'+level.rate+'</td>';
+        		data+='<td class="textc">'+level.createDt+'</td>';
+        		data+='<td class="textc">'+level.logo+'</td>';
+        		data+='<td class="textc">';
+        		data+='<div class="positionr listOperaters">';
+        		data+='		<a href="javascript:void(0);"  class="icon-large dlblock w16 h16"><img src="'+resourcePath+'/images/angle-down.png"/></a>';
+        		data+='		<div class="ops_box ops_itemDiv positiona clearfix whitebg">';
+        		data+='			<ul>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showLevelDetails('+level.id+')" class="btn btn-primary fa fa-edit ops_more f12">编辑</a></li>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="initDeleteLevel('+level.id+')" class="btn btn-primary fa fa-remove ops_more f12">删除</a></li>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showLevelDetails('+level.id+')" class="btn btn-primary fa fa-detail ops_more f12">明细</a></li>';
+        	    data+='			</ul>';
+              data+='		</div>';
+        	    data+='</div>';
+        	    data+='</td>';
+        	    data+='</tr>';
+        	    $('#data_content').append(data);
+        	});
+        	//分页
+        	$('#pageCount').html(result.pageCount);
+      	$('#currPage').html(result.currPage);
+          $('#totalCount').html(result.count);
+           	//设置分页
+           	pageIndex=result.currPage;
+			$('#pagination').pagination({
+				pageCount: result.pageCount,
+				jump: true,
+				coping: true,
+				jump: true,
+				homePage: '首页',
+				endPage: '末页',
+				prevContent: '上页',
+				nextContent: '下页',
+				current:result.currPage,
+				callback:function(api){
+					pageIndex=api.getCurrent();
+					queryLevel(api.getCurrent());
+				}
+			});
+        } 
+    });  
+	//表头列不选中
+	$("#allCheck").find("span").removeClass('checked');
+}
+
+//初始化新增
+function initAddLevel(){
+	window.location=ctx+'/level/queryLevelDetails?pageIndex='+pageIndex;
+}
+
+//初始化修改
+function showLevelDetails(id){
+	window.location=ctx+'/level/queryLevelDetails?id='+id+'&pageIndex='+pageIndex;
+}
+
+//初始化删除
+function initDeleteLevel(id){
+	
+		layer.open({
+		type: 1,
+		closeBtn: 1,		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r'	, //按钮居中
+		shade: 0.3 ,//不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteLevel(id,true);
+		}
+	});
+}
+
+//删除
+function deleteLevel(id,showMsg){
+	$.ajax({
+		url:ctx+'/level/deleteLevel',
+		data:[{
+			name:'id',
+			value:id
+		}],
+		type:'POST',
+		dataType:'json',
+		success:function(){
+			queryLevel(pageIndex);
+			if(showMsg){
+				layer.msg('删除成功!');	
+			}
+		}
+	});
+}
+//头部编辑
+function initEditLevel(){
+	var count=0;
+	var id=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+        	 id=$(this).data('id');
+         }
+    })
+    if(count>1){
+    	layer.msg('只能选中一行记录进行操作!');
+    	return ;
+    }
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	 if(id>0){
+	  showLevelDetails(id);
+	 }
+}
+//头部删除
+function initBatchDeleteLevel(){
+	var count=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+         }
+    })
+	
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	
+
+	layer.open({
+		type: 1,
+		closeBtn: 1,
+		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r', //按钮居中
+		shade: 0.3, //不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteBatchLevel();
+		}
+	});
+	
+}
+//批量删除
+function deleteBatchLevel(){
+	
+	$(".checkeBox").find("span").each(function () {
+        if($(this).hasClass("checked")){
+        	var id=$(this).data('id');
+        	deleteLevel(id,false);
+        	layer.msg('删除成功!');	
+        }
+   })
+}
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/merchantDevice/merchantDeviceDetails.js b/pluss-manage-page/src/main/resources/static/resources/merchantDevice/merchantDeviceDetails.js
new file mode 100644
index 0000000..5c4de78
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/merchantDevice/merchantDeviceDetails.js
@@ -0,0 +1,130 @@
+/**
+ * create by robot 
+ * date Thu Sep 12 16:16:36 CST 2019 
+ */ 
+
+$(document).ready(function(){
+	//form表单样式
+	layui.use(['layer', 'form'], function() {
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+	//li 切换事件
+	$(".nav-tabs>li").click(function() {
+		var index = $(".nav-tabs>li").index(this);
+		$(this).addClass("active").siblings("li").removeClass("active");
+		
+	})
+	//弹出一个提示层
+	$('.fa-save').on('click', function() {
+		saveMerchantDevice();
+	});
+
+	//绑定标签栏事件
+	$(document).on('click','.nav-tabs li',function(){
+
+		var action =$(this).data('action');
+		 switch (action) {
+			case "base"://基本资料
+				goBase();
+				break;  
+			case "functions"://多功能
+				goFunctions();
+				break;
+			case "extends"://扩展    
+				goExtends();         
+				break;           
+		 }
+	})
+
+	//加载第一个标签
+	$('.nav-tabs li').eq(0).click();
+	
+});
+
+
+//跳转基本信息 
+function goBase(){
+	var url=ctx+'/merchantDevice/queryMerchantDeviceBaseInfo?id='+$('#merchantDeviceId').val();
+	$('.tab-content').load(url);
+	              
+}
+//跳转多功能输入
+function goFunctions(){ 
+	var url=ctx+'/merchantDevice/queryMerchantDeviceFunctionsInfo?id='+$('#merchantDeviceId').val();
+	$('.tab-content').load(url);  
+	
+}
+//跳转到扩展   
+function goExtends(){
+	
+	var url=ctx+'/merchantDevice/queryMerchantDeviceExtendsInfo?id='+$('#merchantDeviceId').val();
+	$('.tab-content').load(url);          
+}  
+  
+
+ 
+//保存
+function saveMerchantDevice(){
+	var isAdmin=$("#isAdmin").val();
+	var merchantCode=$("#merchantCode option:selected").val();
+	if(isAdmin=='1'){
+		if(StringUtil.isBlank(merchantCode)){
+			layer.msg('请选择商户');
+			return;
+		}
+	}
+	var name=$("#name").val();
+	if(StringUtil.isBlank(name)){
+		layer.msg('请输入设备名称');
+		return;
+	}
+	var type=$("#type").val();
+	if(StringUtil.isBlank(type)){
+		layer.msg('请输入设备类型');
+		return;
+	}
+	var introDesc=UM.getEditor('introDesc').getContent().trim();
+	if(StringUtil.isBlank(introDesc)){
+		layer.msg('请输入简介');
+		return;
+	}
+	var status=$("#status option:selected").val();
+	if(StringUtil.isBlank(status)){
+		layer.msg('请选择状态');
+		return;
+	}
+	var sn=$("#sn").val();
+	if(StringUtil.isBlank(sn)){
+		layer.msg('请输入设备sn');
+		return;
+	}
+	var form=$("#data_form").serialize();
+	var data_form=form+'&introDesc='+introDesc;
+	$(".fa-save").attr("disabled","disabled");
+	$('.fa-save').html('正在保存...')
+	$.ajax({
+		url:ctx+"/merchantDevice/saveMerchantDevice",
+		type:"POST",
+		dataType:'json',
+		data:data_form,
+		complete:function(){
+			$(".fa-save").removeAttr("disabled");
+			$('.fa-save').html('保存')
+		},        
+		success:function(service){ 
+		
+			layer.confirm('保存成功,是否前往列表？', {
+				  btn: ['确认','取消'] //按钮
+				}, function(){
+					$('#goback span').trigger('click'); 
+				}, function(){         
+					layer.closeAll();
+			});  
+			
+		}
+	});  
+}
+ 
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/merchantDevice/merchantDeviceList.js b/pluss-manage-page/src/main/resources/static/resources/merchantDevice/merchantDeviceList.js
new file mode 100644
index 0000000..8c89839
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/merchantDevice/merchantDeviceList.js
@@ -0,0 +1,282 @@
+/**
+ * create by robot 
+ * date Thu Sep 12 16:16:36 CST 2019 
+ */ 
+
+var pageIndex=1;
+$(document).ready(function(){
+	//调用查询
+	pageIndex=StringUtil.getQueryString('pageIndex');
+	if(pageIndex==undefined||pageIndex==null){
+		pageIndex=1;
+	}
+	queryMerchantDevice(pageIndex);
+	//绑定hover操作
+	$(document).on('mouseenter','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").show();
+		var width=15;
+		$(this).children('div').find('li').each(function(){
+			//获取li宽度
+			width+=$(this).width();
+		});
+		$(this).children('div').width(width);
+	})
+	$(document).on('mouseleave','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").hide();
+	});
+
+	//日历控件
+	layui.use(['layer', 'laydate'], function() {
+		var layer = layui.layer;
+		laydate = layui.laydate;
+		laydate.render({
+		elem: '#date1' //指定元素
+		});
+		laydate.render({
+			elem: '#date2' //指定元素
+		});
+	});
+
+	//行选中事件
+	$("#allCheck").find("span").click(function() {
+		$(this).toggleClass('checked');
+		if($(this).hasClass('checked')){
+			//所有列选中
+		  $(".checker").find("span").each(function () {
+		         $(this).addClass("checked");
+		    })
+		}else{
+			//所有列取消选中
+			$(".checker").find("span").each(function () {
+				 $(this).removeClass("checked");
+		    })
+		}
+	});
+
+	//单个选中
+	$(document).on('click','.checkeBox span',function() {
+		$(this).toggleClass('checked');
+		//设置头部事件
+		var length=$('.checkeBox span').length;
+		var count=0;
+		$(".checkeBox").find("span").each(function () {
+	        if($(this).hasClass("checked")){
+	        	count++;
+	        }
+	   })
+		//全选
+	   if(count==length){
+		   $("#allCheck").find("span").addClass('checked');
+	   }else{
+		   $("#allCheck").find("span").removeClass('checked');
+	   }
+	})
+	//左右div高度相等
+	var left_content_height = $(".right-content").height();
+	$(".left-content").height(left_content_height+35);
+	var sub_left_height=$(".res-menu").height(left_content_height-60);
+});
+
+//查询
+function queryMerchantDevice(index){
+	if(typeof(index)=='undefined'){
+		index=1;
+	}
+	var url=ctx+'/merchantDevice/queryMerchantDeviceByPage';
+	$.ajax({  
+        url:url,  
+        type:"post", 
+        dataType:"json",  
+        data:{  
+        	"currPage":index,
+        	"name":$("#name").val(),
+        	"alias":$("#alias").val(),
+			"userId":$("#userId").val(),
+        },  
+        success:function(result){  
+        	var presentPage = result.currPage;
+        	//渲染数据
+        	$('#data_content').empty();
+        	var header='';
+        	$.each(result.merchantDeviceList,function(i){
+        		var merchantDevice=result.merchantDeviceList[i];
+        		var orderNumber = (presentPage-1)*12+i+1;
+        		var data='';
+        		data+='<tr class="odd">';
+        		data+='<td class="textc">';
+				data+='		 <div class="checker checkeBox">';        		data+='		 <span class=""  data-id="'+merchantDevice.id+'"><input type="checkbox"  value=""></span>';
+        		data+='		</div>';
+        		data+='</td>';
+        		data+='<td class="textc">'+orderNumber+'</td>';
+        		if(StringUtil.isNotBlank($("#admin").val())){
+        			data+='<td class="textc">'+merchantDevice.userId+'</td>';
+        		}
+        		data+='<td class="textc">'+merchantDevice.alias+'</td>';
+        		data+='<td class="textc">'+merchantDevice.name+'</td>';
+        		//data+='<td class="textc">'+merchantDevice.introDesc+'</td>';
+        		data+='<td class="textc"><a href="javascript:void(0);" onclick="enlargePicture(\''+merchantDevice.deviceLogo+'\')"><img src="'+merchantDevice.deviceLogo+'" onerror="javascript:this.src=\'https://www.shouyinbei.net/resources/images/error.jpg\'"   height="30px" width="30px"></img></a></td>';
+        		//data+='<td class="textc">'+merchantDevice.merchantCode+'</td>';
+        		//data+='<td class="textc">'+merchantDevice.userId+'</td>';
+        		data+='<td class="textc">'+merchantDevice.venderModel+'</td>';
+        		var createDt='';
+        		if(StringUtil.isNotBlank(merchantDevice.createDt)){
+        			createDt=new Date(merchantDevice.createDt).toYYYYMMDDHHMMSS();
+        		}
+        		data+='<td class="textc">'+createDt+'</td>';
+        	    data+='</tr>';
+        	    $('#data_content').append(data);
+        	});
+        	//分页
+        	$('#pageCount').html(result.pageCount);
+      	$('#currPage').html(result.currPage);
+          $('#totalCount').html(result.count);
+           	//设置分页
+           	pageIndex=result.currPage;
+			$('#pagination').pagination({
+				pageCount: result.pageCount,
+				jump: true,
+				coping: true,
+				jump: true,
+				homePage: '首页',
+				endPage: '末页',
+				prevContent: '上页',
+				nextContent: '下页',
+				current:result.currPage,
+				callback:function(api){
+					pageIndex=api.getCurrent();
+					queryMerchantDevice(api.getCurrent());
+				}
+			});
+        } 
+    });  
+	//表头列不选中
+	$("#allCheck").find("span").removeClass('checked');
+}
+
+//初始化新增
+function initAddMerchantDevice(){
+	window.location=ctx+'/merchantDevice/queryMerchantDeviceDetails?pageIndex='+pageIndex;
+}
+
+//初始化修改
+function showMerchantDeviceDetails(id){
+	window.location=ctx+'/merchantDevice/queryMerchantDeviceDetails?id='+id+'&pageIndex='+pageIndex;
+}
+
+//初始化删除
+function initDeleteMerchantDevice(id){
+	
+		layer.open({
+		type: 1,
+		closeBtn: 1,		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r'	, //按钮居中
+		shade: 0.3 ,//不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteMerchantDevice(id,true);
+		}
+	});
+}
+
+//删除
+function deleteMerchantDevice(id,showMsg){
+	$.ajax({
+		url:ctx+'/merchantDevice/deleteMerchantDevice',
+		data:[{
+			name:'id',
+			value:id
+		}],
+		type:'POST',
+		dataType:'json',
+		success:function(){
+			queryMerchantDevice(pageIndex);
+			if(showMsg){
+				layer.msg('删除成功!');	
+			}
+		}
+	});
+}
+//头部编辑
+function initEditMerchantDevice(){
+	var count=0;
+	var id=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+        	 id=$(this).data('id');
+         }
+    })
+    if(count>1){
+    	layer.msg('只能选中一行记录进行操作!');
+    	return ;
+    }
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	 if(id>0){
+	  showMerchantDeviceDetails(id);
+	 }
+}
+//头部删除
+function initBatchDeleteMerchantDevice(){
+	var count=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+         }
+    })
+	
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	
+
+	layer.open({
+		type: 1,
+		closeBtn: 1,
+		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r', //按钮居中
+		shade: 0.3, //不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteBatchMerchantDevice();
+		}
+	});
+	
+}
+//批量删除
+function deleteBatchMerchantDevice(){
+	
+	$(".checkeBox").find("span").each(function () {
+        if($(this).hasClass("checked")){
+        	var id=$(this).data('id');
+        	deleteMerchantDevice(id,false);
+        	layer.msg('删除成功!');	
+        }
+   })
+}
+
+//点击放大图片
+function enlargePicture(billPicUrl){
+	//alert("即将弹出图片");
+	var data='';
+	data+='<img src="'+billPicUrl+'"  class="img" onerror="javascript:this.src=\'https://www.shouyinbei.net/resources/images/error.jpg\'" >';
+	$('#picture').append(data);
+	$('#pictureWindow').show();
+}
+
+function hidePictureWindow(){
+	$('#picture').empty();
+	$('#pictureWindow').hide();
+}
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/merchantMenber/merchantMenberDetails.js b/pluss-manage-page/src/main/resources/static/resources/merchantMenber/merchantMenberDetails.js
new file mode 100644
index 0000000..bad1487
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/merchantMenber/merchantMenberDetails.js
@@ -0,0 +1,177 @@
+/**
+ * create by robot 
+ * date Thu Sep 12 16:16:36 CST 2019 
+ */ 
+
+$(document).ready(function(){
+	//form表单样式
+	layui.use(['layer', 'form'], function() {
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+		
+		
+		
+		
+		
+		
+	});
+	//li 切换事件
+	$(".nav-tabs>li").click(function() {
+		var index = $(".nav-tabs>li").index(this);
+		$(this).addClass("active").siblings("li").removeClass("active");
+		
+	})
+	//弹出一个提示层
+	$('.fa-save').on('click', function() {
+		saveMerchantMenber();
+	});
+
+	//绑定标签栏事件
+	$(document).on('click','.nav-tabs li',function(){
+
+		var action =$(this).data('action');
+		 switch (action) {
+			case "base"://基本资料
+				goBase();
+				break;  
+			case "functions"://多功能
+				goFunctions();
+				break;
+			case "extends"://扩展    
+				goExtends();         
+				break;           
+		 }
+	})
+
+	//加载第一个标签
+	$('.nav-tabs li').eq(0).click();
+	
+});
+
+
+//跳转基本信息 
+function goBase(){
+	var url=ctx+'/merchantMenber/queryMerchantMenberBaseInfo?id='+$('#merchantMenberId').val();
+	$('.tab-content').load(url);
+	              
+}
+//跳转多功能输入
+function goFunctions(){ 
+	var url=ctx+'/merchantMenber/queryMerchantMenberFunctionsInfo?id='+$('#merchantMenberId').val();
+	$('.tab-content').load(url);  
+	
+}
+//跳转到扩展   
+function goExtends(){
+	
+	var url=ctx+'/merchantMenber/queryMerchantMenberExtendsInfo?id='+$('#merchantMenberId').val();
+	$('.tab-content').load(url);          
+}  
+  
+
+ 
+//保存
+function saveMerchantMenber(){
+	var isAdmin=$("#isAdmin").val();
+	if(isAdmin=='1'){
+		var merchantCode=$("#merchantCode option:selected").val();
+		if(StringUtil.isBlank(merchantCode)){
+			layer.msg('请选择商户');
+			return;
+		}
+	}
+	var storeId=$("#storeId option:selected").val();
+	if(StringUtil.isBlank(storeId)){
+		layer.msg('请选择门店');
+		return;
+	}
+	
+	var nickName=$("#nickName").val();
+	if(StringUtil.isBlank(nickName)){
+		layer.msg('请输入昵称');
+		return;
+	}
+	var phone=$("#phone").val();
+	if(StringUtil.isNotPhone(phone)){
+		if(StringUtil.isBlank(phone)){
+			layer.msg('请输入手机号');
+			return;
+		}
+		layer.msg('请输入正确的手机号格式');
+		return;
+	}
+	var logo=$("#logo").val();
+	if(StringUtil.isBlank(logo)){
+		layer.msg('请上传过logo图');
+		return;
+	}
+	var status=$("#status option:selected").val();
+	if(StringUtil.isBlank(status)){
+		layer.msg('请选择会员状态');
+		return;
+	}
+	$(".fa-save").attr("disabled","disabled");
+	$('.fa-save').html('正在保存...')
+	$.ajax({
+		url:ctx+"/merchantMenber/saveMerchantMenber",
+		type:"POST",
+		dataType:'json',
+		data:$("#data_form").serializeArray(),
+		complete:function(){
+			$(".fa-save").removeAttr("disabled");
+			$('.fa-save').html('保存')
+		},        
+		success:function(service){ 
+		
+			layer.confirm('保存成功,是否前往列表？', {
+				  btn: ['确认','取消'] //按钮
+				}, function(){
+					$('#goback span').trigger('click'); 
+				}, function(){         
+					layer.closeAll();
+			});  
+			
+		}
+	});  
+}
+//onchange商户
+$(function(){
+	layui.use(['layer', 'form'], function() {
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+		form.on('select(selectMerchantCode)', function(data){
+			var merchantCode=data.value;
+			$.ajax({
+				url:ctx+'/merchantMenber/getStoreByMerchantCode',
+				type:'post',
+				dataType:'json',
+				data:{
+					'merchantCode':merchantCode,
+				},
+				success:function(result){
+					var storeList=result.merchantStoreList;
+					$("#storeId").empty();
+					var data='';
+					data+='<option value="">请选择</option>';
+					for (var i = 0; i < storeList.length; i++) {
+						data+='<option value='+storeList[i].storeId+'>'+storeList[i].storeName+'</option>'
+					}
+					$("#storeId").append(data);
+					form.render("select");
+				}
+			})
+		})
+	})
+});
+
+function uploadImage(){
+	$.seocooUpload(function(data){
+		var url=data.url;
+		$('#demo1').attr("src",url);
+		$('#logo').val(url);
+	})
+}
+ 
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/merchantMenber/merchantMenberList.js b/pluss-manage-page/src/main/resources/static/resources/merchantMenber/merchantMenberList.js
new file mode 100644
index 0000000..ea283f2
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/merchantMenber/merchantMenberList.js
@@ -0,0 +1,384 @@
+/**
+ * create by robot 
+ * date Thu Sep 12 16:16:36 CST 2019 
+ */ 
+
+var pageIndex=1;
+$(document).ready(function(){
+	//调用查询
+	pageIndex=StringUtil.getQueryString('pageIndex');
+	if(pageIndex==undefined||pageIndex==null){
+		pageIndex=1;
+	}
+	queryMerchantMenber(pageIndex);
+	//绑定hover操作
+	$(document).on('mouseenter','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").show();
+		var width=15;
+		$(this).children('div').find('li').each(function(){
+			//获取li宽度
+			width+=$(this).width();
+		});
+		$(this).children('div').width(width);
+	})
+	$(document).on('mouseleave','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").hide();
+	});
+
+	//日历控件
+	layui.use(['layer', 'laydate'], function() {
+		var layer = layui.layer;
+		laydate = layui.laydate;
+		laydate.render({
+		elem: '#date1' //指定元素
+		});
+		laydate.render({
+			elem: '#date2' //指定元素
+		});
+	});
+
+
+	//行选中事件
+	$("#allCheck").find("span").click(function() {
+		$(this).toggleClass('checked');
+		if($(this).hasClass('checked')){
+			//所有列选中
+		  $(".checker").find("span").each(function () {
+		         $(this).addClass("checked");
+		    })
+		}else{
+			//所有列取消选中
+			$(".checker").find("span").each(function () {
+				 $(this).removeClass("checked");
+		    })
+		}
+	});
+
+	//单个选中
+	$(document).on('click','.checkeBox span',function() {
+		$(this).toggleClass('checked');
+		//设置头部事件
+		var length=$('.checkeBox span').length;
+		var count=0;
+		$(".checkeBox").find("span").each(function () {
+	        if($(this).hasClass("checked")){
+	        	count++;
+	        }
+	   })
+		//全选
+	   if(count==length){
+		   $("#allCheck").find("span").addClass('checked');
+	   }else{
+		   $("#allCheck").find("span").removeClass('checked');
+	   }
+	})
+	//左右div高度相等
+	var left_content_height = $(".right-content").height();
+	$(".left-content").height(left_content_height+35);
+	var sub_left_height=$(".res-menu").height(left_content_height-60);
+});
+
+//查询
+function queryMerchantMenber(index){
+	if(typeof(index)=='undefined'){
+		index=1;
+	}
+	var url=ctx+'/merchantMenber/queryMerchantMenberByPage';
+	$.ajax({  
+        url:url,  
+        type:"post", 
+        dataType:"json",  
+        data:{  
+        	"currPage":index,
+        	"memberName":$("#memberName").val(),
+        	"phone":$("#phone").val(),
+        	"userId":$("#userId").val(),
+        	"alias":$("#alias").val(),
+        },  
+        success:function(result){  
+        	var presentPage = result.currPage;
+        	//渲染数据
+        	$('#data_content').empty();
+        	var header='';
+        	$.each(result.merchantMenberList,function(i){
+        		var orderNumber = (presentPage-1)*12+i+1;
+        		var merchantMenber=result.merchantMenberList[i];
+        		var data='';
+        		data+='<tr class="odd">';
+        		data+='<td class="textc">';
+				data+='		 <div class="checker checkeBox">';        		data+='		 <span class=""  data-id="'+merchantMenber.id+'"><input type="checkbox"  value=""></span>';
+        		data+='		</div>';
+        		data+='</td>';
+        		data+='<td class="textc">'+orderNumber+'</td>';
+        		data+='<td class="textc">'+merchantMenber.userId+'</td>';
+//        		var storeId='';
+//        		if(StringUtil.isNotBlank(merchantMenber.storeId)){
+//        			storeId=merchantMenber.storeId;
+//        		}
+//        		data+='<td class="textc">'+storeId+'</td>';
+        		
+        		data+='<td class="textc">'+merchantMenber.alias+'</td>';
+        		var memberName='';
+        		if(StringUtil.isNotBlank(merchantMenber.memberName)){
+        			memberName=merchantMenber.memberName;
+        		}
+        		data+='<td class="textc">'+memberName+'</td>';
+        		data+='<td class="textc"><a href="javascript:void(0);" onclick="enlargePicture(\''+merchantMenber.logo+'\')"><img src="'+merchantMenber.logo+'" onerror="javascript:this.src=\'https://www.shouyinbei.net/resources/images/error.jpg\'"   height="30px" width="30px"></img></a></td>'
+        		var nickName='';
+        		if(StringUtil.isNotBlank(merchantMenber.nickName)){
+        			nickName=merchantMenber.nickName;
+        		}
+        		data+='<td class="textc">'+nickName+'</td>';
+        		data+='<td class="textc">'+merchantMenber.phone+'</td>';
+        		var comsumeMoney='';
+        		if(StringUtil.isNotBlank(merchantMenber.comsumeMoney)){
+        			comsumeMoney=merchantMenber.comsumeMoney;
+        		}
+        		data+='<td class="textc">'+comsumeMoney+'</td>';
+        		
+        		
+        		/*var profitMoney='';
+        		if(StringUtil.isNotBlank(merchantMenber.profitMoney)){
+        			profitMoney=merchantMenber.profitMoney;
+        		}
+        		data+='<td class="textc">'+profitMoney+'</td>';*/
+        		var usableRechargeFee=Number(merchantMenber.usableRechargeFee);
+        		var usableGiveFee=Number(merchantMenber.usableGiveFee);
+        		var money=usableRechargeFee+usableGiveFee;
+        		data+='<td class="textc">'+money+'</td>';
+        		/*var status='';
+        		if(StringUtil.isNotBlank(merchantMenber.status)){
+        			if(merchantMenber.status=='0'){
+        				status='不显示';
+        			}else if(merchantMenber.status=='1'){
+        				status='显示';
+        			}
+        		}
+        		data+='<td class="textc">'+status+'</td>';*/
+        		var createDt='';
+        		if(StringUtil.isNotBlank(merchantMenber.createDt)){
+					createDt= dateFtt("yyyy-MM-dd hh:mm:ss",new Date(merchantMenber.createDt));
+        		}
+        		data+='<td class="textc">'+createDt+'</td>';
+        		/*data+='<td class="textc">'+merchantMenber.orderNumber+'</td>';*/
+        		data+='<td class="textc">';
+        		data+='<div class="positionr listOperaters">';
+        		data+='		<a href="javascript:void(0);"  class="icon-large dlblock w16 h16"><img src="'+resourcePath+'/images/angle-down.png"/></a>';
+        		data+='		<div class="ops_box ops_itemDiv positiona clearfix whitebg">';
+        		data+='			<ul>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showRechargeDetails(this)" data-membercode='+merchantMenber.memberCode + ' class="layui-btn layui-btn-radius layui-btn-sm fa fa-remove ops_more f12">充值记录</a></li>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showConsumptionDetails(this)" data-membercode='+merchantMenber.memberCode + ' class="layui-btn layui-btn-radius layui-btn-sm fa fa-detail ops_more f12">消费记录</a></li>';
+        	    data+='			</ul>';
+                data+='		</div>';
+        	    data+='</div>';
+        	    data+='</td>';
+//        		data+='<td class="textc">';
+//        		//商家跟管理员可以进行操作
+//        		if(result.admin=='admin'||result.userType=='merchant'){
+//        			data+='<div class="positionr listOperaters">';
+//            		data+='		<a href="javascript:void(0);"  class="icon-large dlblock w16 h16"><img src="'+resourcePath+'/images/angle-down.png"/></a>';
+//            		data+='		<div class="ops_box ops_itemDiv positiona clearfix whitebg">';
+//            		data+='			<ul>';
+//            		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showMerchantMenberDetails('+merchantMenber.id+')" class="layui-btn fa fa-edit ops_more f12">编辑</a></li>';
+//            		
+//            	    data+='			</ul>';
+//                    data+='		</div>';
+//            	    data+='</div>';
+//        		}else{
+//        			//其它用户只能查看 不能编辑 
+//        			data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="otherMerchantMenberDetails('+merchantMenber.id+')" class="layui-btn fa fa-detail ops_more f12">详情</a></li>';
+//        		}
+//        	    data+='</td>';
+        	    data+='</tr>';
+        	    $('#data_content').append(data);
+        	});
+        	//分页
+        	$('#pageCount').html(result.pageCount);
+      	$('#currPage').html(result.currPage);
+          $('#totalCount').html(result.count);
+           	//设置分页
+           	pageIndex=result.currPage;
+			$('#pagination').pagination({
+				pageCount: result.pageCount,
+				jump: true,
+				coping: true,
+				jump: true,
+				homePage: '首页',
+				endPage: '末页',
+				prevContent: '上页',
+				nextContent: '下页',
+				current:result.currPage,
+				callback:function(api){
+					pageIndex=api.getCurrent();
+					queryMerchantMenber(api.getCurrent());
+				}
+			});
+        } 
+    });  
+	//表头列不选中
+	$("#allCheck").find("span").removeClass('checked');
+}
+
+//初始化新增
+function initAddMerchantMenber(){
+	window.location=ctx+'/merchantMenber/queryMerchantMenberDetails?pageIndex='+pageIndex;
+}
+
+//初始化修改
+function showMerchantMenberDetails(id){
+	window.location=ctx+'/merchantMenber/queryMerchantMenberDetails?id='+id+'&pageIndex='+pageIndex;
+}
+
+//其它用户查看详情
+function otherMerchantMenberDetails(id){
+	window.location=ctx+'/merchantMenber/otherMerchantMenberDetails?id='+id+'&pageIndex='+pageIndex;
+}
+
+//初始化删除
+function initDeleteMerchantMenber(id){
+	
+		layer.open({
+		type: 1,
+		closeBtn: 1,		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r'	, //按钮居中
+		shade: 0.3 ,//不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteMerchantMenber(id,true);
+		}
+	});
+}
+
+//删除
+function deleteMerchantMenber(id,showMsg){
+	$.ajax({
+		url:ctx+'/merchantMenber/deleteMerchantMenber',
+		data:[{
+			name:'id',
+			value:id
+		}],
+		type:'POST',
+		dataType:'json',
+		success:function(){
+			queryMerchantMenber(pageIndex);
+			if(showMsg){
+				layer.msg('删除成功!');	
+			}
+		}
+	});
+}
+//头部编辑
+function initEditMerchantMenber(){
+	var count=0;
+	var id=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+        	 id=$(this).data('id');
+         }
+    })
+    if(count>1){
+    	layer.msg('只能选中一行记录进行操作!');
+    	return ;
+    }
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	 if(id>0){
+	  showMerchantMenberDetails(id);
+	 }
+}
+//头部删除
+function initBatchDeleteMerchantMenber(){
+	var count=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+         }
+    })
+	
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	
+
+	layer.open({
+		type: 1,
+		closeBtn: 1,
+		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r', //按钮居中
+		shade: 0.3, //不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteBatchMerchantMenber();
+		}
+	});
+	
+}
+//批量删除
+function deleteBatchMerchantMenber(){
+	
+	$(".checkeBox").find("span").each(function () {
+        if($(this).hasClass("checked")){
+        	var id=$(this).data('id');
+        	deleteMerchantMenber(id,false);
+        	layer.msg('删除成功!');	
+        }
+   })
+}
+
+//充值记录
+function showRechargeDetails(obj){
+	var membercode=$(obj).data('membercode');
+	window.location=ctx+'/merchantMenber/showRechargeDetails?memberCode='+membercode;
+}
+
+//消费记录
+function showConsumptionDetails(obj){
+	var membercode=$(obj).data('membercode');
+	window.location=ctx+'/merchantMenber/showConsumptionDetails?memberCode='+membercode;
+}
+
+//点击放大图片
+function enlargePicture(billPicUrl){
+	//alert("即将弹出图片");
+	var data='';
+	data+='<img src="'+billPicUrl+'"  class="img" onerror="javascript:this.src=\'https://www.shouyinbei.net/resources/images/error.jpg\'" >';
+	$('#picture').append(data);
+	$('#pictureWindow').show();
+}
+
+function hidePictureWindow(){
+	$('#picture').empty();
+	$('#pictureWindow').hide();
+}
+
+function dateFtt(fmt,date)
+{ //author: meizz
+	var o = {
+		"M+" : date.getMonth()+1,                 //月份
+		"d+" : date.getDate(),                    //日
+		"h+" : date.getHours(),                   //小时
+		"m+" : date.getMinutes(),                 //分
+		"s+" : date.getSeconds(),                 //秒
+		"q+" : Math.floor((date.getMonth()+3)/3), //季度
+		"S"  : date.getMilliseconds()             //毫秒
+	};
+	if(/(y+)/.test(fmt))
+		fmt=fmt.replace(RegExp.$1, (date.getFullYear()+"").substr(4 - RegExp.$1.length));
+	for(var k in o)
+		if(new RegExp("("+ k +")").test(fmt))
+			fmt = fmt.replace(RegExp.$1, (RegExp.$1.length==1) ? (o[k]) : (("00"+ o[k]).substr((""+ o[k]).length)));
+	return fmt;
+}
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/merchantMenber/showConsumptionDetails.js b/pluss-manage-page/src/main/resources/static/resources/merchantMenber/showConsumptionDetails.js
new file mode 100644
index 0000000..c96f533
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/merchantMenber/showConsumptionDetails.js
@@ -0,0 +1,294 @@
+/**
+ * create by robot 
+ * date Thu Sep 12 16:16:37 CST 2019 
+ */ 
+
+var pageIndex=1;
+$(document).ready(function(){
+	//调用查询
+	pageIndex=StringUtil.getQueryString('pageIndex');
+	if(pageIndex==undefined||pageIndex==null){
+		pageIndex=1;
+	}
+	queryUserApp(pageIndex);
+	//绑定hover操作
+	$(document).on('mouseenter','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").show();
+		var width=15;
+		$(this).children('div').find('li').each(function(){
+			//获取li宽度
+			width+=$(this).width();
+		});
+		$(this).children('div').width(width);
+	})
+	$(document).on('mouseleave','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").hide();
+	});
+
+	//日历控件
+	layui.use(['layer', 'laydate'], function() {
+		var layer = layui.layer;
+		laydate = layui.laydate;
+		laydate.render({
+		elem: '#date1' //指定元素
+		});
+		laydate.render({
+			elem: '#date2' //指定元素
+		});
+	});
+
+
+	//行选中事件
+	$("#allCheck").find("span").click(function() {
+		$(this).toggleClass('checked');
+		if($(this).hasClass('checked')){
+			//所有列选中
+		  $(".checker").find("span").each(function () {
+		         $(this).addClass("checked");
+		    })
+		}else{
+			//所有列取消选中
+			$(".checker").find("span").each(function () {
+				 $(this).removeClass("checked");
+		    })
+		}
+	});
+
+	//单个选中
+	$(document).on('click','.checkeBox span',function() {
+		$(this).toggleClass('checked');
+		//设置头部事件
+		var length=$('.checkeBox span').length;
+		var count=0;
+		$(".checkeBox").find("span").each(function () {
+	        if($(this).hasClass("checked")){
+	        	count++;
+	        }
+	   })
+		//全选
+	   if(count==length){
+		   $("#allCheck").find("span").addClass('checked');
+	   }else{
+		   $("#allCheck").find("span").removeClass('checked');
+	   }
+	})
+	//左右div高度相等
+	var left_content_height = $(".right-content").height();
+	$(".left-content").height(left_content_height+35);
+	var sub_left_height=$(".res-menu").height(left_content_height-60);
+});
+
+//查询
+function queryUserApp(index){
+	if(typeof(index)=='undefined'){
+		index=1;
+	}
+	var url=ctx+'/merchantMenber/consumptionDetails';
+	$.ajax({  
+        url:url,  
+        type:"post", 
+        dataType:"json",  
+        data:{  
+        	"currPage":index,
+        	"memberCode":$("#memberCode").val(),
+        	"nickName":$("#nickName").val(),
+        	"phone":$("#phone").val(),
+        	"orderNumber":$("#orderNumber").val(),
+        	"alias":$("#alias").val(),
+        },  
+        success:function(result){  
+        	var presentPage = result.currPage;
+        	//渲染数据
+        	$('#data_content').empty();
+        	var header='';
+        	$.each(result.merchantMenberComsumeList,function(i){
+        		var orderNumber = (presentPage-1)*12+i+1;
+        		var merchantMenberComsume=result.merchantMenberComsumeList[i];
+        		var data='';
+        		data+='<tr class="odd">';
+        		data+='<td class="textc">';
+				data+='		 <div class="checker checkeBox">';        		data+='		 <span class=""  data-id="'+merchantMenberComsume.id+'"><input type="checkbox"  value=""></span>';
+        		data+='		</div>';
+        		data+='</td>';
+        		data+='<td class="textc">'+orderNumber+'</td>';
+        		data+='<td class="textc">'+merchantMenberComsume.id+'</td>';
+        		/*data+='<td class="textc">'+merchantMenberComsume.merchantCode+'</td>';*/
+        		data+='<td class="textc">'+merchantMenberComsume.alias+'</td>';
+        		/*data+='<td class="textc">'+merchantMenberComsume.storeId+'</td>';*/
+//        		data+='<td class="textc">'+merchantMenberComsume.storeName+'</td>';
+        		
+        		/*data+='<td class="textc">'+merchantMenberComsume.logo+'</td>';
+        		data+='<td class="textc">'+merchantMenberComsume.memberCode+'</td>';*/
+        		data+='<td class="textc">'+merchantMenberComsume.nickName+'</td>';
+        		data+='<td class="textc">'+merchantMenberComsume.phone+'</td>';
+        		data+='<td class="textc">'+merchantMenberComsume.comsumeMoney+'</td>';
+        		data+='<td class="textc">'+merchantMenberComsume.orderNumber+'</td>';
+        		var payType='';
+        		if(StringUtil.isNotBlank(merchantMenberComsume.payType)){
+        			if(merchantMenberComsume.payType=='0'){
+        				payType='支付宝';
+        			}else if(merchantMenberComsume.payType=='1'){
+        				payType='微信';
+        			}else if(merchantMenberComsume.payType=='99'){
+        				payType='其他';
+        			}
+        		}
+        		data+='<td class="textc">'+payType+'</td>';
+        		var createDt='';
+        		if(StringUtil.isNotBlank(merchantMenberComsume.createDt)){
+        			createDt=new Date(merchantMenberComsume.createDt).toYYYYMMDD();
+        		}
+        		data+='<td class="textc">'+createDt+'</td>';
+        		 data+='</tr>';
+        	    $('#data_content').append(data);
+        	});
+        	//分页
+        	$('#pageCount').html(result.pageCount);
+      	$('#currPage').html(result.currPage);
+          $('#totalCount').html(result.count);
+           	//设置分页
+           	pageIndex=result.currPage;
+			$('#pagination').pagination({
+				pageCount: result.pageCount,
+				jump: true,
+				coping: true,
+				jump: true,
+				homePage: '首页',
+				endPage: '末页',
+				prevContent: '上页',
+				nextContent: '下页',
+				current:result.currPage,
+				callback:function(api){
+					pageIndex=api.getCurrent();
+					queryUserApp(api.getCurrent());
+				}
+			});
+        } 
+    });  
+	//表头列不选中
+	$("#allCheck").find("span").removeClass('checked');
+}
+
+//初始化新增
+function initAddUserApp(){
+	window.location=ctx+'/userApp/queryUserAppDetails?pageIndex='+pageIndex;
+}
+
+//初始化修改
+function showUserAppDetails(id){
+	window.location=ctx+'/userApp/queryUserAppDetails?id='+id+'&pageIndex='+pageIndex;
+}
+
+//初始化删除
+function initDeleteUserApp(id){
+	
+		layer.open({
+		type: 1,
+		closeBtn: 1,		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r'	, //按钮居中
+		shade: 0.3 ,//不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteUserApp(id,true);
+		}
+	});
+}
+
+//删除
+function deleteUserApp(id,showMsg){
+	$.ajax({
+		url:ctx+'/userApp/deleteUserApp',
+		data:[{
+			name:'id',
+			value:id
+		}],
+		type:'POST',
+		dataType:'json',
+		success:function(){
+			queryUserApp(pageIndex);
+			if(showMsg){
+				layer.msg('删除成功!');	
+			}
+		}
+	});
+}
+//头部编辑
+function initEditUserApp(){
+	var count=0;
+	var id=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+        	 id=$(this).data('id');
+         }
+    })
+    if(count>1){
+    	layer.msg('只能选中一行记录进行操作!');
+    	return ;
+    }
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	 if(id>0){
+	  showUserAppDetails(id);
+	 }
+}
+//头部删除
+function initBatchDeleteUserApp(){
+	var count=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+         }
+    })
+	
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	
+
+	layer.open({
+		type: 1,
+		closeBtn: 1,
+		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r', //按钮居中
+		shade: 0.3, //不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteBatchUserApp();
+		}
+	});
+	
+}
+//批量删除
+function deleteBatchUserApp(){
+	
+	$(".checkeBox").find("span").each(function () {
+        if($(this).hasClass("checked")){
+        	var id=$(this).data('id');
+        	deleteUserApp(id,false);
+        	layer.msg('删除成功!');	
+        }
+   })
+}
+
+//充值记录
+function showRechargeDetails(userId){
+	window.location=ctx+'/userApp/showRechargeDetails?userId='+userId;
+}
+
+//消费记录
+function showConsumptionDetails(userId){
+	window.location=ctx+'/userApp/showConsumptionDetails?userId='+userId;
+}
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/merchantMenber/showRechargeDetails.js b/pluss-manage-page/src/main/resources/static/resources/merchantMenber/showRechargeDetails.js
new file mode 100644
index 0000000..e1afb8e
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/merchantMenber/showRechargeDetails.js
@@ -0,0 +1,293 @@
+/**
+ * create by robot 
+ * date Thu Sep 12 16:16:37 CST 2019 
+ */ 
+
+var pageIndex=1;
+$(document).ready(function(){
+	//调用查询
+	pageIndex=StringUtil.getQueryString('pageIndex');
+	if(pageIndex==undefined||pageIndex==null){
+		pageIndex=1;
+	}
+	queryUserApp(pageIndex);
+	//绑定hover操作
+	$(document).on('mouseenter','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").show();
+		var width=15;
+		$(this).children('div').find('li').each(function(){
+			//获取li宽度
+			width+=$(this).width();
+		});
+		$(this).children('div').width(width);
+	})
+	$(document).on('mouseleave','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").hide();
+	});
+
+	//日历控件
+	layui.use(['layer', 'laydate'], function() {
+		var layer = layui.layer;
+		laydate = layui.laydate;
+		laydate.render({
+		elem: '#date1' //指定元素
+		});
+		laydate.render({
+			elem: '#date2' //指定元素
+		});
+	});
+
+
+	//行选中事件
+	$("#allCheck").find("span").click(function() {
+		$(this).toggleClass('checked');
+		if($(this).hasClass('checked')){
+			//所有列选中
+		  $(".checker").find("span").each(function () {
+		         $(this).addClass("checked");
+		    })
+		}else{
+			//所有列取消选中
+			$(".checker").find("span").each(function () {
+				 $(this).removeClass("checked");
+		    })
+		}
+	});
+
+	//单个选中
+	$(document).on('click','.checkeBox span',function() {
+		$(this).toggleClass('checked');
+		//设置头部事件
+		var length=$('.checkeBox span').length;
+		var count=0;
+		$(".checkeBox").find("span").each(function () {
+	        if($(this).hasClass("checked")){
+	        	count++;
+	        }
+	   })
+		//全选
+	   if(count==length){
+		   $("#allCheck").find("span").addClass('checked');
+	   }else{
+		   $("#allCheck").find("span").removeClass('checked');
+	   }
+	})
+	//左右div高度相等
+	var left_content_height = $(".right-content").height();
+	$(".left-content").height(left_content_height+35);
+	var sub_left_height=$(".res-menu").height(left_content_height-60);
+});
+
+//查询
+function queryUserApp(index){
+	if(typeof(index)=='undefined'){
+		index=1;
+	}
+	var url=ctx+'/merchantMenber/rechargeDetails';
+	$.ajax({  
+        url:url,  
+        type:"post", 
+        dataType:"json",  
+        data:{  
+        	"currPage":index,
+        	"memberCode":$("#memberCode").val(),
+        	"nickName":$("#nickName").val(),
+        	"phone":$("#phone").val(),
+        	"id":$("#id").val(),
+        	"alias":$("#alias").val(),
+        	"orderNumber":$("#orderNumber").val(),
+        },  
+        success:function(result){  
+        	var presentPage = result.currPage;
+        	//渲染数据
+        	$('#data_content').empty();
+        	var header='';
+        	$.each(result.merchantMenberRechargeList,function(i){
+        		var orderNumber = (presentPage-1)*12+i+1;
+        		var merchantMenberRecharge=result.merchantMenberRechargeList[i];
+        		var data='';
+        		data+='<tr class="odd">';
+        		data+='<td class="textc">';
+				data+='		 <div class="checker checkeBox">';        		data+='		 <span class=""  data-id="'+merchantMenberRecharge.id+'"><input type="checkbox"  value=""></span>';
+        		data+='		</div>';
+        		data+='</td>';
+				data+='<td class="textc">'+orderNumber+'</td>';
+				data+='<td class="textc">'+merchantMenberRecharge.id+'</td>';
+        		/*data+='<td class="textc">'+merchantMenberRecharge.merchantCode+'</td>';*/
+        		data+='<td class="textc">'+merchantMenberRecharge.alias+'</td>';
+        		/*data+='<td class="textc">'+merchantMenberRecharge.storeId+'</td>';*/
+//        		data+='<td class="textc">'+merchantMenberRecharge.storeName+'</td>';
+        		/*data+='<td class="textc">'+merchantMenberRecharge.logo+'</td>';
+        		data+='<td class="textc">'+merchantMenberRecharge.memberCode+'</td>';*/
+        		data+='<td class="textc">'+merchantMenberRecharge.nickName+'</td>';
+        		data+='<td class="textc">'+merchantMenberRecharge.phone+'</td>';
+        		data+='<td class="textc">'+merchantMenberRecharge.rechargeMoney+'</td>';
+        		data+='<td class="textc">'+merchantMenberRecharge.giveMoney+'</td>';
+        		data+='<td class="textc">'+merchantMenberRecharge.orderNumber+'</td>';//订单号
+        		var payType='';
+        		if(StringUtil.isNotBlank(merchantMenberRecharge.payType)){
+        			if(merchantMenberRecharge.payType=='0'||merchantMenberRecharge.payType=='1'||merchantMenberRecharge.payType=='2'){
+        				payType='扫码充值';
+        			}else if(merchantMenberRecharge.payType=='3'){
+        				payType='现金充值';
+        			}else if(merchantMenberRecharge.payType=='99'){
+        				payType='线上充值';
+        			}
+        		}
+        		data+='<td class="textc">'+payType+'</td>';
+        		var createDt='';
+        		if(StringUtil.isNotBlank(merchantMenberRecharge.createDt)){
+        			createDt=new Date(merchantMenberRecharge.createDt).toYYYYMMDD();
+        		}
+        		data+='<td class="textc">'+createDt+'</td>';
+        	    data+='</tr>';
+        	    $('#data_content').append(data);
+        	});
+        	//分页
+        	$('#pageCount').html(result.pageCount);
+      	$('#currPage').html(result.currPage);
+          $('#totalCount').html(result.count);
+           	//设置分页
+           	pageIndex=result.currPage;
+			$('#pagination').pagination({
+				pageCount: result.pageCount,
+				jump: true,
+				coping: true,
+				jump: true,
+				homePage: '首页',
+				endPage: '末页',
+				prevContent: '上页',
+				nextContent: '下页',
+				current:result.currPage,
+				callback:function(api){
+					pageIndex=api.getCurrent();
+					queryUserApp(api.getCurrent());
+				}
+			});
+        } 
+    });  
+	//表头列不选中
+	$("#allCheck").find("span").removeClass('checked');
+}
+
+//初始化新增
+function initAddUserApp(){
+	window.location=ctx+'/userApp/queryUserAppDetails?pageIndex='+pageIndex;
+}
+
+//初始化修改
+function showUserAppDetails(id){
+	window.location=ctx+'/userApp/queryUserAppDetails?id='+id+'&pageIndex='+pageIndex;
+}
+
+//初始化删除
+function initDeleteUserApp(id){
+		layer.open({
+		type: 1,
+		closeBtn: 1,		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r'	, //按钮居中
+		shade: 0.3 ,//不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteUserApp(id,true);
+		}
+	});
+}
+
+//删除
+function deleteUserApp(id,showMsg){
+	$.ajax({
+		url:ctx+'/userApp/deleteUserApp',
+		data:[{
+			name:'id',
+			value:id
+		}],
+		type:'POST',
+		dataType:'json',
+		success:function(){
+			queryUserApp(pageIndex);
+			if(showMsg){
+				layer.msg('删除成功!');	
+			}
+		}
+	});
+}
+//头部编辑
+function initEditUserApp(){
+	var count=0;
+	var id=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+        	 id=$(this).data('id');
+         }
+    })
+    if(count>1){
+    	layer.msg('只能选中一行记录进行操作!');
+    	return ;
+    }
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	 if(id>0){
+	  showUserAppDetails(id);
+	 }
+}
+//头部删除
+function initBatchDeleteUserApp(){
+	var count=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+         }
+    })
+	
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+
+	layer.open({
+		type: 1,
+		closeBtn: 1,
+		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r', //按钮居中
+		shade: 0.3, //不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteBatchUserApp();
+		}
+	});
+	
+}
+//批量删除
+function deleteBatchUserApp(){
+	
+	$(".checkeBox").find("span").each(function () {
+        if($(this).hasClass("checked")){
+        	var id=$(this).data('id');
+        	deleteUserApp(id,false);
+        	layer.msg('删除成功!');	
+        }
+   })
+}
+
+//充值记录
+function showRechargeDetails(userId){
+	window.location=ctx+'/userApp/showRechargeDetails?userId='+userId;
+}
+
+//消费记录
+function showConsumptionDetails(userId){
+	window.location=ctx+'/userApp/showConsumptionDetails?userId='+userId;
+}
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/merchantMenberComsume/merchantMenberComsumeDetails.js b/pluss-manage-page/src/main/resources/static/resources/merchantMenberComsume/merchantMenberComsumeDetails.js
new file mode 100644
index 0000000..f74dbb3
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/merchantMenberComsume/merchantMenberComsumeDetails.js
@@ -0,0 +1,96 @@
+/**
+ * create by robot 
+ * date Thu Sep 12 16:16:36 CST 2019 
+ */ 
+
+$(document).ready(function(){
+	//form表单样式
+	layui.use(['layer', 'form'], function() {
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+	//li 切换事件
+	$(".nav-tabs>li").click(function() {
+		var index = $(".nav-tabs>li").index(this);
+		$(this).addClass("active").siblings("li").removeClass("active");
+		
+	})
+	//弹出一个提示层
+	$('.fa-save').on('click', function() {
+		saveMerchantMenberComsume();
+	});
+
+	//绑定标签栏事件
+	$(document).on('click','.nav-tabs li',function(){
+
+		var action =$(this).data('action');
+		 switch (action) {
+			case "base"://基本资料
+				goBase();
+				break;  
+			case "functions"://多功能
+				goFunctions();
+				break;
+			case "extends"://扩展    
+				goExtends();         
+				break;           
+		 }
+	})
+
+	//加载第一个标签
+	$('.nav-tabs li').eq(0).click();
+	
+});
+
+
+//跳转基本信息 
+function goBase(){
+	var url=ctx+'/merchantMenberComsume/queryMerchantMenberComsumeBaseInfo?id='+$('#merchantMenberComsumeId').val();
+	$('.tab-content').load(url);
+	              
+}
+//跳转多功能输入
+function goFunctions(){ 
+	var url=ctx+'/merchantMenberComsume/queryMerchantMenberComsumeFunctionsInfo?id='+$('#merchantMenberComsumeId').val();
+	$('.tab-content').load(url);  
+	
+}
+//跳转到扩展   
+function goExtends(){
+	
+	var url=ctx+'/merchantMenberComsume/queryMerchantMenberComsumeExtendsInfo?id='+$('#merchantMenberComsumeId').val();
+	$('.tab-content').load(url);          
+}  
+  
+
+ 
+//保存
+function saveMerchantMenberComsume(){
+	 
+	$(".fa-save").attr("disabled","disabled");
+	$('.fa-save').html('正在保存...')
+	$.ajax({
+		url:ctx+"/merchantMenberComsume/saveMerchantMenberComsume",
+		type:"POST",
+		dataType:'json',
+		data:$("#data_form").serializeArray(),
+		complete:function(){
+			$(".fa-save").removeAttr("disabled");
+			$('.fa-save').html('保存')
+		},        
+		success:function(service){ 
+		
+			layer.confirm('保存成功,是否前往列表？', {
+				  btn: ['确认','取消'] //按钮
+				}, function(){
+					$('#goback span').trigger('click'); 
+				}, function(){         
+					layer.closeAll();
+			});  
+			
+		}
+	});  
+}
+ 
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/merchantMenberComsume/merchantMenberComsumeList.js b/pluss-manage-page/src/main/resources/static/resources/merchantMenberComsume/merchantMenberComsumeList.js
new file mode 100644
index 0000000..5191e01
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/merchantMenberComsume/merchantMenberComsumeList.js
@@ -0,0 +1,273 @@
+/**
+ * create by robot 
+ * date Thu Sep 12 16:16:36 CST 2019 
+ */ 
+
+var pageIndex=1;
+$(document).ready(function(){
+	//调用查询
+	pageIndex=StringUtil.getQueryString('pageIndex');
+	if(pageIndex==undefined||pageIndex==null){
+		pageIndex=1;
+	}
+	queryMerchantMenberComsume(pageIndex);
+	//绑定hover操作
+	$(document).on('mouseenter','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").show();
+		var width=15;
+		$(this).children('div').find('li').each(function(){
+			//获取li宽度
+			width+=$(this).width();
+		});
+		$(this).children('div').width(width);
+	})
+	$(document).on('mouseleave','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").hide();
+	});
+
+	//日历控件
+	layui.use(['layer', 'laydate'], function() {
+		var layer = layui.layer;
+		laydate = layui.laydate;
+		laydate.render({
+		elem: '#date1' //指定元素
+		});
+		laydate.render({
+			elem: '#date2' //指定元素
+		});
+	});
+
+
+	//行选中事件
+	$("#allCheck").find("span").click(function() {
+		$(this).toggleClass('checked');
+		if($(this).hasClass('checked')){
+			//所有列选中
+		  $(".checker").find("span").each(function () {
+		         $(this).addClass("checked");
+		    })
+		}else{
+			//所有列取消选中
+			$(".checker").find("span").each(function () {
+				 $(this).removeClass("checked");
+		    })
+		}
+	});
+
+	//单个选中
+	$(document).on('click','.checkeBox span',function() {
+		$(this).toggleClass('checked');
+		//设置头部事件
+		var length=$('.checkeBox span').length;
+		var count=0;
+		$(".checkeBox").find("span").each(function () {
+	        if($(this).hasClass("checked")){
+	        	count++;
+	        }
+	   })
+		//全选
+	   if(count==length){
+		   $("#allCheck").find("span").addClass('checked');
+	   }else{
+		   $("#allCheck").find("span").removeClass('checked');
+	   }
+	})
+	//左右div高度相等
+	var left_content_height = $(".right-content").height();
+	$(".left-content").height(left_content_height+35);
+	var sub_left_height=$(".res-menu").height(left_content_height-60);
+});
+
+//查询
+function queryMerchantMenberComsume(index){
+	if(typeof(index)=='undefined'){
+		index=1;
+	}
+	var url=ctx+'/merchantMenberComsume/queryMerchantMenberComsumeByPage';
+	$.ajax({  
+        url:url,  
+        type:"post", 
+        dataType:"json",  
+        data:{  
+        	"currPage":index,
+        	"id":$('#searchId').val()
+        },  
+        success:function(result){  
+        	//渲染数据
+        	$('#data_content').empty();
+        	var header='';
+        	$.each(result.merchantMenberComsumeList,function(i){
+        		var merchantMenberComsume=result.merchantMenberComsumeList[i];
+        		var data='';
+        		data+='<tr class="odd">';
+        		data+='<td class="textc">';
+				data+='		 <div class="checker checkeBox">';        		data+='		 <span class=""  data-id="'+merchantMenberComsume.id+'"><input type="checkbox"  value=""></span>';
+        		data+='		</div>';
+        		data+='</td>';
+        		data+='<td class="textc">'+merchantMenberComsume.id+'</td>';
+        		data+='<td class="textc">'+merchantMenberComsume.merchantCode+'</td>';
+        		data+='<td class="textc">'+merchantMenberComsume.merchantName+'</td>';
+        		data+='<td class="textc">'+merchantMenberComsume.storeId+'</td>';
+        		data+='<td class="textc">'+merchantMenberComsume.storeName+'</td>';
+        		data+='<td class="textc">'+merchantMenberComsume.createDt+'</td>';
+        		data+='<td class="textc">'+merchantMenberComsume.logo+'</td>';
+        		data+='<td class="textc">'+merchantMenberComsume.memberCode+'</td>';
+        		data+='<td class="textc">'+merchantMenberComsume.nickName+'</td>';
+        		data+='<td class="textc">'+merchantMenberComsume.phone+'</td>';
+        		data+='<td class="textc">'+merchantMenberComsume.comsumeMoney+'</td>';
+        		data+='<td class="textc">'+merchantMenberComsume.payType+'</td>';
+        		data+='<td class="textc">';
+        		data+='<div class="positionr listOperaters">';
+        		data+='		<a href="javascript:void(0);"  class="icon-large dlblock w16 h16"><img src="'+resourcePath+'/images/angle-down.png"/></a>';
+        		data+='		<div class="ops_box ops_itemDiv positiona clearfix whitebg">';
+        		data+='			<ul>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showMerchantMenberComsumeDetails('+merchantMenberComsume.id+')" class="layui-btn layui-btn-sm layui-btn-radius fa fa-edit ops_more f12">编辑</a></li>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="initDeleteMerchantMenberComsume('+merchantMenberComsume.id+')" class="layui-btn layui-btn-sm layui-btn-radius layui-btn-danger fa fa-remove ops_more f12">删除</a></li>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showMerchantMenberComsumeDetails('+merchantMenberComsume.id+')" class="layui-btn layui-btn-sm layui-btn-radius fa fa-detail ops_more f12">明细</a></li>';
+        	    data+='			</ul>';
+              data+='		</div>';
+        	    data+='</div>';
+        	    data+='</td>';
+        	    data+='</tr>';
+        	    $('#data_content').append(data);
+        	});
+        	//分页
+        	$('#pageCount').html(result.pageCount);
+      	$('#currPage').html(result.currPage);
+          $('#totalCount').html(result.count);
+           	//设置分页
+           	pageIndex=result.currPage;
+			$('#pagination').pagination({
+				pageCount: result.pageCount,
+				jump: true,
+				coping: true,
+				jump: true,
+				homePage: '首页',
+				endPage: '末页',
+				prevContent: '上页',
+				nextContent: '下页',
+				current:result.currPage,
+				callback:function(api){
+					pageIndex=api.getCurrent();
+					queryMerchantMenberComsume(api.getCurrent());
+				}
+			});
+        } 
+    });  
+	//表头列不选中
+	$("#allCheck").find("span").removeClass('checked');
+}
+
+//初始化新增
+function initAddMerchantMenberComsume(){
+	window.location=ctx+'/merchantMenberComsume/queryMerchantMenberComsumeDetails?pageIndex='+pageIndex;
+}
+
+//初始化修改
+function showMerchantMenberComsumeDetails(id){
+	window.location=ctx+'/merchantMenberComsume/queryMerchantMenberComsumeDetails?id='+id+'&pageIndex='+pageIndex;
+}
+
+//初始化删除
+function initDeleteMerchantMenberComsume(id){
+	
+		layer.open({
+		type: 1,
+		closeBtn: 1,		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r'	, //按钮居中
+		shade: 0.3 ,//不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteMerchantMenberComsume(id,true);
+		}
+	});
+}
+
+//删除
+function deleteMerchantMenberComsume(id,showMsg){
+	$.ajax({
+		url:ctx+'/merchantMenberComsume/deleteMerchantMenberComsume',
+		data:[{
+			name:'id',
+			value:id
+		}],
+		type:'POST',
+		dataType:'json',
+		success:function(){
+			queryMerchantMenberComsume(pageIndex);
+			if(showMsg){
+				layer.msg('删除成功!');	
+			}
+		}
+	});
+}
+//头部编辑
+function initEditMerchantMenberComsume(){
+	var count=0;
+	var id=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+        	 id=$(this).data('id');
+         }
+    })
+    if(count>1){
+    	layer.msg('只能选中一行记录进行操作!');
+    	return ;
+    }
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	 if(id>0){
+	  showMerchantMenberComsumeDetails(id);
+	 }
+}
+//头部删除
+function initBatchDeleteMerchantMenberComsume(){
+	var count=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+         }
+    })
+	
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	
+
+	layer.open({
+		type: 1,
+		closeBtn: 1,
+		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r', //按钮居中
+		shade: 0.3, //不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteBatchMerchantMenberComsume();
+		}
+	});
+	
+}
+//批量删除
+function deleteBatchMerchantMenberComsume(){
+	
+	$(".checkeBox").find("span").each(function () {
+        if($(this).hasClass("checked")){
+        	var id=$(this).data('id');
+        	deleteMerchantMenberComsume(id,false);
+        	layer.msg('删除成功!');	
+        }
+   })
+}
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/merchantMenberRecharge/merchantMenberRechargeDetails.js b/pluss-manage-page/src/main/resources/static/resources/merchantMenberRecharge/merchantMenberRechargeDetails.js
new file mode 100644
index 0000000..798b1ba
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/merchantMenberRecharge/merchantMenberRechargeDetails.js
@@ -0,0 +1,96 @@
+/**
+ * create by robot 
+ * date Thu Sep 12 16:16:36 CST 2019 
+ */ 
+
+$(document).ready(function(){
+	//form表单样式
+	layui.use(['layer', 'form'], function() {
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+	//li 切换事件
+	$(".nav-tabs>li").click(function() {
+		var index = $(".nav-tabs>li").index(this);
+		$(this).addClass("active").siblings("li").removeClass("active");
+		
+	})
+	//弹出一个提示层
+	$('.fa-save').on('click', function() {
+		saveMerchantMenberRecharge();
+	});
+
+	//绑定标签栏事件
+	$(document).on('click','.nav-tabs li',function(){
+
+		var action =$(this).data('action');
+		 switch (action) {
+			case "base"://基本资料
+				goBase();
+				break;  
+			case "functions"://多功能
+				goFunctions();
+				break;
+			case "extends"://扩展    
+				goExtends();         
+				break;           
+		 }
+	})
+
+	//加载第一个标签
+	$('.nav-tabs li').eq(0).click();
+	
+});
+
+
+//跳转基本信息 
+function goBase(){
+	var url=ctx+'/merchantMenberRecharge/queryMerchantMenberRechargeBaseInfo?id='+$('#merchantMenberRechargeId').val();
+	$('.tab-content').load(url);
+	              
+}
+//跳转多功能输入
+function goFunctions(){ 
+	var url=ctx+'/merchantMenberRecharge/queryMerchantMenberRechargeFunctionsInfo?id='+$('#merchantMenberRechargeId').val();
+	$('.tab-content').load(url);  
+	
+}
+//跳转到扩展   
+function goExtends(){
+	
+	var url=ctx+'/merchantMenberRecharge/queryMerchantMenberRechargeExtendsInfo?id='+$('#merchantMenberRechargeId').val();
+	$('.tab-content').load(url);          
+}  
+  
+
+ 
+//保存
+function saveMerchantMenberRecharge(){
+	 
+	$(".fa-save").attr("disabled","disabled");
+	$('.fa-save').html('正在保存...')
+	$.ajax({
+		url:ctx+"/merchantMenberRecharge/saveMerchantMenberRecharge",
+		type:"POST",
+		dataType:'json',
+		data:$("#data_form").serializeArray(),
+		complete:function(){
+			$(".fa-save").removeAttr("disabled");
+			$('.fa-save').html('保存')
+		},        
+		success:function(service){ 
+		
+			layer.confirm('保存成功,是否前往列表？', {
+				  btn: ['确认','取消'] //按钮
+				}, function(){
+					$('#goback span').trigger('click'); 
+				}, function(){         
+					layer.closeAll();
+			});  
+			
+		}
+	});  
+}
+ 
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/merchantMenberRecharge/merchantMenberRechargeList.js b/pluss-manage-page/src/main/resources/static/resources/merchantMenberRecharge/merchantMenberRechargeList.js
new file mode 100644
index 0000000..68f6a66
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/merchantMenberRecharge/merchantMenberRechargeList.js
@@ -0,0 +1,274 @@
+/**
+ * create by robot 
+ * date Thu Sep 12 16:16:36 CST 2019 
+ */ 
+
+var pageIndex=1;
+$(document).ready(function(){
+	//调用查询
+	pageIndex=StringUtil.getQueryString('pageIndex');
+	if(pageIndex==undefined||pageIndex==null){
+		pageIndex=1;
+	}
+	queryMerchantMenberRecharge(pageIndex);
+	//绑定hover操作
+	$(document).on('mouseenter','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").show();
+		var width=15;
+		$(this).children('div').find('li').each(function(){
+			//获取li宽度
+			width+=$(this).width();
+		});
+		$(this).children('div').width(width);
+	})
+	$(document).on('mouseleave','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").hide();
+	});
+
+	//日历控件
+	layui.use(['layer', 'laydate'], function() {
+		var layer = layui.layer;
+		laydate = layui.laydate;
+		laydate.render({
+		elem: '#date1' //指定元素
+		});
+		laydate.render({
+			elem: '#date2' //指定元素
+		});
+	});
+
+
+	//行选中事件
+	$("#allCheck").find("span").click(function() {
+		$(this).toggleClass('checked');
+		if($(this).hasClass('checked')){
+			//所有列选中
+		  $(".checker").find("span").each(function () {
+		         $(this).addClass("checked");
+		    })
+		}else{
+			//所有列取消选中
+			$(".checker").find("span").each(function () {
+				 $(this).removeClass("checked");
+		    })
+		}
+	});
+
+	//单个选中
+	$(document).on('click','.checkeBox span',function() {
+		$(this).toggleClass('checked');
+		//设置头部事件
+		var length=$('.checkeBox span').length;
+		var count=0;
+		$(".checkeBox").find("span").each(function () {
+	        if($(this).hasClass("checked")){
+	        	count++;
+	        }
+	   })
+		//全选
+	   if(count==length){
+		   $("#allCheck").find("span").addClass('checked');
+	   }else{
+		   $("#allCheck").find("span").removeClass('checked');
+	   }
+	})
+	//左右div高度相等
+	var left_content_height = $(".right-content").height();
+	$(".left-content").height(left_content_height+35);
+	var sub_left_height=$(".res-menu").height(left_content_height-60);
+});
+
+//查询
+function queryMerchantMenberRecharge(index){
+	if(typeof(index)=='undefined'){
+		index=1;
+	}
+	var url=ctx+'/merchantMenberRecharge/queryMerchantMenberRechargeByPage';
+	$.ajax({  
+        url:url,  
+        type:"post", 
+        dataType:"json",  
+        data:{  
+        	"currPage":index,
+        	"id":$('#searchId').val()
+        },  
+        success:function(result){  
+        	//渲染数据
+        	$('#data_content').empty();
+        	var header='';
+        	$.each(result.merchantMenberRechargeList,function(i){
+        		var merchantMenberRecharge=result.merchantMenberRechargeList[i];
+        		var data='';
+        		data+='<tr class="odd">';
+        		data+='<td class="textc">';
+				data+='		 <div class="checker checkeBox">';        		data+='		 <span class=""  data-id="'+merchantMenberRecharge.id+'"><input type="checkbox"  value=""></span>';
+        		data+='		</div>';
+        		data+='</td>';
+        		data+='<td class="textc">'+merchantMenberRecharge.id+'</td>';
+        		data+='<td class="textc">'+merchantMenberRecharge.merchantCode+'</td>';
+        		data+='<td class="textc">'+merchantMenberRecharge.merchantName+'</td>';
+        		data+='<td class="textc">'+merchantMenberRecharge.storeId+'</td>';
+        		data+='<td class="textc">'+merchantMenberRecharge.storeName+'</td>';
+        		data+='<td class="textc">'+merchantMenberRecharge.createDt+'</td>';
+        		data+='<td class="textc">'+merchantMenberRecharge.logo+'</td>';
+        		data+='<td class="textc">'+merchantMenberRecharge.memberCode+'</td>';
+        		data+='<td class="textc">'+merchantMenberRecharge.nickName+'</td>';
+        		data+='<td class="textc">'+merchantMenberRecharge.phone+'</td>';
+        		data+='<td class="textc">'+merchantMenberRecharge.rechargeMoney+'</td>';
+        		data+='<td class="textc">'+merchantMenberRecharge.giveMoney+'</td>';
+        		data+='<td class="textc">'+merchantMenberRecharge.payType+'</td>';
+        		data+='<td class="textc">';
+        		data+='<div class="positionr listOperaters">';
+        		data+='		<a href="javascript:void(0);"  class="icon-large dlblock w16 h16"><img src="'+resourcePath+'/images/angle-down.png"/></a>';
+        		data+='		<div class="ops_box ops_itemDiv positiona clearfix whitebg">';
+        		data+='			<ul>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showMerchantMenberRechargeDetails('+merchantMenberRecharge.id+')" class="btn btn-primary fa fa-edit ops_more f12">编辑</a></li>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="initDeleteMerchantMenberRecharge('+merchantMenberRecharge.id+')" class="btn btn-primary fa fa-remove ops_more f12">删除</a></li>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showMerchantMenberRechargeDetails('+merchantMenberRecharge.id+')" class="btn btn-primary fa fa-detail ops_more f12">明细</a></li>';
+        	    data+='			</ul>';
+              data+='		</div>';
+        	    data+='</div>';
+        	    data+='</td>';
+        	    data+='</tr>';
+        	    $('#data_content').append(data);
+        	});
+        	//分页
+        	$('#pageCount').html(result.pageCount);
+      	$('#currPage').html(result.currPage);
+          $('#totalCount').html(result.count);
+           	//设置分页
+           	pageIndex=result.currPage;
+			$('#pagination').pagination({
+				pageCount: result.pageCount,
+				jump: true,
+				coping: true,
+				jump: true,
+				homePage: '首页',
+				endPage: '末页',
+				prevContent: '上页',
+				nextContent: '下页',
+				current:result.currPage,
+				callback:function(api){
+					pageIndex=api.getCurrent();
+					queryMerchantMenberRecharge(api.getCurrent());
+				}
+			});
+        } 
+    });  
+	//表头列不选中
+	$("#allCheck").find("span").removeClass('checked');
+}
+
+//初始化新增
+function initAddMerchantMenberRecharge(){
+	window.location=ctx+'/merchantMenberRecharge/queryMerchantMenberRechargeDetails?pageIndex='+pageIndex;
+}
+
+//初始化修改
+function showMerchantMenberRechargeDetails(id){
+	window.location=ctx+'/merchantMenberRecharge/queryMerchantMenberRechargeDetails?id='+id+'&pageIndex='+pageIndex;
+}
+
+//初始化删除
+function initDeleteMerchantMenberRecharge(id){
+	
+		layer.open({
+		type: 1,
+		closeBtn: 1,		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r'	, //按钮居中
+		shade: 0.3 ,//不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteMerchantMenberRecharge(id,true);
+		}
+	});
+}
+
+//删除
+function deleteMerchantMenberRecharge(id,showMsg){
+	$.ajax({
+		url:ctx+'/merchantMenberRecharge/deleteMerchantMenberRecharge',
+		data:[{
+			name:'id',
+			value:id
+		}],
+		type:'POST',
+		dataType:'json',
+		success:function(){
+			queryMerchantMenberRecharge(pageIndex);
+			if(showMsg){
+				layer.msg('删除成功!');	
+			}
+		}
+	});
+}
+//头部编辑
+function initEditMerchantMenberRecharge(){
+	var count=0;
+	var id=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+        	 id=$(this).data('id');
+         }
+    })
+    if(count>1){
+    	layer.msg('只能选中一行记录进行操作!');
+    	return ;
+    }
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	 if(id>0){
+	  showMerchantMenberRechargeDetails(id);
+	 }
+}
+//头部删除
+function initBatchDeleteMerchantMenberRecharge(){
+	var count=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+         }
+    })
+	
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	
+
+	layer.open({
+		type: 1,
+		closeBtn: 1,
+		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r', //按钮居中
+		shade: 0.3, //不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteBatchMerchantMenberRecharge();
+		}
+	});
+	
+}
+//批量删除
+function deleteBatchMerchantMenberRecharge(){
+	
+	$(".checkeBox").find("span").each(function () {
+        if($(this).hasClass("checked")){
+        	var id=$(this).data('id');
+        	deleteMerchantMenberRecharge(id,false);
+        	layer.msg('删除成功!');	
+        }
+   })
+}
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/merchantProfit/merchantProfitDetails.js b/pluss-manage-page/src/main/resources/static/resources/merchantProfit/merchantProfitDetails.js
new file mode 100644
index 0000000..0b5367c
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/merchantProfit/merchantProfitDetails.js
@@ -0,0 +1,96 @@
+/**
+ * create by robot 
+ * date Mon Apr 27 18:33:02 CST 2020 
+ */ 
+
+$(document).ready(function(){
+	//form表单样式
+	layui.use(['layer', 'form'], function() {
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+	//li 切换事件
+	$(".nav-tabs>li").click(function() {
+		var index = $(".nav-tabs>li").index(this);
+		$(this).addClass("active").siblings("li").removeClass("active");
+		
+	})
+	//弹出一个提示层
+	$('.fa-save').on('click', function() {
+		saveMerchantProfit();
+	});
+
+	//绑定标签栏事件
+	$(document).on('click','.nav-tabs li',function(){
+
+		var action =$(this).data('action');
+		 switch (action) {
+			case "base"://基本资料
+				goBase();
+				break;  
+			case "functions"://多功能
+				goFunctions();
+				break;
+			case "extends"://扩展    
+				goExtends();         
+				break;           
+		 }
+	})
+
+	//加载第一个标签
+	$('.nav-tabs li').eq(0).click();
+	
+});
+
+
+//跳转基本信息 
+function goBase(){
+	var url=ctx+'/merchantProfit/queryMerchantProfitBaseInfo?id='+$('#merchantProfitId').val();
+	$('.tab-content').load(url);
+	              
+}
+//跳转多功能输入
+function goFunctions(){ 
+	var url=ctx+'/merchantProfit/queryMerchantProfitFunctionsInfo?id='+$('#merchantProfitId').val();
+	$('.tab-content').load(url);  
+	
+}
+//跳转到扩展   
+function goExtends(){
+	
+	var url=ctx+'/merchantProfit/queryMerchantProfitExtendsInfo?id='+$('#merchantProfitId').val();
+	$('.tab-content').load(url);          
+}  
+  
+
+ 
+//保存
+function saveMerchantProfit(){
+	 
+	$(".fa-save").attr("disabled","disabled");
+	$('.fa-save').html('正在保存...')
+	$.ajax({
+		url:ctx+"/merchantProfit/saveMerchantProfit",
+		type:"POST",
+		dataType:'json',
+		data:$("#data_form").serializeArray(),
+		complete:function(){
+			$(".fa-save").removeAttr("disabled");
+			$('.fa-save').html('保存')
+		},        
+		success:function(service){ 
+		
+			layer.confirm('保存成功,是否前往列表？', {
+				  btn: ['确认','取消'] //按钮
+				}, function(){
+					$('#goback span').trigger('click'); 
+				}, function(){         
+					layer.closeAll();
+			});  
+			
+		}
+	});  
+}
+ 
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/merchantProfit/merchantProfitList.js b/pluss-manage-page/src/main/resources/static/resources/merchantProfit/merchantProfitList.js
new file mode 100644
index 0000000..b5ef45b
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/merchantProfit/merchantProfitList.js
@@ -0,0 +1,271 @@
+/**
+ * create by robot 
+ * date Mon Apr 27 18:33:02 CST 2020 
+ */ 
+
+var pageIndex=1;
+$(document).ready(function(){
+	//调用查询
+	pageIndex=StringUtil.getQueryString('pageIndex');
+	if(pageIndex==undefined||pageIndex==null){
+		pageIndex=1;
+	}
+	queryMerchantProfit(pageIndex);
+	//绑定hover操作
+	$(document).on('mouseenter','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").show();
+		var width=15;
+		$(this).children('div').find('li').each(function(){
+			//获取li宽度
+			width+=$(this).width();
+		});
+		$(this).children('div').width(width);
+	})
+	$(document).on('mouseleave','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").hide();
+	});
+
+	//日历控件
+	layui.use(['layer', 'laydate'], function() {
+		var layer = layui.layer;
+		laydate = layui.laydate;
+		laydate.render({
+		elem: '#date1' //指定元素
+		});
+		laydate.render({
+			elem: '#date2' //指定元素
+		});
+	});
+
+
+	//行选中事件
+	$("#allCheck").find("span").click(function() {
+		$(this).toggleClass('checked');
+		if($(this).hasClass('checked')){
+			//所有列选中
+		  $(".checker").find("span").each(function () {
+		         $(this).addClass("checked");
+		    })
+		}else{
+			//所有列取消选中
+			$(".checker").find("span").each(function () {
+				 $(this).removeClass("checked");
+		    })
+		}
+	});
+
+	//单个选中
+	$(document).on('click','.checkeBox span',function() {
+		$(this).toggleClass('checked');
+		//设置头部事件
+		var length=$('.checkeBox span').length;
+		var count=0;
+		$(".checkeBox").find("span").each(function () {
+	        if($(this).hasClass("checked")){
+	        	count++;
+	        }
+	   })
+		//全选
+	   if(count==length){
+		   $("#allCheck").find("span").addClass('checked');
+	   }else{
+		   $("#allCheck").find("span").removeClass('checked');
+	   }
+	})
+	//左右div高度相等
+	var left_content_height = $(".right-content").height();
+	$(".left-content").height(left_content_height+35);
+	var sub_left_height=$(".res-menu").height(left_content_height-60);
+});
+
+//查询
+function queryMerchantProfit(index){
+	if(typeof(index)=='undefined'){
+		index=1;
+	}
+	var url=ctx+'/merchantProfit/queryMerchantProfitByPage';
+	$.ajax({  
+        url:url,  
+        type:"post", 
+        dataType:"json",  
+        data:{  
+        	"currPage":index,
+        	"id":$('#searchId').val()
+        },  
+        success:function(result){  
+        	//渲染数据
+        	$('#data_content').empty();
+        	var header='';
+        	$.each(result.merchantProfitList,function(i){
+        		var merchantProfit=result.merchantProfitList[i];
+        		var data='';
+        		data+='<tr class="odd">';
+        		data+='<td class="textc">';
+				data+='		 <div class="checker checkeBox">';        		data+='		 <span class=""  data-id="'+merchantProfit.id+'"><input type="checkbox"  value=""></span>';
+        		data+='		</div>';
+        		data+='</td>';
+        		data+='<td class="textc">'+merchantProfit.id+'</td>';
+        		data+='<td class="textc">'+merchantProfit.userId+'</td>';
+        		data+='<td class="textc">'+merchantProfit.type+'</td>';
+        		data+='<td class="textc">'+merchantProfit.price+'</td>';
+        		data+='<td class="textc">'+merchantProfit.orderNumber+'</td>';
+        		data+='<td class="textc">'+merchantProfit.merchantCode+'</td>';
+        		data+='<td class="textc">'+merchantProfit.merchantName+'</td>';
+        		data+='<td class="textc">'+merchantProfit.consumeFee+'</td>';
+        		data+='<td class="textc">'+merchantProfit.createDt+'</td>';
+        		data+='<td class="textc">'+merchantProfit.orderDt+'</td>';
+        		data+='<td class="textc">';
+        		data+='<div class="positionr listOperaters">';
+        		data+='		<a href="javascript:void(0);"  class="icon-large dlblock w16 h16"><img src="'+resourcePath+'/images/angle-down.png"/></a>';
+        		data+='		<div class="ops_box ops_itemDiv positiona clearfix whitebg">';
+        		data+='			<ul>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showMerchantProfitDetails('+merchantProfit.id+')" class="btn btn-primary fa fa-edit ops_more f12">编辑</a></li>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="initDeleteMerchantProfit('+merchantProfit.id+')" class="btn btn-primary fa fa-remove ops_more f12">删除</a></li>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showMerchantProfitDetails('+merchantProfit.id+')" class="btn btn-primary fa fa-detail ops_more f12">明细</a></li>';
+        	    data+='			</ul>';
+              data+='		</div>';
+        	    data+='</div>';
+        	    data+='</td>';
+        	    data+='</tr>';
+        	    $('#data_content').append(data);
+        	});
+        	//分页
+        	$('#pageCount').html(result.pageCount);
+      	$('#currPage').html(result.currPage);
+          $('#totalCount').html(result.count);
+           	//设置分页
+           	pageIndex=result.currPage;
+			$('#pagination').pagination({
+				pageCount: result.pageCount,
+				jump: true,
+				coping: true,
+				jump: true,
+				homePage: '首页',
+				endPage: '末页',
+				prevContent: '上页',
+				nextContent: '下页',
+				current:result.currPage,
+				callback:function(api){
+					pageIndex=api.getCurrent();
+					queryMerchantProfit(api.getCurrent());
+				}
+			});
+        } 
+    });  
+	//表头列不选中
+	$("#allCheck").find("span").removeClass('checked');
+}
+
+//初始化新增
+function initAddMerchantProfit(){
+	window.location=ctx+'/merchantProfit/queryMerchantProfitDetails?pageIndex='+pageIndex;
+}
+
+//初始化修改
+function showMerchantProfitDetails(id){
+	window.location=ctx+'/merchantProfit/queryMerchantProfitDetails?id='+id+'&pageIndex='+pageIndex;
+}
+
+//初始化删除
+function initDeleteMerchantProfit(id){
+	
+		layer.open({
+		type: 1,
+		closeBtn: 1,		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r'	, //按钮居中
+		shade: 0.3 ,//不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteMerchantProfit(id,true);
+		}
+	});
+}
+
+//删除
+function deleteMerchantProfit(id,showMsg){
+	$.ajax({
+		url:ctx+'/merchantProfit/deleteMerchantProfit',
+		data:[{
+			name:'id',
+			value:id
+		}],
+		type:'POST',
+		dataType:'json',
+		success:function(){
+			queryMerchantProfit(pageIndex);
+			if(showMsg){
+				layer.msg('删除成功!');	
+			}
+		}
+	});
+}
+//头部编辑
+function initEditMerchantProfit(){
+	var count=0;
+	var id=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+        	 id=$(this).data('id');
+         }
+    })
+    if(count>1){
+    	layer.msg('只能选中一行记录进行操作!');
+    	return ;
+    }
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	 if(id>0){
+	  showMerchantProfitDetails(id);
+	 }
+}
+//头部删除
+function initBatchDeleteMerchantProfit(){
+	var count=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+         }
+    })
+	
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	
+
+	layer.open({
+		type: 1,
+		closeBtn: 1,
+		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r', //按钮居中
+		shade: 0.3, //不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteBatchMerchantProfit();
+		}
+	});
+	
+}
+//批量删除
+function deleteBatchMerchantProfit(){
+	
+	$(".checkeBox").find("span").each(function () {
+        if($(this).hasClass("checked")){
+        	var id=$(this).data('id');
+        	deleteMerchantProfit(id,false);
+        	layer.msg('删除成功!');	
+        }
+   })
+}
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/newArea/newAreaDetails.js b/pluss-manage-page/src/main/resources/static/resources/newArea/newAreaDetails.js
new file mode 100644
index 0000000..9e16539
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/newArea/newAreaDetails.js
@@ -0,0 +1,96 @@
+/**
+ * create by robot 
+ * date Mon Mar 16 12:06:20 CST 2020 
+ */ 
+
+$(document).ready(function(){
+	//form表单样式
+	layui.use(['layer', 'form'], function() {
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+	//li 切换事件
+	$(".nav-tabs>li").click(function() {
+		var index = $(".nav-tabs>li").index(this);
+		$(this).addClass("active").siblings("li").removeClass("active");
+		
+	})
+	//弹出一个提示层
+	$('.fa-save').on('click', function() {
+		saveNewArea();
+	});
+
+	//绑定标签栏事件
+	$(document).on('click','.nav-tabs li',function(){
+
+		var action =$(this).data('action');
+		 switch (action) {
+			case "base"://基本资料
+				goBase();
+				break;  
+			case "functions"://多功能
+				goFunctions();
+				break;
+			case "extends"://扩展    
+				goExtends();         
+				break;           
+		 }
+	})
+
+	//加载第一个标签
+	$('.nav-tabs li').eq(0).click();
+	
+});
+
+
+//跳转基本信息 
+function goBase(){
+	var url=ctx+'/newArea/queryNewAreaBaseInfo?id='+$('#newAreaId').val();
+	$('.tab-content').load(url);
+	              
+}
+//跳转多功能输入
+function goFunctions(){ 
+	var url=ctx+'/newArea/queryNewAreaFunctionsInfo?id='+$('#newAreaId').val();
+	$('.tab-content').load(url);  
+	
+}
+//跳转到扩展   
+function goExtends(){
+	
+	var url=ctx+'/newArea/queryNewAreaExtendsInfo?id='+$('#newAreaId').val();
+	$('.tab-content').load(url);          
+}  
+  
+
+ 
+//保存
+function saveNewArea(){
+	 
+	$(".fa-save").attr("disabled","disabled");
+	$('.fa-save').html('正在保存...')
+	$.ajax({
+		url:ctx+"/newArea/saveNewArea",
+		type:"POST",
+		dataType:'json',
+		data:$("#data_form").serializeArray(),
+		complete:function(){
+			$(".fa-save").removeAttr("disabled");
+			$('.fa-save').html('保存')
+		},        
+		success:function(service){ 
+		
+			layer.confirm('保存成功,是否前往列表？', {
+				  btn: ['确认','取消'] //按钮
+				}, function(){
+					$('#goback span').trigger('click'); 
+				}, function(){         
+					layer.closeAll();
+			});  
+			
+		}
+	});  
+}
+ 
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/newArea/newAreaList.js b/pluss-manage-page/src/main/resources/static/resources/newArea/newAreaList.js
new file mode 100644
index 0000000..b584f1f
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/newArea/newAreaList.js
@@ -0,0 +1,271 @@
+/**
+ * create by robot 
+ * date Mon Mar 16 12:06:20 CST 2020 
+ */ 
+
+var pageIndex=1;
+$(document).ready(function(){
+	//调用查询
+	pageIndex=StringUtil.getQueryString('pageIndex');
+	if(pageIndex==undefined||pageIndex==null){
+		pageIndex=1;
+	}
+	queryNewArea(pageIndex);
+	//绑定hover操作
+	$(document).on('mouseenter','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").show();
+		var width=15;
+		$(this).children('div').find('li').each(function(){
+			//获取li宽度
+			width+=$(this).width();
+		});
+		$(this).children('div').width(width);
+	})
+	$(document).on('mouseleave','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").hide();
+	});
+
+	//日历控件
+	layui.use(['layer', 'laydate'], function() {
+		var layer = layui.layer;
+		laydate = layui.laydate;
+		laydate.render({
+		elem: '#date1' //指定元素
+		});
+		laydate.render({
+			elem: '#date2' //指定元素
+		});
+	});
+
+
+	//行选中事件
+	$("#allCheck").find("span").click(function() {
+		$(this).toggleClass('checked');
+		if($(this).hasClass('checked')){
+			//所有列选中
+		  $(".checker").find("span").each(function () {
+		         $(this).addClass("checked");
+		    })
+		}else{
+			//所有列取消选中
+			$(".checker").find("span").each(function () {
+				 $(this).removeClass("checked");
+		    })
+		}
+	});
+
+	//单个选中
+	$(document).on('click','.checkeBox span',function() {
+		$(this).toggleClass('checked');
+		//设置头部事件
+		var length=$('.checkeBox span').length;
+		var count=0;
+		$(".checkeBox").find("span").each(function () {
+	        if($(this).hasClass("checked")){
+	        	count++;
+	        }
+	   })
+		//全选
+	   if(count==length){
+		   $("#allCheck").find("span").addClass('checked');
+	   }else{
+		   $("#allCheck").find("span").removeClass('checked');
+	   }
+	})
+	//左右div高度相等
+	var left_content_height = $(".right-content").height();
+	$(".left-content").height(left_content_height+35);
+	var sub_left_height=$(".res-menu").height(left_content_height-60);
+});
+
+//查询
+function queryNewArea(index){
+	if(typeof(index)=='undefined'){
+		index=1;
+	}
+	var url=ctx+'/newArea/queryNewAreaByPage';
+	$.ajax({  
+        url:url,  
+        type:"post", 
+        dataType:"json",  
+        data:{  
+        	"currPage":index,
+        	"id":$('#searchId').val()
+        },  
+        success:function(result){  
+        	//渲染数据
+        	$('#data_content').empty();
+        	var header='';
+        	$.each(result.newAreaList,function(i){
+        		var newArea=result.newAreaList[i];
+        		var data='';
+        		data+='<tr class="odd">';
+        		data+='<td class="textc">';
+				data+='		 <div class="checker checkeBox">';        		data+='		 <span class=""  data-id="'+newArea.id+'"><input type="checkbox"  value=""></span>';
+        		data+='		</div>';
+        		data+='</td>';
+        		data+='<td class="textc">'+newArea.id+'</td>';
+        		data+='<td class="textc">'+newArea.parentId+'</td>';
+        		data+='<td class="textc">'+newArea.name+'</td>';
+        		data+='<td class="textc">'+newArea.shortName+'</td>';
+        		data+='<td class="textc">'+newArea.longitude+'</td>';
+        		data+='<td class="textc">'+newArea.latitude+'</td>';
+        		data+='<td class="textc">'+newArea.level+'</td>';
+        		data+='<td class="textc">'+newArea.sort+'</td>';
+        		data+='<td class="textc">'+newArea.status+'</td>';
+        		data+='<td class="textc">'+newArea.open+'</td>';
+        		data+='<td class="textc">';
+        		data+='<div class="positionr listOperaters">';
+        		data+='		<a href="javascript:void(0);"  class="icon-large dlblock w16 h16"><img src="'+resourcePath+'/images/angle-down.png"/></a>';
+        		data+='		<div class="ops_box ops_itemDiv positiona clearfix whitebg">';
+        		data+='			<ul>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showNewAreaDetails('+newArea.id+')" class="btn btn-primary fa fa-edit ops_more f12">编辑</a></li>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="initDeleteNewArea('+newArea.id+')" class="btn btn-primary fa fa-remove ops_more f12">删除</a></li>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showNewAreaDetails('+newArea.id+')" class="btn btn-primary fa fa-detail ops_more f12">明细</a></li>';
+        	    data+='			</ul>';
+              data+='		</div>';
+        	    data+='</div>';
+        	    data+='</td>';
+        	    data+='</tr>';
+        	    $('#data_content').append(data);
+        	});
+        	//分页
+        	$('#pageCount').html(result.pageCount);
+      	$('#currPage').html(result.currPage);
+          $('#totalCount').html(result.count);
+           	//设置分页
+           	pageIndex=result.currPage;
+			$('#pagination').pagination({
+				pageCount: result.pageCount,
+				jump: true,
+				coping: true,
+				jump: true,
+				homePage: '首页',
+				endPage: '末页',
+				prevContent: '上页',
+				nextContent: '下页',
+				current:result.currPage,
+				callback:function(api){
+					pageIndex=api.getCurrent();
+					queryNewArea(api.getCurrent());
+				}
+			});
+        } 
+    });  
+	//表头列不选中
+	$("#allCheck").find("span").removeClass('checked');
+}
+
+//初始化新增
+function initAddNewArea(){
+	window.location=ctx+'/newArea/queryNewAreaDetails?pageIndex='+pageIndex;
+}
+
+//初始化修改
+function showNewAreaDetails(id){
+	window.location=ctx+'/newArea/queryNewAreaDetails?id='+id+'&pageIndex='+pageIndex;
+}
+
+//初始化删除
+function initDeleteNewArea(id){
+	
+		layer.open({
+		type: 1,
+		closeBtn: 1,		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r'	, //按钮居中
+		shade: 0.3 ,//不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteNewArea(id,true);
+		}
+	});
+}
+
+//删除
+function deleteNewArea(id,showMsg){
+	$.ajax({
+		url:ctx+'/newArea/deleteNewArea',
+		data:[{
+			name:'id',
+			value:id
+		}],
+		type:'POST',
+		dataType:'json',
+		success:function(){
+			queryNewArea(pageIndex);
+			if(showMsg){
+				layer.msg('删除成功!');	
+			}
+		}
+	});
+}
+//头部编辑
+function initEditNewArea(){
+	var count=0;
+	var id=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+        	 id=$(this).data('id');
+         }
+    })
+    if(count>1){
+    	layer.msg('只能选中一行记录进行操作!');
+    	return ;
+    }
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	 if(id>0){
+	  showNewAreaDetails(id);
+	 }
+}
+//头部删除
+function initBatchDeleteNewArea(){
+	var count=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+         }
+    })
+	
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	
+
+	layer.open({
+		type: 1,
+		closeBtn: 1,
+		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r', //按钮居中
+		shade: 0.3, //不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteBatchNewArea();
+		}
+	});
+	
+}
+//批量删除
+function deleteBatchNewArea(){
+	
+	$(".checkeBox").find("span").each(function () {
+        if($(this).hasClass("checked")){
+        	var id=$(this).data('id');
+        	deleteNewArea(id,false);
+        	layer.msg('删除成功!');	
+        }
+   })
+}
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/notice/noticeDetails.js b/pluss-manage-page/src/main/resources/static/resources/notice/noticeDetails.js
new file mode 100644
index 0000000..ebde8ba
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/notice/noticeDetails.js
@@ -0,0 +1,96 @@
+/**
+ * create by robot 
+ * date Thu Sep 12 16:16:36 CST 2019 
+ */ 
+
+$(document).ready(function(){
+	//form表单样式
+	layui.use(['layer', 'form'], function() {
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+	//li 切换事件
+	$(".nav-tabs>li").click(function() {
+		var index = $(".nav-tabs>li").index(this);
+		$(this).addClass("active").siblings("li").removeClass("active");
+		
+	})
+	//弹出一个提示层
+	$('.fa-save').on('click', function() {
+		saveNotice();
+	});
+
+	//绑定标签栏事件
+	$(document).on('click','.nav-tabs li',function(){
+
+		var action =$(this).data('action');
+		 switch (action) {
+			case "base"://基本资料
+				goBase();
+				break;  
+			case "functions"://多功能
+				goFunctions();
+				break;
+			case "extends"://扩展    
+				goExtends();         
+				break;           
+		 }
+	})
+
+	//加载第一个标签
+	$('.nav-tabs li').eq(0).click();
+	
+});
+
+
+//跳转基本信息 
+function goBase(){
+	var url=ctx+'/notice/queryNoticeBaseInfo?id='+$('#noticeId').val();
+	$('.tab-content').load(url);
+	              
+}
+//跳转多功能输入
+function goFunctions(){ 
+	var url=ctx+'/notice/queryNoticeFunctionsInfo?id='+$('#noticeId').val();
+	$('.tab-content').load(url);  
+	
+}
+//跳转到扩展   
+function goExtends(){
+	
+	var url=ctx+'/notice/queryNoticeExtendsInfo?id='+$('#noticeId').val();
+	$('.tab-content').load(url);          
+}  
+  
+
+ 
+//保存
+function saveNotice(){
+	 
+	$(".fa-save").attr("disabled","disabled");
+	$('.fa-save').html('正在保存...')
+	$.ajax({
+		url:ctx+"/notice/saveNotice",
+		type:"POST",
+		dataType:'json',
+		data:$("#data_form").serializeArray(),
+		complete:function(){
+			$(".fa-save").removeAttr("disabled");
+			$('.fa-save').html('保存')
+		},        
+		success:function(service){ 
+		
+			layer.confirm('保存成功,是否前往列表？', {
+				  btn: ['确认','取消'] //按钮
+				}, function(){
+					$('#goback span').trigger('click'); 
+				}, function(){         
+					layer.closeAll();
+			});  
+			
+		}
+	});  
+}
+ 
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/notice/noticeList.js b/pluss-manage-page/src/main/resources/static/resources/notice/noticeList.js
new file mode 100644
index 0000000..b38f823
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/notice/noticeList.js
@@ -0,0 +1,308 @@
+/**
+ * create by robot 
+ * date Thu Sep 12 16:16:36 CST 2019 
+ */ 
+
+var pageIndex=1;
+$(document).ready(function(){
+	//调用查询
+	pageIndex=StringUtil.getQueryString('pageIndex');
+	if(pageIndex==undefined||pageIndex==null){
+		pageIndex=1;
+	}
+	queryNotice(pageIndex);
+	//绑定hover操作
+	$(document).on('mouseenter','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").show();
+		var width=15;
+		$(this).children('div').find('li').each(function(){
+			//获取li宽度
+			width+=$(this).width();
+		});
+		$(this).children('div').width(width);
+	})
+	$(document).on('mouseleave','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").hide();
+	});
+
+	//日历控件
+	layui.use(['layer', 'laydate'], function() {
+		var layer = layui.layer;
+		laydate = layui.laydate;
+		laydate.render({
+		elem: '#date1' //指定元素
+		});
+		laydate.render({
+			elem: '#date2' //指定元素
+		});
+	});
+
+
+	//行选中事件
+	$("#allCheck").find("span").click(function() {
+		$(this).toggleClass('checked');
+		if($(this).hasClass('checked')){
+			//所有列选中
+		  $(".checker").find("span").each(function () {
+		         $(this).addClass("checked");
+		    })
+		}else{
+			//所有列取消选中
+			$(".checker").find("span").each(function () {
+				 $(this).removeClass("checked");
+		    })
+		}
+	});
+
+	//单个选中
+	$(document).on('click','.checkeBox span',function() {
+		$(this).toggleClass('checked');
+		//设置头部事件
+		var length=$('.checkeBox span').length;
+		var count=0;
+		$(".checkeBox").find("span").each(function () {
+	        if($(this).hasClass("checked")){
+	        	count++;
+	        }
+	   })
+		//全选
+	   if(count==length){
+		   $("#allCheck").find("span").addClass('checked');
+	   }else{
+		   $("#allCheck").find("span").removeClass('checked');
+	   }
+	})
+	//左右div高度相等
+	var left_content_height = $(".right-content").height();
+	$(".left-content").height(left_content_height+35);
+	var sub_left_height=$(".res-menu").height(left_content_height-60);
+});
+
+//查询
+function queryNotice(index){
+	if(typeof(index)=='undefined'){
+		index=1;
+	}
+	var url=ctx+'/notice/queryNoticeByPage';
+	$.ajax({  
+        url:url,  
+        type:"post", 
+        dataType:"json",  
+        data:{  
+        	"currPage":index,
+        	"userName":$("#userName").val(),
+        	"typeFirst":$("#typeFirst option:selected").val(),
+        	"typeSecond":$("#typeSecond option:selected").val(),
+        },  
+        success:function(result){  
+        	//渲染数据
+        	$('#data_content').empty();
+        	var header='';
+        	$.each(result.noticeList,function(i){
+        		var notice=result.noticeList[i];
+        		var data='';
+        		data+='<tr class="odd">';
+        		data+='<td class="textc">';
+				data+='		 <div class="checker checkeBox">';        		data+='		 <span class=""  data-id="'+notice.id+'"><input type="checkbox"  value=""></span>';
+        		data+='		</div>';
+        		data+='</td>';
+        		data+='<td class="textc">'+notice.id+'</td>';
+        		/*data+='<td class="textc">'+notice.userId+'</td>';*/
+        		if(result.admin=='admin'){
+        			var userName='';
+        			if(StringUtil.isNotBlank(notice.userName)){
+        				userName=notice.userName;
+        			}
+        			data+='<td class="textc">'+userName+'</td>';
+        		}
+        		var typeFirst='';
+        		if(StringUtil.isNotBlank(notice.typeFirst)){
+        			if(notice.typeFirst=='0'){
+        				typeFirst='分润通知';
+        			}
+        			if(notice.typeFirst=='1'){
+        				typeFirst='审核通知';
+        			}
+        		}
+        		data+='<td class="textc">'+typeFirst+'</td>';
+        		var typeSecond='';
+        		if(StringUtil.isNotBlank(notice.typeSecond)){
+        			if(notice.typeSecond=='0'){
+        				typeSecond='身份证认证';
+        			}else if(notice.typeSecond=='1'){
+        				typeSecond='商家认证';
+        			}else if(notice.typeSecond=='2'){
+        				typeSecond='店员退款通知';
+        			}else if(notice.typeSecond=='3'){
+        				typeSecond='收款通知';
+        			}else if(notice.typeSecond=='4'){
+        				typeSecond='邀请注册通知';
+        			}else if(notice.typeSecond=='5'){
+        				typeSecond='银行卡认证';
+        			}else if(notice.typeSecond=='99'){
+        				typeSecond='其它';
+        			}
+        		}
+        		data+='<td class="textc">'+typeSecond+'</td>';
+        		/*data+='<td class="textc">'+notice.conrtent+'</td>';*/
+        		var createDt='';
+        		if(StringUtil.isNotBlank(notice.createDt)){
+        			createDt=new Date(notice.createDt).toYYYYMMDD();
+        		}
+        		data+='<td class="textc">'+createDt+'</td>';
+        	/*	data+='<td class="textc">'+notice.noticeCode+'</td>';*/
+        		data+='<td class="textc">';
+        		data+='<div class="positionr listOperaters">';
+        		data+='		<a href="javascript:void(0);"  class="icon-large dlblock w16 h16"><img src="'+resourcePath+'/images/angle-down.png"/></a>';
+        		data+='		<div class="ops_box ops_itemDiv positiona clearfix whitebg">';
+        		data+='			<ul>';
+        		/*data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showNoticeDetails('+notice.id+')" class="btn btn-primary fa fa-edit ops_more f12">编辑</a></li>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="initDeleteNotice('+notice.id+')" class="btn btn-primary fa fa-remove ops_more f12">删除</a></li>';*/
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showNoticeDetails('+notice.id+')" class="btn btn-primary fa fa-detail ops_more f12">明细</a></li>';
+        	    data+='			</ul>';
+              data+='		</div>';
+        	    data+='</div>';
+        	    data+='</td>';
+        	    data+='</tr>';
+        	    $('#data_content').append(data);
+        	});
+        	//分页
+        	$('#pageCount').html(result.pageCount);
+      	$('#currPage').html(result.currPage);
+          $('#totalCount').html(result.count);
+           	//设置分页
+           	pageIndex=result.currPage;
+			$('#pagination').pagination({
+				pageCount: result.pageCount,
+				jump: true,
+				coping: true,
+				jump: true,
+				homePage: '首页',
+				endPage: '末页',
+				prevContent: '上页',
+				nextContent: '下页',
+				current:result.currPage,
+				callback:function(api){
+					pageIndex=api.getCurrent();
+					queryNotice(api.getCurrent());
+				}
+			});
+        } 
+    });  
+	//表头列不选中
+	$("#allCheck").find("span").removeClass('checked');
+}
+
+//初始化新增
+function initAddNotice(){
+	window.location=ctx+'/notice/queryNoticeDetails?pageIndex='+pageIndex;
+}
+
+//初始化修改
+function showNoticeDetails(id){
+	window.location=ctx+'/notice/queryNoticeDetails?id='+id+'&pageIndex='+pageIndex;
+}
+
+//初始化删除
+function initDeleteNotice(id){
+	
+		layer.open({
+		type: 1,
+		closeBtn: 1,		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r'	, //按钮居中
+		shade: 0.3 ,//不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteNotice(id,true);
+		}
+	});
+}
+
+//删除
+function deleteNotice(id,showMsg){
+	$.ajax({
+		url:ctx+'/notice/deleteNotice',
+		data:[{
+			name:'id',
+			value:id
+		}],
+		type:'POST',
+		dataType:'json',
+		success:function(){
+			queryNotice(pageIndex);
+			if(showMsg){
+				layer.msg('删除成功!');	
+			}
+		}
+	});
+}
+//头部编辑
+function initEditNotice(){
+	var count=0;
+	var id=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+        	 id=$(this).data('id');
+         }
+    })
+    if(count>1){
+    	layer.msg('只能选中一行记录进行操作!');
+    	return ;
+    }
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	 if(id>0){
+	  showNoticeDetails(id);
+	 }
+}
+//头部删除
+function initBatchDeleteNotice(){
+	var count=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+         }
+    })
+	
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	
+
+	layer.open({
+		type: 1,
+		closeBtn: 1,
+		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r', //按钮居中
+		shade: 0.3, //不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteBatchNotice();
+		}
+	});
+	
+}
+//批量删除
+function deleteBatchNotice(){
+	
+	$(".checkeBox").find("span").each(function () {
+        if($(this).hasClass("checked")){
+        	var id=$(this).data('id');
+        	deleteNotice(id,false);
+        	layer.msg('删除成功!');	
+        }
+   })
+}
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/promoter/userAppDetails.js b/pluss-manage-page/src/main/resources/static/resources/promoter/userAppDetails.js
new file mode 100644
index 0000000..9303cae
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/promoter/userAppDetails.js
@@ -0,0 +1,63 @@
+/**
+ * create by robot 
+ * date Thu Sep 12 16:16:37 CST 2019 
+ */ 
+
+$(document).ready(function(){
+	//form表单样式
+	layui.use(['layer', 'form'], function() {
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+	//li 切换事件
+	$(".nav-tabs>li").click(function() {
+		var index = $(".nav-tabs>li").index(this);
+		$(this).addClass("active").siblings("li").removeClass("active");
+		
+	})
+	//弹出一个提示层
+	// $('.fa-save').on('click', function() {
+	// 	saveUserApp();
+	// });
+
+	//绑定标签栏事件
+	$(document).on('click','.nav-tabs li',function(){
+
+		var action =$(this).data('action');
+		 switch (action) {
+			case "base"://基本资料
+				goBase();
+				break;  
+			case "functions"://多功能
+				goFunctions();
+				break;
+			case "extends"://扩展    
+				goExtends();         
+				break;           
+		 }
+	})
+
+	//加载第一个标签
+	$('.nav-tabs li').eq(0).click();
+	
+});
+
+
+//跳转基本信息 
+function goBase(){
+	var url=ctx+'/promoter/queryUserAppBaseInfo?id='+$('#userAppId').val();
+	$('.tab-content').load(url);
+	              
+}
+//跳转多功能输入
+function goFunctions(){ 
+	var url=ctx+'/promoter/queryUserAppFunctionsInfo?id='+$('#userAppId').val();
+	$('.tab-content').load(url);  
+	
+}
+//跳转到扩展   
+function goExtends(){
+	var url=ctx+'/promoter/queryUserAppExtendsInfo?id='+$('#userAppId').val();
+	$('.tab-content').load(url);          
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/resources/static/resources/promoter/userAppList.js b/pluss-manage-page/src/main/resources/static/resources/promoter/userAppList.js
new file mode 100644
index 0000000..1b94e55
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/promoter/userAppList.js
@@ -0,0 +1,340 @@
+/**
+ * create by robot 
+ * date Thu Sep 12 16:16:37 CST 2019 
+ */ 
+
+var pageIndex=1;
+$(document).ready(function(){
+	//调用查询
+	pageIndex=StringUtil.getQueryString('pageIndex');
+	if(pageIndex==undefined||pageIndex==null){
+		pageIndex=1;
+	}
+	//绑定hover操作
+	$(document).on('mouseenter','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").show();
+		var width=15;
+		$(this).children('div').find('li').each(function(){
+			//获取li宽度
+			width+=$(this).width();
+		});
+		$(this).children('div').width(width);
+	})
+	$(document).on('mouseleave','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").hide();
+	});
+
+	//日历控件
+	layui.use(['layer', 'laydate'], function() {
+		var layer = layui.layer;
+		laydate = layui.laydate;
+		laydate.render({
+		elem: '#date1' //指定元素
+		});
+		laydate.render({
+			elem: '#date2' //指定元素
+		});
+	});
+
+
+	//行选中事件
+	$("#allCheck").find("span").click(function() {
+		$(this).toggleClass('checked');
+		if($(this).hasClass('checked')){
+			//所有列选中
+		  $(".checker").find("span").each(function () {
+		         $(this).addClass("checked");
+		    })
+		}else{
+			//所有列取消选中
+			$(".checker").find("span").each(function () {
+				 $(this).removeClass("checked");
+		    })
+		}
+	});
+
+	//单个选中
+	$(document).on('click','.checkeBox span',function() {
+		$(this).toggleClass('checked');
+		//设置头部事件
+		var length=$('.checkeBox span').length;
+		var count=0;
+		$(".checkeBox").find("span").each(function () {
+	        if($(this).hasClass("checked")){
+	        	count++;
+	        }
+	   })
+		//全选
+	   if(count==length){
+		   $("#allCheck").find("span").addClass('checked');
+	   }else{
+		   $("#allCheck").find("span").removeClass('checked');
+	   }
+	})
+	//左右div高度相等
+	var left_content_height = $(".right-content").height();
+	$(".left-content").height(left_content_height+35);
+	var sub_left_height=$(".res-menu").height(left_content_height-60);
+});
+
+//初始化新增
+function initAddUserApp(){
+	window.location=ctx+'/promoter/queryUserAppDetails?pageIndex='+pageIndex;
+}
+
+
+//初始化审核
+function toExamine(id){
+	var htmlStr = '<div style="margin: 10px;"><label class="layui-form-label">理由：</label><textarea class="layui-textarea" id="certReason"></textarea></div>';
+	layer.open({
+		type:1,
+		title:'实名认证审核',
+		area: '350px;',
+		shade:0.3,
+		maxmin:true,
+		content:htmlStr,
+		btn:['通过','不通过'],
+		yes:function(){
+			var certReason = $("#certReason").val();
+			examine(3,id,certReason);
+		},
+		btn2:function(){
+			var certReason = $("#certReason").val();
+			if(StringUtil.isBlank(certReason)){
+				layer.msg('请填写不通过理由');
+				return;
+			}
+			examine(2,id,certReason);
+		}
+	})
+}
+
+function examine(status,id,certReason){
+	var url=ctx+'/promoter/toExamine';
+	$.ajax({  
+        url:url,  
+        type:"post", 
+        dataType:"json",  
+        data:{  
+        	"id":id,
+        	"status":status,
+        	"certReason":certReason
+        },  
+        success:function(result){
+        	queryUserApp(pageIndex);
+        	layer.msg(result.resultMessage);
+        	setTimeout(function (){layer.closeAll();},1500);
+        }
+	})
+}
+
+//初始化删除
+function initDeleteUserApp(id){
+	
+		layer.open({
+		type: 1,
+		closeBtn: 1,		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r'	, //按钮居中
+		shade: 0.3 ,//不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteUserApp(id,true);
+		}
+	});
+}
+
+//删除
+function deleteUserApp(id,showMsg){
+	$.ajax({
+		url:ctx+'/promoter/deleteUserApp',
+		data:[{
+			name:'id',
+			value:id
+		}],
+		type:'POST',
+		dataType:'json',
+		success:function(){
+			queryUserApp(pageIndex);
+			if(showMsg){
+				layer.msg('删除成功!');	
+			}
+		}
+	});
+}
+//头部编辑
+function initEditUserApp(){
+	var count=0;
+	var id=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+        	 id=$(this).data('id');
+         }
+    })
+    if(count>1){
+    	layer.msg('只能选中一行记录进行操作!');
+    	return ;
+    }
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	 if(id>0){
+	  showUserAppDetails(id);
+	 }
+}
+//头部删除
+function initBatchDeleteUserApp(){
+	var count=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+         }
+    })
+	
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	layer.open({
+		type: 1,
+		closeBtn: 1,
+		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r', //按钮居中
+		shade: 0.3, //不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteBatchUserApp();
+		}
+	});
+	
+}
+//批量删除
+function deleteBatchUserApp(){
+	
+	$(".checkeBox").find("span").each(function () {
+        if($(this).hasClass("checked")){
+        	var id=$(this).data('id');
+        	deleteUserApp(id,false);
+        	layer.msg('删除成功!');	
+        }
+   })
+}
+
+
+function goLevel(id,levelCode) {
+	let url = ctx + "/promoter/getLevelConfig/"+id
+	$.get(url,function (res){
+		if(res.code != 200){
+			return layer.msg(res.message,{icon:2});
+		}
+		var index = layer.open({
+			type: 1
+			,shade: 0.5
+			,title: '升级'
+			,maxmin: true
+			,content: $("#upgrade").html()
+			,area: ['400px', '400px']
+			,btn: ['保存','取消',]
+			,shadeClose: true
+			,btn1: function(index, layero) {
+				if(!$("#leveCode").val()){
+					layer.msg("请选择等级!");
+					return;
+				}
+				layer.close(index);
+				LevelV2(id,$("#leveCode").val());
+			}
+			,btn2: function(index, layero){
+				layer.close(index);
+			}
+			,success:function () {
+				let dom = $("#leveCode");
+				let data = res.data;
+				let content = "<option value=''>请选择</option>";
+				dom.empty();
+				if(data.length > 0){
+					$.each(data,function (key,val){
+						content += "<option value='"+val.levelCode+"'>"+val.levelName+"</option>"
+					})
+				}
+				$("#form2").append('<input name="id" id="upGradeId" hidden value="'+id+'">')
+				dom.append(content);
+			}
+		});
+		form.render('select');
+	})
+}
+
+function LevelV2(id,levelCode){
+	var url = ctx+'/promoter/goLevelV2';
+	$.ajax({
+		url:url,
+		type:"post",
+		dataType:"json",
+		data:{
+			"id":id,
+			"levelCode":levelCode,
+		},
+		success:function(res){
+			queryUserApp(pageIndex);
+			layer.msg(res.message,{icon:res.code == 200 ? 1: 2});
+			setTimeout(function (){layer.closeAll();},1500);
+		}
+	})
+}
+
+// function Level(id,leveleUser){
+// 	if(StringUtil.isNotJustInteger(leveleUser)){
+// 		if(StringUtil.isBlank(leveleUser)){
+// 			layer.msg('请选择等级');
+// 			return;
+// 		}
+// 	}
+//
+// 	var url=ctx+'/promoter/goLevel';
+// 	$.ajax({
+//         url:url,
+//         type:"post",
+//         dataType:"json",
+//         data:{
+//         	"id":id,
+//         	"level":leveleUser,
+//         },
+//         success:function(result){
+//         	queryUserApp(pageIndex);
+//         	layer.msg(result.msg);
+//         	setTimeout(function (){layer.closeAll();},1500);
+//         }
+// 	})
+// }
+
+//时间格式化处理
+function dateFtt(fmt,date)   
+{ //author: meizz   
+  var o = {   
+    "M+" : date.getMonth()+1,                 //月份   
+    "d+" : date.getDate(),                    //日   
+    "h+" : date.getHours(),                   //小时   
+    "m+" : date.getMinutes(),                 //分   
+    "s+" : date.getSeconds(),                 //秒   
+    "q+" : Math.floor((date.getMonth()+3)/3), //季度   
+    "S"  : date.getMilliseconds()             //毫秒   
+  };   
+  if(/(y+)/.test(fmt))   
+    fmt=fmt.replace(RegExp.$1, (date.getFullYear()+"").substr(4 - RegExp.$1.length));   
+  for(var k in o)   
+    if(new RegExp("("+ k +")").test(fmt))   
+  fmt = fmt.replace(RegExp.$1, (RegExp.$1.length==1) ? (o[k]) : (("00"+ o[k]).substr((""+ o[k]).length)));   
+  return fmt;   
+}
+
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/qrCode/qrCodeList.js b/pluss-manage-page/src/main/resources/static/resources/qrCode/qrCodeList.js
new file mode 100644
index 0000000..34b4c12
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/qrCode/qrCodeList.js
@@ -0,0 +1,323 @@
+/**
+ * create by robot
+ * date Thu Sep 12 16:16:37 CST 2019
+ */
+
+var pageIndex=1;
+$(document).ready(function(){
+	//调用查询
+	pageIndex=StringUtil.getQueryString('pageIndex');
+	if(pageIndex==undefined||pageIndex==null){
+		pageIndex=1;
+	}
+	qrCodeQueryInit(pageIndex);
+
+	$(document).on('mouseenter','.listOperaters',function(){
+        $(this).children(".ops_itemDiv").show();
+        var width=15;
+        $(this).children('div').find('li').each(function(){
+            //获取li宽度
+            width+=$(this).width();
+        });
+        $(this).children('div').width(width);
+    })
+    $(document).on('mouseleave','.listOperaters',function(){
+        $(this).children(".ops_itemDiv").hide();
+    });
+
+
+	layui.use(['layer', 'laydate'], function() {
+        var layer = layui.layer;
+    });
+
+    //行选中事件
+    $("#allCheck").find("span").click(function() {
+        $(this).toggleClass('checked');
+        if($(this).hasClass('checked')){
+            //所有列选中
+          $(".checker").find("span").each(function () {
+                 $(this).addClass("checked");
+            })
+        }else{
+            //所有列取消选中
+            $(".checker").find("span").each(function () {
+                 $(this).removeClass("checked");
+            })
+        }
+    });
+
+
+    //单个选中
+    $(document).on('click','.checkeBox span',function() {
+        $(this).toggleClass('checked');
+        //设置头部事件
+        var length=$('.checkeBox span').length;
+        var count=0;
+        $(".checkeBox").find("span").each(function () {
+            if($(this).hasClass("checked")){
+                count++;
+            }
+       })
+        //全选
+       if(count==length){
+           $("#allCheck").find("span").addClass('checked');
+       }else{
+           $("#allCheck").find("span").removeClass('checked');
+       }
+    })
+    //左右div高度相等
+    var left_content_height = $(".right-content").height();
+    $(".left-content").height(left_content_height+35);
+    var sub_left_height=$(".res-menu").height(left_content_height-60);
+});
+
+//查询
+function qrCodeQueryInit(index){
+	if(typeof(index)=='undefined'){
+		index=1;
+    }
+    var url=ctx+'/qrCode/queryQrCodeByPage';
+    $.ajax({
+        url:url,
+        type:"post",
+        dataType:"json",
+        data:{
+            "currPage":index,
+            "qrNo":$('#qrNo').val(),
+            "status":$('#status').val()
+        },
+        success:function(result){
+            $('#data_content').empty();
+            var presentPage=result.currPage;
+            var header='';
+            $.each(result.qrCodeList,function(k,v){
+                var orderNumber=(presentPage-1)*12+k+1;
+                var qrCode=v;
+                var data='';
+                data+='<tr class="odd">';
+                data+='<td class="textc">';
+                data+='		 <div class="checker checkeBox">';        		data+='		 <span class=""  data-id="'+qrCode.id+'"><input type="checkbox"  value=""></span>';
+                data+='		</div>';
+                data+='</td>';
+                data+='<td class="textc">'+orderNumber+'</td>';
+                data+='<td class="textc">NO.'+qrCode.qrNo+'</td>';
+                data+='<td class="textc">'+(qrCode.orderNo == '' || qrCode.orderNo == null  ? '' : qrCode.orderNo)+'</td>';
+                data+='<td class="textc">'+(qrCode.buyMercId == '' || qrCode.buyMercId == null   ? '' : qrCode.buyMercId)+'</td>';
+                data+='<td class="textc">'+(qrCode.buyMercName == '' || qrCode.buyMercName == null   ? '' : qrCode.buyMercName)+'</td>';
+                data+='<td class="textc">'+(qrCode.actMercId == '' || qrCode.actMercId == null   ? '' : qrCode.actMercId)+'</td>';
+                data+='<td class="textc">'+(qrCode.actMercName == '' || qrCode.actMercName == null   ? '' : qrCode.actMercName)+'</td>';
+                var status='';
+                if(qrCode.status=='1'){
+                    status='未出售';
+                }else if(qrCode.status=='2'){
+                    status='已出售';
+                }else{
+                    status='已激活';
+                }
+                data+='<td class="textc">'+status+'</td>';
+                var createTime='';
+                if(StringUtil.isNotBlank(qrCode.createTime)){
+                    createTime= dateFtt("yyyy-MM-dd hh:mm:ss",new Date(qrCode.createTime));
+                }
+                data+='<td class="textc">'+createTime+'</td>';
+                data+='<td class="textc">';
+                data+='<div class="positionr listOperaters">';
+                data+='		<a href="javascript:void(0);"  class="icon-large dlblock w16 h16"><img src="'+resourcePath+'/images/angle-down.png"/></a>';
+                data+='		<div class="ops_box ops_itemDiv positiona clearfix whitebg">';
+                data+='			<ul>';
+//                data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showQuestionsAnswersDetails('+qrCode.id+')" class="layui-btn fa fa-edit ops_more f12">编辑</a></li>';
+                data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="deleteOne('+qrCode.id+')" class="layui-btn layui-btn-radius layui-btn-sm layui-btn-danger fa fa-remove ops_more f12">删除</a></li>';
+/*        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showQuestionsAnswersReadDetails('+questionsAnswers.id+')" class="layui-btn fa fa-detail ops_more f12">明细</a></li>';*/
+                data+='			</ul>';
+                data+='		</div>';
+                data+='</div>';
+                data+='</td>';
+                data+='</tr>';
+                $('#data_content').append(data);
+                //分页
+                $('#pageCount').html(result.pageCount);
+                $('#currPage').html(result.currPage);
+                $('#totalCount').html(result.count);
+                //设置分页
+                pageIndex=result.currPage;
+                $('#pagination').pagination({
+                    pageCount: result.pageCount,
+                    jump: true,
+                    coping: true,
+                    jump: true,
+                    homePage: '首页',
+                    endPage: '末页',
+                    prevContent: '上页',
+                    nextContent: '下页',
+                    current:result.currPage,
+                    callback:function(api){
+                        pageIndex=api.getCurrent();
+                        qrCodeQueryInit(api.getCurrent());
+                    }
+                });
+            });
+        }
+    });
+	//表头列不选中
+	$("#allCheck").find("span").removeClass('checked');
+}
+function dateFtt(fmt,date)
+{ //author: meizz
+  var o = {
+    "M+" : date.getMonth()+1,                 //月份
+    "d+" : date.getDate(),                    //日
+    "h+" : date.getHours(),                   //小时
+    "m+" : date.getMinutes(),                 //分
+    "s+" : date.getSeconds(),                 //秒
+    "q+" : Math.floor((date.getMonth()+3)/3), //季度
+    "S"  : date.getMilliseconds()             //毫秒
+  };
+  if(/(y+)/.test(fmt))
+    fmt=fmt.replace(RegExp.$1, (date.getFullYear()+"").substr(4 - RegExp.$1.length));
+  for(var k in o)
+    if(new RegExp("("+ k +")").test(fmt))
+  fmt = fmt.replace(RegExp.$1, (RegExp.$1.length==1) ? (o[k]) : (("00"+ o[k]).substr((""+ o[k]).length)));
+  return fmt;
+}
+
+function initAddQrCode(){
+    $("#qrNoInput").val("");
+    layer.open({
+        type: 1,
+        closeBtn: 1,		title: '添加',
+        offset: 'm', //具体配置参考：offset参数项
+        area: ['400px', '180px'],
+        content: $("#addForm"),
+        btn: ['保存','取消'],
+        btnAlign: 'r'	, //按钮居中
+        shade: 0.3 ,//不显示遮罩
+        yes: function() {
+            saveQrCode();
+        }
+    });
+}
+function initBatchAddQrde(){
+  $("#qrNoStartInput").val('');
+  $("#qrNoEndInput").val('');
+    layer.open({
+        type: 1,
+        closeBtn: 1,
+        title: '批量添加',
+        offset: 'm', //具体配置参考：offset参数项
+        area: ['500px', '180px'],
+        content: $("#addBathForm"),
+        btn: ['保存','取消'],
+        btnAlign: 'r'	, //按钮居中
+        shade: 0.3 ,//不显示遮罩
+        yes: function() {
+            saveBatchQrCode();
+        }
+    });
+}
+
+function saveQrCode(){
+	$.ajax({
+		url:ctx+'/qrCode/saveQrCode',
+		data:{
+			qrNo:$("#qrNoInput").val(),
+		},
+		type:'POST',
+		dataType:'json',
+		success:function(res){
+			if(res.resultCode == '1'){
+			    qrCodeQueryInit(pageIndex);
+			    layer.closeAll();
+			    $("#qrNoInput").val('');
+				layer.msg(res.resultMessage);
+			}else{
+			    layer.msg(res.resultMessage);
+			}
+		}
+	});
+}
+function saveBatchQrCode(){
+	$.ajax({
+		url:ctx+'/qrCode/saveBatchQrCode',
+		data:{
+			qrNoStart:$("#qrNoStartInput").val(),
+			qrNoEnd:$("#qrNoEndInput").val()
+		},
+		type:'POST',
+		dataType:'json',
+		success:function(res){
+			if(res.resultCode == '1'){
+			    qrCodeQueryInit(pageIndex);
+			    layer.closeAll();
+			    $("#qrNoStartInput").val('');
+			    $("#qrNoEndInput").val('')
+				layer.msg(res.resultMessage);
+			}else{
+			    layer.msg(res.resultMessage);
+			}
+		}
+	});
+}
+function initBatchDeleteCode(){
+    var count=0;
+    $(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+             count++;
+         }
+    })
+     if(count==0){
+        layer.msg('请选中一行记录!');
+        return ;
+      }
+
+    var idArr = new Array();
+    $(".checkeBox").find("span").each(function () {
+          if($(this).hasClass("checked")){
+            var id=$(this).data('id');
+            idArr.push(id);
+          }
+     })
+    var diglog = layer.confirm('确认删除选中的记录吗？', {
+     btn: ['确认', '取消'] //可以无限个按钮
+     ,btn1: function(index, layero){
+       layer.close(diglog);
+     }
+   }, function(index, layero){
+        deleteQrCode(idArr)
+   });
+}
+function deleteQrCode(ids){
+    $.ajax({
+        url:ctx+'/qrCode/deleteBatchQrCode',
+        data:{
+            ids:ids
+        },
+        type:'POST',
+        dataType:'json',
+        traditional: true,
+        success:function(res){
+            if(res.resultCode == '1'){
+                qrCodeQueryInit(pageIndex);
+                layer.closeAll();
+                $("#qrNoStartInput").val('');
+                $("#qrNoEndInput").val('')
+                layer.msg(res.resultMessage);
+            }else{
+                layer.msg(res.resultMessage);
+            }
+        }
+    });
+}
+
+function deleteOne(id){
+    var ids = new Array();
+    ids.push(id);
+    var diglog = layer.confirm('确认删除此条记录吗？', {
+     btn: ['确认', '取消'] //可以无限个按钮
+     ,btn1: function(index, layero){
+       layer.close(diglog);
+     }
+   }, function(index, layero){
+        deleteQrCode(ids)
+   });
+}
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/questionsAnswers/questionsAnswersDetails.js b/pluss-manage-page/src/main/resources/static/resources/questionsAnswers/questionsAnswersDetails.js
new file mode 100644
index 0000000..4a3b795
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/questionsAnswers/questionsAnswersDetails.js
@@ -0,0 +1,122 @@
+/**
+ * create by robot 
+ * date Thu Sep 12 16:16:37 CST 2019 
+ */ 
+
+$(document).ready(function(){
+	//form表单样式
+	layui.use(['layer', 'form'], function() {
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+	//li 切换事件
+	$(".nav-tabs>li").click(function() {
+		var index = $(".nav-tabs>li").index(this);
+		$(this).addClass("active").siblings("li").removeClass("active");
+		
+	})
+	//弹出一个提示层
+	$('.fa-save').on('click', function() {
+		saveQuestionsAnswers();
+	});
+
+	//绑定标签栏事件
+	$(document).on('click','.nav-tabs li',function(){
+
+		var action =$(this).data('action');
+		 switch (action) {
+			case "base"://基本资料
+				goBase();
+				break;  
+			case "functions"://多功能
+				goFunctions();
+				break;
+			case "extends"://扩展    
+				goExtends();         
+				break;           
+		 }
+	})
+
+	//加载第一个标签
+	$('.nav-tabs li').eq(0).click();
+	
+});
+
+
+//跳转基本信息 
+function goBase(){
+	var url=ctx+'/questionsAnswers/queryQuestionsAnswersBaseInfo?id='+$('#questionsAnswersId').val();
+	$('.tab-content').load(url);
+	              
+}
+//跳转多功能输入
+function goFunctions(){ 
+	var url=ctx+'/questionsAnswers/queryQuestionsAnswersFunctionsInfo?id='+$('#questionsAnswersId').val();
+	$('.tab-content').load(url);  
+	
+}
+//跳转到扩展   
+function goExtends(){
+	
+	var url=ctx+'/questionsAnswers/queryQuestionsAnswersExtendsInfo?id='+$('#questionsAnswersId').val();
+	$('.tab-content').load(url);          
+}  
+  
+
+ 
+//保存
+function saveQuestionsAnswers(){
+	var question=$("#question").val();
+//	var answer=UM.getEditor('answer').getContent().trim();
+	var answer=$("#answer").val();
+	var seq=$("#seq").val();
+	var status=$("#status option:selected").val();
+	if(StringUtil.isBlank(question)){
+		layer.msg('请输入问题');
+		return;
+	}
+	if(StringUtil.isBlank(answer)){
+		layer.msg('请输入回答');
+		return;
+	}
+	
+	if(StringUtil.isNotJustInteger(seq)){
+		if(StringUtil.isBlank(seq)){
+			layer.msg('请输入排序');
+			return;
+		}
+		layer.msg('请输入正确的排序格式(正整数)');
+		return;
+	}
+	
+	if(StringUtil.isBlank(status)){
+		layer.msg('请选择状态');
+		return;
+	}
+	$(".fa-save").attr("disabled","disabled");
+	$('.fa-save').html('正在保存...')
+	$.ajax({
+		url:ctx+"/questionsAnswers/saveQuestionsAnswers",
+		type:"POST",
+		dataType:'json',
+		data:$("#data_form").serializeArray(),
+		complete:function(){
+			$(".fa-save").removeAttr("disabled");
+			$('.fa-save').html('保存')
+		},        
+		success:function(service){ 
+		
+			layer.confirm('保存成功,是否前往列表？', {
+				  btn: ['确认','取消'] //按钮
+				}, function(){
+					$('#goback span').trigger('click'); 
+				}, function(){         
+					layer.closeAll();
+			});  
+			
+		}
+	});  
+}
+ 
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/questionsAnswers/questionsAnswersReadDetails.js b/pluss-manage-page/src/main/resources/static/resources/questionsAnswers/questionsAnswersReadDetails.js
new file mode 100644
index 0000000..b65839c
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/questionsAnswers/questionsAnswersReadDetails.js
@@ -0,0 +1,122 @@
+/**
+ * create by robot 
+ * date Thu Sep 12 16:16:37 CST 2019 
+ */ 
+
+$(document).ready(function(){
+	//form表单样式
+	layui.use(['layer', 'form'], function() {
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+	//li 切换事件
+	$(".nav-tabs>li").click(function() {
+		var index = $(".nav-tabs>li").index(this);
+		$(this).addClass("active").siblings("li").removeClass("active");
+		
+	})
+	//弹出一个提示层
+	$('.fa-save').on('click', function() {
+		saveQuestionsAnswers();
+	});
+
+	//绑定标签栏事件
+	$(document).on('click','.nav-tabs li',function(){
+
+		var action =$(this).data('action');
+		 switch (action) {
+			case "base"://基本资料
+				goBase();
+				break;  
+			case "functions"://多功能
+				goFunctions();
+				break;
+			case "extends"://扩展    
+				goExtends();         
+				break;           
+		 }
+	})
+
+	//加载第一个标签
+	$('.nav-tabs li').eq(0).click();
+	
+});
+
+
+//跳转基本信息 
+function goBase(){
+	var url=ctx+'/questionsAnswers/queryQuestionsAnswersBaseReadInfo?id='+$('#questionsAnswersId').val();
+	$('.tab-content').load(url);
+	              
+}
+//跳转多功能输入
+function goFunctions(){ 
+	var url=ctx+'/questionsAnswers/queryQuestionsAnswersFunctionsInfo?id='+$('#questionsAnswersId').val();
+	$('.tab-content').load(url);  
+	
+}
+//跳转到扩展   
+function goExtends(){
+	
+	var url=ctx+'/questionsAnswers/queryQuestionsAnswersExtendsInfo?id='+$('#questionsAnswersId').val();
+	$('.tab-content').load(url);          
+}  
+  
+
+ 
+//保存
+function saveQuestionsAnswers(){
+	var question=$("#question").val();
+//	var answer=UM.getEditor('answer').getContent().trim();
+	var answer=$("#answer").val();
+	var seq=$("#seq").val();
+	var status=$("#status option:selected").val();
+	if(StringUtil.isBlank(question)){
+		layer.msg('请输入问题');
+		return;
+	}
+	if(StringUtil.isBlank(answer)){
+		layer.msg('请输入回答');
+		return;
+	}
+	
+	if(StringUtil.isNotJustInteger(seq)){
+		if(StringUtil.isBlank(seq)){
+			layer.msg('请输入排序');
+			return;
+		}
+		layer.msg('请输入正确的排序格式(正整数)');
+		return;
+	}
+	
+	if(StringUtil.isBlank(status)){
+		layer.msg('请选择状态');
+		return;
+	}
+	$(".fa-save").attr("disabled","disabled");
+	$('.fa-save').html('正在保存...')
+	$.ajax({
+		url:ctx+"/questionsAnswers/saveQuestionsAnswers",
+		type:"POST",
+		dataType:'json',
+		data:$("#data_form").serializeArray(),
+		complete:function(){
+			$(".fa-save").removeAttr("disabled");
+			$('.fa-save').html('保存')
+		},        
+		success:function(service){ 
+		
+			layer.confirm('保存成功,是否前往列表？', {
+				  btn: ['确认','取消'] //按钮
+				}, function(){
+					$('#goback span').trigger('click'); 
+				}, function(){         
+					layer.closeAll();
+			});  
+			
+		}
+	});  
+}
+ 
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/staff/userAppDetails.js b/pluss-manage-page/src/main/resources/static/resources/staff/userAppDetails.js
new file mode 100644
index 0000000..6bc7e12
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/staff/userAppDetails.js
@@ -0,0 +1,178 @@
+/**
+ * create by robot 
+ * date Thu Sep 12 16:16:37 CST 2019 
+ */ 
+
+$(document).ready(function(){
+	//form表单样式
+	layui.use(['layer', 'form'], function() {
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+	//li 切换事件
+	$(".nav-tabs>li").click(function() {
+		var index = $(".nav-tabs>li").index(this);
+		$(this).addClass("active").siblings("li").removeClass("active");
+		
+	})
+	//弹出一个提示层
+	$('.fa-save').on('click', function() {
+		saveUserApp();
+	});
+
+	//绑定标签栏事件
+	$(document).on('click','.nav-tabs li',function(){
+
+		var action =$(this).data('action');
+		 switch (action) {
+			case "base"://基本资料
+				goBase();
+				break;  
+			case "functions"://多功能
+				goFunctions();
+				break;
+			case "extends"://扩展    
+				goExtends();         
+				break;           
+		 }
+	})
+
+	//加载第一个标签
+	$('.nav-tabs li').eq(0).click();
+	
+});
+
+
+//跳转基本信息 
+function goBase(){
+	var url=ctx+'/staff/queryUserAppBaseInfo?id='+$('#userAppId').val();
+	$('.tab-content').load(url);
+	              
+}
+//跳转多功能输入
+function goFunctions(){ 
+	var url=ctx+'/staff/queryUserAppFunctionsInfo?id='+$('#userAppId').val();
+	$('.tab-content').load(url);  
+	
+}
+//跳转到扩展   
+function goExtends(){
+	
+	var url=ctx+'/staff/queryUserAppExtendsInfo?id='+$('#userAppId').val();
+	$('.tab-content').load(url);          
+}  
+  
+
+ 
+//保存
+function saveUserApp(){
+	//alert(1);
+	var isAdmin=$("#isAdmin").val();
+	if(isAdmin=='1'){
+		var merchantCode=$("#merchantCode").val();
+		if(StringUtil.isBlank(merchantCode)){
+			layer.msg('请选择商户');
+			return;
+		}
+	}
+	var storeId=$("#storeId").val();
+	if(StringUtil.isBlank(storeId)){
+		layer.msg('请选择门店');
+		return;
+	}
+	var loginName=$("#loginName").val();
+	if(StringUtil.isBlank(loginName)){
+		layer.msg('请输入账号');
+		return;
+	}
+	var userName=$("#userName").val();
+	if(StringUtil.isBlank(userName)){
+		layer.msg('请输入姓名');
+		return;
+	}
+	var phone=$("#phone").val();
+	if(StringUtil.isNotPhone(phone)){
+		if(StringUtil.isBlank(phone)){
+			layer.msg('请输入手机号');
+			return;
+		}
+		layer.msg('请输入正确的手机号');
+		return;
+	}
+	var password=$("#password").val();
+	if(StringUtil.isBlank(password)){
+		layer.msg('请输入密码');
+		return;
+	}
+	var verifyPassword=$("#verifyPassword").val();
+	if(StringUtil.isBlank(verifyPassword)){
+		layer.msg('请再次输入密码');
+		return;
+	}
+	if(password!=verifyPassword){
+		layer.msg('两次密码不一致！');
+		return;
+	}
+	$(".fa-save").attr("disabled","disabled");
+	$('.fa-save').html('正在保存...')
+	
+	console.log($("#data_form").serializeArray());
+	
+	$.ajax({
+		url:ctx+"/staff/saveStaff",
+		type:"POST",
+		dataType:'json',
+		data:$("#data_form").serializeArray(),
+		complete:function(){
+			$(".fa-save").removeAttr("disabled");
+			$('.fa-save').html('保存')
+		},        
+		success:function(service){ 
+			if(service.code=='1'){
+				layer.confirm('保存成功,是否前往列表？', {
+					  btn: ['确认','取消'] //按钮
+					}, function(){
+						$('#goback span').trigger('click'); 
+					}, function(){         
+						layer.closeAll();
+				}); 
+			}else if(service.code=='0'){
+				layer.msg(service.msg);
+			}
+		}
+	});  
+}
+
+//onchange商户
+$(function(){
+	layui.use(['layer', 'form'], function() {
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+		form.on('select(selectMerchantCode)', function(data){
+			var merchantCode=data.value;
+			$.ajax({
+				url:ctx+'/merchantMenber/getStoreByMerchantCode',
+				type:'post',
+				dataType:'json',
+				data:{
+					'merchantCode':merchantCode,
+				},
+				success:function(result){
+					var storeList=result.merchantStoreList;
+					$("#storeId").empty();
+					var data='';
+					data+='<option value="">请选择</option>';
+					for (var i = 0; i < storeList.length; i++) {
+						data+='<option value='+storeList[i].storeId+'>'+storeList[i].storeName+'</option>'
+					}
+					$("#storeId").append(data);
+					form.render("select");
+				}
+			})
+		})
+	})
+});
+ 
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/staff/userAppList.js b/pluss-manage-page/src/main/resources/static/resources/staff/userAppList.js
new file mode 100644
index 0000000..7b6bd2c
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/staff/userAppList.js
@@ -0,0 +1,146 @@
+/**
+ * create by robot 
+ * date Thu Sep 12 16:16:37 CST 2019 
+ */ 
+
+var pageIndex=1;
+$(document).ready(function(){
+	//调用查询
+	pageIndex=StringUtil.getQueryString('pageIndex');
+	if(pageIndex==undefined||pageIndex==null){
+		pageIndex=1;
+	}
+	//绑定hover操作
+	$(document).on('mouseenter','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").show();
+		var width=15;
+		$(this).children('div').find('li').each(function(){
+			//获取li宽度
+			width+=$(this).width();
+		});
+		$(this).children('div').width(width);
+	})
+	$(document).on('mouseleave','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").hide();
+	});
+
+	//日历控件
+	layui.use(['layer', 'laydate'], function() {
+		var layer = layui.layer;
+		laydate = layui.laydate;
+		laydate.render({
+		elem: '#date1' //指定元素
+		});
+		laydate.render({
+			elem: '#date2' //指定元素
+		});
+	});
+
+
+	//行选中事件
+	$("#allCheck").find("span").click(function() {
+		$(this).toggleClass('checked');
+		if($(this).hasClass('checked')){
+			//所有列选中
+		  $(".checker").find("span").each(function () {
+		         $(this).addClass("checked");
+		    })
+		}else{
+			//所有列取消选中
+			$(".checker").find("span").each(function () {
+				 $(this).removeClass("checked");
+		    })
+		}
+	});
+
+	//单个选中
+	$(document).on('click','.checkeBox span',function() {
+		$(this).toggleClass('checked');
+		//设置头部事件
+		var length=$('.checkeBox span').length;
+		var count=0;
+		$(".checkeBox").find("span").each(function () {
+	        if($(this).hasClass("checked")){
+	        	count++;
+	        }
+	   })
+		//全选
+	   if(count==length){
+		   $("#allCheck").find("span").addClass('checked');
+	   }else{
+		   $("#allCheck").find("span").removeClass('checked');
+	   }
+	})
+	//左右div高度相等
+	var left_content_height = $(".right-content").height();
+	$(".left-content").height(left_content_height+35);
+	var sub_left_height=$(".res-menu").height(left_content_height-60);
+});
+
+
+//头部编辑
+function initEditUserApp(){
+	var count=0;
+	var id=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+        	 id=$(this).data('id');
+         }
+    })
+    if(count>1){
+    	layer.msg('只能选中一行记录进行操作!');
+    	return ;
+    }
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	 if(id>0){
+	  showUserAppDetails(id);
+	 }
+}
+//头部删除
+function initBatchDeleteUserApp(){
+	var count=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+         }
+    })
+
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+
+
+	layer.open({
+		type: 1,
+		closeBtn: 1,
+		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r', //按钮居中
+		shade: 0.3, //不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteBatchUserApp();
+		}
+	});
+
+}
+//批量删除
+function deleteBatchUserApp(){
+
+	$(".checkeBox").find("span").each(function () {
+        if($(this).hasClass("checked")){
+        	var id=$(this).data('id');
+        	deleteUserApp(id,false);
+        	layer.msg('删除成功!');
+        }
+   })
+}
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/suggest/suggestDetails.js b/pluss-manage-page/src/main/resources/static/resources/suggest/suggestDetails.js
new file mode 100644
index 0000000..c94202b
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/suggest/suggestDetails.js
@@ -0,0 +1,96 @@
+/**
+ * create by robot 
+ * date Thu Sep 12 16:16:37 CST 2019 
+ */ 
+
+$(document).ready(function(){
+	//form表单样式
+	layui.use(['layer', 'form'], function() {
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+	//li 切换事件
+	$(".nav-tabs>li").click(function() {
+		var index = $(".nav-tabs>li").index(this);
+		$(this).addClass("active").siblings("li").removeClass("active");
+		
+	})
+	//弹出一个提示层
+	$('.fa-save').on('click', function() {
+		saveSuggest();
+	});
+
+	//绑定标签栏事件
+	$(document).on('click','.nav-tabs li',function(){
+
+		var action =$(this).data('action');
+		 switch (action) {
+			case "base"://基本资料
+				goBase();
+				break;  
+			case "functions"://多功能
+				goFunctions();
+				break;
+			case "extends"://扩展    
+				goExtends();         
+				break;           
+		 }
+	})
+
+	//加载第一个标签
+	$('.nav-tabs li').eq(0).click();
+	
+});
+
+
+//跳转基本信息 
+function goBase(){
+	var url=ctx+'/suggest/querySuggestBaseInfo?id='+$('#suggestId').val();
+	$('.tab-content').load(url);
+	              
+}
+//跳转多功能输入
+function goFunctions(){ 
+	var url=ctx+'/suggest/querySuggestFunctionsInfo?id='+$('#suggestId').val();
+	$('.tab-content').load(url);  
+	
+}
+//跳转到扩展   
+function goExtends(){
+	
+	var url=ctx+'/suggest/querySuggestExtendsInfo?id='+$('#suggestId').val();
+	$('.tab-content').load(url);          
+}  
+  
+
+ 
+//保存
+function saveSuggest(){
+	 
+	$(".fa-save").attr("disabled","disabled");
+	$('.fa-save').html('正在保存...')
+	$.ajax({
+		url:ctx+"/suggest/saveSuggest",
+		type:"POST",
+		dataType:'json',
+		data:$("#data_form").serializeArray(),
+		complete:function(){
+			$(".fa-save").removeAttr("disabled");
+			$('.fa-save').html('保存')
+		},        
+		success:function(service){ 
+		
+			layer.confirm('保存成功,是否前往列表？', {
+				  btn: ['确认','取消'] //按钮
+				}, function(){
+					$('#goback span').trigger('click'); 
+				}, function(){         
+					layer.closeAll();
+			});  
+			
+		}
+	});  
+}
+ 
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/suggest/suggestList.js b/pluss-manage-page/src/main/resources/static/resources/suggest/suggestList.js
new file mode 100644
index 0000000..a53f863
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/suggest/suggestList.js
@@ -0,0 +1,345 @@
+/**
+ * create by robot 
+ * date Thu Sep 12 16:16:37 CST 2019 
+ */ 
+
+var pageIndex=1;
+$(document).ready(function(){
+	//调用查询
+	pageIndex=StringUtil.getQueryString('pageIndex');
+	if(pageIndex==undefined||pageIndex==null){
+		pageIndex=1;
+	}
+	querySuggest(pageIndex);
+	//绑定hover操作
+	$(document).on('mouseenter','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").show();
+		var width=15;
+		$(this).children('div').find('li').each(function(){
+			//获取li宽度
+			width+=$(this).width();
+		});
+		$(this).children('div').width(width);
+	})
+	$(document).on('mouseleave','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").hide();
+	});
+
+	//日历控件
+	layui.use(['layer', 'laydate'], function() {
+		var layer = layui.layer;
+		laydate = layui.laydate;
+		laydate.render({
+		elem: '#date1' //指定元素
+		});
+		laydate.render({
+			elem: '#date2' //指定元素
+		});
+	});
+
+
+	//行选中事件
+	$("#allCheck").find("span").click(function() {
+		$(this).toggleClass('checked');
+		if($(this).hasClass('checked')){
+			//所有列选中
+		  $(".checker").find("span").each(function () {
+		         $(this).addClass("checked");
+		    })
+		}else{
+			//所有列取消选中
+			$(".checker").find("span").each(function () {
+				 $(this).removeClass("checked");
+		    })
+		}
+	});
+
+	//单个选中
+	$(document).on('click','.checkeBox span',function() {
+		$(this).toggleClass('checked');
+		//设置头部事件
+		var length=$('.checkeBox span').length;
+		var count=0;
+		$(".checkeBox").find("span").each(function () {
+	        if($(this).hasClass("checked")){
+	        	count++;
+	        }
+	   })
+		//全选
+	   if(count==length){
+		   $("#allCheck").find("span").addClass('checked');
+	   }else{
+		   $("#allCheck").find("span").removeClass('checked');
+	   }
+	})
+	//左右div高度相等
+	var left_content_height = $(".right-content").height();
+	$(".left-content").height(left_content_height+35);
+	var sub_left_height=$(".res-menu").height(left_content_height-60);
+	
+	$("#ssearch").on("click",function(){
+		querySuggest();
+	});
+});
+
+//查询
+function querySuggest(index){
+	if(typeof(index)=='undefined'){
+		index=1;
+	}
+	var url=ctx+'/suggest/querySuggestByPage';
+	$.ajax({  
+        url:url,  
+        type:"post", 
+        dataType:"json",  
+        data:{  
+        	"currPage":index,
+        	"phone":$("#content").val(),
+        	"status":$("#status option:selected").val(),
+        },  
+        success:function(result){  
+        	//渲染数据
+        	$('#data_content').empty();
+        	var presentPage=result.currPage;
+        	var header='';
+        	$.each(result.suggestList,function(i){
+        		var orderNumber=(presentPage-1)*12+i+1;
+        		var suggest=result.suggestList[i];
+        		var data='';
+        		data+='<tr class="odd">';
+        		data+='<td class="textc">';
+				data+='		 <div class="checker checkeBox">';        		data+='		 <span class=""  data-id="'+suggest.id+'"><input type="checkbox"  value=""></span>';
+        		data+='		</div>';
+        		data+='</td>';
+        		data+='<td class="textc">'+orderNumber+'</td>';
+        		data+='<td class="textc">'+suggest.content+'</td>';
+        		var createDt='';
+        		if(StringUtil.isNotBlank(suggest.createDt)){
+        			createDt= dateFtt("yyyy-MM-dd hh:mm",new Date(suggest.createDt));
+        		}
+        		data+='<td class="textc">'+createDt+'</td>';
+
+				var userPhone = "无";
+				if(undefined != suggest.userPhone){
+					userPhone = suggest.userPhone;
+				}
+				data+='<td class="textc">'+userPhone+'</td>';
+
+        		var phone = "无";
+        		if(undefined != suggest.phone){
+        			phone = suggest.phone;
+        		}
+        		data+='<td class="textc">'+phone+'</td>';
+        		if(suggest.status=='1'){
+        			data+='<td class="textc">已处理</td>';
+        		}else if(suggest.status=='0'){
+        			data+='<td class="textc"><a href="javascript:void(0);" onclick="updateSuggestDetails('+suggest.id+')" class="layui-btn layui-btn-xs fa fa-detail ops_more f12">未处理</a></td>';
+        		}
+        		data+='<td class="textc">';
+        		data+='<div class="positionr listOperaters">';
+        		data+='		<a href="javascript:void(0);"  class="icon-large dlblock w16 h16"><img src="'+resourcePath+'/images/angle-down.png"/></a>';
+        		data+='		<div class="ops_box ops_itemDiv positiona clearfix whitebg">';
+        		data+='			<ul>';
+        	/*	data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showSuggestDetails('+suggest.id+')" class="layui-btn fa fa-edit ops_more f12">编辑</a></li>';
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="initDeleteSuggest('+suggest.id+')" class="layui-btn fa fa-remove ops_more f12">删除</a></li>';*/
+        		data+='				<li class="fl ml2 mr2"><a href="javascript:void(0);" onclick="showSuggestDetails('+suggest.id+')" class="layui-btn layui-btn-sm layui-btn-radius fa fa-detail ops_more f12">查看明细</a></li>';
+        	    data+='			</ul>';
+              data+='		</div>';
+        	    data+='</div>';
+        	    data+='</td>';
+        	    data+='</tr>';
+        	    $('#data_content').append(data);
+        	});
+        	//分页
+        	$('#pageCount').html(result.pageCount);
+      	$('#currPage').html(result.currPage);
+          $('#totalCount').html(result.count);
+           	//设置分页
+           	pageIndex=result.currPage;
+			$('#pagination').pagination({
+				pageCount: result.pageCount,
+				jump: true,
+				coping: true,
+				jump: true,
+				homePage: '首页',
+				endPage: '末页',
+				prevContent: '上页',
+				nextContent: '下页',
+				current:result.currPage,
+				callback:function(api){
+					pageIndex=api.getCurrent();
+					querySuggest(api.getCurrent());
+				}
+			});
+        } 
+    });  
+	//表头列不选中
+	$("#allCheck").find("span").removeClass('checked');
+}
+
+//初始化新增
+function initAddSuggest(){
+	window.location=ctx+'/suggest/querySuggestDetails?pageIndex='+pageIndex;
+}
+
+//初始化修改
+function showSuggestDetails(id){
+	window.location=ctx+'/suggest/querySuggestDetails?id='+id+'&pageIndex='+pageIndex;
+}
+
+//初始化删除
+function initDeleteSuggest(id){
+	
+		layer.open({
+		type: 1,
+		closeBtn: 1,		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r'	, //按钮居中
+		shade: 0.3 ,//不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteSuggest(id,true);
+		}
+	});
+}
+
+//删除
+function deleteSuggest(id,showMsg){
+	$.ajax({
+		url:ctx+'/suggest/deleteSuggest',
+		data:[{
+			name:'id',
+			value:id
+		}],
+		type:'POST',
+		dataType:'json',
+		success:function(){
+			querySuggest(pageIndex);
+			if(showMsg){
+				layer.msg('删除成功!');	
+			}
+		}
+	});
+}
+//头部编辑
+function initEditSuggest(){
+	var count=0;
+	var id=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+        	 id=$(this).data('id');
+         }
+    })
+    if(count>1){
+    	layer.msg('只能选中一行记录进行操作!');
+    	return ;
+    }
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	 if(id>0){
+	  showSuggestDetails(id);
+	 }
+}
+//头部删除
+function initBatchDeleteSuggest(){
+	var count=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+         }
+    })
+	
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	
+
+	layer.open({
+		type: 1,
+		closeBtn: 1,
+		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r', //按钮居中
+		shade: 0.3, //不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteBatchSuggest();
+		}
+	});
+	
+}
+//批量删除
+function deleteBatchSuggest(){
+	
+	$(".checkeBox").find("span").each(function () {
+        if($(this).hasClass("checked")){
+        	var id=$(this).data('id');
+        	deleteSuggest(id,false);
+        	layer.msg('删除成功!');	
+        }
+   })
+}
+
+function updateSuggestDetails(id){
+	layer.open({
+		type: 1,
+		closeBtn: 1,		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认处理吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r'	, //按钮居中
+		shade: 0.3 ,//不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			disposeReq(id,true);
+		}
+	});
+}
+
+function disposeReq(id,showMsg){
+	$.ajax({
+		url:ctx+'/suggest/disposeReq',
+		data:[{
+			name:'id',
+			value:id
+		}],
+		type:'POST',
+		dataType:'json',
+		success:function(){
+			querySuggest(pageIndex);
+			if(showMsg){
+				layer.msg('处理成功!');	
+			}
+		}
+	});
+}
+
+function dateFtt(fmt,date)   
+{ //author: meizz   
+  var o = {   
+    "M+" : date.getMonth()+1,                 //月份   
+    "d+" : date.getDate(),                    //日   
+    "h+" : date.getHours(),                   //小时   
+    "m+" : date.getMinutes(),                 //分   
+    "s+" : date.getSeconds(),                 //秒   
+    "q+" : Math.floor((date.getMonth()+3)/3), //季度   
+    "S"  : date.getMilliseconds()             //毫秒   
+  };   
+  if(/(y+)/.test(fmt))   
+    fmt=fmt.replace(RegExp.$1, (date.getFullYear()+"").substr(4 - RegExp.$1.length));   
+  for(var k in o)   
+    if(new RegExp("("+ k +")").test(fmt))   
+  fmt = fmt.replace(RegExp.$1, (RegExp.$1.length==1) ? (o[k]) : (("00"+ o[k]).substr((""+ o[k]).length)));   
+  return fmt;   
+}
diff --git a/pluss-manage-page/src/main/resources/static/resources/userApp/userAppDetails.js b/pluss-manage-page/src/main/resources/static/resources/userApp/userAppDetails.js
new file mode 100644
index 0000000..c063f8d
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/userApp/userAppDetails.js
@@ -0,0 +1,96 @@
+/**
+ * create by robot 
+ * date Thu Sep 12 16:16:37 CST 2019 
+ */ 
+
+$(document).ready(function(){
+	//form表单样式
+	layui.use(['layer', 'form'], function() {
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+	//li 切换事件
+	$(".nav-tabs>li").click(function() {
+		var index = $(".nav-tabs>li").index(this);
+		$(this).addClass("active").siblings("li").removeClass("active");
+		
+	})
+	//弹出一个提示层
+	$('.fa-save').on('click', function() {
+		saveUserApp();
+	});
+
+	//绑定标签栏事件
+	$(document).on('click','.nav-tabs li',function(){
+
+		var action =$(this).data('action');
+		 switch (action) {
+			case "base"://基本资料
+				goBase();
+				break;  
+			case "functions"://多功能
+				goFunctions();
+				break;
+			case "extends"://扩展    
+				goExtends();         
+				break;           
+		 }
+	})
+
+	//加载第一个标签
+	$('.nav-tabs li').eq(0).click();
+	
+});
+
+
+//跳转基本信息 
+function goBase(){
+	var url=ctx+'/userApp/queryUserAppBaseInfo?id='+$('#userAppId').val();
+	$('.tab-content').load(url);
+	              
+}
+//跳转多功能输入
+function goFunctions(){ 
+	var url=ctx+'/userApp/queryUserAppFunctionsInfo?id='+$('#userAppId').val();
+	$('.tab-content').load(url);  
+	
+}
+//跳转到扩展   
+function goExtends(){
+	
+	var url=ctx+'/userApp/queryUserAppExtendsInfo?id='+$('#userAppId').val();
+	$('.tab-content').load(url);          
+}  
+  
+
+ 
+//保存
+function saveUserApp(){
+	 
+	$(".fa-save").attr("disabled","disabled");
+	$('.fa-save').html('正在保存...')
+	$.ajax({
+		url:ctx+"/userApp/saveUserApp",
+		type:"POST",
+		dataType:'json',
+		data:$("#data_form").serializeArray(),
+		complete:function(){
+			$(".fa-save").removeAttr("disabled");
+			$('.fa-save').html('保存')
+		},        
+		success:function(service){ 
+		
+			layer.confirm('保存成功,是否前往列表？', {
+				  btn: ['确认','取消'] //按钮
+				}, function(){
+					$('#goback span').trigger('click'); 
+				}, function(){         
+					layer.closeAll();
+			});  
+			
+		}
+	});  
+}
+ 
+
diff --git a/pluss-manage-page/src/main/resources/static/resources/userApp/userAppList.js b/pluss-manage-page/src/main/resources/static/resources/userApp/userAppList.js
new file mode 100644
index 0000000..df474f0
--- /dev/null
+++ b/pluss-manage-page/src/main/resources/static/resources/userApp/userAppList.js
@@ -0,0 +1,197 @@
+/**
+ * create by robot 
+ * date Thu Sep 12 16:16:37 CST 2019 
+ */ 
+
+var pageIndex=1;
+$(document).ready(function(){
+	//调用查询
+	pageIndex=StringUtil.getQueryString('pageIndex');
+	if(pageIndex==undefined||pageIndex==null){
+		pageIndex=1;
+	}
+	queryUserApp(pageIndex);
+	//绑定hover操作
+	$(document).on('mouseenter','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").show();
+		var width=15;
+		$(this).children('div').find('li').each(function(){
+			//获取li宽度
+			width+=$(this).width();
+		});
+		$(this).children('div').width(width);
+	})
+	$(document).on('mouseleave','.listOperaters',function(){
+		$(this).children(".ops_itemDiv").hide();
+	});
+
+	//日历控件
+	layui.use(['layer', 'laydate'], function() {
+		var layer = layui.layer;
+		laydate = layui.laydate;
+		laydate.render({
+		elem: '#date1' //指定元素
+		});
+		laydate.render({
+			elem: '#date2' //指定元素
+		});
+	});
+
+
+	//行选中事件
+	$("#allCheck").find("span").click(function() {
+		$(this).toggleClass('checked');
+		if($(this).hasClass('checked')){
+			//所有列选中
+		  $(".checker").find("span").each(function () {
+		         $(this).addClass("checked");
+		    })
+		}else{
+			//所有列取消选中
+			$(".checker").find("span").each(function () {
+				 $(this).removeClass("checked");
+		    })
+		}
+	});
+
+	//单个选中
+	$(document).on('click','.checkeBox span',function() {
+		$(this).toggleClass('checked');
+		//设置头部事件
+		var length=$('.checkeBox span').length;
+		var count=0;
+		$(".checkeBox").find("span").each(function () {
+	        if($(this).hasClass("checked")){
+	        	count++;
+	        }
+	   })
+		//全选
+	   if(count==length){
+		   $("#allCheck").find("span").addClass('checked');
+	   }else{
+		   $("#allCheck").find("span").removeClass('checked');
+	   }
+	})
+	//左右div高度相等
+	var left_content_height = $(".right-content").height();
+	$(".left-content").height(left_content_height+35);
+	var sub_left_height=$(".res-menu").height(left_content_height-60);
+});
+
+//初始化修改
+function showUserAppDetails(id){
+	window.location=ctx+'/userApp/queryUserAppDetails?id='+id+'&pageIndex='+pageIndex;
+}
+
+//初始化删除
+function initDeleteUserApp(id){
+		layer.open({
+		type: 1,
+		closeBtn: 1,		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r'	, //按钮居中
+		shade: 0.3 ,//不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteUserApp(id,true);
+		}
+	});
+}
+
+//删除
+function deleteUserApp(id,showMsg){
+	$.ajax({
+		url:ctx+'/userApp/deleteUserApp',
+		data:[{
+			name:'id',
+			value:id
+		}],
+		type:'POST',
+		dataType:'json',
+		success:function(){
+			queryUserApp(pageIndex);
+			if(showMsg){
+				layer.msg('删除成功!');	
+			}
+		}
+	});
+}
+//头部编辑
+function initEditUserApp(){
+	var count=0;
+	var id=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+        	 id=$(this).data('id');
+         }
+    })
+    if(count>1){
+    	layer.msg('只能选中一行记录进行操作!');
+    	return ;
+    }
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	 if(id>0){
+	  showUserAppDetails(id);
+	 }
+}
+//头部删除
+function initBatchDeleteUserApp(){
+	var count=0;
+	$(".checkeBox").find("span").each(function () {
+         if($(this).hasClass("checked")){
+        	 count++;
+         }
+    })
+	
+	 if(count==0){
+    	layer.msg('请选中一行记录!');
+    	return ;
+	  }
+	
+
+	layer.open({
+		type: 1,
+		closeBtn: 1,
+		title: '提示',
+		offset: 'm', //具体配置参考：offset参数项
+		area: ['300px', '180px'],
+		content: '<div style="padding:10px;" class="textc mt20">确认删除吗？</div>',
+		btn: ['确认','取消'],
+		btnAlign: 'r', //按钮居中
+		shade: 0.3, //不显示遮罩
+		yes: function() {
+			layer.closeAll();
+			deleteBatchUserApp();
+		}
+	});
+	
+}
+//批量删除
+function deleteBatchUserApp(){
+	
+	$(".checkeBox").find("span").each(function () {
+        if($(this).hasClass("checked")){
+        	var id=$(this).data('id');
+        	deleteUserApp(id,false);
+        	layer.msg('删除成功!');	
+        }
+   })
+}
+
+//充值记录
+function showRechargeDetails(userId){
+	window.location=ctx+'/userApp/showRechargeDetails?userId='+userId;
+}
+
+//消费记录
+function showConsumptionDetails(userId){
+	window.location=ctx+'/userApp/showConsumptionDetails?userId='+userId;
+}
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/common.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/common.jsp
new file mode 100644
index 0000000..b1c683b
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/common.jsp
@@ -0,0 +1,137 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+<c:set var="ctx" value="${pageContext.request.contextPath}"  scope="request"/>
+<c:set var="resourcePath" value="${ctx}/resources"  scope="request"/>
+
+<link rel="shortcut icon" href="${resourcePath}/images/logo.png"/>
+<link rel="icon" href="${resourcePath}/images/logo.png"/>
+
+<style>
+    .layui-inline {
+        margin-bottom: 10px !important;
+    }
+    .layui-layer-dialog{
+        position: fixed;
+        top: 200px !important;
+    }
+    .layui-table-cell {
+        font-size: 13px;
+        font-weight: 500;
+    }
+</style>
+
+<script type="text/javascript">
+	var ctx = "${ctx}";	//上下文路径
+	var resourcePath = "${resourcePath}";
+	//var resourcePath = resourcePath+"/manage";
+	document.writeln('<script type="text/javascript" src="'+resourcePath+'/js/global.js?d=' + new Date().getTime() + '" ><\/script>');
+</script>
+
+<script>MICROANSWER_DROPDOWAN="mDropdown";</script>
+<script type="text/javascript">
+    // 内部包含有 box-sizing: border-box, 宽度会包含padding，导致layui的label显示异常
+   	// requireCss('css/bootstrap.min.css');
+   	requireCss("css/font-awesome.min.css");
+   	requireCss("css/animate.css");
+   	requireCss("css/reset.css");
+    requireCss("layuiadmin/layui/css/layui.css");
+   	requireCss("css/pagination.css");
+   	require("js/bootstrap.min.js");
+    require("layuiadmin/layui/layui.js");
+   	require("js/jquery.serializejson.min.js");
+   	require("js/ySelect.js");
+   	require("js/utils/StringUtil.js");
+   	require("js/utils/DialogUtil.js");
+    require("js/utils/DateUtil.js");
+    require("js/jquery.table2excel.js");
+
+	function serialize(form) {
+	    var serializeArray = form.serializeArray();
+	    var result = [];
+	    $.each(serializeArray, function(index, item) {
+            result[item.name] = item.value;
+        });
+        return result;
+    }
+    function serializeObj(form) {
+        var serializeArray = form.serializeArray();
+        var result = {};
+        $.each(serializeArray, function(index, item) {
+            result[item.name] = item.value;
+        });
+        return result;
+    }
+
+    function null2Zero(src) {
+        if (src == null) {
+            return 0.0
+        } else {
+            return src
+        }
+    }
+
+    function getDictText(value,obj,type) {
+        var dictText = "";
+        $.each(obj,function (k,v) {
+            if (type === 'id'){
+                if(v.id === value){
+                    dictText = v.name;
+                }
+            } else if (type === 'value'){
+                if(v.value === value){
+                    dictText = v.name;
+                }
+            } else if (type === 'code'){
+                if(v.code === value){
+                    dictText = v.name;
+                }
+            } else if (type === 'roleCode'){
+                if(v.roleCode === value){
+                    dictText = v.roleName;
+                }
+            }
+        })
+        if(dictText == ""){
+            dictText = "全部"
+        }
+        return dictText;
+    }
+
+    $(document).ready(function() {
+        //条件搜索框点击收缩隐藏
+        $(".collapse").click(function() {
+            $(this).find("i").toggleClass("fa-angle-double-down");
+            $($(".toolbar-body")[0]).slideToggle();
+        });
+    })
+
+    $.ajaxSetup({
+        beforeSend: function (xhr) {
+            let token = localStorage.getItem("token");
+            let userId = localStorage.getItem("userId");
+            xhr.setRequestHeader("token", token);
+            xhr.setRequestHeader("userId", userId);
+        }
+        , complete: function (xhr, textStatus) {
+            try {
+                let response = JSON.parse(xhr.responseText);
+                if (response.code == 401) {
+                    localStorage.removeItem("token");
+                    localStorage.removeItem("userId");
+                    window.location.href = ctx + "/login";
+                }
+            } catch (e) {
+
+            }
+        }
+    })
+
+</script>
+<script>
+    layui.config({
+        base: '${resourcePath}/layuiExtension/' //假设这是你存放拓展模块的根目录
+    }).extend({
+        index: 'lib/index' //主入口模块
+    })
+</script>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/error.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/error.jsp
new file mode 100644
index 0000000..624a35a
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/error.jsp
@@ -0,0 +1,15 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+</head>
+<body>
+	
+	<%
+
+	response.sendRedirect("http://ah.189.cn/404.html");
+
+	%>
+	
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityActivate/activityActivateBaseInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityActivate/activityActivateBaseInfo.jsp
new file mode 100644
index 0000000..3ec912c
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityActivate/activityActivateBaseInfo.jsp
@@ -0,0 +1,146 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">  
+	<div class="tab-pane active">     
+		<div class="panel-body">
+			<div class="wrapper wrapper-content">
+				<div class="panel-form animated fadeInRight wp60 fc">
+					<div class="layui-form-item dn	has-error" >   
+						<label class="layui-form-label">id</label>  
+						<div class="layui-input-block">
+							<input type="text" name="id" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityActivate.id }" >
+						</div>  
+					</div>
+					<%-- <div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">userId</label>  
+						<div class="layui-input-block">
+							<input type="text" name="userId" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityActivate.userId }" >
+						</div>  
+					</div> --%>
+					<%-- <div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">merchantCode</label>  
+						<div class="layui-input-block">
+							<input type="text" name="merchantCode" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityActivate.merchantCode }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">merchantName</label>  
+						<div class="layui-input-block">
+							<input type="text" name="merchantName" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityActivate.merchantName }" >
+						</div>  
+					</div> --%>
+					
+					<!--管理员看到的  -->
+                    <c:if test="${admin eq 'admin' }">
+                        <div class="form-group">
+                            <div class="layui-form-item">          
+                                <label class="layui-form-label">商户</label>
+                                <div class="layui-input-block">
+                                    <select name="merchantCode" lay-filter="selectMerchantCode" id="merchantCode">  
+                                        <option value="">请选择</option>
+                                        <c:forEach items="${merchantBaseInfoList }" var="mb">
+                                            <option value="${mb.merchantCode }" <c:if test="${activityActivate.merchantCode eq mb.merchantCode }">selected</c:if>>${mb.merchantName }</option>
+                                        </c:forEach>
+                                    </select>
+                                </div>
+                            </div>
+                        </div>
+                        
+                        <div class="form-group">
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">门店</label>
+                                <div class="layui-input-block">
+                                    <select name="storeId" id="storeId">  
+                                        <option value="">请选择</option>
+                                        <c:forEach items="${merchantStoreList }" var="ms">
+                                            <option value="${ms.storeId }" <c:if test="${ms.storeId eq activityActivate.storeId }">selected</c:if>>${ms.storeName }</option>
+                                        </c:forEach>
+                                    </select>              
+                                </div>
+                            </div>
+                        </div>
+                    </c:if>
+                    
+                    <!--不是管理员看到的  -->
+                    <c:if test="${admin ne 'admin' }">
+                        <div class="form-group">
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">门店</label>
+                                <div class="layui-input-block">
+                                    <select name="storeId" id="storeId">  
+                                        <option value="">请选择</option>
+                                        <c:forEach items="${merchantStoreList }" var="ms">
+                                            <option value="${ms.storeId }" <c:if test="${ms.storeId eq activityActivate.storeId }">selected</c:if>>${ms.storeName }</option>
+                                        </c:forEach>
+                                    </select>              
+                                </div>
+                            </div>
+                        </div>
+                    </c:if>
+                    
+                    <div class="layui-form-item     has-error" >   
+                        <label class="layui-form-label">活动名称</label>  
+                        <div class="layui-input-block">
+                            <input type="text" name="name" id="name" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityActivate.name }" >
+                        </div>  
+                    </div>
+					
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">激活赠送金额</label>  
+						<div class="layui-input-block">
+							<input type="text" name="giveMoney" id="giveMoney" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityActivate.giveMoney }" >
+						</div>  
+					</div>
+					<%-- <div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">storeId</label>  
+						<div class="layui-input-block">
+							<input type="text" name="storeId" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityActivate.storeId }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">storeName</label>  
+						<div class="layui-input-block">
+							<input type="text" name="storeName" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityActivate.storeName }" >
+						</div>  
+					</div> --%>
+					<%-- <div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">createDt</label>  
+						<div class="layui-input-block">
+							<input type="text" name="createDt" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityActivate.createDt }" >
+						</div>  
+					</div> --%>
+	               <c:if test="${admin eq 'admin' }">
+                       <input type="hidden" id="isAdmin" value="1">
+                    </c:if>
+                    <c:if test="${admin ne 'admin' }">
+                       <input type="hidden" id="isAdmin" value="0">
+                    </c:if>
+				</div>
+			</div>
+		</div>  
+	</div>
+</form>
+<script type="text/javascript">
+   $(function(){
+	   //form表单样式
+	    layui.use(['layer', 'form'], function() {    
+	        var layer = layui.layer,
+	            form = layui.form;
+	        form.render();
+	    });
+	  //日历控件
+	    layui.use(['layer', 'laydate'], function() {
+	        var layer = layui.layer;
+	        laydate = layui.laydate;
+	        laydate.render({
+	             elem: '#date1' //指定元素
+	        });
+	        laydate.render({
+	            elem: '#date2' //指定元素
+	        });
+	    });
+   })
+   
+</script> 
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityActivate/activityActivateDetails.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityActivate/activityActivateDetails.jsp
new file mode 100644
index 0000000..cbfe1a8
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityActivate/activityActivateDetails.jsp
@@ -0,0 +1,54 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>     
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">                      
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black"> 
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> 
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->                                     
+<meta name="viewport"
+	content="width=device-width, initial-scale=1.0, maximum-scale=1.0">   
+<jsp:include page="../../common.jsp" />
+<script type="text/javascript">
+    require("activityActivate/activityActivateDetails.js");
+</script>
+<title>编辑</title>
+</head>                                 
+	<body class="lgraybg">            
+		<div class="	container-fluid animated fadeInRight col-sm-12">
+			<div class="panel-toolbar mt10 mb10 pt5 pb5 pl10 bdd whitebg">
+				<div class="buttons">
+					<a href="javascript:void(0);" class="layui-btn layui-btn-sm layui-btn-danger fa fa-save f12"><span>保存</span></a>
+					<a href="${ctx }/activityActivate/index?pageIndex=${pageIndex}"  class="layui-btn layui-btn-sm fa fa-back f12" id="goback"><span>返回</span></a>
+				</div>
+			</div>
+				<div class="tabs-container whitebg">
+					<div class="pt10 pl5 pr5">
+						<ul class="nav nav-tabs" id="nav-tabs">
+							<li class="active" data-action="base">   
+								<a href="javascript:void(0);" >基本资料</a>
+							</li>
+							<!-- <li class="" data-action="functions">
+								<a href="javascript:void(0);"  >多功能输入</a>
+							</li>
+							<li class="" data-action="extends">
+								<a href="javascript:void(0);" >扩展属性</a>
+							</li> -->
+						</ul>
+						<div class="tab-content pt30 p30">               
+		
+						</div>     
+					</div>
+				</div>    
+		</div>
+		<!-- 隐藏域 -->
+		<input type="hidden" id="activityActivateId" value="${activityActivate.id }"/>
+	</body>
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityActivate/activityActivateExtendsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityActivate/activityActivateExtendsInfo.jsp
new file mode 100644
index 0000000..592687a
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityActivate/activityActivateExtendsInfo.jsp
@@ -0,0 +1,201 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>           
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> 
+<div class="tab-pane active">      
+	<div class="animated fadeInRight">
+		<div class="whitebg pl10 pr10">
+			<table class="table table-striped table-bordered table-hover">     
+				<thead> 
+					<tr>  
+						<th class="textc">序号</th>         
+						<th class="textc wp15">流水账号</th>
+						<th class="textc">日期</th>         
+						<th class="textc">财务类别</th>     
+						<th class="textc">金额</th>         
+						<th class="textc">银行</th>         
+						<th class="textc">发票</th>         
+						<th class="textc">客户名称</th>     
+						<th class="textc wp15">单号</th>    
+						<th class="textc">状态</th>         
+						<th class="textc">类别</th>         
+						<th class="textc">操作</th>         
+					</tr> 
+				</thead>
+				<tbody> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+                
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="green">支出</span></td>     
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+				</tbody>
+                
+			</table>  
+			<!-- footer -->  
+			<div class="clearfix mb10 pb20">          
+					<div class="layui-tab-item fr">       
+							<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+							<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>   
+							<div class="pagination dlblock vm" id="pagination"></div>
+							<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>            
+					</div>
+				</div>  
+		</div>      
+	</div>        
+</div>          
+                
+<script type="text/javascript">    
+//分页          
+$('#pagination').pagination({        
+	pageCount: 50,
+	jump: true,   
+	coping: true, 
+	homePage: '首页',    
+	endPage: '末页',     
+	prevContent: '上页', 
+	nextContent: '下页', 
+	callback: function(api) {          
+		$('.now').text(api.getCurrent());
+	}             
+});             
+</script>       
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityActivate/activityActivateFunctionsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityActivate/activityActivateFunctionsInfo.jsp
new file mode 100644
index 0000000..982ce84
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityActivate/activityActivateFunctionsInfo.jsp
@@ -0,0 +1,130 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>		
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">      
+<div class="tab-pane active">
+				<div class="panel-body">
+					<div class="wrapper wrapper-content">     
+						<div class="panel-form animated fadeInRight wp60 fc">
+							<!-- 账号资料 -->
+			<div class="layui-form-item 	has-error">
+				<label class="layui-form-label">单行输入框<i class="red">*</i></label>
+				<div class="layui-input-block">
+					<input type="text" name="title" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input">
+				</div>                                         
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">自定义验证</label>
+				<div class="layui-input-inline ml30">
+					<input type="password" name="password" lay-verify="pass" placeholder="请输入密码" autocomplete="off" class="layui-input">
+				</div>
+				<div class="layui-form-mid layui-word-aux">请填写6到12位密码</div>
+			</div>
+			<div class="form-group">
+				<div class="layui-form-item">          
+					<label class="layui-form-label">单行选择框</label>
+					<div class="layui-input-block">
+						<select name="interest" lay-filter="aihao">  
+							<option value=""></option>
+							<option value="0">写作</option>         
+							<option value="1" selected="">阅读</option>
+							<option value="2">游戏</option>
+							<option value="3">音乐</option>
+							<option value="4">旅行</option>  
+						</select>              
+					</div>
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<div class="layui-inline">  
+					<label class="layui-form-label">范围</label>
+					<div class="layui-input-inline ml30">
+						<input type="text" name="price_min" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>                                     
+					<div class="layui-form-mid">-</div>
+					<div class="layui-input-inline">       
+						<input type="text" name="price_max" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>
+				</div>           
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">联动选择框</label>
+				<div class="layui-input-inline ml30">
+					<select name="quiz1">     
+						<option value="">请选择省</option>
+						<option value="浙江" selected="">浙江省</option> 
+						<option value="你的工号">江西省</option>           
+						<option value="你最喜欢的老师">福建省</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz2">
+						<option value="">请选择市</option>
+						<option value="杭州">杭州</option>
+						<option value="宁波" disabled="">宁波</option>
+						<option value="温州">温州</option>
+						<option value="温州">台州</option>
+						<option value="温州">绍兴</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz3">
+						<option value="">请选择县/区</option>
+						<option value="西湖区">西湖区</option>
+						<option value="余杭区">余杭区</option>
+						<option value="拱墅区">临安市</option>
+					</select>
+				</div>    
+			</div>
+			<div class="layui-form-item" pane="">   
+				<label class="layui-form-label">原始复选框</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="like1[write]" lay-skin="primary" title="写作" checked="">  
+					<input type="checkbox" name="like1[read]" lay-skin="primary" title="阅读">
+					<input type="checkbox" name="like1[game]" lay-skin="primary" title="游戏" disabled="">
+				</div>
+			</div>
+
+			<div class="layui-form-item">
+				<label class="layui-form-label">开关-默认关</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="close" lay-skin="switch" lay-text="ON|OFF">
+				</div>
+			</div>
+			<div class="layui-form-item">  
+				<label class="layui-form-label">单选框</label>
+				<div class="layui-input-block">
+					<input type="radio" name="sex" value="男" title="男" checked="">
+					<input type="radio" name="sex" value="女" title="女">
+					<input type="radio" name="sex" value="禁" title="禁用" disabled="">
+				</div>
+			</div>
+			<!--<div class="layui-form-item layui-form-text">
+				<label class="layui-form-label">上传图片</label>
+				<div class="layui-input-block">
+					<div class="layui-upload-drag w200 h200">
+						<i class="layui-icon"></i>          
+						<p>点击上传</p>
+					</div>
+				</div>
+			</div>-->
+				<div class="layui-form-item layui-form-text">
+					<label class="layui-form-label">普通文本域</label>  
+					<div class="layui-input-block">              
+						<textarea placeholder="请输入内容" class="layui-textarea"></textarea>
+					</div>
+				</div>
+			</div>
+		</div>   
+	</div>
+</div>
+</form>   
+<script type="text/javascript">
+	//form表单样式
+	layui.use(['layer', 'form'], function() {    
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+</script>                 
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityActivate/activityActivateList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityActivate/activityActivateList.jsp
new file mode 100644
index 0000000..b81ff80
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityActivate/activityActivateList.jsp
@@ -0,0 +1,131 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black">
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->
+<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+<jsp:include page="../../common.jsp" />
+<script type="text/javascript">
+     require("activityActivate/activityActivateList.js");
+</script>
+	<style type="text/css">
+		.layui-table th {
+			text-align: center;
+		}
+	</style>
+</head>
+<body>
+	<div class="row animated fadeInRight" style="margin: 0;">
+		<div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+			<div class="toolbar-panel bdd">
+				<div class="toolbar-box">
+					<div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+						<!-- 顶部按钮 -->
+						<div class="buttons fl">
+							<a class="layui-btn layui-btn-sm fa fa-search f13" href="javascript:void(0);" onclick="queryActivityActivate()"><span>搜索</span></a>
+							<c:if test="${admin eq 'admin'||merchant eq 'merchant' }">
+								<a class="layui-btn layui-btn-sm fa fa-plus f13 add" href="javascript:void(0);" onclick="initAddActivityActivate()"><span>添加</span></a>
+								<a class="layui-btn layui-btn-sm fa fa-edit f13" href="javascript:void(0);" onclick="initEditActivityActivate()"><span>编辑</span></a>
+								<a class="layui-btn layui-btn-sm layui-btn-danger fa fa-remove f13 delete" href="javascript:void(0);" onclick="initBatchDeleteActivityActivate()"><span>删除</span></a>
+							</c:if>
+						</div>
+						<div class="tools fr">
+							<a href="javascript:void(0);" class="collapse dblock f14 dgray mr5"> 
+								<i class="fa-2x fa fa-angle-double-up"></i>
+							</a>
+						</div>
+					</div>
+				</div>
+
+				<!--搜索条件 -->
+				<div class="toolbar-body">
+					<div class="row pt10 pb10 whitebg ml0 mr0">
+						<!-- <span class="dlblock w100 textr">ID：</span> 
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+							<input type="text" placeholder="请输入内容" id="searchId">  
+						</span> --> 
+						<span class="dlblock w100 textr">活动名称：</span> 
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+							<input type="text" id="name" placeholder="请输入活动名称">
+						</span>
+						
+					<!-- 	<span class="dlblock w100 textr">门店：</span>
+                         <select class="form-control f12 w180 textc">
+                            <option value="">请选择</option>
+                        </select> -->
+						 
+						<!-- <span class="dlblock w100 textr">类别：</span>
+						 <select class="form-control f12 w180 textc">
+							<option value="">支出</option>
+							<option value="">收入</option>
+						</select> -->
+					</div>
+					<!-- <div class="mt10 mb20">
+						<span class="dlblock w100 textr">开始日期</span>
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+							 <input type="text" placeholder="" id="date1" class="w150">
+							 <i class="fa fa-calendar"></i>
+						</span> 
+						<span class="dlblock w100 textr">结束日期</span>
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+						<input type="text" placeholder="" id="date2" class="w150"> 
+							<i class="fa fa-calendar"></i>
+						</span>
+					</div> -->
+				</div>
+			</div>
+		</div>
+		<!-- 表单数据 -->
+		<div class="mb20 mt10">
+			<div class="whitebg pl10 pr10">
+				<table class="layui-table">
+					<thead>
+						<tr>
+							<th class="textc">
+								<div class="checker" id="allCheck">
+									<span class=""><input type="checkbox" value="" ></span>
+								</div>
+							</th>
+							<th class="textc ">id</th>
+							<th class="textc ">活动名称</th>
+							<th class="textc wp15">激活赠送金额</th>
+							<!-- <th class="textc ">userId</th>
+							<th class="textc ">merchantCode</th> -->
+							<th class="textc ">商家名称</th>
+							<!-- <th class="textc ">storeId</th> -->
+							<th class="textc ">门店名称</th>
+							<th class="textc wp15">创建时间</th>
+							<th class="textc">编辑</th>
+						</tr>
+					</thead>
+					<!-- 数据体 -->
+					<tbody id="data_content">
+					</tbody>
+				</table>
+			
+			<!-- footer -->
+				<div class="clearfix mb10 pb20">
+						<div class="layui-tab-item fr">
+								<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+								<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>
+								<div class="pagination dlblock vm" id="pagination"></div>
+								<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>
+						</div>
+					</div>
+	
+			</div>
+		</div>
+	</div>
+</body>
+
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityActivate/otherActivityActivateDetails.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityActivate/otherActivityActivateDetails.jsp
new file mode 100644
index 0000000..00af126
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityActivate/otherActivityActivateDetails.jsp
@@ -0,0 +1,174 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+    pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>     
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">                      
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black"> 
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> 
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->                                     
+<meta name="viewport"
+    content="width=device-width, initial-scale=1.0, maximum-scale=1.0">   
+<jsp:include page="../../common.jsp" />
+<script type="text/javascript">
+</script>
+<title>编辑</title>
+</head>                                 
+    <body class="lgraybg">            
+        <div class="    container-fluid animated fadeInRight col-sm-12">
+            <div class="panel-toolbar mt10 mb10 pt5 pb5 pl10 bdd whitebg">
+                <div class="buttons">
+                    <!-- <a href="javascript:void(0);" class="btn btn-primary fa fa-save f12"><span>保存</span></a> -->
+                    <a href="${ctx }/activityActivate/index?pageIndex=${pageIndex}"  class="btn btn-primary fa fa-back f12" id="goback"><span>返回</span></a>
+                </div>
+            </div>
+                <div class="tabs-container whitebg">
+                    <div class="pt10 pl5 pr5">
+                        <ul class="nav nav-tabs" id="nav-tabs">
+                            <li class="active" data-action="base">   
+                                <a href="javascript:void(0);" >基本资料</a>
+                            </li>
+                            <!-- <li class="" data-action="functions">
+                                <a href="javascript:void(0);"  >多功能输入</a>
+                            </li>
+                            <li class="" data-action="extends">
+                                <a href="javascript:void(0);" >扩展属性</a>
+                            </li> -->
+                        </ul>
+                        <div class="tab-content pt30 p30">               
+                                <form class="layui-form whitebg pb10 pt10" action="" id="data_form">  
+    <div class="tab-pane active">     
+        <div class="panel-body">
+            <div class="wrapper wrapper-content">
+                <div class="panel-form animated fadeInRight wp60 fc">
+                    <div class="layui-form-item dn  has-error" >   
+                        <label class="layui-form-label">id</label>  
+                        <div class="layui-input-block">
+                            <input type="text" name="id" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityActivate.id }" >
+                        </div>  
+                    </div>
+                    <%-- <div class="layui-form-item    has-error" >   
+                        <label class="layui-form-label">userId</label>  
+                        <div class="layui-input-block">
+                            <input type="text" name="userId" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityActivate.userId }" >
+                        </div>  
+                    </div> --%>
+                    <%-- <div class="layui-form-item    has-error" >   
+                        <label class="layui-form-label">merchantCode</label>  
+                        <div class="layui-input-block">
+                            <input type="text" name="merchantCode" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityActivate.merchantCode }" >
+                        </div>  
+                    </div>
+                    <div class="layui-form-item     has-error" >   
+                        <label class="layui-form-label">merchantName</label>  
+                        <div class="layui-input-block">
+                            <input type="text" name="merchantName" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityActivate.merchantName }" >
+                        </div>  
+                    </div> --%>
+                    
+                    <!--管理员看到的  -->
+                    <c:if test="${admin eq 'admin' }">
+                       <div class="form-group">
+                            <div class="layui-form-item">          
+                                <label class="layui-form-label">商户</label>
+                                <div class="layui-input-block">
+                                    <select name="merchantCode" lay-filter="selectMerchantCode" id="merchantCode" disabled="disabled">  
+                                        <option value="">请选择</option>
+                                        <c:forEach items="${merchantBaseInfoList }" var="mb">
+                                            <option value="${mb.merchantCode }" <c:if test=" ${activityActivate.merchantCode eq mb.merchantCode }">selected="selected"</c:if>>${mb.merchantName }</option>
+                                        </c:forEach>
+                                    </select>              
+                                </div>
+                            </div>
+                        </div>
+                        
+                        <div class="form-group">
+                            <div class="layui-form-item">          
+                                <label class="layui-form-label">门店</label>
+                                <div class="layui-input-block">
+                                    <select name="storeId" id="storeId" disabled="disabled">  
+                                        <option value="">请选择</option>
+                                        <c:forEach items="${merchantStoreList }" var="ms">
+                                            <option value="${ms.storeId }" <c:if test="${ms.storeId eq activityActivate.storeId }">selected="selected"</c:if>>${ms.storeName }</option>
+                                        </c:forEach>
+                                    </select>              
+                                </div>
+                            </div>
+                        </div>
+                    </c:if>
+                    
+                    <!--不是管理员看到的  -->
+                    <c:if test="${admin ne 'admin' }">
+                       <div class="form-group">
+                            <div class="layui-form-item">          
+                                <label class="layui-form-label">门店</label>
+                                <div class="layui-input-block">
+                                    <select name="storeId" id="storeId" disabled="disabled">  
+                                        <option value="">请选择</option>
+                                        <c:forEach items="${merchantStoreList }" var="ms">
+                                            <option value="${ms.storeId }" <c:if test="${ms.storeId eq activityActivate.storeId }">selected="selected"</c:if>>${ms.storeName }</option>
+                                        </c:forEach>
+                                    </select>              
+                                </div>
+                            </div>
+                        </div>
+                    </c:if>
+                    
+                    <div class="layui-form-item     has-error" >   
+                        <label class="layui-form-label">活动名称</label>  
+                        <div class="layui-input-block">
+                            <input type="text" name="name" id="name" lay-verify="title" readonly="readonly" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityActivate.name }" >
+                        </div>  
+                    </div>
+                    
+                    <div class="layui-form-item     has-error" >   
+                        <label class="layui-form-label">激活赠送金额</label>  
+                        <div class="layui-input-block">
+                            <input type="text" name="giveMoney" lay-verify="title" readonly="readonly" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityActivate.giveMoney }" >
+                        </div>  
+                    </div>
+                    <%-- <div class="layui-form-item    has-error" >   
+                        <label class="layui-form-label">storeId</label>  
+                        <div class="layui-input-block">
+                            <input type="text" name="storeId" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityActivate.storeId }" >
+                        </div>  
+                    </div>
+                    <div class="layui-form-item     has-error" >   
+                        <label class="layui-form-label">storeName</label>  
+                        <div class="layui-input-block">
+                            <input type="text" name="storeName" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityActivate.storeName }" >
+                        </div>  
+                    </div> --%>
+                    <%-- <div class="layui-form-item    has-error" >   
+                        <label class="layui-form-label">createDt</label>  
+                        <div class="layui-input-block">
+                            <input type="text" name="createDt" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityActivate.createDt }" >
+                        </div>  
+                    </div> --%>
+    
+                </div>
+            </div>
+        </div>  
+    </div>
+</form>
+<script type="text/javascript">
+    //form表单样式
+    layui.use(['layer', 'form'], function() {    
+        var layer = layui.layer,
+            form = layui.form;
+        form.render();
+    });
+</script> 
+                        </div>     
+                    </div>
+                </div>    
+        </div>
+        <!-- 隐藏域 -->
+        <input type="hidden" id="activityActivateId" value="${activityActivate.id }"/>
+    </body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityConsumReturn/activityConsumReturnBaseInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityConsumReturn/activityConsumReturnBaseInfo.jsp
new file mode 100644
index 0000000..5887bec
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityConsumReturn/activityConsumReturnBaseInfo.jsp
@@ -0,0 +1,219 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"  prefix="fmt"%>
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">  
+	<div class="tab-pane active">     
+		<div class="panel-body">
+			<div class="wrapper wrapper-content">
+				<div class="panel-form animated fadeInRight wp60 fc">
+					<div class="layui-form-item dn	has-error" >   
+						<label class="layui-form-label">id</label>  
+						<div class="layui-input-block">
+							<input type="text" name="id" id="Id" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityConsumReturn.id }" >
+						</div>  
+					</div>
+					<%-- <div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">userId</label>  
+						<div class="layui-input-block">
+							<input type="text" name="userId" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityConsumReturn.userId }" >
+						</div>  
+					</div> --%>
+					<%-- <div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">merchantCode</label>  
+						<div class="layui-input-block">
+							<input type="text" name="merchantCode" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityConsumReturn.merchantCode }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">merchantName</label>  
+						<div class="layui-input-block">
+							<input type="text" name="merchantName" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityConsumReturn.merchantName }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">storeId</label>  
+						<div class="layui-input-block">
+							<input type="text" name="storeId" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityConsumReturn.storeId }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">storeName</label>  
+						<div class="layui-input-block">
+							<input type="text" name="storeName" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityConsumReturn.storeName }" >
+						</div>  
+					</div> --%>
+					
+					<!--管理员看到的  -->
+                    <c:if test="${admin eq 'admin' }">
+                       <div class="form-group">
+                            <div class="layui-form-item">          
+                                <label class="layui-form-label">商户</label>
+                                <div class="layui-input-block">
+                                    <select name="merchantCode" lay-filter="selectMerchantCode" id="merchantCode">  
+                                        <option value="">请选择</option>
+                                        <c:forEach items="${merchantBaseInfoList }" var="mb">
+                                            <option value="${mb.merchantCode }" <c:if test="${activityConsumReturn.merchantCode eq mb.merchantCode }">selected="selected"</c:if>>${mb.merchantName }</option>
+                                        </c:forEach>
+                                    </select>              
+                                </div>
+                            </div>
+                        </div>
+                        
+                        <div class="form-group">
+                            <div class="layui-form-item">          
+                                <label class="layui-form-label">门店</label>
+                                <div class="layui-input-block">
+                                    <select name="storeId" id="storeId">  
+                                        <option value="">请选择</option>
+                                        <c:forEach items="${merchantStoreList }" var="ms">
+                                            <option value="${ms.storeId }" <c:if test="${ms.storeId eq activityConsumReturn.storeId }">selected="selected"</c:if>>${ms.storeName }</option>
+                                        </c:forEach>
+                                    </select>              
+                                </div>
+                            </div>
+                        </div>
+                    </c:if>
+                    
+                    <!--不是管理员看到的  -->
+                    <c:if test="${admin ne 'admin' }">
+                       <div class="form-group">
+                            <div class="layui-form-item">          
+                                <label class="layui-form-label">门店</label>
+                                <div class="layui-input-block">
+                                    <select name="storeId" id="storeId">  
+                                        <option value="">请选择</option>
+                                        <c:forEach items="${merchantStoreList }" var="ms">
+                                            <option value="${ms.storeId }" <c:if test="${ms.storeId eq activityConsumReturn.storeId }">selected="selected"</c:if>>${ms.storeName }</option>
+                                        </c:forEach>
+                                    </select>              
+                                </div>
+                            </div>
+                        </div>
+                    </c:if>
+					
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">活动名称</label>  
+						<div class="layui-input-block">
+							<input type="text" name="name" id="name" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityConsumReturn.name }" >
+						</div>  
+					</div>
+					<%-- <div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">createDt</label>  
+						<div class="layui-input-block">
+							<input type="text" name="createDt" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityConsumReturn.createDt }" >
+						</div>  
+					</div> --%>
+					<%-- <div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">活动类型</label>  
+						<div class="layui-input-block">
+							<input type="text" name="type" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityConsumReturn.type }" >
+						</div>  
+					</div> --%>
+					
+					<div class="form-group">
+                            <div class="layui-form-item">          
+                                <label class="layui-form-label">活动类型</label>
+                                <div class="layui-input-block">
+                                    <select name="type" lay-filter="selectType" id="type">  
+                                        <option value="0" <c:if test="${activityConsumReturn.type eq '0' }">selected="selected"</c:if> >分等级返现</option>
+                                        <option value="1" <c:if test="${activityConsumReturn.type eq '1' }">selected="selected"</c:if> >等比例返现</option>
+                                        <option value="2" <c:if test="${activityConsumReturn.type eq '2' }">selected="selected"</c:if> >百分比返现</option>
+                                    </select>              
+                                </div>
+                            </div>
+                        </div>
+					
+					<div class="layui-form-item    has-error" id="percentDetail">   
+                        <label class="layui-form-label">百分比返现比例</label>  
+                        <div class="layui-input-block">
+                            <input type="text" name="percent" id="percent" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityConsumReturn.percent }" >
+                        </div>  
+                    </div>
+					
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">消费金额</label>  
+						<div class="layui-input-block">
+							<input type="text" name="comsumeMoney" id="comsumeMoney" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityConsumReturn.comsumeMoney }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">返现金额</label>  
+						<div class="layui-input-block">
+							<input type="text" name="returnMoney" id="returnMoney" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityConsumReturn.returnMoney }" >
+						</div>  
+					</div>
+					
+					<div class="form-group">
+                            <div class="layui-form-item">          
+                                <label class="layui-form-label">活动时间类型</label>
+                                <div class="layui-input-block">
+                                    <select name="timeType" lay-filter="selectTimeType" id="timeType">  
+                                        <option value="0" <c:if test="${activityConsumReturn.timeType eq '0' }">selected="selected"</c:if> >永久</option>
+                                        <option value="1" <c:if test="${activityConsumReturn.timeType eq '1' }">selected="selected"</c:if> >设置时间</option>
+                                    </select>              
+                                </div>
+                            </div>
+                        </div>
+                        
+                        <div class="mt10 mb20" id="dateDetail">
+                                <span class="dlblock w100 textr">开始日期</span>
+                                <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+                                     <input type="text" placeholder="" name="startDt" id="date1"  value="<fmt:formatDate value='${activityConsumReturn.startDt }' pattern='yyyy-MM-dd' />"  class="w150">
+                                     <i class="fa fa-calendar"></i>
+                                </span> 
+                                <span class="dlblock w100 textr">结束日期</span>
+                                <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+                                <input type="text" placeholder="" name="endDt" id="date2" value="<fmt:formatDate value='${activityConsumReturn.endDt }' pattern='yyyy-MM-dd' />" class="w150"> 
+                                    <i class="fa fa-calendar"></i>
+                                </span>
+                         </div>
+					<%-- <div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">活动时间类型</label>  
+						<div class="layui-input-block">
+							<input type="text" name="timeType" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityConsumReturn.timeType }" >
+						</div>  
+					</div> --%>
+	               <c:if test="${admin eq 'admin' }">
+                       <input type="hidden" id="isAdmin" value="1">
+                    </c:if>
+                    <c:if test="${admin ne 'admin' }">
+                       <input type="hidden" id="isAdmin" value="0">
+                    </c:if>
+				</div>
+			</div>
+		</div>  
+	</div>
+</form>
+<script type="text/javascript">
+$(function(){
+	//form表单样式
+    layui.use(['layer', 'form'], function() {    
+        var layer = layui.layer,
+            form = layui.form;
+        form.render();
+    });
+	
+  //日历控件
+    layui.use(['layer', 'laydate'], function() {
+        var layer = layui.layer;
+        laydate = layui.laydate;
+        laydate.render({
+        elem: '#date1' //指定元素
+        });
+        laydate.render({
+            elem: '#date2' //指定元素
+        });
+    });
+  $("#dateDetail").hide();
+  $("#percentDetail").hide();
+  if($("#timeType").val()=='1'){
+      $("#dateDetail").show();
+  }
+  if($("#type").val()=='2'){
+	  $("#percentDetail").show();
+  }
+});
+
+</script> 
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityConsumReturn/activityConsumReturnDetails.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityConsumReturn/activityConsumReturnDetails.jsp
new file mode 100644
index 0000000..4743543
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityConsumReturn/activityConsumReturnDetails.jsp
@@ -0,0 +1,54 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>     
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">                      
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black"> 
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> 
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->                                     
+<meta name="viewport"
+	content="width=device-width, initial-scale=1.0, maximum-scale=1.0">   
+<jsp:include page="../../common.jsp" />
+<script type="text/javascript">
+    require("activityConsumReturn/activityConsumReturnDetails.js");
+</script>
+<title>编辑</title>
+</head>                                 
+	<body class="lgraybg">            
+		<div class="	container-fluid animated fadeInRight col-sm-12">
+			<div class="panel-toolbar mt10 mb10 pt5 pb5 pl10 bdd whitebg">
+				<div class="buttons">
+					<a href="javascript:void(0);" class="layui-btn layui-btn-sm layui-btn-danger fa fa-save f12"><span>保存</span></a>
+					<a href="${ctx }/activityConsumReturn/index?pageIndex=${pageIndex}"  class="layui-btn layui-btn-sm fa fa-back f12" id="goback"><span>返回</span></a>
+				</div>
+			</div>
+				<div class="tabs-container whitebg">
+					<div class="pt10 pl5 pr5">
+						<ul class="nav nav-tabs" id="nav-tabs">
+							<li class="active" data-action="base">   
+								<a href="javascript:void(0);" >基本资料</a>
+							</li>
+							<!-- <li class="" data-action="functions">
+								<a href="javascript:void(0);"  >多功能输入</a>
+							</li>
+							<li class="" data-action="extends">
+								<a href="javascript:void(0);" >扩展属性</a>
+							</li> -->
+						</ul>
+						<div class="tab-content pt30 p30">               
+		
+						</div>     
+					</div>
+				</div>    
+		</div>
+		<!-- 隐藏域 -->
+		<input type="hidden" id="activityConsumReturnId" value="${activityConsumReturn.id }"/>
+	</body>
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityConsumReturn/activityConsumReturnExtendsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityConsumReturn/activityConsumReturnExtendsInfo.jsp
new file mode 100644
index 0000000..592687a
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityConsumReturn/activityConsumReturnExtendsInfo.jsp
@@ -0,0 +1,201 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>           
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> 
+<div class="tab-pane active">      
+	<div class="animated fadeInRight">
+		<div class="whitebg pl10 pr10">
+			<table class="table table-striped table-bordered table-hover">     
+				<thead> 
+					<tr>  
+						<th class="textc">序号</th>         
+						<th class="textc wp15">流水账号</th>
+						<th class="textc">日期</th>         
+						<th class="textc">财务类别</th>     
+						<th class="textc">金额</th>         
+						<th class="textc">银行</th>         
+						<th class="textc">发票</th>         
+						<th class="textc">客户名称</th>     
+						<th class="textc wp15">单号</th>    
+						<th class="textc">状态</th>         
+						<th class="textc">类别</th>         
+						<th class="textc">操作</th>         
+					</tr> 
+				</thead>
+				<tbody> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+                
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="green">支出</span></td>     
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+				</tbody>
+                
+			</table>  
+			<!-- footer -->  
+			<div class="clearfix mb10 pb20">          
+					<div class="layui-tab-item fr">       
+							<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+							<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>   
+							<div class="pagination dlblock vm" id="pagination"></div>
+							<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>            
+					</div>
+				</div>  
+		</div>      
+	</div>        
+</div>          
+                
+<script type="text/javascript">    
+//分页          
+$('#pagination').pagination({        
+	pageCount: 50,
+	jump: true,   
+	coping: true, 
+	homePage: '首页',    
+	endPage: '末页',     
+	prevContent: '上页', 
+	nextContent: '下页', 
+	callback: function(api) {          
+		$('.now').text(api.getCurrent());
+	}             
+});             
+</script>       
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityConsumReturn/activityConsumReturnFunctionsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityConsumReturn/activityConsumReturnFunctionsInfo.jsp
new file mode 100644
index 0000000..982ce84
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityConsumReturn/activityConsumReturnFunctionsInfo.jsp
@@ -0,0 +1,130 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>		
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">      
+<div class="tab-pane active">
+				<div class="panel-body">
+					<div class="wrapper wrapper-content">     
+						<div class="panel-form animated fadeInRight wp60 fc">
+							<!-- 账号资料 -->
+			<div class="layui-form-item 	has-error">
+				<label class="layui-form-label">单行输入框<i class="red">*</i></label>
+				<div class="layui-input-block">
+					<input type="text" name="title" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input">
+				</div>                                         
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">自定义验证</label>
+				<div class="layui-input-inline ml30">
+					<input type="password" name="password" lay-verify="pass" placeholder="请输入密码" autocomplete="off" class="layui-input">
+				</div>
+				<div class="layui-form-mid layui-word-aux">请填写6到12位密码</div>
+			</div>
+			<div class="form-group">
+				<div class="layui-form-item">          
+					<label class="layui-form-label">单行选择框</label>
+					<div class="layui-input-block">
+						<select name="interest" lay-filter="aihao">  
+							<option value=""></option>
+							<option value="0">写作</option>         
+							<option value="1" selected="">阅读</option>
+							<option value="2">游戏</option>
+							<option value="3">音乐</option>
+							<option value="4">旅行</option>  
+						</select>              
+					</div>
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<div class="layui-inline">  
+					<label class="layui-form-label">范围</label>
+					<div class="layui-input-inline ml30">
+						<input type="text" name="price_min" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>                                     
+					<div class="layui-form-mid">-</div>
+					<div class="layui-input-inline">       
+						<input type="text" name="price_max" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>
+				</div>           
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">联动选择框</label>
+				<div class="layui-input-inline ml30">
+					<select name="quiz1">     
+						<option value="">请选择省</option>
+						<option value="浙江" selected="">浙江省</option> 
+						<option value="你的工号">江西省</option>           
+						<option value="你最喜欢的老师">福建省</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz2">
+						<option value="">请选择市</option>
+						<option value="杭州">杭州</option>
+						<option value="宁波" disabled="">宁波</option>
+						<option value="温州">温州</option>
+						<option value="温州">台州</option>
+						<option value="温州">绍兴</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz3">
+						<option value="">请选择县/区</option>
+						<option value="西湖区">西湖区</option>
+						<option value="余杭区">余杭区</option>
+						<option value="拱墅区">临安市</option>
+					</select>
+				</div>    
+			</div>
+			<div class="layui-form-item" pane="">   
+				<label class="layui-form-label">原始复选框</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="like1[write]" lay-skin="primary" title="写作" checked="">  
+					<input type="checkbox" name="like1[read]" lay-skin="primary" title="阅读">
+					<input type="checkbox" name="like1[game]" lay-skin="primary" title="游戏" disabled="">
+				</div>
+			</div>
+
+			<div class="layui-form-item">
+				<label class="layui-form-label">开关-默认关</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="close" lay-skin="switch" lay-text="ON|OFF">
+				</div>
+			</div>
+			<div class="layui-form-item">  
+				<label class="layui-form-label">单选框</label>
+				<div class="layui-input-block">
+					<input type="radio" name="sex" value="男" title="男" checked="">
+					<input type="radio" name="sex" value="女" title="女">
+					<input type="radio" name="sex" value="禁" title="禁用" disabled="">
+				</div>
+			</div>
+			<!--<div class="layui-form-item layui-form-text">
+				<label class="layui-form-label">上传图片</label>
+				<div class="layui-input-block">
+					<div class="layui-upload-drag w200 h200">
+						<i class="layui-icon"></i>          
+						<p>点击上传</p>
+					</div>
+				</div>
+			</div>-->
+				<div class="layui-form-item layui-form-text">
+					<label class="layui-form-label">普通文本域</label>  
+					<div class="layui-input-block">              
+						<textarea placeholder="请输入内容" class="layui-textarea"></textarea>
+					</div>
+				</div>
+			</div>
+		</div>   
+	</div>
+</div>
+</form>   
+<script type="text/javascript">
+	//form表单样式
+	layui.use(['layer', 'form'], function() {    
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+</script>                 
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityConsumReturn/activityConsumReturnList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityConsumReturn/activityConsumReturnList.jsp
new file mode 100644
index 0000000..6d49073
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityConsumReturn/activityConsumReturnList.jsp
@@ -0,0 +1,131 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black">
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->
+<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+<jsp:include page="../../common.jsp" />
+<script type="text/javascript">
+     require("activityConsumReturn/activityConsumReturnList.js");
+</script>
+<style type="text/css">
+	.layui-table th {
+		text-align: center;
+	}
+</style>
+</head>
+<body>
+	<div class="row animated fadeInRight" style="margin: 0;">
+		<div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+			<div class="toolbar-panel bdd">
+				<div class="toolbar-box">
+					<div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+						<!-- 顶部按钮 -->
+						<div class="buttons fl">
+							<a class="layui-btn layui-btn-sm fa fa-search f13" href="javascript:void(0);" onclick="queryActivityConsumReturn()"><span>搜索</span></a>
+							<c:if test="${admin eq 'admin' || merchant eq 'merchant' }">
+								<a class="layui-btn layui-btn-sm fa fa-plus f13 add" href="javascript:void(0);" onclick="initAddActivityConsumReturn()"><span>添加</span></a>
+								<a class="layui-btn layui-btn-sm fa fa-edit f13" href="javascript:void(0);" onclick="initEditActivityConsumReturn()"><span>编辑</span></a>
+								<a class="layui-btn layui-btn-sm layui-btn-danger fa fa-remove f13 delete" href="javascript:void(0);" onclick="initBatchDeleteActivityConsumReturn()"><span>删除</span></a>
+							</c:if>
+						</div>
+						<div class="tools fr">
+							<a href="javascript:void(0);" class="collapse dblock f14 dgray mr5"> 
+								<i class="fa-2x fa fa-angle-double-up"></i>
+							</a>
+						</div>
+					</div>
+				</div>
+
+				<!--搜索条件 -->
+				<div class="toolbar-body">
+					<div class="row pt10 pb10 whitebg ml0 mr0">
+						<!-- <span class="dlblock w100 textr">ID：</span> 
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+							<input type="text" placeholder="请输入内容" id="searchId">  
+						</span>  -->
+						<span class="dlblock w100 textr">活动名称：</span> 
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+							<input type="text" id="name" placeholder="请输入活动名称">
+						</span> 
+						<!-- <span class="dlblock w100 textr">类别：</span>
+						 <select class="form-control f12 w180 textc">
+							<option value="">支出</option>
+							<option value="">收入</option>
+						</select> -->
+<%--					</div>--%>
+<%--					<div class="mt10 mb20">--%>
+						<span class="dlblock w100 textr">开始日期</span>
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+							 <input type="text" placeholder="" name="startDt" id="date1" class="w150">
+							 <i class="fa fa-calendar"></i>
+						</span> 
+						<span class="dlblock w100 textr">结束日期</span>
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+						<input type="text" placeholder="" name="endDt" id="date2" class="w150"> 
+							<i class="fa fa-calendar"></i>
+						</span>
+					</div>
+				</div>
+			</div>
+		</div>
+		<!-- 表单数据 -->
+		<div class="mb20 mt10">
+			<div class="whitebg pl10 pr10">
+				<table class="layui-table">
+					<thead>
+						<tr>
+							<th class="textc">
+								<div class="checker" id="allCheck">
+									<span class=""><input type="checkbox" value="" ></span>
+								</div>
+							</th>
+							<th class="textc ">id</th>
+							<th class="textc ">活动名称</th>
+							<!-- <th class="textc ">userId</th>
+							<th class="textc ">merchantCode</th> -->
+							<th class="textc ">商家名称</th>
+							<!-- <th class="textc wp15">storeId</th> -->
+							<th class="textc ">门店名称</th>
+							<th class="textc ">返现类型</th>
+							<th class="textc ">消费金额</th>
+							<th class="textc ">返现金额</th>
+							<th class="textc ">百分比返现比例</th>
+							<th class="textc ">开始时间</th>
+							<th class="textc ">结束时间</th>
+							<th class="textc ">活动时间类型</th>
+							<th class="textc ">创建时间</th>
+							<th class="textc">编辑</th>
+						</tr>
+					</thead>
+					<!-- 数据体 -->
+					<tbody id="data_content">
+					</tbody>
+				</table>
+			
+			<!-- footer -->
+				<div class="clearfix mb10 pb20">
+						<div class="layui-tab-item fr">
+								<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+								<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>
+								<div class="pagination dlblock vm" id="pagination"></div>
+								<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>
+						</div>
+					</div>
+	
+			</div>
+		</div>
+	</div>
+</body>
+
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityConsumReturn/otherActivityConsumReturnDetails.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityConsumReturn/otherActivityConsumReturnDetails.jsp
new file mode 100644
index 0000000..2dbcb7a
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityConsumReturn/otherActivityConsumReturnDetails.jsp
@@ -0,0 +1,264 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>    
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"  prefix="fmt"%> 
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">                      
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black"> 
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> 
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->                                     
+<meta name="viewport"
+	content="width=device-width, initial-scale=1.0, maximum-scale=1.0">   
+<jsp:include page="../../common.jsp" />
+<script type="text/javascript">
+</script>
+<title>编辑</title>
+</head>                                 
+	<body class="lgraybg">            
+		<div class="	container-fluid animated fadeInRight col-sm-12">
+			<div class="panel-toolbar mt10 mb10 pt5 pb5 pl10 bdd whitebg">
+				<div class="buttons">
+					<!-- <a href="javascript:void(0);" class="btn btn-primary fa fa-save f12"><span>保存</span></a> -->
+					<a href="${ctx }/activityConsumReturn/index?pageIndex=${pageIndex}"  class="btn btn-primary fa fa-back f12" id="goback"><span>返回</span></a>
+				</div>
+			</div>
+				<div class="tabs-container whitebg">
+					<div class="pt10 pl5 pr5">
+						<ul class="nav nav-tabs" id="nav-tabs">
+							<li class="active" data-action="base">   
+								<a href="javascript:void(0);" >基本资料</a>
+							</li>
+							<!-- <li class="" data-action="functions">
+								<a href="javascript:void(0);"  >多功能输入</a>
+							</li>
+							<li class="" data-action="extends">
+								<a href="javascript:void(0);" >扩展属性</a>
+							</li> -->
+						</ul>
+						<div class="tab-content pt30 p30">               
+		                      <form class="layui-form whitebg pb10 pt10" action="" id="data_form">  
+    <div class="tab-pane active">     
+        <div class="panel-body">
+            <div class="wrapper wrapper-content">
+                <div class="panel-form animated fadeInRight wp60 fc">
+                    <div class="layui-form-item dn  has-error" >   
+                        <label class="layui-form-label">id</label>  
+                        <div class="layui-input-block">
+                            <input type="text" name="id" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityConsumReturn.id }" >
+                        </div>  
+                    </div>
+                    <%-- <div class="layui-form-item    has-error" >   
+                        <label class="layui-form-label">userId</label>  
+                        <div class="layui-input-block">
+                            <input type="text" name="userId" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityConsumReturn.userId }" >
+                        </div>  
+                    </div> --%>
+                    <%-- <div class="layui-form-item    has-error" >   
+                        <label class="layui-form-label">merchantCode</label>  
+                        <div class="layui-input-block">
+                            <input type="text" name="merchantCode" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityConsumReturn.merchantCode }" >
+                        </div>  
+                    </div>
+                    <div class="layui-form-item     has-error" >   
+                        <label class="layui-form-label">merchantName</label>  
+                        <div class="layui-input-block">
+                            <input type="text" name="merchantName" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityConsumReturn.merchantName }" >
+                        </div>  
+                    </div>
+                    <div class="layui-form-item     has-error" >   
+                        <label class="layui-form-label">storeId</label>  
+                        <div class="layui-input-block">
+                            <input type="text" name="storeId" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityConsumReturn.storeId }" >
+                        </div>  
+                    </div>
+                    <div class="layui-form-item     has-error" >   
+                        <label class="layui-form-label">storeName</label>  
+                        <div class="layui-input-block">
+                            <input type="text" name="storeName" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityConsumReturn.storeName }" >
+                        </div>  
+                    </div> --%>
+                    
+                    <!--管理员看到的  -->
+                    <c:if test="${admin eq 'admin' }">
+                       <div class="form-group">
+                            <div class="layui-form-item">          
+                                <label class="layui-form-label">商户</label>
+                                <div class="layui-input-block">
+                                    <select name="merchantCode" lay-filter="selectMerchantCode" id="merchantCode" disabled="disabled">  
+                                        <option value="">请选择</option>
+                                        <c:forEach items="${merchantBaseInfoList }" var="mb">
+                                            <option value="${mb.merchantCode }" <c:if test="${activityConsumReturn.merchantCode eq mb.merchantCode }">selected="selected"</c:if>>${mb.merchantName }</option>
+                                        </c:forEach>
+                                    </select>              
+                                </div>
+                            </div>
+                        </div>
+                        
+                        <div class="form-group">
+                            <div class="layui-form-item">          
+                                <label class="layui-form-label">门店</label>
+                                <div class="layui-input-block">
+                                    <select name="storeId" id="storeId" disabled="disabled">  
+                                        <option value="">请选择</option>
+                                        <c:forEach items="${merchantStoreList }" var="ms">
+                                            <option value="${ms.storeId }" <c:if test="${ms.storeId eq activityConsumReturn.storeId }">selected="selected"</c:if>>${ms.storeName }</option>
+                                        </c:forEach>
+                                    </select>              
+                                </div>
+                            </div>
+                        </div>
+                    </c:if>
+                    
+                    <!--不是管理员看到的  -->
+                    <c:if test="${admin ne 'admin' }">
+                       <div class="form-group">
+                            <div class="layui-form-item">          
+                                <label class="layui-form-label">门店</label>
+                                <div class="layui-input-block">
+                                    <select name="storeId" id="storeId" disabled="disabled">  
+                                        <option value="">请选择</option>
+                                        <c:forEach items="${merchantStoreList }" var="ms">
+                                            <option value="${ms.storeId }" <c:if test="${ms.storeId eq activityConsumReturn.storeId }">selected="selected"</c:if>>${ms.storeName }</option>
+                                        </c:forEach>
+                                    </select>              
+                                </div>
+                            </div>
+                        </div>
+                    </c:if>
+                    
+                    <div class="layui-form-item     has-error" >   
+                        <label class="layui-form-label">活动名称</label>  
+                        <div class="layui-input-block">
+                            <input type="text" name="name" required="required" id="name" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityConsumReturn.name }" >
+                        </div>  
+                    </div>
+                    <%-- <div class="layui-form-item    has-error" >   
+                        <label class="layui-form-label">createDt</label>  
+                        <div class="layui-input-block">
+                            <input type="text" name="createDt" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityConsumReturn.createDt }" >
+                        </div>  
+                    </div> --%>
+                    <%-- <div class="layui-form-item    has-error" >   
+                        <label class="layui-form-label">活动类型</label>  
+                        <div class="layui-input-block">
+                            <input type="text" name="type" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityConsumReturn.type }" >
+                        </div>  
+                    </div> --%>
+                    
+                    <div class="form-group">
+                            <div class="layui-form-item">          
+                                <label class="layui-form-label">活动类型</label>
+                                <div class="layui-input-block">
+                                    <select name="type" lay-filter="selectType" id="type" disabled="disabled">  
+                                        <option value="">请选择</option>
+                                        <option value="0" <c:if test="${activityConsumReturn.type eq '0' }">selected="selected"</c:if> >分等级返现</option>
+                                        <option value="1" <c:if test="${activityConsumReturn.type eq '1' }">selected="selected"</c:if> >等比例返现</option>
+                                        <option value="2" <c:if test="${activityConsumReturn.type eq '2' }">selected="selected"</c:if> >百分比返现</option>
+                                    </select>              
+                                </div>
+                            </div>
+                        </div>
+                    
+                    <div class="layui-form-item    has-error" id="percentDetail">   
+                        <label class="layui-form-label">百分比返现比例</label>  
+                        <div class="layui-input-block">
+                            <input type="text" name="percent" readonly="readonly" id="percent" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityConsumReturn.percent }" >
+                        </div>  
+                    </div>
+                    
+                    <div class="layui-form-item     has-error" >   
+                        <label class="layui-form-label">消费金额</label>  
+                        <div class="layui-input-block">
+                            <input type="text" name="comsumeMoney" readonly="readonly" id="comsumeMoney" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityConsumReturn.comsumeMoney }" >
+                        </div>  
+                    </div>
+                    <div class="layui-form-item     has-error" >   
+                        <label class="layui-form-label">返现金额</label>  
+                        <div class="layui-input-block">
+                            <input type="text" name="returnMoney" id="returnMoney"  readonly="readonly" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityConsumReturn.returnMoney }" >
+                        </div>  
+                    </div>
+                    
+                    <div class="form-group">
+                            <div class="layui-form-item">          
+                                <label class="layui-form-label">活动时间类型</label>
+                                <div class="layui-input-block">
+                                    <select name="timeType" lay-filter="selectTimeType" id="timeType" disabled="disabled">  
+                                        <option value="">请选择</option>
+                                        <option value="0" <c:if test=" ${activityConsumReturn.timeType eq '0' }">selected="selected"</c:if> >永久</option>
+                                        <option value="1" <c:if test=" ${activityConsumReturn.timeType eq '1' }">selected="selected"</c:if> >设置时间</option>
+                                    </select>              
+                                </div>
+                            </div>
+                        </div>
+                        
+                       <div class="mt10 mb20" id="dateDetail">
+                                <span class="dlblock w100 textr">开始日期</span>
+                                <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+                                     <input type="text" placeholder="" name="startDt" readonly="readonly" id="date1"  value="<fmt:formatDate value='${activityConsumReturn.startDt }' pattern='yyyy-MM-dd' />"  class="w150">
+                                     <i class="fa fa-calendar"></i>
+                                </span> 
+                                <span class="dlblock w100 textr">结束日期</span>
+                                <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+                                <input type="text" placeholder="" name="endDt" readonly="readonly" id="date2" value="<fmt:formatDate value='${activityConsumReturn.endDt }' pattern='yyyy-MM-dd' />" class="w150"> 
+                                    <i class="fa fa-calendar"></i>
+                                </span>
+                         </div>
+                    
+                    <%-- <div class="layui-form-item    has-error" >   
+                        <label class="layui-form-label">活动时间类型</label>  
+                        <div class="layui-input-block">
+                            <input type="text" name="timeType" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityConsumReturn.timeType }" >
+                        </div>  
+                    </div> --%>
+    
+                </div>
+            </div>
+        </div>  
+    </div>
+</form>
+<script type="text/javascript">
+$(function(){
+    //form表单样式
+    layui.use(['layer', 'form'], function() {    
+        var layer = layui.layer,
+            form = layui.form;
+        form.render();
+    });
+    
+  /* //日历控件
+    layui.use(['layer', 'laydate'], function() {
+        var layer = layui.layer;
+        laydate = layui.laydate;
+        laydate.render({
+        elem: '#date1' //指定元素
+        });
+        laydate.render({
+            elem: '#date2' //指定元素
+        });
+    }); */
+  $("#dateDetail").hide();
+  $("#percentDetail").hide();
+  if($("#timeType").val()=='1'){
+      $("#dateDetail").show();
+  }
+  if($("#type")=='2'){
+      $("#percentDetail").show();
+  }
+});
+</script> 
+						</div>     
+					</div>
+				</div>    
+		</div>
+		<!-- 隐藏域 -->
+		<input type="hidden" id="activityConsumReturnId" value="${activityConsumReturn.id }"/>
+	</body>
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityEnroll/list.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityEnroll/list.jsp
new file mode 100644
index 0000000..256d9f2
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityEnroll/list.jsp
@@ -0,0 +1,272 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp" />
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" action="" id="form1" style="margin-top: 10px">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">商户名称</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="merchantName" id="merchantName" placeholder="请输入商户名称" autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">商户编号</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="merchantCode" id="merchantCode" placeholder="请输入商户编号" autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <!-- 表单数据 -->
+    <div class="mb50 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-hide" id="activityEnrollTab" lay-filter="activityEnrollTab"></table>
+        </div>
+    </div>
+</div>
+
+<script type="text/template" id="audit">
+    <form class="layui-form" id="form2" style="margin-top: 2rem;">
+        <input  name="id" id="id" hidden>
+        <div class="layui-form-item" style="width: 300px;">
+            <label class="layui-form-label">商户名称</label>
+            <div class="layui-input-block">
+                <input type="text" name="merchantName" id="auditName" style="cursor: pointer" placeholder="请输入商户名称"  autocomplete="off" class="layui-input layui-disabled" readonly>
+            </div>
+        </div>
+        <div class="layui-form-item" style="width: 300px;">
+            <label class="layui-form-label">审核</label>
+            <div class="layui-input-block">
+                <select class="layui-select" id="status" name="status" >
+                    <option value="">请选择</option>
+                    <option value="1">通过</option>
+                    <option value="2">驳回</option>
+                </select>
+            </div>
+        </div>
+        <div class="layui-form-item" style="width: 300px;">
+            <label class="layui-form-label">驳回原因</label>
+            <div class="layui-input-block">
+                <textarea placeholder="请输入驳回原因" name="remark" id="remark" lay-verify="required"  required autocomplete="off" class="layui-textarea"></textarea>
+            </div>
+        </div>
+    </form>
+</script>
+
+<script type="text/html" id="leftBar">
+    <%--<button type="button" class="layui-btn layui-btn-sm" lay-event="add"><i class="layui-icon">&#xe608;</i>新增</button>--%>
+    <button type="button" class="layui-btn layui-btn-normal layui-btn-sm" lay-event="search"><i class="layui-icon">&#xe615;</i>查询</button>
+</script>
+
+<script type="text/html" id="toolBar">
+    {{#  if(d.status == 0){ }}
+    <button type="button" class="layui-btn layui-btn-sm" lay-event="audit"><i class="layui-icon">&#xe642;</i>审核</button>
+    {{# } }}
+    <%--<button type="button" class="layui-btn layui-btn-sm layui-btn-danger" lay-event="del"><i class="layui-icon">&#xe640;</i>删除</button>--%>
+</script>
+
+<script>
+    var actTypeList = JSON.parse('${actTypeList}');
+    layui.use(['table', 'layer','form'], function(){
+        var table = layui.table;
+        var layer = layui.layer;
+        var form = layui.form;
+        var tableIns = table.render({
+            elem: '#activityEnrollTab'
+            ,url:'${ctx}/activityEnroll/page'
+            ,id: 'activityEnroll'
+            ,response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                ,countName: 'count' //数据总数的字段名称，默认：count
+                ,dataName: 'data' //默数据列表的字段名称，认：data
+                ,statusCode : 200
+            }
+            ,parseData: function(res){ //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            ,toolbar: '#leftBar' //开启头部工具栏，并为其绑定左侧模板
+            , defaultToolbar: ['filter']
+            ,defaultToolbar: ['filter', 'exports', 'print', { //自定义头部工具栏右侧图标。如无需自定义，去除该参数即可
+                title: '提示'
+                ,layEvent: 'LAYTABLE_TIPS'
+                ,icon: 'layui-icon-tips'
+            }]
+            ,title: '商户引导话术信息表'
+            ,cols: [[
+                {type: 'checkbox', fixed: 'left', hidden: true}
+                ,{field:'numbers', title:'序号', fixed: 'left', unresize: true, width:80, type:'numbers'}
+                ,{field:'merchantName', title:'商户名称'}
+                ,{field:'merchantCode', title:'商户编号'}
+                ,{field:'actName', title:'活动名称'}
+                ,{field:'actId', title:'活动ID'}
+                ,{field:'actType', title:'活动类型',templet:function (d) {
+                    return getDictText(d.actType,actTypeList,'value');
+                }}
+                ,{field:'deviceNo', title:'设备SN号/激活码'}
+                ,{field:'status', title:'状态',templet: function (d) {
+                    if(d.status == '0'){
+                        return "<span style='color: orange'>申请中</span>"
+                    }else if(d.status == '1'){
+                        return "<span style='color: green'>通过</span>"
+                    }else{
+                        return "<span style='color: red'>驳回</span>"
+                    }
+                 }}
+                ,{field:'remark', title:'驳回原因'}
+                ,{field: 'createTime', title: '创建时间', width: 160, templet : "<div>{{layui.util.toDateString(d.createTime,'yyyy-MM-dd HH:mm:ss')}}</div>"}
+                ,{fixed: 'right', title:'操作',width:200, toolbar: '#toolBar'}
+            ]]
+            ,request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                ,limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            ,page: true
+        });
+        table.on('tool(activityEnrollTab)', function(obj){ //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            var data = obj.data; //获得当前行数据
+            var layEvent = obj.event; //获得 lay-event 对应的值（也可以是表头的 event 参数对应的值）
+            if(layEvent === 'audit'){ //审核
+                //do something
+                toAudit(obj);
+                //同步更新缓存对应的值
+                // obj.update({
+                //     username: '123'
+                //     ,title: 'xxx'
+                // });
+            }
+        });
+
+        //监听头工具栏事件
+        table.on('toolbar(activityEnrollTab)', function (obj) {
+            switch (obj.event) {
+                case 'add':
+                    // 添加
+                    toAdd();
+                    break;
+                case 'search':
+                    var params= serialize($('#form1'));
+                    table.reload('activityEnroll', {
+                        where: params
+                        , page: {
+                            size: 10
+                            , current: 1
+                        }
+                    });
+                    break;
+            }
+        });
+        function toAudit(obj) {
+            var index = layer.open({
+                type: 1
+                ,shade: 0.5
+                ,title: '审核'
+                ,maxmin: true
+                ,content: $("#audit").html()
+                ,area: ['400px', '400px']
+                ,btn: ['保存','取消',]
+                ,shadeClose: true
+                ,btn1: function(index, layero) {
+                    if($("#status").val() === "2"){
+                        if(!$("#remark").val()){
+                            layer.msg("驳回需填写驳回原因!");
+                            return;
+                        }
+                    }
+                    if(!$("#status").val()){
+                        layer.msg("请先选择审核通过或驳回!");
+                        return;
+                    }
+                    layer.close(index);
+                    toAuditEdit(obj);
+                }
+                ,btn2: function(index, layero){
+                    layer.close(index);
+                }
+                ,success:function () {
+                    $("#id").val(obj.data.id);
+                    $("#auditName").val(obj.data.merchantName);
+                }
+            });
+            form.render();
+        }
+
+        function toAuditEdit(obj) {
+            var data = $("#form2").serializeObject();
+            $.ajax({
+                url: '${ctx}/activityEnroll/saveOrUpdate',
+                method: 'post',
+                data: JSON.stringify(data),
+                dataType: 'JSON',
+                contentType:"application/json",
+                success: function(res) {
+                    if(res.code == 200) {
+                        layer.msg(res.data, {
+                            icon: 1
+                        });
+                        obj.update({
+                            status: data.status,
+                            remark: data.remark
+                        });
+                        $("[lay-event=audit]").hide();
+                    } else {
+                        layer.msg(res.data, {
+                            icon: 2
+                        });
+                    }
+                }
+            })
+        }
+    });
+
+    jQuery.prototype.serializeObject=function(){
+        var obj=new Object();
+        $.each(this.serializeArray(),function(index,param){
+            if(!(param.name in obj)){
+                obj[param.name]=param.value;
+            }
+        });
+        return obj;
+    };
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityRecharge/activityRechargeBaseInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityRecharge/activityRechargeBaseInfo.jsp
new file mode 100644
index 0000000..d869730
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityRecharge/activityRechargeBaseInfo.jsp
@@ -0,0 +1,190 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"  prefix="fmt"%>
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">  
+	<div class="tab-pane active">     
+		<div class="panel-body">
+			<div class="wrapper wrapper-content">
+				<div class="panel-form animated fadeInRight wp60 fc">
+					<div class="layui-form-item dn	has-error" >   
+						<label class="layui-form-label">id</label>  
+						<div class="layui-input-block">
+							<input type="text" name="id" id="Id" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityRecharge.id }" >
+						</div>  
+					</div>
+					<%-- <div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">userId</label>  
+						<div class="layui-input-block">
+							<input type="text" name="userId" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityRecharge.userId }" >
+						</div>  
+					</div> --%>
+					<!--管理员看到的  -->
+					<c:if test="${admin eq 'admin' }">
+					   <div class="form-group">
+                            <div class="layui-form-item">          
+                                <label class="layui-form-label">商户</label>
+                                <div class="layui-input-block">
+                                    <select name="merchantCode" lay-filter="selectMerchantCode" id="merchantCode">  
+                                        <option value="">请选择</option>
+                                        <c:forEach items="${merchantBaseInfoList }" var="mb">
+                                            <option value="${mb.merchantCode }" <c:if test="${activityRecharge.merchantCode eq mb.merchantCode }">selected</c:if>>${mb.merchantName }</option>
+                                        </c:forEach>
+                                    </select>              
+                                </div>
+                            </div>
+                       </div>
+                        
+                       <div class="form-group">
+                            <div class="layui-form-item">          
+                                <label class="layui-form-label">门店</label>
+                                <div class="layui-input-block">
+                                    <select name="storeId" id="storeId">  
+                                        <option value="">请选择</option>
+                                        <c:forEach items="${merchantStoreList }" var="ms">
+                                            <option value="${ms.storeId }" <c:if test="${ms.storeId eq activityRecharge.storeId }">selected</c:if>>${ms.storeName }</option>
+                                        </c:forEach>
+                                    </select>              
+                                </div>
+                            </div>
+                       </div>
+					</c:if>
+					
+					<!--不是管理员看到的  -->
+                    <c:if test="${admin ne 'admin' }">
+                       <div class="form-group">
+                            <div class="layui-form-item">          
+                                <label class="layui-form-label">门店</label>
+                                <div class="layui-input-block">
+                                    <select name="storeId" id="storeId">  
+                                        <option value="">请选择</option>
+                                        <c:forEach items="${merchantStoreList }" var="ms">
+                                            <option value="${ms.storeId }" <c:if test="${ms.storeId eq activityRecharge.storeId }">selected</c:if>>${ms.storeName }</option>
+                                        </c:forEach>
+                                    </select>              
+                                </div>
+                            </div>
+                        </div>
+                    </c:if>
+					
+					<div class="layui-form-item    has-error" >   
+                        <label class="layui-form-label">活动名称</label>  
+                        <div class="layui-input-block">
+                            <input type="text" name="name" id="name" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityRecharge.name }" >
+                        </div>  
+                    </div>
+					
+					<%-- <div class="layui-form-item   has-error" >   
+                        <label class="layui-form-label">storeId</label>  
+                        <div class="layui-input-block">
+                            <input type="text" name="storeId" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityRecharge.storeId }" >
+                        </div>  
+                    </div>
+                    <div class="layui-form-item     has-error" >   
+                        <label class="layui-form-label">storeName</label>  
+                        <div class="layui-input-block">
+                            <input type="text" name="storeName" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityRecharge.storeName }" >
+                        </div>  
+                    </div> --%>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">充值金额</label>  
+						<div class="layui-input-block">
+							<input type="text" name="rechargeMoney" id="rechargeMoney" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityRecharge.rechargeMoney }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">赠送金额</label>  
+						<div class="layui-input-block">
+							<input type="text" name="giveMoney" id="giveMoney" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityRecharge.giveMoney }" >
+						</div>  
+					</div>
+					
+					<%-- <div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">startDt</label>  
+						<div class="layui-input-block">
+							<input type="text" name="startDt" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityRecharge.startDt }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">noticeCode</label>  
+						<div class="layui-input-block">
+							<input type="text" name="noticeCode" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityRecharge.noticeCode }" >
+						</div>  
+					</div> --%>
+					<%-- <div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">createDt</label>  
+						<div class="layui-input-block">
+							<input type="text" name="createDt" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityRecharge.createDt }" >
+						</div>  
+					</div> --%>
+					
+						<div class="form-group">
+			                <div class="layui-form-item">          
+			                    <label class="layui-form-label">时间类型</label>
+			                    <div class="layui-input-block">
+			                        <select name="timeType" lay-filter="selectTimeType" id="timeType">  
+			                           <!--  <option value="">请选择</option> -->
+			                            <option value="0" <c:if test="${activityRecharge.timeType eq '0' }">selected</c:if> >永久</option>
+			                            <option value="1" <c:if test="${activityRecharge.timeType eq '1' }">selected</c:if> >设置时间</option>
+			                        </select>              
+			                    </div>
+			                </div>
+			            </div>
+			            
+					         <div class="mt10 mb20" id="dateDetail">
+		                        <span class="dlblock w100 textr">开始日期</span>
+		                        <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+		                             <input type="text" placeholder="" name="startDt" id="date1" class="w150"  value="<fmt:formatDate value='${activityRecharge.startDt }' pattern='yyyy-MM-dd' />" >
+		                             <i class="fa fa-calendar"></i>
+		                        </span> 
+		                        <span class="dlblock w100 textr">结束日期</span>
+		                        <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+		                        <input type="text" placeholder="" name="endDt" id="date2" class="w150" value="<fmt:formatDate value='${activityRecharge.endDt }' pattern='yyyy-MM-dd' />" > 
+		                            <i class="fa fa-calendar"></i>
+		                        </span>
+		                    </div>
+					
+					<%-- <div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">时间类型</label>  
+						<div class="layui-input-block">
+							<input type="text" name="timeType"  lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityRecharge.timeType }" >
+						</div>  
+					</div> --%>
+	               <c:if test="${admin eq 'admin' }">
+                       <input type="hidden" id="isAdmin" value="1">
+                    </c:if>
+                    <c:if test="${admin ne 'admin' }">
+                       <input type="hidden" id="isAdmin" value="0">
+                    </c:if>
+				</div>
+			</div>
+		</div>  
+	</div>
+</form>
+<script type="text/javascript">
+$(function(){
+	//form表单样式
+    layui.use(['layer', 'form'], function() {    
+        var layer = layui.layer,
+            form = layui.form;
+        form.render();
+    });
+  //日历控件
+    layui.use(['layer', 'laydate'], function() {
+        var layer = layui.layer;
+        laydate = layui.laydate;
+        laydate.render({
+        elem: '#date1' //指定元素
+        });
+        laydate.render({
+            elem: '#date2' //指定元素
+        });
+    });
+    $("#dateDetail").hide();
+     if($("#timeType").val()=='1'){
+    	$("#dateDetail").show();
+    }
+})
+    
+</script> 
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityRecharge/activityRechargeDetails.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityRecharge/activityRechargeDetails.jsp
new file mode 100644
index 0000000..5814444
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityRecharge/activityRechargeDetails.jsp
@@ -0,0 +1,55 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>     
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">                      
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black"> 
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> 
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->                                     
+<meta name="viewport"
+	content="width=device-width, initial-scale=1.0, maximum-scale=1.0">   
+<jsp:include page="../../common.jsp" />
+<script type="text/javascript">
+    require("activityRecharge/activityRechargeDetails.js");
+</script>
+<title>编辑</title>
+</head>                                 
+	<body class="lgraybg">
+		<div class="	container-fluid animated fadeInRight col-sm-12">
+			<div class="panel-toolbar mt10 mb10 pt5 pb5 pl10 bdd whitebg">
+				<div class="buttons">
+					<a href="javascript:void(0);" class="layui-btn layui-btn-sm layui-btn-danger fa fa-save f12"><span>保存</span></a>
+					<a href="${ctx }/activityRecharge/index?pageIndex=${pageIndex}"  class="layui-btn layui-btn-sm fa fa-back f12" id="goback"><span>返回</span></a>
+				</div>
+			</div>
+				<div class="tabs-container whitebg">
+					<div class="pt10 pl5 pr5">
+						<ul class="nav nav-tabs" id="nav-tabs">
+							<li class="active" data-action="base">   
+								<a href="javascript:void(0);" >基本资料</a>
+							</li>
+							<!-- <li class="" data-action="functions">
+								<a href="javascript:void(0);"  >多功能输入</a>
+							</li>
+							<li class="" data-action="extends">
+								<a href="javascript:void(0);" >扩展属性</a>
+							</li> -->
+						</ul>
+						<div class="tab-content pt30 p30">               
+		
+						</div>     
+					</div>
+				</div>    
+		</div>
+		<!-- 隐藏域 -->
+		<input type="hidden" id="activityRechargeId" value="${activityRecharge.id }"/>
+
+	</body>
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityRecharge/activityRechargeExtendsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityRecharge/activityRechargeExtendsInfo.jsp
new file mode 100644
index 0000000..592687a
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityRecharge/activityRechargeExtendsInfo.jsp
@@ -0,0 +1,201 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>           
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> 
+<div class="tab-pane active">      
+	<div class="animated fadeInRight">
+		<div class="whitebg pl10 pr10">
+			<table class="table table-striped table-bordered table-hover">     
+				<thead> 
+					<tr>  
+						<th class="textc">序号</th>         
+						<th class="textc wp15">流水账号</th>
+						<th class="textc">日期</th>         
+						<th class="textc">财务类别</th>     
+						<th class="textc">金额</th>         
+						<th class="textc">银行</th>         
+						<th class="textc">发票</th>         
+						<th class="textc">客户名称</th>     
+						<th class="textc wp15">单号</th>    
+						<th class="textc">状态</th>         
+						<th class="textc">类别</th>         
+						<th class="textc">操作</th>         
+					</tr> 
+				</thead>
+				<tbody> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+                
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="green">支出</span></td>     
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+				</tbody>
+                
+			</table>  
+			<!-- footer -->  
+			<div class="clearfix mb10 pb20">          
+					<div class="layui-tab-item fr">       
+							<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+							<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>   
+							<div class="pagination dlblock vm" id="pagination"></div>
+							<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>            
+					</div>
+				</div>  
+		</div>      
+	</div>        
+</div>          
+                
+<script type="text/javascript">    
+//分页          
+$('#pagination').pagination({        
+	pageCount: 50,
+	jump: true,   
+	coping: true, 
+	homePage: '首页',    
+	endPage: '末页',     
+	prevContent: '上页', 
+	nextContent: '下页', 
+	callback: function(api) {          
+		$('.now').text(api.getCurrent());
+	}             
+});             
+</script>       
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityRecharge/activityRechargeFunctionsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityRecharge/activityRechargeFunctionsInfo.jsp
new file mode 100644
index 0000000..982ce84
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityRecharge/activityRechargeFunctionsInfo.jsp
@@ -0,0 +1,130 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>		
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">      
+<div class="tab-pane active">
+				<div class="panel-body">
+					<div class="wrapper wrapper-content">     
+						<div class="panel-form animated fadeInRight wp60 fc">
+							<!-- 账号资料 -->
+			<div class="layui-form-item 	has-error">
+				<label class="layui-form-label">单行输入框<i class="red">*</i></label>
+				<div class="layui-input-block">
+					<input type="text" name="title" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input">
+				</div>                                         
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">自定义验证</label>
+				<div class="layui-input-inline ml30">
+					<input type="password" name="password" lay-verify="pass" placeholder="请输入密码" autocomplete="off" class="layui-input">
+				</div>
+				<div class="layui-form-mid layui-word-aux">请填写6到12位密码</div>
+			</div>
+			<div class="form-group">
+				<div class="layui-form-item">          
+					<label class="layui-form-label">单行选择框</label>
+					<div class="layui-input-block">
+						<select name="interest" lay-filter="aihao">  
+							<option value=""></option>
+							<option value="0">写作</option>         
+							<option value="1" selected="">阅读</option>
+							<option value="2">游戏</option>
+							<option value="3">音乐</option>
+							<option value="4">旅行</option>  
+						</select>              
+					</div>
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<div class="layui-inline">  
+					<label class="layui-form-label">范围</label>
+					<div class="layui-input-inline ml30">
+						<input type="text" name="price_min" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>                                     
+					<div class="layui-form-mid">-</div>
+					<div class="layui-input-inline">       
+						<input type="text" name="price_max" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>
+				</div>           
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">联动选择框</label>
+				<div class="layui-input-inline ml30">
+					<select name="quiz1">     
+						<option value="">请选择省</option>
+						<option value="浙江" selected="">浙江省</option> 
+						<option value="你的工号">江西省</option>           
+						<option value="你最喜欢的老师">福建省</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz2">
+						<option value="">请选择市</option>
+						<option value="杭州">杭州</option>
+						<option value="宁波" disabled="">宁波</option>
+						<option value="温州">温州</option>
+						<option value="温州">台州</option>
+						<option value="温州">绍兴</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz3">
+						<option value="">请选择县/区</option>
+						<option value="西湖区">西湖区</option>
+						<option value="余杭区">余杭区</option>
+						<option value="拱墅区">临安市</option>
+					</select>
+				</div>    
+			</div>
+			<div class="layui-form-item" pane="">   
+				<label class="layui-form-label">原始复选框</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="like1[write]" lay-skin="primary" title="写作" checked="">  
+					<input type="checkbox" name="like1[read]" lay-skin="primary" title="阅读">
+					<input type="checkbox" name="like1[game]" lay-skin="primary" title="游戏" disabled="">
+				</div>
+			</div>
+
+			<div class="layui-form-item">
+				<label class="layui-form-label">开关-默认关</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="close" lay-skin="switch" lay-text="ON|OFF">
+				</div>
+			</div>
+			<div class="layui-form-item">  
+				<label class="layui-form-label">单选框</label>
+				<div class="layui-input-block">
+					<input type="radio" name="sex" value="男" title="男" checked="">
+					<input type="radio" name="sex" value="女" title="女">
+					<input type="radio" name="sex" value="禁" title="禁用" disabled="">
+				</div>
+			</div>
+			<!--<div class="layui-form-item layui-form-text">
+				<label class="layui-form-label">上传图片</label>
+				<div class="layui-input-block">
+					<div class="layui-upload-drag w200 h200">
+						<i class="layui-icon"></i>          
+						<p>点击上传</p>
+					</div>
+				</div>
+			</div>-->
+				<div class="layui-form-item layui-form-text">
+					<label class="layui-form-label">普通文本域</label>  
+					<div class="layui-input-block">              
+						<textarea placeholder="请输入内容" class="layui-textarea"></textarea>
+					</div>
+				</div>
+			</div>
+		</div>   
+	</div>
+</div>
+</form>   
+<script type="text/javascript">
+	//form表单样式
+	layui.use(['layer', 'form'], function() {    
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+</script>                 
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityRecharge/activityRechargeList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityRecharge/activityRechargeList.jsp
new file mode 100644
index 0000000..01591d7
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityRecharge/activityRechargeList.jsp
@@ -0,0 +1,130 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+    <script type="text/javascript">
+        require("activityRecharge/activityRechargeList.js");
+    </script>
+    <style type="text/css">
+        .layui-table th {
+            text-align: center;
+        }
+    </style>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="buttons fl">
+                        <a class="layui-btn layui-btn-sm fa fa-search f13" href="javascript:void(0);"
+                           onclick="queryActivityRecharge()"><span>搜索</span></a>
+                        <c:if test="${admin eq 'admin'||merchant eq 'merchant' }">
+                            <a class="layui-btn layui-btn-sm fa fa-plus f13 add" href="javascript:void(0);"
+                               onclick="initAddActivityRecharge()"><span>添加</span></a>
+                            <a class="layui-btn layui-btn-sm fa fa-edit f13" href="javascript:void(0);"
+                               onclick="initEditActivityRecharge()"><span>编辑</span></a>
+                            <a class="layui-btn layui-btn-sm layui-btn-danger fa fa-remove f13 delete"
+                               href="javascript:void(0);"
+                               onclick="initBatchDeleteActivityRecharge()"><span>删除</span></a>
+                        </c:if>
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <div class="row pt10 pb10 whitebg ml0 mr0">
+                    <span class="dlblock w100 textr">ID：</span>
+                    <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+							<input type="text" placeholder="请输入内容" id="searchId">  
+						</span>
+                    <span class="dlblock w100 textr">商户名称：</span>
+                    <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+							<input type="text" placeholder="请输入名称" id="name">
+						</span>
+                    <!-- <span class="dlblock w100 textr">类别：</span>
+                     <select class="form-control f12 w180 textc">
+                        <option value="">支出</option>
+                        <option value="">收入</option>
+                    </select> -->
+                    <%--					</div>--%>
+                    <%--					<div class="mt10 mb20">--%>
+                    <span class="dlblock w100 textr">开始日期</span>
+                    <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+							 <input type="text" placeholder="" name="startDt" id="date1" class="w150">
+							 <i class="fa fa-calendar"></i>
+						</span>
+                    <span class="dlblock w100 textr">结束日期</span>
+                    <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+						<input type="text" placeholder="" name="endDt" id="date2" class="w150"> 
+							<i class="fa fa-calendar"></i>
+						</span>
+                </div>
+            </div>
+        </div>
+    </div>
+    <!-- 表单数据 -->
+    <div class="mb20 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-table">
+                <thead>
+                <tr>
+                    <th class="textc">
+                        <div class="checker" id="allCheck">
+                            <span class=""><input type="checkbox" value=""></span>
+                        </div>
+                    </th>
+                    <th class="textc ">序号</th>
+                    <th class="textc ">ID</th>
+                    <th class="textc wp15">活动名称</th>
+                    <!-- <th class="textc ">userId</th>
+                    <th class="textc ">merchantCode</th> -->
+                    <th class="textc ">商家名称</th>
+                    <th class="textc ">门店名称</th>
+                    <th class="textc ">充值金额</th>
+                    <th class="textc ">赠送金额</th>
+                    <th class="textc ">开始时间</th>
+                    <th class="textc ">结束时间</th>
+                    <th class="textc ">时间类型</th>
+                    <!-- <th class="textc ">storeId</th> -->
+                    <th class="textc ">创建时间</th>
+                    <th class="textc">编辑</th>
+                </tr>
+                </thead>
+                <!-- 数据体 -->
+                <tbody id="data_content">
+                </tbody>
+            </table>
+            <!-- footer -->
+            <div class="clearfix mb10 pb20">
+                <div class="layui-tab-item fr">
+                    <span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+                    <span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>
+                    <div class="pagination dlblock vm" id="pagination"></div>
+                    <span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityRecharge/otherActivityRechargeDetails.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityRecharge/otherActivityRechargeDetails.jsp
new file mode 100644
index 0000000..d31c5a8
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityRecharge/otherActivityRechargeDetails.jsp
@@ -0,0 +1,245 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport"
+          content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+    <script type="text/javascript">
+    </script>
+    <title>详情</title>
+</head>
+<body class="lgraybg">
+<div class="	container-fluid animated fadeInRight col-sm-12">
+    <div class="panel-toolbar mt10 mb10 pt5 pb5 pl10 bdd whitebg">
+        <div class="buttons">
+            <!-- <a href="javascript:void(0);" class="btn btn-primary fa fa-save f12"><span>保存</span></a> -->
+            <a href="${ctx }/activityRecharge/index?pageIndex=${pageIndex}" class="btn btn-primary fa fa-back f12"
+               id="goback"><span>返回</span></a>
+        </div>
+    </div>
+    <div class="tabs-container whitebg">
+        <div class="pt10 pl5 pr5">
+            <ul class="nav nav-tabs" id="nav-tabs">
+                <li class="active" data-action="base">
+                    <a href="javascript:void(0);">基本资料</a>
+                </li>
+                <!-- <li class="" data-action="functions">
+                    <a href="javascript:void(0);"  >多功能输入</a>
+                </li>
+                <li class="" data-action="extends">
+                    <a href="javascript:void(0);" >扩展属性</a>
+                </li> -->
+            </ul>
+            <div class="tab-content pt30 p30">
+                <form class="layui-form whitebg pb10 pt10" action="" id="data_form">
+                    <div class="tab-pane active">
+                        <div class="panel-body">
+                            <div class="wrapper wrapper-content">
+                                <div class="panel-form animated fadeInRight wp60 fc">
+                                    <div class="layui-form-item dn  has-error">
+                                        <label class="layui-form-label">id</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" name="id" lay-verify="title" autocomplete="off"
+                                                   placeholder="请输入内容" class="layui-input"
+                                                   value="${activityRecharge.id }">
+                                        </div>
+                                    </div>
+                                    <%-- <div class="layui-form-item    has-error" >
+                                        <label class="layui-form-label">userId</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" name="userId" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityRecharge.userId }" >
+                                        </div>
+                                    </div> --%>
+                                    <!--管理员看到的  -->
+                                    <c:if test="${admin eq 'admin' }">
+                                        <div class="form-group">
+                                            <div class="layui-form-item">
+                                                <label class="layui-form-label">商户</label>
+                                                <div class="layui-input-block">
+                                                    <select name="merchantCode" lay-filter="selectMerchantCode"
+                                                            id="merchantCode" disabled="disabled">
+                                                        <option value="">请选择</option>
+                                                        <c:forEach items="${merchantBaseInfoList }" var="mb">
+                                                            <option value="${mb.merchantCode }"
+                                                                    <c:if test="${activityRecharge.merchantCode eq mb.merchantCode }">selected</c:if>>${mb.merchantName }</option>
+                                                        </c:forEach>
+                                                    </select>
+                                                </div>
+                                            </div>
+                                        </div>
+
+                                        <div class="form-group">
+                                            <div class="layui-form-item">
+                                                <label class="layui-form-label">门店</label>
+                                                <div class="layui-input-block">
+                                                    <select name="storeId" id="storeId" disabled="disabled">
+                                                        <option value="">请选择</option>
+                                                        <c:forEach items="${merchantStoreList }" var="ms">
+                                                            <option value="${ms.storeId }"
+                                                                    <c:if test="${ms.storeId eq activityRecharge.storeId }">selected</c:if>>${ms.storeName }</option>
+                                                        </c:forEach>
+                                                    </select>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </c:if>
+
+                                    <!--不是管理员看到的  -->
+                                    <c:if test="${admin ne 'admin' }">
+                                        <div class="form-group">
+                                            <div class="layui-form-item">
+                                                <label class="layui-form-label">门店</label>
+                                                <div class="layui-input-block">
+                                                    <select name="storeId" id="storeId" disabled="disabled">
+                                                        <option value="">请选择</option>
+                                                        <c:forEach items="${merchantStoreList }" var="ms">
+                                                            <option value="${ms.storeId }"
+                                                                    <c:if test="${ms.storeId eq activityRecharge.storeId }">selected</c:if>>${ms.storeName }</option>
+                                                        </c:forEach>
+                                                    </select>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </c:if>
+
+                                    <div class="layui-form-item    has-error">
+                                        <label class="layui-form-label">活动名称</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" name="name" readonly="readonly" id="name"
+                                                   lay-verify="title" autocomplete="off" placeholder="请输入内容"
+                                                   class="layui-input" value="${activityRecharge.name }">
+                                        </div>
+                                    </div>
+
+                                    <div class="layui-form-item     has-error">
+                                        <label class="layui-form-label">充值金额</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" name="rechargeMoney" readonly="readonly"
+                                                   id="rechargeMoney" lay-verify="title" autocomplete="off"
+                                                   placeholder="请输入内容" class="layui-input"
+                                                   value="${activityRecharge.rechargeMoney }">
+                                        </div>
+                                    </div>
+                                    <div class="layui-form-item     has-error">
+                                        <label class="layui-form-label">赠送金额</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" name="giveMoney" id="giveMoney" readonly="readonly"
+                                                   lay-verify="title" autocomplete="off" placeholder="请输入内容"
+                                                   class="layui-input" value="${activityRecharge.giveMoney }">
+                                        </div>
+                                    </div>
+
+                                    <%-- <div class="layui-form-item    has-error" >
+                                        <label class="layui-form-label">startDt</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" name="startDt" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityRecharge.startDt }" >
+                                        </div>
+                                    </div>
+                                    <div class="layui-form-item     has-error" >
+                                        <label class="layui-form-label">noticeCode</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" name="noticeCode" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityRecharge.noticeCode }" >
+                                        </div>
+                                    </div> --%>
+                                    <%-- <div class="layui-form-item    has-error" >
+                                        <label class="layui-form-label">createDt</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" name="createDt" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityRecharge.createDt }" >
+                                        </div>
+                                    </div> --%>
+
+                                    <div class="form-group">
+                                        <div class="layui-form-item">
+                                            <label class="layui-form-label">时间类型</label>
+                                            <div class="layui-input-block">
+                                                <select name="timeType" lay-filter="selectTimeType" id="timeType"
+                                                        disabled="disabled">
+                                                    <option value="">请选择</option>
+                                                    <option value="0"
+                                                            <c:if test="${activityRecharge.timeType eq '0' }">selected="selected"</c:if> >
+                                                        永久
+                                                    </option>
+                                                    <option value="1"
+                                                            <c:if test="${activityRecharge.timeType eq '1' }">selected="selected"</c:if> >
+                                                        设置时间
+                                                    </option>
+                                                </select>
+                                            </div>
+                                        </div>
+                                    </div>
+
+                                    <div class="mt10 mb20" id="dateDetail">
+                                        <span class="dlblock w100 textr">开始日期</span>
+                                        <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+                                     <input type="text" placeholder="" name="startDt" readonly="readonly" id="date1"
+                                            class="w150"
+                                            value="<fmt:formatDate value='${activityRecharge.startDt }' pattern='yyyy-MM-dd' />">
+                                     <i class="fa fa-calendar"></i>
+                                </span>
+                                        <span class="dlblock w100 textr">结束日期</span>
+                                        <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+                                <input type="text" placeholder="" name="noticeCode" readonly="readonly" id="date2"
+                                       class="w150"
+                                       value="<fmt:formatDate value='${activityRecharge.noticeCode }' pattern='yyyy-MM-dd' />">
+                                    <i class="fa fa-calendar"></i>
+                                </span>
+                                    </div>
+
+                                    <%-- <div class="layui-form-item    has-error" >
+                                        <label class="layui-form-label">时间类型</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" name="timeType"  lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityRecharge.timeType }" >
+                                        </div>
+                                    </div> --%>
+
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+                <script type="text/javascript">
+                    $(function () {
+                        //form表单样式
+                        layui.use(['layer', 'form'], function () {
+                            var layer = layui.layer,
+                                form = layui.form;
+                            form.render();
+                        });
+                        /* //日历控件
+                          layui.use(['layer', 'laydate'], function() {
+                              var layer = layui.layer;
+                              laydate = layui.laydate;
+                              laydate.render({
+                              elem: '#date1' //指定元素
+                              });
+                              laydate.render({
+                                  elem: '#date2' //指定元素
+                              });
+                          }); */
+                        $("#dateDetail").hide();
+                        if ($("#timeType").val() == '1') {
+                            $("#dateDetail").show();
+                        }
+                    })
+                </script>
+            </div>
+        </div>
+    </div>
+</div>
+<!-- 隐藏域 -->
+<input type="hidden" id="activityRechargeId" value="${activityRecharge.id }"/>
+</body>
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityRecommend/activityRecommendBaseInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityRecommend/activityRecommendBaseInfo.jsp
new file mode 100644
index 0000000..df3186c
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityRecommend/activityRecommendBaseInfo.jsp
@@ -0,0 +1,141 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">  
+	<div class="tab-pane active">     
+		<div class="panel-body">
+			<div class="wrapper wrapper-content">
+				<div class="panel-form animated fadeInRight wp60 fc">
+					<div class="layui-form-item dn	has-error" >   
+						<label class="layui-form-label">id</label>  
+						<div class="layui-input-block">
+							<input type="text" name="id" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityRecommend.id }" >
+						</div>  
+					</div>
+					<%-- <div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">userId</label>  
+						<div class="layui-input-block">
+							<input type="text" name="userId" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityRecommend.userId }" >
+						</div>  
+					</div> --%>
+					<!--  管理员看到的-->
+					<shiro:hasAnyRoles name="超级系统管理员">
+					       <div class="form-group">
+                            <div class="layui-form-item">          
+                                <label class="layui-form-label">商户</label>
+                                <div class="layui-input-block">
+                                    <select name="merchantCode" lay-filter="selectMerchantCode" id="merchantCode">  
+                                        <option value="">请选择</option>
+                                        <c:forEach items="${merchantBaseInfoList }" var="mb">
+                                            <option value="${mb.merchantCode }" <c:if test="${activityRecommend.merchantCode eq mb.merchantCode }">selected</c:if>>${mb.merchantName }</option>
+                                        </c:forEach>
+                                    </select>              
+                                </div>
+                            </div>
+                        </div>
+                        
+                        <div class="form-group">
+                            <div class="layui-form-item">          
+                                <label class="layui-form-label">门店</label>
+                                <div class="layui-input-block">
+                                    <select name="storeId" id="storeId">  
+                                        <option value="">请选择</option>
+                                        <c:forEach items="${merchantStoreList }" var="ms">
+                                            <option value="${ms.storeId }" <c:if test="${ms.storeId eq activityRecommend.storeId }">selected</c:if>>${ms.storeName }</option>
+                                        </c:forEach>
+                                    </select>              
+                                </div>
+                            </div>
+                        </div>
+                        <input type="hidden" id="isAdmin" value="1">
+					</shiro:hasAnyRoles>
+					
+					<!-- 不是管理员 但是是商户看到的 -->
+					<shiro:lacksRole name="超级系统管理员">
+						   <c:if test="${not empty sessionScope.merchantCodeSession}">
+							 <div class="form-group">
+	                            <div class="layui-form-item">          
+	                                <label class="layui-form-label">门店</label>
+	                                <div class="layui-input-block">
+	                                    <select name="storeId" id="storeId">  
+	                                        <option value="">请选择</option>
+	                                        <c:forEach items="${merchantStoreList }" var="ms">
+	                                            <option value="${ms.storeId }" <c:if test="${ms.storeId eq activityRecommend.storeId }">selected</c:if>>${ms.storeName }</option>
+	                                        </c:forEach>
+	                                    </select>              
+	                                </div>
+	                            </div>
+	                        </div>
+						   </c:if>
+					</shiro:lacksRole>
+					
+					<%-- <div class="layui-form-item    has-error" >   
+                        <label class="layui-form-label">merchantCode</label>  
+                        <div class="layui-input-block">
+                            <input type="text" name="merchantCode" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityRecommend.merchantCode }" >
+                        </div>  
+                    </div>
+                    <div class="layui-form-item     has-error" >   
+                        <label class="layui-form-label">merchantName</label>  
+                        <div class="layui-input-block">
+                            <input type="text" name="merchantName" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityRecommend.merchantName }" >
+                        </div>  
+                    </div>
+                    <div class="layui-form-item     has-error" >   
+                        <label class="layui-form-label">storeId</label>  
+                        <div class="layui-input-block">
+                            <input type="text" name="storeId" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityRecommend.storeId }" >
+                        </div>  
+                    </div>
+                    <div class="layui-form-item     has-error" >   
+                        <label class="layui-form-label">storeName</label>  
+                        <div class="layui-input-block">
+                            <input type="text" name="storeName" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityRecommend.storeName }" >
+                        </div>  
+                    </div> --%>
+					
+					
+					
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">活动名称</label>  
+						<div class="layui-input-block">
+							<input type="text" name="name" id="name" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityRecommend.name }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">首充最低充值金额</label>  
+						<div class="layui-input-block">
+							<input type="text" name="firstMixRechargeMoney" id="firstMixRechargeMoney" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityRecommend.firstMixRechargeMoney }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">推荐人与被推荐人金额</label>  
+						<div class="layui-input-block">
+							<input type="text" name="recommendMoney" id="recommendMoney" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityRecommend.recommendMoney }" >
+						</div>  
+					</div>
+					<%-- <div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">createDt</label>  
+						<div class="layui-input-block">
+							<input type="text" name="createDt" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${activityRecommend.createDt }" >
+						</div>  
+					</div> --%>
+	
+				</div>
+			</div>
+		</div>  
+	</div>
+</form>
+
+<script type="text/javascript">
+$(function(){
+    //form表单样式
+    layui.use(['layer', 'form'], function() {    
+        var layer = layui.layer,
+            form = layui.form;
+        form.render();
+    });
+})
+    
+</script>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityRecommend/activityRecommendDetails.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityRecommend/activityRecommendDetails.jsp
new file mode 100644
index 0000000..91c63f0
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityRecommend/activityRecommendDetails.jsp
@@ -0,0 +1,54 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>     
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">                      
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black"> 
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> 
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->                                     
+<meta name="viewport"
+	content="width=device-width, initial-scale=1.0, maximum-scale=1.0">   
+<jsp:include page="../../common.jsp" />
+<script type="text/javascript">
+    require("js/activityRecommend/activityRecommendDetails.js");
+</script>
+<title>编辑</title>
+</head>                                 
+	<body class="lgraybg">            
+		<div class="	container-fluid animated fadeInRight col-sm-12">
+			<div class="panel-toolbar mt10 mb10 pt5 pb5 pl10 bdd whitebg">
+				<div class="buttons">
+					<a href="javascript:void(0);" class="btn btn-primary fa fa-save f12"><span>保存</span></a>
+					<a href="${ctx }/activityRecommend/index?pageIndex=${pageIndex}"  class="btn btn-primary fa fa-back f12" id="goback"><span>返回</span></a>
+				</div>
+			</div>
+				<div class="tabs-container whitebg">
+					<div class="pt10 pl5 pr5">
+						<ul class="nav nav-tabs" id="nav-tabs">
+							<li class="active" data-action="base">   
+								<a href="javascript:void(0);" >基本资料</a>
+							</li>
+							<!-- <li class="" data-action="functions">
+								<a href="javascript:void(0);"  >多功能输入</a>
+							</li>
+							<li class="" data-action="extends">
+								<a href="javascript:void(0);" >扩展属性</a>
+							</li> -->
+						</ul>
+						<div class="tab-content pt30 p30">               
+		
+						</div>     
+					</div>
+				</div>    
+		</div>
+		<!-- 隐藏域 -->
+		<input type="hidden" id="activityRecommendId" value="${activityRecommend.id }"/>
+	</body>
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityRecommend/activityRecommendExtendsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityRecommend/activityRecommendExtendsInfo.jsp
new file mode 100644
index 0000000..592687a
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityRecommend/activityRecommendExtendsInfo.jsp
@@ -0,0 +1,201 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>           
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> 
+<div class="tab-pane active">      
+	<div class="animated fadeInRight">
+		<div class="whitebg pl10 pr10">
+			<table class="table table-striped table-bordered table-hover">     
+				<thead> 
+					<tr>  
+						<th class="textc">序号</th>         
+						<th class="textc wp15">流水账号</th>
+						<th class="textc">日期</th>         
+						<th class="textc">财务类别</th>     
+						<th class="textc">金额</th>         
+						<th class="textc">银行</th>         
+						<th class="textc">发票</th>         
+						<th class="textc">客户名称</th>     
+						<th class="textc wp15">单号</th>    
+						<th class="textc">状态</th>         
+						<th class="textc">类别</th>         
+						<th class="textc">操作</th>         
+					</tr> 
+				</thead>
+				<tbody> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+                
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="green">支出</span></td>     
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+				</tbody>
+                
+			</table>  
+			<!-- footer -->  
+			<div class="clearfix mb10 pb20">          
+					<div class="layui-tab-item fr">       
+							<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+							<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>   
+							<div class="pagination dlblock vm" id="pagination"></div>
+							<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>            
+					</div>
+				</div>  
+		</div>      
+	</div>        
+</div>          
+                
+<script type="text/javascript">    
+//分页          
+$('#pagination').pagination({        
+	pageCount: 50,
+	jump: true,   
+	coping: true, 
+	homePage: '首页',    
+	endPage: '末页',     
+	prevContent: '上页', 
+	nextContent: '下页', 
+	callback: function(api) {          
+		$('.now').text(api.getCurrent());
+	}             
+});             
+</script>       
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityRecommend/activityRecommendFunctionsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityRecommend/activityRecommendFunctionsInfo.jsp
new file mode 100644
index 0000000..982ce84
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityRecommend/activityRecommendFunctionsInfo.jsp
@@ -0,0 +1,130 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>		
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">      
+<div class="tab-pane active">
+				<div class="panel-body">
+					<div class="wrapper wrapper-content">     
+						<div class="panel-form animated fadeInRight wp60 fc">
+							<!-- 账号资料 -->
+			<div class="layui-form-item 	has-error">
+				<label class="layui-form-label">单行输入框<i class="red">*</i></label>
+				<div class="layui-input-block">
+					<input type="text" name="title" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input">
+				</div>                                         
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">自定义验证</label>
+				<div class="layui-input-inline ml30">
+					<input type="password" name="password" lay-verify="pass" placeholder="请输入密码" autocomplete="off" class="layui-input">
+				</div>
+				<div class="layui-form-mid layui-word-aux">请填写6到12位密码</div>
+			</div>
+			<div class="form-group">
+				<div class="layui-form-item">          
+					<label class="layui-form-label">单行选择框</label>
+					<div class="layui-input-block">
+						<select name="interest" lay-filter="aihao">  
+							<option value=""></option>
+							<option value="0">写作</option>         
+							<option value="1" selected="">阅读</option>
+							<option value="2">游戏</option>
+							<option value="3">音乐</option>
+							<option value="4">旅行</option>  
+						</select>              
+					</div>
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<div class="layui-inline">  
+					<label class="layui-form-label">范围</label>
+					<div class="layui-input-inline ml30">
+						<input type="text" name="price_min" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>                                     
+					<div class="layui-form-mid">-</div>
+					<div class="layui-input-inline">       
+						<input type="text" name="price_max" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>
+				</div>           
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">联动选择框</label>
+				<div class="layui-input-inline ml30">
+					<select name="quiz1">     
+						<option value="">请选择省</option>
+						<option value="浙江" selected="">浙江省</option> 
+						<option value="你的工号">江西省</option>           
+						<option value="你最喜欢的老师">福建省</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz2">
+						<option value="">请选择市</option>
+						<option value="杭州">杭州</option>
+						<option value="宁波" disabled="">宁波</option>
+						<option value="温州">温州</option>
+						<option value="温州">台州</option>
+						<option value="温州">绍兴</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz3">
+						<option value="">请选择县/区</option>
+						<option value="西湖区">西湖区</option>
+						<option value="余杭区">余杭区</option>
+						<option value="拱墅区">临安市</option>
+					</select>
+				</div>    
+			</div>
+			<div class="layui-form-item" pane="">   
+				<label class="layui-form-label">原始复选框</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="like1[write]" lay-skin="primary" title="写作" checked="">  
+					<input type="checkbox" name="like1[read]" lay-skin="primary" title="阅读">
+					<input type="checkbox" name="like1[game]" lay-skin="primary" title="游戏" disabled="">
+				</div>
+			</div>
+
+			<div class="layui-form-item">
+				<label class="layui-form-label">开关-默认关</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="close" lay-skin="switch" lay-text="ON|OFF">
+				</div>
+			</div>
+			<div class="layui-form-item">  
+				<label class="layui-form-label">单选框</label>
+				<div class="layui-input-block">
+					<input type="radio" name="sex" value="男" title="男" checked="">
+					<input type="radio" name="sex" value="女" title="女">
+					<input type="radio" name="sex" value="禁" title="禁用" disabled="">
+				</div>
+			</div>
+			<!--<div class="layui-form-item layui-form-text">
+				<label class="layui-form-label">上传图片</label>
+				<div class="layui-input-block">
+					<div class="layui-upload-drag w200 h200">
+						<i class="layui-icon"></i>          
+						<p>点击上传</p>
+					</div>
+				</div>
+			</div>-->
+				<div class="layui-form-item layui-form-text">
+					<label class="layui-form-label">普通文本域</label>  
+					<div class="layui-input-block">              
+						<textarea placeholder="请输入内容" class="layui-textarea"></textarea>
+					</div>
+				</div>
+			</div>
+		</div>   
+	</div>
+</div>
+</form>   
+<script type="text/javascript">
+	//form表单样式
+	layui.use(['layer', 'form'], function() {    
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+</script>                 
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityRecommend/activityRecommendList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityRecommend/activityRecommendList.jsp
new file mode 100644
index 0000000..cc4806a
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/activityRecommend/activityRecommendList.jsp
@@ -0,0 +1,145 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black">
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->
+<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+<jsp:include page="../../common.jsp" />
+<script type="text/javascript">
+     require("js/activityRecommend/activityRecommendList.js");
+</script>
+</head>
+<body>
+	<div class="row animated fadeInRight" style="margin: 0;">
+		<div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+			<div class="toolbar-panel bdd">
+				<div class="toolbar-box">
+					<div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+						<!-- 顶部按钮 -->
+						<div class="buttons fl">
+							<a class="btn btn-primary fa fa-search f13" href="javascript:void(0);" onclick="queryActivityRecommend()"><span>搜索</span></a>
+							<shiro:hasAnyRoles name="超级系统管理员">
+									<a class="btn btn-primary fa fa-plus f13 add" href="javascript:void(0);" onclick="initAddActivityRecommend()"><span>添加</span></a>
+									<a class="btn btn-primary fa fa-edit f13" href="javascript:void(0);" onclick="initEditActivityRecommend()"><span>编辑</span></a> 
+									<a class="btn btn-primary fa fa-remove f13 delete" href="javascript:void(0);" onclick="initBatchDeleteActivityRecommend()"><span>删除</span></a> 
+									<input id="isAdmin" type="hidden" value="1" >
+							</shiro:hasAnyRoles>
+							<shiro:lacksRole name="超级系统管理员">
+							      <c:if test="${not empty sessionScope.merchantCodeSession }">
+							         <a class="btn btn-primary fa fa-plus f13 add" href="javascript:void(0);" onclick="initAddActivityRecommend()"><span>添加</span></a>
+                                     <a class="btn btn-primary fa fa-edit f13" href="javascript:void(0);" onclick="initEditActivityRecommend()"><span>编辑</span></a> 
+                                     <a class="btn btn-primary fa fa-remove f13 delete" href="javascript:void(0);" onclick="initBatchDeleteActivityRecommend()"><span>删除</span></a>
+							      </c:if>
+							      <input id="isAdmin" type="hidden" value="0" >
+							</shiro:lacksRole>
+						</div>
+						<div class="tools fr">
+							<a href="javascript:void(0);" class="collapse dblock f14 dgray mr5"> 
+								<i class="fa-2x fa fa-angle-double-up"></i>
+							</a>
+						</div>
+					</div>
+				</div>
+
+				<!--搜索条件 -->
+				<div class="toolbar-body">
+					<div class="row pt10 pb10 whitebg ml0 mr0">
+						<!-- <span class="dlblock w100 textr">ID：</span> 
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+							<input type="text" placeholder="请输入内容" id="searchId">  
+						</span>  -->
+						<span class="dlblock w100 textr">活动名称：</span> 
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+							<input type="text" id="name" placeholder="请输入名称">
+						</span> 
+						<!-- <span class="dlblock w100 textr">类别：</span>
+						 <select class="form-control f12 w180 textc">
+							<option value="">支出</option>
+							<option value="">收入</option>
+						</select> -->
+					</div>
+					<div class="mt10 dn mb20">
+						<span class="dlblock w100 textr">开始日期</span>
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+							 <input type="text" placeholder="" id="date1" class="w150">
+							 <i class="fa fa-calendar"></i>
+						</span> 
+						<span class="dlblock w100 textr">结束日期</span>
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+						<input type="text" placeholder="" id="date2" class="w150"> 
+							<i class="fa fa-calendar"></i>
+						</span>
+					</div>
+				</div>
+			</div>
+		</div>
+		<!-- 表单数据 -->
+		<div class="mb20 mt10">
+			<div class="whitebg pl10 pr10">
+				<table class="table table-striped table-bordered table-hover">
+					<thead>
+						<tr>
+							<th class="textc">
+								<div class="checker" id="allCheck">
+									<span class=""><input type="checkbox" value="" ></span>
+								</div>
+							</th>
+							<th class="textc ">id</th>
+							<!-- <th class="textc ">userId</th> -->
+							<th class="textc ">活动名称</th>
+							<th class="textc ">首充最低充值金额</th>
+							<th class="textc wp15">推荐与被推荐奖励金额</th>
+							<!-- <th class="textc ">merchantCode</th> -->
+							<th class="textc ">商家名称</th>
+							<!-- <th class="textc ">storeId</th> -->
+							<th class="textc wp15">门店名称</th>
+							<th class="textc ">创建时间</th>
+							<shiro:hasAnyRoles name="超级系统管理员">
+							     <th class="textc">编辑</th>
+							</shiro:hasAnyRoles>
+							<shiro:lacksRole name="超级系统管理员">
+							  <c:if test="${not empty sessionScope.userTypeSession && not empty sessionScope.merchantCodeSession }">
+                                    <th class="textc">编辑</th>
+                               </c:if>
+							</shiro:lacksRole>
+							
+						</tr>
+					</thead>
+					<!-- 数据体 -->
+					<tbody id="data_content">
+					</tbody>
+				</table>
+			
+			<!-- footer -->
+				<div class="clearfix mb10 pb20">
+						<div class="layui-tab-item fr">
+								<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+								<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>
+								<div class="pagination dlblock vm" id="pagination"></div>
+								<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>
+						</div>
+					</div>
+					
+					<div class="row pt10 pb10 dn  whitebg ml0 mr0">
+                        <span class="dlblock w100 textr">userTypeSession：</span>
+                        <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+                           <input id="merchantCodeSession" value="${sessionScope.merchantCodeSession }"> 
+                        </span> 
+                    </div>
+	
+			</div>
+		</div>
+	</div>
+</body>
+
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/agent/detail.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/agent/detail.jsp
new file mode 100644
index 0000000..f2d5ab5
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/agent/detail.jsp
@@ -0,0 +1,141 @@
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+    <style>
+        .layui-input, .layui-textarea {
+            border-color: #606060;
+        }
+    </style>
+</head>
+<body>
+<form class="layui-form" action="" style="width: 80%; margin-top: 20px">
+    <input name="userId" value="${entity.userId}" hidden/>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">登录账号</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="loginName" value="${entity.loginName}" placeholder="请输入账号" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">手机号</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="phone" value="${entity.phone}" placeholder="请输入手机号" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">已提现金额</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="cashAmt" value="${entity.cashAmt}" placeholder="请输入已提现金额" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">浮动费率</label>
+        <div class="layui-input-block">
+            <input type="radio" name="isFixedRate" value="0" title="是"
+                    <c:if test='${entity.isFixedRate != "1"}'>
+                        checked
+                    </c:if>
+            />
+            <input type="radio" name="isFixedRate" value="1" title="否"
+                    <c:if test='${entity.isFixedRate == "1"}'>
+                        checked
+                    </c:if>
+            />
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">费率(%)</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <select name="rate" class="layui-input">
+                    <c:forEach begin="21" end="38" var="item">
+                        <option value="${item}"
+                                <c:if test="${entity.rate == item}">
+                                    selected
+                                </c:if>
+                        >${item}</option>
+                    </c:forEach>
+                </select>
+
+                <%--                <input name="rate" value="${entity.rate}" placeholder="请输入费率" class="layui-input"/>--%>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">姓名</label>
+        <div class="layui-input-block layui-select-disabled">
+            <!-- 禁止输入，需要代理商app手动认证 -->
+            <input name="userName" value="${entity.userName}" placeholder="代理商在app中手动认证"
+                   class="layui-input layui-disabled" disabled/>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button class="layui-btn" lay-submit lay-filter="formDemo">立即提交</button>
+            <button type="button" id="close" class="layui-btn layui-btn-primary">关闭</button>
+        </div>
+    </div>
+</form>
+
+<script>
+    //Demo
+    layui.use(['form', 'layer'], function () {
+        var form = layui.form;
+        var layer = layui.layer;
+
+        $('#close').click(function () {
+            parent.layer.closeAll();
+        });
+
+        //监听提交
+        form.on('submit(formDemo)', function (data) {
+            var index = layer.load(1, {shade: [0.1, '#000']});
+            $.ajax({
+                url: ctx + '/agentInfo/saveOrUpdate',
+                method: 'post',
+                data: JSON.stringify(data.field),
+                dataType: 'JSON',
+                contentType: "application/json",
+                success: function (res) {
+                    layer.close(index);
+                    if (res.code == 200) {
+                        layer.alert(res.message, function () {
+                            parent.location.reload();
+                        })
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 5
+                        });
+                    }
+                }
+            })
+            return false;
+        });
+    });
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/agent/list.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/agent/list.jsp
new file mode 100644
index 0000000..78fd31e
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/agent/list.jsp
@@ -0,0 +1,454 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="minWidth=device-minWidth, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" action="" style="margin-top: 10px" lay-filter="formCondition">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">用户ID</label>
+                            <div class="layui-input-inline">
+                                <input type="text" placeholder="请输入用户ID" id="userId" name="userId" class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">账号</label>
+                            <div class="layui-input-inline">
+                                <input type="text" placeholder="请输入账号" id="loginName" name="loginName"
+                                       class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">电话</label>
+                            <div class="layui-input-inline">
+                                <input type="text" placeholder="请输入电话" id="phone" name="phone" class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">姓名</label>
+                            <div class="layui-input-inline">
+                                <input type="text" placeholder="请输入姓名" id="userName" name="userName"
+                                       class="layui-input">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">费率类型</label>
+                            <div class="layui-input-inline">
+                                <select name="isFixedRate" id="isFixedRate">
+                                    <option value="">请选择</option>
+                                    <option value="0">浮动</option>
+                                    <option value="1">固定</option>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">自动审核</label>
+                            <div class="layui-input-inline">
+                                <select name="autoAudit" id="autoAudit">
+                                    <option value="">请选择</option>
+                                    <option value="1">开启</option>
+                                    <option value="0">关闭</option>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">异地支付</label>
+                            <div class="layui-input-inline">
+                                <select name="payEcdemicSwitch" id="payEcdemicSwitch">
+                                    <option value="">请选择</option>
+                                    <option value="1">开启</option>
+                                    <option value="0">关闭</option>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">营销商户</label>
+                            <div class="layui-input-inline">
+                                <select name="isMarket" id="isMarket">
+                                    <option value="">请选择</option>
+                                    <option value="1">开启</option>
+                                    <option value="0">关闭</option>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">银联支付</label>
+                            <div class="layui-input-inline">
+                                <select name="isUnionPay" id="isUnionPay">
+                                    <option value="">请选择</option>
+                                    <option value="1">开启</option>
+                                    <option value="0">关闭</option>
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <!-- 表单数据 -->
+    <div class="mb50 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-hide" id="agentInfoTab" lay-filter="agentInfoTab"></table>
+        </div>
+    </div>
+</div>
+
+<script type="text/html" id="toolbarDemo">
+    <div class="layui-btn-container">
+        <button class="layui-btn layui-btn-sm" lay-event="search">
+            <i class="layui-icon layui-icon-search"></i>查询
+        </button>
+        <button class="layui-btn layui-btn-sm" lay-event="add">
+            <i class="layui-icon layui-icon-add-1"></i>添加
+        </button>
+    </div>
+</script>
+
+<script type="text/html" id="barDemo">
+    <a class="layui-btn layui-btn-xs" lay-event="edit">
+        <i class="layui-icon layui-icon-edit"></i>编辑
+    </a>
+    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">
+        <i class="layui-icon layui-icon-delete"></i>删除
+    </a>
+</script>
+
+<script>
+    let form;
+    let table;
+    let layer;
+
+    layui.use(['table', 'form', 'layer'], function () {
+        table = layui.table;
+        form = layui.form;
+        layer = layui.layer;
+        form.render();
+
+        var tableIns = table.render({
+            elem: '#agentInfoTab'
+            , url: ctx + '/agentInfo/page'
+            , where: form.val('formCondition')
+            , initSort: {
+                field: 'createTime'
+                , type: 'desc'
+            }
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.count, //解析数据长度
+                    "data": res.data.data //解析数据列表
+                };
+            }
+            , toolbar: '#toolbarDemo' //开启头部工具栏，并为其绑定左侧模板
+            , defaultToolbar: ['filter', 'exports', 'print', { //自定义头部工具栏右侧图标。如无需自定义，去除该参数即可
+                title: '提示'
+                , layEvent: 'LAYTABLE_TIPS'
+                , icon: 'layui-icon-tips'
+            }]
+            , title: '超级管理商数据表'
+            , cols: [[
+                {type: 'checkbox', fixed: 'left', hidden: true}
+                , {field: 'numbers', title: '序号', fixed: 'left', type: 'numbers'}
+                , {field: 'userId', title: '用户id', fixed: 'left'}
+                , {field: 'loginName', title: '账号'}
+                , {field: 'phone', minWidth: 120, title: '电话'}
+                , {field: 'userName', minWidth: 80, title: '姓名'}
+                , {
+                    field: 'sumPrice', title: '总收益', sort: true, templet: function (d) {
+                        return (d.sumPrice - 0).toFixed(2);
+                    }
+                }
+                , {
+                    field: 'beforeMonthPrice', title: '上月收益', sort: true, templet: function (d) {
+                        return (d.beforeMonthPrice - 0).toFixed(2);
+                    }
+                }
+                , {
+                    field: 'nowMonthPrice', title: '本月收益', sort: true, templet: function (d) {
+                        return (d.nowMonthPrice - 0).toFixed(2);
+                    }
+                }
+                , {
+                    field: 'cashAmt', title: '已提现', sort: true, templet: function (d) {
+                        return (d.cashAmt - 0).toFixed(2);
+                    }
+                }
+                , {
+                    field: 'surplusPrice', title: '余额', sort: true, templet: function (d) {
+                        return (d.sumPrice - d.cashAmt).toFixed(2);
+                    }
+                }
+                , {
+                    field: 'rate', title: '费率(%)', sort: true, templet: function (d) {
+                        return (d.rate / 100).toFixed(2);
+                    }
+                }
+                , {
+                    field: 'isFixedRate', title: '费率类型', templet: function (d) {
+                        if (d.isFixedRate == "1") {
+                            return "固定";
+                        } else {
+                            return "浮动";
+                        }
+                    }
+                }
+                , {
+                    title: '自动审核', minWidth: 95, align: "center", templet: (d) => {
+                        return '<input type="checkbox" '+(d.autoAudit == "1" ? "checked" : "") + ' lay-filter="switchAutoAudit" data-userId="' + d.userId + '" lay-skin="switch" lay-text="开启|关闭">';
+                    }
+                }
+                , {
+                    title: '异地支付', minWidth: 95, align: "center", templet: (d) => {
+                        return '<input type="checkbox" '+(d.payEcdemicSwitch == "1" ? "checked" : "") + ' lay-filter="switchPayEcdemicSwitch" lay-skin="switch" data-userId="' + d.userId + '" lay-text="开启|关闭">';
+                    }
+                }
+                , {
+                    title: '营销商户', minWidth: 95, align: "center", templet: (d) => {
+                        return '<input type="checkbox" '+(d.isMarket == "1" ? "checked" : "") + ' lay-filter="switchMarket" lay-skin="switch" data-userId="' + d.userId + '" lay-text="开启|关闭">';
+                    }
+                }
+                , {
+                    title: '银联支付', minWidth: 95, align: "center", templet: (d) => {
+                        return '<input type="checkbox" '+(d.isUnionPay == "1" ? "checked" : "") + ' lay-filter="switchUnionPay" lay-skin="switch" data-userId="' + d.userId + '" lay-text="开启|关闭">';
+                    }
+                }
+                , {
+                    field: 'createTime',
+                    title: '创建日期',
+                    sort: true,
+                    templet: "<div>{{layui.util.toDateString(d.createTime, 'yyyy-MM-dd HH:mm:ss')}}</div>"
+                }
+                , {
+                    field: 'updateTime',
+                    title: '修改日期',
+                    templet: "<div>{{layui.util.toDateString(d.updateTime, 'yyyy-MM-dd HH:mm:ss')}}</div>"
+                }
+                , {fixed: 'right', title: '操作', minWidth: 165, toolbar: '#barDemo'}
+            ]]
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , page: true
+            , done: function () {
+                $("[data-field='forceUpdate']").children().each(function () {
+                    if ($(this).text() == '0') {
+                        $(this).text('否');
+                    } else if ($(this).text() == '1') {
+                        $(this).text('是');
+                    }
+                });
+            }
+        });
+
+        //头工具栏事件
+        table.on('toolbar(agentInfoTab)', function (obj) {
+            switch (obj.event) {
+                case 'add':
+                    // 添加
+                    toAdd();
+                    break;
+                case 'search':
+                    // 查询
+                    search();
+                    break;
+            }
+        });
+
+        function search() {
+            table.reload('agentInfoTab', {
+                page: {
+                    curr: 1
+                }
+                , where: form.val('formCondition')
+            });
+        }
+
+        function saveUserApp(msg, param) {
+            layer.confirm(msg , function (index) {
+                $.ajax({
+                    url: ctx + "/userApp/updateByUserId"
+                    , type: 'post'
+                    , data: param
+                    , success: function(data) {
+                        layer.close(index);
+                        table.reload('agentInfoTab', {
+                            where: form.val('formCondition')
+                        });
+                    }
+                });
+                layer.close(index);
+            }, function(index) {
+                table.reload('agentInfoTab', {
+                    where: form.val('formCondition')
+                });
+            });
+        }
+
+        form.on('switch(switchAutoAudit)', function(data) {
+            debugger
+            let userId = $(data.elem).data().userid;
+            let param = {};
+            param.userId = userId;
+            param.autoAudit = this.checked? '1': '0';
+            let msg = this.checked? '是否开启自动审核': '是否关闭自动审核?';
+            saveUserApp(msg, param);
+        })
+
+        form.on('switch(switchPayEcdemicSwitch)', function(data) {
+            let userId = $(data.elem).data().userid;
+            let param = {};
+            param.userId = userId;
+            param.payEcdemicSwitch = this.checked? '1': '0';
+            let msg = this.checked? '是否开启异地支付?': '是否关闭异地支付?';
+            saveUserApp(msg, param);
+        })
+
+        form.on('switch(switchMarket)', function(data) {
+            let userId = $(data.elem).data().userid;
+            let param = {};
+            param.userId = userId;
+            param.isMarket = this.checked? '1': '0';
+            let msg = this.checked? '是否开启营销商户': '是否关闭营销商户?';
+            saveUserApp(msg, param);
+        })
+
+        form.on('switch(switchUnionPay)', function(data) {
+            let userId = $(data.elem).data().userid;
+            let param = {};
+            param.userId = userId;
+            param.isUnionPay = this.checked? '1': '0';
+            let msg = this.checked? '是否开启银联支付': '是否关闭银联支付?';
+            saveUserApp(msg, param);
+        })
+
+        //监听行工具事件
+        table.on('tool(agentInfoTab)', function (obj) {
+            var data = obj.data;
+            //console.log(obj)
+            if (obj.event === 'del') {
+                layer.confirm('真的删除行么?', function (index) {
+                    obj.del(data);
+                    layer.close(index);
+                    del(obj);
+                });
+            } else if (obj.event === 'edit') {
+                toBaseEdit(obj.data);
+            }
+        });
+
+        function toAdd(obj) {
+            var url = ctx + '/agentInfo/detail/';
+            if (obj !== undefined) {
+                url = ctx + "/agentInfo/detail/" + obj.userId
+            }
+            var index = layer.open({
+                type: 2
+                , title: "添加"
+                , shade: 0.5
+                , maxmin: true
+                , content: url
+                , area: ['700px', '700px']
+            });
+        }
+
+        function toBaseEdit(obj) {
+            var url = ctx + '/agentInfo/detail/';
+            if (obj !== undefined) {
+                url = ctx + "/agentInfo/detail/" + obj.userId
+            }
+            var index = layer.open({
+                type: 2
+                , title: "编辑"
+                , shade: 0.5
+                , maxmin: true
+                , content: url
+                , area: ['550px', '500px']
+            });
+        }
+
+        function part(obj) {
+            var url = ctx + "/agentInfo/part/" + obj.userId;
+            var index = layer.open({
+                type: 2
+                , title: "编辑"
+                , shade: 0.5
+                , maxmin: true
+                , content: url
+                , area: ['550px', '300px']
+            });
+            layer.full(index);
+        }
+
+        function del(obj) {
+            $.ajax({
+                url: ctx + '/agentInfo/delete',
+                method: 'post',
+                data: JSON.stringify(obj.data),
+                dataType: 'JSON',
+                contentType: "application/json",
+                success: function (res) {
+                    if (res.code == 200) {
+                        layer.msg(res.data, {
+                            icon: 1
+                        });
+                    } else {
+                        layer.msg(res.data, {
+                            icon: 5
+                        });
+                    }
+                }
+            })
+        }
+    });
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/agent/particulars.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/agent/particulars.jsp
new file mode 100644
index 0000000..bbafd83
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/agent/particulars.jsp
@@ -0,0 +1,207 @@
+<!DOCTYPE html>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+    <style>
+        .layui-input, .layui-textarea {
+            border-color: #606060;
+        }
+    </style>
+</head>
+<body>
+<form class="layui-form"  action="" style="width: 80%; margin-top: 20px;margin-left: 150px">
+    <div class="w1000 fc" style="background: white">
+        <div class=" pd10 textl pl50 pb20 fw800 f16 pb20 bdbe mb20">超级管理商基本信息：</div>
+        <input type="hidden" id="userId" name="userId" value="${userApp.userId}"/>
+        <div class="clearfix mb20">
+            <div class="fl textc wp50">
+                <div class="w100 textr  dlblock">超级管理商名称</div>
+                <div class="dlblock ml10">
+                    <input type="text" placeholder="超级管理商名称"
+                           class="bdc w320 pd7 radius5" value="${userApp.userName}"
+                           id="userName" name="userName"/>
+                </div>
+            </div>
+        </div>
+        <div class=" pd10 textl pl50 pb20 fw800 f16 pb20 bdbe mb20 pt20">
+            超级管理商结算信息：<span class="red f12 ml20">注：请保持银行卡信息(证件号码、开户名、卡号、预留手机号)的匹配性</span>
+        </div>
+        <input type="hidden" id="bankId" name="merchantBankCard.id" value="${mercBankCard.id}"/>
+        <div class="clearfix mb20">
+            <div class="fl wp50 textc">
+                <div class="w100 textr dlblock">银行名称</div>
+                <div class="dlblock ml10">
+                    <input type="text" placeholder="银行名称"
+                           class="bdc w320 pd7 radius5"
+                           name="merchantBankCard.bankName" value="${mercBankCard.bankName}"/>
+                    <!-- 保存原始用户名 -->
+                </div>
+            </div>
+            <div class="fl wp50 textc" style="background: white">
+                <div class="w100 textr dlblock">开户支行名称</div>
+                <div class="dlblock ml10 fyellowbg positionr">
+                    <input type="text" id="branchName" name="merchantBankCard.branchName"
+                           placeholder="开户支行名称 "
+                           class="fyellowbg lgray w320 pd7 bdc radius5" autocomplete="off"
+                           value="${mercBankCard.branchName}"/>
+                </div>
+            </div>
+        </div>
+        <div class="clearfix mb20">
+            <div class="fl wp50 textc">
+                <div class="w100 textr dlblock">开户名</div>
+                <div class="dlblock ml10">
+                    <input type="text" placeholder="开户名"
+                           class="bdc w320 pd7 radius5" id="updateBankCertName"
+                           name="merchantBankCard.bankCertName" value="${mercBankCard.bankCertName}"/>
+                </div>
+            </div>
+            <div class="fl wp50 textc">
+                <div class="w100 textr dlblock">证件号码</div>
+                <div class="dlblock ml10">
+                    <input type="text" placeholder="法人身份证号"
+                           class="bdc w320 pd7 radius5" id="updateCertNo"
+                           name="merchantBankCard.certNo" value="${mercBankCard.certNo}"/>
+                </div>
+            </div>
+        </div>
+        <div class="clearfix mb20">
+            <div class="fl wp50 textc">
+                <div class="w100 textr dlblock">开户账号</div>
+                <div class="dlblock ml10 lgray">
+                    <input type="text" placeholder="开户账号"
+                           class="bdc w320 pd7 radius5" id="updateBankCardNo"
+                           name="merchantBankCard.bankCardNo" value="${mercBankCard.bankCardNo}"/>
+                </div>
+            </div>
+            <div class="fl wp50 textc">
+                <div class="w100 textr dlblock">银行预留手机号</div>
+                <div class="dlblock ml10 ">
+                    <input type="text" placeholder="银行预留手机号码"
+                           class="bdc w320 pd7 radius5" id="updatePhone" name="merchantBankCard.phone"
+                           value="${mercBankCard.phone}"/>
+                </div>
+            </div>
+        </div>
+        <div class="pd10 textl pl50 pb20 fw800 f16 pb20 bdbe mb20 pt20">
+            超级管理商证照信息：<span class="red f12 ml20"></span>
+        </div>
+        <div class="clearfix textc bdbe " id="picContent">
+            <ul>
+                <li class="fl pt10 pb10 wp33" data-v="01">
+                    <div>身份证正面</div>
+                    <div class="dlblock upload w200 h200 mt10">
+                        <img src="${merchantImage1}"
+                             onerror="this.src='${resourcePath }/images/error.jpg'"
+                             width="200" height="200">
+                    </div>
+                </li>
+                <li class="fl pt10 pb10 wp33" id='update02' data-v="02">
+                    <div>身份证反面</div>
+                    <div class="dlblock upload w200 h200 mt10">
+                        <img src="${merchantImage2}"
+                             onerror="this.src='${resourcePath }/images/error.jpg'"
+                             width="200" height="200">
+                    </div>
+                </li>
+                <li class="fl pt10 pb10 wp33" id='update03' data-v="02">
+                    <div>营业执照照片</div>
+                    <div class="dlblock upload w200 h200 mt10">
+                        <img src="${merchantImage3}"
+                             onerror="this.src='${resourcePath }/images/error.jpg'"
+                             width="200" height="200">
+                    </div>
+                </li>
+                <li class="fl pt10 pb10 wp33" id='update06' data-v="02">
+                    <div>门头照</div>
+                    <div class="dlblock upload w200 h200 mt10">
+                        <img src="${merchantImage6}"
+                             onerror="this.src='${resourcePath }/images/error.jpg'"
+                             width="200" height="200">
+                    </div>
+                </li>
+                <li class="fl pt10 pb10 wp33" id='update08' data-v="02">
+                    <div>收银台照</div>
+                    <div class="dlblock upload w200 h200 mt10">
+                        <img src="${merchantImage8}"
+                             onerror="this.src='${resourcePath }/images/error.jpg'"
+                             width="200" height="200">
+                    </div>
+                </li>
+                <li class="fl pt10 pb10 wp33" id='update09' data-v="02">
+                    <div>门店内场景照</div>
+                    <div class="dlblock upload w200 h200 mt10">
+                            <img src="${merchantImage8}"
+                                 onerror="this.src='${resourcePath }/images/error.jpg'"
+                                 width="200" height="200">
+                    </div>
+                </li>
+                <li class="fl pt10 pb10 wp33" id='update01' data-v="98">
+                    <div>银行卡照片</div>
+                    <div class="dlblock upload w200 h200 mt10">
+                            <img src="${merchantImage98 }"
+                                 onerror="this.src='${resourcePath }/images/error.jpg'"
+                                 width="200" height="200">
+                    </div>
+                </li>
+            </ul>
+        </div>
+        <div class="layui-form-item">
+            <div class="layui-input-block">
+                <button class="layui-btn" lay-submit lay-filter="formDemo">立即提交</button>
+                <button type="button" id="close" class="layui-btn layui-btn-primary">关闭</button>
+            </div>
+        </div>
+    </div>
+</form>
+
+<script type="text/javascript">
+    //form表单样式
+    layui.use(['form', 'layer'], function () {
+        var form = layui.form;
+        var layer = layui.layer;
+
+        $('#close').click(function () {
+            parent.layer.closeAll();
+        });
+
+        form.on('submit(formDemo)', function (data) {
+            var index = layer.load(1, {shade: [0.1, '#000']});
+            $.ajax({
+                url: '${ctx}/agentInfo/saveAgentInfo',
+                method: 'post',
+                data: data.field,
+                dataType: 'JSON',
+                success: function (res) {
+                    layer.close(index);
+                    if (res.code == 200) {
+                        layer.alert(res.data, function () {
+                            parent.location.reload();
+                        })
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 5
+                        });
+                    }
+                }
+            })
+            return false;
+        });
+    });
+</script>
+</body>
+</html>
+
+
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/agent/staffList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/agent/staffList.jsp
new file mode 100644
index 0000000..e793fa2
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/agent/staffList.jsp
@@ -0,0 +1,241 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="minWidth=device-minWidth, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp" />
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" action="" style="margin-top: 10px">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">用户ID</label>
+                            <div class="layui-input-inline">
+                                <input type="text" placeholder="请输入用户ID" id="userId" name="userId" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">账号</label>
+                            <div class="layui-input-inline">
+                                <input type="text" placeholder="请输入内容" id="loginName" name="loginName"
+                                       class="layui-input">
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <!-- 表单数据 -->
+    <div class="mb50 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-hide" id="agentInfoTab" lay-filter="agentInfoTab"></table>
+        </div>
+    </div>
+</div>
+
+<script type="text/html" id="toolbarDemo">
+    <div class="layui-btn-container">
+        <button class="layui-btn layui-btn-sm" lay-event="search">查询</button>
+        <button class="layui-btn layui-btn-sm" lay-event="add">添加</button>
+    </div>
+</script>
+<script>
+    layui.use(['table', 'layer'], function(){
+        var table = layui.table;
+        var layer = layui.layer;
+
+        var tableIns = table.render({
+            elem: '#agentInfoTab'
+            ,url:'${ctx}/agentInfo/staffPage'
+            ,where:{
+                userId:$('#userId').val()
+                ,loginName:$('#loginName').val()
+            }
+            ,response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                ,countName: 'count' //数据总数的字段名称，默认：count
+                ,dataName: 'data' //默数据列表的字段名称，认：data
+                ,statusCode : 200
+            }
+            ,parseData: function(res){ //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.count, //解析数据长度
+                    "data": res.data.data //解析数据列表
+                };
+            }
+            ,toolbar: '#toolbarDemo' //开启头部工具栏，并为其绑定左侧模板
+            ,defaultToolbar: ['filter', 'exports', 'print', { //自定义头部工具栏右侧图标。如无需自定义，去除该参数即可
+                title: '提示'
+                ,layEvent: 'LAYTABLE_TIPS'
+                ,icon: 'layui-icon-tips'
+            }]
+            ,title: '超级管理商数据表'
+            ,cols: [[
+                {type: 'checkbox', fixed: 'left', hidden: true}
+                ,{field:'numbers', title:'序号', fixed: 'left',type:'numbers'}
+                ,{field:'userId', title:'用户id',fixed: 'left',sort: true}
+                ,{field:'loginName',title:'账号'}
+                ,{field:'userName',minWidth:80, title:'姓名'}
+                ,{field:'phone',minWidth:120, title:'电话'}
+                ,{field:'parentId', title:'服务商/代理商id',sort: true}
+                ,{field:'agentName',minWidth:80, title:'代理商名称'}
+                ,{field:'agentPhone',minWidth:120, title:'代理商电话'}
+                ,{field: 'createTime',title: '创建日期',templet : "<div>{{layui.util.toDateString(d.createTime, 'yyyy-MM-dd HH:mm:ss')}}</div>"}
+                // ,{fixed: 'right', title:'操作',minWidth:160, toolbar: '#barDemo'}
+            ]]
+            ,request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                ,limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            ,page: true
+            ,done: function () {
+                $("[data-field='forceUpdate']").children().each(function () {
+                    if ($(this).text() == '0') {
+                        $(this).text('否');
+                    } else if ($(this).text() == '1') {
+                        $(this).text('是');
+                    }
+                });
+            }
+        });
+
+        //头工具栏事件
+        table.on('toolbar(agentInfoTab)', function(obj){
+            switch(obj.event){
+                case 'add':
+                    // 添加
+                    toAdd();
+                    break;
+                case 'search':
+                    // 查询
+                    search();
+                    break;
+            }
+        });
+
+        function search() {
+            table.reload('agentInfoTab', {
+                page: {
+                    curr: 1
+                }
+                ,where: { //请求参数（注意：这里面的参数可任意定义，并非下面固定的格式）
+                    userId:$('#userId').val()
+                    ,loginName:$('#loginName').val()
+                }
+            });
+        }
+
+        //监听行工具事件
+        table.on('tool(agentInfoTab)', function(obj){
+            var data = obj.data;
+            //console.log(obj)
+            if(obj.event === 'del'){
+                layer.confirm('真的删除行么?', function(index){
+                    obj.del(data);
+                    layer.close(index);
+                    del(obj);
+                });
+            } else if(obj.event === 'edit'){
+                toBaseEdit(obj.data);
+            } else if (obj.event === 'part'){
+                part(obj.data);
+            }
+        });
+
+        function toAdd(obj) {
+            var url = '${ctx}/agentInfo/detail/';
+            if(obj != undefined){
+                url = "${ctx}/agentInfo/detail/"+obj.userId
+            }
+            var index = layer.open({
+                type: 2
+                , title: "添加"
+                , shade: 0.5
+                , maxmin: true
+                , content: url
+                , area: ['550px', '500px']
+            });
+        }
+
+        function toBaseEdit(obj) {
+            var url = '${ctx}/agentInfo/detail/';
+            if(obj != undefined){
+                url = "${ctx}/agentInfo/detail/"+obj.userId
+            }
+            var index = layer.open({
+                type: 2
+                , title: "编辑"
+                , shade: 0.5
+                , maxmin: true
+                , content: url
+                , area: ['550px', '500px']
+            });
+        }
+
+        function part(obj) {
+            var url = "${ctx}/agentInfo/part/"+obj.userId;
+            var index = layer.open({
+                type: 2
+                , title: "编辑"
+                , shade: 0.5
+                , maxmin: true
+                , content: url
+                , area: ['550px', '300px']
+            });
+            layer.full(index);
+        }
+        function del(obj) {
+            $.ajax({
+                url: '${ctx}/agentInfo/delete',
+                method: 'post',
+                data: JSON.stringify(obj.data),
+                dataType: 'JSON',
+                contentType:"application/json",
+                success: function(res) {
+                    if(res.code == 200) {
+                        layer.msg(res.data, {
+                            icon: 1
+                        });
+                    } else {
+                        layer.msg(res.data, {
+                            icon: 5
+                        });
+                    }
+                }
+            })
+        }
+    });
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/agent/subAgentList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/agent/subAgentList.jsp
new file mode 100644
index 0000000..b7a90f4
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/agent/subAgentList.jsp
@@ -0,0 +1,441 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="minWidth=device-minWidth, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" action="" style="margin-top: 10px" lay-filter="formCondition">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">用户ID</label>
+                            <div class="layui-input-inline">
+                                <input type="text" placeholder="请输入用户ID" id="userId" name="userId" class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">上级用户ID</label>
+                            <div class="layui-input-inline">
+                                <input type="text" placeholder="请输入用户上级ID" id="parentId" name="parentId"
+                                       class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">电话</label>
+                            <div class="layui-input-inline">
+                                <input type="text" placeholder="请输入电话" id="phone" name="phone" class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">姓名</label>
+                            <div class="layui-input-inline">
+                                <input type="text" placeholder="请输入姓名" id="userName" name="userName"
+                                       class="layui-input">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">账号</label>
+                            <div class="layui-input-inline">
+                                <input type="text" placeholder="请输入账号" id="loginName" name="loginName"
+                                       class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">自动审核</label>
+                            <div class="layui-input-inline">
+                                <select name="autoAudit" id="autoAudit">
+                                    <option value="">请选择</option>
+                                    <option value="1">开启</option>
+                                    <option value="0">关闭</option>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">异地支付</label>
+                            <div class="layui-input-inline">
+                                <select name="payEcdemicSwitch" id="payEcdemicSwitch">
+                                    <option value="">请选择</option>
+                                    <option value="1">开启</option>
+                                    <option value="0">关闭</option>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">营销商户</label>
+                            <div class="layui-input-inline">
+                                <select name="isMarket" id="isMarket">
+                                    <option value="">请选择</option>
+                                    <option value="1">开启</option>
+                                    <option value="0">关闭</option>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">银联支付</label>
+                            <div class="layui-input-inline">
+                                <select name="isUnionPay" id="isUnionPay">
+                                    <option value="">请选择</option>
+                                    <option value="1">开启</option>
+                                    <option value="0">关闭</option>
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <div class="mb50 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-hide" id="agentInfoTab" lay-filter="agentInfoTab"></table>
+        </div>
+    </div>
+</div>
+<script type="text/html" id="toolbarDemo">
+    <div class="layui-btn-container">
+        <button class="layui-btn layui-btn-sm" lay-event="search">查询</button>
+        <button class="layui-btn layui-btn-sm" lay-event="add">添加</button>
+    </div>
+</script>
+
+<script type="text/html" id="barDemo">
+    <a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>
+    <a class="layui-btn layui-btn-xs" lay-event="part">详情</a>
+    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
+</script>
+
+<script>
+    layui.use(['table', 'layer', 'form'], function () {
+        var table = layui.table;
+        var layer = layui.layer;
+        var form = layui.form;
+
+        var tableIns = table.render({
+            elem: '#agentInfoTab'
+            , url: ctx + '/agentInfo/subAgentPage'
+            , where: form.val('formCondition')
+            , initSort: {
+                field: 'createTime'
+                , type: 'desc'
+            }
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.count, //解析数据长度
+                    "data": res.data.data //解析数据列表
+                };
+            }
+            , toolbar: '#toolbarDemo' //开启头部工具栏，并为其绑定左侧模板
+            , defaultToolbar: ['filter', 'exports', 'print', { //自定义头部工具栏右侧图标。如无需自定义，去除该参数即可
+                title: '提示'
+                , layEvent: 'LAYTABLE_TIPS'
+                , icon: 'layui-icon-tips'
+            }]
+            , title: '超级管理商数据表'
+            , cols: [[
+                {type: 'checkbox', fixed: 'left', hidden: true}
+                , {field: 'numbers', title: '序号', fixed: 'left', type: 'numbers'}
+                , {field: 'userId', title: '用户id', fixed: 'left', sort: true}
+                , {field: 'parentId', title: '上级用户id', fixed: 'left', sort: true}
+                , {field: 'loginName', title: '账号',minWidth: 100}
+                , {field: 'phone', minWidth: 120, title: '电话'}
+                , {field: 'userName', minWidth: 80, title: '姓名'}
+                , {
+                    field: 'sumPrice', title: '总收益', templet: function (d) {
+                        return (d.sumPrice - 0).toFixed(2);
+                    }
+                }
+                , {
+                    field: 'beforeMonthPrice', title: '上月收益', templet: function (d) {
+                        return (d.beforeMonthPrice - 0).toFixed(2);
+                    }
+                }
+                , {
+                    field: 'nowMonthPrice', title: '本月收益', templet: function (d) {
+                        return (d.nowMonthPrice - 0).toFixed(2);
+                    }
+                }
+                , {
+                    field: 'cashAmt', title: '已提现', templet: function (d) {
+                        return (d.cashAmt - 0).toFixed(2);
+                    }
+                }
+                , {
+                    field: 'surplusPrice', title: '余额', templet: function (d) {
+                        return (d.sumPrice - d.cashAmt).toFixed(2);
+                    }
+                }
+                , {
+                    field: 'rate', title: '费率(%)', sort: true, templet: function (d) {
+                        return (d.rate / 100).toFixed(2);
+                    }
+                }
+                , {
+                    field: 'isFixedRate', title: '费率类型', templet: function (d) {
+                        if (d.isFixedRate == "1") {
+                            return "固定";
+                        } else {
+                            return "浮动";
+                        }
+                    }
+                }
+                , {
+                    title: '自动审核', minWidth: 95, align: "center", templet: (d) => {
+                        return '<input type="checkbox" '+(d.autoAudit == "1" ? "checked" : "") + ' lay-filter="switchAutoAudit" data-userId="' + d.userId + '" lay-skin="switch" lay-text="开启|关闭">';
+                    }
+                }
+                , {
+                    title: '异地支付', minWidth: 95, align: "center", templet: (d) => {
+                        return '<input type="checkbox" '+(d.payEcdemicSwitch == "1" ? "checked" : "") + ' lay-filter="switchPayEcdemicSwitch" lay-skin="switch" data-userId="' + d.userId + '" lay-text="开启|关闭">';
+                    }
+                }
+                , {
+                    title: '营销商户', minWidth: 95, align: "center", templet: (d) => {
+                        return '<input type="checkbox" '+(d.isMarket == "1" ? "checked" : "") + ' lay-filter="switchMarket" lay-skin="switch" data-userId="' + d.userId + '" lay-text="开启|关闭">';
+                    }
+                }
+                , {
+                    title: '银联支付', minWidth: 95, align: "center", templet: (d) => {
+                        return '<input type="checkbox" '+(d.isUnionPay == "1" ? "checked" : "") + ' lay-filter="switchUnionPay" lay-skin="switch" data-userId="' + d.userId + '" lay-text="开启|关闭">';
+                    }
+                }
+                , {
+                    field: 'createTime',
+                    title: '创建日期',
+                    templet: "<div>{{layui.util.toDateString(d.createTime, 'yyyy-MM-dd HH:mm:ss')}}</div>"
+                }
+                , {
+                    field: 'updateTime',
+                    title: '修改日期',
+                    templet: "<div>{{layui.util.toDateString(d.updateTime, 'yyyy-MM-dd HH:mm:ss')}}</div>"
+                }
+                , {fixed: 'right', title: '操作', minWidth: 165, toolbar: '#barDemo'}
+            ]]
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , page: true
+            , done: function () {
+                $("[data-field='forceUpdate']").children().each(function () {
+                    if ($(this).text() == '0') {
+                        $(this).text('否');
+                    } else if ($(this).text() == '1') {
+                        $(this).text('是');
+                    }
+                });
+            }
+        });
+
+        //头工具栏事件
+        table.on('toolbar(agentInfoTab)', function (obj) {
+            switch (obj.event) {
+                case 'add':
+                    // 添加
+                    toAdd();
+                    break;
+                case 'search':
+                    // 查询
+                    search();
+                    break;
+            }
+        });
+
+        function saveUserApp(msg, param) {
+            debugger;
+            layer.confirm(msg , function (index) {
+                $.ajax({
+                    url: ctx + "/userApp/updateByUserId"
+                    , type: 'post'
+                    , data: param
+                    , success: function(data) {
+                        layer.close(index);
+                        table.reload('agentInfoTab', {
+                            where: form.val('formCondition')
+                        });
+                    }
+                });
+                layer.close(index);
+            }, function(index) {
+                table.reload('agentInfoTab', {
+                    where: form.val('formCondition')
+                });
+            });
+        }
+
+
+        form.on('switch(switchAutoAudit)', function(data) {
+            debugger
+            let userId = $(data.elem).data().userid;
+            let param = {};
+            param.userId = userId;
+            param.autoAudit = this.checked? '1': '0';
+            let msg = this.checked? '是否开启自动审核': '是否关闭自动审核?';
+            saveUserApp(msg, param);
+        })
+
+        form.on('switch(switchPayEcdemicSwitch)', function(data) {
+            let userId = $(data.elem).data().userid;
+            let param = {};
+            param.userId = userId;
+            param.payEcdemicSwitch = this.checked? '1': '0';
+            let msg = this.checked? '是否开启异地支付?': '是否关闭异地支付?';
+            saveUserApp(msg, param);
+        })
+
+        form.on('switch(switchMarket)', function(data) {
+            let userId = $(data.elem).data().userid;
+            let param = {};
+            param.userId = userId;
+            param.isMarket = this.checked? '1': '0';
+            let msg = this.checked? '是否开启营销商户': '是否关闭营销商户?';
+            saveUserApp(msg, param);
+        })
+
+        form.on('switch(switchUnionPay)', function(data) {
+            let userId = $(data.elem).data().userid;
+            let param = {};
+            param.userId = userId;
+            param.isUnionPay = this.checked? '1': '0';
+            let msg = this.checked? '是否开启银联支付': '是否关闭银联支付?';
+            saveUserApp(msg, param);
+        })
+
+        function search() {
+            table.reload('agentInfoTab', {
+                page: {
+                    curr: 1
+                }
+                , where: form.val('formCondition')
+            });
+        }
+
+        //监听行工具事件
+        table.on('tool(agentInfoTab)', function (obj) {
+            var data = obj.data;
+            //console.log(obj)
+            if (obj.event === 'del') {
+                layer.confirm('真的删除行么?', function (index) {
+                    obj.del(data);
+                    layer.close(index);
+                    del(obj);
+                });
+            } else if (obj.event === 'edit') {
+                toBaseEdit(obj.data);
+            } else if (obj.event === 'part') {
+                part(obj.data);
+            }
+        });
+
+        function toAdd(obj) {
+            var url = '${ctx}/agentInfo/detail/';
+            if (obj != undefined) {
+                url = "${ctx}/agentInfo/detail/" + obj.userId
+            }
+            var index = layer.open({
+                type: 2
+                , title: "添加"
+                , shade: 0.5
+                , maxmin: true
+                , content: url
+                , area: ['550px', '500px']
+            });
+        }
+
+        function toBaseEdit(obj) {
+            var url = '${ctx}/agentInfo/detail/';
+            if (obj != undefined) {
+                url = "${ctx}/agentInfo/detail/" + obj.userId
+            }
+            var index = layer.open({
+                type: 2
+                , title: "编辑"
+                , shade: 0.5
+                , maxmin: true
+                , content: url
+                , area: ['550px', '500px']
+            });
+        }
+
+        function part(obj) {
+            var url = "${ctx}/agentInfo/part/" + obj.userId;
+            var index = layer.open({
+                type: 2
+                , title: "编辑"
+                , shade: 0.5
+                , maxmin: true
+                , content: url
+                , area: ['550px', '300px']
+            });
+            layer.full(index);
+        }
+
+        function del(obj) {
+            $.ajax({
+                url: '${ctx}/agentInfo/delete',
+                method: 'post',
+                data: JSON.stringify(obj.data),
+                dataType: 'JSON',
+                contentType: "application/json",
+                success: function (res) {
+                    if (res.code == 200) {
+                        layer.msg(res.data, {
+                            icon: 1
+                        });
+                    } else {
+                        layer.msg(res.data, {
+                            icon: 5
+                        });
+                    }
+                }
+            })
+        }
+    });
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/agreement/agreementBaseInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/agreement/agreementBaseInfo.jsp
new file mode 100644
index 0000000..ba6387d
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/agreement/agreementBaseInfo.jsp
@@ -0,0 +1,85 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<script type="text/javascript">
+  window.UMEDITOR_HOME_URL = ctx + "/page/umeditor/";
+  var URL = window.UEDITOR_HOME_URL;
+</script>
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">  
+	<div class="tab-pane active">     
+		<div class="panel-body">
+			<div class="wrapper wrapper-content">
+				<div class="panel-form animated fadeInRight wp60 fc">
+					<div class="layui-form-item dn	has-error" >   
+						<label class="layui-form-label">id</label>  
+						<div class="layui-input-block">
+							<input type="text" id="id"  lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${agreement.id }" >
+						</div>  
+					</div>
+					
+					<%-- <div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">名称</label>  
+						<div class="layui-input-block">
+							<input type="text" id="name" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${agreement.name }" >
+						</div>  
+					</div> --%>
+					
+					<div class="layui-form-item layui-form-text">
+                    <label class="layui-form-label">内容</label>  
+                    <div class="layui-input-block">         
+                        <textarea id="content"  placeholder="请输入内容" class="layui-textarea">${agreement.content }</textarea>
+                        <span><font color="red">请勿轻易修改此内容！</font></span>
+                    </div>
+                </div>
+                
+                <div class="form-group">
+                            <div class="layui-form-item">          
+                                <label class="layui-form-label">协议</label>
+                                <div class="layui-input-block">
+                                    <select  id="discern">
+                                        <option value="">请选择</option>
+                                        <option value="0" <c:if test="${agreement.discern == 0}">selected</c:if>>注册协议</option>         
+                                        <option value="1" <c:if test="${agreement.discern == 1}">selected</c:if>>银行卡协议</option>
+                                        <option value="2" <c:if test="${agreement.discern == 2}">selected</c:if>>提现规则</option>
+                                        <option value="3" <c:if test="${agreement.discern == 3}">selected</c:if>>隐私协议</option>
+                                        <option value="5" <c:if test="${agreement.discern == 5}">selected</c:if>>应用权限说明</option>
+                                        <option value="6" <c:if test="${agreement.discern == 6}">selected</c:if>>第三方SDK说明</option>
+                                    </select>              
+                                </div>
+                            </div>
+                        </div>
+                        
+                      <div class="layui-form-item dn  has-error" >   
+                        <label class="layui-form-label"></label>  
+                        <div class="layui-input-block">
+                            <input type="text" id="oldDiscern"  lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${agreement.discern}" >
+                        </div>  
+                    </div>
+                        
+					
+					<%-- <div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">内容</label>  
+						<div class="layui-input-block">
+						  <textarea rows="" cols=""></textarea>
+							<input type="text" name="content" id="" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${agreement.content }" >
+						</div>  
+					</div> --%>
+	
+				</div>
+			</div>
+		</div>  
+	</div>
+</form>
+<script type="text/javascript">
+    //form表单样式
+    layui.use(['layer', 'form'], function() {    
+        var layer = layui.layer,
+            form = layui.form;
+        form.render();
+    });
+    $(function(){
+        UM.getEditor('content');
+    })
+    
+</script>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/agreement/agreementDetails.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/agreement/agreementDetails.jsp
new file mode 100644
index 0000000..2dd9e9f
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/agreement/agreementDetails.jsp
@@ -0,0 +1,59 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>     
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">                      
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black"> 
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> 
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->                                     
+<meta name="viewport"
+	content="width=device-width, initial-scale=1.0, maximum-scale=1.0">   
+<jsp:include page="../../common.jsp" />
+<link rel="stylesheet" type="text/css" href="${ctx}/page/umeditor/themes/default/css/umeditor.css">
+<script type="text/javascript" src="${ctx}/page/umeditor/third-party/template.min.js"></script>
+<script type="text/javascript" src="${ctx}/page/umeditor/umeditor.config.js"></script>
+<script type="text/javascript" src="${ctx}/page/umeditor/umeditor.min.js"></script>
+<script type="text/javascript" src="${ctx}/page/umeditor/lang/zh-cn/zh-cn.js"></script>
+<script type="text/javascript">
+    require("js/agreement/agreementDetails.js");
+</script>
+<title>编辑</title>
+</head>                                 
+	<body class="lgraybg">            
+		<div class="	container-fluid animated fadeInRight col-sm-12">
+			<div class="panel-toolbar mt10 mb10 pt5 pb5 pl10 bdd whitebg">
+				<div class="buttons">
+					<a href="javascript:void(0);" class="layui-btn layui-btn-sm layui-btn-danger fa fa-save f12"><span>保存</span></a>
+					<a href="${ctx }/agreement/index?pageIndex=${pageIndex}"  class="layui-btn layui-btn-sm fa fa-back f12" id="goback"><span>返回</span></a>
+				</div>
+			</div>
+				<div class="tabs-container whitebg">
+					<div class="pt10 pl5 pr5">
+						<ul class="nav nav-tabs" id="nav-tabs">
+							<li class="active" data-action="base">   
+								<a href="javascript:void(0);" >基本资料</a>
+							</li>
+							<!-- <li class="" data-action="functions">
+								<a href="javascript:void(0);"  >多功能输入</a>
+							</li>
+							<li class="" data-action="extends">
+								<a href="javascript:void(0);" >扩展属性</a>
+							</li> -->
+						</ul>
+						<div class="tab-content pt30 p30">               
+		
+						</div>     
+					</div>
+				</div>    
+		</div>
+		<!-- 隐藏域 -->
+		<input type="hidden" id="agreementId" value="${agreement.id }"/>
+	</body>
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/agreement/agreementExtendsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/agreement/agreementExtendsInfo.jsp
new file mode 100644
index 0000000..592687a
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/agreement/agreementExtendsInfo.jsp
@@ -0,0 +1,201 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>           
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> 
+<div class="tab-pane active">      
+	<div class="animated fadeInRight">
+		<div class="whitebg pl10 pr10">
+			<table class="table table-striped table-bordered table-hover">     
+				<thead> 
+					<tr>  
+						<th class="textc">序号</th>         
+						<th class="textc wp15">流水账号</th>
+						<th class="textc">日期</th>         
+						<th class="textc">财务类别</th>     
+						<th class="textc">金额</th>         
+						<th class="textc">银行</th>         
+						<th class="textc">发票</th>         
+						<th class="textc">客户名称</th>     
+						<th class="textc wp15">单号</th>    
+						<th class="textc">状态</th>         
+						<th class="textc">类别</th>         
+						<th class="textc">操作</th>         
+					</tr> 
+				</thead>
+				<tbody> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+                
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="green">支出</span></td>     
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+				</tbody>
+                
+			</table>  
+			<!-- footer -->  
+			<div class="clearfix mb10 pb20">          
+					<div class="layui-tab-item fr">       
+							<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+							<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>   
+							<div class="pagination dlblock vm" id="pagination"></div>
+							<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>            
+					</div>
+				</div>  
+		</div>      
+	</div>        
+</div>          
+                
+<script type="text/javascript">    
+//分页          
+$('#pagination').pagination({        
+	pageCount: 50,
+	jump: true,   
+	coping: true, 
+	homePage: '首页',    
+	endPage: '末页',     
+	prevContent: '上页', 
+	nextContent: '下页', 
+	callback: function(api) {          
+		$('.now').text(api.getCurrent());
+	}             
+});             
+</script>       
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/agreement/agreementFunctionsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/agreement/agreementFunctionsInfo.jsp
new file mode 100644
index 0000000..982ce84
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/agreement/agreementFunctionsInfo.jsp
@@ -0,0 +1,130 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>		
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">      
+<div class="tab-pane active">
+				<div class="panel-body">
+					<div class="wrapper wrapper-content">     
+						<div class="panel-form animated fadeInRight wp60 fc">
+							<!-- 账号资料 -->
+			<div class="layui-form-item 	has-error">
+				<label class="layui-form-label">单行输入框<i class="red">*</i></label>
+				<div class="layui-input-block">
+					<input type="text" name="title" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input">
+				</div>                                         
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">自定义验证</label>
+				<div class="layui-input-inline ml30">
+					<input type="password" name="password" lay-verify="pass" placeholder="请输入密码" autocomplete="off" class="layui-input">
+				</div>
+				<div class="layui-form-mid layui-word-aux">请填写6到12位密码</div>
+			</div>
+			<div class="form-group">
+				<div class="layui-form-item">          
+					<label class="layui-form-label">单行选择框</label>
+					<div class="layui-input-block">
+						<select name="interest" lay-filter="aihao">  
+							<option value=""></option>
+							<option value="0">写作</option>         
+							<option value="1" selected="">阅读</option>
+							<option value="2">游戏</option>
+							<option value="3">音乐</option>
+							<option value="4">旅行</option>  
+						</select>              
+					</div>
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<div class="layui-inline">  
+					<label class="layui-form-label">范围</label>
+					<div class="layui-input-inline ml30">
+						<input type="text" name="price_min" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>                                     
+					<div class="layui-form-mid">-</div>
+					<div class="layui-input-inline">       
+						<input type="text" name="price_max" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>
+				</div>           
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">联动选择框</label>
+				<div class="layui-input-inline ml30">
+					<select name="quiz1">     
+						<option value="">请选择省</option>
+						<option value="浙江" selected="">浙江省</option> 
+						<option value="你的工号">江西省</option>           
+						<option value="你最喜欢的老师">福建省</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz2">
+						<option value="">请选择市</option>
+						<option value="杭州">杭州</option>
+						<option value="宁波" disabled="">宁波</option>
+						<option value="温州">温州</option>
+						<option value="温州">台州</option>
+						<option value="温州">绍兴</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz3">
+						<option value="">请选择县/区</option>
+						<option value="西湖区">西湖区</option>
+						<option value="余杭区">余杭区</option>
+						<option value="拱墅区">临安市</option>
+					</select>
+				</div>    
+			</div>
+			<div class="layui-form-item" pane="">   
+				<label class="layui-form-label">原始复选框</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="like1[write]" lay-skin="primary" title="写作" checked="">  
+					<input type="checkbox" name="like1[read]" lay-skin="primary" title="阅读">
+					<input type="checkbox" name="like1[game]" lay-skin="primary" title="游戏" disabled="">
+				</div>
+			</div>
+
+			<div class="layui-form-item">
+				<label class="layui-form-label">开关-默认关</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="close" lay-skin="switch" lay-text="ON|OFF">
+				</div>
+			</div>
+			<div class="layui-form-item">  
+				<label class="layui-form-label">单选框</label>
+				<div class="layui-input-block">
+					<input type="radio" name="sex" value="男" title="男" checked="">
+					<input type="radio" name="sex" value="女" title="女">
+					<input type="radio" name="sex" value="禁" title="禁用" disabled="">
+				</div>
+			</div>
+			<!--<div class="layui-form-item layui-form-text">
+				<label class="layui-form-label">上传图片</label>
+				<div class="layui-input-block">
+					<div class="layui-upload-drag w200 h200">
+						<i class="layui-icon"></i>          
+						<p>点击上传</p>
+					</div>
+				</div>
+			</div>-->
+				<div class="layui-form-item layui-form-text">
+					<label class="layui-form-label">普通文本域</label>  
+					<div class="layui-input-block">              
+						<textarea placeholder="请输入内容" class="layui-textarea"></textarea>
+					</div>
+				</div>
+			</div>
+		</div>   
+	</div>
+</div>
+</form>   
+<script type="text/javascript">
+	//form表单样式
+	layui.use(['layer', 'form'], function() {    
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+</script>                 
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/agreement/agreementList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/agreement/agreementList.jsp
new file mode 100644
index 0000000..c48824f
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/agreement/agreementList.jsp
@@ -0,0 +1,114 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black">
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->
+<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+<jsp:include page="../../common.jsp" />
+<script type="text/javascript">
+     require("js/agreement/agreementList.js");
+</script>
+	<style type="text/css">
+		.layui-table th {
+			text-align: center;
+		}
+	</style>
+</head>
+<body>
+	<div class="row animated fadeInRight" style="margin: 0;">
+		<div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+			<div class="toolbar-panel bdd">
+				<div class="toolbar-box">
+					<div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+						<!-- 顶部按钮 -->
+						<div class="buttons fl">
+							<a class="layui-btn layui-btn-sm fa fa-search f13" href="javascript:void(0);" onclick="queryAgreement()"><span>搜索</span></a>
+							<a class="layui-btn layui-btn-sm fa fa-plus f13 add" href="javascript:void(0);" onclick="initAddAgreement()"><span>添加</span></a>
+							<a class="layui-btn layui-btn-sm fa fa-edit f13" href="javascript:void(0);" onclick="initEditAgreement()"><span>编辑</span></a>
+							<a class="layui-btn layui-btn-sm layui-btn-danger fa fa-remove f13 delete" href="javascript:void(0);" onclick="initBatchDeleteAgreement()"><span>删除</span></a>
+						</div>
+						<div class="tools fr">
+							<a href="javascript:void(0);" class="collapse dblock f14 dgray mr5"> 
+								<i class="fa-2x fa fa-angle-double-up"></i>
+							</a>
+						</div>
+					</div>
+				</div>
+
+				<!--搜索条件 -->
+				<div class="toolbar-body">
+					<div class="row pt10 pb10 whitebg ml0 mr0">
+						<span class="dlblock w100 textr">名称：</span> 
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+							<input type="text" id="name" placeholder="请输入名称">
+						</span> 
+						<!-- <span class="dlblock w100 textr">类别：</span>
+						 <select class="form-control f12 w180 textc">
+							<option value="">支出</option>
+							<option value="">收入</option>
+						</select> -->
+<%--					</div>--%>
+<%--					<div class="mt10 dn mb20">--%>
+						<span class="dlblock w100 textr">开始日期</span>
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+							 <input type="text" placeholder="" id="date1" class="w150">
+							 <i class="fa fa-calendar"></i>
+						</span> 
+						<span class="dlblock w100 textr">结束日期</span>
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+						<input type="text" placeholder="" id="date2" class="w150"> 
+							<i class="fa fa-calendar"></i>
+						</span>
+					</div>
+				</div>
+			</div>
+		</div>
+		<!-- 表单数据 -->
+		<div class="mb20 mt10">
+			<div class="whitebg pl10 pr10">
+				<table class="layui-table">
+					<thead>
+						<tr>
+							<th class="textc">
+								<div class="checker" id="allCheck">
+									<span class=""><input type="checkbox" value="" ></span>
+								</div>
+							</th>
+							<th class="textc ">序号</th>
+							<th class="textc ">名称</th>
+							<th class="textc ">创建时间</th>
+							<th class="textc wp15">创建人</th>
+							<th class="textc">操作</th>
+						</tr>
+					</thead>
+					<!-- 数据体 -->
+					<tbody id="data_content">
+					</tbody>
+				</table>
+			
+			<!-- footer -->
+				<div class="clearfix mb10 pb20">
+						<div class="layui-tab-item fr">
+								<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+								<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>
+								<div class="pagination dlblock vm" id="pagination"></div>
+								<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>
+						</div>
+					</div>
+	
+			</div>
+		</div>
+	</div>
+</body>
+
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/appGuide/appGuideDetail.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/appGuide/appGuideDetail.jsp
new file mode 100644
index 0000000..3e6106e
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/appGuide/appGuideDetail.jsp
@@ -0,0 +1,117 @@
+<%--
+  Created by IntelliJ IDEA.
+  User: Administrator
+  Date: 2020/8/3
+  Time: 14:32
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+    <link rel="stylesheet" type="text/css" href="${ctx}/page/umeditor/themes/default/css/umeditor.css">
+    <script type="text/javascript" src="${ctx}/page/umeditor/third-party/template.min.js"></script>
+    <script type="text/javascript" src="${ctx}/page/umeditor/umeditor.config.js"></script>
+    <script type="text/javascript" src="${ctx}/page/umeditor/umeditor.min.js"></script>
+    <script type="text/javascript" src="${ctx}/page/umeditor/lang/zh-cn/zh-cn.js"></script>
+    <style>
+        .layui-input, .layui-textarea {
+            border-color: #606060;
+        }
+
+        .layui-form-select dl {
+            z-index: 9999;
+        }
+    </style>
+</head>
+<body>
+<form class="layui-form" action="" style="width: 90%">
+    <input name="id" value="${entity.id}" hidden/>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">页面code</label>
+        <div class="layui-input-block">
+            <input name="code" value="${entity.code}" placeholder="请输入页面Code" class="layui-input"/>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">页面名称</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="name" value="${entity.name}" placeholder="请输入页面名称" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">简介内容</label>
+        <div class="layui-input-block">
+            <textarea name="content" id="content" placeholder="请输入内容"
+                      class="layui-textarea">${entity.content}</textarea>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button class="layui-btn" lay-submit lay-filter="formDemo">立即提交</button>
+            <button type="button" id="close" class="layui-btn layui-btn-primary">关闭</button>
+        </div>
+    </div>
+</form>
+
+<script>
+    layui.use(['form', 'upload', 'element', 'layer'], function () {
+        var form = layui.form;
+        var layer = layui.layer;
+        var element = layui.element;
+
+        var um = UM.getEditor('content');
+        um.setWidth("100%");
+
+        element.init();
+
+        $('#close').click(function () {
+            parent.layer.closeAll();
+        });
+
+        //监听提交
+        form.on('submit(formDemo)', function (data) {
+            var index = layer.load(1, {shade: [0.1, '#000']});
+            var params = data.field;
+            params.content = um.getContent();
+            debugger;
+            $.ajax({
+                url: '${ctx}/appGuide/saveOrUpdate',
+                method: 'post',
+                data: JSON.stringify(params),
+                dataType: 'JSON',
+                contentType: "application/json",
+                success: function (res) {
+                    layer.close(index);
+                    if (res.code == 200) {
+                        layer.alert(res.data, function () {
+                            parent.location.reload();
+                        })
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 5
+                        });
+                    }
+                }
+            })
+            return false;
+        });
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/appGuide/appGuideList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/appGuide/appGuideList.jsp
new file mode 100644
index 0000000..5a10209
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/appGuide/appGuideList.jsp
@@ -0,0 +1,174 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+
+    <style>
+        p img {
+            width: 100%;
+            height: 100%;
+            object-fit:cover;
+        }
+    </style>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <table class="layui-hide" id="tab1" lay-filter="tab1"></table>
+    </div>
+</div>
+
+<script type="text/html" id="toolbarDemo">
+    <div class="layui-btn-container">
+        <button class="layui-btn layui-btn-sm" lay-event="add">添加</button>
+        <button class="layui-btn layui-btn-sm" lay-event="search">查询</button>
+    </div>
+</script>
+
+<script type="text/html" id="barDemo">
+    <a class="layui-btn layui-btn-xs" lay-event="view">查看</a>
+    <a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>
+    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
+</script>
+
+<script>
+    layui.use(['table', 'layer'], function () {
+        var table = layui.table;
+        var layer = layui.layer;
+
+        var tableIns = table.render({
+            elem: '#tab1'
+            , url: '${ctx}/appGuide/page'
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.count, //解析数据长度
+                    "data": res.data.data //解析数据列表
+                };
+            }
+            , toolbar: '#toolbarDemo' //开启头部工具栏，并为其绑定左侧模板
+            , defaultToolbar: ['filter']
+            , title: 'app引导内容数据表'
+            , cols: [[
+                {type: 'checkbox', fixed: 'left'}
+                , {field: 'numbers', title: '序号', fixed: 'left', type: 'numbers'}
+                , { field: 'code', title: '编码'}
+                , { field: 'name', title: '页面名称'}
+                , {
+                    field: 'createTime',
+                    title: '创建日期',
+                    templet: "<div>{{layui.util.toDateString(d.createTime, 'yyyy-MM-dd HH:mm:ss')}}</div>"
+                }
+                , {
+                    field: 'updateTime',
+                    title: '修改日期'
+                    // , width: 160
+                    // ,templet: "<div>{{layui.util.toDateString(d.updateTime, 'yyyy-MM-dd HH:mm:ss')}}</div>"
+                }
+                , {fixed: 'right', title: '操作', minWidth: 110, toolbar: '#barDemo'}
+            ]]
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , page: true
+        });
+
+        //头工具栏事件
+        table.on('toolbar(tab1)', function (obj) {
+            switch (obj.event) {
+                case 'add':
+                    // 添加
+                    toAdd();
+                    break;
+                case 'search':
+                    // 查询
+                    tableIns.reload();
+                    break;
+            }
+        });
+
+        //监听行工具事件
+        table.on('tool(tab1)', function (obj) {
+            var data = obj.data;
+            switch (obj.event) {
+                case 'del':
+                    layer.confirm('真的删除行么?', function (index) {
+                        obj.del(data);
+                        layer.close(index);
+                        del(obj);
+                    });
+                    break;
+                case 'edit':
+                    toAdd(obj.data);
+                    break;
+                case 'view':
+                    layer.open({
+                        type: 1
+                        , title: "预览"
+                        , content: data.content
+                        , area: ['600px', '800px']
+
+                    });
+                    break;
+
+            }
+        });
+
+        function toAdd(obj) {
+            var url = '${ctx}/appGuide/add';
+            if (obj != undefined) {
+                url = "${ctx}/appGuide/edit/" + obj.id
+            }
+            var index = layer.open({
+                type: 2
+                , shade: 0.5
+                , maxmin: true
+                , content: url
+                , area: ['800px', '600px']
+            });
+        }
+
+        function del(obj) {
+            $.ajax({
+                url: '${ctx}/appGuide/delete',
+                type: 'post',
+                data: JSON.stringify(obj.data),
+                dataType: 'JSON',
+                contentType: "application/json",
+                success: function (res) {
+                    if (res.code == 200) {
+                        layer.msg(res.data, {
+                            icon: 1
+                        });
+                    } else {
+                        layer.msg(res.data, {
+                            icon: 5
+                        });
+                    }
+                }
+            })
+        }
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/appVersionInfo/detail.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/appVersionInfo/detail.jsp
new file mode 100644
index 0000000..f83ff82
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/appVersionInfo/detail.jsp
@@ -0,0 +1,239 @@
+<%--
+  Created by IntelliJ IDEA.
+  User: Administrator
+  Date: 2020/8/3
+  Time: 14:32
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp" />
+    <style>
+        .layui-input,.layui-textarea{
+            border-color:#606060;
+        }
+    </style>
+</head>
+<body>
+<form class="layui-form" action="" style="width: 70%">
+    <input name="id" value="${appVerInfo.id}" hidden/>
+    <input name="url" value="${appVerInfo.url}" hidden />
+
+   <div class="layui-form-item">
+       <label class="layui-form-label">平台Code</label>
+       <div class="layui-input-block">
+           <select name="platformCode" lay-verify="required">
+               <option value=""></option>
+               <option value="0" ${appVerInfo.platformCode == 0 ? 'selected' : ''} >android</option>
+               <option value="1" ${appVerInfo.platformCode == 1 ? 'selected' : ''}>iOS</option>
+           </select>
+       </div>
+   </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">平台名称</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="platformName" value="${appVerInfo.platformName}" placeholder="请输入版本Code" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+
+     <div class="layui-form-item">
+        <label class="layui-form-label">版本Code</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="versionCode" value="${appVerInfo.versionCode}" placeholder="请输入版本Code" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+     <div class="layui-form-item">
+        <label class="layui-form-label">版本号</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="versionName" value="${appVerInfo.versionName}" placeholder="请输入版本号" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+
+
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">是否强制更新</label>
+        <div class="layui-input-block">
+            <select name="forceUpdate" lay-verify="required">
+                <option value="0" ${appVerInfo.forceUpdate == 0 ? 'selected' : ''}>否</option>
+                <option value="1" ${appVerInfo.forceUpdate == 1 ? 'selected' : ''}>是</option>
+            </select>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">版本说明</label>
+        <div class="layui-input-block" style="margin-left:0">
+            <div class="layui-input-block">
+                <textarea name="updateInfo" placeholder="更新说明" class="layui-textarea">${appVerInfo.updateInfo}</textarea>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">上传APP</label>
+        <div class="layui-input-block" style="display: flex;justify-content: flex-start">
+            <input name="fileKey" id="fileKey" hidden/>
+            <input name="url" id="url" value="${appVerInfo.url}" hidden/>
+            <input name="chooseFile" id="chooseFile" placeholder="浏览..." class="layui-input layui-col-xs6" readonly/>
+            <button type="button" class="layui-btn layui-btn-normal layui-col-xs3"  id="uploadBtn">
+                上传
+            </button>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button class="layui-btn" lay-submit lay-filter="formDemo">立即提交</button>
+            <button type="button" id="close" class="layui-btn layui-btn-primary">关闭</button>
+        </div>
+    </div>
+
+    <div id="uploadLoadingDiv" style="display: none;">
+        <div class="layui-progress" lay-showpercent="true" lay-filter="js_upload_progress" style="margin: 10px;margin-top: 20px;">
+            <div class="layui-progress-bar layui-bg-red" lay-percent="0%"></div>
+        </div>
+    </div>
+</form>
+
+<form id="ajaxForm" class="layui-form" style="width: 70%" >
+    <input type="hidden" name="OSSAccessKeyId" id="accessid" value="${uploadParam.accessid}">
+    <input type="hidden" name="policy" id="policy" value="${uploadParam.policy}">
+    <input type="hidden" name="signature" id="signature" value="${uploadParam.signature}">
+    <input type="hidden" name="expire" id="expire" value="${uploadParam.expire}">
+    <input type="hidden" name="success_action_status" id="success_action_status" value="200">
+    <input type="hidden" name="key" id="key" value="${uploadParam.key}">
+    <input type="hidden" name="callBack" id="key2_callBack" value="${uploadParam.callBack}">
+    <input type="file" style="display: none" name="file" id="file" onchange="document.getElementById('fileName').value=this.files[0].name">
+</form>
+
+<script>
+    //Demo
+    layui.use(['form', 'upload','element','layer'], function(){
+        var form = layui.form;
+        var upload = layui.upload;
+        var layer = layui.layer;
+        var element = layui.element;
+        element.init();
+        $('#close').click(function() {
+            parent.layer.closeAll();
+        });
+
+        //创建监听函数
+        var xhrOnProgress=function(fun) {
+            xhrOnProgress.onprogress = fun; //绑定监听
+            //使用闭包实现监听绑
+            return function() {
+                //通过$.ajaxSettings.xhr();获得XMLHttpRequest对象
+                var xhr = $.ajaxSettings.xhr();
+                //判断监听函数是否为函数
+                if (typeof xhrOnProgress.onprogress !== 'function')
+                    return xhr;
+                //如果有监听函数并且xhr对象支持绑定时就把监听函数绑定上去
+                if (xhrOnProgress.onprogress && xhr.upload) {
+                    xhr.upload.onprogress = xhrOnProgress.onprogress;
+                }
+                return xhr;
+            }
+        }
+        var openIndex = "";
+        upload.render({
+            elem: '#chooseFile', // 文件选择
+            // accept:'apk',
+            url: '${uploadParam.host}',
+            exts: 'apk',
+            method:'POST',
+            auto: false, // 设置不自动提交
+            bindAction: '#uploadBtn', // 提交按钮
+            before:function(){
+                element.progress('js_upload_progress', '0%');//设置页面进度条
+                openIndex = layer.open({
+                    type: 1,
+                    title: '上传进度',
+                    closeBtn: 1, //不显示关闭按钮
+                    area: ['300px', '130px'],
+                    shadeClose: false, //开启遮罩关闭
+                    content: $("#uploadLoadingDiv").html(),
+                    offset: '100px'
+                });
+            }
+            ,xhr:xhrOnProgress
+            ,progress:function(value){//上传进度回调 value进度值
+                element.progress('js_upload_progress', value+'%');//设置页面进度条
+            }
+            , data: {
+                'key': '${uploadParam.key}.apk'
+                , 'OSSAccessKeyId': '${uploadParam.accessid}'
+                , 'policy': '${uploadParam.policy}'
+                , 'signature': '${uploadParam.signature}'
+                , 'expire': '${uploadParam.expire}'
+                , 'success_action_status': '200'
+                , 'callBack': '${uploadParam.callBack}'
+            }
+            ,choose: function(obj) {
+                obj.preview(function(index, file, result) {
+                    $("#chooseFile").val(file.name);
+                });
+            }
+            , done: function(res) {
+                layer.close(openIndex);
+                if (res.code == 200){
+                    layer.msg("上传成功！")
+                    $("#url").val(res.url);
+                }else{
+                    layer.msg("上传失败！")
+                }
+            },
+            error: function(res) {
+                layer.msg(res.msg);
+            }
+        });
+
+        //关闭进度条提示
+        $(document).on('click','.js_upload_progress_bar_sure',function(){
+            layer.close(layer.index);
+        });
+
+            //监听提交
+        form.on('submit(formDemo)', function(data){
+            var index = layer.load(1,{shade: [0.1,'#000'] });
+            $.ajax({
+                url: '${ctx}/appVersionInfo/saveOrUpdate',
+                method: 'post',
+                data: JSON.stringify(data.field),
+                dataType: 'JSON',
+                contentType:"application/json",
+                success: function(res) {
+                    layer.close(index);
+                    if(res.code == 200) {
+                        layer.alert(res.data,function(){
+                             parent.location.reload();
+                        })
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 5
+                        });
+                    }
+                }
+            })
+            return false;
+        });
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/appVersionInfo/list.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/appVersionInfo/list.jsp
new file mode 100644
index 0000000..29a0734
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/appVersionInfo/list.jsp
@@ -0,0 +1,183 @@
+<%--
+  Created by IntelliJ IDEA.
+  User: Administrator
+  Date: 2020/8/3
+  Time: 14:29
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <table class="layui-hide" id="appVersionInfoTab" lay-filter="appVersionInfoTab"></table>
+    </div>
+</div>
+
+<script type="text/html" id="toolbarDemo">
+    <div class="layui-btn-container">
+        <button class="layui-btn layui-btn-sm" lay-event="add">添加</button>
+        <button class="layui-btn layui-btn-sm" lay-event="search">查询</button>
+    </div>
+</script>
+
+<script type="text/html" id="barDemo">
+    <a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>
+    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
+</script>
+
+<script>
+    layui.use(['table', 'layer'], function () {
+        var table = layui.table;
+        var layer = layui.layer;
+
+        var tableIns = table.render({
+            elem: '#appVersionInfoTab'
+            , url: '${ctx}/appVersionInfo/page'
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.count, //解析数据长度
+                    "data": res.data.data //解析数据列表
+                };
+            }
+            , toolbar: '#toolbarDemo' //开启头部工具栏，并为其绑定左侧模板
+            , defaultToolbar: ['filter']
+            , title: 'app版本数据表'
+            , cols: [[
+                {type: 'checkbox', fixed: 'left'}
+                , {field: 'numbers', title: '序号', fixed: 'left', width: 80, type: 'numbers'}
+                , {
+                    field: 'platformCode', title: '平台code', templet: function (r) {
+                        if (r.platformCode == 0) {
+                            return "android";
+                        } else {
+                            return "IOS";
+                        }
+                    }
+                }
+                , {field: 'platformName', title: '平台名称'}
+                , {field: 'versionCode', title: '版本code', sort: true}
+                , {field: 'versionName', title: '版本号'}
+                , {field: 'url', title: '下载链接', hidden: true}
+                , {field: 'updateInfo', title: '更新内容', sort: true}
+                , {field: 'forceUpdate', title: '强制更新'}
+                , {
+                    field: 'createTime',
+                    title: '创建日期',
+                    width: 160,
+                    templet: "<div>{{layui.util.toDateString(d.createTime, 'yyyy-MM-dd HH:mm:ss')}}</div>"
+                }
+                , {
+                    field: 'updateTime',
+                    title: '修改日期',
+                    width: 160
+                    // ,templet: "<div>{{layui.util.toDateString(d.updateTime, 'yyyy-MM-dd HH:mm:ss')}}</div>"
+                }
+                , {fixed: 'right', title: '操作', minWidth: 110, toolbar: '#barDemo'}
+            ]]
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , page: true
+            , done: function () {
+                $("[data-field='forceUpdate']").children().each(function () {
+                    if ($(this).text() == '0') {
+                        $(this).text('否');
+                    } else if ($(this).text() == '1') {
+                        $(this).text('是');
+                    }
+                });
+            }
+        });
+
+        //头工具栏事件
+        table.on('toolbar(appVersionInfoTab)', function (obj) {
+            switch (obj.event) {
+                case 'add':
+                    // 添加
+                    toAdd();
+                    break;
+                case 'search':
+                    // 查询
+                    tableIns.reload();
+                    break;
+            }
+        });
+
+        //监听行工具事件
+        table.on('tool(appVersionInfoTab)', function (obj) {
+            var data = obj.data;
+            //console.log(obj)
+            if (obj.event === 'del') {
+                layer.confirm('真的删除行么?', function (index) {
+                    obj.del(data);
+                    layer.close(index);
+                    del(obj);
+                });
+            } else if (obj.event === 'edit') {
+                toAdd(obj.data);
+            }
+        });
+
+        function toAdd(obj) {
+            var url = '${ctx}/appVersionInfo/add';
+            if (obj != undefined) {
+                url = "${ctx}/appVersionInfo/edit/" + obj.id
+            }
+            var index = layer.open({
+                type: 2
+                , shade: 0.5
+                , maxmin: true
+                , content: url
+                , area: ['550px', '600px']
+            });
+        }
+
+        function del(obj) {
+            $.ajax({
+                url: '${ctx}/appVersionInfo/delete',
+                type: 'post',
+                data: JSON.stringify(obj.data),
+                dataType: 'JSON',
+                contentType: "application/json",
+                success: function (res) {
+                    if (res.code == 200) {
+                        layer.msg(res.data, {
+                            icon: 1
+                        });
+                    } else {
+                        layer.msg(res.data, {
+                            icon: 5
+                        });
+                    }
+                }
+            })
+        }
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/menu/menu.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/menu/menu.jsp
new file mode 100644
index 0000000..0bc6032
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/menu/menu.jsp
@@ -0,0 +1,259 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <title>菜单管理</title>
+    <jsp:include page="../../../common.jsp"/>
+    <jsp:include page="../../../public.jsp"/>
+    <link href="${res}/js/zTree/css/zTreeStyle/zTreeStyle.css" rel="stylesheet">
+    <script type="text/javascript" src="${res}/js/zTree/js/jquery.ztree.all-3.5.min.js"></script>
+    <script type="text/javascript" src="${res}/js/menu/menu.js?rnd=112.7"></script>
+
+    <style type="text/css">
+        #menu_tree {
+            min-height: 320px;
+            max-height: 480px;
+        }
+
+        #menu_tree_block .block-body {
+            margin: 5px;
+        }
+
+        .ztree li a:hover {
+            text-decoration: none;
+        }
+
+        .ztree li span.button.folder_ico_close {
+            margin-right: 2px;
+            vertical-align: top;
+            background-position: -384px -120px;
+            background-image: url("${res}/jquery-ui-bs/assets/img/glyphicons-halflings.png");
+        }
+
+        .ztree li span.button.folder_ico_open {
+            margin-right: 2px;
+            vertical-align: top;
+            background-position: -408px -120px;
+            background-image: url("${res}/jquery-ui-bs/assets/img/glyphicons-halflings.png");
+        }
+
+        .ztree li span.button.page_ico_open {
+            margin-right: 2px;
+            vertical-align: top;
+            background-position: -24px -24px;
+            background-image: url("${res}/jquery-ui-bs/assets/img/glyphicons-halflings.png");
+        }
+
+        .ztree li span.button.page_ico_close {
+            margin-right: 2px;
+            vertical-align: top;
+            background-position: -24px -24px;
+            background-image: url("${res}/jquery-ui-bs/assets/img/glyphicons-halflings.png");
+        }
+
+        .ztree li span.button.action_ico_docu {
+            margin-right: 2px;
+            vertical-align: top;
+            background-position: -384px -144px;
+            background-image: url("${res}/jquery-ui-bs/assets/img/glyphicons-halflings.png");
+        }
+
+        #rMenu {
+            position: absolute;
+            visibility: hidden;
+            top: 0;
+            background-color: rgb(244, 244, 244);
+            text-align: left;
+            padding: 2px;
+            border: 1px solid #a6a6a6;
+        }
+
+        #rMenu ul {
+            margin: 0;
+        }
+
+        #rMenu ul li {
+            margin: 1px 0;
+            padding: 2px 8px;
+            cursor: pointer;
+            list-style: none outside none;
+            font-size: 12px;
+            font-family: Verdana, Arial, Helvetica, AppleGothic, sans-serif;
+            color: #0088cc;
+        }
+
+        #rMenu ul li:hover {
+            color: #005580;
+        }
+
+        #icon_upload_wrap {
+            width: 80px;
+            height: 80px;
+            position: relative;
+            border: 1px solid #ccc;
+            background-image: url(${res}/img/upload.png);
+            background-repeat: no-repeat;
+            background-position: center center;
+        }
+
+        #icon_upload_wrap img {
+            width: 100%;
+            height: 100%;
+            display: block;
+            background-color: #FFF;
+        }
+
+        #icon_upload_wrap .clear {
+            width: 100%;
+            height: 50%;
+            position: absolute;
+            bottom: 0;
+            background-color: rgba(0, 0, 0, 0.6);
+            filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#99000000, endColorstr=#99000000);
+            -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr=#99000000, endColorstr=#99000000)";
+            z-index: 10;
+            display: none;
+        }
+
+        #icon_upload_wrap .clear button {
+            margin: 10px auto;
+            width: 50px;
+            display: block;
+        }
+
+        .uploadify-queue {
+            position: fixed;
+            margin: auto;
+            left: 0;
+            top: 0;
+            right: 0;
+            bottom: 0;
+            width: 300px;
+            height: 120px;
+        }
+
+        .control-label {
+            padding-top: 0 !important;
+        }
+    </style>
+</head>
+<body>
+<fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
+    <legend>菜单管理</legend>
+</fieldset>
+<div class="container-fluid" style="padding: 0 10px;">
+    <div class="row-fluid">
+        <div class="layui-col-md4">
+
+            <div style="padding: 5px; background-color: #F2F2F2;">
+                <div class="layui-card">
+                    <div class="layui-card-header" style="padding: 10px 15px">
+                        <h3>菜单树</h3>
+                    </div>
+                    <div class="layui-card-body" style="overflow: auto">
+                        <div class="ztree" id="menu_tree"></div>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <div class="layui-col-md8" id="menu_info_block">
+            <div style="padding: 5px; background-color: #F2F2F2; margin-left: 10px;">
+                <div class="layui-card">
+
+                    <div class="layui-card-header" style="padding: 10px 15px">
+                        <div class="layui-inline" style="position: relative">
+                            <h4>编辑菜单项</h4>
+                        </div>
+                    </div>
+
+                    <div class="layui-card-body">
+                        <div id="menu_info" class="block-body">
+                            <form id="menu_form" action="javascript:submit();" class="layui-form">
+                                <input type="hidden" id="id" name="id">
+                                <input type="hidden" id="parentId" name="parentId">
+                                <input type="hidden" id="menuType" name="menuType">
+
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label">菜单名称<span class="help-inline">*</span></label>
+                                    <div class="layui-input-block">
+                                        <input type="text" id="name" name="name" style="width:50%;" class="layui-input">
+                                    </div>
+                                </div>
+
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label">菜单链接<span class="help-inline">&nbsp;</span></label>
+                                    <div class="layui-input-block">
+                                        <input type="text" id="link" name="link" style="width:95%;" class="layui-input">
+                                    </div>
+                                </div>
+
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label">菜单链接<span class="help-inline">&nbsp;</span></label>
+                                    <div class="layui-input-block">
+                                        <input type="text" id="menuOrder" name="menuOrder" style="width:95%;" class="layui-input">
+                                    </div>
+                                </div>
+
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label">菜单描述<span class="help-inline">&nbsp;</span></label>
+                                    <div class="layui-input-block">
+                                        <textarea id="description" class="layui-textarea" name="description" style="width:95%;"></textarea>
+                                    </div>
+                                </div>
+
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label">菜单图标<span class="help-inline">&nbsp;</span></label>
+                                    <div class="layui-input-block">
+                                        <div id="icon_upload_wrap">
+                                            <div id="icon_upload"></div>
+                                            <div class="clear">
+                                                <button class="layui-btn layui-btn-danger layui-btn-xs">删除</button>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+
+                                <div class="layui-form-item">
+                                    <div class="layui-input-block">
+                                        <input type="checkbox" name="isVisible" lay-skin="primary" title="是否可见" checked="">
+                                    </div>
+                                </div>
+
+                                <div class="layui-form-item">
+                                    <div class="layui-input-block">
+                                        <button type="button" id="btn_save" class="layui-btn">保存</button>
+                                    </div>
+                                </div>
+                            </form>
+                        </div>
+                    </div>
+
+                </div>
+            </div>
+        </div>
+        <div class=" span8">
+
+        </div>
+    </div>
+</div>
+
+
+<div id="rMenu">
+    <ul>
+        <li id="m_refresh" onclick="menu_refreshTreeNode();"><i class="icon-refresh"></i>刷新</li>
+        <li id="m_add_folder" onclick="menu_addTreeNode(1);"><i class="icon-folder-open"></i> 新增目录</li>
+        <li id="m_add_page" onclick="menu_addTreeNode(2);"><i class="icon-file"></i> 新增页面</li>
+        <li id="m_add_action" onclick="menu_addTreeNode(3);"><i class="icon-tasks"></i> 新增操作</li>
+        <li id="m_del" onclick="menu_removeTreeNode();"><i class="icon-minus-sign"></i> 删除</li>
+    </ul>
+</div>
+</body>
+<script>
+    layui.use(["form"], function() {
+        var form = layui.form;
+        form.render();
+    })
+</script>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/menu/menu_v2.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/menu/menu_v2.jsp
new file mode 100644
index 0000000..0beb163
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/menu/menu_v2.jsp
@@ -0,0 +1,203 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <title>菜单管理</title>
+    <jsp:include page="../../../common.jsp"/>
+
+    <style type="text/css">
+
+    </style>
+</head>
+<div class="layui-row layui-fluid layui-bg-gray layui-col-space15">
+    <div class="layui-col-md5 ">
+        <div class="layui-card">
+            <div class="layui-card-header">菜单树</div>
+            <div class="layui-card-body">
+                <div class="demo-tree demo-tree-box" id="test1">
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="layui-col-md7">
+        <div class="layui-card">
+            <div class="layui-card-header">编辑菜单项</div>
+            <div class="layui-card-body">
+                <form action="" class="layui-form" lay-filter="formMenu">
+                    <input class="layui-input layui-hide" id="parentId" lay-reqtext="请在左侧树中选择一项" lay-verify="required" name="parentId" type="text" />
+                    <input class="layui-input layui-hide" id="id" name="id" type="text" />
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">菜单名称</label>
+                        <div class="layui-input-block">
+                            <input autocomplete="off" class="layui-input" lay-verify="required" name="name" placeholder="请输入标题" type="text">
+                        </div>
+                    </div>
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">菜单链接</label>
+                        <div class="layui-input-block">
+                            <input autocomplete="off" class="layui-input" lay-verify="required" name="link" placeholder="请输入" type="text">
+                        </div>
+                    </div>
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">排序</label>
+                        <div class="layui-input-block">
+                            <input autocomplete="off" class="layui-input" lay-verify="required" name="menuOrder" type="number" value="10">
+                        </div>
+                    </div>
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">是否可见</label>
+                        <div class="layui-input-block">
+                            <input checked lay-skin="switch" lay-text="ON|OFF" name="visible" type="checkbox">
+                        </div>
+                    </div>
+                    <div class="layui-form-item">
+                        <div class="layui-input-block">
+                            <button class="layui-btn" lay-filter="demo1" lay-submit type="submit">保存</button>
+                            <button class="layui-btn layui-btn-primary" type="reset">清空</button>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+</div>
+</body>
+<script>
+    let layer;
+    let treeData = []
+    let tree
+    let form
+    layui.use(['tree', 'form', 'layer'], function(){
+        tree = layui.tree;
+        layer = layui.layer;
+        form = layui.form;
+        treeInit()
+
+        form.on("submit(demo1)", function (data) {
+            // let param = JSON.stringify(data.field)
+            if (data.field.visible == 'on') {
+                data.field.visible = 1;
+            } else {
+                data.field.visible = 0;
+            }
+
+            var index = layer.load(1, {shade: [0.1, '#000']});
+            $.ajax({
+                url: ctx + "/menuInfo/saveMenuInfo"
+                , type: 'POST'
+                , data: data.field
+                , success: function (d) {
+                    layer.msg(d.message)
+                    if (d.code === 200) {
+                        treeReload()
+                    }
+                }
+            })
+
+            return false;
+        })
+    });
+
+    function treeInit() {
+        $.ajax({
+            url: ctx + "/menuInfo/getMenuTree"
+            , type: 'GET'
+            , success: function (d) {
+                if (d.code === 200) {
+                    treeData = d.data;
+                    treeData[0].spread = true;
+                    //渲染
+                    tree.render({
+                        elem: '#test1'  //绑定元素
+                        , id: 'test1'
+                        , edit: ['add', 'del']
+                        , click: function(obj){
+                            // 获取节点的父节点id
+                            let parent = obj.elem.parent().parent();
+                            obj.data.parentId = parent.attr("data-id");
+                            obj.data.parentChildrenCount = obj.elem.parent().children().length;
+                            setForm(obj.data);
+                        }
+                        , operate: function (obj) {
+                            let type = obj.type; //得到操作类型：add、edit、del
+                            let data = obj.data; //得到当前节点的数据
+                            let elem = obj.elem; //得到当前节点元素
+
+                            console.log(elem)
+                            //Ajax 操作
+                            let id = data.id; //得到节点索引
+                            if(type === 'add'){ //增加节点
+                                spreadOpen(elem);
+                            } else if(type === 'del'){ //删除节点
+                                delMenu(data)
+                            }
+                        }
+                        , data: treeData
+                    });
+                }
+            }
+        })
+    }
+
+    function spreadOpen(elem) {
+        elem.find(".layui-tree-pack").show();
+        elem.addClass("layui-tree-spread");
+        elem.find(".layui-tree-entry")
+            .find(".layui-tree-main")
+            .find(".layui-tree-icon")
+            .find(".layui-icon")
+            .removeClass("layui-icon-addition")
+            .addClass("layui-icon-subtraction");
+    }
+
+    function setForm(data) {
+        if (data.name == null) {
+            data.name = "未命名";
+            data.link = "";
+            data.menuOrder = data.parentChildrenCount;
+        }
+        form.val("formMenu", data);
+    }
+
+    function treeReload() {
+        $.ajax({
+            url: ctx + "/menuInfo/getMenuTree"
+            , type: 'GET'
+            , success: function (d) {
+                if (d.code === 200) {
+                    debugger
+                    treeData = d.data;
+                    treeData[0].spread = true;
+                    tree.reload('test1', {
+                        data: treeData
+                    });
+                }
+            }
+        });
+    }
+
+    function delMenu(node) {
+        debugger;
+        if (node.children && node.children.length > 0) {
+            layer.msg("请先删除子页面", {
+                time: 2000
+            })
+
+            treeReload()
+            return;
+        }
+
+        $.ajax({
+            url: ctx + "/menuInfo/deleteMenuInfo"
+            , type: 'POST'
+            , data: {
+                id: node.id
+            }
+            , success(d) {
+                treeReload()
+            }
+        })
+    }
+</script>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/menuInfo/menuInfoBaseInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/menuInfo/menuInfoBaseInfo.jsp
new file mode 100644
index 0000000..c019ac7
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/menuInfo/menuInfoBaseInfo.jsp
@@ -0,0 +1,87 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">  
+	<div class="tab-pane active">     
+		<div class="panel-body">
+			<div class="wrapper wrapper-content">
+				<div class="panel-form animated fadeInRight wp60 fc">
+					<div class="layui-form-item dn	has-error" >   
+						<label class="layui-form-label">id</label>  
+						<div class="layui-input-block">
+							<input type="text" name="id" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${menuInfo.id }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">name</label>  
+						<div class="layui-input-block">
+							<input type="text" name="name" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${menuInfo.name }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">menuType</label>  
+						<div class="layui-input-block">
+							<input type="text" name="menuType" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${menuInfo.menuType }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">link</label>  
+						<div class="layui-input-block">
+							<input type="text" name="link" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${menuInfo.link }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">parentId</label>  
+						<div class="layui-input-block">
+							<input type="text" name="parentId" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${menuInfo.parentId }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">menuOrder</label>  
+						<div class="layui-input-block">
+							<input type="text" name="menuOrder" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${menuInfo.menuOrder }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">iconUrl</label>  
+						<div class="layui-input-block">
+							<input type="text" name="iconUrl" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${menuInfo.iconUrl }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">visible</label>  
+						<div class="layui-input-block">
+							<input type="text" name="visible" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${menuInfo.visible }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">creator</label>  
+						<div class="layui-input-block">
+							<input type="text" name="creator" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${menuInfo.creator }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">version</label>  
+						<div class="layui-input-block">
+							<input type="text" name="version" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${menuInfo.version }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">description</label>  
+						<div class="layui-input-block">
+							<input type="text" name="description" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${menuInfo.description }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">seq</label>  
+						<div class="layui-input-block">
+							<input type="text" name="seq" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${menuInfo.seq }" >
+						</div>  
+					</div>
+	
+				</div>
+			</div>
+		</div>  
+	</div>
+</form>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/menuInfo/menuInfoDetails.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/menuInfo/menuInfoDetails.jsp
new file mode 100644
index 0000000..701eaa9
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/menuInfo/menuInfoDetails.jsp
@@ -0,0 +1,54 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>     
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">                      
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black"> 
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> 
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->                                     
+<meta name="viewport"
+	content="width=device-width, initial-scale=1.0, maximum-scale=1.0">   
+<jsp:include page="../../../common.jsp" />
+<script type="text/javascript">
+    require("js/menuInfo/menuInfoDetails.js");
+</script>
+<title>编辑</title>
+</head>                                 
+	<body class="lgraybg">            
+		<div class="	container-fluid animated fadeInRight col-sm-12">
+			<div class="panel-toolbar mt10 mb10 pt5 pb5 pl10 bdd whitebg">
+				<div class="buttons">
+					<a href="javascript:void(0);" class="btn btn-primary fa fa-save f12"><span>保存</span></a>
+					<a href="${ctx }/menuInfo/index?pageIndex=${pageIndex}"  class="btn btn-primary fa fa-back f12" id="goback"><span>返回</span></a>
+				</div>
+			</div>
+				<div class="tabs-container whitebg">
+					<div class="pt10 pl5 pr5">
+						<ul class="nav nav-tabs" id="nav-tabs">
+							<li class="active" data-action="base">   
+								<a href="javascript:void(0);" >基本资料</a>
+							</li>
+							<li class="" data-action="functions">
+								<a href="javascript:void(0);"  >多功能输入</a>
+							</li>
+							<li class="" data-action="extends">
+								<a href="javascript:void(0);" >扩展属性</a>
+							</li>
+						</ul>
+						<div class="tab-content pt30 p30">               
+		
+						</div>     
+					</div>
+				</div>    
+		</div>
+		<!-- 隐藏域 -->
+		<input type="hidden" id="menuInfoId" value="${menuInfo.id }"/>
+	</body>
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/menuInfo/menuInfoExtendsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/menuInfo/menuInfoExtendsInfo.jsp
new file mode 100644
index 0000000..592687a
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/menuInfo/menuInfoExtendsInfo.jsp
@@ -0,0 +1,201 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>           
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> 
+<div class="tab-pane active">      
+	<div class="animated fadeInRight">
+		<div class="whitebg pl10 pr10">
+			<table class="table table-striped table-bordered table-hover">     
+				<thead> 
+					<tr>  
+						<th class="textc">序号</th>         
+						<th class="textc wp15">流水账号</th>
+						<th class="textc">日期</th>         
+						<th class="textc">财务类别</th>     
+						<th class="textc">金额</th>         
+						<th class="textc">银行</th>         
+						<th class="textc">发票</th>         
+						<th class="textc">客户名称</th>     
+						<th class="textc wp15">单号</th>    
+						<th class="textc">状态</th>         
+						<th class="textc">类别</th>         
+						<th class="textc">操作</th>         
+					</tr> 
+				</thead>
+				<tbody> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+                
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="green">支出</span></td>     
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+				</tbody>
+                
+			</table>  
+			<!-- footer -->  
+			<div class="clearfix mb10 pb20">          
+					<div class="layui-tab-item fr">       
+							<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+							<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>   
+							<div class="pagination dlblock vm" id="pagination"></div>
+							<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>            
+					</div>
+				</div>  
+		</div>      
+	</div>        
+</div>          
+                
+<script type="text/javascript">    
+//分页          
+$('#pagination').pagination({        
+	pageCount: 50,
+	jump: true,   
+	coping: true, 
+	homePage: '首页',    
+	endPage: '末页',     
+	prevContent: '上页', 
+	nextContent: '下页', 
+	callback: function(api) {          
+		$('.now').text(api.getCurrent());
+	}             
+});             
+</script>       
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/menuInfo/menuInfoFunctionsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/menuInfo/menuInfoFunctionsInfo.jsp
new file mode 100644
index 0000000..982ce84
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/menuInfo/menuInfoFunctionsInfo.jsp
@@ -0,0 +1,130 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>		
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">      
+<div class="tab-pane active">
+				<div class="panel-body">
+					<div class="wrapper wrapper-content">     
+						<div class="panel-form animated fadeInRight wp60 fc">
+							<!-- 账号资料 -->
+			<div class="layui-form-item 	has-error">
+				<label class="layui-form-label">单行输入框<i class="red">*</i></label>
+				<div class="layui-input-block">
+					<input type="text" name="title" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input">
+				</div>                                         
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">自定义验证</label>
+				<div class="layui-input-inline ml30">
+					<input type="password" name="password" lay-verify="pass" placeholder="请输入密码" autocomplete="off" class="layui-input">
+				</div>
+				<div class="layui-form-mid layui-word-aux">请填写6到12位密码</div>
+			</div>
+			<div class="form-group">
+				<div class="layui-form-item">          
+					<label class="layui-form-label">单行选择框</label>
+					<div class="layui-input-block">
+						<select name="interest" lay-filter="aihao">  
+							<option value=""></option>
+							<option value="0">写作</option>         
+							<option value="1" selected="">阅读</option>
+							<option value="2">游戏</option>
+							<option value="3">音乐</option>
+							<option value="4">旅行</option>  
+						</select>              
+					</div>
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<div class="layui-inline">  
+					<label class="layui-form-label">范围</label>
+					<div class="layui-input-inline ml30">
+						<input type="text" name="price_min" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>                                     
+					<div class="layui-form-mid">-</div>
+					<div class="layui-input-inline">       
+						<input type="text" name="price_max" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>
+				</div>           
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">联动选择框</label>
+				<div class="layui-input-inline ml30">
+					<select name="quiz1">     
+						<option value="">请选择省</option>
+						<option value="浙江" selected="">浙江省</option> 
+						<option value="你的工号">江西省</option>           
+						<option value="你最喜欢的老师">福建省</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz2">
+						<option value="">请选择市</option>
+						<option value="杭州">杭州</option>
+						<option value="宁波" disabled="">宁波</option>
+						<option value="温州">温州</option>
+						<option value="温州">台州</option>
+						<option value="温州">绍兴</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz3">
+						<option value="">请选择县/区</option>
+						<option value="西湖区">西湖区</option>
+						<option value="余杭区">余杭区</option>
+						<option value="拱墅区">临安市</option>
+					</select>
+				</div>    
+			</div>
+			<div class="layui-form-item" pane="">   
+				<label class="layui-form-label">原始复选框</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="like1[write]" lay-skin="primary" title="写作" checked="">  
+					<input type="checkbox" name="like1[read]" lay-skin="primary" title="阅读">
+					<input type="checkbox" name="like1[game]" lay-skin="primary" title="游戏" disabled="">
+				</div>
+			</div>
+
+			<div class="layui-form-item">
+				<label class="layui-form-label">开关-默认关</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="close" lay-skin="switch" lay-text="ON|OFF">
+				</div>
+			</div>
+			<div class="layui-form-item">  
+				<label class="layui-form-label">单选框</label>
+				<div class="layui-input-block">
+					<input type="radio" name="sex" value="男" title="男" checked="">
+					<input type="radio" name="sex" value="女" title="女">
+					<input type="radio" name="sex" value="禁" title="禁用" disabled="">
+				</div>
+			</div>
+			<!--<div class="layui-form-item layui-form-text">
+				<label class="layui-form-label">上传图片</label>
+				<div class="layui-input-block">
+					<div class="layui-upload-drag w200 h200">
+						<i class="layui-icon"></i>          
+						<p>点击上传</p>
+					</div>
+				</div>
+			</div>-->
+				<div class="layui-form-item layui-form-text">
+					<label class="layui-form-label">普通文本域</label>  
+					<div class="layui-input-block">              
+						<textarea placeholder="请输入内容" class="layui-textarea"></textarea>
+					</div>
+				</div>
+			</div>
+		</div>   
+	</div>
+</div>
+</form>   
+<script type="text/javascript">
+	//form表单样式
+	layui.use(['layer', 'form'], function() {    
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+</script>                 
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/menuInfo/menuInfoList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/menuInfo/menuInfoList.jsp
new file mode 100644
index 0000000..62fb06b
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/menuInfo/menuInfoList.jsp
@@ -0,0 +1,121 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black">
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->
+<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+<jsp:include page="../../../common.jsp" />
+<script type="text/javascript">
+     require("js/menuInfo/menuInfoList.js");
+</script>
+</head>
+<body>
+	<div class="row animated fadeInRight" style="margin: 0;">
+		<div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+			<div class="toolbar-panel bdd">
+				<div class="toolbar-box">
+					<div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+						<!-- 顶部按钮 -->
+						<div class="buttons fl">
+							<a class="btn btn-primary fa fa-search f13" href="javascript:void(0);" onclick="queryMenuInfo()"><span>搜索</span></a>
+							<a class="btn btn-primary fa fa-plus f13 add" href="javascript:void(0);" onclick="initAddMenuInfo()"><span>添加</span></a>
+							<a class="btn btn-primary fa fa-edit f13" href="javascript:void(0);" onclick="initEditMenuInfo()"><span>编辑</span></a> 
+							<a class="btn btn-primary fa fa-remove f13 delete" href="javascript:void(0);" onclick="initBatchDeleteMenuInfo()"><span>删除</span></a> 
+						</div>
+						<div class="tools fr">
+							<a href="javascript:void(0);" class="collapse dblock f14 dgray mr5"> 
+								<i class="fa-2x fa fa-angle-double-up"></i>
+							</a>
+						</div>
+					</div>
+				</div>
+
+				<!--搜索条件 -->
+				<div class="toolbar-body">
+					<div class="row pt10 pb10 whitebg ml0 mr0">
+						<span class="dlblock w100 textr">ID：</span> 
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+							<input type="text" placeholder="请输入内容" id="searchId">  
+						</span> 
+						<span class="dlblock w100 textr">名称：</span> 
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+							<input type="text" placeholder="请输入名称">
+						</span> 
+						<span class="dlblock w100 textr">类别：</span>
+						 <select class="form-control f12 w180 textc">
+							<option value="">支出</option>
+							<option value="">收入</option>
+						</select>
+					</div>
+					<div class="mt10 mb20">
+						<span class="dlblock w100 textr">开始日期</span>
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+							 <input type="text" placeholder="" id="date1" class="w150">
+							 <i class="fa fa-calendar"></i>
+						</span> 
+						<span class="dlblock w100 textr">结束日期</span>
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+						<input type="text" placeholder="" id="date2" class="w150"> 
+							<i class="fa fa-calendar"></i>
+						</span>
+					</div>
+				</div>
+			</div>
+		</div>
+		<!-- 表单数据 -->
+		<div class="mb20 mt10">
+			<div class="whitebg pl10 pr10">
+				<table class="table table-striped table-bordered table-hover">
+					<thead>
+						<tr>
+							<th class="textc">
+								<div class="checker" id="allCheck">
+									<span class=""><input type="checkbox" value="" ></span>
+								</div>
+							</th>
+							<th class="textc ">id</th>
+							<th class="textc ">name</th>
+							<th class="textc ">menuType</th>
+							<th class="textc ">link</th>
+							<th class="textc wp15">parentId</th>
+							<th class="textc ">menuOrder</th>
+							<th class="textc ">iconUrl</th>
+							<th class="textc ">visible</th>
+							<th class="textc wp15">creator</th>
+							<th class="textc ">version</th>
+							<th class="textc ">description</th>
+							<th class="textc ">seq</th>
+							<th class="textc">编辑</th>
+						</tr>
+					</thead>
+					<!-- 数据体 -->
+					<tbody id="data_content">
+					</tbody>
+				</table>
+			
+			<!-- footer -->
+				<div class="clearfix mb10 pb20">
+						<div class="layui-tab-item fr">
+								<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+								<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>
+								<div class="pagination dlblock vm" id="pagination"></div>
+								<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>
+						</div>
+					</div>
+	
+			</div>
+		</div>
+	</div>
+</body>
+
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/role/editRole.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/role/editRole.jsp
new file mode 100644
index 0000000..b4b5bc7
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/role/editRole.jsp
@@ -0,0 +1,112 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+		<title>角色管理</title>
+		<jsp:include page="../../../common.jsp"></jsp:include>
+		<jsp:include page="../../../public.jsp"></jsp:include>
+		<link href="${res}/js/zTree/css/zTreeStyle/zTreeStyle.css" rel="stylesheet">
+		<script type="text/javascript" src="${res}/js/zTree/js/jquery.ztree.all-3.5.min.js"></script>
+		
+		<script type="text/javascript">
+			var readOnly = '${param.readOnly}' === 'true';
+			var role = null;
+			var rolemenuKeys = [];
+		</script>
+		<script type="text/javascript" src="${res}/js/role/editRole.js?rnd=123"></script>
+		
+		<style type="text/css">
+			#menu_tree_block {
+				margin-top : 0px;
+				width : 40%;
+				min-width : 216px;
+			}
+			#menu_tree_block .block-body {
+				margin : 5px;
+			}
+			#menu_tree {
+				min-height : 320px;
+				max-height : 480px;
+			}
+			.ztree li a:hover {
+				text-decoration: none;
+			}
+			
+			.ztree li span.button.folder_ico_close {
+			  margin-right: 2px;
+			  vertical-align: top;
+			  background-position: -384px -120px;
+			  background-image: url("${res}/jquery-ui-bs/assets/img/glyphicons-halflings.png");
+			}
+			
+			.ztree li span.button.folder_ico_open {
+			  margin-right: 2px;
+			  vertical-align: top;
+			  background-position: -408px -120px;
+			  background-image: url("${res}/jquery-ui-bs/assets/img/glyphicons-halflings.png");
+			}
+			
+			.ztree li span.button.page_ico_open {
+				margin-right: 2px;
+				vertical-align: top;
+				background-position: -24px -24px;
+				background-image: url("${res}/jquery-ui-bs/assets/img/glyphicons-halflings.png");
+			}
+			.ztree li span.button.page_ico_close {
+				margin-right: 2px;
+				vertical-align: top;
+				background-position: -24px -24px;
+				background-image: url("${res}/jquery-ui-bs/assets/img/glyphicons-halflings.png");
+			}
+			
+			.ztree li span.button.action_ico_docu {
+				margin-right: 2px;
+				vertical-align: top;
+				background-position: -384px -144px;
+				background-image: url("${res}/jquery-ui-bs/assets/img/glyphicons-halflings.png");
+			}
+		</style>
+	</head>
+<body>
+	<div class="container-fluid">
+		<div class="row-fluid">
+			<ul class="breadcrumb">
+				<li class="active">权限管理 <span class="divider">/</span></li>
+				<li class="active">角色管理</li>
+			</ul>
+			<form id="role_form">
+				<input type="hidden" id="id" name="id" value="${param.id }">
+				<input type="hidden" id="createTime" name="_createTime">
+				<div class="form-horizontal">
+					<div class="control-group">
+						<label class="control-label" for="name">角色名:<span class="help-inline">*</span></label> 
+						<div class="controls">
+							<input type="text" id="name" name="name">
+						</div>
+					</div>
+					<div class="control-group">
+						<label class="control-label">角色菜单:<span class="help-inline">&nbsp;</span></label> 
+						<div class="controls">
+							<div class="block inline" id="menu_tree_block">
+								<p class="block-heading">角色菜单树</p>
+								<div class="block-body">
+									<div class="ztree" id="menu_tree"></div>
+								</div>
+							</div>
+						</div>
+					</div>
+					<div class="control-group">
+						<label class="control-label"></label> 
+						<div class="controls">
+							<button type="button" class="btn btn-primary" id="btn_save">保存</button>
+							<button type="button" class="btn btn-primary" onclick="history.go(-1);">返回</button>
+						</div>
+					</div>
+				</div>
+			</form>
+		</div>
+	</div>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/role/role.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/role/role.jsp
new file mode 100644
index 0000000..d64b859
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/role/role.jsp
@@ -0,0 +1,106 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+		<title>角色管理</title>
+		<%@include file="../../../common.jsp"%>
+		<link href="${res}/zTree/css/zTreeStyle/zTreeStyle.css" rel="stylesheet">
+		
+		<script type="text/javascript" src="${res}/zTree/js/jquery.ztree.all-3.5.min.js"></script>
+		<script type="text/javascript" src="${res}/js/role/role.js"></script>
+		
+		<style type="text/css">
+			#menu_tree {
+				min-height : 150px;
+				padding : 10px;
+			}
+			#role_table {
+				min-width : 600px;
+			}
+			.ztree li a:hover {
+				text-decoration: none;
+			}
+			
+			.ztree li span.button.folder_ico_close {
+			  margin-right: 2px;
+			  vertical-align: top;
+			  background-position: -384px -120px;
+			  background-image: url("${res}/jquery-ui-bs/assets/img/glyphicons-halflings.png");
+			}
+			
+			.ztree li span.button.folder_ico_open {
+			  margin-right: 2px;
+			  vertical-align: top;
+			  background-position: -408px -120px;
+			  background-image: url("${res}/jquery-ui-bs/assets/img/glyphicons-halflings.png");
+			}
+			
+			.ztree li span.button.page_ico_open {
+				margin-right: 2px;
+				vertical-align: top;
+				background-position: -24px -24px;
+				background-image: url("${res}/jquery-ui-bs/assets/img/glyphicons-halflings.png");
+			}
+			.ztree li span.button.page_ico_close {
+				margin-right: 2px;
+				vertical-align: top;
+				background-position: -24px -24px;
+				background-image: url("${res}/jquery-ui-bs/assets/img/glyphicons-halflings.png");
+			}
+			
+			.ztree li span.button.action_ico_docu {
+				margin-right: 2px;
+				vertical-align: top;
+				background-position: -384px -144px;
+				background-image: url("${res}/jquery-ui-bs/assets/img/glyphicons-halflings.png");
+			}
+		</style>
+	</head>
+<body>
+	<div class="container-fluid">
+		<div class="row-fluid">
+			<ul class="breadcrumb">
+				<li class="active">权限管理 <span class="divider">/</span></li>
+				<li class="active">角色管理</li>
+			</ul>
+			<div class="page-wrapper" style="max-width: 1024px;">
+			<form id="queryForm" action="javascript:table.fnDraw();">
+				<div class="form-inline">
+					<div class="control-group inline">
+						<label class="inline" for="name">角色名:</label> <input id="name"
+							name="name" type="text" class="input-text-medium"
+							placeholder="角色名">
+					</div>
+					<div class="control-group inline">
+						<label class="inline"></label>
+						<button type="button" id="query_btn" class="btn btn-primary">查询</button>
+					</div>
+				</div>
+			</form>
+			<div class="row-fluid toolbar">
+				<button type="button" class="btn btn-primary"
+					onclick="window.location.href='/sso/role!edit.do'">新增</button>
+			</div>
+			
+			<table id="role_table" class="table table-hover table-bordered table-condensed table-striped">
+				<thead>
+					<tr>
+						<th>角色名</th>
+						<th>更新人</th>
+						<th>更新时间</th>
+						<th>创建人</th>
+						<th>创建时间</th>
+						<th>查看</th>
+						<th>修改</th>
+						<th>删除</th>
+					</tr>
+				</thead>
+				<tbody></tbody>			
+			</table>
+			</div>
+
+		</div>
+	</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/roleInfo/roleInfoBaseInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/roleInfo/roleInfoBaseInfo.jsp
new file mode 100644
index 0000000..b378c15
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/roleInfo/roleInfoBaseInfo.jsp
@@ -0,0 +1,57 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">  
+	<div class="tab-pane active">     
+		<div class="panel-body">
+			<div class="wrapper wrapper-content">
+				<div class="panel-form animated fadeInRight wp60 fc">
+					<div class="layui-form-item dn	has-error" >   
+						<label class="layui-form-label">id</label>  
+						<div class="layui-input-block">
+							<input type="text" name="id" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${roleInfo.id }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">name</label>  
+						<div class="layui-input-block">
+							<input type="text" name="name" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${roleInfo.name }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">creator</label>  
+						<div class="layui-input-block">
+							<input type="text" name="creator" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${roleInfo.creator }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">createTime</label>  
+						<div class="layui-input-block">
+							<input type="text" name="createTime" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${roleInfo.createTime }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">updator</label>  
+						<div class="layui-input-block">
+							<input type="text" name="updator" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${roleInfo.updator }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">updateTime</label>  
+						<div class="layui-input-block">
+							<input type="text" name="updateTime" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${roleInfo.updateTime }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">version</label>  
+						<div class="layui-input-block">
+							<input type="text" name="version" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${roleInfo.version }" >
+						</div>  
+					</div>
+	
+				</div>
+			</div>
+		</div>  
+	</div>
+</form>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/roleInfo/roleInfoConfig.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/roleInfo/roleInfoConfig.jsp
new file mode 100644
index 0000000..4947bc0
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/roleInfo/roleInfoConfig.jsp
@@ -0,0 +1,113 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport"
+          content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../../common.jsp" />
+    <title>编辑</title>
+</head>
+<body>
+<div class="layui-fluid">
+
+    <div style="margin-bottom: 20px;" id="test1"></div>
+
+    <form action="" class="layui-form" lay-filter="form">
+        <input autocomplete="off" class="layui-input layui-hide" name="id" value="${entity.id}" type="text">
+
+        <div class="layui-btn-container">
+            <button class="layui-btn layui-btn-fluid" lay-filter="demo1" lay-submit type="submit">保存</button>
+        </div>
+
+    </form>
+</div>
+</body>
+
+<script>
+    let layer;
+    let treeData = []
+    let tree
+    let form
+    layui.use(['tree', 'layer'], function () {
+        tree = layui.tree;
+        layer = layui.layer;
+        treeInit()
+    });
+
+    layui.use(['form'], function () {
+        let form = layui.form;
+
+        form.on("submit(demo1)", function (d) {
+            let data = d.field;
+            let resultArr = [];
+            getAllIdList(tree.getChecked('test1'), resultArr);
+            data.menuIds = resultArr;
+            $.ajax({
+                url: ctx + '/roleInfo/saveConfig'
+                , type: 'POST'
+                , data: data
+                , success: function (data) {
+                    if (data.code === 200) {
+                        parent.layer.msg("保存成功")
+                        let index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
+                        parent.layer.close(index);
+                        parent.location.reload();
+                    } else {
+                        parent.layer.msg("保存失败")
+                    }
+                }
+            });
+
+            return false;
+        })
+    })
+
+    function getAllIdList(nodeList, resultArr) {
+        if (Array.isArray(nodeList)) {
+            nodeList.forEach(function(item) {
+                resultArr.push(item.id);
+                if (item.children) {
+                    getAllIdList(item.children, resultArr);
+                }
+            })
+        } else {
+            resultArr.push(nodeList);
+            if (nodeList.children) {
+                getAllIdList(nodeList.children, resultArr);
+            }
+        }
+    }
+
+    function treeInit() {
+        $.ajax({
+            url: ctx + "/menuInfo/getRoleConfigMenuTree?roleId=${entity.id}"
+            , type: 'GET'
+            , success: function (d) {
+                if (d.code === 200) {
+                    treeData = d.data;
+                    treeData[0].spread = true;
+
+
+                    //渲染
+                    tree.render({
+                        elem: '#test1'  //绑定元素
+                        , id: 'test1'
+                        , showCheckbox: true
+                        , data: treeData
+                    });
+                }
+            }
+        })
+    }
+</script>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/roleInfo/roleInfoDetails.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/roleInfo/roleInfoDetails.jsp
new file mode 100644
index 0000000..6315cac
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/roleInfo/roleInfoDetails.jsp
@@ -0,0 +1,64 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>     
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">                      
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black"> 
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> 
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->                                     
+<meta name="viewport"
+	content="width=device-width, initial-scale=1.0, maximum-scale=1.0">   
+<jsp:include page="../../../common.jsp" />
+<title>编辑</title>
+</head>
+<div class="layui-fluid">
+	<form action="" class="layui-form" lay-filter="form">
+		<input autocomplete="off" class="layui-input layui-hide" name="id" value="${entity.id}" type="text">
+		<div class="layui-form-item">
+			<label class="layui-form-label">角色名称</label>
+			<div class="layui-input-block">
+				<input autocomplete="off" class="layui-input" lay-verify="required" name="name" placeholder="角色名称" value="${entity.name}" type="text">
+			</div>
+		</div>
+
+		<div class="layui-form-item">
+			<div class="layui-input-block">
+				<button class="layui-btn" lay-filter="demo1" lay-submit type="submit">保存</button>
+			</div>
+		</div>
+	</form>
+</div>
+
+<script>
+	layui.use(['form'], function () {
+		let form = layui.form;
+		$ = layui.$;
+		form.on("submit(demo1)", function (d) {
+			$.ajax({
+				url: ctx + '/roleInfo/save'
+				, type: 'POST'
+				, data: d.field
+				, success: function (data) {
+					if (data.code === 200) {
+						parent.layer.msg("保存成功")
+						let index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
+						parent.layer.close(index);
+						parent.tabReload();
+					} else {
+						parent.layer.msg("保存失败")
+					}
+				}
+			})
+
+			return false;
+		})
+	})
+</script>
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/roleInfo/roleInfoExtendsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/roleInfo/roleInfoExtendsInfo.jsp
new file mode 100644
index 0000000..592687a
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/roleInfo/roleInfoExtendsInfo.jsp
@@ -0,0 +1,201 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>           
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> 
+<div class="tab-pane active">      
+	<div class="animated fadeInRight">
+		<div class="whitebg pl10 pr10">
+			<table class="table table-striped table-bordered table-hover">     
+				<thead> 
+					<tr>  
+						<th class="textc">序号</th>         
+						<th class="textc wp15">流水账号</th>
+						<th class="textc">日期</th>         
+						<th class="textc">财务类别</th>     
+						<th class="textc">金额</th>         
+						<th class="textc">银行</th>         
+						<th class="textc">发票</th>         
+						<th class="textc">客户名称</th>     
+						<th class="textc wp15">单号</th>    
+						<th class="textc">状态</th>         
+						<th class="textc">类别</th>         
+						<th class="textc">操作</th>         
+					</tr> 
+				</thead>
+				<tbody> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+                
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="green">支出</span></td>     
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+				</tbody>
+                
+			</table>  
+			<!-- footer -->  
+			<div class="clearfix mb10 pb20">          
+					<div class="layui-tab-item fr">       
+							<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+							<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>   
+							<div class="pagination dlblock vm" id="pagination"></div>
+							<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>            
+					</div>
+				</div>  
+		</div>      
+	</div>        
+</div>          
+                
+<script type="text/javascript">    
+//分页          
+$('#pagination').pagination({        
+	pageCount: 50,
+	jump: true,   
+	coping: true, 
+	homePage: '首页',    
+	endPage: '末页',     
+	prevContent: '上页', 
+	nextContent: '下页', 
+	callback: function(api) {          
+		$('.now').text(api.getCurrent());
+	}             
+});             
+</script>       
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/roleInfo/roleInfoFunctionsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/roleInfo/roleInfoFunctionsInfo.jsp
new file mode 100644
index 0000000..982ce84
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/roleInfo/roleInfoFunctionsInfo.jsp
@@ -0,0 +1,130 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>		
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">      
+<div class="tab-pane active">
+				<div class="panel-body">
+					<div class="wrapper wrapper-content">     
+						<div class="panel-form animated fadeInRight wp60 fc">
+							<!-- 账号资料 -->
+			<div class="layui-form-item 	has-error">
+				<label class="layui-form-label">单行输入框<i class="red">*</i></label>
+				<div class="layui-input-block">
+					<input type="text" name="title" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input">
+				</div>                                         
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">自定义验证</label>
+				<div class="layui-input-inline ml30">
+					<input type="password" name="password" lay-verify="pass" placeholder="请输入密码" autocomplete="off" class="layui-input">
+				</div>
+				<div class="layui-form-mid layui-word-aux">请填写6到12位密码</div>
+			</div>
+			<div class="form-group">
+				<div class="layui-form-item">          
+					<label class="layui-form-label">单行选择框</label>
+					<div class="layui-input-block">
+						<select name="interest" lay-filter="aihao">  
+							<option value=""></option>
+							<option value="0">写作</option>         
+							<option value="1" selected="">阅读</option>
+							<option value="2">游戏</option>
+							<option value="3">音乐</option>
+							<option value="4">旅行</option>  
+						</select>              
+					</div>
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<div class="layui-inline">  
+					<label class="layui-form-label">范围</label>
+					<div class="layui-input-inline ml30">
+						<input type="text" name="price_min" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>                                     
+					<div class="layui-form-mid">-</div>
+					<div class="layui-input-inline">       
+						<input type="text" name="price_max" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>
+				</div>           
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">联动选择框</label>
+				<div class="layui-input-inline ml30">
+					<select name="quiz1">     
+						<option value="">请选择省</option>
+						<option value="浙江" selected="">浙江省</option> 
+						<option value="你的工号">江西省</option>           
+						<option value="你最喜欢的老师">福建省</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz2">
+						<option value="">请选择市</option>
+						<option value="杭州">杭州</option>
+						<option value="宁波" disabled="">宁波</option>
+						<option value="温州">温州</option>
+						<option value="温州">台州</option>
+						<option value="温州">绍兴</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz3">
+						<option value="">请选择县/区</option>
+						<option value="西湖区">西湖区</option>
+						<option value="余杭区">余杭区</option>
+						<option value="拱墅区">临安市</option>
+					</select>
+				</div>    
+			</div>
+			<div class="layui-form-item" pane="">   
+				<label class="layui-form-label">原始复选框</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="like1[write]" lay-skin="primary" title="写作" checked="">  
+					<input type="checkbox" name="like1[read]" lay-skin="primary" title="阅读">
+					<input type="checkbox" name="like1[game]" lay-skin="primary" title="游戏" disabled="">
+				</div>
+			</div>
+
+			<div class="layui-form-item">
+				<label class="layui-form-label">开关-默认关</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="close" lay-skin="switch" lay-text="ON|OFF">
+				</div>
+			</div>
+			<div class="layui-form-item">  
+				<label class="layui-form-label">单选框</label>
+				<div class="layui-input-block">
+					<input type="radio" name="sex" value="男" title="男" checked="">
+					<input type="radio" name="sex" value="女" title="女">
+					<input type="radio" name="sex" value="禁" title="禁用" disabled="">
+				</div>
+			</div>
+			<!--<div class="layui-form-item layui-form-text">
+				<label class="layui-form-label">上传图片</label>
+				<div class="layui-input-block">
+					<div class="layui-upload-drag w200 h200">
+						<i class="layui-icon"></i>          
+						<p>点击上传</p>
+					</div>
+				</div>
+			</div>-->
+				<div class="layui-form-item layui-form-text">
+					<label class="layui-form-label">普通文本域</label>  
+					<div class="layui-input-block">              
+						<textarea placeholder="请输入内容" class="layui-textarea"></textarea>
+					</div>
+				</div>
+			</div>
+		</div>   
+	</div>
+</div>
+</form>   
+<script type="text/javascript">
+	//form表单样式
+	layui.use(['layer', 'form'], function() {    
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+</script>                 
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/roleInfo/roleInfoList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/roleInfo/roleInfoList.jsp
new file mode 100644
index 0000000..98b0c55
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/roleInfo/roleInfoList.jsp
@@ -0,0 +1,191 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../../common.jsp"/>
+
+    <style>
+        .layui-table th {
+            text-align: center;
+        }
+    </style>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" action="" style="margin-top: 10px" lay-filter="formCondition">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">名称：</label>
+                            <div class="layui-input-inline">
+                                <input type="text" id="name" name="name" placeholder="请输入名称" class="layui-input">
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+
+    <table class="layui-hide" id="roleInfoTab" lay-filter="roleInfoTab"></table>
+</div>
+</body>
+<script id="toolbar" type="text/html">
+    <div class="layui-btn-container">
+        <a class="layui-btn layui-btn-normal layui-btn-sm" lay-event="search">
+            <i class="layui-icon  layui-icon-search"></i>查询
+        </a>
+        <a class="layui-btn layui-btn-sm" lay-event="add">
+            <i class="layui-icon layui-icon-add-circle-fine"></i>添加
+        </a>
+    </div>
+</script>
+
+<script id="lineBar" type="text/html">
+    <a class="layui-btn layui-btn-xs" lay-event="edit">
+        <i class="layui-icon layui-icon-edit"></i>编辑
+    </a>
+    <a class="layui-btn  layui-btn-normal layui-btn-xs" lay-event="config">
+        <i class="layui-icon layui-icon-edit"></i>配置菜单
+    </a>
+    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">
+        <i class="layui-icon layui-icon-delete"></i>删除</a>
+
+</script>
+
+<script>
+    let table;
+    let layer;
+
+    layui.use(["table", "layer"], function () {
+        table = layui.table;
+        layer = layui.layer;
+
+        table.render({
+            elem: "#roleInfoTab"
+            , id: 'tabId'
+            , url: ctx + '/roleInfo/page'
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , where: {
+                column: 'createTime'
+                , asc: false
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , toolbar: '#toolbar' //开启头部工具栏，并为其绑定左侧模板
+            , title: '通知'
+            , cols: [[
+                {field: 'numbers', title: '序号', minWidth: 80, type: 'numbers'}
+                , {field: 'id', title: 'id', minWidth: 180, align: "center"}
+                , {field: 'name', title: '角色名称', minWidth: 200, align: "center"}
+                , {field: 'createTime', title: '创建时间', minWidth: 180, align: "center"}
+                , {field: 'updateTime', title: '更新时间', minWidth: 180, align: "center"}
+                , {fixed: 'right', title: '操作', minWidth: 238, toolbar: '#lineBar', align: "center"}
+            ]]
+            , page: true
+        })
+
+        table.on("toolbar(roleInfoTab)", function (obj) {
+            switch (obj.event) {
+                case 'add':
+                    editOrNew()
+                    break;
+                case 'search':
+                    layer.msg('查询');
+                    break;
+            }
+        });
+
+        table.on('tool(roleInfoTab)', function (obj) { //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            let data = obj.data; //获得当前行数据
+            let layEvent = obj.event; //获得 lay-event 对应的值（也可以是表头的 event 参数对应的值）
+
+            if (layEvent === 'del') { //查看
+                del(data);
+            } else if (layEvent === 'config') { //删除
+                config(data);
+            } else if (layEvent === 'edit') { //编辑
+                editOrNew(data)
+            }
+        });
+    })
+
+    function tabReload() {
+        table.reload('tabId', {}, true)
+    }
+
+    function editOrNew(data) {
+        let url = ctx + '/roleInfo/detail';
+        if (data != null && data.id != null) {
+            url += '?id=' + data.id;
+        }
+        layer.open({
+            type: 2
+            , title: '角色信息'
+            , content: url
+            , area: '400px'
+            , success: function (layero, index) {
+                layer.iframeAuto(index);
+            }
+        })
+    }
+
+    function del(data) {
+
+    }
+
+    function config(data) {
+        let url = ctx + '/roleInfo/configDetail?id=' + data.id;
+        layer.open({
+            type: 2
+            , title: '角色信息'
+            , content: url
+            , area: ['400px', '600px']
+        })
+    }
+</script>
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/roleMenuInfo/roleMenuInfoBaseInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/roleMenuInfo/roleMenuInfoBaseInfo.jsp
new file mode 100644
index 0000000..0e5cab9
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/roleMenuInfo/roleMenuInfoBaseInfo.jsp
@@ -0,0 +1,33 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">  
+	<div class="tab-pane active">     
+		<div class="panel-body">
+			<div class="wrapper wrapper-content">
+				<div class="panel-form animated fadeInRight wp60 fc">
+					<div class="layui-form-item dn	has-error" >   
+						<label class="layui-form-label">id</label>  
+						<div class="layui-input-block">
+							<input type="text" name="id" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${roleMenuInfo.id }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">roleId</label>  
+						<div class="layui-input-block">
+							<input type="text" name="roleId" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${roleMenuInfo.roleId }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">menuId</label>  
+						<div class="layui-input-block">
+							<input type="text" name="menuId" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${roleMenuInfo.menuId }" >
+						</div>  
+					</div>
+	
+				</div>
+			</div>
+		</div>  
+	</div>
+</form>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/roleMenuInfo/roleMenuInfoDetails.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/roleMenuInfo/roleMenuInfoDetails.jsp
new file mode 100644
index 0000000..fcaee24
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/roleMenuInfo/roleMenuInfoDetails.jsp
@@ -0,0 +1,54 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>     
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">                      
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black"> 
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> 
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->                                     
+<meta name="viewport"
+	content="width=device-width, initial-scale=1.0, maximum-scale=1.0">   
+<jsp:include page="../../../common.jsp" />
+<script type="text/javascript">
+    require("js/roleMenuInfo/roleMenuInfoDetails.js");
+</script>
+<title>编辑</title>
+</head>                                 
+	<body class="lgraybg">            
+		<div class="	container-fluid animated fadeInRight col-sm-12">
+			<div class="panel-toolbar mt10 mb10 pt5 pb5 pl10 bdd whitebg">
+				<div class="buttons">
+					<a href="javascript:void(0);" class="btn btn-primary fa fa-save f12"><span>保存</span></a>
+					<a href="${ctx }/roleMenuInfo/index?pageIndex=${pageIndex}"  class="btn btn-primary fa fa-back f12" id="goback"><span>返回</span></a>
+				</div>
+			</div>
+				<div class="tabs-container whitebg">
+					<div class="pt10 pl5 pr5">
+						<ul class="nav nav-tabs" id="nav-tabs">
+							<li class="active" data-action="base">   
+								<a href="javascript:void(0);" >基本资料</a>
+							</li>
+							<li class="" data-action="functions">
+								<a href="javascript:void(0);"  >多功能输入</a>
+							</li>
+							<li class="" data-action="extends">
+								<a href="javascript:void(0);" >扩展属性</a>
+							</li>
+						</ul>
+						<div class="tab-content pt30 p30">               
+		
+						</div>     
+					</div>
+				</div>    
+		</div>
+		<!-- 隐藏域 -->
+		<input type="hidden" id="roleMenuInfoId" value="${roleMenuInfo.id }"/>
+	</body>
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/roleMenuInfo/roleMenuInfoExtendsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/roleMenuInfo/roleMenuInfoExtendsInfo.jsp
new file mode 100644
index 0000000..592687a
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/roleMenuInfo/roleMenuInfoExtendsInfo.jsp
@@ -0,0 +1,201 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>           
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> 
+<div class="tab-pane active">      
+	<div class="animated fadeInRight">
+		<div class="whitebg pl10 pr10">
+			<table class="table table-striped table-bordered table-hover">     
+				<thead> 
+					<tr>  
+						<th class="textc">序号</th>         
+						<th class="textc wp15">流水账号</th>
+						<th class="textc">日期</th>         
+						<th class="textc">财务类别</th>     
+						<th class="textc">金额</th>         
+						<th class="textc">银行</th>         
+						<th class="textc">发票</th>         
+						<th class="textc">客户名称</th>     
+						<th class="textc wp15">单号</th>    
+						<th class="textc">状态</th>         
+						<th class="textc">类别</th>         
+						<th class="textc">操作</th>         
+					</tr> 
+				</thead>
+				<tbody> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+                
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="green">支出</span></td>     
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+				</tbody>
+                
+			</table>  
+			<!-- footer -->  
+			<div class="clearfix mb10 pb20">          
+					<div class="layui-tab-item fr">       
+							<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+							<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>   
+							<div class="pagination dlblock vm" id="pagination"></div>
+							<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>            
+					</div>
+				</div>  
+		</div>      
+	</div>        
+</div>          
+                
+<script type="text/javascript">    
+//分页          
+$('#pagination').pagination({        
+	pageCount: 50,
+	jump: true,   
+	coping: true, 
+	homePage: '首页',    
+	endPage: '末页',     
+	prevContent: '上页', 
+	nextContent: '下页', 
+	callback: function(api) {          
+		$('.now').text(api.getCurrent());
+	}             
+});             
+</script>       
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/roleMenuInfo/roleMenuInfoFunctionsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/roleMenuInfo/roleMenuInfoFunctionsInfo.jsp
new file mode 100644
index 0000000..982ce84
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/roleMenuInfo/roleMenuInfoFunctionsInfo.jsp
@@ -0,0 +1,130 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>		
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">      
+<div class="tab-pane active">
+				<div class="panel-body">
+					<div class="wrapper wrapper-content">     
+						<div class="panel-form animated fadeInRight wp60 fc">
+							<!-- 账号资料 -->
+			<div class="layui-form-item 	has-error">
+				<label class="layui-form-label">单行输入框<i class="red">*</i></label>
+				<div class="layui-input-block">
+					<input type="text" name="title" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input">
+				</div>                                         
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">自定义验证</label>
+				<div class="layui-input-inline ml30">
+					<input type="password" name="password" lay-verify="pass" placeholder="请输入密码" autocomplete="off" class="layui-input">
+				</div>
+				<div class="layui-form-mid layui-word-aux">请填写6到12位密码</div>
+			</div>
+			<div class="form-group">
+				<div class="layui-form-item">          
+					<label class="layui-form-label">单行选择框</label>
+					<div class="layui-input-block">
+						<select name="interest" lay-filter="aihao">  
+							<option value=""></option>
+							<option value="0">写作</option>         
+							<option value="1" selected="">阅读</option>
+							<option value="2">游戏</option>
+							<option value="3">音乐</option>
+							<option value="4">旅行</option>  
+						</select>              
+					</div>
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<div class="layui-inline">  
+					<label class="layui-form-label">范围</label>
+					<div class="layui-input-inline ml30">
+						<input type="text" name="price_min" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>                                     
+					<div class="layui-form-mid">-</div>
+					<div class="layui-input-inline">       
+						<input type="text" name="price_max" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>
+				</div>           
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">联动选择框</label>
+				<div class="layui-input-inline ml30">
+					<select name="quiz1">     
+						<option value="">请选择省</option>
+						<option value="浙江" selected="">浙江省</option> 
+						<option value="你的工号">江西省</option>           
+						<option value="你最喜欢的老师">福建省</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz2">
+						<option value="">请选择市</option>
+						<option value="杭州">杭州</option>
+						<option value="宁波" disabled="">宁波</option>
+						<option value="温州">温州</option>
+						<option value="温州">台州</option>
+						<option value="温州">绍兴</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz3">
+						<option value="">请选择县/区</option>
+						<option value="西湖区">西湖区</option>
+						<option value="余杭区">余杭区</option>
+						<option value="拱墅区">临安市</option>
+					</select>
+				</div>    
+			</div>
+			<div class="layui-form-item" pane="">   
+				<label class="layui-form-label">原始复选框</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="like1[write]" lay-skin="primary" title="写作" checked="">  
+					<input type="checkbox" name="like1[read]" lay-skin="primary" title="阅读">
+					<input type="checkbox" name="like1[game]" lay-skin="primary" title="游戏" disabled="">
+				</div>
+			</div>
+
+			<div class="layui-form-item">
+				<label class="layui-form-label">开关-默认关</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="close" lay-skin="switch" lay-text="ON|OFF">
+				</div>
+			</div>
+			<div class="layui-form-item">  
+				<label class="layui-form-label">单选框</label>
+				<div class="layui-input-block">
+					<input type="radio" name="sex" value="男" title="男" checked="">
+					<input type="radio" name="sex" value="女" title="女">
+					<input type="radio" name="sex" value="禁" title="禁用" disabled="">
+				</div>
+			</div>
+			<!--<div class="layui-form-item layui-form-text">
+				<label class="layui-form-label">上传图片</label>
+				<div class="layui-input-block">
+					<div class="layui-upload-drag w200 h200">
+						<i class="layui-icon"></i>          
+						<p>点击上传</p>
+					</div>
+				</div>
+			</div>-->
+				<div class="layui-form-item layui-form-text">
+					<label class="layui-form-label">普通文本域</label>  
+					<div class="layui-input-block">              
+						<textarea placeholder="请输入内容" class="layui-textarea"></textarea>
+					</div>
+				</div>
+			</div>
+		</div>   
+	</div>
+</div>
+</form>   
+<script type="text/javascript">
+	//form表单样式
+	layui.use(['layer', 'form'], function() {    
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+</script>                 
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/roleMenuInfo/roleMenuInfoList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/roleMenuInfo/roleMenuInfoList.jsp
new file mode 100644
index 0000000..1633efb
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/roleMenuInfo/roleMenuInfoList.jsp
@@ -0,0 +1,112 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black">
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->
+<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+<jsp:include page="../../../common.jsp" />
+<script type="text/javascript">
+     require("js/roleMenuInfo/roleMenuInfoList.js");
+</script>
+</head>
+<body>
+	<div class="row animated fadeInRight" style="margin: 0;">
+		<div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+			<div class="toolbar-panel bdd">
+				<div class="toolbar-box">
+					<div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+						<!-- 顶部按钮 -->
+						<div class="buttons fl">
+							<a class="btn btn-primary fa fa-search f13" href="javascript:void(0);" onclick="queryRoleMenuInfo()"><span>搜索</span></a>
+							<a class="btn btn-primary fa fa-plus f13 add" href="javascript:void(0);" onclick="initAddRoleMenuInfo()"><span>添加</span></a>
+							<a class="btn btn-primary fa fa-edit f13" href="javascript:void(0);" onclick="initEditRoleMenuInfo()"><span>编辑</span></a> 
+							<a class="btn btn-primary fa fa-remove f13 delete" href="javascript:void(0);" onclick="initBatchDeleteRoleMenuInfo()"><span>删除</span></a> 
+						</div>
+						<div class="tools fr">
+							<a href="javascript:void(0);" class="collapse dblock f14 dgray mr5"> 
+								<i class="fa-2x fa fa-angle-double-up"></i>
+							</a>
+						</div>
+					</div>
+				</div>
+
+				<!--搜索条件 -->
+				<div class="toolbar-body">
+					<div class="row pt10 pb10 whitebg ml0 mr0">
+						<span class="dlblock w100 textr">ID：</span> 
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+							<input type="text" placeholder="请输入内容" id="searchId">  
+						</span> 
+						<span class="dlblock w100 textr">名称：</span> 
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+							<input type="text" placeholder="请输入名称">
+						</span> 
+						<span class="dlblock w100 textr">类别：</span>
+						 <select class="form-control f12 w180 textc">
+							<option value="">支出</option>
+							<option value="">收入</option>
+						</select>
+					</div>
+					<div class="mt10 mb20">
+						<span class="dlblock w100 textr">开始日期</span>
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+							 <input type="text" placeholder="" id="date1" class="w150">
+							 <i class="fa fa-calendar"></i>
+						</span> 
+						<span class="dlblock w100 textr">结束日期</span>
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+						<input type="text" placeholder="" id="date2" class="w150"> 
+							<i class="fa fa-calendar"></i>
+						</span>
+					</div>
+				</div>
+			</div>
+		</div>
+		<!-- 表单数据 -->
+		<div class="mb20 mt10">
+			<div class="whitebg pl10 pr10">
+				<table class="table table-striped table-bordered table-hover">
+					<thead>
+						<tr>
+							<th class="textc">
+								<div class="checker" id="allCheck">
+									<span class=""><input type="checkbox" value="" ></span>
+								</div>
+							</th>
+							<th class="textc ">id</th>
+							<th class="textc ">roleId</th>
+							<th class="textc ">menuId</th>
+							<th class="textc">编辑</th>
+						</tr>
+					</thead>
+					<!-- 数据体 -->
+					<tbody id="data_content">
+					</tbody>
+				</table>
+			
+			<!-- footer -->
+				<div class="clearfix mb10 pb20">
+						<div class="layui-tab-item fr">
+								<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+								<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>
+								<div class="pagination dlblock vm" id="pagination"></div>
+								<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>
+						</div>
+					</div>
+	
+			</div>
+		</div>
+	</div>
+</body>
+
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/roleUserInfo/roleUserInfoBaseInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/roleUserInfo/roleUserInfoBaseInfo.jsp
new file mode 100644
index 0000000..b432a42
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/roleUserInfo/roleUserInfoBaseInfo.jsp
@@ -0,0 +1,39 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">  
+	<div class="tab-pane active">     
+		<div class="panel-body">
+			<div class="wrapper wrapper-content">
+				<div class="panel-form animated fadeInRight wp60 fc">
+					<div class="layui-form-item dn	has-error" >   
+						<label class="layui-form-label">id</label>  
+						<div class="layui-input-block">
+							<input type="text" name="id" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${roleUserInfo.id }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">roleId</label>  
+						<div class="layui-input-block">
+							<input type="text" name="roleId" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${roleUserInfo.roleId }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">userId</label>  
+						<div class="layui-input-block">
+							<input type="text" name="userId" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${roleUserInfo.userId }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">version</label>  
+						<div class="layui-input-block">
+							<input type="text" name="version" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${roleUserInfo.version }" >
+						</div>  
+					</div>
+	
+				</div>
+			</div>
+		</div>  
+	</div>
+</form>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/roleUserInfo/roleUserInfoDetails.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/roleUserInfo/roleUserInfoDetails.jsp
new file mode 100644
index 0000000..7ea9566
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/roleUserInfo/roleUserInfoDetails.jsp
@@ -0,0 +1,54 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>     
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">                      
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black"> 
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> 
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->                                     
+<meta name="viewport"
+	content="width=device-width, initial-scale=1.0, maximum-scale=1.0">   
+<jsp:include page="../../../common.jsp" />
+<script type="text/javascript">
+    require("js/roleUserInfo/roleUserInfoDetails.js");
+</script>
+<title>编辑</title>
+</head>                                 
+	<body class="lgraybg">            
+		<div class="	container-fluid animated fadeInRight col-sm-12">
+			<div class="panel-toolbar mt10 mb10 pt5 pb5 pl10 bdd whitebg">
+				<div class="buttons">
+					<a href="javascript:void(0);" class="btn btn-primary fa fa-save f12"><span>保存</span></a>
+					<a href="${ctx }/roleUserInfo/index?pageIndex=${pageIndex}"  class="btn btn-primary fa fa-back f12" id="goback"><span>返回</span></a>
+				</div>
+			</div>
+				<div class="tabs-container whitebg">
+					<div class="pt10 pl5 pr5">
+						<ul class="nav nav-tabs" id="nav-tabs">
+							<li class="active" data-action="base">   
+								<a href="javascript:void(0);" >基本资料</a>
+							</li>
+							<li class="" data-action="functions">
+								<a href="javascript:void(0);"  >多功能输入</a>
+							</li>
+							<li class="" data-action="extends">
+								<a href="javascript:void(0);" >扩展属性</a>
+							</li>
+						</ul>
+						<div class="tab-content pt30 p30">               
+		
+						</div>     
+					</div>
+				</div>    
+		</div>
+		<!-- 隐藏域 -->
+		<input type="hidden" id="roleUserInfoId" value="${roleUserInfo.id }"/>
+	</body>
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/roleUserInfo/roleUserInfoExtendsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/roleUserInfo/roleUserInfoExtendsInfo.jsp
new file mode 100644
index 0000000..592687a
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/roleUserInfo/roleUserInfoExtendsInfo.jsp
@@ -0,0 +1,201 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>           
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> 
+<div class="tab-pane active">      
+	<div class="animated fadeInRight">
+		<div class="whitebg pl10 pr10">
+			<table class="table table-striped table-bordered table-hover">     
+				<thead> 
+					<tr>  
+						<th class="textc">序号</th>         
+						<th class="textc wp15">流水账号</th>
+						<th class="textc">日期</th>         
+						<th class="textc">财务类别</th>     
+						<th class="textc">金额</th>         
+						<th class="textc">银行</th>         
+						<th class="textc">发票</th>         
+						<th class="textc">客户名称</th>     
+						<th class="textc wp15">单号</th>    
+						<th class="textc">状态</th>         
+						<th class="textc">类别</th>         
+						<th class="textc">操作</th>         
+					</tr> 
+				</thead>
+				<tbody> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+                
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="green">支出</span></td>     
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+				</tbody>
+                
+			</table>  
+			<!-- footer -->  
+			<div class="clearfix mb10 pb20">          
+					<div class="layui-tab-item fr">       
+							<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+							<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>   
+							<div class="pagination dlblock vm" id="pagination"></div>
+							<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>            
+					</div>
+				</div>  
+		</div>      
+	</div>        
+</div>          
+                
+<script type="text/javascript">    
+//分页          
+$('#pagination').pagination({        
+	pageCount: 50,
+	jump: true,   
+	coping: true, 
+	homePage: '首页',    
+	endPage: '末页',     
+	prevContent: '上页', 
+	nextContent: '下页', 
+	callback: function(api) {          
+		$('.now').text(api.getCurrent());
+	}             
+});             
+</script>       
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/roleUserInfo/roleUserInfoFunctionsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/roleUserInfo/roleUserInfoFunctionsInfo.jsp
new file mode 100644
index 0000000..982ce84
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/roleUserInfo/roleUserInfoFunctionsInfo.jsp
@@ -0,0 +1,130 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>		
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">      
+<div class="tab-pane active">
+				<div class="panel-body">
+					<div class="wrapper wrapper-content">     
+						<div class="panel-form animated fadeInRight wp60 fc">
+							<!-- 账号资料 -->
+			<div class="layui-form-item 	has-error">
+				<label class="layui-form-label">单行输入框<i class="red">*</i></label>
+				<div class="layui-input-block">
+					<input type="text" name="title" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input">
+				</div>                                         
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">自定义验证</label>
+				<div class="layui-input-inline ml30">
+					<input type="password" name="password" lay-verify="pass" placeholder="请输入密码" autocomplete="off" class="layui-input">
+				</div>
+				<div class="layui-form-mid layui-word-aux">请填写6到12位密码</div>
+			</div>
+			<div class="form-group">
+				<div class="layui-form-item">          
+					<label class="layui-form-label">单行选择框</label>
+					<div class="layui-input-block">
+						<select name="interest" lay-filter="aihao">  
+							<option value=""></option>
+							<option value="0">写作</option>         
+							<option value="1" selected="">阅读</option>
+							<option value="2">游戏</option>
+							<option value="3">音乐</option>
+							<option value="4">旅行</option>  
+						</select>              
+					</div>
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<div class="layui-inline">  
+					<label class="layui-form-label">范围</label>
+					<div class="layui-input-inline ml30">
+						<input type="text" name="price_min" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>                                     
+					<div class="layui-form-mid">-</div>
+					<div class="layui-input-inline">       
+						<input type="text" name="price_max" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>
+				</div>           
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">联动选择框</label>
+				<div class="layui-input-inline ml30">
+					<select name="quiz1">     
+						<option value="">请选择省</option>
+						<option value="浙江" selected="">浙江省</option> 
+						<option value="你的工号">江西省</option>           
+						<option value="你最喜欢的老师">福建省</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz2">
+						<option value="">请选择市</option>
+						<option value="杭州">杭州</option>
+						<option value="宁波" disabled="">宁波</option>
+						<option value="温州">温州</option>
+						<option value="温州">台州</option>
+						<option value="温州">绍兴</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz3">
+						<option value="">请选择县/区</option>
+						<option value="西湖区">西湖区</option>
+						<option value="余杭区">余杭区</option>
+						<option value="拱墅区">临安市</option>
+					</select>
+				</div>    
+			</div>
+			<div class="layui-form-item" pane="">   
+				<label class="layui-form-label">原始复选框</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="like1[write]" lay-skin="primary" title="写作" checked="">  
+					<input type="checkbox" name="like1[read]" lay-skin="primary" title="阅读">
+					<input type="checkbox" name="like1[game]" lay-skin="primary" title="游戏" disabled="">
+				</div>
+			</div>
+
+			<div class="layui-form-item">
+				<label class="layui-form-label">开关-默认关</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="close" lay-skin="switch" lay-text="ON|OFF">
+				</div>
+			</div>
+			<div class="layui-form-item">  
+				<label class="layui-form-label">单选框</label>
+				<div class="layui-input-block">
+					<input type="radio" name="sex" value="男" title="男" checked="">
+					<input type="radio" name="sex" value="女" title="女">
+					<input type="radio" name="sex" value="禁" title="禁用" disabled="">
+				</div>
+			</div>
+			<!--<div class="layui-form-item layui-form-text">
+				<label class="layui-form-label">上传图片</label>
+				<div class="layui-input-block">
+					<div class="layui-upload-drag w200 h200">
+						<i class="layui-icon"></i>          
+						<p>点击上传</p>
+					</div>
+				</div>
+			</div>-->
+				<div class="layui-form-item layui-form-text">
+					<label class="layui-form-label">普通文本域</label>  
+					<div class="layui-input-block">              
+						<textarea placeholder="请输入内容" class="layui-textarea"></textarea>
+					</div>
+				</div>
+			</div>
+		</div>   
+	</div>
+</div>
+</form>   
+<script type="text/javascript">
+	//form表单样式
+	layui.use(['layer', 'form'], function() {    
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+</script>                 
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/roleUserInfo/roleUserInfoList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/roleUserInfo/roleUserInfoList.jsp
new file mode 100644
index 0000000..f275336
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/roleUserInfo/roleUserInfoList.jsp
@@ -0,0 +1,113 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black">
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->
+<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+<jsp:include page="../../../common.jsp" />
+<script type="text/javascript">
+     require("js/roleUserInfo/roleUserInfoList.js");
+</script>
+</head>
+<body>
+	<div class="row animated fadeInRight" style="margin: 0;">
+		<div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+			<div class="toolbar-panel bdd">
+				<div class="toolbar-box">
+					<div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+						<!-- 顶部按钮 -->
+						<div class="buttons fl">
+							<a class="btn btn-primary fa fa-search f13" href="javascript:void(0);" onclick="queryRoleUserInfo()"><span>搜索</span></a>
+							<a class="btn btn-primary fa fa-plus f13 add" href="javascript:void(0);" onclick="initAddRoleUserInfo()"><span>添加</span></a>
+							<a class="btn btn-primary fa fa-edit f13" href="javascript:void(0);" onclick="initEditRoleUserInfo()"><span>编辑</span></a> 
+							<a class="btn btn-primary fa fa-remove f13 delete" href="javascript:void(0);" onclick="initBatchDeleteRoleUserInfo()"><span>删除</span></a> 
+						</div>
+						<div class="tools fr">
+							<a href="javascript:void(0);" class="collapse dblock f14 dgray mr5"> 
+								<i class="fa-2x fa fa-angle-double-up"></i>
+							</a>
+						</div>
+					</div>
+				</div>
+
+				<!--搜索条件 -->
+				<div class="toolbar-body">
+					<div class="row pt10 pb10 whitebg ml0 mr0">
+						<span class="dlblock w100 textr">ID：</span> 
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+							<input type="text" placeholder="请输入内容" id="searchId">  
+						</span> 
+						<span class="dlblock w100 textr">名称：</span> 
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+							<input type="text" placeholder="请输入名称">
+						</span> 
+						<span class="dlblock w100 textr">类别：</span>
+						 <select class="form-control f12 w180 textc">
+							<option value="">支出</option>
+							<option value="">收入</option>
+						</select>
+					</div>
+					<div class="mt10 mb20">
+						<span class="dlblock w100 textr">开始日期</span>
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+							 <input type="text" placeholder="" id="date1" class="w150">
+							 <i class="fa fa-calendar"></i>
+						</span> 
+						<span class="dlblock w100 textr">结束日期</span>
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+						<input type="text" placeholder="" id="date2" class="w150"> 
+							<i class="fa fa-calendar"></i>
+						</span>
+					</div>
+				</div>
+			</div>
+		</div>
+		<!-- 表单数据 -->
+		<div class="mb20 mt10">
+			<div class="whitebg pl10 pr10">
+				<table class="table table-striped table-bordered table-hover">
+					<thead>
+						<tr>
+							<th class="textc">
+								<div class="checker" id="allCheck">
+									<span class=""><input type="checkbox" value="" ></span>
+								</div>
+							</th>
+							<th class="textc ">id</th>
+							<th class="textc ">roleId</th>
+							<th class="textc ">userId</th>
+							<th class="textc ">version</th>
+							<th class="textc">编辑</th>
+						</tr>
+					</thead>
+					<!-- 数据体 -->
+					<tbody id="data_content">
+					</tbody>
+				</table>
+			
+			<!-- footer -->
+				<div class="clearfix mb10 pb20">
+						<div class="layui-tab-item fr">
+								<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+								<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>
+								<div class="pagination dlblock vm" id="pagination"></div>
+								<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>
+						</div>
+					</div>
+	
+			</div>
+		</div>
+	</div>
+</body>
+
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/user/changePwd.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/user/changePwd.jsp
new file mode 100644
index 0000000..0c014a0
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/user/changePwd.jsp
@@ -0,0 +1,52 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+		<title>用户管理</title>
+		<%@include file="../../../common.jsp"%>
+		<script type="text/javascript" src="${res}/js/user/changePwd.js"></script>
+		
+		<style type="text/css">
+		</style>
+	</head>
+<body>
+	<div class="container-fluid">
+		<div class="row-fluid">
+			<ul class="breadcrumb">
+				<li class="active">权限管理 <span class="divider">/</span></li>
+				<li class="active">修改密码</li>
+			</ul>
+			<form id="pwd_form">
+				<div class="form-horizontal">
+					<div class="control-group">
+						<label class="control-label" for="oldPassword">原密码:<span class="help-inline">*</span></label> 
+						<div class="controls">
+						<input type="password" id="oldPassword" name="oldPassword">
+						</div>
+					</div>
+					<div class="control-group">
+						<label class="control-label" for="newPassword">新密码:<span class="help-inline">*</span></label> 
+						<div class="controls">
+							<input type="password" id="newPassword" name="newPassword">
+						</div>
+					</div>
+					<div class="control-group">
+						<label class="control-label" for="confirmPassword">确认密码:</label> 
+						<div class="controls">
+						<input type="password" id="confirmPassword" name="confirmPassword">
+						</div>
+					</div>
+					<div class="control-group">
+						<label class="control-label"></label> 
+						<div class="controls">
+						<button type="button" class="btn btn-primary" id="btn_save">提交</button>
+						</div>
+					</div>
+				</div>
+			</form>
+		</div>
+	</div>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/user/editUser.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/user/editUser.jsp
new file mode 100644
index 0000000..eb754d9
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/user/editUser.jsp
@@ -0,0 +1,164 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+		<title>用户管理</title>
+		<jsp:include page="../../../common.jsp"></jsp:include>
+		<jsp:include page="../../../public.jsp"></jsp:include>
+		<script type="text/javascript">
+			var readOnly = '${param.readOnly}' === 'true';
+			var user = null;
+			var userRoleIds = [];
+			var userRoles = [];
+			var userProducts = [];
+			var userPlatforms = [];
+			var userProvinceId = null;
+			var userCityId = null;
+			var curUserId = "<shiro:principal property='id'/>";
+			var curUserLoginName = "<shiro:principal property='loginName'/>";
+		</script>
+		<script type="text/javascript" src="${res}/js/user/editUser.js"></script>
+		
+		<style type="text/css">
+		.nav-tabs > .active > a ,.nav-tabs > .active > a:hover,.nav-tabs > .active > a:focus{
+			background-color: #0088cc;
+			color : #fff;
+		}
+		</style>
+	</head>
+<body>
+
+	
+	<!-- [start]  device新增模态框 -->
+ 	<div class="modal hide fade" id="dataAuthModal">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal"  >&times;</button>       
+	        <h3 id="deviceModelTitle">权限配置 
+		        <select id="organType" style="margin-left:40%;" name="organType" class="input-medium">
+		        	<option value="order_meal">点餐</option>
+					<option value="wifi_manage">wifi后台</option>
+		        </select>
+	        </h3>       
+      </div>
+      <div class="modal-body" id="modelBody">
+      </div>
+      <div class="modal-footer">
+        <a id="addDevice" href="javascript:addOrgan()"  class="btn btn-primary">保存</a>
+      </div>
+	</div>
+	<!-- [end]  device新增模态框 -->
+	
+	<div class="container-fluid">
+		<div class="row-fluid">
+			<ul class="breadcrumb">
+				<li class="active">权限管理 <span class="divider">/</span></li>
+				<li class="active">用户管理</li>
+			</ul>
+			<form id="user_form">
+			<input type="hidden" id="OrganIdWifi" name="OrganWifiStr" value="">
+			<input type="hidden" id="OrganIdMeal" name="OrganMealStr" value="">
+			<input type="hidden" id="OrganId" name="OrganStr" value="">
+			<div class="tabbable">
+				<ul class="nav nav-tabs">
+					<li class="active"><a href="#profile_tab" data-toggle="tab">基本信息</a></li>
+				</ul>
+				<div class="tab-content">
+					<div class="tab-pane active" id="profile_tab">
+						<input type="hidden" id="id" name="id" value="${userInfo.id }">
+						<div class="form-horizontal">
+							<div class="control-group">
+								<label class="control-label" for="loginName">登录名:<span class="help-inline">*</span></label> 
+								<div class="controls">
+									<input type="text" id="loginName" name="loginName" value="${userInfo.loginName }" required="required">
+								</div>
+							</div>
+							<!-- <div class="control-group">
+                                <label class="control-label" for="password">密码:<span class="help-inline">*</span></label> 
+                                <div class="controls">
+                                    <input type="password" id="password" name=password value="" required="required">
+                                </div>
+                            </div> -->
+							<div class="control-group">
+								<label class="control-label" for="trueName">用户姓名:<span class="help-inline">*</span></label> 
+								<div class="controls">
+									<input type="text" id="trueName" name="trueName" value="${userInfo.trueName }" required="required">
+								</div>
+							</div>
+							<div class="control-group">
+								<label class="control-label" for="status">用户状态:</label> 
+								<div class="controls">
+								<select id="status" name="status" class="input-medium">
+									<option value="1" <c:if test="${userInfo.status eq '1' }">selected</c:if>>有效</option>
+									<option value="0" <c:if test="${userInfo.status eq '0' }">selected</c:if>>无效</option>
+								</select>
+								</div>
+							</div>
+							<div class="control-group">
+								<label class="control-label">性别:</label>
+								<div class="controls">
+									<label class="radio inline">
+										<input type="radio" <c:if test="${userInfo.sex eq '0' }">checked</c:if>   id="sex_male" name="sex" value="0"> 男
+									</label>
+									<label class="radio inline">
+										<input type="radio" id="sex_female" <c:if test="${userInfo.sex eq '1' }">checked</c:if> name="sex" value="1"> 女
+									</label>
+								</div>
+							</div>
+							<div class="control-group">
+								<label class="control-label" for="phone">手机号:</label>
+								<div class="controls">
+									<input type="text" id="phone" name="phone" value="${userInfo.phone}">
+								</div>
+							</div>
+							<div class="control-group">
+								<label class="control-label" for="email">电子邮箱:</label>
+								<div class="controls">
+									<input type="text" id="email" name="email" value="${userInfo.email}">
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+			<div class="tabbable">
+				<ul class="nav nav-tabs">
+					<li class="active"><a href="#data_tab" data-toggle="tab">数据权限</a></li>
+				</ul>
+				<div class="tab-content">
+					<label class="control-label" style="float:left;text-indent:24px;">数据权限:</label>
+						<!-- <a id="dataAuth" href="#" onclick="showModel(0);" data-toggle="modal" data-target="#dataAuthModal">&nbsp;&nbsp;权限配置</a>
+				 -->
+				</div>
+			<div class="tabbable">
+				<ul class="nav nav-tabs">
+					<li class="active"><a href="#permission_tab" data-toggle="tab">操作权限</a></li>
+				</ul>
+				<div class="tab-content">
+					<div class="tab-pane active" id="permission_tab">
+						<div class="form-horizontal">
+							<div class="control-group">
+								<label class="control-label">操作权限:</label>
+								<div class="controls" id="roles"  >
+									<label class="checkbox inline">
+										<input type="checkbox" id="role_{0}" value="{0}"> {1}
+									</label>
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+			<div class="form-btns">
+				<button type="button" class="btn btn-primary" id="btn_save">保存</button>
+				<button type="button" class="btn btn-primary" onclick="history.go(-1);">返回</button>
+			</div>
+			<!--隐藏域  -->
+			<input id="roleIds" name="roleIds" type="hidden">
+			</form>
+		</div>
+	</div>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/user/modelList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/user/modelList.jsp
new file mode 100644
index 0000000..8878413
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/user/modelList.jsp
@@ -0,0 +1,20 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<c:forEach var="item" items="${resList}" varStatus="statusPro">
+ 	<li class="provinceLi" style="list-style-type:none;clear:both;">
+      	 <label><input class="checkBoxPro" id="pro_${item.provinceId}" onclick="checkBoxProvince(this,'${item.provinceId}')" type="checkbox" value="${item.provinceId}" />${item.provinceName}</label>
+      	 <c:forEach items="${item.latnList }" var="latn" varStatus="statusCity">
+		     <ul class="cityUl" style="list-style-type:none;clear:both;">
+		      	<label><input class="subCheck checkBoxLatn_${item.provinceId}" id="city_${latn.latnId }" provinceId="${item.provinceId}" type="checkbox" onclick="checkBoxCity(this,'${item.provinceId}','${latn.latnId}','${statusPro.index}')" value="${latn.latnId }" />${latn.latnName }</label>
+		      	<li class="shopLi" style="list-style-type:none;">
+		      		<c:forEach items="${latn.organList }" var="organ" varStatus="statusOrgan">
+				      	<ul class="shopUl" id="" style="float:left;">
+				      		<label><input class="classOrgan subCheck_${latn.latnId } checkBoxOrgan_${item.provinceId}" id="organ_${organ.organCode}" provinceId="${item.provinceId}" latnId="${latn.latnId }" onclick="checkBoxOrgan(this,'${organ.organCode}')" type="checkbox" value="${organ.organCode }" />${organ.organName }</label>
+				      	</ul>
+			      	</c:forEach>
+		      	</li>
+		     </ul>
+	      </c:forEach>
+     </li>
+</c:forEach>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/user/user.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/user/user.jsp
new file mode 100644
index 0000000..9c225e5
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/user/user.jsp
@@ -0,0 +1,86 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+		<title>用户管理</title>
+		<%@include file="../../../common.jsp"%>
+		<style type="text/css">
+		#user_table {
+			min-width : 800px;
+		}
+		</style>
+<jsp:include page="../../../common.jsp"></jsp:include>
+<jsp:include page="../../../public.jsp"></jsp:include>
+	<script type="text/javascript">
+		require("js/auth/user/user.js");
+	</script>
+	</head>
+<body>
+	<div class="container-fluid">
+		<div class="row-fluid">
+			<ul class="breadcrumb">
+				<li class="active">权限管理 <span class="divider">/</span></li>
+				<li class="active">用户管理</li>
+			</ul>
+			<form id="queryForm" action="javascript:table.fnDraw();">
+				<div class="form-inline">
+					<div class="control-group inline">
+						<label class="inline" for="province">所属省份:</label> 
+						<select id="province" name="province" class="input-medium">
+						</select>
+					</div>
+					<div class="control-group inline">
+						<label class="inline" for="city">所属城市:</label> 
+						<select id="city" name="city" class="input-medium">
+						</select>
+					</div>
+					<div class="control-group inline">
+						<label class="inline" for="status">用户状态:</label> 
+						<select id="status" name="status" class="input-medium">
+							<option value="">选择状态</option>
+							<option value="1">有效</option>
+							<option value="0">无效</option>
+						</select>
+					</div>
+					<div class="control-group inline">
+						<label class="inline" for="trueName">用户名:</label> 
+						<input id="trueName" name="trueName" type="text" class="input-text-medium" placeholder="用户名/登录名">
+					</div>
+					<div class="control-group inline">
+						<label class="inline" for="loginName">登录名:</label> 
+						<input id="loginName" name="loginName" type="text" class="input-text-medium" placeholder="用户名/登录名">
+					</div>
+					<!-- 
+					<div class="control-group inline">
+						<label class="inline" for="roleName">角色名:</label> 
+						<input id="roleName" name="roleName" type="text" class="input-text-medium" placeholder="角色名">
+					</div>
+					 -->
+					<div class="control-group inline pull-right">
+						<button type="button" id="query_btn" class="btn btn-primary">查询</button>
+					</div>
+				</div>
+			</form>
+			<div class="row-fluid toolbar">
+        		<button type="button" class="btn btn-primary" onclick="window.location.href='/sso/user!edit.do'">新增</button>
+        	</div>
+	        <table id="user_table" class="table table-hover table-bordered table-condensed table-striped">
+				<thead>
+					<tr>
+					    <th>id</th>
+						<th>登录名</th>
+						<th>真实姓名</th>
+						<th>状态</th>
+						<th>创建人</th>
+						<th>修改人</th>
+						<th>编辑</th>
+					</tr>
+				</thead>
+				<tbody></tbody>
+			</table>
+		</div>
+	</div>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/user/userDetail.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/user/userDetail.jsp
new file mode 100644
index 0000000..a633fe0
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/user/userDetail.jsp
@@ -0,0 +1,152 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+		<title>用户管理</title>
+		<jsp:include page="../../../common.jsp"></jsp:include>
+		<jsp:include page="../../../public.jsp"></jsp:include>
+		<script type="text/javascript">
+			var readOnly = '${param.readOnly}' === 'true';
+			var user = null;
+			var userRoleIds = [];
+			var userRoles = [];
+			var userProducts = [];
+			var userPlatforms = [];
+			var userProvinceId = null;
+			var userCityId = null;
+			var curUserId = "<shiro:principal property='id'/>";
+			var curUserLoginName = "<shiro:principal property='loginName'/>";
+		</script>
+		<script type="text/javascript" src="${res}/js/user/editUser.js"></script>
+		
+		<style type="text/css">
+		.nav-tabs > .active > a ,.nav-tabs > .active > a:hover,.nav-tabs > .active > a:focus{
+			background-color: #0088cc;
+			color : #fff;
+		}
+		</style>
+	</head>
+<body>
+
+	
+	<!-- [start]  device新增模态框 -->
+ 	<div class="modal hide fade" id="dataAuthModal">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal"  >&times;</button>       
+	        <h3 id="deviceModelTitle">权限配置 
+		        <select id="organType" style="margin-left:40%;" name="organType" class="input-medium">
+		        	<option value="order_meal">点餐</option>
+					<option value="wifi_manage">wifi后台</option>
+		        </select>
+	        </h3>       
+      </div>
+      <div class="modal-body" id="modelBody">
+      </div>
+      <div class="modal-footer">
+        <a id="addDevice" href="javascript:addOrgan()"  class="btn btn-primary">保存</a>
+      </div>
+	</div>
+	<!-- [end]  device新增模态框 -->
+	
+	<div class="container-fluid">
+		<div class="row-fluid">
+			<ul class="breadcrumb">
+				<li class="active">权限管理 <span class="divider">/</span></li>
+				<li class="active">用户管理</li>
+			</ul>
+			<form id="user_form">
+			<input type="hidden" id="OrganIdWifi" name="OrganWifiStr" value="">
+			<input type="hidden" id="OrganIdMeal" name="OrganMealStr" value="">
+			<input type="hidden" id="OrganId" name="OrganStr" value="">
+			<div class="tabbable">
+				<ul class="nav nav-tabs">
+					<li class="active"><a href="#profile_tab" data-toggle="tab">基本信息</a></li>
+				</ul>
+				<div class="tab-content">
+					<div class="tab-pane active" id="profile_tab">
+						<input type="hidden" id="id" name="id" value="${userInfo.id }">
+						<div class="form-horizontal">
+							<div class="control-group">
+								<label class="control-label" for="loginName">登录名:</label> 
+								<div class="controls">
+									<input type="text" id="loginName" name="loginName" value="${userInfo.loginName }" readonly="readonly">
+								</div>
+							</div>
+							<div class="control-group">
+								<label class="control-label" for="trueName">用户姓名:</label> 
+								<div class="controls">
+									<input type="text" id="trueName" name="trueName" value="${userInfo.trueName }" readonly="readonly">
+								</div>
+							</div>
+							<div class="control-group">
+								<label class="control-label" for="status">用户状态:</label> 
+								<div class="controls">
+								<input type="text" id="status" name="status" 
+								value='<c:if test="${userInfo.status eq '1' }">有效</c:if><c:if test="${userInfo.status eq '0' }">无效</c:if>' readonly="readonly">
+								</div>
+							</div>
+							<div class="control-group">
+								<label class="control-label">性别:</label>
+								<div class="controls">
+									<input type="text" id="sex_male" name="sex_male"
+									 value='<c:if test="${userInfo.sex eq '1' }">女</c:if><c:if test="${userInfo.sex eq '0' }">男</c:if>' readonly="readonly">
+								</div>
+							</div>
+							<div class="control-group">
+								<label class="control-label" for="phone">手机号:</label>
+								<div class="controls">
+									<input type="text" id="phone" name="phone" value="${userInfo.phone}" readonly="readonly">
+								</div>
+							</div>
+							<div class="control-group">
+								<label class="control-label" for="email">电子邮箱:</label>
+								<div class="controls">
+									<input type="text" id="email" name="email" value="${userInfo.email}" readonly="readonly">
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+			<div class="tabbable">
+				<ul class="nav nav-tabs">
+					<li class="active"><a href="#data_tab" data-toggle="tab">数据权限</a></li>
+				</ul>
+				<div class="tab-content">
+					<label class="control-label" style="float:left;text-indent:24px;">数据权限:</label>
+						<!-- <a id="dataAuth" href="#" onclick="showModel(0);" data-toggle="modal" data-target="#dataAuthModal">&nbsp;&nbsp;权限配置</a>
+				 -->
+				</div>
+			<div class="tabbable">
+				<ul class="nav nav-tabs">
+					<li class="active"><a href="#permission_tab" data-toggle="tab">操作权限</a></li>
+				</ul>
+				<div class="tab-content">
+					<div class="tab-pane active" id="permission_tab">
+						<div class="form-horizontal">
+							<div class="control-group">
+								<label class="control-label">操作权限:</label>
+								<div class="controls" id="roles"  >
+									<label class="checkbox inline">
+										<input type="checkbox" id="role_{0}" value="{0}"> {1}
+									</label>
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+			<div class="form-btns">
+				<!-- <button type="button" class="btn btn-primary" id="btn_save">保存</button> -->
+				<button type="button" class="btn btn-primary" onclick="history.go(-1);">返回</button>
+			</div>
+			<!--隐藏域  -->
+			<input id="roleIds" name="roleIds" type="hidden">
+			</form>
+		</div>
+	</div>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/userInfo/editUser.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/userInfo/editUser.jsp
new file mode 100644
index 0000000..14ec663
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/userInfo/editUser.jsp
@@ -0,0 +1,157 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+		<title>用户管理</title>
+		<jsp:include page="../../../common.jsp"></jsp:include>
+		<jsp:include page="../../../public.jsp"></jsp:include>
+		<script type="text/javascript">
+			var readOnly = '${param.readOnly}' === 'true';
+			var user = null;
+			var userRoleIds = [];
+			var userRoles = [];
+			var userProducts = [];
+			var userPlatforms = [];
+			var userProvinceId = null;
+			var userCityId = null;
+			var curUserId = "<shiro:principal property='id'/>";
+			var curUserLoginName = "<shiro:principal property='loginName'/>";
+		</script>
+		<script type="text/javascript" src="${res}/js/user/editUser.js"></script>
+		
+		<style type="text/css">
+		.nav-tabs > .active > a ,.nav-tabs > .active > a:hover,.nav-tabs > .active > a:focus{
+			background-color: #0088cc;
+			color : #fff;
+		}
+		</style>
+	</head>
+<body>
+
+	
+	<!-- [start]  device新增模态框 -->
+ 	<div class="modal hide fade" id="dataAuthModal">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal"  >&times;</button>       
+	        <h3 id="deviceModelTitle">权限配置 
+		        <select id="organType" style="margin-left:40%;" name="organType" class="input-medium">
+		        	<option value="order_meal">点餐</option>
+					<option value="wifi_manage">wifi后台</option>
+		        </select>
+	        </h3>       
+      </div>
+      <div class="modal-body" id="modelBody">
+      </div>
+      <div class="modal-footer">
+        <a id="addDevice" href="javascript:addOrgan()"  class="btn btn-primary">保存</a>
+      </div>
+	</div>
+	<!-- [end]  device新增模态框 -->
+	
+	<div class="container-fluid">
+		<div class="row-fluid">
+			<ul class="breadcrumb">
+				<li class="active">权限管理 <span class="divider">/</span></li>
+				<li class="active">用户管理</li>
+			</ul>
+			<form id="user_form">
+			<input type="hidden" id="OrganIdWifi" name="OrganWifiStr" value="">
+			<input type="hidden" id="OrganIdMeal" name="OrganMealStr" value="">
+			<input type="hidden" id="OrganId" name="OrganStr" value="">
+			<div class="tabbable">
+				<ul class="nav nav-tabs">
+					<li class="active"><a href="#profile_tab" data-toggle="tab">基本信息</a></li>
+				</ul>
+				<div class="tab-content">
+					<div class="tab-pane active" id="profile_tab">
+						<input type="hidden" id="id" name="user.id" value="${param.id }">
+						<div class="form-horizontal">
+							<div class="control-group">
+								<label class="control-label" for="loginName">登录名:<span class="help-inline">*</span></label> 
+								<div class="controls">
+									<input type="text" id="loginName" name="user.loginName" value="">
+								</div>
+							</div>
+							<div class="control-group">
+								<label class="control-label" for="trueName">用户姓名:<span class="help-inline">*</span></label> 
+								<div class="controls">
+									<input type="text" id="trueName" name="user.trueName">
+								</div>
+							</div>
+							<div class="control-group">
+								<label class="control-label" for="status">用户状态:</label> 
+								<div class="controls">
+								<select id="status" name="user.status" class="input-medium">
+									<option value="1">有效</option>
+									<option value="0">无效</option>
+								</select>
+								</div>
+							</div>
+							<div class="control-group">
+								<label class="control-label">性别:</label>
+								<div class="controls">
+									<label class="radio inline">
+										<input type="radio" id="sex_male" name="user.sex" value="男"> 男
+									</label>
+									<label class="radio inline">
+										<input type="radio" id="sex_female" name="user.sex" value="女"> 女
+									</label>
+								</div>
+							</div>
+							<div class="control-group">
+								<label class="control-label" for="phone">手机号:</label>
+								<div class="controls">
+									<input type="text" id="phone" name="user.phone">
+								</div>
+							</div>
+							<div class="control-group">
+								<label class="control-label" for="email">电子邮箱:</label>
+								<div class="controls">
+									<input type="text" id="email" name="user.email">
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+			<div class="tabbable">
+				<ul class="nav nav-tabs">
+					<li class="active"><a href="#data_tab" data-toggle="tab">数据权限</a></li>
+				</ul>
+				<div class="tab-content">
+					<label class="control-label" style="float:left;text-indent:24px;">数据权限:</label>
+						<!-- <a id="dataAuth" href="#" onclick="showModel(0);" data-toggle="modal" data-target="#dataAuthModal">&nbsp;&nbsp;权限配置</a>
+				 -->
+				</div>
+			<div class="tabbable">
+				<ul class="nav nav-tabs">
+					<li class="active"><a href="#permission_tab" data-toggle="tab">操作权限</a></li>
+				</ul>
+				<div class="tab-content">
+					<div class="tab-pane active" id="permission_tab">
+						<div class="form-horizontal">
+							<div class="control-group">
+								<label class="control-label">操作权限:</label>
+								<div class="controls" id="roles"  >
+									<label class="checkbox inline">
+										<input type="checkbox" id="role_{0}" value="{0}"> {1}
+									</label>
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+			<div class="form-btns">
+				<button type="button" class="btn btn-primary" id="btn_save">保存</button>
+				<button type="button" class="btn btn-primary" onclick="history.go(-1);">返回</button>
+			</div>
+			<!--隐藏域  -->
+			<input id="roleIds" name="roleIds" type="hidden">
+			</form>
+		</div>
+	</div>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/userInfo/userInfoBaseInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/userInfo/userInfoBaseInfo.jsp
new file mode 100644
index 0000000..7b9ac88
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/userInfo/userInfoBaseInfo.jsp
@@ -0,0 +1,190 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">  
+	<div class="tab-pane active">     
+		<div class="panel-body">
+			<div class="wrapper wrapper-content">
+				<div class="panel-form animated fadeInRight wp60 fc">
+					<div class="layui-form-item dn	has-error" >   
+						<label class="layui-form-label">id</label>  
+						<div class="layui-input-block">
+							<input type="text" name="id" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${userInfo.id }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">用户名</label>  
+						<div class="layui-input-block">
+							<input type="text" name="loginName" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${userInfo.loginName }" >
+						</div>  
+					</div>
+					<c:if test="${userInfo.id eq '' }">
+					<div class="layui-form-item    has-error" >   
+                        <label class="layui-form-label">密码</label>  
+                        <div class="layui-input-block">
+                            <input type="text" name="password" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="" >
+                        </div>  
+                    </div>
+                    </c:if>
+					
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">姓名</label>  
+						<div class="layui-input-block">
+							<input type="text" name="trueName" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${userInfo.trueName }" >
+						</div>  
+					</div>
+					<div class="layui-form-item    has-error" >   
+                        <label class="layui-form-label">手机</label>  
+                        <div class="layui-input-block">
+                            <input type="text" name="phone" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${userInfo.phone }" >
+                        </div>  
+                    </div>
+                    <div class="form-group">
+                        <div class="layui-form-item">          
+                            <label class="layui-form-label">选择性别</label>
+                            <div class="layui-input-block">
+                                <select name="sex" lay-filter="aihao">  
+                                    <option value=""></option>
+                                    <option value="0">男</option>
+                                    <option value="1">女</option>         
+                                </select>              
+                            </div>
+                        </div>
+                    </div>
+		             <div class="form-group">
+		                <div class="layui-form-item">          
+		                    <label class="layui-form-label">选择门店</label>
+		                    <div class="layui-input-block">
+		                        <select  lay-filter="aihao">  
+		                            <option value=""></option>
+		                            <option value="0">写作</option>         
+		                        </select>              
+		                    </div>
+		                </div>
+		            </div>
+		            
+		            <div class="form-group">
+                        <div class="layui-form-item">          
+                            <label class="layui-form-label">选择角色</label>
+                            <div class="layui-input-block">
+                                <select  lay-filter="aihao">  
+                                    <option value=""></option>
+                                    <option value="0">写作</option>         
+                                </select>              
+                            </div>
+                        </div>
+                    </div>
+                    
+                    <div class="form-group">
+                        <div class="layui-form-item">          
+                            <label class="layui-form-label">选择状态</label>
+                            <div class="layui-input-block">
+                                <select name="status" lay-filter="aihao">  
+                                    <option value="0">无效</option> 
+                                    <option value="1">有效</option>     
+                                </select>              
+                            </div>
+                        </div>
+                    </div>
+		            
+				<%-- 	<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">provinceCode</label>  
+						<div class="layui-input-block">
+							<input type="text" name="provinceCode" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${userInfo.provinceCode }" >
+						</div>  
+					</div>
+					
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">cityCode</label>  
+						<div class="layui-input-block">
+							<input type="text" name="cityCode" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${userInfo.cityCode }" >
+						</div>  
+					</div>
+					
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">email</label>  
+						<div class="layui-input-block">
+							<input type="text" name="email" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${userInfo.email }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">status</label>  
+						<div class="layui-input-block">
+							<input type="text" name="status" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${userInfo.status }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">password</label>  
+						<div class="layui-input-block">
+							<input type="text" name="password" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${userInfo.password }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">creator</label>  
+						<div class="layui-input-block">
+							<input type="text" name="creator" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${userInfo.creator }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">createTime</label>  
+						<div class="layui-input-block">
+							<input type="text" name="createTime" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${userInfo.createTime }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">updator</label>  
+						<div class="layui-input-block">
+							<input type="text" name="updator" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${userInfo.updator }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">updateTime</label>  
+						<div class="layui-input-block">
+							<input type="text" name="updateTime" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${userInfo.updateTime }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">version</label>  
+						<div class="layui-input-block">
+							<input type="text" name="version" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${userInfo.version }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">parentId</label>  
+						<div class="layui-input-block">
+							<input type="text" name="parentId" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${userInfo.parentId }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">areaId</label>  
+						<div class="layui-input-block">
+							<input type="text" name="areaId" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${userInfo.areaId }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">areaCode</label>  
+						<div class="layui-input-block">
+							<input type="text" name="areaCode" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${userInfo.areaCode }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">source</label>  
+						<div class="layui-input-block">
+							<input type="text" name="source" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${userInfo.source }" >
+						</div>  
+					</div> --%>
+	
+				</div>
+			</div>
+		</div>  
+	</div>
+</form>
+<<script type="text/javascript">
+//form表单样式
+layui.use(['layer', 'form'], function() {    
+    var layer = layui.layer,
+        form = layui.form;
+    form.render();
+});
+</script>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/userInfo/userInfoDetails.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/userInfo/userInfoDetails.jsp
new file mode 100644
index 0000000..915273b
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/userInfo/userInfoDetails.jsp
@@ -0,0 +1,54 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>     
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">                      
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black"> 
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> 
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->                                     
+<meta name="viewport"
+	content="width=device-width, initial-scale=1.0, maximum-scale=1.0">   
+<jsp:include page="../../../common.jsp" />
+<script type="text/javascript">
+    require("js/userInfo/userInfoDetails.js");
+</script>
+<title>编辑</title>
+</head>                                 
+	<body class="lgraybg">            
+		<div class="	container-fluid animated fadeInRight col-sm-12">
+			<div class="panel-toolbar mt10 mb10 pt5 pb5 pl10 bdd whitebg">
+				<div class="buttons">
+					<a href="javascript:void(0);" class="btn btn-primary fa fa-save f12"><span>保存</span></a>
+					<a href="${ctx }/userInfo?pageIndex=${pageIndex}"  class="btn btn-primary fa fa-back f12" id="goback"><span>返回</span></a>
+				</div>
+			</div>
+				<div class="tabs-container whitebg">
+					<div class="pt10 pl5 pr5">
+						<ul class="nav nav-tabs" id="nav-tabs">
+							<li class="active" data-action="base">   
+								<a href="javascript:void(0);" >基本资料</a>
+							</li>
+							<li class="" data-action="functions">
+								<a href="javascript:void(0);"  >多功能输入</a>
+							</li>
+							<li class="" data-action="extends">
+								<a href="javascript:void(0);" >扩展属性</a>
+							</li>
+						</ul>
+						<div class="tab-content pt30 p30">               
+		
+						</div>     
+					</div>
+				</div>    
+		</div>
+		<!-- 隐藏域 -->
+		<input type="hidden" id="userInfoId" value="${userInfo.id }"/>
+	</body>
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/userInfo/userInfoExtendsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/userInfo/userInfoExtendsInfo.jsp
new file mode 100644
index 0000000..592687a
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/userInfo/userInfoExtendsInfo.jsp
@@ -0,0 +1,201 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>           
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> 
+<div class="tab-pane active">      
+	<div class="animated fadeInRight">
+		<div class="whitebg pl10 pr10">
+			<table class="table table-striped table-bordered table-hover">     
+				<thead> 
+					<tr>  
+						<th class="textc">序号</th>         
+						<th class="textc wp15">流水账号</th>
+						<th class="textc">日期</th>         
+						<th class="textc">财务类别</th>     
+						<th class="textc">金额</th>         
+						<th class="textc">银行</th>         
+						<th class="textc">发票</th>         
+						<th class="textc">客户名称</th>     
+						<th class="textc wp15">单号</th>    
+						<th class="textc">状态</th>         
+						<th class="textc">类别</th>         
+						<th class="textc">操作</th>         
+					</tr> 
+				</thead>
+				<tbody> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+                
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="green">支出</span></td>     
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+				</tbody>
+                
+			</table>  
+			<!-- footer -->  
+			<div class="clearfix mb10 pb20">          
+					<div class="layui-tab-item fr">       
+							<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+							<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>   
+							<div class="pagination dlblock vm" id="pagination"></div>
+							<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>            
+					</div>
+				</div>  
+		</div>      
+	</div>        
+</div>          
+                
+<script type="text/javascript">    
+//分页          
+$('#pagination').pagination({        
+	pageCount: 50,
+	jump: true,   
+	coping: true, 
+	homePage: '首页',    
+	endPage: '末页',     
+	prevContent: '上页', 
+	nextContent: '下页', 
+	callback: function(api) {          
+		$('.now').text(api.getCurrent());
+	}             
+});             
+</script>       
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/userInfo/userInfoFunctionsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/userInfo/userInfoFunctionsInfo.jsp
new file mode 100644
index 0000000..982ce84
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/userInfo/userInfoFunctionsInfo.jsp
@@ -0,0 +1,130 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>		
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">      
+<div class="tab-pane active">
+				<div class="panel-body">
+					<div class="wrapper wrapper-content">     
+						<div class="panel-form animated fadeInRight wp60 fc">
+							<!-- 账号资料 -->
+			<div class="layui-form-item 	has-error">
+				<label class="layui-form-label">单行输入框<i class="red">*</i></label>
+				<div class="layui-input-block">
+					<input type="text" name="title" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input">
+				</div>                                         
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">自定义验证</label>
+				<div class="layui-input-inline ml30">
+					<input type="password" name="password" lay-verify="pass" placeholder="请输入密码" autocomplete="off" class="layui-input">
+				</div>
+				<div class="layui-form-mid layui-word-aux">请填写6到12位密码</div>
+			</div>
+			<div class="form-group">
+				<div class="layui-form-item">          
+					<label class="layui-form-label">单行选择框</label>
+					<div class="layui-input-block">
+						<select name="interest" lay-filter="aihao">  
+							<option value=""></option>
+							<option value="0">写作</option>         
+							<option value="1" selected="">阅读</option>
+							<option value="2">游戏</option>
+							<option value="3">音乐</option>
+							<option value="4">旅行</option>  
+						</select>              
+					</div>
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<div class="layui-inline">  
+					<label class="layui-form-label">范围</label>
+					<div class="layui-input-inline ml30">
+						<input type="text" name="price_min" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>                                     
+					<div class="layui-form-mid">-</div>
+					<div class="layui-input-inline">       
+						<input type="text" name="price_max" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>
+				</div>           
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">联动选择框</label>
+				<div class="layui-input-inline ml30">
+					<select name="quiz1">     
+						<option value="">请选择省</option>
+						<option value="浙江" selected="">浙江省</option> 
+						<option value="你的工号">江西省</option>           
+						<option value="你最喜欢的老师">福建省</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz2">
+						<option value="">请选择市</option>
+						<option value="杭州">杭州</option>
+						<option value="宁波" disabled="">宁波</option>
+						<option value="温州">温州</option>
+						<option value="温州">台州</option>
+						<option value="温州">绍兴</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz3">
+						<option value="">请选择县/区</option>
+						<option value="西湖区">西湖区</option>
+						<option value="余杭区">余杭区</option>
+						<option value="拱墅区">临安市</option>
+					</select>
+				</div>    
+			</div>
+			<div class="layui-form-item" pane="">   
+				<label class="layui-form-label">原始复选框</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="like1[write]" lay-skin="primary" title="写作" checked="">  
+					<input type="checkbox" name="like1[read]" lay-skin="primary" title="阅读">
+					<input type="checkbox" name="like1[game]" lay-skin="primary" title="游戏" disabled="">
+				</div>
+			</div>
+
+			<div class="layui-form-item">
+				<label class="layui-form-label">开关-默认关</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="close" lay-skin="switch" lay-text="ON|OFF">
+				</div>
+			</div>
+			<div class="layui-form-item">  
+				<label class="layui-form-label">单选框</label>
+				<div class="layui-input-block">
+					<input type="radio" name="sex" value="男" title="男" checked="">
+					<input type="radio" name="sex" value="女" title="女">
+					<input type="radio" name="sex" value="禁" title="禁用" disabled="">
+				</div>
+			</div>
+			<!--<div class="layui-form-item layui-form-text">
+				<label class="layui-form-label">上传图片</label>
+				<div class="layui-input-block">
+					<div class="layui-upload-drag w200 h200">
+						<i class="layui-icon"></i>          
+						<p>点击上传</p>
+					</div>
+				</div>
+			</div>-->
+				<div class="layui-form-item layui-form-text">
+					<label class="layui-form-label">普通文本域</label>  
+					<div class="layui-input-block">              
+						<textarea placeholder="请输入内容" class="layui-textarea"></textarea>
+					</div>
+				</div>
+			</div>
+		</div>   
+	</div>
+</div>
+</form>   
+<script type="text/javascript">
+	//form表单样式
+	layui.use(['layer', 'form'], function() {    
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+</script>                 
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/userInfo/userInfoList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/userInfo/userInfoList.jsp
new file mode 100644
index 0000000..a8e88b9
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/auth/userInfo/userInfoList.jsp
@@ -0,0 +1,116 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black">
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->
+<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+<jsp:include page="../../../common.jsp" />
+<script type="text/javascript">
+     require("js/userInfo/userInfoList.js");
+</script>
+
+	<style>
+		.layui-table th {
+			text-align: center;
+		}
+	</style>
+</head>
+<body>
+	<div class="row animated fadeInRight" style="margin: 0;">
+		<div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+			<div class="toolbar-panel bdd">
+				<div class="toolbar-box">
+					<div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+						<!-- 顶部按钮 -->
+						<div class="buttons fl">
+							<a class="layui-btn layui-btn-sm fa fa-search f13" href="javascript:void(0);" onclick="queryUserInfo()"><span>搜索</span></a>
+							<!-- <a class="btn btn-primary fa fa-plus f13 add" href="javascript:void(0);" onclick="initAddUserInfo()"><span>添加</span></a> -->
+							<a class="layui-btn layui-btn-sm layui-btn-danger fa fa-remove f13 delete" href="javascript:void(0);" onclick="initBatchDeleteUserInfo()"><span>删除</span></a>
+						</div>
+						<div class="tools fr">
+							<a href="javascript:void(0);" class="collapse dblock f14 dgray mr5"> 
+								<i class="fa-2x fa fa-angle-double-up"></i>
+							</a>
+						</div>
+					</div>
+				</div>
+
+				<!--搜索条件 -->
+				<div class="toolbar-body">
+					<div class="row pt10 pb10 whitebg ml0 mr0">
+						<span class="dlblock w100 textr">登录名：</span> 
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+							<input type="text" placeholder="请输入名称" name="loginName" id="loginName">
+						</span> 
+						<!-- <span class="dlblock w100 textr">类别：</span>
+						 <select class="form-control f12 w180 textc">
+							<option value="">支出</option>
+							<option value="">收入</option>
+						</select> -->
+					</div>
+					<!-- <div class="mt10 mb20">
+						<span class="dlblock w100 textr">开始日期</span>
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+							 <input type="text" placeholder="" id="date1" class="w150">
+							 <i class="fa fa-calendar"></i>
+						</span> 
+						<span class="dlblock w100 textr">结束日期</span>
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+						<input type="text" placeholder="" id="date2" class="w150"> 
+							<i class="fa fa-calendar"></i>
+						</span>
+					</div> -->
+				</div>
+			</div>
+		</div>
+		<!-- 表单数据 -->
+		<div class="mb20 mt10">
+			<div class="whitebg pl10 pr10">
+				<table class="layui-table">
+					<thead>
+						<tr>
+							<th class="textc">
+								<div class="checker" id="allCheck">
+									<span class=""><input type="checkbox" value="" ></span>
+								</div>
+							</th>
+						<th class="textc ">id</th>
+                        <th class="textc ">登录名</th>
+                        <th class="textc ">真实姓名</th>
+                       <!--  <th class="textc ">状态</th> -->
+                       <!--  <th class="textc ">创建人</th>
+                        <th class="textc ">修改人</th> -->
+                        <th class="textc ">编辑</th>
+						</tr>
+					</thead>
+					<!-- 数据体 -->
+					<tbody id="data_content">
+					</tbody>
+				</table>
+			
+			<!-- footer -->
+				<div class="clearfix mb10 pb20">
+						<div class="layui-tab-item fr">
+								<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+								<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>
+								<div class="pagination dlblock vm" id="pagination"></div>
+								<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>
+						</div>
+					</div>
+	
+			</div>
+		</div>
+	</div>
+</body>
+
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/banner/bannerBaseInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/banner/bannerBaseInfo.jsp
new file mode 100644
index 0000000..26936ba
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/banner/bannerBaseInfo.jsp
@@ -0,0 +1,167 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<html>
+<head>
+	<meta charset="utf-8">
+	<meta http-equiv="X-UA-Compatible" content="IE=edge">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<meta name="format-detection" content="telephone=no">
+	<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+	<meta name="renderer" content="webkit">
+	<!-- 移动设备 viewport -->
+	<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+	<jsp:include page="../../common.jsp"/>
+	<style>
+		.layui-input,.layui-textarea{
+			border-color:#606060;
+		}
+	</style>
+</head>
+<body>
+<form class="layui-form" action="" style="width: 70%">
+	<input name="id" value="${banner.id}" hidden/>
+	<input name="picUrl" value="${banner.picUrl}" hidden />
+
+	<div class="layui-form-item">
+		<label class="layui-form-label">排序</label>
+		<div class="layui-input-block" style="margin-left:0px">
+			<div class="layui-input-block">
+				<input name="seq" value="${banner.seq}" placeholder="请输入描述" class="layui-input"/>
+			</div>
+		</div>
+	</div>
+
+	<div class="layui-form-item">
+		<label class="layui-form-label">跳转地址</label>
+		<div class="layui-input-block" style="margin-left:0px">
+			<div class="layui-input-block">
+				<input name="jumpUrl" value="${banner.jumpUrl}" placeholder="请输入类型" class="layui-input"/>
+			</div>
+		</div>
+	</div>
+
+	<div class="layui-form-item">
+		<label class="layui-form-label">图片类型</label>
+		<div class="layui-input-block" style="margin-left:0px">
+			<div class="layui-input-block">
+<%--				<input name="type" value="${banner.type}" placeholder="请输入类型" class="layui-input"/>--%>
+				<select name="type" id="adTypeCode" class="layui-input">
+					<option value="01" <c:if test='${"01" eq banner.type }'>selected="selected"</c:if>>主页</option>
+					<option value="02" <c:if test='${"02" eq banner.type }'>selected="selected"</c:if>>推广页</option>
+					<option value="03" <c:if test='${"03" eq banner.type }'>selected="selected"</c:if>>插件</option>
+				</select>
+			</div>
+		</div>
+	</div>
+
+	<div class="layui-form-item">
+		<label class="layui-form-label">上传图片</label>
+		<div class="layui-input-block" style="display: flex;justify-content: flex-start">
+			<input name="fileKey" id="fileKey" hidden/>
+			<input type="hidden" name="picUrl" value="${banner.picUrl}" id="url"/>
+			<input name="fileName" id="fileName" class="layui-input layui-col-xs6 layui-disabled" disabled/>
+		</div>
+		<div class="layui-input-block" style="display: flex;justify-content: flex-start ; margin-top: 5px">
+			<button type="button" class="layui-btn layui-btn layui-btn-normal  layui-col-xs3"  onclick="$('#file').click();">
+				浏览...
+			</button>
+			<button type="button" class="layui-btn layui-btn-normal layui-col-xs3"  id="uploadParam">
+				上传
+			</button>
+		</div>
+	</div>
+
+	<div class="layui-form-item">
+		<div class="layui-input-block">
+			<button class="layui-btn" lay-submit lay-filter="formDemo">立即提交</button>
+			<button type="button" id="close" class="layui-btn layui-btn-primary">关闭</button>
+		</div>
+	</div>
+</form>
+
+<form id="ajaxForm" class="layui-form" style="width: 70%" >
+	<input type="hidden" name="OSSAccessKeyId" id="accessid" value="${uploadParam.accessid}">
+	<input type="hidden" name="policy" id="policy" value="${uploadParam.policy}">
+	<input type="hidden" name="signature" id="signature" value="${uploadParam.signature}">
+	<input type="hidden" name="expire" id="expire" value="${uploadParam.expire}">
+	<input type="hidden" name="success_action_status" id="success_action_status" value="200">
+	<input type="hidden" name="key" id="key" value="${uploadParam.key}">
+	<input type="hidden" name="callBack" id="key2_callBack" value="${uploadParam.callBack}">
+	<input type="file" style="display: none" name="file" id="file" onchange="document.getElementById('fileName').value=this.files[0].name">
+</form>
+
+<script type="text/javascript">
+	layui.use(['form', 'upload','layer'], function(){
+		var form = layui.form;
+		var upload = layui.upload;
+		var layer = layui.layer;
+
+		$('#close').click(function() {
+			parent.layer.closeAll();
+		});
+
+		var data;
+		$("#uploadParam").click(function () {
+			var fileName = $("#fileName").val();
+			if(!fileName){
+				layer.msg("请先选择文件！");
+				return;
+			}
+			var suffix = fileName.substring(fileName.lastIndexOf('.') + 1, fileName.length); //
+			var key = '${uploadParam.key}'+"."+suffix;
+			$("#key").val(key);
+			$("#fileKey").val(key);
+			var index = layer.load(1,{shade: [0.1,'#000'] });
+			$.ajax({
+				url: '${uploadParam.host}',
+				method: 'post',
+				data: new FormData($('#ajaxForm')[0]),
+				dataType:'json',
+				processData: false,
+				contentType: false,
+				success: function(res) {
+					layer.close(index);
+					if (res.code == 200){
+						layer.msg("上传成功！")
+						$("#url").val(res.url);
+					}else{
+						layer.msg("上传失败！")
+					}
+				},
+				error: function (errorMsg) {
+					layer.close(index);
+					layer.msg("上传出错！")
+				}
+			})
+		})
+
+		//监听提交
+		form.on('submit(formDemo)', function(data){
+			var index = layer.load(1,{shade: [0.1,'#000'] });
+			$.ajax({
+				url: '${ctx}/banner/saveOrUpdate',
+				method: 'post',
+				data: JSON.stringify(data.field),
+				dataType: 'JSON',
+				contentType:"application/json",
+				success: function(res) {
+					layer.close(index);
+					if(res.code == 200) {
+						layer.alert(res.data,function(){
+							parent.location.reload();
+						})
+					} else {
+						layer.msg(res.message, {
+							icon: 5
+						});
+					}
+				}
+			})
+			return false;
+		});
+	});
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/banner/bannerExtendsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/banner/bannerExtendsInfo.jsp
new file mode 100644
index 0000000..592687a
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/banner/bannerExtendsInfo.jsp
@@ -0,0 +1,201 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>           
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> 
+<div class="tab-pane active">      
+	<div class="animated fadeInRight">
+		<div class="whitebg pl10 pr10">
+			<table class="table table-striped table-bordered table-hover">     
+				<thead> 
+					<tr>  
+						<th class="textc">序号</th>         
+						<th class="textc wp15">流水账号</th>
+						<th class="textc">日期</th>         
+						<th class="textc">财务类别</th>     
+						<th class="textc">金额</th>         
+						<th class="textc">银行</th>         
+						<th class="textc">发票</th>         
+						<th class="textc">客户名称</th>     
+						<th class="textc wp15">单号</th>    
+						<th class="textc">状态</th>         
+						<th class="textc">类别</th>         
+						<th class="textc">操作</th>         
+					</tr> 
+				</thead>
+				<tbody> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+                
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="green">支出</span></td>     
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+				</tbody>
+                
+			</table>  
+			<!-- footer -->  
+			<div class="clearfix mb10 pb20">          
+					<div class="layui-tab-item fr">       
+							<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+							<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>   
+							<div class="pagination dlblock vm" id="pagination"></div>
+							<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>            
+					</div>
+				</div>  
+		</div>      
+	</div>        
+</div>          
+                
+<script type="text/javascript">    
+//分页          
+$('#pagination').pagination({        
+	pageCount: 50,
+	jump: true,   
+	coping: true, 
+	homePage: '首页',    
+	endPage: '末页',     
+	prevContent: '上页', 
+	nextContent: '下页', 
+	callback: function(api) {          
+		$('.now').text(api.getCurrent());
+	}             
+});             
+</script>       
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/banner/bannerFunctionsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/banner/bannerFunctionsInfo.jsp
new file mode 100644
index 0000000..982ce84
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/banner/bannerFunctionsInfo.jsp
@@ -0,0 +1,130 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>		
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">      
+<div class="tab-pane active">
+				<div class="panel-body">
+					<div class="wrapper wrapper-content">     
+						<div class="panel-form animated fadeInRight wp60 fc">
+							<!-- 账号资料 -->
+			<div class="layui-form-item 	has-error">
+				<label class="layui-form-label">单行输入框<i class="red">*</i></label>
+				<div class="layui-input-block">
+					<input type="text" name="title" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input">
+				</div>                                         
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">自定义验证</label>
+				<div class="layui-input-inline ml30">
+					<input type="password" name="password" lay-verify="pass" placeholder="请输入密码" autocomplete="off" class="layui-input">
+				</div>
+				<div class="layui-form-mid layui-word-aux">请填写6到12位密码</div>
+			</div>
+			<div class="form-group">
+				<div class="layui-form-item">          
+					<label class="layui-form-label">单行选择框</label>
+					<div class="layui-input-block">
+						<select name="interest" lay-filter="aihao">  
+							<option value=""></option>
+							<option value="0">写作</option>         
+							<option value="1" selected="">阅读</option>
+							<option value="2">游戏</option>
+							<option value="3">音乐</option>
+							<option value="4">旅行</option>  
+						</select>              
+					</div>
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<div class="layui-inline">  
+					<label class="layui-form-label">范围</label>
+					<div class="layui-input-inline ml30">
+						<input type="text" name="price_min" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>                                     
+					<div class="layui-form-mid">-</div>
+					<div class="layui-input-inline">       
+						<input type="text" name="price_max" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>
+				</div>           
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">联动选择框</label>
+				<div class="layui-input-inline ml30">
+					<select name="quiz1">     
+						<option value="">请选择省</option>
+						<option value="浙江" selected="">浙江省</option> 
+						<option value="你的工号">江西省</option>           
+						<option value="你最喜欢的老师">福建省</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz2">
+						<option value="">请选择市</option>
+						<option value="杭州">杭州</option>
+						<option value="宁波" disabled="">宁波</option>
+						<option value="温州">温州</option>
+						<option value="温州">台州</option>
+						<option value="温州">绍兴</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz3">
+						<option value="">请选择县/区</option>
+						<option value="西湖区">西湖区</option>
+						<option value="余杭区">余杭区</option>
+						<option value="拱墅区">临安市</option>
+					</select>
+				</div>    
+			</div>
+			<div class="layui-form-item" pane="">   
+				<label class="layui-form-label">原始复选框</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="like1[write]" lay-skin="primary" title="写作" checked="">  
+					<input type="checkbox" name="like1[read]" lay-skin="primary" title="阅读">
+					<input type="checkbox" name="like1[game]" lay-skin="primary" title="游戏" disabled="">
+				</div>
+			</div>
+
+			<div class="layui-form-item">
+				<label class="layui-form-label">开关-默认关</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="close" lay-skin="switch" lay-text="ON|OFF">
+				</div>
+			</div>
+			<div class="layui-form-item">  
+				<label class="layui-form-label">单选框</label>
+				<div class="layui-input-block">
+					<input type="radio" name="sex" value="男" title="男" checked="">
+					<input type="radio" name="sex" value="女" title="女">
+					<input type="radio" name="sex" value="禁" title="禁用" disabled="">
+				</div>
+			</div>
+			<!--<div class="layui-form-item layui-form-text">
+				<label class="layui-form-label">上传图片</label>
+				<div class="layui-input-block">
+					<div class="layui-upload-drag w200 h200">
+						<i class="layui-icon"></i>          
+						<p>点击上传</p>
+					</div>
+				</div>
+			</div>-->
+				<div class="layui-form-item layui-form-text">
+					<label class="layui-form-label">普通文本域</label>  
+					<div class="layui-input-block">              
+						<textarea placeholder="请输入内容" class="layui-textarea"></textarea>
+					</div>
+				</div>
+			</div>
+		</div>   
+	</div>
+</div>
+</form>   
+<script type="text/javascript">
+	//form表单样式
+	layui.use(['layer', 'form'], function() {    
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+</script>                 
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/banner/bannerList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/banner/bannerList.jsp
new file mode 100644
index 0000000..4449e91
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/banner/bannerList.jsp
@@ -0,0 +1,213 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black">
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->
+<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+<jsp:include page="../../common.jsp" />
+</head>
+<body>
+<table class="layui-hide" id="bannerTab" lay-filter="bannerTab"></table>
+
+<script type="text/html" id="toolbarDemo">
+	<div class="layui-btn-container">
+		<button class="layui-btn layui-btn-sm" lay-event="add">添加</button>
+		<button class="layui-btn layui-btn-sm" lay-event="search">查询</button>
+	</div>
+</script>
+
+<script type="text/html" id="barDemo">
+	<a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>
+	<a class="layui-btn layui-btn-xs" lay-event="statusUpdate">状态</a>
+	<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
+
+</script>
+
+<script type="text/html" id="imgtmp">
+	<img src="{{d.picUrl}}">
+</script>
+
+<script type="text/html" id="type">
+	{{#  if(d.type == '01' ){ }}
+	<span>主页</span>
+	{{# } else if (d.type == "02") { }}
+	<span>推广页</span>
+	{{#} else { }}
+	<span>插件</span>
+	{{#} }}
+</script>
+
+<script type="text/html" id="statu">
+	{{#  if(d.status == 0 ){ }}
+	<span class="layui-badge ">不显示</span>
+	{{#} else { }}
+	<span class="layui-badge layui-bg-green">显示</span>
+	{{#} }}
+</script>
+
+<style type="text/css">
+	.layui-table-cell{
+		height:auto!important;
+		white-space:normal;
+	}
+</style>
+
+<script>
+	layui.use(['table', 'layer'], function(){
+		var table = layui.table;
+		var layer = layui.layer;
+
+		var tableIns = table.render({
+			elem: '#bannerTab'
+			,url:'${ctx}/banner/page'
+			,response: {
+				statusName: 'code' //数据状态的字段名称，默认：code
+				,countName: 'count' //数据总数的字段名称，默认：count
+				,dataName: 'data' //默数据列表的字段名称，认：data
+				,statusCode : 200
+			}
+			,parseData: function(res){ //res 即为原始返回的数据
+				return {
+					"code": res.code, //解析接口状态
+					"msg": res.message, //解析提示文本
+					"count": res.data.count, //解析数据长度
+					"data": res.data.data //解析数据列表
+				};
+			}
+			,toolbar: '#toolbarDemo' //开启头部工具栏，并为其绑定左侧模板
+			,defaultToolbar: ['filter', 'exports', 'print', { //自定义头部工具栏右侧图标。如无需自定义，去除该参数即可
+				title: '提示'
+				,layEvent: 'LAYTABLE_TIPS'
+				,icon: 'layui-icon-tips'
+			}]
+			,title: '轮播管理数据表'
+			,cols: [[
+				{type: 'checkbox',hidden: true}
+				,{field:'numbers', title:'序号',unresize: true,type:'numbers'}
+				,{field:'id', title:'ID',unresize: true, sort: true}
+				,{field:'picUrl', title:'缩略图',templet:"#imgtmp"}
+				,{field:'seq', title:'排序', sort: true}
+				,{field:'jumpUrl', title:'跳转路径'}
+				,{field:'type', title:'导航选择',templet:"#type"}
+				,{field:'status', title:'状态',templet:'#statu'}
+				,{fixed: 'right', title:'操作', toolbar: '#barDemo'}
+			]]
+			,request: {
+				pageName: 'current' //页码的参数名称，默认：page
+				,limitName: 'size' //每页数据量的参数名，默认：limit
+			}
+			,page: true
+			,done: function () {
+				$("[data-field='forceUpdate']").children().each(function () {
+					if ($(this).text() == '0') {
+						$(this).text('否');
+					} else if ($(this).text() == '1') {
+						$(this).text('是');
+					}
+				});
+			}
+		});
+
+		//头工具栏事件
+		table.on('toolbar(bannerTab)', function(obj){
+			switch(obj.event){
+				case 'add':
+					// 添加
+					toAdd();
+					break;
+				case 'search':
+					// 查询
+					tableIns.reload();
+					break;
+			}
+		});
+
+		//监听行工具事件
+		table.on('tool(bannerTab)', function(obj){
+			var data = obj.data;
+			//console.log(obj)
+			if(obj.event === 'del'){
+				layer.confirm('真的删除行么?', function(index){
+					obj.del(data);
+					layer.close(index);
+					del(obj);
+				});
+			} else if(obj.event === 'edit'){
+				toAdd(obj.data);
+			} else if(obj.event === 'statusUpdate'){
+				layer.confirm('确定更改已选状态吗?',function (index) {
+					layer.close(index);
+					statusUpdate(obj);
+				});
+			}
+		});
+
+		function toAdd(obj) {
+			var url = '${ctx}/banner/add';
+			if(obj != undefined){
+				url = "${ctx}/banner/edit/"+obj.id
+			}
+			var index = layer.open({
+				type: 2
+				,shade: 0.5
+				,maxmin: true
+				, content: url
+				, area: ['550px', '500px']
+			});
+		}
+
+		function statusUpdate(obj) {
+			$.ajax({
+				url: '${ctx}/banner/statusUpdate',
+				method: 'post',
+				data: JSON.stringify(obj.data),
+				dataType: 'JSON',
+				contentType:"application/json",
+				success: function(res) {
+					if(res.code == 200) {
+						layer.msg(res.data, {
+							icon: 1,
+						});
+					} else {
+						layer.msg(res.data, {
+							icon: 5
+						});
+					}
+				}
+			})
+		}
+
+		function del(obj) {
+			$.ajax({
+				url: '${ctx}/banner/delete',
+				method: 'post',
+				data: JSON.stringify(obj.data),
+				dataType: 'JSON',
+				contentType:"application/json",
+				success: function(res) {
+					if(res.code == 200) {
+						layer.msg(res.data, {
+							icon: 1
+						});
+					} else {
+						layer.msg(res.data, {
+							icon: 5
+						});
+					}
+				}
+			})
+		}
+	});
+</script>
+</body>
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/bestNewActivity/bestNewActivityBaseInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/bestNewActivity/bestNewActivityBaseInfo.jsp
new file mode 100644
index 0000000..7e3b400
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/bestNewActivity/bestNewActivityBaseInfo.jsp
@@ -0,0 +1,341 @@
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>\
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+    <link rel="stylesheet" type="text/css" href="${ctx}/page/umeditor/themes/default/css/umeditor.css">
+    <script type="text/javascript" src="${ctx}/page/umeditor/third-party/template.min.js"></script>
+    <script type="text/javascript" src="${ctx}/page/umeditor/umeditor.config.js"></script>
+    <script type="text/javascript" src="${ctx}/page/umeditor/umeditor.min.js"></script>
+    <script type="text/javascript" src="${ctx}/page/umeditor/lang/zh-cn/zh-cn.js"></script>
+    <script type="text/javascript">
+        window.UMEDITOR_HOME_URL = ctx + "/page/umeditor/";
+        var URL = window.UEDITOR_HOME_URL;
+    </script>
+    <style>
+        .layui-input, .layui-textarea {
+            border-color: #606060;
+        }
+        .layui-form-selectup {
+            z-index: 899999;
+        }
+    </style>
+</head>
+<body>
+<form class="layui-form" action="" style="width: 80%; margin-top: 20px">
+    <input name="id" value="${entity.id}" hidden/>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">标题</label>
+        <div class="layui-input-block" style="margin-left:0">
+            <div class="layui-input-block">
+                <input name="title" value="${entity.title}" placeholder="请输入标题" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">简介</label>
+        <div class="layui-input-block" style="margin-left:0">
+            <div class="layui-input-block">
+                <input name="desc" value="${entity.desc}" maxlength="50" placeholder="请输入简介" class="layui-input" lay-verify="required"  lay-reqText="请输入简介"/>
+            </div>
+        </div>
+    </div>
+
+    <input name="imgs" value="${entity.imgs}" style="display: none"/>
+    <div class="layui-form-item">
+        <label class="layui-form-label">封面配图</label>
+        <div class="layui-input-block">
+            <button id="uploadIcon" type="button" class="layui-btn">选择配图</button>
+        </div>
+    </div>
+
+    <div id="iconDiv" class="layui-form-item" style="display: ${empty entity.imgs ? 'none' : 'black'}">
+        <div class="layui-input-block">
+            <img id="iconImg" src="${entity.imgs}" alt="" height="50px" width="50px"/>
+        </div>
+    </div>
+
+    <c:set value="${fn:split(entity.type, ',') }" var="typeArray" />
+    <div class="layui-form-item">
+        <label class="layui-form-label">类别</label>
+        <div class="layui-input-block">
+            <input type="checkbox" name="type" value="1" title="商户攻略"
+            <c:forEach items="${typeArray}" var="item">
+            <c:if test="${item == '1'}">
+                   checked="true"
+            </c:if>
+            </c:forEach>
+            >
+            <input type="checkbox" name="type" value="4" title="服务商攻略"
+            <c:forEach items="${typeArray}" var="item">
+            <c:if test="${item == '4'}">
+                   checked="true"
+            </c:if>
+            </c:forEach>
+            >
+            <input type="checkbox" name="type" value="2" title="资讯"
+            <c:forEach items="${typeArray}" var="item">
+            <c:if test="${item == '2'}">
+                   checked="true"
+            </c:if>
+            </c:forEach>
+            >
+            <input type="checkbox" name="type" value="3" title="活动"
+            <c:forEach items="${typeArray}" var="item">
+            <c:if test="${item == '3'}">
+                   checked="true"
+            </c:if>
+            </c:forEach>
+            >
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">排序</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="seq" value="${entity.seq}" placeholder="请输入序号" type="number" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item layui-form-text">
+        <label class="layui-form-label">内容链接</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block" style="width: 975px">
+                <input placeholder="内容链接" value="${entity.url}" id="url" name="url" lay-verify="url"  class="layui-input" />
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item layui-form-text">
+        <label class="layui-form-label">内容</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block" style="width: 975px">
+                <textarea placeholder="请输入内容" id="content" name="content" lay-verify="content"  class="layui-textarea">${entity.content}</textarea>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">显示状态</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <select id="status" name="status">
+                    <option value="">请选择</option>
+                    <option value="0" <c:if test="${entity.status == 0}">selected</c:if>>显示</option>
+                    <option value="1" <c:if test="${entity.status == 1}">selected</c:if>>不显示</option>
+                </select>
+            </div>
+        </div>
+    </div>
+
+    <c:if test="${empty entity.id}">
+        <div class="layui-form-item">
+            <label class="layui-form-label">是否推送全部</label>
+            <div class="layui-input-block" style="margin-left:0px">
+                <div class="layui-input-block">
+                    <select id="pushType" name="pushType">
+                        <option value="0">请选择</option>
+                        <option value="1">是</option>
+                    </select>
+                </div>
+            </div>
+        </div>
+    </c:if>
+
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button class="layui-btn" lay-submit lay-filter="formDemo">立即提交</button>
+            <button type="button" id="close" class="layui-btn layui-btn-primary">关闭</button>
+        </div>
+    </div>
+</form>
+
+<script>
+    //Demo
+    layui.use(['form','layer', 'upload'], function () {
+        var form = layui.form;
+        var layer = layui.layer;
+        var upload = layui.upload;
+        var um = UM.getEditor('content');
+
+        $('#close').click(function () {
+            parent.layer.closeAll();
+        });
+
+        //监听提交
+        form.on('submit(formDemo)', function (data) {
+            let params  = data.field;
+            let checkIds = $("input[name='type']:checked");
+            let type = null;
+            if (checkIds.length > 0) {
+                type = "";
+                checkIds.each(function() {
+                    type = type + $(this).val() + ",";
+                })
+                type = type.substring(0, type.length - 1)
+                params.type = type
+            }
+            console.log("type : " + params.type)
+            params.content = um.getContent();
+            var index = layer.load(1, {shade: [0.1, '#000']});
+            $.ajax({
+                url: '${ctx}/bestNewActivity/saveOrUpdate',
+                method: 'post',
+                data: JSON.stringify(params),
+                dataType: 'json',
+                contentType: "application/json",
+                success: function (res) {
+                    layer.close(index);
+                    if (res.code == 200) {
+                        layer.alert(res.message, function () {
+                            parent.location.reload();
+                        })
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 5
+                        });
+                    }
+                }
+            })
+            return false;
+        });
+
+        <%--upload.render({--%>
+        <%--    elem: '#uploadIcon', // 文件选择--%>
+        <%--    // accept:'apk',--%>
+        <%--    url: '${uploadParam.host}',--%>
+        <%--    exts: 'png|jpg|jpeg|bmp',--%>
+        <%--    method:'POST',--%>
+        <%--    auto: true,--%>
+        <%--    before: function(){--%>
+        <%--        this.data.OSSAccessKeyId = $('#accessid').val();--%>
+        <%--        this.data.policy = $('#policy').val();--%>
+        <%--        this.data.signature = $('#signature').val();--%>
+        <%--        this.data.expire = $('#expire').val();--%>
+        <%--        this.data.success_action_status = $('#success_action_status').val();--%>
+        <%--        this.data.callBack = $("#key2_callBack").val();--%>
+        <%--        this.data.key = $("#key").val();--%>
+
+        <%--        element.progress('js_upload_progress', '0%');//设置页面进度条--%>
+        <%--        openIndex = layer.open({--%>
+        <%--            type: 1,--%>
+        <%--            title: '上传进度',--%>
+        <%--            closeBtn: 1, //不显示关闭按钮--%>
+        <%--            area: ['300px', '130px'],--%>
+        <%--            shadeClose: false, //开启遮罩关闭--%>
+        <%--            content: $("#uploadLoadingDiv").html(),--%>
+        <%--            offset: '100px'--%>
+        <%--        });--%>
+        <%--    }--%>
+        <%--    ,xhr: xhrOnProgress--%>
+        <%--    ,progress:function(value){//上传进度回调 value进度值--%>
+        <%--        element.progress('js_upload_progress', value+'%');//设置页面进度条--%>
+        <%--    }--%>
+        <%--    ,choose: function(obj) {--%>
+        <%--        var loading = layer.load(1,{shade: [0.1,'#000'] });--%>
+        <%--        obj.preview(function(index, file, result) {--%>
+        <%--            var fileName = file.name;--%>
+        <%--            var suffix = fileName.substring(fileName.lastIndexOf('.') + 1, fileName.length);--%>
+        <%--            var key = '${uploadParam.key}'+"."+suffix;--%>
+        <%--            $("#key").val(key);--%>
+        <%--            $("#fileKey").val(key);--%>
+        <%--            layer.close(loading);--%>
+        <%--        });--%>
+        <%--    },--%>
+        <%--    done: function(res) {--%>
+        <%--        layer.close(openIndex);--%>
+        <%--        if (res.code == 200){--%>
+        <%--            layer.msg("上传成功！")--%>
+        <%--            $("#iconDiv").show();--%>
+        <%--            $("#iconImg").attr("src", res.url);--%>
+        <%--            $("input[name='icon']").val(res.url);--%>
+        <%--            // parent.layer.style(layerIndex, {--%>
+        <%--            //     width: '550px',--%>
+        <%--            //     height: '510px'--%>
+        <%--            // });--%>
+        <%--        }else{--%>
+        <%--            layer.msg("上传失败！")--%>
+        <%--        }--%>
+        <%--    },--%>
+        <%--    error: function(res) {--%>
+        <%--        layer.close(openIndex);--%>
+        <%--        layer.msg(res.msg);--%>
+        <%--    }--%>
+        <%--});--%>
+
+        var xhrOnProgress = function (fun) {
+            xhrOnProgress.onprogress = fun; //绑定监听
+            //使用闭包实现监听绑定
+            return function () {
+                //通过$.ajaxSettings.xhr();获得XMLHttpRequest对象
+                var xhr = $.ajaxSettings.xhr();
+                //判断监听函数是否为函数
+                if (typeof xhrOnProgress.onprogress !== 'function') {
+                    return xhr;
+                }
+                //如果有监听函数并且xhr对象支持绑定时就把监听函数绑定上去
+                if (xhrOnProgress.onprogress && xhr.upload) {
+                    xhr.upload.onprogress = xhrOnProgress.onprogress;
+                }
+                return xhr;
+            }
+        }
+
+        upload.render({
+            elem: '#uploadIcon', // 文件选择
+            url: ctx + '/upload/ossUploadFile',
+            exts: 'jpg|png|gif|bmp|jpeg',
+            method: 'POST',
+            auto: true,
+            before: function () {
+
+                openIndex = layer.open({
+                    type: 1,
+                    title: '上传进度',
+                    closeBtn: 1, //不显示关闭按钮
+                    area: ['300px', '130px'],
+                    shadeClose: false, //开启遮罩关闭
+                    content: $("#uploadLoadingDiv").html(),
+                    offset: '100px'
+                });
+            }
+            , xhr: xhrOnProgress
+            , progress: function (value) {//上传进度回调 value进度值
+                element.progress('js_upload_progress', value + '%');//设置页面进度条
+            }
+            , done: function (res) {
+                layer.close(openIndex);
+                if (res.code == 200) {
+                    layer.msg("上传成功！")
+                    $("#iconDiv").show();
+                    $("#iconImg").attr("src", res.url);
+                    $("input[name='imgs']").val(res.url);
+                } else {
+                    layer.msg("上传失败！");
+                }
+            }
+            , error: function (res) {
+                layer.close(openIndex);
+                layer.msg(res.msg);
+            }
+        });
+    });
+
+
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/bestNewActivity/bestNewActivityExtendsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/bestNewActivity/bestNewActivityExtendsInfo.jsp
new file mode 100644
index 0000000..592687a
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/bestNewActivity/bestNewActivityExtendsInfo.jsp
@@ -0,0 +1,201 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>           
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> 
+<div class="tab-pane active">      
+	<div class="animated fadeInRight">
+		<div class="whitebg pl10 pr10">
+			<table class="table table-striped table-bordered table-hover">     
+				<thead> 
+					<tr>  
+						<th class="textc">序号</th>         
+						<th class="textc wp15">流水账号</th>
+						<th class="textc">日期</th>         
+						<th class="textc">财务类别</th>     
+						<th class="textc">金额</th>         
+						<th class="textc">银行</th>         
+						<th class="textc">发票</th>         
+						<th class="textc">客户名称</th>     
+						<th class="textc wp15">单号</th>    
+						<th class="textc">状态</th>         
+						<th class="textc">类别</th>         
+						<th class="textc">操作</th>         
+					</tr> 
+				</thead>
+				<tbody> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+                
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="green">支出</span></td>     
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+				</tbody>
+                
+			</table>  
+			<!-- footer -->  
+			<div class="clearfix mb10 pb20">          
+					<div class="layui-tab-item fr">       
+							<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+							<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>   
+							<div class="pagination dlblock vm" id="pagination"></div>
+							<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>            
+					</div>
+				</div>  
+		</div>      
+	</div>        
+</div>          
+                
+<script type="text/javascript">    
+//分页          
+$('#pagination').pagination({        
+	pageCount: 50,
+	jump: true,   
+	coping: true, 
+	homePage: '首页',    
+	endPage: '末页',     
+	prevContent: '上页', 
+	nextContent: '下页', 
+	callback: function(api) {          
+		$('.now').text(api.getCurrent());
+	}             
+});             
+</script>       
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/bestNewActivity/bestNewActivityFunctionsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/bestNewActivity/bestNewActivityFunctionsInfo.jsp
new file mode 100644
index 0000000..982ce84
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/bestNewActivity/bestNewActivityFunctionsInfo.jsp
@@ -0,0 +1,130 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>		
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">      
+<div class="tab-pane active">
+				<div class="panel-body">
+					<div class="wrapper wrapper-content">     
+						<div class="panel-form animated fadeInRight wp60 fc">
+							<!-- 账号资料 -->
+			<div class="layui-form-item 	has-error">
+				<label class="layui-form-label">单行输入框<i class="red">*</i></label>
+				<div class="layui-input-block">
+					<input type="text" name="title" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input">
+				</div>                                         
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">自定义验证</label>
+				<div class="layui-input-inline ml30">
+					<input type="password" name="password" lay-verify="pass" placeholder="请输入密码" autocomplete="off" class="layui-input">
+				</div>
+				<div class="layui-form-mid layui-word-aux">请填写6到12位密码</div>
+			</div>
+			<div class="form-group">
+				<div class="layui-form-item">          
+					<label class="layui-form-label">单行选择框</label>
+					<div class="layui-input-block">
+						<select name="interest" lay-filter="aihao">  
+							<option value=""></option>
+							<option value="0">写作</option>         
+							<option value="1" selected="">阅读</option>
+							<option value="2">游戏</option>
+							<option value="3">音乐</option>
+							<option value="4">旅行</option>  
+						</select>              
+					</div>
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<div class="layui-inline">  
+					<label class="layui-form-label">范围</label>
+					<div class="layui-input-inline ml30">
+						<input type="text" name="price_min" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>                                     
+					<div class="layui-form-mid">-</div>
+					<div class="layui-input-inline">       
+						<input type="text" name="price_max" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>
+				</div>           
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">联动选择框</label>
+				<div class="layui-input-inline ml30">
+					<select name="quiz1">     
+						<option value="">请选择省</option>
+						<option value="浙江" selected="">浙江省</option> 
+						<option value="你的工号">江西省</option>           
+						<option value="你最喜欢的老师">福建省</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz2">
+						<option value="">请选择市</option>
+						<option value="杭州">杭州</option>
+						<option value="宁波" disabled="">宁波</option>
+						<option value="温州">温州</option>
+						<option value="温州">台州</option>
+						<option value="温州">绍兴</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz3">
+						<option value="">请选择县/区</option>
+						<option value="西湖区">西湖区</option>
+						<option value="余杭区">余杭区</option>
+						<option value="拱墅区">临安市</option>
+					</select>
+				</div>    
+			</div>
+			<div class="layui-form-item" pane="">   
+				<label class="layui-form-label">原始复选框</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="like1[write]" lay-skin="primary" title="写作" checked="">  
+					<input type="checkbox" name="like1[read]" lay-skin="primary" title="阅读">
+					<input type="checkbox" name="like1[game]" lay-skin="primary" title="游戏" disabled="">
+				</div>
+			</div>
+
+			<div class="layui-form-item">
+				<label class="layui-form-label">开关-默认关</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="close" lay-skin="switch" lay-text="ON|OFF">
+				</div>
+			</div>
+			<div class="layui-form-item">  
+				<label class="layui-form-label">单选框</label>
+				<div class="layui-input-block">
+					<input type="radio" name="sex" value="男" title="男" checked="">
+					<input type="radio" name="sex" value="女" title="女">
+					<input type="radio" name="sex" value="禁" title="禁用" disabled="">
+				</div>
+			</div>
+			<!--<div class="layui-form-item layui-form-text">
+				<label class="layui-form-label">上传图片</label>
+				<div class="layui-input-block">
+					<div class="layui-upload-drag w200 h200">
+						<i class="layui-icon"></i>          
+						<p>点击上传</p>
+					</div>
+				</div>
+			</div>-->
+				<div class="layui-form-item layui-form-text">
+					<label class="layui-form-label">普通文本域</label>  
+					<div class="layui-input-block">              
+						<textarea placeholder="请输入内容" class="layui-textarea"></textarea>
+					</div>
+				</div>
+			</div>
+		</div>   
+	</div>
+</div>
+</form>   
+<script type="text/javascript">
+	//form表单样式
+	layui.use(['layer', 'form'], function() {    
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+</script>                 
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/bestNewActivity/bestNewActivityList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/bestNewActivity/bestNewActivityList.jsp
new file mode 100644
index 0000000..10ec6f7
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/bestNewActivity/bestNewActivityList.jsp
@@ -0,0 +1,200 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form action="${ctx}/bestNewActivity/page" method="get" id="condition">
+                    <div class="toolbar-body">
+                        <div class="row pt10 pb10 whitebg ml0 mr0">
+                            <span class="dlblock w100 textr">标题：</span>
+                            <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+							<input type="text" placeholder="请输入标题" id="title" name="title" value="">
+						</span>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <div class="mb50 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-hide" id="bestNewActivityTab" lay-filter="bestNewActivityTab"></table>
+        </div>
+    </div>
+</div>
+
+<script type="text/html" id="toolbarDemo">
+    <div class="layui-btn-container">
+        <button class="layui-btn layui-btn-sm" lay-event="add">添加</button>
+        <button class="layui-btn layui-btn-sm" lay-event="search">查询</button>
+    </div>
+</script>
+
+<script type="text/html" id="barDemo">
+    <a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>
+    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
+</script>
+
+<script>
+    layui.use(['table', 'layer'], function () {
+        var table = layui.table;
+        var layer = layui.layer;
+
+        var tableIns = table.render({
+            elem: '#bestNewActivityTab'
+            , url: '${ctx}/bestNewActivity/page'
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.count, //解析数据长度
+                    "data": res.data.data //解析数据列表
+                };
+            }
+            , toolbar: '#toolbarDemo' //开启头部工具栏，并为其绑定左侧模板
+            , defaultToolbar: ['filter', 'exports', 'print', { //自定义头部工具栏右侧图标。如无需自定义，去除该参数即可
+                title: '提示'
+                , layEvent: 'LAYTABLE_TIPS'
+                , icon: 'layui-icon-tips'
+            }]
+            , title: '系统最新活动表'
+            , cols: [[
+                {type: 'checkbox', fixed: 'left', hidden: true}
+                , {field: 'numbers', title: '序号', fixed: 'left', unresize: true, width: 80, sort: true, type: 'numbers'}
+                , {field: 'title', title: '标题'}
+                , {field: 'seq', title: '排序', sore: true}
+                , {field: 'updateor', title: '创建人'}
+                , {
+                    field: 'updateTime', title: '创建时间', sort: true,
+                    templet: "<div>{{layui.util.toDateString(d.updateTime, 'yyyy-MM-dd HH:mm:ss')}}</div>"
+                }
+                , {fixed: 'right', title: '操作', toolbar: '#barDemo'}
+            ]]
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , page: true
+            , done: function () {
+                $("[data-field='forceUpdate']").children().each(function () {
+                    if ($(this).text() == '0') {
+                        $(this).text('否');
+                    } else if ($(this).text() == '1') {
+                        $(this).text('是');
+                    }
+                });
+            }
+        });
+
+        //头工具栏事件
+        table.on('toolbar(bestNewActivityTab)', function (obj) {
+            switch (obj.event) {
+                case 'add':
+                    // 添加
+                    toAdd();
+                    break;
+                case 'search':
+                    // 查询
+                    tableIns.reload({
+                        where: { //设定异步数据接口的额外参数，任意设
+                            title: $("#title").val()
+                        }
+                        , page: {
+                            curr: 1 //重新从第 1 页开始
+                        }
+                    });
+                    break;
+            }
+        });
+
+        //监听行工具事件
+        table.on('tool(bestNewActivityTab)', function (obj) {
+            var data = obj.data;
+            //console.log(obj)
+            if (obj.event === 'del') {
+                layer.confirm('真的删除行么?', function (index) {
+                    obj.del(data);
+                    layer.close(index);
+                    del(obj);
+                });
+            } else if (obj.event === 'edit') {
+                toAdd(obj.data);
+            }
+        });
+
+        function toAdd(obj) {
+            var url = '${ctx}/bestNewActivity/detail';
+            if (obj != undefined) {
+                url = "${ctx}/bestNewActivity/detail/" + obj.id
+            }
+            var index = layer.open({
+                type: 2
+                , shade: 0.5
+                , maxmin: true
+                , content: url
+                , area: ['750px', '650px']
+            });
+            layer.full(index);
+        }
+
+        function del(obj) {
+            $.ajax({
+                url: '${ctx}/bestNewActivity/delete',
+                method: 'post',
+                data: JSON.stringify(obj.data),
+                dataType: 'JSON',
+                contentType: "application/json",
+                success: function (res) {
+                    if (res.code == 200) {
+                        layer.msg(res.message, {
+                            icon: 1
+                        });
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 5
+                        });
+                    }
+                }
+            })
+        }
+    });
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/business/list.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/business/list.jsp
new file mode 100644
index 0000000..9b48f24
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/business/list.jsp
@@ -0,0 +1,220 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp" />
+    <style> .layui-form-label {
+        width: 115px !important;
+    }
+    .layui-input-block {
+        margin-left: 120px;
+        min-height: 36px;
+    }
+    </style>
+</head>
+<body>
+<form class="layui-form" id="form1" action="" style="margin-top: 30px;margin-left: 50px;">
+    <div class="layui-inline">
+        <label class="layui-form-label">用户ID</label>
+        <div class="layui-input-block">
+            <input type="text" name="userId" id="userId" placeholder="请输入用户ID" autocomplete="off" class="layui-input">
+        </div>
+    </div>
+    <div class="layui-inline">
+        <label class="layui-form-label">业务员名称</label>
+        <div class="layui-input-block">
+            <input type="text" name="userName"  id="userName" placeholder="请输入业务员名称" autocomplete="off" class="layui-input">
+        </div>
+    </div>
+    <div class="layui-inline">
+        <label class="layui-form-label">登录账号</label>
+        <div class="layui-input-block">
+            <input type="text" name="loginName"  id="loginName" placeholder="请输入登录账号" autocomplete="off" class="layui-input">
+        </div>
+    </div>
+    <div class="layui-inline">
+        <label class="layui-form-label">联系电话</label>
+        <div class="layui-input-block">
+            <input type="text" name="phone"  id="phone" placeholder="请输入联系电话" autocomplete="off" class="layui-input">
+        </div>
+    </div>
+    <div class="layui-inline">
+        <label class="layui-form-label">所属代理ID</label>
+        <div class="layui-input-block">
+            <input type="text" name="agentId"  id="agentId" placeholder="请输入所属代理ID" autocomplete="off" class="layui-input">
+        </div>
+    </div>
+    <div class="layui-inline">
+        <label class="layui-form-label">所属代理名称</label>
+        <div class="layui-input-block">
+            <input type="text" name="agentName"  id="agentName" placeholder="请输入所属代理名称" autocomplete="off" class="layui-input">
+        </div>
+    </div>
+</form>
+<table class="layui-hide" id="businessInfoTab" lay-filter="businessInfoTab"></table>
+
+
+<script type="text/html" id="toolbarDemo">
+    <div class="layui-btn-container">
+        <%--<button class="layui-btn layui-btn-sm" lay-event="add">添加</button>--%>
+<%--         TODO 暂时不需要查询功能，屏蔽按钮 --%>
+        <button class="layui-btn layui-btn-sm" lay-event="search">查询</button>
+    </div>
+</script>
+
+<script type="text/html" id="barDemo">
+    <a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>
+<%--    <a class="layui-btn layui-btn-xs" lay-event="part">详情</a>--%>
+   <%--<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>--%>
+</script>
+
+<script>
+    layui.use(['table', 'layer'], function(){
+        var table = layui.table;
+        var layer = layui.layer;
+
+        var tableIns = table.render({
+            elem: '#businessInfoTab'
+            ,url:'${ctx}/businessInfo/page'
+            ,initSort: {
+                field: 'createTime'
+                ,type: 'desc'
+            }
+            ,response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                ,countName: 'count' //数据总数的字段名称，默认：count
+                ,dataName: 'data' //默数据列表的字段名称，认：data
+                ,statusCode : 200
+            }
+            ,parseData: function(res){ //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.count, //解析数据长度
+                    "data": res.data.data //解析数据列表
+                };
+            }
+            ,toolbar: '#toolbarDemo' //开启头部工具栏，并为其绑定左侧模板
+            ,defaultToolbar: ['filter', 'exports', 'print', { //自定义头部工具栏右侧图标。如无需自定义，去除该参数即可
+                title: '提示'
+                ,layEvent: 'LAYTABLE_TIPS'
+                ,icon: 'layui-icon-tips'
+            }]
+            ,title: '业务员数据表'
+            ,cols: [[
+                {type: 'checkbox', fixed: 'left', hidden: true}
+                ,{field:'numbers', title:'序号', fixed: 'left', width:100,type:'numbers'}
+                ,{field:'userId', title:'用户ID', fixed: 'left', width:100, sort: true}
+                ,{field:'userName', title:'业务员名称', sort: true}
+                ,{field:'loginName', title:'登录账号'}
+                ,{field:'phone', title:'联系电话'}
+                ,{field:'agentId', title:'所属代理ID'}
+                ,{field:'agentName', title:'所属代理名称'}
+                ,{field:'status', title:'状态',templet: function (d) {
+                    if(d.status == 1){
+                        return "<div style='color: green'>正常</div>";
+                    }else{
+                        return "<div style='color: red'>禁用</div>";
+                    }
+                 }}
+                ,{field: 'createTime', title: '创建日期',width:180,templet : "<div>{{layui.util.toDateString(d.createTime, 'yyyy-MM-dd HH:mm:ss')}}</div>"}
+            ]]
+            ,request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                ,limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            ,page: true
+        });
+
+        //头工具栏事件
+        table.on('toolbar(businessInfoTab)', function(obj){
+            switch(obj.event){
+                case 'add':
+                    // 添加
+                    toAdd();
+                    break;
+                case 'search':
+                    // 查询
+                    var params= serialize($('#form1'));
+                    table.reload('businessInfoTab', {
+                        where: params
+                        , page: {
+                            size: 10
+                            , current: 1
+                        }
+                    });
+                    break;
+            }
+        });
+        //监听行工具事件
+        table.on('tool(businessInfoTab)', function(obj){
+            var data = obj.data;
+            if(obj.event === 'del'){
+                layer.confirm('真的删除行么?', function(index){
+                    obj.del(data);
+                    layer.close(index);
+                    del(obj);
+                });
+            } else if(obj.event === 'edit'){
+                toAdd(obj.data);
+            }
+        });
+
+        function toAdd(obj) {
+            var url = '${ctx}/businessInfo/detail/';
+            if(obj != undefined){
+                url = "${ctx}/businessInfo/detail/"+obj.userId
+            }
+            var index = layer.open({
+                type: 2
+                ,shade: 0.5
+                ,maxmin: true
+                , content: url
+                , area: ['550px', '300px']
+            });
+        }
+        /*function part(obj) {
+            var url = "${ctx}/agentInfo/part/"+obj.userId;
+            var index = layer.open({
+                type: 2
+                ,shade: 0.5
+                ,maxmin: true
+                , content: url
+                , area: ['550px', '300px']
+            });
+            layer.full(index);
+        }*/
+        function del(obj) {
+            $.ajax({
+                url: '${ctx}/businessInfo/delete',
+                method: 'post',
+                data: JSON.stringify(obj.data),
+                dataType: 'JSON',
+                contentType:"application/json",
+                success: function(res) {
+                    if(res.code == 200) {
+                        layer.msg(res.data, {
+                            icon: 1
+                        });
+                    } else {
+                        layer.msg(res.data, {
+                            icon: 5
+                        });
+                    }
+                }
+            })
+        }
+    });
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/cash/account/detail.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/cash/account/detail.jsp
new file mode 100644
index 0000000..3b96dfc
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/cash/account/detail.jsp
@@ -0,0 +1,107 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../../common.jsp" />
+    <style>
+        .layui-input,.layui-textarea{
+            border-color:#606060;
+        }
+    </style>
+</head>
+<body style="padding: 1rem 0">
+<form class="layui-form" action="" style="width: 70%">
+    <input name="id" value="${entity.id}" hidden/>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">用户ID</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="userId" value="${entity.userId}" readonly  placeholder="请输入用户ID" class="layui-input layui-disabled"/>
+            </div>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">收款人名称</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="accountName" value="${entity.accountName}" placeholder="请输入收款人名称" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">收款人账号</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="accountNo" value="${entity.accountNo}"  placeholder="请输入收款人账号" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">状态</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <select name="status" class="layui-select" lay-verify="required">
+                    <option value="">请选择</option>
+                    <option value="1" ${entity.status == 1 || empty entity ? 'selected' : ''}>启用</option>
+                    <option value="0" ${entity.status == 0 ? 'selected' : ''}>禁用</option>
+                </select>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button class="layui-btn" lay-submit lay-filter="formDemo">立即提交</button>
+            <button type="button" id="close" class="layui-btn layui-btn-primary">关闭</button>
+        </div>
+    </div>
+</form>
+
+<script>
+    //Demo
+    layui.use(['form','layer'], function(){
+        var form = layui.form;
+        var layer = layui.layer;
+        $('#close').click(function() {
+            parent.layer.closeAll();
+        });
+        //监听提交
+        form.on('submit(formDemo)', function(data){
+            var index = layer.load(1,{shade: [0.1,'#000'] });
+            $.ajax({
+                url: '${ctx}/cashAccount/save',
+                method: 'post',
+                data: JSON.stringify(data.field),
+                dataType: 'JSON',
+                contentType:"application/json",
+                success: function(res) {
+                    layer.close(index);
+                    if(res.code == 200) {
+                        layer.msg(res.message, { icon: 1, time: 1000 }, function () {
+                            var index = parent.layer.getFrameIndex(window.name);
+                            parent.layui.table.reload('cashAccount');
+                            parent.layer.close(index);
+                        });
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 2
+                        });
+                    }
+                }
+            })
+            return false;
+        });
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/cash/account/list.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/cash/account/list.jsp
new file mode 100644
index 0000000..309c8c0
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/cash/account/list.jsp
@@ -0,0 +1,238 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../../common.jsp"/>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" id="form1" action="" style="margin-top: 10px">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">用户ID</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="userId" id="userId" placeholder="请输入用户ID"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">收款名称</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="accountName" id="accountName" placeholder="请输入收款名称"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">收款账号</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="accountNo" id="accountNo" placeholder="请输入收款账号"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">状态</label>
+                            <div class="layui-input-block">
+                                <select name="status" class="layui-select" lay-verify="required">
+                                    <option value="">请选择</option>
+                                    <option value="1" ${entity.status == '1' ? 'selected' : ''}>正常</option>
+                                    <option value="0" ${entity.status == '0' ? 'selected' : ''}>禁用</option>
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <div class="mb50 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-hide" id="cashAccountTab" lay-filter="cashAccountTab"></table>
+        </div>
+    </div>
+</div>
+<script type="text/html" id="leftBar">
+    <a class="layui-btn layui-btn-sm" lay-event="search">
+        <i class="layui-icon layui-icon-search"></i>查询
+    </a>
+</script>
+
+<script type="text/html" id="toolBar">
+    <a class="layui-btn layui-btn-xs" lay-event="edit">
+        <i class="layui-icon layui-icon-edit"></i>编辑
+    </a>
+    <a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="del">
+        <i class="layui-icon layui-icon-delete"></i>删除
+    </a>
+</script>
+
+<script>
+    layui.use(['table', 'layer'], function () {
+        var table = layui.table;
+        var layer = layui.layer;
+
+        var tableIns = table.render({
+            elem: '#cashAccountTab'
+            , url: '${ctx}/cashAccount/page'
+            , id: 'cashAccount'
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            , toolbar: '#leftBar' //开启头部工具栏，并为其绑定左侧模板
+            , defaultToolbar: ['filter']
+            , defaultToolbar: ['filter', 'exports', 'print', { //自定义头部工具栏右侧图标。如无需自定义，去除该参数即可
+                title: '提示'
+                , layEvent: 'LAYTABLE_TIPS'
+                , icon: 'layui-icon-tips'
+            }]
+            , title: '用户提现账户表'
+            , cols: [[
+                {type: 'checkbox', fixed: 'left', hidden: true}
+                , {title: '序号', fixed: 'left', unresize: true, width: 80, type: 'numbers'}
+                , {field: 'userId', title: '用户ID'}
+                , {field: 'accountName', title: '收款名称'}
+                , {field: 'accountNo', title: '收款账号'}
+                , {
+                    field: 'status', title: '状态', templet: function (d) {
+                        if (d.status === 1) {
+                            return "<span style='color: green'>正常</span>"
+                        } else {
+                            return "<span style='color: red'>禁用</span>"
+                        }
+                    }
+                }
+                , {
+                    field: 'createTime',
+                    title: '创建时间',
+                    width: 160,
+                    templet: "<div>{{layui.util.toDateString(d.createTime,'yyyy-MM-dd HH:mm:ss')}}</div>"
+                }
+                , {fixed: 'right', title: '操作', width: 200, toolbar: '#toolBar'}
+            ]]
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , page: true
+        });
+        table.on('tool(cashAccountTab)', function (obj) { //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            var data = obj.data; //获得当前行数据
+            var layEvent = obj.event; //获得 lay-event 对应的值（也可以是表头的 event 参数对应的值）
+            if (layEvent === 'del') { //删除
+                layer.confirm('真的删除么?', {icon: 3}, function (index) {
+                    obj.del(); //删除对应行（tr）的DOM结构，并更新缓存
+                    layer.close(index);
+                    del(data);
+                    //向服务端发送删除指令
+                });
+            } else if (layEvent === 'edit') { //编辑
+                //do something
+                toAdd(obj.data);
+                //同步更新缓存对应的值
+                // obj.update({
+                //     username: '123'
+                //     ,title: 'xxx'
+                // });
+            }
+        });
+
+        //监听头工具栏事件
+        table.on('toolbar(cashAccountTab)', function (obj) {
+            switch (obj.event) {
+                case 'add':
+                    // 添加
+                    toAdd();
+                    break;
+                case 'search':
+                    var params = serialize($('#form1'));
+                    table.reload('cashAccount', {
+                        where: params
+                        , page: {
+                            size: 10
+                            , current: 1
+                        }
+                    });
+                    break;
+            }
+        });
+
+        function toAdd(obj) {
+            var url = '${ctx}/cashAccount/detail';
+            var title = "新增";
+            if (obj != undefined) {
+                url = "${ctx}/cashAccount/detail/" + obj.id;
+                title = "编辑"
+            }
+            var index = layer.open({
+                type: 2
+                , shade: 0.5
+                , title: title
+                , maxmin: true
+                , content: url
+                , area: ['500px', '400px']
+                , end: function () {
+
+                }
+            });
+        }
+
+        function del(obj) {
+            $.ajax({
+                url: '${ctx}/cashAccount/del/' + obj.id,
+                method: 'DELETE',
+                dataType: 'JSON',
+                contentType: "application/json",
+                success: function (res) {
+                    if (res.code == 200) {
+                        layer.msg(res.data, {
+                            icon: 1
+                        });
+                    } else {
+                        layer.msg(res.data, {
+                            icon: 2
+                        });
+                    }
+                }
+            })
+        }
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/cash/cashBaseInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/cash/cashBaseInfo.jsp
new file mode 100644
index 0000000..1b6387e
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/cash/cashBaseInfo.jsp
@@ -0,0 +1,99 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">  
+	<div class="tab-pane active">     
+		<div class="panel-body">
+			<div class="wrapper wrapper-content">
+				<div class="panel-form animated fadeInRight wp60 fc">
+					<div class="layui-form-item dn	has-error" >   
+						<label class="layui-form-label">id</label>  
+						<div class="layui-input-block">
+							<input type="text" name="id" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${cash.id }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">userName</label>  
+						<div class="layui-input-block">
+							<input type="text" name="userName" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${cash.userName }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">merchantName</label>  
+						<div class="layui-input-block">
+							<input type="text" name="merchantName" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${cash.merchantName }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">cashAmt</label>  
+						<div class="layui-input-block">
+							<input type="text" name="cashAmt" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${cash.cashAmt }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">status</label>  
+						<div class="layui-input-block">
+							<input type="text" name="status" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${cash.status }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">reason</label>  
+						<div class="layui-input-block">
+							<input type="text" name="reason" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${cash.reason }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">createDt</label>  
+						<div class="layui-input-block">
+							<input type="text" name="createDt" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${cash.createDt }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">updateDt</label>  
+						<div class="layui-input-block">
+							<input type="text" name="updateDt" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${cash.updateDt }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">logo</label>  
+						<div class="layui-input-block">
+							<input type="text" name="logo" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${cash.logo }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">cashNumber</label>  
+						<div class="layui-input-block">
+							<input type="text" name="cashNumber" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${cash.cashNumber }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">backNo</label>  
+						<div class="layui-input-block">
+							<input type="text" name="backNo" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${cash.backNo }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">backDt</label>  
+						<div class="layui-input-block">
+							<input type="text" name="backDt" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${cash.backDt }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">updator</label>  
+						<div class="layui-input-block">
+							<input type="text" name="updator" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${cash.updator }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">type</label>  
+						<div class="layui-input-block">
+							<input type="text" name="type" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${cash.type }" >
+						</div>  
+					</div>
+	
+				</div>
+			</div>
+		</div>  
+	</div>
+</form>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/cash/cashDetails.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/cash/cashDetails.jsp
new file mode 100644
index 0000000..986454f
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/cash/cashDetails.jsp
@@ -0,0 +1,54 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>     
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">                      
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black"> 
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> 
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->                                     
+<meta name="viewport"
+	content="width=device-width, initial-scale=1.0, maximum-scale=1.0">   
+<jsp:include page="../../common.jsp" />
+<script type="text/javascript">
+    require("js/cash/cashDetails.js");
+</script>
+<title>编辑</title>
+</head>                                 
+	<body class="lgraybg">            
+		<div class="	container-fluid animated fadeInRight col-sm-12">
+			<div class="panel-toolbar mt10 mb10 pt5 pb5 pl10 bdd whitebg">
+				<div class="buttons">
+					<a href="javascript:void(0);" class="btn btn-primary fa fa-save f12"><span>保存</span></a>
+					<a href="${ctx }/cash/index?pageIndex=${pageIndex}"  class="btn btn-primary fa fa-back f12" id="goback"><span>返回</span></a>
+				</div>
+			</div>
+				<div class="tabs-container whitebg">
+					<div class="pt10 pl5 pr5">
+						<ul class="nav nav-tabs" id="nav-tabs">
+							<li class="active" data-action="base">   
+								<a href="javascript:void(0);" >基本资料</a>
+							</li>
+							<li class="" data-action="functions">
+								<a href="javascript:void(0);"  >多功能输入</a>
+							</li>
+							<li class="" data-action="extends">
+								<a href="javascript:void(0);" >扩展属性</a>
+							</li>
+						</ul>
+						<div class="tab-content pt30 p30">               
+		
+						</div>     
+					</div>
+				</div>    
+		</div>
+		<!-- 隐藏域 -->
+		<input type="hidden" id="cashId" value="${cash.id }"/>
+	</body>
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/cash/cashExtendsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/cash/cashExtendsInfo.jsp
new file mode 100644
index 0000000..592687a
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/cash/cashExtendsInfo.jsp
@@ -0,0 +1,201 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>           
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> 
+<div class="tab-pane active">      
+	<div class="animated fadeInRight">
+		<div class="whitebg pl10 pr10">
+			<table class="table table-striped table-bordered table-hover">     
+				<thead> 
+					<tr>  
+						<th class="textc">序号</th>         
+						<th class="textc wp15">流水账号</th>
+						<th class="textc">日期</th>         
+						<th class="textc">财务类别</th>     
+						<th class="textc">金额</th>         
+						<th class="textc">银行</th>         
+						<th class="textc">发票</th>         
+						<th class="textc">客户名称</th>     
+						<th class="textc wp15">单号</th>    
+						<th class="textc">状态</th>         
+						<th class="textc">类别</th>         
+						<th class="textc">操作</th>         
+					</tr> 
+				</thead>
+				<tbody> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+                
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="green">支出</span></td>     
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+				</tbody>
+                
+			</table>  
+			<!-- footer -->  
+			<div class="clearfix mb10 pb20">          
+					<div class="layui-tab-item fr">       
+							<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+							<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>   
+							<div class="pagination dlblock vm" id="pagination"></div>
+							<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>            
+					</div>
+				</div>  
+		</div>      
+	</div>        
+</div>          
+                
+<script type="text/javascript">    
+//分页          
+$('#pagination').pagination({        
+	pageCount: 50,
+	jump: true,   
+	coping: true, 
+	homePage: '首页',    
+	endPage: '末页',     
+	prevContent: '上页', 
+	nextContent: '下页', 
+	callback: function(api) {          
+		$('.now').text(api.getCurrent());
+	}             
+});             
+</script>       
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/cash/cashFunctionsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/cash/cashFunctionsInfo.jsp
new file mode 100644
index 0000000..982ce84
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/cash/cashFunctionsInfo.jsp
@@ -0,0 +1,130 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>		
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">      
+<div class="tab-pane active">
+				<div class="panel-body">
+					<div class="wrapper wrapper-content">     
+						<div class="panel-form animated fadeInRight wp60 fc">
+							<!-- 账号资料 -->
+			<div class="layui-form-item 	has-error">
+				<label class="layui-form-label">单行输入框<i class="red">*</i></label>
+				<div class="layui-input-block">
+					<input type="text" name="title" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input">
+				</div>                                         
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">自定义验证</label>
+				<div class="layui-input-inline ml30">
+					<input type="password" name="password" lay-verify="pass" placeholder="请输入密码" autocomplete="off" class="layui-input">
+				</div>
+				<div class="layui-form-mid layui-word-aux">请填写6到12位密码</div>
+			</div>
+			<div class="form-group">
+				<div class="layui-form-item">          
+					<label class="layui-form-label">单行选择框</label>
+					<div class="layui-input-block">
+						<select name="interest" lay-filter="aihao">  
+							<option value=""></option>
+							<option value="0">写作</option>         
+							<option value="1" selected="">阅读</option>
+							<option value="2">游戏</option>
+							<option value="3">音乐</option>
+							<option value="4">旅行</option>  
+						</select>              
+					</div>
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<div class="layui-inline">  
+					<label class="layui-form-label">范围</label>
+					<div class="layui-input-inline ml30">
+						<input type="text" name="price_min" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>                                     
+					<div class="layui-form-mid">-</div>
+					<div class="layui-input-inline">       
+						<input type="text" name="price_max" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>
+				</div>           
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">联动选择框</label>
+				<div class="layui-input-inline ml30">
+					<select name="quiz1">     
+						<option value="">请选择省</option>
+						<option value="浙江" selected="">浙江省</option> 
+						<option value="你的工号">江西省</option>           
+						<option value="你最喜欢的老师">福建省</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz2">
+						<option value="">请选择市</option>
+						<option value="杭州">杭州</option>
+						<option value="宁波" disabled="">宁波</option>
+						<option value="温州">温州</option>
+						<option value="温州">台州</option>
+						<option value="温州">绍兴</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz3">
+						<option value="">请选择县/区</option>
+						<option value="西湖区">西湖区</option>
+						<option value="余杭区">余杭区</option>
+						<option value="拱墅区">临安市</option>
+					</select>
+				</div>    
+			</div>
+			<div class="layui-form-item" pane="">   
+				<label class="layui-form-label">原始复选框</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="like1[write]" lay-skin="primary" title="写作" checked="">  
+					<input type="checkbox" name="like1[read]" lay-skin="primary" title="阅读">
+					<input type="checkbox" name="like1[game]" lay-skin="primary" title="游戏" disabled="">
+				</div>
+			</div>
+
+			<div class="layui-form-item">
+				<label class="layui-form-label">开关-默认关</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="close" lay-skin="switch" lay-text="ON|OFF">
+				</div>
+			</div>
+			<div class="layui-form-item">  
+				<label class="layui-form-label">单选框</label>
+				<div class="layui-input-block">
+					<input type="radio" name="sex" value="男" title="男" checked="">
+					<input type="radio" name="sex" value="女" title="女">
+					<input type="radio" name="sex" value="禁" title="禁用" disabled="">
+				</div>
+			</div>
+			<!--<div class="layui-form-item layui-form-text">
+				<label class="layui-form-label">上传图片</label>
+				<div class="layui-input-block">
+					<div class="layui-upload-drag w200 h200">
+						<i class="layui-icon"></i>          
+						<p>点击上传</p>
+					</div>
+				</div>
+			</div>-->
+				<div class="layui-form-item layui-form-text">
+					<label class="layui-form-label">普通文本域</label>  
+					<div class="layui-input-block">              
+						<textarea placeholder="请输入内容" class="layui-textarea"></textarea>
+					</div>
+				</div>
+			</div>
+		</div>   
+	</div>
+</div>
+</form>   
+<script type="text/javascript">
+	//form表单样式
+	layui.use(['layer', 'form'], function() {    
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+</script>                 
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/cash/cashList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/cash/cashList.jsp
new file mode 100644
index 0000000..afd7594
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/cash/cashList.jsp
@@ -0,0 +1,217 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+    <script type="text/javascript">
+        require("cash/cashList.js");
+    </script>
+
+    <style>
+        .layui-table th {
+            text-align: center;
+        }
+
+        .layui-dropdown {
+            min-width: 0px !important;
+        }
+
+        /*.layui-dropdown-item*/
+        .layui-dropdown-item .layui-menu {background-color: #fff; border: none;}
+        .layui-dropdown-item .layui-menu li{
+            color: #fff;
+            padding: 0;
+        }
+
+        .layui-menu {
+            margin: 5px;
+        }
+
+        .layui-menu li, .layui-menu-body-title a {
+            padding: 0;
+        }
+
+        .layui-menu-body-title a {
+            display: block;
+            margin: 0 !important;
+            color: rgba(255,255,255,.8);
+        }
+        .cash-count{
+            display: flex;
+            justify-content: space-around;
+            border-left: 1px solid #ddd;
+            border-right: 1px solid #ddd;
+            padding: 1.5rem 0;
+        }
+        .layui-table-view{
+            margin:0;
+        }
+        .cash-count{
+            font-weight: bold;
+            color: #FF5722;
+            font-size: 1rem;
+        }
+        .amt-label{
+            color: #000;
+        }
+    </style>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pb5 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" action="" style="margin-top: 10px">
+
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">用户ID</label>
+                            <div class="layui-input-inline">
+                                <input type="text" placeholder="请输入用户ID" id="userId" class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">手机号</label>
+                            <div class="layui-input-inline">
+                                <input type="text" placeholder="请输入手机号" id="phone" class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">用户名称</label>
+                            <div class="layui-input-inline">
+                                <input type="text" placeholder="请输入内容" id="userName" class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">状态</label>
+                            <div class="layui-input-inline">
+                                <select name="status" id="status">
+                                    <option value="">请选择</option>
+                                    <option value="0">审核中</option>
+                                    <option value="1">提现成功</option>
+                                    <option value="2">提现失败</option>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">开始日期</label>
+                            <div class="layui-input-inline">
+                                <input type="text" placeholder="" id="date1" class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">结束日期</label>
+                            <div class="layui-input-inline">
+                                <input type="text" placeholder="" id="date2" class="layui-input">
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+
+        </div>
+        <div class="toolbar-body">
+            <div class="cash-count">
+<%--                <div class="amt-info">--%>
+<%--                    <label class="amt-label">交易金额：</label>--%>
+<%--                    <span id="transAmountCount">${ not empty otherData.transAmountCount ? otherData.transAmountCount : "0.00"}</span>--%>
+<%--                </div>--%>
+                <div class="amt-info">
+                    <label class="amt-label">收益金额：</label>
+                    <span id="profitAmountCount">${ not empty otherData.profitAmountCount ? otherData.profitAmountCount : "0.00"}</span>
+                </div>
+                <div class="amt-info">
+                    <label class="amt-label">推广分润：</label>
+                    <span id="shareAmountCount">${ not empty otherData.shareAmountCount ? otherData.shareAmountCount : "0.00"}</span>
+                </div>
+                <div class="amt-info">
+                    <label class="amt-label">粉丝分润：</label>
+                    <span id="fansAmountCount">${ not empty otherData.fansAmountCount ? otherData.fansAmountCount : "0.00"}</span>
+                </div>
+                <div class="amt-info">
+                    <label class="amt-label">已提分润：</label>
+                    <span id="useCashAmtCount">${ not empty otherData.useCashAmtCount ? otherData.useCashAmtCount : "0.00"}</span>
+                </div>
+                <div class="amt-info">
+                    <label class="amt-label">待提分润：</label>
+                    <span id="inCashAmtCount">${ not empty otherData.inCashAmtCount ? otherData.inCashAmtCount : "0.00"}</span>
+                </div>
+            </div>
+        </div>
+
+        <table class="layui-hide" id="demo" lay-filter="test"></table>
+    </div>
+</div>
+</body>
+
+<script type="text/html" id="imgTemp">
+    {{# if (d.logo != null && d.logo != '') { }}
+    <img src="{{d.logo}}" width="35px" height="35px">
+    {{# } }}
+</script>
+
+<script id="barDemo" type="text/html">
+    {{# if (d.status=='0') { }}
+    <a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="auditPass">
+        <i class="layui-icon layui-icon-ok"></i>
+        通过并打款
+    </a>
+    <a class="layui-btn layui-btn-xs" lay-event="auditSuccess">
+        <i class="layui-icon layui-icon-ok"></i>
+        通过
+    </a>
+    <a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="auditRefuse">
+        <i class="layui-icon layui-icon-close"></i>
+        拒绝
+    </a>
+    {{# } }}
+</script>
+
+<script type="text/html" id="toolBar">
+    <a class="layui-btn layui-btn-sm" href="javascript:void(0);" lay-event="search">
+        <i class="layui-icon layui-icon-search"></i>
+        <span>搜索</span>
+    </a>
+    <a class="layui-btn layui-btn-sm layui-btn-normal" href="javascript:void(0);" lay-event="batchPass">
+        <i class="layui-icon layui-icon-ok"></i>
+        <span>批量通过并打款</span>
+    </a>
+</script>
+
+<script type="text/html" id="auditRefuseForm">
+
+</script>
+
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/cash/cashPass.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/cash/cashPass.jsp
new file mode 100644
index 0000000..5a79b93
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/cash/cashPass.jsp
@@ -0,0 +1,107 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<!DOCTYPE html>
+<html lang="zh">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+    <script type="text/javascript">
+        require("cash/cashList.js");
+    </script>
+
+    <style>
+        .layui-table th {
+            text-align: center;
+        }
+
+        .layui-dropdown {
+            min-width: 0px !important;
+        }
+
+        /*.layui-dropdown-item*/
+        .layui-dropdown-item .layui-menu {background-color: #fff; border: none;}
+        .layui-dropdown-item .layui-menu li{
+            color: #fff;
+            padding: 0;
+        }
+
+        .layui-menu {
+            margin: 5px;
+        }
+
+        .layui-menu li, .layui-menu-body-title a {
+            padding: 0;
+        }
+
+        .layui-menu-body-title a {
+            display: block;
+            margin: 0 !important;
+            color: rgba(255,255,255,.8);
+        }
+    </style>
+</head>
+<body>
+<form class="layui-form" action="" style="margin-top: 35px; width: 80%;">
+    <input name="id" value="${entity.id}" class="layui-hide"/>
+    <div class="layui-form-item">
+        <label class="layui-form-label">真实名称</label>
+        <div class="layui-input-block">
+            <input type="text" name="accountName" value="${entity.accountName}" autocomplete="off" class="layui-input">
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">支付宝账号</label>
+        <div class="layui-input-block">
+            <input type="text" name="accountNo" value="${entity.accountNo}" autocomplete="off" class="layui-input">
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">备注</label>
+        <div class="layui-input-block">
+            <input type="text" name="remark" value="${entity.remark}" autocomplete="off" class="layui-input">
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button class="layui-btn" lay-submit lay-filter="auditPassForm">立即提交</button>
+            <button type="reset" class="layui-btn layui-btn-primary">重置</button>
+        </div>
+    </div>
+</form>
+
+<script>
+    layui.use(['form'], function() {
+        var form = layui.form;
+
+        form.on("submit(auditPassForm)", function(data) {
+            var index = layer.load(1, {shade: [0.1, '#000']});
+            var formData = data.field;
+            $.ajax({
+                url: ctx + "/cash/realAuditPass"
+                , type: 'post'
+                , data: formData
+                , success: function(d) {
+                    layer.close(index);
+                    layer.msg(d.message);
+                    if (d.code == 200) {
+                        parent.layer.closeAll()
+                        parent.queryCash2()
+                    }
+                }
+            })
+
+            return false;
+        });
+    });
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/countData/mercActiveList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/countData/mercActiveList.jsp
new file mode 100644
index 0000000..99cbf44
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/countData/mercActiveList.jsp
@@ -0,0 +1,140 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+    <style>
+        .layui-btn+.layui-btn {
+            margin-left: -4px;
+        }
+        .active{
+            color: #fff !important;
+            background-color: #009688;
+            border: 0;
+        }
+        .layui-inline,.layui-input-block{
+            padding: 0 20px;
+        }
+        .layui-input-block{
+            margin: 10px 0 0 0;
+        }
+        .layui-form-item{
+            margin-bottom:10px;
+        }
+    </style>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" id="form1" action="" style="margin-top: 10px">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <button class="layui-btn layui-btn-primary check-btn active" data-v="1" type="button" >活跃商户</button>
+                            <button class="layui-btn layui-btn-primary check-btn" data-v="-1" type="button" >沉默商户</button>
+                        </div>
+                        <div class="layui-input-block">
+                            <button class="layui-btn layui-btn-sm layui-btn-primary check-date-btn layui-border-green" data-v="7" type="button" >近7日</button>
+                            <button class="layui-btn layui-btn-sm layui-btn-primary check-date-btn" data-v="15" type="button" >近15天</button>
+                            <button class="layui-btn layui-btn-sm layui-btn-primary check-date-btn" data-v="30" type="button" >近30天</button>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <div class="mb50 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-hide" id="mercActiveDataTab" lay-filter="mercActiveDataTab"></table>
+        </div>
+    </div>
+</div>
+<script type="text/html" id="leftBar">
+    <a class="layui-btn layui-btn-sm" lay-event="search">
+        <i class="layui-icon layui-icon-search"></i>查询
+    </a>
+</script>
+
+<script>
+    layui.use(['table', 'layer'], function () {
+        let table = layui.table;
+        $(".check-btn").click(function (event){
+            $(".check-btn").each(function (index,e){
+                $(e).removeClass("active")
+            })
+            $(event.target).addClass("active");
+        })
+        $(".check-date-btn").click(function (event){
+            $(".check-date-btn").each(function (index,e){
+                $(e).removeClass("layui-border-green")
+            })
+            $(event.target).addClass("layui-border-green");
+        })
+        var tableIns = table.render({
+            elem: '#mercActiveDataTab'
+            , url: '${ctx}/mercData/activePage'
+            , id: 'mercActiveData'
+            , where: {}
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.count, //解析数据长度
+                    "data": res.data.data //解析数据列表
+                };
+            }
+            , toolbar: '#leftBar' //开启头部工具栏，并为其绑定左侧模板
+            , defaultToolbar: ['filter']
+            , defaultToolbar: ['filter', 'exports', 'print', { //自定义头部工具栏右侧图标。如无需自定义，去除该参数即可
+                title: '提示'
+                , layEvent: 'LAYTABLE_TIPS'
+                , icon: 'layui-icon-tips'
+            }]
+            , title: '商户活跃度数据统计'
+            , cols: [[
+                {type: 'checkbox', fixed: 'left', hidden: true}
+                , {field: 'numbers', title: '序号', fixed: 'left', unresize: true, width: 80, type: 'numbers'}
+                , {field: 'userId', title: '用户ID'}
+                , {field: 'alias', title: '商户名称'}
+            ]]
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , page: true
+        });
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/countData/mercChainList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/countData/mercChainList.jsp
new file mode 100644
index 0000000..737cd57
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/countData/mercChainList.jsp
@@ -0,0 +1,337 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" id="form1" action="" style="margin-top: 10px">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">用户ID</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="userId" id="userId" placeholder="请输入用户ID"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">商户名称</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="alias" id="merchantName" placeholder="请输入商户名称"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <div class="mb50 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-hide" id="merchantDataTab" lay-filter="merchantDataTab"></table>
+        </div>
+    </div>
+</div>
+<script type="text/html" id="leftBar">
+    <a class="layui-btn layui-btn-sm" lay-event="search">
+        <i class="layui-icon layui-icon-search"></i>查询
+    </a>
+</script>
+
+<script type="text/template" id="audit">
+    <form class="layui-form" id="form2" style="margin-top: 2rem;">
+        <div class="layui-form-item" style="width: 300px;">
+            <label class="layui-form-label">禁用原因</label>
+            <div class="layui-input-block">
+                <textarea placeholder="请输入禁用原因" name="remark" id="banRemark" lay-verify="required"  required autocomplete="off" class="layui-textarea"></textarea>
+            </div>
+        </div>
+    </form>
+</script>
+
+<script type="text/html" id="toolBar">
+    {{# if (d.risk === 'D1套现' && (d.valid == 0 || d.valid)) { }}
+        <button type="button" class="layui-btn layui-btn-xs layui-btn-danger" lay-event="disable">禁用D1</button>
+    {{# } else if (d.risk === 'D1套现' && (d.valid == -1)){ }}
+        <button type="button" class="layui-btn layui-btn-xs" lay-event="enable">启用D1</button>
+    {{# } }}
+</script>
+
+<script>
+    layui.use(['table', 'layer'], function () {
+        var table = layui.table;
+        var layer = layui.layer;
+
+        var tableIns = table.render({
+            elem: '#merchantDataTab'
+            , url: '${ctx}/mercData/page'
+            , id: 'merchantData'
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.count, //解析数据长度
+                    "data": res.data.data //解析数据列表
+                };
+            }
+            , toolbar: '#leftBar' //开启头部工具栏，并为其绑定左侧模板
+            , defaultToolbar: ['filter']
+            , defaultToolbar: ['filter', 'exports', 'print', { //自定义头部工具栏右侧图标。如无需自定义，去除该参数即可
+                title: '提示'
+                , layEvent: 'LAYTABLE_TIPS'
+                , icon: 'layui-icon-tips'
+            }]
+            , title: '商户数据统计'
+            , cols: [[
+                {type: 'checkbox', fixed: 'left', hidden: true}
+                , {field: 'numbers', title: '序号', fixed: 'left', unresize: true, width: 80, type: 'numbers'}
+                , {field: 'userId', title: '用户ID'}
+                , {field: 'alias', title: '商户名称'}
+                // , {field: 'totalAmt', title: '总额',templet:function (d){
+                //     if(d.totalAmt){
+                //         return d.totalAmt.toFixed(2);
+                //     }else{
+                //         return "-";
+                //     }
+                //  }}
+                , {field: 'tradeSucAmt', title: '交易额',templet:function (d){
+                    if(d.tradeSucAmt){
+                        return d.tradeSucAmt.toFixed(2);
+                    }else{
+                        return "-";
+                    }
+                }}
+                , {field: 'tradeNum', title: '总笔数',templet:function (d){
+                        if(d.tradeNum){
+                            return d.tradeNum;
+                        }else{
+                            return "-";
+                        }
+                    }}
+                , {field: 'tradeSucNum', title: '成功笔数',templet:function (d){
+                        if(d.tradeSucNum){
+                            return d.tradeSucNum;
+                        }else{
+                            return "-";
+                        }
+                    }}
+                , {field: 'debitSucNum', title: '储蓄卡',templet:function (d){
+                        if(d.debitSucNum){
+                            return d.debitSucNum;
+                        }else{
+                            return "-";
+                        }
+                    }}
+                , {field: 'creditSucNum', title: '信用卡',templet:function (d){
+                        if(d.creditSucNum){
+                            return d.creditSucNum;
+                        }else{
+                            return "-";
+                        }
+                    }}
+                , {field: 'otherSucNum', title: '其他',templet:function (d){
+                        if(d.otherSucNum){
+                            return d.otherSucNum;
+                        }else{
+                            return "-";
+                        }
+                    }}
+                , {field: 'd1Num', title: 'D1笔数',templet:function (d){
+                        if(d.d1Num){
+                            return d.d1Num;
+                        }else{
+                            return "-";
+                        }
+                    }}
+                , {field: 'd0Num', title: 'D0笔数',templet:function (d){
+                        if(d.d0Num){
+                            return d.d0Num;
+                        }else{
+                            return "-";
+                        }
+                    }}
+                , {field: 'numScale', title: '成功率%',templet:function (d){
+                    if(d.numScale){
+                        return d.numScale + "%";
+                    }else{
+                        return "-";
+                    }
+                }}
+                , {field: 'debitScale', title: '储蓄卡%',templet:function (d){
+                    if(d.debitScale){
+                        return d.debitScale + "%";
+                    }else{
+                        return "-";
+                    }
+                }}
+                , {field: 'creditScale', title: '信用卡%',templet:function (d){
+                    if(d.creditScale){
+                        return d.creditScale + "%";
+                    }else{
+                        return "-";
+                    }
+                }}
+                , {field: 'd1Scale', title: 'D1%',templet:function (d){
+                    if(d.d1Scale){
+                        return d.d1Scale + "%";
+                    }else{
+                        return "-";
+                    }
+                }}
+                , {field: 'd0Scale', title: 'D0%',templet:function (d){
+                    if(d.d0Scale){
+                        return d.d0Scale + "%";
+                    }else{
+                        return "-";
+                    }
+                }}
+                , {field: 'valid', title: 'D1状态',templet:function (d){
+                        if(d.valid == 0 || d.valid){
+                            if(d.valid == -1){
+                                return "<span style='color: red'>禁用</span>";
+                            }else{
+                                return "<span style='color: green'>启用</span>";
+                            }
+                        }else{
+                            return "未开通";
+                        }
+                    }}
+
+                , {field: 'risk', title: '风控备注',templet:function (d){
+                    if(d.risk != "-"){
+                        return "<span style='color: red'>"+d.risk+"</span>";
+                    }
+                    return d.risk;
+                }}
+                ,{fixed: 'right', title:'操作', toolbar: '#toolBar'}
+            ]]
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , page: true
+        });
+        //监听头工具栏事件
+        table.on('toolbar(merchantDataTab)', function (obj) {
+            switch (obj.event) {
+                case 'add':
+                    // 添加
+                    toAdd();
+                    break;
+                case 'search':
+                    var params = serialize($('#form1'));
+                    table.reload('merchantData', {
+                        where: params
+                        , page: {
+                            size: 10
+                            , current: 1
+                        }
+                    });
+                    break;
+            }
+        });
+        table.on('tool(merchantDataTab)', function(obj) { //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            var data = obj.data; //获得当前行数据
+            var layEvent = obj.event; //获得 lay-event 对应的值（也可以是表头的 event 参数对应的值）
+            if (layEvent === 'disable') { //
+                showBanValidStatus(data);
+            }else if(layEvent === 'enable'){
+                showOpenValidStatus(data);
+            }
+        })
+        function showOpenValidStatus(data) {
+            layer.confirm('确定启用当前商户D1通道？', {icon: 3, title: '提示'}, function (index) {
+                var index = layer.load(1, {shade: [0.1, '#000']});
+                $.ajax({
+                    type: 'POST'
+                    , url: ctx + "/merchantStore/openChannelValid"
+                    , data: {
+                        channelId: data.channel,
+                        merchantCode: data.merchantCode
+                    }
+                    , success: function (res) {
+                        layer.close(index);
+                        layer.msg(res.message, {
+                            icon: res.code == 200 ? 1 : 2
+                        });
+                        if(res.code == 200){
+                            tableIns.reload();
+                        }
+                    }
+                });
+            })
+        }
+        function showBanValidStatus(data) {
+            layer.open({
+                type: 1,
+                title: '提示',
+                offset: 'm', //具体配置参考：offset参数项
+                area: ['400px', '300px'],
+                content: $("#audit").html(),
+                btn: ['确认', '取消'],
+                shade: 0.3,
+                btn1: function (index, layero) {
+                    layer.closeAll();
+                    var index = layer.load(1, {shade: [0.1, '#000']});
+                    $.ajax({
+                        type: 'POST'
+                        , url: ctx + "/merchantStore/banChannelValid"
+                        , data: {
+                            channelId: data.channel,
+                            merchantCode: data.merchantCode,
+                            remark: $("#banRemark").val()
+                        }
+                        , success: function (res) {
+                            layer.close(index);
+                            layer.msg(res.message, {
+                                icon: res.code == 200 ? 1 : 2
+                            });
+                            if(res.code == 200){
+                                tableIns.reload();
+                            }
+                        }
+                    });
+                }
+                ,btn2: function(index, layero){
+                    layer.close(index);
+                }
+            });
+        }
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/countData/mercTradeList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/countData/mercTradeList.jsp
new file mode 100644
index 0000000..0e36491
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/countData/mercTradeList.jsp
@@ -0,0 +1,557 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<!Doctype html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+    <style>
+    </style>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" id="form1" action="" style="margin-top: 10px">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">用户ID</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="userId" id="userId" placeholder="请输入用户ID"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <%--                        <div class="layui-inline">--%>
+                        <%--                            <label class="layui-form-label">商户名称</label>--%>
+                        <%--                            <div class="layui-input-block">--%>
+                        <%--                                <input type="text" name="alias" id="alias" placeholder="请输入商户名称"--%>
+                        <%--                                       autocomplete="off" class="layui-input">--%>
+                        <%--                            </div>--%>
+                        <%--                        </div>--%>
+                        <input type="hidden" name="condition" id="condition" class="layui-input">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">日期</label>
+                            <div class="layui-input-inline">
+                                <input type="text" placeholder="开始日期" readonly id="date1" name="startTime"
+                                       autocomplete="off"
+                                       class="layui-input layui-disabled">
+                            </div>
+                            <div class="layui-input-inline">
+                                <input type="text" placeholder="结束日期" readonly id="date2" name="endTime"
+                                       autocomplete="off"
+                                       class="layui-input layui-disabled">
+                            </div>
+                            <button class="layui-btn layui-btn-primary check-btn layui-border-green" data-v="1"
+                                    type="button">今日
+                            </button>
+                            <button style="margin-left: -4px;" class="layui-btn layui-btn-primary check-btn" data-v="2"
+                                    type="button">昨日
+                            </button>
+                            <%--                            <button class="layui-btn layui-btn-primary check-btn" data-v="3" type="button" >上月</button>--%>
+                            <button style="margin-left: -4px;" class="layui-btn layui-btn-primary check-btn" data-v="-1"
+                                    type="button">全部
+                            </button>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <div class="mb50 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-hide" id="mercTradeDataTab" lay-filter="mercTradeDataTab"></table>
+        </div>
+    </div>
+</div>
+<script type="text/html" id="leftBar">
+    <a class="layui-btn layui-btn-sm" lay-event="search">
+        <i class="layui-icon layui-icon-search"></i>查询
+    </a>
+</script>
+
+<script type="text/template" id="remarkForm">
+    <form class="layui-form" id="form2" style="margin-top: 2rem;">
+        <input name="id" id="id" hidden>
+        <div class="layui-form-item" style="width: 400px;">
+            <label class="layui-form-label">备注</label>
+            <div class="layui-input-block">
+                <textarea name="remark" id="remark" placeholder="备注说明" class="layui-textarea"></textarea>
+            </div>
+        </div>
+    </form>
+</script>
+
+<script type="text/html" id="lineBar">
+    <a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="followUp">
+        复制并跟进
+    </a>
+    <a class="layui-btn layui-btn-xs" lay-event="pass">
+        已通过
+    </a>
+</script>
+
+<script type="text/html" id="lineBar2">
+    <a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="addFollowUp">
+        添加
+    </a>
+    <a class="layui-btn layui-btn-xs" lay-event="followUpRecord">
+        查看
+    </a>
+</script>
+
+<script type="text/html" id="lineBar3">
+    <a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="sendNotice">
+        <i class="layui-icon layui-icon-release"></i>发送通知
+    </a>
+</script>
+
+<script>
+    layui.use(['table', 'layer', 'laydate', 'form'], function () {
+        let table = layui.table;
+        let laydate = layui.laydate;
+        let form = layui.form;
+        let fmt = "YYYY-mm-dd";
+        let date = new Date();
+        let dateTime = dateChange(0, dateFormat(fmt, date));
+        $("#date1").val(dateTime);
+        $("#date2").val(dateTime);
+        var tableIns = table.render({
+            elem: '#mercTradeDataTab'
+            , url: ctx + '/mercData/tradePage'
+            , id: 'mercTradeData'
+            , where: {
+                condition: 1,
+                startTime: dateTime,
+                endTime: dateTime,
+            }
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            , toolbar: '#leftBar' //开启头部工具栏，并为其绑定左侧模板
+            , defaultToolbar: ['filter']
+            , title: '商户交易数据统计'
+            , cols: [[
+                {type: 'checkbox', fixed: 'left', hidden: true}
+                , {field: 'numbers', title: '序号', fixed: 'left', unresize: true, width: 70, type: 'numbers'}
+                , {
+                    field: 'userId', title: '用户ID / 商户名称', minWidth: 180, templet: function (d) {
+                        return d.userId + '&emsp;&emsp;' + d.alias;
+                    }
+                }
+                , {
+                    field: 'tradeSumAmt', title: '交易金额', sort: 'true', minWidth: 130, templet: function (d) {
+                        if (d.tradeSumAmt) {
+                            return d.tradeSumAmt.toFixed(2);
+                        }
+                        return "-";
+                    }
+                }
+                , {field: 'tradeSumNum', title: '交易笔数', sort: 'true', minWidth: 100}
+                , {
+                    field: 'prevTradeSumAmt', title: '昨日金额', width: 120, templet: function (d) {
+                        if (d.prevTradeSumAmt) {
+                            return d.prevTradeSumAmt.toFixed(2);
+                        }
+                        return "-";
+                    }
+                }
+                , {
+                    field: 'prevTradeSumNum', title: '昨日笔数', minWidth: 100, templet: function (d) {
+                        if (d.prevTradeSumNum) {
+                            return d.prevTradeSumNum;
+                        }
+                        return "-";
+                    }
+                }
+                , {
+                    field: 'amtChain', title: '金额环比%', width: 100, templet: function (d) {
+                        if (d.amtChain) {
+                            return d.amtChain + "%";
+                        }
+                        return "-";
+                    }
+                }
+                , {
+                    field: 'numChain', title: '笔数环比%', width: 100, templet: function (d) {
+                        if (d.numChain) {
+                            return d.numChain + "%";
+                        }
+                        return "-";
+                    }
+                }
+                , {field: 'phone', title: '注册手机号', width: 120}
+                , {
+                    title: '异地支付', align: "center", templet: (d) => {
+                        return '<input type="checkbox" ' + (d.payEcdemicSwitch == "1" ? "checked" : "") + ' lay-filter="switchPayEcdemicSwitch" lay-skin="switch" data-userId="' + d.userId + '" lay-text="开启|关闭">';
+                    }
+                }
+                , {
+                    title: '跟进状态', align: "center", width: 80, templet: (d) => {
+                        switch (d.followStatus) {
+                            case '1':
+                                return "<span style='color: #00B83F'>已跟进</span>";
+                            case '2':
+                                return "<span style='color: #00AA91'>待验证</span>";
+                            default:
+                                return "<span style='color: red'>待跟进</span>";
+                        }
+                    }
+                }
+                , {fixed: 'right', title: '状态操作', toolbar: '#lineBar', width: 170}
+                , {fixed: 'right', title: '跟进记录', toolbar: '#lineBar2', width: 130}
+                , {fixed: 'right', title: '其他操作', toolbar: '#lineBar3', width: 120}
+            ]]
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , page: true
+        });
+        table.on('toolbar(mercTradeDataTab)', function (obj) {
+            switch (obj.event) {
+                case 'add':
+                    // 添加
+                    toAdd();
+                    break;
+                case 'search':
+                    var params = serialize($('#form1'));
+                    table.reload('mercTradeData', {
+                        where: params
+                        , page: {
+                            size: 10
+                            , current: 1
+                        }
+                    });
+                    break;
+            }
+        });
+
+        table.on('tool(mercTradeDataTab)', function (obj) {
+            switch (obj.event) {
+                case 'followUp':
+                    navigator && navigator.clipboard && navigator.clipboard.writeText(obj.data.phone).then(res => {
+                        layer.msg("已复制");
+                        layer.confirm("是否已开始跟进？", {title: '跟进确认', icon: 3}, function (index) {
+                            $.ajax({
+                                url: ctx + '/user/followUpStart'
+                                , type: 'POST'
+                                , data: {
+                                    userId: obj.data.userId
+                                }
+                                , success: function (d) {
+                                    layer.msg(d.message);
+
+                                    if (d.code === 200) {
+                                        table.reload('mercTradeData', {
+                                            where: params
+                                            , page: {
+                                                size: 10
+                                                , current: 1
+                                            }
+                                        });
+                                        layer.close(index)
+                                    }
+                                }
+                            })
+                        });
+                    }).catch(err => {
+
+                    })
+                    break;
+                case 'pass':
+                    layer.confirm("是否已跟进？", {title: '跟进确认', icon: 3}, function (index) {
+                        $.ajax({
+                            url: ctx + '/user/followUpSuccess'
+                            , type: 'POST'
+                            , data: {
+                                userId: obj.data.userId
+                            }
+                            , success: function (d) {
+                                layer.msg(d.message);
+
+                                if (d.code === 200) {
+                                    table.reload('mercTradeData', {
+                                        where: params
+                                        , page: {
+                                            size: 10
+                                            , current: 1
+                                        }
+                                    });
+                                    layer.close(index)
+                                }
+                            }
+                        })
+                    });
+                    break;
+                case 'followUpRecord':
+                    var url = ctx + "/user/followUpData?userId=" + obj.data.userId;
+                    parent.layui.index.openTabsPage(url, obj.data.userId + "-跟进详情")
+                    break;
+
+                case 'addFollowUp':
+                    layer.prompt({
+                        formType: 0
+                        , title: '添加跟进记录'
+                    }, function (value, index, elem) {
+                        $.ajax({
+                            url: ctx + "/user/addFollowUpRecord"
+                            , type: 'POST'
+                            , data: {
+                                userId: obj.data.userId
+                                , remark: value
+                            }
+                            , success: function (d) {
+                                layer.msg(d.message);
+
+                                if (d.code === 200) {
+                                    layer.close(index)
+                                }
+                            }
+                        })
+                    })
+                    break;
+                case 'sendNotice':
+                    sendNotice(obj.data);
+                    break;
+            }
+        });
+
+        function sendNotice(obj) {
+            var url = ctx + '/notice/detail?userId=' + obj.userId;
+            var index = layer.open({
+                type: 2
+                , title: "通知详情"
+                , shade: 0.5
+                , maxmin: true
+                , content: url
+                , area: ['753px', '700px']
+                , end: function () {
+                    time: 1000
+                }
+            });
+        }
+
+        //触发排序事件
+        table.on('sort(mercTradeDataTab)', function (obj) { //注：sort 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            var params = serialize($('#form1'));
+            params["field"] = obj.field;
+            params["order"] = obj.type;
+            table.reload('mercTradeData', {
+                initSort: obj //记录初始排序，如果不设的话，将无法标记表头的排序状态。
+                , where: params
+            });
+            // layer.msg('服务端排序。order by ' + obj.field + ' ' + obj.type);
+        });
+        form.on('switch(switchPayEcdemicSwitch)', function (data) {
+            let userid = $(data.elem).data().userid;
+            let param = {};
+            param.id = userid;
+            param.payEcdemicSwitch = this.checked ? '0' : '1';
+            let msg = this.checked ? '开启异地支付' : '关闭异地支付';
+            openLayer(msg, param, data);
+        })
+
+        function openLayer(title, param, data) {
+            // if(param.payEcdemicSwitch == 0){
+            //     layer.confirm('确认关闭异地支付吗?',
+            //         {icon: 3, title:'提示',cancel:function (){
+            //                 $(data.elem).prop('checked', !data.elem.checked)
+            //                 layui.form.render();//刷新表格
+            //                 layer.msg('您点击了取消！');
+            //             }}
+            //         , function(index){
+            //             layer.close(index);
+            //         },
+            //         function (){
+            //             $(data.elem).prop('checked', !data.elem.checked)
+            //             layui.form.render();//刷新表格
+            //             layer.msg('您点击了取消！');
+            //         }
+            //     );
+            // }else{
+            //     let index = layer.open({
+            //         title: title,
+            //         shade: 0.5,
+            //         maxmin: true,
+            //         area: ['550px', '300px'],
+            //         content: $("#remarkForm").html(),
+            //         btn: ['确认', '取消'],
+            //         yes: function () {
+            //
+            //         }
+            //         ,btn2: function(index, layero){
+            //             $(data.elem).prop('checked', !data.elem.checked)
+            //             layui.form.render();//刷新表格
+            //             layer.msg('您点击了拒绝！');
+            //             layer.close(index);
+            //         }
+            //     });
+            // }
+            let index = layer.open({
+                title: title,
+                shade: 0.5,
+                maxmin: true,
+                area: ['550px', '300px'],
+                content: $("#remarkForm").html(),
+                btn: ['确认', '取消'],
+                yes: function () {
+                    let remark = $("#remark").val();
+                    param.remark = remark;
+                    let index = layer.load(1, {shade: [0.1, '#000']});
+                    $.ajax({
+                        url: '${ctx}/merchantStore/payEcdemicSwitchMerchantStore',
+                        method: 'post',
+                        data: param,
+                        dataType: 'JSON',
+                        success: function (res) {
+                            layer.close(index);
+                            layer.msg(res.msg, {
+                                icon: res.resultCode == 1 ? 1 : 2
+                            });
+                        }
+                    })
+                }
+                , btn2: function (index, layero) {
+                    $(data.elem).prop('checked', !data.elem.checked)
+                    layui.form.render();//刷新表格
+                    layer.msg('您点击了拒绝！');
+                    layer.close(index);
+                },
+                cancel: function () {
+                    $(data.elem).prop('checked', !data.elem.checked)
+                    layui.form.render();//刷新表格
+                    layer.msg('您点击了拒绝！');
+                    layer.close(index);
+                }
+            });
+        }
+
+        $(".check-btn").click(function (event) {
+            $(".check-btn").each(function (index, e) {
+                $(e).removeClass("layui-border-green")
+            })
+            $(event.target).addClass("layui-border-green");
+            let val = $(event.target).data().v;
+            let date = new Date();
+            if (val == 1) {
+                let dateTime = dateChange(0, dateFormat(fmt, date));
+                $("#date1").val(dateTime);
+                $("#date2").val(dateTime);
+            } else if (val == 2) {
+                let dateTime = dateChange(-1, dateFormat(fmt, date));
+                $("#date1").val(dateTime);
+                $("#date2").val(dateTime);
+            } else {
+                let dateTime = dateChange(-1, dateFormat(fmt, date));
+                $("#date1").val("");
+                $("#date2").val(dateTime);
+            }
+            $("#condition").val(val);
+            var params = serialize($('#form1'));
+            table.reload('mercTradeData', {
+                where: params
+                , page: {
+                    size: 10
+                    , current: 1
+                }
+            });
+        })
+
+        function dateFormat(fmt, date) {
+            let ret;
+            const opt = {
+                "Y+": date.getFullYear().toString(),        // 年
+                "m+": (date.getMonth() + 1).toString(),     // 月
+                "d+": date.getDate().toString(),            // 日
+                "H+": date.getHours().toString(),           // 时
+                "M+": date.getMinutes().toString(),         // 分
+                "S+": date.getSeconds().toString()          // 秒
+                // 有其他格式化字符需求可以继续添加，必须转化成字符串
+            };
+            for (let k in opt) {
+                ret = new RegExp("(" + k + ")").exec(fmt);
+                if (ret) {
+                    fmt = fmt.replace(ret[1], (ret[1].length == 1) ? (opt[k]) : (opt[k].padStart(ret[1].length, "0")))
+                }
+                ;
+            }
+            ;
+            return fmt;
+        }
+
+        function dateChange(num = 1, date = false) {
+            if (!date) {
+                date = new Date();//没有传入值时,默认是当前日期
+                date = date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate();
+            }
+            date += " 00:00:00";//设置为当天凌晨12点
+            date = Date.parse(new Date(date)) / 1000;//转换为时间戳
+            date += (86400) * num;//修改后的时间戳
+            var newDate = new Date(parseInt(date) * 1000);//转换为时间
+            return newDate.getFullYear() + '-' + (newDate.getMonth() + 1) + '-' + newDate.getDate();
+        }
+
+        function getPreMonth(date) {
+            var arr = date.split('-');
+            var year = arr[0]; //获取当前日期的年份
+            var month = arr[1]; //获取当前日期的月份
+            var day = arr[2]; //获取当前日期的日
+            var days = new Date(year, month, 0);
+            days = days.getDate(); //获取当前日期中月的天数
+            var year2 = year;
+            var month2 = parseInt(month) - 1;
+            if (month2 == 0) {
+                year2 = parseInt(year2) - 1;
+                month2 = 12;
+            }
+            var day2 = day;
+            var days2 = new Date(year2, month2, 0);
+            days2 = days2.getDate();
+            if (day2 > days2) {
+                day2 = days2;
+            }
+            if (month2 < 10) {
+                month2 = '0' + month2;
+            }
+            var t2 = year2 + '-' + month2 + '-' + day2;
+            return t2;
+        }
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/countData/userFlowList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/countData/userFlowList.jsp
new file mode 100644
index 0000000..e5da96d
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/countData/userFlowList.jsp
@@ -0,0 +1,263 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+    <style>
+        .layui-btn+.layui-btn {
+            margin-left: -4px;
+        }
+    </style>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" id="form1" action="" style="margin-top: 10px">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">用户ID</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="userId" id="userId" placeholder="请输入用户ID"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">上级ID</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="parentId" id="parentId" placeholder="上级用户ID"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">日期</label>
+                            <div class="layui-input-inline">
+                                <input type="text" placeholder="日期" id="date1" readonly name="profitDate" autocomplete="off"
+                                       class="layui-input">
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <div class="mb50 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-hide" id="userFlowTab" lay-filter="userFlowTab"></table>
+        </div>
+    </div>
+</div>
+<script type="text/html" id="leftBar">
+    <a class="layui-btn layui-btn-sm" lay-event="search">
+        <i class="layui-icon layui-icon-search"></i>查询
+    </a>
+</script>
+
+<script>
+    layui.use(['table', 'layer','laydate','form'], function () {
+        let table = layui.table;
+        let laydate = layui.laydate;
+        let fmt = "YYYY-mm-dd";
+        let date = new Date();
+        let dateTime = dateChange(-1,dateFormat(fmt,date));
+        $("#date1").val(dateTime);
+        laydate.render({
+            elem: '#date1', //指定元素
+            format: 'yyyy-MM-dd',
+            btns: ['now','confirm']
+        });
+        var tableIns = table.render({
+            elem: '#userFlowTab'
+            , url: '${ctx}/userProft/pageData'
+            , id: 'userFlow'
+            , where: {
+                profitDate:dateTime,
+            }
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.count, //解析数据长度
+                    "data": res.data.data //解析数据列表
+                };
+            }
+            , toolbar: '#leftBar' //开启头部工具栏，并为其绑定左侧模板
+            , defaultToolbar: ['filter']
+            , defaultToolbar: ['filter', 'exports', 'print', { //自定义头部工具栏右侧图标。如无需自定义，去除该参数即可
+                title: '提示'
+                , layEvent: 'LAYTABLE_TIPS'
+                , icon: 'layui-icon-tips'
+            }]
+            , title: '用户日流水数据统计'
+            , cols: [[
+                {type: 'checkbox', fixed: 'left', hidden: true}
+                , {field: 'numbers', title: '序号', fixed: 'left', unresize: true, width: 80, type: 'numbers'}
+                , {field: 'userId', title: '用户ID'}
+                , {field: 'parentId', title: '上级ID',templet:function (d){
+                    if(d.parentId){
+                        return d.parentId;
+                    }else{
+                        return "-";
+                    }
+                }}
+                , {field: 'userName', title: '用户名称'}
+                , {field: 'roleCode', title: '用户角色',templet:function (d){
+                        if(d.roleCode == "ZY_BST"){
+                            return "<span style='color: blue' '>倍斯特</span>"
+                        }else if(d.roleCode == "SV2"){
+                            return "<span style='color: green' '>官方</span>"
+                        }else{
+                            return "未知"
+                        }
+                    }}
+                , {field: 'teamTransFlow', title: '团队流水',templet:function (d){
+                        if(d.teamTransFlow){
+                            return d.teamTransFlow.toFixed(2);
+                        }
+                        return "-";
+                    }}
+                , {field: 'transNum', title: '团队笔数'}
+                , {field: 'directTransFlow', title: '直推流水',templet:function (d){
+                        if(d.directTransFlow){
+                            return d.directTransFlow.toFixed(2);
+                        }
+                        return "-";
+                    }}
+                , {field: 'indirectTransFlow', title: '间推流水',templet:function (d){
+                        if(d.indirectTransFlow){
+                            return d.indirectTransFlow.toFixed(2);
+                        }
+                        return "-";
+                    }}
+                , {field: 'ownTransFlow', title: '自有流水',templet:function (d){
+                        if(d.ownTransFlow){
+                            return d.ownTransFlow.toFixed(2);
+                        }
+                        return "-";
+                    }}
+                , {field: 'totalProfitAmt', title: '总分润',templet:function (d){
+                        if(d.totalProfitAmt){
+                            return d.totalProfitAmt.toFixed(2);
+                        }
+                        return "-";
+                    }}
+                , {field: 'directProfitAmt', title: '直推分润',templet:function (d){
+                        if(d.directProfitAmt){
+                            return d.directProfitAmt.toFixed(2);
+                        }
+                        return "-";
+                    }}
+                , {field: 't2ProfitAmt', title: 't2收益',templet:function (d){
+                        if(d.t2ProfitAmt){
+                            return d.t2ProfitAmt.toFixed(2);
+                        }
+                        return "-";
+                    }}
+                , {field: 't3ProfitAmt', title: 't3收益',templet:function (d){
+                        if(d.t3ProfitAmt){
+                            return d.t3ProfitAmt.toFixed(2);
+                        }
+                        return "-";
+                    }}
+                , {
+                    field: 'profitDate',
+                    title: '分润日期',
+                    templet: "<div>{{layui.util.toDateString(d.profitDate,'yyyy-MM-dd')}}</div>"
+                }
+            ]]
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , page: true
+        });
+        table.on('toolbar(userFlowTab)', function (obj) {
+            switch (obj.event) {
+                case 'search':
+                    var params = serialize($('#form1'));
+                    table.reload('userFlow', {
+                        where: params
+                        , page: {
+                            size: 10
+                            , current: 1
+                        }
+                    });
+                    break;
+            }
+        });
+        //触发排序事件
+        table.on('sort(userFlowTab)', function(obj){ //注：sort 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            var params = serialize($('#form1'));
+            params["field"] = obj.field;
+            params["order"] = obj.type;
+            table.reload('userFlow', {
+                initSort: obj //记录初始排序，如果不设的话，将无法标记表头的排序状态。
+                ,where: params
+            });
+            layer.msg('服务端排序。order by '+ obj.field + ' ' + obj.type);
+        });
+        function dateFormat(fmt, date) {
+            let ret;
+            const opt = {
+                "Y+": date.getFullYear().toString(),        // 年
+                "m+": (date.getMonth() + 1).toString(),     // 月
+                "d+": date.getDate().toString(),            // 日
+                "H+": date.getHours().toString(),           // 时
+                "M+": date.getMinutes().toString(),         // 分
+                "S+": date.getSeconds().toString()          // 秒
+                // 有其他格式化字符需求可以继续添加，必须转化成字符串
+            };
+            for (let k in opt) {
+                ret = new RegExp("(" + k + ")").exec(fmt);
+                if (ret) {
+                    fmt = fmt.replace(ret[1], (ret[1].length == 1) ? (opt[k]) : (opt[k].padStart(ret[1].length, "0")))
+                };
+            };
+            return fmt;
+        }
+        function dateChange(num = 1,date = false) {
+            if (!date) {
+                date = new Date();//没有传入值时,默认是当前日期
+                date = date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate();
+            }
+            date += " 00:00:00";//设置为当天凌晨12点
+            date = Date.parse(new Date(date))/1000;//转换为时间戳
+            date += (86400) * num;//修改后的时间戳
+            var newDate = new Date(parseInt(date) * 1000);//转换为时间
+            return dateFormat("YYYY-mm-dd",newDate);
+        }
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/device/deviceBaseInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/device/deviceBaseInfo.jsp
new file mode 100644
index 0000000..5d42e62
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/device/deviceBaseInfo.jsp
@@ -0,0 +1,227 @@
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp" />
+    <link rel="stylesheet" type="text/css" href="${ctx}/page/umeditor/themes/default/css/umeditor.css">
+    <script type="text/javascript" src="${ctx}/page/umeditor/third-party/template.min.js"></script>
+    <script type="text/javascript" src="${ctx}/page/umeditor/umeditor.config.js"></script>
+    <script type="text/javascript" src="${ctx}/page/umeditor/umeditor.min.js"></script>
+    <script type="text/javascript" src="${ctx}/page/umeditor/lang/zh-cn/zh-cn.js"></script>
+    <style>
+        .layui-input,.layui-textarea{
+            border-color:#606060;
+        }
+    </style>
+</head>
+<body>
+<form class="layui-form" action="" style="width: 80%; margin-top: 20px" >
+    <input name="id" value="${entity.id}" hidden/>
+<div style="margin-left: 200px;margin-right: 200px">
+    <div class="layui-form-item">
+        <label class="layui-form-label" >设备名称:</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="name" value="${entity.name}" placeholder="请输入设备名称" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label"  >设备详情:</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+<%--                <input name="phone" value="${entity.phone}" placeholder="请输入手机号" class="layui-input"/>--%>
+                <textarea id="detail" name="detail" lay-verify="detail" style="width: 571px" placeholder="请输入内容" class="layui-textarea">${entity.detail}</textarea>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label" >单价:</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block" >
+                <input name="unitPrice" value="${entity.unitPrice}" placeholder="请输入单价" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label"  >厂家名称:</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block" >
+                <input name="venderName" value="${entity.venderName}" placeholder="请输入厂家名称" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label" >厂家型号:</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block" >
+                <input name="venderModel" value="${entity.venderModel}" placeholder="请输入厂家型号" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label" >通道机器型号:</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block" >
+                <input name="aisleModel" value="${entity.aisleModel}" placeholder="请输入通道机器型号" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label" >设备简介:</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block" >
+                <textarea placeholder="请输入设备简介" name="introDesc" id="introDesc" class="layui-textarea">${entity.introDesc}</textarea>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">排序:</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block" >
+                <input name="seq" value="${entity.seq}" placeholder="请输入排序" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">设备图片</label>
+        <div class="layui-input-block" style="display: flex;justify-content: flex-start">
+            <input name="fileKey" id="fileKey" hidden/>
+            <input type="hidden" name="deviceLogo" value="${entity.deviceLogo}" id="url"/>
+            <input name="fileName" id="fileName" class="layui-input layui-col-xs6 layui-disabled" disabled/>
+        </div>
+        <div class="layui-input-block" style="display: flex;justify-content: flex-start ; margin-top: 5px">
+            <button type="button" class="layui-btn layui-btn layui-btn-normal  layui-col-xs3"  onclick="$('#file').click();">
+                浏览...
+            </button>
+            <button type="button" class="layui-btn layui-btn-normal layui-col-xs3"  id="uploadParam">
+                上传
+            </button>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">状态</label>
+        <div class="layui-input-block">
+            <select name="status" id="status" lay-filter="aihao">
+                <option value="">请选择</option>
+                <option value="1" <c:if test="${entity.status eq '1' }">selected</c:if> >显示</option>
+                <option value="0" <c:if test="${entity.status eq '0' }">selected</c:if> >不显示</option>
+            </select>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button class="layui-btn" lay-submit lay-filter="formDemo">立即提交</button>
+            <button type="button" id="close" class="layui-btn layui-btn-primary">关闭</button>
+        </div>
+    </div>
+</div>
+</form>
+
+<form id="ajaxForm" class="layui-form" style="width: 70%" >
+    <input type="hidden" name="OSSAccessKeyId" id="accessid" value="${uploadParam.accessid}">
+    <input type="hidden" name="policy" id="policy" value="${uploadParam.policy}">
+    <input type="hidden" name="signature" id="signature" value="${uploadParam.signature}">
+    <input type="hidden" name="expire" id="expire" value="${uploadParam.expire}">
+    <input type="hidden" name="success_action_status" id="success_action_status" value="200">
+    <input type="hidden" name="key" id="key" value="${uploadParam.key}">
+    <input type="hidden" name="callBack" id="key2_callBack" value="${uploadParam.callBack}">
+    <input type="file" style="display: none" name="file" id="file" onchange="document.getElementById('fileName').value=this.files[0].name">
+</form>
+
+<script>
+    //Demo
+    layui.use(['form', 'layer'], function(){
+        var form = layui.form;
+        var layer = layui.layer;
+
+        var um = UM.getEditor('detail');
+
+        $('#close').click(function() {
+            parent.layer.closeAll();
+        });
+
+        $("#uploadParam").click(function () {
+            var fileName = $("#fileName").val();
+            if(!fileName){
+                layer.msg("请先选择文件！");
+                return;
+            }
+            var suffix = fileName.substring(fileName.lastIndexOf('.') + 1, fileName.length); //
+            var key = '${uploadParam.key}'+"."+suffix;
+            $("#key").val(key);
+            $("#fileKey").val(key);
+            var index = layer.load(1,{shade: [0.1,'#000'] });
+            $.ajax({
+                url: '${uploadParam.host}',
+                method: 'post',
+                data: new FormData($('#ajaxForm')[0]),
+                dataType:'json',
+                processData: false,
+                contentType: false,
+                success: function(res) {
+                    layer.close(index);
+                    if (res.code == 200){
+                        layer.msg("上传成功！")
+                        $("#url").val(res.url);
+                    }else{
+                        layer.msg("上传失败！")
+                    }
+                },
+                error: function (errorMsg) {
+                    layer.close(index);
+                    layer.msg("上传出错！")
+                }
+            })
+        })
+
+        //监听提交
+        form.on('submit(formDemo)', function(data){
+            var index = layer.load(1,{shade: [0.1,'#000'] });
+            var params = data.field;
+            params.detail = um.getContent();
+            $.ajax({
+                url: '${ctx}/device/saveOrUpdate',
+                method: 'post',
+                data: JSON.stringify(params),
+                dataType: 'JSON',
+                contentType:"application/json",
+                success: function(res) {
+                    layer.close(index);
+                    if(res.code == 200) {
+                        layer.alert(res.data,function(){
+                            parent.location.reload();
+                        })
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 5
+                        });
+                    }
+                }
+            })
+            return false;
+        });
+    });
+
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/device/deviceBsj/list.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/device/deviceBsj/list.jsp
new file mode 100644
index 0000000..1113041
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/device/deviceBsj/list.jsp
@@ -0,0 +1,245 @@
+<!DOCTYPE html>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <title>博实结设备列表</title>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport"
+          content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../../common.jsp"/>
+
+    <style>
+        .layui-table th {
+            text-align: center;
+        }
+
+        .layui-form-label {
+            padding: 9px 7px;
+            width: 96px;
+        }
+    </style>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head lgraybg pt10 pb10 pl10 bdbd pr10"
+                     style="display: flex; justify-content: space-between">
+                    <!-- 顶部按钮 -->
+                    <div class="fl" style="align-items: center; display: flex">
+                        <p style="align-items: center;">查询条件</p>
+                    </div>
+
+                    <div class="tools" style="align-items: center; display: flex">
+                        <a class="layui-btn layui-btn-normal layui-btn-sm import" id="import"
+                           style="align-items: center;">
+                            <i class="layui-icon layui-icon-upload"></i>导入
+                        </a>
+                        <a href="javascript:void(0);" class="collapse f14 dgray mr5"
+                           style="display: inline-block; align-items: center; margin-left: 30px;">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" action="" style="margin-top: 10px" lay-filter="formCondition">
+                    <div class="layui-form-item">
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">厂家编号</label>
+                            <div class="layui-input-inline">
+                                <input type="text" id="deviceNo" name="deviceNo" placeholder="请输入厂家编号"
+                                       class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">设备编号</label>
+                            <div class="layui-input-inline">
+                                <input type="text" id="snNo" name="snNo" placeholder="请输入设备编号"
+                                       class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">IMEI</label>
+                            <div class="layui-input-inline">
+                                <input type="text" id="imei" name="imei" placeholder="请输入IMEI"
+                                       class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">ICCID</label>
+                            <div class="layui-input-inline">
+                                <input type="text" id="iccid" name="iccid" placeholder="请输入ICCID"
+                                       class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">SIM</label>
+                            <div class="layui-input-inline">
+                                <input type="text" id="sim" name="sim" placeholder="请输入SIM卡号"
+                                       class="layui-input">
+                            </div>
+                        </div>
+
+                    </div>
+                </form>
+            </div>
+        </div>
+
+        <!-- 表单数据 -->
+        <table class="layui-hide" id="tableList" lay-filter="tableList"></table>
+    </div>
+</div>
+
+<script id="toolBar" type="text/html">
+    <a class="layui-btn layui-btn-sm" lay-event="search">
+        <i class="layui-icon layui-icon-search"></i>查询
+    </a>
+
+    <a class="layui-btn layui-btn-danger layui-btn-sm" lay-event="sendExpiredNotice">
+        <i class="layui-icon layui-icon-release"></i>一键发送流量到期通知
+    </a>
+</script>
+
+<script type="text/javascript">
+    var layer;
+    var laytpl;
+    var form;
+    var table;
+    var laydate;
+    var dropdown;
+
+    //form表单样式
+    layui.use(['table', 'layer', 'form', 'laydate', 'dropdown', 'upload'], function () {
+        layer = layui.layer;
+        laytpl = layui.laytpl;
+        form = layui.form;
+        table = layui.table;
+        laydate = layui.laydate;
+        dropdown = layui.dropdown;
+        form.render();
+
+        var upload = layui.upload;
+
+        //执行实例
+        var uploadInst = upload.render({
+            elem: '.import' //绑定元素
+            , url: ctx + '/deivceBsj/importExpiredTime' //上传接口
+            , accept: 'file'
+            , acceptMime: 'file/xlsx, file/xls'
+            , exts: 'xlsx|xls'
+            , done: function (res) {
+                layer.alert(res.message);
+            }
+            , error: function () {
+
+            }
+        });
+
+        $("#userId").bind("input propertychange", function (event) {
+            if ($("#userId").val() == null || $("#userId").val() == "") {
+                $("#sameIp").attr("disabled", true);
+                $("#sameIp").removeAttr("checked");
+                $("#sameIp").prop({checked: false});
+            } else {
+                $("#sameIp").attr("disabled", false);
+            }
+
+            form.render();
+        });
+
+        //执行一个 table 实例
+        table.render({
+            elem: '#tableList'
+            , id: 'tableList'
+            , url: ctx + '/deivceBsj/page' //数据接口
+            , autoSort: false
+            , where: form.val("formCondition")
+            , response: {
+                statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , even: true
+            , title: '博实结设备列表'
+            , page: true //开启分页
+            , toolbar: '#toolBar' //开启工具栏，此处显示默认图标，可以自定义模板，详见文档
+            , defaultToolbar: ['filter']
+            , cols: [[ //表头
+                {field: 'deviceNo', title: '厂家编号', minWidth: 86, align: "left"}
+                , {field: 'imei', title: 'IMEI', minWidth: 86, align: "left"}
+                , {field: 'iccid', title: 'ICCID', minWidth: 86, align: "left"}
+                , {field: 'sim', title: 'SIM卡号', minWidth: 86, align: "left"}
+                , {field: 'snNo', title: '设备编号', minWidth: 86, align: "left"}
+                , {
+                    field: 'simExpireTime',
+                    title: '过期时间',
+                    align: "left",
+                    minWidth: 160,
+                    templet: "<div>{{layui.util.toDateString(d.simExpireTime,'yyyy-MM-dd HH:mm:ss')}}</div>"
+                }
+            ]]
+
+        });
+
+        table.on('toolbar(tableList)', function (obj) {
+            switch (obj.event) {
+                case 'search':
+                    queryUserApp();
+                    break;
+                case 'sendExpiredNotice':
+                    layer.confirm('是否发送流量卡到期通知', {icon: 3, title: '提示'}, function (index) {
+                        var url = ctx + "/deivceBsj/sendExpiredTime";
+
+                        $.ajax({
+                            url: url,
+                            type: "POST",
+                            success: function (d) {
+                                layer.alert(d.message);
+                            }
+                        });
+
+                        layer.close(index);
+                    });
+                    break;
+            }
+        });
+    });
+
+    //查询
+    function queryUserApp() {
+        table.reload('tableList', {
+            page: {
+                curr: 1
+            }
+            , where: form.val("formCondition")
+        });
+    }
+</script>
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/device/deviceDetails.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/device/deviceDetails.jsp
new file mode 100644
index 0000000..79a7b54
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/device/deviceDetails.jsp
@@ -0,0 +1,59 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>     
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">                      
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black"> 
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> 
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->                                     
+<meta name="viewport"
+	content="width=device-width, initial-scale=1.0, maximum-scale=1.0">   
+<jsp:include page="../../common.jsp" />
+<link rel="stylesheet" type="text/css" href="${ctx}/page/umeditor/themes/default/css/umeditor.css">
+<script type="text/javascript" src="${ctx}/page/umeditor/third-party/template.min.js"></script>
+<script type="text/javascript" src="${ctx}/page/umeditor/umeditor.config.js"></script>
+<script type="text/javascript" src="${ctx}/page/umeditor/umeditor.min.js"></script>
+<script type="text/javascript" src="${ctx}/page/umeditor/lang/zh-cn/zh-cn.js"></script>
+<script type="text/javascript">
+    require("device/deviceDetails.js");
+</script>
+<title>编辑</title>
+</head>                                 
+	<body class="lgraybg">            
+		<div class="	container-fluid animated fadeInRight col-sm-12">
+			<div class="panel-toolbar mt10 mb10 pt5 pb5 pl10 bdd whitebg">
+				<div class="buttons">
+					<a href="javascript:void(0);" class="btn btn-primary fa fa-save f12"><span>保存</span></a>
+					<a href="${ctx }/device/index?pageIndex=${pageIndex}"  class="btn btn-primary fa fa-back f12" id="goback"><span>返回</span></a>
+				</div>
+			</div>
+				<div class="tabs-container whitebg">
+					<div class="pt10 pl5 pr5">
+						<ul class="nav nav-tabs" id="nav-tabs">
+							<li class="active" data-action="base">   
+								<a href="javascript:void(0);" >基本资料</a>
+							</li>
+							<!-- <li class="" data-action="functions">
+								<a href="javascript:void(0);"  >多功能输入</a>
+							</li>
+							<li class="" data-action="extends">
+								<a href="javascript:void(0);" >扩展属性</a>
+							</li> -->
+						</ul>
+						<div class="tab-content pt30 p30">               
+		
+						</div>     
+					</div>
+				</div>    
+		</div>
+		<!-- 隐藏域 -->
+		<input type="hidden" id="deviceId" value="${device.id }"/>
+	</body>
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/device/deviceExtendsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/device/deviceExtendsInfo.jsp
new file mode 100644
index 0000000..592687a
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/device/deviceExtendsInfo.jsp
@@ -0,0 +1,201 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>           
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> 
+<div class="tab-pane active">      
+	<div class="animated fadeInRight">
+		<div class="whitebg pl10 pr10">
+			<table class="table table-striped table-bordered table-hover">     
+				<thead> 
+					<tr>  
+						<th class="textc">序号</th>         
+						<th class="textc wp15">流水账号</th>
+						<th class="textc">日期</th>         
+						<th class="textc">财务类别</th>     
+						<th class="textc">金额</th>         
+						<th class="textc">银行</th>         
+						<th class="textc">发票</th>         
+						<th class="textc">客户名称</th>     
+						<th class="textc wp15">单号</th>    
+						<th class="textc">状态</th>         
+						<th class="textc">类别</th>         
+						<th class="textc">操作</th>         
+					</tr> 
+				</thead>
+				<tbody> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+                
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="green">支出</span></td>     
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+				</tbody>
+                
+			</table>  
+			<!-- footer -->  
+			<div class="clearfix mb10 pb20">          
+					<div class="layui-tab-item fr">       
+							<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+							<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>   
+							<div class="pagination dlblock vm" id="pagination"></div>
+							<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>            
+					</div>
+				</div>  
+		</div>      
+	</div>        
+</div>          
+                
+<script type="text/javascript">    
+//分页          
+$('#pagination').pagination({        
+	pageCount: 50,
+	jump: true,   
+	coping: true, 
+	homePage: '首页',    
+	endPage: '末页',     
+	prevContent: '上页', 
+	nextContent: '下页', 
+	callback: function(api) {          
+		$('.now').text(api.getCurrent());
+	}             
+});             
+</script>       
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/device/deviceFunctionsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/device/deviceFunctionsInfo.jsp
new file mode 100644
index 0000000..982ce84
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/device/deviceFunctionsInfo.jsp
@@ -0,0 +1,130 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>		
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">      
+<div class="tab-pane active">
+				<div class="panel-body">
+					<div class="wrapper wrapper-content">     
+						<div class="panel-form animated fadeInRight wp60 fc">
+							<!-- 账号资料 -->
+			<div class="layui-form-item 	has-error">
+				<label class="layui-form-label">单行输入框<i class="red">*</i></label>
+				<div class="layui-input-block">
+					<input type="text" name="title" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input">
+				</div>                                         
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">自定义验证</label>
+				<div class="layui-input-inline ml30">
+					<input type="password" name="password" lay-verify="pass" placeholder="请输入密码" autocomplete="off" class="layui-input">
+				</div>
+				<div class="layui-form-mid layui-word-aux">请填写6到12位密码</div>
+			</div>
+			<div class="form-group">
+				<div class="layui-form-item">          
+					<label class="layui-form-label">单行选择框</label>
+					<div class="layui-input-block">
+						<select name="interest" lay-filter="aihao">  
+							<option value=""></option>
+							<option value="0">写作</option>         
+							<option value="1" selected="">阅读</option>
+							<option value="2">游戏</option>
+							<option value="3">音乐</option>
+							<option value="4">旅行</option>  
+						</select>              
+					</div>
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<div class="layui-inline">  
+					<label class="layui-form-label">范围</label>
+					<div class="layui-input-inline ml30">
+						<input type="text" name="price_min" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>                                     
+					<div class="layui-form-mid">-</div>
+					<div class="layui-input-inline">       
+						<input type="text" name="price_max" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>
+				</div>           
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">联动选择框</label>
+				<div class="layui-input-inline ml30">
+					<select name="quiz1">     
+						<option value="">请选择省</option>
+						<option value="浙江" selected="">浙江省</option> 
+						<option value="你的工号">江西省</option>           
+						<option value="你最喜欢的老师">福建省</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz2">
+						<option value="">请选择市</option>
+						<option value="杭州">杭州</option>
+						<option value="宁波" disabled="">宁波</option>
+						<option value="温州">温州</option>
+						<option value="温州">台州</option>
+						<option value="温州">绍兴</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz3">
+						<option value="">请选择县/区</option>
+						<option value="西湖区">西湖区</option>
+						<option value="余杭区">余杭区</option>
+						<option value="拱墅区">临安市</option>
+					</select>
+				</div>    
+			</div>
+			<div class="layui-form-item" pane="">   
+				<label class="layui-form-label">原始复选框</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="like1[write]" lay-skin="primary" title="写作" checked="">  
+					<input type="checkbox" name="like1[read]" lay-skin="primary" title="阅读">
+					<input type="checkbox" name="like1[game]" lay-skin="primary" title="游戏" disabled="">
+				</div>
+			</div>
+
+			<div class="layui-form-item">
+				<label class="layui-form-label">开关-默认关</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="close" lay-skin="switch" lay-text="ON|OFF">
+				</div>
+			</div>
+			<div class="layui-form-item">  
+				<label class="layui-form-label">单选框</label>
+				<div class="layui-input-block">
+					<input type="radio" name="sex" value="男" title="男" checked="">
+					<input type="radio" name="sex" value="女" title="女">
+					<input type="radio" name="sex" value="禁" title="禁用" disabled="">
+				</div>
+			</div>
+			<!--<div class="layui-form-item layui-form-text">
+				<label class="layui-form-label">上传图片</label>
+				<div class="layui-input-block">
+					<div class="layui-upload-drag w200 h200">
+						<i class="layui-icon"></i>          
+						<p>点击上传</p>
+					</div>
+				</div>
+			</div>-->
+				<div class="layui-form-item layui-form-text">
+					<label class="layui-form-label">普通文本域</label>  
+					<div class="layui-input-block">              
+						<textarea placeholder="请输入内容" class="layui-textarea"></textarea>
+					</div>
+				</div>
+			</div>
+		</div>   
+	</div>
+</div>
+</form>   
+<script type="text/javascript">
+	//form表单样式
+	layui.use(['layer', 'form'], function() {    
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+</script>                 
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/device/deviceList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/device/deviceList.jsp
new file mode 100644
index 0000000..3be5fed
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/device/deviceList.jsp
@@ -0,0 +1,270 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+</head>
+<body>
+<div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+    <div class="toolbar-panel bdd">
+        <!--搜索条件 -->
+        <form action="${ctx}/device/page" method="get" id="condition" class="layui-form">
+            <div class="toolbar-body">
+                <div class="row pt10 pb10 whitebg ml0 mr0">
+                    <span class="dlblock w100 textr">设备名称:</span>
+                    <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+							<input type="text" placeholder="请输入设备名称" id="name" name="name" value="">
+						</span>
+                    <span class="dlblock w100 textr">厂家名称:</span>
+                    <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+							<input type="text" placeholder="请输入厂家名称" id="venderName" name="venderName" value="">
+						</span>
+                    <span class="dlblock w100 textr">厂家型号:</span>
+                    <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+							<input type="text" placeholder="请输入厂家型号" id="venderModel" name="venderModel" value="">
+						</span>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">状态</label>
+                        <div class="layui-input-inline">
+                            <select id="status">
+                                <option value="">请选择</option>
+                                <option value="0">不显示</option>
+                                <option value="1">显示</option>
+                            </select>
+                        </div>
+                    </div>
+                    <br>
+                    <br>
+                    <span class="dlblock w100 textr">开始日期:</span>
+                    <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+							 <input type="text" placeholder="" id="date1" name="startTime"
+                                    class="w150"/>
+							 <i class="fa fa-calendar"></i>
+						</span>
+                    <span class="dlblock w100 textr">结束日期:</span>
+                    <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+						<input type="text" placeholder="" id="date2" name="endTime"
+                               class="w150"/>
+							<i class="fa fa-calendar"></i>
+						</span>
+                </div>
+            </div>
+        </form>
+    </div>
+</div>
+
+<table class="layui-hide" id="deviceTab" lay-filter="deviceTab"></table>
+
+<script type="text/html" id="toolbarDemo">
+    <div class="layui-btn-container">
+        <button class="layui-btn layui-btn-sm" lay-event="add">添加</button>
+        <button class="layui-btn layui-btn-sm" lay-event="search">查询</button>
+    </div>
+</script>
+
+<script id="barDemo" type="text/html">
+    <button class="layui-btn layui-btn-xs"
+            lay-mDropdown="{template: '#toolbarMenu'}">
+        <span>操作</span>
+        <i class="layui-icon layui-icon-triangle-d"></i>
+    </button>
+</script>
+
+<script type="text/html" id="toolbarMenu">
+    <a href="javascript:void(0);" lay-event="edit"
+       class="layui-btn layui-btn-radius layui-btn-xs fa fa-edit ops_more f12">编&emsp;&emsp;辑</a>
+    </br> <a href="javascript:void(0);" lay-event="particulars"
+             class="layui-btn layui-btn-xs layui-btn-radius fa fa-edit ops_more f12">设备详情</a>
+    </br><a href="javascript:void(0);" lay-event="del"
+            class="layui-btn layui-btn-radius layui-btn-xs layui-btn-danger fa fa-remove ops_more f12">删&emsp;&emsp;除</a>
+</script>
+
+<script type="text/html" id="deviceLogo">
+    <img src="{{d.deviceLogo}}">
+</script>
+
+<script type="text/html" id="statu">
+    {{#  if(d.status == 0 ){ }}
+    <span class="layui-badge ">不显示</span>
+    {{#} else { }}
+    <span class="layui-badge layui-bg-green">显示</span>
+    {{#} }}
+</script>
+
+<script>
+    layui.use(['table', 'layer','laydate','mDropdown'], function () {
+        var table = layui.table;
+        var layer = layui.layer;
+		laydate = layui.laydate;
+        dropdown = layui.mDropdown;
+		laydate.render({
+			elem: '#date1', //指定元素
+            format:'yyyy-MM-dd 00:00:00'
+		});
+		laydate.render({
+			elem: '#date2', //指定元素
+            format:'yyyy-MM-dd 23:59:59'
+		});
+
+        var tableIns = table.render({
+            elem: '#deviceTab'
+            , url: '${ctx}/device/page'
+            , initSort: {
+                field: 'createTime'
+                , type: 'desc'
+            }
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.count, //解析数据长度
+                    "data": res.data.data //解析数据列表
+                };
+            }
+            , toolbar: '#toolbarDemo' //开启头部工具栏，并为其绑定左侧模板
+            , defaultToolbar: ['filter', 'exports', 'print', { //自定义头部工具栏右侧图标。如无需自定义，去除该参数即可
+                title: '提示'
+                , layEvent: 'LAYTABLE_TIPS'
+                , icon: 'layui-icon-tips'
+            }]
+            , title: '设备商城表'
+            , cols: [[
+                {type: 'checkbox', fixed: 'left', hidden: true}
+                , {field: 'numbers', title: '序号', fixed: 'left', unresize: true, width: 80, sort: true, type: 'numbers'}
+                , {field: 'name', title: '设备名称'}
+                , {field: 'deviceLogo', title: '设备图片', templet: "#deviceLogo"}
+                , {field: 'venderName', title: '厂家名称'}
+                , {field: 'venderModel', title: '厂家型号'}
+                , {field: 'status', title: '状态', templet: "#statu"}
+                , {field: 'unitPrice', title: '单价'}
+                , {field: 'seq', title: '排序'}
+                , {
+                    field: 'createDt', title: '创建时间', sort: true,
+                    templet: "<div>{{layui.util.toDateString(d.createDt, 'yyyy-MM-dd HH:mm:ss')}}</div>"
+                }
+                , {fixed: 'right', title: '操作',width:80, toolbar: '#barDemo'}
+            ]]
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , page: true
+            , done: function (res) {
+                dropdown.suite();
+            }
+        });
+
+        //头工具栏事件
+        table.on('toolbar(deviceTab)', function (obj) {
+            switch (obj.event) {
+                case 'add':
+                    // 添加
+                    toAdd();
+                    break;
+                case 'search':
+                    // 查询
+                    tableIns.reload({
+                        where: { //设定异步数据接口的额外参数，任意设
+                            name: $("#name").val(),
+                            venderName: $("#venderName").val(),
+                            venderModel: $("#venderModel").val(),
+                            status: $("#status").val(),
+                            startTime: $("#date1").val(),
+                            endTime: $("#date2").val()
+                        }
+                        , page: {
+                            curr: 1 //重新从第 1 页开始
+                        }
+                    });
+                    break;
+            }
+        });
+
+        //监听行工具事件
+        table.on('tool(deviceTab)', function (obj) {
+            var data = obj.data;
+            //console.log(obj)
+            if (obj.event === 'del') {
+                layer.confirm('真的删除行么?', function (index) {
+                    obj.del(data);
+                    layer.close(index);
+                    del(obj);
+                });
+            } else if (obj.event === 'edit') {
+                toAdd(obj.data);
+            } else if (obj.event === 'particulars'){
+                particulars(obj.data);
+            }
+        });
+
+        function particulars(obj) {
+            if (obj != undefined) {
+                url = "${ctx}/device/particulars/" + obj.id
+            }
+            var index = layer.open({
+                type: 2
+                , shade: 0.5
+                , maxmin: true
+                , content: url
+                , area: ['550px', '300px']
+            });
+            layer.full(index);
+        }
+
+
+        function toAdd(obj) {
+            var url = '${ctx}/device/detail/';
+            if (obj != undefined) {
+                url = "${ctx}/device/detail/" + obj.id
+            }
+            var index = layer.open({
+                type: 2
+                , shade: 0.5
+                , maxmin: true
+                , content: url
+                , area: ['550px', '300px']
+            });
+            layer.full(index);
+        }
+
+        function del(obj) {
+            $.ajax({
+                url: '${ctx}/device/delete',
+                method: 'post',
+                data: JSON.stringify(obj.data),
+                dataType: 'JSON',
+                contentType: "application/json",
+                success: function (res) {
+                    if (res.code == 200) {
+                        layer.msg(res.data, {
+                            icon: 1
+                        });
+                    } else {
+                        layer.msg(res.data, {
+                            icon: 5
+                        });
+                    }
+                }
+            })
+        }
+    });
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/device/express/detailList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/device/express/detailList.jsp
new file mode 100644
index 0000000..e23a066
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/device/express/detailList.jsp
@@ -0,0 +1,82 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../../common.jsp"/>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+
+    <div class="mb50 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-hide" id="mercOrderExpressDetailTab" lay-filter="mercOrderExpressDetailTab"></table>
+        </div>
+    </div>
+</div>
+<script>
+    layui.use(['table', 'layer'], function () {
+        var table = layui.table;
+        var layer = layui.layer;
+
+        var tableIns = table.render({
+            elem: '#mercOrderExpressDetailTab'
+            , url: '${ctx}/mercOrderExpressDetail/page'
+            , id: 'mercOrderExpressDetail'
+            , where:{
+                expressNo : '${expressNo}'
+            }
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            , defaultToolbar: ['filter']
+            , defaultToolbar: ['filter', 'exports', 'print', { //自定义头部工具栏右侧图标。如无需自定义，去除该参数即可
+                title: '提示'
+                , layEvent: 'LAYTABLE_TIPS'
+                , icon: 'layui-icon-tips'
+            }]
+            , title: '订单物流详情'
+            , cols: [[
+                {type: 'checkbox', fixed: 'left', hidden: true}
+                , {field: 'orderNo', title: '订单号',width: 200}
+                , {field: 'expressNo', title: '快递单号',width: 150}
+                , {field: 'remark', title: '备注'}
+                , {field: 'questionCause', title: '失败原因',width: 100}
+                , {field: 'weight', title: '重量(kg)',width: 100}
+                , {
+                    field: 'acceptTime',
+                    title: '处理时间',
+                    width: 140,
+                    templet: "<div>{{layui.util.toDateString(d.acceptTime,'yyyy-MM-dd HH:mm')}}</div>"
+                 }
+            ]]
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , page: true
+        });
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/device/order/detailList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/device/order/detailList.jsp
new file mode 100644
index 0000000..4b6c2a8
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/device/order/detailList.jsp
@@ -0,0 +1,816 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../../common.jsp"/>
+    <style>
+        .layui-form-select {
+            width: 182px;
+        }
+
+        .layui-input-block {
+            width: 55%;
+        }
+
+        .refund-status {
+            display: none;
+        }
+        /*layui-table 表格内容允许换行*/
+        .layui-table-cell {
+            height: auto !important;
+            white-space: normal;
+        }
+        .ellipsis{
+            width: 100px;
+            white-space:nowrap;
+            overflow:hidden;
+            text-overflow:ellipsis;
+        }
+        .layui-btn+.layui-btn {
+            margin-left: 0px;
+        }
+    </style>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" id="form1" action="" style="margin-top: 10px;">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">用户ID</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="userId" id="userId" placeholder="请输入用户ID"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">用户角色</label>
+                            <div class="layui-input-block">
+                                <select id="roleCode" name="roleCode">
+                                    <option value="">请选择</option>
+                                    <option value="SV2">官方</option>
+                                    <option value="ZY_BST">倍斯特</option>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">商品名称</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="name" placeholder="请输入商品名称"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">订单号</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="orderNo" placeholder="请输入订单号"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">商户简称</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="merchant.alias" placeholder="请输入商户简称"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">收货人</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="order.receiver" placeholder="请输入收货人"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">手机号</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="order.phone" placeholder="请输入收货人手机号"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">快递单号</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="expressNo" placeholder="请输入快递单号"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">订单状态</label>
+                            <div class="layui-input-block">
+                                <select id="status" name="status">
+                                    <option value="">请选择</option>
+                                    <option value="00">待支付</option>
+                                    <option value="01">已支付</option>
+                                    <option value="02">发起退货</option>
+                                    <option value="12">已同意退款</option>
+
+                                    <option value="13">等待退款中</option>
+                                    <option value="03">退款成功</option>
+                                    <option value="04">退款失败</option>
+                                    <option value="05">待收货</option>
+                                    <option value="06">已完成</option>
+                                    <option value="07">部分退款</option>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">物流状态</label>
+                            <div class="layui-input-block">
+                                <select id="expressStatus" name="expressStatus">
+                                    <option value="">请选择</option>
+                                    <option value="00">待发货</option>
+                                    <option value="10">已发货</option>
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <div class="mb50 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-hide" id="mercOrderDetailTab" lay-filter="mercOrderDetailTab"></table>
+        </div>
+    </div>
+</div>
+
+<script type="text/template" id="refund">
+    <form class="layui-form" id="form2" style="margin-top: 1rem;">
+        <input name="id" id="id" hidden>
+        <div class="layui-form-item" style="width: 350px;">
+            <label class="layui-form-label">退款金额</label>
+            <div class="layui-input-block">
+                <input type="number" id="refundAmt" autocomplete="off" class="layui-input">
+            </div>
+        </div>
+        <div class="layui-form-item" style="width: 350px;">
+            <label class="layui-form-label">退款原因</label>
+            <div class="layui-input-block">
+                <textarea placeholder="退款原因" id="refundReason" autocomplete="off" class="layui-textarea"></textarea>
+            </div>
+        </div>
+        <div class="layui-form-item" style="width: 350px;">
+            <label class="layui-form-label">审核</label>
+            <div class="layui-input-block">
+                <select class="layui-select" id="refundStatus" name="status" lay-filter="refundStatus">
+                    <option value="">请选择</option>
+                    <option value="1">通过</option>
+                    <option value="2">驳回</option>
+                </select>
+            </div>
+        </div>
+        <div class="layui-form-item refund-status refund-status-2" style="width: 350px;">
+            <label class="layui-form-label">驳回原因</label>
+            <div class="layui-input-block">
+                <textarea placeholder="请输入驳回原因" name="rejectRemark" id="rejectRemark" autocomplete="off"
+                          class="layui-textarea"></textarea>
+            </div>
+        </div>
+        <div class="layui-form-item refund-status refund-status-1" style="width: 350px;">
+            <label class="layui-form-label">手机号</label>
+            <div class="layui-input-block">
+                <select class="layui-select" id="phone" name="phone" lay-filter="phone">
+                    <option value="">请选择</option>
+                    <c:forEach items="${phoneList}" var="p">
+                        <option value="${p.phone}">${p.phone}(${p.name})</option>
+                    </c:forEach>
+                </select>
+            </div>
+        </div>
+        <div class="layui-form-item refund-status refund-status-1" style="width: 350px;">
+            <label class="layui-form-label">验证码</label>
+            <div class="layui-input-block" style="display: flex;justify-content: flex-start">
+                <input type="text" id="verifyCode" autocomplete="off" class="layui-input">
+                <button type="button" class="layui-btn" onclick="getVerifyCode()">发送</button>
+            </div>
+        </div>
+        <div class="layui-form-item" style="width: 350px;">
+            <label class="layui-form-label">备注</label>
+            <div class="layui-input-block">
+                <span style="color: red">审核通过会发起退款请求，交易金额会原路退回，请仔细核对后再确认</span>
+            </div>
+        </div>
+    </form>
+</script>
+
+<script type="text/html" id="leftBar">
+    <a class="layui-btn layui-btn-sm" lay-event="print">
+        <i class="layui-icon layui-icon-print"></i>打印单号
+    </a>
+    <a class="layui-btn layui-btn-sm layui-btn-normal" lay-event="inputExpressNo">
+        <i class="layui-icon layui-icon-edit"></i>填写单号
+    </a>
+    <a class="layui-btn layui-btn-sm" lay-event="search">
+        <i class="layui-icon layui-icon-search"></i>查询
+    </a>
+</script>
+
+<script type="text/template" id="refundDetail">
+    <form class="layui-form" id="form3" style="margin-top: 1rem;">
+        <div class="layui-form-item" style="width: 350px;">
+            <label class="layui-form-label">退款单号</label>
+            <div class="layui-input-block">
+                <input type="text" id="refundNo" autocomplete="off" class="layui-input">
+            </div>
+        </div>
+        <div class="layui-form-item" style="width: 350px;">
+            <label class="layui-form-label">退款快递号</label>
+            <div class="layui-input-block">
+                <input type="text" id="refundExpressNo" autocomplete="off" class="layui-input">
+            </div>
+        </div>
+        <div class="layui-form-item" style="width: 350px;">
+            <label class="layui-form-label">退款金额</label>
+            <div class="layui-input-block">
+                <input type="number" id="showRefundAmt" autocomplete="off" class="layui-input">
+            </div>
+        </div>
+        <div class="layui-form-item" style="width: 350px;">
+            <label class="layui-form-label">退款时间</label>
+            <div class="layui-input-block">
+                <input type="text" id="showRefundTime" autocomplete="off" class="layui-input">
+            </div>
+        </div>
+        <div class="layui-form-item" style="width: 350px;">
+            <label class="layui-form-label">退款原因</label>
+            <div class="layui-input-block">
+                <textarea placeholder="退款原因" id="showRefundReason" autocomplete="off" class="layui-textarea"></textarea>
+            </div>
+        </div>
+        <div class="layui-form-item" style="width: 350px;">
+            <label class="layui-form-label">退款备注</label>
+            <div class="layui-input-block">
+                <textarea placeholder="退款备注" id="refundRemark" autocomplete="off" class="layui-textarea"></textarea>
+            </div>
+        </div>
+    </form>
+</script>
+
+<script type="text/template" id="inputExpressNo">
+    <form class="layui-form" id="form4" style="margin-top: 1rem;">
+        <div class="layui-form-item" style="width: 350px;">
+            <label class="layui-form-label">快递单号</label>
+            <div class="layui-input-block">
+                <input type="text" id="expressNo" autocomplete="off" class="layui-input">
+            </div>
+        </div>
+    </form>
+</script>
+
+<script type="text/template" id="appointDevice">
+    <form class="layui-form" id="form5" style="margin-top: 1rem;">
+        <div class="layui-form-item" style="width: 500px;">
+            <label class="layui-form-label">设备名称</label>
+            <div class="layui-input-block">
+                <input type="text" id="name" autocomplete="off" class="layui-input" readonly>
+            </div>
+        </div>
+        <div class="layui-form-item" style="width: 500px;">
+            <label class="layui-form-label">设备数量</label>
+            <div class="layui-input-block">
+                <input type="text" id="num" autocomplete="off" class="layui-input" readonly>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">设备SN号</label>
+            <div class="layui-input-inline">
+                <input type="text" id="startSnNo" autocomplete="off" class="layui-input">
+            </div>
+            <div class="layui-input-inline">
+                <input type="text" id="endSnNo" autocomplete="off" class="layui-input">
+            </div>
+        </div>
+    </form>
+</script>
+
+<script type="text/html" id="toolBar">
+    {{# if (d.status == "02") { }}
+    <a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="refundReject">
+        <i class="layui-icon layui-icon-close-fill"></i>驳回
+    </a>
+    {{# if (d.expressNo == null || d.expressNo == "") { }}
+    <a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="refundDirect">
+        <i class="layui-icon layui-icon-ok"></i>仅退款
+    </a>
+    {{# } else if (d.refundExpressNo == null || d.refundExpressNo == ""){ }}
+    <a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="agreeRefund">
+        <i class="layui-icon layui-icon-ok"></i>同意退货
+    </a>
+    {{# } }}
+    {{# } }}
+    {{# if (d.status == "13") { }}
+    <a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="refundReject">
+        <i class="layui-icon layui-icon-close-fill"></i>驳回
+    </a>
+    {{# } }}
+
+    {{# if (d.status != "00" || d.status != "02" || d.status != '03') { }}
+    <a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="refund">
+        <i class="layui-icon layui-icon-ok"></i>退款
+    </a>
+    {{# } }}
+
+    {{# if (d.status == "03") { }}
+    <a class="layui-btn layui-btn-xs" lay-event="refundDetail">
+        <i class="layui-icon layui-icon-list"></i>退款详情
+    </a>
+    {{# } }}
+    {{# if (d.status == "05" || d.status == "06") { }}
+    <a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="showExpressDetail">
+        <i class="layui-icon layui-icon-list"></i>物流详情
+    </a>
+    {{# } }}
+    {{# if ( (d.status == "02" || d.status == "03" || d.status == "04") && d.picList.length > 0) { }}
+    <a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="showPicList">
+        <i class="layui-icon layui-icon-list"></i>图片
+    </a>
+    {{# } }}
+</script>
+
+<script>
+    layui.use(['table', 'layer', 'form'], function () {
+        let table = layui.table;
+        let layer = layui.layer;
+        let form = layui.form;
+
+        let tableIns = table.render({
+            elem: '#mercOrderDetailTab'
+            , url: ctx + '/mercOrderDetail/pageInfo'
+            , id: 'mercOrderDetail'
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            ,done: function(res, curr, count){
+                $(".layui-table-main tr").each(function (index, val) {
+                    $($(".layui-table-fixed-l .layui-table-body tbody tr")[index]).height($(val).height());
+                    $($(".layui-table-fixed-r .layui-table-body tbody tr")[index]).height($(val).height());
+                })
+            }
+            , toolbar: '#leftBar' //开启头部工具栏，并为其绑定左侧模板
+            , title: '新版订单详情表'
+            , cols: [[
+                {type: 'checkbox', fixed: 'left', hidden: true}
+                , {
+                    field: 'userId', title: 'ID/角色', width: 85, templet: function (d) {
+                        let userId = d.userId;
+                        let roleName = d.roleCode == 'ZY_BST' ? '倍斯特' : '官方';
+                        return userId + "<br/>" + roleName;
+                    }
+                }
+                , {field: 'name', title: '规格/商品/订单号', width: 160,templet:function (d){
+                    return "<span class='ellipsis'>" +d.specName+ "</span><br/>" +"<span class='ellipsis'>" +d.name+ "</span><br/>" + d.orderNo;
+                    }}
+                , {
+                    title: '总价(含邮费)/邮费', width: 150, templet: function (d) {
+                        return (d.price * d.num + d.postage).toFixed(2) + "<br/>" + d.postage.toFixed(2);
+                    }
+                }
+                , {
+                    field: 'price', title: '单价/数量', width: 100, templet: function (d) {
+                        return d.price.toFixed(2) + "<br/>" + d.num;
+                    }
+                }
+                , {
+                    field: 'alias', title: '商户简称', width: 170, templet: function (d) {
+                        if(d.merchant && d.merchant.alias){
+                            return d.merchant.alias;
+                        }
+                        return '-';
+                    }
+                }
+                , {
+                    field: 'receiver', title: '收货人信息', width: 170, templet: function (d) {
+                        return d.order.receiver +"&nbsp;"+ d.order.phone + "<br/><span class='ellipsis'>" +(d.order.areaName.replaceAll('-',''))+d.order.address + "</span>";
+                    }
+                }
+                , {field: 'logistNo', title: '物流/快递单号', width: 150,templet:function (d){
+                    let text = "";
+                    let flag = false;
+                    if(d.logistNo){
+                        text += d.logistNo;
+                        flag = true;
+                    }
+                    if(d.expressNo){
+                        if(flag){
+                            text += "<br/>";
+                        }
+                        text += d.expressNo;
+                    }
+                    return text;
+                }}
+                , {field: 'refundExpressNo', title: '退款快递号', width: 150}
+                , {
+                    field: 'createTime',
+                    title: '时间',
+                    width: 150,
+                    templet: "<div>{{layui.util.toDateString(d.createTime,'yyyy-MM-dd HH:mm')}}</div>"
+                }
+                , {field: 'expressStatusDesc', fixed: 'right', width: 100, title: '物流状态'}
+                , {
+                    field: 'status', title: '订单状态', width: 90, fixed: 'right', templet: function (d) {
+                        if (d.status == "00") {
+                            return "待支付";
+                        }
+                        if (d.status == "01") {
+                            return "<span style='color: green'>已支付</span>";
+                        }
+                        if (d.status == "02") {
+                            return "<span style='color: #ff4400'>发起退货</span>";
+                        }
+                        if (d.status == "12") {
+                            return "<span style='color: #ff4400'>已同意退款</span>";
+                        }
+                        if (d.status == "13") {
+                            return "<span style='color: #ff4400'>等待退款中</span>";
+                        }
+                        if (d.status == "03") {
+                            return "<span style='color: #0fcff1'>退款成功</span>";
+                        }
+                        if (d.status == "04") {
+                            return "<span style='color: red'>退款失败</span>";
+                        }
+                        if (d.status == "05") {
+                            return "<span style='color: blue'>待收货</span>";
+                        }
+                        if (d.status == "06") {
+                            return "<span style='color: #6ff602'>已完成</span>";
+                        }
+                        if (d.status == "07") {
+                            return "<span style='color: #f14c04'>部分退款</span>";
+                        }
+                    }
+                }
+                , {title: '操作', fixed: 'right', width: 120, toolbar: '#toolBar'}
+            ]]
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , page: true
+        });
+        form.on('select(refundStatus)', function (data) {
+            let value = data.value;
+            $(".refund-status").hide();
+            $(".refund-status-" + value).show();
+        })
+
+        table.on('tool(mercOrderDetailTab)', function (obj) { //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            var data = obj.data; //获得当前行数据
+            var layEvent = obj.event; //获得 lay-event 对应的值（也可以是表头的 event 参数对应的值）
+            if (layEvent === 'refundDirect') { //退款
+                let index = layer.open({
+                    type: 1,
+                    title: '仅退款',
+                    shade: 0.5,
+                    maxmin: true,
+                    area: ['400', '550'],
+                    btn: ['确认', '取消'],
+                    content: $("#refund").html(),
+                    success: function (d) {
+                        form.render("select");
+                        $("#refundAmt").val(data.refundAmt.toFixed(2));
+                        $("#refundExpressNo").val(data.refundExpressNo);
+                        $("#refundReason").val(data.refundReason);
+                        $("#id").val(data.id);
+                    },
+                    yes: function (index, layero) {
+                        let op = $("#refundStatus").val();
+                        let mk = $("#rejectRemark").val();
+                        let id = data.id;
+                        let rm = $("#refundAmt").val();
+                        let ph = $("#phone").val();
+                        let vc = $("#verifyCode").val();
+                        if (!op) {
+                            return layer.msg("请先选择审核状态");
+                        }
+                        if (op == '1') {
+                            if (!ph) {
+                                return layer.msg("请选择发送验证码的手机号");
+                            }
+                            if (!vc) {
+                                return layer.msg("请输入验证码");
+                            }
+                        }
+                        if (op == '2' && !mk) {
+                            return layer.msg("审核驳回，需填写驳回原因");
+                        }
+                        let d = {
+                            id: id,
+                            status: op == '1' ? '03' : '04',
+                            rejectRemark: mk,
+                            refundAmt: rm,
+                            phone: ph,
+                            verifyCode: vc
+                        };
+                        refundSubmit(d, index);
+                    },
+                    btn2: function (index, layero) {
+                        layer.close(index);
+                    },
+                });
+            } else if (layEvent === "agreeRefund") {
+                // TODO 同意退货
+                layer.confirm("同意退货", {icon: 3}, function () {
+                    $.ajax({
+                        url: ctx + "/mercOrderDetail/refundAgree",
+                        type: 'post',
+                        data: data,
+                        success: (res) => {
+                            parent.layer.msg(res.message);
+                        }
+                    })
+                });
+            } else if (layEvent === "refund") {
+                // TODO 退货退款
+                let index = layer.open({
+                    type: 1,
+                    title: '退货退款',
+                    shade: 0.5,
+                    maxmin: true,
+                    area: ['400px', '550px'],
+                    btn: ['确认', '取消'],
+                    content: $("#refund").html(),
+                    success: function (d) {
+                        form.render("select");
+                        $("#refundAmt").val(data.refundAmt.toFixed(2));
+                        $("#refundExpressNo").val(data.refundExpressNo);
+                        $("#refundReason").val(data.refundReason);
+                        $("#id").val(data.id);
+                    },
+                    yes: function (index, layero) {
+                        let op = $("#refundStatus").val();
+                        let mk = $("#rejectRemark").val();
+                        let id = data.id;
+                        let rm = $("#refundAmt").val();
+                        let ph = $("#phone").val();
+                        let vc = $("#verifyCode").val();
+                        if (!op) {
+                            return layer.msg("请先选择审核状态");
+                        }
+                        if (op == '1') {
+                            if (!ph) {
+                                return layer.msg("请选择发送验证码的手机号");
+                            }
+                            if (!vc) {
+                                return layer.msg("请输入验证码");
+                            }
+                        }
+                        if (op == '2' && !mk) {
+                            return layer.msg("审核驳回，需填写驳回原因");
+                        }
+                        let d = {
+                            id: id,
+                            status: op == '1' ? '03' : '04',
+                            rejectRemark: mk,
+                            refundAmt: rm,
+                            phone: ph,
+                            verifyCode: vc
+                        };
+                        refundSubmit(d, index);
+                    },
+                    btn2: function (index, layero) {
+                        layer.close(index);
+                    },
+                });
+            } else if (layEvent === "refundReject") {
+                // TODO 拒绝退款
+                layer.open({
+                    type: 2,
+                    title: '拒绝退款',
+                    shade: 0.5,
+                    maxmin: true,
+                    area: ['400px', '400px'],
+                    content: ctx + "/mercOrderDetail/refundReject/" + data.id
+                });
+            } else if (layEvent === 'refundDetail') {
+                let index = layer.open({
+                    type: 1,
+                    title: '退款详情',
+                    shade: 0.5,
+                    maxmin: true,
+                    area: ['400', '550'],
+                    content: $("#refundDetail").html(),
+                    success: function (d) {
+                        $("#refundNo").val(data.refundNo);
+                        $("#showRefundAmt").val(data.refundAmt.toFixed(2));
+                        $("#showRefundTime").val(data.refundTime);
+                        $("#refundExpressNo").val(data.refundExpressNo);
+                        $("#showRefundReason").val(data.refundReason);
+                        $("#refundRemark").val(data.refundRemark);
+                    },
+                });
+            } else if (layEvent === 'showPicList') {
+                let picList = data.picList;
+                let obj = {title: "投诉图片详情", id: 1, start: 0};
+                let d = [];
+                $.each(picList, function (k, v) {
+                    let pd = {"alt": "投诉图片", "pid": k, "src": v};
+                    d.push(pd);
+                })
+                obj.data = d;
+                layer.photos({
+                    photos: obj
+                    , anim: 5 //0-6的选择，指定弹出图片动画类型，默认随机（请注意，3.0之前的版本用shift参数）
+                });
+            } else if (layEvent === 'showExpressDetail') {
+                if (data.expressNo === "" || data.expressNo == null) {
+                    layer.msg("暂无物流信息");
+                    return;
+                }
+
+                let url = ctx + '/mercOrderExpressDetail/index?expressNo=' + data.expressNo;
+                let index = layer.open({
+                    type: 2,
+                    title: '物流详情',
+                    shade: 0.5,
+                    maxmin: true,
+                    area: ['90%', '90%'],
+                    content: url
+                });
+            }
+        });
+
+        /**
+         * 发起退款操作
+         * @param obj
+         */
+        function refundSubmit(obj, index) {
+            var dialog = layer.msg('加载中...', {icon: 16, time: 0, shade: [0.3, '#000', false]});
+            let url = ctx + "/mercOrderDetail/auditRefund";
+            $.ajax({
+                url: url,
+                type: 'post',
+                data: obj,
+                success: (res) => {
+                    layer.close(dialog);
+                    if (res.code == 200) {
+                        layer.close(index);
+                        tableIns.reload();
+                    }
+                    layer.msg(res.message, {
+                        icon: res.code == 200 ? 1 : 2
+                    });
+                }
+            })
+        }
+
+        //监听头工具栏事件
+        table.on('toolbar(mercOrderDetailTab)', function (obj) {
+            var checkStatus = table.checkStatus('mercOrderDetail');
+            let data = checkStatus.data;
+            switch (obj.event) {
+                case 'search':
+                    var params = serialize($('#form1'));
+                    table.reload('mercOrderDetail', {
+                        where: params
+                        , page: {
+                            size: 10
+                            , current: 1
+                        }
+                    });
+                    break;
+                case 'print':
+                    if (data.length == 0) {
+                        return layer.msg("至少选中一行数据");
+                    }
+                    let title = "确定打印物流单号吗？";
+                    if (data.length > 1) {
+                        title = "选中多条数据时会打印合并成一条快递物流数据,若所选订单中包含收货地址不同的,请勿一起打印！";
+                    }
+                    let flag = false;
+                    let ids = [];
+                    $.each(data, function (k, v) {
+                        if (v.status != '01') {
+                            flag = true;
+                            return;
+                        }
+                        ids.push(v.id);
+                    })
+                    if (flag) {
+                        return layer.msg("只能处理已支付的订单！");
+                    }
+                    let confirm = layer.confirm(title, {icon: 3}, function (index) {
+                        let url = ctx + "/mercOrderDetail/print";
+                        var dialog = layer.msg('加载中...', {icon: 16, time: 0, shade: [0.3, '#000', false]});
+                        $.post(url, {ids: ids}, function (res) {
+                            layer.close(dialog);
+                            layer.close(confirm);
+                            if (res.code == 200) {
+                                tableIns.reload();
+                            }
+                            layer.msg(res.message, {
+                                icon: res.code == 200 ? 1 : 2
+                            });
+                        })
+                    });
+                    break;
+                case "inputExpressNo":
+                    if (data.length == 0) {
+                        return layer.msg("至少选中一行数据");
+                    }
+                    if (data.length >= 2) {
+                        return layer.msg("最多选中一行数据");
+                    }
+                    let id = data[0].id;
+                    let index = layer.open({
+                        type: 1,
+                        title: '填写快递单号',
+                        shade: 0.5,
+                        maxmin: true,
+                        area: ['400', '200'],
+                        content: $("#inputExpressNo").html(),
+                        btn: ["确认", "取消"],
+                        yes: function (res) {
+                            var dialog = layer.msg('加载中...', {icon: 16, time: 0, shade: [0.3, '#000', false]});
+                            let url = ctx + "/mercOrderDetail/inputExpressNo";
+                            let expressNo = $("#expressNo").val();
+                            if (!expressNo) {
+                                return layer.msg("请输入快递物流单号");
+                            }
+                            let params = {id: id, expressNo: expressNo};
+                            $.ajax({
+                                url: url,
+                                data: params,
+                                type: 'post',
+                                success: function (res) {
+                                    layer.close(index);
+                                    layer.close(dialog);
+                                    if (res.code == 200) {
+                                        tableIns.reload();
+                                    }
+                                    layer.msg(res.message, {
+                                        icon: res.code == 200 ? 1 : 2
+                                    });
+                                }
+                            })
+                        }
+                    });
+                    break;
+            }
+        });
+    });
+
+    /**
+     * 获取验证码
+     */
+    function getVerifyCode() {
+        let phone = $("#phone").val();
+        if (!phone) {
+            return layer.msg("请先选择发送验证码的手机号")
+        }
+        let url = ctx + "/mercOrderDetail/getVerifyCode";
+        var dialog = layer.msg('加载中...', {icon: 16, time: 0, shade: [0.3, '#000', false]});
+        $.post(url, {phone: phone}, function (res) {
+            layer.close(dialog);
+            layer.msg(res.message, {
+                icon: res.code == 200 ? 1 : 2
+            });
+        })
+    }
+
+    function reloadTable() {
+        tableIns.reload();
+    }
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/device/order/list.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/device/order/list.jsp
new file mode 100644
index 0000000..ed970bd
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/device/order/list.jsp
@@ -0,0 +1,252 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../../common.jsp"/>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" id="form1" action="" style="margin-top: 10px;">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">用户ID</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="userId" id="userId" placeholder="请输入用户ID"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">订单号</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="orderNo" id="orderNo" placeholder="请输入订单号"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">收货人</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="receiver" id="receiver" placeholder="请输入收货人"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">收货人手机</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="phone" id="phone" placeholder="请输入收货人手机"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">订单状态</label>
+                            <div class="layui-input-block">
+                                <select id="status" name="status">
+                                    <option value="">请选择</option>
+                                    <option value="00">待支付</option>
+                                    <option value="01">已支付</option>
+                                    <option value="02">已退款</option>
+                                    <option value="03">退款审核中</option>
+                                    <option value="04">已完成</option>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">支付方式</label>
+                            <div class="layui-input-block">
+                                <select id="payType" name="payType">
+                                    <option value="">请选择</option>
+                                    <option value="aliPay">支付宝</option>
+                                    <option value="wechatPay">微信</option>
+                                    <option value="bank">银联</option>
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <div class="mb50 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-hide" id="mercOrderNewTab" lay-filter="mercOrderNewTab"></table>
+        </div>
+    </div>
+</div>
+<script type="text/html" id="leftBar">
+    <a class="layui-btn layui-btn-sm" lay-event="search">
+        <i class="layui-icon layui-icon-search"></i>查询
+    </a>
+</script>
+
+<script type="text/html" id="toolBar">
+    <a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="detail">
+        <i class="layui-icon layui-icon-list"></i>详情
+    </a>
+    <%--    <a class="layui-btn layui-btn-xs" lay-event="edit">--%>
+    <%--        <i class="layui-icon layui-icon-edit"></i>编辑--%>
+    <%--    </a>--%>
+    <%--    <a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="del">--%>
+    <%--        <i class="layui-icon layui-icon-delete"></i>删除--%>
+    <%--    </a>--%>
+</script>
+
+<script>
+    layui.use(['table', 'layer'], function () {
+        var table = layui.table;
+        var layer = layui.layer;
+
+        var tableIns = table.render({
+            elem: '#mercOrderNewTab'
+            , url: ctx + '/mercOrderNew/page'
+            , id: 'mercOrderNew'
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            , toolbar: '#leftBar' //开启头部工具栏，并为其绑定左侧模板
+            , defaultToolbar: ['filter']
+            , defaultToolbar: ['filter', 'exports', 'print', { //自定义头部工具栏右侧图标。如无需自定义，去除该参数即可
+                title: '提示'
+                , layEvent: 'LAYTABLE_TIPS'
+                , icon: 'layui-icon-tips'
+            }]
+            , title: '新版订单表'
+            , cols: [[
+                {type: 'checkbox', fixed: 'left', hidden: true}
+                , {field: 'numbers', title: '序号', fixed: 'left', unresize: true, width: 80, type: 'numbers'}
+                , {field: 'userId', title: '用户ID', width: 85}
+                , {field: 'orderNo', title: '订单号'}
+                , {
+                    field: 'orderAmt', title: '订单金额', width: 90, templet: function (d) {
+                        return d.orderAmt.toFixed(2);
+                    }
+                }
+                , {
+                    field: 'discountAmt', title: '优惠金额', width: 90, templet: function (d) {
+                        return d.discountAmt.toFixed(2);
+                    }
+                }
+                , {
+                    field: 'postage', title: '邮费', width: 90, templet: function (d) {
+                        return d.postage.toFixed(2);
+                    }
+                }
+                , {
+                    field: 'actualAmt', title: '实付金额', width: 90, templet: function (d) {
+                        return d.actualAmt.toFixed(2);
+                    }
+                }
+                , {field: 'receiver', title: '收货人', width: 100}
+                , {field: 'phone', title: '收货人手机', width: 130}
+                , {
+                    field: 'payType', title: '支付方式', templet: function (d) {
+                        return d.payType === "aliPay" ? "支付宝" : d.payType === "wechatPay" ? "微信" : "银联";
+                    }
+                }
+                , {
+                    field: 'status', title: '支付状态', templet: function (d) {
+                        if (d.status == "00") {
+                            return "待支付";
+                        }
+                        if (d.status == "01") {
+                            return "<span style='color: green'>已支付</span>";
+                        }
+                        if (d.status == "02") {
+                            return "<span style='color: red'>已退款</span>";
+                        }
+                        if (d.status == "03") {
+                            return "<span style='color: #f36b22'>退款审核中</span>";
+                        }
+                        if (d.status == "04") {
+                            return "<span style='color: blue'>已完成</span>";
+                        }
+                    }
+                }
+                , {
+                    field: 'transDt',
+                    title: '支付时间',
+                    templet: "<div>{{layui.util.toDateString(d.transDt,'yyyy-MM-dd HH:mm')}}</div>"
+                }
+                , {
+                    field: 'createTime',
+                    title: '创建时间',
+                    templet: "<div>{{layui.util.toDateString(d.createTime,'yyyy-MM-dd HH:mm')}}</div>"
+                }
+                , {fixed: 'right', title: '操作', width: 100, toolbar: '#toolBar'}
+            ]]
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , page: true
+        });
+        table.on('tool(mercOrderNewTab)', function (obj) { //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            var data = obj.data; //获得当前行数据
+            var layEvent = obj.event; //获得 lay-event 对应的值（也可以是表头的 event 参数对应的值）
+            if (layEvent === 'detail') { //详情
+                let url = ctx + '/mercOrderDetail/index?orderNo=' + data.orderNo;
+                let index = layer.open({
+                    type: 2,
+                    title: '订单详情',
+                    shade: 0.5,
+                    maxmin: true,
+                    area: ['90%', '90%'],
+                    content: url
+                });
+            }
+        });
+        //监听头工具栏事件
+        table.on('toolbar(mercOrderNewTab)', function (obj) {
+            switch (obj.event) {
+                case 'search':
+                    var params = serialize($('#form1'));
+                    table.reload('mercOrderNew', {
+                        where: params
+                        , page: {
+                            size: 10
+                            , current: 1
+                        }
+                    });
+                    break;
+            }
+        });
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/device/order/reject.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/device/order/reject.jsp
new file mode 100644
index 0000000..cc67dd3
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/device/order/reject.jsp
@@ -0,0 +1,63 @@
+<%--
+  Created by IntelliJ IDEA.
+  User: DJH
+  Date: 2022/5/11
+  Time: 10:41
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<!DOCTYPE html>
+<html>
+<head>
+    <title>拒绝退款</title>
+
+    <jsp:include page="../../../common.jsp"/>
+</head>
+<body>
+<form class="layui-form" id="form2" style="margin-top: 1rem; width: 80%;" lay-filter="demo1">
+    <input name="id" id="id" value="${entity.id}" hidden>
+    <div class="layui-form-item" style="width: 350px;">
+        <label class="layui-form-label">退款原因</label>
+        <div class="layui-input-block">
+            <textarea placeholder="退款原因" name="refundReason" id="refundReason" autocomplete="off"
+                      class="layui-textarea">${entity.refundReason}</textarea>
+        </div>
+    </div>
+    <div class="layui-form-item refund-status refund-status-2" style="width: 350px;">
+        <label class="layui-form-label">驳回原因</label>
+        <div class="layui-input-block">
+                <textarea placeholder="请输入驳回原因" name="rejectRemark" id="rejectRemark" autocomplete="off"
+                          class="layui-textarea"></textarea>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button type="submit" class="layui-btn" lay-submit="" lay-filter="demo1">确认驳回</button>
+        </div>
+    </div>
+</form>
+
+<script>
+    layui.use(['layer', 'form'], function () {
+        var form = layui.form;
+
+        form.on('submit(demo1)', function (data) {
+
+            var url = ctx + "/mercOrderDetail/refundReject";
+
+            $.ajax({
+                url: ctx + "/mercOrderDetail/refundReject",
+                type: 'post',
+                data: data.field,
+                success: (res) => {
+                    parent.layer.msg(res.message)
+                    var index = parent.layer.getFrameIndex(window.name);
+                    parent.layer.close(index);//关闭当前页
+                }
+            })
+            return false;
+        });
+    })
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/device/particulars.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/device/particulars.jsp
new file mode 100644
index 0000000..dd70b73
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/device/particulars.jsp
@@ -0,0 +1,64 @@
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp" />
+    <link rel="stylesheet" type="text/css" href="${ctx}/page/umeditor/themes/default/css/umeditor.css">
+    <script type="text/javascript" src="${ctx}/page/umeditor/third-party/template.min.js"></script>
+    <script type="text/javascript" src="${ctx}/page/umeditor/umeditor.config.js"></script>
+    <script type="text/javascript" src="${ctx}/page/umeditor/umeditor.min.js"></script>
+    <script type="text/javascript" src="${ctx}/page/umeditor/lang/zh-cn/zh-cn.js"></script>
+    <style>
+        .layui-input,.layui-textarea{
+            border-color:#606060;
+        }
+    </style>
+</head>
+<body>
+<form class="layui-form" action="" style="width: 100%; margin-top: 20px" >
+    <input name="id" value="${entity.id}" hidden/>
+    <div style="margin-left: 50px;margin-right: 50px">
+        <div class="layui-form-item">
+            <label class="layui-form-label"  >设备详情:</label>
+            <div class="layui-input-block" style="margin-left:0px">
+                <div class="layui-input-block">
+                    <textarea id="detail" name="detail" lay-verify="detail" style="width: 1000px;height: 1000px" placeholder="请输入内容" class="layui-textarea">${entity.detail}</textarea>
+                </div>
+            </div>
+        </div>
+    </div>
+</form>
+
+<form id="ajaxForm" class="layui-form" style="width: 70%" >
+    <input type="hidden" name="OSSAccessKeyId" id="accessid" value="${uploadParam.accessid}">
+    <input type="hidden" name="policy" id="policy" value="${uploadParam.policy}">
+    <input type="hidden" name="signature" id="signature" value="${uploadParam.signature}">
+    <input type="hidden" name="expire" id="expire" value="${uploadParam.expire}">
+    <input type="hidden" name="success_action_status" id="success_action_status" value="200">
+    <input type="hidden" name="key" id="key" value="${uploadParam.key}">
+    <input type="hidden" name="callBack" id="key2_callBack" value="${uploadParam.callBack}">
+    <input type="file" style="display: none" name="file" id="file" onchange="document.getElementById('fileName').value=this.files[0].name">
+</form>
+
+<script>
+    //Demo
+    layui.use(['form', 'layer'], function(){
+        var form = layui.form;
+        var layer = layui.layer;
+        var um = UM.getEditor('detail');
+        $('#close').click(function() {
+            parent.layer.closeAll();
+        });
+    });
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/device/spec/detail.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/device/spec/detail.jsp
new file mode 100644
index 0000000..fa658bf
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/device/spec/detail.jsp
@@ -0,0 +1,129 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../../common.jsp" />
+    <style>
+        .layui-form-item{
+            margin-top: 10px;
+        }
+        .layui-form{
+            width: 70%;
+            margin-left: 10%;
+        }
+    </style>
+</head>
+<body>
+<form class="layui-form" action="">
+    <input name="id" value="${entity.id}" hidden/>
+    <div class="layui-form-item">
+        <label class="layui-form-label">类型名称</label>
+        <div class="layui-input-block">
+            <select class="layui-select" name="code" autocomplete="off" lay-filter="code" lay-verify="required">
+                <option value="">请选择</option>
+                <c:forEach items="${codeList}" var="c">
+                    <option value="${c.code}" ${c.code == entity.code ? 'selected' : ''}>${c.name}</option>
+                </c:forEach>
+            </select>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">规格名称</label>
+        <div class="layui-input-block">
+            <input name="specName" value="${entity.specName}" autocomplete="off" maxlength="20" placeholder="请输入规格名称" class="layui-input" lay-verify="required" />
+        </div>
+    </div>
+     <div class="layui-form-item">
+        <label class="layui-form-label">规格Code</label>
+        <div class="layui-input-block">
+            <input name="spec" value="${entity.spec}" autocomplete="off" maxlength="20" placeholder="请输入规格Code" class="layui-input" lay-verify="required" />
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">类型</label>
+        <div class="layui-input-block">
+            <select class="layui-select" name="type" autocomplete="off" lay-verify="required">
+                <option value="">请选择</option>
+                <option value="1" ${entity.type eq '1' ? 'selected' : ''}>主扫设备（商户扫顾客）</option>
+                <option value="2" ${entity.type eq '2' ? 'selected' : ''}>被扫设备（顾客扫商户）</option>
+                <option value="3" ${entity.type eq '3' ? 'selected' : ''}>其他</option>
+            </select>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">是否包邮</label>
+        <div class="layui-input-block">
+            <select class="layui-select" name="postageFlag" autocomplete="off" lay-verify="required">
+                <option value="">请选择</option>
+                <option value="00" ${entity.postageFlag eq '00' ? 'selected' : ''}>包邮</option>
+                <option value="01" ${entity.postageFlag eq '01' ? 'selected' : ''}>不包邮</option>
+            </select>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">重量(kg)</label>
+        <div class="layui-input-block">
+            <input type="number" name="weight" value="${entity.weight}" autocomplete="off" maxlength="20" placeholder="请输入重量(kg)" class="layui-input" lay-verify="required" />
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label" >规格描述</label>
+        <div class="layui-input-block">
+            <textarea placeholder="请输入规格描述" name="specDesc" class="layui-textarea">${entity.specDesc}</textarea>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button class="layui-btn" lay-submit lay-filter="formDemo">立即提交</button>
+            <button type="button" id="close" class="layui-btn layui-btn-primary">关闭</button>
+        </div>
+    </div>
+</form>
+
+<script>
+    layui.use(['form','layer'], function(){
+        var form = layui.form;
+        var layer = layui.layer;
+        $('#close').click(function() {
+            parent.layer.closeAll();
+        });
+            //监听提交
+        form.on('submit(formDemo)', function(data){
+            var index = layer.load(1,{shade: [0.1,'#000'] });
+            $.ajax({
+                url: '${ctx}/deviceSpec/save',
+                method: 'post',
+                data: JSON.stringify(data.field),
+                dataType: 'JSON',
+                contentType:"application/json",
+                success: function(res) {
+                    layer.close(index);
+                    if(res.code == 200) {
+                        layer.msg(res.message, { icon: 1, time: 1000 }, function () {
+                            var index = parent.layer.getFrameIndex(window.name);
+                            parent.layui.table.reload('deviceSpec');
+                            parent.layer.close(index);
+                        });
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 2
+                        });
+                    }
+                }
+            })
+            return false;
+        });
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/device/spec/list.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/device/spec/list.jsp
new file mode 100644
index 0000000..daf668c
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/device/spec/list.jsp
@@ -0,0 +1,231 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../../common.jsp"/>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" id="form1" action="" style="margin-top: 10px;">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">类型code</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="code" id="code" placeholder="请输入类型code"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">规格名称</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="specName" id="specName" placeholder="请输入规格名称"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">是否包邮</label>
+                            <div class="layui-input-block">
+                                <select id="postageFlag" name="postageFlag">
+                                    <option value="">请选择</option>
+                                    <option value="00">包邮</option>
+                                    <option value="01">不包邮</option>
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <div class="mb50 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-hide" id="deviceSpecTab" lay-filter="deviceSpecTab"></table>
+        </div>
+    </div>
+</div>
+<script type="text/html" id="leftBar">
+    <a class="layui-btn layui-btn-sm layui-btn-normal" lay-event="add">
+        <i class="layui-icon layui-icon-add-circle"></i>新增
+    </a>
+<%--    <a class="layui-btn layui-btn-sm layui-btn-danger" lay-event="delete">--%>
+<%--        <i class="layui-icon layui-icon-delete"></i>删除--%>
+<%--    </a>--%>
+    <a class="layui-btn layui-btn-sm" lay-event="search">
+        <i class="layui-icon layui-icon-search"></i>查询
+    </a>
+</script>
+
+<script type="text/html" id="toolBar">
+    <a class="layui-btn layui-btn-xs" lay-event="edit">
+        <i class="layui-icon layui-icon-edit"></i>编辑
+    </a>
+    <a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="del">
+        <i class="layui-icon layui-icon-delete"></i>删除
+    </a>
+</script>
+
+<script>
+    layui.use(['table', 'layer'], function () {
+        var table = layui.table;
+        var layer = layui.layer;
+
+        var tableIns = table.render({
+            elem: '#deviceSpecTab'
+            , url: '${ctx}/deviceSpec/page'
+            , id: 'deviceSpec'
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            , toolbar: '#leftBar' //开启头部工具栏，并为其绑定左侧模板
+            , defaultToolbar: ['filter']
+            , defaultToolbar: ['filter', 'exports', 'print', { //自定义头部工具栏右侧图标。如无需自定义，去除该参数即可
+                title: '提示'
+                , layEvent: 'LAYTABLE_TIPS'
+                , icon: 'layui-icon-tips'
+            }]
+            , title: '商品规格表'
+            , cols: [[
+                {type: 'checkbox', fixed: 'left', hidden: true}
+                , {field: 'numbers', title: '序号', fixed: 'left', unresize: true, width: 80, type: 'numbers'}
+                , {field: 'code', title: '类型code'}
+                , {field: 'specName', title: '规格名称'}
+                , {field: 'spec', title: '规格code'}
+                , {field: 'postageFlag', title: '是否包邮',templet: function (d){
+                    if(d.postageFlag === '00'){
+                        return '<span style="color: green">包邮</span>';
+                    }else{
+                        return '<span style="color: blue">不包邮</span>';
+                    }
+                    }}
+                , {field: 'weight', title: '重量(kg)',templet:function (d){
+                    return d.weight.toFixed(2);
+                    }}
+                , {field: 'specDesc', title: '规格描述'}
+                , {
+                    field: 'createTime',
+                    title: '创建时间',
+                    templet: "<div>{{layui.util.toDateString(d.createTime,'yyyy-MM-dd HH:mm')}}</div>"
+                }
+                , {fixed: 'right', title: '操作', toolbar: '#toolBar'}
+            ]]
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , page: true
+        });
+        table.on('tool(deviceSpecTab)', function (obj) { //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            var data = obj.data; //获得当前行数据
+            var layEvent = obj.event; //获得 lay-event 对应的值（也可以是表头的 event 参数对应的值）
+            if (layEvent === 'del') { //删除
+                layer.confirm('真的删除么?', {icon: 3}, function (index) {
+                    obj.del(); //删除对应行（tr）的DOM结构，并更新缓存
+                    layer.close(index);
+                    del(data);
+                    //向服务端发送删除指令
+                });
+            } else if (layEvent === 'edit') { //编辑
+                //do something
+                toAdd(obj.data);
+                //同步更新缓存对应的值
+                // obj.update({
+                //     username: '123'
+                //     ,title: 'xxx'
+                // });
+            }
+        });
+
+        //监听头工具栏事件
+        table.on('toolbar(deviceSpecTab)', function (obj) {
+            switch (obj.event) {
+                case 'add':
+                    // 添加
+                    toAdd();
+                    break;
+                case 'search':
+                    var params = serialize($('#form1'));
+                    table.reload('deviceSpec', {
+                        where: params
+                        , page: {
+                            size: 10
+                            , current: 1
+                        }
+                    });
+                    break;
+            }
+        });
+        function toAdd(obj) {
+            var url = '${ctx}/deviceSpec/detail';
+            var title = "新增";
+            if (obj != undefined) {
+                url = "${ctx}/deviceSpec/detail/" + obj.id;
+                title = "编辑"
+            }
+            var index = layer.open({
+                type: 2
+                , shade: 0.5
+                , title: title
+                , maxmin: true
+                , content: url
+                , area: ['500px', '620px']
+                , end: function () {
+
+                }
+            });
+        }
+
+        function del(obj) {
+            $.ajax({
+                url: '${ctx}/deviceSpec/del/' + obj.id,
+                method: 'DELETE',
+                dataType: 'JSON',
+                contentType: "application/json",
+                success: function (res) {
+                    layer.msg(res.message, {
+                        icon: res.code == 200 ? 1: 2
+                    });
+                }
+            })
+        }
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/device/tag/detail.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/device/tag/detail.jsp
new file mode 100644
index 0000000..7267d3f
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/device/tag/detail.jsp
@@ -0,0 +1,86 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../../common.jsp" />
+    <style>
+        .layui-form-item{
+            margin-top: 10px;
+        }
+        .layui-form{
+            width: 70%;
+            margin-left: 10%;
+        }
+    </style>
+</head>
+<body>
+<form class="layui-form" action="">
+    <input name="id" value="${entity.id}" hidden/>
+    <div class="layui-form-item">
+        <label class="layui-form-label">标签</label>
+        <div class="layui-input-block">
+            <input name="tag" value="${entity.tag}" autocomplete="off" maxlength="20" placeholder="请输入标签名称" class="layui-input" lay-verify="required" />
+        </div>
+    </div>
+
+     <div class="layui-form-item">
+        <label class="layui-form-label">规格Code</label>
+        <div class="layui-input-block">
+            <input type="number" name="sort" value="${entity.sort}" autocomplete="off" maxlength="20" placeholder="请输入序号" class="layui-input" lay-verify="required" />
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button class="layui-btn" lay-submit lay-filter="formDemo">立即提交</button>
+            <button type="button" id="close" class="layui-btn layui-btn-primary">关闭</button>
+        </div>
+    </div>
+</form>
+
+<script>
+    layui.use(['form','layer'], function(){
+        var form = layui.form;
+        var layer = layui.layer;
+        $('#close').click(function() {
+            parent.layer.closeAll();
+        });
+            //监听提交
+        form.on('submit(formDemo)', function(data){
+            var index = layer.load(1,{shade: [0.1,'#000'] });
+            $.ajax({
+                url: ctx + '/deviceGoodTag/save',
+                method: 'post',
+                data: JSON.stringify(data.field),
+                dataType: 'JSON',
+                contentType:"application/json",
+                success: function(res) {
+                    layer.close(index);
+                    if(res.code == 200) {
+                        layer.msg(res.message, { icon: 1, time: 1000 }, function () {
+                            var index = parent.layer.getFrameIndex(window.name);
+                            parent.layui.table.reload('deviceSpec');
+                            parent.layer.close(index);
+                        });
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 2
+                        });
+                    }
+                }
+            })
+            return false;
+        });
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/device/tag/list.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/device/tag/list.jsp
new file mode 100644
index 0000000..6de433e
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/device/tag/list.jsp
@@ -0,0 +1,191 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../../common.jsp"/>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" id="form1" action="" style="margin-top: 10px;">
+                    <div class="layui-form-item">
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <div class="mb50 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-hide" id="deviceGoodTag" lay-filter="deviceGoodTag"></table>
+        </div>
+    </div>
+</div>
+<script type="text/html" id="leftBar">
+    <a class="layui-btn layui-btn-sm layui-btn-normal" lay-event="add">
+        <i class="layui-icon layui-icon-add-circle"></i>新增
+    </a>
+<%--    <a class="layui-btn layui-btn-sm layui-btn-danger" lay-event="delete">--%>
+<%--        <i class="layui-icon layui-icon-delete"></i>删除--%>
+<%--    </a>--%>
+    <a class="layui-btn layui-btn-sm" lay-event="search">
+        <i class="layui-icon layui-icon-search"></i>查询
+    </a>
+</script>
+
+<script type="text/html" id="toolBar">
+    <a class="layui-btn layui-btn-xs" lay-event="edit">
+        <i class="layui-icon layui-icon-edit"></i>编辑
+    </a>
+    <a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="del">
+        <i class="layui-icon layui-icon-delete"></i>删除
+    </a>
+</script>
+
+<script>
+    layui.use(['table', 'layer'], function () {
+        var table = layui.table;
+        var layer = layui.layer;
+
+        var tableIns = table.render({
+            elem: '#deviceGoodTag'
+            , url: ctx + '/deviceGoodTag/page'
+            , id: 'deviceSpec'
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            , toolbar: '#leftBar' //开启头部工具栏，并为其绑定左侧模板
+            , defaultToolbar: ['filter']
+            , title: '商品规格表'
+            , cols: [[
+                {type: 'checkbox', fixed: 'left', hidden: true}
+                , {field: 'numbers', title: '序号', fixed: 'left', unresize: true, width: 80, type: 'numbers'}
+                , {field: 'id', title: 'ID'}
+                , {field: 'tag', title: '分类标签'}
+                , {field: 'sort', title: '排序'}
+                , {
+                    field: 'createTime',
+                    title: '创建时间',
+                    templet: "<div>{{layui.util.toDateString(d.createTime,'yyyy-MM-dd HH:mm')}}</div>"
+                }
+                , {fixed: 'right', title: '操作', toolbar: '#toolBar'}
+            ]]
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , page: true
+        });
+        table.on('tool(deviceGoodTag)', function (obj) { //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            var data = obj.data; //获得当前行数据
+            var layEvent = obj.event; //获得 lay-event 对应的值（也可以是表头的 event 参数对应的值）
+            if (layEvent === 'del') { //删除
+                layer.confirm('真的删除么?', {icon: 3}, function (index) {
+                    obj.del(); //删除对应行（tr）的DOM结构，并更新缓存
+                    layer.close(index);
+                    del(data);
+                    //向服务端发送删除指令
+                });
+            } else if (layEvent === 'edit') { //编辑
+                //do something
+                toAdd(obj.data);
+                //同步更新缓存对应的值
+                // obj.update({
+                //     username: '123'
+                //     ,title: 'xxx'
+                // });
+            }
+        });
+
+        //监听头工具栏事件
+        table.on('toolbar(deviceGoodTag)', function (obj) {
+            switch (obj.event) {
+                case 'add':
+                    // 添加
+                    toAdd();
+                    break;
+                case 'search':
+                    var params = serialize($('#form1'));
+                    table.reload('deviceGoodTag', {
+                        where: params
+                        , page: {
+                            size: 10
+                            , current: 1
+                        }
+                    });
+                    break;
+            }
+        });
+        function toAdd(obj) {
+            var url = ctx + '/deviceGoodTag/detail';
+            var title = "新增";
+            if (obj != undefined) {
+                url = ctx + "/deviceGoodTag/detail/" + obj.id;
+                title = "编辑"
+            }
+            var index = layer.open({
+                type: 2
+                , shade: 0.5
+                , title: title
+                , maxmin: true
+                , content: url
+                , area: ['500px', '250px']
+                , end: function () {
+
+                }
+            });
+        }
+
+        function del(obj) {
+            $.ajax({
+                url: ctx + '/deviceGoodTag/del/' + obj.id,
+                method: 'DELETE',
+                dataType: 'JSON',
+                contentType: "application/json",
+                success: function (res) {
+                    layer.msg(res.message, {
+                        icon: res.code == 200 ? 1: 2
+                    });
+                }
+            })
+        }
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/device/type/detail.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/device/type/detail.jsp
new file mode 100644
index 0000000..92c8d7d
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/device/type/detail.jsp
@@ -0,0 +1,156 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../../common.jsp" />
+    <style>
+        .layui-form-item{
+            margin-top: 10px;
+        }
+        .layui-form{
+            width: 70%;
+            margin-left: 10%;
+        }
+        .device-logo-img{
+            border: 1px solid #e7e7e7;
+            border-radius: 5px;
+            padding: 10px;
+            width: 100px;
+        }
+    </style>
+</head>
+<body>
+<form class="layui-form" action="" enctype="multipart/form-data">
+    <input name="id" value="${entity.id}" hidden/>
+<%--    <div class="layui-form-item">--%>
+<%--        <label class="layui-form-label">类型logo</label>--%>
+<%--        <div class="layui-input-block">--%>
+<%--            <button class="layui-btn layui-btn-sm" type="button" id="upload"><i class="layui-icon">&#xe681;</i>上传</button>--%>
+<%--            <div class="device-logo" style="margin-top: 10px; display: ${empty entity.deviceLogo ? 'none' : ''}">--%>
+<%--                <img alt="图片" class="device-logo-img" id="prevImg" src="${entity.deviceLogo}"/>--%>
+<%--            </div>--%>
+<%--            <input class="layui-input" type="hidden" name="deviceLogo" id="deviceLogo" value="${entity.deviceLogo}">--%>
+<%--        </div>--%>
+<%--    </div>--%>
+    <div class="layui-form-item">
+        <label class="layui-form-label">类型名称</label>
+        <div class="layui-input-block">
+            <input name="name" value="${entity.name}" autocomplete="off" maxlength="20" placeholder="请输入类型名称" class="layui-input" lay-verify="required" />
+        </div>
+    </div>
+     <div class="layui-form-item">
+        <label class="layui-form-label">类型Code</label>
+        <div class="layui-input-block">
+            <input name="code" value="${entity.code}" autocomplete="off" maxlength="20" placeholder="请输入类型Code" class="layui-input" lay-verify="required" />
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">划拨显示</label>
+        <div class="layui-input-block">
+            <select class="layui-select" name="showFlag" autocomplete="off" lay-verify="required">
+                <option value="">请选择</option>
+                <option value="1" ${entity.showFlag eq '1' ? 'selected' : ''}>显示</option>
+                <option value="2" ${entity.showFlag eq '2' ? 'selected' : ''}>不显示</option>
+            </select>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">是否收款码</label>
+        <div class="layui-input-block">
+            <select class="layui-select" name="payCodeFlag" autocomplete="off" lay-verify="required">
+                <option value="">请选择</option>
+                <option value="0" ${entity.payCodeFlag eq '0' ? 'selected' : ''}>否</option>
+                <option value="1" ${entity.payCodeFlag eq '1' ? 'selected' : ''}>是</option>
+            </select>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label" >类型描述</label>
+        <div class="layui-input-block">
+            <textarea placeholder="请输入类型描述" name="desc" class="layui-textarea">${entity.desc}</textarea>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button class="layui-btn" lay-submit lay-filter="formDemo">立即提交</button>
+            <button type="button" id="close" class="layui-btn layui-btn-primary">关闭</button>
+        </div>
+    </div>
+</form>
+
+<script>
+    layui.use(['form','layer'], function(){
+        let form = layui.form;
+        let layer = layui.layer;
+        $('#close').click(function() {
+            parent.layer.closeAll();
+        });
+            //监听提交
+        form.on('submit(formDemo)', function(data){
+            var index = layer.load(1,{shade: [0.1,'#000'] });
+            $.ajax({
+                url: '${ctx}/deviceType/save',
+                method: 'post',
+                data: JSON.stringify(data.field),
+                dataType: 'JSON',
+                contentType:"application/json",
+                success: function(res) {
+                    layer.close(index);
+                    if(res.code == 200) {
+                        layer.msg(res.message, { icon: 1, time: 1000 }, function () {
+                            var index = parent.layer.getFrameIndex(window.name);
+                            parent.layui.table.reload('deviceType');
+                            parent.layer.close(index);
+                        });
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 2
+                        });
+                    }
+                }
+            })
+            return false;
+        });
+
+        //初始化文件上传
+        // let dialog = null;
+        // let uploadInst = upload.render({
+        //     elem: '#upload' //绑定元素
+        //     ,acceptMime:'image/*'
+        //     ,url: ctx + '/upload/ossUploadFile' //上传接口
+        //     ,choose:function (obj){
+        //         //预读本地文件，如果是多文件，则会遍历。(不支持ie8/9)
+        //         obj.preview(function(index, file, result){
+        //             $("#prevImg").attr("src",result).parent("div").show();
+        //         });
+        //     }
+        //     ,before: function(obj){ //obj参数包含的信息，跟 choose回调完全一致，可参见上文。
+        //         dialog = layer.msg('上传中...', {icon: 16, time: 0, shade: [0.3, '#000', false]});
+        //     }
+        //     ,done: function(res){
+        //         layer.close(dialog);
+        //         if(res.code == 200){
+        //             $("#deviceLogo").val(res.url);
+        //         }else{
+        //             layer.msg(res.msg,{icon:2});
+        //         }
+        //     }
+        //     ,error: function(){
+        //         layer.close(dialog);
+        //         layer.msg("上传失败",{icon:2});
+        //     }
+        // });
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/device/type/list.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/device/type/list.jsp
new file mode 100644
index 0000000..ef8bad0
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/device/type/list.jsp
@@ -0,0 +1,248 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<!DOCTYPE html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../../common.jsp"/>
+</head>
+<body>
+
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" id="form1" action="" style="margin-top: 10px;">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">类型CODE</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="code" id="code" placeholder="请输入类型CODE"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">类型名称</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="name" id="name" placeholder="请输入类型名称"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">划拨显示</label>
+                            <div class="layui-input-block">
+                                <select id="showFlag" name="showFlag" class="layui-select">
+                                    <option value="">请选择</option>
+                                    <option value="1">显示</option>
+                                    <option value="2">不显示</option>
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <!-- 表单数据 -->
+    <div class="mb50 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-hide" id="deviceTypeTab" lay-filter="deviceTypeTab"></table>
+        </div>
+    </div>
+</div>
+
+<script type="text/html" id="leftBar">
+    <a class="layui-btn layui-btn-sm layui-btn-normal" lay-event="add">
+        <i class="layui-icon layui-icon-add-circle"></i>新增
+    </a>
+<%--    <a class="layui-btn layui-btn-sm layui-btn-danger" lay-event="delete">--%>
+<%--        <i class="layui-icon layui-icon-delete"></i>删除--%>
+<%--    </a>--%>
+    <a class="layui-btn layui-btn-sm" lay-event="search">
+        <i class="layui-icon layui-icon-search"></i>查询
+    </a>
+</script>
+
+<script type="text/html" id="toolBar">
+    <a class="layui-btn layui-btn-xs" lay-event="edit">
+        <i class="layui-icon layui-icon-edit"></i>编辑
+    </a>
+    <a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="del">
+        <i class="layui-icon layui-icon-delete"></i>删除
+    </a>
+</script>
+
+<script>
+    layui.use(['table', 'layer', 'form'], function () {
+        let table = layui.table;
+        let layer = layui.layer;
+        let form = layui.form;
+
+        let tableIns = table.render({
+            elem: '#deviceTypeTab'
+            , url: ctx + '/deviceType/page'
+            , id: 'deviceType'
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            , toolbar: '#leftBar' //开启头部工具栏，并为其绑定左侧模板
+            , defaultToolbar: ['filter']
+            , title: '设备类型表'
+            , cols: [[
+                {type: 'checkbox', fixed: 'left', hidden: true}
+                , {field: 'numbers', title: '序号', fixed: 'left', unresize: true, minWidth: 80, type: 'numbers'}
+                , {field: 'code', title: '类型CODE', minWidth: 150}
+                , {field: 'name', title: '类型名称', minWidth: 150}
+                , {field: 'showFlag', title: '划拨显示',templet: function (d){
+                        if(d.showFlag === '1'){
+                            return '<span style="color: green">显示</span>';
+                        }else{
+                            return '<span style="color: red">不显示</span>';
+                        }
+                    }}
+                , {field: 'payCodeFlag', title: '是否收款码',templet: function (d){
+                        return d.payCodeFlag === '0' ? '否' : '<span style="color: blue">是</span>';
+                    }}
+                , {field: 'desc', title: '类型描述', minWidth: 100}
+                , {
+                    field: 'createTime',
+                    title: '创建时间',
+                    minWidth: 160,
+                    templet: "<div>{{layui.util.toDateString(d.createTime,'yyyy-MM-dd HH:mm:ss')}}</div>"
+                }
+                , {fixed: 'right', title: '操作', minWidth: 180, toolbar: '#toolBar'}
+            ]]
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , page: true
+        });
+
+        //监听头工具栏事件
+        table.on('toolbar(deviceTypeTab)', function (obj) {
+            switch (obj.event) {
+                case 'add':
+                    // 添加
+                    toAdd();
+                    break;
+                case 'search':
+                    var params = serialize($('#form1'));
+                    table.reload('deviceType', {
+                        where: params
+                        , page: {
+                            size: 10
+                            , current: 1
+                        }
+                    });
+                    break;
+            }
+        });
+
+        table.on('tool(deviceTypeTab)', function (obj) {
+            var data = obj.data; //获得当前行数据
+            var layEvent = obj.event; //获得 lay-event 对应的值（也可以是表头的 event 参数对应的值）
+            if (layEvent === 'del') { //删除
+                layer.confirm('真的删除么?', {icon: 3}, function (index) {
+                    obj.del(); //删除对应行（tr）的DOM结构，并更新缓存
+                    layer.close(index);
+                    del(data);
+                    //向服务端发送删除指令
+                });
+            }else if (obj.event === "showPic") {
+                var objJson = {};
+                objJson.title = "预览";
+                objJson.id = data.id;
+                objJson.start = "0";
+                objJson.data = new Array();
+                var imgObj = new Object();
+                imgObj.alt = "商品图片";
+                imgObj.pid = data.id;
+                imgObj.src = $('#pic_' + data.id).find("img").attr("src");
+                objJson.data.push(imgObj);
+                layer.photos({
+                    photos: objJson,
+                    //0-6的选择，指定弹出图片动画类型，默认随机
+                    anim: 5
+                });
+            }else if (obj.event === 'edit') { //编辑
+                //do something
+                toAdd(obj.data);
+                //同步更新缓存对应的值
+                // obj.update({
+                //     username: '123'
+                //     ,title: 'xxx'
+                // });
+            }
+        })
+
+        function toAdd(obj) {
+            var url = '${ctx}/deviceType/detail';
+            var title = "新增";
+            if (obj != undefined) {
+                url = "${ctx}/deviceType/detail/" + obj.id;
+                title = "编辑"
+            }
+            var index = layer.open({
+                type: 2
+                , shade: 0.5
+                , title: title
+                , maxmin: true
+                , content: url
+                , area: ['500px', '620px']
+                , end: function () {
+
+                }
+            });
+        }
+
+        function del(obj) {
+            $.ajax({
+                url: '${ctx}/deviceType/del/' + obj.id,
+                method: 'DELETE',
+                dataType: 'JSON',
+                contentType: "application/json",
+                success: function (res) {
+                    layer.msg(res.message, {
+                        icon: res.code == 200 ? 1: 2
+                    });
+                }
+            })
+        }
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceDetail/detail.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceDetail/detail.jsp
new file mode 100644
index 0000000..9ea2d31
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceDetail/detail.jsp
@@ -0,0 +1,383 @@
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp" />
+    <link rel="stylesheet" type="text/css" href="${ctx}/page/umeditor/themes/default/css/umeditor.css">
+    <script type="text/javascript" src="${ctx}/page/umeditor/third-party/template.min.js"></script>
+    <script type="text/javascript" src="${ctx}/page/umeditor/umeditor.config.js"></script>
+    <script type="text/javascript" src="${ctx}/page/umeditor/umeditor.min.js"></script>
+    <script type="text/javascript" src="${ctx}/page/umeditor/lang/zh-cn/zh-cn.js"></script>
+    <style>
+        .layui-input,.layui-textarea{
+            border-color:#606060;
+        }
+    </style>
+</head>
+<body>
+<form class="layui-form" action="" style="margin-top:20px; width: 98%;" >
+    <input name="id" value="${entity.id}" hidden/>
+    <div class="layui-form-item">
+        <div class="layui-inline">
+            <label class="layui-form-label" >设备类型:</label>
+            <div class="layui-input-inline">
+                <select class="layui-select" name="code" autocomplete="off" lay-filter="deviceType" lay-verify="required">
+                    <option value="">请选择</option>
+                    <c:forEach items="${deviceTypeDict}" var="dict">
+                        <option value="${dict.code}" ${dict.code == entity.code ? 'selected' : ''}>${dict.name}</option>
+                    </c:forEach>
+                </select>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <div class="layui-inline">
+            <label class="layui-form-label" >设备规格:</label>
+            <div class="layui-input-inline">
+                <select class="layui-select" lay-filter="typeSelect" autocomplete="off" id="type" lay-verify="required">
+                    <option value="">请选择</option>
+                    <c:if test="${not empty subDeviceType}">
+                        <c:forEach items="${subDeviceType}" var="sub">
+                            <c:if test="${sub.spec == entity.type}">
+                                <c:set var="typeDesc" value="${sub.specName}" />
+                            </c:if>
+                            <option value="${sub.spec}" data-weight="${sub.weight}" data-postageFlag="${sub.postageFlag}" ${sub.spec == entity.type ? 'selected' : ''}>${sub.specName}</option>
+                        </c:forEach>
+                    </c:if>
+                </select>
+            </div>
+            <div class="layui-form-mid layui-word-aux">
+                <span style="color: red">* 若需要添加新的版本，可以在以下编码和名称中自定义</span>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <div class="layui-inline">
+            <label class="layui-form-label">规格code</label>
+            <div class="layui-input-inline">
+                <input type="text" name="type" placeholder="建议使用纯英文串" value="${entity.type}" lay-verify="required" autocomplete="off" class="layui-input">
+            </div>
+        </div>
+        <div class="layui-inline">
+            <label class="layui-form-label">规格名称</label>
+            <div class="layui-input-inline">
+                <input type="text" name="typeDesc" placeholder="规格名称" value="${typeDesc}" lay-verify="required" autocomplete="off" class="layui-input">
+            </div>
+        </div>
+        <div class="layui-inline">
+            <label class="layui-form-label">重量(kg)</label>
+            <div class="layui-input-inline">
+                <input type="number" name="weight" id="weight" placeholder="请输入重量" value="${weight}" lay-verify="required" autocomplete="off" class="layui-input">
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <div class="layui-inline">
+            <label class="layui-form-label" >设备分组:</label>
+            <div class="layui-input-inline" style="margin-left:0">
+                <select class="layui-select" lay-filter="groupNoSelect" autocomplete="off" lay-verify="required">
+                    <option value="">请选择</option>
+                    <c:forEach items="${deviceGroupDict}" var="dict">
+                        <c:if test="${dict.groupCode == entity.groupNo}">
+                            <c:set var="groupNoDesc" value="${dict.groupName}" />
+                        </c:if>
+                        <option value="${dict.groupCode}" ${dict.groupCode == entity.groupNo ? 'selected' : ''}>${dict.groupName}</option>
+                    </c:forEach>
+                </select>
+            </div>
+            <div class="layui-form-mid layui-word-aux">
+                <span style="color: red">* 若需要添加新的分组，可以在以下编码和名称中自定义</span>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <div class="layui-inline">
+            <label class="layui-form-label">分组编码</label>
+            <div class="layui-input-inline">
+                <input type="text" name="groupNo" placeholder="建议使用纯英文串" value="${entity.groupNo}" lay-verify="required" autocomplete="off" class="layui-input">
+            </div>
+        </div>
+        <div class="layui-inline">
+            <label class="layui-form-label">分组名称</label>
+            <div class="layui-input-inline">
+                <input type="text" name="groupNoDesc" placeholder="版本名称" value="${groupNoDesc}" lay-verify="required" autocomplete="off" class="layui-input">
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <div class="layui-inline">
+            <label class="layui-form-label" >厂家名称:</label>
+            <div class="layui-input-inline">
+                <input name="venderName" value="${entity.venderName}" autocomplete="off" placeholder="请输入厂家名称" class="layui-input"/>
+            </div>
+        </div>
+        <div class="layui-inline">
+            <label class="layui-form-label" >厂家型号:</label>
+            <div class="layui-input-inline">
+                <input name="venderModel" value="${entity.venderModel}" autocomplete="off"  placeholder="请输入厂家型号" class="layui-input"/>
+            </div>
+        </div>
+        <div class="layui-inline">
+            <label class="layui-form-label" >通道型号:</label>
+            <div class="layui-input-inline">
+                <input name="aisleModel" value="${entity.aisleModel}" autocomplete="off" placeholder="请输入通道型号" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <div class="layui-inline">
+            <label class="layui-form-label" >单价:</label>
+            <div class="layui-input-inline">
+                <input type="number" name="unitPrice" value="${entity.unitPrice}" autocomplete="off" lay-verify="required" placeholder="请输入单价" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <div class="layui-inline">
+            <label class="layui-form-label" >批发价:</label>
+            <div class="layui-input-inline">
+                <input type="number" name="wholesalePrice" value="${entity.wholesalePrice}" autocomplete="off" placeholder="请输入批发单价" class="layui-input"/>
+            </div>
+        </div>
+
+        <div class="layui-inline">
+            <label class="layui-form-label" >批发最低数:</label>
+            <div class="layui-input-block">
+                <input type="number" name="wholesaleMinNum" value="${entity.wholesaleMinNum}" autocomplete="off" placeholder="请输入批发最低数" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <div class="layui-inline">
+            <label class="layui-form-label" >状态:</label>
+            <div class="layui-input-inline">
+                <select class="layui-select" autocomplete="off" name="status" lay-verify="required">
+                    <option value="">请选择</option>
+                    <option value="1" ${entity.status eq '1' or  empty entity.status ? 'selected' : '' } >显示</option>
+                    <option value="0" ${entity.status eq '0' ? 'selected' : '' } >不显示</option>
+                </select>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <div class="layui-inline">
+            <label class="layui-form-label" >排序:</label>
+            <div class="layui-input-inline">
+                <input name="seq" value="${entity.seq}" autocomplete="off" placeholder="请输入排序" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label" >设备简介:</label>
+        <div class="layui-input-block" style="margin-left:0">
+            <div class="layui-input-block">
+                <textarea placeholder="请输入商品简介" name="introDesc" id="introDesc" class="layui-textarea">${entity.introDesc}</textarea>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button class="layui-btn" lay-submit lay-filter="formDemo">立即提交</button>
+            <button type="button" id="close" class="layui-btn layui-btn-primary">关闭</button>
+        </div>
+    </div>
+
+</form>
+
+<%--<form id="ajaxForm" class="layui-form" style="width: 70%" >
+    <input type="hidden" name="OSSAccessKeyId" id="accessid" value="${uploadParam.accessid}">
+    <input type="hidden" name="policy" id="policy" value="${uploadParam.policy}">
+    <input type="hidden" name="signature" id="signature" value="${uploadParam.signature}">
+    <input type="hidden" name="expire" id="expire" value="${uploadParam.expire}">
+    <input type="hidden" name="success_action_status" id="success_action_status" value="200">
+    <input type="hidden" name="key" id="key" value="${uploadParam.key}">
+    <input type="hidden" name="callBack" id="key2_callBack" value="${uploadParam.callBack}">
+    <input type="file" style="display: none" name="file" id="file" onchange="document.getElementById('fileName').value=this.files[0].name">
+</form>--%>
+
+<script>
+    //Demo
+    layui.use(['form', 'layer','upload'], function(){
+        var form = layui.form;
+        var layer = layui.layer;
+        /*var upload = layui.upload;*/
+
+        $('#close').click(function() {
+            parent.layer.closeAll();
+        });
+
+        /*//创建监听函数
+        var xhrOnProgress = function (fun) {
+            xhrOnProgress.onprogress = fun; //绑定监听
+            //使用闭包实现监听绑
+            return function () {
+                //通过$.ajaxSettings.xhr();获得XMLHttpRequest对象
+                var xhr = $.ajaxSettings.xhr();
+                //判断监听函数是否为函数
+                if (typeof xhrOnProgress.onprogress !== 'function')
+                    return xhr;
+                //如果有监听函数并且xhr对象支持绑定时就把监听函数绑定上去
+                if (xhrOnProgress.onprogress && xhr.upload) {
+                    xhr.upload.onprogress = xhrOnProgress.onprogress;
+                }
+                return xhr;
+            }
+        }*/
+
+        /*var openIndex = "";
+        upload.render({
+            elem: '#chooseFile', // 文件选择
+            accept: 'images',
+            acceptMime: 'image/!*',
+            url: '${uploadParam.host}',
+            exts: 'jpg|png|gif|bmp|jpeg',
+            method: 'POST',
+            auto: false, // 设置不自动提交
+            bindAction: '#uploadBtn', // 提交按钮
+            before: function () {
+                element.progress('js_upload_progress', '0%');//设置页面进度条
+                openIndex = layer.open({
+                    type: 1,
+                    title: '上传进度',
+                    closeBtn: 1, //不显示关闭按钮
+                    area: ['300', '130'],
+                    shadeClose: false, //开启遮罩关闭
+                    content: $("#uploadLoadingDiv").html(),
+                    offset: '100'
+                });
+            }
+            , xhr: xhrOnProgress
+            , progress: function (value) {//上传进度回调 value进度值
+                element.progress('js_upload_progress', value + '%');//设置页面进度条
+            }
+            , choose: function (obj) {
+                var loading = layer.load(1, {shade: [0.1, '#000']});
+                var data = {};
+                obj.preview(function (index, file, result) {
+                    var fileName = file.name;
+                    $("#chooseFile").val(fileName);
+                    var suffix = fileName.substring(fileName.lastIndexOf('.') + 1, fileName.length);
+                    var key = '${uploadParam.key}' + "." + suffix;
+                    $("#key").val(key);
+                    $("#fileKey").val(key);
+                    data.OSSAccessKeyId = $('#accessid').val();
+                    data.policy = $('#policy').val();
+                    data.signature = $('#signature').val();
+                    data.expire = $('#expire').val();
+                    data.success_action_status = $('#success_action_status').val();
+                    data.callBack = $("#key2_callBack").val();
+                    data.key = key;
+                    layer.close(loading);
+                });
+                this.data = data;
+            },
+            done: function (res) {
+                layer.close(openIndex);
+                if (res.code == 200) {
+                    layer.msg("上传成功！")
+                    $("#url").val(res.url);
+                } else {
+                    layer.msg("上传失败！")
+                }
+            },
+            error: function (res) {
+                layer.msg(res.msg);
+            }
+        });*/
+        form.on('select(deviceType)',function (data) {
+            var dataType = data.value;
+            $.ajax({
+                url: ctx + '/deviceDetail/getDeviceSubVersionType/'+dataType,
+                method: 'get',
+                dataType: 'json',
+                success: function(res) {
+                    if(res.code == 200) {
+                        var dom = $("#type");
+                        var html = "<option value=''>请选择</option>";
+                        dom.empty();
+                        if(res.data.length > 0){
+                            $.each(res.data,function (k,v) {
+                                html+= "<option data-weight='"+v.weight+"' value='"+v.spec+"'>"+v.specName+"</option>";
+                            })
+                            dom.append(html);
+                        }
+                        form.render('select');
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 5
+                        });
+                    }
+                }
+            })
+
+        })
+
+        //监听提交
+        form.on('submit(formDemo)', function(data){
+            var index = layer.load(1,{shade: [0.1,'#000'] });
+            var params = data.field;
+            $.ajax({
+                url: ctx + '/deviceDetail/saveOrUpdate',
+                method: 'post',
+                data: JSON.stringify(params),
+                dataType: 'JSON',
+                contentType:"application/json",
+                success: function(res) {
+                    layer.close(index);
+                    if(res.code == 200) {
+                        layer.alert(res.message,function(){
+                            parent.location.reload();
+                        })
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 2
+                        });
+                    }
+                }
+            })
+            return false;
+        });
+
+        form.on('select(typeSelect)', function(data) {
+            $('input[name="type"]').val(data.value);
+            if (data.value != "") {
+                let obj = $(data.elem).find("option:selected").data();
+                $("input[name = 'typeDesc']").val(data.elem[data.elem.selectedIndex].text);
+                $("#weight").val(obj.weight.toFixed(2));
+            } else {
+                $("input[name = 'typeDesc']").val("");
+            }
+        });
+
+        form.on('select(groupNoSelect)', function(data) {
+            $('input[name="groupNo"]').val(data.value);
+            if (data.value != "") {
+                $("input[name = 'groupNoDesc']").val(data.elem[data.elem.selectedIndex].text);
+            } else {
+                $("input[name = 'groupNoDesc']").val("");
+            }
+        });
+    });
+
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceDetail/list.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceDetail/list.jsp
new file mode 100644
index 0000000..bf1800c
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceDetail/list.jsp
@@ -0,0 +1,259 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+</head>
+<body>
+
+<form class="layui-form" id="form1" action="" style="margin-top: 30px;">
+    <div class="layui-inline">
+        <label class="layui-form-label">设备类型</label>
+        <div class="layui-input-block">
+            <select class="layui-select" name="code" autocomplete="off">
+                <option value="">请选择</option>
+                <c:forEach items="${deviceTypeDict}" var="dict">
+                    <option value="${dict.value}">${dict.name}</option>
+                </c:forEach>
+            </select>
+        </div>
+    </div>
+    <div class="layui-inline">
+        <label class="layui-form-label">厂家名称</label>
+        <div class="layui-input-block">
+            <input type="text" name="venderName" placeholder="请输入厂家名称" autocomplete="off" class="layui-input">
+        </div>
+    </div>
+
+    <div class="layui-inline">
+        <label class="layui-form-label">状态</label>
+        <div class="layui-input-block">
+            <select class="layui-select" name="status" autocomplete="off">
+                <option value="">请选择</option>
+                <option value="1">显示</option>
+                <option value="0">不显示</option>
+            </select>
+        </div>
+    </div>
+</form>
+<table class="layui-hide" id="deviceDetailTab" lay-filter="deviceDetailTab"></table>
+
+<script type="text/html" id="leftBar">
+    <button type="button" class="layui-btn layui-btn-sm" lay-event="add"><i class="layui-icon">&#xe608;</i>新增</button>
+    <button type="button" class="layui-btn layui-btn-normal layui-btn-sm" lay-event="search"><i class="layui-icon">&#xe615;</i>查询
+    </button>
+</script>
+
+<script type="text/html" id="toolBar">
+    <button type="button" class="layui-btn layui-btn-sm layui-btn-normal" lay-event="edit"><i class="layui-icon">&#xe642;</i>编辑
+    </button>
+    <button type="button" class="layui-btn layui-btn-sm layui-btn-danger" lay-event="del"><i
+            class="layui-icon">&#xe640;</i>删除
+    </button>
+</script>
+
+<script>
+    layui.use(['table', 'layer', 'form'], function () {
+        var table = layui.table;
+        var layer = layui.layer;
+        var form = layui.form;
+        var tableIns = table.render({
+            elem: '#deviceDetailTab'
+            , url: ctx + '/deviceDetail/page'
+            , id: 'deviceDetail'
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            , toolbar: '#leftBar' //开启头部工具栏，并为其绑定左侧模板
+            , defaultToolbar: ['filter']
+            , title: '设备类型详情表'
+            , cols: [[
+                {type: 'checkbox', fixed: 'left', hidden: true}
+                , {field: 'numbers', title: '序号', fixed: 'left', unresize: true, width: 80, type: 'numbers'}
+                , {field: 'codeDesc', title: '设备类型'}
+                , {field: 'typeDesc', title: '设备规格'}
+                , {field: 'groupNoDesc', title: '设备分组'}
+                /*,{field:'deviceLogo', title:'设备图片',templet:function (d) {
+                    if(d.deviceLogo != ''){
+                        return '<span id="pic_'+d.id+'"><img src="'+d.deviceLogo+'" lay-event="showPic" style="cursor: pointer" width="50px" height="50px" alt=""/></span>';
+                    }else{
+                        return "";
+                    }
+                }}*/
+                , {field: 'venderName', title: '厂家名称'}
+                , {field: 'venderModel', title: '厂家型号'}
+                , {field: 'aisleModel', title: '通道型号'}
+                , {field: 'seq', title: '排序'}
+                , {
+                    field: 'unitPrice', title: '单价', templet: function (d) {
+                        return d.unitPrice.toFixed(2);
+                    }
+                }
+                , {
+                    field: 'status', title: '状态', templet: function (d) {
+                        if (d.status == '1') {
+                            return '<span style="color: green">显示</span>';
+                        } else {
+                            return '<span >不显示</span>';
+                        }
+                    }
+                }
+                , {field: 'introDesc', title: '设备简介'}
+                , {
+                    field: 'createTime',
+                    title: '创建时间',
+                    width: 160,
+                    templet: "<div>{{layui.util.toDateString(d.createTime,'yyyy-MM-dd HH:mm:ss')}}</div>"
+                }
+                , {fixed: 'right', title: '操作', width: 180, toolbar: '#toolBar'}
+            ]]
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , page: true
+        });
+        table.on('tool(deviceDetailTab)', function (obj) { //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            var data = obj.data; //获得当前行数据
+            var layEvent = obj.event; //获得 lay-event 对应的值（也可以是表头的 event 参数对应的值）
+            if (layEvent === 'del') { //删除
+                layer.confirm('真的删除么?', {icon: 3}, function (index) {
+                    obj.del(); //删除对应行（tr）的DOM结构，并更新缓存
+                    layer.close(index);
+                    del(data);
+                    //向服务端发送删除指令
+                });
+            } else if (layEvent === 'edit') {
+                toAdd(obj.data);
+            } else if (obj.event === "showPic") {
+                var objJson = {};
+                objJson.title = "预览";
+                objJson.id = data.id;
+                objJson.start = "0";
+                objJson.data = new Array();
+                var imgObj = new Object();
+                imgObj.alt = "设备图片";
+                imgObj.pid = data.id;
+                imgObj.src = $('#pic_' + data.id).find("img").attr("src");
+                objJson.data.push(imgObj);
+                layer.photos({
+                    photos: objJson,
+                    //0-6的选择，指定弹出图片动画类型，默认随机
+                    anim: 5
+                });
+            }
+        });
+
+        function toAdd(obj) {
+            var title = "新增";
+            var url = ctx + '/deviceDetail/detail/';
+            if (obj != undefined) {
+                url = ctx + "/deviceDetail/detail/" + obj.id;
+                title = "编辑";
+            }
+            var index = layer.open({
+                type: 2
+                , title: title
+                , shade: 0.5
+                , maxmin: true
+                , content: url
+                , area: ['1000px', '650px']
+            });
+        }
+
+        //监听头工具栏事件
+        table.on('toolbar(deviceDetailTab)', function (obj) {
+            switch (obj.event) {
+                case 'add':
+                    // 添加
+                    toAdd();
+                    break;
+                case 'search':
+                    var params = serialize($('#form1'));
+                    table.reload('deviceDetail', {
+                        where: params
+                        , page: {
+                            size: 10
+                            , current: 1
+                        }
+                    });
+                    break;
+            }
+        });
+
+        /*function toAddSave(index,dom) {
+            var data = dom.serializeObject();
+            $.ajax({
+                url: ctx + '/deviceDetail/saveOrUpdate',
+                method: 'post',
+                data: JSON.stringify(data),
+                dataType: 'JSON',
+                contentType:"application/json",
+                success: function(res) {
+                    if(res.code == 200) {
+                        layer.close(index);
+                        layer.msg(res.message, {
+                            icon: 1
+                        });
+                        tableIns.reload();
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 2
+                        });
+                    }
+                }
+            })
+        }*/
+        function del(obj) {
+            $.ajax({
+                url: ctx + '/deviceDetail/del/' + obj.id,
+                method: 'DELETE',
+                dataType: 'JSON',
+                contentType: "application/json",
+                success: function (res) {
+                    if (res.code == 200) {
+                        layer.msg(res.data, {
+                            icon: 1
+                        });
+                    } else {
+                        layer.msg(res.data, {
+                            icon: 2
+                        });
+                    }
+                }
+            })
+        }
+    });
+    jQuery.prototype.serializeObject = function () {
+        var obj = new Object();
+        $.each(this.serializeArray(), function (index, param) {
+            if (!(param.name in obj)) {
+                obj[param.name] = param.value;
+            }
+        });
+        return obj;
+    };
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceGoods/detail.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceGoods/detail.jsp
new file mode 100644
index 0000000..00c1657
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceGoods/detail.jsp
@@ -0,0 +1,336 @@
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ page contentType="text/html;charset=UTF-8"%>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+    <link rel="stylesheet" type="text/css" href="${ctx}/page/umeditor/themes/default/css/umeditor.css">
+    <script type="text/javascript" src="${ctx}/page/umeditor/third-party/template.min.js"></script>
+    <script type="text/javascript" src="${ctx}/page/umeditor/umeditor.config.js"></script>
+    <script type="text/javascript" src="${ctx}/page/umeditor/umeditor.min.js"></script>
+    <script type="text/javascript" src="${ctx}/page/umeditor/lang/zh-cn/zh-cn.js"></script>
+    <style>
+        .layui-input, .layui-textarea {
+            border-color: #606060;
+        }
+
+        .layui-form-select dl {
+            z-index: 9999;
+        }
+    </style>
+</head>
+<body>
+<form class="layui-form" action="" style="margin-top: 20px;width: 90%;">
+    <input name="id" value="${entity.id}" hidden/>
+    <div class="layui-form-item">
+        <label class="layui-form-label">商品名称:</label>
+        <div class="layui-input-block">
+            <input name="name" value="${entity.name}" placeholder="请输入商品名称" class="layui-input" lay-verify="required"/>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <div class="layui-inline">
+            <label class="layui-form-label">编码选择:</label>
+            <div class="layui-input-inline">
+                <select lay-filter="typeSelect" id="typeSelect" class="layui-select" autocomplete="off">
+                    <option value="">请选择</option>
+                    <c:forEach items="${deviceTypeDict}" var="dict">
+                        <option value="${dict.code}" ${dict.code == entity.code ? 'selected' : ''}>${dict.name}</option>
+                    </c:forEach>
+                </select>
+            </div>
+            <div class="layui-form-mid layui-word-aux">
+                <span style="color: red">* 若需要添加新的商品，可以在编码和名称中自定义</span>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <div class="layui-inline">
+            <label class="layui-form-label">编码:</label>
+            <div class="layui-input-inline">
+                <input name="code" value="${entity.code}" placeholder="请输入/选择编码" class="layui-input"  lay-verify="required"/>
+            </div>
+        </div>
+        <div class="layui-inline">
+            <label class="layui-form-label">编码名称:</label>
+            <div class="layui-input-inline">
+                <input name="codeName" value="${entity.codeName}" placeholder="请输入/选择编码名称" class="layui-input"  lay-verify="required"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <div class="layui-inline">
+            <label class="layui-form-label">排序:</label>
+            <div class="layui-input-inline">
+                <input type="number" name="sort" value="${entity.sort == null? -1: entity.sort}" placeholder="请输入序号" class="layui-input" lay-verify="required|number"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <div class="layui-inline">
+            <label class="layui-form-label">分类标签:</label>
+            <div class="layui-input-inline">
+                <select lay-filter="tagSelect" id="tagSelect" name="tagId" class="layui-select" autocomplete="off">
+                    <option value="">请选择</option>
+                    <c:forEach items="${deviceGoodTagList}" var="item">
+                        <option value="${item.id}" ${item.id == entity.tagId ? 'selected' : ''}>${item.tag}</option>
+                    </c:forEach>
+                </select>
+            </div>
+            <div class="layui-form-mid layui-word-aux">
+                <span style="color: red">* 若需要添加新的商品，可以在编码和名称中自定义</span>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">商品图片</label>
+        <%--        <div class="layui-input-block" style="display: flex;justify-content: flex-start">--%>
+        <%--            <input name="fileKey" id="fileKey" hidden/>--%>
+        <%--            <input type="hidden" name="deviceLogo" value="${entity.deviceLogo}" id="url"/>--%>
+        <%--            <input name="chooseFile" id="chooseFile" placeholder="浏览..." class="layui-input layui-col-xs6"--%>
+        <%--                   style="cursor:hand" readonly/>--%>
+        <%--            <button type="button" class="layui-btn layui-btn-normal layui-col-xs3" id="uploadBtn">--%>
+        <%--                上传--%>
+        <%--            </button>--%>
+        <%--        </div>--%>
+        <div class="layui-input-block" style="display: flex;justify-content: flex-start">
+            <button type="button" class="layui-btn" id="chooseFile">上传图片</button>
+            <input name="deviceLogo" value="${entity.deviceLogo}" lay-verify="required" hidden>
+        </div>
+
+        <label class="layui-form-label" style="height: 1px; padding-top: 0; padding-bottom: 0"></label>
+        <img class="layui-upload-img" src="${entity.deviceLogo}" id="deviceLogo" style="max-width: 150px; margin-top: 10px">
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">状态</label>
+        <div class="layui-input-block">
+            <select name="status" id="status" lay-verify="required">
+                <option value="">请选择</option>
+                <option value="1"
+                        <c:if test="${entity.status eq '1' }">selected</c:if> >显示
+                </option>
+                <option value="0"
+                        <c:if test="${entity.status eq '0' }">selected</c:if> >不显示
+                </option>
+            </select>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">商品简介:</label>
+        <div class="layui-input-block" style="margin-left:0px;">
+            <div class="layui-input-block">
+                <textarea placeholder="请输入商品简介" name="introDesc" id="introDesc"
+                          class="layui-textarea">${entity.introDesc}</textarea>
+            </div>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">商品详情:</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <textarea id="detail" name="detail" lay-verify="detail" style="width: 571px" placeholder="请输入商品详情"
+                          class="layui-textarea">${entity.detail}</textarea>
+            </div>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button class="layui-btn" lay-submit lay-filter="formDemo">立即提交</button>
+            <button type="button" id="close" class="layui-btn layui-btn-primary">关闭</button>
+        </div>
+    </div>
+</form>
+
+<script>
+
+    layui.use(['form', 'layer', 'upload', 'element'], function () {
+        var form = layui.form;
+        var layer = layui.layer;
+        var upload = layui.upload;
+        var element = layui.element;
+        element.init();
+        var um = UM.getEditor('detail');
+        um.setWidth("100%");
+
+        $('#close').click(function () {
+            parent.layer.closeAll();
+        });
+
+        //创建监听函数
+        var xhrOnProgress = function (fun) {
+            xhrOnProgress.onprogress = fun; //绑定监听
+            //使用闭包实现监听绑
+            return function () {
+                //通过$.ajaxSettings.xhr();获得XMLHttpRequest对象
+                var xhr = $.ajaxSettings.xhr();
+                //判断监听函数是否为函数
+                if (typeof xhrOnProgress.onprogress !== 'function')
+                    return xhr;
+                //如果有监听函数并且xhr对象支持绑定时就把监听函数绑定上去
+                if (xhrOnProgress.onprogress && xhr.upload) {
+                    xhr.upload.onprogress = xhrOnProgress.onprogress;
+                }
+                return xhr;
+            }
+        }
+
+        var openIndex = "";
+
+        <%--upload.render({--%>
+        <%--    elem: '#chooseFile', // 文件选择--%>
+        <%--    accept: 'images',--%>
+        <%--    acceptMime: 'image/*',--%>
+        <%--    url: '${uploadParam.host}',--%>
+        <%--    exts: 'jpg|png|gif|bmp|jpeg',--%>
+        <%--    method: 'POST',--%>
+        <%--    auto: false, // 设置不自动提交--%>
+        <%--    bindAction: '#uploadBtn', // 提交按钮--%>
+        <%--    before: function () {--%>
+        <%--        element.progress('js_upload_progress', '0%');//设置页面进度条--%>
+        <%--        openIndex = layer.open({--%>
+        <%--            type: 1,--%>
+        <%--            title: '上传进度',--%>
+        <%--            closeBtn: 1, //不显示关闭按钮--%>
+        <%--            area: ['300px', '130px'],--%>
+        <%--            shadeClose: false, //开启遮罩关闭--%>
+        <%--            content: $("#uploadLoadingDiv").html(),--%>
+        <%--            offset: '100px'--%>
+        <%--        });--%>
+        <%--    }--%>
+        <%--    , xhr: xhrOnProgress--%>
+        <%--    , progress: function (value) {//上传进度回调 value进度值--%>
+        <%--        element.progress('js_upload_progress', value + '%');//设置页面进度条--%>
+        <%--    }--%>
+        <%--    , choose: function (obj) {--%>
+        <%--        var loading = layer.load(1, {shade: [0.1, '#000']});--%>
+        <%--        var data = {};--%>
+        <%--        obj.preview(function (index, file, result) {--%>
+        <%--            var fileName = file.name;--%>
+        <%--            $("#chooseFile").val(fileName);--%>
+        <%--            var suffix = fileName.substring(fileName.lastIndexOf('.') + 1, fileName.length);--%>
+        <%--            var key = '${uploadParam.key}' + "." + suffix;--%>
+        <%--            $("#key").val(key);--%>
+        <%--            $("#fileKey").val(key);--%>
+        <%--            data.OSSAccessKeyId = $('#accessid').val();--%>
+        <%--            data.policy = $('#policy').val();--%>
+        <%--            data.signature = $('#signature').val();--%>
+        <%--            data.expire = $('#expire').val();--%>
+        <%--            data.success_action_status = $('#success_action_status').val();--%>
+        <%--            data.callBack = $("#key2_callBack").val();--%>
+        <%--            data.key = key;--%>
+        <%--            layer.close(loading);--%>
+        <%--        });--%>
+        <%--        this.data = data;--%>
+        <%--    },--%>
+        <%--    done: function (res) {--%>
+        <%--        layer.close(openIndex);--%>
+        <%--        if (res.code == 200) {--%>
+        <%--            layer.msg("上传成功！")--%>
+        <%--            $("#url").val(res.url);--%>
+        <%--        } else {--%>
+        <%--            layer.msg("上传失败！")--%>
+        <%--        }--%>
+        <%--    },--%>
+        <%--    error: function (res) {--%>
+        <%--        layer.msg(res.msg);--%>
+        <%--    }--%>
+        <%--});--%>
+
+        upload.render({
+            elem: '#chooseFile', // 文件选择
+            url: ctx + '/upload/ossUploadFile',
+            exts: 'jpg|png|gif|bmp|jpeg',
+            accept: 'images',
+            acceptMime: 'image/*',
+            method: 'POST',
+            auto: true,
+            before: function () {
+                openIndex = layer.open({
+                    type: 1,
+                    title: '上传进度',
+                    closeBtn: 1, //不显示关闭按钮
+                    area: ['300px', '130px'],
+                    shadeClose: false, //开启遮罩关闭
+                    content: $("#uploadLoadingDiv").html(),
+                    offset: '100px'
+                });
+            }
+            , xhr: xhrOnProgress
+            , progress: function (value) {//上传进度回调 value进度值
+                element.progress('js_upload_progress', value + '%');//设置页面进度条
+            }
+            , done: function (res) {
+                layer.close(openIndex);
+                if (res.code == 200) {
+                    layer.msg("上传成功！")
+                    $("#deviceLogo").attr("src", res.url);
+                    $("input[name = 'deviceLogo']").val(res.url)
+                } else {
+                    layer.msg("上传失败！")
+                }
+            }
+            , error: function (res) {
+                layer.close(openIndex);
+                layer.msg(res.msg);
+            }
+        });
+
+        /**
+         * 监听提交
+         */
+        form.on('submit(formDemo)', function (data) {
+            var index = layer.load(1, {shade: [0.1, '#000']});
+            var params = data.field;
+            params.detail = um.getContent();
+            $.ajax({
+                url: '${ctx}/deviceGoods/saveOrUpdate',
+                method: 'post',
+                data: JSON.stringify(params),
+                dataType: 'JSON',
+                contentType: "application/json",
+                success: function (res) {
+                    layer.close(index);
+                    if (res.code === 200) {
+                        parent.layer.closeAll();
+                        parent.layer.msg(res.message)
+                    } else {
+                        parent.layer.msg(res.message);
+                    }
+                }
+            })
+            return false;
+        });
+
+        /**
+         * 下拉框监听
+         */
+        form.on("select(typeSelect)", function(data) {
+            console.log("aaaaa");
+            console.log(data.othis);
+            console.log(data.value);
+            $("input[name = 'code']").val(data.value);
+            if (data.value != "") {
+                $("input[name = 'codeName']").val(data.elem[data.elem.selectedIndex].text);
+            } else {
+                $("input[name = 'codeName']").val("");
+            }
+        })
+    });
+
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceGoods/list.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceGoods/list.jsp
new file mode 100644
index 0000000..164ecdb
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceGoods/list.jsp
@@ -0,0 +1,276 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<!DOCTYPE HTML>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" action="" style="margin-top: 10px">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">商品名称</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="name" placeholder="请输入商品名称" autocomplete="off"
+                                       class="layui-input">
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <div class="mb50 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-hide" id="deviceGoodsTab" lay-filter="deviceGoodsTab"></table>
+        </div>
+    </div>
+</div>
+
+<script type="text/html" id="leftBar">
+    <a class="layui-btn layui-btn-sm" lay-event="add">
+        <i class="layui-icon layui-icon-add-1"></i>添加
+    </a>
+    <a class="layui-btn layui-btn-normal layui-btn-sm" lay-event="search">
+        <i class="layui-icon layui-icon-search"></i>查询
+    </a>
+</script>
+
+<script type="text/html" id="toolBar">
+    <a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="edit">
+        <i class="layui-icon layui-icon-edit"></i>编辑
+    </a>
+    <a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="del">
+        <i class="layui-icon layui-icon-edit"></i>删除
+    </a>
+</script>
+
+<%--<script type="text/html" id="imgTemp">
+    <img src="{{d.deviceLogo}}" id="imgView" style="cursor: pointer" width="50px" height="50px" alt=""/>
+</script>--%>
+
+<script>
+    layui.use(['table', 'layer', 'form'], function () {
+        var table = layui.table;
+        var layer = layui.layer;
+        var form = layui.form;
+        var tableIns = table.render({
+            elem: '#deviceGoodsTab'
+            , url: '${ctx}/deviceGoods/page'
+            , id: 'deviceGoods'
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            , toolbar: '#leftBar' //开启头部工具栏，并为其绑定左侧模板
+            , defaultToolbar: ['filter']
+            , defaultToolbar: ['filter', 'exports', 'print', { //自定义头部工具栏右侧图标。如无需自定义，去除该参数即可
+                title: '提示'
+                , layEvent: 'LAYTABLE_TIPS'
+                , icon: 'layui-icon-tips'
+            }]
+            , title: '设备商城商品信息表'
+            , cols: [[
+                {type: 'checkbox', fixed: 'left', hidden: true}
+                , {field: 'numbers', title: '序号', fixed: 'left', unresize: true, width: 80, type: 'numbers'}
+                , {field: 'name', title: '商品名称'}
+                , {
+                    field: 'code', title: '商品类型', templet: function (d) {
+                        return getDictText(d.code, JSON.parse('${deviceTypeJsonDict}'), 'code');
+                    }
+                }
+                , { field: 'tag', title: '分类标签' }
+                , {
+                    field: 'deviceLogo', title: '商品图片', templet: function (d) {
+                        return '<span id="pic_' + d.id + '"><img src="' + d.deviceLogo + '" lay-event="showPic" style="cursor: pointer" width="50px" height="50px" alt=""/></span>';
+                    }
+                }
+                , {field: 'introDesc', title: '商品简介'}
+                , {
+                    field: 'status', title: '状态', templet: function (d) {
+                        if (d.status == '1') {
+                            return '<span style="color: green">显示</span>';
+                        } else {
+                            return '<span >不显示</span>';
+                        }
+                    }
+                }
+                , {
+                    field: 'sort', title: '序号'
+                }
+                , {
+                    field: 'createTime',
+                    title: '创建时间',
+                    width: 160,
+                    templet: "<div>{{layui.util.toDateString(d.createTime,'yyyy-MM-dd HH:mm:ss')}}</div>"
+                }
+                , {fixed: 'right', title: '操作', width: 180, toolbar: '#toolBar'}
+            ]]
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , page: true
+        });
+        table.on('tool(deviceGoodsTab)', function (obj) { //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            var data = obj.data; //获得当前行数据
+            var layEvent = obj.event; //获得 lay-event 对应的值（也可以是表头的 event 参数对应的值）
+            if (layEvent === 'del') { //删除
+                layer.confirm('真的删除么?', {icon: 3}, function (index) {
+                    obj.del(); //删除对应行（tr）的DOM结构，并更新缓存
+                    layer.close(index);
+                    del(data);
+                    //向服务端发送删除指令
+                });
+            } else if (layEvent === 'edit') {
+                toAdd(obj.data);
+            } else if (obj.event === "showPic") {
+                var objJson = {};
+                objJson.title = "预览";
+                objJson.id = data.id;
+                objJson.start = "0";
+                objJson.data = new Array();
+                var imgObj = new Object();
+                imgObj.alt = "商品图片";
+                imgObj.pid = data.id;
+                imgObj.src = $('#pic_' + data.id).find("img").attr("src");
+                objJson.data.push(imgObj);
+                layer.photos({
+                    photos: objJson,
+                    //0-6的选择，指定弹出图片动画类型，默认随机
+                    anim: 5
+                });
+            }
+        });
+
+        function toAdd(obj) {
+            var title = "新增";
+            var url = '${ctx}/deviceGoods/detail/';
+            if (obj != undefined) {
+                url = "${ctx}/deviceGoods/detail/" + obj.id;
+                title = "编辑";
+            }
+            var index = layer.open({
+                type: 2
+                , title: title
+                , shade: 0.5
+                , maxmin: true
+                , content: url
+                , area: ['900px', '750px']
+            });
+        }
+
+        //监听头工具栏事件
+        table.on('toolbar(deviceGoodsTab)', function (obj) {
+            switch (obj.event) {
+                case 'add':
+                    // 添加
+                    toAdd();
+                    break;
+                case 'search':
+                    var params = serialize($('#form1'));
+                    table.reload('deviceGoods', {
+                        where: params
+                        , page: {
+                            size: 10
+                            , current: 1
+                        }
+                    });
+                    break;
+            }
+        });
+
+        function toAddSave(index, dom) {
+            var data = dom.serializeObject();
+            $.ajax({
+                url: '${ctx}/deviceGoods/saveOrUpdate',
+                method: 'post',
+                data: JSON.stringify(data),
+                dataType: 'JSON',
+                contentType: "application/json",
+                success: function (res) {
+                    if (res.code == 200) {
+                        layer.close(index);
+                        layer.msg(res.message, {
+                            icon: 1
+                        });
+                        tableIns.reload();
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 2
+                        });
+                    }
+                }
+            })
+        }
+
+        function del(obj) {
+            $.ajax({
+                url: '${ctx}/deviceGoods/del/' + obj.id,
+                method: 'DELETE',
+                dataType: 'JSON',
+                contentType: "application/json",
+                success: function (res) {
+                    if (res.code == 200) {
+                        layer.msg(res.data, {
+                            icon: 1
+                        });
+                    } else {
+                        layer.msg(res.data, {
+                            icon: 2
+                        });
+                    }
+                }
+            })
+        }
+    });
+    jQuery.prototype.serializeObject = function () {
+        var obj = new Object();
+        $.each(this.serializeArray(), function (index, param) {
+            if (!(param.name in obj)) {
+                obj[param.name] = param.value;
+            }
+        });
+        return obj;
+    };
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceMerchantBuy/deviceMerchantBuyBaseInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceMerchantBuy/deviceMerchantBuyBaseInfo.jsp
new file mode 100644
index 0000000..2777abf
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceMerchantBuy/deviceMerchantBuyBaseInfo.jsp
@@ -0,0 +1,64 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+    pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!--商户基本信息-->
+        <form id="postForm">
+            <div class="w1000 fc" style="background: white">
+                <div class="pd10 textl pl50 pb20 fw800 f16 pb20 bdbe mb20">
+                   订单信息：<span class="red f12 ml20"></span>
+                </div>
+                 <div class="clearfix mb20">
+                    <div class="fl textc wp30">
+                        <div class="w100 textr  dlblock">购买数量:</div>
+                        <div class="dlblock ml10">${deviceMerchantBuy.quantity }
+                        </div>
+                    </div>
+                    <div class="textc fl wp30">
+                        <div class="w100 textr dlblock">订单金额:</div>
+                        <div class="dlblock ml10">${deviceMerchantBuy.orderAmount }元
+                        </div>
+                    </div>
+                    <div class="fl textc wp30">
+                        <div class="w100 textr  dlblock">订单状态:</div>
+                        <div class="dlblock ml10">
+                        <c:if test="${deviceMerchantBuy.status eq '0' }">
+                              待付款
+                        </c:if>
+                         <c:if test="${deviceMerchantBuy.status eq '1' }">
+                              已付款
+                        </c:if>
+                        </div>
+                    </div>
+                </div>
+                <div class="pd10 textl pl50 pb20 fw800 f16 pb20 bdbe mb20 pt20">
+                   收货人信息：<span class="red f12 ml20"></span>
+                </div>
+                <div class="clearfix mb20">
+                    <div class="fl textc wp30">
+                        <div class="w100 textr  dlblock">姓名:</div>
+                        <div class="dlblock ml10">${deviceMerchantBuy.linkName }
+                        </div>
+                    </div>
+                    <div class="textc fl wp30">
+                        <div class="w100 textr dlblock">手机号:</div>
+                        <div class="dlblock ml10">${deviceMerchantBuy.linkPhone }
+                        </div>
+                    </div>
+                    <div class="textc fl wp30">
+                        <div class="w100 textr dlblock">详细地址:</div>
+                        <div class="dlblock ml10">${deviceMerchantBuy.provinces}&nbsp;&nbsp;${deviceMerchantBuy.address}
+                        </div>
+                    </div>
+                </div>
+            </div>
+<%--    <script type="text/javascript">--%>
+<%--            $(".downSelect").hide();--%>
+<%--            $("#div-1").show();--%>
+<%--            function updateRate(obj){--%>
+<%--                var merchantInfoId=$("#merchantInfoId").val();--%>
+<%--            } --%>
+<%--            --%>
+<%--        </script>--%>
+        </form>
+
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceMerchantBuy/deviceMerchantBuyDetails.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceMerchantBuy/deviceMerchantBuyDetails.jsp
new file mode 100644
index 0000000..81925b0
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceMerchantBuy/deviceMerchantBuyDetails.jsp
@@ -0,0 +1,54 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>     
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">                      
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black"> 
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> 
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->                                     
+<meta name="viewport"
+	content="width=device-width, initial-scale=1.0, maximum-scale=1.0">   
+<jsp:include page="../../common.jsp" />
+<script type="text/javascript">
+    require("js/deviceMerchantBuy/deviceMerchantBuyDetails.js");
+</script>
+<title>编辑</title>
+</head>                                 
+	<body class="lgraybg">            
+		<div class="	container-fluid animated fadeInRight col-sm-12">
+			<div class="panel-toolbar mt10 mb10 pt5 pb5 pl10 bdd whitebg">
+				<div class="buttons">
+					<!-- <a href="javascript:void(0);" class="btn btn-primary fa fa-save f12"><span>保存</span></a> -->
+					<a href="${ctx }/deviceMerchantBuy/index?pageIndex=${pageIndex}"  class="layui-btn layui-btn-sm fa fa-back f12" id="goback"><span>返回</span></a>
+				</div>
+			</div>
+				<div class="tabs-container whitebg">
+					<div class="pt10 pl5 pr5">
+						<ul class="nav nav-tabs" id="nav-tabs">
+							<li class="active" data-action="base">   
+								<a href="javascript:void(0);" >基本资料</a>
+							</li>
+							<!-- <li class="" data-action="functions">
+								<a href="javascript:void(0);"  >多功能输入</a>
+							</li>
+							<li class="" data-action="extends">
+								<a href="javascript:void(0);" >扩展属性</a>
+							</li> -->
+						</ul>
+						<div class="tab-content pt30 p30">               
+		
+						</div>     
+					</div>
+				</div>    
+		</div>
+		<!-- 隐藏域 -->
+		<input type="hidden" id="deviceMerchantBuyId" value="${deviceMerchantBuy.id }"/>
+	</body>
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceMerchantBuy/deviceMerchantBuyExtendsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceMerchantBuy/deviceMerchantBuyExtendsInfo.jsp
new file mode 100644
index 0000000..592687a
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceMerchantBuy/deviceMerchantBuyExtendsInfo.jsp
@@ -0,0 +1,201 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>           
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> 
+<div class="tab-pane active">      
+	<div class="animated fadeInRight">
+		<div class="whitebg pl10 pr10">
+			<table class="table table-striped table-bordered table-hover">     
+				<thead> 
+					<tr>  
+						<th class="textc">序号</th>         
+						<th class="textc wp15">流水账号</th>
+						<th class="textc">日期</th>         
+						<th class="textc">财务类别</th>     
+						<th class="textc">金额</th>         
+						<th class="textc">银行</th>         
+						<th class="textc">发票</th>         
+						<th class="textc">客户名称</th>     
+						<th class="textc wp15">单号</th>    
+						<th class="textc">状态</th>         
+						<th class="textc">类别</th>         
+						<th class="textc">操作</th>         
+					</tr> 
+				</thead>
+				<tbody> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+                
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="green">支出</span></td>     
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+				</tbody>
+                
+			</table>  
+			<!-- footer -->  
+			<div class="clearfix mb10 pb20">          
+					<div class="layui-tab-item fr">       
+							<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+							<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>   
+							<div class="pagination dlblock vm" id="pagination"></div>
+							<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>            
+					</div>
+				</div>  
+		</div>      
+	</div>        
+</div>          
+                
+<script type="text/javascript">    
+//分页          
+$('#pagination').pagination({        
+	pageCount: 50,
+	jump: true,   
+	coping: true, 
+	homePage: '首页',    
+	endPage: '末页',     
+	prevContent: '上页', 
+	nextContent: '下页', 
+	callback: function(api) {          
+		$('.now').text(api.getCurrent());
+	}             
+});             
+</script>       
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceMerchantBuy/deviceMerchantBuyFunctionsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceMerchantBuy/deviceMerchantBuyFunctionsInfo.jsp
new file mode 100644
index 0000000..982ce84
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceMerchantBuy/deviceMerchantBuyFunctionsInfo.jsp
@@ -0,0 +1,130 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>		
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">      
+<div class="tab-pane active">
+				<div class="panel-body">
+					<div class="wrapper wrapper-content">     
+						<div class="panel-form animated fadeInRight wp60 fc">
+							<!-- 账号资料 -->
+			<div class="layui-form-item 	has-error">
+				<label class="layui-form-label">单行输入框<i class="red">*</i></label>
+				<div class="layui-input-block">
+					<input type="text" name="title" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input">
+				</div>                                         
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">自定义验证</label>
+				<div class="layui-input-inline ml30">
+					<input type="password" name="password" lay-verify="pass" placeholder="请输入密码" autocomplete="off" class="layui-input">
+				</div>
+				<div class="layui-form-mid layui-word-aux">请填写6到12位密码</div>
+			</div>
+			<div class="form-group">
+				<div class="layui-form-item">          
+					<label class="layui-form-label">单行选择框</label>
+					<div class="layui-input-block">
+						<select name="interest" lay-filter="aihao">  
+							<option value=""></option>
+							<option value="0">写作</option>         
+							<option value="1" selected="">阅读</option>
+							<option value="2">游戏</option>
+							<option value="3">音乐</option>
+							<option value="4">旅行</option>  
+						</select>              
+					</div>
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<div class="layui-inline">  
+					<label class="layui-form-label">范围</label>
+					<div class="layui-input-inline ml30">
+						<input type="text" name="price_min" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>                                     
+					<div class="layui-form-mid">-</div>
+					<div class="layui-input-inline">       
+						<input type="text" name="price_max" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>
+				</div>           
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">联动选择框</label>
+				<div class="layui-input-inline ml30">
+					<select name="quiz1">     
+						<option value="">请选择省</option>
+						<option value="浙江" selected="">浙江省</option> 
+						<option value="你的工号">江西省</option>           
+						<option value="你最喜欢的老师">福建省</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz2">
+						<option value="">请选择市</option>
+						<option value="杭州">杭州</option>
+						<option value="宁波" disabled="">宁波</option>
+						<option value="温州">温州</option>
+						<option value="温州">台州</option>
+						<option value="温州">绍兴</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz3">
+						<option value="">请选择县/区</option>
+						<option value="西湖区">西湖区</option>
+						<option value="余杭区">余杭区</option>
+						<option value="拱墅区">临安市</option>
+					</select>
+				</div>    
+			</div>
+			<div class="layui-form-item" pane="">   
+				<label class="layui-form-label">原始复选框</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="like1[write]" lay-skin="primary" title="写作" checked="">  
+					<input type="checkbox" name="like1[read]" lay-skin="primary" title="阅读">
+					<input type="checkbox" name="like1[game]" lay-skin="primary" title="游戏" disabled="">
+				</div>
+			</div>
+
+			<div class="layui-form-item">
+				<label class="layui-form-label">开关-默认关</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="close" lay-skin="switch" lay-text="ON|OFF">
+				</div>
+			</div>
+			<div class="layui-form-item">  
+				<label class="layui-form-label">单选框</label>
+				<div class="layui-input-block">
+					<input type="radio" name="sex" value="男" title="男" checked="">
+					<input type="radio" name="sex" value="女" title="女">
+					<input type="radio" name="sex" value="禁" title="禁用" disabled="">
+				</div>
+			</div>
+			<!--<div class="layui-form-item layui-form-text">
+				<label class="layui-form-label">上传图片</label>
+				<div class="layui-input-block">
+					<div class="layui-upload-drag w200 h200">
+						<i class="layui-icon"></i>          
+						<p>点击上传</p>
+					</div>
+				</div>
+			</div>-->
+				<div class="layui-form-item layui-form-text">
+					<label class="layui-form-label">普通文本域</label>  
+					<div class="layui-input-block">              
+						<textarea placeholder="请输入内容" class="layui-textarea"></textarea>
+					</div>
+				</div>
+			</div>
+		</div>   
+	</div>
+</div>
+</form>   
+<script type="text/javascript">
+	//form表单样式
+	layui.use(['layer', 'form'], function() {    
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+</script>                 
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceMerchantBuy/deviceMerchantBuyList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceMerchantBuy/deviceMerchantBuyList.jsp
new file mode 100644
index 0000000..b57aabc
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceMerchantBuy/deviceMerchantBuyList.jsp
@@ -0,0 +1,665 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+    <script type="text/javascript">
+        require("js/deviceMerchantBuy/deviceMerchantBuyList.js");
+    </script>
+
+    <style>
+        .layui-table th {
+            text-align: center;
+        }
+
+        .layui-dropdown {
+            min-width: 0px !important;
+        }
+
+        /*.layui-dropdown-item*/
+        .layui-dropdown-item .layui-menu {background-color: #fff; border: none;}
+        .layui-dropdown-item .layui-menu li{
+            color: #fff;
+            padding: 0;
+        }
+
+        .layui-menu {
+            margin: 5px;
+        }
+
+        .layui-menu li, .layui-menu-body-title a {
+            padding: 0;
+        }
+
+        .layui-menu-body-title a {
+            display: block;
+            margin: 0 !important;
+            color: rgba(255,255,255,.8);
+        }
+    </style>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+
+                </div>
+            </div>
+
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" action="" style="margin-top: 10px" id="form1">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">用户ID</label>
+                            <div class="layui-input-inline">
+                                <input type="text" name="userId" placeholder="请输入用户ID" id="userId" class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">商户简称</label>
+                            <div class="layui-input-inline">
+                                <input type="text" name="alias" placeholder="请输入商户简称" id="alias" class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">订单号</label>
+                            <div class="layui-input-inline">
+                                <input type="text" name="orderNo" placeholder="请输入订单号" id="orderNo" class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">商品名称</label>
+                            <div class="layui-input-inline">
+                                <input type="text" name="name" placeholder="请输入商品名称" id="name" class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">订单金额</label>
+                            <div class="layui-input-inline">
+                                <input type="number" name="orderAmt" placeholder="请输入订单金额" id="orderAmt" class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">联系人</label>
+                            <div class="layui-input-inline">
+                                <input type="text" name="linkName" placeholder="请输入联系人" id="linkName" class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">联系人手机</label>
+                            <div class="layui-input-inline">
+                                <input type="text" name="linkPhone" placeholder="请输入手机" id="queryLinkPhone" class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">开始日期</label>
+                            <div class="layui-input-inline">
+                                <input type="text" placeholder="开始日期" id="date1" name="startTime" autocomplete="off"
+                                       class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">结束日期</label>
+                            <div class="layui-input-inline">
+                                <input type="text" placeholder="结束日期" id="date2" name="endTime" autocomplete="off"
+                                       class="layui-input">
+                            </div>
+                        </div>
+
+
+                        <%--<div class="layui-inline">
+                            <label class="layui-form-label">商户订单号</label>
+                            <div class="layui-input-inline">
+                                <input type="text" placeholder="请输入名称" id="transNo" class="layui-input">
+                            </div>
+                        </div>--%>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">状态</label>
+                            <div class="layui-input-inline">
+                                <select class="form-control f12 w180 textc" name="status" id="status">
+                                    <option value="">请选择</option>
+                                    <option value="0">待付款</option>
+                                    <option value="1">已付款</option>
+                                    <option value="2">已退款</option>
+                                    <!--<option value="3">退款失败</option>
+                                    <option value="4">支付失败</option> -->
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+
+                    <%--<div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">开始日期</label>
+                            <div class="layui-input-inline">
+                                <input type="text" placeholder="订单创建时间" id="date1" name="startTime" class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">结束日期</label>
+                            <div class="layui-input-inline">
+                                <input type="text" placeholder="订单创建时间" id="date2" name="endTime" class="layui-input">
+                            </div>
+                        </div>
+                    </div>--%>
+                </form>
+            </div>
+        </div>
+    </div>
+    <div class="mb50 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-hide" id="deviceMerchantBuyList" lay-filter="deviceMerchantBuyList"></table>
+        </div>
+    </div>
+</div>
+</body>
+
+<script id="dealStatus" type="text/html">
+    {{# if (d.status == '0') { }}
+    <div style="color: red">待付款</div>
+    {{# } else if (d.status == '1') { }}
+    <div style="color: green;">已付款</div>
+    {{# } else if (d.status == '2') { }}
+    <div style="color: blue">已退款</div>
+    {{# } else if (d.status == '3') { }}
+    <div style="color: red;">退款失败</div>
+    {{# } else if (d.status == '4') { }}
+    <div style="color: red;">支付失败</div>
+    {{# } }}
+</script>
+
+<script id="lineBar" type="text/html">
+    <a class="layui-btn layui-btn-xs" lay-event="more">操作 <i class="layui-icon layui-icon-down"></i></a>
+<%--{{# if (d.actStatus == '2') { }}--%>
+<%--<a href="javascript:void(0);" lay-event="updateExpress"--%>
+<%--   class="layui-btn layui-btn-radius layui-btn-xs fa fa-edit ops_more f12">快递单号</a>--%>
+<%--<a href="javascript:void(0);" lay-event="showDevice"--%>
+<%--         class="layui-btn layui-btn-xs layui-btn-radius fa fa-edit ops_more f12">详&emsp;&emsp;情</a>--%>
+<%--<a href="javascript:void(0);" lay-event="initDeleteDevice"--%>
+<%--        class="layui-btn layui-btn-radius layui-btn-xs layui-btn-danger fa fa-remove ops_more f12">删&emsp;&emsp;除</a>--%>
+<%--{{# } else { }}--%>
+<%--<a href="javascript:void(0);" lay-event="updateExpress"--%>
+<%--   class="layui-btn layui-btn-radius layui-btn-xs fa fa-edit ops_more f12">快递单号</a>--%>
+<%--<a href="javascript:void(0);" lay-event="updateQrCode"--%>
+<%--        class="layui-btn layui-btn-radius layui-btn-xs fa fa-edit ops_more f12">设备编号</a>--%>
+<%-- <a href="javascript:void(0);" lay-event="showDevice"--%>
+<%--         class="layui-btn layui-btn-xs layui-btn-radius fa fa-edit ops_more f12">详&emsp;&emsp;情</a>--%>
+<%--<a href="javascript:void(0);" lay-event="initDeleteDevice"--%>
+<%--        class="layui-btn layui-btn-xs layui-btn-radius layui-btn-danger fa fa-remove ops_more f12">删&emsp;&emsp;除</a>--%>
+<%--{{# } }}--%>
+</script>
+
+<script id="toolbarMenu1" type="text/html">
+    <a href="javascript:void(0);" lay-event="updateExpress"
+       class="layui-btn layui-btn-radius layui-btn-xs fa fa-edit ops_more f12">快递单号</a>
+    </br> <a href="javascript:void(0);" lay-event="showDevice"
+             class="layui-btn layui-btn-xs layui-btn-radius fa fa-edit ops_more f12">详&emsp;&emsp;情</a>
+    </br><a href="javascript:void(0);" lay-event="initDeleteDevice"
+            class="layui-btn layui-btn-radius layui-btn-xs layui-btn-danger fa fa-remove ops_more f12">删&emsp;&emsp;除</a>
+</script>
+
+<script id="toolbarMenu2" type="text/html">
+    <a href="javascript:void(0);" lay-event="updateExpress"
+       class="layui-btn layui-btn-radius layui-btn-xs fa fa-edit ops_more f12">快递单号</a>
+    </br><a href="javascript:void(0);" lay-event="updateQrCode"
+            class="layui-btn layui-btn-radius layui-btn-xs fa fa-edit ops_more f12">设备编号</a>
+    </br> <a href="javascript:void(0);" lay-event="showDevice"
+             class="layui-btn layui-btn-xs layui-btn-radius fa fa-edit ops_more f12">详&emsp;&emsp;情</a>
+    </br><a href="javascript:void(0);" lay-event="initDeleteDevice"
+            class="layui-btn layui-btn-xs layui-btn-radius layui-btn-danger fa fa-remove ops_more f12">删&emsp;&emsp;除</a>
+</script>
+
+<script id="actStatus" type="text/html">
+    {{# if (d.actStatus == '2') { }}
+    <div style="color: green">已激活</div>
+    {{# } else { }}
+    <div style="color: red">未激活</div>
+    {{# } }}
+</script>
+
+<script type="text/template" id="setDeviceNo">
+    <form class="layui-form" id="form2" style="margin-top: 2rem;">
+        <input name="id" id="id" hidden>
+        <div class="layui-form-item" style="width: 350px;">
+            <label class="layui-form-label">设备类型</label>
+            <div class="layui-input-block">
+                <select class="layui-select" name="groupNo" id="groupNo" lay-verify="required">
+                    <option value="">请选择</option>
+                    <c:forEach items="${deviceGroupDict}" var="device">
+                        <option value="${device.value}">${device.name}</option>
+                    </c:forEach>
+                </select>
+            </div>
+        </div>
+        <div class="layui-form-item" style="width: 350px;">
+            <label class="layui-form-label">设备编号</label>
+            <div class="layui-input-block">
+                <input type="text" name="snNo" id="snNo" placeholder="设备编号" autocomplete="off" class="layui-input">
+            </div>
+        </div>
+    </form>
+</script>
+
+<script type="text/template" id="showDeviceDetail">
+
+    <form class="layui-form" id="form3" style="width: 90%;">
+        <div class="layui-form-item">
+            <blockquote class="layui-elem-quote">订单信息</blockquote>
+        </div>
+        <div class="layui-form-item" style="width: 350px;">
+            <label class="layui-form-label">购买数量</label>
+            <div class="layui-input-block">
+                <input type="text" name="quantity" id="quantity" readonly placeholder="购买数量" autocomplete="off" class="layui-input">
+            </div>
+        </div>
+        <div class="layui-form-item" style="width: 350px;">
+            <label class="layui-form-label">订单金额</label>
+            <div class="layui-input-block">
+                <input type="text" name="orderAmount" id="orderAmount" readonly placeholder="订单金额" autocomplete="off" class="layui-input">
+            </div>
+        </div>
+        <div class="layui-form-item" style="width: 350px;">
+            <label class="layui-form-label">订单状态</label>
+            <div class="layui-input-block">
+                <input type="text" name="status" id="orderStatus" readonly placeholder="订单状态" autocomplete="off" class="layui-input layui-hide">
+                <input type="text" name="statusDesc" id="statusDesc" readonly placeholder="订单状态" autocomplete="off" class="layui-input">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <blockquote class="layui-elem-quote">收货信息</blockquote>
+        </div>
+        <div class="layui-form-item" style="width: 350px;">
+            <label class="layui-form-label">收货信息</label>
+            <div class="layui-input-block">
+                <textarea class="layui-textarea" id="addressComposite" readonly name="addressComposite"></textarea>
+            </div>
+        </div>
+
+        <input class="layui-hide" name="id"/>
+
+        <div class="layui-form-item" style="width: 350px;">
+            <label class="layui-form-label">收货人</label>
+            <div class="layui-input-block">
+                <input class="layui-input" name="linkName"/>
+            </div>
+        </div>
+
+        <div class="layui-form-item" style="width: 350px;">
+            <label class="layui-form-label">手机号</label>
+            <div class="layui-input-block">
+                <input class="layui-input" id="linkPhone" name="linkPhone" />
+            </div>
+        </div>
+
+        <div class="layui-form-item" style="width: 350px;">
+            <label class="layui-form-label">省市区</label>
+            <div class="layui-input-block">
+                <input class="layui-input" id="provinces" name="provinces" />
+            </div>
+        </div>
+
+        <div class="layui-form-item" style="width: 350px;">
+            <label class="layui-form-label">详细地址</label>
+            <div class="layui-input-block">
+                <textarea class="layui-textarea" id="address" name="address"></textarea>
+            </div>
+        </div>
+
+        <div class="layui-form-item">
+            <div class="layui-input-block">
+                <button class="layui-btn" lay-submit lay-filter="formDemo">保存收货信息</button>
+            </div>
+        </div>
+    </form>
+</script>
+
+<script id="toolBar" type="text/html">
+    <a class="layui-btn layui-btn-sm fa fa-search f13" href="javascript:void(0);"
+       onclick="queryDeviceMerchantBuy()"><span>搜索</span></a>
+    <button type="button" class="layui-btn layui-btn-sm layui-btn-normal" lay-event="print"><i class="layui-icon layui-icon-print"></i>打印圆通单号</button>
+    <!-- <a class="layui-btn fa fa-plus f13 add" href="javascript:void(0);" onclick="initAddDeviceMerchantBuy()"><span>添加</span></a>
+    <a class="layui-btn fa fa-edit f13" href="javascript:void(0);" onclick="initEditDeviceMerchantBuy()"><span>编辑</span></a>
+    <a class="layui-btn fa fa-remove f13 delete" href="javascript:void(0);" onclick="initBatchDeleteDeviceMerchantBuy()"><span>删除</span></a> -->
+</script>
+
+<script type="text/javascript">
+    var layer;
+    var form;
+    var table;
+    var laydate;
+    var dropdown;
+    //form表单样式
+    layui.use(['table', 'layer', 'form', 'dropdown'], function () {
+        layer = layui.layer;
+        form = layui.form;
+        table = layui.table;
+        laydate = layui.laydate;
+        dropdown = layui.dropdown;
+        form.render();
+
+        form.on('submit(formDemo)', function(data){
+            $.ajax({
+                url: ctx + '/deviceMerchantBuy/update',
+                type: 'post',
+                contentType: "application/json",
+                data: JSON.stringify(data.field),
+                success: function(ret) {
+                    if (ret.code == 200) {
+                        layer.closeAll();
+                        layer.msg(ret.message);
+                        let params = serialize($('#form1'));
+                        table.reload('deviceMerchantBuyList', {
+                            where: params
+                        });
+                    }else{
+                        layer.msg(ret.message);
+                    }
+                }
+            });
+            return false;
+        });
+
+        //执行一个 table 实例
+        table.render({
+            elem: '#deviceMerchantBuyList'
+            , id: 'deviceMerchantBuyList'
+            , url: ctx + '/deviceMerchantBuy/queryDeviceMerchantBuyByPage' //数据接口
+            , autoSort: false
+            , where: {
+                alias: $("#alias").val(),
+                orderNo: $('#orderNo').val(),
+                transNo: $('#transNo').val(),
+                status: $('#status').val(),
+                startTime: $('#date1').val(),
+                endTime: $('#date2').val(),
+                userId: $('#userId').val()
+            }
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , title: 'app首页菜单表'
+            , page: true //开启分页
+            , toolbar: '#toolBar' //开启工具栏，此处显示默认图标，可以自定义模板，详见文档
+            , defaultToolbar: ['filter']
+            , cols: [[ //表头
+                {type: 'numbers'}
+                , {type: 'checkbox'}
+                /*   , {type: 'checkbox'}*/
+                /* , {field: 'id', title: 'id'}*/
+                , {field: 'userId', title: '用户ID', width: 90}
+                , {field: 'orderNo', title: '订单号', width: 150}
+                , {field: 'name', title: '商品名称', width: 150}
+                , {field: 'deviceType', title: '商品类型/尺寸', width: 120}
+                , {field: 'orderAmount', title: '订单金额', width: 90}
+                , {field: 'quantity', title: '购买数量', width: 90}
+                , {field: 'alias', title: '商户简称', width: 90}
+                , {field: 'linkName', title: '联系人', width: 90}
+                , {field: 'linkPhone', title: '联系人手机', width: 120}
+                , {field: 'venderModel', title: '机具编码', width: 90}
+                , {field: 'payName', title: '支付方式', width: 90}
+                /* , {field: 'createDt', title: '创建时间'}*/
+                , {field: 'transDt', title: '支付时间', width: 160}
+                , {field: 'expressNo', title: '快递单号', width: 150}
+                , {field: 'snNo', title: '设备编号', width: 150}
+                , {field: 'actStatus', title: '激活状态', width: 90, templet: '#actStatus'}
+                , {field: 'status', title: '状态', width: 90, templet: '#dealStatus'}
+                , {fixed: 'right', title: '操作', minWidth: 90, align: 'center', toolbar: '#lineBar'}
+            ]]
+        });
+
+        table.on('toolbar(deviceMerchantBuyList)', function (obj) {
+            var checkStatus = table.checkStatus(obj.config.id);
+            if(checkStatus.data.length == 0){
+                return layer.msg("最少选中一行数据！");
+            }
+            if(obj.event === "print"){
+                let data = checkStatus.data;
+                let ids = "";
+                $.each(data,function (index,event){
+                    ids += event.id + ",";
+                })
+                ids = ids.substring(0,ids.length -1);
+                var loading = layer.load(1, {shade: [0.1, '#000']});
+                $.ajax({
+                    url: ctx + '/deviceMerchantBuy/printYtOrder',
+                    type: "post",
+                    dataType: "json",
+                    data: {
+                        "ids": ids,
+                    },
+                    success: function (result) {
+                        layer.close(loading);
+                        let index = layer.alert(result.message,{icon:result.code == 200 ? 1: 2},function (){
+                            layer.close(index);
+                            var params= serialize($('#form1'));
+                            table.reload('deviceMerchantBuyList', {
+                                where: params
+                            });
+                        })
+                    }
+                })
+
+            }
+        });
+
+        //监听行工具事件
+        table.on('tool(deviceMerchantBuyList)', function (obj) { //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            var d = obj.data //获得当前行数据
+                , layEvent = obj.event; //获得 lay-event 对应的值
+            var that = this;
+            if (layEvent === 'updateExpress') {
+                updateExpressNo(d.id);
+            } else if (layEvent === 'updateQrCode') {
+                updateQrCodeNo(d.id);
+            } else if (layEvent === 'showDevice') {
+                showDeviceMerchantBuyDetails(d);
+            } else if (layEvent === 'initDeleteDevice') {
+                initDeleteDeviceMerchantBuy(d.id);
+            } else if (layEvent === 'more') {
+                if (d.actStatus == '2') {
+                    dropdown.render({
+                        elem: that
+                        , show: true //外部事件触发即显示
+                        , data: [{
+                            title: 'menu item 1'
+                            , templet: '<a href="javascript:void(0);" onclick="updateExpressNo(' + d.id + ')" class="layui-btn layui-btn-radius layui-btn-xs fa fa-edit ops_more f12">快递单号</a>'
+                        }, {
+                            title: 'menu item 1'
+                            , templet: '<a href="javascript:void(0);" onclick="showDeviceMerchantBuyDetails(' + d + ')"  class="layui-btn layui-btn-xs layui-btn-radius fa fa-edit ops_more f12">详情</a>'
+                        }, {
+                            title: 'menu item 1'
+                            , templet: '<a href="javascript:void(0);" onclick="initDeleteDeviceMerchantBuy(' + d.id + ')" class="layui-btn layui-btn-radius layui-btn-xs layui-btn-danger fa fa-remove ops_more f12">删除</a>'
+                        }]
+                        , className: 'layui-dropdown-item'
+                    });
+                } else {
+                    let data = [{
+                        id: 'updateExpressNo'
+                        // onclick="updateExpressNo(' + d.id + ')"
+                        , templet: '<a href="javascript:void(0);" class="layui-btn layui-btn-radius layui-btn-xs fa fa-edit ops_more f12">快递单号</a>'
+                    }, {
+                        id: 'updateQrCodeNo'
+                        // onclick="updateQrCodeNo(' + d.id + ')"
+                        , templet: '<a href="javascript:void(0);"  class="layui-btn layui-btn-xs layui-btn-radius fa fa-edit ops_more f12">设备编号</a>'
+                    }, {
+                        id: 'showDeviceDetail'
+                        // onclick="showDeviceMerchantBuyDetails(' + d + ')"
+                        , templet: '<a href="javascript:void(0);"  class="layui-btn layui-btn-xs layui-btn-radius fa fa-edit ops_more f12">详情</a>'
+                    }];
+                    // if(d.status == 1){
+                    //     data.push({id: 'updateStatus', templet: '<a href="javascript:void(0);"  class="layui-btn layui-btn-xs layui-btn-radius fa fa-gratipay ops_more f12">设为退款</a>'})
+                    // }
+                    data.push({id: 'deleteDevice', templet: '<a href="javascript:void(0);"  class="layui-btn layui-btn-radius layui-btn-xs layui-btn-danger fa fa-remove ops_more f12">删除</a>'})
+                    dropdown.render({
+                        elem: that
+                        , show: true //外部事件触发即显示
+                        , data:data
+                        , className: 'layui-dropdown-item'
+                        , click:function (data,othis){
+                            if(data.id === "updateExpressNo"){
+                                updateExpressNo(d.id);
+                            }else if(data.id === "updateQrCodeNo"){
+                                updateQrCodeNo(d.id);
+                            }else if(data.id === "showDeviceDetail"){
+                                showDeviceMerchantBuyDetails(d);
+                            }
+                            // else if(data.id === "updateStatus"){
+                            //     updateBuyOrderStatus(obj,"2");
+                            // }
+                            else{
+                                initDeleteDeviceMerchantBuy(d.id);
+                            }
+                        }
+                    });
+                }
+            }
+        });
+
+        function updateBuyOrderStatus(obj,status){
+            let index = layer.load(1, {shade: [0.1, '#000']});
+            $.ajax({
+                url: ctx + '/deviceMerchantBuy/saveDeviceMerchantBuy',
+                type: "post",
+                dataType: "json",
+                data: {
+                    "status": status,
+                    "id": obj.data.id,
+                },
+                success: function (result) {
+                    layer.close(index);
+                    if (result.resultCode == 1) {
+                        obj.update({
+                            status:2
+                        })
+                        layer.msg(result.resultMessage, {icon: 1});
+                    } else {
+                        layer.msg(result.resultMessage, {icon: 2});
+                    }
+                }
+            })
+        }
+    });
+
+    function updateQrCodeNo(id) {
+        //var htmlStr = '<div class="layui-form-item" style="margin: 10px;"><label class="layui-form-label">二维码编号</label><div class="layui-input-block"><input id="qrNo" placeholder="请输入二维码编号" maxlength="10" style="width:130px" class="layui-input"></div></div>';
+        layer.open({
+            type: 1,
+            title: '填充设备编号',
+            area: ['450px', '350px'],
+            shade: 0.3,
+            maxmin: true,
+            content: $("#setDeviceNo").html(),
+            btn: ['确定', '取消'],
+            yes: function () {
+                var groupNo = $("#groupNo").val();
+                if (!groupNo) {
+                    layer.msg("设备类型不能为空!", {icon: 2});
+                    return;
+                }
+                var snNo = $("#snNo").val();
+                if (!snNo) {
+                    layer.msg("设备编号不能为空!", {icon: 2});
+                    return;
+                }
+                updateSnNo(id, groupNo, snNo);
+            }
+            , success: function () {
+                form.render('select');
+            }
+        })
+    }
+
+    function updateSnNo(id, groupNo, snNo) {
+        $.ajax({
+            url: ctx + '/deviceMerchantBuy/updateSnNo',
+            type: "post",
+            dataType: "json",
+            data: {
+                "groupNo": groupNo,
+                "snNo": snNo,
+                "id": id,
+            },
+            success: function (result) {
+                if (result.code == 200) {
+                    layer.msg(result.message, {icon: 1});
+                    queryDeviceMerchantBuy(pageIndex);
+                    layer.closeAll();
+                } else {
+                    layer.msg(result.message, {icon: 2});
+                }
+            }
+        })
+    }
+
+    //查询
+    function queryDeviceMerchantBuy() {
+        table.reload('deviceMerchantBuyList', {
+            page: {
+                curr: 1
+            }
+            , where: { //请求参数（注意：这里面的参数可任意定义，并非下面固定的格式）
+                alias: $("#alias").val(),
+                orderNo: $('#orderNo').val(),
+                transNo: $('#transNo').val(),
+                status: $('#status').val(),
+                startTime: $('#date1').val(),
+                endTime: $('#date2').val(),
+                userId: $('#userId').val(),
+                name: $('#name').val(),
+                orderAmount: $('#orderAmt').val(),
+                linkName: $('#linkName').val(),
+                linkPhone: $("#queryLinkPhone").val()
+            }
+        });
+    }
+</script>
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceMerchantBuyDetail/deviceMerchantBuyDetailBaseInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceMerchantBuyDetail/deviceMerchantBuyDetailBaseInfo.jsp
new file mode 100644
index 0000000..78a2ed9
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceMerchantBuyDetail/deviceMerchantBuyDetailBaseInfo.jsp
@@ -0,0 +1,33 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">  
+	<div class="tab-pane active">     
+		<div class="panel-body">
+			<div class="wrapper wrapper-content">
+				<div class="panel-form animated fadeInRight wp60 fc">
+					<div class="layui-form-item dn	has-error" >   
+						<label class="layui-form-label">id</label>  
+						<div class="layui-input-block">
+							<input type="text" name="id" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${deviceMerchantBuyDetail.id }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">orderNo</label>  
+						<div class="layui-input-block">
+							<input type="text" name="orderNo" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${deviceMerchantBuyDetail.orderNo }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">soleCode</label>  
+						<div class="layui-input-block">
+							<input type="text" name="soleCode" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${deviceMerchantBuyDetail.soleCode }" >
+						</div>  
+					</div>
+	
+				</div>
+			</div>
+		</div>  
+	</div>
+</form>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceMerchantBuyDetail/deviceMerchantBuyDetailDetails.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceMerchantBuyDetail/deviceMerchantBuyDetailDetails.jsp
new file mode 100644
index 0000000..1cd2686
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceMerchantBuyDetail/deviceMerchantBuyDetailDetails.jsp
@@ -0,0 +1,54 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>     
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">                      
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black"> 
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> 
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->                                     
+<meta name="viewport"
+	content="width=device-width, initial-scale=1.0, maximum-scale=1.0">   
+<jsp:include page="../../common.jsp" />
+<script type="text/javascript">
+    require("js/deviceMerchantBuyDetail/deviceMerchantBuyDetailDetails.js");
+</script>
+<title>编辑</title>
+</head>                                 
+	<body class="lgraybg">            
+		<div class="	container-fluid animated fadeInRight col-sm-12">
+			<div class="panel-toolbar mt10 mb10 pt5 pb5 pl10 bdd whitebg">
+				<div class="buttons">
+					<a href="javascript:void(0);" class="btn btn-primary fa fa-save f12"><span>保存</span></a>
+					<a href="${ctx }/deviceMerchantBuyDetail/index?pageIndex=${pageIndex}"  class="btn btn-primary fa fa-back f12" id="goback"><span>返回</span></a>
+				</div>
+			</div>
+				<div class="tabs-container whitebg">
+					<div class="pt10 pl5 pr5">
+						<ul class="nav nav-tabs" id="nav-tabs">
+							<li class="active" data-action="base">   
+								<a href="javascript:void(0);" >基本资料</a>
+							</li>
+							<li class="" data-action="functions">
+								<a href="javascript:void(0);"  >多功能输入</a>
+							</li>
+							<li class="" data-action="extends">
+								<a href="javascript:void(0);" >扩展属性</a>
+							</li>
+						</ul>
+						<div class="tab-content pt30 p30">               
+		
+						</div>     
+					</div>
+				</div>    
+		</div>
+		<!-- 隐藏域 -->
+		<input type="hidden" id="deviceMerchantBuyDetailId" value="${deviceMerchantBuyDetail.id }"/>
+	</body>
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceMerchantBuyDetail/deviceMerchantBuyDetailExtendsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceMerchantBuyDetail/deviceMerchantBuyDetailExtendsInfo.jsp
new file mode 100644
index 0000000..592687a
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceMerchantBuyDetail/deviceMerchantBuyDetailExtendsInfo.jsp
@@ -0,0 +1,201 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>           
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> 
+<div class="tab-pane active">      
+	<div class="animated fadeInRight">
+		<div class="whitebg pl10 pr10">
+			<table class="table table-striped table-bordered table-hover">     
+				<thead> 
+					<tr>  
+						<th class="textc">序号</th>         
+						<th class="textc wp15">流水账号</th>
+						<th class="textc">日期</th>         
+						<th class="textc">财务类别</th>     
+						<th class="textc">金额</th>         
+						<th class="textc">银行</th>         
+						<th class="textc">发票</th>         
+						<th class="textc">客户名称</th>     
+						<th class="textc wp15">单号</th>    
+						<th class="textc">状态</th>         
+						<th class="textc">类别</th>         
+						<th class="textc">操作</th>         
+					</tr> 
+				</thead>
+				<tbody> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+                
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="green">支出</span></td>     
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+				</tbody>
+                
+			</table>  
+			<!-- footer -->  
+			<div class="clearfix mb10 pb20">          
+					<div class="layui-tab-item fr">       
+							<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+							<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>   
+							<div class="pagination dlblock vm" id="pagination"></div>
+							<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>            
+					</div>
+				</div>  
+		</div>      
+	</div>        
+</div>          
+                
+<script type="text/javascript">    
+//分页          
+$('#pagination').pagination({        
+	pageCount: 50,
+	jump: true,   
+	coping: true, 
+	homePage: '首页',    
+	endPage: '末页',     
+	prevContent: '上页', 
+	nextContent: '下页', 
+	callback: function(api) {          
+		$('.now').text(api.getCurrent());
+	}             
+});             
+</script>       
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceMerchantBuyDetail/deviceMerchantBuyDetailFunctionsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceMerchantBuyDetail/deviceMerchantBuyDetailFunctionsInfo.jsp
new file mode 100644
index 0000000..982ce84
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceMerchantBuyDetail/deviceMerchantBuyDetailFunctionsInfo.jsp
@@ -0,0 +1,130 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>		
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">      
+<div class="tab-pane active">
+				<div class="panel-body">
+					<div class="wrapper wrapper-content">     
+						<div class="panel-form animated fadeInRight wp60 fc">
+							<!-- 账号资料 -->
+			<div class="layui-form-item 	has-error">
+				<label class="layui-form-label">单行输入框<i class="red">*</i></label>
+				<div class="layui-input-block">
+					<input type="text" name="title" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input">
+				</div>                                         
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">自定义验证</label>
+				<div class="layui-input-inline ml30">
+					<input type="password" name="password" lay-verify="pass" placeholder="请输入密码" autocomplete="off" class="layui-input">
+				</div>
+				<div class="layui-form-mid layui-word-aux">请填写6到12位密码</div>
+			</div>
+			<div class="form-group">
+				<div class="layui-form-item">          
+					<label class="layui-form-label">单行选择框</label>
+					<div class="layui-input-block">
+						<select name="interest" lay-filter="aihao">  
+							<option value=""></option>
+							<option value="0">写作</option>         
+							<option value="1" selected="">阅读</option>
+							<option value="2">游戏</option>
+							<option value="3">音乐</option>
+							<option value="4">旅行</option>  
+						</select>              
+					</div>
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<div class="layui-inline">  
+					<label class="layui-form-label">范围</label>
+					<div class="layui-input-inline ml30">
+						<input type="text" name="price_min" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>                                     
+					<div class="layui-form-mid">-</div>
+					<div class="layui-input-inline">       
+						<input type="text" name="price_max" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>
+				</div>           
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">联动选择框</label>
+				<div class="layui-input-inline ml30">
+					<select name="quiz1">     
+						<option value="">请选择省</option>
+						<option value="浙江" selected="">浙江省</option> 
+						<option value="你的工号">江西省</option>           
+						<option value="你最喜欢的老师">福建省</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz2">
+						<option value="">请选择市</option>
+						<option value="杭州">杭州</option>
+						<option value="宁波" disabled="">宁波</option>
+						<option value="温州">温州</option>
+						<option value="温州">台州</option>
+						<option value="温州">绍兴</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz3">
+						<option value="">请选择县/区</option>
+						<option value="西湖区">西湖区</option>
+						<option value="余杭区">余杭区</option>
+						<option value="拱墅区">临安市</option>
+					</select>
+				</div>    
+			</div>
+			<div class="layui-form-item" pane="">   
+				<label class="layui-form-label">原始复选框</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="like1[write]" lay-skin="primary" title="写作" checked="">  
+					<input type="checkbox" name="like1[read]" lay-skin="primary" title="阅读">
+					<input type="checkbox" name="like1[game]" lay-skin="primary" title="游戏" disabled="">
+				</div>
+			</div>
+
+			<div class="layui-form-item">
+				<label class="layui-form-label">开关-默认关</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="close" lay-skin="switch" lay-text="ON|OFF">
+				</div>
+			</div>
+			<div class="layui-form-item">  
+				<label class="layui-form-label">单选框</label>
+				<div class="layui-input-block">
+					<input type="radio" name="sex" value="男" title="男" checked="">
+					<input type="radio" name="sex" value="女" title="女">
+					<input type="radio" name="sex" value="禁" title="禁用" disabled="">
+				</div>
+			</div>
+			<!--<div class="layui-form-item layui-form-text">
+				<label class="layui-form-label">上传图片</label>
+				<div class="layui-input-block">
+					<div class="layui-upload-drag w200 h200">
+						<i class="layui-icon"></i>          
+						<p>点击上传</p>
+					</div>
+				</div>
+			</div>-->
+				<div class="layui-form-item layui-form-text">
+					<label class="layui-form-label">普通文本域</label>  
+					<div class="layui-input-block">              
+						<textarea placeholder="请输入内容" class="layui-textarea"></textarea>
+					</div>
+				</div>
+			</div>
+		</div>   
+	</div>
+</div>
+</form>   
+<script type="text/javascript">
+	//form表单样式
+	layui.use(['layer', 'form'], function() {    
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+</script>                 
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceMerchantBuyDetail/deviceMerchantBuyDetailList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceMerchantBuyDetail/deviceMerchantBuyDetailList.jsp
new file mode 100644
index 0000000..db8a7aa
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceMerchantBuyDetail/deviceMerchantBuyDetailList.jsp
@@ -0,0 +1,112 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black">
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->
+<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+<jsp:include page="../../common.jsp" />
+<script type="text/javascript">
+     require("js/deviceMerchantBuyDetail/deviceMerchantBuyDetailList.js");
+</script>
+</head>
+<body>
+	<div class="row animated fadeInRight" style="margin: 0;">
+		<div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+			<div class="toolbar-panel bdd">
+				<div class="toolbar-box">
+					<div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+						<!-- 顶部按钮 -->
+						<div class="buttons fl">
+							<a class="btn btn-primary fa fa-search f13" href="javascript:void(0);" onclick="queryDeviceMerchantBuyDetail()"><span>搜索</span></a>
+							<a class="btn btn-primary fa fa-plus f13 add" href="javascript:void(0);" onclick="initAddDeviceMerchantBuyDetail()"><span>添加</span></a>
+							<a class="btn btn-primary fa fa-edit f13" href="javascript:void(0);" onclick="initEditDeviceMerchantBuyDetail()"><span>编辑</span></a> 
+							<a class="btn btn-primary fa fa-remove f13 delete" href="javascript:void(0);" onclick="initBatchDeleteDeviceMerchantBuyDetail()"><span>删除</span></a> 
+						</div>
+						<div class="tools fr">
+							<a href="javascript:void(0);" class="collapse dblock f14 dgray mr5"> 
+								<i class="fa-2x fa fa-angle-double-up"></i>
+							</a>
+						</div>
+					</div>
+				</div>
+
+				<!--搜索条件 -->
+				<div class="toolbar-body">
+					<div class="row pt10 pb10 whitebg ml0 mr0">
+						<span class="dlblock w100 textr">ID：</span> 
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+							<input type="text" placeholder="请输入内容" id="searchId">  
+						</span> 
+						<span class="dlblock w100 textr">名称：</span> 
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+							<input type="text" placeholder="请输入名称">
+						</span> 
+						<span class="dlblock w100 textr">类别：</span>
+						 <select class="form-control f12 w180 textc">
+							<option value="">支出</option>
+							<option value="">收入</option>
+						</select>
+					</div>
+					<div class="mt10 mb20">
+						<span class="dlblock w100 textr">开始日期</span>
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+							 <input type="text" placeholder="" id="date1" class="w150">
+							 <i class="fa fa-calendar"></i>
+						</span> 
+						<span class="dlblock w100 textr">结束日期</span>
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+						<input type="text" placeholder="" id="date2" class="w150"> 
+							<i class="fa fa-calendar"></i>
+						</span>
+					</div>
+				</div>
+			</div>
+		</div>
+		<!-- 表单数据 -->
+		<div class="mb20 mt10">
+			<div class="whitebg pl10 pr10">
+				<table class="table table-striped table-bordered table-hover">
+					<thead>
+						<tr>
+							<th class="textc">
+								<div class="checker" id="allCheck">
+									<span class=""><input type="checkbox" value="" ></span>
+								</div>
+							</th>
+							<th class="textc ">id</th>
+							<th class="textc ">orderNo</th>
+							<th class="textc ">soleCode</th>
+							<th class="textc">编辑</th>
+						</tr>
+					</thead>
+					<!-- 数据体 -->
+					<tbody id="data_content">
+					</tbody>
+				</table>
+			
+			<!-- footer -->
+				<div class="clearfix mb10 pb20">
+						<div class="layui-tab-item fr">
+								<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+								<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>
+								<div class="pagination dlblock vm" id="pagination"></div>
+								<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>
+						</div>
+					</div>
+	
+			</div>
+		</div>
+	</div>
+</body>
+
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceOperateInfo/list.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceOperateInfo/list.jsp
new file mode 100644
index 0000000..877d581
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceOperateInfo/list.jsp
@@ -0,0 +1,142 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<!DOCTYPE html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+</head>
+<body>
+
+<div class="row animated fadeInRight" style="margin: 0;">
+    <!-- 表单数据 -->
+    <div class="mb50 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-hide" id="deviceOperateInfoTab" lay-filter="deviceOperateInfoTab"></table>
+        </div>
+    </div>
+</div>
+
+<script type="text/html" id="leftBar">
+    <button type="button" class="layui-btn layui-btn-normal layui-btn-sm" lay-event="search"><i class="layui-icon">&#xe615;</i>查询
+    </button>
+</script>
+
+<script type="text/html" id="toolBar">
+    <button type="button" class="layui-btn layui-btn-xs layui-btn-danger" lay-event="del"><i
+            class="layui-icon">&#xe640;</i>删除
+    </button>
+</script>
+
+<script>
+    layui.use(['table', 'layer', 'form'], function () {
+        var table = layui.table;
+        var layer = layui.layer;
+        var form = layui.form;
+
+        var tableIns = table.render({
+            elem: '#deviceOperateInfoTab'
+            , url: ctx + '/deviceOperateInfo/pageData'
+            , id: 'deviceOperateInfo'
+            ,where: {
+                deviceNo:'${deviceNo}'
+            }
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            , toolbar: '#leftBar' //开启头部工具栏，并为其绑定左侧模板
+            , defaultToolbar: ['filter']
+            , title: '设备操作详情表'
+            , cols: [[
+                {type: 'checkbox', fixed: 'left', hidden: true}
+                , {field: 'numbers', title: '序号', fixed: 'left', unresize: true, minWidth: 80, type: 'numbers'}
+                , {
+                    field: 'deviceNo', title: '设备编号', minWidth: 150, templet: function (d) {
+                        return "NO." + d.deviceNo;
+                    }
+                }
+                , {field: 'typeDesc', title: '操作类型', minWidth: 100}
+                , {field: 'remark', title: '备注', minWidth: 100}
+
+                , {
+                    field: 'createTime',
+                    title: '操作时间',
+                    minWidth: 160,
+                    templet: "<div>{{layui.util.toDateString(d.createTime,'yyyy-MM-dd HH:mm')}}</div>"
+                }
+            ]]
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , page: true
+        });
+
+        //监听头工具栏事件
+        table.on('toolbar(deviceOperateInfoTab)', function (obj) {
+            switch (obj.event) {
+                case 'search':
+                    var params = serialize($('#form1'));
+                    params["deviceNo"] = '${deviceNo}';
+                    table.reload('deviceOperateInfo', {
+                        where: params
+                        , page: {
+                            size: 10
+                            , current: 1
+                        }
+                    });
+                    break;
+            }
+        });
+
+        function del(obj) {
+            $.ajax({
+                url: '${ctx}/deviceOperateInfo/del/' + obj.id,
+                method: 'DELETE',
+                dataType: 'JSON',
+                contentType: "application/json",
+                success: function (res) {
+                    if (res.code == 200) {
+                        layer.msg(res.message, {
+                            icon: 1
+                        });
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 2
+                        });
+                    }
+                }
+            })
+        }
+    });
+    jQuery.prototype.serializeObject = function () {
+        var obj = new Object();
+        $.each(this.serializeArray(), function (index, param) {
+            if (!(param.name in obj)) {
+                obj[param.name] = param.value;
+            }
+        });
+        return obj;
+    };
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceSignUnbind/deviceSignUnbindBaseInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceSignUnbind/deviceSignUnbindBaseInfo.jsp
new file mode 100644
index 0000000..ceb8a5b
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceSignUnbind/deviceSignUnbindBaseInfo.jsp
@@ -0,0 +1,51 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">  
+	<div class="tab-pane active">     
+		<div class="panel-body">
+			<div class="wrapper wrapper-content">
+				<div class="panel-form animated fadeInRight wp60 fc">
+					<div class="layui-form-item dn	has-error" >   
+						<label class="layui-form-label">id</label>  
+						<div class="layui-input-block">
+							<input type="text" name="id" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${deviceSignUnbind.id }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">orderNo</label>  
+						<div class="layui-input-block">
+							<input type="text" name="orderNo" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${deviceSignUnbind.orderNo }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">merchantCode</label>  
+						<div class="layui-input-block">
+							<input type="text" name="merchantCode" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${deviceSignUnbind.merchantCode }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">mercahntName</label>  
+						<div class="layui-input-block">
+							<input type="text" name="mercahntName" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${deviceSignUnbind.mercahntName }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">mchId</label>  
+						<div class="layui-input-block">
+							<input type="text" name="mchId" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${deviceSignUnbind.mchId }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">status</label>  
+						<div class="layui-input-block">
+							<input type="text" name="status" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${deviceSignUnbind.status }" >
+						</div>  
+					</div>
+	
+				</div>
+			</div>
+		</div>  
+	</div>
+</form>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceSignUnbind/deviceSignUnbindDetails.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceSignUnbind/deviceSignUnbindDetails.jsp
new file mode 100644
index 0000000..cc15f71
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceSignUnbind/deviceSignUnbindDetails.jsp
@@ -0,0 +1,54 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>     
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">                      
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black"> 
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> 
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->                                     
+<meta name="viewport"
+	content="width=device-width, initial-scale=1.0, maximum-scale=1.0">   
+<jsp:include page="../../common.jsp" />
+<script type="text/javascript">
+    require("js/deviceSignUnbind/deviceSignUnbindDetails.js");
+</script>
+<title>编辑</title>
+</head>                                 
+	<body class="lgraybg">            
+		<div class="	container-fluid animated fadeInRight col-sm-12">
+			<div class="panel-toolbar mt10 mb10 pt5 pb5 pl10 bdd whitebg">
+				<div class="buttons">
+					<a href="javascript:void(0);" class="btn btn-primary fa fa-save f12"><span>保存</span></a>
+					<a href="${ctx }/deviceSignUnbind/index?pageIndex=${pageIndex}"  class="btn btn-primary fa fa-back f12" id="goback"><span>返回</span></a>
+				</div>
+			</div>
+				<div class="tabs-container whitebg">
+					<div class="pt10 pl5 pr5">
+						<ul class="nav nav-tabs" id="nav-tabs">
+							<li class="active" data-action="base">   
+								<a href="javascript:void(0);" >基本资料</a>
+							</li>
+							<li class="" data-action="functions">
+								<a href="javascript:void(0);"  >多功能输入</a>
+							</li>
+							<li class="" data-action="extends">
+								<a href="javascript:void(0);" >扩展属性</a>
+							</li>
+						</ul>
+						<div class="tab-content pt30 p30">               
+		
+						</div>     
+					</div>
+				</div>    
+		</div>
+		<!-- 隐藏域 -->
+		<input type="hidden" id="deviceSignUnbindId" value="${deviceSignUnbind.id }"/>
+	</body>
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceSignUnbind/deviceSignUnbindExtendsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceSignUnbind/deviceSignUnbindExtendsInfo.jsp
new file mode 100644
index 0000000..592687a
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceSignUnbind/deviceSignUnbindExtendsInfo.jsp
@@ -0,0 +1,201 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>           
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> 
+<div class="tab-pane active">      
+	<div class="animated fadeInRight">
+		<div class="whitebg pl10 pr10">
+			<table class="table table-striped table-bordered table-hover">     
+				<thead> 
+					<tr>  
+						<th class="textc">序号</th>         
+						<th class="textc wp15">流水账号</th>
+						<th class="textc">日期</th>         
+						<th class="textc">财务类别</th>     
+						<th class="textc">金额</th>         
+						<th class="textc">银行</th>         
+						<th class="textc">发票</th>         
+						<th class="textc">客户名称</th>     
+						<th class="textc wp15">单号</th>    
+						<th class="textc">状态</th>         
+						<th class="textc">类别</th>         
+						<th class="textc">操作</th>         
+					</tr> 
+				</thead>
+				<tbody> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+                
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="green">支出</span></td>     
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+				</tbody>
+                
+			</table>  
+			<!-- footer -->  
+			<div class="clearfix mb10 pb20">          
+					<div class="layui-tab-item fr">       
+							<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+							<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>   
+							<div class="pagination dlblock vm" id="pagination"></div>
+							<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>            
+					</div>
+				</div>  
+		</div>      
+	</div>        
+</div>          
+                
+<script type="text/javascript">    
+//分页          
+$('#pagination').pagination({        
+	pageCount: 50,
+	jump: true,   
+	coping: true, 
+	homePage: '首页',    
+	endPage: '末页',     
+	prevContent: '上页', 
+	nextContent: '下页', 
+	callback: function(api) {          
+		$('.now').text(api.getCurrent());
+	}             
+});             
+</script>       
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceSignUnbind/deviceSignUnbindFunctionsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceSignUnbind/deviceSignUnbindFunctionsInfo.jsp
new file mode 100644
index 0000000..982ce84
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceSignUnbind/deviceSignUnbindFunctionsInfo.jsp
@@ -0,0 +1,130 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>		
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">      
+<div class="tab-pane active">
+				<div class="panel-body">
+					<div class="wrapper wrapper-content">     
+						<div class="panel-form animated fadeInRight wp60 fc">
+							<!-- 账号资料 -->
+			<div class="layui-form-item 	has-error">
+				<label class="layui-form-label">单行输入框<i class="red">*</i></label>
+				<div class="layui-input-block">
+					<input type="text" name="title" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input">
+				</div>                                         
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">自定义验证</label>
+				<div class="layui-input-inline ml30">
+					<input type="password" name="password" lay-verify="pass" placeholder="请输入密码" autocomplete="off" class="layui-input">
+				</div>
+				<div class="layui-form-mid layui-word-aux">请填写6到12位密码</div>
+			</div>
+			<div class="form-group">
+				<div class="layui-form-item">          
+					<label class="layui-form-label">单行选择框</label>
+					<div class="layui-input-block">
+						<select name="interest" lay-filter="aihao">  
+							<option value=""></option>
+							<option value="0">写作</option>         
+							<option value="1" selected="">阅读</option>
+							<option value="2">游戏</option>
+							<option value="3">音乐</option>
+							<option value="4">旅行</option>  
+						</select>              
+					</div>
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<div class="layui-inline">  
+					<label class="layui-form-label">范围</label>
+					<div class="layui-input-inline ml30">
+						<input type="text" name="price_min" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>                                     
+					<div class="layui-form-mid">-</div>
+					<div class="layui-input-inline">       
+						<input type="text" name="price_max" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>
+				</div>           
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">联动选择框</label>
+				<div class="layui-input-inline ml30">
+					<select name="quiz1">     
+						<option value="">请选择省</option>
+						<option value="浙江" selected="">浙江省</option> 
+						<option value="你的工号">江西省</option>           
+						<option value="你最喜欢的老师">福建省</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz2">
+						<option value="">请选择市</option>
+						<option value="杭州">杭州</option>
+						<option value="宁波" disabled="">宁波</option>
+						<option value="温州">温州</option>
+						<option value="温州">台州</option>
+						<option value="温州">绍兴</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz3">
+						<option value="">请选择县/区</option>
+						<option value="西湖区">西湖区</option>
+						<option value="余杭区">余杭区</option>
+						<option value="拱墅区">临安市</option>
+					</select>
+				</div>    
+			</div>
+			<div class="layui-form-item" pane="">   
+				<label class="layui-form-label">原始复选框</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="like1[write]" lay-skin="primary" title="写作" checked="">  
+					<input type="checkbox" name="like1[read]" lay-skin="primary" title="阅读">
+					<input type="checkbox" name="like1[game]" lay-skin="primary" title="游戏" disabled="">
+				</div>
+			</div>
+
+			<div class="layui-form-item">
+				<label class="layui-form-label">开关-默认关</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="close" lay-skin="switch" lay-text="ON|OFF">
+				</div>
+			</div>
+			<div class="layui-form-item">  
+				<label class="layui-form-label">单选框</label>
+				<div class="layui-input-block">
+					<input type="radio" name="sex" value="男" title="男" checked="">
+					<input type="radio" name="sex" value="女" title="女">
+					<input type="radio" name="sex" value="禁" title="禁用" disabled="">
+				</div>
+			</div>
+			<!--<div class="layui-form-item layui-form-text">
+				<label class="layui-form-label">上传图片</label>
+				<div class="layui-input-block">
+					<div class="layui-upload-drag w200 h200">
+						<i class="layui-icon"></i>          
+						<p>点击上传</p>
+					</div>
+				</div>
+			</div>-->
+				<div class="layui-form-item layui-form-text">
+					<label class="layui-form-label">普通文本域</label>  
+					<div class="layui-input-block">              
+						<textarea placeholder="请输入内容" class="layui-textarea"></textarea>
+					</div>
+				</div>
+			</div>
+		</div>   
+	</div>
+</div>
+</form>   
+<script type="text/javascript">
+	//form表单样式
+	layui.use(['layer', 'form'], function() {    
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+</script>                 
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceSignUnbind/deviceSignUnbindList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceSignUnbind/deviceSignUnbindList.jsp
new file mode 100644
index 0000000..7bde187
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceSignUnbind/deviceSignUnbindList.jsp
@@ -0,0 +1,157 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+    <script type="text/javascript">
+        require("js/deviceSignUnbind/deviceSignUnbindList.js");
+    </script>
+    <style>
+        .layui-table th {
+            text-align: center;
+        }
+    </style>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="buttons fl">
+                        <a class="layui-btn layui-btn-sm fa fa-search f13" href="javascript:void(0);"
+                           onclick="queryDeviceSignUnbind()"><span>搜索</span></a>
+                        <!-- <a class="layui-btn fa fa-plus f13 add" href="javascript:void(0);" onclick="initAddDeviceSignUnbind()"><span>添加</span></a>
+                        <a class="layui-btn fa fa-edit f13" href="javascript:void(0);" onclick="initEditDeviceSignUnbind()"><span>编辑</span></a>
+                        <a class="layui-btn fa fa-remove f13 delete" href="javascript:void(0);" onclick="initBatchDeleteDeviceSignUnbind()"><span>删除</span></a> -->
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" action="" style="margin-top: 10px">
+                    <div class="layui-form-item">
+
+                        <!-- <span class="dlblock w100 textr">ID：</span>
+                        <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+                            <input type="text" placeholder="请输入内容" id="searchId">
+                        </span>  -->
+                        <div class="layui-inline">
+                            <label class="layui-form-label">用户ID</label>
+                            <div class="layui-input-inline">
+                                <input type="text" placeholder="请输入用户ID" id="userId" class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">订单号</label>
+                            <div class="layui-input-inline">
+                                <input type="text" placeholder="请输入订单号" id="orderNo" class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">商家名称</label>
+                            <div class="layui-input-inline">
+                                <input type="text" placeholder="请输入商家名称" id="merchantName" class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">状态</label>
+                            <div class="layui-input-inline">
+                                <select class="form-control f12 w180 textc" id="status">
+                                    <option value="">请选择</option>
+                                    <option value="1">确定激活</option>
+                                    <option value="2">已激活</option>
+                                    <option value="3">确定解绑</option>
+                                    <option value="4">已解绑</option>
+                                </select>
+                            </div>
+                        </div>
+
+                    </div>
+                </form>
+                <!-- <div class="mt10 mb20">
+                    <span class="dlblock w100 textr">开始日期</span>
+                    <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+                         <input type="text" placeholder="" id="date1" class="w150">
+                         <i class="fa fa-calendar"></i>
+                    </span>
+                    <span class="dlblock w100 textr">结束日期</span>
+                    <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+                    <input type="text" placeholder="" id="date2" class="w150">
+                        <i class="fa fa-calendar"></i>
+                    </span>
+                </div> -->
+            </div>
+        </div>
+    </div>
+    <!-- 表单数据 -->
+    <div class="mb20 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-table">
+                <thead>
+                <tr>
+                    <th class="textc">
+                        <div class="checker" id="allCheck">
+                            <span class=""><input type="checkbox" value=""></span>
+                        </div>
+                    </th>
+                    <th class="textc ">序号</th>
+                    <th class="textc ">用户ID</th>
+                    <th class="textc ">订单号</th>
+                    <th class="textc ">商家名称</th>
+                    <th class="textc ">厂家型号</th>
+                    <th class="textc ">sn码</th>
+                    <th class="textc ">状态</th>
+                    <!-- <th class="textc ">申请时间</th> -->
+                    <th class="textc">编辑</th>
+                </tr>
+                </thead>
+                <!-- 数据体 -->
+                <tbody id="data_content">
+                </tbody>
+            </table>
+
+            <!-- footer -->
+            <div class="clearfix mb10 pb20">
+                <div class="layui-tab-item fr">
+                    <span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+                    <span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>
+                    <div class="pagination dlblock vm" id="pagination"></div>
+                    <span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>
+                </div>
+            </div>
+
+        </div>
+    </div>
+</div>
+<script>
+    layui.use(['form'], function() {
+        var form = layui.form
+        form.render();
+    })
+</script>
+</body>
+
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceStock/list.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceStock/list.jsp
new file mode 100644
index 0000000..be25a0b
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceStock/list.jsp
@@ -0,0 +1,978 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<!DOCTYPE html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+
+    <style>
+        .layui-table-cell.laytable-cell-1-0-2,
+        .layui-table-cell.laytable-cell-1-0-3,
+        .layui-table-cell.laytable-cell-1-0-5,
+        .layui-table-cell.laytable-cell-1-0-6,
+        .layui-table-cell.laytable-cell-1-0-7,
+        .layui-table-cell.laytable-cell-1-0-8,
+        .layui-table-cell.laytable-cell-1-0-9,
+        .layui-table-cell.laytable-cell-1-0-13 {
+            vertical-align: middle;
+            height: auto;
+            overflow: hidden;
+            text-overflow: inherit;
+            white-space: nowrap;
+        }
+
+        hr {
+            margin: 3px 0 !important;
+        }
+    </style>
+</head>
+<body>
+
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" id="form1" action="" style="margin-top: 10px;">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">设备编号</label>
+                            <div class="layui-input-inline">
+                                <input type="text" name="snNo" placeholder="请输入设备编号" autocomplete="off"
+                                       class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">厂家编号</label>
+                            <div class="layui-input-inline">
+                                <input type="text" name="deviceNo" placeholder="请输入厂家编号" autocomplete="off"
+                                       class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">设备类型</label>
+                            <div class="layui-input-inline">
+                                <select class="layui-select" name="code" data-dom="queryType" lay-filter="deviceType"
+                                        lay-verify="required">
+                                    <option value="">请选择</option>
+                                    <c:forEach items="${deviceTypeDict}" var="dict">
+                                        <option value="${dict.code}" ${dict.code == entity.code ? 'selected' : ''}>${dict.name}</option>
+                                    </c:forEach>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">设备版本</label>
+                            <div class="layui-input-inline">
+                                <select class="layui-select" name="type" id="queryType" lay-verify="required">
+                                </select>
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">购买商家</label>
+                            <div class="layui-input-inline">
+                                <input type="text" name="buyMercName" id="buyMercName" placeholder="请输入购买商家名称"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">激活用户id</label>
+                            <div class="layui-input-inline">
+                                <input type="text" name="actUserId" id="actUserId" placeholder="请输入购买激活用户id"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">激活商家</label>
+                            <div class="layui-input-inline">
+                                <input type="text" name="actMercName" id="actMercName" placeholder="请输入激活商家名称"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">状态</label>
+                            <div class="layui-input-inline">
+                                <select class="layui-select" name="bindStatus">
+                                    <option value="">请选择</option>
+                                    <option value="-1">未激活</option>
+                                    <option value="1">已激活</option>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">提货人</label>
+                            <div class="layui-input-inline">
+                                <input type="number" name="extractUserId" placeholder="提货人用户ID" autocomplete="off"
+                                       class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">归属人</label>
+                            <div class="layui-input-inline">
+                                <input type="text" name="belongUserId" placeholder="归属人用户ID" autocomplete="off"
+                                       class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label" style="width: 100px;padding: 0 15px">
+                                <select class="layui-select" id="noType">
+                                    <option value="1" selected>设备编号</option>
+                                    <option value="2">厂家编号</option>
+                                </select>
+                            </label>
+                            <div class="layui-input-inline" style="width: 150px;">
+                                <input type="text" name="startDeviceNo" placeholder="开始编号" autocomplete="off"
+                                       class="layui-input">
+                            </div>
+                            <span style="float: left;padding-right: 10px;line-height: 36px;">-</span>
+                            <div class="layui-input-inline" style="width: 150px;">
+                                <input type="text" name="endDeviceNo" placeholder="结束编号" autocomplete="off"
+                                       class="layui-input">
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <!-- 表单数据 -->
+    <div class="mb50 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-hide" id="deviceStockTab" lay-filter="deviceStockTab"></table>
+        </div>
+    </div>
+</div>
+
+<script type="text/template" id="add">
+    <form class="layui-form" id="form2" style="margin-top: 2rem;">
+        <input name="id" id="id" hidden>
+        <div class="layui-form-item" style="width: 350px;">
+            <label class="layui-form-label">设备类型</label>
+            <div class="layui-input-block">
+                <select class="layui-select" name="code" id="code" data-dom="addType" lay-filter="deviceType"
+                        lay-verify="required">
+                    <option value="">请选择</option>
+                    <c:forEach items="${deviceTypeDict}" var="dict">
+                        <option value="${dict.code}" ${dict.code == entity.code ? 'selected' : ''}>${dict.name}</option>
+                    </c:forEach>
+                </select>
+            </div>
+        </div>
+
+        <div class="layui-form-item" style="width: 350px;">
+            <label class="layui-form-label">设备版本</label>
+            <div class="layui-input-block">
+                <select class="layui-select" name="type" id="addType" lay-verify="required">
+                </select>
+            </div>
+        </div>
+
+        <div class="layui-form-item" style="width: 350px;">
+            <label class="layui-form-label">设备分组</label>
+            <div class="layui-input-block">
+                <select class="layui-select" name="groupNo" id="groupNo" lay-verify="required">
+                </select>
+            </div>
+        </div>
+        <div class="layui-form-item" style="width: 350px;">
+            <label class="layui-form-label">设备编号</label>
+            <div class="layui-input-block">
+                <input type="text" name="snNo" id="snNo" placeholder="设备编号" autocomplete="off" class="layui-input">
+            </div>
+        </div>
+    </form>
+</script>
+
+<script type="text/template" id="addBatch">
+    <form class="layui-form" id="form3" style="margin-top: 2rem;">
+
+        <div class="layui-form-item" style="width: 350px;">
+            <label class="layui-form-label">设备类型</label>
+            <div class="layui-input-block">
+                <select class="layui-select" name="code" id="addBatchCode" lay-filter="deviceType"
+                        data-dom="addBatchType" lay-verify="required">
+                    <option value="">请选择</option>
+                    <c:forEach items="${deviceTypeDict}" var="dict">
+                        <option value="${dict.code}" ${dict.code == entity.code ? 'selected' : ''}>${dict.name}</option>
+                    </c:forEach>
+                </select>
+            </div>
+        </div>
+
+        <div class="layui-form-item" style="width: 350px;">
+            <label class="layui-form-label">设备版本</label>
+            <div class="layui-input-block">
+                <select class="layui-select" name="type" id="addBatchType" lay-verify="required">
+                </select>
+            </div>
+        </div>
+
+        <div class="layui-form-item" style="width: 350px;">
+            <label class="layui-form-label">设备分组</label>
+            <div class="layui-input-block">
+                <select class="layui-select" name="groupNo" id="addBatchGroupNo" lay-verify="required">
+                </select>
+            </div>
+        </div>
+
+        <div class="layui-form-item">
+            <div class="layui-inline">
+                <label class="layui-form-label">编号范围</label>
+                <div class="layui-input-inline" style="width: 200px;">
+                    <input type="text" name="startSnNo" id="startSnNo" placeholder="开始编号" autocomplete="off"
+                           class="layui-input">
+                </div>
+                <div class="layui-form-mid">-</div>
+                <div class="layui-input-inline" style="width: 200px;">
+                    <input type="text" name="endSnNo" id="endSnNo" placeholder="结束编号" autocomplete="off"
+                           class="layui-input">
+                </div>
+            </div>
+        </div>
+    </form>
+</script>
+
+<script type="text/template" id="bind">
+    <form class="layui-form" id="form4" style="margin-top: 2rem;">
+        <input name="id" id="bindId" hidden>
+        <input name="status" id="status" value="3" hidden>
+        <div class="layui-form-item" style="width: 300px;">
+            <label class="layui-form-label">用户ID</label>
+            <div class="layui-input-block">
+                <input type="text" name="userId" id="actMercId" placeholder="请输入商户ID" autocomplete="off"
+                       class="layui-input">
+            </div>
+        </div>
+    </form>
+</script>
+
+<script type="text/template" id="bind2">
+    <form class="layui-form" id="form5" style="margin-top: 2rem;">
+        <input name="id" id="bindId2" hidden>
+        <div class="layui-form-item" style="width: 300px;">
+            <label class="layui-form-label">厂家编号</label>
+            <div class="layui-input-block">
+                <input type="text" name="deviceNo" id="deviceNo" placeholder="设备厂家编号，码牌可不填" autocomplete="off"
+                       class="layui-input">
+            </div>
+        </div>
+    </form>
+</script>
+
+<script type="text/template" id="transfer">
+    <form class="layui-form" id="form6" style="margin-top: 2rem;">
+        <div class="layui-form-item" style="width: 400px;">
+            <label class="layui-form-label">出库用户</label>
+            <div class="layui-input-block">
+                <input type="number" name="accpetUserId" id="accpetUserId" placeholder="请输入出库用户ID" autocomplete="off"
+                       class="layui-input">
+            </div>
+        </div>
+        <div class="layui-form-item" style="width: 400px;">
+            <label class="layui-form-label">订单号</label>
+            <div class="layui-input-block">
+                <input type="text" name="orderNo" id="orderNo" placeholder="出库设备对应的设备商城订单号" autocomplete="off"
+                       class="layui-input">
+            </div>
+        </div>
+    </form>
+</script>
+
+<script type="text/html" id="leftBar">
+    <button type="button" class="layui-btn layui-btn-sm" lay-event="add"><i class="layui-icon">&#xe608;</i>新增</button>
+    <button type="button" class="layui-btn layui-btn-sm" lay-event="addBatch"><i class="layui-icon">&#xe608;</i>批量新增
+    </button>
+    <button type="button" class="layui-btn layui-btn-sm layui-btn-warm" lay-event="transfer"><i class="layui-icon">&#xe609;</i>设备出库
+    </button>
+    <button type="button" class="layui-btn layui-btn-normal layui-btn-sm" lay-event="search"><i class="layui-icon">&#xe615;</i>查询
+    </button>
+</script>
+
+<script type="text/html" id="toolBar">
+    {{#  if(d.status == 3){ }}
+    <div class="layui-col-md12">
+        <button type="button" class="layui-btn layui-btn-xs layui-btn-warm" lay-event="unbind"><i class="layui-icon">&#xe64d;</i>解绑
+        </button>
+    </div>
+    {{# } }}
+    {{#  if(d.status == 1 || d.status == 2){ }}
+    <div class="layui-col-md12">
+        <button type="button" class="layui-btn layui-btn-xs layui-btn-normal" lay-event="bind"><i class="layui-icon">&#xe64c;</i>绑定
+        </button>
+    </div>
+    {{# } }}
+    <div class="layui-col-md12">
+        <button type="button" class="layui-btn layui-btn-xs" lay-event="showDeviceOperaInfo"><i
+                class="layui-icon layui-icon-list"></i>详情
+        </button>
+    </div>
+<%--    <div class="layui-col-md12">--%>
+<%--        <button type="button" class="layui-btn layui-btn-xs layui-btn-danger" lay-event="del"><i--%>
+<%--                class="layui-icon">&#xe640;</i>删除--%>
+<%--        </button>--%>
+<%--    </div>--%>
+</script>
+
+<script type="text/template" id="bindDeviceNo">
+
+</script>
+
+<script>
+    var dictGroupList;
+
+    layui.use(['table', 'layer', 'form'], function () {
+        var table = layui.table;
+        var layer = layui.layer;
+        var form = layui.form;
+
+        var tableIns = table.render({
+            elem: '#deviceStockTab'
+            , url: ctx + '/deviceStock/pageData'
+            , id: 'deviceStock'
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            , toolbar: '#leftBar' //开启头部工具栏，并为其绑定左侧模板
+            , defaultToolbar: ['filter']
+            , title: '智能音箱信息表'
+            , cols: [[
+                {type: 'checkbox', fixed: 'left', hidden: true}
+                , {field: 'numbers', title: '序号', fixed: 'left', unresize: true, minWidth: 80, type: 'numbers'}
+                /*,{field:'boxName', title:'音箱名称'}*/
+                , {
+                    field: 'snNo', title: '设备编号&nbsp;/&nbsp;厂家编号', minWidth: 175, templet: function (d) {
+                        if (d.deviceNo == '' || d.deviceNo == null) {
+                            return "NO." + d.snNo + '<hr/>' + '<button type="button" class="layui-btn layui-btn-sm" onClick="toBindDeviceNo(' + d.id + ')">绑定厂家编号</button>';
+                        } else {
+                            return "NO." + d.snNo + '<hr/>' + "NO." + d.deviceNo;
+                        }
+                    }
+                }
+                , {
+                    field: 'codeDesc',
+                    title: '设备类型&nbsp;/&nbsp;版本',
+                    minWidth: 100,
+                    templet: "<div>{{d.codeDesc}}<hr/>{{d.typeDesc}}</div>"
+                }
+                , {
+                    field: 'groupNoDesc', title: '库存分组', minWidth: 120
+                }
+                , {
+                    field: 'price', title: '设备价格<hr/>购买单号', minWidth: 100, templet: function (d) {
+                        if (d.price != '' && d.price != null) {
+                            return d.price.toFixed(2) + "<hr/>" + d.orderNo;
+                        }
+                        return d.orderNo;
+                    }
+                }
+                , {title: '购买商家名称<hr/>商家ID', minWidth: 150, templet: "<div>{{d.buyMercName}}<hr/>{{d.buyUserId}}</div>"}
+                , {title: '激活商家名称<hr/>商家ID', minWidth: 150, templet: "<div>{{d.actMercName}}<hr/>{{d.actUserId}}</div>"}
+                , {
+                    field: 'extractUserId', title: '提货人<hr/>ID', minWidth: 100, templet: function (d) {
+                        if (!d.extractUserId) {
+                            return "-";
+                        }
+                        return d.extractName + "<hr/>" + d.extractUserId;
+                    }
+                }
+                , {
+                    field: 'belongUserId', title: '所属人<hr/>ID', minWidth: 100, templet: function (d) {
+                        if (!d.belongUserId) {
+                            return "-";
+                        }
+                        return d.belongName + "<hr/>" + d.belongUserId;
+                    }
+                }
+                , {
+                    field: 'status', title: '状态', minWidth: 80, templet: function (d) {
+                        if (d.status == '1') {
+                            return "<span>未出售</span>"
+                        } else if (d.status == '2') {
+                            return "<span style='color: blue'>已出售</span>"
+                        } else if (d.status == '3') {
+                            return "<span style='color: green'>已激活</span>"
+                        }
+                    }
+                }
+                , {
+                    field: 'bindTime',
+                    title: '激活时间',
+                    minWidth: 160,
+                    templet: "<div>{{layui.util.toDateString(d.bindTime,'yyyy-MM-dd HH:mm')}}</div>"
+                }
+                , {
+                    field: 'createTime',
+                    title: '创建时间',
+                    minWidth: 160,
+                    templet: "<div>{{layui.util.toDateString(d.createTime,'yyyy-MM-dd HH:mm')}}</div>"
+                }
+                , {fixed: 'right', title: '操作', minWidth: 70, toolbar: '#toolBar'}
+            ]]
+            , done: function (index, layero) {
+                //表头部分
+                //动态监听表头高度变化，冻结行跟着改变高度
+                $(".layui-table-header  tr").resize(function () {
+                    $(".layui-table-header  tr").each(function (index, val) {
+                        $($(".layui-table-fixed .layui-table-header table tr")[index]).height(val.getBoundingClientRect().height);
+                    });
+                });
+                //初始化高度，使得冻结行表头高度一致
+                $(".layui-table-header  tr").each(function (index, val) {
+                    let initElement = $(".layui-table-fixed .layui-table-header table tr")[index]
+                    if (initElement != null) {
+                        $(initElement).height(val.getBoundingClientRect().height);
+                        $(initElement).find("th").removeAttr("style");
+                    }
+                });
+
+                //表体部分
+                //动态监听表体高度变化，冻结行跟着改变高度
+                $(".layui-table-body  tr").resize(function () {
+                    $(".layui-table-body  tr").each(function (index, val) {
+                        $($(".layui-table-fixed .layui-table-body table tr")[index]).height(val.getBoundingClientRect().height);
+                    });
+                });
+                //初始化高度，使得冻结行表体高度一致
+                $(".layui-table-body  tr").each(function (index, val) {
+                    $($(".layui-table-fixed .layui-table-body table tr")[index]).height(val.getBoundingClientRect().height);
+                });
+            }
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , page: true
+        });
+
+        form.on('select(deviceType)', function (data) {
+            var dataType = data.value;
+            var domId = $(data.elem).attr("data-dom");
+            $.ajax({
+                url: ctx + '/deviceDetail/getDeviceSubVersionType/' + dataType,
+                method: 'get',
+                dataType: 'json',
+                success: function (res) {
+                    if (res.code == 200) {
+                        var dom = $("#" + domId);
+                        var html = "<option value=''>请选择</option>";
+                        dom.empty();
+                        if (res.data.length > 0) {
+                            $.each(res.data, function (k, v) {
+                                html += "<option value='" + v.spec + "'>" + v.specName + "</option>";
+                            })
+                            dom.append(html);
+                        }
+                        form.render('select');
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 5
+                        });
+                    }
+                }
+            })
+        })
+
+        table.on('tool(deviceStockTab)', function (obj) { //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            var data = obj.data; //获得当前行数据
+            var layEvent = obj.event; //获得 lay-event 对应的值（也可以是表头的 event 参数对应的值）
+            if (layEvent === 'del') { //删除
+                layer.confirm('真的删除么?', {icon: 3}, function (index) {
+                    obj.del(); //删除对应行（tr）的DOM结构，并更新缓存
+                    layer.close(index);
+                    del(data);
+                    //向服务端发送删除指令
+                });
+            } else if (layEvent === 'bind') {
+                toBind(obj);
+            } else if (layEvent === 'unbind') {
+                layer.confirm('确定要解绑吗?', {icon: 3}, function (index) {
+                    layer.close(index);
+                    var data = obj.data;
+                    toUnBindSave(data.status, data.id);
+                    //向服务端发送删除指令
+                });
+            } else if (layEvent === 'showDeviceOperaInfo') {
+                let url = ctx + '/deviceOperateInfo/index?deviceNo=' + data.snNo;
+                var index = layer.open({
+                    type: 2
+                    , shade: 0.5
+                    , title: '绑定'
+                    , maxmin: true
+                    , area: ['80%', '80%']
+                    , content: url
+                });
+            }
+        });
+
+        //监听头工具栏事件
+        table.on('toolbar(deviceStockTab)', function (obj) {
+            switch (obj.event) {
+                case 'add':
+                    // 添加
+                    toAdd();
+                    break;
+                case 'addBatch':
+                    // 添加
+                    toAddBatch();
+                    break;
+                case 'transfer':
+                    // 设备出库
+                    var checkStatus = table.checkStatus('deviceStock'); //idTest 即为基础参数 id 对应的值
+                    if (checkStatus.data.length == 0) {
+                        return layer.msg("至少选中一条记录");
+                    }
+                    toTrasnfer(checkStatus.data);
+                    break;
+                case 'search':
+                    var params = serialize($('#form1'));
+                    let noType = $("#noType").val();
+                    params["noType"] = noType;
+                    table.reload('deviceStock', {
+                        where: params
+                        , page: {
+                            size: 10
+                            , current: 1
+                        }
+                    });
+                    break;
+            }
+        });
+
+        function getDictSubText(code, value) {
+            var subDictName = "";
+            $.ajax({
+                url: '${ctx}/deviceDetail/getDeviceSubVersionType/' + code,
+                method: 'get',
+                dataType: 'json',
+                async: false,
+                success: function (res) {
+                    if (res.code == 200) {
+                        if (res.data.length > 0) {
+                            $.each(res.data, function (k, v) {
+                                if (v.value == value) {
+                                    subDictName = v.name;
+                                }
+                            })
+                        }
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 5
+                        });
+                    }
+                }
+            })
+            return subDictName;
+        }
+
+        /**
+         * 获取设备版本信息
+         * @param code
+         */
+        function initVersion() {
+            $.ajax({
+                url: ctx + '/deviceStock/getDeviceVersion',
+                method: 'get',
+                dataType: 'json',
+                success: function (res) {
+                    if (res.code == 200) {
+                        var dataList = res.data;
+                        var dom = $("[name='groupNo']");
+                        var html = "<option value=''>请选择</option>";
+                        dom.empty();
+                        if (dataList.length > 0) {
+                            $.each(dataList, function (k, v) {
+                                html += "<option value='" + v.groupCode + "'>" + v.groupName + "</option>";
+                            })
+                            dom.append(html);
+                            form.render();
+                        }
+                    }
+                }
+            })
+        }
+
+        function toBind(obj) {
+            var index = layer.open({
+                type: 1
+                , shade: 0.5
+                , title: '绑定'
+                , maxmin: true
+                , content: $("#bind").html()
+                , area: ['400px', '300px']
+                , btn: ['保存', '取消',]
+                , shadeClose: true
+                , btn1: function (index, layero) {
+                    var actMercId = $("#actMercId").val();
+                    if (!actMercId) {
+                        layer.msg("商户ID不能为空!");
+                        return;
+                    }
+                    toAddSave(index, $("#form4"), "bind");
+                }
+                , btn2: function (index, layero) {
+                    layer.close(index);
+                }
+                , success: function () {
+                    $("#bindId").val(obj.data.id);
+                }
+            });
+        }
+
+        //设备划拨
+        function toTrasnfer(data) {
+            let ids = [];
+            $.each(data, function (k, v) {
+                ids.push(v.id);
+            })
+            var index = layer.open({
+                type: 1
+                , shade: 0.5
+                , title: '设备出库'
+                , maxmin: true
+                , content: $("#transfer").html()
+                , area: ['450px', '250px']
+                , btn: ['确定', '取消',]
+                , shadeClose: true
+                , btn1: function (index, layero) {
+                    var accpetUserId = $("#accpetUserId").val();
+                    let orderNo = $("#orderNo").val();
+                    if (!accpetUserId) {
+                        layer.msg("用户ID不能为空!");
+                        return;
+                    }
+                    saveTrasnfer(ids, accpetUserId, orderNo, index);
+                }
+                , btn2: function (index, layero) {
+                    layer.close(index);
+                }
+            });
+        }
+
+        function saveTrasnfer(ids, accpetUserId, orderNo, index) {
+            var dialog = layer.msg('正在出库中...', {icon: 16, time: 0, shade: [0.3, '#000', false]});
+            $.ajax({
+                url: ctx + '/deviceStock/transfer',
+                method: 'post',
+                data: {
+                    ids: ids,
+                    accpetUserId: accpetUserId,
+                    orderNo: orderNo
+                },
+                dataType: 'JSON',
+                success: function (res) {
+                    layer.close(dialog);
+                    if (res.code == 200) {
+                        layer.close(index);
+                        tableIns.reload();
+                    }
+                    layer.msg(res.message, {
+                        icon: res.code == 200 ? 1 : 2
+                    });
+                }
+            })
+        }
+
+        function toAddBatch() {
+            var index = layer.open({
+                type: 1
+                , shade: 0.5
+                , title: '批量新增'
+                , maxmin: true
+                , content: $("#addBatch").html()
+                , area: ['650px', '450px']
+                , btn: ['保存', '取消',]
+                , shadeClose: true
+                , btn1: function (index, layero) {
+                    var addBatchGroupNo = $("#addBatchGroupNo").val();
+                    if (!addBatchGroupNo) {
+                        layer.msg("设备分组不能为空!", {icon: 2});
+                        return;
+                    }
+                    var addBatchCode = $("#addBatchCode").val();
+                    if (!addBatchCode) {
+                        layer.msg("设备类型不能为空!", {icon: 2});
+                        return;
+                    }
+                    var addBatchType = $("#addBatchType").val();
+                    if (!addBatchType) {
+                        layer.msg("设备版本不能为空!", {icon: 2});
+                        return;
+                    }
+                    var startSnNo = $("#startSnNo").val();
+                    if (!startSnNo) {
+                        layer.msg("开始设备编号不能为空!", {icon: 2});
+                        return;
+                    }
+                    var endSnNo = $("#endSnNo").val();
+                    if (!endSnNo) {
+                        layer.msg("结束设备编号不能为空!", {icon: 2});
+                        return;
+                    }
+                    var reg = /^[0-9]+$/;
+                    if (!reg.test(startSnNo)) {
+                        layer.msg("开始设备编号格式不正确!", {icon: 2});
+                        return;
+                    }
+                    if (!reg.test(endSnNo)) {
+                        layer.msg("结束设备编号格式不正确!", {icon: 2});
+                        return;
+                    }
+                    if (parseInt(endSnNo) - parseInt(startSnNo) < 0) {
+                        layer.msg("编号范围输入有误!", {icon: 2});
+                        return;
+                    }
+                    toAddBatchSave(index, startSnNo, endSnNo, addBatchGroupNo, addBatchCode, addBatchType);
+                }
+                , btn2: function (index, layero) {
+                    layer.close(index);
+                }
+                , success: function () {
+                    initVersion();
+                    form.render('select');
+                }
+            });
+        }
+
+        function toAdd(obj) {
+            var index = layer.open({
+                type: 1
+                , shade: 0.5
+                , title: '新增'
+                , maxmin: true
+                , content: $("#add").html()
+                , area: ['500px', '450px']
+                , btn: ['保存', '取消',]
+                , shadeClose: true
+                , btn1: function (index, layero) {
+                    if (!$("#groupNo").val()) {
+                        layer.msg("设备分组不能为空!", {icon: 2});
+                        return;
+                    }
+                    if (!$("#code").val()) {
+                        layer.msg("设备类型不能为空!", {icon: 2});
+                        return;
+                    }
+                    if (!$("#addType").val()) {
+                        layer.msg("设备本版不能为空!", {icon: 2});
+                        return;
+                    }
+                    if (!$("#snNo").val()) {
+                        layer.msg("设备编号不能为空!", {icon: 2});
+                        return;
+                    }
+                    toAddSave(index, $("#form2"), "add");
+                }
+                , btn2: function (index, layero) {
+                    layer.close(index);
+                }
+                , success: function () {
+                    initVersion();
+                    form.render('select');
+                }
+            });
+        }
+
+        function toAddBatchSave(index, start, end, groupNo, code, type) {
+            var dialog = layer.msg('正在保存...', {icon: 16, time: 0, shade: [0.3, '#000', false]});
+            var data = {};
+            data.startSnNo = start;
+            data.endSnNo = end;
+            data.groupNo = groupNo;
+            data.code = code;
+            data.type = type;
+            $.ajax({
+                url: ctx + '/deviceStock/batchSaveNo',
+                method: 'post',
+                data: JSON.stringify(data),
+                dataType: 'JSON',
+                contentType: "application/json",
+                success: function (res) {
+                    layer.close(dialog);
+                    if (res.code == 200) {
+                        layer.close(index);
+                        layer.msg(res.message, {
+                            icon: 1
+                        });
+                        tableIns.reload();
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 2
+                        });
+                    }
+                }
+            })
+        }
+
+        function toAddSave(index, dom, type) {
+            var data = dom.serializeObject();
+            let url = ctx + '/deviceStock/bindSave'
+            if (type === "add") {
+                url = ctx + '/deviceStock/save'
+            }
+            $.ajax({
+                url: url,
+                method: 'post',
+                data: JSON.stringify(data),
+                dataType: 'JSON',
+                contentType: "application/json",
+                success: function (res) {
+                    if (res.code == 200) {
+                        layer.close(index);
+                        layer.msg(res.message, {
+                            icon: 1
+                        });
+                        tableIns.reload();
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 2
+                        });
+                    }
+                }
+            })
+        }
+
+        function toUnBindSave(status, id) {
+            var data = {};
+            data.status = status;
+            data.id = id;
+            $.ajax({
+                url: ctx + '/deviceStock/unBindSave',
+                method: 'post',
+                data: JSON.stringify(data),
+                dataType: 'JSON',
+                contentType: "application/json",
+                success: function (res) {
+                    if (res.code == 200) {
+                        layer.msg(res.message, {
+                            icon: 1
+                        });
+                        tableIns.reload();
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 2
+                        });
+                    }
+                }
+            })
+        }
+
+        function del(obj) {
+            $.ajax({
+                url: '${ctx}/deviceStock/del/' + obj.id,
+                method: 'DELETE',
+                dataType: 'JSON',
+                contentType: "application/json",
+                success: function (res) {
+                    if (res.code == 200) {
+                        layer.msg(res.message, {
+                            icon: 1
+                        });
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 2
+                        });
+                    }
+                }
+            })
+        }
+    });
+    jQuery.prototype.serializeObject = function () {
+        var obj = new Object();
+        $.each(this.serializeArray(), function (index, param) {
+            if (!(param.name in obj)) {
+                obj[param.name] = param.value;
+            }
+        });
+        return obj;
+    };
+
+    function toBindDeviceNo(id) {
+        var index = layer.open({
+            type: 1
+            , shade: 0.5
+            , title: '绑定厂家编号'
+            , maxmin: true
+            , content: $("#bind2").html()
+            , area: ['400px', '300px']
+            , btn: ['保存', '取消',]
+            , shadeClose: true
+            , btn1: function (index, layero) {
+                var deviceNo = $("#deviceNo").val();
+                if (!deviceNo) {
+                    layer.msg("厂家编号不能为空!");
+                    return;
+                }
+                bindDeviceNo(index, $("#form5"));
+            }
+            , btn2: function (index, layero) {
+                layer.close(index);
+            }
+            , success: function () {
+                $("#bindId2").val(id);
+            }
+        });
+    }
+
+    function bindDeviceNo(index, dom) {
+        var data = dom.serializeObject();
+        $.ajax({
+            url: '${ctx}/deviceStock/bindDeviceNo',
+            method: 'post',
+            data: JSON.stringify(data),
+            dataType: 'JSON',
+            contentType: "application/json",
+            success: function (res) {
+                if (res.code == 200) {
+                    layer.close(index);
+                    layer.msg(res.message, {
+                        icon: 1
+                    });
+                    tableIns.reload();
+                } else {
+                    layer.msg(res.message, {
+                        icon: 2
+                    });
+                }
+            }
+        })
+    }
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceVoiceBox/list.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceVoiceBox/list.jsp
new file mode 100644
index 0000000..793aead
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceVoiceBox/list.jsp
@@ -0,0 +1,477 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" action="" style="margin-top: 10px">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">音箱编号</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="boxNo" id="boxNo" placeholder="请输入音箱编号" autocomplete="off"
+                                       class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">购买商家</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="buyMercName" id="buyMercName" placeholder="请输入购买商家名称"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">激活商家</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="actMercName" id="actMercName" placeholder="请输入激活商家名称"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">状态</label>
+                            <div class="layui-input-block">
+                                <select class="layui-select" name="status">
+                                    <option value="">请选择</option>
+                                    <option value="1">未出售</option>
+                                    <option value="2">已出售</option>
+                                    <option value="3">已激活</option>
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <div class="mb50 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-hide" id="deviceVoiceBoxTab" lay-filter="deviceVoiceBoxTab"></table>
+        </div>
+    </div>
+</div>
+
+<script type="text/template" id="add">
+    <form class="layui-form" id="form2" style="margin-top: 2rem;">
+        <input name="id" id="id" hidden>
+        <div class="layui-form-item" style="width: 300px;">
+            <label class="layui-form-label">音箱名称</label>
+            <div class="layui-input-block">
+                <input type="text" name="boxName" id="boxName" placeholder="请输入音箱名称" autocomplete="off" value="QR686"
+                       class="layui-input" readonly>
+            </div>
+        </div>
+        <div class="layui-form-item" style="width: 300px;">
+            <label class="layui-form-label">音箱编号</label>
+            <div class="layui-input-block">
+                <input type="text" name="boxNo" id="addBoxNo" placeholder="请输入编号" autocomplete="off"
+                       class="layui-input">
+            </div>
+        </div>
+    </form>
+</script>
+
+<script type="text/template" id="addBatch">
+    <form class="layui-form" id="form3" style="margin-top: 2rem;">
+        <div class="layui-form-item">
+            <div class="layui-inline">
+                <label class="layui-form-label">编号范围</label>
+                <div class="layui-input-inline" style="width: 200px;">
+                    <input type="text" name="startBoxNo" id="startBoxNo" placeholder="开始编号" autocomplete="off"
+                           class="layui-input">
+                </div>
+                <div class="layui-form-mid">-</div>
+                <div class="layui-input-inline" style="width: 200px;">
+                    <input type="text" name="endBoxNo" id="endBoxNo" placeholder="结束编号" autocomplete="off"
+                           class="layui-input">
+                </div>
+            </div>
+        </div>
+    </form>
+</script>
+
+<script type="text/template" id="bind">
+    <form class="layui-form" id="form4" style="margin-top: 2rem;">
+        <input name="id" id="bindId" hidden>
+        <input name="status" id="status" value="3" hidden>
+        <div class="layui-form-item" style="width: 250px;">
+            <label class="layui-form-label">商户ID</label>
+            <div class="layui-input-block">
+                <input type="text" name="actMercId" id="actMercId" placeholder="请输入商户ID" autocomplete="off"
+                       class="layui-input">
+            </div>
+        </div>
+    </form>
+</script>
+
+<script type="text/html" id="leftBar">
+    <button type="button" class="layui-btn layui-btn-sm" lay-event="add"><i class="layui-icon">&#xe608;</i>新增</button>
+    <button type="button" class="layui-btn layui-btn-sm" lay-event="addBatch"><i class="layui-icon">&#xe608;</i>批量新增
+    </button>
+    <button type="button" class="layui-btn layui-btn-normal layui-btn-sm" lay-event="search"><i class="layui-icon">&#xe615;</i>查询
+    </button>
+</script>
+
+<script type="text/html" id="toolBar">
+    {{#  if(d.status == 3){ }}
+    <button type="button" class="layui-btn layui-btn-sm layui-btn-warm" lay-event="unbind"><i class="layui-icon">&#xe64d;</i>解绑
+    </button>
+    {{# } }}
+    {{#  if(d.status == 1 || d.status == 2){ }}
+    <button type="button" class="layui-btn layui-btn-sm layui-btn-normal" lay-event="bind"><i class="layui-icon">&#xe64c;</i>绑定
+    </button>
+    {{# } }}
+    <button type="button" class="layui-btn layui-btn-sm layui-btn-danger" lay-event="del"><i
+            class="layui-icon">&#xe640;</i>删除
+    </button>
+</script>
+
+<script>
+    layui.use(['table', 'layer', 'form'], function () {
+        var table = layui.table;
+        var layer = layui.layer;
+        var form = layui.form;
+        var tableIns = table.render({
+            elem: '#deviceVoiceBoxTab'
+            , url: '${ctx}/deviceVoiceBox/page'
+            , id: 'deviceVoiceBox'
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            , toolbar: '#leftBar' //开启头部工具栏，并为其绑定左侧模板
+            , defaultToolbar: ['filter']
+            , defaultToolbar: ['filter', 'exports', 'print', { //自定义头部工具栏右侧图标。如无需自定义，去除该参数即可
+                title: '提示'
+                , layEvent: 'LAYTABLE_TIPS'
+                , icon: 'layui-icon-tips'
+            }]
+            , title: '智能音箱信息表'
+            , cols: [[
+                {type: 'checkbox', fixed: 'left', hidden: true}
+                , {field: 'numbers', title: '序号', fixed: 'left', unresize: true, width: 80, type: 'numbers'}
+                , {field: 'boxName', title: '音箱名称'}
+                , {
+                    field: 'boxNo', title: '音箱编号', templet: function (d) {
+                        return "NO." + d.boxNo;
+                    }
+                }
+                , {field: 'orderNo', title: '购买单号'}
+                , {field: 'buyMercName', title: '购买商家名称'}
+                , {field: 'buyMercId', title: '购买商家ID'}
+                , {field: 'actMercName', title: '激活商家名称'}
+                , {field: 'actMercId', title: '激活商家ID'}
+                , {
+                    field: 'status', title: '状态', templet: function (d) {
+                        if (d.status == '1') {
+                            return "<span>未出售</span>"
+                        } else if (d.status == '2') {
+                            return "<span style='color: blue'>已出售</span>"
+                        } else if (d.status == '3') {
+                            return "<span style='color: green'>已激活</span>"
+                        }
+                    }
+                }
+                , {
+                    field: 'createTime',
+                    title: '创建时间',
+                    width: 160,
+                    templet: "<div>{{layui.util.toDateString(d.createTime,'yyyy-MM-dd HH:mm:ss')}}</div>"
+                }
+                , {fixed: 'right', title: '操作', width: 250, toolbar: '#toolBar'}
+            ]]
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , page: true
+        });
+        table.on('tool(deviceVoiceBoxTab)', function (obj) { //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            var data = obj.data; //获得当前行数据
+            var layEvent = obj.event; //获得 lay-event 对应的值（也可以是表头的 event 参数对应的值）
+            if (layEvent === 'del') { //删除
+                layer.confirm('真的删除么?', {icon: 3}, function (index) {
+                    obj.del(); //删除对应行（tr）的DOM结构，并更新缓存
+                    layer.close(index);
+                    del(data);
+                    //向服务端发送删除指令
+                });
+            } else if (layEvent === 'bind') {
+                toBind(obj);
+            } else if (layEvent === 'unbind') {
+                layer.confirm('确定要解绑吗?', {icon: 3}, function (index) {
+                    layer.close(index);
+                    var buyId = obj.data.buyMercId;
+                    var status = 2;
+                    if (buyId == null) {
+                        status = 1;
+                    }
+                    toUnBindSave(status, obj.data.id);
+                    //向服务端发送删除指令
+                });
+            }
+        });
+
+        //监听头工具栏事件
+        table.on('toolbar(deviceVoiceBoxTab)', function (obj) {
+            switch (obj.event) {
+                case 'add':
+                    // 添加
+                    toAdd();
+                    break;
+                case 'addBatch':
+                    // 添加
+                    toAddBatch();
+                    break;
+                case 'search':
+                    var params = serialize($('#form1'));
+                    table.reload('deviceVoiceBox', {
+                        where: params
+                        , page: {
+                            size: 10
+                            , current: 1
+                        }
+                    });
+                    break;
+            }
+        });
+
+        function toBind(obj) {
+            var index = layer.open({
+                type: 1
+                , shade: 0.5
+                , title: '绑定'
+                , maxmin: true
+                , content: $("#bind").html()
+                , area: ['350px', '300px']
+                , btn: ['保存', '取消',]
+                , shadeClose: true
+                , btn1: function (index, layero) {
+                    var actMercId = $("#actMercId").val();
+                    if (!actMercId) {
+                        layer.msg("商户ID不能为空!");
+                        return;
+                    }
+                    toAddSave(index, $("#form4"));
+                }
+                , btn2: function (index, layero) {
+                    layer.close(index);
+                }
+                , success: function () {
+                    $("#bindId").val(obj.data.id);
+                }
+            });
+        }
+
+        function toAddBatch() {
+            var index = layer.open({
+                type: 1
+                , shade: 0.5
+                , title: '批量新增'
+                , maxmin: true
+                , content: $("#addBatch").html()
+                , area: ['650px', '200px']
+                , btn: ['保存', '取消',]
+                , shadeClose: true
+                , btn1: function (index, layero) {
+                    var startBoxNo = $("#startBoxNo").val();
+                    if (!startBoxNo) {
+                        layer.msg("开始编号不能为空!");
+                        return;
+                    }
+                    var endBoxNo = $("#endBoxNo").val();
+                    if (!endBoxNo) {
+                        layer.msg("结束编号不能为空!");
+                        return;
+                    }
+                    var reg = /^[0-9]+$/;
+                    if (!reg.test(startBoxNo)) {
+                        layer.msg("开始编号格式不正确!");
+                        return;
+                    }
+                    if (!reg.test(endBoxNo)) {
+                        layer.msg("结束编号格式不正确!");
+                        return;
+                    }
+                    if (parseInt(endBoxNo) - parseInt(startBoxNo) < 0) {
+                        layer.msg("编号范围输入有误!");
+                        return;
+                    }
+                    toAddBatchSave(index, startBoxNo, endBoxNo);
+                }
+                , btn2: function (index, layero) {
+                    layer.close(index);
+                }
+            });
+        }
+
+        function toAdd(obj) {
+            var index = layer.open({
+                type: 1
+                , shade: 0.5
+                , title: '新增'
+                , maxmin: true
+                , content: $("#add").html()
+                , area: ['400px', '400px']
+                , btn: ['保存', '取消',]
+                , shadeClose: true
+                , btn1: function (index, layero) {
+                    if (!$("#addBoxNo").val()) {
+                        layer.msg("设备编号不能为空!");
+                        return;
+                    }
+                    toAddSave(index, $("#form2"));
+                }
+                , btn2: function (index, layero) {
+                    layer.close(index);
+                }
+            });
+        }
+
+        function toAddBatchSave(index, start, end) {
+            var dialog = layer.msg('正在保存...', {icon: 16, time: 0, shade: [0.3, '#000', false]});
+            var data = {};
+            data.startBoxNo = start;
+            data.endBoxNo = end;
+            $.ajax({
+                url: '${ctx}/deviceVoiceBox/batchSaveNo',
+                method: 'post',
+                data: JSON.stringify(data),
+                dataType: 'JSON',
+                contentType: "application/json",
+                success: function (res) {
+                    layer.close(dialog);
+                    if (res.code == 200) {
+                        layer.close(index);
+                        layer.msg(res.message, {
+                            icon: 1
+                        });
+                        tableIns.reload();
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 2
+                        });
+                    }
+                }
+            })
+        }
+
+        function toAddSave(index, dom) {
+            var data = dom.serializeObject();
+            $.ajax({
+                url: '${ctx}/deviceVoiceBox/saveOrUpdate',
+                method: 'post',
+                data: JSON.stringify(data),
+                dataType: 'JSON',
+                contentType: "application/json",
+                success: function (res) {
+                    if (res.code == 200) {
+                        layer.close(index);
+                        layer.msg(res.message, {
+                            icon: 1
+                        });
+                        tableIns.reload();
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 2
+                        });
+                    }
+                }
+            })
+        }
+
+        function toUnBindSave(status, id) {
+            var data = {};
+            data.status = status;
+            data.id = id;
+            $.ajax({
+                url: '${ctx}/deviceVoiceBox/unBindSave',
+                method: 'post',
+                data: JSON.stringify(data),
+                dataType: 'JSON',
+                contentType: "application/json",
+                success: function (res) {
+                    if (res.code == 200) {
+                        layer.msg(res.message, {
+                            icon: 1
+                        });
+                        tableIns.reload();
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 2
+                        });
+                    }
+                }
+            })
+        }
+
+        function del(obj) {
+            $.ajax({
+                url: '${ctx}/deviceVoiceBox/del/' + obj.id,
+                method: 'DELETE',
+                dataType: 'JSON',
+                contentType: "application/json",
+                success: function (res) {
+                    if (res.code == 200) {
+                        layer.msg(res.data, {
+                            icon: 1
+                        });
+                    } else {
+                        layer.msg(res.data, {
+                            icon: 2
+                        });
+                    }
+                }
+            })
+        }
+    });
+    jQuery.prototype.serializeObject = function () {
+        var obj = new Object();
+        $.each(this.serializeArray(), function (index, param) {
+            if (!(param.name in obj)) {
+                obj[param.name] = param.value;
+            }
+        });
+        return obj;
+    };
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceVoiceBox/msg/list.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceVoiceBox/msg/list.jsp
new file mode 100644
index 0000000..c3f1f7e
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/deviceVoiceBox/msg/list.jsp
@@ -0,0 +1,120 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../../common.jsp" />
+</head>
+<body>
+
+<form class="layui-form" id="form1" action="" style="margin-top: 30px;">
+    <div class="layui-inline">
+        <label class="layui-form-label">设备编号</label>
+        <div class="layui-input-block">
+            <input type="text" name="deviceNo" id="deviceNo" placeholder="请输入设备编号" autocomplete="off" class="layui-input">
+        </div>
+    </div>
+</form>
+<table class="layui-hide" id="deviceVoiceBoxMsgTab" lay-filter="deviceVoiceBoxMsgTab"></table>
+
+<script type="text/html" id="leftBar">
+    <%--<button type="button" class="layui-btn layui-btn-sm" lay-event="add"><i class="layui-icon">&#xe608;</i>新增</button>--%>
+    <button type="button" class="layui-btn layui-btn-normal layui-btn-sm" lay-event="search"><i class="layui-icon">&#xe615;</i>查询</button>
+</script>
+
+<script type="text/html" id="toolBar">
+   <%-- {{#  if(d.status == 0){ }}
+    <button type="button" class="layui-btn layui-btn-sm" lay-event="audit"><i class="layui-icon">&#xe642;</i>审核</button>
+    {{# } }}--%>
+    <%--<button type="button" class="layui-btn layui-btn-sm layui-btn-danger" lay-event="del"><i class="layui-icon">&#xe640;</i>删除</button>--%>
+</script>
+
+<script>
+    layui.use(['table', 'layer','form'], function(){
+        var table = layui.table;
+        var layer = layui.layer;
+        var form = layui.form;
+        var tableIns = table.render({
+            elem: '#deviceVoiceBoxMsgTab'
+            ,url:'${ctx}/deviceVoiceBoxMsg/page'
+            ,id: 'deviceVoiceBoxMsg'
+            ,response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                ,countName: 'count' //数据总数的字段名称，默认：count
+                ,dataName: 'data' //默数据列表的字段名称，认：data
+                ,statusCode : 200
+            }
+            ,parseData: function(res){ //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            ,toolbar: '#leftBar' //开启头部工具栏，并为其绑定左侧模板
+            , defaultToolbar: ['filter']
+            ,defaultToolbar: ['filter', 'exports', 'print', { //自定义头部工具栏右侧图标。如无需自定义，去除该参数即可
+                title: '提示'
+                ,layEvent: 'LAYTABLE_TIPS'
+                ,icon: 'layui-icon-tips'
+            }]
+            ,title: '设备消息推送记录表'
+            ,cols: [[
+                {type: 'checkbox', fixed: 'left', hidden: true}
+                ,{field:'numbers', title:'序号', fixed: 'left', unresize: true, width:80, type:'numbers'}
+                ,{field:'deviceNo', title:'设备编号'}
+                ,{field:'body', title:'推送内容'}
+                ,{field:'requestId', title:'请求ID'}
+                ,{field:'msgId', title:'消息ID'}
+                ,{field: 'createTime', title: '创建时间', width: 160, templet : "<div>{{layui.util.toDateString(d.createTime,'yyyy-MM-dd HH:mm:ss')}}</div>"}
+                ,{fixed: 'right', title:'操作',width:200, toolbar: '#toolBar'}
+            ]]
+            ,request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                ,limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            ,page: true
+        });
+        /*table.on('tool(deviceVoicePoxMsgTab)', function(obj){ //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            var data = obj.data; //获得当前行数据
+            var layEvent = obj.event; //获得 lay-event 对应的值（也可以是表头的 event 参数对应的值）
+            if(layEvent === 'audit'){ //审核
+                //do something
+                toAudit(obj);
+                //同步更新缓存对应的值
+                // obj.update({
+                //     username: '123'
+                //     ,title: 'xxx'
+                // });
+            }
+        });*/
+
+        //监听头工具栏事件
+        table.on('toolbar(deviceVoiceBoxMsgTab)', function (obj) {
+            switch (obj.event) {
+                case 'search':
+                    var params= serialize($('#form1'));
+                    table.reload('deviceVoiceBoxMsg', {
+                        where: params
+                        , page: {
+                            size: 10
+                            , current: 1
+                        }
+                    });
+                    break;
+            }
+        });
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/dict/detailDict.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/dict/detailDict.jsp
new file mode 100644
index 0000000..b56e9b6
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/dict/detailDict.jsp
@@ -0,0 +1,124 @@
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp" />
+    <style>
+        .layui-input,.layui-textarea{
+            border-color:#606060;
+        }
+    </style>
+</head>
+<body>
+<form class="layui-form" action="" style="width: 80%; margin-top: 20px">
+    <input name="userId" value="${entity.id}" hidden/>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">pid</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="pid" value="${entity.pid}" placeholder="请输入父级id" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">排序</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="sort" value="${entity.sort}" placeholder="请输入排序" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">字典</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block" >
+                <input name="code" value="${entity.code}" placeholder="请输入字典" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">名称</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block" >
+                <input name="name" value="${entity.name}" placeholder="请输入名称" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">描述</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block" >
+                <input name="describes" value="${entity.describes}" placeholder="请输入描述" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">字典值</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block" >
+                <input name="codeValue" value="${entity.codeValue}" placeholder="请输入字典值" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button class="layui-btn" lay-submit lay-filter="formDemo">立即提交</button>
+            <button type="button" id="close" class="layui-btn layui-btn-primary">关闭</button>
+        </div>
+    </div>
+</form>
+
+<script>
+    //Demo
+    layui.use(['form', 'layer'], function(){
+        var form = layui.form;
+        var layer = layui.layer;
+
+        $('#close').click(function() {
+            parent.layer.closeAll();
+        });
+
+        //监听提交
+        form.on('submit(formDemo)', function(data){
+            var index = layer.load(1,{shade: [0.1,'#000'] });
+            $.ajax({
+                url: '${ctx}/dict/saveOrUpdate',
+                method: 'post',
+                data: JSON.stringify(data.field),
+                dataType: 'JSON',
+                contentType:"application/json",
+                success: function(res) {
+                    layer.close(index);
+                    if(res.code == 200) {
+                        layer.alert(res.message,function(){
+                            parent.location.reload();
+                        })
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 5
+                        });
+                    }
+                }
+            })
+            return false;
+        });
+    });
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/dict/dict.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/dict/dict.jsp
new file mode 100644
index 0000000..3c11ee6
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/dict/dict.jsp
@@ -0,0 +1,398 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+
+    <style>
+        .inline_right_btn {
+            display: inline;
+            position: absolute;
+            right: 15px;
+        }
+
+        /*修改源码点击选中变色*/
+        .custom-tree-item-clicked {
+            color: green;
+        }
+    </style>
+</head>
+<body>
+<fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
+    <legend>数据字典</legend>
+</fieldset>
+<div class="layui-col-md4">
+    <div style="padding: 20px; background-color: #F2F2F2;">
+        <div class="layui-card">
+            <div class="layui-card-header" style="padding: 10px 15px">
+                <div class="layui-inline" style="position: relative">
+                    字典树
+                </div>
+                <button id="initAdd" type="button" class="layui-btn inline_right_btn" onclick="initDictAdd()" style="display: none">添加字典组
+                </button>
+            </div>
+            <div class="layui-card-body">
+                <div id="test1" class="demo-tree demo-tree-box" style="height: 600px; overflow: scroll;"></div>
+            </div>
+        </div>
+    </div>
+</div>
+
+<div class="layui-col-md8" style="padding-left: 20px">
+    <div style="padding: 20px; background-color: #F2F2F2;">
+        <div id="divDictGroup" class="layui-card" style="margin-bottom: 0px">
+            <div class="layui-card-header" style="padding: 10px 15px">
+                <div class="layui-inline" style="position: relative">
+                    字典组信息
+                </div>
+                <button type="button" onclick="delDictGroup()" class="inline_right_btn layui-btn layui-btn-danger">删除字典组
+                </button>
+            </div>
+            <div class="layui-card-body">
+                <form id="formDictGroup" class="layui-form" action="">
+                    <input type="text" name="id" autocomplete="off" placeholder="请输入名称"
+                           class="layui-input" style="display: none">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">名称</label>
+                            <div class="layui-input-inline">
+                                <input type="text" name="name" lay-verify="required" autocomplete="off"
+                                       placeholder="请输入名称"
+                                       class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">字典编码</label>
+                            <div class="layui-input-inline">
+                                <input type="text" name="code" lay-verify="required" autocomplete="off"
+                                       placeholder="请输入字典编码"
+                                       class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">序号</label>
+                            <div class="layui-input-inline">
+                                <input type="number" name="sort" lay-verify="required" autocomplete="off"
+                                       placeholder="请输入序号"
+                                       class="layui-input">
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">描述</label>
+                        <div class="layui-input-block">
+                            <input type="text" name="desc" lay-verify="required" autocomplete="off" placeholder="描述内容"
+                                   class="layui-input"/>
+                        </div>
+                    </div>
+
+                    <div class="layui-form-item">
+                        <div class="layui-input-block">
+                            <button class="layui-btn"  lay-submit lay-filter="formDictGroup">添加字典组</button>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+
+        <div id="divDictItem" class="layui-card" style="display: none">
+
+            <div class="layui-card-header" style="padding: 10px 15px">
+                <div class="layui-inline" style="position: relative">
+                    字典项
+                </div>
+                <button type="button" onclick="delDictItem()" class="inline_right_btn layui-btn layui-btn-danger">删除字典
+                </button>
+            </div>
+
+            <div class="layui-card-body">
+                <form id="formDictItem" class="layui-form" action="">
+                    <input type="text" name="id" lay-verify="" autocomplete="off" placeholder="请输入名称"
+                           class="layui-input" style="display: none">
+                    <input type="text" name="pId" lay-verify="" autocomplete="off" placeholder="请输入名称"
+                           class="layui-input" style="display: none">
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">字典组名称</label>
+                        <div class="layui-input-block">
+                            <input type="text" name="pName" lay-verify="" autocomplete="off" placeholder=""
+                                   class="layui-input" disabled>
+                        </div>
+                    </div>
+
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">名称</label>
+                        <div class="layui-input-block">
+                            <input type="text" name="name" lay-verify="required" autocomplete="off" placeholder="请输入名称"
+                                   class="layui-input">
+                        </div>
+                    </div>
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">字典值</label>
+                        <div class="layui-input-block">
+                            <input type="text" name="value" lay-verify="required" autocomplete="off"
+                                   placeholder="请输入字典值"
+                                   class="layui-input">
+                        </div>
+                    </div>
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">描述</label>
+                        <div class="layui-input-block">
+                            <input type="text" name="desc" lay-verify="required" autocomplete="off" placeholder="请输入描述"
+                                   class="layui-input">
+                        </div>
+                    </div>
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">序号</label>
+                        <div class="layui-input-block">
+                            <input type="number" name="sort" lay-verify="required" autocomplete="off"
+                                   placeholder="请输入序号"
+                                   class="layui-input">
+                        </div>
+                    </div>
+
+                    <div class="layui-form-item">
+                        <div class="layui-input-block">
+                            <button class="layui-btn" lay-submit lay-filter="formDictItem" style="display: none">添加字典</button>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+</div>
+<script>
+    var layer;
+    var tree;
+    var form;
+
+    var treeData;
+    layui.use(['tree', 'layer', 'form'], function () {
+        tree = layui.tree;
+        layer = layui.layer;
+        form = layui.form;
+
+        //渲染
+        var inst1 = tree.render({
+            elem: '#test1'  //绑定元素
+            , data: treeData
+            , id: 'tree1'
+            , click: function(obj) {
+                treeSelect(obj);
+            }
+        });
+
+        initData();
+
+        $("#formDictItem").submit(function (event) {
+           event.preventDefault();
+           addOrUpdateDict();
+        });
+
+        form.on('submit(formDictGroup)', function(data) {
+            addOrUpdateDict(data.field);
+            return false;
+        });
+
+        form.on('submit(formDictItem)', function(data) {
+            addOrUpdateDict(data.field);
+            return false;
+        });
+    });
+
+    function treeSelect(obj){
+        $("#initAdd").css("display", "inline");
+        $("#divDictItem").show();
+        $("#divDictGroup").css("margin-bottom", "20px");
+
+        $("#formDictItem button").show();
+        if (obj.data.value === null || obj.data.value === undefined || obj.data.value === '') {
+            setDictGroup(obj.data);
+            $("#formDictGroup button").html("修改字典组");
+
+            // 字典项表单内容清空
+            $("#formDictItem input[name='pId']").val(obj.data.id);
+            $("#formDictItem input[name='pName']").val(obj.data.name);
+            $("#formDictItem input[name='id']").val(null);
+            $("#formDictItem input[name='name']").val(null);
+            $("#formDictItem input[name='value']").val(null);
+            $("#formDictItem input[name='sort']").val(null);
+            $("#formDictItem input[name='desc']").val(null);
+            $("#formDictItem button").html("添加字典");
+
+        } else {
+            var cur = obj.data;
+            var parent;
+
+            // 字典组
+            treeData.forEach(function(item) {
+                if (item.id === cur.pId) {
+                    parent = item;
+                    setDictGroup(parent);
+                    $("#formDictItem input[name='pId']").val(parent.id);
+                    $("#formDictItem input[name='pName']").val(parent.name);
+                }
+            });
+
+            $("#formDictItem input[name='id']").val(cur.id);
+            $("#formDictItem input[name='name']").val(cur.name);
+            $("#formDictItem input[name='value']").val(cur.value);
+            $("#formDictItem input[name='sort']").val(cur.sort);
+            $("#formDictItem input[name='desc']").val(cur.desc);
+            $("#formDictItem button").html("修改字典");
+        }
+    }
+
+    // 给字典组表单赋值
+    function setDictGroup(item) {
+        $("#formDictGroup input[name='id']").val(item.id);
+        $("#formDictGroup input[name='name']").val(item.name);
+        $("#formDictGroup input[name='code']").val(item.code);
+        $("#formDictGroup input[name='sort']").val(item.sort);
+        $("#formDictGroup input[name='desc']").val(item.desc);
+        $("#formDictGroup button").html("修改字典组");
+    }
+
+    function resetDictGroup() {
+        $("#formDictGroup input[name='id']").val(null);
+        $("#formDictGroup input[name='name']").val(null);
+        $("#formDictGroup input[name='code']").val(null);
+        $("#formDictGroup input[name='sort']").val(null);
+        $("#formDictGroup input[name='desc']").val(null);
+        $("#formDictGroup button").html("修改字典组");
+
+        $("#divDictItem").hide();
+        $("#divDictGroup").css("margin-bottom", "20px");
+    }
+
+    function setDictItem(item) {
+        var cur = item;
+        var parent;
+
+        // 字典组
+        treeData.forEach(function(item) {
+            if (item.id === cur.pId) {
+                parent = item;
+                setDictGroup(parent);
+                $("#formDictItem input[name='pId']").val(parent.id);
+                $("#formDictItem input[name='pName']").val(parent.name);
+            }
+        });
+
+        $("#formDictItem input[name='id']").val(cur.id);
+        $("#formDictItem input[name='name']").val(cur.name);
+        $("#formDictItem input[name='value']").val(cur.value);
+        $("#formDictItem input[name='sort']").val(cur.sort);
+        $("#formDictItem input[name='desc']").val(cur.desc);
+        $("#formDictItem button").html("修改字典");
+    }
+
+    function initData() {
+        $.ajax({
+            type: "GET",
+            url: "${ctx}/dict/tree",
+            dataType: "json",
+            success: function(data) {
+                if (data.code == 200) {
+                    treeData = data.data;
+                    tree.reload('tree1', {data: treeData});
+
+                    resetDictGroup(null)
+                    resetDictItem(null)
+                } else {
+                    layer.msg("数据请求失败！");
+                }
+            }
+        });
+    }
+
+    function addOrUpdateDict(data) {
+        $.ajax({
+            url: ctx + '/dict/save',
+            type: 'post',
+            data: JSON.stringify(data),
+            contentType: "application/json",
+            success: function(data) {
+                if (data.code == 200) {
+                    layer.msg(data.message);
+                    initData();
+                } else {
+                    layer.msg(data.message);
+                }
+            },
+            error: function() {
+                layer.msg("网络异常");
+            }
+        });
+    }
+
+    function delDict(id) {
+        $.ajax({
+            url: ctx + '/dict/del/' + id,
+            type: 'delete',
+            contentType: "application/json",
+            success: function(data) {
+                if (data.code == 200) {
+                    layer.msg(data.message);
+                    initData();
+                } else {
+                    layer.msg(data.message);
+                }
+            },
+            error: function() {
+                layer.msg("网络异常");
+            }
+        });
+    }
+
+    function delDictGroup() {
+        layer.confirm('确认删除该字典组？', {
+            btn: ['确认删除', '取消']
+        }, function(index, layero) {
+            delDict($('#formDictGroup input[name="id"]').val())
+        }, function(index, layero) {
+            layer.msg("取消删除字典组 index: " + index + "; layero: " + layero);
+        });
+    }
+
+    function delDictItem() {
+        layer.confirm('确认删除该字典项？', {
+            btn: ['确认删除', '取消']
+        }, function(index, layero) {
+            delDict($('#formDictItem input[name="id"]').val())
+        }, function(index, layero) {
+            layer.msg("取消删除字典项 index: " + index + "; layero: " + layero);
+        });
+    }
+
+
+    // 清理表单
+    function initDictAdd() {
+        $("#formDictGroup input[name='id']").val(null);
+        $("#formDictGroup input[name='name']").val(null);
+        $("#formDictGroup input[name='code']").val(null);
+        $("#formDictGroup input[name='sort']").val(null);
+        $("#formDictGroup input[name='desc']").val(null);
+        $("#formDictGroup button").html("添加字典组");
+        $(".custom-tree-item-clicked").removeClass("custom-tree-item-clicked")
+        $("#initAdd").hide();
+
+        $("#divDictItem").css("margin")
+        $("#divDictItem").hide();
+        $("#divDictGroup").css("margin-bottom", "0px");
+    }
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/encrypt/detail.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/encrypt/detail.jsp
new file mode 100644
index 0000000..9a8f0c0
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/encrypt/detail.jsp
@@ -0,0 +1,103 @@
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<!DOCTYPE>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp" />
+    <style>
+    </style>
+</head>
+<body>
+<div class="layui-container">
+    <form class="layui-form" action="" style="margin-top: 10px" lay-filter="formDemo">
+        <div class="layui-form-item">
+            <label class="layui-form-label">名称</label>
+            <div class="layui-input-block">
+                <input type="text" name="name" required  lay-verify="required" placeholder="请输入名称" autocomplete="off" class="layui-input">
+            </div>
+        </div>
+
+        <div class="layui-form-item">
+            <label class="layui-form-label">编码</label>
+            <div class="layui-input-block">
+                <input type="text" name="code" required  lay-verify="required" placeholder="请输入编码" autocomplete="off" class="layui-input">
+            </div>
+        </div>
+
+        <div class="layui-form-item">
+            <label class="layui-form-label">版本</label>
+            <div class="layui-input-block">
+                <input type="text" name="title" required  lay-verify="required" placeholder="请输入版本号" autocomplete="off" class="layui-input">
+            </div>
+        </div>
+
+        <div class="layui-form-item">
+            <label class="layui-form-label">私钥</label>
+            <div class="layui-input-block">
+                <textarea name="priKey" placeholder="请输入私钥" class="layui-textarea"></textarea>
+            </div>
+        </div>
+
+        <div class="layui-form-item">
+            <label class="layui-form-label">公钥</label>
+            <div class="layui-input-block">
+                <textarea name="pubKey" placeholder="请输入公钥" class="layui-textarea"></textarea>
+            </div>
+        </div>
+
+        <div class="layui-form-item">
+            <label class="layui-form-label">是否生效</label>
+            <div class="layui-input-block">
+                <input type="radio" name="status" value="1" title="生效" checked>
+                <input type="radio" name="status" value="0" title="不生效">
+            </div>
+        </div>
+
+        <div class="layui-form-item">
+            <div class="layui-input-block">
+                <button class="layui-btn" lay-submit lay-filter="formDemo">立即提交</button>
+                <button type="reset" class="layui-btn layui-btn-primary">重置</button>
+            </div>
+        </div>
+    </form>
+</div>
+</body>
+
+<script>
+    //Demo
+    layui.use(['form', 'layer'], function(){
+        var form = layui.form;
+        var layer = layui.layer;
+
+        //监听提交
+        form.on('submit(formDemo)', function(data){
+            let index = layer.load(1, {shade: [0.1, '#000']});
+
+            $.ajax({
+                url: ctx + "/encryptKey/save"
+                , type: 'POST'
+                , data: form.val("formDemo")
+                , success: function(d) {
+                    if (d.code == 200) {
+                        parent.layer.closeAll()
+                    } else {
+                        layer.close(index);
+                    }
+                    parent.layer.msg(d.message);
+                }
+            })
+
+            return false;
+        });
+    });
+</script>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/encrypt/index.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/encrypt/index.jsp
new file mode 100644
index 0000000..1ad934b
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/encrypt/index.jsp
@@ -0,0 +1,223 @@
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<!DOCTYPE>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp" />
+    <style>
+    </style>
+</head>
+<body>
+<div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+    <div class="toolbar-panel bdd">
+        <!--搜索条件 -->
+        <div class="toolbar-box">
+            <div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+                <!-- 顶部按钮 -->
+                <div class="fl">
+                    查询条件
+                </div>
+                <div class="tools fr">
+                    <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                        <i class="fa-2x fa fa-angle-double-up"></i>
+                    </a>
+                </div>
+            </div>
+        </div>
+        <!--搜索条件 -->
+        <div class="toolbar-body">
+            <form class="layui-form" action="" style="margin-top: 10px" lay-filter="formCondition">
+                <div class="layui-form-item">
+                    <div class="layui-inline">
+                        <label class="layui-form-label">名称</label>
+                        <div class="layui-input-inline">
+                            <input type="text" id="name" name="name" placeholder="请输入用户ID" class="layui-input">
+                        </div>
+                    </div>
+
+                    <div class="layui-inline">
+                        <label class="layui-form-label">编码</label>
+                        <div class="layui-input-inline">
+                            <input type="text" id="code" value="1" name="code" class="layui-input">
+                        </div>
+                    </div>
+
+                    <div class="layui-inline">
+                        <label class="layui-form-label">状态</label>
+                        <div class="layui-input-inline">
+                            <select id="status" name="status">
+                                <option value="">请选择</option>
+                                <option value="0">无效</option>
+                                <option value="1" selected>有效</option>
+                            </select>
+                        </div>
+                    </div>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
+
+<table class="layui-hide" id="table" lay-filter="table"></table>
+</body>
+
+
+<script>
+    let layer;
+    let table;
+    let form;
+
+    layui.use(['layer', 'table', 'form'], function () {
+        layer = layui.layer; //弹层
+        table = layui.table; //表格
+        form = layui.form;
+
+        //执行一个 table 实例
+        table.render({
+            elem: '#table'
+            , id: 'table'
+            , url: ctx + '/encryptKey/page' //数据接口
+            , autoSort: false
+            , where: form.val('formCondition')
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , title: 'app首页菜单表'
+            , page: true //开启分页
+            , toolbar: '#toolBar' //开启工具栏，此处显示默认图标，可以自定义模板，详见文档
+            , defaultToolbar: ['filter']
+            , cols: [[ //表头
+                {type: 'checkbox'}
+                , {field: '', title: '序号', type: 'numbers'}
+                , {field: 'name', title: '名称', minWidth: 80}
+                , {field: 'code', title: '编码', minWidth: 80}
+                , {field: 'desc', title: '描述', minWidth: 150}
+                , {field: 'priKey', title: '私钥', minWidth: 100}
+                , {field: 'pubKey', title: '公钥', minWidth: 100}
+                , {field: 'version', title: '版本', minWidth: 100}
+                , {field: 'status', title: '状态', template: function(d) {
+                        if (d.status == "1") {
+                            return "<span class='color: #FF5722'>生效中</span>";
+                        } else {
+                            return "";
+                        }
+                    }}
+                , {
+                    field: 'createTime',
+                    title: '创建时间',
+                    width: 160,
+                    hide: false,
+                    templet: "<div>{{layui.util.toDateString(d.createTime, 'yyyy-MM-dd HH:mm:ss')}}</div>"
+                }
+                , {
+                    field: 'updateTime',
+                    title: '更新时间',
+                    width: 165,
+                    hide: false,
+                    templet: "<div>{{layui.util.toDateString(d.updateTime, 'yyyy-MM-dd HH:mm:ss')}}</div>"
+                }
+                , {fixed: 'right', title: '操作', minWidth: 80, align: 'center', toolbar: '#barDemo'}
+            ]]
+        });
+
+        //监听头工具栏事件
+        table.on('toolbar(table)', function (obj) {
+            var checkStatus = table.checkStatus(obj.config.id)
+                , data = checkStatus.data; //获取选中的数据
+            switch (obj.event) {
+                case 'search':
+                    search();
+                    break;
+                case 'add':
+                    toAdd(data.id)
+                    break;
+            }
+        });
+
+        //监听行工具事件
+        table.on('tool(table)', function (obj) { //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            let itemData = obj.data //获得当前行数据
+                , layEvent = obj.event; //获得 lay-event 对应的值
+            if (layEvent === 'enable') {
+                let index = layer.confirm('确认生效', {
+                    btn: ['确认','取消'] //按钮
+                }, function(){
+                    let index = layer.load(1, {shade: [0.1, '#000']});
+                    $.ajax({
+                        url: ctx + "/encryptKey/enable"
+                        , type: 'POST'
+                        , data: {
+                            id: itemData.id
+                        }
+                        , success: function(d) {
+                            if (d.code == 200) {
+                                layer.closeAll()
+                                table.reload('table');
+                            } else {
+                                layer.close(index);
+                            }
+                            layer.msg(d.message);
+                        }
+                    })
+                });
+            }
+        });
+    });
+
+    function search() {
+        table.reload("table", {
+            where: form.val('formCondition')
+        }, true)
+    }
+
+    function toAdd(id) {
+        layer.open({
+            type: 2
+            , title: "添加新的秘钥信息"
+            , shade: 0.5
+            , maxmin: false
+            , content: ctx + '/encryptKey/detail'
+            , area: ['550px', '600px']
+        });
+    }
+</script>
+
+<script id ="barDemo" type="text/html">
+    <a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="enable">
+        <i class="layui-icon layui-icon-release"></i>启用
+    </a>
+</script>
+
+<script id ="toolBar" type="text/html">
+    <a class="layui-btn layui-btn-sm" lay-event="search">
+        <i class="layui-icon  layui-icon-search"></i>启用
+    </a>
+    <a class="layui-btn layui-btn-sm" lay-event="add">
+        <i class="layui-icon layui-icon-add-1"></i>添加
+    </a>
+</script>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/fans/fansBaseInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/fans/fansBaseInfo.jsp
new file mode 100644
index 0000000..e943bfb
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/fans/fansBaseInfo.jsp
@@ -0,0 +1,69 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">  
+	<div class="tab-pane active">     
+		<div class="panel-body">
+			<div class="wrapper wrapper-content">
+				<div class="panel-form animated fadeInRight wp60 fc">
+					<div class="layui-form-item dn	has-error" >   
+						<label class="layui-form-label">id</label>  
+						<div class="layui-input-block">
+							<input type="text" name="id" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${fans.id }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">userId</label>  
+						<div class="layui-input-block">
+							<input type="text" name="userId" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${fans.userId }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">logo</label>  
+						<div class="layui-input-block">
+							<input type="text" name="logo" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${fans.logo }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">nickName</label>  
+						<div class="layui-input-block">
+							<input type="text" name="nickName" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${fans.nickName }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">consumMoney</label>  
+						<div class="layui-input-block">
+							<input type="text" name="consumMoney" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${fans.consumMoney }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">merchantCode</label>  
+						<div class="layui-input-block">
+							<input type="text" name="merchantCode" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${fans.merchantCode }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">merchantName</label>  
+						<div class="layui-input-block">
+							<input type="text" name="merchantName" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${fans.merchantName }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">consumAddress</label>  
+						<div class="layui-input-block">
+							<input type="text" name="consumAddress" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${fans.consumAddress }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">consumTime</label>  
+						<div class="layui-input-block">
+							<input type="text" name="consumTime" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${fans.consumTime }" >
+						</div>  
+					</div>
+	
+				</div>
+			</div>
+		</div>  
+	</div>
+</form>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/fans/fansDetails.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/fans/fansDetails.jsp
new file mode 100644
index 0000000..d8d1b75
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/fans/fansDetails.jsp
@@ -0,0 +1,54 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>     
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">                      
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black"> 
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> 
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->                                     
+<meta name="viewport"
+	content="width=device-width, initial-scale=1.0, maximum-scale=1.0">   
+<jsp:include page="../../common.jsp" />
+<script type="text/javascript">
+    require("js/fans/fansDetails.js");
+</script>
+<title>编辑</title>
+</head>                                 
+	<body class="lgraybg">            
+		<div class="	container-fluid animated fadeInRight col-sm-12">
+			<div class="panel-toolbar mt10 mb10 pt5 pb5 pl10 bdd whitebg">
+				<div class="buttons">
+					<a href="javascript:void(0);" class="btn btn-primary fa fa-save f12"><span>保存</span></a>
+					<a href="${ctx }/fans/index?pageIndex=${pageIndex}"  class="btn btn-primary fa fa-back f12" id="goback"><span>返回</span></a>
+				</div>
+			</div>
+				<div class="tabs-container whitebg">
+					<div class="pt10 pl5 pr5">
+						<ul class="nav nav-tabs" id="nav-tabs">
+							<li class="active" data-action="base">   
+								<a href="javascript:void(0);" >基本资料</a>
+							</li>
+							<li class="" data-action="functions">
+								<a href="javascript:void(0);"  >多功能输入</a>
+							</li>
+							<li class="" data-action="extends">
+								<a href="javascript:void(0);" >扩展属性</a>
+							</li>
+						</ul>
+						<div class="tab-content pt30 p30">               
+		
+						</div>     
+					</div>
+				</div>    
+		</div>
+		<!-- 隐藏域 -->
+		<input type="hidden" id="fansId" value="${fans.id }"/>
+	</body>
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/fans/fansExtendsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/fans/fansExtendsInfo.jsp
new file mode 100644
index 0000000..592687a
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/fans/fansExtendsInfo.jsp
@@ -0,0 +1,201 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>           
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> 
+<div class="tab-pane active">      
+	<div class="animated fadeInRight">
+		<div class="whitebg pl10 pr10">
+			<table class="table table-striped table-bordered table-hover">     
+				<thead> 
+					<tr>  
+						<th class="textc">序号</th>         
+						<th class="textc wp15">流水账号</th>
+						<th class="textc">日期</th>         
+						<th class="textc">财务类别</th>     
+						<th class="textc">金额</th>         
+						<th class="textc">银行</th>         
+						<th class="textc">发票</th>         
+						<th class="textc">客户名称</th>     
+						<th class="textc wp15">单号</th>    
+						<th class="textc">状态</th>         
+						<th class="textc">类别</th>         
+						<th class="textc">操作</th>         
+					</tr> 
+				</thead>
+				<tbody> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+                
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="green">支出</span></td>     
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+				</tbody>
+                
+			</table>  
+			<!-- footer -->  
+			<div class="clearfix mb10 pb20">          
+					<div class="layui-tab-item fr">       
+							<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+							<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>   
+							<div class="pagination dlblock vm" id="pagination"></div>
+							<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>            
+					</div>
+				</div>  
+		</div>      
+	</div>        
+</div>          
+                
+<script type="text/javascript">    
+//分页          
+$('#pagination').pagination({        
+	pageCount: 50,
+	jump: true,   
+	coping: true, 
+	homePage: '首页',    
+	endPage: '末页',     
+	prevContent: '上页', 
+	nextContent: '下页', 
+	callback: function(api) {          
+		$('.now').text(api.getCurrent());
+	}             
+});             
+</script>       
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/fans/fansFunctionsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/fans/fansFunctionsInfo.jsp
new file mode 100644
index 0000000..982ce84
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/fans/fansFunctionsInfo.jsp
@@ -0,0 +1,130 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>		
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">      
+<div class="tab-pane active">
+				<div class="panel-body">
+					<div class="wrapper wrapper-content">     
+						<div class="panel-form animated fadeInRight wp60 fc">
+							<!-- 账号资料 -->
+			<div class="layui-form-item 	has-error">
+				<label class="layui-form-label">单行输入框<i class="red">*</i></label>
+				<div class="layui-input-block">
+					<input type="text" name="title" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input">
+				</div>                                         
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">自定义验证</label>
+				<div class="layui-input-inline ml30">
+					<input type="password" name="password" lay-verify="pass" placeholder="请输入密码" autocomplete="off" class="layui-input">
+				</div>
+				<div class="layui-form-mid layui-word-aux">请填写6到12位密码</div>
+			</div>
+			<div class="form-group">
+				<div class="layui-form-item">          
+					<label class="layui-form-label">单行选择框</label>
+					<div class="layui-input-block">
+						<select name="interest" lay-filter="aihao">  
+							<option value=""></option>
+							<option value="0">写作</option>         
+							<option value="1" selected="">阅读</option>
+							<option value="2">游戏</option>
+							<option value="3">音乐</option>
+							<option value="4">旅行</option>  
+						</select>              
+					</div>
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<div class="layui-inline">  
+					<label class="layui-form-label">范围</label>
+					<div class="layui-input-inline ml30">
+						<input type="text" name="price_min" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>                                     
+					<div class="layui-form-mid">-</div>
+					<div class="layui-input-inline">       
+						<input type="text" name="price_max" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>
+				</div>           
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">联动选择框</label>
+				<div class="layui-input-inline ml30">
+					<select name="quiz1">     
+						<option value="">请选择省</option>
+						<option value="浙江" selected="">浙江省</option> 
+						<option value="你的工号">江西省</option>           
+						<option value="你最喜欢的老师">福建省</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz2">
+						<option value="">请选择市</option>
+						<option value="杭州">杭州</option>
+						<option value="宁波" disabled="">宁波</option>
+						<option value="温州">温州</option>
+						<option value="温州">台州</option>
+						<option value="温州">绍兴</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz3">
+						<option value="">请选择县/区</option>
+						<option value="西湖区">西湖区</option>
+						<option value="余杭区">余杭区</option>
+						<option value="拱墅区">临安市</option>
+					</select>
+				</div>    
+			</div>
+			<div class="layui-form-item" pane="">   
+				<label class="layui-form-label">原始复选框</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="like1[write]" lay-skin="primary" title="写作" checked="">  
+					<input type="checkbox" name="like1[read]" lay-skin="primary" title="阅读">
+					<input type="checkbox" name="like1[game]" lay-skin="primary" title="游戏" disabled="">
+				</div>
+			</div>
+
+			<div class="layui-form-item">
+				<label class="layui-form-label">开关-默认关</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="close" lay-skin="switch" lay-text="ON|OFF">
+				</div>
+			</div>
+			<div class="layui-form-item">  
+				<label class="layui-form-label">单选框</label>
+				<div class="layui-input-block">
+					<input type="radio" name="sex" value="男" title="男" checked="">
+					<input type="radio" name="sex" value="女" title="女">
+					<input type="radio" name="sex" value="禁" title="禁用" disabled="">
+				</div>
+			</div>
+			<!--<div class="layui-form-item layui-form-text">
+				<label class="layui-form-label">上传图片</label>
+				<div class="layui-input-block">
+					<div class="layui-upload-drag w200 h200">
+						<i class="layui-icon"></i>          
+						<p>点击上传</p>
+					</div>
+				</div>
+			</div>-->
+				<div class="layui-form-item layui-form-text">
+					<label class="layui-form-label">普通文本域</label>  
+					<div class="layui-input-block">              
+						<textarea placeholder="请输入内容" class="layui-textarea"></textarea>
+					</div>
+				</div>
+			</div>
+		</div>   
+	</div>
+</div>
+</form>   
+<script type="text/javascript">
+	//form表单样式
+	layui.use(['layer', 'form'], function() {    
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+</script>                 
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/fans/fansList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/fans/fansList.jsp
new file mode 100644
index 0000000..d4c87f7
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/fans/fansList.jsp
@@ -0,0 +1,131 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black">
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->
+<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+<jsp:include page="../../common.jsp" />
+<script type="text/javascript">
+     require("js/fans/fansList.js");
+</script>
+
+	<style>
+		.layui-table th {
+			text-align: center;
+		}
+	</style>
+</head>
+<body>
+	<div class="row animated fadeInRight" style="margin: 0;">
+		<div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+			<div class="toolbar-panel bdd">
+				<div class="toolbar-box">
+					<div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+						<!-- 顶部按钮 -->
+						<div class="buttons fl">
+						<img alt="" src="" >
+							<a class="layui-btn layui-btn-sm fa fa-search f13" href="javascript:void(0);" onclick="queryFans()"><span>搜索</span></a>
+							<!-- <a class="layui-btn fa fa-plus f13 add" href="javascript:void(0);" onclick="initAddFans()"><span>添加</span></a>
+							<a class="layui-btn fa fa-edit f13" href="javascript:void(0);" onclick="initEditFans()"><span>编辑</span></a> 
+							<a class="layui-btn fa fa-remove f13 delete" href="javascript:void(0);" onclick="initBatchDeleteFans()"><span>删除</span></a> --> 
+						</div>
+						<div class="tools fr">
+							<a href="javascript:void(0);" class="collapse dblock f14 dgray mr5"> 
+								<i class="fa-2x fa fa-angle-double-up"></i>
+							</a>
+						</div>
+					</div>
+				</div>
+				<!--搜索条件 -->
+				<div class="toolbar-body">
+					<div class="row pt10 pb10 whitebg ml0 mr0">
+						<span class="dlblock w100 textr">昵称：</span> 
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+							<input type="text" placeholder="请输入内容" id="nickName">  
+						</span> 
+						<span class="dlblock w100 textr">本次消费商家：</span> 
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+							<input type="text" placeholder="请输入内容" id="merchantName">  
+						</span> 
+						<span class="dlblock w100 textr">上次消费商家：</span> 
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+							<input type="text" placeholder="请输入内容" id="lastMerchantName">  
+						</span> 
+						<span class="dlblock w100 textr">本次订单号：</span> 
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+							<input type="text" placeholder="请输入内容" id="orderNumber">  
+						</span>
+						<br>
+						<br>
+						<span class="dlblock w100 textr">上次订单号：</span> 
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+							<input type="text" placeholder="请输入内容" id="lastOrderNumber">  
+						</span>
+						<span class="dlblock w100 textr">开始日期</span>
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+							 <input type="text" placeholder="" id="date1" class="w150">
+							 <i class="fa fa-calendar"></i>
+						</span> 
+						<span class="dlblock w100 textr">结束日期</span>
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+						<input type="text" placeholder="" id="date2" class="w150"> 
+							<i class="fa fa-calendar"></i>
+						</span>
+					</div>
+				</div>
+			</div>
+		</div>
+		<!-- 表单数据 -->
+		<div class="mb20 mt10">
+			<div class="whitebg pl10 pr10">
+				<table class="layui-table">
+					<thead>
+						<tr>
+							<th class="textc">
+								<div class="checker" id="allCheck">
+									<span class=""><input type="checkbox" value="" ></span>
+								</div>
+							</th>
+							<th class="textc ">序号</th>
+							 <th class="textc">头像</th>
+							<th class="textc ">昵称</th>
+							<th class="textc ">本次消费金额</th>
+							<th class="textc ">本次消费商家</th>
+							<th class="textc ">本次消费时间</th>
+							<!-- <th class="textc ">上一次消费时间</th> -->
+							<th class="textc ">本次订单号</th>
+							<th class="textc ">上次消费商家</th>
+							<th class="textc ">上一次订单号</th>
+							<th class="textc ">分润金额</th>
+						</tr>
+					</thead>
+					<!-- 数据体 -->
+					<tbody id="data_content">
+					</tbody>
+				</table>
+			
+			<!-- footer -->
+				<div class="clearfix mb10 pb20">
+						<div class="layui-tab-item fr">
+								<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+								<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>
+								<div class="pagination dlblock vm" id="pagination"></div>
+								<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>
+						</div>
+					</div>
+	       <input type="hidden" value="${admin }" id="admin"/>
+			</div>
+		</div>
+	</div>
+</body>
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/fansConsumReturn/fansConsumReturnBaseInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/fansConsumReturn/fansConsumReturnBaseInfo.jsp
new file mode 100644
index 0000000..1445d68
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/fansConsumReturn/fansConsumReturnBaseInfo.jsp
@@ -0,0 +1,63 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">  
+	<div class="tab-pane active">     
+		<div class="panel-body">
+			<div class="wrapper wrapper-content">
+				<div class="panel-form animated fadeInRight wp60 fc">
+					<div class="layui-form-item dn	has-error" >   
+						<label class="layui-form-label">id</label>  
+						<div class="layui-input-block">
+							<input type="text" name="id" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${fansConsumReturn.id }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">logo</label>  
+						<div class="layui-input-block">
+							<input type="text" name="logo" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${fansConsumReturn.logo }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">nickName</label>  
+						<div class="layui-input-block">
+							<input type="text" name="nickName" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${fansConsumReturn.nickName }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">consumMony</label>  
+						<div class="layui-input-block">
+							<input type="text" name="consumMony" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${fansConsumReturn.consumMony }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">merchantCode</label>  
+						<div class="layui-input-block">
+							<input type="text" name="merchantCode" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${fansConsumReturn.merchantCode }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">merchantName</label>  
+						<div class="layui-input-block">
+							<input type="text" name="merchantName" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${fansConsumReturn.merchantName }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">returnMoney</label>  
+						<div class="layui-input-block">
+							<input type="text" name="returnMoney" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${fansConsumReturn.returnMoney }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">consumTime</label>  
+						<div class="layui-input-block">
+							<input type="text" name="consumTime" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${fansConsumReturn.consumTime }" >
+						</div>  
+					</div>
+	
+				</div>
+			</div>
+		</div>  
+	</div>
+</form>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/fansConsumReturn/fansConsumReturnDetails.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/fansConsumReturn/fansConsumReturnDetails.jsp
new file mode 100644
index 0000000..8a904cb
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/fansConsumReturn/fansConsumReturnDetails.jsp
@@ -0,0 +1,54 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>     
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">                      
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black"> 
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> 
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->                                     
+<meta name="viewport"
+	content="width=device-width, initial-scale=1.0, maximum-scale=1.0">   
+<jsp:include page="../../common.jsp" />
+<script type="text/javascript">
+    require("js/fansConsumReturn/fansConsumReturnDetails.js");
+</script>
+<title>编辑</title>
+</head>                                 
+	<body class="lgraybg">            
+		<div class="	container-fluid animated fadeInRight col-sm-12">
+			<div class="panel-toolbar mt10 mb10 pt5 pb5 pl10 bdd whitebg">
+				<div class="buttons">
+					<a href="javascript:void(0);" class="btn btn-primary fa fa-save f12"><span>保存</span></a>
+					<a href="${ctx }/fansConsumReturn/index?pageIndex=${pageIndex}"  class="btn btn-primary fa fa-back f12" id="goback"><span>返回</span></a>
+				</div>
+			</div>
+				<div class="tabs-container whitebg">
+					<div class="pt10 pl5 pr5">
+						<ul class="nav nav-tabs" id="nav-tabs">
+							<li class="active" data-action="base">   
+								<a href="javascript:void(0);" >基本资料</a>
+							</li>
+							<li class="" data-action="functions">
+								<a href="javascript:void(0);"  >多功能输入</a>
+							</li>
+							<li class="" data-action="extends">
+								<a href="javascript:void(0);" >扩展属性</a>
+							</li>
+						</ul>
+						<div class="tab-content pt30 p30">               
+		
+						</div>     
+					</div>
+				</div>    
+		</div>
+		<!-- 隐藏域 -->
+		<input type="hidden" id="fansConsumReturnId" value="${fansConsumReturn.id }"/>
+	</body>
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/fansConsumReturn/fansConsumReturnExtendsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/fansConsumReturn/fansConsumReturnExtendsInfo.jsp
new file mode 100644
index 0000000..592687a
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/fansConsumReturn/fansConsumReturnExtendsInfo.jsp
@@ -0,0 +1,201 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>           
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> 
+<div class="tab-pane active">      
+	<div class="animated fadeInRight">
+		<div class="whitebg pl10 pr10">
+			<table class="table table-striped table-bordered table-hover">     
+				<thead> 
+					<tr>  
+						<th class="textc">序号</th>         
+						<th class="textc wp15">流水账号</th>
+						<th class="textc">日期</th>         
+						<th class="textc">财务类别</th>     
+						<th class="textc">金额</th>         
+						<th class="textc">银行</th>         
+						<th class="textc">发票</th>         
+						<th class="textc">客户名称</th>     
+						<th class="textc wp15">单号</th>    
+						<th class="textc">状态</th>         
+						<th class="textc">类别</th>         
+						<th class="textc">操作</th>         
+					</tr> 
+				</thead>
+				<tbody> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+                
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="green">支出</span></td>     
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+				</tbody>
+                
+			</table>  
+			<!-- footer -->  
+			<div class="clearfix mb10 pb20">          
+					<div class="layui-tab-item fr">       
+							<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+							<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>   
+							<div class="pagination dlblock vm" id="pagination"></div>
+							<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>            
+					</div>
+				</div>  
+		</div>      
+	</div>        
+</div>          
+                
+<script type="text/javascript">    
+//分页          
+$('#pagination').pagination({        
+	pageCount: 50,
+	jump: true,   
+	coping: true, 
+	homePage: '首页',    
+	endPage: '末页',     
+	prevContent: '上页', 
+	nextContent: '下页', 
+	callback: function(api) {          
+		$('.now').text(api.getCurrent());
+	}             
+});             
+</script>       
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/fansConsumReturn/fansConsumReturnFunctionsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/fansConsumReturn/fansConsumReturnFunctionsInfo.jsp
new file mode 100644
index 0000000..982ce84
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/fansConsumReturn/fansConsumReturnFunctionsInfo.jsp
@@ -0,0 +1,130 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>		
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">      
+<div class="tab-pane active">
+				<div class="panel-body">
+					<div class="wrapper wrapper-content">     
+						<div class="panel-form animated fadeInRight wp60 fc">
+							<!-- 账号资料 -->
+			<div class="layui-form-item 	has-error">
+				<label class="layui-form-label">单行输入框<i class="red">*</i></label>
+				<div class="layui-input-block">
+					<input type="text" name="title" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input">
+				</div>                                         
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">自定义验证</label>
+				<div class="layui-input-inline ml30">
+					<input type="password" name="password" lay-verify="pass" placeholder="请输入密码" autocomplete="off" class="layui-input">
+				</div>
+				<div class="layui-form-mid layui-word-aux">请填写6到12位密码</div>
+			</div>
+			<div class="form-group">
+				<div class="layui-form-item">          
+					<label class="layui-form-label">单行选择框</label>
+					<div class="layui-input-block">
+						<select name="interest" lay-filter="aihao">  
+							<option value=""></option>
+							<option value="0">写作</option>         
+							<option value="1" selected="">阅读</option>
+							<option value="2">游戏</option>
+							<option value="3">音乐</option>
+							<option value="4">旅行</option>  
+						</select>              
+					</div>
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<div class="layui-inline">  
+					<label class="layui-form-label">范围</label>
+					<div class="layui-input-inline ml30">
+						<input type="text" name="price_min" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>                                     
+					<div class="layui-form-mid">-</div>
+					<div class="layui-input-inline">       
+						<input type="text" name="price_max" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>
+				</div>           
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">联动选择框</label>
+				<div class="layui-input-inline ml30">
+					<select name="quiz1">     
+						<option value="">请选择省</option>
+						<option value="浙江" selected="">浙江省</option> 
+						<option value="你的工号">江西省</option>           
+						<option value="你最喜欢的老师">福建省</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz2">
+						<option value="">请选择市</option>
+						<option value="杭州">杭州</option>
+						<option value="宁波" disabled="">宁波</option>
+						<option value="温州">温州</option>
+						<option value="温州">台州</option>
+						<option value="温州">绍兴</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz3">
+						<option value="">请选择县/区</option>
+						<option value="西湖区">西湖区</option>
+						<option value="余杭区">余杭区</option>
+						<option value="拱墅区">临安市</option>
+					</select>
+				</div>    
+			</div>
+			<div class="layui-form-item" pane="">   
+				<label class="layui-form-label">原始复选框</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="like1[write]" lay-skin="primary" title="写作" checked="">  
+					<input type="checkbox" name="like1[read]" lay-skin="primary" title="阅读">
+					<input type="checkbox" name="like1[game]" lay-skin="primary" title="游戏" disabled="">
+				</div>
+			</div>
+
+			<div class="layui-form-item">
+				<label class="layui-form-label">开关-默认关</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="close" lay-skin="switch" lay-text="ON|OFF">
+				</div>
+			</div>
+			<div class="layui-form-item">  
+				<label class="layui-form-label">单选框</label>
+				<div class="layui-input-block">
+					<input type="radio" name="sex" value="男" title="男" checked="">
+					<input type="radio" name="sex" value="女" title="女">
+					<input type="radio" name="sex" value="禁" title="禁用" disabled="">
+				</div>
+			</div>
+			<!--<div class="layui-form-item layui-form-text">
+				<label class="layui-form-label">上传图片</label>
+				<div class="layui-input-block">
+					<div class="layui-upload-drag w200 h200">
+						<i class="layui-icon"></i>          
+						<p>点击上传</p>
+					</div>
+				</div>
+			</div>-->
+				<div class="layui-form-item layui-form-text">
+					<label class="layui-form-label">普通文本域</label>  
+					<div class="layui-input-block">              
+						<textarea placeholder="请输入内容" class="layui-textarea"></textarea>
+					</div>
+				</div>
+			</div>
+		</div>   
+	</div>
+</div>
+</form>   
+<script type="text/javascript">
+	//form表单样式
+	layui.use(['layer', 'form'], function() {    
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+</script>                 
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/fansConsumReturn/fansConsumReturnList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/fansConsumReturn/fansConsumReturnList.jsp
new file mode 100644
index 0000000..542ce9f
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/fansConsumReturn/fansConsumReturnList.jsp
@@ -0,0 +1,117 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black">
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->
+<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+<jsp:include page="../../common.jsp" />
+<script type="text/javascript">
+     require("js/fansConsumReturn/fansConsumReturnList.js");
+</script>
+</head>
+<body>
+	<div class="row animated fadeInRight" style="margin: 0;">
+		<div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+			<div class="toolbar-panel bdd">
+				<div class="toolbar-box">
+					<div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+						<!-- 顶部按钮 -->
+						<div class="buttons fl">
+							<a class="btn btn-primary fa fa-search f13" href="javascript:void(0);" onclick="queryFansConsumReturn()"><span>搜索</span></a>
+							<!-- <a class="btn btn-primary fa fa-plus f13 add" href="javascript:void(0);" onclick="initAddFansConsumReturn()"><span>添加</span></a>
+							<a class="btn btn-primary fa fa-edit f13" href="javascript:void(0);" onclick="initEditFansConsumReturn()"><span>编辑</span></a> 
+							<a class="btn btn-primary fa fa-remove f13 delete" href="javascript:void(0);" onclick="initBatchDeleteFansConsumReturn()"><span>删除</span></a> --> 
+						</div>
+						<div class="tools fr">
+							<a href="javascript:void(0);" class="collapse dblock f14 dgray mr5"> 
+								<i class="fa-2x fa fa-angle-double-up"></i>
+							</a>
+						</div>
+					</div>
+				</div>
+
+				<!--搜索条件 -->
+				<div class="toolbar-body">
+					<div class="row pt10 pb10 whitebg ml0 mr0">
+						<span class="dlblock w100 textr">昵称：</span> 
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+							<input type="text" placeholder="请输入内容" id="nickName">  
+						</span> 
+						<!-- <span class="dlblock w100 textr">名称：</span> 
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+							<input type="text" placeholder="请输入名称">
+						</span> 
+						<span class="dlblock w100 textr">类别：</span>
+						 <select class="form-control f12 w180 textc">
+							<option value="">支出</option>
+							<option value="">收入</option>
+						</select> -->
+					</div>
+					<div class="mt10 dn mb20">
+						<span class="dlblock w100 textr">开始日期</span>
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+							 <input type="text" placeholder="" id="date1" class="w150">
+							 <i class="fa fa-calendar"></i>
+						</span> 
+						<span class="dlblock w100 textr">结束日期</span>
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+						<input type="text" placeholder="" id="date2" class="w150"> 
+							<i class="fa fa-calendar"></i>
+						</span>
+					</div>
+				</div>
+			</div>
+		</div>
+		<!-- 表单数据 -->
+		<div class="mb20 mt10">
+			<div class="whitebg pl10 pr10">
+				<table class="table table-striped table-bordered table-hover">
+					<thead>
+						<tr>
+							<th class="textc">
+								<div class="checker" id="allCheck">
+									<span class=""><input type="checkbox" value="" ></span>
+								</div>
+							</th>
+							<th class="textc ">id</th>
+							<th class="textc ">昵称</th>
+							<th class="textc ">头像</th>
+							<th class="textc ">消费金额</th>
+							<!-- <th class="textc wp15">merchantCode</th> -->
+							<th class="textc ">商家名称</th>
+							<th class="textc ">返现金额</th>
+							<th class="textc ">消费时间</th>
+							<!-- <th class="textc">编辑</th> -->
+						</tr>
+					</thead>
+					<!-- 数据体 -->
+					<tbody id="data_content">
+					</tbody>
+				</table>
+			
+			<!-- footer -->
+				<div class="clearfix mb10 pb20">
+						<div class="layui-tab-item fr">
+								<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+								<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>
+								<div class="pagination dlblock vm" id="pagination"></div>
+								<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>
+						</div>
+					</div>
+	
+			</div>
+		</div>
+	</div>
+</body>
+
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/guideLabel/detail.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/guideLabel/detail.jsp
new file mode 100644
index 0000000..91dbb61
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/guideLabel/detail.jsp
@@ -0,0 +1,85 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp" />
+</head>
+<body>
+<form class="layui-form" action="" style="width: 70%">
+    <input name="id" value="${entity.id}" hidden/>
+    <div class="layui-form-item">
+        <label class="layui-form-label">话术名称</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="name" value="${entity.name}"  maxlength="12" placeholder="话术名称" autocomplete="off" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">是否选中</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <select name="status" class="layui-select" lay-verify="required">
+                    <option value="">请选择</option>
+                    <option value="0" ${entity.status == '0' ? 'selected' : ''}>否</option>
+                    <option value="1" ${entity.status == '1' ? 'selected' : ''}>是</option>
+                </select>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button class="layui-btn" lay-submit lay-filter="formDemo">立即提交</button>
+            <button type="button" id="close" class="layui-btn layui-btn-primary">关闭</button>
+        </div>
+    </div>
+</form>
+
+<script>
+    //Demo
+    layui.use(['form','layer'], function(){
+        var form = layui.form;
+        var layer = layui.layer;
+        $('#close').click(function() {
+            parent.layer.closeAll();
+        });
+            //监听提交
+        form.on('submit(formDemo)', function(data){
+            var index = layer.load(1,{shade: [0.1,'#000'] });
+            $.ajax({
+                url: '${ctx}/guideLabel/save',
+                method: 'post',
+                data: JSON.stringify(data.field),
+                dataType: 'JSON',
+                contentType:"application/json",
+                success: function(res) {
+                    layer.close(index);
+                    if(res.code == 200) {
+                        layer.msg(res.message, { icon: 1, time: 1000 }, function () {
+                            var index = parent.layer.getFrameIndex(window.name);
+                            parent.layui.table.reload('guideLabel');
+                            parent.layer.close(index);
+                        });
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 2
+                        });
+                    }
+                }
+            })
+            return false;
+        });
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/guideLabel/list.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/guideLabel/list.jsp
new file mode 100644
index 0000000..035f98d
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/guideLabel/list.jsp
@@ -0,0 +1,172 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp" />
+</head>
+<body>
+
+<form class="layui-form" id="form1" action="" style="margin-top: 30px;">
+    <div class="layui-inline">
+        <label class="layui-form-label">话术名称</label>
+        <div class="layui-input-block">
+            <input type="text" name="name" id="name" placeholder="请输入话术名称" autocomplete="off" class="layui-input">
+        </div>
+    </div>
+</form>
+<table class="layui-hide" id="guideLabelTab" lay-filter="guideLabelTab"></table>
+
+<script type="text/html" id="leftBar">
+    <button type="button" class="layui-btn layui-btn-sm" lay-event="add"><i class="layui-icon">&#xe608;</i>新增</button>
+    <button type="button" class="layui-btn layui-btn-normal layui-btn-sm" lay-event="search"><i class="layui-icon">&#xe615;</i>查询</button>
+</script>
+
+<script type="text/html" id="toolBar">
+    <button type="button" class="layui-btn layui-btn-sm" lay-event="edit"><i class="layui-icon">&#xe642;</i>编辑</button>
+    <button type="button" class="layui-btn layui-btn-sm layui-btn-danger" lay-event="del"><i class="layui-icon">&#xe640;</i>删除</button>
+</script>
+
+<script>
+    layui.use(['table', 'layer'], function(){
+        var table = layui.table;
+        var layer = layui.layer;
+
+        var tableIns = table.render({
+            elem: '#guideLabelTab'
+            ,url:'${ctx}/guideLabel/page'
+            ,id: 'guideLabel'
+            ,response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                ,countName: 'count' //数据总数的字段名称，默认：count
+                ,dataName: 'data' //默数据列表的字段名称，认：data
+                ,statusCode : 200
+            }
+            ,parseData: function(res){ //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            ,toolbar: '#leftBar' //开启头部工具栏，并为其绑定左侧模板
+            , defaultToolbar: ['filter']
+            ,defaultToolbar: ['filter', 'exports', 'print', { //自定义头部工具栏右侧图标。如无需自定义，去除该参数即可
+                title: '提示'
+                ,layEvent: 'LAYTABLE_TIPS'
+                ,icon: 'layui-icon-tips'
+            }]
+            ,title: '通用引导话术信息表'
+            ,cols: [[
+                {type: 'checkbox', fixed: 'left', hidden: true}
+                ,{field:'numbers', title:'序号', fixed: 'left', unresize: true, width:80, type:'numbers'}
+                ,{field:'name', title:'话术名称'}
+                ,{field:'status', title:'是否选中',templet: function (d) {
+                    if(d.status === '1'){
+                        return "<span style='color: green'>是</span>"
+                    }else{
+                        return "<span style='color: red'>否</span>"
+                    }
+                 }}
+                ,{field: 'createTime', title: '创建时间', width: 160,templet : "<div>{{layui.util.toDateString(d.createTime,'yyyy-MM-dd HH:mm:ss')}}</div>"}
+                ,{field: 'updateTime', title: '修改时间', width: 160,templet : "<div>{{layui.util.toDateString(d.updateTime,'yyyy-MM-dd HH:mm:ss')}}</div>"}
+                ,{fixed: 'right', title:'操作',width:200, toolbar: '#toolBar'}
+            ]]
+            ,request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                ,limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            ,page: true
+        });
+        table.on('tool(guideLabelTab)', function(obj){ //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            var data = obj.data; //获得当前行数据
+            var layEvent = obj.event; //获得 lay-event 对应的值（也可以是表头的 event 参数对应的值）
+            if(layEvent === 'del'){ //删除
+                layer.confirm('真的删除么?',{icon:3},function(index){
+                    obj.del(); //删除对应行（tr）的DOM结构，并更新缓存
+                    layer.close(index);
+                    del(data);
+                    //向服务端发送删除指令
+                });
+            } else if(layEvent === 'edit'){ //编辑
+                //do something
+                toAdd(obj.data);
+                //同步更新缓存对应的值
+                // obj.update({
+                //     username: '123'
+                //     ,title: 'xxx'
+                // });
+            }
+        });
+
+        //监听头工具栏事件
+        table.on('toolbar(guideLabelTab)', function (obj) {
+            switch (obj.event) {
+                case 'add':
+                    // 添加
+                    toAdd();
+                    break;
+                case 'search':
+                    var params= serialize($('#form1'));
+                    table.reload('guideLabel', {
+                        where: params
+                        , page: {
+                            size: 10
+                            , current: 1
+                        }
+                    });
+                    break;
+            }
+        });
+        function toAdd(obj) {
+            var url = '${ctx}/guideLabel/detail';
+            var title = "新增";
+            if(obj != undefined){
+                url = "${ctx}/guideLabel/detail/"+obj.id;
+                title = "编辑"
+            }
+            var index = layer.open({
+                type: 2
+                ,shade: 0.5
+                ,title: title
+                ,maxmin: true
+                , content: url
+                , area: ['450px', '320px']
+                ,end:function () {
+
+                }
+            });
+        }
+        function del(obj) {
+            $.ajax({
+                url: '${ctx}/guideLabel/del/'+obj.id,
+                method: 'DELETE',
+                dataType: 'JSON',
+                contentType:"application/json",
+                success: function(res) {
+                    if(res.code == 200) {
+                        layer.msg(res.data, {
+                            icon: 1
+                        });
+                    } else {
+                        layer.msg(res.data, {
+                            icon: 2
+                        });
+                    }
+                }
+            })
+        }
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/helpVideo/helpVideoBaseInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/helpVideo/helpVideoBaseInfo.jsp
new file mode 100644
index 0000000..b0262f3
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/helpVideo/helpVideoBaseInfo.jsp
@@ -0,0 +1,219 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+    <style>
+        .layui-input, .layui-textarea {
+            border-color: #606060;
+        }
+    </style>
+</head>
+<body>
+<form class="layui-form" action="" style="width: 80%;margin-top: 20px">
+    <input name="id" value="${helpVideo.id}" hidden/>
+    <input name="videoUrl" value="${helpVideo.videoUrl}" hidden/>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">名称</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="name" value="${helpVideo.name}" placeholder="请输入名称" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">描述</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="content" value="${helpVideo.content}" placeholder="请输入描述" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">类型</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="type" value="${helpVideo.type}" placeholder="请输入类型" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">排序</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="sort" type="number" value="${helpVideo.sort == null? helpVideo.sort: 1}" placeholder="序号" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">上传视频</label>
+        <div class="layui-input-block" style="display: flex;justify-content: flex-start">
+            <input name="fileKey" id="fileKey" hidden/>
+            <input name="videoUrl" value="${helpVideo.videoUrl}" id="url" hidden/>
+            <input name="chooseFile" id="chooseFile" placeholder="浏览..." class="layui-input layui-col-xs6" readonly/>
+            <button type="button" class="layui-btn layui-btn-normal layui-col-xs3" id="uploadBtn">
+                上传
+            </button>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button class="layui-btn" lay-submit lay-filter="formDemo">立即提交</button>
+            <button type="button" id="close" class="layui-btn layui-btn-primary">关闭</button>
+        </div>
+    </div>
+
+    <!--弹出进度条-->
+    <div id="uploadLoadingDiv" style="display: none;">
+        <div class="layui-progress" lay-showpercent="true" lay-filter="js_upload_progress"
+             style="margin: 10px;margin-top: 20px;">
+            <div class="layui-progress-bar layui-bg-red" lay-percent="0%"></div>
+        </div>
+    </div>
+</form>
+
+<form id="ajaxForm" class="layui-form" style="width: 70%">
+    <input type="hidden" name="OSSAccessKeyId" id="accessid" value="${uploadParam.accessid}">
+    <input type="hidden" name="policy" id="policy" value="${uploadParam.policy}">
+    <input type="hidden" name="signature" id="signature" value="${uploadParam.signature}">
+    <input type="hidden" name="expire" id="expire" value="${uploadParam.expire}">
+    <input type="hidden" name="success_action_status" id="success_action_status" value="200">
+    <input type="hidden" name="key" id="key" value="${uploadParam.key}">
+    <input type="hidden" name="callBack" id="key2_callBack" value="${uploadParam.callBack}">
+</form>
+
+<script type="text/javascript">
+    layui.use(['form', 'upload', 'element', 'layer'], function () {
+        var form = layui.form;
+        var upload = layui.upload;
+        var layer = layui.layer
+        var element = layui.element;
+        element.init();
+        $('#close').click(function () {
+            parent.layer.closeAll();
+        });
+
+        //创建监听函数
+        var xhrOnProgress = function (fun) {
+            xhrOnProgress.onprogress = fun; //绑定监听
+            //使用闭包实现监听绑
+            return function () {
+                //通过$.ajaxSettings.xhr();获得XMLHttpRequest对象
+                var xhr = $.ajaxSettings.xhr();
+                //判断监听函数是否为函数
+                if (typeof xhrOnProgress.onprogress !== 'function')
+                    return xhr;
+                //如果有监听函数并且xhr对象支持绑定时就把监听函数绑定上去
+                if (xhrOnProgress.onprogress && xhr.upload) {
+                    xhr.upload.onprogress = xhrOnProgress.onprogress;
+                }
+                return xhr;
+            }
+        }
+        var openIndex = "";
+        upload.render({
+            elem: '#chooseFile', // 文件选择
+            accept: 'video',
+            url: '${uploadParam.host}',
+            exts: 'rm|mp4|rmvb|avi|wmv|flv|mov|mtv|3gp',
+            acceptMime: 'video/*',
+            method: 'POST',
+            auto: false, // 设置不自动提交
+            bindAction: '#uploadBtn', // 提交按钮
+            before: function () {
+                element.progress('js_upload_progress', '0%');//设置页面进度条
+                openIndex = layer.open({
+                    type: 1,
+                    title: '上传进度',
+                    closeBtn: 1, //不显示关闭按钮
+                    area: ['300px', '130px'],
+                    shadeClose: false, //开启遮罩关闭
+                    content: $("#uploadLoadingDiv").html(),
+                    offset: '100px'
+                });
+            }
+            , xhr: xhrOnProgress
+            , progress: function (value) {//上传进度回调 value进度值
+                element.progress('js_upload_progress', value + '%');//设置页面进度条
+            }
+            , choose: function (obj) {
+                var loading = layer.load(1, {shade: [0.1, '#000']});
+                var data = {};
+                obj.preview(function (index, file, result) {
+                    var fileName = file.name;
+                    $("#chooseFile").val(fileName);
+                    var suffix = fileName.substring(fileName.lastIndexOf('.') + 1, fileName.length);
+                    var key = '${uploadParam.key}' + "." + suffix;
+                    $("#key").val(key);
+                    $("#fileKey").val(key);
+                    data.OSSAccessKeyId = $('#accessid').val();
+                    data.policy = $('#policy').val();
+                    data.signature = $('#signature').val();
+                    data.expire = $('#expire').val();
+                    data.success_action_status = $('#success_action_status').val();
+                    data.callBack = $("#key2_callBack").val();
+                    data.key = key;
+                    layer.close(loading);
+                });
+                this.data = data;
+            },
+            done: function (res) {
+                layer.close(openIndex);
+                if (res.code == 200) {
+                    layer.msg("上传成功！")
+                    $("#url").val(res.url);
+                } else {
+                    layer.msg("上传失败！")
+                }
+            },
+            error: function (res) {
+                layer.msg(res.msg);
+            }
+        });
+
+        //关闭进度条提示
+        $(document).on('click', '.js_upload_progress_bar_sure', function () {
+            layer.close(layer.index);
+        });
+        //监听提交
+        form.on('submit(formDemo)', function (data) {
+            var index = layer.load(1, {shade: [0.1, '#000']});
+            $.ajax({
+                url: '${ctx}/helpVideo/saveOrUpdate',
+                method: 'post',
+                data: JSON.stringify(data.field),
+                dataType: 'JSON',
+                contentType: "application/json",
+                success: function (res) {
+                    layer.close(index);
+                    if (res.code == 200) {
+                        layer.alert(res.data, function () {
+                            parent.location.reload();
+                        })
+                    } else {
+                        layer.msg(res.data, {
+                            icon: 5
+                        });
+                    }
+                }
+            })
+            return false;
+        });
+    });
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/helpVideo/helpVideoBaseReadInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/helpVideo/helpVideoBaseReadInfo.jsp
new file mode 100644
index 0000000..82728c4
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/helpVideo/helpVideoBaseReadInfo.jsp
@@ -0,0 +1,69 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<script type="text/javascript">
+  window.UMEDITOR_HOME_URL = ctx + "/page/umeditor/";
+  var URL = window.UEDITOR_HOME_URL;
+</script>
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">  
+	<div class="tab-pane active">     
+		<div class="panel-body">
+			<div class="wrapper wrapper-content">
+				<div class="panel-form animated fadeInRight wp60 fc">
+					<div class="layui-form-item dn	has-error" >   
+						<label class="layui-form-label">id</label>  
+						<div class="layui-input-block">
+							<input type="text" name="id" lay-verify="title" autocomplete="off" readonly="readonly" class="layui-input" value="${helpVideo.id }" >
+						</div>  
+					</div>
+					
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">名称</label>  
+						<div class="layui-input-block">
+							<input type="text" name="name" id="name" lay-verify="title" autocomplete="off" readonly="readonly" class="layui-input" value="${helpVideo.name }" >
+						</div>  
+					</div>
+					<div class="layui-form-item    has-error" >   
+                        <label class="layui-form-label">视频类型</label>  
+                        <div class="layui-input-block">
+                            <input type="text" name="type" id="type" lay-verify="title" autocomplete="off" readonly="readonly" class="layui-input" value="${helpVideo.type }" >
+                        </div>  
+                    </div>
+                    
+                    <div class="layui-form-item layui-form-text" >
+                <label class="layui-form-label">上传视频</label>
+                <div class="layui-input-block">
+                    <div class=" w300 h200 postionr">
+                        <i class="layui-icon"></i>    
+                        <video width="300px" height="200px" controls id="video">
+                                <source src="${helpVideo.videoUrl }"  type="video/mp4"  id="demo2"></source>                        
+                        </video>
+                          <input type="hidden" name="videoUrl" value="${videoCourseChapterSection.videoUrl }"  id="videoUrl">
+                    </div>
+                </div>
+            </div> 
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">描述</label>  
+						<div class="layui-input-block">
+						  <textarea class="layui-textarea" rows="20" cols="120" name="content" id="content" readonly="readonly">${helpVideo.content }</textarea>
+						</div>  
+					</div>
+	
+				</div>
+			</div>
+		</div>  
+	</div>
+</form>
+<script type="text/javascript">
+    //form表单样式
+    layui.use(['layer', 'form'], function() {    
+        var layer = layui.layer,
+            form = layui.form;
+        form.render();
+    });
+   /*  $(function(){
+        UM.getEditor('content');
+        
+    }) */
+</script>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/helpVideo/helpVideoExtendsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/helpVideo/helpVideoExtendsInfo.jsp
new file mode 100644
index 0000000..592687a
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/helpVideo/helpVideoExtendsInfo.jsp
@@ -0,0 +1,201 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>           
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> 
+<div class="tab-pane active">      
+	<div class="animated fadeInRight">
+		<div class="whitebg pl10 pr10">
+			<table class="table table-striped table-bordered table-hover">     
+				<thead> 
+					<tr>  
+						<th class="textc">序号</th>         
+						<th class="textc wp15">流水账号</th>
+						<th class="textc">日期</th>         
+						<th class="textc">财务类别</th>     
+						<th class="textc">金额</th>         
+						<th class="textc">银行</th>         
+						<th class="textc">发票</th>         
+						<th class="textc">客户名称</th>     
+						<th class="textc wp15">单号</th>    
+						<th class="textc">状态</th>         
+						<th class="textc">类别</th>         
+						<th class="textc">操作</th>         
+					</tr> 
+				</thead>
+				<tbody> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+                
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="green">支出</span></td>     
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+				</tbody>
+                
+			</table>  
+			<!-- footer -->  
+			<div class="clearfix mb10 pb20">          
+					<div class="layui-tab-item fr">       
+							<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+							<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>   
+							<div class="pagination dlblock vm" id="pagination"></div>
+							<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>            
+					</div>
+				</div>  
+		</div>      
+	</div>        
+</div>          
+                
+<script type="text/javascript">    
+//分页          
+$('#pagination').pagination({        
+	pageCount: 50,
+	jump: true,   
+	coping: true, 
+	homePage: '首页',    
+	endPage: '末页',     
+	prevContent: '上页', 
+	nextContent: '下页', 
+	callback: function(api) {          
+		$('.now').text(api.getCurrent());
+	}             
+});             
+</script>       
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/helpVideo/helpVideoFunctionsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/helpVideo/helpVideoFunctionsInfo.jsp
new file mode 100644
index 0000000..982ce84
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/helpVideo/helpVideoFunctionsInfo.jsp
@@ -0,0 +1,130 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>		
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">      
+<div class="tab-pane active">
+				<div class="panel-body">
+					<div class="wrapper wrapper-content">     
+						<div class="panel-form animated fadeInRight wp60 fc">
+							<!-- 账号资料 -->
+			<div class="layui-form-item 	has-error">
+				<label class="layui-form-label">单行输入框<i class="red">*</i></label>
+				<div class="layui-input-block">
+					<input type="text" name="title" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input">
+				</div>                                         
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">自定义验证</label>
+				<div class="layui-input-inline ml30">
+					<input type="password" name="password" lay-verify="pass" placeholder="请输入密码" autocomplete="off" class="layui-input">
+				</div>
+				<div class="layui-form-mid layui-word-aux">请填写6到12位密码</div>
+			</div>
+			<div class="form-group">
+				<div class="layui-form-item">          
+					<label class="layui-form-label">单行选择框</label>
+					<div class="layui-input-block">
+						<select name="interest" lay-filter="aihao">  
+							<option value=""></option>
+							<option value="0">写作</option>         
+							<option value="1" selected="">阅读</option>
+							<option value="2">游戏</option>
+							<option value="3">音乐</option>
+							<option value="4">旅行</option>  
+						</select>              
+					</div>
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<div class="layui-inline">  
+					<label class="layui-form-label">范围</label>
+					<div class="layui-input-inline ml30">
+						<input type="text" name="price_min" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>                                     
+					<div class="layui-form-mid">-</div>
+					<div class="layui-input-inline">       
+						<input type="text" name="price_max" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>
+				</div>           
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">联动选择框</label>
+				<div class="layui-input-inline ml30">
+					<select name="quiz1">     
+						<option value="">请选择省</option>
+						<option value="浙江" selected="">浙江省</option> 
+						<option value="你的工号">江西省</option>           
+						<option value="你最喜欢的老师">福建省</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz2">
+						<option value="">请选择市</option>
+						<option value="杭州">杭州</option>
+						<option value="宁波" disabled="">宁波</option>
+						<option value="温州">温州</option>
+						<option value="温州">台州</option>
+						<option value="温州">绍兴</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz3">
+						<option value="">请选择县/区</option>
+						<option value="西湖区">西湖区</option>
+						<option value="余杭区">余杭区</option>
+						<option value="拱墅区">临安市</option>
+					</select>
+				</div>    
+			</div>
+			<div class="layui-form-item" pane="">   
+				<label class="layui-form-label">原始复选框</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="like1[write]" lay-skin="primary" title="写作" checked="">  
+					<input type="checkbox" name="like1[read]" lay-skin="primary" title="阅读">
+					<input type="checkbox" name="like1[game]" lay-skin="primary" title="游戏" disabled="">
+				</div>
+			</div>
+
+			<div class="layui-form-item">
+				<label class="layui-form-label">开关-默认关</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="close" lay-skin="switch" lay-text="ON|OFF">
+				</div>
+			</div>
+			<div class="layui-form-item">  
+				<label class="layui-form-label">单选框</label>
+				<div class="layui-input-block">
+					<input type="radio" name="sex" value="男" title="男" checked="">
+					<input type="radio" name="sex" value="女" title="女">
+					<input type="radio" name="sex" value="禁" title="禁用" disabled="">
+				</div>
+			</div>
+			<!--<div class="layui-form-item layui-form-text">
+				<label class="layui-form-label">上传图片</label>
+				<div class="layui-input-block">
+					<div class="layui-upload-drag w200 h200">
+						<i class="layui-icon"></i>          
+						<p>点击上传</p>
+					</div>
+				</div>
+			</div>-->
+				<div class="layui-form-item layui-form-text">
+					<label class="layui-form-label">普通文本域</label>  
+					<div class="layui-input-block">              
+						<textarea placeholder="请输入内容" class="layui-textarea"></textarea>
+					</div>
+				</div>
+			</div>
+		</div>   
+	</div>
+</div>
+</form>   
+<script type="text/javascript">
+	//form表单样式
+	layui.use(['layer', 'form'], function() {    
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+</script>                 
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/helpVideo/helpVideoList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/helpVideo/helpVideoList.jsp
new file mode 100644
index 0000000..47d1015
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/helpVideo/helpVideoList.jsp
@@ -0,0 +1,154 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black">
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->
+<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+<jsp:include page="../../common.jsp" />
+</head>
+<body>
+<table class="layui-hide" id="helpVideoTab" lay-filter="helpVideoTab"></table>
+
+<script type="text/html" id="toolbarDemo">
+	<div class="layui-btn-container">
+		<button class="layui-btn layui-btn-sm" lay-event="add">添加</button>
+		<button class="layui-btn layui-btn-sm" lay-event="search">查询</button>
+	</div>
+</script>
+
+<script type="text/html" id="barDemo">
+	<a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>
+	<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
+</script>
+
+<script>
+	layui.use(['table', 'layer'], function(){
+		var table = layui.table;
+		var layer = layui.layer;
+
+		var tableIns = table.render({
+			elem: '#helpVideoTab'
+			,url:'${ctx}/helpVideo/queryHelpVideoByPage'
+			,response: {
+				statusName: 'code' //数据状态的字段名称，默认：code
+				,countName: 'count' //数据总数的字段名称，默认：count
+				,dataName: 'data' //默数据列表的字段名称，认：data
+				,statusCode : 200
+			}
+			,parseData: function(res){ //res 即为原始返回的数据
+				return {
+					"code": res.code, //解析接口状态
+					"msg": res.message, //解析提示文本
+					"count": res.data.count, //解析数据长度
+					"data": res.data.data //解析数据列表
+				};
+			}
+			,toolbar: '#toolbarDemo' //开启头部工具栏，并为其绑定左侧模板
+			,defaultToolbar: ['filter', 'exports', 'print', { //自定义头部工具栏右侧图标。如无需自定义，去除该参数即可
+				title: '提示'
+				,layEvent: 'LAYTABLE_TIPS'
+				,icon: 'layui-icon-tips'
+			}]
+			,title: '系统帮助视频数据表'
+			,cols: [[
+				{type: 'checkbox', fixed: 'left', hidden: true}
+				,{field:'sort', title:'序号', fixed: 'left', unresize: true, width:80}
+				,{field:'id', title:'ID', fixed: 'left', unresize: true, width:80, sort: true}
+				,{field:'name', title:'名称'}
+				,{field:'type', title:'类型'}
+				,{field:'content', title:'描述'}
+				,{field:'videoUrl', title:'视频地址'}
+				,{field: 'createDt', title: '创建日期',width:160,templet : "<div>{{layui.util.toDateString(d.createDt,'yyyy-MM-dd HH:mm:ss')}}</div>"}
+				,{fixed: 'right', title:'操作', toolbar: '#barDemo'}
+			]]
+			,request: {
+				pageName: 'current' //页码的参数名称，默认：page
+				,limitName: 'size' //每页数据量的参数名，默认：limit
+			}
+			,page: true
+			,done: function () {
+				$("[data-field='forceUpdate']").children().each(function () {
+					if ($(this).text() == '0') {
+						$(this).text('否');
+					} else if ($(this).text() == '1') {
+						$(this).text('是');
+					}
+				});
+			}
+		});
+
+		//头工具栏事件
+		table.on('toolbar(helpVideoTab)', function(obj){
+			switch(obj.event){
+				case 'add':
+					// 添加
+					toAdd();
+					break;
+				case 'search':
+					// 查询
+					tableIns.reload();
+					break;
+			}
+		});
+
+		//监听行工具事件
+		table.on('tool(helpVideoTab)', function(obj){
+			var data = obj.data;
+			//console.log(obj)
+			if(obj.event === 'del'){
+				layer.confirm('真的删除行么?', function(index){
+					obj.del(data);
+					layer.close(index);
+					del(obj);
+				});
+			} else if(obj.event === 'edit'){
+				toAdd(obj.data);
+			}
+		});
+
+		function toAdd(obj) {
+			var url = '${ctx}/helpVideo/add';
+			if(obj != undefined){
+				url = "${ctx}/helpVideo/edit/"+obj.id
+			}
+			var index = layer.open({
+				type: 2
+				,shade: 0.5
+				,maxmin: true
+				, content: url
+				, area: ['550px', '500px']
+			});
+		}
+		function del(obj) {
+			$.ajax({
+				url: '${ctx}/helpVideo/delete',
+				method: 'post',
+				data: JSON.stringify(obj.data),
+				dataType: 'JSON',
+				contentType:"application/json",
+				success: function(res) {
+					if(res.code == 200) {
+						layer.msg(res.data, {
+							icon: 1
+						});
+					} else {
+						layer.msg(res.data, {
+							icon: 5
+						});
+					}
+				}
+			})
+		}
+	});
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/helpVideo/helpVideoReadDetails.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/helpVideo/helpVideoReadDetails.jsp
new file mode 100644
index 0000000..f1193c2
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/helpVideo/helpVideoReadDetails.jsp
@@ -0,0 +1,59 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>     
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">                      
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black"> 
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> 
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->                                     
+<meta name="viewport"
+	content="width=device-width, initial-scale=1.0, maximum-scale=1.0">   
+<jsp:include page="../../common.jsp" />
+<link rel="stylesheet" type="text/css" href="${ctx}/page/umeditor/themes/default/css/umeditor.css">
+<script type="text/javascript" src="${ctx}/page/umeditor/third-party/template.min.js"></script>
+<script type="text/javascript" src="${ctx}/page/umeditor/umeditor.config.js"></script>
+<script type="text/javascript" src="${ctx}/page/umeditor/umeditor.min.js"></script>
+<script type="text/javascript" src="${ctx}/page/umeditor/lang/zh-cn/zh-cn.js"></script>
+<script type="text/javascript">
+    require("helpVideo/helpVideoReadDetails.js");
+</script>
+<title>编辑</title>
+</head>                                 
+	<body class="lgraybg">            
+		<div class="	container-fluid animated fadeInRight col-sm-12">
+			<div class="panel-toolbar mt10 mb10 pt5 pb5 pl10 bdd whitebg">
+				<div class="buttons">
+					<!-- <a href="javascript:void(0);" class="btn btn-primary fa fa-save f12"><span>保存</span></a> -->
+					<a href="${ctx }/helpVideo/index?pageIndex=${pageIndex}"  class="btn btn-primary fa fa-back f12" id="goback"><span>返回</span></a>
+				</div>
+			</div>
+				<div class="tabs-container whitebg">
+					<div class="pt10 pl5 pr5">
+						<ul class="nav nav-tabs" id="nav-tabs">
+							<li class="active" data-action="base">   
+								<a href="javascript:void(0);" >基本资料</a>
+							</li>
+							<!-- <li class="" data-action="functions">
+								<a href="javascript:void(0);"  >多功能输入</a>
+							</li>
+							<li class="" data-action="extends">
+								<a href="javascript:void(0);" >扩展属性</a>
+							</li> -->
+						</ul>
+						<div class="tab-content pt30 p30">               
+		
+						</div>     
+					</div>
+				</div>    
+		</div>
+		<!-- 隐藏域 -->
+		<input type="hidden" id="helpVideoId" value="${helpVideo.id }"/>
+	</body>
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/index/first.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/index/first.jsp
new file mode 100644
index 0000000..fc14a91
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/index/first.jsp
@@ -0,0 +1,513 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+         pageEncoding="UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <jsp:include page="../../common.jsp"></jsp:include>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta name="viewport"
+          content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no">
+    <meta name="format-detection" content="telephone=no">
+    <%-- <link rel="shortcut icon" href="${resourcePath }/images/favicon.ico"
+        type="image/x-icon"> --%>
+    <link href="${resourcePath}/css/index/first.css" rel="stylesheet">
+    <meta name="keywords" content="">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <title>武汉荣商创银科技有限公司</title>
+    <script type="text/javascript">
+        require("js/nicescroll.min.js");
+        require("js/echarts.js");
+    </script>
+    <style type="text/css">
+        .flex-header{
+            width: 100%;
+            display: flex;
+            justify-content: space-between;
+        }
+        .count-data{
+            box-shadow: 0px 0px 10px #d4d4d4;
+            width: 25%;
+        }
+        .layui-icon{
+            font-size: 55px;
+            color: #f4516c;
+        }
+        .layui-icon-about{
+            color: #6c6c6c;
+            font-size: 23px;
+            margin-left: 5px;
+        }
+        .header-info{
+            display: flex;
+            justify-content: space-between;
+            padding: 25px 60px;
+            align-items: center;
+        }
+        .info{
+            line-height: 40px;
+        }
+        .label{
+            color: #535353;
+        }
+        .value{
+            font-size: 20px;
+        }
+    </style>
+</head>
+
+<body>
+<div class="container-first">
+    <div class="clearfix md-tj">
+        <div class="layui-col-md2 layui-col-sm4 layui-col-xs12 flex-header">
+            <div class="tj-body mt3 mb3 ml3 mr3 count-data" style="background-color: #fff;margin-top: 10px">
+                <div class="header-info">
+                    <i class="layui-icon layui-icon-rmb"></i>
+                    <div class="info">
+                        <div class="label">总交易额</div>
+                        <div class="value" id="transCount"></div>
+                    </div>
+                </div>
+            </div>
+            <div class="tj-body mt3 mb3 ml3 mr3 count-data" style="background-color: #fff;margin-top: 10px">
+                <div class="header-info">
+                    <i class="layui-icon layui-icon-form"></i>
+                    <div class="info">
+                        <div class="label">总笔数</div>
+                        <div class="value" id="transNum"></div>
+                    </div>
+                </div>
+            </div>
+            <div class="tj-body mt3 mb3 ml3 mr3 count-data" style="background-color: #fff;margin-top: 10px">
+                <div class="header-info">
+                    <i class="layui-icon layui-icon-user"></i>
+                    <div class="info">
+                        <div class="label">总用户数</div>
+                        <div class="value" id="promoterCount"></div>
+                    </div>
+                </div>
+            </div>
+            <div class="tj-body mt3 mb3 ml3 mr3 count-data" style="background-color: #fff;margin-top: 10px">
+                <div class="header-info">
+                    <i class="layui-icon layui-icon-home"></i>
+                    <div class="info">
+                        <div class="label">总商户数</div>
+                        <div class="value" id="merchantCount"></div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="clearfix md-tj">
+
+        <div class="tj-value">
+            <div class="pl20 pt10">
+                <span class="now-tj">今日实时数据统计</span>
+            </div>
+            <div class="tj-content pt5 pb10">
+                <div class="layui-col-md1 layui-col-sm0 layui-col-xs0">
+                </div>
+                <div class="layui-col-md2 layui-col-sm4 layui-col-xs12">
+                    <div class="tj-body mt3 mb3 ml3 mr3">
+                        <div class="md-pre-body">
+                            <div>收款金额<i class="layui-icon layui-icon-about" onmouseover="showTips(this)" onmouseout="closeTips()"></i></div>
+                            <div style="margin:5px 0;">
+                                <span id="toDayTransSum">￥0</span>
+                            </div>
+                        </div>
+                        <div class="md-type">
+                            <div class="md-positionr">
+                                <div class="md-desc">支付宝</div>
+                                <div class="md-number">
+                                    <span id="toDayTransZfbSum">￥0</span>
+                                </div>
+                            </div>
+                            <div class="md-line"></div>
+                            <div class="md-positionr">
+                                <div class="md-desc">微信</div>
+                                <div class="md-number">
+                                    <span id="toDayTransWxSum">￥0</span>
+                                </div>
+                            </div>
+                            <div class="md-line"></div>
+                            <div class="md-positionr">
+                                <div class="md-desc">云闪付</div>
+                                <div class="md-number">
+                                    <span id="toDayTransYsfSum">￥0</span>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="layui-col-md2 layui-col-sm4 layui-col-xs12">
+                    <div class="tj-body mt3 mb3 ml3 mr3">
+                        <div class="md-pre-body">
+                            <div>收款笔数</div>
+                            <div style="margin:5px 0;">
+                                <span id="toDayTransCount">0</span>
+                            </div>
+                        </div>
+                        <div class="md-type">
+                            <div class="md-positionr">
+                                <div class="md-desc">支付宝</div>
+                                <div class="md-number">
+                                    <span id="toDayTransZfbCount">0</span>
+                                </div>
+                            </div>
+                            <div class="md-line"></div>
+                            <div class="md-positionr">
+                                <div class="md-desc">微信</div>
+                                <div class="md-number">
+                                    <span id="toDayTransWxCount">0</span>
+                                </div>
+                            </div>
+                            <div class="md-line"></div>
+                            <div class="md-positionr">
+                                <div class="md-desc">云闪付</div>
+                                <div class="md-number">
+                                    <span id="toDayTransYsfCount">0</span>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="layui-col-md2 layui-col-sm4 layui-col-xs12">
+                    <div class="tj-body mt3 mb3 ml3 mr3">
+                        <div class="md-pre-body">
+                            <div>退款金额</div>
+                            <div style="margin:5px 0;">
+                                <span id="toDayRefundSum">￥0</span>
+                            </div>
+                        </div>
+                        <div class="md-type">
+                            <div class="md-positionr">
+                                <div class="md-desc">支付宝</div>
+                                <div class="md-number">
+                                    <span id="toDayRefundZfbSum">￥0</span>
+                                </div>
+                            </div>
+                            <div class="md-line"></div>
+                            <div class="md-positionr">
+                                <div class="md-desc">微信</div>
+                                <div class="md-number">
+                                    <span id="toDayRefundWxSum">￥0</span>
+                                </div>
+                            </div>
+                            <div class="md-line"></div>
+                            <div class="md-positionr">
+                                <div class="md-desc">云闪付</div>
+                                <div class="md-number">
+                                    <span id="toDayRefundYsfSum">￥0</span>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="layui-col-md2 layui-col-sm4 layui-col-xs12">
+                    <div class="tj-body mt3 mb3 ml3 mr3">
+                        <div class="md-pre-body">
+                            <div> 新增数量</div>
+                            <div style="margin:5px 0;">
+                                <span id="toDayAddCount">0</span>
+                            </div>
+                        </div>
+                        <div class="md-type">
+                            <div class="md-positionr">
+                                <div class="md-desc">门店</div>
+                                <div class="md-number">
+                                    <span id="toDayStoreCount">0</span>
+                                </div>
+                            </div>
+                            <div class="md-line"></div>
+                            <div class="md-positionr">
+                                <div class="md-desc">会员</div>
+                                <div class="md-number">
+                                    <span id="toDayMemberCount">0</span>
+                                </div>
+                            </div>
+                            <div class="md-line"></div>
+                            <div class="md-positionr">
+                                <div class="md-desc">推广员</div>
+                                <div class="md-number">
+                                    <span id="toDayPromoterCount">0</span>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="layui-col-md2 layui-col-sm4 layui-col-xs12">
+                    <div class="tj-body mt3 mb3 ml3 mr3">
+                        <div class="md-pre-body">
+                            <div>累计收益</div>
+                            <div style="margin:5px 0;">
+                                <span id="toDayAddMoneyCount">￥0</span>
+                            </div>
+                        </div>
+                        <div class="md-type">
+                            <div class="md-positionr">
+                                <div class="md-desc">推广分润</div>
+                                <div class="md-number">
+                                    <span id="toDayShareoneySum">￥0</span>
+                                </div>
+                            </div>
+                            <div class="md-line"></div>
+                            <div class="md-positionr">
+                                <div class="md-desc">粉丝奖励</div>
+                                <div class="md-number">
+                                    <span id="toDayFansShareMoneySum">￥0</span>
+                                </div>
+                            </div>
+                            <div class="md-line"></div>
+                            <div class="md-positionr">
+                                <div class="md-desc">收益</div>
+                                <div class="md-number">
+                                    <span id="toDayEarnings">￥0</span>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="md-tj">
+        <div class="tj-value">
+            <div class="pl20 pt10">
+                <span class="now-tj">昨日实时数据统计</span>
+            </div>
+            <div class="tj-content pt5 pb10">
+                <div class="layui-col-md1 layui-col-sm0 layui-col-xs0">
+                </div>
+                <div class="layui-col-md2 layui-col-sm4 layui-col-xs12">
+                    <div class="tj-body mt3 mb3 ml3 mr3">
+                        <div class="md-pre-body">
+                            <div> 收款金额</div>
+                            <div style="margin:5px 0;">
+                                <span id="yesterDayTransSum"></span>
+                            </div>
+                        </div>
+                        <div class="md-type">
+                            <div class="md-positionr">
+                                <div class="md-desc">支付宝</div>
+                                <div class="md-number">
+                                    <span id="yesterDayTransZfbSum"></span>
+                                </div>
+                            </div>
+                            <div class="md-line"></div>
+                            <div class="md-positionr">
+                                <div class="md-desc">微信</div>
+                                <div class="md-number">
+                                    <span id="yesterDayTransWxSum"></span>
+                                </div>
+                            </div>
+                            <div class="md-line"></div>
+                            <div class="md-positionr">
+                                <div class="md-desc">云闪付</div>
+                                <div class="md-number">
+                                    <span id="yesterDayTransYsfSum"></span>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="layui-col-md2 layui-col-sm4 layui-col-xs12">
+                    <div class="tj-body mt3 mb3 ml3 mr3">
+                        <div class="md-pre-body">
+                            <div> 收款笔数</div>
+                            <div style="margin:5px 0;">
+                                <span id="yesterDayTransCount"></span>
+                            </div>
+                        </div>
+                        <div class="md-type">
+                            <div class="md-positionr">
+                                <div class="md-desc">支付宝</div>
+                                <div class="md-number">
+                                    <span id="yesterDayTransZfbCount"></span>
+                                </div>
+                            </div>
+                            <div class="md-line"></div>
+                            <div class="md-positionr">
+                                <div class="md-desc">微信</div>
+                                <div class="md-number">
+                                    <span id="yesterDayTransWxCount"></span>
+                                </div>
+                            </div>
+                            <div class="md-line"></div>
+                            <div class="md-positionr">
+                                <div class="md-desc">云闪付</div>
+                                <div class="md-number">
+                                    <span id="yesterDayTransYsfCount"></span>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="layui-col-md2 layui-col-sm4 layui-col-xs12">
+                    <div class="tj-body mt3 mb3 ml3 mr3">
+                        <div class="md-pre-body">
+                            <div> 退款金额</div>
+                            <div style="margin:5px 0;">
+                                <span id="yesterDayRefundSum"></span>
+                            </div>
+                        </div>
+                        <div class="md-type">
+                            <div class="md-positionr">
+                                <div class="md-desc">支付宝</div>
+                                <div class="md-number">
+                                    <span id="yesterDayRefundZfbSum"></span>
+                                </div>
+                            </div>
+                            <div class="md-line"></div>
+                            <div class="md-positionr">
+                                <div class="md-desc">微信</div>
+                                <div class="md-number">
+                                    <span id="yesterDayRefundWxSum"></span>
+                                </div>
+                            </div>
+                            <div class="md-line"></div>
+                            <div class="md-positionr">
+                                <div class="md-desc">云闪付</div>
+                                <div class="md-number">
+                                    <span id="yesterDayRefundYsfSum"></span>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="layui-col-md2 layui-col-sm4 layui-col-xs12">
+                    <div class="tj-body mt3 mb3 ml3 mr3">
+                        <div class="md-pre-body">
+                            <div> 新增数量</div>
+                            <div style="margin:5px 0;">
+                                <span id="yesterDayAddCount"></span>
+                            </div>
+                        </div>
+                        <div class="md-type">
+                            <div class="md-positionr">
+                                <div class="md-desc">门店</div>
+                                <div class="md-number">
+                                    <span id="yesterDayStoreCount"></span>
+                                </div>
+                            </div>
+                            <div class="md-line"></div>
+                            <div class="md-positionr">
+                                <div class="md-desc">会员</div>
+                                <div class="md-number">
+                                    <span id="yesterDayMemberCount"></span>
+                                </div>
+                            </div>
+                            <div class="md-line"></div>
+                            <div class="md-positionr">
+                                <div class="md-desc">推广员</div>
+                                <div class="md-number">
+                                    <span id="yesterDayPromoterCount"></span>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="layui-col-md2 layui-col-sm4 layui-col-xs12">
+                    <div class="tj-body mt3 mb3 ml3 mr3">
+                        <div class="md-pre-body">
+                            <div>累计收益</div>
+                            <div style="margin:5px 0;">
+                                <span id="yesterDayAddMoneyCount"></span>
+                            </div>
+                        </div>
+                        <div class="md-type">
+                            <div class="md-positionr">
+                                <div class="md-desc">推广分润</div>
+                                <div class="md-number">
+                                    <span id="yesterDayShareoneySum"></span>
+                                </div>
+                            </div>
+                            <div class="md-line"></div>
+                            <div class="md-positionr">
+                                <div class="md-desc">粉丝奖励</div>
+                                <div class="md-number">
+                                    <span id="yesterDayFansShareMoneySum"></span>
+                                </div>
+                            </div>
+                            <div class="md-line"></div>
+                            <div class="md-positionr">
+                                <div class="md-desc">收益</div>
+                                <div class="md-number">
+                                    <span id="yesterDayEarnings"></span>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="md-tj pb20 layui-col-space5">
+        <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
+            <div class="echarts-model layui-col-md12 layui-col-sm12 layui-col-xs12">
+                <div class="row echarts-top">
+                    <div class="col-md-6  echarts-title">
+                        <div class="title-tab"></div>
+                        <span>数据统计</span>
+                    </div>
+                    <div class="col-md-6 textr">
+                        <div class="btn-group mr30" data-toggle="buttons" id="date_order">
+                            <label class="btn choose-btn active"> <input type="radio"
+                                                                         name="options1" value="1" autocomplete="off"
+                                                                         checked>
+                                交易金额
+                            </label> <label class="btn choose-btn"> <input type="radio"
+                                                                           name="options1" value="2" autocomplete="off">
+                            交易笔数
+                        </label>
+                        </div>
+                    </div>
+                </div>
+                <div class="echarts-md echartBox1">
+                    <div class="echarts-img" id="orderFee_date"></div>
+<%--                    <div class="echarts-img hidden" id="orderCount_date"></div>--%>
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-md6 layui-col-sm6 layui-col-xs12" style="float: right;">
+            <div class="echarts-model layui-col-md12 layui-col-sm12 layui-col-xs12">
+                <div class="row echarts-top">
+                    <div class="col-md-6 echarts-title">
+                        <div class="title-tab"></div>
+                        <span>支付通道占比</span>
+                    </div>
+                    <div class="col-md-6 textr">
+                        <div class="btn-group mr30" data-toggle="buttons" id="type_order">
+                            <label class="btn choose-btn active"> <input type="radio"
+                                                                         name="options2" value="1" autocomplete="off"
+                                                                         checked>
+                                交易金额
+                            </label> <label class="btn choose-btn"> <input type="radio"
+                                                                           name="options3" value="2" autocomplete="off">
+                            交易笔数
+                        </label>
+                        </div>
+                    </div>
+                </div>
+                <div class="echarts-md echartBox2">
+                    <div class="echarts-img" id="orderFee_payType"></div>
+<%--                    <div class="echarts-img hidden" id="orderCount_payType"></div>--%>
+                </div>
+            </div>
+        </div>
+        <div style="clear:both;"></div>
+    </div>
+</div>
+<script type="text/javascript" src="${resourcePath }/js/index/first.js"></script>
+<script type="text/javascript">
+    let layer;
+    layui.use(['layer'], function () {
+        layer = layui.layer;
+    });
+</script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/index/index.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/index/index.jsp
new file mode 100644
index 0000000..2debcb0
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/index/index.jsp
@@ -0,0 +1,197 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <jsp:include page="../../common.jsp"></jsp:include>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta name="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no">
+    <meta name="format-detection" content="telephone=no">
+    <link href="${resourcePath}/css/jquery.mCustomScrollbar.css" rel="stylesheet">
+    <meta name="keywords" content="">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <title>武汉融商创银科技有限公司</title>
+
+    <script type="text/javascript">
+        require("js/jquery.min.js");
+        require("js/main/main.js");
+        require("js/jquery.mCustomScrollbar.concat.min.js");
+        require("js/nicescroll.min.js");
+    </script>
+    <style type="text/css">
+        .layui-badge-dot{
+            width: 18px;
+            height: 18px;
+        }
+
+        .layui-nav-child {
+            padding: 1px 0;
+        }
+    </style>
+
+</head>
+
+<body style="overflow: hidden;">
+<div class="layui-layout layui-layout-admin">
+    <div class="layui-header">
+        <div class="layui-logo">
+            收银呗管理系统
+        </div>
+        <ul class="layui-nav layui-layout-right">
+            <li style="float: left">
+                <a href="javascript:void(0)"
+                   id="notification" style="line-height: 60px" >
+                    <i class="layui-icon layui-icon-notice" style="font-size: 30px;color: whitesmoke;"></i>
+                </a>
+                <div class="testc"></div>
+            </li>
+            <li class="layui-nav-item" style="float: right">
+                <a href="javascript:void(0)"
+                   id="manage-dropdown">
+                    <img src="${resourcePath}/images/default_use_image.png" alt="管理员相片" id="picture"
+                         class="w30 h30 vm dlblock">
+                    <span class="user-info vm overFont textl">欢迎您,管理员</span>
+                </a>
+                <dl class="layui-nav-child">
+                    <dd>
+                        <a href="javascript:void(0);" id="logout" onclick="logout()">
+                            <i class="ibps-icon fa fa-power-off"></i> 退出
+                        </a>
+                    </dd>
+                </dl>
+            </li>
+        </ul>
+    </div>
+    <!-- 主体内容 -->
+    <div class="main-container pt45" id="main-container">
+        <!-- 左侧的树 -->
+        <div class="layui-side layui-bg-black">
+            <div class="layui-side-scroll" id="leftMenu">
+            </div>
+        </div>
+        <div class="layui-body">
+            <div class="main-content">
+                <div class="page-content">
+                    <div class="page-content-area">
+                        <!--Tab部分开始-->
+                        <div class="content-tabs positionr bdbe h32 lgraybg mt2">
+                            <button class="J_tabLeft positiona w30 h30 textc zIndex99 top0 left0 bdre whitebg">
+                                <i class="fa fa-backward"></i>
+                            </button>
+                            <nav class="page-tabs J_menuTabs ml30 mr30">
+                                <div class="page-tabs-content fl">
+                                    <a href="javascript:void(0);"
+                                       class="J_menuTab active dblock fl bdrc pt7 pb6 pl15 pr15"><span
+                                            class="fa fa-home"></span>首页</a>
+                                </div>
+                            </nav>
+                            <button class="J_tabRight positiona w30 h30 textc zIndex99 top0 right0 bdle whitebg">
+                                <i class="fa fa-forward"></i>
+                            </button>
+                        </div>
+                        <!--主体部分开始-->
+
+                        <!-- 内容主体区域 -->
+                        <div class="J_mainContent res-menu">
+                            <iframe class="J_iframe" src="first" frameborder="0" scrolling="no" οnlοad="changeFrameHeight()"></iframe>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+</body>
+<script type="text/javascript">
+
+    $(document).ready(function(){
+        $.ajax({
+            url: ctx + "/notification/countStatus",
+            method: 'get',
+            dataType: 'JSON',
+            contentType: "application/json",
+            success: function (count) {
+                if (count > 0){
+                    $(".testc").html("<b><scan class=\"layui-badge-dot\" style=\"margin: -19px 18px 0;\"></scan></b>");
+                }
+            }
+        })
+    });
+
+    function adjustWidthHeight() {
+        var height = $(window).height();
+        $(".page-content-area").height(height - 45);
+    }
+
+    $(window).resize(function () {
+        adjustWidthHeight();
+    });
+
+    $(function () {
+        adjustWidthHeight();
+        //滚动条
+        $(".res-menu").niceScroll({
+            cursorcolor: "#ccc",
+            cursoropacitymax: 1,
+            touchbehavior: false,
+            cursorwidth: "4px",
+            cursorborder: "0",
+            cursorborderradius: "4px"
+        });
+
+        //退出
+        $("#manage-dropdown").click(function () {
+            $(this).siblings("ul").toggle();
+        })
+        //测导航栏收缩
+        // $("#sidebar-collapse").click(function() {
+        // 	$(this).parents("#sidebar").toggleClass("menu-min");
+        // 	$(this).find(".ibps-icon").toggleClass("fa-angle-double-right");
+        // 	$(".main-content").toggleClass("ml105");
+        // })
+        //顶部导航栏
+        $("#nav-menu li").click(
+            function () {
+                $(this).addClass("selected").siblings("li").removeClass(
+                    "selected");
+            });
+
+        $(".nav-list>li").hover(function () {
+            $(this).find(".submenu").show();
+            $(this).addClass("hover-show");
+
+        }, function () {
+            $(this).find(".submenu").hide();
+            $(this).removeClass("hover-show");
+        })
+        //面包屑导航栏
+        $(".page-tabs-content a").click(
+            function () {
+                $(this).addClass("active").siblings("a").removeClass(
+                    "active");
+                var index = $(".page-tabs-content a").index(this);
+                $(".J_mainContent iframe").eq(index).show().siblings(
+                    "iframe").hide();
+            })
+
+    });
+
+    function logout() {
+        $.ajax({
+            url: ctx + "/platform/logout",
+            type: 'POST',
+            dataType: 'json',
+            async: false,
+            success: function (data) {
+                parent.location.href = data.url
+            },
+            error: function (jqXHR, textStatus, errorThrown) {
+                console.log(jqXHR.status)
+                window.location = $('#logout').val();
+            }
+        })
+    }
+</script>
+
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/index/index2.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/index/index2.jsp
new file mode 100644
index 0000000..2087b49
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/index/index2.jsp
@@ -0,0 +1,250 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<!DOCTYPE html>
+<html>
+<head>
+    <jsp:include page="../../common.jsp"></jsp:include>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta name="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no">
+    <meta name="format-detection" content="telephone=no">
+    <link href="${resourcePath}/layuiadmin/style/admin.css" rel="stylesheet">
+    <meta name="keywords" content="">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <title>武汉融商创银科技有限公司</title>
+
+    <script type="text/javascript">
+        require("js/main/main.js");
+    </script>
+    <style type="text/css">
+        .layui-nav-child {
+            padding: 1px 0;
+        }
+
+        .layui-icon.layui-icon-notice {
+            font-size: 25px !important;
+        }
+
+        .layui-badge-dot {
+            width: 13px;
+            height: 13px;
+            margin-top: -12px !important;
+            margin-left: -10px !important;
+        }
+
+        .layui-form-label {
+            width: 96px;
+        }
+
+        .layui-body {
+            position: fixed !important;
+        }
+
+        .layadmin-iframe {
+            background-color: #ffffff;
+        }
+    </style>
+
+</head>
+
+<body class="layui-layout-body">
+<div id="LAY_app">
+    <div class="layui-layout layui-layout-admin">
+        <div class="layui-header">
+            <!-- 头部区域 -->
+            <ul class="layui-nav layui-layout-left">
+                <li class="layui-nav-item layadmin-flexible" lay-unselect>
+                    <a href="javascript:;" layadmin-event="flexible" title="侧边伸缩">
+                        <i class="layui-icon layui-icon-shrink-right" id="LAY_app_flexible"></i>
+                    </a>
+                </li>
+                <li class="layui-nav-item" lay-unselect>
+                    <a href="javascript:;" layadmin-event="refresh" title="刷新">
+                        <i class="layui-icon layui-icon-refresh-3"></i>
+                    </a>
+                </li>
+            </ul>
+            <ul class="layui-nav layui-layout-right" lay-filter="layadmin-layout-right">
+
+                <li class="layui-nav-item" lay-unselect>
+                    <a lay-text="消息通知" layadmin-event="message" lay-href="${ctx}/notification/index">
+                        <i class="layui-icon layui-icon-notice"></i>
+                        <!-- 如果有新消息，则显示小圆点 -->
+                        <span class="layui-badge-dot hide"></span>
+                    </a>
+                </li>
+                <li class="layui-nav-item layui-hide-xs" lay-unselect>
+                    <a href="javascript:;" layadmin-event="theme">
+                        <i class="layui-icon layui-icon-theme"></i>
+                    </a>
+                </li>
+                <li class="layui-nav-item layui-hide-xs" lay-unselect>
+                    <a href="javascript:;" layadmin-event="note">
+                        <i class="layui-icon layui-icon-note"></i>
+                    </a>
+                </li>
+                <li class="layui-nav-item layui-hide-xs" lay-unselect>
+                    <a href="javascript:;" layadmin-event="fullscreen">
+                        <i class="layui-icon layui-icon-screen-full"></i>
+                    </a>
+                </li>
+                <li class="layui-nav-item layui-hide-xs" lay-unselect>
+                    <a href="javascript:;" layadmin-event="openVideo">
+                        <i class="layui-icon layui-icon-mute" id="video-icon" style="font-size: 20px"></i>
+                        <span class="layui-badge audit-num" id="audit-num"></span>
+                    </a>
+                    <div class="layui-hide">
+                        <audio autoplay id="au" controls>
+                            <source src="${resourcePath}/css/2.mp3" type="audio/mpeg">
+                        </audio>
+                    </div>
+                </li>
+                <li class="layui-nav-item" lay-unselect>
+                    <a href="javascript:;">
+                        <cite>管理员</cite>
+                    </a>
+                    <dl class="layui-nav-child">
+                        <dd layadmin-event="logout" style="text-align: center;"><a>退出</a></dd>
+                    </dl>
+                </li>
+
+                <li class="layui-nav-item layui-show-xs-inline-block layui-hide-sm" lay-unselect>
+                    <a href="javascript:;" layadmin-event="more"><i class="layui-icon layui-icon-more-vertical"></i></a>
+                </li>
+            </ul>
+        </div>
+
+        <!-- 侧边菜单 -->
+        <div class="layui-side layui-side-menu">
+            <div class="layui-side-scroll">
+                <div class="layui-logo" lay-href="home/console.html">
+                    <span>收银呗管理平台</span>
+                </div>
+
+                <div class="layui-side layui-bg-black">
+                    <div class="layui-side-scroll" id="leftMenu">
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <!-- 页面标签 -->
+        <div class="layadmin-pagetabs" id="LAY_app_tabs">
+            <div class="layui-icon layadmin-tabs-control layui-icon-prev" layadmin-event="leftPage"></div>
+            <div class="layui-icon layadmin-tabs-control layui-icon-next" layadmin-event="rightPage"></div>
+            <div class="layui-icon layadmin-tabs-control layui-icon-down">
+                <ul class="layui-nav layadmin-tabs-select" lay-filter="layadmin-pagetabs-nav">
+                    <li class="layui-nav-item" lay-unselect>
+                        <a href="javascript:;"></a>
+                        <dl class="layui-nav-child layui-anim-fadein">
+                            <dd layadmin-event="closeThisTabs"><a href="javascript:;">关闭当前标签页</a></dd>
+                            <dd layadmin-event="closeOtherTabs"><a href="javascript:;">关闭其它标签页</a></dd>
+                            <dd layadmin-event="closeAllTabs"><a href="javascript:;">关闭全部标签页</a></dd>
+                        </dl>
+                    </li>
+                </ul>
+            </div>
+            <div class="layui-tab" lay-unauto lay-allowClose="true" lay-filter="layadmin-layout-tabs">
+                <ul class="layui-tab-title" id="LAY_app_tabsheader">
+                    <li lay-id="home/console.html" lay-attr="home/console.html" class="layui-this"><i
+                            class="layui-icon layui-icon-home"></i></li>
+                </ul>
+            </div>
+        </div>
+
+
+        <!-- 主体内容 -->
+        <div class="layui-body" id="LAY_app_body">
+            <div class="layadmin-tabsbody-item layui-show">
+                <iframe class="layadmin-iframe" frameborder="0" src="${ctx}/platform/first" title="内页"></iframe>
+            </div>
+        </div>
+
+        <!-- 辅助元素，一般用于移动设备下遮罩 -->
+        <div class="layadmin-body-shade" layadmin-event="shade"></div>
+    </div>
+</div>
+</body>
+<script type="text/javascript">
+
+    document.onselectstart = function () {
+        return false;
+    };
+
+    $(document).ready(function () {
+        $.ajax({
+            url: ctx + "/notification/countStatus",
+            method: 'get',
+            dataType: 'JSON',
+            contentType: "application/json",
+            success: function (count) {
+                if (count > 0) {
+                    $(".testc").html("<b><scan class=\"layui-badge-dot\" style=\"margin: -19px 18px 0;\"></scan></b>");
+                }
+            }
+        })
+        initAuditData();
+
+
+    });
+
+    function logout() {
+        $.ajax({
+            url: ctx + "/platform/logout",
+            type: 'POST',
+            async: false,
+            success: function (data) {
+                window.location.href = data.url
+            },
+            error: function (jqXHR, textStatus, errorThrown) {
+                console.log(jqXHR.status)
+                window.location = $('#logout').val();
+            }
+        })
+    }
+
+    var id = 0;
+
+    function initAuditData() {
+        getAuditData();
+        setInterval("getAuditData()", 5000);
+    }
+
+    function getAuditData() {
+        let status = window.localStorage.getItem("status");
+        $.ajax({
+            url: ctx + "/platform/getAuditData",
+            type: 'POST',
+            async: false,
+            success: function (res) {
+                if (res.code == 200) {
+                    let data = res.data;
+                    let count = 0;
+                    if (data.count) {
+                        count = data.count;
+                    }
+                    if (data.id && data.id != 0 && status == 1 && data.count > 0) {
+                        play(data.id);
+                    } else {
+                        pause();
+                    }
+                    $("#audit-num").html(count);
+                }
+            }
+        })
+    }
+
+    function play(nid) {
+        if (nid != id) {
+            id = nid;
+            $("#au")[0].play();
+        }
+    }
+
+    function pause() {
+        $("#au")[0].pause();
+    }
+</script>
+
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/index/login.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/index/login.jsp
new file mode 100644
index 0000000..38a69c4
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/index/login.jsp
@@ -0,0 +1,118 @@
+
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+
+    <%@include file="../../taglib.jsp" %>
+    <jsp:include page="../../common.jsp"></jsp:include>
+
+    <meta http-equiv="X-UA-Compatible" content="IE=8"/>
+    <c:set var="res" value="${resourcePath}/auth" scope="request"/>
+
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <title>登录</title>
+    <meta name="description" content="">
+    <meta name="keywords" content="">
+    <link rel="stylesheet" type="text/css" href="${res}/css/animate.css">
+    <link rel="stylesheet" type="text/css" href="${res}/css/font-awesome.min.css">
+    <link rel="stylesheet" type="text/css" href="${res}/css/animate.css">
+    <link rel="stylesheet" type="text/css" href="${res}/css/bootstrap.min.css">
+    <link rel="stylesheet" type="text/css" href="${res}/css/reset.css">
+    <link rel="stylesheet" type="text/css" href="${res}/css/login.css">
+
+    <script type="text/javascript">
+        require("js/login/login.js");
+    </script>
+    <script>
+        if (window !== top) {
+            top.location.href = location.href;
+        }
+    </script>
+
+    <style>
+        .whole-window {
+            background: url(${res}/images/1.png) no-repeat center / cover;
+            position: fixed;
+            left: 0;
+            right: 0;
+            top: 0;
+            bottom: 0;
+            zoom: 1;
+        }
+    </style>
+</head>
+<body class="login bg scroll-animations-activated" id="loginBody">
+<div class="whole-window">
+&lt;%&ndash;    <img src="${res}/images/1.png" alt="" width="100%" />&ndash;%&gt;
+</div>
+<!-- BEGIN LOGO -->
+<div class="logo">
+    <div>收银呗管理平台</div>
+</div>
+<!-- END LOGO -->
+<!-- BEGIN LOGIN -->
+<div class="content  animated bounceIn" data-animation="bounceIn">
+    <!-- BEGIN LOGIN FORM -->
+    <form class="login-form" method="post">
+        <h3 class="form-title">登录账户</h3>
+        <div class="form-group">
+            <!--ie8, ie9 does not support html5 placeholder, so we just show field title for that-->
+            <label class="control-label visible-ie8 visible-ie9">用户名</label>
+            <div class="input-icon">
+                <i class="fa fa-user"></i>
+                <input class="form-control placeholder-no-fix" type="text" autocomplete="off" placeholder="用户名"
+                       id="username" name="username" tabindex="1" style="height:32px;"></div>
+        </div>
+        <div class="form-group">
+            <label class="control-label visible-ie8 visible-ie9">密码</label>
+            <div class="input-icon">
+                <i class="fa fa-lock"></i>
+                <input class="form-control placeholder-no-fix" type="password" autocomplete="off" placeholder="密码"
+                       id="password" name="password" tabindex="2" style="height:32px;"></div>
+        </div>
+        <div class="form-actions">
+            <div class="pull-left dn">
+                <label class="rememberme mt-checkbox mt-checkbox-outline">
+                    <input type="checkbox" id="rememberMe" name="rememberme" checked="checked">下次自动登录
+                    <span></span>
+                </label>
+            </div>
+            <div class="pull-right register hidden">
+                <a href="javascript:void(0);" id="register">注册账号</a>
+                <a href="javascript:void(0);" id="forget">忘记密码</a>
+            </div>
+        </div>
+        <a class="btn btn-primary btn-block btn-lg green m-b " id="login" href="javascript:void(0);"
+           style="padding: 5px;">登&nbsp;&nbsp;&nbsp;&nbsp;录</a>
+    </form>
+</div>
+
+<!-- END LOGIN FORM -->
+
+<!-- END LOGIN -->
+<div class="copyright"> 2019-2020 ©
+    <a href="javascript:void(0);" target="_blank" class="dlblock"> 武汉融商创银科技有限公司</a> - All Rights Reserved.
+</div>
+
+<script>
+
+    if (window !== top) {
+        top.location.href = location.href;
+    }
+
+    $(function() {
+        $.ajax({
+            url: ctx + "/login/auth"
+            , success: function(d) {
+                if (d.code == 200) {
+                    top.location.href = ctx + "/platform/console";
+                }
+            }
+        })
+    })
+
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/index/loginMerchant.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/index/loginMerchant.jsp
new file mode 100644
index 0000000..8a924ac
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/index/loginMerchant.jsp
@@ -0,0 +1,130 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <%@include file="../../taglib.jsp"%>
+    <%--<jsp:include page="../../common.jsp"></jsp:include>--%>
+
+    <meta http-equiv="X-UA-Compatible" content="IE=8"/>
+    <c:set var="res" value="${resourcePath}/auth"  scope="request"/>
+    <link href="${res}/jquery-validation/1.10.0/validate.css" rel="stylesheet"/>
+    <link href="${res}/dataTables/jquery.dataTables.bs.css" rel="stylesheet"/>
+    <link href="${res}/jquery-ui-multiselect/jquery.multiselect.css" rel="stylesheet"/>
+    <link href="${res}/jquery-loadmask-0.4/jquery.loadmask.css" rel="stylesheet"/>
+    <link href="${res}/uploadify/uploadify.css" rel="stylesheet" type="text/css"/>
+    <link href="${res}/My97DatePicker/skin/WdatePicker.css" rel="stylesheet" type="text/css"/>
+    <link href="${res}/css/common.css" rel="stylesheet"/>
+
+    <script type="text/javascript" src="${res}/jquery-ui-bs/js/jquery-1.8.3.min.js"></script>
+    <script type="text/javascript" src="${res}/jquery-ui-bs/js/jquery-ui-1.10.0.custom.min.js"></script>
+    <script type="text/javascript" src="${res}/jquery-ui-bs/assets/js/bootstrap.min.js"></script>
+    <script type="text/javascript" src="${res}/jquery-validation/1.10.0/jquery.validate.min.js"></script>
+    <script type="text/javascript" src="${res}/jquery-validation/1.10.0/messages_bs_zh.js"></script>
+    <script type="text/javascript" src="${res}/dataTables/jquery.dataTables.js"></script>
+    <script type="text/javascript" src="${res}/jquery-ui-multiselect/jquery.multiselect.js"></script>
+    <script type="text/javascript" src="${res}/jquery-loadmask-0.4/jquery.loadmask.min.js"></script>
+    <script type="text/javascript" src="${res}/uploadify/jquery.uploadify.min.js"></script>
+    <script type="text/javascript" src="${res}/My97DatePicker/WdatePicker.js"></script>
+
+    <script type="text/javascript" src="${res}/js/common.js"></script>
+
+    <script type="text/javascript" src="${res}/upload/jquery.form.js"></script>
+    <script type="text/javascript" src="${res}/upload/upload.js?rnd=12.1"></script>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <title>登录</title>
+    <meta name="description" content="">
+    <meta name="keywords" content="">
+    <link rel="stylesheet" type="text/css" href="${res}/css/animate.css">
+    <link rel="stylesheet" type="text/css" href="${res}/css/font-awesome.min.css">
+    <link rel="stylesheet" type="text/css" href="${res}/css/animate.css">
+    <link rel="stylesheet" type="text/css" href="${res}/css/bootstrap.min.css">
+    <link rel="stylesheet" type="text/css" href="${res}/css/reset.css">
+    <link rel="stylesheet" type="text/css" href="${res}/css/login.css">
+    <link rel="stylesheet" type="text/css" href="${res}/css/swiper.min.css"/>
+    <link rel="stylesheet" type="text/css" href="${res}/css/layui.css">
+
+    <script type="text/javascript" src="${res}/js/jquery-1.11.0.min.js"></script>
+
+    <script type="text/javascript" src="${res}/js/layui.js"></script>
+    <script type="text/javascript" src="${res}/js/login/swiper.min.js"></script>
+    <script type="text/javascript" src="${res}/js/login/laydialog.min.js"></script>
+    <script type="text/javascript" src="${res}/js/login/DialogUtil.js"></script>
+    <script type="text/javascript">
+        require("js/login/login.js");
+    </script>
+</head>
+<body class="login scroll-animations-activated" id="loginBody">
+<!-- BEGIN LOGO -->
+<div class="logo">
+    <div>商户服务商登录</div>
+</div>
+<!-- END LOGO -->
+<!-- BEGIN LOGIN -->
+<div class="content  animated bounceIn" data-animation="bounceIn">
+    <!-- BEGIN LOGIN FORM -->
+    <form class="login-form" method="post">
+        <h3 class="form-title">登录账户</h3>
+        <div class="form-group">
+            <!--ie8, ie9 does not support html5 placeholder, so we just show field title for that-->
+            <label class="control-label visible-ie8 visible-ie9">用户名</label>
+            <div class="input-icon">
+                <i class="fa fa-user"></i>
+                <input class="form-control placeholder-no-fix" type="text" autocomplete="off" placeholder="用户名" id="username" name="username" tabindex="1" style="height:32px;"> </div>
+        </div>
+        <div class="form-group">
+            <label class="control-label visible-ie8 visible-ie9">密码</label>
+            <div class="input-icon">
+                <i class="fa fa-lock"></i>
+                <input class="form-control placeholder-no-fix" type="password" autocomplete="off" placeholder="密码" id="password" name="password" tabindex="2" style="height:32px;"> </div>
+        </div>
+        <div class="form-actions">
+            <div class="pull-left dn">
+                <label class="rememberme mt-checkbox mt-checkbox-outline">
+                    <input type="checkbox" id="rememberMe" name="rememberme" checked="checked">下次自动登录
+                    <span></span>
+                </label>
+            </div>
+            <div class="pull-right register hidden">
+                <a href="javascript:void(0);" id="register">注册账号</a>
+                <a href="javascript:void(0);" id="forget">忘记密码</a>
+            </div>
+        </div>
+        <a class="btn btn-primary btn-block btn-lg green m-b " id="login" href="javascript:void(0);" style="padding: 5px;">登&nbsp;&nbsp;&nbsp;&nbsp;录</a>
+    </form>
+</div>
+
+<!-- END LOGIN FORM -->
+
+<!-- END LOGIN -->
+<div class="copyright"> 2019-2020 ©
+    <a href="javascript:void(0);" target="_blank" class="dlblock"> 武汉融商创银科技有限公司</a> - All Rights Reserved. </div>
+
+<div class="swiper-container" style="position:fixed;top:0;left:0;right:0;bottom:0;z-index:-1;">
+    <div class="swiper-wrapper">
+        <div class="swiper-slide" style="background:url(${res}/images/1.png);background-size:cover;"></div>
+
+    </div>
+</div>
+<script>
+    var swiper = new Swiper('.swiper-container', {
+        spaceBetween: 30,
+        autoplay: false,//可选选项，自动滑动
+        speed:1000,
+        effect: 'fade',
+        pagination: {
+            el: '.swiper-pagination',
+            clickable: true,
+        },
+        navigation: {
+            nextEl: '.swiper-button-next',
+            prevEl: '.swiper-button-prev',
+        },
+    });
+
+    if (window != top)
+
+        top.location.href = location.href;
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/index/loginService.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/index/loginService.jsp
new file mode 100644
index 0000000..c11dccc
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/index/loginService.jsp
@@ -0,0 +1,130 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <%@include file="../../taglib.jsp"%>
+    <%--<jsp:include page="../../common.jsp"></jsp:include>--%>
+
+    <meta http-equiv="X-UA-Compatible" content="IE=8"/>
+    <c:set var="res" value="${resourcePath}/auth"  scope="request"/>
+    <link href="${res}/jquery-validation/1.10.0/validate.css" rel="stylesheet"/>
+    <link href="${res}/dataTables/jquery.dataTables.bs.css" rel="stylesheet"/>
+    <link href="${res}/jquery-ui-multiselect/jquery.multiselect.css" rel="stylesheet"/>
+    <link href="${res}/jquery-loadmask-0.4/jquery.loadmask.css" rel="stylesheet"/>
+    <link href="${res}/uploadify/uploadify.css" rel="stylesheet" type="text/css"/>
+    <link href="${res}/My97DatePicker/skin/WdatePicker.css" rel="stylesheet" type="text/css"/>
+    <link href="${res}/css/common.css" rel="stylesheet"/>
+
+    <script type="text/javascript" src="${res}/jquery-ui-bs/js/jquery-1.8.3.min.js"></script>
+    <script type="text/javascript" src="${res}/jquery-ui-bs/js/jquery-ui-1.10.0.custom.min.js"></script>
+    <script type="text/javascript" src="${res}/jquery-ui-bs/assets/js/bootstrap.min.js"></script>
+    <script type="text/javascript" src="${res}/jquery-validation/1.10.0/jquery.validate.min.js"></script>
+    <script type="text/javascript" src="${res}/jquery-validation/1.10.0/messages_bs_zh.js"></script>
+    <script type="text/javascript" src="${res}/dataTables/jquery.dataTables.js"></script>
+    <script type="text/javascript" src="${res}/jquery-ui-multiselect/jquery.multiselect.js"></script>
+    <script type="text/javascript" src="${res}/jquery-loadmask-0.4/jquery.loadmask.min.js"></script>
+    <script type="text/javascript" src="${res}/uploadify/jquery.uploadify.min.js"></script>
+    <script type="text/javascript" src="${res}/My97DatePicker/WdatePicker.js"></script>
+
+    <script type="text/javascript" src="${res}/js/common.js"></script>
+
+    <script type="text/javascript" src="${res}/upload/jquery.form.js"></script>
+    <script type="text/javascript" src="${res}/upload/upload.js?rnd=12.1"></script>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <title>登录</title>
+    <meta name="description" content="">
+    <meta name="keywords" content="">
+    <link rel="stylesheet" type="text/css" href="${res}/css/animate.css">
+    <link rel="stylesheet" type="text/css" href="${res}/css/font-awesome.min.css">
+    <link rel="stylesheet" type="text/css" href="${res}/css/animate.css">
+    <link rel="stylesheet" type="text/css" href="${res}/css/bootstrap.min.css">
+    <link rel="stylesheet" type="text/css" href="${res}/css/reset.css">
+    <link rel="stylesheet" type="text/css" href="${res}/css/login.css">
+    <link rel="stylesheet" type="text/css" href="${res}/css/swiper.min.css"/>
+    <link rel="stylesheet" type="text/css" href="${res}/css/layui.css">
+
+    <script type="text/javascript" src="${res}/js/jquery-1.11.0.min.js"></script>
+
+    <script type="text/javascript" src="${res}/js/layui.js"></script>
+    <script type="text/javascript" src="${res}/js/login/swiper.min.js"></script>
+    <script type="text/javascript" src="${res}/js/login/laydialog.min.js"></script>
+    <script type="text/javascript" src="${res}/js/login/DialogUtil.js"></script>
+    <script type="text/javascript">
+        require("js/login/login.js");
+    </script>
+</head>
+<body class="login scroll-animations-activated" id="loginBody">
+<!-- BEGIN LOGO -->
+<div class="logo">
+    <div>超级服务商登录</div>
+</div>
+<!-- END LOGO -->
+<!-- BEGIN LOGIN -->
+<div class="content  animated bounceIn" data-animation="bounceIn">
+    <!-- BEGIN LOGIN FORM -->
+    <form class="login-form" method="post">
+        <h3 class="form-title">登录账户</h3>
+        <div class="form-group">
+            <!--ie8, ie9 does not support html5 placeholder, so we just show field title for that-->
+            <label class="control-label visible-ie8 visible-ie9">用户名</label>
+            <div class="input-icon">
+                <i class="fa fa-user"></i>
+                <input class="form-control placeholder-no-fix" type="text" autocomplete="off" placeholder="用户名" id="username" name="username" tabindex="1" style="height:32px;"> </div>
+        </div>
+        <div class="form-group">
+            <label class="control-label visible-ie8 visible-ie9">密码</label>
+            <div class="input-icon">
+                <i class="fa fa-lock"></i>
+                <input class="form-control placeholder-no-fix" type="password" autocomplete="off" placeholder="密码" id="password" name="password" tabindex="2" style="height:32px;"> </div>
+        </div>
+        <div class="form-actions">
+            <div class="pull-left dn">
+                <label class="rememberme mt-checkbox mt-checkbox-outline">
+                    <input type="checkbox" id="rememberMe" name="rememberme" checked="checked">下次自动登录
+                    <span></span>
+                </label>
+            </div>
+            <div class="pull-right register hidden">
+                <a href="javascript:void(0);" id="register">注册账号</a>
+                <a href="javascript:void(0);" id="forget">忘记密码</a>
+            </div>
+        </div>
+        <a class="btn btn-primary btn-block btn-lg green m-b " id="login" href="javascript:void(0);" style="padding: 5px;">登&nbsp;&nbsp;&nbsp;&nbsp;录</a>
+    </form>
+</div>
+
+<!-- END LOGIN FORM -->
+
+<!-- END LOGIN -->
+<div class="copyright"> 2019-2020 ©
+    <a href="javascript:void(0);" target="_blank" class="dlblock"> 武汉融商创银科技有限公司</a> - All Rights Reserved. </div>
+
+<div class="swiper-container" style="position:fixed;top:0;left:0;right:0;bottom:0;z-index:-1;">
+    <div class="swiper-wrapper">
+        <div class="swiper-slide" style="background:url(${res}/images/1.png);background-size:cover;"></div>
+
+    </div>
+</div>
+<script>
+    var swiper = new Swiper('.swiper-container', {
+        spaceBetween: 30,
+        autoplay: false,//可选选项，自动滑动
+        speed:1000,
+        effect: 'fade',
+        pagination: {
+            el: '.swiper-pagination',
+            clickable: true,
+        },
+        navigation: {
+            nextEl: '.swiper-button-next',
+            prevEl: '.swiper-button-prev',
+        },
+    });
+
+    if (window != top)
+
+        top.location.href = location.href;
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/index/video.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/index/video.jsp
new file mode 100644
index 0000000..1c9a40d
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/index/video.jsp
@@ -0,0 +1,87 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<head>
+<jsp:include page="../../common.jsp"></jsp:include>
+<title>武汉荣商创银科技有限公司</title>
+  <meta charset="utf-8">
+  <meta content="width=device-width, initial-scale=1" name="viewport">
+  <script type="text/javascript">
+	requireCss("css/tencentVideo/bootstrap.css");
+	requireCss("css/tencentVideo/style.css");
+	requireCss("css/tencentVideo/pure-min.css");
+	requireCss("css/tencentVideo/baby-blue.css");
+  </script>
+
+  <style>
+      #remote-video-wrap div{max-width:400px;display: inline-block;padding:10px}
+      
+  </style>
+</head>
+<body>
+
+  <!-- 登录  -->
+  <div id="input-container" class="container">
+    
+    <div class="login-box">
+      <div class="form-group">
+        <div class="hide">
+          <label for="sdkappid">SDKAPPID:&nbsp;</label>
+          <input class="form-control" id="sdkappid" type="text" value="1400037025" />
+        </div>
+          <label for="userId">用户名:</label>
+          <select class="form-control" id="userId"></select>
+          <!-- <input class="form-control" id="userId" type="text" value="" /> -->
+          <label for="room-number">房间号:</label>
+          <input class="form-control" id="roomid" type="text" value="1111">
+      </div>
+      <button class="btn btn-default" type="button" onclick="push()">我要视频通话</button>
+      <br />
+      <p>注意：如果房间已经存在，则加入房间</p>
+    </div>
+  </div>
+  <!-- 登录  -->
+
+  <!-- RTC  -->
+  <div id="video-section" style="display: none">
+    <p>当前房间号：<span id="c_roomid"></span>  当前用户： <span id="c_userid"></span></p>
+    <button class="btn btn-default" type="button" onclick="quitRTC()">退房</button>
+    <button class="btn btn-default" type="button" onclick="stopRTC()">停止推流</button>
+    <button class="btn btn-default" type="button" onclick="startRTC()">开始推流</button>
+        <div id="remote-video-wrap">
+
+        </div>
+    </div>
+  </div>
+  <!-- RTC  -->
+
+  <!-- demo 部分 -->
+  <script src="https://sqimg.qq.com/expert_qq/webrtc/3.0.6/WebRTCAPI.min.js"></script>
+    <script src="${resourcePath }/js/video/config.js"></script>
+    <script src="${resourcePath }/js/video/index.js"></script>
+	  
+  
+    <script>
+        var _mtac = {"senseHash":0};
+        (function() {
+            var mta = document.createElement("script");
+            mta.src = "//pingjs.qq.com/h5/stats.js";
+            mta.setAttribute("name", "MTAH5");
+            mta.setAttribute("sid", "500538821");
+            mta.setAttribute("cid", "500538834");
+            var s = document.getElementsByTagName("script")[0];
+            s.parentNode.insertBefore(mta, s);
+        })();
+    </script>
+	<!-- Global site tag (gtag.js) - Google Analytics --> 
+	<script async src="https://www.googletagmanager.com/gtag/js?id=UA-121844058-1"></script> 
+	<script>  
+	window.dataLayer = window.dataLayer || [];  
+	function gtag(){
+		dataLayer.push(arguments);
+	}  
+	gtag('js', new Date());   
+	gtag('config', 'UA-121844058-1');
+	</script>
+	</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/inviteRate/detail.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/inviteRate/detail.jsp
new file mode 100644
index 0000000..3a8b6f4
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/inviteRate/detail.jsp
@@ -0,0 +1,182 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+    <style>
+        .layui-input, .layui-textarea {
+            border-color: #606060;
+        }
+    </style>
+</head>
+<body>
+<form class="layui-form" action="" style="width: 80%; margin-top: 20px">
+    <input name="id" value="${entity.id}" hidden/>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">邀请数量</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="number" value="${entity.number}" lay-verify="required" placeholder="请输入邀请数量" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">费率(%)</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <%--<select name="rate" class="layui-input">
+                    <c:forEach begin="0.21" end="0.38" var="item">
+                        <option value="${item}"
+                                <c:if test="${entity.rate.equest(item)}">
+                                    selected
+                                </c:if>
+                        >${item}</option>
+                    </c:forEach>
+                </select>--%>
+                <input name="rate" value="${entity.rate}" lay-verify="required" placeholder="请输入费率" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">活动类别</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <select name="type" lay-verify="required" lay-filter="selectAct"  class="layui-select">
+                    <option value="">请选择</option>
+                    <c:forEach items="${typeList}" var="item">
+                        <option value="${item.value}" ${entity.type eq item.value ? 'selected' : ''}>${item.name}</option>
+                    </c:forEach>
+                </select>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">关联活动</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <select name="actId" id="actId" lay-verify="required" class="layui-select">
+                    <option value="">请选择</option>
+                    <c:if test="${ not empty actList}">
+                        <c:forEach items="${actList}" var="act">
+                            <option value="${act.id}" ${entity.actId eq act.id ? 'selected' : ''}>${act.officName}</option>
+                        </c:forEach>
+                    </c:if>
+                </select>
+            </div>
+        </div>
+    </div>
+
+    <%--<div class="layui-form-item">
+        <span class="dlblock w100 textr">开始日期</span>
+        <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock" style="margin-left: 6px">
+            <input type="text" placeholder="" name="startTime" autocomplete="off" id="startTime" class="w150"
+                   value="${entity.startTimeStr}"/>
+            <i class="fa fa-calendar"></i>
+        </span>
+    </div>
+
+    <div class="layui-form-item">
+        <span class="dlblock w100 textr">结束日期</span>
+        <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock" style="margin-left: 6px">
+            <input type="text" placeholder="" name="endTime" autocomplete="off" id="endTime" class="w150"
+                   value="${entity.endTimeStr}"/>
+            <i class="fa fa-calendar"></i>
+        </span>
+    </div>--%>
+
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button class="layui-btn" lay-submit lay-filter="formDemo">立即提交</button>
+            <button type="button" id="close" class="layui-btn layui-btn-primary">关闭</button>
+        </div>
+    </div>
+</form>
+
+<script>
+    //Demo
+    layui.use(['form', 'layer', 'laydate'], function () {
+        var form = layui.form;
+        var layer = layui.layer;
+        var laydate = layui.laydate;
+        $('#close').click(function () {
+            parent.layer.closeAll();
+        });
+        laydate.render({
+            elem: '#startTime', //指定元素
+            format:'yyyy-MM-dd'
+        });
+        laydate.render({
+            elem: '#endTime', //指定元素
+            format:'yyyy-MM-dd'
+        });
+        form.on('select(selectAct)',function (data) {
+            let value = data.value;
+            let dom = $("#actId");
+            if(!value){
+                dom.empty();
+                return;
+            }
+            $.ajax({
+                url: '${ctx}/inviteRate/getActType/'+value,
+                method: 'get',
+                dataType: 'JSON',
+                contentType: "application/json",
+                success: function (res) {
+                    if(res.code == 200){
+                        dom.empty();
+                        let html = "<option value=''>请选择</option>";
+                        let dataList = res.data;
+                        if(dataList.length > 0){
+                            $.each(dataList,function (k,v) {
+                                html+= "<option value='"+v.id+"'>"+v.officName+"</option>";
+                            })
+                            dom.append(html);
+                            form.render('select');
+                        }
+                    }
+                }
+            })
+            return false;
+        })
+        //监听提交
+        form.on('submit(formDemo)', function (data) {
+            var index = layer.load(1, {shade: [0.1, '#000']});
+            $.ajax({
+                url: '${ctx}/inviteRate/save',
+                method: 'post',
+                data: JSON.stringify(data.field),
+                dataType: 'JSON',
+                contentType: "application/json",
+                success: function (res) {
+                    layer.close(index);
+                    if (res.code == 200) {
+                        layer.alert(res.message, function () {
+                            parent.location.reload();
+                        })
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 5
+                        });
+                    }
+                }
+            })
+            return false;
+        });
+    });
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/inviteRate/inviteRateList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/inviteRate/inviteRateList.jsp
new file mode 100644
index 0000000..17225fc
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/inviteRate/inviteRateList.jsp
@@ -0,0 +1,211 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+</head>
+<body>
+<div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+    <div class="toolbar-panel bdd">
+        <!--搜索条件 -->
+        <%--<form action="${ctx}/inviteRate/page" method="get" id="condition">
+            <div class="toolbar-body">
+                <div class="row pt10 pb10 whitebg ml0 mr0">
+                    <span class="dlblock w100 textr">开始日期</span>
+                    <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+							 <input type="text" placeholder="" id="date1" class="w150">
+							 <i class="fa fa-calendar"></i>
+						</span>
+                    <span class="dlblock w100 textr">结束日期</span>
+                    <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+						<input type="text" placeholder="" id="date2" class="w150">
+							<i class="fa fa-calendar"></i>
+						</span>
+                </div>
+            </div>
+        </form>--%>
+    </div>
+</div>
+
+<div class="mb50 mt10">
+    <div class="whitebg pl10 pr10">
+        <table class="layui-hide" id="inviteRateTab" lay-filter="inviteRateTab"></table>
+    </div>
+</div>
+
+<script type="text/html" id="toolbarDemo">
+    <div class="layui-btn-container">
+        <button class="layui-btn layui-btn-sm" lay-event="add">添加</button>
+        <button class="layui-btn layui-btn-sm" lay-event="search">查询</button>
+    </div>
+</script>
+
+<script type="text/html" id="barDemo">
+    <a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>
+    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
+</script>
+
+<script>
+    var dictList = JSON.parse('${dictList}');
+    layui.use(['table', 'layer','laydate' ], function () {
+        var table = layui.table;
+        var layer = layui.layer;
+        var laydate=layui.laydate;
+        /*laydate.render({
+            elem: '#date1', //指定元素
+            format:'yyyy-MM-dd 00:00:00'
+        });
+        laydate.render({
+            elem: '#date2', //指定元素
+            format:'yyyy-MM-dd 23:59:59'
+        });*/
+
+        var tableIns = table.render({
+            elem: '#inviteRateTab'
+            , url: '${ctx}/inviteRate/page'
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            , toolbar: '#toolbarDemo' //开启头部工具栏，并为其绑定左侧模板
+            , defaultToolbar: ['filter', 'exports', 'print', { //自定义头部工具栏右侧图标。如无需自定义，去除该参数即可
+                title: '提示'
+                , layEvent: 'LAYTABLE_TIPS'
+                , icon: 'layui-icon-tips'
+            }]
+            , title: '邀请商户费率阶梯表'
+            , cols: [[
+                {type: 'checkbox', fixed: 'left', hidden: true}
+                , {field: '', title: '序号', fixed: 'left', unresize: true, width: 80, sort: true, type: 'numbers'}
+                , {field: 'number', title: '邀请数量',align: "center"}
+                , {field: 'rate', title: '费率%',align: "center",templet:function (d) {
+                        return d.rate + '%';
+                    }}
+                , {field: 'type', title: '类别',align: "center",templet:function (d) {
+                    return getDictText(d.type,dictList,'value');
+                  }}
+                , {field: 'actId', title: '关联活动id',align: "center"}
+                , {field: 'actName', title: '关联活动名称',align: "center"}
+                , {field: 'startTime', title: '开始时间',align: "center",
+                    templet: "<div>{{layui.util.toDateString(d.startTime, 'yyyy-MM-dd')}}</div>"}
+                , {field: 'endTime', title: '结束时间',align: "center",
+                    templet: "<div>{{layui.util.toDateString(d.endTime, 'yyyy-MM-dd')}}</div>"}
+                , {field: 'createTime', title: '创建日期', sort: true,align: "center", width: 160,
+                    templet: "<div>{{layui.util.toDateString(d.createTime, 'yyyy-MM-dd HH:mm:ss')}}</div>"}
+                , {field: 'updateTime', title: '修改时间', sort: true,align: "center", width: 160,
+                    templet: "<div>{{layui.util.toDateString(d.updateTime, 'yyyy-MM-dd HH:mm:ss')}}</div>"}
+                , {fixed: 'right', title: '操作',align: "center", toolbar: '#barDemo'}
+            ]]
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , page: true
+            , done: function () {
+                $("[data-field='forceUpdate']").children().each(function () {
+                    if ($(this).text() == '0') {
+                        $(this).text('否');
+                    } else if ($(this).text() == '1') {
+                        $(this).text('是');
+                    }
+                });
+            }
+        });
+
+        //头工具栏事件
+        table.on('toolbar(inviteRateTab)', function (obj) {
+            switch (obj.event) {
+                case 'add':
+                    // 添加
+                    toAdd();
+                    break;
+                case 'search':
+                    // 查询
+                    // $("#condition").submit();
+                    tableIns.reload({
+                        /*where: { //设定异步数据接口的额外参数，任意设
+                            startTime: $("#date1").val(),
+                            endTime: $("#date2").val()
+                        }*/
+                        page: {
+                            curr: 1 //重新从第 1 页开始
+                        }
+                    });
+                    break;
+            }
+        });
+
+        //监听行工具事件
+        table.on('tool(inviteRateTab)', function (obj) {
+            var data = obj.data;
+            //console.log(obj)
+            if (obj.event === 'del') {
+                layer.confirm('真的删除行么?', function (index) {
+                    obj.del(data);
+                    layer.close(index);
+                    del(obj);
+                });
+            } else if (obj.event === 'edit') {
+                toAdd(obj.data);
+            }
+        });
+
+        function toAdd(obj) {
+            var url = '${ctx}/inviteRate/detail';
+            if (obj != undefined) {
+                url = "${ctx}/inviteRate/detail/" + obj.id
+            }
+            var index = layer.open({
+                type: 2
+                , shade: 0.5
+                , maxmin: true
+                , content: url
+                , area: ['550px', '550px']
+            });
+        }
+
+        function del(obj) {
+            $.ajax({
+                url: '${ctx}/inviteRate/del',
+                method: 'delete',
+                data: JSON.stringify(obj.data),
+                dataType: 'JSON',
+                contentType: "application/json",
+                success: function (res) {
+                    if (res.code == 200) {
+                        layer.msg(res.message, {
+                            icon: 1
+                        });
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 5
+                        });
+                    }
+                }
+            })
+        }
+    });
+</script>
+</body>
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/jft/bankDetail.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/jft/bankDetail.jsp
new file mode 100644
index 0000000..55a8f80
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/jft/bankDetail.jsp
@@ -0,0 +1,217 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp" />
+    <style>
+        .layui-form-item{
+            margin-top: 10px;
+        }
+        .layui-form{
+            width: 75%;
+            margin-left: 10%;
+        }
+        .area-info{
+            width: 25% !important;
+        }
+        /*.layui-icon-add-circle{*/
+        /*    color:#1E9FFF*/
+        /*}*/
+    </style>
+</head>
+<body>
+<form class="layui-form" action="" id="addForm">
+    <input name="id" value="${entity.id}" hidden/>
+    <div class="layui-form-item">
+        <label class="layui-form-label">用户ID</label>
+        <div class="layui-input-block">
+            <input name="userId" type="number" value="${entity.userId}" autocomplete="off" maxlength="11"  placeholder="手机号和用户ID二选一" class="layui-input"/>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">登录账号</label>
+        <div class="layui-input-block">
+            <input name="loginName" type="text" value="${entity.loginName}" autocomplete="off" maxlength="50"  placeholder="登录账号和用户ID二选一" class="layui-input" />
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">奖励类型</label>
+        <div class="layui-input-block">
+            <select name="reId" id="reId" lay-verify="required">
+                <c:forEach items="${rList}" var="r">
+                    <option ${entity.reId eq r.id ? 'selected' : ''} value="${r.id}">${r.name}</option>
+                </c:forEach>
+            </select>
+        </div>
+    </div>
+
+<%--    <div class="layui-form-item layui-hide" id="hide-area-info">--%>
+<%--        <div class="layui-form-label">区域</div>--%>
+<%--        <div class="layui-input-inline area-info" >--%>
+<%--            <select name="province" class="province-selector" lay-filter="province-1" lay-verify="required">--%>
+<%--                <option value="">请选择</option>--%>
+<%--                <c:forEach items="${pList}" var="p">--%>
+<%--                    <option ${entity.areaNo eq p.areaCode ? 'selected' : ''} value="${p.areaCode}">${p.areaName}</option>--%>
+<%--                </c:forEach>--%>
+<%--            </select>--%>
+<%--        </div>--%>
+<%--    </div>--%>
+
+    <div class="layui-form-item" id="area-info">
+        <div class="layui-form-label">区域</div>
+        <div class="layui-input-inline area-info" >
+            <select name="province" id="province-selector" class="province-selector" lay-filter="province-1" lay-verify="required">
+                <option value="">请选择</option>
+                <c:forEach items="${pList}" var="p">
+                    <option ${entity.areaNo eq p.areaCode ? 'selected' : ''} value="${p.areaCode}">${p.areaName}</option>
+                </c:forEach>
+            </select>
+        </div>
+        <div class="layui-input-inline area-info ${entity.areaLevel eq 2 or entity.areaLevel eq 3 ? '' : 'layui-hide'}">
+            <select name="city" id="city-selector" class="city-selector" lay-filter="city-1">
+            </select>
+        </div>
+        <div class="layui-input-inline area-info ${entity.areaLevel eq 3 ? '' : 'layui-hide'}">
+            <select name="county" id="county-selector" class="county-selector" lay-filter="county-1">
+            </select>
+        </div>
+<%--        <div class="layui-input-inline" style="width: auto;padding-top:10px" id="addArea">--%>
+<%--            <i class="layui-icon layui-icon-add-circle"></i>--%>
+<%--        </div>--%>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">状态</label>
+        <div class="layui-input-block">
+            <select name="status" id="status" lay-verify="required">
+                <option value="">请选择</option>
+                <option value="1" ${empty entity or entity.status eq 1 ? 'selected' : ''}>正常</option>
+                <option value="-1" ${entity.status eq -1 ? 'selected' : ''}>禁用</option>
+            </select>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button class="layui-btn" lay-submit lay-filter="formDemo">立即提交</button>
+            <button type="button" id="close" class="layui-btn layui-btn-primary">关闭</button>
+        </div>
+    </div>
+</form>
+<script>
+    layui.use(['form','layer'], function(){
+        let layer = layui.layer
+            , form = layui.form;
+        $('#close').click(function() {
+            parent.layer.closeAll();
+        });
+        let areaNo = '${entity.areaNo}';
+        if(areaNo){
+            if(areaNo.indexOf("-") < 0){
+                let dom = $("#city-selector");
+                getNextAreaInfo(areaNo,dom);
+            }else{
+                let checkAreaNo = areaNo.split("-");
+                if(checkAreaNo.length == 2){
+                    let dom = $("#city-selector");
+                    getNextAreaInfo(checkAreaNo[1],dom);
+                }else{
+                    let dom = $("#county-selector");
+                    getNextAreaInfo(checkAreaNo[2],dom);
+                }
+            }
+        }
+        form.on('select(province-1)',function (data){
+            let value = data.value;
+            let dom = $("#city-selector");
+            getNextAreaInfo(value,dom);
+            $("#county-selector").empty().parent().addClass("layui-hide")
+        })
+        form.on('select(city-1)',function (data){
+            let value = data.value;
+            let dom = $("#county-selector");
+            getNextAreaInfo(value,dom);
+        })
+        //监听提交
+        form.on('submit(formDemo)', function(data){
+            let index = layer.load(1,{shade: [0.1,'#000'] });
+            let param = data.field;
+            let areaLevel = 1;
+            let areaNo = $("#province-selector").children("option:selected").val();
+            let areaName = $("#province-selector").children("option:selected").text();
+
+            let cityCode = $("#city-selector").children("option:selected").val();
+            let cityName = $("#city-selector").children("option:selected").text();
+            let countyCode = $("#county-selector").children("option:selected").val();
+            let countyName = $("#county-selector").children("option:selected").text();
+            if(cityCode){
+                areaNo = areaNo + "-" + cityCode;
+                areaName = areaName + "-" + cityName;
+                areaLevel = 2;
+            }
+            if(countyCode){
+                areaNo = areaNo + "-" + countyCode;
+                areaName = areaName + "-" + countyName;
+                areaLevel = 3
+            }
+            param.areaNo = areaNo;
+            param.areaName = areaName;
+            param.areaLevel = areaLevel;
+            $.ajax({
+                url: '${ctx}/userRewardInfo/save',
+                method: 'post',
+                data: JSON.stringify(data.field),
+                dataType: 'JSON',
+                contentType:"application/json",
+                success: function(res) {
+                    layer.close(index);
+                    if(res.code == 200) {
+                        layer.msg(res.message, { icon: 1, time: 1000 }, function () {
+                            var index = parent.layer.getFrameIndex(window.name);
+                            parent.layui.table.reload('userRewardInfo');
+                            parent.layer.close(index);
+                        });
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 2
+                        });
+                    }
+                }
+            })
+            return false;
+        });
+
+        function getNextAreaInfo(value,dom){
+            let url = '${ctx}/userRewardInfo/getNextAreaInfo/'+value;
+            $.get(url,function(res){
+               if(res.code == 200){
+                   let html = "<option value=''>请选择</option>";
+                   $.each(res.data,function (index,e){
+                       html += '<option value="'+e.areaCode+'">'+e.areaName+'</option>';
+                   })
+                   dom.empty();
+                   dom.append(html);
+                   dom.parent("div").removeClass("layui-hide");
+                   form.render("select");
+               }
+            })
+        }
+    });
+    function del(obj){
+        let value = $(obj).data().value;
+        let values = $("#areaNos").val();
+        $("#areaNos").val(values.replace(","+value,""));
+        $(obj).parent().remove();
+    }
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/jft/bankList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/jft/bankList.jsp
new file mode 100644
index 0000000..47a41b7
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/jft/bankList.jsp
@@ -0,0 +1,250 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" id="form1" action="" style="margin-top: 10px;">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">用户ID</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="userId" id="userId" placeholder="用户ID"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">开户名</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="bankHolder" id="bankHolder" placeholder="开户名"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">手机号</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="phone" id="phone" placeholder="手机号"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <div class="mb50 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-hide" id="jftBankCard" lay-filter="jftBankCard"></table>
+        </div>
+    </div>
+</div>
+<script type="text/html" id="leftBar">
+    <a class="layui-btn layui-btn-sm" lay-event="search">
+        <i class="layui-icon layui-icon-search"></i>查询
+    </a>
+</script>
+
+<script type="text/html" id="toolBar">
+    <a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="del">
+        <i class="layui-icon layui-icon-delete"></i>删除
+    </a>
+</script>
+
+<script type="text/html" id="imgUrl">
+    <a href='javascript:void(0)' onclick='openImg("{{d.imgUrl}}")'><img src="{{d.imgUrl}}"/></a>
+</script>
+
+<script>
+    var table = null;
+    var layer = null;
+    layui.use(['table', 'layer'], function () {
+        table = layui.table;
+        layer = layui.layer;
+
+        var tableIns = table.render({
+            elem: '#jftBankCard'
+            , url: '${ctx}/jftBankCard/page'
+            , id: 'jftBankCard'
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            , toolbar: '#leftBar' //开启头部工具栏，并为其绑定左侧模板
+            , defaultToolbar: ['filter']
+            , defaultToolbar: ['filter', 'exports', 'print', { //自定义头部工具栏右侧图标。如无需自定义，去除该参数即可
+                title: '提示'
+                , layEvent: 'LAYTABLE_TIPS'
+                , icon: 'layui-icon-tips'
+            }]
+            , title: '缴费通用户卡号列表'
+            , cols: [[
+                {type: 'checkbox', fixed: 'left', hidden: true}
+                , {field: 'numbers', title: '序号', fixed: 'left', unresize: true, width: 80, type: 'numbers'}
+                , {field: 'userId', title: '用户ID'}
+                , {field: 'bankHolder', title: '开户名'}
+                , {field: 'bankCardNo', title: '卡号',width: 170}
+                , {field: 'bankName', title: '开户行'}
+                , {field: 'phone', title: '手机号'}
+                , {field: 'branchName', title: '开户支行'}
+                , {field: 'imgUrl', title: '结算卡图片',width: 120, align: "center", templet: '#imgUrl'}
+                , {field: 'status', title: '状态',templet: function (d){
+                    if(d.status === "1"){
+                        return "<span style='color: green'>正常</span>";
+                    }else{
+                        return "<span style='color: blue'>变更中</span>";
+                    }
+                    }}
+                , {
+                    field: 'createTime',
+                    title: '创建时间',
+                    templet: "<div>{{layui.util.toDateString(d.createTime,'yyyy-MM-dd HH:mm')}}</div>"
+                }
+                , {fixed: 'right', title: '操作', width: 160, toolbar: '#toolBar'}
+            ]]
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , page: true
+        });
+        table.on('tool(jftBankCard)', function (obj) { //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            var data = obj.data; //获得当前行数据
+            var layEvent = obj.event; //获得 lay-event 对应的值（也可以是表头的 event 参数对应的值）
+            if (layEvent === 'del') { //删除
+                layer.confirm('真的删除么?', {icon: 3}, function (index) {
+                    obj.del(); //删除对应行（tr）的DOM结构，并更新缓存
+                    layer.close(index);
+                    del(data);
+                    //向服务端发送删除指令
+                });
+            } else if (layEvent === 'edit') { //编辑
+                //do something
+                toAdd(obj.data);
+                //同步更新缓存对应的值
+                // obj.update({
+                //     username: '123'
+                //     ,title: 'xxx'
+                // });
+            }
+        });
+
+        //监听头工具栏事件
+        table.on('toolbar(jftBankCard)', function (obj) {
+            switch (obj.event) {
+                case 'add':
+                    // 添加
+                    toAdd();
+                    break;
+                case 'search':
+                    var params = serialize($('#form1'));
+                    table.reload('jftBankCard', {
+                        where: params
+                        , page: {
+                            size: 10
+                            , current: 1
+                        }
+                    });
+                    break;
+            }
+        });
+
+        function toAdd(obj) {
+            var url = '${ctx}/jftBankCard/detail';
+            var title = "新增";
+            if (obj != undefined) {
+                url = "${ctx}/jftBankCard/detail/" + obj.id;
+                title = "编辑"
+            }
+            var index = layer.open({
+                type: 2
+                , shade: 0.5
+                , title: title
+                , maxmin: true
+                , content: url
+                , area: ['800px', '500px']
+                , end: function () {
+
+                }
+            });
+        }
+
+        function del(obj) {
+            $.ajax({
+                url: '${ctx}/jftBankCard/del/' + obj.id,
+                method: 'DELETE',
+                dataType: 'JSON',
+                contentType: "application/json",
+                success: function (res) {
+                    layer.msg(res.message, {
+                        icon: res.code == 200 ? 1: 2
+                    });
+                }
+            })
+        }
+    });
+
+    function openImg(url) {
+        if (url) {
+            var img = new Image();
+            img.src = url;
+            //var height = img.height + 50; // 原图片大小
+            //var width = img.width; //原图片大小
+            var imgHtml = "<img src='" + url + "' width='500px' height='500px'/>";
+            //弹出层
+            layer.open({
+                type: 1,
+                shade: 0.8,
+                offset: 'auto',
+                area: [500 + 'px', 550 + 'px'],  // area: [width + 'px',height+'px']  //原图显示
+                shadeClose: true,
+                scrollbar: false,
+                title: "预览", //不显示标题
+                content: imgHtml, //捕获的元素，注意：最好该指定的元素要存放在body最外层，否则可能被其它的相对元素所影响
+                cancel: function () {
+                    //layer.msg('捕获就是从页面已经存在的元素上，包裹layer的结构', { time: 5000, icon: 6 });
+                }
+            });
+        }
+    }
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/jft/channelDetail.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/jft/channelDetail.jsp
new file mode 100644
index 0000000..a1ba316
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/jft/channelDetail.jsp
@@ -0,0 +1,78 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp" />
+    <style>
+        .layui-form-item{
+            margin-top: 10px;
+        }
+        .layui-form{
+            width: 75%;
+            margin-left: 10%;
+        }
+    </style>
+</head>
+<body>
+<form class="layui-form" action="" id="addForm">
+    <input name="id" value="${entity.id}" hidden/>
+    <div class="layui-form-item">
+        <label class="layui-form-label">支付宝费率</label>
+        <div class="layui-input-block">
+            <input name="title" type="text" value="${entity.aliRate}" autocomplete="off" maxlength="11" lay-verify="required" placeholder="支付宝费率" class="layui-input"/>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button class="layui-btn" lay-submit lay-filter="formDemo">立即提交</button>
+            <button type="button" id="close" class="layui-btn layui-btn-primary">关闭</button>
+        </div>
+    </div>
+</form>
+<script>
+    layui.use(['form','layer'], function(){
+        let layer = layui.layer
+            , form = layui.form;
+        $('#close').click(function() {
+            parent.layer.closeAll();
+        });
+        //监听提交
+        form.on('submit(formDemo)', function(data){
+            var loading = layer.msg('数据提交中...', {icon: 16,shade: 0.3,time: false});
+            $.ajax({
+                url: '${ctx}/jftMercRate/save',
+                method: 'post',
+                data: JSON.stringify(data.field),
+                dataType: 'JSON',
+                contentType:"application/json",
+                success: function(res) {
+                    layer.close(loading);
+                    if(res.code == 200) {
+                        layer.msg(res.message, { icon: 1, time: 1000 }, function () {
+                            var index = parent.layer.getFrameIndex(window.name);
+                            parent.layui.table.reload('jftMercRate');
+                            parent.layer.close(index);
+                        });
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 2
+                        });
+                    }
+                }
+            })
+            return false;
+        });
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/jft/channelList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/jft/channelList.jsp
new file mode 100644
index 0000000..09d2b95
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/jft/channelList.jsp
@@ -0,0 +1,191 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" id="form1" action="" style="margin-top: 10px;">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">用户ID</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="userId" id="userId" placeholder="用户ID"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+<%--                        <div class="layui-inline">--%>
+<%--                            <label class="layui-form-label">商户编号</label>--%>
+<%--                            <div class="layui-input-block">--%>
+<%--                                <input type="text" name="merchantCode" id="merchantCode" placeholder="商户编号"--%>
+<%--                                       autocomplete="off" class="layui-input">--%>
+<%--                            </div>--%>
+<%--                        </div>--%>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">通道商编</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="merchantId" id="merchantId" placeholder="通道商编"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <div class="mb50 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-hide" id="jftPaymentChannel" lay-filter="jftPaymentChannel"></table>
+        </div>
+    </div>
+</div>
+<script type="text/html" id="leftBar">
+    <a class="layui-btn layui-btn-sm" lay-event="search">
+        <i class="layui-icon layui-icon-search"></i>查询
+    </a>
+</script>
+
+<script type="text/html" id="toolBar">
+    <a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="sendSignMsg">
+        <i class="layui-icon layui-icon-release"></i>签约短信
+    </a>
+</script>
+
+<script>
+    var table = null;
+    var layer = null;
+    layui.use(['table', 'layer'], function () {
+        table = layui.table;
+        layer = layui.layer;
+        var tableIns = table.render({
+            elem: '#jftPaymentChannel'
+            , url: ctx + '/jftPaymentChannel/page'
+            , id: 'jftPaymentChannel'
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            , toolbar: '#leftBar' //开启头部工具栏，并为其绑定左侧模板
+            , defaultToolbar: ['filter']
+            , title: '缴费通商户进件信息表'
+            , cols: [[
+                {type: 'checkbox', fixed: 'left', hidden: true}
+                , {field: 'numbers', title: '序号', fixed: 'left', unresize: true, width: 80, type: 'numbers'}
+                , {field: 'userId', title: '用户ID'}
+                , {field: 'merchantId', title: '通道商编'}
+                , {field: 'status', title: '状态',templet:function (d){
+                        if(d.status === "1"){
+                            return "<span style='color: blue'>审核中</span>";
+                        }else if(d.status === "2"){
+                            return "<span style='color: red'>审核失败</span>";
+                        }else if(d.status === "3"){
+                            return "<span style='color: green'>审核通过</span>";
+                        }else if(d.status === "8"){
+                            return "<span style='color: orange'>待签约</span>";
+                        }else{
+                            return "未知状态";
+                        }
+                    }}
+                , {field: 'remark', title: '备注'}
+                , {
+                    field: 'createTime',
+                    title: '创建时间',
+                    templet: "<div>{{layui.util.toDateString(d.createTime,'yyyy-MM-dd HH:mm')}}</div>"
+                }
+                , {fixed: 'right', title: '操作', width: 160, toolbar: '#toolBar'}
+            ]]
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , page: true
+        });
+        table.on('tool(jftPaymentChannel)', function (obj) { //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            var data = obj.data; //获得当前行数据
+            var layEvent = obj.event; //获得 lay-event 对应的值（也可以是表头的 event 参数对应的值）
+
+            switch (layEvent) {
+                case "sendSignMsg":
+                    sendSignMsg(data);
+                    break;
+            }
+        });
+
+        //监听头工具栏事件
+        table.on('toolbar(jftPaymentChannel)', function (obj) {
+            switch (obj.event) {
+                case 'add':
+                    // 添加
+                    toAdd();
+                    break;
+                case 'search':
+                    var params = serialize($('#form1'));
+                    table.reload('jftPaymentChannel', {
+                        where: params
+                        , page: {
+                            size: 10
+                            , current: 1
+                        }
+                    });
+                    break;
+            }
+        });
+
+        function sendSignMsg(obj) {
+            layer.confirm('确认发送签约短信?', {icon: 3, title:'提示'}, function(index){
+                $.ajax({
+                    url: ctx + '/jftPaymentChannel/sendMsg',
+                    method: 'POST',
+                    data: {
+                        userId: obj.userId
+                    },
+                    success: function (res) {
+                        layer.msg(res.message, {
+                            icon: res.code == 200 ? 1: 2
+                        });
+                    }
+                })
+            });
+        }
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/jft/classDetail.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/jft/classDetail.jsp
new file mode 100644
index 0000000..68129de
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/jft/classDetail.jsp
@@ -0,0 +1,161 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp" />
+    <link rel="stylesheet" type="text/css" href="${ctx}/page/umeditor/themes/default/css/umeditor.css">
+    <script type="text/javascript" src="${ctx}/page/umeditor/third-party/template.min.js"></script>
+    <script type="text/javascript" src="${ctx}/page/umeditor/umeditor.config.js"></script>
+    <script type="text/javascript" src="${ctx}/page/umeditor/umeditor.min.js"></script>
+    <script type="text/javascript" src="${ctx}/page/umeditor/lang/zh-cn/zh-cn.js"></script>
+    <style>
+        .layui-form-item{
+            margin-top: 10px;
+        }
+        .layui-form{
+            width: 75%;
+            margin-left: 10%;
+        }
+    </style>
+</head>
+<body>
+<form class="layui-form" action="" id="addForm">
+    <input name="id" value="${entity.id}" hidden/>
+    <div class="layui-form-item">
+        <label class="layui-form-label">标题</label>
+        <div class="layui-input-block">
+            <input name="title" type="text" value="${entity.title}" autocomplete="off" maxlength="11" lay-verify="required" placeholder="标题" class="layui-input"/>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">简介</label>
+        <div class="layui-input-block">
+            <input name="describe" type="text" value="${entity.describe}" lay-verify="required" autocomplete="off" maxlength="50"  placeholder="简介" class="layui-input" />
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">内容</label>
+        <div class="layui-input-block">
+            <textarea class="layui-textarea" id="content" name="content">${entity.content}</textarea>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">url</label>
+        <div class="layui-input-block">
+            <input name="url" type="text" value="${entity.url}" autocomplete="off"  placeholder="url" class="layui-input" />
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">图片</label>
+        <div class="layui-input-block">
+            <button type="button" class="layui-btn" id="upload"><i class="layui-icon">&#xe67c;</i>上传图片</button>
+            <div class="prev-image" style="margin-top: 5px;display: ${empty entity || empty entity.photo ? 'none' : 'block'}">
+                <img src="${entity.photo}" id="prevImg" alt="图片" style="height: 100px;border: 1px solid #e1e1e1;" />
+            </div>
+            <input name="photoBaseStr" id="photoBaseStr" type="hidden" value="${entity.photoBaseStr}"/>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">排序</label>
+        <div class="layui-input-block">
+            <input name="sort" type="number" value="${entity.sort}" autocomplete="off" maxlength="8"  placeholder="排序" class="layui-input" />
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">是否显示</label>
+        <div class="layui-input-block">
+            <select name="status" id="status" lay-verify="required">
+               <option value="">请选择</option>
+                <option value="1" ${empty entity || entity.status eq 1 ? 'selected' : ''}>是</option>
+                <option value="-1" ${entity.status eq -1 ? 'selected' : ''}>否</option>
+            </select>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button class="layui-btn" lay-submit lay-filter="formDemo">立即提交</button>
+            <button type="button" id="close" class="layui-btn layui-btn-primary">关闭</button>
+        </div>
+    </div>
+</form>
+<script>
+    layui.use(['form','layer','upload'], function(){
+        let layer = layui.layer
+            , form = layui.form, upload = layui.upload;
+        var um = UM.getEditor('content');
+        um.setWidth("100%");
+        $('#close').click(function() {
+            parent.layer.closeAll();
+        });
+        var up = upload.render({
+            elem: '#upload' //绑定元素
+            ,url: '/api/upload/' //上传接口
+            ,auto:false
+            ,acceptMime:"image/*"
+            ,accept:"images"
+            ,size : 1024 //最大上传1M的图片
+            ,choose: function(obj){
+                //将每次选择的文件追加到文件队列
+                var files = obj.pushFile();
+                //预读本地文件，如果是多文件，则会遍历。(不支持ie8/9)
+                obj.preview(function(index, file, result){
+                    $(".prev-image").show();
+                    $("#prevImg").attr("src",result)
+                    $("#photoBaseStr").val(result);
+                });
+            }
+            ,done: function(res){
+                //上传完毕回调
+            }
+            ,error: function(){
+                //请求异常回调
+            }
+        });
+        //监听提交
+        form.on('submit(formDemo)', function(data){
+            var loading = layer.msg('数据提交中...', {icon: 16,shade: 0.3,time: false});
+            let params = data.field;
+            params.content = um.getContent();
+            $.ajax({
+                url: '${ctx}/jftSmallClass/save',
+                method: 'post',
+                data: JSON.stringify(params),
+                dataType: 'JSON',
+                contentType:"application/json",
+                success: function(res) {
+                    layer.close(loading);
+                    if(res.code == 200) {
+                        layer.msg(res.message, { icon: 1, time: 1000 }, function () {
+                            var index = parent.layer.getFrameIndex(window.name);
+                            parent.layui.table.reload('jftSmallClass');
+                            parent.layer.close(index);
+                        });
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 2
+                        });
+                    }
+                }
+            })
+            return false;
+        });
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/jft/classList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/jft/classList.jsp
new file mode 100644
index 0000000..e08855c
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/jft/classList.jsp
@@ -0,0 +1,239 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" id="form1" action="" style="margin-top: 10px;">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">标题</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="title" id="title" placeholder="请输入标题"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <div class="mb50 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-hide" id="jftSmallClass" lay-filter="jftSmallClass"></table>
+        </div>
+    </div>
+</div>
+<script type="text/html" id="leftBar">
+    <a class="layui-btn layui-btn-sm layui-btn-normal" lay-event="add">
+        <i class="layui-icon layui-icon-add-1"></i>新增
+    </a>
+    <a class="layui-btn layui-btn-sm" lay-event="search">
+        <i class="layui-icon layui-icon-search"></i>查询
+    </a>
+</script>
+
+<script type="text/html" id="toolBar">
+    <a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="edit">
+        <i class="layui-icon layui-icon-edit"></i>编辑
+    </a>
+    <a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="del">
+        <i class="layui-icon layui-icon-delete"></i>删除
+    </a>
+</script>
+
+<script type="text/html" id="photo">
+    <a href='javascript:void(0)' onclick='openImg("{{d.photo}}")'><img src="{{d.photo}}"/></a>
+</script>
+
+<script>
+    var table = null;
+    var layer = null;
+    layui.use(['table', 'layer'], function () {
+        table = layui.table;
+        layer = layui.layer;
+        var tableIns = table.render({
+            elem: '#jftSmallClass'
+            , url: '${ctx}/jftSmallClass/page'
+            , id: 'jftSmallClass'
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            , toolbar: '#leftBar' //开启头部工具栏，并为其绑定左侧模板
+            , defaultToolbar: ['filter']
+            , defaultToolbar: ['filter', 'exports', 'print', { //自定义头部工具栏右侧图标。如无需自定义，去除该参数即可
+                title: '提示'
+                , layEvent: 'LAYTABLE_TIPS'
+                , icon: 'layui-icon-tips'
+            }]
+            , title: '缴费通小课堂信息表'
+            , cols: [[
+                {type: 'checkbox', fixed: 'left', hidden: true}
+                , {field: 'numbers', title: '序号', fixed: 'left', unresize: true, width: 80, type: 'numbers'}
+                , {field: 'title', title: '标题'}
+                , {field: 'describe', title: '描述'}
+                , {field: 'content', title: '内容'}
+                , {field: 'photo', title: '图片', width: 120, align: "center", templet: '#photo'}
+                , {field: 'url', title: 'url'}
+                , {field: 'sort', title: '排序'}
+                , {field: 'status', title: '状态',templet: function (d){
+                    if(d.status === 1){
+                        return "<span style='color: green'>正常</span>";
+                    }else{
+                        return "<span style='color: red'>不显示</span>";
+                    }
+                    }}
+                , {
+                    field: 'createTime',
+                    title: '创建时间',
+                    templet: "<div>{{layui.util.toDateString(d.createTime,'yyyy-MM-dd HH:mm')}}</div>"
+                }
+                , {fixed: 'right', title: '操作', width: 160, toolbar: '#toolBar'}
+            ]]
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , page: true
+        });
+        table.on('tool(jftSmallClass)', function (obj) { //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            var data = obj.data; //获得当前行数据
+            var layEvent = obj.event; //获得 lay-event 对应的值（也可以是表头的 event 参数对应的值）
+            if (layEvent === 'del') { //删除
+                layer.confirm('真的删除么?', {icon: 3}, function (index) {
+                    obj.del(); //删除对应行（tr）的DOM结构，并更新缓存
+                    layer.close(index);
+                    del(data);
+                    //向服务端发送删除指令
+                });
+            } else if (layEvent === 'edit') { //编辑
+                //do something
+                toAdd(obj.data);
+                //同步更新缓存对应的值
+                // obj.update({
+                //     username: '123'
+                //     ,title: 'xxx'
+                // });
+            }
+        });
+
+        //监听头工具栏事件
+        table.on('toolbar(jftSmallClass)', function (obj) {
+            switch (obj.event) {
+                case 'add':
+                    // 添加
+                    toAdd();
+                    break;
+                case 'search':
+                    var params = serialize($('#form1'));
+                    table.reload('jftSmallClass', {
+                        where: params
+                        , page: {
+                            size: 10
+                            , current: 1
+                        }
+                    });
+                    break;
+            }
+        });
+
+        function toAdd(obj) {
+            var url = '${ctx}/jftSmallClass/detail';
+            var title = "新增";
+            if (obj != undefined) {
+                url = "${ctx}/jftSmallClass/detail/" + obj.id;
+                title = "编辑"
+            }
+            var index = layer.open({
+                type: 2
+                , shade: 0.5
+                , title: title
+                , maxmin: true
+                , content: url
+                , area: ['600px', '700px']
+                , end: function () {
+
+                }
+            });
+        }
+
+        function del(obj) {
+            $.ajax({
+                url: '${ctx}/jftSmallClass/del/' + obj.id,
+                method: 'DELETE',
+                dataType: 'JSON',
+                contentType: "application/json",
+                success: function (res) {
+                    layer.msg(res.message, {
+                        icon: res.code == 200 ? 1: 2
+                    });
+                }
+            })
+        }
+    });
+    function openImg(url) {
+        if (url) {
+            var img = new Image();
+            img.src = url;
+            //var height = img.height + 50; // 原图片大小
+            //var width = img.width; //原图片大小
+            var imgHtml = "<img src='" + url + "' width='500px' height='500px'/>";
+            //弹出层
+            layer.open({
+                type: 1,
+                shade: 0.8,
+                offset: 'auto',
+                area: [500 + 'px', 550 + 'px'],  // area: [width + 'px',height+'px']  //原图显示
+                shadeClose: true,
+                scrollbar: false,
+                title: "预览", //不显示标题
+                content: imgHtml, //捕获的元素，注意：最好该指定的元素要存放在body最外层，否则可能被其它的相对元素所影响
+                cancel: function () {
+                    //layer.msg('捕获就是从页面已经存在的元素上，包裹layer的结构', { time: 5000, icon: 6 });
+                }
+            });
+        }
+    }
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/jft/mercDetail.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/jft/mercDetail.jsp
new file mode 100644
index 0000000..5245c40
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/jft/mercDetail.jsp
@@ -0,0 +1,154 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp" />
+    <style>
+        .layui-form-item{
+            margin-top: 10px;
+        }
+        .layui-form{
+            width: 75%;
+            margin-left: 10%;
+        }
+    </style>
+</head>
+<body>
+<form class="layui-form" action="" id="addForm">
+    <input name="id" value="${entity.id}" hidden/>
+    <div class="layui-form-item">
+        <label class="layui-form-label">标题</label>
+        <div class="layui-input-block">
+            <input name="title" type="text" value="${entity.title}" autocomplete="off" maxlength="11" lay-verify="required" placeholder="标题" class="layui-input"/>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">简介</label>
+        <div class="layui-input-block">
+            <input name="describe" type="text" value="${entity.describe}" lay-verify="required" autocomplete="off" maxlength="50"  placeholder="简介" class="layui-input" />
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">内容</label>
+        <div class="layui-input-block">
+            <textarea class="layui-textarea" id="content" name="content">${entity.content}</textarea>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">url</label>
+        <div class="layui-input-block">
+            <input name="url" type="text" value="${entity.url}" autocomplete="off"  placeholder="url" class="layui-input" />
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">图片</label>
+        <div class="layui-input-block">
+            <button type="button" class="layui-btn" id="upload"><i class="layui-icon">&#xe67c;</i>上传图片</button>
+            <div class="prev-image" style="margin-top: 5px;display: ${empty entity || empty entity.photo ? 'none' : 'block'}">
+                <img src="${entity.photo}" id="prevImg" alt="图片" style="height: 100px;border: 1px solid #e1e1e1;" />
+            </div>
+            <input name="photoBaseStr" id="photoBaseStr" type="hidden" value="${entity.photoBaseStr}"/>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">排序</label>
+        <div class="layui-input-block">
+            <input name="sort" type="number" value="${entity.sort}" autocomplete="off" maxlength="8"  placeholder="排序" class="layui-input" />
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">是否显示</label>
+        <div class="layui-input-block">
+            <select name="status" id="status" lay-verify="required">
+               <option value="">请选择</option>
+                <option value="1" ${empty entity || entity.status eq 1 ? 'selected' : ''}>是</option>
+                <option value="-1" ${entity.status eq -1 ? 'selected' : ''}>否</option>
+            </select>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button class="layui-btn" lay-submit lay-filter="formDemo">立即提交</button>
+            <button type="button" id="close" class="layui-btn layui-btn-primary">关闭</button>
+        </div>
+    </div>
+</form>
+<script>
+    layui.use(['form','layer','upload'], function(){
+        let layer = layui.layer
+            , form = layui.form, upload = layui.upload;
+        $('#close').click(function() {
+            parent.layer.closeAll();
+        });
+        var up = upload.render({
+            elem: '#upload' //绑定元素
+            ,url: '/api/upload/' //上传接口
+            ,auto:false
+            ,acceptMime:"image/*"
+            ,accept:"images"
+            ,size : 1024 //最大上传1M的图片
+            ,choose: function(obj){
+                //将每次选择的文件追加到文件队列
+                var files = obj.pushFile();
+                //预读本地文件，如果是多文件，则会遍历。(不支持ie8/9)
+                obj.preview(function(index, file, result){
+                    $(".prev-image").show();
+                    $("#prevImg").attr("src",result)
+                    $("#photoBaseStr").val(result);
+                });
+            }
+            ,done: function(res){
+                //上传完毕回调
+            }
+            ,error: function(){
+                //请求异常回调
+            }
+        });
+        //监听提交
+        form.on('submit(formDemo)', function(data){
+            var loading = layer.msg('数据提交中...', {icon: 16,shade: 0.3,time: false});
+            let params = data.field;
+            params.content = um.getContent();
+            $.ajax({
+                url: '${ctx}/jftSmallClass/save',
+                method: 'post',
+                data: JSON.stringify(params),
+                dataType: 'JSON',
+                contentType:"application/json",
+                success: function(res) {
+                    layer.close(loading);
+                    if(res.code == 200) {
+                        layer.msg(res.message, { icon: 1, time: 1000 }, function () {
+                            var index = parent.layer.getFrameIndex(window.name);
+                            parent.layui.table.reload('jftSmallClass');
+                            parent.layer.close(index);
+                        });
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 2
+                        });
+                    }
+                }
+            })
+            return false;
+        });
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/jft/mercList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/jft/mercList.jsp
new file mode 100644
index 0000000..1632715
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/jft/mercList.jsp
@@ -0,0 +1,255 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" id="form1" action="" style="margin-top: 10px;">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">用户ID</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="userId" id="userId" placeholder="用户ID"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">商户编号</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="merchantCode" id="merchantCode" placeholder="商户编号"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">商户名称</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="merchantName" id="merchantName" placeholder="请输入商户名称"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <div class="mb50 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-hide" id="jftMercInfo" lay-filter="jftMercInfo"></table>
+        </div>
+    </div>
+</div>
+<script type="text/html" id="leftBar">
+    <a class="layui-btn layui-btn-sm" lay-event="search">
+        <i class="layui-icon layui-icon-search"></i>查询
+    </a>
+</script>
+
+<script type="text/html" id="toolBar">
+<%--    <a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="edit">--%>
+<%--        <i class="layui-icon layui-icon-edit"></i>编辑--%>
+<%--    </a>--%>
+    <a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="del">
+        <i class="layui-icon layui-icon-delete"></i>删除
+    </a>
+</script>
+
+<script type="text/html" id="frontPic">
+    <a href='javascript:void(0)' onclick='openImg("{{d.frontPic}}")'><img src="{{d.frontPic}}"/></a>
+</script>
+
+<script type="text/html" id="cashDesk">
+    <a href='javascript:void(0)' onclick='openImg("{{d.cashDesk}}")'><img src="{{d.cashDesk}}"/></a>
+</script>
+
+<script type="text/html" id="interior">
+    <a href='javascript:void(0)' onclick='openImg("{{d.interior}}")'><img src="{{d.interior}}"/></a>
+</script>
+
+<script>
+    var table = null;
+    var layer = null;
+    layui.use(['table', 'layer'], function () {
+        table = layui.table;
+        layer = layui.layer;
+        var tableIns = table.render({
+            elem: '#jftMercInfo'
+            , url: '${ctx}/jftMercInfo/page'
+            , id: 'jftMercInfo'
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            , toolbar: '#leftBar' //开启头部工具栏，并为其绑定左侧模板
+            , defaultToolbar: ['filter']
+            , defaultToolbar: ['filter', 'exports', 'print', { //自定义头部工具栏右侧图标。如无需自定义，去除该参数即可
+                title: '提示'
+                , layEvent: 'LAYTABLE_TIPS'
+                , icon: 'layui-icon-tips'
+            }]
+            , title: '缴费通商户信息'
+            , cols: [[
+                {type: 'checkbox', fixed: 'left', hidden: true}
+                , {field: 'numbers', title: '序号', fixed: 'left', unresize: true, width: 80, type: 'numbers'}
+                , {field: 'userId', title: '用户ID'}
+                , {field: 'merchantCode', title: '商户编号'}
+                , {field: 'merchantName', title: '商户名称'}
+                , {field: 'mcc', title: '经营类目'}
+                , {field: 'frontPic', title: '门头照', align: "center", templet: '#frontPic'}
+                , {field: 'cashDesk', title: '收银台照', align: "center", templet: '#cashDesk'}
+                , {field: 'interior', title: '内景照', align: "center", templet: '#interior'}
+                , {field: 'address', title: '省市区',templet: function (d){
+                        return d.province + "-" + d.city + "-" + d.district
+                    }}
+                , {
+                    field: 'createTime',
+                    title: '创建时间',
+                    templet: "<div>{{layui.util.toDateString(d.createTime,'yyyy-MM-dd HH:mm')}}</div>"
+                }
+                , {fixed: 'right', title: '操作', width: 160, toolbar: '#toolBar'}
+            ]]
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , page: true
+        });
+        table.on('tool(jftMercInfo)', function (obj) { //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            var data = obj.data; //获得当前行数据
+            var layEvent = obj.event; //获得 lay-event 对应的值（也可以是表头的 event 参数对应的值）
+            if (layEvent === 'del') { //删除
+                layer.confirm('真的删除么?', {icon: 3}, function (index) {
+                    obj.del(); //删除对应行（tr）的DOM结构，并更新缓存
+                    layer.close(index);
+                    del(data);
+                    //向服务端发送删除指令
+                });
+            } else if (layEvent === 'edit') { //编辑
+                //do something
+                toAdd(obj.data);
+                //同步更新缓存对应的值
+                // obj.update({
+                //     username: '123'
+                //     ,title: 'xxx'
+                // });
+            }
+        });
+
+        //监听头工具栏事件
+        table.on('toolbar(jftMercInfo)', function (obj) {
+            switch (obj.event) {
+                case 'add':
+                    // 添加
+                    toAdd();
+                    break;
+                case 'search':
+                    var params = serialize($('#form1'));
+                    table.reload('jftMercInfo', {
+                        where: params
+                        , page: {
+                            size: 10
+                            , current: 1
+                        }
+                    });
+                    break;
+            }
+        });
+
+        function toAdd(obj) {
+            var url = '${ctx}/jftMercInfo/detail';
+            var title = "新增";
+            if (obj != undefined) {
+                url = "${ctx}/jftMercInfo/detail/" + obj.id;
+                title = "编辑"
+            }
+            var index = layer.open({
+                type: 2
+                , shade: 0.5
+                , title: title
+                , maxmin: true
+                , content: url
+                , area: ['600px', '700px']
+                , end: function () {
+
+                }
+            });
+        }
+
+        function del(obj) {
+            $.ajax({
+                url: '${ctx}/jftMercInfo/del/' + obj.id,
+                method: 'DELETE',
+                dataType: 'JSON',
+                contentType: "application/json",
+                success: function (res) {
+                    layer.msg(res.message, {
+                        icon: res.code == 200 ? 1: 2
+                    });
+                }
+            })
+        }
+    });
+    function openImg(url) {
+        if (url) {
+            var img = new Image();
+            img.src = url;
+            //var height = img.height + 50; // 原图片大小
+            //var width = img.width; //原图片大小
+            var imgHtml = "<img src='" + url + "' width='500px' height='500px'/>";
+            //弹出层
+            layer.open({
+                type: 1,
+                shade: 0.8,
+                offset: 'auto',
+                area: [500 + 'px', 550 + 'px'],  // area: [width + 'px',height+'px']  //原图显示
+                shadeClose: true,
+                scrollbar: false,
+                title: "预览", //不显示标题
+                content: imgHtml, //捕获的元素，注意：最好该指定的元素要存放在body最外层，否则可能被其它的相对元素所影响
+                cancel: function () {
+                    //layer.msg('捕获就是从页面已经存在的元素上，包裹layer的结构', { time: 5000, icon: 6 });
+                }
+            });
+        }
+    }
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/jft/orderList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/jft/orderList.jsp
new file mode 100644
index 0000000..55ee6a7
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/jft/orderList.jsp
@@ -0,0 +1,232 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" id="form1" action="" style="margin-top: 10px;">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">用户ID</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="userId" id="userId" placeholder="用户ID"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">订单号</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="orderNumber" id="orderNumber" placeholder="订单号"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">商户名称</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="merchantName" id="merchantName" placeholder="商户名称"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">支付状态</label>
+                            <div class="layui-input-block">
+                               <select class="layui-select" name="status">
+                                   <option value="">请选择</option>
+                                   <option value="01">待支付</option>、
+                                   <option value="02">已支付</option>
+                               </select>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <div class="mb50 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-hide" id="jftOrder" lay-filter="jftOrder"></table>
+        </div>
+    </div>
+</div>
+<script type="text/html" id="leftBar">
+    <a class="layui-btn layui-btn-sm" lay-event="search">
+        <i class="layui-icon layui-icon-search"></i>查询
+    </a>
+</script>
+
+<script>
+    var table = null;
+    var layer = null;
+    layui.use(['table', 'layer'], function () {
+        table = layui.table;
+        layer = layui.layer;
+        var tableIns = table.render({
+            elem: '#jftOrder'
+            , url: '${ctx}/jftOrder/page'
+            , id: 'jftOrder'
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            , toolbar: '#leftBar' //开启头部工具栏，并为其绑定左侧模板
+            , defaultToolbar: ['filter']
+            , defaultToolbar: ['filter', 'exports', 'print', { //自定义头部工具栏右侧图标。如无需自定义，去除该参数即可
+                title: '提示'
+                , layEvent: 'LAYTABLE_TIPS'
+                , icon: 'layui-icon-tips'
+            }]
+            , title: '缴费通订单信息表'
+            , cols: [[
+                {type: 'checkbox', fixed: 'left', hidden: true}
+                , {field: 'userId', title: '用户ID',width:80}
+                , {
+                    field: 'orderNumber', align: "center", title: '订单号', templet: function (d) {
+                        return d.orderNumber + "<br/>" + d.transNo + "<br/>" + d.channelTransNo + "<br/>" + d.mercOrderNo;
+                    }
+                }
+                , {field: 'merchantName', title: '商户名称'}
+                , {field: 'amount', title: '订单金额',templet:function (d){
+                        if(d.amount){
+                            return d.amount.toFixed(2);
+                        }
+                        return "0.00";
+                    }}
+                , {field: 'channelFee', title: '通道手续费',templet:function (d){
+                    if(d.channelFee){
+                        return d.channelFee.toFixed(2);
+                    }
+                    return "0.00";
+                }}
+                , {field: 'mercFee', title: '商户手续费',templet:function (d){
+                        if(d.mercFee){
+                            return d.mercFee.toFixed(2);
+                        }
+                        return "0.00";
+                    }}
+                , {field: 'cashFee', title: '提现手续费',templet:function (d){
+                        if(d.cashFee){
+                            return d.cashFee.toFixed(2);
+                        }
+                        return "0.00";
+                    }}
+                , {field: 'profitFee', title: '收益金额',templet:function (d){
+                        if(d.profitFee){
+                            return d.profitFee.toFixed(2);
+                        }
+                        return "0.00";
+                    }}
+                , {field: 'rate', title: '费率(%)',templet:function (d){
+                    if(d.rate){
+                        return d.rate / 100 + "%";
+                    }
+                    return "-";
+                }}
+                , {field: 'payUserCity', title: '付款城市'}
+                , {field: 'name', title: '输入项',templet: function (d){
+                    let str = "";
+                    if(d.name){
+                        str = str + d.name + "-";
+                    }
+                    if(d.phone){
+                        str = str + d.phone + "-";
+                    }
+                    if(d.goods){
+                        str = str + d.goods + "-";
+                    }
+                    if(d.address){
+                        str = str + d.address + "-";
+                    }
+                    if(str){
+                        str = str.substring(0,str.length - 1)
+                    }
+                    return str;
+                }}
+                , {field: 'status', title: '交易状态',templet: function (d){
+                    if(d.status === "02"){
+                        return "<span style='color: green'>已支付</span>";
+                    }else{
+                        return "<span style='color: red'>待支付</span>";
+                    }
+                    }}
+                , {
+                    field: 'date',
+                    title: '创建/交易时间',
+                    width: 130,
+                    templet:function (d){
+                        let date = layui.util.toDateString(d.createTime,'yyyy-MM-dd HH:mm:ss');
+                        if(d.transTime){
+                            date = date + "<br/>" + layui.util.toDateString(d.transTime,'yyyy-MM-dd HH:mm:ss');
+                        }
+                        return date;
+                    }
+                }
+            ]]
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , page: true
+        });
+        //监听头工具栏事件
+        table.on('toolbar(jftOrder)', function (obj) {
+            switch (obj.event) {
+                case 'add':
+                    // 添加
+                    toAdd();
+                    break;
+                case 'search':
+                    var params = serialize($('#form1'));
+                    table.reload('jftOrder', {
+                        where: params
+                        , page: {
+                            size: 10
+                            , current: 1
+                        }
+                    });
+                    break;
+            }
+        });
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/jft/rateDetail.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/jft/rateDetail.jsp
new file mode 100644
index 0000000..a1ba316
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/jft/rateDetail.jsp
@@ -0,0 +1,78 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp" />
+    <style>
+        .layui-form-item{
+            margin-top: 10px;
+        }
+        .layui-form{
+            width: 75%;
+            margin-left: 10%;
+        }
+    </style>
+</head>
+<body>
+<form class="layui-form" action="" id="addForm">
+    <input name="id" value="${entity.id}" hidden/>
+    <div class="layui-form-item">
+        <label class="layui-form-label">支付宝费率</label>
+        <div class="layui-input-block">
+            <input name="title" type="text" value="${entity.aliRate}" autocomplete="off" maxlength="11" lay-verify="required" placeholder="支付宝费率" class="layui-input"/>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button class="layui-btn" lay-submit lay-filter="formDemo">立即提交</button>
+            <button type="button" id="close" class="layui-btn layui-btn-primary">关闭</button>
+        </div>
+    </div>
+</form>
+<script>
+    layui.use(['form','layer'], function(){
+        let layer = layui.layer
+            , form = layui.form;
+        $('#close').click(function() {
+            parent.layer.closeAll();
+        });
+        //监听提交
+        form.on('submit(formDemo)', function(data){
+            var loading = layer.msg('数据提交中...', {icon: 16,shade: 0.3,time: false});
+            $.ajax({
+                url: '${ctx}/jftMercRate/save',
+                method: 'post',
+                data: JSON.stringify(data.field),
+                dataType: 'JSON',
+                contentType:"application/json",
+                success: function(res) {
+                    layer.close(loading);
+                    if(res.code == 200) {
+                        layer.msg(res.message, { icon: 1, time: 1000 }, function () {
+                            var index = parent.layer.getFrameIndex(window.name);
+                            parent.layui.table.reload('jftMercRate');
+                            parent.layer.close(index);
+                        });
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 2
+                        });
+                    }
+                }
+            })
+            return false;
+        });
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/jft/rateList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/jft/rateList.jsp
new file mode 100644
index 0000000..76665a1
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/jft/rateList.jsp
@@ -0,0 +1,209 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" id="form1" action="" style="margin-top: 10px;">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">用户ID</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="userId" id="userId" placeholder="用户ID"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">通道商编</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="merchantId" id="merchantId" placeholder="通道商编"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <div class="mb50 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-hide" id="jftMercRate" lay-filter="jftMercRate"></table>
+        </div>
+    </div>
+</div>
+<script type="text/html" id="leftBar">
+    <a class="layui-btn layui-btn-sm" lay-event="search">
+        <i class="layui-icon layui-icon-search"></i>查询
+    </a>
+</script>
+
+<script type="text/html" id="toolBar">
+<%--    <a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="edit">--%>
+<%--        <i class="layui-icon layui-icon-edit"></i>编辑--%>
+<%--    </a>--%>
+    <a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="del">
+        <i class="layui-icon layui-icon-delete"></i>删除
+    </a>
+</script>
+
+<script>
+    var table = null;
+    var layer = null;
+    layui.use(['table', 'layer'], function () {
+        table = layui.table;
+        layer = layui.layer;
+        var tableIns = table.render({
+            elem: '#jftMercRate'
+            , url: '${ctx}/jftMercRate/page'
+            , id: 'jftMercRate'
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            , toolbar: '#leftBar' //开启头部工具栏，并为其绑定左侧模板
+            , defaultToolbar: ['filter']
+            , defaultToolbar: ['filter', 'exports', 'print', { //自定义头部工具栏右侧图标。如无需自定义，去除该参数即可
+                title: '提示'
+                , layEvent: 'LAYTABLE_TIPS'
+                , icon: 'layui-icon-tips'
+            }]
+            , title: '缴费通商户费率信息'
+            , cols: [[
+                {type: 'checkbox', fixed: 'left', hidden: true}
+                , {field: 'numbers', title: '序号', fixed: 'left', unresize: true, width: 80, type: 'numbers'}
+                , {field: 'userId', title: '用户ID'}
+                , {field: 'levelCode', title: '用户等级'}
+                , {field: 'consultRate', title: '参考费率(%)',templet:function (d){
+                        return d.consultRate / 100 + "%"
+                    }}
+                , {field: 'aliRate', title: '实际费率(%)',templet:function (d){
+                    if(d.consultRate != d.aliRate){
+                        return "<span style='color: red'>"+d.aliRate / 100 +"%</span>"
+                    }
+                    return d.aliRate / 100 + "%"
+                }}
+                , {field: 'merchantId', title: '通道商编'}
+                , {
+                    field: 'createTime',
+                    title: '创建时间',
+                    templet: "<div>{{layui.util.toDateString(d.createTime,'yyyy-MM-dd HH:mm')}}</div>"
+                }
+                , {fixed: 'right', title: '操作', width: 160, toolbar: '#toolBar'}
+            ]]
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , page: true
+        });
+        table.on('tool(jftMercRate)', function (obj) { //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            var data = obj.data; //获得当前行数据
+            var layEvent = obj.event; //获得 lay-event 对应的值（也可以是表头的 event 参数对应的值）
+            if (layEvent === 'del') { //删除
+                layer.confirm('真的删除么?', {icon: 3}, function (index) {
+                    obj.del(); //删除对应行（tr）的DOM结构，并更新缓存
+                    layer.close(index);
+                    del(data);
+                    //向服务端发送删除指令
+                });
+            } else if (layEvent === 'edit') { //编辑
+                toAdd(obj.data);
+            }
+        });
+
+        //监听头工具栏事件
+        table.on('toolbar(jftMercRate)', function (obj) {
+            switch (obj.event) {
+                case 'add':
+                    // 添加
+                    toAdd();
+                    break;
+                case 'search':
+                    var params = serialize($('#form1'));
+                    table.reload('jftMercRate', {
+                        where: params
+                        , page: {
+                            size: 10
+                            , current: 1
+                        }
+                    });
+                    break;
+            }
+        });
+
+        function toAdd(obj) {
+            var url = '${ctx}/jftMercRate/detail';
+            var title = "新增";
+            if (obj != undefined) {
+                url = "${ctx}/jftMercRate/detail/" + obj.id;
+                title = "编辑"
+            }
+            var index = layer.open({
+                type: 2
+                , shade: 0.5
+                , title: title
+                , maxmin: true
+                , content: url
+                , area: ['600px', '500px']
+                , end: function () {
+
+                }
+            });
+        }
+
+        function del(obj) {
+            $.ajax({
+                url: '${ctx}/jftMercRate/del/' + obj.id,
+                method: 'DELETE',
+                dataType: 'JSON',
+                contentType: "application/json",
+                success: function (res) {
+                    layer.msg(res.message, {
+                        icon: res.code == 200 ? 1: 2
+                    });
+                }
+            })
+        }
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/jft/rateRecordList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/jft/rateRecordList.jsp
new file mode 100644
index 0000000..b7424a0
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/jft/rateRecordList.jsp
@@ -0,0 +1,182 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" id="form1" action="" style="margin-top: 10px;">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">通道商编</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="merchantId" id="merchantId" placeholder="通道商编"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <div class="mb50 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-hide" id="jftRateRecord" lay-filter="jftRateRecord"></table>
+        </div>
+    </div>
+</div>
+<script type="text/html" id="leftBar">
+    <a class="layui-btn layui-btn-sm" lay-event="search">
+        <i class="layui-icon layui-icon-search"></i>查询
+    </a>
+</script>
+<script type="text/html" id="toolBar">
+    <a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="del">
+        <i class="layui-icon layui-icon-delete"></i>删除
+    </a>
+</script>
+
+
+<script>
+    var table = null;
+    var layer = null;
+    layui.use(['table', 'layer'], function () {
+        table = layui.table;
+        layer = layui.layer;
+        var tableIns = table.render({
+            elem: '#jftRateRecord'
+            , url: '${ctx}/jftRateRecord/page'
+            , id: 'jftRateRecord'
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            , toolbar: '#leftBar' //开启头部工具栏，并为其绑定左侧模板
+            , defaultToolbar: ['filter']
+            , defaultToolbar: ['filter', 'exports', 'print', { //自定义头部工具栏右侧图标。如无需自定义，去除该参数即可
+                title: '提示'
+                , layEvent: 'LAYTABLE_TIPS'
+                , icon: 'layui-icon-tips'
+            }]
+            , title: '缴费通商户费率变更信息'
+            , cols: [[
+                {type: 'checkbox', fixed: 'left', hidden: true}
+                , {field: 'numbers', title: '序号', fixed: 'left', unresize: true, width: 80, type: 'numbers'}
+                , {field: 'merchantId', title: '通道商编'}
+                , {field: 'aliRate', title: '费率(%)',templet:function (d){
+                        return d.aliRate / 100 + "%"
+                    }}
+                , {field: 'status', title: '状态',templet:function (d){
+                       if(d.status === "0"){
+                           return "<span style='color: blue'>变更中</span>"
+                       }
+                        if(d.status === "1"){
+                            return "<span style='color: green'>变更成功</span>"
+                        }
+                        if(d.status === "2"){
+                            return "<span style='color: red'>变更失败</span>"
+                        }
+                    }}
+                , {field: 'operationDate',title: '变更日期'}
+                , {
+                    field: 'createTime',
+                    title: '创建时间',
+                    templet: "<div>{{layui.util.toDateString(d.createTime,'yyyy-MM-dd HH:mm')}}</div>"
+                }
+                , {fixed: 'right', title: '操作', width: 160, toolbar: '#toolBar'}
+            ]]
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , page: true
+        });
+        table.on('tool(jftRateRecord)', function (obj) { //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            var data = obj.data; //获得当前行数据
+            var layEvent = obj.event; //获得 lay-event 对应的值（也可以是表头的 event 参数对应的值）
+            if (layEvent === 'del') { //删除
+                layer.confirm('真的删除么?', {icon: 3}, function (index) {
+                    obj.del(); //删除对应行（tr）的DOM结构，并更新缓存
+                    layer.close(index);
+                    del(data);
+                    //向服务端发送删除指令
+                });
+            } else if (layEvent === 'edit') { //编辑
+                toAdd(obj.data);
+            }
+        });
+
+        //监听头工具栏事件
+        table.on('toolbar(jftRateRecord)', function (obj) {
+            switch (obj.event) {
+                case 'add':
+                    // 添加
+                    toAdd();
+                    break;
+                case 'search':
+                    var params = serialize($('#form1'));
+                    table.reload('jftRateRecord', {
+                        where: params
+                        , page: {
+                            size: 10
+                            , current: 1
+                        }
+                    });
+                    break;
+            }
+        });
+        function del(obj) {
+            $.ajax({
+                url: '${ctx}/jftRateRecord/del/' + obj.id,
+                method: 'DELETE',
+                dataType: 'JSON',
+                contentType: "application/json",
+                success: function (res) {
+                    layer.msg(res.message, {
+                        icon: res.code == 200 ? 1: 2
+                    });
+                }
+            })
+        }
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/jft/receiptList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/jft/receiptList.jsp
new file mode 100644
index 0000000..29f1c94
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/jft/receiptList.jsp
@@ -0,0 +1,240 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" id="form1" action="" style="margin-top: 10px;">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">用户ID</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="userId" id="userId" placeholder="用户ID"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">项目名称</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="projectName" id="projectName" placeholder="项目名称"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <div class="mb50 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-hide" id="jfReceiptInfo" lay-filter="jfReceiptInfo"></table>
+        </div>
+    </div>
+</div>
+<script type="text/html" id="leftBar">
+    <a class="layui-btn layui-btn-sm" lay-event="search">
+        <i class="layui-icon layui-icon-search"></i>查询
+    </a>
+</script>
+
+
+<script type="text/html" id="imageUrl">
+    <a href='javascript:void(0)' onclick='openImg("{{d.imageUrl}}")'><img src="{{d.imageUrl}}"/></a>
+</script>
+
+<script>
+    var table = null;
+    var layer = null;
+    layui.use(['table', 'layer'], function () {
+        table = layui.table;
+        layer = layui.layer;
+        var tableIns = table.render({
+            elem: '#jfReceiptInfo'
+            , url: '${ctx}/jfReceiptInfo/page'
+            , id: 'jfReceiptInfo'
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            , toolbar: '#leftBar' //开启头部工具栏，并为其绑定左侧模板
+            , defaultToolbar: ['filter']
+            , defaultToolbar: ['filter', 'exports', 'print', { //自定义头部工具栏右侧图标。如无需自定义，去除该参数即可
+                title: '提示'
+                , layEvent: 'LAYTABLE_TIPS'
+                , icon: 'layui-icon-tips'
+            }]
+            , title: '缴费通收款单信息表'
+            , cols: [[
+                {type: 'checkbox', fixed: 'left', hidden: true}
+                , {field: 'numbers', title: '序号', fixed: 'left', unresize: true, width: 80, type: 'numbers'}
+                , {field: 'userId', title: '用户ID'}
+                , {field: 'projectName', title: '项目名称'}
+                , {field: 'amount', title: '金额',templet: function (d){
+                    return d.amount.toFixed(2);
+                    }}
+                , {field: 'ip', title: 'ip地址'}
+                , {field: 'imageUrl', title: '二维码',align: "center", templet: '#imageUrl'}
+                , {field: 'status', title: '状态',templet: function (d){
+                    if(d.status === 1){
+                        return "<span style='color: green'>正常</span>";
+                    }else{
+                        return "<span style='color: red'>关闭</span>";
+                    }
+                    }}
+                , {
+                    field: 'createTime',
+                    title: '开始时间',
+                    templet: "<div>{{layui.util.toDateString(d.createTime,'yyyy-MM-dd HH:mm')}}</div>"
+                }
+                , {
+                    field: 'endTime',
+                    title: '结束时间',
+                    templet: "<div>{{layui.util.toDateString(d.endTime,'yyyy-MM-dd HH:mm')}}</div>"
+                }
+            ]]
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , page: true
+        });
+        table.on('tool(jfReceiptInfo)', function (obj) { //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            var data = obj.data; //获得当前行数据
+            var layEvent = obj.event; //获得 lay-event 对应的值（也可以是表头的 event 参数对应的值）
+            if (layEvent === 'del') { //删除
+                layer.confirm('真的删除么?', {icon: 3}, function (index) {
+                    obj.del(); //删除对应行（tr）的DOM结构，并更新缓存
+                    layer.close(index);
+                    del(data);
+                    //向服务端发送删除指令
+                });
+            } else if (layEvent === 'edit') { //编辑
+                //do something
+                toAdd(obj.data);
+                //同步更新缓存对应的值
+                // obj.update({
+                //     username: '123'
+                //     ,title: 'xxx'
+                // });
+            }
+        });
+
+        //监听头工具栏事件
+        table.on('toolbar(jfReceiptInfo)', function (obj) {
+            switch (obj.event) {
+                case 'add':
+                    // 添加
+                    toAdd();
+                    break;
+                case 'search':
+                    var params = serialize($('#form1'));
+                    table.reload('jfReceiptInfo', {
+                        where: params
+                        , page: {
+                            size: 10
+                            , current: 1
+                        }
+                    });
+                    break;
+            }
+        });
+
+        function toAdd(obj) {
+            var url = '${ctx}/jfReceiptInfo/detail';
+            var title = "新增";
+            if (obj != undefined) {
+                url = "${ctx}/jfReceiptInfo/detail/" + obj.id;
+                title = "编辑"
+            }
+            var index = layer.open({
+                type: 2
+                , shade: 0.5
+                , title: title
+                , maxmin: true
+                , content: url
+                , area: ['600px', '700px']
+                , end: function () {
+
+                }
+            });
+        }
+
+        function del(obj) {
+            $.ajax({
+                url: '${ctx}/jfReceiptInfo/del/' + obj.id,
+                method: 'DELETE',
+                dataType: 'JSON',
+                contentType: "application/json",
+                success: function (res) {
+                    layer.msg(res.message, {
+                        icon: res.code == 200 ? 1: 2
+                    });
+                }
+            })
+        }
+    });
+    function openImg(url) {
+        if (url) {
+            var img = new Image();
+            img.src = url;
+            //var height = img.height + 50; // 原图片大小
+            //var width = img.width; //原图片大小
+            var imgHtml = "<img src='" + url + "' width='500px' height='500px'/>";
+            //弹出层
+            layer.open({
+                type: 1,
+                shade: 0.8,
+                offset: 'auto',
+                area: [500 + 'px', 550 + 'px'],  // area: [width + 'px',height+'px']  //原图显示
+                shadeClose: true,
+                scrollbar: false,
+                title: "预览", //不显示标题
+                content: imgHtml, //捕获的元素，注意：最好该指定的元素要存放在body最外层，否则可能被其它的相对元素所影响
+                cancel: function () {
+                    //layer.msg('捕获就是从页面已经存在的元素上，包裹layer的结构', { time: 5000, icon: 6 });
+                }
+            });
+        }
+    }
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/level/levelBaseInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/level/levelBaseInfo.jsp
new file mode 100644
index 0000000..d662b80
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/level/levelBaseInfo.jsp
@@ -0,0 +1,105 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+
+<script type="text/javascript">
+     //渲染日历控件
+	layui.use(['layer', 'form','laydate'], function() {
+		var layer = layui.layer,
+			laydate = layui.laydate,
+			form = layui.form;
+		    form.render();
+		    laydate.render({
+		    	elem: '#createDtId',
+		    	value:$("#createDtId").val()
+		    	});
+	});
+     
+     
+
+	  layui.use('upload', function(){
+		  var upload = layui.upload;
+		  
+		  //执行实例
+		  var uploadInst = upload.render({
+		    elem: '#test1' //绑定元素
+		    ,url: '/upload/uploadFile' //上传接口
+		    ,done: function(res){
+		      //上传完毕回调
+		       
+		       console.log(res.fileName);		      
+		       console.log(res.url);		       	           	                  
+		       console.log(res.result); 
+		       $('#imgs').val(res.url);
+		       $('#demo1').attr('src', res.url); //图片链接（base64）
+		    }
+		    ,error: function(){
+		      //请求异常回调
+		    }
+		  });
+		});
+	var upload = layui.upload; //得到 upload 对象
+	 
+	//创建一个上传组件
+	upload.render({
+	  elem: '#id'
+	  ,url: 'test1'
+	  ,done: function(res, index, upload){ //上传后的回调
+		 
+	  } 
+	  ,accept: 'file' //允许上传的文件类型
+	  ,size: 20000 //最大允许上传的文件大小
+	  //,……
+	})
+	 
+     
+ </script>
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">  
+	<div class="tab-pane active">     
+		<div class="panel-body">
+			<div class="wrapper wrapper-content">
+				<div class="panel-form animated fadeInRight wp60 fc">
+					<div class="layui-form-item dn	has-error" >   
+						<label class="layui-form-label">id</label>  
+						<div class="layui-input-block">
+							<input type="text" name="id" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${level.id }" >
+						</div>  
+					</div>
+					<%-- <div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">等级</label>  
+						<div class="layui-input-block">
+							<input type="text" name="level" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${level.level }" >
+						</div>  
+					</div> --%>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">交易额</label>  
+						<div class="layui-input-block">
+							<input type="text" id="tradeMoney" name="tradeMoney" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${level.tradeMoney }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">实名认证数</label>  
+						<div class="layui-input-block">
+							<input type="text" id="authCount" name="authCount" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${level.authCount }" >
+						</div>  
+					</div>
+					<%-- <div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">等级名称</label>  
+						<div class="layui-input-block">
+							<input type="text" name="levelName" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${level.levelName }" >
+						</div>  
+					</div> --%>
+					<%-- <div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">等级对应费率</label>  
+						<div class="layui-input-block">
+							<input type="text" id="rate" name="rate" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${rate }" >
+						</div>  
+					</div> --%>
+					
+				
+				</div>
+			</div>
+		</div>  
+	</div>
+</form>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/level/levelDetails.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/level/levelDetails.jsp
new file mode 100644
index 0000000..25a08f5
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/level/levelDetails.jsp
@@ -0,0 +1,54 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>     
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">                      
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black"> 
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> 
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->                                     
+<meta name="viewport"
+	content="width=device-width, initial-scale=1.0, maximum-scale=1.0">   
+<jsp:include page="../../common.jsp" />
+<script type="text/javascript">
+    require("js/level/levelDetails.js");
+</script>
+<title>编辑</title>
+</head>                                 
+	<body class="lgraybg">            
+		<div class="	container-fluid animated fadeInRight col-sm-12">
+			<div class="panel-toolbar mt10 mb10 pt5 pb5 pl10 bdd whitebg">
+				<div class="buttons">
+					<a href="javascript:void(0);" class="layui-btn layui-btn-sm layui-btn-danger fa fa-save f12"><span>保存</span></a>
+					<a href="${ctx }/level/index?pageIndex=${pageIndex}"  class="layui-btn layui-btn-sm fa fa-back f12" id="goback"><span>返回</span></a>
+				</div>
+			</div>
+				<div class="tabs-container whitebg">
+					<div class="pt10 pl5 pr5">
+						<ul class="nav nav-tabs" id="nav-tabs">
+							<li class="active" data-action="base">
+								<a href="javascript:void(0);" >基本资料</a>
+							</li>
+							<li class="" data-action="functions">
+								<a href="javascript:void(0);"  >多功能输入</a>
+							</li>
+							<li class="" data-action="extends">
+								<a href="javascript:void(0);" >扩展属性</a>
+							</li>
+						</ul>
+						<div class="tab-content pt30 p30">               
+		
+						</div>     
+					</div>
+				</div>    
+		</div>
+		<!-- 隐藏域 -->
+		<input type="hidden" id="levelId" value="${level.id }"/>
+	</body>
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/level/levelExtendsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/level/levelExtendsInfo.jsp
new file mode 100644
index 0000000..592687a
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/level/levelExtendsInfo.jsp
@@ -0,0 +1,201 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>           
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> 
+<div class="tab-pane active">      
+	<div class="animated fadeInRight">
+		<div class="whitebg pl10 pr10">
+			<table class="table table-striped table-bordered table-hover">     
+				<thead> 
+					<tr>  
+						<th class="textc">序号</th>         
+						<th class="textc wp15">流水账号</th>
+						<th class="textc">日期</th>         
+						<th class="textc">财务类别</th>     
+						<th class="textc">金额</th>         
+						<th class="textc">银行</th>         
+						<th class="textc">发票</th>         
+						<th class="textc">客户名称</th>     
+						<th class="textc wp15">单号</th>    
+						<th class="textc">状态</th>         
+						<th class="textc">类别</th>         
+						<th class="textc">操作</th>         
+					</tr> 
+				</thead>
+				<tbody> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+                
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="green">支出</span></td>     
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+				</tbody>
+                
+			</table>  
+			<!-- footer -->  
+			<div class="clearfix mb10 pb20">          
+					<div class="layui-tab-item fr">       
+							<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+							<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>   
+							<div class="pagination dlblock vm" id="pagination"></div>
+							<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>            
+					</div>
+				</div>  
+		</div>      
+	</div>        
+</div>          
+                
+<script type="text/javascript">    
+//分页          
+$('#pagination').pagination({        
+	pageCount: 50,
+	jump: true,   
+	coping: true, 
+	homePage: '首页',    
+	endPage: '末页',     
+	prevContent: '上页', 
+	nextContent: '下页', 
+	callback: function(api) {          
+		$('.now').text(api.getCurrent());
+	}             
+});             
+</script>       
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/level/levelFunctionsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/level/levelFunctionsInfo.jsp
new file mode 100644
index 0000000..982ce84
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/level/levelFunctionsInfo.jsp
@@ -0,0 +1,130 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>		
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">      
+<div class="tab-pane active">
+				<div class="panel-body">
+					<div class="wrapper wrapper-content">     
+						<div class="panel-form animated fadeInRight wp60 fc">
+							<!-- 账号资料 -->
+			<div class="layui-form-item 	has-error">
+				<label class="layui-form-label">单行输入框<i class="red">*</i></label>
+				<div class="layui-input-block">
+					<input type="text" name="title" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input">
+				</div>                                         
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">自定义验证</label>
+				<div class="layui-input-inline ml30">
+					<input type="password" name="password" lay-verify="pass" placeholder="请输入密码" autocomplete="off" class="layui-input">
+				</div>
+				<div class="layui-form-mid layui-word-aux">请填写6到12位密码</div>
+			</div>
+			<div class="form-group">
+				<div class="layui-form-item">          
+					<label class="layui-form-label">单行选择框</label>
+					<div class="layui-input-block">
+						<select name="interest" lay-filter="aihao">  
+							<option value=""></option>
+							<option value="0">写作</option>         
+							<option value="1" selected="">阅读</option>
+							<option value="2">游戏</option>
+							<option value="3">音乐</option>
+							<option value="4">旅行</option>  
+						</select>              
+					</div>
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<div class="layui-inline">  
+					<label class="layui-form-label">范围</label>
+					<div class="layui-input-inline ml30">
+						<input type="text" name="price_min" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>                                     
+					<div class="layui-form-mid">-</div>
+					<div class="layui-input-inline">       
+						<input type="text" name="price_max" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>
+				</div>           
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">联动选择框</label>
+				<div class="layui-input-inline ml30">
+					<select name="quiz1">     
+						<option value="">请选择省</option>
+						<option value="浙江" selected="">浙江省</option> 
+						<option value="你的工号">江西省</option>           
+						<option value="你最喜欢的老师">福建省</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz2">
+						<option value="">请选择市</option>
+						<option value="杭州">杭州</option>
+						<option value="宁波" disabled="">宁波</option>
+						<option value="温州">温州</option>
+						<option value="温州">台州</option>
+						<option value="温州">绍兴</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz3">
+						<option value="">请选择县/区</option>
+						<option value="西湖区">西湖区</option>
+						<option value="余杭区">余杭区</option>
+						<option value="拱墅区">临安市</option>
+					</select>
+				</div>    
+			</div>
+			<div class="layui-form-item" pane="">   
+				<label class="layui-form-label">原始复选框</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="like1[write]" lay-skin="primary" title="写作" checked="">  
+					<input type="checkbox" name="like1[read]" lay-skin="primary" title="阅读">
+					<input type="checkbox" name="like1[game]" lay-skin="primary" title="游戏" disabled="">
+				</div>
+			</div>
+
+			<div class="layui-form-item">
+				<label class="layui-form-label">开关-默认关</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="close" lay-skin="switch" lay-text="ON|OFF">
+				</div>
+			</div>
+			<div class="layui-form-item">  
+				<label class="layui-form-label">单选框</label>
+				<div class="layui-input-block">
+					<input type="radio" name="sex" value="男" title="男" checked="">
+					<input type="radio" name="sex" value="女" title="女">
+					<input type="radio" name="sex" value="禁" title="禁用" disabled="">
+				</div>
+			</div>
+			<!--<div class="layui-form-item layui-form-text">
+				<label class="layui-form-label">上传图片</label>
+				<div class="layui-input-block">
+					<div class="layui-upload-drag w200 h200">
+						<i class="layui-icon"></i>          
+						<p>点击上传</p>
+					</div>
+				</div>
+			</div>-->
+				<div class="layui-form-item layui-form-text">
+					<label class="layui-form-label">普通文本域</label>  
+					<div class="layui-input-block">              
+						<textarea placeholder="请输入内容" class="layui-textarea"></textarea>
+					</div>
+				</div>
+			</div>
+		</div>   
+	</div>
+</div>
+</form>   
+<script type="text/javascript">
+	//form表单样式
+	layui.use(['layer', 'form'], function() {    
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+</script>                 
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/level/levelList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/level/levelList.jsp
new file mode 100644
index 0000000..1941251
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/level/levelList.jsp
@@ -0,0 +1,86 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black">
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->
+<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+<jsp:include page="../../common.jsp" />
+<script type="text/javascript">
+require("js/level/levelList.js");
+</script>
+<style type="text/css">
+	.layui-table th {
+		text-align: center;
+	}
+</style>
+</head>
+<body>
+	<div class="row animated fadeInRight" style="margin: 0;">
+		<div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+			<div class="toolbar-panel bdd">
+				<div class="toolbar-box">
+					<div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+						<!-- 顶部按钮 -->
+						<div class="buttons fl">							
+							<a class="layui-btn layui-btn-sm fa fa-edit f13" href="javascript:void(0);" onclick="initEditLevel()"><span>编辑</span></a>
+						</div>
+						<div class="tools fr">
+							<a href="javascript:void(0);" class="collapse dblock f14 dgray mr5"> 
+								<i class="fa-2x fa fa-angle-double-up"></i>
+							</a>
+						</div>
+					</div>
+				</div>
+				
+			</div>
+		</div>
+		<!-- 表单数据 -->
+		<div class="mb20 mt10">
+			<div class="whitebg pl10 pr10">
+				<table class="layui-table">
+					<thead>
+						<tr>
+							<th class="textc">
+								<div class="checker" id="allCheck">
+									<span class=""><input type="checkbox" value="" ></span>
+								</div>
+							</th>							
+							<th class="textc ">等级</th>
+							<th class="textc ">交易额</th>
+							<th class="textc ">实名认证数</th>
+							<th class="textc wp15">等级名称</th>
+							<th class="textc ">等级对应费率</th>							
+							<th class="textc">编辑</th>
+						</tr>
+					</thead>
+					<!-- 数据体 -->
+					<tbody id="data_content">
+					</tbody>
+				</table>
+			    
+			    <!-- footer -->
+				<div class="clearfix mb10 pb20">
+						<div class="layui-tab-item fr">
+								<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+								<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>
+								<div class="pagination dlblock vm" id="pagination"></div>
+								<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>
+						</div>
+					</div>
+	
+			</div>
+		</div>
+	</div>
+</body>
+
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/memberOrder/memberOrderBaseInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/memberOrder/memberOrderBaseInfo.jsp
new file mode 100644
index 0000000..909935e
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/memberOrder/memberOrderBaseInfo.jsp
@@ -0,0 +1,87 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">  
+	<div class="tab-pane active">     
+		<div class="panel-body">
+			<div class="wrapper wrapper-content">
+				<div class="panel-form animated fadeInRight wp60 fc">
+					<div class="layui-form-item dn	has-error" >   
+						<label class="layui-form-label">id</label>  
+						<div class="layui-input-block">
+							<input type="text" name="id" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${memberOrder.id }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">merchantCode</label>  
+						<div class="layui-input-block">
+							<input type="text" name="merchantCode" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${memberOrder.merchantCode }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">merchantName</label>  
+						<div class="layui-input-block">
+							<input type="text" name="merchantName" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${memberOrder.merchantName }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">storeId</label>  
+						<div class="layui-input-block">
+							<input type="text" name="storeId" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${memberOrder.storeId }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">storeName</label>  
+						<div class="layui-input-block">
+							<input type="text" name="storeName" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${memberOrder.storeName }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">memberCode</label>  
+						<div class="layui-input-block">
+							<input type="text" name="memberCode" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${memberOrder.memberCode }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">nickName</label>  
+						<div class="layui-input-block">
+							<input type="text" name="nickName" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${memberOrder.nickName }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">createDt</label>  
+						<div class="layui-input-block">
+							<input type="text" name="createDt" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${memberOrder.createDt }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">orderType</label>  
+						<div class="layui-input-block">
+							<input type="text" name="orderType" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${memberOrder.orderType }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">orderFee</label>  
+						<div class="layui-input-block">
+							<input type="text" name="orderFee" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${memberOrder.orderFee }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">orderStatus</label>  
+						<div class="layui-input-block">
+							<input type="text" name="orderStatus" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${memberOrder.orderStatus }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">rechargeType</label>  
+						<div class="layui-input-block">
+							<input type="text" name="rechargeType" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${memberOrder.rechargeType }" >
+						</div>  
+					</div>
+	
+				</div>
+			</div>
+		</div>  
+	</div>
+</form>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/memberOrder/memberOrderDetails.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/memberOrder/memberOrderDetails.jsp
new file mode 100644
index 0000000..1374a43
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/memberOrder/memberOrderDetails.jsp
@@ -0,0 +1,54 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>     
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">                      
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black"> 
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> 
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->                                     
+<meta name="viewport"
+	content="width=device-width, initial-scale=1.0, maximum-scale=1.0">   
+<jsp:include page="../../common.jsp" />
+<script type="text/javascript">
+    require("js/memberOrder/memberOrderDetails.js");
+</script>
+<title>编辑</title>
+</head>                                 
+	<body class="lgraybg">            
+		<div class="	container-fluid animated fadeInRight col-sm-12">
+			<div class="panel-toolbar mt10 mb10 pt5 pb5 pl10 bdd whitebg">
+				<div class="buttons">
+					<a href="javascript:void(0);" class="btn btn-primary fa fa-save f12"><span>保存</span></a>
+					<a href="${ctx }/memberOrder/index?pageIndex=${pageIndex}"  class="btn btn-primary fa fa-back f12" id="goback"><span>返回</span></a>
+				</div>
+			</div>
+				<div class="tabs-container whitebg">
+					<div class="pt10 pl5 pr5">
+						<ul class="nav nav-tabs" id="nav-tabs">
+							<li class="active" data-action="base">   
+								<a href="javascript:void(0);" >基本资料</a>
+							</li>
+							<li class="" data-action="functions">
+								<a href="javascript:void(0);"  >多功能输入</a>
+							</li>
+							<li class="" data-action="extends">
+								<a href="javascript:void(0);" >扩展属性</a>
+							</li>
+						</ul>
+						<div class="tab-content pt30 p30">               
+		
+						</div>     
+					</div>
+				</div>    
+		</div>
+		<!-- 隐藏域 -->
+		<input type="hidden" id="memberOrderId" value="${memberOrder.id }"/>
+	</body>
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/memberOrder/memberOrderExtendsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/memberOrder/memberOrderExtendsInfo.jsp
new file mode 100644
index 0000000..592687a
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/memberOrder/memberOrderExtendsInfo.jsp
@@ -0,0 +1,201 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>           
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> 
+<div class="tab-pane active">      
+	<div class="animated fadeInRight">
+		<div class="whitebg pl10 pr10">
+			<table class="table table-striped table-bordered table-hover">     
+				<thead> 
+					<tr>  
+						<th class="textc">序号</th>         
+						<th class="textc wp15">流水账号</th>
+						<th class="textc">日期</th>         
+						<th class="textc">财务类别</th>     
+						<th class="textc">金额</th>         
+						<th class="textc">银行</th>         
+						<th class="textc">发票</th>         
+						<th class="textc">客户名称</th>     
+						<th class="textc wp15">单号</th>    
+						<th class="textc">状态</th>         
+						<th class="textc">类别</th>         
+						<th class="textc">操作</th>         
+					</tr> 
+				</thead>
+				<tbody> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+                
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="green">支出</span></td>     
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+				</tbody>
+                
+			</table>  
+			<!-- footer -->  
+			<div class="clearfix mb10 pb20">          
+					<div class="layui-tab-item fr">       
+							<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+							<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>   
+							<div class="pagination dlblock vm" id="pagination"></div>
+							<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>            
+					</div>
+				</div>  
+		</div>      
+	</div>        
+</div>          
+                
+<script type="text/javascript">    
+//分页          
+$('#pagination').pagination({        
+	pageCount: 50,
+	jump: true,   
+	coping: true, 
+	homePage: '首页',    
+	endPage: '末页',     
+	prevContent: '上页', 
+	nextContent: '下页', 
+	callback: function(api) {          
+		$('.now').text(api.getCurrent());
+	}             
+});             
+</script>       
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/memberOrder/memberOrderFunctionsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/memberOrder/memberOrderFunctionsInfo.jsp
new file mode 100644
index 0000000..982ce84
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/memberOrder/memberOrderFunctionsInfo.jsp
@@ -0,0 +1,130 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>		
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">      
+<div class="tab-pane active">
+				<div class="panel-body">
+					<div class="wrapper wrapper-content">     
+						<div class="panel-form animated fadeInRight wp60 fc">
+							<!-- 账号资料 -->
+			<div class="layui-form-item 	has-error">
+				<label class="layui-form-label">单行输入框<i class="red">*</i></label>
+				<div class="layui-input-block">
+					<input type="text" name="title" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input">
+				</div>                                         
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">自定义验证</label>
+				<div class="layui-input-inline ml30">
+					<input type="password" name="password" lay-verify="pass" placeholder="请输入密码" autocomplete="off" class="layui-input">
+				</div>
+				<div class="layui-form-mid layui-word-aux">请填写6到12位密码</div>
+			</div>
+			<div class="form-group">
+				<div class="layui-form-item">          
+					<label class="layui-form-label">单行选择框</label>
+					<div class="layui-input-block">
+						<select name="interest" lay-filter="aihao">  
+							<option value=""></option>
+							<option value="0">写作</option>         
+							<option value="1" selected="">阅读</option>
+							<option value="2">游戏</option>
+							<option value="3">音乐</option>
+							<option value="4">旅行</option>  
+						</select>              
+					</div>
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<div class="layui-inline">  
+					<label class="layui-form-label">范围</label>
+					<div class="layui-input-inline ml30">
+						<input type="text" name="price_min" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>                                     
+					<div class="layui-form-mid">-</div>
+					<div class="layui-input-inline">       
+						<input type="text" name="price_max" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>
+				</div>           
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">联动选择框</label>
+				<div class="layui-input-inline ml30">
+					<select name="quiz1">     
+						<option value="">请选择省</option>
+						<option value="浙江" selected="">浙江省</option> 
+						<option value="你的工号">江西省</option>           
+						<option value="你最喜欢的老师">福建省</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz2">
+						<option value="">请选择市</option>
+						<option value="杭州">杭州</option>
+						<option value="宁波" disabled="">宁波</option>
+						<option value="温州">温州</option>
+						<option value="温州">台州</option>
+						<option value="温州">绍兴</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz3">
+						<option value="">请选择县/区</option>
+						<option value="西湖区">西湖区</option>
+						<option value="余杭区">余杭区</option>
+						<option value="拱墅区">临安市</option>
+					</select>
+				</div>    
+			</div>
+			<div class="layui-form-item" pane="">   
+				<label class="layui-form-label">原始复选框</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="like1[write]" lay-skin="primary" title="写作" checked="">  
+					<input type="checkbox" name="like1[read]" lay-skin="primary" title="阅读">
+					<input type="checkbox" name="like1[game]" lay-skin="primary" title="游戏" disabled="">
+				</div>
+			</div>
+
+			<div class="layui-form-item">
+				<label class="layui-form-label">开关-默认关</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="close" lay-skin="switch" lay-text="ON|OFF">
+				</div>
+			</div>
+			<div class="layui-form-item">  
+				<label class="layui-form-label">单选框</label>
+				<div class="layui-input-block">
+					<input type="radio" name="sex" value="男" title="男" checked="">
+					<input type="radio" name="sex" value="女" title="女">
+					<input type="radio" name="sex" value="禁" title="禁用" disabled="">
+				</div>
+			</div>
+			<!--<div class="layui-form-item layui-form-text">
+				<label class="layui-form-label">上传图片</label>
+				<div class="layui-input-block">
+					<div class="layui-upload-drag w200 h200">
+						<i class="layui-icon"></i>          
+						<p>点击上传</p>
+					</div>
+				</div>
+			</div>-->
+				<div class="layui-form-item layui-form-text">
+					<label class="layui-form-label">普通文本域</label>  
+					<div class="layui-input-block">              
+						<textarea placeholder="请输入内容" class="layui-textarea"></textarea>
+					</div>
+				</div>
+			</div>
+		</div>   
+	</div>
+</div>
+</form>   
+<script type="text/javascript">
+	//form表单样式
+	layui.use(['layer', 'form'], function() {    
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+</script>                 
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/memberOrder/memberOrderList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/memberOrder/memberOrderList.jsp
new file mode 100644
index 0000000..35d02bf
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/memberOrder/memberOrderList.jsp
@@ -0,0 +1,121 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black">
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->
+<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+<jsp:include page="../../common.jsp" />
+<script type="text/javascript">
+     require("js/memberOrder/memberOrderList.js");
+</script>
+</head>
+<body>
+	<div class="row animated fadeInRight" style="margin: 0;">
+		<div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+			<div class="toolbar-panel bdd">
+				<div class="toolbar-box">
+					<div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+						<!-- 顶部按钮 -->
+						<div class="buttons fl">
+							<a class="btn btn-primary fa fa-search f13" href="javascript:void(0);" onclick="queryMemberOrder()"><span>搜索</span></a>
+							<a class="btn btn-primary fa fa-plus f13 add" href="javascript:void(0);" onclick="initAddMemberOrder()"><span>添加</span></a>
+							<a class="btn btn-primary fa fa-edit f13" href="javascript:void(0);" onclick="initEditMemberOrder()"><span>编辑</span></a> 
+							<a class="btn btn-primary fa fa-remove f13 delete" href="javascript:void(0);" onclick="initBatchDeleteMemberOrder()"><span>删除</span></a> 
+						</div>
+						<div class="tools fr">
+							<a href="javascript:void(0);" class="collapse dblock f14 dgray mr5"> 
+								<i class="fa-2x fa fa-angle-double-up"></i>
+							</a>
+						</div>
+					</div>
+				</div>
+
+				<!--搜索条件 -->
+				<div class="toolbar-body">
+					<div class="row pt10 pb10 whitebg ml0 mr0">
+						<span class="dlblock w100 textr">ID：</span> 
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+							<input type="text" placeholder="请输入内容" id="searchId">  
+						</span> 
+						<span class="dlblock w100 textr">名称：</span> 
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+							<input type="text" placeholder="请输入名称">
+						</span> 
+						<span class="dlblock w100 textr">类别：</span>
+						 <select class="form-control f12 w180 textc">
+							<option value="">支出</option>
+							<option value="">收入</option>
+						</select>
+					</div>
+					<div class="mt10 mb20">
+						<span class="dlblock w100 textr">开始日期</span>
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+							 <input type="text" placeholder="" id="date1" class="w150">
+							 <i class="fa fa-calendar"></i>
+						</span> 
+						<span class="dlblock w100 textr">结束日期</span>
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+						<input type="text" placeholder="" id="date2" class="w150"> 
+							<i class="fa fa-calendar"></i>
+						</span>
+					</div>
+				</div>
+			</div>
+		</div>
+		<!-- 表单数据 -->
+		<div class="mb20 mt10">
+			<div class="whitebg pl10 pr10">
+				<table class="table table-striped table-bordered table-hover">
+					<thead>
+						<tr>
+							<th class="textc">
+								<div class="checker" id="allCheck">
+									<span class=""><input type="checkbox" value="" ></span>
+								</div>
+							</th>
+							<th class="textc ">id</th>
+							<th class="textc ">merchantCode</th>
+							<th class="textc ">merchantName</th>
+							<th class="textc ">storeId</th>
+							<th class="textc wp15">storeName</th>
+							<th class="textc ">memberCode</th>
+							<th class="textc ">nickName</th>
+							<th class="textc ">createDt</th>
+							<th class="textc wp15">orderType</th>
+							<th class="textc ">orderFee</th>
+							<th class="textc ">orderStatus</th>
+							<th class="textc ">rechargeType</th>
+							<th class="textc">编辑</th>
+						</tr>
+					</thead>
+					<!-- 数据体 -->
+					<tbody id="data_content">
+					</tbody>
+				</table>
+			
+			<!-- footer -->
+				<div class="clearfix mb10 pb20">
+						<div class="layui-tab-item fr">
+								<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+								<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>
+								<div class="pagination dlblock vm" id="pagination"></div>
+								<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>
+						</div>
+					</div>
+	
+			</div>
+		</div>
+	</div>
+</body>
+
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/mercOrderSplit/detailList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/mercOrderSplit/detailList.jsp
new file mode 100644
index 0000000..9851b05
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/mercOrderSplit/detailList.jsp
@@ -0,0 +1,199 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" id="form1" action="" style="margin-top: 10px;">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">商户名称</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="merchantName" id="merchantName" placeholder="商户名称"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <div class="mb50 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-hide" id="mercOrderSplitDetail" lay-filter="mercOrderSplitDetail"></table>
+        </div>
+    </div>
+</div>
+<script type="text/html" id="leftBar">
+    <a class="layui-btn layui-btn-sm" lay-event="search">
+        <i class="layui-icon layui-icon-search"></i>查询
+    </a>
+</script>
+
+<script type="text/html" id="toolBar">
+    <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit">
+        <i class="layui-icon layui-icon-edit"></i>编辑
+    </a>
+</script>
+
+<script>
+    layui.use(['table', 'layer'], function () {
+        var table = layui.table;
+        var layer = layui.layer;
+        var tableIns = table.render({
+            elem: '#mercOrderSplitDetail'
+            , url: '${ctx}/mercOrderSplit/detailPage'
+            , id: 'mercOrderSplitDetail'
+            , where: {
+                orderNumber : '${orderNumber}'
+            }
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            , toolbar: '#leftBar' //开启头部工具栏，并为其绑定左侧模板
+            , defaultToolbar: ['filter']
+            , defaultToolbar: ['filter', 'exports', 'print', { //自定义头部工具栏右侧图标。如无需自定义，去除该参数即可
+                title: '提示'
+                , layEvent: 'LAYTABLE_TIPS'
+                , icon: 'layui-icon-tips'
+            }]
+            , title: '订单分账详情表'
+            , cols: [[
+                {type: 'checkbox', fixed: 'left', hidden: true}
+                , {field: 'merchantName', title: '商户名称'}
+                , {field: 'finalAmt', title: '分账金额'}
+                , {field: 'refundAmt', title: '退款金额'}
+                , {field: 'status', title: '分账状态',templet:function (d){
+                    if(d.status == -1){
+                        return "<span style='color: blue'>已退款</span>";
+                    }
+                    if(d.status == 1){
+                        return "<span style='color: green'>已分账</span>";
+                    }
+                    if(d.status == 2){
+                        return "<span style='color: blue'>分账失败</span>";
+                    }
+                }}
+                , {field: 'isChargeFee', title: '收取手续费',templet:function (d){
+                        if(d.status == "01"){
+                            return "<span style='color: blue'>是</span>";
+                        }
+                        if(d.status == "02"){
+                            return "<span style='color: green'>否</span>";
+                        }
+                    }}
+                , {field: 'refundAmt', title: '退款金额'}
+                , {field: 'remark', title: '备注'}
+                , {
+                    field: 'createTime',
+                    title: '创建时间',
+                    templet: "<div>{{layui.util.toDateString(d.createTime,'yyyy-MM-dd HH:mm')}}</div>"
+                }
+                , {fixed: 'right', title: '操作', width: 100, toolbar: '#toolBar'}
+            ]]
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , page: true
+        });
+        table.on('tool(mercOrderSplitDetail)', function (obj) { //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            var data = obj.data; //获得当前行数据
+            var layEvent = obj.event; //获得 lay-event 对应的值（也可以是表头的 event 参数对应的值）
+            if (layEvent === 'edit') { //删除
+                toAdd(obj.data);
+            }
+        });
+
+        //监听头工具栏事件
+        table.on('toolbar(mercOrderSplitDetail)', function (obj) {
+            switch (obj.event) {
+                case 'add':
+                    // 添加
+                    toAdd();
+                    break;
+                case 'search':
+                    var params = serialize($('#form1'));
+                    table.reload('mercOrderSplitDetail', {
+                        where: params
+                        , page: {
+                            size: 10
+                            , current: 1
+                        }
+                    });
+                    break;
+            }
+        });
+
+        function toAdd(obj) {
+            var url = "${ctx}/mercOrderSplit/detailOrder/" + obj.id;
+            var index = layer.open({
+                type: 2
+                , shade: 0.5
+                , title: "分账详情"
+                , maxmin: true
+                , content: url
+                , area: ['600px', '500px']
+                , end: function () {
+
+                }
+            });
+        }
+
+        function del(obj) {
+            $.ajax({
+                url: '${ctx}/userRewardInfo/del/' + obj.id,
+                method: 'DELETE',
+                dataType: 'JSON',
+                contentType: "application/json",
+                success: function (res) {
+                    layer.msg(res.message, {
+                        icon: res.code == 200 ? 1: 2
+                    });
+                }
+            })
+        }
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/mercOrderSplit/detailOrder.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/mercOrderSplit/detailOrder.jsp
new file mode 100644
index 0000000..e30f64c
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/mercOrderSplit/detailOrder.jsp
@@ -0,0 +1,95 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp" />
+    <style>
+        .layui-form-item{
+            margin-top: 10px;
+        }
+        .layui-form{
+            width: 75%;
+            margin-left: 10%;
+        }
+        .area-info{
+            width: 25% !important;
+        }
+        /*.layui-icon-add-circle{*/
+        /*    color:#1E9FFF*/
+        /*}*/
+    </style>
+</head>
+<body>
+<form class="layui-form" action="" id="addForm">
+    <input name="id" value="${entity.id}" hidden/>
+    <div class="layui-form-item">
+        <label class="layui-form-label">商户名称</label>
+        <div class="layui-input-block">
+            <input name="merchantName" type="text" value="${entity.merchantName}" autocomplete="off" readonly  class="layui-input layui-disabled"/>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">收取手续费</label>
+        <div class="layui-input-block">
+            <select name="isChargeFee" id="isChargeFee" lay-verify="required">
+                <option value="">请选择</option>
+                <option ${entity.isChargeFee eq '01' ? 'selected' : ''} value="01">是</option>
+                <option ${entity.isChargeFee eq '02' ? 'selected' : ''} value="02">否</option>
+            </select>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button class="layui-btn" lay-submit lay-filter="formDemo">立即提交</button>
+            <button type="button" id="close" class="layui-btn layui-btn-primary">关闭</button>
+        </div>
+    </div>
+</form>
+<script>
+    layui.use(['form','layer'], function(){
+        let layer = layui.layer
+            , form = layui.form;
+        $('#close').click(function() {
+            parent.layer.closeAll();
+        });
+
+        //监听提交
+        form.on('submit(formDemo)', function(data){
+            $.ajax({
+                url: '${ctx}/mercOrderSplit/detailSave',
+                method: 'post',
+                data: JSON.stringify(data.field),
+                dataType: 'JSON',
+                contentType:"application/json",
+                success: function(res) {
+                    layer.close(index);
+                    if(res.code == 200) {
+                        layer.msg(res.message, { icon: 1, time: 1000 }, function () {
+                            var index = parent.layer.getFrameIndex(window.name);
+                            parent.layui.table.reload('mercOrderSplitDetail');
+                            parent.layer.close(index);
+                        });
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 2
+                        });
+                    }
+                }
+            })
+            return false;
+        });
+
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/mercOrderSplit/list.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/mercOrderSplit/list.jsp
new file mode 100644
index 0000000..499de3c
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/mercOrderSplit/list.jsp
@@ -0,0 +1,275 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" id="form1" action="" style="margin-top: 10px;">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">商户编号</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="merchantCode" id="merchantCode" placeholder="商户编号"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">商户名称</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="merchantName" id="merchantName" placeholder="商户名称"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">订单号</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="orderNumber" id="orderNumber" placeholder="订单号"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">交易状态</label>
+                            <div class="layui-input-inline">
+                                <select id="status" name="status">
+                                    <option value="">请选择</option>
+                                    <option value="1">已支付</option>
+                                    <option value="2">退款中</option>
+                                    <option value="3">退款成功</option>
+                                    <option value="4">退款失败</option>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">分账状态</label>
+                            <div class="layui-input-inline">
+                                <select id="divStatus" name="divStatus">
+                                    <option value="">请选择</option>
+                                    <option value="0">待登记</option>
+                                    <option value="1">已登记</option>
+                                    <option value="2">分账成功</option>
+                                    <option value="3">预分账成功</option>
+                                    <option value="4">无需分账</option>
+                                    <option value="-1">分账失败</option>
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <div class="mb50 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-hide" id="mercOrderSplit" lay-filter="mercOrderSplit"></table>
+        </div>
+    </div>
+</div>
+<script type="text/html" id="leftBar">
+    <a class="layui-btn layui-btn-sm" lay-event="search">
+        <i class="layui-icon layui-icon-search"></i>查询
+    </a>
+</script>
+
+<script type="text/html" id="toolBar">
+    <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="detail">
+        <i class="layui-icon layui-icon-list"></i>详情
+    </a>
+    {{# if (d.divStatus == '-1')  {}}
+        <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="restSplt">
+            <i class="layui-icon layui-icon-ok"></i>重新分账
+        </a>
+    {{# } }}
+
+</script>
+
+<script>
+    layui.use(['table', 'layer'], function () {
+        var table = layui.table;
+        var layer = layui.layer;
+
+        var tableIns = table.render({
+            elem: '#mercOrderSplit'
+            , url: '${ctx}/mercOrderSplit/page'
+            , id: 'mercOrderSplit'
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            , toolbar: '#leftBar' //开启头部工具栏，并为其绑定左侧模板
+            , defaultToolbar: ['filter']
+            , defaultToolbar: ['filter', 'exports', 'print', { //自定义头部工具栏右侧图标。如无需自定义，去除该参数即可
+                title: '提示'
+                , layEvent: 'LAYTABLE_TIPS'
+                , icon: 'layui-icon-tips'
+            }]
+            , title: '订单分账表'
+            , cols: [[
+                {type: 'checkbox', fixed: 'left', hidden: true}
+                , {field: 'numbers', title: '序号', fixed: 'left', unresize: true, width: 80, type: 'numbers'}
+                , {field: 'merchantCode', title: '商户编号'}
+                , {field: 'merchantName', title: '商户名称'}
+                , {field: 'orderNumber', title: '订单号'}
+                , {field: 'orderAmt', title: '订单金额'}
+                , {field: 'status', title: '订单状态',templet:function (d){
+                    if(d.status == 1){
+                        return "<span style='color: green'>已支付</span>";
+                    }
+                    if(d.status == 2){
+                        return "<span style='color: #f67d4a'>退款中</span>";
+                    }
+                    if(d.status == 3){
+                        return "<span style='color: blue'>退款成功</span>";
+                    }
+                    if(d.status == 4){
+                        return "<span style='color: red'>退款失败</span>";
+                    }
+                }}
+                , {field: 'divisionMode', title: '分账模式',templet:function (d){
+                    if(d.divisionMode == "01"){
+                        return "比例"
+                    }
+                    return "金额";
+                }}
+                , {field: 'divStatus', title: '分账状态',templet:function (d){
+                        if(d.divStatus == 0){
+                            return "待登记";
+                        }
+                        if(d.divStatus == 1){
+                            return "<span style='color: blue'>已登记</span>";
+                        }
+                        if(d.divStatus == 2){
+                            return "<span style='color: green'>分账成功</span>";
+                        }
+                        if(d.divStatus == -1){
+                            return "<span style='color: red'>分账失败</span>";
+                        }
+                        if(d.divStatus == 3){
+                            return "<span style='color: green'>预分账成功</span>";
+                        }
+                        if(d.divStatus == 4){
+                            return "无需分账";
+                        }
+                        return "未知";
+                    }}
+                // , {field: 'fee', title: '手续费'}
+                , {field: 'refundAmt', title: '退款金额'}
+                , {field: 'remark', title: '备注'}
+                , {
+                    field: 'createTime',
+                    title: '创建时间',
+                    templet: "<div>{{layui.util.toDateString(d.createTime,'yyyy-MM-dd HH:mm')}}</div>"
+                }
+                , {fixed: 'right', title: '操作', width: 180, toolbar: '#toolBar'}
+            ]]
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , page: true
+        });
+        table.on('tool(mercOrderSplit)', function (obj) { //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            var data = obj.data; //获得当前行数据
+            var layEvent = obj.event; //获得 lay-event 对应的值（也可以是表头的 event 参数对应的值）
+            if (layEvent === 'detail') { //删除
+                toAdd(obj.data);
+            } else if (layEvent === 'restSplit') { //编辑
+                layer.confirm('确定要重新发起分账吗?', {icon: 3}, function (index) {
+                    layer.close(index);
+                    del(data);
+                    //向服务端发送删除指令
+                });
+            }
+        });
+
+        //监听头工具栏事件
+        table.on('toolbar(mercOrderSplit)', function (obj) {
+            switch (obj.event) {
+                case 'add':
+                    // 添加
+                    toAdd();
+                    break;
+                case 'search':
+                    var params = serialize($('#form1'));
+                    table.reload('mercOrderSplit', {
+                        where: params
+                        , page: {
+                            size: 10
+                            , current: 1
+                        }
+                    });
+                    break;
+            }
+        });
+
+        function toAdd(obj) {
+            var url = "${ctx}/mercOrderSplit/detail/" + obj.orderNumber;
+            var index = layer.open({
+                type: 2
+                , shade: 0.5
+                , title: "分账详情"
+                , maxmin: true
+                , content: url
+                , area: ['80%', '80%']
+                , end: function () {
+
+                }
+            });
+        }
+
+        function del(obj) {
+            $.ajax({
+                url: '${ctx}/userRewardInfo/del/' + obj.id,
+                method: 'DELETE',
+                dataType: 'JSON',
+                contentType: "application/json",
+                success: function (res) {
+                    layer.msg(res.message, {
+                        icon: res.code == 200 ? 1: 2
+                    });
+                }
+            })
+        }
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantAccount/edit_list.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantAccount/edit_list.jsp
new file mode 100644
index 0000000..c8b98dc
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantAccount/edit_list.jsp
@@ -0,0 +1,238 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<!DOCTYPE html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" id="form1" action="" style="margin-top: 10px">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">用户ID</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="userId" id="userId" placeholder="请输入用户ID"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <div class="mb50 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-hide" id="table" lay-filter="table"></table>
+        </div>
+    </div>
+</div>
+<script type="text/html" id="leftBar">
+    <%-- <button type="button" class="layui-btn layui-btn-normal layui-btn-sm" lay-event="search"><i class="layui-icon">&#xe615;</i>查询
+     </button>--%>
+    <a class="layui-btn layui-btn-sm" lay-event="search">
+        <i class="layui-icon layui-icon-search"></i>查询
+    </a>
+    <a class="layui-btn layui-btn-sm layui-btn-normal" lay-event="batchPass">
+        <i class="layui-icon layui-icon-auz"></i>批量审核通过
+    </a>
+</script>
+<script type="text/html" id="toolBar">
+    {{# if (d.channelType == 'D0') { }}
+    <button type="button" class="layui-btn layui-btn-xs layui-btn-normal" lay-event="edit">
+        <i class="layui-icon layui-icon-auz"></i>
+        审核通过
+    </button>
+    {{# } }}
+</script>
+
+<script>
+    layui.use(['table', 'layer'], function () {
+        var table = layui.table;
+        var layer = layui.layer;
+
+        table.render({
+            elem: '#table'
+            , url: ctx + '/merchantAccount/page'
+            , id: 'table'
+            , request: {
+                pageName: 'current'
+                , limitName: 'size'
+            }
+            , response: {
+                statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            , toolbar: '#leftBar' //开启头部工具栏，并为其绑定左侧模板
+            , defaultToolbar: ['filter']
+            , title: '商户付款页二维码展示表'
+            , cols: [[
+                {type: 'checkbox', hidden: true}
+                , {field: 'numbers', title: '序号', unresize: true, width: 80, type: 'numbers'}
+                , {field: 'bankCard.userId', title: '用户ID', width: 80, templet: function (d) {
+                        return d.bankCard.userId;
+                    }}
+                , {field: 'channelType', title: '通道类型', width: 86}
+                , {field: 'merchantId', title: '通道商编', width: 100}
+                , {field: 'bankCard.bankCardNo', title: '原卡号', minWith: 150, templet: function (d) {
+                        return d.bankCard.bankCardNo;
+                    }}
+                , {field: 'bankCard.bankName', title: '原银行', minWith: 100, templet: function (d) {
+                        return d.bankCard.bankName;
+                    }}
+                , {field: 'bankCard.branchName', title: '原支行', minWith: 100, templet: function (d) {
+                        return d.bankCard.branchName;
+                    }}
+                , {field: 'bak.bankCardNo', title: '新卡号', minWith: 100, templet: function (d) {
+                        return d.bak.bankCardNo;
+                    }}
+                , {field: 'bak.bankName', title: '新银行', minWith: 100, templet: function (d) {
+                        return d.bak.bankName;
+                    }}
+                , {field: 'bak.branchName', title: '新支行', minWith: 100, templet: function (d) {
+                        return d.bak.branchName;
+                    }}
+                , {field: 'bak.imgUrl', title: '新银行卡图片链接', minWith: 100, templet: function (d) {
+                        return d.bak.imgUrl;
+                    }}
+                , {
+                    field: 'createTime',
+                    title: '创建时间',
+                    width: 160,
+                    templet: "<div>{{layui.util.toDateString(d.createTime,'yyyy-MM-dd HH:mm:ss')}}</div>"
+                }
+                , {
+                    field: 'updateTime',
+                    title: '修改发起时间',
+                    width: 160,
+                    templet: "<div>{{layui.util.toDateString(d.updateTime,'yyyy-MM-dd HH:mm:ss')}}</div>"
+                }
+                , {fixed: 'right', title: '操作', width: 150, toolbar: '#toolBar'}
+            ]]
+            , page: true
+        });
+
+        table.on('tool(table)', function (obj) { //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            var data = obj.data; //获得当前行数据
+            var layEvent = obj.event; //获得 lay-event 对应的值（也可以是表头的 event 参数对应的值）
+            if (layEvent === 'edit') { //编辑
+                ratePass(obj.data);
+            }
+        });
+
+        //监听头工具栏事件
+        table.on('toolbar(table)', function (obj) {
+            switch (obj.event) {
+                /*case 'add':
+                    // 添加
+                    toAdd();
+                    break;*/
+                case 'search':
+                    var params = serialize($('#form1'));
+                    table.reload('table', {
+                        where: params
+                        , page: {
+                            size: 10
+                            , current: 1
+                        }
+                    });
+                    break;
+                case 'batchPass':
+                    var checkStatus = table.checkStatus(obj.config.id);
+                    var merchantIds = [];
+                    checkStatus.data.forEach(function(item) {
+                        merchantIds.push(item.merchantId);
+                    });
+                    batchRatePass(merchantIds)
+                    break;
+            }
+        })
+
+        function batchRatePass(merchantIds) {
+            if (merchantIds == null || merchantIds.length === 0) {
+                layer.msg("至少选择一条记录");
+                return;
+            }
+
+            layer.confirm("确认D0费率修改", {
+                yes: function (index, layero) {
+                    $.ajax({
+                        url: ctx + '/merchantRate/batchPass'
+                        , type: "post"
+                        , data: {
+                            merchantId: merchantIds
+                        }
+                        , success: function (d) {
+                            if (d.code == 200) {
+                                layer.msg(d.message);
+                                layer.close(index);
+                                table.reload('table', {}, true);
+                            } else {
+                                layer.msg(d.message);
+                            }
+                        }
+                    })
+                }
+            });
+        }
+
+        function ratePass(obj) {
+            layer.confirm("确认D0费率修改", {
+                yes: function (index, layero) {
+                    $.ajax({
+                        url: ctx + '/merchantRate/pass'
+                        , type: "post"
+                        , data: {
+                            merchantId: obj.merchantId
+                        }
+                        , success: function (d) {
+                            if (d.code == 200) {
+                                layer.msg(d.message);
+                                layer.close(index);
+                                table.reload('table', {}, true);
+                            } else {
+                                layer.msg(d.message);
+                            }
+                        }
+                    })
+                }
+            });
+        }
+    });
+
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantAddress/merchantAddressBaseInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantAddress/merchantAddressBaseInfo.jsp
new file mode 100644
index 0000000..88e08b5
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantAddress/merchantAddressBaseInfo.jsp
@@ -0,0 +1,69 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">  
+	<div class="tab-pane active">     
+		<div class="panel-body">
+			<div class="wrapper wrapper-content">
+				<div class="panel-form animated fadeInRight wp60 fc">
+					<div class="layui-form-item dn	has-error" >   
+						<label class="layui-form-label">id</label>  
+						<div class="layui-input-block">
+							<input type="text" name="id" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantAddress.id }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">userId</label>  
+						<div class="layui-input-block">
+							<input type="text" name="userId" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantAddress.userId }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">merchantCode</label>  
+						<div class="layui-input-block">
+							<input type="text" name="merchantCode" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantAddress.merchantCode }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">provinces</label>  
+						<div class="layui-input-block">
+							<input type="text" name="provinces" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantAddress.provinces }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">address</label>  
+						<div class="layui-input-block">
+							<input type="text" name="address" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantAddress.address }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">linkPhone</label>  
+						<div class="layui-input-block">
+							<input type="text" name="linkPhone" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantAddress.linkPhone }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">linkName</label>  
+						<div class="layui-input-block">
+							<input type="text" name="linkName" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantAddress.linkName }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">isDefault</label>  
+						<div class="layui-input-block">
+							<input type="text" name="isDefault" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantAddress.isDefault }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">createDt</label>  
+						<div class="layui-input-block">
+							<input type="text" name="createDt" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantAddress.createDt }" >
+						</div>  
+					</div>
+	
+				</div>
+			</div>
+		</div>  
+	</div>
+</form>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantAddress/merchantAddressDetails.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantAddress/merchantAddressDetails.jsp
new file mode 100644
index 0000000..13a6f65
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantAddress/merchantAddressDetails.jsp
@@ -0,0 +1,54 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>     
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">                      
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black"> 
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> 
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->                                     
+<meta name="viewport"
+	content="width=device-width, initial-scale=1.0, maximum-scale=1.0">   
+<jsp:include page="../../common.jsp" />
+<script type="text/javascript">
+    require("js/merchantAddress/merchantAddressDetails.js");
+</script>
+<title>编辑</title>
+</head>                                 
+	<body class="lgraybg">            
+		<div class="	container-fluid animated fadeInRight col-sm-12">
+			<div class="panel-toolbar mt10 mb10 pt5 pb5 pl10 bdd whitebg">
+				<div class="buttons">
+					<a href="javascript:void(0);" class="btn btn-primary fa fa-save f12"><span>保存</span></a>
+					<a href="${ctx }/merchantAddress/index?pageIndex=${pageIndex}"  class="btn btn-primary fa fa-back f12" id="goback"><span>返回</span></a>
+				</div>
+			</div>
+				<div class="tabs-container whitebg">
+					<div class="pt10 pl5 pr5">
+						<ul class="nav nav-tabs" id="nav-tabs">
+							<li class="active" data-action="base">   
+								<a href="javascript:void(0);" >基本资料</a>
+							</li>
+							<li class="" data-action="functions">
+								<a href="javascript:void(0);"  >多功能输入</a>
+							</li>
+							<li class="" data-action="extends">
+								<a href="javascript:void(0);" >扩展属性</a>
+							</li>
+						</ul>
+						<div class="tab-content pt30 p30">               
+		
+						</div>     
+					</div>
+				</div>    
+		</div>
+		<!-- 隐藏域 -->
+		<input type="hidden" id="merchantAddressId" value="${merchantAddress.id }"/>
+	</body>
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantAddress/merchantAddressExtendsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantAddress/merchantAddressExtendsInfo.jsp
new file mode 100644
index 0000000..592687a
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantAddress/merchantAddressExtendsInfo.jsp
@@ -0,0 +1,201 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>           
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> 
+<div class="tab-pane active">      
+	<div class="animated fadeInRight">
+		<div class="whitebg pl10 pr10">
+			<table class="table table-striped table-bordered table-hover">     
+				<thead> 
+					<tr>  
+						<th class="textc">序号</th>         
+						<th class="textc wp15">流水账号</th>
+						<th class="textc">日期</th>         
+						<th class="textc">财务类别</th>     
+						<th class="textc">金额</th>         
+						<th class="textc">银行</th>         
+						<th class="textc">发票</th>         
+						<th class="textc">客户名称</th>     
+						<th class="textc wp15">单号</th>    
+						<th class="textc">状态</th>         
+						<th class="textc">类别</th>         
+						<th class="textc">操作</th>         
+					</tr> 
+				</thead>
+				<tbody> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+                
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="green">支出</span></td>     
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+				</tbody>
+                
+			</table>  
+			<!-- footer -->  
+			<div class="clearfix mb10 pb20">          
+					<div class="layui-tab-item fr">       
+							<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+							<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>   
+							<div class="pagination dlblock vm" id="pagination"></div>
+							<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>            
+					</div>
+				</div>  
+		</div>      
+	</div>        
+</div>          
+                
+<script type="text/javascript">    
+//分页          
+$('#pagination').pagination({        
+	pageCount: 50,
+	jump: true,   
+	coping: true, 
+	homePage: '首页',    
+	endPage: '末页',     
+	prevContent: '上页', 
+	nextContent: '下页', 
+	callback: function(api) {          
+		$('.now').text(api.getCurrent());
+	}             
+});             
+</script>       
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantAddress/merchantAddressFunctionsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantAddress/merchantAddressFunctionsInfo.jsp
new file mode 100644
index 0000000..982ce84
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantAddress/merchantAddressFunctionsInfo.jsp
@@ -0,0 +1,130 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>		
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">      
+<div class="tab-pane active">
+				<div class="panel-body">
+					<div class="wrapper wrapper-content">     
+						<div class="panel-form animated fadeInRight wp60 fc">
+							<!-- 账号资料 -->
+			<div class="layui-form-item 	has-error">
+				<label class="layui-form-label">单行输入框<i class="red">*</i></label>
+				<div class="layui-input-block">
+					<input type="text" name="title" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input">
+				</div>                                         
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">自定义验证</label>
+				<div class="layui-input-inline ml30">
+					<input type="password" name="password" lay-verify="pass" placeholder="请输入密码" autocomplete="off" class="layui-input">
+				</div>
+				<div class="layui-form-mid layui-word-aux">请填写6到12位密码</div>
+			</div>
+			<div class="form-group">
+				<div class="layui-form-item">          
+					<label class="layui-form-label">单行选择框</label>
+					<div class="layui-input-block">
+						<select name="interest" lay-filter="aihao">  
+							<option value=""></option>
+							<option value="0">写作</option>         
+							<option value="1" selected="">阅读</option>
+							<option value="2">游戏</option>
+							<option value="3">音乐</option>
+							<option value="4">旅行</option>  
+						</select>              
+					</div>
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<div class="layui-inline">  
+					<label class="layui-form-label">范围</label>
+					<div class="layui-input-inline ml30">
+						<input type="text" name="price_min" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>                                     
+					<div class="layui-form-mid">-</div>
+					<div class="layui-input-inline">       
+						<input type="text" name="price_max" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>
+				</div>           
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">联动选择框</label>
+				<div class="layui-input-inline ml30">
+					<select name="quiz1">     
+						<option value="">请选择省</option>
+						<option value="浙江" selected="">浙江省</option> 
+						<option value="你的工号">江西省</option>           
+						<option value="你最喜欢的老师">福建省</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz2">
+						<option value="">请选择市</option>
+						<option value="杭州">杭州</option>
+						<option value="宁波" disabled="">宁波</option>
+						<option value="温州">温州</option>
+						<option value="温州">台州</option>
+						<option value="温州">绍兴</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz3">
+						<option value="">请选择县/区</option>
+						<option value="西湖区">西湖区</option>
+						<option value="余杭区">余杭区</option>
+						<option value="拱墅区">临安市</option>
+					</select>
+				</div>    
+			</div>
+			<div class="layui-form-item" pane="">   
+				<label class="layui-form-label">原始复选框</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="like1[write]" lay-skin="primary" title="写作" checked="">  
+					<input type="checkbox" name="like1[read]" lay-skin="primary" title="阅读">
+					<input type="checkbox" name="like1[game]" lay-skin="primary" title="游戏" disabled="">
+				</div>
+			</div>
+
+			<div class="layui-form-item">
+				<label class="layui-form-label">开关-默认关</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="close" lay-skin="switch" lay-text="ON|OFF">
+				</div>
+			</div>
+			<div class="layui-form-item">  
+				<label class="layui-form-label">单选框</label>
+				<div class="layui-input-block">
+					<input type="radio" name="sex" value="男" title="男" checked="">
+					<input type="radio" name="sex" value="女" title="女">
+					<input type="radio" name="sex" value="禁" title="禁用" disabled="">
+				</div>
+			</div>
+			<!--<div class="layui-form-item layui-form-text">
+				<label class="layui-form-label">上传图片</label>
+				<div class="layui-input-block">
+					<div class="layui-upload-drag w200 h200">
+						<i class="layui-icon"></i>          
+						<p>点击上传</p>
+					</div>
+				</div>
+			</div>-->
+				<div class="layui-form-item layui-form-text">
+					<label class="layui-form-label">普通文本域</label>  
+					<div class="layui-input-block">              
+						<textarea placeholder="请输入内容" class="layui-textarea"></textarea>
+					</div>
+				</div>
+			</div>
+		</div>   
+	</div>
+</div>
+</form>   
+<script type="text/javascript">
+	//form表单样式
+	layui.use(['layer', 'form'], function() {    
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+</script>                 
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantAddress/merchantAddressList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantAddress/merchantAddressList.jsp
new file mode 100644
index 0000000..b97eb79
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantAddress/merchantAddressList.jsp
@@ -0,0 +1,118 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black">
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->
+<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+<jsp:include page="../../common.jsp" />
+<script type="text/javascript">
+     require("js/merchantAddress/merchantAddressList.js");
+</script>
+</head>
+<body>
+	<div class="row animated fadeInRight" style="margin: 0;">
+		<div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+			<div class="toolbar-panel bdd">
+				<div class="toolbar-box">
+					<div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+						<!-- 顶部按钮 -->
+						<div class="buttons fl">
+							<a class="btn btn-primary fa fa-search f13" href="javascript:void(0);" onclick="queryMerchantAddress()"><span>搜索</span></a>
+							<a class="btn btn-primary fa fa-plus f13 add" href="javascript:void(0);" onclick="initAddMerchantAddress()"><span>添加</span></a>
+							<a class="btn btn-primary fa fa-edit f13" href="javascript:void(0);" onclick="initEditMerchantAddress()"><span>编辑</span></a> 
+							<a class="btn btn-primary fa fa-remove f13 delete" href="javascript:void(0);" onclick="initBatchDeleteMerchantAddress()"><span>删除</span></a> 
+						</div>
+						<div class="tools fr">
+							<a href="javascript:void(0);" class="collapse dblock f14 dgray mr5"> 
+								<i class="fa-2x fa fa-angle-double-up"></i>
+							</a>
+						</div>
+					</div>
+				</div>
+
+				<!--搜索条件 -->
+				<div class="toolbar-body">
+					<div class="row pt10 pb10 whitebg ml0 mr0">
+						<span class="dlblock w100 textr">ID：</span> 
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+							<input type="text" placeholder="请输入内容" id="searchId">  
+						</span> 
+						<span class="dlblock w100 textr">名称：</span> 
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+							<input type="text" placeholder="请输入名称">
+						</span> 
+						<span class="dlblock w100 textr">类别：</span>
+						 <select class="form-control f12 w180 textc">
+							<option value="">支出</option>
+							<option value="">收入</option>
+						</select>
+					</div>
+					<div class="mt10 mb20">
+						<span class="dlblock w100 textr">开始日期</span>
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+							 <input type="text" placeholder="" id="date1" class="w150">
+							 <i class="fa fa-calendar"></i>
+						</span> 
+						<span class="dlblock w100 textr">结束日期</span>
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+						<input type="text" placeholder="" id="date2" class="w150"> 
+							<i class="fa fa-calendar"></i>
+						</span>
+					</div>
+				</div>
+			</div>
+		</div>
+		<!-- 表单数据 -->
+		<div class="mb20 mt10">
+			<div class="whitebg pl10 pr10">
+				<table class="table table-striped table-bordered table-hover">
+					<thead>
+						<tr>
+							<th class="textc">
+								<div class="checker" id="allCheck">
+									<span class=""><input type="checkbox" value="" ></span>
+								</div>
+							</th>
+							<th class="textc ">id</th>
+							<th class="textc ">userId</th>
+							<th class="textc ">merchantCode</th>
+							<th class="textc ">provinces</th>
+							<th class="textc wp15">address</th>
+							<th class="textc ">linkPhone</th>
+							<th class="textc ">linkName</th>
+							<th class="textc ">isDefault</th>
+							<th class="textc wp15">createDt</th>
+							<th class="textc">编辑</th>
+						</tr>
+					</thead>
+					<!-- 数据体 -->
+					<tbody id="data_content">
+					</tbody>
+				</table>
+			
+			<!-- footer -->
+				<div class="clearfix mb10 pb20">
+						<div class="layui-tab-item fr">
+								<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+								<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>
+								<div class="pagination dlblock vm" id="pagination"></div>
+								<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>
+						</div>
+					</div>
+	
+			</div>
+		</div>
+	</div>
+</body>
+
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantBankCard/merchantBankCardList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantBankCard/merchantBankCardList.jsp
new file mode 100644
index 0000000..8d10b5c
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantBankCard/merchantBankCardList.jsp
@@ -0,0 +1,223 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+    <script type="text/javascript">
+        require("js/merchantBankCard/merchantBankCardList.js");
+    </script>
+
+    <style>
+        .layui-table th {
+            text-align: center;
+        }
+    </style>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="buttons fl">
+                        <a class="layui-btn layui-btn-sm fa fa-search f13" href="javascript:void(0);"
+                           onclick="queryMerchantBankCard()"><span>搜索</span></a>
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <div class="row pt10 pb10 whitebg ml0 mr0">
+                    <span class="dlblock w100 textr">用户ID：</span>
+                    <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+							<input type="text" placeholder="请输入用户ID " name="userId" id="userId">
+						</span>
+                    <c:if test="${admin eq 'admin' }">
+                        <span class="dlblock w100 textr">手机号：</span>
+                        <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+							<input type="text" placeholder="请输入手机号 " name="phone" id="phone">
+						</span>
+                    </c:if>
+                    <span class="dlblock w100 textr">商户简称：</span>
+                    <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+                            <input type="text" placeholder="请输入名称" name="alias" id="alias">
+                        </span>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="mb50 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-hide" id="merchantBankCardList" lay-filter="merchantBankCardList"></table>
+        </div>
+    </div>
+</div>
+<!-- 表单数据 -->
+<div class="mb20 mt10">
+    <div class="whitebg pl10 pr10">
+        <table class="layui-table">
+            <thead>
+            <tr>
+                <th class="textc">
+                    <div class="checker" id="allCheck">
+                        <span class=""><input type="checkbox" value=""></span>
+                    </div>
+                </th>
+                <th class="textc ">序号</th>
+                <th class="textc ">用户ID</th>
+                <th class="textc ">手机号</th>
+                <th class="textc ">商户简称</th>
+                <th class="textc ">所属商户</th>
+                <!-- <th class="textc ">通道类型</th> -->
+                <th class="textc ">审核状态</th>
+                <th class="textc ">签约费率</th>
+<%--                <th class="textc">编辑</th>--%>
+            </tr>
+            </thead>
+            <!-- 数据体 -->
+            <tbody id="data_content">
+            </tbody>
+        </table>
+
+        <!-- footer -->
+        <div class="clearfix mb10 pb20">
+            <div class="layui-tab-item fr">
+                <span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+                <span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>
+                <div class="pagination dlblock vm" id="pagination"></div>
+                <span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>
+            </div>
+        </div>
+        <input type="hidden" placeholder="请输入名称" id="admin" value="${admin}">
+    </div>
+</div>
+</body>
+<%--<script type="text/javascript">--%>
+
+<%--	var layer;--%>
+<%--	var form;--%>
+<%--	var table;--%>
+<%--	var laydate;--%>
+<%--	var dropdown;--%>
+<%--	//form表单样式--%>
+<%--	layui.use(['table', 'layer', 'form', 'laydate', 'mDropdown'], function () {--%>
+<%--		layer = layui.layer;--%>
+<%--		form = layui.form;--%>
+<%--		table = layui.table;--%>
+<%--		laydate = layui.laydate;--%>
+<%--		dropdown = layui.mDropdown;--%>
+<%--		form.render();--%>
+
+<%--		//执行一个 table 实例--%>
+<%--		table.render({--%>
+<%--			elem: '#merchantStoreList'--%>
+<%--			, id: 'merchantStoreList'--%>
+<%--			, url: '${ctx}/merchantStore/queryMerchantStoreByPage' //数据接口--%>
+<%--			, autoSort: false--%>
+<%--			, where: {--%>
+<%--				merchantName: $('#merchantName').val()--%>
+<%--				, status: $('#status').val()--%>
+<%--				, productDesc: $('#productDesc').val()--%>
+<%--				, alias: $('#alias').val()--%>
+<%--				, userId: $("#userId").val()--%>
+<%--				, payEcdemicSwitch: $("#payEcdemicSwitch :selected").val()--%>
+<%--				, merchantType: $("#merchantType :selected").val()--%>
+<%--				, isMarket: $("#isMarket :selected").val()--%>
+<%--			}--%>
+<%--			, response: {--%>
+<%--				statusName: 'code' //数据状态的字段名称，默认：code--%>
+<%--				, countName: 'count' //数据总数的字段名称，默认：count--%>
+<%--				, dataName: 'data' //默数据列表的字段名称，认：data--%>
+<%--				, statusCode: 200--%>
+<%--			}--%>
+<%--			, parseData: function (res) { //res 即为原始返回的数据--%>
+<%--				return {--%>
+<%--					"code": res.code, //解析接口状态--%>
+<%--					"msg": res.message, //解析提示文本--%>
+<%--					"count": res.count, //解析数据长度--%>
+<%--					"data": res.merchantStoreList //解析数据列表--%>
+<%--				};--%>
+<%--			}--%>
+<%--			, request: {--%>
+<%--				pageName: 'currPage' //页码的参数名称，默认：page--%>
+<%--				, limitName: 'size' //每页数据量的参数名，默认：limit--%>
+<%--			}--%>
+<%--			, title: 'app首页菜单表'--%>
+<%--			, page: true //开启分页--%>
+<%--			, toolbar: '#toolBar' //开启工具栏，此处显示默认图标，可以自定义模板，详见文档--%>
+<%--			, defaultToolbar: ['filter']--%>
+<%--			, cols: [[ //表头--%>
+<%--				{type: 'numbers'}--%>
+<%--				, {type: 'checkbox'}--%>
+<%--				, {field: 'userId', title: '用户ID'}--%>
+<%--				, {field: 'alias', title: '手机号'}--%>
+<%--				, {field: 'merchantName', title: '商户简称'}--%>
+<%--				, {field: 'productDesc', title: '所属商户'}--%>
+<%--				, {field: 'address', title: '审核状态'}--%>
+<%--				, {field: 'status', title: '签约费率'}--%>
+<%--				, {fixed: 'right', title: '操作', toolbar: '#lineBar'}--%>
+<%--			]]--%>
+<%--			, done: function (res) {--%>
+<%--				dropdown.suite();--%>
+<%--			}--%>
+<%--		});--%>
+
+<%--		//监听行工具事件--%>
+<%--		table.on('tool(merchantStoreList)', function (obj) { //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"--%>
+<%--			var data = obj.data //获得当前行数据--%>
+<%--					, layEvent = obj.event; //获得 lay-event 对应的值--%>
+<%--			if (layEvent === 'payQrCode') {--%>
+<%--				showMerchantStoreReceipt(data.userId);--%>
+<%--			} else if (layEvent === 'remark') {--%>
+<%--				showMerchantStoreParticulars(data.id);--%>
+<%--			} else if (layEvent === 'edit') {--%>
+<%--				//layer.msg('编辑操作');--%>
+<%--				showMerchantStoreDetails(data.id);--%>
+<%--			} else if (layEvent === 'audit') {--%>
+<%--				manualMerchantIncom(data.userId)--%>
+<%--			} else if (layEvent === 'detail') {--%>
+<%--				showMerchantInfo(data.userId)--%>
+<%--			}--%>
+<%--		});--%>
+<%--	});--%>
+
+<%--	//查询--%>
+<%--	function queryMerchantStore() {--%>
+<%--		table.reload('merchantStoreList', {--%>
+<%--			page: {--%>
+<%--				curr: 1--%>
+<%--			}--%>
+<%--			, where: { //请求参数（注意：这里面的参数可任意定义，并非下面固定的格式）--%>
+<%--				merchantName: $('#merchantName').val()--%>
+<%--				, status: $('#status').val()--%>
+<%--				, productDesc: $('#productDesc').val()--%>
+<%--				, alias: $('#alias').val()--%>
+<%--				, userId: $("#userId").val()--%>
+<%--				, payEcdemicSwitch: $("#payEcdemicSwitch :selected").val()--%>
+<%--				, merchantType: $("#merchantType :selected").val()--%>
+<%--				, isMarket: $("#isMarket :selected").val()--%>
+<%--			}--%>
+<%--		});--%>
+<%--	}--%>
+<%--</script>--%>
+
+
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantBaseInfo/merchantBaseInfoList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantBaseInfo/merchantBaseInfoList.jsp
new file mode 100644
index 0000000..ceb4ad3
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantBaseInfo/merchantBaseInfoList.jsp
@@ -0,0 +1,248 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+    <script type="text/javascript">
+        require("js/merchantBaseInfo/merchantBaseInfoList.js");
+    </script>
+
+    <style>
+        .layui-table th {
+            text-align: center;
+        }
+    </style>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" action="" style="margin-top: 10px">
+                    <div class="layui-form-item">
+                        <c:if test="${admin eq 'admin'}">
+                            <div class="layui-inline">
+                                <label class="layui-form-label">用户名称</label>
+                                <div class="layui-input-inline">
+                                    <input type="text" placeholder="请输入用户名称" id="userName" name="userName"
+                                           class="layui-input">
+                                </div>
+                            </div>
+
+
+                            <div class="layui-inline">
+                                <label class="layui-form-label">商户简称</label>
+                                <div class="layui-input-inline">
+                                    <input type="text" placeholder="请输入商户简称" id="alias" name="alias"
+                                           class="layui-input">
+                                </div>
+                            </div>
+                        </c:if>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">用户ID</label>
+                            <div class="layui-input-inline">
+                                <input type="text" placeholder="请输入用户ID" id="userId" name="userId"
+                                       class="layui-input">
+                            </div>
+                        </div>
+                        <c:if test="${admin ne 'admin'}">
+                            <div class="layui-inline">
+                                <label class="layui-form-label">商户简称</label>
+                                <div class="layui-input-inline">
+                                    <input type="text" placeholder="请输入商户简称" id="alias" name="alias"
+                                           class="layui-input">
+                                </div>
+                            </div>
+                        </c:if>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <div class="mb50 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-hide" id="merchantBaseInfoList" lay-filter="merchantBaseInfoList"></table>
+        </div>
+    </div>
+</div>
+</body>
+
+<script id="lineBar" type="text/html">
+    <button class="layui-btn layui-btn-xs"
+            lay-mDropdown="{template: '#toolbarMenu'}">
+        <span>操作</span>
+        <i class="layui-icon layui-icon-triangle-d"></i>
+    </button>
+</script>
+
+<script id="toolbarMenu" type="text/html">
+    <a href="javascript:void(0);" lay-event="detail"
+       class="layui-btn layui-btn-xs layui-btn-danger fa fa-detail ops_more f12">乐刷修改费率</a>
+</script>
+
+<script id="toolBar" type="text/html">
+    <a class="layui-btn layui-btn-sm fa fa-search f13" href="javascript:void(0);"
+       onclick="queryMerchantBaseInfo()"><span>搜索</span></a>
+</script>
+
+<script type="text/javascript">
+    var layer;
+    var form;
+    var table;
+    var laydate;
+    var dropdown;
+    //form表单样式
+    layui.use(['table', 'layer', 'form', 'laydate', 'mDropdown'], function () {
+        layer = layui.layer;
+        form = layui.form;
+        table = layui.table;
+        laydate = layui.laydate;
+        dropdown = layui.mDropdown;
+        form.render();
+
+        //执行一个 table 实例
+        table.render({
+            elem: '#merchantBaseInfoList'
+            , autoSort: false
+            , id: 'merchantBaseInfoList'
+            , url: '${ctx}/merchantBaseInfo/queryMerchantBaseInfoPage' //数据接口
+            , where: { //请求参数（注意：这里面的参数可任意定义，并非下面固定的格式）
+                userName: $('#userName').val()
+                , phone: $('#phone').val()
+                , parentIdPhone: $('#parentIdPhone').val()
+                , alias: $('#alias').val()
+                , userId: $("#userId").val()
+            }
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //数据列表的字段名称，默认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.count, //解析数据长度
+                    "data": res.merchantBaseInfoList //解析数据列表
+                };
+            }
+            , title: '商户详情'
+            , toolbar: '#toolBar' //开启工具栏，此处显示默认图标，可以自定义模板，详见文档
+            , defaultToolbar: ['filter']
+            , cols: [[ //表头
+                {type: 'numbers'}
+                , {type: 'checkbox'}
+                , {field: 'userId', title: '用户ID', align: "center"}
+                <c:if test="${admin eq 'admin' }">
+                , {field: 'userName', title: '用户名称', minWidth: 100}
+                , {field: 'phone', title: '用户手机号', hide: true, minWidth: 110}
+                , {field: 'parentIdPhone', title: '直属上级手机号', hide: true, minWidth: 130}
+                </c:if>
+                , {field: 'alias', title: '商户简称', minWidth: 100}
+                , {field: 'earnings', title: '交易总流水', sort: true, minWidth: 120}
+                , {field: 'toDayEarnings', title: '今日流水', sort: true, minWidth: 100}
+                , {field: 'yestDayEarnings', title: '昨日流水', sort: true, minWidth: 100}
+                , {field: 'orderCount', title: '总笔数', sort: true, minWidth: 100}
+                , {field: 'yesterdayOrderCount', title: '昨日笔数', sort: true, minWidth: 100}
+                , {field: 'yesterdaySpreadCount', title: '昨日推广', sort: true, minWidth: 100}
+                , {field: 'menber', title: '已有会员', sort: true, minWidth: 100}
+                , {field: 'toDayMenber', title: '今日新增会员', hide: true, sort: true, minWidth: 120}
+                , {field: 'yestDayMenber', title: '昨日新增会员', sort: true, minWidth: 120}
+                <c:if test="${admin != 'admin'}">
+                , {
+                    field: 'sumDifference', title: '会员总余额', minWidth: 110, templet: function (d) {
+                        return (d.sumDifference - 0).toFixed(2);
+                    }
+                }
+                , {field: 'sumNumber', title: '交易总数', sort: true, minWidth: 100}
+                </c:if>
+                , {field: 'toDayFansCount', title: '今日粉丝', sort: true, hide: true, minWidth: 100}
+                , {field: 'yesterDayFansCount', title: '昨日粉丝', sort: true, minWidth: 100}
+                , {field: 'fansMoney', title: '粉丝奖励', minWidth: 100}
+                , {
+                    field: 'createDt', title: '创建日期', hide: true, width: 160,
+                    templet: "<div>{{layui.util.toDateString(d.createDt, 'yyyy-MM-dd HH:mm:ss')}}</div>"
+                }
+                <c:if test="${admin eq 'admin'}">
+                , {fixed: 'right', title: '操作', align: 'center', width: 90, toolbar: '#lineBar'}
+                </c:if>
+            ]]
+            , page: true //开启分页
+            , request: {
+                pageName: 'currPage' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , done: function (res) {
+                dropdown.suite();
+            }
+        });
+        table.on('tool(merchantBaseInfoList)', function (obj) {
+            var data = obj.data;
+            if (obj.event === 'detail') {
+                updateBaseInfoLeshuaRate(data.id)
+            }
+        });
+
+        table.on('sort(merchantBaseInfoList)', function (obj) {
+            console.log(obj.field); //当前排序的字段名
+            console.log(obj.type); //当前排序类型：desc（降序）、asc（升序）、null（空对象，默认排序）
+            console.log(this); //当前排序的 th 对象
+
+            //尽管我们的 table 自带排序功能，但并没有请求服务端。
+            //有些时候，你可能需要根据当前排序的字段，重新向服务端发送请求，从而实现服务端排序，如：
+            table.reload('merchantBaseInfoList', {
+                initSort: obj
+                , where: {
+                    column: obj.field //排序字段
+                    , asc: (obj.type === "asc") //排序方式
+                }
+            });
+        });
+    });
+
+    //查询
+    function queryMerchantBaseInfo() {
+        table.reload('merchantBaseInfoList', {
+            page: {
+                curr: 1
+            }
+            , where: { //请求参数（注意：这里面的参数可任意定义，并非下面固定的格式）
+                userName: $('#userName').val()
+                , phone: $('#phone').val()
+                , parentIdPhone: $('#parentIdPhone').val()
+                , alias: $('#alias').val()
+                , userId: $("#userId").val()
+            }
+        });
+    }
+</script>
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantComplaintRecord/list.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantComplaintRecord/list.jsp
new file mode 100644
index 0000000..315c67e
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantComplaintRecord/list.jsp
@@ -0,0 +1,281 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" id="form1" action="" style="margin-top: 10px">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">用户ID</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="userInfo.id" id="userId" placeholder="请输入用户ID"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">用户账号</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="userInfo.loginName" id="loginName" placeholder="请输入用户账号"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">商户名称</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="merchantName" id="alias" placeholder="请输入商户名称"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">投诉人手机</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="complaintPhone" id="complaintPhone" placeholder="请输入投诉人手机"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">订单号</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="orderNumber" id="orderNumber" placeholder="请输入订单号"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <div class="mb50 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-hide" id="merchantComplaintRecordTab" lay-filter="merchantComplaintRecordTab"></table>
+        </div>
+    </div>
+</div>
+<script type="text/html" id="leftBar">
+    <a class="layui-btn layui-btn-sm" lay-event="search">
+        <i class="layui-icon layui-icon-search"></i>
+        查询
+    </a>
+</script>
+
+<script type="text/html" id="toolBar">
+    {{# if (d.status != "2") { }}
+    <a class="layui-btn layui-btn-xs layui-custom" lay-event="edit">
+        <i class="layui-icon layui-icon-edit"></i>处理
+    </a>
+    {{# } }}
+<%--    <a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="del">--%>
+<%--        <i class="layui-icon layui-icon-delete"></i>删除--%>
+<%--    </a>--%>
+</script>
+
+<script>
+    layui.use(['table', 'layer'], function () {
+        var table = layui.table;
+        var layer = layui.layer;
+
+        var tableIns = table.render({
+            elem: '#merchantComplaintRecordTab'
+            , url: ctx + '/merchantComplaintRecord/pageData'
+            , id: 'merchantComplaintRecord'
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            , toolbar: '#leftBar' //开启头部工具栏，并为其绑定左侧模板
+            , defaultToolbar: ['filter']
+            , defaultToolbar: ['filter', 'exports', 'print', { //自定义头部工具栏右侧图标。如无需自定义，去除该参数即可
+                title: '提示'
+                , layEvent: 'LAYTABLE_TIPS'
+                , icon: 'layui-icon-tips'
+            }]
+            , title: '商户投诉表'
+            , cols: [[
+                 {field: 'numbers', title: '序号', fixed: 'left', unresize: true, width: 80, type: 'numbers'}
+                , {title: '用户ID',width: 90,templet:function (d){
+                    if(d.userInfo){
+                        return d.userInfo.id;
+                    }
+                    return "-";
+                }}
+                , {title: '用户账号',width: 120,templet:function (d){
+                    if(d.userInfo){
+                        return d.userInfo.loginName;
+                    }
+                    return "-";
+                }}
+                , {title: '商户名称',templet:function (d){
+                    return d.merchantName;
+                    }}
+                , {field: 'merchantCode', title: '商户编号'}
+                , {field: 'complaintPhone', title: '投诉人手机',width: 120}
+                , {field: 'orderNumber', title: '订单号'}
+                , {title: '金额(元)',width: 100,templet:function (d){
+                    return d.orderAmt.toFixed(2);
+                    }}
+                , {title: '投诉截图',width: 86, templet: function (d){
+                    return '<a href="javascript:void(0)" class="layui-btn layui-btn-xs layui-btn-normal" lay-event="showPic">' +
+                        '<i class="layui-icon layui-icon-file-b"></i>' +
+                        '查看' +
+                        '</a>';
+                    }}
+                , {field: 'remark', minWidth: 86, title: '投诉内容'}
+                , {
+                    field: 'payTime',
+                    title: '交易时间',
+                    width: 160,
+                    templet: "<div>{{layui.util.toDateString(d.startTime,'yyyy-MM-dd HH:mm:ss')}}</div>"
+                }
+                , {
+                    field: 'status', title: '状态',width: 80, templet: function (d) {
+                        if (d.status == "2") {
+                            return "<span style='color: green'>已处理</span>"
+                        } else {
+                            return "<span style='color: red'>未处理</span>"
+                        }
+                    }
+                }
+                , {
+                    field: 'createTime',
+                    title: '创建时间',
+                    width: 160,
+                    templet: "<div>{{layui.util.toDateString(d.createTime,'yyyy-MM-dd HH:mm:ss')}}</div>"
+                }
+                , {fixed: 'right', title: '操作', width: 90, toolbar: '#toolBar'}
+            ]]
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , page: true
+        });
+        table.on('tool(merchantComplaintRecordTab)', function (obj) { //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            var data = obj.data; //获得当前行数据
+            var layEvent = obj.event; //获得 lay-event 对应的值（也可以是表头的 event 参数对应的值）
+            if (layEvent === 'del') { //删除
+                layer.confirm('真的删除么?', {icon: 3}, function (index) {
+                    obj.del(); //删除对应行（tr）的DOM结构，并更新缓存
+                    layer.close(index);
+                    del(data);
+                    //向服务端发送删除指令
+                });
+            }else if(layEvent === 'showPic'){
+                var objJson = {};
+                objJson.title = "预览";
+                objJson.id = data.id;
+                objJson.start = 0;
+                objJson.data = new Array();
+                data.imageList.forEach(function (src){
+                    var imgObj = new Object();
+                    imgObj.alt = "投诉截图";
+                    imgObj.pid = data.id;
+                    imgObj.src = src;
+                    objJson.data.push(imgObj);
+                })
+                layer.photos({
+                    photos: objJson,
+                    //0-6的选择，指定弹出图片动画类型，默认随机
+                    anim: 5
+                });
+            }else if (layEvent === 'edit'){
+                let index = layer.confirm('确认处理当前投诉吗?',{icon: 3, title:'提示'}, function(index){
+                    data.status = "2";
+                    obj.update(data);
+                    layer.close(index);
+                    obj.tr.find('.layui-custom').hide();
+                    toUpdate(data);
+                });
+            }
+        });
+
+        //监听头工具栏事件
+        table.on('toolbar(merchantComplaintRecordTab)', function (obj) {
+            switch (obj.event) {
+                case 'search':
+                    var params = serialize($('#form1'));
+                    table.reload('merchantComplaintRecord', {
+                        where: params
+                        , page: {
+                            size: 10
+                            , current: 1
+                        }
+                    });
+                    break;
+            }
+        });
+        function toUpdate(params) {
+            $.ajax({
+                url: '${ctx}/merchantComplaintRecord/save',
+                method: 'POST',
+                dataType: 'JSON',
+                data:JSON.stringify(params),
+                contentType: "application/json",
+                success: function (res) {
+                    layer.msg(res.message, {
+                        icon: res.code == 200 ? 1 : 2
+                    });
+                }
+            })
+        }
+
+        function del(obj) {
+            $.ajax({
+                url: ctx + '/merchantComplaintRecord/del/' + obj.id,
+                method: 'DELETE',
+                dataType: 'JSON',
+                contentType: "application/json",
+                success: function (res) {
+                    layer.msg(res.message, {
+                        icon: res.code == 200 ? 1 : 2
+                    });
+                }
+            })
+        }
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantDevice/merchantDeviceBaseInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantDevice/merchantDeviceBaseInfo.jsp
new file mode 100644
index 0000000..ae28ffc
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantDevice/merchantDeviceBaseInfo.jsp
@@ -0,0 +1,132 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<script type="text/javascript">
+  window.UMEDITOR_HOME_URL = ctx + "/page/umeditor/";
+  var URL = window.UEDITOR_HOME_URL;
+</script>
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">  
+	<div class="tab-pane active">     
+		<div class="panel-body">
+			<div class="wrapper wrapper-content">
+				<div class="panel-form animated fadeInRight wp60 fc">
+					<div class="layui-form-item dn	has-error" >   
+						<label class="layui-form-label">id</label>  
+						<div class="layui-input-block">
+							<input type="text" name="id" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantDevice.id }" >
+						</div>  
+					</div>
+					
+					
+					<!--管理员看到的  -->
+                    <c:if test="${admin eq 'admin' }">
+                       <div class="form-group">
+                            <div class="layui-form-item">          
+                                <label class="layui-form-label">商户</label>
+                                <div class="layui-input-block">
+                                    <select name="merchantCode" lay-filter="selectMerchantCode" id="merchantCode">  
+                                        <option value="">请选择</option>
+                                        <c:forEach items="${merchantBaseInfoList }" var="mb">
+                                            <option value="${mb.merchantCode }" <c:if test="${merchantDevice.merchantCode eq mb.merchantCode }">selected="selected"</c:if>>${mb.merchantName }</option>
+                                        </c:forEach>
+                                    </select>              
+                                </div>
+                            </div>
+                        </div>
+                    </c:if>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">设备名称</label>  
+						<div class="layui-input-block">
+							<input type="text" name="name" id="name" lay-verify="title" autocomplete="off"  placeholder="请输入内容" class="layui-input" value="${merchantDevice.name }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">设备类型</label>  
+						<div class="layui-input-block">
+							<input type="text" name="type" id="type" lay-verify="title"  autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantDevice.type }" >
+						</div>  
+					</div>
+					<c:if test="${admin eq 'admin'||userType eq 'merchant'  }">
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">简介</label>  
+						<div class="layui-input-block">
+						  <textarea class="layui-textarea" id="introDesc"  >${merchantDevice.introDesc }</textarea>
+						</div>  
+					</div>
+					</c:if>
+					<c:if test="${admin ne 'admin'&&userType ne 'merchant'  }">
+					   <div class="layui-form-item     has-error" >   
+                        <label class="layui-form-label">简介</label>  
+                        <div class="layui-input-block">
+                          <textarea class="layui-textarea"  readonly="readonly">${merchantDevice.introDesc }</textarea>
+                        </div>  
+                    </div>
+					</c:if>
+					
+					<%-- <div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">status</label>  
+						<div class="layui-input-block">
+							<input type="text" name="status" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantDevice.status }" >
+						</div>  
+					</div> --%>
+			<div class="form-group">
+                <div class="layui-form-item">          
+                    <label class="layui-form-label">状态</label>
+                    <div class="layui-input-block">
+                        <select name="status" lay-filter="aihao" id="status"  >  
+                            <option value=""></option>
+                            <option value="1" <c:if test="${merchantDevice.status eq '1' }">selected="selected"</c:if>>使用</option>         
+                            <option value="0" <c:if test="${merchantDevice.status eq '0' }">selected="selected"</c:if>>不使用</option>
+                        </select>              
+                    </div>
+                </div>
+            </div>
+					<%-- <div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">createDt</label>  
+						<div class="layui-input-block">
+							<input type="text" name="createDt" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantDevice.createDt }" >
+						</div>  
+					</div> --%>
+					<%-- <div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">merchantCode</label>  
+						<div class="layui-input-block">
+							<input type="text" name="merchantCode" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantDevice.merchantCode }" >
+						</div>  
+					</div> --%>
+					<%-- <div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">userId</label>  
+						<div class="layui-input-block">
+							<input type="text" name="userId" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantDevice.userId }" >
+						</div>  
+					</div> --%>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">设备sn</label>  
+						<div class="layui-input-block">
+							<input type="text" name="sn" id="sn" lay-verify="title"  autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantDevice.sn }" >
+						</div>  
+					</div>
+					
+					<c:if test="${admin eq 'admin' }">
+                       <input type="hidden" id="isAdmin" value="1">
+                    </c:if>
+                    <c:if test="${admin ne 'admin' }">
+                       <input type="hidden" id="isAdmin" value="0">
+                    </c:if>
+	
+				</div>
+			</div>
+		</div>  
+	</div>
+</form>
+<script type="text/javascript">
+    //form表单样式
+    layui.use(['layer', 'form'], function() {    
+        var layer = layui.layer,
+            form = layui.form;
+        form.render();
+    });
+    $(function(){
+        UM.getEditor('introDesc');
+    })
+</script>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantDevice/merchantDeviceDetails.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantDevice/merchantDeviceDetails.jsp
new file mode 100644
index 0000000..0c7dc00
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantDevice/merchantDeviceDetails.jsp
@@ -0,0 +1,59 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>     
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">                      
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black"> 
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> 
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->                                     
+<meta name="viewport"
+	content="width=device-width, initial-scale=1.0, maximum-scale=1.0">   
+<jsp:include page="../../common.jsp" />
+<link rel="stylesheet" type="text/css" href="${ctx}/page/umeditor/themes/default/css/umeditor.css">
+<script type="text/javascript" src="${ctx}/page/umeditor/third-party/template.min.js"></script>
+<script type="text/javascript" src="${ctx}/page/umeditor/umeditor.config.js"></script>
+<script type="text/javascript" src="${ctx}/page/umeditor/umeditor.min.js"></script>
+<script type="text/javascript" src="${ctx}/page/umeditor/lang/zh-cn/zh-cn.js"></script>
+<script type="text/javascript">
+    require("merchantDevice/merchantDeviceDetails.js");
+</script>
+<title>编辑</title>
+</head>                                 
+	<body class="lgraybg">            
+		<div class="	container-fluid animated fadeInRight col-sm-12">
+			<div class="panel-toolbar mt10 mb10 pt5 pb5 pl10 bdd whitebg">
+				<div class="buttons">
+					<a href="javascript:void(0);" class="btn btn-primary fa fa-save f12"><span>保存</span></a>
+					<a href="${ctx }/merchantDevice/index?pageIndex=${pageIndex}"  class="btn btn-primary fa fa-back f12" id="goback"><span>返回</span></a>
+				</div>
+			</div>
+				<div class="tabs-container whitebg">
+					<div class="pt10 pl5 pr5">
+						<ul class="nav nav-tabs" id="nav-tabs">
+							<li class="active" data-action="base">   
+								<a href="javascript:void(0);" >基本资料</a>
+							</li>
+							<!-- <li class="" data-action="functions">
+								<a href="javascript:void(0);"  >多功能输入</a>
+							</li>
+							<li class="" data-action="extends">
+								<a href="javascript:void(0);" >扩展属性</a>
+							</li> -->
+						</ul>
+						<div class="tab-content pt30 p30">               
+		
+						</div>     
+					</div>
+				</div>    
+		</div>
+		<!-- 隐藏域 -->
+		<input type="hidden" id="merchantDeviceId" value="${merchantDevice.id }"/>
+	</body>
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantDevice/merchantDeviceExtendsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantDevice/merchantDeviceExtendsInfo.jsp
new file mode 100644
index 0000000..592687a
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantDevice/merchantDeviceExtendsInfo.jsp
@@ -0,0 +1,201 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>           
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> 
+<div class="tab-pane active">      
+	<div class="animated fadeInRight">
+		<div class="whitebg pl10 pr10">
+			<table class="table table-striped table-bordered table-hover">     
+				<thead> 
+					<tr>  
+						<th class="textc">序号</th>         
+						<th class="textc wp15">流水账号</th>
+						<th class="textc">日期</th>         
+						<th class="textc">财务类别</th>     
+						<th class="textc">金额</th>         
+						<th class="textc">银行</th>         
+						<th class="textc">发票</th>         
+						<th class="textc">客户名称</th>     
+						<th class="textc wp15">单号</th>    
+						<th class="textc">状态</th>         
+						<th class="textc">类别</th>         
+						<th class="textc">操作</th>         
+					</tr> 
+				</thead>
+				<tbody> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+                
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="green">支出</span></td>     
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+				</tbody>
+                
+			</table>  
+			<!-- footer -->  
+			<div class="clearfix mb10 pb20">          
+					<div class="layui-tab-item fr">       
+							<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+							<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>   
+							<div class="pagination dlblock vm" id="pagination"></div>
+							<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>            
+					</div>
+				</div>  
+		</div>      
+	</div>        
+</div>          
+                
+<script type="text/javascript">    
+//分页          
+$('#pagination').pagination({        
+	pageCount: 50,
+	jump: true,   
+	coping: true, 
+	homePage: '首页',    
+	endPage: '末页',     
+	prevContent: '上页', 
+	nextContent: '下页', 
+	callback: function(api) {          
+		$('.now').text(api.getCurrent());
+	}             
+});             
+</script>       
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantDevice/merchantDeviceFunctionsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantDevice/merchantDeviceFunctionsInfo.jsp
new file mode 100644
index 0000000..982ce84
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantDevice/merchantDeviceFunctionsInfo.jsp
@@ -0,0 +1,130 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>		
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">      
+<div class="tab-pane active">
+				<div class="panel-body">
+					<div class="wrapper wrapper-content">     
+						<div class="panel-form animated fadeInRight wp60 fc">
+							<!-- 账号资料 -->
+			<div class="layui-form-item 	has-error">
+				<label class="layui-form-label">单行输入框<i class="red">*</i></label>
+				<div class="layui-input-block">
+					<input type="text" name="title" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input">
+				</div>                                         
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">自定义验证</label>
+				<div class="layui-input-inline ml30">
+					<input type="password" name="password" lay-verify="pass" placeholder="请输入密码" autocomplete="off" class="layui-input">
+				</div>
+				<div class="layui-form-mid layui-word-aux">请填写6到12位密码</div>
+			</div>
+			<div class="form-group">
+				<div class="layui-form-item">          
+					<label class="layui-form-label">单行选择框</label>
+					<div class="layui-input-block">
+						<select name="interest" lay-filter="aihao">  
+							<option value=""></option>
+							<option value="0">写作</option>         
+							<option value="1" selected="">阅读</option>
+							<option value="2">游戏</option>
+							<option value="3">音乐</option>
+							<option value="4">旅行</option>  
+						</select>              
+					</div>
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<div class="layui-inline">  
+					<label class="layui-form-label">范围</label>
+					<div class="layui-input-inline ml30">
+						<input type="text" name="price_min" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>                                     
+					<div class="layui-form-mid">-</div>
+					<div class="layui-input-inline">       
+						<input type="text" name="price_max" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>
+				</div>           
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">联动选择框</label>
+				<div class="layui-input-inline ml30">
+					<select name="quiz1">     
+						<option value="">请选择省</option>
+						<option value="浙江" selected="">浙江省</option> 
+						<option value="你的工号">江西省</option>           
+						<option value="你最喜欢的老师">福建省</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz2">
+						<option value="">请选择市</option>
+						<option value="杭州">杭州</option>
+						<option value="宁波" disabled="">宁波</option>
+						<option value="温州">温州</option>
+						<option value="温州">台州</option>
+						<option value="温州">绍兴</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz3">
+						<option value="">请选择县/区</option>
+						<option value="西湖区">西湖区</option>
+						<option value="余杭区">余杭区</option>
+						<option value="拱墅区">临安市</option>
+					</select>
+				</div>    
+			</div>
+			<div class="layui-form-item" pane="">   
+				<label class="layui-form-label">原始复选框</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="like1[write]" lay-skin="primary" title="写作" checked="">  
+					<input type="checkbox" name="like1[read]" lay-skin="primary" title="阅读">
+					<input type="checkbox" name="like1[game]" lay-skin="primary" title="游戏" disabled="">
+				</div>
+			</div>
+
+			<div class="layui-form-item">
+				<label class="layui-form-label">开关-默认关</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="close" lay-skin="switch" lay-text="ON|OFF">
+				</div>
+			</div>
+			<div class="layui-form-item">  
+				<label class="layui-form-label">单选框</label>
+				<div class="layui-input-block">
+					<input type="radio" name="sex" value="男" title="男" checked="">
+					<input type="radio" name="sex" value="女" title="女">
+					<input type="radio" name="sex" value="禁" title="禁用" disabled="">
+				</div>
+			</div>
+			<!--<div class="layui-form-item layui-form-text">
+				<label class="layui-form-label">上传图片</label>
+				<div class="layui-input-block">
+					<div class="layui-upload-drag w200 h200">
+						<i class="layui-icon"></i>          
+						<p>点击上传</p>
+					</div>
+				</div>
+			</div>-->
+				<div class="layui-form-item layui-form-text">
+					<label class="layui-form-label">普通文本域</label>  
+					<div class="layui-input-block">              
+						<textarea placeholder="请输入内容" class="layui-textarea"></textarea>
+					</div>
+				</div>
+			</div>
+		</div>   
+	</div>
+</div>
+</form>   
+<script type="text/javascript">
+	//form表单样式
+	layui.use(['layer', 'form'], function() {    
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+</script>                 
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantDevice/merchantDeviceList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantDevice/merchantDeviceList.jsp
new file mode 100644
index 0000000..9df1129
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantDevice/merchantDeviceList.jsp
@@ -0,0 +1,166 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+    <script type="text/javascript">
+        require("merchantDevice/merchantDeviceList.js");
+    </script>
+    <style type="text/css">
+        .layui-table th {
+            text-align: center;
+        }
+
+        .c1 {
+            position: fixed;
+            top: 0;
+            bottom: 0;
+            left: 0;
+            right: 0;
+            background: rgba(0, 0, 0, .5);
+            z-index: 2;
+        }
+
+        .c5 {
+            position: fixed;
+            width: 350px;
+            height: 250px;
+            top: 50%;
+            left: 50%;
+            z-index: 3;
+            margin-top: -125px;
+            margin-left: -175px;
+        }
+
+        .img {
+            width: 100%;
+            height: 100%;
+            background-size: 100% 100%;
+        }
+    </style>
+
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="buttons fl">
+                        <a class="layui-btn layui-btn-sm fa fa-search f13" href="javascript:void(0);"
+                           onclick="queryMerchantDevice()"><span>搜索</span></a>
+<%--                             <a class="layui-btn fa fa-plus f13 add" href="javascript:void(0);" onclick="initAddMerchantDevice()"><span>添加</span></a>--%>
+<%--                            <a class="layui-btn fa fa-edit f13" href="javascript:void(0);" onclick="initEditMerchantDevice()"><span>编辑</span></a>--%>
+<%--                            <a class="layui-btn fa fa-remove f13 delete" href="javascript:void(0);" onclick="initBatchDeleteMerchantDevice()"><span>删除</span></a>--%>
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <div class="row pt10 pb10 whitebg ml0 mr0">
+                    <span class="dlblock w100 textr">用户ID：</span>
+                    <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+							<input type="text" placeholder="请输入用户ID" id="userId">
+						</span>
+                    <span class="dlblock w100 textr">商户简称：</span>
+                    <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+							<input type="text" placeholder="请输入名称" id="alias">
+						</span>
+                    <span class="dlblock w100 textr">设备名称：</span>
+                    <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+							<input type="text" id="name" placeholder="请输入名称">
+						</span>
+
+                    <!-- <span class="dlblock w100 textr">状态：</span>
+                     <select class="form-control f12 w180 textc" id="status">
+                        <option value="">请选择</option>
+                        <option value="1">使用</option>
+                        <option value="0">不使用</option>
+                    </select> -->
+                </div>
+                <!-- <div class="mt10 mb20">
+                    <span class="dlblock w100 textr">开始日期</span>
+                    <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+                         <input type="text" placeholder="" id="date1" class="w150">
+                         <i class="fa fa-calendar"></i>
+                    </span>
+                    <span class="dlblock w100 textr">结束日期</span>
+                    <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+                    <input type="text" placeholder="" id="date2" class="w150">
+                        <i class="fa fa-calendar"></i>
+                    </span>
+                </div> -->
+            </div>
+        </div>
+    </div>
+    <!-- 表单数据 -->
+    <div class="mb50 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-table">
+                <thead>
+                <tr>
+                    <th class="textc">
+                        <div class="checker" id="allCheck">
+                            <span class=""><input type="checkbox" value=""></span>
+                        </div>
+                    </th>
+                    <th class="textc ">序号</th>
+                    <th class="textc ">用户ID</th>
+                    <th class="textc ">商户简称</th>
+                    <th class="textc ">设备名称</th>
+                    <th class="textc ">设备logo</th>
+                    <th class="textc ">厂家型号</th>
+                    <th class="textc ">创建时间</th>
+                    <!-- <th class="textc">编辑</th> -->
+                </tr>
+                </thead>
+                <!-- 数据体 -->
+                <tbody id="data_content">
+                </tbody>
+            </table>
+
+            <!-- footer -->
+            <div class="clearfix mb10 pb20">
+                <div class="layui-tab-item fr">
+                    <span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+                    <span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>
+                    <div class="pagination dlblock vm" id="pagination"></div>
+                    <span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>
+                </div>
+            </div>
+
+            <!-- 放大图片弹框 -->
+            <div id="pictureWindow" class="dn" onclick="hidePictureWindow()">
+                <div class="c1"></div>
+                <div class="c5">
+                    <div class="mt20" id="picture">
+
+                    </div>
+                </div>
+            </div>
+
+        </div>
+    </div>
+</div>
+</body>
+
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantGuide/detail.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantGuide/detail.jsp
new file mode 100644
index 0000000..a066b26
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantGuide/detail.jsp
@@ -0,0 +1,109 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp" />
+    <style>
+        .layui-input,.layui-textarea{
+            border-color:#606060;
+        }
+    </style>
+</head>
+<body>
+<form class="layui-form" action="" style="width: 70%">
+    <input name="id" value="${entity.id}" hidden/>
+    <input name="guideId" value="${entity.guideId}" hidden/>
+    <div class="layui-form-item">
+        <label class="layui-form-label">商户名称</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="merchantName" value="${entity.merchantName}" readonly  placeholder="商户名称" class="layui-input layui-disabled"/>
+            </div>
+        </div>
+    </div>
+     <div class="layui-form-item">
+        <label class="layui-form-label">商户编号</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="merchantCode" value="${entity.merchantCode}" readonly  placeholder="请输入商户编号" class="layui-input layui-disabled"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">话术名称</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="name" value="${entity.name}" lay-verify="required"  placeholder="请输入话术名称"  class="layui-input"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">是否选中</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <select name="status" class="layui-select" lay-verify="required">
+                    <option value="">请选择</option>
+                    <option value="0" ${entity.status == '0' ? 'selected' : ''}>否</option>
+                    <option value="1" ${entity.status == '1' ? 'selected' : ''}>是</option>
+                </select>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button class="layui-btn" lay-submit lay-filter="formDemo">立即提交</button>
+            <button type="button" id="close" class="layui-btn layui-btn-primary">关闭</button>
+        </div>
+    </div>
+</form>
+
+<script>
+    //Demo
+    layui.use(['form','layer'], function(){
+        var form = layui.form;
+        var layer = layui.layer;
+        $('#close').click(function() {
+            parent.layer.closeAll();
+        });
+            //监听提交
+        form.on('submit(formDemo)', function(data){
+            var index = layer.load(1,{shade: [0.1,'#000'] });
+            $.ajax({
+                url: '${ctx}/merchantGuide/save',
+                method: 'post',
+                data: JSON.stringify(data.field),
+                dataType: 'JSON',
+                contentType:"application/json",
+                success: function(res) {
+                    layer.close(index);
+                    if(res.code == 200) {
+                        layer.msg(res.message, { icon: 1, time: 1000 }, function () {
+                            var index = parent.layer.getFrameIndex(window.name);
+                            parent.layui.table.reload('merchantGuide');
+                            parent.layer.close(index);
+                        });
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 2
+                        });
+                    }
+                }
+            })
+            return false;
+        });
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantGuide/list.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantGuide/list.jsp
new file mode 100644
index 0000000..7682669
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantGuide/list.jsp
@@ -0,0 +1,234 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" id="form1" action="" style="margin-top: 10px">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">商户名称</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="merchantName" id="merchantName" placeholder="请输入商户名称"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">商户编号</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="merchantCode" id="merchantCode" placeholder="请输入商户编号"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">话术名称</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="name" id="name" placeholder="请输入话术名称" autocomplete="off"
+                                       class="layui-input">
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <div class="mb50 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-hide" id="merchantGuideTab" lay-filter="merchantGuideTab"></table>
+        </div>
+    </div>
+</div>
+<script type="text/html" id="leftBar">
+    <a class="layui-btn layui-btn-sm" lay-event="search">
+        <i class="layui-icon layui-icon-search"></i>查询
+    </a>
+</script>
+
+<script type="text/html" id="toolBar">
+    <a class="layui-btn layui-btn-xs" lay-event="edit">
+        <i class="layui-icon layui-icon-edit"></i>编辑
+    </a>
+    <a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="del">
+        <i class="layui-icon layui-icon-delete"></i>删除
+    </a>
+</script>
+
+<script>
+    layui.use(['table', 'layer'], function () {
+        var table = layui.table;
+        var layer = layui.layer;
+
+        var tableIns = table.render({
+            elem: '#merchantGuideTab'
+            , url: '${ctx}/merchantGuide/page'
+            , id: 'merchantGuide'
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            , toolbar: '#leftBar' //开启头部工具栏，并为其绑定左侧模板
+            , defaultToolbar: ['filter']
+            , defaultToolbar: ['filter', 'exports', 'print', { //自定义头部工具栏右侧图标。如无需自定义，去除该参数即可
+                title: '提示'
+                , layEvent: 'LAYTABLE_TIPS'
+                , icon: 'layui-icon-tips'
+            }]
+            , title: '商户引导话术信息表'
+            , cols: [[
+                {type: 'checkbox', fixed: 'left', hidden: true}
+                , {field: 'numbers', title: '序号', fixed: 'left', unresize: true, width: 80, type: 'numbers'}
+                , {field: 'merchantName', title: '商户名称'}
+                , {field: 'merchantCode', title: '商户编号'}
+                , {field: 'name', title: '话术名称'}
+                , {
+                    field: 'status', title: '是否选中', templet: function (d) {
+                        if (d.status === '1') {
+                            return "<span style='color: green'>是</span>"
+                        } else {
+                            return "<span style='color: red'>否</span>"
+                        }
+                    }
+                }
+                , {
+                    field: 'createTime',
+                    title: '创建时间',
+                    width: 160,
+                    templet: "<div>{{layui.util.toDateString(d.createTime,'yyyy-MM-dd HH:mm:ss')}}</div>"
+                }
+                , {
+                    field: 'updateTime',
+                    title: '修改时间',
+                    width: 160,
+                    templet: "<div>{{layui.util.toDateString(d.updateTime,'yyyy-MM-dd HH:mm:ss')}}</div>"
+                }
+                , {fixed: 'right', title: '操作', width: 200, toolbar: '#toolBar'}
+            ]]
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , page: true
+        });
+        table.on('tool(merchantGuideTab)', function (obj) { //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            var data = obj.data; //获得当前行数据
+            var layEvent = obj.event; //获得 lay-event 对应的值（也可以是表头的 event 参数对应的值）
+            if (layEvent === 'del') { //删除
+                layer.confirm('真的删除么?', {icon: 3}, function (index) {
+                    obj.del(); //删除对应行（tr）的DOM结构，并更新缓存
+                    layer.close(index);
+                    del(data);
+                    //向服务端发送删除指令
+                });
+            } else if (layEvent === 'edit') { //编辑
+                //do something
+                toAdd(obj.data);
+                //同步更新缓存对应的值
+                // obj.update({
+                //     username: '123'
+                //     ,title: 'xxx'
+                // });
+            }
+        });
+
+        //监听头工具栏事件
+        table.on('toolbar(merchantGuideTab)', function (obj) {
+            switch (obj.event) {
+                case 'add':
+                    // 添加
+                    toAdd();
+                    break;
+                case 'search':
+                    var params = serialize($('#form1'));
+                    table.reload('merchantGuide', {
+                        where: params
+                        , page: {
+                            size: 10
+                            , current: 1
+                        }
+                    });
+                    break;
+            }
+        });
+
+        function toAdd(obj) {
+            var url = '${ctx}/merchantGuide/detail';
+            var title = "新增";
+            if (obj != undefined) {
+                url = "${ctx}/merchantGuide/detail/" + obj.id;
+                title = "编辑"
+            }
+            var index = layer.open({
+                type: 2
+                , shade: 0.5
+                , title: title
+                , maxmin: true
+                , content: url
+                , area: ['500px', '420px']
+                , end: function () {
+
+                }
+            });
+        }
+
+        function del(obj) {
+            $.ajax({
+                url: '${ctx}/merchantGuide/del/' + obj.id,
+                method: 'DELETE',
+                dataType: 'JSON',
+                contentType: "application/json",
+                success: function (res) {
+                    if (res.code == 200) {
+                        layer.msg(res.data, {
+                            icon: 1
+                        });
+                    } else {
+                        layer.msg(res.data, {
+                            icon: 2
+                        });
+                    }
+                }
+            })
+        }
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantImage/merchantImageBaseInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantImage/merchantImageBaseInfo.jsp
new file mode 100644
index 0000000..c2cfd67
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantImage/merchantImageBaseInfo.jsp
@@ -0,0 +1,57 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">  
+	<div class="tab-pane active">     
+		<div class="panel-body">
+			<div class="wrapper wrapper-content">
+				<div class="panel-form animated fadeInRight wp60 fc">
+					<div class="layui-form-item dn	has-error" >   
+						<label class="layui-form-label">id</label>  
+						<div class="layui-input-block">
+							<input type="text" name="id" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantImage.id }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">merchantCode</label>  
+						<div class="layui-input-block">
+							<input type="text" name="merchantCode" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantImage.merchantCode }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">photoType</label>  
+						<div class="layui-input-block">
+							<input type="text" name="photoType" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantImage.photoType }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">photoUrl</label>  
+						<div class="layui-input-block">
+							<input type="text" name="photoUrl" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantImage.photoUrl }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">picUrl</label>  
+						<div class="layui-input-block">
+							<input type="text" name="picUrl" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantImage.picUrl }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">createDt</label>  
+						<div class="layui-input-block">
+							<input type="text" name="createDt" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantImage.createDt }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">updateDt</label>  
+						<div class="layui-input-block">
+							<input type="text" name="updateDt" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantImage.updateDt }" >
+						</div>  
+					</div>
+	
+				</div>
+			</div>
+		</div>  
+	</div>
+</form>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantImage/merchantImageDetails.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantImage/merchantImageDetails.jsp
new file mode 100644
index 0000000..d94df2d
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantImage/merchantImageDetails.jsp
@@ -0,0 +1,54 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>     
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">                      
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black"> 
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> 
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->                                     
+<meta name="viewport"
+	content="width=device-width, initial-scale=1.0, maximum-scale=1.0">   
+<jsp:include page="../../common.jsp" />
+<script type="text/javascript">
+    require("js/merchantImage/merchantImageDetails.js");
+</script>
+<title>编辑</title>
+</head>                                 
+	<body class="lgraybg">            
+		<div class="	container-fluid animated fadeInRight col-sm-12">
+			<div class="panel-toolbar mt10 mb10 pt5 pb5 pl10 bdd whitebg">
+				<div class="buttons">
+					<a href="javascript:void(0);" class="btn btn-primary fa fa-save f12"><span>保存</span></a>
+					<a href="${ctx }/merchantImage/index?pageIndex=${pageIndex}"  class="btn btn-primary fa fa-back f12" id="goback"><span>返回</span></a>
+				</div>
+			</div>
+				<div class="tabs-container whitebg">
+					<div class="pt10 pl5 pr5">
+						<ul class="nav nav-tabs" id="nav-tabs">
+							<li class="active" data-action="base">   
+								<a href="javascript:void(0);" >基本资料</a>
+							</li>
+							<li class="" data-action="functions">
+								<a href="javascript:void(0);"  >多功能输入</a>
+							</li>
+							<li class="" data-action="extends">
+								<a href="javascript:void(0);" >扩展属性</a>
+							</li>
+						</ul>
+						<div class="tab-content pt30 p30">               
+		
+						</div>     
+					</div>
+				</div>    
+		</div>
+		<!-- 隐藏域 -->
+		<input type="hidden" id="merchantImageId" value="${merchantImage.id }"/>
+	</body>
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantImage/merchantImageExtendsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantImage/merchantImageExtendsInfo.jsp
new file mode 100644
index 0000000..592687a
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantImage/merchantImageExtendsInfo.jsp
@@ -0,0 +1,201 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>           
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> 
+<div class="tab-pane active">      
+	<div class="animated fadeInRight">
+		<div class="whitebg pl10 pr10">
+			<table class="table table-striped table-bordered table-hover">     
+				<thead> 
+					<tr>  
+						<th class="textc">序号</th>         
+						<th class="textc wp15">流水账号</th>
+						<th class="textc">日期</th>         
+						<th class="textc">财务类别</th>     
+						<th class="textc">金额</th>         
+						<th class="textc">银行</th>         
+						<th class="textc">发票</th>         
+						<th class="textc">客户名称</th>     
+						<th class="textc wp15">单号</th>    
+						<th class="textc">状态</th>         
+						<th class="textc">类别</th>         
+						<th class="textc">操作</th>         
+					</tr> 
+				</thead>
+				<tbody> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+                
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="green">支出</span></td>     
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+				</tbody>
+                
+			</table>  
+			<!-- footer -->  
+			<div class="clearfix mb10 pb20">          
+					<div class="layui-tab-item fr">       
+							<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+							<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>   
+							<div class="pagination dlblock vm" id="pagination"></div>
+							<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>            
+					</div>
+				</div>  
+		</div>      
+	</div>        
+</div>          
+                
+<script type="text/javascript">    
+//分页          
+$('#pagination').pagination({        
+	pageCount: 50,
+	jump: true,   
+	coping: true, 
+	homePage: '首页',    
+	endPage: '末页',     
+	prevContent: '上页', 
+	nextContent: '下页', 
+	callback: function(api) {          
+		$('.now').text(api.getCurrent());
+	}             
+});             
+</script>       
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantImage/merchantImageFunctionsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantImage/merchantImageFunctionsInfo.jsp
new file mode 100644
index 0000000..982ce84
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantImage/merchantImageFunctionsInfo.jsp
@@ -0,0 +1,130 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>		
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">      
+<div class="tab-pane active">
+				<div class="panel-body">
+					<div class="wrapper wrapper-content">     
+						<div class="panel-form animated fadeInRight wp60 fc">
+							<!-- 账号资料 -->
+			<div class="layui-form-item 	has-error">
+				<label class="layui-form-label">单行输入框<i class="red">*</i></label>
+				<div class="layui-input-block">
+					<input type="text" name="title" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input">
+				</div>                                         
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">自定义验证</label>
+				<div class="layui-input-inline ml30">
+					<input type="password" name="password" lay-verify="pass" placeholder="请输入密码" autocomplete="off" class="layui-input">
+				</div>
+				<div class="layui-form-mid layui-word-aux">请填写6到12位密码</div>
+			</div>
+			<div class="form-group">
+				<div class="layui-form-item">          
+					<label class="layui-form-label">单行选择框</label>
+					<div class="layui-input-block">
+						<select name="interest" lay-filter="aihao">  
+							<option value=""></option>
+							<option value="0">写作</option>         
+							<option value="1" selected="">阅读</option>
+							<option value="2">游戏</option>
+							<option value="3">音乐</option>
+							<option value="4">旅行</option>  
+						</select>              
+					</div>
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<div class="layui-inline">  
+					<label class="layui-form-label">范围</label>
+					<div class="layui-input-inline ml30">
+						<input type="text" name="price_min" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>                                     
+					<div class="layui-form-mid">-</div>
+					<div class="layui-input-inline">       
+						<input type="text" name="price_max" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>
+				</div>           
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">联动选择框</label>
+				<div class="layui-input-inline ml30">
+					<select name="quiz1">     
+						<option value="">请选择省</option>
+						<option value="浙江" selected="">浙江省</option> 
+						<option value="你的工号">江西省</option>           
+						<option value="你最喜欢的老师">福建省</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz2">
+						<option value="">请选择市</option>
+						<option value="杭州">杭州</option>
+						<option value="宁波" disabled="">宁波</option>
+						<option value="温州">温州</option>
+						<option value="温州">台州</option>
+						<option value="温州">绍兴</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz3">
+						<option value="">请选择县/区</option>
+						<option value="西湖区">西湖区</option>
+						<option value="余杭区">余杭区</option>
+						<option value="拱墅区">临安市</option>
+					</select>
+				</div>    
+			</div>
+			<div class="layui-form-item" pane="">   
+				<label class="layui-form-label">原始复选框</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="like1[write]" lay-skin="primary" title="写作" checked="">  
+					<input type="checkbox" name="like1[read]" lay-skin="primary" title="阅读">
+					<input type="checkbox" name="like1[game]" lay-skin="primary" title="游戏" disabled="">
+				</div>
+			</div>
+
+			<div class="layui-form-item">
+				<label class="layui-form-label">开关-默认关</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="close" lay-skin="switch" lay-text="ON|OFF">
+				</div>
+			</div>
+			<div class="layui-form-item">  
+				<label class="layui-form-label">单选框</label>
+				<div class="layui-input-block">
+					<input type="radio" name="sex" value="男" title="男" checked="">
+					<input type="radio" name="sex" value="女" title="女">
+					<input type="radio" name="sex" value="禁" title="禁用" disabled="">
+				</div>
+			</div>
+			<!--<div class="layui-form-item layui-form-text">
+				<label class="layui-form-label">上传图片</label>
+				<div class="layui-input-block">
+					<div class="layui-upload-drag w200 h200">
+						<i class="layui-icon"></i>          
+						<p>点击上传</p>
+					</div>
+				</div>
+			</div>-->
+				<div class="layui-form-item layui-form-text">
+					<label class="layui-form-label">普通文本域</label>  
+					<div class="layui-input-block">              
+						<textarea placeholder="请输入内容" class="layui-textarea"></textarea>
+					</div>
+				</div>
+			</div>
+		</div>   
+	</div>
+</div>
+</form>   
+<script type="text/javascript">
+	//form表单样式
+	layui.use(['layer', 'form'], function() {    
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+</script>                 
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantImage/merchantImageList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantImage/merchantImageList.jsp
new file mode 100644
index 0000000..7fbc839
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantImage/merchantImageList.jsp
@@ -0,0 +1,116 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black">
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->
+<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+<jsp:include page="../../common.jsp" />
+<script type="text/javascript">
+     require("js/merchantImage/merchantImageList.js");
+</script>
+</head>
+<body>
+	<div class="row animated fadeInRight" style="margin: 0;">
+		<div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+			<div class="toolbar-panel bdd">
+				<div class="toolbar-box">
+					<div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+						<!-- 顶部按钮 -->
+						<div class="buttons fl">
+							<a class="btn btn-primary fa fa-search f13" href="javascript:void(0);" onclick="queryMerchantImage()"><span>搜索</span></a>
+							<a class="btn btn-primary fa fa-plus f13 add" href="javascript:void(0);" onclick="initAddMerchantImage()"><span>添加</span></a>
+							<a class="btn btn-primary fa fa-edit f13" href="javascript:void(0);" onclick="initEditMerchantImage()"><span>编辑</span></a> 
+							<a class="btn btn-primary fa fa-remove f13 delete" href="javascript:void(0);" onclick="initBatchDeleteMerchantImage()"><span>删除</span></a> 
+						</div>
+						<div class="tools fr">
+							<a href="javascript:void(0);" class="collapse dblock f14 dgray mr5"> 
+								<i class="fa-2x fa fa-angle-double-up"></i>
+							</a>
+						</div>
+					</div>
+				</div>
+
+				<!--搜索条件 -->
+				<div class="toolbar-body">
+					<div class="row pt10 pb10 whitebg ml0 mr0">
+						<span class="dlblock w100 textr">ID：</span> 
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+							<input type="text" placeholder="请输入内容" id="searchId">  
+						</span> 
+						<span class="dlblock w100 textr">名称：</span> 
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+							<input type="text" placeholder="请输入名称">
+						</span> 
+						<span class="dlblock w100 textr">类别：</span>
+						 <select class="form-control f12 w180 textc">
+							<option value="">支出</option>
+							<option value="">收入</option>
+						</select>
+					</div>
+					<div class="mt10 mb20">
+						<span class="dlblock w100 textr">开始日期</span>
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+							 <input type="text" placeholder="" id="date1" class="w150">
+							 <i class="fa fa-calendar"></i>
+						</span> 
+						<span class="dlblock w100 textr">结束日期</span>
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+						<input type="text" placeholder="" id="date2" class="w150"> 
+							<i class="fa fa-calendar"></i>
+						</span>
+					</div>
+				</div>
+			</div>
+		</div>
+		<!-- 表单数据 -->
+		<div class="mb20 mt10">
+			<div class="whitebg pl10 pr10">
+				<table class="table table-striped table-bordered table-hover">
+					<thead>
+						<tr>
+							<th class="textc">
+								<div class="checker" id="allCheck">
+									<span class=""><input type="checkbox" value="" ></span>
+								</div>
+							</th>
+							<th class="textc ">id</th>
+							<th class="textc ">merchantCode</th>
+							<th class="textc ">photoType</th>
+							<th class="textc ">photoUrl</th>
+							<th class="textc wp15">picUrl</th>
+							<th class="textc ">createDt</th>
+							<th class="textc ">updateDt</th>
+							<th class="textc">编辑</th>
+						</tr>
+					</thead>
+					<!-- 数据体 -->
+					<tbody id="data_content">
+					</tbody>
+				</table>
+			
+			<!-- footer -->
+				<div class="clearfix mb10 pb20">
+						<div class="layui-tab-item fr">
+								<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+								<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>
+								<div class="pagination dlblock vm" id="pagination"></div>
+								<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>
+						</div>
+					</div>
+	
+			</div>
+		</div>
+	</div>
+</body>
+
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantIncome/merchantIncomeBaseInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantIncome/merchantIncomeBaseInfo.jsp
new file mode 100644
index 0000000..00d30cf
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantIncome/merchantIncomeBaseInfo.jsp
@@ -0,0 +1,123 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">  
+	<div class="tab-pane active">     
+		<div class="panel-body">
+			<div class="wrapper wrapper-content">
+				<div class="panel-form animated fadeInRight wp60 fc">
+					<div class="layui-form-item dn	has-error" >   
+						<label class="layui-form-label">id</label>  
+						<div class="layui-input-block">
+							<input type="text" name="id" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantIncome.id }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">userId</label>  
+						<div class="layui-input-block">
+							<input type="text" name="userId" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantIncome.userId }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">merchantCode</label>  
+						<div class="layui-input-block">
+							<input type="text" name="merchantCode" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantIncome.merchantCode }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">merchantName</label>  
+						<div class="layui-input-block">
+							<input type="text" name="merchantName" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantIncome.merchantName }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">storeId</label>  
+						<div class="layui-input-block">
+							<input type="text" name="storeId" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantIncome.storeId }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">storeName</label>  
+						<div class="layui-input-block">
+							<input type="text" name="storeName" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantIncome.storeName }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">dealType</label>  
+						<div class="layui-input-block">
+							<input type="text" name="dealType" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantIncome.dealType }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">dealFee</label>  
+						<div class="layui-input-block">
+							<input type="text" name="dealFee" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantIncome.dealFee }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">incomeFee</label>  
+						<div class="layui-input-block">
+							<input type="text" name="incomeFee" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantIncome.incomeFee }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">createTime</label>  
+						<div class="layui-input-block">
+							<input type="text" name="createTime" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantIncome.createTime }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">payTypeCode</label>  
+						<div class="layui-input-block">
+							<input type="text" name="payTypeCode" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantIncome.payTypeCode }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">payTypeName</label>  
+						<div class="layui-input-block">
+							<input type="text" name="payTypeName" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantIncome.payTypeName }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">memberCode</label>  
+						<div class="layui-input-block">
+							<input type="text" name="memberCode" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantIncome.memberCode }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">memberName</label>  
+						<div class="layui-input-block">
+							<input type="text" name="memberName" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantIncome.memberName }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">memberPic</label>  
+						<div class="layui-input-block">
+							<input type="text" name="memberPic" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantIncome.memberPic }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">incomeType</label>  
+						<div class="layui-input-block">
+							<input type="text" name="incomeType" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantIncome.incomeType }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">plateformProfit</label>  
+						<div class="layui-input-block">
+							<input type="text" name="plateformProfit" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantIncome.plateformProfit }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">promoterProfit</label>  
+						<div class="layui-input-block">
+							<input type="text" name="promoterProfit" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantIncome.promoterProfit }" >
+						</div>  
+					</div>
+	
+				</div>
+			</div>
+		</div>  
+	</div>
+</form>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantIncome/merchantIncomeDetails.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantIncome/merchantIncomeDetails.jsp
new file mode 100644
index 0000000..f509fda
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantIncome/merchantIncomeDetails.jsp
@@ -0,0 +1,54 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>     
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">                      
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black"> 
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> 
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->                                     
+<meta name="viewport"
+	content="width=device-width, initial-scale=1.0, maximum-scale=1.0">   
+<jsp:include page="../../common.jsp" />
+<script type="text/javascript">
+    require("js/merchantIncome/merchantIncomeDetails.js");
+</script>
+<title>编辑</title>
+</head>                                 
+	<body class="lgraybg">            
+		<div class="	container-fluid animated fadeInRight col-sm-12">
+			<div class="panel-toolbar mt10 mb10 pt5 pb5 pl10 bdd whitebg">
+				<div class="buttons">
+					<a href="javascript:void(0);" class="btn btn-primary fa fa-save f12"><span>保存</span></a>
+					<a href="${ctx }/merchantIncome/index?pageIndex=${pageIndex}"  class="btn btn-primary fa fa-back f12" id="goback"><span>返回</span></a>
+				</div>
+			</div>
+				<div class="tabs-container whitebg">
+					<div class="pt10 pl5 pr5">
+						<ul class="nav nav-tabs" id="nav-tabs">
+							<li class="active" data-action="base">   
+								<a href="javascript:void(0);" >基本资料</a>
+							</li>
+							<li class="" data-action="functions">
+								<a href="javascript:void(0);"  >多功能输入</a>
+							</li>
+							<li class="" data-action="extends">
+								<a href="javascript:void(0);" >扩展属性</a>
+							</li>
+						</ul>
+						<div class="tab-content pt30 p30">               
+		
+						</div>     
+					</div>
+				</div>    
+		</div>
+		<!-- 隐藏域 -->
+		<input type="hidden" id="merchantIncomeId" value="${merchantIncome.id }"/>
+	</body>
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantIncome/merchantIncomeExtendsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantIncome/merchantIncomeExtendsInfo.jsp
new file mode 100644
index 0000000..592687a
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantIncome/merchantIncomeExtendsInfo.jsp
@@ -0,0 +1,201 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>           
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> 
+<div class="tab-pane active">      
+	<div class="animated fadeInRight">
+		<div class="whitebg pl10 pr10">
+			<table class="table table-striped table-bordered table-hover">     
+				<thead> 
+					<tr>  
+						<th class="textc">序号</th>         
+						<th class="textc wp15">流水账号</th>
+						<th class="textc">日期</th>         
+						<th class="textc">财务类别</th>     
+						<th class="textc">金额</th>         
+						<th class="textc">银行</th>         
+						<th class="textc">发票</th>         
+						<th class="textc">客户名称</th>     
+						<th class="textc wp15">单号</th>    
+						<th class="textc">状态</th>         
+						<th class="textc">类别</th>         
+						<th class="textc">操作</th>         
+					</tr> 
+				</thead>
+				<tbody> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+                
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="green">支出</span></td>     
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+				</tbody>
+                
+			</table>  
+			<!-- footer -->  
+			<div class="clearfix mb10 pb20">          
+					<div class="layui-tab-item fr">       
+							<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+							<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>   
+							<div class="pagination dlblock vm" id="pagination"></div>
+							<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>            
+					</div>
+				</div>  
+		</div>      
+	</div>        
+</div>          
+                
+<script type="text/javascript">    
+//分页          
+$('#pagination').pagination({        
+	pageCount: 50,
+	jump: true,   
+	coping: true, 
+	homePage: '首页',    
+	endPage: '末页',     
+	prevContent: '上页', 
+	nextContent: '下页', 
+	callback: function(api) {          
+		$('.now').text(api.getCurrent());
+	}             
+});             
+</script>       
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantIncome/merchantIncomeFunctionsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantIncome/merchantIncomeFunctionsInfo.jsp
new file mode 100644
index 0000000..982ce84
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantIncome/merchantIncomeFunctionsInfo.jsp
@@ -0,0 +1,130 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>		
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">      
+<div class="tab-pane active">
+				<div class="panel-body">
+					<div class="wrapper wrapper-content">     
+						<div class="panel-form animated fadeInRight wp60 fc">
+							<!-- 账号资料 -->
+			<div class="layui-form-item 	has-error">
+				<label class="layui-form-label">单行输入框<i class="red">*</i></label>
+				<div class="layui-input-block">
+					<input type="text" name="title" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input">
+				</div>                                         
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">自定义验证</label>
+				<div class="layui-input-inline ml30">
+					<input type="password" name="password" lay-verify="pass" placeholder="请输入密码" autocomplete="off" class="layui-input">
+				</div>
+				<div class="layui-form-mid layui-word-aux">请填写6到12位密码</div>
+			</div>
+			<div class="form-group">
+				<div class="layui-form-item">          
+					<label class="layui-form-label">单行选择框</label>
+					<div class="layui-input-block">
+						<select name="interest" lay-filter="aihao">  
+							<option value=""></option>
+							<option value="0">写作</option>         
+							<option value="1" selected="">阅读</option>
+							<option value="2">游戏</option>
+							<option value="3">音乐</option>
+							<option value="4">旅行</option>  
+						</select>              
+					</div>
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<div class="layui-inline">  
+					<label class="layui-form-label">范围</label>
+					<div class="layui-input-inline ml30">
+						<input type="text" name="price_min" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>                                     
+					<div class="layui-form-mid">-</div>
+					<div class="layui-input-inline">       
+						<input type="text" name="price_max" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>
+				</div>           
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">联动选择框</label>
+				<div class="layui-input-inline ml30">
+					<select name="quiz1">     
+						<option value="">请选择省</option>
+						<option value="浙江" selected="">浙江省</option> 
+						<option value="你的工号">江西省</option>           
+						<option value="你最喜欢的老师">福建省</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz2">
+						<option value="">请选择市</option>
+						<option value="杭州">杭州</option>
+						<option value="宁波" disabled="">宁波</option>
+						<option value="温州">温州</option>
+						<option value="温州">台州</option>
+						<option value="温州">绍兴</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz3">
+						<option value="">请选择县/区</option>
+						<option value="西湖区">西湖区</option>
+						<option value="余杭区">余杭区</option>
+						<option value="拱墅区">临安市</option>
+					</select>
+				</div>    
+			</div>
+			<div class="layui-form-item" pane="">   
+				<label class="layui-form-label">原始复选框</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="like1[write]" lay-skin="primary" title="写作" checked="">  
+					<input type="checkbox" name="like1[read]" lay-skin="primary" title="阅读">
+					<input type="checkbox" name="like1[game]" lay-skin="primary" title="游戏" disabled="">
+				</div>
+			</div>
+
+			<div class="layui-form-item">
+				<label class="layui-form-label">开关-默认关</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="close" lay-skin="switch" lay-text="ON|OFF">
+				</div>
+			</div>
+			<div class="layui-form-item">  
+				<label class="layui-form-label">单选框</label>
+				<div class="layui-input-block">
+					<input type="radio" name="sex" value="男" title="男" checked="">
+					<input type="radio" name="sex" value="女" title="女">
+					<input type="radio" name="sex" value="禁" title="禁用" disabled="">
+				</div>
+			</div>
+			<!--<div class="layui-form-item layui-form-text">
+				<label class="layui-form-label">上传图片</label>
+				<div class="layui-input-block">
+					<div class="layui-upload-drag w200 h200">
+						<i class="layui-icon"></i>          
+						<p>点击上传</p>
+					</div>
+				</div>
+			</div>-->
+				<div class="layui-form-item layui-form-text">
+					<label class="layui-form-label">普通文本域</label>  
+					<div class="layui-input-block">              
+						<textarea placeholder="请输入内容" class="layui-textarea"></textarea>
+					</div>
+				</div>
+			</div>
+		</div>   
+	</div>
+</div>
+</form>   
+<script type="text/javascript">
+	//form表单样式
+	layui.use(['layer', 'form'], function() {    
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+</script>                 
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantIncome/merchantIncomeList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantIncome/merchantIncomeList.jsp
new file mode 100644
index 0000000..cc6e711
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantIncome/merchantIncomeList.jsp
@@ -0,0 +1,127 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black">
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->
+<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+<jsp:include page="../../common.jsp" />
+<script type="text/javascript">
+     require("js/merchantIncome/merchantIncomeList.js");
+</script>
+</head>
+<body>
+	<div class="row animated fadeInRight" style="margin: 0;">
+		<div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+			<div class="toolbar-panel bdd">
+				<div class="toolbar-box">
+					<div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+						<!-- 顶部按钮 -->
+						<div class="buttons fl">
+							<a class="btn btn-primary fa fa-search f13" href="javascript:void(0);" onclick="queryMerchantIncome()"><span>搜索</span></a>
+							<a class="btn btn-primary fa fa-plus f13 add" href="javascript:void(0);" onclick="initAddMerchantIncome()"><span>添加</span></a>
+							<a class="btn btn-primary fa fa-edit f13" href="javascript:void(0);" onclick="initEditMerchantIncome()"><span>编辑</span></a> 
+							<a class="btn btn-primary fa fa-remove f13 delete" href="javascript:void(0);" onclick="initBatchDeleteMerchantIncome()"><span>删除</span></a> 
+						</div>
+						<div class="tools fr">
+							<a href="javascript:void(0);" class="collapse dblock f14 dgray mr5"> 
+								<i class="fa-2x fa fa-angle-double-up"></i>
+							</a>
+						</div>
+					</div>
+				</div>
+
+				<!--搜索条件 -->
+				<div class="toolbar-body">
+					<div class="row pt10 pb10 whitebg ml0 mr0">
+						<span class="dlblock w100 textr">ID：</span> 
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+							<input type="text" placeholder="请输入内容" id="searchId">  
+						</span> 
+						<span class="dlblock w100 textr">名称：</span> 
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+							<input type="text" placeholder="请输入名称">
+						</span> 
+						<span class="dlblock w100 textr">类别：</span>
+						 <select class="form-control f12 w180 textc">
+							<option value="">支出</option>
+							<option value="">收入</option>
+						</select>
+					</div>
+					<div class="mt10 mb20">
+						<span class="dlblock w100 textr">开始日期</span>
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+							 <input type="text" placeholder="" id="date1" class="w150">
+							 <i class="fa fa-calendar"></i>
+						</span> 
+						<span class="dlblock w100 textr">结束日期</span>
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+						<input type="text" placeholder="" id="date2" class="w150"> 
+							<i class="fa fa-calendar"></i>
+						</span>
+					</div>
+				</div>
+			</div>
+		</div>
+		<!-- 表单数据 -->
+		<div class="mb20 mt10">
+			<div class="whitebg pl10 pr10">
+				<table class="table table-striped table-bordered table-hover">
+					<thead>
+						<tr>
+							<th class="textc">
+								<div class="checker" id="allCheck">
+									<span class=""><input type="checkbox" value="" ></span>
+								</div>
+							</th>
+							<th class="textc ">id</th>
+							<th class="textc ">userId</th>
+							<th class="textc ">merchantCode</th>
+							<th class="textc ">merchantName</th>
+							<th class="textc wp15">storeId</th>
+							<th class="textc ">storeName</th>
+							<th class="textc ">dealType</th>
+							<th class="textc ">dealFee</th>
+							<th class="textc wp15">incomeFee</th>
+							<th class="textc ">createTime</th>
+							<th class="textc ">payTypeCode</th>
+							<th class="textc ">payTypeName</th>
+							<th class="textc wp15">memberCode</th>
+							<th class="textc ">memberName</th>
+							<th class="textc ">memberPic</th>
+							<th class="textc ">incomeType</th>
+							<th class="textc wp15">plateformProfit</th>
+							<th class="textc ">promoterProfit</th>
+							<th class="textc">编辑</th>
+						</tr>
+					</thead>
+					<!-- 数据体 -->
+					<tbody id="data_content">
+					</tbody>
+				</table>
+			
+			<!-- footer -->
+				<div class="clearfix mb10 pb20">
+						<div class="layui-tab-item fr">
+								<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+								<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>
+								<div class="pagination dlblock vm" id="pagination"></div>
+								<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>
+						</div>
+					</div>
+	
+			</div>
+		</div>
+	</div>
+</body>
+
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMenber/memberMarket.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMenber/memberMarket.jsp
new file mode 100644
index 0000000..8fc1464
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMenber/memberMarket.jsp
@@ -0,0 +1,64 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black">
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->
+<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+<jsp:include page="../../common.jsp" />
+<style>
+ .pb100{
+    padding-bottom:100px;
+ }
+  .pt100{
+    padding-top:100px;
+ }
+</style>
+<script type="text/javascript">
+     require("js/merchantBankCard/merchantBankCardList.js");
+</script>
+</head>
+    <body class="gwhitebg"">	
+		<div class="clearfix mt20 ml20 mr20 whitebg pb100 pt100 textc">
+			      <div class="bde dlblock w300 pb20">
+			           <div class="pt20 pb20 textc fw600 f18 black">充值送</div>
+			           <div class="gray pb20 textc f16">充值即收益，快速回笼资金</div>
+			           <div>
+			               <img alt="" src="${resourcePath }/images/recharge1.png">
+			           </div>
+			           <div class="mt20">
+			            <a class="btn btn-primary f13" href="${ctx }/activityRecharge/index">立即使用</a>
+			           </div>
+			      </div>
+			      <div class="bde dlblock w300 pb20 ml50 mr50">
+			           <div class="pt20 pb20 textc fw600 f18 black">消费返</div>
+			           <div class="gray pb20 textc f16">消费返余额，引导二次购买</div>
+			           <div>
+			               <img alt="" src="${resourcePath }/images/recharge2.png">
+			           </div>
+			           <div class="mt20">
+			            <a class="btn btn-primary f13" href="${ctx }/activityConsumReturn/index">立即使用</a>
+			           </div>
+			      </div>
+			      <div class="bde dlblock w300 pb20">
+			           <div class="pt20 pb20 textc fw600 f18 black">激活送</div>
+			           <div class="gray pb20 textc f16">激活赠余额，快速发展会员</div>
+			           <div>
+			               <img alt="" src="${resourcePath }/images/recharge3.png">
+			           </div>
+			           <div class="mt20">
+			            <a class="btn btn-primary f13" href="${ctx }/activityActivate/index">立即使用</a>
+			           </div>
+			      </div>
+			 
+		</div>
+     </body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMenber/merchantMenberBaseInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMenber/merchantMenberBaseInfo.jsp
new file mode 100644
index 0000000..c3a4560
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMenber/merchantMenberBaseInfo.jsp
@@ -0,0 +1,183 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">  
+	<div class="tab-pane active">     
+		<div class="panel-body">
+			<div class="wrapper wrapper-content">
+				<div class="panel-form animated fadeInRight wp60 fc">
+					<div class="layui-form-item dn	has-error" >   
+						<label class="layui-form-label">id</label>  
+						<div class="layui-input-block">
+							<input type="text" name="id" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantMenber.id }" >
+						</div>  
+					</div>
+					<!--管理员看到的  -->
+					<c:if test="${admin eq 'admin' }">
+						<div class="form-group">
+			                <div class="layui-form-item">          
+			                    <label class="layui-form-label">商户</label>
+			                    <div class="layui-input-block">
+			                        <select name="merchantCode" id="merchantCode" lay-filter="selectMerchantCode">  
+			                            <option value="">请选择</option>
+			                            <c:forEach items="${merchantBaseInfoList }" var="mb">
+			                                 <option value="${mb.merchantCode }" <c:if test="${mb.merchantCode eq merchantMenber.merchantCode }">selected="selected"</c:if>>${mb.alias }</option>
+			                            </c:forEach>
+			                        </select>              
+			                    </div>
+			                </div>
+			            </div>
+			            
+			            <!-- <div class="form-group">
+                            <div class="layui-form-item">          
+                                <label class="layui-form-label">门店</label>
+                                <div class="layui-input-block">
+                                    <select name="storeId" id="storeId">  
+                                        <option value="">请选择</option>
+                                    </select>              
+                                </div>
+                            </div>
+                        </div> -->
+					</c:if>
+					<!--不是管理员看到的  -->
+					<c:if test="${admin ne 'admin' }">
+					   <div class="form-group">
+                            <div class="layui-form-item">          
+                                <label class="layui-form-label">门店</label>
+                                <div class="layui-input-block">
+                                    <select name="storeId" id="storeId">  
+                                        <option value="">请选择</option>
+                                        <c:forEach items="${merchantStoreList }" var="ms">
+                                            <option value="${ms.storeId }" <c:if test="${ms.storeId eq merchantMenber.storeId }">selected="selected"</c:if>>${ms.storeName }</option>
+                                            
+                                        </c:forEach>
+                                    </select>              
+                                </div>
+                            </div>
+                        </div>
+					</c:if>
+					
+					<%-- <div class="layui-form-item dn	has-error" >   
+						<label class="layui-form-label">storeId</label>  
+						<div class="layui-input-block">
+							<input type="text" name="storeId" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantMenber.storeId }" >
+						</div>  
+					</div>
+					<div class="layui-form-item dn	has-error" >   
+						<label class="layui-form-label">storeName</label>  
+						<div class="layui-input-block">
+							<input type="text" name="storeName" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantMenber.storeName }" >
+						</div>  
+					</div> --%>
+					
+					
+					<%-- <div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">状态</label>  
+						<div class="layui-input-block">
+							<input type="text" name="status" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantMenber.status }" >
+						</div>  
+					</div> --%>
+					<%-- <div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">createDt</label>  
+						<div class="layui-input-block">
+							<input type="text" name="createDt" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantMenber.createDt }" >
+						</div>  
+					</div> --%>
+					<%-- <div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">memberCode</label>  
+						<div class="layui-input-block">
+							<input type="text" name="memberCode" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantMenber.memberCode }" >
+						</div>  
+					</div> --%>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">姓名</label>  
+						<div class="layui-input-block">
+							<input type="text" name="nickName" id="nickName" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantMenber.nickName }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">手机号</label>  
+						<div class="layui-input-block">
+							<input type="text" name="phone" id="phone" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantMenber.phone }" >
+						</div>  
+					</div>
+					
+					<div class="layui-form-item layui-form-text" onclick="uploadImage()">
+		                <label class="layui-form-label">logo</label>
+		                <div class="layui-input-block"  >
+		                    <div class="layui-upload-drag w300 h200 postionr">
+		                        <i class="layui-icon"> </i>    
+		                        <img src="${merchantMenber.logo}" id="demo1" onerror="this.src=''" class="positiona top0 left0 w300 h200 dblock">      
+		                        <input type="hidden" name="logo" value="${merchantMenber.logo}"   id="logo">
+		                    </div>
+		                </div>
+		            </div>
+					<%-- <div class="layui-form-item    has-error" >   
+                        <label class="layui-form-label">logo</label>  
+                        <div class="layui-input-block">
+                            <input type="text" name="logo"  lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantMenber.logo }" >
+                        </div>  
+                    </div> --%>
+					
+					<div class="form-group">
+                            <div class="layui-form-item">          
+                                <label class="layui-form-label">会员状态</label>
+                                <div class="layui-input-block">
+                                    <select name="status" id="status">
+                                        <option value="">请选择</option>
+                                         <option value="1" <c:if test="${merchantMenber.status eq '1' }">selected="selected"</c:if>>显示</option>
+                                          <option value="0" <c:if test="${merchantMenber.status eq '0' }">selected="selected"</c:if>>不显示</option>
+                                    </select>              
+                                </div>
+                            </div>
+                        </div>
+					<%-- <div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">openid</label>  
+						<div class="layui-input-block">
+							<input type="text" name="openid" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantMenber.openid }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">alipayUserId</label>  
+						<div class="layui-input-block">
+							<input type="text" name="alipayUserId" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantMenber.alipayUserId }" >
+						</div>  
+					</div> --%>
+					<%-- <div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">comsumeMoney</label>  
+						<div class="layui-input-block">
+							<input type="text" name="comsumeMoney" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantMenber.comsumeMoney }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">profitMoney</label>  
+						<div class="layui-input-block">
+							<input type="text" name="profitMoney" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantMenber.profitMoney }" >
+						</div>  
+					</div> --%>
+					<%-- <div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">orderNumber</label>  
+						<div class="layui-input-block">
+							<input type="text" name="orderNumber" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantMenber.orderNumber }" >
+						</div>  
+					</div> --%>
+					<c:if test="${admin eq 'admin' }">
+	                   <input type="hidden" id="isAdmin" value="1">
+					</c:if>
+					<c:if test="${admin ne 'admin' }">
+	                   <input type="hidden" id="isAdmin" value="0">
+					</c:if>
+				</div>
+			</div>
+		</div>  
+	</div>
+</form>
+<script type="text/javascript">
+    //form表单样式
+    layui.use(['layer', 'form'], function() {    
+        var layer = layui.layer,
+            form = layui.form;
+        form.render();
+    });
+</script> 
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMenber/merchantMenberDetails.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMenber/merchantMenberDetails.jsp
new file mode 100644
index 0000000..1657ab0
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMenber/merchantMenberDetails.jsp
@@ -0,0 +1,54 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>     
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">                      
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black"> 
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> 
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->                                     
+<meta name="viewport"
+	content="width=device-width, initial-scale=1.0, maximum-scale=1.0">   
+<jsp:include page="../../common.jsp" />
+<script type="text/javascript">
+    require("merchantMenber/merchantMenberDetails.js");
+</script>
+<title>编辑</title>
+</head>                                 
+	<body class="lgraybg">            
+		<div class="	container-fluid animated fadeInRight col-sm-12">
+			<div class="panel-toolbar mt10 mb10 pt5 pb5 pl10 bdd whitebg">
+				<div class="buttons">
+					<a href="javascript:void(0);" class="layui-btn layui-btn-sm layui-btn-danger fa fa-save f12"><span>保存</span></a>
+					<a href="${ctx }/merchantMenber/index?pageIndex=${pageIndex}"  class="layui-btn layui-btn-sm fa fa-back f12" id="goback"><span>返回</span></a>
+				</div>
+			</div>
+				<div class="tabs-container whitebg">
+					<div class="pt10 pl5 pr5">
+						<ul class="nav nav-tabs" id="nav-tabs">
+							<li class="active" data-action="base">   
+								<a href="javascript:void(0);" >基本资料</a>
+							</li>
+							<!-- <li class="" data-action="functions">
+								<a href="javascript:void(0);"  >多功能输入</a>
+							</li>
+							<li class="" data-action="extends">
+								<a href="javascript:void(0);" >扩展属性</a>
+							</li> -->
+						</ul>
+						<div class="tab-content pt30 p30">               
+		
+						</div>     
+					</div>
+				</div>    
+		</div>
+		<!-- 隐藏域 -->
+		<input type="hidden" id="merchantMenberId" value="${merchantMenber.id }"/>
+	</body>
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMenber/merchantMenberExtendsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMenber/merchantMenberExtendsInfo.jsp
new file mode 100644
index 0000000..592687a
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMenber/merchantMenberExtendsInfo.jsp
@@ -0,0 +1,201 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>           
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> 
+<div class="tab-pane active">      
+	<div class="animated fadeInRight">
+		<div class="whitebg pl10 pr10">
+			<table class="table table-striped table-bordered table-hover">     
+				<thead> 
+					<tr>  
+						<th class="textc">序号</th>         
+						<th class="textc wp15">流水账号</th>
+						<th class="textc">日期</th>         
+						<th class="textc">财务类别</th>     
+						<th class="textc">金额</th>         
+						<th class="textc">银行</th>         
+						<th class="textc">发票</th>         
+						<th class="textc">客户名称</th>     
+						<th class="textc wp15">单号</th>    
+						<th class="textc">状态</th>         
+						<th class="textc">类别</th>         
+						<th class="textc">操作</th>         
+					</tr> 
+				</thead>
+				<tbody> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+                
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="green">支出</span></td>     
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+				</tbody>
+                
+			</table>  
+			<!-- footer -->  
+			<div class="clearfix mb10 pb20">          
+					<div class="layui-tab-item fr">       
+							<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+							<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>   
+							<div class="pagination dlblock vm" id="pagination"></div>
+							<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>            
+					</div>
+				</div>  
+		</div>      
+	</div>        
+</div>          
+                
+<script type="text/javascript">    
+//分页          
+$('#pagination').pagination({        
+	pageCount: 50,
+	jump: true,   
+	coping: true, 
+	homePage: '首页',    
+	endPage: '末页',     
+	prevContent: '上页', 
+	nextContent: '下页', 
+	callback: function(api) {          
+		$('.now').text(api.getCurrent());
+	}             
+});             
+</script>       
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMenber/merchantMenberFunctionsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMenber/merchantMenberFunctionsInfo.jsp
new file mode 100644
index 0000000..982ce84
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMenber/merchantMenberFunctionsInfo.jsp
@@ -0,0 +1,130 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>		
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">      
+<div class="tab-pane active">
+				<div class="panel-body">
+					<div class="wrapper wrapper-content">     
+						<div class="panel-form animated fadeInRight wp60 fc">
+							<!-- 账号资料 -->
+			<div class="layui-form-item 	has-error">
+				<label class="layui-form-label">单行输入框<i class="red">*</i></label>
+				<div class="layui-input-block">
+					<input type="text" name="title" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input">
+				</div>                                         
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">自定义验证</label>
+				<div class="layui-input-inline ml30">
+					<input type="password" name="password" lay-verify="pass" placeholder="请输入密码" autocomplete="off" class="layui-input">
+				</div>
+				<div class="layui-form-mid layui-word-aux">请填写6到12位密码</div>
+			</div>
+			<div class="form-group">
+				<div class="layui-form-item">          
+					<label class="layui-form-label">单行选择框</label>
+					<div class="layui-input-block">
+						<select name="interest" lay-filter="aihao">  
+							<option value=""></option>
+							<option value="0">写作</option>         
+							<option value="1" selected="">阅读</option>
+							<option value="2">游戏</option>
+							<option value="3">音乐</option>
+							<option value="4">旅行</option>  
+						</select>              
+					</div>
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<div class="layui-inline">  
+					<label class="layui-form-label">范围</label>
+					<div class="layui-input-inline ml30">
+						<input type="text" name="price_min" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>                                     
+					<div class="layui-form-mid">-</div>
+					<div class="layui-input-inline">       
+						<input type="text" name="price_max" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>
+				</div>           
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">联动选择框</label>
+				<div class="layui-input-inline ml30">
+					<select name="quiz1">     
+						<option value="">请选择省</option>
+						<option value="浙江" selected="">浙江省</option> 
+						<option value="你的工号">江西省</option>           
+						<option value="你最喜欢的老师">福建省</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz2">
+						<option value="">请选择市</option>
+						<option value="杭州">杭州</option>
+						<option value="宁波" disabled="">宁波</option>
+						<option value="温州">温州</option>
+						<option value="温州">台州</option>
+						<option value="温州">绍兴</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz3">
+						<option value="">请选择县/区</option>
+						<option value="西湖区">西湖区</option>
+						<option value="余杭区">余杭区</option>
+						<option value="拱墅区">临安市</option>
+					</select>
+				</div>    
+			</div>
+			<div class="layui-form-item" pane="">   
+				<label class="layui-form-label">原始复选框</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="like1[write]" lay-skin="primary" title="写作" checked="">  
+					<input type="checkbox" name="like1[read]" lay-skin="primary" title="阅读">
+					<input type="checkbox" name="like1[game]" lay-skin="primary" title="游戏" disabled="">
+				</div>
+			</div>
+
+			<div class="layui-form-item">
+				<label class="layui-form-label">开关-默认关</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="close" lay-skin="switch" lay-text="ON|OFF">
+				</div>
+			</div>
+			<div class="layui-form-item">  
+				<label class="layui-form-label">单选框</label>
+				<div class="layui-input-block">
+					<input type="radio" name="sex" value="男" title="男" checked="">
+					<input type="radio" name="sex" value="女" title="女">
+					<input type="radio" name="sex" value="禁" title="禁用" disabled="">
+				</div>
+			</div>
+			<!--<div class="layui-form-item layui-form-text">
+				<label class="layui-form-label">上传图片</label>
+				<div class="layui-input-block">
+					<div class="layui-upload-drag w200 h200">
+						<i class="layui-icon"></i>          
+						<p>点击上传</p>
+					</div>
+				</div>
+			</div>-->
+				<div class="layui-form-item layui-form-text">
+					<label class="layui-form-label">普通文本域</label>  
+					<div class="layui-input-block">              
+						<textarea placeholder="请输入内容" class="layui-textarea"></textarea>
+					</div>
+				</div>
+			</div>
+		</div>   
+	</div>
+</div>
+</form>   
+<script type="text/javascript">
+	//form表单样式
+	layui.use(['layer', 'form'], function() {    
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+</script>                 
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMenber/merchantMenberList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMenber/merchantMenberList.jsp
new file mode 100644
index 0000000..0e306ae
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMenber/merchantMenberList.jsp
@@ -0,0 +1,166 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black">
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->
+<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+<jsp:include page="../../common.jsp" />
+<script type="text/javascript">
+     require("merchantMenber/merchantMenberList.js");
+</script>
+ <style type="text/css">
+ 
+ .c1{
+        position: fixed;
+        top:0;
+        bottom: 0;
+        left:0;
+        right: 0;
+        background: rgba(0,0,0,.5);
+        z-index: 2;
+}
+
+ .c5{
+    position: fixed;
+    width: 350px;
+    height: 250px;
+    top:50%;
+    left: 50%;
+    z-index: 3;
+    margin-top: -125px;
+    margin-left: -175px;
+} 
+.img{
+    width: 100%;
+    height: 100%;
+    background-size: 100% 100%;
+}
+
+ .layui-table th {
+	 text-align: center;
+ }
+ </style>
+</head>
+<body>
+	<div class="row animated fadeInRight" style="margin: 0;">
+		<div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+			<div class="toolbar-panel bdd">
+				<div class="toolbar-box">
+					<div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+						<!-- 顶部按钮 -->
+						<div class="buttons fl">
+							<a class="layui-btn layui-btn-sm fa fa-search f13" href="javascript:void(0);" onclick="queryMerchantMenber()"><span>搜索</span></a>
+							 <!-- <a class="layui-btn fa fa-plus f13 add" href="javascript:void(0);" onclick="initAddMerchantMenber()"><span>添加</span></a> -->
+                            <a class="layui-btn layui-btn-sm fa fa-edit f13" href="javascript:void(0);" onclick="initEditMerchantMenber()"><span>编辑</span></a>
+                            <a class="layui-btn layui-btn-sm layui-btn-danger fa fa-remove f13 delete" href="javascript:void(0);" onclick="initBatchDeleteMerchantMenber()"><span>删除</span></a>
+						</div>
+						<div class="tools fr">
+							<a href="javascript:void(0);" class="collapse dblock f14 dgray mr5"> 
+								<i class="fa-2x fa fa-angle-double-up"></i>
+							</a>
+						</div>
+					</div>
+				</div>
+				<!--搜索条件 -->
+				<div class="toolbar-body">
+					<div class="row pt10 pb10 whitebg ml0 mr0">
+						<span class="dlblock w100 textr">用户ID：</span>
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+							<input type="text" id="userId" placeholder="请输入用户ID">
+						</span> 
+						<span class="dlblock w100 textr">商户名称：</span> 
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+							<input type="text" id="alias" placeholder="请输入商户名称">
+						</span> 
+						<span class="dlblock w100 textr">昵称：</span> 
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+							<input type="text" id="memberName" placeholder="请输入昵称">
+						</span> 
+						<span class="dlblock w100 textr">手机号：</span> 
+                        <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+                            <input type="text" id="phone" placeholder="请输入手机号">
+                        </span>
+						<!-- <span class="dlblock w100 textr">类别：</span>
+						 <select class="form-control f12 w180 textc">
+							<option value="">支出</option>
+							<option value="">收入</option>
+						</select> -->
+					</div>
+					<!-- <div class="mt10 mb20">
+						<span class="dlblock w100 textr">开始日期</span>
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+							 <input type="text" placeholder="" id="date1" class="w150">
+							 <i class="fa fa-calendar"></i>
+						</span> 
+						<span class="dlblock w100 textr">结束日期</span>
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+						<input type="text" placeholder="" id="date2" class="w150"> 
+							<i class="fa fa-calendar"></i>
+						</span>
+					</div> -->
+				</div>
+			</div>
+		</div>
+		<!-- 表单数据 -->
+		<div class="mb20 mt10">
+			<div class="whitebg pl10 pr10">
+				<table class="layui-table">
+					<thead>
+						<tr>
+							<th class="textc">
+								<div class="checker" id="allCheck">
+									<span class=""><input type="checkbox" value="" ></span>
+								</div>
+							</th>
+							<th class="textc ">序号</th>
+							<th class="textc ">用户ID</th>
+							<th class="textc">商户简称</th>
+							<th class="textc ">昵称</th>
+							<th class="textc ">头像</th>
+							<th class="textc ">会员名</th>
+							<th class="textc ">手机号</th>
+							<th class="textc ">消费总金额</th>
+							<th class="textc ">余额</th>
+							<th class="textc ">激活时间</th>
+							<th class="textc ">查看</th>
+							<!-- <th class="textc">编辑</th> -->
+						</tr>
+					</thead>
+					<!-- 数据体 -->
+					<tbody id="data_content">
+					</tbody>
+				</table>
+			<!-- footer -->
+				<div class="clearfix mb10 pb20">
+						<div class="layui-tab-item fr">
+								<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+								<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>
+								<div class="pagination dlblock vm" id="pagination"></div>
+								<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>
+						</div>
+					</div>
+
+					<!-- 放大图片弹框 -->
+    <div id="pictureWindow" class="dn" onclick="hidePictureWindow()">
+            <div class="c1"></div>
+            <div class="c5">
+                <div class="mt20" id="picture">
+                </div>
+            </div>
+    </div>
+			</div>
+		</div>
+	</div>
+</body>
+
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMenber/otherMerchantMenberDetails.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMenber/otherMerchantMenberDetails.jsp
new file mode 100644
index 0000000..a3b8335
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMenber/otherMerchantMenberDetails.jsp
@@ -0,0 +1,182 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black">
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->
+<meta name="viewport"
+	content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+<jsp:include page="../../common.jsp" />
+<script type="text/javascript">
+</script>
+<title>编辑</title>
+</head>
+<body class="lgraybg">
+	<div class="    container-fluid animated fadeInRight col-sm-12">
+		<div class="panel-toolbar mt10 mb10 pt5 pb5 pl10 bdd whitebg">
+			<div class="buttons">
+				<!-- <a href="javascript:void(0);" class="btn btn-primary fa fa-save f12"><span>保存</span></a> -->
+				<a href="${ctx }/merchantMenber/index?pageIndex=${pageIndex}"
+					class="layui-btn layui-btn-sm fa fa-back f12" id="goback"><span>返回</span></a>
+			</div>
+		</div>
+		<div class="tabs-container whitebg">
+			<div class="pt10 pl5 pr5">
+				<ul class="nav nav-tabs" id="nav-tabs">
+					<li class="active" data-action="base"><a
+						href="javascript:void(0);">基本资料</a></li>
+				</ul>
+				<div class="tab-content pt30 p30">
+					<form class="layui-form whitebg pb10 pt10" action="" id="data_form">
+						<div class="tab-pane active">
+							<div class="panel-body">
+								<div class="wrapper wrapper-content">
+									<div class="panel-form animated fadeInRight wp60 fc">
+										<div class="layui-form-item dn  has-error">
+											<label class="layui-form-label">id</label>
+											<div class="layui-input-block">
+												<input type="text" name="id" lay-verify="title"
+													autocomplete="off" placeholder="请输入内容" class="layui-input"
+													value="${merchantMenber.id }">
+											</div>
+										</div>
+										<div class="layui-form-item  dn   has-error">
+											<label class="layui-form-label">merchantCode</label>
+											<div class="layui-input-block">
+												<input type="text" name="merchantCode" lay-verify="title"
+													autocomplete="off" placeholder="请输入内容" class="layui-input"
+													value="${merchantMenber.merchantCode }">
+											</div>
+										</div>
+										<div class="layui-form-item     has-error">
+											<label class="layui-form-label">商家名称</label>
+											<div class="layui-input-block">
+												<input type="text" name="merchantName" readonly="readonly" lay-verify="title"
+													autocomplete="off" class="layui-input"
+													value="${merchantMenber.merchantName }">
+											</div>
+										</div>
+										<div class="layui-form-item  dn   has-error">
+											<label class="layui-form-label">storeId</label>
+											<div class="layui-input-block">
+												<input type="text" name="storeId" lay-verify="title"
+													autocomplete="off" placeholder="请输入内容"  class="layui-input"
+													value="${merchantMenber.storeId }">
+											</div>
+										</div>
+										<div class="layui-form-item     has-error">
+											<label class="layui-form-label">门店名称</label>
+											<div class="layui-input-block">
+												<input type="text" name="storeName" readonly="readonly" lay-verify="title"
+													autocomplete="off" placeholder="请输入内容" class="layui-input"
+													value="${merchantMenber.storeName }">
+											</div>
+										</div>
+										<div class="layui-form-item     has-error">
+											<label class="layui-form-label">status</label>
+											<div class="layui-input-block">
+												<input type="text" name="status" lay-verify="title"
+													autocomplete="off" placeholder="请输入内容" class="layui-input"
+													value="${merchantMenber.status }">
+											</div>
+										</div>
+										<div class="layui-form-item dn    has-error">
+											<label class="layui-form-label">createDt</label>
+											<div class="layui-input-block">
+												<input type="text" name="createDt" lay-verify="title"
+													autocomplete="off" placeholder="请输入内容" class="layui-input"
+													value="${merchantMenber.createDt }">
+											</div>
+										</div>
+										<div class="layui-form-item     has-error">
+											<label class="layui-form-label">logo</label>
+											<div class="layui-input-block">
+											<img alt="" src="${merchantMenber.logo }" width="200px" height="120px">
+												<%-- <input type="text" name="logo" lay-verify="title"
+													autocomplete="off" placeholder="请输入内容" class="layui-input"
+													value="${merchantMenber.logo }"> --%>
+											</div>
+										</div>
+										<div class="layui-form-item  dn   has-error">
+											<label class="layui-form-label">memberCode</label>
+											<div class="layui-input-block">
+												<input type="text" name="memberCode" lay-verify="title"
+													autocomplete="off" placeholder="请输入内容" class="layui-input"
+													value="${merchantMenber.memberCode }">
+											</div>
+										</div>
+										<div class="layui-form-item     has-error">
+											<label class="layui-form-label">昵称</label>
+											<div class="layui-input-block">
+												<input type="text" name="nickName" readonly="readonly" lay-verify="title"
+													autocomplete="off"  class="layui-input"
+													value="${merchantMenber.nickName }">
+											</div>
+										</div>
+										<div class="layui-form-item     has-error">
+											<label class="layui-form-label">手机号</label>
+											<div class="layui-input-block">
+												<input type="text" name="phone" readonly="readonly" lay-verify="title"
+													autocomplete="off"  class="layui-input"
+													value="${merchantMenber.phone }">
+											</div>
+										</div>
+										<div class="layui-form-item dn    has-error">
+											<label class="layui-form-label">openid</label>
+											<div class="layui-input-block">
+												<input type="text" name="openid"  lay-verify="title"
+													autocomplete="off" placeholder="请输入内容" class="layui-input"
+													value="${merchantMenber.openid }">
+											</div>
+										</div>
+										<div class="layui-form-item  dn   has-error">
+											<label class="layui-form-label">alipayUserId</label>
+											<div class="layui-input-block">
+												<input type="text" name="alipayUserId" lay-verify="title"
+													autocomplete="off" placeholder="请输入内容" class="layui-input"
+													value="${merchantMenber.alipayUserId }">
+											</div>
+										</div>
+										<div class="layui-form-item     has-error">
+											<label class="layui-form-label">消费金额</label>
+											<div class="layui-input-block">
+												<input type="text" name="comsumeMoney" readonly="readonly" lay-verify="title"
+													autocomplete="off"  class="layui-input"
+													value="${merchantMenber.comsumeMoney }">
+											</div>
+										</div>
+										<div class="layui-form-item     has-error">
+											<label class="layui-form-label">分润金额</label>
+											<div class="layui-input-block">
+												<input type="text" name="profitMoney" readonly="readonly" lay-verify="title"
+													autocomplete="off"  class="layui-input"
+													value="${merchantMenber.profitMoney }">
+											</div>
+										</div>
+										<div class="layui-form-item  dn   has-error">
+											<label class="layui-form-label">orderNumber</label>
+											<div class="layui-input-block">
+												<input type="text" name="orderNumber" lay-verify="title"
+													autocomplete="off" placeholder="请输入内容" class="layui-input"
+													value="${merchantMenber.orderNumber }">
+											</div>
+										</div>
+									</div>
+								</div>
+							</div>
+						</div>
+					</form>
+				</div>
+			</div>
+		</div>
+	</div>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMenber/showConsumptionDetails.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMenber/showConsumptionDetails.jsp
new file mode 100644
index 0000000..5d277c2
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMenber/showConsumptionDetails.jsp
@@ -0,0 +1,143 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+    pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black">
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->
+<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+<jsp:include page="../../common.jsp" />
+<script type="text/javascript">
+     require("merchantMenber/showConsumptionDetails.js");
+</script>
+<style type="text/css">
+    .layui-table th {
+        text-align: center;
+    }
+</style>
+</head>
+<body>
+    <div class="row animated fadeInRight" style="margin: 0;">
+        <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+            <div class="toolbar-panel bdd">
+                <div class="toolbar-box">
+                    <div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+                        <!-- 顶部按钮 -->
+                        <div class="buttons fl">
+                             <a class="layui-btn layui-btn-sm fa fa-search f13" href="javascript:void(0);" onclick="queryUserApp()"><span>搜索</span></a>
+                            <!--<a class="btn btn-primary fa fa-plus f13 add" href="javascript:void(0);" onclick="initAddUserApp()"><span>添加</span></a>
+                            <a class="btn btn-primary fa fa-edit f13" href="javascript:void(0);" onclick="initEditUserApp()"><span>编辑</span></a>  -->
+                            <a class="layui-btn layui-btn-sm fa fa-remove f13 delete" href="javascript:history.back(-1);" ><span>返回</span></a>
+                        </div>
+                        <div class="tools fr">
+                            <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5"> 
+                                <i class="fa-2x fa fa-angle-double-up"></i>
+                            </a>
+                        </div>
+                    </div>
+                </div>
+
+                <!--搜索条件 -->
+                <div class="toolbar-body">
+                    <div class="row pt10 pb10 whitebg ml0 mr0">
+                         <span class="dlblock w100 textr">昵称：</span> 
+                        <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+                            <input type="text" id="nickName" placeholder="请输入昵称">
+                        </span> 
+                        <span class="dlblock w100 textr">手机号：</span> 
+                        <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+                            <input type="text" id="phone" placeholder="请输入手机号">
+                        </span>
+                        <span class="dlblock w100 textr">商户名称：</span> 
+                        <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+                            <input type="text" id="alias" placeholder="请输入商户名称">
+                        </span>
+                        <span class="dlblock w100 textr">订单号：</span> 
+                        <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+                            <input type="text" id="orderNumber" placeholder="请输入订单号">
+                        </span>
+                        <!-- <span class="dlblock w100 textr">ID：</span> 
+                        <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+                            <input type="text" placeholder="请输入内容" id="searchId">  
+                        </span> 
+                        <span class="dlblock w100 textr">名称：</span> 
+                        <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+                            <input type="text" placeholder="请输入名称">
+                        </span> 
+                        <span class="dlblock w100 textr">类别：</span>
+                         <select class="form-control f12 w180 textc">
+                            <option value="">支出</option>
+                            <option value="">收入</option>
+                        </select> -->
+                    </div>
+                   <!--  <div class="mt10 mb20">
+                        <span class="dlblock w100 textr">开始日期</span>
+                        <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+                             <input type="text" placeholder="" id="date1" class="w150">
+                             <i class="fa fa-calendar"></i>
+                        </span> 
+                        <span class="dlblock w100 textr">结束日期</span>
+                        <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+                        <input type="text" placeholder="" id="date2" class="w150"> 
+                            <i class="fa fa-calendar"></i>
+                        </span>
+                    </div> -->
+                </div>
+            </div>
+        </div>
+        <!-- 表单数据 -->
+        <div class="mb20 mt10">
+            <div class="whitebg pl10 pr10">
+                <table class="layui-table">
+                    <thead>
+                        <tr>
+                            <th class="textc">
+                                <div class="checker" id="allCheck">
+                                    <span class=""><input type="checkbox" value="" ></span>
+                                </div>
+                            </th>
+                           <th class="textc ">序号</th>
+                           <th class="textc ">id</th>
+                            <!-- <th class="textc ">merchantCode</th> -->
+                            <th class="textc ">商户名称</th>
+                           <!--  <th class="textc ">storeId</th> -->
+                            <!-- <th class="textc wp15">门店名称</th> -->
+                           <!--  <th class="textc ">logo</th> -->
+                           <!--  <th class="textc ">memberCode</th> -->
+                            <th class="textc wp15">昵称</th>
+                            <th class="textc ">手机号</th>
+                            <th class="textc ">消费金额</th>
+                            <th class="textc ">订单号</th>
+                            <th class="textc ">支付方式</th>
+                            <th class="textc ">创建时间</th>
+                        </tr>
+                    </thead>
+                    <!-- 数据体 -->
+                    <tbody id="data_content">
+                    </tbody>
+                </table>
+            
+            <!-- footer -->
+                <div class="clearfix mb10 pb20">
+                        <div class="layui-tab-item fr">
+                                <span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+                                <span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>
+                                <div class="pagination dlblock vm" id="pagination"></div>
+                                <span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>
+                        </div>
+                    </div>
+        <input type="hidden" id="memberCode" value="${memberCode }">
+            </div>
+        </div>
+    </div>
+</body>
+
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMenber/showRechargeDetails.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMenber/showRechargeDetails.jsp
new file mode 100644
index 0000000..cdd6cd3
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMenber/showRechargeDetails.jsp
@@ -0,0 +1,141 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+    pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black">
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->
+<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+<jsp:include page="../../common.jsp" />
+<script type="text/javascript">
+     require("merchantMenber/showRechargeDetails.js");
+</script>
+    <style type="text/css">
+        .layui-table th {
+            text-align: center;
+        }
+    </style>
+</head>
+<body>
+    <div class="row animated fadeInRight" style="margin: 0;">
+        <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+            <div class="toolbar-panel bdd">
+                <div class="toolbar-box">
+                    <div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+                        <!-- 顶部按钮 -->
+                        <div class="buttons fl">
+                             <a class="layui-btn layui-btn-sm fa fa-search f13" href="javascript:void(0);" onclick="queryUserApp()"><span>搜索</span></a>
+                            <!--<a class="btn btn-primary fa fa-plus f13 add" href="javascript:void(0);" onclick="initAddUserApp()"><span>添加</span></a>
+                            <a class="btn btn-primary fa fa-edit f13" href="javascript:void(0);" onclick="initEditUserApp()"><span>编辑</span></a>  -->
+                            <a class="layui-btn layui-btn-sm fa fa-remove f13 delete" href="javascript:history.back(-1);" ><span>返回</span></a>
+                        </div>
+                        <div class="tools fr">
+                            <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5"> 
+                                <i class="fa-2x fa fa-angle-double-up"></i>
+                            </a>
+                        </div>
+                    </div>
+                </div>
+
+                <!--搜索条件 -->
+                <div class="toolbar-body">
+                    <div class="row pt10 pb10 whitebg ml0 mr0">
+                       <!--  <span class="dlblock w100 textr">ID：</span> 
+                        <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+                            <input type="text" placeholder="请输入内容" id="searchId">  
+                        </span>  -->
+                        <span class="dlblock w100 textr">ID：</span> 
+                        <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+                            <input type="text" id="id" placeholder="请输入id">
+                        </span> 
+                        <span class="dlblock w100 textr">商户简称：</span> 
+                        <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+                            <input type="text" id="alias" placeholder="请输入商户名称">
+                        </span> 
+                        <span class="dlblock w100 textr">订单号：</span> 
+                        <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+                            <input type="text" id="orderNumber" placeholder="请输入订单号">
+                        </span> 
+                        <span class="dlblock w100 textr">昵称：</span> 
+                        <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+                            <input type="text" id="nickName" placeholder="请输入昵称">
+                        </span>
+                        <br>
+                        <br>
+                        <span class="dlblock w100 textr">手机号：</span> 
+                        <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+                            <input type="text" id="phone" placeholder="请输入手机号">
+                        </span>
+                       <!--  <span class="dlblock w100 textr">类别：</span>
+                         <select class="form-control f12 w180 textc">
+                            <option value="">支出</option>
+                            <option value="">收入</option>
+                        </select> -->
+                    </div>
+                   <!--  <div class="mt10 mb20">
+                        <span class="dlblock w100 textr">开始日期</span>
+                        <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+                             <input type="text" placeholder="" id="date1" class="w150">
+                             <i class="fa fa-calendar"></i>
+                        </span> 
+                        <span class="dlblock w100 textr">结束日期</span>
+                        <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+                        <input type="text" placeholder="" id="date2" class="w150"> 
+                            <i class="fa fa-calendar"></i>
+                        </span>
+                    </div> -->
+                </div>
+            </div>
+        </div>
+        <!-- 表单数据 -->
+        <div class="mb20 mt10">
+            <div class="whitebg pl10 pr10">
+                <table class="layui-table">
+                    <thead>
+                        <tr>
+                            <th class="textc">
+                                <div class="checker" id="allCheck">
+                                    <span class=""><input type="checkbox" value="" ></span>
+                                </div>
+                            </th>
+                            <th class="textc ">序号</th>
+                            <th class="textc ">id</th>
+                            <th class="textc ">商户简称</th>
+                            <th class="textc ">会员名</th>
+                            <th class="textc ">手机号</th>
+                            <th class="textc ">充值金额</th>
+                            <th class="textc ">赠送金额</th>
+                            <th class="textc ">订单号</th>
+                            <th class="textc ">充值类型</th>
+                            <th class="textc ">创建时间</th>
+                        </tr>
+                    </thead>
+                    <!-- 数据体 -->
+                    <tbody id="data_content">
+                    </tbody>
+                </table>
+            
+            <!-- footer -->
+                <div class="clearfix mb10 pb20">
+                        <div class="layui-tab-item fr">
+                                <span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+                                <span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>
+                                <div class="pagination dlblock vm" id="pagination"></div>
+                                <span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>
+                        </div>
+                    </div>
+    <input type="hidden" id="memberCode" value="${memberCode }">
+            </div>
+        </div>
+    </div>
+</body>
+
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMenberComsume/merchantMenberComsumeBaseInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMenberComsume/merchantMenberComsumeBaseInfo.jsp
new file mode 100644
index 0000000..ed58eb3
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMenberComsume/merchantMenberComsumeBaseInfo.jsp
@@ -0,0 +1,87 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">  
+	<div class="tab-pane active">     
+		<div class="panel-body">
+			<div class="wrapper wrapper-content">
+				<div class="panel-form animated fadeInRight wp60 fc">
+					<div class="layui-form-item dn	has-error" >   
+						<label class="layui-form-label">id</label>  
+						<div class="layui-input-block">
+							<input type="text" name="id" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantMenberComsume.id }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">merchantCode</label>  
+						<div class="layui-input-block">
+							<input type="text" name="merchantCode" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantMenberComsume.merchantCode }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">merchantName</label>  
+						<div class="layui-input-block">
+							<input type="text" name="merchantName" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantMenberComsume.merchantName }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">storeId</label>  
+						<div class="layui-input-block">
+							<input type="text" name="storeId" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantMenberComsume.storeId }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">storeName</label>  
+						<div class="layui-input-block">
+							<input type="text" name="storeName" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantMenberComsume.storeName }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">createDt</label>  
+						<div class="layui-input-block">
+							<input type="text" name="createDt" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantMenberComsume.createDt }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">logo</label>  
+						<div class="layui-input-block">
+							<input type="text" name="logo" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantMenberComsume.logo }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">memberCode</label>  
+						<div class="layui-input-block">
+							<input type="text" name="memberCode" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantMenberComsume.memberCode }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">nickName</label>  
+						<div class="layui-input-block">
+							<input type="text" name="nickName" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantMenberComsume.nickName }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">phone</label>  
+						<div class="layui-input-block">
+							<input type="text" name="phone" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantMenberComsume.phone }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">comsumeMoney</label>  
+						<div class="layui-input-block">
+							<input type="text" name="comsumeMoney" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantMenberComsume.comsumeMoney }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">payType</label>  
+						<div class="layui-input-block">
+							<input type="text" name="payType" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantMenberComsume.payType }" >
+						</div>  
+					</div>
+	
+				</div>
+			</div>
+		</div>  
+	</div>
+</form>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMenberComsume/merchantMenberComsumeDetails.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMenberComsume/merchantMenberComsumeDetails.jsp
new file mode 100644
index 0000000..5220c55
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMenberComsume/merchantMenberComsumeDetails.jsp
@@ -0,0 +1,54 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>     
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">                      
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black"> 
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> 
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->                                     
+<meta name="viewport"
+	content="width=device-width, initial-scale=1.0, maximum-scale=1.0">   
+<jsp:include page="../../common.jsp" />
+<script type="text/javascript">
+    require("js/merchantMenberComsume/merchantMenberComsumeDetails.js");
+</script>
+<title>编辑</title>
+</head>                                 
+	<body class="lgraybg">            
+		<div class="	container-fluid animated fadeInRight col-sm-12">
+			<div class="panel-toolbar mt10 mb10 pt5 pb5 pl10 bdd whitebg">
+				<div class="buttons">
+					<a href="javascript:void(0);" class="btn btn-primary fa fa-save f12"><span>保存</span></a>
+					<a href="${ctx }/merchantMenberComsume/index?pageIndex=${pageIndex}"  class="btn btn-primary fa fa-back f12" id="goback"><span>返回</span></a>
+				</div>
+			</div>
+				<div class="tabs-container whitebg">
+					<div class="pt10 pl5 pr5">
+						<ul class="nav nav-tabs" id="nav-tabs">
+							<li class="active" data-action="base">   
+								<a href="javascript:void(0);" >基本资料</a>
+							</li>
+							<li class="" data-action="functions">
+								<a href="javascript:void(0);"  >多功能输入</a>
+							</li>
+							<li class="" data-action="extends">
+								<a href="javascript:void(0);" >扩展属性</a>
+							</li>
+						</ul>
+						<div class="tab-content pt30 p30">               
+		
+						</div>     
+					</div>
+				</div>    
+		</div>
+		<!-- 隐藏域 -->
+		<input type="hidden" id="merchantMenberComsumeId" value="${merchantMenberComsume.id }"/>
+	</body>
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMenberComsume/merchantMenberComsumeExtendsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMenberComsume/merchantMenberComsumeExtendsInfo.jsp
new file mode 100644
index 0000000..592687a
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMenberComsume/merchantMenberComsumeExtendsInfo.jsp
@@ -0,0 +1,201 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>           
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> 
+<div class="tab-pane active">      
+	<div class="animated fadeInRight">
+		<div class="whitebg pl10 pr10">
+			<table class="table table-striped table-bordered table-hover">     
+				<thead> 
+					<tr>  
+						<th class="textc">序号</th>         
+						<th class="textc wp15">流水账号</th>
+						<th class="textc">日期</th>         
+						<th class="textc">财务类别</th>     
+						<th class="textc">金额</th>         
+						<th class="textc">银行</th>         
+						<th class="textc">发票</th>         
+						<th class="textc">客户名称</th>     
+						<th class="textc wp15">单号</th>    
+						<th class="textc">状态</th>         
+						<th class="textc">类别</th>         
+						<th class="textc">操作</th>         
+					</tr> 
+				</thead>
+				<tbody> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+                
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="green">支出</span></td>     
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+				</tbody>
+                
+			</table>  
+			<!-- footer -->  
+			<div class="clearfix mb10 pb20">          
+					<div class="layui-tab-item fr">       
+							<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+							<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>   
+							<div class="pagination dlblock vm" id="pagination"></div>
+							<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>            
+					</div>
+				</div>  
+		</div>      
+	</div>        
+</div>          
+                
+<script type="text/javascript">    
+//分页          
+$('#pagination').pagination({        
+	pageCount: 50,
+	jump: true,   
+	coping: true, 
+	homePage: '首页',    
+	endPage: '末页',     
+	prevContent: '上页', 
+	nextContent: '下页', 
+	callback: function(api) {          
+		$('.now').text(api.getCurrent());
+	}             
+});             
+</script>       
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMenberComsume/merchantMenberComsumeFunctionsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMenberComsume/merchantMenberComsumeFunctionsInfo.jsp
new file mode 100644
index 0000000..982ce84
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMenberComsume/merchantMenberComsumeFunctionsInfo.jsp
@@ -0,0 +1,130 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>		
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">      
+<div class="tab-pane active">
+				<div class="panel-body">
+					<div class="wrapper wrapper-content">     
+						<div class="panel-form animated fadeInRight wp60 fc">
+							<!-- 账号资料 -->
+			<div class="layui-form-item 	has-error">
+				<label class="layui-form-label">单行输入框<i class="red">*</i></label>
+				<div class="layui-input-block">
+					<input type="text" name="title" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input">
+				</div>                                         
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">自定义验证</label>
+				<div class="layui-input-inline ml30">
+					<input type="password" name="password" lay-verify="pass" placeholder="请输入密码" autocomplete="off" class="layui-input">
+				</div>
+				<div class="layui-form-mid layui-word-aux">请填写6到12位密码</div>
+			</div>
+			<div class="form-group">
+				<div class="layui-form-item">          
+					<label class="layui-form-label">单行选择框</label>
+					<div class="layui-input-block">
+						<select name="interest" lay-filter="aihao">  
+							<option value=""></option>
+							<option value="0">写作</option>         
+							<option value="1" selected="">阅读</option>
+							<option value="2">游戏</option>
+							<option value="3">音乐</option>
+							<option value="4">旅行</option>  
+						</select>              
+					</div>
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<div class="layui-inline">  
+					<label class="layui-form-label">范围</label>
+					<div class="layui-input-inline ml30">
+						<input type="text" name="price_min" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>                                     
+					<div class="layui-form-mid">-</div>
+					<div class="layui-input-inline">       
+						<input type="text" name="price_max" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>
+				</div>           
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">联动选择框</label>
+				<div class="layui-input-inline ml30">
+					<select name="quiz1">     
+						<option value="">请选择省</option>
+						<option value="浙江" selected="">浙江省</option> 
+						<option value="你的工号">江西省</option>           
+						<option value="你最喜欢的老师">福建省</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz2">
+						<option value="">请选择市</option>
+						<option value="杭州">杭州</option>
+						<option value="宁波" disabled="">宁波</option>
+						<option value="温州">温州</option>
+						<option value="温州">台州</option>
+						<option value="温州">绍兴</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz3">
+						<option value="">请选择县/区</option>
+						<option value="西湖区">西湖区</option>
+						<option value="余杭区">余杭区</option>
+						<option value="拱墅区">临安市</option>
+					</select>
+				</div>    
+			</div>
+			<div class="layui-form-item" pane="">   
+				<label class="layui-form-label">原始复选框</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="like1[write]" lay-skin="primary" title="写作" checked="">  
+					<input type="checkbox" name="like1[read]" lay-skin="primary" title="阅读">
+					<input type="checkbox" name="like1[game]" lay-skin="primary" title="游戏" disabled="">
+				</div>
+			</div>
+
+			<div class="layui-form-item">
+				<label class="layui-form-label">开关-默认关</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="close" lay-skin="switch" lay-text="ON|OFF">
+				</div>
+			</div>
+			<div class="layui-form-item">  
+				<label class="layui-form-label">单选框</label>
+				<div class="layui-input-block">
+					<input type="radio" name="sex" value="男" title="男" checked="">
+					<input type="radio" name="sex" value="女" title="女">
+					<input type="radio" name="sex" value="禁" title="禁用" disabled="">
+				</div>
+			</div>
+			<!--<div class="layui-form-item layui-form-text">
+				<label class="layui-form-label">上传图片</label>
+				<div class="layui-input-block">
+					<div class="layui-upload-drag w200 h200">
+						<i class="layui-icon"></i>          
+						<p>点击上传</p>
+					</div>
+				</div>
+			</div>-->
+				<div class="layui-form-item layui-form-text">
+					<label class="layui-form-label">普通文本域</label>  
+					<div class="layui-input-block">              
+						<textarea placeholder="请输入内容" class="layui-textarea"></textarea>
+					</div>
+				</div>
+			</div>
+		</div>   
+	</div>
+</div>
+</form>   
+<script type="text/javascript">
+	//form表单样式
+	layui.use(['layer', 'form'], function() {    
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+</script>                 
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMenberComsume/merchantMenberComsumeList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMenberComsume/merchantMenberComsumeList.jsp
new file mode 100644
index 0000000..5bb0b99
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMenberComsume/merchantMenberComsumeList.jsp
@@ -0,0 +1,131 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+    <script type="text/javascript">
+        require("js/merchantMenberComsume/merchantMenberComsumeList.js");
+    </script>
+
+	<style>
+		.layui-table th {
+			text-align: center;
+		}
+	</style>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="buttons fl">
+                        <a class="layui-btn fa fa-search f13" href="javascript:void(0);"
+                           onclick="queryMerchantMenberComsume()"><span>搜索</span></a>
+                        <a class="layui-btn fa fa-plus f13 add" href="javascript:void(0);"
+                           onclick="initAddMerchantMenberComsume()"><span>添加</span></a>
+                        <a class="layui-btn fa fa-edit f13" href="javascript:void(0);"
+                           onclick="initEditMerchantMenberComsume()"><span>编辑</span></a>
+                        <a class="layui-btn layui-danger fa fa-remove f13 delete" href="javascript:void(0);"
+                           onclick="initBatchDeleteMerchantMenberComsume()"><span>删除</span></a>
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <div class="row pt10 pb10 whitebg ml0 mr0">
+                    <span class="dlblock w100 textr">ID：</span>
+                    <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+							<input type="text" placeholder="请输入内容" id="searchId">  
+						</span>
+                    <span class="dlblock w100 textr">名称：</span>
+                    <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+							<input type="text" placeholder="请输入名称">
+						</span>
+                    <span class="dlblock w100 textr">类别：</span>
+                    <select class="form-control f12 w180 textc">
+                        <option value="">支出</option>
+                        <option value="">收入</option>
+                    </select>
+                </div>
+                <div class="mt10 mb20">
+                    <span class="dlblock w100 textr">开始日期</span>
+                    <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+							 <input type="text" placeholder="" id="date1" class="w150">
+							 <i class="fa fa-calendar"></i>
+						</span>
+                    <span class="dlblock w100 textr">结束日期</span>
+                    <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+						<input type="text" placeholder="" id="date2" class="w150"> 
+							<i class="fa fa-calendar"></i>
+						</span>
+                </div>
+            </div>
+        </div>
+    </div>
+    <!-- 表单数据 -->
+    <div class="mb20 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-table">
+                <thead>
+                <tr>
+                    <th class="textc">
+                        <div class="checker" id="allCheck">
+                            <span class=""><input type="checkbox" value=""></span>
+                        </div>
+                    </th>
+                    <th class="textc ">id</th>
+                    <th class="textc ">merchantCode</th>
+                    <th class="textc ">merchantName</th>
+                    <th class="textc ">storeId</th>
+                    <th class="textc wp15">storeName</th>
+                    <th class="textc ">createDt</th>
+                    <th class="textc ">logo</th>
+                    <th class="textc ">memberCode</th>
+                    <th class="textc wp15">nickName</th>
+                    <th class="textc ">phone</th>
+                    <th class="textc ">comsumeMoney</th>
+                    <th class="textc ">payType</th>
+                    <th class="textc">编辑</th>
+                </tr>
+                </thead>
+                <!-- 数据体 -->
+                <tbody id="data_content">
+                </tbody>
+            </table>
+
+            <!-- footer -->
+            <div class="clearfix mb10 pb20">
+                <div class="layui-tab-item fr">
+                    <span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+                    <span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>
+                    <div class="pagination dlblock vm" id="pagination"></div>
+                    <span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>
+                </div>
+            </div>
+
+        </div>
+    </div>
+</div>
+</body>
+
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMenberRecharge/merchantMenberRechargeBaseInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMenberRecharge/merchantMenberRechargeBaseInfo.jsp
new file mode 100644
index 0000000..a44eae3
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMenberRecharge/merchantMenberRechargeBaseInfo.jsp
@@ -0,0 +1,93 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">  
+	<div class="tab-pane active">     
+		<div class="panel-body">
+			<div class="wrapper wrapper-content">
+				<div class="panel-form animated fadeInRight wp60 fc">
+					<div class="layui-form-item dn	has-error" >   
+						<label class="layui-form-label">id</label>  
+						<div class="layui-input-block">
+							<input type="text" name="id" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantMenberRecharge.id }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">merchantCode</label>  
+						<div class="layui-input-block">
+							<input type="text" name="merchantCode" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantMenberRecharge.merchantCode }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">merchantName</label>  
+						<div class="layui-input-block">
+							<input type="text" name="merchantName" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantMenberRecharge.merchantName }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">storeId</label>  
+						<div class="layui-input-block">
+							<input type="text" name="storeId" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantMenberRecharge.storeId }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">storeName</label>  
+						<div class="layui-input-block">
+							<input type="text" name="storeName" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantMenberRecharge.storeName }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">createDt</label>  
+						<div class="layui-input-block">
+							<input type="text" name="createDt" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantMenberRecharge.createDt }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">logo</label>  
+						<div class="layui-input-block">
+							<input type="text" name="logo" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantMenberRecharge.logo }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">memberCode</label>  
+						<div class="layui-input-block">
+							<input type="text" name="memberCode" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantMenberRecharge.memberCode }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">nickName</label>  
+						<div class="layui-input-block">
+							<input type="text" name="nickName" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantMenberRecharge.nickName }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">phone</label>  
+						<div class="layui-input-block">
+							<input type="text" name="phone" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantMenberRecharge.phone }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">rechargeMoney</label>  
+						<div class="layui-input-block">
+							<input type="text" name="rechargeMoney" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantMenberRecharge.rechargeMoney }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">giveMoney</label>  
+						<div class="layui-input-block">
+							<input type="text" name="giveMoney" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantMenberRecharge.giveMoney }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">payType</label>  
+						<div class="layui-input-block">
+							<input type="text" name="payType" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantMenberRecharge.payType }" >
+						</div>  
+					</div>
+	
+				</div>
+			</div>
+		</div>  
+	</div>
+</form>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMenberRecharge/merchantMenberRechargeDetails.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMenberRecharge/merchantMenberRechargeDetails.jsp
new file mode 100644
index 0000000..b3fa84b
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMenberRecharge/merchantMenberRechargeDetails.jsp
@@ -0,0 +1,54 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>     
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">                      
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black"> 
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> 
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->                                     
+<meta name="viewport"
+	content="width=device-width, initial-scale=1.0, maximum-scale=1.0">   
+<jsp:include page="../../common.jsp" />
+<script type="text/javascript">
+    require("js/merchantMenberRecharge/merchantMenberRechargeDetails.js");
+</script>
+<title>编辑</title>
+</head>                                 
+	<body class="lgraybg">            
+		<div class="	container-fluid animated fadeInRight col-sm-12">
+			<div class="panel-toolbar mt10 mb10 pt5 pb5 pl10 bdd whitebg">
+				<div class="buttons">
+					<a href="javascript:void(0);" class="btn btn-primary fa fa-save f12"><span>保存</span></a>
+					<a href="${ctx }/merchantMenberRecharge/index?pageIndex=${pageIndex}"  class="btn btn-primary fa fa-back f12" id="goback"><span>返回</span></a>
+				</div>
+			</div>
+				<div class="tabs-container whitebg">
+					<div class="pt10 pl5 pr5">
+						<ul class="nav nav-tabs" id="nav-tabs">
+							<li class="active" data-action="base">   
+								<a href="javascript:void(0);" >基本资料</a>
+							</li>
+							<li class="" data-action="functions">
+								<a href="javascript:void(0);"  >多功能输入</a>
+							</li>
+							<li class="" data-action="extends">
+								<a href="javascript:void(0);" >扩展属性</a>
+							</li>
+						</ul>
+						<div class="tab-content pt30 p30">               
+		
+						</div>     
+					</div>
+				</div>    
+		</div>
+		<!-- 隐藏域 -->
+		<input type="hidden" id="merchantMenberRechargeId" value="${merchantMenberRecharge.id }"/>
+	</body>
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMenberRecharge/merchantMenberRechargeExtendsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMenberRecharge/merchantMenberRechargeExtendsInfo.jsp
new file mode 100644
index 0000000..592687a
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMenberRecharge/merchantMenberRechargeExtendsInfo.jsp
@@ -0,0 +1,201 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>           
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> 
+<div class="tab-pane active">      
+	<div class="animated fadeInRight">
+		<div class="whitebg pl10 pr10">
+			<table class="table table-striped table-bordered table-hover">     
+				<thead> 
+					<tr>  
+						<th class="textc">序号</th>         
+						<th class="textc wp15">流水账号</th>
+						<th class="textc">日期</th>         
+						<th class="textc">财务类别</th>     
+						<th class="textc">金额</th>         
+						<th class="textc">银行</th>         
+						<th class="textc">发票</th>         
+						<th class="textc">客户名称</th>     
+						<th class="textc wp15">单号</th>    
+						<th class="textc">状态</th>         
+						<th class="textc">类别</th>         
+						<th class="textc">操作</th>         
+					</tr> 
+				</thead>
+				<tbody> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+                
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="green">支出</span></td>     
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+				</tbody>
+                
+			</table>  
+			<!-- footer -->  
+			<div class="clearfix mb10 pb20">          
+					<div class="layui-tab-item fr">       
+							<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+							<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>   
+							<div class="pagination dlblock vm" id="pagination"></div>
+							<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>            
+					</div>
+				</div>  
+		</div>      
+	</div>        
+</div>          
+                
+<script type="text/javascript">    
+//分页          
+$('#pagination').pagination({        
+	pageCount: 50,
+	jump: true,   
+	coping: true, 
+	homePage: '首页',    
+	endPage: '末页',     
+	prevContent: '上页', 
+	nextContent: '下页', 
+	callback: function(api) {          
+		$('.now').text(api.getCurrent());
+	}             
+});             
+</script>       
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMenberRecharge/merchantMenberRechargeFunctionsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMenberRecharge/merchantMenberRechargeFunctionsInfo.jsp
new file mode 100644
index 0000000..982ce84
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMenberRecharge/merchantMenberRechargeFunctionsInfo.jsp
@@ -0,0 +1,130 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>		
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">      
+<div class="tab-pane active">
+				<div class="panel-body">
+					<div class="wrapper wrapper-content">     
+						<div class="panel-form animated fadeInRight wp60 fc">
+							<!-- 账号资料 -->
+			<div class="layui-form-item 	has-error">
+				<label class="layui-form-label">单行输入框<i class="red">*</i></label>
+				<div class="layui-input-block">
+					<input type="text" name="title" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input">
+				</div>                                         
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">自定义验证</label>
+				<div class="layui-input-inline ml30">
+					<input type="password" name="password" lay-verify="pass" placeholder="请输入密码" autocomplete="off" class="layui-input">
+				</div>
+				<div class="layui-form-mid layui-word-aux">请填写6到12位密码</div>
+			</div>
+			<div class="form-group">
+				<div class="layui-form-item">          
+					<label class="layui-form-label">单行选择框</label>
+					<div class="layui-input-block">
+						<select name="interest" lay-filter="aihao">  
+							<option value=""></option>
+							<option value="0">写作</option>         
+							<option value="1" selected="">阅读</option>
+							<option value="2">游戏</option>
+							<option value="3">音乐</option>
+							<option value="4">旅行</option>  
+						</select>              
+					</div>
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<div class="layui-inline">  
+					<label class="layui-form-label">范围</label>
+					<div class="layui-input-inline ml30">
+						<input type="text" name="price_min" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>                                     
+					<div class="layui-form-mid">-</div>
+					<div class="layui-input-inline">       
+						<input type="text" name="price_max" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>
+				</div>           
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">联动选择框</label>
+				<div class="layui-input-inline ml30">
+					<select name="quiz1">     
+						<option value="">请选择省</option>
+						<option value="浙江" selected="">浙江省</option> 
+						<option value="你的工号">江西省</option>           
+						<option value="你最喜欢的老师">福建省</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz2">
+						<option value="">请选择市</option>
+						<option value="杭州">杭州</option>
+						<option value="宁波" disabled="">宁波</option>
+						<option value="温州">温州</option>
+						<option value="温州">台州</option>
+						<option value="温州">绍兴</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz3">
+						<option value="">请选择县/区</option>
+						<option value="西湖区">西湖区</option>
+						<option value="余杭区">余杭区</option>
+						<option value="拱墅区">临安市</option>
+					</select>
+				</div>    
+			</div>
+			<div class="layui-form-item" pane="">   
+				<label class="layui-form-label">原始复选框</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="like1[write]" lay-skin="primary" title="写作" checked="">  
+					<input type="checkbox" name="like1[read]" lay-skin="primary" title="阅读">
+					<input type="checkbox" name="like1[game]" lay-skin="primary" title="游戏" disabled="">
+				</div>
+			</div>
+
+			<div class="layui-form-item">
+				<label class="layui-form-label">开关-默认关</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="close" lay-skin="switch" lay-text="ON|OFF">
+				</div>
+			</div>
+			<div class="layui-form-item">  
+				<label class="layui-form-label">单选框</label>
+				<div class="layui-input-block">
+					<input type="radio" name="sex" value="男" title="男" checked="">
+					<input type="radio" name="sex" value="女" title="女">
+					<input type="radio" name="sex" value="禁" title="禁用" disabled="">
+				</div>
+			</div>
+			<!--<div class="layui-form-item layui-form-text">
+				<label class="layui-form-label">上传图片</label>
+				<div class="layui-input-block">
+					<div class="layui-upload-drag w200 h200">
+						<i class="layui-icon"></i>          
+						<p>点击上传</p>
+					</div>
+				</div>
+			</div>-->
+				<div class="layui-form-item layui-form-text">
+					<label class="layui-form-label">普通文本域</label>  
+					<div class="layui-input-block">              
+						<textarea placeholder="请输入内容" class="layui-textarea"></textarea>
+					</div>
+				</div>
+			</div>
+		</div>   
+	</div>
+</div>
+</form>   
+<script type="text/javascript">
+	//form表单样式
+	layui.use(['layer', 'form'], function() {    
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+</script>                 
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMenberRecharge/merchantMenberRechargeList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMenberRecharge/merchantMenberRechargeList.jsp
new file mode 100644
index 0000000..f0fde9e
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMenberRecharge/merchantMenberRechargeList.jsp
@@ -0,0 +1,122 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black">
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->
+<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+<jsp:include page="../../common.jsp" />
+<script type="text/javascript">
+     require("js/merchantMenberRecharge/merchantMenberRechargeList.js");
+</script>
+</head>
+<body>
+	<div class="row animated fadeInRight" style="margin: 0;">
+		<div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+			<div class="toolbar-panel bdd">
+				<div class="toolbar-box">
+					<div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+						<!-- 顶部按钮 -->
+						<div class="buttons fl">
+							<a class="btn btn-primary fa fa-search f13" href="javascript:void(0);" onclick="queryMerchantMenberRecharge()"><span>搜索</span></a>
+							<a class="btn btn-primary fa fa-plus f13 add" href="javascript:void(0);" onclick="initAddMerchantMenberRecharge()"><span>添加</span></a>
+							<a class="btn btn-primary fa fa-edit f13" href="javascript:void(0);" onclick="initEditMerchantMenberRecharge()"><span>编辑</span></a> 
+							<a class="btn btn-primary fa fa-remove f13 delete" href="javascript:void(0);" onclick="initBatchDeleteMerchantMenberRecharge()"><span>删除</span></a> 
+						</div>
+						<div class="tools fr">
+							<a href="javascript:void(0);" class="collapse dblock f14 dgray mr5"> 
+								<i class="fa-2x fa fa-angle-double-up"></i>
+							</a>
+						</div>
+					</div>
+				</div>
+
+				<!--搜索条件 -->
+				<div class="toolbar-body">
+					<div class="row pt10 pb10 whitebg ml0 mr0">
+						<span class="dlblock w100 textr">ID：</span> 
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+							<input type="text" placeholder="请输入内容" id="searchId">  
+						</span> 
+						<span class="dlblock w100 textr">名称：</span> 
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+							<input type="text" placeholder="请输入名称">
+						</span> 
+						<span class="dlblock w100 textr">类别：</span>
+						 <select class="form-control f12 w180 textc">
+							<option value="">支出</option>
+							<option value="">收入</option>
+						</select>
+					</div>
+					<div class="mt10 mb20">
+						<span class="dlblock w100 textr">开始日期</span>
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+							 <input type="text" placeholder="" id="date1" class="w150">
+							 <i class="fa fa-calendar"></i>
+						</span> 
+						<span class="dlblock w100 textr">结束日期</span>
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+						<input type="text" placeholder="" id="date2" class="w150"> 
+							<i class="fa fa-calendar"></i>
+						</span>
+					</div>
+				</div>
+			</div>
+		</div>
+		<!-- 表单数据 -->
+		<div class="mb20 mt10">
+			<div class="whitebg pl10 pr10">
+				<table class="table table-striped table-bordered table-hover">
+					<thead>
+						<tr>
+							<th class="textc">
+								<div class="checker" id="allCheck">
+									<span class=""><input type="checkbox" value="" ></span>
+								</div>
+							</th>
+							<th class="textc ">id</th>
+							<th class="textc ">merchantCode</th>
+							<th class="textc ">merchantName</th>
+							<th class="textc ">storeId</th>
+							<th class="textc wp15">storeName</th>
+							<th class="textc ">createDt</th>
+							<th class="textc ">logo</th>
+							<th class="textc ">memberCode</th>
+							<th class="textc wp15">nickName</th>
+							<th class="textc ">phone</th>
+							<th class="textc ">rechargeMoney</th>
+							<th class="textc ">giveMoney</th>
+							<th class="textc wp15">payType</th>
+							<th class="textc">编辑</th>
+						</tr>
+					</thead>
+					<!-- 数据体 -->
+					<tbody id="data_content">
+					</tbody>
+				</table>
+			
+			<!-- footer -->
+				<div class="clearfix mb10 pb20">
+						<div class="layui-tab-item fr">
+								<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+								<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>
+								<div class="pagination dlblock vm" id="pagination"></div>
+								<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>
+						</div>
+					</div>
+	
+			</div>
+		</div>
+	</div>
+</body>
+
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMoveRecords/list.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMoveRecords/list.jsp
new file mode 100644
index 0000000..fbe0a5b
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMoveRecords/list.jsp
@@ -0,0 +1,242 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" id="form1" action="" style="margin-top: 10px">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">商户名称</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="merchantName" id="merchantName" placeholder="请输入商户名称"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">商户编号</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="merchantCode" id="merchantCode" placeholder="请输入商户编号"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">订单号</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="orderNumber" id="orderNumber" placeholder="请输入订单号"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <div class="mb50 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-hide" id="merchantMoveRecordsTab" lay-filter="merchantMoveRecordsTab"></table>
+        </div>
+    </div>
+</div>
+<script type="text/html" id="leftBar">
+    <a class="layui-btn layui-btn-sm" lay-event="search">
+        <i class="layui-icon layui-icon-search"></i>查询
+    </a>
+</script>
+
+<script type="text/html" id="toolBar">
+    <a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="del">
+        <i class="layui-icon layui-icon-delete"></i>删除
+    </a>
+</script>
+
+<script>
+    layui.use(['table', 'layer'], function () {
+        var table = layui.table;
+        var layer = layui.layer;
+
+        var tableIns = table.render({
+            elem: '#merchantMoveRecordsTab'
+            , url: '${ctx}/merchantMoveRecords/page'
+            , id: 'merchantMoveRecords'
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            , toolbar: '#leftBar' //开启头部工具栏，并为其绑定左侧模板
+            , defaultToolbar: ['filter']
+            , defaultToolbar: ['filter', 'exports', 'print', { //自定义头部工具栏右侧图标。如无需自定义，去除该参数即可
+                title: '提示'
+                , layEvent: 'LAYTABLE_TIPS'
+                , icon: 'layui-icon-tips'
+            }]
+            , title: '商户动态码生成详情表'
+            , cols: [[
+                 {field: 'numbers', title: '序号', fixed: 'left', unresize: true, width: 80, type: 'numbers'}
+                , {field: 'merchantName', title: '商户名称'}
+                , {field: 'merchantCode', title: '商户编号',width: 190}
+                , {field: 'ip', title: '付款人IP',width: 140}
+                , {field: 'payUserId', title: '付款人用户ID'}
+                , {field: 'orderNumber', title: '订单号'}
+                , {
+                    field: 'paySource', title: '订单来源',width: 100, templet: function (d) {
+                        if (d.paySource === 1) {
+                            return "微信";
+                        } else if (d.paySource === 2)  {
+                            return "支付宝";
+                        } else if (d.paySource === 3)  {
+                            return "云闪付";
+                        }else if (d.paySource === 4)  {
+                            return "其他";
+                        }else{
+                            return "";
+                        }
+                    }
+                }
+                , {
+                    field: 'payNum', title: '是否支付',width: 100, templet: function (d) {
+                        if (d.payNum === 1) {
+                            return "<span style='color: green'>支付成功</span>"
+                        } else {
+                            return "<span style='color: red'>未支付</span>"
+                        }
+                    }
+                }
+
+                , {
+                    field: 'startTime',
+                    title: '过期开始时间',
+                    width: 160,
+                    templet: "<div>{{layui.util.toDateString(d.startTime,'yyyy-MM-dd HH:mm:ss')}}</div>"
+                }
+                , {
+                    field: 'endTime',
+                    title: '过期结束时间',
+                    width: 160,
+                    templet: "<div>{{layui.util.toDateString(d.endTime,'yyyy-MM-dd HH:mm:ss')}}</div>"
+                }
+                , {
+                    field: 'createTime',
+                    title: '创建时间',
+                    width: 160,
+                    templet: "<div>{{layui.util.toDateString(d.createTime,'yyyy-MM-dd HH:mm:ss')}}</div>"
+                }
+                , {fixed: 'right', title: '操作', width: 90, toolbar: '#toolBar'}
+            ]]
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , page: true
+        });
+        table.on('tool(merchantMoveRecordsTab)', function (obj) { //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            var data = obj.data; //获得当前行数据
+            var layEvent = obj.event; //获得 lay-event 对应的值（也可以是表头的 event 参数对应的值）
+            if (layEvent === 'del') { //删除
+                layer.confirm('真的删除么?', {icon: 3}, function (index) {
+                    obj.del(); //删除对应行（tr）的DOM结构，并更新缓存
+                    layer.close(index);
+                    del(data);
+                    //向服务端发送删除指令
+                });
+            }
+        });
+
+        //监听头工具栏事件
+        table.on('toolbar(merchantMoveRecordsTab)', function (obj) {
+            switch (obj.event) {
+                case 'search':
+                    var params = serialize($('#form1'));
+                    table.reload('merchantMoveRecords', {
+                        where: params
+                        , page: {
+                            size: 10
+                            , current: 1
+                        }
+                    });
+                    break;
+            }
+        });
+
+        <%--function toAdd(obj) {--%>
+        <%--    var url = '${ctx}/merchantMoveSetting/detail';--%>
+        <%--    var title = "新增";--%>
+        <%--    if (obj != undefined) {--%>
+        <%--        url = "${ctx}/merchantMoveSetting/detail/" + obj.id;--%>
+        <%--        title = "编辑"--%>
+        <%--    }--%>
+        <%--    var index = layer.open({--%>
+        <%--        type: 2--%>
+        <%--        , shade: 0.5--%>
+        <%--        , title: title--%>
+        <%--        , maxmin: true--%>
+        <%--        , content: url--%>
+        <%--        , area: ['500px', '420px']--%>
+        <%--        , end: function () {--%>
+
+        <%--        }--%>
+        <%--    });--%>
+        <%--}--%>
+
+        function del(obj) {
+            $.ajax({
+                url: '${ctx}/merchantMoveRecords/del/' + obj.id,
+                method: 'DELETE',
+                dataType: 'JSON',
+                contentType: "application/json",
+                success: function (res) {
+                    if (res.code == 200) {
+                        layer.msg(res.data, {
+                            icon: 1
+                        });
+                    } else {
+                        layer.msg(res.data, {
+                            icon: 2
+                        });
+                    }
+                }
+            })
+        }
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMoveSetting/detail.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMoveSetting/detail.jsp
new file mode 100644
index 0000000..aa448e2
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMoveSetting/detail.jsp
@@ -0,0 +1,123 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp" />
+    <style>
+        .layui-input,.layui-textarea{
+            border-color:#606060;
+        }
+    </style>
+</head>
+<body style="padding: 1rem 0">
+<form class="layui-form" action="" style="width: 70%">
+    <input name="id" value="${entity.id}" hidden/>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">商户名称</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="merchantName" value="${entity.merchantName}" readonly  placeholder="请输入商户名称" class="layui-input layui-disabled"/>
+            </div>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">商户编号</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="merchantCode" value="${entity.merchantCode}" readonly  placeholder="请输入商户编号" class="layui-input layui-disabled"/>
+            </div>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">码生成上限</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="qrNum" value="${entity.qrNum}"  placeholder="请输入动态码生成次数上限" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">支付上限</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="payNum" value="${entity.payNum}"  placeholder="请输入支付次数上限" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">有效时间</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="payOverTime" value="${entity.payOverTime}" placeholder="请输入支付有效时间(分钟)" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">状态</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <select name="status" class="layui-select" lay-verify="required">
+                    <option value="">请选择</option>
+                    <option value="1" ${entity.status == 1 || empty entity ? 'selected' : ''}>启用</option>
+                    <option value="0" ${entity.status == 0 ? 'selected' : ''}>禁用</option>
+                </select>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button class="layui-btn" lay-submit lay-filter="formDemo">立即提交</button>
+            <button type="button" id="close" class="layui-btn layui-btn-primary">关闭</button>
+        </div>
+    </div>
+</form>
+
+<script>
+    //Demo
+    layui.use(['form','layer'], function(){
+        var form = layui.form;
+        var layer = layui.layer;
+        $('#close').click(function() {
+            parent.layer.closeAll();
+        });
+        //监听提交
+        form.on('submit(formDemo)', function(data){
+            var index = layer.load(1,{shade: [0.1,'#000'] });
+            $.ajax({
+                url: '${ctx}/merchantMoveSetting/save',
+                method: 'post',
+                data: JSON.stringify(data.field),
+                dataType: 'JSON',
+                contentType:"application/json",
+                success: function(res) {
+                    layer.close(index);
+                    if(res.code == 200) {
+                        layer.msg(res.message, { icon: 1, time: 1000 }, function () {
+                            var index = parent.layer.getFrameIndex(window.name);
+                            parent.layui.table.reload('merchantMoveSetting');
+                            parent.layer.close(index);
+                        });
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 2
+                        });
+                    }
+                }
+            })
+            return false;
+        });
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMoveSetting/list.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMoveSetting/list.jsp
new file mode 100644
index 0000000..3729885
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantMoveSetting/list.jsp
@@ -0,0 +1,233 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" id="form1" action="" style="margin-top: 10px">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">商户名称</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="merchantName" id="merchantName" placeholder="请输入商户名称"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">商户编号</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="merchantCode" id="merchantCode" placeholder="请输入商户编号"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">状态</label>
+                            <div class="layui-input-block">
+                                <select name="status" class="layui-select" lay-verify="required">
+                                    <option value="">请选择</option>
+                                    <option value="1" ${entity.status == '1' ? 'selected' : ''}>启用</option>
+                                    <option value="0" ${entity.status == '0' ? 'selected' : ''}>禁用</option>
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <div class="mb50 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-hide" id="merchantMoveSettingTab" lay-filter="merchantMoveSettingTab"></table>
+        </div>
+    </div>
+</div>
+<script type="text/html" id="leftBar">
+    <a class="layui-btn layui-btn-sm" lay-event="search">
+        <i class="layui-icon layui-icon-search"></i>查询
+    </a>
+</script>
+
+<script type="text/html" id="toolBar">
+    <a class="layui-btn layui-btn-xs" lay-event="edit">
+        <i class="layui-icon layui-icon-edit"></i>编辑
+    </a>
+    <a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="del">
+        <i class="layui-icon layui-icon-delete"></i>删除
+    </a>
+</script>
+
+<script>
+    layui.use(['table', 'layer'], function () {
+        var table = layui.table;
+        var layer = layui.layer;
+
+        var tableIns = table.render({
+            elem: '#merchantMoveSettingTab'
+            , url: '${ctx}/merchantMoveSetting/page'
+            , id: 'merchantMoveSetting'
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            , toolbar: '#leftBar' //开启头部工具栏，并为其绑定左侧模板
+            , defaultToolbar: ['filter']
+            , defaultToolbar: ['filter', 'exports', 'print', { //自定义头部工具栏右侧图标。如无需自定义，去除该参数即可
+                title: '提示'
+                , layEvent: 'LAYTABLE_TIPS'
+                , icon: 'layui-icon-tips'
+            }]
+            , title: '商户动态码设置表'
+            , cols: [[
+                {type: 'checkbox', fixed: 'left', hidden: true}
+                , {field: 'numbers', title: '序号', fixed: 'left', unresize: true, width: 80, type: 'numbers'}
+                , {field: 'merchantName', title: '商户名称'}
+                , {field: 'merchantCode', title: '商户编号'}
+                , {field: 'qrNum', title: '生成次数上限'}
+                , {field: 'payNum', title: '支付成功次数'}
+                , {field: 'payOverTime', title: '支付有效时间(分钟)'}
+                , {
+                    field: 'status', title: '状态', templet: function (d) {
+                        if (d.status === 1) {
+                            return "<span style='color: green'>启用</span>"
+                        } else {
+                            return "<span style='color: red'>禁止</span>"
+                        }
+                    }
+                }
+                , {
+                    field: 'createTime',
+                    title: '创建时间',
+                    width: 160,
+                    templet: "<div>{{layui.util.toDateString(d.createTime,'yyyy-MM-dd HH:mm:ss')}}</div>"
+                }
+                , {fixed: 'right', title: '操作', width: 200, toolbar: '#toolBar'}
+            ]]
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , page: true
+        });
+        table.on('tool(merchantMoveSettingTab)', function (obj) { //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            var data = obj.data; //获得当前行数据
+            var layEvent = obj.event; //获得 lay-event 对应的值（也可以是表头的 event 参数对应的值）
+            if (layEvent === 'del') { //删除
+                layer.confirm('真的删除么?', {icon: 3}, function (index) {
+                    obj.del(); //删除对应行（tr）的DOM结构，并更新缓存
+                    layer.close(index);
+                    del(data);
+                    //向服务端发送删除指令
+                });
+            } else if (layEvent === 'edit') { //编辑
+                //do something
+                toAdd(obj.data);
+                //同步更新缓存对应的值
+                // obj.update({
+                //     username: '123'
+                //     ,title: 'xxx'
+                // });
+            }
+        });
+
+        //监听头工具栏事件
+        table.on('toolbar(merchantMoveSettingTab)', function (obj) {
+            switch (obj.event) {
+                case 'add':
+                    // 添加
+                    toAdd();
+                    break;
+                case 'search':
+                    var params = serialize($('#form1'));
+                    table.reload('merchantMoveSetting', {
+                        where: params
+                        , page: {
+                            size: 10
+                            , current: 1
+                        }
+                    });
+                    break;
+            }
+        });
+
+        function toAdd(obj) {
+            var url = '${ctx}/merchantMoveSetting/detail';
+            var title = "新增";
+            if (obj != undefined) {
+                url = "${ctx}/merchantMoveSetting/detail/" + obj.id;
+                title = "编辑"
+            }
+            var index = layer.open({
+                type: 2
+                , shade: 0.5
+                , title: title
+                , maxmin: true
+                , content: url
+                , area: ['500px', '500px']
+                , end: function () {
+
+                }
+            });
+        }
+
+        function del(obj) {
+            $.ajax({
+                url: '${ctx}/merchantMoveSetting/del/' + obj.id,
+                method: 'DELETE',
+                dataType: 'JSON',
+                contentType: "application/json",
+                success: function (res) {
+                    if (res.code == 200) {
+                        layer.msg(res.data, {
+                            icon: 1
+                        });
+                    } else {
+                        layer.msg(res.data, {
+                            icon: 2
+                        });
+                    }
+                }
+            })
+        }
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantOrder/merchantOrderBaseInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantOrder/merchantOrderBaseInfo.jsp
new file mode 100644
index 0000000..b92065c
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantOrder/merchantOrderBaseInfo.jsp
@@ -0,0 +1,99 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">  
+	<div class="tab-pane active">     
+		<div class="panel-body">
+			<div class="wrapper wrapper-content">
+				<div class="panel-form animated fadeInRight wp60 fc">
+					<div class="layui-form-item dn	has-error" >   
+						<label class="layui-form-label">id</label>  
+						<div class="layui-input-block">
+							<input type="text" name="id" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantOrder.id }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">orderNumber</label>  
+						<div class="layui-input-block">
+							<input type="text" name="orderNumber" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantOrder.orderNumber }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">merchantCode</label>  
+						<div class="layui-input-block">
+							<input type="text" name="merchantCode" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantOrder.merchantCode }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">merchantName</label>  
+						<div class="layui-input-block">
+							<input type="text" name="merchantName" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantOrder.merchantName }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">payTypeCode</label>  
+						<div class="layui-input-block">
+							<input type="text" name="payTypeCode" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantOrder.payTypeCode }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">payTypeName</label>  
+						<div class="layui-input-block">
+							<input type="text" name="payTypeName" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantOrder.payTypeName }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">consumeFee</label>  
+						<div class="layui-input-block">
+							<input type="text" name="consumeFee" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantOrder.consumeFee }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">transNo</label>  
+						<div class="layui-input-block">
+							<input type="text" name="transNo" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantOrder.transNo }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">memberCode</label>  
+						<div class="layui-input-block">
+							<input type="text" name="memberCode" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantOrder.memberCode }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">storeId</label>  
+						<div class="layui-input-block">
+							<input type="text" name="storeId" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantOrder.storeId }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">storeName</label>  
+						<div class="layui-input-block">
+							<input type="text" name="storeName" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantOrder.storeName }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">createDt</label>  
+						<div class="layui-input-block">
+							<input type="text" name="createDt" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantOrder.createDt }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">staffCode</label>  
+						<div class="layui-input-block">
+							<input type="text" name="staffCode" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantOrder.staffCode }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">status</label>  
+						<div class="layui-input-block">
+							<input type="text" name="status" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantOrder.status }" >
+						</div>  
+					</div>
+	
+				</div>
+			</div>
+		</div>  
+	</div>
+</form>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantOrder/merchantOrderDetails.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantOrder/merchantOrderDetails.jsp
new file mode 100644
index 0000000..99a26f1
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantOrder/merchantOrderDetails.jsp
@@ -0,0 +1,54 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>     
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">                      
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black"> 
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> 
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->                                     
+<meta name="viewport"
+	content="width=device-width, initial-scale=1.0, maximum-scale=1.0">   
+<jsp:include page="../../common.jsp" />
+<script type="text/javascript">
+    require("js/merchantOrder/merchantOrderDetails.js");
+</script>
+<title>编辑</title>
+</head>                                 
+	<body class="lgraybg">            
+		<div class="	container-fluid animated fadeInRight col-sm-12">
+			<div class="panel-toolbar mt10 mb10 pt5 pb5 pl10 bdd whitebg">
+				<div class="buttons">
+					<a href="javascript:void(0);" class="btn btn-primary fa fa-save f12"><span>保存</span></a>
+					<a href="${ctx }/merchantOrder/index?pageIndex=${pageIndex}"  class="btn btn-primary fa fa-back f12" id="goback"><span>返回</span></a>
+				</div>
+			</div>
+				<div class="tabs-container whitebg">
+					<div class="pt10 pl5 pr5">
+						<ul class="nav nav-tabs" id="nav-tabs">
+							<li class="active" data-action="base">   
+								<a href="javascript:void(0);" >基本资料</a>
+							</li>
+							<li class="" data-action="functions">
+								<a href="javascript:void(0);"  >多功能输入</a>
+							</li>
+							<li class="" data-action="extends">
+								<a href="javascript:void(0);" >扩展属性</a>
+							</li>
+						</ul>
+						<div class="tab-content pt30 p30">               
+		
+						</div>     
+					</div>
+				</div>    
+		</div>
+		<!-- 隐藏域 -->
+		<input type="hidden" id="merchantOrderId" value="${merchantOrder.id }"/>
+	</body>
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantOrder/merchantOrderExtendsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantOrder/merchantOrderExtendsInfo.jsp
new file mode 100644
index 0000000..592687a
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantOrder/merchantOrderExtendsInfo.jsp
@@ -0,0 +1,201 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>           
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> 
+<div class="tab-pane active">      
+	<div class="animated fadeInRight">
+		<div class="whitebg pl10 pr10">
+			<table class="table table-striped table-bordered table-hover">     
+				<thead> 
+					<tr>  
+						<th class="textc">序号</th>         
+						<th class="textc wp15">流水账号</th>
+						<th class="textc">日期</th>         
+						<th class="textc">财务类别</th>     
+						<th class="textc">金额</th>         
+						<th class="textc">银行</th>         
+						<th class="textc">发票</th>         
+						<th class="textc">客户名称</th>     
+						<th class="textc wp15">单号</th>    
+						<th class="textc">状态</th>         
+						<th class="textc">类别</th>         
+						<th class="textc">操作</th>         
+					</tr> 
+				</thead>
+				<tbody> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+                
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="green">支出</span></td>     
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+				</tbody>
+                
+			</table>  
+			<!-- footer -->  
+			<div class="clearfix mb10 pb20">          
+					<div class="layui-tab-item fr">       
+							<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+							<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>   
+							<div class="pagination dlblock vm" id="pagination"></div>
+							<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>            
+					</div>
+				</div>  
+		</div>      
+	</div>        
+</div>          
+                
+<script type="text/javascript">    
+//分页          
+$('#pagination').pagination({        
+	pageCount: 50,
+	jump: true,   
+	coping: true, 
+	homePage: '首页',    
+	endPage: '末页',     
+	prevContent: '上页', 
+	nextContent: '下页', 
+	callback: function(api) {          
+		$('.now').text(api.getCurrent());
+	}             
+});             
+</script>       
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantOrder/merchantOrderFunctionsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantOrder/merchantOrderFunctionsInfo.jsp
new file mode 100644
index 0000000..982ce84
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantOrder/merchantOrderFunctionsInfo.jsp
@@ -0,0 +1,130 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>		
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">      
+<div class="tab-pane active">
+				<div class="panel-body">
+					<div class="wrapper wrapper-content">     
+						<div class="panel-form animated fadeInRight wp60 fc">
+							<!-- 账号资料 -->
+			<div class="layui-form-item 	has-error">
+				<label class="layui-form-label">单行输入框<i class="red">*</i></label>
+				<div class="layui-input-block">
+					<input type="text" name="title" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input">
+				</div>                                         
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">自定义验证</label>
+				<div class="layui-input-inline ml30">
+					<input type="password" name="password" lay-verify="pass" placeholder="请输入密码" autocomplete="off" class="layui-input">
+				</div>
+				<div class="layui-form-mid layui-word-aux">请填写6到12位密码</div>
+			</div>
+			<div class="form-group">
+				<div class="layui-form-item">          
+					<label class="layui-form-label">单行选择框</label>
+					<div class="layui-input-block">
+						<select name="interest" lay-filter="aihao">  
+							<option value=""></option>
+							<option value="0">写作</option>         
+							<option value="1" selected="">阅读</option>
+							<option value="2">游戏</option>
+							<option value="3">音乐</option>
+							<option value="4">旅行</option>  
+						</select>              
+					</div>
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<div class="layui-inline">  
+					<label class="layui-form-label">范围</label>
+					<div class="layui-input-inline ml30">
+						<input type="text" name="price_min" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>                                     
+					<div class="layui-form-mid">-</div>
+					<div class="layui-input-inline">       
+						<input type="text" name="price_max" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>
+				</div>           
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">联动选择框</label>
+				<div class="layui-input-inline ml30">
+					<select name="quiz1">     
+						<option value="">请选择省</option>
+						<option value="浙江" selected="">浙江省</option> 
+						<option value="你的工号">江西省</option>           
+						<option value="你最喜欢的老师">福建省</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz2">
+						<option value="">请选择市</option>
+						<option value="杭州">杭州</option>
+						<option value="宁波" disabled="">宁波</option>
+						<option value="温州">温州</option>
+						<option value="温州">台州</option>
+						<option value="温州">绍兴</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz3">
+						<option value="">请选择县/区</option>
+						<option value="西湖区">西湖区</option>
+						<option value="余杭区">余杭区</option>
+						<option value="拱墅区">临安市</option>
+					</select>
+				</div>    
+			</div>
+			<div class="layui-form-item" pane="">   
+				<label class="layui-form-label">原始复选框</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="like1[write]" lay-skin="primary" title="写作" checked="">  
+					<input type="checkbox" name="like1[read]" lay-skin="primary" title="阅读">
+					<input type="checkbox" name="like1[game]" lay-skin="primary" title="游戏" disabled="">
+				</div>
+			</div>
+
+			<div class="layui-form-item">
+				<label class="layui-form-label">开关-默认关</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="close" lay-skin="switch" lay-text="ON|OFF">
+				</div>
+			</div>
+			<div class="layui-form-item">  
+				<label class="layui-form-label">单选框</label>
+				<div class="layui-input-block">
+					<input type="radio" name="sex" value="男" title="男" checked="">
+					<input type="radio" name="sex" value="女" title="女">
+					<input type="radio" name="sex" value="禁" title="禁用" disabled="">
+				</div>
+			</div>
+			<!--<div class="layui-form-item layui-form-text">
+				<label class="layui-form-label">上传图片</label>
+				<div class="layui-input-block">
+					<div class="layui-upload-drag w200 h200">
+						<i class="layui-icon"></i>          
+						<p>点击上传</p>
+					</div>
+				</div>
+			</div>-->
+				<div class="layui-form-item layui-form-text">
+					<label class="layui-form-label">普通文本域</label>  
+					<div class="layui-input-block">              
+						<textarea placeholder="请输入内容" class="layui-textarea"></textarea>
+					</div>
+				</div>
+			</div>
+		</div>   
+	</div>
+</div>
+</form>   
+<script type="text/javascript">
+	//form表单样式
+	layui.use(['layer', 'form'], function() {    
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+</script>                 
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantOrder/merchantOrderList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantOrder/merchantOrderList.jsp
new file mode 100644
index 0000000..2ef1222
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantOrder/merchantOrderList.jsp
@@ -0,0 +1,686 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+    <style>
+        .layui-table th {
+            text-align: center;
+        }
+
+        .buttons {
+            margin-right: .5rem;
+        }
+    </style>
+    <script type="text/javascript">
+        require("js/merchantOrder/merchantOrderList.js");
+    </script>
+</head>
+<body>
+<div class="row animated" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="buttons fl">
+                        <a class="layui-btn layui-btn-sm fa fa-search f13" href="javascript:void(0);"
+                           onclick="queryMerchantOrderSearch()"><span>搜索</span></a>
+                    </div>
+                    <div class="buttons fl">
+                        <a class="layui-btn layui-btn-sm layui-btn-warm fa fa-check f13" href="javascript:void(0);"
+                           onclick="syncPluginOrder()"><span>同步</span></a>
+                    </div>
+                    <div class="buttons fl">
+                        <a class="layui-btn layui-btn-sm layui-btn-normal fa fa-download f13" href="javascript:void(0);"
+                           onclick="downloadSettleFile()"><span>下载对账文件</span></a>
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" action="" style="margin-top: 10px">
+                    <div class="layui-form-item">
+<%--                        <div class="layui-inline">--%>
+<%--                            <label class="layui-form-label">用户ID</label>--%>
+<%--                            <div class="layui-input-inline">--%>
+<%--                                <input type="text" placeholder="请输入用户ID" id="userId" name="userId" class="layui-input">--%>
+<%--                            </div>--%>
+<%--                        </div>--%>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">订单号：</label>
+                            <div class="layui-input-inline">
+                                <input type="text" id="orderNumber" name="orderNumber" placeholder="请输入订单号"
+                                       class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">商户名称：</label>
+                            <div class="layui-input-inline">
+                                <input type="text" id="alias" name="alias" placeholder="请输入商户名称" class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">商户编号：</label>
+                            <div class="layui-input-inline">
+                                <input type="text" id="merchantCode" name="merchantCode" placeholder="商户编号" class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">订单类型：</label>
+                            <div class="layui-input-inline">
+                                <select id="orderType" name="orderType">
+                                    <option value="">请选择订单类型</option>
+                                    <option value="1">主扫</option>
+                                    <option value="2">被扫</option>
+                                    <option value="3">会员充值</option>
+                                    <option value="4">POS</option>
+                                    <option value="5">主扫充值</option>
+                                    <option value="6">扫码王收款</option>
+                                    <option value="7">H5</option>
+                                    <option value="8">升级消费</option>
+                                    <option value="9">小程序</option>
+                                    <option value="10">线上店</option>
+                                    <option value="11">缴费通</option>
+                                    <option value="99">插件</option>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">支付方式：</label>
+                            <div class="layui-input-inline">
+                                <select id="payTypeCode" name="payTypeCode">
+                                    <option value="">请选择交易状态</option>
+                                    <option value="sxfPay0|aliPay">支付宝</option>
+                                    <option value="sxfPay1|wechatPay">微信</option>
+                                    <option value="sxfPay2|bank">银联</option>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">交易状态：</label>
+                            <div class="layui-input-inline">
+                                <select id="status" name="status">
+                                    <option value="">请选择交易状态</option>
+                                    <option value="5">待付款</option>
+                                    <option value="1">交易成功</option>
+                                    <option value="0">交易失败</option>
+                                    <option value="2">退款成功</option>
+                                    <option value="3">退款失败</option>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">结算类型：</label>
+                            <div class="layui-input-inline">
+                                <select id="settlementType" name="settlementType">
+                                    <option value="">请选择</option>
+                                    <option value="0">D0</option>
+                                    <option value="1">D1</option>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">订单来源：</label>
+                            <div class="layui-input-inline">
+                                <select id="aisleSwitch" name="aisleSwitch">
+                                    <option value="">请选择</option>
+                                    <c:forEach items="${channelList}" var="c">
+                                        <option value="${c.id eq 1 ? 2 : c.id}">${c.channelName}</option>
+                                    </c:forEach>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">开始日期</label>
+                            <div class="layui-input-inline">
+                                <input type="text" placeholder="开始日期" id="date1" name="startTime" autocomplete="off"
+                                       class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">结束日期</label>
+                            <div class="layui-input-inline">
+                                <input type="text" placeholder="结束日期" id="date2" name="endTime" autocomplete="off"
+                                       class="layui-input">
+                            </div>
+                        </div>
+                    </div>
+                    <br>
+                    <div class="mt10 mb20" style="position: relative;">
+                        <button type="button" id="gofile1"
+                                style="position: absolute;right: 30px;padding: 5px;bottom: 0px;background-color: #ff5e5f;color: #fff;border-radius: 8px;">
+                            批量导出
+                        </button>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+</div>
+
+<div class="box-flex  fw600 f18" style="justify-content:space-around;padding: 1rem;align-items: center;">
+    <div>交易总额：<span id="transAmountCount" style="color:#ff5e5f;"></span>元</div>
+    <div>退款总额：<span id="refundAmountCount" style="color:#ff5e5f;"></span>元</div>
+    <div>实收总额：<span id="normalAmountCount" style="color:#ff5e5f;"></span>元</div>
+    <div>收益总额：<span id="profitAmountCount" style="color:#ff5e5f;"></span>元</div>
+    <div style="font-size: 1rem;">
+        <div>交易分润：<span id="transProfitAmountCount" style="color:#ff5e5f;"></span>元</div>
+        <div>笔数分润：<span id="numberAmountCount" style="color:#ff5e5f;"></span>元</div>
+        <div>升级分润：<span id="upAmountCount" style="color:#ff5e5f;"></span>元</div>
+    </div>
+    <div>推广分润：<span id="shareAmountCount" style="color:#ff5e5f;"></span>元</div>
+    <div>粉丝分润：<span id="fansAmountCount" style="color:#ff5e5f;"></span>元</div>
+    <div>实际收益：<span id="actualAmountCount" style="color:#ff5e5f;"></span>元</div>
+</div>
+
+<div class="mb50 mt10">
+    <div class="whitebg pl10 pr10">
+        <table class="layui-hide" id="merchantOrderList" lay-filter="merchantOrderList"></table>
+    </div>
+</div>
+</body>
+
+<script id="orderTypeSearch" type="text/html">
+    {{# if (d.orderType == "1") { }}
+    <span>主扫</span>
+    {{# } else if(d.orderType == "2") {}}
+    <span>被扫</span>
+    {{# } else if(d.orderType == "3") {}}
+    <span>会员充值</span>
+    {{# } else if(d.orderType == "4") {}}
+    <span>POS</span>
+    {{# } else if(d.orderType == "5") {}}
+    <span>主扫充值</span>
+    {{# } else if(d.orderType == "6") {}}
+    <span>扫码王收款</span>
+    {{# } else if(d.orderType == "7") {}}
+    <span>H5</span>
+    {{# } else if(d.orderType == "8") {}}
+    <span>升级消费</span>
+    {{# } else if(d.orderType == "9") {}}
+    <span>小程序</span>
+    {{# } else if(d.orderType == "10") {}}
+    <span>线上店</span>
+    {{# } else if(d.orderType == "11") {}}
+    <span>缴费通</span>
+    {{# } else if(d.orderType == "99") {}}
+    <span>插件</span>
+    {{# } }}
+</script>
+
+<script id="payTypeCodeSearch" type="text/html">
+    {{# if (d.payTypeCode == "sxfPay0" || d.payTypeCode == "aliPay") { }}
+    <span>支付宝</span>
+    {{# } else if(d.payTypeCode == "sxfPay1" || d.payTypeCode == "wechatPay") {}}
+    <span>微信</span>
+    {{# } else if(d.payTypeCode == "sxfPay2" || d.payTypeCode == "bank") {}}
+    <span>银联</span>
+    {{# } }}
+</script>
+
+<script id="lineBar" type="text/html">
+    {{# if (d.status == '5' || d.status == '7')  {}}
+    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="suppleOrder">补单</a>
+    {{# } }}
+</script>
+
+<script id="dealStatus" type="text/html">
+    {{# if (d.status == "0") { }}
+    <span style="color: red">交易失败</span>
+    {{# } else if(d.status == "1") {}}
+    <span style="color: green">交易成功</span>
+    {{# } else if(d.status == "2") {}}
+    <span style="color: green">退款成功</span>
+    {{# } else if(d.status == "3") {}}
+    <span style="color: red">退款失败</span>
+    {{# } else if(d.status == "5") {}}
+    <span style="color: blue">待付款</span>
+    {{# } else if(d.status == "7") {}}
+    <span style="color: blue">待付款(待确认)</span>
+    {{# } }}
+</script>
+
+
+<script type="text/template" id="settle">
+    <form class="layui-form" id="settleForm" style="margin-top: 2rem;">
+        <div class="layui-form-item" style="width: 300px;">
+            <label class="layui-form-label">日期</label>
+            <div class="layui-input-block">
+                <input type="text" name="date" id="accountDate" style="cursor: pointer" placeholder="日期"  autocomplete="off" class="layui-input">
+            </div>
+        </div>
+        <div class="layui-form-item" style="width: 300px;">
+            <label class="layui-form-label">通道</label>
+            <div class="layui-input-block">
+                <select class="layui-select" id="channel" name="channel" >
+                    <option value="">请选择</option>
+                    <option value="4">银盛</option>
+                </select>
+            </div>
+        </div>
+        <div class="layui-form-item" style="width: 300px;">
+            <label class="layui-form-label">类型</label>
+            <div class="layui-input-block">
+                <select class="layui-select" id="type" name="type" >
+                    <option value="">请选择</option>
+                    <option value="1">清算文件</option>
+                    <option value="2">交易文件</option>
+                </select>
+            </div>
+        </div>
+    </form>
+</script>
+
+<script type="text/javascript">
+    var layer;
+    var form;
+    var table;
+    var laydate;
+    var dropdown;
+    //form表单样式
+    layui.use(['table', 'layer', 'form', 'laydate', 'dropdown'], function () {
+        layer = layui.layer;
+        form = layui.form;
+        table = layui.table;
+        laydate = layui.laydate;
+        dropdown = layui.dropdown;
+        form.render();
+        laydate.render({
+            elem: '#date1',//指定元素
+            type: 'datetime',
+            format: 'yyyy-MM-dd HH:mm:ss'
+        });
+        laydate.render({
+            elem: '#date2', //指定元素
+            type: 'datetime',
+            format: 'yyyy-MM-dd HH:mm:ss'
+        });
+
+        //执一个 table 实例
+        table.render({
+            elem: '#merchantOrderList'
+            , id: 'merchantOrderList'
+            , url: ctx + '/merchantOrder/queryMerchantOrderByPage' //数据接口
+            , autoSort: false
+            , where: {
+                userId: $('#userId').val()
+                , orderNumber: $('#orderNumber').val()
+                , payTypeCode: $('#payTypeCode').val()
+                , alias: $('#alias').val()
+                , orderType: $("#orderType :selected").val()
+                , status: $("#status :selected").val()
+                , startTime: $('#date1').val()
+                , endTime: $('#date2').val()
+                , settlementType: $('#settlementType').val()
+                , aisleSwitch: $('#aisleSwitch').val()
+            }
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.count, //解析数据长度
+                    "data": res.merchantOrderList, //解析数据列表，
+                    "resultData": res.resultData
+                };
+            }
+            , request: {
+                pageName: 'currPage' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , title: '订单列表'
+            , page: true //开启分页
+            , toolbar: '#toolBar' //开启工具栏，此处显示默认图标，可以自定义模板，详见文档
+            , defaultToolbar: ['filter']
+            , cellMinWidth: 80 //全局定义常规单元格的最小宽度，layui 2.2.1 新增
+            , cols: [[ //表头
+                {type: 'numbers', fixed: 'left'}
+                // , {field: 'userId', title: '用户ID', align: "center", fixed: 'left'}
+                , {
+                    field: 'orderNumber', align: "center", minWidth: 150, title: '订单号', templet: function (d) {
+                        return d.orderNumber + "<br/>" + d.transNo + "<br/>" + d.thirdTransNo + "<br/>" + d.mercOrderNo;
+                    }
+                }
+                // , {field: 'transNo',align:"center", title: '商户单号',width: 280}
+                , {field: 'merchantName', align: "center", minWidth: 150, title: '商户名称'}
+                , {field: 'merchantCode', align: "center", minWidth: 180, title: '商户编号'}
+                , {field: 'orderType', align: "center", minWidth: 100, title: '类型', templet: '#orderTypeSearch'}
+                , {field: 'payTypeCode', align: "center", minWidth: 90, title: '支付方式', templet: '#payTypeCodeSearch'}
+                , {
+                    field: 'consumeFee', align: "center", minWidth: 110, title: '订单金额', templet: function (d) {
+                        return d.consumeFee.toFixed(2);
+                    }
+                }
+                , {
+                    field: 'mercFee', align: "center", title: '手续费', templet: function (d) {
+                        if (!d.mercFee || d.mercFee == 0) {
+                            return "0.00";
+                        } else {
+                            return d.mercFee;
+                        }
+                    }
+                }
+                , {
+                    field: 'cashFee', align: "center", title: '提现手续费', templet: function (d) {
+                        if (!d.cashFee || d.cashFee == 0) {
+                            return "0.00";
+                        } else {
+                            return d.cashFee;
+                        }
+                    }
+                }
+                , {
+                    field: 'enterFee', align: "center", minWidth: 110, title: '实际到账', templet: function (d) {
+                        if(d.enterFee){
+                            return d.enterFee;
+                        }
+                        return "0.00";
+                    }
+                }
+                , {
+                    field: 'mercRate', align: "center", minWidth: 100, title: '商户费率%', templet: (d) => {
+                        return (d.mercRate / 100) + "%";
+                    }
+                }
+                // , {
+                //     field: 'aisleRate', align: "center", minWidth: 100, title: '通道费率%', templet: (d) => {
+                //         return (d.aisleRate / 100) + "%";
+                //     }
+                // }
+                , {
+                    field: 'platformRevenue', align: "center", minWidth: 90, title: '平台收益', templet: function (d) {
+                        if (!d.platformRevenue || d.platformRevenue == 0) {
+                            return "0.00";
+                        } else {
+                            return d.platformRevenue;
+                        }
+                    }
+                }
+                , {
+                    field: 'profitShareMoney', align: "center", minWidth: 90, title: '推广分润', templet: function (d) {
+                        if (!d.profitShareMoney) {
+                            return "0.00";
+                        } else {
+                            return d.profitShareMoney;
+                        }
+                    }
+                }
+                , {
+                    field: 'fansShareMoney', align: "center", minWidth: 90, title: '粉丝分润', templet: function (d) {
+                        if (!d.fansShareMoney) {
+                            return "0.00";
+                        } else {
+                            return d.fansShareMoney;
+                        }
+                    }
+                }
+                , {
+                    field: 'marketAmt', align: "center", title: '奖励积分', minWidth: 90, templet: function (d) {
+                        if (!d.marketAmt) {
+                            return "0.00";
+                        } else {
+                            return d.marketAmt;
+                        }
+                    }
+                }
+                , {
+                    field: 'practical', align: "center", title: '实际收益', minWidth: 90, templet: function (d) {
+                        if (!d.practical) {
+                            return "0.00";
+                        } else {
+                            return d.practical;
+                        }
+                    }
+                }
+                , {
+                    title: '创建/交易时间', minWidth: 155, align: "center", templet: function (d) {
+                        var orderTime = layui.util.toDateString(d.createDt, 'yyyy-MM-dd HH:mm:ss');
+                        if (d.transDt != null) {
+                            orderTime = orderTime + "<br/>" + layui.util.toDateString(d.transDt, 'yyyy-MM-dd HH:mm:ss')
+                        }
+                        return orderTime;
+                    }
+                }
+                , {field: 'ip', align: "center", minWidth: 150, title: '付款IP'}
+                , {field: 'ipAddress', align: "center", minWidth: 250, title: '付款地址'}
+                , {field: 'drType', align: "center", minWidth: 80, title: '卡类型',templet: function (d){
+                    if(d.drType){
+                        if(d.drType == "1"){
+                            return "储蓄卡";
+                        }else if(d.drType == "2"){
+                            return "信用卡";
+                        }else{
+                            return "其他";
+                        }
+                    }else{
+                        return "-";
+                    }
+                  }}
+                , {
+                    field: 'status',
+                    align: "center",
+                    minWidth: 100,
+                    title: '交易状态',
+                    templet: '#dealStatus',
+                    fixed: 'right'
+                }
+                , {field: 'right', title: '操作', align: 'center', toolbar: '#lineBar', fixed: 'right'}
+            ]]
+            , done: function (res) {
+                // dropdown.suite();
+                if (res.resultData == null) {
+                    $("#transAmountCount").html(0);
+                    $("#refundAmountCount").html(0);
+                    $("#profitAmountCount").html(0);
+                    $("#shareAmountCount").html(0);
+                    $("#fansAmountCount").html(0);
+                    $("#actualAmountCount").html(0);
+
+                    $("#transProfitAmountCount").html(0);
+                    $("#numberAmountCount").html(0);
+                    $("#upAmountCount").html(0);
+                } else {
+                    $("#transAmountCount").html(res.resultData.transAmountCount);
+                    $("#refundAmountCount").html(res.resultData.refundAmountCount);
+                    $("#normalAmountCount").html((parseFloat(res.resultData.transAmountCount) - parseFloat(res.resultData.refundAmountCount)).toFixed(2));
+                    $("#profitAmountCount").html(res.resultData.profitAmountCount);
+                    $("#shareAmountCount").html(res.resultData.shareAmountCount);
+                    $("#fansAmountCount").html(res.resultData.fansAmountCount);
+                    $("#actualAmountCount").html(res.resultData.actualAmountCount);
+
+                    $("#transProfitAmountCount").html(res.resultData.transProfitAmountCount);
+                    $("#numberAmountCount").html(res.resultData.numberAmountCount);
+                    $("#upAmountCount").html(res.resultData.upAmountCount);
+                }
+            }
+        });
+        //监听行工具事件
+        table.on('tool(merchantOrderList)', function (obj) { //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            var data = obj.data //获得当前行数据
+                , layEvent = obj.event; //获得 lay-event 对应的值
+            if (layEvent === 'suppleOrder') {
+                suppleOrder(data);
+            }
+        });
+
+
+    });
+
+    function downloadSettleFile(){
+        let openIndex = layer.open({
+            type: 1,
+            closeBtn: 1,
+            title: '下载对账文件',
+            offset: 'm', //具体配置参考：offset参数项
+            area: ['450px', '500px'],
+            content: $("#settle").html(),
+            btn: ['确认','取消'],
+            btnAlign: 'r'	, //按钮居中
+            shade: 0.3 ,//不显示遮罩
+            success:function (){
+                laydate.render({
+                    elem: '#accountDate', //指定元素
+                    format: 'yyyy-MM-dd'
+                });
+                form.render("select");
+            },
+            yes: function() {
+                let accountDate = $("#accountDate").val();
+                let channel = $("#channel").val();
+                let type = $("#type").val();
+                if(!accountDate){
+                    return layer.msg("日期必填");
+                }
+                if(!channel){
+                    return layer.msg("所属通道必填");
+                }
+                if(!type){
+                    return layer.msg("文件类型必填");
+                }
+                let index = layer.load(1, {shade: [0.1, '#000']});
+                let url = ctx + "/merchantOrder/getChannelFileUrl";
+                $.ajax({
+                    url:url,
+                    type:'POST',
+                    data:{
+                        accountDate:accountDate,
+                        channel:channel,
+                        type:type
+                    },
+                    dataType: 'json',
+                    success:function (res){
+                        layer.close(index);
+                        layer.close(openIndex);
+                        layer.msg(res.message,{icon:res.code == 200 ? 1 : 2})
+                        if(res.code == 200){
+                            window.location.href = res.data;
+                        }
+                    }
+                })
+            }
+        });
+    }
+
+    function suppleOrder(data) {
+        // var id = $(this).attr("data-id");
+        var id = data.id;
+        layer.confirm('是否确认对订单ID为【' + id + '】发起补单？', function () {
+            var index = layer.load(1, {shade: [0.1, '#000']});
+            $.ajax({
+                url: '${ctx}/merchantOrder/suppleOrder/' + id,
+                type: 'post',
+                dataType: "json",
+                success: function (res) {
+                    layer.close(index);
+                    if (res.code == 200) {
+                        layer.msg(res.message, {icon: 1});
+                        $("#queryForm").submit();
+                    } else {
+                        layer.msg(res.message, {icon: 5});
+                    }
+                }
+            })
+        })
+    }
+
+    //查询
+    function queryMerchantOrderSearch() {
+        table.reload('merchantOrderList', {
+            page: {
+                curr: 1
+            }
+            , where: { //请求参数（注意：这里面的参数可任意定义，并非下面固定的格式）
+                userId: $('#userId').val()
+                , orderNumber: $('#orderNumber').val()
+                , payTypeCode: $('#payTypeCode').val()
+                , alias: $('#alias').val()
+                , orderType: $("#orderType :selected").val()
+                , status: $("#status :selected").val()
+                , startTime: $('#date1').val()
+                , endTime: $('#date2').val()
+                , settlementType: $("#settlementType").val()
+                , aisleSwitch: $("#aisleSwitch").val()
+                , merchantCode: $("#merchantCode").val()
+            }
+        });
+    }
+
+    /**
+     * 同步插件订单
+     */
+    function syncPluginOrder() {
+        let startTime = $("#date1").val();
+        let endTime = $("#date2").val();
+        if (!startTime || !endTime) {
+            layer.msg("请在“开始日期”和“结束日期”指定需要同步的数据的日期");
+            return;
+        }
+        let daysBetween = getDaysBetween(startTime, endTime);
+        if (parseFloat(daysBetween) >= 1) {
+            layer.msg("日期相差超过一天");
+            return;
+        }
+        var url = ctx + "/merchantOrder/syncPluginOrder"
+        var dialog = layer.msg('正在同步...', {icon: 16, time: 0, shade: [0.3, '#000', false]});
+        $.post(url, {'startDate': startTime, 'endDate': endTime}, (res) => {
+            layer.close(dialog);
+            if (res.code == 200) {
+                layer.msg("数据同步成功", {icon: 1});
+            } else {
+                layer.msg(res.message, {icon: 2});
+            }
+        })
+    }
+
+    function getDaysBetween(dateString1, dateString2) {
+        var startDate = Date.parse(dateString1);
+        var endDate = Date.parse(dateString2);
+        var days = (endDate - startDate) / (1 * 24 * 60 * 60 * 1000);
+        return days;
+    }
+</script>
+<script type="text/javascript">
+    $("#gofile1").on("click", function () {
+        window.location.href = ctx + '/merchantOrder/dowloadExcel';
+        /*  $("#ExTable").table2excel({
+             exclude  : ".noExl",                                       //过滤位置的 css 类名
+             filename : "Excel" + new Date().getTime(),        //文件名称
+             name: "Excel Document Name.xlsx",
+             exclude_img: true,
+             exclude_links: true,
+             exclude_inputs: true
+         }); */
+    });
+</script>
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantOrder/orderProfitList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantOrder/orderProfitList.jsp
new file mode 100644
index 0000000..6f60763
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantOrder/orderProfitList.jsp
@@ -0,0 +1,404 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp" />
+    <style type="text/css">
+        .layui-table th {
+            text-align: center;
+        }
+    </style>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" action="" style="margin-top: 10px" lay-filter="formCondition">
+                    <div class="row pt10 pb10 whitebg ml0 mr0">
+                        <span class="dlblock w100 textr">订单号：</span>
+                        <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+                        <input type="text" id="orderNumber" placeholder="请输入订单号">
+                    </span>
+                        <span class="dlblock w100 textr">商户名称：</span>
+                        <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+                        <input type="text" id="alias" placeholder="请输入商户名称">
+                    </span>
+                        <span class="dlblock w100 textr">分润人ID：</span>
+                        <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+                        <input type="text" id="userId" placeholder="请输分润人ID">
+                    </span>
+                    </div>
+                </form>
+                <div class="box-flex fw600 pb20 mt20 f18" style="justify-content:space-around;">
+                    <div>交易总额：<span id="five" style="color:#ff5e5f;"></span>元</div>
+                    <div>分润总额：<span id="three" style="color:#ff5e5f;"></span>元</div>
+                </div>
+
+            </div>
+        </div>
+    </div>
+
+    <!-- 表单数据 -->
+    <table class="layui-hide" id="table" lay-filter="table"></table>
+<%--    <!-- 表单数据 -->--%>
+<%--    <div class="mb20 mt10">--%>
+<%--        <div class="whitebg pl10 pr10">--%>
+<%--            <table class="layui-table">--%>
+<%--                <thead>--%>
+<%--                <tr>--%>
+<%--                    <th class="textc">--%>
+<%--                        <div class="checker" id="allCheck">--%>
+<%--                            <span class=""><input type="checkbox" value="" ></span>--%>
+<%--                        </div>--%>
+<%--                    </th>--%>
+<%--                    <th class="textc">序号</th>--%>
+<%--                    <th class="textc noExl">用户ID</th>--%>
+<%--                    <th class="textc ">订单号</th>--%>
+<%--                    <th class="textc ">商户名称</th>--%>
+<%--                    <th class="textc ">订单金额</th>--%>
+<%--                    <th class="textc ">商户费率</th>--%>
+<%--                    <th class="textc ">分润总金额</th>--%>
+<%--                    <th class="textc ">直推/手机号</th>--%>
+<%--                    <th class="textc ">直推分润</th>--%>
+<%--                    <th class="textc ">间推/手机号</th>--%>
+<%--                    <th class="textc ">间推分润</th>--%>
+<%--                    <th class="textc ">二级间推/手机号</th>--%>
+<%--                    <th class="textc ">二级间推分润</th>--%>
+<%--                    <th class="textc ">代理分润</th>--%>
+<%--                    <th class="textc ">升级/手机号</th>--%>
+<%--                    <th class="textc ">升级分润</th>--%>
+<%--                </tr>--%>
+<%--                </thead>--%>
+<%--                <!-- 数据体 -->--%>
+<%--                <tbody id="data_content">--%>
+<%--                </tbody>--%>
+<%--            </table>--%>
+
+<%--            <!-- footer -->--%>
+<%--            <div class="clearfix mb10 pb20">--%>
+<%--                <div class="layui-tab-item fr">--%>
+<%--                    <span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>--%>
+<%--                    <span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>--%>
+<%--                    <div class="pagination dlblock vm" id="pagination"></div>--%>
+<%--                    <span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>--%>
+<%--                </div>--%>
+<%--            </div>--%>
+<%--        </div>--%>
+<%--    </div>--%>
+</div>
+
+<script id="toolBar" type="text/html">
+    <a class="layui-btn layui-btn-sm" lay-event="search">
+        <i class="layui-icon layui-icon-search"></i>查询
+    </a>
+</script>
+</body>
+<%--<script>
+    layui.use(['table', 'layer'], function(){
+        var table = layui.table;
+        var layer = layui.layer;
+    });
+</script>--%>
+<script>
+    var layer;
+    var form;
+    var table;
+    var laydate;
+    var dropdown;
+
+    layui.use(['table', 'layer', 'form'], function() {
+        layer = layui.layer;
+        form = layui.form;
+        table = layui.table;
+
+        table.render({
+            elem: '#table'
+            , id: 'table'
+            , url: ctx + '/merchantOrder/profit/page2' //数据接口
+            , autoSort: false
+            , where: form.val("formCondition")
+            , response: {
+                statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.pageData.total, //解析数据长度
+                    "data": res.data.pageData.records //解析数据列表
+                };
+            }
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , even: true
+            , title: '推广员列表'
+            , page: true //开启分页
+            , toolbar: '#toolBar' //开启工具栏，此处显示默认图标，可以自定义模板，详见文档
+            , defaultToolbar: ['filter']
+            , cols: [[
+                {type: 'checkbox', minWidth: 40, rowspan: 2}
+                , {field: 'userId', title: '用户id', width: 110, align: "left"}
+                , {field: 'orderNumber', title: '订单号', minWidth: 86, align: "left"}
+                , {field: 'merchantName', title: '商户名', minWidth: 86, align: "left"}
+                , {field: 'consumeFee', title: '订单金额', minWidth: 86, align: "left", templet: function(d) {
+                        return d.consumeFee.toFixed(2);
+                    }}
+                , {title: '商户费率', align: "left", width: 86, templet: function(d) {
+                        return (d.mercRate/100)+'%';
+                    }}
+                , {field: 'shareMoney', title: '分润总金额', minWidth: 86, templet: function(d) {
+                        return d.shareMoney.toFixed(4);
+                    }}
+                , {title: '直推/手机号', align: "left", minWidth: 176, templet: function(d) {
+                        return (d.oneName +' / '+ d.onePhone);
+                    }}
+                , {title: '直推分润', minWidth: 86, align: 'left', templet: function(d) {
+                        return (d.oneFee.toFixed(4) === '0.0000'  ? '' : d.oneFee.toFixed(4));
+                    }}
+                , {title: '间推/手机号', minWidth: 176, align: 'left', templet: function(d) {
+                        return (d.twoName + ' / ' + d.twoPhone);
+                    }}
+                , {title: '间推分润', minWidth: 86, align: 'left', templet: function(d) {
+                        return (d.twoFee.toFixed(4) === '0.0000'  ? '' : d.twoFee.toFixed(4));
+                    }}
+                , {title: '二级间推/手机号', minWidth: 176, align: 'left', templet: function(d) {
+                        return (d.threeName + ' / ' + d.threePhone);
+                    }}
+                , {title: '二级间推分润', minWidth: 86, align: 'left', templet: function(d) {
+                        return (d.threeFee.toFixed(4) === '0.0000' ? '' : d.threeFee.toFixed(4));
+                    }}
+                , {title: '代理分润', minWidth: 86, align: 'left', templet: function(d) {
+                        return (d.toAgentFeeCount.toFixed(4) === '0.0000' ? '' : d.toAgentFeeCount.toFixed(4));
+                    }}
+                , {title: '升级/手机号', minWidth: 176, align: 'left', templet: function(d) {
+                        return (d.toUpName + ' / ' + d.toUpName);
+                    }}
+                , {title: '升级分润', minWidth: 86, align: 'left', templet: function(d) {
+                        return (d.toUpFee.toFixed(4) === '0.0000' ? '' : d.toUpFee.toFixed(4));
+                    }}
+            ]]
+            , done: function (res, curr, count) {
+                console.log(res);
+                $("#five").html(res.transAmountCount);
+                $("#three").html(res.shareAmountCount);
+            }
+        });
+
+        table.on('toolbar(table)', function (obj) {
+            switch (obj.event) {
+                case 'search':
+                    queryData();
+                    break;
+            }
+        });
+    });
+
+    //查询
+    function queryData() {
+        table.reload('table', {
+            page: {
+                curr: 1
+            }
+            , where: form.val("formCondition")
+        });
+    }
+
+    var pageIndex=1;
+    $(document).ready(function(){
+        //调用查询
+        pageIndex = StringUtil.getQueryString('pageIndex');
+        if(pageIndex==undefined||pageIndex==null){
+            pageIndex=1;
+        }
+        // queryProfitOrderList(pageIndex);
+        //绑定hover操作
+        $(document).on('mouseenter','.listOperaters',function(){
+            $(this).children(".ops_itemDiv").show();
+            var width=15;
+            $(this).children('div').find('li').each(function(){
+                //获取li宽度
+                width+=$(this).width();
+            });
+            $(this).children('div').width(width);
+        })
+        $(document).on('mouseleave','.listOperaters',function(){
+            $(this).children(".ops_itemDiv").hide();
+        });
+
+
+        //行选中事件
+        $("#allCheck").find("span").click(function() {
+            $(this).toggleClass('checked');
+            if($(this).hasClass('checked')){
+                //所有列选中
+                $(".checker").find("span").each(function () {
+                    $(this).addClass("checked");
+                })
+            }else{
+                //所有列取消选中
+                $(".checker").find("span").each(function () {
+                    $(this).removeClass("checked");
+                })
+            }
+        });
+
+        //单个选中
+        $(document).on('click','.checkeBox span',function() {
+            $(this).toggleClass('checked');
+            //设置头部事件
+            var length=$('.checkeBox span').length;
+            var count=0;
+            $(".checkeBox").find("span").each(function () {
+                if($(this).hasClass("checked")){
+                    count++;
+                }
+            })
+            //全选
+            if(count==length){
+                $("#allCheck").find("span").addClass('checked');
+            }else{
+                $("#allCheck").find("span").removeClass('checked');
+            }
+        })
+        //左右div高度相等
+        var left_content_height = $(".right-content").height();
+        $(".left-content").height(left_content_height+35);
+        var sub_left_height=$(".res-menu").height(left_content_height-60);
+    });
+
+    //查询
+    function queryProfitOrderList(index){
+        if(typeof(index)=='undefined'){
+            index=1;
+        }
+        var url= ctx +'/merchantOrder/profit/page';
+        $.ajax({
+            url:url,
+            type:"post",
+            dataType:"json",
+            data:{
+                "currPage":index,
+                "orderNumber":$("#orderNumber").val(),
+                "alias":$("#alias").val(),
+                "userId":$("#userId").val(),
+            },
+            success:function(result){
+                var presentPage = result.currPage;
+                //渲染数据
+                $('#data_content').empty();
+                $.each(result.orderProfitList,function(i){
+                    var index = (presentPage-1)*12+i+1;
+                    var orderProfit=result.orderProfitList[i];
+                    var data='';
+                    data+='<tr class="odd">';
+                    data+='<td class="textc">';
+                    data+='		 <div class="checker checkeBox">';
+                    data+='		 <span class="" "><input type="checkbox"  value=""></span>';
+                    data+='		</div>';
+                    data+='</td>';
+                    data+='<td class="textc">'+index+'</td>';
+                    data+='<td class="textc">'+orderProfit.userId+'</td>';
+                    data+='<td class="textc">'+orderProfit.orderNumber+'</td>';
+                    data+='<td class="textc">'+orderProfit.merchantName+'</td>';
+                    data+='<td class="textc">'+orderProfit.consumeFee.toFixed(2)+'</td>';
+                    data+='<td class="textc">'+(orderProfit.mercRate/100)+'%</td>';
+                    data+='<td class="textc">'+orderProfit.shareMoney.toFixed(4)+'</td>';
+
+                    data+='<td class="textc">'+(orderProfit.oneName +'<br/>'+ orderProfit.onePhone)+'</td>';
+                    data+='<td class="textc">'+(orderProfit.oneFee.toFixed(4) === '0.0000'  ? '' : orderProfit.oneFee.toFixed(4))+'</td>';
+
+                    data += '<td class="textc">' + (orderProfit.twoName + '<br/>' + orderProfit.twoPhone) + '</td>';
+                    data += '<td class="textc">' + (orderProfit.twoFee.toFixed(4) === '0.0000' ? '' : orderProfit.twoFee.toFixed(4)) + '</td>';
+                    data += '<td class="textc">' + (orderProfit.threeName + '<br/>' + orderProfit.threePhone) + '</td>';
+                    data += '<td class="textc">' + (orderProfit.threeFee.toFixed(4) === '0.0000' ? '' : orderProfit.threeFee.toFixed(4)) + '</td>';
+                    data += '<td class="textc">' + (orderProfit.toAgentFeeCount.toFixed(4) === '0.0000' ? '' : orderProfit.toAgentFeeCount.toFixed(4)) + '</td>';
+                    data += '<td class="textc">' + (orderProfit.toUpName + '<br/>' + orderProfit.toUpName) + '</td>';
+                    data += '<td class="textc">' + (orderProfit.toUpFee.toFixed(4) === '0.0000' ? '' : orderProfit.toUpFee.toFixed(4)) + '</td>';
+                    data+='</tr>';
+                    $('#data_content').append(data);
+                });
+                //分页
+                if(result.shareAmountCount != null){
+                    $("#five").html(result.transAmountCount);
+                }
+                if(result.transAmountCount != null){
+                    $("#three").html(result.shareAmountCount);
+                }
+                $('#pageCount').html(result.pageCount);
+                $('#currPage').html(result.currPage);
+                $('#totalCount').html(result.count);
+                //设置分页
+                pageIndex=result.currPage;
+                $('#pagination').pagination({
+                    pageCount: result.pageCount,
+                    jump: true,
+                    coping: true,
+                    jump: true,
+                    homePage: '首页',
+                    endPage: '末页',
+                    prevContent: '上页',
+                    nextContent: '下页',
+                    current:result.currPage,
+                    callback:function(api){
+                        pageIndex=api.getCurrent();
+                        queryProfitOrderList(api.getCurrent());
+                    }
+                });
+            }
+        });
+        //表头列不选中
+        $("#allCheck").find("span").removeClass('checked');
+    }
+    function hidePictureWindow(){
+        $('#picture').empty();
+        $('#pictureWindow').hide();
+    }
+
+    function dateFtt(fmt,date)
+    { //author: meizz
+        var o = {
+            "M+" : date.getMonth()+1,                 //月份
+            "d+" : date.getDate(),                    //日
+            "h+" : date.getHours(),                   //小时
+            "m+" : date.getMinutes(),                 //分
+            "s+" : date.getSeconds(),                 //秒
+            "q+" : Math.floor((date.getMonth()+3)/3), //季度
+            "S"  : date.getMilliseconds()             //毫秒
+        };
+        if(/(y+)/.test(fmt))
+            fmt=fmt.replace(RegExp.$1, (date.getFullYear()+"").substr(4 - RegExp.$1.length));
+        for(var k in o)
+            if(new RegExp("("+ k +")").test(fmt))
+                fmt = fmt.replace(RegExp.$1, (RegExp.$1.length==1) ? (o[k]) : (("00"+ o[k]).substr((""+ o[k]).length)));
+        return fmt;
+    }
+</script>
+
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantOrder/orderRefund.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantOrder/orderRefund.jsp
new file mode 100644
index 0000000..a235cb3
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantOrder/orderRefund.jsp
@@ -0,0 +1,220 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+    <link rel="stylesheet" type="text/css" href="http://cdn.bootcss.com/font-awesome/4.6.0/css/font-awesome.min.css">
+    <script type="text/javascript">
+        require("js/merchantOrder/orderRefund.js");
+        requireCss("css/ySelect.css");
+    </script>
+    <%--<script type="text/javascript" src="https://files.cnblogs.com/files/liuchenxing/jquery.table2excel.js"></script>--%>
+    <style type="text/css">
+        .layui-table th {
+            text-align: center;
+        }
+    </style>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+<%--                    onclick="queryMerchantOrder()"--%>
+                    <div class="buttons fl">
+                        <a class="layui-btn layui-btn-sm fa fa-search f13"  href="javascript:void(0);"
+                           onclick="queryMerchantOrder()"><span>搜索</span></a>
+                        <!-- <a class="btn btn-primary fa fa-plus f13 add" href="javascript:void(0);" onclick="initAddMerchantOrder()"><span>添加</span></a>
+                        <a class="btn btn-primary fa fa-edit f13" href="javascript:void(0);" onclick="initEditMerchantOrder()"><span>编辑</span></a>
+                        <a class="btn btn-primary fa fa-remove f13 delete" href="javascript:void(0);" onclick="initBatchDeleteMerchantOrder()"><span>删除</span></a>-->
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+
+                <form class="layui-form" action="" style="margin-top: 10px">
+                    <%--                    <div class="row pt10 pb10 whitebg ml0 mr0">--%>
+                    <!-- <span class="dlblock w100 textr">订单号：</span>
+                    <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+                        <input type="text" placeholder="请输入内容" id="orderNumber">
+                    </span>  -->
+                    <!-- <span class="dlblock w100 textr">支付方式：</span>
+                    <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+                        <input type="text" placeholder="请输入内容" id="payTypeCodeList">
+                    </span>  -->
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">行业类型：</label>
+                            <div class="layui-input-inline">
+                                <select name="orderType" id="orderType">
+                                    <option value="">请选择支付方式</option>
+                                    <option value="1">主扫</option>
+                                    <option value="2">被扫</option>
+                                    <option value="3">会员充值</option>
+                                    <option value="4">POS</option>
+                                </select>
+                            </div>
+                        </div>
+                        <%--                        <span class="dlblock w100 textr">订单类型：</span>--%>
+                        <%--                        <select class="bdc pt6 pb6 pl6 pr5 w180 dlblock" style="width: 193px" id="orderType">--%>
+                        <%--                            <option value="">请选择支付方式</option>--%>
+                        <%--                            <option value="1">主扫</option>--%>
+                        <%--                            <option value="2">被扫</option>--%>
+                        <%--                            <option value="3">会员充值</option>--%>
+                        <%--                            <option value="4">POS</option>--%>
+                        <%--                        </select>--%>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">时间：</label>
+                            <div class="layui-input-inline">
+                                <select name="timeStatus" id="timeStatus">
+                                    <option value="">请选择</option>
+                                    <option value="1">今天</option>
+                                    <option value="2">昨天</option>
+                                    <option value="3">一个星期</option>
+                                    <option value="4">近一个月</option>
+                                    <option value="5">近三个月</option>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">支付方式：</label>
+                            <div class="layui-input-inline">
+                                <select name="payTypeCodeList" id="payTypeCodeList" multiple="multiple">
+                                    <option value="">请选择</option>
+                                    <option value="wechatPay">微信</option>
+                                    <option value="aliPay">支付宝</option>
+                                    <option value="leshuaPay0">乐刷支付宝支付</option>
+                                    <option value="leshuaPay1">乐刷微信支付</option>
+                                    <option value="leshuaPay2">乐刷刷卡支付</option>
+                                </select>
+                            </div>
+                        </div>
+                        <button type="button" id="gofile1"
+                                style="right: 30px;padding: 5px;bottom: 0px;background-color: #ff5e5f;color: #fff;border-radius: 8px;">
+                            批量导出
+                        </button>
+                    </div>
+                        <%--						<span class="dlblock w100 textr">支付方式：</span>--%>
+                        <%--						<select class="form-control f12 w180 textc payTypeCodeList" id="payTypeCodeList"--%>
+                        <%--								multiple="multiple">--%>
+                        <%--							<option value="wechatPay">微信</option>--%>
+                        <%--							<option value="aliPay">支付宝</option>--%>
+                        <%--							<option value="leshuaPay0">乐刷支付宝支付</option>--%>
+                        <%--							<option value="leshuaPay1">乐刷微信支付</option>--%>
+                        <%--							<option value="leshuaPay2">乐刷刷卡支付</option>--%>
+                        <%--						</select>--%>
+                        <%--                        <span class="dlblock w100 textr">时间：</span>--%>
+                        <%--                        <select class="bdc pt6 pb6 pl6 pr5 w180 dlblock" style="width: 193px" id="timeStatus">--%>
+                        <%--                            <option value="">请选择</option>--%>
+                        <%--                            <option value="1">今天</option>--%>
+                        <%--                            <option value="2">昨天</option>--%>
+                        <%--                            <option value="3">一个星期</option>--%>
+                        <%--                            <option value="4">近一个月</option>--%>
+                        <%--                            <option value="5">近三个月</option>--%>
+                        <%--                        </select>--%>
+
+                        <%--  <span class="dlblock w100 textr">员工：</span>
+                         <select class="form-control f12 w180 textc staffCodeList" id="staffCodeList" multiple="multiple">
+                            <option value="">请选择</option>
+                            <c:forEach items="${userAppList }" var="ua">
+                            <option value="${ua.userId }">${ua.userName }</option>
+                            </c:forEach>
+                        </select> --%>
+
+                        <%--  <span class="dlblock w100 textr">门店：</span>
+                        <select class="form-control f12 w180 textc storeIdList" id="storeIdList" multiple="multiple">
+                             <option value="">请选择</option>
+                             <c:forEach items="${merchantStoreList }" var="ms">
+                             <option value="${ms.storeId }">${ms.storeName }</option>
+                             </c:forEach>
+                         </select> --%>
+                        <!-- <input type="text" id="storeIdList" placeholder="请输入内容"/> -->
+                </form>
+            </div>
+        </div>
+    </div>
+    <!-- 表单数据 -->
+    <div class="mb20 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-table" id="ExTable">
+                <thead>
+                <tr>
+                    <th class="textc">
+                        <div class="checker" id="allCheck">
+                            <span class=""><input type="checkbox" value=""></span>
+                        </div>
+                    </th>
+                    <th class="textc">序号</th>
+                    <th class="textc noExl">id</th>
+                    <th class="textc ">订单号</th>
+                    <th class="textc ">交易流水号</th>
+                    <!-- <th class="textc ">merchantCode</th> -->
+                    <th class="textc ">商户简称</th>
+                    <th class="textc ">类型</th>
+                    <!-- <th class="textc wp15">payTypeCode</th> -->
+                    <th class="textc ">支付方式名称</th>
+                    <th class="textc ">消费金额</th>
+                    <!-- <th class="textc wp15">memberCode</th> -->
+                    <!-- <th class="textc ">storeId</th> -->
+                    <th class="textc ">交易时间</th>
+                    <!-- <th class="textc wp15">staffCode</th> -->
+                    <th class="textc ">交易状态</th>
+                    <!--  <th class="textc noExl">操作</th>  -->
+                </tr>
+                </thead>
+                <!-- 数据体 -->
+                <tbody id="data_content">
+                </tbody>
+            </table>
+
+            <!-- footer -->
+            <div class="clearfix mb10 pb20">
+                <div class="layui-tab-item fr">
+                    <span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+                    <span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>
+                    <div class="pagination dlblock vm" id="pagination"></div>
+                    <span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>
+                </div>
+            </div>
+            <input type="hidden" id="staffTypeSession" value="${sessionScope.staffTypeSession }">
+        </div>
+    </div>
+</div>
+</body>
+<script type="text/javascript">
+    //form表单样式
+    layui.use(['layer', 'form', 'table'], function () {
+        var layer = layui.layer;
+        var form = layui.form;
+        var table = layui.table;
+        form.render();
+    });
+    $('.payTypeCodeList').ySelect();
+    $('.storeIdList').ySelect();
+    $('.staffCodeList').ySelect();
+    $("#gofile1").on("click", function () {
+        window.location.href = ctx + '/merchantOrder/dowOrderRefundExcel';
+    });
+</script>
+
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantOrder/summaryOfWater.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantOrder/summaryOfWater.jsp
new file mode 100644
index 0000000..9077b8b
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantOrder/summaryOfWater.jsp
@@ -0,0 +1,117 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+    pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black">
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->
+<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+<link rel="stylesheet" type="text/css" href="http://cdn.bootcss.com/font-awesome/4.6.0/css/font-awesome.min.css">
+<jsp:include page="../../common.jsp" />
+<script type="text/javascript">
+     require("js/merchantOrder/summaryOfWater.js");
+     requireCss("css/ySelect.css");
+</script>
+</head>
+<body>
+    <div class="row animated fadeInRight" style="margin: 0;">
+        <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+            <div class="toolbar-panel bdd">
+                <div class="toolbar-box">
+                    <div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+                        <!-- 顶部按钮 -->
+                        <div class="buttons fl">
+                            <a class="btn btn-primary fa fa-search f13" href="javascript:void(0);" onclick="queryMerchantOrder()"><span>搜索</span></a>
+                        </div>
+                        <div class="tools fr">
+                            <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5"> 
+                                <i class="fa-2x fa fa-angle-double-up"></i>
+                            </a>
+                        </div>
+                    </div>
+                </div>
+
+                <!--搜索条件 -->
+                <div class="toolbar-body">
+                    <div class="row pt10 pb10 whitebg ml0 mr0">
+                        <!-- <span class="dlblock w100 textr">订单号：</span> 
+                        <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+                            <input type="text" placeholder="请输入内容" id="orderNumber">  
+                        </span>  -->
+                        <!-- <span class="dlblock w100 textr">支付方式：</span> 
+                        <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+                            <input type="text" placeholder="请输入内容" id="payTypeCodeList">  
+                        </span>  -->
+                        
+                        <span class="dlblock w100 textr">支付方式：</span>
+                         <select class="form-control f12 w180 textc payTypeCodeList" id="payTypeCodeList" multiple="multiple">
+                            <option value="wechat">微信</option>
+                            <option value="alipay">支付宝</option>
+                            <option value="bank">银联</option>
+                        </select>
+                        
+                         <span class="dlblock w100 textr">员工：</span>
+                         <select class="form-control f12 w180 textc staffCodeList" id="staffCodeList" multiple="multiple">
+                            <option value="">请选择</option>
+                            <c:forEach items="${userAppList }" var="ua">
+                            <option value="${ua.userId }">${ua.userName }</option>
+                            </c:forEach>
+                        </select>
+                        
+                        <span class="dlblock w100 textr">门店：</span>
+                         <select class="form-control f12 w180 textc storeIdList" id="storeIdList" multiple="multiple">
+                            <option value="">请选择</option>
+                            <c:forEach items="${merchantStoreList }" var="ms">
+                            <option value="${ms.storeId }">${ms.storeName }</option>
+                            </c:forEach>
+                        </select>
+                        <span class="dlblock w100 textr">时间：</span>
+                         <select class="form-control f12 w180 textc timeStatus" id="timeStatus">
+                            <option value="">请选择</option>
+                            <option value="1">今天</option>
+                            <option value="2">昨天</option>
+                            <option value="3">一个星期</option>
+                            <option value="4">近一个月</option>
+                            <option value="5">近三个月</option>
+                        </select>
+                    </div>
+                </div>
+               
+                
+            </div>
+        </div>
+        <!-- 表单数据 -->
+        <div class="mb20 mt10">
+            <div class="whitebg pl10 pr10">
+                <table class="table table-striped table-bordered table-hover" >
+                    <thead>
+                        <tr>
+                            <th class="textc ">交易笔数</th>
+                            <th class="textc ">交易总额</th>
+                            <th class="textc ">退款笔数</th>
+                            <th class="textc ">净退款</th>
+                        </tr>
+                    </thead>
+                    <!-- 数据体 -->
+                    <tbody id="data_content">
+                    </tbody>
+                </table>
+            <input type="hidden" value="${merchantCode }" id="merchantCode">
+            </div>
+        </div>
+    </div>
+</body>
+<script type="text/javascript">
+	$('.payTypeCodeList').ySelect();
+	$('.storeIdList').ySelect();
+	$('.staffCodeList').ySelect();
+</script>
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantPlugin/detail.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantPlugin/detail.jsp
new file mode 100644
index 0000000..17c7f5b
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantPlugin/detail.jsp
@@ -0,0 +1,94 @@
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<!DOCTYPE HTML>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+    <link rel="stylesheet" type="text/css" href="${ctx}/page/umeditor/themes/default/css/umeditor.css">
+</head>
+<body>
+<form class="layui-form" action="" style="width: 80%; margin-top: 20px">
+    <input name="id" value="${merchantPlugin.id}" hidden/>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">用户Id</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="userId" value="${merchantPlugin.userId}" disabled class="layui-input"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">pos商编</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="posMerId" value="${merchantPlugin.posMerId}" disabled class="layui-input"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">终端编号</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="termList" value="${merchantPlugin.termList}" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button class="layui-btn" lay-submit lay-filter="formDemo">立即提交</button>
+            <button type="button" id="close" class="layui-btn layui-btn-primary">关闭</button>
+        </div>
+    </div>
+</form>
+
+<script>
+    //Demo
+    layui.use(['form','layer'], function () {
+        var form = layui.form;
+        var layer = layui.layer;
+
+        $('#close').click(function () {
+            parent.layer.closeAll();
+        });
+
+        //监听提交
+        form.on('submit(formDemo)', function (data) {
+            var index = layer.load(1, {shade: [0.1, '#000']});
+            $.ajax({
+                url: '${ctx}/merchantPlugin/updatePlugin',
+                method: 'post',
+                data: JSON.stringify(data.field),
+                dataType: 'JSON',
+                contentType: "application/json",
+                success: function (res) {
+                    layer.close(index);
+                    if (res.code == 200) {
+                        layer.alert(res.message, function () {
+                            parent.location.reload();
+                        })
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 5
+                        });
+                    }
+                }
+            })
+            return false;
+        });
+    });
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantPlugin/merchantPluginList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantPlugin/merchantPluginList.jsp
new file mode 100644
index 0000000..e1037ca
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantPlugin/merchantPluginList.jsp
@@ -0,0 +1,176 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form action="${ctx}/bestNewActivity/page" method="get" id="condition" style="margin-top: 10px">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">用户ID</label>
+                            <div class="layui-input-inline">
+                                <input type="text" placeholder="请输入用户ID" id="userId" name="userId" class="layui-input">
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <div class="mb50 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-hide" id="merchantPluginList" lay-filter="merchantPluginList"></table>
+        </div>
+    </div>
+</div>
+
+<script type="text/html" id="toolbarDemo">
+    <div class="layui-btn-container">
+        <button class="layui-btn layui-btn-sm" lay-event="search">查询</button>
+    </div>
+</script>
+
+<script type="text/html" id="barDemo">
+    <a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>
+</script>
+
+<script>
+    layui.use(['table', 'layer'], function () {
+        var table = layui.table;
+        var layer = layui.layer;
+
+        var tableIns = table.render({
+            elem: '#merchantPluginList'
+            , url: '${ctx}/merchantPlugin/page'
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.count, //解析数据长度
+                    "data": res.merchantPluginList //解析数据列表
+                };
+            }
+            , toolbar: '#toolbarDemo' //开启头部工具栏，并为其绑定左侧模板
+            , defaultToolbar: ['filter', 'exports', 'print', { //自定义头部工具栏右侧图标。如无需自定义，去除该参数即可
+                title: '提示'
+                , layEvent: 'LAYTABLE_TIPS'
+                , icon: 'layui-icon-tips'
+            }]
+            , title: '插件配置表'
+            , cols: [[
+                {type: 'checkbox', hidden: true}
+                , {field: 'numbers', title: '序号', width: 80, sort: true, type: 'numbers'}
+                , {field: 'userId', title: '用户ID'}
+                , {field: 'posMerId', title: 'pos商编'}
+                , {field: 'termList', title: '终端编号'}
+                , {
+                    field: 'createTime', title: '创建时间', sort: true, width: 160,
+                    templet: "<div>{{layui.util.toDateString(d.createTime, 'yyyy-MM-dd HH:mm:ss')}}</div>"
+                }
+                , {
+                    field: 'updateTime', title: '修改时间', sort: true,
+                    templet: "<div>{{layui.util.toDateString(d.updateTime, 'yyyy-MM-dd HH:mm:ss')}}</div>"
+                }
+                , {fixed: 'right', title: '操作', toolbar: '#barDemo'}
+            ]]
+            , request: {
+                pageName: 'currPage' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , page: true
+            , done: function () {
+                $("[data-field='forceUpdate']").children().each(function () {
+                    if ($(this).text() == '0') {
+                        $(this).text('否');
+                    } else if ($(this).text() == '1') {
+                        $(this).text('是');
+                    }
+                });
+            }
+        });
+
+        //头工具栏事件
+        table.on('toolbar(merchantPluginList)', function (obj) {
+            switch (obj.event) {
+                case 'add':
+                    // 添加
+                    toAdd();
+                    break;
+                case 'search':
+                    // 查询
+                    tableIns.reload({
+                        where: { //设定异步数据接口的额外参数，任意设
+                            userId: $("#userId").val()
+                        }
+                        , page: {
+                            curr: 1 //重新从第 1 页开始
+                        }
+                    });
+                    break;
+            }
+        });
+
+        //监听行工具事件
+        table.on('tool(merchantPluginList)', function (obj) {
+            var data = obj.data;
+            //console.log(obj)
+            if (obj.event === 'del') {
+                layer.confirm('真的删除行么?', function (index) {
+                    obj.del(data);
+                    layer.close(index);
+                    del(obj);
+                });
+            } else if (obj.event === 'edit') {
+                toAdd(obj.data);
+            }
+        });
+
+        function toAdd(obj) {
+            url = "${ctx}/merchantPlugin/detail/" + obj.id
+            var index = layer.open({
+                type: 2
+                , shade: 0.5
+                , maxmin: true
+                , content: url
+                , area: ['550px', '500px']
+            });
+        }
+    });
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantProfit/list.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantProfit/list.jsp
new file mode 100644
index 0000000..8f0d393
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantProfit/list.jsp
@@ -0,0 +1,200 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" id="form1" action="" style="margin-top: 10px;">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">用户ID</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="userId" id="userId" placeholder="分润用户ID"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">订单号</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="orderNumber" id="orderNumber" placeholder="订单号"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">分润日期</label>
+                            <div class="layui-input-inline">
+                                <input type="text" placeholder="分润日期" id="date1" name="recordDate" readonly autocomplete="off"
+                                       class="layui-input">
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <div class="box-flex  fw600 f18" style="justify-content:space-around;padding: 1rem;align-items: center;">
+        <div>分润总额：<span id="shareAmountCount" style="color:#ff5e5f;"></span>元</div>
+        <div>直推分润：<span id="diretAmountCount" style="color:#ff5e5f;"></span>元</div>
+        <div>团队分润：<span id="teamAmountCount" style="color:#ff5e5f;"></span>元</div>
+    </div>
+    <div class="mb50 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-hide" id="merchantProfitTab" lay-filter="merchantProfitTab"></table>
+        </div>
+    </div>
+</div>
+<script type="text/html" id="leftBar">
+    <a class="layui-btn layui-btn-sm" lay-event="search">
+        <i class="layui-icon layui-icon-search"></i>查询
+    </a>
+</script>
+
+<script type="text/html" id="toolBar">
+    <a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="detail">
+        <i class="layui-icon layui-icon-delete"></i>详情
+    </a>
+</script>
+
+<script>
+    layui.use(['table', 'layer','laydate'], function () {
+        var table = layui.table;
+        var layer = layui.layer;
+        let laydate = layui.laydate;
+        laydate.render({
+            elem: '#date1',
+            format: 'yyyy-MM-dd',
+            value:new Date(),
+            isInitValue:true
+        });
+        var tableIns = table.render({
+            elem: '#merchantProfitTab'
+            , url: '${ctx}/merchantProfit/page'
+            , id: 'merchantProfit'
+            , where: {
+                recordDate: $("#date1").val()
+            }
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            , toolbar: '#leftBar' //开启头部工具栏，并为其绑定左侧模板
+            , defaultToolbar: ['filter']
+            , defaultToolbar: ['filter', 'exports', 'print', { //自定义头部工具栏右侧图标。如无需自定义，去除该参数即可
+                title: '提示'
+                , layEvent: 'LAYTABLE_TIPS'
+                , icon: 'layui-icon-tips'
+            }]
+            , title: '商户订单分润表'
+            , cols: [[
+                {type: 'checkbox', fixed: 'left', hidden: true}
+                , {field: 'numbers', title: '序号', fixed: 'left', unresize: true, width: 80, type: 'numbers'}
+                , {field: 'userId', title: '用户ID', width: 90}
+                , {field: 'type', title: '分润类型', width: 90,templet: function (d){
+                    if(d.type == 1){
+                        return "直推分润";
+                    }
+                    return "团队分润";
+                }}
+                , {field: 'merchantName', title: '商户名称'}
+                , {field: 'orderNumber', title: '订单号'}
+                , {field: 'consumeFee', title: '交易金额(元)', width: 110,templet:function (d){
+                        return d.consumeFee.toFixed(2);
+                    }}
+                , {field: 'price', title: '分润金额(元)', width: 110}
+                , {field: 'profitRate', title: '分润比例%', width: 100,templet: function (d){
+                    if(d.profitRate == 0){
+                        return "0";
+                    }
+                    return d.profitRate/100 + "%";
+                  }}
+                , {
+                    field: 'createDt',
+                    title: '分润时间',
+                    templet: "<div>{{layui.util.toDateString(d.createDt,'yyyy-MM-dd HH:mm')}}</div>"
+                }
+            ]]
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , page: true
+        });
+
+        //监听头工具栏事件
+        table.on('toolbar(merchantProfitTab)', function (obj) {
+            switch (obj.event) {
+                case 'search':
+                    var params = serialize($('#form1'));
+                    table.reload('merchantProfit', {
+                        where: params
+                        , page: {
+                            size: 10
+                            , current: 1
+                        }
+                    });
+                    if(!params["userId"] && !params["orderNumber"] && !params["recordDate"]){
+                        clearCountData();
+                    }else{
+                        initCountData(params);
+                    }
+                    break;
+            }
+        });
+        function initCountData(params){
+            let url = ctx + "/merchantProfit/countData";
+            $.get(url,{userId:params["userId"],orderNumber:params["orderNumber"],recordDate:params["recordDate"]},function (res){
+                if(res.code == 200 && res.data != null){
+                    $("#shareAmountCount").html(res.data.shareAmountCount);
+                    $("#diretAmountCount").html(res.data.diretAmountCount);
+                    $("#teamAmountCount").html(res.data.teamAmountCount);
+                }
+            })
+        }
+        function clearCountData(){
+            $("#shareAmountCount").html("");
+            $("#diretAmountCount").html("");
+            $("#teamAmountCount").html("");
+        }
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantProfit/merchantProfitBaseInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantProfit/merchantProfitBaseInfo.jsp
new file mode 100644
index 0000000..23c73d0
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantProfit/merchantProfitBaseInfo.jsp
@@ -0,0 +1,75 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">  
+	<div class="tab-pane active">     
+		<div class="panel-body">
+			<div class="wrapper wrapper-content">
+				<div class="panel-form animated fadeInRight wp60 fc">
+					<div class="layui-form-item dn	has-error" >   
+						<label class="layui-form-label">id</label>  
+						<div class="layui-input-block">
+							<input type="text" name="id" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantProfit.id }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">userId</label>  
+						<div class="layui-input-block">
+							<input type="text" name="userId" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantProfit.userId }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">type</label>  
+						<div class="layui-input-block">
+							<input type="text" name="type" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantProfit.type }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">price</label>  
+						<div class="layui-input-block">
+							<input type="text" name="price" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantProfit.price }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">orderNumber</label>  
+						<div class="layui-input-block">
+							<input type="text" name="orderNumber" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantProfit.orderNumber }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">merchantCode</label>  
+						<div class="layui-input-block">
+							<input type="text" name="merchantCode" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantProfit.merchantCode }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">merchantName</label>  
+						<div class="layui-input-block">
+							<input type="text" name="merchantName" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantProfit.merchantName }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">consumeFee</label>  
+						<div class="layui-input-block">
+							<input type="text" name="consumeFee" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantProfit.consumeFee }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">createDt</label>  
+						<div class="layui-input-block">
+							<input type="text" name="createDt" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantProfit.createDt }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">orderDt</label>  
+						<div class="layui-input-block">
+							<input type="text" name="orderDt" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantProfit.orderDt }" >
+						</div>  
+					</div>
+	
+				</div>
+			</div>
+		</div>  
+	</div>
+</form>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantProfit/merchantProfitDetails.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantProfit/merchantProfitDetails.jsp
new file mode 100644
index 0000000..0775de6
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantProfit/merchantProfitDetails.jsp
@@ -0,0 +1,54 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>     
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">                      
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black"> 
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> 
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->                                     
+<meta name="viewport"
+	content="width=device-width, initial-scale=1.0, maximum-scale=1.0">   
+<jsp:include page="../../common.jsp" />
+<script type="text/javascript">
+    require("js/merchantProfit/merchantProfitDetails.js");
+</script>
+<title>编辑</title>
+</head>                                 
+	<body class="lgraybg">            
+		<div class="	container-fluid animated fadeInRight col-sm-12">
+			<div class="panel-toolbar mt10 mb10 pt5 pb5 pl10 bdd whitebg">
+				<div class="buttons">
+					<a href="javascript:void(0);" class="btn btn-primary fa fa-save f12"><span>保存</span></a>
+					<a href="${ctx }/merchantProfit/index?pageIndex=${pageIndex}"  class="btn btn-primary fa fa-back f12" id="goback"><span>返回</span></a>
+				</div>
+			</div>
+				<div class="tabs-container whitebg">
+					<div class="pt10 pl5 pr5">
+						<ul class="nav nav-tabs" id="nav-tabs">
+							<li class="active" data-action="base">   
+								<a href="javascript:void(0);" >基本资料</a>
+							</li>
+							<li class="" data-action="functions">
+								<a href="javascript:void(0);"  >多功能输入</a>
+							</li>
+							<li class="" data-action="extends">
+								<a href="javascript:void(0);" >扩展属性</a>
+							</li>
+						</ul>
+						<div class="tab-content pt30 p30">               
+		
+						</div>     
+					</div>
+				</div>    
+		</div>
+		<!-- 隐藏域 -->
+		<input type="hidden" id="merchantProfitId" value="${merchantProfit.id }"/>
+	</body>
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantProfit/merchantProfitExtendsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantProfit/merchantProfitExtendsInfo.jsp
new file mode 100644
index 0000000..592687a
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantProfit/merchantProfitExtendsInfo.jsp
@@ -0,0 +1,201 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>           
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> 
+<div class="tab-pane active">      
+	<div class="animated fadeInRight">
+		<div class="whitebg pl10 pr10">
+			<table class="table table-striped table-bordered table-hover">     
+				<thead> 
+					<tr>  
+						<th class="textc">序号</th>         
+						<th class="textc wp15">流水账号</th>
+						<th class="textc">日期</th>         
+						<th class="textc">财务类别</th>     
+						<th class="textc">金额</th>         
+						<th class="textc">银行</th>         
+						<th class="textc">发票</th>         
+						<th class="textc">客户名称</th>     
+						<th class="textc wp15">单号</th>    
+						<th class="textc">状态</th>         
+						<th class="textc">类别</th>         
+						<th class="textc">操作</th>         
+					</tr> 
+				</thead>
+				<tbody> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+                
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="green">支出</span></td>     
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+				</tbody>
+                
+			</table>  
+			<!-- footer -->  
+			<div class="clearfix mb10 pb20">          
+					<div class="layui-tab-item fr">       
+							<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+							<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>   
+							<div class="pagination dlblock vm" id="pagination"></div>
+							<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>            
+					</div>
+				</div>  
+		</div>      
+	</div>        
+</div>          
+                
+<script type="text/javascript">    
+//分页          
+$('#pagination').pagination({        
+	pageCount: 50,
+	jump: true,   
+	coping: true, 
+	homePage: '首页',    
+	endPage: '末页',     
+	prevContent: '上页', 
+	nextContent: '下页', 
+	callback: function(api) {          
+		$('.now').text(api.getCurrent());
+	}             
+});             
+</script>       
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantProfit/merchantProfitFunctionsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantProfit/merchantProfitFunctionsInfo.jsp
new file mode 100644
index 0000000..982ce84
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantProfit/merchantProfitFunctionsInfo.jsp
@@ -0,0 +1,130 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>		
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">      
+<div class="tab-pane active">
+				<div class="panel-body">
+					<div class="wrapper wrapper-content">     
+						<div class="panel-form animated fadeInRight wp60 fc">
+							<!-- 账号资料 -->
+			<div class="layui-form-item 	has-error">
+				<label class="layui-form-label">单行输入框<i class="red">*</i></label>
+				<div class="layui-input-block">
+					<input type="text" name="title" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input">
+				</div>                                         
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">自定义验证</label>
+				<div class="layui-input-inline ml30">
+					<input type="password" name="password" lay-verify="pass" placeholder="请输入密码" autocomplete="off" class="layui-input">
+				</div>
+				<div class="layui-form-mid layui-word-aux">请填写6到12位密码</div>
+			</div>
+			<div class="form-group">
+				<div class="layui-form-item">          
+					<label class="layui-form-label">单行选择框</label>
+					<div class="layui-input-block">
+						<select name="interest" lay-filter="aihao">  
+							<option value=""></option>
+							<option value="0">写作</option>         
+							<option value="1" selected="">阅读</option>
+							<option value="2">游戏</option>
+							<option value="3">音乐</option>
+							<option value="4">旅行</option>  
+						</select>              
+					</div>
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<div class="layui-inline">  
+					<label class="layui-form-label">范围</label>
+					<div class="layui-input-inline ml30">
+						<input type="text" name="price_min" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>                                     
+					<div class="layui-form-mid">-</div>
+					<div class="layui-input-inline">       
+						<input type="text" name="price_max" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>
+				</div>           
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">联动选择框</label>
+				<div class="layui-input-inline ml30">
+					<select name="quiz1">     
+						<option value="">请选择省</option>
+						<option value="浙江" selected="">浙江省</option> 
+						<option value="你的工号">江西省</option>           
+						<option value="你最喜欢的老师">福建省</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz2">
+						<option value="">请选择市</option>
+						<option value="杭州">杭州</option>
+						<option value="宁波" disabled="">宁波</option>
+						<option value="温州">温州</option>
+						<option value="温州">台州</option>
+						<option value="温州">绍兴</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz3">
+						<option value="">请选择县/区</option>
+						<option value="西湖区">西湖区</option>
+						<option value="余杭区">余杭区</option>
+						<option value="拱墅区">临安市</option>
+					</select>
+				</div>    
+			</div>
+			<div class="layui-form-item" pane="">   
+				<label class="layui-form-label">原始复选框</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="like1[write]" lay-skin="primary" title="写作" checked="">  
+					<input type="checkbox" name="like1[read]" lay-skin="primary" title="阅读">
+					<input type="checkbox" name="like1[game]" lay-skin="primary" title="游戏" disabled="">
+				</div>
+			</div>
+
+			<div class="layui-form-item">
+				<label class="layui-form-label">开关-默认关</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="close" lay-skin="switch" lay-text="ON|OFF">
+				</div>
+			</div>
+			<div class="layui-form-item">  
+				<label class="layui-form-label">单选框</label>
+				<div class="layui-input-block">
+					<input type="radio" name="sex" value="男" title="男" checked="">
+					<input type="radio" name="sex" value="女" title="女">
+					<input type="radio" name="sex" value="禁" title="禁用" disabled="">
+				</div>
+			</div>
+			<!--<div class="layui-form-item layui-form-text">
+				<label class="layui-form-label">上传图片</label>
+				<div class="layui-input-block">
+					<div class="layui-upload-drag w200 h200">
+						<i class="layui-icon"></i>          
+						<p>点击上传</p>
+					</div>
+				</div>
+			</div>-->
+				<div class="layui-form-item layui-form-text">
+					<label class="layui-form-label">普通文本域</label>  
+					<div class="layui-input-block">              
+						<textarea placeholder="请输入内容" class="layui-textarea"></textarea>
+					</div>
+				</div>
+			</div>
+		</div>   
+	</div>
+</div>
+</form>   
+<script type="text/javascript">
+	//form表单样式
+	layui.use(['layer', 'form'], function() {    
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+</script>                 
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantProfit/merchantProfitList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantProfit/merchantProfitList.jsp
new file mode 100644
index 0000000..66db8c2
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantProfit/merchantProfitList.jsp
@@ -0,0 +1,119 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black">
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->
+<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+<jsp:include page="../../common.jsp" />
+<script type="text/javascript">
+     require("js/merchantProfit/merchantProfitList.js");
+</script>
+</head>
+<body>
+	<div class="row animated fadeInRight" style="margin: 0;">
+		<div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+			<div class="toolbar-panel bdd">
+				<div class="toolbar-box">
+					<div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+						<!-- 顶部按钮 -->
+						<div class="buttons fl">
+							<a class="btn btn-primary fa fa-search f13" href="javascript:void(0);" onclick="queryMerchantProfit()"><span>搜索</span></a>
+							<a class="btn btn-primary fa fa-plus f13 add" href="javascript:void(0);" onclick="initAddMerchantProfit()"><span>添加</span></a>
+							<a class="btn btn-primary fa fa-edit f13" href="javascript:void(0);" onclick="initEditMerchantProfit()"><span>编辑</span></a> 
+							<a class="btn btn-primary fa fa-remove f13 delete" href="javascript:void(0);" onclick="initBatchDeleteMerchantProfit()"><span>删除</span></a> 
+						</div>
+						<div class="tools fr">
+							<a href="javascript:void(0);" class="collapse dblock f14 dgray mr5"> 
+								<i class="fa-2x fa fa-angle-double-up"></i>
+							</a>
+						</div>
+					</div>
+				</div>
+
+				<!--搜索条件 -->
+				<div class="toolbar-body">
+					<div class="row pt10 pb10 whitebg ml0 mr0">
+						<span class="dlblock w100 textr">ID：</span> 
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+							<input type="text" placeholder="请输入内容" id="searchId">  
+						</span> 
+						<span class="dlblock w100 textr">名称：</span> 
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+							<input type="text" placeholder="请输入名称">
+						</span> 
+						<span class="dlblock w100 textr">类别：</span>
+						 <select class="form-control f12 w180 textc">
+							<option value="">支出</option>
+							<option value="">收入</option>
+						</select>
+					</div>
+					<div class="mt10 mb20">
+						<span class="dlblock w100 textr">开始日期</span>
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+							 <input type="text" placeholder="" id="date1" class="w150">
+							 <i class="fa fa-calendar"></i>
+						</span> 
+						<span class="dlblock w100 textr">结束日期</span>
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+						<input type="text" placeholder="" id="date2" class="w150"> 
+							<i class="fa fa-calendar"></i>
+						</span>
+					</div>
+				</div>
+			</div>
+		</div>
+		<!-- 表单数据 -->
+		<div class="mb20 mt10">
+			<div class="whitebg pl10 pr10">
+				<table class="table table-striped table-bordered table-hover">
+					<thead>
+						<tr>
+							<th class="textc">
+								<div class="checker" id="allCheck">
+									<span class=""><input type="checkbox" value="" ></span>
+								</div>
+							</th>
+							<th class="textc ">id</th>
+							<th class="textc ">userId</th>
+							<th class="textc ">type</th>
+							<th class="textc ">price</th>
+							<th class="textc wp15">orderNumber</th>
+							<th class="textc ">merchantCode</th>
+							<th class="textc ">merchantName</th>
+							<th class="textc ">consumeFee</th>
+							<th class="textc wp15">createDt</th>
+							<th class="textc ">orderDt</th>
+							<th class="textc">编辑</th>
+						</tr>
+					</thead>
+					<!-- 数据体 -->
+					<tbody id="data_content">
+					</tbody>
+				</table>
+			
+			<!-- footer -->
+				<div class="clearfix mb10 pb20">
+						<div class="layui-tab-item fr">
+								<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+								<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>
+								<div class="pagination dlblock vm" id="pagination"></div>
+								<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>
+						</div>
+					</div>
+	
+			</div>
+		</div>
+	</div>
+</body>
+
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantQrcode/detail.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantQrcode/detail.jsp
new file mode 100644
index 0000000..8cf735a
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantQrcode/detail.jsp
@@ -0,0 +1,211 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp" />
+    <style>
+        .layui-input,.layui-textarea{
+            border-color:#606060;
+        }
+    </style>
+</head>
+<body>
+<form class="layui-form" action="" style="width: 70%">
+    <input name="id" value="${entity.id}" hidden/>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">商户名称</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="merchantName" value="${entity.merchantName}" readonly  placeholder="商户名称" class="layui-input layui-disabled"/>
+            </div>
+        </div>
+    </div>
+
+     <div class="layui-form-item">
+        <label class="layui-form-label">商户编号</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="merchantCode" value="${entity.merchantCode}" readonly  placeholder="请输入商户编号" class="layui-input layui-disabled"/>
+            </div>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">二维码图片</label>
+        <div class="layui-input-block" style="display: flex;justify-content: flex-start">
+            <input name="fileKey" id="fileKey" hidden/>
+            <input name="qrCodeUrl" id="url" value="${entity.qrCodeUrl}" hidden/>
+            <input name="chooseFile" id="chooseFile" placeholder="浏览..." class="layui-input layui-col-xs6" style="cursor:hand" readonly/>
+            <button type="button" class="layui-btn layui-btn-normal layui-col-xs3"  id="uploadBtn">
+                上传
+            </button>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">预览</label>
+        <div class="layui-input-block">
+            <img src="${entity.qrCodeUrl}" width="240px" id="preview" alt="预览" />
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button class="layui-btn" lay-submit lay-filter="formDemo">立即提交</button>
+            <button type="button" id="close" class="layui-btn layui-btn-primary">关闭</button>
+        </div>
+    </div>
+
+    <div id="uploadLoadingDiv" style="display: none;">
+        <div class="layui-progress" lay-showpercent="true" lay-filter="js_upload_progress" style="margin: 10px;margin-top: 20px;">
+            <div class="layui-progress-bar layui-bg-red" lay-percent="0%"></div>
+        </div>
+    </div>
+</form>
+
+<form id="ajaxForm" class="layui-form" style="width: 70%" >
+    <input type="hidden" name="OSSAccessKeyId" id="accessid" value="${uploadParam.accessid}">
+    <input type="hidden" name="policy" id="policy" value="${uploadParam.policy}">
+    <input type="hidden" name="signature" id="signature" value="${uploadParam.signature}">
+    <input type="hidden" name="expire" id="expire" value="${uploadParam.expire}">
+    <input type="hidden" name="success_action_status" id="success_action_status" value="200">
+    <input type="hidden" name="key" id="key" value="${uploadParam.key}">
+    <input type="hidden" name="callBack" id="key2_callBack" value="${uploadParam.callBack}">
+    <input type="file" style="display: none" name="file" id="file" onchange="document.getElementById('fileName').value=this.files[0].name">
+</form>
+
+<script>
+    //Demo
+    layui.use(['form', 'upload','element','layer'], function(){
+        var form = layui.form;
+        var upload = layui.upload;
+        var layer = layui.layer;
+        var element = layui.element;
+        element.init();
+        $('#close').click(function() {
+            parent.layer.closeAll();
+        });
+
+        //创建监听函数
+        var xhrOnProgress=function(fun) {
+            xhrOnProgress.onprogress = fun; //绑定监听
+            //使用闭包实现监听绑
+            return function() {
+                //通过$.ajaxSettings.xhr();获得XMLHttpRequest对象
+                var xhr = $.ajaxSettings.xhr();
+                //判断监听函数是否为函数
+                if (typeof xhrOnProgress.onprogress !== 'function')
+                    return xhr;
+                //如果有监听函数并且xhr对象支持绑定时就把监听函数绑定上去
+                if (xhrOnProgress.onprogress && xhr.upload) {
+                    xhr.upload.onprogress = xhrOnProgress.onprogress;
+                }
+                return xhr;
+            }
+        }
+        var openIndex = "";
+        upload.render({
+            elem: '#chooseFile', // 文件选择
+            accept:'images',
+            acceptMime:'image/*',
+            url: '${uploadParam.host}',
+            exts: 'jpg|png|gif|bmp|jpeg',
+            method:'POST',
+            auto: false, // 设置不自动提交
+            bindAction: '#uploadBtn', // 提交按钮
+            before:function(){
+                element.progress('js_upload_progress', '0%');//设置页面进度条
+                openIndex = layer.open({
+                    type: 1,
+                    title: '上传进度',
+                    closeBtn: 1, //不显示关闭按钮
+                    area: ['300px', '130px'],
+                    shadeClose: false, //开启遮罩关闭
+                    content: $("#uploadLoadingDiv").html(),
+                    offset: '100px'
+                });
+            }
+            ,xhr:xhrOnProgress
+            ,progress:function(value){//上传进度回调 value进度值
+                element.progress('js_upload_progress', value+'%');//设置页面进度条
+            }
+            ,choose: function(obj) {
+                var loading = layer.load(1,{shade: [0.1,'#000'] });
+                var data = {};
+                obj.preview(function(index, file, result) {
+                    var fileName = file.name;
+                    $("#chooseFile").val(fileName);
+                    var suffix = fileName.substring(fileName.lastIndexOf('.') + 1, fileName.length);
+                    var key = '${uploadParam.key}'+"."+suffix;
+                    $("#key").val(key);
+                    $("#fileKey").val(key);
+                    data.OSSAccessKeyId = $('#accessid').val();
+                    data.policy = $('#policy').val();
+                    data.signature = $('#signature').val();
+                    data.expire = $('#expire').val();
+                    data.success_action_status = $('#success_action_status').val();
+                    data.callBack = $("#key2_callBack").val();
+                    data.key = key;
+                    $("#preview").attr("src",result);
+                    layer.close(loading);
+                });
+                this.data = data;
+            },
+            done: function(res) {
+                layer.close(openIndex);
+                if (res.code == 200){
+                    layer.msg("上传成功！")
+                    $("#url").val(res.url);
+                }else{
+                    layer.msg("上传失败！")
+                }
+            },
+            error: function(res) {
+                layer.msg(res.msg);
+            }
+        });
+
+        //关闭进度条提示
+        $(document).on('click','.js_upload_progress_bar_sure',function(){
+            layer.close(layer.index);
+        });
+
+            //监听提交
+        form.on('submit(formDemo)', function(data){
+            var index = layer.load(1,{shade: [0.1,'#000'] });
+            $.ajax({
+                url: '${ctx}/merchantQrcode/save',
+                method: 'post',
+                data: JSON.stringify(data.field),
+                dataType: 'JSON',
+                contentType:"application/json",
+                success: function(res) {
+                    layer.close(index);
+                    if(res.code == 200) {
+                        layer.msg(res.message, { icon: 1, time: 1000 }, function () {
+                            var index = parent.layer.getFrameIndex(window.name);
+                            parent.layui.table.reload('merchantQrcode');
+                            parent.layer.close(index);
+                        });
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 2
+                        });
+                    }
+                }
+            })
+            return false;
+        });
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantQrcode/list.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantQrcode/list.jsp
new file mode 100644
index 0000000..b39635f
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantQrcode/list.jsp
@@ -0,0 +1,280 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" id="form1" action="" style="margin-top: 10px">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">用户ID</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="userId" id="userId" placeholder="请输入用户ID"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">商户名称</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="merchantName" id="merchantName" placeholder="请输入商户名称"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">话术名称</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="name" id="name" placeholder="请输入话术名称"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <div class="mb50 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-hide" id="merchantQrcodeTab" lay-filter="merchantQrcodeTab"></table>
+        </div>
+    </div>
+</div>
+<script type="text/html" id="leftBar">
+    <%-- <button type="button" class="layui-btn layui-btn-normal layui-btn-sm" lay-event="search"><i class="layui-icon">&#xe615;</i>查询
+     </button>--%>
+    <a class="layui-btn layui-btn-sm fa fa-search f13" lay-event="search"><span>搜索</span></a>
+</script>
+
+<script type="text/html" id="qrUrl">
+    <a href='javascript:void(0)' onclick='openImg("{{d.qrCodeUrl}}")'><img src="{{d.qrCodeUrl}}"/></a>
+</script>
+
+<script type="text/html" id="toolBar">
+    <button type="button" class="layui-btn layui-btn-xs" lay-event="edit"><i class="layui-icon">&#xe642;</i>编辑
+    </button>
+    <button type="button" class="layui-btn layui-btn-xs layui-btn-danger" lay-event="del"><i
+            class="layui-icon">&#xe640;</i>删除
+    </button>
+</script>
+
+<script>
+    layui.use(['table', 'layer'], function () {
+        var table = layui.table;
+        var layer = layui.layer;
+
+        table.render({
+            elem: '#merchantQrcodeTab'
+            , url: ctx + '/merchantQrcode/page'
+            , id: 'merchantQrcode'
+            , request: {
+                pageName: 'current'
+                , limitName: 'size'
+            }
+            , response: {
+                statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            , toolbar: '#leftBar' //开启头部工具栏，并为其绑定左侧模板
+            , defaultToolbar: ['filter']
+            , title: '商户付款页二维码展示表'
+            , cols: [[
+                {type: 'checkbox', hidden: true}
+                , {field: 'numbers', title: '序号', unresize: true, width: 80, type: 'numbers'}
+                , {field: 'userId', title: '用户ID'}
+                , {field: 'merchantName', title: '商户名称'}
+                , {field: 'name', title: '话术名称'}
+                , {
+                    field: 'status', title: '是否选中', width: 90, align: "center", templet: function (d) {
+                        if (d.status === '1') {
+                            return "<span style='color: green'>是</span>"
+                        } else {
+                            return "<span style='color: red'>否</span>"
+                        }
+                    }
+                }
+                , { field: 'qrCodeUrl', title: '二维码照片', width: 120, align: "center", templet: '#qrUrl'}
+                , {
+                    field: 'createTime',
+                    title: '创建时间',
+                    width: 160,
+                    templet: "<div>{{layui.util.toDateString(d.createTime,'yyyy-MM-dd HH:mm:ss')}}</div>"
+                }
+                , {
+                    field: 'updateTime',
+                    title: '修改时间',
+                    width: 160,
+                    templet: "<div>{{layui.util.toDateString(d.updateTime,'yyyy-MM-dd HH:mm:ss')}}</div>"
+                }
+                , {fixed: 'right', title: '操作', width: 150, toolbar: '#toolBar'}
+            ]]
+            , page: true
+        });
+
+        table.on('tool(merchantQrcodeTab)', function (obj) { //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            var data = obj.data; //获得当前行数据
+            var layEvent = obj.event; //获得 lay-event 对应的值（也可以是表头的 event 参数对应的值）
+            if (layEvent === 'del') { //删除
+                layer.confirm('真的删除么?', {icon: 3}, function (index) {
+                    obj.del(); //删除对应行（tr）的DOM结构，并更新缓存
+                    layer.close(index);
+                    del(data);
+                    //向服务端发送删除指令
+                });
+            } else if (layEvent === 'edit') { //编辑
+                //do something
+                toAdd(obj.data);
+                //同步更新缓存对应的值
+                // obj.update({
+                //     username: '123'
+                //     ,title: 'xxx'
+                // });
+            }
+        });
+
+        //监听头工具栏事件
+        table.on('toolbar(merchantQrcodeTab)', function (obj) {
+            switch (obj.event) {
+                /*case 'add':
+                    // 添加
+                    toAdd();
+                    break;*/
+                case 'search':
+                    var params = serialize($('#form1'));
+                    table.reload('merchantQrcode', {
+                        where: params
+                        , page: {
+                            size: 10
+                            , current: 1
+                        }
+                    });
+                    break;
+                case 'del':
+                    var checkStatus = table.checkStatus('merchantQrcode'); //idTest 即为基础参数 id 对应的值
+                    if (checkStatus.data.length == 0) {
+                        layer.msg("至少选中一条数据!", {icon: 5});
+                        return;
+                    }
+                    var idsArr = new Array();
+                    $.each(checkStatus.data, function (k, v) {
+                        idsArr.push(v.id);
+                    })
+                    layer.confirm('真的删除么？', {icon: 3}, function (index) {
+                        $("div.layui-table-body table tbody input[name='layTableCheckbox']:checked").each(function () { // 遍历选中的checkbox
+                            n = $(this).parents("tbody tr").index();  // 获取checkbox所在行的顺序
+                            //移除行
+                            $("div.layui-table-body table tbody ").find("tr:eq(" + n + ")").remove();
+                            //如果是全选移除，就将全选CheckBox还原为未选中状态
+                            $("div.layui-table-header table thead div.layui-unselect.layui-form-checkbox").removeClass("layui-form-checked");
+                        });
+                        layer.close(index);
+                        del(idsArr);
+                    });
+                    break;
+            }
+        });
+
+        function toAdd(obj) {
+            var url = '${ctx}/merchantQrcode/detail';
+            var title = "新增";
+            if (obj != undefined) {
+                url = "${ctx}/merchantQrcode/detail/" + obj.id;
+                title = "编辑"
+            }
+            var index = layer.open({
+                type: 2
+                , shade: 0.5
+                , title: title
+                , maxmin: true
+                , content: url
+                , area: ['500px', '520px']
+                , end: function () {
+
+                }
+            });
+        }
+
+        function del(obj) {
+            $.ajax({
+                url: '${ctx}/merchantQrcode/del/' + obj.id,
+                method: 'DELETE',
+                dataType: 'JSON',
+                contentType: "application/json",
+                success: function (res) {
+                    if (res.code == 200) {
+                        layer.msg(res.data, {
+                            icon: 1
+                        });
+
+                    } else {
+                        layer.msg(res.data, {
+                            icon: 5
+                        });
+                    }
+                }
+            })
+        }
+    });
+
+    function openImg(url) {
+        if (url) {
+            var img = new Image();
+            img.src = url;
+            //var height = img.height + 50; // 原图片大小
+            //var width = img.width; //原图片大小
+            var imgHtml = "<img src='" + url + "' width='500px' height='500px'/>";
+            //弹出层
+            layer.open({
+                type: 1,
+                shade: 0.8,
+                offset: 'auto',
+                area: [500 + 'px', 550 + 'px'],  // area: [width + 'px',height+'px']  //原图显示
+                shadeClose: true,
+                scrollbar: false,
+                title: "预览", //不显示标题
+                content: imgHtml, //捕获的元素，注意：最好该指定的元素要存放在body最外层，否则可能被其它的相对元素所影响
+                cancel: function () {
+                    //layer.msg('捕获就是从页面已经存在的元素上，包裹layer的结构', { time: 5000, icon: 6 });
+                }
+            });
+        }
+    }
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantRate/rate_list.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantRate/rate_list.jsp
new file mode 100644
index 0000000..d69caaf
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantRate/rate_list.jsp
@@ -0,0 +1,294 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<!DOCTYPE html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" id="form1" action="" style="margin-top: 10px">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">用户ID</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="userId" id="userId" placeholder="请输入用户ID"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">状态</label>
+                            <div class="layui-input-block">
+                                <select name="status">
+                                    <option value="">请选择</option>
+                                    <option value="0">审核中</option>
+                                    <option value="1">已完成</option>
+                                    <option value="2">审核驳回</option>
+                                    <option value="3">审核过待生效</option>
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <div class="mb50 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-hide" id="table" lay-filter="table"></table>
+        </div>
+    </div>
+</div>
+<script type="text/html" id="leftBar">
+    <%-- <button type="button" class="layui-btn layui-btn-normal layui-btn-sm" lay-event="search"><i class="layui-icon">&#xe615;</i>查询
+     </button>--%>
+    <a class="layui-btn layui-btn-sm" lay-event="search">
+        <i class="layui-icon layui-icon-search"></i>查询
+    </a>
+    <a class="layui-btn layui-btn-sm layui-btn-normal" lay-event="batchPass">
+        <i class="layui-icon layui-icon-auz"></i>D0批量审核通过
+    </a>
+</script>
+<script type="text/html" id="toolBar">
+    {{# if (d.status == '0') { }}
+    <button type="button" class="layui-btn layui-btn-xs layui-btn-normal" lay-event="edit">
+        <i class="layui-icon layui-icon-auz"></i>
+        D0审核通过
+    </button>
+    {{# } }}
+</script>
+
+<script>
+    layui.use(['table', 'layer'], function () {
+        var table = layui.table;
+        var layer = layui.layer;
+
+        table.render({
+            elem: '#table'
+            , url: ctx + '/merchantRate/page'
+            , id: 'table'
+            , request: {
+                pageName: 'current'
+                , limitName: 'size'
+            }
+            , response: {
+                statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            , toolbar: '#leftBar' //开启头部工具栏，并为其绑定左侧模板
+            , defaultToolbar: ['filter']
+            , title: '商户付款页二维码展示表'
+            , cols: [[
+                {type: 'checkbox', hidden: true}
+                , {field: 'numbers', title: '序号', unresize: true, width: 80, type: 'numbers'}
+                , {field: 'userId', title: '用户ID', width: 80}
+                , {field: 'alias', title: '商户简称', minWith: 100}
+                , {
+                    field: 'merchantId', title: '银盛商编', minWith: 150, templet: function (d) {
+                        if (d.merchantId == null) {
+                            return '-';
+                        } else {
+                            return d.merchantId;
+                        }
+                    }
+                }
+                , {field: 'aliRateD1', title: '支付宝D1', minWith: 100}
+                , {field: 'wxRateD1', title: '微信D1', minWith: 100}
+                , {
+                    field: 'bankRateD1', title: '银联D1', minWith: 100, templet: function (d) {
+                        if (!Number(d.bankRateD1)) {
+                            return '-';
+                        }
+                        return (Number(d.bankRateD1) + 2);``
+                    }
+                }
+                , {field: 'bankRateLargeD1', title: '银联大额D1', minWith: 100}
+                , {
+                    field: 'aliRateD0', title: '支付宝D0', minWith: 100, templet: function (d) {
+                        if (d.status == 0) {
+                            return d.aliRateD0 + " -> " + d.aliRateEditD0
+                        } else {
+                            return d.aliRateD0
+                        }
+                    }
+                }
+                , {
+                    field: 'wxRateD0', title: '微信D0', minWith: 100, templet: function (d) {
+                        if (d.status == 0) {
+                            return d.wxRateD0 + " -> " + d.wxRateEditD0
+                        } else {
+                            return d.wxRateD0
+                        }
+                    }
+                }
+                , {
+                    field: 'bankRateD0', title: '银联D0', minWith: 100, templet: function (d) {
+                        if (d.status == 0) {
+                            return (Number(d.bankRateD0) + 2) + " -> " + (Number(d.bankRateEditD0) + 2)
+                        } else if (d.status == -1) {
+                            return d.bankRateD0
+                        } else {
+                            return (Number(d.bankRateD0) + 2)
+                        }
+                    }
+                }
+                , {
+                    field: 'bankRateLargeD0', title: '银联大额D0', minWith: 120, templet: function (d) {
+                        if (d.status == 0) {
+                            return ((d.bankRateLargeD0 - 21) / 2.0 + 53) + " -> " + ((d.bankRateLargeEditD0 - 21) / 2.0 + 53)
+                        } else if (d.status == -1) {
+                            return d.bankRateLargeD0;
+                        } else {
+                            return ((d.bankRateLargeD0 - 21) / 2.0 + 53)
+                        }
+                    }
+                }
+                , {
+                    field: 'status', title: 'D0编辑状态', minWith: 100, templet: function (d) {
+                        if (d.status == 0) {
+                            return "审核中";
+                        } else if (d.status == 1) {
+                            return "已生效";
+                        } else {
+                            return "未开通";
+                        }
+                    }
+                }
+                , {
+                    field: 'createTime',
+                    title: '创建时间',
+                    width: 160,
+                    templet: "<div>{{layui.util.toDateString(d.createTime,'yyyy-MM-dd HH:mm:ss')}}</div>"
+                }
+                , {fixed: 'right', title: '操作', width: 150, toolbar: '#toolBar'}
+            ]]
+            , page: true
+        });
+
+        table.on('tool(table)', function (obj) { //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            var data = obj.data; //获得当前行数据
+            var layEvent = obj.event; //获得 lay-event 对应的值（也可以是表头的 event 参数对应的值）
+            if (layEvent === 'edit') { //编辑
+                ratePass(obj.data);
+            } else if (layEvent === 'reject') {
+
+            }
+        });
+
+        //监听头工具栏事件
+        table.on('toolbar(table)', function (obj) {
+            switch (obj.event) {
+                /*case 'add':
+                    // 添加
+                    toAdd();
+                    break;*/
+                case 'search':
+                    var params = serialize($('#form1'));
+                    table.reload('table', {
+                        where: params
+                        , page: {
+                            size: 10
+                            , current: 1
+                        }
+                    });
+                    break;
+                case 'batchPass':
+                    var checkStatus = table.checkStatus(obj.config.id);
+                    var merchantIds = [];
+                    checkStatus.data.forEach(function(item) {
+                        merchantIds.push(item.merchantId);
+                    });
+                    batchRatePass(merchantIds)
+                    break;
+            }
+        })
+
+        function batchRatePass(merchantIds) {
+            if (merchantIds == null || merchantIds.length === 0) {
+                layer.msg("至少选择一条记录");
+                return;
+            }
+
+            layer.confirm("确认D0费率修改", {
+                yes: function (index, layero) {
+                    $.ajax({
+                        url: ctx + '/merchantRate/batchPass'
+                        , type: "post"
+                        , data: {
+                            merchantId: merchantIds
+                        }
+                        , success: function (d) {
+                            if (d.code == 200) {
+                                layer.msg(d.message);
+                                layer.close(index);
+                                table.reload('table', {}, true);
+                            } else {
+                                layer.msg(d.message);
+                            }
+                        }
+                    })
+                }
+            });
+        }
+
+        function ratePass(obj) {
+            layer.confirm("确认D0费率修改", {
+                yes: function (index, layero) {
+                    $.ajax({
+                        url: ctx + '/merchantRate/pass'
+                        , type: "post"
+                        , data: {
+                            merchantId: obj.merchantId
+                        }
+                        , success: function (d) {
+                            if (d.code == 200) {
+                                layer.msg(d.message);
+                                layer.close(index);
+                                table.reload('table', {}, true);
+                            } else {
+                                layer.msg(d.message);
+                            }
+                        }
+                    })
+                }
+            });
+        }
+    });
+
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantRegistAuditRecord/merchantRegistAuditRecordBaseInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantRegistAuditRecord/merchantRegistAuditRecordBaseInfo.jsp
new file mode 100644
index 0000000..55c585c
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantRegistAuditRecord/merchantRegistAuditRecordBaseInfo.jsp
@@ -0,0 +1,87 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">  
+	<div class="tab-pane active">     
+		<div class="panel-body">
+			<div class="wrapper wrapper-content">
+				<div class="panel-form animated fadeInRight wp60 fc">
+					<div class="layui-form-item dn	has-error" >   
+						<label class="layui-form-label">id</label>  
+						<div class="layui-input-block">
+							<input type="text" name="id" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantRegistAuditRecord.id }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">merchantCode</label>  
+						<div class="layui-input-block">
+							<input type="text" name="merchantCode" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantRegistAuditRecord.merchantCode }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">merchantName</label>  
+						<div class="layui-input-block">
+							<input type="text" name="merchantName" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantRegistAuditRecord.merchantName }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">agentCode</label>  
+						<div class="layui-input-block">
+							<input type="text" name="agentCode" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantRegistAuditRecord.agentCode }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">agentName</label>  
+						<div class="layui-input-block">
+							<input type="text" name="agentName" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantRegistAuditRecord.agentName }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">creator</label>  
+						<div class="layui-input-block">
+							<input type="text" name="creator" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantRegistAuditRecord.creator }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">message</label>  
+						<div class="layui-input-block">
+							<input type="text" name="message" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantRegistAuditRecord.message }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">type</label>  
+						<div class="layui-input-block">
+							<input type="text" name="type" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantRegistAuditRecord.type }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">status</label>  
+						<div class="layui-input-block">
+							<input type="text" name="status" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantRegistAuditRecord.status }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">failReason</label>  
+						<div class="layui-input-block">
+							<input type="text" name="failReason" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantRegistAuditRecord.failReason }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">creatDt</label>  
+						<div class="layui-input-block">
+							<input type="text" name="creatDt" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantRegistAuditRecord.creatDt }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">modifyStatus</label>  
+						<div class="layui-input-block">
+							<input type="text" name="modifyStatus" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantRegistAuditRecord.modifyStatus }" >
+						</div>  
+					</div>
+	
+				</div>
+			</div>
+		</div>  
+	</div>
+</form>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantRegistAuditRecord/merchantRegistAuditRecordDetails.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantRegistAuditRecord/merchantRegistAuditRecordDetails.jsp
new file mode 100644
index 0000000..559f466
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantRegistAuditRecord/merchantRegistAuditRecordDetails.jsp
@@ -0,0 +1,54 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>     
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">                      
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black"> 
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> 
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->                                     
+<meta name="viewport"
+	content="width=device-width, initial-scale=1.0, maximum-scale=1.0">   
+<jsp:include page="../../common.jsp" />
+<script type="text/javascript">
+    require("js/merchantRegistAuditRecord/merchantRegistAuditRecordDetails.js");
+</script>
+<title>编辑</title>
+</head>                                 
+	<body class="lgraybg">            
+		<div class="	container-fluid animated fadeInRight col-sm-12">
+			<div class="panel-toolbar mt10 mb10 pt5 pb5 pl10 bdd whitebg">
+				<div class="buttons">
+					<a href="javascript:void(0);" class="btn btn-primary fa fa-save f12"><span>保存</span></a>
+					<a href="${ctx }/merchantRegistAuditRecord/index?pageIndex=${pageIndex}"  class="btn btn-primary fa fa-back f12" id="goback"><span>返回</span></a>
+				</div>
+			</div>
+				<div class="tabs-container whitebg">
+					<div class="pt10 pl5 pr5">
+						<ul class="nav nav-tabs" id="nav-tabs">
+							<li class="active" data-action="base">   
+								<a href="javascript:void(0);" >基本资料</a>
+							</li>
+							<li class="" data-action="functions">
+								<a href="javascript:void(0);"  >多功能输入</a>
+							</li>
+							<li class="" data-action="extends">
+								<a href="javascript:void(0);" >扩展属性</a>
+							</li>
+						</ul>
+						<div class="tab-content pt30 p30">               
+		
+						</div>     
+					</div>
+				</div>    
+		</div>
+		<!-- 隐藏域 -->
+		<input type="hidden" id="merchantRegistAuditRecordId" value="${merchantRegistAuditRecord.id }"/>
+	</body>
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantRegistAuditRecord/merchantRegistAuditRecordExtendsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantRegistAuditRecord/merchantRegistAuditRecordExtendsInfo.jsp
new file mode 100644
index 0000000..592687a
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantRegistAuditRecord/merchantRegistAuditRecordExtendsInfo.jsp
@@ -0,0 +1,201 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>           
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> 
+<div class="tab-pane active">      
+	<div class="animated fadeInRight">
+		<div class="whitebg pl10 pr10">
+			<table class="table table-striped table-bordered table-hover">     
+				<thead> 
+					<tr>  
+						<th class="textc">序号</th>         
+						<th class="textc wp15">流水账号</th>
+						<th class="textc">日期</th>         
+						<th class="textc">财务类别</th>     
+						<th class="textc">金额</th>         
+						<th class="textc">银行</th>         
+						<th class="textc">发票</th>         
+						<th class="textc">客户名称</th>     
+						<th class="textc wp15">单号</th>    
+						<th class="textc">状态</th>         
+						<th class="textc">类别</th>         
+						<th class="textc">操作</th>         
+					</tr> 
+				</thead>
+				<tbody> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+                
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="green">支出</span></td>     
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+				</tbody>
+                
+			</table>  
+			<!-- footer -->  
+			<div class="clearfix mb10 pb20">          
+					<div class="layui-tab-item fr">       
+							<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+							<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>   
+							<div class="pagination dlblock vm" id="pagination"></div>
+							<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>            
+					</div>
+				</div>  
+		</div>      
+	</div>        
+</div>          
+                
+<script type="text/javascript">    
+//分页          
+$('#pagination').pagination({        
+	pageCount: 50,
+	jump: true,   
+	coping: true, 
+	homePage: '首页',    
+	endPage: '末页',     
+	prevContent: '上页', 
+	nextContent: '下页', 
+	callback: function(api) {          
+		$('.now').text(api.getCurrent());
+	}             
+});             
+</script>       
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantRegistAuditRecord/merchantRegistAuditRecordFunctionsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantRegistAuditRecord/merchantRegistAuditRecordFunctionsInfo.jsp
new file mode 100644
index 0000000..982ce84
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantRegistAuditRecord/merchantRegistAuditRecordFunctionsInfo.jsp
@@ -0,0 +1,130 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>		
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">      
+<div class="tab-pane active">
+				<div class="panel-body">
+					<div class="wrapper wrapper-content">     
+						<div class="panel-form animated fadeInRight wp60 fc">
+							<!-- 账号资料 -->
+			<div class="layui-form-item 	has-error">
+				<label class="layui-form-label">单行输入框<i class="red">*</i></label>
+				<div class="layui-input-block">
+					<input type="text" name="title" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input">
+				</div>                                         
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">自定义验证</label>
+				<div class="layui-input-inline ml30">
+					<input type="password" name="password" lay-verify="pass" placeholder="请输入密码" autocomplete="off" class="layui-input">
+				</div>
+				<div class="layui-form-mid layui-word-aux">请填写6到12位密码</div>
+			</div>
+			<div class="form-group">
+				<div class="layui-form-item">          
+					<label class="layui-form-label">单行选择框</label>
+					<div class="layui-input-block">
+						<select name="interest" lay-filter="aihao">  
+							<option value=""></option>
+							<option value="0">写作</option>         
+							<option value="1" selected="">阅读</option>
+							<option value="2">游戏</option>
+							<option value="3">音乐</option>
+							<option value="4">旅行</option>  
+						</select>              
+					</div>
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<div class="layui-inline">  
+					<label class="layui-form-label">范围</label>
+					<div class="layui-input-inline ml30">
+						<input type="text" name="price_min" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>                                     
+					<div class="layui-form-mid">-</div>
+					<div class="layui-input-inline">       
+						<input type="text" name="price_max" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>
+				</div>           
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">联动选择框</label>
+				<div class="layui-input-inline ml30">
+					<select name="quiz1">     
+						<option value="">请选择省</option>
+						<option value="浙江" selected="">浙江省</option> 
+						<option value="你的工号">江西省</option>           
+						<option value="你最喜欢的老师">福建省</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz2">
+						<option value="">请选择市</option>
+						<option value="杭州">杭州</option>
+						<option value="宁波" disabled="">宁波</option>
+						<option value="温州">温州</option>
+						<option value="温州">台州</option>
+						<option value="温州">绍兴</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz3">
+						<option value="">请选择县/区</option>
+						<option value="西湖区">西湖区</option>
+						<option value="余杭区">余杭区</option>
+						<option value="拱墅区">临安市</option>
+					</select>
+				</div>    
+			</div>
+			<div class="layui-form-item" pane="">   
+				<label class="layui-form-label">原始复选框</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="like1[write]" lay-skin="primary" title="写作" checked="">  
+					<input type="checkbox" name="like1[read]" lay-skin="primary" title="阅读">
+					<input type="checkbox" name="like1[game]" lay-skin="primary" title="游戏" disabled="">
+				</div>
+			</div>
+
+			<div class="layui-form-item">
+				<label class="layui-form-label">开关-默认关</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="close" lay-skin="switch" lay-text="ON|OFF">
+				</div>
+			</div>
+			<div class="layui-form-item">  
+				<label class="layui-form-label">单选框</label>
+				<div class="layui-input-block">
+					<input type="radio" name="sex" value="男" title="男" checked="">
+					<input type="radio" name="sex" value="女" title="女">
+					<input type="radio" name="sex" value="禁" title="禁用" disabled="">
+				</div>
+			</div>
+			<!--<div class="layui-form-item layui-form-text">
+				<label class="layui-form-label">上传图片</label>
+				<div class="layui-input-block">
+					<div class="layui-upload-drag w200 h200">
+						<i class="layui-icon"></i>          
+						<p>点击上传</p>
+					</div>
+				</div>
+			</div>-->
+				<div class="layui-form-item layui-form-text">
+					<label class="layui-form-label">普通文本域</label>  
+					<div class="layui-input-block">              
+						<textarea placeholder="请输入内容" class="layui-textarea"></textarea>
+					</div>
+				</div>
+			</div>
+		</div>   
+	</div>
+</div>
+</form>   
+<script type="text/javascript">
+	//form表单样式
+	layui.use(['layer', 'form'], function() {    
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+</script>                 
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantRegistAuditRecord/merchantRegistAuditRecordList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantRegistAuditRecord/merchantRegistAuditRecordList.jsp
new file mode 100644
index 0000000..737653b
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantRegistAuditRecord/merchantRegistAuditRecordList.jsp
@@ -0,0 +1,121 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black">
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->
+<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+<jsp:include page="../../common.jsp" />
+<script type="text/javascript">
+     require("js/merchantRegistAuditRecord/merchantRegistAuditRecordList.js");
+</script>
+</head>
+<body>
+	<div class="row animated fadeInRight" style="margin: 0;">
+		<div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+			<div class="toolbar-panel bdd">
+				<div class="toolbar-box">
+					<div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+						<!-- 顶部按钮 -->
+						<div class="buttons fl">
+							<a class="btn btn-primary fa fa-search f13" href="javascript:void(0);" onclick="queryMerchantRegistAuditRecord()"><span>搜索</span></a>
+							<a class="btn btn-primary fa fa-plus f13 add" href="javascript:void(0);" onclick="initAddMerchantRegistAuditRecord()"><span>添加</span></a>
+							<a class="btn btn-primary fa fa-edit f13" href="javascript:void(0);" onclick="initEditMerchantRegistAuditRecord()"><span>编辑</span></a> 
+							<a class="btn btn-primary fa fa-remove f13 delete" href="javascript:void(0);" onclick="initBatchDeleteMerchantRegistAuditRecord()"><span>删除</span></a> 
+						</div>
+						<div class="tools fr">
+							<a href="javascript:void(0);" class="collapse dblock f14 dgray mr5"> 
+								<i class="fa-2x fa fa-angle-double-up"></i>
+							</a>
+						</div>
+					</div>
+				</div>
+
+				<!--搜索条件 -->
+				<div class="toolbar-body">
+					<div class="row pt10 pb10 whitebg ml0 mr0">
+						<span class="dlblock w100 textr">ID：</span> 
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+							<input type="text" placeholder="请输入内容" id="searchId">  
+						</span> 
+						<span class="dlblock w100 textr">名称：</span> 
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+							<input type="text" placeholder="请输入名称">
+						</span> 
+						<span class="dlblock w100 textr">类别：</span>
+						 <select class="form-control f12 w180 textc">
+							<option value="">支出</option>
+							<option value="">收入</option>
+						</select>
+					</div>
+					<div class="mt10 mb20">
+						<span class="dlblock w100 textr">开始日期</span>
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+							 <input type="text" placeholder="" id="date1" class="w150">
+							 <i class="fa fa-calendar"></i>
+						</span> 
+						<span class="dlblock w100 textr">结束日期</span>
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+						<input type="text" placeholder="" id="date2" class="w150"> 
+							<i class="fa fa-calendar"></i>
+						</span>
+					</div>
+				</div>
+			</div>
+		</div>
+		<!-- 表单数据 -->
+		<div class="mb20 mt10">
+			<div class="whitebg pl10 pr10">
+				<table class="table table-striped table-bordered table-hover">
+					<thead>
+						<tr>
+							<th class="textc">
+								<div class="checker" id="allCheck">
+									<span class=""><input type="checkbox" value="" ></span>
+								</div>
+							</th>
+							<th class="textc ">id</th>
+							<th class="textc ">merchantCode</th>
+							<th class="textc ">merchantName</th>
+							<th class="textc ">agentCode</th>
+							<th class="textc wp15">agentName</th>
+							<th class="textc ">creator</th>
+							<th class="textc ">message</th>
+							<th class="textc ">type</th>
+							<th class="textc wp15">status</th>
+							<th class="textc ">failReason</th>
+							<th class="textc ">creatDt</th>
+							<th class="textc ">modifyStatus</th>
+							<th class="textc">编辑</th>
+						</tr>
+					</thead>
+					<!-- 数据体 -->
+					<tbody id="data_content">
+					</tbody>
+				</table>
+			
+			<!-- footer -->
+				<div class="clearfix mb10 pb20">
+						<div class="layui-tab-item fr">
+								<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+								<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>
+								<div class="pagination dlblock vm" id="pagination"></div>
+								<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>
+						</div>
+					</div>
+	
+			</div>
+		</div>
+	</div>
+</body>
+
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantRegistLog/merchantRegistLogBaseInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantRegistLog/merchantRegistLogBaseInfo.jsp
new file mode 100644
index 0000000..2bd4d72
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantRegistLog/merchantRegistLogBaseInfo.jsp
@@ -0,0 +1,75 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">  
+	<div class="tab-pane active">     
+		<div class="panel-body">
+			<div class="wrapper wrapper-content">
+				<div class="panel-form animated fadeInRight wp60 fc">
+					<div class="layui-form-item dn	has-error" >   
+						<label class="layui-form-label">id</label>  
+						<div class="layui-input-block">
+							<input type="text" name="id" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantRegistLog.id }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">merchantCode</label>  
+						<div class="layui-input-block">
+							<input type="text" name="merchantCode" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantRegistLog.merchantCode }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">storeId</label>  
+						<div class="layui-input-block">
+							<input type="text" name="storeId" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantRegistLog.storeId }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">applyStatus</label>  
+						<div class="layui-input-block">
+							<input type="text" name="applyStatus" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantRegistLog.applyStatus }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">message</label>  
+						<div class="layui-input-block">
+							<input type="text" name="message" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantRegistLog.message }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">createDt</label>  
+						<div class="layui-input-block">
+							<input type="text" name="createDt" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantRegistLog.createDt }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">merchantName</label>  
+						<div class="layui-input-block">
+							<input type="text" name="merchantName" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantRegistLog.merchantName }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">merchantId</label>  
+						<div class="layui-input-block">
+							<input type="text" name="merchantId" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantRegistLog.merchantId }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">parentCode</label>  
+						<div class="layui-input-block">
+							<input type="text" name="parentCode" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantRegistLog.parentCode }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">creator</label>  
+						<div class="layui-input-block">
+							<input type="text" name="creator" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantRegistLog.creator }" >
+						</div>  
+					</div>
+	
+				</div>
+			</div>
+		</div>  
+	</div>
+</form>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantRegistLog/merchantRegistLogDetails.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantRegistLog/merchantRegistLogDetails.jsp
new file mode 100644
index 0000000..ebbb21c
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantRegistLog/merchantRegistLogDetails.jsp
@@ -0,0 +1,54 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>     
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">                      
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black"> 
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> 
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->                                     
+<meta name="viewport"
+	content="width=device-width, initial-scale=1.0, maximum-scale=1.0">   
+<jsp:include page="../../common.jsp" />
+<script type="text/javascript">
+    require("js/merchantRegistLog/merchantRegistLogDetails.js");
+</script>
+<title>编辑</title>
+</head>                                 
+	<body class="lgraybg">            
+		<div class="	container-fluid animated fadeInRight col-sm-12">
+			<div class="panel-toolbar mt10 mb10 pt5 pb5 pl10 bdd whitebg">
+				<div class="buttons">
+					<a href="javascript:void(0);" class="btn btn-primary fa fa-save f12"><span>保存</span></a>
+					<a href="${ctx }/merchantRegistLog/index?pageIndex=${pageIndex}"  class="btn btn-primary fa fa-back f12" id="goback"><span>返回</span></a>
+				</div>
+			</div>
+				<div class="tabs-container whitebg">
+					<div class="pt10 pl5 pr5">
+						<ul class="nav nav-tabs" id="nav-tabs">
+							<li class="active" data-action="base">   
+								<a href="javascript:void(0);" >基本资料</a>
+							</li>
+							<li class="" data-action="functions">
+								<a href="javascript:void(0);"  >多功能输入</a>
+							</li>
+							<li class="" data-action="extends">
+								<a href="javascript:void(0);" >扩展属性</a>
+							</li>
+						</ul>
+						<div class="tab-content pt30 p30">               
+		
+						</div>     
+					</div>
+				</div>    
+		</div>
+		<!-- 隐藏域 -->
+		<input type="hidden" id="merchantRegistLogId" value="${merchantRegistLog.id }"/>
+	</body>
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantRegistLog/merchantRegistLogExtendsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantRegistLog/merchantRegistLogExtendsInfo.jsp
new file mode 100644
index 0000000..592687a
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantRegistLog/merchantRegistLogExtendsInfo.jsp
@@ -0,0 +1,201 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>           
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> 
+<div class="tab-pane active">      
+	<div class="animated fadeInRight">
+		<div class="whitebg pl10 pr10">
+			<table class="table table-striped table-bordered table-hover">     
+				<thead> 
+					<tr>  
+						<th class="textc">序号</th>         
+						<th class="textc wp15">流水账号</th>
+						<th class="textc">日期</th>         
+						<th class="textc">财务类别</th>     
+						<th class="textc">金额</th>         
+						<th class="textc">银行</th>         
+						<th class="textc">发票</th>         
+						<th class="textc">客户名称</th>     
+						<th class="textc wp15">单号</th>    
+						<th class="textc">状态</th>         
+						<th class="textc">类别</th>         
+						<th class="textc">操作</th>         
+					</tr> 
+				</thead>
+				<tbody> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+                
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="green">支出</span></td>     
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+				</tbody>
+                
+			</table>  
+			<!-- footer -->  
+			<div class="clearfix mb10 pb20">          
+					<div class="layui-tab-item fr">       
+							<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+							<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>   
+							<div class="pagination dlblock vm" id="pagination"></div>
+							<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>            
+					</div>
+				</div>  
+		</div>      
+	</div>        
+</div>          
+                
+<script type="text/javascript">    
+//分页          
+$('#pagination').pagination({        
+	pageCount: 50,
+	jump: true,   
+	coping: true, 
+	homePage: '首页',    
+	endPage: '末页',     
+	prevContent: '上页', 
+	nextContent: '下页', 
+	callback: function(api) {          
+		$('.now').text(api.getCurrent());
+	}             
+});             
+</script>       
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantRegistLog/merchantRegistLogFunctionsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantRegistLog/merchantRegistLogFunctionsInfo.jsp
new file mode 100644
index 0000000..982ce84
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantRegistLog/merchantRegistLogFunctionsInfo.jsp
@@ -0,0 +1,130 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>		
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">      
+<div class="tab-pane active">
+				<div class="panel-body">
+					<div class="wrapper wrapper-content">     
+						<div class="panel-form animated fadeInRight wp60 fc">
+							<!-- 账号资料 -->
+			<div class="layui-form-item 	has-error">
+				<label class="layui-form-label">单行输入框<i class="red">*</i></label>
+				<div class="layui-input-block">
+					<input type="text" name="title" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input">
+				</div>                                         
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">自定义验证</label>
+				<div class="layui-input-inline ml30">
+					<input type="password" name="password" lay-verify="pass" placeholder="请输入密码" autocomplete="off" class="layui-input">
+				</div>
+				<div class="layui-form-mid layui-word-aux">请填写6到12位密码</div>
+			</div>
+			<div class="form-group">
+				<div class="layui-form-item">          
+					<label class="layui-form-label">单行选择框</label>
+					<div class="layui-input-block">
+						<select name="interest" lay-filter="aihao">  
+							<option value=""></option>
+							<option value="0">写作</option>         
+							<option value="1" selected="">阅读</option>
+							<option value="2">游戏</option>
+							<option value="3">音乐</option>
+							<option value="4">旅行</option>  
+						</select>              
+					</div>
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<div class="layui-inline">  
+					<label class="layui-form-label">范围</label>
+					<div class="layui-input-inline ml30">
+						<input type="text" name="price_min" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>                                     
+					<div class="layui-form-mid">-</div>
+					<div class="layui-input-inline">       
+						<input type="text" name="price_max" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>
+				</div>           
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">联动选择框</label>
+				<div class="layui-input-inline ml30">
+					<select name="quiz1">     
+						<option value="">请选择省</option>
+						<option value="浙江" selected="">浙江省</option> 
+						<option value="你的工号">江西省</option>           
+						<option value="你最喜欢的老师">福建省</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz2">
+						<option value="">请选择市</option>
+						<option value="杭州">杭州</option>
+						<option value="宁波" disabled="">宁波</option>
+						<option value="温州">温州</option>
+						<option value="温州">台州</option>
+						<option value="温州">绍兴</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz3">
+						<option value="">请选择县/区</option>
+						<option value="西湖区">西湖区</option>
+						<option value="余杭区">余杭区</option>
+						<option value="拱墅区">临安市</option>
+					</select>
+				</div>    
+			</div>
+			<div class="layui-form-item" pane="">   
+				<label class="layui-form-label">原始复选框</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="like1[write]" lay-skin="primary" title="写作" checked="">  
+					<input type="checkbox" name="like1[read]" lay-skin="primary" title="阅读">
+					<input type="checkbox" name="like1[game]" lay-skin="primary" title="游戏" disabled="">
+				</div>
+			</div>
+
+			<div class="layui-form-item">
+				<label class="layui-form-label">开关-默认关</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="close" lay-skin="switch" lay-text="ON|OFF">
+				</div>
+			</div>
+			<div class="layui-form-item">  
+				<label class="layui-form-label">单选框</label>
+				<div class="layui-input-block">
+					<input type="radio" name="sex" value="男" title="男" checked="">
+					<input type="radio" name="sex" value="女" title="女">
+					<input type="radio" name="sex" value="禁" title="禁用" disabled="">
+				</div>
+			</div>
+			<!--<div class="layui-form-item layui-form-text">
+				<label class="layui-form-label">上传图片</label>
+				<div class="layui-input-block">
+					<div class="layui-upload-drag w200 h200">
+						<i class="layui-icon"></i>          
+						<p>点击上传</p>
+					</div>
+				</div>
+			</div>-->
+				<div class="layui-form-item layui-form-text">
+					<label class="layui-form-label">普通文本域</label>  
+					<div class="layui-input-block">              
+						<textarea placeholder="请输入内容" class="layui-textarea"></textarea>
+					</div>
+				</div>
+			</div>
+		</div>   
+	</div>
+</div>
+</form>   
+<script type="text/javascript">
+	//form表单样式
+	layui.use(['layer', 'form'], function() {    
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+</script>                 
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantRegistLog/merchantRegistLogList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantRegistLog/merchantRegistLogList.jsp
new file mode 100644
index 0000000..be918d1
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantRegistLog/merchantRegistLogList.jsp
@@ -0,0 +1,119 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black">
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->
+<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+<jsp:include page="../../common.jsp" />
+<script type="text/javascript">
+     require("js/merchantRegistLog/merchantRegistLogList.js");
+</script>
+</head>
+<body>
+	<div class="row animated fadeInRight" style="margin: 0;">
+		<div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+			<div class="toolbar-panel bdd">
+				<div class="toolbar-box">
+					<div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+						<!-- 顶部按钮 -->
+						<div class="buttons fl">
+							<a class="btn btn-primary fa fa-search f13" href="javascript:void(0);" onclick="queryMerchantRegistLog()"><span>搜索</span></a>
+							<a class="btn btn-primary fa fa-plus f13 add" href="javascript:void(0);" onclick="initAddMerchantRegistLog()"><span>添加</span></a>
+							<a class="btn btn-primary fa fa-edit f13" href="javascript:void(0);" onclick="initEditMerchantRegistLog()"><span>编辑</span></a> 
+							<a class="btn btn-primary fa fa-remove f13 delete" href="javascript:void(0);" onclick="initBatchDeleteMerchantRegistLog()"><span>删除</span></a> 
+						</div>
+						<div class="tools fr">
+							<a href="javascript:void(0);" class="collapse dblock f14 dgray mr5"> 
+								<i class="fa-2x fa fa-angle-double-up"></i>
+							</a>
+						</div>
+					</div>
+				</div>
+
+				<!--搜索条件 -->
+				<div class="toolbar-body">
+					<div class="row pt10 pb10 whitebg ml0 mr0">
+						<span class="dlblock w100 textr">ID：</span> 
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+							<input type="text" placeholder="请输入内容" id="searchId">  
+						</span> 
+						<span class="dlblock w100 textr">名称：</span> 
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+							<input type="text" placeholder="请输入名称">
+						</span> 
+						<span class="dlblock w100 textr">类别：</span>
+						 <select class="form-control f12 w180 textc">
+							<option value="">支出</option>
+							<option value="">收入</option>
+						</select>
+					</div>
+					<div class="mt10 mb20">
+						<span class="dlblock w100 textr">开始日期</span>
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+							 <input type="text" placeholder="" id="date1" class="w150">
+							 <i class="fa fa-calendar"></i>
+						</span> 
+						<span class="dlblock w100 textr">结束日期</span>
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+						<input type="text" placeholder="" id="date2" class="w150"> 
+							<i class="fa fa-calendar"></i>
+						</span>
+					</div>
+				</div>
+			</div>
+		</div>
+		<!-- 表单数据 -->
+		<div class="mb20 mt10">
+			<div class="whitebg pl10 pr10">
+				<table class="table table-striped table-bordered table-hover">
+					<thead>
+						<tr>
+							<th class="textc">
+								<div class="checker" id="allCheck">
+									<span class=""><input type="checkbox" value="" ></span>
+								</div>
+							</th>
+							<th class="textc ">id</th>
+							<th class="textc ">merchantCode</th>
+							<th class="textc ">storeId</th>
+							<th class="textc ">applyStatus</th>
+							<th class="textc wp15">message</th>
+							<th class="textc ">createDt</th>
+							<th class="textc ">merchantName</th>
+							<th class="textc ">merchantId</th>
+							<th class="textc wp15">parentCode</th>
+							<th class="textc ">creator</th>
+							<th class="textc">编辑</th>
+						</tr>
+					</thead>
+					<!-- 数据体 -->
+					<tbody id="data_content">
+					</tbody>
+				</table>
+			
+			<!-- footer -->
+				<div class="clearfix mb10 pb20">
+						<div class="layui-tab-item fr">
+								<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+								<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>
+								<div class="pagination dlblock vm" id="pagination"></div>
+								<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>
+						</div>
+					</div>
+	
+			</div>
+		</div>
+	</div>
+</body>
+
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantRejectDesc/list.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantRejectDesc/list.jsp
new file mode 100644
index 0000000..d825e51
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantRejectDesc/list.jsp
@@ -0,0 +1,295 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" id="form1" action="" style="margin-top: 10px;">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">驳回原因</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="rejectName" id="rejectName" placeholder="请输入驳回原因"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <div class="mb50 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-hide" id="merchantRejectDescTab" lay-filter="merchantRejectDescTab"></table>
+        </div>
+    </div>
+</div>
+<script type="text/html" id="edit">
+    <form class="layui-form" id="form2" style="margin-top: 2rem;">
+        <input name="id" id="id" hidden>
+        <div class="layui-form-item" style="width: 300px;">
+            <label class="layui-form-label">驳回原因</label>
+            <div class="layui-input-block">
+                    <textarea class="layui-textarea" name="rejectName" id="rejectNameEdit"
+                              autocomplete="off"></textarea>
+                <%--                <input type="text" name="rejectName" id="rejectNameEdit" style="cursor: pointer" placeholder="请输入驳回原因"  autocomplete="off" class="layui-input">--%>
+            </div>
+        </div>
+        <div class="layui-form-item" style="width: 300px;">
+            <label class="layui-form-label">排序</label>
+            <div class="layui-input-block">
+                <input type="number" name="sort" id="sort" style="cursor: pointer" placeholder="请输入排序"
+                       autocomplete="off" class="layui-input">
+            </div>
+        </div>
+    </form>
+</script>
+
+<script type="text/html" id="leftBar">
+    <a class="layui-btn layui-btn-normal layui-btn-sm" lay-event="search">
+        <i class="layui-icon layui-icon-search"></i>
+        查询
+    </a>
+    <a class="layui-btn layui-btn-sm" lay-event="add">
+        <i class="layui-icon layui-icon-add-1"></i>添加
+    </a>
+</script>
+
+<script type="text/html" id="toolBar">
+    <a class="layui-btn layui-btn-xs" lay-event="edit">
+        <i class="layui-icon layui-icon-edit"></i>编辑
+    </a>
+    <a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="del">
+        <i class="layui-icon layui-icon-delete"></i>删除
+    </a>
+</script>
+
+<script>
+    var sort = '${sort}';
+    layui.use(['table', 'layer', 'form'], function () {
+        var table = layui.table;
+        var layer = layui.layer;
+        var form = layui.form;
+        var tableIns = table.render({
+            elem: '#merchantRejectDescTab'
+            , url: '${ctx}/merchantRejectDesc/page'
+            , id: 'merchantRejectDesc'
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            , toolbar: '#leftBar' //开启头部工具栏，并为其绑定左侧模板
+            , defaultToolbar: ['filter']
+            , title: '商户审核驳回描述信息表'
+            , cols: [[
+                {type: 'checkbox', fixed: 'left', hidden: true}
+                , {field: 'numbers', title: '序号', fixed: 'left', unresize: true, width: 80, type: 'numbers'}
+                , {field: 'rejectName', title: '驳回原因', width: 900}
+                , {field: 'sort', title: '排序', sort: true}
+                , {
+                    field: 'createTime',
+                    title: '创建时间',
+                    width: 160,
+                    templet: "<div>{{layui.util.toDateString(d.createTime,'yyyy-MM-dd HH:mm:ss')}}</div>"
+                }
+                , {
+                    field: 'updateTime',
+                    title: '修改时间',
+                    width: 160,
+                    templet: "<div>{{layui.util.toDateString(d.updateTime,'yyyy-MM-dd HH:mm:ss')}}</div>"
+                }
+                , {fixed: 'right', title: '操作', width: 200, toolbar: '#toolBar'}
+            ]]
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , page: true
+        });
+        table.on('tool(merchantRejectDescTab)', function (obj) { //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            var data = obj.data; //获得当前行数据
+            var layEvent = obj.event; //获得 lay-event 对应的值（也可以是表头的 event 参数对应的值）
+            if (layEvent === 'edit') { //编辑
+                //do something
+                toAdd(obj);
+                //同步更新缓存对应的值
+                // obj.update({
+                //     rejectName: '123'
+                //     ,sort: 'xxx'
+                // });
+            } else if (layEvent === 'del') { //编辑
+                layer.confirm('真的删除么?', {icon: 3}, function (index) {
+                    obj.del(); //删除对应行（tr）的DOM结构，并更新缓存
+                    layer.close(index);
+                    del(data);
+                    //向服务端发送删除指令
+                });
+            }
+        });
+
+        //监听头工具栏事件
+        table.on('toolbar(merchantRejectDescTab)', function (obj) {
+            switch (obj.event) {
+                case 'add':
+                    // 添加
+                    toAdd();
+                    break;
+                case 'search':
+                    var params = serialize($('#form1'));
+                    table.reload('merchantRejectDesc', {
+                        where: params
+                        , page: {
+                            curr: 1
+                        }
+                    });
+                    break;
+            }
+        });
+
+        function toAdd(obj) {
+            var msg = '新增';
+            if (obj !== undefined) {
+                msg = '编辑';
+            }
+            var index = layer.open({
+                type: 1
+                , shade: 0.5
+                , title: msg
+                , maxmin: true
+                , content: $("#edit").html()
+                , area: ['400px', '400px']
+                , btn: ['保存', '取消',]
+                , shadeClose: true
+                , btn1: function (index, layero) {
+                    if (!$("#rejectNameEdit").val()) {
+                        layer.msg("驳回原因不能为空！");
+                        return;
+                    }
+                    if (!$("#sort").val()) {
+                        layer.msg("排序不能为空!");
+                        return;
+                    }
+                    layer.close(index);
+                    toEdit(obj);
+                }
+                , btn2: function (index, layero) {
+                    layer.close(index);
+                }
+                , success: function () {
+                    if (obj != undefined) {
+                        $("#id").val(obj.data.id);
+                        $("#rejectNameEdit").val(obj.data.rejectName);
+                        $("#sort").val(obj.data.sort);
+                    } else {
+                        $("#sort").val(sort);
+                    }
+                }
+            });
+            form.render();
+        }
+
+        function toEdit(obj) {
+            var data = $("#form2").serializeObject();
+            $.ajax({
+                url: '${ctx}/merchantRejectDesc/saveOrUpdate',
+                method: 'post',
+                data: JSON.stringify(data),
+                dataType: 'JSON',
+                contentType: "application/json",
+                success: function (res) {
+                    if (res.code == 200) {
+                        layer.msg(res.data, {
+                            icon: 1
+                        });
+                        if (obj != undefined) {
+                            obj.update({
+                                rejectName: data.rejectName,
+                                sort: data.sort
+                            });
+                            // $("[lay-event=edit]").hide();
+                        } else {
+                            tableIns.reload();
+                            sort++;
+                        }
+                    } else {
+                        layer.msg(res.data, {
+                            icon: 2
+                        });
+                    }
+                }
+            })
+        }
+
+        function del(obj) {
+            $.ajax({
+                url: '${ctx}/merchantRejectDesc/del/' + obj.id,
+                method: 'DELETE',
+                dataType: 'JSON',
+                contentType: "application/json",
+                success: function (res) {
+                    if (res.code == 200) {
+                        layer.msg(res.data, {
+                            icon: 1
+                        });
+                        sort++;
+                    } else {
+                        layer.msg(res.data, {
+                            icon: 2
+                        });
+                    }
+                }
+            })
+        }
+    });
+
+    jQuery.prototype.serializeObject = function () {
+        var obj = new Object();
+        $.each(this.serializeArray(), function (index, param) {
+            if (!(param.name in obj)) {
+                obj[param.name] = param.value;
+            }
+        });
+        return obj;
+    };
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantStore/mercSplitSettingDetail.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantStore/mercSplitSettingDetail.jsp
new file mode 100644
index 0000000..b8b516f
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantStore/mercSplitSettingDetail.jsp
@@ -0,0 +1,168 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp" />
+</head>
+<body>
+<form class="layui-form" action="" style="width: 70%">
+    <input name="id" value="${entity.id}" hidden/>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">主商户名</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="chieMerchantName" value="${merchant.alias}"  readonly placeholder="主商户名" autocomplete="off" class="layui-input layui-disabled"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">主商户号</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="chieMerchantCode" value="${merchant.merchantCode}" lay-verify="required"  readonly placeholder="主商户号" autocomplete="off" class="layui-input layui-disabled"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item" style="display: none">
+        <label class="layui-form-label">主通道商编</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="chieMerchantId" value="${channel.merchantId}" lay-verify="required"  readonly placeholder="主通道商户编号" autocomplete="off" class="layui-input layui-disabled"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">原订单分账</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <select name="isDivistion" class="layui-select" lay-verify="required">
+                    <option value="">请选择</option>
+                    <option value="01" ${empty entity or entity.isDivistion == '01' ? 'selected' : ''}>是</option>
+                    <option value="02" ${entity.isDivistion == '02' ? 'selected' : ''}>否</option>
+                </select>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">分账模式</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <select name="divisionMode" class="layui-select" lay-verify="required">
+                    <option value="">请选择</option>
+                    <option value="01" ${empty entity or entity.divisionMode == '01' ? 'selected' : ''}>比例</option>
+                    <option value="02" ${entity.divisionMode == '02' ? 'selected' : ''}>金额</option>
+                </select>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">分账商户号</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="diviMerchantCode" value="${entity.diviMerchantCode}" lay-verify="required"  placeholder="分账商户号" autocomplete="off" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item" style="display: none">
+        <label class="layui-form-label">分账通道号</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="diviMerchantId" value="${entity.diviMerchantId}"  placeholder="分账通道商户号" autocomplete="off" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">分账金额</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="divAmt" type="number" value="${entity.divAmt}"   placeholder="分账金额" autocomplete="off" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">分账比例</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="divRatio" type="number" value="${entity.divRatio}"   placeholder="分账比例" autocomplete="off" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">手续费</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <select name="isChargeFee" class="layui-select" >
+                    <option value="">请选择</option>
+                    <option value="01" ${empty entity or entity.isChargeFee == '01' ? 'selected' : ''}>是</option>
+                    <option value="02" ${entity.isChargeFee == '02' ? 'selected' : ''}>否</option>
+                </select>
+            </div>
+        </div>
+    </div>
+
+
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button class="layui-btn" lay-submit lay-filter="formDemo">立即提交</button>
+            <button type="button" id="close" class="layui-btn layui-btn-primary">关闭</button>
+        </div>
+    </div>
+</form>
+
+<script>
+    //Demo
+    layui.use(['form','layer'], function(){
+        var form = layui.form;
+        var layer = layui.layer;
+        $('#close').click(function() {
+            parent.layer.closeAll();
+        });
+            //监听提交
+        form.on('submit(formDemo)', function(data){
+            var index = layer.load(1,{shade: [0.1,'#000'] });
+            $.ajax({
+                url: '${ctx}/mercSplitSetting/save',
+                method: 'post',
+                data: JSON.stringify(data.field),
+                dataType: 'JSON',
+                contentType:"application/json",
+                success: function(res) {
+                    layer.close(index);
+                    if(res.code == 200) {
+                        layer.msg(res.message, { icon: 1, time: 1000 }, function () {
+                            var index = parent.layer.getFrameIndex(window.name);
+                            parent.layui.table.reload('mercSplitSetting');
+                            parent.layer.close(index);
+                        });
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 2
+                        });
+                    }
+                }
+            })
+            return false;
+        });
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantStore/mercSplitSettingList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantStore/mercSplitSettingList.jsp
new file mode 100644
index 0000000..f920dbb
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantStore/mercSplitSettingList.jsp
@@ -0,0 +1,196 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp" />
+</head>
+<body>
+
+<form class="layui-form" id="form1" action="" style="margin-top: 30px;">
+    <div class="layui-inline">
+        <label class="layui-form-label">主商户号</label>
+        <div class="layui-input-block">
+            <input type="text" name="chieMerchantCode"  placeholder="主商户号" autocomplete="off" class="layui-input">
+        </div>
+    </div>
+    <div class="layui-inline">
+        <label class="layui-form-label">主商户名</label>
+        <div class="layui-input-block">
+            <input type="text" name="chieMerchantName"  placeholder="主商户名称" autocomplete="off" class="layui-input">
+        </div>
+    </div>
+</form>
+<table class="layui-hide" id="mercSplitSettingTab" lay-filter="mercSplitSettingTab"></table>
+<script type="text/html" id="leftBar">
+    <button type="button" class="layui-btn layui-btn-sm" lay-event="add"><i class="layui-icon">&#xe608;</i>新增</button>
+    <button type="button" class="layui-btn layui-btn-normal layui-btn-sm" lay-event="search"><i class="layui-icon">&#xe615;</i>查询</button>
+</script>
+
+<script type="text/html" id="toolBar">
+    <button type="button" class="layui-btn layui-btn-sm" lay-event="edit"><i class="layui-icon">&#xe642;</i>编辑</button>
+    <button type="button" class="layui-btn layui-btn-sm layui-btn-danger" lay-event="del"><i class="layui-icon">&#xe640;</i>删除</button>
+</script>
+
+<script>
+    layui.use(['table', 'layer'], function(){
+        var table = layui.table;
+        var layer = layui.layer;
+
+        var tableIns = table.render({
+            elem: '#mercSplitSettingTab'
+            ,url:'${ctx}/mercSplitSetting/selectPage'
+            ,id: 'mercSplitSetting'
+            ,response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                ,countName: 'count' //数据总数的字段名称，默认：count
+                ,dataName: 'data' //默数据列表的字段名称，认：data
+                ,statusCode : 200
+            }
+            ,parseData: function(res){ //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.count, //解析数据长度
+                    "data": res.data.data //解析数据列表
+                };
+            }
+            ,toolbar: '#leftBar' //开启头部工具栏，并为其绑定左侧模板
+            , defaultToolbar: ['filter']
+            ,defaultToolbar: ['filter', 'exports', 'print', { //自定义头部工具栏右侧图标。如无需自定义，去除该参数即可
+                title: '提示'
+                ,layEvent: 'LAYTABLE_TIPS'
+                ,icon: 'layui-icon-tips'
+            }]
+            ,title: '商户分账信息表'
+            ,cols: [[
+                {type: 'checkbox', fixed: 'left', hidden: true}
+                ,{field:'numbers', title:'序号', fixed: 'left', unresize: true, width:80, type:'numbers'}
+                ,{field:'chieMerchantName', title:'主商户名'}
+                ,{field:'chieMerchantCode', title:'主商户号'}
+                ,{field:'diviMerchantName', title:'分账商户名'}
+                ,{field:'diviMerchantCode', title:'分账商户号'}
+                // ,{field:'chieMerchantId', title:'通道商户号'}
+                ,{field:'isDivistion', title:'是否分账',templet: function (d) {
+                    return d.isDivistion === '01' ? "是" : "否";
+                }}
+                ,{field:'divisionMode', title:'分账模式',templet: function (d) {
+                        return d.isDivistion === '01' ? "比例" : "金额";
+                }}
+                // ,{field:'diviMerchantCode', title:'分账通道商编'}
+                ,{field:'divAmt', title:'分账金额',templet: function (d) {
+                    return d.divAmt ? d.divAmt.toFixed(2) : "-";
+                }}
+                ,{field:'divRatio', title:'分账比例'}
+                // ,{field:'isChargeFee', title:'收取手续费',templet: function (d) {
+                //     return d.isDivistion === '01' ? "是" : "否";
+                // }}
+
+                ,{field:'status', title:'状态',templet: function (d) {
+                    if(d.status == '1'){
+                        return "<span style='color: green'>正常</span>"
+                    }else{
+                        return "<span style='color: red'>关闭</span>"
+                    }
+                 }}
+                ,{field: 'createTime', title: '创建时间', width: 160,templet : "<div>{{layui.util.toDateString(d.createTime,'yyyy-MM-dd HH:mm:ss')}}</div>"}
+                ,{fixed: 'right', title:'操作',width:200, toolbar: '#toolBar'}
+            ]]
+            ,request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                ,limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            ,page: true
+        });
+        table.on('tool(mercSplitSettingTab)', function(obj){ //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            var data = obj.data; //获得当前行数据
+            var layEvent = obj.event; //获得 lay-event 对应的值（也可以是表头的 event 参数对应的值）
+            if(layEvent === 'del'){ //删除
+                layer.confirm('真的删除么?',{icon:3},function(index){
+                    obj.del(); //删除对应行（tr）的DOM结构，并更新缓存
+                    layer.close(index);
+                    del(data);
+                    //向服务端发送删除指令
+                });
+            } else if(layEvent === 'edit'){ //编辑
+                //do something
+                toAdd(obj.data);
+                //同步更新缓存对应的值
+                // obj.update({
+                //     username: '123'
+                //     ,title: 'xxx'
+                // });
+            }
+        });
+
+        //监听头工具栏事件
+        table.on('toolbar(mercSplitSettingTab)', function (obj) {
+            switch (obj.event) {
+                case 'add':
+                    // 添加
+                    toAdd();
+                    break;
+                case 'search':
+                    var params= serialize($('#form1'));
+                    table.reload('mercSplitSetting', {
+                        where: params
+                        , page: {
+                            size: 10
+                            , current: 1
+                        }
+                    });
+                    break;
+            }
+        });
+        function toAdd(obj) {
+            let csId = '${csId}';
+            var url = '${ctx}/mercSplitSetting/detail/'+csId;
+            var title = "新增";
+            if(obj != undefined){
+                url = "${ctx}/mercSplitSetting/detail/"+csId+"/"+obj.id;
+                title = "编辑"
+            }
+            var index = layer.open({
+                type: 2
+                ,shade: 0.5
+                ,title: title
+                ,maxmin: true
+                , content: url
+                , area: ['450px', '620px']
+                ,end:function () {
+
+                }
+            });
+        }
+        function del(obj) {
+            $.ajax({
+                url: '${ctx}/mercSplitSetting/del/'+obj.id,
+                method: 'DELETE',
+                dataType: 'JSON',
+                contentType:"application/json",
+                success: function(res) {
+                    if(res.code == 200) {
+                        layer.msg(res.data, {
+                            icon: 1
+                        });
+                    } else {
+                        layer.msg(res.data, {
+                            icon: 2
+                        });
+                    }
+                }
+            })
+        }
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantStore/merchantStoreBaseInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantStore/merchantStoreBaseInfo.jsp
new file mode 100644
index 0000000..d57e509
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantStore/merchantStoreBaseInfo.jsp
@@ -0,0 +1,174 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">  
+	<div class="tab-pane active">     
+		<div class="panel-body">
+			<div class="wrapper wrapper-content">
+				<div class="panel-form animated fadeInRight wp60 fc">
+					<div class="layui-form-item dn	has-error" >   
+						<label class="layui-form-label">id</label>  
+						<div class="layui-input-block">
+							<input type="text" name="id" lay-verify="title" autocomplete="off"  placeholder="请输入内容" class="layui-input" value="${merchantStore.id }" >
+						</div>  
+					</div>
+					<c:if test="${admin eq 'admin' }">
+						<div class="form-group">
+			                <div class="layui-form-item">          
+			                    <label class="layui-form-label">商户</label>
+			                    <div class="layui-input-block">
+			                        <select name="merchantCode" lay-filter="aihao" id="merchantCode">
+			                            <option value="">请选择</option>
+			                            <c:forEach items="${merchantBaseInfoList }" var="mb">
+			                                 <option value="${mb.merchantCode }" <c:if test="${mb.merchantCode eq merchantStore.merchantCode }">selected="selected"</c:if>>${mb.merchantName }</option>
+			                            </c:forEach>
+			                        </select>           
+			                    </div>
+			                </div>
+			            </div>
+			            <input type="hidden"  id="isAdmin" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="1" >
+					</c:if>
+					<c:if test="${admin ne 'admin' }">
+						 <div class="layui-form-item dn  has-error" >
+	                        <label class="layui-form-label">merchantCode</label>  
+	                        <div class="layui-input-block">
+	                            <input type="text" name="merchantCode" id="merchantCode" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantStore.merchantCode }" >
+	                        </div>  
+	                    </div>
+	                    <input type="hidden"  id="isAdmin" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="0" >
+					</c:if>
+					 
+					<%--
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">storeId</label>  
+						<div class="layui-input-block">
+							<input type="text" name="storeId" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantStore.storeId }" >
+						</div>  
+					</div> --%>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">店铺名称</label>  
+						<div class="layui-input-block">
+							<input type="text" name="storeName" id="storeName" lay-verify="title" autocomplete="off"  placeholder="请输入内容" class="layui-input" value="${merchantStore.storeName }" >
+						</div>  
+					</div>
+					<div class="layui-form-item    has-error" >   
+                        <label class="layui-form-label">门店地址</label>  
+                        <div class="layui-input-block">
+                            <input type="text" name="address" id="address" lay-verify="title" autocomplete="off"  placeholder="请输入内容" class="layui-input" value="${merchantStore.address }" >
+                        </div>  
+                    </div>
+                    
+                    <div class="layui-form-item     has-error" >   
+                        <label class="layui-form-label">电话号码</label>  
+                        <div class="layui-input-block">
+                            <input type="text" name="linkPhone" id="linkPhone" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantStore.linkPhone }" >
+                        </div>  
+                    </div>
+                    
+                    <div class="form-group">
+                <div class="layui-form-item">          
+                    <label class="layui-form-label">经营类目</label>
+                    <div class="layui-input-block">
+                        <select name="productDesc" id="productDesc">  
+                            <option value=""></option>
+                            <option value="餐饮" <c:if test="${merchantStore.productDesc eq '餐饮' }">selected</c:if>>餐饮</option>         
+                            <option value="线下零售" <c:if test="${merchantStore.productDesc eq '线下零售' }">selected</c:if>>线下零售</option>
+                            <option value="居民生活服务" <c:if test="${merchantStore.productDesc eq '居民生活服务' }">selected</c:if>>居民生活服务</option>
+                            <option value="休闲娱乐" <c:if test="${merchantStore.productDesc eq '休闲娱乐' }">selected</c:if>>休闲娱乐</option>
+                            <option value="交通出行" <c:if test="${merchantStore.productDesc eq '交通出行' }">selected</c:if>>交通出行</option>  
+                            <option value="其它" <c:if test="${merchantStore.productDesc eq '其它' }">selected</c:if>>其它</option>  
+                        </select>              
+                    </div>
+                </div>
+            </div>
+					
+					<div class="layui-form-item    has-error" >   
+                        <label class="layui-form-label">营业时间</label>  
+                        <div class="layui-input-block">
+                            <input type="text" id="openingTime" name="openingTime" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${merchantStore.openingTime }" >
+                        </div>  
+                    </div>
+					
+					<div class="layui-form-item layui-form-text">
+                    <label class="layui-form-label">简介</label>  
+                    <div class="layui-input-block">              
+                        <textarea name="storeDesc"  placeholder="请输入内容" id="storeDesc" class="layui-textarea">${merchantStore.storeDesc }</textarea>
+                    </div>
+                </div>
+                
+                
+                <div class="form-group">
+                <div class="layui-form-item">          
+                    <label class="layui-form-label">店铺状态</label>
+                    <div class="layui-input-block">
+                        <select name="status" lay-filter="aihao" id="status">
+                            <option value="">请选择</option>
+                            <option value="0" <c:if test="${merchantStore.status eq '0' }">selected="selected"</c:if>>商家打烊</option>         
+                            <option value="1" <c:if test="${merchantStore.status eq '1' }">selected="selected"</c:if>>营业中</option>
+                            <option value="2" <c:if test="${merchantStore.status eq '2' }">selected="selected"</c:if>>系统禁用</option>
+                        </select>           
+                    </div>
+                </div>
+            </div>
+            
+            
+            <div class="layui-form-item layui-form-text" onclick="uploadImage1()">
+                <label class="layui-form-label">门店LOGO</label>
+                <div class="layui-input-block"  >
+                    <div class="layui-upload-drag w300 h200 postionr">
+                        <i class="layui-icon"> </i>    
+                        <img src="${merchantStore.logo}" id="demo1" onerror="this.src='${ctx }/resources/images/error.jpg'" class="positiona top0 left0 w300 h200 dblock">      
+                        <input type="hidden" name="logo" value="${merchantStore.logo}"   id="logo">
+                    </div>
+                </div>
+            </div>
+            
+					
+			<div class="layui-form-item layui-form-text" onclick="uploadImage2()">
+                <label class="layui-form-label">门头照</label>
+                <div class="layui-input-block"  >
+                    <div class="layui-upload-drag w300 h200 postionr">
+                        <i class="layui-icon"> </i>    
+                        <img src="${merchantStore.storeHeadPic}" id="demo2" onerror="this.src='${ctx }/resources/images/error.jpg'" class="positiona top0 left0 w300 h200 dblock">      
+                        <input type="hidden" name="storeHeadPic" value="${merchantStore.storeHeadPic}"   id="storeHeadPic">
+                    </div>
+                </div>
+            </div>
+            
+            <div class="layui-form-item layui-form-text" onclick="uploadImage3()">
+                <label class="layui-form-label">收银台照</label>
+                <div class="layui-input-block"  >
+                    <div class="layui-upload-drag w300 h200 postionr">
+                        <i class="layui-icon"> </i>    
+                        <img src="${merchantStore.cashPic}" id="demo3" onerror="this.src='${ctx }/resources/images/error.jpg'" class="positiona top0 left0 w300 h200 dblock">      
+                        <input type="hidden" name="cashPic" value="${merchantStore.cashPic}"   id="cashPic">
+                    </div>
+                </div>
+            </div>
+            
+            <div class="layui-form-item layui-form-text" onclick="uploadImage4()">
+                <label class="layui-form-label">店内环境照</label>
+                <div class="layui-input-block"  >
+                    <div class="layui-upload-drag w300 h200 postionr">
+                        <i class="layui-icon"> </i>    
+                        <img src="${merchantStore.storeInsidePic}" id="demo4" onerror="this.src='${ctx }/resources/images/error.jpg'" class="positiona top0 left0 w300 h200 dblock">      
+                        <input type="hidden" name="storeInsidePic" value="${merchantStore.cashPic}"   id="storeInsidePic">
+                    </div>
+                </div>
+            </div>
+					
+			
+				</div>
+			</div>
+		</div>  
+	</div>
+</form>
+<script type="text/javascript">
+//form表单样式
+layui.use(['layer', 'form'], function() {    
+    var layer = layui.layer,
+        form = layui.form;
+    form.render();
+});
+</script>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantStore/merchantStoreForbidden.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantStore/merchantStoreForbidden.jsp
new file mode 100644
index 0000000..a7957e2
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantStore/merchantStoreForbidden.jsp
@@ -0,0 +1,79 @@
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+    <style>
+        .layui-input, .layui-textarea {
+            border-color: #606060;
+        }
+    </style>
+</head>
+<body>
+<form class="layui-form" action="" style="width: 80%; margin-top: 20px">
+    <div class="layui-form-item">
+        <label class="layui-form-label">备注：</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <textarea name="remark" id="remark" placeholder="备注说明" class="layui-textarea"></textarea>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button class="layui-btn" lay-submit lay-filter="formDemo">确认更改</button>
+            <button type="button" id="close" class="layui-btn layui-btn-primary">关闭</button>
+        </div>
+    </div>
+</form>
+
+<script>
+    //Demo
+    layui.use(['form', 'layer'], function () {
+        var form = layui.form;
+        var layer = layui.layer;
+        var mParent = parent;
+
+        $('#close').click(function () {
+            parent.layer.closeAll();
+        });
+
+        //监听提交
+        form.on('submit(formDemo)', function (data) {
+            var index = layer.load(1, {shade: [0.1, '#000']});
+            $.ajax({
+                url: ctx + '/merchantStore/disableMerchantStore',
+                method: 'post',
+                data: {
+                    id: '${id}',
+                    resultValue: '${resultValue}',
+                    remark: $("#remark").val()
+                },
+                dataType: 'JSON',
+                success: function (res) {
+                    layer.close(index);
+                    layer.msg(res.msg);
+                    if (res.resultCode == 1) {
+                        setInterval(function (){
+                            mParent.layer.closeAll();
+                            mParent.reload();
+                        },1500)
+                    }
+                }
+            })
+            return false;
+        });
+    });
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantStore/merchantStoreList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantStore/merchantStoreList.jsp
new file mode 100644
index 0000000..24aeedb
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantStore/merchantStoreList.jsp
@@ -0,0 +1,1072 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="minWidth=device-minWidth, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+    <script type="text/javascript">
+        require("js/merchantStore/merchantStoreList.js");
+        require("js/jquery.qrcode.min.js");
+    </script>
+    <style type="text/css">
+        .layui-table th {
+            text-align: center;
+        }
+
+        .layui-dropdown {
+            min-minWidth: 0px !important;
+        }
+
+        /*.layui-dropdown-item*/
+        .layui-dropdown-item .layui-menu {
+            background-color: #fff;
+            border: none;
+        }
+
+        .layui-dropdown-item .layui-menu li {
+            color: #fff;
+            padding: 0;
+        }
+
+        .layui-menu {
+            margin: 5px;
+        }
+
+        .layui-menu li, .layui-menu-body-title a {
+            padding: 0;
+        }
+
+        .layui-menu-body-title a {
+            display: block;
+            margin: 0 !important;
+            color: rgba(255, 255, 255, .8);
+        }
+
+        .c1 {
+            position: fixed;
+            top: 0;
+            bottom: 0;
+            left: 0;
+            right: 0;
+            background: rgba(0, 0, 0, .5);
+            z-index: 2;
+        }
+
+        .c5 {
+            position: fixed;
+            minWidth: 350px;
+            height: 250px;
+            top: 50%;
+            left: 50%;
+            z-index: 3;
+            margin-top: -125px;
+            margin-left: -175px;
+        }
+
+        .img {
+            minWidth: 100%;
+            height: 100%;
+            background-size: 100% 100%;
+        }
+
+        .layui-form-item {
+            margin-bottom: 5px;
+        }
+
+        .layui-form-label {
+            padding: 9px 7px;
+            minWidth: 96px;
+        }
+
+        .layui-layer-content {
+            padding: 10px;
+        }
+
+        .allopatry-btn {
+            text-align: center;
+            margin-top: 10px;
+        }
+
+        .layui-table th {
+            text-align: center;
+        }
+
+        .layui-form-label {
+            padding: 9px 7px;
+            width: 96px;
+        }
+
+
+        .site-dropdown-demo,
+        .site-dropdown-demo .layui-menu {
+            background-color: #000;
+            border: none;
+        }
+
+        .site-dropdown-demo .layui-menu li {
+            color: #fff;
+        }
+
+        .site-dropdown-demo .layui-menu li:hover {
+            background-color: #333;
+        }
+
+        .layui-table-cell.laytable-cell-1-0-5,
+        .layui-table-cell.laytable-cell-1-0-1,
+        .layui-table-cell.laytable-cell-1-0-8,
+        .layui-table-cell.laytable-cell-1-1-0,
+        .layui-table-cell.laytable-cell-1-1-1,
+        .layui-table-cell.laytable-cell-1-1-2,
+        .layui-table-cell.laytable-cell-1-0-11 {
+            vertical-align: middle;
+            height: auto;
+            overflow: hidden;
+            text-overflow: inherit;
+            white-space: nowrap;
+        }
+
+        hr {
+            margin: 3px 0 !important;
+        }
+
+        .layui-menu-body-title {
+            padding: 0 15px;
+        }
+
+        .layui-menu-body-title > .layui-icon {
+            position: absolute;
+            left: 0;
+            top: 0;
+            font-size: 14px;
+        }
+    </style>
+
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" action="" lay-filter="form" id="form1" style="margin-top: 10px">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">用户ID</label>
+                            <div class="layui-input-inline">
+                                <input type="text" placeholder="请输入用户ID" id="userId" name="userId" class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">所属商户</label>
+                            <div class="layui-input-inline">
+                                <input type="text" placeholder="请输入内容" id="merchantName" name="merchantName"
+                                       class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">商户简称</label>
+                            <div class="layui-input-inline">
+                                <input type="text" placeholder="请输入内容" id="alias" name="alias" class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">进件状态</label>
+                            <div class="layui-input-inline">
+                                <select name="mcsStatus" id="mcsStatus">
+                                    <option value="">请选择</option>
+                                    <option value="0">待进件</option>
+                                    <option value="1">审核中</option>
+                                    <option value="2">审核不通过</option>
+                                    <option value="3">审核通过</option>
+                                    <option value="4">秒审通过</option>
+                                    <option value="5">复审不通过</option>
+                                    <option value="7">快付审核中</option>
+
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">商户类型</label>
+                            <div class="layui-input-inline">
+                                <select name="merchantType" id="merchantType">
+                                    <option value="">请选择</option>
+                                    <option value="1">小微</option>
+                                    <option value="2">个体</option>
+                                    <option value="3">企业</option>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">营销商户</label>
+                            <div class="layui-input-inline">
+                                <select name="isMarket" id="isMarket">
+                                    <option value="">请选择</option>
+                                    <option value="0">否</option>
+                                    <option value="1">是</option>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">交易状态</label>
+                            <div class="layui-input-inline">
+                                <select name="status" id="status">
+                                    <option value="">请选择</option>
+                                    <option value="1">开通</option>
+                                    <option value="2">禁用</option>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">异地支付</label>
+                            <div class="layui-input-inline">
+                                <select name="payEcdemicSwitch" id="payEcdemicSwitch">
+                                    <option value="">请选择</option>
+                                    <option value="1">开启</option>
+                                    <option value="2">关闭</option>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">开始日期</label>
+                            <div class="layui-input-inline">
+                                <input type="text" placeholder="开始日期" id="date1" name="startTime" autocomplete="off"
+                                       class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">结束日期</label>
+                            <div class="layui-input-inline">
+                                <input type="text" placeholder="结束日期" id="date2" name="endTime" autocomplete="off"
+                                       class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">详细地址</label>
+                            <div class="layui-input-inline">
+                                <input type="text" placeholder="请输入内容" id="location" name="location"
+                                       class="layui-input">
+                            </div>
+                        </div>
+                    </div>
+                    <!-- <span class="dlblock w100 textr">门店状态</span>
+                    <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+                        <input type="text" placeholder="请输入名称">
+                    </span>  -->
+                    <div class="layui-form-item">
+
+
+                    </div>
+                    <div class="layui-form-item">
+
+                    </div>
+                </form>
+            </div>
+        </div>
+
+        <table class="layui-hide" id="merchantStoreList" lay-filter="merchantStoreList"></table>
+    </div>
+</div>
+
+<script type="text/template" id="audit">
+    <form class="layui-form" id="form2" style="margin-top: 2rem;">
+        <input  name="merchantCode" id="merchantCode" hidden>
+        <input  name="channelId" id="channelId" hidden>
+        <div class="layui-form-item" style="width: 300px;">
+            <label class="layui-form-label">审核原因</label>
+            <div class="layui-input-block">
+                <textarea placeholder="请输入禁用原因" name="remark" id="banRemark" lay-verify="required"  required autocomplete="off" class="layui-textarea"></textarea>
+            </div>
+        </div>
+    </form>
+</script>
+
+</body>
+<script id="storeStatus" type="text/html">
+    {{# if (d.status == '2') { }}
+    <div style="color: red">禁用</div>
+    {{# } else { }}
+    <div style="color: green">开通</div>
+    {{# } }}
+</script>
+
+<script id="storeIsMarket" type="text/html">
+    {{# if (d.isMarket == '1') { }}
+    <div style="color: green">是</div>
+    {{# } else { }}
+    <div style="color: red">否</div>
+    {{# } }}
+</script>
+
+<script id="storeMerchantType" type="text/html">
+    {{# if (d.merchantType == "1") { }}
+    小微
+    {{# } else if (d.merchantType == "2") { }}
+    个体
+    {{# } else if (d.merchantType == "3") { }}
+    企业
+    {{# } }}
+</script>
+
+<script id="lineBar" type="text/html">
+    <div style="text-align: left">
+        <a class="layui-btn layui-btn-xs" lay-event="openQrcode">
+            <i class="layui-icon layui-icon-ok"></i>收款码
+        </a>
+        {{# if (d.mcsStatus == '3') { }}
+        {{# if (d.validStatus == '-1') { }}
+        <a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="validStatus">
+            启用该通道
+        </a>
+        {{# } else { }}
+        <a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="invalidStatus">
+            禁用该通道
+        </a>
+        {{# } }}
+        {{# } }}
+        <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="more">
+            更多&nbsp;<i class="layui-icon layui-icon-down"></i>
+        </a>
+    </div>
+</script>
+<%--<script id="lineBar" type="text/html">--%>
+<%--    <a class="layui-btn layui-btn-xs" lay-event="openQrcode">--%>
+<%--        <i class="layui-icon layui-icon-ok"></i>--%>
+<%--        收款码--%>
+<%--    </a>--%>
+<%--    {{# if (d.mcsStatus == "7") { }}--%>
+<%--    <a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="quickAudit">--%>
+<%--        <i class="layui-icon layui-icon-note"></i>--%>
+<%--        快付审核--%>
+<%--    </a>--%>
+<%--    {{# } }}--%>
+<%--    {{# if (d.channel == "4") { }}--%>
+<%--    <a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="splitSetting">--%>
+<%--        <i class="layui-icon layui-icon-note"></i>--%>
+<%--        分账设置--%>
+<%--    </a>--%>
+<%--    {{# } }}--%>
+
+<%--</script>--%>
+<%--<script id="barDemo" type="text/html">--%>
+<%--    {{# if (d.status=='0') { }}--%>
+<%--    <a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="auditPass">--%>
+<%--        <i class="layui-icon layui-icon-ok"></i>--%>
+<%--        通过并打款--%>
+<%--    </a>--%>
+<%--    <a class="layui-btn layui-btn-xs" lay-event="auditSuccess">--%>
+<%--        <i class="layui-icon layui-icon-edit"></i>--%>
+<%--        通过--%>
+<%--    </a>--%>
+<%--    <a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="auditRefuse">--%>
+<%--        <i class="layui-icon layui-icon-close"></i>--%>
+<%--        拒绝--%>
+<%--    </a>--%>
+<%--    {{# } }}--%>
+<%--</script>--%>
+
+<script id="toolBar" type="text/html">
+    <a class="layui-btn layui-btn-sm" href="javascript:void(0);" onclick="reload()">
+        <i class="layui-icon layui-icon-search"></i>查询
+    </a>
+    <a class="layui-btn layui-btn-sm layui-btn-danger" href="javascript:void(0);" data-index="1"
+       onclick="disableMerchantStore()">
+        <i class="layui-icon layui-icon-edit"></i>禁用
+    </a>
+    <a class="layui-btn layui-btn-sm" href="javascript:void(0);" data-index="1"
+       onclick="payEcdemicSwitchMerchantStore()">
+        <i class="layui-icon layui-icon-edit"></i>异地支付
+    </a>
+    <a class="layui-btn layui-btn-sm" href="javascript:void(0);" data-index="1"
+       onclick="isMarket()">
+        <i class="layui-icon layui-icon-edit"></i>营销商户
+    </a>
+    <a class="layui-btn layui-btn-sm" href="javascript:void(0);"
+       onclick="batchMerchantIncom()">
+        <i class="layui-icon layui-icon-edit"></i>批量进件
+    </a>
+    <a class="layui-btn layui-btn-sm layui-btn-warm upload">
+        <i class="layui-icon layui-icon-upload-drag"></i>D0快付导入
+    </a>
+    <a class="layui-btn layui-btn-sm layui-btn-normal download">
+        <i class="layui-icon layui-icon-download-circle"></i>D0快付导出
+    </a>
+</script>
+
+<script id="toolbarMenu" type="text/html">
+
+</script>
+
+<script id="storePayEcdemicSwitch" type="text/html">
+    {{# if (d.payEcdemicSwitch == "1") { }}
+    <span style='color: red;'>开启</span>
+    {{# } else { }}
+    <span style='color: green;'>关闭</span>
+    {{# } }}
+</script>
+
+<script id="transmitStatus" type="text/html">
+    {{# if (d.mcsStatus == "1") { }}
+    <span style='color: red;'>审核中</span>
+    {{# } else if (d.mcsStatus == "2") { }}
+    <span style='color: red;'>审核不通过</span>
+    {{# } else if (d.mcsStatus == "3") { }}
+    <span style='color: green;'>审核通过</span>
+    {{# } else if (d.mcsStatus == "4") { }}
+    <span style='color: green;'>秒审通过</span>
+    {{# } else if (d.mcsStatus == "5") { }}
+    <span style='color: red;'>复审不通过</span>
+    {{# } else if (d.mcsStatus == "7") { }}
+    <span style='color: red;'>快付审核中</span>
+    {{# } else { }}
+    <span style='color: blue;'>待进件</span>
+    {{# } }}
+</script>
+
+
+<script type="text/template" id="desc">
+    <form class="layui-form" action="" style="minWidth: 80%; margin-top: 20px">
+        <input type="hidden" name="id" id="id">
+        <input type="hidden" name="payEcdemicSwitch" id="allopatry">
+        <div class="layui-form-item">
+            <label class="layui-form-label">备注：</label>
+            <div class="layui-input-block" style="margin-left:0px">
+                <div class="layui-input-block">
+                    <textarea name="remark" id="remark" placeholder="备注说明" class="layui-textarea"></textarea>
+                </div>
+            </div>
+        </div>
+
+        <div class="layui-form-item">
+            <div class="layui-input-block">
+                <button class="layui-btn" lay-submit lay-filter="remarkForm">确认更改</button>
+                <button type="button" id="remarkClose" class="layui-btn layui-btn-primary">关闭</button>
+            </div>
+        </div>
+    </form>
+</script>
+
+
+<script type="text/template" id="setApiParam">
+    <form class="layui-form" action="">
+        <input type="hidden" name="id" id="mercId">
+        <div class="layui-form-item">
+            <label class="layui-form-label">密钥：</label>
+            <div class="layui-input-block" style="margin-left:0px">
+                <div class="layui-input-block" style="display: flex">
+                    <input type="text" placeholder="商户密钥" style="width: 70%" name="md5Key"
+                           id="md5Key" autocomplete="off" class="layui-input">
+                    <button type="button" class="layui-btn layui-btn-primary layui-border-blue" id="createKey">生成
+                    </button>
+                </div>
+            </div>
+        </div>
+
+        <div class="layui-form-item">
+            <label class="layui-form-label">小程序Appid：</label>
+            <div class="layui-input-block" style="margin-left:0px">
+                <div class="layui-input-block" style="display: flex">
+                    <input type="text" placeholder="小程序Appid" style="width: 70%" name="subAppId"
+                           id="subAppId" autocomplete="off" class="layui-input">
+                </div>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">公众号Appid：</label>
+            <div class="layui-input-block" style="margin-left:0px">
+                <div class="layui-input-block" style="display: flex">
+                    <input type="text" placeholder="公众号appid" style="width: 70%"  name="appid"
+                           id="appid" autocomplete="off" class="layui-input">
+                </div>
+            </div>
+        </div>
+
+        <div class="layui-form-item" style="margin-top: 2rem">
+            <div class="layui-input-block">
+                <button class="layui-btn" id="setApiParamForm" lay-submit lay-filter="setApiParamForm">保存</button>
+                <button type="button" id="setApiParamClose" class="layui-btn layui-btn-primary">关闭</button>
+            </div>
+        </div>
+    </form>
+</script>
+
+<script type="text/javascript">
+
+    var layer;
+    var form;
+    var table;
+    var laydate;
+    var dropdown;
+
+    //form表单样式
+    layui.use(['table', 'layer', 'form', 'laydate', 'dropdown', 'upload'], function () {
+        layer = layui.layer;
+        form = layui.form;
+        table = layui.table;
+        laydate = layui.laydate;
+        dropdown = layui.dropdown;
+        var upload = layui.upload;
+        form.render();
+
+        laydate.render({
+            elem: '#date1' //指定元素
+            , format: 'yyyy-MM-dd HH:mm:ss'
+            , type: 'datetime'
+        });
+        laydate.render({
+            elem: '#date2' //指定元素
+            , format: 'yyyy-MM-dd HH:mm:ss'
+            , type: 'datetime'
+        });
+
+        //执行一个 table 实例
+        table.render({
+            elem: '#merchantStoreList'
+            , id: 'merchantStoreList'
+            , url: ctx + '/merchantStore/queryMerchantStoreByPage' //数据接口
+            , autoSort: false
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.count, //解析数据长度
+                    "data": res.merchantStoreList //解析数据列表
+                };
+            }
+            , request: {
+                pageName: 'currPage' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , title: '门店信息表'
+            , page: true //开启分页
+            , toolbar: '#toolBar' //开启工具栏，此处显示默认图标，可以自定义模板，详见文档
+            , defaultToolbar: ['filter']
+            , cols: [[ //表头
+                {type: 'numbers'}
+                , {type: 'checkbox'}
+                , {field: 'userId', title: '用户ID', width: 80, align: "center", templet: '#imgTemp'}
+                , {field: 'alias', title: '商户简称', minWidth: 86}
+                , {field: 'merchantName', title: '所属商户', minWidth: 86}
+                , {field: 'status', title: '交易状态', minWidth: 86, templet: '#storeStatus', align: "center"}
+                , {field: 'isMarket', title: '营销商户', minWidth: 86, templet: '#storeIsMarket', align: "center"}
+                , {field: 'merchantType', title: '门店类型', minWidth: 86, templet: '#storeMerchantType', align: "center"}
+                , {
+                    field: 'rate', title: '费率%', minWidth: 80, align: "center", templet: function (d) {
+                        return (d.rate / 100).toFixed(2);
+                    }
+                }
+                , {
+                    title: '结算类型', minWidth: 86, align: "center", templet: (d) => {
+                        if (d.settleType === "D1" && d.channel != 4) {
+                            return d.settleType
+                        } else {
+                            return '<input type="checkbox" ' + (d.settleType == "D0" || !d.settleType ? "checked" : "") + ' data-csId="' + d.csId + '" name="switch" lay-skin="switch" lay-filter="switchIsSettleType" lay-text="D0|D1">';
+                        }
+                    }
+                }
+                , {
+                    field: 'payEcdemicSwitch',
+                    title: '异地支付',
+                    align: "center",
+                    minWidth: 86,
+                    templet: '#storePayEcdemicSwitch'
+                }
+                , {
+                    title: '银联支付', minWidth: 95, align: "center", templet: (d) => {
+                        return '<input type="checkbox" ' + (d.isUnionPay == "1" ? "checked" : "") + ' data-mercId="' + d.mercId + '" name="switch" lay-skin="switch" lay-filter="switchIsUnionPay" lay-text="开启|关闭">';
+                    }
+                }
+                , {field: 'mcsStatus', title: '进件状态', align: "center", minWidth: 90, templet: '#transmitStatus'}
+                , {
+                    field: 'incomTime',
+                    title: '进件时间',
+                    minWidth: 160,
+                    templet: "<div>{{layui.util.toDateString(d.incomTime,'yyyy-MM-dd HH:mm:ss')}}</div>"
+                }
+                , {
+                    field: 'location', title: '详细地址', minWidth: 100, templet: function (d) {
+                        return d.province + "-" + d.city + "-" + d.district + "-" + d.address;
+                    }
+                }
+                , {field: 'operatRemark', title: '备注', align: "center", minWidth: 100}
+                , {fixed: 'right', title: '操作', minWidth: '250', toolbar: '#lineBar'}
+            ]]
+        });
+
+        upload.render({ //允许上传的文件后缀
+            elem: '.upload'
+            , url: ctx + '/merchantStore/exportD0Excel' //改成您自己的上传接口
+            , accept: 'file' //普通文件
+            , acceptMime: 'application/vnd.ms-excel, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+            , exts: 'xlsx|xls' //只允许上传excel
+            , before: function () {
+                layer.load(1);
+            }
+            , done: function (res) {
+                layer.closeAll();
+                var icon = 2;
+                if (res.code == 200) {
+                    icon = 1;
+                    reload();
+                }
+                layer.msg(res.message, {icon: icon});
+
+            }
+        });
+
+        //监听行工具事件
+        table.on('tool(merchantStoreList)', function (obj) { //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            var data = obj.data //获得当前行数据
+                , that = this
+                , layEvent = obj.event; //获得 lay-event 对应的值
+            switch (layEvent) {
+                case 'openQrcode':
+                    let isPaySwitch = data.payEcdemicSwitch;
+                    if (!isPaySwitch) {
+                        isPaySwitch = 0;
+                    }
+                    showMerchantStoreReceipt(data, isPaySwitch);
+                    break;
+                case 'invalidStatus':
+                    showBanValidStatus(data);
+                    break;
+                case 'validStatus':
+                    showOpenValidStatus(data);
+                    break;
+                case 'more':
+                    let itemData = [
+                        {
+                            title: '设置api参数'
+                            , id: 'setApiParam'
+                            , templet: '<i class="layui-icon layui-icon-key"></i> {{d.title}}'
+                        },
+                    ];
+                    if (data.mcsStatus == "7") {
+                        itemData.push({
+                            title: '快付审核'
+                            , id: 'quickAudit'
+                        });
+                    }
+                    if (data.channel == "4") {
+                        itemData.push({
+                            title: '分账设置'
+                            , id: 'splitSetting'
+                        });
+                    }
+                    dropdown.render({
+                        elem: that
+                        , show: true //外部事件触发即显示
+                        , data: itemData
+                        , className: 'site-dropdown-demo'
+                        , click: function (mData, othis) {
+                            switch (mData.id) {
+                                case 'quickAudit':
+                                    updateChannelStatus(data.csId, "3", data.userId);
+                                    break;
+                                case 'splitSetting':
+                                    splitSetting(data);
+                                    break;
+                                case 'setApiParam':
+                                    setApiParam(data);
+                                    break;
+                                case 'setAppid':
+                                    setAppid(data);
+                                    break;
+                            }
+                        }
+                        , align: 'right' //右对齐弹出（v2.6.8 新增）
+                        , style: 'box-shadow: 1px 1px 10px rgb(0 0 0 / 12%);' //设置额外样式
+                    });
+                    break;
+            }
+
+            // var data = obj.data //获得当前行数据
+            //     , layEvent = obj.event; //获得 lay-event 对应的值
+            // if (layEvent === 'openQrcode') {
+            //     let isPaySwitch = data.payEcdemicSwitch;
+            //     if (!isPaySwitch) {
+            //         isPaySwitch = 0;
+            //     }
+            //     showMerchantStoreReceipt(data.userId, data.settleType, data.id, isPaySwitch);
+            // } else if (layEvent === 'quickAudit') {
+            //     updateChannelStatus(data.csId, "3", data.userId);
+            // }else if (layEvent === 'splitSetting') {
+            //     splitSetting(data);
+            // }
+        });
+
+        $(document).on("click", ".download", function () {
+            var startTime = $("#date1").val();
+            var endTime = $("#date2").val();
+            if (!startTime || !endTime) {
+                layer.msg("开始时间和结束时间不能为空！", {icon: 2});
+                return;
+            }
+            var index = layer.load(1);
+            window.location.href = ctx + '/merchantStore/dowloadD0QuicklyExcel?startTime=' + startTime + '&endTime=' + endTime;
+            setTimeout("layer.closeAll()", 5000);
+        })
+        var dIndex = 0;
+        //监听提交
+        var dxStatus = 0;
+        form.on('submit(remarkForm)', function (data) {
+            var index = layer.load(1, {shade: [0.1, '#000']});
+            $.ajax({
+                url: ctx + '/merchantStore/payEcdemicSwitchMerchantStore',
+                method: 'post',
+                data: data.field,
+                dataType: 'JSON',
+                success: function (res) {
+                    layer.close(index);
+                    layer.close(dIndex);
+                    layer.msg(res.msg);
+                    dxStatus = 1;
+                    dkStatus = 1;
+                }
+            })
+            return false;
+        });
+
+        form.on('submit(setApiParamForm)', function (data) {
+            layer.load(1, {shade: [0.1, '#000']});
+            $.ajax({
+                url: ctx + '/merchantBaseInfo/updateInfo',
+                method: 'post',
+                data: data.field,
+                dataType: 'JSON',
+                success: function (res) {
+                    layer.closeAll();
+                    layer.msg(res.message, {
+                        icon: res.code == 200 ? 1 : 2
+                    });
+                    var params = serialize($('#form1'));
+                    table.reload('merchantStoreList', {
+                        where: params
+                        , page: {
+                            size: 10
+                            , current: 1
+                        }
+                    });
+                }
+            })
+            return false;
+        });
+
+        function splitSetting(obj) {
+            let csId = obj.csId;
+            var url = '${ctx}/mercSplitSetting/index/' + csId;
+            var title = "商户分账详情";
+            var index = layer.open({
+                type: 2
+                , shade: 0.5
+                , title: title
+                , maxmin: true
+                , content: url
+                , area: ['90%', '90%']
+                , end: function () {
+                }
+            });
+        }
+
+        function setApiParam(obj) {
+            let mercId = obj.mercId;
+            let md5Key = obj.md5Key;
+            let subAppId = obj.subAppId;
+            let appid = obj.appid;
+            var title = "api参数";
+            var index = layer.open({
+                type: 1
+                , shade: 0.5
+                , title: title
+                , maxmin: true
+                , content: $("#setApiParam").html()
+                , area: ['500px', '300px']
+                , success: function () {
+                    if (md5Key) {
+                        $("#md5Key").val(md5Key);
+                        $("#createKey").addClass("layui-btn-disabled");
+                        $("#createKey").attr("id","createKey-disabled");
+                        $("#createKey").attr("readonly", true);
+                    }
+                    $("#mercId").val(mercId);
+                    $("#subAppId").val(subAppId);
+                    $("#appid").val(appid);
+                }
+            });
+        }
+        // function setAppid(obj) {
+        //     console.log(obj);
+        //     let mercId = obj.mercId;
+        //     let subAppId = obj.subAppId;
+        //     let appid = obj.appid;
+        //     var title = "设置商户appid";
+        //     var index = layer.open({
+        //         type: 1
+        //         , shade: 0.5
+        //         , title: title
+        //         , maxmin: true
+        //         , content: $("#setAppid").html()
+        //         , area: ['400px', '250px']
+        //         , success: function () {
+        //             $("#setAppidMercId").val(mercId);
+        //             $("#subAppId").val(subAppId);
+        //             $("#appid").val(appid);
+        //         }
+        //     });
+        // }
+
+
+        form.on('switch(switchIsUnionPay)', function (data) {
+            let isUnionPay = 0;
+            let mercid = $(data.elem).data().mercid;
+            if (this.checked) {
+                isUnionPay = 1;
+                layer.tips('温馨提示：请注意开关状态的文字可以随意定义，而不仅 仅是ON|OFF', data.othis)
+            } else {
+                isUnionPay = 0
+            }
+            $.ajax({
+                url: ctx + "/merchantBaseInfo/updateInfo",
+                data: {"id": mercid, "isUnionPay": isUnionPay},
+                method: 'POST',
+                dateType: 'json',
+                success: res => {
+                    layer.msg(res.message, {
+                        offset: '6px',
+                        icon: res.code == 200 ? 1 : 2
+                    });
+                }
+            })
+            //do some ajax opeartiopns;
+        });
+
+        form.on('switch(switchIsSettleType)', function (data) {
+            layer.confirm('确认修改当前商户的结算类型？', {
+                icon: 3, title: '提示',
+                btn: ['确认', '取消',] //可以无限个按钮
+            }, function (index, layero) {
+                let dom = $(data.elem).next("div");
+                let classVal = dom.attr("class").indexOf("layui-form-onswitch");
+                let settleType = "D1";
+                let csid = $(data.elem).data().csid;
+                if (classVal > -1) {
+                    settleType = "D0";
+                    layer.tips('温馨提示：请注意开关状态的文字可以随意定义，而不仅 仅是ON|OFF', data.othis)
+                } else {
+                    settleType = "D1";
+                }
+                $.ajax({
+                    url: ctx + "/merchantBaseInfo/updateSettleType",
+                    data: {"id": csid, "settlementType": settleType},
+                    method: 'POST',
+                    dateType: 'json',
+                    success: res => {
+                        layer.msg(res.message, {
+                            offset: '6px',
+                            icon: res.code == 200 ? 1 : 2
+                        });
+                    }
+                })
+            }, function (index, layero) {
+                $(data.elem).prop('checked', !data.elem.checked)
+                layui.form.render();//刷新表格
+                layer.msg('您点击了拒绝！');
+            });
+            //do some ajax opeartiopns;
+        });
+
+
+        $(document).on("click", "#remarkClose,#setApiParamClose", (res) => {
+            layer.closeAll();
+        });
+
+        $(document).on("click", "#createKey", (res) => {
+            let index = layer.load(1, {shade: [0.1, '#000']});
+            let url = ctx + "/merchantBaseInfo/createKey";
+            $.get(url, function (res) {
+                layer.close(index);
+                $("#md5Key").val(res.data);
+            })
+        })
+        $(document).on("click", ".layui-layer-close1", (res) => {
+            if (dkStatus == 0 || dkStatus == undefined || dkStatus == '') {
+                return;
+            }
+            let $data = {};
+            $data.payEcdemicSwitch = 1;
+            $data.id = dkId;
+            $.ajax({
+                url: ctx + '/merchantStore/payEcdemicSwitchMerchantStore',
+                method: 'post',
+                data: $data,
+                dataType: 'JSON',
+                success: function (res) {
+                    dxStatus = 0;
+                    layer.msg(res.msg, {
+                        icon: res.resultCode == 1 ? 1 : 2
+                    });
+                }
+            })
+        })
+        $(document).on("click", ".allopatry", (res) => {
+            let $data = $(res.currentTarget).data();
+            let $title = $data.t === "open" ? '开启异地支付' : '关闭异地支付';
+            let $value = $data.t === "open" ? 0 : 1;
+            if ($value === 0) {
+                dIndex = layer.open({
+                    type: 1,
+                    title: $title,
+                    shade: 0.5,
+                    maxmin: true,
+                    area: ['550px', '300px'],
+                    content: $("#desc").html(),
+                    success: (res) => {
+                        $("#id").val($data.id);
+                        $("#allopatry").val($value);
+                    }
+                });
+            } else {
+                if ($data.value === 0 && $value === 1 && dxStatus != 1) {
+                    layer.close(dkIndex);
+                } else {
+                    $data.payEcdemicSwitch = $value;
+                    $.ajax({
+                        url: ctx + '/merchantStore/payEcdemicSwitchMerchantStore',
+                        method: 'post',
+                        data: $data,
+                        dataType: 'JSON',
+                        success: function (res) {
+                            dxStatus = 0;
+                            layer.msg(res.msg);
+                        }
+                    })
+                }
+
+                <%--$.post('${ctx}/merchantStore/payEcdemicSwitchMerchantStore',{data:},(res)=>{--%>
+                <%--    layer.msg(res.message, {--%>
+                <%--        icon: res.resultCode == 1 ? 1 : 2--%>
+                <%--    });--%>
+                <%--})--%>
+            }
+        })
+    });
+
+    //查询
+    function reload() {
+        table.reload('merchantStoreList', {
+            page: {
+                curr: 1
+            }
+            , where: form.val('form')
+        }, false);
+    }
+
+    function showBanValidStatus(data) {
+        layer.open({
+            type: 1,
+            title: '提示',
+            offset: 'm', //具体配置参考：offset参数项
+            area: ['400px', '300px'],
+            content: $("#audit").html(),
+            btn: ['确认', '取消'],
+            shade: 0.3,
+            btn1: function (index, layero) {
+                layer.closeAll();
+                var index = layer.load(1, {shade: [0.1, '#000']});
+                $.ajax({
+                    type: 'POST'
+                    , url: ctx + "/merchantStore/banChannelValid"
+                    , data: {
+                        channelId: data.channel,
+                        merchantCode: data.merchantCode,
+                        remark: $("#banRemark").val()
+                    }
+                    , success: function (d) {
+                        if (d.code == 200) {
+                            layer.close(index);
+                        } else {
+                            layer.close(index);
+                        }
+
+                        reload()
+                    }
+                });
+            }
+            ,btn2: function(index, layero){
+                layer.close(index);
+            }
+        });
+    }
+
+    function showOpenValidStatus(data) {
+        layer.open({
+            type: 1,
+            closeBtn: 1, title: '提示',
+            offset: 'm', //具体配置参考：offset参数项
+            area: ['300px', '180px'],
+            content: '<div style="padding:10px;" class="textc mt20">确认启用' + data.settleType + '支付权限？</div>',
+            btn: ['确认', '取消'],
+            btnAlign: 'r', //按钮居中
+            shade: 0.3,//不显示遮罩
+            yes: function () {
+                layer.closeAll();
+                var index = layer.load(1, {shade: [0.1, '#000']});
+                $.ajax({
+                    type: 'POST'
+                    , url: ctx + "/merchantStore/openChannelValid"
+                    , data: {
+                        channelId: data.channel,
+                        merchantCode: data.merchantCode
+                    }
+                    , success: function (d) {
+                        if (d.code == 200) {
+                            layer.close(index);
+                        } else {
+                            layer.close(index);
+                        }
+
+                        reload()
+                    }
+                });
+            }
+        });
+    }
+
+</script>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantStore/merchantStoreParticulars.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantStore/merchantStoreParticulars.jsp
new file mode 100644
index 0000000..fe6156e
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantStore/merchantStoreParticulars.jsp
@@ -0,0 +1,58 @@
+ <%@ page language="java" contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+    <script type="text/javascript">
+        require("js/merchantStore/merchantStoreParticulars.js");
+    </script>
+    <style>
+        .layui-table th {
+            text-align: center;
+        }
+    </style>
+</head>
+<body>
+<div class="mb20 mt10">
+    <div class="whitebg pl10 pr10">
+        <table class="layui-table">
+            <thead>
+            <tr>
+                <th class="textc ">序号</th>
+                <c:if test="${admin eq 'admin'}">
+                    <th class="textc ">操作人</th>
+                </c:if>
+                <th class="textc ">操作名称</th>
+                <th class="textc ">备注</th>
+                <th class="textc ">操作时间</th>
+            </tr>
+            </thead>
+            <!-- 数据体 -->
+            <tbody id="data_content">
+            </tbody>
+        </table>
+        <!-- footer -->
+        <div class="clearfix mb10 pb20">
+            <div class="layui-tab-item fr">
+                <span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+                <span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>
+                <div class="pagination dlblock vm" id="pagination"></div>
+                <span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>
+            </div>
+        </div>
+        <input type="hidden" id="id" value="${id}">
+    </div>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantStore/merchantStoreReceipt.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantStore/merchantStoreReceipt.jsp
new file mode 100644
index 0000000..60b7101
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantStore/merchantStoreReceipt.jsp
@@ -0,0 +1,49 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ko" lang="ko">
+<head>
+    <title>Javascript 二维码生成库：QRCode</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=no" />
+</head>
+<body>
+<input id="text" type="text" value="${url}" style="width:80%" /><br />
+<div id="qrcode" style="width:100px; height:100px; margin-top:15px;"></div>
+
+<script type="text/javascript">
+    var qrcode = new QRCode(document.getElementById("qrcode") ,{
+        width : 100,
+        height : 100
+    });
+
+    function makeCode () {
+        var elText = document.getElementById("text");
+
+        if (!elText.value) {
+            alert("Input a text");
+            elText.focus();
+            return;
+        }
+
+        qrcode.makeCode(elText.value);
+    }
+
+    makeCode();
+
+    $("#text").
+    on("blur", function () {
+        makeCode();
+    }).
+    on("keydown", function (e) {
+        if (e.keyCode == 13) {
+            makeCode();
+        }
+    });
+</script>
+</body>
+    <script type="text/javascript">
+        require("js/jquery.min.js");
+    </script>
+    <script type="text/javascript">
+        require("js/jquery.qrcode.min.js");
+    </script>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantStore/merchantStoreTthoroughfare.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantStore/merchantStoreTthoroughfare.jsp
new file mode 100644
index 0000000..d571bc0
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantStore/merchantStoreTthoroughfare.jsp
@@ -0,0 +1,79 @@
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+    <style>
+        .layui-input, .layui-textarea {
+            border-color: #606060;
+        }
+    </style>
+</head>
+<body>
+<form class="layui-form" action="" style="width: 80%; margin-top: 20px">
+    <div class="layui-form-item">
+        <label class="layui-form-label">备注：</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <textarea name="remark" id="remark" placeholder="备注说明" class="layui-textarea"></textarea>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button class="layui-btn" lay-submit lay-filter="formDemo">确认更改</button>
+            <button type="button" id="close" class="layui-btn layui-btn-primary">关闭</button>
+        </div>
+    </div>
+</form>
+
+<script>
+    //Demo
+    layui.use(['form', 'layer'], function () {
+        var form = layui.form;
+        var layer = layui.layer;
+        var mParent = parent;
+
+        $('#close').click(function () {
+            parent.layer.closeAll();
+        });
+
+        //监听提交
+        form.on('submit(formDemo)', function (data) {
+            var index = layer.load(1, {shade: [0.1, '#000']});
+            $.ajax({
+                url: '${ctx}/merchantStore/payEcdemicSwitchMerchantStore',
+                method: 'post',
+                data: {
+                    id: '${id}',
+                    payEcdemicSwitch: '${payEcdemicSwitch}',
+                    remark:$("#remark").val()
+                },
+                dataType: 'JSON',
+                success: function (res) {
+                    layer.close(index);
+                    layer.msg(res.msg);
+                    if (res.resultCode == 1) {
+                        setInterval(function (){
+                            mParent.layer.closeAll();
+                            mParent.reload();
+                        },1500)
+                    }
+                }
+            })
+            return false;
+        });
+    });
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantTransfer/list.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantTransfer/list.jsp
new file mode 100644
index 0000000..b8d4524
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/merchantTransfer/list.jsp
@@ -0,0 +1,121 @@
+<%--
+  Created by IntelliJ IDEA.
+  User: Administrator
+  Date: 2020/8/3
+  Time: 14:29
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp" />
+</head>
+<body>
+
+<form class="layui-form" id="form1" action="" style="margin-top: 30px;margin-left: 50px;">
+    <div class="layui-inline">
+        <label class="layui-form-label">商户简称</label>
+        <div class="layui-input-block">
+            <input type="text" name="alias" id="alias" placeholder="请输入商户简称" autocomplete="off" class="layui-input">
+        </div>
+    </div>
+    <div class="layui-inline">
+        <label class="layui-form-label">转账单号</label>
+        <div class="layui-input-block">
+            <input type="text" name="orderNo"  id="orderNo" placeholder="请输入转账单号" autocomplete="off" class="layui-input">
+        </div>
+    </div>
+</form>
+<table class="layui-hide" id="merchantTransferTab" lay-filter="merchantTransferTab"></table>
+
+<script type="text/html" id="leftBar">
+    <button type="button" class="layui-btn" lay-event="search">查询</button>
+</script>
+
+<script>
+    layui.use(['table', 'layer'], function(){
+        var table = layui.table;
+        var layer = layui.layer;
+
+        var tableIns = table.render({
+            elem: '#merchantTransferTab'
+            ,url:'${ctx}/merchantTransfer/page'
+            ,response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                ,countName: 'count' //数据总数的字段名称，默认：count
+                ,dataName: 'data' //默数据列表的字段名称，认：data
+                ,statusCode : 200
+            }
+            ,parseData: function(res){ //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.count, //解析数据长度
+                    "data": res.data.data //解析数据列表
+                };
+            }
+            ,toolbar: '#leftBar' //开启头部工具栏，并为其绑定左侧模板
+            , defaultToolbar: ['filter']
+            ,defaultToolbar: ['filter', 'exports', 'print', { //自定义头部工具栏右侧图标。如无需自定义，去除该参数即可
+                title: '提示'
+                ,layEvent: 'LAYTABLE_TIPS'
+                ,icon: 'layui-icon-tips'
+            }]
+            ,title: 'app版本数据表'
+            ,cols: [[
+                {type: 'checkbox', fixed: 'left', hidden: true}
+                ,{field:'numbers', title:'序号', fixed: 'left', unresize: true, width:80, type:'numbers'}
+                /*,{field:'platformCode', title:'平台code',templet:function(r){
+                        if(r.platformCode == 0){
+                            return "android";
+                        }else{
+                            return "IOS";
+                        }
+                    }}*/
+                ,{field:'merchantCode', title:'商户编号'}
+                ,{field:'alias', title:'商户简称', sort: true}
+                ,{field:'channelNo', title:'通道商户号'}
+                ,{field:'orderNo', title:'转账单号', sort: true}
+                ,{field:'transNo', title:'通道单号'}
+                ,{field:'amount', title:'转账金额(元)', }
+                ,{field:'content', title:'备注', }
+                ,{field:'remark', title:'描述', }
+                ,{field: 'transTime', title: '转账时间',width:160,templet : "<div>{{layui.util.toDateString(d.transTime, 'yyyy-MM-dd HH:mm:ss')}}</div>"}
+                ,{field: 'createDt', title: '创建时间',width:160,templet : "<div>{{layui.util.toDateString(d.createDt, 'yyyy-MM-dd HH:mm:ss')}}</div>"}
+            ]]
+            ,request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                ,limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            ,page: true
+        });
+        //监听头工具栏事件
+        table.on('toolbar(merchantTransferTab)', function (obj) {
+            switch (obj.event) {
+                case 'search':
+                    var params= serialize($('#form1'));
+                    table.reload('merchantTransferTab', {
+                        where: params
+                        , page: {
+                            size: 10
+                            , current: 1
+                        }
+                    });
+                    break;
+            }
+        });
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/newArea/newAreaBaseInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/newArea/newAreaBaseInfo.jsp
new file mode 100644
index 0000000..8be5c07
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/newArea/newAreaBaseInfo.jsp
@@ -0,0 +1,75 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">  
+	<div class="tab-pane active">     
+		<div class="panel-body">
+			<div class="wrapper wrapper-content">
+				<div class="panel-form animated fadeInRight wp60 fc">
+					<div class="layui-form-item dn	has-error" >   
+						<label class="layui-form-label">id</label>  
+						<div class="layui-input-block">
+							<input type="text" name="id" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${newArea.id }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">parentId</label>  
+						<div class="layui-input-block">
+							<input type="text" name="parentId" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${newArea.parentId }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">name</label>  
+						<div class="layui-input-block">
+							<input type="text" name="name" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${newArea.name }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">shortName</label>  
+						<div class="layui-input-block">
+							<input type="text" name="shortName" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${newArea.shortName }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">longitude</label>  
+						<div class="layui-input-block">
+							<input type="text" name="longitude" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${newArea.longitude }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">latitude</label>  
+						<div class="layui-input-block">
+							<input type="text" name="latitude" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${newArea.latitude }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">level</label>  
+						<div class="layui-input-block">
+							<input type="text" name="level" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${newArea.level }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">sort</label>  
+						<div class="layui-input-block">
+							<input type="text" name="sort" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${newArea.sort }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">status</label>  
+						<div class="layui-input-block">
+							<input type="text" name="status" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${newArea.status }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">open</label>  
+						<div class="layui-input-block">
+							<input type="text" name="open" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${newArea.open }" >
+						</div>  
+					</div>
+	
+				</div>
+			</div>
+		</div>  
+	</div>
+</form>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/newArea/newAreaDetails.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/newArea/newAreaDetails.jsp
new file mode 100644
index 0000000..f34d595
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/newArea/newAreaDetails.jsp
@@ -0,0 +1,54 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>     
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">                      
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black"> 
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> 
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->                                     
+<meta name="viewport"
+	content="width=device-width, initial-scale=1.0, maximum-scale=1.0">   
+<jsp:include page="../../common.jsp" />
+<script type="text/javascript">
+    require("js/newArea/newAreaDetails.js");
+</script>
+<title>编辑</title>
+</head>                                 
+	<body class="lgraybg">            
+		<div class="	container-fluid animated fadeInRight col-sm-12">
+			<div class="panel-toolbar mt10 mb10 pt5 pb5 pl10 bdd whitebg">
+				<div class="buttons">
+					<a href="javascript:void(0);" class="btn btn-primary fa fa-save f12"><span>保存</span></a>
+					<a href="${ctx }/newArea/index?pageIndex=${pageIndex}"  class="btn btn-primary fa fa-back f12" id="goback"><span>返回</span></a>
+				</div>
+			</div>
+				<div class="tabs-container whitebg">
+					<div class="pt10 pl5 pr5">
+						<ul class="nav nav-tabs" id="nav-tabs">
+							<li class="active" data-action="base">   
+								<a href="javascript:void(0);" >基本资料</a>
+							</li>
+							<li class="" data-action="functions">
+								<a href="javascript:void(0);"  >多功能输入</a>
+							</li>
+							<li class="" data-action="extends">
+								<a href="javascript:void(0);" >扩展属性</a>
+							</li>
+						</ul>
+						<div class="tab-content pt30 p30">               
+		
+						</div>     
+					</div>
+				</div>    
+		</div>
+		<!-- 隐藏域 -->
+		<input type="hidden" id="newAreaId" value="${newArea.id }"/>
+	</body>
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/newArea/newAreaExtendsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/newArea/newAreaExtendsInfo.jsp
new file mode 100644
index 0000000..592687a
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/newArea/newAreaExtendsInfo.jsp
@@ -0,0 +1,201 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>           
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> 
+<div class="tab-pane active">      
+	<div class="animated fadeInRight">
+		<div class="whitebg pl10 pr10">
+			<table class="table table-striped table-bordered table-hover">     
+				<thead> 
+					<tr>  
+						<th class="textc">序号</th>         
+						<th class="textc wp15">流水账号</th>
+						<th class="textc">日期</th>         
+						<th class="textc">财务类别</th>     
+						<th class="textc">金额</th>         
+						<th class="textc">银行</th>         
+						<th class="textc">发票</th>         
+						<th class="textc">客户名称</th>     
+						<th class="textc wp15">单号</th>    
+						<th class="textc">状态</th>         
+						<th class="textc">类别</th>         
+						<th class="textc">操作</th>         
+					</tr> 
+				</thead>
+				<tbody> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+                
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="green">支出</span></td>     
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+				</tbody>
+                
+			</table>  
+			<!-- footer -->  
+			<div class="clearfix mb10 pb20">          
+					<div class="layui-tab-item fr">       
+							<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+							<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>   
+							<div class="pagination dlblock vm" id="pagination"></div>
+							<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>            
+					</div>
+				</div>  
+		</div>      
+	</div>        
+</div>          
+                
+<script type="text/javascript">    
+//分页          
+$('#pagination').pagination({        
+	pageCount: 50,
+	jump: true,   
+	coping: true, 
+	homePage: '首页',    
+	endPage: '末页',     
+	prevContent: '上页', 
+	nextContent: '下页', 
+	callback: function(api) {          
+		$('.now').text(api.getCurrent());
+	}             
+});             
+</script>       
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/newArea/newAreaFunctionsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/newArea/newAreaFunctionsInfo.jsp
new file mode 100644
index 0000000..982ce84
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/newArea/newAreaFunctionsInfo.jsp
@@ -0,0 +1,130 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>		
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">      
+<div class="tab-pane active">
+				<div class="panel-body">
+					<div class="wrapper wrapper-content">     
+						<div class="panel-form animated fadeInRight wp60 fc">
+							<!-- 账号资料 -->
+			<div class="layui-form-item 	has-error">
+				<label class="layui-form-label">单行输入框<i class="red">*</i></label>
+				<div class="layui-input-block">
+					<input type="text" name="title" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input">
+				</div>                                         
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">自定义验证</label>
+				<div class="layui-input-inline ml30">
+					<input type="password" name="password" lay-verify="pass" placeholder="请输入密码" autocomplete="off" class="layui-input">
+				</div>
+				<div class="layui-form-mid layui-word-aux">请填写6到12位密码</div>
+			</div>
+			<div class="form-group">
+				<div class="layui-form-item">          
+					<label class="layui-form-label">单行选择框</label>
+					<div class="layui-input-block">
+						<select name="interest" lay-filter="aihao">  
+							<option value=""></option>
+							<option value="0">写作</option>         
+							<option value="1" selected="">阅读</option>
+							<option value="2">游戏</option>
+							<option value="3">音乐</option>
+							<option value="4">旅行</option>  
+						</select>              
+					</div>
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<div class="layui-inline">  
+					<label class="layui-form-label">范围</label>
+					<div class="layui-input-inline ml30">
+						<input type="text" name="price_min" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>                                     
+					<div class="layui-form-mid">-</div>
+					<div class="layui-input-inline">       
+						<input type="text" name="price_max" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>
+				</div>           
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">联动选择框</label>
+				<div class="layui-input-inline ml30">
+					<select name="quiz1">     
+						<option value="">请选择省</option>
+						<option value="浙江" selected="">浙江省</option> 
+						<option value="你的工号">江西省</option>           
+						<option value="你最喜欢的老师">福建省</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz2">
+						<option value="">请选择市</option>
+						<option value="杭州">杭州</option>
+						<option value="宁波" disabled="">宁波</option>
+						<option value="温州">温州</option>
+						<option value="温州">台州</option>
+						<option value="温州">绍兴</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz3">
+						<option value="">请选择县/区</option>
+						<option value="西湖区">西湖区</option>
+						<option value="余杭区">余杭区</option>
+						<option value="拱墅区">临安市</option>
+					</select>
+				</div>    
+			</div>
+			<div class="layui-form-item" pane="">   
+				<label class="layui-form-label">原始复选框</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="like1[write]" lay-skin="primary" title="写作" checked="">  
+					<input type="checkbox" name="like1[read]" lay-skin="primary" title="阅读">
+					<input type="checkbox" name="like1[game]" lay-skin="primary" title="游戏" disabled="">
+				</div>
+			</div>
+
+			<div class="layui-form-item">
+				<label class="layui-form-label">开关-默认关</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="close" lay-skin="switch" lay-text="ON|OFF">
+				</div>
+			</div>
+			<div class="layui-form-item">  
+				<label class="layui-form-label">单选框</label>
+				<div class="layui-input-block">
+					<input type="radio" name="sex" value="男" title="男" checked="">
+					<input type="radio" name="sex" value="女" title="女">
+					<input type="radio" name="sex" value="禁" title="禁用" disabled="">
+				</div>
+			</div>
+			<!--<div class="layui-form-item layui-form-text">
+				<label class="layui-form-label">上传图片</label>
+				<div class="layui-input-block">
+					<div class="layui-upload-drag w200 h200">
+						<i class="layui-icon"></i>          
+						<p>点击上传</p>
+					</div>
+				</div>
+			</div>-->
+				<div class="layui-form-item layui-form-text">
+					<label class="layui-form-label">普通文本域</label>  
+					<div class="layui-input-block">              
+						<textarea placeholder="请输入内容" class="layui-textarea"></textarea>
+					</div>
+				</div>
+			</div>
+		</div>   
+	</div>
+</div>
+</form>   
+<script type="text/javascript">
+	//form表单样式
+	layui.use(['layer', 'form'], function() {    
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+</script>                 
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/newArea/newAreaList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/newArea/newAreaList.jsp
new file mode 100644
index 0000000..dbb3144
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/newArea/newAreaList.jsp
@@ -0,0 +1,119 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black">
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->
+<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+<jsp:include page="../../common.jsp" />
+<script type="text/javascript">
+     require("js/newArea/newAreaList.js");
+</script>
+</head>
+<body>
+	<div class="row animated fadeInRight" style="margin: 0;">
+		<div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+			<div class="toolbar-panel bdd">
+				<div class="toolbar-box">
+					<div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+						<!-- 顶部按钮 -->
+						<div class="buttons fl">
+							<a class="btn btn-primary fa fa-search f13" href="javascript:void(0);" onclick="queryNewArea()"><span>搜索</span></a>
+							<a class="btn btn-primary fa fa-plus f13 add" href="javascript:void(0);" onclick="initAddNewArea()"><span>添加</span></a>
+							<a class="btn btn-primary fa fa-edit f13" href="javascript:void(0);" onclick="initEditNewArea()"><span>编辑</span></a> 
+							<a class="btn btn-primary fa fa-remove f13 delete" href="javascript:void(0);" onclick="initBatchDeleteNewArea()"><span>删除</span></a> 
+						</div>
+						<div class="tools fr">
+							<a href="javascript:void(0);" class="collapse dblock f14 dgray mr5"> 
+								<i class="fa-2x fa fa-angle-double-up"></i>
+							</a>
+						</div>
+					</div>
+				</div>
+
+				<!--搜索条件 -->
+				<div class="toolbar-body">
+					<div class="row pt10 pb10 whitebg ml0 mr0">
+						<span class="dlblock w100 textr">ID：</span> 
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+							<input type="text" placeholder="请输入内容" id="searchId">  
+						</span> 
+						<span class="dlblock w100 textr">名称：</span> 
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+							<input type="text" placeholder="请输入名称">
+						</span> 
+						<span class="dlblock w100 textr">类别：</span>
+						 <select class="form-control f12 w180 textc">
+							<option value="">支出</option>
+							<option value="">收入</option>
+						</select>
+					</div>
+					<div class="mt10 mb20">
+						<span class="dlblock w100 textr">开始日期</span>
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+							 <input type="text" placeholder="" id="date1" class="w150">
+							 <i class="fa fa-calendar"></i>
+						</span> 
+						<span class="dlblock w100 textr">结束日期</span>
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+						<input type="text" placeholder="" id="date2" class="w150"> 
+							<i class="fa fa-calendar"></i>
+						</span>
+					</div>
+				</div>
+			</div>
+		</div>
+		<!-- 表单数据 -->
+		<div class="mb20 mt10">
+			<div class="whitebg pl10 pr10">
+				<table class="table table-striped table-bordered table-hover">
+					<thead>
+						<tr>
+							<th class="textc">
+								<div class="checker" id="allCheck">
+									<span class=""><input type="checkbox" value="" ></span>
+								</div>
+							</th>
+							<th class="textc ">id</th>
+							<th class="textc ">parentId</th>
+							<th class="textc ">name</th>
+							<th class="textc ">shortName</th>
+							<th class="textc wp15">longitude</th>
+							<th class="textc ">latitude</th>
+							<th class="textc ">level</th>
+							<th class="textc ">sort</th>
+							<th class="textc wp15">status</th>
+							<th class="textc ">open</th>
+							<th class="textc">编辑</th>
+						</tr>
+					</thead>
+					<!-- 数据体 -->
+					<tbody id="data_content">
+					</tbody>
+				</table>
+			
+			<!-- footer -->
+				<div class="clearfix mb10 pb20">
+						<div class="layui-tab-item fr">
+								<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+								<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>
+								<div class="pagination dlblock vm" id="pagination"></div>
+								<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>
+						</div>
+					</div>
+	
+			</div>
+		</div>
+	</div>
+</body>
+
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/notice/noticeBaseInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/notice/noticeBaseInfo.jsp
new file mode 100644
index 0000000..423f79c
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/notice/noticeBaseInfo.jsp
@@ -0,0 +1,72 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">  
+	<div class="tab-pane active">     
+		<div class="panel-body">
+			<div class="wrapper wrapper-content">
+				<div class="panel-form animated fadeInRight wp60 fc">
+					<div class="layui-form-item dn	has-error" >   
+						<label class="layui-form-label">id</label>  
+						<div class="layui-input-block">
+							<input type="text" name="id" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${notice.id }" >
+						</div>  
+					</div>
+					<%-- <div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">userId</label>  
+						<div class="layui-input-block">
+							<input type="text" name="userId" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${notice.userId }" >
+						</div>  
+					</div> --%>
+					<c:if test="${admin eq 'admin' }">
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">用户名称</label>
+						<div class="layui-input-block">
+							<input type="text" name="userName" readonly="readonly" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${notice.userName }" >
+						</div>  
+					</div>
+					</c:if>
+					<%-- <div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">typeFirst</label>  
+						<div class="layui-input-block">
+							<input type="text" name="typeFirst" lay-verify="title" readonly="readonly" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${notice.typeFirst }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">typeSecond</label>  
+						<div class="layui-input-block">
+							<input type="text" name="typeSecond" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${notice.typeSecond }" >
+						</div>  
+					</div> --%>
+					<div class="layui-form-item layui-form-text">
+                    <label class="layui-form-label">通知内容</label>  
+                    <div class="layui-input-block">              
+                        <textarea placeholder="请输入内容" class="layui-textarea" readonly="readonly">${notice.conrtent }</textarea>
+                    </div>
+                </div>
+					<%-- <div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">通知内容</label>  
+						<div class="layui-input-block">
+						      <textarea rows="" cols=""></textarea>
+							<input type="text" name="conrtent" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${notice.conrtent }" >
+						</div>  
+					</div> --%>
+					<%-- <div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">createDt</label>  
+						<div class="layui-input-block">
+							<input type="text" name="createDt" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${notice.createDt }" >
+						</div>  
+					</div> --%>
+					<%-- <div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">noticeCode</label>  
+						<div class="layui-input-block">
+							<input type="text" name="noticeCode" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${notice.noticeCode }" >
+						</div>  
+					</div> --%>
+	
+				</div>
+			</div>
+		</div>  
+	</div>
+</form>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/notice/noticeDetails.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/notice/noticeDetails.jsp
new file mode 100644
index 0000000..a2e4707
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/notice/noticeDetails.jsp
@@ -0,0 +1,312 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport"
+          content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+    <link rel="stylesheet" type="text/css" href="${ctx}/page/umeditor/themes/default/css/umeditor.css">
+    <script type="text/javascript" src="${ctx}/page/umeditor/third-party/template.min.js"></script>
+    <script type="text/javascript" src="${ctx}/page/umeditor/umeditor.config.js"></script>
+    <script type="text/javascript" src="${ctx}/page/umeditor/umeditor.min.js"></script>
+    <script type="text/javascript" src="${ctx}/page/umeditor/lang/zh-cn/zh-cn.js"></script>
+    <script type="text/javascript">
+        require("notice/noticeDetails.js");
+    </script>
+    <style>
+        .layui-form-select dl {
+            z-index: 9999;
+        }
+    </style>
+    <title>编辑</title>
+</head>
+<body class="lgraybg">
+<form class="layui-form" action="" style="width: 90%; margin-top: 20px">
+
+    <input name="aliass" id="aliass" value="${userData.alias}" class="layui-input" type="hidden">
+    <input name="userIds" id="userIds" value="${userData.userIds}" class="layui-input" type="hidden">
+    <input name="parentIds" id="parentIds" value="${userData.parentIds}" class="layui-input" type="hidden">
+    <input name="id" value="${notice.id}" class="layui-input" type="hidden">
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">通知类型</label>
+        <div class="layui-input-block">
+            <input type="radio" name="type" lay-filter="typeRadio" value="1" title="指定用户" checked>
+            <input type="radio" name="type" lay-filter="typeRadio" value="2" title="所有用户">
+        </div>
+    </div>
+
+    <div class="layui-form-item userInfo">
+        <div class="layui-inline">
+            <label class="layui-form-label">用户ID</label>
+            <div class="layui-input-inline" style="width: 26.5rem;margin-right: 0px;">
+                <input type="text" name="userId" value="${notice.userId}"  autocomplete="off"
+                       placeholder="用户ID或通道ID多个用,分隔" class="layui-input" required>
+            </div>
+        </div>
+        <div class="layui-inline" style="margin-bottom:0px;margin-right:0px;margin-top: -5px;">
+            <button type="button" style="height: 35px;line-height: 35px;" class="layui-btn btn1">查询用户名称</button>
+        </div>
+    </div>
+
+    <div class="layui-form-item userInfo">
+        <label class="layui-form-label">用户名称</label>
+        <div class="layui-input-block">
+            <input type="text" name="userName" value="${notice.userName}" autocomplete="off" class="layui-input layui-disabled"
+                   disabled>
+        </div>
+    </div>
+    <div class="layui-form-item userInfo">
+        <label class="layui-form-label">上级名称</label>
+        <div class="layui-input-block">
+            <input type="text" name="parentName" value="${parentName}" autocomplete="off" class="layui-input layui-disabled"
+                   disabled>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">模板类型</label>
+        <div class="layui-input-block">
+            <select name="typeSecond" lay-filter="typeSecond" lay-verify="required">
+                <option value="">请选择</option>
+                <c:forEach items="${templateTypeList}" var="list">
+                    <option value="${list.value}" ${notice.typeSecond == list.value ? "selected" : ""}>${list.name}</option>
+                </c:forEach>
+            </select>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">通知标题</label>
+        <div class="layui-input-block">
+            <input type="text" value="${notice.title}" name="title" autocomplete="off" class="layui-input">
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">通知简介</label>
+        <div class="layui-input-block">
+            <textarea name="desc" class="layui-textarea">${notice.desc}</textarea>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">通知链接</label>
+        <div class="layui-input-block">
+            <input type="text" placeholder="若有通知链接，无需填写通知内容" value="${notice.url}" name="url"
+                   autocomplete="off" class="layui-input">
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">通知内容</label>
+        <div class="layui-input-block">
+            <textarea name="conrtent" id="conrtent" placeholder="请输入内容"
+                      class="layui-textarea">${notice.conrtent}</textarea>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">是否推送</label>
+        <div class="layui-input-block">
+            <input type="radio" name="pushFlag" value="0" title="不发送" checked>
+            <input type="radio" name="pushFlag" value="1" title="发送">
+            <input type="radio" name="pushFlag" value="2" title="发送并发送到上级">
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">定时任务</label>
+        <div class="layui-input-block">
+            <input type="radio" name="scheduleFlag" value="0" title="立即执行(仅一次)" checked>
+            <input type="radio" name="scheduleFlag" value="1" title="次日执行(仅一次)">
+            <input type="radio" name="scheduleFlag" value="2" title="每天执行">
+            <input type="radio" name="scheduleFlag" value="3" title="每周执行">
+            <input type="radio" name="scheduleFlag" value="4" title="每月执行">
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button class="layui-btn" lay-submit lay-filter="formDemo">立即提交</button>
+            <button type="button" id="close" class="layui-btn layui-btn-primary">关闭</button>
+        </div>
+    </div>
+</form>
+</body>
+<script>
+    var layer;
+    var form;
+    var element;
+
+    var alias;
+
+    //Demo
+    layui.use(['form', 'layer', 'element', 'upload'], function () {
+        form = layui.form;
+        layer = layui.layer;
+        element = layui.element;
+
+        var um = UM.getEditor('conrtent');
+        um.setWidth("100%");
+
+        var layerIndex = parent.layer.getFrameIndex(window.name);
+
+        $('#close').click(function () {
+            parent.layer.closeAll();
+        });
+
+        form.on('radio(typeRadio)', function (data) {
+            var item = $('select[name="typeSecond"]')
+            if (data.value == 2) {
+                $('.userInfo').hide()
+                $('input[name="userName"]').val("");
+                $('input[name="userId"]').val("-1");
+                $('input[name="title"]').val("系统通知");
+                $('textarea[name="desc"]').val(null);
+                alias = null;
+                item.val(null);
+                item.attr("disabled", true);
+                item.removeAttr("lay-verify");
+            } else {
+                $('.userInfo').show()
+                $('input[name="userName"]').val("")
+                $('input[name="userId"]').val("")
+                item.removeAttr("disabled");
+                item.removeAttr("lay-verify", "required");
+            }
+
+            form.render('select');
+        })
+
+        function setTemplateContent($val){
+            let title = $("[name='typeSecond']").find("option:selected").text();
+            let templateStr = '${templateList}'.replace(/\n/g,"\\n");
+            console.log(templateStr)
+            let $obj = JSON.parse(templateStr);
+
+            let $tmp = null;
+            if(!$obj){
+                $('input[name = "title"]').val("");
+                $('textarea[name = "desc"]').val("");
+                layer.msg("暂无可用模板,请在自定义模板中添加!",{icon:2});return;
+            }
+            if(title){
+                $('input[name = "title"]').val(title+"通知");
+            }
+
+            for (let i = 0; i < $obj.length; i++){
+                if($val == $obj[i].type){
+                    $tmp = $obj[i];
+                    break;
+                }else{
+                    $tmp = null;
+                }
+            }
+            console.log($obj);
+            if(!$tmp){
+                $('input[name = "title"]').val("");
+                $('textarea[name = "desc"]').val("");
+                layer.msg("暂无可用模板,请在自定义模板中添加!",{icon:2});return;
+            }
+            console.log($tmp.content);
+            $('textarea[name = "desc"]').val($tmp.content);
+        }
+
+        form.on('select(typeSecond)', function(data) {
+            if (alias != null) {
+                let title = $(data.elem).find("option:selected").text()+"通知";
+                $('input[name = "title"]').val(title);
+                let $val = data.value;
+                setTemplateContent($val);
+            }
+        })
+
+        //监听提交
+        form.on('submit(formDemo)', function (data) {
+            var index = layer.load(1, {shade: [0.1, '#000']});
+            var params = data.field;
+            params.conrtent = um.getContent();
+            $.ajax({
+                url: ctx + '/notice/sendTempNotice',
+                type: 'post',
+                data: JSON.stringify(params),
+                dataType: 'json',
+                contentType: "application/json",
+                success: function (res) {
+                    layer.close(index);
+                    if (res.code == 200) {
+                        parent.layer.msg(res.message);
+                        parent.layer.closeAll();
+                        parent.table.reload('idTest', {//testReload是组件名称,表格名
+                            page: {//page参数是指重新刷新后从第几页开始
+                                curr: 1 //重新从第 1 页开始
+                            }
+                        });
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 5
+                        });
+                    }
+                },
+                error: function (res) {
+                    layer.close(index);
+                    layer.msg("操作失败", {
+                        icon: 5
+                    });
+                }
+            })
+            return false;
+        });
+
+        $('.btn1').click(function () {
+            var index = layer.load(1, {shade: [0.1, '#000']});
+            if(!$('input[name="userId"]').val()){
+                layer.msg("请输入用户ID或通道方ID",{icon:7});
+                return;
+            }
+            $.ajax({
+                url: ctx + '/userApp/getByUId/' + $('input[name="userId"]').val(),
+                type: 'GET',
+                dataType: 'json',
+                success: function (res) {
+                    layer.close(index);
+                    if (res.code == 200) {
+                        // if(res.data.alias){
+                        //     layer.msg("请输入正确的用户ID或通道ID", { icon: 2});
+                        //     return;
+                        // }
+                        alias = res.data.fastName;
+                        $('input[name="userName"]').val(res.data.userName);
+                        $('input[name="parentName"]').val(res.data.parentName);
+                        $('#aliass').val(res.data.alias);
+                        $('#userIds').val(res.data.userIds);
+                        $('#parentIds').val(res.data.parentIds);
+                        if($('select[name="typeSecond"]').val()){
+                            setTemplateContent($('select[name="typeSecond"]').val());
+                        }
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 2
+                        });
+                    }
+                },
+                error: function (res) {
+                    layer.msg("查询失败", {
+                        icon: 2
+                    });
+                }
+            })
+        })
+    });
+</script>
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/notice/noticeExtendsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/notice/noticeExtendsInfo.jsp
new file mode 100644
index 0000000..592687a
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/notice/noticeExtendsInfo.jsp
@@ -0,0 +1,201 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>           
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> 
+<div class="tab-pane active">      
+	<div class="animated fadeInRight">
+		<div class="whitebg pl10 pr10">
+			<table class="table table-striped table-bordered table-hover">     
+				<thead> 
+					<tr>  
+						<th class="textc">序号</th>         
+						<th class="textc wp15">流水账号</th>
+						<th class="textc">日期</th>         
+						<th class="textc">财务类别</th>     
+						<th class="textc">金额</th>         
+						<th class="textc">银行</th>         
+						<th class="textc">发票</th>         
+						<th class="textc">客户名称</th>     
+						<th class="textc wp15">单号</th>    
+						<th class="textc">状态</th>         
+						<th class="textc">类别</th>         
+						<th class="textc">操作</th>         
+					</tr> 
+				</thead>
+				<tbody> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+                
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="green">支出</span></td>     
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+				</tbody>
+                
+			</table>  
+			<!-- footer -->  
+			<div class="clearfix mb10 pb20">          
+					<div class="layui-tab-item fr">       
+							<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+							<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>   
+							<div class="pagination dlblock vm" id="pagination"></div>
+							<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>            
+					</div>
+				</div>  
+		</div>      
+	</div>        
+</div>          
+                
+<script type="text/javascript">    
+//分页          
+$('#pagination').pagination({        
+	pageCount: 50,
+	jump: true,   
+	coping: true, 
+	homePage: '首页',    
+	endPage: '末页',     
+	prevContent: '上页', 
+	nextContent: '下页', 
+	callback: function(api) {          
+		$('.now').text(api.getCurrent());
+	}             
+});             
+</script>       
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/notice/noticeFunctionsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/notice/noticeFunctionsInfo.jsp
new file mode 100644
index 0000000..982ce84
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/notice/noticeFunctionsInfo.jsp
@@ -0,0 +1,130 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>		
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">      
+<div class="tab-pane active">
+				<div class="panel-body">
+					<div class="wrapper wrapper-content">     
+						<div class="panel-form animated fadeInRight wp60 fc">
+							<!-- 账号资料 -->
+			<div class="layui-form-item 	has-error">
+				<label class="layui-form-label">单行输入框<i class="red">*</i></label>
+				<div class="layui-input-block">
+					<input type="text" name="title" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input">
+				</div>                                         
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">自定义验证</label>
+				<div class="layui-input-inline ml30">
+					<input type="password" name="password" lay-verify="pass" placeholder="请输入密码" autocomplete="off" class="layui-input">
+				</div>
+				<div class="layui-form-mid layui-word-aux">请填写6到12位密码</div>
+			</div>
+			<div class="form-group">
+				<div class="layui-form-item">          
+					<label class="layui-form-label">单行选择框</label>
+					<div class="layui-input-block">
+						<select name="interest" lay-filter="aihao">  
+							<option value=""></option>
+							<option value="0">写作</option>         
+							<option value="1" selected="">阅读</option>
+							<option value="2">游戏</option>
+							<option value="3">音乐</option>
+							<option value="4">旅行</option>  
+						</select>              
+					</div>
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<div class="layui-inline">  
+					<label class="layui-form-label">范围</label>
+					<div class="layui-input-inline ml30">
+						<input type="text" name="price_min" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>                                     
+					<div class="layui-form-mid">-</div>
+					<div class="layui-input-inline">       
+						<input type="text" name="price_max" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>
+				</div>           
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">联动选择框</label>
+				<div class="layui-input-inline ml30">
+					<select name="quiz1">     
+						<option value="">请选择省</option>
+						<option value="浙江" selected="">浙江省</option> 
+						<option value="你的工号">江西省</option>           
+						<option value="你最喜欢的老师">福建省</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz2">
+						<option value="">请选择市</option>
+						<option value="杭州">杭州</option>
+						<option value="宁波" disabled="">宁波</option>
+						<option value="温州">温州</option>
+						<option value="温州">台州</option>
+						<option value="温州">绍兴</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz3">
+						<option value="">请选择县/区</option>
+						<option value="西湖区">西湖区</option>
+						<option value="余杭区">余杭区</option>
+						<option value="拱墅区">临安市</option>
+					</select>
+				</div>    
+			</div>
+			<div class="layui-form-item" pane="">   
+				<label class="layui-form-label">原始复选框</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="like1[write]" lay-skin="primary" title="写作" checked="">  
+					<input type="checkbox" name="like1[read]" lay-skin="primary" title="阅读">
+					<input type="checkbox" name="like1[game]" lay-skin="primary" title="游戏" disabled="">
+				</div>
+			</div>
+
+			<div class="layui-form-item">
+				<label class="layui-form-label">开关-默认关</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="close" lay-skin="switch" lay-text="ON|OFF">
+				</div>
+			</div>
+			<div class="layui-form-item">  
+				<label class="layui-form-label">单选框</label>
+				<div class="layui-input-block">
+					<input type="radio" name="sex" value="男" title="男" checked="">
+					<input type="radio" name="sex" value="女" title="女">
+					<input type="radio" name="sex" value="禁" title="禁用" disabled="">
+				</div>
+			</div>
+			<!--<div class="layui-form-item layui-form-text">
+				<label class="layui-form-label">上传图片</label>
+				<div class="layui-input-block">
+					<div class="layui-upload-drag w200 h200">
+						<i class="layui-icon"></i>          
+						<p>点击上传</p>
+					</div>
+				</div>
+			</div>-->
+				<div class="layui-form-item layui-form-text">
+					<label class="layui-form-label">普通文本域</label>  
+					<div class="layui-input-block">              
+						<textarea placeholder="请输入内容" class="layui-textarea"></textarea>
+					</div>
+				</div>
+			</div>
+		</div>   
+	</div>
+</div>
+</form>   
+<script type="text/javascript">
+	//form表单样式
+	layui.use(['layer', 'form'], function() {    
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+</script>                 
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/notice/noticeList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/notice/noticeList.jsp
new file mode 100644
index 0000000..9a0911c
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/notice/noticeList.jsp
@@ -0,0 +1,431 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<!DOCTYPE html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+
+    <style>
+        /*.layui-table-cell {*/
+        /*    text-align: center;*/
+        /*    height: auto;*/
+        /*    white-space: normal;*/
+        /*}*/
+
+        .layui-table img {
+            max-width: 300px
+        }
+    </style>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pb5 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form id="form1" class="layui-form" action="" style="margin-top: 10px">
+                    <div class="layui-form-item">
+                        <!-- <span class="dlblock w100 textr">ID：</span>
+                    <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+                        <input type="text" placeholder="请输入内容" id="searchId">
+                        </span>  -->
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">用户ID</label>
+                            <div class="layui-input-inline">
+                                <input type="text" name="userId" placeholder="请输入用户ID" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">一级分类</label>
+                            <div class="layui-input-inline">
+                                <select name="typeFirst" lay-filter="typeFirst">
+                                    <option value="">请选择一级分类</option>
+                                    <c:if test="${typeFirstList != null}">
+                                        <c:forEach items="${typeFirstList}" var="item">
+                                            <option value="${item.value}">${item.name}</option>
+                                        </c:forEach>
+                                    </c:if>
+                                </select>
+                            </div>
+                            <label class="layui-form-label">二级分类</label>
+                            <div class="layui-input-inline">
+                                <select name="typeSecond" lay-filter="typeSecond">
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+
+        <table class="layui-hide" id="demo" lay-filter="test"></table>
+    </div>
+</div>
+
+<script id="typeSecond0" type="text/html">
+    <c:if test="${typeSecondList0 != null}">
+        <option value="">选择二级分类</option>
+        <c:forEach var="item" items="${typeSecondList0}">
+            <option value="${item.value}">${item.name}</option>
+        </c:forEach>
+    </c:if>
+</script>
+
+<script id="typeSecond1" type="text/html">
+    <c:if test="${typeSecondList1 != null}">
+        <option value="">选择二级分类</option>
+        <c:forEach var="item" items="${typeSecondList1}">
+            <option value="${item.value}">${item.name}</option>
+        </c:forEach>
+    </c:if>
+</script>
+
+<script id="barDemo" type="text/html">
+    <a lay-event="edit" class="layui-btn layui-btn-xs">
+        <i class="layui-icon layui-icon-edit"></i>
+        编辑
+    </a>
+
+    <a lay-event="del" class="layui-btn layui-btn-xs layui-btn-danger">
+        <i class="layui-icon layui-icon-delete"></i>
+        删除
+    </a>
+</script>
+
+
+<script type="text/html" id="imgTemp">
+    <img src="{{d.icon}}" width="50px" height="50px" alt=""/>
+</script>
+
+<script type="text/html" id="toolBar">
+    <a class="layui-btn layui-btn-sm " href="javascript:void(0);" lay-event="search">
+        <i class="layui-icon layui-icon-search"></i>
+        查询
+    </a>
+    <a class="layui-btn layui-btn-sm" lay-event="add">
+        <i class="layui-icon layui-icon-add-1"></i>
+        添加
+    </a>
+    <a class="layui-btn layui-btn-sm layui-btn-danger">
+        <i class="layui-icon layui-icon-delete"></i>
+        删除
+    </a>
+</script>
+
+<script>
+    var laypage, layer, table, form;
+
+    layui.use(['laypage', 'layer', 'mDropdown', 'table', 'upload', 'element', 'form'], function () {
+        laypage = layui.laypage;
+        layer = layui.layer; //弹层
+        table = layui.table; //表格
+        dropdown = layui.mDropdown;
+        form = layui.form;
+
+        //执行一个 table 实例
+        table.render({
+            elem: '#demo'
+            , id: 'idTest'
+            , url: '${ctx}/notice/page' //数据接口
+            , autoSort: false
+            , where: {
+                column: 'createDt'
+                , asc: false
+            }
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , title: 'app首页菜单表'
+            , page: true //开启分页
+            , toolbar: '#toolBar' //开启工具栏，此处显示默认图标，可以自定义模板，详见文档
+            , defaultToolbar: ['filter']
+            , cols: [[ //表头
+                {type: 'checkbox'}
+                , {field: '', title: '序号', type: 'numbers'}
+                , {field: 'userId', title: '用户id', width: 80, sort: false}
+                , {
+                    field: 'userName', title: '用户名', width: 80, align: "center", templet: function (r) {
+                        if (r.userId == -1) {
+                            return '全员'
+                        } else {
+                            return r.userName
+                        }
+                    }
+                }
+                , {
+                    field: 'typeFirst', title: '类别', minWidth: 100, align: "center", templet: function (r) {
+                        var content;
+                        if (r.typeFirst == 0) {
+                            content = "分润通知"
+                        } else {
+                            content = "系统通知"
+                        }
+
+                        if (r.typeSecond == 0) {
+                            content += " - 身份认证"
+                        }
+                        if (r.typeSecond == 1) {
+                            content += " - 商家认证"
+                        }
+                        if (r.typeSecond == 2) {
+                            content += " - 店员退款审核"
+                        }
+                        if (r.typeSecond == 4) {
+                            content += " - 邀请注册"
+                        }
+                        if (r.typeSecond == 5) {
+                            content += " - 银行卡认证"
+                        }
+                        if (r.typeSecond == 6) {
+                            content += " - 商户分润"
+                        }
+                        if (r.typeSecond == 99) {
+                            content += " - 其他"
+                        }
+                        if (r.typeSecond == 7) {
+                            content += " - 升级收益"
+                        }
+                        if (r.typeSecond == 8) {
+                            content += " - 商户资料修改"
+                        }
+                        if (r.typeSecond == 9) {
+                            content += " - 结算卡修改"
+                        }
+                        if (r.typeSecond == 10) {
+                            content += " - 商户违规"
+                        }
+                        if (r.typeSecond == 11) {
+                            content += " - 商户异常"
+                        }
+                        if (r.typeSecond == 12) {
+                            content += " - 商户冻结"
+                        }
+
+                        return content
+                    }
+                }
+                , {field: 'title', title: '标题', minWidth: 150}
+                , {field: 'desc', title: '简介', minWidth: 150}
+                , {field: 'url', title: '内容链接', minWidth: 150}
+                , {field: 'conrtent', title: '通知内容', minWidth: 150}
+                , {
+                    field: 'createDt',
+                    title: '创建时间',
+                    width: 160,
+                    sort: true,
+                    hide: false,
+                    templet: "<div>{{layui.util.toDateString(d.createDt, 'yyyy-MM-dd HH:mm:ss')}}</div>"
+                }
+                , {field: 'noticeCode', hide: true, title: '通知编号', minWidth: 100}
+                , {field: 'orderNumber', hide: true, title: '订单号', minWidth: 100}
+                , {fixed: 'right', title: '操作', minWidth: 85, align: 'center', toolbar: '#barDemo'}
+            ]]
+            , done: function (res) {
+            }
+        });
+
+        //监听头工具栏事件
+        table.on('toolbar(test)', function (obj) {
+            var checkStatus = table.checkStatus(obj.config.id)
+                , data = checkStatus.data; //获取选中的数据
+            switch (obj.event) {
+                case 'search':
+                    search(obj);
+                    break;
+                case 'add':
+                    toAdd()
+                    break;
+                case 'update':
+                    if (data.length === 0) {
+                        layer.msg('请选择一行');
+                    } else if (data.length > 1) {
+                        layer.msg('只能同时编辑一个');
+                    } else {
+                        toEdit(checkStatus.data[0].id);
+                    }
+                    break;
+                case 'delete':
+                    if (data.length === 0) {
+                        layer.msg('请选择一行');
+                    } else {
+                        del(data)
+                    }
+                    break;
+            }
+        });
+
+        //监听行工具事件
+        table.on('tool(test)', function (obj) { //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            var data = obj.data //获得当前行数据
+                , layEvent = obj.event; //获得 lay-event 对应的值
+            if (layEvent === 'detail') {
+                layer.msg('查看操作');
+            } else if (layEvent === 'del') {
+                del(data)
+            } else if (layEvent === 'edit') {
+                //layer.msg('编辑操作');
+                toEdit(data.id);
+            } else if (layEvent === 'bandage') {
+                bandage(data.id);
+            }
+        });
+
+        //监听排序事件
+        table.on('sort(test)', function (obj) { //注：sort 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            console.log(obj.field); //当前排序的字段名
+            console.log(obj.type); //当前排序类型：desc（降序）、asc（升序）、null（空对象，默认排序）
+            console.log(this); //当前排序的 th 对象
+
+            //尽管我们的 table 自带排序功能，但并没有请求服务端。
+            //有些时候，你可能需要根据当前排序的字段，重新向服务端发送请求，从而实现服务端排序，如：
+            table.reload('idTest', {
+                initSort: obj //记录初始排序，如果不设的话，将无法标记表头的排序状态。
+                , where: { //请求参数（注意：这里面的参数可任意定义，并非下面固定的格式）
+                    column: obj.field //排序字段
+                    , asc: obj.type === 'asc' //排序方式
+                }
+            });
+
+            layer.msg('服务端排序。order by ' + obj.field + ' ' + obj.type);
+        });
+
+        form.on('select(typeFirst)', function(data) {
+            console.log("data.value : " + data.value);
+            var html;
+            if (data.value === "0") {
+                html = document.getElementById("typeSecond0").innerHTML;
+            } else if (data.value === "1") {
+                html = document.getElementById("typeSecond1").innerHTML;
+            } else {
+                html = "";
+            }
+
+            var typeSecond = $('select[name="typeSecond"]');
+            typeSecond.empty();
+            typeSecond.append(html);
+            form.render('select');
+        });
+    });
+
+    function toEdit(id) {
+        var url = ctx + '/notice/detail/' + id;
+        var index = layer.open({
+            type: 2
+            , title: "通知详情"
+            , shade: 0.5
+            , maxmin: true
+            , content: url
+            , area: ['753px', '700px']
+        });
+    }
+
+    function toAdd() {
+        var url = ctx + '/notice/detail';
+        var index = layer.open({
+            type: 2
+            , title: "通知详情"
+            , shade: 0.5
+            , maxmin: true
+            , content: url
+            , area: ['753px', '700px']
+            , end: function () {
+                time: 1000
+            }
+        });
+    }
+
+    function bandage(id) {
+        var url = '${ctx}/appMenu/bandage/' + id;
+        var index = layer.open({
+            type: 2
+            , title: "用户角色"
+            , shade: 0.5
+            , maxmin: true
+            , content: url
+            , area: ['400px', '300px']
+        });
+    }
+
+    function del(obj) {
+        var url = '${ctx}/notice/del/' + obj.id;
+        layer.confirm('确认删除', {
+            yes: function () {
+                $.ajax({
+                    url: url,
+                    type: 'DELETE',
+                    dataType: 'json',
+                    success: function (res) {
+                        if (res.code == 200) {
+                            layer.msg(res.message);
+                            table.reload('idTest');
+                        } else {
+                            layer.msg(res.message, {
+                                icon: 5
+                            });
+                        }
+                    },
+                    error: function () {
+                        layer.msg("操作失败", {
+                            icon: 5
+                        });
+                    }
+                })
+            }
+        });
+    }
+
+    function search(obj) {
+        var params = serialize($('#form1'));
+        params.column = obj.config.where.column;
+        params.asc = obj.config.where.asc;
+        table.reload('idTest', {
+            page: {
+                curr: 1
+            },
+            initSort: obj,
+            where: params
+        });
+    }
+</script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/notice/templateDetail.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/notice/templateDetail.jsp
new file mode 100644
index 0000000..cbbcc26
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/notice/templateDetail.jsp
@@ -0,0 +1,106 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp" />
+    <style>
+        .layui-input,.layui-textarea{
+            border-color:#606060;
+        }
+        .layui-input-block{
+            width: 300px;
+        }
+
+    </style>
+</head>
+<body style="padding: 1rem 0">
+<form class="layui-form" action="" style="width: 70%">
+    <input name="id" value="${entity.id}" hidden/>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">模板类型</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block col-md-8">
+                <select name="type" class="layui-select" lay-verify="required">
+                    <option value="">请选择</option>
+                    <c:forEach items="${templateTypeList}" var="list">
+                        <option value="${list.value}" ${entity.type == list.value ? "selected" : ""}>${list.name}</option>
+                    </c:forEach>
+                </select>
+            </div>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">模板变量</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input type="text" placeholder="请输入模板变量" value="${entity.variable}" name="variable"
+                       autocomplete="off" class="layui-input">
+            </div>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">模板内容</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+               <textarea name="content" id="content" placeholder="请输入模板内容" maxlength="2000" lay-verify="required"
+                         class="layui-textarea">${entity.content}</textarea>
+            </div>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button class="layui-btn" lay-submit lay-filter="formDemo">立即提交</button>
+            <button type="button" id="close" class="layui-btn layui-btn-primary">关闭</button>
+        </div>
+    </div>
+</form>
+
+<script>
+    //Demo
+    layui.use(['form','layer'], function(){
+        var form = layui.form;
+        var layer = layui.layer;
+        $('#close').click(function() {
+            parent.layer.closeAll();
+        });
+        //监听提交
+        form.on('submit(formDemo)', function(data){
+            var index = layer.load(1,{shade: [0.1,'#000'] });
+            $.ajax({
+                url: '${ctx}/notice/template/save',
+                method: 'post',
+                data: JSON.stringify(data.field),
+                dataType: 'JSON',
+                contentType:"application/json",
+                success: function(res) {
+                    layer.close(index);
+                    if(res.code == 200) {
+                        layer.msg(res.message, { icon: 1, time: 1000 }, function () {
+                            var index = parent.layer.getFrameIndex(window.name);
+                            parent.layui.table.reload('noticeTemplate');
+                            parent.layer.close(index);
+                        });
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 2
+                        });
+                    }
+                }
+            })
+            return false;
+        });
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/notice/templateList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/notice/templateList.jsp
new file mode 100644
index 0000000..3adf42a
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/notice/templateList.jsp
@@ -0,0 +1,207 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" id="form1" action="" style="margin-top: 10px">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">模板类型</label>
+                            <div class="layui-input-block">
+                                <select name="type" class="layui-select" lay-verify="required">
+                                    <option value="">请选择</option>
+                                    <option value="10">商户违规</option>
+                                    <option value="11">商户异常</option>
+                                    <option value="12">商户冻结</option>
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <div class="mb50 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-hide" id="noticeTemplateTab" lay-filter="noticeTemplateTab"></table>
+        </div>
+    </div>
+</div>
+<script type="text/html" id="leftBar">
+    <a class="layui-btn layui-btn-normal layui-btn-sm fa fa-plus"
+       lay-event="add"><span>&nbsp;新增</span></a>
+    <a class="layui-btn layui-btn-sm" lay-event="search">
+        <i class="layui-icon layui-icon-search"></i>查询
+    </a>
+</script>
+
+<script type="text/html" id="toolBar">
+    <a class="layui-btn layui-btn-xs" lay-event="edit">
+        <i class="layui-icon layui-icon-edit"></i>编辑
+    </a>
+    <a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="del">
+        <i class="layui-icon layui-icon-delete"></i>删除
+    </a>
+</script>
+
+<script>
+    layui.use(['table', 'layer'], function () {
+        var table = layui.table;
+        var layer = layui.layer;
+        let templateTypeList = eval('${templateTypeList}');
+        var tableIns = table.render({
+            elem: '#noticeTemplateTab'
+            , url: '${ctx}/notice/template/page'
+            , id: 'noticeTemplate'
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            , toolbar: '#leftBar' //开启头部工具栏，并为其绑定左侧模板
+            , defaultToolbar: ['filter']
+            , defaultToolbar: ['filter', 'exports', 'print', { //自定义头部工具栏右侧图标。如无需自定义，去除该参数即可
+                title: '提示'
+                , layEvent: 'LAYTABLE_TIPS'
+                , icon: 'layui-icon-tips'
+            }]
+            , title: '自定义模板消息通知'
+            , cols: [[
+                {type: 'checkbox', fixed: 'left', hidden: true}
+                , {field: 'numbers', title: '序号', fixed: 'left', unresize: true, width: 80, type: 'numbers'}
+                , {field: 'type', title: '模板类型',width: 100 ,templet: function (r){
+                    return getDictText(r.type,templateTypeList,"value");
+                  }}
+                , {field: 'variable', title: '模板变量',width: 100}
+                , {field: 'content', title: '模板内容',minWidth:250}
+                , {
+                    field: 'createTime',
+                    title: '创建时间',
+                    width: 160,
+                    templet: "<div>{{layui.util.toDateString(d.createTime,'yyyy-MM-dd HH:mm:ss')}}</div>"
+                }
+                , {fixed: 'right', title: '操作', width: 200, toolbar: '#toolBar'}
+            ]]
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , page: true
+        });
+        table.on('tool(noticeTemplateTab)', function (obj) { //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            var data = obj.data; //获得当前行数据
+            var layEvent = obj.event; //获得 lay-event 对应的值（也可以是表头的 event 参数对应的值）
+            if (layEvent === 'del') { //删除
+                layer.confirm('真的删除么?', {icon: 3}, function (index) {
+                    obj.del(); //删除对应行（tr）的DOM结构，并更新缓存
+                    layer.close(index);
+                    del(data);
+                    //向服务端发送删除指令
+                });
+            } else if (layEvent === 'edit') { //编辑
+                //do something
+                toAdd(obj.data);
+                //同步更新缓存对应的值
+                // obj.update({
+                //     username: '123'
+                //     ,title: 'xxx'
+                // });
+            }
+        });
+
+        //监听头工具栏事件
+        table.on('toolbar(noticeTemplateTab)', function (obj) {
+            switch (obj.event) {
+                case 'add':
+                    // 添加
+                    toAdd();
+                    break;
+                case 'search':
+                    var params = serialize($('#form1'));
+                    table.reload('noticeTemplate', {
+                        where: params
+                        , page: {
+                            size: 10
+                            , current: 1
+                        }
+                    });
+                    break;
+            }
+        });
+
+        function toAdd(obj) {
+            var url = '${ctx}/notice/template/detail';
+            var title = "新增";
+            if (obj != undefined) {
+                url = "${ctx}/notice/template/detail/" + obj.id;
+                title = "编辑"
+            }
+            var index = layer.open({
+                type: 2
+                , shade: 0.5
+                , title: title
+                , maxmin: true
+                , content: url
+                , area: ['500px', '400px']
+                , end: function () {
+
+                }
+            });
+        }
+
+        function del(obj) {
+            $.ajax({
+                url: '${ctx}/notice/template/del/' + obj.id,
+                method: 'DELETE',
+                dataType: 'JSON',
+                contentType: "application/json",
+                success: function (res) {
+                    layer.msg(res.data, {
+                        icon: res.code == 200 ? 1 : 2
+                    });
+                }
+            })
+        }
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/notification/notificationList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/notification/notificationList.jsp
new file mode 100644
index 0000000..d28866b
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/notification/notificationList.jsp
@@ -0,0 +1,170 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+
+</head>
+<body>
+<table class="layui-hide" id="notificationTab" lay-filter="notificationTab"></table>
+
+<script type="text/html" id="toolbarDemo">
+    <div class="layui-btn-container">
+        <button class="layui-btn layui-btn-sm" lay-event="already">全部已读</button>
+        <button class="layui-btn layui-btn-sm" lay-event="whithout">全部未读</button>
+    </div>
+</script>
+
+<script id="barDemo" type="text/html">
+    {{# if (d.status == '1') { }}
+    <a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="edit">点击已读</a>
+    {{# } else { }}
+    <scan>已读</scan>
+    {{# } }}
+</script>
+
+<script>
+    layui.use(['table', 'layer' ], function () {
+        var table = layui.table;
+        var layer = layui.layer;
+
+        var tableIns = table.render({
+            elem: '#notificationTab'
+            , url: '${ctx}/notification/page'
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.count, //解析数据长度
+                    "data": res.notificationList //解析数据列表
+                };
+            }
+            , request: {
+                pageName: 'currPage' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            ,toolbar: '#toolbarDemo' //开启头部工具栏，并为其绑定左侧模板
+            , title: '通知'
+            , cols: [[
+                {type: 'checkbox',  hidden: true}
+                , {field: 'numbers', title: '序号',width: 80,type: 'numbers'}
+                , {field: 'title', title: '通知路由',width: 180,align:"center"}
+                , {field: 'content', title: '通知信息',align:"center"}
+                , {field: 'createTime', title: '创建时间',width: 160,align:"center"}
+                , {fixed: 'right', title: '操作',width: 100, toolbar: '#barDemo',align:"center"}
+            ]]
+            , page: true
+            , done: function () {
+                $("[data-field='forceUpdate']").children().each(function () {
+                    if ($(this).text() == '0') {
+                        $(this).text('否');
+                    } else if ($(this).text() == '1') {
+                        $(this).text('是');
+                    }
+                });
+            }
+        });
+
+        //头工具栏事件
+        table.on('toolbar(notificationTab)', function (obj) {
+            if (obj.event === 'already') {
+                layer.confirm('确认选择全部已读?', function (index) {
+                    layer.close(index);
+                    already();
+                });
+            } else if (obj.event === 'whithout') {
+                layer.confirm('确认选择全部未读?', function (index) {
+                    layer.close(index);
+                    whithout();
+                });
+            }
+        });
+        //监听行工具事件
+        table.on('tool(notificationTab)', function (obj) {
+            var data = obj.data;
+            //console.log(obj)
+            if (obj.event === 'edit') {
+                // layer.confirm('确认已读?', function (index) {
+                //     layer.close(index);
+                    del(obj);
+                // });
+            }
+        });
+
+        function already() {
+            $.ajax({
+                url: '${ctx}/notification/already',
+                method: 'post',
+                dataType: 'JSON',
+                contentType: "application/json",
+                success: function (res) {
+                    if (res.code == 200) {
+                        parent.location.reload();
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 5
+                        });
+                    }
+                }
+            })
+        }
+
+        function whithout() {
+            $.ajax({
+                url: '${ctx}/notification/whithout',
+                method: 'post',
+                dataType: 'JSON',
+                contentType: "application/json",
+                success: function (res) {
+                    if (res.code == 200) {
+                        location.reload();
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 5
+                        });
+                    }
+                }
+            })
+        }
+
+        function del(obj) {
+            $.ajax({
+                url: '${ctx}/notification/delete',
+                method: 'post',
+                data: JSON.stringify(obj.data),
+                dataType: 'JSON',
+                contentType: "application/json",
+                success: function (res) {
+                    if (res.code == 200) {
+                        layer.msg(res.message, {
+                            icon: 1
+                        });
+                        location.reload();
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 5
+                        });
+                    }
+                }
+            })
+        }
+    });
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/officialActivity/detail.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/officialActivity/detail.jsp
new file mode 100644
index 0000000..de14ba6
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/officialActivity/detail.jsp
@@ -0,0 +1,350 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+    <style>
+        .layui-input, .layui-textarea {
+            border-color: #606060;
+        }
+    </style>
+</head>
+<body>
+<form class="layui-form" action="" style="width: 438px">
+    <input name="id" value="${officialActivity.id}" hidden/>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">活动名称</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="officName" value="${officialActivity.officName}" lay-verify="required"
+                       placeholder="请输入活动名称" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">活动标题</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="officTitle" value="${officialActivity.officTitle}" lay-verify="required"
+                       placeholder="请输入活动标题" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">活动类型</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <c:if test="${not empty actTypeList}">
+                    <select  lay-verify="required" name="actType" id="actType" class="layui-select">
+                        <option value="">请选择</option>
+                        <c:forEach items="${actTypeList}" var="type">
+                            <option value="${type.value}" ${officialActivity.actType eq type.value ? 'selected' : ''}>${type.name}</option>
+                        </c:forEach>
+                    </select>
+                </c:if>
+            </div>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">活动内容</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="officContent" value="${officialActivity.officContent}" placeholder="请输入活动内容"
+                       class="layui-input"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">开始时间</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="startTime" lay-verify="required"
+                       value="<fmt:formatDate  value='${officialActivity.startTime}' pattern='yyyy-MM-dd'/>"
+                       autocomplete="off" placeholder="请输入开始时间" class="layui-input loan-date"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">结束时间</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="endTime" lay-verify="required"
+                       value="<fmt:formatDate  value='${officialActivity.endTime}' pattern='yyyy-MM-dd'/>"
+                       autocomplete="off" placeholder="请输入结束时间" class="layui-input loan-date"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">类别</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <c:choose>
+                    <c:when test="${empty officialActivity}">
+                        <c:forEach items="${dictList}" var="dict">
+                            <input type="checkbox" name="activityGroupNo" title="${dict.name}"
+                                   value="${dict.value}">
+                        </c:forEach>
+                    </c:when>
+                    <c:otherwise>
+                        <select  lay-verify="required" name="value" id="value" class="layui-select">
+                            <option value="">请选择</option>
+                            <c:forEach items="${dictList}" var="dict">
+                                <option value="${dict.value}" <c:if test="${officialActivity.activityGroupNo eq dict.value}">selected</c:if>>${dict.name}</option>
+                            </c:forEach>
+                        </select>
+                    </c:otherwise>
+                </c:choose>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">角色</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input type="radio" name="roleType" value="common" ${empty officialActivity || officialActivity.roleType eq 'common' ?  'checked' : ''} title="全部" checked>
+                <c:forEach items="${roleList}" var="r">
+                    <input type="radio" name="roleType" ${officialActivity.roleType eq r.roleCode ? 'checked' : ''} value="${r.roleCode}" title="${r.roleName}" >
+                </c:forEach>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">所属分组</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="groupBy" value="${officialActivity.groupBy}" placeholder="请输入所属分组" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">链接地址</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="toImgUrl" value="${officialActivity.toImgUrl}" placeholder="请输入链接地址" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">活动图片</label>
+        <div class="layui-input-block" style="display: flex;justify-content: flex-start">
+            <input name="fileKey" id="fileKey" hidden/>
+            <input name="officImgUrl" id="url" value="${officialActivity.officImgUrl}" hidden/>
+            <input name="chooseFile" id="chooseFile" placeholder="浏览..." class="layui-input layui-col-xs6"
+                   style="cursor:hand" readonly/>
+            <button type="button" class="layui-btn layui-btn-normal layui-col-xs3" id="uploadBtn">
+                上传
+            </button>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">活动规则</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <textarea placeholder="请输入活动规则" name="officRule" id="officRule"
+                          style="display: none">${officialActivity.officRule}</textarea>
+                <%--                <input name="goodDesc" value="${officialGoods.goodDesc}" maxlength="100" placeholder="请输入商品描述" class="layui-input"/>--%>
+            </div>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button class="layui-btn" lay-submit lay-filter="formDemo">立即提交</button>
+            <button type="button" id="close" class="layui-btn layui-btn-primary">关闭</button>
+        </div>
+    </div>
+
+    <div id="uploadLoadingDiv" style="display: none;">
+        <div class="layui-progress" lay-showpercent="true" lay-filter="js_upload_progress"
+             style="margin: 10px;margin-top: 20px;">
+            <div class="layui-progress-bar layui-bg-red" lay-percent="0%"></div>
+        </div>
+    </div>
+</form>
+
+<form id="ajaxForm" class="layui-form" style="width: 70%">
+    <input type="hidden" name="OSSAccessKeyId" id="accessid" value="${uploadParam.accessid}">
+    <input type="hidden" name="policy" id="policy" value="${uploadParam.policy}">
+    <input type="hidden" name="signature" id="signature" value="${uploadParam.signature}">
+    <input type="hidden" name="expire" id="expire" value="${uploadParam.expire}">
+    <input type="hidden" name="success_action_status" id="success_action_status" value="200">
+    <input type="hidden" name="key" id="key" value="${uploadParam.key}">
+    <input type="hidden" name="callBack" id="key2_callBack" value="${uploadParam.callBack}">
+    <input type="file" style="display: none" name="file" id="file"
+           onchange="document.getElementById('fileName').value=this.files[0].name">
+</form>
+
+<script>
+
+    var form;
+    //Demo
+    layui.use(['form', 'upload', 'element', 'layer', 'laydate', 'layedit'], function () {
+        form = layui.form;
+        var upload = layui.upload;
+        var layer = layui.layer;
+        var element = layui.element;
+        var laydate = layui.laydate;
+        var layedit = layui.layedit;
+
+        var editIndex = layedit.build('officRule', {
+            height: 140 //设置编辑器高度
+        }); //
+        // laydate.render({
+        //     elem: '#start' //指定元素
+        //     ,zIndex: 99999999
+        // });
+        // laydate.render({
+        //     elem: '#end' //指定元素
+        //     ,zIndex: 99999999
+        // });
+        lay('.loan-date').each(function () {
+            laydate.render({
+                elem: this
+                , trigger: 'click'
+            });
+        });
+        element.init();
+        $('#close').click(function () {
+            parent.layer.closeAll();
+        });
+
+        //创建监听函数
+        var xhrOnProgress = function (fun) {
+            xhrOnProgress.onprogress = fun; //绑定监听
+            //使用闭包实现监听绑
+            return function () {
+                //通过$.ajaxSettings.xhr();获得XMLHttpRequest对象
+                var xhr = $.ajaxSettings.xhr();
+                //判断监听函数是否为函数
+                if (typeof xhrOnProgress.onprogress !== 'function')
+                    return xhr;
+                //如果有监听函数并且xhr对象支持绑定时就把监听函数绑定上去
+                if (xhrOnProgress.onprogress && xhr.upload) {
+                    xhr.upload.onprogress = xhrOnProgress.onprogress;
+                }
+                return xhr;
+            }
+        }
+        var openIndex = "";
+        upload.render({
+            elem: '#chooseFile', // 文件选择
+            accept: 'images',
+            acceptMime: 'image/*',
+            url: '${uploadParam.host}',
+            exts: 'jpg|png|gif|bmp|jpeg',
+            method: 'POST',
+            auto: false, // 设置不自动提交
+            bindAction: '#uploadBtn', // 提交按钮
+            before: function () {
+                element.progress('js_upload_progress', '0%');//设置页面进度条
+                openIndex = layer.open({
+                    type: 1,
+                    title: '上传进度',
+                    closeBtn: 1, //不显示关闭按钮
+                    area: ['300px', '130px'],
+                    shadeClose: false, //开启遮罩关闭
+                    content: $("#uploadLoadingDiv").html(),
+                    offset: '100px'
+                });
+            }
+            , xhr: xhrOnProgress
+            , progress: function (value) {//上传进度回调 value进度值
+                element.progress('js_upload_progress', value + '%');//设置页面进度条
+            }
+            , choose: function (obj) {
+                var loading = layer.load(1, {shade: [0.1, '#000']});
+                var data = {};
+                obj.preview(function (index, file, result) {
+                    var fileName = file.name;
+                    $("#chooseFile").val(fileName);
+                    var suffix = fileName.substring(fileName.lastIndexOf('.') + 1, fileName.length);
+                    var key = '${uploadParam.key}' + "." + suffix;
+                    $("#key").val(key);
+                    $("#fileKey").val(key);
+                    data.OSSAccessKeyId = $('#accessid').val();
+                    data.policy = $('#policy').val();
+                    data.signature = $('#signature').val();
+                    data.expire = $('#expire').val();
+                    data.success_action_status = $('#success_action_status').val();
+                    data.callBack = $("#key2_callBack").val();
+                    data.key = key;
+                    layer.close(loading);
+                });
+                this.data = data;
+            },
+            done: function (res) {
+                layer.close(openIndex);
+                if (res.code == 200) {
+                    layer.msg("上传成功！")
+                    $("#url").val(res.url);
+                } else {
+                    layer.msg("上传失败！")
+                }
+            },
+            error: function (res) {
+                layer.msg(res.msg);
+            }
+        });
+
+        //关闭进度条提示
+        $(document).on('click', '.js_upload_progress_bar_sure', function () {
+            layer.close(layer.index);
+        });
+
+        //监听提交
+        form.on('submit(formDemo)', function (data) {
+            var index = layer.load(1, {shade: [0.1, '#000']});
+            data.field.officRule = layedit.getContent(editIndex);
+            if ($('#id').val() == null) {
+                var activityGroupNo = [];
+                $("input[name='activityGroupNo']:checked").each(function (i) {
+                    activityGroupNo[i] = $(this).val();
+                })
+                var noStr = activityGroupNo.join(",");
+                data.field.activityGroupNo = noStr;
+            }
+            $.ajax({
+                url: '${ctx}/officialActivity/saveOrUpdate',
+                method: 'post',
+                data: JSON.stringify(data.field),
+                dataType: 'JSON',
+                contentType: "application/json",
+                success: function (res) {
+                    layer.close(index);
+                    if (res.code == 200) {
+                        layer.alert(res.data, function () {
+                            parent.location.reload();
+                        })
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 5
+                        });
+                    }
+                }
+            })
+            return false;
+        });
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/officialActivity/list.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/officialActivity/list.jsp
new file mode 100644
index 0000000..d4fc548
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/officialActivity/list.jsp
@@ -0,0 +1,370 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp" />
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form"  id="form1" action="" style="margin-top: 10px">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">活动名称</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="officName" id="officName" placeholder="请输入活动名称" autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">活动状态</label>
+                            <div class="layui-input-block">
+                                <select id="status" name="status">
+                                    <option value="">请选择</option>
+                                    <option value="1">未发布</option>
+                                    <option value="2">进行中</option>
+                                    <option value="3">已过期</option>
+                                    <option value="4">已下架</option>
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <!-- 表单数据 -->
+    <div class="mb50 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-hide" id="officialActivityTab" lay-filter="officialActivityTab"></table>
+        </div>
+    </div>
+</div>
+
+<script type="text/html" id="leftBar">
+    <button type="button" class="layui-btn layui-btn-sm" lay-event="add"><i class="layui-icon">&#xe608;</i>新增</button>
+    <button type="button" class="layui-btn layui-btn-sm" lay-event="release"><i class="layui-icon">&#xe609;</i>发布</button>
+    <button type="button" class="layui-btn layui-btn-sm" lay-event="shelf"><i class="layui-icon">&#xe601;</i>下架</button>
+    <button type="button" class="layui-btn layui-btn-sm layui-btn-warm" lay-event="expire"><i class="layui-icon">&#xe68d;</i>过期</button>
+    <button type="button" class="layui-btn layui-btn-sm layui-btn-danger" lay-event="del"><i class="layui-icon">&#xe640;</i>删除</button>
+    <button type="button" class="layui-btn layui-btn-normal layui-btn-sm" lay-event="search"><i class="layui-icon">&#xe615;</i>查询</button>
+</script>
+
+<script type="text/html" id="toolBar">
+    <button type="button" class="layui-btn layui-btn-sm" lay-event="edit"><i class="layui-icon">&#xe642;</i>编辑</button>
+    <button type="button" class="layui-btn layui-btn-sm layui-btn-danger" lay-event="del"><i class="layui-icon">&#xe640;</i>删除</button>
+</script>
+
+<script>
+    var dictList = JSON.parse('${dictList}');
+    var actTypeList = JSON.parse('${actTypeList}');
+    var roleList = JSON.parse('${roleList}');
+    layui.use(['table', 'layer'], function(){
+        var table = layui.table;
+        var layer = layui.layer;
+
+        var tableIns = table.render({
+            elem: '#officialActivityTab'
+            ,url:'${ctx}/officialActivity/page'
+            ,id: 'officialActivity'
+            ,response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                ,countName: 'count' //数据总数的字段名称，默认：count
+                ,dataName: 'data' //默数据列表的字段名称，认：data
+                ,statusCode : 200
+            }
+            ,parseData: function(res){ //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            ,toolbar: '#leftBar' //开启头部工具栏，并为其绑定左侧模板
+            , defaultToolbar: ['filter']
+            ,defaultToolbar: ['filter', 'exports', 'print', { //自定义头部工具栏右侧图标。如无需自定义，去除该参数即可
+                title: '提示'
+                ,layEvent: 'LAYTABLE_TIPS'
+                ,icon: 'layui-icon-tips'
+            }]
+            ,title: 'app版本数据表'
+            ,cols: [[
+                {type: 'checkbox', fixed: 'left', hidden: true}
+                ,{field:'numbers', title:'序号', fixed: 'left', unresize: true, width:80, type:'numbers'}
+                ,{field:'officName', title:'活动名称'}
+                ,{field:'officTitle', title:'活动标题'}
+                ,{field:'actType', title:'活动类型',templet:function (d) {
+                    return getDictText(d.actType,actTypeList,'value');
+                }}
+                // ,{field:'officContent', title:'活动内容'}
+                ,{field:'officImgUrl', title:'活动图片',templet:function (d) {
+                        return "<a href='javascript:void(0)' onclick='openImg(this)' >"+d.officImgUrl+"</a>";
+                    }}
+                ,{field:'activityGroupId', title:'类别',templet:function (d) {
+                        return getDictText(d.activityGroupNo,dictList,'value');
+                    }}
+                ,{field:'roleType', title:'角色',templet:function (d) {
+                        return getDictText(d.roleType,roleList,'roleCode');
+                    }}
+                ,{field:'groupBy', title:'所属分组'}
+                ,{field:'status', title:'活动状态',templet:function(d){
+                    if(d.status == '1'){
+                        return '<span>未发布</span>';
+                    }else if(d.status == '2'){
+                        return '<span style="color: green">进行中</span>';
+                    }else if(d.status == '3'){
+                        return '<span style="color: orangered">已过期</span>';
+                    }else{
+                        return '<span style="color: red">已下架</span>';
+                    }
+                 }}
+                ,{field: 'startTime', title:'开始时间', width: 160, templet : "<div>{{layui.util.toDateString(d.startTime, 'yyyy-MM-dd')}}</div>"}
+                ,{field: 'endTime', title: '结束时间', width: 160, templet : "<div>{{layui.util.toDateString(d.endTime, 'yyyy-MM-dd')}}</div>"}
+                ,{field: 'createTime', title: '创建时间', sort: true, width: 160, templet : "<div>{{layui.util.toDateString(d.createTime,'yyyy-MM-dd HH:mm:ss')}}</div>"}
+                ,{fixed: 'right', title:'操作',width:200, toolbar: '#toolBar'}
+            ]]
+            ,request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                ,limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            ,where: {
+                column: "createTime"
+                , asc: "false"
+            }
+            ,page: true
+        });
+        table.on('tool(officialActivityTab)', function(obj){ //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            var data = obj.data; //获得当前行数据
+            var layEvent = obj.event; //获得 lay-event 对应的值（也可以是表头的 event 参数对应的值）
+            if(layEvent === 'del'){ //删除
+                layer.confirm('真的删除么?',{icon:3},function(index){
+                    obj.del(); //删除对应行（tr）的DOM结构，并更新缓存
+                    layer.close(index);
+                    var idArr = new Array();
+                    idArr.push(data.id);
+                    del(idArr);
+                    //向服务端发送删除指令
+                });
+            } else if(layEvent === 'edit'){ //编辑
+                //do something
+                toAdd(obj.data);
+                //同步更新缓存对应的值
+                // obj.update({
+                //     username: '123'
+                //     ,title: 'xxx'
+                // });
+            }
+        });
+
+        //监听头工具栏事件
+        table.on('toolbar(officialActivityTab)', function (obj) {
+            switch (obj.event) {
+                case 'add':
+                    // 添加
+                    toAdd();
+                    break;
+                case 'release':
+                    var checkStatus = table.checkStatus('officialActivity'); //idTest 即为基础参数 id 对应的值
+                    if(checkStatus.data.length == 0){
+                        layer.msg("至少选中一条数据!",{icon:5});
+                        return;
+                    }
+                    if(checkStatus.data.length > 1){
+                        layer.msg("最多选择一条数据!",{icon:5});
+                        return;
+                    }
+                    if(checkStatus.data[0].status === '2'){
+                        layer.msg("当前活动正在进行中!",{icon:5});
+                        return;
+                    }
+                    var obj = {};
+                    obj.id = checkStatus.data[0].id;
+                    obj.status = '2';
+                    // 发布
+                    e(obj);
+                    break;
+                case 'shelf':
+                    var checkStatus = table.checkStatus('officialActivity'); //idTest 即为基础参数 id 对应的值
+                    if(checkStatus.data.length == 0){
+                        layer.msg("至少选中一条数据!",{icon:5});
+                        return;
+                    }
+                    if(checkStatus.data.length > 1){
+                        layer.msg("最多选择一条数据!",{icon:5});
+                        return;
+                    }
+                    var obj = {};
+                    obj.id = checkStatus.data[0].id;
+                    obj.status = '4';
+                    // 下架
+                    e(obj);
+                    break;
+                case 'expire':
+                    var checkStatus = table.checkStatus('officialActivity'); //idTest 即为基础参数 id 对应的值
+                    if(checkStatus.data.length == 0){
+                        layer.msg("至少选中一条数据!",{icon:5});
+                        return;
+                    }
+                    if(checkStatus.data.length > 1){
+                        layer.msg("最多选择一条数据!",{icon:5});
+                        return;
+                    }
+                    var obj = {};
+                    obj.id = checkStatus.data[0].id;
+                    obj.status = '3';
+                    // 过期
+                    e(obj);
+                    break;
+                case 'search':
+                    var params= serialize($('#form1'));
+                    table.reload('officialActivity', {
+                        where: params
+                        , page: {
+                            size: 10
+                            , current: 1
+                        }
+                    });
+                    break;
+                case 'del':
+                    var checkStatus = table.checkStatus('officialActivity'); //idTest 即为基础参数 id 对应的值
+                    if(checkStatus.data.length == 0){
+                        layer.msg("至少选中一条数据!",{icon:5});
+                        return;
+                    }
+                    var idsArr = new Array();
+                    $.each(checkStatus.data,function (k,v) {
+                        idsArr.push(v.id);
+                    })
+                    layer.confirm('真的删除么？',{icon:3}, function (index) {
+                        $("div.layui-table-body table tbody input[name='layTableCheckbox']:checked").each(function () { // 遍历选中的checkbox
+                            n = $(this).parents("tbody tr").index();  // 获取checkbox所在行的顺序
+                            //移除行
+                            $("div.layui-table-body table tbody ").find("tr:eq(" + n + ")").remove();
+                            //如果是全选移除，就将全选CheckBox还原为未选中状态
+                            $("div.layui-table-header table thead div.layui-unselect.layui-form-checkbox").removeClass("layui-form-checked");
+                        });
+                        layer.close(index);
+                        del(idsArr);
+                    });
+                    break;
+            }
+        });
+        function e(obj) {
+            layer.confirm('确定'+(obj.status === '2' ? '发布': obj.status === '3' ? '过期' : '下架' )+'当前活动么？',{icon:3}, function (index) {
+                var index = layer.load(1,{shade: [0.1,'#000'] });
+                $.ajax({
+                    url: '${ctx}/officialActivity/saveOrUpdate',
+                    method: 'post',
+                    data: JSON.stringify(obj),
+                    dataType: 'JSON',
+                    contentType:"application/json",
+                    success: function(res) {
+                        layer.close(index);
+                        if(res.code == 200) {
+                            layer.msg(res.message, {
+                                icon: 1
+                            });
+                            tableIns.reload();
+                        } else {
+                            layer.msg(res.message, {
+                                icon: 2
+                            });
+                        }
+                    }
+                })
+            });
+        }
+
+        function toAdd(obj) {
+            var url = '${ctx}/officialActivity/add';
+            if(obj != undefined){
+                url = "${ctx}/officialActivity/edit/"+obj.id
+            }
+            var index = layer.open({
+                type: 2
+                ,shade: 0.5
+                ,title: '新增'
+                ,maxmin: true
+                , content: url
+                , area: ['550px', '700px']
+            });
+        }
+        function del(obj) {
+            $.ajax({
+                url: '${ctx}/officialActivity/batchDelete',
+                method: 'post',
+                data: JSON.stringify(obj),
+                dataType: 'JSON',
+                contentType:"application/json",
+                success: function(res) {
+                    if(res.code == 200) {
+                        layer.msg(res.data, {
+                            icon: 1
+                        });
+
+                    } else {
+                        layer.msg(res.data, {
+                            icon: 5
+                        });
+                    }
+                }
+            })
+        }
+    });
+
+    function openImg(obj) {
+        var url = $(obj).text();
+        if(url){
+            var img = new Image();
+            img.src = url;
+
+            //弹出层
+            layer.photos({
+                photos: { "data": [{"src": url}] }
+            });
+
+            // layer.open({
+            //     type: 1,
+            //     shade: 0.8,
+            //     area:['auto','auto'],
+            //     offset: 'auto',
+            //     // area: [500 + 'px',550+'px'],  // area: [width + 'px',height+'px']  //原图显示
+            //     shadeClose:true,
+            //     scrollbar: false,
+            //     title: "预览", //不显示标题
+            //     content: imgHtml, //捕获的元素，注意：最好该指定的元素要存放在body最外层，否则可能被其它的相对元素所影响
+            //     cancel: function () {
+            //         //layer.msg('捕获就是从页面已经存在的元素上，包裹layer的结构', { time: 5000, icon: 6 });
+            //     }
+            // });
+        }
+    }
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/officialGoods/detail.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/officialGoods/detail.jsp
new file mode 100644
index 0000000..7f84594
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/officialGoods/detail.jsp
@@ -0,0 +1,297 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp" />
+    <link rel="stylesheet" type="text/css" href="${ctx}/page/umeditor/themes/default/css/umeditor.css">
+    <script type="text/javascript" src="${ctx}/page/umeditor/third-party/template.min.js"></script>
+    <script type="text/javascript" src="${ctx}/page/umeditor/umeditor.config.js"></script>
+    <script type="text/javascript" src="${ctx}/page/umeditor/umeditor.min.js"></script>
+    <script type="text/javascript" src="${ctx}/page/umeditor/lang/zh-cn/zh-cn.js"></script>
+    <style>
+        .layui-input,.layui-textarea{
+            border-color:#606060;
+        }
+    </style>
+</head>
+<body>
+<form class="layui-form" action="" style="width: 70%">
+    <input name="id" value="${officialGoods.id}" hidden/>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">商品名称</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="goodName" value="${officialGoods.goodName}" maxlength="25" lay-verify="required" autocomplete="off" placeholder="请输入商品名称" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+
+     <div class="layui-form-item">
+        <label class="layui-form-label">商品价格</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="goodPrice" type="number" maxlength="10" value="${officialGoods.goodPrice}" lay-verify="required" autocomplete="off" placeholder="请输入商品价格" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item" id="isPostage">
+        <label class="layui-form-label">是否包邮</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <select name="isPostage" lay-filter="isPostage" data-elem="postageFee">
+                    <option value="">请选择</option>
+                    <option value="0" ${officialGoods.isPostage == 0 ? 'selected' : ''}>不包邮</option>
+                    <option value="1" ${officialGoods.isPostage == 1 ? 'selected' : ''}>包邮</option>
+                </select>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item" id="postageFee" style="display:${empty officialGoods or officialGoods.isPostage eq 0 ? 'black' : 'none'}">
+        <label class="layui-form-label">邮费</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input type="number" name="postageFee"  value="${officialGoods.postageFee}" maxlength="10" autocomplete="off" placeholder="请输入商品邮费" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">商品类型</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <select name="deductRule" lay-filter="deductRule" data-elem="deductRule">
+                    <option value="">请选择</option>
+                    <option value="0" ${officialGoods.deductRule == 0 ? 'selected' : ''}>积分</option>
+                    <option value="1" ${officialGoods.deductRule == 1 ? 'selected' : ''}>积分+现金</option>
+                </select>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item" id="deductRule" style="display:${empty officialGoods or officialGoods.deductRule eq 0 ? 'none' : 'black'}">
+        <label class="layui-form-label">金额</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input type="number" name="deductValue" value="${officialGoods.deductValue}" maxlength="10" autocomplete="off" placeholder="请输入需要额外支付的金额" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">链接地址</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="toImgUrl" value="${officialGoods.toImgUrl}" placeholder="请输入链接地址" class="layui-input" autocomplete="off"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">商品图片</label>
+        <div class="layui-input-block" style="display: flex;justify-content: flex-start">
+            <input name="fileKey" id="fileKey" hidden/>
+            <input name="imgUrl" id="url" value="${officialGoods.imgUrl}" hidden/>
+            <input name="chooseFile" id="chooseFile" placeholder="浏览..." class="layui-input layui-col-xs6" style="cursor:hand" readonly/>
+            <button type="button" class="layui-btn layui-btn-normal layui-col-xs3"  id="uploadBtn">
+                上传
+            </button>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">商品描述</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <textarea id="goodDesc" name="goodDesc" lay-verify="goodDesc"  placeholder="请输入商品描述"
+                          class="layui-textarea">${officialGoods.goodDesc}</textarea>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button class="layui-btn" lay-submit lay-filter="formDemo">立即提交</button>
+            <button type="button" id="close" class="layui-btn layui-btn-primary">关闭</button>
+        </div>
+    </div>
+
+    <div id="uploadLoadingDiv" style="display: none;">
+        <div class="layui-progress" lay-showpercent="true" lay-filter="js_upload_progress" style="margin: 10px;margin-top: 20px;">
+            <div class="layui-progress-bar layui-bg-red" lay-percent="0%"></div>
+        </div>
+    </div>
+</form>
+
+<form id="ajaxForm" class="layui-form" style="width: 70%" >
+    <input type="hidden" name="OSSAccessKeyId" id="accessid" value="${uploadParam.accessid}">
+    <input type="hidden" name="policy" id="policy" value="${uploadParam.policy}">
+    <input type="hidden" name="signature" id="signature" value="${uploadParam.signature}">
+    <input type="hidden" name="expire" id="expire" value="${uploadParam.expire}">
+    <input type="hidden" name="success_action_status" id="success_action_status" value="200">
+    <input type="hidden" name="key" id="key" value="${uploadParam.key}">
+    <input type="hidden" name="callBack" id="key2_callBack" value="${uploadParam.callBack}">
+    <input type="file" style="display: none" name="file" id="file" onchange="document.getElementById('fileName').value=this.files[0].name">
+</form>
+
+<script>
+    layui.use(['form', 'upload','element','layer','layedit'], function(){
+        var form = layui.form;
+        var upload = layui.upload;
+        var layer = layui.layer;
+        var element = layui.element;
+        var layedit = layui.layedit;
+        element.init();
+
+        var um = UM.getEditor('goodDesc');
+        um.setWidth("100%");
+
+        $('#close').click(function() {
+            parent.layer.closeAll();
+        });
+
+        //创建监听函数
+        var xhrOnProgress=function(fun) {
+            xhrOnProgress.onprogress = fun; //绑定监听
+            //使用闭包实现监听绑
+            return function() {
+                //通过$.ajaxSettings.xhr();获得XMLHttpRequest对象
+                var xhr = $.ajaxSettings.xhr();
+                //判断监听函数是否为函数
+                if (typeof xhrOnProgress.onprogress !== 'function')
+                    return xhr;
+                //如果有监听函数并且xhr对象支持绑定时就把监听函数绑定上去
+                if (xhrOnProgress.onprogress && xhr.upload) {
+                    xhr.upload.onprogress = xhrOnProgress.onprogress;
+                }
+                return xhr;
+            }
+        }
+        var openIndex = "";
+        upload.render({
+            elem: '#chooseFile', // 文件选择
+            accept:'images',
+            acceptMime:'image/*',
+            url: '${uploadParam.host}',
+            exts: 'jpg|png|gif|bmp|jpeg',
+            method:'POST',
+            auto: false, // 设置不自动提交
+            bindAction: '#uploadBtn', // 提交按钮
+            before:function(){
+                element.progress('js_upload_progress', '0%');//设置页面进度条
+                openIndex = layer.open({
+                    type: 1,
+                    title: '上传进度',
+                    closeBtn: 1, //不显示关闭按钮
+                    area: ['300px', '130px'],
+                    shadeClose: false, //开启遮罩关闭
+                    content: $("#uploadLoadingDiv").html(),
+                    offset: '100px'
+                });
+            }
+            ,xhr:xhrOnProgress
+            ,progress:function(value){//上传进度回调 value进度值
+                element.progress('js_upload_progress', value+'%');//设置页面进度条
+            }
+            ,choose: function(obj) {
+                var loading = layer.load(1,{shade: [0.1,'#000'] });
+                var data = {};
+                obj.preview(function(index, file, result) {
+                    var fileName = file.name;
+                    $("#chooseFile").val(fileName);
+                    var suffix = fileName.substring(fileName.lastIndexOf('.') + 1, fileName.length);
+                    var key = '${uploadParam.key}'+"."+suffix;
+                    $("#key").val(key);
+                    $("#fileKey").val(key);
+                    data.OSSAccessKeyId = $('#accessid').val();
+                    data.policy = $('#policy').val();
+                    data.signature = $('#signature').val();
+                    data.expire = $('#expire').val();
+                    data.success_action_status = $('#success_action_status').val();
+                    data.callBack = $("#key2_callBack").val();
+                    data.key = key;
+                    layer.close(loading);
+                });
+                this.data = data;
+            },
+            done: function(res) {
+                layer.close(openIndex);
+                if (res.code == 200){
+                    layer.msg("上传成功！")
+                    $("#url").val(res.url);
+                }else{
+                    layer.msg("上传失败！")
+                }
+            },
+            error: function(res) {
+                layer.msg(res.msg);
+            }
+        });
+
+        //关闭进度条提示
+        $(document).on('click','.js_upload_progress_bar_sure',function(){
+            layer.close(layer.index);
+        });
+
+            //监听提交
+        form.on('submit(formDemo)', function(data){
+            var params = data.field;
+            if(params.isPostage == 0 && !params.postageFee){
+                return layer.msg("邮费不能为空!");
+            }
+            params.goodDesc = um.getContent();
+            // data.field.goodDesc = layedit.getContent(editIndex);
+            var index = layer.load(1,{shade: [0.1,'#000'] });
+            $.ajax({
+                url: '${ctx}/officialGoods/saveOrUpdate',
+                method: 'post',
+                data: JSON.stringify(data.field),
+                dataType: 'JSON',
+                contentType:"application/json",
+                success: function(res) {
+                    layer.close(index);
+                    if(res.code == 200) {
+                        layer.alert(res.data,function(){
+                             parent.location.reload();
+                        })
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 5
+                        });
+                    }
+                }
+            })
+            return false;
+        });
+
+        form.on('select(isPostage)', function(data){
+            let domVal = data.elem.dataset.elem;
+            if(data.value == 0){
+                $("#"+domVal).show();
+            }else{
+                $("#"+domVal).hide();
+            }
+        })
+
+        form.on('select(deductRule)', function(data){
+            let domVal = data.elem.dataset.elem;
+            if(data.value == 1){
+                $("#"+domVal).show();
+            }else{
+                $("#"+domVal).hide();
+            }
+        })
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/officialGoods/exchange/list.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/officialGoods/exchange/list.jsp
new file mode 100644
index 0000000..585130c
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/officialGoods/exchange/list.jsp
@@ -0,0 +1,344 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../../common.jsp"/>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" id="queryForm" action="" style="margin-top: 10px">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">用户ID</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="userId" id="userId" placeholder="请输入用户ID" autocomplete="off"
+                                       class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">商品名称</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="name" id="name" placeholder="请输入商品名称" autocomplete="off"
+                                       class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">兑换人</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="userName" id="userName" placeholder="请输入兑换人" autocomplete="off"
+                                       class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">联系方式</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="phone" id="phone" placeholder="请输入联系方式" autocomplete="off"
+                                       class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">支付状态</label>
+                            <div class="layui-input-block">
+                                <select class="layui-select" name="status" id="status">
+                                    <option value="">请选择</option>
+                                    <option value="1">已支付</option>
+                                    <option value="0">待支付</option>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">发货状态</label>
+                            <div class="layui-input-block">
+                                <select class="layui-select" name="deliveryStatus">
+                                    <option value="">请选择</option>
+                                    <option value="1">已发货</option>
+                                    <option value="0">待发货</option>
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <!-- 表单数据 -->
+    <div class="mb50 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-hide" id="officialGoodsExchangeTab" lay-filter="officialGoodsExchangeTab"></table>
+        </div>
+    </div>
+</div>
+
+<script type="text/html" id="leftBar">
+    <button type="button" class="layui-btn layui-btn-normal layui-btn-sm" lay-event="search"><i class="layui-icon">&#xe615;</i>查询
+    </button>
+</script>
+
+
+<script type="text/html" id="toolBar">
+    {{# if (d.status === 1)  {}}
+    <a class="layui-btn layui-btn-xs" lay-event="deliverGoods"><i class="layui-icon">&#xe642;</i>确认发货</a>
+    {{# } }}
+</script>
+
+<script type="text/template" id="deliverGoods">
+    <form class="layui-form" id="form2" style="margin-top: 2rem;">
+        <input name="id" id="id" hidden>
+        <input name="deliveryStatus" id="deliveryStatus" hidden value="1">
+        <div class="layui-form-item" style="width: 300px;">
+            <label class="layui-form-label">发货单号</label>
+            <div class="layui-input-block">
+                <input type="text" name="expressNo" id="expressNo" style="cursor: pointer" placeholder="请输入发货单号"
+                       autocomplete="off" class="layui-input">
+            </div>
+        </div>
+    </form>
+</script>
+
+<script>
+    layui.use(['table', 'layer'], function () {
+        var table = layui.table;
+        var layer = layui.layer;
+        let form = layui.form;
+
+        var tableIns = table.render({
+            elem: '#officialGoodsExchangeTab'
+            , url: ctx + '/officialGoodsExchange/page'
+            , id: 'officialGoodsExchange'
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            , toolbar: '#leftBar' //开启头部工具栏，并为其绑定左侧模板
+            , defaultToolbar: ['filter']
+            , defaultToolbar: ['filter', 'exports', 'print', { //自定义头部工具栏右侧图标。如无需自定义，去除该参数即可
+                title: '提示'
+                , layEvent: 'LAYTABLE_TIPS'
+                , icon: 'layui-icon-tips'
+            }]
+            , title: '商品兑换信息表'
+            , cols: [[
+                {type: 'checkbox', fixed: 'left', hidden: true}
+                , {field: 'numbers', title: '序号', fixed: 'left', unresize: true, width: 80, type: 'numbers'}
+                , {field: 'userId', title: '用户ID', width: 80}
+                , {field: 'name', title: '商品名称'}
+                , {
+                    field: 'price', title: '商品价格', width: 90, templet: function (d) {
+                        return d.price.toFixed(2);
+                    }
+                }
+                , {field: 'userName', title: '兑换人', width: 100}
+                , {field: 'phone', title: '联系方式', width: 130}
+                , {field: 'address', title: '收货地址'}
+                , {field: 'orderNumber', title: '订单号'}
+                , {field: 'expressNo', title: '快递单号'}
+                , {
+                    field: 'status', title: '支付状态', width: 90, templet: function (d) {
+                        if (d.status === 1) {
+                            return "<span style='color: green'>已支付</span>"
+                        } else {
+                            return "<span style='color: red'>待支付</span>"
+                        }
+                    }
+                }
+                , {
+                    field: 'deliveryStatus', title: '发货状态', width: 90, templet: function (d) {
+                        if (d.deliveryStatus === 0) {
+                            return "<span style='color: blue'>待发货</span>"
+                        } else {
+                            return "<span style='color: green'>已发货</span>"
+                        }
+                    }
+                }
+                , {
+                    field: 'createTime',
+                    title: '创建时间',
+                    width: 160,
+                    templet: "<div>{{layui.util.toDateString(d.createTime,'yyyy-MM-dd HH:mm:ss')}}</div>"
+                }
+                , {fixed: 'right', title: '操作', toolbar: '#toolBar'}
+            ]]
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , page: true
+        });
+        table.on('tool(officialGoodsExchangeTab)', function (obj) { //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            var data = obj.data; //获得当前行数据
+            var layEvent = obj.event; //获得 lay-event 对应的值（也可以是表头的 event 参数对应的值）
+            if (layEvent === 'deliverGoods') { //编辑
+                // console.log(123);
+                //do something
+                deliverGoods(obj);
+                //同步更新缓存对应的值
+                // obj.update({
+                //     username: '123'
+                //     ,title: 'xxx'
+                // });
+            }
+        });
+
+        //监听头工具栏事件
+        table.on('toolbar(officialGoodsExchangeTab)', function (obj) {
+            switch (obj.event) {
+                case 'search':
+                    var params = serializeObj($('#queryForm'));
+                    table.reload('officialGoodsExchange', {
+                        where: params
+                        , page: {
+                            size: 10
+                            , current: 1
+                        }
+                    });
+                    break;
+            }
+        });
+
+        function e(obj) {
+            layer.confirm('确定' + (obj.status === '2' ? '上架' : '下架') + '当前商品么？', {icon: 3}, function (index) {
+                var index = layer.load(1, {shade: [0.1, '#000']});
+                $.ajax({
+                    url: '${ctx}/officialGoods/saveOrUpdate',
+                    method: 'post',
+                    data: JSON.stringify(obj),
+                    dataType: 'JSON',
+                    contentType: "application/json",
+                    success: function (res) {
+                        layer.close(index);
+                        if (res.code == 200) {
+                            layer.msg(res.message, {
+                                icon: 1
+                            });
+                            tableIns.reload();
+                        } else {
+                            layer.msg(res.message, {
+                                icon: 2
+                            });
+                        }
+                    }
+                })
+            });
+        }
+
+        function deliverGoods(obj) {
+            var index = layer.open({
+                type: 1
+                , shade: 0.5
+                , title: '确认发货'
+                , maxmin: true
+                , content: $("#deliverGoods").html()
+                , area: ['400px', '200px']
+                , btn: ['保存', '取消',]
+                , shadeClose: true
+                , btn1: function (index, layero) {
+                    if (!$("#expressNo").val()) {
+                        return layer.msg("请输入发货单号!");
+                    }
+                    saveDeliverGoods(obj, index);
+                }
+                , btn2: function (index, layero) {
+                    layer.close(index);
+                }
+                , success: function () {
+                    $("#id").val(obj.data.id);
+                }
+            });
+            form.render('select');
+        }
+
+        function saveDeliverGoods(obj, index) {
+            var loadindex = layer.load(1, {shade: [0.1, '#000']});
+            var data = serializeObj($("#form2"));
+            $.ajax({
+                url: ctx + '/officialGoodsExchange/save',
+                method: 'post',
+                data: JSON.stringify(data),
+                dataType: 'JSON',
+                contentType: "application/json",
+                success: function (res) {
+                    layer.close(loadindex);
+                    console.log(obj, "12323");
+                    if (res.code == 200) {
+                        layer.close(index);
+                        layer.msg(res.message, {
+                            icon: 1
+                        });
+                        obj.update({
+                            expressNo: $("#expressNo").val(),
+                            deliveryStatus: $("#deliveryStatus").val()
+                        });
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 2
+                        });
+                    }
+                }
+            })
+        }
+    });
+
+    /*function openImg(obj) {
+        var url = $(obj).text();
+        if(url){
+            var img = new Image();
+            img.src = url;
+            //var height = img.height + 50; // 原图片大小
+            //var width = img.width; //原图片大小
+            var imgHtml = "<img src='" + url + "' width='500px' height='500px'/>";
+            //弹出层
+            layer.open({
+                type: 1,
+                shade: 0.8,
+                offset: 'auto',
+                area: [500 + 'px',550+'px'],  // area: [width + 'px',height+'px']  //原图显示
+                shadeClose:true,
+                scrollbar: false,
+                title: "预览", //不显示标题
+                content: imgHtml, //捕获的元素，注意：最好该指定的元素要存放在body最外层，否则可能被其它的相对元素所影响
+                cancel: function () {
+                    //layer.msg('捕获就是从页面已经存在的元素上，包裹layer的结构', { time: 5000, icon: 6 });
+                }
+            });
+        }
+    }*/
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/officialGoods/list.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/officialGoods/list.jsp
new file mode 100644
index 0000000..36f17db
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/officialGoods/list.jsp
@@ -0,0 +1,339 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp" />
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" action="" style="margin-top: 10px">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">商品名称</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="goodName" id="goodName" placeholder="请输入商品名称" autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">商品状态</label>
+                            <div class="layui-input-block">
+                                <select name="status" id="status">
+                                    <option value="">请选择</option>
+                                    <option value="1">未上架</option>
+                                    <option value="2">上架中</option>
+                                    <option value="3">已下架</option>
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <!-- 表单数据 -->
+    <div class="mb50 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-hide" id="officialGoodsTab" lay-filter="officialGoodsTab"></table>
+
+        </div>
+    </div>
+</div>
+
+<script type="text/html" id="leftBar">
+    <button type="button" class="layui-btn layui-btn-sm" lay-event="add"><i class="layui-icon">&#xe608;</i>新增</button>
+    <button type="button" class="layui-btn layui-btn-sm" lay-event="up"><i class="layui-icon">&#xe62f;</i>上架</button>
+    <button type="button" class="layui-btn layui-btn-sm" lay-event="down"><i class="layui-icon">&#xe601;</i>下架</button>
+    <button type="button" class="layui-btn layui-btn-sm layui-btn-danger" lay-event="del"><i class="layui-icon">&#xe640;</i>删除</button>
+    <button type="button" class="layui-btn layui-btn-normal layui-btn-sm" lay-event="search"><i class="layui-icon">&#xe615;</i>查询</button>
+</script>
+
+<script type="text/html" id="toolBar">
+    <button type="button" class="layui-btn layui-btn-sm" lay-event="edit"><i class="layui-icon">&#xe642;</i>编辑</button>
+    <button type="button" class="layui-btn layui-btn-sm layui-btn-danger" lay-event="del"><i class="layui-icon">&#xe640;</i>删除</button>
+</script>
+
+<script>
+    layui.use(['table', 'layer'], function(){
+        var table = layui.table;
+        var layer = layui.layer;
+
+        var tableIns = table.render({
+            elem: '#officialGoodsTab'
+            ,url:'${ctx}/officialGoods/page'
+            ,id: 'officialGoods'
+            ,response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                ,countName: 'count' //数据总数的字段名称，默认：count
+                ,dataName: 'data' //默数据列表的字段名称，认：data
+                ,statusCode : 200
+            }
+            ,parseData: function(res){ //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            ,toolbar: '#leftBar' //开启头部工具栏，并为其绑定左侧模板
+            , defaultToolbar: ['filter']
+            ,defaultToolbar: ['filter', 'exports', 'print', { //自定义头部工具栏右侧图标。如无需自定义，去除该参数即可
+                title: '提示'
+                ,layEvent: 'LAYTABLE_TIPS'
+                ,icon: 'layui-icon-tips'
+            }]
+            ,title: '活动商品信息表'
+            ,cols: [[
+                {type: 'checkbox', fixed: 'left', hidden: true}
+                ,{field:'numbers', title:'序号', fixed: 'left', unresize: true, width:80, type:'numbers'}
+                ,{field:'goodName', title:'商品名称'}
+                ,{field:'goodPrice', title:'商品积分'}
+                ,{field:'deductRule', title:'商品类型',templet:function (d){
+                    if(d.deductRule == 0){
+                        return "积分";
+                    }else if(d.deductRule == 1){
+                        return "积分+现金";
+                    }else{
+                        return "未知";
+                    }
+                 }}
+                ,{field:'deductValue', title:'商品价格'}
+                ,{field:'toImgUrl', title:'跳转地址'}
+                ,{field:'goodDesc', title:'商品描述'}
+                ,{field:'imgUrl', title:'商品图片',templet:function (d) {
+                    return "<a href='javascript:void(0)' onclick='openImg(this)' >"+d.imgUrl+"</a>";
+                    }}
+                ,{field:'status', title:'商品状态',templet:function(d){
+                    if(d.status == '1'){
+                        return '<span>未上架</span>';
+                    }else if(d.status == '2'){
+                        return '<span style="color: green">上架中</span>';
+                    }else{
+                        return '<span style="color: red">已下架</span>';
+                    }
+                 }}
+                ,{field: 'endTime', title: '创建时间', width: 160,templet : "<div>{{layui.util.toDateString(d.createTime,'yyyy-MM-dd HH:mm:ss')}}</div>"}
+                ,{fixed: 'right', title:'操作', width: 200, toolbar: '#toolBar'}
+            ]]
+            ,request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                ,limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            ,page: true
+        });
+        table.on('tool(officialGoodsTab)', function(obj){ //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            var data = obj.data; //获得当前行数据
+            var layEvent = obj.event; //获得 lay-event 对应的值（也可以是表头的 event 参数对应的值）
+            if(layEvent === 'del'){ //删除
+                layer.confirm('真的删除么?',{icon:3},function(index){
+                    obj.del(); //删除对应行（tr）的DOM结构，并更新缓存
+                    layer.close(index);
+                    var idArr = new Array();
+                    idArr.push(data.id);
+                    del(idArr);
+                    //向服务端发送删除指令
+                });
+            } else if(layEvent === 'edit'){ //编辑
+                //do something
+                toAdd(obj.data);
+                //同步更新缓存对应的值
+                // obj.update({
+                //     username: '123'
+                //     ,title: 'xxx'
+                // });
+            }
+        });
+
+        //监听头工具栏事件
+        table.on('toolbar(officialGoodsTab)', function (obj) {
+            switch (obj.event) {
+                case 'add':
+                    // 添加
+                    toAdd();
+                    break;
+                case 'up':
+                    var checkStatus = table.checkStatus('officialGoods'); //idTest 即为基础参数 id 对应的值
+                    if(checkStatus.data.length == 0){
+                        layer.msg("至少选中一条数据!",{icon:5});
+                        return;
+                    }
+                    if(checkStatus.data.length > 1){
+                        layer.msg("最多选择一条数据!",{icon:5});
+                        return;
+                    }
+                    if(checkStatus.data[0].status === '2'){
+                        layer.msg("当前商品正在上架中!",{icon:5});
+                        return;
+                    }
+                    var obj = {};
+                    obj.id = checkStatus.data[0].id;
+                    obj.status = '2';
+                    // 发布
+                    e(obj);
+                    break;
+                case 'down':
+                    var checkStatus = table.checkStatus('officialGoods'); //idTest 即为基础参数 id 对应的值
+                    if(checkStatus.data.length == 0){
+                        layer.msg("至少选中一条数据!",{icon:5});
+                        return;
+                    }
+                    if(checkStatus.data.length > 1){
+                        layer.msg("最多选择一条数据!",{icon:5});
+                        return;
+                    }
+                    var obj = {};
+                    obj.id = checkStatus.data[0].id;
+                    obj.status = '3';
+                    // 下架
+                    e(obj);
+                    break;
+                case 'search':
+                    var params= serialize($('#form1'));
+                    table.reload('officialGoods', {
+                        where: params
+                        , page: {
+                            size: 10
+                            , current: 1
+                        }
+                    });
+                    break;
+                case 'del':
+                    var checkStatus = table.checkStatus('officialGoods'); //idTest 即为基础参数 id 对应的值
+                    if(checkStatus.data.length == 0){
+                        layer.msg("至少选中一条数据!",{icon:5});
+                        return;
+                    }
+                    var idsArr = new Array();
+                    $.each(checkStatus.data,function (k,v) {
+                        idsArr.push(v.id);
+                    })
+                    layer.confirm('真的删除么？',{icon:3}, function (index) {
+                        $("div.layui-table-body table tbody input[name='layTableCheckbox']:checked").each(function () { // 遍历选中的checkbox
+                            n = $(this).parents("tbody tr").index();  // 获取checkbox所在行的顺序
+                            //移除行
+                            $("div.layui-table-body table tbody ").find("tr:eq(" + n + ")").remove();
+                            //如果是全选移除，就将全选CheckBox还原为未选中状态
+                            $("div.layui-table-header table thead div.layui-unselect.layui-form-checkbox").removeClass("layui-form-checked");
+                        });
+                        layer.close(index);
+                        del(idsArr);
+                    });
+                    break;
+            }
+        });
+        function e(obj) {
+            layer.confirm('确定'+(obj.status === '2' ? '上架': '下架' )+'当前商品么？',{icon:3}, function (index) {
+                var index = layer.load(1,{shade: [0.1,'#000'] });
+                $.ajax({
+                    url: '${ctx}/officialGoods/saveOrUpdate',
+                    method: 'post',
+                    data: JSON.stringify(obj),
+                    dataType: 'JSON',
+                    contentType:"application/json",
+                    success: function(res) {
+                        layer.close(index);
+                        if(res.code == 200) {
+                            layer.msg(res.message, {
+                                icon: 1
+                            });
+                            tableIns.reload();
+                        } else {
+                            layer.msg(res.message, {
+                                icon: 2
+                            });
+                        }
+                    }
+                })
+            });
+        }
+
+        function toAdd(obj) {
+            var url = '${ctx}/officialGoods/add';
+            if(obj != undefined){
+                url = "${ctx}/officialGoods/edit/"+obj.id
+            }
+            var index = layer.open({
+                type: 2
+                ,shade: 0.5
+                ,maxmin: true
+                , content: url
+                , area: ['700px', '720px']
+            });
+        }
+        function del(obj) {
+            $.ajax({
+                url: '${ctx}/officialGoods/batchDelete',
+                method: 'post',
+                data: JSON.stringify(obj),
+                dataType: 'JSON',
+                contentType:"application/json",
+                success: function(res) {
+                    if(res.code == 200) {
+                        layer.msg(res.data, {
+                            icon: 1
+                        });
+
+                    } else {
+                        layer.msg(res.data, {
+                            icon: 5
+                        });
+                    }
+                }
+            })
+        }
+    });
+
+    function openImg(obj) {
+        var url = $(obj).text();
+        if(url){
+            var img = new Image();
+            img.src = url;
+            //var height = img.height + 50; // 原图片大小
+            //var width = img.width; //原图片大小
+            var imgHtml = "<img src='" + url + "' width='500px' height='500px'/>";
+            //弹出层
+            layer.open({
+                type: 1,
+                shade: 0.8,
+                offset: 'auto',
+                area: [500 + 'px',550+'px'],  // area: [width + 'px',height+'px']  //原图显示
+                shadeClose:true,
+                scrollbar: false,
+                title: "预览", //不显示标题
+                content: imgHtml, //捕获的元素，注意：最好该指定的元素要存放在body最外层，否则可能被其它的相对元素所影响
+                cancel: function () {
+                    //layer.msg('捕获就是从页面已经存在的元素上，包裹layer的结构', { time: 5000, icon: 6 });
+                }
+            });
+        }
+    }
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/openAccount/configDetail.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/openAccount/configDetail.jsp
new file mode 100644
index 0000000..651196e
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/openAccount/configDetail.jsp
@@ -0,0 +1,206 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp" />
+    <style>
+        .layui-form-item{
+            margin-top: 10px;
+        }
+        .layui-form{
+            width: 75%;
+            margin-left: 5%;
+        }
+        .area-info{
+            width: 25% !important;
+        }
+        .layui-form-item .layui-input-inline{
+            margin-right: 0 !important;
+        }
+        .area{
+            display: none;
+        }
+    </style>
+</head>
+<body>
+<form class="layui-form" action="" id="addForm">
+    <input name="id" value="${entity.id}" hidden/>
+    <div class="layui-form-item">
+        <label class="layui-form-label">用户角色</label>
+        <div class="layui-input-block">
+            <select name="roleCode" lay-verify="required" id="roleCode">
+                <option value="">请选择</option>
+                <c:forEach items="${roleList}" var="r">
+                    <option value="${r.roleCode}" ${entity.roleCode eq r.roleCode ? 'selected' : ''}>${r.roleName}</option>
+                </c:forEach>
+            </select>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">类型</label>
+        <div class="layui-input-block">
+            <select name="type" lay-verify="required" lay-filter="type" id="type">
+                <option value="">请选择</option>
+                <option value="01" ${entity.type eq '01' ? 'selected' : ''} >默认</option>
+                <option value="02" ${entity.type eq '02' ? 'selected' : ''}>区域</option>
+            </select>
+        </div>
+    </div>
+    <div class="layui-form-item ${entity.type eq '01' or empty entity ? 'area' : '' }" id="area-info">
+        <div class="layui-form-label">区域</div>
+        <div class="layui-input-inline area-info" >
+            <select name="provinceCode" id="province-selector" class="province-selector" lay-filter="province-1">
+                <option value="">请选择</option>
+                <c:forEach items="${pList}" var="p">
+                    <option ${entity.provinceCode eq p.areaCode ? 'selected' : ''} value="${p.areaCode}">${p.areaName}</option>
+                </c:forEach>
+            </select>
+        </div>
+        <div class="layui-input-inline area-info ${entity.level eq 2 or entity.level eq 3 ? '' : 'layui-hide'}">
+            <select name="cityCode" id="city-selector" class="city-selector" lay-filter="city-1">
+            </select>
+        </div>
+        <div class="layui-input-inline area-info ${entity.level eq 3 ? '' : 'layui-hide'}">
+            <select name="areaCode" id="county-selector" class="county-selector" lay-filter="county-1">
+            </select>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">金额</label>
+        <div class="layui-input-block">
+            <input name="rewardAmt" type="number" value="${entity.rewardAmt}" lay-verify="required|price" autocomplete="off" maxlength="11"  placeholder="奖励金额" class="layui-input"/>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button class="layui-btn" lay-submit lay-filter="formDemo">立即提交</button>
+            <button type="button" id="close" class="layui-btn layui-btn-primary">关闭</button>
+        </div>
+    </div>
+</form>
+<script>
+    layui.use(['form','layer'], function(){
+        let layer = layui.layer
+            , form = layui.form;
+        $('#close').click(function() {
+            parent.layer.closeAll();
+        });
+        let provinceCode = '${entity.provinceCode}';
+        let cityCode = '${entity.cityCode}';
+        let areaCode = '${entity.areaCode}';
+        if(provinceCode){
+            let dom = $("#city-selector");
+            getNextAreaInfo(provinceCode,dom,cityCode);
+            if(cityCode){
+                let dom = $("#county-selector");
+                getNextAreaInfo(cityCode,dom,areaCode);
+            }
+
+        }
+        form.on('select(province-1)',function (data){
+            let value = data.value;
+            let dom = $("#city-selector");
+            getNextAreaInfo(value,dom);
+            $("#county-selector").empty().parent().addClass("layui-hide")
+        })
+        form.on('select(city-1)',function (data){
+            let value = data.value;
+            let dom = $("#county-selector");
+            getNextAreaInfo(value,dom);
+        })
+
+        form.on('select(type)',function (data){
+            if(data.value == "02"){
+                $(".area").show();
+                form.render("select");
+            }else{
+                $(".area").hide();
+            }
+        })
+        //监听提交
+        form.on('submit(formDemo)', function(data){
+            let index = layer.load(1,{shade: [0.1,'#000'] });
+            let param = data.field;
+            let level = 1;
+            if(param.type == "01"){
+                level = 0;
+                param.provinceCode = "";
+                param.cityCode = "";
+                param.areaCode = "";
+            }else{
+                let provinceName = $("#province-selector").children("option:selected").text();
+                let cityCode = $("#city-selector").children("option:selected").val();
+                let cityName = $("#city-selector").children("option:selected").text();
+                let areaCode = $("#county-selector").children("option:selected").val();
+                let areaName = $("#county-selector").children("option:selected").text();
+                if(cityCode){
+                    level = 2;
+                }
+                if(areaCode){
+                    level = 3
+                }
+                param.provinceName = provinceName;
+                param.cityName = cityName == "请选择" ? "" : cityName;
+                param.areaName = areaName == "请选择" ? "" : areaName;
+            }
+            param.level = level;
+
+            $.ajax({
+                url: '${ctx}/openAccountConfig/save',
+                method: 'post',
+                data: JSON.stringify(data.field),
+                dataType: 'JSON',
+                contentType:"application/json",
+                success: function(res) {
+                    layer.close(index);
+                    if(res.code == 200) {
+                        layer.msg(res.message, { icon: 1, time: 1000 }, function () {
+                            var index = parent.layer.getFrameIndex(window.name);
+                            parent.layui.table.reload('openAccountConfig');
+                            parent.layer.close(index);
+                        });
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 2
+                        });
+                    }
+                }
+            })
+            return false;
+        });
+
+        function getNextAreaInfo(value,dom,cVal){
+            let url = '${ctx}/userRewardInfo/getNextAreaInfo/'+value;
+            $.get(url,function(res){
+               if(res.code == 200){
+                   let html = "<option value=''>请选择</option>";
+                   $.each(res.data,function (index,e){
+                       html += '<option '+(e.areaCode === cVal ? 'selected' : '')+'  value="'+e.areaCode+'">'+e.areaName+'</option>';
+                   })
+                   dom.empty();
+                   dom.append(html);
+                   dom.parent("div").removeClass("layui-hide");
+                   form.render("select");
+               }
+            })
+        }
+    });
+    function del(obj){
+        let value = $(obj).data().value;
+        let values = $("#areaNos").val();
+        $("#areaNos").val(values.replace(","+value,""));
+        $(obj).parent().remove();
+    }
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/openAccount/configList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/openAccount/configList.jsp
new file mode 100644
index 0000000..fab88c0
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/openAccount/configList.jsp
@@ -0,0 +1,259 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" id="form1" action="" style="margin-top: 10px;">
+                    <div class="layui-form-item">
+<%--                        <div class="layui-inline">--%>
+<%--                            <label class="layui-form-label">用户角色</label>--%>
+<%--                            <select name="roleCode" id="roleCode">--%>
+<%--                                <option value="">请选择</option>--%>
+<%--&lt;%&ndash;                                <c:forEach items="${roleList}" var="r">&ndash;%&gt;--%>
+<%--&lt;%&ndash;                                    <option value="${r.roleCode}">${r.roleName}</option>&ndash;%&gt;--%>
+<%--&lt;%&ndash;                                </c:forEach>&ndash;%&gt;--%>
+<%--                            </select>--%>
+<%--                        </div>--%>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">省</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="provinceName" id="provinceName" placeholder="省"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">市</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="cityName" id="cityName" placeholder="市"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">区域</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="areaName" id="areaName" placeholder="区域"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <div class="mb50 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-hide" id="openAccountConfig" lay-filter="openAccountConfig"></table>
+        </div>
+    </div>
+</div>
+<script type="text/html" id="leftBar">
+    <a class="layui-btn layui-btn-sm layui-btn-normal" lay-event="add">
+        <i class="layui-icon layui-icon-add-1"></i>新增
+    </a>
+    <a class="layui-btn layui-btn-sm" lay-event="search">
+        <i class="layui-icon layui-icon-search"></i>查询
+    </a>
+</script>
+
+<script type="text/html" id="toolBar">
+    <a class="layui-btn layui-btn-xs" lay-event="edit">
+        <i class="layui-icon layui-icon-edit"></i>编辑
+    </a>
+    <a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="del">
+        <i class="layui-icon layui-icon-delete"></i>删除
+    </a>
+</script>
+
+<script>
+    layui.use(['table', 'layer'], function () {
+        var table = layui.table;
+        var layer = layui.layer;
+        var roleList = JSON.parse('${roleList}');
+        var tableIns = table.render({
+            elem: '#openAccountConfig'
+            , url: '${ctx}/openAccountConfig/page'
+            , id: 'openAccountConfig'
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            , toolbar: '#leftBar' //开启头部工具栏，并为其绑定左侧模板
+            , defaultToolbar: ['filter']
+            , defaultToolbar: ['filter', 'exports', 'print', { //自定义头部工具栏右侧图标。如无需自定义，去除该参数即可
+                title: '提示'
+                , layEvent: 'LAYTABLE_TIPS'
+                , icon: 'layui-icon-tips'
+            }]
+            , title: '开户奖配置'
+            , cols: [[
+                {type: 'checkbox', fixed: 'left', hidden: true}
+                , {field: 'numbers', title: '序号', fixed: 'left', unresize: true, width: 80, type: 'numbers'}
+                ,{field:'roleCode', title:'角色',templet:function (d) {
+                    return getDictText(d.roleCode,roleList,'roleCode');
+                }}
+                , {field: 'type', title: '类型',templet:function (d){
+                    if(d.type === "01"){
+                        return "默认";
+                    }
+                    return "区域"
+                }}
+                , {field: 'codeInfo', title: '区域信息',templet:function (d){
+                    let codeInfo = "";
+                    if(!d.provinceCode && !d.cityCode && !d.areaCode){
+                        codeInfo = "-";
+                    }else if(d.provinceCode && d.cityCode && !d.areaCode){
+                        codeInfo = d.provinceCode + "-" + d.cityCode;
+                    }else if(d.provinceCode && !d.cityCode && !d.areaCode){
+                        codeInfo = d.provinceCode;
+                    }else{
+                        codeInfo = d.provinceCode + "-" + d.cityCode + "-" + d.areaCode;
+                    }
+                    return codeInfo;
+                }}
+                , {field: 'areaName', title: '区域名称',templet:function (d){
+                        let areaName = "";
+                        if(!d.provinceName && !d.cityName && !d.areaName){
+                            areaName = "-";
+                        }else if(d.provinceName && d.cityName && !d.areaName){
+                            areaName = d.provinceName + "-" + d.cityName;
+                        }else if(d.provinceName && !d.cityName && !d.areaName){
+                            areaName = d.provinceName;
+                        }else{
+                            areaName = d.provinceName + "-" + d.cityName + "-" + d.areaName;
+                        }
+                        return areaName;
+                    }}
+                , {field: 'rewardAmt', title: '金额',templet:function (d){
+                   return d.rewardAmt.toFixed(2);
+                   }}
+                , {
+                    field: 'createTime',
+                    title: '创建时间',
+                    templet: "<div>{{layui.util.toDateString(d.createTime,'yyyy-MM-dd HH:mm')}}</div>"
+                }
+                , {fixed: 'right', title: '操作', width: 160, toolbar: '#toolBar'}
+            ]]
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , page: true
+        });
+        table.on('tool(openAccountConfig)', function (obj) { //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            var data = obj.data; //获得当前行数据
+            var layEvent = obj.event; //获得 lay-event 对应的值（也可以是表头的 event 参数对应的值）
+            if (layEvent === 'del') { //删除
+                layer.confirm('真的删除么?', {icon: 3}, function (index) {
+                    obj.del(); //删除对应行（tr）的DOM结构，并更新缓存
+                    layer.close(index);
+                    del(data);
+                    //向服务端发送删除指令
+                });
+            } else if (layEvent === 'edit') { //编辑
+                //do something
+                toAdd(obj.data);
+                //同步更新缓存对应的值
+                // obj.update({
+                //     username: '123'
+                //     ,title: 'xxx'
+                // });
+            }
+        });
+
+        //监听头工具栏事件
+        table.on('toolbar(openAccountConfig)', function (obj) {
+            switch (obj.event) {
+                case 'add':
+                    // 添加
+                    toAdd();
+                    break;
+                case 'search':
+                    var params = serialize($('#form1'));
+                    table.reload('openAccountConfig', {
+                        where: params
+                        , page: {
+                            size: 10
+                            , current: 1
+                        }
+                    });
+                    break;
+            }
+        });
+
+        function toAdd(obj) {
+            var url = '${ctx}/openAccountConfig/detail';
+            var title = "新增";
+            if (obj != undefined) {
+                url = "${ctx}/openAccountConfig/detail/" + obj.id;
+                title = "编辑"
+            }
+            var index = layer.open({
+                type: 2
+                , shade: 0.5
+                , title: title
+                , maxmin: true
+                , content: url
+                , area: ['600px', '550px']
+                , end: function () {
+
+                }
+            });
+        }
+
+        function del(obj) {
+            $.ajax({
+                url: '${ctx}/openAccountConfig/del/' + obj.id,
+                method: 'DELETE',
+                dataType: 'JSON',
+                contentType: "application/json",
+                success: function (res) {
+                    layer.msg(res.message, {
+                        icon: res.code == 200 ? 1: 2
+                    });
+                }
+            })
+        }
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/openAccount/recordList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/openAccount/recordList.jsp
new file mode 100644
index 0000000..d5939c2
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/openAccount/recordList.jsp
@@ -0,0 +1,360 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+    <style>
+        .count-data{
+            display: flex;
+            justify-content: space-around;
+            align-items: center;
+            font-size: 18px;
+        }
+        .count-item{
+            padding: 15px 60px;
+            border-radius: 5px;
+            box-shadow: 0px 0px 5px 1px #f1f1f1;
+            border-top: 1px solid #e5e5e5;
+        }
+        .red{
+            color: red;
+        }
+        .layui-form-item .layui-input-inline ,.layui-select-title{
+            width: 182px;
+        }
+</style>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" id="form1" action="" style="margin-top: 10px;">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">收益用户</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="rewardUserId" id="rewardUserId" placeholder="收益用户ID"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">付款用户</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="userId" id="userId" placeholder="付款用户ID"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">商户名称</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="merchantName" id="merchantName" placeholder="商户名称"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">订单号</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="orderNumber" id="orderNumber" placeholder="订单号"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">区域名称</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="areaName" id="areaName" placeholder="区域名称"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">类型</label>
+                            <div class="layui-input-block">
+                                <select class="layui-select" name="type">
+                                    <option value="">请选择</option>
+                                    <option value="01">设备下单</option>
+                                    <option class="02">设备退款</option>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">开始日期</label>
+                            <div class="layui-input-inline">
+                                <input type="text" placeholder="开始日期" id="date1" readonly name="startTime" autocomplete="off"
+                                       class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">结束日期</label>
+                            <div class="layui-input-inline">
+                                <input type="text" placeholder="结束日期" id="date2" readonly name="endTime" autocomplete="off"
+                                       class="layui-input">
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <div class="toolbar-panel count-data mr5 ml5 mt5">
+        <div class="count-item">收入：<span class="red">￥<span id="orderAmtCount"></span></span>元</div>
+        <div class="count-item">退款：<span class="red">￥<span id="refundAmtCount"></span></span>元</div>
+        <div class="count-item">实收：<span class="red">￥<span id="actualAmtCount"></span></span>元</div>
+        <div class="count-item">支出：<span class="red">￥<span id="actualExpendAmtCount"></span></span>元</div>
+        <div class="count-item">结余：<span class="red">￥<span id="residueAmtCount"></span></span>元</div>
+    </div>
+    <div class="mb50 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-hide" id="openAccountRecord" lay-filter="openAccountRecord"></table>
+        </div>
+    </div>
+</div>
+<script type="text/html" id="leftBar">
+    <a class="layui-btn layui-btn-sm" lay-event="search">
+        <i class="layui-icon layui-icon-search"></i>查询
+    </a>
+</script>
+
+<script type="text/html" id="toolBar">
+    <a class="layui-btn layui-btn-xs layui-btn-warm" lay-event="refund">
+        <i class="layui-icon layui-icon-release"></i>退款
+    </a>
+    <a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="del">
+        <i class="layui-icon layui-icon-delete"></i>删除
+    </a>
+</script>
+
+<script>
+    layui.use(['table', 'layer','laydate'], function () {
+        var table = layui.table;
+        var layer = layui.layer;
+        let laydate = layui.laydate;
+        laydate.render({
+            elem: '#date1',//指定元素
+            type: 'date',
+            format: 'yyyy-MM-dd',
+            value: new Date(),
+            btns: ['now','confirm']
+        });
+        laydate.render({
+            elem: '#date2', //指定元素
+            type: 'date',
+            format: 'yyyy-MM-dd',
+            value: new Date(),
+            btns: ['now','confirm']
+        });
+        var params = serialize($('#form1'));
+        initData(params);
+        var tableIns = table.render({
+            elem: '#openAccountRecord'
+            , url: '${ctx}/openAccountRecord/page'
+            , id: 'openAccountRecord'
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            , toolbar: '#leftBar' //开启头部工具栏，并为其绑定左侧模板
+            , defaultToolbar: ['filter']
+            , defaultToolbar: ['filter', 'exports', 'print', { //自定义头部工具栏右侧图标。如无需自定义，去除该参数即可
+                title: '提示'
+                , layEvent: 'LAYTABLE_TIPS'
+                , icon: 'layui-icon-tips'
+            }]
+            , title: '开户奖明细'
+            , cols: [[
+                {type: 'checkbox', fixed: 'left', hidden: true}
+                ,{field: 'numbers', title: '序号', fixed: 'left', unresize: true, width: 80, type: 'numbers'}
+                ,{field:'rewardUserId', title:'收益用户'}
+                ,{field:'userId', title:'付款用户'}
+                ,{field:'merchantName', title:'商户名称'}
+                ,{field:'orderNumber', title:'订单号'}
+                ,{field:'orderAmt', title:'订单金额',templet:function (d){
+                    return d.orderAmt.toFixed(2);
+                }}
+                ,{field:'areaName', title:'区域名称'}
+                ,{field:'goodName', title:'商品名称'}
+                , {field: 'type', title: '类型',templet:function (d){
+                        if(d.type === "01"){
+                            return "<span style='color: green'>设备下单</span>";
+                        }else{
+                            return "<span style='color: red'>设备退款</span>";
+                        }
+                    }}
+                ,{field:'rewardAmt', title:'开户奖',templet:function (d){
+                        if(parseFloat(d.rewardAmt) > 0){
+                            return "<span style='color: green'>+ "+d.rewardAmt.toFixed(2)+"</span>";
+                        }else{
+                            return "<span style='color: red'>"+d.rewardAmt.toFixed(2)+"</span>";
+                        }
+                }}
+                , {field: 'status', title: '状态',templet:function (d){
+                        if(d.status === "01"){
+                            return "<span style='color: green'>正常</span>";
+                        }else{
+                            return "<span style='color: red'>禁用</span>";
+                        }
+                    }}
+                , {
+                    field: 'createTime',
+                    title: '时间',
+                    templet: "<div>{{layui.util.toDateString(d.createTime,'yyyy-MM-dd HH:mm')}}</div>"
+                }
+                , {fixed: 'right', title: '操作', width: 160, toolbar: '#toolBar'}
+            ]]
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , page: true
+        });
+        table.on('tool(openAccountRecord)', function (obj) { //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            var data = obj.data; //获得当前行数据
+            var layEvent = obj.event; //获得 lay-event 对应的值（也可以是表头的 event 参数对应的值）
+            if (layEvent === 'del') { //删除
+                layer.confirm('真的删除么?', {icon: 3}, function (index) {
+                    obj.del(); //删除对应行（tr）的DOM结构，并更新缓存
+                    layer.close(index);
+                    del(data);
+                    //向服务端发送删除指令
+                });
+            }else if(layEvent === 'refund'){
+                layer.confirm('确定标记退款,标记后会扣除该用户的开户奖?', {icon: 3,title:"提示"}, function (index) {
+                    layer.close(index);
+                    refund(data);
+                    //向服务端发送删除指令
+                });
+            }
+        });
+
+        //监听头工具栏事件
+        table.on('toolbar(openAccountRecord)', function (obj) {
+            switch (obj.event) {
+                case 'add':
+                    // 添加
+                    toAdd();
+                    break;
+                case 'search':
+                    var params = serialize($('#form1'));
+                    table.reload('openAccountRecord', {
+                        where: params
+                        , page: {
+                            size: 10
+                            , current: 1
+                        }
+                    });
+                    initData(params)
+                    break;
+            }
+        });
+        function refund(obj) {
+            $.ajax({
+                url: '${ctx}/openAccountRecord/refund/' + obj.orderNumber,
+                method: 'get',
+                dataType: 'JSON',
+                success: function (res) {
+                    layer.msg(res.message, {
+                        icon: res.code == 200 ? 1: 2
+                    });
+                    if(res.code == 200){
+                        tableIns.reload();
+                    }
+                }
+            })
+        }
+        function toAdd(obj) {
+            var url = '${ctx}/openAccountRecord/detail';
+            var title = "新增";
+            if (obj != undefined) {
+                url = "${ctx}/openAccountRecord/detail/" + obj.id;
+                title = "编辑"
+            }
+            var index = layer.open({
+                type: 2
+                , shade: 0.5
+                , title: title
+                , maxmin: true
+                , content: url
+                , area: ['600px', '550px']
+                , end: function () {
+
+                }
+            });
+        }
+
+        function del(obj) {
+            $.ajax({
+                url: '${ctx}/openAccountRecord/del/' + obj.id,
+                method: 'DELETE',
+                dataType: 'JSON',
+                contentType: "application/json",
+                success: function (res) {
+                    layer.msg(res.message, {
+                        icon: res.code == 200 ? 1: 2
+                    });
+                }
+            })
+        }
+
+        /**
+         * 初始化统计数据
+         * @param data
+         */
+        function initData(data){
+            let params = {};
+            for (var key in data) {
+                params[key] = data[key]
+            }
+            let url = ctx + "/openAccountRecord/countData";
+            $.ajax({
+                url:url,
+                type:'get',
+                data:params,
+                success:function(res){
+                    if(res.code == 200){
+                        $("#orderAmtCount").html(res.data.orderAmtCount.toFixed(2));
+                        $("#refundAmtCount").html(res.data.refundAmtCount.toFixed(2));
+                        $("#actualAmtCount").html((res.data.orderAmtCount - res.data.refundAmtCount).toFixed(2));
+                        $("#actualExpendAmtCount").html(res.data.actualExpendAmtCount.toFixed(2));
+                        $("#residueAmtCount").html((res.data.orderAmtCount - res.data.refundAmtCount - res.data.actualExpendAmtCount).toFixed(2));
+                    }
+                }
+            })
+        }
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/operationRecord/index.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/operationRecord/index.jsp
new file mode 100644
index 0000000..5594757
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/operationRecord/index.jsp
@@ -0,0 +1,273 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport"
+          content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" action="" style="margin-top: 10px" lay-filter="form">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">用户ID</label>
+                            <div class="layui-input-inline">
+                                <input type="text" name="userId" class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">IP</label>
+                            <div class="layui-input-inline">
+                                <input type="text" name="ip" class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">开始时间</label>
+                            <div class="layui-input-inline">
+                                <input type="text" id="startTime" name="createTimeStart" class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">截止时间</label>
+                            <div class="layui-input-inline">
+                                <input type="text" id="endTime" name="createTimeEnd" class="layui-input">
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">国家</label>
+                            <div class="layui-input-inline">
+                                <select name="isChina" lay-verify="required">
+                                    <option value="" selected>未选择</option>
+                                    <option value="1">中国</option>
+                                    <option value="0">国外</option>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">省份</label>
+                            <div class="layui-input-inline">
+                                <input type="text" name="province" class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">城市</label>
+                            <div class="layui-input-inline">
+                                <input type="text" name="city" class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">县区</label>
+                            <div class="layui-input-inline">
+                                <input type="text" name="county" class="layui-input">
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">操作内容</label>
+                            <div class="layui-input-inline">
+                                <input type="text" name="remark" class="layui-input">
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <!-- 表单数据 -->
+    <div class="mb50 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-hide" id="table" lay-filter="table"></table>
+        </div>
+    </div>
+</div>
+
+<script type="text/html" id="toolBar">
+    <a class="layui-btn layui-btn-sm" lay-event="reset">
+        <i class="layui-icon layui-icon-fonts-clear"></i>
+        清空
+    </a>
+    <a class="layui-btn layui-btn-sm" lay-event="search">
+        <i class="layui-icon layui-icon-search"></i>
+        查询
+    </a>
+</script>
+
+<script>
+    let table;
+    let form;
+    let laydate;
+    layui.use(['table', 'form', 'laydate'], function () {
+        table = layui.table;
+        form = layui.form;
+        laydate = layui.laydate;
+
+        laydate.render({
+            elem: '#startTime'
+            , type: 'datetime'
+        });
+
+        laydate.render({
+            elem: '#endTime'
+            , type: 'datetime'
+        });
+
+        table.render({
+            elem: '#table'
+            , id: 'table'
+            , url: ctx + '/operationRecord/page' //数据接口
+            , response: {
+                statusCode: 200
+            }
+            , autoSort: false
+            , where: {
+                asc: false,
+                column: 'createTime'
+            }
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            , even: true
+            , page: true //开启分页
+            , toolbar: '#toolBar' //开启工具栏，此处显示默认图标，可以自定义模板，详见文档
+            , defaultToolbar: ['filter']
+            , cols: [[
+                {type: 'checkbox', minWidth: 40, rowspan: 2}
+                , {field: 'userId', title: '用户ID', width: 90, align: "left"}
+                , {field: 'userName', title: '用户名称', width: 120, align: "left"}
+                , {field: 'remark', title: '操作内容', minWidth: 86, align: "left"}
+                , {
+                    field: 'ip', title: '操作IP', width: 140, align: "left", templet: function (d) {
+                        return '<a style="text-decoration: underline;" lay-event="searchIp">' + d.ip + '</a>';
+                    }
+                }
+                , {field: 'count', title: '同IP用户', width: 110, align: "left", sort: true}
+                , {
+                    title: "地区", minWidth: 195, align: 'left', templet: function (d) {
+                        let result = "";
+                        if (d.country != null && d.country != '') {
+                            result = result + d.country + " - ";
+                        }
+
+                        if (d.province != null && d.province != '') {
+                            result = result + d.province + " - ";
+                        }
+
+                        if (d.city != null && d.city != '') {
+                            result = result + d.city + " - ";
+                        }
+
+                        if (d.county != null && d.county != '') {
+                            result = result + d.county + " - ";
+                        }
+
+                        if (result.length > 0) {
+                            result = result.substring(0, result.length - 3);
+                        }
+
+                        return result;
+                    }
+                }
+                , {field: 'address', title: '商户地址', minWidth: 100, align: "left"}
+                , {field: 'isp', title: '运营商', width: 86, align: "left"}
+                , {
+                    field: 'createTime',
+                    title: '操作时间',
+                    width: 160,
+                    align: "left",
+                    templet: "<div>{{layui.util.toDateString(d.createTime,'yyyy-MM-dd HH:mm:ss')}}</div>"
+                }
+            ]]
+        })
+
+        table.on('toolbar(table)', function (obj) {
+            switch (obj.event) {
+                case 'search':
+                    reload();
+                    break;
+                case 'reset':
+                    debugger;
+                    $('form[lay-filter="form"]')[0].reset()
+                    break;
+            }
+        })
+
+        table.on('tool(table)', function (obj) {
+            let data = obj.data;
+            switch (obj.event) {
+                case 'searchIp':
+                    $('input[name="ip"]').val(data.ip);
+                    reload()
+            }
+        })
+
+        table.on('sort(table)', function (obj) {
+            table.reload('table', {
+                initSort: obj
+                , where: {
+                    column: obj.field //排序字段
+                    , asc: obj.type === 'asc' //排序方式
+                }
+            });
+        })
+    })
+
+    function reload() {
+        let formData = form.val('form')
+        table.reload('table', {
+            page: {
+                curr: 1
+            }
+            , where: formData
+
+        }, true);
+    }
+</script>
+</body>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/phoneValidateCode/phoneValidateCodeBaseInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/phoneValidateCode/phoneValidateCodeBaseInfo.jsp
new file mode 100644
index 0000000..a2271a9
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/phoneValidateCode/phoneValidateCodeBaseInfo.jsp
@@ -0,0 +1,51 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">  
+	<div class="tab-pane active">     
+		<div class="panel-body">
+			<div class="wrapper wrapper-content">
+				<div class="panel-form animated fadeInRight wp60 fc">
+					<div class="layui-form-item dn	has-error" >   
+						<label class="layui-form-label">id</label>  
+						<div class="layui-input-block">
+							<input type="text" name="id" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${phoneValidateCode.id }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">phone</label>  
+						<div class="layui-input-block">
+							<input type="text" name="phone" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${phoneValidateCode.phone }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">code</label>  
+						<div class="layui-input-block">
+							<input type="text" name="code" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${phoneValidateCode.code }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">sendDt</label>  
+						<div class="layui-input-block">
+							<input type="text" name="sendDt" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${phoneValidateCode.sendDt }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">status</label>  
+						<div class="layui-input-block">
+							<input type="text" name="status" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${phoneValidateCode.status }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">remark</label>  
+						<div class="layui-input-block">
+							<input type="text" name="remark" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${phoneValidateCode.remark }" >
+						</div>  
+					</div>
+	
+				</div>
+			</div>
+		</div>  
+	</div>
+</form>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/phoneValidateCode/phoneValidateCodeDetails.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/phoneValidateCode/phoneValidateCodeDetails.jsp
new file mode 100644
index 0000000..af1f530
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/phoneValidateCode/phoneValidateCodeDetails.jsp
@@ -0,0 +1,54 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>     
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">                      
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black"> 
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> 
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->                                     
+<meta name="viewport"
+	content="width=device-width, initial-scale=1.0, maximum-scale=1.0">   
+<jsp:include page="../../common.jsp" />
+<script type="text/javascript">
+    require("js/phoneValidateCode/phoneValidateCodeDetails.js");
+</script>
+<title>编辑</title>
+</head>                                 
+	<body class="lgraybg">            
+		<div class="	container-fluid animated fadeInRight col-sm-12">
+			<div class="panel-toolbar mt10 mb10 pt5 pb5 pl10 bdd whitebg">
+				<div class="buttons">
+					<a href="javascript:void(0);" class="btn btn-primary fa fa-save f12"><span>保存</span></a>
+					<a href="${ctx }/phoneValidateCode/index?pageIndex=${pageIndex}"  class="btn btn-primary fa fa-back f12" id="goback"><span>返回</span></a>
+				</div>
+			</div>
+				<div class="tabs-container whitebg">
+					<div class="pt10 pl5 pr5">
+						<ul class="nav nav-tabs" id="nav-tabs">
+							<li class="active" data-action="base">   
+								<a href="javascript:void(0);" >基本资料</a>
+							</li>
+							<li class="" data-action="functions">
+								<a href="javascript:void(0);"  >多功能输入</a>
+							</li>
+							<li class="" data-action="extends">
+								<a href="javascript:void(0);" >扩展属性</a>
+							</li>
+						</ul>
+						<div class="tab-content pt30 p30">               
+		
+						</div>     
+					</div>
+				</div>    
+		</div>
+		<!-- 隐藏域 -->
+		<input type="hidden" id="phoneValidateCodeId" value="${phoneValidateCode.id }"/>
+	</body>
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/phoneValidateCode/phoneValidateCodeExtendsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/phoneValidateCode/phoneValidateCodeExtendsInfo.jsp
new file mode 100644
index 0000000..592687a
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/phoneValidateCode/phoneValidateCodeExtendsInfo.jsp
@@ -0,0 +1,201 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>           
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> 
+<div class="tab-pane active">      
+	<div class="animated fadeInRight">
+		<div class="whitebg pl10 pr10">
+			<table class="table table-striped table-bordered table-hover">     
+				<thead> 
+					<tr>  
+						<th class="textc">序号</th>         
+						<th class="textc wp15">流水账号</th>
+						<th class="textc">日期</th>         
+						<th class="textc">财务类别</th>     
+						<th class="textc">金额</th>         
+						<th class="textc">银行</th>         
+						<th class="textc">发票</th>         
+						<th class="textc">客户名称</th>     
+						<th class="textc wp15">单号</th>    
+						<th class="textc">状态</th>         
+						<th class="textc">类别</th>         
+						<th class="textc">操作</th>         
+					</tr> 
+				</thead>
+				<tbody> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+                
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="green">支出</span></td>     
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+				</tbody>
+                
+			</table>  
+			<!-- footer -->  
+			<div class="clearfix mb10 pb20">          
+					<div class="layui-tab-item fr">       
+							<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+							<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>   
+							<div class="pagination dlblock vm" id="pagination"></div>
+							<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>            
+					</div>
+				</div>  
+		</div>      
+	</div>        
+</div>          
+                
+<script type="text/javascript">    
+//分页          
+$('#pagination').pagination({        
+	pageCount: 50,
+	jump: true,   
+	coping: true, 
+	homePage: '首页',    
+	endPage: '末页',     
+	prevContent: '上页', 
+	nextContent: '下页', 
+	callback: function(api) {          
+		$('.now').text(api.getCurrent());
+	}             
+});             
+</script>       
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/phoneValidateCode/phoneValidateCodeFunctionsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/phoneValidateCode/phoneValidateCodeFunctionsInfo.jsp
new file mode 100644
index 0000000..982ce84
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/phoneValidateCode/phoneValidateCodeFunctionsInfo.jsp
@@ -0,0 +1,130 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>		
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">      
+<div class="tab-pane active">
+				<div class="panel-body">
+					<div class="wrapper wrapper-content">     
+						<div class="panel-form animated fadeInRight wp60 fc">
+							<!-- 账号资料 -->
+			<div class="layui-form-item 	has-error">
+				<label class="layui-form-label">单行输入框<i class="red">*</i></label>
+				<div class="layui-input-block">
+					<input type="text" name="title" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input">
+				</div>                                         
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">自定义验证</label>
+				<div class="layui-input-inline ml30">
+					<input type="password" name="password" lay-verify="pass" placeholder="请输入密码" autocomplete="off" class="layui-input">
+				</div>
+				<div class="layui-form-mid layui-word-aux">请填写6到12位密码</div>
+			</div>
+			<div class="form-group">
+				<div class="layui-form-item">          
+					<label class="layui-form-label">单行选择框</label>
+					<div class="layui-input-block">
+						<select name="interest" lay-filter="aihao">  
+							<option value=""></option>
+							<option value="0">写作</option>         
+							<option value="1" selected="">阅读</option>
+							<option value="2">游戏</option>
+							<option value="3">音乐</option>
+							<option value="4">旅行</option>  
+						</select>              
+					</div>
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<div class="layui-inline">  
+					<label class="layui-form-label">范围</label>
+					<div class="layui-input-inline ml30">
+						<input type="text" name="price_min" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>                                     
+					<div class="layui-form-mid">-</div>
+					<div class="layui-input-inline">       
+						<input type="text" name="price_max" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>
+				</div>           
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">联动选择框</label>
+				<div class="layui-input-inline ml30">
+					<select name="quiz1">     
+						<option value="">请选择省</option>
+						<option value="浙江" selected="">浙江省</option> 
+						<option value="你的工号">江西省</option>           
+						<option value="你最喜欢的老师">福建省</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz2">
+						<option value="">请选择市</option>
+						<option value="杭州">杭州</option>
+						<option value="宁波" disabled="">宁波</option>
+						<option value="温州">温州</option>
+						<option value="温州">台州</option>
+						<option value="温州">绍兴</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz3">
+						<option value="">请选择县/区</option>
+						<option value="西湖区">西湖区</option>
+						<option value="余杭区">余杭区</option>
+						<option value="拱墅区">临安市</option>
+					</select>
+				</div>    
+			</div>
+			<div class="layui-form-item" pane="">   
+				<label class="layui-form-label">原始复选框</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="like1[write]" lay-skin="primary" title="写作" checked="">  
+					<input type="checkbox" name="like1[read]" lay-skin="primary" title="阅读">
+					<input type="checkbox" name="like1[game]" lay-skin="primary" title="游戏" disabled="">
+				</div>
+			</div>
+
+			<div class="layui-form-item">
+				<label class="layui-form-label">开关-默认关</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="close" lay-skin="switch" lay-text="ON|OFF">
+				</div>
+			</div>
+			<div class="layui-form-item">  
+				<label class="layui-form-label">单选框</label>
+				<div class="layui-input-block">
+					<input type="radio" name="sex" value="男" title="男" checked="">
+					<input type="radio" name="sex" value="女" title="女">
+					<input type="radio" name="sex" value="禁" title="禁用" disabled="">
+				</div>
+			</div>
+			<!--<div class="layui-form-item layui-form-text">
+				<label class="layui-form-label">上传图片</label>
+				<div class="layui-input-block">
+					<div class="layui-upload-drag w200 h200">
+						<i class="layui-icon"></i>          
+						<p>点击上传</p>
+					</div>
+				</div>
+			</div>-->
+				<div class="layui-form-item layui-form-text">
+					<label class="layui-form-label">普通文本域</label>  
+					<div class="layui-input-block">              
+						<textarea placeholder="请输入内容" class="layui-textarea"></textarea>
+					</div>
+				</div>
+			</div>
+		</div>   
+	</div>
+</div>
+</form>   
+<script type="text/javascript">
+	//form表单样式
+	layui.use(['layer', 'form'], function() {    
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+</script>                 
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/phoneValidateCode/phoneValidateCodeList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/phoneValidateCode/phoneValidateCodeList.jsp
new file mode 100644
index 0000000..9cb2209
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/phoneValidateCode/phoneValidateCodeList.jsp
@@ -0,0 +1,115 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black">
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->
+<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+<jsp:include page="../../common.jsp" />
+<script type="text/javascript">
+     require("js/phoneValidateCode/phoneValidateCodeList.js");
+</script>
+</head>
+<body>
+	<div class="row animated fadeInRight" style="margin: 0;">
+		<div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+			<div class="toolbar-panel bdd">
+				<div class="toolbar-box">
+					<div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+						<!-- 顶部按钮 -->
+						<div class="buttons fl">
+							<a class="btn btn-primary fa fa-search f13" href="javascript:void(0);" onclick="queryPhoneValidateCode()"><span>搜索</span></a>
+							<a class="btn btn-primary fa fa-plus f13 add" href="javascript:void(0);" onclick="initAddPhoneValidateCode()"><span>添加</span></a>
+							<a class="btn btn-primary fa fa-edit f13" href="javascript:void(0);" onclick="initEditPhoneValidateCode()"><span>编辑</span></a> 
+							<a class="btn btn-primary fa fa-remove f13 delete" href="javascript:void(0);" onclick="initBatchDeletePhoneValidateCode()"><span>删除</span></a> 
+						</div>
+						<div class="tools fr">
+							<a href="javascript:void(0);" class="collapse dblock f14 dgray mr5"> 
+								<i class="fa-2x fa fa-angle-double-up"></i>
+							</a>
+						</div>
+					</div>
+				</div>
+
+				<!--搜索条件 -->
+				<div class="toolbar-body">
+					<div class="row pt10 pb10 whitebg ml0 mr0">
+						<span class="dlblock w100 textr">ID：</span> 
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+							<input type="text" placeholder="请输入内容" id="searchId">  
+						</span> 
+						<span class="dlblock w100 textr">名称：</span> 
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+							<input type="text" placeholder="请输入名称">
+						</span> 
+						<span class="dlblock w100 textr">类别：</span>
+						 <select class="form-control f12 w180 textc">
+							<option value="">支出</option>
+							<option value="">收入</option>
+						</select>
+					</div>
+					<div class="mt10 mb20">
+						<span class="dlblock w100 textr">开始日期</span>
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+							 <input type="text" placeholder="" id="date1" class="w150">
+							 <i class="fa fa-calendar"></i>
+						</span> 
+						<span class="dlblock w100 textr">结束日期</span>
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+						<input type="text" placeholder="" id="date2" class="w150"> 
+							<i class="fa fa-calendar"></i>
+						</span>
+					</div>
+				</div>
+			</div>
+		</div>
+		<!-- 表单数据 -->
+		<div class="mb20 mt10">
+			<div class="whitebg pl10 pr10">
+				<table class="table table-striped table-bordered table-hover">
+					<thead>
+						<tr>
+							<th class="textc">
+								<div class="checker" id="allCheck">
+									<span class=""><input type="checkbox" value="" ></span>
+								</div>
+							</th>
+							<th class="textc ">id</th>
+							<th class="textc ">phone</th>
+							<th class="textc ">code</th>
+							<th class="textc ">sendDt</th>
+							<th class="textc wp15">status</th>
+							<th class="textc ">remark</th>
+							<th class="textc">编辑</th>
+						</tr>
+					</thead>
+					<!-- 数据体 -->
+					<tbody id="data_content">
+					</tbody>
+				</table>
+			
+			<!-- footer -->
+				<div class="clearfix mb10 pb20">
+						<div class="layui-tab-item fr">
+								<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+								<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>
+								<div class="pagination dlblock vm" id="pagination"></div>
+								<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>
+						</div>
+					</div>
+	
+			</div>
+		</div>
+	</div>
+</body>
+
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/postageConfig/detail.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/postageConfig/detail.jsp
new file mode 100644
index 0000000..0704e13
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/postageConfig/detail.jsp
@@ -0,0 +1,118 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp" />
+</head>
+<body style="padding: 1rem 0">
+<form class="layui-form" action="" style="width: 70%">
+    <input name="id" value="${entity.id}" hidden/>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">商户名称</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="merchantName" value="${entity.merchantName}" readonly  placeholder="请输入商户名称" class="layui-input layui-disabled"/>
+            </div>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">商户编号</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="merchantCode" value="${entity.merchantCode}" readonly  placeholder="请输入商户编号" class="layui-input layui-disabled"/>
+            </div>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">码生成上限</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="qrNum" value="${entity.qrNum}"  placeholder="请输入动态码生成次数上限" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">支付上限</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="payNum" value="${entity.payNum}"  placeholder="请输入支付次数上限" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">有效时间</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="payOverTime" value="${entity.payOverTime}" placeholder="请输入支付有效时间(分钟)" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">状态</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <select name="status" class="layui-select" lay-verify="required">
+                    <option value="">请选择</option>
+                    <option value="1" ${entity.status == 1 || empty entity ? 'selected' : ''}>启用</option>
+                    <option value="0" ${entity.status == 0 ? 'selected' : ''}>禁用</option>
+                </select>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button class="layui-btn" lay-submit lay-filter="formDemo">立即提交</button>
+            <button type="button" id="close" class="layui-btn layui-btn-primary">关闭</button>
+        </div>
+    </div>
+</form>
+
+<script>
+    //Demo
+    layui.use(['form','layer'], function(){
+        var form = layui.form;
+        var layer = layui.layer;
+        $('#close').click(function() {
+            parent.layer.closeAll();
+        });
+        //监听提交
+        form.on('submit(formDemo)', function(data){
+            var index = layer.load(1,{shade: [0.1,'#000'] });
+            $.ajax({
+                url: '${ctx}/merchantMoveSetting/save',
+                method: 'post',
+                data: JSON.stringify(data.field),
+                dataType: 'JSON',
+                contentType:"application/json",
+                success: function(res) {
+                    layer.close(index);
+                    if(res.code == 200) {
+                        layer.msg(res.message, { icon: 1, time: 1000 }, function () {
+                            var index = parent.layer.getFrameIndex(window.name);
+                            parent.layui.table.reload('merchantMoveSetting');
+                            parent.layer.close(index);
+                        });
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 2
+                        });
+                    }
+                }
+            })
+            return false;
+        });
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/postageConfig/list.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/postageConfig/list.jsp
new file mode 100644
index 0000000..d6541b0
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/postageConfig/list.jsp
@@ -0,0 +1,217 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" id="form1" action="" style="margin-top: 10px;">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">区域code</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="areaCode" id="areaCode" placeholder="区域code"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">状态</label>
+                            <div class="layui-input-block">
+                                <select id="status" name="status">
+                                    <option value="">请选择</option>
+                                    <option value="1">启用</option>
+                                    <option value="0">禁用</option>
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <div class="mb50 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-hide" id="postageConfigTab" lay-filter="postageConfigTab"></table>
+        </div>
+    </div>
+</div>
+<script type="text/html" id="leftBar">
+    <a class="layui-btn layui-btn-sm" lay-event="search">
+        <i class="layui-icon layui-icon-search"></i>查询
+    </a>
+</script>
+
+<script type="text/html" id="toolBar">
+    <a class="layui-btn layui-btn-xs" lay-event="edit">
+        <i class="layui-icon layui-icon-edit"></i>编辑
+    </a>
+    <a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="del">
+        <i class="layui-icon layui-icon-delete"></i>删除
+    </a>
+</script>
+
+<script>
+    layui.use(['table', 'layer'], function () {
+        var table = layui.table;
+        var layer = layui.layer;
+
+        var tableIns = table.render({
+            elem: '#postageConfigTab'
+            , url: '${ctx}/postageConfig/page'
+            , id: 'postageConfig'
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            , toolbar: '#leftBar' //开启头部工具栏，并为其绑定左侧模板
+            , defaultToolbar: ['filter']
+            , defaultToolbar: ['filter', 'exports', 'print', { //自定义头部工具栏右侧图标。如无需自定义，去除该参数即可
+                title: '提示'
+                , layEvent: 'LAYTABLE_TIPS'
+                , icon: 'layui-icon-tips'
+            }]
+            , title: '商品规格表'
+            , cols: [[
+                {type: 'checkbox', fixed: 'left', hidden: true}
+                , {field: 'numbers', title: '序号', fixed: 'left', unresize: true, width: 80, type: 'numbers'}
+                , {field: 'areaCode', title: '区域code',minWidth:300}
+                , {field: 'areaLevel', title: '区域等级',width: 110}
+                , {field: 'firstWeight', title: '首重/kg',width: 110}
+                , {field: 'nextWeight', title: '续重/kg',width: 110}
+                , {field: 'status', title: '状态',width: 90,templet: function (d){
+                    if(d.status == '1'){
+                        return '<span style="color: green">启用</span>';
+                    }else{
+                        return '<span style="color: red">禁用</span>';
+                    }
+                    }}
+                , {field: 'remark', title: '备注',width: 200}
+                , {
+                    field: 'createTime',
+                    title: '创建时间',
+                    width: 160,
+                    templet: "<div>{{layui.util.toDateString(d.createTime,'yyyy-MM-dd HH:mm')}}</div>"
+                }
+                , {fixed: 'right', title: '操作', toolbar: '#toolBar',width: 160}
+            ]]
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , page: true
+        });
+        table.on('tool(postageConfigTab)', function (obj) { //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            var data = obj.data; //获得当前行数据
+            var layEvent = obj.event; //获得 lay-event 对应的值（也可以是表头的 event 参数对应的值）
+            if (layEvent === 'del') { //删除
+                layer.confirm('真的删除么?', {icon: 3}, function (index) {
+                    obj.del(); //删除对应行（tr）的DOM结构，并更新缓存
+                    layer.close(index);
+                    del(data);
+                    //向服务端发送删除指令
+                });
+            } else if (layEvent === 'edit') { //编辑
+                //do something
+                toAdd(obj.data);
+                //同步更新缓存对应的值
+                // obj.update({
+                //     username: '123'
+                //     ,title: 'xxx'
+                // });
+            }
+        });
+
+        //监听头工具栏事件
+        table.on('toolbar(postageConfigTab)', function (obj) {
+            switch (obj.event) {
+                case 'add':
+                    // 添加
+                    toAdd();
+                    break;
+                case 'search':
+                    var params = serialize($('#form1'));
+                    table.reload('postageConfig', {
+                        where: params
+                        , page: {
+                            size: 10
+                            , current: 1
+                        }
+                    });
+                    break;
+            }
+        });
+        function toAdd(obj) {
+            var url = '${ctx}/postageConfig/detail';
+            var title = "新增";
+            if (obj != undefined) {
+                url = "${ctx}/postageConfig/detail/" + obj.id;
+                title = "编辑"
+            }
+            var index = layer.open({
+                type: 2
+                , shade: 0.5
+                , title: title
+                , maxmin: true
+                , content: url
+                , area: ['500px', '620px']
+                , end: function () {
+
+                }
+            });
+        }
+
+        function del(obj) {
+            $.ajax({
+                url: '${ctx}/postageConfig/del/' + obj.id,
+                method: 'DELETE',
+                dataType: 'JSON',
+                contentType: "application/json",
+                success: function (res) {
+                    layer.msg(res.message, {
+                        icon: res.code == 200 ? 1: 2
+                    });
+                }
+            })
+        }
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/promoter/actUserList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/promoter/actUserList.jsp
new file mode 100644
index 0000000..ac29753
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/promoter/actUserList.jsp
@@ -0,0 +1,180 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black">
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->
+<meta name="viewport"
+	content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+<jsp:include page="../../common.jsp" />
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" action="" style="margin-top: 10px">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">用户ID</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="userId" placeholder="请输入用户ID" autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">用户名称</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="userName" placeholder="请输入用户名称" autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">登录账号</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="loginName" placeholder="请输入登录账号" autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">商户简称</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="alias" placeholder="请输入商户简称" autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">联系人手机</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="contactMobile" placeholder="请输入联系人手机号" autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">上级手机号</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="parentPhone" placeholder="请输入上级手机号" autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <!-- 表单数据 -->
+    <div class="mb50 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-hide" id="actUserListTab" lay-filter="actUserListTab"></table>
+        </div>
+    </div>
+</div>
+
+<script type="text/html" id="leftBar">
+    <button type="button" class="layui-btn layui-btn-normal layui-btn-sm" lay-event="search"><i class="layui-icon">&#xe615;</i>查询</button>
+</script>
+</body>
+
+<script>
+    layui.use(['table', 'layer','form'], function(){
+        var table = layui.table;
+        var layer = layui.layer;
+        var form = layui.form;
+        var tableIns = table.render({
+            elem: '#actUserListTab'
+            ,url:'${ctx}/promoter/queryActPage'
+            ,id: 'actUserList'
+            ,response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                ,countName: 'count' //数据总数的字段名称，默认：count
+                ,dataName: 'data' //默数据列表的字段名称，认：data
+                ,statusCode : 200
+            }
+            ,parseData: function(res){ //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            ,toolbar: '#leftBar' //开启头部工具栏，并为其绑定左侧模板
+            , defaultToolbar: ['filter']
+            ,defaultToolbar: ['filter', 'exports', 'print', { //自定义头部工具栏右侧图标。如无需自定义，去除该参数即可
+                title: '提示'
+                ,layEvent: 'LAYTABLE_TIPS'
+                ,icon: 'layui-icon-tips'
+            }]
+            ,title: '活动商户邀请详情表'
+            ,cols: [[
+                {type: 'checkbox', fixed: 'left', hidden: true}
+                ,{field:'numbers', title:'序号', fixed: 'left', unresize: true, width:80, type:'numbers'}
+                ,{field:'userId', title:'用户ID'}
+                ,{field:'userName', title:'用户名称'}
+                ,{field:'loginName', title:'登录账号'}
+                ,{field:'alias', title:'商户简称'}
+                ,{field:'contactMobile', title:'联系人手机'}
+                ,{field:'parentPhone', title:'上级手机号'}
+                ,{field:'level', title:'推广等级'}
+                ,{field:'status', title:'状态',templet: function (d) {
+                    if(d.status == '0'){
+                        return '<span>未实名</span>';
+                    }else if(d.status == '1'){
+                        return '<span style="color: orangered">审核中</span>';
+                    }else if(d.status == '2'){
+                        return '<span style="color: red">审核失败</span>';
+                    }else if(d.status == '3'){
+                        return '<span style="color: green">已认证</span>';
+                    }
+                 }}
+                ,{field:'nextRegisterCount', title:'邀请注册数量'}
+                ,{field:'nextCertCount', title:'邀请认证数量'}
+                ,{field:'nextIncomingCount', title:'邀请进件数量'}
+                ,{field: 'createDt', title: '创建时间', width:160,templet : "<div>{{layui.util.toDateString(d.createDt,'yyyy-MM-dd HH:mm:ss')}}</div>"}
+                /*,{fixed: 'right', title:'操作',width:180, toolbar: '#toolBar'}*/
+            ]]
+            ,request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                ,limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            ,page: true
+        });
+        //监听头工具栏事件
+        table.on('toolbar(actUserListTab)', function (obj) {
+            switch (obj.event) {
+                case 'search':
+                    var params= serialize($('#form1'));
+                    table.reload('actUserList', {
+                        where: params
+                        , page: {
+                            size: 10
+                            , current: 1
+                        }
+                    });
+                    break;
+            }
+        });
+    });
+</script>
+
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/promoter/audit.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/promoter/audit.jsp
new file mode 100644
index 0000000..ca15474
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/promoter/audit.jsp
@@ -0,0 +1,359 @@
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ page contentType="text/html;charset=UTF-8" %>
+<c:set var="ctx" value="${pageContext.request.contextPath}" scope="request"/>
+<c:set var="resourcePath" value="${ctx}/resources" scope="request"/>
+
+<form class="layui-form" action="">
+    <input type="hidden" id="status" name="status" value="${userAppInfo.status}"/>
+    <input type="hidden" id="id" name="id" value="${userAppInfo.id}"/>
+    <input type="hidden" id="merchantCode" name="merchantCode" value="${userAppInfo.merchantCode}"/>
+    <input type="hidden" name="userId" value="${userAppInfo.userId}"/>
+    <div class="layui-form-item">
+        <div class="layui-inline">
+            <label class="layui-form-label">推广员名称</label>
+            <div class="layui-input-inline">
+                <input type="text" placeholder="推广员名称"
+                       class="layui-input" value="${userAppInfo.userName}"
+                       id="userName" name="userName"/>
+            </div>
+        </div>
+        <div class="layui-inline">
+            <label class="layui-form-label">登录账号</label>
+            <div class="layui-input-inline">
+                <input type="text" placeholder="推广员登录账号"
+                       class="layui-input" value="${userAppInfo.loginName}"
+                       id="loginName" name="loginName"/>
+            </div>
+        </div>
+    </div>
+
+    <c:if test="${userAppInfo.status == 3 || userAppInfo.status == 2 || userAppInfo.status == 1}">
+        <blockquote class="layui-elem-quote layui-text">
+            实名身份证
+        </blockquote>
+        <input type="hidden" name="idCard.id" value="${idCard.id}"/>
+        <input type="hidden" name="idCard.userId" value="${idCard.userId}"/>
+
+        <div class="layui-form-item">
+
+            <div class="layui-col-md12" style="clear:both">
+                <div class="layui-inline layui-col-xs12 layui-col-auto">
+                    <label class="layui-form-label">姓名</label>
+                    <div class="layui-input-inline">
+                        <input type="text"
+                               class="layui-input" value="${idCard.certName}"
+                               name="idCard.certName"/>
+                    </div>
+                </div>
+
+                <div class="layui-inline layui-col-xs12 layui-col-auto" style="word-break: break-all; display: block;">
+                    <label class="layui-form-label">身份证号码</label>
+                    <div class="layui-input-inline">
+                        <input type="text"
+                               class="layui-input" value="${idCard.certNo}"
+                               name="idCard.certNo"/>
+                    </div>
+                </div>
+            </div>
+
+            <div class="layui-col-md12" style="clear:both">
+                <div class="layui-inline layui-col-xs12 layui-col-auto">
+                    <label class="layui-form-label">发放日期</label>
+                    <div class="layui-input-inline">
+                        <input type="text"
+                               class="layui-input" value="${idCard.certStartTime}"
+                               name="idCard.certStartTime"/>
+                    </div>
+                </div>
+
+                <div class="layui-inline layui-col-xs12 layui-col-auto">
+                    <label class="layui-form-label">失效日期</label>
+                    <div class="layui-input-inline">
+                        <input type="text"
+                               class="layui-input" value="${idCard.certEndTime}"
+                               name="idCard.certEndTime"/>
+                    </div>
+                </div>
+
+            </div>
+
+            <ul>
+                <li class="textc fl pt10 pb10 layui-col-xs12 layui-col-md4 layui-col-sm4" data-v="01" data-t="auth"
+                    data-value="${idCard.id}">
+                    <div>身份证正面</div>
+                    <div class="dlblock w200 h200 mt10 upload">
+                        <input name="idCard.imgPositive" value="" hidden/>
+                        <img id="idCard1"
+                             src="${idCard.imgPositive}"
+                             onerror="this.src='${resourcePath}/images/error.jpg'"
+                             width="200" height="200" class="img-card">
+                        <div class="cover"
+                             style="background: rgba(0, 0, 0, 0.6);
+                                 height:200px;
+                                 width:200px;
+                                 position:absolute;
+                                 margin-top: -200px;
+                                 ">
+                            <div style="margin-top: 90px;">
+                                <div class="u-icon icon1" onclick="magnify('idCard1')">
+                                    <i class="layui-icon layui-icon-search"></i>
+                                </div>
+                                <div class="u-icon icon2 upload_icon">
+                                    <i class="layui-icon layui-icon-edit"></i>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </li>
+                <li class="textc fl pt10 pb10 layui-col-xs12 layui-col-md4 layui-col-sm4" data-v="02" data-t="auth"
+                    data-value="${idCard.id}">
+                    <div>身份证反面</div>
+                    <div class="dlblock upload w200 h200 mt10">
+                        <input name="idCard.imgNegative" value="" hidden/>
+                        <img id="idCard2" src="${idCard.imgNegative}"
+                             onerror="this.src='${resourcePath}/images/error.jpg'"
+                             width="200" height="200"/>
+                        <div class="cover"
+                             style="background: rgba(0, 0, 0, 0.6);
+                                 height:200px;
+                                 width:200px;
+                                 position:absolute;
+                                 margin-top: -200px;
+                                 ">
+                            <div style="margin-top: 90px;">
+                                <div class="u-icon icon1" onclick="magnify('idCard2')">
+                                    <i class="layui-icon layui-icon-search"></i>
+                                </div>
+                                <div class="u-icon icon2 upload_icon">
+                                    <i class="layui-icon layui-icon-edit"></i>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </li>
+            </ul>
+        </div>
+
+        <div class="layui-form-item">
+            <blockquote class="layui-elem-quote layui-text">
+                实名银行卡
+            </blockquote>
+        </div>
+
+        <input type="hidden" name="bankCard.id" value="${bankCard.id}"/>
+        <input type="hidden" name="bankCard.userId" value="${bankCard.userId}"/>
+        <div class="layui-form-item">
+
+            <div class="layui-col-md12" style="clear: both">
+                <div class="layui-inline">
+                    <label class="layui-form-label">银行卡号</label>
+                    <div class="layui-input-inline">
+                        <input type="text" placeholder="银行卡号"
+                               class="layui-input" value="${bankCard.bankCardNo}"
+                               name="bankCard.bankCardNo"/>
+                    </div>
+                </div>
+
+                <div class="layui-inline">
+                    <label class="layui-form-label">预留手机号</label>
+                    <div class="layui-input-inline">
+                        <input type="text" placeholder="身份证发放日期"
+                               class="layui-input" value="${bankCard.phone}"
+                               name="bankCard.phone"/>
+                    </div>
+                </div>
+
+            </div>
+
+            <div class="layui-col-md12" style="clear: both">
+                <div class="layui-inline">
+                    <div class="layui-form-label">开户行地区</div>
+                    <div class="layui-input-inline">
+                        <select id="bankProvince" class="province-selector"
+                                data-dom="bankCity" name="bankCard.branchProvince"
+                                data-value=" " lay-filter="bankProvinceType">
+                            <option value="">请选择省</option>
+                            <c:forEach items="${areaCitiesList}" var="acl">>
+                                <option value="${acl.areaCode}"
+                                        <c:if test="${bankCard.branchProvince eq acl.areaName }">selected</c:if>>${acl.areaName}
+                                </option>
+                            </c:forEach>
+                        </select>
+                    </div>
+                    <div class="layui-input-inline">
+                        <select id="bankCity" class="city-selector" name="bankCard.branchCity"
+                                data-dom="bankArea" data-value=""
+                                lay-filter="bankCityType">
+                            <option value="${bankCard.branchCity}">${bankCard.branchCity}</option>
+                        </select>
+                    </div>
+                    <div class="layui-input-inline">
+                        <select id="bankArea" name="bankCard.branchArea" class="county-selector"
+                                data-value=""
+                                lay-filter="bankCountyType">
+                            <option value="${bankCard.branchArea}">${bankCard.branchArea}</option>
+                        </select>
+                    </div>
+                </div>
+            </div>
+
+            <div class="layui-col-md12" style="clear: both">
+                <div class="layui-inline">
+                    <div class="layui-form-label">开户银行</div>
+                    <div class="layui-input-inline">
+                        <select id="bankName" name="bankCard.bankName"
+                                data-dom="bankBranch"
+                                bank-province="bankProvince"
+                                bank-city="bankCity"
+                                bank-area="bankArea"
+                                data-value=" " lay-filter="bankBranchType">
+                            <option value="">选择银行</option>
+                            <option value="工商银行"
+                                    <c:if test='${bankCard.bankName eq "工商银行" }'>selected</c:if>>工商银行
+                            </option>
+                            <option value="交通银行"
+                                    <c:if test='${bankCard.bankName eq "交通银行" }'>selected</c:if>>交通银行
+                            </option>
+                            <option value="招商银行"
+                                    <c:if test='${bankCard.bankName eq "招商银行" }'>selected</c:if>>招商银行
+                            </option>
+                            <option value="民生银行"
+                                    <c:if test='${bankCard.bankName eq "民生银行" }'>selected</c:if>>民生银行
+                            </option>
+                            <option value="中信银行"
+                                    <c:if test='${bankCard.bankName eq "中信银行" }'>selected</c:if>>中信银行
+                            </option>
+                            <option value="浦发银行"
+                                    <c:if test='${bankCard.bankName eq "浦发银行" }'>selected</c:if>>浦发银行
+                            </option>
+                            <option value="兴业银行"
+                                    <c:if test='${bankCard.bankName eq "兴业银行" }'>selected</c:if>>兴业银行
+                            </option>
+                            <option value="光大银行"
+                                    <c:if test='${bankCard.bankName eq "光大银行" }'>selected</c:if>>光大银行
+                            </option>
+                            <option value="广发银行"
+                                    <c:if test='${bankCard.bankName eq "广发银行" }'>selected</c:if>>广发银行
+                            </option>
+                            <option value="平安银行"
+                                    <c:if test='${bankCard.bankName eq "平安银行" }'>selected</c:if>>平安银行
+                            </option>
+                            <option value="北京银行"
+                                    <c:if test='${bankCard.bankName eq "北京银行" }'>selected</c:if>>北京银行
+                            </option>
+                            <option value="华夏银行"
+                                    <c:if test='${bankCard.bankName eq "华夏银行" }'>selected</c:if>>华夏银行
+                            </option>
+                            <option value="农业银行"
+                                    <c:if test='${bankCard.bankName eq "农业银行" }'>selected</c:if>>农业银行
+                            </option>
+                            <option value="建设银行"
+                                    <c:if test='${bankCard.bankName eq "建设银行" }'>selected</c:if>>建设银行
+                            </option>
+                            <option value="邮政储蓄银行"
+                                    <c:if test='${bankCard.bankName eq "邮政储蓄银行" }'>selected</c:if>>
+                                邮政储蓄银行
+                            </option>
+                            <option value="中国银行"
+                                    <c:if test='${bankCard.bankName eq "中国银行" }'>selected</c:if>>中国银行
+                            </option>
+                            <option value="宁波银行"
+                                    <c:if test='${bankCard.bankName eq "宁波银行" }'>selected</c:if>>宁波银行
+                            </option>
+                        </select>
+                    </div>
+                </div>
+
+                <div class="layui-inline">
+                    <div class="layui-form-label">开户支行</div>
+                    <div class="layui-input-inline" style="width: 250px;">
+                        <select id="bankBranch" class="city-selector" name="bankCard.contactLine"
+                                data-value=""
+                                lay-filter="bankBranch">
+                            <option value="${bankCard.contactLine}">${bankCard.branchName}</option>
+                        </select>
+                    </div>
+                </div>
+            </div>
+
+            <ul>
+                <li class="textc fl pt10 pb10 layui-col-xs12 layui-col-md4 layui-col-sm4" data-v="04" data-t="auth" data-value="${bankCard.id}">
+                    <div>银行卡照片</div>
+                    <div class="dlblock upload w200 h200 mt10">
+                        <input name="bankCard.imgUrl" value="" hidden/>
+                        <img id="imgUrl1" src="${bankCard.imgUrl}"
+                             onerror="this.src='${resourcePath}/images/error.jpg'"
+                             width="200" height="200"/>
+                        <div class="cover"
+                             style="background: rgba(0, 0, 0, 0.6);
+                                 height:200px;
+                                 width:200px;
+                                 position:absolute;
+                                 margin-top: -200px;
+                                 ">
+                            <div style="margin-top: 90px;">
+                                <div class="u-icon icon1" onclick="magnify('imgUrl1')">
+                                    <i class="layui-icon layui-icon-search"></i>
+                                </div>
+                                <div class="u-icon icon2 upload_icon">
+                                    <i class="layui-icon layui-icon-edit"></i>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </li>
+            </ul>
+        </div>
+    </c:if>
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button class="layui-btn" lay-submit lay-filter="formDemo1">立即提交</button>
+        </div>
+    </div>
+    <div id="uploadLoadingDiv" style="display: none;">
+        <div class="layui-progress" lay-showpercent="true" lay-filter="js_upload_progress"
+             style="margin: 10px;margin-top: 20px;">
+            <div class="layui-progress-bar layui-bg-red" lay-percent="0%"></div>
+        </div>
+    </div>
+</form>
+
+<script>
+
+    $(function () {
+        form.render();
+
+        auditLoading = 1;
+        baseSet()
+    });
+
+    form.on('select(bankProvinceType)', funcDistrict);
+
+    form.on('select(bankCityType)', funcDistrict);
+
+    form.on('select(bankBranchType)', funcBranchByBank);
+
+    form.on('submit(formDemo1)', function(data) {
+        var index = layer.load(1, {shade: [0.1, '#000']});
+        $.ajax({
+            url: ctx + '/promoter/updatePromoterInformation',
+            method: 'post',
+            data: data.field,
+            dataType: 'JSON',
+            success: function (res) {
+                layer.close(index);
+                if (res.code == 200) {
+                    layer.msg(res.message, {
+                        icon: 1
+                    });
+                } else {
+                    layer.msg(res.message, {
+                        icon: 5
+                    });
+                }
+            }
+        })
+        return false;
+    })
+
+</script>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/promoter/base.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/promoter/base.jsp
new file mode 100644
index 0000000..16dab8e
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/promoter/base.jsp
@@ -0,0 +1,246 @@
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ page contentType="text/html;charset=UTF-8" %>
+
+<script>
+    let upload;
+
+    let auditLoading = 0, merchBaseInfoLoading = 0, merchLicenseLoading = 0, settlementLoading = 0;
+
+    layui.use(['upload'], function() {
+        upload = layui.upload;
+    });
+
+    var xhrOnProgress = function (fun) {
+        xhrOnProgress.onprogress = fun; //绑定监听
+        //使用闭包实现监听绑定
+        return function () {
+            //通过$.ajaxSettings.xhr();获得XMLHttpRequest对象
+            var xhr = $.ajaxSettings.xhr();
+            //判断监听函数是否为函数
+            if (typeof xhrOnProgress.onprogress !== 'function') {
+                return xhr;
+            }
+            //如果有监听函数并且xhr对象支持绑定时就把监听函数绑定上去
+            if (xhrOnProgress.onprogress && xhr.upload) {
+                xhr.upload.onprogress = xhrOnProgress.onprogress;
+            }
+            return xhr;
+        }
+    }
+    var data = {};
+    var inputUpload;
+    var imgUpload;
+
+    function baseSet() {
+        // 因为上传功能只能初始化一次，所以这里等所有页面加载完成再进行初始化
+        if (auditLoading == 0) {
+            return;
+        }
+
+        if (merchBaseInfoLoading == 0) {
+            return;
+        }
+
+        if (merchLicenseLoading == 0) {
+            return;
+        }
+
+        if (settlementLoading == 0) {
+            return;
+        }
+
+
+        upload.render({
+            elem: '.upload', // 文件选择
+            url: '${ctx}/upload/ossUploadFile',
+            exts: 'jpg|png|gif|bmp|jpeg',
+            method: 'POST',
+            auto: true,
+            before: function () {
+                var dom = $(this.item);
+                inputUpload = dom.find("input");
+                imgUpload = dom.find("img");
+
+                openIndex = layer.open({
+                    type: 1,
+                    title: '上传进度',
+                    closeBtn: 1, //不显示关闭按钮
+                    area: ['300px', '130px'],
+                    shadeClose: false, //开启遮罩关闭
+                    content: $("#uploadLoadingDiv").html(),
+                    offset: '100px'
+                });
+            }
+            , xhr: xhrOnProgress
+            , progress: function (value) {//上传进度回调 value进度值
+                element.progress('js_upload_progress', value + '%');//设置页面进度条
+            }
+            , done: function (res) {
+                layer.close(openIndex);
+                if (res.code == 200) {
+                    layer.msg("上传成功！")
+                    inputUpload.val(res.url);
+                    imgUpload.attr("src", res.url);
+                } else {
+                    layer.msg("上传失败！");
+                }
+            }
+            , error: function (res) {
+                layer.close(openIndex);
+                layer.msg(res.msg);
+            }
+        });
+
+        /**
+         * 屏蔽点击事件
+         */
+        $('.cover').unbind()
+        $('.cover').click(function (e) {
+            e.stopPropagation()
+        })
+
+        /**
+         * 重置
+         */
+        $('.upload_icon').unbind()
+        $('.upload_icon').click(function (e) {
+            e.stopPropagation();
+            console.log("upload icon click")
+            $(this).parents('.upload').click()
+        })
+    }
+
+    // 省市区同步方法
+    let funcDistrict = function (data) {
+        var areaCode = data.value;
+        var domId = $(data.elem).attr("data-dom");
+        $.ajax({
+            url: ctx + '/promoter/getDowntownByCode/' + areaCode,
+            method: 'get',
+            dataType: 'json',
+            success: function (res) {
+                if (res.code == 200) {
+                    var dom = $("#" + domId);
+                    var html = "<option value=''>请选择</option>";
+                    dom.empty();
+                    if (res.areaCityList.length > 0) {
+                        $.each(res.areaCityList, function (k, v) {
+                            html += "<option value='" + v.areaCode + "'>" + v.areaName + "</option>";
+                        })
+                        dom.append(html);
+                    }
+                    form.render('select');
+                } else {
+                    layer.msg(res.message, {
+                        icon: 5
+                    });
+                }
+            }
+        })
+    };
+
+    // 省市区同步方法
+    let funcDistrictByName = function (data) {
+        var areaName = data.value;
+        var domId = $(data.elem).attr("data-dom");
+        $.ajax({
+            url: ctx + '/promoter/getDowntownByName/area/' + areaName,
+            method: 'get',
+            dataType: 'json',
+            success: function (res) {
+                if (res.code == 200) {
+                    var dom = $("#" + domId);
+                    var html = "<option value=''>请选择</option>";
+                    dom.empty();
+                    if (res.areaCityList.length > 0) {
+                        $.each(res.areaCityList, function (k, v) {
+                            html += "<option value='" + v.areaName + "'>" + v.areaName + "</option>";
+                        })
+                        dom.append(html);
+                    }
+                    form.render('select');
+                } else {
+                    layer.msg(res.message, {
+                        icon: 5
+                    });
+                }
+            }
+        })
+    };
+
+    // 省市区同步方法
+    let funcCityByName = function (data) {
+        var areaName = data.value;
+        var domId = $(data.elem).attr("data-dom");
+        $.ajax({
+            url: ctx + '/promoter/getDowntownByName/city/' + areaName,
+            method: 'get',
+            dataType: 'json',
+            success: function (res) {
+                if (res.code == 200) {
+                    var dom = $("#" + domId);
+                    var html = "<option value=''>请选择</option>";
+                    dom.empty();
+                    if (res.areaCityList.length > 0) {
+                        $.each(res.areaCityList, function (k, v) {
+                            html += "<option value='" + v.areaName + "'>" + v.areaName + "</option>";
+                        })
+                        dom.append(html);
+                    }
+                    form.render('select');
+                } else {
+                    layer.msg(res.message, {
+                        icon: 5
+                    });
+                }
+            }
+        })
+    };
+
+    let funcBranchByBank = function (data) {
+        var bankCityId = $(data.elem).attr('bank-city');
+        var bankCity = $('#' + bankCityId).val();
+        var bankName = $(data.elem).children("option:selected").val();
+        var domId = $(data.elem).attr("data-dom");
+        $.ajax({
+            url: ctx + '/promoter/getBranchList',
+            method: 'get',
+            data: {
+                "bankName": bankName,
+                "cityName": bankCity,
+            },
+            success: function (res) {
+                if (res.code == 200) {
+                    var dom = $("#" + domId);
+                    var html = "<option value=''>请选择</option>";
+                    dom.empty();
+                    if (res.branchList.length > 0) {
+                        $.each(res.branchList, function (k, v) {
+                            html += "<option value='" + v.cnapsCode + "'>" + v.cnapsName + "</option>";
+                        })
+                        dom.append(html);
+                    }
+                    form.render('select');
+                } else {
+                    layer.msg(res.message, {
+                        icon: 5
+                    });
+                }
+            }
+        })
+    }
+
+    function magnify(obj) {
+
+        var imgUrl = $('#' + obj).attr("src");
+        if (imgUrl) {
+            var img = new Image();
+            img.src = imgUrl;
+            //弹出层
+            parent.layer.photos({
+                photos: {"data": [{"src": imgUrl}]}
+            });
+        }
+    }
+
+</script>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/promoter/channelAuditInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/promoter/channelAuditInfo.jsp
new file mode 100644
index 0000000..6e08695
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/promoter/channelAuditInfo.jsp
@@ -0,0 +1,315 @@
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ page contentType="text/html;charset=UTF-8" %>
+
+<c:set var="ctx" value="${pageContext.request.contextPath}" scope="request"/>
+<c:set var="resourcePath" value="${ctx}/resources" scope="request"/>
+
+<c:forEach items="${channelStatusList}" var="channelStatus" varStatus="status">
+    <div class="w1000" style="background: white">
+        <fieldset class="w1000 fc layui-elem-field layui-field-title" style="margin-top: 20px;">
+            <legend>通道进件组${status.index + 1}</legend>
+        </fieldset>
+    </div>
+
+    <form class="layui-form mb100" action="">
+        <input type="hidden" name="id" value="${channelStatus.channel}"/>
+        <input type="hidden" name="userId" value="${userId}"/>
+        <input type="hidden" name="merchantCode" value="${channelStatus.merchantCode}"/>
+        <div class="layui-form-item">
+            <div class="layui-inline">
+                <label class="layui-form-label">审核备注组</label>
+                <div class="layui-input-inline" style="width: 600px">
+                    <select id="errMsg" lay-search lay-filter="changeAudit" data-dom="remark${status.index}"
+                    <c:if test="${channelStatus.status ne '1' || channelStatus.thirdStatus ne '-100'}">
+                            class="layui-disabled"
+                    </c:if>
+                    <option value=""></option>
+                    <c:forEach items="${listMerchantRejectDesc}" var="mrd">
+                        <option value="${mrd.rejectName}">${mrd.rejectName}</option>
+                    </c:forEach>
+                    </select>
+                </div>
+            </div>
+        </div>
+
+        <div class="layui-form-item">
+            <div class="layui-inline">
+                <label class="layui-form-label">审核备注</label>
+                <div class="layui-input-inline" style="width: 600px">
+                        <textarea name="errMsg" id="remark${status.index}"
+                                <c:if test="${channelStatus.status ne '1' || channelStatus.thirdStatus ne '-100'}">
+                                    disabled
+                                </c:if>
+                                  class="layui-textarea">${channelStatus.remark}</textarea>
+                </div>
+            </div>
+        </div>
+
+        <c:if test="${channelStatus.status eq '2' or (channelStatus.status eq '0' and channelStatus.thirdStatus eq '-100')}">
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <label class="layui-form-label">驳回时间：</label>
+                    <div class="layui-input-inline">
+                        <input type="text" class="layui-input layui-font-black"
+                               value="<fmt:formatDate value="${channelStatus.updateTime}" pattern="yyyy-MM-dd HH:mm:ss"/>" disabled />
+
+                    </div>
+                </div>
+            </div>
+        </c:if>
+
+        <div class="layui-form-item">
+            <label class="layui-form-label">通道选择</label>
+            <div class="layui-input-block" style="margin-left: 110px">
+                <c:forEach items="${channel}" var="channelItem">
+                    <input type="radio" name="id" value="${channelItem.id}"
+                           title="${channelItem.channelName}"
+                            <c:if test="${channelStatus.channel ne null || channelStatus.status ne 1 || channelStatus.thirdStatus ne -100 || channelStatus.status eq 3}">
+                                disabled
+                            </c:if>
+                            <c:if test="${channelStatus.channel eq channelItem.id}">
+                                checked
+                            </c:if>
+                            <c:if test="${channelStatus.channel eq null and channelStatusList.size() le 1}">
+                                <c:if test="${mbi.merchantType eq '1' and channelItem.id eq '3'}">
+                                    checked
+                                </c:if>
+                                <c:if test="${mbi.merchantType ne '1' and channelItem.id eq '1'}">
+                                    checked
+                                </c:if>
+                            </c:if>
+                    />
+                </c:forEach>
+            </div>
+        </div>
+
+        <div class="layui-form-item">
+            <div class="layui-inline">
+                <label class="layui-form-label">审核状态</label>
+                <div class="layui-input-inline">
+                    <c:if test='${(channelStatus.status eq "0" && channelStatus.thirdStatus eq "-100") || channelStatus.status eq "2"}'>
+                        <input type="text" class="layui-input layui-font-black" value="审核驳回" disabled/>
+                    </c:if>
+                    <c:if test='${(channelStatus.status eq "1" && channelStatus.thirdStatus eq "-100")}'>
+                        <input type="text" class="layui-input layui-font-black" value="待后台审核" disabled/>
+                    </c:if>
+                    <c:if test='${channelStatus.status eq "3"}'>
+                        <input type="text" class="layui-input layui-font-black" value="审核通过" disabled/>
+                    </c:if>
+                    <c:if test='${channelStatus.status eq "7"}'>
+                        <input type="text" class="layui-input layui-font-black" value="快付审核中" disabled/>
+                    </c:if>
+                </div>
+            </div>
+        </div>
+
+        <c:if test="${channelStatus.status eq '1' && channelStatus.thirdStatus eq '-100'}">
+            <div class="layui-form-item">
+                <div class="layui-input-block">
+                    <div class="layui-inline">
+                        <button class="layui-btn" lay-submit lay-filter="consent">通过</button>
+                    </div>
+
+                    <div class="layui-inline">
+                        <button class="layui-btn layui-btn-danger" lay-submit lay-filter="reject">驳回</button>
+                    </div>
+
+                    <div class="layui-inline">
+                        <button class="layui-btn layui-btn-danger" lay-submit lay-filter="reject2">驳回并禁止进件</button>
+                    </div>
+                </div>
+            </div>
+        </c:if>
+
+        <c:if test="${channelStatus.status eq '1' && channelStatus.status eq '-100'}">
+            <div class="layui-form-item">
+                <div class="layui-input-block">
+                    <button class="layui-btn" lay-submit lay-filter="consent">重审</button>
+                </div>
+            </div>
+        </c:if>
+    </form>
+
+</c:forEach>
+
+<c:if test="${ppStatus eq '1' && ppThirdStatus eq '-100' }">
+    <fieldset class="w1000 fc layui-elem-field layui-field-title mt100">
+        <legend>瑞银信插件进件</legend>
+    </fieldset>
+    <form class="layui-form" action="">
+        <input type="hidden" name="userId" value="${userId}"/>
+        <div class="w1000 fc" style="background: white">
+            <div class=" pd10 textl pl50 pb20 fw800 f16 pb20 bdbe mb20 ch">插件审核</div>
+            <div class="clearfix mb20">
+                <div class="fl textc wp50">
+                    <label class="layui-form-label">审核备注：</label>
+                    <div class="layui-input-block" style="margin-left:0px">
+                        <div class="layui-input-block">
+                            <textarea name="errMsg" id="remark2" style="margin-top: -13px;width: 372px"
+                                      class="bdc w320 pd7 radius5"></textarea>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="layui-form-item">
+                <div class="layui-input-block">
+                    <button class="layui-btn" lay-submit lay-filter="plugin">插件进件通过</button>
+                    <button class="layui-btn layui-btn-danger" lay-submit lay-filter="pluginReject">驳回</button>
+                </div>
+            </div>
+        </div>
+    </form>
+</c:if>
+
+<script>
+    $(function () {
+        form.render();
+    });
+
+    /*提交通过备注信息*/
+    form.on('submit(consent)', function (data) {
+        layer.confirm('确认通过?', function (index) {
+            var index = layer.load(1, {shade: [0.1, '#000']});
+            $.ajax({
+                url: ctx + '/merchantStore/manualMerchantIncom/' + data.field.userId + '/' + data.field.id + '/' + data.field.merchantCode,
+                method: 'get',
+                timeout: 0, // 此处将超时时间设为30秒
+                data: data.field,
+                dataType: 'JSON',
+                success: function (res) {
+                    layer.close(index);
+                    if (res.code == 1) {
+                        layer.alert(res.msg, function (index) {
+                            layer.close(index);
+                        })
+                    } else {
+                        layer.alert(res.msg, function (index) {
+                            layer.close(index);
+                        })
+                    }
+                },
+                error: function () {
+                    layer.close(index);
+                    layer.alert("服务器错误", function (index) {
+                        layer.close(index);
+                    })
+                }
+            })
+        });
+        return false;
+    });
+
+    /*提交通过备注信息*/
+    form.on('submit(plugin)', function (data) {
+        layer.confirm('确认通过?', function (index) {
+            var index = layer.load(1, {shade: [0.1, '#000']});
+            $.ajax({
+                url: '${ctx}/merchantStore/audit/' + data.field.userId,
+                method: 'get',
+                data: data.field,
+                dataType: 'JSON',
+                success: function (res) {
+                    layer.close(index);
+                    if (res.code == 200) {
+                        layer.msg(res.msg, {
+                            icon: 1
+                        });
+                    } else {
+                        layer.msg(res.msg, {
+                            icon: 5
+                        });
+                    }
+                },
+                error: function () {
+                    layer.close(index);
+                    layer.msg("服务器错误", {
+                        icon: 5
+                    });
+                }
+            })
+        });
+        return false;
+    });
+
+    /*提交驳回备注信息*/
+    form.on('submit(reject)', function (data) {
+        var index = layer.load(1, {shade: [0.1, '#000']});
+        $.ajax({
+            url: ctx + '/merchantStore/rejectAudit/' + data.field.userId,
+            method: 'get',
+            data: data.field,
+            dataType: 'JSON',
+            success: function (res) {
+                layer.close(index);
+                if (res.code == 1) {
+                    layer.msg(res.msg, {
+                        icon: 1
+                    });
+                } else {
+                    layer.msg(res.msg, {
+                        icon: 5
+                    });
+                }
+            }
+        })
+        return false;
+    });
+
+    /*提交驳回备注信息*/
+    form.on('submit(reject2)', function (data) {
+        var index = layer.load(1, {shade: [0.1, '#000']});
+        $.ajax({
+            url: '${ctx}/merchantStore/rejectAudit2/' + data.field.userId,
+            method: 'get',
+            data: data.field,
+            dataType: 'JSON',
+            success: function (res) {
+                layer.close(index);
+                if (res.code == 1) {
+                    layer.msg(res.msg, {
+                        icon: 1
+                    });
+                } else {
+                    layer.msg(res.msg, {
+                        icon: 5
+                    });
+                }
+            }
+        })
+        return false;
+    });
+
+    /*提交驳回备注信息*/
+    form.on('submit(pluginReject)', function (data) {
+        var index = layer.load(1, {shade: [0.1, '#000']});
+        $.ajax({
+            url: '${ctx}/merchantStore/rejectPluginAudit/' + data.field.userId,
+            method: 'get',
+            data: data.field,
+            dataType: 'JSON',
+            success: function (res) {
+                layer.close(index);
+                if (res.code == 1) {
+                    layer.msg(res.msg, {
+                        icon: 1
+                    });
+                } else {
+                    layer.msg(res.msg, {
+                        icon: 5
+                    });
+                }
+            }
+        })
+        return false;
+    });
+
+    form.on('select(changeAudit)', function (obj) {
+        let name = obj.value;
+        let elem = obj.elem;
+        let domId = $(elem).attr('data-dom');
+        debugger
+        let remark = $('#' + domId);
+        remark.val(remark.val() + name + ';');
+    })
+</script>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/promoter/detail.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/promoter/detail.jsp
new file mode 100644
index 0000000..49cf671
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/promoter/detail.jsp
@@ -0,0 +1,217 @@
+<!DOCTYPE html>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html lang="zh">
+<head>
+    <meta charset="utf-8">
+    <meta name="referrer" content="no-referrer">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+    <jsp:include page="base.jsp"/>
+    <script type="text/javascript">
+        require("promoter/userAppList.js");
+    </script>
+    <style>
+        .layui-input, .layui-textarea {
+            border-radius: 6px;
+            height: 34px;
+        }
+
+        .u-icon {
+            display: inline-block;
+            margin: 10px;
+            background: #fff;
+            color: dodgerblue;
+            width: 30px;
+            height: 30px;
+            text-align: center;
+            border-radius: 50%;
+            margin-top: -40px;
+            cursor: pointer;
+        }
+
+        .u-icon i {
+            margin-top: 7px;
+            display: block;
+        }
+
+        .cover {
+            display: none;
+        }
+
+        .dlblock:hover .cover {
+            display: block;
+        }
+
+        layui-tab-title li {
+            display: block !important;
+        }
+
+        @media screen and (min-width: 768px) {
+            .layui-col-auto {
+                width: auto;
+            }
+        }
+
+        ul li {
+            text-align: center;
+        }
+
+        .layui-form-label {
+            width: 84px !important;
+            padding: 9px 10px;
+        }
+    </style>
+</head>
+<body style="float: left; width: 100%; padding: 0 5px; box-sizing: border-box;">
+<div class="layui-col-md8">
+    <div class="layui-tab layui-tab-brief" lay-filter="tabBrief">
+        <ul class="layui-tab-title">
+            <li id="titleAudit" lay-id="auditData" class="layui-this">实名认证信息</li>
+            <li id="titleMerchBaseInfo" lay-id="merchBaseData">商户基本信息</li>
+            <li id="titleMerchLicense" lay-id="merchLicenseData">营业执照信息</li>
+            <li id="titleSettlement" lay-id="settlementData">结算信息</li>
+            <li id="titleMerchAudit" lay-id="merchAuditData">通道进件信息</li>
+        </ul>
+        <div class="layui-tab-content">
+            <div id="tabAudit" class="layui-tab-item layui-show">实名认证信息</div>
+            <div id="tabMerchBaseInfo" class="layui-tab-item">商户基本信息</div>
+            <div id="tabMerchLicense" class="layui-tab-item">营业执照内容</div>
+            <div id="tabSettlement" class="layui-tab-item">结算信息</div>
+            <div id="tabMerchAudit" class="layui-tab-item">通道进件信息</div>
+        </div>
+    </div>
+</div>
+
+<div class="layui-col-md4 layui-col-xs12 layui-col-sm12" style="overflow-y: scroll; background: #ffffff;">
+    <div id="connectContent"></div>
+</div>
+
+<script>
+    $(document).ready(function () {
+        $('iframe').height($('body')[0].clientHeight);
+
+
+        $(window.frameElement).load(function() {
+            adjustWidthHeight();
+        })
+    });
+
+    function adjustWidthHeight() {
+        var height = $(window).height();
+        console.log("iframe height: " + height);
+        $('.layui-layer-iframe1').height($('.layui-layer-iframe1').body.scroll);
+    }
+
+    let userId = "${userId}";
+
+    let layer;
+
+    let element;
+
+    let form;
+
+    layui.use(['element', 'layer', 'upload', 'form'], function () {
+        layer = layui.layer;
+        element = layui.element; //Tab的切换功能，切换事件监听等，需要依赖element模块
+        form = layui.form;
+        onStart();
+
+        element.on('tab(tabBrief)', function (data) {
+        });
+
+        $('#connectContent').load(ctx + '/promoter/connectInfo?userId=' + userId);
+    });
+
+    function promoterInit() {
+        $("#titleMerchBaseInfo").remove();
+        $("#tabMerchBaseInfo").remove();
+        $("#titleMerchLicense").remove();
+        $("#tabMerchLicense").remove();
+        $("#titleSettlement").remove();
+        $("#tabSettlement").remove();
+        $("#titleMerchAudit").remove();
+        $("#tabMerchAudit").remove();
+
+        // 填充商户认证信息页面
+        auditInfoInit();
+    }
+
+    function microMerchInit() {
+        $("#titleMerchLicense").remove();
+        $("#tabMerchLicense").remove();
+
+        auditInfoInit();
+        merchBaseInfoInit();
+        settlementInfoInit();
+        channelAuditInfoInit();
+    }
+
+    function licenseMerchInit() {
+        auditInfoInit()
+        merchBaseInfoInit();
+        merchLicenseInfoInit();
+        settlementInfoInit();
+        channelAuditInfoInit();
+    }
+
+    function auditInfoInit() {
+        $("#tabAudit").load(ctx + "/promoter/detail/audit/" + userId);
+    }
+
+    function merchBaseInfoInit() {
+        $("#tabMerchBaseInfo").load(ctx + "/promoter/detail/merchBaseInfo/" + userId);
+    }
+
+    function merchLicenseInfoInit() {
+        $("#tabMerchLicense").load(ctx + "/promoter/detail/merchLicense/" + userId);
+    }
+
+    function settlementInfoInit() {
+        $("#tabSettlement").load(ctx + "/promoter/detail/settlementV2/" + userId)
+    }
+
+    function channelAuditInfoInit() {
+        $("#tabMerchAudit").load(ctx + "/promoter/detail/channelAuditInfo/" + userId)
+    }
+
+    function onStart() {
+        $.ajax({
+            url: ctx + "/merchantBaseInfo/" + userId
+            , type: 'GET'
+            , async: true
+            , success: function (d) {
+                if (d.code == 200) {
+                    if (d.data == null) {
+                        merchLicenseLoading = 1;
+                        merchBaseInfoLoading = 1;
+                        settlementLoading = 1;
+                        promoterInit();
+                        return;
+                    }
+
+                    if (d.data.merchantType == 1) {
+                        merchLicenseLoading = 1;
+                        microMerchInit()
+                        return;
+                    }
+
+                    licenseMerchInit();
+                } else {
+                    layer.confirm(d.message, {icon: 3, title: '提示'}, function (index) {
+                        layer.close(index)
+                    });
+                }
+            }
+        });
+    }
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/promoter/merchBaseInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/promoter/merchBaseInfo.jsp
new file mode 100644
index 0000000..55bfc23
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/promoter/merchBaseInfo.jsp
@@ -0,0 +1,339 @@
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ page contentType="text/html;charset=UTF-8" %>
+<c:set var="ctx" value="${pageContext.request.contextPath}" scope="request"/>
+<c:set var="resourcePath" value="${ctx}/resources" scope="request"/>
+
+<form class="layui-form" id="form2" action="">
+    <input type="hidden" name="userId" value="${merchantBaseInfo.userId}"/>
+    <div class="layui-form-item">
+        <div class="layui-col-md12" style="clear:both">
+            <div class="layui-inline">
+                <div class="layui-form-label">商户名称</div>
+                <div class="layui-input-inline">
+                    <input type="text" placeholder="和营业执照保持一致"
+                           class="layui-input"
+                           value="${merchantBaseInfo.merchantName }" id="updateMerchantName"
+                           name="merchantBaseInfo.merchantName"/>
+                </div>
+            </div>
+
+            <div class="layui-inline">
+                <div class="layui-form-label">商户类型</div>
+                <div class="layui-input-inline">
+                    <c:if test="${ merchantBaseInfo.merchantType=='1'}">
+                        <input type="text" readonly="readonly"
+                               class="layui-input"
+                               value="小微" id="upateRegistName1"/>
+                    </c:if>
+                    <c:if test="${ merchantBaseInfo.merchantType=='2'}">
+                        <input type="text" readonly="readonly"
+                               class="layui-input"
+                               value="个体" id="upateRegistName2"/>
+                    </c:if>
+                    <c:if test="${ merchantBaseInfo.merchantType=='3'}">
+                        <input type="text" readonly="readonly"
+                               class="layui-input"
+                               value="企业" id="upateRegistName3"/>
+                    </c:if>
+                </div>
+            </div>
+        </div>
+
+        <div class="layui-col-md12" style="clear:both">
+            <div class="layui-inline">
+                <div class="layui-form-label">商户简称</div>
+                <div class="layui-input-inline">
+                    <input type="text" placeholder="商户简称"
+                           class="layui-input"
+                           value="${merchantBaseInfo.alias }"
+                           name="merchantBaseInfo.alias"/>
+                </div>
+            </div>
+
+            <div class="layui-inline">
+                <div class="layui-form-label">商户联系人</div>
+                <div class="layui-input-inline">
+                    <input type="text" placeholder="联系人姓名"
+                           class="layui-input" id="updateContactName"
+                           value="${merchantBaseInfo.contactName }"
+                           name="merchantBaseInfo.contactName"/>
+                </div>
+            </div>
+        </div>
+
+        <div class="layui-col-md12" style="clear:both">
+            <div class="layui-inline">
+                <div class="layui-form-label">联系人邮箱</div>
+                <div class="layui-input-inline">
+                    <input type="text" placeholder="联系人邮箱(作为登录名)"
+                           class="layui-input"
+                           value="${merchantBaseInfo.email }"
+                           name="merchantBaseInfo.email"/>
+                </div>
+            </div>
+
+            <div class="layui-inline">
+                <div class="layui-form-label">联系人电话</div>
+                <div class="layui-input-inline">
+                    <input type="text" placeholder="联系人电话(作为登录名)"
+                           class="layui-input" id="updateContactMobile"
+                           value="${merchantBaseInfo.contactMobile }"
+                           name="merchantBaseInfo.contactMobile"/>
+                </div>
+            </div>
+        </div>
+
+        <div class="layui-col-md12" style="clear:both">
+            <div class="layui-inline">
+                <div class="layui-form-label">支付宝账号</div>
+                <div class="layui-input-inline">
+                    <input type="text" placeholder="支付宝账号"
+                           class="layui-input" id="updateServicealiAccount"
+                           value="${merchantBaseInfo.aliAccount }"
+                           name="merchantBaseInfo.aliAccount"/>
+                </div>
+            </div>
+        </div>
+
+        <div class="layui-col-md12" style="clear:both">
+            <div class="layui-inline">
+                <div class="layui-form-label">经营类目</div>
+                <div class="layui-input-inline" style="width: 250px;">
+                    <select name="merchantBaseInfo.mcc" id="mccCode" lay-search>
+                        <option value=""></option>
+                        <c:forEach items="${mccList}" var="mcc">
+                            <option value="${mcc.fMccCode}" ${checkMcc.fMccCode == mcc.fMccCode ? 'selected' : ''}>${mcc.fMccTxt}[${mcc.fMccCode}]</option>
+                        </c:forEach>
+                    </select>
+                </div>
+            </div>
+        </div>
+
+        <div class="layui-col-md12" style="clear:both">
+            <div class="layui-inline">
+                <div class="layui-form-label">商户地址</div>
+                <div class="layui-input-inline">
+                    <select id="province" name="merchantBaseInfo.province" class="province-selector"
+                            data-dom="city"
+                            data-value=" " lay-filter="provinceType">
+                        <option value="">请选择省</option>
+                        <c:forEach items="${areaCitiesList}" var="acl">>
+                            <option value="${acl.areaCode}"
+                                    <c:if test="${merchantBaseInfo.province eq acl.areaName }">selected</c:if>>${acl.areaName}
+                            </option>
+                        </c:forEach>
+                    </select>
+                </div>
+
+                <div class="layui-input-inline">
+                    <select id="city" name="merchantBaseInfo.city" class="city-selector"
+                            data-dom="county" data-value=""
+                            lay-filter="cityType">
+                        <option value="${merchantBaseInfo.city}">${merchantBaseInfo.city}</option>
+                    </select>
+                </div>
+
+                <div class="layui-input-inline">
+                    <select id="county" name="merchantBaseInfo.district" class="county-selector"
+                            data-value=""
+                            lay-filter="countyType">
+                        <option value="${merchantBaseInfo.district}">${merchantBaseInfo.district}</option>
+                    </select>
+                </div>
+            </div>
+        </div>
+
+        <div class="layui-col-md12" style="clear:both">
+            <div class="layui-inline">
+                <div class="layui-form-label">详细地址</div>
+                <div class="layui-input-inline" style="width: 300px;">
+                    <input type="text" placeholder="详细地址:不含省市区县字样"
+                           class="layui-input"
+                           id="updateAddress" name="merchantBaseInfo.address"
+                           value="${merchantBaseInfo.address }"/>
+                </div>
+            </div>
+        </div>
+
+        <input type="hidden" name="merchantCode" value="${merchantBaseInfo.merchantCode}"/>
+
+        <div class="layui-col-md12" style="clear:both">
+            <ul>
+                <li class="fl pt10 pb10 layui-col-xs12 layui-col-md4 layui-col-sm4" data-v="06" data-t="store">
+                    <div>门头照</div>
+                    <div class="dlblock upload w200 h200 mt10">
+                        <input name="picUrl6" value="${merchantImage6}" hidden/>
+                        <img id="picUrl6" src="${merchantImage6}"
+                             onerror="this.src='${resourcePath}/images/error.jpg'"
+                             width="200" height="200">
+                        <div class="cover"
+                             style="background: rgba(0, 0, 0, 0.6);
+                                 height:200px;
+                                 width:200px;
+                                 position:absolute;
+                                 margin-top: -200px;
+                                 ">
+                            <div style="margin-top: 90px;">
+                                <div class="u-icon icon1" onclick="magnify('picUrl6')">
+                                    <i class="layui-icon layui-icon-search"></i>
+                                </div>
+                                <div class="u-icon icon2 upload_icon">
+                                    <i class="layui-icon layui-icon-edit"></i>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </li>
+                <li class="fl pt10 pb10 layui-col-xs12 layui-col-md4 layui-col-sm4" data-v="08" data-t="store">
+                    <div>收银台照</div>
+                    <div class="dlblock upload w200 h200 mt10">
+                        <input name="picUrl8" value="${merchantImage8}" hidden/>
+                        <img id="picUrl8" src="${merchantImage8}"
+                             onerror="this.src='${resourcePath}/images/error.jpg'"
+                             width="200" height="200"/>
+                        <div class="cover"
+                             style="background: rgba(0, 0, 0, 0.6);
+                                 height:200px;
+                                 width:200px;
+                                 position:absolute;
+                                 margin-top: -200px;
+                                 ">
+                            <div style="margin-top: 90px;">
+                                <div class="u-icon icon1" onclick="magnify('picUrl8')">
+                                    <i class="layui-icon layui-icon-search"></i>
+                                </div>
+                                <div class="u-icon icon2 upload_icon">
+                                    <i class="layui-icon layui-icon-edit"></i>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </li>
+                <li class="fl pt10 pb10 layui-col-xs12 layui-col-md4 layui-col-sm4" data-v="09" data-t="store">
+                    <div>门店内场景照</div>
+                    <div class="dlblock upload w200 h200 mt10">
+                        <input name="picUrl9" value="${merchantImage9}" hidden/>
+                        <c:if test="${not empty merchantImage8 }">
+                            <img id="picUrl9" src="${merchantImage9}"
+                                 onerror="this.src='${resourcePath}/images/error.jpg'"
+                                 width="200" height="200"/>
+                            <div class="cover"
+                                 style="background: rgba(0, 0, 0, 0.6);
+                                height:200px;
+                                width:200px;
+                                position:absolute;
+                                margin-top: -200px;
+                                ">
+                                <div style="margin-top: 90px;">
+                                    <div class="u-icon icon1" onclick="magnify('picUrl9')">
+                                        <i class="layui-icon layui-icon-search"></i>
+                                    </div>
+                                    <div class="u-icon icon2 upload_icon">
+                                        <i class="layui-icon layui-icon-edit"></i>
+                                    </div>
+                                </div>
+                            </div>
+                        </c:if>
+                    </div>
+                </li>
+
+                <li class="fl pt10 pb10 layui-col-xs12 layui-col-md4 layui-col-sm4" data-v="101" data-t="store">
+                    <div>商户协议</div>
+                    <div class="dlblock upload w200 h200 mt10">
+                        <input name="picUrl101" value="${merchantImage101}" hidden/>
+                        <img id="picUrl101" src="${merchantImage101}"
+                             onerror="this.src='${resourcePath }/images/error.jpg'"
+                             width="200" height="200">
+                        <div class="cover"
+                             style="background: rgba(0, 0, 0, 0.6);
+                                 height:200px;
+                                 width:200px;
+                                 position:absolute;
+                                 margin-top: -200px;
+                                 ">
+                            <div style="margin-top: 90px;">
+                                <div class="u-icon icon1" onclick="magnify('picUrl101')">
+                                    <i class="layui-icon layui-icon-search"></i>
+                                </div>
+                                <div class="u-icon icon2 upload_icon">
+                                    <i class="layui-icon layui-icon-edit"></i>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </li>
+
+                <li class="fl pt10 pb10 layui-col-xs12 layui-col-md4 layui-col-sm4" data-v="102" data-t="store">
+                    <div>商户附属协议</div>
+                    <div class="dlblock upload w200 h200 mt10">
+                        <input name="picUrl102" value="${merchantImage102}" hidden/>
+                        <img id="picUrl102" src="${merchantImage102}"
+                             onerror="this.src='${resourcePath }/images/error.jpg'"
+                             width="200" height="200">
+                        <div class="cover"
+                             style="background: rgba(0, 0, 0, 0.6);
+                                 height:200px;
+                                 width:200px;
+                                 position:absolute;
+                                 margin-top: -200px;
+                                 ">
+                            <div style="margin-top: 90px;">
+                                <div class="u-icon icon1" onclick="magnify('picUrl102')">
+                                    <i class="layui-icon layui-icon-search"></i>
+                                </div>
+                                <div class="u-icon icon2 upload_icon">
+                                    <i class="layui-icon layui-icon-edit"></i>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </li>
+            </ul>
+        </div>
+        <br/>
+
+    </div>
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button class="layui-btn" lay-submit lay-filter="formDemo2">立即提交</button>
+        </div>
+    </div>
+</form>
+
+<script>
+
+    $(function () {
+        form.render();
+
+        merchBaseInfoLoading = 1;
+        baseSet()
+    });
+
+    form.on('select(provinceType)', funcDistrict);
+
+    form.on('select(cityType)', funcDistrict);
+
+    form.on('submit(formDemo2)', function (data) {
+        var index = layer.load(1, {shade: [0.1, '#000']});
+        $.ajax({
+            url: '${ctx}/promoter/updateMerchantInformation',
+            method: 'post',
+            data: data.field,
+            dataType: 'JSON',
+            success: function (res) {
+                layer.close(index);
+                if (res.code == 200) {
+                    layer.msg(res.message, {
+                        icon: 1
+                    });
+                } else {
+                    layer.msg(res.message, {
+                        icon: 5
+                    });
+                }
+            }
+        })
+        return false;
+    })
+
+</script>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/promoter/merchLicense.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/promoter/merchLicense.jsp
new file mode 100644
index 0000000..61b9176
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/promoter/merchLicense.jsp
@@ -0,0 +1,250 @@
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ page contentType="text/html;charset=UTF-8" %>
+<c:set var="ctx" value="${pageContext.request.contextPath}" scope="request"/>
+<c:set var="resourcePath" value="${ctx}/resources" scope="request"/>
+
+<form class="layui-form" id="form3" action="">
+    <input type="hidden" name="userId" value="${merchantBaseInfo.userId}"/>
+    <input type="hidden" name="merchantCode" value="${merchantBaseInfo.merchantCode}"/>
+    <input type="hidden" id="merchantType" name="merchantBaseInfo.merchantType"
+           value="${merchantBaseInfo.merchantType}"/>
+    <input type="hidden" name="certName" value="${priceIdCard.certName}"/>
+    <div class="layui-form-item">
+        <div class="layui-col-md12" style="clear:both">
+            <div class="layui-inline">
+                <div class="layui-form-label">法人姓名</div>
+                <div class="layui-input-inline">
+                    <input type="text" placeholder="营业执照名称"
+                           class="layui-input"
+                           value="${merchantBaseInfo.principalPerson }" id="principalPerson"
+                           name="merchantBaseInfo.principalPerson"/>
+                </div>
+            </div>
+
+            <div class="layui-inline">
+                <div class="layui-form-label">法人身份证号</div>
+                <div class="layui-input-inline">
+                    <input type="text" placeholder="法人身份证号"
+                           class="layui-input"
+                           value="${priceIdCard.certNo}" id="priceIdCard.certNo"
+                           name="certNo"/>
+                </div>
+            </div>
+        </div>
+
+        <div class="layui-col-md12" style="clear:both">
+            <div class="layui-inline">
+                <div class="layui-form-label">身份证发放日期</div>
+                <div class="layui-input-inline">
+                    <input type="text" placeholder="营业执照名称"
+                           class="layui-input"
+                           value="${priceIdCard.certStartTime }" id="priceIdCard.certStartTime"
+                           name="certStartTime"/>
+                </div>
+            </div>
+
+            <div class="layui-inline">
+                <div class="layui-form-label">身份证截止日期</div>
+                <div class="layui-input-inline">
+                    <input type="text" placeholder="法人身份证号"
+                           class="layui-input"
+                           value="${priceIdCard.certEndTime}" id="priceIdCard.certEndTime"
+                           name="certEndTime"/>
+                </div>
+            </div>
+        </div>
+
+        <div class="layui-col-md12" style="clear:both">
+            <div class="layui-inline">
+                <div class="layui-form-label">执照名称</div>
+                <div class="layui-input-inline">
+                    <input type="text" placeholder="营业执照名称"
+                           class="layui-input"
+                           value="${merchantBaseInfo.bussAuthName }" id="bussAuthName"
+                           name="merchantBaseInfo.bussAuthName"/>
+                </div>
+            </div>
+
+            <div class="layui-inline">
+                <div class="layui-form-label">工商注册号</div>
+                <div class="layui-input-inline">
+                    <input type="text" placeholder="工商注册号"
+                           class="layui-input"
+                           value="${merchantBaseInfo.bussAuthNum}" id="bussAuthNum"
+                           name="merchantBaseInfo.bussAuthNum"/>
+                </div>
+            </div>
+        </div>
+
+        <div class="layui-col-md12" style="clear:both">
+            <div class="layui-inline">
+                <div class="layui-form-label">开始时间</div>
+                <div class="layui-input-inline">
+                    <input type="text" placeholder="营业执照下发时间"
+                           class="layui-input"
+                           value="${merchantBaseInfo.bussAuthStartTime }"
+                           name="merchantBaseInfo.bussAuthStartTime"/>
+                </div>
+            </div>
+
+            <div class="layui-inline">
+                <div class="layui-form-label">结束时间</div>
+                <div class="layui-input-inline">
+                    <input type="text" placeholder="营业执照失效时间"
+                           class="layui-input"
+                           value="${merchantBaseInfo.bussAuthEndTime }"
+                           name="merchantBaseInfo.bussAuthEndTime"/>
+                </div>
+            </div>
+        </div>
+
+        <div class="layui-col-md12" style="clear:both">
+            <div class="layui-inline">
+                <div class="layui-form-label">注册地址</div>
+                <div class="layui-input-inline" style="width: 400px">
+                <textarea placeholder="注册地址"
+                          class="layui-textarea"
+                          name="merchantBaseInfo.bussAuthAddress">${merchantBaseInfo.bussAuthAddress}</textarea>
+                </div>
+            </div>
+        </div>
+
+        <div class="layui-col-md12" style="clear:both">
+            <ul>
+                <li class="fl pt10 pb10 layui-col-md4 layui-col-xs12 layui-col-sm4" data-v="09" data-t="store"
+                    data-value="${merchantImage3}">
+                    <div>营业执照照片</div>
+                    <div class="dlblock upload w200 h200 mt10">
+                        <input name="picUrl3" hidden/>
+                        <img id="picUrl3" src="${merchantImage3}" referrer="no-referrer|origin|unsafe-url"
+                             onerror="this.src='${resourcePath }/images/error.jpg'"
+                             width="200" height="200"/>
+                        <div class="cover"
+                             style="background: rgba(0, 0, 0, 0.6);
+                                 height:200px;
+                                 width:200px;
+                                 position:absolute;
+                                 margin-top: -200px;
+                                 ">
+                            <div style="margin-top: 90px;">
+                                <div class="u-icon icon1" onclick="magnify('picUrl3')"><i
+                                        class="layui-icon layui-icon-search"></i></div>
+                                <div class="u-icon icon2 upload_icon"><i class="layui-icon layui-icon-edit"></i>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </li>
+                <li class="fl pt10 pb10 layui-col-md4 layui-col-xs12 layui-col-sm4" data-v="06" data-t="store"
+                    data-value="${idCard.id}">
+                    <div>法人身份证正面</div>
+                    <div class="dlblock upload w200 h200 mt10">
+                        <input name="picUrl1" hidden/>
+                        <img id="imgLegalPositive1" src="${merchantImage1}"
+                             referrer="no-referrer|origin|unsafe-url"
+                             onerror="this.src='${resourcePath }/images/error.jpg'"
+                             width="200" height="200">
+                        <div class="cover"
+                             style="background: rgba(0, 0, 0, 0.6);
+                                 height:200px;
+                                 width:200px;
+                                 position:absolute;
+                                 margin-top: -200px;
+                                 ">
+                            <div style="margin-top: 90px;">
+                                <div class="u-icon icon1" onclick="magnify('imgLegalPositive1')"><i
+                                        class="layui-icon layui-icon-search"></i></div>
+                                <div class="u-icon icon2 upload_icon"><i class="layui-icon layui-icon-edit"></i>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </li>
+                <li class="fl pt10 pb10 layui-col-md4 layui-col-xs12 layui-col-sm4" data-v="08" data-t="store"
+                    data-value="${idCard.id}">
+                    <div>法人身份证反面</div>
+                    <div class="dlblock upload w200 h200 mt10">
+                        <input name="picUrl2" hidden/>
+                        <img id="imgLegalNegative2" src="${merchantImage2}"
+                             onerror="this.src='${resourcePath }/images/error.jpg'"
+                             width="200" height="200">
+                        <div class="cover"
+                             style="background: rgba(0, 0, 0, 0.6);
+                                 height:200px;
+                                 width:200px;
+                                 position:absolute;
+                                 margin-top: -200px;
+                                 ">
+                            <div style="margin-top: 90px;">
+                                <div class="u-icon icon1" onclick="magnify('imgLegalNegative2')">
+                                    <i class="layui-icon layui-icon-search"></i>
+                                </div>
+                                <div class="u-icon icon2 upload_icon">
+                                    <i class="layui-icon layui-icon-edit"></i>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </li>
+            </ul>
+        </div>
+    </div>
+
+
+    <br/>
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button class="layui-btn" lay-submit lay-filter="formDemo3">立即提交</button>
+        </div>
+    </div>
+</form>
+
+<script>
+
+    $(function () {
+        form.render();
+
+        merchLicenseLoading = 1;
+        baseSet()
+    });
+
+    /*提交营业执照信息*/
+    form.on('submit(formDemo3)', function (data) {
+        var index = layer.load(1, {shade: [0.1, '#000']});
+        $.ajax({
+            url: ctx + '/promoter/updateMerchantLicense',
+            method: 'post',
+            data: data.field,
+            dataType: 'JSON',
+            success: function (res) {
+                layer.close(index);
+                if (res.code == 200) {
+                    /*layer.alert(res.data, function () {
+                        parent.location.reload();
+                        layer.msg(res.message, {
+                            icon: 1
+                        });
+                    })*/
+
+                    layer.alert(res.message, function (index) {
+                        //do something
+
+                        layer.close(index);
+                    });
+
+                    layer.confirm(res.message, {
+                        icon: 1
+                    });
+                } else {
+                    layer.alert(res.message, function (index) {
+                        //do something
+
+                        layer.close(index);
+                    });
+                }
+            }
+        })
+        return false;
+    });
+
+</script>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/promoter/permissionList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/promoter/permissionList.jsp
new file mode 100644
index 0000000..52750d1
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/promoter/permissionList.jsp
@@ -0,0 +1,436 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="minWidth=device-minWidth, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" action="" style="margin-top: 10px" lay-filter="formCondition">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">用户ID</label>
+                            <div class="layui-input-inline">
+                                <input type="text" placeholder="请输入用户ID" id="userId" name="userId" class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">账号</label>
+                            <div class="layui-input-inline">
+                                <input type="text" placeholder="请输入账号" id="loginName" name="loginName"
+                                       class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">电话</label>
+                            <div class="layui-input-inline">
+                                <input type="text" placeholder="请输入电话" id="phone" name="phone" class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">姓名</label>
+                            <div class="layui-input-inline">
+                                <input type="text" placeholder="请输入姓名" id="userName" name="userName"
+                                       class="layui-input">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">费率类型</label>
+                            <div class="layui-input-inline">
+                                <select name="isFixedRate" id="isFixedRate">
+                                    <option value="">请选择</option>
+                                    <option value="0">浮动</option>
+                                    <option value="1">固定</option>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">自动审核</label>
+                            <div class="layui-input-inline">
+                                <select name="autoAudit" id="autoAudit">
+                                    <option value="">请选择</option>
+                                    <option value="1">开启</option>
+                                    <option value="0">关闭</option>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">异地支付</label>
+                            <div class="layui-input-inline">
+                                <select name="payEcdemicSwitch" id="payEcdemicSwitch">
+                                    <option value="">请选择</option>
+                                    <option value="1">开启</option>
+                                    <option value="0">关闭</option>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">营销商户</label>
+                            <div class="layui-input-inline">
+                                <select name="isMarket" id="isMarket">
+                                    <option value="">请选择</option>
+                                    <option value="1">开启</option>
+                                    <option value="0">关闭</option>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">银联支付</label>
+                            <div class="layui-input-inline">
+                                <select name="isUnionPay" id="isUnionPay">
+                                    <option value="">请选择</option>
+                                    <option value="1">开启</option>
+                                    <option value="0">关闭</option>
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <!-- 表单数据 -->
+    <div class="mb50 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-hide" id="agentInfoTab" lay-filter="agentInfoTab"></table>
+        </div>
+    </div>
+</div>
+
+<script type="text/html" id="toolbarDemo">
+    <div class="layui-btn-container">
+        <button class="layui-btn layui-btn-sm" lay-event="search">
+            <i class="layui-icon layui-icon-search"></i>查询
+        </button>
+        <button class="layui-btn layui-btn-sm" lay-event="add">
+            <i class="layui-icon layui-icon-add-1"></i>添加
+        </button>
+    </div>
+</script>
+
+<script type="text/html" id="barDemo">
+    <a class="layui-btn layui-btn-xs" lay-event="edit">
+        <i class="layui-icon layui-icon-edit"></i>备注
+    </a>
+</script>
+
+<script>
+    let form;
+    let table;
+    let layer;
+
+    layui.use(['table', 'form', 'layer'], function () {
+        table = layui.table;
+        form = layui.form;
+        layer = layui.layer;
+        form.render();
+
+        var tableIns = table.render({
+            elem: '#agentInfoTab'
+            , url: ctx + '/promoter/permissionPage'
+            , where: form.val('formCondition')
+            , initSort: {
+                field: 'createTime'
+                , type: 'desc'
+            }
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.count, //解析数据长度
+                    "data": res.data.data //解析数据列表
+                };
+            }
+            , toolbar: '#toolbarDemo' //开启头部工具栏，并为其绑定左侧模板
+            , defaultToolbar: ['filter', 'exports', 'print', { //自定义头部工具栏右侧图标。如无需自定义，去除该参数即可
+                title: '提示'
+                , layEvent: 'LAYTABLE_TIPS'
+                , icon: 'layui-icon-tips'
+            }]
+            , title: '超级管理商数据表'
+            , cols: [[
+                {type: 'checkbox', fixed: 'left', hidden: true}
+                , {field: 'numbers', title: '序号', fixed: 'left', type: 'numbers'}
+                , {field: 'userId', title: '用户ID', width: 90, fixed: 'left'}
+                , {field: 'loginName', width: 120, title: '账号'}
+                , {field: 'phone', width: 120, title: '电话'}
+                , {field: 'userName', width: 120, title: '姓名'}
+                , {
+                    title: '一键开启', width: 95, align: "center", templet: (d) => {
+                        return '<a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="openAll">开启全部</a>';
+                    }
+                }
+                , {
+                    title: '自动审核', width: 95, align: "center", templet: (d) => {
+                        return '<input type="checkbox" '+(d.autoAudit == "1" ? "checked" : "") + ' lay-filter="switchAutoAudit" data-userId="' + d.userId + '" lay-skin="switch" lay-text="开启|关闭">';
+                    }
+                }
+                , {
+                    title: '异地支付', width: 95, align: "center", templet: (d) => {
+                        return '<input type="checkbox" '+(d.payEcdemicSwitch == "1" ? "checked" : "") + ' lay-filter="switchPayEcdemicSwitch" lay-skin="switch" data-userId="' + d.userId + '" lay-text="开启|关闭">';
+                    }
+                }
+                , {
+                    title: '营销商户', width: 95, align: "center", templet: (d) => {
+                        return '<input type="checkbox" '+(d.isMarket == "1" ? "checked" : "") + ' lay-filter="switchMarket" lay-skin="switch" data-userId="' + d.userId + '" lay-text="开启|关闭">';
+                    }
+                }
+                , {
+                    title: '银联支付', width: 95, align: "center", templet: (d) => {
+                        return '<input type="checkbox" '+(d.isUnionPay == "1" ? "checked" : "") + ' lay-filter="switchUnionPay" lay-skin="switch" data-userId="' + d.userId + '" lay-text="开启|关闭">';
+                    }
+                }
+                , {
+                    field: 'remark', title: '备注', minWidth: 95, align: "center"
+                }
+                , {
+                    field: 'createTime',
+                    title: '创建日期',
+                    width: 160,
+                    templet: "<div>{{layui.util.toDateString(d.createTime, 'yyyy-MM-dd HH:mm:ss')}}</div>"
+                }
+                , {fixed: 'right', title: '操作', minWidth: 165, toolbar: '#barDemo'}
+            ]]
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , page: true
+            , done: function () {
+                $("[data-field='forceUpdate']").children().each(function () {
+                    if ($(this).text() == '0') {
+                        $(this).text('否');
+                    } else if ($(this).text() == '1') {
+                        $(this).text('是');
+                    }
+                });
+            }
+        });
+
+        //头工具栏事件
+        table.on('toolbar(agentInfoTab)', function (obj) {
+            switch (obj.event) {
+                case 'search':
+                    // 查询
+                    refresh();
+                    break;
+            }
+        });
+
+        function saveUserApp(msg, param) {
+            layer.confirm(msg , function (index) {
+                $.ajax({
+                    url: ctx + "/userApp/updateByUserId"
+                    , type: 'post'
+                    , data: param
+                    , success: function(data) {
+                        layer.close(index);
+                        table.reload('agentInfoTab', {
+                            where: form.val('formCondition')
+                        });
+                    }
+                });
+                layer.close(index);
+            }, function(index) {
+                table.reload('agentInfoTab', {
+                    where: form.val('formCondition')
+                });
+            });
+        }
+
+        form.on('switch(switchAutoAudit)', function(data) {
+            let userId = $(data.elem).data().userid;
+            let param = {};
+            param.userId = userId;
+            param.autoAudit = this.checked? '1': '0';
+            let msg = this.checked? '是否开启自动审核': '是否关闭自动审核?';
+            saveUserApp(msg, param);
+        })
+
+        form.on('switch(switchPayEcdemicSwitch)', function(data) {
+            let userId = $(data.elem).data().userid;
+            let param = {};
+            param.userId = userId;
+            param.payEcdemicSwitch = this.checked? '1': '0';
+            let msg = this.checked? '是否开启异地支付?': '是否关闭异地支付?';
+            saveUserApp(msg, param);
+        })
+
+        form.on('switch(switchMarket)', function(data) {
+            let userId = $(data.elem).data().userid;
+            let param = {};
+            param.userId = userId;
+            param.isMarket = this.checked? '1': '0';
+            let msg = this.checked? '是否开启营销商户': '是否关闭营销商户?';
+            saveUserApp(msg, param);
+        })
+
+        form.on('switch(switchUnionPay)', function(data) {
+            let userId = $(data.elem).data().userid;
+            let param = {};
+            param.userId = userId;
+            param.isUnionPay = this.checked? '1': '0';
+            let msg = this.checked? '是否开启银联支付': '是否关闭银联支付?';
+            saveUserApp(msg, param);
+        })
+
+        //监听行工具事件
+        table.on('tool(agentInfoTab)', function (obj) {
+            var data = obj.data;
+            //console.log(obj)
+            if (obj.event === 'del') {
+                layer.confirm('真的删除行么?', function (index) {
+                    obj.del(data);
+                    layer.close(index);
+                    del(obj);
+                });
+            } else if (obj.event === 'edit') {
+                // toBaseEdit(obj.data);
+                edit(obj.data.userId);
+            } else if (obj.event === "openAll") {
+                openAll(obj.data.userId);
+            }
+        });
+
+        function openAll(userId) {
+            layer.confirm('是否打开' + userId + '所有权限?', {icon: 3, title: '提示'}, function (index) {
+                var url = ctx + "/promoter/openAll";
+
+                layer.load(2);
+                $.ajax({
+                    url: url
+                    , type: "POST"
+                    , data: {
+                        userId: userId
+                    }
+                    , complete: function() {
+                        layer.closeAll('loading');
+                    }
+                    , success: function (d) {
+                        layer.close(index);
+                        layer.alert(d.message);
+                    }
+                })
+            });
+        }
+
+        function edit(userId) {
+            var url = ctx + '/promoter/remark';
+            if (userId !== undefined) {
+                url = url + "?userId=" + userId;
+            }
+            console.log(url);
+            var index = layer.open({
+                type: 2
+                , title: "编辑备注"
+                , shade: 0.5
+                , maxmin: true
+                , content: url
+                , area: ['400px', '250px']
+            });
+        }
+
+        function toBaseEdit(obj) {
+            var url = ctx + '/agentInfo/detail/';
+            if (obj !== undefined) {
+                url = ctx + "/agentInfo/detail/" + obj.userId
+            }
+            var index = layer.open({
+                type: 2
+                , title: "编辑"
+                , shade: 0.5
+                , maxmin: true
+                , content: url
+                , area: ['550px', '500px']
+            });
+        }
+
+        function part(obj) {
+            var url = ctx + "/agentInfo/part/" + obj.userId;
+            var index = layer.open({
+                type: 2
+                , title: "编辑"
+                , shade: 0.5
+                , maxmin: true
+                , content: url
+                , area: ['550px', '300px']
+            });
+            layer.full(index);
+        }
+
+        function del(obj) {
+            $.ajax({
+                url: ctx + '/agentInfo/delete',
+                method: 'post',
+                data: JSON.stringify(obj.data),
+                dataType: 'JSON',
+                contentType: "application/json",
+                success: function (res) {
+                    if (res.code == 200) {
+                        layer.msg(res.data, {
+                            icon: 1
+                        });
+                    } else {
+                        layer.msg(res.data, {
+                            icon: 5
+                        });
+                    }
+                }
+            })
+        }
+    });
+
+    function refresh() {
+        table.reload('agentInfoTab', {
+            page: {
+                curr: 1
+            }
+            , where: form.val('formCondition')
+        });
+    }
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/promoter/remark.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/promoter/remark.jsp
new file mode 100644
index 0000000..2be04a4
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/promoter/remark.jsp
@@ -0,0 +1,59 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="minWidth=device-minWidth, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+</head>
+<body>
+<form class="layui-form mt20" action="" style="width: 95%;">
+    <input type="text" name="userId" value="${entity.userId}" required  lay-verify="required" placeholder="请输入标题" autocomplete="off" class="layui-hide">
+    <div class="layui-form-item">
+        <label class="layui-form-label">备注</label>
+        <div class="layui-input-block">
+            <textarea name="remark" placeholder="请输入内容" class="layui-textarea">${entity.remark}</textarea>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button class="layui-btn" lay-submit lay-filter="formDemo">立即提交</button>
+        </div>
+    </div>
+</form>
+</body>
+<script>
+    //Demo
+    layui.use('form', function(){
+        var form = layui.form;
+
+        //监听提交
+        form.on('submit(formDemo)', function(data){
+            debugger;
+            $.ajax({
+                url: ctx + "/promoter/userRemark"
+                , type: 'post'
+                , data: data.field
+                , success: function(retData) {
+                    debugger;
+                    parent.layer.msg(retData.message);
+                    if (retData.code == 200) {
+                        parent.layer.closeAll();
+                        parent.refresh();
+                    }
+                }
+            });
+            return false;
+        });
+    });
+</script>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/promoter/settlementInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/promoter/settlementInfo.jsp
new file mode 100644
index 0000000..0122341
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/promoter/settlementInfo.jsp
@@ -0,0 +1,438 @@
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ page contentType="text/html;charset=UTF-8" %>
+<c:set var="ctx" value="${pageContext.request.contextPath}" scope="request"/>
+<c:set var="resourcePath" value="${ctx}/resources" scope="request"/>
+
+<form class="layui-form" id="form4" action="">
+    <blockquote class="layui-elem-quote layui-text" style="margin-top: 15px;">
+        <span style="color: red;">${settleTypeName}</span><span
+            class="red f12 ml20">(注：请保持银行卡信息(证件号码、开户名、卡号、预留手机号)的匹配性)</span>
+    </blockquote>
+    <input type="hidden" name="merchantCode" value="${merchantCode}"/>
+    <input type="hidden" name="bankCard.userId" value="${bankCard.userId}"/>
+    <%--            <input type="hidden" name="bankCard.accountType" value="${bankCard.accountType}"/>--%>
+    <input type="hidden" name="idCard.userId" value="${idCard.userId}"/>
+    <input type="hidden" name="idCard.userType" value="${idCard.userType}"/>
+    <input type="hidden" name="idCard.certName" value="${idCard.certName}"/>
+    <div class="layui-form-item" id="area2-picker2">
+        <div class="layui-col-md12" style="clear:both">
+            <div class="layui-inline">
+                <div class="layui-form-label"><label for="bankProvince2">开户行地区</label></div>
+                <div class="layui-input-inline">
+                    <select id="bankProvince2" class="province-selector" lay-search=""
+                            data-dom="bankCity2" name="bankCard.branchProvince"
+                            data-value=" " lay-filter="bankProvinceType2">
+                        <option value="">请选择省</option>
+                        <c:forEach items="${areaCitiesList}" var="acl">>
+                            <option value="${acl.areaName}"
+                                    <c:if test="${bankCard.branchProvince eq acl.areaName }">selected</c:if>>${acl.areaName}
+                            </option>
+                        </c:forEach>
+                    </select>
+                </div>
+
+                <div class="layui-input-inline">
+                    <select id="bankCity2" class="city-selector" name="bankCard.branchCity"
+                            data-dom="bankArea2" data-value="" lay-search=""
+                            lay-filter="bankCityType2">
+                        <option value="${bankCard.branchCity}">${bankCard.branchCity}</option>
+                    </select>
+                </div>
+
+                <div class="layui-input-inline">
+                    <select id="bankArea2" name="bankCard.branchArea" class="county-selector"
+                            data-value="" lay-search=""
+                            lay-filter="bankCountyType2">
+                        <option value="${bankCard.branchArea}">${bankCard.branchArea}</option>
+                    </select>
+                </div>
+            </div>
+        </div>
+
+        <div class="layui-col-md12" style="clear:both">
+            <div class="layui-inline">
+                <div class="layui-form-label">开户银行</div>
+                <div class="layui-input-inline" style="width: 271px;">
+                    <select id="bankName2" name="bankCard.bankName"
+                            data-dom="bankBranch2"
+                            bank-city="bankCity2"
+                            data-value="" lay-filter="bankBranchType2" lay-search="">
+                        <option value="">选择银行</option>
+                        <option value="工商银行"
+                                <c:if test='${bankCard.bankName eq "工商银行" }'>selected</c:if>>工商银行
+                        </option>
+                        <option value="交通银行"
+                                <c:if test='${bankCard.bankName eq "交通银行" }'>selected</c:if>>交通银行
+                        </option>
+                        <option value="招商银行"
+                                <c:if test='${bankCard.bankName eq "招商银行" }'>selected</c:if>>招商银行
+                        </option>
+                        <option value="民生银行"
+                                <c:if test='${bankCard.bankName eq "民生银行" }'>selected</c:if>>民生银行
+                        </option>
+                        <option value="中信银行"
+                                <c:if test='${bankCard.bankName eq "中信银行" }'>selected</c:if>>中信银行
+                        </option>
+                        <option value="浦发银行"
+                                <c:if test='${bankCard.bankName eq "浦发银行" }'>selected</c:if>>浦发银行
+                        </option>
+                        <option value="兴业银行"
+                                <c:if test='${bankCard.bankName eq "兴业银行" }'>selected</c:if>>兴业银行
+                        </option>
+                        <option value="光大银行"
+                                <c:if test='${bankCard.bankName eq "光大银行" }'>selected</c:if>>光大银行
+                        </option>
+                        <option value="广发银行"
+                                <c:if test='${bankCard.bankName eq "广发银行" }'>selected</c:if>>广发银行
+                        </option>
+                        <option value="平安银行"
+                                <c:if test='${bankCard.bankName eq "平安银行" }'>selected</c:if>>平安银行
+                        </option>
+                        <option value="北京银行"
+                                <c:if test='${bankCard.bankName eq "北京银行" }'>selected</c:if>>北京银行
+                        </option>
+                        <option value="华夏银行"
+                                <c:if test='${bankCard.bankName eq "华夏银行" }'>selected</c:if>>华夏银行
+                        </option>
+                        <option value="农业银行"
+                                <c:if test='${bankCard.bankName eq "农业银行" }'>selected</c:if>>农业银行
+                        </option>
+                        <option value="建设银行"
+                                <c:if test='${bankCard.bankName eq "建设银行" }'>selected</c:if>>建设银行
+                        </option>
+                        <option value="邮政储蓄银行"
+                                <c:if test='${bankCard.bankName eq "邮政储蓄银行" }'>selected</c:if>>邮政储蓄银行
+                        </option>
+                        <option value="中国银行"
+                                <c:if test='${bankCard.bankName eq "中国银行" }'>selected</c:if>>中国银行
+                        </option>
+                        <option value="宁波银行"
+                                <c:if test='${bankCard.bankName eq "宁波银行" }'>selected</c:if>>宁波银行
+                        </option>
+                        <option value="其他银行"
+                                <c:if test='${bankCard.bankName eq "其他银行" }'>selected</c:if>>其他银行
+                        </option>
+                    </select>
+                </div>
+            </div>
+        </div>
+
+        <div class="layui-col-md12" style="clear:both">
+            <div class="layui-inline">
+                <div class="layui-form-label">开户支行</div>
+                <div class="layui-input-inline" style="width: 272px;">
+                    <select id="bankBranch2" class="city-selector" name="bankCard.contactLine"
+                            data-value="" lay-filter="bankBranch2" lay-search="">
+                        <option value="${bankCard.contactLine}">${bankCard.branchName}</option>
+                    </select>
+                </div>
+            </div>
+        </div>
+
+        <div class="layui-col-md12" style="clear:both">
+            <div class="layui-inline">
+                <div class="layui-form-label">支行联行号</div>
+                <div class="layui-input-inline">
+                    <input id="contactLine2" class="layui-input" type="text" value="${bankCard.contactLine}" readonly/>
+                </div>
+            </div>
+        </div>
+
+        <div class="layui-col-md12" style="clear:both">
+            <div class="layui-inline">
+                <div class="layui-form-label">开户名</div>
+                <div class="layui-input-inline">
+                    <input type="text" placeholder="开户名"
+                           class="layui-input" id="bankHolder"
+                           name="bankCard.bankHolder" value="${bankCard.bankHolder}"/>
+                </div>
+            </div>
+
+            <div class="layui-inline">
+                <div class="layui-form-label">开户账号</div>
+                <div class="layui-input-inline">
+                    <input type="text" placeholder="开户账号"
+                           class="layui-input" id="cardBankCard"
+                           name="bankCard.bankCardNo" value="${bankCard.bankCardNo}"/>
+                </div>
+            </div>
+        </div>
+
+        <div class="layui-col-md12" style="clear:both">
+            <div class="layui-inline">
+                <div class="layui-form-label">预留手机号</div>
+                <div class="layui-input-inline">
+                    <input type="text" placeholder="预留手机号(对公账户不需要)"
+                           class="layui-input" id="cardPhone" name="bankCard.phone"
+                           value="${bankCard.phone}"/>
+                </div>
+            </div>
+
+            <div class="layui-inline">
+                <div class="layui-form-label">身份证号码</div>
+                <div class="layui-input-inline">
+                    <input type="text" placeholder="身份证号码"
+                           class="layui-input" id="certNo" name="idCard.certNo"
+                           value="${idCard.certNo}"/>
+                </div>
+            </div>
+        </div>
+
+        <div class="layui-col-md12" style="clear:both">
+            <div class="layui-inline">
+                <div class="layui-form-label">发放日期</div>
+                <div class="layui-input-inline">
+                    <input type="text" placeholder="身份证发放日期"
+                           class="layui-input" name="idCard.certStartTime"
+                           value="${idCard.certStartTime}"/>
+                </div>
+            </div>
+
+            <div class="layui-inline">
+                <div class="layui-form-label">失效日期</div>
+                <div class="layui-input-inline">
+                    <input type="text" placeholder="身份证失效日期"
+                           class="layui-input" name="idCard.certEndTime"
+                           value="${idCard.certEndTime}"/>
+                </div>
+            </div>
+        </div>
+
+        <div class="layui-col-md12" style="clear:both">
+            <ul>
+                <li class="fl pt10 pb10 layui-col-xs12 layui-col-md4 layui-col-sm4" data-v="06" data-t="store"
+                    data-value="${idCard.id}">
+                    <div>身份证正面</div>
+                    <div class="dlblock upload w200 h200 mt10">
+                        <input name="idCard.imgPositive" hidden/>
+                        <img id="imgPositive1" src="${idCard.imgPositive}"
+                             referrer="no-referrer|origin|unsafe-url"
+                             onerror="this.src='${resourcePath }/images/error.jpg'"
+                             width="200" height="200">
+                        <div class="cover"
+                             style="background: rgba(0, 0, 0, 0.6);
+                                 height:200px;
+                                 width:200px;
+                                 position:absolute;
+                                 margin-top: -200px;
+                                 ">
+                            <div style="margin-top: 90px;">
+                                <div class="u-icon icon1" onclick="magnify('imgPositive1')"><i
+                                        class="layui-icon layui-icon-search"></i></div>
+                                <div class="u-icon icon2 upload_icon"><i class="layui-icon layui-icon-edit"></i>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </li>
+                <li class="fl pt10 pb10 layui-col-xs12 layui-col-md4 layui-col-sm4" data-v="08" data-t="store"
+                    data-value="${idCard.id}">
+                    <div>身份证反面</div>
+                    <div class="dlblock upload w200 h200 mt10">
+                        <input name="idCard.imgNegative" hidden/>
+                        <img id="imgNegative2" src="${idCard.imgNegative}"
+                             onerror="this.src='${resourcePath }/images/error.jpg'"
+                             width="200" height="200">
+                        <div class="cover"
+                             style="background: rgba(0, 0, 0, 0.6);
+                                 height:200px;
+                                 width:200px;
+                                 position:absolute;
+                                 margin-top: -200px;
+                                 ">
+                            <div style="margin-top: 90px;">
+                                <div class="u-icon icon1" onclick="magnify('imgNegative2')">
+                                    <i class="layui-icon layui-icon-search"></i>
+                                </div>
+                                <div class="u-icon icon2 upload_icon">
+                                    <i class="layui-icon layui-icon-edit"></i>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </li>
+                <c:if test="${settleTypeName eq '对公'}">
+                    <li class="fl pt10 pb10 layui-col-xs12 layui-col-md4 layui-col-sm4" data-v="09" data-t="store"
+                        data-value="${bankCard.id}">
+                        <div>开户许可证</div>
+                        <div class="dlblock upload w200 h200 mt10">
+                            <input name="bankCard.licenseUrl" hidden/>
+                            <img id="imgUrl2" src="${bankCard.licenseUrl}" referrer="no-referrer|origin|unsafe-url"
+                                 onerror="this.src='${resourcePath }/images/error.jpg'"
+                                 width="200" height="200">
+                            <div class="cover"
+                                 style="background: rgba(0, 0, 0, 0.6);
+                                 height:200px;
+                                 width:200px;
+                                 position:absolute;
+                                 margin-top: -200px;
+                                 ">
+                                <div style="margin-top: 90px;">
+                                    <div class="u-icon icon1" onclick="magnify('imgUrl2')"><i
+                                            class="layui-icon layui-icon-search"></i></div>
+                                    <div class="u-icon icon2 upload_icon"><i class="layui-icon layui-icon-edit"></i>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </li>
+                </c:if>
+                <c:if test="${settleTypeName ne '对公'}">
+                    <li class="fl pt10 pb10 layui-col-xs12 layui-col-md4 layui-col-sm4" data-v="09" data-t="store"
+                        data-value="${bankCard.id}">
+                        <div>结算卡图片</div>
+                        <div class="dlblock upload w200 h200 mt10">
+                            <input name="bankCard.imgUrl" hidden/>
+                            <img id="imgUrl2" src="${bankCard.imgUrl}" referrer="no-referrer|origin|unsafe-url"
+                                 onerror="this.src='${resourcePath }/images/error.jpg'"
+                                 width="200" height="200">
+                            <div class="cover"
+                                 style="background: rgba(0, 0, 0, 0.6);
+                                 height:200px;
+                                 width:200px;
+                                 position:absolute;
+                                 margin-top: -200px;
+                                 ">
+                                <div style="margin-top: 90px;">
+                                    <div class="u-icon icon1" onclick="magnify('imgUrl2')"><i
+                                            class="layui-icon layui-icon-search"></i></div>
+                                    <div class="u-icon icon2 upload_icon"><i class="layui-icon layui-icon-edit"></i>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </li>
+                </c:if>
+
+                <li class="fl pt10 pb10 layui-col-xs12 layui-col-md4 layui-col-sm4" data-v="999" data-t="store">
+                    <div>结算人与收银台合照</div>
+                    <div class="dlblock upload w200 h200 mt10">
+                        <input name="picUrl999" hidden/>
+                        <img id="picUrl999" src="${merchantImage999}"
+                             onerror="this.src='${resourcePath}/images/error.jpg'"
+                             width="200" height="200">
+                        <div class="cover"
+                             style="background: rgba(0, 0, 0, 0.6);
+                                 height:200px;
+                                 width:200px;
+                                 position:absolute;
+                                 margin-top: -200px;
+                                ">
+                            <div style="margin-top: 90px;">
+                                <div class="u-icon icon1" onclick="magnify('picUrl999')">
+                                    <i class="layui-icon layui-icon-search"></i>
+                                </div>
+                                <div class="u-icon icon2 upload_icon">
+                                    <i class="layui-icon layui-icon-edit"></i>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </li>
+
+                <c:if test="${settleTypeName ne '对公'}">
+                    <li class="fl pt10 pb10 layui-col-xs12 layui-col-md4 layui-col-sm4" data-v="11" data-t="store">
+                        <div>结算人手持身份证照</div>
+                        <div class="dlblock upload w200 h200 mt10">
+                            <input name="picUrl11" hidden/>
+                            <img id="picUrl11" src="${merchantImage11}"
+                                 onerror="this.src='${resourcePath }/images/error.jpg'"
+                                 width="200" height="200">
+                            <div class="cover"
+                                 style="background: rgba(0, 0, 0, 0.6);
+                                     height:200px;
+                                     width:200px;
+                                     position:absolute;
+                                     margin-top: -200px;
+                                    ">
+                                <div style="margin-top: 90px;">
+                                    <div class="u-icon icon1" onclick="magnify('picUrl11')">
+                                        <i class="layui-icon layui-icon-search"></i>
+                                    </div>
+                                    <div class="u-icon icon2 upload_icon">
+                                        <i class="layui-icon layui-icon-edit"></i>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </li>
+                </c:if>
+                <c:if test="${settleTypeName == '法人对私非法人' || settleTypeName == '非法人对私非法人'}">
+                    <li class="fl pt10 pb10 layui-col-xs12 layui-col-md4 layui-col-sm4" data-v="06" data-t="store"
+                        data-value="${idCard.id}">
+                        <div>非法人授权函</div>
+                        <div class="dlblock upload w200 h200 mt10">
+                            <input name="picUrl7" hidden/>
+                            <img id="picUrl7" src="${merchantImage7}"
+                                 referrer="no-referrer|origin|unsafe-url"
+                                 onerror="this.src='${resourcePath }/images/error.jpg'"
+                                 width="200" height="200">
+                            <div class="cover"
+                                 style="background: rgba(0, 0, 0, 0.6);
+                                 height:200px;
+                                 width:200px;
+                                 position:absolute;
+                                 margin-top: -200px;
+                                ">
+                                <div style="margin-top: 90px;">
+                                    <div class="u-icon icon1" onclick="magnify('picUrl7')"><i
+                                            class="layui-icon layui-icon-search"></i></div>
+                                    <div class="u-icon icon2 upload_icon"><i class="layui-icon layui-icon-edit"></i>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </li>
+                </c:if>
+            </ul>
+        </div>
+    </div>
+
+    <br/>
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button class="layui-btn" lay-submit lay-filter="formDemo4">立即提交</button>
+        </div>
+    </div>
+</form>
+
+<script>
+
+    $(function () {
+        form.render();
+
+        settlementLoading = 1;
+        baseSet()
+    });
+
+    form.on('select(bankProvinceType2)', funcDistrictByName);
+
+    form.on('select(bankCityType2)', funcDistrictByName);
+
+    form.on('select(bankBranchType2)', funcBranchByBank);
+
+    //更改结算信息
+    form.on('submit(formDemo4)', function (data) {
+        var index = layer.load(1, {shade: [0.1, '#000']});
+        $.ajax({
+            url: ctx + '/promoter/updateMerchantSettlement',
+            method: 'post',
+            data: data.field,
+            dataType: 'JSON',
+            success: function (res) {
+                layer.close(index);
+                if (res.code == 200) {
+                    layer.msg(res.message, {
+                        icon: 1
+                    });
+                } else {
+                    layer.msg(res.message, {
+                        icon: 5
+                    });
+                }
+            }
+        })
+        return false;
+    });
+
+</script>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/promoter/settlementInfoV2.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/promoter/settlementInfoV2.jsp
new file mode 100644
index 0000000..7b18cd2
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/promoter/settlementInfoV2.jsp
@@ -0,0 +1,922 @@
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ page contentType="text/html;charset=UTF-8" %>
+<c:set var="ctx" value="${pageContext.request.contextPath}" scope="request"/>
+<c:set var="resourcePath" value="${ctx}/resources" scope="request"/>
+
+<style>
+    .layui-input-inline {
+        width: 271px !important;
+    }
+</style>
+
+<div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
+    <blockquote class="layui-elem-quote layui-text" style="margin-top: 15px;">
+        <div>D1</div>
+        <div>
+            <span style="color: red;">${d1.settleTypeName}</span><span
+                class="red f12 ml20">(注：请保持银行卡信息(证件号码、开户名、卡号、预留手机号)的匹配性)</span>
+        </div>
+    </blockquote>
+    <form class="layui-form" id="form4" action="">
+        <input type="hidden" name="userId" value="${d1.userId}">
+        <input type="hidden" name="settleType" value="${d1.settleType}">
+        <input type="hidden" name="channelType" value="${d1.channelType}">
+        <input type="hidden" name="bankCardId" value="${d1.bankCardId}">
+        <input type="hidden" name="merchantCode" value="${merchantCode}"/>
+        <input type="hidden" name="bankCard.id" value="${d1.bankCard.id}"/>
+        <input type="hidden" name="bankCard.accountType" value="${d1.bankCard.accountType}"/>
+        <input type="hidden" name="bankCard.userId" value="${d1.bankCard.userId}"/>
+        <input type="hidden" name="idcard.userId" value="${d1.idcard.userId}"/>
+        <input type="hidden" name="idcard.userType" value="${d1.idcard.userType}"/>
+        <input type="hidden" name="idcard.certName" value="${d1.idcard.certName}"/>
+        <div class="layui-form-item" id="area2-picker2">
+            <div class="layui-col-md12" style="clear:both">
+                <div class="layui-inline">
+                    <div class="layui-form-label"><label for="bankProvince2">开户行地区</label></div>
+                    <div class="layui-input-inline">
+                        <select id="bankProvince2" class="province-selector" lay-search
+                                data-dom="bankCity2" name="bankCard.branchProvince"
+                                data-value=" " lay-filter="bankProvinceType2">
+                            <option value="">请选择省</option>
+                            <c:forEach items="${areaCitiesList}" var="acl">>
+                                <option value="${acl.areaName}"
+                                        <c:if test="${d1.bankCard.branchProvince eq acl.areaName }">selected</c:if>>${acl.areaName}
+                                </option>
+                            </c:forEach>
+                        </select>
+                    </div>
+                    <%--                <div class="layui-input-inline">--%>
+                    <%--                    <select id="bankCity2" class="city-selector" name="bankCard.branchCity"--%>
+                    <%--                            data-dom="bankArea2" data-value=""--%>
+                    <%--                            lay-filter="bankCityType2">--%>
+                    <%--                        <option value="${d1.bankCard.branchCity}">${d1.bankCard.branchCity}</option>--%>
+                    <%--                    </select>--%>
+                    <%--                </div>--%>
+
+                    <%--                <div class="layui-input-inline">--%>
+                    <%--                    <select id="bankArea2" name="bankCard.branchArea" class="county-selector"--%>
+                    <%--                            data-value=""--%>
+                    <%--                            lay-filter="bankCountyType2">--%>
+                    <%--                        <option value="${d1.bankCard.branchArea}">${d1.bankCard.branchArea}</option>--%>
+                    <%--                    </select>--%>
+                    <%--                </div>--%>
+                </div>
+            </div>
+
+            <div class="layui-col-md12" style="clear:both">
+                <div class="layui-inline">
+                    <div class="layui-form-label"></div>
+                    <div class="layui-input-inline">
+                        <select id="bankCity2" class="city-selector" name="bankCard.branchCity"
+                                data-dom="bankArea2" data-value="" lay-search
+                                lay-filter="bankCityType2">
+                            <option value="${d1.bankCard.branchCity}">${d1.bankCard.branchCity}</option>
+                        </select>
+                    </div>
+                </div>
+            </div>
+
+            <div class="layui-col-md12" style="clear:both">
+                <div class="layui-inline">
+                    <div class="layui-form-label"></div>
+
+                    <div class="layui-input-inline">
+                        <select id="bankArea2" name="bankCard.branchArea" class="county-selector"
+                                data-value="" lay-search
+                                lay-filter="bankCountyType2">
+                            <option value="${d1.bankCard.branchArea}">${d1.bankCard.branchArea}</option>
+                        </select>
+                    </div>
+                </div>
+            </div>
+
+            <div class="layui-col-md12" style="clear:both">
+                <div class="layui-inline">
+                    <div class="layui-form-label">开户银行</div>
+                    <div class="layui-input-inline">
+                        <select id="bankName2" name="bankCard.bankName"
+                                data-dom="bankBranch2" lay-search
+                                bank-city="bankCity2"
+                                data-value="" lay-filter="bankBranchType2">
+                            <option value="">选择银行</option>
+                            <option value="工商银行"
+                                    <c:if test='${d1.bankCard.bankName eq "工商银行" }'>selected</c:if>>工商银行
+                            </option>
+                            <option value="交通银行"
+                                    <c:if test='${d1.bankCard.bankName eq "交通银行" }'>selected</c:if>>交通银行
+                            </option>
+                            <option value="招商银行"
+                                    <c:if test='${d1.bankCard.bankName eq "招商银行" }'>selected</c:if>>招商银行
+                            </option>
+                            <option value="民生银行"
+                                    <c:if test='${d1.bankCard.bankName eq "民生银行" }'>selected</c:if>>民生银行
+                            </option>
+                            <option value="中信银行"
+                                    <c:if test='${d1.bankCard.bankName eq "中信银行" }'>selected</c:if>>中信银行
+                            </option>
+                            <option value="浦发银行"
+                                    <c:if test='${d1.bankCard.bankName eq "浦发银行" }'>selected</c:if>>浦发银行
+                            </option>
+                            <option value="兴业银行"
+                                    <c:if test='${d1.bankCard.bankName eq "兴业银行" }'>selected</c:if>>兴业银行
+                            </option>
+                            <option value="光大银行"
+                                    <c:if test='${d1.bankCard.bankName eq "光大银行" }'>selected</c:if>>光大银行
+                            </option>
+                            <option value="广发银行"
+                                    <c:if test='${d1.bankCard.bankName eq "广发银行" }'>selected</c:if>>广发银行
+                            </option>
+                            <option value="平安银行"
+                                    <c:if test='${d1.bankCard.bankName eq "平安银行" }'>selected</c:if>>平安银行
+                            </option>
+                            <option value="北京银行"
+                                    <c:if test='${d1.bankCard.bankName eq "北京银行" }'>selected</c:if>>北京银行
+                            </option>
+                            <option value="华夏银行"
+                                    <c:if test='${d1.bankCard.bankName eq "华夏银行" }'>selected</c:if>>华夏银行
+                            </option>
+                            <option value="农业银行"
+                                    <c:if test='${d1.bankCard.bankName eq "农业银行" }'>selected</c:if>>农业银行
+                            </option>
+                            <option value="建设银行"
+                                    <c:if test='${d1.bankCard.bankName eq "建设银行" }'>selected</c:if>>建设银行
+                            </option>
+                            <option value="邮政储蓄银行"
+                                    <c:if test='${d1.bankCard.bankName eq "邮政储蓄银行" }'>selected</c:if>>邮政储蓄银行
+                            </option>
+                            <option value="中国银行"
+                                    <c:if test='${d1.bankCard.bankName eq "中国银行" }'>selected</c:if>>中国银行
+                            </option>
+                            <option value="宁波银行"
+                                    <c:if test='${d1.bankCard.bankName eq "宁波银行" }'>selected</c:if>>宁波银行
+                            </option>
+                            <option value="其他银行"
+                                    <c:if test='${d1.bankCard.bankName eq "其他银行" }'>selected</c:if>>其他银行
+                            </option>
+                        </select>
+                    </div>
+                </div>
+            </div>
+
+            <div class="layui-col-md12" style="clear:both">
+                <div class="layui-inline">
+                    <div class="layui-form-label">开户支行</div>
+                    <div class="layui-input-inline" style="width: 272px;">
+                        <select id="bankBranch2" class="city-selector" name="bankCard.contactLine" lay-search
+                                data-value="" lay-filter="bankBranch2">
+                            <option value="${d1.bankCard.contactLine}">${d1.bankCard.branchName}</option>
+                        </select>
+                    </div>
+                </div>
+            </div>
+
+            <div class="layui-col-md12" style="clear:both">
+                <div class="layui-inline">
+                    <div class="layui-form-label">支行联行号</div>
+                    <div class="layui-input-inline">
+                        <input id="branchName" name="bankCard.branchName" class="layui-input" type="hidden"
+                               value="${d1.bankCard.branchName}"
+                               readonly/>
+                        <input id="contactLine2" class="layui-input" type="text" value="${d1.bankCard.contactLine}"
+                               readonly/>
+                    </div>
+                </div>
+            </div>
+
+            <div class="layui-col-md12" style="clear:both">
+                <div class="layui-inline">
+                    <div class="layui-form-label">开户名</div>
+                    <div class="layui-input-inline">
+                        <input type="text" placeholder="开户名"
+                               class="layui-input"
+                               name="bankCard.bankHolder" value="${d1.bankCard.bankHolder}"/>
+                    </div>
+                </div>
+            </div>
+
+            <div class="layui-col-md12" style="clear:both">
+                <div class="layui-inline">
+                    <div class="layui-form-label">开户账号</div>
+                    <div class="layui-input-inline">
+                        <input type="text" placeholder="开户账号"
+                               class="layui-input" id="cardBankCard"
+                               name="bankCard.bankCardNo" value="${d1.bankCard.bankCardNo}"/>
+                    </div>
+                </div>
+            </div>
+
+            <div class="layui-col-md12" style="clear:both">
+                <div class="layui-inline">
+                    <div class="layui-form-label">预留手机号</div>
+                    <div class="layui-input-inline">
+                        <input type="text" placeholder="预留手机号(对公账户不需要)"
+                               class="layui-input" id="cardPhone" name="bankCard.phone"
+                               value="${d1.bankCard.phone}"/>
+                    </div>
+                </div>
+            </div>
+
+            <input type="hidden" name="idcard.certType" value="${d1.idcard.certType}"/>
+
+            <div class="layui-col-md12" style="clear:both">
+                <div class="layui-inline">
+                    <div class="layui-form-label">身份证号码</div>
+                    <div class="layui-input-inline">
+                        <input type="text" placeholder="身份证号码"
+                               class="layui-input" id="certNo" name="idcard.certNo"
+                               value="${d1.idcard.certNo}"/>
+                    </div>
+                </div>
+            </div>
+
+            <div class="layui-col-md12" style="clear:both">
+                <div class="layui-inline">
+                    <div class="layui-form-label">发放日期</div>
+                    <div class="layui-input-inline">
+                        <input type="text" placeholder="身份证发放日期"
+                               class="layui-input" name="idcard.certStartTime"
+                               value="${d1.idcard.certStartTime}"/>
+                    </div>
+                </div>
+            </div>
+
+            <div class="layui-col-md12" style="clear:both">
+                <div class="layui-inline">
+                    <div class="layui-form-label">失效日期</div>
+                    <div class="layui-input-inline">
+                        <input type="text" placeholder="身份证失效日期"
+                               class="layui-input" name="idcard.certEndTime"
+                               value="${d1.idcard.certEndTime}"/>
+                    </div>
+                </div>
+            </div>
+
+            <div class="layui-col-md12" style="clear:both">
+                <ul>
+                    <li class="fl pt10 pb10 layui-col-md12 layui-col-sm12 layui-col-xs12" data-v="06" data-t="store"
+                        data-value="${d1.idcard.id}">
+                        <div>身份证正面</div>
+                        <div class="dlblock upload w300 h200 mt10">
+                            <input name="idcard.imgPositive" value="${d1.idcard.imgPositive}" hidden/>
+                            <img id="imgPositive1" src="${d1.idcard.imgPositive}" alt="身份证正面图片"
+                                 referrer="no-referrer|origin|unsafe-url"
+                                 onerror="this.src='${resourcePath }/images/error.jpg'"
+                                 width="300" height="200">
+                            <div class="cover"
+                                 style="background: rgba(0, 0, 0, 0.6);
+                                 height:200px;
+                                 width:300px;
+                                 position:absolute;
+                                 margin-top: -200px;
+                                 ">
+                                <div style="margin-top: 90px;">
+                                    <div class="u-icon icon1" onclick="magnify('imgPositive1')">
+                                        <i class="layui-icon layui-icon-search"></i>
+                                    </div>
+                                    <div class="u-icon icon2 upload_icon">
+                                        <i class="layui-icon layui-icon-edit"></i>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </li>
+                    <li class="fl pt10 pb10  layui-col-md12 layui-col-sm12 layui-col-xs12" data-v="08" data-t="store"
+                        data-value="${d1.idcard.id}">
+                        <div>身份证反面</div>
+                        <div class="dlblock upload w300 h200 mt10">
+                            <input name="idcard.imgNegative" value="${d1.idcard.imgNegative}" hidden/>
+                            <img id="imgNegative2" src="${d1.idcard.imgNegative}" alt=""
+                                 onerror="this.src='${resourcePath }/images/error.jpg'"
+                                 width="300" height="200">
+                            <div class="cover"
+                                 style="background: rgba(0, 0, 0, 0.6);
+                                 height:200px;
+                                 width:300px;
+                                 position:absolute;
+                                 margin-top: -200px;
+                                 ">
+                                <div style="margin-top: 90px;">
+                                    <div class="u-icon icon1" onclick="magnify('imgNegative2')">
+                                        <i class="layui-icon layui-icon-search"></i>
+                                    </div>
+                                    <div class="u-icon icon2 upload_icon">
+                                        <i class="layui-icon layui-icon-edit"></i>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </li>
+                    <c:if test="${d1.settleTypeName eq '对公'}">
+                        <li class="fl pt10 pb10 layui-col-md12 layui-col-sm12 layui-col-xs12" data-v="09" data-t="store"
+                            data-value="${d1.bankCard.id}">
+                            <div>开户许可证</div>
+                            <div class="dlblock upload w300 h200 mt10">
+                                <input name="bankCard.licenseUrl" value="${d1.bankCard.licenseUrl}" hidden/>
+                                <img id="imgUrl2" src="${d1.bankCard.licenseUrl}"
+                                     referrer="no-referrer|origin|unsafe-url" alt=""
+                                     onerror="this.src='${resourcePath }/images/error.jpg'"
+                                     width="300" height="200">
+                                <div class="cover"
+                                     style="background: rgba(0, 0, 0, 0.6);
+                                 height:200px;
+                                 width:300px;
+                                 position:absolute;
+                                 margin-top: -200px;
+                                 ">
+                                    <div style="margin-top: 90px;">
+                                        <div class="u-icon icon1" onclick="magnify('imgUrl2')">
+                                            <i class="layui-icon layui-icon-search"></i>
+                                        </div>
+                                        <div class="u-icon icon2 upload_icon">
+                                            <i class="layui-icon layui-icon-edit"></i>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </li>
+                    </c:if>
+                    <c:if test="${d1.settleTypeName ne '对公'}">
+                        <li class="fl pt10 pb10 layui-col-md12 layui-col-sm12 layui-col-xs12" data-v="09" data-t="store"
+                            data-value="${d1.bankCard.id}">
+                            <div>结算卡图片</div>
+                            <div class="dlblock upload w300 h200 mt10">
+                                <input name="bankCard.imgUrl" value="${d1.bankCard.imgUrl}" hidden/>
+                                <img id="imgUrl2" src="${d1.bankCard.imgUrl}" referrer="no-referrer|origin|unsafe-url"
+                                     alt=""
+                                     onerror="this.src='${resourcePath }/images/error.jpg'"
+                                     width="300" height="200">
+                                <div class="cover"
+                                     style="background: rgba(0, 0, 0, 0.6);
+                                 height:200px;
+                                 width:300px;
+                                 position:absolute;
+                                 margin-top: -200px;
+                                 ">
+                                    <div style="margin-top: 90px;">
+                                        <div class="u-icon icon1" onclick="magnify('imgUrl2')">
+                                            <i class="layui-icon layui-icon-search"></i>
+                                        </div>
+                                        <div class="u-icon icon2 upload_icon">
+                                            <i class="layui-icon layui-icon-edit"></i>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </li>
+                    </c:if>
+                    <c:if test="${d1.settleTypeName == '法人对私非法人' || d1.settleTypeName == '非法人对私非法人' || d1.settleTypeName == '对私非法人'}">
+                        <li class="fl pt10 pb10 layui-col-md12 layui-col-sm12 layui-col-xs12" data-v="06" data-t="store"
+                            data-value="${d1.idcard.id}">
+                            <div>非法人授权函</div>
+                            <div class="dlblock upload w300 h200 mt10">
+                                <input name="certificateUrl" value="${d1.certificateUrl}" hidden/>
+                                <img id="picUrl7" src="${d1.certificateUrl}" alt=""
+                                     referrer="no-referrer|origin|unsafe-url"
+                                     onerror="this.src='${resourcePath }/images/error.jpg'"
+                                     width="300" height="200">
+                                <div class="cover"
+                                     style="background: rgba(0, 0, 0, 0.6);
+                                 height:200px;
+                                 width:300px;
+                                 position:absolute;
+                                 margin-top: -200px;
+                                ">
+                                    <div style="margin-top: 90px;">
+                                        <div class="u-icon icon1" onclick="magnify('picUrl7')">
+                                            <i class="layui-icon layui-icon-search"></i>
+                                        </div>
+                                        <div class="u-icon icon2 upload_icon">
+                                            <i class="layui-icon layui-icon-edit"></i>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </li>
+                    </c:if>
+                </ul>
+            </div>
+        </div>
+
+        <br/>
+        <div class="layui-form-item">
+            <div class="layui-input-block">
+                <button class="layui-btn" lay-submit lay-filter="formDemo4">保存-D1</button>
+            </div>
+        </div>
+    </form>
+</div>
+
+<div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
+    <blockquote class="layui-elem-quote layui-text" style="margin-top: 15px;">
+        <div>D0</div>
+        <div>
+            <span style="color: red;">${d0.settleTypeName}</span><span
+                class="red f12 ml20">(注：请保持银行卡信息(证件号码、开户名、卡号、预留手机号)的匹配性)</span>
+        </div>
+    </blockquote>
+    <form class="layui-form" id="form42" action="">
+        <input type="hidden" name="userId" value="${d0.userId}">
+        <input type="hidden" name="settleType" value="${d0.settleType}">
+        <input type="hidden" name="channelType" value="${d0.channelType}">
+        <input type="hidden" name="merchantCode" value="${merchantCode}"/>
+        <input type="hidden" name="bankCard.id" value="${d0.bankCard.id}"/>
+        <input type="hidden" name="bankCard.accountType" value="${d0.bankCard.accountType}"/>
+        <input type="hidden" name="bankCard.userId" value="${d0.bankCard.userId}"/>
+        <input type="hidden" name="idcard.userId" value="${d0.idcard.userId}"/>
+        <input type="hidden" name="idcard.userType" value="${d0.idcard.userType}"/>
+        <input type="hidden" name="idcard.certName" value="${d0.idcard.certName}"/>
+        <div class="layui-form-item" id="area22-picker22">
+            <div class="layui-col-md12" style="clear:both">
+                <div class="layui-inline">
+                    <div class="layui-form-label"><label for="bankProvince2">开户行地区</label></div>
+                    <div class="layui-input-inline">
+                        <select id="bankProvince22" class="province-selector" lay-search
+                                data-dom="bankCity22" name="bankCard.branchProvince"
+                                data-value=" " lay-filter="bankProvinceType2">
+                            <option value="">请选择省</option>
+                            <c:forEach items="${areaCitiesList}" var="acl">>
+                                <option value="${acl.areaName}"
+                                        <c:if test="${d0.bankCard.branchProvince eq acl.areaName }">selected</c:if>>${acl.areaName}
+                                </option>
+                            </c:forEach>
+                        </select>
+                    </div>
+                    <%--                <div class="layui-input-inline">--%>
+                    <%--                    <select id="bankCity2" class="city-selector" name="bankCard.branchCity"--%>
+                    <%--                            data-dom="bankArea2" data-value=""--%>
+                    <%--                            lay-filter="bankCityType2">--%>
+                    <%--                        <option value="${d0.bankCard.branchCity}">${d0.bankCard.branchCity}</option>--%>
+                    <%--                    </select>--%>
+                    <%--                </div>--%>
+
+                    <%--                <div class="layui-input-inline">--%>
+                    <%--                    <select id="bankArea2" name="bankCard.branchArea" class="county-selector"--%>
+                    <%--                            data-value=""--%>
+                    <%--                            lay-filter="bankCountyType2">--%>
+                    <%--                        <option value="${d0.bankCard.branchArea}">${d0.bankCard.branchArea}</option>--%>
+                    <%--                    </select>--%>
+                    <%--                </div>--%>
+                </div>
+            </div>
+
+            <div class="layui-col-md12" style="clear:both">
+                <div class="layui-inline">
+                    <div class="layui-form-label"></div>
+                    <div class="layui-input-inline">
+                        <select id="bankCity22" class="city-selector" name="bankCard.branchCity"
+                                data-dom="bankArea22" data-value="" lay-search
+                                lay-filter="bankCityType2">
+                            <option value="${d0.bankCard.branchCity}">${d0.bankCard.branchCity}</option>
+                        </select>
+                    </div>
+                </div>
+            </div>
+
+            <div class="layui-col-md12" style="clear:both">
+                <div class="layui-inline">
+                    <div class="layui-form-label"></div>
+
+                    <div class="layui-input-inline">
+                        <select id="bankArea22" name="bankCard.branchArea" class="county-selector"
+                                data-value="" lay-search
+                                lay-filter="bankCountyType2">
+                            <option value="${d0.bankCard.branchArea}">${d0.bankCard.branchArea}</option>
+                        </select>
+                    </div>
+                </div>
+            </div>
+
+            <div class="layui-col-md12" style="clear:both">
+                <div class="layui-inline">
+                    <div class="layui-form-label">开户银行</div>
+                    <div class="layui-input-inline">
+                        <select id="bankName22" name="bankCard.bankName"
+                                data-dom="bankBranch22" lay-search
+                                bank-city="bankCity22"
+                                data-value="" lay-filter="bankBranchType2">
+                            <option value="">选择银行</option>
+                            <option value="工商银行"
+                                    <c:if test='${d0.bankCard.bankName eq "工商银行" }'>selected</c:if>>工商银行
+                            </option>
+                            <option value="交通银行"
+                                    <c:if test='${d0.bankCard.bankName eq "交通银行" }'>selected</c:if>>交通银行
+                            </option>
+                            <option value="招商银行"
+                                    <c:if test='${d0.bankCard.bankName eq "招商银行" }'>selected</c:if>>招商银行
+                            </option>
+                            <option value="民生银行"
+                                    <c:if test='${d0.bankCard.bankName eq "民生银行" }'>selected</c:if>>民生银行
+                            </option>
+                            <option value="中信银行"
+                                    <c:if test='${d0.bankCard.bankName eq "中信银行" }'>selected</c:if>>中信银行
+                            </option>
+                            <option value="浦发银行"
+                                    <c:if test='${d0.bankCard.bankName eq "浦发银行" }'>selected</c:if>>浦发银行
+                            </option>
+                            <option value="兴业银行"
+                                    <c:if test='${d0.bankCard.bankName eq "兴业银行" }'>selected</c:if>>兴业银行
+                            </option>
+                            <option value="光大银行"
+                                    <c:if test='${d0.bankCard.bankName eq "光大银行" }'>selected</c:if>>光大银行
+                            </option>
+                            <option value="广发银行"
+                                    <c:if test='${d0.bankCard.bankName eq "广发银行" }'>selected</c:if>>广发银行
+                            </option>
+                            <option value="平安银行"
+                                    <c:if test='${d0.bankCard.bankName eq "平安银行" }'>selected</c:if>>平安银行
+                            </option>
+                            <option value="北京银行"
+                                    <c:if test='${d0.bankCard.bankName eq "北京银行" }'>selected</c:if>>北京银行
+                            </option>
+                            <option value="华夏银行"
+                                    <c:if test='${d0.bankCard.bankName eq "华夏银行" }'>selected</c:if>>华夏银行
+                            </option>
+                            <option value="农业银行"
+                                    <c:if test='${d0.bankCard.bankName eq "农业银行" }'>selected</c:if>>农业银行
+                            </option>
+                            <option value="建设银行"
+                                    <c:if test='${d0.bankCard.bankName eq "建设银行" }'>selected</c:if>>建设银行
+                            </option>
+                            <option value="邮政储蓄银行"
+                                    <c:if test='${d0.bankCard.bankName eq "邮政储蓄银行" }'>selected</c:if>>邮政储蓄银行
+                            </option>
+                            <option value="中国银行"
+                                    <c:if test='${d0.bankCard.bankName eq "中国银行" }'>selected</c:if>>中国银行
+                            </option>
+                            <option value="宁波银行"
+                                    <c:if test='${d0.bankCard.bankName eq "宁波银行" }'>selected</c:if>>宁波银行
+                            </option>
+                            <option value="其他银行"
+                                    <c:if test='${d0.bankCard.bankName eq "其他银行" }'>selected</c:if>>其他银行
+                            </option>
+                        </select>
+                    </div>
+                </div>
+            </div>
+
+            <div class="layui-col-md12" style="clear:both">
+                <div class="layui-inline">
+                    <div class="layui-form-label">开户支行</div>
+                    <div class="layui-input-inline" style="width: 272px;">
+                        <select id="bankBranch22" class="city-selector" name="bankCard.contactLine" lay-search
+                                data-value="" lay-filter="bankBranch22">
+                            <option value="${d0.bankCard.contactLine}">${d0.bankCard.branchName}</option>
+                        </select>
+                    </div>
+                </div>
+            </div>
+
+            <div class="layui-col-md12" style="clear:both">
+                <div class="layui-inline">
+                    <div class="layui-form-label">支行联行号</div>
+                    <div class="layui-input-inline">
+                        <input id="branchName2" name="bankCard.branchName" class="layui-input" type="hidden"
+                               value="${d1.bankCard.branchName}"
+                               readonly/>
+                        <input name="contactLine22" class="layui-input" type="text" value="${d0.bankCard.contactLine}"
+                               readonly/>
+                    </div>
+                </div>
+            </div>
+
+            <div class="layui-col-md12" style="clear:both">
+                <div class="layui-inline">
+                    <div class="layui-form-label">开户名</div>
+                    <div class="layui-input-inline">
+                        <input type="text" placeholder="开户名"
+                               class="layui-input" id="bankHolder"
+                               name="bankCard.bankHolder" value="${d0.bankCard.bankHolder}"/>
+                    </div>
+                </div>
+            </div>
+
+            <div class="layui-col-md12" style="clear:both">
+                <div class="layui-inline">
+                    <div class="layui-form-label">开户账号</div>
+                    <div class="layui-input-inline">
+                        <input type="text" placeholder="开户账号"
+                               class="layui-input" id="cardBankCard2"
+                               name="bankCard.bankCardNo" value="${d0.bankCard.bankCardNo}"/>
+                    </div>
+                </div>
+            </div>
+
+            <div class="layui-col-md12" style="clear:both">
+                <div class="layui-inline">
+                    <div class="layui-form-label">预留手机号</div>
+                    <div class="layui-input-inline">
+                        <input type="text" placeholder="预留手机号(对公账户不需要)"
+                               class="layui-input" id="cardPhone2" name="bankCard.phone"
+                               value="${d0.bankCard.phone}"/>
+                    </div>
+                </div>
+            </div>
+
+            <input type="hidden" name="idcard.certType" value="${d0.idcard.certType}"/>
+
+            <div class="layui-col-md12" style="clear:both">
+                <div class="layui-inline">
+                    <div class="layui-form-label">身份证号码</div>
+                    <div class="layui-input-inline">
+                        <input type="text" placeholder="身份证号码"
+                               class="layui-input" id="certNo2" name="idcard.certNo"
+                               value="${d0.idcard.certNo}"/>
+                    </div>
+                </div>
+            </div>
+
+            <div class="layui-col-md12" style="clear:both">
+                <div class="layui-inline">
+                    <div class="layui-form-label">发放日期</div>
+                    <div class="layui-input-inline">
+                        <input type="text" placeholder="身份证发放日期"
+                               class="layui-input" name="idcard.certStartTime"
+                               value="${d0.idcard.certStartTime}"/>
+                    </div>
+                </div>
+            </div>
+
+            <div class="layui-col-md12" style="clear:both">
+                <div class="layui-inline">
+                    <div class="layui-form-label">失效日期</div>
+                    <div class="layui-input-inline">
+                        <input type="text" placeholder="身份证失效日期"
+                               class="layui-input" name="idcard.certEndTime"
+                               value="${d0.idcard.certEndTime}"/>
+                    </div>
+                </div>
+            </div>
+
+            <div class="layui-col-md12" style="clear:both">
+                <ul>
+                    <li class="fl pt10 pb10 layui-col-md12 layui-col-sm12 layui-col-xs12" data-v="06" data-t="store"
+                        data-value="${d0.idcard.id}">
+                        <div>身份证正面</div>
+                        <div class="dlblock upload w300 h200 mt10">
+                            <input name="idcard.imgPositive" value="${d0.idcard.imgPositive}" hidden/>
+                            <img id="imgPositive12" src="${d0.idcard.imgPositive}"
+                                 referrer="no-referrer|origin|unsafe-url" alt=""
+                                 onerror="this.src='${resourcePath }/images/error.jpg'"
+                                 width="300" height="200">
+                            <div class="cover"
+                                 style="background: rgba(0, 0, 0, 0.6);
+                                 height:200px;
+                                 width:300px;
+                                 position:absolute;
+                                 margin-top: -200px;
+                                 ">
+                                <div style="margin-top: 90px;">
+                                    <div class="u-icon icon1" onclick="magnify('imgPositive12')"><i
+                                            class="layui-icon layui-icon-search"></i></div>
+                                    <div class="u-icon icon2 upload_icon"><i class="layui-icon layui-icon-edit"></i>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </li>
+                    <li class="fl pt10 pb10  layui-col-md12 layui-col-sm12 layui-col-xs12" data-v="08" data-t="store"
+                        data-value="${d0.idcard.id}">
+                        <div>身份证反面</div>
+                        <div class="dlblock upload w300 h200 mt10">
+                            <input name="idcard.imgNegative" value="${d0.idcard.imgNegative}" hidden/>
+                            <img id="imgNegative22" src="${d0.idcard.imgNegative}" alt=""
+                                 onerror="this.src='${resourcePath }/images/error.jpg'"
+                                 width="300" height="200">
+                            <div class="cover"
+                                 style="background: rgba(0, 0, 0, 0.6);
+                                 height:200px;
+                                 width:300px;
+                                 position:absolute;
+                                 margin-top: -200px;
+                                 ">
+                                <div style="margin-top: 90px;">
+                                    <div class="u-icon icon1" onclick="magnify('imgNegative22')">
+                                        <i class="layui-icon layui-icon-search"></i>
+                                    </div>
+                                    <div class="u-icon icon2 upload_icon">
+                                        <i class="layui-icon layui-icon-edit"></i>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </li>
+                    <c:if test="${d0.settleTypeName eq '对公'}">
+                        <li class="fl pt10 pb10 layui-col-md12 layui-col-sm12 layui-col-xs12" data-v="09" data-t="store"
+                            data-value="${d0.bankCard.id}">
+                            <div>开户许可证</div>
+                            <div class="dlblock upload w300 h200 mt10">
+                                <input name="bankCard.licenseUrl" value="${d0.bankCard.licenseUrl}" hidden/>
+                                <img id="imgUrl22" src="${d0.bankCard.licenseUrl}"
+                                     referrer="no-referrer|origin|unsafe-url" alt=""
+                                     onerror="this.src='${resourcePath }/images/error.jpg'"
+                                     width="300" height="200">
+                                <div class="cover"
+                                     style="background: rgba(0, 0, 0, 0.6);
+                                 height:200px;
+                                 width:300px;
+                                 position:absolute;
+                                 margin-top: -200px;
+                                 ">
+                                    <div style="margin-top: 90px;">
+                                        <div class="u-icon icon1" onclick="magnify('imgUrl22')">
+                                            <i class="layui-icon layui-icon-search"></i>
+                                        </div>
+                                        <div class="u-icon icon2 upload_icon">
+                                            <i class="layui-icon layui-icon-edit"></i>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </li>
+                    </c:if>
+                    <c:if test="${d0.settleTypeName ne '对公'}">
+                        <li class="fl pt10 pb10 layui-col-md12 layui-col-sm12 layui-col-xs12" data-v="09" data-t="store"
+                            data-value="${d0.bankCard.id}">
+                            <div>结算卡图片</div>
+                            <div class="dlblock upload w300 h200 mt10">
+                                <input name="bankCard.imgUrl" value="${d0.bankCard.imgUrl}" hidden/>
+                                <img id="imgUrl22" src="${d0.bankCard.imgUrl}" referrer="no-referrer|origin|unsafe-url"
+                                     onerror="this.src='${resourcePath }/images/error.jpg'" alt=""
+                                     width="300" height="200">
+                                <div class="cover"
+                                     style="background: rgba(0, 0, 0, 0.6);
+                                 height:200px;
+                                 width:300px;
+                                 position:absolute;
+                                 margin-top: -200px;
+                                 ">
+                                    <div style="margin-top: 90px;">
+                                        <div class="u-icon icon1" onclick="magnify('imgUrl22')">
+                                            <i class="layui-icon layui-icon-search"></i>
+                                        </div>
+                                        <div class="u-icon icon2 upload_icon">
+                                            <i class="layui-icon layui-icon-edit"></i>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </li>
+                    </c:if>
+                    <c:if test="${d0.settleTypeName == '法人对私非法人' || d0.settleTypeName == '非法人对私非法人' || d0.settleTypeName == '对私非法人'}">
+                        <li class="fl pt10 pb10 layui-col-md12 layui-col-sm12 layui-col-xs12" data-v="06" data-t="store"
+                            data-value="${d0.idcard.id}">
+                            <div>非法人授权函</div>
+                            <div class="dlblock upload w300 h200 mt10">
+                                <input name="certificateUrl" value="${d0.certificateUrl}" hidden/>
+                                <img id="picUrl72" src="${d0.certificateUrl}"
+                                     referrer="no-referrer|origin|unsafe-url" alt=""
+                                     onerror="this.src='${resourcePath }/images/error.jpg'"
+                                     width="300" height="200">
+                                <div class="cover"
+                                     style="background: rgba(0, 0, 0, 0.6);
+                                 height:200px;
+                                 width:300px;
+                                 position:absolute;
+                                 margin-top: -200px;">
+                                    <div style="margin-top: 90px;">
+                                        <div class="u-icon icon1" onclick="magnify('picUrl72')">
+                                            <i class="layui-icon layui-icon-search"></i>
+                                        </div>
+                                        <div class="u-icon icon2 upload_icon">
+                                            <i class="layui-icon layui-icon-edit"></i>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </li>
+                    </c:if>
+                </ul>
+            </div>
+        </div>
+
+        <br/>
+        <div class="layui-form-item">
+            <div class="layui-input-block">
+                <button class="layui-btn" lay-submit lay-filter="formDemo4">保存-D0</button>
+            </div>
+        </div>
+    </form>
+</div>
+
+<div class="layui-col-md12" style="clear:both">
+    <blockquote class="layui-elem-quote layui-text" style="margin-top: 15px;">
+        <span>认证信息</span>
+    </blockquote>
+
+    <form class="layui-form" id="form43" action="">
+        <input type="hidden" name="merchantCode" value="${merchantCode}"/>
+        <div class="layui-form-item">
+            <ul>
+                <li class="fl pt10 pb10 layui-col-md6 layui-col-xs12 layui-col-sm6" data-v="999" data-t="store">
+                    <div>结算人与收银台合照</div>
+                    <div class="dlblock upload w300 h200 mt10">
+                        <input name="picUrl999" value="${merchantImage999}" hidden/>
+                        <img id="picUrl999" src="${merchantImage999}" alt=""
+                             onerror="this.src='${resourcePath}/images/error.jpg'"
+                             width="300" height="200">
+                        <div class="cover"
+                             style="background: rgba(0, 0, 0, 0.6);
+                                 height:200px;
+                                 width:300px;
+                                 position:absolute;
+                                 margin-top: -200px;
+                                ">
+                            <div style="margin-top: 90px;">
+                                <div class="u-icon icon1" onclick="magnify('picUrl999')">
+                                    <i class="layui-icon layui-icon-search"></i>
+                                </div>
+                                <div class="u-icon icon2 upload_icon">
+                                    <i class="layui-icon layui-icon-edit"></i>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </li>
+
+                <li class="fl pt10 pb10 layui-col-md6 layui-col-xs12 layui-col-sm6" data-v="11" data-t="store">
+                    <div>结算人手持身份证照</div>
+                    <div class="dlblock upload w300 h200 mt10">
+                        <input name="picUrl11" value="${merchantImage11}" hidden/>
+                        <img id="picUrl11" src="${merchantImage11}" alt=""
+                             onerror="this.src='${resourcePath }/images/error.jpg'"
+                             width="300" height="200">
+                        <div class="cover"
+                             style="background: rgba(0, 0, 0, 0.6);
+                                     height:200px;
+                                     width:300px;
+                                     position:absolute;
+                                     margin-top: -200px;
+                                    ">
+                            <div style="margin-top: 90px;">
+                                <div class="u-icon icon1" onclick="magnify('picUrl11')">
+                                    <i class="layui-icon layui-icon-search"></i>
+                                </div>
+                                <div class="u-icon icon2 upload_icon">
+                                    <i class="layui-icon layui-icon-edit"></i>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </li>
+            </ul>
+        </div>
+
+        <br/>
+        <div class="layui-form-item">
+            <div class="layui-input-block">
+                <button class="layui-btn" lay-submit lay-filter="formDemo4">保存认证信息</button>
+            </div>
+        </div>
+    </form>
+</div>
+
+<script>
+
+    $(function () {
+        form.render();
+
+        settlementLoading = 1;
+        baseSet()
+    });
+
+    form.on('select(bankProvinceType2)', funcCityByName);
+
+    form.on('select(bankCityType2)', funcDistrictByName);
+
+    form.on('select(bankBranchType2)', funcBranchByBank);
+
+    form.on('select(bankBranch2)', function (data) {
+        $('#contactLine2').val(data.value)
+        $('#branchName').val($(data.elem).find('option:selected').text())
+    });
+
+    form.on('select(bankBranch22)', function (data) {
+        $('#contactLine22').val(data.value)
+        $('#branchName2').val($(data.elem).find('option:selected').text())
+    });
+
+    //更改结算信息
+    form.on('submit(formDemo4)', function (data) {
+        var index = layer.load(1, {shade: [0.1, '#000']});
+        $.ajax({
+            url: ctx + '/promoter/updateMerchantSettlement2',
+            method: 'post',
+            data: data.field,
+            dataType: 'JSON',
+            success: function (res) {
+                layer.close(index);
+                if (res.code == 200) {
+                    layer.msg(res.message, {
+                        icon: 1
+                    });
+                } else {
+                    layer.msg(res.message, {
+                        icon: 5
+                    });
+                }
+            }
+        })
+        return false;
+    });
+
+</script>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/promoter/userAppBaseInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/promoter/userAppBaseInfo.jsp
new file mode 100644
index 0000000..8eae1d0
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/promoter/userAppBaseInfo.jsp
@@ -0,0 +1,1839 @@
+<!DOCTYPE html>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html lang="zh">
+<head>
+    <meta charset="utf-8">
+    <meta name="referrer" content="no-referrer">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+    <script type="text/javascript">
+        require("promoter/userAppList.js");
+    </script>
+    <style>
+        .layui-input, .layui-textarea {
+            border-radius: 6px;
+            height: 34px;
+        }
+
+        .layui-form-label {
+            padding: 9px 7px;
+            width: 100px;
+        }
+
+        .u-icon {
+            display: inline-block;
+            margin: 10px;
+            background: #fff;
+            color: dodgerblue;
+            width: 30px;
+            height: 30px;
+            text-align: center;
+            border-radius: 50%;
+            margin-top: -40px;
+            cursor: pointer;
+        }
+
+        .u-icon i {
+            margin-top: 7px;
+            display: block;
+        }
+
+        .cover {
+            display: none;
+        }
+
+        .dlblock:hover .cover {
+            display: block;
+        }
+
+        /*.textr{
+            text-align:left;
+        }*/
+
+
+    </style>
+</head>
+<body>
+<div class="layui-col-md8 pl20">
+    <form class="layui-form" id="form1" action="">
+        <blockquote class="layui-elem-quote layui-text" style="margin-top: 15px;">
+            推广员基本信息
+        </blockquote>
+        <input type="hidden" id="status" name="status" value="${userAppInfo.status}"/>
+        <input type="hidden" id="id" name="id" value="${userAppInfo.id}"/>
+        <input type="hidden" id="merchantCode" name="merchantCode" value="${userAppInfo.merchantCode}"/>
+        <input type="hidden" name="userId" value="${userAppInfo.userId}"/>
+        <div class="layui-form-item">
+            <div class="layui-inline">
+                <label class="layui-form-label">推广员名称</label>
+                <div class="layui-input-inline">
+                    <input type="text" placeholder="推广员名称"
+                           class="layui-input" value="${userAppInfo.userName}"
+                           id="userName" name="userName"/>
+                </div>
+            </div>
+            <div class="layui-inline">
+                <label class="layui-form-label">登录账号</label>
+                <div class="layui-input-inline">
+                    <input type="text" placeholder="推广员登录账号"
+                           class="layui-input" value="${userAppInfo.loginName}"
+                           id="loginName" name="loginName"/>
+                </div>
+            </div>
+        </div>
+        <c:if test="${userAppInfo.status == 3 || userAppInfo.status == 2 || userAppInfo.status == 1}">
+            <input type="hidden" id="idCard" name="idCard.userId" value="${userAppInfo.userId}"/>
+            <input type="hidden" id="bankCardId" name="bankCard.userId" value="${userAppInfo.userId}"/>
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <label class="layui-form-label">身份证号</label>
+                    <div class="layui-input-inline">
+                        <input type="text" placeholder="推广员名称"
+                               class="layui-input" value="${userAppInfo.idCard.certNo}"
+                               name="idCard.certNo"/>
+                    </div>
+                </div>
+            </div>
+
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <label class="layui-form-label">发放日期</label>
+                    <div class="layui-input-inline">
+                        <input type="text" placeholder="身份证发放日期"
+                               class="layui-input" value="${userAppInfo.idCard.certStartTime}"
+                               name="idCard.certStartTime"/>
+                    </div>
+                </div>
+
+                <div class="layui-inline">
+                    <label class="layui-form-label">失效日期</label>
+                    <div class="layui-input-inline">
+                        <input type="text" placeholder="身份证发放日期"
+                               class="layui-input" value="${userAppInfo.idCard.certEndTime}"
+                               name="idCard.certEndTime"/>
+                    </div>
+                </div>
+            </div>
+
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <label class="layui-form-label">银行卡号</label>
+                    <div class="layui-input-inline">
+                        <input type="text" placeholder="银行卡号"
+                               class="layui-input" value="${userAppInfo.bankCard.bankCardNo}"
+                               name="bankCard.bankCardNo"/>
+                    </div>
+                </div>
+
+                <div class="layui-inline">
+                    <label class="layui-form-label">预留手机号</label>
+                    <div class="layui-input-inline">
+                        <input type="text" placeholder="身份证发放日期"
+                               class="layui-input" value="${userAppInfo.bankCard.phone}"
+                               name="bankCard.phone"/>
+                    </div>
+                </div>
+            </div>
+
+            <div class="layui-form-item" id="area2-picker">
+                <div class="layui-form-label">开户行地区</div>
+                <div class="layui-input-inline">
+                    <select id="bankProvince" class="province-selector"
+                            data-dom="bankCity" name="bankCard.branchProvince"
+                            data-value=" " lay-filter="bankProvinceType">
+                        <option value="">请选择省</option>
+                        <c:forEach items="${areaCitiesList}" var="acl">>
+                            <option value="${acl.areaCode}"
+                                    <c:if test="${userAppInfo.bankCard.branchProvince eq acl.areaName }">selected</c:if>>${acl.areaName}
+                            </option>
+                        </c:forEach>
+                    </select>
+                </div>
+                <div class="layui-input-inline">
+                    <select id="bankCity" class="city-selector" name="bankCard.branchCity"
+                            data-dom="bankArea" data-value=""
+                            lay-filter="bankBranType">
+                        <option value="${userAppInfo.bankCard.branchCity}">${userAppInfo.bankCard.branchCity}</option>
+                    </select>
+                </div>
+                <div class="layui-input-inline">
+                    <select id="bankArea" name="bankCard.branchArea" class="county-selector"
+                            data-value=""
+                            lay-filter="bankCountyType">
+                        <option value="${userAppInfo.bankCard.branchArea}">${userAppInfo.bankCard.branchArea}</option>
+                    </select>
+                </div>
+            </div>
+
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <div class="layui-form-label">开户银行</div>
+                    <div class="layui-input-inline">
+                        <select id="bankName" name="bankCard.bankName"
+                                data-dom="bankBranch"
+                                data-value=" " lay-filter="bankBranchType">
+                            <option value="">选择银行</option>
+                            <option value="工商银行"
+                                    <c:if test='${userAppInfo.bankCard.bankName eq "工商银行" }'>selected</c:if>>工商银行
+                            </option>
+                            <option value="交通银行"
+                                    <c:if test='${userAppInfo.bankCard.bankName eq "交通银行" }'>selected</c:if>>交通银行
+                            </option>
+                            <option value="招商银行"
+                                    <c:if test='${userAppInfo.bankCard.bankName eq "招商银行" }'>selected</c:if>>招商银行
+                            </option>
+                            <option value="民生银行"
+                                    <c:if test='${userAppInfo.bankCard.bankName eq "民生银行" }'>selected</c:if>>民生银行
+                            </option>
+                            <option value="中信银行"
+                                    <c:if test='${userAppInfo.bankCard.bankName eq "中信银行" }'>selected</c:if>>中信银行
+                            </option>
+                            <option value="浦发银行"
+                                    <c:if test='${userAppInfo.bankCard.bankName eq "浦发银行" }'>selected</c:if>>浦发银行
+                            </option>
+                            <option value="兴业银行"
+                                    <c:if test='${userAppInfo.bankCard.bankName eq "兴业银行" }'>selected</c:if>>兴业银行
+                            </option>
+                            <option value="光大银行"
+                                    <c:if test='${userAppInfo.bankCard.bankName eq "光大银行" }'>selected</c:if>>光大银行
+                            </option>
+                            <option value="广发银行"
+                                    <c:if test='${userAppInfo.bankCard.bankName eq "广发银行" }'>selected</c:if>>广发银行
+                            </option>
+                            <option value="平安银行"
+                                    <c:if test='${userAppInfo.bankCard.bankName eq "平安银行" }'>selected</c:if>>平安银行
+                            </option>
+                            <option value="北京银行"
+                                    <c:if test='${userAppInfo.bankCard.bankName eq "北京银行" }'>selected</c:if>>北京银行
+                            </option>
+                            <option value="华夏银行"
+                                    <c:if test='${userAppInfo.bankCard.bankName eq "华夏银行" }'>selected</c:if>>华夏银行
+                            </option>
+                            <option value="农业银行"
+                                    <c:if test='${userAppInfo.bankCard.bankName eq "农业银行" }'>selected</c:if>>农业银行
+                            </option>
+                            <option value="建设银行"
+                                    <c:if test='${userAppInfo.bankCard.bankName eq "建设银行" }'>selected</c:if>>建设银行
+                            </option>
+                            <option value="邮政储蓄银行"
+                                    <c:if test='${userAppInfo.bankCard.bankName eq "邮政储蓄银行" }'>selected</c:if>>
+                                邮政储蓄银行
+                            </option>
+                            <option value="中国银行"
+                                    <c:if test='${userAppInfo.bankCard.bankName eq "中国银行" }'>selected</c:if>>中国银行
+                            </option>
+                            <option value="宁波银行"
+                                    <c:if test='${userAppInfo.bankCard.bankName eq "宁波银行" }'>selected</c:if>>宁波银行
+                            </option>
+                        </select>
+                    </div>
+                </div>
+
+                <div class="layui-inline">
+                    <div class="layui-form-label">开户支行</div>
+                    <div class="layui-input-inline" style="width: 250px;">
+                        <select id="bankBranch" class="city-selector" name="bankCard.branchName"
+                                data-value=""
+                                lay-filter="bankBranch">
+                            <option value="${userAppInfo.bankCard.branchName}">${userAppInfo.bankCard.branchName}</option>
+                        </select>
+                    </div>
+                </div>
+            </div>
+
+            <div class="pd10 textl pl50 fw800 f16 bdbe ch">
+                实名认证信息：<span class="red f12 ml20"></span>
+            </div>
+            <div class="clearfix textc bdbe" id="picContent">
+                <ul class="layui-col-md10">
+                    <li class="fl pt10 pb10 wp25" data-v="01" data-t="auth" data-value="${userAppInfo.idCard.id}">
+                        <div>身份证正面</div>
+                        <div class="dlblock w200 h200 mt10 upload">
+                            <input name="idCard.imgPositive" value="" hidden/>
+                            <img id="idCard1" onmouseover="showImg(this)" onmouseout="hideImg(this)"
+                                 src="${userAppInfo.idCard.imgPositive}"
+                                 onerror="this.src='${resourcePath }/images/error.jpg'"
+                                 width="200" height="200" class="img-card">
+                            <div class="cover"
+                                 style="background: rgba(0, 0, 0, 0.6);
+                                 height:200px;
+                                 width:200px;
+                                 position:absolute;
+                                 margin-top: -200px;
+                                 ">
+                                <div style="margin-top: 90px;">
+                                    <div class="u-icon icon1" onclick="magnify('idCard1')">
+                                        <i class="layui-icon layui-icon-search"></i>
+                                    </div>
+                                    <div class="u-icon icon2 upload_icon">
+                                        <i class="layui-icon layui-icon-edit"></i>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </li>
+                    <li class="fl pt10 pb10 wp25" data-v="02" data-t="auth" data-value="${userAppInfo.idCard.id}">
+                        <div>身份证反面</div>
+                        <div class="dlblock upload w200 h200 mt10">
+                            <input name="idCard.imgNegative" value="" hidden/>
+                            <img id="idCard2" src="${userAppInfo.idCard.imgNegative}"
+                                 onerror="this.src='${resourcePath }/images/error.jpg'"
+                                 width="200" height="200"/>
+                            <div class="cover"
+                                 style="background: rgba(0, 0, 0, 0.6);
+                                 height:200px;
+                                 width:200px;
+                                 position:absolute;
+                                 margin-top: -200px;
+                                 ">
+                                <div style="margin-top: 90px;">
+                                    <div class="u-icon icon1" onclick="magnify('idCard2')">
+                                        <i class="layui-icon layui-icon-search"></i>
+                                    </div>
+                                    <div class="u-icon icon2 upload_icon">
+                                        <i class="layui-icon layui-icon-edit"></i>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </li>
+                    <li class="fl pt10 pb10 wp25" data-v="04" data-t="auth" data-value="${userAppInfo.bankCard.id}">
+                        <div>银行卡照片</div>
+                        <div class="dlblock upload w200 h200 mt10">
+                            <input name="bankCard.imgUrl" value="" hidden/>
+                            <img id="imgUrl1" src="${userAppInfo.bankCard.imgUrl}"
+                                 onerror="this.src='${resourcePath }/images/error.jpg'"
+                                 width="200" height="200"/>
+                            <div class="cover"
+                                 style="background: rgba(0, 0, 0, 0.6);
+                                 height:200px;
+                                 width:200px;
+                                 position:absolute;
+                                 margin-top: -200px;
+                                 ">
+                                <div style="margin-top: 90px;">
+                                    <div class="u-icon icon1" onclick="magnify('imgUrl1')">
+                                        <i class="layui-icon layui-icon-search"></i>
+                                    </div>
+                                    <div class="u-icon icon2 upload_icon">
+                                        <i class="layui-icon layui-icon-edit"></i>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </li>
+                </ul>
+            </div>
+            <br/>
+        </c:if>
+        <div class="layui-form-item">
+            <div class="layui-input-block">
+                <button class="layui-btn" lay-submit lay-filter="formDemo1">立即提交</button>
+            </div>
+        </div>
+        <div id="uploadLoadingDiv" style="display: none;">
+            <div class="layui-progress" lay-showpercent="true" lay-filter="js_upload_progress"
+                 style="margin: 10px;margin-top: 20px;">
+                <div class="layui-progress-bar layui-bg-red" lay-percent="0%"></div>
+            </div>
+        </div>
+    </form>
+
+    <c:if test="${not empty userAppInfo.merchantBaseInfo}">
+        <form class="layui-form" id="form2" action="">
+            <blockquote class="layui-elem-quote layui-text" style="margin-top: 15px;">
+                商户信息
+            </blockquote>
+            <input type="hidden" name="userId" value="${userAppInfo.userId}"/>
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <div class="layui-form-label">商户名称</div>
+                    <div class="layui-input-inline">
+                        <input type="text" placeholder="和营业执照保持一致"
+                               class="layui-input"
+                               value="${userAppInfo.merchantBaseInfo.merchantName }" id="updateMerchantName"
+                               name="merchantBaseInfo.merchantName"/>
+                    </div>
+                </div>
+
+                <div class="layui-inline">
+                    <div class="layui-form-label">商户类型</div>
+                    <div class="layui-input-inline">
+                        <c:if test="${ userAppInfo.merchantBaseInfo.merchantType=='1'}">
+                            <input type="text" readonly="readonly"
+                                   class="layui-input"
+                                   value="小微" id="upateRegistName1"/>
+                        </c:if>
+                        <c:if test="${ userAppInfo.merchantBaseInfo.merchantType=='2'}">
+                            <input type="text" readonly="readonly"
+                                   class="layui-input"
+                                   value="个体" id="upateRegistName2"/>
+                        </c:if>
+                        <c:if test="${ userAppInfo.merchantBaseInfo.merchantType=='3'}">
+                            <input type="text" readonly="readonly"
+                                   class="layui-input"
+                                   value="企业" id="upateRegistName3"/>
+                        </c:if>
+                    </div>
+                </div>
+            </div>
+
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <div class="layui-form-label">商户简称</div>
+                    <div class="layui-input-inline">
+                        <input type="text" placeholder="商户简称"
+                               class="layui-input"
+                               value="${userAppInfo.merchantBaseInfo.alias }"
+                               name="merchantBaseInfo.alias"/>
+                    </div>
+                </div>
+
+                <div class="layui-inline">
+                    <div class="layui-form-label">商户联系人</div>
+                    <div class="layui-input-inline">
+                        <input type="text" placeholder="联系人姓名"
+                               class="layui-input" id="updateContactName"
+                               value="${userAppInfo.merchantBaseInfo.contactName }"
+                               name="merchantBaseInfo.contactName"/>
+                    </div>
+                </div>
+            </div>
+
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <div class="layui-form-label">联系人邮箱</div>
+                    <div class="layui-input-inline">
+                        <input type="text" placeholder="联系人邮箱(作为登录名)"
+                               class="layui-input"
+                               value="${userAppInfo.merchantBaseInfo.email }"
+                               name="merchantBaseInfo.email"/>
+                    </div>
+                </div>
+
+                <div class="layui-inline">
+                    <div class="layui-form-label">联系人电话</div>
+                    <div class="layui-input-inline">
+                        <input type="text" placeholder="联系人电话(作为登录名)"
+                               class="layui-input" id="updateContactMobile"
+                               value="${userAppInfo.merchantBaseInfo.contactMobile }"
+                               name="merchantBaseInfo.contactMobile"/>
+                    </div>
+                </div>
+            </div>
+
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <div class="layui-form-label">支付宝账号</div>
+                    <div class="layui-input-inline">
+                        <input type="text" placeholder="支付宝账号"
+                               class="layui-input" id="updateServicealiAccount"
+                               value="${userAppInfo.merchantBaseInfo.aliAccount }"
+                               name="merchantBaseInfo.aliAccount"/>
+                    </div>
+                </div>
+            </div>
+
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <div class="layui-form-label">经营类目</div>
+                    <div class="layui-input-inline" style="width: 300px;">
+                        <select name="merchantBaseInfo.mcc" id="mccCode" lay-search>
+                            <option value=""></option>
+                            <c:forEach items="${mccList}" var="mcc">
+                                <option value="${mcc.fMccCode}" ${checkMcc.fMccCode == mcc.fMccCode ? 'selected' : ''}>${mcc.fMccTxt}[${mcc.fMccCode}]</option>
+                            </c:forEach>
+                        </select>
+                    </div>
+                </div>
+            </div>
+
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <div class="layui-form-label">商户地址</div>
+                    <div class="layui-input-inline">
+                        <select id="province" name="merchantBaseInfo.province" class="province-selector"
+                                data-dom="city"
+                                data-value=" " lay-filter="provinceType">
+                            <option value="">请选择省</option>
+                            <c:forEach items="${areaCitiesList}" var="acl">>
+                                <option value="${acl.areaCode}"
+                                        <c:if test="${userAppInfo.merchantBaseInfo.province eq acl.areaName }">selected</c:if>>${acl.areaName}
+                                </option>
+                            </c:forEach>
+                        </select>
+                    </div>
+
+                    <div class="layui-input-inline">
+                        <select id="city" name="merchantBaseInfo.city" class="city-selector"
+                                data-dom="county" data-value=""
+                                lay-filter="cityType">
+                            <option value="${userAppInfo.merchantBaseInfo.city}">${userAppInfo.merchantBaseInfo.city}</option>
+                        </select>
+                    </div>
+
+                    <div class="layui-input-inline">
+                        <select id="county" name="merchantBaseInfo.district" class="county-selector"
+                                data-value=""
+                                lay-filter="countyType">
+                            <option value="${userAppInfo.merchantBaseInfo.district}">${userAppInfo.merchantBaseInfo.district}</option>
+                        </select>
+                    </div>
+                </div>
+            </div>
+
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <div class="layui-form-label">详细地址</div>
+                    <div class="layui-input-inline" style="width: 300px;">
+                        <input type="text" placeholder="详细地址:不含省市区县字样"
+                               class="layui-input"
+                               id="updateAddress" name="merchantBaseInfo.address"
+                               value="${userAppInfo.merchantBaseInfo.address }"/>
+                    </div>
+                </div>
+            </div>
+
+            <div class="pd10 textl pl50 pb20 fw800 f16 pb20 bdbe mb20 pt20 ch">
+                门店照片信息：<span class="red f12 ml20"></span>
+            </div>
+            <input type="hidden" name="merchantCode" value="${userAppInfo.merchantCode}"/>
+            <div class="clearfix textc bdbe ">
+                <ul class="layui-col-md10">
+                    <li class="fl pt10 pb10 wp25" data-v="06" data-t="store">
+                        <div>门头照</div>
+                        <div class="dlblock upload w200 h200 mt10">
+                            <input name="picUrl6" hidden/>
+                            <img id="picUrl6" src="${merchantImage6}"
+                                 onerror="this.src='${resourcePath }/images/error.jpg'"
+                                 width="200" height="200">
+                            <div class="cover"
+                                 style="background: rgba(0, 0, 0, 0.6);
+                                 height:200px;
+                                 width:200px;
+                                 position:absolute;
+                                 margin-top: -200px;
+                                 ">
+                                <div style="margin-top: 90px;">
+                                    <div class="u-icon icon1" onclick="magnify('picUrl6')">
+                                        <i class="layui-icon layui-icon-search"></i>
+                                    </div>
+                                    <div class="u-icon icon2 upload_icon">
+                                        <i class="layui-icon layui-icon-edit"></i>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </li>
+                    <li class="fl pt10 pb10 wp25" data-v="08" data-t="store">
+                        <div>收银台照</div>
+                        <div class="dlblock upload w200 h200 mt10">
+                            <input name="picUrl8" hidden/>
+                            <img id="picUrl8" src="${merchantImage8}"
+                                 onerror="this.src='${resourcePath }/images/error.jpg'"
+                                 width="200" height="200"/>
+                            <div class="cover"
+                                 style="background: rgba(0, 0, 0, 0.6);
+                                 height:200px;
+                                 width:200px;
+                                 position:absolute;
+                                 margin-top: -200px;
+                                 ">
+                                <div style="margin-top: 90px;">
+                                    <div class="u-icon icon1" onclick="magnify('picUrl8')">
+                                        <i class="layui-icon layui-icon-search"></i>
+                                    </div>
+                                    <div class="u-icon icon2 upload_icon">
+                                        <i class="layui-icon layui-icon-edit"></i>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </li>
+                    <li class="fl pt10 pb10 wp25" data-v="09" data-t="store">
+                        <div>门店内场景照</div>
+                        <div class="dlblock upload w200 h200 mt10">
+                            <input name="picUrl9" hidden/>
+                            <c:if test="${not empty merchantImage8 }">
+                                <img id="picUrl9" src="${merchantImage9}"
+                                     onerror="this.src='${resourcePath }/images/error.jpg'"
+                                     width="200" height="200"/>
+                                <div class="cover"
+                                     style="background: rgba(0, 0, 0, 0.6);
+                                height:200px;
+                                width:200px;
+                                position:absolute;
+                                margin-top: -200px;
+                                ">
+                                    <div style="margin-top: 90px;">
+                                        <div class="u-icon icon1" onclick="magnify('picUrl9')">
+                                            <i class="layui-icon layui-icon-search"></i>
+                                        </div>
+                                        <div class="u-icon icon2 upload_icon">
+                                            <i class="layui-icon layui-icon-edit"></i>
+                                        </div>
+                                    </div>
+                                </div>
+                            </c:if>
+                        </div>
+                    </li>
+                </ul>
+            </div>
+            <div class="clearfix textc bdbe ">
+                <ul class="layui-col-md10">
+                    <li class="fl pt10 pb10 wp25" data-v="101" data-t="store">
+                        <div>商户协议</div>
+                        <div class="dlblock upload w200 h200 mt10">
+                            <input name="picUrl101" hidden/>
+                            <img id="picUrl101" src="${merchantImage101}"
+                                 onerror="this.src='${resourcePath }/images/error.jpg'"
+                                 width="200" height="200">
+                            <div class="cover"
+                                 style="background: rgba(0, 0, 0, 0.6);
+                                 height:200px;
+                                 width:200px;
+                                 position:absolute;
+                                 margin-top: -200px;
+                                 ">
+                                <div style="margin-top: 90px;">
+                                    <div class="u-icon icon1" onclick="magnify('picUrl101')">
+                                        <i class="layui-icon layui-icon-search"></i>
+                                    </div>
+                                    <div class="u-icon icon2 upload_icon">
+                                        <i class="layui-icon layui-icon-edit"></i>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </li>
+
+                    <li class="fl pt10 pb10 wp25" data-v="102" data-t="store">
+                        <div>商户附属协议</div>
+                        <div class="dlblock upload w200 h200 mt10">
+                            <input name="picUrl102" hidden/>
+                            <img id="picUrl102" src="${merchantImage102}"
+                                 onerror="this.src='${resourcePath }/images/error.jpg'"
+                                 width="200" height="200">
+                            <div class="cover"
+                                 style="background: rgba(0, 0, 0, 0.6);
+                                 height:200px;
+                                 width:200px;
+                                 position:absolute;
+                                 margin-top: -200px;
+                                 ">
+                                <div style="margin-top: 90px;">
+                                    <div class="u-icon icon1" onclick="magnify('picUrl102')">
+                                        <i class="layui-icon layui-icon-search"></i>
+                                    </div>
+                                    <div class="u-icon icon2 upload_icon">
+                                        <i class="layui-icon layui-icon-edit"></i>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </li>
+                </ul>
+            </div>
+
+            <br/>
+            <div class="layui-form-item">
+                <div class="layui-input-block">
+                    <button class="layui-btn" lay-submit lay-filter="formDemo2">立即提交</button>
+                </div>
+            </div>
+        </form>
+    </c:if>
+
+    <c:if test="${not empty userAppInfo.merchantBaseInfo && userAppInfo.merchantBaseInfo.merchantType ne 1}">
+        <form class="layui-form" id="form3" action="">
+            <blockquote class="layui-elem-quote layui-text" style="margin-top: 15px;">
+                营业执照信息
+            </blockquote>
+            <input type="hidden" name="userId" value="${userAppInfo.userId}"/>
+            <input type="hidden" name="merchantCode" value="${userAppInfo.merchantCode}"/>
+            <input type="hidden" id="merchantType" name="userAppInfo.merchantBaseInfo.merchantType"
+                   value="${userAppInfo.merchantBaseInfo.merchantType}"/>
+            <input type="hidden" name="certName" value="${priceIdCard.certName}"/>
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <div class="layui-form-label">法人姓名</div>
+                    <div class="layui-input-inline">
+                        <input type="text" placeholder="营业执照名称"
+                               class="layui-input"
+                               value="${userAppInfo.merchantBaseInfo.principalPerson }" id="principalPerson"
+                               name="merchantBaseInfo.principalPerson"/>
+                    </div>
+                </div>
+
+                <div class="layui-inline">
+                    <div class="layui-form-label">法人身份证号</div>
+                    <div class="layui-input-inline">
+                        <input type="text" placeholder="法人身份证号"
+                               class="layui-input"
+                               value="${priceIdCard.certNo}" id="priceIdCard.certNo"
+                               name="certNo"/>
+                    </div>
+                </div>
+            </div>
+
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <div class="layui-form-label">执照名称</div>
+                    <div class="layui-input-inline">
+                        <input type="text" placeholder="营业执照名称"
+                               class="layui-input"
+                               value="${userAppInfo.merchantBaseInfo.bussAuthName }" id="bussAuthName"
+                               name="merchantBaseInfo.bussAuthName"/>
+                    </div>
+                </div>
+
+                <div class="layui-inline">
+                    <div class="layui-form-label">工商注册号</div>
+                    <div class="layui-input-inline">
+                        <input type="text" placeholder="工商注册号"
+                               class="layui-input"
+                               value="${userAppInfo.merchantBaseInfo.bussAuthNum}" id="bussAuthNum"
+                               name="merchantBaseInfo.bussAuthNum"/>
+                    </div>
+                </div>
+            </div>
+
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <div class="layui-form-label">开始时间</div>
+                    <div class="layui-input-inline">
+                        <input type="text" placeholder="营业执照下发时间"
+                               class="layui-input"
+                               value="${userAppInfo.merchantBaseInfo.bussAuthStartTime }"
+                               name="merchantBaseInfo.bussAuthStartTime"/>
+                    </div>
+                </div>
+
+                <div class="layui-inline">
+                    <div class="layui-form-label">结束时间</div>
+                    <div class="layui-input-inline">
+                        <input type="text" placeholder="营业执照失效时间"
+                               class="layui-input"
+                               value="${userAppInfo.merchantBaseInfo.bussAuthEndTime }"
+                               name="merchantBaseInfo.bussAuthEndTime"/>
+                    </div>
+                </div>
+            </div>
+
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <div class="layui-form-label">注册地址</div>
+                    <div class="layui-input-inline" style="width: 400px">
+                        <input type="text" placeholder="注册地址"
+                               class="layui-input"
+                               value="${userAppInfo.merchantBaseInfo.bussAuthAddress}"
+                               name="merchantBaseInfo.bussAuthAddress"/>
+                    </div>
+                </div>
+            </div>
+
+            <div class="clearfix textc bdbe ">
+                <ul class="layui-col-md10">
+                    <li class="fl pt10 pb10 wp25" data-v="09" data-t="store" data-value="${merchantImage3}">
+                        <div>营业执照照片</div>
+                        <div class="dlblock upload w200 h200 mt10">
+                            <input name="picUrl3" hidden/>
+                            <img id="picUrl3" src="${merchantImage3}" referrer="no-referrer|origin|unsafe-url"
+                                 onerror="this.src='${resourcePath }/images/error.jpg'"
+                                 width="200" height="200"/>
+                            <div class="cover"
+                                 style="background: rgba(0, 0, 0, 0.6);
+                                 height:200px;
+                                 width:200px;
+                                 position:absolute;
+                                 margin-top: -200px;
+                                 ">
+                                <div style="margin-top: 90px;">
+                                    <div class="u-icon icon1" onclick="magnify('picUrl3')"><i
+                                            class="layui-icon layui-icon-search"></i></div>
+                                    <div class="u-icon icon2 upload_icon"><i class="layui-icon layui-icon-edit"></i>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </li>
+                    <li class="fl pt10 pb10 wp25" data-v="06" data-t="store" data-value="${idCard.id}">
+                        <div>法人身份证正面</div>
+                        <div class="dlblock upload w200 h200 mt10">
+                            <input name="picUrl1" hidden/>
+                            <img id="imgLegalPositive1" src="${merchantImage1}"
+                                 referrer="no-referrer|origin|unsafe-url"
+                                 onerror="this.src='${resourcePath }/images/error.jpg'"
+                                 width="200" height="200">
+                            <div class="cover"
+                                 style="background: rgba(0, 0, 0, 0.6);
+                                 height:200px;
+                                 width:200px;
+                                 position:absolute;
+                                 margin-top: -200px;
+                                 ">
+                                <div style="margin-top: 90px;">
+                                    <div class="u-icon icon1" onclick="magnify('imgLegalPositive1')"><i
+                                            class="layui-icon layui-icon-search"></i></div>
+                                    <div class="u-icon icon2 upload_icon"><i class="layui-icon layui-icon-edit"></i>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </li>
+                    <li class="fl pt10 pb10 wp25" data-v="08" data-t="store" data-value="${idCard.id}">
+                        <div>法人身份证反面</div>
+                        <div class="dlblock upload w200 h200 mt10">
+                            <input name="picUrl2" hidden/>
+                            <img id="imgLegalNegative2" src="${merchantImage2}"
+                                 onerror="this.src='${resourcePath }/images/error.jpg'"
+                                 width="200" height="200">
+                            <div class="cover"
+                                 style="background: rgba(0, 0, 0, 0.6);
+                                 height:200px;
+                                 width:200px;
+                                 position:absolute;
+                                 margin-top: -200px;
+                                 ">
+                                <div style="margin-top: 90px;">
+                                    <div class="u-icon icon1" onclick="magnify('imgLegalNegative2')">
+                                        <i class="layui-icon layui-icon-search"></i>
+                                    </div>
+                                    <div class="u-icon icon2 upload_icon">
+                                        <i class="layui-icon layui-icon-edit"></i>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </li>
+                </ul>
+            </div>
+            <br/>
+            <div class="layui-form-item">
+                <div class="layui-input-block">
+                    <button class="layui-btn" lay-submit lay-filter="formDemo3">立即提交</button>
+                </div>
+            </div>
+        </form>
+    </c:if>
+
+    <form class="layui-form" id="form4" action="">
+        <blockquote class="layui-elem-quote layui-text" style="margin-top: 15px;">
+            结算信息(<span style="color: red;">${settleTypeName}</span>)：<span class="red f12 ml20">注：请保持银行卡信息(证件号码、开户名、卡号、预留手机号)的匹配性</span>
+        </blockquote>
+        <input type="hidden" name="merchantCode" value="${userAppInfo.merchantCode}"/>
+        <input type="hidden" name="bankCard.userId" value="${bankCard.userId}"/>
+        <%--            <input type="hidden" name="bankCard.accountType" value="${bankCard.accountType}"/>--%>
+        <input type="hidden" name="idCard.userId" value="${idCard.userId}"/>
+        <input type="hidden" name="idCard.userType" value="${idCard.userType}"/>
+        <input type="hidden" name="idCard.certName" value="${idCard.certName}"/>
+        <div class="layui-form-item" id="area2-picker2">
+            <div class="layui-form-label">开户行地区</div>
+            <div class="layui-input-inline">
+                <select id="bankProvince2" class="province-selector"
+                        data-dom="bankCity2" name="bankCard.branchProvince"
+                        data-value=" " lay-filter="bankProvinceType2">
+                    <option value="">请选择省</option>
+                    <c:forEach items="${areaCitiesList}" var="acl">>
+                        <option value="${acl.areaName}"
+                                <c:if test="${bankCard.branchProvince eq acl.areaName }">selected</c:if>>${acl.areaName}
+                        </option>
+                    </c:forEach>
+                </select>
+            </div>
+
+            <div class="layui-input-inline">
+                <select id="bankCity2" class="city-selector" name="bankCard.branchCity"
+                        data-dom="bankArea2" data-value=""
+                        lay-filter="bankBranType2">
+                    <option value="${bankCard.branchCity}">${bankCard.branchCity}</option>
+                </select>
+            </div>
+
+            <div class="layui-input-inline">
+                <select id="bankArea2" name="bankCard.branchArea" class="county-selector"
+                        data-value=""
+                        lay-filter="bankCountyType2">
+                    <option value="${bankCard.branchArea}">${bankCard.branchArea}</option>
+                </select>
+            </div>
+        </div>
+
+        <div class="layui-form-item">
+            <div class="layui-form-label">开户银行</div>
+            <div class="layui-input-inline" style="width: 271px;">
+                <select id="bankName2" name="bankCard.bankName"
+                        data-dom="bankBranch2"
+                        data-value="" lay-filter="bankBranchType2">
+                    <option value="">选择银行</option>
+                    <option value="工商银行"
+                            <c:if test='${bankCard.bankName eq "工商银行" }'>selected</c:if>>工商银行
+                    </option>
+                    <option value="交通银行"
+                            <c:if test='${bankCard.bankName eq "交通银行" }'>selected</c:if>>交通银行
+                    </option>
+                    <option value="招商银行"
+                            <c:if test='${bankCard.bankName eq "招商银行" }'>selected</c:if>>招商银行
+                    </option>
+                    <option value="民生银行"
+                            <c:if test='${bankCard.bankName eq "民生银行" }'>selected</c:if>>民生银行
+                    </option>
+                    <option value="中信银行"
+                            <c:if test='${bankCard.bankName eq "中信银行" }'>selected</c:if>>中信银行
+                    </option>
+                    <option value="浦发银行"
+                            <c:if test='${bankCard.bankName eq "浦发银行" }'>selected</c:if>>浦发银行
+                    </option>
+                    <option value="兴业银行"
+                            <c:if test='${bankCard.bankName eq "兴业银行" }'>selected</c:if>>兴业银行
+                    </option>
+                    <option value="光大银行"
+                            <c:if test='${bankCard.bankName eq "光大银行" }'>selected</c:if>>光大银行
+                    </option>
+                    <option value="广发银行"
+                            <c:if test='${bankCard.bankName eq "广发银行" }'>selected</c:if>>广发银行
+                    </option>
+                    <option value="平安银行"
+                            <c:if test='${bankCard.bankName eq "平安银行" }'>selected</c:if>>平安银行
+                    </option>
+                    <option value="北京银行"
+                            <c:if test='${bankCard.bankName eq "北京银行" }'>selected</c:if>>北京银行
+                    </option>
+                    <option value="华夏银行"
+                            <c:if test='${bankCard.bankName eq "华夏银行" }'>selected</c:if>>华夏银行
+                    </option>
+                    <option value="农业银行"
+                            <c:if test='${bankCard.bankName eq "农业银行" }'>selected</c:if>>农业银行
+                    </option>
+                    <option value="建设银行"
+                            <c:if test='${bankCard.bankName eq "建设银行" }'>selected</c:if>>建设银行
+                    </option>
+                    <option value="邮政储蓄银行"
+                            <c:if test='${bankCard.bankName eq "邮政储蓄银行" }'>selected</c:if>>邮政储蓄银行
+                    </option>
+                    <option value="中国银行"
+                            <c:if test='${bankCard.bankName eq "中国银行" }'>selected</c:if>>中国银行
+                    </option>
+                    <option value="宁波银行"
+                            <c:if test='${bankCard.bankName eq "宁波银行" }'>selected</c:if>>宁波银行
+                    </option>
+                </select>
+            </div>
+        </div>
+
+        <div class="layui-form-item">
+            <div class="layui-form-label">开户支行</div>
+            <div class="layui-input-inline" style="width: 272px;">
+                <select id="bankBranch2" class="city-selector" name="bankCard.contactLine"
+                        data-value="" lay-filter="bankBranch2">
+                    <option value="${bankCard.contactLine}">${bankCard.branchName}</option>
+                </select>
+            </div>
+        </div>
+
+        <div class="layui-form-item">
+            <div class="layui-form-label">支行联行号</div>
+            <div class="layui-input-inline">
+                <input id="contactLine2" class="layui-input" type="text" value="${bankCard.contactLine}" readonly />
+            </div>
+        </div>
+
+        <div class="layui-form-item">
+            <div class="layui-inline">
+                <div class="layui-form-label">开户名</div>
+                <div class="layui-input-inline">
+                    <input type="text" placeholder="开户名"
+                           class="layui-input" id="bankHolder"
+                           name="bankCard.bankHolder" value="${bankCard.bankHolder}"/>
+                </div>
+            </div>
+
+            <div class="layui-inline">
+                <div class="layui-form-label">开户账号</div>
+                <div class="layui-input-inline">
+                    <input type="text" placeholder="开户账号"
+                           class="layui-input" id="cardBankCard"
+                           name="bankCard.bankCardNo" value="${bankCard.bankCardNo}"/>
+                </div>
+            </div>
+        </div>
+
+        <div class="layui-form-item">
+            <div class="layui-inline">
+                <div class="layui-form-label">银行预留手机号</div>
+                <div class="layui-input-inline">
+                    <input type="text" placeholder="银行预留手机号码"
+                           class="layui-input" id="cardPhone" name="bankCard.phone"
+                           value="${bankCard.phone}"/>
+                </div>
+            </div>
+
+            <div class="layui-inline">
+                <div class="layui-form-label">身份证号码</div>
+                <div class="layui-input-inline">
+                    <input type="text" placeholder="身份证号码"
+                           class="layui-input" id="certNo" name="idCard.certNo"
+                           value="${idCard.certNo}"/>
+                </div>
+            </div>
+        </div>
+
+        <div class="layui-form-item">
+            <div class="layui-inline">
+                <div class="layui-form-label">身份证发放日期</div>
+                <div class="layui-input-inline">
+                    <input type="text" placeholder="身份证发放日期"
+                           class="layui-input" name="idCard.certStartTime"
+                           value="${idCard.certStartTime}"/>
+                </div>
+            </div>
+
+            <div class="layui-inline">
+                <div class="layui-form-label">身份证失效日期</div>
+                <div class="layui-input-inline">
+                    <input type="text" placeholder="身份证失效日期"
+                           class="layui-input" name="idCard.certEndTime"
+                           value="${idCard.certEndTime}"/>
+                </div>
+            </div>
+        </div>
+
+        <div class="clearfix textc bdbe ">
+            <ul class="layui-col-md10">
+                <li class="fl pt10 pb10 wp25" data-v="06" data-t="store" data-value="${idCard.id}">
+                    <div>身份证正面</div>
+                    <div class="dlblock upload w200 h200 mt10">
+                        <input name="idCard.imgPositive" hidden/>
+                        <img id="imgPositive1" src="${idCard.imgPositive}"
+                             referrer="no-referrer|origin|unsafe-url"
+                             onerror="this.src='${resourcePath }/images/error.jpg'"
+                             width="200" height="200">
+                        <div class="cover"
+                             style="background: rgba(0, 0, 0, 0.6);
+                                 height:200px;
+                                 width:200px;
+                                 position:absolute;
+                                 margin-top: -200px;
+                                 ">
+                            <div style="margin-top: 90px;">
+                                <div class="u-icon icon1" onclick="magnify('imgPositive1')"><i
+                                        class="layui-icon layui-icon-search"></i></div>
+                                <div class="u-icon icon2 upload_icon"><i class="layui-icon layui-icon-edit"></i>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </li>
+                <li class="fl pt10 pb10 wp25" data-v="08" data-t="store" data-value="${idCard.id}">
+                    <div>身份证反面</div>
+                    <div class="dlblock upload w200 h200 mt10">
+                        <input name="idCard.imgNegative" hidden/>
+                        <img id="imgNegative2" src="${idCard.imgNegative}"
+                             onerror="this.src='${resourcePath }/images/error.jpg'"
+                             width="200" height="200">
+                        <div class="cover"
+                             style="background: rgba(0, 0, 0, 0.6);
+                                 height:200px;
+                                 width:200px;
+                                 position:absolute;
+                                 margin-top: -200px;
+                                 ">
+                            <div style="margin-top: 90px;">
+                                <div class="u-icon icon1" onclick="magnify('imgNegative2')">
+                                    <i class="layui-icon layui-icon-search"></i>
+                                </div>
+                                <div class="u-icon icon2 upload_icon">
+                                    <i class="layui-icon layui-icon-edit"></i>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </li>
+                <li class="fl pt10 pb10 wp25" data-v="09" data-t="store" data-value="${bankCard.id}">
+                    <div>结算卡图片</div>
+                    <div class="dlblock upload w200 h200 mt10">
+                        <input name="bankCard.imgUrl" hidden/>
+                        <img id="imgUrl2" src="${bankCard.imgUrl}" referrer="no-referrer|origin|unsafe-url"
+                             onerror="this.src='${resourcePath }/images/error.jpg'"
+                             width="200" height="200">
+                        <div class="cover"
+                             style="background: rgba(0, 0, 0, 0.6);
+                                 height:200px;
+                                 width:200px;
+                                 position:absolute;
+                                 margin-top: -200px;
+                                 ">
+                            <div style="margin-top: 90px;">
+                                <div class="u-icon icon1" onclick="magnify('imgUrl2')"><i
+                                        class="layui-icon layui-icon-search"></i></div>
+                                <div class="u-icon icon2 upload_icon"><i class="layui-icon layui-icon-edit"></i>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </li>
+            </ul>
+
+        </div>
+
+        <div class="clearfix textc bdbe ">
+            <ul class="layui-col-md10">
+                <li class="fl pt10 pb10 wp25" data-v="999" data-t="store">
+                    <div>结算人与收银台合照</div>
+                    <div class="dlblock upload w200 h200 mt10">
+                        <input name="picUrl999" hidden/>
+                        <img id="picUrl999" src="${merchantImage999}"
+                             onerror="this.src='${resourcePath}/images/error.jpg'"
+                             width="200" height="200">
+                        <div class="cover"
+                             style="background: rgba(0, 0, 0, 0.6);
+                                 height:200px;
+                                 width:200px;
+                                 position:absolute;
+                                 margin-top: -200px;
+                                ">
+                            <div style="margin-top: 90px;">
+                                <div class="u-icon icon1" onclick="magnify('picUrl999')">
+                                    <i class="layui-icon layui-icon-search"></i>
+                                </div>
+                                <div class="u-icon icon2 upload_icon">
+                                    <i class="layui-icon layui-icon-edit"></i>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </li>
+                <li class="fl pt10 pb10 wp25" data-v="11" data-t="store">
+                    <div>结算人手持身份证照</div>
+                    <div class="dlblock upload w200 h200 mt10">
+                        <input name="picUrl11" hidden/>
+                        <img id="picUrl11" src="${merchantImage11}"
+                             onerror="this.src='${resourcePath }/images/error.jpg'"
+                             width="200" height="200">
+                        <div class="cover"
+                             style="background: rgba(0, 0, 0, 0.6);
+                                 height:200px;
+                                 width:200px;
+                                 position:absolute;
+                                 margin-top: -200px;
+                                ">
+                            <div style="margin-top: 90px;">
+                                <div class="u-icon icon1" onclick="magnify('picUrl11')">
+                                    <i class="layui-icon layui-icon-search"></i>
+                                </div>
+                                <div class="u-icon icon2 upload_icon">
+                                    <i class="layui-icon layui-icon-edit"></i>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </li>
+                <c:if test="${settleTypeName == '法人对私非法人' || settleTypeName == '非法人对私非法人'}">
+                    <li class="fl pt10 pb10 wp25" data-v="06" data-t="store" data-value="${idCard.id}">
+                        <div>非法人授权函</div>
+                        <div class="dlblock upload w200 h200 mt10">
+                            <input name="picUrl7" hidden/>
+                            <img id="picUrl7" src="${merchantImage7}"
+                                 referrer="no-referrer|origin|unsafe-url"
+                                 onerror="this.src='${resourcePath }/images/error.jpg'"
+                                 width="200" height="200">
+                            <div class="cover"
+                                 style="background: rgba(0, 0, 0, 0.6);
+                                 height:200px;
+                                 width:200px;
+                                 position:absolute;
+                                 margin-top: -200px;
+                                ">
+                                <div style="margin-top: 90px;">
+                                    <div class="u-icon icon1" onclick="magnify('picUrl7')"><i
+                                            class="layui-icon layui-icon-search"></i></div>
+                                    <div class="u-icon icon2 upload_icon"><i class="layui-icon layui-icon-edit"></i>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </li>
+                </c:if>
+            </ul>
+        </div>
+
+        <br/>
+        <div class="layui-form-item">
+            <div class="layui-input-block">
+                <button class="layui-btn" lay-submit lay-filter="formDemo4">立即提交</button>
+            </div>
+        </div>
+    </form>
+
+    <c:forEach items="${userAppInfo.channelStatusList}" var="channelStatus" varStatus="status">
+        <div class="w1000 mt100" style="background: white">
+            <fieldset class="w1000 fc layui-elem-field layui-field-title" style="margin-top: 20px;">
+                <legend>通道进件组${status.index + 1}</legend>
+            </fieldset>
+        </div>
+
+        <form class="layui-form mb100" action="">
+            <input type="hidden" name="id" value="${channelStatus.channel}"/>
+            <input type="hidden" name="userId" value="${userAppInfo.userId}"/>
+            <input type="hidden" name="merchantCode" value="${userAppInfo.merchantCode}"/>
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <label class="layui-form-label">审核备注组</label>
+                    <div class="layui-input-inline" style="width: 600px">
+                        <select id="errMsg" lay-search lay-filter="changeAudit"
+                        <c:if test="${channelStatus.status ne '1' || channelStatus.thirdStatus ne '-100'}">
+                                class="layui-disabled"
+                        </c:if>
+                        <option value=""></option>
+                        <c:forEach items="${listMerchantRejectDesc}" var="mrd">
+                            <option value="${mrd.rejectName}">${mrd.rejectName}</option>
+                        </c:forEach>
+                        </select>
+                    </div>
+                </div>
+            </div>
+
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <label class="layui-form-label">审核备注</label>
+                    <div class="layui-input-inline" style="width: 600px">
+                        <textarea name="errMsg" id="remark"
+                                <c:if test="${channelStatus.status ne '1' || channelStatus.thirdStatus ne '-100'}">
+                                    disabled
+                                </c:if>
+                                  class="layui-textarea">${channelStatus.remark}</textarea>
+                    </div>
+                </div>
+            </div>
+
+            <c:if test="${channelStatus.status eq '2'}">
+                <div class="layui-form-item">
+                    <div class="layui-inline">
+                        <label class="layui-form-label">驳回时间：</label>
+                        <div class="layui-input-inline">
+                                ${userAppInfo.updateTime}
+                        </div>
+                    </div>
+                </div>
+            </c:if>
+
+            <div class="layui-form-item">
+                <label class="layui-form-label">通道选择</label>
+                <div class="layui-input-block" style="margin-left: 110px">
+                    <c:forEach items="${channel}" var="channelItem">
+                        <input type="radio" name="id" value="${channelItem.id}"
+                               title="${channelItem.channelName}"
+                                <c:if test="${channelStatus.channel ne null || channelStatus.status ne 1 || channelStatus.thirdStatus ne -100 || channelStatus.status eq 3}">
+                                    disabled
+                                </c:if>
+                                <c:if test="${channelStatus.channel eq channelItem.id}">
+                                    checked
+                                </c:if>
+                                <c:if test="${channelStatus.channel eq null and userAppInfo.channelStatusList.size() le 1}">
+                                    <c:if test="${userAppInfo.merchantBaseInfo.merchantType eq '1' and channelItem.id eq '3'}">
+                                        checked
+                                    </c:if>
+                                    <c:if test="${userAppInfo.merchantBaseInfo.merchantType ne '1' and channelItem.id eq '1'}">
+                                        checked
+                                    </c:if>
+                                </c:if>
+
+                                <c:if test="${channelStatus.channel eq null and userAppInfo.channelStatusList.size() gt 1}">
+                                    <c:if test="${channelItem.id eq '4'}">
+                                        checked
+                                    </c:if>
+                                </c:if>
+                        />
+                    </c:forEach>
+                </div>
+            </div>
+
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <label class="layui-form-label">审核状态</label>
+                    <div class="layui-input-inline">
+                        <c:if test='${(channelStatus.status eq "0" && channelStatus.thirdStatus eq "-100") || channelStatus.status eq "2"}'>
+                            <input type="text" class="layui-input layui-font-black" value="审核驳回" disabled />
+                        </c:if>
+                        <c:if test='${(channelStatus.status eq "1" && channelStatus.thirdStatus eq "-100")}'>
+                            <input type="text" class="layui-input layui-font-black" value="待后台审核" disabled />
+                        </c:if>
+                        <c:if test='${channelStatus.status eq "3"}'>
+                            <input type="text" class="layui-input layui-font-black" value="审核通过" disabled  />
+                        </c:if>
+                        <c:if test='${channelStatus.status eq "7"}'>
+                            <input type="text" class="layui-input layui-font-black" value="快付审核中" disabled />
+                        </c:if>
+                    </div>
+                </div>
+            </div>
+
+            <c:if test="${channelStatus.status eq '1' && channelStatus.thirdStatus eq '-100'}">
+                <div class="layui-form-item">
+                    <div class="layui-input-block">
+                        <button class="layui-btn" lay-submit lay-filter="consent">通过</button>
+                        <button class="layui-btn layui-btn-danger" lay-submit lay-filter="reject">驳回</button>
+                        <button class="layui-btn layui-btn-danger" lay-submit lay-filter="reject2">驳回并禁止进件</button>
+                    </div>
+                </div>
+            </c:if>
+
+            <c:if test="${channelStatus.status eq '0' && channelStatus.status eq '-100'}">
+                <div class="layui-form-item">
+                    <div class="layui-input-block">
+                        <button class="layui-btn" lay-submit lay-filter="consent">重审</button>
+                    </div>
+                </div>
+            </c:if>
+        </form>
+
+    </c:forEach>
+
+    <c:if test="${userAppInfo.ppStatus eq '1' && userAppInfo.ppThirdStatus eq '-100' }">
+        <fieldset class="w1000 fc layui-elem-field layui-field-title mt100">
+            <legend>瑞银信插件进件</legend>
+        </fieldset>
+        <form class="layui-form" action="">
+            <input type="hidden" name="userId" value="${userAppInfo.userId}"/>
+            <div class="w1000 fc" style="background: white">
+                <div class=" pd10 textl pl50 pb20 fw800 f16 pb20 bdbe mb20 ch">插件审核</div>
+                <div class="clearfix mb20">
+                    <div class="fl textc wp50">
+                        <label class="layui-form-label">审核备注：</label>
+                        <div class="layui-input-block" style="margin-left:0px">
+                            <div class="layui-input-block">
+                            <textarea name="errMsg" id="remark2" style="margin-top: -13px;width: 372px"
+                                      class="bdc w320 pd7 radius5"></textarea>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <div class="layui-input-block">
+                        <button class="layui-btn" lay-submit lay-filter="plugin">插件进件通过</button>
+                        <button class="layui-btn layui-btn-danger" lay-submit lay-filter="pluginReject">驳回</button>
+                    </div>
+                </div>
+            </div>
+        </form>
+    </c:if>
+</div>
+
+
+<div class="layui-col-md5" style="overflow-y: scroll; position: fixed; float: right; right: 0; height: 100%; background: #ffffff;">
+    <div id="connectContent"></div>
+</div>
+<script type="text/javascript">
+    var mccList = '${mccList}';
+    var checkMcc = '${checkMcc}';
+    //form表单样式
+    layui.use(['layer', 'form', 'upload', 'element'], function () {
+        var layer = layui.layer,
+            form = layui.form,
+            upload = layui.upload;
+        var element = layui.element;
+        element.init();
+        form.render();
+
+        $('#connectContent').load(ctx + '/promoter/connectInfo?userId=${userAppInfo.userId}');
+
+        $('.close').click(function () {
+            parent.layer.closeAll();
+        });
+
+        var xhrOnProgress = function (fun) {
+            xhrOnProgress.onprogress = fun; //绑定监听
+            //使用闭包实现监听绑定
+            return function () {
+                //通过$.ajaxSettings.xhr();获得XMLHttpRequest对象
+                var xhr = $.ajaxSettings.xhr();
+                //判断监听函数是否为函数
+                if (typeof xhrOnProgress.onprogress !== 'function') {
+                    return xhr;
+                }
+                //如果有监听函数并且xhr对象支持绑定时就把监听函数绑定上去
+                if (xhrOnProgress.onprogress && xhr.upload) {
+                    xhr.upload.onprogress = xhrOnProgress.onprogress;
+                }
+                return xhr;
+            }
+        }
+        var data = {};
+        var inputUpload;
+        var imgUpload;
+
+        upload.render({
+            elem: '.upload', // 文件选择
+            url: ctx + '/upload/ossUploadFile',
+            exts: 'jpg|png|gif|bmp|jpeg',
+            method: 'POST',
+            auto: true,
+            before: function () {
+                var dom = $(this.item);
+                inputUpload = dom.find("input");
+                imgUpload = dom.find("img");
+
+                openIndex = layer.open({
+                    type: 1,
+                    title: '上传进度',
+                    closeBtn: 1, //不显示关闭按钮
+                    area: ['300px', '130px'],
+                    shadeClose: false, //开启遮罩关闭
+                    content: $("#uploadLoadingDiv").html(),
+                    offset: '100px'
+                });
+            }
+            , xhr: xhrOnProgress
+            , progress: function (value) {//上传进度回调 value进度值
+                element.progress('js_upload_progress', value + '%');//设置页面进度条
+            }
+            , done: function (res) {
+                layer.close(openIndex);
+                if (res.code == 200) {
+                    layer.msg("上传成功！")
+                    inputUpload.val(res.url);
+                    imgUpload.attr("src", res.url);
+                } else {
+                    layer.msg("上传失败！");
+                }
+            }
+            , error: function (res) {
+                layer.close(openIndex);
+                layer.msg(res.msg);
+            }
+        });
+
+        //关闭进度条提示
+        $(document).on('click', '.js_upload_progress_bar_sure', function () {
+            layer.close(layer.index);
+        });
+
+        /*提交推广员基本信息*/
+        form.on('submit(formDemo1)', function (data) {
+            var index = layer.load(1, {shade: [0.1, '#000']});
+            $.ajax({
+                url: ctx + '/promoter/updatePromoterInformation',
+                method: 'post',
+                data: data.field,
+                dataType: 'JSON',
+                success: function (res) {
+                    layer.close(index);
+                    if (res.code == 200) {
+                        layer.msg(res.message, {
+                            icon: 1
+                        });
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 5
+                        });
+                    }
+                }
+            })
+            return false;
+        });
+        /*提交商户信息*/
+        form.on('submit(formDemo2)', function (data) {
+            var index = layer.load(1, {shade: [0.1, '#000']});
+            $.ajax({
+                url: '${ctx}/promoter/updateMerchantInformation',
+                method: 'post',
+                data: data.field,
+                dataType: 'JSON',
+                success: function (res) {
+                    layer.close(index);
+                    if (res.code == 200) {
+                        layer.msg(res.message, {
+                            icon: 1
+                        });
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 5
+                        });
+                    }
+                }
+            })
+            return false;
+        });
+        /*提交营业执照信息*/
+        form.on('submit(formDemo3)', function (data) {
+            var index = layer.load(1, {shade: [0.1, '#000']});
+            $.ajax({
+                url: '${ctx}/promoter/updateMerchantLicense',
+                method: 'post',
+                data: data.field,
+                dataType: 'JSON',
+                success: function (res) {
+                    layer.close(index);
+                    if (res.code == 200) {
+                        /*layer.alert(res.data, function () {
+                            parent.location.reload();
+                            layer.msg(res.message, {
+                                icon: 1
+                            });
+                        })*/
+
+                        layer.alert(res.message, function (index) {
+                            //do something
+
+                            layer.close(index);
+                        });
+
+                        layer.confirm(res.message, {
+                            icon: 1
+                        });
+                    } else {
+                        layer.alert(res.message, function (index) {
+                            //do something
+
+                            layer.close(index);
+                        });
+                    }
+                }
+            })
+            return false;
+        });
+        //更改结算信息
+        form.on('submit(formDemo4)', function (data) {
+            var index = layer.load(1, {shade: [0.1, '#000']});
+            $.ajax({
+                url: '${ctx}/promoter/updateMerchantSettlement',
+                method: 'post',
+                data: data.field,
+                dataType: 'JSON',
+                success: function (res) {
+                    layer.close(index);
+                    if (res.code == 200) {
+                        layer.msg(res.message, {
+                            icon: 1
+                        });
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 5
+                        });
+                    }
+                }
+            })
+            return false;
+        });
+
+        /*提交通过备注信息*/
+        form.on('submit(consent)', function (data) {
+            layer.confirm('确认通过?', function (index) {
+                var index = layer.load(1, {shade: [0.1, '#000']});
+                $.ajax({
+                    url: '${ctx}/merchantStore/manualMerchantIncom/' + data.field.userId + '/' + data.field.id + '/' + data.field.merchantCode,
+                    method: 'get',
+                    timeout: 0, // 此处将超时时间设为30秒
+                    data: data.field,
+                    dataType: 'JSON',
+                    success: function (res) {
+                        layer.close(index);
+                        if (res.code == 1) {
+                            layer.alert(res.msg, function (index) {
+                                layer.close(index);
+                            })
+                        } else {
+                            layer.alert(res.msg, function (index) {
+                                layer.close(index);
+                            })
+                        }
+                    },
+                    error: function () {
+                        layer.close(index);
+                        layer.alert("服务器错误", function (index) {
+                            layer.close(index);
+                        })
+                    }
+                })
+            });
+            return false;
+        });
+
+        /*提交通过备注信息*/
+        form.on('submit(plugin)', function (data) {
+            layer.confirm('确认通过?', function (index) {
+                var index = layer.load(1, {shade: [0.1, '#000']});
+                $.ajax({
+                    url: '${ctx}/merchantStore/audit/' + data.field.userId,
+                    method: 'get',
+                    data: data.field,
+                    dataType: 'JSON',
+                    success: function (res) {
+                        layer.close(index);
+                        if (res.code == 200) {
+                            layer.msg(res.msg, {
+                                icon: 1
+                            });
+                        } else {
+                            layer.msg(res.msg, {
+                                icon: 5
+                            });
+                        }
+                    },
+                    error: function () {
+                        layer.close(index);
+                        layer.msg("服务器错误", {
+                            icon: 5
+                        });
+                    }
+                })
+            });
+            return false;
+        });
+
+        /*提交驳回备注信息*/
+        form.on('submit(reject)', function (data) {
+            var index = layer.load(1, {shade: [0.1, '#000']});
+            $.ajax({
+                url: '${ctx}/merchantStore/rejectAudit/' + data.field.userId,
+                method: 'get',
+                data: data.field,
+                dataType: 'JSON',
+                success: function (res) {
+                    layer.close(index);
+                    if (res.code == 1) {
+                        layer.msg(res.msg, {
+                            icon: 1
+                        });
+                    } else {
+                        layer.msg(res.msg, {
+                            icon: 5
+                        });
+                    }
+                }
+            })
+            return false;
+        });
+
+        /*提交驳回备注信息*/
+        form.on('submit(reject2)', function (data) {
+            var index = layer.load(1, {shade: [0.1, '#000']});
+            $.ajax({
+                url: '${ctx}/merchantStore/rejectAudit2/' + data.field.userId,
+                method: 'get',
+                data: data.field,
+                dataType: 'JSON',
+                success: function (res) {
+                    layer.close(index);
+                    if (res.code == 1) {
+                        layer.msg(res.msg, {
+                            icon: 1
+                        });
+                    } else {
+                        layer.msg(res.msg, {
+                            icon: 5
+                        });
+                    }
+                }
+            })
+            return false;
+        });
+
+        /*提交驳回备注信息*/
+        form.on('submit(pluginReject)', function (data) {
+            var index = layer.load(1, {shade: [0.1, '#000']});
+            $.ajax({
+                url: ctx + '/merchantStore/rejectPluginAudit/' + data.field.userId,
+                method: 'get',
+                data: data.field,
+                dataType: 'JSON',
+                success: function (res) {
+                    layer.close(index);
+                    if (res.code == 1) {
+                        layer.msg(res.msg, {
+                            icon: 1
+                        });
+                    } else {
+                        layer.msg(res.msg, {
+                            icon: 5
+                        });
+                    }
+                }
+            })
+            return false;
+        });
+
+        form.on('select(changeAudit)', function (obj) {
+            var name = obj.value;
+            $("#remark").val($("#remark").val() + name + ';');
+        })
+
+        // 省市区同步方法
+        var func = function (data) {
+            var areaCode = data.value;
+            var domId = $(data.elem).attr("data-dom");
+            $.ajax({
+                url: ctx + '/promoter/getDowntownByCode/' + areaCode,
+                method: 'get',
+                dataType: 'json',
+                success: function (res) {
+                    if (res.code == 200) {
+                        var dom = $("#" + domId);
+                        var html = "<option value=''>请选择</option>";
+                        dom.empty();
+                        if (res.areaCityList.length > 0) {
+                            $.each(res.areaCityList, function (k, v) {
+                                html += "<option value='" + v.areaCode + "'>" + v.areaName + "</option>";
+                            })
+                            dom.append(html);
+                        }
+                        form.render('select');
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 5
+                        });
+                    }
+                }
+            })
+        };
+
+        // 省市区同步方法
+        var func2 = function (data) {
+            var areaCode = data.value;
+                var domId = $(data.elem).attr("data-dom");
+            $.ajax({
+                url: ctx + '/promoter/getDowntownByName/' + areaCode,
+                method: 'get',
+                dataType: 'json',
+                success: function (res) {
+                    if (res.code == 200) {
+                        var dom = $("#" + domId);
+                        var html = "<option value=''>请选择</option>";
+                        dom.empty();
+                        if (res.areaCityList.length > 0) {
+                            $.each(res.areaCityList, function (k, v) {
+                                html += "<option value='" + v.areaName + "'>" + v.areaName + "</option>";
+                            })
+                            dom.append(html);
+                        }
+                        form.render('select');
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 5
+                        });
+                    }
+                }
+            })
+        };
+
+        form.on('select(bankBranch2)', function(data) {
+            var contactLine = $("#bankBranch2 option:selected").val();
+            $('#contactLine2').val(contactLine);
+        });
+
+        form.on('select(provinceType)', func);
+
+        form.on('select(cityType)', func);
+
+        form.on('select(bankProvinceType2)', func2);
+
+        form.on('select(bankBranType2)', func2);
+
+        form.on('select(bankBranchType)', function (data) {
+            var bankCity = $("#bankCity option:selected").text();
+            var bankName = $("#bankName").val();
+            var domId = $(data.elem).attr("data-dom");
+            $.ajax({
+                url: ctx + '/promoter/getBranchList',
+                method: 'get',
+                data: {
+                    "bankName": bankName,
+                    "cityName": bankCity,
+                },
+                success: function (res) {
+                    if (res.code == 200) {
+                        var dom = $("#" + domId);
+                        var html = "<option value=''>请选择</option>";
+                        dom.empty();
+                        if (res.branchList.length > 0) {
+                            $.each(res.branchList, function (k, v) {
+                                html += "<option value='" + v.cnapsName + "'>" + v.cnapsName + "</option>";
+                            })
+                            dom.append(html);
+                        }
+                        form.render('select');
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 5
+                        });
+                    }
+                }
+            })
+        });
+
+        form.on('select(bankBranchType2)', function (data) {
+            var bankCity = $("#bankCity2 option:selected").text();
+            var bankName = $("#bankName2").val();
+            var domId = $(data.elem).attr("data-dom");
+            $.ajax({
+                url: ctx + '/promoter/getBranchList',
+                method: 'get',
+                data: {
+                    "bankName": bankName,
+                    "cityName": bankCity,
+                },
+                success: function (res) {
+                    if (res.code == 200) {
+                        var dom = $("#" + domId);
+                        var html = "<option value=''>请选择</option>";
+                        dom.empty();
+                        if (res.branchList.length > 0) {
+                            $.each(res.branchList, function (k, v) {
+                                html += "<option value='" + v.cnapsCode + "'>" + v.cnapsName + "</option>";
+                            })
+                            dom.append(html);
+                        }
+                        form.render('select');
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 5
+                        });
+                    }
+                }
+            })
+        });
+    });
+
+    function showImg(obj) {
+        $("#img-icons").show();
+    }
+
+    function hideImg(obj) {
+        $("#img-icons").hide();
+    }
+
+    function magnify(obj) {
+        var e = window.event || arguments.callee.caller.arguments[0];
+        e.stopPropagation()
+
+        var imgUrl = $('#' + obj).attr("src");
+        if (imgUrl) {
+            var img = new Image();
+            img.src = imgUrl;
+            //弹出层
+            layer.photos({
+                photos: {"data": [{"src": imgUrl}]}
+            });
+        }
+    }
+
+    $('.cover').click(function (e) {
+        e.stopPropagation()
+    })
+
+    $('.upload_icon').click(function () {
+        $(this).parents('.upload').click()
+    })
+
+
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/promoter/userAppConnectInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/promoter/userAppConnectInfo.jsp
new file mode 100644
index 0000000..52685d8
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/promoter/userAppConnectInfo.jsp
@@ -0,0 +1,114 @@
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ page contentType="text/html;charset=UTF-8" %>
+<style>
+    .num {
+        color: #FF5722;
+        text-decoration: underline;
+    }
+</style>
+<div>
+    <fieldset class="layui-elem-field layui-field-title" style="margin-top: 30px;">
+        <legend>商户关联信息</legend>
+    </fieldset>
+    <blockquote class="layui-elem-quote layui-text" style="margin-top: 15px;">
+        身份信息关联（进件成功的）商户数量
+    </blockquote>
+    <form class="layui-form">
+        <div class="layui-form-item" style="margin-left: 20px;">
+            <a id="countCert">
+                <label class="layui-form-label-col">实名身份证 <span class="num">${countCert}</span></label>
+            </a>
+
+            <a id="countAccount">
+                <label class="layui-form-label-col">结算身份证 <span class="num">${countAccount}</span></label>
+            </a>
+
+            <a id="countMbiName">
+                <label class="layui-form-label-col">同名商户&emsp; <span class="num">${countMbiName}</span></label>
+            </a>
+        </div>
+    </form>
+    <blockquote class="layui-elem-quote layui-text" style="margin-top: 15px;">
+        用户IP记录
+    </blockquote>
+    <table id="tableIpData" lay-filter="tableIpData"></table>
+</div>
+
+<script>
+    let table;
+    layui.use(['table',], function () {
+        table = layui.table;
+
+        //执行一个 table 实例
+        table.render({
+            elem: '#tableIpData'
+            , id: 'tableIpData'
+            , url: ctx + '/promoter/userIpPage?userId=${userId}' //数据接口
+            , autoSort: false
+            , response: {
+                statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , even: true
+            , title: 'IP关联信息'
+            , page: true //开启分页
+            , cols: [[ //表头
+                {field: 'ip', title: 'IP地址', width: 130, align: "left"}
+                , {
+                    title: "地区", minWidth: 150, align: "left", templet: function (d) {
+                        let result = "";
+                        if (d.country != null && d.country != '') {
+                            result = result + d.country + "-";
+                        }
+
+                        if (d.province != null && d.province != '') {
+                            result = result + d.province + "-";
+                        }
+
+                        if (d.city != null && d.city != '') {
+                            result = result + d.city + "-";
+                        }
+
+                        if (d.county != null && d.county != '') {
+                            result = result + d.county + "-";
+                        }
+
+                        if (result.length > 0) {
+                            result = result.substring(0, result.length - 1);
+                        }
+
+                        return result;
+                    }
+                }
+                , {field: 'remark', title: '操作', minWidth: 121, align: "left"}
+                , {field: 'count', title: '同IP', width: 60, align: "left"}
+                , {
+                    field: 'createTime',
+                    title: '操作时间',
+                    width: 141,
+                    align: "left",
+                    templet: "<div>{{layui.util.toDateString(d.createTime,'yyyy-MM-dd HH:mm')}}</div>"
+                }
+            ]]
+        })
+
+        $('#countCert').click(function () {
+            parent.layui.element.tabAdd('layadmin-layout-tabs', {
+                title: '消息通知'
+                , content: ctx + "/notification/index"
+                , id: ctx + "/notification/index"
+            });
+        })
+    })
+</script>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/promoter/userAppList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/promoter/userAppList.jsp
new file mode 100644
index 0000000..e049bab
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/promoter/userAppList.jsp
@@ -0,0 +1,1312 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport"
+          content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+    <script type="text/javascript">
+        require("promoter/userAppList.js");
+    </script>
+
+    <style>
+        .layui-table th {
+            text-align: center;
+        }
+
+        .layui-form-label {
+            padding: 9px 7px;
+            width: 96px;
+        }
+
+
+        .site-dropdown-demo,
+        .site-dropdown-demo .layui-menu {
+            background-color: #000;
+            border: none;
+        }
+
+        .site-dropdown-demo .layui-menu li {
+            color: #fff;
+        }
+
+        .site-dropdown-demo .layui-menu li:hover {
+            background-color: #333;
+        }
+
+        .layui-table-cell.laytable-cell-1-0-7,
+        .layui-table-cell.laytable-cell-1-0-1,
+        .layui-table-cell.laytable-cell-1-0-3,
+        .layui-table-cell.laytable-cell-1-0-8,
+        .layui-table-cell.laytable-cell-1-1-0,
+        .layui-table-cell.laytable-cell-1-1-2,
+        .layui-table-cell.laytable-cell-1-1-3,
+        .layui-table-cell.laytable-cell-1-1-4,
+        .layui-table-cell.laytable-cell-1-0-10,
+        .layui-table-cell.laytable-cell-1-0-11,
+        .layui-table-cell.laytable-cell-1-0-14 {
+            vertical-align: middle;
+            height: auto;
+            overflow: hidden;
+            text-overflow: inherit;
+            white-space: nowrap;
+        }
+
+        hr {
+            margin: 3px 0 !important;
+        }
+
+    </style>
+</head>
+
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" action="" style="margin-top: 10px" lay-filter="formCondition">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">用户ID</label>
+                            <div class="layui-input-inline">
+                                <input type="text" id="userId" name="userId" placeholder="请输入用户ID" class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">同IP用户</label>
+                            <div class="layui-input-inline">
+                                <input type="checkbox" id="sameIp" lay-skin="switch" value="1" name="sameIp" disabled>
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">用户名称</label>
+                            <div class="layui-input-inline">
+                                <input type="text" id="userName" name="userName" placeholder="请输入名称"
+                                       class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">商户简称</label>
+                            <div class="layui-input-inline">
+                                <input type="text" id="alias" name="alias" placeholder="请输入商户简称" class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">商户编号</label>
+                            <div class="layui-input-inline">
+                                <input type="text" id="merchantCode" name="merchantCode" placeholder="商户编号"
+                                       class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">推广码</label>
+                            <div class="layui-input-inline">
+                                <input type="text" id="inviteNum" name="inviteNum" placeholder="请输入名称"
+                                       class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">手机号</label>
+                            <div class="layui-input-inline">
+                                <input type="text" placeholder="请输入内容" id="phone" name="phone" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">上级手机号</label>
+                            <div class="layui-input-inline">
+                                <input type="text" placeholder="请输入内容" id="parentPhone" name="parentPhone"
+                                       class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">审核状态</label>
+                            <div class="layui-input-inline">
+                                <select id="status" name="status">
+                                    <option value="">请选择</option>
+                                    <option value="0">未实名</option>
+                                    <option value="1">审核中</option>
+                                    <option value="2">审核失败</option>
+                                    <option value="3">已审核</option>
+                                </select>
+                            </div>
+                        </div>
+
+                        <%--                        <div class="layui-inline">--%>
+                        <%--                            <label class="layui-form-label">用户类型</label>--%>
+                        <%--                            <div class="layui-input-inline">--%>
+                        <%--                                <select id="userType" name="userType">--%>
+                        <%--                                    <option value="">请选择</option>--%>
+                        <%--                                    <option value="promoter">普通</option>--%>
+                        <%--                                    <option value="agent_staff">业务员</option>--%>
+                        <%--                                    <option value="agent_agency">代理</option>--%>
+                        <%--                                    <option value="agent">超级</option>--%>
+                        <%--                                </select>--%>
+                        <%--                            </div>--%>
+                        <%--                        </div>--%>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">进件审核状态</label>
+                            <div class="layui-input-inline">
+                                <select id="mcsStatus" name="mcsStatus">
+                                    <option value="">请选择</option>
+                                    <option value="0">待审核</option>
+                                    <option value="1">审核中</option>
+                                    <option value="2">审核驳回</option>
+                                    <option value="3">审核通过</option>
+                                </select>
+                            </div>
+                        </div>
+
+                        <%--                        <div class="layui-inline">--%>
+                        <%--                            <label class="layui-form-label">插件审核状态</label>--%>
+                        <%--                            <div class="layui-input-inline">--%>
+                        <%--                                <select id="ppStatus" name="ppStatus">--%>
+                        <%--                                    <option value="">请选择</option>--%>
+                        <%--                                    <option value="0">插件待审核</option>--%>
+                        <%--                                    <option value="1">插件审核中</option>--%>
+                        <%--                                    <option value="2">插件审核驳回</option>--%>
+                        <%--                                    <option value="3">插件审核通过</option>--%>
+                        <%--                                </select>--%>
+                        <%--                            </div>--%>
+                        <%--                        </div>--%>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">商户类型</label>
+                            <div class="layui-input-inline">
+                                <select id="merchantType" name="merchantType">
+                                    <option value="">请选择</option>
+                                    <option value="1">小微</option>
+                                    <option value="2">个体</option>
+                                    <option value="3">企业</option>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">通道商编</label>
+                            <div class="layui-input-inline">
+                                <input type="text" placeholder="请输入内容" id="merchantId" name="merchantId"
+                                       class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">微信商户号</label>
+                            <div class="layui-input-inline">
+                                <input type="text" placeholder="请输入内容" id="wxMercNo" name="wxMercNo"
+                                       class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">支付宝商户号</label>
+                            <div class="layui-input-inline">
+                                <input type="text" placeholder="请输入内容" id="zfbMercNo" name="zfbMercNo"
+                                       class="layui-input">
+                            </div>
+                        </div>
+
+                    </div>
+                </form>
+            </div>
+        </div>
+
+        <!-- 表单数据 -->
+        <table class="layui-hide" id="userAppList" lay-filter="userAppList"></table>
+    </div>
+</div>
+
+<script id="merchantBaseInfo" type="text/html">
+    {{# if(d.merchantType == null || d.merchantType == '') { }}
+    <span style="color: #c2c2c2">无商户信息</span>
+    {{# } else { }}
+    <div class="layui-col-md12" style="color: #1E9FFF; text-align: start;">
+        {{# if (d.merchantType == "1") { }}
+        小微
+        {{# } else if (d.merchantType == "2" ) { }}
+        个体
+        {{# } else if (d.merchantType == "3" ) { }}
+        企业
+        {{# } }}
+        &emsp;&emsp;&emsp;&emsp;
+        {{# if (d.isBlack == true) { }}
+        <span style="color: #FF5722;">已拉黑</span>
+        {{# } }}
+    </div>
+    <hr/>
+    <div class="layui-col-md12" style="color: #393D49; text-align: start;">
+        {{d.merchantCode}}
+    </div>
+    <hr/>
+    <div class="layui-col-md12" style="color: #009688; text-align: start;">
+        {{d.alias}}
+    </div>
+    {{# } }}
+</script>
+
+<script id="userBaseInfo" type="text/html">
+    <div class="layui-col-md12">
+        {{d.userId}}
+    </div>
+    <hr/>
+    <div class="layui-col-md12">
+        {{# if (d.userName == null || d.userName == '') { }}
+        -
+        {{# } else { }}
+        {{d.userName}}
+        {{# } }}
+    </div>
+    <hr/>
+    <div class="layui-col-md12">
+        {{ d.phone.substring(0, 11)}}
+    </div>
+</script>
+
+<script id="parentInfo" type="text/html">
+    {{# if(d.parentUserId == null) { }}
+    暂无上级
+    {{# } else { }}
+    <div class="layui-col-md12">
+        {{d.parentUserId}}
+    </div>
+    <hr/>
+    <div class="layui-col-md12">
+        {{# if (d.parentUserName == null || d.parentUserName == '') { }}
+        -
+        {{# } else { }}
+        {{d.parentUserName}}
+        {{# } }}
+    </div>
+    <hr/>
+    <div class="layui-col-md12">
+        {{d.parentPhone}}
+    </div>
+    {{# } }}
+</script>
+
+<script id="spreadInfo" type="text/html">
+    <div class="layui-col-md12" style="text-align: center">
+        {{# if (d.uiStatus == '-2') { }}
+            <a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="openSpread">
+                打开
+            </a>
+        {{# } else { }}
+            <a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="banSpread">
+                关闭
+            </a>
+        {{# } }}
+    </div>
+    <div class="layui-col-md12" style="text-align: center">
+        {{d.inviteNum}}
+    </div>
+</script>
+
+<script id="extensionParentUserType" type="text/html">
+    {{# if (d.parentUserType == "agent") { }}
+    <span style="color:#FF5722">超级</span>
+    {{# } else if (d.parentUserType == "agent_staff") { }}
+    <span style="color: blue">业务员</span>
+    {{# } else if (d.parentUserType == "agent_agency") { }}
+    <span style="color: green">代理</span>
+    {{# } else if (d.parentUserType == "promoter") { }}
+    <span>普通</span>
+    {{# } }}
+</script>
+
+
+<script id="extensionUserType" type="text/html">
+    {{# if (d.userType == "agent") { }}
+    <span style="color:red">超级</span>
+    {{# } else if (d.userType == "agent_staff") { }}
+    <span style="color: blue">业务员</span>
+    {{# } else if (d.userType == "agent_agency" ) { }}
+    <span style="color: green">代理</span>
+    {{# } else if (d.userType == "promoter") { }}
+    <span>普通</span>
+    {{# } }}
+</script>
+
+<script id="toolBar" type="text/html">
+    <a class="layui-btn layui-btn-sm" lay-event="search">
+        <i class="layui-icon layui-icon-search"></i>查询
+    </a>
+
+    <a class="layui-btn layui-btn-danger layui-btn-sm" lay-event="batch2Blacklist">
+        <i class="layui-icon layui-icon-close-fill"></i>批量拉黑
+    </a>
+</script>
+
+<script id="extensionStatus" type="text/html">
+    {{# if (d.status=='0') { }}
+    <span>未实名</span>
+    {{# } else if (d.status=='1') { }}
+    <span>审核中</span>
+    {{# } else if (d.status=='2') { }}
+    <span>审核失败</span>
+    {{# } else if (d.status=='3') { }}
+    <span>已审核</span>
+    {{# } }}
+</script>
+
+<script id="extensionMerchantType" type="text/html">
+    {{# if (d.merchantType == "1") { }}
+    <span>小微</span>
+    {{# } else if (d.merchantType == "2" ) { }}
+    <span>个体</span>
+    {{# } else if (d.merchantType == "3" ) { }}
+    <span>企业</span>
+    {{# } }}
+</script>
+
+<script id="extensionThirdStatus" type="text/html">
+    {{# if (d.mcsStatus == "1" && d.thirdStatus == "-100") { }}
+    <span style="color: blue">待审核</span>
+    {{# } else if (d.mcsStatus == "1" && d.thirdStatus != "-100") { }}
+    <span style="color: green">审核中</span>
+    {{# } else if ( (d.mcsStatus == "0" && d.thirdStatus == "-100") || d.mcsStatus == "2" ) { }}
+    <span style="color: red">审核驳回</span>
+    {{# } else if (d.mcsStatus == "3" ) { }}
+    {{# if (d.ppStatus == "1" && d.ppThirdStatus == "-100") { }}
+    <span style="color: blue">插件待审核</span>
+    {{# } else if (d.ppStatus == "1" && d.ppThirdStatus != "-100") { }}
+    <span style="color: green">插件审核中</span>
+    {{# } else if ( (d.ppStatus == "0" && d.ppThirdStatus == "-100") || d.ppStatus == "2" ) { }}
+    <span style="color: red">插件审核驳回</span>
+    {{# } else if (d.ppStatus == "3" ) { }}
+    <span>插件审核通过</span>
+    {{# } else if (d.ppStatus == "0" || d.ppStatus == '' || d.ppStatus == null ) { }}
+    <span>审核通过</span>
+    {{# } }}
+    {{# } else  { }}
+    <span>未进件</span>
+    {{# } }}
+</script>
+
+
+<script id="extensionThird3Status" type="text/html">
+    {{ thirdStatus('{{=d.msc3Status}}') }}
+</script>
+
+<script id="extensionThird4Status" type="text/html">
+    {{ thirdStatus('d.msc4Status') }}
+</script>
+
+<script id="lineBar2" type="text/html">
+    <div class="layui-col-md12">
+        <a href="javascript:void(0);" lay-event="sendNotice" class="layui-btn layui-btn-xs">
+            <i class="layui-icon layui-icon-release"></i>&nbsp;发送通知
+        </a>
+    </div>
+</script>
+
+<script id="lineBar" type="text/html">
+    <div style="text-align: center">
+        <div class="layui-col-md12">
+            <a href="javascript:void(0);" lay-event="detail2" class="layui-btn layui-btn-xs">
+                <i class="layui-icon layui-icon-edit"></i>&nbsp;详情
+            </a>
+        </div>
+
+        <div class="layui-col-md12">
+            <a href="javascript:void(0);" lay-event="toBlacklist" class="layui-btn layui-btn-danger layui-btn-xs">
+                <i class="layui-icon layui-icon-close-fill"></i>&nbsp;拉黑
+            </a>
+        </div>
+
+        <div class="layui-col-md12">
+            <a href="javascript:void(0);" lay-event="more" class="layui-btn layui-btn-normal layui-btn-xs">
+                更多&nbsp;<i class="layui-icon layui-icon-down"></i>
+            </a>
+        </div>
+
+        <%--        <a href="javascript:void(0);" lay-event="detail" class="layui-btn layui-btn-xs">--%>
+        <%--            <i class="layui-icon layui-icon-edit"></i>详情old--%>
+        <%--        </a>--%>
+
+
+    </div>
+</script>
+
+
+<script type="text/template" id="upgrade">
+    <form class="layui-form" id="form2" style="margin-top: 1rem;">
+        <div class="layui-form-item" style="width: 300px;">
+            <label class="layui-form-label">选择等级</label>
+            <div class="layui-input-block">
+                <select class="layui-select" id="leveCode" name="leveCode">
+
+                </select>
+            </div>
+        </div>
+    </form>
+</script>
+
+<script type="text/javascript">
+    var layer;
+    var laytpl;
+    var form;
+    var table;
+    var laydate;
+    var dropdown;
+
+    //form表单样式
+    layui.use(['table', 'layer', 'form', 'laydate', 'dropdown'], function () {
+        layer = layui.layer;
+        laytpl = layui.laytpl;
+        form = layui.form;
+        table = layui.table;
+        laydate = layui.laydate;
+        dropdown = layui.dropdown;
+        form.render();
+
+        $("#userId").bind("input propertychange", function (event) {
+            if ($("#userId").val() == null || $("#userId").val() == "") {
+                $("#sameIp").attr("disabled", true);
+                $("#sameIp").removeAttr("checked");
+                $("#sameIp").prop({checked: false});
+            } else {
+                $("#sameIp").attr("disabled", false);
+            }
+
+            form.render();
+        });
+
+        //执行一个 table 实例
+        table.render({
+            elem: '#userAppList'
+            , id: 'userAppList'
+            , url: ctx + '/promoter/queryUserAppByPage' //数据接口
+            , autoSort: false
+            , where: form.val("formCondition")
+            , response: {
+                statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.count, //解析数据长度
+                    "data": res.userAppList //解析数据列表
+                };
+            }
+            , request: {
+                pageName: 'currPage' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , even: true
+            , title: '推广员列表'
+            , page: true //开启分页
+            , toolbar: '#toolBar' //开启工具栏，此处显示默认图标，可以自定义模板，详见文档
+            , defaultToolbar: ['filter']
+            , cols: [[ //表头
+                {type: 'checkbox', minWidth: 40, rowspan: 2}
+                , {title: '用户基本信息', width: 105, align: "left", rowspan: 2, templet: '#userBaseInfo'}
+                , {field: 'levelName', title: '等级', width: 60, align: "left", rowspan: 2}
+                , {field: 'inviteNum', title: '推广码', width: 80, align: "left", rowspan: 2, templet: '#spreadInfo'}
+                , {
+                    field: 'userType',
+                    title: '用户类型',
+                    minWidth: 83,
+                    align: "left",
+                    templet: '#extensionUserType',
+                    rowspan: 2
+                }
+                , {
+                    field: 'roleCode',
+                    title: '用户标签',
+                    minWidth: 83,
+                    rowspan: 2,
+                    templet: function (d) {
+                        if (d.roleCode == "ZY_BST") {
+                            return '<span style="color: red">倍斯特</span>';
+                        } else {
+                            return '<span>-</span>';
+                        }
+                    }
+                }
+                , {
+                    field: 'status',
+                    title: '实名状态',
+                    align: "left",
+                    minWidth: 83,
+                    templet: '#extensionStatus',
+                    rowspan: 2
+                }
+                , {title: "上级", align: "center", colspan: 2}
+                , {title: '商户基本信息', minWidth: 158, align: 'center', templet: '#merchantBaseInfo', rowspan: 2}
+                , {
+                    title: '进件审核状态',
+                    align: "center",
+                    minWidth: 160,
+                    templet: '#extensionThirdStatus',
+                    rowspan: 1,
+                    colspan: 3
+                }
+                , {
+                    title: 'D1微信子商户号<hr/>支付宝子商户号',
+                    align: "center",
+                    minWidth: 130,
+                    field: "wxMercNoD1",
+                    rowspan: 2,
+                    templet: '<div>{{d.wxMercNoD1}}<hr/>{{zfbMercNoD1}}</div'
+                }
+                , {
+                    title: 'D0微信子商户号<hr/>支付宝子商户号',
+                    align: "center",
+                    minWidth: 130,
+                    field: "wxMercNoD0",
+                    rowspan: 2,
+                    templet: '<div>{{d.wxMercNoD0}}<hr/>{{zfbMercNoD0}}</div'
+                }
+
+                // , {
+                //     field: 'channel',
+                //     title: '通道',
+                //     align: "center",
+                //     minWidth: 80
+                //     , templet: function (r) {
+                //         if (r.channel == 1) {
+                //             return '随行付'
+                //         } else if (r.channel == 2) {
+                //             return '乐刷'
+                //         } else if (r.channel == 3) {
+                //             return '瑞银信'
+                //         } else if (r.channel == 3) {
+                //             return '瑞银信'
+                //         }
+                //     }
+                //     , rowspan: 1
+                // }
+                , {
+                    field: 'createDt',
+                    title: '创建时间',
+                    align: "left",
+                    minWidth: 158,
+                    rowspan: 2,
+                    templet: '<div>{{layui.util.toDateString(d.createDt,"yyyy-MM-dd HH:mm")}}</div'
+                }
+                , {fixed: 'right', title: '操作', align: "left", minWidth: 100, rowspan: 2, toolbar: '#lineBar2'}
+                , {fixed: 'right', title: '操作', minWidth: 80, align: 'center', toolbar: '#lineBar', rowspan: 2}
+                , {
+                    field: 'merchantCode',
+                    fixed: 'right',
+                    title: 'M800商编',
+                    minWidth: 180,
+                    align: 'center',
+                    rowspan: 2,
+                    hide: true
+                }
+            ],
+                [
+                    {
+                        title: '上级信息', align: "left", width: 105, rowspan: 1, templet: '#parentInfo'
+                        , style: "padding: 0;"
+                    }
+                    , {
+                    field: 'parentUserType',
+                    title: '类型',
+                    width: 65,
+                    templet: '#extensionParentUserType',
+                    align: "left"
+                    , rowspan: 1
+                }
+                    ,
+                    {
+                        field: 'mcsStatus',
+                        title: '随行付',
+                        align: "left",
+                        width: 150,
+                        rowspan: 1,
+                        templet: function (r) {
+                            return thirdStatus(r.channelStatusList, r.ppStatus, r.ppThirdStatus, 1);
+                        }
+                    }
+                    , {
+                    field: 'mcs3Status',
+                    title: '瑞银信',
+                    align: "left",
+                    width: 150,
+                    rowspan: 1,
+                    templet: function (r) {
+                        return thirdStatus(r.channelStatusList, r.ppStatus, r.ppThirdStatus, 3);
+                    }
+                }
+                    , {
+                    field: 'mcs4Status',
+                    title: '银盛',
+                    align: "left",
+                    width: 190,
+                    rowspan: 1,
+                    templet: function (r) {
+                        return thirdStatus(r.channelStatusList, r.ppStatus, r.ppThirdStatus, 4);
+                    }
+                }
+                ]
+            ],
+            done: function (index, layero) {
+                //表头部分
+                //动态监听表头高度变化，冻结行跟着改变高度
+                $(".layui-table-header  tr").resize(function () {
+                    $(".layui-table-header  tr").each(function (index, val) {
+                        $($(".layui-table-fixed .layui-table-header table tr")[index]).height(val.getBoundingClientRect().height);
+                    });
+                });
+                //初始化高度，使得冻结行表头高度一致
+                $(".layui-table-header  tr").each(function (index, val) {
+                    let initElement = $(".layui-table-fixed .layui-table-header table tr")[index]
+                    if (initElement != null) {
+                        $(initElement).height(val.getBoundingClientRect().height);
+                        $(initElement).find("th").removeAttr("style");
+                    }
+                });
+
+                //表体部分
+                //动态监听表体高度变化，冻结行跟着改变高度
+                $(".layui-table-body  tr").resize(function () {
+                    $(".layui-table-body  tr").each(function (index, val) {
+                        $($(".layui-table-fixed .layui-table-body table tr")[index]).height(val.getBoundingClientRect().height);
+                    });
+                });
+                //初始化高度，使得冻结行表体高度一致
+                $(".layui-table-body  tr").each(function (index, val) {
+                    $($(".layui-table-fixed .layui-table-body table tr")[index]).height(val.getBoundingClientRect().height);
+                });
+            }
+
+        });
+
+        table.on('toolbar(userAppList)', function (obj) {
+            switch (obj.event) {
+                case 'search':
+                    queryUserApp();
+                    break;
+                case 'batch2Blacklist':
+                    let checkStatus = table.checkStatus('userAppList');
+                    let data = checkStatus.data;
+                    if (data.length === 0) {
+                        layer.msg("至少选择一行数据");
+                        return;
+                    }
+
+                    let userIdList = [];
+                    let url = ctx + "/riskBlacklist/batchForm?";
+                    data.forEach(function (d) {
+                        userIdList.push(d.userId);
+                        url += "userId=" + d.userId + "&";
+                    })
+
+                    layer.open({
+                        type: 2,
+                        title: '加入黑名单',
+                        shadeClose: true,
+                        shade: false,
+                        maxmin: true, //开启最大化最小化按钮
+                        area: ['400px', '400px'],
+                        content: url
+                    });
+
+                    break;
+            }
+        });
+
+        function verifyFaceCert(userId) {
+            layer.confirm('是否核实用户信息，并确认人脸核验通过?', {icon: 3, title: '提示'}, function (index) {
+                $.ajax({
+                    url: ctx + "/userInfo/verifyFaceCert"
+                    , type: 'POST'
+                    , data: {
+                        userId: userId
+                    }
+                    , success: function (d) {
+                        layer.alert(d.message);
+
+                        if (d.code === 200) {
+                            layer.close(index);
+                        }
+                    }
+                })
+            })
+        }
+
+        //监听行工具事件
+        table.on('tool(userAppList)', function (obj) { //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            var data = obj.data //获得当前行数据
+                , that = this
+                , layEvent = obj.event; //获得 lay-event 对应的值
+
+            switch (layEvent) {
+                case 'detail2':
+                    showUserAppDetails2(obj.data);
+                    break;
+                case 'level':
+                    goLevel(data.id, data.level);
+                    break;
+                case 'examine':
+                    toExamine(data.id);
+                    break;
+                case 'clearChannel':
+                    showClearChannelTip(obj.data);
+                    break;
+                case 'allowAudit':
+                    showAllowAuditTip(obj.data);
+                    break;
+                case 'toBlacklist':
+                    toBlacklist(data.userId);
+                    break;
+                case 'sendSignMsg':
+                    sendSignMsg(data.merchantCode);
+                    break;
+                case 'openD0':
+                    openD0(data.merchantCode);
+                    break;
+                case 'banSpread':
+                    banSpread(data.userId);
+                    break;
+                case 'openSpread':
+                    openSpread(data.userId);
+                    break;
+                case 'createAuditingData':
+                    createAuditingData(data.merchantCode);
+                    break;
+                case 'outBlack':
+                    debugger;
+                    outBlack(data);
+                    break;
+                case 'sendNotice':
+                    sendNotice(data)
+                    break;
+                case 'more':
+                    let itemData = [{
+                        title: '重进/进件银盛'
+                        , id: 'reAuditYs'
+                    }, {
+                        title: '实名审核'
+                        , id: 'examine'
+                    }, {
+                        title: '通道数据清理'
+                        , id: 'clearChannel'
+                    }, {
+                        title: '允许进件'
+                        , id: 'allowAudit'
+                    }, {
+                        title: '人脸识别通过'
+                        , id: 'verifyFaceCert'
+                    },{
+                        title: '生成待审核数据'
+                        , id: 'createAuditingData'
+                    }];
+                    if (data.status == '3') {
+                        itemData.push({
+                            title: '升级'
+                            , id: 'level'
+                        });
+                    }
+
+                    if (data.isBlack === true) {
+                        itemData.push({
+                            title: '解除拉黑'
+                            , id: 'outBlack'
+                        });
+                    }
+
+                    dropdown.render({
+                        elem: that
+                        , show: true //外部事件触发即显示
+                        , data: itemData
+                        , className: 'site-dropdown-demo'
+                        , click: function (mData, othis) {
+                            switch (mData.id) {
+                                case 'level':
+                                    goLevel(data.id, data.level);
+                                    break;
+                                case 'examine':
+                                    toExamine(data.id);
+                                    break;
+                                case 'clearChannel':
+                                    showClearChannelTip(obj.data);
+                                    break;
+                                case 'allowAudit':
+                                    showAllowAuditTip(obj.data);
+                                    break;
+                                case 'reAuditYs':
+                                    reAuditYs(obj.data);
+                                    break;
+                                case 'outBlack':
+                                    outBlack(obj.data);
+                                    break;
+                                case 'createAuditingData':
+                                    createAuditingData(data.merchantCode);
+                                    break;
+                                case 'closeSpreadPerm':
+                                    closeSpreadPerm(data.userId);
+                                    break;
+                                case 'verifyFaceCert':
+                                    verifyFaceCert(data.userId);
+                                    break;
+                            }
+                        }
+                        , align: 'right' //右对齐弹出（v2.6.8 新增）
+                        , style: 'box-shadow: 1px 1px 10px rgb(0 0 0 / 12%);' //设置额外样式
+                    });
+                    break;
+            }
+        });
+    });
+
+    function sendNotice(obj) {
+        var url = ctx + '/notice/detail?userId=' + obj.userId;
+        var index = layer.open({
+            type: 2
+            , title: "通知详情"
+            , shade: 0.5
+            , maxmin: true
+            , content: url
+            , area: ['753px', '700px']
+            , end: function () {
+                time: 1000
+            }
+        });
+    }
+
+    function closeSpreadPerm(userId) {
+        layer.confirm('是否关闭' + userId + '推广权限?', {icon: 3, title: '提示'}, function (index) {
+            var url = ctx + "/userApp/closeSpreadPerm";
+
+            layer.load(2);
+            $.ajax({
+                url: url
+                , type: "POST"
+                , data: {
+                    userId: userId
+                }
+                , complete: function () {
+                    layer.closeAll('loading');
+                }
+                , success: function (d) {
+                    layer.close(index);
+                    layer.alert(d.message);
+                }
+            })
+        });
+    }
+
+    function createAuditingData(merchantCode) {
+        layer.confirm('是否生成进件审核信息?', {icon: 3, title: '提示'}, function (index) {
+            var url = ctx + "/channelStatus/createNewAuditData";
+
+            layer.load(2);
+            $.ajax({
+                url: url
+                , type: "POST"
+                , data: {
+                    merchantCode: merchantCode
+                }
+                , complete: function () {
+                    layer.closeAll('loading');
+                }
+                , success: function (d) {
+                    layer.close(index);
+                    layer.alert(d.message);
+                }
+            })
+        });
+    }
+
+    function reAuditYs(data) {
+        layer.confirm('是否(重新)进件银盛?', {icon: 3, title: '提示'}, function (index) {
+            var url = ctx + "/merchantStore/reAuditYs/" + data.merchantCode;
+
+            layer.load(2);
+            $.ajax({
+                url: url
+                , type: "POST"
+                , complete: function () {
+                    layer.closeAll('loading');
+                }
+                , success: function (d) {
+                    layer.close(index);
+                    layer.alert(d.msg);
+                }
+            })
+        });
+    }
+
+    function showAllowAuditTip(data) {
+        layer.confirm('是否允许提交进件?', {icon: 3, title: '提示'}, function (index) {
+            var url = ctx + "/merchantStore/canAudit";
+
+            $.ajax({
+                url: url,
+                type: "POST",
+                data: {
+                    userId: data.userId
+                },
+                success: function (d) {
+                    layer.alert(d.msg);
+                }
+            })
+
+            layer.close(index);
+        });
+    }
+
+    function showClearChannelTip(data) {
+        layer.confirm('是否清理进件驳回、待审核数据的通道信息?', {icon: 3, title: '提示'}, function (index) {
+            var url = ctx + "/channelStatus/clearRejectedChannel";
+
+            $.ajax({
+                url: url,
+                type: "POST",
+                data: {
+                    merchantCode: data.merchantCode
+                },
+                success: function (d) {
+                    layer.alert(d.message);
+                }
+            });
+
+            layer.close(index);
+        });
+    }
+
+    function showUserAppDetails(obj) {
+        var url = ctx + "/promoter/queryUserAppBaseInfo/" + obj.userId;
+        var index = layer.open({
+            type: 2
+            , title: "详情"
+            , shade: 0.5
+            , maxmin: true
+            , content: url
+            , area: ['100%', '95%']
+            , resize: true
+        });
+        layer.full(index);
+    }
+
+    function showUserAppDetails2(obj) {
+        var url = ctx + "/promoter/detail/" + obj.userId;
+        parent.layui.index.openTabsPage(url, obj.userId + "-详情")
+
+        // var index = layer.open({
+        //     type: 2
+        //     , title: "详情"
+        //     , shade: 0.5
+        //     , maxmin: true
+        //     , content: url
+        //     , area: ['100%', '95%']
+        // });
+        // layer.full(index);
+        //
+        // window.onresize = function () {
+        //     layer.style(index, {
+        //         width: '100%'
+        //         , height: '95%'
+        //     })
+        //     layer.full(index);
+        // }
+    }
+
+    //查询
+    function queryUserApp() {
+        console.log($("#userId").val())
+        table.reload('userAppList', {
+            page: {
+                curr: 1
+            }
+            , where: form.val("formCondition")
+        });
+    }
+
+    function thirdStatus(channelStatusList, ppStatus, ppThirdStatus, channel) {
+
+        // 结果信息
+        let result = '<div class="layui-col-md12">';
+        let flag = false;
+        let undefinedChannel;
+
+        /**
+         * forEach无法通过return中断
+         */
+        for (let i = 0; i < channelStatusList.length; i++) {
+            let item = channelStatusList[i];
+
+            if (item.channel == null) {
+                undefinedChannel = item;
+            }
+
+            if (item.channel == channel) {
+                flag = true;
+                // 只操作指定的通道信息
+                if ((item.status == "0" && item.thirdStatus == "-100") || item.status == "2") {
+                    result += '<span style="color: #FF5722;">审核驳回</span>';
+                }
+
+                if (item.status == '1' && item.thirdStatus == '-100') {
+                    result += '<span style="color: blue">待审核</span>';
+                }
+
+                if (item.status == "1" && item.thirdStatus != "-100") {
+                    if (channel == '3' && item.thirdStatus == '5') {
+                        result += '<span style="color: green">待商户签约</span>';
+                    } else {
+                        if (item.thirdStatus == '-999') {
+                            result += '<span style="color: green">后台进件中...</span>';
+                        } else {
+                            result += '<span style="color: green">审核中</span>';
+                        }
+                    }
+                }
+
+                if (item.status == "3") {
+                    result += '<span style="color: green">审核通过</span>'
+                }
+
+                if (item.status == "6") {
+                    result += '<span style="color: green">结算信息变更中</span>'
+                }
+
+                if (item.status == '8') {
+                    result += '<span style="color: green">待商户签约</span>'
+                }
+
+                if (item.status == '9') {
+                    result += '<span style="color: green">已签约, 待复审</span>'
+                }
+
+                if (item.status == "7") {
+                    result += '<span style="color: green">快付审核中</span>'
+                }
+
+                if ((item.status == "3" || item.status == "6") && channel == '3') {
+                    // 瑞银信，需要判断插件
+                    if (ppStatus == "1" && ppThirdStatus == "-100") {
+                        result += ' <span style="color: blue">插件待审核</span>';
+                    } else if (ppStatus == "1" && ppThirdStatus != "-100") {
+                        result += ' <span style="color: green">插件审核中</span>';
+                    } else if ((ppStatus == "0" && ppThirdStatus == "-100") || ppStatus == "2") {
+                        result += ' <span style="color: red">插件审核驳回</span>';
+                    } else if (ppStatus == "3") {
+                        result += ' <span style="color: green">插件审核通过</span>';
+                    } else if (ppStatus == "0" || ppStatus == '' || ppStatus == null) {
+                        result += '';
+                    } else {
+                        result += ' <span style="color: #c2c2c2;">插件未知状态</span>';
+                    }
+                }
+
+                if (item.status == '8' && channel == '4') {
+                    result += '<a class="layui-btn layui-btn-normal layui-btn-xs" style="float:right;" lay-event="sendSignMsg">' +
+                        '<i class="layui-icon layui-icon-release"></i>签约短信' +
+                        '</a>';
+                }
+
+                if (item.status == '3' && channel == '4') {
+                    result += '<a class="layui-btn layui-btn-normal layui-btn-xs" style="float:right;" lay-event="openD0">' +
+                        '<i class="layui-icon layui-icon-release"></i>开通DO' +
+                        '</a>';
+                }
+
+                if (item.merchantId != null && item.merchantId != '') {
+                    result += '</div><hr/>';
+                    result += '<div class="layui-col-md12">';
+                    result += item.merchantId;
+                }
+
+                result += '</div><hr/>';
+                result += '<div class="layui-col-md12">';
+                result += layui.util.toDateString(item.updateTime, 'yyyy-MM-dd HH:mm:ss');
+            }
+        }
+
+        if (undefinedChannel != null && !flag) {
+            if (undefinedChannel.status == '1' && undefinedChannel.thirdStatus == '-100') {
+                result += '<span style="color: blue">待审核</span>';
+                result += '</div><hr/>';
+                result += '<div class="layui-col-md12">';
+                result += layui.util.toDateString(undefinedChannel.updateTime, 'yyyy-MM-dd HH:mm:ss');
+            }
+
+            if (undefinedChannel.status == '0' && undefinedChannel.thirdStatus == '-100' || undefinedChannel.status == '2') {
+                result += '<span style="color: blue">审核驳回</span>';
+                result += '</div><hr/>';
+                result += '<div class="layui-col-md12">';
+                result += layui.util.toDateString(undefinedChannel.updateTime, 'yyyy-MM-dd HH:mm:ss');
+            }
+
+        } else if (!flag) {
+            if (channel == '3' && ppStatus != null && ppStatus != '') {
+                // 瑞银信，需要判断插件
+                if (ppStatus == "1" && ppThirdStatus == "-100") {
+                    result += ' <span style="color: blue">插件待审核</span>';
+                } else if (ppStatus == "1" && ppThirdStatus != "-100") {
+                    result += ' <span style="color: green">插件审核中</span>';
+                } else if ((ppStatus == "0" && ppThirdStatus == "-100") || ppStatus == "2") {
+                    result += '<span style="color: red">插件审核驳回</span>';
+                } else if (ppStatus == "3") {
+                    result += ' <span style="color: green">插件审核通过</span>';
+                } else if (ppStatus == "0" || ppStatus == '' || ppStatus == null) {
+                    result += '';
+                } else {
+                    result += ' <span style="color: #c2c2c2;">插件未知状态</span>';
+                }
+            } else {
+                result += '<span style="color: #c2c2c2">-</span>';
+            }
+        }
+
+        // if (mscStatus == "1" && mscStatus != "-100") {
+        //     return '<span style="color: green">审核中</span>';
+        // }
+
+        result += '</div>';
+        return result;
+    }
+
+    function toBlacklist(userId) {
+        layer.open({
+            type: 2,
+            title: '加入黑名单',
+            shadeClose: true,
+            shade: false,
+            maxmin: true, //开启最大化最小化按钮
+            area: ['400px', '400px'],
+            content: ctx + "/riskBlacklist/simpleForm?userId=" + userId
+        });
+    }
+
+    function outBlack(obj) {
+        layer.confirm('是否解除黑名单?', {icon: 3, title: '提示'}, function (index) {
+            $.ajax({
+                url: ctx + "/riskBlacklist/relieve"
+                , type: 'POST'
+                , data: {
+                    userId: obj.userId
+                }
+                , success: function (d) {
+                    layer.alert(d.message);
+
+                    if (d.code == 200) {
+                        layer.close(index);
+                    }
+                }
+            })
+        })
+    }
+
+    function sendSignMsg(merchantCode) {
+        layer.confirm('发送签约短信及通知', {icon: 3, title: '提示'}, function (index) {
+            var url = ctx + "/channelStatus/sendSignMsg";
+
+            $.ajax({
+                url: url,
+                type: "POST",
+                data: {
+                    merchantCode: merchantCode
+                },
+                success: function (d) {
+                    layer.alert(d.message);
+                    layer.close(index);
+                }
+            });
+
+
+        });
+    }
+
+    function openD0(merchantCode) {
+        layer.confirm('开通线上支付以及D0权限？', {icon: 3, title: '提示'}, function (index) {
+            var url = ctx + "/channelStatus/openOnlinePay";
+
+            $.ajax({
+                url: url,
+                type: "POST",
+                data: {
+                    merchantCode: merchantCode
+                },
+                success: function (d) {
+                    layer.alert(d.message);
+                }
+            });
+
+            layer.close(index);
+        });
+    }
+
+    function banSpread(userId) {
+        layer.confirm('是否关闭' + userId + '推广权限?', {icon: 3, title: '提示'}, function (index) {
+            var url = ctx + "/userApp/closeSpreadPerm";
+
+            layer.load(2);
+            $.ajax({
+                url: url
+                , type: "POST"
+                , data: {
+                    userId: userId
+                }
+                , complete: function () {
+                    layer.closeAll('loading');
+                }
+                , success: function (d) {
+                    layer.close(index);
+                    layer.alert(d.message);
+                }
+            })
+        });
+    }
+
+    function openSpread(userId) {
+        layer.confirm('是否打开' + userId + '推广权限?', {icon: 3, title: '提示'}, function (index) {
+            var url = ctx + "/userApp/openSpreadPerm";
+
+            layer.load(2);
+            $.ajax({
+                url: url
+                , type: "POST"
+                , data: {
+                    userId: userId
+                }
+                , complete: function () {
+                    layer.closeAll('loading');
+                }
+                , success: function (d) {
+                    layer.close(index);
+                    layer.alert(d.message);
+                }
+            })
+        });
+    }
+</script>
+</body>
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/qrCode/qrCodeList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/qrCode/qrCodeList.jsp
new file mode 100644
index 0000000..8b86854
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/qrCode/qrCodeList.jsp
@@ -0,0 +1,163 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+    <script type="text/javascript">
+        require("qrCode/qrCodeList.js");
+    </script>
+
+    <style>
+        .layui-table th {
+            text-align: center;
+        }
+    </style>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="buttons fl">
+                        <a class="layui-btn layui-btn-sm fa fa-search f13" href="javascript:void(0);"
+                           onclick="qrCodeQueryInit()"><span>搜索</span></a>
+                        <a class="layui-btn layui-btn-sm fa fa-plus f13 add" href="javascript:void(0);"
+                           onclick="initAddQrCode()"><span>添加</span></a>
+                        <a class="layui-btn layui-btn-sm fa fa-plus f13 add" href="javascript:void(0);"
+                           onclick="initBatchAddQrde()"><span>批量添加</span></a>
+                        <a class="layui-btn layui-btn-sm layui-btn-danger fa fa-remove f13 delete" href="javascript:void(0);"
+                           onclick="initBatchDeleteCode()"><span>删除</span></a>
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" action="" style="margin-top: 10px">
+                    <div class="layui-form-item">
+                        <!-- <span class="dlblock w100 textr">ID：</span>
+                        <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+                            <input type="text" placeholder="请输入内容" id="searchId">
+                        </span>  -->
+                        <div class="layui-inline">
+                            <label class="layui-form-label">二维码编号</label>
+                            <div class="layui-input-inline">
+                                <input type="text" id="qrNo" placeholder="请输入二维码编号" class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">状态</label>
+                            <div class="layui-input-inline">
+                                <select class="form-control f12 w180 textc" id="status">
+                                    <option value="">请选择</option>
+                                    <option value="1">未出售</option>
+                                    <option value="2">已出售</option>
+                                    <option value="3">已激活</option>
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <!-- 表单数据 -->
+    <div class="mb20 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-table">
+                <thead>
+                <tr>
+                    <th class="textc">
+                        <div class="checker" id="allCheck">
+                            <span class=""><input type="checkbox" value=""></span>
+                        </div>
+                    </th>
+                    <th class="textc ">序号</th>
+                    <th class="textc ">二维码编号</th>
+                    <!-- <th class="textc "></th> -->
+                    <th class="textc wp15">设备单号</th>
+                    <th class="textc ">购买商家ID</th>
+                    <th class="textc ">购买商家名称</th>
+                    <th class="textc ">激活商家ID</th>
+                    <th class="textc ">激活商家名称</th>
+                    <th class="textc ">状态</th>
+                    <th class="textc ">创建时间</th>
+                    <th class="textc">操作</th>
+                </tr>
+                </thead>
+                <!-- 数据体 -->
+                <tbody id="data_content">
+                </tbody>
+            </table>
+
+            <!-- footer -->
+            <div class="clearfix mb10 pb20">
+                <div class="layui-tab-item fr">
+                    <span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+                    <span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>
+                    <div class="pagination dlblock vm" id="pagination"></div>
+                    <span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>
+                </div>
+            </div>
+
+        </div>
+    </div>
+</div>
+
+<script type="text/html" id="addContent">
+    <form class="layui-form" id="addForm" action="">
+        <div class="layui-form-item">
+            <label class="layui-form-label">二维码编号</label>
+            <div class="layui-input-block">
+                <input type="text" name="qrNo" id="qrNoInput" required maxlength="10" lay-verify="required"
+                       style="width:160px;" placeholder="请输入二维码编号" autocomplete="off" class="layui-input">
+            </div>
+        </div>
+    </form>
+</script>
+
+<script type="text/html" id="addBathContent">
+    <form class="layui-form" id="addBathForm" action="">
+        <div class="layui-inline">
+            <label class="layui-form-label">编号范围</label>
+            <div class="layui-input-inline" style="width: 150px;">
+                <input type="text" name="qrNoStartInput" id="qrNoStartInput" maxlength="10" autocomplete="off"
+                       placeholder="请输入开始值" class="layui-input">
+            </div>
+            <div class="layui-input-inline" style="width: 150px;">
+                <input type="text" name="qrNoEndInput" id="qrNoEndInput" maxlength="10" autocomplete="off"
+                       placeholder="请输入结束值" class="layui-input">
+            </div>
+        </div>
+    </form>
+</script>
+
+<script type="text/javascript">
+    //form表单样式
+    layui.use(['layer', 'form'], function () {
+        var form = layui.form;
+        form.render();
+    });
+</script>
+</body>
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/questionsAnswers/questionsAnswersBaseInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/questionsAnswers/questionsAnswersBaseInfo.jsp
new file mode 100644
index 0000000..63229df
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/questionsAnswers/questionsAnswersBaseInfo.jsp
@@ -0,0 +1,111 @@
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+    <style>
+        .layui-input, .layui-textarea {
+            border-color: #606060;
+        }
+    </style>
+</head>
+<body>
+<form class="layui-form" action="" style="width: 80%; margin-top: 20px">
+    <input name="id" value="${entity.id}" hidden/>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">问题</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="question" value="${entity.question}" placeholder="请输入问题" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">回答</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <textarea placeholder="请输入内容" name="answer" id="answer"
+                          class="layui-textarea">${entity.answer}</textarea>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">排序</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="seq" value="${entity.seq}" placeholder="请输入排序" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">状态</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <select name="status" lay-filter="aihao" id="status">
+                    <option value="">请选择</option>
+                    <option value="1" <c:if test="${entity.status eq '1' }">selected</c:if>>显示
+                    </option>
+                    <option value="0" <c:if test="${entity.status eq '0' }">selected</c:if>>不显示
+                    </option>
+                </select>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button class="layui-btn" lay-submit lay-filter="formDemo">立即提交</button>
+            <button type="button" id="close" class="layui-btn layui-btn-primary">关闭</button>
+        </div>
+    </div>
+</form>
+
+<script>
+    //Demo
+    layui.use(['form', 'layer'], function () {
+        var form = layui.form;
+        var layer = layui.layer;
+
+        $('#close').click(function () {
+            parent.layer.closeAll();
+        });
+        //监听提交
+        form.on('submit(formDemo)', function(data){
+            var index = layer.load(1,{shade: [0.1,'#000'] });
+            $.ajax({
+                url: '${ctx}/questionsAnswers/saveOrUpdate',
+                method: 'post',
+                data: JSON.stringify(data.field),
+                dataType: 'JSON',
+                contentType:"application/json",
+                success: function(res) {
+                    if(res.code == 200) {
+                        layer.alert(res.message,function(){
+                            parent.location.reload();
+                        })
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 5
+                        });
+                    }
+                }
+            })
+            return false;
+        });
+    });
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/questionsAnswers/questionsAnswersBaseReadInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/questionsAnswers/questionsAnswersBaseReadInfo.jsp
new file mode 100644
index 0000000..4f6c248
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/questionsAnswers/questionsAnswersBaseReadInfo.jsp
@@ -0,0 +1,74 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!-- <script type="text/javascript">
+  window.UMEDITOR_HOME_URL = ctx + "/page/umeditor/";
+  var URL = window.UEDITOR_HOME_URL;
+</script> -->
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">  
+	<div class="tab-pane active">     
+		<div class="panel-body">
+			<div class="wrapper wrapper-content">
+				<div class="panel-form animated fadeInRight wp60 fc">
+					<div class="layui-form-item dn	has-error" >   
+						<label class="layui-form-label">id</label>  
+						<div class="layui-input-block">
+							<input type="text" name="id" lay-verify="title" id="id" autocomplete="off" readonly="readonly" class="layui-input" value="${questionsAnswers.id }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">问题</label>  
+						<div class="layui-input-block">
+							<input type="text" name="question" id="question" lay-verify="title" autocomplete="off" readonly="readonly" class="layui-input" value="${questionsAnswers.question }" >
+						</div>  
+					</div>
+					
+					<div class="layui-form-item layui-form-text">
+                    <label class="layui-form-label">回答</label>  
+                    <div class="layui-input-block">              
+                        <textarea readonly="readonly" name="answer"  id="answer" class="layui-textarea">${questionsAnswers.answer }</textarea>
+                    </div>
+                </div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">排序</label>  
+						<div class="layui-input-block">
+							<input type="text" name="seq"  id="seq" lay-verify="title" autocomplete="off" readonly="readonly" class="layui-input" value="${questionsAnswers.seq }" >
+						</div>  
+					</div>
+					
+						<div class="form-group">
+			                <div class="layui-form-item">          
+			                    <label class="layui-form-label">状态</label>
+			                    <div class="layui-input-block">
+			                    <input type="text" name="status" id="status" lay-verify="title" autocomplete="off" readonly="readonly" class="layui-input"
+			                     value="<c:if test="${questionsAnswers.status eq '1' }">显示</c:if><c:if test="${questionsAnswers.status eq '0' }">不显示</c:if>"
+			                    	 >          
+			                    </div>
+			                </div>
+			            </div>
+					
+					<%-- <div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">状态</label>  
+						<div class="layui-input-block">
+							<input type="text" name="status" lay-verify="title" autocomplete="off" readonly="readonly" class="layui-input" value="${questionsAnswers.status }" >
+						</div>  
+					</div> --%>
+	
+				</div>
+			</div>
+		</div>  
+	</div>
+</form>
+<script type="text/javascript">
+    //form表单样式
+    layui.use(['layer', 'form'], function() {    
+        var layer = layui.layer,
+            form = layui.form;
+        form.render();
+    });
+   /*  $(function(){
+        UM.getEditor('answer');
+        
+    }) */
+</script>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/questionsAnswers/questionsAnswersDetails.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/questionsAnswers/questionsAnswersDetails.jsp
new file mode 100644
index 0000000..4e585f1
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/questionsAnswers/questionsAnswersDetails.jsp
@@ -0,0 +1,60 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>     
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">                      
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black"> 
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> 
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->                                     
+<meta name="viewport"
+	content="width=device-width, initial-scale=1.0, maximum-scale=1.0">   
+<jsp:include page="../../common.jsp" />
+<%-- <link rel="stylesheet" type="text/css" href="${ctx}/page/umeditor/themes/default/css/umeditor.css">
+<script type="text/javascript" src="${ctx}/page/umeditor/third-party/template.min.js"></script>
+<script type="text/javascript" src="${ctx}/page/umeditor/umeditor.config.js"></script>
+<script type="text/javascript" src="${ctx}/page/umeditor/umeditor.min.js"></script>
+<script type="text/javascript" src="${ctx}/page/umeditor/lang/zh-cn/zh-cn.js"></script> --%>
+<script type="text/javascript">
+    require("questionsAnswers/questionsAnswersDetails.js");
+    
+</script>
+<title>编辑</title>
+</head>                                 
+	<body class="lgraybg">            
+		<div class="	container-fluid animated fadeInRight col-sm-12">
+			<div class="panel-toolbar mt10 mb10 pt5 pb5 pl10 bdd whitebg">
+				<div class="buttons">
+					<a href="javascript:void(0);" class="btn btn-primary fa fa-save f12"><span>保存</span></a>
+					<a href="${ctx }/questionsAnswers/index?pageIndex=${pageIndex}"  class="btn btn-primary fa fa-back f12" id="goback"><span>返回</span></a>
+				</div>
+			</div>
+				<div class="tabs-container whitebg">
+					<div class="pt10 pl5 pr5">
+						<ul class="nav nav-tabs" id="nav-tabs">
+							<li class="active" data-action="base">   
+								<a href="javascript:void(0);" >基本资料</a>
+							</li>
+							<!-- <li class="" data-action="functions">
+								<a href="javascript:void(0);"  >多功能输入</a>
+							</li>
+							<li class="" data-action="extends">
+								<a href="javascript:void(0);" >扩展属性</a>
+							</li> -->
+						</ul>
+						<div class="tab-content pt30 p30">               
+		
+						</div>     
+					</div>
+				</div>    
+		</div>
+		<!-- 隐藏域 -->
+		<input type="hidden" id="questionsAnswersId" value="${questionsAnswers.id }"/>
+	</body>
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/questionsAnswers/questionsAnswersExtendsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/questionsAnswers/questionsAnswersExtendsInfo.jsp
new file mode 100644
index 0000000..592687a
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/questionsAnswers/questionsAnswersExtendsInfo.jsp
@@ -0,0 +1,201 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>           
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> 
+<div class="tab-pane active">      
+	<div class="animated fadeInRight">
+		<div class="whitebg pl10 pr10">
+			<table class="table table-striped table-bordered table-hover">     
+				<thead> 
+					<tr>  
+						<th class="textc">序号</th>         
+						<th class="textc wp15">流水账号</th>
+						<th class="textc">日期</th>         
+						<th class="textc">财务类别</th>     
+						<th class="textc">金额</th>         
+						<th class="textc">银行</th>         
+						<th class="textc">发票</th>         
+						<th class="textc">客户名称</th>     
+						<th class="textc wp15">单号</th>    
+						<th class="textc">状态</th>         
+						<th class="textc">类别</th>         
+						<th class="textc">操作</th>         
+					</tr> 
+				</thead>
+				<tbody> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+                
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="green">支出</span></td>     
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+				</tbody>
+                
+			</table>  
+			<!-- footer -->  
+			<div class="clearfix mb10 pb20">          
+					<div class="layui-tab-item fr">       
+							<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+							<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>   
+							<div class="pagination dlblock vm" id="pagination"></div>
+							<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>            
+					</div>
+				</div>  
+		</div>      
+	</div>        
+</div>          
+                
+<script type="text/javascript">    
+//分页          
+$('#pagination').pagination({        
+	pageCount: 50,
+	jump: true,   
+	coping: true, 
+	homePage: '首页',    
+	endPage: '末页',     
+	prevContent: '上页', 
+	nextContent: '下页', 
+	callback: function(api) {          
+		$('.now').text(api.getCurrent());
+	}             
+});             
+</script>       
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/questionsAnswers/questionsAnswersFunctionsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/questionsAnswers/questionsAnswersFunctionsInfo.jsp
new file mode 100644
index 0000000..982ce84
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/questionsAnswers/questionsAnswersFunctionsInfo.jsp
@@ -0,0 +1,130 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>		
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">      
+<div class="tab-pane active">
+				<div class="panel-body">
+					<div class="wrapper wrapper-content">     
+						<div class="panel-form animated fadeInRight wp60 fc">
+							<!-- 账号资料 -->
+			<div class="layui-form-item 	has-error">
+				<label class="layui-form-label">单行输入框<i class="red">*</i></label>
+				<div class="layui-input-block">
+					<input type="text" name="title" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input">
+				</div>                                         
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">自定义验证</label>
+				<div class="layui-input-inline ml30">
+					<input type="password" name="password" lay-verify="pass" placeholder="请输入密码" autocomplete="off" class="layui-input">
+				</div>
+				<div class="layui-form-mid layui-word-aux">请填写6到12位密码</div>
+			</div>
+			<div class="form-group">
+				<div class="layui-form-item">          
+					<label class="layui-form-label">单行选择框</label>
+					<div class="layui-input-block">
+						<select name="interest" lay-filter="aihao">  
+							<option value=""></option>
+							<option value="0">写作</option>         
+							<option value="1" selected="">阅读</option>
+							<option value="2">游戏</option>
+							<option value="3">音乐</option>
+							<option value="4">旅行</option>  
+						</select>              
+					</div>
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<div class="layui-inline">  
+					<label class="layui-form-label">范围</label>
+					<div class="layui-input-inline ml30">
+						<input type="text" name="price_min" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>                                     
+					<div class="layui-form-mid">-</div>
+					<div class="layui-input-inline">       
+						<input type="text" name="price_max" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>
+				</div>           
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">联动选择框</label>
+				<div class="layui-input-inline ml30">
+					<select name="quiz1">     
+						<option value="">请选择省</option>
+						<option value="浙江" selected="">浙江省</option> 
+						<option value="你的工号">江西省</option>           
+						<option value="你最喜欢的老师">福建省</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz2">
+						<option value="">请选择市</option>
+						<option value="杭州">杭州</option>
+						<option value="宁波" disabled="">宁波</option>
+						<option value="温州">温州</option>
+						<option value="温州">台州</option>
+						<option value="温州">绍兴</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz3">
+						<option value="">请选择县/区</option>
+						<option value="西湖区">西湖区</option>
+						<option value="余杭区">余杭区</option>
+						<option value="拱墅区">临安市</option>
+					</select>
+				</div>    
+			</div>
+			<div class="layui-form-item" pane="">   
+				<label class="layui-form-label">原始复选框</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="like1[write]" lay-skin="primary" title="写作" checked="">  
+					<input type="checkbox" name="like1[read]" lay-skin="primary" title="阅读">
+					<input type="checkbox" name="like1[game]" lay-skin="primary" title="游戏" disabled="">
+				</div>
+			</div>
+
+			<div class="layui-form-item">
+				<label class="layui-form-label">开关-默认关</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="close" lay-skin="switch" lay-text="ON|OFF">
+				</div>
+			</div>
+			<div class="layui-form-item">  
+				<label class="layui-form-label">单选框</label>
+				<div class="layui-input-block">
+					<input type="radio" name="sex" value="男" title="男" checked="">
+					<input type="radio" name="sex" value="女" title="女">
+					<input type="radio" name="sex" value="禁" title="禁用" disabled="">
+				</div>
+			</div>
+			<!--<div class="layui-form-item layui-form-text">
+				<label class="layui-form-label">上传图片</label>
+				<div class="layui-input-block">
+					<div class="layui-upload-drag w200 h200">
+						<i class="layui-icon"></i>          
+						<p>点击上传</p>
+					</div>
+				</div>
+			</div>-->
+				<div class="layui-form-item layui-form-text">
+					<label class="layui-form-label">普通文本域</label>  
+					<div class="layui-input-block">              
+						<textarea placeholder="请输入内容" class="layui-textarea"></textarea>
+					</div>
+				</div>
+			</div>
+		</div>   
+	</div>
+</div>
+</form>   
+<script type="text/javascript">
+	//form表单样式
+	layui.use(['layer', 'form'], function() {    
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+</script>                 
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/questionsAnswers/questionsAnswersList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/questionsAnswers/questionsAnswersList.jsp
new file mode 100644
index 0000000..8614b35
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/questionsAnswers/questionsAnswersList.jsp
@@ -0,0 +1,218 @@
+
+<%--
+  Created by IntelliJ IDEA.
+  User: Administrator
+  Date: 2020/8/3
+  Time: 14:29
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html; charset=utf-8"
+		 pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head>
+	<meta charset="utf-8">
+	<meta http-equiv="X-UA-Compatible" content="IE=edge">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<meta name="format-detection" content="telephone=no">
+	<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+	<meta name="renderer" content="webkit">
+	<!-- 移动设备 viewport -->
+	<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+	<jsp:include page="../../common.jsp"/>
+</head>
+<body>
+<div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+	<div class="toolbar-panel bdd">
+		<!--搜索条件 -->
+		<div class="toolbar-body">
+		<form action="${ctx}/questionsAnswers/page" method="get" id="condition" class="layui-form">
+			<div class="toolbar-body">
+				<div class="row pt10 pb10 whitebg ml0 mr0">
+					<span class="dlblock w100 textr">问题：</span>
+					<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+							<input type="text" placeholder="请输入标题" id="question" name="question" value="">
+						</span>
+
+					<div class="layui-inline">
+						<label class="layui-form-label">状态</label>
+						<div class="layui-input-inline">
+							<select id="status">
+								<option value="">请选择</option>
+								<option value="0">显示</option>
+								<option value="1">不显示</option>
+							</select>
+						</div>
+					</div>
+
+                    <!-- <div class="mt10 mb20">
+						<span class="dlblock w100 textr">开始日期</span>
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+							 <input type="text" placeholder="" id="date1" class="w150">
+							 <i class="fa fa-calendar"></i>
+						</span>
+						<span class="dlblock w100 textr">结束日期</span>
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+						<input type="text" placeholder="" id="date2" class="w150">
+							<i class="fa fa-calendar"></i>
+						</span>
+					</div> -->
+				</div>
+			</div>
+		</form>
+	</div>
+</div>
+<table class="layui-hide" id="questionsAnswersTab" lay-filter="questionsAnswersTab"></table>
+
+<script type="text/html" id="toolbarDemo">
+	<div class="layui-btn-container">
+		<button class="layui-btn layui-btn-sm" lay-event="add">添加</button>
+		<button class="layui-btn layui-btn-sm" lay-event="search">查询</button>
+	</div>
+</script>
+
+<script type="text/html" id="barDemo">
+	<a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>
+	<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
+</script>
+
+<script type="text/html" id="statu">
+	{{#  if(d.status == 1){ }}
+	<span class="layui-badge layui-bg-green">显示</span>
+	{{#} else { }}
+	<span class="layui-badge">不显示</span>
+	{{#} }}
+</script>
+
+<script>
+	layui.use(['table', 'layer' ], function () {
+		var table = layui.table;
+		var layer = layui.layer;
+
+		var tableIns = table.render({
+			elem: '#questionsAnswersTab'
+			, url: '${ctx}/questionsAnswers/page'
+			, response: {
+				statusName: 'code' //数据状态的字段名称，默认：code
+				, countName: 'count' //数据总数的字段名称，默认：count
+				, dataName: 'data' //默数据列表的字段名称，认：data
+				, statusCode: 200
+			}
+			, parseData: function (res) { //res 即为原始返回的数据
+				return {
+					"code": res.code, //解析接口状态
+					"msg": res.message, //解析提示文本
+					"count": res.data.count, //解析数据长度
+					"data": res.data.data //解析数据列表
+				};
+			}
+			, toolbar: '#toolbarDemo' //开启头部工具栏，并为其绑定左侧模板
+			, defaultToolbar: ['filter', 'exports', 'print', { //自定义头部工具栏右侧图标。如无需自定义，去除该参数即可
+				title: '提示'
+				, layEvent: 'LAYTABLE_TIPS'
+				, icon: 'layui-icon-tips'
+			}]
+			, title: '系统安全问答表'
+			, cols: [[
+				{type: 'checkbox', fixed: 'left', hidden: true}
+				, {field: 'numbers', title: '序号', fixed: 'left', unresize: true, width: 80, sort: true, type: 'numbers'}
+				, {field: 'question', title: '问题'}
+				, {field: 'seq', title: '排序'}
+				, {field: 'status', title: '状态',templet:'#statu'}
+				, {field: 'createDt', title: '创建日期', sort: true,
+					templet: "<div>{{layui.util.toDateString(d.createDt, 'yyyy-MM-dd HH:mm:ss')}}</div>"}
+				, {fixed: 'right', title: '操作', toolbar: '#barDemo'}
+			]]
+			, request: {
+				pageName: 'current' //页码的参数名称，默认：page
+				, limitName: 'size' //每页数据量的参数名，默认：limit
+			}
+			, page: true
+			, done: function () {
+				$("[data-field='forceUpdate']").children().each(function () {
+					if ($(this).text() == '0') {
+						$(this).text('否');
+					} else if ($(this).text() == '1') {
+						$(this).text('是');
+					}
+				});
+			}
+		});
+
+		//头工具栏事件
+		table.on('toolbar(questionsAnswersTab)', function (obj) {
+			switch (obj.event) {
+				case 'add':
+					// 添加
+					toAdd();
+					break;
+				case 'search':
+					// 查询
+					// $("#condition").submit();
+					tableIns.reload({
+						where: { //设定异步数据接口的额外参数，任意设
+							status:  $("#status").val(),
+							question: $("#question").val()
+						}
+						,page: {
+							curr: 1 //重新从第 1 页开始
+						}
+					});
+					break;
+			}
+		});
+
+		//监听行工具事件
+		table.on('tool(questionsAnswersTab)', function (obj) {
+			var data = obj.data;
+			//console.log(obj)
+			if (obj.event === 'del') {
+				layer.confirm('真的删除行么?', function (index) {
+					obj.del(data);
+					layer.close(index);
+					del(obj);
+				});
+			} else if (obj.event === 'edit') {
+				toAdd(obj.data);
+			}
+		});
+
+		function toAdd(obj) {
+			var url = '${ctx}/questionsAnswers/detail';
+			if (obj != undefined) {
+				url = "${ctx}/questionsAnswers/detail/" + obj.id
+			}
+			var index = layer.open({
+				type: 2
+				, shade: 0.5
+				, maxmin: true
+				, content: url
+				, area: ['550px', '500px']
+			});
+		}
+
+		function del(obj) {
+			$.ajax({
+				url: '${ctx}/questionsAnswers/delete',
+				method: 'post',
+				data: JSON.stringify(obj.data),
+				dataType: 'JSON',
+				contentType:"application/json",
+				success: function(res) {
+					if(res.code == 200) {
+						layer.msg(res.message, {
+							icon: 1
+						});
+					} else {
+						layer.msg(res.message, {
+							icon: 5
+						});
+					}
+				}
+			})
+		}
+	});
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/questionsAnswers/questionsAnswersReadDetails.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/questionsAnswers/questionsAnswersReadDetails.jsp
new file mode 100644
index 0000000..2ec2340
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/questionsAnswers/questionsAnswersReadDetails.jsp
@@ -0,0 +1,60 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>     
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">                      
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black"> 
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> 
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->                                     
+<meta name="viewport"
+	content="width=device-width, initial-scale=1.0, maximum-scale=1.0">   
+<jsp:include page="../../common.jsp" />
+<%-- <link rel="stylesheet" type="text/css" href="${ctx}/page/umeditor/themes/default/css/umeditor.css">
+<script type="text/javascript" src="${ctx}/page/umeditor/third-party/template.min.js"></script>
+<script type="text/javascript" src="${ctx}/page/umeditor/umeditor.config.js"></script>
+<script type="text/javascript" src="${ctx}/page/umeditor/umeditor.min.js"></script>
+<script type="text/javascript" src="${ctx}/page/umeditor/lang/zh-cn/zh-cn.js"></script> --%>
+<script type="text/javascript">
+    require("questionsAnswers/questionsAnswersReadDetails.js");
+    
+</script>
+<title>编辑</title>
+</head>                                 
+	<body class="lgraybg">            
+		<div class="	container-fluid animated fadeInRight col-sm-12">
+			<div class="panel-toolbar mt10 mb10 pt5 pb5 pl10 bdd whitebg">
+				<div class="buttons">
+					<!-- <a href="javascript:void(0);" class="btn btn-primary fa fa-save f12"><span>保存</span></a> -->
+					<a href="${ctx }/questionsAnswers/index?pageIndex=${pageIndex}"  class="btn btn-primary fa fa-back f12" id="goback"><span>返回</span></a>
+				</div>
+			</div>
+				<div class="tabs-container whitebg">
+					<div class="pt10 pl5 pr5">
+						<ul class="nav nav-tabs" id="nav-tabs">
+							<li class="active" data-action="base">   
+								<a href="javascript:void(0);" >基本资料</a>
+							</li>
+							<!-- <li class="" data-action="functions">
+								<a href="javascript:void(0);"  >多功能输入</a>
+							</li>
+							<li class="" data-action="extends">
+								<a href="javascript:void(0);" >扩展属性</a>
+							</li> -->
+						</ul>
+						<div class="tab-content pt30 p30">               
+		
+						</div>     
+					</div>
+				</div>    
+		</div>
+		<!-- 隐藏域 -->
+		<input type="hidden" id="questionsAnswersId" value="${questionsAnswers.id }"/>
+	</body>
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/realFans/realFansBaseInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/realFans/realFansBaseInfo.jsp
new file mode 100644
index 0000000..2bf7517
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/realFans/realFansBaseInfo.jsp
@@ -0,0 +1,69 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">  
+	<div class="tab-pane active">     
+		<div class="panel-body">
+			<div class="wrapper wrapper-content">
+				<div class="panel-form animated fadeInRight wp60 fc">
+					<div class="layui-form-item dn	has-error" >   
+						<label class="layui-form-label">id</label>  
+						<div class="layui-input-block">
+							<input type="text" name="id" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${realFans.id }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">nickName</label>  
+						<div class="layui-input-block">
+							<input type="text" name="nickName" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${realFans.nickName }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">logo</label>  
+						<div class="layui-input-block">
+							<input type="text" name="logo" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${realFans.logo }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">phone</label>  
+						<div class="layui-input-block">
+							<input type="text" name="phone" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${realFans.phone }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">soleId</label>  
+						<div class="layui-input-block">
+							<input type="text" name="soleId" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${realFans.soleId }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">aliConsum</label>  
+						<div class="layui-input-block">
+							<input type="text" name="aliConsum" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${realFans.aliConsum }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">wechatConsum</label>  
+						<div class="layui-input-block">
+							<input type="text" name="wechatConsum" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${realFans.wechatConsum }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">enableMerchantCode</label>  
+						<div class="layui-input-block">
+							<input type="text" name="enableMerchantCode" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${realFans.enableMerchantCode }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">enableTime</label>  
+						<div class="layui-input-block">
+							<input type="text" name="enableTime" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${realFans.enableTime }" >
+						</div>  
+					</div>
+	
+				</div>
+			</div>
+		</div>  
+	</div>
+</form>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/realFans/realFansDetails.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/realFans/realFansDetails.jsp
new file mode 100644
index 0000000..18882c0
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/realFans/realFansDetails.jsp
@@ -0,0 +1,54 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>     
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">                      
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black"> 
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> 
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->                                     
+<meta name="viewport"
+	content="width=device-width, initial-scale=1.0, maximum-scale=1.0">   
+<jsp:include page="../../common.jsp" />
+<script type="text/javascript">
+    require("js/realFans/realFansDetails.js");
+</script>
+<title>编辑</title>
+</head>                                 
+	<body class="lgraybg">            
+		<div class="	container-fluid animated fadeInRight col-sm-12">
+			<div class="panel-toolbar mt10 mb10 pt5 pb5 pl10 bdd whitebg">
+				<div class="buttons">
+					<a href="javascript:void(0);" class="btn btn-primary fa fa-save f12"><span>保存</span></a>
+					<a href="${ctx }/realFans/index?pageIndex=${pageIndex}"  class="btn btn-primary fa fa-back f12" id="goback"><span>返回</span></a>
+				</div>
+			</div>
+				<div class="tabs-container whitebg">
+					<div class="pt10 pl5 pr5">
+						<ul class="nav nav-tabs" id="nav-tabs">
+							<li class="active" data-action="base">   
+								<a href="javascript:void(0);" >基本资料</a>
+							</li>
+							<li class="" data-action="functions">
+								<a href="javascript:void(0);"  >多功能输入</a>
+							</li>
+							<li class="" data-action="extends">
+								<a href="javascript:void(0);" >扩展属性</a>
+							</li>
+						</ul>
+						<div class="tab-content pt30 p30">               
+		
+						</div>     
+					</div>
+				</div>    
+		</div>
+		<!-- 隐藏域 -->
+		<input type="hidden" id="realFansId" value="${realFans.id }"/>
+	</body>
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/realFans/realFansExtendsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/realFans/realFansExtendsInfo.jsp
new file mode 100644
index 0000000..592687a
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/realFans/realFansExtendsInfo.jsp
@@ -0,0 +1,201 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>           
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> 
+<div class="tab-pane active">      
+	<div class="animated fadeInRight">
+		<div class="whitebg pl10 pr10">
+			<table class="table table-striped table-bordered table-hover">     
+				<thead> 
+					<tr>  
+						<th class="textc">序号</th>         
+						<th class="textc wp15">流水账号</th>
+						<th class="textc">日期</th>         
+						<th class="textc">财务类别</th>     
+						<th class="textc">金额</th>         
+						<th class="textc">银行</th>         
+						<th class="textc">发票</th>         
+						<th class="textc">客户名称</th>     
+						<th class="textc wp15">单号</th>    
+						<th class="textc">状态</th>         
+						<th class="textc">类别</th>         
+						<th class="textc">操作</th>         
+					</tr> 
+				</thead>
+				<tbody> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+                
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="green">支出</span></td>     
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+				</tbody>
+                
+			</table>  
+			<!-- footer -->  
+			<div class="clearfix mb10 pb20">          
+					<div class="layui-tab-item fr">       
+							<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+							<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>   
+							<div class="pagination dlblock vm" id="pagination"></div>
+							<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>            
+					</div>
+				</div>  
+		</div>      
+	</div>        
+</div>          
+                
+<script type="text/javascript">    
+//分页          
+$('#pagination').pagination({        
+	pageCount: 50,
+	jump: true,   
+	coping: true, 
+	homePage: '首页',    
+	endPage: '末页',     
+	prevContent: '上页', 
+	nextContent: '下页', 
+	callback: function(api) {          
+		$('.now').text(api.getCurrent());
+	}             
+});             
+</script>       
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/realFans/realFansFunctionsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/realFans/realFansFunctionsInfo.jsp
new file mode 100644
index 0000000..982ce84
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/realFans/realFansFunctionsInfo.jsp
@@ -0,0 +1,130 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>		
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">      
+<div class="tab-pane active">
+				<div class="panel-body">
+					<div class="wrapper wrapper-content">     
+						<div class="panel-form animated fadeInRight wp60 fc">
+							<!-- 账号资料 -->
+			<div class="layui-form-item 	has-error">
+				<label class="layui-form-label">单行输入框<i class="red">*</i></label>
+				<div class="layui-input-block">
+					<input type="text" name="title" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input">
+				</div>                                         
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">自定义验证</label>
+				<div class="layui-input-inline ml30">
+					<input type="password" name="password" lay-verify="pass" placeholder="请输入密码" autocomplete="off" class="layui-input">
+				</div>
+				<div class="layui-form-mid layui-word-aux">请填写6到12位密码</div>
+			</div>
+			<div class="form-group">
+				<div class="layui-form-item">          
+					<label class="layui-form-label">单行选择框</label>
+					<div class="layui-input-block">
+						<select name="interest" lay-filter="aihao">  
+							<option value=""></option>
+							<option value="0">写作</option>         
+							<option value="1" selected="">阅读</option>
+							<option value="2">游戏</option>
+							<option value="3">音乐</option>
+							<option value="4">旅行</option>  
+						</select>              
+					</div>
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<div class="layui-inline">  
+					<label class="layui-form-label">范围</label>
+					<div class="layui-input-inline ml30">
+						<input type="text" name="price_min" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>                                     
+					<div class="layui-form-mid">-</div>
+					<div class="layui-input-inline">       
+						<input type="text" name="price_max" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>
+				</div>           
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">联动选择框</label>
+				<div class="layui-input-inline ml30">
+					<select name="quiz1">     
+						<option value="">请选择省</option>
+						<option value="浙江" selected="">浙江省</option> 
+						<option value="你的工号">江西省</option>           
+						<option value="你最喜欢的老师">福建省</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz2">
+						<option value="">请选择市</option>
+						<option value="杭州">杭州</option>
+						<option value="宁波" disabled="">宁波</option>
+						<option value="温州">温州</option>
+						<option value="温州">台州</option>
+						<option value="温州">绍兴</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz3">
+						<option value="">请选择县/区</option>
+						<option value="西湖区">西湖区</option>
+						<option value="余杭区">余杭区</option>
+						<option value="拱墅区">临安市</option>
+					</select>
+				</div>    
+			</div>
+			<div class="layui-form-item" pane="">   
+				<label class="layui-form-label">原始复选框</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="like1[write]" lay-skin="primary" title="写作" checked="">  
+					<input type="checkbox" name="like1[read]" lay-skin="primary" title="阅读">
+					<input type="checkbox" name="like1[game]" lay-skin="primary" title="游戏" disabled="">
+				</div>
+			</div>
+
+			<div class="layui-form-item">
+				<label class="layui-form-label">开关-默认关</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="close" lay-skin="switch" lay-text="ON|OFF">
+				</div>
+			</div>
+			<div class="layui-form-item">  
+				<label class="layui-form-label">单选框</label>
+				<div class="layui-input-block">
+					<input type="radio" name="sex" value="男" title="男" checked="">
+					<input type="radio" name="sex" value="女" title="女">
+					<input type="radio" name="sex" value="禁" title="禁用" disabled="">
+				</div>
+			</div>
+			<!--<div class="layui-form-item layui-form-text">
+				<label class="layui-form-label">上传图片</label>
+				<div class="layui-input-block">
+					<div class="layui-upload-drag w200 h200">
+						<i class="layui-icon"></i>          
+						<p>点击上传</p>
+					</div>
+				</div>
+			</div>-->
+				<div class="layui-form-item layui-form-text">
+					<label class="layui-form-label">普通文本域</label>  
+					<div class="layui-input-block">              
+						<textarea placeholder="请输入内容" class="layui-textarea"></textarea>
+					</div>
+				</div>
+			</div>
+		</div>   
+	</div>
+</div>
+</form>   
+<script type="text/javascript">
+	//form表单样式
+	layui.use(['layer', 'form'], function() {    
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+</script>                 
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/realFans/realFansList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/realFans/realFansList.jsp
new file mode 100644
index 0000000..cf2f564
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/realFans/realFansList.jsp
@@ -0,0 +1,208 @@
+<%@ page contentType="text/html; charset=utf-8"
+		 pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<html>
+<head>
+	<meta charset="utf-8">
+	<meta http-equiv="X-UA-Compatible" content="IE=edge">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<meta name="format-detection" content="telephone=no">
+	<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+	<meta name="renderer" content="webkit">
+	<!-- 移动设备 viewport -->
+	<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+	<jsp:include page="../../common.jsp" />
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+	<div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+		<div class="toolbar-panel bdd">
+			<div class="toolbar-box">
+				<div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+					<!-- 顶部按钮 -->
+					<div class="fl">
+						查询条件
+					</div>
+					<div class="tools fr">
+						<a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+							<i class="fa-2x fa fa-angle-double-up"></i>
+						</a>
+					</div>
+				</div>
+			</div>
+			<!--搜索条件 -->
+			<div class="toolbar-body">
+				<form class="layui-form" action="" style="margin-top: 10px">
+					<div class="layui-form-item">
+						<div class="layui-inline">
+							<label class="layui-form-label">昵称</label>
+							<div class="layui-input-block">
+								<input type="text" name="nickName" id="nickName" placeholder="请输入昵称" autocomplete="off" class="layui-input">
+							</div>
+						</div>
+
+						<div class="layui-inline">
+							<label class="layui-form-label">唯一标识</label>
+							<div class="layui-input-block">
+								<input type="text" name="soleId" id="soleId" placeholder="请输入唯一标识" autocomplete="off" class="layui-input">
+							</div>
+						</div>
+
+						<div class="layui-inline">
+							<label class="layui-form-label">激活商家</label>
+							<div class="layui-input-block">
+								<input type="text" name="alias" id="alias" placeholder="请输入激活商户简称" autocomplete="off" class="layui-input">
+							</div>
+						</div>
+
+						<div class="layui-inline">
+							<label class="layui-form-label">开始日期</label>
+							<div class="layui-input-inline">
+								<input type="text" placeholder="请输入激活开始日期" id="date1" name="startTime" autocomplete="off" class="layui-input">
+							</div>
+						</div>
+					</div>
+					<div class="layui-form-item">
+						<div class="layui-inline">
+							<label class="layui-form-label">结束日期</label>
+							<div class="layui-input-inline">
+								<input type="text" placeholder="请输入激活结束日期" id="date2" name="endTime" autocomplete="off" class="layui-input">
+							</div>
+						</div>
+					</div>
+				</form>
+			</div>
+		</div>
+	</div>
+	<!-- 表单数据 -->
+	<div class="mb50 mt10">
+		<div class="whitebg pl10 pr10">
+			<table class="layui-hide" id="realFansTab" lay-filter="realFansTab"></table>
+		</div>
+	</div>
+</div>
+
+<script type="text/html" id="leftBar">
+	<button type="button" class="layui-btn layui-btn-normal layui-btn-sm" lay-event="search"><i class="layui-icon">&#xe615;</i>查询</button>
+</script>
+<script>
+	layui.use(['table', 'layer','form','laydate'], function(){
+		var table = layui.table;
+		var layer = layui.layer;
+		var form = layui.form;
+		var laydate = layui.laydate;
+
+		laydate.render({
+			elem: '#date1',//指定元素
+			format: 'yyyy-MM-dd'
+		});
+		laydate.render({
+			elem: '#date2', //指定元素
+			format: 'yyyy-MM-dd'
+		});
+
+		var tableIns = table.render({
+			elem: '#realFansTab'
+			,url:'${ctx}/realFans/pageData'
+			,id: 'realFans'
+			,response: {
+				statusName: 'code' //数据状态的字段名称，默认：code
+				,countName: 'count' //数据总数的字段名称，默认：count
+				,dataName: 'data' //默数据列表的字段名称，认：data
+				,statusCode : 200
+			}
+			,parseData: function(res){ //res 即为原始返回的数据
+				return {
+					"code": res.code, //解析接口状态
+					"msg": res.message, //解析提示文本
+					"count": res.data.total, //解析数据长度
+					"data": res.data.records //解析数据列表
+				};
+			}
+			,toolbar: '#leftBar' //开启头部工具栏，并为其绑定左侧模板
+			, defaultToolbar: ['filter']
+			,defaultToolbar: ['filter', 'exports', 'print', { //自定义头部工具栏右侧图标。如无需自定义，去除该参数即可
+				title: '提示'
+				,layEvent: 'LAYTABLE_TIPS'
+				,icon: 'layui-icon-tips'
+			}]
+			,title: '粉丝列表'
+			,cols: [[
+				{type: 'checkbox', fixed: 'left', hidden: true}
+				,{field:'numbers', title:'序号', fixed: 'left', unresize: true, width:80, type:'numbers'}
+				,{field:'nickName', title:'昵称', width: 200,templet:function (d) {
+						return decodeURI(d.nickName);
+					}}
+				,{field:'logo', title:'头像',templet:function (d) {
+						return "<a href='javascript:void(0)' onclick='openImg(this)' >"+d.logo+"</a>";
+				 }}
+				,{field:'soleId', title:'唯一标识'}
+				,{field:'aliConsum', title:'支付宝消费金额',width: 150,sort:true }
+				,{field:'wechatConsum', title:'微信消费金额',width: 150,sort:true }
+				,{field:'alias', title:'激活商家名称'}
+				,{field: 'enableTime', title: '激活时间',width:160,sort:true ,templet : "<div>{{layui.util.toDateString(d.enableTime,'yyyy-MM-dd HH:mm:ss')}}</div>"}
+			]]
+			,request: {
+				pageName: 'current' //页码的参数名称，默认：page
+				,limitName: 'size' //每页数据量的参数名，默认：limit
+			}
+			,page: true
+		});
+
+		//监听头工具栏事件
+		table.on('toolbar(realFansTab)', function (obj) {
+			switch (obj.event) {
+				case 'search':
+					var params= serialize($('#form1'));
+					table.reload('realFans', {
+						where: params
+						, page: {
+							size: 10
+							, current: 1
+						}
+					});
+					break;
+			}
+		});
+	});
+
+	function openImg(obj) {
+		var url = $(obj).text();
+		if(url){
+			var img = new Image();
+			img.src = url;
+
+			//弹出层
+			layer.photos({
+				photos: { "data": [{"src": url}] }
+			});
+
+			// layer.open({
+			//     type: 1,
+			//     shade: 0.8,
+			//     area:['auto','auto'],
+			//     offset: 'auto',
+			//     // area: [500 + 'px',550+'px'],  // area: [width + 'px',height+'px']  //原图显示
+			//     shadeClose:true,
+			//     scrollbar: false,
+			//     title: "预览", //不显示标题
+			//     content: imgHtml, //捕获的元素，注意：最好该指定的元素要存放在body最外层，否则可能被其它的相对元素所影响
+			//     cancel: function () {
+			//         //layer.msg('捕获就是从页面已经存在的元素上，包裹layer的结构', { time: 5000, icon: 6 });
+			//     }
+			// });
+		}
+	}
+	jQuery.prototype.serializeObject=function(){
+		var obj=new Object();
+		$.each(this.serializeArray(),function(index,param){
+			if(!(param.name in obj)){
+				obj[param.name]=param.value;
+			}
+		});
+		return obj;
+	};
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/refundOrder/marketOrderList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/refundOrder/marketOrderList.jsp
new file mode 100644
index 0000000..8adbda1
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/refundOrder/marketOrderList.jsp
@@ -0,0 +1,241 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+		 pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta charset="utf-8">
+	<meta http-equiv="X-UA-Compatible" content="IE=edge">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<meta name="format-detection" content="telephone=no">
+	<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+	<meta name="renderer" content="webkit">
+	<!-- 移动设备 viewport -->
+	<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+	<jsp:include page="../../common.jsp" />
+	<style type="text/css">
+		.layui-table th {
+			text-align: center;
+		}
+	</style>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+	<div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+		<div class="toolbar-panel bdd">
+			<div class="toolbar-box">
+				<div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+					<!-- 顶部按钮 -->
+					<div class="buttons fl">
+						<a class="layui-btn layui-btn-sm fa fa-search f13" href="javascript:void(0);" onclick="queryMarketOrderList()"><span>搜索</span></a>
+					</div>
+					<div class="tools fr">
+						<a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+							<i class="fa-2x fa fa-angle-double-up"></i>
+						</a>
+					</div>
+				</div>
+			</div>
+
+			<!--搜索条件 -->
+			<div class="toolbar-body">
+				<div class="row pt10 pb10 whitebg ml0 mr0">
+					<span class="dlblock w100 textr">商户名称：</span>
+					<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+							<input type="text" id="alias" placeholder="请输入商户名称">
+						</span>
+				</div>
+			</div>
+		</div>
+	</div>
+	<!-- 表单数据 -->
+	<div class="mb20 mt10">
+		<div class="whitebg pl10 pr10">
+			<table class="layui-table">
+				<thead>
+				<tr>
+					<th class="textc">
+						<div class="checker" id="allCheck">
+							<span class=""><input type="checkbox" value="" ></span>
+						</div>
+					</th>
+					<th class="textc">序号</th>
+					<th class="textc ">商户编号</th>
+					<th class="textc ">商户简称</th>
+					<th class="textc ">退款总额(元)</th>
+					<th class="textc ">退款笔数</th>
+					<th class="textc ">营销打款金额(元)</th>
+				</tr>
+				</thead>
+				<!-- 数据体 -->
+				<tbody id="data_content">
+				</tbody>
+			</table>
+
+			<!-- footer -->
+			<div class="clearfix mb10 pb20">
+				<div class="layui-tab-item fr">
+					<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+					<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>
+					<div class="pagination dlblock vm" id="pagination"></div>
+					<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+</body>
+<script>
+	var pageIndex=1;
+	$(document).ready(function(){
+		//调用查询
+		pageIndex=StringUtil.getQueryString('pageIndex');
+		if(pageIndex==undefined||pageIndex==null){
+			pageIndex=1;
+		}
+		queryMarketOrderList(pageIndex);
+		//绑定hover操作
+		$(document).on('mouseenter','.listOperaters',function(){
+			$(this).children(".ops_itemDiv").show();
+			var width=15;
+			$(this).children('div').find('li').each(function(){
+				//获取li宽度
+				width+=$(this).width();
+			});
+			$(this).children('div').width(width);
+		})
+		$(document).on('mouseleave','.listOperaters',function(){
+			$(this).children(".ops_itemDiv").hide();
+		});
+
+		//行选中事件
+		$("#allCheck").find("span").click(function() {
+			$(this).toggleClass('checked');
+			if($(this).hasClass('checked')){
+				//所有列选中
+				$(".checker").find("span").each(function () {
+					$(this).addClass("checked");
+				})
+			}else{
+				//所有列取消选中
+				$(".checker").find("span").each(function () {
+					$(this).removeClass("checked");
+				})
+			}
+		});
+
+		//单个选中
+		$(document).on('click','.checkeBox span',function() {
+			$(this).toggleClass('checked');
+			//设置头部事件
+			var length=$('.checkeBox span').length;
+			var count=0;
+			$(".checkeBox").find("span").each(function () {
+				if($(this).hasClass("checked")){
+					count++;
+				}
+			})
+			//全选
+			if(count==length){
+				$("#allCheck").find("span").addClass('checked');
+			}else{
+				$("#allCheck").find("span").removeClass('checked');
+			}
+		})
+		//左右div高度相等
+		var left_content_height = $(".right-content").height();
+		$(".left-content").height(left_content_height+35);
+		var sub_left_height=$(".res-menu").height(left_content_height-60);
+	});
+
+	//查询
+	function queryMarketOrderList(index){
+		if(typeof(index)=='undefined'){
+			index=1;
+		}
+		var url=ctx+'/refundOrder/queryMarketCountByPage';
+		$.ajax({
+			url:url,
+			type:"post",
+			dataType:"json",
+			data:{
+				"currPage":index,
+				"alias":$("#alias").val(),
+			},
+			success:function(result){
+				var presentPage = result.currPage;
+				//渲染数据
+				$('#data_content').empty();
+				$.each(result.refundOrderCountList,function(i){
+					var index = (presentPage-1)*12+i+1;
+					var refundOrderCount=result.refundOrderCountList[i];
+					var data='';
+					data+='<tr class="odd">';
+					data+='<td class="textc">';
+					data+='		 <div class="checker checkeBox">';
+					data+='		 <span class="" "><input type="checkbox"  value=""></span>';
+					data+='		</div>';
+					data+='</td>';
+					data+='<td class="textc">'+index+'</td>';
+					data+='<td class="textc">'+refundOrderCount.merchantCode+'</td>';
+					data+='<td class="textc">'+refundOrderCount.alias+'</td>';
+					data+='<td class="textc">'+refundOrderCount.refundAmtCount+'</td>';
+					data+='<td class="textc">'+refundOrderCount.refunCount+'</td>';
+					data+='<td class="textc">'+refundOrderCount.transferAmtCount+'</td>';
+					data+='</tr>';
+					$('#data_content').append(data);
+				});
+				//分页
+				$('#pageCount').html(result.pageCount);
+				$('#currPage').html(result.currPage);
+				$('#totalCount').html(result.count);
+				//设置分页
+				pageIndex=result.currPage;
+				$('#pagination').pagination({
+					pageCount: result.pageCount,
+					jump: true,
+					coping: true,
+					jump: true,
+					homePage: '首页',
+					endPage: '末页',
+					prevContent: '上页',
+					nextContent: '下页',
+					current:result.currPage,
+					callback:function(api){
+						pageIndex=api.getCurrent();
+						queryMarketOrderList(api.getCurrent());
+					}
+				});
+			}
+		});
+		//表头列不选中
+		$("#allCheck").find("span").removeClass('checked');
+	}
+	function hidePictureWindow(){
+		$('#picture').empty();
+		$('#pictureWindow').hide();
+	}
+
+	function dateFtt(fmt,date)
+	{ //author: meizz
+		var o = {
+			"M+" : date.getMonth()+1,                 //月份
+			"d+" : date.getDate(),                    //日
+			"h+" : date.getHours(),                   //小时
+			"m+" : date.getMinutes(),                 //分
+			"s+" : date.getSeconds(),                 //秒
+			"q+" : Math.floor((date.getMonth()+3)/3), //季度
+			"S"  : date.getMilliseconds()             //毫秒
+		};
+		if(/(y+)/.test(fmt))
+			fmt=fmt.replace(RegExp.$1, (date.getFullYear()+"").substr(4 - RegExp.$1.length));
+		for(var k in o)
+			if(new RegExp("("+ k +")").test(fmt))
+				fmt = fmt.replace(RegExp.$1, (RegExp.$1.length==1) ? (o[k]) : (("00"+ o[k]).substr((""+ o[k]).length)));
+		return fmt;
+	}
+</script>
+
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/refundOrder/refundOrderList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/refundOrder/refundOrderList.jsp
new file mode 100644
index 0000000..eb37fc1
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/refundOrder/refundOrderList.jsp
@@ -0,0 +1,229 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp" />
+</head>
+<body>
+
+<form class="layui-form" id="form1" action="" style="margin-top: 30px;margin-left: 50px;">
+    <div class="layui-inline">
+        <label class="layui-form-label">订单号</label>
+        <div class="layui-input-block">
+            <input type="text" name="orderNumber" id="orderNumber" placeholder="请输入订单号" autocomplete="off" class="layui-input">
+        </div>
+    </div>
+    <%--<div class="layui-inline">
+        <label class="layui-form-label">通道单号</label>
+        <div class="layui-input-block">
+            <input type="text" name="channelNo"  id="channelNo" placeholder="请输入通道单号" autocomplete="off" class="layui-input">
+        </div>
+    </div>
+    <div class="layui-inline">
+        <label class="layui-form-label">退款单号</label>
+        <div class="layui-input-block">
+            <input type="text" name="refundNo"  id="refundNo" placeholder="请输入退款单号" autocomplete="off" class="layui-input">
+        </div>
+    </div>
+    <div class="layui-inline">
+        <label class="layui-form-label">商户简称</label>
+        <div class="layui-input-block">
+            <input type="text" name="alias"  id="alias" placeholder="请输入商户简称" autocomplete="off" class="layui-input">
+        </div>
+    </div>--%>
+    <div class="layui-inline">
+        <label class="layui-form-label">订单类型</label>
+        <div class="layui-input-block">
+            <select name="orderType" class="layui-select">
+                <option value="">请选择</option>
+                <option value="1">主扫</option>
+                <option value="2">被扫</option>
+                <option value="3">会员充值</option>
+                <option value="4">POS刷卡</option>
+                <option value="5">主扫充值</option>
+                <option value="6">扫码王</option>
+                <option value="7">H5</option>
+                <option value="8">升级</option>
+                <option value="9">小程序</option>
+                <option value="10">线上店</option>
+                <option value="99">插件</option>
+            </select>
+        </div>
+    </div>
+
+    <div class="layui-inline">
+        <label class="layui-form-label">支付方式</label>
+        <div class="layui-input-block">
+            <select name="payTypeCode" class="layui-select">
+                <option value="">请选择</option>
+                <option value="wechatPay|sxfPay1">微信</option>
+                <option value="aliPay|sxfPay0">支付宝</option>
+                <option value="bank|sxfPay2">银联</option>
+            </select>
+        </div>
+    </div>
+</form>
+<table class="layui-hide" id="refundOrderTab" lay-filter="refundOrderTab"></table>
+
+<script type="text/html" id="leftBar">
+    <button type="button" class="layui-btn" lay-event="search">查询</button>
+</script>
+
+<script>
+    layui.use(['table', 'layer'], function(){
+        var table = layui.table;
+        var layer = layui.layer;
+
+        var tableIns = table.render({
+            elem: '#refundOrderTab'
+            ,url:'${ctx}/refundOrder/queryRefundOrderByPage'
+            ,response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                ,countName: 'count' //数据总数的字段名称，默认：count
+                ,dataName: 'data' //默数据列表的字段名称，认：data
+                ,statusCode : 200
+            }
+            ,id:'refundOrder'
+            ,method:'POST'
+            ,parseData: function(res){ //res 即为原始返回的数据
+                console.log(res);
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            ,toolbar: '#leftBar' //开启头部工具栏，并为其绑定左侧模板
+            , defaultToolbar: ['filter']
+            ,defaultToolbar: ['filter', 'exports', 'print', { //自定义头部工具栏右侧图标。如无需自定义，去除该参数即可
+                title: '提示'
+                ,layEvent: 'LAYTABLE_TIPS'
+                ,icon: 'layui-icon-tips'
+            }]
+            ,title: '退款列表'
+            ,cols: [[
+                {type: 'checkbox', fixed: 'left', hidden: true}
+                ,{field:'numbers', title:'序号', fixed: 'left', unresize: true, width:80, type:'numbers'}
+                ,{title:'订单号',templet: function (d) {
+                        return d.orderNumber;
+                    }}
+                ,{field:'refundNo', title:'退款单号', sort: true}
+                ,{field:'alias', title:'商户简称'}
+                ,{field:'orderType', title:'订单类型', templet:function (d) {
+                        if(d.orderType === '1'){
+                            return "主扫";
+                        }else if(d.orderType === '2'){
+                            return "被扫";
+                        }else if(d.orderType === '3'){
+                            return "会员充值";
+                        }else if(d.orderType === '4'){
+                            return "POS刷卡";
+                        }else if(d.orderType === '5'){
+                            return "主扫充值";
+                        }else if(d.orderType === '6'){
+                            return "扫码王";
+                        }else if(d.orderType === '7'){
+                            return "H5";
+                        }else if(d.orderType === '8'){
+                            return "升级";
+                        }else if(d.orderType === '9'){
+                            return "小程序";
+                        }else if(d.orderType === '10'){
+                            return "线上店";
+                        }else{
+                            return "插件";
+                        }
+                    }}
+                ,{title:'订单来源',templet:function (d) {
+                        if(d.aisleSwitch === '1'){
+                            return "乐刷";
+                        }else if(d.aisleSwitch === '2'){
+                            return "随行付";
+                        }else if(d.aisleSwitch === '3'){
+                            return "瑞银信";
+                        }else if (d.aisleSwitch === '4'){
+                            return "银盛";
+                        }else{
+                            return "未知";
+                        }
+                    }}
+                ,{title:'支付方式', templet:function (d) {
+                        if(d.payTypeCode.search('0') != -1 || d.payTypeCode === "aliPay"){
+                            return "支付宝";
+                        }else if(d.payTypeCode.search('1') != -1 || d.payTypeCode === "wechatPay"){
+                            return "微信";
+                        }else if(d.payTypeCode.search('2') != -1 || d.payTypeCode === "bank"){
+                            return "银联";
+                        }else{
+                            return "未知";
+                        }
+                    }}
+                ,{field:'payAmt', title:'支付金额(元)', templet:function (d) {
+                        return d.payAmt.toFixed(2);
+                  }}
+                ,{field:'refundAmt', title:'退款金额(元)', templet:function (d) {
+                    if(d.refundAmt){
+                        return d.refundAmt.toFixed(2);
+                    }else{
+                        return d.payAmt.toFixed(2);
+                    }
+                }}
+                ,{field: 'payTime', title: '交易时间',width:160,templet : "<div>{{layui.util.toDateString(d.payTime, 'yyyy-MM-dd HH:mm:ss')}}</div>"}
+                ,{field: 'refundTime', title: '退款时间',width:160,templet : "<div>{{layui.util.toDateString(d.refundTime, 'yyyy-MM-dd HH:mm:ss')}}</div>"}
+                ,{title:'退款状态', templet:function (d) {
+                    if(d.status === '1'){
+                        return '<span style="color: green;">退款成功</span>';
+                    }else if(d.status === '2'){
+                        return '<span style="color: blue;">退款中</span>';
+                    }else{
+                        return '<span style="color: red;">退款失败</span>';
+                    }
+                }}
+                ,{field:'failMsg', title:'备注',width:160,templet:function (d){
+                    if(d.refundAmt){
+                        if(d.refundAmt === d.payAmt){
+                            return d.failMsg + "(全额退款)";
+                        }else{
+                            return d.failMsg + "(部分退款)";
+                        }
+                    }else{
+                        return d.failMsg + "(全额退款)";
+                    }
+                }}
+            ]]
+            ,request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                ,limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            ,page: true
+        });
+        //监听头工具栏事件
+        table.on('toolbar(refundOrderTab)', function (obj) {
+            switch (obj.event) {
+                case 'search':
+                    var params= serialize($('#form1'));
+                    table.reload('refundOrder', {
+                        where: params
+                        , page: {
+                            size: 10
+                            , current: 1
+                        }
+                    });
+                    break;
+            }
+        });
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/rewardConfig/detail.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/rewardConfig/detail.jsp
new file mode 100644
index 0000000..a850cc8
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/rewardConfig/detail.jsp
@@ -0,0 +1,97 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp" />
+    <style>
+        .layui-form-item{
+            margin-top: 10px;
+        }
+        .layui-form{
+            width: 70%;
+            margin-left: 10%;
+        }
+    </style>
+</head>
+<body>
+<form class="layui-form" action="">
+    <input name="id" value="${entity.id}" hidden/>
+    <div class="layui-form-item">
+        <label class="layui-form-label">名称</label>
+        <div class="layui-input-block">
+            <input name="name" value="${entity.name}" autocomplete="off" maxlength="10"  placeholder="名称" class="layui-input" lay-verify="required"/>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label" >所属角色</label>
+        <div class="layui-input-block">
+            <select class="layui-select" name="roleCode" autocomplete="off" lay-filter="roleCode" lay-verify="required">
+                <option value="">请选择</option>
+                <c:forEach items="${roleList}" var="role">
+                    <option value="${role.roleCode}" ${role.roleCode == entity.roleCode ? 'selected' : ''}>${role.roleName}</option>
+                </c:forEach>
+            </select>
+        </div>
+    </div>
+    <div class="layui-form-item ">
+        <label class="layui-form-label" >比例</label>
+        <div class="layui-input-block">
+            <input name="scale" type="number" value="<fmt:formatNumber type="number" value="${entity.scale * 10000}"/>" autocomplete="off" lay-verify="required"  placeholder="比例，2表示万分之2" class="layui-input" />
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button class="layui-btn" lay-submit lay-filter="formDemo">立即提交</button>
+            <button type="button" id="close" class="layui-btn layui-btn-primary">关闭</button>
+        </div>
+    </div>
+</form>
+
+<script>
+    layui.use(['form','layer'], function(){
+        var form = layui.form;
+        var layer = layui.layer;
+        $('#close').click(function() {
+            parent.layer.closeAll();
+        });
+            //监听提交
+        form.on('submit(formDemo)', function(data){
+            var index = layer.load(1,{shade: [0.1,'#000'] });
+            $.ajax({
+                url: '${ctx}/rewardConfig/save',
+                method: 'post',
+                data: JSON.stringify(data.field),
+                dataType: 'JSON',
+                contentType:"application/json",
+                success: function(res) {
+                    layer.close(index);
+                    if(res.code == 200) {
+                        layer.msg(res.message, { icon: 1, time: 1000 }, function () {
+                            var index = parent.layer.getFrameIndex(window.name);
+                            parent.layui.table.reload('rewardConfig');
+                            parent.layer.close(index);
+                        });
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 2
+                        });
+                    }
+                }
+            })
+            return false;
+        });
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/rewardConfig/list.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/rewardConfig/list.jsp
new file mode 100644
index 0000000..b923c5e
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/rewardConfig/list.jsp
@@ -0,0 +1,206 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" id="form1" action="" style="margin-top: 10px;">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">名称</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="name" id="name" placeholder="名称"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <div class="mb50 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-hide" id="rewardConfigTab" lay-filter="rewardConfigTab"></table>
+        </div>
+    </div>
+</div>
+<script type="text/html" id="leftBar">
+    <a class="layui-btn layui-btn-sm layui-btn-normal" lay-event="add">
+        <i class="layui-icon layui-icon-add-1"></i>新增
+    </a>
+    <a class="layui-btn layui-btn-sm" lay-event="search">
+        <i class="layui-icon layui-icon-search"></i>查询
+    </a>
+</script>
+
+<script type="text/html" id="toolBar">
+    <a class="layui-btn layui-btn-xs" lay-event="edit">
+        <i class="layui-icon layui-icon-edit"></i>编辑
+    </a>
+    <a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="del">
+        <i class="layui-icon layui-icon-delete"></i>删除
+    </a>
+</script>
+
+<script>
+    layui.use(['table', 'layer'], function () {
+        var table = layui.table;
+        var layer = layui.layer;
+
+        var tableIns = table.render({
+            elem: '#rewardConfigTab'
+            , url: '${ctx}/rewardConfig/page'
+            , id: 'rewardConfig'
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            , toolbar: '#leftBar' //开启头部工具栏，并为其绑定左侧模板
+            , defaultToolbar: ['filter']
+            , defaultToolbar: ['filter', 'exports', 'print', { //自定义头部工具栏右侧图标。如无需自定义，去除该参数即可
+                title: '提示'
+                , layEvent: 'LAYTABLE_TIPS'
+                , icon: 'layui-icon-tips'
+            }]
+            , title: '用户奖励配置'
+            , cols: [[
+                {type: 'checkbox', fixed: 'left', hidden: true}
+                , {field: 'numbers', title: '序号', fixed: 'left', unresize: true, width: 80, type: 'numbers'}
+                , {field: 'name', title: '名称'}
+                // , {field: 'type', title: 'code'}
+                , {field: 'roleCode', title: '所属角色',templet: function (d){
+                        return getDictText(d.roleCode,JSON.parse('${roleList}'),'roleCode');
+                    }}
+                , {field: 'scale', title: '比例(%)',templet: function (d){
+                        return (d.scale*100) + "%";
+                    }}
+                , {
+                    field: 'createTime',
+                    title: '创建时间',
+                    templet: "<div>{{layui.util.toDateString(d.createTime,'yyyy-MM-dd HH:mm')}}</div>"
+                }
+                , {fixed: 'right', title: '操作', width: 160, toolbar: '#toolBar'}
+            ]]
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , page: true
+        });
+        table.on('tool(rewardConfigTab)', function (obj) { //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            var data = obj.data; //获得当前行数据
+            var layEvent = obj.event; //获得 lay-event 对应的值（也可以是表头的 event 参数对应的值）
+            if (layEvent === 'del') { //删除
+                layer.confirm('真的删除么?', {icon: 3}, function (index) {
+                    obj.del(); //删除对应行（tr）的DOM结构，并更新缓存
+                    layer.close(index);
+                    del(data);
+                    //向服务端发送删除指令
+                });
+            } else if (layEvent === 'edit') { //编辑
+                //do something
+                toAdd(obj.data);
+                //同步更新缓存对应的值
+                // obj.update({
+                //     username: '123'
+                //     ,title: 'xxx'
+                // });
+            }
+        });
+
+        //监听头工具栏事件
+        table.on('toolbar(rewardConfigTab)', function (obj) {
+            switch (obj.event) {
+                case 'add':
+                    // 添加
+                    toAdd();
+                    break;
+                case 'search':
+                    var params = serialize($('#form1'));
+                    table.reload('rewardConfig', {
+                        where: params
+                        , page: {
+                            size: 10
+                            , current: 1
+                        }
+                    });
+                    break;
+            }
+        });
+
+        function toAdd(obj) {
+            var url = '${ctx}/rewardConfig/detail';
+            var title = "新增";
+            if (obj != undefined) {
+                url = "${ctx}/rewardConfig/detail/" + obj.id;
+                title = "编辑"
+            }
+            var index = layer.open({
+                type: 2
+                , shade: 0.5
+                , title: title
+                , maxmin: true
+                , content: url
+                , area: ['500px', '300px']
+                , end: function () {
+
+                }
+            });
+        }
+
+        function del(obj) {
+            $.ajax({
+                url: '${ctx}/rewardConfig/del/' + obj.id,
+                method: 'DELETE',
+                dataType: 'JSON',
+                contentType: "application/json",
+                success: function (res) {
+                    layer.msg(res.message, {
+                        icon: res.code == 200 ? 1: 2
+                    });
+                }
+            })
+        }
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/riskBlacklist/batch_form.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/riskBlacklist/batch_form.jsp
new file mode 100644
index 0000000..85c19f8
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/riskBlacklist/batch_form.jsp
@@ -0,0 +1,109 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp" />
+    <style>
+        .layui-table th {
+            text-align: center;
+        }
+    </style>
+</head>
+<body>
+<form class="layui-form" lay-filter="form" action="" style="width: 80%; margin-top: 20px">
+    <div class="layui-form-item">
+        <label class="layui-form-label">违规通道</label>
+        <div class="layui-input-block">
+            <select name="channel" lay-verify="required">
+                <option value="" selected>请选择</option>
+                <option value="1">随行付</option>
+                <option value="3">瑞银信</option>
+                <option value="4">银盛</option>
+            </select>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">支付方式</label>
+        <div class="layui-input-block">
+            <select name="payWay" lay-verify="required">
+                <option value="" selected>请选择</option>
+                <option value="01">支付宝</option>
+                <option value="02">微信</option>
+                <option value="03">银联</option>
+            </select>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">同步子商户</label>
+        <div class="layui-input-block">
+            <input type="checkbox" name="connectFlag" lay-skin="switch" checked>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">备注</label>
+        <div class="layui-input-block">
+            <textarea name="remark" required placeholder="请输入内容" class="layui-textarea"></textarea>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button class="layui-btn" lay-submit lay-filter="formDemo">立即拉黑</button>
+            <button type="reset" onclick="parent.layer.closeAll();" class="layui-btn layui-btn-primary">取消</button>
+        </div>
+    </div>
+</form>
+
+<script>
+    let userIdArr = [];
+    <c:forEach var="userId" items="${userIds}">
+        userIdArr.push(${userId});
+    </c:forEach>
+
+    layui.use(['layer', 'form'], function () {
+        let form = layui.form;
+
+        form.on('submit(formDemo)', function(data) {
+            let paramData = data.field;
+            if (paramData.connectFlag == 'on') {
+                paramData.connectFlag = '1';
+            } else {
+                paramData.connectFlag = '0';
+            }
+
+            paramData.userIdArr = userIdArr
+            let loadingIdx = layer.load(1, {
+                shade: [0.1,'#000'] //0.1透明度的白色背景
+            });
+            $.ajax({
+                url: ctx + "/riskBlacklist/batchToBlackList"
+                , type: 'post'
+                , contentType: 'application/json'
+                , data: JSON.stringify(paramData)
+                , success(d) {
+                    layer.close(loadingIdx);
+                    if (d.code == 200) {
+                        parent.layer.closeAll();
+                        parent.layer.msg(d.message);
+                    } else {
+                        layer.confirm(d.message);
+                    }
+                }
+            })
+
+            return false;
+        })
+    })
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/riskBlacklist/list.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/riskBlacklist/list.jsp
new file mode 100644
index 0000000..d3c5a0c
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/riskBlacklist/list.jsp
@@ -0,0 +1,193 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp" />
+    <style>
+        .layui-table th {
+            text-align: center;
+        }
+    </style>
+</head>
+
+<script type="text/html" id="toolbarDemo">
+    <div class="layui-btn-container">
+        <button class="layui-btn layui-btn-sm" lay-event="search">
+            <i class="layui-icon layui-icon-search"></i>
+            查询
+        </button>
+
+    </div>
+</script>
+
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" action="" lay-filter="condition" style="margin-top: 10px">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">用户ID</label>
+                            <div class="layui-input-inline">
+                                <input type="text" name="userId" id="userId" class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">违规用户ID</label>
+                            <div class="layui-input-inline">
+                                <input type="text" name="causeUserId" id="causeUserId" class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">结算身份证</label>
+                            <div class="layui-input-inline">
+                                <input type="text" name="idcardNo" id="idcardNo" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">注册手机号</label>
+                            <div class="layui-input-inline">
+                                <input type="text" name="regPhone" id="regPhone" class="layui-input">
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <!-- 表单数据 -->
+    <div class="mb50 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-hide" id="table" lay-filter="table"></table>
+        </div>
+    </div>
+</div>
+
+<script>
+
+let form;
+let table;
+
+layui.use(['form', 'table'], function() {
+    form = layui.form;
+    table = layui.table;
+
+    table.render({
+        elem: '#table'
+        , id: 'table'
+        , url: ctx + '/riskBlacklist/page'
+        , response: {
+            statusCode: 200
+        }
+        , parseData: function (res) { //res 即为原始返回的数据
+            return {
+                "code": res.code, //解析接口状态
+                "msg": res.message, //解析提示文本
+                "count": res.data.total,
+                "data": res.data.records
+            };
+        }
+        , request: {
+            pageName: 'current' //页码的参数名称，默认：page
+            , limitName: 'size' //每页数据量的参数名，默认：limit
+        }
+        , even: true
+        , title: '风控黑名单列表'
+        , page: true //开启分页
+        , defaultToolbar: ['filter']
+        , toolbar: '#toolbarDemo'
+        , cols: [[ //表头
+             {type: 'checkbox', rowspan: 1}
+            , {field: 'regPhone', title: '注册手机号', minWidth: 120}
+            , {field: 'accountPhone', title: '结算手机号', minWidth: 130}
+            , {field: 'idcardNo', title: '结算身份信息', minWidth: 228, templet: function (d) {
+                    return d.idcardNo + " - " + d.certName;
+                }}
+            , {field: 'userId', title: '用户ID', minWidth: 80}
+            , {field: 'causeUserId', title: '违规用户ID', minWidth: 100}
+            , {field: 'remark', title: '违规信息', minWidth: 86}
+            , {field: 'channel', title: '违规通道', minWidth: 86, templet: function(d) {
+                    if (d.channel == '1') {
+                        return "随行付";
+                    }
+                    if (d.channel == '3') {
+                        return "瑞银信";
+                    }
+                    if (d.channel == '4') {
+                        return '银盛';
+                    }
+
+                    return "-";
+                }}
+            , {field: 'payWay', title: '支付方式', minWidth: 86, templet: function(d) {
+                    if (d.payWay == '01') {
+                        return '支付宝';
+                    }
+
+                    if (d.payWay == '02') {
+                        return '微信';
+                    }
+
+                    if (d.payWay == '03') {
+                        return '银联';
+                    }
+
+                    return '-';
+                }}
+            , {field: 'createTime', title: '违规记录时间', minWidth: 160, templet : "<div>{{layui.util.toDateString(d.createTime,'yyyy-MM-dd HH:mm:ss')}}</div>"}
+            , {field: 'userName', title: '实名姓名', minWidth: 86}
+            , {field: 'alias', title: '商户简称', minWidth: 86}
+            , {field: 'parentId', title: '上级ID', minWidth: 86}
+            , {field: 'parentName', title: '上级姓名', minWidth: 86}
+            , {field: 'grandParentId', title: '上上级ID', minWidth: 86}
+            , {field: 'grandParentName', title: '上上级姓名', minWidth: 100}
+        ]]
+    });
+
+    table.on('toolbar(table)', function (obj) {
+       switch (obj.event) {
+           case 'search':
+               reload();
+               break;
+       }
+    });
+});
+
+function reload() {
+    debugger;
+    let field = form.val('condition');
+    table.reload("table", {
+        where: field
+    });
+}
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/riskBlacklist/simple_form.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/riskBlacklist/simple_form.jsp
new file mode 100644
index 0000000..80b5713
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/riskBlacklist/simple_form.jsp
@@ -0,0 +1,104 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp" />
+    <style>
+        .layui-table th {
+            text-align: center;
+        }
+    </style>
+</head>
+<body>
+<form class="layui-form" lay-filter="form" action="" style="width: 80%; margin-top: 20px">
+    <div class="layui-form-item">
+        <label class="layui-form-label">违规通道</label>
+        <div class="layui-input-block">
+            <select name="channel" lay-verify="required">
+                <option value="" selected>请选择</option>
+                <option value="1">随行付</option>
+                <option value="3">瑞银信</option>
+                <option value="4">银盛</option>
+            </select>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">支付方式</label>
+        <div class="layui-input-block">
+            <select name="payWay" lay-verify="required">
+                <option value="" selected>请选择</option>
+                <option value="01">支付宝</option>
+                <option value="02">微信</option>
+                <option value="03">银联</option>
+            </select>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">同步子商户</label>
+        <div class="layui-input-block">
+            <input type="checkbox" name="connectFlag" lay-skin="switch" checked>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">备注</label>
+        <div class="layui-input-block">
+            <textarea name="remark" required placeholder="请输入内容" class="layui-textarea"></textarea>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button class="layui-btn" lay-submit lay-filter="formDemo">立即拉黑</button>
+            <button type="reset" onclick="parent.layer.closeAll();" class="layui-btn layui-btn-primary">取消</button>
+        </div>
+    </div>
+</form>
+
+<script>
+    let userId = '${userId}';
+    layui.use(['layer', 'form'], function () {
+        let form = layui.form;
+
+        form.on('submit(formDemo)', function(data) {
+            let paramData = data.field;
+            if (paramData.connectFlag == 'on') {
+                paramData.connectFlag = '1';
+            } else {
+                paramData.connectFlag = '0';
+            }
+            paramData.userId = userId;
+            let loadingIdx = layer.load(1, {
+                shade: [0.1,'#000'] //0.1透明度的白色背景
+            });
+            $.ajax({
+                url: ctx + "/riskBlacklist/toBlackList"
+                , type: 'post'
+                , contentType: 'application/json'
+                , data: JSON.stringify(paramData)
+                , success(d) {
+                    layer.close(loadingIdx);
+                    if (d.code == 200) {
+                        parent.layer.closeAll();
+                        parent.layer.msg(d.message);
+                    } else {
+                        layer.confirm(d.message);
+                    }
+                }
+            })
+
+            return false;
+        })
+    })
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/staff/userAppBaseInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/staff/userAppBaseInfo.jsp
new file mode 100644
index 0000000..723e928
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/staff/userAppBaseInfo.jsp
@@ -0,0 +1,162 @@
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+    <style>
+        .layui-input, .layui-textarea {
+            border-color: #606060;
+        }
+    </style>
+</head>
+<body>
+<form class="layui-form" action="" style="width: 80%; margin-top: 20px">
+    <input type="text" name="id" hidden/>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">商户</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <select name="merchantCode" lay-filter="selectMerchantCode" id="merchantCode">
+                    <option value="">请选择</option>
+                    <c:forEach items="${merchantBaseInfoList }" var="mb">
+                        <option value="${mb.merchantCode }"
+                                <c:if test="${userApp.merchantCode eq mb.merchantCode }">selected</c:if> >${mb.merchantName }</option>
+                    </c:forEach>
+                </select>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">账号</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input type="text" name="loginName" id="loginName" lay-verify="title" autocomplete="off"
+                       placeholder="账号后面会自动拼接@shouyin" class="layui-input">
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">姓名</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input type="text" name="userName" id="userName" lay-verify="title" autocomplete="off"
+                       placeholder="请输入内容" class="layui-input">
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">手机号</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input type="text" name="phone" id="phone" lay-verify="title" autocomplete="off"
+                       placeholder="请输入内容" class="layui-input">
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">登录密码</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input type="password" name="password" id="password" lay-verify="title" autocomplete="off"
+                       placeholder="请输入内容" class="layui-input">
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item has-error">
+        <label class="layui-form-label">确认密码</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input type="password" name="verifyPassword" id="verifyPassword" lay-verify="title"
+                       autocomplete="off" placeholder="请输入内容" class="layui-input">
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button class="layui-btn" lay-submit lay-filter="formDemo">立即提交</button>
+            <button type="button" id="close" class="layui-btn layui-btn-primary">关闭</button>
+        </div>
+    </div>
+</form>
+
+<script>
+    //Demo
+    layui.use(['form', 'layer'], function () {
+        var form = layui.form;
+        var layer = layui.layer;
+
+        $('#close').click(function () {
+            parent.layer.closeAll();
+        });
+        //监听提交
+        form.on('submit(formDemo)', function (data) {
+            var index = layer.load(1, {shade: [0.1, '#000']});
+            $.ajax({
+                url: '${ctx}/questionsAnswers/saveOrUpdate',
+                method: 'post',
+                data: JSON.stringify(data.field),
+                dataType: 'JSON',
+                contentType: "application/json",
+                success: function (res) {
+                    if (res.code == 200) {
+                        layer.alert(res.message, function () {
+                            parent.location.reload();
+                        })
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 5
+                        });
+                    }
+                }
+            })
+            return false;
+        });
+
+        form.on('select()',function (data) {
+            var areaCode = data.value;
+            var domId = $(data.elem).attr("data-dom");
+            $.ajax({
+                url: ctx + '/promoter/getDowntown/' + areaCode,
+                method: 'get',
+                dataType: 'json',
+                success: function (res) {
+                    if (res.code == 200) {
+                        var dom = $("#" + domId);
+                        var html = "<option value=''>请选择</option>";
+                        dom.empty();
+                        if (res.areaCityList.length > 0) {
+                            $.each(res.areaCityList, function (k, v) {
+                                html += "<option value='" + v.areaCode + "'>" + v.areaName + "</option>";
+                            })
+                            dom.append(html);
+                        }
+                        form.render('select');
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 5
+                        });
+                    }
+                }
+            })
+        });
+    });
+</script>
+</body>
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/staff/userAppList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/staff/userAppList.jsp
new file mode 100644
index 0000000..4921d6a
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/staff/userAppList.jsp
@@ -0,0 +1,265 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+    <script type="text/javascript">
+        require("staff/userAppList.js");
+    </script>
+    <style type="text/css">
+        .layui-table th {
+            text-align: center;
+        }
+    </style>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" action="" style="margin-top: 10px">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">用户ID</label>
+                            <div class="layui-input-inline">
+                                <input type="text" placeholder="请输入用户ID" id="userId" name="userId"
+                                       class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">员工名称</label>
+                            <div class="layui-input-inline">
+                                <input type="text" placeholder="请输入员工名称" id="userName" name="userName"
+                                       class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">手机号</label>
+                            <div class="layui-input-inline">
+                                <input type="text" placeholder="请输入手机号" id="phone" name="phone"
+                                       class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">商户手机号</label>
+                            <div class="layui-input-inline">
+                                <input type="text" placeholder="请输入商户手机号" id="contactMobile" name="contactMobile"
+                                       class="layui-input">
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">商户简称</label>
+                            <div class="layui-input-inline">
+                                <input type="text" placeholder="请输入商户简称" id="alias" name="alias"
+                                       class="layui-input">
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <div class="mb50 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-hide" id="staffList" lay-filter="staffList"></table>
+        </div>
+    </div>
+</div>
+</body>
+
+<script id="toolBar" type="text/html">
+    <a class="layui-btn layui-btn-sm" href="javascript:void(0);"
+       onclick="queryUserApp()">
+        <i class="layui-icon layui-icon-search"></i>搜索
+    </a>
+    <a class="layui-btn layui-btn-sm" href="javascript:void(0);"
+       onclick="initAddStaffUserApp()">
+        <i class="layui-icon layui-icon-add-1"></i>添加
+    </a>
+    <a class="layui-btn layui-btn-sm layui-btn-danger"
+       href="javascript:void(0);" onclick="initBatchDeleteUserApp()">
+        <i class="layui-icon layui-icon-delete"></i>删除
+    </a>
+</script>
+
+<script id="barDemo" type="text/html">
+    <a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>
+    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
+</script>
+
+<script type="text/javascript">
+    var layer;
+    var form;
+    var table;
+    var laydate;
+    var dropdown;
+    //form表单样式
+    layui.use(['table', 'layer', 'form', 'laydate', 'mDropdown'], function () {
+        layer = layui.layer;
+        form = layui.form;
+        table = layui.table;
+        laydate = layui.laydate;
+        dropdown = layui.mDropdown;
+        form.render();
+
+        //执行一个 table 实例
+        table.render({
+            elem: '#staffList'
+            , id: 'staffList'
+            , url: '${ctx}/staff/queryUserAppByPage' //数据接口
+            , where: { //请求参数（注意：这里面的参数可任意定义，并非下面固定的格式）
+                userType: $("#userType").val(),
+                phone: $("#phone").val(),
+                userName: $("#userName").val(),
+                storeId: $("#storeId").val(),
+                alias: $("#alias").val(),
+                phone: $("#phone").val(),
+                contactMobile: $("#contactMobile").val(),
+                userId: $("#userId").val()
+            }
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //数据列表的字段名称，默认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.count, //解析数据长度
+                    "data": res.userAppList //解析数据列表
+                };
+            }
+            , title: '商户详情'
+            , toolbar: '#toolBar' //开启工具栏，此处显示默认图标，可以自定义模板，详见文档
+            , defaultToolbar: ['filter']
+            , cols: [[ //表头
+                {type: 'numbers'}
+                , {type: 'checkbox'}
+                , {field: 'userId', title: '用户ID', align: "center"}
+                , {field: 'userName', title: '员工名称', minWidth: 100, align: "center"}
+                , {field: 'phone', title: '手机号', minWidth: 120, align: "center"}
+                , {field: 'contactMobile', title: '商户手机号', minWidth: 100, align: "center"}
+                , {field: 'loginName', title: '员工账号', minWidth: 100, align: "center",}
+                , {field: 'alias', title: '商户简称', minWidth: 120, align: "center"}
+                , {field: 'merchantName', title: '所属商户', minWidth: 120, align: "center"}
+                , {
+                    field: 'createDt', title: '创建日期', width: 160, align: "center",
+                    templet: "<div>{{layui.util.toDateString(d.createDt, 'yyyy-MM-dd HH:mm:ss')}}</div>"
+                }
+                , {fixed: 'right', title: '操作', toolbar: '#barDemo'}
+            ]]
+            , page: true //开启分页
+            , request: {
+                pageName: 'currPage' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , done: function (res) {
+                dropdown.suite();
+            }
+        });
+        //监听行工具事件
+        table.on('tool(staffList)', function (obj) {
+            var data = obj.data;
+            //console.log(obj)
+            if (obj.event === 'del') {
+                layer.confirm('真的删除行么?', function (index) {
+                    obj.del(data);
+                    layer.close(index);
+                    initDeleteUserApp(obj);
+                });
+            } else if (obj.event === 'edit') {
+                initAddStaffUserApp(obj.data);
+            }
+        });
+    });
+
+    //查询
+    function queryUserApp() {
+        table.reload('staffList', {
+            page: {
+                curr: 1
+            }
+            , where: { //请求参数（注意：这里面的参数可任意定义，并非下面固定的格式）
+                userType: $("#userType").val(),
+                phone: $("#phone").val(),
+                userName: $("#userName").val(),
+                storeId: $("#storeId").val(),
+                alias: $("#alias").val(),
+                phone: $("#phone").val(),
+                contactMobile: $("#contactMobile").val(),
+                userId: $("#userId").val()
+            }
+        });
+    }
+
+    //增加
+    function initAddStaffUserApp(obj) {
+        var url = '${ctx}/staff/queryUserAppBaseInfo';
+        if (obj != undefined) {
+            url = "${ctx}/staff/queryUserAppBaseInfo/" + obj.id
+        }
+        var index = layer.open({
+            type: 2
+            , shade: 0.5
+            , maxmin: true
+            , content: url
+            , area: ['550px', '500px']
+        });
+    }
+
+    //删除
+    function initDeleteUserApp(id) {
+        $.ajax({
+            url: ctx + '/staff/deleteStaff',
+            data: [{
+                name: 'id',
+                value: id
+            }],
+            type: 'POST',
+            dataType: 'json',
+            success: function (result) {
+                queryUserApp(pageIndex);
+                if (result.code == '1') {
+                    layer.msg('删除成功!');
+                } else if (result.code == '0') {
+                    layer.msg(result.msg);
+                }
+            }
+        });
+    }
+</script>
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/subMerchant/detail.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/subMerchant/detail.jsp
new file mode 100644
index 0000000..c87e7f4
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/subMerchant/detail.jsp
@@ -0,0 +1,69 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+</head>
+<body>
+
+<form class="layui-form" action="">
+    <input type="text" name="merchantCode" autocomplete="off" value="${data.merchantCode}" class="layui-input" class="layui-hide">
+    <input type="text" name="channelId" autocomplete="off" value="${data.channelId}" class="layui-input" class="layui-hide">
+    <input type="text" name="subMchType" autocomplete="off" value="WX" class="layui-input" disabled>
+    <input type="text" name="infoQrcode" lay-verify="title" autocomplete="off" value="${data.infoQrcode}" class="layui-hide">
+    <div class="layui-form-item">
+        <label class="layui-form-label">申请单号</label>
+        <div class="layui-input-block">
+            <input type="text" name="applyNo" autocomplete="off" value="${data.applyNo}" class="layui-input" disabled>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">认证图片</label>
+        <div class="layui-input-block">
+            <button type="button" class="layui-btn" id="test1">
+                <i class="layui-icon">&#xe67c;</i>上传图片
+            </button>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label"></label>
+        <div class="layui-input-block">
+            <input type="text" name="title" lay-verify="title" autocomplete="off" value="${data.merchantName}" class="layui-input" disabled>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">商户名称</label>
+        <div class="layui-input-block">
+            <input type="text" name="title" lay-verify="title" autocomplete="off" value="${data.merchantName}" class="layui-input" disabled>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">商户名称</label>
+        <div class="layui-input-block">
+            <input type="text" name="title" lay-verify="title" autocomplete="off" value="${data.merchantName}" class="layui-input" disabled>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">商户名称</label>
+        <div class="layui-input-block">
+            <input type="text" name="title" lay-verify="title" autocomplete="off" value="${data.merchantName}" class="layui-input" disabled>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">商户名称</label>
+        <div class="layui-input-block">
+            <input type="text" name="title" lay-verify="title" autocomplete="off" value="${data.merchantName}" class="layui-input" disabled>
+        </div>
+    </div>
+</form>
+</body>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/subMerchant/list.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/subMerchant/list.jsp
new file mode 100644
index 0000000..4066e91
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/subMerchant/list.jsp
@@ -0,0 +1,348 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<!DOCTYPE html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+
+    <style>
+        .layui-form-label {
+        !important;
+        }
+    </style>
+</head>
+<body>
+
+<div>
+</div>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" id="form1" action="" style="margin-top: 10px" lay-filter="formCondtion">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">手机号</label>
+                            <div class="layui-input-inline">
+                                <input type="text" id="loginName" name="loginName" placeholder="请输入手机号" class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">M800商编</label>
+                            <div class="layui-input-inline">
+                                <input type="text" id="merchantCode" name="merchantCode"
+                                       class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">通道商户号</label>
+                            <div class="layui-input-inline">
+                                <input type="text" id="merchantId" placeholder="请输入通道商户号" name="merchantId"
+                                       class="layui-input">
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <div class="mb50 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-hide" id="demo" lay-filter="test"></table>
+        </div>
+    </div>
+</div>
+
+<script type="text/html" id="toolbarMenu">
+    {{# if (d.resultStatus != '3' && ((d.status == '' || d.status == undefined) || ((d.infoQrcode == undefined || d.infoQrcode == '' )))) { }}
+    {{# if (d.channelId != '3') { }}
+    <a class="layui-btn layui-btn-xs" lay-event="wx-audit">
+        <i class="layui-icon layui-icon-release"></i>
+        微信认证
+    </a>
+    {{# } }}
+    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="wx-complete">
+        <i class="layui-icon layui-icon-ok-circle"></i>
+        标记为完成
+    </a>
+    {{# } }}
+</script>
+
+<script type="text/html" id="leftBar">
+    <a class="layui-btn layui-btn-sm " lay-event="search">
+        <i class="layui-icon layui-icon-search"></i>查询
+    </a>
+</script>
+
+<script>
+
+    function getChannelName(channelId) {
+        if (1 == channelId) {
+            return "随行付";
+        }
+
+        if (3 == channelId) {
+            return "瑞银信";
+        }
+
+        if (4 == channelId) {
+            return "银盛";
+        }
+
+        return "";
+    }
+
+    function getSubMchType(subMchType) {
+        if (subMchType == "WX") {
+            return "微信";
+        } else if (subMchType == "ZFB") {
+            return "支付宝";
+        } else {
+            return "银联";
+        }
+    }
+
+    function getSortField(obj, type) {
+        if (obj.type === type) {
+            return obj.field;
+        }
+    }
+
+    $(function () {
+
+    });
+
+    layui.config({
+        version: '1596625002448' //为了更新 js 缓存，可忽略
+    });
+
+    let layer;
+    let layPage;
+    let table;
+    let form;
+
+    layui.use(['laydate', 'laypage', 'layer', 'form', 'table', 'element', 'slider'], function () {
+        layPage = layui.laypage //分页
+        layer = layui.layer //弹层
+        table = layui.table //表格
+        form = layui.form;
+
+        //执行一个 table 实例
+        table.render({
+            elem: '#demo'
+            , autoSort: false
+            , url: ctx + '/subMerchant/page'//数据接口
+            , title: '用户表'
+            , page: true //开启分页
+            , toolbar: '#leftBar'
+            , defaultToolbar: ['filter']
+            , where: form.val("formCondtion")
+            , cols: [[ //表头
+                {type: 'checkbox', fixed: 'left'}
+                , {field: 'id', title: 'ID', width: 70, sort: true, fixed: 'left'}
+                , {field: 'userName', title: "实名姓名", minWidth: 86, sort: false}
+                , {field: 'loginName', title: "账号", width: 190, sort: false}
+                , {field: 'merchantCode', title: '商户code', width: 190}
+                , {field: 'merchantId', title: '通道商户号', width: 160}
+                , {
+                    field: 'channelTypeId', title: '通道', minWidth: 90, sort: true, templet: function (d) {
+                        return getChannelName(d.channelTypeId);
+                    }
+                }
+                , {
+                    field: 'subMchType', title: '子渠道类型', minWidth: 130, sort: true, templet: function (d) {
+                        return getSubMchType(d.subMchType);
+                    }
+                }
+                , {field: 'channelId', title: '接入方渠道号', minWidth: 160}
+                , {field: 'subMchId', title: '子商户号', minWidth: 160}
+                , {
+                    field: 'createTime',
+                    title: '创建时间',
+                    width: 160,
+                    sort: true,
+                    templet: "<div>{{layui.util.toDateString(d.createTime, 'yyyy-MM-dd HH:mm:ss')}}</div>"
+                }
+            ]]
+            , request: {
+                pageName: 'current'
+                , limitName: 'size'
+            }
+            , response: {
+                statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+        });
+
+        //监听头工具栏事件
+        table.on('toolbar(test)', function (obj) {
+            var checkStatus = table.checkStatus(obj.config.id)
+                , data = checkStatus.data; //获取选中的数据
+            switch (obj.event) {
+                case 'update':
+                    if (data.length === 0) {
+                        layer.msg('请选择一行');
+                    } else if (data.length > 1) {
+                        layer.msg('只能同时编辑一个');
+                    } else {
+                        layer.alert('编辑 [id]：' + checkStatus.data[0].id);
+                    }
+                    break;
+                case 'search':
+                    var params = serialize($('#form1'));
+                    params.column = obj.config.where.column;
+                    params.asc = obj.config.where.asc;
+                    table.reload('demo', {
+                        where: params
+                        , page: {
+                            size: 10
+                            , current: 1
+                        }
+                    });
+                    break;
+            }
+        });
+
+        //监听排序事件
+        table.on('sort(test)', function (obj) { //注：sort 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            console.log(obj.field); //当前排序的字段名
+            console.log(obj.type); //当前排序类型：desc（降序）、asc（升序）、null（空对象，默认排序）
+            console.log(this); //当前排序的 th 对象
+
+            //尽管我们的 table 自带排序功能，但并没有请求服务端。
+            //有些时候，你可能需要根据当前排序的字段，重新向服务端发送请求，从而实现服务端排序，如：
+            table.reload('demo', {
+                initSort: obj //记录初始排序，如果不设的话，将无法标记表头的排序状态。
+                , where: form.val("formCondition")
+            });
+
+            layer.msg('服务端排序。order by ' + obj.field + ' ' + obj.type);
+        });
+
+        //监听行工具事件
+        table.on('tool(test)', function (obj) { //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            var data = obj.data //获得当前行数据
+                , layEvent = obj.event; //获得 lay-event 对应的值
+            if (layEvent === 'wx-audit') {
+                // 微信认证
+                var id = data.id;
+                layer.confirm('是否为商户' + data.merchantCode + '发起微信实名认证？', function (index) {
+                    $.ajax({
+                        async: false
+                        , url: ctx + "/wx/wxCert"
+                        , data: {
+                            merchantCode: data.merchantCode
+                            , channelId: data.channelId
+                        }
+                        , type: 'POST'
+                        , dataType: 'json'
+                        , contentType: 'application/x-www-form-urlencoded'
+                        , success: function (res) {
+                            if (res.code == '200') {
+                                table.reload('demo');
+                                layer.msg(res.message);
+                                layer.close(index);
+                            } else {
+                                layer.msg(res.message);
+                                layer.close(index);
+                            }
+                        }
+                        , error: function (obj, error) {
+                            layer.msg(error);
+                            layer.close(index);
+                        }
+                    });
+                });
+            } else if (layEvent === 'wx-complete') {
+                layer.confirm('是否标记为完成', {icon: 3, title: '提示'}, function (index) {
+                    //do something
+
+                    var fieldData = new Object();
+                    fieldData.merchantCode = data.merchantCode;
+                    fieldData.channel = data.channelId;
+                    $.post("${ctx}/subMerchantApplyOrder/complete", fieldData, function (d) {
+                        layer.msg(d.message)
+                        table.reload('demo', null, true);
+                        layer.close(index);
+                    })
+                });
+            }
+        });
+
+        //分页
+        layPage.render({
+            elem: 'demo' //分页容器的id
+            , count: 100 //总页数
+            , skin: '#1E9FFF' //自定义选中色值
+            //,skip: true //开启跳页
+            , jump: function (obj, first) {
+                if (!first) {
+                    layer.msg('第' + obj.curr + '页', {offset: 'b'});
+                }
+            }
+        });
+    });
+
+    var index;
+
+    // 无法做到完全与layui.table兼容
+    function onDetailMouseOver(obj) {
+        console.log("onDetailMouseOver");
+        $(obj).addClass('data');
+        var width = 200;
+        var top = $(obj).offset().top;
+        var left = $(obj).offset().left - width;
+
+        var data = new Array();
+        $("tr.layui-table-hover td").each(function () {
+            var fieldName = $(this).attr("data-field");
+            data[fieldName] = $(this).children('div').text();
+        })
+
+        console.log(data);
+        index = layer.msg("姓名：" + data['userName'] + "<br />手机号： " + data['phone'] + "\n", {
+            area: width
+            , offset: [top, left]
+            , time: '-1'
+        });
+    }
+
+    function onDetailMouseOut(obj) {
+        console.log("onDetailMouseLeave");
+        $(obj).removeClass('data');
+        layer.close(index);
+    }
+</script>
+</body>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/subMerchant/remark.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/subMerchant/remark.jsp
new file mode 100644
index 0000000..7a87338
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/subMerchant/remark.jsp
@@ -0,0 +1,79 @@
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+    <style>
+        .layui-input, .layui-textarea {
+            border-color: #606060;
+        }
+    </style>
+</head>
+<body>
+<form class="layui-form" action="" style="width: 80%; margin-top: 20px">
+    <div class="layui-form-item">
+        <label class="layui-form-label" style="width: 84px">处理结果备注</label>
+        <div class="layui-input-block" style="margin-left:15px">
+            <div class="layui-input-block">
+                <textarea name="resultStatus" id="resultStatus" placeholder="备注说明" class="layui-textarea"></textarea>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button class="layui-btn" lay-submit lay-filter="formDemo">确认更改</button>
+            <button type="button" id="close" class="layui-btn layui-btn-primary">关闭</button>
+        </div>
+    </div>
+</form>
+
+<script>
+    //Demo
+    layui.use(['form', 'layer'], function () {
+        var form = layui.form;
+        var layer = layui.layer;
+        $('#close').click(function () {
+            parent.layer.closeAll();
+        });
+
+        //监听提交
+        form.on('submit(formDemo)', function (data) {
+            var index = layer.load(1, {shade: [0.1, '#000']});
+            $.ajax({
+                url: '${ctx}/subMerchantApplyOrder/disable',
+                method: 'post',
+                data: {
+                    merchantCode:'${merchantCode}'
+                    , resultStatus: $("#resultStatus").val()
+                    , channel: ${channel}
+                },
+                dataType: 'JSON',
+                success: function (res) {
+                    layer.close(index);
+                    if (res.code == 200) {
+                        layer.alert(res.message, function () {
+                            parent.location.reload();
+                        })
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 5
+                        });
+                    }
+                }
+            })
+            return false;
+        });
+    });
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/subMerchantApplyOrder/detail.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/subMerchantApplyOrder/detail.jsp
new file mode 100644
index 0000000..c87e7f4
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/subMerchantApplyOrder/detail.jsp
@@ -0,0 +1,69 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+</head>
+<body>
+
+<form class="layui-form" action="">
+    <input type="text" name="merchantCode" autocomplete="off" value="${data.merchantCode}" class="layui-input" class="layui-hide">
+    <input type="text" name="channelId" autocomplete="off" value="${data.channelId}" class="layui-input" class="layui-hide">
+    <input type="text" name="subMchType" autocomplete="off" value="WX" class="layui-input" disabled>
+    <input type="text" name="infoQrcode" lay-verify="title" autocomplete="off" value="${data.infoQrcode}" class="layui-hide">
+    <div class="layui-form-item">
+        <label class="layui-form-label">申请单号</label>
+        <div class="layui-input-block">
+            <input type="text" name="applyNo" autocomplete="off" value="${data.applyNo}" class="layui-input" disabled>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">认证图片</label>
+        <div class="layui-input-block">
+            <button type="button" class="layui-btn" id="test1">
+                <i class="layui-icon">&#xe67c;</i>上传图片
+            </button>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label"></label>
+        <div class="layui-input-block">
+            <input type="text" name="title" lay-verify="title" autocomplete="off" value="${data.merchantName}" class="layui-input" disabled>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">商户名称</label>
+        <div class="layui-input-block">
+            <input type="text" name="title" lay-verify="title" autocomplete="off" value="${data.merchantName}" class="layui-input" disabled>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">商户名称</label>
+        <div class="layui-input-block">
+            <input type="text" name="title" lay-verify="title" autocomplete="off" value="${data.merchantName}" class="layui-input" disabled>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">商户名称</label>
+        <div class="layui-input-block">
+            <input type="text" name="title" lay-verify="title" autocomplete="off" value="${data.merchantName}" class="layui-input" disabled>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">商户名称</label>
+        <div class="layui-input-block">
+            <input type="text" name="title" lay-verify="title" autocomplete="off" value="${data.merchantName}" class="layui-input" disabled>
+        </div>
+    </div>
+</form>
+</body>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/subMerchantApplyOrder/list.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/subMerchantApplyOrder/list.jsp
new file mode 100644
index 0000000..4a47204
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/subMerchantApplyOrder/list.jsp
@@ -0,0 +1,430 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<!DOCTYPE html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+
+    <style>
+        .layui-form-label {
+        !important;
+        }
+    </style>
+</head>
+<body>
+
+<div>
+</div>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" id="form1" action="" style="margin-top: 10px">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">手机号</label>
+                            <div class="layui-input-inline">
+                                <input type="text" id="phone" name="phone" placeholder="请输入手机号" class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">姓名</label>
+                            <div class="layui-input-inline">
+                                <input type="text" id="userName" name="userName" placeholder="请输入姓名"
+                                       class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">商户号</label>
+                            <div class="layui-input-inline">
+                                <input type="text" id="merchantCode" placeholder="请输入商户号" name="merchantCode"
+                                       class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">通道商户号</label>
+                            <div class="layui-input-inline">
+                                <input type="text" id="merchantId" placeholder="请输入通道商户号" name="merchantId"
+                                       class="layui-input">
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">处理状态</label>
+                            <div class="layui-input-inline">
+                                <select id="status" name="status">
+                                    <option value="">请选择</option>
+                                    <option value="0">未处理</option>
+                                    <option value="1">已处理</option>
+                                    <option value="2">已取消</option>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">工单状态</label>
+                            <div class="layui-input-inline">
+                                <select id="resultStatus" name="resultStatus">
+                                    <option value="">请选择</option>
+                                    <option value="-1">未认证</option>
+                                    <option value="0">审核中</option>
+                                    <option value="1">待授权</option>
+                                    <option value="3">已驳回</option>
+                                    <option value="2">已完成</option>
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <div class="mb50 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-hide" id="demo" lay-filter="test"></table>
+        </div>
+    </div>
+</div>
+
+<script type="text/html" id="toolbarMenu">
+    {{# if (d.resultStatus != '3' && ((d.status == '' || d.status == undefined) || ((d.infoQrcode == undefined || d.infoQrcode == '' )))) { }}
+    {{# if (d.channelId != '3') { }}
+    <a class="layui-btn layui-btn-xs" lay-event="wx-audit">
+        <i class="layui-icon layui-icon-release"></i>
+        微信认证
+    </a>
+    {{# } }}
+    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="wx-complete">
+        <i class="layui-icon layui-icon-ok-circle"></i>
+        标记为完成
+    </a>
+    {{# } }}
+</script>
+
+<script type="text/html" id="leftBar">
+    <a class="layui-btn layui-btn-sm fa fa-search f13" lay-event="search"><span>搜索</span></a>
+    <%--    <button type="button" class="layui-btn" lay-event="add">商户实名认证</button>--%>
+    <%--    <button type="button" class="layui-btn layui-btn-danger" lay-event="delete">删除</button>--%>
+</script>
+
+<script>
+
+    function getChannelName(channelId) {
+        if (1 == channelId) {
+            return "随行付";
+        }
+
+        if (3 == channelId) {
+            return "瑞银信";
+        }
+
+        if (4 == channelId) {
+            return "银盛";
+        }
+
+        return "";
+    }
+
+    function getSubMchType(subMchType) {
+        if (subMchType == "WX") {
+            return "微信";
+        } else {
+            return "";
+        }
+    }
+
+    function getSortField(obj, type) {
+        if (obj.type === type) {
+            return obj.field;
+        }
+    }
+
+    $(function () {
+
+    });
+
+    layui.config({
+        version: '1596625002448' //为了更新 js 缓存，可忽略
+    });
+
+    var layer;
+    var layPage;
+    var table;
+
+    layui.use(['laydate', 'laypage', 'layer', 'table', 'carousel', 'element', 'slider'], function () {
+        layPage = layui.laypage //分页
+        layer = layui.layer //弹层
+        table = layui.table //表格
+
+        //执行一个 table 实例
+        table.render({
+            elem: '#demo'
+            , autoSort: false
+            , url: ctx + '/subMerchantApplyOrder/pageMoreDetail'//数据接口
+            , title: '用户表'
+            , page: true //开启分页
+            , toolbar: '#leftBar'
+            , defaultToolbar: ['filter']
+            , where: {
+                column: "auditUpdateTime" // 初始化排序字段
+                , asc: false
+                , phone: $('input[name="phone"]').val()
+                , userName: $('input[name="userName"]').val()
+                , merchantCode: $('input[name="merchantCode"]').val()
+                , merchantId: $('input[name="merchantId"]').val()
+                , status: $('input[name="status"]').val()
+            }
+            , cols: [[ //表头
+                {type: 'checkbox', fixed: 'left'}
+                , {field: 'id', title: 'ID', minWidth: 70, sort: true, fixed: 'left'}
+                , {field: 'bankCertName', title: "用户名称", minWidth: 90, sort: false}
+                , {field: 'phone', title: "手机号", minWidth: 140, sort: false}
+                , {field: 'merchantCode', title: '商户code', minWidth: 190}
+                , {field: 'merchantId', title: '通道商户号', minWidth: 160}
+                , {
+                    field: 'channelId', title: '通道id', minWidth: 90, sort: true, templet: function (d) {
+                        return getChannelName(d.channelId);
+                    }
+                }
+                , {
+                    field: 'subMchType', title: '子渠道类型', minWidth: 130, sort: true, templet: function (d) {
+                        return getSubMchType(d.subMchType);
+                    }
+                }
+                , {field: 'applyNo', title: '工单号', minWidth: 160}
+                , {
+                    field: 'status', title: '处理状态', minWidth: 100, templet: function (d) {
+                        if (d.status == '' || d.status == undefined) {
+                            return "待认证";
+                        }
+                        if (d.status == "1") {
+                            return "已处理";
+                        } else if (d.status == '2') {
+                            return "已取消";
+                        } else {
+                            return "未处理";
+                        }
+                    }
+                }
+                , {field: 'infoQrcode', title: '二维码链接', minWidth: 100}
+                , {field: 'resultStatus', title: '处理结果code', minWidth: 120}
+                , {field: 'remark', title: '处理结果内容', minWidth: 135}
+                , {
+                    field: 'auditUpdateTime',
+                    title: '进件通过时间',
+                    width: 160,
+                    sort: true,
+                    templet: "<div>{{layui.util.toDateString(d.auditUpdateTime, 'yyyy-MM-dd \n HH:mm:ss')}}</div>"
+                }
+                , {
+                    field: 'createTime',
+                    title: '微信认证发起时间',
+                    width: 160,
+                    sort: true,
+                    templet: "<div>{{layui.util.toDateString(d.createTime, 'yyyy-MM-dd HH:mm:ss')}}</div>"
+                }
+                , {fixed: 'right', title: '操作', minWidth: 280, align: 'left', toolbar: '#toolbarMenu'}
+            ]]
+            , request: {
+                pageName: 'current'
+                , limitName: 'size'
+            }
+            , response: {
+                statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+        });
+
+        //监听头工具栏事件
+        table.on('toolbar(test)', function (obj) {
+            var checkStatus = table.checkStatus(obj.config.id)
+                , data = checkStatus.data; //获取选中的数据
+            switch (obj.event) {
+                case 'add':
+                    layer.msg('添加');
+                    break;
+                case 'update':
+                    if (data.length === 0) {
+                        layer.msg('请选择一行');
+                    } else if (data.length > 1) {
+                        layer.msg('只能同时编辑一个');
+                    } else {
+                        layer.alert('编辑 [id]：' + checkStatus.data[0].id);
+                    }
+                    break;
+                case 'delete':
+                    if (data.length === 0) {
+                        layer.msg('请选择一行');
+                    } else {
+                        layer.msg('删除');
+                    }
+                    break;
+                case 'search':
+                    var params = serialize($('#form1'));
+                    params.column = obj.config.where.column;
+                    params.asc = obj.config.where.asc;
+                    table.reload('demo', {
+                        where: params
+                        , page: {
+                            size: 10
+                            , current: 1
+                        }
+                    });
+                    break;
+            }
+        });
+
+        //监听排序事件
+        table.on('sort(test)', function (obj) { //注：sort 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            console.log(obj.field); //当前排序的字段名
+            console.log(obj.type); //当前排序类型：desc（降序）、asc（升序）、null（空对象，默认排序）
+            console.log(this); //当前排序的 th 对象
+
+            //尽管我们的 table 自带排序功能，但并没有请求服务端。
+            //有些时候，你可能需要根据当前排序的字段，重新向服务端发送请求，从而实现服务端排序，如：
+            table.reload('demo', {
+                initSort: obj //记录初始排序，如果不设的话，将无法标记表头的排序状态。
+                , where: {
+                    column: obj.field //排序字段
+                    , asc: obj.type === 'asc' //排序方式
+                    , phone: $('input[name="phone"]').val()
+                    , userName: $('input[name="userName"]').val()
+                    , merchantCode: $('input[name="merchantCode"]').val()
+                    , merchantId: $('input[name="merchantId"]').val()
+                    , status: $('input[name="status"]').val()
+                }
+            });
+
+            layer.msg('服务端排序。order by ' + obj.field + ' ' + obj.type);
+        });
+
+        //监听行工具事件
+        table.on('tool(test)', function (obj) { //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            var data = obj.data //获得当前行数据
+                , layEvent = obj.event; //获得 lay-event 对应的值
+            if (layEvent === 'wx-audit') {
+                // 微信认证
+                var id = data.id;
+                layer.confirm('是否为商户' + data.merchantCode + '发起微信实名认证？', function (index) {
+                    $.ajax({
+                        async: false
+                        , url: ctx + "/wx/wxCert"
+                        , data: {
+                            merchantCode: data.merchantCode
+                            , channelId: data.channelId
+                        }
+                        , type: 'POST'
+                        , dataType: 'json'
+                        , contentType: 'application/x-www-form-urlencoded'
+                        , success: function (res) {
+                            if (res.code == '200') {
+                                table.reload('demo');
+                                layer.msg(res.message);
+                                layer.close(index);
+                            } else {
+                                layer.msg(res.message);
+                                layer.close(index);
+                            }
+                        }
+                        , error: function (obj, error) {
+                            layer.msg(error);
+                            layer.close(index);
+                        }
+                    });
+                });
+            } else if (layEvent === 'wx-complete') {
+                layer.confirm('是否标记为完成', {icon: 3, title: '提示'}, function (index) {
+                    //do something
+
+                    var fieldData = new Object();
+                    fieldData.merchantCode = data.merchantCode;
+                    fieldData.channel = data.channelId;
+                    $.post("${ctx}/subMerchantApplyOrder/complete", fieldData, function (d) {
+                        layer.msg(d.message)
+                        table.reload('demo', null, true);
+                        layer.close(index);
+                    })
+                });
+            }
+        });
+
+        //分页
+        layPage.render({
+            elem: 'demo' //分页容器的id
+            , count: 100 //总页数
+            , skin: '#1E9FFF' //自定义选中色值
+            //,skip: true //开启跳页
+            , jump: function (obj, first) {
+                if (!first) {
+                    layer.msg('第' + obj.curr + '页', {offset: 'b'});
+                }
+            }
+        });
+    });
+
+    var index;
+
+    // 无法做到完全与layui.table兼容
+    function onDetailMouseOver(obj) {
+        console.log("onDetailMouseOver");
+        $(obj).addClass('data');
+        var width = 200;
+        var top = $(obj).offset().top;
+        var left = $(obj).offset().left - width;
+
+        var data = new Array();
+        $("tr.layui-table-hover td").each(function () {
+            var fieldName = $(this).attr("data-field");
+            data[fieldName] = $(this).children('div').text();
+        })
+
+        console.log(data);
+        index = layer.msg("姓名：" + data['userName'] + "<br />手机号： " + data['phone'] + "\n", {
+            area: width
+            , offset: [top, left]
+            , time: '-1'
+        });
+    }
+
+    function onDetailMouseOut(obj) {
+        console.log("onDetailMouseLeave");
+        $(obj).removeClass('data');
+        layer.close(index);
+    }
+</script>
+</body>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/subMerchantApplyOrder/remark.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/subMerchantApplyOrder/remark.jsp
new file mode 100644
index 0000000..7a87338
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/subMerchantApplyOrder/remark.jsp
@@ -0,0 +1,79 @@
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+    <style>
+        .layui-input, .layui-textarea {
+            border-color: #606060;
+        }
+    </style>
+</head>
+<body>
+<form class="layui-form" action="" style="width: 80%; margin-top: 20px">
+    <div class="layui-form-item">
+        <label class="layui-form-label" style="width: 84px">处理结果备注</label>
+        <div class="layui-input-block" style="margin-left:15px">
+            <div class="layui-input-block">
+                <textarea name="resultStatus" id="resultStatus" placeholder="备注说明" class="layui-textarea"></textarea>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button class="layui-btn" lay-submit lay-filter="formDemo">确认更改</button>
+            <button type="button" id="close" class="layui-btn layui-btn-primary">关闭</button>
+        </div>
+    </div>
+</form>
+
+<script>
+    //Demo
+    layui.use(['form', 'layer'], function () {
+        var form = layui.form;
+        var layer = layui.layer;
+        $('#close').click(function () {
+            parent.layer.closeAll();
+        });
+
+        //监听提交
+        form.on('submit(formDemo)', function (data) {
+            var index = layer.load(1, {shade: [0.1, '#000']});
+            $.ajax({
+                url: '${ctx}/subMerchantApplyOrder/disable',
+                method: 'post',
+                data: {
+                    merchantCode:'${merchantCode}'
+                    , resultStatus: $("#resultStatus").val()
+                    , channel: ${channel}
+                },
+                dataType: 'JSON',
+                success: function (res) {
+                    layer.close(index);
+                    if (res.code == 200) {
+                        layer.alert(res.message, function () {
+                            parent.location.reload();
+                        })
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 5
+                        });
+                    }
+                }
+            })
+            return false;
+        });
+    });
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/suggest/suggestBaseInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/suggest/suggestBaseInfo.jsp
new file mode 100644
index 0000000..7c4d8db
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/suggest/suggestBaseInfo.jsp
@@ -0,0 +1,53 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">
+	<div class="tab-pane active">
+		<div class="panel-body">
+			<div class="wrapper wrapper-content">
+				<div class="panel-form animated fadeInRight wp60 fc">
+					<div class="layui-form-item dn	has-error">
+						<label class="layui-form-label">id</label>
+						<div class="layui-input-block">
+							<input type="text" name="id" lay-verify="title"
+								autocomplete="off" placeholder="请输入内容" class="layui-input"
+								value="${suggest.id }">
+						</div>
+					</div>
+					<div class="layui-form-item layui-form-text">
+						<label class="layui-form-label">意见内容</label>
+						<div class="layui-input-block">
+							<textarea placeholder="请输入内容" class="layui-textarea"
+								readonly="readonly">${suggest.content }</textarea>
+					<input type="hidden" name="picUrls" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input"
+							value="${suggest.picUrls }">
+						</div>
+					</div>
+						<div class="layui-form-item 	has-error">
+							<label class="layui-form-label">照片</label>
+							<div class="layui-input-block">
+								<c:forEach items="${suggest.picUrls }" var="pic">
+										<img src="${pic}" class="mr10 w200 h100 dlblock enlarge mb10">
+								</c:forEach>
+							</div>
+					   </div>
+				</div>
+			</div>
+		</div>
+</form>
+<script>
+	   layui.use('layer', function(){ 
+		   var $ = layui.jquery, layer = layui.layer; 
+		   
+	   $(".enlarge").click(function(){
+		   var url = this.src;
+		   layer.open({
+		        type: 1
+		        ,title: '图片放大'
+		        ,area: ['700px', '600px']
+		        ,shade: 0
+		        ,content: '<div class="ml10 mr10 mt10 m10 textc"><img src="'+url+'" style="max-width:100%"></div>'
+		      });
+	   })
+   })
+</script>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/suggest/suggestDetails.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/suggest/suggestDetails.jsp
new file mode 100644
index 0000000..bced47a
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/suggest/suggestDetails.jsp
@@ -0,0 +1,54 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>     
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">                      
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black"> 
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> 
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->                                     
+<meta name="viewport"
+	content="width=device-width, initial-scale=1.0, maximum-scale=1.0">   
+<jsp:include page="../../common.jsp" />
+<script type="text/javascript">
+    require("suggest/suggestDetails.js");
+</script>
+<title>编辑</title>
+</head>                                 
+	<body class="lgraybg">            
+		<div class="	container-fluid animated fadeInRight col-sm-12">
+			<div class="panel-toolbar mt10 mb10 pt5 pb5 pl10 bdd whitebg">
+				<div class="buttons">
+					<!-- <a href="javascript:void(0);" class="btn btn-primary fa fa-save f12"><span>保存</span></a> -->
+					<a href="${ctx }/suggest/index?pageIndex=${pageIndex}"  class="layui-btn layui-btn-sm fa fa-back f12" id="goback"><span>返回</span></a>
+				</div>
+			</div>
+				<div class="tabs-container whitebg">
+					<div class="pt10 pl5 pr5">
+						<ul class="nav nav-tabs" id="nav-tabs">
+							<li class="active" data-action="base">   
+								<a href="javascript:void(0);" >基本资料</a>
+							</li>
+							<!-- <li class="" data-action="functions">
+								<a href="javascript:void(0);"  >多功能输入</a>
+							</li>
+							<li class="" data-action="extends">
+								<a href="javascript:void(0);" >扩展属性</a>
+							</li> -->
+						</ul>
+						<div class="tab-content pt30 p30">               
+		
+						</div>     
+					</div>
+				</div>    
+		</div>
+		<!-- 隐藏域 -->
+		<input type="hidden" id="suggestId" value="${suggest.id }"/>
+	</body>
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/suggest/suggestExtendsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/suggest/suggestExtendsInfo.jsp
new file mode 100644
index 0000000..592687a
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/suggest/suggestExtendsInfo.jsp
@@ -0,0 +1,201 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>           
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> 
+<div class="tab-pane active">      
+	<div class="animated fadeInRight">
+		<div class="whitebg pl10 pr10">
+			<table class="table table-striped table-bordered table-hover">     
+				<thead> 
+					<tr>  
+						<th class="textc">序号</th>         
+						<th class="textc wp15">流水账号</th>
+						<th class="textc">日期</th>         
+						<th class="textc">财务类别</th>     
+						<th class="textc">金额</th>         
+						<th class="textc">银行</th>         
+						<th class="textc">发票</th>         
+						<th class="textc">客户名称</th>     
+						<th class="textc wp15">单号</th>    
+						<th class="textc">状态</th>         
+						<th class="textc">类别</th>         
+						<th class="textc">操作</th>         
+					</tr> 
+				</thead>
+				<tbody> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+                
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="green">支出</span></td>     
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+				</tbody>
+                
+			</table>  
+			<!-- footer -->  
+			<div class="clearfix mb10 pb20">          
+					<div class="layui-tab-item fr">       
+							<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+							<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>   
+							<div class="pagination dlblock vm" id="pagination"></div>
+							<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>            
+					</div>
+				</div>  
+		</div>      
+	</div>        
+</div>          
+                
+<script type="text/javascript">    
+//分页          
+$('#pagination').pagination({        
+	pageCount: 50,
+	jump: true,   
+	coping: true, 
+	homePage: '首页',    
+	endPage: '末页',     
+	prevContent: '上页', 
+	nextContent: '下页', 
+	callback: function(api) {          
+		$('.now').text(api.getCurrent());
+	}             
+});             
+</script>       
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/suggest/suggestFunctionsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/suggest/suggestFunctionsInfo.jsp
new file mode 100644
index 0000000..982ce84
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/suggest/suggestFunctionsInfo.jsp
@@ -0,0 +1,130 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>		
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">      
+<div class="tab-pane active">
+				<div class="panel-body">
+					<div class="wrapper wrapper-content">     
+						<div class="panel-form animated fadeInRight wp60 fc">
+							<!-- 账号资料 -->
+			<div class="layui-form-item 	has-error">
+				<label class="layui-form-label">单行输入框<i class="red">*</i></label>
+				<div class="layui-input-block">
+					<input type="text" name="title" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input">
+				</div>                                         
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">自定义验证</label>
+				<div class="layui-input-inline ml30">
+					<input type="password" name="password" lay-verify="pass" placeholder="请输入密码" autocomplete="off" class="layui-input">
+				</div>
+				<div class="layui-form-mid layui-word-aux">请填写6到12位密码</div>
+			</div>
+			<div class="form-group">
+				<div class="layui-form-item">          
+					<label class="layui-form-label">单行选择框</label>
+					<div class="layui-input-block">
+						<select name="interest" lay-filter="aihao">  
+							<option value=""></option>
+							<option value="0">写作</option>         
+							<option value="1" selected="">阅读</option>
+							<option value="2">游戏</option>
+							<option value="3">音乐</option>
+							<option value="4">旅行</option>  
+						</select>              
+					</div>
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<div class="layui-inline">  
+					<label class="layui-form-label">范围</label>
+					<div class="layui-input-inline ml30">
+						<input type="text" name="price_min" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>                                     
+					<div class="layui-form-mid">-</div>
+					<div class="layui-input-inline">       
+						<input type="text" name="price_max" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>
+				</div>           
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">联动选择框</label>
+				<div class="layui-input-inline ml30">
+					<select name="quiz1">     
+						<option value="">请选择省</option>
+						<option value="浙江" selected="">浙江省</option> 
+						<option value="你的工号">江西省</option>           
+						<option value="你最喜欢的老师">福建省</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz2">
+						<option value="">请选择市</option>
+						<option value="杭州">杭州</option>
+						<option value="宁波" disabled="">宁波</option>
+						<option value="温州">温州</option>
+						<option value="温州">台州</option>
+						<option value="温州">绍兴</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz3">
+						<option value="">请选择县/区</option>
+						<option value="西湖区">西湖区</option>
+						<option value="余杭区">余杭区</option>
+						<option value="拱墅区">临安市</option>
+					</select>
+				</div>    
+			</div>
+			<div class="layui-form-item" pane="">   
+				<label class="layui-form-label">原始复选框</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="like1[write]" lay-skin="primary" title="写作" checked="">  
+					<input type="checkbox" name="like1[read]" lay-skin="primary" title="阅读">
+					<input type="checkbox" name="like1[game]" lay-skin="primary" title="游戏" disabled="">
+				</div>
+			</div>
+
+			<div class="layui-form-item">
+				<label class="layui-form-label">开关-默认关</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="close" lay-skin="switch" lay-text="ON|OFF">
+				</div>
+			</div>
+			<div class="layui-form-item">  
+				<label class="layui-form-label">单选框</label>
+				<div class="layui-input-block">
+					<input type="radio" name="sex" value="男" title="男" checked="">
+					<input type="radio" name="sex" value="女" title="女">
+					<input type="radio" name="sex" value="禁" title="禁用" disabled="">
+				</div>
+			</div>
+			<!--<div class="layui-form-item layui-form-text">
+				<label class="layui-form-label">上传图片</label>
+				<div class="layui-input-block">
+					<div class="layui-upload-drag w200 h200">
+						<i class="layui-icon"></i>          
+						<p>点击上传</p>
+					</div>
+				</div>
+			</div>-->
+				<div class="layui-form-item layui-form-text">
+					<label class="layui-form-label">普通文本域</label>  
+					<div class="layui-input-block">              
+						<textarea placeholder="请输入内容" class="layui-textarea"></textarea>
+					</div>
+				</div>
+			</div>
+		</div>   
+	</div>
+</div>
+</form>   
+<script type="text/javascript">
+	//form表单样式
+	layui.use(['layer', 'form'], function() {    
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+</script>                 
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/suggest/suggestList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/suggest/suggestList.jsp
new file mode 100644
index 0000000..17a2129
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/suggest/suggestList.jsp
@@ -0,0 +1,207 @@
+<%@ page contentType="text/html; charset=utf-8"
+		 pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head>
+	<meta charset="utf-8">
+	<meta http-equiv="X-UA-Compatible" content="IE=edge">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<meta name="format-detection" content="telephone=no">
+	<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+	<meta name="renderer" content="webkit">
+	<!-- 移动设备 viewport -->
+	<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+	<jsp:include page="../../common.jsp"/>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+	<div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+		<div class="toolbar-panel bdd">
+			<div class="toolbar-box">
+				<div class="toolbar-head clearfix lgraybg pt5 pl10 bdbd">
+					<!-- 顶部按钮 -->
+					<div class="fl">
+						查询条件
+					</div>
+					<div class="tools fr">
+						<a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+							<i class="fa-2x fa fa-angle-double-up"></i>
+						</a>
+					</div>
+				</div>
+			</div>
+			<!--搜索条件 -->
+			<div class="toolbar-body">
+				<form class="layui-form" id="form1" action="" style="margin-top: 10px;">
+					<div class="layui-form-item">
+						<div class="layui-inline">
+							<label class="layui-form-label">用户ID</label>
+							<div class="layui-input-block">
+								<input type="text" name="userId" id="userId" placeholder="用户ID"
+									   autocomplete="off" class="layui-input">
+							</div>
+						</div>
+						<div class="layui-inline">
+							<label class="layui-form-label">联系手机号</label>
+							<div class="layui-input-block">
+								<input type="text" name="phone" id="phone" placeholder="联系人手机号"
+									   autocomplete="off" class="layui-input">
+							</div>
+						</div>
+						<div class="layui-inline">
+							<label class="layui-form-label">处理状态</label>
+							<div class="layui-input-block">
+								<select id="status" name="status">
+									<option value="">请选择</option>
+									<option value="0">未处理</option>
+									<option value="1">已处理</option>
+								</select>
+							</div>
+						</div>
+					</div>
+				</form>
+			</div>
+		</div>
+	</div>
+	<div class="mb50 mt10">
+		<div class="whitebg pl10 pr10">
+			<table class="layui-hide" id="suggestTab" lay-filter="suggestTab"></table>
+		</div>
+	</div>
+</div>
+<script type="text/html" id="leftBar">
+	<a class="layui-btn layui-btn-sm" lay-event="search">
+		<i class="layui-icon layui-icon-search"></i>查询
+	</a>
+</script>
+<script type="text/html" id="toolBar">
+	{{# if (d.status != "1") { }}
+		<a class="layui-btn layui-btn-xs layui-btn-warm" lay-event="markDeal">
+			<i class="layui-icon layui-icon-ok"></i>标记已处理
+		</a>
+	{{# } }}
+	{{# if (d.picUrls && d.picUrls.indexOf("null") < 0) { }}
+		<a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="showPic">
+			<i class="layui-icon layui-icon-list"></i>查看图片
+		</a>
+	{{# } }}
+</script>
+
+<script>
+	layui.use(['table', 'layer'], function () {
+		var table = layui.table;
+		var layer = layui.layer;
+
+		var tableIns = table.render({
+			elem: '#suggestTab'
+			, url: ctx + '/suggest/page'
+			, id: 'suggest'
+			, response: {
+				statusName: 'code' //数据状态的字段名称，默认：code
+				, countName: 'count' //数据总数的字段名称，默认：count
+				, dataName: 'data' //默数据列表的字段名称，认：data
+				, statusCode: 200
+			}
+			, parseData: function (res) { //res 即为原始返回的数据
+				return {
+					"code": res.code, //解析接口状态
+					"msg": res.message, //解析提示文本
+					"count": res.data.total, //解析数据长度
+					"data": res.data.records //解析数据列表
+				};
+			}
+			, toolbar: '#leftBar' //开启头部工具栏，并为其绑定左侧模板
+			, defaultToolbar: ['filter']
+			, title: '意见反馈信息表'
+			, cols: [[
+				 {field: 'numbers', title: '序号', unresize: true, width: 80, type: 'numbers'}
+				, {field: 'userId', title: '用户ID',width: 90}
+				, {field: 'content', title: '反馈内容'}
+				, {field: 'phone', title: '联系手机号',width: 120}
+				, {field: 'status', title: '状态',width: 100,templet: function (d){
+					return d.status == '0' ? '<span style="color: red">未处理</span>' : '<span style="color: green">已处理</span>'
+					}}
+				, {
+					field: 'createDt',
+					title: '创建时间',
+					width: 150,
+					templet: "<div>{{layui.util.toDateString(d.createDt,'yyyy-MM-dd HH:mm')}}</div>"
+				}
+				, {fixed: 'right', title: '操作', width: 220, toolbar: '#toolBar'}
+			]]
+			, request: {
+				pageName: 'current' //页码的参数名称，默认：page
+				, limitName: 'size' //每页数据量的参数名，默认：limit
+			}
+			, page: true
+		});
+		table.on('tool(suggestTab)', function (obj) { //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+			var data = obj.data; //获得当前行数据
+			var layEvent = obj.event; //获得 lay-event 对应的值（也可以是表头的 event 参数对应的值）
+			if (layEvent === 'showPic') { //详情
+				let picUrls = data.picUrls.split(",");
+				let obj = {};
+				obj.title = "图片详情";
+				obj.id = 1;
+				obj.start = 0;
+				let cData = [];
+				$.each(picUrls,function (k,v){
+					let pData = {};
+					pData.alt = "意见反馈图";
+					pData.pid = 1;
+					pData.src = v;
+					pData.thumb = v;
+					cData.push(pData);
+				})
+				obj.data = cData;
+				layer.photos({
+					photos: obj
+					,anim: 5 //0-6的选择，指定弹出图片动画类型，默认随机（请注意，3.0之前的版本用shift参数）
+				});
+			} else if (layEvent === 'markDeal') {
+				layer.confirm('标记为已完成？', {icon: 3, title: '提示'}, function (index) {
+					var url = ctx + "/suggest/markDeal";
+
+					$.ajax({
+						url: url,
+						type: "POST",
+						data: {
+							id: data.id
+						},
+						success: function (d) {
+							layer.alert(d.message);
+
+							table.reload('suggest', {
+								where: params
+								, page: {
+									size: 10
+									, current: 1
+								}
+							});
+						}
+					});
+
+					layer.close(index);
+				});
+			}
+		});
+		//监听头工具栏事件
+		table.on('toolbar(suggestTab)', function (obj) {
+			switch (obj.event) {
+				case 'search':
+					var params = serialize($('#form1'));
+					table.reload('suggest', {
+						where: params
+						, page: {
+							size: 10
+							, current: 1
+						}
+					});
+					break;
+			}
+		});
+	});
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/sys/appMenu/appMenuBandage.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/sys/appMenu/appMenuBandage.jsp
new file mode 100644
index 0000000..7f65b99
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/sys/appMenu/appMenuBandage.jsp
@@ -0,0 +1,92 @@
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../../common.jsp"/>
+    <style>
+        .layui-input, .layui-textarea {
+            border-color: #606060;
+        }
+    </style>
+</head>
+<body>
+<form class="layui-form" action="" style="width: 80%; margin-top: 20px">
+    <input name="id" value="${id}" style="display: none"/>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">角色</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <c:forEach items="${dictList}" var="dict">
+                    <input type="checkbox" name="name" title="${dict.name}"
+                           value="${dict.value}"
+                           <c:forEach items="${appMenuUserTypeList}" var="appMenuUserType">
+                                <c:if test="${ appMenuUserType.dictValue eq dict.value && appMenuUserType.navCode eq appMenu.navCode }">checked</c:if>
+                           </c:forEach>
+                           >
+                    <br>
+                </c:forEach>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button class="layui-btn" lay-submit lay-filter="formBandage">立即提交</button>
+            <button type="button" id="close" class="layui-btn layui-btn-primary">关闭</button>
+        </div>
+    </div>
+</form>
+
+<script>
+    layui.use(['form', 'layer'], function () {
+        var form = layui.form;
+        var layer = layui.layer;
+
+        $('#close').click(function () {
+            parent.layer.closeAll();
+        });
+        //监听提交
+        form.on('submit(formBandage)', function (data) {
+            var index = layer.load(1, {shade: [0.1, '#000']});
+            var name = [];
+            $("input[name='name']:checked").each(function (i) {
+                name[i] = $(this).val();
+            })
+            var noStr = name.join(",");
+            data.field.dictValue = noStr;
+            $.ajax({
+                url: '${ctx}/appMenu/saveOrUpdate',
+                method: 'post',
+                data: JSON.stringify(data.field),
+                dataType: 'JSON',
+                contentType: "application/json",
+                success: function (res) {
+                    layer.close(index);
+                    if (res.code == 200) {
+                        parent.layer.closeAll();
+                        parent.layer.msg(res.data,{
+                            icon: 1
+                        })
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 5
+                        });
+                    }
+                }
+            });
+            return false;
+        });
+    });
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/sys/appMenu/appMenuDetail.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/sys/appMenu/appMenuDetail.jsp
new file mode 100644
index 0000000..36225d3
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/sys/appMenu/appMenuDetail.jsp
@@ -0,0 +1,425 @@
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../../common.jsp"/>
+    <style>
+        .layui-input, .layui-textarea {
+            border-color: #606060;
+        }
+    </style>
+</head>
+<body>
+<form class="layui-form" action="" style="width: 80%; margin-top: 20px">
+    <input name="id" value="${entity.id}" style="display: none"/>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">菜单名称</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="name" value="${entity.name}" placeholder="请输入菜单名称" lay-verify="required"
+                       class="layui-input"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">菜单code</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="code" value="${entity.code}" placeholder="请输入菜单code" lay-verify="required"
+                       lay-reqText="请输入菜单名称" maxlength="20" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">排序</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <c:choose>
+                    <c:when test="${entity.sort == '' or entity.sort == null}">
+                        <input name="sort" value="1" placeholder="排序" class="layui-input"/>
+                    </c:when>
+                    <c:otherwise>
+                        <input name="sort" value="${entity.sort}" placeholder="排序" class="layui-input"/>
+                    </c:otherwise>
+                </c:choose>
+            </div>
+        </div>
+    </div>
+
+    <input name="icon" value="${entity.icon}" style="display: none" lay-verify="required" lay-reqText="请选择图标"/>
+    <div class="layui-form-item">
+        <label class="layui-form-label">图标</label>
+        <div class="layui-input-block">
+            <button id="uploadIcon" type="button" class="layui-btn">选择图标</button>
+        </div>
+    </div>
+
+    <div id="iconDiv" class="layui-form-item" style="display: ${empty entity.icon ? 'none' : 'black'}">
+        <div class="layui-input-block">
+            <img id="iconImg" src="${entity.icon}" alt="" height="50px" width="50px"/>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <div class="layui-inline">
+            <label class="layui-form-label">导航选择</label>
+            <div class="layui-input-inline">
+                <select id="menuNavSelect" name="navCode" lay-verify="required">
+                    <option value="">请选择导航</option>
+                </select>
+            </div>
+        </div>
+
+        <div class="layui-inline">
+            <label class="layui-form-label">分组选择</label>
+            <div class="layui-input-inline">
+                <select id="menuGroupSelect" name="menuGroup" lay-verify="required">
+                    <option value="">请选择分组</option>
+                </select>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">是否显示</label>
+        <div class="layui-input-inline">
+            <select id="visible" name="visible" lay-verify="required">
+                <c:choose>
+                    <c:when test="${not empty entity}">
+                        <option value="1" ${entity.visible == '1' ? 'selected' : ''}>是</option>
+                        <option value="0" ${entity.visible == '0' ? 'selected' : ''}>否</option>
+                    </c:when>
+                    <c:otherwise>
+                        <option value="1">是</option>
+                        <option value="0">否</option>
+                    </c:otherwise>
+                </c:choose>
+            </select>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">菜单类型</label>
+        <div class="layui-input-inline">
+            <select id="menuType" name="menuType" lay-verify="required" lay-filter="menuType">
+                <option value="0" ${entity.menuType == '0' ? 'selected' : ''}>原生菜单</option>
+                <option value="1" ${entity.menuType == '1' ? 'selected' : ''}>H5网页</option>
+                <option value="2" ${entity.menuType == '2' ? 'selected' : ''}>小程序</option>
+                <option value="3" ${entity.menuType == '3' ? 'selected' : ''}>uniapp</option>
+            </select>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">安卓显示</label>
+        <div class="layui-input-inline">
+            <select id="isAndroidEnabled" name="isAndroidEnabled">
+                <option value="1" ${entity.isAndroidEnabled == '1' || empty entity ? 'selected' : ''}>是</option>
+                <option value="0" ${entity.isAndroidEnabled == '0' ? 'selected' : ''}>否</option>
+            </select>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">IOS显示</label>
+        <div class="layui-input-inline">
+            <select id="isIphoneEnabled" name="isIphoneEnabled">
+                <option value="1" ${entity.isIphoneEnabled == '1' || empty entity ? 'selected' : ''}>是</option>
+                <option value="0" ${entity.isIphoneEnabled == '0' ? 'selected' : ''}>否</option>
+            </select>
+        </div>
+    </div>
+
+    <div class="layui-form-item isApplets" style="display: ${entity.menuType == "2" ? 'black' : 'none'}">
+        <label class="layui-form-label">小程序ID</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="userName" id="userName" value="${entity.userName}" placeholder="请输入小程序ID"
+                       lay-reqText="请输入小程序ID" maxlength="50" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item isApplets isUniapp"
+         style="display: ${(entity.menuType == "2" || entity.menuType == "3") ? 'black' : 'none'}">
+        <label class="layui-form-label">小程序/uniapp路径</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="path" id="path" value="${entity.path}" placeholder="请输入小程序/uniapp路径" lay-reqText="请输入小程序/uniapp路径"
+                       maxlength="500" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item isHtml" style="display: ${entity.menuType == "1" ? 'black' : 'none'}">
+        <label class="layui-form-label">菜单url</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="url" value="${entity.url}" placeholder="请输入菜单url(原生菜单不填)" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button class="layui-btn" lay-submit lay-filter="formDemo">立即提交</button>
+            <button type="button" id="close" class="layui-btn layui-btn-primary">关闭</button>
+        </div>
+    </div>
+
+    <div id="uploadLoadingDiv" style="display: none;">
+        <div class="layui-progress" lay-showpercent="true" lay-filter="js_upload_progress"
+             style="margin: 10px;margin-top: 20px;">
+            <div class="layui-progress-bar layui-bg-red" lay-percent="0%"></div>
+        </div>
+    </div>
+</form>
+
+<form id="ajaxForm" class="layui-form" style="width: 70%">
+    <input type="hidden" name="OSSAccessKeyId" id="accessid" value="${uploadParam.accessid}">
+    <input type="hidden" name="policy" id="policy" value="${uploadParam.policy}">
+    <input type="hidden" name="signature" id="signature" value="${uploadParam.signature}">
+    <input type="hidden" name="expire" id="expire" value="${uploadParam.expire}">
+    <input type="hidden" name="success_action_status" id="success_action_status" value="200">
+    <input type="hidden" name="key" id="key" value="${uploadParam.key}">
+    <input type="hidden" name="callBack" id="key2_callBack" value="${uploadParam.callBack}">
+    <input type="file" style="display: none" name="file" id="file"
+           onchange="document.getElementById('fileName').value=this.files[0].name">
+</form>
+
+<script>
+    var layer;
+    var form;
+    var upload;
+    var element;
+
+    //Demo
+    layui.use(['form', 'layer', 'element', 'upload'], function () {
+        form = layui.form;
+        layer = layui.layer;
+        upload = layui.upload;
+        element = layui.element;
+
+        var layerIndex = parent.layer.getFrameIndex(window.name);
+
+        $('#close').click(function () {
+            parent.layer.closeAll();
+        });
+
+        //监听select
+        form.on('select(menuType)', function (data) {
+            switch (data.value) {
+                case "1":
+                    $(".isApplets").hide();
+                    $(".isUniapp").hide();
+                    $(".isHtml").show();
+                    break;
+                case "2":
+                    $(".isHtml").hide();
+                    $(".isUniapp").hide();
+                    $(".isApplets").show();
+                    $("#userName").attr("lay-verify", "required");
+                    $("#userName").val("gh_30406fa9c666");
+                    break;
+                case "3":
+                    $(".isHtml").hide();
+                    $(".isApplets").hide();
+                    $(".isUniapp").show();
+                    break;
+            }
+
+            form.render('select');//select是固定写法 不是选择器
+        });
+
+        //监听提交
+        form.on('submit(formDemo)', function (data) {
+            var index = layer.load(1, {shade: [0.1, '#000']});
+            $.ajax({
+                url: '${ctx}/appMenu/save',
+                type: 'post',
+                data: JSON.stringify(data.field),
+                dataType: 'json',
+                contentType: "application/json",
+                success: function (res) {
+                    layer.close(index);
+                    if (res.code == 200) {
+                        parent.layer.msg(res.message);
+                        parent.layer.closeAll();
+                        parent.table.reload('idTest', {//testReload是组件名称,表格名
+                            page: {//page参数是指重新刷新后从第几页开始
+                                curr: 1 //重新从第 1 页开始
+                            }
+                        });
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 5
+                        });
+                    }
+                },
+                error: function (res) {
+                    layer.msg("操作失败", {
+                        icon: 5
+                    });
+                }
+            })
+            return false;
+        });
+
+        //创建监听函数
+        var xhrOnProgress = function (fun) {
+            xhrOnProgress.onprogress = fun; //绑定监听
+            //使用闭包实现监听绑
+            return function () {
+                //通过$.ajaxSettings.xhr();获得XMLHttpRequest对象
+                var xhr = $.ajaxSettings.xhr();
+                //判断监听函数是否为函数
+                if (typeof xhrOnProgress.onprogress !== 'function')
+                    return xhr;
+                //如果有监听函数并且xhr对象支持绑定时就把监听函数绑定上去
+                if (xhrOnProgress.onprogress && xhr.upload) {
+                    xhr.upload.onprogress = xhrOnProgress.onprogress;
+                }
+                return xhr;
+            }
+        }
+
+        var data = {};
+        upload.render({
+            elem: '#uploadIcon', // 文件选择
+            // accept:'apk',
+            url: '${uploadParam.host}',
+            exts: 'png|jpg|jpeg|bmp',
+            method: 'POST',
+            auto: true,
+            before: function () {
+                this.data.OSSAccessKeyId = $('#accessid').val();
+                this.data.policy = $('#policy').val();
+                this.data.signature = $('#signature').val();
+                this.data.expire = $('#expire').val();
+                this.data.success_action_status = $('#success_action_status').val();
+                this.data.callBack = $("#key2_callBack").val();
+                this.data.key = $("#key").val();
+
+                element.progress('js_upload_progress', '0%');//设置页面进度条
+                openIndex = layer.open({
+                    type: 1,
+                    title: '上传进度',
+                    closeBtn: 1, //不显示关闭按钮
+                    area: ['300px', '130px'],
+                    shadeClose: false, //开启遮罩关闭
+                    content: $("#uploadLoadingDiv").html(),
+                    offset: '100px'
+                });
+            }
+            , xhr: xhrOnProgress
+            , progress: function (value) {//上传进度回调 value进度值
+                element.progress('js_upload_progress', value + '%');//设置页面进度条
+            }
+            , choose: function (obj) {
+                var loading = layer.load(1, {shade: [0.1, '#000']});
+                obj.preview(function (index, file, result) {
+                    var fileName = file.name;
+                    var suffix = fileName.substring(fileName.lastIndexOf('.') + 1, fileName.length);
+                    var key = '${uploadParam.key}' + "." + suffix;
+                    $("#key").val(key);
+                    $("#fileKey").val(key);
+                    layer.close(loading);
+                });
+            },
+            done: function (res) {
+                layer.close(openIndex);
+                if (res.code == 200) {
+                    layer.msg("上传成功！")
+                    $("#iconDiv").show();
+                    $("#iconImg").attr("src", res.url);
+                    $("input[name='icon']").val(res.url);
+                    // parent.layer.style(layerIndex, {
+                    //     width: '550px',
+                    //     height: '510px'
+                    // });
+                } else {
+                    layer.msg("上传失败！")
+                }
+            },
+            error: function (res) {
+                layer.close(openIndex);
+                layer.msg(res.msg);
+            }
+        });
+
+        getMenuNavInfo();
+        getMenuGroupInfo();
+    });
+
+    function getMenuNavInfo() {
+        $.ajax({
+            url: ctx + "/dict/getGroup/APP_MENU_NAV"
+            , dataType: "json"
+            , success: function (data) {
+                if (data.code === 200) {
+                    data.data.forEach(function (item) {
+                        <%--//var checkValue = '${entity.menuGroup}';--%>
+                        var checkValue = '${entity.navCode}';
+                        var content = '';
+                        if (checkValue === item.id) {
+                            content = '<option value="' + item.id + '" selected>' + item.name + '</option>';
+                        } else {
+                            content = '<option value="' + item.id + '">' + item.name + '</option>';
+                        }
+                        $("#menuNavSelect").append(content);
+                        // 需要使用layui进行表单刷新
+                        form.render();
+                    });
+                } else {
+                    layer.msg(data.message);
+                }
+            }
+            , error: function (info) {
+                console.log(info);
+                layer.msg("数据异常");
+            }
+        })
+    }
+
+    function getMenuGroupInfo() {
+        $.ajax({
+            url: ctx + "/dict/getGroup/APP_MENU_GROUP"
+            , dataType: "json"
+            , success: function (data) {
+                if (data.code === 200) {
+                    data.data.forEach(function (item) {
+                        var checkValue = '${entity.menuGroup}';
+                        var content = '';
+                        if (checkValue === item.id) {
+                            content = '<option value="' + item.id + '" selected>' + item.name + '</option>';
+                        } else {
+                            content = '<option value="' + item.id + '">' + item.name + '</option>';
+                        }
+                        $("#menuGroupSelect").append(content);
+                        // 需要使用layui进行表单刷新
+                        form.render();
+                    });
+                } else {
+                    layer.msg(data.message);
+                }
+            }
+            , error: function (info) {
+                console.log(info);
+                layer.msg("数据异常");
+            }
+        })
+    }
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/sys/appMenu/appMenuList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/sys/appMenu/appMenuList.jsp
new file mode 100644
index 0000000..c3bc269
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/sys/appMenu/appMenuList.jsp
@@ -0,0 +1,431 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<!DOCTYPE html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../../common.jsp"/>
+
+    <style>
+        .layui-table-cell {
+            text-align: center;
+            height: auto;
+            white-space: normal;
+        }
+
+        .layui-table img {
+            max-width: 300px
+        }
+    </style>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pb5 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" action="" style="margin-top: 10px">
+                    <div class="layui-form-item">
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">分组</label>
+                            <div class="layui-input-inline">
+                                <select name="menuGroup" class="form-control f12 w180 textc">
+                                    <option value="">请选择</option>
+                                    <c:forEach items="${menuGroup}" var="item">
+                                        <option value="${item.id}">${item.name}</option>
+                                    </c:forEach>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">导航</label>
+                            <div class="layui-input-inline">
+                                <select name="navCode" class="form-control f12 w180 textc">
+                                    <option value="">请选择</option>
+                                    <c:forEach items="${navCode}" var="item">
+                                        <option value="${item.id}">${item.name}</option>
+                                    </c:forEach>
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+
+        <table class="layui-hide" id="demo" lay-filter="test"></table>
+    </div>
+</div>
+
+<script id="barDemo" type="text/html">
+    <button class="layui-btn layui-btn-xs"
+            lay-mDropdown="{template: '#toolbarMenu'}">
+        <span>操作</span>
+        <i class="layui-icon layui-icon-triangle-d"></i>
+    </button>
+</script>
+
+<script type="text/html" id="toolbarMenu">
+    <a href="javascript:void(0);" lay-event="edit"
+       class="layui-btn layui-btn-xs layui-btn-radius fa fa-edit ops_more f12">编&emsp;&emsp;辑</a>
+    <br/><a href="javascript:void(0);" lay-event="bandage"
+            class="layui-btn layui-btn-xs layui-btn-radius layui-btn-danger fa ops_more f12">&ensp;角色绑定&ensp;</a>
+    <br/><a href="javascript:void(0);" lay-event="del"
+            class="layui-btn layui-btn-xs layui-btn-radius fa fa-detail ops_more f12">删&emsp;&emsp;&emsp;除</a>
+</script>
+
+<script type="text/html" id="imgTemp">
+    <img src="{{d.icon}}" width="50px" height="50px" alt=""/>
+</script>
+
+<script type="text/html" id="toolBar">
+    <a class="layui-btn layui-btn-sm fa fa-search" href="javascript:void(0);"
+       lay-event="search"><span>搜索</span></a>
+    <a class="layui-btn layui-btn-sm fa fa-plus" href="javascript:void(0);"
+       lay-event="add"><span>添加</span></a>
+    <a class="layui-btn layui-btn-sm layui-btn-danger fa fa-remove"
+       href="javascript:void(0);" lay-event="delete"><span>删除</span></a>
+</script>
+
+<script>
+
+    var laypage, layer, table;
+
+    var menuGroup = JSON.parse('${menuGroupString}');
+    var navCode = JSON.parse('${navCodeString}');
+
+    layui.config({
+        version: '1598935358933' //为了更新 js 缓存，可忽略
+    });
+
+    layui.use(['laypage', 'layer', 'mDropdown', 'table', 'upload', 'element'], function () {
+        laypage = layui.laypage;
+        layer = layui.layer; //弹层
+        table = layui.table; //表格
+        dropdown = layui.mDropdown;
+
+        //执行一个 table 实例
+        table.render({
+            elem: '#demo'
+            , id: 'idTest'
+            , url: ctx + '/appMenu/page' //数据接口
+            , autoSort: false
+            , where: {
+                column: 'sort'
+                , asc: true
+            }
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , title: 'app首页菜单表'
+            , page: true //开启分页
+            , toolbar: '#toolBar' //开启工具栏，此处显示默认图标，可以自定义模板，详见文档
+            , defaultToolbar: ['filter']
+            , cols: [[ //表头
+                {type: 'checkbox'}
+                , {field: '', title: '序号', type: 'numbers'}
+                , {field: 'sort', title: '排序', width: 73, sort: true, style: "height: 61px"}
+                , {field: 'icon', title: '图标', width: 80, align: "center", style: "height: 61px", templet: '#imgTemp'}
+                , {field: 'name', title: '名称', width: 150}
+                , {field: 'code', title: '菜单code', minWidth: 100, hide: true}
+                , {
+                    field: 'menuGroup', title: '分组', minWidth: 100, sort: true, templet: function (r) {
+                        return getDictText(r.menuGroup, menuGroup, 'id');
+                    }
+                }
+                , {
+                    field: 'navCode', title: '导航', minWidth: 100, templet: function (r) {
+                        return getDictText(r.navCode, navCode, 'id');
+                    }
+                }
+                , {field: 'url', title: '链接', minWidth: 150}
+                , {
+                    field: 'visible', title: '是否显示', minWidth: 89, templet: function (r) {
+                        if (r.visible == 1) {
+                            return "是";
+                        } else {
+                            return "否";
+                        }
+                    }
+                }
+                , {
+                    field: 'isApplets', title: '是否小程序', width: 100, templet: function (r) {
+                        if (r.isApplets == 1) {
+                            return "是";
+                        } else {
+                            return "否";
+                        }
+                    }
+                }
+                , {
+                    field: 'isUniapp', title: '是否uniapp', width: 100, templet: function (r) {
+                        if (r.isUniapp == 1) {
+                            return "是";
+                        } else {
+                            return "否";
+                        }
+                    }
+                }
+                , {
+                    field: 'android/ios', title: '显示(安卓/iso)', width: 100, templet: function (r) {
+                        let and = "是";
+                        let ios = "是";
+                        if (r.isAndroidEnabled == '0') {
+                            and = "否";
+                        }
+                        if (r.isIphoneEnabled == '0') {
+                            ios = "否";
+                        }
+                        return and + "/" + ios;
+                    }
+                }
+                , {field: 'userName', title: '小程序ID', width: 100}
+                , {field: 'path', title: '跳转路径/uniApp路径', width: 165}
+                , {
+                    field: 'createTime',
+                    title: '创建时间',
+                    width: 160,
+                    sort: true,
+                    hide: false,
+                    templet: "<div>{{layui.util.toDateString(d.createTime, 'yyyy-MM-dd HH:mm:ss')}}</div>"
+                }
+                , {
+                    field: 'updateTime',
+                    title: '更新时间',
+                    width: 165,
+                    sort: true,
+                    hide: false,
+                    templet: "<div>{{layui.util.toDateString(d.updateTime, 'yyyy-MM-dd HH:mm:ss')}}</div>"
+                }
+                , {
+                    fixed: 'right',
+                    title: '操作',
+                    minWidth: 100,
+                    style: "height: 61px",
+                    align: 'center',
+                    toolbar: '#barDemo'
+                }
+            ]]
+            , done: function (res) {
+                dropdown.suite();
+
+                //动态监听表头高度变化，冻结行跟着改变高度
+                $(".layui-table-header  tr").resize(function () {
+                    $(".layui-table-header  tr").each(function (index, val) {
+                        $($(".layui-table-fixed .layui-table-header table tr")[index]).height(val.getBoundingClientRect().height);
+                    });
+                });
+                //初始化高度，使得冻结行表头高度一致
+                $(".layui-table-header  tr").each(function (index, val) {
+                    let initElement = $(".layui-table-fixed .layui-table-header table tr")[index]
+                    if (initElement != null) {
+                        $(initElement).height(val.getBoundingClientRect().height);
+                        $(initElement).find("th").removeAttr("style");
+                    }
+                });
+
+                //表体部分
+                //动态监听表体高度变化，冻结行跟着改变高度
+                $(".layui-table-body  tr").resize(function () {
+                    $(".layui-table-body  tr").each(function (index, val) {
+                        $($(".layui-table-fixed .layui-table-body table tr")[index]).height(val.getBoundingClientRect().height);
+                    });
+                });
+                //初始化高度，使得冻结行表体高度一致
+                $(".layui-table-body  tr").each(function (index, val) {
+                    $($(".layui-table-fixed .layui-table-body table tr")[index]).height(val.getBoundingClientRect().height);
+                });
+            }
+        });
+
+        //监听头工具栏事件
+        table.on('toolbar(test)', function (obj) {
+            var checkStatus = table.checkStatus(obj.config.id)
+                , data = checkStatus.data; //获取选中的数据
+            switch (obj.event) {
+                case 'search':
+                    search();
+                    break;
+                case 'add':
+                    toAdd()
+                    break;
+                case 'update':
+                    if (data.length === 0) {
+                        layer.msg('请选择一行');
+                    } else if (data.length > 1) {
+                        layer.msg('只能同时编辑一个');
+                    } else {
+                        toEdit(checkStatus.data[0].id);
+                    }
+                    break;
+                case 'delete':
+                    if (data.length === 0) {
+                        layer.msg('请选择一行');
+                    } else {
+                        del(data)
+                    }
+                    break;
+            }
+        });
+
+        //监听行工具事件
+        table.on('tool(test)', function (obj) { //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            var data = obj.data //获得当前行数据
+                , layEvent = obj.event; //获得 lay-event 对应的值
+            if (layEvent === 'detail') {
+                layer.msg('查看操作');
+            } else if (layEvent === 'del') {
+                del(data)
+            } else if (layEvent === 'edit') {
+                //layer.msg('编辑操作');
+                toEdit(data.id);
+            } else if (layEvent === 'bandage') {
+                bandage(data.id);
+            }
+        });
+
+        //监听排序事件
+        table.on('sort(test)', function (obj) { //注：sort 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            console.log(obj.field); //当前排序的字段名
+            console.log(obj.type); //当前排序类型：desc（降序）、asc（升序）、null（空对象，默认排序）
+            console.log(this); //当前排序的 th 对象
+
+            //尽管我们的 table 自带排序功能，但并没有请求服务端。
+            //有些时候，你可能需要根据当前排序的字段，重新向服务端发送请求，从而实现服务端排序，如：
+            table.reload('idTest', {
+                initSort: obj //记录初始排序，如果不设的话，将无法标记表头的排序状态。
+                , where: { //请求参数（注意：这里面的参数可任意定义，并非下面固定的格式）
+                    column: obj.field //排序字段
+                    , asc: obj.type === 'asc' //排序方式
+                }
+            });
+
+            layer.msg('服务端排序。order by ' + obj.field + ' ' + obj.type);
+        });
+    });
+
+    function toEdit(id) {
+        var url = ctx + '/appMenu/detail/' + id;
+        var index = layer.open({
+            type: 2
+            , title: "菜单详情"
+            , shade: 0.5
+            , maxmin: true
+            , content: url
+            , area: ['600px', '750px']
+        });
+    }
+
+    function toAdd() {
+        var url = ctx + '/appMenu/detail';
+        var index = layer.open({
+            type: 2
+            , title: "菜单详情"
+            , shade: 0.5
+            , maxmin: true
+            , content: url
+            , area: ['600px', '750px']
+            , end: function () {
+                time: 1000
+            }
+        });
+    }
+
+    function bandage(id) {
+        var url = ctx + '/appMenu/bandage/' + id;
+        var index = layer.open({
+            type: 2
+            , title: "用户角色"
+            , shade: 0.5
+            , maxmin: true
+            , content: url
+            , area: ['400px', '300px']
+        });
+    }
+
+    function del(obj) {
+        var url = ctx + '/appMenu/del/' + obj.id;
+        layer.confirm('真的删除“' + obj.name + '”么', {
+            yes: function () {
+                $.ajax({
+                    url: url,
+                    type: 'DELETE',
+                    dataType: 'json',
+                    success: function (res) {
+                        if (res.code == 200) {
+                            layer.msg(res.message);
+                            table.reload('idTest');
+                        } else {
+                            layer.msg(res.message, {
+                                icon: 5
+                            });
+                        }
+                    },
+                    error: function () {
+                        layer.msg("操作失败", {
+                            icon: 5
+                        });
+                    }
+                })
+            }
+        });
+    }
+
+    function search() {
+        var menuGroup = $("select[name='menuGroup'] option:selected").val();
+        var navCode = $("select[name='navCode'] option:selected").val();
+
+        table.reload('idTest', {
+            where: { //请求参数（注意：这里面的参数可任意定义，并非下面固定的格式）
+                menuGroup: menuGroup
+                , navCode: navCode
+            }
+            , page: {
+                size: 10
+                , current: 1
+            }
+        });
+    }
+</script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/sys/mcc/mccReflectEdit.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/sys/mcc/mccReflectEdit.jsp
new file mode 100644
index 0000000..f267292
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/sys/mcc/mccReflectEdit.jsp
@@ -0,0 +1,91 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../../common.jsp" />
+</head>
+<body style="padding: 1rem 0">
+<form class="layui-form" action="" style="width: 90%">
+    <input name="id" value="${entity.id}" hidden/>
+    <div class="layui-form-item">
+        <label class="layui-form-label">随行付MCC</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="standardMccCode" value="${entity.standardMccCode}"  lay-verify="required" autocomplete="off"  placeholder="请输入随行付MCC" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">通道MCC</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="mccCode" value="${entity.mccCode}" lay-verify="required"  autocomplete="off" placeholder="请输入通道MCC" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">通道</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <select name="channelId" class="layui-select" lay-verify="required">
+                    <option value="">请选择</option>
+                    <c:forEach var="channel" items="${channelList }">
+                        <option value="${channel.id}" ${entity.channelId eq channel.id ? 'selected' : '' } >${channel.channelName}</option>
+                    </c:forEach>
+                </select>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button class="layui-btn" lay-submit lay-filter="formDemo">立即提交</button>
+            <button type="button" id="close" class="layui-btn layui-btn-primary">关闭</button>
+        </div>
+    </div>
+</form>
+
+<script>
+    //Demo
+    layui.use(['form','layer'], function(){
+        var form = layui.form;
+        var layer = layui.layer;
+        //监听提交
+        form.on('submit(formDemo)', function(data){
+            var index = layer.load(1,{shade: [0.1,'#000'] });
+            $.ajax({
+                url: '${ctx}/mccInfo/mccReflect/save',
+                method: 'post',
+                data: JSON.stringify(data.field),
+                dataType: 'JSON',
+                contentType:"application/json",
+                success: function(res) {
+                    layer.close(index);
+                    layer.msg(res.message, { icon: res.code == 200 ? 1 : 2, time: 1000 }, function () {
+                        if(res.code == 200){
+                            let index = parent.layer.getFrameIndex(window.name);
+                            parent.search();
+                            parent.layer.close(index);
+                        }
+                    });
+                }
+            })
+            return false;
+        });
+        $('#close').click(function() {
+            parent.layer.closeAll();
+        });
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/sys/mcc/mccReflectEditV2.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/sys/mcc/mccReflectEditV2.jsp
new file mode 100644
index 0000000..e136793
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/sys/mcc/mccReflectEditV2.jsp
@@ -0,0 +1,81 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../../common.jsp" />
+</head>
+<body style="padding: 1rem 0">
+<form class="layui-form" action="" style="width: 90%">
+    <input name="id" value="${entity.id}" hidden />
+    <input name="mccCode" value="${entity.mccCode}" type="hidden" />
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">随行付MCC</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="standardMccCode" value="${entity.standardMccCode}"  lay-verify="required" autocomplete="off"  placeholder="请输入随行付MCC" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">通道MCC</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="mccCode" value="${entity.mccCode}" lay-verify="required"  autocomplete="off" placeholder="请输入通道MCC" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+
+
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button class="layui-btn" lay-submit lay-filter="formDemo">立即提交</button>
+            <button type="button" id="close" class="layui-btn layui-btn-primary">关闭</button>
+        </div>
+    </div>
+</form>
+
+<script>
+    //Demo
+    layui.use(['form','layer'], function(){
+        var form = layui.form;
+        var layer = layui.layer;
+        //监听提交
+        form.on('submit(formDemo)', function(data){
+            var index = layer.load(1,{shade: [0.1,'#000'] });
+            $.ajax({
+                url: ctx + '/mccInfo/mccReflect/save',
+                method: 'post',
+                data: JSON.stringify(data.field),
+                dataType: 'JSON',
+                contentType:"application/json",
+                success: function(res) {
+                    layer.close(index);
+                    layer.msg(res.message, { icon: res.code == 200 ? 1 : 2, time: 1000 }, function () {
+                        if(res.code == 200){
+                            let index = parent.layer.getFrameIndex(window.name);
+                            parent.search();
+                            parent.layer.close(index);
+                        }
+                    });
+                }
+            })
+            return false;
+        });
+        $('#close').click(function() {
+            parent.layer.closeAll();
+        });
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/sys/mcc/mccReflectList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/sys/mcc/mccReflectList.jsp
new file mode 100644
index 0000000..018d6b9
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/sys/mcc/mccReflectList.jsp
@@ -0,0 +1,224 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<!DOCTYPE html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../../common.jsp"/>
+
+    <style>
+    </style>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pb5 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" action="" style="margin-top: 10px" lay-filter="condition">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">mcc编码</label>
+                            <div class="layui-input-inline">
+                                <input type="text" class="layui-input" name="mccCode">
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+
+        <table class="layui-hide" id="demo" lay-filter="test"></table>
+    </div>
+</div>
+
+<script id="barDemo" type="text/html">
+    <a href="javascript:void(0);" lay-event="edit"
+       class="layui-btn layui-btn-xs">
+        <i class="layui-icon layui-icon-edit"></i>编辑</a>
+    <a href="javascript:void(0);" lay-event="del"
+       class="layui-btn layui-btn-xs layui-btn-danger">
+        <i class="layui-icon layui-icon-delete"></i>删除</a>
+</script>
+
+<script type="text/html" id="imgTemp">
+    <img src="{{d.icon}}" width="50px" height="50px" alt=""/>
+</script>
+
+<script type="text/html" id="toolBar">
+    <a class="layui-btn layui-btn-sm" href="javascript:void(0);"
+       lay-event="search"><i class="layui-icon layui-icon-search"></i><span>搜索</span></a>
+
+</script>
+
+<script type="text/html" id="operation2">
+    <a class="layui-btn layui-btn-xs" href="javascript:void(0);"
+       lay-event="editRyx">
+        <i class="layui-icon layui-icon-edit"></i>
+        <span>编辑</span>
+    </a>
+</script>
+
+<script type="text/html" id="operation3">
+    <a class="layui-btn layui-btn-xs" href="javascript:void(0);"
+       lay-event="editYs">
+        <i class="layui-icon layui-icon-edit"></i>
+        <span>编辑</span>
+    </a>
+</script>
+
+<script>
+
+    var laypage, layer, table, form;
+    let cData = {};
+    layui.config({
+        version: '1598935358933' //为了更新 js 缓存，可忽略
+    });
+
+    layui.use(['laypage', 'layer', 'table', 'upload', 'element'], function () {
+        laypage = layui.laypage;
+        layer = layui.layer; //弹层
+        table = layui.table; //表格
+        form = layui.form;
+
+        //执行一个 table 实例
+        table.render({
+            elem: '#demo'
+            , id: 'idTest'
+            , url: ctx + '/mccInfo/mccReflect/page' //数据接口
+            , autoSort: false
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , title: 'app首页菜单表'
+            , page: true //开启分页
+            , toolbar: '#toolBar' //开启工具栏，此处显示默认图标，可以自定义模板，详见文档
+            , defaultToolbar: ['filter']
+            , cols: [[ //表头
+                {type: 'checkbox'}
+                , { field: 'standardMccCode', title: 'mcc编码(随行付)', minWidth: 40}
+                , { field: 'sxfMccDesc', title: '随行付mcc编码描述', minWidth: 200 }
+                , { field: 'ryxMcc', title: '瑞银信mcc', minWidth: 40}
+                , { field: 'ryxMccDesc', title: '瑞银信mcc编码描述', minWidth: 40}
+                , { field: '', title: '操作', minWidth: 80, templet: '#operation2' }
+                , { field: 'ysMcc', title: '银盛mcc', minWidth: 200 }
+                , { field: 'ysMccDesc', title: '随行付mcc编码描述', minWidth: 200 }
+                , { field: '', title: '操作', minWidth: 80, templet: '#operation3' }
+            ]]
+        });
+
+        //监听头工具栏事件
+        table.on('toolbar(test)', function (obj) {
+            var checkStatus = table.checkStatus(obj.config.id)
+                , data = checkStatus.data; //获取选中的数据
+            switch (obj.event) {
+                case 'search':
+                    search();
+                    break;
+            }
+        });
+
+        //监听行工具事件
+        table.on('tool(test)', function (obj) { //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            var data = obj.data //获得当前行数据
+                , layEvent = obj.event; //获得 lay-event 对应的值
+            if (layEvent === 'edit') {
+                toAdd(obj);
+            } else if (layEvent === 'del') {
+                layer.confirm('真的删除么?', {icon: 3}, function (index) {
+                    del(obj)
+                    layer.close(index);
+                });
+            } else if (layEvent === "editRyx") {
+                toAdd(data.standardMccCode, 3);
+            } else if (layEvent === "editYs") {
+                toAdd(data.standardMccCode, 4);
+            }
+        });
+
+        function del(obj) {
+            $.ajax({
+                url: ctx + '/mccInfo/mccReflect/del/' + obj.data.id,
+                method: 'DELETE',
+                dataType: 'JSON',
+                contentType: "application/json",
+                success: function (res) {
+                    let icon = 2;
+                    if(res.code == 200){
+                        icon = 1;
+                        obj.del();
+                    }
+                    layer.msg(res.message, {
+                        icon:icon
+                    });
+                }
+            })
+        }
+
+        function toAdd(standardMccCode, channelId) {
+            var url = ctx + '/mccInfo/sxfMccEdit';
+            if (standardMccCode != null) {
+                url = url + "?sxfMcc=" + standardMccCode;
+                url = url + "&channelId=" + channelId;
+            }
+
+            layer.open({
+                type: 2
+                , shade: 0.5
+                , title: "编辑"
+                , maxmin: true
+                , content: url
+                , area: ['500px', '400px']
+                , end: function () {
+                }
+            });
+        }
+    });
+
+    function search() {
+        var condition = form.val('condition');
+        table.reload('idTest', {
+            where: condition
+        }, true);
+    }
+</script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/sys/mcc/sxfMccList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/sys/mcc/sxfMccList.jsp
new file mode 100644
index 0000000..e1d8ac5
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/sys/mcc/sxfMccList.jsp
@@ -0,0 +1,288 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<!DOCTYPE html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../../common.jsp"/>
+
+    <style>
+    </style>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pb5 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" action="" style="margin-top: 10px" lay-filter="condition">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">mcc编码</label>
+                            <div class="layui-input-inline">
+                                <input type="text" class="layui-input" name="fMccCode">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">一级类目</label>
+                            <div class="layui-input-inline">
+                                <input type="text" class="layui-input" name="fGrandpaTxt">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">二级类目</label>
+                            <div class="layui-input-inline">
+                                <input type="text" class="layui-input" name="fFatherTxt">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">mcc描述</label>
+                            <div class="layui-input-inline">
+                                <input type="text" class="layui-input" name="fMccTxt">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">mcc类型</label>
+                            <div class="layui-input-inline">
+                                <input type="text" class="layui-input" name="fMccType">
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+
+        <table class="layui-hide" id="demo" lay-filter="test"></table>
+    </div>
+</div>
+
+<script id="barDemo" type="text/html">
+    <button class="layui-btn layui-btn-xs"
+            lay-mDropdown="{template: '#toolbarMenu'}">
+        <span>操作</span>
+        <i class="layui-icon layui-icon-triangle-d"></i>
+    </button>
+</script>
+
+<script type="text/html" id="toolbarMenu">
+    <a href="javascript:void(0);" lay-event="edit"
+       class="layui-btn layui-btn-xs layui-btn-radius fa fa-edit ops_more f12">编&emsp;&emsp;辑</a>
+    <br/><a href="javascript:void(0);" lay-event="bandage"
+            class="layui-btn layui-btn-xs layui-btn-radius layui-btn-danger fa ops_more f12">&ensp;角色绑定&ensp;</a>
+    <br/><a href="javascript:void(0);" lay-event="del"
+            class="layui-btn layui-btn-xs layui-btn-radius fa fa-detail ops_more f12">删&emsp;&emsp;&emsp;除</a>
+</script>
+
+<script type="text/html" id="imgTemp">
+    <img src="{{d.icon}}" width="50px" height="50px" alt=""/>
+</script>
+
+<script type="text/html" id="toolBar">
+    <a class="layui-btn layui-btn-sm" href="javascript:void(0);"
+       lay-event="search"><i class="layui-icon layui-icon-search"></i><span>搜索</span></a>
+</script>
+
+<script>
+
+    var laypage, layer, table, form;
+
+    layui.config({
+        version: '1598935358933' //为了更新 js 缓存，可忽略
+    });
+
+    layui.use(['laypage', 'layer', 'table', 'upload', 'element'], function () {
+        laypage = layui.laypage;
+        layer = layui.layer; //弹层
+        table = layui.table; //表格
+        form = layui.form;
+
+        //执行一个 table 实例
+        table.render({
+            elem: '#demo'
+            , id: 'idTest'
+            , url: ctx + '/mccInfo/sxf/page' //数据接口
+            , autoSort: false
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , title: 'app首页菜单表'
+            , page: true //开启分页
+            , toolbar: '#toolBar' //开启工具栏，此处显示默认图标，可以自定义模板，详见文档
+            , defaultToolbar: ['filter']
+            , cols: [[ //表头
+                {type: 'checkbox'}
+                , { field: 'fId', title: 'id'}
+                , { field: 'fMccCode', title: 'mcc编码', minWidth: 80, sort: true }
+                , { field: 'fGrandpaTxt', title: '一级类目', minWidth: 80}
+                , { field: 'fFatherTxt', title: '二级类目', minWidth: 80}
+                , { field: 'fMccTxt', title: 'mcc描述', minWidth: 200}
+                , { field: 'fMccType', title: 'mcc类型', minWidth: 80}
+                // , {fixed: 'right', title: '操作', minWidth: 100, style: "height: 61px", align: 'center', toolbar: '#barDemo'}
+            ]]
+        });
+
+        //监听头工具栏事件
+        table.on('toolbar(test)', function (obj) {
+            var checkStatus = table.checkStatus(obj.config.id)
+                , data = checkStatus.data; //获取选中的数据
+            switch (obj.event) {
+                case 'search':
+                    search();
+                    break;
+            }
+        });
+
+        //监听行工具事件
+        table.on('tool(test)', function (obj) { //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            var data = obj.data //获得当前行数据
+                , layEvent = obj.event; //获得 lay-event 对应的值
+            if (layEvent === 'detail') {
+                layer.msg('查看操作');
+            } else if (layEvent === 'del') {
+                del(data)
+            } else if (layEvent === 'edit') {
+                //layer.msg('编辑操作');
+                toEdit(data.id);
+            } else if (layEvent === 'bandage') {
+                bandage(data.id);
+            }
+        });
+
+        //监听排序事件
+        table.on('sort(test)', function (obj) { //注：sort 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            console.log(obj.field); //当前排序的字段名
+            console.log(obj.type); //当前排序类型：desc（降序）、asc（升序）、null（空对象，默认排序）
+            console.log(this); //当前排序的 th 对象
+
+            //尽管我们的 table 自带排序功能，但并没有请求服务端。
+            //有些时候，你可能需要根据当前排序的字段，重新向服务端发送请求，从而实现服务端排序，如：
+            table.reload('idTest', {
+                initSort: obj //记录初始排序，如果不设的话，将无法标记表头的排序状态。
+                , where: { //请求参数（注意：这里面的参数可任意定义，并非下面固定的格式）
+                    column: obj.field //排序字段
+                    , asc: obj.type === 'asc' //排序方式
+                }
+            }, true);
+
+            layer.msg('服务端排序。order by ' + obj.field + ' ' + obj.type);
+        });
+    });
+
+    function toEdit(id) {
+        var url = '${ctx}/appMenu/detail/' + id;
+        var index = layer.open({
+            type: 2
+            , title: "菜单详情"
+            , shade: 0.5
+            , maxmin: true
+            , content: url
+            , area: ['550px', '750px']
+        });
+    }
+
+    function toAdd() {
+        var url = '${ctx}/appMenu/detail';
+        var index = layer.open({
+            type: 2
+            , title: "菜单详情"
+            , shade: 0.5
+            , maxmin: true
+            , content: url
+            , area: ['550px', '750px']
+            , end: function () {
+                time: 1000
+            }
+        });
+    }
+
+    function bandage(id) {
+        var url = '${ctx}/appMenu/bandage/' + id;
+        var index = layer.open({
+            type: 2
+            , title: "用户角色"
+            , shade: 0.5
+            , maxmin: true
+            , content: url
+            , area: ['400px', '300px']
+        });
+    }
+
+    function del(obj) {
+        var url = '${ctx}/appMenu/del/' + obj.id;
+        layer.confirm('真的删除“' + obj.name + '”么', {
+            yes: function () {
+                $.ajax({
+                    url: url,
+                    type: 'DELETE',
+                    dataType: 'json',
+                    success: function (res) {
+                        if (res.code == 200) {
+                            layer.msg(res.message);
+                            table.reload('idTest');
+                        } else {
+                            layer.msg(res.message, {
+                                icon: 5
+                            });
+                        }
+                    },
+                    error: function () {
+                        layer.msg("操作失败", {
+                            icon: 5
+                        });
+                    }
+                })
+            }
+        });
+    }
+
+    function search() {
+        var condition = form.val('condition');
+        table.reload('idTest', {
+            where: condition
+        }, true);
+    }
+</script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/sys/mcc/ysMccList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/sys/mcc/ysMccList.jsp
new file mode 100644
index 0000000..86055dd
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/sys/mcc/ysMccList.jsp
@@ -0,0 +1,208 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<!DOCTYPE html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../../common.jsp"/>
+
+    <style>
+    </style>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pb5 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" action="" style="margin-top: 10px" lay-filter="condition">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">mcc编码</label>
+                            <div class="layui-input-inline">
+                                <input type="text" class="layui-input" name="mccCode">
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+
+        <table class="layui-hide" id="demo" lay-filter="test"></table>
+    </div>
+</div>
+
+<script id="barDemo" type="text/html">
+    <button class="layui-btn layui-btn-xs"
+            lay-mDropdown="{template: '#toolbarMenu'}">
+        <span>操作</span>
+        <i class="layui-icon layui-icon-triangle-d"></i>
+    </button>
+</script>
+
+<script type="text/html" id="toolbarMenu">
+    <a href="javascript:void(0);" lay-event="edit"
+       class="layui-btn layui-btn-xs layui-btn-radius fa fa-edit ops_more f12">编&emsp;&emsp;辑</a>
+    <br/><a href="javascript:void(0);" lay-event="bandage"
+            class="layui-btn layui-btn-xs layui-btn-radius layui-btn-danger fa ops_more f12">&ensp;角色绑定&ensp;</a>
+    <br/><a href="javascript:void(0);" lay-event="del"
+            class="layui-btn layui-btn-xs layui-btn-radius fa fa-detail ops_more f12">删&emsp;&emsp;&emsp;除</a>
+</script>
+
+<script type="text/html" id="imgTemp">
+    <img src="{{d.icon}}" width="50px" height="50px" alt=""/>
+</script>
+
+<script type="text/html" id="toolBar">
+    <a class="layui-btn layui-btn-sm" href="javascript:void(0);"
+       lay-event="search"><i class="layui-icon layui-icon-search"></i><span>搜索</span></a>
+</script>
+
+<script>
+
+    var laypage, layer, table, form;
+
+    layui.config({
+        version: '1598935358933' //为了更新 js 缓存，可忽略
+    });
+
+    layui.use(['laypage', 'layer', 'table', 'upload', 'element'], function () {
+        laypage = layui.laypage;
+        layer = layui.layer; //弹层
+        table = layui.table; //表格
+        form = layui.form;
+
+        //执行一个 table 实例
+        table.render({
+            elem: '#demo'
+            , id: 'idTest'
+            , url: ctx + '/mccInfo/ys/page' //数据接口
+            , autoSort: false
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , title: 'app首页菜单表'
+            , page: true //开启分页
+            , toolbar: '#toolBar' //开启工具栏，此处显示默认图标，可以自定义模板，详见文档
+            , defaultToolbar: ['filter']
+            , cols: [[ //表头
+                {type: 'checkbox'}
+                , { field: 'id', title: 'id', minWidth: 20}
+                , { field: 'mccCode', title: 'mcc编码', minWidth: 40}
+                , { field: 'mccDesc', title: 'mcc描述', minWidth: 200, sort: true }
+                , { field: 'compan', title: '企业', minWidth: 40, sort: true }
+                , { field: 'individual', title: '个体', minWidth: 40, sort: true }
+                , { field: 'micro', title: '小微', minWidth: 40, sort: true }
+                , { field: 'type', title: '银盛商户类型', minWidth: 40, sort: true }
+                , { field: 'industryType', title: '产业编码', minWidth: 40, sort: true }
+                , { field: 'industryTypeDesc', title: '产业描述', minWidth: 200, sort: true }
+                // , {fixed: 'right', title: '操作', minWidth: 100, style: "height: 61px", align: 'center', toolbar: '#barDemo'}
+            ]]
+        });
+
+        //监听头工具栏事件
+        table.on('toolbar(test)', function (obj) {
+            var checkStatus = table.checkStatus(obj.config.id)
+                , data = checkStatus.data; //获取选中的数据
+            switch (obj.event) {
+                case 'search':
+                    search();
+                    break;
+            }
+        });
+
+        //监听行工具事件
+        table.on('tool(test)', function (obj) { //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            var data = obj.data //获得当前行数据
+                , layEvent = obj.event; //获得 lay-event 对应的值
+            if (layEvent === 'detail') {
+                layer.msg('查看操作');
+            } else if (layEvent === 'del') {
+                del(data)
+            } else if (layEvent === 'edit') {
+                //layer.msg('编辑操作');
+                toEdit(data.id);
+            } else if (layEvent === 'bandage') {
+                bandage(data.id);
+            }
+        });
+
+        //监听排序事件
+        table.on('sort(test)', function (obj) { //注：sort 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            console.log(obj.field); //当前排序的字段名
+            console.log(obj.type); //当前排序类型：desc（降序）、asc（升序）、null（空对象，默认排序）
+            console.log(this); //当前排序的 th 对象
+
+            //尽管我们的 table 自带排序功能，但并没有请求服务端。
+            //有些时候，你可能需要根据当前排序的字段，重新向服务端发送请求，从而实现服务端排序，如：
+            table.reload('idTest', {
+                initSort: obj //记录初始排序，如果不设的话，将无法标记表头的排序状态。
+                , where: { //请求参数（注意：这里面的参数可任意定义，并非下面固定的格式）
+                    column: obj.field //排序字段
+                    , asc: obj.type === 'asc' //排序方式
+                }
+            }, true);
+
+            layer.msg('服务端排序。order by ' + obj.field + ' ' + obj.type);
+        });
+    });
+
+    function bandage(id) {
+        var url = '${ctx}/appMenu/bandage/' + id;
+        var index = layer.open({
+            type: 2
+            , title: "用户角色"
+            , shade: 0.5
+            , maxmin: true
+            , content: url
+            , area: ['400px', '300px']
+        });
+    }
+
+    function search() {
+        var condition = form.val('condition');
+        table.reload('idTest', {
+            where: condition
+        }, true);
+    }
+</script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/sys/region/regionReflectEdit.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/sys/region/regionReflectEdit.jsp
new file mode 100644
index 0000000..71c47e0
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/sys/region/regionReflectEdit.jsp
@@ -0,0 +1,142 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<!DOCTYPE html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../../common.jsp"/>
+
+    <style>
+        .layui-table-cell {
+            text-align: center;
+            height: auto;
+            white-space: normal;
+        }
+
+        .layui-table img {
+            max-width: 300px
+        }
+    </style>
+</head>
+<body>
+<form action="" class="layui-form" lay-filter="form" style="width: 80%; margin-top: 20px;">
+    <input name="regionSrc" value="${regionSrc}" hidden>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">省</label>
+        <div class="layui-input-block">
+            <select name="province" lay-filter="province" lay-search>
+            </select>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">市</label>
+        <div class="layui-input-block">
+            <select name="city" lay-filter="city" lay-search>
+            </select>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">县</label>
+        <div class="layui-input-block">
+            <select name="area" lay-filter="area" lay-search>
+            </select>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button class="layui-btn" lay-submit lay-filter="formDemo">立即提交</button>
+        </div>
+    </div>
+
+</form>
+
+<script>
+    var form, element, layer;
+
+    var province;
+
+    layui.use(['form', 'element', 'layer'], function () {
+        form = layui.form;
+        layer = layui.layer;
+
+        $.get('${ctx}/regionReflect/listProvince/${type}', function (d) {
+            var content = '';
+
+            d.data.forEach(function (el) {
+                content += '<option value="' + el + '">' + el + "</option>";
+            })
+
+            console.log("province: " + content);
+            $('select[name="province"]').html(content);
+            form.render('select');
+        })
+
+        form.on('select(province)', function(data){
+            console.log(data.elem); //得到select原始DOM对象
+            console.log(data.value); //得到被选中的值
+            console.log(data.othis); //得到美化后的DOM对象
+
+            province = data.value;
+
+            $.get('${ctx}/regionReflect/listCity/${type}/' + province, function (d) {
+                var content = '';
+
+                d.data.forEach(function (el) {
+                    content += '<option value="' + el + '">' + el + "</option>";
+                })
+
+                console.log("city: " + content);
+                $('select[name="city"]').html(content);
+
+                form.render('select');
+            })
+        });
+
+        form.on('select(city)', function(data){
+            console.log(data.elem); //得到select原始DOM对象
+            console.log(data.value); //得到被选中的值
+            console.log(data.othis); //得到美化后的DOM对象
+
+            $.get('${ctx}/regionReflect/listArea/${type}/' + province + "/" + data.value, function (d) {
+                var content = "";
+
+                d.data.forEach(function (el) {
+                    content += '<option value="' + el + '">' + el + "</option>"
+                })
+
+                $('select[name="area"]').html(content);
+
+                form.render('select');
+            })
+        });
+
+        //监听提交
+        form.on('submit(formDemo)', function(data){
+            var fileData = data.field;
+            fileData.type = '${type}';
+            $.post('${ctx}/regionReflect/save', fileData, function(d) {
+                layer.msg(d.message);
+                if (d.code == 200) {
+                    parent.layer.closeAll();
+                    parent.reload();
+                }
+            })
+
+            return false;
+        });
+    })
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/sys/region/regionReflectList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/sys/region/regionReflectList.jsp
new file mode 100644
index 0000000..8a2dd26
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/sys/region/regionReflectList.jsp
@@ -0,0 +1,234 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<!DOCTYPE html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../../common.jsp"/>
+
+    <style>
+        .layui-table-cell {
+            text-align: center;
+            height: auto;
+            white-space: normal;
+        }
+
+        .layui-table img {
+            max-width: 300px
+        }
+    </style>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pb5 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" action="" lay-filter="condition" style="margin-top: 10px">
+                    <div class="layui-form-item">
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">省</label>
+                            <div class="layui-input-inline">
+                                <input name="province" placeholder="源数据" class="layui-input"/>
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">市</label>
+                            <div class="layui-input-inline">
+                                <input name="city" placeholder="源数据" class="layui-input"/>
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">县区</label>
+                            <div class="layui-input-inline">
+                                <input name="area" placeholder="源数据" class="layui-input"/>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+
+        <table class="layui-hide" id="demo" lay-filter="test"></table>
+    </div>
+</div>
+
+
+<script type="text/html" id="toolBar">
+    <a class="layui-btn layui-btn-sm" href="javascript:void(0);"
+       lay-event="search">
+        <i class="layui-icon layui-icon-search"></i>
+        <span>搜索</span>
+    </a>
+</script>
+
+<script type="text/html" id="operation1">
+    <a class="layui-btn layui-btn-xs" href="javascript:void(0);"
+       lay-event="editSxf">
+        <i class="layui-icon layui-icon-edit"></i>
+        <span>编辑</span>
+    </a>
+</script>
+
+<script type="text/html" id="operation2">
+    <a class="layui-btn layui-btn-xs" href="javascript:void(0);"
+       lay-event="editRyx">
+        <i class="layui-icon layui-icon-edit"></i>
+        <span>编辑</span>
+    </a>
+</script>
+
+<script type="text/html" id="operation3">
+    <a class="layui-btn layui-btn-xs" href="javascript:void(0);"
+       lay-event="editYs">
+        <i class="layui-icon layui-icon-edit"></i>
+        <span>编辑</span>
+    </a>
+</script>
+
+<script>
+
+    var laypage, layer, table, form;
+
+    layui.use(['table', 'upload', 'element', 'form'], function () {
+        laypage = layui.laypage;
+        layer = layui.layer; //弹层
+        table = layui.table; //表格
+        form = layui.form;
+
+        //执行一个 table 实例
+        table.render({
+            elem: '#demo'
+            , id: 'idTest'
+            , url: '${ctx}/regionReflect/pageData' //数据接口
+            , autoSort: false
+            , where: {
+                column: 'sort'
+                , asc: true
+            }
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , title: '商户'
+            , page: true //开启分页
+            , toolbar: '#toolBar' //开启工具栏，此处显示默认图标，可以自定义模板，详见文档
+            , defaultToolbar: ['filter']
+            , cols: [[ //表头
+                    {type: 'checkbox', rowspan: 2}
+                    , {field: '', title: '序号', type: 'numbers', rowspan: 2}
+                    , {field: '', title: '源地区数据', minWidth: 180, rowspan: 2, sort: true, templet: function(d) {
+                            return d.src.province + "-" + d.src.city + "-" + d.src.area
+                        }}
+                    , {field: '', title: '随行付', minWidth: 180, colspan: 2}
+                    , {field: '', title: '瑞银信', minWidth: 180, colspan: 2}
+                    , {field: '', title: '银盛', minWidth: 180, colspan: 2}
+                ],
+                [
+                    {field: '', title: '地区数据', minWidth: 180, templet: function(d) {
+                            if (d.sxf != null) {
+                                return d.sxf.province + "-" + d.sxf.city + "-" + d.sxf.area
+                            }
+                            return "";
+                        }}
+                    , {field: '', title: '操作', minWidth: 80, templet: '#operation1' }
+                    , {field: '', title: '地区数据', minWidth: 180, templet: function(d) {
+                        if (d.ryx != null) {
+                            return d.ryx.province + "-" + d.ryx.city + "-" + d.ryx.area
+                        }
+
+                        return "";
+                    }}
+                    , {field: '', title: '操作', minWidth: 80, templet: '#operation2' }
+                    , {field: '', title: '地区数据', minWidth: 180, templet: function(d) {
+                        if (d.ys != null) {
+                            return d.ys.province + "-" + d.ys.city + "-" + d.ys.area
+                        }
+                        return "";
+                    }}
+                    , {field: '', title: '操作', minWidth: 80, templet: '#operation3' }
+                ]
+            ]
+        });
+
+        table.on('toolbar(test)', function(obj) {
+            switch(obj.event){
+                case 'search':
+                    reload();
+                    break;
+            }
+        });
+
+        table.on('tool(test)', function(obj) {
+            var data = obj.data;
+            var type;
+            switch(obj.event){
+                case 'editSxf':
+                    type = "sxf";
+                    break;
+                case 'editRyx':
+                    type = "ryx";
+                    break;
+                case 'editYs':
+                    type = "ys";
+                    break;
+            }
+
+            layer.open({
+                type: 2
+                , area: ['500px', '500px']
+                , content: ctx + '/regionReflect/edit/' + type + "?regionSrc=" + data.regionSrc
+            });
+        });
+    });
+
+    function reload() {
+        var data = form.val('condition')
+
+        table.reload('idTest', {
+            url: '${ctx}/regionReflect/pageData'
+            , where: data
+        }, true);
+    }
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/systemConfig/systemconfigBaseInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/systemConfig/systemconfigBaseInfo.jsp
new file mode 100644
index 0000000..3bcb71b
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/systemConfig/systemconfigBaseInfo.jsp
@@ -0,0 +1,177 @@
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+	<meta charset="utf-8">
+	<meta http-equiv="X-UA-Compatible" content="IE=edge">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<meta name="format-detection" content="telephone=no">
+	<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+	<meta name="renderer" content="webkit">
+	<!-- 移动设备 viewport -->
+	<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+	<jsp:include page="../../common.jsp"/>
+	<style>
+		.layui-input, .layui-textarea {
+			border-color: #606060;
+		}
+	</style>
+</head>
+<body>
+<form class="layui-form" action="" style="width: 80%; margin-top: 20px">
+	<input name="id" value="${systemconfig.id}" hidden/>
+
+	<div class="layui-form-item">
+		<label class="layui-form-label">属性键</label>
+		<div class="layui-input-block" style="margin-left:0px">
+			<div class="layui-input-block">
+				<input name="propertyKey" value="${systemconfig.propertyKey}" placeholder="请输入内容" class="layui-input"/>
+			</div>
+		</div>
+	</div>
+
+	<div class="layui-form-item">
+		<label class="layui-form-label">属性值</label>
+		<div class="layui-input-block" style="margin-left:0px">
+			<div class="layui-input-block">
+				<input name="propertyValue" id="url" value="${systemconfig.propertyValue}" placeholder="请输入内容" class="layui-input"/>
+			</div>
+		</div>
+	</div>
+
+	<div class="layui-form-item">
+		<label class="layui-form-label">上传图片</label>
+		<div class="layui-input-block" style="display: flex;justify-content: flex-start">
+			<input name="fileKey" id="fileKey" hidden/>
+			<input name="fileName" id="fileName" class="layui-input layui-col-xs6 layui-disabled" disabled/>
+		</div>
+		<div class="layui-input-block" style="display: flex;justify-content: flex-start ; margin-top: 5px">
+			<button type="button" class="layui-btn layui-btn layui-btn-normal  layui-col-xs3"  onclick="$('#file').click();">
+				浏览...
+			</button>
+			<button type="button" class="layui-btn layui-btn-normal layui-col-xs3"  id="uploadParam">
+				上传
+			</button>
+		</div>
+	</div>
+
+	<div class="layui-form-item">
+		<label class="layui-form-label">属性描述</label>
+		<div class="layui-input-block" style="margin-left:0px">
+			<div class="layui-input-block">
+				<input name="propertyDesc" value="${systemconfig.propertyDesc}" placeholder="请输入内容" class="layui-input"/>
+			</div>
+		</div>
+	</div>
+
+	<div class="layui-form-item">
+		<label class="layui-form-label">属性索引</label>
+		<div class="layui-input-block" style="margin-left:0px">
+			<div class="layui-input-block">
+				<input name="propertyIndex" value="${systemconfig.propertyIndex}" placeholder="请输入内容" class="layui-input"/>
+			</div>
+		</div>
+	</div>
+
+	<div class="layui-form-item">
+		<label class="layui-form-label">系统ID</label>
+		<div class="layui-input-block" style="margin-left:0px">
+			<div class="layui-input-block">
+				<input name="systemId" value="${systemconfig.systemId}" placeholder="请输入内容" class="layui-input"/>
+			</div>
+		</div>
+	</div>
+
+	<div class="layui-form-item">
+		<div class="layui-input-block">
+			<button class="layui-btn" lay-submit lay-filter="formDemo">立即提交</button>
+			<button type="button" id="close" class="layui-btn layui-btn-primary">关闭</button>
+		</div>
+	</div>
+</form>
+
+<form id="ajaxForm" class="layui-form" style="width: 70%" >
+	<input type="hidden" name="OSSAccessKeyId" id="accessid" value="${uploadParam.accessid}">
+	<input type="hidden" name="policy" id="policy" value="${uploadParam.policy}">
+	<input type="hidden" name="signature" id="signature" value="${uploadParam.signature}">
+	<input type="hidden" name="expire" id="expire" value="${uploadParam.expire}">
+	<input type="hidden" name="success_action_status" id="success_action_status" value="200">
+	<input type="hidden" name="key" id="key" value="${uploadParam.key}">
+	<input type="hidden" name="callBack" id="key2_callBack" value="${uploadParam.callBack}">
+	<input type="file" style="display: none" name="file" id="file" onchange="document.getElementById('fileName').value=this.files[0].name">
+</form>
+
+<script>
+	//Demo
+	layui.use(['form','upload', 'layer'], function () {
+		var form = layui.form;
+		var layer = layui.layer;
+
+		$('#close').click(function () {
+			parent.layer.closeAll();
+		});
+
+		var data;
+		$("#uploadParam").click(function () {
+			var fileName = $("#fileName").val();
+			if(!fileName){
+				layer.msg("请先选择文件！");
+				return;
+			}
+			var suffix = fileName.substring(fileName.lastIndexOf('.') + 1, fileName.length); //
+			var key = '${uploadParam.key}'+"."+suffix;
+			$("#key").val(key);
+			$("#fileKey").val(key);
+			var index = layer.load(1,{shade: [0.1,'#000'] });
+			$.ajax({
+				url: '${uploadParam.host}',
+				method: 'post',
+				data: new FormData($('#ajaxForm')[0]),
+				dataType:'json',
+				processData: false,
+				contentType: false,
+				success: function(res) {
+					layer.close(index);
+					if (res.code == 200){
+						layer.msg("上传成功！")
+						$("#url").val(res.url);
+					}else{
+						layer.msg("上传失败！")
+					}
+				},
+				error: function (errorMsg) {
+					layer.close(index);
+					layer.msg("上传出错！")
+				}
+			})
+		})
+
+		//监听提交
+		form.on('submit(formDemo)', function (data) {
+			var index = layer.load(1, {shade: [0.1, '#000']});
+			$.ajax({
+				url: '${ctx}/systemconfig/saveSystemconfig',
+				method: 'post',
+				data: JSON.stringify(data.field),
+				dataType: 'JSON',
+				contentType: "application/json",
+				success: function (res) {
+					layer.close(index);
+					if (res.code == 200) {
+						layer.alert(res.message, function () {
+							parent.location.reload();
+						})
+					} else {
+						layer.msg(res.message, {
+							icon: 5
+						});
+					}
+				}
+			})
+			return false;
+		});
+	});
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/systemConfig/systemconfigList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/systemConfig/systemconfigList.jsp
new file mode 100644
index 0000000..3053f48
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/systemConfig/systemconfigList.jsp
@@ -0,0 +1,168 @@
+<%@ page contentType="text/html; charset=utf-8"
+		 pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head>
+	<meta charset="utf-8">
+	<meta http-equiv="X-UA-Compatible" content="IE=edge">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<meta name="format-detection" content="telephone=no">
+	<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+	<meta name="renderer" content="webkit">
+	<!-- 移动设备 viewport -->
+	<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+	<jsp:include page="../../common.jsp"/>
+
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+	<div class="mb50 mt10">
+		<div class="whitebg pl10 pr10">
+			<table class="layui-hide" id="systemconfigTab" lay-filter="systemconfigTab"></table>
+		</div>
+	</div>
+</div>
+
+<script type="text/html" id="toolbarDemo">
+	<div class="layui-btn-container">
+		<button class="layui-btn layui-btn-sm" lay-event="add">添加</button>
+		<button class="layui-btn layui-btn-sm" lay-event="search">查询</button>
+	</div>
+</script>
+
+<script type="text/html" id="barDemo">
+	<a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>
+	<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
+</script>
+
+<script>
+	layui.use(['table', 'layer'], function () {
+		var table = layui.table;
+		var layer = layui.layer;
+
+		var tableIns = table.render({
+			elem: '#systemconfigTab'
+			, url: '${ctx}/systemconfig/querySystemconfigByPage'
+			, response: {
+				statusName: 'code' //数据状态的字段名称，默认：code
+				, countName: 'count' //数据总数的字段名称，默认：count
+				, dataName: 'data' //默数据列表的字段名称，认：data
+				, statusCode: 200
+			}
+			, parseData: function (res) { //res 即为原始返回的数据
+				return {
+					"code": res.code, //解析接口状态
+					"msg": res.message, //解析提示文本
+					"count": res.count, //解析数据长度
+					"data": res.systemconfigList //解析数据列表
+				};
+			}
+			, toolbar: '#toolbarDemo' //开启头部工具栏，并为其绑定左侧模板
+			, defaultToolbar: ['filter', 'exports', 'print', { //自定义头部工具栏右侧图标。如无需自定义，去除该参数即可
+				title: '提示'
+				, layEvent: 'LAYTABLE_TIPS'
+				, icon: 'layui-icon-tips'
+			}]
+			, title: '系统属性配置'
+			, cols: [[
+				{type: 'checkbox', fixed: 'left', hidden: true}
+				, {field: 'numbers', title: '序号',width: 80, type: 'numbers'}
+				, {field: 'id', title: 'id'}
+				, {field: 'propertyKey', title: '属性键', sore: true}
+				, {field: 'propertyValue', title: '属性值',align: "center"}
+				, {field: 'propertyDesc', title: '属性描述',align: "center"}
+				, {field: 'propertyIndex', title: '属性索引',align: "center"}
+				, {field: 'systemId', title: '系统ID',align: "center"}
+				, {fixed: 'right', title: '操作',align: "center", toolbar: '#barDemo'}
+			]]
+			, request: {
+				pageName: 'currPage' //页码的参数名称，默认：page
+				, limitName: 'size' //每页数据量的参数名，默认：limit
+			}
+			, page: true
+			, done: function () {
+				$("[data-field='forceUpdate']").children().each(function () {
+					if ($(this).text() == '0') {
+						$(this).text('否');
+					} else if ($(this).text() == '1') {
+						$(this).text('是');
+					}
+				});
+			}
+		});
+
+		//头工具栏事件
+		table.on('toolbar(systemconfigTab)', function (obj) {
+			switch (obj.event) {
+				case 'add':
+					// 添加
+					toAdd();
+					break;
+				case 'search':
+					// 查询
+					tableIns.reload({
+						where: { //设定异步数据接口的额外参数，任意设
+							title: $("#title").val()
+						}
+						, page: {
+							curr: 1 //重新从第 1 页开始
+						}
+					});
+					break;
+			}
+		});
+
+		//监听行工具事件
+		table.on('tool(systemconfigTab)', function (obj) {
+			var data = obj.data;
+			//console.log(obj)
+			if (obj.event === 'del') {
+				layer.confirm('真的删除行么?', function (index) {
+					obj.del(data);
+					layer.close(index);
+					del(obj);
+				});
+			} else if (obj.event === 'edit') {
+				toAdd(obj.data);
+			}
+		});
+
+		function toAdd(obj) {
+			var url = '${ctx}/systemconfig/querySystemconfigBaseInfo';
+			if (obj != undefined) {
+				url = "${ctx}/systemconfig/querySystemconfigBaseInfo/" + obj.id
+			}
+			var index = layer.open({
+				type: 2
+				, shade: 0.5
+				, maxmin: true
+				, content: url
+				, area: ['550px', '500px']
+			});
+		}
+
+		function del(obj) {
+			$.ajax({
+				url: '${ctx}/systemconfig/deleteSystemconfig',
+				method: 'post',
+				data: JSON.stringify(obj.data),
+				dataType: 'JSON',
+				contentType: "application/json",
+				success: function (res) {
+					if (res.code == 200) {
+						layer.msg(res.message, {
+							icon: 1
+						});
+					} else {
+						layer.msg(res.message, {
+							icon: 5
+						});
+					}
+				}
+			})
+		}
+	});
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/systemInfo/systemInfoBaseInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/systemInfo/systemInfoBaseInfo.jsp
new file mode 100644
index 0000000..34a1a4b
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/systemInfo/systemInfoBaseInfo.jsp
@@ -0,0 +1,45 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">  
+	<div class="tab-pane active">     
+		<div class="panel-body">
+			<div class="wrapper wrapper-content">
+				<div class="panel-form animated fadeInRight wp60 fc">
+					<div class="layui-form-item dn	has-error" >   
+						<label class="layui-form-label">id</label>  
+						<div class="layui-input-block">
+							<input type="text" name="id" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${systemInfo.id }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">标题</label>  
+						<div class="layui-input-block">
+							<input type="text" name="title" id="title" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${systemInfo.title }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">内容</label>  
+						<div class="layui-input-block">
+							<input type="text" name="content" id="content" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${systemInfo.content }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">备注</label>  
+						<div class="layui-input-block">
+							<input type="text" name="remark" id="remark" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${systemInfo.remark }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">排序</label>  
+						<div class="layui-input-block">
+							<input type="text" name="seq" id="seq" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${systemInfo.seq }" >
+						</div>  
+					</div>
+	
+				</div>
+			</div>
+		</div>  
+	</div>
+</form>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/systemInfo/systemInfoBaseReadInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/systemInfo/systemInfoBaseReadInfo.jsp
new file mode 100644
index 0000000..33248f0
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/systemInfo/systemInfoBaseReadInfo.jsp
@@ -0,0 +1,106 @@
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+    <style>
+        .layui-input, .layui-textarea {
+            border-color: #606060;
+        }
+    </style>
+</head>
+<body>
+<form class="layui-form" action="" style="width: 80%; margin-top: 20px">
+    <input name="id" value="${entity.id}" hidden/>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">标题</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="title" value="${entity.title}" placeholder="请输入标题" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">内容</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="content" value="${entity.content}" placeholder="请输入内容" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">备注</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="remark" value="${entity.remark}" placeholder="请输入备注" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">排序</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="seq" value="${entity.seq}" placeholder="请输入排序" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button class="layui-btn" lay-submit lay-filter="formDemo">立即提交</button>
+            <button type="button" id="close" class="layui-btn layui-btn-primary">关闭</button>
+        </div>
+    </div>
+</form>
+
+<script>
+    //Demo
+    layui.use(['form', 'layer'], function () {
+        var form = layui.form;
+        var layer = layui.layer;
+
+        $('#close').click(function () {
+            parent.layer.closeAll();
+        });
+
+        //监听提交
+        form.on('submit(formDemo)', function (data) {
+            var index = layer.load(1, {shade: [0.1, '#000']});
+            $.ajax({
+                url: '${ctx}/systemInfo/saveOrUpdate',
+                method: 'post',
+                data: JSON.stringify(data.field),
+                dataType: 'JSON',
+                contentType: "application/json",
+                success: function (res) {
+                    layer.close(index);
+                    if (res.code == 200) {
+                        layer.alert(res.message, function () {
+                            parent.location.reload();
+                        })
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 5
+                        });
+                    }
+                }
+            })
+            return false;
+        });
+    });
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/systemInfo/systemInfoExtendsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/systemInfo/systemInfoExtendsInfo.jsp
new file mode 100644
index 0000000..592687a
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/systemInfo/systemInfoExtendsInfo.jsp
@@ -0,0 +1,201 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>           
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> 
+<div class="tab-pane active">      
+	<div class="animated fadeInRight">
+		<div class="whitebg pl10 pr10">
+			<table class="table table-striped table-bordered table-hover">     
+				<thead> 
+					<tr>  
+						<th class="textc">序号</th>         
+						<th class="textc wp15">流水账号</th>
+						<th class="textc">日期</th>         
+						<th class="textc">财务类别</th>     
+						<th class="textc">金额</th>         
+						<th class="textc">银行</th>         
+						<th class="textc">发票</th>         
+						<th class="textc">客户名称</th>     
+						<th class="textc wp15">单号</th>    
+						<th class="textc">状态</th>         
+						<th class="textc">类别</th>         
+						<th class="textc">操作</th>         
+					</tr> 
+				</thead>
+				<tbody> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+                
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="green">支出</span></td>     
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+				</tbody>
+                
+			</table>  
+			<!-- footer -->  
+			<div class="clearfix mb10 pb20">          
+					<div class="layui-tab-item fr">       
+							<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+							<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>   
+							<div class="pagination dlblock vm" id="pagination"></div>
+							<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>            
+					</div>
+				</div>  
+		</div>      
+	</div>        
+</div>          
+                
+<script type="text/javascript">    
+//分页          
+$('#pagination').pagination({        
+	pageCount: 50,
+	jump: true,   
+	coping: true, 
+	homePage: '首页',    
+	endPage: '末页',     
+	prevContent: '上页', 
+	nextContent: '下页', 
+	callback: function(api) {          
+		$('.now').text(api.getCurrent());
+	}             
+});             
+</script>       
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/systemInfo/systemInfoFunctionsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/systemInfo/systemInfoFunctionsInfo.jsp
new file mode 100644
index 0000000..982ce84
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/systemInfo/systemInfoFunctionsInfo.jsp
@@ -0,0 +1,130 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>		
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">      
+<div class="tab-pane active">
+				<div class="panel-body">
+					<div class="wrapper wrapper-content">     
+						<div class="panel-form animated fadeInRight wp60 fc">
+							<!-- 账号资料 -->
+			<div class="layui-form-item 	has-error">
+				<label class="layui-form-label">单行输入框<i class="red">*</i></label>
+				<div class="layui-input-block">
+					<input type="text" name="title" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input">
+				</div>                                         
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">自定义验证</label>
+				<div class="layui-input-inline ml30">
+					<input type="password" name="password" lay-verify="pass" placeholder="请输入密码" autocomplete="off" class="layui-input">
+				</div>
+				<div class="layui-form-mid layui-word-aux">请填写6到12位密码</div>
+			</div>
+			<div class="form-group">
+				<div class="layui-form-item">          
+					<label class="layui-form-label">单行选择框</label>
+					<div class="layui-input-block">
+						<select name="interest" lay-filter="aihao">  
+							<option value=""></option>
+							<option value="0">写作</option>         
+							<option value="1" selected="">阅读</option>
+							<option value="2">游戏</option>
+							<option value="3">音乐</option>
+							<option value="4">旅行</option>  
+						</select>              
+					</div>
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<div class="layui-inline">  
+					<label class="layui-form-label">范围</label>
+					<div class="layui-input-inline ml30">
+						<input type="text" name="price_min" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>                                     
+					<div class="layui-form-mid">-</div>
+					<div class="layui-input-inline">       
+						<input type="text" name="price_max" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>
+				</div>           
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">联动选择框</label>
+				<div class="layui-input-inline ml30">
+					<select name="quiz1">     
+						<option value="">请选择省</option>
+						<option value="浙江" selected="">浙江省</option> 
+						<option value="你的工号">江西省</option>           
+						<option value="你最喜欢的老师">福建省</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz2">
+						<option value="">请选择市</option>
+						<option value="杭州">杭州</option>
+						<option value="宁波" disabled="">宁波</option>
+						<option value="温州">温州</option>
+						<option value="温州">台州</option>
+						<option value="温州">绍兴</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz3">
+						<option value="">请选择县/区</option>
+						<option value="西湖区">西湖区</option>
+						<option value="余杭区">余杭区</option>
+						<option value="拱墅区">临安市</option>
+					</select>
+				</div>    
+			</div>
+			<div class="layui-form-item" pane="">   
+				<label class="layui-form-label">原始复选框</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="like1[write]" lay-skin="primary" title="写作" checked="">  
+					<input type="checkbox" name="like1[read]" lay-skin="primary" title="阅读">
+					<input type="checkbox" name="like1[game]" lay-skin="primary" title="游戏" disabled="">
+				</div>
+			</div>
+
+			<div class="layui-form-item">
+				<label class="layui-form-label">开关-默认关</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="close" lay-skin="switch" lay-text="ON|OFF">
+				</div>
+			</div>
+			<div class="layui-form-item">  
+				<label class="layui-form-label">单选框</label>
+				<div class="layui-input-block">
+					<input type="radio" name="sex" value="男" title="男" checked="">
+					<input type="radio" name="sex" value="女" title="女">
+					<input type="radio" name="sex" value="禁" title="禁用" disabled="">
+				</div>
+			</div>
+			<!--<div class="layui-form-item layui-form-text">
+				<label class="layui-form-label">上传图片</label>
+				<div class="layui-input-block">
+					<div class="layui-upload-drag w200 h200">
+						<i class="layui-icon"></i>          
+						<p>点击上传</p>
+					</div>
+				</div>
+			</div>-->
+				<div class="layui-form-item layui-form-text">
+					<label class="layui-form-label">普通文本域</label>  
+					<div class="layui-input-block">              
+						<textarea placeholder="请输入内容" class="layui-textarea"></textarea>
+					</div>
+				</div>
+			</div>
+		</div>   
+	</div>
+</div>
+</form>   
+<script type="text/javascript">
+	//form表单样式
+	layui.use(['layer', 'form'], function() {    
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+</script>                 
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/systemInfo/systemInfoList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/systemInfo/systemInfoList.jsp
new file mode 100644
index 0000000..830c91d
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/systemInfo/systemInfoList.jsp
@@ -0,0 +1,216 @@
+<%--
+  Created by IntelliJ IDEA.
+  User: Administrator
+  Date: 2020/8/3
+  Time: 14:29
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+</head>
+<body>
+<div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+    <div class="toolbar-panel bdd">
+        <!--搜索条件 -->
+        <form action="${ctx}/systemInfo/page" method="get" id="condition">
+            <div class="toolbar-body">
+                <div class="row pt10 pb10 whitebg ml0 mr0">
+                    <span class="dlblock w100 textr">标题：</span>
+                    <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+							<input type="text" placeholder="请输入标题" id="title" name="title" value="">
+						</span>
+                    <span class="dlblock w100 textr">内容：</span>
+					<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+							<input type="text" placeholder="请输入内容" id="content" name="content" value="">
+						</span>
+                    <span class="dlblock w100 textr">开始日期</span>
+                    <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+							 <input type="text" placeholder="" id="date1" class="w150">
+							 <i class="fa fa-calendar"></i>
+						</span>
+                    <span class="dlblock w100 textr">结束日期</span>
+                    <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+						<input type="text" placeholder="" id="date2" class="w150">
+							<i class="fa fa-calendar"></i>
+						</span>
+                </div>
+            </div>
+        </form>
+    </div>
+</div>
+
+<div class="mb50 mt10">
+    <div class="whitebg pl10 pr10">
+        <table class="layui-hide" id="systemInfoTab" lay-filter="systemInfoTab"></table>
+    </div>
+</div>
+
+<script type="text/html" id="toolbarDemo">
+    <div class="layui-btn-container">
+        <button class="layui-btn layui-btn-sm" lay-event="add">添加</button>
+        <button class="layui-btn layui-btn-sm" lay-event="search">查询</button>
+    </div>
+</script>
+
+<script type="text/html" id="barDemo">
+    <a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>
+    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
+</script>
+
+<script>
+    layui.use(['table', 'layer','laydate' ], function () {
+        var table = layui.table;
+        var layer = layui.layer;
+        var laydate=layui.laydate;
+        laydate.render({
+            elem: '#date1', //指定元素
+            format:'yyyy-MM-dd 00:00:00'
+        });
+        laydate.render({
+            elem: '#date2', //指定元素
+            format:'yyyy-MM-dd 23:59:59'
+        });
+
+        var tableIns = table.render({
+            elem: '#systemInfoTab'
+            , url: '${ctx}/systemInfo/page'
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.count, //解析数据长度
+                    "data": res.data.data //解析数据列表
+                };
+            }
+            , toolbar: '#toolbarDemo' //开启头部工具栏，并为其绑定左侧模板
+            , defaultToolbar: ['filter', 'exports', 'print', { //自定义头部工具栏右侧图标。如无需自定义，去除该参数即可
+                title: '提示'
+                , layEvent: 'LAYTABLE_TIPS'
+                , icon: 'layui-icon-tips'
+            }]
+            , title: '系统客服信息表'
+            , cols: [[
+                {type: 'checkbox', fixed: 'left', hidden: true}
+                , {field: 'numbers', title: '序号', fixed: 'left', unresize: true, width: 80, sort: true, type: 'numbers'}
+                , {field: 'title', title: '标题'}
+                , {field: 'content', title: '内容'}
+                , {field: 'remark', title: '备注'}
+                , {field: 'seq', title: '排序', sort: true}
+                , {field: 'createDt', title: '创建日期', sort: true, width: 160,
+                    templet: "<div>{{layui.util.toDateString(d.createDt, 'yyyy-MM-dd HH:mm:ss')}}</div>"}
+                , {fixed: 'right', title: '操作', toolbar: '#barDemo'}
+            ]]
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , page: true
+            , done: function () {
+                $("[data-field='forceUpdate']").children().each(function () {
+                    if ($(this).text() == '0') {
+                        $(this).text('否');
+                    } else if ($(this).text() == '1') {
+                        $(this).text('是');
+                    }
+                });
+            }
+        });
+
+        //头工具栏事件
+        table.on('toolbar(systemInfoTab)', function (obj) {
+            switch (obj.event) {
+                case 'add':
+                    // 添加
+                    toAdd();
+                    break;
+                case 'search':
+                    // 查询
+                   // $("#condition").submit();
+                    tableIns.reload({
+                        where: { //设定异步数据接口的额外参数，任意设
+                            title:  $("#title").val(),
+                            content: $("#content").val(),
+                            startTime: $("#date1").val(),
+                            endTime: $("#date2").val()
+                        }
+                        ,page: {
+                            curr: 1 //重新从第 1 页开始
+                        }
+                    });
+                    break;
+            }
+        });
+
+        //监听行工具事件
+        table.on('tool(systemInfoTab)', function (obj) {
+            var data = obj.data;
+            //console.log(obj)
+            if (obj.event === 'del') {
+                layer.confirm('真的删除行么?', function (index) {
+                    obj.del(data);
+                    layer.close(index);
+                    del(obj);
+                });
+            } else if (obj.event === 'edit') {
+                toAdd(obj.data);
+            }
+        });
+
+        function toAdd(obj) {
+            var url = '${ctx}/systemInfo/detail';
+            if (obj != undefined) {
+                url = "${ctx}/systemInfo/detail/" + obj.id
+            }
+            var index = layer.open({
+                type: 2
+                , shade: 0.5
+                , maxmin: true
+                , content: url
+                , area: ['550px', '500px']
+            });
+        }
+
+        function del(obj) {
+            $.ajax({
+                url: '${ctx}/systemInfo/delete',
+                method: 'post',
+                data: JSON.stringify(obj.data),
+                dataType: 'JSON',
+                contentType: "application/json",
+                success: function (res) {
+                    if (res.code == 200) {
+                        layer.msg(res.message, {
+                            icon: 1
+                        });
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 5
+                        });
+                    }
+                }
+            })
+        }
+    });
+</script>
+</body>
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/systemInfo/systemInfoReadDetails.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/systemInfo/systemInfoReadDetails.jsp
new file mode 100644
index 0000000..8301b2d
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/systemInfo/systemInfoReadDetails.jsp
@@ -0,0 +1,54 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>     
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">                      
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black"> 
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> 
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->                                     
+<meta name="viewport"
+	content="width=device-width, initial-scale=1.0, maximum-scale=1.0">   
+<jsp:include page="../../common.jsp" />
+<script type="text/javascript">
+    require("js/systemInfo/systemInfoReadDetails.js");
+</script>
+<title>编辑</title>
+</head>                                 
+	<body class="lgraybg">            
+		<div class="	container-fluid animated fadeInRight col-sm-12">
+			<div class="panel-toolbar mt10 mb10 pt5 pb5 pl10 bdd whitebg">
+				<div class="buttons">
+					<!-- <a href="javascript:void(0);" class="btn btn-primary fa fa-save f12"><span>保存</span></a> -->
+					<a href="${ctx }/systemInfo/index?pageIndex=${pageIndex}"  class="btn btn-primary fa fa-back f12" id="goback"><span>返回</span></a>
+				</div>
+			</div>
+				<div class="tabs-container whitebg">
+					<div class="pt10 pl5 pr5">
+						<ul class="nav nav-tabs" id="nav-tabs">
+							<li class="active" data-action="base">   
+								<a href="javascript:void(0);" >基本资料</a>
+							</li>
+							<!-- <li class="" data-action="functions">
+								<a href="javascript:void(0);"  >多功能输入</a>
+							</li>
+							<li class="" data-action="extends">
+								<a href="javascript:void(0);" >扩展属性</a>
+							</li> -->
+						</ul>
+						<div class="tab-content pt30 p30">               
+		
+						</div>     
+					</div>
+				</div>    
+		</div>
+		<!-- 隐藏域 -->
+		<input type="hidden" id="systemInfoId" value="${systemInfo.id }"/>
+	</body>
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/systemSwitch/list.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/systemSwitch/list.jsp
new file mode 100644
index 0000000..34183ec
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/systemSwitch/list.jsp
@@ -0,0 +1,151 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp" />
+</head>
+<body>
+<table class="layui-hide" id="systemSwitch" lay-filter="systemSwitchTab"></table>
+
+<script type="text/html" id="toolbarDemo">
+    <div class="layui-btn-container">
+        <button class="layui-btn layui-btn-sm" lay-event="add">添加</button>
+        <button class="layui-btn layui-btn-sm" lay-event="search">查询</button>
+    </div>
+</script>
+
+<script type="text/html" id="barDemo">
+    <a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>
+<%--    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>--%>
+</script>
+
+<script>
+    layui.use(['table', 'layer'], function(){
+        var table = layui.table;
+        var layer = layui.layer;
+
+        var tableIns = table.render({
+            elem: '#systemSwitch'
+            ,url:'${ctx}/systemSwitch/page'
+            ,response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                ,countName: 'count' //数据总数的字段名称，默认：count
+                ,dataName: 'data' //默数据列表的字段名称，认：data
+                ,statusCode : 200
+            }
+            ,parseData: function(res){ //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.count, //解析数据长度
+                    "data": res.data.data //解析数据列表
+                };
+            }
+            ,toolbar: '#toolbarDemo' //开启头部工具栏，并为其绑定左侧模板
+            ,defaultToolbar: ['filter', 'exports', 'print', { //自定义头部工具栏右侧图标。如无需自定义，去除该参数即可
+                title: '提示'
+                ,layEvent: 'LAYTABLE_TIPS'
+                ,icon: 'layui-icon-tips'
+            }]
+            ,title: 'app版本数据表'
+            ,cols: [[
+                {type: 'checkbox', fixed: 'left', hidden: true}
+                ,{field:'String', title:'ID', fixed: 'left', unresize: true, width:80, sort: true}
+                ,{field:'name', title:'开关名称'}
+                ,{field:'code', title:'code', sort: true}
+                ,{field:'value', title:'状态', sort: true}
+                ,{field: 'createTime', title: '创建日期',width:160,templet : "<div>{{layui.util.toDateString(d.createTime, 'yyyy-MM-dd HH:mm:ss')}}</div>"}
+                ,{fixed: 'right', title:'操作', toolbar: '#barDemo'}
+            ]]
+            ,request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                ,limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            ,page: true
+            ,done: function () {
+                $("[data-field='forceUpdate']").children().each(function () {
+                    if ($(this).text() == '0') {
+                        $(this).text('否');
+                    } else if ($(this).text() == '1') {
+                        $(this).text('是');
+                    }
+                });
+            }
+        });
+
+        //头工具栏事件
+        table.on('toolbar(systemSwitchTab)', function(obj){
+            switch(obj.event){
+                case 'add':
+                    // 添加
+                    toAdd();
+                    break;
+                case 'search':
+                    // 查询
+                    tableIns.reload();
+                    break;
+            }
+        });
+
+        //监听行工具事件
+        table.on('tool(systemSwitchTab)', function(obj){
+            var data = obj.data;
+            //console.log(obj)
+            if(obj.event === 'del'){
+                layer.confirm('真的删除行么?', function(index){
+                    obj.del(data);
+                    layer.close(index);
+                    del(obj);
+                });
+            } else if(obj.event === 'edit'){
+                toAdd(obj.data);
+            }
+        });
+
+        function toAdd(obj) {
+            var url = '${ctx}/systemSwitch/add';
+            if(obj != undefined){
+                url = "${ctx}/systemSwitch/edit/"+obj.id
+            }
+            var index = layer.open({
+                type: 2
+                ,shade: 0.5
+                ,maxmin: true
+                , content: url
+                , area: ['550px', '500px']
+            });
+        }
+        function del(obj) {
+            $.ajax({
+                url: '${ctx}/systemSwitch/delete',
+                method: 'post',
+                data: JSON.stringify(obj.data),
+                dataType: 'JSON',
+                contentType:"application/json",
+                success: function(res) {
+                    if(res.code == 200) {
+                        layer.msg(res.data, {
+                            icon: 1
+                        });
+                    } else {
+                        layer.msg(res.data, {
+                            icon: 5
+                        });
+                    }
+                }
+            })
+        }
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/task/taskSortIndex.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/task/taskSortIndex.jsp
new file mode 100644
index 0000000..9482a67
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/task/taskSortIndex.jsp
@@ -0,0 +1,85 @@
+<%--
+  Created by IntelliJ IDEA.
+  User: DJH
+  Date: 2022/5/30
+  Time: 11:05
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html; charset=utf-8" pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+</head>
+<body>
+<div class="mb50 mt10">
+    <div class="whitebg pl10 pr10">
+        <table class="layui-hide" id="table" lay-filter="table"></table>
+    </div>
+</div>
+
+<script>
+    layui.use(['table', 'layer','laydate' ], function () {
+        var table = layui.table;
+        var layer = layui.layer;
+        var laydate=layui.laydate;
+        laydate.render({
+            elem: '#date1', //指定元素
+            format:'yyyy-MM-dd 00:00:00'
+        });
+        laydate.render({
+            elem: '#date2', //指定元素
+            format:'yyyy-MM-dd 23:59:59'
+        });
+
+        var tableIns = table.render({
+            elem: '#table'
+            , url: ctx + '/taskSort/page'
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            , toolbar: '#toolbarDemo' //开启头部工具栏，并为其绑定左侧模板
+            , defaultToolbar: ['filter', { //自定义头部工具栏右侧图标。如无需自定义，去除该参数即可
+                title: '提示'
+                , layEvent: 'LAYTABLE_TIPS'
+                , icon: 'layui-icon-tips'
+            }]
+            , title: '系统客服信息表'
+            , cols: [[
+                {type: 'checkbox', fixed: 'left', hidden: true}
+                , {field: 'numbers', title: '序号', fixed: 'left', unresize: true, width: 80, sort: true, type: 'numbers'}
+                , {field: 'id', title: 'ID'}
+                , {field: 'code', title: '编码'}
+                , {field: 'name', title: '名称'}
+                , {field: 'desc', title: '描述'}
+            ]]
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , page: true
+        });
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/task/userTaskIndex.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/task/userTaskIndex.jsp
new file mode 100644
index 0000000..ce01e2f
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/task/userTaskIndex.jsp
@@ -0,0 +1,192 @@
+<%--
+  Created by IntelliJ IDEA.
+  User: DJH
+  Date: 2022/5/30
+  Time: 11:05
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html; charset=utf-8" pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+</head>
+<body>
+<div class="mb50 mt10">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" lay-filter="formCondition" id="form1" action="" style="margin-top: 10px;">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">用户ID</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="userId" id="userId" placeholder="用户ID"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <div class="whitebg pl10 pr10">
+        <table class="layui-hide" id="table" lay-filter="table"></table>
+    </div>
+</div>
+
+<script type="text/html" id="toolbarDemo">
+    <a class="layui-btn layui-btn-sm" lay-event="search">
+        <i class="layui-icon layui-icon-search"></i>查询
+    </a>
+</script>
+
+<script type="text/html" id="toolBar">
+    {{# if (d.status == '1') { }}
+    <a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="cancel">
+        <i class="layui-icon layui-icon-delete"></i>取消该任务
+    </a>
+    {{# } }}
+</script>
+
+<script>
+    layui.use(['table', 'layer', 'laydate', 'form'], function () {
+        var table = layui.table;
+        var layer = layui.layer;
+        var laydate = layui.laydate;
+        var form = layui.form;
+
+        laydate.render({
+            elem: '#date1', //指定元素
+            format: 'yyyy-MM-dd 00:00:00'
+        });
+        laydate.render({
+            elem: '#date2', //指定元素
+            format: 'yyyy-MM-dd 23:59:59'
+        });
+
+        var tableIns = table.render({
+            elem: '#table'
+            , id: 'idTest'
+            , url: ctx + '/userTask/page'
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            , where: {
+                column: "createTime"
+                , asc: false,
+            }
+            , toolbar: '#toolbarDemo' //开启头部工具栏，并为其绑定左侧模板
+            , defaultToolbar: ['filter', { //自定义头部工具栏右侧图标。如无需自定义，去除该参数即可
+                title: '提示'
+                , layEvent: 'LAYTABLE_TIPS'
+                , icon: 'layui-icon-tips'
+            }]
+            , title: '系统客服信息表'
+            , cols: [[
+                {type: 'checkbox', fixed: 'left', hidden: true}
+                , {field: 'numbers', title: '序号', fixed: 'left', unresize: true, width: 80, sort: true, type: 'numbers'}
+                , {field: 'userId', title: '用户id'}
+                , {field: 'taskCodeDesc', title: '任务描述'}
+                , {field: 'typeDesc', title: '任务类型(执行时间早上10点)'}
+                , {field: 'statusDesc', title: '状态'}
+                , {field: 'arg0', title: '参数一'}
+                , {field: 'arg1', title: '参数二'}
+                , {field: 'createTime', title: "创建时间"}
+                , {fixed: 'right', title: '操作', width: 220, toolbar: '#toolBar'}
+            ]]
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , page: true
+        });
+
+        //监听头工具栏事件
+        table.on('toolbar(table)', function (obj) {
+            // var checkStatus = table.checkStatus(obj.config.id);
+            //获取选中的数据
+            switch (obj.event) {
+                case 'search':
+                    table.reload('idTest', {
+                        page: {
+                            curr: 1
+                        },
+                        initSort: obj,
+                        where: form.val('formCondition')
+                    });
+                    break;
+            }
+        });
+
+        //监听行工具事件
+        table.on('tool(table)', function (obj) { //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            var data = obj.data //获得当前行数据
+                , layEvent = obj.event; //获得 lay-event 对应的值
+            if (layEvent === 'cancel') {
+                layer.confirm('是否取消该任务？', function (index) {
+                    $.ajax({
+                        async: false
+                        , url: ctx + "/userTask/cancel"
+                        , data: {
+                            id: data.id
+                        }
+                        , type: 'POST'
+                        , dataType: 'json'
+                        , contentType: 'application/x-www-form-urlencoded'
+                        , success: function (res) {
+                            if (res.code == '200') {
+                                table.reload('demo');
+                                layer.msg(res.message);
+                                layer.close(index);
+                            } else {
+                                layer.msg(res.message);
+                                layer.close(index);
+                            }
+                        }
+                        , error: function (obj, error) {
+                            layer.msg(error);
+                            layer.close(index);
+                        }
+                    });
+                });
+            }
+        });
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/test/test.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/test/test.jsp
new file mode 100644
index 0000000..db35ba6
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/test/test.jsp
@@ -0,0 +1,237 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+    pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black">
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->
+<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+<jsp:include page="../../common.jsp" />
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/paho-mqtt/1.0.1/mqttws31.js" type="text/javascript"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/crypto-js/3.1.9-1/crypto-js.js" type="text/javascript"></script>
+</head>
+<body>
+    <a onclick="send()">发送MQTT消息</a>
+</body>
+<%--<script>
+  var hostname = "mqtt-cn-oew1viggh03.mqtt.aliyuncs.com";      //主机IP  106.14.181.32    此域名已不是我在使用了(2019-6-16注)
+  var port = 1883;
+  var clientid = "GID_SHOUYINBEI@@@0101170001542";
+  var timeout = 5;
+  var keepAlive = 100;
+  var cleanSession = false;
+  var ssl = false;
+  var client;
+  var topic = "SYB_TOPIC_SHOUYINBEI/order/GID_SHOUYINBEI@@@0101170001542";
+
+  function init (){
+    client = new Paho.MQTT.Client(hostname, port, clientid);
+    var options = {
+      invocationContext: {
+        host: hostname,
+        port: port,
+        path: client.path,
+        clientId: clientid
+      },
+      timeout: timeout,
+      keepAliveInterval: keepAlive,
+      cleanSession: cleanSession,
+      useSSL: ssl,
+      // userName: userName,
+      // password: password,
+      onSuccess: onConnect,
+      onFailure: function (e) {
+        console.log(e);
+        s = "{time:" + new Date().Format("yyyy-MM-dd hh:mm:ss") + ", onFailure()}";
+        console.log(s);
+      }
+    };
+    client.connect(options);
+
+    client.onConnectionLost = onConnectionLost;
+
+    //注册连接断开处理事件
+    client.onMessageArrived = onMessageArrived;
+
+  }
+
+  init();
+
+  function onConnectionLost(responseObject) {
+    console.log(responseObject);
+    s = "{time:" + new Date().Format("yyyy-MM-dd hh:mm:ss") + ", onConnectionLost()}";
+    console.log(s);
+    if (responseObject.errorCode !== 0) {
+      console.log("onConnectionLost:" + responseObject.errorMessage);
+      console.log("连接已断开");
+    }
+  }
+
+  function onMessageArrived(message) {
+    s = "{time:" + new Date().Format("yyyy-MM-dd hh:mm:ss") + ", onMessageArrived()}";
+    console.log(s);
+    console.log("收到消息:" + message.payloadString);
+  }
+
+  function send() {
+    var msgText = {};
+    msgText.type = "trans_cancel";
+    msgText.orderId = "D00"+new Date().getTime();
+    msgText.cancelTime = new Date().Format("yyyy-MM-dd HH:mm:ss");
+    message = new Paho.MQTT.Message(JSON.stringify(msgText));
+    message.destinationName = topic;
+    client.send(message);
+  }
+
+  var count = 0;
+
+  function start() {
+    window.tester = window.setInterval(function () {
+      if (client.isConnected) {
+        var s = "{time:" + new Date().Format("yyyy-MM-dd hh:mm:ss") + ", content:" + (count++) +
+                ", from: web console}";
+        message = new Paho.MQTT.Message(s);
+        message.destinationName = topic;
+        client.send(message);
+      }
+    }, 1000);
+  }
+
+  function stop() {
+    window.clearInterval(window.tester);
+  }
+
+
+  function onConnect() {
+    console.log("onConnected");
+    s = "{time:" + new Date().Format("yyyy-MM-dd hh:mm:ss") + ", onConnected()}";
+    console.log(s);
+    client.subscribe(topic);
+  }
+
+  Date.prototype.Format = function (fmt) { //author: meizz
+    var o = {
+      "M+": this.getMonth() + 1, //月份
+      "d+": this.getDate(), //日
+      "h+": this.getHours(), //小时
+      "m+": this.getMinutes(), //分
+      "s+": this.getSeconds(), //秒
+      "q+": Math.floor((this.getMonth() + 3) / 3), //季度
+      "S": this.getMilliseconds() //毫秒
+    };
+    if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length));
+    for (var k in o)
+      if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[
+              k]) : (("00" + o[k]).substr(("" + o[k]).length)));
+    return fmt;
+  }
+</script>--%>
+
+<script type="text/javascript">
+  var instanceId = 'mqtt-cn-oew1viggh03';//实例 ID，购买后从控制台获取
+  var host = 'mqtt-cn-oew1viggh03.mqtt.aliyuncs.com';// 设置当前用户的接入点域名，接入点获取方法请参考接入准备章节文档，先在控制台创建实例
+  var port = 80;//WebSocket 协议服务端口，如果是走 HTTPS，设置443端口
+  var topic = 'SYB_TOPIC_SHOUYINBEI';//需要操作的 Topic,第一级父级 topic 需要在控制台申请
+  var useTLS = false;//是否走加密 HTTPS，如果走 HTTPS，设置为 true
+  var accessKey = 'LTAI4G25PY4Tebxq4gCrhtF5';//账号的 AccessKey，在阿里云控制台查看
+  var secretKey = 'dUc1KMRqfvJI2AzOPKXYrWe3Hnmict';//账号的的 SecretKey，在阿里云控制台查看
+  var cleansession = true;
+  var groupId = 'GID_SHOUYINBEI';//MQTT GroupID,创建实例后从 MQTT 控制台创建
+  var clientId = groupId + '@@@0101170001542';//GroupId@@@DeviceId，由控制台创建的 Group ID 和自己指定的 Device ID 组合构成
+  var mqtt;
+  var reconnectTimeout = 2000;
+  var username = 'Signature|' + accessKey + '|' + instanceId;//username和 Password 签名模式下的设置方法，参考文档 https://help.aliyun.com/document_detail/48271.html?spm=a2c4g.11186623.6.553.217831c3BSFry7
+  var password = CryptoJS.HmacSHA1(clientId, secretKey).toString(CryptoJS.enc.Base64);
+
+  function MQTTconnect() {
+    mqtt = new Paho.MQTT.Client(
+            host,//MQTT 域名
+            port,//WebSocket 端口，如果使用 HTTPS 加密则配置为443,否则配置80
+            clientId//客户端 ClientId
+    );
+    var options = {
+      timeout: 3,
+      onSuccess: onConnect,
+      mqttVersion: 4,
+      cleanSession: cleansession,
+      onFailure: function (message) {
+        setTimeout(MQTTconnect, reconnectTimeout);
+      }
+    };
+    mqtt.onConnectionLost = onConnectionLost;
+    mqtt.onMessageArrived = onMessageArrived;
+    if (username != null) {
+      options.userName = username;
+      options.password = password;
+      options.useSSL = useTLS;//如果使用 HTTPS 加密则配置为 true
+    }
+    mqtt.connect(options);
+  }
+
+  function onConnect() {
+      console.log("连接成功！")
+    /*var msgText = {};
+    msgText.type = "trans_cancel";
+    msgText.orderId = "D00"+new Date().getTime();
+    msgText.cancelTime = dateFormat("YYYY-mm-dd HH:MM:SS",new Date());
+    console.log(msgText);
+    // Connection succeeded; subscribe to our topic
+    //发送 P2P 消息，topic 设置方式参考https://help.aliyun.com/document_detail/96176.html?spm=a2c4g.11186623.6.586.694f7cb4oookL7
+    message = new Paho.MQTT.Message(JSON.stringify(msgText));//set body
+    message.destinationName = topic + "/order/" + clientId;// set topic
+    mqtt.send(message);*/
+  }
+
+  function onConnectionLost(response) {
+    setTimeout(MQTTconnect, reconnectTimeout);
+  };
+
+  function onMessageArrived(message) {
+    var topic = message.destinationName;
+    var payload = message.payloadString;
+    console.log("recv msg : " + topic + "   " + payload);
+  };
+  MQTTconnect();
+
+  function dateFormat(fmt, date) {
+    let ret;
+    const opt = {
+      "Y+": date.getFullYear().toString(),        // 年
+      "m+": (date.getMonth() + 1).toString(),     // 月
+      "d+": date.getDate().toString(),            // 日
+      "H+": date.getHours().toString(),           // 时
+      "M+": date.getMinutes().toString(),         // 分
+      "S+": date.getSeconds().toString()          // 秒
+      // 有其他格式化字符需求可以继续添加，必须转化成字符串
+    };
+    for (let k in opt) {
+      ret = new RegExp("(" + k + ")").exec(fmt);
+      if (ret) {
+        fmt = fmt.replace(ret[1], (ret[1].length == 1) ? (opt[k]) : (opt[k].padStart(ret[1].length, "0")))
+      };
+    };
+    return fmt;
+  }
+
+  function send() {
+      var msgText = {};
+      msgText.type = "trans_cancel";
+      msgText.orderId = "D00"+new Date().getTime();
+      msgText.cancelTime = dateFormat("YYYY-mm-dd HH:MM:SS",new Date());
+      console.log(msgText);
+      message = new Paho.MQTT.Message(JSON.stringify(msgText));
+      var sendTopic  = topic + "/order/"+ clientId;
+      message.destinationName = sendTopic;
+      mqtt.send(message);
+  }
+</script>
+
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/transferCash/list.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/transferCash/list.jsp
new file mode 100644
index 0000000..d66dd2c
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/transferCash/list.jsp
@@ -0,0 +1,360 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp" />
+    <%--<style>
+        .layui-form-item .layui-input-inline {
+            width: 195px;
+        }
+    </style>--%>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" action="" style="margin-top: 10px">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">用户名称</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="userName" id="userName" placeholder="请输入商户名称" autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">提现单号</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="cashNo" id="cashNo" placeholder="请输入提现单号" autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">提现状态</label>
+                            <div class="layui-input-block">
+                                <select class="layui-select" id="status" name="status">
+                                    <option value="">请选择</option>
+                                    <option value="1">提现中</option>
+                                    <option value="2">提现成功</option>
+                                    <option value="3">提现失败</option>
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <!-- 表单数据 -->
+    <div class="mb50 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-hide" id="transferCashTab" lay-filter="transferCashTab"></table>
+        </div>
+    </div>
+</div>
+
+<script type="text/template" id="audit">
+    <form class="layui-form" id="form2" style="margin-top: 2rem;">
+        <input  name="id" id="id" hidden>
+        <div class="layui-form-item" style="width: 300px;">
+            <label class="layui-form-label">商户名称</label>
+            <div class="layui-input-block">
+                <input type="text" name="merchantName" id="auditName" style="cursor: pointer" placeholder="请输入商户名称"  autocomplete="off" class="layui-input layui-disabled" readonly>
+            </div>
+        </div>
+        <div class="layui-form-item" style="width: 300px;">
+            <label class="layui-form-label">审核</label>
+            <div class="layui-input-block">
+                <select class="layui-select" id="auditStatus" name="status" >
+                    <option value="">请选择</option>
+                    <option value="2">通过</option>
+                    <option value="3">驳回</option>
+                </select>
+            </div>
+        </div>
+        <div class="layui-form-item" style="width: 300px;">
+            <label class="layui-form-label">备注</label>
+            <div class="layui-input-block">
+                <textarea placeholder="请输入备注" name="remark" id="remark" lay-verify="required"  required autocomplete="off" class="layui-textarea"></textarea>
+            </div>
+        </div>
+    </form>
+</script>
+
+
+<script type="text/template" id="settle">
+    <form class="layui-form" id="form3" style="margin-top: 2rem;">
+        <div class="layui-inline">
+            <label class="layui-form-label">结算名称</label>
+            <div class="layui-input-block">
+                <input type="text" name="settleName" id="settleName" style="outline:none;border: none"  autocomplete="off" class="layui-input" readonly>
+            </div>
+        </div>
+        <div class="layui-inline">
+            <label class="layui-form-label">结算卡号</label>
+            <div class="layui-input-block">
+                <input type="text" name="settleNo" id="settleNo"  style="outline:none;border: none" autocomplete="off" class="layui-input" readonly>
+            </div>
+        </div>
+        <div class="layui-inline">
+            <label class="layui-form-label">银行名称</label>
+            <div class="layui-input-block">
+                <input type="text" name="bankName" id="bankName" style="outline:none;border: none"  autocomplete="off" class="layui-input" readonly>
+            </div>
+        </div>
+        <div class="layui-inline">
+            <label class="layui-form-label">支行名称</label>
+            <div class="layui-input-block">
+                <input type="text" name="branchName" id="branchName" style="outline:none;border: none" autocomplete="off" class="layui-input" readonly>
+            </div>
+        </div>
+        <div class="layui-inline">
+            <label class="layui-form-label">联系方式</label>
+            <div class="layui-input-block">
+                <input type="text" name="phone" id="phone" style="outline:none;border: none" autocomplete="off" class="layui-input" readonly>
+            </div>
+        </div>
+        <div class="layui-inline">
+            <label class="layui-form-label">省市区</label>
+            <div class="layui-input-block">
+                <input type="text" name="bankAddr" id="bankAddr" style="outline:none;border: none" autocomplete="off" class="layui-input" readonly>
+            </div>
+        </div>
+        <div class="layui-inline">
+            <label class="layui-form-label">支付宝账号</label>
+            <div class="layui-input-block">
+                <input type="text" name="zfbAcount" id="zfbAcount" style="outline:none;border: none"  autocomplete="off" class="layui-input" readonly>
+            </div>
+        </div>
+    </form>
+</script>
+
+<script type="text/html" id="toolBar">
+    {{#  if(d.status == 1){ }}
+    <button type="button" class="layui-btn layui-btn-sm" lay-event="audit"><i class="layui-icon">&#xe642;</i>审核</button>
+    {{# } }}
+    <button type="button" class="layui-btn layui-btn-sm layui-btn-normal" lay-event="settle"><i class="layui-icon">&#xe65e;</i>结算信息</button>
+</script>
+
+<script type="text/html" id="leftBar">
+    <button type="button" class="layui-btn layui-btn-normal layui-btn-sm" lay-event="search"><i class="layui-icon">&#xe615;</i>查询</button>
+</script>
+
+
+<script>
+    layui.use(['table', 'layer','form'], function(){
+        var table = layui.table;
+        var layer = layui.layer;
+        var form = layui.form;
+        var tableIns = table.render({
+            elem: '#transferCashTab'
+            ,url:'${ctx}/merchantTransferCash/page'
+            ,id: 'transferCashTab'
+            ,response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                ,countName: 'count' //数据总数的字段名称，默认：count
+                ,dataName: 'data' //默数据列表的字段名称，认：data
+                ,statusCode : 200
+            }
+            ,parseData: function(res){ //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            ,toolbar: '#leftBar' //开启头部工具栏，并为其绑定左侧模板
+            , defaultToolbar: ['filter']
+            ,defaultToolbar: ['filter', 'exports', 'print', { //自定义头部工具栏右侧图标。如无需自定义，去除该参数即可
+                title: '提示'
+                ,layEvent: 'LAYTABLE_TIPS'
+                ,icon: 'layui-icon-tips'
+            }]
+            ,title: '奖励金提现列表'
+            ,cols: [[
+                {type: 'checkbox', fixed: 'left', hidden: true}
+                ,{field:'numbers', title:'序号', fixed: 'left', unresize: true, width:80, type:'numbers'}
+                ,{field:'userId', title:'用户ID'}
+                ,{field:'userName', title:'用户名称'}
+                ,{field:'cashNo', title:'提现单号'}
+                ,{field:'cashAmt', title:'提现金额(元)',sort:true,templet:function (d) {
+                    return d.cashAmt.toFixed(2);
+                 }}
+                ,{field:'status', title:'提现状态',templet:function(d){
+                    if(d.status == '1'){
+                        return '<span style="color: orange">提现中</span>';
+                    }else if(d.status == '2'){
+                        return '<span style="color: green">提现成功</span>';
+                    }else if(d.status == '3'){
+                        return '<span style="color: red">提现失败</span>';
+                    }
+                 }}
+                ,{field:'cashTime', title:'提现时间',width:220,templet : "<div>{{layui.util.toDateString(d.cashTime, 'yyyy-MM-dd HH:mm:ss')}}</div>"}
+                ,{field:'remark', title:'备注'}
+                ,{fixed: 'right', title:'操作',width:200, toolbar: '#toolBar'}
+            ]]
+            ,request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                ,limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            ,page: true
+        });
+        //监听头工具栏事件
+        table.on('toolbar(transferCashTab)', function (obj) {
+            switch (obj.event) {
+                case 'search':
+                    var params= serialize($('#form1'));
+                    table.reload('transferCashTab', {
+                        where: params
+                        , page: {
+                            size: 10
+                            , current: 1
+                        }
+                    });
+                break;
+            }
+        });
+
+        table.on('tool(transferCashTab)', function(obj){ //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            var data = obj.data; //获得当前行数据
+            var layEvent = obj.event; //获得 lay-event 对应的值（也可以是表头的 event 参数对应的值）
+            if(layEvent === 'audit'){ //审核
+                toAudit(obj);
+            }else if(layEvent === 'settle'){
+                showSettle(obj);
+            }
+        });
+        function showSettle(obj) {
+            var userId = obj.data.userId;
+            $.ajax({
+                url: '${ctx}/merchantTransferCash/settle/'+userId,
+                method: 'get',
+                dataType: 'JSON',
+                success: function(res) {
+                   if(res.code == 200){
+                       var bankCard = res.data.bankCard;
+                       var index = layer.open({
+                           type: 1
+                           ,shade: 0.5
+                           ,title: '结算信息'
+                           ,maxmin: true
+                           ,content: $("#settle").html()
+                           ,area: ['450px', '400px']
+                           ,shadeClose: true
+                           ,btn2: function(index, layero){
+                               layer.close(index);
+                           }
+                           ,success:function () {
+                               $("#settleName").val(bankCard.bankCertName);
+                               $("#settleNo").val(bankCard.bankCardNo);
+                               $("#bankName").val(bankCard.bankName);
+                               $("#branchName").val(bankCard.branchName);
+                               $("#phone").val(bankCard.phone);
+                               $("#bankAddr").val(bankCard.branchProvince+bankCard.branchCity+bankCard.branchArea);
+                               $("#zfbAcount").val(res.data.zfbAccount);
+                           }
+                       });
+                   }else{
+                       layer.msg(res.message, {
+                           icon: 2
+                       });
+                   }
+                }
+            })
+        }
+
+        function toAudit(obj) {
+            var index = layer.open({
+                type: 1
+                ,shade: 0.5
+                ,title: '审核'
+                ,maxmin: true
+                ,content: $("#audit").html()
+                ,area: ['400px', '400px']
+                ,btn: ['保存','取消',]
+                ,shadeClose: true
+                ,btn1: function(index, layero) {
+                    if($("#auditStatus").val() === "3"){
+                        if(!$("#remark").val()){
+                            layer.msg("驳回需填写备注!");
+                            return;
+                        }
+                    }
+                    if(!$("#auditStatus").val()){
+                        layer.msg("请先选择审核通过或驳回!");
+                        return;
+                    }
+                    layer.close(index);
+                    toAuditEdit(obj);
+                }
+                ,btn2: function(index, layero){
+                    layer.close(index);
+                }
+                ,success:function () {
+                    $("#id").val(obj.data.id);
+                    $("#auditName").val(obj.data.merchantName);
+                }
+            });
+            form.render();
+        }
+        function toAuditEdit(obj) {
+            var data = $("#form2").serializeObject();
+            $.ajax({
+                url: '${ctx}/merchantTransferCash/saveOrUpdate',
+                method: 'post',
+                data: JSON.stringify(data),
+                dataType: 'JSON',
+                contentType:"application/json",
+                success: function(res) {
+                    if(res.code == 200) {
+                        layer.msg(res.data, {
+                            icon: 1
+                        });
+                        obj.update({
+                            status: $("#auditStatus").val()
+                        });
+                    } else {
+                        layer.msg(res.data, {
+                            icon: 2
+                        });
+                    }
+                }
+            })
+        }
+    });
+    jQuery.prototype.serializeObject=function(){
+        var obj=new Object();
+        $.each(this.serializeArray(),function(index,param){
+            if(!(param.name in obj)){
+                obj[param.name]=param.value;
+            }
+        });
+        return obj;
+    };
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/user/bankCardChangeRecord.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/user/bankCardChangeRecord.jsp
new file mode 100644
index 0000000..c0ae14a
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/user/bankCardChangeRecord.jsp
@@ -0,0 +1,1290 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport"
+          content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+    <script type="text/javascript">
+        require("promoter/userAppList.js");
+    </script>
+
+    <style>
+        .layui-table th {
+            text-align: center;
+        }
+
+        .layui-form-label {
+            padding: 9px 7px;
+            width: 96px;
+        }
+
+
+        .site-dropdown-demo,
+        .site-dropdown-demo .layui-menu {
+            background-color: #000;
+            border: none;
+        }
+
+        .site-dropdown-demo .layui-menu li {
+            color: #fff;
+        }
+
+        .site-dropdown-demo .layui-menu li:hover {
+            background-color: #333;
+        }
+
+        .layui-table-cell.laytable-cell-1-0-7,
+        .layui-table-cell.laytable-cell-1-0-1,
+        .layui-table-cell.laytable-cell-1-0-3,
+        .layui-table-cell.laytable-cell-1-0-8,
+        .layui-table-cell.laytable-cell-1-1-0,
+        .layui-table-cell.laytable-cell-1-1-2,
+        .layui-table-cell.laytable-cell-1-1-3,
+        .layui-table-cell.laytable-cell-1-1-4,
+        .layui-table-cell.laytable-cell-1-0-10,
+        .layui-table-cell.laytable-cell-1-0-11,
+        .layui-table-cell.laytable-cell-1-0-14 {
+            vertical-align: middle;
+            height: auto;
+            overflow: hidden;
+            text-overflow: inherit;
+            white-space: nowrap;
+        }
+
+        hr {
+            margin: 3px 0 !important;
+        }
+
+    </style>
+</head>
+
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" action="" style="margin-top: 10px" lay-filter="formCondition">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">用户ID</label>
+                            <div class="layui-input-inline">
+                                <input type="text" id="userId" name="userId" placeholder="请输入用户ID" class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">同IP用户</label>
+                            <div class="layui-input-inline">
+                                <input type="checkbox" id="sameIp" lay-skin="switch" value="1" name="sameIp" disabled>
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">用户名称</label>
+                            <div class="layui-input-inline">
+                                <input type="text" id="userName" name="userName" placeholder="请输入名称"
+                                       class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">商户简称</label>
+                            <div class="layui-input-inline">
+                                <input type="text" id="alias" name="alias" placeholder="请输入商户简称" class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">商户编号</label>
+                            <div class="layui-input-inline">
+                                <input type="text" id="merchantCode" name="merchantCode" placeholder="商户编号"
+                                       class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">推广码</label>
+                            <div class="layui-input-inline">
+                                <input type="text" id="inviteNum" name="inviteNum" placeholder="请输入名称"
+                                       class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">手机号</label>
+                            <div class="layui-input-inline">
+                                <input type="text" placeholder="请输入内容" id="phone" name="phone" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">上级手机号</label>
+                            <div class="layui-input-inline">
+                                <input type="text" placeholder="请输入内容" id="parentPhone" name="parentPhone"
+                                       class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">审核状态</label>
+                            <div class="layui-input-inline">
+                                <select id="status" name="status">
+                                    <option value="">请选择</option>
+                                    <option value="0">未实名</option>
+                                    <option value="1">审核中</option>
+                                    <option value="2">审核失败</option>
+                                    <option value="3">已审核</option>
+                                </select>
+                            </div>
+                        </div>
+
+                        <%--                        <div class="layui-inline">--%>
+                        <%--                            <label class="layui-form-label">用户类型</label>--%>
+                        <%--                            <div class="layui-input-inline">--%>
+                        <%--                                <select id="userType" name="userType">--%>
+                        <%--                                    <option value="">请选择</option>--%>
+                        <%--                                    <option value="promoter">普通</option>--%>
+                        <%--                                    <option value="agent_staff">业务员</option>--%>
+                        <%--                                    <option value="agent_agency">代理</option>--%>
+                        <%--                                    <option value="agent">超级</option>--%>
+                        <%--                                </select>--%>
+                        <%--                            </div>--%>
+                        <%--                        </div>--%>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">进件审核状态</label>
+                            <div class="layui-input-inline">
+                                <select id="mcsStatus" name="mcsStatus">
+                                    <option value="">请选择</option>
+                                    <option value="0">待审核</option>
+                                    <option value="1">审核中</option>
+                                    <option value="2">审核驳回</option>
+                                    <option value="3">审核通过</option>
+                                </select>
+                            </div>
+                        </div>
+
+                        <%--                        <div class="layui-inline">--%>
+                        <%--                            <label class="layui-form-label">插件审核状态</label>--%>
+                        <%--                            <div class="layui-input-inline">--%>
+                        <%--                                <select id="ppStatus" name="ppStatus">--%>
+                        <%--                                    <option value="">请选择</option>--%>
+                        <%--                                    <option value="0">插件待审核</option>--%>
+                        <%--                                    <option value="1">插件审核中</option>--%>
+                        <%--                                    <option value="2">插件审核驳回</option>--%>
+                        <%--                                    <option value="3">插件审核通过</option>--%>
+                        <%--                                </select>--%>
+                        <%--                            </div>--%>
+                        <%--                        </div>--%>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">商户类型</label>
+                            <div class="layui-input-inline">
+                                <select id="merchantType" name="merchantType">
+                                    <option value="">请选择</option>
+                                    <option value="1">小微</option>
+                                    <option value="2">个体</option>
+                                    <option value="3">企业</option>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">通道商编</label>
+                            <div class="layui-input-inline">
+                                <input type="text" placeholder="请输入内容" id="merchantId" name="merchantId"
+                                       class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">微信商户号</label>
+                            <div class="layui-input-inline">
+                                <input type="text" placeholder="请输入内容" id="wxMercNo" name="wxMercNo"
+                                       class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label">支付宝商户号</label>
+                            <div class="layui-input-inline">
+                                <input type="text" placeholder="请输入内容" id="zfbMercNo" name="zfbMercNo"
+                                       class="layui-input">
+                            </div>
+                        </div>
+
+                    </div>
+                </form>
+            </div>
+        </div>
+
+        <!-- 表单数据 -->
+        <table class="layui-hide" id="userAppList" lay-filter="userAppList"></table>
+    </div>
+</div>
+
+<script id="merchantBaseInfo" type="text/html">
+    {{# if(d.merchantType == null || d.merchantType == '') { }}
+    <span style="color: #c2c2c2">无商户信息</span>
+    {{# } else { }}
+    <div class="layui-col-md12" style="color: #1E9FFF; text-align: start;">
+        {{# if (d.merchantType == "1") { }}
+        小微
+        {{# } else if (d.merchantType == "2" ) { }}
+        个体
+        {{# } else if (d.merchantType == "3" ) { }}
+        企业
+        {{# } }}
+        &emsp;&emsp;&emsp;&emsp;
+        {{# if (d.isBlack == true) { }}
+        <span style="color: #FF5722;">已拉黑</span>
+        {{# } }}
+    </div>
+    <hr/>
+    <div class="layui-col-md12" style="color: #393D49; text-align: start;">
+        {{d.merchantCode}}
+    </div>
+    <hr/>
+    <div class="layui-col-md12" style="color: #009688; text-align: start;">
+        {{d.alias}}
+    </div>
+    {{# } }}
+</script>
+
+<script id="userBaseInfo" type="text/html">
+    <div class="layui-col-md12">
+        {{d.userId}}
+    </div>
+    <hr/>
+    <div class="layui-col-md12">
+        {{# if (d.userName == null || d.userName == '') { }}
+        -
+        {{# } else { }}
+        {{d.userName}}
+        {{# } }}
+    </div>
+    <hr/>
+    <div class="layui-col-md12">
+        {{ d.phone.substring(0, 11)}}
+    </div>
+</script>
+
+<script id="parentInfo" type="text/html">
+    {{# if(d.parentUserId == null) { }}
+    暂无上级
+    {{# } else { }}
+    <div class="layui-col-md12">
+        {{d.parentUserId}}
+    </div>
+    <hr/>
+    <div class="layui-col-md12">
+        {{# if (d.parentUserName == null || d.parentUserName == '') { }}
+        -
+        {{# } else { }}
+        {{d.parentUserName}}
+        {{# } }}
+    </div>
+    <hr/>
+    <div class="layui-col-md12">
+        {{d.parentPhone}}
+    </div>
+    {{# } }}
+</script>
+
+<script id="spreadInfo" type="text/html">
+    <div class="layui-col-md12" style="text-align: center">
+        {{# if (d.uiStatus == '-2') { }}
+            <a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="openSpread">
+                打开
+            </a>
+        {{# } else { }}
+            <a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="banSpread">
+                关闭
+            </a>
+        {{# } }}
+    </div>
+    <div class="layui-col-md12" style="text-align: center">
+        {{d.inviteNum}}
+    </div>
+</script>
+
+<script id="extensionParentUserType" type="text/html">
+    {{# if (d.parentUserType == "agent") { }}
+    <span style="color:#FF5722">超级</span>
+    {{# } else if (d.parentUserType == "agent_staff") { }}
+    <span style="color: blue">业务员</span>
+    {{# } else if (d.parentUserType == "agent_agency") { }}
+    <span style="color: green">代理</span>
+    {{# } else if (d.parentUserType == "promoter") { }}
+    <span>普通</span>
+    {{# } }}
+</script>
+
+
+<script id="extensionUserType" type="text/html">
+    {{# if (d.userType == "agent") { }}
+    <span style="color:red">超级</span>
+    {{# } else if (d.userType == "agent_staff") { }}
+    <span style="color: blue">业务员</span>
+    {{# } else if (d.userType == "agent_agency" ) { }}
+    <span style="color: green">代理</span>
+    {{# } else if (d.userType == "promoter") { }}
+    <span>普通</span>
+    {{# } }}
+</script>
+
+<script id="toolBar" type="text/html">
+    <a class="layui-btn layui-btn-sm" lay-event="search">
+        <i class="layui-icon layui-icon-search"></i>查询
+    </a>
+
+    <a class="layui-btn layui-btn-danger layui-btn-sm" lay-event="batch2Blacklist">
+        <i class="layui-icon layui-icon-close-fill"></i>批量拉黑
+    </a>
+</script>
+
+<script id="extensionStatus" type="text/html">
+    {{# if (d.status=='0') { }}
+    <span>未实名</span>
+    {{# } else if (d.status=='1') { }}
+    <span>审核中</span>
+    {{# } else if (d.status=='2') { }}
+    <span>审核失败</span>
+    {{# } else if (d.status=='3') { }}
+    <span>已审核</span>
+    {{# } }}
+</script>
+
+<script id="extensionMerchantType" type="text/html">
+    {{# if (d.merchantType == "1") { }}
+    <span>小微</span>
+    {{# } else if (d.merchantType == "2" ) { }}
+    <span>个体</span>
+    {{# } else if (d.merchantType == "3" ) { }}
+    <span>企业</span>
+    {{# } }}
+</script>
+
+<script id="extensionThirdStatus" type="text/html">
+    {{# if (d.mcsStatus == "1" && d.thirdStatus == "-100") { }}
+    <span style="color: blue">待审核</span>
+    {{# } else if (d.mcsStatus == "1" && d.thirdStatus != "-100") { }}
+    <span style="color: green">审核中</span>
+    {{# } else if ( (d.mcsStatus == "0" && d.thirdStatus == "-100") || d.mcsStatus == "2" ) { }}
+    <span style="color: red">审核驳回</span>
+    {{# } else if (d.mcsStatus == "3" ) { }}
+    {{# if (d.ppStatus == "1" && d.ppThirdStatus == "-100") { }}
+    <span style="color: blue">插件待审核</span>
+    {{# } else if (d.ppStatus == "1" && d.ppThirdStatus != "-100") { }}
+    <span style="color: green">插件审核中</span>
+    {{# } else if ( (d.ppStatus == "0" && d.ppThirdStatus == "-100") || d.ppStatus == "2" ) { }}
+    <span style="color: red">插件审核驳回</span>
+    {{# } else if (d.ppStatus == "3" ) { }}
+    <span>插件审核通过</span>
+    {{# } else if (d.ppStatus == "0" || d.ppStatus == '' || d.ppStatus == null ) { }}
+    <span>审核通过</span>
+    {{# } }}
+    {{# } else  { }}
+    <span>未进件</span>
+    {{# } }}
+</script>
+
+
+<script id="extensionThird3Status" type="text/html">
+    {{ thirdStatus('{{=d.msc3Status}}') }}
+</script>
+
+<script id="extensionThird4Status" type="text/html">
+    {{ thirdStatus('d.msc4Status') }}
+</script>
+
+<script id="lineBar2" type="text/html">
+    <div class="layui-col-md12">
+        <a href="javascript:void(0);" lay-event="sendNotice" class="layui-btn layui-btn-xs">
+            <i class="layui-icon layui-icon-release"></i>&nbsp;发送通知
+        </a>
+    </div>
+</script>
+
+<script id="lineBar" type="text/html">
+    <div style="text-align: center">
+        <div class="layui-col-md12">
+            <a href="javascript:void(0);" lay-event="detail2" class="layui-btn layui-btn-xs">
+                <i class="layui-icon layui-icon-edit"></i>&nbsp;详情
+            </a>
+        </div>
+
+        <div class="layui-col-md12">
+            <a href="javascript:void(0);" lay-event="toBlacklist" class="layui-btn layui-btn-danger layui-btn-xs">
+                <i class="layui-icon layui-icon-close-fill"></i>&nbsp;拉黑
+            </a>
+        </div>
+
+        <div class="layui-col-md12">
+            <a href="javascript:void(0);" lay-event="more" class="layui-btn layui-btn-normal layui-btn-xs">
+                更多&nbsp;<i class="layui-icon layui-icon-down"></i>
+            </a>
+        </div>
+
+        <%--        <a href="javascript:void(0);" lay-event="detail" class="layui-btn layui-btn-xs">--%>
+        <%--            <i class="layui-icon layui-icon-edit"></i>详情old--%>
+        <%--        </a>--%>
+
+
+    </div>
+</script>
+
+
+<script type="text/template" id="upgrade">
+    <form class="layui-form" id="form2" style="margin-top: 1rem;">
+        <div class="layui-form-item" style="width: 300px;">
+            <label class="layui-form-label">选择等级</label>
+            <div class="layui-input-block">
+                <select class="layui-select" id="leveCode" name="leveCode">
+
+                </select>
+            </div>
+        </div>
+    </form>
+</script>
+
+<script type="text/javascript">
+    var layer;
+    var laytpl;
+    var form;
+    var table;
+    var laydate;
+    var dropdown;
+
+    //form表单样式
+    layui.use(['table', 'layer', 'form', 'laydate', 'dropdown'], function () {
+        layer = layui.layer;
+        laytpl = layui.laytpl;
+        form = layui.form;
+        table = layui.table;
+        laydate = layui.laydate;
+        dropdown = layui.dropdown;
+        form.render();
+
+        $("#userId").bind("input propertychange", function (event) {
+            if ($("#userId").val() == null || $("#userId").val() == "") {
+                $("#sameIp").attr("disabled", true);
+                $("#sameIp").removeAttr("checked");
+                $("#sameIp").prop({checked: false});
+            } else {
+                $("#sameIp").attr("disabled", false);
+            }
+
+            form.render();
+        });
+
+        //执行一个 table 实例
+        table.render({
+            elem: '#userAppList'
+            , id: 'userAppList'
+            , url: ctx + '/promoter/queryUserAppByPage' //数据接口
+            , autoSort: false
+            , where: form.val("formCondition")
+            , response: {
+                statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.count, //解析数据长度
+                    "data": res.userAppList //解析数据列表
+                };
+            }
+            , request: {
+                pageName: 'currPage' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , even: true
+            , title: '推广员列表'
+            , page: true //开启分页
+            , toolbar: '#toolBar' //开启工具栏，此处显示默认图标，可以自定义模板，详见文档
+            , defaultToolbar: ['filter']
+            , cols: [[ //表头
+                {type: 'checkbox', minWidth: 40, rowspan: 2}
+                , {title: '用户基本信息', width: 105, align: "left", rowspan: 2, templet: '#userBaseInfo'}
+                , {field: 'levelName', title: '等级', width: 60, align: "left", rowspan: 2}
+                , {field: 'inviteNum', title: '推广码', width: 80, align: "left", rowspan: 2, templet: '#spreadInfo'}
+                , {
+                    field: 'userType',
+                    title: '用户类型',
+                    minWidth: 83,
+                    align: "left",
+                    templet: '#extensionUserType',
+                    rowspan: 2
+                }
+                , {
+                    field: 'roleCode',
+                    title: '用户标签',
+                    minWidth: 83,
+                    rowspan: 2,
+                    templet: function (d) {
+                        if (d.roleCode == "ZY_BST") {
+                            return '<span style="color: red">倍斯特</span>';
+                        } else {
+                            return '<span>-</span>';
+                        }
+                    }
+                }
+                , {
+                    field: 'status',
+                    title: '实名状态',
+                    align: "left",
+                    minWidth: 83,
+                    templet: '#extensionStatus',
+                    rowspan: 2
+                }
+                , {title: "上级", align: "center", colspan: 2}
+                , {title: '商户基本信息', minWidth: 158, align: 'center', templet: '#merchantBaseInfo', rowspan: 2}
+                , {
+                    title: '进件审核状态',
+                    align: "center",
+                    minWidth: 160,
+                    templet: '#extensionThirdStatus',
+                    rowspan: 1,
+                    colspan: 3
+                }
+                , {
+                    title: 'D1微信子商户号<hr/>支付宝子商户号',
+                    align: "center",
+                    minWidth: 130,
+                    field: "wxMercNoD1",
+                    rowspan: 2,
+                    templet: '<div>{{d.wxMercNoD1}}<hr/>{{zfbMercNoD1}}</div'
+                }
+                , {
+                    title: 'D0微信子商户号<hr/>支付宝子商户号',
+                    align: "center",
+                    minWidth: 130,
+                    field: "wxMercNoD0",
+                    rowspan: 2,
+                    templet: '<div>{{d.wxMercNoD0}}<hr/>{{zfbMercNoD0}}</div'
+                }
+
+                // , {
+                //     field: 'channel',
+                //     title: '通道',
+                //     align: "center",
+                //     minWidth: 80
+                //     , templet: function (r) {
+                //         if (r.channel == 1) {
+                //             return '随行付'
+                //         } else if (r.channel == 2) {
+                //             return '乐刷'
+                //         } else if (r.channel == 3) {
+                //             return '瑞银信'
+                //         } else if (r.channel == 3) {
+                //             return '瑞银信'
+                //         }
+                //     }
+                //     , rowspan: 1
+                // }
+                , {
+                    field: 'createDt',
+                    title: '创建时间',
+                    align: "left",
+                    minWidth: 158,
+                    rowspan: 2,
+                    templet: '<div>{{layui.util.toDateString(d.createDt,"yyyy-MM-dd HH:mm")}}</div'
+                }
+                , {fixed: 'right', title: '操作', align: "left", minWidth: 100, rowspan: 2, toolbar: '#lineBar2'}
+                , {fixed: 'right', title: '操作', minWidth: 80, align: 'center', toolbar: '#lineBar', rowspan: 2}
+                , {
+                    field: 'merchantCode',
+                    fixed: 'right',
+                    title: 'M800商编',
+                    minWidth: 180,
+                    align: 'center',
+                    rowspan: 2,
+                    hide: true
+                }
+            ],
+                [
+                    {
+                        title: '上级信息', align: "left", width: 105, rowspan: 1, templet: '#parentInfo'
+                        , style: "padding: 0;"
+                    }
+                    , {
+                    field: 'parentUserType',
+                    title: '类型',
+                    width: 65,
+                    templet: '#extensionParentUserType',
+                    align: "left"
+                    , rowspan: 1
+                }
+                    ,
+                    {
+                        field: 'mcsStatus',
+                        title: '随行付',
+                        align: "left",
+                        width: 150,
+                        rowspan: 1,
+                        templet: function (r) {
+                            return thirdStatus(r.channelStatusList, r.ppStatus, r.ppThirdStatus, 1);
+                        }
+                    }
+                    , {
+                    field: 'mcs3Status',
+                    title: '瑞银信',
+                    align: "left",
+                    width: 150,
+                    rowspan: 1,
+                    templet: function (r) {
+                        return thirdStatus(r.channelStatusList, r.ppStatus, r.ppThirdStatus, 3);
+                    }
+                }
+                    , {
+                    field: 'mcs4Status',
+                    title: '银盛',
+                    align: "left",
+                    width: 190,
+                    rowspan: 1,
+                    templet: function (r) {
+                        return thirdStatus(r.channelStatusList, r.ppStatus, r.ppThirdStatus, 4);
+                    }
+                }
+                ]
+            ],
+            done: function (index, layero) {
+                //表头部分
+                //动态监听表头高度变化，冻结行跟着改变高度
+                $(".layui-table-header  tr").resize(function () {
+                    $(".layui-table-header  tr").each(function (index, val) {
+                        $($(".layui-table-fixed .layui-table-header table tr")[index]).height(val.getBoundingClientRect().height);
+                    });
+                });
+                //初始化高度，使得冻结行表头高度一致
+                $(".layui-table-header  tr").each(function (index, val) {
+                    let initElement = $(".layui-table-fixed .layui-table-header table tr")[index]
+                    if (initElement != null) {
+                        $(initElement).height(val.getBoundingClientRect().height);
+                        $(initElement).find("th").removeAttr("style");
+                    }
+                });
+
+                //表体部分
+                //动态监听表体高度变化，冻结行跟着改变高度
+                $(".layui-table-body  tr").resize(function () {
+                    $(".layui-table-body  tr").each(function (index, val) {
+                        $($(".layui-table-fixed .layui-table-body table tr")[index]).height(val.getBoundingClientRect().height);
+                    });
+                });
+                //初始化高度，使得冻结行表体高度一致
+                $(".layui-table-body  tr").each(function (index, val) {
+                    $($(".layui-table-fixed .layui-table-body table tr")[index]).height(val.getBoundingClientRect().height);
+                });
+            }
+
+        });
+
+        table.on('toolbar(userAppList)', function (obj) {
+            switch (obj.event) {
+                case 'search':
+                    queryUserApp();
+                    break;
+                case 'batch2Blacklist':
+                    let checkStatus = table.checkStatus('userAppList');
+                    let data = checkStatus.data;
+                    if (data.length === 0) {
+                        layer.msg("至少选择一行数据");
+                        return;
+                    }
+
+                    let userIdList = [];
+                    let url = ctx + "/riskBlacklist/batchForm?";
+                    data.forEach(function (d) {
+                        userIdList.push(d.userId);
+                        url += "userId=" + d.userId + "&";
+                    })
+
+                    layer.open({
+                        type: 2,
+                        title: '加入黑名单',
+                        shadeClose: true,
+                        shade: false,
+                        maxmin: true, //开启最大化最小化按钮
+                        area: ['400px', '400px'],
+                        content: url
+                    });
+
+                    break;
+            }
+        });
+
+        //监听行工具事件
+        table.on('tool(userAppList)', function (obj) { //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            var data = obj.data //获得当前行数据
+                , that = this
+                , layEvent = obj.event; //获得 lay-event 对应的值
+
+            switch (layEvent) {
+                case 'detail':
+                    showUserAppDetails(obj.data);
+                    break;
+                case 'detail2':
+                    showUserAppDetails2(obj.data);
+                    break;
+                case 'level':
+                    goLevel(data.id, data.level);
+                    break;
+                case 'examine':
+                    toExamine(data.id);
+                    break;
+                case 'clearChannel':
+                    showClearChannelTip(obj.data);
+                    break;
+                case 'allowAudit':
+                    showAllowAuditTip(obj.data);
+                    break;
+                case 'toBlacklist':
+                    toBlacklist(data.userId);
+                    break;
+                case 'sendSignMsg':
+                    sendSignMsg(data.merchantCode);
+                    break;
+                case 'openD0':
+                    openD0(data.merchantCode);
+                    break;
+                case 'banSpread':
+                    banSpread(data.userId);
+                    break;
+                case 'openSpread':
+                    openSpread(data.userId);
+                    break;
+                case 'createAuditingData':
+                    createAuditingData(data.merchantCode);
+                    break;
+                case 'outBlack':
+                    debugger;
+                    outBlack(data);
+                    break;
+                case 'sendNotice':
+                    sendNotice(data)
+                    break;
+                case 'more':
+                    let itemData = [{
+                        title: '重进/进件银盛'
+                        , id: 'reAuditYs'
+                    }, {
+                        title: '实名审核'
+                        , id: 'examine'
+                    }, {
+                        title: '通道数据清理'
+                        , id: 'clearChannel'
+                    }, {
+                        title: '允许进件'
+                        , id: 'allowAudit'
+                    }, {
+                        title: '生成待审核数据'
+                        , id: 'createAuditingData'
+                    }];
+                    if (data.status == '3') {
+                        itemData.push({
+                            title: '升级'
+                            , id: 'level'
+                        });
+                    }
+
+                    if (data.isBlack === true) {
+                        itemData.push({
+                            title: '解除拉黑'
+                            , id: 'outBlack'
+                        });
+                    }
+
+                    dropdown.render({
+                        elem: that
+                        , show: true //外部事件触发即显示
+                        , data: itemData
+                        , className: 'site-dropdown-demo'
+                        , click: function (mData, othis) {
+                            switch (mData.id) {
+                                case 'level':
+                                    goLevel(data.id, data.level);
+                                    break;
+                                case 'examine':
+                                    toExamine(data.id);
+                                    break;
+                                case 'clearChannel':
+                                    showClearChannelTip(obj.data);
+                                    break;
+                                case 'allowAudit':
+                                    showAllowAuditTip(obj.data);
+                                    break;
+                                case 'reAuditYs':
+                                    reAuditYs(obj.data);
+                                    break;
+                                case 'outBlack':
+                                    outBlack(obj.data);
+                                    break;
+                                case 'createAuditingData':
+                                    createAuditingData(data.merchantCode);
+                                    break;
+                                case 'closeSpreadPerm':
+                                    closeSpreadPerm(data.userId);
+                                    break;
+                            }
+                        }
+                        , align: 'right' //右对齐弹出（v2.6.8 新增）
+                        , style: 'box-shadow: 1px 1px 10px rgb(0 0 0 / 12%);' //设置额外样式
+                    });
+                    break;
+            }
+        });
+    });
+
+    function sendNotice(obj) {
+        var url = ctx + '/notice/detail?userId=' + obj.userId;
+        var index = layer.open({
+            type: 2
+            , title: "通知详情"
+            , shade: 0.5
+            , maxmin: true
+            , content: url
+            , area: ['753px', '700px']
+            , end: function () {
+                time: 1000
+            }
+        });
+    }
+
+    function closeSpreadPerm(userId) {
+        layer.confirm('是否关闭' + userId + '推广权限?', {icon: 3, title: '提示'}, function (index) {
+            var url = ctx + "/userApp/closeSpreadPerm";
+
+            layer.load(2);
+            $.ajax({
+                url: url
+                , type: "POST"
+                , data: {
+                    userId: userId
+                }
+                , complete: function () {
+                    layer.closeAll('loading');
+                }
+                , success: function (d) {
+                    layer.close(index);
+                    layer.alert(d.message);
+                }
+            })
+        });
+    }
+
+    function createAuditingData(merchantCode) {
+        layer.confirm('是否生成进件审核信息?', {icon: 3, title: '提示'}, function (index) {
+            var url = ctx + "/channelStatus/createNewAuditData";
+
+            layer.load(2);
+            $.ajax({
+                url: url
+                , type: "POST"
+                , data: {
+                    merchantCode: merchantCode
+                }
+                , complete: function () {
+                    layer.closeAll('loading');
+                }
+                , success: function (d) {
+                    layer.close(index);
+                    layer.alert(d.message);
+                }
+            })
+        });
+    }
+
+    function reAuditYs(data) {
+        layer.confirm('是否(重新)进件银盛?', {icon: 3, title: '提示'}, function (index) {
+            var url = ctx + "/merchantStore/reAuditYs/" + data.merchantCode;
+
+            layer.load(2);
+            $.ajax({
+                url: url
+                , type: "POST"
+                , complete: function () {
+                    layer.closeAll('loading');
+                }
+                , success: function (d) {
+                    layer.close(index);
+                    layer.alert(d.msg);
+                }
+            })
+        });
+    }
+
+    function showAllowAuditTip(data) {
+        layer.confirm('是否允许提交进件?', {icon: 3, title: '提示'}, function (index) {
+            var url = ctx + "/merchantStore/canAudit";
+
+            $.ajax({
+                url: url,
+                type: "POST",
+                data: {
+                    userId: data.userId
+                },
+                success: function (d) {
+                    layer.alert(d.msg);
+                }
+            })
+
+            layer.close(index);
+        });
+    }
+
+    function showClearChannelTip(data) {
+        layer.confirm('是否清理进件驳回、待审核数据的通道信息?', {icon: 3, title: '提示'}, function (index) {
+            var url = ctx + "/channelStatus/clearRejectedChannel";
+
+            $.ajax({
+                url: url,
+                type: "POST",
+                data: {
+                    merchantCode: data.merchantCode
+                },
+                success: function (d) {
+                    layer.alert(d.message);
+                }
+            });
+
+            layer.close(index);
+        });
+    }
+
+    function showUserAppDetails(obj) {
+        var url = ctx + "/promoter/queryUserAppBaseInfo/" + obj.userId;
+        var index = layer.open({
+            type: 2
+            , title: "详情"
+            , shade: 0.5
+            , maxmin: true
+            , content: url
+            , area: ['100%', '95%']
+            , resize: true
+        });
+        layer.full(index);
+    }
+
+    function showUserAppDetails2(obj) {
+        var url = ctx + "/promoter/detail/" + obj.userId;
+        parent.layui.index.openTabsPage(url, obj.userId + "-详情")
+
+        // var index = layer.open({
+        //     type: 2
+        //     , title: "详情"
+        //     , shade: 0.5
+        //     , maxmin: true
+        //     , content: url
+        //     , area: ['100%', '95%']
+        // });
+        // layer.full(index);
+        //
+        // window.onresize = function () {
+        //     layer.style(index, {
+        //         width: '100%'
+        //         , height: '95%'
+        //     })
+        //     layer.full(index);
+        // }
+    }
+
+    //查询
+    function queryUserApp() {
+        console.log($("#userId").val())
+        table.reload('userAppList', {
+            page: {
+                curr: 1
+            }
+            , where: form.val("formCondition")
+        });
+    }
+
+    function thirdStatus(channelStatusList, ppStatus, ppThirdStatus, channel) {
+
+        // 结果信息
+        let result = '<div class="layui-col-md12">';
+        let flag = false;
+        let undefinedChannel;
+
+        /**
+         * forEach无法通过return中断
+         */
+        for (let i = 0; i < channelStatusList.length; i++) {
+            let item = channelStatusList[i];
+
+            if (item.channel == null) {
+                undefinedChannel = item;
+            }
+
+            if (item.channel == channel) {
+                flag = true;
+                // 只操作指定的通道信息
+                if ((item.status == "0" && item.thirdStatus == "-100") || item.status == "2") {
+                    result += '<span style="color: #FF5722;">审核驳回</span>';
+                }
+
+                if (item.status == '1' && item.thirdStatus == '-100') {
+                    result += '<span style="color: blue">待审核</span>';
+                }
+
+                if (item.status == "1" && item.thirdStatus != "-100") {
+                    if (channel == '3' && item.thirdStatus == '5') {
+                        result += '<span style="color: green">待商户签约</span>';
+                    } else {
+                        if (item.thirdStatus == '-999') {
+                            result += '<span style="color: green">后台进件中...</span>';
+                        } else {
+                            result += '<span style="color: green">审核中</span>';
+                        }
+                    }
+                }
+
+                if (item.status == "3") {
+                    result += '<span style="color: green">审核通过</span>'
+                }
+
+                if (item.status == "6") {
+                    result += '<span style="color: green">结算信息变更中</span>'
+                }
+
+                if (item.status == '8') {
+                    result += '<span style="color: green">待商户签约</span>'
+                }
+
+                if (item.status == '9') {
+                    result += '<span style="color: green">已签约, 待复审</span>'
+                }
+
+                if (item.status == "7") {
+                    result += '<span style="color: green">快付审核中</span>'
+                }
+
+                if ((item.status == "3" || item.status == "6") && channel == '3') {
+                    // 瑞银信，需要判断插件
+                    if (ppStatus == "1" && ppThirdStatus == "-100") {
+                        result += ' <span style="color: blue">插件待审核</span>';
+                    } else if (ppStatus == "1" && ppThirdStatus != "-100") {
+                        result += ' <span style="color: green">插件审核中</span>';
+                    } else if ((ppStatus == "0" && ppThirdStatus == "-100") || ppStatus == "2") {
+                        result += ' <span style="color: red">插件审核驳回</span>';
+                    } else if (ppStatus == "3") {
+                        result += ' <span style="color: green">插件审核通过</span>';
+                    } else if (ppStatus == "0" || ppStatus == '' || ppStatus == null) {
+                        result += '';
+                    } else {
+                        result += ' <span style="color: #c2c2c2;">插件未知状态</span>';
+                    }
+                }
+
+                if (item.status == '8' && channel == '4') {
+                    result += '<a class="layui-btn layui-btn-normal layui-btn-xs" style="float:right;" lay-event="sendSignMsg">' +
+                        '<i class="layui-icon layui-icon-release"></i>签约短信' +
+                        '</a>';
+                }
+
+                if (item.status == '3' && channel == '4') {
+                    result += '<a class="layui-btn layui-btn-normal layui-btn-xs" style="float:right;" lay-event="openD0">' +
+                        '<i class="layui-icon layui-icon-release"></i>开通DO' +
+                        '</a>';
+                }
+
+                if (item.merchantId != null && item.merchantId != '') {
+                    result += '</div><hr/>';
+                    result += '<div class="layui-col-md12">';
+                    result += item.merchantId;
+                }
+
+                result += '</div><hr/>';
+                result += '<div class="layui-col-md12">';
+                result += layui.util.toDateString(item.updateTime, 'yyyy-MM-dd HH:mm:ss');
+            }
+        }
+
+        if (undefinedChannel != null && !flag) {
+            if (undefinedChannel.status == '1' && undefinedChannel.thirdStatus == '-100') {
+                result += '<span style="color: blue">待审核</span>';
+                result += '</div><hr/>';
+                result += '<div class="layui-col-md12">';
+                result += layui.util.toDateString(undefinedChannel.updateTime, 'yyyy-MM-dd HH:mm:ss');
+            }
+
+            if (undefinedChannel.status == '0' && undefinedChannel.thirdStatus == '-100' || undefinedChannel.status == '2') {
+                result += '<span style="color: blue">审核驳回</span>';
+                result += '</div><hr/>';
+                result += '<div class="layui-col-md12">';
+                result += layui.util.toDateString(undefinedChannel.updateTime, 'yyyy-MM-dd HH:mm:ss');
+            }
+
+        } else if (!flag) {
+            if (channel == '3' && ppStatus != null && ppStatus != '') {
+                // 瑞银信，需要判断插件
+                if (ppStatus == "1" && ppThirdStatus == "-100") {
+                    result += ' <span style="color: blue">插件待审核</span>';
+                } else if (ppStatus == "1" && ppThirdStatus != "-100") {
+                    result += ' <span style="color: green">插件审核中</span>';
+                } else if ((ppStatus == "0" && ppThirdStatus == "-100") || ppStatus == "2") {
+                    result += '<span style="color: red">插件审核驳回</span>';
+                } else if (ppStatus == "3") {
+                    result += ' <span style="color: green">插件审核通过</span>';
+                } else if (ppStatus == "0" || ppStatus == '' || ppStatus == null) {
+                    result += '';
+                } else {
+                    result += ' <span style="color: #c2c2c2;">插件未知状态</span>';
+                }
+            } else {
+                result += '<span style="color: #c2c2c2">-</span>';
+            }
+        }
+
+        // if (mscStatus == "1" && mscStatus != "-100") {
+        //     return '<span style="color: green">审核中</span>';
+        // }
+
+        result += '</div>';
+        return result;
+    }
+
+    function toBlacklist(userId) {
+        layer.open({
+            type: 2,
+            title: '加入黑名单',
+            shadeClose: true,
+            shade: false,
+            maxmin: true, //开启最大化最小化按钮
+            area: ['400px', '400px'],
+            content: ctx + "/riskBlacklist/simpleForm?userId=" + userId
+        });
+    }
+
+    function outBlack(obj) {
+        layer.confirm('是否解除黑名单?', {icon: 3, title: '提示'}, function (index) {
+            $.ajax({
+                url: ctx + "/riskBlacklist/relieve"
+                , type: 'POST'
+                , data: {
+                    userId: obj.userId
+                }
+                , success: function (d) {
+                    layer.alert(d.message);
+
+                    if (d.code == 200) {
+                        layer.close(index);
+                    }
+                }
+            })
+        })
+    }
+
+    function sendSignMsg(merchantCode) {
+        layer.confirm('发送签约短信及通知', {icon: 3, title: '提示'}, function (index) {
+            var url = ctx + "/channelStatus/sendSignMsg";
+
+            $.ajax({
+                url: url,
+                type: "POST",
+                data: {
+                    merchantCode: merchantCode
+                },
+                success: function (d) {
+                    layer.alert(d.message);
+                    layer.close(index);
+                }
+            });
+
+
+        });
+    }
+
+    function openD0(merchantCode) {
+        layer.confirm('开通线上支付以及D0权限？', {icon: 3, title: '提示'}, function (index) {
+            var url = ctx + "/channelStatus/openOnlinePay";
+
+            $.ajax({
+                url: url,
+                type: "POST",
+                data: {
+                    merchantCode: merchantCode
+                },
+                success: function (d) {
+                    layer.alert(d.message);
+                }
+            });
+
+            layer.close(index);
+        });
+    }
+
+    function banSpread(userId) {
+        layer.confirm('是否关闭' + userId + '推广权限?', {icon: 3, title: '提示'}, function (index) {
+            var url = ctx + "/userApp/closeSpreadPerm";
+
+            layer.load(2);
+            $.ajax({
+                url: url
+                , type: "POST"
+                , data: {
+                    userId: userId
+                }
+                , complete: function () {
+                    layer.closeAll('loading');
+                }
+                , success: function (d) {
+                    layer.close(index);
+                    layer.alert(d.message);
+                }
+            })
+        });
+    }
+
+    function openSpread(userId) {
+        layer.confirm('是否打开' + userId + '推广权限?', {icon: 3, title: '提示'}, function (index) {
+            var url = ctx + "/userApp/openSpreadPerm";
+
+            layer.load(2);
+            $.ajax({
+                url: url
+                , type: "POST"
+                , data: {
+                    userId: userId
+                }
+                , complete: function () {
+                    layer.closeAll('loading');
+                }
+                , success: function (d) {
+                    layer.close(index);
+                    layer.alert(d.message);
+                }
+            })
+        });
+    }
+</script>
+</body>
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/user/userFollowList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/user/userFollowList.jsp
new file mode 100644
index 0000000..286a226
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/user/userFollowList.jsp
@@ -0,0 +1,65 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+    <style>
+    </style>
+</head>
+<body>
+<table class="layui-hide" id="mercTradeDataTab" lay-filter="tab"></table>
+
+<script>
+    layui.use(['table', 'layer'], function () {
+        let table = layui.table;
+        let layer = layui.layer;
+
+        table.render({
+            elem: '#mercTradeDataTab'
+            , url: ctx + '/user/followUpDataList'
+            , id: 'tab'
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , where: {
+                userId: '${userId}'
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            , title: '商户交易数据统计'
+            , cols: [[
+                {field: 'remark', title: '备注信息'}
+                , {
+                    field: 'createTime',
+                    title: '备注时间',
+                    templets: "<div>{{layui.util.toDateString(d.createTime,'yyyy-MM-dd HH:mm:ss')}}</div>"
+                }
+            ]]
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , page: true
+        });
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/userApp/goAisleSwitchPage.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/userApp/goAisleSwitchPage.jsp
new file mode 100644
index 0000000..2000995
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/userApp/goAisleSwitchPage.jsp
@@ -0,0 +1,158 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black">
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->
+<meta name="viewport"
+	content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+<jsp:include page="../../common.jsp" />
+<script type="text/javascript">
+	//require("userApp/userAppDetails.js");
+</script>
+<title>切换通道</title>
+</head>
+<body class="lgraybg">
+	<div class="    container-fluid animated fadeInRight col-sm-12">
+		<div class="panel-toolbar mt10 mb10 pt5 pb5 pl10 bdd whitebg">
+			<div class="buttons"></div>
+		</div>
+		<div class="tabs-container whitebg">
+			<div class="pt10 pl5 pr5">
+
+				<div class="tab-content pt30 p30">
+
+					<form class="layui-form whitebg pb10 pt10" action="" id="data_form">
+						<div class="tab-pane active">
+							<div class="panel-body">
+								<div class="wrapper wrapper-content">
+									<div class="panel-form animated fadeInRight wp60 fc"
+										id="tongdao">
+
+										<!-- <div class="layui-form-item     has-error">
+											<label class="layui-form-label">商户名称</label>
+											<div class="layui-input-block">
+												<input type="text" name="merchantName" id="merchantName"
+													readonly="readonly" lay-verify="title" autocomplete="off"
+													placeholder="请输入内容" class="layui-input" value="">
+											</div>
+										</div> -->
+										
+										<div class="layui-form-item     has-error">
+                                            <label class="layui-form-label">当前通道</label>
+                                            <div class="layui-input-block">
+                                                <input type="text" name="nowAisleSwitch" id="nowAisleSwitch"
+                                                    readonly="readonly" lay-verify="title" autocomplete="off"
+                                                    placeholder="请输入内容" class="layui-input" value="${aisleSwitchValue }">
+                                            </div>
+                                        </div>
+                                        
+										<!-- <div class="form-group">
+											<div class="layui-form-item">
+												<label class="layui-form-label">切换通道</label>
+												<div class="layui-input-block">
+													<select name="selectAisleSwitch" id="selectAisleSwitch">
+														<option value="">请选择</option>
+														<option value="0">支付宝，微信官方通道</option>
+														<option value="1">乐刷通道</option>
+													</select>
+												</div>
+											</div>
+										</div> -->
+                          <%--  <center><a href="javascript:void(0);" onclick="updateAisleSwitch()"><span>切换通道</span></a></center> --%>
+									</div>
+								</div>
+							</div>
+						</div>
+					</form>
+
+
+				</div>
+			</div>
+		</div>
+	</div>
+</body>
+<script type="text/javascript">
+	//form表单样式
+	layui.use([ 'layer', 'form' ], function() {
+		var layer = layui.layer, form = layui.form;
+		form.render();
+	});
+</script>
+<script type="text/javascript">
+$(function(){
+	//loadAisleSwitchDetail();
+})
+
+/* function loadAisleSwitchDetail(){
+	$.ajax({
+        url : ctx + "/userApp/aisleSwitchDetail",
+        type : "post",
+        success : function(res) {
+            if (res.code == '1') {
+                var userApp = res.userApp;
+                $("#merchantName").val(userApp.merchantName);
+                var aisleSwitch = userApp.aisleSwitch;
+                if(aisleSwitch=='0'){
+                    aisleSwitch="支付宝，微信官方通道";
+                }else if(aisleSwitch=='1'){
+                    aisleSwitch="乐刷通道";
+                }
+                $("#nowAisleSwitch").val(aisleSwitch);
+            } else {
+                $("#tongdao").empty();
+                var html = '';
+                html += '<center>尚未开通商户</center>';
+                $("#tongdao").append(html);
+            }
+        }
+    })
+} */
+	
+	
+	function updateAisleSwitch(){
+		var selectAisleSwitch=$("#selectAisleSwitch").val();
+		if(StringUtil.isBlank(selectAisleSwitch)){
+			layer.msg('请选择通道');
+			return;
+		}
+		
+		layer.confirm('确定切换通道吗？', {
+            btn: ['确认','取消'] //按钮
+          }, function(){
+        	  $.ajax({
+                  url:ctx+"/userApp/updateAisleSwitch",
+                  data:{
+                      "aisleSwitch":selectAisleSwitch,
+                  },
+                  dataType:"json",
+                  type:"post",
+                  success:function(res){
+                      if(res.code=='1'){
+                          layer.msg('切换成功');
+                          if(res.aisleSwitchValue==0){
+                          $("#nowAisleSwitch").val("支付宝，微信官方通道");
+                          }else if(res.aisleSwitchValue==1){
+                        	  $("#nowAisleSwitch").val("乐刷通道");
+                          }
+                      }else{
+                          layer.msg('切换失败');
+                      }
+                  }
+              })
+          }, function(){         
+              layer.closeAll();
+      });
+	}
+</script>
+</html>
+
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/userApp/showConsumptionDetails.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/userApp/showConsumptionDetails.jsp
new file mode 100644
index 0000000..9cb0517
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/userApp/showConsumptionDetails.jsp
@@ -0,0 +1,134 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+    pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black">
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->
+<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+<jsp:include page="../../common.jsp" />
+<script type="text/javascript">
+     require("userApp/userAppList.js");
+</script>
+</head>
+<body>
+    <div class="row animated fadeInRight" style="margin: 0;">
+        <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+            <div class="toolbar-panel bdd">
+                <div class="toolbar-box">
+                    <div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+                        <!-- 顶部按钮 -->
+                        <div class="buttons fl">
+                            <a class="btn btn-primary fa fa-search f13" href="javascript:void(0);" onclick="queryUserApp()"><span>搜索</span></a>
+                            <a class="btn btn-primary fa fa-plus f13 add" href="javascript:void(0);" onclick="initAddUserApp()"><span>添加</span></a>
+                            <a class="btn btn-primary fa fa-edit f13" href="javascript:void(0);" onclick="initEditUserApp()"><span>编辑</span></a> 
+                            <a class="btn btn-primary fa fa-remove f13 delete" href="javascript:void(0);" onclick="initBatchDeleteUserApp()"><span>删除</span></a> 
+                        </div>
+                        <div class="tools fr">
+                            <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5"> 
+                                <i class="fa-2x fa fa-angle-double-up"></i>
+                            </a>
+                        </div>
+                    </div>
+                </div>
+
+                <!--搜索条件 -->
+                <div class="toolbar-body">
+                    <div class="row pt10 pb10 whitebg ml0 mr0">
+                        <span class="dlblock w100 textr">ID：</span> 
+                        <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+                            <input type="text" placeholder="请输入内容" id="searchId">  
+                        </span> 
+                        <span class="dlblock w100 textr">名称：</span> 
+                        <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+                            <input type="text" placeholder="请输入名称">
+                        </span> 
+                        <span class="dlblock w100 textr">类别：</span>
+                         <select class="form-control f12 w180 textc">
+                            <option value="">支出</option>
+                            <option value="">收入</option>
+                        </select>
+                    </div>
+                    <div class="mt10 mb20">
+                        <span class="dlblock w100 textr">开始日期</span>
+                        <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+                             <input type="text" placeholder="" id="date1" class="w150">
+                             <i class="fa fa-calendar"></i>
+                        </span> 
+                        <span class="dlblock w100 textr">结束日期</span>
+                        <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+                        <input type="text" placeholder="" id="date2" class="w150"> 
+                            <i class="fa fa-calendar"></i>
+                        </span>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <!-- 表单数据 -->
+        <div class="mb20 mt10">
+            <div class="whitebg pl10 pr10">
+                <table class="table table-striped table-bordered table-hover">
+                    <thead>
+                        <tr>
+                            <th class="textc">
+                                <div class="checker" id="allCheck">
+                                    <span class=""><input type="checkbox" value="" ></span>
+                                </div>
+                            </th>
+                            <th class="textc ">id</th>
+                            <th class="textc wp15">用户名称</th>
+                            <!-- <th class="textc ">userId</th> 
+                            <th class="textc ">logo</th>-->
+                            <th class="textc ">推广等级</th>
+                            <th class="textc wp15">用户类型</th>
+                            <th class="textc ">身份证号</th>
+                            <!-- <th class="textc wp15">certFullPhoto</th>
+                            <th class="textc ">certBacKPhoto</th>
+                            <th class="textc ">handCertPhoto</th>
+                            <th class="textc ">bankName</th>
+                            <th class="textc wp15">bankAddress</th>
+                            <th class="textc ">bankBranch</th>
+                            <th class="textc ">bankNo</th>
+                            <th class="textc ">bankPhoto</th>
+                            <th class="textc wp15">merchantCode</th>
+                            <th class="textc ">fansProfit</th>
+                            <th class="textc ">extendProfit</th>
+                            <th class="textc ">cashProfit</th>
+                            <th class="textc ">staffType</th>
+                            <th class="textc ">parentId</th>
+                            <th class="textc ">inviteNum</th> -->
+                            <th class="textc ">是否实名认证</th>
+                            <th class="textc ">创建时间</th>
+                            <th class="textc">查看</th>
+                            <th class="textc">编辑</th>
+                        </tr>
+                    </thead>
+                    <!-- 数据体 -->
+                    <tbody id="data_content">
+                    </tbody>
+                </table>
+            
+            <!-- footer -->
+                <div class="clearfix mb10 pb20">
+                        <div class="layui-tab-item fr">
+                                <span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+                                <span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>
+                                <div class="pagination dlblock vm" id="pagination"></div>
+                                <span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>
+                        </div>
+                    </div>
+    
+            </div>
+        </div>
+    </div>
+</body>
+
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/userApp/showRechargeDetails.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/userApp/showRechargeDetails.jsp
new file mode 100644
index 0000000..9cb0517
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/userApp/showRechargeDetails.jsp
@@ -0,0 +1,134 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+    pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black">
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->
+<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+<jsp:include page="../../common.jsp" />
+<script type="text/javascript">
+     require("userApp/userAppList.js");
+</script>
+</head>
+<body>
+    <div class="row animated fadeInRight" style="margin: 0;">
+        <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+            <div class="toolbar-panel bdd">
+                <div class="toolbar-box">
+                    <div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+                        <!-- 顶部按钮 -->
+                        <div class="buttons fl">
+                            <a class="btn btn-primary fa fa-search f13" href="javascript:void(0);" onclick="queryUserApp()"><span>搜索</span></a>
+                            <a class="btn btn-primary fa fa-plus f13 add" href="javascript:void(0);" onclick="initAddUserApp()"><span>添加</span></a>
+                            <a class="btn btn-primary fa fa-edit f13" href="javascript:void(0);" onclick="initEditUserApp()"><span>编辑</span></a> 
+                            <a class="btn btn-primary fa fa-remove f13 delete" href="javascript:void(0);" onclick="initBatchDeleteUserApp()"><span>删除</span></a> 
+                        </div>
+                        <div class="tools fr">
+                            <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5"> 
+                                <i class="fa-2x fa fa-angle-double-up"></i>
+                            </a>
+                        </div>
+                    </div>
+                </div>
+
+                <!--搜索条件 -->
+                <div class="toolbar-body">
+                    <div class="row pt10 pb10 whitebg ml0 mr0">
+                        <span class="dlblock w100 textr">ID：</span> 
+                        <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+                            <input type="text" placeholder="请输入内容" id="searchId">  
+                        </span> 
+                        <span class="dlblock w100 textr">名称：</span> 
+                        <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+                            <input type="text" placeholder="请输入名称">
+                        </span> 
+                        <span class="dlblock w100 textr">类别：</span>
+                         <select class="form-control f12 w180 textc">
+                            <option value="">支出</option>
+                            <option value="">收入</option>
+                        </select>
+                    </div>
+                    <div class="mt10 mb20">
+                        <span class="dlblock w100 textr">开始日期</span>
+                        <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+                             <input type="text" placeholder="" id="date1" class="w150">
+                             <i class="fa fa-calendar"></i>
+                        </span> 
+                        <span class="dlblock w100 textr">结束日期</span>
+                        <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+                        <input type="text" placeholder="" id="date2" class="w150"> 
+                            <i class="fa fa-calendar"></i>
+                        </span>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <!-- 表单数据 -->
+        <div class="mb20 mt10">
+            <div class="whitebg pl10 pr10">
+                <table class="table table-striped table-bordered table-hover">
+                    <thead>
+                        <tr>
+                            <th class="textc">
+                                <div class="checker" id="allCheck">
+                                    <span class=""><input type="checkbox" value="" ></span>
+                                </div>
+                            </th>
+                            <th class="textc ">id</th>
+                            <th class="textc wp15">用户名称</th>
+                            <!-- <th class="textc ">userId</th> 
+                            <th class="textc ">logo</th>-->
+                            <th class="textc ">推广等级</th>
+                            <th class="textc wp15">用户类型</th>
+                            <th class="textc ">身份证号</th>
+                            <!-- <th class="textc wp15">certFullPhoto</th>
+                            <th class="textc ">certBacKPhoto</th>
+                            <th class="textc ">handCertPhoto</th>
+                            <th class="textc ">bankName</th>
+                            <th class="textc wp15">bankAddress</th>
+                            <th class="textc ">bankBranch</th>
+                            <th class="textc ">bankNo</th>
+                            <th class="textc ">bankPhoto</th>
+                            <th class="textc wp15">merchantCode</th>
+                            <th class="textc ">fansProfit</th>
+                            <th class="textc ">extendProfit</th>
+                            <th class="textc ">cashProfit</th>
+                            <th class="textc ">staffType</th>
+                            <th class="textc ">parentId</th>
+                            <th class="textc ">inviteNum</th> -->
+                            <th class="textc ">是否实名认证</th>
+                            <th class="textc ">创建时间</th>
+                            <th class="textc">查看</th>
+                            <th class="textc">编辑</th>
+                        </tr>
+                    </thead>
+                    <!-- 数据体 -->
+                    <tbody id="data_content">
+                    </tbody>
+                </table>
+            
+            <!-- footer -->
+                <div class="clearfix mb10 pb20">
+                        <div class="layui-tab-item fr">
+                                <span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+                                <span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>
+                                <div class="pagination dlblock vm" id="pagination"></div>
+                                <span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>
+                        </div>
+                    </div>
+    
+            </div>
+        </div>
+    </div>
+</body>
+
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/userApp/userAppBaseInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/userApp/userAppBaseInfo.jsp
new file mode 100644
index 0000000..70c19c4
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/userApp/userAppBaseInfo.jsp
@@ -0,0 +1,182 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">  
+	<div class="tab-pane active">     
+		<div class="panel-body">
+			<div class="wrapper wrapper-content">
+				<div class="panel-form animated fadeInRight wp60 fc">
+					<div class="layui-form-item dn	has-error" >   
+						<label class="layui-form-label">id</label>  
+						<div class="layui-input-block">
+							<input type="text" name="id" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${userApp.id }" >
+						</div>  
+					</div>
+					<%-- <div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">userId</label>  
+						<div class="layui-input-block">
+							<input type="text" name="userId" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${userApp.userId }" >
+						</div>  
+					</div> --%>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">logo</label>  
+						<div class="layui-input-block">
+							<input type="text" name="logo" id="logo" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${userApp.logo }" >
+						</div>  
+					</div>
+					<%-- <div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">level</label>  
+						<div class="layui-input-block">
+							<input type="text" name="level" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${userApp.level }" >
+						</div>  
+					</div> --%>
+					
+			<div class="form-group">
+                <div class="layui-form-item">          
+                    <label class="layui-form-label">用户类型</label>
+                    <div class="layui-input-block">
+                        <select name="userType" lay-filter="aihao">  
+                            <option value=""></option>
+                            <option value="merchant">商家</option>         
+                            <option value="promoter" selected="">推广人</option>
+                            <option value="staff">员工</option>
+                        </select>              
+                    </div>
+                </div>
+            </div>
+					
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">userType</label>  
+						<div class="layui-input-block">
+							<input type="text" name="userType" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${userApp.userType }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">createDt</label>  
+						<div class="layui-input-block">
+							<input type="text" name="createDt" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${userApp.createDt }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">status</label>  
+						<div class="layui-input-block">
+							<input type="text" name="status" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${userApp.status }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">certnum</label>  
+						<div class="layui-input-block">
+							<input type="text" name="certnum" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${userApp.certnum }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">certFullPhoto</label>  
+						<div class="layui-input-block">
+							<input type="text" name="certFullPhoto" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${userApp.certFullPhoto }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">certBacKPhoto</label>  
+						<div class="layui-input-block">
+							<input type="text" name="certBacKPhoto" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${userApp.certBacKPhoto }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">handCertPhoto</label>  
+						<div class="layui-input-block">
+							<input type="text" name="handCertPhoto" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${userApp.handCertPhoto }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">bankName</label>  
+						<div class="layui-input-block">
+							<input type="text" name="bankName" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${userApp.bankName }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">bankAddress</label>  
+						<div class="layui-input-block">
+							<input type="text" name="bankAddress" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${userApp.bankAddress }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">bankBranch</label>  
+						<div class="layui-input-block">
+							<input type="text" name="bankBranch" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${userApp.bankBranch }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">bankNo</label>  
+						<div class="layui-input-block">
+							<input type="text" name="bankNo" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${userApp.bankNo }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">bankPhoto</label>  
+						<div class="layui-input-block">
+							<input type="text" name="bankPhoto" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${userApp.bankPhoto }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">merchantCode</label>  
+						<div class="layui-input-block">
+							<input type="text" name="merchantCode" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${userApp.merchantCode }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">fansProfit</label>  
+						<div class="layui-input-block">
+							<input type="text" name="fansProfit" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${userApp.fansProfit }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">extendProfit</label>  
+						<div class="layui-input-block">
+							<input type="text" name="extendProfit" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${userApp.extendProfit }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">cashProfit</label>  
+						<div class="layui-input-block">
+							<input type="text" name="cashProfit" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${userApp.cashProfit }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">userName</label>  
+						<div class="layui-input-block">
+							<input type="text" name="userName" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${userApp.userName }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">staffType</label>  
+						<div class="layui-input-block">
+							<input type="text" name="staffType" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${userApp.staffType }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">parentId</label>  
+						<div class="layui-input-block">
+							<input type="text" name="parentId" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${userApp.parentId }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">inviteNum</label>  
+						<div class="layui-input-block">
+							<input type="text" name="inviteNum" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${userApp.inviteNum }" >
+						</div>  
+					</div>
+	
+				</div>
+			</div>
+		</div>  
+	</div>
+</form>
+<script type="text/javascript">
+    //form表单样式
+    layui.use(['layer', 'form'], function() {    
+        var layer = layui.layer,
+            form = layui.form;
+        form.render();
+    });
+</script> 
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/userApp/userAppDetails.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/userApp/userAppDetails.jsp
new file mode 100644
index 0000000..7038883
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/userApp/userAppDetails.jsp
@@ -0,0 +1,54 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>     
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">                      
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black"> 
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> 
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->                                     
+<meta name="viewport"
+	content="width=device-width, initial-scale=1.0, maximum-scale=1.0">   
+<jsp:include page="../../common.jsp" />
+<script type="text/javascript">
+    require("userApp/userAppDetails.js");
+</script>
+<title>编辑</title>
+</head>                                 
+	<body class="lgraybg">            
+		<div class="	container-fluid animated fadeInRight col-sm-12">
+			<div class="panel-toolbar mt10 mb10 pt5 pb5 pl10 bdd whitebg">
+				<div class="buttons">
+					<a href="javascript:void(0);" class="btn btn-primary fa fa-save f12"><span>保存</span></a>
+					<a href="${ctx }/userApp/index?pageIndex=${pageIndex}"  class="btn btn-primary fa fa-back f12" id="goback"><span>返回</span></a>
+				</div>
+			</div>
+				<div class="tabs-container whitebg">
+					<div class="pt10 pl5 pr5">
+						<ul class="nav nav-tabs" id="nav-tabs">
+							<li class="active" data-action="base">   
+								<a href="javascript:void(0);" >基本资料</a>
+							</li>
+							<!-- <li class="" data-action="functions">
+								<a href="javascript:void(0);"  >多功能输入</a>
+							</li>
+							<li class="" data-action="extends">
+								<a href="javascript:void(0);" >扩展属性</a>
+							</li> -->
+						</ul>
+						<div class="tab-content pt30 p30">               
+		
+						</div>     
+					</div>
+				</div>    
+		</div>
+		<!-- 隐藏域 -->
+		<input type="hidden" id="userAppId" value="${userApp.id }"/>
+	</body>
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/userApp/userAppExtendsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/userApp/userAppExtendsInfo.jsp
new file mode 100644
index 0000000..592687a
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/userApp/userAppExtendsInfo.jsp
@@ -0,0 +1,201 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>           
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> 
+<div class="tab-pane active">      
+	<div class="animated fadeInRight">
+		<div class="whitebg pl10 pr10">
+			<table class="table table-striped table-bordered table-hover">     
+				<thead> 
+					<tr>  
+						<th class="textc">序号</th>         
+						<th class="textc wp15">流水账号</th>
+						<th class="textc">日期</th>         
+						<th class="textc">财务类别</th>     
+						<th class="textc">金额</th>         
+						<th class="textc">银行</th>         
+						<th class="textc">发票</th>         
+						<th class="textc">客户名称</th>     
+						<th class="textc wp15">单号</th>    
+						<th class="textc">状态</th>         
+						<th class="textc">类别</th>         
+						<th class="textc">操作</th>         
+					</tr> 
+				</thead>
+				<tbody> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+                
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="green">支出</span></td>     
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+				</tbody>
+                
+			</table>  
+			<!-- footer -->  
+			<div class="clearfix mb10 pb20">          
+					<div class="layui-tab-item fr">       
+							<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+							<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>   
+							<div class="pagination dlblock vm" id="pagination"></div>
+							<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>            
+					</div>
+				</div>  
+		</div>      
+	</div>        
+</div>          
+                
+<script type="text/javascript">    
+//分页          
+$('#pagination').pagination({        
+	pageCount: 50,
+	jump: true,   
+	coping: true, 
+	homePage: '首页',    
+	endPage: '末页',     
+	prevContent: '上页', 
+	nextContent: '下页', 
+	callback: function(api) {          
+		$('.now').text(api.getCurrent());
+	}             
+});             
+</script>       
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/userApp/userAppFunctionsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/userApp/userAppFunctionsInfo.jsp
new file mode 100644
index 0000000..982ce84
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/userApp/userAppFunctionsInfo.jsp
@@ -0,0 +1,130 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>		
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">      
+<div class="tab-pane active">
+				<div class="panel-body">
+					<div class="wrapper wrapper-content">     
+						<div class="panel-form animated fadeInRight wp60 fc">
+							<!-- 账号资料 -->
+			<div class="layui-form-item 	has-error">
+				<label class="layui-form-label">单行输入框<i class="red">*</i></label>
+				<div class="layui-input-block">
+					<input type="text" name="title" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input">
+				</div>                                         
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">自定义验证</label>
+				<div class="layui-input-inline ml30">
+					<input type="password" name="password" lay-verify="pass" placeholder="请输入密码" autocomplete="off" class="layui-input">
+				</div>
+				<div class="layui-form-mid layui-word-aux">请填写6到12位密码</div>
+			</div>
+			<div class="form-group">
+				<div class="layui-form-item">          
+					<label class="layui-form-label">单行选择框</label>
+					<div class="layui-input-block">
+						<select name="interest" lay-filter="aihao">  
+							<option value=""></option>
+							<option value="0">写作</option>         
+							<option value="1" selected="">阅读</option>
+							<option value="2">游戏</option>
+							<option value="3">音乐</option>
+							<option value="4">旅行</option>  
+						</select>              
+					</div>
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<div class="layui-inline">  
+					<label class="layui-form-label">范围</label>
+					<div class="layui-input-inline ml30">
+						<input type="text" name="price_min" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>                                     
+					<div class="layui-form-mid">-</div>
+					<div class="layui-input-inline">       
+						<input type="text" name="price_max" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>
+				</div>           
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">联动选择框</label>
+				<div class="layui-input-inline ml30">
+					<select name="quiz1">     
+						<option value="">请选择省</option>
+						<option value="浙江" selected="">浙江省</option> 
+						<option value="你的工号">江西省</option>           
+						<option value="你最喜欢的老师">福建省</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz2">
+						<option value="">请选择市</option>
+						<option value="杭州">杭州</option>
+						<option value="宁波" disabled="">宁波</option>
+						<option value="温州">温州</option>
+						<option value="温州">台州</option>
+						<option value="温州">绍兴</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz3">
+						<option value="">请选择县/区</option>
+						<option value="西湖区">西湖区</option>
+						<option value="余杭区">余杭区</option>
+						<option value="拱墅区">临安市</option>
+					</select>
+				</div>    
+			</div>
+			<div class="layui-form-item" pane="">   
+				<label class="layui-form-label">原始复选框</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="like1[write]" lay-skin="primary" title="写作" checked="">  
+					<input type="checkbox" name="like1[read]" lay-skin="primary" title="阅读">
+					<input type="checkbox" name="like1[game]" lay-skin="primary" title="游戏" disabled="">
+				</div>
+			</div>
+
+			<div class="layui-form-item">
+				<label class="layui-form-label">开关-默认关</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="close" lay-skin="switch" lay-text="ON|OFF">
+				</div>
+			</div>
+			<div class="layui-form-item">  
+				<label class="layui-form-label">单选框</label>
+				<div class="layui-input-block">
+					<input type="radio" name="sex" value="男" title="男" checked="">
+					<input type="radio" name="sex" value="女" title="女">
+					<input type="radio" name="sex" value="禁" title="禁用" disabled="">
+				</div>
+			</div>
+			<!--<div class="layui-form-item layui-form-text">
+				<label class="layui-form-label">上传图片</label>
+				<div class="layui-input-block">
+					<div class="layui-upload-drag w200 h200">
+						<i class="layui-icon"></i>          
+						<p>点击上传</p>
+					</div>
+				</div>
+			</div>-->
+				<div class="layui-form-item layui-form-text">
+					<label class="layui-form-label">普通文本域</label>  
+					<div class="layui-input-block">              
+						<textarea placeholder="请输入内容" class="layui-textarea"></textarea>
+					</div>
+				</div>
+			</div>
+		</div>   
+	</div>
+</div>
+</form>   
+<script type="text/javascript">
+	//form表单样式
+	layui.use(['layer', 'form'], function() {    
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+</script>                 
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/userApp/userAppList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/userApp/userAppList.jsp
new file mode 100644
index 0000000..207b66d
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/userApp/userAppList.jsp
@@ -0,0 +1,142 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black">
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->
+<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+<jsp:include page="../../common.jsp" />
+<script type="text/javascript">
+     require("userApp/userAppList.js");
+</script>
+</head>
+<body>
+	<div class="row animated fadeInRight" style="margin: 0;">
+		<div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+			<div class="toolbar-panel bdd">
+				<div class="toolbar-box">
+					<div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+						<!-- 顶部按钮 -->
+						<div class="buttons fl">
+							<a class="btn btn-primary fa fa-search f13" href="javascript:void(0);" onclick="queryUserApp()"><span>搜索</span></a>
+							<a class="btn btn-primary fa fa-plus f13 add" href="javascript:void(0);" onclick="initAddUserApp()"><span>添加</span></a>
+							<a class="btn btn-primary fa fa-edit f13" href="javascript:void(0);" onclick="initEditUserApp()"><span>编辑</span></a> 
+							<a class="btn btn-primary fa fa-remove f13 delete" href="javascript:void(0);" onclick="initBatchDeleteUserApp()"><span>删除</span></a> 
+						</div>
+						<div class="tools fr">
+							<a href="javascript:void(0);" class="collapse dblock f14 dgray mr5"> 
+								<i class="fa-2x fa fa-angle-double-up"></i>
+							</a>
+						</div>
+					</div>
+				</div>
+
+				<!--搜索条件 -->
+				<div class="toolbar-body">
+					<div class="row pt10 pb10  whitebg ml0 mr0">
+						<span class="dlblock w100 textr">ID：</span> 
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+							<input type="text" placeholder="请输入内容" id="searchId">  
+						</span> 
+						<span class="dlblock w100 textr">名称：</span> 
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+							<input type="text" placeholder="请输入名称">
+						</span> 
+						
+						<span class="dlblock w100 textr">类别：</span>
+						 <select class="form-control f12 w180 textc">
+							<option value="">支出</option>
+							<option value="">收入</option>
+						</select>
+					</div>
+					<div class="mt10 dn mb20">
+						<span class="dlblock w100 textr">开始日期</span>
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+							 <input type="text" placeholder="" id="date1" class="w150">
+							 <i class="fa fa-calendar"></i>
+						</span> 
+						<span class="dlblock w100 textr">结束日期</span>
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+						<input type="text" placeholder="" id="date2" class="w150"> 
+							<i class="fa fa-calendar"></i>
+						</span>
+					</div>
+				</div>
+			</div>
+		</div>
+		<!-- 表单数据 -->
+		<div class="mb20 mt10">
+			<div class="whitebg pl10 pr10">
+				<table class="table table-striped table-bordered table-hover">
+					<thead>
+						<tr>
+							<th class="textc">
+								<div class="checker" id="allCheck">
+									<span class=""><input type="checkbox" value="" ></span>
+								</div>
+							</th>
+							<th class="textc ">id</th>
+							<th class="textc wp15">用户名称</th>
+							<!-- <th class="textc ">userId</th> 
+							<th class="textc ">logo</th>-->
+							<th class="textc ">推广等级</th>
+							<th class="textc wp15">用户类型</th>
+							<th class="textc ">身份证号</th>
+							<!-- <th class="textc wp15">certFullPhoto</th>
+							<th class="textc ">certBacKPhoto</th>
+							<th class="textc ">handCertPhoto</th>
+							<th class="textc ">bankName</th>
+							<th class="textc wp15">bankAddress</th>
+							<th class="textc ">bankBranch</th>
+							<th class="textc ">bankNo</th>
+							<th class="textc ">bankPhoto</th>
+							<th class="textc wp15">merchantCode</th>
+							<th class="textc ">fansProfit</th>
+							<th class="textc ">extendProfit</th>
+							<th class="textc ">cashProfit</th>
+							<th class="textc ">staffType</th>
+							<th class="textc ">parentId</th>
+							<th class="textc ">inviteNum</th> -->
+							<th class="textc ">是否实名认证</th>
+							<th class="textc ">创建时间</th>
+							<th class="textc">查看</th>
+							<th class="textc">编辑</th>
+						</tr>
+					</thead>
+					<!-- 数据体 -->
+					<tbody id="data_content">
+					</tbody>
+				</table>
+			
+			<!-- footer -->
+				<div class="clearfix mb10 pb20">
+						<div class="layui-tab-item fr">
+								<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+								<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>
+								<div class="pagination dlblock vm" id="pagination"></div>
+								<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>
+						</div>
+					</div>
+					
+					<div class="row pt10 pb10 dn  whitebg ml0 mr0">
+                        <span class="dlblock w100 textr">userType：</span> 
+                        <span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+                            <input type="text" value="${userType }"  placeholder="请输入内容" id="userType">  
+                        </span> 
+                    </div>
+	
+			</div>
+		</div>
+	</div>
+</body>
+
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/userIntegral/detail.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/userIntegral/detail.jsp
new file mode 100644
index 0000000..57ef246
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/userIntegral/detail.jsp
@@ -0,0 +1,136 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp" />
+    <style>
+        .layui-input,.layui-textarea{
+            border-color:#606060;
+        }
+    </style>
+</head>
+<body>
+<form class="layui-form" action="" style="width: 70%;margin-top: 1rem">
+    <input name="id" value="${entity.id}" hidden/>
+     <div class="layui-form-item">
+        <label class="layui-form-label">用户ID</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="userId" type="number" value="${entity.userId}" lay-verify="required" autocomplete="off" placeholder="请输入用户ID" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">积分类型</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <select name="type" class="layui-select" lay-verify="required">
+                    <option value="">请选择</option>
+                    <option value="1">交易积分</option>
+                    <option value="2">活动积分</option>
+                    <option value="3">任务积分</option>
+                    <option value="4">签到积分</option>
+                </select>
+            </div>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">积分来源</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <select name="source" class="layui-select" lay-verify="required">
+                    <option value="">请选择</option>
+                    <option value="1">交易订单</option>
+                    <option value="2">云音箱</option>
+                    <option value="3">任务奖励</option>
+                    <option value="4">签到打卡</option>
+                    <option value="5">扫码王</option>
+                </select>
+            </div>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">积分</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="integral" type="number" value="${entity.integral}" lay-verify="required|price" autocomplete="off"  placeholder="请输入积分" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">订单号</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input name="orderNumber" value="${entity.orderNumber}" autocomplete="off" placeholder="请输入订单号" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">订单金额</label>
+        <div class="layui-input-block" style="margin-left:0px">
+            <div class="layui-input-block">
+                <input type="number" name="orderAmt" value="${entity.orderAmt}" autocomplete="off" placeholder="请输入订单金额" class="layui-input"/>
+            </div>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button class="layui-btn" lay-submit lay-filter="formDemo">立即提交</button>
+            <button type="button" id="close" class="layui-btn layui-btn-primary">关闭</button>
+        </div>
+    </div>
+</form>
+
+<script>
+    //Demo
+    layui.use(['form','layer'], function(){
+        var form = layui.form;
+        var layer = layui.layer;
+        $('#close').click(function() {
+            parent.layer.closeAll();
+        });
+
+        form.verify({
+            price: [
+                /((^[1-9]\d*)|^0)(\.\d{1,2}){0,1}$/
+                ,'请填入正确的金额'
+            ]
+        });
+            //监听提交
+        form.on('submit(formDemo)', function(data){
+            var index = layer.load(1,{shade: [0.1,'#000'] });
+            $.ajax({
+                url: '${ctx}/userIntegral/saveOrUpdate',
+                method: 'post',
+                data: data.field,
+                dataType: 'JSON',
+                success: function(res) {
+                    layer.close(index);
+                    if(res.code == 200) {
+                        layer.msg(res.message, { icon: 1, time: 1000 }, function () {
+                            var index = parent.layer.getFrameIndex(window.name);
+                            parent.layui.table.reload('userIntegral');
+                            parent.layer.close(index);
+                        });
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 2
+                        });
+                    }
+                }
+            })
+            return false;
+        });
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/userIntegral/list.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/userIntegral/list.jsp
new file mode 100644
index 0000000..d19eef8
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/userIntegral/list.jsp
@@ -0,0 +1,255 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp" />
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" action="" id="form1" style="margin-top: 10px">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">用户ID</label>
+                            <div class="layui-input-block">
+                                <input type="number" name="userId" id="userId" placeholder="用户ID" autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">订单号</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="orderNumber" id="orderNumber" placeholder="订单号" autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">类型</label>
+                            <div class="layui-input-block">
+                                <select name="type" id="type" class="layui-select">
+                                    <option value="">请选择</option>
+                                    <option value="1">交易积分</option>
+                                    <option value="2">活动积分</option>
+                                    <option value="3">任务积分</option>
+                                    <option value="4">签到积分</option>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">状态</label>
+                            <div class="layui-input-block">
+                                <select name="status" id="status" class="layui-select">
+                                    <option value="">请选择</option>
+                                    <option value="1">正常</option>
+                                    <option value="-1">过期</option>
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <!-- 表单数据 -->
+    <div class="mb50 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-hide" id="userIntegral" lay-filter="userIntegral"></table>
+        </div>
+    </div>
+</div>
+
+<script type="text/html" id="leftBar">
+    <button type="button" class="layui-btn layui-btn-sm" lay-event="add"><i class="layui-icon">&#xe608;</i>新增</button>
+    <button type="button" class="layui-btn layui-btn-normal layui-btn-sm" lay-event="search"><i class="layui-icon">&#xe615;</i>查询</button>
+</script>
+
+<script type="text/html" id="toolBar">
+    <button type="button" class="layui-btn layui-btn-xs layui-btn-danger" lay-event="del"><i class="layui-icon">&#xe640;</i>删除</button>
+</script>
+
+<script>
+    layui.use(['table', 'layer'], function(){
+        var table = layui.table;
+        var layer = layui.layer;
+
+        var tableIns = table.render({
+            elem: '#userIntegral'
+            ,url:'${ctx}/userIntegral/page'
+            ,id: 'userIntegral'
+            ,response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                ,countName: 'count' //数据总数的字段名称，默认：count
+                ,dataName: 'data' //默数据列表的字段名称，认：data
+                ,statusCode : 200
+            }
+            ,parseData: function(res){ //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            ,toolbar: '#leftBar' //开启头部工具栏，并为其绑定左侧模板
+            , defaultToolbar: ['filter']
+            ,defaultToolbar: ['filter', 'exports', 'print', { //自定义头部工具栏右侧图标。如无需自定义，去除该参数即可
+                title: '提示'
+                ,layEvent: 'LAYTABLE_TIPS'
+                ,icon: 'layui-icon-tips'
+            }]
+            ,title: '用户积分记录表'
+            ,cols: [[
+                {type: 'checkbox', fixed: 'left', hidden: true}
+                ,{field:'numbers', title:'序号', fixed: 'left', unresize: true, width:80, type:'numbers'}
+                ,{field:'userId', title:'用户ID'}
+                ,{field:'orderNumber', title:'订单号',templet:function (d){
+                        if(!d.orderNumber){
+                            return '-';
+                        }
+                        return d.orderNumber;
+                    }}
+                ,{field:'orderAmt', title:'订单金额',templet:function (d){
+                        if(!d.orderAmt){
+                            return "-";
+                        }
+                        return d.orderAmt.toFixed(2);
+                    }}
+                ,{field:'type', title:'积分类型',templet: function (d) {
+                    if(d.type === '1'){
+                        return "交易积分"
+                    }else if(d.type === '2'){
+                        return "活动积分"
+                    }else if(d.type === '3'){
+                        return "任务积分"
+                    }else if(d.source === '4'){
+                        return "签到积分"
+                    }
+                 }}
+                ,{field:'source', title:'积分来源',templet: function (d) {
+                        if(d.source === '1'){
+                            return "交易订单"
+                        }else if(d.source === '2'){
+                            return "云音箱"
+                        }else if(d.source === '3'){
+                            return "完成任务"
+                        }else if(d.source === '4'){
+                            return "签到打卡"
+                        }else if(d.source === '5'){
+                            return "扫码王"
+                        }
+                    }}
+                ,{field:'integral', title:'积分',templet:function (d){
+                    return '<span style="color: green"> +'+d.integral+'</span>';
+                }}
+                ,{field:'status', title:'状态',templet: function (d) {
+                        if(d.status === 1){
+                            return '<span style="color:green;">正常</span>'
+                        }else if(d.status === -1){
+                            return '<span style="color:green;">过期</span>'
+                        }
+                    }}
+                ,{field:'remark', title:'备注'}
+                ,{field: 'createTime', title: '发放时间', width: 160,templet : "<div>{{layui.util.toDateString(d.createTime,'yyyy-MM-dd HH:mm')}}</div>"}
+                ,{fixed: 'right', title:'操作',width:200, toolbar: '#toolBar'}
+            ]]
+            ,request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                ,limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            ,page: true
+        });
+        table.on('tool(userIntegral)', function(obj){ //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            var data = obj.data; //获得当前行数据
+            var layEvent = obj.event; //获得 lay-event 对应的值（也可以是表头的 event 参数对应的值）
+            if(layEvent === 'del'){ //删除
+                layer.confirm('真的删除么?',{icon:3},function(index){
+                    obj.del(); //删除对应行（tr）的DOM结构，并更新缓存
+                    layer.close(index);
+                    del(data);
+                    //向服务端发送删除指令
+                });
+            }
+        });
+
+        //监听头工具栏事件
+        table.on('toolbar(userIntegral)', function (obj) {
+            switch (obj.event) {
+                case 'add':
+                    // 添加
+                    toAdd();
+                    break;
+                case 'search':
+                    var params = serialize($('#form1'));
+                    table.reload('userIntegral', {
+                        where: params
+                        , page: {
+                            size: 10
+                            , current: 1
+                        }
+                    });
+                    break;
+            }
+        });
+        function toAdd(obj) {
+            var url = '${ctx}/userIntegral/detail';
+            var title = "新增";
+            if(obj != undefined){
+                url = "${ctx}/userIntegral/detail/"+obj.id;
+                title = "编辑"
+            }
+            var index = layer.open({
+                type: 2
+                ,shade: 0.5
+                ,title: title
+                ,maxmin: true
+                , content: url
+                , area: ['500px', '520px']
+            });
+        }
+        function del(obj) {
+            $.ajax({
+                url: '${ctx}/userIntegral/del/'+obj.id,
+                method: 'DELETE',
+                dataType: 'JSON',
+                contentType:"application/json",
+                success: function(res) {
+                    if(res.code == 200) {
+                        layer.msg(res.data, {
+                            icon: 1
+                        });
+                    } else {
+                        layer.msg(res.data, {
+                            icon: 2
+                        });
+                    }
+                }
+            })
+        }
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/userLevel/detail.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/userLevel/detail.jsp
new file mode 100644
index 0000000..feb6494
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/userLevel/detail.jsp
@@ -0,0 +1,182 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp" />
+    <style>
+        .layui-form-item{
+            margin-top: 10px;
+        }
+        .layui-form{
+            width: 70%;
+            margin-left: 10%;
+        }
+    </style>
+</head>
+<body>
+<form class="layui-form" action="">
+    <input name="id" value="${entity.id}" hidden/>
+    <div class="layui-form-item">
+        <label class="layui-form-label">等级名称</label>
+        <div class="layui-input-block">
+            <input name="levelName" value="${entity.levelName}" autocomplete="off" maxlength="10"  placeholder="等级名称" class="layui-input" lay-verify="required"/>
+        </div>
+    </div>
+     <div class="layui-form-item">
+        <label class="layui-form-label">等级Code</label>
+        <div class="layui-input-block">
+            <input name="levelCode" value="${entity.levelCode}" autocomplete="off" maxlength="20" placeholder="请输入等级Code" class="layui-input" lay-verify="required" />
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label" >所属角色</label>
+        <div class="layui-input-block">
+            <select class="layui-select" name="roleCode" autocomplete="off" lay-filter="roleCode" lay-verify="required">
+                <option value="">请选择</option>
+                <c:forEach items="${roleList}" var="role">
+                    <option value="${role.roleCode}" ${role.roleCode == entity.roleCode ? 'selected' : ''}>${role.roleName}</option>
+                </c:forEach>
+            </select>
+        </div>
+    </div>
+    <div class="layui-form-item  ${empty entity or entity.roleCode eq 'ZY_BST' ? 'layui-hide' : ''  } SV2 dynamic">
+        <label class="layui-form-label" >结算费率</label>
+        <div class="layui-input-block">
+            <input name="rate" type="number" value="${entity.rate}" autocomplete="off"  placeholder="结算费率，32表示万分之32" class="layui-input" />
+        </div>
+    </div>
+
+    <div class="layui-form-item ${empty entity or entity.roleCode eq 'ZY_BST' ? 'layui-hide' : ''  } SV2 dynamic">
+        <label class="layui-form-label" >升级额度</label>
+        <div class="layui-input-block">
+            <input name="quota" type="number" value="${entity.quota}" autocomplete="off" maxlength="15" placeholder="请输入升级额度" class="layui-input" />
+        </div>
+    </div>
+
+    <div class="layui-form-item ${empty entity or entity.roleCode eq 'SV2' ? 'layui-hide' : ''  } ZY_BST dynamic">
+        <label class="layui-form-label" >直推收益</label>
+        <div class="layui-input-block">
+            <input name="directRate" type="number" value="${entity.directRate}" autocomplete="off" maxlength="15" placeholder="如万6,则输入6,最多1位小数" class="layui-input" />
+        </div>
+    </div>
+
+    <div class="layui-form-item ${empty entity or entity.roleCode eq 'SV2' ? 'layui-hide' : ''  } ZY_BST dynamic">
+        <label class="layui-form-label" >间推收益</label>
+        <div class="layui-input-block">
+            <input name="indirectRate" type="number" value="${entity.indirectRate}" autocomplete="off" maxlength="15" placeholder="如万3,则输入3,最多1位小数" class="layui-input" />
+        </div>
+    </div>
+
+    <div class="layui-form-item ${empty entity or entity.roleCode eq 'SV2' ? 'layui-hide' : ''  } ZY_BST dynamic">
+        <label class="layui-form-label" >T2收益</label>
+        <div class="layui-input-block">
+            <input name="t2Scale" type="number" value="${entity.t2Scale}" autocomplete="off" maxlength="15" placeholder="T2收益，输入0.3则表示30%" class="layui-input" />
+        </div>
+    </div>
+
+    <div class="layui-form-item ${empty entity or entity.roleCode eq 'SV2' ? 'layui-hide' : ''  } ZY_BST dynamic">
+        <label class="layui-form-label" >T3收益</label>
+        <div class="layui-input-block">
+            <input name="t3Scale" type="number" value="${entity.t3Scale}" autocomplete="off" maxlength="15" placeholder="T3收益，输入0.2则表示20%" class="layui-input" />
+        </div>
+    </div>
+
+    <div class="layui-form-item ${empty entity or entity.roleCode eq 'SV2' ? 'layui-hide' : ''  } ZY_BST dynamic">
+        <label class="layui-form-label" >分红收益(%)</label>
+        <div class="layui-input-block">
+            <input name="dividScale" type="number" value="${entity.dividScale}" autocomplete="off" maxlength="15" placeholder="分红收益，输入0.2则表示20%" class="layui-input" />
+        </div>
+    </div>
+
+    <div class="layui-form-item ${empty entity or entity.roleCode eq 'SV2' ? 'layui-hide' : ''  } ZY_BST dynamic">
+        <label class="layui-form-label" >区域收益(%)</label>
+        <div class="layui-input-block">
+            <input name="areaScale" type="number" value="${entity.areaScale}" autocomplete="off" maxlength="15" placeholder="区域收益，输入0.2则表示20%" class="layui-input" />
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button class="layui-btn" lay-submit lay-filter="formDemo">立即提交</button>
+            <button type="button" id="close" class="layui-btn layui-btn-primary">关闭</button>
+        </div>
+    </div>
+</form>
+
+<script>
+    layui.use(['form','layer'], function(){
+        var form = layui.form;
+        var layer = layui.layer;
+        $('#close').click(function() {
+            parent.layer.closeAll();
+        });
+            //监听提交
+        form.on('submit(formDemo)', function(data){
+            var index = layer.load(1,{shade: [0.1,'#000'] });
+            $.ajax({
+                url: '${ctx}/userLevel/save',
+                method: 'post',
+                data: JSON.stringify(data.field),
+                dataType: 'JSON',
+                contentType:"application/json",
+                success: function(res) {
+                    layer.close(index);
+                    if(res.code == 200) {
+                        layer.msg(res.message, { icon: 1, time: 1000 }, function () {
+                            var index = parent.layer.getFrameIndex(window.name);
+                            parent.layui.table.reload('userRole');
+                            parent.layer.close(index);
+                        });
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 2
+                        });
+                    }
+                }
+            })
+            return false;
+        });
+
+        form.on('select(roleCode)', function(data){
+            let value = data.value;
+            $(".dynamic").each(function (){
+                $(this).addClass("layui-hide");
+            })
+            $("."+value).removeClass("layui-hide");
+            if(value == "SV2"){
+                operaSv2Required("add");
+                operaBstRequired("remove")
+            }else if(value == "ZY_BST"){
+                operaBstRequired("add");
+                operaSv2Required("remove");
+            }
+        })
+        function operaBstRequired(type){
+            if(type == "add"){
+                $("input[name='directRate']").attr("lay-verify","required");
+                $("input[name='indirectRate']").attr("lay-verify","required");
+            }else{
+                $("input[name='directRate']").removeAttr("lay-verify");
+                $("input[name='indirectRate']").removeAttr("lay-verify");
+            }
+        }
+        function operaSv2Required(type){
+            if(type == "add"){
+                $("input[name='rate']").attr("lay-verify","required");
+            }else{
+                $("input[name='rate']").removeAttr("lay-verify");
+            }
+        }
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/userLevel/list.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/userLevel/list.jsp
new file mode 100644
index 0000000..9802bbf
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/userLevel/list.jsp
@@ -0,0 +1,244 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" id="form1" action="" style="margin-top: 10px;">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">等级名称</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="levelName" id="levelName" placeholder="请输入等级名称"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <div class="mb50 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-hide" id="userLevelTab" lay-filter="userLevelTab"></table>
+        </div>
+    </div>
+</div>
+<script type="text/html" id="leftBar">
+    <a class="layui-btn layui-btn-sm layui-btn-normal" lay-event="add">
+        <i class="layui-icon layui-icon-add-1"></i>新增
+    </a>
+    <a class="layui-btn layui-btn-sm" lay-event="search">
+        <i class="layui-icon layui-icon-search"></i>查询
+    </a>
+</script>
+
+<script type="text/html" id="toolBar">
+    <a class="layui-btn layui-btn-xs" lay-event="edit">
+        <i class="layui-icon layui-icon-edit"></i>编辑
+    </a>
+    <a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="del">
+        <i class="layui-icon layui-icon-delete"></i>删除
+    </a>
+</script>
+
+<script>
+    layui.use(['table', 'layer'], function () {
+        var table = layui.table;
+        var layer = layui.layer;
+
+        var tableIns = table.render({
+            elem: '#userLevelTab'
+            , url: '${ctx}/userLevel/page'
+            , id: 'userRole'
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            , toolbar: '#leftBar' //开启头部工具栏，并为其绑定左侧模板
+            , defaultToolbar: ['filter']
+            , defaultToolbar: ['filter', 'exports', 'print', { //自定义头部工具栏右侧图标。如无需自定义，去除该参数即可
+                title: '提示'
+                , layEvent: 'LAYTABLE_TIPS'
+                , icon: 'layui-icon-tips'
+            }]
+            , title: '用户等级信息表'
+            , cols: [[
+                {type: 'checkbox', fixed: 'left', hidden: true}
+                , {field: 'numbers', title: '序号', fixed: 'left', unresize: true, width: 80, type: 'numbers'}
+                , {field: 'levelName', title: '等级名称'}
+                , {field: 'levelCode', title: '等级Code'}
+                , {field: 'roleCode', title: '所属角色'}
+                , {field: 'rate', title: '结算费率(%)',templet: function (d){
+                    if(d.rate){
+                       return (d.rate/100).toFixed(2);
+                    }
+                    return "-";
+                  }}
+                , {field: 'quota', title: '升级额度(元)'}
+                , {field: 'directRate', title: '直推收益(%)',templet: function (d){
+                        if(d.directRate){
+                            return (d.directRate/100).toFixed(2);
+                        }
+                        return "-";
+                    }}
+                , {field: 'indirectRate', title: '间推收益(%)',templet: function (d){
+                        if(d.indirectRate){
+                            return (d.indirectRate/100).toFixed(2);
+                        }
+                        return "-";
+                    }}
+                , {field: 't2Scale', title: 'T2比例',templet: function (d){
+                        if(d.t2Scale){
+                            return d.t2Scale;
+                        }
+                        return "-";
+                    }}
+                , {field: 't3Scale', title: 'T3比例',templet: function (d){
+                        if(d.t3Scale){
+                            return d.t3Scale;
+                        }
+                        return "-";
+                    }}
+                , {field: 'dividScale', title: '分红收益(%)',templet: function (d){
+                        if(d.dividScale){
+                            return (d.dividScale/100).toFixed(2);
+                        }
+                        return "-";
+                    }}
+                , {field: 'areadScale', title: '区域收益(%)',templet: function (d){
+                        if(d.areadScale){
+                            return (d.areadScale/100).toFixed(2);
+                        }
+                        return "-";
+                    }}
+                , {
+                    field: 'createTime',
+                    title: '创建时间',
+                    templet: "<div>{{layui.util.toDateString(d.createTime,'yyyy-MM-dd')}}</div>"
+                }
+                , {fixed: 'right', title: '操作', width: 160, toolbar: '#toolBar'}
+            ]]
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , page: true
+        });
+        table.on('tool(userLevelTab)', function (obj) { //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            var data = obj.data; //获得当前行数据
+            var layEvent = obj.event; //获得 lay-event 对应的值（也可以是表头的 event 参数对应的值）
+            if (layEvent === 'del') { //删除
+                layer.confirm('真的删除么?', {icon: 3}, function (index) {
+                    obj.del(); //删除对应行（tr）的DOM结构，并更新缓存
+                    layer.close(index);
+                    del(data);
+                    //向服务端发送删除指令
+                });
+            } else if (layEvent === 'edit') { //编辑
+                //do something
+                toAdd(obj.data);
+                //同步更新缓存对应的值
+                // obj.update({
+                //     username: '123'
+                //     ,title: 'xxx'
+                // });
+            }
+        });
+
+        //监听头工具栏事件
+        table.on('toolbar(userLevelTab)', function (obj) {
+            switch (obj.event) {
+                case 'add':
+                    // 添加
+                    toAdd();
+                    break;
+                case 'search':
+                    var params = serialize($('#form1'));
+                    table.reload('userLevel', {
+                        where: params
+                        , page: {
+                            size: 10
+                            , current: 1
+                        }
+                    });
+                    break;
+            }
+        });
+
+        function toAdd(obj) {
+            var url = '${ctx}/userLevel/detail';
+            var title = "新增";
+            if (obj != undefined) {
+                url = "${ctx}/userLevel/detail/" + obj.id;
+                title = "编辑"
+            }
+            var index = layer.open({
+                type: 2
+                , shade: 0.5
+                , title: title
+                , maxmin: true
+                , content: url
+                , area: ['500px', '620px']
+                , end: function () {
+
+                }
+            });
+        }
+
+        function del(obj) {
+            $.ajax({
+                url: '${ctx}/userLevel/del/' + obj.id,
+                method: 'DELETE',
+                dataType: 'JSON',
+                contentType: "application/json",
+                success: function (res) {
+                    layer.msg(res.message, {
+                        icon: res.code == 200 ? 1: 2
+                    });
+                }
+            })
+        }
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/userOrgan/userOrganBaseInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/userOrgan/userOrganBaseInfo.jsp
new file mode 100644
index 0000000..ff22e6b
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/userOrgan/userOrganBaseInfo.jsp
@@ -0,0 +1,51 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">  
+	<div class="tab-pane active">     
+		<div class="panel-body">
+			<div class="wrapper wrapper-content">
+				<div class="panel-form animated fadeInRight wp60 fc">
+					<div class="layui-form-item dn	has-error" >   
+						<label class="layui-form-label">id</label>  
+						<div class="layui-input-block">
+							<input type="text" name="id" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${userOrgan.id }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">userId</label>  
+						<div class="layui-input-block">
+							<input type="text" name="userId" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${userOrgan.userId }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">organCode</label>  
+						<div class="layui-input-block">
+							<input type="text" name="organCode" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${userOrgan.organCode }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">organName</label>  
+						<div class="layui-input-block">
+							<input type="text" name="organName" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${userOrgan.organName }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">organTypeCode</label>  
+						<div class="layui-input-block">
+							<input type="text" name="organTypeCode" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${userOrgan.organTypeCode }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">organTypeName</label>  
+						<div class="layui-input-block">
+							<input type="text" name="organTypeName" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${userOrgan.organTypeName }" >
+						</div>  
+					</div>
+	
+				</div>
+			</div>
+		</div>  
+	</div>
+</form>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/userOrgan/userOrganDetails.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/userOrgan/userOrganDetails.jsp
new file mode 100644
index 0000000..38a0ac1
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/userOrgan/userOrganDetails.jsp
@@ -0,0 +1,54 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>     
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">                      
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black"> 
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> 
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->                                     
+<meta name="viewport"
+	content="width=device-width, initial-scale=1.0, maximum-scale=1.0">   
+<jsp:include page="../../common.jsp" />
+<script type="text/javascript">
+    require("js/userOrgan/userOrganDetails.js");
+</script>
+<title>编辑</title>
+</head>                                 
+	<body class="lgraybg">            
+		<div class="	container-fluid animated fadeInRight col-sm-12">
+			<div class="panel-toolbar mt10 mb10 pt5 pb5 pl10 bdd whitebg">
+				<div class="buttons">
+					<a href="javascript:void(0);" class="btn btn-primary fa fa-save f12"><span>保存</span></a>
+					<a href="${ctx }/userOrgan/index?pageIndex=${pageIndex}"  class="btn btn-primary fa fa-back f12" id="goback"><span>返回</span></a>
+				</div>
+			</div>
+				<div class="tabs-container whitebg">
+					<div class="pt10 pl5 pr5">
+						<ul class="nav nav-tabs" id="nav-tabs">
+							<li class="active" data-action="base">   
+								<a href="javascript:void(0);" >基本资料</a>
+							</li>
+							<li class="" data-action="functions">
+								<a href="javascript:void(0);"  >多功能输入</a>
+							</li>
+							<li class="" data-action="extends">
+								<a href="javascript:void(0);" >扩展属性</a>
+							</li>
+						</ul>
+						<div class="tab-content pt30 p30">               
+		
+						</div>     
+					</div>
+				</div>    
+		</div>
+		<!-- 隐藏域 -->
+		<input type="hidden" id="userOrganId" value="${userOrgan.id }"/>
+	</body>
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/userOrgan/userOrganExtendsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/userOrgan/userOrganExtendsInfo.jsp
new file mode 100644
index 0000000..592687a
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/userOrgan/userOrganExtendsInfo.jsp
@@ -0,0 +1,201 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>           
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> 
+<div class="tab-pane active">      
+	<div class="animated fadeInRight">
+		<div class="whitebg pl10 pr10">
+			<table class="table table-striped table-bordered table-hover">     
+				<thead> 
+					<tr>  
+						<th class="textc">序号</th>         
+						<th class="textc wp15">流水账号</th>
+						<th class="textc">日期</th>         
+						<th class="textc">财务类别</th>     
+						<th class="textc">金额</th>         
+						<th class="textc">银行</th>         
+						<th class="textc">发票</th>         
+						<th class="textc">客户名称</th>     
+						<th class="textc wp15">单号</th>    
+						<th class="textc">状态</th>         
+						<th class="textc">类别</th>         
+						<th class="textc">操作</th>         
+					</tr> 
+				</thead>
+				<tbody> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+                
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="green">支出</span></td>     
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+				</tbody>
+                
+			</table>  
+			<!-- footer -->  
+			<div class="clearfix mb10 pb20">          
+					<div class="layui-tab-item fr">       
+							<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+							<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>   
+							<div class="pagination dlblock vm" id="pagination"></div>
+							<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>            
+					</div>
+				</div>  
+		</div>      
+	</div>        
+</div>          
+                
+<script type="text/javascript">    
+//分页          
+$('#pagination').pagination({        
+	pageCount: 50,
+	jump: true,   
+	coping: true, 
+	homePage: '首页',    
+	endPage: '末页',     
+	prevContent: '上页', 
+	nextContent: '下页', 
+	callback: function(api) {          
+		$('.now').text(api.getCurrent());
+	}             
+});             
+</script>       
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/userOrgan/userOrganFunctionsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/userOrgan/userOrganFunctionsInfo.jsp
new file mode 100644
index 0000000..982ce84
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/userOrgan/userOrganFunctionsInfo.jsp
@@ -0,0 +1,130 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>		
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">      
+<div class="tab-pane active">
+				<div class="panel-body">
+					<div class="wrapper wrapper-content">     
+						<div class="panel-form animated fadeInRight wp60 fc">
+							<!-- 账号资料 -->
+			<div class="layui-form-item 	has-error">
+				<label class="layui-form-label">单行输入框<i class="red">*</i></label>
+				<div class="layui-input-block">
+					<input type="text" name="title" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input">
+				</div>                                         
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">自定义验证</label>
+				<div class="layui-input-inline ml30">
+					<input type="password" name="password" lay-verify="pass" placeholder="请输入密码" autocomplete="off" class="layui-input">
+				</div>
+				<div class="layui-form-mid layui-word-aux">请填写6到12位密码</div>
+			</div>
+			<div class="form-group">
+				<div class="layui-form-item">          
+					<label class="layui-form-label">单行选择框</label>
+					<div class="layui-input-block">
+						<select name="interest" lay-filter="aihao">  
+							<option value=""></option>
+							<option value="0">写作</option>         
+							<option value="1" selected="">阅读</option>
+							<option value="2">游戏</option>
+							<option value="3">音乐</option>
+							<option value="4">旅行</option>  
+						</select>              
+					</div>
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<div class="layui-inline">  
+					<label class="layui-form-label">范围</label>
+					<div class="layui-input-inline ml30">
+						<input type="text" name="price_min" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>                                     
+					<div class="layui-form-mid">-</div>
+					<div class="layui-input-inline">       
+						<input type="text" name="price_max" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>
+				</div>           
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">联动选择框</label>
+				<div class="layui-input-inline ml30">
+					<select name="quiz1">     
+						<option value="">请选择省</option>
+						<option value="浙江" selected="">浙江省</option> 
+						<option value="你的工号">江西省</option>           
+						<option value="你最喜欢的老师">福建省</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz2">
+						<option value="">请选择市</option>
+						<option value="杭州">杭州</option>
+						<option value="宁波" disabled="">宁波</option>
+						<option value="温州">温州</option>
+						<option value="温州">台州</option>
+						<option value="温州">绍兴</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz3">
+						<option value="">请选择县/区</option>
+						<option value="西湖区">西湖区</option>
+						<option value="余杭区">余杭区</option>
+						<option value="拱墅区">临安市</option>
+					</select>
+				</div>    
+			</div>
+			<div class="layui-form-item" pane="">   
+				<label class="layui-form-label">原始复选框</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="like1[write]" lay-skin="primary" title="写作" checked="">  
+					<input type="checkbox" name="like1[read]" lay-skin="primary" title="阅读">
+					<input type="checkbox" name="like1[game]" lay-skin="primary" title="游戏" disabled="">
+				</div>
+			</div>
+
+			<div class="layui-form-item">
+				<label class="layui-form-label">开关-默认关</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="close" lay-skin="switch" lay-text="ON|OFF">
+				</div>
+			</div>
+			<div class="layui-form-item">  
+				<label class="layui-form-label">单选框</label>
+				<div class="layui-input-block">
+					<input type="radio" name="sex" value="男" title="男" checked="">
+					<input type="radio" name="sex" value="女" title="女">
+					<input type="radio" name="sex" value="禁" title="禁用" disabled="">
+				</div>
+			</div>
+			<!--<div class="layui-form-item layui-form-text">
+				<label class="layui-form-label">上传图片</label>
+				<div class="layui-input-block">
+					<div class="layui-upload-drag w200 h200">
+						<i class="layui-icon"></i>          
+						<p>点击上传</p>
+					</div>
+				</div>
+			</div>-->
+				<div class="layui-form-item layui-form-text">
+					<label class="layui-form-label">普通文本域</label>  
+					<div class="layui-input-block">              
+						<textarea placeholder="请输入内容" class="layui-textarea"></textarea>
+					</div>
+				</div>
+			</div>
+		</div>   
+	</div>
+</div>
+</form>   
+<script type="text/javascript">
+	//form表单样式
+	layui.use(['layer', 'form'], function() {    
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+</script>                 
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/userOrgan/userOrganList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/userOrgan/userOrganList.jsp
new file mode 100644
index 0000000..9002f55
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/userOrgan/userOrganList.jsp
@@ -0,0 +1,117 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black">
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->
+<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+<jsp:include page="../../common.jsp" />
+<script type="text/javascript">
+     require("js/userOrgan/userOrganList.js");
+</script>
+</head>
+<body>
+	<div class="row animated fadeInRight" style="margin: 0;">
+		<div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+			<div class="toolbar-panel bdd">
+				<div class="toolbar-box">
+					<div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+						<!-- 顶部按钮 -->
+						<div class="buttons fl">
+							<a class="btn btn-primary fa fa-search f13" href="javascript:void(0);" onclick="queryUserOrgan()"><span>搜索</span></a>
+							<c:if test="${userType eq 'merchant'||admin eq 'admin' }">
+							   <a class="btn btn-primary fa fa-plus f13 add" href="javascript:void(0);" onclick="initAddUserOrgan()"><span>添加</span></a>
+							</c:if>
+							<a class="btn btn-primary fa fa-edit f13" href="javascript:void(0);" onclick="initEditUserOrgan()"><span>编辑</span></a> 
+							<a class="btn btn-primary fa fa-remove f13 delete" href="javascript:void(0);" onclick="initBatchDeleteUserOrgan()"><span>删除</span></a> 
+						</div>
+						<div class="tools fr">
+							<a href="javascript:void(0);" class="collapse dblock f14 dgray mr5"> 
+								<i class="fa-2x fa fa-angle-double-up"></i>
+							</a>
+						</div>
+					</div>
+				</div>
+
+				<!--搜索条件 -->
+				<div class="toolbar-body">
+					<div class="row pt10 pb10 whitebg ml0 mr0">
+						<span class="dlblock w100 textr">ID：</span> 
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+							<input type="text" placeholder="请输入内容" id="searchId">  
+						</span> 
+						<span class="dlblock w100 textr">名称：</span> 
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+							<input type="text" placeholder="请输入名称">
+						</span> 
+						<span class="dlblock w100 textr">类别：</span>
+						 <select class="form-control f12 w180 textc">
+							<option value="">支出</option>
+							<option value="">收入</option>
+						</select>
+					</div>
+					<div class="mt10 mb20">
+						<span class="dlblock w100 textr">开始日期</span>
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+							 <input type="text" placeholder="" id="date1" class="w150">
+							 <i class="fa fa-calendar"></i>
+						</span> 
+						<span class="dlblock w100 textr">结束日期</span>
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+						<input type="text" placeholder="" id="date2" class="w150"> 
+							<i class="fa fa-calendar"></i>
+						</span>
+					</div>
+				</div>
+			</div>
+		</div>
+		<!-- 表单数据 -->
+		<div class="mb20 mt10">
+			<div class="whitebg pl10 pr10">
+				<table class="table table-striped table-bordered table-hover">
+					<thead>
+						<tr>
+							<th class="textc">
+								<div class="checker" id="allCheck">
+									<span class=""><input type="checkbox" value="" ></span>
+								</div>
+							</th>
+							<th class="textc ">id</th>
+							<th class="textc ">userId</th>
+							<th class="textc ">organCode</th>
+							<th class="textc ">organName</th>
+							<th class="textc wp15">organTypeCode</th>
+							<th class="textc ">organTypeName</th>
+							<th class="textc">编辑</th>
+						</tr>
+					</thead>
+					<!-- 数据体 -->
+					<tbody id="data_content">
+					</tbody>
+				</table>
+			
+			<!-- footer -->
+				<div class="clearfix mb10 pb20">
+						<div class="layui-tab-item fr">
+								<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+								<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>
+								<div class="pagination dlblock vm" id="pagination"></div>
+								<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>
+						</div>
+					</div>
+	
+			</div>
+		</div>
+	</div>
+</body>
+
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/userRewardInfo/detail.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/userRewardInfo/detail.jsp
new file mode 100644
index 0000000..55a8f80
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/userRewardInfo/detail.jsp
@@ -0,0 +1,217 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp" />
+    <style>
+        .layui-form-item{
+            margin-top: 10px;
+        }
+        .layui-form{
+            width: 75%;
+            margin-left: 10%;
+        }
+        .area-info{
+            width: 25% !important;
+        }
+        /*.layui-icon-add-circle{*/
+        /*    color:#1E9FFF*/
+        /*}*/
+    </style>
+</head>
+<body>
+<form class="layui-form" action="" id="addForm">
+    <input name="id" value="${entity.id}" hidden/>
+    <div class="layui-form-item">
+        <label class="layui-form-label">用户ID</label>
+        <div class="layui-input-block">
+            <input name="userId" type="number" value="${entity.userId}" autocomplete="off" maxlength="11"  placeholder="手机号和用户ID二选一" class="layui-input"/>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">登录账号</label>
+        <div class="layui-input-block">
+            <input name="loginName" type="text" value="${entity.loginName}" autocomplete="off" maxlength="50"  placeholder="登录账号和用户ID二选一" class="layui-input" />
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">奖励类型</label>
+        <div class="layui-input-block">
+            <select name="reId" id="reId" lay-verify="required">
+                <c:forEach items="${rList}" var="r">
+                    <option ${entity.reId eq r.id ? 'selected' : ''} value="${r.id}">${r.name}</option>
+                </c:forEach>
+            </select>
+        </div>
+    </div>
+
+<%--    <div class="layui-form-item layui-hide" id="hide-area-info">--%>
+<%--        <div class="layui-form-label">区域</div>--%>
+<%--        <div class="layui-input-inline area-info" >--%>
+<%--            <select name="province" class="province-selector" lay-filter="province-1" lay-verify="required">--%>
+<%--                <option value="">请选择</option>--%>
+<%--                <c:forEach items="${pList}" var="p">--%>
+<%--                    <option ${entity.areaNo eq p.areaCode ? 'selected' : ''} value="${p.areaCode}">${p.areaName}</option>--%>
+<%--                </c:forEach>--%>
+<%--            </select>--%>
+<%--        </div>--%>
+<%--    </div>--%>
+
+    <div class="layui-form-item" id="area-info">
+        <div class="layui-form-label">区域</div>
+        <div class="layui-input-inline area-info" >
+            <select name="province" id="province-selector" class="province-selector" lay-filter="province-1" lay-verify="required">
+                <option value="">请选择</option>
+                <c:forEach items="${pList}" var="p">
+                    <option ${entity.areaNo eq p.areaCode ? 'selected' : ''} value="${p.areaCode}">${p.areaName}</option>
+                </c:forEach>
+            </select>
+        </div>
+        <div class="layui-input-inline area-info ${entity.areaLevel eq 2 or entity.areaLevel eq 3 ? '' : 'layui-hide'}">
+            <select name="city" id="city-selector" class="city-selector" lay-filter="city-1">
+            </select>
+        </div>
+        <div class="layui-input-inline area-info ${entity.areaLevel eq 3 ? '' : 'layui-hide'}">
+            <select name="county" id="county-selector" class="county-selector" lay-filter="county-1">
+            </select>
+        </div>
+<%--        <div class="layui-input-inline" style="width: auto;padding-top:10px" id="addArea">--%>
+<%--            <i class="layui-icon layui-icon-add-circle"></i>--%>
+<%--        </div>--%>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">状态</label>
+        <div class="layui-input-block">
+            <select name="status" id="status" lay-verify="required">
+                <option value="">请选择</option>
+                <option value="1" ${empty entity or entity.status eq 1 ? 'selected' : ''}>正常</option>
+                <option value="-1" ${entity.status eq -1 ? 'selected' : ''}>禁用</option>
+            </select>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button class="layui-btn" lay-submit lay-filter="formDemo">立即提交</button>
+            <button type="button" id="close" class="layui-btn layui-btn-primary">关闭</button>
+        </div>
+    </div>
+</form>
+<script>
+    layui.use(['form','layer'], function(){
+        let layer = layui.layer
+            , form = layui.form;
+        $('#close').click(function() {
+            parent.layer.closeAll();
+        });
+        let areaNo = '${entity.areaNo}';
+        if(areaNo){
+            if(areaNo.indexOf("-") < 0){
+                let dom = $("#city-selector");
+                getNextAreaInfo(areaNo,dom);
+            }else{
+                let checkAreaNo = areaNo.split("-");
+                if(checkAreaNo.length == 2){
+                    let dom = $("#city-selector");
+                    getNextAreaInfo(checkAreaNo[1],dom);
+                }else{
+                    let dom = $("#county-selector");
+                    getNextAreaInfo(checkAreaNo[2],dom);
+                }
+            }
+        }
+        form.on('select(province-1)',function (data){
+            let value = data.value;
+            let dom = $("#city-selector");
+            getNextAreaInfo(value,dom);
+            $("#county-selector").empty().parent().addClass("layui-hide")
+        })
+        form.on('select(city-1)',function (data){
+            let value = data.value;
+            let dom = $("#county-selector");
+            getNextAreaInfo(value,dom);
+        })
+        //监听提交
+        form.on('submit(formDemo)', function(data){
+            let index = layer.load(1,{shade: [0.1,'#000'] });
+            let param = data.field;
+            let areaLevel = 1;
+            let areaNo = $("#province-selector").children("option:selected").val();
+            let areaName = $("#province-selector").children("option:selected").text();
+
+            let cityCode = $("#city-selector").children("option:selected").val();
+            let cityName = $("#city-selector").children("option:selected").text();
+            let countyCode = $("#county-selector").children("option:selected").val();
+            let countyName = $("#county-selector").children("option:selected").text();
+            if(cityCode){
+                areaNo = areaNo + "-" + cityCode;
+                areaName = areaName + "-" + cityName;
+                areaLevel = 2;
+            }
+            if(countyCode){
+                areaNo = areaNo + "-" + countyCode;
+                areaName = areaName + "-" + countyName;
+                areaLevel = 3
+            }
+            param.areaNo = areaNo;
+            param.areaName = areaName;
+            param.areaLevel = areaLevel;
+            $.ajax({
+                url: '${ctx}/userRewardInfo/save',
+                method: 'post',
+                data: JSON.stringify(data.field),
+                dataType: 'JSON',
+                contentType:"application/json",
+                success: function(res) {
+                    layer.close(index);
+                    if(res.code == 200) {
+                        layer.msg(res.message, { icon: 1, time: 1000 }, function () {
+                            var index = parent.layer.getFrameIndex(window.name);
+                            parent.layui.table.reload('userRewardInfo');
+                            parent.layer.close(index);
+                        });
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 2
+                        });
+                    }
+                }
+            })
+            return false;
+        });
+
+        function getNextAreaInfo(value,dom){
+            let url = '${ctx}/userRewardInfo/getNextAreaInfo/'+value;
+            $.get(url,function(res){
+               if(res.code == 200){
+                   let html = "<option value=''>请选择</option>";
+                   $.each(res.data,function (index,e){
+                       html += '<option value="'+e.areaCode+'">'+e.areaName+'</option>';
+                   })
+                   dom.empty();
+                   dom.append(html);
+                   dom.parent("div").removeClass("layui-hide");
+                   form.render("select");
+               }
+            })
+        }
+    });
+    function del(obj){
+        let value = $(obj).data().value;
+        let values = $("#areaNos").val();
+        $("#areaNos").val(values.replace(","+value,""));
+        $(obj).parent().remove();
+    }
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/userRewardInfo/list.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/userRewardInfo/list.jsp
new file mode 100644
index 0000000..d6a33e6
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/userRewardInfo/list.jsp
@@ -0,0 +1,210 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+</head>
+<body>
+<div class="row animated fadeInRight" style="margin: 0;">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" id="form1" action="" style="margin-top: 10px;">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">用户ID</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="userId" id="userId" placeholder="用户ID"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <div class="mb50 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-hide" id="userRewardInfoTab" lay-filter="userRewardInfoTab"></table>
+        </div>
+    </div>
+</div>
+<script type="text/html" id="leftBar">
+    <a class="layui-btn layui-btn-sm layui-btn-normal" lay-event="add">
+        <i class="layui-icon layui-icon-add-1"></i>新增
+    </a>
+    <a class="layui-btn layui-btn-sm" lay-event="search">
+        <i class="layui-icon layui-icon-search"></i>查询
+    </a>
+</script>
+
+<script type="text/html" id="toolBar">
+    <a class="layui-btn layui-btn-xs" lay-event="edit">
+        <i class="layui-icon layui-icon-edit"></i>编辑
+    </a>
+    <a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="del">
+        <i class="layui-icon layui-icon-delete"></i>删除
+    </a>
+</script>
+
+<script>
+    layui.use(['table', 'layer'], function () {
+        var table = layui.table;
+        var layer = layui.layer;
+
+        var tableIns = table.render({
+            elem: '#userRewardInfoTab'
+            , url: '${ctx}/userRewardInfo/page'
+            , id: 'userRewardInfo'
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            , toolbar: '#leftBar' //开启头部工具栏，并为其绑定左侧模板
+            , defaultToolbar: ['filter']
+            , defaultToolbar: ['filter', 'exports', 'print', { //自定义头部工具栏右侧图标。如无需自定义，去除该参数即可
+                title: '提示'
+                , layEvent: 'LAYTABLE_TIPS'
+                , icon: 'layui-icon-tips'
+            }]
+            , title: '用户奖励信息配置表'
+            , cols: [[
+                {type: 'checkbox', fixed: 'left', hidden: true}
+                , {field: 'numbers', title: '序号', fixed: 'left', unresize: true, width: 80, type: 'numbers'}
+                , {field: 'userId', title: '用户ID'}
+                , {field: 'rName', title: '奖励名称'}
+                , {field: 'areaLevel', title: '区域等级'}
+                , {field: 'areaName', title: '区域名称'}
+                , {field: 'areaNo', title: '区域编码'}
+                , {field: 'status', title: '状态',templet: function (d){
+                    if(d.status === 1){
+                        return "<span style='color: green'>正常</span>";
+                    }else{
+                        return "<span style='color: red'>禁用</span>";
+                    }
+                    }}
+                , {
+                    field: 'createTime',
+                    title: '创建时间',
+                    templet: "<div>{{layui.util.toDateString(d.createTime,'yyyy-MM-dd HH:mm')}}</div>"
+                }
+                , {fixed: 'right', title: '操作', width: 160, toolbar: '#toolBar'}
+            ]]
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , page: true
+        });
+        table.on('tool(userRewardInfoTab)', function (obj) { //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            var data = obj.data; //获得当前行数据
+            var layEvent = obj.event; //获得 lay-event 对应的值（也可以是表头的 event 参数对应的值）
+            if (layEvent === 'del') { //删除
+                layer.confirm('真的删除么?', {icon: 3}, function (index) {
+                    obj.del(); //删除对应行（tr）的DOM结构，并更新缓存
+                    layer.close(index);
+                    del(data);
+                    //向服务端发送删除指令
+                });
+            } else if (layEvent === 'edit') { //编辑
+                //do something
+                toAdd(obj.data);
+                //同步更新缓存对应的值
+                // obj.update({
+                //     username: '123'
+                //     ,title: 'xxx'
+                // });
+            }
+        });
+
+        //监听头工具栏事件
+        table.on('toolbar(userRewardInfoTab)', function (obj) {
+            switch (obj.event) {
+                case 'add':
+                    // 添加
+                    toAdd();
+                    break;
+                case 'search':
+                    var params = serialize($('#form1'));
+                    table.reload('userRewardInfo', {
+                        where: params
+                        , page: {
+                            size: 10
+                            , current: 1
+                        }
+                    });
+                    break;
+            }
+        });
+
+        function toAdd(obj) {
+            var url = '${ctx}/userRewardInfo/detail';
+            var title = "新增";
+            if (obj != undefined) {
+                url = "${ctx}/userRewardInfo/detail/" + obj.id;
+                title = "编辑"
+            }
+            var index = layer.open({
+                type: 2
+                , shade: 0.5
+                , title: title
+                , maxmin: true
+                , content: url
+                , area: ['800px', '500px']
+                , end: function () {
+
+                }
+            });
+        }
+
+        function del(obj) {
+            $.ajax({
+                url: '${ctx}/userRewardInfo/del/' + obj.id,
+                method: 'DELETE',
+                dataType: 'JSON',
+                contentType: "application/json",
+                success: function (res) {
+                    layer.msg(res.message, {
+                        icon: res.code == 200 ? 1: 2
+                    });
+                }
+            })
+        }
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/userRole/detail.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/userRole/detail.jsp
new file mode 100644
index 0000000..da46971
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/userRole/detail.jsp
@@ -0,0 +1,82 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp" />
+    <style>
+        .layui-form-item{
+            margin-top: 10px;
+        }
+    </style>
+</head>
+<body>
+<form class="layui-form" action="" style="width: 70%">
+    <input name="id" value="${entity.id}" hidden/>
+    <div class="layui-form-item">
+        <label class="layui-form-label">角色名称</label>
+        <div class="layui-input-block">
+            <input name="roleName" value="${entity.roleName}" maxlength="20"  placeholder="角色名称" class="layui-input"/>
+        </div>
+    </div>
+     <div class="layui-form-item">
+        <label class="layui-form-label">角色Code</label>
+        <div class="layui-input-block">
+            <input name="roleCode" value="${entity.roleCode}" maxlength="20" placeholder="请输入角色Code" class="layui-input"/>
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button class="layui-btn" lay-submit lay-filter="formDemo">立即提交</button>
+            <button type="button" id="close" class="layui-btn layui-btn-primary">关闭</button>
+        </div>
+    </div>
+</form>
+
+<script>
+    //Demo
+    layui.use(['form','layer'], function(){
+        var form = layui.form;
+        var layer = layui.layer;
+        $('#close').click(function() {
+            parent.layer.closeAll();
+        });
+            //监听提交
+        form.on('submit(formDemo)', function(data){
+            var index = layer.load(1,{shade: [0.1,'#000'] });
+            $.ajax({
+                url: '${ctx}/userRole/save',
+                method: 'post',
+                data: JSON.stringify(data.field),
+                dataType: 'JSON',
+                contentType:"application/json",
+                success: function(res) {
+                    layer.close(index);
+                    if(res.code == 200) {
+                        layer.msg(res.message, { icon: 1, time: 1000 }, function () {
+                            var index = parent.layer.getFrameIndex(window.name);
+                            parent.layui.table.reload('userRole');
+                            parent.layer.close(index);
+                        });
+                    } else {
+                        layer.msg(res.message, {
+                            icon: 2
+                        });
+                    }
+                }
+            })
+            return false;
+        });
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/userRole/list.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/userRole/list.jsp
new file mode 100644
index 0000000..4177180
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/userRole/list.jsp
@@ -0,0 +1,201 @@
+<%@ page contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <!-- 移动设备 viewport -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <jsp:include page="../../common.jsp"/>
+</head>
+<body>
+<div class="row animated fadeInRight">
+    <div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+        <div class="toolbar-panel bdd">
+            <div class="toolbar-box">
+                <div class="toolbar-head clearfix lgraybg pt5 pl10 bdbd">
+                    <!-- 顶部按钮 -->
+                    <div class="fl">
+                        查询条件
+                    </div>
+                    <div class="tools fr">
+                        <a href="javascript:void(0);" class="collapse dblock f14 dgray mr5">
+                            <i class="fa-2x fa fa-angle-double-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            <!--搜索条件 -->
+            <div class="toolbar-body">
+                <form class="layui-form" id="form1" action="" style="margin-top: 10px;">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">角色名称</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="roleName" id="roleName" placeholder="请输入角色名称"
+                                       autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <div class="mb50 mt10">
+        <div class="whitebg pl10 pr10">
+            <table class="layui-hide" id="userRoleTab" lay-filter="userRoleTab"></table>
+        </div>
+    </div>
+</div>
+<script type="text/html" id="leftBar">
+    <a class="layui-btn layui-btn-sm layui-btn-normal" lay-event="add">
+        <i class="layui-icon layui-icon-add-1"></i>新增
+    </a>
+    <a class="layui-btn layui-btn-sm" lay-event="search">
+        <i class="layui-icon layui-icon-search"></i>查询
+    </a>
+</script>
+
+<script type="text/html" id="toolBar">
+    <a class="layui-btn layui-btn-xs" lay-event="edit">
+        <i class="layui-icon layui-icon-edit"></i>编辑
+    </a>
+    <a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="del">
+        <i class="layui-icon layui-icon-delete"></i>删除
+    </a>
+</script>
+
+<script>
+    layui.use(['table', 'layer'], function () {
+        var table = layui.table;
+        var layer = layui.layer;
+
+        var tableIns = table.render({
+            elem: '#userRoleTab'
+            , url: '${ctx}/userRole/page'
+            , id: 'userRole'
+            , response: {
+                statusName: 'code' //数据状态的字段名称，默认：code
+                , countName: 'count' //数据总数的字段名称，默认：count
+                , dataName: 'data' //默数据列表的字段名称，认：data
+                , statusCode: 200
+            }
+            , parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.records //解析数据列表
+                };
+            }
+            , toolbar: '#leftBar' //开启头部工具栏，并为其绑定左侧模板
+            , defaultToolbar: ['filter']
+            , defaultToolbar: ['filter', 'exports', 'print', { //自定义头部工具栏右侧图标。如无需自定义，去除该参数即可
+                title: '提示'
+                , layEvent: 'LAYTABLE_TIPS'
+                , icon: 'layui-icon-tips'
+            }]
+            , title: '用户角色表'
+            , cols: [[
+                {type: 'checkbox', fixed: 'left', hidden: true}
+                , {field: 'numbers', title: '序号', fixed: 'left', unresize: true, width: 80, type: 'numbers'}
+                , {field: 'roleName', title: '角色名称'}
+                , {field: 'roleCode', title: '角色Code'}
+                , {
+                    field: 'createTime',
+                    title: '创建时间',
+                    width: 160,
+                    templet: "<div>{{layui.util.toDateString(d.createTime,'yyyy-MM-dd HH:mm:ss')}}</div>"
+                }
+                , {fixed: 'right', title: '操作', width: 200, toolbar: '#toolBar'}
+            ]]
+            , request: {
+                pageName: 'current' //页码的参数名称，默认：page
+                , limitName: 'size' //每页数据量的参数名，默认：limit
+            }
+            , page: true
+        });
+        table.on('tool(userRoleTab)', function (obj) { //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            var data = obj.data; //获得当前行数据
+            var layEvent = obj.event; //获得 lay-event 对应的值（也可以是表头的 event 参数对应的值）
+            if (layEvent === 'del') { //删除
+                layer.confirm('真的删除么?', {icon: 3}, function (index) {
+                    obj.del(); //删除对应行（tr）的DOM结构，并更新缓存
+                    layer.close(index);
+                    del(data);
+                    //向服务端发送删除指令
+                });
+            } else if (layEvent === 'edit') { //编辑
+                //do something
+                toAdd(obj.data);
+                //同步更新缓存对应的值
+                // obj.update({
+                //     username: '123'
+                //     ,title: 'xxx'
+                // });
+            }
+        });
+
+        //监听头工具栏事件
+        table.on('toolbar(userRoleTab)', function (obj) {
+            switch (obj.event) {
+                case 'add':
+                    // 添加
+                    toAdd();
+                    break;
+                case 'search':
+                    var params = serialize($('#form1'));
+                    table.reload('userRole', {
+                        where: params
+                        , page: {
+                            size: 10
+                            , current: 1
+                        }
+                    });
+                    break;
+            }
+        });
+
+        function toAdd(obj) {
+            var url = '${ctx}/userRole/detail';
+            var title = "新增";
+            if (obj != undefined) {
+                url = "${ctx}/userRole/detail/" + obj.id;
+                title = "编辑"
+            }
+            var index = layer.open({
+                type: 2
+                , shade: 0.5
+                , title: title
+                , maxmin: true
+                , content: url
+                , area: ['450px', '320px']
+                , end: function () {
+
+                }
+            });
+        }
+
+        function del(obj) {
+            $.ajax({
+                url: '${ctx}/userRole/del/' + obj.id,
+                method: 'DELETE',
+                dataType: 'JSON',
+                contentType: "application/json",
+                success: function (res) {
+                    layer.msg(res.message, {
+                        icon: res.code == 200 ? 1: 2
+                    });
+                }
+            })
+        }
+    });
+</script>
+</body>
+</html>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/wxCityInfo/wxCityInfoBaseInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/wxCityInfo/wxCityInfoBaseInfo.jsp
new file mode 100644
index 0000000..366c934
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/wxCityInfo/wxCityInfoBaseInfo.jsp
@@ -0,0 +1,33 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">  
+	<div class="tab-pane active">     
+		<div class="panel-body">
+			<div class="wrapper wrapper-content">
+				<div class="panel-form animated fadeInRight wp60 fc">
+					<div class="layui-form-item dn	has-error" >   
+						<label class="layui-form-label">id</label>  
+						<div class="layui-input-block">
+							<input type="text" name="id" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${wxCityInfo.id }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">cityCode</label>  
+						<div class="layui-input-block">
+							<input type="text" name="cityCode" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${wxCityInfo.cityCode }" >
+						</div>  
+					</div>
+					<div class="layui-form-item 	has-error" >   
+						<label class="layui-form-label">cityName</label>  
+						<div class="layui-input-block">
+							<input type="text" name="cityName" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input" value="${wxCityInfo.cityName }" >
+						</div>  
+					</div>
+	
+				</div>
+			</div>
+		</div>  
+	</div>
+</form>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/wxCityInfo/wxCityInfoDetails.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/wxCityInfo/wxCityInfoDetails.jsp
new file mode 100644
index 0000000..0b5c6d2
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/wxCityInfo/wxCityInfoDetails.jsp
@@ -0,0 +1,54 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>     
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">                      
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black"> 
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> 
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->                                     
+<meta name="viewport"
+	content="width=device-width, initial-scale=1.0, maximum-scale=1.0">   
+<jsp:include page="../../common.jsp" />
+<script type="text/javascript">
+    require("js/wxCityInfo/wxCityInfoDetails.js");
+</script>
+<title>编辑</title>
+</head>                                 
+	<body class="lgraybg">            
+		<div class="	container-fluid animated fadeInRight col-sm-12">
+			<div class="panel-toolbar mt10 mb10 pt5 pb5 pl10 bdd whitebg">
+				<div class="buttons">
+					<a href="javascript:void(0);" class="btn btn-primary fa fa-save f12"><span>保存</span></a>
+					<a href="${ctx }/wxCityInfo/index?pageIndex=${pageIndex}"  class="btn btn-primary fa fa-back f12" id="goback"><span>返回</span></a>
+				</div>
+			</div>
+				<div class="tabs-container whitebg">
+					<div class="pt10 pl5 pr5">
+						<ul class="nav nav-tabs" id="nav-tabs">
+							<li class="active" data-action="base">   
+								<a href="javascript:void(0);" >基本资料</a>
+							</li>
+							<li class="" data-action="functions">
+								<a href="javascript:void(0);"  >多功能输入</a>
+							</li>
+							<li class="" data-action="extends">
+								<a href="javascript:void(0);" >扩展属性</a>
+							</li>
+						</ul>
+						<div class="tab-content pt30 p30">               
+		
+						</div>     
+					</div>
+				</div>    
+		</div>
+		<!-- 隐藏域 -->
+		<input type="hidden" id="wxCityInfoId" value="${wxCityInfo.id }"/>
+	</body>
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/wxCityInfo/wxCityInfoExtendsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/wxCityInfo/wxCityInfoExtendsInfo.jsp
new file mode 100644
index 0000000..592687a
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/wxCityInfo/wxCityInfoExtendsInfo.jsp
@@ -0,0 +1,201 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>           
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> 
+<div class="tab-pane active">      
+	<div class="animated fadeInRight">
+		<div class="whitebg pl10 pr10">
+			<table class="table table-striped table-bordered table-hover">     
+				<thead> 
+					<tr>  
+						<th class="textc">序号</th>         
+						<th class="textc wp15">流水账号</th>
+						<th class="textc">日期</th>         
+						<th class="textc">财务类别</th>     
+						<th class="textc">金额</th>         
+						<th class="textc">银行</th>         
+						<th class="textc">发票</th>         
+						<th class="textc">客户名称</th>     
+						<th class="textc wp15">单号</th>    
+						<th class="textc">状态</th>         
+						<th class="textc">类别</th>         
+						<th class="textc">操作</th>         
+					</tr> 
+				</thead>
+				<tbody> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+                
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="green">支出</span></td>     
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+					<tr class="odd">         
+						<td class="textc">1</td>
+						<td class="textc">MD-201812</td>    
+						<td class="textc">2018-12-12</td>   
+						<td class="textc">会员充值</td>     
+						<td class="textc"><span class="red">4563.00</span></td>    
+						<td class="textc">对公账户</td>     
+						<td class="textc">否</td>           
+						<td class="textc">张三</td>         
+						<td class="textc">     
+							<div class="overFont w150">销售单号(xs-3234456676776)</div>
+						</td>      
+						<td class="textc">已确认</td>       
+						<td class="textc"><span class="red">收入</span></td>
+						<td class="textc">     
+							<a href="javascript:void(0);" class=" blue dlblock w20 h20 edit"><i class="fa fa-pencil"></i></a>   
+						</td>      
+					</tr> 
+				</tbody>
+                
+			</table>  
+			<!-- footer -->  
+			<div class="clearfix mb10 pb20">          
+					<div class="layui-tab-item fr">       
+							<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+							<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>   
+							<div class="pagination dlblock vm" id="pagination"></div>
+							<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>            
+					</div>
+				</div>  
+		</div>      
+	</div>        
+</div>          
+                
+<script type="text/javascript">    
+//分页          
+$('#pagination').pagination({        
+	pageCount: 50,
+	jump: true,   
+	coping: true, 
+	homePage: '首页',    
+	endPage: '末页',     
+	prevContent: '上页', 
+	nextContent: '下页', 
+	callback: function(api) {          
+		$('.now').text(api.getCurrent());
+	}             
+});             
+</script>       
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/wxCityInfo/wxCityInfoFunctionsInfo.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/wxCityInfo/wxCityInfoFunctionsInfo.jsp
new file mode 100644
index 0000000..982ce84
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/wxCityInfo/wxCityInfoFunctionsInfo.jsp
@@ -0,0 +1,130 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>		
+<form class="layui-form whitebg pb10 pt10" action="" id="data_form">      
+<div class="tab-pane active">
+				<div class="panel-body">
+					<div class="wrapper wrapper-content">     
+						<div class="panel-form animated fadeInRight wp60 fc">
+							<!-- 账号资料 -->
+			<div class="layui-form-item 	has-error">
+				<label class="layui-form-label">单行输入框<i class="red">*</i></label>
+				<div class="layui-input-block">
+					<input type="text" name="title" lay-verify="title" autocomplete="off" placeholder="请输入内容" class="layui-input">
+				</div>                                         
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">自定义验证</label>
+				<div class="layui-input-inline ml30">
+					<input type="password" name="password" lay-verify="pass" placeholder="请输入密码" autocomplete="off" class="layui-input">
+				</div>
+				<div class="layui-form-mid layui-word-aux">请填写6到12位密码</div>
+			</div>
+			<div class="form-group">
+				<div class="layui-form-item">          
+					<label class="layui-form-label">单行选择框</label>
+					<div class="layui-input-block">
+						<select name="interest" lay-filter="aihao">  
+							<option value=""></option>
+							<option value="0">写作</option>         
+							<option value="1" selected="">阅读</option>
+							<option value="2">游戏</option>
+							<option value="3">音乐</option>
+							<option value="4">旅行</option>  
+						</select>              
+					</div>
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<div class="layui-inline">  
+					<label class="layui-form-label">范围</label>
+					<div class="layui-input-inline ml30">
+						<input type="text" name="price_min" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>                                     
+					<div class="layui-form-mid">-</div>
+					<div class="layui-input-inline">       
+						<input type="text" name="price_max" placeholder="￥" autocomplete="off" class="layui-input">
+					</div>
+				</div>           
+			</div>
+			<div class="layui-form-item">
+				<label class="layui-form-label">联动选择框</label>
+				<div class="layui-input-inline ml30">
+					<select name="quiz1">     
+						<option value="">请选择省</option>
+						<option value="浙江" selected="">浙江省</option> 
+						<option value="你的工号">江西省</option>           
+						<option value="你最喜欢的老师">福建省</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz2">
+						<option value="">请选择市</option>
+						<option value="杭州">杭州</option>
+						<option value="宁波" disabled="">宁波</option>
+						<option value="温州">温州</option>
+						<option value="温州">台州</option>
+						<option value="温州">绍兴</option>
+					</select>
+				</div>
+				<div class="layui-input-inline">
+					<select name="quiz3">
+						<option value="">请选择县/区</option>
+						<option value="西湖区">西湖区</option>
+						<option value="余杭区">余杭区</option>
+						<option value="拱墅区">临安市</option>
+					</select>
+				</div>    
+			</div>
+			<div class="layui-form-item" pane="">   
+				<label class="layui-form-label">原始复选框</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="like1[write]" lay-skin="primary" title="写作" checked="">  
+					<input type="checkbox" name="like1[read]" lay-skin="primary" title="阅读">
+					<input type="checkbox" name="like1[game]" lay-skin="primary" title="游戏" disabled="">
+				</div>
+			</div>
+
+			<div class="layui-form-item">
+				<label class="layui-form-label">开关-默认关</label>
+				<div class="layui-input-block">
+					<input type="checkbox" name="close" lay-skin="switch" lay-text="ON|OFF">
+				</div>
+			</div>
+			<div class="layui-form-item">  
+				<label class="layui-form-label">单选框</label>
+				<div class="layui-input-block">
+					<input type="radio" name="sex" value="男" title="男" checked="">
+					<input type="radio" name="sex" value="女" title="女">
+					<input type="radio" name="sex" value="禁" title="禁用" disabled="">
+				</div>
+			</div>
+			<!--<div class="layui-form-item layui-form-text">
+				<label class="layui-form-label">上传图片</label>
+				<div class="layui-input-block">
+					<div class="layui-upload-drag w200 h200">
+						<i class="layui-icon"></i>          
+						<p>点击上传</p>
+					</div>
+				</div>
+			</div>-->
+				<div class="layui-form-item layui-form-text">
+					<label class="layui-form-label">普通文本域</label>  
+					<div class="layui-input-block">              
+						<textarea placeholder="请输入内容" class="layui-textarea"></textarea>
+					</div>
+				</div>
+			</div>
+		</div>   
+	</div>
+</div>
+</form>   
+<script type="text/javascript">
+	//form表单样式
+	layui.use(['layer', 'form'], function() {    
+		var layer = layui.layer,
+			form = layui.form;
+		form.render();
+	});
+</script>                 
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/jsp/wxCityInfo/wxCityInfoList.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/wxCityInfo/wxCityInfoList.jsp
new file mode 100644
index 0000000..743f6c8
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/jsp/wxCityInfo/wxCityInfoList.jsp
@@ -0,0 +1,112 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black">
+<meta name="format-detection" content="telephone=no">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+<meta name="renderer" content="webkit">
+<!-- 移动设备 viewport -->
+<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+<jsp:include page="../../common.jsp" />
+<script type="text/javascript">
+     require("js/wxCityInfo/wxCityInfoList.js");
+</script>
+</head>
+<body>
+	<div class="row animated fadeInRight" style="margin: 0;">
+		<div class="wrapper wrapper-content mt5 right-content ml5 mr5">
+			<div class="toolbar-panel bdd">
+				<div class="toolbar-box">
+					<div class="toolbar-head clearfix lgraybg pt5 pb10 pl10 bdbd">
+						<!-- 顶部按钮 -->
+						<div class="buttons fl">
+							<a class="btn btn-primary fa fa-search f13" href="javascript:void(0);" onclick="queryWxCityInfo()"><span>搜索</span></a>
+							<a class="btn btn-primary fa fa-plus f13 add" href="javascript:void(0);" onclick="initAddWxCityInfo()"><span>添加</span></a>
+							<a class="btn btn-primary fa fa-edit f13" href="javascript:void(0);" onclick="initEditWxCityInfo()"><span>编辑</span></a> 
+							<a class="btn btn-primary fa fa-remove f13 delete" href="javascript:void(0);" onclick="initBatchDeleteWxCityInfo()"><span>删除</span></a> 
+						</div>
+						<div class="tools fr">
+							<a href="javascript:void(0);" class="collapse dblock f14 dgray mr5"> 
+								<i class="fa-2x fa fa-angle-double-up"></i>
+							</a>
+						</div>
+					</div>
+				</div>
+
+				<!--搜索条件 -->
+				<div class="toolbar-body">
+					<div class="row pt10 pb10 whitebg ml0 mr0">
+						<span class="dlblock w100 textr">ID：</span> 
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+							<input type="text" placeholder="请输入内容" id="searchId">  
+						</span> 
+						<span class="dlblock w100 textr">名称：</span> 
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+							<input type="text" placeholder="请输入名称">
+						</span> 
+						<span class="dlblock w100 textr">类别：</span>
+						 <select class="form-control f12 w180 textc">
+							<option value="">支出</option>
+							<option value="">收入</option>
+						</select>
+					</div>
+					<div class="mt10 mb20">
+						<span class="dlblock w100 textr">开始日期</span>
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock">
+							 <input type="text" placeholder="" id="date1" class="w150">
+							 <i class="fa fa-calendar"></i>
+						</span> 
+						<span class="dlblock w100 textr">结束日期</span>
+						<span class="bdc pt6 pb6 pl6 pr5 w180 dlblock"> 
+						<input type="text" placeholder="" id="date2" class="w150"> 
+							<i class="fa fa-calendar"></i>
+						</span>
+					</div>
+				</div>
+			</div>
+		</div>
+		<!-- 表单数据 -->
+		<div class="mb20 mt10">
+			<div class="whitebg pl10 pr10">
+				<table class="table table-striped table-bordered table-hover">
+					<thead>
+						<tr>
+							<th class="textc">
+								<div class="checker" id="allCheck">
+									<span class=""><input type="checkbox" value="" ></span>
+								</div>
+							</th>
+							<th class="textc ">id</th>
+							<th class="textc ">cityCode</th>
+							<th class="textc ">cityName</th>
+							<th class="textc">编辑</th>
+						</tr>
+					</thead>
+					<!-- 数据体 -->
+					<tbody id="data_content">
+					</tbody>
+				</table>
+			
+			<!-- footer -->
+				<div class="clearfix mb10 pb20">
+						<div class="layui-tab-item fr">
+								<span class="dlblock vm">当前第<span class="now" id="currPage"></span>页 , </span>
+								<span class="dlblock vm">共<span class="count" id="pageCount"></span>页 </span>
+								<div class="pagination dlblock vm" id="pagination"></div>
+								<span class="dlblock vm ml10">总记录数<span class="now" id="totalCount"></span>条</span>
+						</div>
+					</div>
+	
+			</div>
+		</div>
+	</div>
+</body>
+
+</html>
+
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/public.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/public.jsp
new file mode 100644
index 0000000..6bc40ec
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/public.jsp
@@ -0,0 +1,34 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@include file="taglib.jsp"%>
+<meta http-equiv="X-UA-Compatible" content="IE=8" >
+<c:set var="res" value="${resourcePath}/auth"  scope="request"/>
+<%--<link href="${res}/jquery-ui-bs/assets/css/bootstrap.css" rel="stylesheet">--%>
+<%--<link href="${res}/jquery-ui-bs/assets/css/bootstrap-responsive.css" rel="stylesheet">--%>
+<link href="${res}/jquery-ui-bs/css/custom-theme/jquery-ui-1.10.0.custom.css" rel="stylesheet">
+<!--[if lt IE 9]>
+<link rel="stylesheet" href="${res}/jquery-ui-bs/css/custom-theme/jquery.ui.1.10.0.ie.css"/>
+<![endif]-->
+
+<link href="${res}/jquery-validation/1.10.0/validate.css" rel="stylesheet">
+<link href="${res}/dataTables/jquery.dataTables.bs.css" rel="stylesheet">
+<link href="${res}/jquery-ui-multiselect/jquery.multiselect.css" rel="stylesheet">
+<link href="${res}/jquery-loadmask-0.4/jquery.loadmask.css" rel="stylesheet">
+<link href="${res}/uploadify/uploadify.css" rel="stylesheet" type="text/css"/>
+<link href="${res}/My97DatePicker/skin/WdatePicker.css" rel="stylesheet" type="text/css"/>
+
+<link href="${res}/css/common.css" rel="stylesheet">
+
+<script type="text/javascript" src="${res}/jquery-ui-bs/js/jquery-1.8.3.min.js"></script>
+<script type="text/javascript" src="${res}/jquery-ui-bs/js/jquery-ui-1.10.0.custom.min.js"></script>
+<script type="text/javascript" src="${res}/jquery-ui-bs/assets/js/bootstrap.min.js"></script>
+<script type="text/javascript" src="${res}/jquery-validation/1.10.0/jquery.validate.min.js"></script>
+<script type="text/javascript" src="${res}/jquery-validation/1.10.0/messages_bs_zh.js"></script>
+<script type="text/javascript" src="${res}/dataTables/jquery.dataTables.js"></script>
+<script type="text/javascript" src="${res}/jquery-ui-multiselect/jquery.multiselect.js"></script>
+<script type="text/javascript" src="${res}/jquery-loadmask-0.4/jquery.loadmask.min.js"></script>
+<script type="text/javascript" src="${res}/uploadify/jquery.uploadify.min.js"></script>
+<script type="text/javascript" src="${res}/My97DatePicker/WdatePicker.js"></script>
+
+<script type="text/javascript" src="${res}/js/common.js"></script>
+<script type="text/javascript" src="${res}/upload/jquery.form.js"></script>
+<script type="text/javascript" src="${res}/upload/upload.js?rnd=12.1"></script>
diff --git a/pluss-manage-page/src/main/webapp/WEB-INF/taglib.jsp b/pluss-manage-page/src/main/webapp/WEB-INF/taglib.jsp
new file mode 100644
index 0000000..73615c1
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/WEB-INF/taglib.jsp
@@ -0,0 +1,19 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> 
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+<%@ taglib prefix="s" uri="http://www.springframework.org/tags" %>
+<c:set var="version" value="1.02" scope="request" />
+<c:set var="ctx" value="${pageContext.request.contextPath}"  scope="request"/>
+<c:set var="resourcePath" value="${ctx}/resources"  scope="request"/>
+<%--上传文件URL --%>
+<c:set var="res" value="/sso/resources/auth" scope="request"/>
+<meta http-equiv="X-UA-Compatible" content="IE=8" >
+<script type="text/javascript">
+	var ctx = "${ctx}";
+	var res = "${res}";
+    var resourcePath = "${resourcePath}";
+    document.writeln('<script type="text/javascript" src="'+resourcePath+'/js/global.js?d=' + new Date().getTime() + '" ><\/script>');
+</script>
+</script>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/emotion/emotion.css b/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/emotion/emotion.css
new file mode 100644
index 0000000..4fef67c
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/emotion/emotion.css
@@ -0,0 +1,87 @@
+.edui-popup-emotion .edui-emotion-jd img{
+    background:transparent url(images/jxface2.gif?v=1.1) no-repeat scroll left top;
+    cursor:pointer;width:35px;height:35px;display:block;
+}
+.edui-popup-emotion .edui-emotion-pp img{
+    background:transparent url(images/fface.gif?v=1.1) no-repeat scroll left top;
+    cursor:pointer;width:25px;height:25px;display:block;
+}
+
+.edui-popup-emotion .edui-emotion-ldw img{
+    background:transparent url(images/wface.gif?v=1.1) no-repeat scroll left top;
+    cursor:pointer;width:35px;height:35px;display:block;
+}
+
+.edui-popup-emotion .edui-emotion-tsj img{
+    background:transparent url(images/tface.gif?v=1.1) no-repeat scroll left top;
+    cursor:pointer;width:35px;height:35px;display:block;
+}
+
+.edui-popup-emotion .edui-emotion-cat img{
+    background:transparent url(images/cface.gif?v=1.1) no-repeat scroll left top;
+    cursor:pointer;width:35px;height:35px;display:block;
+}
+
+.edui-popup-emotion .edui-emotion-bb img{
+    background:transparent url(images/bface.gif?v=1.1) no-repeat scroll left top;
+    cursor:pointer;width:35px;height:35px;display:block;
+}
+
+.edui-popup-emotion .edui-emotion-youa img{
+    background:transparent url(images/yface.gif?v=1.1) no-repeat scroll left top;
+    cursor:pointer;width:35px;height:35px;display:block;
+}
+
+.edui-popup-emotion .edui-emotion-smileytable {
+    width: 100%;
+    border-spacing: 0;
+    border-collapse: collapse;
+    table-layout: fixed;
+}
+
+.edui-popup-emotion .edui-emotion-wrapper {
+    padding: 15px;
+}
+
+.edui-popup-emotion .edui-tab-nav{
+    height: auto;
+    *height: 31px;
+}
+.edui-popup-emotion .edui-emotion-tabs{
+    clear: both;
+    width: 0;
+    height: 0;
+}
+
+.edui-popup-emotion .edui-tab-content {
+    padding: 15px 0;
+}
+
+.edui-popup-emotion .edui-emotion-preview-box {
+    width:90px;
+    height:76px;
+    border:2px solid #9cb945;
+    background:#FFFFFF;
+    background-position:center;
+    background-repeat:no-repeat;
+    position: absolute;
+    top: 67px;
+    left: 494px;
+    display: none;
+}
+
+.edui-popup-emotion .edui-tab-text {
+    font-size: 12px;
+}
+
+.edui-popup-emotion .edui-emotion-preview-left {
+    left: 15px;
+}
+
+.edui-popup-emotion .edui-emotion-preview-img {
+    width: 100%;
+    height: 100%;
+    display: block;
+    background-repeat: no-repeat;
+    background-position: center center;
+}
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/emotion/emotion.js b/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/emotion/emotion.js
new file mode 100644
index 0000000..a74ddaf
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/emotion/emotion.js
@@ -0,0 +1,272 @@
+(function(){
+
+    var editor = null;
+
+    UM.registerWidget('emotion',{
+
+        tpl: "<link type=\"text/css\" rel=\"stylesheet\" href=\"<%=emotion_url%>emotion.css\">" +
+            "<div class=\"edui-emotion-tab-Jpanel edui-emotion-wrapper\">" +
+            "<ul class=\"edui-emotion-Jtabnav edui-tab-nav\">" +
+            "<li class=\"edui-tab-item\"><a data-context=\".edui-emotion-Jtab0\" hideFocus=\"true\" class=\"edui-tab-text\"><%=lang_input_choice%></a></li>" +
+            "<li class=\"edui-tab-item\"><a data-context=\".edui-emotion-Jtab1\" class=\"edui-tab-text\"><%=lang_input_Tuzki%></a></li>" +
+            "<li class=\"edui-tab-item\"><a data-context=\".edui-emotion-Jtab2\" hideFocus=\"true\" class=\"edui-tab-text\"><%=lang_input_lvdouwa%></a></li>" +
+            "<li class=\"edui-tab-item\"><a data-context=\".edui-emotion-Jtab3\" hideFocus=\"true\" class=\"edui-tab-text\"><%=lang_input_BOBO%></a></li>" +
+            "<li class=\"edui-tab-item\"><a data-context=\".edui-emotion-Jtab4\" hideFocus=\"true\" class=\"edui-tab-text\"><%=lang_input_babyCat%></a></li>" +
+            "<li class=\"edui-tab-item\"><a data-context=\".edui-emotion-Jtab5\" hideFocus=\"true\" class=\"edui-tab-text\"><%=lang_input_bubble%></a></li>" +
+            "<li class=\"edui-tab-item\"><a data-context=\".edui-emotion-Jtab6\" hideFocus=\"true\" class=\"edui-tab-text\"><%=lang_input_youa%></a></li>" +
+            "<li class=\"edui-emotion-tabs\"></li>" +
+            "</ul>" +
+            "<div class=\"edui-tab-content edui-emotion-JtabBodys\">" +
+            "<div class=\"edui-emotion-Jtab0 edui-tab-pane\"></div>" +
+            "<div class=\"edui-emotion-Jtab1 edui-tab-pane\"></div>" +
+            "<div class=\"edui-emotion-Jtab2 edui-tab-pane\"></div>" +
+            "<div class=\"edui-emotion-Jtab3 edui-tab-pane\"></div>" +
+            "<div class=\"edui-emotion-Jtab4 edui-tab-pane\"></div>" +
+            "<div class=\"edui-emotion-Jtab5 edui-tab-pane\"></div>" +
+            "<div class=\"edui-emotion-Jtab6 edui-tab-pane\"></div>" +
+            "</div>" +
+            "<div class=\"edui-emotion-JtabIconReview edui-emotion-preview-box\">" +
+            "<img src=\"<%=cover_img%>\" class=\'edui-emotion-JfaceReview edui-emotion-preview-img\'/>" +
+            "</div>",
+
+        sourceData: {
+            emotion: {
+                tabNum:7, //切换面板数量
+                SmilmgName:{ 'edui-emotion-Jtab0':['j_00', 84], 'edui-emotion-Jtab1':['t_00', 40], 'edui-emotion-Jtab2':['w_00', 52], 'edui-emotion-Jtab3':['B_00', 63], 'edui-emotion-Jtab4':['C_00', 20], 'edui-emotion-Jtab5':['i_f', 50], 'edui-emotion-Jtab6':['y_00', 40] }, //图片前缀名
+                imageFolders:{ 'edui-emotion-Jtab0':'jx2/', 'edui-emotion-Jtab1':'tsj/', 'edui-emotion-Jtab2':'ldw/', 'edui-emotion-Jtab3':'bobo/', 'edui-emotion-Jtab4':'babycat/', 'edui-emotion-Jtab5':'face/', 'edui-emotion-Jtab6':'youa/'}, //图片对应文件夹路径
+                imageCss:{'edui-emotion-Jtab0':'jd', 'edui-emotion-Jtab1':'tsj', 'edui-emotion-Jtab2':'ldw', 'edui-emotion-Jtab3':'bb', 'edui-emotion-Jtab4':'cat', 'edui-emotion-Jtab5':'pp', 'edui-emotion-Jtab6':'youa'}, //图片css类名
+                imageCssOffset:{'edui-emotion-Jtab0':35, 'edui-emotion-Jtab1':35, 'edui-emotion-Jtab2':35, 'edui-emotion-Jtab3':35, 'edui-emotion-Jtab4':35, 'edui-emotion-Jtab5':25, 'edui-emotion-Jtab6':35}, //图片偏移
+                SmileyInfor:{
+                    'edui-emotion-Jtab0':['Kiss', 'Love', 'Yeah', '啊！', '背扭', '顶', '抖胸', '88', '汗', '瞌睡', '鲁拉', '拍砖', '揉脸', '生日快乐', '大笑', '瀑布汗~', '惊讶', '臭美', '傻笑', '抛媚眼', '发怒', '打酱油', '俯卧撑', '气愤', '?', '吻', '怒', '胜利', 'HI', 'KISS', '不说', '不要', '扯花', '大心', '顶', '大惊', '飞吻', '鬼脸', '害羞', '口水', '狂哭', '来', '发财了', '吃西瓜', '套牢', '害羞', '庆祝', '我来了', '敲打', '晕了', '胜利', '臭美', '被打了', '贪吃', '迎接', '酷', '微笑', '亲吻', '调皮', '惊恐', '耍酷', '发火', '害羞', '汗水', '大哭', '', '加油', '困', '你NB', '晕倒', '开心', '偷笑', '大哭', '滴汗', '叹气', '超赞', '??', '飞吻', '天使', '撒花', '生气', '被砸', '吓傻', '随意吐'],
+                    'edui-emotion-Jtab1':['Kiss', 'Love', 'Yeah', '啊！', '背扭', '顶', '抖胸', '88', '汗', '瞌睡', '鲁拉', '拍砖', '揉脸', '生日快乐', '摊手', '睡觉', '瘫坐', '无聊', '星星闪', '旋转', '也不行', '郁闷', '正Music', '抓墙', '撞墙至死', '歪头', '戳眼', '飘过', '互相拍砖', '砍死你', '扔桌子', '少林寺', '什么？', '转头', '我爱牛奶', '我踢', '摇晃', '晕厥', '在笼子里', '震荡'],
+                    'edui-emotion-Jtab2':['大笑', '瀑布汗~', '惊讶', '臭美', '傻笑', '抛媚眼', '发怒', '我错了', 'money', '气愤', '挑逗', '吻', '怒', '胜利', '委屈', '受伤', '说啥呢？', '闭嘴', '不', '逗你玩儿', '飞吻', '眩晕', '魔法', '我来了', '睡了', '我打', '闭嘴', '打', '打晕了', '刷牙', '爆揍', '炸弹', '倒立', '刮胡子', '邪恶的笑', '不要不要', '爱恋中', '放大仔细看', '偷窥', '超高兴', '晕', '松口气', '我跑', '享受', '修养', '哭', '汗', '啊~', '热烈欢迎', '打酱油', '俯卧撑', '?'],
+                    'edui-emotion-Jtab3':['HI', 'KISS', '不说', '不要', '扯花', '大心', '顶', '大惊', '飞吻', '鬼脸', '害羞', '口水', '狂哭', '来', '泪眼', '流泪', '生气', '吐舌', '喜欢', '旋转', '再见', '抓狂', '汗', '鄙视', '拜', '吐血', '嘘', '打人', '蹦跳', '变脸', '扯肉', '吃To', '吃花', '吹泡泡糖', '大变身', '飞天舞', '回眸', '可怜', '猛抽', '泡泡', '苹果', '亲', '', '骚舞', '烧香', '睡', '套娃娃', '捅捅', '舞倒', '西红柿', '爱慕', '摇', '摇摆', '杂耍', '招财', '被殴', '被球闷', '大惊', '理想', '欧打', '呕吐', '碎', '吐痰'],
+                    'edui-emotion-Jtab4':['发财了', '吃西瓜', '套牢', '害羞', '庆祝', '我来了', '敲打', '晕了', '胜利', '臭美', '被打了', '贪吃', '迎接', '酷', '顶', '幸运', '爱心', '躲', '送花', '选择'],
+                    'edui-emotion-Jtab5':['微笑', '亲吻', '调皮', '惊讶', '耍酷', '发火', '害羞', '汗水', '大哭', '得意', '鄙视', '困', '夸奖', '晕倒', '疑问', '媒婆', '狂吐', '青蛙', '发愁', '亲吻', '', '爱心', '心碎', '玫瑰', '礼物', '哭', '奸笑', '可爱', '得意', '呲牙', '暴汗', '楚楚可怜', '困', '哭', '生气', '惊讶', '口水', '彩虹', '夜空', '太阳', '钱钱', '灯泡', '咖啡', '蛋糕', '音乐', '爱', '胜利', '赞', '鄙视', 'OK'],
+                    'edui-emotion-Jtab6':['男兜', '女兜', '开心', '乖乖', '偷笑', '大笑', '抽泣', '大哭', '无奈', '滴汗', '叹气', '狂晕', '委屈', '超赞', '??', '疑问', '飞吻', '天使', '撒花', '生气', '被砸', '口水', '泪奔', '吓傻', '吐舌头', '点头', '随意吐', '旋转', '困困', '鄙视', '狂顶', '篮球', '再见', '欢迎光临', '恭喜发财', '稍等', '我在线', '恕不议价', '库房有货', '货在路上']
+                }
+            }
+        },
+        initContent:function( _editor, $widget ){
+
+            var me = this,
+                emotion = me.sourceData.emotion,
+                lang = _editor.getLang( 'emotion' )['static'],
+                emotionUrl = UMEDITOR_CONFIG.UMEDITOR_HOME_URL + 'dialogs/emotion/',
+                options = $.extend( {}, lang, {
+                    emotion_url: emotionUrl
+                }),
+                $root = me.root();
+
+            if( me.inited ) {
+                me.preventDefault();
+                this.switchToFirst();
+                return;
+            }
+
+            me.inited = true;
+
+            editor = _editor;
+            this.widget = $widget;
+
+            emotion.SmileyPath = _editor.options.emotionLocalization === true ? emotionUrl + 'images/' : "http://img.baidu.com/hi/";
+            emotion.SmileyBox = me.createTabList( emotion.tabNum );
+            emotion.tabExist = me.createArr( emotion.tabNum );
+
+            options['cover_img'] = emotion.SmileyPath + (editor.options.emotionLocalization ? '0.gif' : 'default/0.gif');
+
+            $root.html( $.parseTmpl( me.tpl, options ) );
+
+            me.tabs = $.eduitab({selector:".edui-emotion-tab-Jpanel"});
+
+            //缓存预览对象
+            me.previewBox = $root.find(".edui-emotion-JtabIconReview");
+            me.previewImg = $root.find(".edui-emotion-JfaceReview");
+
+            me.initImgName();
+
+        },
+        initEvent:function(){
+
+            var me = this;
+
+            //防止点击过后关闭popup
+            me.root().on('click', function(e){
+                return false;
+            });
+
+            //移动预览
+            me.root().delegate( 'td', 'mouseover mouseout', function( evt ){
+
+                var $td = $( this),
+                    url = $td.attr('data-surl') || null;
+
+                if( url ) {
+                    me[evt.type]( this, url , $td.attr('data-posflag') );
+                }
+
+                return false;
+
+            } );
+
+            //点击选中
+            me.root().delegate( 'td', 'click', function( evt ){
+
+                var $td = $( this),
+                    realUrl = $td.attr('data-realurl') || null;
+
+                if( realUrl ) {
+                    me.insertSmiley( realUrl.replace( /'/g, "\\'" ), evt );
+                }
+
+                return false;
+
+            } );
+
+            //更新模板
+            me.tabs.edui().on("beforeshow", function( evt ){
+
+                var contentId = $(evt.target).attr('data-context').replace( /^.*\.(?=[^\s]*$)/, '' );
+
+                evt.stopPropagation();
+
+                me.updateTab( contentId );
+
+            });
+
+            this.switchToFirst();
+
+        },
+        initImgName: function() {
+
+            var emotion = this.sourceData.emotion;
+
+            for ( var pro in emotion.SmilmgName ) {
+                var tempName = emotion.SmilmgName[pro],
+                    tempBox = emotion.SmileyBox[pro],
+                    tempStr = "";
+
+                if ( tempBox.length ) return;
+
+                for ( var i = 1; i <= tempName[1]; i++ ) {
+                    tempStr = tempName[0];
+                    if ( i < 10 ) tempStr = tempStr + '0';
+                    tempStr = tempStr + i + '.gif';
+                    tempBox.push( tempStr );
+                }
+            }
+
+        },
+        /**
+         * 切换到第一个tab
+         */
+        switchToFirst: function(){
+            this.root().find(".edui-emotion-Jtabnav .edui-tab-text:first").trigger('click');
+        },
+        updateTab: function( contentBoxId ) {
+
+            var me = this,
+                emotion = me.sourceData.emotion;
+
+            me.autoHeight( contentBoxId );
+
+            if ( !emotion.tabExist[ contentBoxId ] ) {
+
+                emotion.tabExist[ contentBoxId ] = true;
+                me.createTab( contentBoxId );
+
+            }
+
+        },
+        autoHeight: function( ) {
+            this.widget.height(this.root() + 2);
+        },
+        createTabList: function( tabNum ) {
+            var obj = {};
+            for ( var i = 0; i < tabNum; i++ ) {
+                obj["edui-emotion-Jtab" + i] = [];
+            }
+            return obj;
+        },
+        mouseover: function( td, srcPath, posFlag ) {
+
+            posFlag -= 0;
+
+            $(td).css( 'backgroundColor', '#ACCD3C' );
+
+            this.previewImg.css( "backgroundImage", "url(" + srcPath + ")" );
+            posFlag && this.previewBox.addClass('edui-emotion-preview-left');
+            this.previewBox.show();
+
+        },
+        mouseout: function( td ) {
+            $(td).css( 'backgroundColor', 'transparent' );
+            this.previewBox.removeClass('edui-emotion-preview-left').hide();
+        },
+        insertSmiley: function( url, evt ) {
+            var obj = {
+                src: url
+            };
+            obj._src = obj.src;
+            editor.execCommand( 'insertimage', obj );
+            if ( !evt.ctrlKey ) {
+                //关闭预览
+                this.previewBox.removeClass('edui-emotion-preview-left').hide();
+                this.widget.edui().hide();
+            }
+        },
+        createTab: function( contentBoxId ) {
+
+            var faceVersion = "?v=1.1", //版本号
+                me = this,
+                $contentBox = this.root().find("."+contentBoxId),
+                emotion = me.sourceData.emotion,
+                imagePath = emotion.SmileyPath + emotion.imageFolders[ contentBoxId ], //获取显示表情和预览表情的路径
+                positionLine = 11 / 2, //中间数
+                iWidth = iHeight = 35, //图片长宽
+                iColWidth = 3, //表格剩余空间的显示比例
+                tableCss = emotion.imageCss[ contentBoxId ],
+                cssOffset = emotion.imageCssOffset[ contentBoxId ],
+                textHTML = ['<table border="1" class="edui-emotion-smileytable">'],
+                i = 0, imgNum = emotion.SmileyBox[ contentBoxId ].length, imgColNum = 11, faceImage,
+                sUrl, realUrl, posflag, offset, infor;
+
+            for ( ; i < imgNum; ) {
+                textHTML.push( '<tr>' );
+                for ( var j = 0; j < imgColNum; j++, i++ ) {
+                    faceImage = emotion.SmileyBox[ contentBoxId ][i];
+                    if ( faceImage ) {
+                        sUrl = imagePath + faceImage + faceVersion;
+                        realUrl = imagePath + faceImage;
+                        posflag = j < positionLine ? 0 : 1;
+                        offset = cssOffset * i * (-1) - 1;
+                        infor = emotion.SmileyInfor[ contentBoxId ][i];
+
+                        textHTML.push( '<td  class="edui-emotion-' + tableCss + '" data-surl="'+ sUrl +'" data-realurl="'+ realUrl +'" data-posflag="'+ posflag +'" align="center">' );
+                        textHTML.push( '<span>' );
+                        textHTML.push( '<img  style="background-position:left ' + offset + 'px;" title="' + infor + '" src="' + emotion.SmileyPath + (editor.options.emotionLocalization ? '0.gif" width="' : 'default/0.gif" width="') + iWidth + '" height="' + iHeight + '"></img>' );
+                        textHTML.push( '</span>' );
+                    } else {
+                        textHTML.push( '<td bgcolor="#FFFFFF">' );
+                    }
+                    textHTML.push( '</td>' );
+                }
+                textHTML.push( '</tr>' );
+            }
+            textHTML.push( '</table>' );
+            textHTML = textHTML.join( "" );
+            $contentBox.html( textHTML );
+        },
+        createArr: function( tabNum ) {
+            var arr = [];
+            for ( var i = 0; i < tabNum; i++ ) {
+                arr[i] = 0;
+            }
+            return arr;
+        },
+        width:603,
+        height:400
+    });
+
+})();
+
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/emotion/images/0.gif b/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/emotion/images/0.gif
new file mode 100644
index 0000000..6964168
Binary files /dev/null and b/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/emotion/images/0.gif differ
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/emotion/images/bface.gif b/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/emotion/images/bface.gif
new file mode 100644
index 0000000..14fe618
Binary files /dev/null and b/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/emotion/images/bface.gif differ
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/emotion/images/cface.gif b/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/emotion/images/cface.gif
new file mode 100644
index 0000000..bff947f
Binary files /dev/null and b/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/emotion/images/cface.gif differ
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/emotion/images/fface.gif b/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/emotion/images/fface.gif
new file mode 100644
index 0000000..0d8a6af
Binary files /dev/null and b/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/emotion/images/fface.gif differ
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/emotion/images/jxface2.gif b/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/emotion/images/jxface2.gif
new file mode 100644
index 0000000..a959c90
Binary files /dev/null and b/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/emotion/images/jxface2.gif differ
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/emotion/images/neweditor-tab-bg.png b/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/emotion/images/neweditor-tab-bg.png
new file mode 100644
index 0000000..8f398b0
Binary files /dev/null and b/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/emotion/images/neweditor-tab-bg.png differ
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/emotion/images/tface.gif b/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/emotion/images/tface.gif
new file mode 100644
index 0000000..1354f54
Binary files /dev/null and b/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/emotion/images/tface.gif differ
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/emotion/images/wface.gif b/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/emotion/images/wface.gif
new file mode 100644
index 0000000..5667160
Binary files /dev/null and b/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/emotion/images/wface.gif differ
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/emotion/images/yface.gif b/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/emotion/images/yface.gif
new file mode 100644
index 0000000..51608be
Binary files /dev/null and b/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/emotion/images/yface.gif differ
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/formula/formula.css b/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/formula/formula.css
new file mode 100644
index 0000000..45d4865
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/formula/formula.css
@@ -0,0 +1,32 @@
+.edui-popup-formula .edui-formula-wrapper {
+    padding: 15px;
+}
+.edui-popup-formula .edui-formula-wrapper .edui-tab-nav{
+    height: auto;
+    *height: 31px;
+}
+.edui-popup-formula .edui-formula-wrapper .edui-tab-text {
+    font-size: 12px;
+}
+.edui-popup-formula .edui-formula-wrapper .edui-formula-clearboth {
+    clear: both;
+    width: 0;
+    height: 0;
+}
+.edui-popup-formula .edui-formula-wrapper .edui-tab-pane ul {
+    margin: 0px;
+    padding: 0px;
+}
+.edui-popup-formula .edui-formula-wrapper .edui-tab-content {
+    padding: 5px 0px 0px 0px;
+}
+.edui-popup-formula .edui-formula-wrapper .edui-tab-pane .edui-formula-latex-item {
+    display: block;
+    float: left;
+    margin: 0px 3px 3px 0px;
+    width: 30px;
+    height: 30px;
+    border:1px solid #cccccc;
+    background-image: url("images/formula.png");
+    cursor: pointer;
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/formula/formula.html b/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/formula/formula.html
new file mode 100644
index 0000000..d3c47fc
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/formula/formula.html
@@ -0,0 +1,213 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Document</title>
+    <link rel="stylesheet" href="../../third-party/mathquill/mathquill.css"/>
+    <style>
+        html, body, .main{
+            margin: 0;
+            padding: 0;
+            overflow: hidden;
+        }
+        .main{
+            width:1024px;
+            height:1024px;
+        }
+        .mathquill-editable,
+        .mathquill-rendered-math{
+            border: 0px;
+            padding: 0px;
+            margin:4px;
+        }
+    </style>
+</head>
+<body>
+
+<div class="main">
+    <div class="mathquill-editable"></div>
+</div>
+
+<div>
+    <input id="blurHelper" />
+</div>
+
+<script src="../../third-party/jquery.min.js"></script>
+<script type="text/javascript" src="../third-party/template.min.js"></script>
+<script src="../../third-party/mathquill/mathquill.js"></script>
+<script>
+    $(function(){
+
+        var UM = parent.UM,
+            $iframe = $(getSelfIframe()),
+            editorId = $iframe.parents('.edui-body-container').attr('id'),
+            editor = UM.getEditor(editorId),
+            timer;
+
+        /* 获得当前公式所在的iframe节点 */
+        function getSelfIframe(){
+            var iframes = parent.document.getElementsByTagName('iframe');
+            for (var key in iframes) {
+                if (iframes[key].contentWindow == window) {
+                    return iframes[key];
+                }
+            }
+            return null;
+        }
+        /* 获得当前url上的hash存储的参数值 */
+        function getLatex() {
+            return $iframe.attr('data-latex') || '';
+        }
+        /* 保存场景 */
+        function saveScene(){
+            timer && clearTimeout(timer);
+            timer = setTimeout(function(){
+                editor.fireEvent('savescene');
+                editor.fireEvent('contentchange');
+                editor.fireEvent('selectionchange');
+                timer = null;
+            }, 300);
+        }
+        /* 设置编辑器可编辑 */
+        function enableEditor(){
+            if(editor.body.contentEditable == 'false') {
+                editor.setEnabled();
+            }
+        }
+        /* 设置编辑器不可编辑 */
+        function disableEditor(){
+            if(editor.body.contentEditable == 'true') {
+                editor.setDisabled(['undo', 'redo', 'preview', 'formula'], true);
+            }
+        }
+
+        /* 公式 */
+        var Formula = function(){
+            var _this = this,
+                latex = getLatex();
+
+            this.isFocus = false;
+            this.isDisabled = false;
+
+            /* 加载公式内容 */
+            this.$mathquill = $('.mathquill-editable').mathquill('latex', latex);
+
+            /* 设置活动状态的公式iframe */
+            this.$mathquill.on('mousedown', function(){
+                /* 编辑器不可用时,公式也不可用 */
+                if(_this.disabled) return false;
+
+                /* 第一次点击当前公式,设置公式活动 */
+                if(!$iframe.hasClass('edui-formula-active')) {
+                    disableEditor();
+                    editor.blur();
+                    editor.$body.find('iframe').not($iframe).each(function(k, v){
+                        v.contentWindow.formula.blur();
+                    });
+                    if(_this.$mathquill.find('.cursor').css('display') == 'none') {
+                        _this.refresh();
+                        _this.$mathquill.addClass('hasCursor');
+                    }
+                }
+                _this.focus();
+            });
+            editor.addListener('click', function(){
+                _this.blur();
+                enableEditor();
+            });
+
+            /* 里面focus,编辑器也判断为focus */
+            editor.addListener('isFocus', function(){
+                return _this.isFocus;
+            });
+            /* um不可用,公式也不可编辑 */
+            editor.addListener('setDisabled', function(type, except){
+                if (!(except && except.join(' ').indexOf('formula') != -1) && _this.isDisabled != true ) {
+                    _this.setDisabled();
+                }
+            });
+            editor.addListener('setEnabled', function(){
+                if (_this.isDisabled != false) {
+                    _this.setEnabled();
+                }
+            });
+
+            /* 设置更新外层iframe的大小和属性 */
+            $(document.body).on('keydown', function(){
+                _this.updateIframe();
+            }).on('keyup', function(){
+                _this.updateIframe();
+            });
+
+            /* 清除初始化的高亮状态 */
+            this.$mathquill.removeClass('hasCursor');
+
+            /* 初始化后延迟刷新外层iframe大小 */
+            setTimeout(function(){
+                _this.updateIframe();
+            }, 300);
+        };
+
+        Formula.prototype = {
+            focus:function(){
+                $iframe.addClass('edui-formula-active');
+                this.isFocus = true;
+            },
+            blur:function(){
+                $iframe.removeClass('edui-formula-active');
+                this.removeCursor();
+                this.isFocus = false;
+            },
+            removeCursor: function(){
+                this.$mathquill.find('span.cursor').hide();
+                this.$mathquill.parent().find('.hasCursor').removeClass('hasCursor');
+            },
+            updateIframe: function(){
+                $iframe.width(this.$mathquill.width()+8).height(this.$mathquill.height()+8);
+                var latex = $iframe.attr('data-latex'),
+                    newLatex = this.getLatex();
+                if(latex != newLatex) {
+                    $iframe.attr('data-latex', this.getLatex());
+                    saveScene();
+                }
+            },
+            insertLatex: function(latex){
+                this.$mathquill.mathquill('write', latex);
+                this.updateIframe();
+                this.removeCursor();
+            },
+            setLatex: function(latex){
+                this.$mathquill.mathquill('latex', latex);
+                this.updateIframe();
+            },
+            getLatex: function(){
+                return this.$mathquill.mathquill('latex');
+            },
+            redraw: function(){
+                this.$mathquill.mathquill('redraw');
+            },
+            setDisabled: function(){
+                this.blur();
+                var latex = this.getLatex();
+                this.$mathquill.mathquill('revert').text(latex).mathquill();
+                this.updateIframe();
+                this.isDisabled = true;
+            },
+            setEnabled: function(){
+                this.$mathquill.removeClass('mathquill-rendered-math');
+                this.refresh();
+                this.isDisabled = false;
+            },
+            refresh: function(){
+                var latex = this.getLatex();
+                this.$mathquill.mathquill('revert').text(latex).mathquill('editable');
+                this.updateIframe();
+            }
+        };
+
+        /* 绑定到window上，给上级window调用 */
+        window.formula = new Formula();
+    });
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/formula/formula.js b/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/formula/formula.js
new file mode 100644
index 0000000..ffa9e78
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/formula/formula.js
@@ -0,0 +1,124 @@
+(function () {
+
+    var editor = null;
+
+    UM.registerWidget('formula', {
+
+        tpl: "<link type=\"text/css\" rel=\"stylesheet\" href=\"<%=formula_url%>formula.css\">" +
+            "<div class=\"edui-formula-wrapper\">" +
+            "<ul class=\"edui-tab-nav\"></ul>" +
+            "<div class=\"edui-tab-content\"></div>" +
+            "</div>",
+
+        sourceData: {
+            formula: {
+                'common': [
+                    "{/}frac{ }{ }", "^{ }/_{ }", "x^{ }", "x_{ }", "x^{ }_{ }", "{/}bar{ }", "{/}sqrt{ }", "{/}nthroot{ }{ }",
+                    "{/}sum^{ }_{n=}", "{/}sum", "{/}log_{ }", "{/}ln", "{/}int_{ }^{ }", "{/}oint_{ }^{ }"
+                ],
+                'symbol': [
+                    "+", "-", "{/}pm", "{/}times", "{/}ast", "{/}div", "/", "{/}bigtriangleup",
+                    "=", "{/}ne", "{/}approx", ">", "<", "{/}ge", "{/}le", "{/}infty",
+                    "{/}cap", "{/}cup", "{/}because", "{/}therefore", "{/}subset", "{/}supset", "{/}subseteq", "{/}supseteq",
+                    "{/}nsubseteq", "{/}nsupseteq", "{/}in", "{/}ni", "{/}notin", "{/}mapsto", "{/}leftarrow", "{/}rightarrow",
+                    "{/}Leftarrow", "{/}Rightarrow", "{/}leftrightarrow", "{/}Leftrightarrow"
+                ],
+                'letter': [
+                    "{/}alpha", "{/}beta", "{/}gamma", "{/}delta", "{/}varepsilon", "{/}varphi", "{/}lambda", "{/}mu",
+                    "{/}rho", "{/}sigma", "{/}omega", "{/}Gamma", "{/}Delta", "{/}Theta", "{/}Lambda", "{/}Xi",
+                    "{/}Pi", "{/}Sigma", "{/}Upsilon", "{/}Phi", "{/}Psi", "{/}Omega"
+                ]
+            }
+        },
+        initContent: function (_editor, $widget) {
+
+            var me = this,
+                formula = me.sourceData.formula,
+                lang = _editor.getLang('formula').static,
+                formulaUrl = UMEDITOR_CONFIG.UMEDITOR_HOME_URL + 'dialogs/formula/',
+                options = $.extend({}, lang, { 'formula_url': formulaUrl }),
+                $root = me.root();
+
+            if (me.inited) {
+                me.preventDefault();
+                return;
+            }
+            me.inited = true;
+
+            editor = _editor;
+            me.$widget = $widget;
+
+            $root.html($.parseTmpl(me.tpl, options));
+            me.tabs = $.eduitab({selector: "#edui-formula-tab-Jpanel"});
+
+            /* 初始化popup的内容 */
+            var headHtml = [], xMax = 0, yMax = 0,
+                $tabContent = me.root().find('.edui-tab-content');
+            $.each(formula, function (k, v) {
+                var contentHtml = [];
+                $.each(v, function (i, f) {
+                    contentHtml.push('<li class="edui-formula-latex-item" data-latex="' + f + '" style="background-position:-' + (xMax * 30) + 'px -' + (yMax * 30) + 'px"></li>');
+                    if (++xMax >=8) {
+                        ++yMax; xMax = 0;
+                    }
+                });
+                yMax++; xMax = 0;
+                $tabContent.append('<div class="edui-tab-pane"><ul>' + contentHtml.join('') + '</ul>');
+                headHtml.push('<li class="edui-tab-item"><a href="javascript:void(0);" class="edui-tab-text">' + lang['lang_tab_' + k] + '</a></li>');
+            });
+            headHtml.push('<li class="edui-formula-clearboth"></li>');
+            $root.find('.edui-tab-nav').html(headHtml.join(''));
+            $root.find('.edui-tab-content').append('<div class="edui-formula-clearboth"></div>');
+
+            /* 选中第一个tab */
+            me.switchTab(0);
+        },
+        initEvent: function () {
+            var me = this;
+
+            //防止点击过后关闭popup
+            me.root().on('click', function (e) {
+                return false;
+            });
+
+            //点击tab切换菜单
+            me.root().find('.edui-tab-nav').delegate('.edui-tab-item', 'click', function (evt) {
+                me.switchTab(this);
+                return false;
+            });
+
+            //点击选中公式
+            me.root().find('.edui-tab-pane').delegate('.edui-formula-latex-item', 'click', function (evt) {
+                var $item = $(this),
+                    latex = $item.attr('data-latex') || '';
+
+                if (latex) {
+                    me.insertLatex(latex.replace("{/}", "\\"));
+                }
+                me.$widget.edui().hide();
+                return false;
+            });
+        },
+        switchTab:function(index){
+            var me = this,
+                $root = me.root(),
+                index = $.isNumeric(index) ? index:$.inArray(index, $root.find('.edui-tab-nav .edui-tab-item'));
+
+            $root.find('.edui-tab-nav .edui-tab-item').removeClass('edui-active').eq(index).addClass('edui-active');
+            $root.find('.edui-tab-content .edui-tab-pane').removeClass('edui-active').eq(index).addClass('edui-active');
+
+            /* 自动长高 */
+            me.autoHeight(0);
+        },
+        autoHeight: function () {
+            this.$widget.height(this.root() + 2);
+        },
+        insertLatex: function (latex) {
+            editor.execCommand('formula', latex );
+        },
+        width: 350,
+        height: 400
+    });
+
+})();
+
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/formula/images/formula.png b/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/formula/images/formula.png
new file mode 100644
index 0000000..04cbb3b
Binary files /dev/null and b/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/formula/images/formula.png differ
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/image/image.css b/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/image/image.css
new file mode 100644
index 0000000..5548391
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/image/image.css
@@ -0,0 +1,42 @@
+.edui-dialog-image .edui-image-wrapper{font-size: 12px;margin: 15px;}
+
+/*upload*/
+.edui-dialog-image .edui-image-upload1{position: absolute;top:50%;left:50%;width:44px;height:38px;margin-top:-19px; margin-left: -22px;}
+.edui-dialog-image .edui-image-upload2{position:relative;float:left;width:120px;height:120px;margin:5px 0 0 5px;}
+
+.edui-dialog-image .edui-image-form{position: absolute;left: 0px;top: 0px;width: 100%;height: 100%;opacity: 0;cursor: pointer;}
+.edui-dialog-image .edui-image-form .edui-image-file{width: 100%;height:100%;filter: alpha(opacity=0)}
+
+.edui-dialog-image .edui-image-upload1 .edui-image-icon{display: inline-block;width:44px;height:38px;background-image: url('images/upload1.png')}
+.edui-dialog-image .edui-image-upload1 .edui-image-icon.hover{background-position: -50px 0;}
+.edui-dialog-image .edui-image-upload2 .edui-image-icon{display: inline-block;width:120px;height:120px;background-image: url('images/upload2.png')}
+
+.edui-dialog-image .edui-image-dragTip{position: absolute;display:none;top:50%;left:50%;margin-top:30px;margin-left: -60px;
+    color: #222;font-size:14px;text-shadow: 0px 2px 3px #555;}
+
+.edui-dialog-image .edui-image-content{height:330px;width:100%;position: relative;}
+
+.edui-dialog-image .edui-image-mask{display: none;position: absolute;top:0;left:0;width: 100%; height: 100%;background-color:#fff;
+    text-align: center;line-height:300px;color:#000;font-size:14px;font-weight:bold;opacity: 0.6;filter: alpha(opacity=60);}
+.edui-dialog-image .edui-image-mask.edui-active{display: block;}
+
+/*network*/
+.edui-dialog-image .edui-image-searchBar{margin: 10px;}
+.edui-dialog-image .edui-image-searchBar .edui-image-searchTxt{display: inline-block !important;*display: inline !important;*zoom:1;width:400px; border: 1px solid #c5d2ff; height: 20px; line-height: 18px; font-size: 14px; padding: 3px; margin: 0;outline:0;}
+.edui-dialog-image .edui-image-searchBar .edui-image-searchAdd{display: inline-block !important;*display: inline !important;*zoom:1;
+    width:60px; text-align:center;height: 25px;text-align: center;line-height: 25px;
+    background-color: #ffffff;padding: 0; border: 1px solid #ababab;margin-left: 20px;cursor: pointer;
+}
+.edui-dialog-image .edui-image-searchBar .edui-image-searchAdd.hover{
+    background-color: #d5e1f2;
+    padding: 0;
+    border: 1px solid #a3bde3;
+}
+.edui-dialog-image .edui-image-searchRes{height:280px;overflow:auto;}
+
+
+/*common*/
+.edui-dialog-image .edui-image-item{position:relative;float:left;width:120px;height:120px;border: 1px solid #CCC;cursor: default;margin: 5px 0 0 5px;}
+.edui-dialog-image .edui-image-item .edui-image-pic{position: absolute;left:-9999px;}
+.edui-dialog-image .edui-image-item .edui-image-close{position:absolute;right:0;background: url('images/close.png');width:17px;height:17px;cursor:pointer;z-index:1}
+.edui-dialog-image .edui-image-item.hover .edui-image-close{display: block;}
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/image/image.js b/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/image/image.js
new file mode 100644
index 0000000..a4a8264
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/image/image.js
@@ -0,0 +1,450 @@
+(function () {
+
+    var utils = UM.utils,
+        browser = UM.browser,
+        Base = {
+        checkURL: function (url) {
+            if(!url)    return false;
+            url = utils.trim(url);
+            if (url.length <= 0) {
+                return false;
+            }
+            if (url.search(/http:\/\/|https:\/\//) !== 0) {
+                url += 'http://';
+            }
+
+            url=url.replace(/\?[\s\S]*$/,"");
+
+            if (!/(.gif|.jpg|.jpeg|.png)$/i.test(url)) {
+                return false;
+            }
+            return url;
+        },
+        getAllPic: function (sel, $w, editor) {
+            var me = this,
+                arr = [],
+                $imgs = $(sel, $w);
+
+            $.each($imgs, function (index, node) {
+                $(node).removeAttr("width").removeAttr("height");
+
+//                if (node.width > editor.options.initialFrameWidth) {
+//                    me.scale(node, editor.options.initialFrameWidth -
+//                        parseInt($(editor.body).css("padding-left"))  -
+//                        parseInt($(editor.body).css("padding-right")));
+//                }
+
+                return arr.push({
+                    _src: node.src,
+                    src: node.src
+                });
+            });
+
+            return arr;
+        },
+        scale: function (img, max, oWidth, oHeight) {
+            var width = 0, height = 0, percent, ow = img.width || oWidth, oh = img.height || oHeight;
+            if (ow > max || oh > max) {
+                if (ow >= oh) {
+                    if (width = ow - max) {
+                        percent = (width / ow).toFixed(2);
+                        img.height = oh - oh * percent;
+                        img.width = max;
+                    }
+                } else {
+                    if (height = oh - max) {
+                        percent = (height / oh).toFixed(2);
+                        img.width = ow - ow * percent;
+                        img.height = max;
+                    }
+                }
+            }
+
+            return this;
+        },
+        close: function ($img) {
+
+            $img.css({
+                top: ($img.parent().height() - $img.height()) / 2,
+                left: ($img.parent().width()-$img.width())/2
+            }).prev().on("click",function () {
+
+                if ( $(this).parent().remove().hasClass("edui-image-upload-item") ) {
+                    //显示图片计数-1
+                    Upload.showCount--;
+                    Upload.updateView();
+                }
+
+            });
+
+            return this;
+        },
+        createImgBase64: function (img, file, $w) {
+            if (browser.webkit) {
+                //Chrome8+
+                img.src = window.webkitURL.createObjectURL(file);
+            } else if (browser.gecko) {
+                //FF4+
+                img.src = window.URL.createObjectURL(file);
+            } else {
+                //实例化file reader对象
+                var reader = new FileReader();
+                reader.onload = function (e) {
+                    img.src = this.result;
+                    $w.append(img);
+                };
+                reader.readAsDataURL(file);
+            }
+        },
+        callback: function (editor, $w, url, state) {
+
+            if (state == "SUCCESS") {
+                //显示图片计数+1
+                Upload.showCount++;
+//                var $img = $("<img src='" + editor.options.imagePath + url + "' class='edui-image-pic' />"),
+//                    $item = $("<div class='edui-image-item edui-image-upload-item'><div class='edui-image-close'></div></div>").append($img);
+
+                
+//                <span style="color:#ff6666;">
+                var $img = $("<img src='" + url + "'  class='edui-image-pic' />"),
+                $item = $("<div class='edui-image-item edui-image-upload-item'><div class='edui-image-close'></div></div>").append($img); 
+                
+                if ($(".edui-image-upload2", $w).length < 1) {
+                    $(".edui-image-content", $w).append($item);
+
+                    Upload.render(".edui-image-content", 2)
+                        .config(".edui-image-upload2");
+                } else {
+                    $(".edui-image-upload2", $w).before($item).show();
+                }
+
+                $img.on("load", function () {
+                    Base.scale(this, 120);
+                    Base.close($(this));
+                    $(".edui-image-content", $w).focus();
+                });
+
+            } else {
+                currentDialog.showTip( state );
+                window.setTimeout( function () {
+
+                    currentDialog.hideTip();
+
+                }, 3000 );
+            }
+
+            Upload.toggleMask();
+
+        }
+    };
+
+    /*
+     * 本地上传
+     * */
+    var Upload = {
+        showCount: 0,
+        uploadTpl: '<div class="edui-image-upload%%">' +
+            '<span class="edui-image-icon"></span>' +
+            '<form class="edui-image-form" method="post" enctype="multipart/form-data" target="up">' +
+            '<input style=\"filter: alpha(opacity=0);\" class="edui-image-file" type="file" hidefocus name="upfile" accept="image/gif,image/jpeg,image/png,image/jpg,image/bmp"/>' +
+            '</form>' +
+
+            '</div>',
+        init: function (editor, $w) {
+            var me = this;
+
+            me.editor = editor;
+            me.dialog = $w;
+            me.render(".edui-image-local", 1);
+            me.config(".edui-image-upload1");
+            me.submit();
+            me.drag();
+
+            $(".edui-image-upload1").hover(function () {
+                $(".edui-image-icon", this).toggleClass("hover");
+            });
+
+            if (!(UM.browser.ie && UM.browser.version <= 9)) {
+                $(".edui-image-dragTip", me.dialog).css("display", "block");
+            }
+
+
+            return me;
+        },
+        render: function (sel, t) {
+            var me = this;
+
+            $(sel, me.dialog).append($(me.uploadTpl.replace(/%%/g, t)));
+
+            return me;
+        },
+        config: function (sel) {
+            var me = this,
+                url=me.editor.options.imageUrl;
+
+            url=url + (url.indexOf("?") == -1 ? "?" : "&") + "editorid="+me.editor.id;//初始form提交地址;
+  
+            $("form", $(sel, me.dialog)).attr("action", url);
+
+            return me;
+        },
+        uploadComplete: function(r){
+            var me = this;
+            try{
+                var json = eval('('+r+')');
+                Base.callback(me.editor, me.dialog, json.url, json.state);
+            }catch (e){
+                var lang = me.editor.getLang('image');
+                Base.callback(me.editor, me.dialog, '', (lang && lang.uploadError) || 'Error!');
+            }
+        },
+        submit: function (callback) {
+
+            var me = this,
+                input = $( '<input style="filter: alpha(opacity=0);" class="edui-image-file" type="file" hidefocus="" name="upfile" accept="image/gif,image/jpeg,image/png,image/jpg,image/bmp">'),
+                input = input[0];
+
+            $(me.dialog).delegate( ".edui-image-file", "change", function ( e ) {
+
+                if ( !this.parentNode ) {
+                    return;
+                }
+
+                $('<iframe name="up"  style="display: none"></iframe>').insertBefore(me.dialog).on('load', function(){
+                    var r = this.contentWindow.document.body.innerHTML;
+                    if(r == '')return;
+                    me.uploadComplete(r);
+                    $(this).unbind('load');
+                    $(this).remove();
+
+                });
+
+                $(this).parent()[0].submit();
+                Upload.updateInput( input );
+                me.toggleMask("Loading....");
+                callback && callback();
+
+            });
+
+            return me;
+        },
+        //更新input
+        updateInput: function ( inputField ) {
+
+            $( ".edui-image-file", this.dialog ).each( function ( index, ele ) {
+
+                ele.parentNode.replaceChild( inputField.cloneNode( true ), ele );
+
+            } );
+
+        },
+        //更新上传框
+        updateView: function () {
+
+            if ( Upload.showCount !== 0 ) {
+                return;
+            }
+
+            $(".edui-image-upload2", this.dialog).hide();
+            $(".edui-image-dragTip", this.dialog).show();
+            $(".edui-image-upload1", this.dialog).show();
+
+        },
+        drag: function () {
+            var me = this;
+            //做拽上传的支持
+            if (!UM.browser.ie9below) {
+                me.dialog.find('.edui-image-content').on('drop',function (e) {
+
+                    //获取文件列表
+                    var fileList = e.originalEvent.dataTransfer.files;
+                    var img = document.createElement('img');
+                    var hasImg = false;
+                    $.each(fileList, function (i, f) {
+                        if (/^image/.test(f.type)) {
+                            //创建图片的base64
+                            Base.createImgBase64(img, f, me.dialog);
+
+                            var xhr = new XMLHttpRequest();
+                            xhr.open("post", me.editor.getOpt('imageUrl') + "?type=ajax", true);
+                            xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
+
+                            //模拟数据
+                            var fd = new FormData();
+                            fd.append(me.editor.getOpt('imageFieldName'), f);
+
+                            xhr.send(fd);
+                            xhr.addEventListener('load', function (e) {
+                                var r = e.target.response, json;
+                                me.uploadComplete(r);
+                                if (i == fileList.length - 1) {
+                                    $(img).remove()
+                                }
+                            });
+                            hasImg = true;
+                        }
+                    });
+                    if (hasImg) {
+                        e.preventDefault();
+                        me.toggleMask("Loading....");
+                    }
+
+                }).on('dragover', function (e) {
+                        e.preventDefault();
+                    });
+            }
+        },
+        toggleMask: function (html) {
+            var me = this;
+
+            var $mask = $(".edui-image-mask", me.dialog);
+            if (html) {
+                if (!(UM.browser.ie && UM.browser.version <= 9)) {
+                    $(".edui-image-dragTip", me.dialog).css( "display", "none" );
+                }
+                $(".edui-image-upload1", me.dialog).css( "display", "none" );
+                $mask.addClass("edui-active").html(html);
+            } else {
+
+                $mask.removeClass("edui-active").html();
+
+                if ( Upload.showCount > 0 ) {
+                    return me;
+                }
+
+                if (!(UM.browser.ie && UM.browser.version <= 9) ){
+                    $(".edui-image-dragTip", me.dialog).css("display", "block");
+                }
+                $(".edui-image-upload1", me.dialog).css( "display", "block" );
+            }
+
+            return me;
+        }
+    };
+
+    /*
+     * 网络图片
+     * */
+    var NetWork = {
+        init: function (editor, $w) {
+            var me = this;
+
+            me.editor = editor;
+            me.dialog = $w;
+
+            me.initEvt();
+        },
+        initEvt: function () {
+            var me = this,
+                url,
+                $ele = $(".edui-image-searchTxt", me.dialog);
+
+            $(".edui-image-searchAdd", me.dialog).on("click", function () {
+                url = Base.checkURL($ele.val());
+
+                if (url) {
+
+                    $("<img src='" + url + "' class='edui-image-pic' />").on("load", function () {
+
+
+
+                        var $item = $("<div class='edui-image-item'><div class='edui-image-close'></div></div>").append(this);
+
+                        $(".edui-image-searchRes", me.dialog).append($item);
+
+                        Base.scale(this, 120);
+
+                        $item.width($(this).width());
+
+                        Base.close($(this));
+
+                        $ele.val("");
+                    });
+                }
+            })
+                .hover(function () {
+                    $(this).toggleClass("hover");
+                });
+        }
+    };
+
+    var $tab = null,
+        currentDialog = null;
+
+    UM.registerWidget('image', {
+        tpl: "<link rel=\"stylesheet\" type=\"text/css\" href=\"<%=image_url%>image.css\">" +
+            "<div class=\"edui-image-wrapper\">" +
+            "<ul class=\"edui-tab-nav\">" +
+            "<li class=\"edui-tab-item edui-active\"><a data-context=\".edui-image-local\" class=\"edui-tab-text\"><%=lang_tab_local%></a></li>" +
+            "<li  class=\"edui-tab-item\"><a data-context=\".edui-image-JimgSearch\" class=\"edui-tab-text\"><%=lang_tab_imgSearch%></a></li>" +
+            "</ul>" +
+            "<div class=\"edui-tab-content\">" +
+            "<div class=\"edui-image-local edui-tab-pane edui-active\">" +
+            "<div class=\"edui-image-content\"></div>" +
+            "<div class=\"edui-image-mask\"></div>" +
+            "<div class=\"edui-image-dragTip\"><%=lang_input_dragTip%></div>" +
+            "</div>" +
+            "<div class=\"edui-image-JimgSearch edui-tab-pane\">" +
+            "<div class=\"edui-image-searchBar\">" +
+            "<table><tr><td><input class=\"edui-image-searchTxt\" type=\"text\"></td>" +
+            "<td><div class=\"edui-image-searchAdd\"><%=lang_btn_add%></div></td></tr></table>" +
+            "</div>" +
+            "<div class=\"edui-image-searchRes\"></div>" +
+            "</div>" +
+            "</div>" +
+            "</div>",
+        initContent: function (editor, $dialog) {
+            var lang = editor.getLang('image')["static"],
+                opt = $.extend({}, lang, {
+                    image_url: UMEDITOR_CONFIG.UMEDITOR_HOME_URL + 'dialogs/image/'
+                });
+
+            Upload.showCount = 0;
+
+            if (lang) {
+                var html = $.parseTmpl(this.tpl, opt);
+            }
+
+            currentDialog = $dialog.edui();
+
+            this.root().html(html);
+
+        },
+        initEvent: function (editor, $w) {
+            $tab = $.eduitab({selector: ".edui-image-wrapper"})
+                .edui().on("beforeshow", function (e) {
+                    e.stopPropagation();
+                });
+
+            Upload.init(editor, $w);
+
+            NetWork.init(editor, $w);
+        },
+        buttons: {
+            'ok': {
+                exec: function (editor, $w) {
+                    var sel = "",
+                        index = $tab.activate();
+
+                    if (index == 0) {
+                        sel = ".edui-image-content .edui-image-pic";
+                    } else if (index == 1) {
+                        sel = ".edui-image-searchRes .edui-image-pic";
+                    }
+
+                    var list = Base.getAllPic(sel, $w, editor);
+
+                    if (index != -1) {
+                        editor.execCommand('insertimage', list);
+                    }
+                }
+            },
+            'cancel': {}
+        },
+        width: 700,
+        height: 408
+    }, function (editor, $w, url, state) {
+        Base.callback(editor, $w, url, state)
+    })
+})();
+
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/image/images/close.png b/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/image/images/close.png
new file mode 100644
index 0000000..d368388
Binary files /dev/null and b/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/image/images/close.png differ
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/image/images/upload1.png b/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/image/images/upload1.png
new file mode 100644
index 0000000..c9056ca
Binary files /dev/null and b/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/image/images/upload1.png differ
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/image/images/upload2.png b/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/image/images/upload2.png
new file mode 100644
index 0000000..57ce63f
Binary files /dev/null and b/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/image/images/upload2.png differ
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/link/link.js b/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/link/link.js
new file mode 100644
index 0000000..fd10afb
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/link/link.js
@@ -0,0 +1,73 @@
+(function(){
+    var utils = UM.utils;
+    function hrefStartWith(href, arr) {
+        href = href.replace(/^\s+|\s+$/g, '');
+        for (var i = 0, ai; ai = arr[i++];) {
+            if (href.indexOf(ai) == 0) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    UM.registerWidget('link', {
+        tpl: "<style type=\"text/css\">" +
+            ".edui-dialog-link .edui-link-table{font-size: 12px;margin: 10px;line-height: 30px}" +
+            ".edui-dialog-link .edui-link-txt{width:300px;height:21px;line-height:21px;border:1px solid #d7d7d7;}" +
+            "</style>" +
+            "<table class=\"edui-link-table\">" +
+            "<tr>" +
+            "<td><label for=\"href\"><%=lang_input_url%></label></td>" +
+            "<td><input class=\"edui-link-txt\" id=\"edui-link-Jhref\" type=\"text\" /></td>" +
+            "</tr>" +
+            "<tr>" +
+            "<td><label for=\"title\"><%=lang_input_title%></label></td>" +
+            "<td><input class=\"edui-link-txt\" id=\"edui-link-Jtitle\" type=\"text\"/></td>" +
+            "</tr>" +
+            "<tr>" +
+            "<td colspan=\"2\">" +
+            "<label for=\"target\"><%=lang_input_target%></label>" +
+            "<input id=\"edui-link-Jtarget\" type=\"checkbox\"/>" +
+            "</td>" +
+            "</tr>" +
+//            "<tr>" +
+//            "<td colspan=\"2\" id=\"edui-link-Jmsg\"></td>" +
+//            "</tr>" +
+            "</table>",
+        initContent: function (editor) {
+            var lang = editor.getLang('link');
+            if (lang) {
+                var html = $.parseTmpl(this.tpl, lang.static);
+            }
+            this.root().html(html);
+        },
+        initEvent: function (editor, $w) {
+            var link = editor.queryCommandValue('link');
+            if(link){
+                $('#edui-link-Jhref',$w).val(utils.html($(link).attr('href')));
+                $('#edui-link-Jtitle',$w).val($(link).attr('title'));
+                $(link).attr('target') == '_blank' && $('#edui-link-Jtarget').attr('checked',true)
+            }
+            $('#edui-link-Jhref',$w).focus();
+        },
+        buttons: {
+            'ok': {
+                exec: function (editor, $w) {
+                    var href = $('#edui-link-Jhref').val().replace(/^\s+|\s+$/g, '');
+
+                    if (href) {
+                        editor.execCommand('link', {
+                            'href': href,
+                            'target': $("#edui-link-Jtarget:checked").length ? "_blank" : '_self',
+                            'title': $("#edui-link-Jtitle").val().replace(/^\s+|\s+$/g, ''),
+                            '_href': href
+                        });
+                    }
+                }
+            },
+            'cancel':{}
+        },
+        width: 400
+    })
+})();
+
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/map/map.html b/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/map/map.html
new file mode 100644
index 0000000..be97a8c
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/map/map.html
@@ -0,0 +1,148 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta charset="utf-8"/>
+    <meta name="keywords" content="百度地图,百度地图API，百度地图自定义工具，百度地图所见即所得工具"/>
+    <meta name="description" content="百度地图API自定义地图，帮助用户在可视化操作下生成百度地图"/>
+    <title>百度地图API自定义地图</title>
+    <!--引用百度地图API-->
+    <style type="text/css">
+        html, body {
+            margin: 0;
+            padding: 0;
+            overflow: hidden;
+        }
+    </style>
+    <script type="text/javascript" src="http://api.map.baidu.com/api?key=&v=2.0&ak=6b6c1a67eaa7db1ca6d6da28e590e343&services=true"></script>
+</head>
+
+<body onload="initMap();">
+<!--百度地图容器-->
+<div style="width:697px;height:550px;border:#ccc solid 1px;" id="dituContent"></div>
+</body>
+<script type="text/javascript">
+    function getParam(name) {
+        return location.href.match(new RegExp('[?#&]' + name + '=([^?#&]+)', 'i')) ? RegExp.$1 : '';
+    }
+    var map, marker;
+    var centerParam = getParam('center');
+    var zoomParam = getParam('zoom');
+    var widthParam = getParam('width');
+    var heightParam = getParam('height');
+    var markersParam = getParam('markers');
+    var markerStylesParam = getParam('markerStyles');
+    var iframe = getSelfIframe();
+    var UM = parent.UM;
+    var editor = getEditor();
+
+    //创建和初始化地图函数：
+    function initMap() {
+        // [FF]切换模式后报错
+        if (!window.BMap) {
+            return;
+        }
+        var dituContent = document.getElementById('dituContent');
+        dituContent.style.width = widthParam + 'px';
+        dituContent.style.height = heightParam + 'px';
+
+        createMap();//创建地图
+        setMapEvent();//设置地图事件
+        addMapControl();//向地图添加控件
+
+        // 创建标注
+        var markersArr = markersParam.split(',');
+        var point = new BMap.Point(markersArr[0], markersArr[1]);
+        marker = new BMap.Marker(point);
+        marker.enableDragging();
+        map.addOverlay(marker); // 将标注添加到地图中
+
+        if(iframe && UM && editor) { //在编辑状态下
+            setMapListener();//地图改变修改外层的iframe标签src属性
+        } else {
+            document.focus();
+        }
+    }
+
+    //创建地图函数：
+    function createMap() {
+        map = new BMap.Map("dituContent");//在百度地图容器中创建一个地图
+        var centerArr = centerParam.split(',');
+        var point = new BMap.Point(parseFloat(centerArr[0]), parseFloat(centerArr[1]));//定义一个中心点坐标
+        map.centerAndZoom(point, parseInt(zoomParam));//设定地图的中心点和坐标并将地图显示在地图容器中
+    }
+
+    //地图事件设置函数：
+    function setMapEvent() {
+        map.enableDragging();//启用地图拖拽事件，默认启用(可不写)
+        map.enableScrollWheelZoom();//启用地图滚轮放大缩小
+        map.enableDoubleClickZoom();//启用鼠标双击放大，默认启用(可不写)
+        map.enableKeyboard();//启用键盘上下左右键移动地图
+    }
+
+    //地图控件添加函数：
+    function addMapControl() {
+        //向地图中添加缩放控件
+        var ctrl_nav = new BMap.NavigationControl({anchor: BMAP_ANCHOR_TOP_LEFT, type: BMAP_NAVIGATION_CONTROL_LARGE});
+        map.addControl(ctrl_nav);
+        //向地图中添加缩略图控件
+        var ctrl_ove = new BMap.OverviewMapControl({anchor: BMAP_ANCHOR_BOTTOM_RIGHT, isOpen: 1});
+        map.addControl(ctrl_ove);
+        //向地图中添加比例尺控件
+        var ctrl_sca = new BMap.ScaleControl({anchor: BMAP_ANCHOR_BOTTOM_LEFT});
+        map.addControl(ctrl_sca);
+    }
+
+    function setMapListener() {
+        var timer;
+
+        map.addEventListener('moveend', mapListenerHandler);
+        map.addEventListener('zoomend', mapListenerHandler);
+        marker.addEventListener('dragend', mapListenerHandler);
+
+        function mapListenerHandler() {
+            var zoom = map.getZoom(),
+                center = map.getCenter(),
+                marker = window.marker.P;
+
+            iframe.src = iframe.src.
+                replace(new RegExp('([?#&])center=([^?#&]+)', 'i'), '$1center=' + center.lng + ',' + center.lat).
+                replace(new RegExp('([?#&])markers=([^?#&]+)', 'i'), '$1markers=' + marker.lng + ',' + marker.lat).
+                replace(new RegExp('([?#&])zoom=([^?#&]+)', 'i'), '$1zoom=' + zoom);
+            editor.fireEvent('saveScene');
+            saveScene(editor);
+        }
+
+        function saveScene(){
+            if(!timer) {
+                timer = setTimeout(function(){
+                    editor.fireEvent('savescene');
+                    editor.fireEvent('contentchange');
+                    timer = null;
+                }, 1000);
+            }
+        }
+    }
+
+    function getSelfIframe(){
+        var iframes = parent.document.getElementsByTagName('iframe');
+        for (var key in iframes) {
+            if (iframes[key].contentWindow == window) {
+                return iframes[key];
+            }
+        }
+        return null;
+    }
+
+    function getEditor(){
+        var parentNode = iframe.parentNode;
+        while (parentNode && parentNode.tagName && parentNode.tagName.toLowerCase() != 'body') {
+            if (parentNode.className && parentNode.className.indexOf('edui-body-container')!=-1) {
+                return UM.getEditor(parentNode.id);
+            }
+            parentNode = parentNode.parentNode;
+        }
+        return null;
+    }
+</script>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/map/map.js b/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/map/map.js
new file mode 100644
index 0000000..6f898c4
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/map/map.js
@@ -0,0 +1,263 @@
+(function () {
+
+    var widgetName = 'map';
+
+    UM.registerWidget(widgetName, {
+
+        tpl: "<style type=\"text/css\">" +
+            ".edui-dialog-map .edui-map-content{width:530px; height: 350px;margin: 10px auto;}" +
+            ".edui-dialog-map .edui-map-content table{width: 100%}" +
+            ".edui-dialog-map .edui-map-content table td{vertical-align: middle;}" +
+            ".edui-dialog-map .edui-map-button { border: 1px solid #ccc; float: left; cursor: default; height: 23px; width: 70px; cursor: pointer; margin: 0; font-size: 12px; line-height: 24px; text-align: center; }" +
+            ".edui-dialog-map .edui-map-button:hover {background:#eee;}" +
+            ".edui-dialog-map .edui-map-city,.edui-dialog-map .edui-map-address{height:21px;background: #FFF;border:1px solid #d7d7d7; line-height: 21px;}" +
+            ".edui-dialog-map .edui-map-city{width:90px}" +
+            ".edui-dialog-map .edui-map-address{width:150px}" +
+            ".edui-dialog-map .edui-map-dynamic-label span{vertical-align:middle;margin: 3px 0px 3px 3px;}" +
+            ".edui-dialog-map .edui-map-dynamic-label input{vertical-align:middle;margin: 3px;}" +
+            "</style>" +
+            "<div class=\"edui-map-content\">" +
+            "<table>" +
+            "<tr>" +
+            "<td><%=lang_city%>:</td>" +
+            "<td><input class=\"edui-map-city\" type=\"text\" value=\"<%=city.value%>\"/></td>" +
+            "<td><%=lang_address%>:</td>" +
+            "<td><input class=\"edui-map-address\" type=\"text\" value=\"\" /></td>" +
+            "<td><a class=\"edui-map-button\"><%=lang_search%></a></td>" +
+            "<td><label class=\"edui-map-dynamic-label\"><input class=\"edui-map-dynamic\" type=\"checkbox\" name=\"edui-map-dynamic\" /><span><%=lang_dynamicmap%></span></label></td>"+
+            "</tr>" +
+            "</table>" +
+            "<div style=\"width:100%;height:340px;margin:5px auto;border:1px solid gray\" class=\"edui-map-container\"></div>" +
+            "</div>" +
+            "<script class=\"edui-tpl-container\" type=\"text/plain\">" +
+            "<!DOCTYPE html>" +
+            "<html>" +
+            "<head>" +
+            "<title></title>" +
+            "</head>" +
+            "<body>" +
+            "<scr_ipt>" +
+            "window.onload = function(){" +
+            "var scripts = document.scripts || document.getElementsByTagName(\"script\")," +
+            "src = [];" +
+            "for( var i = 1, len = scripts.length; i<len; i++ ) {" +
+            "src.push( scripts[i].src );" +
+            "}" +
+            "parent.UM.getEditor(<<id>>).getWidgetData(\'map\').requestMapApi( src );" +
+            "};" +
+            "function mapReadyStateChange ( state ) { " +
+            " if ( state === 'complete' || state === 'loaded' ) {" +
+            " document.close(); " +
+            " } }" +
+            "</scr_ipt>" +
+            "<scr_ipt onreadystatechange='mapReadyStateChange(this.readyState);' onload='mapReadyStateChange(\"loaded\");' src=\"http://api.map.baidu.com/api?v=2.0&ak=6b6c1a67eaa7db1ca6d6da28e590e343&services=true\"></scr_ipt>" +
+            "</body>" +
+            "</html>" +
+            "</script>",
+        initContent: function (editor, $widget) {
+
+            var me = this,
+                lang = editor.getLang(widgetName),
+                theme_url = editor.options.themePath + editor.options.theme;
+
+            if( me.inited ) {
+                me.preventDefault();
+                return false;
+            }
+
+            me.inited = true;
+
+            me.lang = lang;
+            me.editor = editor;
+
+            me.root().html($.parseTmpl(me.tpl, $.extend({}, lang['static'], {
+                'theme_url': theme_url
+            })));
+
+            me.initRequestApi();
+
+        },
+        /**
+         * 初始化请求API
+         */
+        initRequestApi: function () {
+
+            var $ifr = null;
+
+            //已经初始化过， 不用再次初始化
+            if (window.BMap && window.BMap.Map) {
+                this.initBaiduMap();
+            } else {
+
+                $ifr = $('<iframe style="display: none;"></iframe>');
+                $ifr.appendTo( this.root() );
+
+                $ifr = $ifr[ 0 ].contentWindow.document;
+
+                $ifr.open();
+                $ifr.write( this.root().find(".edui-tpl-container").html().replace( /scr_ipt/g, 'script').replace('<<id>>',"'" + this.editor.id + "'") );
+
+            }
+
+        },
+        requestMapApi: function (src) {
+
+            var me = this;
+
+            if (src.length) {
+
+                var _src = src[0];
+
+                src = src.slice(1);
+
+                if (_src) {
+                    $.getScript(_src, function () {
+                        me.requestMapApi(src);
+                    });
+                } else {
+                    me.requestMapApi(src);
+                }
+
+            } else {
+
+                me.initBaiduMap();
+
+            }
+
+
+        },
+        initBaiduMap: function () {
+
+            var $root = this.root(),
+                map = new BMap.Map($root.find(".edui-map-container")[0]),
+                me = this,
+                marker,
+                point,
+                imgcss,
+                img = $(me.editor.selection.getRange().getClosedNode());
+
+            map.enableInertialDragging();
+            map.enableScrollWheelZoom();
+            map.enableContinuousZoom();
+
+            if (img.length && /api[.]map[.]baidu[.]com/ig.test(img.attr("src"))) {
+                var url = img.attr("src"),
+                    centerPos = me.getPars(url, "center").split(","),
+                    markerPos = me.getPars(url, "markers").split(",");
+                point = new BMap.Point(Number(centerPos[0]), Number(centerPos[1]));
+                marker = new BMap.Marker(new BMap.Point(Number(markerPos[0]), Number(markerPos[1])));
+                map.addControl(new BMap.NavigationControl());
+                map.centerAndZoom(point, Number(me.getPars(url, "zoom")));
+                imgcss = img.attr('style');
+            } else {
+                point = new BMap.Point(116.404, 39.915);    // 创建点坐标
+                marker = new BMap.Marker(point);
+                map.addControl(new BMap.NavigationControl());
+                map.centerAndZoom(point, 10);                     // 初始化地图,设置中心点坐标和地图级别。
+            }
+            marker.enableDragging();
+            map.addOverlay(marker);
+
+            me.map = map;
+            me.marker = marker;
+            me.imgcss = imgcss;
+        },
+        doSearch: function () {
+            var me = this,
+                city = me.root().find('.edui-map-city').val(),
+                address = me.root().find('.edui-map-address').val();
+
+            if (!city) {
+                alert(me.lang.cityMsg);
+                return;
+            }
+            var search = new BMap.LocalSearch(city, {
+                onSearchComplete: function (results) {
+                    if (results && results.getNumPois()) {
+                        var points = [];
+                        for (var i = 0; i < results.getCurrentNumPois(); i++) {
+                            points.push(results.getPoi(i).point);
+                        }
+                        if (points.length > 1) {
+                            me.map.setViewport(points);
+                        } else {
+                            me.map.centerAndZoom(points[0], 13);
+                        }
+                        point = me.map.getCenter();
+                        me.marker.setPoint(point);
+                    } else {
+                        alert(me.lang.errorMsg);
+                    }
+                }
+            });
+            search.search(address || city);
+        },
+        getPars: function (str, par) {
+            var reg = new RegExp(par + "=((\\d+|[.,])*)", "g");
+            return reg.exec(str)[1];
+        },
+        reset: function(){
+            this.map && this.map.reset();
+        },
+        initEvent: function () {
+            var me = this,
+                $root = me.root();
+
+            $root.find('.edui-map-address').on('keydown', function (evt) {
+                evt = evt || event;
+                if (evt.keyCode == 13) {
+                    me.doSearch();
+                    return false;
+                }
+            });
+
+            $root.find(".edui-map-button").on('click', function (evt) {
+                me.doSearch();
+            });
+
+            $root.find(".edui-map-address").focus();
+
+            $root.on( "mousewheel DOMMouseScroll", function ( e ) {
+                return false;
+            } );
+
+        },
+        width: 580,
+        height: 408,
+        buttons: {
+            ok: {
+                exec: function (editor) {
+                    var widget = editor.getWidgetData(widgetName),
+                        center = widget.map.getCenter(),
+                        zoom = widget.map.getZoom(),
+                        size = widget.map.getSize(),
+                        point = widget.marker.P;
+
+                    if (widget.root().find(".edui-map-dynamic")[0].checked) {
+                        var URL = editor.getOpt('UMEDITOR_HOME_URL'),
+                            url = [URL + (/\/$/.test(URL) ? '':'/') + "dialogs/map/map.html" +
+                                '#center=' + center.lng + ',' + center.lat,
+                                '&zoom=' + zoom,
+                                '&width=' + size.width,
+                                '&height=' + size.height,
+                                '&markers=' + point.lng + ',' + point.lat].join('');
+                        editor.execCommand('inserthtml', '<iframe class="ueditor_baidumap" src="' + url + '" frameborder="0" width="' + (size.width+4) + '" height="' + (size.height+4) + '"></iframe>');
+                    } else {
+                        url = "http://api.map.baidu.com/staticimage?center=" + center.lng + ',' + center.lat +
+                            "&zoom=" + zoom + "&width=" + size.width + '&height=' + size.height + "&markers=" + point.lng + ',' + point.lat;
+                        editor.execCommand('inserthtml', '<img width="' + size.width + '"height="' + size.height + '" src="' + url + '"' + (widget.imgcss ? ' style="' + widget.imgcss + '"' : '') + '/>', true);
+                    }
+
+                    widget.reset();
+                }
+            },
+            cancel: {
+                exec: function(editor){
+                    editor.getWidgetData(widgetName).reset();
+                }
+            }
+        }
+    });
+
+})();
+
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/video/images/center_focus.jpg b/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/video/images/center_focus.jpg
new file mode 100644
index 0000000..262b029
Binary files /dev/null and b/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/video/images/center_focus.jpg differ
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/video/images/left_focus.jpg b/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/video/images/left_focus.jpg
new file mode 100644
index 0000000..7886d27
Binary files /dev/null and b/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/video/images/left_focus.jpg differ
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/video/images/none_focus.jpg b/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/video/images/none_focus.jpg
new file mode 100644
index 0000000..7c768dc
Binary files /dev/null and b/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/video/images/none_focus.jpg differ
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/video/images/right_focus.jpg b/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/video/images/right_focus.jpg
new file mode 100644
index 0000000..173e10d
Binary files /dev/null and b/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/video/images/right_focus.jpg differ
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/video/video.css b/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/video/video.css
new file mode 100644
index 0000000..e046d8c
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/video/video.css
@@ -0,0 +1,59 @@
+@charset "utf-8";
+.edui-dialog-video .edui-video-wrapper{ width: 570px;_width:575px;margin: 10px auto; zoom:1;position: relative}
+.edui-dialog-video .edui-video-tabbody{height:335px;}
+.edui-dialog-video .edui-video-panel { position: absolute;width:100%; height:100%;background: #fff;}
+.edui-dialog-video .edui-video-panel table td{vertical-align: middle;}
+.edui-dialog-video #eduiVideoUrl {
+    width: 470px;
+    height: 21px;
+    line-height: 21px;
+    margin: 8px 5px;
+    background: #FFF;
+    border: 1px solid #d7d7d7;
+}
+.edui-dialog-video #eduiVideoSearchTxt{margin-left:15px;background: #FFF;width:200px;height:21px;line-height:21px;border: 1px solid #d7d7d7;}
+.edui-dialog-video #searchList{width: 570px;overflow: auto;zoom:1;height: 270px;}
+.edui-dialog-video #searchList div{float: left;width: 120px;height: 135px;margin: 5px 15px;}
+.edui-dialog-video #searchList img{margin: 2px 8px;cursor: pointer;border: 2px solid #fff} /*不用缩略图*/
+.edui-dialog-video #searchList p{margin-left: 10px;}
+.edui-dialog-video #eduiVideoType{
+    width: 65px;
+    height: 23px;
+    line-height: 22px;
+    border: 1px solid #d7d7d7;
+}
+.edui-dialog-video #eduiVideoSearchBtn,.edui-dialog-video #eduiVideoSearchReset{
+    /*width: 80px;*/
+    height: 25px;
+    line-height: 25px;
+    background: #eee;
+    border: 1px solid #d7d7d7;
+    cursor: pointer;
+    padding: 0 5px;
+}
+
+
+
+.edui-dialog-video #eduiVideoPreview{width: 420px; margin-left: 10px; _margin-left:5px; height: 280px;background-color: #ddd;float: left}
+.edui-dialog-video #eduiVideoInfo {width: 120px;float: left;margin-left: 10px;_margin-left:7px;}
+.edui-dialog-video .edui-video-wrapper fieldset{
+    border: 1px solid #ddd;
+    padding-left: 5px;
+    margin-bottom: 20px;
+    padding-bottom: 5px;
+    width: 115px;
+}
+.edui-dialog-video .edui-video-wrapper fieldset legend{font-weight: bold;}
+.edui-dialog-video .edui-video-wrapper fieldset p{line-height: 30px;}
+.edui-dialog-video .edui-video-wrapper fieldset input.edui-video-txt{
+    width: 65px;
+    height: 21px;
+    line-height: 21px;
+    margin: 8px 5px;
+    background: #FFF;
+    border: 1px solid #d7d7d7;
+}
+.edui-dialog-video .edui-video-wrapper label.edui-video-url{font-weight: bold;margin-left: 5px;color: #06c;}
+.edui-dialog-video #eduiVideoFloat div{cursor:pointer;opacity: 0.5;filter: alpha(opacity = 50);margin:9px;_margin:5px;width:38px;height:36px;float:left;}
+.edui-dialog-video #eduiVideoFloat .edui-video-focus{opacity: 1;filter: alpha(opacity = 100)}
+.edui-dialog-video .edui-video-wrapper span.edui-video-view{display: inline-block;width: 30px;float: right;cursor: pointer;color: blue}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/video/video.js b/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/video/video.js
new file mode 100644
index 0000000..64a47ec
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/page/umeditor/dialogs/video/video.js
@@ -0,0 +1,282 @@
+
+(function(){
+    var domUtils = UM.dom.domUtils;
+    var widgetName = 'video';
+
+    UM.registerWidget( widgetName,{
+
+        tpl: "<link rel=\"stylesheet\" type=\"text/css\" href=\"<%=video_url%>video.css\" />" +
+            "<div class=\"edui-video-wrapper\">" +
+            "<div id=\"eduiVideoTab\">" +
+            "<div id=\"eduiVideoTabHeads\" class=\"edui-video-tabhead\">" +
+            "<span tabSrc=\"video\" class=\"edui-video-focus\"><%=lang_tab_insertV%></span>" +
+            "</div>" +
+            "<div id=\"eduiVideoTabBodys\" class=\"edui-video-tabbody\">" +
+            "<div id=\"eduiVideoPanel\" class=\"edui-video-panel\">" +
+            "<table><tr><td><label for=\"eduiVideoUrl\" class=\"edui-video-url\"><%=lang_video_url%></label></td><td><input id=\"eduiVideoUrl\" type=\"text\"></td></tr></table>" +
+            "<div id=\"eduiVideoPreview\"></div>" +
+            "<div id=\"eduiVideoInfo\">" +
+            "<fieldset>" +
+            "<legend><%=lang_video_size%></legend>" +
+            "<table>" +
+            "<tr><td><label for=\"eduiVideoWidth\"><%=lang_videoW%></label></td><td><input class=\"edui-video-txt\" id=\"eduiVideoWidth\" type=\"text\"/></td></tr>" +
+            "<tr><td><label for=\"eduiVideoHeight\"><%=lang_videoH%></label></td><td><input class=\"edui-video-txt\" id=\"eduiVideoHeight\" type=\"text\"/></td></tr>" +
+            "</table>" +
+            "</fieldset>" +
+            "<fieldset>" +
+            "<legend><%=lang_alignment%></legend>" +
+            "<div id=\"eduiVideoFloat\"></div>" +
+            "</fieldset>" +
+            "</div>" +
+            "</div>" +
+            "</div>" +
+            "</div>" +
+            "</div>",
+        initContent:function( editor, $widget ){
+
+            var me = this,
+                lang = editor.getLang( widgetName),
+                video_url = UMEDITOR_CONFIG.UMEDITOR_HOME_URL + 'dialogs/video/';
+
+            me.lang = lang;
+            me.editor = editor;
+            me.$widget = $widget;
+            me.root().html( $.parseTmpl( me.tpl, $.extend( { video_url: video_url }, lang['static'] ) ) );
+
+            me.initController( lang );
+
+        },
+        initEvent:function(){
+
+            var me = this,
+                url = $("#eduiVideoUrl", me.$widget)[0];
+
+            if( 'oninput' in url ) {
+                url.oninput = function(){
+                    me.createPreviewVideo( this.value );
+                };
+            } else {
+                url.onpropertychange = function () {
+                    me.createPreviewVideo( this.value );
+                }
+            }
+
+        },
+        initController: function( lang ){
+
+            var me = this,
+                img = me.editor.selection.getRange().getClosedNode(),
+                url;
+
+            me.createAlignButton( ["eduiVideoFloat"] );
+
+            //编辑视频时初始化相关信息
+            if(img && img.className == "edui-faked-video"){
+                $("#eduiVideoUrl", me.$widget)[0].value = url = img.getAttribute("_url");
+                $("#eduiVideoWidth", me.$widget)[0].value = img.width;
+                $("#eduiVideoHeight", me.$widget)[0].value = img.height;
+                var align = domUtils.getComputedStyle(img,"float"),
+                    parentAlign = domUtils.getComputedStyle(img.parentNode,"text-align");
+                me.updateAlignButton(parentAlign==="center"?"center":align);
+            }
+            me.createPreviewVideo(url);
+
+        },
+        /**
+         * 根据url生成视频预览
+         */
+        createPreviewVideo: function(url){
+
+            if ( !url )return;
+
+            var me = this,
+                lang = me.lang,
+                conUrl = me.convert_url(url);
+
+            if(!me.endWith(conUrl,[".swf",".flv",".wmv"])){
+                $("#eduiVideoPreview", me.$widget).html( lang.urlError );
+                return;
+            }
+            $("#eduiVideoPreview", me.$widget)[0].innerHTML = '<embed type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer"' +
+                ' src="' + url + '"' +
+                ' width="' + 420  + '"' +
+                ' height="' + 280  + '"' +
+                ' wmode="transparent" play="true" loop="false" menu="false" allowscriptaccess="never" allowfullscreen="true" ></embed>';
+
+        },
+        /**
+         * 将单个视频信息插入编辑器中
+         */
+        insertSingle: function(){
+
+            var me = this,
+                width = $("#eduiVideoWidth", me.$widget)[0],
+                height = $("#eduiVideoHeight", me.$widget)[0],
+                url=$('#eduiVideoUrl', me.$widget)[0].value,
+                align = this.findFocus("eduiVideoFloat","name");
+
+            if(!url) return false;
+            if ( !me.checkNum( [width, height] ) ) return false;
+            this.editor.execCommand('insertvideo', {
+                url: me.convert_url(url),
+                width: width.value,
+                height: height.value,
+                align: align
+            });
+
+        },
+        /**
+         * URL转换
+         */
+        convert_url: function(url){
+            if ( !url ) return '';
+            var matches = url.match(/youtu.be\/(\w+)$/) ||
+                    url.match(/youtube\.com\/watch\?v=(\w+)/) ||
+                    url.match(/youtube.com\/v\/(\w+)/),
+                youku = url.match(/youku\.com\/v_show\/id_(\w+)/),
+                youkuPlay = /player\.youku\.com/ig.test(url);
+
+            if(youkuPlay){
+                url = url.replace(/\?f=.*/, "");
+            } else if (matches){
+                url = "https://www.youtube.com/v/" + matches[1] + "?version=3&feature=player_embedded";
+            }else if(youku){
+                url = "http://player.youku.com/player.php/sid/"+youku[1]+"/v.swf"
+            } else {
+                url = url.replace(/http:\/\/www\.tudou\.com\/programs\/view\/([\w\-]+)\/?/i, "http://www.tudou.com/v/$1")
+                    .replace(/http:\/\/www\.youtube\.com\/watch\?v=([\w\-]+)/i, "http://www.youtube.com/v/$1")
+                    .replace(/http:\/\/v\.youku\.com\/v_show\/id_([\w\-=]+)\.html/i, "http://player.youku.com/player.php/sid/$1")
+                    .replace(/http:\/\/www\.56\.com\/u\d+\/v_([\w\-]+)\.html/i, "http://player.56.com/v_$1.swf")
+                    .replace(/http:\/\/www.56.com\/w\d+\/play_album\-aid\-\d+_vid\-([^.]+)\.html/i, "http://player.56.com/v_$1.swf")
+                    .replace(/http:\/\/v\.ku6\.com\/.+\/([^.]+)\.html/i, "http://player.ku6.com/refer/$1/v.swf")
+                    .replace(/\?f=.*/, "");
+            }
+            return url;
+        },
+        /**
+         * 检测传入的所有input框中输入的长宽是否是正数
+         */
+        checkNum: function checkNum( nodes ) {
+
+            var me = this;
+
+            for ( var i = 0, ci; ci = nodes[i++]; ) {
+                var value = ci.value;
+                if ( !me.isNumber( value ) && value) {
+                    alert( me.lang.numError );
+                    ci.value = "";
+                    ci.focus();
+                    return false;
+                }
+            }
+            return true;
+        },
+        /**
+         * 数字判断
+         * @param value
+         */
+        isNumber: function( value ) {
+            return /(0|^[1-9]\d*$)/.test( value );
+        },
+        updateAlignButton: function( align ) {
+            var aligns = $( "#eduiVideoFloat", this.$widget )[0].children;
+
+            for ( var i = 0, ci; ci = aligns[i++]; ) {
+                if ( ci.getAttribute( "name" ) == align ) {
+                    if ( ci.className !="edui-video-focus" ) {
+                        ci.className = "edui-video-focus";
+                    }
+                } else {
+                    if ( ci.className =="edui-video-focus" ) {
+                        ci.className = "";
+                    }
+                }
+            }
+
+        },
+        /**
+         * 创建图片浮动选择按钮
+         * @param ids
+         */
+        createAlignButton: function( ids ) {
+            var lang = this.lang,
+                vidoe_home = UMEDITOR_CONFIG.UMEDITOR_HOME_URL + 'dialogs/video/';
+
+            for ( var i = 0, ci; ci = ids[i++]; ) {
+                var floatContainer = $( "#" + ci, this.$widget ) [0],
+                    nameMaps = {"none":lang['default'], "left":lang.floatLeft, "right":lang.floatRight};
+                for ( var j in nameMaps ) {
+                    var div = document.createElement( "div" );
+                    div.setAttribute( "name", j );
+                    if ( j == "none" ) div.className="edui-video-focus";
+                    div.style.cssText = "background:url("+ vidoe_home +"images/" + j + "_focus.jpg);";
+                    div.setAttribute( "title", nameMaps[j] );
+                    floatContainer.appendChild( div );
+                }
+                this.switchSelect( ci );
+            }
+        },
+        /**
+         * 选择切换
+         */
+        switchSelect: function( selectParentId ) {
+            var selects = $( "#" + selectParentId, this.$widget )[0].children;
+            for ( var i = 0, ci; ci = selects[i++]; ) {
+               $(ci).on("click", function () {
+                    for ( var j = 0, cj; cj = selects[j++]; ) {
+                        cj.className = "";
+                        cj.removeAttribute && cj.removeAttribute( "class" );
+                    }
+                    this.className = "edui-video-focus";
+                } )
+            }
+        },
+        /**
+         * 找到id下具有focus类的节点并返回该节点下的某个属性
+         * @param id
+         * @param returnProperty
+         */
+        findFocus: function( id, returnProperty ) {
+            var tabs = $( "#" + id , this.$widget)[0].children,
+                property;
+            for ( var i = 0, ci; ci = tabs[i++]; ) {
+                if ( ci.className=="edui-video-focus" ) {
+                    property = ci.getAttribute( returnProperty );
+                    break;
+                }
+            }
+            return property;
+        },
+        /**
+         * 末尾字符检测
+         */
+        endWith: function(str,endStrArr){
+            for(var i=0,len = endStrArr.length;i<len;i++){
+                var tmp = endStrArr[i];
+                if(str.length - tmp.length<0) return false;
+
+                if(str.substring(str.length-tmp.length)==tmp){
+                    return true;
+                }
+            }
+            return false;
+        },
+        width:610,
+        height:498,
+        buttons: {
+            ok: {
+                exec: function( editor, $w ){
+                    $("#eduiVideoPreview", $w).html("");
+                    editor.getWidgetData(widgetName).insertSingle();
+                }
+            },
+            cancel: {
+                exec: function(){
+                    //清除视频
+                    $("#eduiVideoPreview").html("");
+                }
+            }
+        }
+    });
+
+})();
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/index.html b/pluss-manage-page/src/main/webapp/page/umeditor/index.html
new file mode 100644
index 0000000..f90474a
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/page/umeditor/index.html
@@ -0,0 +1,231 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+
+    <meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
+    <title>UMEDITOR 完整demo</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <link href="themes/default/css/umeditor.css" type="text/css" rel="stylesheet">
+    <script type="text/javascript" src="third-party/jquery.min.js"></script>
+    <script type="text/javascript" src="third-party/template.min.js"></script>
+    <script type="text/javascript" charset="utf-8" src="umeditor.config.js"></script>
+    <script type="text/javascript" charset="utf-8" src="umeditor.min.js"></script>
+    <script type="text/javascript" src="lang/zh-cn/zh-cn.js"></script>
+    <style type="text/css">
+        h1{
+            font-family: "微软雅黑";
+            font-weight: normal;
+        }
+        .btn {
+            display: inline-block;
+            *display: inline;
+            padding: 4px 12px;
+            margin-bottom: 0;
+            *margin-left: .3em;
+            font-size: 14px;
+            line-height: 20px;
+            color: #333333;
+            text-align: center;
+            text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
+            vertical-align: middle;
+            cursor: pointer;
+            background-color: #f5f5f5;
+            *background-color: #e6e6e6;
+            background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
+            background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));
+            background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);
+            background-image: -o-linear-gradient(top, #ffffff, #e6e6e6);
+            background-image: linear-gradient(to bottom, #ffffff, #e6e6e6);
+            background-repeat: repeat-x;
+            border: 1px solid #cccccc;
+            *border: 0;
+            border-color: #e6e6e6 #e6e6e6 #bfbfbf;
+            border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+            border-bottom-color: #b3b3b3;
+            -webkit-border-radius: 4px;
+            -moz-border-radius: 4px;
+            border-radius: 4px;
+            filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0);
+            filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+            *zoom: 1;
+            -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+            -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+            box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+        }
+
+        .btn:hover,
+        .btn:focus,
+        .btn:active,
+        .btn.active,
+        .btn.disabled,
+        .btn[disabled] {
+            color: #333333;
+            background-color: #e6e6e6;
+            *background-color: #d9d9d9;
+        }
+
+        .btn:active,
+        .btn.active {
+            background-color: #cccccc \9;
+        }
+
+        .btn:first-child {
+            *margin-left: 0;
+        }
+
+        .btn:hover,
+        .btn:focus {
+            color: #333333;
+            text-decoration: none;
+            background-position: 0 -15px;
+            -webkit-transition: background-position 0.1s linear;
+            -moz-transition: background-position 0.1s linear;
+            -o-transition: background-position 0.1s linear;
+            transition: background-position 0.1s linear;
+        }
+
+        .btn:focus {
+            outline: thin dotted #333;
+            outline: 5px auto -webkit-focus-ring-color;
+            outline-offset: -2px;
+        }
+
+        .btn.active,
+        .btn:active {
+            background-image: none;
+            outline: 0;
+            -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+            -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+            box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+        }
+
+        .btn.disabled,
+        .btn[disabled] {
+            cursor: default;
+            background-image: none;
+            opacity: 0.65;
+            filter: alpha(opacity=65);
+            -webkit-box-shadow: none;
+            -moz-box-shadow: none;
+            box-shadow: none;
+        }
+    </style>
+</head>
+<body>
+
+
+
+
+<div id="myEditor" style="width:600px;height:240px;">
+    <p>这里我可以写一些输入提示</p>
+</div>
+<div class="clear"></div>
+
+
+
+
+<script type="text/javascript">
+    //实例化编辑器
+    var um = UM.getEditor('myEditor');
+    um.addListener('blur',function(){
+        $('#focush2').html('编辑器失去焦点了')
+    });
+    um.addListener('focus',function(){
+        $('#focush2').html('')
+    });
+    //按钮的操作
+    function insertHtml() {
+        var value = prompt('插入html代码', '');
+        um.execCommand('insertHtml', value)
+    }
+    function isFocus(){
+        alert(um.isFocus())
+    }
+    function doBlur(){
+        um.blur()
+    }
+    function createEditor() {
+        enableBtn();
+        um = UM.getEditor('myEditor');
+    }
+    function getAllHtml() {
+        alert(UM.getEditor('myEditor').getAllHtml())
+    }
+    function getContent() {
+        var arr = [];
+        arr.push("使用editor.getContent()方法可以获得编辑器的内容");
+        arr.push("内容为：");
+        arr.push(UM.getEditor('myEditor').getContent());
+        alert(arr.join("\n"));
+    }
+    function getPlainTxt() {
+        var arr = [];
+        arr.push("使用editor.getPlainTxt()方法可以获得编辑器的带格式的纯文本内容");
+        arr.push("内容为：");
+        arr.push(UM.getEditor('myEditor').getPlainTxt());
+        alert(arr.join('\n'))
+    }
+    function setContent(isAppendTo) {
+        var arr = [];
+        arr.push("使用editor.setContent('欢迎使用umeditor')方法可以设置编辑器的内容");
+        UM.getEditor('myEditor').setContent('欢迎使用umeditor', isAppendTo);
+        alert(arr.join("\n"));
+    }
+    function setDisabled() {
+        UM.getEditor('myEditor').setDisabled('fullscreen');
+        disableBtn("enable");
+    }
+
+    function setEnabled() {
+        UM.getEditor('myEditor').setEnabled();
+        enableBtn();
+    }
+
+    function getText() {
+        //当你点击按钮时编辑区域已经失去了焦点，如果直接用getText将不会得到内容，所以要在选回来，然后取得内容
+        var range = UM.getEditor('myEditor').selection.getRange();
+        range.select();
+        var txt = UM.getEditor('myEditor').selection.getText();
+        alert(txt)
+    }
+
+    function getContentTxt() {
+        
+		alert(UM.getEditor('myEditor').getContent());
+    }
+    function hasContent() {
+        var arr = [];
+        arr.push("使用editor.hasContents()方法判断编辑器里是否有内容");
+        arr.push("判断结果为：");
+        arr.push(UM.getEditor('myEditor').hasContents());
+        alert(arr.join("\n"));
+    }
+    function setFocus() {
+        UM.getEditor('myEditor').focus();
+    }
+    function deleteEditor() {
+        disableBtn();
+        UM.getEditor('myEditor').destroy();
+    }
+    function disableBtn(str) {
+        var div = document.getElementById('btns');
+        var btns = domUtils.getElementsByTagName(div, "button");
+        for (var i = 0, btn; btn = btns[i++];) {
+            if (btn.id == str) {
+                domUtils.removeAttributes(btn, ["disabled"]);
+            } else {
+                btn.setAttribute("disabled", "true");
+            }
+        }
+    }
+    function enableBtn() {
+        var div = document.getElementById('btns');
+        var btns = domUtils.getElementsByTagName(div, "button");
+        for (var i = 0, btn; btn = btns[i++];) {
+            domUtils.removeAttributes(btn, ["disabled"]);
+        }
+    }
+</script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/jsp/getContent.jsp b/pluss-manage-page/src/main/webapp/page/umeditor/jsp/getContent.jsp
new file mode 100644
index 0000000..6aee0c0
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/page/umeditor/jsp/getContent.jsp
@@ -0,0 +1,15 @@
+<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%>
+<script src="../third-party/jquery.min.js"></script>
+<script src="../third-party/mathquill/mathquill.min.js"></script>
+<link rel="stylesheet" href="../third-party/mathquill/mathquill.css"/>
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
+<%
+request.setCharacterEncoding("utf-8");
+response.setCharacterEncoding("utf-8");
+String content = request.getParameter("myEditor");
+
+
+
+response.getWriter().print("<div class='content'>"+content+"</div>");
+
+%>
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/jsp/imageUp.jsp b/pluss-manage-page/src/main/webapp/page/umeditor/jsp/imageUp.jsp
new file mode 100644
index 0000000..d95bbe3
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/page/umeditor/jsp/imageUp.jsp
@@ -0,0 +1,29 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+         pageEncoding="utf-8" %>
+<%@ page import="cn.pluss.platform.controller.upload.Uploader" %>
+
+<%
+    request.setCharacterEncoding("utf-8");
+    response.setCharacterEncoding("utf-8");
+
+    Uploader up = new Uploader(request);
+
+    //up.setSavePath("E:/svn/mediaNew/resources/manage/upload");
+    String[] fileType = {".gif", ".png", ".jpg", ".jpeg", ".bmp"};
+    up.setAllowFiles(fileType);
+    up.setMaxSize(10000); //单位KB
+    up.upload();
+
+    String callback = request.getParameter("callback");
+
+    String result = "{\"name\":\"" + up.getFileName() + "\", \"originalName\": \"" + up.getOriginalName() + "\", \"size\": " + up.getSize() + ", \"state\": \"" + up.getState() + "\", \"type\": \"" + up.getType() + "\", \"url\": \"" + up.getUrl() + "\"}";
+
+    result = result.replaceAll("\\\\", "\\\\");
+
+    if (callback == null) {
+        response.getWriter().print(result);
+    } else {
+        response.getWriter().print("<script>" + callback + "(" + result + ")</script>");
+    }
+%>
+    
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/lang/en/en.js b/pluss-manage-page/src/main/webapp/page/umeditor/lang/en/en.js
new file mode 100644
index 0000000..45b2f1a
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/page/umeditor/lang/en/en.js
@@ -0,0 +1,150 @@
+/**
+ * English language package
+ */
+UM.I18N['en'] = {
+    'labelMap':{
+        'anchor':'Anchor', 'undo':'Undo', 'redo':'Redo', 'bold':'Bold', 'indent':'Indent', 'snapscreen':'SnapScreen',
+        'italic':'Italic', 'underline':'Underline', 'strikethrough':'Strikethrough', 'subscript':'SubScript','fontborder':'text border',
+        'superscript':'SuperScript', 'formatmatch':'Format Match', 'source':'Source', 'blockquote':'BlockQuote',
+        'pasteplain':'PastePlain', 'selectall':'SelectAll', 'print':'Print', 'preview':'Preview',
+        'horizontal':'Horizontal', 'removeformat':'RemoveFormat', 'time':'Time', 'date':'Date',
+        'unlink':'Unlink', 'insertrow':'InsertRow', 'insertcol':'InsertCol', 'mergeright':'MergeRight', 'mergedown':'MergeDown',
+        'deleterow':'DeleteRow', 'deletecol':'DeleteCol', 'splittorows':'SplitToRows','insertcode':'insert code',
+        'splittocols':'SplitToCols', 'splittocells':'SplitToCells','deletecaption':'DeleteCaption','inserttitle':'InsertTitle',
+        'mergecells':'MergeCells', 'deletetable':'DeleteTable', 'cleardoc':'Clear', 'insertparagraphbeforetable':"InsertParagraphBeforeTable",
+        'fontfamily':'FontFamily', 'fontsize':'FontSize', 'paragraph':'Paragraph', 'image':'Image','edittable':'Edit Table', 'edittd':'Edit Td','link':'Link',
+        'emotion':'Emotion', 'spechars':'Spechars', 'searchreplace':'SearchReplace', 'map':'BaiduMap', 'gmap':'GoogleMap',
+        'video':'Video', 'help':'Help', 'justifyleft':'JustifyLeft', 'justifyright':'JustifyRight', 'justifycenter':'JustifyCenter',
+        'justifyjustify':'Justify', 'forecolor':'FontColor', 'backcolor':'BackColor', 'insertorderedlist':'OL',
+        'insertunorderedlist':'UL', 'fullscreen':'FullScreen', 'directionalityltr':'EnterFromLeft', 'directionalityrtl':'EnterFromRight',
+        'rowspacingtop':'RowSpacingTop', 'rowspacingbottom':'RowSpacingBottom', 'highlightcode':'Code', 'pagebreak':'PageBreak', 'insertframe':'Iframe', 'imagenone':'Default',
+        'imageleft':'ImageLeft', 'imageright':'ImageRight', 'attachment':'Attachment', 'imagecenter':'ImageCenter', 'wordimage':'WordImage',
+        'lineheight':'LineHeight','edittip':'EditTip','customstyle':'CustomStyle', 'scrawl':'Scrawl', 'autotypeset':'AutoTypeset',
+        'webapp':'WebAPP', 'touppercase':'UpperCase', 'tolowercase':'LowerCase','template':'Template','background':'Background','inserttable':'InsertTable',
+        'drafts': 'drafts', 'formula':'formula'
+    },
+    'paragraph':{'p':'Paragraph', 'h1':'Title 1', 'h2':'Title 2', 'h3':'Title 3', 'h4':'Title 4', 'h5':'Title 5', 'h6':'Title 6'},
+    'fontfamily':{
+        'songti':'Sim sun',
+        'kaiti':'Sim kai',
+        'heiti':'Sim hei',
+        'lishu':'Sim li',
+        'yahei': 'Microsoft yahei',
+        'andaleMono':'Andale mono',
+        'arial': 'Arial',
+        'arialBlack':'Arial black',
+        'comicSansMs':'Comic sans ms',
+        'impact':'Impact',
+        'timesNewRoman':'Times new roman'
+    },
+    'ok':"OK",
+    'cancel':"Cancel",
+    'closeDialog':"closeDialog",
+    'tableDrag':"You must import the file uiUtils.js before drag! ",
+    'autofloatMsg':"The plugin AutoFloat depends on EditorUI!",
+    'anthorMsg':"Link",
+    'clearColor':'Clear',
+    'standardColor':'Standard color',
+    'themeColor':'Theme color',
+    'property':'Property',
+    'default':'Default',
+    'modify':'Modify',
+    'justifyleft':'Justify Left',
+    'justifyright':'Justify Right',
+    'justifycenter':'Justify Center',
+    'justify':'Default',
+    'clear':'Clear',
+    'anchorMsg':'Anchor',
+    'delete':'Delete',
+    'clickToUpload':"Click to upload",
+    'unset':"Language hasn't been set!",
+    't_row':'row',
+    't_col':'col',
+    'more':'More',
+    'pasteOpt':'Paste Option',
+    'pasteSourceFormat':"Keep Source Formatting",
+    'tagFormat':'Keep tag',
+    'pasteTextFormat':'Keep Text only',
+
+    //===============dialog i18N=======================
+    'image':{
+        'static':{
+            'lang_tab_local':"Local Upload",
+            'lang_tab_imgSearch':"Network Pictures",
+            'lang_input_dragTip':"Support drag upload",
+            'lang_btn_add':"Add"
+        },
+        'uploadError': 'Upload Error'
+    },
+    'emotion':{
+        'static':{
+            'lang_input_choice':'Choice',
+            'lang_input_Tuzki':'Tuzki',
+            'lang_input_lvdouwa':'LvDouWa',
+            'lang_input_BOBO':'BOBO',
+            'lang_input_babyCat':'BabyCat',
+            'lang_input_bubble':'Bubble',
+            'lang_input_youa':'YouA'
+        }
+    },
+    'gmap':{
+        'static':{
+            'lang_input_address':'Address:',
+            'lang_input_search':'Search',
+            'address':{'value':"Beijing"}
+        },
+        'searchError':'Unable to locate the address!'
+    },
+    'link':{
+        'static':{
+            'lang_input_text':'Text：',
+            'lang_input_url':'URL：',
+            'lang_input_title':'Title：',
+            'lang_input_target':'open in new window：'
+        },
+        'validLink':'Supports only effective when a link is selected',
+        'httpPrompt':'The hyperlink you enter should start with "http|https|ftp://"!'
+    },
+    'map':{
+        'static':{
+            'lang_city':"City",
+            'lang_address':"Address",
+            'city':{'value':"Beijing"},
+            'lang_search':"Search",
+            'lang_dynamicmap':"Dynamic map"
+        },
+        'cityMsg':"Please enter the city name!",
+        'errorMsg':"Can't find the place!"
+    },
+    'video':{
+        'static':{
+            'lang_tab_insertV':"Video",
+            'lang_video_url':" URL ",
+            'lang_video_size':"Video Size",
+            'lang_videoW':"Width",
+            'lang_videoH':"Height",
+            'lang_alignment':"Alignment",
+            'videoSearchTxt':{'value':"Enter the search keyword!"},
+            'videoType':{'options':["All", "Hot", "Entertainment", "Funny", "Sports", "Science", "variety"]},
+            'videoSearchBtn':{'value':"Search in Baidu"},
+            'videoSearchReset':{'value':"Clear result"}
+        },
+        'numError':"Please enter the correct Num. e.g 123,400",
+        'floatLeft':"Float left",
+        'floatRight':"Float right",
+        'default':"Default",
+        'block':"Display in block",
+        'urlError':"The video url format may be wrong!",
+        'loading':" &nbsp;The video is loading, please wait…",
+        'clickToSelect':"Click to select",
+        'goToSource':'Visit source video ',
+        'noVideo':" &nbsp; &nbsp;Sorry,can't find the video,please try again!"
+    },
+    'formula':{
+        'static':{
+            'lang_tab_common':'Common',
+            'lang_tab_symbol':'Symbol',
+            'lang_tab_letter':'Letter'
+        }
+    }
+};
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/lang/en/images/addimage.png b/pluss-manage-page/src/main/webapp/page/umeditor/lang/en/images/addimage.png
new file mode 100644
index 0000000..3a2fd17
Binary files /dev/null and b/pluss-manage-page/src/main/webapp/page/umeditor/lang/en/images/addimage.png differ
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/lang/en/images/alldeletebtnhoverskin.png b/pluss-manage-page/src/main/webapp/page/umeditor/lang/en/images/alldeletebtnhoverskin.png
new file mode 100644
index 0000000..355eeab
Binary files /dev/null and b/pluss-manage-page/src/main/webapp/page/umeditor/lang/en/images/alldeletebtnhoverskin.png differ
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/lang/en/images/alldeletebtnupskin.png b/pluss-manage-page/src/main/webapp/page/umeditor/lang/en/images/alldeletebtnupskin.png
new file mode 100644
index 0000000..61658ce
Binary files /dev/null and b/pluss-manage-page/src/main/webapp/page/umeditor/lang/en/images/alldeletebtnupskin.png differ
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/lang/en/images/background.png b/pluss-manage-page/src/main/webapp/page/umeditor/lang/en/images/background.png
new file mode 100644
index 0000000..d5bf5fd
Binary files /dev/null and b/pluss-manage-page/src/main/webapp/page/umeditor/lang/en/images/background.png differ
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/lang/en/images/button.png b/pluss-manage-page/src/main/webapp/page/umeditor/lang/en/images/button.png
new file mode 100644
index 0000000..098874c
Binary files /dev/null and b/pluss-manage-page/src/main/webapp/page/umeditor/lang/en/images/button.png differ
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/lang/en/images/copy.png b/pluss-manage-page/src/main/webapp/page/umeditor/lang/en/images/copy.png
new file mode 100644
index 0000000..f982e8b
Binary files /dev/null and b/pluss-manage-page/src/main/webapp/page/umeditor/lang/en/images/copy.png differ
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/lang/en/images/deletedisable.png b/pluss-manage-page/src/main/webapp/page/umeditor/lang/en/images/deletedisable.png
new file mode 100644
index 0000000..c8ee750
Binary files /dev/null and b/pluss-manage-page/src/main/webapp/page/umeditor/lang/en/images/deletedisable.png differ
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/lang/en/images/deleteenable.png b/pluss-manage-page/src/main/webapp/page/umeditor/lang/en/images/deleteenable.png
new file mode 100644
index 0000000..26acc88
Binary files /dev/null and b/pluss-manage-page/src/main/webapp/page/umeditor/lang/en/images/deleteenable.png differ
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/lang/en/images/imglabel.png b/pluss-manage-page/src/main/webapp/page/umeditor/lang/en/images/imglabel.png
new file mode 100644
index 0000000..da401e6
Binary files /dev/null and b/pluss-manage-page/src/main/webapp/page/umeditor/lang/en/images/imglabel.png differ
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/lang/en/images/listbackground.png b/pluss-manage-page/src/main/webapp/page/umeditor/lang/en/images/listbackground.png
new file mode 100644
index 0000000..4f82ccd
Binary files /dev/null and b/pluss-manage-page/src/main/webapp/page/umeditor/lang/en/images/listbackground.png differ
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/lang/en/images/localimage.png b/pluss-manage-page/src/main/webapp/page/umeditor/lang/en/images/localimage.png
new file mode 100644
index 0000000..12c8e6a
Binary files /dev/null and b/pluss-manage-page/src/main/webapp/page/umeditor/lang/en/images/localimage.png differ
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/lang/en/images/music.png b/pluss-manage-page/src/main/webapp/page/umeditor/lang/en/images/music.png
new file mode 100644
index 0000000..2f495fe
Binary files /dev/null and b/pluss-manage-page/src/main/webapp/page/umeditor/lang/en/images/music.png differ
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/lang/en/images/rotateleftdisable.png b/pluss-manage-page/src/main/webapp/page/umeditor/lang/en/images/rotateleftdisable.png
new file mode 100644
index 0000000..741526e
Binary files /dev/null and b/pluss-manage-page/src/main/webapp/page/umeditor/lang/en/images/rotateleftdisable.png differ
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/lang/en/images/rotateleftenable.png b/pluss-manage-page/src/main/webapp/page/umeditor/lang/en/images/rotateleftenable.png
new file mode 100644
index 0000000..e164ddb
Binary files /dev/null and b/pluss-manage-page/src/main/webapp/page/umeditor/lang/en/images/rotateleftenable.png differ
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/lang/en/images/rotaterightdisable.png b/pluss-manage-page/src/main/webapp/page/umeditor/lang/en/images/rotaterightdisable.png
new file mode 100644
index 0000000..5a78c26
Binary files /dev/null and b/pluss-manage-page/src/main/webapp/page/umeditor/lang/en/images/rotaterightdisable.png differ
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/lang/en/images/rotaterightenable.png b/pluss-manage-page/src/main/webapp/page/umeditor/lang/en/images/rotaterightenable.png
new file mode 100644
index 0000000..d768531
Binary files /dev/null and b/pluss-manage-page/src/main/webapp/page/umeditor/lang/en/images/rotaterightenable.png differ
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/lang/en/images/upload.png b/pluss-manage-page/src/main/webapp/page/umeditor/lang/en/images/upload.png
new file mode 100644
index 0000000..7bb15b3
Binary files /dev/null and b/pluss-manage-page/src/main/webapp/page/umeditor/lang/en/images/upload.png differ
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/lang/zh-cn/images/copy.png b/pluss-manage-page/src/main/webapp/page/umeditor/lang/zh-cn/images/copy.png
new file mode 100644
index 0000000..b2536aa
Binary files /dev/null and b/pluss-manage-page/src/main/webapp/page/umeditor/lang/zh-cn/images/copy.png differ
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/lang/zh-cn/images/imglabel.png b/pluss-manage-page/src/main/webapp/page/umeditor/lang/zh-cn/images/imglabel.png
new file mode 100644
index 0000000..4fc3c88
Binary files /dev/null and b/pluss-manage-page/src/main/webapp/page/umeditor/lang/zh-cn/images/imglabel.png differ
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/lang/zh-cn/images/localimage.png b/pluss-manage-page/src/main/webapp/page/umeditor/lang/zh-cn/images/localimage.png
new file mode 100644
index 0000000..7303c36
Binary files /dev/null and b/pluss-manage-page/src/main/webapp/page/umeditor/lang/zh-cn/images/localimage.png differ
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/lang/zh-cn/images/music.png b/pluss-manage-page/src/main/webapp/page/umeditor/lang/zh-cn/images/music.png
new file mode 100644
index 0000000..354edeb
Binary files /dev/null and b/pluss-manage-page/src/main/webapp/page/umeditor/lang/zh-cn/images/music.png differ
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/lang/zh-cn/images/upload.png b/pluss-manage-page/src/main/webapp/page/umeditor/lang/zh-cn/images/upload.png
new file mode 100644
index 0000000..08d4d92
Binary files /dev/null and b/pluss-manage-page/src/main/webapp/page/umeditor/lang/zh-cn/images/upload.png differ
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/lang/zh-cn/zh-cn.js b/pluss-manage-page/src/main/webapp/page/umeditor/lang/zh-cn/zh-cn.js
new file mode 100644
index 0000000..5f4a5e5
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/page/umeditor/lang/zh-cn/zh-cn.js
@@ -0,0 +1,150 @@
+/**
+ * 中文语言包
+ */
+UM.I18N['zh-cn'] = {
+    'labelMap':{
+        'anchor':'锚点', 'undo':'撤销', 'redo':'重做', 'bold':'加粗', 'indent':'首行缩进', 'snapscreen':'截图',
+        'italic':'斜体', 'underline':'下划线', 'strikethrough':'删除线', 'subscript':'下标','fontborder':'字符边框',
+        'superscript':'上标', 'formatmatch':'格式刷', 'source':'源代码', 'blockquote':'引用',
+        'pasteplain':'纯文本粘贴模式', 'selectall':'全选', 'print':'打印', 'preview':'预览',
+        'horizontal':'分隔线', 'removeformat':'清除格式', 'time':'时间', 'date':'日期',
+        'unlink':'取消链接', 'insertrow':'前插入行', 'insertcol':'前插入列', 'mergeright':'右合并单元格', 'mergedown':'下合并单元格',
+        'deleterow':'删除行', 'deletecol':'删除列', 'splittorows':'拆分成行', 'splittocols':'拆分成列', 'splittocells':'完全拆分单元格',
+        'mergecells':'合并多个单元格', 'deletetable':'删除表格', 'cleardoc':'清空文档','insertparagraphbeforetable':"表格前插入行",'insertcode':'代码语言','fontfamily':'字体', 'fontsize':'字号', 'paragraph':'段落格式', 'image':'图片',
+        'edittable':'表格属性','edittd':'单元格属性', 'link':'超链接','emotion':'表情', 'spechars':'特殊字符', 'searchreplace':'查询替换', 'map':'百度地图', 'gmap':'Google地图',
+        'video':'视频', 'help':'帮助', 'justifyleft':'居左对齐', 'justifyright':'居右对齐', 'justifycenter':'居中对齐',
+        'justifyjustify':'两端对齐', 'forecolor':'字体颜色', 'backcolor':'背景色', 'insertorderedlist':'有序列表',
+        'insertunorderedlist':'无序列表', 'fullscreen':'全屏', 'directionalityltr':'从左向右输入', 'directionalityrtl':'从右向左输入',
+        'rowspacingtop':'段前距', 'rowspacingbottom':'段后距', 'highlightcode':'插入代码', 'pagebreak':'分页', 'insertframe':'插入Iframe', 'imagenone':'默认',
+        'imageleft':'左浮动', 'imageright':'右浮动', 'attachment':'附件', 'imagecenter':'居中', 'wordimage':'图片转存',
+        'lineheight':'行间距','edittip' :'编辑提示','customstyle':'自定义标题', 'autotypeset':'自动排版', 'webapp':'百度应用',
+        'touppercase':'字母大写', 'tolowercase':'字母小写','background':'背景','template':'模板','scrawl':'涂鸦','music':'音乐','inserttable':'插入表格',
+        'drafts': '草稿箱', 'formula':'数学公式'
+
+
+    },
+    'paragraph':{'p':'段落', 'h1':'标题 1', 'h2':'标题 2', 'h3':'标题 3', 'h4':'标题 4', 'h5':'标题 5', 'h6':'标题 6'},
+    'fontfamily':{
+        'songti':'宋体',
+        'kaiti':'楷体',
+        'heiti':'黑体',
+        'lishu':'隶书',
+        'yahei':'微软雅黑',
+        'andaleMono':'andale mono',
+        'arial': 'arial',
+        'arialBlack':'arial black',
+        'comicSansMs':'comic sans ms',
+        'impact':'impact',
+        'timesNewRoman':'times new roman'
+    },
+    'ok':"确认",
+    'cancel':"取消",
+    'closeDialog':"关闭对话框",
+    'tableDrag':"表格拖动必须引入uiUtils.js文件！",
+    'autofloatMsg':"工具栏浮动依赖编辑器UI，您首先需要引入UI文件!",
+    'anthorMsg':"链接",
+    'clearColor':'清空颜色',
+    'standardColor':'标准颜色',
+    'themeColor':'主题颜色',
+    'property':'属性',
+    'default':'默认',
+    'modify':'修改',
+    'justifyleft':'左对齐',
+    'justifyright':'右对齐',
+    'justifycenter':'居中',
+    'justify':'默认',
+    'clear':'清除',
+    'anchorMsg':'锚点',
+    'delete':'删除',
+    'clickToUpload':"点击上传",
+    'unset':'尚未设置语言文件',
+    't_row':'行',
+    't_col':'列',
+    'more':'更多',
+    'pasteOpt':'粘贴选项',
+    'pasteSourceFormat':"保留源格式",
+    'tagFormat':'只保留标签',
+    'pasteTextFormat':'只保留文本',
+
+    //===============dialog i18N=======================
+    'image':{
+        'static':{
+            'lang_tab_local':"本地上传",
+            'lang_tab_imgSearch':"网络图片",
+            'lang_input_dragTip':"支持图片拖拽上传",
+            'lang_btn_add':"添加"
+        },
+        'uploadError': '上传出错'
+    },
+    'emotion':{
+        'static':{
+            'lang_input_choice':'精选',
+            'lang_input_Tuzki':'兔斯基',
+            'lang_input_BOBO':'BOBO',
+            'lang_input_lvdouwa':'绿豆蛙',
+            'lang_input_babyCat':'baby猫',
+            'lang_input_bubble':'泡泡',
+            'lang_input_youa':'有啊'
+        }
+    },
+    'gmap':{
+        'static':{
+            'lang_input_address':'地址',
+            'lang_input_search':'搜索',
+            'address':{'value':"北京"}
+        },
+        'searchError':'无法定位到该地址!'
+    },
+    'link':{
+        'static':{
+            'lang_input_text':'文本内容：',
+            'lang_input_url':'链接地址：',
+            'lang_input_title':'标题：',
+            'lang_input_target':'是否在新窗口打开：'
+        },
+        'validLink':'只支持选中一个链接时生效',
+        'httpPrompt':'您输入的超链接中不包含http等协议名称，默认将为您添加http://前缀'
+    },
+    'map':{
+        'static':{
+            'lang_city':"城市",
+            'lang_address':"地址",
+            'city':{'value':"北京"},
+            'lang_search':"搜索",
+            'lang_dynamicmap':"插入动态地图"
+        },
+        'cityMsg':"请选择城市",
+        'errorMsg':"抱歉，找不到该位置！"
+    },
+    'video':{
+        'static':{
+            'lang_tab_insertV':"插入视频",
+            'lang_video_url':"视频网址",
+            'lang_video_size':"视频尺寸",
+            'lang_videoW':"宽度",
+            'lang_videoH':"高度",
+            'lang_alignment':"对齐方式",
+            'videoSearchTxt':{'value':"请输入搜索关键字！"},
+            'videoType':{'options':["全部", "热门", "娱乐", "搞笑", "体育", "科技", "综艺"]},
+            'videoSearchBtn':{'value':"百度一下"},
+            'videoSearchReset':{'value':"清空结果"}
+        },
+        'numError':"请输入正确的数值，如123,400",
+        'floatLeft':"左浮动",
+        'floatRight':"右浮动",
+        'default':"默认",
+        'block':"独占一行",
+        'urlError':"输入的视频地址有误，请检查后再试！",
+        'loading':" &nbsp;视频加载中，请等待……",
+        'clickToSelect':"点击选中",
+        'goToSource':'访问源视频',
+        'noVideo':" &nbsp; &nbsp;抱歉，找不到对应的视频，请重试！"
+    },
+    'formula':{
+        'static':{
+            'lang_tab_common':'常用公式',
+            'lang_tab_symbol':'符号',
+            'lang_tab_letter':'字母'
+        }
+    }
+};
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/themes/default/css/umeditor.css b/pluss-manage-page/src/main/webapp/page/umeditor/themes/default/css/umeditor.css
new file mode 100644
index 0000000..b65cd32
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/page/umeditor/themes/default/css/umeditor.css
@@ -0,0 +1,775 @@
+.edui-container{
+    position: relative;
+    border: 1px solid #d4d4d4;
+    box-shadow: 2px 2px 5px #d3d6da;
+    background-color: #fff;
+}
+.edui-container .edui-toolbar{
+    position: relative;
+    width:auto;
+    border-bottom: 1px solid #e1e1e1;
+    box-shadow: 2px 2px 5px #d3d6da;
+    background-color: #fafafa;
+    z-index: 99999;
+}
+.edui-toolbar .edui-btn-toolbar{
+    position: relative;
+    padding: 5px;
+}
+.edui-container .edui-editor-body{
+    background-color: #fff;
+}
+.edui-editor-body .edui-body-container{
+}
+
+.edui-editor-body .edui-body-container p{margin:5px 0;}
+.edui-editor-body .edui-body-container{
+    border:0;
+    outline:none;
+    cursor:text;
+    padding:0 10px 0;
+    overflow:auto;
+    display:block;
+    word-wrap:break-word;
+    font-size:16px;
+    font-family:sans-serif;
+    height:240px;
+}
+
+.edui-editor-body.focus{border:1px solid #5c9dff}
+.edui-editor-body table{margin:10px 0 10px;border-collapse:collapse;display:table;}
+.edui-editor-body td{padding: 5px 10px;border: 1px solid #DDD;}
+.edui-editor-body iframe.mathquill-embedded-latex{
+    border: 0px;
+    padding: 0px;
+    display: inline;
+    margin: 0px;
+    background: none;
+    vertical-align: middle;
+    width: 0px;
+    height: 0px;
+}
+/*普通按钮*/
+.edui-btn-toolbar .edui-btn{
+    position: relative;
+    display: inline-block;
+    vertical-align: top;
+    *display: inline;
+    *zoom:1;
+    width:auto;
+    margin: 0 1px;
+    padding:1px;
+    border:none;
+    background: none;
+}
+.edui-btn-toolbar .edui-btn .edui-icon{
+    width: 20px;
+    height: 20px;
+    margin: 0;
+    padding:0;
+    background-repeat: no-repeat;
+    background-image: url(../images/icons.png);
+    background-image: url(../images/icons.gif) \9;
+}
+
+/*状态反射*/
+.edui-btn-toolbar .edui-btn.edui-hover,
+.edui-btn-toolbar .edui-btn.edui-active{
+    background-color: #d5e1f2;
+    padding: 0;
+    border: 1px solid #a3bde3;
+    _z-index: 1;
+}
+.edui-btn-toolbar .edui-btn.edui-disabled{
+    opacity: 0.3;
+    filter: alpha(opacity = 30);
+}
+.edui-btn-toolbar .edui-btn .edui-icon-source {
+    background-position:-260px -0px;
+}
+.edui-btn-toolbar .edui-btn .edui-icon-undo {
+    background-position: -160px 0;
+}
+.edui-btn-toolbar .edui-btn .edui-icon-redo {
+    background-position: -100px 0;
+}
+.edui-btn-toolbar  .edui-btn .edui-icon-bold{
+    background-position: 0 0;
+}
+.edui-btn-toolbar  .edui-btn .edui-icon-italic {
+    background-position: -60px 0;
+}
+.edui-btn-toolbar  .edui-btn .edui-icon-underline  {
+    background-position: -140px 0
+}
+.edui-btn-toolbar .edui-btn .edui-icon-strikethrough {
+    background-position: -120px 0;
+}
+
+.edui-btn-toolbar .edui-btn .edui-icon-superscript {
+    background-position: -620px 0;
+}
+.edui-btn-toolbar .edui-btn .edui-icon-subscript {
+    background-position:  -600px 0;
+}
+.edui-btn-toolbar .edui-btn .edui-icon-font, .edui-btn-toolbar .edui-btn .edui-icon-forecolor {
+    background-position: -720px 0;
+}
+
+.edui-btn-toolbar .edui-btn .edui-icon-backcolor {
+    background-position: -760px 0;
+}
+
+.edui-btn-toolbar .edui-btn .edui-icon-insertorderedlist {
+    background-position: -80px 0;
+}
+.edui-btn-toolbar .edui-btn .edui-icon-insertunorderedlist {
+    background-position:   -20px 0;
+}
+.edui-btn-toolbar .edui-btn .edui-icon-selectall {
+    background-position: -400px -20px;
+}
+.edui-btn-toolbar .edui-btn .edui-icon-cleardoc {
+    background-position: -520px 0;
+}
+.edui-btn-toolbar .edui-btn .edui-icon-paragraph {
+    background-position: -140px 0;
+}
+
+.edui-btn-toolbar .edui-btn .edui-icon-fontfamily {
+    background-position: -140px 0;
+}
+
+.edui-btn-toolbar .edui-btn .edui-icon-fontsize {
+    background-position: -140px 0;
+}
+
+.edui-btn-toolbar .edui-btn .edui-icon-justifyleft {
+    background-position: -460px 0;
+}
+
+.edui-btn-toolbar .edui-btn .edui-icon-justifycenter {
+    background-position: -420px 0;
+}
+
+.edui-btn-toolbar .edui-btn .edui-icon-justifyright {
+    background-position:-480px 0;
+}
+
+.edui-btn-toolbar .edui-btn .edui-icon-justifyjustify {
+    background-position: -440px 0;
+}
+
+.edui-btn-toolbar .edui-btn .edui-icon-link {
+    background-position: -500px 0;
+}
+
+.edui-btn-toolbar .edui-btn .edui-icon-unlink {
+    background-position: -640px 0;
+}
+
+.edui-btn-toolbar .edui-btn .edui-icon-image {
+    background-position: -380px 0;
+}
+
+.edui-btn-toolbar .edui-btn .edui-icon-emotion {
+    background-position: -60px -20px;
+}
+.edui-btn-toolbar .edui-btn .edui-icon-video {
+    background-position: -320px -20px;
+}
+
+.edui-btn-toolbar .edui-btn .edui-icon-map {
+    background-position:  -40px -40px;
+}
+
+.edui-btn-toolbar .edui-btn .edui-icon-gmap {
+    background-position:  -260px -40px;
+}
+.edui-btn-toolbar .edui-btn .edui-icon-horizontal {
+    background-position: -360px 0;
+}
+
+.edui-btn-toolbar .edui-btn .edui-icon-print {
+    background-position: -440px -20px;
+}
+.edui-btn-toolbar .edui-btn .edui-icon-preview {
+    background-position: -420px -20px;
+}
+
+.edui-btn-toolbar .edui-btn-fullscreen{
+    float:right;
+}
+.edui-btn-toolbar .edui-btn .edui-icon-fullscreen {
+    background-position: -100px -20px;
+}
+
+.edui-btn-toolbar .edui-btn .edui-icon-removeformat {
+    background-position: -580px 0;
+}
+.edui-btn-toolbar .edui-btn .edui-icon-drafts {
+    background-position: -560px 0;
+}
+.edui-btn-toolbar .edui-btn .edui-icon-formula {
+    background-position: -80px -20px;
+}
+.edui-btn-toolbar .edui-splitbutton{
+    position: relative;
+    display: inline-block ;
+    vertical-align: top;
+    *display: inline ;
+    *zoom:1;
+    margin:0 2px;
+}
+.edui-splitbutton .edui-btn{
+    margin: 0;
+}
+.edui-splitbutton .edui-caret{
+    position: relative;
+    display: inline-block ;
+    vertical-align: top;
+    *display: inline ;
+    *zoom:1;
+    width: 8px;
+    height: 20px;
+    background: url(../images/icons.png) -741px 0;
+    _background: url(../images/icons.gif) -741px 0;
+}
+
+.edui-btn-toolbar .edui-splitbutton,
+.edui-btn-toolbar .edui-splitbutton{
+    _border: none;
+}
+
+/*状态反射*/
+.edui-btn-toolbar .edui-splitbutton.edui-hover .edui-btn{
+    background-color: #d5e1f2;
+}
+
+.edui-btn-toolbar .edui-splitbutton.edui-disabled{
+    opacity: 0.3;
+    filter: alpha(opacity = 30);
+}
+.edui-btn-toolbar .edui-splitbutton.edui-disabled .edui-caret{
+    opacity: 0.3 \0;
+    filter: alpha(opacity = 30)\0;
+}
+
+
+.edui-btn-toolbar .edui-combobox{
+    border: 1px solid #CCC;
+    padding:0;
+    margin:0 2px;
+    line-height: 20px;
+}
+.edui-combobox .edui-button-label{
+    position: relative;
+    display: inline-block;
+    vertical-align: top;
+    *display: inline ;
+    *zoom:1;
+    width:60px;
+    height:20px;
+    line-height: 20px;
+    padding: 2px;
+    margin: 0;
+    font-size: 12px;
+    text-align: center;
+    cursor: default;
+}
+.edui-combobox  .edui-button-spacing{
+    position: relative;
+    display: inline-block ;
+    vertical-align: top;
+    *display: inline ;
+    *zoom:1;
+    height:20px;
+    margin: 0;
+    padding:0 3px;
+}
+.edui-combobox .edui-caret{
+    position: relative;
+    display: inline-block ;
+    vertical-align: top;
+    *display: inline ;
+    *zoom:1;
+    height:20px;
+    width: 12px;
+    margin: 0;
+    padding: 0;
+    background: url(../images/icons.png) -741px 0;
+    _background: url(../images/icons.gif) -741px 0;
+}
+.edui-btn-toolbar .edui-combobox.edui-disabled{
+    opacity: 0.2;
+    filter: alpha(opacity = 20);
+}
+.edui-btn-toolbar .edui-combobox.edui-disabled .edui-button-label,
+.edui-btn-toolbar .edui-combobox.edui-disabled .edui-caret{
+    opacity: 0.2 \0;
+    filter: alpha(opacity = 20)\0;
+}
+.edui-combobox-menu{
+    position: absolute;
+    top: 100%;
+    left: 0;
+    display: none;
+    list-style: none;
+    text-decoration: none;
+    margin: 0;
+    padding:5px;
+    background-color: #ffffff;
+    border: 1px solid #ccc;
+    font-size: 12px;
+    box-shadow: 2px 2px 5px #d3d6da;
+    min-width: 160px;
+    _width: 160px;
+}
+
+.edui-combobox-menu .edui-combobox-item {
+    display: block;
+    border: 1px solid white;
+}
+
+.edui-combobox-menu .edui-combobox-item-label {
+    height: 25px;
+    line-height: 25px;
+    display: inline-block;
+    _display: inline;
+    _zoom: 1;
+    margin-left: 10px;
+}
+
+.edui-combobox-menu .edui-combobox-item:hover, .edui-combobox-menu .edui-combobox-stack-item:hover, .edui-combobox-menu .edui-combobox-item-hover {
+    background-color: #d5e1f2;
+    padding: 0;
+    border: 1px solid #a3bde3;
+}
+
+.edui-combobox-menu .edui-combobox-item .edui-combobox-icon {
+    display: inline-block;
+    *zoom: 1;
+    *display: inline;
+    width: 24px;
+    height: 25px;
+    background: red;
+    vertical-align: bottom;
+    background: url(../images/ok.gif) no-repeat 1000px 1000px;
+}
+
+.edui-combobox-menu .edui-combobox-checked .edui-combobox-icon {
+    background-position: 10px 7px;
+}
+
+
+.edui-combobox-menu .edui-combobox-item-separator {
+    min-width: 160px;
+    height: 1px;
+    line-height: 1px;
+    overflow: hidden;
+    background: #d3d3d3;
+    margin: 5px 0;
+    *margin-top: -8px;
+}
+
+/* 字体样式校正 */
+
+.edui-combobox-fontsize .edui-combobox-item-0.edui-combobox-checked .edui-combobox-icon {
+    background-position: 10px 7px;
+}
+
+.edui-combobox-fontsize .edui-combobox-item-1.edui-combobox-checked .edui-combobox-icon {
+    background-position: 10px 7px;
+}
+
+.edui-combobox-fontsize .edui-combobox-item-2.edui-combobox-checked .edui-combobox-icon {
+    background-position: 10px 7px;
+}
+
+.edui-combobox-fontsize .edui-combobox-item-3.edui-combobox-checked .edui-combobox-icon {
+    background-position: 10px 7px;
+}
+
+/* 24 */
+.edui-combobox-fontsize .edui-combobox-item-4 .edui-combobox-item-label {
+    height: 27px;
+    line-height: 27px;
+}
+
+.edui-combobox-fontsize .edui-combobox-item-4.edui-combobox-checked .edui-combobox-icon {
+    background-position: 10px 5px;
+}
+
+/* 32 */
+.edui-combobox-fontsize .edui-combobox-item-5 .edui-combobox-item-label {
+    height: 31px;
+    line-height: 31px;
+}
+
+.edui-combobox-fontsize .edui-combobox-item-5.edui-combobox-checked .edui-combobox-icon {
+    background-position: 10px 4px;
+}
+
+
+/* 48 */
+.edui-combobox-fontsize .edui-combobox-item-6 .edui-combobox-item-label {
+    height: 47px;
+    line-height: 47px;
+}
+
+/*.edui-combobox-fontsize .edui-combobox-item-6 .edui-combobox-icon {*/
+    /*height: 25px;*/
+    /*margin-bottom: 11px;*/
+/*}*/
+
+/*.edui-combobox-fontsize .edui-combobox-item-6.edui-combobox-checked .edui-combobox-icon {*/
+    /*background-position: 10px 7px;*/
+/*}*/
+
+
+/* 段落样式校正 */
+/* h1 */
+.edui-combobox-paragraph .edui-combobox-item-1 .edui-combobox-item-label {
+    font-size: 32px;
+    height: 36px;
+    line-height: 36px;
+}
+
+.edui-combobox-paragraph .edui-combobox-item-1 .edui-combobox-icon {
+    height: 25px;
+    margin-bottom: 5px;
+}
+
+.edui-combobox-paragraph .edui-combobox-item-1.edui-combobox-checked .edui-combobox-icon {
+    background-position: 10px 7px;
+}
+
+/* h2 */
+.edui-combobox-paragraph .edui-combobox-item-2 .edui-combobox-item-label {
+    font-size: 28px;
+    height: 27px;
+    line-height: 27px;
+}
+
+.edui-combobox-paragraph .edui-combobox-item-2 .edui-combobox-icon {
+    margin-bottom: 5px;
+}
+
+.edui-combobox-paragraph .edui-combobox-item-2.edui-combobox-checked .edui-combobox-icon {
+    background-position: 10px 10px;
+}
+
+/* h3 */
+.edui-combobox-paragraph .edui-combobox-item-3 .edui-combobox-item-label {
+    font-size: 24px;
+    height: 25px;
+    line-height: 25px;
+}
+
+.edui-combobox-paragraph .edui-combobox-item-3 .edui-combobox-icon {
+    height: 25px;
+    margin-bottom: 5px;
+}
+
+.edui-combobox-paragraph .edui-combobox-item-3.edui-combobox-checked .edui-combobox-icon {
+    background-position: 10px 11px;
+}
+
+/* h4 */
+.edui-combobox-paragraph .edui-combobox-item-4 .edui-combobox-item-label {
+    font-size: 18px;
+    height: 25px;
+    line-height: 25px;
+}
+
+.edui-combobox-paragraph .edui-combobox-item-4.edui-combobox-checked .edui-combobox-icon {
+    background-position: 10px 6px;
+}
+
+/* h5 */
+.edui-combobox-paragraph .edui-combobox-item-5 .edui-combobox-item-label {
+    font-size: 16px;
+}
+
+/* h6 */
+.edui-combobox-paragraph .edui-combobox-item-6 .edui-combobox-item-label {
+    font-size: 12px;
+}
+.edui-modal {
+    position: fixed;
+    _position: absolute;
+    top: 10%;
+    left: 50%;
+    border: 1px solid #acacac;
+    box-shadow: 2px 2px 5px #d3d6da;
+    background-color: #ffffff;
+    outline: 0;
+}
+.edui-modal-header {
+    padding: 5px 10px;
+    border-bottom: 1px solid #eee;
+}
+.edui-modal-header .edui-close {
+    float: right;
+    width:20px;
+    height:20px;
+    margin-top: 2px;
+    padding: 1px;
+    border: 0;
+    background: url("../images/close.png") no-repeat center center;
+    cursor: pointer;
+}
+.edui-modal-header .edui-close.edui-hover {
+    background-color: #d5e1f2;
+    padding:0;
+    border: 1px solid #a3bde3;
+}
+.edui-modal-header .edui-title {
+    margin: 0;
+    line-height: 25px;
+    font-size: 20px;
+}
+.edui-modal-body {
+    position: relative;
+    max-height: 400px;
+    font-size: 12px;
+    overflow-y: auto;
+}
+.edui-modal-footer {
+    float: right;
+    padding: 5px 15px 15px;
+    overflow: hidden;
+}
+.edui-modal-footer .edui-btn {
+    float: left;
+    height: 24px;
+    width: 96px;
+    margin: 0 10px;
+    background-color: #ffffff;
+    padding: 0;
+    border: 1px solid #ababab;
+    font-size: 12px;
+    line-height: 24px;
+    text-align: center;
+    cursor: pointer;
+}
+.edui-modal-footer .edui-btn.edui-hover{
+    background-color: #d5e1f2;
+    border: 1px solid #a3bde3;
+}
+.edui-modal-backdrop{
+    opacity: 0.5;
+    filter: alpha(opacity=50);
+    position: fixed;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    background-color: #c6c6c6;
+}
+
+.edui-modal .edui-modal-tip {
+    color: red;
+    position: absolute;
+    bottom: 10px;
+    left: 10px;
+    height: 30px;
+    line-height: 30px;
+    display: none;
+}
+/*图片上传*/
+.edui-dialog-image-body {
+    width: 700px;
+    height: 400px;
+}
+/*插入视频*/
+.edui-dialog-video-body{
+    width: 600px;
+    height: 350px;
+}
+/*谷歌地图*/
+.edui-dialog-gmap-body{
+    width:550px;
+    height: 400px;
+}
+
+/*百度地图*/
+.edui-dialog-map-body{
+    width:580px;
+    height: 400px;
+}
+
+/*链接*/
+.edui-dialog-link-body{
+    width:400px;
+    height:200px;
+}
+.edui-popup{
+    display: none;
+    background: url('../images/pop-bg.png') repeat #fff;
+    padding: 2px;
+}
+.edui-popup .edui-popup-body{
+    border: 1px solid #bfbfbf;
+    background-color: #fff;
+}
+.edui-popup .edui-popup-caret{
+    width: 21px;
+    height: 11px;
+}
+.edui-popup .edui-popup-caret.up{
+    background:url('../images/caret.png') no-repeat 0 0;
+}
+.edui-popup .edui-popup-caret.down{
+    background:url('../images/caret.png') no-repeat 0 0;
+}
+
+
+.edui-tab-nav {
+    margin: 0;
+    padding:0;
+    border-bottom: 1px solid #ddd;
+    list-style: none;
+    height:30px;
+}
+.edui-tab-nav .edui-tab-item {
+    float:left;
+    margin-bottom: -1px;
+    margin-top: 1px;
+    margin-top: 0\9;
+}
+.edui-tab-nav .edui-tab-item .edui-tab-text{
+    display: block;
+    padding:8px 12px;
+    border: 1px solid transparent;
+    color: #0088cc;
+    text-decoration: none;
+    outline: 0;
+    _border:1px solid #fff ;
+    cursor: pointer;
+}
+.edui-tab-nav .edui-tab-item .edui-tab-text:FOCUS {
+    outline: none;
+}
+.edui-tab-nav .edui-tab-item.edui-active  .edui-tab-text{
+    border: 1px solid #ddd;
+    border-bottom-color: transparent;
+    background-color: #fff;
+    padding:8px 12px;
+    color: #555555;
+    cursor: default;
+}
+.edui-tab-content .edui-tab-pane{
+    padding: 1px;
+    position: relative;
+    display: none;
+    background-color: #fff;
+    clear: both;
+}
+.edui-tab-content .edui-tab-pane.edui-active{
+    display: block;
+}
+
+
+.edui-btn-toolbar .edui-tooltip{
+    position: absolute;
+    padding: 5px 0;
+    display: none;
+    /*opacity: 0.8;*/
+    /*filter: alpha(opacity=80);*/
+    z-index: 99999;
+}
+.edui-tooltip .edui-tooltip-arrow{
+    position: absolute;
+    top: 0;
+    _top: -2px;
+    left: 50%;
+    width: 0;
+    height: 0;
+    padding: 0;
+    font-size:0;
+    margin-left: -5px;
+    border-color: transparent;
+    border-style: dashed dashed solid dashed;
+    border-bottom-color: #000000;
+    border-width: 0 5px 5px;
+    background: transparent;
+}
+.edui-tooltip .edui-tooltip-inner{
+    padding: 6px;
+    color: #ffffff;
+    text-align: center;
+    text-decoration: none;
+    font-size: 10px;
+    background-color: #000000;
+    white-space: nowrap;
+    line-height: 12px;
+}
+.edui-splitbutton-color-label {
+    width: 16px;
+    height: 3px;
+    position: absolute;
+    bottom: 2px;
+    left: 50%;
+    margin-left: -8px;
+    overflow: hidden;
+    line-height: 3px;
+}
+.edui-popup .edui-colorpicker {
+    margin: 10px;
+    font-size: 12px;
+}
+.edui-colorpicker .edui-colorpicker-topbar{
+    height: 27px;
+    width: 200px;
+    overflow: hidden;
+}
+.edui-colorpicker .edui-colorpicker-topbar .edui-colorpicker-preview{
+    height: 20px;
+    border: 1px inset black;
+    margin-left: 1px;
+    width: 128px;
+    float: left;
+}
+.edui-colorpicker .edui-colorpicker-topbar .edui-colorpicker-nocolor{
+    float: right;
+    margin-right: 1px;
+    font-size: 12px;
+    line-height: 14px;
+    height: 14px;
+    border: 1px solid #333;
+    padding: 3px 5px;
+    cursor: pointer;
+}
+.edui-colorpicker table{
+    border-collapse: collapse;
+    border-spacing: 2px;
+}
+.edui-colorpicker tr.edui-colorpicker-firstrow{
+    height: 30px;
+}
+.edui-colorpicker table td{
+    padding: 0 2px;
+}
+.edui-colorpicker table td .edui-colorpicker-colorcell{
+    display: block;
+    text-decoration: none;
+    color: black;
+    width: 14px;
+    height: 14px;
+    margin: 0;
+    cursor: pointer;
+}
+.edui-toolbar .edui-separator{
+    width: 2px;
+    height: 20px;
+    padding: 1px 2px;
+    background: url(../images/icons.png) -179px 1px;
+    background: url(../images/icons.gif) -179px 1px \9;
+    display: inline-block ;
+    vertical-align: top;
+    *display: inline ;
+    *zoom:1;
+    border:none;
+
+}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/themes/default/css/umeditor.min.css b/pluss-manage-page/src/main/webapp/page/umeditor/themes/default/css/umeditor.min.css
new file mode 100644
index 0000000..ead5993
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/page/umeditor/themes/default/css/umeditor.min.css
@@ -0,0 +1,8 @@
+/*!
+ * UEditor Mini版本
+ * version: 1.2.2
+ * build: Fri Feb 10 2017 15:01:51 GMT+0800 (CST)
+ */
+
+
+.edui-container{position:relative;border:1px solid #d4d4d4;box-shadow:2px 2px 5px #d3d6da;background-color:#fff}.edui-container .edui-toolbar{position:relative;width:auto;border-bottom:1px solid #e1e1e1;box-shadow:2px 2px 5px #d3d6da;background-color:#fafafa;z-index:99999}.edui-toolbar .edui-btn-toolbar{position:relative;padding:5px}.edui-container .edui-editor-body{background-color:#fff}.edui-editor-body .edui-body-container{}.edui-editor-body .edui-body-container p{margin:5px 0}.edui-editor-body .edui-body-container{border:0;outline:0;cursor:text;padding:0 10px;overflow:auto;display:block;word-wrap:break-word;font-size:16px;font-family:sans-serif}.edui-editor-body.focus{border:1px solid #5c9dff}.edui-editor-body table{margin:10px 0;border-collapse:collapse;display:table}.edui-editor-body td{padding:5px 10px;border:1px solid #DDD}.edui-editor-body iframe.mathquill-embedded-latex{border:0;padding:0;display:inline;margin:0;background:0 0;vertical-align:middle;width:0;height:0}.edui-btn-toolbar .edui-btn{position:relative;display:inline-block;vertical-align:top;*display:inline;*zoom:1;width:auto;margin:0 1px;padding:1px;border:0;background:0 0}.edui-btn-toolbar .edui-btn .edui-icon{width:20px;height:20px;margin:0;padding:0;background-repeat:no-repeat;background-image:url(../images/icons.png);background-image:url(../images/icons.gif) \9}.edui-btn-toolbar .edui-btn.edui-hover,.edui-btn-toolbar .edui-btn.edui-active{background-color:#d5e1f2;padding:0;border:1px solid #a3bde3;_z-index:1}.edui-btn-toolbar .edui-btn.edui-disabled{opacity:.3;filter:alpha(opacity=30)}.edui-btn-toolbar .edui-btn .edui-icon-source{background-position:-260px -0px}.edui-btn-toolbar .edui-btn .edui-icon-undo{background-position:-160px 0}.edui-btn-toolbar .edui-btn .edui-icon-redo{background-position:-100px 0}.edui-btn-toolbar .edui-btn .edui-icon-bold{background-position:0 0}.edui-btn-toolbar .edui-btn .edui-icon-italic{background-position:-60px 0}.edui-btn-toolbar .edui-btn .edui-icon-underline{background-position:-140px 0}.edui-btn-toolbar .edui-btn .edui-icon-strikethrough{background-position:-120px 0}.edui-btn-toolbar .edui-btn .edui-icon-superscript{background-position:-620px 0}.edui-btn-toolbar .edui-btn .edui-icon-subscript{background-position:-600px 0}.edui-btn-toolbar .edui-btn .edui-icon-font,.edui-btn-toolbar .edui-btn .edui-icon-forecolor{background-position:-720px 0}.edui-btn-toolbar .edui-btn .edui-icon-backcolor{background-position:-760px 0}.edui-btn-toolbar .edui-btn .edui-icon-insertorderedlist{background-position:-80px 0}.edui-btn-toolbar .edui-btn .edui-icon-insertunorderedlist{background-position:-20px 0}.edui-btn-toolbar .edui-btn .edui-icon-selectall{background-position:-400px -20px}.edui-btn-toolbar .edui-btn .edui-icon-cleardoc{background-position:-520px 0}.edui-btn-toolbar .edui-btn .edui-icon-paragraph{background-position:-140px 0}.edui-btn-toolbar .edui-btn .edui-icon-fontfamily{background-position:-140px 0}.edui-btn-toolbar .edui-btn .edui-icon-fontsize{background-position:-140px 0}.edui-btn-toolbar .edui-btn .edui-icon-justifyleft{background-position:-460px 0}.edui-btn-toolbar .edui-btn .edui-icon-justifycenter{background-position:-420px 0}.edui-btn-toolbar .edui-btn .edui-icon-justifyright{background-position:-480px 0}.edui-btn-toolbar .edui-btn .edui-icon-justifyjustify{background-position:-440px 0}.edui-btn-toolbar .edui-btn .edui-icon-link{background-position:-500px 0}.edui-btn-toolbar .edui-btn .edui-icon-unlink{background-position:-640px 0}.edui-btn-toolbar .edui-btn .edui-icon-image{background-position:-380px 0}.edui-btn-toolbar .edui-btn .edui-icon-emotion{background-position:-60px -20px}.edui-btn-toolbar .edui-btn .edui-icon-video{background-position:-320px -20px}.edui-btn-toolbar .edui-btn .edui-icon-map{background-position:-40px -40px}.edui-btn-toolbar .edui-btn .edui-icon-gmap{background-position:-260px -40px}.edui-btn-toolbar .edui-btn .edui-icon-horizontal{background-position:-360px 0}.edui-btn-toolbar .edui-btn .edui-icon-print{background-position:-440px -20px}.edui-btn-toolbar .edui-btn .edui-icon-preview{background-position:-420px -20px}.edui-btn-toolbar .edui-btn-fullscreen{float:right}.edui-btn-toolbar .edui-btn .edui-icon-fullscreen{background-position:-100px -20px}.edui-btn-toolbar .edui-btn .edui-icon-removeformat{background-position:-580px 0}.edui-btn-toolbar .edui-btn .edui-icon-drafts{background-position:-560px 0}.edui-btn-toolbar .edui-btn .edui-icon-formula{background-position:-80px -20px}.edui-btn-toolbar .edui-splitbutton{position:relative;display:inline-block;vertical-align:top;*display:inline;*zoom:1;margin:0 2px}.edui-splitbutton .edui-btn{margin:0}.edui-splitbutton .edui-caret{position:relative;display:inline-block;vertical-align:top;*display:inline;*zoom:1;width:8px;height:20px;background:url(../images/icons.png) -741px 0;_background:url(../images/icons.gif) -741px 0}.edui-btn-toolbar .edui-splitbutton,.edui-btn-toolbar .edui-splitbutton{_border:0}.edui-btn-toolbar .edui-splitbutton.edui-hover .edui-btn{background-color:#d5e1f2}.edui-btn-toolbar .edui-splitbutton.edui-disabled{opacity:.3;filter:alpha(opacity=30)}.edui-btn-toolbar .edui-splitbutton.edui-disabled .edui-caret{opacity:.3 \0;filter:alpha(opacity=30)\0}.edui-btn-toolbar .edui-combobox{border:1px solid #CCC;padding:0;margin:0 2px;line-height:20px}.edui-combobox .edui-button-label{position:relative;display:inline-block;vertical-align:top;*display:inline;*zoom:1;width:60px;height:20px;line-height:20px;padding:2px;margin:0;font-size:12px;text-align:center;cursor:default}.edui-combobox .edui-button-spacing{position:relative;display:inline-block;vertical-align:top;*display:inline;*zoom:1;height:20px;margin:0;padding:0 3px}.edui-combobox .edui-caret{position:relative;display:inline-block;vertical-align:top;*display:inline;*zoom:1;height:20px;width:12px;margin:0;padding:0;background:url(../images/icons.png) -741px 0;_background:url(../images/icons.gif) -741px 0}.edui-btn-toolbar .edui-combobox.edui-disabled{opacity:.2;filter:alpha(opacity=20)}.edui-btn-toolbar .edui-combobox.edui-disabled .edui-button-label,.edui-btn-toolbar .edui-combobox.edui-disabled .edui-caret{opacity:.2 \0;filter:alpha(opacity=20)\0}.edui-combobox-menu{position:absolute;top:100%;left:0;display:none;list-style:none;text-decoration:none;margin:0;padding:5px;background-color:#fff;border:1px solid #ccc;font-size:12px;box-shadow:2px 2px 5px #d3d6da;min-width:160px;_width:160px}.edui-combobox-menu .edui-combobox-item{display:block;border:1px solid #fff}.edui-combobox-menu .edui-combobox-item-label{height:25px;line-height:25px;display:inline-block;_display:inline;_zoom:1;margin-left:10px}.edui-combobox-menu .edui-combobox-item:hover,.edui-combobox-menu .edui-combobox-stack-item:hover,.edui-combobox-menu .edui-combobox-item-hover{background-color:#d5e1f2;padding:0;border:1px solid #a3bde3}.edui-combobox-menu .edui-combobox-item .edui-combobox-icon{display:inline-block;*zoom:1;*display:inline;width:24px;height:25px;background:red;vertical-align:bottom;background:url(../images/ok.gif) no-repeat 1000px 1000px}.edui-combobox-menu .edui-combobox-checked .edui-combobox-icon{background-position:10px 7px}.edui-combobox-menu .edui-combobox-item-separator{min-width:160px;height:1px;line-height:1px;overflow:hidden;background:#d3d3d3;margin:5px 0;*margin-top:-8px}.edui-combobox-fontsize .edui-combobox-item-0.edui-combobox-checked .edui-combobox-icon{background-position:10px 7px}.edui-combobox-fontsize .edui-combobox-item-1.edui-combobox-checked .edui-combobox-icon{background-position:10px 7px}.edui-combobox-fontsize .edui-combobox-item-2.edui-combobox-checked .edui-combobox-icon{background-position:10px 7px}.edui-combobox-fontsize .edui-combobox-item-3.edui-combobox-checked .edui-combobox-icon{background-position:10px 7px}.edui-combobox-fontsize .edui-combobox-item-4 .edui-combobox-item-label{height:27px;line-height:27px}.edui-combobox-fontsize .edui-combobox-item-4.edui-combobox-checked .edui-combobox-icon{background-position:10px 5px}.edui-combobox-fontsize .edui-combobox-item-5 .edui-combobox-item-label{height:31px;line-height:31px}.edui-combobox-fontsize .edui-combobox-item-5.edui-combobox-checked .edui-combobox-icon{background-position:10px 4px}.edui-combobox-fontsize .edui-combobox-item-6 .edui-combobox-item-label{height:47px;line-height:47px}.edui-combobox-paragraph .edui-combobox-item-1 .edui-combobox-item-label{font-size:32px;height:36px;line-height:36px}.edui-combobox-paragraph .edui-combobox-item-1 .edui-combobox-icon{height:25px;margin-bottom:5px}.edui-combobox-paragraph .edui-combobox-item-1.edui-combobox-checked .edui-combobox-icon{background-position:10px 7px}.edui-combobox-paragraph .edui-combobox-item-2 .edui-combobox-item-label{font-size:28px;height:27px;line-height:27px}.edui-combobox-paragraph .edui-combobox-item-2 .edui-combobox-icon{margin-bottom:5px}.edui-combobox-paragraph .edui-combobox-item-2.edui-combobox-checked .edui-combobox-icon{background-position:10px 10px}.edui-combobox-paragraph .edui-combobox-item-3 .edui-combobox-item-label{font-size:24px;height:25px;line-height:25px}.edui-combobox-paragraph .edui-combobox-item-3 .edui-combobox-icon{height:25px;margin-bottom:5px}.edui-combobox-paragraph .edui-combobox-item-3.edui-combobox-checked .edui-combobox-icon{background-position:10px 11px}.edui-combobox-paragraph .edui-combobox-item-4 .edui-combobox-item-label{font-size:18px;height:25px;line-height:25px}.edui-combobox-paragraph .edui-combobox-item-4.edui-combobox-checked .edui-combobox-icon{background-position:10px 6px}.edui-combobox-paragraph .edui-combobox-item-5 .edui-combobox-item-label{font-size:16px}.edui-combobox-paragraph .edui-combobox-item-6 .edui-combobox-item-label{font-size:12px}.edui-modal{position:fixed;_position:absolute;top:10%;left:50%;border:1px solid #acacac;box-shadow:2px 2px 5px #d3d6da;background-color:#fff;outline:0}.edui-modal-header{padding:5px 10px;border-bottom:1px solid #eee}.edui-modal-header .edui-close{float:right;width:20px;height:20px;margin-top:2px;padding:1px;border:0;background:url(../images/close.png) no-repeat center center;cursor:pointer}.edui-modal-header .edui-close.edui-hover{background-color:#d5e1f2;padding:0;border:1px solid #a3bde3}.edui-modal-header .edui-title{margin:0;line-height:25px;font-size:20px}.edui-modal-body{position:relative;max-height:400px;font-size:12px;overflow-y:auto}.edui-modal-footer{float:right;padding:5px 15px 15px;overflow:hidden}.edui-modal-footer .edui-btn{float:left;height:24px;width:96px;margin:0 10px;background-color:#fff;padding:0;border:1px solid #ababab;font-size:12px;line-height:24px;text-align:center;cursor:pointer}.edui-modal-footer .edui-btn.edui-hover{background-color:#d5e1f2;border:1px solid #a3bde3}.edui-modal-backdrop{opacity:.5;filter:alpha(opacity=50);position:fixed;top:0;right:0;bottom:0;left:0;background-color:#c6c6c6}.edui-modal .edui-modal-tip{color:red;position:absolute;bottom:10px;left:10px;height:30px;line-height:30px;display:none}.edui-dialog-image-body{width:700px;height:400px}.edui-dialog-video-body{width:600px;height:350px}.edui-dialog-gmap-body{width:550px;height:400px}.edui-dialog-map-body{width:580px;height:400px}.edui-dialog-link-body{width:400px;height:200px}.edui-popup{display:none;background:url(../images/pop-bg.png) repeat #fff;padding:2px}.edui-popup .edui-popup-body{border:1px solid #bfbfbf;background-color:#fff}.edui-popup .edui-popup-caret{width:21px;height:11px}.edui-popup .edui-popup-caret.up{background:url(../images/caret.png) no-repeat 0 0}.edui-popup .edui-popup-caret.down{background:url(../images/caret.png) no-repeat 0 0}.edui-tab-nav{margin:0;padding:0;border-bottom:1px solid #ddd;list-style:none;height:30px}.edui-tab-nav .edui-tab-item{float:left;margin-bottom:-1px;margin-top:1px;margin-top:0\9}.edui-tab-nav .edui-tab-item .edui-tab-text{display:block;padding:8px 12px;border:1px solid transparent;color:#08c;text-decoration:none;outline:0;_border:1px solid #fff;cursor:pointer}.edui-tab-nav .edui-tab-item .edui-tab-text:FOCUS{outline:0}.edui-tab-nav .edui-tab-item.edui-active .edui-tab-text{border:1px solid #ddd;border-bottom-color:transparent;background-color:#fff;padding:8px 12px;color:#555;cursor:default}.edui-tab-content .edui-tab-pane{padding:1px;position:relative;display:none;background-color:#fff;clear:both}.edui-tab-content .edui-tab-pane.edui-active{display:block}.edui-btn-toolbar .edui-tooltip{position:absolute;padding:5px 0;display:none;z-index:99999}.edui-tooltip .edui-tooltip-arrow{position:absolute;top:0;_top:-2px;left:50%;width:0;height:0;padding:0;font-size:0;margin-left:-5px;border-color:transparent;border-style:dashed dashed solid;border-bottom-color:#000;border-width:0 5px 5px;background:transparent}.edui-tooltip .edui-tooltip-inner{padding:6px;color:#fff;text-align:center;text-decoration:none;font-size:10px;background-color:#000;white-space:nowrap;line-height:12px}.edui-splitbutton-color-label{width:16px;height:3px;position:absolute;bottom:2px;left:50%;margin-left:-8px;overflow:hidden;line-height:3px}.edui-popup .edui-colorpicker{margin:10px;font-size:12px}.edui-colorpicker .edui-colorpicker-topbar{height:27px;width:200px;overflow:hidden}.edui-colorpicker .edui-colorpicker-topbar .edui-colorpicker-preview{height:20px;border:1px inset #000;margin-left:1px;width:128px;float:left}.edui-colorpicker .edui-colorpicker-topbar .edui-colorpicker-nocolor{float:right;margin-right:1px;font-size:12px;line-height:14px;height:14px;border:1px solid #333;padding:3px 5px;cursor:pointer}.edui-colorpicker table{border-collapse:collapse;border-spacing:2px}.edui-colorpicker tr.edui-colorpicker-firstrow{height:30px}.edui-colorpicker table td{padding:0 2px}.edui-colorpicker table td .edui-colorpicker-colorcell{display:block;text-decoration:none;color:#000;width:14px;height:14px;margin:0;cursor:pointer}.edui-toolbar .edui-separator{width:2px;height:20px;padding:1px 2px;background:url(../images/icons.png) -179px 1px;background:url(../images/icons.gif) -179px 1px \9;display:inline-block;vertical-align:top;*display:inline;*zoom:1;border:0}
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/themes/default/images/caret.png b/pluss-manage-page/src/main/webapp/page/umeditor/themes/default/images/caret.png
new file mode 100644
index 0000000..cf06947
Binary files /dev/null and b/pluss-manage-page/src/main/webapp/page/umeditor/themes/default/images/caret.png differ
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/themes/default/images/close.png b/pluss-manage-page/src/main/webapp/page/umeditor/themes/default/images/close.png
new file mode 100644
index 0000000..a57693f
Binary files /dev/null and b/pluss-manage-page/src/main/webapp/page/umeditor/themes/default/images/close.png differ
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/themes/default/images/icons.gif b/pluss-manage-page/src/main/webapp/page/umeditor/themes/default/images/icons.gif
new file mode 100644
index 0000000..8206560
Binary files /dev/null and b/pluss-manage-page/src/main/webapp/page/umeditor/themes/default/images/icons.gif differ
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/themes/default/images/icons.png b/pluss-manage-page/src/main/webapp/page/umeditor/themes/default/images/icons.png
new file mode 100644
index 0000000..de9a1bb
Binary files /dev/null and b/pluss-manage-page/src/main/webapp/page/umeditor/themes/default/images/icons.png differ
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/themes/default/images/ok.gif b/pluss-manage-page/src/main/webapp/page/umeditor/themes/default/images/ok.gif
new file mode 100644
index 0000000..9d1362c
Binary files /dev/null and b/pluss-manage-page/src/main/webapp/page/umeditor/themes/default/images/ok.gif differ
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/themes/default/images/pop-bg.png b/pluss-manage-page/src/main/webapp/page/umeditor/themes/default/images/pop-bg.png
new file mode 100644
index 0000000..d7a5a30
Binary files /dev/null and b/pluss-manage-page/src/main/webapp/page/umeditor/themes/default/images/pop-bg.png differ
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/themes/default/images/spacer.gif b/pluss-manage-page/src/main/webapp/page/umeditor/themes/default/images/spacer.gif
new file mode 100644
index 0000000..5bfd67a
Binary files /dev/null and b/pluss-manage-page/src/main/webapp/page/umeditor/themes/default/images/spacer.gif differ
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/themes/default/images/videologo.gif b/pluss-manage-page/src/main/webapp/page/umeditor/themes/default/images/videologo.gif
new file mode 100644
index 0000000..555af74
Binary files /dev/null and b/pluss-manage-page/src/main/webapp/page/umeditor/themes/default/images/videologo.gif differ
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/third-party/jquery.min.js b/pluss-manage-page/src/main/webapp/page/umeditor/third-party/jquery.min.js
new file mode 100644
index 0000000..da41706
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/page/umeditor/third-party/jquery.min.js
@@ -0,0 +1,6 @@
+/*! jQuery v1.10.2 | (c) 2005, 2013 jQuery Foundation, Inc. | jquery.org/license
+//@ sourceMappingURL=jquery-1.10.2.min.map
+*/
+(function(e,t){var n,r,i=typeof t,o=e.location,a=e.document,s=a.documentElement,l=e.jQuery,u=e.$,c={},p=[],f="1.10.2",d=p.concat,h=p.push,g=p.slice,m=p.indexOf,y=c.toString,v=c.hasOwnProperty,b=f.trim,x=function(e,t){return new x.fn.init(e,t,r)},w=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,T=/\S+/g,C=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,N=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,k=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,E=/^[\],:{}\s]*$/,S=/(?:^|:|,)(?:\s*\[)+/g,A=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,j=/"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g,D=/^-ms-/,L=/-([\da-z])/gi,H=function(e,t){return t.toUpperCase()},q=function(e){(a.addEventListener||"load"===e.type||"complete"===a.readyState)&&(_(),x.ready())},_=function(){a.addEventListener?(a.removeEventListener("DOMContentLoaded",q,!1),e.removeEventListener("load",q,!1)):(a.detachEvent("onreadystatechange",q),e.detachEvent("onload",q))};x.fn=x.prototype={jquery:f,constructor:x,init:function(e,n,r){var i,o;if(!e)return this;if("string"==typeof e){if(i="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:N.exec(e),!i||!i[1]&&n)return!n||n.jquery?(n||r).find(e):this.constructor(n).find(e);if(i[1]){if(n=n instanceof x?n[0]:n,x.merge(this,x.parseHTML(i[1],n&&n.nodeType?n.ownerDocument||n:a,!0)),k.test(i[1])&&x.isPlainObject(n))for(i in n)x.isFunction(this[i])?this[i](n[i]):this.attr(i,n[i]);return this}if(o=a.getElementById(i[2]),o&&o.parentNode){if(o.id!==i[2])return r.find(e);this.length=1,this[0]=o}return this.context=a,this.selector=e,this}return e.nodeType?(this.context=this[0]=e,this.length=1,this):x.isFunction(e)?r.ready(e):(e.selector!==t&&(this.selector=e.selector,this.context=e.context),x.makeArray(e,this))},selector:"",length:0,toArray:function(){return g.call(this)},get:function(e){return null==e?this.toArray():0>e?this[this.length+e]:this[e]},pushStack:function(e){var t=x.merge(this.constructor(),e);return t.prevObject=this,t.context=this.context,t},each:function(e,t){return x.each(this,e,t)},ready:function(e){return x.ready.promise().done(e),this},slice:function(){return this.pushStack(g.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(0>e?t:0);return this.pushStack(n>=0&&t>n?[this[n]]:[])},map:function(e){return this.pushStack(x.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject||this.constructor(null)},push:h,sort:[].sort,splice:[].splice},x.fn.init.prototype=x.fn,x.extend=x.fn.extend=function(){var e,n,r,i,o,a,s=arguments[0]||{},l=1,u=arguments.length,c=!1;for("boolean"==typeof s&&(c=s,s=arguments[1]||{},l=2),"object"==typeof s||x.isFunction(s)||(s={}),u===l&&(s=this,--l);u>l;l++)if(null!=(o=arguments[l]))for(i in o)e=s[i],r=o[i],s!==r&&(c&&r&&(x.isPlainObject(r)||(n=x.isArray(r)))?(n?(n=!1,a=e&&x.isArray(e)?e:[]):a=e&&x.isPlainObject(e)?e:{},s[i]=x.extend(c,a,r)):r!==t&&(s[i]=r));return s},x.extend({expando:"jQuery"+(f+Math.random()).replace(/\D/g,""),noConflict:function(t){return e.$===x&&(e.$=u),t&&e.jQuery===x&&(e.jQuery=l),x},isReady:!1,readyWait:1,holdReady:function(e){e?x.readyWait++:x.ready(!0)},ready:function(e){if(e===!0?!--x.readyWait:!x.isReady){if(!a.body)return setTimeout(x.ready);x.isReady=!0,e!==!0&&--x.readyWait>0||(n.resolveWith(a,[x]),x.fn.trigger&&x(a).trigger("ready").off("ready"))}},isFunction:function(e){return"function"===x.type(e)},isArray:Array.isArray||function(e){return"array"===x.type(e)},isWindow:function(e){return null!=e&&e==e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?c[y.call(e)]||"object":typeof e},isPlainObject:function(e){var n;if(!e||"object"!==x.type(e)||e.nodeType||x.isWindow(e))return!1;try{if(e.constructor&&!v.call(e,"constructor")&&!v.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(r){return!1}if(x.support.ownLast)for(n in e)return v.call(e,n);for(n in e);return n===t||v.call(e,n)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},error:function(e){throw Error(e)},parseHTML:function(e,t,n){if(!e||"string"!=typeof e)return null;"boolean"==typeof t&&(n=t,t=!1),t=t||a;var r=k.exec(e),i=!n&&[];return r?[t.createElement(r[1])]:(r=x.buildFragment([e],t,i),i&&x(i).remove(),x.merge([],r.childNodes))},parseJSON:function(n){return e.JSON&&e.JSON.parse?e.JSON.parse(n):null===n?n:"string"==typeof n&&(n=x.trim(n),n&&E.test(n.replace(A,"@").replace(j,"]").replace(S,"")))?Function("return "+n)():(x.error("Invalid JSON: "+n),t)},parseXML:function(n){var r,i;if(!n||"string"!=typeof n)return null;try{e.DOMParser?(i=new DOMParser,r=i.parseFromString(n,"text/xml")):(r=new ActiveXObject("Microsoft.XMLDOM"),r.async="false",r.loadXML(n))}catch(o){r=t}return r&&r.documentElement&&!r.getElementsByTagName("parsererror").length||x.error("Invalid XML: "+n),r},noop:function(){},globalEval:function(t){t&&x.trim(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(D,"ms-").replace(L,H)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t,n){var r,i=0,o=e.length,a=M(e);if(n){if(a){for(;o>i;i++)if(r=t.apply(e[i],n),r===!1)break}else for(i in e)if(r=t.apply(e[i],n),r===!1)break}else if(a){for(;o>i;i++)if(r=t.call(e[i],i,e[i]),r===!1)break}else for(i in e)if(r=t.call(e[i],i,e[i]),r===!1)break;return e},trim:b&&!b.call("\ufeff\u00a0")?function(e){return null==e?"":b.call(e)}:function(e){return null==e?"":(e+"").replace(C,"")},makeArray:function(e,t){var n=t||[];return null!=e&&(M(Object(e))?x.merge(n,"string"==typeof e?[e]:e):h.call(n,e)),n},inArray:function(e,t,n){var r;if(t){if(m)return m.call(t,e,n);for(r=t.length,n=n?0>n?Math.max(0,r+n):n:0;r>n;n++)if(n in t&&t[n]===e)return n}return-1},merge:function(e,n){var r=n.length,i=e.length,o=0;if("number"==typeof r)for(;r>o;o++)e[i++]=n[o];else while(n[o]!==t)e[i++]=n[o++];return e.length=i,e},grep:function(e,t,n){var r,i=[],o=0,a=e.length;for(n=!!n;a>o;o++)r=!!t(e[o],o),n!==r&&i.push(e[o]);return i},map:function(e,t,n){var r,i=0,o=e.length,a=M(e),s=[];if(a)for(;o>i;i++)r=t(e[i],i,n),null!=r&&(s[s.length]=r);else for(i in e)r=t(e[i],i,n),null!=r&&(s[s.length]=r);return d.apply([],s)},guid:1,proxy:function(e,n){var r,i,o;return"string"==typeof n&&(o=e[n],n=e,e=o),x.isFunction(e)?(r=g.call(arguments,2),i=function(){return e.apply(n||this,r.concat(g.call(arguments)))},i.guid=e.guid=e.guid||x.guid++,i):t},access:function(e,n,r,i,o,a,s){var l=0,u=e.length,c=null==r;if("object"===x.type(r)){o=!0;for(l in r)x.access(e,n,l,r[l],!0,a,s)}else if(i!==t&&(o=!0,x.isFunction(i)||(s=!0),c&&(s?(n.call(e,i),n=null):(c=n,n=function(e,t,n){return c.call(x(e),n)})),n))for(;u>l;l++)n(e[l],r,s?i:i.call(e[l],l,n(e[l],r)));return o?e:c?n.call(e):u?n(e[0],r):a},now:function(){return(new Date).getTime()},swap:function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];i=n.apply(e,r||[]);for(o in t)e.style[o]=a[o];return i}}),x.ready.promise=function(t){if(!n)if(n=x.Deferred(),"complete"===a.readyState)setTimeout(x.ready);else if(a.addEventListener)a.addEventListener("DOMContentLoaded",q,!1),e.addEventListener("load",q,!1);else{a.attachEvent("onreadystatechange",q),e.attachEvent("onload",q);var r=!1;try{r=null==e.frameElement&&a.documentElement}catch(i){}r&&r.doScroll&&function o(){if(!x.isReady){try{r.doScroll("left")}catch(e){return setTimeout(o,50)}_(),x.ready()}}()}return n.promise(t)},x.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(e,t){c["[object "+t+"]"]=t.toLowerCase()});function M(e){var t=e.length,n=x.type(e);return x.isWindow(e)?!1:1===e.nodeType&&t?!0:"array"===n||"function"!==n&&(0===t||"number"==typeof t&&t>0&&t-1 in e)}r=x(a),function(e,t){var n,r,i,o,a,s,l,u,c,p,f,d,h,g,m,y,v,b="sizzle"+-new Date,w=e.document,T=0,C=0,N=st(),k=st(),E=st(),S=!1,A=function(e,t){return e===t?(S=!0,0):0},j=typeof t,D=1<<31,L={}.hasOwnProperty,H=[],q=H.pop,_=H.push,M=H.push,O=H.slice,F=H.indexOf||function(e){var t=0,n=this.length;for(;n>t;t++)if(this[t]===e)return t;return-1},B="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",P="[\\x20\\t\\r\\n\\f]",R="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",W=R.replace("w","w#"),$="\\["+P+"*("+R+")"+P+"*(?:([*^$|!~]?=)"+P+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+W+")|)|)"+P+"*\\]",I=":("+R+")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+$.replace(3,8)+")*)|.*)\\)|)",z=RegExp("^"+P+"+|((?:^|[^\\\\])(?:\\\\.)*)"+P+"+$","g"),X=RegExp("^"+P+"*,"+P+"*"),U=RegExp("^"+P+"*([>+~]|"+P+")"+P+"*"),V=RegExp(P+"*[+~]"),Y=RegExp("="+P+"*([^\\]'\"]*)"+P+"*\\]","g"),J=RegExp(I),G=RegExp("^"+W+"$"),Q={ID:RegExp("^#("+R+")"),CLASS:RegExp("^\\.("+R+")"),TAG:RegExp("^("+R.replace("w","w*")+")"),ATTR:RegExp("^"+$),PSEUDO:RegExp("^"+I),CHILD:RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+P+"*(even|odd|(([+-]|)(\\d*)n|)"+P+"*(?:([+-]|)"+P+"*(\\d+)|))"+P+"*\\)|)","i"),bool:RegExp("^(?:"+B+")$","i"),needsContext:RegExp("^"+P+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+P+"*((?:-\\d)?\\d*)"+P+"*\\)|)(?=[^-]|$)","i")},K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,et=/^(?:input|select|textarea|button)$/i,tt=/^h\d$/i,nt=/'|\\/g,rt=RegExp("\\\\([\\da-f]{1,6}"+P+"?|("+P+")|.)","ig"),it=function(e,t,n){var r="0x"+t-65536;return r!==r||n?t:0>r?String.fromCharCode(r+65536):String.fromCharCode(55296|r>>10,56320|1023&r)};try{M.apply(H=O.call(w.childNodes),w.childNodes),H[w.childNodes.length].nodeType}catch(ot){M={apply:H.length?function(e,t){_.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function at(e,t,n,i){var o,a,s,l,u,c,d,m,y,x;if((t?t.ownerDocument||t:w)!==f&&p(t),t=t||f,n=n||[],!e||"string"!=typeof e)return n;if(1!==(l=t.nodeType)&&9!==l)return[];if(h&&!i){if(o=Z.exec(e))if(s=o[1]){if(9===l){if(a=t.getElementById(s),!a||!a.parentNode)return n;if(a.id===s)return n.push(a),n}else if(t.ownerDocument&&(a=t.ownerDocument.getElementById(s))&&v(t,a)&&a.id===s)return n.push(a),n}else{if(o[2])return M.apply(n,t.getElementsByTagName(e)),n;if((s=o[3])&&r.getElementsByClassName&&t.getElementsByClassName)return M.apply(n,t.getElementsByClassName(s)),n}if(r.qsa&&(!g||!g.test(e))){if(m=d=b,y=t,x=9===l&&e,1===l&&"object"!==t.nodeName.toLowerCase()){c=mt(e),(d=t.getAttribute("id"))?m=d.replace(nt,"\\$&"):t.setAttribute("id",m),m="[id='"+m+"'] ",u=c.length;while(u--)c[u]=m+yt(c[u]);y=V.test(e)&&t.parentNode||t,x=c.join(",")}if(x)try{return M.apply(n,y.querySelectorAll(x)),n}catch(T){}finally{d||t.removeAttribute("id")}}}return kt(e.replace(z,"$1"),t,n,i)}function st(){var e=[];function t(n,r){return e.push(n+=" ")>o.cacheLength&&delete t[e.shift()],t[n]=r}return t}function lt(e){return e[b]=!0,e}function ut(e){var t=f.createElement("div");try{return!!e(t)}catch(n){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function ct(e,t){var n=e.split("|"),r=e.length;while(r--)o.attrHandle[n[r]]=t}function pt(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&(~t.sourceIndex||D)-(~e.sourceIndex||D);if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function ft(e){return function(t){var n=t.nodeName.toLowerCase();return"input"===n&&t.type===e}}function dt(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function ht(e){return lt(function(t){return t=+t,lt(function(n,r){var i,o=e([],n.length,t),a=o.length;while(a--)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}s=at.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?"HTML"!==t.nodeName:!1},r=at.support={},p=at.setDocument=function(e){var n=e?e.ownerDocument||e:w,i=n.defaultView;return n!==f&&9===n.nodeType&&n.documentElement?(f=n,d=n.documentElement,h=!s(n),i&&i.attachEvent&&i!==i.top&&i.attachEvent("onbeforeunload",function(){p()}),r.attributes=ut(function(e){return e.className="i",!e.getAttribute("className")}),r.getElementsByTagName=ut(function(e){return e.appendChild(n.createComment("")),!e.getElementsByTagName("*").length}),r.getElementsByClassName=ut(function(e){return e.innerHTML="<div class='a'></div><div class='a i'></div>",e.firstChild.className="i",2===e.getElementsByClassName("i").length}),r.getById=ut(function(e){return d.appendChild(e).id=b,!n.getElementsByName||!n.getElementsByName(b).length}),r.getById?(o.find.ID=function(e,t){if(typeof t.getElementById!==j&&h){var n=t.getElementById(e);return n&&n.parentNode?[n]:[]}},o.filter.ID=function(e){var t=e.replace(rt,it);return function(e){return e.getAttribute("id")===t}}):(delete o.find.ID,o.filter.ID=function(e){var t=e.replace(rt,it);return function(e){var n=typeof e.getAttributeNode!==j&&e.getAttributeNode("id");return n&&n.value===t}}),o.find.TAG=r.getElementsByTagName?function(e,n){return typeof n.getElementsByTagName!==j?n.getElementsByTagName(e):t}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},o.find.CLASS=r.getElementsByClassName&&function(e,n){return typeof n.getElementsByClassName!==j&&h?n.getElementsByClassName(e):t},m=[],g=[],(r.qsa=K.test(n.querySelectorAll))&&(ut(function(e){e.innerHTML="<select><option selected=''></option></select>",e.querySelectorAll("[selected]").length||g.push("\\["+P+"*(?:value|"+B+")"),e.querySelectorAll(":checked").length||g.push(":checked")}),ut(function(e){var t=n.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("t",""),e.querySelectorAll("[t^='']").length&&g.push("[*^$]="+P+"*(?:''|\"\")"),e.querySelectorAll(":enabled").length||g.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),g.push(",.*:")})),(r.matchesSelector=K.test(y=d.webkitMatchesSelector||d.mozMatchesSelector||d.oMatchesSelector||d.msMatchesSelector))&&ut(function(e){r.disconnectedMatch=y.call(e,"div"),y.call(e,"[s!='']:x"),m.push("!=",I)}),g=g.length&&RegExp(g.join("|")),m=m.length&&RegExp(m.join("|")),v=K.test(d.contains)||d.compareDocumentPosition?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},A=d.compareDocumentPosition?function(e,t){if(e===t)return S=!0,0;var i=t.compareDocumentPosition&&e.compareDocumentPosition&&e.compareDocumentPosition(t);return i?1&i||!r.sortDetached&&t.compareDocumentPosition(e)===i?e===n||v(w,e)?-1:t===n||v(w,t)?1:c?F.call(c,e)-F.call(c,t):0:4&i?-1:1:e.compareDocumentPosition?-1:1}:function(e,t){var r,i=0,o=e.parentNode,a=t.parentNode,s=[e],l=[t];if(e===t)return S=!0,0;if(!o||!a)return e===n?-1:t===n?1:o?-1:a?1:c?F.call(c,e)-F.call(c,t):0;if(o===a)return pt(e,t);r=e;while(r=r.parentNode)s.unshift(r);r=t;while(r=r.parentNode)l.unshift(r);while(s[i]===l[i])i++;return i?pt(s[i],l[i]):s[i]===w?-1:l[i]===w?1:0},n):f},at.matches=function(e,t){return at(e,null,null,t)},at.matchesSelector=function(e,t){if((e.ownerDocument||e)!==f&&p(e),t=t.replace(Y,"='$1']"),!(!r.matchesSelector||!h||m&&m.test(t)||g&&g.test(t)))try{var n=y.call(e,t);if(n||r.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(i){}return at(t,f,null,[e]).length>0},at.contains=function(e,t){return(e.ownerDocument||e)!==f&&p(e),v(e,t)},at.attr=function(e,n){(e.ownerDocument||e)!==f&&p(e);var i=o.attrHandle[n.toLowerCase()],a=i&&L.call(o.attrHandle,n.toLowerCase())?i(e,n,!h):t;return a===t?r.attributes||!h?e.getAttribute(n):(a=e.getAttributeNode(n))&&a.specified?a.value:null:a},at.error=function(e){throw Error("Syntax error, unrecognized expression: "+e)},at.uniqueSort=function(e){var t,n=[],i=0,o=0;if(S=!r.detectDuplicates,c=!r.sortStable&&e.slice(0),e.sort(A),S){while(t=e[o++])t===e[o]&&(i=n.push(o));while(i--)e.splice(n[i],1)}return e},a=at.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=a(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r];r++)n+=a(t);return n},o=at.selectors={cacheLength:50,createPseudo:lt,match:Q,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(rt,it),e[3]=(e[4]||e[5]||"").replace(rt,it),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||at.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&at.error(e[0]),e},PSEUDO:function(e){var n,r=!e[5]&&e[2];return Q.CHILD.test(e[0])?null:(e[3]&&e[4]!==t?e[2]=e[4]:r&&J.test(r)&&(n=mt(r,!0))&&(n=r.indexOf(")",r.length-n)-r.length)&&(e[0]=e[0].slice(0,n),e[2]=r.slice(0,n)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(rt,it).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=N[e+" "];return t||(t=RegExp("(^|"+P+")"+e+"("+P+"|$)"))&&N(e,function(e){return t.test("string"==typeof e.className&&e.className||typeof e.getAttribute!==j&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=at.attr(r,e);return null==i?"!="===t:t?(i+="","="===t?i===n:"!="===t?i!==n:"^="===t?n&&0===i.indexOf(n):"*="===t?n&&i.indexOf(n)>-1:"$="===t?n&&i.slice(-n.length)===n:"~="===t?(" "+i+" ").indexOf(n)>-1:"|="===t?i===n||i.slice(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,l){var u,c,p,f,d,h,g=o!==a?"nextSibling":"previousSibling",m=t.parentNode,y=s&&t.nodeName.toLowerCase(),v=!l&&!s;if(m){if(o){while(g){p=t;while(p=p[g])if(s?p.nodeName.toLowerCase()===y:1===p.nodeType)return!1;h=g="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?m.firstChild:m.lastChild],a&&v){c=m[b]||(m[b]={}),u=c[e]||[],d=u[0]===T&&u[1],f=u[0]===T&&u[2],p=d&&m.childNodes[d];while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if(1===p.nodeType&&++f&&p===t){c[e]=[T,d,f];break}}else if(v&&(u=(t[b]||(t[b]={}))[e])&&u[0]===T)f=u[1];else while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if((s?p.nodeName.toLowerCase()===y:1===p.nodeType)&&++f&&(v&&((p[b]||(p[b]={}))[e]=[T,f]),p===t))break;return f-=i,f===r||0===f%r&&f/r>=0}}},PSEUDO:function(e,t){var n,r=o.pseudos[e]||o.setFilters[e.toLowerCase()]||at.error("unsupported pseudo: "+e);return r[b]?r(t):r.length>1?(n=[e,e,"",t],o.setFilters.hasOwnProperty(e.toLowerCase())?lt(function(e,n){var i,o=r(e,t),a=o.length;while(a--)i=F.call(e,o[a]),e[i]=!(n[i]=o[a])}):function(e){return r(e,0,n)}):r}},pseudos:{not:lt(function(e){var t=[],n=[],r=l(e.replace(z,"$1"));return r[b]?lt(function(e,t,n,i){var o,a=r(e,null,i,[]),s=e.length;while(s--)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,i,o){return t[0]=e,r(t,null,o,n),!n.pop()}}),has:lt(function(e){return function(t){return at(e,t).length>0}}),contains:lt(function(e){return function(t){return(t.textContent||t.innerText||a(t)).indexOf(e)>-1}}),lang:lt(function(e){return G.test(e||"")||at.error("unsupported lang: "+e),e=e.replace(rt,it).toLowerCase(),function(t){var n;do if(n=h?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang"))return n=n.toLowerCase(),n===e||0===n.indexOf(e+"-");while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===d},focus:function(e){return e===f.activeElement&&(!f.hasFocus||f.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeName>"@"||3===e.nodeType||4===e.nodeType)return!1;return!0},parent:function(e){return!o.pseudos.empty(e)},header:function(e){return tt.test(e.nodeName)},input:function(e){return et.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||t.toLowerCase()===e.type)},first:ht(function(){return[0]}),last:ht(function(e,t){return[t-1]}),eq:ht(function(e,t,n){return[0>n?n+t:n]}),even:ht(function(e,t){var n=0;for(;t>n;n+=2)e.push(n);return e}),odd:ht(function(e,t){var n=1;for(;t>n;n+=2)e.push(n);return e}),lt:ht(function(e,t,n){var r=0>n?n+t:n;for(;--r>=0;)e.push(r);return e}),gt:ht(function(e,t,n){var r=0>n?n+t:n;for(;t>++r;)e.push(r);return e})}},o.pseudos.nth=o.pseudos.eq;for(n in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})o.pseudos[n]=ft(n);for(n in{submit:!0,reset:!0})o.pseudos[n]=dt(n);function gt(){}gt.prototype=o.filters=o.pseudos,o.setFilters=new gt;function mt(e,t){var n,r,i,a,s,l,u,c=k[e+" "];if(c)return t?0:c.slice(0);s=e,l=[],u=o.preFilter;while(s){(!n||(r=X.exec(s)))&&(r&&(s=s.slice(r[0].length)||s),l.push(i=[])),n=!1,(r=U.exec(s))&&(n=r.shift(),i.push({value:n,type:r[0].replace(z," ")}),s=s.slice(n.length));for(a in o.filter)!(r=Q[a].exec(s))||u[a]&&!(r=u[a](r))||(n=r.shift(),i.push({value:n,type:a,matches:r}),s=s.slice(n.length));if(!n)break}return t?s.length:s?at.error(e):k(e,l).slice(0)}function yt(e){var t=0,n=e.length,r="";for(;n>t;t++)r+=e[t].value;return r}function vt(e,t,n){var r=t.dir,o=n&&"parentNode"===r,a=C++;return t.first?function(t,n,i){while(t=t[r])if(1===t.nodeType||o)return e(t,n,i)}:function(t,n,s){var l,u,c,p=T+" "+a;if(s){while(t=t[r])if((1===t.nodeType||o)&&e(t,n,s))return!0}else while(t=t[r])if(1===t.nodeType||o)if(c=t[b]||(t[b]={}),(u=c[r])&&u[0]===p){if((l=u[1])===!0||l===i)return l===!0}else if(u=c[r]=[p],u[1]=e(t,n,s)||i,u[1]===!0)return!0}}function bt(e){return e.length>1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function xt(e,t,n,r,i){var o,a=[],s=0,l=e.length,u=null!=t;for(;l>s;s++)(o=e[s])&&(!n||n(o,r,i))&&(a.push(o),u&&t.push(s));return a}function wt(e,t,n,r,i,o){return r&&!r[b]&&(r=wt(r)),i&&!i[b]&&(i=wt(i,o)),lt(function(o,a,s,l){var u,c,p,f=[],d=[],h=a.length,g=o||Nt(t||"*",s.nodeType?[s]:s,[]),m=!e||!o&&t?g:xt(g,f,e,s,l),y=n?i||(o?e:h||r)?[]:a:m;if(n&&n(m,y,s,l),r){u=xt(y,d),r(u,[],s,l),c=u.length;while(c--)(p=u[c])&&(y[d[c]]=!(m[d[c]]=p))}if(o){if(i||e){if(i){u=[],c=y.length;while(c--)(p=y[c])&&u.push(m[c]=p);i(null,y=[],u,l)}c=y.length;while(c--)(p=y[c])&&(u=i?F.call(o,p):f[c])>-1&&(o[u]=!(a[u]=p))}}else y=xt(y===a?y.splice(h,y.length):y),i?i(null,a,y,l):M.apply(a,y)})}function Tt(e){var t,n,r,i=e.length,a=o.relative[e[0].type],s=a||o.relative[" "],l=a?1:0,c=vt(function(e){return e===t},s,!0),p=vt(function(e){return F.call(t,e)>-1},s,!0),f=[function(e,n,r){return!a&&(r||n!==u)||((t=n).nodeType?c(e,n,r):p(e,n,r))}];for(;i>l;l++)if(n=o.relative[e[l].type])f=[vt(bt(f),n)];else{if(n=o.filter[e[l].type].apply(null,e[l].matches),n[b]){for(r=++l;i>r;r++)if(o.relative[e[r].type])break;return wt(l>1&&bt(f),l>1&&yt(e.slice(0,l-1).concat({value:" "===e[l-2].type?"*":""})).replace(z,"$1"),n,r>l&&Tt(e.slice(l,r)),i>r&&Tt(e=e.slice(r)),i>r&&yt(e))}f.push(n)}return bt(f)}function Ct(e,t){var n=0,r=t.length>0,a=e.length>0,s=function(s,l,c,p,d){var h,g,m,y=[],v=0,b="0",x=s&&[],w=null!=d,C=u,N=s||a&&o.find.TAG("*",d&&l.parentNode||l),k=T+=null==C?1:Math.random()||.1;for(w&&(u=l!==f&&l,i=n);null!=(h=N[b]);b++){if(a&&h){g=0;while(m=e[g++])if(m(h,l,c)){p.push(h);break}w&&(T=k,i=++n)}r&&((h=!m&&h)&&v--,s&&x.push(h))}if(v+=b,r&&b!==v){g=0;while(m=t[g++])m(x,y,l,c);if(s){if(v>0)while(b--)x[b]||y[b]||(y[b]=q.call(p));y=xt(y)}M.apply(p,y),w&&!s&&y.length>0&&v+t.length>1&&at.uniqueSort(p)}return w&&(T=k,u=C),x};return r?lt(s):s}l=at.compile=function(e,t){var n,r=[],i=[],o=E[e+" "];if(!o){t||(t=mt(e)),n=t.length;while(n--)o=Tt(t[n]),o[b]?r.push(o):i.push(o);o=E(e,Ct(i,r))}return o};function Nt(e,t,n){var r=0,i=t.length;for(;i>r;r++)at(e,t[r],n);return n}function kt(e,t,n,i){var a,s,u,c,p,f=mt(e);if(!i&&1===f.length){if(s=f[0]=f[0].slice(0),s.length>2&&"ID"===(u=s[0]).type&&r.getById&&9===t.nodeType&&h&&o.relative[s[1].type]){if(t=(o.find.ID(u.matches[0].replace(rt,it),t)||[])[0],!t)return n;e=e.slice(s.shift().value.length)}a=Q.needsContext.test(e)?0:s.length;while(a--){if(u=s[a],o.relative[c=u.type])break;if((p=o.find[c])&&(i=p(u.matches[0].replace(rt,it),V.test(s[0].type)&&t.parentNode||t))){if(s.splice(a,1),e=i.length&&yt(s),!e)return M.apply(n,i),n;break}}}return l(e,f)(i,t,!h,n,V.test(e)),n}r.sortStable=b.split("").sort(A).join("")===b,r.detectDuplicates=S,p(),r.sortDetached=ut(function(e){return 1&e.compareDocumentPosition(f.createElement("div"))}),ut(function(e){return e.innerHTML="<a href='#'></a>","#"===e.firstChild.getAttribute("href")})||ct("type|href|height|width",function(e,n,r){return r?t:e.getAttribute(n,"type"===n.toLowerCase()?1:2)}),r.attributes&&ut(function(e){return e.innerHTML="<input/>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||ct("value",function(e,n,r){return r||"input"!==e.nodeName.toLowerCase()?t:e.defaultValue}),ut(function(e){return null==e.getAttribute("disabled")})||ct(B,function(e,n,r){var i;return r?t:(i=e.getAttributeNode(n))&&i.specified?i.value:e[n]===!0?n.toLowerCase():null}),x.find=at,x.expr=at.selectors,x.expr[":"]=x.expr.pseudos,x.unique=at.uniqueSort,x.text=at.getText,x.isXMLDoc=at.isXML,x.contains=at.contains}(e);var O={};function F(e){var t=O[e]={};return x.each(e.match(T)||[],function(e,n){t[n]=!0}),t}x.Callbacks=function(e){e="string"==typeof e?O[e]||F(e):x.extend({},e);var n,r,i,o,a,s,l=[],u=!e.once&&[],c=function(t){for(r=e.memory&&t,i=!0,a=s||0,s=0,o=l.length,n=!0;l&&o>a;a++)if(l[a].apply(t[0],t[1])===!1&&e.stopOnFalse){r=!1;break}n=!1,l&&(u?u.length&&c(u.shift()):r?l=[]:p.disable())},p={add:function(){if(l){var t=l.length;(function i(t){x.each(t,function(t,n){var r=x.type(n);"function"===r?e.unique&&p.has(n)||l.push(n):n&&n.length&&"string"!==r&&i(n)})})(arguments),n?o=l.length:r&&(s=t,c(r))}return this},remove:function(){return l&&x.each(arguments,function(e,t){var r;while((r=x.inArray(t,l,r))>-1)l.splice(r,1),n&&(o>=r&&o--,a>=r&&a--)}),this},has:function(e){return e?x.inArray(e,l)>-1:!(!l||!l.length)},empty:function(){return l=[],o=0,this},disable:function(){return l=u=r=t,this},disabled:function(){return!l},lock:function(){return u=t,r||p.disable(),this},locked:function(){return!u},fireWith:function(e,t){return!l||i&&!u||(t=t||[],t=[e,t.slice?t.slice():t],n?u.push(t):c(t)),this},fire:function(){return p.fireWith(this,arguments),this},fired:function(){return!!i}};return p},x.extend({Deferred:function(e){var t=[["resolve","done",x.Callbacks("once memory"),"resolved"],["reject","fail",x.Callbacks("once memory"),"rejected"],["notify","progress",x.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return x.Deferred(function(n){x.each(t,function(t,o){var a=o[0],s=x.isFunction(e[t])&&e[t];i[o[1]](function(){var e=s&&s.apply(this,arguments);e&&x.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[a+"With"](this===r?n.promise():this,s?[e]:arguments)})}),e=null}).promise()},promise:function(e){return null!=e?x.extend(e,r):r}},i={};return r.pipe=r.then,x.each(t,function(e,o){var a=o[2],s=o[3];r[o[1]]=a.add,s&&a.add(function(){n=s},t[1^e][2].disable,t[2][2].lock),i[o[0]]=function(){return i[o[0]+"With"](this===i?r:this,arguments),this},i[o[0]+"With"]=a.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t=0,n=g.call(arguments),r=n.length,i=1!==r||e&&x.isFunction(e.promise)?r:0,o=1===i?e:x.Deferred(),a=function(e,t,n){return function(r){t[e]=this,n[e]=arguments.length>1?g.call(arguments):r,n===s?o.notifyWith(t,n):--i||o.resolveWith(t,n)}},s,l,u;if(r>1)for(s=Array(r),l=Array(r),u=Array(r);r>t;t++)n[t]&&x.isFunction(n[t].promise)?n[t].promise().done(a(t,u,n)).fail(o.reject).progress(a(t,l,s)):--i;return i||o.resolveWith(u,n),o.promise()}}),x.support=function(t){var n,r,o,s,l,u,c,p,f,d=a.createElement("div");if(d.setAttribute("className","t"),d.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",n=d.getElementsByTagName("*")||[],r=d.getElementsByTagName("a")[0],!r||!r.style||!n.length)return t;s=a.createElement("select"),u=s.appendChild(a.createElement("option")),o=d.getElementsByTagName("input")[0],r.style.cssText="top:1px;float:left;opacity:.5",t.getSetAttribute="t"!==d.className,t.leadingWhitespace=3===d.firstChild.nodeType,t.tbody=!d.getElementsByTagName("tbody").length,t.htmlSerialize=!!d.getElementsByTagName("link").length,t.style=/top/.test(r.getAttribute("style")),t.hrefNormalized="/a"===r.getAttribute("href"),t.opacity=/^0.5/.test(r.style.opacity),t.cssFloat=!!r.style.cssFloat,t.checkOn=!!o.value,t.optSelected=u.selected,t.enctype=!!a.createElement("form").enctype,t.html5Clone="<:nav></:nav>"!==a.createElement("nav").cloneNode(!0).outerHTML,t.inlineBlockNeedsLayout=!1,t.shrinkWrapBlocks=!1,t.pixelPosition=!1,t.deleteExpando=!0,t.noCloneEvent=!0,t.reliableMarginRight=!0,t.boxSizingReliable=!0,o.checked=!0,t.noCloneChecked=o.cloneNode(!0).checked,s.disabled=!0,t.optDisabled=!u.disabled;try{delete d.test}catch(h){t.deleteExpando=!1}o=a.createElement("input"),o.setAttribute("value",""),t.input=""===o.getAttribute("value"),o.value="t",o.setAttribute("type","radio"),t.radioValue="t"===o.value,o.setAttribute("checked","t"),o.setAttribute("name","t"),l=a.createDocumentFragment(),l.appendChild(o),t.appendChecked=o.checked,t.checkClone=l.cloneNode(!0).cloneNode(!0).lastChild.checked,d.attachEvent&&(d.attachEvent("onclick",function(){t.noCloneEvent=!1}),d.cloneNode(!0).click());for(f in{submit:!0,change:!0,focusin:!0})d.setAttribute(c="on"+f,"t"),t[f+"Bubbles"]=c in e||d.attributes[c].expando===!1;d.style.backgroundClip="content-box",d.cloneNode(!0).style.backgroundClip="",t.clearCloneStyle="content-box"===d.style.backgroundClip;for(f in x(t))break;return t.ownLast="0"!==f,x(function(){var n,r,o,s="padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;",l=a.getElementsByTagName("body")[0];l&&(n=a.createElement("div"),n.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px",l.appendChild(n).appendChild(d),d.innerHTML="<table><tr><td></td><td>t</td></tr></table>",o=d.getElementsByTagName("td"),o[0].style.cssText="padding:0;margin:0;border:0;display:none",p=0===o[0].offsetHeight,o[0].style.display="",o[1].style.display="none",t.reliableHiddenOffsets=p&&0===o[0].offsetHeight,d.innerHTML="",d.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",x.swap(l,null!=l.style.zoom?{zoom:1}:{},function(){t.boxSizing=4===d.offsetWidth}),e.getComputedStyle&&(t.pixelPosition="1%"!==(e.getComputedStyle(d,null)||{}).top,t.boxSizingReliable="4px"===(e.getComputedStyle(d,null)||{width:"4px"}).width,r=d.appendChild(a.createElement("div")),r.style.cssText=d.style.cssText=s,r.style.marginRight=r.style.width="0",d.style.width="1px",t.reliableMarginRight=!parseFloat((e.getComputedStyle(r,null)||{}).marginRight)),typeof d.style.zoom!==i&&(d.innerHTML="",d.style.cssText=s+"width:1px;padding:1px;display:inline;zoom:1",t.inlineBlockNeedsLayout=3===d.offsetWidth,d.style.display="block",d.innerHTML="<div></div>",d.firstChild.style.width="5px",t.shrinkWrapBlocks=3!==d.offsetWidth,t.inlineBlockNeedsLayout&&(l.style.zoom=1)),l.removeChild(n),n=d=o=r=null)}),n=s=l=u=r=o=null,t
+}({});var B=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,P=/([A-Z])/g;function R(e,n,r,i){if(x.acceptData(e)){var o,a,s=x.expando,l=e.nodeType,u=l?x.cache:e,c=l?e[s]:e[s]&&s;if(c&&u[c]&&(i||u[c].data)||r!==t||"string"!=typeof n)return c||(c=l?e[s]=p.pop()||x.guid++:s),u[c]||(u[c]=l?{}:{toJSON:x.noop}),("object"==typeof n||"function"==typeof n)&&(i?u[c]=x.extend(u[c],n):u[c].data=x.extend(u[c].data,n)),a=u[c],i||(a.data||(a.data={}),a=a.data),r!==t&&(a[x.camelCase(n)]=r),"string"==typeof n?(o=a[n],null==o&&(o=a[x.camelCase(n)])):o=a,o}}function W(e,t,n){if(x.acceptData(e)){var r,i,o=e.nodeType,a=o?x.cache:e,s=o?e[x.expando]:x.expando;if(a[s]){if(t&&(r=n?a[s]:a[s].data)){x.isArray(t)?t=t.concat(x.map(t,x.camelCase)):t in r?t=[t]:(t=x.camelCase(t),t=t in r?[t]:t.split(" ")),i=t.length;while(i--)delete r[t[i]];if(n?!I(r):!x.isEmptyObject(r))return}(n||(delete a[s].data,I(a[s])))&&(o?x.cleanData([e],!0):x.support.deleteExpando||a!=a.window?delete a[s]:a[s]=null)}}}x.extend({cache:{},noData:{applet:!0,embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(e){return e=e.nodeType?x.cache[e[x.expando]]:e[x.expando],!!e&&!I(e)},data:function(e,t,n){return R(e,t,n)},removeData:function(e,t){return W(e,t)},_data:function(e,t,n){return R(e,t,n,!0)},_removeData:function(e,t){return W(e,t,!0)},acceptData:function(e){if(e.nodeType&&1!==e.nodeType&&9!==e.nodeType)return!1;var t=e.nodeName&&x.noData[e.nodeName.toLowerCase()];return!t||t!==!0&&e.getAttribute("classid")===t}}),x.fn.extend({data:function(e,n){var r,i,o=null,a=0,s=this[0];if(e===t){if(this.length&&(o=x.data(s),1===s.nodeType&&!x._data(s,"parsedAttrs"))){for(r=s.attributes;r.length>a;a++)i=r[a].name,0===i.indexOf("data-")&&(i=x.camelCase(i.slice(5)),$(s,i,o[i]));x._data(s,"parsedAttrs",!0)}return o}return"object"==typeof e?this.each(function(){x.data(this,e)}):arguments.length>1?this.each(function(){x.data(this,e,n)}):s?$(s,e,x.data(s,e)):null},removeData:function(e){return this.each(function(){x.removeData(this,e)})}});function $(e,n,r){if(r===t&&1===e.nodeType){var i="data-"+n.replace(P,"-$1").toLowerCase();if(r=e.getAttribute(i),"string"==typeof r){try{r="true"===r?!0:"false"===r?!1:"null"===r?null:+r+""===r?+r:B.test(r)?x.parseJSON(r):r}catch(o){}x.data(e,n,r)}else r=t}return r}function I(e){var t;for(t in e)if(("data"!==t||!x.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}x.extend({queue:function(e,n,r){var i;return e?(n=(n||"fx")+"queue",i=x._data(e,n),r&&(!i||x.isArray(r)?i=x._data(e,n,x.makeArray(r)):i.push(r)),i||[]):t},dequeue:function(e,t){t=t||"fx";var n=x.queue(e,t),r=n.length,i=n.shift(),o=x._queueHooks(e,t),a=function(){x.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,a,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return x._data(e,n)||x._data(e,n,{empty:x.Callbacks("once memory").add(function(){x._removeData(e,t+"queue"),x._removeData(e,n)})})}}),x.fn.extend({queue:function(e,n){var r=2;return"string"!=typeof e&&(n=e,e="fx",r--),r>arguments.length?x.queue(this[0],e):n===t?this:this.each(function(){var t=x.queue(this,e,n);x._queueHooks(this,e),"fx"===e&&"inprogress"!==t[0]&&x.dequeue(this,e)})},dequeue:function(e){return this.each(function(){x.dequeue(this,e)})},delay:function(e,t){return e=x.fx?x.fx.speeds[e]||e:e,t=t||"fx",this.queue(t,function(t,n){var r=setTimeout(t,e);n.stop=function(){clearTimeout(r)}})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,n){var r,i=1,o=x.Deferred(),a=this,s=this.length,l=function(){--i||o.resolveWith(a,[a])};"string"!=typeof e&&(n=e,e=t),e=e||"fx";while(s--)r=x._data(a[s],e+"queueHooks"),r&&r.empty&&(i++,r.empty.add(l));return l(),o.promise(n)}});var z,X,U=/[\t\r\n\f]/g,V=/\r/g,Y=/^(?:input|select|textarea|button|object)$/i,J=/^(?:a|area)$/i,G=/^(?:checked|selected)$/i,Q=x.support.getSetAttribute,K=x.support.input;x.fn.extend({attr:function(e,t){return x.access(this,x.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){x.removeAttr(this,e)})},prop:function(e,t){return x.access(this,x.prop,e,t,arguments.length>1)},removeProp:function(e){return e=x.propFix[e]||e,this.each(function(){try{this[e]=t,delete this[e]}catch(n){}})},addClass:function(e){var t,n,r,i,o,a=0,s=this.length,l="string"==typeof e&&e;if(x.isFunction(e))return this.each(function(t){x(this).addClass(e.call(this,t,this.className))});if(l)for(t=(e||"").match(T)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(U," "):" ")){o=0;while(i=t[o++])0>r.indexOf(" "+i+" ")&&(r+=i+" ");n.className=x.trim(r)}return this},removeClass:function(e){var t,n,r,i,o,a=0,s=this.length,l=0===arguments.length||"string"==typeof e&&e;if(x.isFunction(e))return this.each(function(t){x(this).removeClass(e.call(this,t,this.className))});if(l)for(t=(e||"").match(T)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(U," "):"")){o=0;while(i=t[o++])while(r.indexOf(" "+i+" ")>=0)r=r.replace(" "+i+" "," ");n.className=e?x.trim(r):""}return this},toggleClass:function(e,t){var n=typeof e;return"boolean"==typeof t&&"string"===n?t?this.addClass(e):this.removeClass(e):x.isFunction(e)?this.each(function(n){x(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if("string"===n){var t,r=0,o=x(this),a=e.match(T)||[];while(t=a[r++])o.hasClass(t)?o.removeClass(t):o.addClass(t)}else(n===i||"boolean"===n)&&(this.className&&x._data(this,"__className__",this.className),this.className=this.className||e===!1?"":x._data(this,"__className__")||"")})},hasClass:function(e){var t=" "+e+" ",n=0,r=this.length;for(;r>n;n++)if(1===this[n].nodeType&&(" "+this[n].className+" ").replace(U," ").indexOf(t)>=0)return!0;return!1},val:function(e){var n,r,i,o=this[0];{if(arguments.length)return i=x.isFunction(e),this.each(function(n){var o;1===this.nodeType&&(o=i?e.call(this,n,x(this).val()):e,null==o?o="":"number"==typeof o?o+="":x.isArray(o)&&(o=x.map(o,function(e){return null==e?"":e+""})),r=x.valHooks[this.type]||x.valHooks[this.nodeName.toLowerCase()],r&&"set"in r&&r.set(this,o,"value")!==t||(this.value=o))});if(o)return r=x.valHooks[o.type]||x.valHooks[o.nodeName.toLowerCase()],r&&"get"in r&&(n=r.get(o,"value"))!==t?n:(n=o.value,"string"==typeof n?n.replace(V,""):null==n?"":n)}}}),x.extend({valHooks:{option:{get:function(e){var t=x.find.attr(e,"value");return null!=t?t:e.text}},select:{get:function(e){var t,n,r=e.options,i=e.selectedIndex,o="select-one"===e.type||0>i,a=o?null:[],s=o?i+1:r.length,l=0>i?s:o?i:0;for(;s>l;l++)if(n=r[l],!(!n.selected&&l!==i||(x.support.optDisabled?n.disabled:null!==n.getAttribute("disabled"))||n.parentNode.disabled&&x.nodeName(n.parentNode,"optgroup"))){if(t=x(n).val(),o)return t;a.push(t)}return a},set:function(e,t){var n,r,i=e.options,o=x.makeArray(t),a=i.length;while(a--)r=i[a],(r.selected=x.inArray(x(r).val(),o)>=0)&&(n=!0);return n||(e.selectedIndex=-1),o}}},attr:function(e,n,r){var o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return typeof e.getAttribute===i?x.prop(e,n,r):(1===s&&x.isXMLDoc(e)||(n=n.toLowerCase(),o=x.attrHooks[n]||(x.expr.match.bool.test(n)?X:z)),r===t?o&&"get"in o&&null!==(a=o.get(e,n))?a:(a=x.find.attr(e,n),null==a?t:a):null!==r?o&&"set"in o&&(a=o.set(e,r,n))!==t?a:(e.setAttribute(n,r+""),r):(x.removeAttr(e,n),t))},removeAttr:function(e,t){var n,r,i=0,o=t&&t.match(T);if(o&&1===e.nodeType)while(n=o[i++])r=x.propFix[n]||n,x.expr.match.bool.test(n)?K&&Q||!G.test(n)?e[r]=!1:e[x.camelCase("default-"+n)]=e[r]=!1:x.attr(e,n,""),e.removeAttribute(Q?n:r)},attrHooks:{type:{set:function(e,t){if(!x.support.radioValue&&"radio"===t&&x.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},propFix:{"for":"htmlFor","class":"className"},prop:function(e,n,r){var i,o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return a=1!==s||!x.isXMLDoc(e),a&&(n=x.propFix[n]||n,o=x.propHooks[n]),r!==t?o&&"set"in o&&(i=o.set(e,r,n))!==t?i:e[n]=r:o&&"get"in o&&null!==(i=o.get(e,n))?i:e[n]},propHooks:{tabIndex:{get:function(e){var t=x.find.attr(e,"tabindex");return t?parseInt(t,10):Y.test(e.nodeName)||J.test(e.nodeName)&&e.href?0:-1}}}}),X={set:function(e,t,n){return t===!1?x.removeAttr(e,n):K&&Q||!G.test(n)?e.setAttribute(!Q&&x.propFix[n]||n,n):e[x.camelCase("default-"+n)]=e[n]=!0,n}},x.each(x.expr.match.bool.source.match(/\w+/g),function(e,n){var r=x.expr.attrHandle[n]||x.find.attr;x.expr.attrHandle[n]=K&&Q||!G.test(n)?function(e,n,i){var o=x.expr.attrHandle[n],a=i?t:(x.expr.attrHandle[n]=t)!=r(e,n,i)?n.toLowerCase():null;return x.expr.attrHandle[n]=o,a}:function(e,n,r){return r?t:e[x.camelCase("default-"+n)]?n.toLowerCase():null}}),K&&Q||(x.attrHooks.value={set:function(e,n,r){return x.nodeName(e,"input")?(e.defaultValue=n,t):z&&z.set(e,n,r)}}),Q||(z={set:function(e,n,r){var i=e.getAttributeNode(r);return i||e.setAttributeNode(i=e.ownerDocument.createAttribute(r)),i.value=n+="","value"===r||n===e.getAttribute(r)?n:t}},x.expr.attrHandle.id=x.expr.attrHandle.name=x.expr.attrHandle.coords=function(e,n,r){var i;return r?t:(i=e.getAttributeNode(n))&&""!==i.value?i.value:null},x.valHooks.button={get:function(e,n){var r=e.getAttributeNode(n);return r&&r.specified?r.value:t},set:z.set},x.attrHooks.contenteditable={set:function(e,t,n){z.set(e,""===t?!1:t,n)}},x.each(["width","height"],function(e,n){x.attrHooks[n]={set:function(e,r){return""===r?(e.setAttribute(n,"auto"),r):t}}})),x.support.hrefNormalized||x.each(["href","src"],function(e,t){x.propHooks[t]={get:function(e){return e.getAttribute(t,4)}}}),x.support.style||(x.attrHooks.style={get:function(e){return e.style.cssText||t},set:function(e,t){return e.style.cssText=t+""}}),x.support.optSelected||(x.propHooks.selected={get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null}}),x.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){x.propFix[this.toLowerCase()]=this}),x.support.enctype||(x.propFix.enctype="encoding"),x.each(["radio","checkbox"],function(){x.valHooks[this]={set:function(e,n){return x.isArray(n)?e.checked=x.inArray(x(e).val(),n)>=0:t}},x.support.checkOn||(x.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})});var Z=/^(?:input|select|textarea)$/i,et=/^key/,tt=/^(?:mouse|contextmenu)|click/,nt=/^(?:focusinfocus|focusoutblur)$/,rt=/^([^.]*)(?:\.(.+)|)$/;function it(){return!0}function ot(){return!1}function at(){try{return a.activeElement}catch(e){}}x.event={global:{},add:function(e,n,r,o,a){var s,l,u,c,p,f,d,h,g,m,y,v=x._data(e);if(v){r.handler&&(c=r,r=c.handler,a=c.selector),r.guid||(r.guid=x.guid++),(l=v.events)||(l=v.events={}),(f=v.handle)||(f=v.handle=function(e){return typeof x===i||e&&x.event.triggered===e.type?t:x.event.dispatch.apply(f.elem,arguments)},f.elem=e),n=(n||"").match(T)||[""],u=n.length;while(u--)s=rt.exec(n[u])||[],g=y=s[1],m=(s[2]||"").split(".").sort(),g&&(p=x.event.special[g]||{},g=(a?p.delegateType:p.bindType)||g,p=x.event.special[g]||{},d=x.extend({type:g,origType:y,data:o,handler:r,guid:r.guid,selector:a,needsContext:a&&x.expr.match.needsContext.test(a),namespace:m.join(".")},c),(h=l[g])||(h=l[g]=[],h.delegateCount=0,p.setup&&p.setup.call(e,o,m,f)!==!1||(e.addEventListener?e.addEventListener(g,f,!1):e.attachEvent&&e.attachEvent("on"+g,f))),p.add&&(p.add.call(e,d),d.handler.guid||(d.handler.guid=r.guid)),a?h.splice(h.delegateCount++,0,d):h.push(d),x.event.global[g]=!0);e=null}},remove:function(e,t,n,r,i){var o,a,s,l,u,c,p,f,d,h,g,m=x.hasData(e)&&x._data(e);if(m&&(c=m.events)){t=(t||"").match(T)||[""],u=t.length;while(u--)if(s=rt.exec(t[u])||[],d=g=s[1],h=(s[2]||"").split(".").sort(),d){p=x.event.special[d]||{},d=(r?p.delegateType:p.bindType)||d,f=c[d]||[],s=s[2]&&RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),l=o=f.length;while(o--)a=f[o],!i&&g!==a.origType||n&&n.guid!==a.guid||s&&!s.test(a.namespace)||r&&r!==a.selector&&("**"!==r||!a.selector)||(f.splice(o,1),a.selector&&f.delegateCount--,p.remove&&p.remove.call(e,a));l&&!f.length&&(p.teardown&&p.teardown.call(e,h,m.handle)!==!1||x.removeEvent(e,d,m.handle),delete c[d])}else for(d in c)x.event.remove(e,d+t[u],n,r,!0);x.isEmptyObject(c)&&(delete m.handle,x._removeData(e,"events"))}},trigger:function(n,r,i,o){var s,l,u,c,p,f,d,h=[i||a],g=v.call(n,"type")?n.type:n,m=v.call(n,"namespace")?n.namespace.split("."):[];if(u=f=i=i||a,3!==i.nodeType&&8!==i.nodeType&&!nt.test(g+x.event.triggered)&&(g.indexOf(".")>=0&&(m=g.split("."),g=m.shift(),m.sort()),l=0>g.indexOf(":")&&"on"+g,n=n[x.expando]?n:new x.Event(g,"object"==typeof n&&n),n.isTrigger=o?2:3,n.namespace=m.join("."),n.namespace_re=n.namespace?RegExp("(^|\\.)"+m.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,n.result=t,n.target||(n.target=i),r=null==r?[n]:x.makeArray(r,[n]),p=x.event.special[g]||{},o||!p.trigger||p.trigger.apply(i,r)!==!1)){if(!o&&!p.noBubble&&!x.isWindow(i)){for(c=p.delegateType||g,nt.test(c+g)||(u=u.parentNode);u;u=u.parentNode)h.push(u),f=u;f===(i.ownerDocument||a)&&h.push(f.defaultView||f.parentWindow||e)}d=0;while((u=h[d++])&&!n.isPropagationStopped())n.type=d>1?c:p.bindType||g,s=(x._data(u,"events")||{})[n.type]&&x._data(u,"handle"),s&&s.apply(u,r),s=l&&u[l],s&&x.acceptData(u)&&s.apply&&s.apply(u,r)===!1&&n.preventDefault();if(n.type=g,!o&&!n.isDefaultPrevented()&&(!p._default||p._default.apply(h.pop(),r)===!1)&&x.acceptData(i)&&l&&i[g]&&!x.isWindow(i)){f=i[l],f&&(i[l]=null),x.event.triggered=g;try{i[g]()}catch(y){}x.event.triggered=t,f&&(i[l]=f)}return n.result}},dispatch:function(e){e=x.event.fix(e);var n,r,i,o,a,s=[],l=g.call(arguments),u=(x._data(this,"events")||{})[e.type]||[],c=x.event.special[e.type]||{};if(l[0]=e,e.delegateTarget=this,!c.preDispatch||c.preDispatch.call(this,e)!==!1){s=x.event.handlers.call(this,e,u),n=0;while((o=s[n++])&&!e.isPropagationStopped()){e.currentTarget=o.elem,a=0;while((i=o.handlers[a++])&&!e.isImmediatePropagationStopped())(!e.namespace_re||e.namespace_re.test(i.namespace))&&(e.handleObj=i,e.data=i.data,r=((x.event.special[i.origType]||{}).handle||i.handler).apply(o.elem,l),r!==t&&(e.result=r)===!1&&(e.preventDefault(),e.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,e),e.result}},handlers:function(e,n){var r,i,o,a,s=[],l=n.delegateCount,u=e.target;if(l&&u.nodeType&&(!e.button||"click"!==e.type))for(;u!=this;u=u.parentNode||this)if(1===u.nodeType&&(u.disabled!==!0||"click"!==e.type)){for(o=[],a=0;l>a;a++)i=n[a],r=i.selector+" ",o[r]===t&&(o[r]=i.needsContext?x(r,this).index(u)>=0:x.find(r,this,null,[u]).length),o[r]&&o.push(i);o.length&&s.push({elem:u,handlers:o})}return n.length>l&&s.push({elem:this,handlers:n.slice(l)}),s},fix:function(e){if(e[x.expando])return e;var t,n,r,i=e.type,o=e,s=this.fixHooks[i];s||(this.fixHooks[i]=s=tt.test(i)?this.mouseHooks:et.test(i)?this.keyHooks:{}),r=s.props?this.props.concat(s.props):this.props,e=new x.Event(o),t=r.length;while(t--)n=r[t],e[n]=o[n];return e.target||(e.target=o.srcElement||a),3===e.target.nodeType&&(e.target=e.target.parentNode),e.metaKey=!!e.metaKey,s.filter?s.filter(e,o):e},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return null==e.which&&(e.which=null!=t.charCode?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,n){var r,i,o,s=n.button,l=n.fromElement;return null==e.pageX&&null!=n.clientX&&(i=e.target.ownerDocument||a,o=i.documentElement,r=i.body,e.pageX=n.clientX+(o&&o.scrollLeft||r&&r.scrollLeft||0)-(o&&o.clientLeft||r&&r.clientLeft||0),e.pageY=n.clientY+(o&&o.scrollTop||r&&r.scrollTop||0)-(o&&o.clientTop||r&&r.clientTop||0)),!e.relatedTarget&&l&&(e.relatedTarget=l===e.target?n.toElement:l),e.which||s===t||(e.which=1&s?1:2&s?3:4&s?2:0),e}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==at()&&this.focus)try{return this.focus(),!1}catch(e){}},delegateType:"focusin"},blur:{trigger:function(){return this===at()&&this.blur?(this.blur(),!1):t},delegateType:"focusout"},click:{trigger:function(){return x.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):t},_default:function(e){return x.nodeName(e.target,"a")}},beforeunload:{postDispatch:function(e){e.result!==t&&(e.originalEvent.returnValue=e.result)}}},simulate:function(e,t,n,r){var i=x.extend(new x.Event,n,{type:e,isSimulated:!0,originalEvent:{}});r?x.event.trigger(i,null,t):x.event.dispatch.call(t,i),i.isDefaultPrevented()&&n.preventDefault()}},x.removeEvent=a.removeEventListener?function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n,!1)}:function(e,t,n){var r="on"+t;e.detachEvent&&(typeof e[r]===i&&(e[r]=null),e.detachEvent(r,n))},x.Event=function(e,n){return this instanceof x.Event?(e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||e.returnValue===!1||e.getPreventDefault&&e.getPreventDefault()?it:ot):this.type=e,n&&x.extend(this,n),this.timeStamp=e&&e.timeStamp||x.now(),this[x.expando]=!0,t):new x.Event(e,n)},x.Event.prototype={isDefaultPrevented:ot,isPropagationStopped:ot,isImmediatePropagationStopped:ot,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=it,e&&(e.preventDefault?e.preventDefault():e.returnValue=!1)},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=it,e&&(e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=it,this.stopPropagation()}},x.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(e,t){x.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,o=e.handleObj;return(!i||i!==r&&!x.contains(r,i))&&(e.type=o.origType,n=o.handler.apply(this,arguments),e.type=t),n}}}),x.support.submitBubbles||(x.event.special.submit={setup:function(){return x.nodeName(this,"form")?!1:(x.event.add(this,"click._submit keypress._submit",function(e){var n=e.target,r=x.nodeName(n,"input")||x.nodeName(n,"button")?n.form:t;r&&!x._data(r,"submitBubbles")&&(x.event.add(r,"submit._submit",function(e){e._submit_bubble=!0}),x._data(r,"submitBubbles",!0))}),t)},postDispatch:function(e){e._submit_bubble&&(delete e._submit_bubble,this.parentNode&&!e.isTrigger&&x.event.simulate("submit",this.parentNode,e,!0))},teardown:function(){return x.nodeName(this,"form")?!1:(x.event.remove(this,"._submit"),t)}}),x.support.changeBubbles||(x.event.special.change={setup:function(){return Z.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(x.event.add(this,"propertychange._change",function(e){"checked"===e.originalEvent.propertyName&&(this._just_changed=!0)}),x.event.add(this,"click._change",function(e){this._just_changed&&!e.isTrigger&&(this._just_changed=!1),x.event.simulate("change",this,e,!0)})),!1):(x.event.add(this,"beforeactivate._change",function(e){var t=e.target;Z.test(t.nodeName)&&!x._data(t,"changeBubbles")&&(x.event.add(t,"change._change",function(e){!this.parentNode||e.isSimulated||e.isTrigger||x.event.simulate("change",this.parentNode,e,!0)}),x._data(t,"changeBubbles",!0))}),t)},handle:function(e){var n=e.target;return this!==n||e.isSimulated||e.isTrigger||"radio"!==n.type&&"checkbox"!==n.type?e.handleObj.handler.apply(this,arguments):t},teardown:function(){return x.event.remove(this,"._change"),!Z.test(this.nodeName)}}),x.support.focusinBubbles||x.each({focus:"focusin",blur:"focusout"},function(e,t){var n=0,r=function(e){x.event.simulate(t,e.target,x.event.fix(e),!0)};x.event.special[t]={setup:function(){0===n++&&a.addEventListener(e,r,!0)},teardown:function(){0===--n&&a.removeEventListener(e,r,!0)}}}),x.fn.extend({on:function(e,n,r,i,o){var a,s;if("object"==typeof e){"string"!=typeof n&&(r=r||n,n=t);for(a in e)this.on(a,n,r,e[a],o);return this}if(null==r&&null==i?(i=n,r=n=t):null==i&&("string"==typeof n?(i=r,r=t):(i=r,r=n,n=t)),i===!1)i=ot;else if(!i)return this;return 1===o&&(s=i,i=function(e){return x().off(e),s.apply(this,arguments)},i.guid=s.guid||(s.guid=x.guid++)),this.each(function(){x.event.add(this,e,i,r,n)})},one:function(e,t,n,r){return this.on(e,t,n,r,1)},off:function(e,n,r){var i,o;if(e&&e.preventDefault&&e.handleObj)return i=e.handleObj,x(e.delegateTarget).off(i.namespace?i.origType+"."+i.namespace:i.origType,i.selector,i.handler),this;if("object"==typeof e){for(o in e)this.off(o,n,e[o]);return this}return(n===!1||"function"==typeof n)&&(r=n,n=t),r===!1&&(r=ot),this.each(function(){x.event.remove(this,e,r,n)})},trigger:function(e,t){return this.each(function(){x.event.trigger(e,t,this)})},triggerHandler:function(e,n){var r=this[0];return r?x.event.trigger(e,n,r,!0):t}});var st=/^.[^:#\[\.,]*$/,lt=/^(?:parents|prev(?:Until|All))/,ut=x.expr.match.needsContext,ct={children:!0,contents:!0,next:!0,prev:!0};x.fn.extend({find:function(e){var t,n=[],r=this,i=r.length;if("string"!=typeof e)return this.pushStack(x(e).filter(function(){for(t=0;i>t;t++)if(x.contains(r[t],this))return!0}));for(t=0;i>t;t++)x.find(e,r[t],n);return n=this.pushStack(i>1?x.unique(n):n),n.selector=this.selector?this.selector+" "+e:e,n},has:function(e){var t,n=x(e,this),r=n.length;return this.filter(function(){for(t=0;r>t;t++)if(x.contains(this,n[t]))return!0})},not:function(e){return this.pushStack(ft(this,e||[],!0))},filter:function(e){return this.pushStack(ft(this,e||[],!1))},is:function(e){return!!ft(this,"string"==typeof e&&ut.test(e)?x(e):e||[],!1).length},closest:function(e,t){var n,r=0,i=this.length,o=[],a=ut.test(e)||"string"!=typeof e?x(e,t||this.context):0;for(;i>r;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(11>n.nodeType&&(a?a.index(n)>-1:1===n.nodeType&&x.find.matchesSelector(n,e))){n=o.push(n);break}return this.pushStack(o.length>1?x.unique(o):o)},index:function(e){return e?"string"==typeof e?x.inArray(this[0],x(e)):x.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){var n="string"==typeof e?x(e,t):x.makeArray(e&&e.nodeType?[e]:e),r=x.merge(this.get(),n);return this.pushStack(x.unique(r))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}});function pt(e,t){do e=e[t];while(e&&1!==e.nodeType);return e}x.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return x.dir(e,"parentNode")},parentsUntil:function(e,t,n){return x.dir(e,"parentNode",n)},next:function(e){return pt(e,"nextSibling")},prev:function(e){return pt(e,"previousSibling")},nextAll:function(e){return x.dir(e,"nextSibling")},prevAll:function(e){return x.dir(e,"previousSibling")},nextUntil:function(e,t,n){return x.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return x.dir(e,"previousSibling",n)},siblings:function(e){return x.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return x.sibling(e.firstChild)},contents:function(e){return x.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:x.merge([],e.childNodes)}},function(e,t){x.fn[e]=function(n,r){var i=x.map(this,t,n);return"Until"!==e.slice(-5)&&(r=n),r&&"string"==typeof r&&(i=x.filter(r,i)),this.length>1&&(ct[e]||(i=x.unique(i)),lt.test(e)&&(i=i.reverse())),this.pushStack(i)}}),x.extend({filter:function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?x.find.matchesSelector(r,e)?[r]:[]:x.find.matches(e,x.grep(t,function(e){return 1===e.nodeType}))},dir:function(e,n,r){var i=[],o=e[n];while(o&&9!==o.nodeType&&(r===t||1!==o.nodeType||!x(o).is(r)))1===o.nodeType&&i.push(o),o=o[n];return i},sibling:function(e,t){var n=[];for(;e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n}});function ft(e,t,n){if(x.isFunction(t))return x.grep(e,function(e,r){return!!t.call(e,r,e)!==n});if(t.nodeType)return x.grep(e,function(e){return e===t!==n});if("string"==typeof t){if(st.test(t))return x.filter(t,e,n);t=x.filter(t,e)}return x.grep(e,function(e){return x.inArray(e,t)>=0!==n})}function dt(e){var t=ht.split("|"),n=e.createDocumentFragment();if(n.createElement)while(t.length)n.createElement(t.pop());return n}var ht="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",gt=/ jQuery\d+="(?:null|\d+)"/g,mt=RegExp("<(?:"+ht+")[\\s/>]","i"),yt=/^\s+/,vt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bt=/<([\w:]+)/,xt=/<tbody/i,wt=/<|&#?\w+;/,Tt=/<(?:script|style|link)/i,Ct=/^(?:checkbox|radio)$/i,Nt=/checked\s*(?:[^=]|=\s*.checked.)/i,kt=/^$|\/(?:java|ecma)script/i,Et=/^true\/(.*)/,St=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,At={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:x.support.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]},jt=dt(a),Dt=jt.appendChild(a.createElement("div"));At.optgroup=At.option,At.tbody=At.tfoot=At.colgroup=At.caption=At.thead,At.th=At.td,x.fn.extend({text:function(e){return x.access(this,function(e){return e===t?x.text(this):this.empty().append((this[0]&&this[0].ownerDocument||a).createTextNode(e))},null,e,arguments.length)},append:function(){return this.domManip(arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Lt(this,e);t.appendChild(e)}})},prepend:function(){return this.domManip(arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Lt(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},remove:function(e,t){var n,r=e?x.filter(e,this):this,i=0;for(;null!=(n=r[i]);i++)t||1!==n.nodeType||x.cleanData(Ft(n)),n.parentNode&&(t&&x.contains(n.ownerDocument,n)&&_t(Ft(n,"script")),n.parentNode.removeChild(n));return this},empty:function(){var e,t=0;for(;null!=(e=this[t]);t++){1===e.nodeType&&x.cleanData(Ft(e,!1));while(e.firstChild)e.removeChild(e.firstChild);e.options&&x.nodeName(e,"select")&&(e.options.length=0)}return this},clone:function(e,t){return e=null==e?!1:e,t=null==t?e:t,this.map(function(){return x.clone(this,e,t)})},html:function(e){return x.access(this,function(e){var n=this[0]||{},r=0,i=this.length;if(e===t)return 1===n.nodeType?n.innerHTML.replace(gt,""):t;if(!("string"!=typeof e||Tt.test(e)||!x.support.htmlSerialize&&mt.test(e)||!x.support.leadingWhitespace&&yt.test(e)||At[(bt.exec(e)||["",""])[1].toLowerCase()])){e=e.replace(vt,"<$1></$2>");try{for(;i>r;r++)n=this[r]||{},1===n.nodeType&&(x.cleanData(Ft(n,!1)),n.innerHTML=e);n=0}catch(o){}}n&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var e=x.map(this,function(e){return[e.nextSibling,e.parentNode]}),t=0;return this.domManip(arguments,function(n){var r=e[t++],i=e[t++];i&&(r&&r.parentNode!==i&&(r=this.nextSibling),x(this).remove(),i.insertBefore(n,r))},!0),t?this:this.remove()},detach:function(e){return this.remove(e,!0)},domManip:function(e,t,n){e=d.apply([],e);var r,i,o,a,s,l,u=0,c=this.length,p=this,f=c-1,h=e[0],g=x.isFunction(h);if(g||!(1>=c||"string"!=typeof h||x.support.checkClone)&&Nt.test(h))return this.each(function(r){var i=p.eq(r);g&&(e[0]=h.call(this,r,i.html())),i.domManip(e,t,n)});if(c&&(l=x.buildFragment(e,this[0].ownerDocument,!1,!n&&this),r=l.firstChild,1===l.childNodes.length&&(l=r),r)){for(a=x.map(Ft(l,"script"),Ht),o=a.length;c>u;u++)i=l,u!==f&&(i=x.clone(i,!0,!0),o&&x.merge(a,Ft(i,"script"))),t.call(this[u],i,u);if(o)for(s=a[a.length-1].ownerDocument,x.map(a,qt),u=0;o>u;u++)i=a[u],kt.test(i.type||"")&&!x._data(i,"globalEval")&&x.contains(s,i)&&(i.src?x._evalUrl(i.src):x.globalEval((i.text||i.textContent||i.innerHTML||"").replace(St,"")));l=r=null}return this}});function Lt(e,t){return x.nodeName(e,"table")&&x.nodeName(1===t.nodeType?t:t.firstChild,"tr")?e.getElementsByTagName("tbody")[0]||e.appendChild(e.ownerDocument.createElement("tbody")):e}function Ht(e){return e.type=(null!==x.find.attr(e,"type"))+"/"+e.type,e}function qt(e){var t=Et.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function _t(e,t){var n,r=0;for(;null!=(n=e[r]);r++)x._data(n,"globalEval",!t||x._data(t[r],"globalEval"))}function Mt(e,t){if(1===t.nodeType&&x.hasData(e)){var n,r,i,o=x._data(e),a=x._data(t,o),s=o.events;if(s){delete a.handle,a.events={};for(n in s)for(r=0,i=s[n].length;i>r;r++)x.event.add(t,n,s[n][r])}a.data&&(a.data=x.extend({},a.data))}}function Ot(e,t){var n,r,i;if(1===t.nodeType){if(n=t.nodeName.toLowerCase(),!x.support.noCloneEvent&&t[x.expando]){i=x._data(t);for(r in i.events)x.removeEvent(t,r,i.handle);t.removeAttribute(x.expando)}"script"===n&&t.text!==e.text?(Ht(t).text=e.text,qt(t)):"object"===n?(t.parentNode&&(t.outerHTML=e.outerHTML),x.support.html5Clone&&e.innerHTML&&!x.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):"input"===n&&Ct.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):"option"===n?t.defaultSelected=t.selected=e.defaultSelected:("input"===n||"textarea"===n)&&(t.defaultValue=e.defaultValue)}}x.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){x.fn[e]=function(e){var n,r=0,i=[],o=x(e),a=o.length-1;for(;a>=r;r++)n=r===a?this:this.clone(!0),x(o[r])[t](n),h.apply(i,n.get());return this.pushStack(i)}});function Ft(e,n){var r,o,a=0,s=typeof e.getElementsByTagName!==i?e.getElementsByTagName(n||"*"):typeof e.querySelectorAll!==i?e.querySelectorAll(n||"*"):t;if(!s)for(s=[],r=e.childNodes||e;null!=(o=r[a]);a++)!n||x.nodeName(o,n)?s.push(o):x.merge(s,Ft(o,n));return n===t||n&&x.nodeName(e,n)?x.merge([e],s):s}function Bt(e){Ct.test(e.type)&&(e.defaultChecked=e.checked)}x.extend({clone:function(e,t,n){var r,i,o,a,s,l=x.contains(e.ownerDocument,e);if(x.support.html5Clone||x.isXMLDoc(e)||!mt.test("<"+e.nodeName+">")?o=e.cloneNode(!0):(Dt.innerHTML=e.outerHTML,Dt.removeChild(o=Dt.firstChild)),!(x.support.noCloneEvent&&x.support.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||x.isXMLDoc(e)))for(r=Ft(o),s=Ft(e),a=0;null!=(i=s[a]);++a)r[a]&&Ot(i,r[a]);if(t)if(n)for(s=s||Ft(e),r=r||Ft(o),a=0;null!=(i=s[a]);a++)Mt(i,r[a]);else Mt(e,o);return r=Ft(o,"script"),r.length>0&&_t(r,!l&&Ft(e,"script")),r=s=i=null,o},buildFragment:function(e,t,n,r){var i,o,a,s,l,u,c,p=e.length,f=dt(t),d=[],h=0;for(;p>h;h++)if(o=e[h],o||0===o)if("object"===x.type(o))x.merge(d,o.nodeType?[o]:o);else if(wt.test(o)){s=s||f.appendChild(t.createElement("div")),l=(bt.exec(o)||["",""])[1].toLowerCase(),c=At[l]||At._default,s.innerHTML=c[1]+o.replace(vt,"<$1></$2>")+c[2],i=c[0];while(i--)s=s.lastChild;if(!x.support.leadingWhitespace&&yt.test(o)&&d.push(t.createTextNode(yt.exec(o)[0])),!x.support.tbody){o="table"!==l||xt.test(o)?"<table>"!==c[1]||xt.test(o)?0:s:s.firstChild,i=o&&o.childNodes.length;while(i--)x.nodeName(u=o.childNodes[i],"tbody")&&!u.childNodes.length&&o.removeChild(u)}x.merge(d,s.childNodes),s.textContent="";while(s.firstChild)s.removeChild(s.firstChild);s=f.lastChild}else d.push(t.createTextNode(o));s&&f.removeChild(s),x.support.appendChecked||x.grep(Ft(d,"input"),Bt),h=0;while(o=d[h++])if((!r||-1===x.inArray(o,r))&&(a=x.contains(o.ownerDocument,o),s=Ft(f.appendChild(o),"script"),a&&_t(s),n)){i=0;while(o=s[i++])kt.test(o.type||"")&&n.push(o)}return s=null,f},cleanData:function(e,t){var n,r,o,a,s=0,l=x.expando,u=x.cache,c=x.support.deleteExpando,f=x.event.special;for(;null!=(n=e[s]);s++)if((t||x.acceptData(n))&&(o=n[l],a=o&&u[o])){if(a.events)for(r in a.events)f[r]?x.event.remove(n,r):x.removeEvent(n,r,a.handle);
+u[o]&&(delete u[o],c?delete n[l]:typeof n.removeAttribute!==i?n.removeAttribute(l):n[l]=null,p.push(o))}},_evalUrl:function(e){return x.ajax({url:e,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})}}),x.fn.extend({wrapAll:function(e){if(x.isFunction(e))return this.each(function(t){x(this).wrapAll(e.call(this,t))});if(this[0]){var t=x(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstChild&&1===e.firstChild.nodeType)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return x.isFunction(e)?this.each(function(t){x(this).wrapInner(e.call(this,t))}):this.each(function(){var t=x(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=x.isFunction(e);return this.each(function(n){x(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){x.nodeName(this,"body")||x(this).replaceWith(this.childNodes)}).end()}});var Pt,Rt,Wt,$t=/alpha\([^)]*\)/i,It=/opacity\s*=\s*([^)]*)/,zt=/^(top|right|bottom|left)$/,Xt=/^(none|table(?!-c[ea]).+)/,Ut=/^margin/,Vt=RegExp("^("+w+")(.*)$","i"),Yt=RegExp("^("+w+")(?!px)[a-z%]+$","i"),Jt=RegExp("^([+-])=("+w+")","i"),Gt={BODY:"block"},Qt={position:"absolute",visibility:"hidden",display:"block"},Kt={letterSpacing:0,fontWeight:400},Zt=["Top","Right","Bottom","Left"],en=["Webkit","O","Moz","ms"];function tn(e,t){if(t in e)return t;var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=en.length;while(i--)if(t=en[i]+n,t in e)return t;return r}function nn(e,t){return e=t||e,"none"===x.css(e,"display")||!x.contains(e.ownerDocument,e)}function rn(e,t){var n,r,i,o=[],a=0,s=e.length;for(;s>a;a++)r=e[a],r.style&&(o[a]=x._data(r,"olddisplay"),n=r.style.display,t?(o[a]||"none"!==n||(r.style.display=""),""===r.style.display&&nn(r)&&(o[a]=x._data(r,"olddisplay",ln(r.nodeName)))):o[a]||(i=nn(r),(n&&"none"!==n||!i)&&x._data(r,"olddisplay",i?n:x.css(r,"display"))));for(a=0;s>a;a++)r=e[a],r.style&&(t&&"none"!==r.style.display&&""!==r.style.display||(r.style.display=t?o[a]||"":"none"));return e}x.fn.extend({css:function(e,n){return x.access(this,function(e,n,r){var i,o,a={},s=0;if(x.isArray(n)){for(o=Rt(e),i=n.length;i>s;s++)a[n[s]]=x.css(e,n[s],!1,o);return a}return r!==t?x.style(e,n,r):x.css(e,n)},e,n,arguments.length>1)},show:function(){return rn(this,!0)},hide:function(){return rn(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){nn(this)?x(this).show():x(this).hide()})}}),x.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Wt(e,"opacity");return""===n?"1":n}}}},cssNumber:{columnCount:!0,fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":x.support.cssFloat?"cssFloat":"styleFloat"},style:function(e,n,r,i){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var o,a,s,l=x.camelCase(n),u=e.style;if(n=x.cssProps[l]||(x.cssProps[l]=tn(u,l)),s=x.cssHooks[n]||x.cssHooks[l],r===t)return s&&"get"in s&&(o=s.get(e,!1,i))!==t?o:u[n];if(a=typeof r,"string"===a&&(o=Jt.exec(r))&&(r=(o[1]+1)*o[2]+parseFloat(x.css(e,n)),a="number"),!(null==r||"number"===a&&isNaN(r)||("number"!==a||x.cssNumber[l]||(r+="px"),x.support.clearCloneStyle||""!==r||0!==n.indexOf("background")||(u[n]="inherit"),s&&"set"in s&&(r=s.set(e,r,i))===t)))try{u[n]=r}catch(c){}}},css:function(e,n,r,i){var o,a,s,l=x.camelCase(n);return n=x.cssProps[l]||(x.cssProps[l]=tn(e.style,l)),s=x.cssHooks[n]||x.cssHooks[l],s&&"get"in s&&(a=s.get(e,!0,r)),a===t&&(a=Wt(e,n,i)),"normal"===a&&n in Kt&&(a=Kt[n]),""===r||r?(o=parseFloat(a),r===!0||x.isNumeric(o)?o||0:a):a}}),e.getComputedStyle?(Rt=function(t){return e.getComputedStyle(t,null)},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),l=s?s.getPropertyValue(n)||s[n]:t,u=e.style;return s&&(""!==l||x.contains(e.ownerDocument,e)||(l=x.style(e,n)),Yt.test(l)&&Ut.test(n)&&(i=u.width,o=u.minWidth,a=u.maxWidth,u.minWidth=u.maxWidth=u.width=l,l=s.width,u.width=i,u.minWidth=o,u.maxWidth=a)),l}):a.documentElement.currentStyle&&(Rt=function(e){return e.currentStyle},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),l=s?s[n]:t,u=e.style;return null==l&&u&&u[n]&&(l=u[n]),Yt.test(l)&&!zt.test(n)&&(i=u.left,o=e.runtimeStyle,a=o&&o.left,a&&(o.left=e.currentStyle.left),u.left="fontSize"===n?"1em":l,l=u.pixelLeft+"px",u.left=i,a&&(o.left=a)),""===l?"auto":l});function on(e,t,n){var r=Vt.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function an(e,t,n,r,i){var o=n===(r?"border":"content")?4:"width"===t?1:0,a=0;for(;4>o;o+=2)"margin"===n&&(a+=x.css(e,n+Zt[o],!0,i)),r?("content"===n&&(a-=x.css(e,"padding"+Zt[o],!0,i)),"margin"!==n&&(a-=x.css(e,"border"+Zt[o]+"Width",!0,i))):(a+=x.css(e,"padding"+Zt[o],!0,i),"padding"!==n&&(a+=x.css(e,"border"+Zt[o]+"Width",!0,i)));return a}function sn(e,t,n){var r=!0,i="width"===t?e.offsetWidth:e.offsetHeight,o=Rt(e),a=x.support.boxSizing&&"border-box"===x.css(e,"boxSizing",!1,o);if(0>=i||null==i){if(i=Wt(e,t,o),(0>i||null==i)&&(i=e.style[t]),Yt.test(i))return i;r=a&&(x.support.boxSizingReliable||i===e.style[t]),i=parseFloat(i)||0}return i+an(e,t,n||(a?"border":"content"),r,o)+"px"}function ln(e){var t=a,n=Gt[e];return n||(n=un(e,t),"none"!==n&&n||(Pt=(Pt||x("<iframe frameborder='0' width='0' height='0'/>").css("cssText","display:block !important")).appendTo(t.documentElement),t=(Pt[0].contentWindow||Pt[0].contentDocument).document,t.write("<!doctype html><html><body>"),t.close(),n=un(e,t),Pt.detach()),Gt[e]=n),n}function un(e,t){var n=x(t.createElement(e)).appendTo(t.body),r=x.css(n[0],"display");return n.remove(),r}x.each(["height","width"],function(e,n){x.cssHooks[n]={get:function(e,r,i){return r?0===e.offsetWidth&&Xt.test(x.css(e,"display"))?x.swap(e,Qt,function(){return sn(e,n,i)}):sn(e,n,i):t},set:function(e,t,r){var i=r&&Rt(e);return on(e,t,r?an(e,n,r,x.support.boxSizing&&"border-box"===x.css(e,"boxSizing",!1,i),i):0)}}}),x.support.opacity||(x.cssHooks.opacity={get:function(e,t){return It.test((t&&e.currentStyle?e.currentStyle.filter:e.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":t?"1":""},set:function(e,t){var n=e.style,r=e.currentStyle,i=x.isNumeric(t)?"alpha(opacity="+100*t+")":"",o=r&&r.filter||n.filter||"";n.zoom=1,(t>=1||""===t)&&""===x.trim(o.replace($t,""))&&n.removeAttribute&&(n.removeAttribute("filter"),""===t||r&&!r.filter)||(n.filter=$t.test(o)?o.replace($t,i):o+" "+i)}}),x(function(){x.support.reliableMarginRight||(x.cssHooks.marginRight={get:function(e,n){return n?x.swap(e,{display:"inline-block"},Wt,[e,"marginRight"]):t}}),!x.support.pixelPosition&&x.fn.position&&x.each(["top","left"],function(e,n){x.cssHooks[n]={get:function(e,r){return r?(r=Wt(e,n),Yt.test(r)?x(e).position()[n]+"px":r):t}}})}),x.expr&&x.expr.filters&&(x.expr.filters.hidden=function(e){return 0>=e.offsetWidth&&0>=e.offsetHeight||!x.support.reliableHiddenOffsets&&"none"===(e.style&&e.style.display||x.css(e,"display"))},x.expr.filters.visible=function(e){return!x.expr.filters.hidden(e)}),x.each({margin:"",padding:"",border:"Width"},function(e,t){x.cssHooks[e+t]={expand:function(n){var r=0,i={},o="string"==typeof n?n.split(" "):[n];for(;4>r;r++)i[e+Zt[r]+t]=o[r]||o[r-2]||o[0];return i}},Ut.test(e)||(x.cssHooks[e+t].set=on)});var cn=/%20/g,pn=/\[\]$/,fn=/\r?\n/g,dn=/^(?:submit|button|image|reset|file)$/i,hn=/^(?:input|select|textarea|keygen)/i;x.fn.extend({serialize:function(){return x.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=x.prop(this,"elements");return e?x.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!x(this).is(":disabled")&&hn.test(this.nodeName)&&!dn.test(e)&&(this.checked||!Ct.test(e))}).map(function(e,t){var n=x(this).val();return null==n?null:x.isArray(n)?x.map(n,function(e){return{name:t.name,value:e.replace(fn,"\r\n")}}):{name:t.name,value:n.replace(fn,"\r\n")}}).get()}}),x.param=function(e,n){var r,i=[],o=function(e,t){t=x.isFunction(t)?t():null==t?"":t,i[i.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};if(n===t&&(n=x.ajaxSettings&&x.ajaxSettings.traditional),x.isArray(e)||e.jquery&&!x.isPlainObject(e))x.each(e,function(){o(this.name,this.value)});else for(r in e)gn(r,e[r],n,o);return i.join("&").replace(cn,"+")};function gn(e,t,n,r){var i;if(x.isArray(t))x.each(t,function(t,i){n||pn.test(e)?r(e,i):gn(e+"["+("object"==typeof i?t:"")+"]",i,n,r)});else if(n||"object"!==x.type(t))r(e,t);else for(i in t)gn(e+"["+i+"]",t[i],n,r)}x.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(e,t){x.fn[t]=function(e,n){return arguments.length>0?this.on(t,null,e,n):this.trigger(t)}}),x.fn.extend({hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)},bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)}});var mn,yn,vn=x.now(),bn=/\?/,xn=/#.*$/,wn=/([?&])_=[^&]*/,Tn=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Cn=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Nn=/^(?:GET|HEAD)$/,kn=/^\/\//,En=/^([\w.+-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,Sn=x.fn.load,An={},jn={},Dn="*/".concat("*");try{yn=o.href}catch(Ln){yn=a.createElement("a"),yn.href="",yn=yn.href}mn=En.exec(yn.toLowerCase())||[];function Hn(e){return function(t,n){"string"!=typeof t&&(n=t,t="*");var r,i=0,o=t.toLowerCase().match(T)||[];if(x.isFunction(n))while(r=o[i++])"+"===r[0]?(r=r.slice(1)||"*",(e[r]=e[r]||[]).unshift(n)):(e[r]=e[r]||[]).push(n)}}function qn(e,n,r,i){var o={},a=e===jn;function s(l){var u;return o[l]=!0,x.each(e[l]||[],function(e,l){var c=l(n,r,i);return"string"!=typeof c||a||o[c]?a?!(u=c):t:(n.dataTypes.unshift(c),s(c),!1)}),u}return s(n.dataTypes[0])||!o["*"]&&s("*")}function _n(e,n){var r,i,o=x.ajaxSettings.flatOptions||{};for(i in n)n[i]!==t&&((o[i]?e:r||(r={}))[i]=n[i]);return r&&x.extend(!0,e,r),e}x.fn.load=function(e,n,r){if("string"!=typeof e&&Sn)return Sn.apply(this,arguments);var i,o,a,s=this,l=e.indexOf(" ");return l>=0&&(i=e.slice(l,e.length),e=e.slice(0,l)),x.isFunction(n)?(r=n,n=t):n&&"object"==typeof n&&(a="POST"),s.length>0&&x.ajax({url:e,type:a,dataType:"html",data:n}).done(function(e){o=arguments,s.html(i?x("<div>").append(x.parseHTML(e)).find(i):e)}).complete(r&&function(e,t){s.each(r,o||[e.responseText,t,e])}),this},x.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){x.fn[t]=function(e){return this.on(t,e)}}),x.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:yn,type:"GET",isLocal:Cn.test(mn[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Dn,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":x.parseJSON,"text xml":x.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?_n(_n(e,x.ajaxSettings),t):_n(x.ajaxSettings,e)},ajaxPrefilter:Hn(An),ajaxTransport:Hn(jn),ajax:function(e,n){"object"==typeof e&&(n=e,e=t),n=n||{};var r,i,o,a,s,l,u,c,p=x.ajaxSetup({},n),f=p.context||p,d=p.context&&(f.nodeType||f.jquery)?x(f):x.event,h=x.Deferred(),g=x.Callbacks("once memory"),m=p.statusCode||{},y={},v={},b=0,w="canceled",C={readyState:0,getResponseHeader:function(e){var t;if(2===b){if(!c){c={};while(t=Tn.exec(a))c[t[1].toLowerCase()]=t[2]}t=c[e.toLowerCase()]}return null==t?null:t},getAllResponseHeaders:function(){return 2===b?a:null},setRequestHeader:function(e,t){var n=e.toLowerCase();return b||(e=v[n]=v[n]||e,y[e]=t),this},overrideMimeType:function(e){return b||(p.mimeType=e),this},statusCode:function(e){var t;if(e)if(2>b)for(t in e)m[t]=[m[t],e[t]];else C.always(e[C.status]);return this},abort:function(e){var t=e||w;return u&&u.abort(t),k(0,t),this}};if(h.promise(C).complete=g.add,C.success=C.done,C.error=C.fail,p.url=((e||p.url||yn)+"").replace(xn,"").replace(kn,mn[1]+"//"),p.type=n.method||n.type||p.method||p.type,p.dataTypes=x.trim(p.dataType||"*").toLowerCase().match(T)||[""],null==p.crossDomain&&(r=En.exec(p.url.toLowerCase()),p.crossDomain=!(!r||r[1]===mn[1]&&r[2]===mn[2]&&(r[3]||("http:"===r[1]?"80":"443"))===(mn[3]||("http:"===mn[1]?"80":"443")))),p.data&&p.processData&&"string"!=typeof p.data&&(p.data=x.param(p.data,p.traditional)),qn(An,p,n,C),2===b)return C;l=p.global,l&&0===x.active++&&x.event.trigger("ajaxStart"),p.type=p.type.toUpperCase(),p.hasContent=!Nn.test(p.type),o=p.url,p.hasContent||(p.data&&(o=p.url+=(bn.test(o)?"&":"?")+p.data,delete p.data),p.cache===!1&&(p.url=wn.test(o)?o.replace(wn,"$1_="+vn++):o+(bn.test(o)?"&":"?")+"_="+vn++)),p.ifModified&&(x.lastModified[o]&&C.setRequestHeader("If-Modified-Since",x.lastModified[o]),x.etag[o]&&C.setRequestHeader("If-None-Match",x.etag[o])),(p.data&&p.hasContent&&p.contentType!==!1||n.contentType)&&C.setRequestHeader("Content-Type",p.contentType),C.setRequestHeader("Accept",p.dataTypes[0]&&p.accepts[p.dataTypes[0]]?p.accepts[p.dataTypes[0]]+("*"!==p.dataTypes[0]?", "+Dn+"; q=0.01":""):p.accepts["*"]);for(i in p.headers)C.setRequestHeader(i,p.headers[i]);if(p.beforeSend&&(p.beforeSend.call(f,C,p)===!1||2===b))return C.abort();w="abort";for(i in{success:1,error:1,complete:1})C[i](p[i]);if(u=qn(jn,p,n,C)){C.readyState=1,l&&d.trigger("ajaxSend",[C,p]),p.async&&p.timeout>0&&(s=setTimeout(function(){C.abort("timeout")},p.timeout));try{b=1,u.send(y,k)}catch(N){if(!(2>b))throw N;k(-1,N)}}else k(-1,"No Transport");function k(e,n,r,i){var c,y,v,w,T,N=n;2!==b&&(b=2,s&&clearTimeout(s),u=t,a=i||"",C.readyState=e>0?4:0,c=e>=200&&300>e||304===e,r&&(w=Mn(p,C,r)),w=On(p,w,C,c),c?(p.ifModified&&(T=C.getResponseHeader("Last-Modified"),T&&(x.lastModified[o]=T),T=C.getResponseHeader("etag"),T&&(x.etag[o]=T)),204===e||"HEAD"===p.type?N="nocontent":304===e?N="notmodified":(N=w.state,y=w.data,v=w.error,c=!v)):(v=N,(e||!N)&&(N="error",0>e&&(e=0))),C.status=e,C.statusText=(n||N)+"",c?h.resolveWith(f,[y,N,C]):h.rejectWith(f,[C,N,v]),C.statusCode(m),m=t,l&&d.trigger(c?"ajaxSuccess":"ajaxError",[C,p,c?y:v]),g.fireWith(f,[C,N]),l&&(d.trigger("ajaxComplete",[C,p]),--x.active||x.event.trigger("ajaxStop")))}return C},getJSON:function(e,t,n){return x.get(e,t,n,"json")},getScript:function(e,n){return x.get(e,t,n,"script")}}),x.each(["get","post"],function(e,n){x[n]=function(e,r,i,o){return x.isFunction(r)&&(o=o||i,i=r,r=t),x.ajax({url:e,type:n,dataType:o,data:r,success:i})}});function Mn(e,n,r){var i,o,a,s,l=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),o===t&&(o=e.mimeType||n.getResponseHeader("Content-Type"));if(o)for(s in l)if(l[s]&&l[s].test(o)){u.unshift(s);break}if(u[0]in r)a=u[0];else{for(s in r){if(!u[0]||e.converters[s+" "+u[0]]){a=s;break}i||(i=s)}a=a||i}return a?(a!==u[0]&&u.unshift(a),r[a]):t}function On(e,t,n,r){var i,o,a,s,l,u={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)u[a.toLowerCase()]=e.converters[a];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!l&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),l=o,o=c.shift())if("*"===o)o=l;else if("*"!==l&&l!==o){if(a=u[l+" "+o]||u["* "+o],!a)for(i in u)if(s=i.split(" "),s[1]===o&&(a=u[l+" "+s[0]]||u["* "+s[0]])){a===!0?a=u[i]:u[i]!==!0&&(o=s[0],c.unshift(s[1]));break}if(a!==!0)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(p){return{state:"parsererror",error:a?p:"No conversion from "+l+" to "+o}}}return{state:"success",data:t}}x.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(e){return x.globalEval(e),e}}}),x.ajaxPrefilter("script",function(e){e.cache===t&&(e.cache=!1),e.crossDomain&&(e.type="GET",e.global=!1)}),x.ajaxTransport("script",function(e){if(e.crossDomain){var n,r=a.head||x("head")[0]||a.documentElement;return{send:function(t,i){n=a.createElement("script"),n.async=!0,e.scriptCharset&&(n.charset=e.scriptCharset),n.src=e.url,n.onload=n.onreadystatechange=function(e,t){(t||!n.readyState||/loaded|complete/.test(n.readyState))&&(n.onload=n.onreadystatechange=null,n.parentNode&&n.parentNode.removeChild(n),n=null,t||i(200,"success"))},r.insertBefore(n,r.firstChild)},abort:function(){n&&n.onload(t,!0)}}}});var Fn=[],Bn=/(=)\?(?=&|$)|\?\?/;x.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Fn.pop()||x.expando+"_"+vn++;return this[e]=!0,e}}),x.ajaxPrefilter("json jsonp",function(n,r,i){var o,a,s,l=n.jsonp!==!1&&(Bn.test(n.url)?"url":"string"==typeof n.data&&!(n.contentType||"").indexOf("application/x-www-form-urlencoded")&&Bn.test(n.data)&&"data");return l||"jsonp"===n.dataTypes[0]?(o=n.jsonpCallback=x.isFunction(n.jsonpCallback)?n.jsonpCallback():n.jsonpCallback,l?n[l]=n[l].replace(Bn,"$1"+o):n.jsonp!==!1&&(n.url+=(bn.test(n.url)?"&":"?")+n.jsonp+"="+o),n.converters["script json"]=function(){return s||x.error(o+" was not called"),s[0]},n.dataTypes[0]="json",a=e[o],e[o]=function(){s=arguments},i.always(function(){e[o]=a,n[o]&&(n.jsonpCallback=r.jsonpCallback,Fn.push(o)),s&&x.isFunction(a)&&a(s[0]),s=a=t}),"script"):t});var Pn,Rn,Wn=0,$n=e.ActiveXObject&&function(){var e;for(e in Pn)Pn[e](t,!0)};function In(){try{return new e.XMLHttpRequest}catch(t){}}function zn(){try{return new e.ActiveXObject("Microsoft.XMLHTTP")}catch(t){}}x.ajaxSettings.xhr=e.ActiveXObject?function(){return!this.isLocal&&In()||zn()}:In,Rn=x.ajaxSettings.xhr(),x.support.cors=!!Rn&&"withCredentials"in Rn,Rn=x.support.ajax=!!Rn,Rn&&x.ajaxTransport(function(n){if(!n.crossDomain||x.support.cors){var r;return{send:function(i,o){var a,s,l=n.xhr();if(n.username?l.open(n.type,n.url,n.async,n.username,n.password):l.open(n.type,n.url,n.async),n.xhrFields)for(s in n.xhrFields)l[s]=n.xhrFields[s];n.mimeType&&l.overrideMimeType&&l.overrideMimeType(n.mimeType),n.crossDomain||i["X-Requested-With"]||(i["X-Requested-With"]="XMLHttpRequest");try{for(s in i)l.setRequestHeader(s,i[s])}catch(u){}l.send(n.hasContent&&n.data||null),r=function(e,i){var s,u,c,p;try{if(r&&(i||4===l.readyState))if(r=t,a&&(l.onreadystatechange=x.noop,$n&&delete Pn[a]),i)4!==l.readyState&&l.abort();else{p={},s=l.status,u=l.getAllResponseHeaders(),"string"==typeof l.responseText&&(p.text=l.responseText);try{c=l.statusText}catch(f){c=""}s||!n.isLocal||n.crossDomain?1223===s&&(s=204):s=p.text?200:404}}catch(d){i||o(-1,d)}p&&o(s,c,p,u)},n.async?4===l.readyState?setTimeout(r):(a=++Wn,$n&&(Pn||(Pn={},x(e).unload($n)),Pn[a]=r),l.onreadystatechange=r):r()},abort:function(){r&&r(t,!0)}}}});var Xn,Un,Vn=/^(?:toggle|show|hide)$/,Yn=RegExp("^(?:([+-])=|)("+w+")([a-z%]*)$","i"),Jn=/queueHooks$/,Gn=[nr],Qn={"*":[function(e,t){var n=this.createTween(e,t),r=n.cur(),i=Yn.exec(t),o=i&&i[3]||(x.cssNumber[e]?"":"px"),a=(x.cssNumber[e]||"px"!==o&&+r)&&Yn.exec(x.css(n.elem,e)),s=1,l=20;if(a&&a[3]!==o){o=o||a[3],i=i||[],a=+r||1;do s=s||".5",a/=s,x.style(n.elem,e,a+o);while(s!==(s=n.cur()/r)&&1!==s&&--l)}return i&&(a=n.start=+a||+r||0,n.unit=o,n.end=i[1]?a+(i[1]+1)*i[2]:+i[2]),n}]};function Kn(){return setTimeout(function(){Xn=t}),Xn=x.now()}function Zn(e,t,n){var r,i=(Qn[t]||[]).concat(Qn["*"]),o=0,a=i.length;for(;a>o;o++)if(r=i[o].call(n,t,e))return r}function er(e,t,n){var r,i,o=0,a=Gn.length,s=x.Deferred().always(function(){delete l.elem}),l=function(){if(i)return!1;var t=Xn||Kn(),n=Math.max(0,u.startTime+u.duration-t),r=n/u.duration||0,o=1-r,a=0,l=u.tweens.length;for(;l>a;a++)u.tweens[a].run(o);return s.notifyWith(e,[u,o,n]),1>o&&l?n:(s.resolveWith(e,[u]),!1)},u=s.promise({elem:e,props:x.extend({},t),opts:x.extend(!0,{specialEasing:{}},n),originalProperties:t,originalOptions:n,startTime:Xn||Kn(),duration:n.duration,tweens:[],createTween:function(t,n){var r=x.Tween(e,u.opts,t,n,u.opts.specialEasing[t]||u.opts.easing);return u.tweens.push(r),r},stop:function(t){var n=0,r=t?u.tweens.length:0;if(i)return this;for(i=!0;r>n;n++)u.tweens[n].run(1);return t?s.resolveWith(e,[u,t]):s.rejectWith(e,[u,t]),this}}),c=u.props;for(tr(c,u.opts.specialEasing);a>o;o++)if(r=Gn[o].call(u,e,c,u.opts))return r;return x.map(c,Zn,u),x.isFunction(u.opts.start)&&u.opts.start.call(e,u),x.fx.timer(x.extend(l,{elem:e,anim:u,queue:u.opts.queue})),u.progress(u.opts.progress).done(u.opts.done,u.opts.complete).fail(u.opts.fail).always(u.opts.always)}function tr(e,t){var n,r,i,o,a;for(n in e)if(r=x.camelCase(n),i=t[r],o=e[n],x.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),a=x.cssHooks[r],a&&"expand"in a){o=a.expand(o),delete e[r];for(n in o)n in e||(e[n]=o[n],t[n]=i)}else t[r]=i}x.Animation=x.extend(er,{tweener:function(e,t){x.isFunction(e)?(t=e,e=["*"]):e=e.split(" ");var n,r=0,i=e.length;for(;i>r;r++)n=e[r],Qn[n]=Qn[n]||[],Qn[n].unshift(t)},prefilter:function(e,t){t?Gn.unshift(e):Gn.push(e)}});function nr(e,t,n){var r,i,o,a,s,l,u=this,c={},p=e.style,f=e.nodeType&&nn(e),d=x._data(e,"fxshow");n.queue||(s=x._queueHooks(e,"fx"),null==s.unqueued&&(s.unqueued=0,l=s.empty.fire,s.empty.fire=function(){s.unqueued||l()}),s.unqueued++,u.always(function(){u.always(function(){s.unqueued--,x.queue(e,"fx").length||s.empty.fire()})})),1===e.nodeType&&("height"in t||"width"in t)&&(n.overflow=[p.overflow,p.overflowX,p.overflowY],"inline"===x.css(e,"display")&&"none"===x.css(e,"float")&&(x.support.inlineBlockNeedsLayout&&"inline"!==ln(e.nodeName)?p.zoom=1:p.display="inline-block")),n.overflow&&(p.overflow="hidden",x.support.shrinkWrapBlocks||u.always(function(){p.overflow=n.overflow[0],p.overflowX=n.overflow[1],p.overflowY=n.overflow[2]}));for(r in t)if(i=t[r],Vn.exec(i)){if(delete t[r],o=o||"toggle"===i,i===(f?"hide":"show"))continue;c[r]=d&&d[r]||x.style(e,r)}if(!x.isEmptyObject(c)){d?"hidden"in d&&(f=d.hidden):d=x._data(e,"fxshow",{}),o&&(d.hidden=!f),f?x(e).show():u.done(function(){x(e).hide()}),u.done(function(){var t;x._removeData(e,"fxshow");for(t in c)x.style(e,t,c[t])});for(r in c)a=Zn(f?d[r]:0,r,u),r in d||(d[r]=a.start,f&&(a.end=a.start,a.start="width"===r||"height"===r?1:0))}}function rr(e,t,n,r,i){return new rr.prototype.init(e,t,n,r,i)}x.Tween=rr,rr.prototype={constructor:rr,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||"swing",this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(x.cssNumber[n]?"":"px")},cur:function(){var e=rr.propHooks[this.prop];return e&&e.get?e.get(this):rr.propHooks._default.get(this)},run:function(e){var t,n=rr.propHooks[this.prop];return this.pos=t=this.options.duration?x.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):rr.propHooks._default.set(this),this}},rr.prototype.init.prototype=rr.prototype,rr.propHooks={_default:{get:function(e){var t;return null==e.elem[e.prop]||e.elem.style&&null!=e.elem.style[e.prop]?(t=x.css(e.elem,e.prop,""),t&&"auto"!==t?t:0):e.elem[e.prop]},set:function(e){x.fx.step[e.prop]?x.fx.step[e.prop](e):e.elem.style&&(null!=e.elem.style[x.cssProps[e.prop]]||x.cssHooks[e.prop])?x.style(e.elem,e.prop,e.now+e.unit):e.elem[e.prop]=e.now}}},rr.propHooks.scrollTop=rr.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},x.each(["toggle","show","hide"],function(e,t){var n=x.fn[t];x.fn[t]=function(e,r,i){return null==e||"boolean"==typeof e?n.apply(this,arguments):this.animate(ir(t,!0),e,r,i)}}),x.fn.extend({fadeTo:function(e,t,n,r){return this.filter(nn).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(e,t,n,r){var i=x.isEmptyObject(e),o=x.speed(t,n,r),a=function(){var t=er(this,x.extend({},e),o);(i||x._data(this,"finish"))&&t.stop(!0)};return a.finish=a,i||o.queue===!1?this.each(a):this.queue(o.queue,a)},stop:function(e,n,r){var i=function(e){var t=e.stop;delete e.stop,t(r)};return"string"!=typeof e&&(r=n,n=e,e=t),n&&e!==!1&&this.queue(e||"fx",[]),this.each(function(){var t=!0,n=null!=e&&e+"queueHooks",o=x.timers,a=x._data(this);if(n)a[n]&&a[n].stop&&i(a[n]);else for(n in a)a[n]&&a[n].stop&&Jn.test(n)&&i(a[n]);for(n=o.length;n--;)o[n].elem!==this||null!=e&&o[n].queue!==e||(o[n].anim.stop(r),t=!1,o.splice(n,1));(t||!r)&&x.dequeue(this,e)})},finish:function(e){return e!==!1&&(e=e||"fx"),this.each(function(){var t,n=x._data(this),r=n[e+"queue"],i=n[e+"queueHooks"],o=x.timers,a=r?r.length:0;for(n.finish=!0,x.queue(this,e,[]),i&&i.stop&&i.stop.call(this,!0),t=o.length;t--;)o[t].elem===this&&o[t].queue===e&&(o[t].anim.stop(!0),o.splice(t,1));for(t=0;a>t;t++)r[t]&&r[t].finish&&r[t].finish.call(this);delete n.finish})}});function ir(e,t){var n,r={height:e},i=0;for(t=t?1:0;4>i;i+=2-t)n=Zt[i],r["margin"+n]=r["padding"+n]=e;return t&&(r.opacity=r.width=e),r}x.each({slideDown:ir("show"),slideUp:ir("hide"),slideToggle:ir("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,t){x.fn[e]=function(e,n,r){return this.animate(t,e,n,r)}}),x.speed=function(e,t,n){var r=e&&"object"==typeof e?x.extend({},e):{complete:n||!n&&t||x.isFunction(e)&&e,duration:e,easing:n&&t||t&&!x.isFunction(t)&&t};return r.duration=x.fx.off?0:"number"==typeof r.duration?r.duration:r.duration in x.fx.speeds?x.fx.speeds[r.duration]:x.fx.speeds._default,(null==r.queue||r.queue===!0)&&(r.queue="fx"),r.old=r.complete,r.complete=function(){x.isFunction(r.old)&&r.old.call(this),r.queue&&x.dequeue(this,r.queue)},r},x.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2}},x.timers=[],x.fx=rr.prototype.init,x.fx.tick=function(){var e,n=x.timers,r=0;for(Xn=x.now();n.length>r;r++)e=n[r],e()||n[r]!==e||n.splice(r--,1);n.length||x.fx.stop(),Xn=t},x.fx.timer=function(e){e()&&x.timers.push(e)&&x.fx.start()},x.fx.interval=13,x.fx.start=function(){Un||(Un=setInterval(x.fx.tick,x.fx.interval))},x.fx.stop=function(){clearInterval(Un),Un=null},x.fx.speeds={slow:600,fast:200,_default:400},x.fx.step={},x.expr&&x.expr.filters&&(x.expr.filters.animated=function(e){return x.grep(x.timers,function(t){return e===t.elem}).length}),x.fn.offset=function(e){if(arguments.length)return e===t?this:this.each(function(t){x.offset.setOffset(this,e,t)});var n,r,o={top:0,left:0},a=this[0],s=a&&a.ownerDocument;if(s)return n=s.documentElement,x.contains(n,a)?(typeof a.getBoundingClientRect!==i&&(o=a.getBoundingClientRect()),r=or(s),{top:o.top+(r.pageYOffset||n.scrollTop)-(n.clientTop||0),left:o.left+(r.pageXOffset||n.scrollLeft)-(n.clientLeft||0)}):o},x.offset={setOffset:function(e,t,n){var r=x.css(e,"position");"static"===r&&(e.style.position="relative");var i=x(e),o=i.offset(),a=x.css(e,"top"),s=x.css(e,"left"),l=("absolute"===r||"fixed"===r)&&x.inArray("auto",[a,s])>-1,u={},c={},p,f;l?(c=i.position(),p=c.top,f=c.left):(p=parseFloat(a)||0,f=parseFloat(s)||0),x.isFunction(t)&&(t=t.call(e,n,o)),null!=t.top&&(u.top=t.top-o.top+p),null!=t.left&&(u.left=t.left-o.left+f),"using"in t?t.using.call(e,u):i.css(u)}},x.fn.extend({position:function(){if(this[0]){var e,t,n={top:0,left:0},r=this[0];return"fixed"===x.css(r,"position")?t=r.getBoundingClientRect():(e=this.offsetParent(),t=this.offset(),x.nodeName(e[0],"html")||(n=e.offset()),n.top+=x.css(e[0],"borderTopWidth",!0),n.left+=x.css(e[0],"borderLeftWidth",!0)),{top:t.top-n.top-x.css(r,"marginTop",!0),left:t.left-n.left-x.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent||s;while(e&&!x.nodeName(e,"html")&&"static"===x.css(e,"position"))e=e.offsetParent;return e||s})}}),x.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,n){var r=/Y/.test(n);x.fn[e]=function(i){return x.access(this,function(e,i,o){var a=or(e);return o===t?a?n in a?a[n]:a.document.documentElement[i]:e[i]:(a?a.scrollTo(r?x(a).scrollLeft():o,r?o:x(a).scrollTop()):e[i]=o,t)},e,i,arguments.length,null)}});function or(e){return x.isWindow(e)?e:9===e.nodeType?e.defaultView||e.parentWindow:!1}x.each({Height:"height",Width:"width"},function(e,n){x.each({padding:"inner"+e,content:n,"":"outer"+e},function(r,i){x.fn[i]=function(i,o){var a=arguments.length&&(r||"boolean"!=typeof i),s=r||(i===!0||o===!0?"margin":"border");return x.access(this,function(n,r,i){var o;return x.isWindow(n)?n.document.documentElement["client"+e]:9===n.nodeType?(o=n.documentElement,Math.max(n.body["scroll"+e],o["scroll"+e],n.body["offset"+e],o["offset"+e],o["client"+e])):i===t?x.css(n,r,s):x.style(n,r,i,s)},n,a?i:t,a,null)}})}),x.fn.size=function(){return this.length},x.fn.andSelf=x.fn.addBack,"object"==typeof module&&module&&"object"==typeof module.exports?module.exports=x:(e.jQuery=e.$=x,"function"==typeof define&&define.amd&&define("jquery",[],function(){return x}))})(window);
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/Symbola.eot b/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/Symbola.eot
new file mode 100644
index 0000000..0d10a95
Binary files /dev/null and b/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/Symbola.eot differ
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/Symbola.otf b/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/Symbola.otf
new file mode 100644
index 0000000..d549563
Binary files /dev/null and b/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/Symbola.otf differ
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/Symbola.svg b/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/Symbola.svg
new file mode 100644
index 0000000..eff3111
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/Symbola.svg
@@ -0,0 +1,5102 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>
+This is a custom SVG webfont generated by Font Squirrel.
+Designer    : George Douros
+Foundry     : Free
+Foundry URL : http://users.teilar.gr/_g1951d/
+</metadata>
+<defs>
+<font id="Symbola" horiz-adv-x="2048" >
+<font-face units-per-em="2048" ascent="1606" descent="-442" />
+<missing-glyph horiz-adv-x="512" />
+<glyph unicode=" "  horiz-adv-x="512" />
+<glyph unicode="&#x09;" horiz-adv-x="512" />
+<glyph unicode="&#xa0;" horiz-adv-x="512" />
+<glyph unicode="!" horiz-adv-x="682" d="M418 185q32 -32 32 -76.5t-32 -76.5t-77 -32t-77 32t-32 76.5t32 76.5t77 32t77 -32zM341 383q-25 0 -29 47l-79 932v10q0 40 30 66q34 28 78 28t78 -28q30 -26 30 -66v-10l-79 -934q-4 -45 -29 -45z" />
+<glyph unicode="&#x22;" horiz-adv-x="809" d="M428 1283q0 -11 -7 -23l-272 -472q-10 -17 -25.5 -17t-15.5 12.5t78 243t95 274.5q16 38 66 38q81 0 81 -56zM701 1283q0 -11 -7 -23l-271 -472q-10 -17 -26 -17t-16 12.5t78 243t95 274.5q16 38 66 38q81 0 81 -56z" />
+<glyph unicode="#" horiz-adv-x="1024" d="M985 382q0 -41 -68 -41h-185l-69 -394q-12 -68 -53 -68q-33 0 -33 35q0 11 4 33l69 394h-318l-69 -394q-12 -68 -53 -68q-33 0 -33 35q0 11 4 33l69 394h-143q-68 0 -68 41t68 41h158l56 318h-214q-68 0 -68 41t68 41h228l66 374q12 68 53 68q33 0 33 -35q0 -11 -4 -33 l-66 -374h318l66 374q12 68 53 68q33 0 33 -35q0 -11 -4 -33l-66 -374h100q68 0 68 -41t-68 -41h-114l-56 -318h170q68 0 68 -41zM721 741h-318l-56 -318h318z" />
+<glyph unicode="$" horiz-adv-x="964" d="M750 652q104 -112 104 -270t-97 -273t-246 -128v-89h-60v86q-155 10 -249 110.5t-94 255.5q0 97 89 97q38 0 63 -25t25 -63q0 -89 -88 -89q-14 0 -31 4q45 -214 285 -228v574q-161 41 -238 116q-105 105 -105 255.5t98.5 255t244.5 117.5v88h60v-86q152 -8 247.5 -99.5 t95.5 -240.5q0 -96 -88 -96q-38 0 -63.5 25.5t-25.5 63.5q0 88 89 88q17 0 30 -4q-50 190 -285 201v-521q159 -39 239 -125zM451 1298q-101 -10 -173 -80.5t-72 -172t69.5 -166t175.5 -87.5v506zM686 133.5q70 79.5 70 187t-67.5 182t-177.5 97.5v-560q105 14 175 93.5z" />
+<glyph unicode="%" horiz-adv-x="1662" d="M1331 878q281 0 281 -456t-281 -456t-281 456t281 456zM1358 1470q0 -12 -17 -37l-1037 -1536q-21 -31 -41 -31q-41 0 -41 41q0 13 19 41l920 1364q-106 -70 -270 -70t-301 99q22 -86 22 -222q0 -453 -281 -453t-281 456t281 456q149 0 223 -142q165 -149 331 -149 q235 0 389 195q23 29 43 29q41 0 41 -41zM1493 351v141q0 150 -19 217q-35 130 -143.5 130t-143.5 -128q-18 -67 -18 -216v-145q0 -345 162 -345t162 346zM493 1051q0 205 1 205v-2q-5 132 -34 197l-84 81q-22 7 -46 7q-108 0 -143 -128q-18 -67 -18 -216v-145 q0 -345 162 -345t162 346z" />
+<glyph unicode="&#x26;" horiz-adv-x="1593" d="M1205 18q81 0 153 59.5t76 170.5h52q-3 -130 -86.5 -211.5t-202.5 -81.5q-182 0 -361 156q-175 -156 -370 -156q-154 0 -262.5 87.5t-108.5 219.5q0 75 31 124.5t128 150.5l173 184q-84 214 -84 416q0 152 86 240.5t187.5 88.5t148.5 -97q35 -71 35 -167 q0 -136 -250 -414q57 -150 169.5 -314.5t170.5 -231.5q133 164 293 446q12 36 12 41q0 90 -146 90v64q81 -6 209.5 -6t239.5 6v-64q-125 -1 -191 -54q-44 -36 -114 -155q-175 -298 -271 -409q154 -183 283 -183zM748 1204q0 56 -15 110q-31 107 -108 107q-61 0 -107 -59 t-46 -201t61 -323q215 233 215 366zM314 523q-49 -81 -49 -193t45 -198q59 -114 172 -114q168 0 316 132q-78 78 -181 228t-172 296q-98 -94 -131 -151z" />
+<glyph unicode="'" horiz-adv-x="536" d="M428 1283q0 -11 -7 -23l-272 -472q-10 -17 -25.5 -17t-15.5 12.5t78 243t95 274.5q16 38 66 38q81 0 81 -56z" />
+<glyph unicode="(" horiz-adv-x="682" d="M574 -332q0 -18 -19 -18q-11 0 -46 29q-226 186 -322 396t-96 507t96 507t322 396q35 29 46 29q19 0 19 -18q0 -8 -24 -32q-300 -295 -300 -882t300 -882q24 -24 24 -32z" />
+<glyph unicode=")" horiz-adv-x="682" d="M591 582q0 -297 -96 -507t-322 -396q-35 -29 -46 -29q-19 0 -19 18q0 8 24 32q300 295 300 882t-300 882q-24 24 -24 32q0 18 19 18q11 0 46 -29q226 -186 322 -396t96 -507z" />
+<glyph unicode="*" horiz-adv-x="964" d="M824 1016q26 -12 26 -39.5t-16.5 -47t-35.5 -19.5t-31 9l-258 182l30 -319q0 -49 -56.5 -49t-56.5 49v5l29 314l-257 -182q-13 -9 -31.5 -9t-35.5 19.5t-17 47t27 39.5l287 132l-287 132q-27 13 -27 40t17 47t35.5 20t31.5 -9l257 -183l-29 319q0 49 56.5 49t56.5 -49v-5 l-30 -314l258 183q12 9 31 9t35.5 -20t16.5 -47t-26 -40l-287 -132z" />
+<glyph unicode="+" horiz-adv-x="1591" d="M1421 582q0 -41 -37 -41h-547v-546q0 -39 -41 -39t-41 39v546h-546q-39 0 -39 41t39 41h546v548q0 37 41 37t41 -37v-548h547q37 0 37 -41z" />
+<glyph unicode="," horiz-adv-x="512" d="M326 33q-33 -33 -83 -33t-78.5 32.5t-28.5 76t29 76t85 32.5t91 -58t35 -157q0 -152 -76.5 -274.5t-110.5 -122.5q-20 0 -20 22q0 8 14 23q148 157 148 352q0 30 -5 31z" />
+<glyph unicode="-" horiz-adv-x="1591" d="M1421 582q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41z" />
+<glyph unicode="." horiz-adv-x="512" d="M333 185q32 -32 32 -76.5t-32 -76.5t-77 -32t-77 32t-32 76.5t32 76.5t77 32t77 -32z" />
+<glyph unicode="/" horiz-adv-x="569" d="M569 1475q0 -6 -2 -13l-488 -1788q-7 -26 -40 -26q-39 0 -39 41q0 6 2 13l488 1788q7 26 40 26q39 0 39 -41z" />
+<glyph unicode="0" horiz-adv-x="1043" d="M877 1156q83 -165 83 -482t-78 -477q-118 -242 -362 -242q-226 0 -344 209q-93 164 -93 490.5t76 486.5q117 247 359 247t359 -232zM787 564v260q0 216 -37 329q-61 190 -229.5 190t-229.5 -191q-37 -114 -37 -329q0 -41 0.5 -122t0.5 -121q0 -239 33 -360 q59 -220 231.5 -220t233.5 212q34 120 34 352z" />
+<glyph unicode="1" horiz-adv-x="1043" d="M190 64l76 -2q153 0 175 43q9 18 9 53v1087q-109 -54 -272 -54v64q250 0 379 133h10q29 0 35 -14q3 -6 3 -39v-1181q0 -33 8 -50q15 -33 117 -40h40.5h94.5v-64q-71 6 -136 6h-404q-64 0 -135 -6v64z" />
+<glyph unicode="2" horiz-adv-x="1043" d="M106 0v18q0 33 24 60l400 445q218 243 218 461q0 139 -72.5 239.5t-206.5 100.5q-97 0 -173 -59t-109 -153q7 2 17 2q121 0 121 -109q0 -46 -31 -78t-77 -32q-111 0 -111 116q0 157 116 267t287.5 110t299.5 -111t128 -293q0 -118 -77 -228q-44 -63 -165 -181l-428 -415 h416q136 0 156 16.5t46 185.5h52l-57 -362h-774z" />
+<glyph unicode="3" horiz-adv-x="1043" d="M954 356q0 -172 -134 -286.5t-300.5 -114.5t-290.5 82q-140 93 -140 244q0 53 32 87t83.5 34t85 -33.5t33.5 -84t-34.5 -82.5t-84.5 -32q-10 0 -20 1q46 -77 135 -118t185 -41q125 0 187 116q48 91 48 232t-51 230q-63 113 -197 113h-108q-33 0 -33 22.5t48 28.5 q33 1 65 3q124 8 183.5 105t59.5 241q0 102 -50.5 168.5t-149.5 66.5q-194 0 -278 -130h5q124 0 124 -105q0 -46 -29.5 -76t-76.5 -30t-76.5 29.5t-29.5 77.5q0 132 123 213q108 71 248.5 71t252.5 -71q130 -82 130 -212t-84 -230t-209 -141q145 -29 246.5 -132.5 t101.5 -245.5z" />
+<glyph unicode="4" horiz-adv-x="1043" d="M983 345h-208v-196q0 -30 9 -48q19 -37 185 -37h9v-64q-83 6 -142 6h-285q-56 0 -139 -6v64q47 -1 64 -1q110 0 130 38q9 17 9 48v196h-555v64l640 978q16 25 41.5 25t31.5 -17q2 -6 2 -38v-948h208v-64zM627 409v777l-509 -777h509z" />
+<glyph unicode="5" horiz-adv-x="1043" d="M278 770q109 106 273.5 106t275 -138.5t110.5 -323t-132.5 -322t-321.5 -137.5q-155 0 -266 113t-111 268q0 111 101 111q44 0 74.5 -29t30.5 -73t-30.5 -73.5t-74.5 -29.5q-18 0 -34 5q29 -101 115.5 -168t190.5 -67q145 0 224 136q49 85 49 274.5t-37 273.5 q-59 134 -178 134q-89 0 -147 -35t-99.5 -83t-49.5 -48q-29 0 -29 41v648q0 34 20 34q9 0 26 -6q166 -60 289.5 -60t270.5 62q12 5 18 5q20 0 20 -23q0 -16 -36 -56q-144 -161 -366 -161q-86 0 -176 27v-405z" />
+<glyph unicode="6" horiz-adv-x="1043" d="M277 684q84 206 263.5 206t296.5 -139t117 -327.5t-121 -328.5t-308 -140q-242 0 -353 247q-83 183 -83 458q0 205 80 385.5t240 276.5q111 66 226 66t191.5 -57.5t76.5 -165.5q0 -44 -26.5 -73t-68.5 -29t-69.5 28t-27.5 69q0 93 103 93h11q-57 85 -183 85 q-81 0 -155 -47q-210 -133 -210 -607zM767 371v104q0 160 -38 238q-63 129 -193 129t-199 -127q-57 -103 -57 -244q0 -206 38 -302q26 -67 82.5 -112t124.5 -45q140 0 206 136q36 74 36 223z" />
+<glyph unicode="7" horiz-adv-x="1043" d="M969 1328q0 -32 -19 -59l-283 -395q-94 -131 -128 -356q-23 -151 -23 -449q0 -114 -95.5 -114t-95.5 114q0 384 256 784l232 329h-499q-117 0 -138 -13.5t-50 -188.5h-52l69 430h52q2 -20 14 -33q31 -34 253 -34h507v-15z" />
+<glyph unicode="8" horiz-adv-x="1043" d="M954 349q0 -170 -130.5 -282t-301 -112t-302 99t-131.5 261q0 235 301 384q-55 32 -154 112q-91 99 -91 239t113.5 239t262 99t263.5 -85t115 -225q0 -194 -253 -323q93 -56 131 -81.5t75 -66.5q102 -113 102 -258zM807 1078q0 112 -86.5 186t-196 74t-199 -58 t-89.5 -153.5t106 -172.5q30 -22 257 -168q208 120 208 292zM851 276q0 76 -40 126t-117 102.5t-257 161.5q-244 -134 -244 -351q0 -130 99 -216.5t226.5 -86.5t230 73t102.5 191z" />
+<glyph unicode="9" horiz-adv-x="1043" d="M954 687q0 -388 -220 -601q-135 -131 -303 -131q-120 0 -198 51q-92 59 -92 173q0 100 95 100q41 0 69 -27.5t28 -70t-33 -70.5q-27 -24 -63 -24q-6 0 -13 1q64 -76 205 -76q77 0 148 47q120 79 163 274q27 120 27 330q-82 -209 -263 -209t-298 139.5t-117 333.5 t129.5 327.5t310.5 133.5q102 0 187 -53q238 -148 238 -648zM763 878q0 202 -34 293q-62 167 -200 167t-209 -132q-43 -80 -43 -247v-86q0 -161 37 -238q64 -132 194.5 -132t199.5 129q55 103 55 246z" />
+<glyph unicode=":" horiz-adv-x="547" d="M378 104q0 -42 -31 -73t-73.5 -31t-73.5 31t-31 73t31 73t73.5 31t73.5 -31t31 -73zM378 743q0 -42 -31 -73t-73.5 -31t-73.5 31t-31 73t31 73t73.5 31t73.5 -31t31 -73z" />
+<glyph unicode=";" horiz-adv-x="569" d="M387 774q0 -45 -31.5 -76.5t-76.5 -31.5t-77 32t-32 76.5t32 76.5t76.5 32t76.5 -32t32 -77zM348 23q-26 -23 -73.5 -23t-76 32.5t-28.5 76t29 76t80 32.5q114 0 114 -211q0 -153 -69.5 -277t-100.5 -124q-20 0 -20 22q0 11 14 27q131 151 131 369z" />
+<glyph unicode="&#x3c;" horiz-adv-x="1591" d="M1421 31q0 -41 -41 -41q-8 0 -14 3l-1169 552q-27 13 -27 37t27 37l1169 552q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-1090 -514l1090 -514q24 -11 24 -37z" />
+<glyph unicode="=" horiz-adv-x="1591" d="M1421 380q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1421 784q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41z" />
+<glyph unicode="&#x3e;" horiz-adv-x="1591" d="M1421 582q0 -24 -27 -37l-1169 -552q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l1090 514l-1090 514q-24 11 -24 37q0 41 41 41q8 0 14 -3l1169 -552q27 -13 27 -37z" />
+<glyph unicode="?" horiz-adv-x="909" d="M504 185q32 -32 32 -76.5t-32 -76.5t-77 -32t-77 32t-32 76.5t32 76.5t77 32t77 -32zM743 1350q79 -73 79 -191.5t-98 -191.5q-270 -200 -270 -457v-72q0 -55 -26 -55t-26 49v92q0 267 181 461q69 74 69 182t-28 152q-49 80 -195 80q-187 0 -268 -139q114 0 114 -93.5 t-94 -93.5t-94 102.5t95.5 185.5t252.5 83q207 0 308 -94z" />
+<glyph unicode="@" horiz-adv-x="1500" d="M1391 652q0 -405 -196 -405q-70 0 -125.5 36.5t-68.5 100.5q-98 -137 -257.5 -137t-269 128.5t-109.5 294t109.5 293.5t272.5 128q124 0 226 -107q12 -15 38 -41q18 -16 63.5 -16t52.5 -6.5t7 -38.5v-466q0 -127 67 -127q141 0 141 322q0 483 -356 651q-117 55 -238 55 q-253 0 -422.5 -195t-169.5 -455t171.5 -452.5t430.5 -192.5q185 0 378 66l95 40q61 23 109.5 23t48.5 -20.5t-109 -56.5q-285 -96 -520 -96q-279 0 -465.5 205t-186.5 484.5t184 486t458 206.5q139 0 267 -63q180 -89 277 -262.5t97 -382.5zM1001 505v329q0 37 -26 76 q-91 139 -218.5 139t-199.5 -134q-60 -111 -60 -245t60 -246q73 -135 195 -135q82 0 165.5 68.5t83.5 147.5z" />
+<glyph unicode="A" horiz-adv-x="1484" d="M1417 0q-127 6 -297.5 6t-244.5 -6v61h5q157 0 157 59q0 29 -39 136l-70 192h-487l-61 -163q-34 -90 -34 -123q0 -51 52 -78q42 -23 97 -23v-61q-189 6 -239.5 6t-187.5 -6v61q174 2 219 133l409 1177q14 40 46 40t46 -40l425 -1231q21 -61 84 -75q19 -5 77 -5q19 0 43 1 v-61zM906 510l-222 641l-220 -641h442z" />
+<glyph unicode="B" horiz-adv-x="1346" d="M1278 360q0 -161 -135.5 -260.5t-302.5 -99.5h-772v61q62 -2 63 -2q113 0 134 45q5 11 5 42v1051q0 31 -5 42q-19 43 -152 43q-21 0 -45 -1v62h720q161 0 290 -83q148 -95 148 -247q0 -120 -98.5 -203t-227.5 -108q147 -16 262.5 -109t115.5 -233zM720 721 q129 0 221.5 82t92.5 202.5t-73 198t-186 77.5h-255q-53 0 -69.5 -13t-16.5 -66v-481h286zM994 147q88 86 88 214t-76.5 222t-200.5 94h-371v-537q0 -53 16.5 -66t69.5 -13h257q129 0 217 86z" />
+<glyph unicode="C" horiz-adv-x="1335" d="M1267 854q0 -26 -29 -26t-35 32q-12 60 -47 178q-51 127 -151 208.5t-217 81.5t-220 -50q-298 -145 -298 -613.5t322 -606.5q96 -41 185 -41q140 0 256 85t159 218q17 52 27 140q4 33 23 33q24 0 24 -35q0 -205 -154 -353t-360 -148q-288 0 -486 213t-198 502.5 t198.5 503.5t485.5 214q193 0 363 -169l99 144q17 25 31 25q22 0 22 -33v-503z" />
+<glyph unicode="D" horiz-adv-x="1459" d="M1226 1130q166 -200 166 -466t-172 -465t-432 -199h-720v61l62 -2q108 0 130 31q10 14 10 52v1060q0 36 -10 50q-21 29 -157 29h-35v62h720q263 0 438 -213zM1085 229q110 148 110 436.5t-103 433.5q-129 182 -359 182h-207q-53 0 -70 -13t-17 -66v-1062q0 -53 17.5 -66 t69.5 -13h209q225 0 350 168z" />
+<glyph unicode="E" horiz-adv-x="1354" d="M68 0v61q47 -1 53 -1q125 0 142 38q7 16 7 48v1053q0 30 -7 47q-15 36 -152 36q-20 0 -43 -1v62h1108l56 -442h-49q-24 218 -99.5 299t-288.5 81h-263q-54 0 -71 -13.5t-17 -65.5v-474h178q134 0 173.5 46.5t39.5 182.5h51v-521h-51q0 136 -40 183t-173 47h-178v-526 q0 -52 17 -65.5t71 -13.5h273q236 0 326 111q67 84 107 336h49l-84 -508h-1135z" />
+<glyph unicode="F" horiz-adv-x="1271" d="M779 1281h-252q-45 0 -64 -11.5t-19 -67.5v-501h170q132 0 171 48t39 183h48v-522h-48q0 136 -39 183.5t-171 47.5h-170v-497q0 -27 7 -44q16 -39 209 -39h37v-61q-74 6 -135 6h-373q-49 0 -121 -6v61h75q64 0 88 10q39 18 39 73v1056q0 25 -6 42q-14 39 -166 39h-30v62 h1081l54 -442h-49q-24 217 -89 291q-77 89 -286 89z" />
+<glyph unicode="G" horiz-adv-x="1472" d="M1405 478q-80 0 -97 -6q-40 -15 -40 -81v-360q0 -29 -16 -29q-42 0 -127 122q-97 -167 -378 -167t-480 212t-199 502.5t198.5 504.5t485.5 214q198 0 365 -169l99 144q17 25 31 25q21 0 21 -33l1 -503q0 -26 -29 -26t-35 32q-12 60 -46 177q-51 128 -151.5 209.5 t-217.5 81.5t-211 -46q-309 -152 -309 -608.5t312 -609.5q96 -47 213 -47t201 56q98 65 98 183v126q0 40 -9 56q-23 40 -175 40h-63v59q65 -5 221.5 -5t336.5 5v-59z" />
+<glyph unicode="H" horiz-adv-x="1480" d="M1413 1284l-56 2q-122 0 -140 -36q-8 -16 -8 -45v-1064q0 -29 8 -45q18 -35 186 -35h10v-61q-71 6 -113 6h-361q-36 0 -107 -6v61q9 0 28 -0.5t29 -0.5q119 0 137 36q8 16 8 45v530h-590v-530q0 -29 8 -45q18 -35 187 -35h10v-61q-71 6 -115 6h-358q-37 0 -108 -6v61 q9 0 27.5 -0.5t28.5 -0.5q121 0 139 36q7 14 7 45v1064q0 31 -7 45q-17 34 -149 34h-46v62q70 -6 112 -6h354q45 0 115 6v-62l-55 2q-123 0 -142 -36q-8 -16 -8 -45v-474h590v474q0 29 -8 45q-17 34 -148 34h-46v62q70 -6 112 -6h356q43 0 113 6v-62z" />
+<glyph unicode="I" horiz-adv-x="736" d="M670 1284l-59 2q-75 0 -103 -9q-53 -18 -53 -76v-1057q0 -27 13.5 -52t91.5 -31h110v-61q-71 6 -117 6h-373q-41 0 -112 -6v61q8 0 27.5 -0.5t29.5 -0.5q128 0 147 36q9 17 9 49v1056q0 32 -9 49q-18 34 -153 34h-51v62q71 -6 115 -6h376q41 0 111 6v-62z" />
+<glyph unicode="J" horiz-adv-x="970" d="M752 284q0 -141 -112.5 -234t-245 -93t-229.5 73t-97 190q0 49 30.5 81.5t78.5 32.5t79 -31.5t31 -78.5q0 -110 -121 -110h-4q71 -114 217 -114q99 0 156 101q47 83 47 190v910q0 29 -9 47q-19 36 -223 36h-32v62q78 -6 161 -6h221q73 0 203 6v-62l-42 2q-60 0 -85 -14 t-25 -69z" />
+<glyph unicode="K" horiz-adv-x="1519" d="M649 1284l-57 2q-126 0 -142 -40q-6 -15 -6 -44v-636l618 588q36 34 36 67q0 61 -91 63v62q69 -6 217.5 -6t201.5 6v-62q-160 -2 -281 -118l-356 -340l456 -670q42 -62 83.5 -78.5t122.5 -16.5v-61q-127 6 -281.5 6t-225.5 -6v61h4q113 0 113 59q0 22 -31 68l-357 528 l-229 -218v-359q0 -28 9 -45q17 -33 186 -33h10v-61q-71 6 -120 6h-347q-43 0 -114 -6v61q8 0 26.5 -0.5t28.5 -0.5q125 0 141 40q6 15 6 44v1066q0 27 -7 41q-16 33 -176 33h-19v62q70 -6 119 -6h342q50 0 120 6v-62z" />
+<glyph unicode="L" horiz-adv-x="1216" d="M697 1284l-66 2q-156 0 -177 -36q-10 -17 -10 -48v-1062q0 -52 17.5 -65.5t68.5 -13.5h173q212 0 303 123q70 96 94 324h49l-55 -508h-1026v61q8 0 25.5 -0.5t27.5 -0.5q124 0 142 35q7 14 7 46v1064q0 32 -7 46q-17 33 -185 33h-10v62q71 -6 126 -6h383q47 0 120 6v-62z " />
+<glyph unicode="M" horiz-adv-x="1793" d="M1726 1281l-56 2q-125 0 -141 -41q-6 -15 -6 -45v-1058q0 -26 8 -43q17 -35 185 -35h10v-61q-75 6 -119 6h-334q-38 0 -113 -6v61h76q63 0 87 10q40 17 40 70v1140h-2l-483 -1245q-14 -36 -36 -36t-39 43l-476 1222h-2v-1064q0 -140 200 -140h3v-61q-209 6 -229 6 t-231 -6v61h3q199 0 199 140v1003q0 22 -6 38q-12 32 -89 39q-6 1 -32.5 1t-74.5 -1v62h341q45 0 61 -42l428 -1102l430 1108q14 36 49 36h349v-62z" />
+<glyph unicode="N" horiz-adv-x="1480" d="M1209 1139v-1107q0 -32 -26 -32q-16 0 -34 26l-805 1178q-12 17 -19 25v-1028q0 -140 200 -140h3v-61q-208 6 -230 6t-230 -6v61h3q199 0 199 140v1032q0 29 -8 35q-19 13 -194 13v62h342q30 0 48 -26l696 -1019v847q0 139 -203 139v62q205 -6 231.5 -6t230.5 6v-62h-3 q-201 0 -201 -145z" />
+<glyph unicode="O" horiz-adv-x="1445" d="M722 -43q-280 0 -467 214t-187 498.5t186.5 502.5t468 218t468 -217.5t186.5 -503t-187.5 -499t-467.5 -213.5zM1175 696q0 438 -260 590q-92 54 -192 54t-191 -53q-262 -153 -262 -591q0 -469 265 -632q91 -56 185 -56t188 55q267 156 267 633z" />
+<glyph unicode="P" horiz-adv-x="1295" d="M1074 1249q154 -106 154 -268t-142 -262t-307 -100h-335v-473q0 -32 7 -48q17 -37 181 -37h17v-61q-72 6 -133 6h-326q-50 0 -122 -6v61l55 -1q122 0 140 38q7 15 7 48v1051q0 32 -7 48q-16 37 -158 37q-18 0 -37 -1v62h695q174 0 311 -94zM1024 977q0 161 -75.5 232.5 t-237.5 71.5h-186q-53 0 -69.5 -13t-16.5 -66v-532h272q313 0 313 307z" />
+<glyph unicode="Q" horiz-adv-x="1457" d="M1390 -19q0 -135 -52 -236q-65 -127 -189 -127t-183 130q-34 73 -56 239q-95 -30 -186 -30q-281 0 -468.5 214t-187.5 498.5t186.5 502.5t468 218t468 -217.5t186.5 -503.5q0 -209 -107 -390.5t-292 -265.5q62 -192 188 -192q138 0 180 166q9 35 21 35q23 0 23 -41z M1180 669q0 455 -262 613q-96 58 -194.5 58t-193.5 -56q-267 -157 -267 -615q0 -213 69 -375q86 -199 259 -263q-28 45 -28 103.5t47.5 107.5t115.5 49q144 0 221 -208q233 172 233 586zM726 248q-50 0 -84.5 -36.5t-34.5 -87t33 -84.5t84 -34q92 0 174 46q-36 196 -172 196 z" />
+<glyph unicode="R" horiz-adv-x="1508" d="M1440 173q0 -86 -51 -151t-135 -65q-330 0 -330 318q0 13 1 40v40q0 158 -73 227.5t-186 69.5h-227v-511q0 -29 7 -46q14 -34 171 -34h26v-61q-74 6 -143 6h-289q-69 0 -143 -6v61q6 0 24.5 -0.5t28.5 -0.5q125 0 142 35q7 15 7 46v1055q0 27 -6 45q-14 40 -167 40h-29 v62h618q183 0 333 -84q180 -100 180 -267q0 -122 -115 -213q-94 -75 -229 -108q165 -57 224 -182q25 -52 39 -149l25 -182q31 -158 118 -158q101 0 131 175q5 31 24 31q24 0 24 -33zM997 992q0 196 -143 256q-84 35 -314 35q-51 0 -69 -7q-32 -14 -32 -57v-523h219 q339 0 339 296z" />
+<glyph unicode="S" horiz-adv-x="1007" d="M860.5 616.5q79.5 -107.5 79.5 -262.5t-110.5 -276t-277.5 -121q-236 0 -362 137l-72 -111q-16 -26 -30 -26q-20 0 -20 29v431q0 29 24 29q30 0 30 -72q0 -143 117 -250t311 -107q114 0 189 84t75 192.5t-59 184.5t-170 104q-88 17 -260 65q-116 42 -186.5 140t-70.5 221 q0 160 111 271t278 111t309 -139l69 112q17 27 29 27q24 0 24 -33v-429q0 -28 -28 -28q-18 0 -23 22q-7 41 -25 122q-81 290 -360 290q-109 0 -183.5 -74.5t-74.5 -183.5q0 -189 199 -250q85 -19 252 -62q136 -40 215.5 -147.5z" />
+<glyph unicode="T" horiz-adv-x="1413" d="M878 1282q-46 0 -65.5 -11.5t-19.5 -53.5v-1071q0 -25 10 -47q18 -38 243 -38h34v-61q-84 6 -154 6h-439q-71 0 -155 -6v61q9 0 35.5 -0.5t40.5 -0.5q184 0 202 39q8 17 8 47v1072q0 43 -29 56q-17 8 -66 8q-256 0 -321 -62.5t-86 -318.5h-48l36 442h1206l36 -442h-49 q-22 262 -88.5 321.5t-330.5 59.5z" />
+<glyph unicode="U" horiz-adv-x="1480" d="M1209 1131v-668q0 -203 -122.5 -354.5t-323.5 -151.5t-347 143.5t-146 347.5v760q0 30 -7 43q-18 34 -156 34q-19 0 -39 -1v62q73 -6 156 -6h269q84 0 156 6v-62q-48 1 -60 1q-118 0 -136 -34q-9 -17 -9 -51v-759q0 -298 192 -393q62 -31 134 -31q170 0 274.5 131 t104.5 306v685q0 89 -63 122q-45 23 -140 23v62q205 -6 234 -6t233 6v-62h-4q-164 0 -192 -85q-8 -24 -8 -68z" />
+<glyph unicode="V" horiz-adv-x="1536" d="M814 -6q-14 -37 -46.5 -37t-48.5 43l-457 1209q-22 57 -81 71q-19 5 -67 5q-20 0 -46 -1v62q214 -6 336.5 -6t195.5 6v-62h-6q-156 0 -156 -56q0 -30 141 -394l247 -637l361 950q9 24 9 40q0 94 -143 97v62q154 -6 238 -6t177 6v-62q-164 -1 -214 -132z" />
+<glyph unicode="W" horiz-adv-x="2087" d="M2019 1284q-152 0 -195 -132l-378 -1156q-13 -39 -38.5 -39t-37.5 37l-328 1003l-323 -1001q-13 -39 -39.5 -39t-38.5 37l-395 1207q-6 19 -23 53q-23 30 -134 30h-21v62q242 -6 344.5 -6t175.5 6v-62h-5q-161 0 -161 -58q0 -15 4 -27l316 -968l275 845l-35 127 q-16 48 -52 64.5t-134 16.5v62q242 -6 344.5 -6t175.5 6v-62h-5q-160 0 -160 -58q0 -15 5 -30l316 -965l296 910q10 31 10 39q0 53 -63 81q-48 22 -109 23v62q155 -6 239 -6t174 6v-62z" />
+<glyph unicode="X" horiz-adv-x="1518" d="M1450 0q-127 6 -299 6t-244 -6v61q128 5 128 59q0 10 -320 493l-281 -414q-19 -28 -19 -48q0 -43 38.5 -66t84.5 -24v-61q-74 6 -165 6t-305 -6v61q196 0 285 131l323 477l-362 547q-34 51 -99 64q-24 4 -81 4h-41v62q112 -6 292.5 -6t251.5 6v-62q-128 -5 -128 -58 q0 -13 268 -410l225 333q17 25 17 46q0 43 -37.5 65.5t-83.5 23.5v62q81 -6 163.5 -6t306.5 6v-62q-198 -2 -285 -128l-271 -395l416 -629q35 -53 99 -66q25 -5 85 -5h38v-61z" />
+<glyph unicode="Y" horiz-adv-x="1566" d="M1499 1284q-173 0 -252 -128l-381 -619v-388q0 -34 10 -53q15 -29 90 -35h104v-61q-73 6 -127 6h-320q-55 0 -128 -6v61q8 0 25.5 -0.5t27.5 -0.5q124 0 142 36q7 14 7 43v398l-413 675q-34 56 -95 68q-21 4 -121 4v62q126 -6 299.5 -6t246.5 6v-62h-24q-112 0 -112 -48 q0 -14 13 -35l356 -581l325 529q21 34 21 58q0 77 -113 77v62q155 -6 240.5 -6t178.5 6v-62z" />
+<glyph unicode="Z" horiz-adv-x="1128" d="M101 0q-33 0 -33 33q0 21 13 41l766 1207h-310q-206 0 -294 -87.5t-100 -293.5h-51l22 443h900q34 0 34 -32q0 -16 -14 -38l-764 -1205h324q239 0 329 114q76 95 89 344h49l-35 -526h-925z" />
+<glyph unicode="[" horiz-adv-x="682" d="M571 -309q0 -41 -68 -41h-391v1864h391q68 0 68 -40.5t-68 -40.5h-309v-1701h309q68 0 68 -41z" />
+<glyph unicode="\" horiz-adv-x="569" d="M569 -311q0 -41 -39 -41q-33 0 -40 26l-488 1788q-2 7 -2 13q0 41 39 41q33 0 40 -26l488 -1788q2 -7 2 -13z" />
+<glyph unicode="]" horiz-adv-x="682" d="M570 -350h-391q-68 0 -68 41t68 41h309v1701h-309q-68 0 -68 40.5t68 40.5h391v-1864z" />
+<glyph unicode="^" horiz-adv-x="906" d="M765 1057q31 -15 31 -41t-21 -26q-5 0 -7 2q-199 57 -315 265q-103 -186 -314 -265q-3 -2 -8 -2q-21 0 -21 36q0 16 28 29l53 23q129 64 208 204q11 23 36 67q6 11 18.5 11t19.5 -11l34 -68q77 -138 208 -203z" />
+<glyph unicode="_" horiz-adv-x="964" d="M971 -337q59 0 59 -38.5t-59 -38.5h-979q-58 0 -58 38.5t59 38.5h978z" />
+<glyph unicode="`" horiz-adv-x="536" d="M255 1301q17 -44 95 -274.5t78 -243t-15.5 -12.5t-26.5 17l-271 472q-7 12 -7 23q0 56 81 56q50 0 66 -38z" />
+<glyph unicode="a" horiz-adv-x="1070" d="M1018 190q0 -83 -47.5 -142.5t-122.5 -59.5t-120.5 51.5t-52.5 122.5q-35 -85 -111 -135.5t-186.5 -50.5t-205.5 50q-119 62 -119 178q0 179 213 279q131 61 394 76v78q0 110 -60.5 192t-166.5 82q-154 0 -231 -98q46 0 78 -26.5t32 -70t-28.5 -71.5t-71.5 -28 q-98 0 -98 99q0 113 102 178.5t222 65.5q183 0 293 -119q50 -54 63.5 -108t13.5 -144v-427q0 -40 20.5 -74t57.5 -34q79 0 79 175q0 28 -2 80h55v-119zM660 300v214q-171 -6 -291 -71q-152 -82 -152 -236q0 -78 56.5 -130.5t135.5 -52.5q111 0 181 81.5t70 194.5z" />
+<glyph unicode="b" horiz-adv-x="1160" d="M360 807q121 139 303.5 139t313 -145.5t130.5 -342t-139 -339.5t-327.5 -143t-290.5 157q-24 -46 -77 -133h-53v1277q0 88 -47 109q-20 10 -85 10q-16 0 -35 -1v67l307 23v-678zM865 162q64 99 64 300t-60 299q-85 138 -225 138q-91 0 -184 -64t-93 -150v-442 q0 -45 30 -89q89 -130 234 -130t234 138z" />
+<glyph unicode="c" horiz-adv-x="920" d="M868 254q0 -22 -27 -75q-104 -203 -329 -203q-194 0 -326.5 144.5t-132.5 343t132 347.5t330 149q121 0 215 -54q113 -64 113 -170t-97 -106q-42 0 -70.5 28t-28.5 70q0 94 100 99q-79 78 -229 78q-60 0 -120 -34q-168 -94 -168 -402.5t178 -404.5q63 -34 123 -34 q113 0 181 64q40 37 74 109.5t53 72.5q29 0 29 -22z" />
+<glyph unicode="d" horiz-adv-x="1159" d="M793 118q-111 -142 -295 -142t-314.5 144.5t-130.5 340.5t139.5 340.5t336.5 144.5q163 0 270 -133v464q0 88 -47 109q-20 10 -85 10q-16 0 -35 -1v67l308 23v-1300q0 -88 46 -110q20 -10 85 -10q16 0 35 1v-66l-313 -24v142zM793 253v449q0 32 -24 68q-87 129 -236 129 t-238 -138q-65 -100 -65 -300t61 -299q85 -138 224 -138q93 0 185.5 69.5t92.5 159.5z" />
+<glyph unicode="e" horiz-adv-x="933" d="M854 280q27 0 27 -28t-35 -88q-110 -188 -315 -188t-341.5 147.5t-136.5 344.5t127 344.5t312.5 147.5t287 -119t101.5 -302q0 -30 -7.5 -37.5t-38.5 -7.5h-605v-7q0 -210 64 -313q90 -144 242 -144q198 0 290 221q12 29 28 29zM740 539q0 143 -50 243q-64 129 -192 129 q-41 0 -90 -23q-165 -78 -175 -349h507z" />
+<glyph unicode="f" horiz-adv-x="798" d="M239 6l-185 -6v66q28 -1 69 -1t64 12q34 18 34 76v702h-168v68h168v246q0 141 95.5 240t236.5 99q72 0 132.5 -40.5t60.5 -108.5q0 -94 -95 -94q-39 0 -65.5 26t-26.5 65q0 69 64 91q-33 15 -70 15q-96 0 -151 -102q-46 -84 -46 -189v-248h251v-68h-246v-704q0 -21 7 -41 q15 -44 186 -44h15v-66q-81 6 -145 6h-185z" />
+<glyph unicode="g" horiz-adv-x="1082" d="M403 136l112 3q242 0 345 -59q142 -81 142 -244q0 -140 -177 -217q-136 -59 -297 -59t-298 59q-177 76 -177 212q0 77 58.5 133.5t138.5 79.5q-94 62 -94 192q0 98 66 176q-101 85 -101 220t105.5 224.5t238 89.5t230.5 -77q103 101 227 101q45 0 76.5 -30t31.5 -75 q0 -64 -62 -64t-62 61q0 44 34 59q-9 2 -20 2q-104 0 -193 -84q87 -81 87 -211t-105 -220t-232 -90t-221 67q-36 -43 -36 -100q0 -149 183 -149zM655 633q0 264 -187 264q-102 0 -153 -87q-34 -58 -34 -178q0 -264 187 -264q101 0 152 86q35 59 35 179zM888 -169 q0 183 -357 183h-191q-72 0 -124.5 -55.5t-52.5 -127.5q0 -109 134 -172q108 -51 230.5 -51t228.5 51q132 64 132 172z" />
+<glyph unicode="h" horiz-adv-x="1181" d="M1129 0q-200 6 -238 6t-244 -6v66q30 -1 70.5 -1t63.5 12q33 19 33 76v519q0 227 -158 227q-130 0 -209.5 -104.5t-79.5 -238.5v-400q0 -39 10 -58q18 -33 117 -33q18 0 38 1v-66q-200 6 -236.5 6t-242.5 -6v66q30 -1 72.5 -1t68 16.5t25.5 80.5v1115q0 87 -44 108 q-21 10 -96 10h-26v67l306 23v-744h2q41 93 125 149t184 56q292 0 292 -314v-502q0 -65 135 -65q15 0 32 1v-66z" />
+<glyph unicode="i" horiz-adv-x="562" d="M510 0q-202 6 -233 6t-224 -6v66l44 -1q66 0 89 13q33 18 33 79v582q0 85 -41 105q-21 11 -103 11h-14v68l298 23v-802q0 -59 51 -73q19 -5 69 -5h31v-66zM335.5 1356q33.5 -33 33.5 -80.5t-33.5 -81t-80.5 -33.5t-80 34.5t-33 80t33.5 79.5t80 34t80 -33z" />
+<glyph unicode="j" horiz-adv-x="588" d="M385 -107q0 -133 -81 -232.5t-211 -99.5q-90 0 -159 40q-83 48 -83 132q0 42 27.5 70t69.5 28t70.5 -28t28.5 -70q0 -76 -74 -96q58 -29 114 -29q158 0 158 281v861q0 39 -9 60q-20 45 -148 45h-27v68l324 23v-1053zM353 1356q33 -33 33 -80.5t-33.5 -81t-80 -33.5 t-79.5 34.5t-33 80t33.5 79.5t80 34t79.5 -33z" />
+<glyph unicode="k" horiz-adv-x="1139" d="M1086 0q-88 6 -168 6t-248 -6v66h6q70 0 70 49q0 38 -255 385l-136 -116v-222q0 -51 12 -69.5t47 -22.5q30 -4 83 -4h25v-66q-121 6 -197 6t-272 -6v66q10 0 33 -0.5t35 -0.5q99 0 99 97v1115q0 87 -45 108q-21 10 -106 10h-16v67l307 23v-1027l302 261q47 41 47 84 q0 50 -61 52v68q116 -8 214 -8t175 8v-68q-133 -6 -270 -114q-174 -137 -174 -156q0 -2 14 -22l273 -383q48 -67 88 -91q39 -23 112 -23h6v-66z" />
+<glyph unicode="l" horiz-adv-x="579" d="M53 66l68 -2q98 0 98 98v1115q0 87 -44 108q-21 10 -106 10h-16v67l306 23v-1323q0 -50 13.5 -69t49.5 -23q29 -4 81 -4h24v-66q-220 6 -247.5 6t-226.5 -6v66z" />
+<glyph unicode="m" horiz-adv-x="1775" d="M1485 6q-40 0 -244 -6v66q26 -1 70 -1t65 13q32 19 32 84v499q0 238 -157 238q-130 0 -209.5 -104.5t-79.5 -238.5v-401q0 -39 12 -60q18 -30 118 -30q17 0 37 1v-66q-198 6 -237.5 6t-244.5 -6v66q26 -1 70 -1t65 13q32 19 32 84v499q0 238 -158 238 q-130 0 -209.5 -104.5t-79.5 -238.5v-397q0 -47 11 -64q18 -30 114 -30q19 0 40 1v-66q-198 6 -236 6t-243 -6v66q26 -1 69.5 -1t70 16t26.5 81v574q0 87 -44 109q-21 10 -96 10h-26v68l301 23v-225q101 225 316 225q251 0 284 -210q43 95 126.5 152.5t185.5 57.5 q158 0 224.5 -81t66.5 -243v-42q-1 -27 -1 -41v-409q0 -65 132 -65q17 0 35 1v-66q-198 6 -238 6z" />
+<glyph unicode="n" horiz-adv-x="1181" d="M1129 0q-200 6 -238 6t-244 -6v66q29 -1 70 -1t64 12q33 19 33 76v519q0 227 -158 227q-130 0 -209.5 -104.5t-79.5 -238.5v-400q0 -38 10 -58q17 -33 117 -33q17 0 38 1v-66q-199 6 -236 6t-243 -6v66q29 -1 72 -1t68.5 16.5t25.5 80.5v574q0 87 -44 109q-21 10 -96 10 h-26v68l301 23v-225q101 225 316 225q292 0 292 -316v-500q0 -65 135 -65q15 0 32 1v-66z" />
+<glyph unicode="o" horiz-adv-x="1054" d="M191.5 118.5q-138.5 142.5 -138.5 341.5t138 349.5t336.5 150.5t336.5 -151t138 -350.5t-139 -341t-336 -141.5t-335.5 142.5zM776 188q47 92 47 292.5t-56 292.5q-84 138 -244.5 138t-241.5 -143q-51 -90 -51 -294.5t55 -299.5q83 -144 246.5 -144t244.5 158z" />
+<glyph unicode="p" horiz-adv-x="1160" d="M360 805q127 141 308 141t310 -146.5t129 -342t-139 -338.5t-337 -143q-78 0 -158.5 42t-105.5 109v-388q0 -42 11 -59q19 -29 114 -29q19 0 41 1v-66q-169 5 -241.5 5t-238.5 -5v66q37 -2 76.5 -2t60.5 14q30 19 30 83v1002q0 51 -10 71.5t-44 28.5q-26 6 -83 6h-30v68 l307 23v-141zM855 176q74 128 74 282t-67 281q-81 154 -218 154q-179 0 -277 -172v-478q0 -46 30 -89q91 -130 230.5 -130t227.5 152z" />
+<glyph unicode="q" horiz-adv-x="1159" d="M1106 -414q-166 5 -243 5t-239 -5v66q37 -2 77 -2t66 16.5t26 80.5v383q-115 -154 -284 -154q-192 0 -324 144.5t-132 340t138 340.5t334 145q92 0 169.5 -54t117.5 -140l81 194h47v-1199q0 -46 12 -67q17 -29 113 -29q19 0 41 1v-66zM799 291v301q0 112 -76 206.5 t-178.5 94.5t-176.5 -72q-138 -134 -138 -362q0 -152 66 -280q81 -155 219 -155q104 0 194 82t90 185z" />
+<glyph unicode="r" horiz-adv-x="823" d="M53 66l67 -2q100 0 100 98v574q0 87 -45 109q-22 10 -106 10h-16v68l297 23v-235q76 235 262 235q60 0 109.5 -36.5t49.5 -85.5t-25.5 -76t-65 -27t-66 26t-26.5 66q0 64 48 84q-6 2 -14 2q-136 0 -207 -140q-55 -111 -55 -262v-346q0 -62 56 -78q23 -7 108 -7h44v-66 q-81 6 -147 6h-174l-194 -6v66z" />
+<glyph unicode="s" horiz-adv-x="804" d="M752 274q0 -146 -97 -222t-242 -76t-242 93q-77 -93 -97.5 -93t-20.5 33v322q0 32 27 32q21 0 30 -35q37 -146 92 -214q73 -90 206 -90q103 0 172 48.5t69 146.5q0 147 -223 195q-128 28 -148 33q-82 25 -134 67q-91 75 -91 183q0 134 108 204q92 59 221.5 59t212.5 -61 q60 61 82 61t22 -33v-254q0 -35 -29 -35q-23 0 -31 43l-6 60q-16 87 -81.5 132.5t-158.5 45.5t-157 -34q-81 -43 -81 -129t94 -130q48 -22 169 -46q170 -33 243 -102q91 -86 91 -204z" />
+<glyph unicode="t" horiz-adv-x="775" d="M722 265q0 -113 -48 -193q-58 -96 -164 -96q-132 0 -203.5 78t-71.5 211v590h-182v49q142 5 215 145q59 111 61 268h53v-394h305v-68h-305v-594q0 -231 144.5 -231t144.5 290q0 18 -1 67h52v-122z" />
+<glyph unicode="u" horiz-adv-x="1181" d="M821 169q-89 -193 -278.5 -193t-256.5 83t-67 280v375q0 102 -35 126q-23 15 -119 15h-12v68l314 23v-710q0 -114 39 -163t156 -49t189 108q63 94 63 224v380q0 87 -45 109q-21 10 -96 10h-26v68l315 23v-761q0 -87 45 -109q21 -10 96 -10h26v-66l-308 -24v193z" />
+<glyph unicode="v" horiz-adv-x="1151" d="M577 -24q-29 0 -45 40l-309 760q-24 60 -68 73q-18 6 -83 6h-19v68q120 -8 164 -8t276 8v-68q-122 0 -122 -54q0 -15 252 -634l219 546q13 32 13 50q0 90 -102 92v68q135 -8 194.5 -8t151.5 8v-68q-142 -1 -198 -142l-279 -697q-16 -40 -45 -40z" />
+<glyph unicode="w" horiz-adv-x="1571" d="M1045 -24q-28 0 -42 40l-220 608l-216 -606q-15 -42 -42.5 -42t-44.5 48l-270 757q-19 54 -62 68q-20 6 -78 6h-17v68q143 -8 170.5 -8t260.5 8v-68h-4q-121 0 -121 -56q0 -38 77 -245l137 -366l183 518q-38 105 -54 121q-29 28 -129 28v68q120 -8 189 -8l224 8v-68h-4 q-124 0 -124 -56q0 -11 11 -42l213 -595l195 546q10 28 10 46q0 98 -125 101v68q151 -8 209.5 -8t146.5 8v-68q-131 -3 -179 -136l-252 -703q-14 -40 -42 -40z" />
+<glyph unicode="x" horiz-adv-x="1183" d="M1131 0q-91 6 -175.5 6t-261.5 -6v66q77 3 77 54q0 10 -208 285q-192 -223 -192 -272q0 -61 62 -67v-66q-141 6 -221 6t-159 -6v66q159 0 274 128l200 256l-212 276q-71 92 -105 110.5t-147 18.5v68q110 -8 171 -8t264 8v-68q-75 -2 -75 -52q0 -20 184 -255l134 167 q33 41 33 75q0 61 -63 65v68q108 -8 192.5 -8t188.5 8v-68q-152 -3 -255 -109q-26 -27 -197 -244l287 -369q37 -47 92 -60q28 -7 95 -7h17v-66z" />
+<glyph unicode="y" horiz-adv-x="1151" d="M249 -439q-76 0 -136 50t-60 124q0 91 89 91q39 0 65 -25.5t26 -63.5q0 -81 -85 -91q41 -38 101 -38q93 0 158 92q32 45 68 130l71 170l-321 781q-22 54 -70 68q-21 6 -74 6h-28v68q120 -8 178.5 -8t261.5 8v-68h-4q-116 0 -116 -54q0 -19 250 -616l217 528q14 34 14 50 q0 90 -101 92v68q170 -8 212 -8t134 8v-68h-2q-140 0 -197 -136l-377 -913q-101 -245 -274 -245z" />
+<glyph unicode="z" horiz-adv-x="904" d="M91 0q-38 0 -38 30q0 15 18 39l599 807h-245q-167 0 -223.5 -63.5t-65.5 -234.5h-53l24 345h701q38 0 38 -28q0 -14 -18 -38l-595 -803h251q182 0 248 86q51 68 65 260h55l-38 -400h-723z" />
+<glyph unicode="{" horiz-adv-x="983" d="M827 -327q0 -23 -41 -23q-174 0 -285 78q-73 51 -93 116q-13 42 -13 149v313q0 117 -72 181t-190 73q-33 2 -33 21t18 22t35 4q242 31 242 252v313q0 107 13 149q20 65 93 116q109 77 285 77q41 0 41 -20.5t-18 -24.5q-154 -9 -237 -94q-42 -43 -54 -114q-5 -34 -5 -129 v-277q0 -89 -21 -132q-47 -96 -202 -141q155 -45 202 -141q21 -42 21 -131v-277q0 -95 5 -129q12 -71 54 -114q83 -85 237 -94q18 -4 18 -23z" />
+<glyph unicode="|" horiz-adv-x="410" d="M246 -311q0 -41 -41 -41t-41 41v1788q0 39 41 39t41 -39v-1788z" />
+<glyph unicode="}" horiz-adv-x="983" d="M883 582q0 -17 -18 -20t-35 -4q-242 -31 -242 -252v-313q0 -107 -13 -149q-20 -65 -93 -116q-111 -78 -285 -78q-41 0 -41 23q0 19 18 23q154 9 237 94q42 43 54 114q5 34 5 129v277q0 89 21 131q47 96 202 141q-155 45 -202 141q-21 43 -21 132v277q0 95 -5 129 q-12 71 -54 114q-83 85 -237 94q-18 4 -18 24.5t41 20.5q176 0 285 -77q73 -51 93 -116q13 -42 13 -149v-313q0 -117 72 -181t190 -73q33 -2 33 -23z" />
+<glyph unicode="~" horiz-adv-x="1058" d="M1021 659q0 -111 -71.5 -195t-175.5 -84t-251.5 116.5t-233.5 116.5q-136 0 -179 -131q-6 -29 -15.5 -65t-27.5 -36q-30 0 -30 57q0 109 72.5 193.5t176 84.5t251 -117t233.5 -117q155 0 192 184q9 49 31 49q28 0 28 -56z" />
+<glyph d="M731 1248q0 -164 -105 -244t-273 -80h-221v650h228q169 0 270 -81t101 -245zM1251 257h-455v650h455v-113h-304v-131h282v-113h-282v-180h304v-113zM1916 -410h-453v650h152v-537h301v-113zM344 1033q229 0 229 216t-229 216h-60v-432h60z" />
+<glyph unicode="&#xa1;" horiz-adv-x="682" d="M418 1012q32 -32 32 -76.5t-32 -76.5t-77 -32t-77 32t-32 76.5t32 76.5t77 32t77 -32zM341 -422q-44 0 -78 28q-30 26 -30 66v10l79 934q4 45 29 45t29 -47l79 -932v-10q0 -40 -30 -66q-34 -28 -78 -28z" />
+<glyph unicode="&#xa2;" horiz-adv-x="920" d="M868 454q0 -22 -27 -75q-100 -194 -310 -203v-284h-60v286q-179 16 -298.5 157t-119.5 327.5t118 332t300 163.5v288h60v-286q118 -5 206 -58q106 -64 106 -168t-97 -104q-42 0 -70.5 28t-28.5 70q0 94 100 99q-75 74 -216 78v-875q113 0 181 64q40 37 74 109.5t53 72.5 q29 0 29 -22zM398 1071q-168 -94 -168 -402.5t178 -404.5q31 -17 63 -26v862q-37 -9 -73 -29z" />
+<glyph unicode="&#xa3;" horiz-adv-x="1051" d="M958 310q18 0 18 -23t-22 -86q-78 -225 -264 -225q-85 0 -177 56q-32 19 -153 112q-81 -168 -182 -168q-50 0 -78.5 35t-28.5 93t44 99.5t110 41.5q35 0 94 -10q4 50 4 120t-21 334h-213v60h209q-9 121 -9 208q0 171 97 299t263 128q117 0 180 -64t63 -133 q0 -27 -20.5 -50t-47.5 -23q-49 0 -61 61q-22 109 -24 112q-27 61 -114 61q-192 0 -192 -294q0 -57 10.5 -161t12.5 -144h357v-60h-356q0 -270 -66 -469l167 -56q101 -30 172 -30q135 0 189 107l17 45q10 24 22 24zM213 203q-105 0 -105 -99q0 -89 75 -89q88 0 126 154 q-52 34 -96 34z" />
+<glyph unicode="&#xa4;" horiz-adv-x="1024" d="M512 140q-160 0 -283 102l-145 -142l-56 55l144 145q-102 123 -102 282.5t102 282.5l-144 141l56 57l145 -141q123 102 283 102t283 -103l143 142l58 -57l-144 -141q102 -123 102 -282.5t-102 -282.5l144 -145l-58 -55l-143 143q-123 -103 -283 -103zM872 582 q0 149 -105.5 254.5t-254.5 105.5t-254.5 -105.5t-105.5 -254.5t105.5 -254.5t254.5 -105.5t254.5 105.5t105.5 254.5z" />
+<glyph unicode="&#xa5;" horiz-adv-x="1566" d="M1499 1284q-174 0 -252 -128l-272 -442h355v-60h-392l-72 -117v-13h464v-60h-464v-315q0 -34 10 -53q15 -29 89 -35h105v-61q-73 6 -127 6h-320q-55 0 -128 -6v61q8 0 25.5 -0.5t27.5 -0.5q124 0 142 36q7 14 7 43v325h-461v60h461v13l-72 117h-389v60h352l-304 498 q-35 56 -95 68q-21 4 -121 4v62q126 -6 299.5 -6t246.5 6v-62h-24q-112 0 -112 -48q0 -14 13 -35l298 -487h115l268 435q21 34 21 58q0 77 -113 77v62q155 -6 240.5 -6t178.5 6v-62zM868 654h-42l21 -34z" />
+<glyph unicode="&#xa6;" horiz-adv-x="386" d="M246 811q0 -61 -41 -61t-41 61v642q0 61 41 61t41 -61v-642zM246 -289q0 -61 -41 -61t-41 61v642q0 61 41 61t41 -61v-642z" />
+<glyph unicode="&#xa7;" horiz-adv-x="964" d="M596 1140l13 91q0 89 -104 89q-68 0 -115.5 -48t-47.5 -117q0 -101 123 -206l229 -183q123 -119 123 -256q0 -197 -207 -321q116 -126 116 -240.5t-77 -192t-180.5 -77.5t-175.5 61t-72 152q0 32 21 57t53 25q71 0 71 -81l-16 -103q0 -36 36.5 -54.5t87 -18.5t103 47 t52.5 108q0 101 -125 211l-232 191q-126 123 -126 257q0 194 209 319q-117 128 -117 242t77.5 191t180 77t175.5 -58.5t73 -146t-74 -87.5q-31 0 -52.5 21t-21.5 51zM578 215q145 87 145 200.5t-127 231.5l-211 174q-142 -84 -142 -200.5t125 -233.5z" />
+<glyph unicode="&#xa8;" horiz-adv-x="549" d="M167 1318q32 -32 32 -78.5t-32 -79t-78 -32.5t-79 33.5t-33 78t33.5 77.5t79 33t77.5 -32zM539 1318q32 -32 32 -78.5t-32 -79t-78 -32.5t-79 33.5t-33 78t33.5 77.5t79 33t77.5 -32z" />
+<glyph unicode="&#xa9;" horiz-adv-x="1524" d="M1233.5 1020q195.5 -197 195.5 -472.5t-196 -471.5t-471.5 -196t-471 196t-195.5 472t196 472.5t471.5 196.5t471 -197zM1378 548q0 255 -181 436.5t-435.5 181.5t-435 -182t-180.5 -437t180.5 -436t435.5 -181t435.5 181.5t180.5 436.5zM1099 390q0 -130 -98.5 -224 t-229.5 -94q-183 0 -308 134.5t-125 318t125.5 318.5t307.5 135q122 0 227 -102q64 102 82.5 102t18.5 -24v-315q0 -23 -24 -23q-20 0 -26.5 31.5t-28.5 104.5q-73 178 -233 178t-242 -129q-70 -109 -70 -276q0 -295 197 -380q57 -25 129 -25t142.5 51.5t97.5 133.5 q6 32 19 96q4 16 18 16q21 0 21 -27z" />
+<glyph unicode="&#xaa;" horiz-adv-x="822" d="M783 715q0 -62 -40 -103t-102 -41q-98 0 -129 97q-67 -105 -206 -105q-96 0 -170 34q-96 44 -96 128q0 125 165 194q99 41 289 51v43q0 73 -44 122.5t-127 49.5t-139 -47q70 -13 70 -74q0 -34 -25.5 -54.5t-59.5 -20.5q-84 0 -84 76q0 83 81.5 127.5t171.5 44.5 q142 0 227 -82q60 -58 60 -174v-284q0 -62 49 -62q48 0 48 130q0 18 -1 40h62v-90zM494 788v132q-116 -5 -198 -43q-113 -52 -113 -150q0 -50 40.5 -81t104 -31t115 49t51.5 124z" />
+<glyph unicode="&#xab;" horiz-adv-x="1140" d="M528 5q0 -27 -48 -27q-20 0 -36 37l-30 68q-79 165 -266 268q-29 14 -86 45q-15 10 -15 25t15 25l87 46q186 100 265 266l26 65q20 41 54 41t34 -27q0 -3 -3 -10q-123 -284 -344 -406q223 -124 344 -406q3 -7 3 -10zM952 5q0 -27 -47 -27q-20 0 -37 37t-30 68 q-79 165 -266 268q-30 14 -86 45q-15 10 -15 25t15 25l87 46q186 100 265 266l26 65q20 41 54 41t34 -27q0 -3 -3 -10q-123 -284 -344 -406q223 -124 344 -406q3 -7 3 -10z" />
+<glyph unicode="&#xac;" horiz-adv-x="1591" d="M1304 219q0 -37 -41 -37t-41 37v428h-1013q-39 0 -39 41t39 41h1058q37 0 37 -37v-473z" />
+<glyph unicode="&#xad;" horiz-adv-x="0" />
+<glyph unicode="&#xae;" horiz-adv-x="1524" d="M1233.5 1020q195.5 -197 195.5 -472.5t-196 -471.5t-471.5 -196t-471 196t-195.5 472t196 472.5t471.5 196.5t471 -197zM1378 548q0 255 -181 436.5t-435.5 181.5t-435 -182t-180.5 -437t180.5 -436t435.5 -181t435.5 181.5t180.5 436.5zM1218 231q0 -56 -33 -98.5 t-88 -42.5q-211 0 -211 205v26q1 17 1 25q0 180 -158 180h-137v-316q0 -17 4 -26q8 -19 105 -19h19v-47q-48 4 -88 4h-195q-40 0 -88 -4v47h20q12 -1 19 -1q75 0 85 20q4 8 4 26v664q0 16 -4 27q-8 21 -100 21h-24v48h393q116 0 212 -55q114 -65 114 -172q0 -144 -205 -202 q116 -45 143 -147l34 -204q18 -63 62 -63q58 0 77 106q4 24 19 24q20 0 20 -26zM931 743q0 112 -75 152q-53 28 -172 28h-53q-39 0 -39 -35v-325h133q206 0 206 180z" />
+<glyph unicode="&#xaf;" horiz-adv-x="964" d="M971 1543q59 0 59 -38.5t-59 -38.5h-979q-58 0 -58 38.5t59 38.5h978z" />
+<glyph unicode="&#xb0;" horiz-adv-x="771" d="M590.5 1325.5q84.5 -84.5 84.5 -205t-84.5 -204.5t-205 -84t-205 84.5t-84.5 204.5t84.5 204.5t205 84.5t205 -84.5zM534 972.5q61 61.5 61 149t-61 148.5t-148.5 61t-149 -61.5t-61.5 -148.5t62 -148.5t149 -61.5t148 61.5z" />
+<glyph unicode="&#xb1;" horiz-adv-x="1591" d="M1421 41q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h546v502h-546q-39 0 -39 41t39 41h546v546q0 39 41 39t41 -39v-546h547q37 0 37 -41t-37 -41h-547v-502h547q37 0 37 -41z" />
+<glyph unicode="&#xb2;" horiz-adv-x="801" d="M79 579v22q0 26 21 47l300 296q160 158 160 299q0 93 -53.5 154.5t-145.5 61.5q-136 0 -195 -119q98 -2 98 -83q0 -36 -27 -59.5t-64 -23.5q-94 0 -94 87q0 113 93.5 187t219.5 74t228 -74t102 -205q0 -82 -60 -158q-33 -42 -125 -121l-300 -259h300q82 0 95 9.5 t33 125.5h59l-46 -261h-599z" />
+<glyph unicode="&#xb3;" horiz-adv-x="801" d="M735 826q0 -124 -106.5 -200.5t-229.5 -76.5t-218 54q-114 64 -114 173q0 90 97 90q40 0 69 -24t29 -63q0 -82 -93 -87q74 -85 219 -85q86 0 126 64t40 155q0 220 -176 220q-72 0 -72 -1h3q-47 3 -47 27t91 29.5t133.5 67.5t42.5 153q0 146 -140 146q-122 0 -187 -67 q86 -7 86 -79q0 -80 -89.5 -80t-89.5 81q0 96 100 152q83 47 188 47t192 -47q105 -57 105 -154q0 -81 -55.5 -145.5t-137.5 -96.5q97 -26 165.5 -93t68.5 -160z" />
+<glyph unicode="&#xb4;" horiz-adv-x="928" d="M523 1401q22 29 53 29t54 -23t23 -53t-28 -54l-313 -256l-37 35z" />
+<glyph unicode="&#xb5;" horiz-adv-x="1120" d="M1043 187q0 -84 -47.5 -143.5t-130 -59.5t-125 64.5t-42.5 152.5q-101 -225 -317 -225q-83 0 -144 25v-66q0 -221 -37 -352h-148q37 173 37 311v1029h147v-663q0 -237 159 -237q129 0 209 101t80 233v566h148v-765q0 -39 21.5 -73.5t58.5 -34.5q78 0 78 171l-2 86h55 v-120z" />
+<glyph unicode="&#xb6;" horiz-adv-x="964" d="M927 1235h-125v-1642h-68v1642h-177v-1642h-68v982h-5q-448 0 -448 358q0 177 128 270q113 83 296 83h467v-51z" />
+<glyph unicode="&#xb7;" horiz-adv-x="300" d="M260 582q0 -46 -32 -78t-78 -32t-78 32t-32 78t32 78t78 32t78 -32t32 -78z" />
+<glyph unicode="&#xb8;" horiz-adv-x="1024" d="M744 -239q0 -161 -376 -161h-88v43q327 0 327 118q0 56 -42 87t-101 32v127h96v-95q70 -11 127 -49.5t57 -101.5z" />
+<glyph unicode="&#xb9;" horiz-adv-x="801" d="M142 642l84 -2q93 0 106 24q5 9 5 30v708q-80 -31 -204 -31v62q193 0 290 89h12q38 0 38 -45v-786q0 -18 5 -28q11 -21 175 -21h15v-64q-67 5 -105 5h-316q-38 0 -105 -5v64z" />
+<glyph unicode="&#xba;" horiz-adv-x="810" d="M771 894.5q0 -143.5 -111 -237.5t-255.5 -94t-254.5 94.5t-110 238t110 242.5t255.5 99t255.5 -99.5t110 -243zM583 719q34 60 34 189t-41 189q-60 88 -174.5 88t-172.5 -91q-37 -58 -37 -190t40 -194q59 -91 176.5 -91t174.5 100z" />
+<glyph unicode="&#xbb;" horiz-adv-x="1140" d="M670 421q0 -15 -15 -25l-87 -45q-188 -104 -266 -268l-26 -64q-20 -41 -46 -41q-41 0 -41 27q0 5 2 10q116 279 345 406q-227 125 -345 406q-2 4 -2 10q0 27 34 27t50 -36.5t29 -69.5q78 -165 265 -266q31 -14 88 -46q15 -10 15 -25zM1093 421q0 -15 -14 -25l-87 -45 q-188 -104 -266 -268l-26 -64q-20 -41 -46 -41q-41 0 -41 27q0 5 1 10q117 279 346 406q-227 125 -346 406q-1 4 -1 10q0 27 33.5 27t53.5 -41l26 -65q78 -165 265 -266q30 -14 88 -46q14 -10 14 -25z" />
+<glyph unicode="&#xbc;" horiz-adv-x="1722" d="M1499 1415q0 -13 -6 -22l-1071 -1667q-11 -17 -35 -17q-40 0 -40 40q0 13 6 22l1071 1667q11 17 35 17q40 0 40 -40zM1677 -100h-156v-120q0 -18 5 -27q10 -19 134 -19h13v-64q-78 5 -117 5h-213q-36 0 -114 -5v64l58 -1q76 0 88 20q6 10 6 27v120h-416v56l481 653 q15 21 40 21q35 0 35 -47v-620h156v-63zM142 643l67 -2q109 0 123 24q5 9 5 30v708q-80 -31 -204 -31v62q193 0 290 89h12q38 0 38 -45v-786q0 -18 5 -28q11 -21 175 -21h15v-64q-67 5 -112 5h-302q-45 0 -112 -5v64zM1390 -37v476l-352 -476h352z" />
+<glyph unicode="&#xbd;" horiz-adv-x="1722" d="M142 643l67 -2q109 0 123 24q5 9 5 30v708q-80 -31 -204 -31v62q193 0 290 89h12q38 0 38 -45v-786q0 -18 5 -28q11 -21 175 -21h15v-64q-67 5 -112 5h-302q-45 0 -112 -5v64zM1419 1415q0 -13 -6 -22l-1071 -1667q-11 -17 -35 -17q-40 0 -40 40q0 13 6 22l1071 1667 q11 17 35 17q40 0 40 -40zM999 -329v22q0 26 21 47l300 296q160 158 160 299q0 89 -52 152.5t-147 63.5q-136 0 -195 -119q98 -2 98 -83q0 -35 -26.5 -59t-64.5 -24q-94 0 -94 87q0 109 90.5 185t222.5 76t231 -76.5t99 -202.5q0 -82 -61 -159q-32 -40 -124 -120l-300 -259 h285q97 0 110 9.5t33 125.5h59l-46 -261h-599z" />
+<glyph unicode="&#xbe;" horiz-adv-x="1722" d="M1499 1415q0 -13 -6 -22l-1071 -1667q-11 -17 -35 -17q-40 0 -40 40q0 13 6 22l1071 1667q11 17 35 17q40 0 40 -40zM1677 -100h-156v-120q0 -18 5 -27q10 -19 134 -19h13v-64q-78 5 -117 5h-213q-36 0 -114 -5v64l58 -1q76 0 88 20q6 10 6 27v120h-416v56l481 653 q15 21 40 21q35 0 35 -47v-620h156v-63zM735 827q0 -120 -103.5 -198.5t-231.5 -78.5t-223 56q-110 65 -110 171q0 90 97 90q42 0 70 -24.5t28 -62.5q0 -82 -93 -87q74 -85 219 -85q88 0 131 72q35 58 35 147q0 220 -176 220h-81q-35 0 -35 25.5t90.5 30.5t133.5 67t43 153 q0 146 -140 146q-123 0 -187 -67q86 -8 86 -79q0 -80 -89.5 -80t-89.5 81q0 94 97 150q83 49 191 49t195 -49q102 -57 102 -152q0 -79 -54.5 -144t-138.5 -98q100 -27 167 -94.5t67 -158.5zM1390 -37v476l-352 -476h352z" />
+<glyph unicode="&#xbf;" horiz-adv-x="909" d="M559 1012q32 -32 32 -76.5t-32 -76.5t-77 -32t-77 32t-32 76.5t32 76.5t77 32t77 -32zM728 -29q94 0 94 -102.5t-95.5 -185.5t-252.5 -83q-207 0 -308 94q-79 73 -79 191.5t98 191.5q270 200 270 457v72q0 55 26 55t26 -49v-92q0 -267 -181 -461q-69 -74 -69 -182 t28 -152q49 -80 195 -80q187 0 268 139q-114 0 -114 93.5t94 93.5z" />
+<glyph unicode="&#xd7;" horiz-adv-x="1591" d="M1321 100q0 -44 -43 -44q-15 0 -25 10l-458 458l-456 -456q-11 -11 -27 -11q-42 0 -42 42q0 16 11 27l457 456l-457 456q-11 11 -11 27q0 42 42 42q16 0 27 -11l456 -456l458 458q10 10 25 10q43 0 43 -44q0 -14 -10 -24l-458 -458l458 -458q10 -10 10 -24z" />
+<glyph unicode="&#xf7;" horiz-adv-x="1591" d="M1421 582q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM875 1109.5q34 -33.5 34 -80t-33.5 -79.5t-80.5 -33t-80.5 33t-33.5 79.5t34 80t80 33.5t80 -33.5zM875.5 214q33.5 -33 33.5 -79.5t-34 -80t-80 -33.5t-80 33.5t-34 80t33.5 79.5t80.5 33t80.5 -33z " />
+<glyph unicode="&#x131;" horiz-adv-x="562" d="M510 0q-202 6 -233 6t-224 -6v66l44 -1q66 0 89 13q33 18 33 79v582q0 85 -41 105q-21 11 -103 11h-14v68l298 23v-802q0 -59 51 -73q19 -5 69 -5h31v-66z" />
+<glyph unicode="&#x192;" horiz-adv-x="1033" d="M977 1183q-39 0 -65 25q-23 23 -23 56v8q3 37 29 64.5t62 32.5q-41 31 -94 31q-19 0 -34 -4q-35 -11 -68 -63q-9 -16 -65 -311l-26 -138h208q26 0 22 -27l-7 -16q-4 -25 -29 -25h-208l-93 -503q-81 -436 -171 -585.5t-203 -149.5q-71 0 -125.5 39t-54.5 98t30 93.5 t79 34.5q75 0 75 -71q0 -44 -29.5 -76t-72.5 -34q37 -37 107 -37q67 0 109 121q26 75 117 559l95 511h-173q-26 0 -20 26l5 17q6 25 31 25h171l24 128q23 121 47.5 204t70.5 136q85 94 185 94q48 0 94 -20q102 -45 102 -132q0 -7 -1 -14q-8 -97 -101 -97z" />
+<glyph unicode="&#x19b;" horiz-adv-x="1121" d="M1102 -7q0 -18 -45 -18q-81 0 -107 19.5t-54 92.5q-62 162 -194 554l-403 -483q-49 -68 -141 -167q-26 -18 -46 -18q-61 0 -61 57q0 29 43 72q575 581 587 594l-130 369h-267q-37 0 -37 42t37 42h237l-51 140q-23 65 -34 87q-26 57 -53 70q-22 6 -48 14.5t-26 23.5 q0 24 39 24q212 0 266 -155l70 -204h276q38 0 38 -42t-38 -42h-247l333 -963q20 -57 38 -81.5t18 -27.5z" />
+<glyph unicode="&#x1c0;" horiz-adv-x="626" d="M354 -101q0 -41 -41 -41t-41 41v1368q0 39 41 39t41 -39v-1368z" />
+<glyph unicode="&#x1c1;" horiz-adv-x="1024" d="M752 -105q0 -37 -41 -37t-41 37v1374q0 37 41 37t41 -37v-1374zM354 -105q0 -37 -41 -37t-41 37v1374q0 37 41 37t41 -37v-1374z" />
+<glyph unicode="&#x1c2;" horiz-adv-x="1194" d="M1024 380q0 -41 -37 -41h-349v-444q0 -37 -41 -37t-41 37v444h-347q-39 0 -39 41t39 41h347v322h-347q-39 0 -39 41t39 41h347v444q0 37 41 37t41 -37v-444h349q37 0 37 -41t-37 -41h-349v-322h349q37 0 37 -41z" />
+<glyph unicode="&#x237;" horiz-adv-x="588" d="M385 -107q0 -133 -81 -232.5t-211 -99.5q-90 0 -159 40q-83 48 -83 132q0 42 27.5 70t69.5 28t70.5 -28t28.5 -70q0 -76 -74 -96q58 -29 114 -29q158 0 158 281v861q0 39 -9 60q-20 45 -148 45h-27v68l324 23v-1053z" />
+<glyph unicode="&#x238;" horiz-adv-x="1740" d="M940 807q121 139 303.5 139t313 -145.5t130.5 -342t-139 -339.5t-327.5 -143t-290.5 157q-24 -46 -77 -133h-60v118q-111 -142 -295 -142t-314.5 144.5t-130.5 340.5t139.5 340.5t336.5 144.5q163 0 270 -133v464q0 88 -47 109q-20 10 -85 10q-16 0 -35 -1v67l308 23 v-678zM1445 162q64 99 64 300t-60 299q-85 138 -225 138q-91 0 -184 -64t-93 -150v-442q0 -45 30 -89q89 -130 234 -130t234 138zM793 253v449q0 32 -24 68q-87 129 -236 129t-238 -138q-65 -100 -65 -300t61 -299q85 -138 224 -138q93 0 185.5 69.5t92.5 159.5z" />
+<glyph unicode="&#x239;" horiz-adv-x="1733" d="M940 813q124 133 303 133t308 -146.5t129 -342t-139 -338.5t-337 -143q-78 0 -158.5 42t-105.5 109v-380q0 -46 12 -67q17 -29 113 -29q19 0 41 1v-66q-166 5 -243 5t-239 -5v66q37 -2 77 -2t66 16.5t26 80.5v383q-115 -154 -284 -154q-192 0 -324 144.5t-132 340 t138 340.5t334 145q92 0 169.5 -54t117.5 -140l81 194h47v-133zM1428 176q74 128 74 282t-67 281q-81 154 -218 154q-179 0 -277 -172v-478q0 -46 30 -89q91 -130 230.5 -130t227.5 152zM799 291v301q0 112 -76 206.5t-178.5 94.5t-176.5 -72q-138 -134 -138 -362 q0 -152 66 -280q81 -155 219 -155q104 0 194 82t90 185z" />
+<glyph unicode="&#x23c;" horiz-adv-x="920" d="M868 254q0 -22 -27 -75q-104 -203 -329 -203q-91 0 -174 36l-83 -229l-44 18l85 232q-111 63 -177 178.5t-66 249.5q0 201 132 350t330 149q56 0 113 -14l74 203l44 -18l-72 -199q169 -62 169 -202q0 -100 -97 -100q-42 0 -70.5 28t-28.5 70q0 94 100 99q-37 36 -91 56 l-289 -792q76 -61 176.5 -61t168.5 64q40 37 74 109.5t53 72.5q29 0 29 -22zM610 896q-43 9 -97.5 9t-114.5 -34q-168 -94 -168 -405q0 -223 100 -339z" />
+<glyph unicode="&#x240;" horiz-adv-x="914" d="M914 -60q0 -69 -61 -114t-142 -45t-181 79q-21 16 -156 147q-82 79 -127 79q-30 0 -66.5 -43t-61.5 -43h-28q-38 0 -38 30q0 15 18 39l599 807h-245q-154 0 -205 -49.5t-74 -208.5h-53l44 305h671q38 0 38 -28q0 -14 -18 -38q-473 -639 -473 -642.5t29.5 -16t66.5 -40.5 q127 -94 172 -212.5t98 -118.5q46 0 70 25q-64 22 -64 91q0 39 26.5 65t66.5 26t67 -26.5t27 -67.5z" />
+<glyph unicode="&#x250;" horiz-adv-x="1070" d="M1018 732q0 -179 -213 -279q-131 -61 -394 -76v-78q0 -110 60.5 -192t166.5 -82q154 0 231 98q-46 0 -78 26.5t-32 70t28.5 71.5t71.5 28q98 0 98 -99q0 -113 -102 -178.5t-222 -65.5q-183 0 -293 119q-50 54 -63.5 108t-13.5 144v427q0 40 -20.5 74t-57.5 34 q-79 0 -79 -175q0 -28 2 -80h-55v119q0 83 47.5 142.5t122.5 59.5t120.5 -51.5t52.5 -122.5q35 85 111 135.5t186.5 50.5t205.5 -50q119 -62 119 -178zM854 729q0 78 -56.5 130.5t-135.5 52.5q-111 0 -181 -81.5t-70 -194.5v-214q171 6 291 71q152 82 152 236z" />
+<glyph unicode="&#x251;" horiz-adv-x="1159" d="M793 118q-111 -142 -295 -142t-314.5 144.5t-130.5 340.5t139.5 340.5t336.5 144.5q90 0 169 -44t114 -120l81 164h47v-761q0 -88 46 -110q20 -10 85 -10q16 0 35 1v-66l-313 -24v142zM793 253v449q0 32 -24 68q-87 129 -236 129t-238 -138q-65 -100 -65 -300t61 -299 q85 -138 224 -138q93 0 185.5 69.5t92.5 159.5z" />
+<glyph unicode="&#x252;" horiz-adv-x="1159" d="M366 804q111 142 295 142t314.5 -144.5t130.5 -340.5t-139.5 -340.5t-336.5 -144.5q-90 0 -169 44t-114 120l-81 -164h-47v761q0 88 -46 110q-20 10 -85 10q-16 0 -35 -1v66l313 24v-142zM864 161q65 100 65 300t-61 299q-85 138 -224 138q-93 0 -185.5 -69.5 t-92.5 -159.5v-449q0 -32 24 -68q87 -129 236 -129t238 138z" />
+<glyph unicode="&#x253;" horiz-adv-x="1160" d="M360 807q121 139 303.5 139t313 -145.5t130.5 -342t-139 -339.5t-327.5 -143t-290.5 157q-24 -46 -77 -133h-53v1099q0 141 95.5 240t236.5 99q72 0 132.5 -40.5t60.5 -108.5q0 -94 -95 -94q-39 0 -65.5 26t-26.5 65q0 69 64 91q-33 15 -70 15q-96 0 -149 -101 q-43 -81 -43 -187v-297zM865 162q64 99 64 300t-60 299q-85 138 -225 138q-91 0 -184 -64t-93 -150v-442q0 -45 30 -89q89 -130 234 -130t234 138z" />
+<glyph unicode="&#x254;" horiz-adv-x="920" d="M406 960q198 0 330 -149t132 -347.5t-132.5 -343t-326.5 -144.5q-225 0 -329 203q-27 53 -27 75t29 22q19 0 53 -72.5t74 -109.5q68 -64 181 -64q60 0 123 34q178 96 178 404.5t-168 402.5q-60 34 -120 34q-150 0 -229 -78q100 -5 100 -99q0 -42 -28.5 -70t-70.5 -28 q-97 0 -97 106t113 170q94 54 215 54z" />
+<glyph unicode="&#x255;" horiz-adv-x="920" d="M869 275q0 -123 -115.5 -211t-241.5 -88q-44 0 -86 8l-47 -74q-20 -38 -63 -112q-9 -15 -23 -15q-29 0 -29 26q0 24 107 190q-142 48 -230 177t-88 285q0 201 132 350t330 149q121 0 215 -54q113 -64 113 -170t-97 -106q-42 0 -70.5 28t-28.5 70q0 94 100 99 q-79 78 -229 78q-60 0 -120 -34q-168 -94 -168 -403q0 -315 182 -406q219 319 338 319t119 -106zM815 275q0 52 -63 52q-89 0 -288 -287q34 -10 67 -10q102 0 193 72t91 173z" />
+<glyph unicode="&#x256;" horiz-adv-x="1159" d="M793 118q-111 -142 -295 -142t-314.5 144.5t-130.5 340.5t139.5 340.5t336.5 144.5q163 0 270 -133v464q0 88 -47 109q-20 10 -85 10q-16 0 -35 -1v67l308 23v-1718q0 -88 46 -110q20 -10 85 -10q16 0 35 1v-66l-313 -24v560zM793 253v449q0 32 -24 68q-87 129 -236 129 t-238 -138q-65 -100 -65 -300t61 -299q85 -138 224 -138q93 0 185.5 69.5t92.5 159.5z" />
+<glyph unicode="&#x257;" horiz-adv-x="1325" d="M1325 1289q0 -94 -95 -94q-39 0 -65.5 26t-26.5 65q0 69 64 91q-33 15 -70 15q-96 0 -149 -101q-43 -81 -43 -187v-919q0 -88 46 -110q20 -10 85 -10q16 0 35 1v-66l-313 -24v142q-111 -142 -295 -142t-314.5 144.5t-130.5 340.5t139.5 340.5t336.5 144.5q163 0 270 -133 v286q0 141 96 240t237 99q72 0 132.5 -40.5t60.5 -108.5zM793 253v449q0 32 -24 68q-87 129 -236 129t-238 -138q-65 -100 -65 -300t61 -299q85 -138 224 -138q93 0 185.5 69.5t92.5 159.5z" />
+<glyph unicode="&#x258;" horiz-adv-x="933" d="M53 539q0 183 101.5 302t287 119t312.5 -147.5t127 -344.5t-136.5 -344.5t-341.5 -147.5t-315 188q-35 60 -35 88t27 28q16 0 28 -29q92 -221 290 -221q152 0 242 144q64 103 64 313v7h-605q-31 0 -38.5 7.5t-7.5 37.5zM436 911q-128 0 -192 -129q-50 -100 -50 -243h507 q-10 271 -175 349q-49 23 -90 23z" />
+<glyph unicode="&#x259;" horiz-adv-x="933" d="M88 772q110 188 315 188t341.5 -147.5t136.5 -344.5t-127 -344.5t-312.5 -147.5t-287 119t-101.5 302q0 30 7.5 37.5t38.5 7.5h605v7q0 210 -64 313q-90 144 -242 144q-198 0 -290 -221q-12 -29 -28 -29q-27 0 -27 28t35 88zM194 397q0 -143 50 -243q64 -129 192 -129 q41 0 90 23q165 78 175 349h-507z" />
+<glyph unicode="&#x25a;" horiz-adv-x="1351" d="M1083 1089l-10 -207q0 -188 118 -188q34 0 64 20q-72 11 -72 84q0 35 24.5 59.5t59.5 24.5t59.5 -24.5t24.5 -59.5q0 -63 -49 -108.5t-113 -45.5q-167 0 -167 251l6 165q0 29 -13 29t-49 -41l-218 -247q123 -145 123 -340.5t-132.5 -340t-317 -144.5t-289.5 127 q-28 34 -28 49.5t33 52.5l495 555q-80 146 -242 146q-113 0 -181 -64q-40 -37 -74 -109.5t-53 -72.5q-29 0 -29 22.5t27 74.5q106 203 329 203q171 0 298 -116l245 274q58 65 88 65q43 0 43 -94zM694 466q0 135 -35 234l-490 -555q73 -115 224 -115q60 0 123 34 q178 97 178 402z" />
+<glyph unicode="&#x25b;" horiz-adv-x="883" d="M792 280q28 0 28 -28.5t-34 -86.5q-110 -189 -326 -189q-148 0 -260 61q-138 75 -138 211q0 99 74 161.5t179 86.5q-93 22 -154 84t-61 153q0 123 132 182q98 45 221 45t210 -28q123 -40 123 -122q0 -33 -24.5 -55.5t-60.5 -22.5t-67 47q-52 77 -61 86q-47 47 -126 47 q-202 0 -202 -194q0 -188 199 -188q22 0 63 11t63 11q86 0 86 -55.5t-87 -55.5q-21 0 -62.5 11t-62.5 11q-224 0 -224 -205q0 -228 255 -228q204 0 290 221q11 29 27 29z" />
+<glyph unicode="&#x25c;" horiz-adv-x="883" d="M820 248q0 -136 -138 -211q-112 -61 -260 -61q-216 0 -326 189q-34 58 -34 86.5t28 28.5q16 0 27 -29q86 -221 290 -221q255 0 255 228q0 205 -224 205q-21 0 -62.5 -11t-62.5 -11q-87 0 -87 55.5t86 55.5q22 0 63 -11t63 -11q199 0 199 188q0 194 -202 194 q-79 0 -126 -47q-9 -9 -61 -86q-31 -47 -67 -47t-60.5 22.5t-24.5 55.5q0 82 123 122q87 28 210 28t221 -45q132 -59 132 -182q0 -91 -61 -153t-154 -84q105 -24 179 -86.5t74 -161.5z" />
+<glyph unicode="&#x25d;" horiz-adv-x="1282" d="M1014 1089l-10 -207q0 -188 118 -188q34 0 64 20q-72 11 -72 84q0 35 24.5 59.5t59.5 24.5t59.5 -24.5t24.5 -59.5q0 -63 -49 -108.5t-113 -45.5q-167 0 -167 251l6 165q0 29 -13 29t-49 -41l-165 -187q50 -53 50 -136t-61 -145t-154 -84q105 -24 179 -86.5t74 -161.5 q0 -136 -138 -211q-112 -61 -260 -61q-216 0 -326 189q-34 58 -34 86.5t28 28.5q16 0 27 -29q86 -221 290 -221q255 0 255 228q0 205 -224 205q-21 0 -62.5 -11t-62.5 -11q-87 0 -87 55.5t86 55.5q22 0 63 -11t63 -11q199 0 199 188q0 194 -202 194q-79 0 -126 -47 q-9 -9 -61 -86q-31 -47 -67 -47t-60.5 22.5t-24.5 55.5q0 82 123 122q87 28 192 28q172 0 274 -63l198 221q58 65 88 65q43 0 43 -94z" />
+<glyph unicode="&#x25e;" horiz-adv-x="977" d="M915 248q0 -135 -140 -211q-114 -61 -263 -61q-200 0 -329.5 146.5t-129.5 347.5t128 345.5t325 144.5q141 0 239 -45q132 -59 132 -182q0 -91 -61 -153t-154 -84q105 -24 179 -86.5t74 -161.5zM757 258q0 205 -224 205q-21 0 -62.5 -11t-62.5 -11q-87 0 -87 55.5 t86 55.5q22 0 63 -11t63 -11q199 0 199 188q0 93 -59.5 143.5t-156.5 50.5q-174 0 -280 -130.5t-106 -309t94 -303.5q103 -139 278 -139q255 0 255 228z" />
+<glyph unicode="&#x25f;" horiz-adv-x="597" d="M585 514h-200v-621q0 -133 -81 -232.5t-211 -99.5q-90 0 -159 40q-83 48 -83 132q0 42 27.5 70t69.5 28t70.5 -28t28.5 -70q0 -76 -74 -96q58 -29 114 -29q158 0 158 281v625h-214v68h214v168q0 39 -9 60q-20 45 -148 45h-27v68l324 23v-364h200v-68z" />
+<glyph unicode="&#x260;" horiz-adv-x="1322" d="M1322 1289q0 -94 -95 -94q-39 0 -65.5 26t-26.5 65q0 69 64 91q-33 15 -70 15q-96 0 -149 -101q-43 -81 -43 -187v-988q0 -558 -514 -558q-118 0 -201.5 54.5t-83.5 166.5q0 98 94 98q41 0 68 -26.5t27 -67.5q0 -94 -105 -94h-2q60 -74 201 -74q369 0 369 413v162 q-115 -154 -284 -154q-193 0 -324.5 130.5t-131.5 324.5t137.5 324.5t325.5 130.5t283 -169v322q0 141 96 240t237 99q72 0 132.5 -40.5t60.5 -108.5zM796 351v241q0 112 -76 206.5t-185 94.5q-146 0 -233 -134q-75 -116 -75 -267.5t67 -268.5q80 -139 218 -139 q104 0 194 82t90 185z" />
+<glyph unicode="&#x261;" horiz-adv-x="1159" d="M937 116q0 -558 -514 -558q-118 0 -201.5 54.5t-83.5 166.5q0 98 94 98q41 0 68 -26.5t27 -67.5q0 -94 -105 -94h-2q60 -74 201 -74q369 0 369 413v162q-115 -154 -284 -154q-193 0 -324.5 130.5t-131.5 324.5t137.5 324.5t334.5 130.5q92 0 169.5 -54t117.5 -140l81 194 h47v-830zM796 351v241q0 112 -76 206.5t-185 94.5q-146 0 -233 -134q-75 -116 -75 -267.5t67 -268.5q80 -139 218 -139q104 0 194 82t90 185z" />
+<glyph unicode="&#x262;" horiz-adv-x="1134" d="M1083 315h-42q-62 0 -62 -51v-236q0 -27 -20 -27q-29 0 -96 77q-80 -108 -287 -108t-365.5 141.5t-158.5 350.5t158 351t369 142q151 0 276 -110l70 90q16 20 30 20q25 0 25 -30v-340q0 -26 -29 -26t-36 28q-8 40 -34 118q-39 87 -114.5 140t-160.5 53t-155 -31 q-230 -102 -230 -404.5t232 -404.5q71 -31 155 -31t146 34q77 41 77 120v77q0 24 -6 33q-17 24 -182 24v64q58 -4 168.5 -4t271.5 4v-64z" />
+<glyph unicode="&#x263;" horiz-adv-x="1151" d="M775 39q66 -144 66 -250t-73 -168.5t-178 -62.5t-176.5 51t-71.5 145t71 230q22 43 126 210l-316 582q-31 57 -71 71q-22 8 -76 8h-23v68q119 -8 168 -8t272 8v-68h-4q-118 0 -118 -54q0 -12 253 -477l218 389q13 23 13 50q0 91 -102 92v68q131 -8 193 -8t153 8v-68 q-119 -1 -198 -142l-248 -443q99 -180 122 -231zM465.5 -344q47.5 -45 113.5 -45t99.5 43.5t33.5 113t-51 183.5q-10 23 -92 180q-151 -247 -151 -357q0 -73 47.5 -118z" />
+<glyph unicode="&#x264;" horiz-adv-x="1051" d="M999 855q-60 0 -103 -33q-27 -19 -75 -79l-215 -265q152 -177 152 -300q0 -202 -220 -202q-190 0 -190 192q0 125 139 261l-284 377q-37 49 -142 49h-8v68q120 -8 166 -8t274 8v-68h-6q-131 0 -131 -46q0 -12 8 -23l209 -277l189 234q9 11 9 30q0 80 -118 82v68 q134 -8 194 -8t152 8v-68zM646 146q0 83 -114 227q-114 -113 -114 -207q0 -56 33 -96t88 -40q107 0 107 116z" />
+<glyph unicode="&#x265;" horiz-adv-x="1181" d="M823 182h-2q-41 -93 -125 -149t-184 -56q-292 0 -292 314v502q0 65 -135 65q-15 0 -32 -1v66q200 -6 238 -6t244 6v-66q-30 1 -70.5 1t-63.5 -12q-33 -19 -33 -76v-519q0 -227 158 -227q130 0 209.5 104.5t79.5 238.5v400q0 39 -10 58q-18 33 -117 33q-18 0 -38 -1v66 q200 -6 236.5 -6t242.5 6v-66q-30 1 -72.5 1t-68 -16.5t-25.5 -80.5v-995q0 -87 44 -108q21 -10 96 -10h26v-67l-306 -23v624z" />
+<glyph unicode="&#x266;" horiz-adv-x="1181" d="M1129 0q-200 6 -238 6t-244 -6v66q30 -1 70.5 -1t63.5 12q33 19 33 76v519q0 227 -158 227q-130 0 -209.5 -104.5t-79.5 -238.5v-400q0 -39 10 -58q18 -33 117 -33q18 0 38 1v-66q-200 6 -236.5 6t-242.5 -6v66q30 -1 72.5 -1t68 16.5t25.5 80.5v937q0 141 95.5 240 t236.5 99q72 0 132.5 -40.5t60.5 -108.5q0 -94 -95 -94q-39 0 -65.5 26t-26.5 65q0 69 64 91q-33 15 -70 15q-96 0 -149 -101q-43 -81 -43 -187v-363h2q41 93 125 149t184 56q292 0 292 -314v-502q0 -65 135 -65q15 0 32 1v-66z" />
+<glyph unicode="&#x267;" horiz-adv-x="1164" d="M962 -107q0 -133 -81 -232.5t-211 -99.5q-90 0 -159 40q-83 48 -83 132q0 42 27.5 70t69.5 28t70.5 -28t28.5 -70q0 -76 -74 -96q58 -29 114 -29q158 0 158 281v743q0 267 -166 267q-130 0 -209.5 -104.5t-79.5 -238.5v-400q0 -39 10 -58q18 -33 117 -33q18 0 38 1v-66 q-200 6 -236.5 6t-242.5 -6v66q30 -1 72.5 -1t68 16.5t25.5 80.5v937q0 141 95.5 240t236.5 99q72 0 132.5 -40.5t60.5 -108.5q0 -94 -95 -94q-39 0 -65.5 26t-26.5 65q0 69 64 91q-33 15 -70 15q-96 0 -149 -101q-43 -81 -43 -187v-363h2q41 93 125 149t184 56 q292 0 292 -316v-737z" />
+<glyph unicode="&#x268;" horiz-adv-x="578" d="M335.5 1356q33.5 -33 33.5 -80.5t-33.5 -81t-80.5 -33.5t-80 34.5t-33 80t33.5 79.5t80 34t80 -33zM566 514h-207v-370q0 -59 51 -73q19 -5 69 -5h31v-66q-202 6 -233 6t-224 -6v66l44 -1q66 0 89 13q33 18 33 79v357h-207v68h207v157q0 85 -41 105q-21 11 -103 11h-14 v68l298 23v-364h207v-68z" />
+<glyph unicode="&#x269;" horiz-adv-x="748" d="M695 266q0 -114 -48 -194q-58 -96 -164 -96q-133 0 -203 78t-70 212v473q0 86 -41 106q-20 11 -103 11h-14v67l299 23v-685q0 -231 148 -231q102 0 131 139q12 56 12 182v37h53v-122z" />
+<glyph unicode="&#x26a;" horiz-adv-x="578" d="M525 0q-193 6 -236 6t-236 -6v66l44 -1q66 0 89 13q33 18 33 79v609q0 61 -33 79q-23 13 -89 13l-44 -1v66q193 -6 236 -6t236 6v-66l-44 1q-66 0 -89 -13q-33 -18 -33 -79v-609q0 -61 33 -79q23 -13 89 -13l44 1v-66z" />
+<glyph unicode="&#x26b;" horiz-adv-x="704" d="M115 66l68 -2q98 0 98 98v505q-38 17 -69 17q-79 0 -165 -99l-35 30q76 87 96 105q64 57 124 57q25 0 49 -8v508q0 87 -44 108q-21 10 -106 10h-16v67l306 23v-790q37 -17 71 -17q79 0 165 99l35 -31q-76 -87 -96 -105q-64 -57 -124 -57q-25 0 -51 9v-431q0 -50 13.5 -69 t49.5 -23q29 -4 81 -4h24v-66q-220 6 -247.5 6t-226.5 -6v66z" />
+<glyph unicode="&#x26c;" horiz-adv-x="749" d="M145 66l68 -2q98 0 98 98v352q-299 0 -299 184q0 60 35.5 99.5t94.5 39.5q100 0 169 -90v530q0 87 -44 108q-21 10 -106 10h-16v67l306 23v-903h286v-68h-286v-352q0 -50 13.5 -69t49.5 -23q29 -4 81 -4h24v-66q-220 6 -247.5 6t-226.5 -6v66zM311 582q-13 68 -61.5 129 t-112 61t-63.5 -74t90 -100q44 -12 147 -16z" />
+<glyph unicode="&#x26d;" horiz-adv-x="663" d="M703 -152q0 -114 -48 -194q-58 -96 -164 -96q-132 0 -202 78t-70 212v1429q0 87 -44 108q-21 10 -106 10h-16v67l306 23v-1642q0 -231 148 -231q102 0 131 139q12 56 12 182v37h53v-122z" />
+<glyph unicode="&#x26e;" horiz-adv-x="1147" d="M53 66l68 -2q98 0 98 98v1115q0 87 -44 108q-21 10 -106 10h-16v67l306 23v-562h688q38 0 38 -28q0 -20 -18 -38l-372 -379q179 -12 295.5 -121t116.5 -293.5t-137.5 -311t-334.5 -126.5q-121 0 -215 54q-113 64 -113 170t97 106q42 0 70.5 -28t28.5 -70q0 -94 -100 -99 q79 -78 221 -78t224 115t82 252.5t-76 220.5t-210 83q-39 0 -84 -12l-37 38l397 405h-336q-122 0 -166 -24q-59 -33 -59 -136v-461q0 -50 13.5 -69t49.5 -23q29 -4 81 -4h24v-66q-220 6 -247.5 6t-226.5 -6v66z" />
+<glyph unicode="&#x26f;" horiz-adv-x="1775" d="M1106 -23q-251 0 -284 210q-43 -95 -126.5 -152.5t-185.5 -57.5q-158 0 -224.5 81t-66.5 243q0 14 0.5 41.5t0.5 41.5v409q0 65 -132 65q-17 0 -35 -1v66q198 -6 238 -6t244 6v-66q-26 1 -70 1t-65 -13q-32 -19 -32 -84v-499q0 -238 157 -238q130 0 209.5 104.5 t79.5 238.5v401q0 39 -12 60q-18 30 -118 30q-17 0 -37 -1v66q198 -6 237.5 -6t244.5 6v-66q-26 1 -70 1t-65 -13q-32 -19 -32 -84v-499q0 -238 158 -238q130 0 209.5 104.5t79.5 238.5v397q0 47 -11 64q-18 30 -114 30q-19 0 -40 -1v66q198 -6 236 -6t243 6v-66 q-26 1 -69.5 1t-70 -16t-26.5 -81v-574q0 -87 44 -109q21 -10 96 -10h26v-68l-301 -23v225q-101 -225 -316 -225z" />
+<glyph unicode="&#x270;" horiz-adv-x="1775" d="M1106 -23q-251 0 -284 210q-43 -95 -126.5 -152.5t-185.5 -57.5q-158 0 -224.5 81t-66.5 243q0 14 0.5 41.5t0.5 41.5v409q0 65 -132 65q-17 0 -35 -1v66q198 -6 238 -6t244 6v-66q-26 1 -70 1t-65 -13q-32 -19 -32 -84v-499q0 -238 157 -238q130 0 209.5 104.5 t79.5 238.5v401q0 39 -12 60q-18 30 -118 30q-17 0 -37 -1v66q198 -6 237.5 -6t244.5 6v-66q-26 1 -70 1t-65 -13q-32 -19 -32 -84v-499q0 -238 158 -238q130 0 209.5 104.5t79.5 238.5v397q0 47 -11 64q-18 30 -114 30q-19 0 -40 -1v66q198 -6 236 -6t243 6v-66 q-26 1 -69.5 1t-70 -16t-26.5 -81v-993q0 -87 44 -109q21 -10 96 -10h26v-68l-301 -23v644q-101 -225 -316 -225z" />
+<glyph unicode="&#x271;" horiz-adv-x="1760" d="M1558 -107q0 -133 -81 -232.5t-211 -99.5q-90 0 -159 40q-83 48 -83 132q0 42 27.5 70t69.5 28t70.5 -28t28.5 -70q0 -76 -74 -96q58 -29 114 -29q158 0 158 281v743q0 267 -166 267q-130 0 -210 -105t-80 -238v-401q0 -39 12 -60q18 -30 118 -30q17 0 37 1v-66 q-198 6 -237.5 6t-244.5 -6v66q26 -1 70 -1t65 13q32 19 32 84v499q0 238 -158 238q-130 0 -209.5 -104.5t-79.5 -238.5v-397q0 -47 11 -64q18 -30 114 -30q19 0 40 1v-66q-198 6 -236 6t-243 -6v66q26 -1 69.5 -1t70 16t26.5 81v574q0 87 -44 109q-21 10 -96 10h-26v68 l301 23v-225q101 225 316 225q251 0 284 -210q43 95 126.5 152.5t185.5 57.5q292 0 292 -316v-737z" />
+<glyph unicode="&#x272;" horiz-adv-x="1207" d="M1155 0q-200 6 -238 6t-244 -6v66q29 -1 70 -1t64 12q33 19 33 76v519q0 227 -158 227q-130 0 -213.5 -109.5t-83.5 -243.5v-653q0 -133 -81 -232.5t-211 -99.5q-90 0 -159 40q-83 48 -83 132q0 42 27.5 70t69.5 28t70.5 -28t28.5 -70q0 -76 -74 -96q58 -29 114 -29 q158 0 158 281v847q0 87 -44 109q-21 10 -96 10h-26v68l301 23v-225q101 225 316 225q292 0 292 -316v-500q0 -65 135 -65q15 0 32 1v-66z" />
+<glyph unicode="&#x273;" horiz-adv-x="1356" d="M1356 -267q0 -84 -83 -132q-69 -40 -159 -40q-130 0 -211 99.5t-81 232.5v739q0 267 -166 267q-130 0 -209.5 -104.5t-79.5 -238.5v-400q0 -38 10 -58q17 -33 117 -33q17 0 38 1v-66q-199 6 -236 6t-243 -6v66q29 -1 72 -1t68.5 16.5t25.5 80.5v574q0 87 -44 109 q-21 10 -96 10h-26v68l301 23v-225q101 225 316 225q292 0 292 -316v-741q0 -281 158 -281q56 0 114 29q-74 20 -74 96q0 42 28.5 70t70.5 28t69.5 -28t27.5 -70z" />
+<glyph unicode="&#x274;" horiz-adv-x="1160" d="M954 769v-740q0 -29 -32 -29t-48 21l-611 796v-665q0 -87 151 -87h3v-65q-156 4 -182.5 4t-182.5 -4v65h3q150 0 150 87v681q0 17 -13.5 20.5t-139.5 3.5v66h287q27 0 43 -21l514 -669v540q0 86 -151 86h-3v66q153 -4 184 -4t183 4v-66h-3q-152 0 -152 -90z" />
+<glyph unicode="&#x275;" horiz-adv-x="1054" d="M191.5 118.5q-138.5 142.5 -138.5 341.5t138 349.5t336.5 150.5t336.5 -151t138 -350.5t-139 -341t-336 -141.5t-335.5 142.5zM767 773q-84 138 -244.5 138t-241.5 -143q-49 -87 -51 -256h593q-2 173 -56 261zM285 174q83 -144 246.5 -144t244.5 158q45 89 47 256h-593 q2 -178 55 -270z" />
+<glyph unicode="&#x276;" horiz-adv-x="1488" d="M786 0q-39 0 -116.5 -15t-116.5 -15q-205 0 -353 142.5t-148 347t148 350t353 145.5q39 0 114.5 -16t114.5 -16h570l44 -315h-53q-19 150 -68 203.5t-196 54.5l-182 1q-32 0 -41.5 -7.5t-9.5 -38.5v-312h153q99 0 132 29q32 28 32 120v6h53v-368h-53v6q0 92 -32 120 q-33 29 -132 29h-153v-349q0 -29 8.5 -37t38.5 -8h183q170 0 231 71q45 53 78 231h54l-66 -359h-587zM717 478v164q0 75 -9 143t-40.5 96.5t-108.5 28.5q-157 0 -255 -142q-87 -126 -87 -292t85 -303q98 -158 257 -158q79 0 110 30t39 93.5t8 157t1 182.5z" />
+<glyph unicode="&#x277;" horiz-adv-x="1419" d="M1335 467q0 -179 -91 -322q-104 -165 -273 -165q-230 0 -258 270h-6q-29 -270 -258 -270q-169 0 -274 165q-91 143 -91 322q0 235 191.5 381.5t431.5 146.5t426 -142q202 -154 202 -386zM1147 471q0 200 -119.5 338.5t-317 138.5t-318 -140t-120.5 -341q0 -428 199 -428 q100 0 151 100q40 78 40 189q0 59 -24 173.5t-24 172.5q0 114 97 114q94 0 94 -114q0 -58 -22.5 -172.5t-22.5 -173.5q0 -112 38 -189q50 -100 150 -100q199 0 199 432z" />
+<glyph unicode="&#x278;" horiz-adv-x="1195" d="M429 1265l-68 -2v66q198 -6 225.5 -6t248.5 6v-66h-24q-53 0 -82 -3q-36 -5 -49 -24t-13 -69v-211q204 -24 339.5 -169.5t135.5 -327.5t-136 -319t-339 -160v-218q0 -50 13 -69t49 -23q29 -4 82 -4h24v-66q-221 6 -248.5 6t-225.5 -6v66l68 -2q98 0 98 98v218 q-203 23 -338.5 160.5t-135.5 319.5t134.5 326.5t339.5 169.5v211q0 98 -98 98zM908 199q55 93 55 281.5t-66 282.5q-81 115 -230 142v-869q162 29 241 163zM290 757q-60 -92 -60 -284t64 -289q80 -119 233 -147v868q-159 -29 -237 -148z" />
+<glyph unicode="&#x279;" horiz-adv-x="823" d="M771 857l-67 2q-100 0 -100 -98v-574q0 -87 45 -109q22 -10 106 -10h16v-68l-297 -23v235q-76 -235 -262 -235q-60 0 -109.5 36.5t-49.5 85.5t25.5 76t65 27t66 -26t26.5 -66q0 -64 -48 -84q6 -2 14 -2q136 0 207 140q55 111 55 262v346q0 62 -56 78q-23 7 -108 7h-44v66 q81 -6 147 -6h174l194 6v-66z" />
+<glyph unicode="&#x27a;" horiz-adv-x="823" d="M771 1277l-67 2q-100 0 -100 -98v-994q0 -87 45 -109q22 -10 106 -10h16v-68l-297 -23v235q-76 -235 -262 -235q-60 0 -109.5 36.5t-49.5 85.5t25.5 76t65 27t66 -26t26.5 -66q0 -64 -48 -84q6 -2 14 -2q136 0 207 140q55 111 55 262v766q0 62 -56 78q-23 7 -108 7h-44 v66q81 -6 147 -6h174l194 6v-66z" />
+<glyph unicode="&#x27b;" horiz-adv-x="998" d="M771 857l-67 2q-100 0 -100 -98v-872q0 -281 158 -281q56 0 114 29q-74 20 -74 96q0 42 28.5 70t70.5 28t69.5 -28t27.5 -70q0 -84 -83 -132q-69 -40 -159 -40q-130 0 -211 99.5t-81 232.5v291q-81 -207 -252 -207q-60 0 -109.5 36.5t-49.5 85.5t25.5 76t65 27t66 -26 t26.5 -66q0 -64 -48 -84q6 -2 14 -2q136 0 207 140q55 111 55 262v346q0 62 -56 78q-23 7 -108 7h-44v66q81 -6 147 -6h174l194 6v-66z" />
+<glyph unicode="&#x27c;" horiz-adv-x="823" d="M53 -348l67 -2q100 0 100 98v988q0 87 -45 109q-22 10 -106 10h-16v68l297 23v-235q76 235 262 235q60 0 109.5 -36.5t49.5 -85.5t-25.5 -76t-65 -27t-66 26t-26.5 66q0 64 48 84q-6 2 -14 2q-136 0 -207 -140q-55 -111 -55 -262v-760q0 -62 56 -78q23 -7 108 -7h44v-66 q-81 6 -147 6h-174l-194 -6v66z" />
+<glyph unicode="&#x27d;" horiz-adv-x="823" d="M612 946q60 0 109.5 -36.5t49.5 -85.5t-25.5 -76t-65 -27t-66 26t-26.5 66q0 64 48 84q-6 2 -14 2q-136 0 -207 -140q-55 -111 -55 -262v-608q0 -281 158 -281q56 0 114 29q-74 20 -74 96q0 42 28.5 70t70.5 28t69.5 -28t27.5 -70q0 -84 -83 -132q-69 -40 -159 -40 q-130 0 -211 99.5t-81 232.5v843q0 87 -45 109q-22 10 -106 10h-16v68l297 23v-235q76 235 262 235z" />
+<glyph unicode="&#x27e;" horiz-adv-x="823" d="M53 66l67 -2q100 0 100 98v445q0 141 95.5 240t236.5 99q72 0 132.5 -40.5t60.5 -108.5q0 -94 -95 -94q-39 0 -65.5 26t-26.5 65q0 69 64 91q-33 15 -70 15q-96 0 -149 -101q-43 -81 -43 -187v-461q0 -62 56 -78q23 -7 108 -7h44v-66q-81 6 -147 6h-174l-194 -6v66z" />
+<glyph unicode="&#x27f;" horiz-adv-x="823" d="M678 -336l67 2v-66l-194 6h-174q-66 0 -147 -6v66h44q85 0 108 7q56 16 56 78v861q0 106 -43 187q-53 101 -149 101q-37 0 -70 -15q64 -22 64 -91q0 -39 -26.5 -65t-65.5 -26q-95 0 -95 94q0 68 60.5 108.5t132.5 40.5q141 0 236.5 -99t95.5 -240v-845q0 -98 100 -98z " />
+<glyph unicode="&#x280;" horiz-adv-x="1166" d="M1103 124q0 -64 -44 -109t-108 -45q-115 0 -189.5 49.5t-74.5 175.5v32q1 21 1 31q0 86 -35 123q-55 58 -141 58h-169v-272q0 -49 9 -68q16 -33 158 -33v-66q-198 6 -226.5 6t-249.5 -6v66q142 0 158 33q9 19 9 68v589q0 49 -9 68q-16 33 -158 33v66h484q206 0 326 -103 q77 -66 77 -147.5t-83 -143.5q-66 -50 -157 -71q86 -38 125 -102q25 -42 51.5 -147t31.5 -118q28 -74 72 -74q73 0 88 109q4 30 26 30q28 0 28 -32zM674 520q69 43 69 157.5t-83 154.5q-54 25 -165.5 25t-124.5 -5q-27 -10 -27 -75v-291h156q121 0 175 34z" />
+<glyph unicode="&#x281;" horiz-adv-x="1166" d="M1103 799q0 -32 -28 -32q-22 0 -26 30q-15 109 -88 109q-44 0 -72 -74q-5 -13 -31.5 -118t-51.5 -147q-39 -64 -125 -102q91 -21 157 -71q83 -62 83 -143.5t-70 -141.5q-127 -109 -333 -109h-484v66q142 0 158 33q9 19 9 68v589q0 49 -9 68q-16 33 -158 33v66 q221 -6 249.5 -6t226.5 6v-66q-142 0 -158 -33q-9 -19 -9 -68v-272h169q86 0 141 58q35 37 35 123q0 10 -1 31v32q0 126 74.5 175.5t189.5 49.5q64 0 108 -45t44 -109zM660 91q83 40 83 154.5t-69 157.5q-54 34 -175 34h-156v-291q0 -65 27 -75q13 -5 124.5 -5t165.5 25z " />
+<glyph unicode="&#x282;" horiz-adv-x="804" d="M752 274q0 -146 -97 -222t-242 -76t-242 93v-177q0 -106 43 -187q53 -101 149 -101q37 0 70 15q-64 22 -64 91q0 39 26.5 65t65.5 26q95 0 95 -94q0 -68 -60.5 -108.5t-132.5 -40.5q-139 0 -224.5 97.5t-85.5 241.5v434q0 32 27 32q21 0 30 -35q37 -146 92 -214 q73 -90 206 -90q103 0 172 48.5t69 146.5q0 147 -223 195q-128 28 -148 33q-82 25 -134 67q-91 75 -91 183q0 134 108 204q92 59 221.5 59t212.5 -61q60 61 82 61t22 -33v-254q0 -35 -29 -35q-23 0 -31 43l-6 60q-16 87 -81.5 132.5t-158.5 45.5t-157 -34q-81 -43 -81 -129 t94 -130q48 -22 169 -46q170 -33 243 -102q91 -86 91 -204z" />
+<glyph unicode="&#x283;" horiz-adv-x="967" d="M915 1359q0 -94 -95 -94q-39 0 -65.5 26t-26.5 65q0 69 64 91q-33 15 -70 15q-96 0 -151 -102q-46 -84 -46 -189v-1224q0 -141 -95.5 -240t-236.5 -99q-72 0 -132.5 40.5t-60.5 108.5q0 94 95 94q39 0 65.5 -26t26.5 -65q0 -69 -64 -91q33 -15 70 -15q96 0 151 102 q46 84 46 189v1224q0 141 95.5 240t236.5 99q72 0 132.5 -40.5t60.5 -108.5z" />
+<glyph unicode="&#x284;" horiz-adv-x="967" d="M915 1359q0 -94 -95 -94q-39 0 -65.5 26t-26.5 65q0 69 64 91q-33 15 -70 15q-96 0 -151 -102q-46 -84 -46 -189v-248h251v-68h-251v-594h168v-68h-168v-246q0 -141 -95.5 -240t-236.5 -99q-72 0 -132.5 40.5t-60.5 108.5q0 94 95 94q39 0 65.5 -26t26.5 -65 q0 -69 -64 -91q33 -15 70 -15q96 0 151 102q46 84 46 189v248h-251v68h251v594h-168v68h168v246q0 141 95.5 240t236.5 99q72 0 132.5 -40.5t60.5 -108.5z" />
+<glyph unicode="&#x285;" horiz-adv-x="915" d="M915 -243q0 -68 -60.5 -108.5t-132.5 -40.5q-141 0 -236.5 99t-95.5 240v662q0 105 -46 189q-55 102 -151 102q-37 0 -70 -15q64 -22 64 -91q0 -39 -26.5 -65t-65.5 -26q-95 0 -95 94q0 68 60.5 108.5t132.5 40.5q141 0 236.5 -99t95.5 -240v-662q0 -105 46 -189 q55 -102 151 -102q37 0 70 15q-64 22 -64 91q0 39 26.5 65t65.5 26q95 0 95 -94z" />
+<glyph unicode="&#x286;" horiz-adv-x="1015" d="M963 1359q0 -41 -27 -67.5t-67 -26.5t-66.5 26t-26.5 65q0 69 64 91q-33 15 -70 15q-96 0 -151 -102q-46 -84 -46 -189v-1178l-4 -59q89 -127 155 -357l-54 -19q-56 196 -121 304q-36 -95 -121.5 -152t-185.5 -57t-171 71t-71 170.5t70 170t174 70.5t194 -62v1096 q0 141 95.5 240t236.5 99q72 0 132.5 -40.5t60.5 -108.5zM438 -22v19q-88 78 -198 78q-74 0 -127.5 -53.5t-53.5 -127.5t53.5 -127.5t127.5 -53.5q94 0 146 82.5t52 182.5z" />
+<glyph unicode="&#x287;" horiz-adv-x="775" d="M393 -24v394h-305v68h305v594q0 231 -144.5 231t-144.5 -290q0 -18 1 -67h-52v122q0 113 48 193q58 96 164 96q132 0 203.5 -78t71.5 -211v-590h182v-49q-142 -5 -215 -145q-59 -111 -61 -268h-53z" />
+<glyph unicode="&#x288;" horiz-adv-x="776" d="M776 -267q0 -84 -83 -132q-69 -40 -159 -40q-131 0 -215 100t-84 233v961h-182v49q142 5 215 145q59 111 61 268h53v-394h305v-68h-305v-966q0 -281 158 -281q56 0 114 29q-74 20 -74 96q0 42 28.5 70t70.5 28t69.5 -28t27.5 -70z" />
+<glyph unicode="&#x289;" horiz-adv-x="1188" d="M1176 514h-207v-329q0 -87 45 -109q21 -10 96 -10h26v-66l-308 -24v193q-89 -193 -278.5 -193t-256.5 83t-67 280v175h-214v68h214v132q0 102 -35 126q-22 15 -119 15h-12v68l314 23v-364h447v154q0 87 -45 109q-21 10 -96 10h-26v68l315 23v-364h207v-68zM821 356v158 h-447v-278q0 -114 39 -163t156 -49t189 108q63 94 63 224z" />
+<glyph unicode="&#x28a;" horiz-adv-x="1110" d="M1038 839h-177q168 -153 168 -381q0 -197 -138.5 -339.5t-335.5 -142.5t-335.5 142.5t-138.5 339.5q0 228 168 381h-177v84q85 -8 133.5 -8t205.5 8v-52q-98 -58 -131 -173q-22 -75 -22 -222q0 -208 55 -302q84 -144 242 -144t242 144q55 94 55 302q0 147 -22 222 q-33 115 -131 173v52q157 -8 205.5 -8t133.5 8v-84z" />
+<glyph unicode="&#x28b;" horiz-adv-x="1199" d="M1146 504q0 -226 -128.5 -377t-350.5 -151q-190 0 -297.5 96.5t-107.5 284.5v421q0 40 -21 74t-58 34q-79 0 -79 -173q0 -36 3 -84h-55v120q0 83 47.5 143t132 60t132 -63t47.5 -153v-357q0 -355 250 -355q171 0 264 163q77 134 77 319q0 134 -49 249q-63 149 -179 149 q-52 0 -94 -29q80 -13 80 -96q0 -39 -27.5 -64.5t-68.5 -25.5t-66.5 29t-25.5 71q0 76 72 119.5t154 43.5q174 0 268 -143q80 -122 80 -305z" />
+<glyph unicode="&#x28c;" horiz-adv-x="1151" d="M1099 0q-120 8 -164 8t-276 -8v68q122 0 122 54q0 15 -252 634l-219 -546q-13 -32 -13 -50q0 -90 102 -92v-68q-135 8 -194.5 8t-151.5 -8v68q142 1 198 142l279 697q16 40 45 40t45 -40l309 -760q24 -60 68 -73q18 -6 83 -6h19v-68z" />
+<glyph unicode="&#x28d;" horiz-adv-x="1571" d="M1518 0q-143 8 -170.5 8t-260.5 -8v68h4q121 0 121 56q0 38 -77 245l-137 366l-183 -518q38 -105 54 -121q29 -28 129 -28v-68q-120 8 -189 8l-224 -8v68h4q124 0 124 56q0 11 -11 42l-213 595l-195 -546q-10 -28 -10 -46q0 -98 125 -101v-68q-151 8 -209.5 8t-146.5 -8 v68q131 3 179 136l252 703q14 40 42 40t42 -40l220 -608l216 606q15 42 42.5 42t44.5 -48l270 -757q19 -54 62 -68q20 -6 78 -6h17v-68z" />
+<glyph unicode="&#x28e;" horiz-adv-x="1151" d="M1099 0q-120 8 -178.5 8t-261.5 -8v68h4q116 0 116 54q0 19 -250 616l-217 -528q-14 -34 -14 -50q0 -90 101 -92v-68q-170 8 -212 8t-134 -8v68h2q140 0 197 136l377 913q101 245 274 245q76 0 136 -50t60 -124q0 -91 -89 -91q-39 0 -65 25.5t-26 63.5q0 81 85 91 q-41 38 -101 38q-93 0 -158 -92q-32 -45 -68 -130l-71 -170l321 -781q22 -54 70 -68q21 -6 74 -6h28v-68z" />
+<glyph unicode="&#x28f;" horiz-adv-x="1206" d="M1154 857q-135 0 -192 -83l-288 -416v-241q0 -21 6 -32q11 -20 149 -20v-66q-68 5 -99 5h-255q-30 0 -99 -5v66q7 0 23 -0.5t25 -0.5q90 0 101 20q4 8 4 26v248l-312 454q-26 37 -75 44q-8 1 -90 1v66q94 -4 185 -4h125q52 0 120 5v-67h-47q-56 0 -56 -24q0 -6 272 -402 l240 348q15 22 15 34q0 44 -86 44v66q116 -4 181.5 -4t152.5 5v-67z" />
+<glyph unicode="&#x290;" horiz-adv-x="1199" d="M1199 -293q0 -68 -60.5 -108.5t-132.5 -40.5q-139 0 -224.5 97.5t-85.5 241.5v103h-605q-38 0 -38 30q0 15 18 39l599 807h-245q-167 0 -223.5 -63.5t-65.5 -234.5h-53l24 345h701q38 0 38 -28q0 -14 -18 -38l-595 -803h251q182 0 248 86q51 68 65 260h55l-38 -400v-108 q0 -106 43 -187q53 -101 149 -101q37 0 70 15q-64 22 -64 91q0 39 26.5 65t65.5 26q95 0 95 -94z" />
+<glyph unicode="&#x291;" horiz-adv-x="935" d="M349 -217q-29 0 -29 24.5t107 192.5h-336q-38 0 -38 30q0 15 18 39l599 807h-245q-167 0 -223.5 -63.5t-65.5 -234.5h-53l24 345h701q38 0 38 -28q0 -14 -18 -38l-595 -803h230q222 327 342 327t120 -106q0 -125 -120 -205q-105 -70 -237 -70h-75q-36 -53 -57 -90 l-64 -112q-10 -15 -23 -15zM871 275q0 52 -63 52q-87 0 -279 -273h58q96 0 190 64.5t94 156.5z" />
+<glyph unicode="&#x292;" horiz-adv-x="948" d="M496 478q179 -12 295.5 -121t116.5 -293.5t-137.5 -311t-334.5 -126.5q-121 0 -215 54q-113 64 -113 170t97 106q42 0 70.5 -28t28.5 -70q0 -94 -100 -99q79 -78 221 -78t224 115t82 252.5t-76 220.5t-210 83q-39 0 -84 -12l-37 38l397 405h-325q-126 0 -164 -19 q-60 -30 -72 -141h-54l21 300h721q38 0 38 -28q0 -20 -18 -38z" />
+<glyph unicode="&#x293;" horiz-adv-x="948" d="M496 478q179 -12 295.5 -121t116.5 -278.5t-103 -289.5q45 -94 81 -214l-47 -17q-33 103 -73 190q-135 -122 -330 -122q-120 0 -215 54q-113 65 -113 176.5t95 179t212 67.5q171 0 300 -167q16 58 16 115q0 135 -76 218t-210 83q-39 0 -84 -12l-37 38l397 405h-325 q-126 0 -164 -19q-60 -30 -72 -141h-54l21 300h721q38 0 38 -28q0 -20 -18 -38zM415 54q-97 0 -172.5 -52.5t-75.5 -144t93 -138.5q74 -38 173 -38q178 0 263 199q-110 174 -281 174z" />
+<glyph unicode="&#x294;" horiz-adv-x="884" d="M705.5 1300q143.5 -138 143.5 -327t-124.5 -319.5t-303.5 -150.5v-347q0 -39 10 -58q17 -33 113 -33q20 0 42 1v-66q-198 6 -236 6t-243 -6v66q28 -1 71.5 -1t69 16.5t25.5 80.5v395q33 -6 83.5 -6t117.5 33q188 92 188 385t-178 384q-65 33 -126 33q-146 0 -227 -80 q98 -5 98 -98q0 -42 -27.5 -69.5t-69.5 -27.5t-69.5 27.5t-27.5 69.5q0 111 113 176q94 54 213 54q201 0 344.5 -138z" />
+<glyph unicode="&#x295;" horiz-adv-x="884" d="M849 1208q0 -42 -27.5 -69.5t-69.5 -27.5t-69.5 27.5t-27.5 69.5q0 93 98 98q-81 80 -227 80q-61 0 -126 -33q-178 -91 -178 -384t188 -385q67 -33 117.5 -33t83.5 6v-395q0 -64 25.5 -80.5t69 -16.5t71.5 1v-66q-205 6 -243 6t-236 -6v66q22 -1 42 -1q96 0 113 33 q10 19 10 58v347q-179 20 -303.5 150.5t-124.5 319.5t143.5 327t344.5 138q119 0 213 -54q113 -65 113 -176z" />
+<glyph unicode="&#x296;" horiz-adv-x="884" d="M421 911q179 -20 303.5 -150.5t124.5 -319.5t-143.5 -327t-344.5 -138q-119 0 -213 54q-113 65 -113 176q0 42 27.5 69.5t69.5 27.5t69.5 -27.5t27.5 -69.5q0 -93 -98 -98q81 -80 227 -80q61 0 126 33q178 91 178 384t-188 385q-67 33 -117.5 33t-83.5 -6v395 q0 64 -25.5 80.5t-69 16.5t-71.5 -1v66q205 -6 243 -6t236 6v-66q-22 1 -42 1q-96 0 -113 -33q-10 -19 -10 -58v-347z" />
+<glyph unicode="&#x297;" horiz-adv-x="920" d="M839 -102q29 0 29 -22.5t-27 -74.5q-106 -203 -328 -203t-352 237q-108 196 -108 440.5t106 442.5q130 242 356 242q121 0 215 -54q113 -64 113 -170t-97 -106q-42 0 -70.5 28t-28.5 70q0 94 100 99q-79 78 -232 78q-149 0 -228 -245q-57 -176 -57 -370q0 -127 30 -275.5 t85 -236.5q79 -126 189 -126t178 64q40 37 74 109.5t53 72.5z" />
+<glyph unicode="&#x298;" horiz-adv-x="1090" d="M1037 468q0 -204 -144 -348t-348 -144t-348 144t-144 348t144 348t348 144t348 -144t144 -348zM873 468q0 177 -74 296q-88 142 -254 142t-254 -142q-74 -119 -74 -296t74 -296q88 -142 254 -142t254 142q74 119 74 296zM662 468q0 -48 -34.5 -82.5t-82.5 -34.5 t-82.5 34.5t-34.5 82.5t34.5 82.5t82.5 34.5t82.5 -34.5t34.5 -82.5z" />
+<glyph unicode="&#x299;" horiz-adv-x="1118" d="M1002 251q0 -49 -27 -97q-87 -154 -315 -154h-598v66q72 0 108.5 4t47.5 25t11 72v589q0 51 -11 72t-47.5 25t-108.5 4v66h557q223 0 312 -136q31 -47 31 -95q0 -82 -73.5 -137.5t-164.5 -72.5q105 -10 191.5 -71.5t86.5 -159.5zM797 690q0 80 -55.5 123.5t-137.5 43.5 h-148q-64 0 -78 -13t-14 -75v-266h199q168 0 219 121q15 36 15 66zM608 66q93 0 158 49.5t65 138t-54.5 145.5t-140.5 57h-272v-302q0 -62 14 -75t78 -13h152z" />
+<glyph unicode="&#x29a;" horiz-adv-x="977" d="M471 960q197 0 325 -144.5t128 -345.5t-129.5 -347.5t-329.5 -146.5q-149 0 -263 61q-140 76 -140 211q0 99 74 161.5t179 86.5q-93 22 -154 84t-61 153q0 123 132 182q98 45 239 45zM753 169q94 125 94 303.5t-106 309t-280 130.5q-97 0 -156.5 -50.5t-59.5 -143.5 q0 -188 199 -188q22 0 63 11t63 11q86 0 86 -55.5t-87 -55.5q-21 0 -62.5 11t-62.5 11q-224 0 -224 -205q0 -228 255 -228q175 0 278 139z" />
+<glyph unicode="&#x29b;" horiz-adv-x="1365" d="M1365 1289q0 -94 -95 -94q-39 0 -65.5 26t-26.5 65q0 69 64 91q-33 15 -70 15q-96 0 -149 -101q-43 -81 -43 -187v-519q0 -26 -29 -26t-36 28q-8 40 -34 118q-39 87 -114.5 140t-160.5 53t-155 -31q-230 -102 -230 -404.5t232 -404.5q71 -31 155 -31t146 34q77 41 77 120 v77q0 24 -6 33q-17 24 -182 24v64q58 -4 168.5 -4t271.5 4v-64h-42q-62 0 -62 -51v-236q0 -27 -20 -27q-29 0 -96 77q-80 -108 -287 -108t-365.5 141.5t-158.5 350.5t158 351t369 142q148 0 271 -106v255q0 142 90.5 238t231.5 96q72 0 132.5 -40.5t60.5 -108.5z" />
+<glyph unicode="&#x29c;" horiz-adv-x="1178" d="M1120 0q-203 6 -238 6t-244 -6v66q140 0 157 30q10 18 10 71v281h-435v-281q0 -49 9 -68q16 -33 159 -33v-66q-203 6 -238 6t-244 -6v66q140 0 157 30q10 18 10 71v589q0 53 -10 71q-17 30 -157 30v66q209 -6 244 -6t238 6v-66q-143 0 -159 -33q-9 -19 -9 -68v-242h435 v242q0 53 -10 71q-17 30 -157 30v66q209 -6 244 -6t238 6v-66q-140 0 -157 -30q-10 -18 -10 -71v-589q0 -53 10 -71q17 -30 157 -30v-66z" />
+<glyph unicode="&#x29d;" horiz-adv-x="588" d="M386 1276q0 -47 -33.5 -81t-80 -34t-79.5 34.5t-33 80t33.5 79.5t79.5 34t79.5 -33t33.5 -80zM555 -66h-170v-41q0 -133 -81 -232.5t-211 -99.5q-90 0 -159 40q-83 48 -83 132q0 158 125 221q91 46 269 46v750q0 39 -9 60q-20 45 -148 45h-27v68l324 23v-946h170v-66z M245 -111v45q-149 0 -222 -26q-119 -43 -119 -163q0 -64 58 -100.5t125 -36.5q158 0 158 281z" />
+<glyph unicode="&#x29e;" horiz-adv-x="1139" d="M430 120q0 -50 61 -52v-68q-116 8 -214 8t-175 -8v68q133 6 270 114q174 137 174 156q0 2 -14 22l-273 383q-48 67 -89 91q-38 23 -111 23h-6v66q88 -6 168 -6t248 6v-66h-6q-70 0 -70 -49q0 -38 255 -385l136 116v222q0 51 -12 69.5t-48 23.5q-29 3 -82 3h-25v66 q121 -6 197 -6t272 6v-66q-10 0 -33 0.5t-35 0.5q-99 0 -99 -97v-995q0 -87 45 -108q21 -10 106 -10h16v-67l-307 -23v907l-302 -261q-47 -41 -47 -84z" />
+<glyph unicode="&#x29f;" horiz-adv-x="985" d="M56 0v67h6q135 0 151 30q10 18 10 70v583q0 53 -10 71q-17 30 -157 30v66q246 -6 344 -6t178 6v-66q-109 0 -150 -8.5t-51 -34.5q-7 -15 -7 -62v-591q0 -62 22.5 -75t92.5 -13q199 0 254 32q80 47 98 229h53l-38 -328h-796z" />
+<glyph unicode="&#x2a0;" horiz-adv-x="1325" d="M1325 1289q0 -94 -95 -94q-39 0 -65.5 26t-26.5 65q0 69 64 91q-33 15 -70 15q-96 0 -149 -101q-43 -81 -43 -187v-1357q0 -46 12 -67q17 -29 113 -29q19 0 41 1v-66q-166 5 -243 5t-239 -5v66q37 -2 77 -2t66 16.5t26 80.5v383q-115 -154 -284 -154q-192 0 -324 144.5 t-132 340t138 340.5t325.5 145t282.5 -169v322q0 141 96 240t237 99q72 0 132.5 -40.5t60.5 -108.5zM799 291v301q0 112 -76 206.5t-178.5 94.5t-176.5 -72q-138 -134 -138 -362q0 -152 66 -280q81 -155 219 -155q104 0 194 82t90 185z" />
+<glyph unicode="&#x2a1;" horiz-adv-x="884" d="M705.5 1300q143.5 -138 143.5 -327t-124.5 -319.5t-303.5 -150.5v-131h205v-68h-205v-148q0 -39 10 -58q17 -33 113 -33q20 0 42 1v-66q-198 6 -236 6t-243 -6v66q28 -1 71.5 -1t69 16.5t25.5 80.5v142h-206v68h206v185q33 -6 83.5 -6t117.5 33q188 92 188 385t-178 384 q-65 33 -126 33q-146 0 -227 -80q98 -5 98 -98q0 -42 -27.5 -69.5t-69.5 -27.5t-69.5 27.5t-27.5 69.5q0 111 113 176q94 54 213 54q201 0 344.5 -138z" />
+<glyph unicode="&#x2a2;" horiz-adv-x="884" d="M849 1208q0 -42 -27.5 -69.5t-69.5 -27.5t-69.5 27.5t-27.5 69.5q0 93 98 98q-81 80 -227 80q-61 0 -126 -33q-178 -91 -178 -384t188 -385q67 -33 117.5 -33t83.5 6v-185h206v-68h-206v-142q0 -64 25.5 -80.5t69 -16.5t71.5 1v-66q-205 6 -243 6t-236 -6v66q22 -1 42 -1 q96 0 113 33q10 19 10 58v148h-205v68h205v131q-179 20 -303.5 150.5t-124.5 319.5t143.5 327t344.5 138q119 0 213 -54q113 -65 113 -176z" />
+<glyph unicode="&#x2a3;" horiz-adv-x="1708" d="M793 118q-111 -142 -295 -142t-314.5 144.5t-130.5 340.5t139.5 340.5t336.5 144.5q163 0 270 -133v464q0 88 -47 109q-20 10 -85 10q-16 0 -35 -1v67l308 23v-562h672q38 0 38 -28q0 -14 -18 -38l-595 -803h251q182 0 248 86q51 68 65 260h55l-38 -400h-512l-313 -24 v142zM1229 876q-169 0 -229 -65t-60 -233v-393q0 -15 1 -27l533 718h-245zM793 253v449q0 32 -24 68q-87 129 -236 129t-238 -138q-65 -100 -65 -300t61 -299q85 -138 224 -138q93 0 185.5 69.5t92.5 159.5z" />
+<glyph unicode="&#x2a4;" horiz-adv-x="1728" d="M1276 478q179 -12 295.5 -121t116.5 -293.5t-137.5 -311t-334.5 -126.5q-121 0 -215 54q-113 64 -113 170t97 106q42 0 70.5 -28t28.5 -70q0 -94 -100 -99q79 -78 221 -78t224 115t82 252.5t-76 220.5t-210 83q-39 0 -84 -12l-37 38l397 405h-325q-136 0 -186 -30.5 t-50 -129.5v-438q0 -88 46 -110q20 -10 85 -10q16 0 35 1v-66l-313 -24v142q-111 -142 -295 -142t-314.5 144.5t-130.5 340.5t139.5 340.5t336.5 144.5q163 0 270 -133v464q0 88 -47 109q-20 10 -85 10q-16 0 -35 -1v67l308 23v-562h688q38 0 38 -28q0 -20 -18 -38zM793 253 v449q0 32 -24 68q-87 129 -236 129t-238 -138q-65 -100 -65 -300t61 -299q85 -138 224 -138q93 0 185.5 69.5t92.5 159.5z" />
+<glyph unicode="&#x2a5;" horiz-adv-x="1739" d="M1153 -217q-29 0 -29 24.5t107 192.5h-125l-313 -24v142q-111 -142 -295 -142t-314.5 144.5t-130.5 340.5t139.5 340.5t336.5 144.5q163 0 270 -133v464q0 88 -47 109q-20 10 -85 10q-16 0 -35 -1v67l308 23v-562h672q38 0 38 -28q0 -14 -18 -38l-595 -803h230 q222 327 342 327t120 -106q0 -125 -120 -205q-105 -70 -237 -70h-75q-36 -53 -57 -90l-64 -112q-10 -15 -23 -15zM1229 876q-169 0 -229 -65t-60 -233v-393q0 -15 1 -27l533 718h-245zM1675 275q0 52 -63 52q-87 0 -279 -273h58q96 0 190 64.5t94 156.5zM793 253v449 q0 32 -24 68q-87 129 -236 129t-238 -138q-65 -100 -65 -300t61 -299q85 -138 224 -138q93 0 185.5 69.5t92.5 159.5z" />
+<glyph unicode="&#x2a6;" horiz-adv-x="1421" d="M1369 274q0 -146 -97 -222t-247 -76q-87 0 -142.5 29t-101.5 70t-61.5 41t-44.5 -42.5t-53 -61.5q-45 -36 -112 -36q-132 0 -203.5 78t-71.5 211v590h-182v49q142 5 215 145q59 111 61 268h53v-394h305v-68h-305v-594q0 -231 144 -231t144 245v56q0 32 27 32q21 0 30 -35 q37 -146 92 -214q73 -90 206 -90q103 0 172 48.5t69 146.5q0 147 -223 195q-128 28 -148 33q-82 25 -134 67q-91 75 -91 183q0 134 108 204q92 59 221.5 59t212.5 -61q60 61 82 61t22 -33v-254q0 -35 -29 -35q-23 0 -31 43l-6 60q-16 87 -81.5 132.5t-158.5 45.5t-157 -34 q-81 -43 -81 -129t94 -130q48 -22 169 -46q170 -33 243 -102q91 -86 91 -204z" />
+<glyph unicode="&#x2a7;" horiz-adv-x="1387" d="M1335 1359q0 -94 -95 -94q-39 0 -65.5 26t-26.5 65q0 69 64 91q-33 15 -70 15q-96 0 -151 -102q-46 -84 -46 -189v-1224q0 -141 -95.5 -240t-236.5 -99q-72 0 -132.5 40.5t-60.5 108.5q0 94 95 94q39 0 65.5 -26t26.5 -65q0 -69 -64 -91q33 -15 70 -15q96 0 151 102 q46 84 46 189v232q-103 -201 -300 -201q-132 0 -203.5 78t-71.5 211v590h-182v49q142 5 215 145q59 111 61 268h53v-394h428v246q0 141 95.5 240t236.5 99q72 0 132.5 -40.5t60.5 -108.5zM810 369v486h-428v-594q0 -231 144 -231q111 0 197.5 112.5t86.5 226.5z" />
+<glyph unicode="&#x2a8;" horiz-adv-x="1537" d="M1486 275q0 -123 -115.5 -211t-241.5 -88q-44 0 -86 8l-47 -74q-20 -38 -63 -112q-9 -15 -23 -15q-29 0 -29 26q0 24 107 190q-179 61 -267 240q-6 -106 -59 -184.5t-152 -78.5q-132 0 -203.5 78t-71.5 211v590h-182v49q142 5 215 145q59 111 61 268h53v-394h305v-68 h-305v-594q0 -231 144 -231q101 0 131 139q13 60 13 218v74q0 201 132 350t330 149q121 0 215 -54q113 -64 113 -170t-97 -106q-42 0 -70.5 28t-28.5 70q0 94 100 99q-79 78 -229 78q-60 0 -120 -34q-168 -94 -168 -403q0 -315 182 -406q219 319 338 319t119 -106zM1432 275 q0 52 -63 52q-89 0 -288 -287q34 -10 67 -10q102 0 193 72t91 173z" />
+<glyph unicode="&#x2a9;" horiz-adv-x="1768" d="M237 6l-183 -6v66q28 -1 69 -1t64 12q34 18 34 76v702h-168v68h168v202q0 180 131 281.5t317 101.5q100 0 192 -45q113 -55 113 -144q0 -47 -34.5 -81t-81 -34t-79.5 34.5t-33 80.5q0 74 63 100q-47 43 -133 43q-141 0 -230.5 -96.5t-89.5 -238.5v-204h301l301 23v-225 q101 225 316 225q292 0 292 -316v-737q0 -133 -81 -232.5t-211 -99.5q-90 0 -159 40q-83 48 -83 132q0 42 27.5 70t69.5 28t70.5 -28t28.5 -70q0 -76 -74 -96q58 -29 114 -29q158 0 158 281v743q0 267 -166 267q-130 0 -209.5 -104.5t-79.5 -238.5v-400q0 -38 10 -58 q17 -33 117 -33q17 0 38 1v-66q-199 6 -236 6t-243 -6v66q29 -1 72 -1t68.5 16.5t25.5 80.5v574q0 87 -44 108q-23 11 -122 11h-296v-704q0 -21 7 -41q15 -44 179 -44h22v-66q-81 6 -145 6h-187z" />
+<glyph unicode="&#x2aa;" horiz-adv-x="1154" d="M53 66l68 -2q98 0 98 98v1115q0 87 -44 108q-21 10 -106 10h-16v67l306 23v-1323q0 -57 16 -73q68 -65 283 -65q341 0 341 195q0 147 -223 195q-128 28 -148 33q-82 25 -134 67q-91 75 -91 183q0 134 108 204q92 59 221.5 59t212.5 -61q60 61 82 61t22 -33v-254 q0 -35 -29 -35q-23 0 -31 43l-6 60q-16 87 -81.5 132.5t-158.5 45.5t-157 -34q-81 -43 -81 -129t94 -130q48 -22 169 -46q170 -33 243 -102q91 -86 91 -204q0 -298 -444 -298q-146 0 -227 27q-89 3 -134 3t-244 -6v66z" />
+<glyph unicode="&#x2ab;" horiz-adv-x="1127" d="M53 66l68 -2q98 0 98 98v1115q0 87 -44 108q-21 10 -106 10h-16v67l306 23v-562h672q38 0 38 -28q0 -14 -18 -38l-595 -803h251q182 0 248 86q51 68 65 260h55l-38 -400h-984v66zM648 876q-169 0 -229 -65t-60 -233v-393q0 -15 1 -27l533 718h-245z" />
+<glyph unicode="&#x2ac;" horiz-adv-x="1572" d="M1092 716q-23 -40 -45 -40t-45 40l-212 373l-218 -373q-23 -40 -45 -40t-45 40l-279 490q-28 49 -141 49h-9v68q120 -8 165 -8t275 8v-68h-6q-131 0 -131 -46q0 -9 8 -23l209 -367l187 321l-37 66q-28 49 -141 49h-9v68q120 -8 165 -8t275 8v-68h-6q-131 0 -131 -46 q0 -9 8 -23l209 -367l189 324q9 15 9 30q0 40 -37 60.5t-81 21.5v68q134 -8 194 -8t152 8v-68q-113 -1 -178 -112zM1092 16q-23 -40 -45 -40t-45 40l-212 373l-218 -373q-23 -40 -45 -40t-45 40l-279 490q-28 49 -141 49h-9v68q120 -8 165 -8t275 8v-68h-6q-131 0 -131 -46 q0 -9 8 -23l209 -367l187 321l-37 66q-28 49 -141 49h-9v68q120 -8 165 -8t275 8v-68h-6q-131 0 -131 -46q0 -9 8 -23l209 -367l189 324q9 15 9 30q0 40 -37 60.5t-81 21.5v68q134 -8 194 -8t152 8v-68q-113 -1 -178 -112z" />
+<glyph unicode="&#x2ad;" horiz-adv-x="1452" d="M1312 882q0 -36 -30.5 -36t-30.5 44v312h-1050v-312q0 -44 -30.5 -44t-30.5 41v416q0 40 45 40h1082q31 0 38 -11.5t7 -33.5v-416zM1312 62q0 -36 -30.5 -36t-30.5 44v312h-1050v-312q0 -44 -30.5 -44t-30.5 41v416q0 40 45 40h1082q31 0 38 -11.5t7 -33.5v-416z" />
+<glyph unicode="&#x2ae;" horiz-adv-x="1399" d="M1033 182h-2q-41 -93 -125 -149t-184 -56q-284 0 -284 314v321q0 106 -43 187q-53 101 -149 101q-37 0 -70 -15q64 -22 64 -91q0 -39 -26.5 -65t-65.5 -26q-95 0 -95 94q0 68 60.5 108.5t132.5 40.5q141 0 236.5 -99t95.5 -240v-356q0 -227 158 -227q130 0 209.5 104.5 t79.5 238.5v400q0 39 -10 58q-18 33 -117 33q-18 0 -38 -1v66q200 -6 236.5 -6t242.5 6v-66q-30 1 -72.5 1t-68 -16.5t-25.5 -80.5v-995q0 -87 44 -108q21 -10 96 -10h26v-67l-306 -23v624z" />
+<glyph unicode="&#x2af;" horiz-adv-x="1567" d="M1567 -267q0 -84 -83 -132q-69 -40 -159 -40q-130 0 -211 99.5t-81 232.5v289h-2q-41 -93 -125 -149t-184 -56q-284 0 -284 314v321q0 106 -43 187q-53 101 -149 101q-37 0 -70 -15q64 -22 64 -91q0 -39 -26.5 -65t-65.5 -26q-95 0 -95 94q0 68 60.5 108.5t132.5 40.5 q141 0 236.5 -99t95.5 -240v-356q0 -227 158 -227q130 0 209.5 104.5t79.5 238.5v400q0 39 -10 58q-18 33 -117 33q-18 0 -38 -1v66q200 -6 236.5 -6t242.5 6v-66q-30 1 -72.5 1t-68 -16.5t-25.5 -80.5v-872q0 -281 158 -281q56 0 114 29q-74 20 -74 96q0 42 28.5 70 t70.5 28t69.5 -28t27.5 -70z" />
+<glyph unicode="&#x2b0;" horiz-adv-x="905" d="M866 579q-150 4 -188 4t-193 -4v64q33 -1 60 -1t46 7.5t19 41.5v345q0 141 -108 141q-89 0 -148 -64.5t-59 -153.5v-266q0 -24 6 -34q10 -17 77 -17q19 0 41 1v-64q-150 4 -187 4t-192 -4v64q33 -1 61.5 -1t45.5 8t17 47v741q0 56 -38 66q-8 2 -52 2h-34v64l249 17v-471 q78 112 223 112q229 0 229 -219v-334q0 -33 90 -33q16 0 35 1v-64z" />
+<glyph unicode="&#x2b1;" horiz-adv-x="905" d="M866 579q-150 4 -188 4t-193 -4v64q33 -1 60 -1t46 7.5t19 41.5v345q0 141 -108 141q-89 0 -148 -64.5t-59 -153.5v-266q0 -23 6 -34q9 -17 77 -17q18 0 41 1v-64q-150 4 -187 4t-192 -4v64q33 -1 61.5 -1t45.5 8t17 47v623q0 103 77 169t182 66q56 0 105 -28.5t49 -80.5 q0 -73 -80 -73t-80 71q0 35 31 58q-10 2 -25 2q-65 0 -99.5 -56t-34.5 -125v-207q78 112 223 112q229 0 229 -219v-334q0 -33 90 -33q16 0 35 1v-64z" />
+<glyph unicode="&#x2b2;" horiz-adv-x="461" d="M309 1437q0 -37 -28.5 -61.5t-66 -24.5t-66 25t-28.5 61t29 60.5t66 24.5t65.5 -24t28.5 -61zM309 518q0 -97 -66 -164t-163 -67q-69 0 -130.5 31.5t-61.5 93.5q0 75 83.5 75t83.5 -75q0 -41 -38 -64q28 -9 58 -9q109 0 109 176v573q0 51 -57 58q-13 2 -40 2 q-17 0 -41 -1v65l263 17v-711z" />
+<glyph unicode="&#x2b3;" horiz-adv-x="637" d="M598 1131q0 -73 -79 -73t-79 72q0 25 17 46q-85 -9 -126 -86t-41 -171v-230q0 -40 63 -47h-1q0 1 94 1v-65q-76 5 -114 5h-144h3l-151 -4v64q9 0 29 -0.5t31 -0.5q65 0 65 55v381q0 56 -39 67q-7 2 -52 2h-34v65l242 17v-121q66 120 187 120q47 0 88 -26.5t41 -70.5z" />
+<glyph unicode="&#x2b4;" horiz-adv-x="637" d="M169 563q-47 0 -88 26.5t-41 70.5q0 73 79 73t79 -72q0 -25 -17 -46q85 9 126 86t41 171v230q0 40 -63 47h1q0 -1 -94 -1v65q76 -5 114 -5h144h-3l151 4v-64q-9 0 -29 0.5t-31 0.5q-65 0 -65 -55v-381q0 -56 39 -67q7 -2 52 -2h34v-65l-242 -17v121q-66 -120 -187 -120z " />
+<glyph unicode="&#x2b5;" horiz-adv-x="768" d="M768 412q0 -62 -61.5 -93.5t-130.5 -31.5q-97 0 -162.5 66.5t-65.5 164.5v153q-66 -107 -179 -107q-47 0 -88 26.5t-41 70.5q0 73 79 73t79 -72q0 -25 -17 -46q85 9 126 86t41 171v230q0 40 -63 47h1q0 -1 -94 -1v65q76 -5 114 -5h144h-3l151 4v-64q-9 0 -29 0.5t-31 0.5 q-65 0 -65 -55v-580q0 -176 108 -176q30 0 58 9q-38 23 -38 64q0 75 83.5 75t83.5 -75z" />
+<glyph unicode="&#x2b6;" horiz-adv-x="894" d="M846 1120q0 -31 -31 -31q-22 0 -34.5 46t-50.5 46q-35 0 -68.5 -121t-110.5 -159q159 -46 159 -145q0 -87 -114 -137q-90 -40 -191 -40h-380v64q6 0 20 -0.5t41 -0.5t40 5q25 9 25 47v398q0 34 -8.5 43.5t-32.5 11.5t-85 2v64q165 -4 197 -4t180 4v-64h-41q-48 0 -59 -4 q-25 -10 -25 -47v-177h117q110 0 120 83v69q0 160 208 160q49 0 86.5 -32t37.5 -81zM492 656q65 23 65 97t-55 100q-37 17 -118 17h-107v-196q0 -27 29 -32q-4 1 73.5 1t112.5 13z" />
+<glyph unicode="&#x2b7;" horiz-adv-x="1197" d="M793 563q-28 0 -41 33l-155 381l-153 -380q-14 -34 -41.5 -34t-42.5 38l-202 503q-14 34 -49 42q-8 1 -36 1h-33v66q121 -6 158 -6l185 6v-66l-21 1h-13q-60 0 -60 -26q0 -29 150 -381l127 317q-27 67 -44.5 78t-92.5 11v66q101 -6 152 -6l178 6v-66l-21 1h-16 q-59 0 -59 -28q0 -4 158 -396q143 355 143 366q0 56 -93 58v65q127 -6 163 -6t123 7v-66q-102 -2 -135 -85l-188 -467q-13 -33 -41 -33z" />
+<glyph unicode="&#x2b8;" horiz-adv-x="882" d="M197 287q-58 0 -107.5 35t-49.5 91q0 70 77.5 70t77.5 -69q0 -47 -49 -65q21 -10 51 -10q64 0 110 57q23 29 49 84l52 109l-239 515q-16 35 -56 42q-9 1 -38 1h-35v66q102 -6 140 -6t209 6v-66l-20 1h-12q-57 0 -57 -26q0 -16 177 -386q163 352 163 360q0 51 -76 52v65 q143 -6 165.5 -6t113.5 7v-67h-3q-108 0 -147 -84l-282 -607q-79 -169 -214 -169z" />
+<glyph unicode="&#x2b9;" horiz-adv-x="448" d="M403 1316q0 -21 -11.5 -54t-72.5 -164l-138 -295h-44l31 296q14 129 26 171q35 117 131 117q78 0 78 -71z" />
+<glyph unicode="&#x2ba;" horiz-adv-x="748" d="M403 1316q0 -21 -11.5 -54t-72.5 -164l-138 -295h-44l31 296q14 129 26 171q35 117 131 117q78 0 78 -71zM703 1316q0 -21 -11.5 -54t-72.5 -164l-138 -295h-44l31 296q14 129 26 171q35 117 131 117q78 0 78 -71z" />
+<glyph unicode="&#x2bb;" horiz-adv-x="861" d="M523 1158.5q33 -32.5 33 -81.5t-33.5 -81.5t-83.5 -32.5q-69 0 -101.5 62.5t-32.5 139.5q0 204 143 324q32 27 46 27q22 0 22 -23q0 -10 -25 -32l-45 -39q-42 -43 -69 -119t-27 -141v-13q33 42 86.5 42t86.5 -32.5z" />
+<glyph unicode="&#x2bc;" horiz-adv-x="861" d="M556 1314q0 -204 -143 -324q-32 -27 -46 -27q-22 0 -22 23q0 10 25 32l45 39q42 43 69 119t27 141v13q-33 -42 -86.5 -42t-86.5 32.5t-33 81.5t33.5 81.5t83.5 32.5q69 0 101.5 -62.5t32.5 -139.5z" />
+<glyph unicode="&#x2bd;" horiz-adv-x="861" d="M522.5 1483.5q33.5 -32.5 33.5 -81.5t-33 -81.5t-86.5 -32.5t-86.5 42v-13q0 -65 27 -141t69 -119l45 -39q25 -22 25 -32q0 -23 -22 -23q-14 0 -46 27q-143 120 -143 324q0 77 32.5 139.5t101.5 62.5q50 0 83.5 -32.5z" />
+<glyph unicode="&#x2be;" horiz-adv-x="682" d="M438 1233q0 -81 -55.5 -136.5t-135.5 -55.5v70q51 0 86.5 35.5t35.5 86.5t-35.5 86.5t-86.5 35.5v69q81 0 136 -55t55 -136z" />
+<glyph unicode="&#x2bf;" horiz-adv-x="682" d="M438 1041q-80 0 -135.5 55.5t-55.5 136.5t55 136t136 55v-69q-51 0 -86.5 -35.5t-35.5 -86.5t35.5 -86.5t86.5 -35.5v-70z" />
+<glyph unicode="&#x2c0;" horiz-adv-x="682" d="M281 1555q147 0 261 -91.5t114 -225.5t-95.5 -221.5t-224.5 -102.5v-335h-131v392q37 -6 71.5 -6t84.5 22q135 59 135 246t-128 246q-46 21 -90 21q-88 0 -145 -37q59 -16 59 -71q0 -74 -83 -74t-83 74q0 81 91 126q74 37 164 37z" />
+<glyph unicode="&#x2c1;" horiz-adv-x="682" d="M656 1392q0 -74 -82.5 -74t-82.5 74q0 55 58 71q-57 37 -145 37q-44 0 -90 -21q-128 -59 -128 -246t135 -246q50 -22 85 -22t72 6v-392h-131v335q-129 15 -225 102.5t-96 221.5t114.5 225.5t261.5 91.5q90 0 163 -37q91 -45 91 -126z" />
+<glyph unicode="&#x2c2;" horiz-adv-x="1155" d="M1115 187l-1076 470v49l1076 466v-87l-926 -402l926 -406v-90z" />
+<glyph unicode="&#x2c3;" horiz-adv-x="1155" d="M1113 653l-1076 -466v86l927 402l-927 406v91l1076 -470v-49z" />
+<glyph unicode="&#x2c4;" horiz-adv-x="1155" d="M1068 142h-90l-406 926l-402 -926h-87l466 1076h49z" />
+<glyph unicode="&#x2c5;" horiz-adv-x="1155" d="M1068 1218l-470 -1076h-49l-466 1076h87l402 -926l406 926h90z" />
+<glyph unicode="&#x2c6;" horiz-adv-x="682" d="M623 1054h-31l-273 213l-229 -213h-30l189 331h184z" />
+<glyph unicode="&#x2c7;" horiz-adv-x="682" d="M623 1385l-189 -331h-184l-190 331h31l273 -212l229 212h30z" />
+<glyph unicode="&#x2c8;" horiz-adv-x="682" d="M392 1088h-103v332h103v-332z" />
+<glyph unicode="&#x2c9;" horiz-adv-x="682" d="M661 1225h-638v128h638v-128z" />
+<glyph unicode="&#x2ca;" horiz-adv-x="682" d="M565 1390l-295 -345h-34l105 345h224z" />
+<glyph unicode="&#x2cb;" horiz-adv-x="682" d="M447 1045h-35l-294 345h223z" />
+<glyph unicode="&#x2cc;" horiz-adv-x="682" d="M392 -420h-103v332h103v-332z" />
+<glyph unicode="&#x2cd;" horiz-adv-x="682" d="M653 -278h-624v128h624v-128z" />
+<glyph unicode="&#x2ce;" horiz-adv-x="682" d="M447 -438h-35l-294 345h223z" />
+<glyph unicode="&#x2cf;" horiz-adv-x="682" d="M565 -93l-295 -345h-34l105 345h224z" />
+<glyph unicode="&#x2d0;" horiz-adv-x="569" d="M387 929l-90 -205h-25l-90 205h205zM387 0h-205l90 205h25z" />
+<glyph unicode="&#x2d1;" horiz-adv-x="569" d="M387 929l-90 -205h-25l-90 205h205z" />
+<glyph unicode="&#x2d2;" horiz-adv-x="682" d="M438 292q0 -81 -55.5 -136.5t-135.5 -55.5v70q51 0 86.5 35.5t35.5 86.5t-35.5 86.5t-86.5 35.5v69q81 0 136 -55t55 -136z" />
+<glyph unicode="&#x2d3;" horiz-adv-x="682" d="M438 100q-80 0 -135.5 55.5t-55.5 136.5t55 136t136 55v-69q-51 0 -86.5 -35.5t-35.5 -86.5t35.5 -86.5t86.5 -35.5v-70z" />
+<glyph unicode="&#x2d4;" horiz-adv-x="682" d="M515 178h-349v103h123v229h103v-229h123v-103z" />
+<glyph unicode="&#x2d5;" horiz-adv-x="682" d="M515 407h-123v-229h-103v229h-123v103h349v-103z" />
+<glyph unicode="&#x2d6;" horiz-adv-x="682" d="M515 293h-123v-115h-103v115h-123v103h123v114h103v-114h123v-103z" />
+<glyph unicode="&#x2d7;" horiz-adv-x="682" d="M653 323h-624v149h624v-149z" />
+<glyph unicode="&#x2d8;" horiz-adv-x="682" d="M341 1078q-118 0 -197 80.5t-89 199.5h31q33 -60 76 -86q73 -43 181 -43t180 42q51 30 71 87h33q-9 -119 -88.5 -199.5t-197.5 -80.5z" />
+<glyph unicode="&#x2d9;" horiz-adv-x="682" d="M451 1228q0 -45 -32 -77t-77 -32t-77 32t-32 77.5t31.5 77t77 31.5t77.5 -32t32 -77z" />
+<glyph unicode="&#x2da;" horiz-adv-x="682" d="M477 1368.5q56 -55.5 56 -136t-55.5 -136t-136 -55.5t-136 56t-55.5 136t55.5 135.5t135.5 55.5t136 -55.5zM463 1233q0 51 -35.5 86.5t-86.5 35.5t-86.5 -35.5t-35.5 -86.5t35.5 -86.5t86.5 -35.5t86.5 35.5t35.5 86.5z" />
+<glyph unicode="&#x2db;" horiz-adv-x="682" d="M366 -339q-90 -90 -171 -90t-125 47q-40 43 -40 103v8q5 129 193 277l69 54h35l-57 -62q-108 -116 -111 -212v-7q0 -47 26 -80q28 -35 75.5 -35t90.5 26z" />
+<glyph unicode="&#x2dc;" horiz-adv-x="682" d="M471 1093q-79 0 -182 70.5t-143 70.5t-64 -36q-11 -17 -28 -101h-32q8 259 188 259q41 0 70 -11t124 -69.5t131 -58.5q72 0 95 139h31v-7q0 -162 -96 -225q-47 -31 -94 -31z" />
+<glyph unicode="&#x2dd;" horiz-adv-x="682" d="M644 1390l-218 -346h-34l65 346h187zM331 1390l-220 -346h-33l66 346h187z" />
+<glyph unicode="&#x2de;" horiz-adv-x="682" d="M273 407q-37 0 -72 15q-132 56 -132 274v10q-28 -21 -69 -37l-17 43q85 24 92 87l38 -7q9 -191 137 -243q30 -12 62 -12q83 0 150 78l21 -48q-25 -68 -83 -114t-127 -46z" />
+<glyph unicode="&#x2df;" horiz-adv-x="782" d="M737 826l-96 -96l-250 251l-250 -251l-96 96l251 250l-251 250l96 96l250 -251l250 251l96 -96l-251 -250z" />
+<glyph unicode="&#x2e0;" horiz-adv-x="882" d="M843 1147q-93 0 -149 -89l-183 -289q139 -222 139 -310t-59.5 -131t-138.5 -43t-137.5 36t-58.5 102.5t53 156.5q18 31 93 138l-233 382q-22 36 -47 42q-21 5 -66 5h-16v66q101 -6 165 -6l184 6v-66l-19 1h-16q-56 0 -56 -26q0 -10 180 -299l154 245q9 14 9 28 q0 50 -77 51v66q110 -6 149.5 -6t129.5 7v-67zM533 429q0 67 -97 229q-103 -149 -103 -219q0 -46 34 -72t82 -26q84 0 84 88z" />
+<glyph unicode="&#x2e1;" horiz-adv-x="454" d="M415 579q-166 4 -195.5 4t-179.5 -4v64q8 0 29 -0.5t32 -0.5q63 0 63 55v741q0 56 -38 66q-8 2 -86 2v64l249 17v-890q0 -31 9 -40q13 -14 98 -14h19v-64z" />
+<glyph unicode="&#x2e2;" horiz-adv-x="623" d="M505 614.5q-78 -51.5 -185 -51.5t-181 58q-53 -58 -73 -58q-26 0 -26 32v214q0 31 30 31q24 0 32 -30q27 -97 74 -146t140 -49q170 0 170 120q0 88 -159 119q-97 19 -112 23q-63 16 -103 46q-72 53 -72 129q0 97 89 146q71 39 167 39t159 -38q41 38 61 38q28 0 28 -32 v-169q0 -33 -32 -33q-23 0 -31 29q-4 24 -7 48q-22 110 -169 110q-169 0 -169 -98q0 -53 72 -80q31 -12 139.5 -30.5t164.5 -66.5q71 -60 71 -154.5t-78 -146z" />
+<glyph unicode="&#x2e3;" horiz-adv-x="906" d="M867 578q-86 5 -150 5t-197 -4v64q58 2 58 26q0 5 -147 174q-133 -134 -133 -165.5t47 -35.5v-63q-106 4 -168.5 4t-136.5 -5v65q116 0 204 77q8 7 148 168l-154 177q-54 62 -78.5 72t-112.5 10v66q92 -6 133.5 -6t212.5 6v-65q-56 -1 -56 -25q0 -13 128 -155 q115 127 115 146q0 32 -47 34v65q91 -6 154 -6t151 6v-65q-114 -2 -194 -69q-16 -14 -141 -156l209 -239q36 -41 150 -41h5v-65z" />
+<glyph unicode="&#x2e4;" horiz-adv-x="682" d="M656 1392q0 -74 -82.5 -74t-82.5 74q0 55 58 71q-57 37 -145 37q-44 0 -90 -21q-128 -59 -128 -246t135 -246q50 -22 85 -22t72 6v-274q0 -39 17 -47t47 -8t60 1v-64q-154 4 -192 4t-187 -4v65q32 -2 60 -2t41 6q23 9 23 45v221q-129 15 -225 102.5t-96 221.5 t114.5 225.5t261.5 91.5q90 0 163 -37q91 -45 91 -126z" />
+<glyph unicode="&#x2e5;" horiz-adv-x="784" d="M634 0h-156v1310h-328v156h484v-1466z" />
+<glyph unicode="&#x2e6;" horiz-adv-x="784" d="M634 0h-156v982h-328v156h328v328h156v-1466z" />
+<glyph unicode="&#x2e7;" horiz-adv-x="784" d="M634 0h-156v655h-328v156h328v655h156v-1466z" />
+<glyph unicode="&#x2e8;" horiz-adv-x="784" d="M634 0h-156v328h-328v156h328v982h156v-1466z" />
+<glyph unicode="&#x2e9;" horiz-adv-x="784" d="M634 0h-484v156h328v1310h156v-1466z" />
+<glyph unicode="&#x2ea;" horiz-adv-x="682" d="M585 0h-487v880h94v-786h393v-94z" />
+<glyph unicode="&#x2eb;" horiz-adv-x="682" d="M585 393h-393v-393h-94v880h94v-393h393v-94z" />
+<glyph unicode="&#x2ec;" horiz-adv-x="682" d="M623 -107l-189 -331h-184l-190 331h31l253 -212l249 212h30z" />
+<glyph unicode="&#x2ed;" horiz-adv-x="682" d="M661 1005h-638v128h638v-128zM661 1225h-638v128h638v-128z" />
+<glyph unicode="&#x2ee;" horiz-adv-x="909" d="M851 1185q0 -114 -72.5 -195.5t-186.5 -118.5v42q164 85 164 205q0 62 -32 62q-11 0 -36 -8t-39 -8q-42 0 -72 31.5t-30 78t38 80t90 33.5q77 0 126.5 -61.5t49.5 -140.5zM372 1186q0 -234 -257 -315v42q81 45 122.5 91t41.5 111t-34 65q-11 0 -36.5 -8t-39.5 -8 q-43 0 -72.5 30t-29.5 77t40 81.5t92 34.5q76 0 124.5 -61.5t48.5 -139.5z" />
+<glyph unicode="&#x2ef;" horiz-adv-x="682" d="M537 -114l-122 -265h-147l-122 265h24l170 -180l172 180h25z" />
+<glyph unicode="&#x2f0;" horiz-adv-x="682" d="M537 -379h-25l-172 180l-170 -180h-24l122 265h147z" />
+<glyph unicode="&#x2f1;" horiz-adv-x="682" d="M474 -442l-265 122v147l265 122v-24l-180 -170l180 -172v-25z" />
+<glyph unicode="&#x2f2;" horiz-adv-x="682" d="M474 -320l-265 -122v25l180 172l-180 170v24l265 -122v-147z" />
+<glyph unicode="&#x2f3;" horiz-adv-x="682" d="M479 -110q55 -55 55 -136.5t-55 -136.5t-136 -55t-136.5 55.5t-55.5 136.5t55 136t136.5 55t136.5 -55zM428.5 -332.5q35.5 35.5 35.5 87t-35 86.5t-86.5 35t-87 -35.5t-35.5 -86t36 -86.5t86.5 -36t86 35.5z" />
+<glyph unicode="&#x2f4;" horiz-adv-x="682" d="M447 178h-35l-294 345h223z" />
+<glyph unicode="&#x2f5;" horiz-adv-x="682" d="M644 178h-33l-220 346h187zM330 178h-34l-218 346h187z" />
+<glyph unicode="&#x2f6;" horiz-adv-x="682" d="M644 524l-218 -346h-34l65 346h187zM331 524l-220 -346h-33l66 346h187z" />
+<glyph unicode="&#x2f7;" horiz-adv-x="682" d="M470 -387q-79 0 -182 70.5t-143 70.5t-64 -36q-11 -17 -28 -101h-32q8 259 188 259q41 0 69 -11t124.5 -69.5t131.5 -58.5q72 0 95 139h31v-7q0 -162 -96 -225q-47 -31 -94 -31z" />
+<glyph unicode="&#x2f8;" horiz-adv-x="569" d="M368 1355q32 -32 32 -78.5t-32.5 -79t-78 -32.5t-78.5 33t-33 78.5t32.5 78t79 32.5t78.5 -32zM366.5 605.5q32.5 -32.5 32.5 -79t-33 -79t-78.5 -32.5t-78.5 33t-33 78.5t32.5 78.5t79 33t79 -32.5z" />
+<glyph unicode="&#x2f9;" horiz-adv-x="682" d="M518 1253h-246v-229h-103v332h349v-103z" />
+<glyph unicode="&#x2fa;" horiz-adv-x="682" d="M518 1024h-103v229h-246v103h349v-332z" />
+<glyph unicode="&#x2fb;" horiz-adv-x="682" d="M518 -420h-349v332h103v-229h246v-103z" />
+<glyph unicode="&#x2fc;" horiz-adv-x="682" d="M518 -420h-349v103h246v229h103v-332z" />
+<glyph unicode="&#x2fd;" horiz-adv-x="814" d="M784 -420h-754v376h154v-222h446v222h154v-376z" />
+<glyph unicode="&#x2fe;" horiz-adv-x="814" d="M784 -420h-754v376h154v-222h600v-154z" />
+<glyph unicode="&#x2ff;" horiz-adv-x="682" d="M625 -177h-439l166 -243h-94l-200 283v14l200 283h94l-166 -243h439v-94z" />
+<glyph unicode="&#x300;" horiz-adv-x="0" d="M426 1476q-28 23 -28 54t23 53.5t54 22.5t53 -29l248 -322l-37 -35z" />
+<glyph unicode="&#x301;" horiz-adv-x="0" d="M753 1583.5q23 -22.5 23 -53.5t-28 -54l-313 -256l-37 35l248 322q22 29 53 29t54 -22.5z" />
+<glyph unicode="&#x302;" horiz-adv-x="0" d="M939 1339l-29 -41l-324 202l-323 -202l-28 41l351 267z" />
+<glyph unicode="&#x303;" horiz-adv-x="0" d="M832 1470q-65 -57 -119 -57t-136 49.5t-130 49.5q-79 0 -165 -99l-35 30q73 86 95 105q64 58 118 58t136.5 -50t130.5 -50q79 0 165 99l35 -31q-73 -84 -95 -104z" />
+<glyph unicode="&#x304;" horiz-adv-x="0" d="M878 1435h-582v82h582v-82z" />
+<glyph unicode="&#x305;" horiz-adv-x="0" d="M1099 1445q0 -41 -37 -41h-948q-39 0 -39 41t39 41h948q37 0 37 -41z" />
+<glyph unicode="&#x306;" horiz-adv-x="0" d="M587 1333q-111 0 -193 78t-105 195h49q24 -86 92 -140.5t157 -54.5t157.5 54.5t92.5 140.5h48q-23 -117 -105 -195t-193 -78z" />
+<glyph unicode="&#x307;" horiz-adv-x="0" d="M666 1574q32 -32 32 -78.5t-32 -79t-78 -32.5t-79 33.5t-33 78t33.5 77.5t79 33t77.5 -32z" />
+<glyph unicode="&#x308;" horiz-adv-x="0" d="M440 1574q32 -32 32 -78.5t-32 -79t-78 -32.5t-79 33.5t-33 78t33.5 77.5t79 33t77.5 -32zM892 1574q32 -32 32 -78.5t-32 -79t-78 -32.5t-78.5 33.5t-32.5 78t33 77.5t78.5 33t77.5 -32z" />
+<glyph unicode="&#x30a;" horiz-adv-x="0" d="M708 1557q50 -49 50 -120.5t-49.5 -122t-120.5 -50.5t-121.5 51.5t-50.5 120.5t51 119.5t121 50.5t120 -49zM666 1356.5q32 32.5 32 79t-32 78.5t-77.5 32t-79 -33t-33.5 -77.5t33 -78t79 -33.5t78 32.5z" />
+<glyph unicode="&#x30b;" horiz-adv-x="0" d="M922.5 1586.5q22.5 -19.5 22.5 -42.5t-24 -56l-182 -248q-14 7 -41 23l107 286q21 57 67 57q28 0 50.5 -19.5zM592 1586.5q22 -19.5 22 -43t-23 -55.5l-181 -248q-14 7 -41 23l106 286q21 57 67 57q28 0 50 -19.5z" />
+<glyph unicode="&#x30c;" horiz-adv-x="0" d="M939 1565l-351 -267l-353 267l29 41l324 -202l322 202z" />
+<glyph unicode="&#x30f;" horiz-adv-x="0" d="M603 1488q-24 33 -24 56t22.5 42.5t50.5 19.5q46 0 67 -57l106 -286q-10 -8 -41 -23zM272 1488q-23 31 -23 55t22 43.5t50 19.5q46 0 67 -57l107 -286q-10 -7 -41 -23z" />
+<glyph unicode="&#x310;" horiz-adv-x="0" d="M695 1497q0 -44 -32 -76t-76 -32t-76.5 32t-32.5 76t32.5 76.5t76.5 32.5t76 -32.5t32 -76.5zM587 1149q-113 0 -194 79t-104 194h49q24 -86 92.5 -140.5t156.5 -54.5t156.5 54.5t92.5 140.5h49q-23 -115 -104 -194t-194 -79z" />
+<glyph unicode="&#x311;" horiz-adv-x="0" d="M587 1528q-88 0 -156.5 -54.5t-92.5 -140.5h-49q23 115 104 194t194 79t194 -79t104 -194h-49q-24 86 -92.5 140.5t-156.5 54.5z" />
+<glyph unicode="&#x312;" horiz-adv-x="0" d="M769 1579q0 -13 -34 -23t-61 -17q-129 -47 -157 -177q28 21 71 21t78 -32t35 -79.5t-32 -82t-86 -34.5t-86 42t-32 104q0 107 67 189t172 109q27 7 43 7q22 0 22 -27z" />
+<glyph unicode="&#x317;" horiz-adv-x="0" d="M723 -78.5q23 -22.5 23 -53.5t-28 -54l-313 -256l-37 35l248 322q22 29 53 29t54 -22.5z" />
+<glyph unicode="&#x323;" horiz-adv-x="0" d="M666 -226q32 -32 32 -78.5t-32 -79t-78 -32.5t-79 33.5t-33 78t33.5 77.5t79 33t77.5 -32z" />
+<glyph unicode="&#x326;" horiz-adv-x="0" d="M706 -166q0 -97 -60.5 -171t-155.5 -99q-22 -6 -40 -6q-22 0 -22 26q0 13 31 22l56 16q112 40 139 153q-25 -16 -62.5 -16t-70 29t-32.5 72.5t29.5 75.5t79 32t79 -38.5t29.5 -95.5z" />
+<glyph unicode="&#x327;" horiz-adv-x="0" d="M819 -185q0 -161 -376 -161h-88v43q327 0 327 118q0 56 -42 87t-101 32v127h96v-95q70 -11 127 -49.5t57 -101.5z" />
+<glyph unicode="&#x328;" horiz-adv-x="0" d="M518 -367q-68 0 -127 41t-59 108t71 126q41 35 145.5 91t136.5 87l20 -35l-135 -115q-92 -83 -92 -138q0 -34 31.5 -54.5t67.5 -20.5q97 0 158 108l37 -27q-98 -171 -254 -171z" />
+<glyph unicode="&#x32c;" horiz-adv-x="0" d="M939 -175l-351 -267l-353 267l29 41l324 -202l322 202z" />
+<glyph unicode="&#x32d;" horiz-adv-x="0" d="M939 -401l-29 -41l-324 202l-323 -202l-28 41l351 267z" />
+<glyph unicode="&#x32e;" horiz-adv-x="0" d="M587 -442q-111 0 -193 78t-105 195h49q24 -86 92 -140.5t157 -54.5t157.5 54.5t92.5 140.5h48q-23 -117 -105 -195t-193 -78z" />
+<glyph unicode="&#x330;" horiz-adv-x="0" d="M832 -350q-65 -57 -119 -57t-136 49.5t-130 49.5q-79 0 -165 -99l-35 30q73 86 95 105q64 58 118 58t136.5 -50t130.5 -50q79 0 165 99l35 -31q-73 -84 -95 -104z" />
+<glyph unicode="&#x333;" horiz-adv-x="0" d="M1099 -391q0 -41 -37 -41h-948q-39 0 -39 41t39 41h948q37 0 37 -41zM1099 -171q0 -41 -37 -41h-948q-39 0 -39 41t39 41h948q37 0 37 -41z" />
+<glyph unicode="&#x334;" horiz-adv-x="0" d="M1079 659q0 -111 -71.5 -195t-175.5 -84t-251.5 116.5t-233.5 116.5q-138 0 -179 -131q-6 -29 -15.5 -65t-27.5 -36q-30 0 -30 57q0 109 72.5 193.5t176.5 84.5t251 -117t236.5 -117t136.5 60q27 35 46 104t37 69q28 0 28 -56z" />
+<glyph unicode="&#x335;" horiz-adv-x="0" d="M1012 582q0 -41 -37 -41h-774q-39 0 -39 41t39 41h774q37 0 37 -41z" />
+<glyph unicode="&#x336;" horiz-adv-x="0" d="M2049 582q0 -41 -37 -41h-1674q-39 0 -39 41t39 41h1674q37 0 37 -41z" />
+<glyph unicode="&#x337;" horiz-adv-x="0" d="M854 1205q0 -7 -2 -13l-453 -1248q-9 -26 -40 -26q-39 0 -39 41q0 7 2 13l453 1248q9 26 40 26q39 0 39 -41z" />
+<glyph unicode="&#x338;" horiz-adv-x="0" d="M964 1505q0 -8 -2 -13l-673 -1848q-9 -26 -40 -26q-39 0 -39 41q0 8 2 13l673 1848q9 26 40 26q39 0 39 -41z" />
+<glyph unicode="&#x33f;" horiz-adv-x="0" d="M1099 1335q0 -41 -37 -41h-948q-39 0 -39 41t39 41h948q37 0 37 -41zM1099 1555q0 -41 -37 -41h-948q-39 0 -39 41t39 41h948q37 0 37 -41z" />
+<glyph unicode="&#x346;" horiz-adv-x="0" d="M878 1354h-81v100h-419v-100h-82v182h582v-182z" />
+<glyph unicode="&#x34d;" horiz-adv-x="0" d="M1117 -241q0 -18 -43 -41q-117 -62 -179 -127q-32 -33 -48 -33q-31 0 -31 32.5t128 129.5h-714q128 -97 128 -129.5t-31 -32.5q-16 0 -48 33q-62 65 -179 127q-43 23 -43 41t43 41q117 62 179 127q32 33 48 33q31 0 31 -32.5t-128 -129.5h714q-128 97 -128 129.5t31 32.5 q16 0 48 -33q62 -65 179 -127q43 -23 43 -41z" />
+<glyph unicode="&#x34f;" horiz-adv-x="0" />
+<glyph unicode="&#x359;" horiz-adv-x="0" d="M775 -313q0 -47 -43 -47q-14 0 -23 8l-102 86l23 -136q0 -40 -43 -40t-43 40v3l23 133l-102 -86q-9 -8 -22 -8q-44 0 -44 47q0 27 23 35l126 46l-126 47q-23 9 -23 35q0 47 44 47q13 0 22 -8l102 -86l-23 136q0 40 43 40t43 -40v-2l-23 -134l102 86q9 8 23 8q43 0 43 -47 q0 -27 -22 -35l-126 -47l126 -46q22 -8 22 -35z" />
+<glyph unicode="&#x35c;" horiz-adv-x="0" d="M2088 -121q0 -15 -15 -28q-174 -145 -413.5 -219t-485.5 -74t-485.5 74t-413.5 219q-15 13 -15 28q0 41 41 41q25 0 77 -30l95 -57q295 -160 701 -160t701 160l95 57q52 30 77 30q41 0 41 -41z" />
+<glyph unicode="&#x35d;" horiz-adv-x="0" d="M2088 1565q0 -15 -15 -28q-174 -145 -413.5 -219t-485.5 -74t-485.5 74t-413.5 219q-15 13 -15 28q0 41 41 41q25 0 77 -30l95 -57q295 -160 701 -160t701 160l95 57q52 30 77 30q41 0 41 -41z" />
+<glyph unicode="&#x35e;" horiz-adv-x="0" d="M2046 1445q0 -41 -37 -41h-1668q-39 0 -39 41t39 41h1668q37 0 37 -41z" />
+<glyph unicode="&#x35f;" horiz-adv-x="0" d="M2057 -377h-1766v92h1766v-92z" />
+<glyph unicode="&#x360;" horiz-adv-x="0" d="M2033 1606q26 0 26 -34t-37 -104q-117 -223 -382 -223q-169 0 -484 111.5t-489.5 111.5t-264.5 -118q-7 -9 -53 -102q-12 -24 -34 -24q-26 0 -26 34t37 104q117 223 382 223q169 0 484.5 -111t489.5 -111t264 117q7 9 53 102q12 24 34 24z" />
+<glyph unicode="&#x361;" horiz-adv-x="0" d="M2088 1285q0 -41 -41 -41q-25 0 -77 30l-95 57q-295 160 -701 160t-701 -160l-95 -57q-52 -30 -77 -30q-41 0 -41 41q0 15 15 28q174 145 413.5 219t485.5 74t485.5 -74t413.5 -219q15 -13 15 -28z" />
+<glyph unicode="&#x362;" horiz-adv-x="0" d="M291 -357v92l1528 9v76l238 -125v-12l-238 -125v76l13 9h-1541z" />
+<glyph unicode="&#x370;" horiz-adv-x="1153" d="M649 1284l-55 2q-123 0 -142 -36q-8 -16 -8 -45v-477h375q134 0 173.5 46.5t39.5 182.5h54v-521h-54q0 136 -40 183t-173 47h-375v-525q0 -29 8 -45q18 -35 187 -35h10v-61q-71 6 -115 6h-358q-37 0 -108 -6v61q9 0 27.5 -0.5t28.5 -0.5q121 0 139 36q7 14 7 45v1064 q0 31 -7 45q-17 34 -149 34h-46v62q70 -6 112 -6h354q45 0 115 6v-62z" />
+<glyph unicode="&#x371;" horiz-adv-x="849" d="M797 431h-446v-431h-141v739q0 86 -41 106q-20 11 -103 11h-14v67l299 23v-415h446v-100z" />
+<glyph unicode="&#x372;" horiz-adv-x="1511" d="M943 1271q-100 0 -100 -79v-1052q0 -53 40 -70q24 -11 64.5 -11t79.5 1v-61q-68 6 -113 6h-317q-45 0 -113 -6v61q39 -1 79.5 -1t64.5 11q40 17 40 70v1052q0 79 -100 79q-240 0 -332 -187q-53 -108 -80 -398h-76l42 657h1267l42 -657h-76q-27 290 -80 398 q-92 187 -332 187z" />
+<glyph unicode="&#x373;" horiz-adv-x="1122" d="M1073 630h-45q-6 76 -48.5 129.5t-115.5 53.5h-229v-813h-148v813h-229q-73 0 -115.5 -53.5t-48.5 -129.5h-45v35q0 95 72.5 176.5t166.5 81.5h546q94 0 166.5 -81.5t72.5 -176.5v-35z" />
+<glyph unicode="&#x374;" horiz-adv-x="506" d="M409 1490.5q27 -23.5 27 -49t-8 -44.5l-285 -664q-4 -10 -12 -10q-50 0 -50 33q0 5 2 12l187 684q17 62 77 62q35 0 62 -23.5z" />
+<glyph unicode="&#x375;" horiz-adv-x="506" d="M425 321q0 -5 -2 -12l-187 -684q-17 -62 -77 -62q-35 0 -62 23.5t-27 49t8 44.5l285 664q4 10 12 10q50 0 50 -33z" />
+<glyph unicode="&#x376;" horiz-adv-x="1631" d="M1564 1284l-56 2q-122 0 -140 -36q-8 -16 -8 -45v-1064q0 -29 8 -45q18 -35 186 -35h10v-61q-71 6 -113 6h-361q-36 0 -107 -6v61q9 0 28 -0.5t29 -0.5q119 0 137 36q8 16 8 45v964l-734 -1008l1 -1q14 -30 90 -35q3 0 30 -0.5t77 0.5v-61q-71 6 -115 6h-358 q-37 0 -108 -6v61q9 0 27.5 -0.5t28.5 -0.5q121 0 139 36q7 14 7 45v1064q0 31 -7 45q-17 34 -149 34h-46v62q70 -6 112 -6h354q45 0 115 6v-62l-55 2q-123 0 -142 -36q-8 -16 -8 -45v-967l734 1009q-15 37 -149 37h-46v62q70 -6 112 -6h356q43 0 113 6v-62z" />
+<glyph unicode="&#x377;" horiz-adv-x="1123" d="M870 347v390l-519 -677v-60h-141v739q0 86 -41 106q-20 11 -103 11h-14v67l299 23v-760l565 737h102v-600q0 -140 40 -323h-148q-40 135 -40 347z" />
+<glyph unicode="&#x378;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x379;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x37a;" horiz-adv-x="982" d="M388 -359q0 -83 -89 -83t-89 81q0 14 3 27l55 242q6 26 30.5 26t30.5 -26l56 -242q3 -13 3 -25z" />
+<glyph unicode="&#x37b;" horiz-adv-x="920" d="M406 960q198 0 330 -149t132 -347.5t-132.5 -343t-326.5 -144.5q-223 0 -329 203q-27 52 -27 74.5t29 22.5q19 0 53 -72.5t74 -109.5q68 -64 181 -64q60 0 123 34q178 96 178 404t-168 403q-60 34 -120 34q-85 0 -128 -56q-4 -6 -52 -105q-27 -56 -74 -56q-81 0 -81 83 t131 141q108 48 207 48z" />
+<glyph unicode="&#x37c;" horiz-adv-x="920" d="M839 276q29 0 29 -22.5t-27 -74.5q-106 -203 -329 -203q-194 0 -326.5 144.5t-132.5 343t132 347.5t330 149q99 0 207 -48q131 -58 131 -141t-81 -83q-47 0 -74 56q-48 99 -52 105q-43 56 -128 56q-60 0 -120 -34q-168 -95 -168 -403t178 -404q63 -34 123 -34 q113 0 181 64q40 37 74 109.5t53 72.5zM620 466q0 -46 -32 -78t-78 -32t-78 32t-32 78t32 78t78 32t78 -32t32 -78z" />
+<glyph unicode="&#x37d;" horiz-adv-x="920" d="M406 960q198 0 330 -149t132 -347.5t-132.5 -343t-326.5 -144.5q-223 0 -329 203q-27 52 -27 74.5t29 22.5q19 0 53 -72.5t74 -109.5q68 -64 181 -64q60 0 123 34q178 96 178 404t-168 403q-60 34 -120 34q-85 0 -128 -56q-4 -6 -52 -105q-27 -56 -74 -56q-81 0 -81 83 t131 141q108 48 207 48zM521 466q0 -46 -32 -78t-78 -32t-78 32t-32 78t32 78t78 32t78 -32t32 -78z" />
+<glyph unicode="&#x37e;" horiz-adv-x="536" d="M334.5 801q30.5 -31 30.5 -72.5t-30.5 -71.5t-72 -30t-72 30t-30.5 71.5t30.5 72.5t72 31t72 -31zM263 204q107 0 107 -203.5t-124 -343.5q-25 -29 -36 -29q-19 0 -19 21q0 9 13 26q124 152 123 347q-15 -15 -49 -20q-3 -2 -11 -2q-107 0 -107 102q0 44 29 73t74 29z" />
+<glyph unicode="&#x37f;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x380;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x381;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x382;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x383;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x384;" horiz-adv-x="564" d="M408 1457q0 -20 -17 -48l-144 -237q-25 -41 -51 -41t-26 24q0 11 8 33l100 278q13 36 60 36q70 0 70 -45z" />
+<glyph unicode="&#x385;" horiz-adv-x="574" d="M484 1561q0 -20 -17 -48l-144 -237q-25 -41 -51 -41t-26 24q0 11 8 33l100 278q13 36 60 36q70 0 70 -45zM574 1233q0 -42 -29.5 -72t-71 -30t-71 30.5t-29.5 71t30 70.5t71 30t70.5 -29t29.5 -71zM202 1233q0 -42 -29.5 -72t-71 -30t-71.5 30.5t-30 71t30.5 70.5 t71.5 30t70.5 -29t29.5 -71z" />
+<glyph unicode="&#x386;" horiz-adv-x="1484" d="M1417 0q-127 6 -297.5 6t-244.5 -6v61h5q157 0 157 59q0 29 -39 136l-70 192h-487l-61 -163q-34 -90 -34 -123q0 -51 52 -78q42 -23 97 -23v-61q-189 6 -239.5 6t-187.5 -6v61q174 2 219 133l409 1177q14 40 46 40t46 -40l425 -1231q21 -61 84 -75q19 -5 77 -5q19 0 43 1 v-61zM906 510l-222 641l-220 -641h442zM318 1324q0 -20 -17 -48l-144 -237q-25 -41 -51 -41t-26 24q0 11 8 33l100 278q13 36 60 36q70 0 70 -45z" />
+<glyph unicode="&#x387;" horiz-adv-x="547" d="M378 837q0 -42 -31 -73t-73.5 -31t-73.5 31t-31 73t31 73t73.5 31t73.5 -31t31 -73z" />
+<glyph unicode="&#x388;" horiz-adv-x="1797" d="M511 0v61q47 -1 53 -1q125 0 142 38q7 16 7 48v1053q0 30 -7 47q-15 36 -152 36q-20 0 -43 -1v62h1108l56 -442h-49q-24 218 -99.5 299t-288.5 81h-263q-54 0 -71 -13.5t-17 -65.5v-474h178q134 0 173.5 46.5t39.5 182.5h51v-521h-51q0 136 -40 183t-173 47h-178v-526 q0 -52 17 -65.5t71 -13.5h273q236 0 326 111q67 84 107 336h49l-84 -508h-1135zM271 1324q0 -20 -17 -48l-144 -237q-25 -41 -51 -41t-26 24q0 11 8 33l100 278q13 36 60 36q70 0 70 -45z" />
+<glyph unicode="&#x389;" horiz-adv-x="1923" d="M1856 1284l-56 2q-122 0 -140 -36q-8 -16 -8 -45v-1064q0 -29 8 -45q18 -35 186 -35h10v-61q-71 6 -113 6h-361q-36 0 -107 -6v61q9 0 28 -0.5t29 -0.5q119 0 137 36q8 16 8 45v530h-590v-530q0 -29 8 -45q18 -35 187 -35h10v-61q-71 6 -115 6h-358q-37 0 -108 -6v61 q9 0 27.5 -0.5t28.5 -0.5q121 0 139 36q7 14 7 45v1064q0 31 -7 45q-17 34 -149 34h-46v62q70 -6 112 -6h354q45 0 115 6v-62l-55 2q-123 0 -142 -36q-8 -16 -8 -45v-474h590v474q0 29 -8 45q-17 34 -148 34h-46v62q70 -6 112 -6h356q43 0 113 6v-62zM271 1324 q0 -20 -17 -48l-144 -237q-25 -41 -51 -41t-26 24q0 11 8 33l100 278q13 36 60 36q70 0 70 -45z" />
+<glyph unicode="&#x38a;" horiz-adv-x="1179" d="M1113 1284l-59 2q-75 0 -103 -9q-53 -18 -53 -76v-1057q0 -27 13.5 -52t91.5 -31h110v-61q-71 6 -117 6h-373q-41 0 -112 -6v61q8 0 27.5 -0.5t29.5 -0.5q128 0 147 36q9 17 9 49v1056q0 32 -9 49q-18 34 -153 34h-51v62q71 -6 115 -6h376q41 0 111 6v-62zM271 1324 q0 -20 -17 -48l-144 -237q-25 -41 -51 -41t-26 24q0 11 8 33l100 278q13 36 60 36q70 0 70 -45z" />
+<glyph unicode="&#x38b;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x38c;" horiz-adv-x="1788" d="M1065 -43q-280 0 -467 214t-187 498.5t186.5 502.5t468 218t468 -217.5t186.5 -503t-187.5 -499t-467.5 -213.5zM1518 696q0 438 -260 590q-92 54 -192 54t-191 -53q-262 -153 -262 -591q0 -469 265 -632q91 -56 185 -56t188 55q267 156 267 633zM271 1324q0 -20 -17 -48 l-144 -237q-25 -41 -51 -41t-26 24q0 11 8 33l100 278q13 36 60 36q70 0 70 -45z" />
+<glyph unicode="&#x38d;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x38e;" horiz-adv-x="1868" d="M1800 1068q0 -33 -31 -33q-23 0 -31 30q-4 24 -9 48q-16 49 -72.5 77.5t-112.5 28.5q-171 0 -252 -200q-59 -145 -59 -346v-529q0 -29 7 -44q19 -40 190 -40q26 0 55 1v-61q-76 6 -159 6h-362q-83 0 -159 -6v61l75 -1q147 0 170 41q8 14 8 42v530q0 201 -59 347 q-82 199 -253 199q-55 0 -108.5 -26.5t-70.5 -73.5q-6 -26 -14.5 -55t-31.5 -29q-30 0 -30 33q0 116 72 209t185 93q174 0 282 -159q84 -124 115 -319h2q30 194 115 319q108 159 280 159q113 0 185.5 -93t72.5 -209zM271 1324q0 -20 -17 -48l-144 -237q-25 -41 -51 -41 t-26 24q0 11 8 33l100 278q13 36 60 36q70 0 70 -45z" />
+<glyph unicode="&#x38f;" horiz-adv-x="1725" d="M1266 0q-25 0 -31.5 7t-6.5 33q0 150 101 429t101 429q0 186 -107 317t-289 131t-289 -131t-107 -317q0 -150 101 -429t101 -429q0 -40 -39 -40h-326l-64 320h48q17 -115 35.5 -146t36 -38.5t58.5 -7.5h194q-27 111 -120 256q-144 223 -153 240q-76 141 -76 272 q0 221 194 364q177 130 406 130t405 -130q194 -143 194 -364q0 -131 -76 -272q-9 -18 -153 -240q-93 -145 -120 -256h195q41 0 58 7.5t35.5 38t35.5 146.5h49l-64 -320h-327zM271 1324q0 -20 -17 -48l-144 -237q-25 -41 -51 -41t-26 24q0 11 8 33l100 278q13 36 60 36 q70 0 70 -45z" />
+<glyph unicode="&#x390;" horiz-adv-x="748" d="M695 266q0 -114 -48 -194q-58 -96 -164 -96q-133 0 -203 78t-70 212v473q0 86 -41 106q-20 11 -103 11h-14v67l299 23v-685q0 -231 148 -231q102 0 131 139q12 56 12 182v37h53v-122zM484 1561q0 -20 -17 -48l-144 -237q-25 -41 -51 -41t-26 24q0 11 8 33l100 278 q13 36 60 36q70 0 70 -45zM574 1233q0 -42 -29.5 -72t-71 -30t-71 30.5t-29.5 71t30 70.5t71 30t70.5 -29t29.5 -71zM202 1233q0 -42 -29.5 -72t-71 -30t-71.5 30.5t-30 71t30.5 70.5t71.5 30t70.5 -29t29.5 -71z" />
+<glyph unicode="&#x391;" horiz-adv-x="1484" d="M1417 0q-127 6 -297.5 6t-244.5 -6v61h5q157 0 157 59q0 29 -39 136l-70 192h-487l-61 -163q-34 -90 -34 -123q0 -51 52 -78q42 -23 97 -23v-61q-189 6 -239.5 6t-187.5 -6v61q174 2 219 133l409 1177q14 40 46 40t46 -40l425 -1231q21 -61 84 -75q19 -5 77 -5q19 0 43 1 v-61zM906 510l-222 641l-220 -641h442z" />
+<glyph unicode="&#x392;" horiz-adv-x="1346" d="M1278 360q0 -161 -135.5 -260.5t-302.5 -99.5h-772v61q62 -2 63 -2q113 0 134 45q5 11 5 42v1051q0 31 -5 42q-19 43 -152 43q-21 0 -45 -1v62h720q161 0 290 -83q148 -95 148 -247q0 -120 -98.5 -203t-227.5 -108q147 -16 262.5 -109t115.5 -233zM720 721 q129 0 221.5 82t92.5 202.5t-73 198t-186 77.5h-255q-53 0 -69.5 -13t-16.5 -66v-481h286zM994 147q88 86 88 214t-76.5 222t-200.5 94h-371v-537q0 -53 16.5 -66t69.5 -13h257q129 0 217 86z" />
+<glyph unicode="&#x393;" horiz-adv-x="1216" d="M744 1281h-214q-51 0 -68.5 -13t-17.5 -66v-1065q0 -22 8 -39q17 -37 223 -37h22v-61q-74 6 -120 6h-382q-55 0 -127 -6v61q8 0 26 -0.5t28 -0.5q124 0 141 38q7 15 7 48v1053q0 31 -7 47q-15 35 -170 35h-25v62h1026l55 -442h-49q-24 212 -82 285q-74 95 -274 95z" />
+<glyph unicode="&#x394;" horiz-adv-x="1202" d="M1135 15q0 -15 -24 -15h-1021q-22 0 -22 11t130 377l319 898q10 30 33 89q16 36 52 36t49 -36l473 -1337q11 -31 11 -23zM918 149l-369 1046l-369 -1046h738z" />
+<glyph unicode="&#x395;" horiz-adv-x="1354" d="M68 0v61q47 -1 53 -1q125 0 142 38q7 16 7 48v1053q0 30 -7 47q-15 36 -152 36q-20 0 -43 -1v62h1108l56 -442h-49q-24 218 -99.5 299t-288.5 81h-263q-54 0 -71 -13.5t-17 -65.5v-474h178q134 0 173.5 46.5t39.5 182.5h51v-521h-51q0 136 -40 183t-173 47h-178v-526 q0 -52 17 -65.5t71 -13.5h273q236 0 326 111q67 84 107 336h49l-84 -508h-1135z" />
+<glyph unicode="&#x396;" horiz-adv-x="1128" d="M101 0q-33 0 -33 33q0 21 13 41l766 1207h-310q-206 0 -294 -87.5t-100 -293.5h-51l22 443h900q34 0 34 -32q0 -16 -14 -38l-764 -1205h324q239 0 329 114q76 95 89 344h49l-35 -526h-925z" />
+<glyph unicode="&#x397;" horiz-adv-x="1480" d="M1413 1284l-56 2q-122 0 -140 -36q-8 -16 -8 -45v-1064q0 -29 8 -45q18 -35 186 -35h10v-61q-71 6 -113 6h-361q-36 0 -107 -6v61q9 0 28 -0.5t29 -0.5q119 0 137 36q8 16 8 45v530h-590v-530q0 -29 8 -45q18 -35 187 -35h10v-61q-71 6 -115 6h-358q-37 0 -108 -6v61 q9 0 27.5 -0.5t28.5 -0.5q121 0 139 36q7 14 7 45v1064q0 31 -7 45q-17 34 -149 34h-46v62q70 -6 112 -6h354q45 0 115 6v-62l-55 2q-123 0 -142 -36q-8 -16 -8 -45v-474h590v474q0 29 -8 45q-17 34 -148 34h-46v62q70 -6 112 -6h356q43 0 113 6v-62z" />
+<glyph unicode="&#x398;" horiz-adv-x="1445" d="M722 -43q-280 0 -467 214t-187 498.5t186.5 502.5t468 218t468 -217.5t186.5 -503t-187.5 -499t-467.5 -213.5zM1175 696q0 438 -260 590q-92 54 -192 54t-191 -53q-262 -153 -262 -591q0 -469 265 -632q91 -56 185 -56t188 55q267 156 267 633zM1054 532h-50v68h-564 v-68h-49v284h49v-68h564v68h50v-284z" />
+<glyph unicode="&#x399;" horiz-adv-x="736" d="M670 1284l-59 2q-75 0 -103 -9q-53 -18 -53 -76v-1057q0 -27 13.5 -52t91.5 -31h110v-61q-71 6 -117 6h-373q-41 0 -112 -6v61q8 0 27.5 -0.5t29.5 -0.5q128 0 147 36q9 17 9 49v1056q0 32 -9 49q-18 34 -153 34h-51v62q71 -6 115 -6h376q41 0 111 6v-62z" />
+<glyph unicode="&#x39a;" horiz-adv-x="1519" d="M649 1284l-57 2q-126 0 -142 -40q-6 -15 -6 -44v-636l618 588q36 34 36 67q0 61 -91 63v62q69 -6 217.5 -6t201.5 6v-62q-160 -2 -281 -118l-356 -340l456 -670q42 -62 83.5 -78.5t122.5 -16.5v-61q-127 6 -281.5 6t-225.5 -6v61h4q113 0 113 59q0 22 -31 68l-357 528 l-229 -218v-359q0 -28 9 -45q17 -33 186 -33h10v-61q-71 6 -120 6h-347q-43 0 -114 -6v61q8 0 26.5 -0.5t28.5 -0.5q125 0 141 40q6 15 6 44v1066q0 27 -7 41q-16 33 -176 33h-19v62q70 -6 119 -6h342q50 0 120 6v-62z" />
+<glyph unicode="&#x39b;" horiz-adv-x="1374" d="M963 6q-110 0 -182 -6v61h5q161 0 161 59q0 16 -59 199l-262 806l-296 -919q-9 -28 -9 -42q0 -51 47.5 -76.5t104.5 -26.5v-61q-183 6 -244 6t-161 -6v61h2q149 0 193 136l380 1172q14 42 45 42t45 -42l394 -1223q6 -20 25 -56q25 -29 141 -29h15v-61q-235 6 -345 6z" />
+<glyph unicode="&#x39c;" horiz-adv-x="1793" d="M1726 1281l-56 2q-125 0 -141 -41q-6 -15 -6 -45v-1058q0 -26 8 -43q17 -35 185 -35h10v-61q-75 6 -119 6h-334q-38 0 -113 -6v61h76q63 0 87 10q40 17 40 70v1140h-2l-483 -1245q-14 -36 -36 -36t-39 43l-476 1222h-2v-1064q0 -140 200 -140h3v-61q-209 6 -229 6 t-231 -6v61h3q199 0 199 140v1003q0 22 -6 38q-12 32 -89 39q-6 1 -32.5 1t-74.5 -1v62h341q45 0 61 -42l428 -1102l430 1108q14 36 49 36h349v-62z" />
+<glyph unicode="&#x39d;" horiz-adv-x="1480" d="M1209 1139v-1107q0 -32 -26 -32q-16 0 -34 26l-805 1178q-12 17 -19 25v-1028q0 -140 200 -140h3v-61q-208 6 -230 6t-230 -6v61h3q199 0 199 140v1032q0 29 -8 35q-19 13 -194 13v62h342q30 0 48 -26l696 -1019v847q0 139 -203 139v62q205 -6 231.5 -6t230.5 6v-62h-3 q-201 0 -201 -145z" />
+<glyph unicode="&#x39e;" horiz-adv-x="1282" d="M1024 1205h-765q-93 0 -110.5 -16.5t-23.5 -153.5h-47l15 308h1096l15 -308h-49q-5 137 -23 153.5t-108 16.5zM1022 524h-49v100h-664v-100h-49v338h49v-99h664v99h49v-338zM256 138h771q93 0 111.5 19.5t26.5 171.5h49l-16 -329h-1115l-15 329h48q2 -56 7 -107.5 t18 -63.5q20 -20 115 -20z" />
+<glyph unicode="&#x39f;" horiz-adv-x="1445" d="M722 -43q-280 0 -467 214t-187 498.5t186.5 502.5t468 218t468 -217.5t186.5 -503t-187.5 -499t-467.5 -213.5zM1175 696q0 438 -260 590q-92 54 -192 54t-191 -53q-262 -153 -262 -591q0 -469 265 -632q91 -56 185 -56t188 55q267 156 267 633z" />
+<glyph unicode="&#x3a0;" horiz-adv-x="1480" d="M1300 6h-361q-36 0 -107 -6v61h78q60 0 85 11q39 17 39 69v1141h-590v-1141q0 -26 6 -41q13 -32 90 -39q6 0 33 -0.5t76 0.5v-61q-71 6 -113 6h-360q-37 0 -108 -6v61h78q60 0 85 11q39 17 39 69v1062q0 26 -6 41q-13 32 -90 38h-106v62h1345v-62q-8 0 -29 0.5t-32 0.5 q-121 0 -137 -39q-6 -14 -6 -41v-1062q0 -26 6 -41q13 -32 90 -39q5 0 32 -0.5t76 0.5v-61q-71 6 -113 6z" />
+<glyph unicode="&#x3a1;" horiz-adv-x="1295" d="M1074 1249q154 -106 154 -268t-142 -262t-307 -100h-335v-473q0 -32 7 -48q17 -37 181 -37h17v-61q-72 6 -133 6h-326q-50 0 -122 -6v61l55 -1q122 0 140 38q7 15 7 48v1051q0 32 -7 48q-16 37 -158 37q-18 0 -37 -1v62h695q174 0 311 -94zM1024 977q0 161 -75.5 232.5 t-237.5 71.5h-186q-53 0 -69.5 -13t-16.5 -66v-532h272q313 0 313 307z" />
+<glyph unicode="&#x3a2;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x3a3;" horiz-adv-x="1335" d="M106 0q-36 0 -36 22q0 9 18 32l470 596l-490 660q0 33 41 33h1103l54 -443h-47q-30 235 -137 313q-93 68 -338 68h-455l405 -532q13 -17 13 -26.5t-17 -31.5l-480 -608h529q244 0 342 69q114 81 138 314h47l-54 -466h-1106z" />
+<glyph unicode="&#x3a4;" horiz-adv-x="1413" d="M878 1282q-46 0 -65.5 -11.5t-19.5 -53.5v-1071q0 -25 10 -47q18 -38 243 -38h34v-61q-84 6 -154 6h-439q-71 0 -155 -6v61q9 0 35.5 -0.5t40.5 -0.5q184 0 202 39q8 17 8 47v1072q0 43 -29 56q-17 8 -66 8q-256 0 -321 -62.5t-86 -318.5h-48l36 442h1206l36 -442h-49 q-22 262 -88.5 321.5t-330.5 59.5z" />
+<glyph unicode="&#x3a5;" horiz-adv-x="1445" d="M1377 1068q0 -33 -31 -33q-23 0 -31 30q-4 24 -9 48q-16 49 -72.5 77.5t-112.5 28.5q-171 0 -252 -200q-59 -145 -59 -346v-529q0 -29 7 -44q19 -40 190 -40q26 0 55 1v-61q-76 6 -159 6h-362q-83 0 -159 -6v61l75 -1q147 0 170 41q8 14 8 42v530q0 201 -59 347 q-82 199 -253 199q-55 0 -108.5 -26.5t-70.5 -73.5q-6 -26 -14.5 -55t-31.5 -29q-30 0 -30 33q0 116 72 209t185 93q174 0 282 -159q84 -124 115 -319h2q30 194 115 319q108 159 280 159q113 0 185.5 -93t72.5 -209z" />
+<glyph unicode="&#x3a6;" horiz-adv-x="1394" d="M1025 1287l-82 2q-135 0 -157 -37q-14 -23 -14 -76v-81q215 -21 368 -118q186 -118 186 -304t-186 -303q-153 -97 -368 -117v-97q0 -39 7 -56q16 -40 202 -40q21 0 44 1v-61q-75 6 -154 6h-359q-80 0 -155 -6v61l81 -2q136 0 158 37q14 23 14 75v82q-210 21 -361 120 q-181 118 -181 300.5t181 300.5q152 99 361 121v99q0 37 -7 54q-16 39 -225 39h-21v62q75 -6 155 -6h359q79 0 154 6v-62zM1130 674q0 339 -358 376v-753q164 13 261 110t97 267zM610 1050q-347 -40 -347 -375.5t347 -375.5v751z" />
+<glyph unicode="&#x3a7;" horiz-adv-x="1518" d="M1450 0q-127 6 -299 6t-244 -6v61q128 5 128 59q0 10 -320 493l-281 -414q-19 -28 -19 -48q0 -43 38.5 -66t84.5 -24v-61q-74 6 -165 6t-305 -6v61q196 0 285 131l323 477l-362 547q-34 51 -99 64q-24 4 -81 4h-41v62q112 -6 292.5 -6t251.5 6v-62q-128 -5 -128 -58 q0 -13 268 -410l225 333q17 25 17 46q0 43 -37.5 65.5t-83.5 23.5v62q81 -6 163.5 -6t306.5 6v-62q-198 -2 -285 -128l-271 -395l416 -629q35 -53 99 -66q25 -5 85 -5h38v-61z" />
+<glyph unicode="&#x3a8;" horiz-adv-x="1441" d="M1048 1287l-63 2q-162 0 -182 -42q-8 -17 -8 -41v-890q263 63 281 475q5 114 15 162q23 101 84 127q35 15 116.5 15t81.5 -25q0 -14 -25 -22q-108 -34 -108 -220q0 -508 -445 -563v-125q0 -22 8 -40q18 -39 208 -39h37v-61q-74 6 -143 6h-382q-69 0 -143 -6v61l83 -2 q140 0 160 40q11 22 11 51v63q-1 40 -1 52q-402 52 -432 516q-9 132 -9 136q-13 93 -53 114l-46 15q-25 9 -25 24q0 22 35 22h87q106 0 146 -92q24 -57 30 -219.5t49 -267.5q62 -156 218 -197v890q0 25 -7 42q-16 39 -225 39h-21v62q74 -6 143 -6h382q69 0 143 6v-62z" />
+<glyph unicode="&#x3a9;" horiz-adv-x="1382" d="M923 0q-25 0 -31.5 7t-6.5 33q0 150 101 429t101 429q0 186 -107 317t-289 131t-289 -131t-107 -317q0 -150 101 -429t101 -429q0 -40 -39 -40h-326l-64 320h48q17 -115 35.5 -146t36 -38.5t58.5 -7.5h194q-27 111 -120 256q-144 223 -153 240q-76 141 -76 272 q0 221 194 364q177 130 406 130t405 -130q194 -143 194 -364q0 -131 -76 -272q-9 -18 -153 -240q-93 -145 -120 -256h195q41 0 58 7.5t35.5 38t35.5 146.5h49l-64 -320h-327z" />
+<glyph unicode="&#x3aa;" horiz-adv-x="736" d="M670 1284l-59 2q-75 0 -103 -9q-53 -18 -53 -76v-1057q0 -27 13.5 -52t91.5 -31h110v-61q-71 6 -117 6h-373q-41 0 -112 -6v61q8 0 27.5 -0.5t29.5 -0.5q128 0 147 36q9 17 9 49v1056q0 32 -9 49q-18 34 -153 34h-51v62q71 -6 115 -6h376q41 0 111 6v-62zM257 1574 q32 -32 32 -78.5t-32 -79t-78 -32.5t-79 33.5t-33 78t33.5 77.5t79 33t77.5 -32zM629 1574q32 -32 32 -78.5t-32 -79t-78 -32.5t-79 33.5t-33 78t33.5 77.5t79 33t77.5 -32z" />
+<glyph unicode="&#x3ab;" horiz-adv-x="1445" d="M1377 1068q0 -33 -31 -33q-23 0 -31 30q-4 24 -9 48q-16 49 -72.5 77.5t-112.5 28.5q-171 0 -252 -200q-59 -145 -59 -346v-529q0 -29 7 -44q19 -40 190 -40q26 0 55 1v-61q-76 6 -159 6h-362q-83 0 -159 -6v61l75 -1q147 0 170 41q8 14 8 42v530q0 201 -59 347 q-82 199 -253 199q-55 0 -108.5 -26.5t-70.5 -73.5q-6 -26 -14.5 -55t-31.5 -29q-30 0 -30 33q0 116 72 209t185 93q174 0 282 -159q84 -124 115 -319h2q30 194 115 319q108 159 280 159q113 0 185.5 -93t72.5 -209zM629 1574q32 -32 32 -78.5t-32 -79t-78 -32.5t-79 33.5 t-33 78t33.5 77.5t79 33t77.5 -32zM1001 1574q32 -32 32 -78.5t-32 -79t-78 -32.5t-79 33.5t-33 78t33.5 77.5t79 33t77.5 -32z" />
+<glyph unicode="&#x3ac;" horiz-adv-x="1228" d="M1151 187q0 -84 -47.5 -143.5t-128.5 -59.5q-139 0 -165 167q-137 -175 -301 -175q-192 0 -324 144.5t-132 340t138 340.5t334 145q92 0 169.5 -54t117.5 -140l81 194h47v-788q0 -39 21.5 -73.5t58.5 -34.5q78 0 78 171l-2 86h55v-120zM799 291v301q0 112 -76 206.5 t-178.5 94.5t-176.5 -72q-138 -134 -138 -362q0 -152 66 -280q81 -155 219 -155q104 0 194 82t90 185zM748 1457q0 -20 -17 -48l-144 -237q-25 -41 -51 -41t-26 24q0 11 8 33l100 278q13 36 60 36q70 0 70 -45z" />
+<glyph unicode="&#x3ad;" horiz-adv-x="883" d="M792 280q28 0 28 -28.5t-34 -86.5q-110 -189 -326 -189q-148 0 -260 61q-138 75 -138 211q0 99 74 161.5t179 86.5q-93 22 -154 84t-61 153q0 123 132 182q98 45 221 45t210 -28q123 -40 123 -122q0 -33 -24.5 -55.5t-60.5 -22.5t-67 47q-52 77 -61 86q-47 47 -126 47 q-202 0 -202 -194q0 -188 199 -188q22 0 63 11t63 11q86 0 86 -55.5t-87 -55.5q-21 0 -62.5 11t-62.5 11q-224 0 -224 -205q0 -228 255 -228q204 0 290 221q11 29 27 29zM628 1457q0 -20 -17 -48l-144 -237q-25 -41 -51 -41t-26 24q0 11 8 33l100 278q13 36 60 36 q70 0 70 -45z" />
+<glyph unicode="&#x3ae;" horiz-adv-x="1098" d="M858 -81v757q0 237 -158 237q-129 0 -209 -100.5t-80 -232.5v-580h-149v778q0 39 -21 73.5t-58 34.5q-78 0 -78 -172q0 -8 2 -85h-55v120q0 84 47 143.5t130 59.5t128 -69q40 -59 40 -147q101 224 317 224q293 0 293 -317v-45q-1 -29 -1 -44v-659q0 -140 40 -323h-148 q-40 135 -40 347zM758 1457q0 -20 -17 -48l-144 -237q-25 -41 -51 -41t-26 24q0 11 8 33l100 278q13 36 60 36q70 0 70 -45z" />
+<glyph unicode="&#x3af;" horiz-adv-x="748" d="M695 266q0 -114 -48 -194q-58 -96 -164 -96q-133 0 -203 78t-70 212v473q0 86 -41 106q-20 11 -103 11h-14v67l299 23v-685q0 -231 148 -231q102 0 131 139q12 56 12 182v37h53v-122zM408 1457q0 -20 -17 -48l-144 -237q-25 -41 -51 -41t-26 24q0 11 8 33l100 278 q13 36 60 36q70 0 70 -45z" />
+<glyph unicode="&#x3b0;" horiz-adv-x="1103" d="M1051 496q0 -211 -106 -357q-119 -163 -322 -163q-178 0 -269.5 100.5t-91.5 280.5v421q0 39 -21 73.5t-58 34.5q-79 0 -79 -173q0 -6 3 -84h-55v120q0 84 47 143.5t132 59.5t132.5 -62.5t47.5 -153.5v-357q0 -355 223 -355q159 0 241 173q64 134 64 313q0 328 -233 410 l5 32q160 -18 250 -152.5t90 -303.5zM764 1561q0 -20 -17 -48l-144 -237q-25 -41 -51 -41t-26 24q0 11 8 33l100 278q13 36 60 36q70 0 70 -45zM854 1233q0 -42 -29.5 -72t-71 -30t-71 30.5t-29.5 71t30 70.5t71 30t70.5 -29t29.5 -71zM482 1233q0 -42 -29.5 -72t-71 -30 t-71.5 30.5t-30 71t30.5 70.5t71.5 30t70.5 -29t29.5 -71z" />
+<glyph unicode="&#x3b1;" horiz-adv-x="1228" d="M1151 187q0 -84 -47.5 -143.5t-128.5 -59.5q-139 0 -165 167q-137 -175 -301 -175q-192 0 -324 144.5t-132 340t138 340.5t334 145q92 0 169.5 -54t117.5 -140l81 194h47v-788q0 -39 21.5 -73.5t58.5 -34.5q78 0 78 171l-2 86h55v-120zM799 291v301q0 112 -76 206.5 t-178.5 94.5t-176.5 -72q-138 -134 -138 -362q0 -152 66 -280q81 -155 219 -155q104 0 194 82t90 185z" />
+<glyph unicode="&#x3b2;" horiz-adv-x="951" d="M898 427q0 -200 -124.5 -325.5t-265 -125.5t-272.5 113q0 -22 0.5 -75t0.5 -79q0 -221 -37 -352h-148q37 173 37 311v1110q0 467 361 467q157 0 257.5 -88t100.5 -242q0 -183 -193 -308q283 -133 283 -406zM671 133q57 92 57 215.5t-46 258.5t-120 198q-56 -27 -98.5 -27 t-80.5 16.5t-38 42.5q0 47 87 47q54 0 131 -30q88 103 88 292q0 277 -211 277q-204 0 -204 -345v-845q0 -48 58 -119q74 -90 192 -90t185 109z" />
+<glyph unicode="&#x3b3;" horiz-adv-x="934" d="M884 847q0 -109 -133 -365l-201 -358q37 -229 37 -383t-78 -154q-82 0 -82 164t68 381q-44 204 -111 379q-107 280 -211 280q-76 0 -88 -155h-35v14q0 273 146 273q129 0 231 -307q18 -55 106 -423q147 307 174 509q13 97 25 133q27 88 82 88q70 0 70 -76z" />
+<glyph unicode="&#x3b4;" horiz-adv-x="929" d="M716 821q160 -165 160 -356.5t-130.5 -340t-311 -148.5t-281.5 123t-101 305t120 309.5t304 154.5q-35 39 -132 116.5t-135 128.5q-56 77 -56 173.5t116 152.5q92 44 207 44t208 -54q113 -64 113 -170.5t-98 -106.5q-43 0 -71 28t-28 71q0 95 101 99q-80 78 -229 78 q-80 0 -140 -31q-74 -38 -74 -111q0 -102 160 -227q271 -210 298 -238zM730 399q0 187 -210 421q-153 -24 -236 -131.5t-83 -262.5t59 -262q73 -134 208.5 -134t205.5 125q56 101 56 244z" />
+<glyph unicode="&#x3b5;" horiz-adv-x="883" d="M792 280q28 0 28 -28.5t-34 -86.5q-110 -189 -326 -189q-148 0 -260 61q-138 75 -138 211q0 99 74 161.5t179 86.5q-93 22 -154 84t-61 153q0 123 132 182q98 45 221 45t210 -28q123 -40 123 -122q0 -33 -24.5 -55.5t-60.5 -22.5t-67 47q-52 77 -61 86q-47 47 -126 47 q-202 0 -202 -194q0 -188 199 -188q22 0 63 11t63 11q86 0 86 -55.5t-87 -55.5q-21 0 -62.5 11t-62.5 11q-224 0 -224 -205q0 -228 255 -228q204 0 290 221q11 29 27 29z" />
+<glyph unicode="&#x3b6;" horiz-adv-x="835" d="M402 126l202 8q97 0 161 -67.5t64 -165.5q0 -147 -86.5 -243t-227.5 -96t-141 88q0 71 75 71q28 0 82.5 -14.5t82.5 -14.5q61 0 102 48.5t41 106.5t-40.5 100t-94.5 42l-185 -13q-385 0 -385 443q0 400 284 723h-5q-185 0 -185 148q0 118 174 167l16 -37 q-104 -45 -104 -123q0 -51 34.5 -83.5t85.5 -32.5q11 0 23 2q56 64 175.5 144.5t184.5 80.5q48 0 48 -38q0 -86 -148 -158q-108 -53 -225 -73q-145 -134 -222 -327.5t-77 -399.5q0 -153 68.5 -219.5t222.5 -66.5z" />
+<glyph unicode="&#x3b7;" horiz-adv-x="1098" d="M858 -81v757q0 237 -158 237q-129 0 -209 -100.5t-80 -232.5v-580h-149v778q0 39 -21 73.5t-58 34.5q-78 0 -78 -172q0 -8 2 -85h-55v120q0 84 47 143.5t130 59.5t128 -69q40 -59 40 -147q101 224 317 224q293 0 293 -317v-45q-1 -29 -1 -44v-659q0 -140 40 -323h-148 q-40 135 -40 347z" />
+<glyph unicode="&#x3b8;" horiz-adv-x="980" d="M836 1205q92 -217 92 -477.5t-94 -474.5q-121 -277 -343.5 -277t-344.5 277q-94 215 -94 475.5t91 476.5q120 284 346.5 284t346.5 -284zM768 765q0 211 -51 398q-75 272 -227 272t-227 -272q-51 -188 -51 -398h556zM768 709h-556q0 -212 51 -402q75 -277 227 -277 t227 276q51 191 51 403z" />
+<glyph unicode="&#x3b9;" horiz-adv-x="748" d="M695 266q0 -114 -48 -194q-58 -96 -164 -96q-133 0 -203 78t-70 212v473q0 86 -41 106q-20 11 -103 11h-14v67l299 23v-685q0 -231 148 -231q102 0 131 139q12 56 12 182v37h53v-122z" />
+<glyph unicode="&#x3ba;" horiz-adv-x="1140" d="M1088 0h-241l-356 502l-137 -118v-384h-134v737q0 88 -45 109q-21 10 -107 10h-16v67l309 23v-488l380 330q155 135 233 135q100 0 100 -98q0 -38 -30.5 -66.5t-64 -28.5t-61 29t-54.5 29q-45 0 -266 -193q2 -20 10 -31l271 -384q47 -67 88.5 -90.5t120.5 -23.5v-66z" />
+<glyph unicode="&#x3bb;" horiz-adv-x="1043" d="M990 259q0 -283 -151.5 -283t-241.5 325l-108 392l-287 -693h-150l377 916l-68 249q-54 188 -181 188q-80 0 -92 -161h-36v15q0 283 152 283t241 -325l237 -864q52 -188 181 -188q79 0 92 161h35v-15z" />
+<glyph unicode="&#x3bc;" horiz-adv-x="1120" d="M1043 187q0 -84 -47.5 -143.5t-130 -59.5t-125 64.5t-42.5 152.5q-101 -225 -317 -225q-83 0 -144 25v-66q0 -221 -37 -352h-148q37 173 37 311v1029h147v-663q0 -237 159 -237q129 0 209 101t80 233v566h148v-765q0 -39 21.5 -73.5t58.5 -34.5q78 0 78 171l-2 86h55 v-120z" />
+<glyph unicode="&#x3bd;" horiz-adv-x="1031" d="M979 871q0 -93 -83 -247l-327 -607q-22 -41 -41 -41q-25 0 -40 41l-234 640q-48 131 -86 152q-25 14 -116 14v49q83 1 195 88h30q55 -105 97 -221l208 -573l199 365q41 75 41 117.5t-16.5 110.5t-16.5 103q0 98 103 98q36 0 61.5 -26.5t25.5 -62.5z" />
+<glyph unicode="&#x3be;" horiz-adv-x="936" d="M420 123l262 12q106 0 172 -61.5t66 -166.5q0 -138 -86.5 -242.5t-221.5 -104.5q-47 0 -96.5 23.5t-49.5 65.5q0 25 22.5 46t48.5 21t78.5 -15t79.5 -15q75 0 117.5 45.5t42.5 109.5t-38 105.5t-91 41.5l-224 -12q-192 0 -312 84q-138 97 -138 281q0 263 252 437 q-116 85 -116 189t97 208q-156 36 -156 151.5t175 123.5v-33q-104 -13 -104 -89q0 -96 129 -105q202 179 327 179q44 0 44 -44q0 -82 -135 -132q-102 -38 -206 -41q-111 -109 -111 -209.5t122 -169.5q62 36 161 62t149.5 26t82.5 -14.5t32 -38.5q0 -49 -96 -74 q-66 -17 -143 -17t-182 17q-256 -184 -256 -394q0 -124 86.5 -187t215.5 -63z" />
+<glyph unicode="&#x3bf;" horiz-adv-x="998" d="M945 481.5q0 -201.5 -127.5 -353.5t-324.5 -152t-319 143.5t-122 341t126.5 348.5t321 151t320 -138.5t125.5 -340zM782 406q0 187 -65 326q-84 180 -250 180q-135 0 -200 -121q-52 -96 -52 -262.5t67 -311.5q87 -187 251 -187q249 0 249 376z" />
+<glyph unicode="&#x3c0;" horiz-adv-x="1134" d="M1084 823h-267v-162q0 -366 108 -563q21 -38 21 -53q0 -66 -80.5 -66t-117.5 197q-24 127 -24 272v375h-228l-80 -704q-16 -140 -90.5 -140t-74.5 62q0 11 10 41q102 311 168 741h-191q-57 0 -118 -41q-55 -36 -55 -40q0 -1 1 -1q-16 0 -16 16q0 39 63.5 102.5 t164.5 63.5h806v-100z" />
+<glyph unicode="&#x3c1;" horiz-adv-x="990" d="M184 818q107 142 305 142t323.5 -138.5t125.5 -340t-127.5 -353.5t-329.5 -152q-145 0 -245 113q0 -23 0.5 -79.5t0.5 -84.5q0 -214 -36 -342h-149q37 173 37 311v589q0 209 95 335zM775 406q0 187 -65 326q-84 180 -250 180q-108 0 -166 -84.5t-58 -197.5v-344 q0 -110 89 -183t201 -73q249 0 249 376z" />
+<glyph unicode="&#x3c2;" horiz-adv-x="905" d="M617 -14l-105 -10q-194 0 -326.5 144.5t-132.5 342.5t132 347.5t330 149.5q99 0 207 -48q131 -58 131 -143q0 -35 -23 -58t-64 -23t-68 56q-48 99 -52 105q-43 56 -128 56q-60 0 -120 -34q-168 -95 -168 -405q0 -109 58 -216q68 -126 168 -126l120 6q106 0 169.5 -62.5 t63.5 -169.5q0 -135 -91.5 -234.5t-228 -99.5t-136.5 84q0 22 22 44.5t47.5 22.5t78.5 -19t82 -19q67 0 112 51t45 118q0 140 -123 140z" />
+<glyph unicode="&#x3c3;" horiz-adv-x="1087" d="M1037 823h-282q155 -134 155 -344t-122.5 -356.5t-312.5 -146.5t-307.5 138.5t-117.5 328t121.5 335t309.5 145.5h556v-100zM753 390q0 307 -151 433h-150q-125 0 -185 -83.5t-60 -213.5q0 -179 65 -318q83 -180 241 -180q240 0 240 362z" />
+<glyph unicode="&#x3c4;" horiz-adv-x="936" d="M888 255q0 -109 -51.5 -194t-153.5 -85q-128 0 -196.5 75t-68.5 204v568h-180q-57 0 -118 -41q-55 -36 -55 -40q0 -1 1 -1q-16 0 -16 16q0 39 63.5 102.5t164.5 63.5h608v-100h-327v-572q0 -223 139 -223q98 0 127 134q11 55 11 173v38h52v-118z" />
+<glyph unicode="&#x3c5;" horiz-adv-x="1103" d="M1051 496q0 -211 -106 -357q-119 -163 -322 -163q-178 0 -269.5 100.5t-91.5 280.5v421q0 39 -21 73.5t-58 34.5q-79 0 -79 -173q0 -6 3 -84h-55v120q0 84 47 143.5t132 59.5t132.5 -62.5t47.5 -153.5v-357q0 -355 223 -355q159 0 241 173q64 134 64 313q0 328 -233 410 l5 32q160 -18 250 -152.5t90 -303.5z" />
+<glyph unicode="&#x3c6;" horiz-adv-x="1201" d="M642 959q225 -13 366 -151.5t141 -326t-138.5 -337t-368.5 -166.5v-390h-83v389q-228 10 -367.5 154.5t-139.5 329t140 334t367 164.5v164h83v-164zM905 165q70 98 79 259v32q0 142 -68 265q-93 167 -274 188v-878q174 10 263 134zM559 33v878q-180 -12 -270 -150 q-64 -97 -71 -244q-1 -13 -1 -26q0 -133 71 -262q94 -172 271 -196z" />
+<glyph unicode="&#x3c7;" horiz-adv-x="952" d="M900 -145q0 -279 -149 -279q-157 0 -226 320l-53 245l-274 -541h-147l380 750l-62 291q-17 74 -63.5 129.5t-114.5 55.5q-78 0 -90 -159h-35v15q0 278 149 278q157 0 226 -319l41 -189l254 502h147l-360 -711l75 -347q17 -74 63 -129.5t114 -55.5q78 0 90 158h35v-14z " />
+<glyph unicode="&#x3c8;" horiz-adv-x="1254" d="M1201 656q0 -244 -99 -438q-122 -241 -343 -241v-389h-83v389q-414 0 -414 386v415q0 39 -21 73.5t-58 34.5q-79 0 -79 -173q0 -7 3 -84h-55v120q0 84 47 143.5t132 59.5t132.5 -62.5t47.5 -153.5v-351q0 -186 39 -256q55 -100 226 -100v894h83v-894q151 0 248 146 q86 130 86 289q0 70 -42.5 200.5t-42.5 199.5q0 96 67 96q85 0 112 -118q14 -59 14 -186z" />
+<glyph unicode="&#x3c9;" horiz-adv-x="1328" d="M1276 430q0 -173 -79 -302q-93 -152 -255 -152q-185 0 -278 219q-93 -219 -278 -219q-162 0 -255 152q-79 129 -79 302q0 245 124.5 386t365.5 144v-48q-327 -10 -327 -470q0 -412 202 -412q135 0 224 241q-67 140 -67 291q0 219 90 219t90 -219q0 -151 -67 -291 q89 -241 224 -241q202 0 202 412q0 460 -327 470v48q241 -3 365.5 -144.5t124.5 -385.5z" />
+<glyph unicode="&#x3ca;" horiz-adv-x="748" d="M695 266q0 -114 -48 -194q-58 -96 -164 -96q-133 0 -203 78t-70 212v473q0 86 -41 106q-20 11 -103 11h-14v67l299 23v-685q0 -231 148 -231q102 0 131 139q12 56 12 182v37h53v-122zM167 1318q32 -32 32 -78.5t-32 -79t-78 -32.5t-79 33.5t-33 78t33.5 77.5t79 33 t77.5 -32zM539 1318q32 -32 32 -78.5t-32 -79t-78 -32.5t-79 33.5t-33 78t33.5 77.5t79 33t77.5 -32z" />
+<glyph unicode="&#x3cb;" horiz-adv-x="1103" d="M1051 496q0 -211 -106 -357q-119 -163 -322 -163q-178 0 -269.5 100.5t-91.5 280.5v421q0 39 -21 73.5t-58 34.5q-79 0 -79 -173q0 -6 3 -84h-55v120q0 84 47 143.5t132 59.5t132.5 -62.5t47.5 -153.5v-357q0 -355 223 -355q159 0 241 173q64 134 64 313q0 328 -233 410 l5 32q160 -18 250 -152.5t90 -303.5zM467 1318q32 -32 32 -78.5t-32 -79t-78 -32.5t-79 33.5t-33 78t33.5 77.5t79 33t77.5 -32zM839 1318q32 -32 32 -78.5t-32 -79t-78 -32.5t-79 33.5t-33 78t33.5 77.5t79 33t77.5 -32z" />
+<glyph unicode="&#x3cc;" horiz-adv-x="998" d="M945 481.5q0 -201.5 -127.5 -353.5t-324.5 -152t-319 143.5t-122 341t126.5 348.5t321 151t320 -138.5t125.5 -340zM782 406q0 187 -65 326q-84 180 -250 180q-135 0 -200 -121q-52 -96 -52 -262.5t67 -311.5q87 -187 251 -187q249 0 249 376zM638 1457q0 -20 -17 -48 l-144 -237q-25 -41 -51 -41t-26 24q0 11 8 33l100 278q13 36 60 36q70 0 70 -45z" />
+<glyph unicode="&#x3cd;" horiz-adv-x="1103" d="M1051 496q0 -211 -106 -357q-119 -163 -322 -163q-178 0 -269.5 100.5t-91.5 280.5v421q0 39 -21 73.5t-58 34.5q-79 0 -79 -173q0 -6 3 -84h-55v120q0 84 47 143.5t132 59.5t132.5 -62.5t47.5 -153.5v-357q0 -355 223 -355q159 0 241 173q64 134 64 313q0 328 -233 410 l5 32q160 -18 250 -152.5t90 -303.5zM728 1457q0 -20 -17 -48l-144 -237q-25 -41 -51 -41t-26 24q0 11 8 33l100 278q13 36 60 36q70 0 70 -45z" />
+<glyph unicode="&#x3ce;" horiz-adv-x="1328" d="M1276 430q0 -173 -79 -302q-93 -152 -255 -152q-185 0 -278 219q-93 -219 -278 -219q-162 0 -255 152q-79 129 -79 302q0 245 124.5 386t365.5 144v-48q-327 -10 -327 -470q0 -412 202 -412q135 0 224 241q-67 140 -67 291q0 219 90 219t90 -219q0 -151 -67 -291 q89 -241 224 -241q202 0 202 412q0 460 -327 470v48q241 -3 365.5 -144.5t124.5 -385.5zM818 1457q0 -20 -17 -48l-144 -237q-25 -41 -51 -41t-26 24q0 11 8 33l100 278q13 36 60 36q70 0 70 -45z" />
+<glyph unicode="&#x3cf;" horiz-adv-x="1519" d="M649 1284l-57 2q-126 0 -142 -40q-6 -15 -6 -44v-636l618 588q36 34 36 67q0 61 -91 63v62q69 -6 217.5 -6t201.5 6v-62q-159 -2 -281 -118l-306 -291l391 -478q107 -131 107 -322t-130.5 -340t-330.5 -149q-121 0 -215 54q-113 64 -113 170t97 106q42 0 70.5 -28 t28.5 -70q0 -94 -100 -99q79 -78 229 -78q59 0 120 34q182 102 182 353q0 180 -103 308l-347 430l-281 -268v-359q0 -28 9 -45q17 -33 186 -33h10v-61q-71 6 -120 6h-347q-43 0 -114 -6v61q8 0 26.5 -0.5t28.5 -0.5q125 0 141 40q6 15 6 44v1066q0 27 -7 41q-16 33 -176 33 h-19v62q70 -6 119 -6h342q50 0 120 6v-62z" />
+<glyph unicode="&#x3d0;" horiz-adv-x="1007" d="M822 736.5q125 -125.5 125 -307.5t-127 -317.5t-312 -135.5q-217 0 -340 185q-95 143 -95 381.5t77 446.5q91 247 266 361q129 84 259 84q78 0 137 -38.5t59 -113.5q0 -169 -247 -258q-180 -65 -390 -66q-51 -132 -56 -279q130 183 342 183q177 0 302 -125.5zM759 1263 q0 85 -108 85q-131 0 -235 -92t-156 -225q158 2 300 48q199 64 199 184zM785 367q0 168 -64 292q-80 157 -232 157q-122 0 -186 -108q-52 -88 -52 -237t66 -279q83 -162 234 -162q234 0 234 337z" />
+<glyph unicode="&#x3d1;" horiz-adv-x="1206" d="M1154 706q0 -17 -15 -17q-40 0 -103 19q0 -245 -85 -456q-111 -273 -315 -273q-246 0 -325 172q-49 108 -49 387q0 39 -21 73.5t-58 34.5q-79 0 -79 -165v-8h-52v36q0 84 47.5 143.5t132 59.5t129.5 -62t45 -154v-44q0 -431 230 -431q147 0 206 260q35 152 35 362v23v81 q-184 55 -301 156q-146 125 -146 292q0 114 53 205q63 108 169 108q201 0 306 -293q74 -209 78 -464q118 -16 118 -45zM668 1445q-82 0 -131 -96q-40 -79 -40 -170q0 -264 379 -382q-1 209 -33 374q-53 274 -175 274z" />
+<glyph unicode="&#x3d2;" horiz-adv-x="1566" d="M1499 1284q-173 0 -252 -128l-381 -619v-388q0 -34 10 -53q15 -29 90 -35h104v-61q-73 6 -127 6h-320q-55 0 -128 -6v61q8 0 25.5 -0.5t27.5 -0.5q124 0 142 36q7 14 7 43v398l-413 675q-34 56 -95 68q-21 4 -121 4v62q126 -6 299.5 -6t246.5 6v-62h-24q-112 0 -112 -48 q0 -14 13 -35l356 -581l325 529q21 34 21 58q0 77 -113 77v62q155 -6 240.5 -6t178.5 6v-62z" />
+<glyph unicode="&#x3d3;" horiz-adv-x="1979" d="M1912 1284q-173 0 -252 -128l-381 -619v-388q0 -34 10 -53q15 -29 90 -35h104v-61q-73 6 -127 6h-320q-55 0 -128 -6v61q8 0 25.5 -0.5t27.5 -0.5q124 0 142 36q7 14 7 43v398l-413 675q-34 56 -95 68q-21 4 -121 4v62q126 -6 299.5 -6t246.5 6v-62h-24q-112 0 -112 -48 q0 -14 13 -35l356 -581l325 529q21 34 21 58q0 77 -113 77v62q155 -6 240.5 -6t178.5 6v-62zM271 1324q0 -20 -17 -48l-144 -237q-25 -41 -51 -41t-26 24q0 11 8 33l100 278q13 36 60 36q70 0 70 -45z" />
+<glyph unicode="&#x3d4;" horiz-adv-x="1566" d="M1499 1284q-173 0 -252 -128l-381 -619v-388q0 -34 10 -53q15 -29 90 -35h104v-61q-73 6 -127 6h-320q-55 0 -128 -6v61q8 0 25.5 -0.5t27.5 -0.5q124 0 142 36q7 14 7 43v398l-413 675q-34 56 -95 68q-21 4 -121 4v62q126 -6 299.5 -6t246.5 6v-62h-24q-112 0 -112 -48 q0 -14 13 -35l356 -581l325 529q21 34 21 58q0 77 -113 77v62q155 -6 240.5 -6t178.5 6v-62zM717 1574q32 -32 32 -78.5t-32 -79t-78 -32.5t-79 33.5t-33 78t33.5 77.5t79 33t77.5 -32zM1089 1574q32 -32 32 -78.5t-32 -79t-78 -32.5t-79 33.5t-33 78t33.5 77.5t79 33 t77.5 -32z" />
+<glyph unicode="&#x3d5;" horiz-adv-x="1201" d="M1021.5 791.5q127.5 -138.5 127.5 -318t-138.5 -329t-367.5 -166.5v-390h-84v389q-228 10 -367.5 154.5t-139.5 329.5q0 160 108.5 298t291.5 183l-3 -53q-120 -44 -181 -164q-44 -87 -50 -191q-1 -15 -1 -30q0 -146 70 -275q95 -172 272 -196v590q0 149 21 206 q38 101 162 101q152 0 279.5 -138.5zM724 859q-81 0 -81 -193v-635q174 10 263 134q72 100 78 256v24q0 142 -60 263q-75 151 -200 151z" />
+<glyph unicode="&#x3d6;" horiz-adv-x="1666" d="M1614 823h-246q158 -113 158 -383q0 -174 -79 -307q-93 -157 -255 -157q-185 0 -278 219q-93 -219 -278 -219q-162 0 -255 157q-79 133 -79 307q0 270 158 383h-222q-57 0 -118 -41q-55 -36 -55 -40q0 -1 1 -1q-16 0 -16 16q0 39 63.5 102.5t164.5 63.5h1336v-100z M1363 462q0 274 -135 361h-628q-135 -87 -135 -361q0 -432 202 -432q135 0 224 241q-67 140 -67 261q0 199 90 199t90 -199q0 -121 -67 -261q89 -241 224 -241q202 0 202 432z" />
+<glyph unicode="&#x3d7;" horiz-adv-x="1028" d="M976 259q0 -202 -65 -370q-83 -218 -243 -259q-41 -11 -112 -11q-14 0 -28 1h-62q-43 0 -63 -2q-87 -10 -139 -60h-44q21 142 154 177l264 43q159 44 225 203q-18 -5 -39 -5q-105 0 -150 221q-26 130 -28 307l-293 -235q-8 -293 -123 -293q-64 0 -64 96q0 206 188 352 q-5 124 -38 236q-49 163 -136 163q-80 0 -92 -161h-36v15q0 283 152 283q108 0 152 -213q26 -127 26 -300l288 232q15 281 122 281q46 0 60 -37q8 -20 8 -76q0 -171 -187 -321q6 -129 40 -243q50 -170 135 -170q80 0 92 161h36v-15z" />
+<glyph unicode="&#x3d8;" horiz-adv-x="1445" d="M672 79q-259 19 -431.5 210t-172.5 447.5t188 455t466.5 198.5t466.5 -198t188 -455t-172 -448t-432 -210v-74q0 -73 25 -183.5t25 -150t-28 -76.5t-73.5 -37t-70.5 43t-25 86.5t23 147.5t23 194v50zM1175 756q0 403 -266 538q-90 46 -186.5 46t-184.5 -45 q-268 -135 -268 -539q0 -436 273 -581q88 -47 177 -47t181 47q144 73 215 246q59 145 59 335z" />
+<glyph unicode="&#x3d9;" horiz-adv-x="1054" d="M863 824.5q139 -135.5 139 -310t-125 -298t-308 -138.5v-93q0 -88 30 -192t30 -139t-28.5 -65.5t-73 -30.5t-70 36t-25.5 75.5t27.5 143.5t27.5 196v68q-183 14 -308.5 139t-125.5 299.5t138.5 309.5t335.5 135t336 -135.5zM773 261q50 81 50 268.5t-59 267.5 q-83 114 -242 114t-238 -118q-54 -78 -54 -269t58 -275q83 -119 244 -119t241 131z" />
+<glyph unicode="&#x3da;" horiz-adv-x="1149" d="M1128 1370q0 -110 -109 -146q-59 -19 -200 -19h-357q-161 0 -270 -164q-98 -145 -98 -314q0 -207 144 -317q130 -101 344 -101q59 0 90 -39t31 -91v-174q0 -73 25 -183.5t25 -150t-28 -76.5t-73.5 -37t-70.5 43t-25 86.5t23 147.5t23 179t-10 100q-16 41 -66 46 q-232 23 -367 178t-135 389t116 412q133 204 345 204h405q125 0 236 75q2 -23 2 -48z" />
+<glyph unicode="&#x3db;" horiz-adv-x="1264" d="M601 -10l-164 -14q-174 0 -278 124.5t-104 301.5q0 240 166 380.5t410 140.5h600v-119h-592q-329 0 -451 -242q-40 -79 -40 -166q0 -120 73.5 -193.5t193.5 -73.5l163 7q99 0 162.5 -69t63.5 -169q0 -134 -92.5 -234t-228.5 -100t-136 83q0 23 22 45.5t48 22.5t79 -18.5 t82 -18.5q66 0 111 50.5t45 117.5q0 144 -133 144z" />
+<glyph unicode="&#x3dc;" horiz-adv-x="1216" d="M744 1281h-214q-51 0 -68.5 -13t-17.5 -66v-279h440l44 -350h-50q-25 155 -96 221.5t-248 66.5h-90v-724q0 -22 8 -39q17 -37 223 -37h22v-61q-74 6 -120 6h-382q-55 0 -127 -6v61q8 0 26 -0.5t28 -0.5q124 0 141 38q7 15 7 48v1053q0 31 -7 47q-15 35 -170 35h-25v62 h1026l55 -442h-49q-24 212 -82 285q-74 95 -274 95z" />
+<glyph unicode="&#x3dd;" horiz-adv-x="924" d="M891 804h-412q-145 0 -205 -46t-60 -141q0 -59 22 -154h381v-119h-381v-419q0 -214 -36 -342h-148q37 173 37 311v552q0 209 95 335q107 142 309 142h398v-119z" />
+<glyph unicode="&#x3de;" horiz-adv-x="910" d="M874.5 781.5q29.5 -31.5 29.5 -85t-11 -85.5l-316 -913q-48 -140 -119 -140q-86 0 -86 115q0 49 36 114l63 105q170 327 356 755h-666q-29 0 -50 21t-21 46t4 38l152 506q-6 -1 -10 -1q-93 0 -93 91q0 37 28 65.5t65.5 28.5t68 -27.5t30.5 -68.5t-15 -92l-130 -441h607 q48 0 77.5 -31.5z" />
+<glyph unicode="&#x3df;" horiz-adv-x="815" d="M771 465q0 -21 -21 -80l-245 -694q-47 -133 -116 -133q-87 0 -87 103q0 58 99 221q156 257 295 539h-557q-69 0 -69 70q0 15 4 23l209 418q-7 -1 -10 -1q-92 0 -92 89q0 36 28 64.5t64.5 28.5t63 -28t26.5 -73.5t-19 -83.5l-181 -364h493q115 0 115 -99z" />
+<glyph unicode="&#x3e0;" horiz-adv-x="1474" d="M1063 6q-110 0 -182 -6v61h6q152 0 152 54q0 10 -163 462l-140 -371q-9 -24 -9 -42q0 -51 44 -76.5t100 -26.5v-61q-182 6 -234.5 6t-152.5 -6v61h2q133 0 183 136l173 472l-166 456l-346 -919q-9 -24 -9 -42q0 -51 47.5 -76.5t104.5 -26.5v-61q-183 6 -244 6t-161 -6v61 h2q143 0 193 136l430 1172q15 42 45 42t45 -42l444 -1223q6 -20 25 -56q25 -29 135 -29h21v-61q-235 6 -345 6z" />
+<glyph unicode="&#x3e1;" horiz-adv-x="1238" d="M1174 175q0 -158 -20 -189q-4 -7 -16 -7q-22 0 -22 57q0 205 -119 393q-166 -188 -235 -383q-26 -74 -67 -74q-37 0 -61.5 24.5t-24.5 61.5q0 136 325 459q-58 72 -134 141q-28 -36 -54 -65l-481 -543q-69 -78 -120 -78q-29 0 -55 23t-26 53.5t46 65.5q313 235 636 590 q-225 180 -504 180q-32 0 -32 23q0 11 7 16q31 20 188 20q338 0 553.5 -215t215.5 -553z" />
+<glyph unicode="&#x3e2;" horiz-adv-x="1686" d="M1026 -368l-212 8q-165 0 -263 -82h-44q16 123 116 170q62 29 208 41t207 19q291 33 408 304q-121 -135 -303 -135q-236 0 -296 247h-8q-60 -247 -295.5 -247t-366.5 222q-109 186 -109 438q0 345 161 546q174 218 511 227v-43q-470 -25 -470 -712q0 -626 295 -626 q94 0 156.5 99t62.5 205t-23 210.5t-23 122.5q0 125 105 125t105 -125q0 -18 -23 -122.5t-23 -210.5t62.5 -205t156.5 -99q295 0 295 626q0 687 -470 712v43q337 -9 511 -227q161 -201 161 -546q0 -306 -103 -574q-131 -344 -375 -401q-43 -10 -114 -10z" />
+<glyph unicode="&#x3e3;" horiz-adv-x="1294" d="M1241 430q0 -723 -318 -800q-42 -10 -116 -10h-26q-27 1 -49 1q-55 0 -82 -4q-80 -11 -131 -59h-44q21 151 178 183l294 56q166 72 209 321q-92 -142 -249 -142q-224 0 -256 267h-8q-32 -267 -256 -267q-162 0 -255 152q-79 129 -79 302q0 244 124.5 385.5t365.5 144.5 v-48q-327 -10 -327 -470q0 -169 25 -257q44 -155 169 -155q99 0 149 102q39 79 39 191.5t-23 219.5t-23 122q0 116 95 116t95 -116q0 -15 -23 -122t-23 -219.5t39 -191.5q50 -102 149 -102q125 0 169 155q25 88 25 257q0 460 -327 470v48q242 -3 366 -144t124 -386z" />
+<glyph unicode="&#x3e4;" horiz-adv-x="1567" d="M1500 1284l-75 2q-140 0 -140 -85v-1057q0 -27 11 -48q19 -35 186 -35h18v-61q-71 6 -117 6h-373q-41 0 -112 -6v61q8 0 29 -0.5t32 -0.5q124 0 143 36q9 17 9 49v586q-43 -88 -119 -157q-185 -168 -420 -168q-196 0 -357.5 145.5t-161.5 343t132 346.5t330 149 q121 0 215 -54q113 -64 113 -170t-97 -106q-42 0 -70.5 28t-28.5 70q0 94 100 99q-79 78 -229 78q-60 0 -120 -34q-168 -95 -168 -405q0 -161 89 -291q99 -145 253 -145q220 0 392 164q147 140 147 358v219q0 32 -9 49q-15 28 -93 34h-111v62q70 -6 115 -6h376q42 0 111 6 v-62z" />
+<glyph unicode="&#x3e5;" horiz-adv-x="1204" d="M1151 0q-193 6 -236 6t-236 -6v66l44 -1q66 0 89 13q33 18 33 79v307q-27 -44 -72 -83q-135 -119 -307 -119t-292.5 97t-120.5 257t107 252t264 92q89 0 159 -39q85 -47 85 -126t-78.5 -79t-78.5 75q0 55 61 75q-60 39 -155.5 39t-151 -83.5t-55.5 -201t67.5 -211.5 t187.5 -94q154 0 267 102.5t113 254.5v94q0 61 -33 79q-23 13 -89 13l-44 -1v66q193 -6 236 -6t236 6v-66l-44 1q-66 0 -89 -13q-33 -18 -33 -79v-609q0 -61 33 -79q23 -13 89 -13l44 1v-66z" />
+<glyph unicode="&#x3e6;" horiz-adv-x="1533" d="M1465 369q0 -253 -114 -482q-140 -278 -367 -278q-84 0 -246 43t-246 43q-173 0 -206 -137h-68q33 136 141 189q82 40 239 40q64 0 188 -32.5t188 -32.5q154 0 233 242q56 173 56 371q0 278 -98 486q-127 269 -373 269q-197 0 -316 -170q-32 -46 -32 -72v-707 q0 -31 8 -45q20 -36 146 -36q24 0 51 1v-61q-68 6 -115 6h-358q-42 0 -108 -6v61q42 -1 62 -1q110 0 133 36q7 11 7 41v1068q0 32 -7 45q-19 35 -157 35q-18 0 -38 -1v62q66 -6 112 -6h354q48 0 115 6v-62q-42 2 -61 2q-114 0 -136 -36q-8 -13 -8 -45v-175q157 110 348 110 q320 0 504 -231q169 -212 169 -540z" />
+<glyph unicode="&#x3e7;" horiz-adv-x="1183" d="M1131 446q0 -294 -220 -421q-85 -49 -174 -49q-227 0 -402 286q-43 70 -100 70t-57 -64q0 -41 32 -104l-46 -26q-34 66 -34 127t46 111t114 50q113 0 206 -155q53 -88 136 -152t177 -64t149 67.5t55 166.5q0 143 -79.5 308t-189.5 289q-190 -168 -342 -168 q-204 0 -317 200q-33 58 -33 114q0 116 98.5 183.5t219.5 67.5q239 0 481 -223q54 73 84 73q12 0 12 -14q0 -30 -65 -88q249 -247 249 -585zM271 1201q-73 0 -119.5 -46.5t-46.5 -119.5q0 -111 101.5 -189t216.5 -78q135 0 292 150q-256 283 -444 283z" />
+<glyph unicode="&#x3e8;" horiz-adv-x="1017" d="M950 420q0 -189 -134.5 -326t-312.5 -137t-306.5 121.5t-128.5 288.5q0 131 69.5 231t191.5 150l195 66q102 35 156 84q72 67 72 175.5t-74.5 185t-183.5 76.5q-160 0 -245 -99q109 0 109 -100q0 -42 -29.5 -69.5t-71.5 -27.5q-96 0 -96 110.5t120 180.5q102 60 222 60 q159 0 270 -111.5t111 -270.5q0 -114 -61 -207t-165 -142q-48 -23 -142.5 -52t-111.5 -35q-108 -38 -156 -112t-48 -163q0 -114 97.5 -196.5t210 -82.5t204.5 60t143 159q30 58 48 177q5 32 24 32q23 0 23 -26z" />
+<glyph unicode="&#x3e9;" horiz-adv-x="928" d="M752 832q124 -128 124 -301.5t-160 -332.5q-37 -37 -298 -238q-160 -123 -160 -200.5t74 -115.5q60 -31 140 -31q148 0 229 78q-43 1 -72 29t-29 70.5t28 70.5t71 28q98 0 98 -106.5t-112 -170.5q-94 -54 -209 -54t-208 44q-115 56 -115 153q0 113 120 224l203 174 q-178 26 -301 141t-123 285.5t114.5 275.5t288 105t297.5 -128zM662 376q68 106 68 224t-70 212t-201.5 94t-199.5 -110q-58 -91 -58 -236t86 -240.5t233 -118.5q104 114 142 175z" />
+<glyph unicode="&#x3ea;" horiz-adv-x="1479" d="M1091 1390q122 0 193.5 -78.5t71.5 -188.5t-33 -110q-29 0 -34 26v49q0 66 -63.5 129t-129.5 63q-168 0 -293 -209q434 -1027 434 -1049t-28 -22h-905q-24 0 -24 22q0 13 10 37l383 911q-61 184 -86 233q-74 144 -177 144q-145 0 -217 -114h6q119 0 119 -110 q0 -47 -31 -78.5t-78.5 -31.5t-78.5 32.5t-31 81.5q0 117 97 190t222.5 73t206.5 -57t141 -179q145 236 325 236zM1010 149l-302 726l-306 -726h608z" />
+<glyph unicode="&#x3eb;" horiz-adv-x="1004" d="M894.5 906q56.5 -54 56.5 -130t-37.5 -76t-37.5 54q0 135 -119 135q-87 0 -187 -158q298 -688 298 -703q0 -28 -33 -28h-625q-31 0 -31 28q0 12 271 637q-39 118 -56 152q-48 96 -111 96q-93 0 -122 -50q75 -10 75 -91q0 -39 -26.5 -65.5t-66 -26.5t-65 27t-25.5 67 q0 85 72.5 135.5t160.5 50.5q162 0 244 -145q99 145 223 145q85 0 141.5 -54zM677 127l-188 439l-190 -439h378z" />
+<glyph unicode="&#x3ec;" horiz-adv-x="1695" d="M1628 1370q0 -110 -135 -146q-71 -19 -215.5 -19t-309.5 67.5t-255 67.5t-181 -53q-262 -153 -262 -591q0 -470 265 -632q92 -56 185.5 -56t187.5 55q267 156 267 633q0 137 -29 253l97 86q134 -169 134 -366q0 -284 -187.5 -498t-467 -214t-467 214.5t-187.5 498.5 t187 502t467 218q103 0 309 -23.5t309 -23.5q174 0 286 75q2 -23 2 -48z" />
+<glyph unicode="&#x3ed;" horiz-adv-x="1177" d="M1128 950q0 -45 -66.5 -88t-191.5 -43t-233.5 46.5t-169.5 46.5q-134 0 -200 -121q-52 -96 -52 -262.5t67 -311.5q87 -187 251 -187q249 0 249 376q0 148 -43 268l88 29q42 -30 80 -94t38 -123q0 -206 -127.5 -358t-324.5 -152t-319 143.5t-122 341t126.5 348.5 t321.5 151q57 0 170 -18.5t170 -18.5q173 0 286 75q2 -24 2 -48z" />
+<glyph unicode="&#x3ee;" horiz-adv-x="1286" d="M944 1284l-59 2q-75 0 -103 -9q-53 -18 -53 -76v-59q197 -20 328 -105q161 -104 161 -278q0 -106 -45 -187q-55 -97 -153 -97q-42 0 -69 28.5t-27 70.5t29 69.5t71 27.5q77 0 96 -83q46 67 46 155q0 151 -146 234q-112 64 -291 79v-912q0 -27 13.5 -52t91.5 -31h110v-61 q-71 6 -117 6h-373q-41 0 -112 -6v61q8 0 27.5 -0.5t29.5 -0.5q128 0 147 36q9 17 9 49v910q-178 -15 -290 -79q-145 -83 -145 -233q0 -88 46 -155q19 83 96 83q42 0 71 -27.5t29 -69.5t-27 -70.5t-69 -28.5q-98 0 -153 97q-45 81 -45 187q0 174 160 278q130 85 327 105v59 q0 32 -9 49q-18 34 -153 34h-51v62q71 -6 115 -6h376q41 0 111 6v-62z" />
+<glyph unicode="&#x3ef;" horiz-adv-x="970" d="M917 435q0 -62 -37.5 -119t-96.5 -57q-39 0 -68 31t-29 70t29.5 68.5t71 29.5t75.5 -37q1 11 1 18q0 223 -307 248v-530q0 -61 33 -79q23 -13 89 -13l44 1v-66q-193 6 -236 6t-236 -6v66l44 -1q66 0 89 13q33 18 33 79v530q-309 -24 -309 -248q0 -7 1 -18q34 37 75.5 37 t71 -29.5t29.5 -68.5t-29 -70t-68 -31q-59 0 -96.5 57t-37.5 119q0 145 114 228q95 70 249 84v19q0 61 -33 79q-23 13 -89 13l-44 -1v66q193 -6 236 -6t236 6v-66l-44 1q-66 0 -89 -13q-33 -18 -33 -79v-19q153 -15 248 -84q113 -83 113 -228z" />
+<glyph unicode="&#x3f0;" horiz-adv-x="1028" d="M976 259q0 -283 -152 -283q-105 0 -150 221q-26 130 -28 307l-293 -235q-8 -293 -123 -293q-64 0 -64 96q0 206 188 352q-5 124 -38 236q-49 163 -136 163q-80 0 -92 -161h-36v15q0 283 152 283q108 0 152 -213q26 -127 26 -300l288 232q15 281 122 281q46 0 60 -37 q8 -20 8 -76q0 -171 -187 -321q6 -129 40 -243q50 -170 135 -170q80 0 92 161h36v-15z" />
+<glyph unicode="&#x3f1;" horiz-adv-x="998" d="M52 459q0 200 126 350.5t321 150.5t320.5 -139t125.5 -340t-127.5 -353t-329.5 -152q-235 0 -360 207q32 -291 199 -376q23 -12 303 -64q166 -30 188 -185h-44q-64 61 -194 63q-181 2 -210 9q-318 80 -318 829zM782 406q0 187 -65 326q-84 180 -250 180q-134 0 -200 -121 q-52 -96 -52 -262.5t67 -311.5q87 -187 251 -187q249 0 249 376z" />
+<glyph unicode="&#x3f2;" horiz-adv-x="920" d="M839 276q29 0 29 -22.5t-27 -74.5q-106 -203 -329 -203q-194 0 -326.5 144.5t-132.5 343t132 347.5t330 149q99 0 207 -48q131 -58 131 -141t-81 -83q-47 0 -74 56q-48 99 -52 105q-43 56 -128 56q-60 0 -120 -34q-168 -95 -168 -403t178 -404q63 -34 123 -34 q113 0 181 64q40 37 74 109.5t53 72.5z" />
+<glyph unicode="&#x3f3;" horiz-adv-x="588" d="M385 -107q0 -133 -81 -232.5t-211 -99.5q-90 0 -159 40q-83 48 -83 132q0 42 27.5 70t69.5 28t70.5 -28t28.5 -70q0 -76 -74 -96q58 -29 114 -29q158 0 158 281v861q0 39 -9 60q-20 45 -148 45h-27v68l324 23v-1053z" />
+<glyph unicode="&#x3f4;" horiz-adv-x="1445" d="M722 -43q-280 0 -467 214t-187 498.5t186.5 502.5t468 218t468 -217.5t186.5 -503t-187.5 -499t-467.5 -213.5zM915 1286q-92 54 -192 54t-191 -53q-250 -146 -261 -556h903q-11 410 -259 555zM535 64q91 -56 185 -56t188 55q258 151 267 608h-905q8 -450 265 -607z" />
+<glyph unicode="&#x3f5;" horiz-adv-x="920" d="M839 276q29 0 29 -22.5t-27 -74.5q-106 -203 -329 -203q-194 0 -326.5 144.5t-132.5 343t132 347.5t330 149q99 0 207 -48q131 -58 131 -141t-81 -83q-47 0 -74 56q-48 99 -52 105q-43 56 -128 56q-60 0 -120 -34q-157 -88 -167 -371h330q59 0 59 -38.5t-59 -38.5h-330 q14 -271 177 -359q63 -34 123 -34q113 0 181 64q40 37 74 109.5t53 72.5z" />
+<glyph unicode="&#x3f6;" horiz-adv-x="920" d="M406 960q198 0 330 -149t132 -347.5t-132.5 -343t-326.5 -144.5q-223 0 -329 203q-27 52 -27 74.5t29 22.5q19 0 53 -72.5t74 -109.5q68 -64 181 -64q60 0 123 34q163 88 177 359h-330q-59 0 -59 38.5t59 38.5h330q-10 283 -167 371q-60 34 -120 34q-85 0 -128 -56 q-4 -6 -52 -105q-27 -56 -74 -56q-81 0 -81 83t131 141q108 48 207 48z" />
+<glyph unicode="&#x3f7;" horiz-adv-x="1076" d="M736 1287l-82 2q-137 0 -159 -37q-13 -22 -13 -58v-66q1 -34 1 -47q193 -16 344 -114q180 -118 180 -293.5t-181 -293.5q-152 -99 -343 -114v-110q0 -39 7 -56q16 -40 202 -40q21 0 44 1v-61q-75 6 -154 6h-359q-80 0 -155 -6v61l81 -2q137 0 160 37q12 20 12 60v1038 q0 37 -7 54q-16 39 -225 39h-21v62q75 -6 155 -6h359q79 0 154 6v-62zM483 311q328 36 328 364t-328 362v-726z" />
+<glyph unicode="&#x3f8;" horiz-adv-x="990" d="M493 960q194 0 319.5 -138.5t125.5 -340t-127.5 -353.5t-329.5 -152q-145 0 -245 113q0 -23 0.5 -79.5t0.5 -84.5q0 -214 -36 -342h-149q37 173 37 311v1085q-1 55 -1 82q0 214 36 342h149q-37 -173 -37 -311v-218q101 86 257 86zM775 406q0 187 -65 326 q-84 180 -250 180q-108 0 -166 -84.5t-58 -197.5v-344q0 -110 89 -183t201 -73q249 0 249 376z" />
+<glyph unicode="&#x3f9;" horiz-adv-x="1335" d="M1243 320q0 -11 -5 -23q-63 -157 -191.5 -248.5t-294.5 -91.5q-288 0 -486 213t-198 502.5t198.5 503.5t485.5 214q166 0 294.5 -91.5t191.5 -248.5q5 -12 5 -23q0 -24 -23 -24q-15 0 -27.5 28.5t-49.5 95.5q-132 203 -366 203q-102 0 -209 -52q-298 -145 -298 -613.5 t322 -606.5q96 -41 185 -41q234 0 366 203q20 31 52 101q10 23 25 23q23 0 23 -24z" />
+<glyph unicode="&#x3fa;" horiz-adv-x="2085" d="M2019 0q-242 6 -344.5 6t-175.5 -6v62h5q161 0 161 58q0 15 -4 27l-316 968l-323 -1001q-13 -39 -39.5 -39t-38.5 37l-329 1003l-296 -910q-10 -31 -10 -39q0 -53 63 -81q48 -22 109 -23v-62q-155 6 -239 6t-174 -6v62q152 0 195 132l378 1156q13 39 38.5 39t37.5 -37 l328 -1003l323 1001q13 39 39.5 39t38.5 -37l395 -1207q6 -19 23 -53q23 -30 134 -30h21v-62z" />
+<glyph unicode="&#x3fb;" horiz-adv-x="1531" d="M656 267q-25 0 -40 41l-167 462l-199 -365q-41 -75 -41 -117.5t16.5 -110.5t16.5 -103q0 -98 -103 -98q-36 0 -61.5 26.5t-25.5 62.5q0 93 83 247l327 607q22 41 41 41q25 0 40 -41l169 -463l250 463q22 41 41 41q25 0 40 -41l234 -640q48 -131 86 -152q25 -14 116 -14 v-49q-83 -1 -195 -88h-30q-55 105 -97 221l-208 573l-252 -462q-22 -41 -41 -41z" />
+<glyph unicode="&#x3fc;" horiz-adv-x="990" d="M184 818q107 142 305 142t323.5 -138.5t125.5 -340t-127.5 -353.5t-329.5 -152q-145 0 -245 113q0 -24 0.5 -82t0.5 -100.5t-2 -86.5h429v-100h-436q-8 -82 -27 -151h-149q17 80 26 151h-68v100h77q2 35 2 69v594q0 209 95 335zM775 406q0 187 -65 326q-84 180 -250 180 q-108 0 -166 -84.5t-58 -197.5v-344q0 -110 89 -183t201 -73q249 0 249 376z" />
+<glyph unicode="&#x3fd;" horiz-adv-x="1335" d="M583 1390q288 0 486 -213t198 -502.5t-199 -503.5t-485 -214q-167 0 -295.5 91.5t-190.5 248.5q-5 12 -5 23q0 24 23 24q14 0 27 -28.5t50 -95.5q132 -203 366 -203q102 0 209 52q298 145 298 613.5t-322 606.5q-96 41 -185 41q-234 0 -366 -203q-21 -31 -52 -101 q-11 -23 -25 -23q-23 0 -23 24q0 11 5 23q62 157 191 248.5t295 91.5z" />
+<glyph unicode="&#x3fe;" horiz-adv-x="1335" d="M1243 320q0 -11 -5 -23q-63 -157 -191.5 -248.5t-294.5 -91.5q-288 0 -486 213t-198 502.5t198.5 503.5t485.5 214q166 0 294.5 -91.5t191.5 -248.5q5 -12 5 -23q0 -24 -23 -24q-15 0 -27.5 28.5t-49.5 95.5q-132 203 -366 203q-102 0 -209 -52q-298 -145 -298 -613.5 t322 -606.5q96 -41 185 -41q234 0 366 203q20 31 52 101q10 23 25 23q23 0 23 -24zM870 672q0 -46 -32 -78t-78 -32t-78 32t-32 78t32 78t78 32t78 -32t32 -78z" />
+<glyph unicode="&#x3ff;" horiz-adv-x="1335" d="M583 1390q288 0 486 -213t198 -502.5t-199 -503.5t-485 -214q-167 0 -295.5 91.5t-190.5 248.5q-5 12 -5 23q0 24 23 24q14 0 27 -28.5t50 -95.5q132 -203 366 -203q102 0 209 52q298 145 298 613.5t-322 606.5q-96 41 -185 41q-234 0 -366 -203q-21 -31 -52 -101 q-11 -23 -25 -23q-23 0 -23 24q0 11 5 23q62 157 190.5 248.5t295.5 91.5zM685 675q0 -46 -32.5 -78t-78 -32t-77.5 32t-32 78t32 78t77.5 32t78 -32t32.5 -78z" />
+<glyph unicode="&#x400;" horiz-adv-x="1354" d="M68 0v61q47 -1 53 -1q125 0 142 38q7 16 7 48v1053q0 30 -7 47q-15 36 -152 36q-20 0 -43 -1v62h1108l56 -442h-49q-24 218 -99.5 299t-288.5 81h-263q-54 0 -71 -13.5t-17 -65.5v-474h178q134 0 173.5 46.5t39.5 182.5h51v-521h-51q0 136 -40 183t-173 47h-178v-526 q0 -52 17 -65.5t71 -13.5h273q236 0 326 111q67 84 107 336h49l-84 -508h-1135zM493 1532q0 28 20 51t44.5 23t43.5 -13l292 -195l-26 -50l-328 123q-46 17 -46 61z" />
+<glyph unicode="&#x401;" horiz-adv-x="1354" d="M68 0v61q47 -1 53 -1q125 0 142 38q7 16 7 48v1053q0 30 -7 47q-15 36 -152 36q-20 0 -43 -1v62h1108l56 -442h-49q-24 218 -99.5 299t-288.5 81h-263q-54 0 -71 -13.5t-17 -65.5v-474h178q134 0 173.5 46.5t39.5 182.5h51v-521h-51q0 136 -40 183t-173 47h-178v-526 q0 -52 17 -65.5t71 -13.5h273q236 0 326 111q67 84 107 336h49l-84 -508h-1135zM958 1574q32 -32 32 -78.5t-32 -79t-78 -32.5t-78.5 33.5t-32.5 78t33 77.5t78.5 33t77.5 -32zM585.5 1574q32.5 -32 32.5 -78.5t-32.5 -79t-78 -32.5t-78.5 33.5t-33 78t33 77.5t78.5 33 t78 -32z" />
+<glyph unicode="&#x402;" horiz-adv-x="1668" d="M1503.5 711q111.5 -116 111.5 -293.5t-100 -307.5t-258 -130q-88 0 -161 47t-73 130q0 92 90.5 92t90.5 -90q0 -78 -80 -91q54 -39 129 -39q112 0 163 138q36 96 36 242t-74.5 257.5t-224.5 111.5q-100 0 -230 -87t-130 -182v-353q0 -40 10 -58q18 -33 114 -33q19 0 41 1 v-66q-199 6 -249.5 6t-256.5 -6v66q28 -1 71.5 -1t69 16.5t25.5 80.5v1055q0 64 -109 64t-189.5 -9.5t-126.5 -52.5t-65 -141h-46l22 264h1206l22 -264h-47q-20 102 -67 144t-151 53q-60 6 -179 6q-95 0 -95 -65v-571q152 182 408 182q191 0 302.5 -116z" />
+<glyph unicode="&#x403;" horiz-adv-x="1216" d="M744 1281h-214q-51 0 -68.5 -13t-17.5 -66v-1065q0 -22 8 -39q17 -37 223 -37h22v-61q-74 6 -120 6h-382q-55 0 -127 -6v61q8 0 26 -0.5t28 -0.5q124 0 141 38q7 15 7 48v1053q0 31 -7 47q-15 35 -170 35h-25v62h1026l55 -442h-49q-24 212 -82 285q-74 95 -274 95z M893 1532q0 -44 -46 -61l-328 -123l-26 50l292 195q19 13 43.5 13t44.5 -23t20 -51z" />
+<glyph unicode="&#x404;" horiz-adv-x="1335" d="M1266 934q0 -26 -28.5 -26t-35.5 32q-34 154 -155 271t-272 117q-105 0 -207 -50q-263 -129 -294 -510q144 95 274 95t224 -58l143 -108q80 -58 165 -58q53 0 105.5 30.5t48.5 30.5q19 0 19 -26t-31 -51q-111 -90 -214.5 -90t-179.5 67q-177 155 -355 155 q-122 0 -202 -45l-1 -38v-19q0 -454 322 -595q94 -41 185 -41q179 0 309 130q55 56 77 101.5t47 135.5q8 29 23 29q27 0 27 -22q0 -6 -2 -17q-35 -180 -178.5 -298.5t-327.5 -118.5q-288 0 -486 213t-198 502.5t198.5 503.5t485.5 214q193 0 363 -169l99 144q17 25 31 25 q21 0 21 -33v-423z" />
+<glyph unicode="&#x405;" horiz-adv-x="1007" d="M860.5 616.5q79.5 -107.5 79.5 -262.5t-110.5 -276t-277.5 -121q-236 0 -362 137l-72 -111q-16 -26 -30 -26q-20 0 -20 29v431q0 29 24 29q30 0 30 -72q0 -143 117 -250t311 -107q114 0 189 84t75 192.5t-59 184.5t-170 104q-88 17 -260 65q-116 42 -186.5 140t-70.5 221 q0 160 111 271t278 111t309 -139l69 112q17 27 29 27q24 0 24 -33v-429q0 -28 -28 -28q-18 0 -23 22q-7 41 -25 122q-81 290 -360 290q-109 0 -183.5 -74.5t-74.5 -183.5q0 -189 199 -250q85 -19 252 -62q136 -40 215.5 -147.5z" />
+<glyph unicode="&#x406;" horiz-adv-x="736" d="M670 1284l-59 2q-75 0 -103 -9q-53 -18 -53 -76v-1057q0 -27 13.5 -52t91.5 -31h110v-61q-71 6 -117 6h-373q-41 0 -112 -6v61q8 0 27.5 -0.5t29.5 -0.5q128 0 147 36q9 17 9 49v1056q0 32 -9 49q-18 34 -153 34h-51v62q71 -6 115 -6h376q41 0 111 6v-62z" />
+<glyph unicode="&#x407;" horiz-adv-x="736" d="M670 1284l-59 2q-75 0 -103 -9q-53 -18 -53 -76v-1057q0 -27 13.5 -52t91.5 -31h110v-61q-71 6 -117 6h-373q-41 0 -112 -6v61q8 0 27.5 -0.5t29.5 -0.5q128 0 147 36q9 17 9 49v1056q0 32 -9 49q-18 34 -153 34h-51v62q71 -6 115 -6h376q41 0 111 6v-62zM629 1574 q32 -32 32 -78.5t-32 -79t-78 -32.5t-78.5 33.5t-32.5 78t33 77.5t78.5 33t77.5 -32zM256.5 1574q32.5 -32 32.5 -78.5t-32.5 -79t-78 -32.5t-78.5 33.5t-33 78t33 77.5t78.5 33t78 -32z" />
+<glyph unicode="&#x408;" horiz-adv-x="970" d="M752 284q0 -141 -112.5 -234t-245 -93t-229.5 73t-97 190q0 49 30.5 81.5t78.5 32.5t79 -31.5t31 -78.5q0 -110 -121 -110h-4q71 -114 217 -114q99 0 156 101q47 83 47 190v910q0 29 -9 47q-19 36 -223 36h-32v62q78 -6 161 -6h221q73 0 203 6v-62l-42 2q-60 0 -85 -14 t-25 -69z" />
+<glyph unicode="&#x409;" horiz-adv-x="2095" d="M1478 1281l-59 2q-76 0 -103 -9q-53 -18 -53 -76v-477h256q188 0 334 -85q174 -101 174 -269t-135.5 -267.5t-302.5 -99.5h-703v61q8 0 27.5 -0.5t29.5 -0.5q128 0 147 36q9 17 9 49v1053q0 32 -9 49q-18 34 -153 34h-67q-188 0 -215 -35q-11 -14 -11 -63 q0 -227 -12 -426q-46 -757 -354 -757q-86 0 -148 60t-62 146q0 45 30 76t74 31t74 -30t30 -75q0 -81 -77 -102q31 -14 75 -14q200 0 256 520q21 195 21 511q0 113 -13 132q-18 27 -187 27v61h1127v-62zM1743 147q88 86 88 221t-87 222t-210 87h-271v-537q0 -53 16.5 -66 t69.5 -13h177q129 0 217 86z" />
+<glyph unicode="&#x40a;" horiz-adv-x="2041" d="M1424 1284l-59 2q-76 0 -103 -9q-53 -18 -53 -76v-480h256q188 0 334 -85q174 -101 174 -269t-135.5 -267.5t-302.5 -99.5h-703v61q9 0 28 -0.5t29 -0.5q119 0 137 36q8 16 8 45v530h-590v-530q0 -29 8 -45q18 -35 187 -35h10v-61q-71 6 -115 6h-358q-37 0 -108 -6v61 q9 0 27.5 -0.5t28.5 -0.5q121 0 139 36q7 14 7 45v1064q0 31 -7 45q-17 34 -149 34h-46v62q70 -6 112 -6h354q45 0 115 6v-62l-55 2q-123 0 -142 -36q-8 -16 -8 -45v-474h590v474q0 29 -8 45q-17 34 -148 34h-46v62q70 -6 112 -6h367q43 0 113 6v-62zM1689 147q88 86 88 221 t-87 222t-210 87h-271v-537q0 -53 16.5 -66t69.5 -13h177q129 0 217 86z" />
+<glyph unicode="&#x40b;" horiz-adv-x="1647" d="M1595 0q-199 6 -238 6t-244 -6v66q28 -1 69.5 -1t64.5 12q33 19 33 76v429q0 95 -44 161t-134 66q-130 0 -219.5 -105.5t-89.5 -237.5v-310q0 -40 10 -58q18 -33 114 -33q19 0 41 1v-66q-199 6 -249.5 6t-256.5 -6v66q28 -1 71.5 -1t69 16.5t25.5 80.5v1055q0 64 -109 64 t-189.5 -9.5t-126.5 -52.5t-65 -141h-46l22 264h1206l22 -264h-47q-20 102 -67 144t-151 53q-60 6 -179 6q-95 0 -95 -65v-552q43 86 134 139t189 53q312 0 312 -314v-412q0 -65 130 -65q17 0 37 1v-66z" />
+<glyph unicode="&#x40c;" horiz-adv-x="1514" d="M649 1284l-57 2q-126 0 -142 -40q-6 -15 -6 -44v-447q324 0 480 158q72 73 163 294q65 158 167 158q53 0 92 -41t39 -95q0 -92 -90 -92q-39 0 -65 25.5t-26 56.5t10 53q-41 -17 -97.5 -159.5t-116.5 -215.5q-106 -130 -287 -165v-8q116 -16 221 -77.5t151 -157.5 q25 -54 39 -150l25 -181q30 -158 118 -158q99 0 131 175q6 31 24 31q24 0 24 -33q0 -86 -51.5 -151t-134.5 -65q-330 0 -330 318q0 13 1 40v40q0 136 -83 239.5t-216 103.5h-188v-559q0 -28 9 -45q17 -33 186 -33h10v-61q-71 6 -120 6h-347q-43 0 -114 -6v61q8 0 26.5 -0.5 t28.5 -0.5q125 0 141 40q6 15 6 44v1066q0 27 -7 41q-16 33 -176 33h-19v62q70 -6 119 -6h342q50 0 120 6v-62zM1093 1532q0 -44 -46 -61l-328 -123l-26 50l292 195q19 13 43.5 13t44.5 -23t20 -51z" />
+<glyph unicode="&#x40d;" horiz-adv-x="1631" d="M1564 1284l-56 2q-122 0 -140 -36q-8 -16 -8 -45v-1064q0 -29 8 -45q18 -35 186 -35h10v-61q-71 6 -113 6h-361q-36 0 -107 -6v61q9 0 28 -0.5t29 -0.5q119 0 137 36q8 16 8 45v964l-734 -1008l1 -1q14 -30 90 -35q3 0 30 -0.5t77 0.5v-61q-71 6 -115 6h-358 q-37 0 -108 -6v61q9 0 27.5 -0.5t28.5 -0.5q121 0 139 36q7 14 7 45v1064q0 31 -7 45q-17 34 -149 34h-46v62q70 -6 112 -6h354q45 0 115 6v-62l-55 2q-123 0 -142 -36q-8 -16 -8 -45v-967l734 1009q-15 37 -149 37h-46v62q70 -6 112 -6h356q43 0 113 6v-62zM563 1532 q0 28 20 51t44.5 23t43.5 -13l292 -195l-26 -50l-328 123q-46 17 -46 61z" />
+<glyph unicode="&#x40e;" horiz-adv-x="1591" d="M441 -20q-135 0 -214.5 72.5t-79.5 206.5q0 106 99 106q42 0 69.5 -27t27.5 -69.5t-28 -70t-71 -27.5q-14 0 -35 5q20 -70 87 -106t149.5 -36t168.5 135q53 83 136 234l-466 798q-10 19 -37 52q-33 29 -170 29h-9v64q196 -6 246 -6t234 6v-64h-4q-91 0 -91 -41 q0 -14 18 -45l371 -636l345 590q23 39 23 65q0 65 -73 67v64q183 -6 233.5 -6t152.5 6v-64q-171 -2 -248 -134l-550 -940q-133 -228 -284 -228zM1203 1516q0 -85 -140 -130q-101 -33 -211 -33t-211 33q-140 45 -140 130q0 39 25 64.5t64 25.5t64 -25.5t25 -70.5t-38 -70 q63 -24 174 -24h74q111 0 174 24q-38 25 -38 70t25 70.5t64 25.5t64 -25.5t25 -64.5z" />
+<glyph unicode="&#x40f;" horiz-adv-x="1481" d="M1413 0h-579q-30 -148 -36 -287h-115q-6 139 -36 287h-579v62h106q77 6 90 38q6 15 6 41v1062q0 52 -39 69q-25 11 -85 11h-78v61q71 -6 108 -6h360q42 0 113 6v-61q-49 1 -76 1t-33 -1q-77 -7 -90 -39q-6 -15 -6 -41v-1141h590v1141q0 52 -39 69q-25 11 -85 11h-78v61 q71 -6 107 -6h361q42 0 113 6v-61q-49 1 -76 1t-32 -1q-77 -7 -90 -39q-6 -15 -6 -41v-1062q0 -27 6 -41q16 -39 137 -39h31q22 1 30 1v-62z" />
+<glyph unicode="&#x410;" horiz-adv-x="1484" d="M1417 0q-127 6 -297.5 6t-244.5 -6v61h5q157 0 157 59q0 29 -39 136l-70 192h-487l-61 -163q-34 -90 -34 -123q0 -51 52 -78q42 -23 97 -23v-61q-189 6 -239.5 6t-187.5 -6v61q174 2 219 133l409 1177q14 40 46 40t46 -40l425 -1231q21 -61 84 -75q19 -5 77 -5q19 0 43 1 v-61zM906 510l-222 641l-220 -641h442z" />
+<glyph unicode="&#x411;" horiz-adv-x="1346" d="M1104 636q174 -101 174 -269t-135.5 -267.5t-302.5 -99.5h-772v61q62 -2 63 -2q113 0 134 45q5 11 5 42v1053q0 31 -7 47q-15 35 -170 35h-25v62h1016l55 -442h-49q-24 212 -82 285q-74 95 -274 95h-214q-51 0 -68.5 -13.5t-17.5 -65.5v-481h336q188 0 334 -85zM994 147 q88 86 88 221t-87 222t-210 87h-351v-537q0 -53 16.5 -66t69.5 -13h257q129 0 217 86z" />
+<glyph unicode="&#x412;" horiz-adv-x="1346" d="M1278 360q0 -161 -135.5 -260.5t-302.5 -99.5h-772v61q62 -2 63 -2q113 0 134 45q5 11 5 42v1051q0 31 -5 42q-19 43 -152 43q-21 0 -45 -1v62h720q161 0 290 -83q148 -95 148 -247q0 -120 -98.5 -203t-227.5 -108q147 -16 262.5 -109t115.5 -233zM720 721q130 0 222 82 t92 202.5t-73 198t-186 77.5h-255q-53 0 -69.5 -13t-16.5 -66v-481h286zM994 147q88 86 88 214t-76.5 222t-200.5 94h-371v-537q0 -53 16.5 -66t69.5 -13h257q129 0 217 86z" />
+<glyph unicode="&#x413;" horiz-adv-x="1216" d="M744 1281h-214q-51 0 -68.5 -13t-17.5 -66v-1065q0 -22 8 -39q17 -37 223 -37h22v-61q-74 6 -120 6h-382q-55 0 -127 -6v61q8 0 26 -0.5t28 -0.5q124 0 141 38q7 15 7 48v1053q0 31 -7 47q-15 35 -170 35h-25v62h1026l55 -442h-49q-24 212 -82 285q-74 95 -274 95z" />
+<glyph unicode="&#x414;" horiz-adv-x="1580" d="M1514 1281l-59 2q-75 0 -103 -9q-53 -18 -53 -76v-1054q0 -27 13.5 -52t92.5 -31h109q0 -81 9 -111q17 -57 76 -72q-77 0 -197 61t-197 61h-888q-81 0 -175 -61t-168 -61h-5v2q54 12 71 73q8 32 8 108q166 0 198 12q63 22 124 141q236 457 236 990q0 39 -14 53.5t-48 19 t-138 4.5v62h1108v-62zM1125 161v1014q0 44 -8 59q-25 47 -204 47t-205 -49q-9 -17 -11 -85q-5 -193 -52.5 -425.5t-142.5 -434.5l-80 -153q-4 -8 -4 -20q0 -35 56.5 -44t247.5 -9q276 0 331 12t66 37q6 13 6 51z" />
+<glyph unicode="&#x415;" horiz-adv-x="1354" d="M68 0v61q47 -1 53 -1q125 0 142 38q7 16 7 48v1053q0 30 -7 47q-15 36 -152 36q-20 0 -43 -1v62h1108l56 -442h-49q-24 218 -99.5 299t-288.5 81h-263q-54 0 -71 -13.5t-17 -65.5v-474h178q134 0 173.5 46.5t39.5 182.5h51v-521h-51q0 136 -40 183t-173 47h-178v-526 q0 -52 17 -65.5t71 -13.5h273q236 0 326 111q67 84 107 336h49l-84 -508h-1135z" />
+<glyph unicode="&#x416;" horiz-adv-x="2214" d="M1399 1284l-57 2q-126 0 -142 -40q-6 -15 -6 -44v-447q289 8 434 167q62 67 159 289q67 154 167 154q53 0 92 -41t39 -95q0 -92 -90 -92q-39 0 -65 25.5t-26 56.5t10 53q-41 -17 -97.5 -159.5t-116.5 -215.5q-106 -130 -287 -165v-8q116 -16 221 -77t151 -158 q25 -54 39 -150l25 -181q30 -158 118 -158q99 0 131 175q6 31 24 31q24 0 24 -33q0 -86 -51.5 -151t-134.5 -65q-330 0 -330 318q0 13 1 40v40q0 136 -83 239.5t-216 103.5h-138v-559q0 -28 9 -45q17 -33 186 -33h10v-61q-71 6 -120 6h-344q-49 0 -120 -6v61h10 q169 0 186 33q9 17 9 45v559h-138q-133 0 -216 -103.5t-83 -239.5q0 -13 0.5 -40t0.5 -40q0 -318 -330 -318q-83 0 -134.5 65t-51.5 151q0 33 24 33q18 0 24 -31q32 -175 131 -175q88 0 118 158l23 169q16 108 41 162q46 97 151 158t221 77v8q-181 35 -287 165 q-60 73 -116.5 215.5t-97.5 159.5q10 -22 10 -53t-26 -56.5t-65 -25.5q-90 0 -90 92q0 54 39 95t92 41q100 0 167 -154q97 -222 159 -289q145 -159 434 -167v447q0 29 -6 44q-16 40 -142 40l-57 -2v62q70 -6 120 -6h344q50 0 120 6v-62z" />
+<glyph unicode="&#x417;" horiz-adv-x="1244" d="M1176 359q0 -85 -50 -164q-77 -122 -218.5 -180t-302.5 -58q-258 0 -386 70q-78 -70 -98 -70q-33 0 -34 33l-12 275q-1 32 41 32q22 0 26.5 -6t11.5 -51t26 -79q80 -144 421 -144q160 0 260 93t100 250t-98.5 247t-255.5 90h-117q-77 -1 -115.5 -1t-38.5 30q0 16 13 22.5 t170.5 18t256.5 77.5q150 100 150 257q0 111 -103 174q-87 53 -225.5 53t-242.5 -62.5t-130 -138.5q-4 -20 -17 -58q-10 -20 -35 -20q-41 0 -39 46l9 246q2 49 35 49q26 0 112 -85q136 85 318 85t326 -64q185 -82 185 -227q0 -261 -386 -360q172 -25 295 -115 q148 -108 148 -265z" />
+<glyph unicode="&#x418;" horiz-adv-x="1631" d="M1564 1284l-56 2q-122 0 -140 -36q-8 -16 -8 -45v-1064q0 -29 8 -45q18 -35 186 -35h10v-61q-71 6 -113 6h-361q-36 0 -107 -6v61q9 0 28 -0.5t29 -0.5q119 0 137 36q8 16 8 45v964l-734 -1008l1 -1q14 -30 90 -35q3 0 30 -0.5t77 0.5v-61q-71 6 -115 6h-358 q-37 0 -108 -6v61q9 0 27.5 -0.5t28.5 -0.5q121 0 139 36q7 14 7 45v1064q0 31 -7 45q-17 34 -149 34h-46v62q70 -6 112 -6h354q45 0 115 6v-62l-55 2q-123 0 -142 -36q-8 -16 -8 -45v-967l734 1009q-15 37 -149 37h-46v62q70 -6 112 -6h356q43 0 113 6v-62z" />
+<glyph unicode="&#x419;" horiz-adv-x="1631" d="M1564 1284l-56 2q-122 0 -140 -36q-8 -16 -8 -45v-1064q0 -29 8 -45q18 -35 186 -35h10v-61q-71 6 -113 6h-361q-36 0 -107 -6v61q9 0 28 -0.5t29 -0.5q119 0 137 36q8 16 8 45v964l-734 -1008l1 -1q14 -30 90 -35q3 0 30 -0.5t77 0.5v-61q-71 6 -115 6h-358 q-37 0 -108 -6v61q9 0 27.5 -0.5t28.5 -0.5q121 0 139 36q7 14 7 45v1064q0 31 -7 45q-17 34 -149 34h-46v62q70 -6 112 -6h354q45 0 115 6v-62l-55 2q-123 0 -142 -36q-8 -16 -8 -45v-967l734 1009q-15 37 -149 37h-46v62q70 -6 112 -6h356q43 0 113 6v-62zM1163 1516 q0 -85 -140 -130q-101 -33 -211 -33t-211 33q-140 45 -140 130q0 39 25 64.5t64 25.5t64 -25.5t25 -70.5t-38 -70q63 -24 174 -24h74q111 0 174 24q-38 25 -38 70t25 70.5t64 25.5t64 -25.5t25 -64.5z" />
+<glyph unicode="&#x41a;" horiz-adv-x="1514" d="M649 1284l-57 2q-126 0 -142 -40q-6 -15 -6 -44v-447q324 0 480 158q72 73 163 294q65 158 167 158q53 0 92 -41t39 -95q0 -92 -90 -92q-39 0 -65 25.5t-26 56.5t10 53q-41 -17 -97.5 -159.5t-116.5 -215.5q-106 -130 -287 -165v-8q116 -16 221 -77.5t151 -157.5 q25 -54 39 -150l25 -181q30 -158 118 -158q99 0 131 175q6 31 24 31q24 0 24 -33q0 -86 -51.5 -151t-134.5 -65q-330 0 -330 318q0 13 1 40v40q0 136 -83 239.5t-216 103.5h-188v-559q0 -28 9 -45q17 -33 186 -33h10v-61q-71 6 -120 6h-347q-43 0 -114 -6v61q8 0 26.5 -0.5 t28.5 -0.5q125 0 141 40q6 15 6 44v1066q0 27 -7 41q-16 33 -176 33h-19v62q70 -6 119 -6h342q50 0 120 6v-62z" />
+<glyph unicode="&#x41b;" horiz-adv-x="1554" d="M1488 1281l-59 2q-76 0 -103 -9q-53 -18 -53 -76v-1054q0 -27 13.5 -52t91.5 -31h110v-61q-71 6 -117 6h-373q-41 0 -112 -6v61q8 0 27.5 -0.5t29.5 -0.5q128 0 147 36q9 17 9 49v1053q0 32 -9 49q-18 34 -153 34h-67q-188 0 -215 -35q-11 -14 -11 -63q0 -227 -12 -426 q-46 -757 -354 -757q-86 0 -148 60t-62 146q0 45 30 76t74 31t74 -30t30 -75q0 -81 -77 -102q31 -14 75 -14q200 0 256 520q21 195 21 511q0 113 -13 132q-18 27 -187 27v61h1137v-62z" />
+<glyph unicode="&#x41c;" horiz-adv-x="1793" d="M1726 1281l-56 2q-125 0 -141 -41q-6 -15 -6 -45v-1058q0 -26 8 -43q17 -35 185 -35h10v-61q-75 6 -119 6h-334q-38 0 -113 -6v61h76q63 0 87 10q40 17 40 70v1140h-2l-483 -1245q-14 -36 -36 -36t-39 43l-476 1222h-2v-1064q0 -140 200 -140h3v-61q-209 6 -229 6 t-231 -6v61h3q199 0 199 140v1003q0 22 -6 38q-12 32 -89 39q-6 1 -32.5 1t-74.5 -1v62h341q45 0 61 -42l428 -1102l430 1108q14 36 49 36h349v-62z" />
+<glyph unicode="&#x41d;" horiz-adv-x="1480" d="M1413 1284l-56 2q-122 0 -140 -36q-8 -16 -8 -45v-1064q0 -29 8 -45q18 -35 186 -35h10v-61q-71 6 -113 6h-361q-36 0 -107 -6v61q9 0 28 -0.5t29 -0.5q119 0 137 36q8 16 8 45v530h-590v-530q0 -29 8 -45q18 -35 187 -35h10v-61q-71 6 -115 6h-358q-37 0 -108 -6v61 q9 0 27.5 -0.5t28.5 -0.5q121 0 139 36q7 14 7 45v1064q0 31 -7 45q-17 34 -149 34h-46v62q70 -6 112 -6h354q45 0 115 6v-62l-55 2q-123 0 -142 -36q-8 -16 -8 -45v-474h590v474q0 29 -8 45q-17 34 -148 34h-46v62q70 -6 112 -6h356q43 0 113 6v-62z" />
+<glyph unicode="&#x41e;" horiz-adv-x="1445" d="M722 -43q-280 0 -467 214t-187 498.5t186.5 502.5t468 218t468 -217.5t186.5 -503t-187.5 -499t-467.5 -213.5zM1175 696q0 438 -260 590q-92 54 -192 54t-191 -53q-262 -153 -262 -591q0 -469 265 -632q91 -56 185 -56t188 55q267 156 267 633z" />
+<glyph unicode="&#x41f;" horiz-adv-x="1480" d="M1300 6h-361q-36 0 -107 -6v61h78q60 0 85 11q39 17 39 69v1141h-590v-1141q0 -26 6 -41q13 -32 90 -39q6 0 33 -0.5t76 0.5v-61q-71 6 -113 6h-360q-37 0 -108 -6v61h78q60 0 85 11q39 17 39 69v1062q0 26 -6 41q-13 32 -90 38h-106v62h1345v-62q-8 0 -29 0.5t-32 0.5 q-121 0 -137 -39q-6 -14 -6 -41v-1062q0 -26 6 -41q13 -32 90 -39q5 0 32 -0.5t76 0.5v-61q-71 6 -113 6z" />
+<glyph unicode="&#x420;" horiz-adv-x="1295" d="M1074 1249q154 -106 154 -268t-142 -262t-307 -100h-335v-473q0 -32 7 -48q17 -37 181 -37h17v-61q-72 6 -133 6h-326q-50 0 -122 -6v61l55 -1q122 0 140 38q7 15 7 48v1051q0 32 -7 48q-16 37 -158 37q-18 0 -37 -1v62h695q174 0 311 -94zM1024 977q0 161 -75.5 232.5 t-237.5 71.5h-186q-53 0 -69.5 -13t-16.5 -66v-532h272q313 0 313 307z" />
+<glyph unicode="&#x421;" horiz-adv-x="1335" d="M1267 854q0 -26 -29 -26t-35 32q-12 60 -47 178q-51 127 -151 208.5t-217 81.5t-220 -50q-298 -145 -298 -613.5t322 -606.5q96 -41 185 -41q140 0 256 85t159 218q17 52 27 140q4 33 23 33q24 0 24 -35q0 -205 -154 -353t-360 -148q-288 0 -486 213t-198 502.5 t198.5 503.5t485.5 214q193 0 363 -169l99 144q17 25 31 25q22 0 22 -33v-503z" />
+<glyph unicode="&#x422;" horiz-adv-x="1413" d="M878 1282q-46 0 -65.5 -11.5t-19.5 -53.5v-1071q0 -25 10 -47q18 -38 243 -38h34v-61q-84 6 -154 6h-439q-71 0 -155 -6v61q9 0 35.5 -0.5t40.5 -0.5q184 0 202 39q8 17 8 47v1072q0 43 -29 56q-17 8 -66 8q-256 0 -321 -62.5t-86 -318.5h-48l36 442h1206l36 -442h-49 q-22 262 -88.5 321.5t-330.5 59.5z" />
+<glyph unicode="&#x423;" horiz-adv-x="1591" d="M441 -20q-135 0 -214.5 72.5t-79.5 206.5q0 106 99 106q42 0 69.5 -27t27.5 -69.5t-28 -70t-71 -27.5q-14 0 -35 5q20 -70 87 -106t149.5 -36t168.5 135q53 83 136 234l-466 798q-10 19 -37 52q-33 29 -170 29h-9v64q196 -6 246 -6t234 6v-64h-4q-91 0 -91 -41 q0 -14 18 -45l371 -636l345 590q23 39 23 65q0 65 -73 67v64q183 -6 233.5 -6t152.5 6v-64q-171 -2 -248 -134l-550 -940q-133 -228 -284 -228z" />
+<glyph unicode="&#x424;" horiz-adv-x="1394" d="M1025 1287l-82 2q-135 0 -157 -37q-14 -23 -14 -76v-81q215 -21 368 -118q186 -118 186 -304t-186 -303q-153 -97 -368 -117v-97q0 -39 7 -56q16 -40 202 -40q21 0 44 1v-61q-75 6 -154 6h-359q-80 0 -155 -6v61l81 -2q136 0 158 37q14 23 14 75v82q-210 21 -361 120 q-181 118 -181 300.5t181 300.5q152 99 361 121v99q0 37 -7 54q-16 39 -225 39h-21v62q75 -6 155 -6h359q79 0 154 6v-62zM1130 674q0 339 -358 376v-753q164 13 261 110t97 267zM610 1050q-347 -40 -347 -375.5t347 -375.5v751z" />
+<glyph unicode="&#x425;" horiz-adv-x="1518" d="M1450 0q-127 6 -299 6t-244 -6v61q128 5 128 59q0 10 -320 493l-281 -414q-19 -28 -19 -48q0 -43 38.5 -66t84.5 -24v-61q-74 6 -165 6t-305 -6v61q196 0 285 131l323 477l-362 547q-34 51 -99 64q-24 4 -81 4h-41v62q112 -6 292.5 -6t251.5 6v-62q-128 -5 -128 -58 q0 -13 268 -410l225 333q17 25 17 46q0 43 -37.5 65.5t-83.5 23.5v62q81 -6 163.5 -6t306.5 6v-62q-198 -2 -285 -128l-271 -395l416 -629q35 -53 99 -66q25 -5 85 -5h38v-61z" />
+<glyph unicode="&#x426;" horiz-adv-x="1481" d="M1077 0h-1009v62h106q77 6 90 38q6 15 6 41v1062q0 52 -39 69q-25 11 -85 11h-78v61q71 -6 108 -6h360q42 0 113 6v-61q-49 1 -76 1t-33 -1q-77 -7 -90 -39q-6 -15 -6 -41v-1141h590v1141q0 52 -39 69q-25 11 -85 11h-78v61q71 -6 107 -6h361q42 0 113 6v-61q-49 1 -76 1 t-32 -1q-77 -7 -90 -39q-6 -15 -6 -41v-998q0 -69 14 -97q23 -47 173 -47h24q0 -12 -0.5 -39t-0.5 -40q0 -312 87 -376q-68 13 -125 92q-15 20 -73.5 125.5t-100 141t-130.5 35.5z" />
+<glyph unicode="&#x427;" horiz-adv-x="1601" d="M1535 1284l-59 2q-75 0 -103 -9q-53 -18 -53 -76v-1057q0 -27 13.5 -52t91.5 -31h110v-61q-71 6 -117 6h-373q-41 0 -112 -6v61q8 0 27.5 -0.5t29.5 -0.5q128 0 147 36q9 17 9 49v545q-190 -218 -438 -218q-187 0 -312.5 111t-125.5 298v327q0 30 -7 43q-18 34 -156 34 q-19 0 -39 -1v62q73 -6 156 -6h270q84 0 156 6v-62q-48 1 -60 1q-118 0 -136 -34q-9 -17 -9 -51v-319q0 -149 90.5 -232t237.5 -83q208 0 373 205v430q0 32 -9 49q-18 34 -153 34h-51v62q71 -6 115 -6h376q41 0 111 6v-62z" />
+<glyph unicode="&#x428;" horiz-adv-x="2161" d="M2093 0h-2025v62h96q67 6 80 38q6 15 6 41v1062q0 52 -39 69q-25 11 -85 11h-58v61q71 -6 88 -6h350q32 0 103 6v-61q-45 1 -70 1t-29 -1q-67 -6 -80 -39q-6 -15 -6 -41v-1141h459q76 0 91 38q6 15 6 41v1062q0 52 -39 69q-25 11 -85 11h-58v61q71 -6 87 -6h341 q42 0 113 6v-61q-44 1 -69 1t-29 -1q-67 -6 -80 -39q-6 -15 -6 -41v-1062q0 -27 6 -41q16 -38 94 -38h459v1141q0 52 -39 69q-25 11 -85 11h-58v61q71 -6 87 -6h351q32 0 103 6v-61q-44 1 -69 1t-29 -1q-67 -6 -80 -39q-6 -15 -6 -41v-1062q0 -27 6 -41q16 -39 137 -39h31 q22 1 30 1v-62z" />
+<glyph unicode="&#x429;" horiz-adv-x="2161" d="M1757 0h-1689v62h96q67 6 80 38q6 15 6 41v1062q0 52 -39 69q-25 11 -85 11h-58v61q71 -6 88 -6h350q32 0 103 6v-61q-45 1 -70 1t-29 -1q-67 -6 -80 -39q-6 -15 -6 -41v-1141h459q76 0 91 38q6 15 6 41v1062q0 52 -39 69q-25 11 -85 11h-58v61q71 -6 87 -6h341 q42 0 113 6v-61q-44 1 -69 1t-29 -1q-67 -6 -80 -39q-6 -15 -6 -41v-1062q0 -27 6 -41q16 -38 94 -38h459v1141q0 52 -39 69q-25 11 -85 11h-58v61q71 -6 87 -6h351q32 0 103 6v-61q-44 1 -69 1t-29 -1q-67 -6 -80 -39q-6 -15 -6 -41v-998q0 -69 14 -97q23 -47 173 -47h24 q0 -12 -0.5 -39t-0.5 -40q0 -312 87 -376q-68 13 -125 92q-15 20 -73.5 125.5t-100 141t-130.5 35.5z" />
+<glyph unicode="&#x42a;" horiz-adv-x="1736" d="M1039 1281l-59 2q-76 0 -103 -9q-53 -18 -53 -76v-477h336q188 0 334 -85q174 -101 174 -269t-135.5 -267.5t-302.5 -99.5h-772v61q62 -2 63 -2q113 0 134 45q5 11 5 42v1056q0 52 -17.5 65.5t-68.5 13.5h-101q-200 0 -274 -95q-58 -73 -82 -285h-49l55 442h916v-62z M1384 147q88 86 88 221t-87 222t-210 87h-351v-537q0 -53 16.5 -66t69.5 -13h257q129 0 217 86z" />
+<glyph unicode="&#x42b;" horiz-adv-x="1986" d="M649 1284l-59 2q-76 0 -103 -9q-53 -18 -53 -76v-480h336q188 0 334 -85q174 -101 174 -269t-135.5 -267.5t-302.5 -99.5h-772v61q62 -2 63 -2q113 0 134 45q5 11 5 42v1055q0 32 -9 49q-18 34 -153 34h-40v62q71 -6 115 -6h355q41 0 111 6v-62zM994 147q88 86 88 221 t-87 222t-210 87h-351v-537q0 -53 16.5 -66t69.5 -13h257q129 0 217 86zM1920 1284l-59 2q-75 0 -103 -9q-53 -18 -53 -76v-1057q0 -27 13.5 -52t91.5 -31h110v-61q-71 6 -117 6h-373q-41 0 -112 -6v61q8 0 27.5 -0.5t29.5 -0.5q128 0 147 36q9 17 9 49v1056q0 32 -9 49 q-18 34 -153 34h-51v62q71 -6 115 -6h376q41 0 111 6v-62z" />
+<glyph unicode="&#x42c;" horiz-adv-x="1346" d="M649 1284l-59 2q-76 0 -103 -9q-53 -18 -53 -76v-480h336q188 0 334 -85q174 -101 174 -269t-135.5 -267.5t-302.5 -99.5h-772v61q62 -2 63 -2q113 0 134 45q5 11 5 42v1055q0 32 -9 49q-18 34 -153 34h-40v62q71 -6 115 -6h355q41 0 111 6v-62zM994 147q88 86 88 221 t-87 222t-210 87h-351v-537q0 -53 16.5 -66t69.5 -13h257q129 0 217 86z" />
+<glyph unicode="&#x42d;" horiz-adv-x="1335" d="M582 1390q287 0 485.5 -214t198.5 -503.5t-198 -502.5t-486 -213q-184 0 -327.5 118.5t-178.5 298.5q-2 11 -2 17q0 22 27 22q15 0 23 -29q25 -90 47 -135.5t77 -101.5q130 -130 309 -130q91 0 185 41q322 141 322 595v19l-1 38q-80 45 -202 45q-178 0 -355 -155 q-76 -67 -179.5 -67t-214.5 90q-31 25 -31 51t19 26q-4 0 48.5 -30.5t105.5 -30.5q85 0 161 56l147 110q94 58 224 58t274 -95q-31 381 -294 510q-102 50 -207 50q-151 0 -272 -117t-155 -271q-7 -32 -35.5 -32t-28.5 26v423q0 33 21 33q14 0 31 -25l99 -144 q170 169 363 169z" />
+<glyph unicode="&#x42e;" horiz-adv-x="1975" d="M649 1284l-55 2q-123 0 -142 -36q-8 -16 -8 -45v-474h356q19 271 175.5 465t383.5 194t387.5 -215.5t160.5 -505t-160.5 -501t-394 -211.5t-394 211.5t-160.5 499.5v3h-354v-530q0 -29 8 -45q18 -35 187 -35h10v-61q-71 6 -115 6h-358q-37 0 -108 -6v61q9 0 27.5 -0.5 t28.5 -0.5q121 0 139 36q7 14 7 45v1064q0 31 -7 45q-17 34 -149 34h-46v62q70 -6 112 -6h354q45 0 115 6v-62zM1705 700q0 448 -210 593q-69 47 -143 47q-182 0 -278 -226q-74 -177 -74 -418.5t72 -433.5q95 -254 280.5 -254t280.5 257q72 193 72 435z" />
+<glyph unicode="&#x42f;" horiz-adv-x="1508" d="M1297 6h-289q-69 0 -143 -6v61h26q157 0 171 34q7 17 7 46v511h-227q-113 0 -186 -69.5t-73 -227.5q0 -13 0.5 -40t0.5 -40q0 -318 -330 -318q-84 0 -135 65t-51 151q0 33 24 33q19 0 24 -31q30 -175 131 -175q87 0 118 158l25 182q14 97 39 149q59 125 224 182 q-135 33 -229 108q-115 91 -115 213q0 167 180 267q150 84 333 84h618v-62h-29q-153 0 -167 -40q-6 -18 -6 -45v-1055q0 -31 7 -46q17 -35 142 -35h27q20 1 26 1v-61q-74 6 -143 6zM1069 696v523q0 43 -32 57q-18 7 -69 7q-230 0 -314 -35q-143 -60 -143 -256 q0 -296 339 -296h219z" />
+<glyph unicode="&#x430;" horiz-adv-x="1070" d="M1018 190q0 -83 -47.5 -142.5t-122.5 -59.5t-120.5 51.5t-52.5 122.5q-35 -85 -111 -135.5t-186.5 -50.5t-205.5 50q-119 62 -119 178q0 179 213 279q131 61 394 76v78q0 110 -60.5 192t-166.5 82q-154 0 -231 -98q46 0 78 -26.5t32 -70t-28.5 -71.5t-71.5 -28 q-98 0 -98 99q0 113 102 178.5t222 65.5q183 0 293 -119q50 -54 63.5 -108t13.5 -144v-427q0 -40 20.5 -74t57.5 -34q79 0 79 175q0 28 -2 80h55v-119zM660 300v214q-171 -6 -291 -71q-152 -82 -152 -236q0 -78 56.5 -130.5t135.5 -52.5q111 0 181 81.5t70 194.5z" />
+<glyph unicode="&#x431;" horiz-adv-x="1054" d="M528 960q198 0 336 -151t138 -350.5t-139 -341t-326.5 -141.5t-319.5 119t-159 295q-21 133 -21 236q0 426 162 616q82 96 160 121.5t321 45.5q48 4 123 20q34 16 49 47h66q-14 -97 -82.5 -159.5t-193 -73.5t-239.5 -20q-131 -24 -202 -113q-89 -113 -111 -462 q54 138 172 225t266 87zM776 188q47 92 47 292.5t-56 292.5q-84 138 -244.5 138t-241.5 -143q-51 -90 -51 -294.5t55 -299.5q83 -144 246.5 -144t244.5 158z" />
+<glyph unicode="&#x432;" horiz-adv-x="1118" d="M1002 251q0 -49 -27 -97q-87 -154 -315 -154h-598v66q72 0 108.5 4t47.5 25t11 72v589q0 51 -11 72t-47.5 25t-108.5 4v66h557q223 0 312 -136q31 -47 31 -95q0 -82 -73.5 -137.5t-164.5 -72.5q105 -10 191.5 -71.5t86.5 -159.5zM797 690q0 80 -55.5 123.5t-137.5 43.5 h-148q-64 0 -78 -13t-14 -75v-266h199q168 0 219 121q15 36 15 66zM608 66q93 0 158 49.5t65 138t-54.5 145.5t-140.5 57h-272v-302q0 -62 14 -75t78 -13h152z" />
+<glyph unicode="&#x433;" horiz-adv-x="1035" d="M535 856q-112 0 -122 -2q-32 -6 -40 -31q-3 -10 -3 -55v-597q0 -47 7 -62q10 -26 51 -34.5t150 -8.5v-66q-80 6 -178 6t-344 -6v66q140 0 157 30q10 18 10 71v589q0 52 -10 70q-16 30 -151 30h-6v67h846l38 -328h-53q-18 182 -98 229q-55 32 -254 32z" />
+<glyph unicode="&#x434;" horiz-adv-x="1225" d="M1195 66l-2 -101q0 -212 94 -231q-68 0 -115 49q-14 15 -64 93.5t-82 101t-99 22.5h-599q-73 0 -108 -34q-19 -18 -60 -97.5t-56 -95.5q-34 -39 -93 -39v3q83 16 83 229l-2 100q104 0 130 4q76 12 108 61q82 125 131 315.5t49 352.5q0 45 -65 56q-16 2 -100 2v66h850v-66 q-78 0 -111 -3.5t-44.5 -24.5t-11.5 -73v-589q0 -52 11.5 -73t44.5 -24.5t111 -3.5zM880 162v607q0 62 -42 79q-23 9 -108 9t-111.5 -17t-31.5 -99q-17 -277 -135 -548q-30 -69 -30 -86q0 -23 35.5 -32t161.5 -9q218 0 248 39q13 17 13 57z" />
+<glyph unicode="&#x435;" horiz-adv-x="933" d="M854 280q27 0 27 -28t-35 -88q-110 -188 -315 -188t-341.5 147.5t-136.5 344.5t127 344.5t312.5 147.5t287 -119t101.5 -302q0 -30 -7.5 -37.5t-38.5 -7.5h-605v-7q0 -210 64 -313q90 -144 242 -144q198 0 290 221q12 29 28 29zM740 539q0 143 -50 243q-64 129 -192 129 q-41 0 -90 -23q-165 -78 -175 -349h507z" />
+<glyph unicode="&#x436;" horiz-adv-x="1611" d="M737 471l-56 7q-128 0 -236 -69q-55 -35 -70.5 -71t-20 -119.5t-53.5 -158.5t-134 -75q-67 0 -101 67q-27 53 -27 128q0 34 27 34q22 0 26 -26q10 -62 16 -78q17 -44 57 -44q66 0 66 141.5t62.5 205t196.5 93.5q-68 33 -107 130l-53 156q-32 76 -89 76q-25 0 -25 -18 q0 -3 16 -29.5t16 -60t-27.5 -62t-66.5 -28.5q-102 0 -102 102q0 70 46 118t112 48q148 0 200 -178q37 -124 57 -151q51 -70 178 -70h92v226q0 41 -9 59q-17 33 -150 33h-8v66q208 -6 243.5 -6t237.5 6v-66q-7 0 -23.5 0.5t-54 0.5t-63.5 -16t-26 -77v-226h92q127 0 178 70 q20 27 53.5 140.5t96.5 158.5q42 30 107.5 30t111.5 -48t46 -118q0 -102 -102 -102q-39 0 -66.5 28.5t-27.5 62t16 60t16 29.5q0 18 -25 18q-57 0 -89 -76l-53 -156q-39 -97 -107 -130q134 -30 196.5 -93.5t62.5 -205t66 -141.5q40 0 57 44q6 16 16 78q4 26 26 26 q27 0 27 -34q0 -75 -27 -128q-34 -67 -101 -67q-85 0 -134 75t-53.5 158.5t-20 119.5t-70.5 71q-108 69 -236 69l-56 -7v-313q0 -41 9 -59q17 -33 150 -33h8v-66q-203 6 -237 6t-244 -6v66q7 0 23.5 -0.5t54 -0.5t63.5 16t26 77v313z" />
+<glyph unicode="&#x437;" horiz-adv-x="920" d="M860 253q0 -59 -36 -116q-106 -167 -386 -167q-169 0 -263 43l-64 -43h-9q-23 0 -27 8q-5 11 -5 48v122q0 58 28 58q20 0 26 -20q2 -23 17 -71q45 -85 293.5 -85t248.5 222.5t-251 222.5h-118q-55 0 -55 23t29.5 25.5t79.5 5.5q122 8 192 62q86 66 86 151.5t-58.5 121 t-151 35.5t-165 -36.5t-94 -91t-36.5 -54.5q-28 0 -28 58v122q0 37 5 47q4 9 27 9h9q25 -19 77 -54q91 54 218 54t232 -43q136 -57 136 -160q0 -170 -254 -242q112 -21 195 -81q102 -73 102 -174z" />
+<glyph unicode="&#x438;" horiz-adv-x="1261" d="M1204 0q-203 6 -238 6t-244 -6v66q142 0 158 33q9 19 9 68v570l-499 -653q38 -18 148 -18v-66q-203 6 -238 6t-244 -6v66q142 0 158 33q9 19 9 68v589q0 49 -9 68q-16 33 -158 33v66q209 -6 244 -6t238 6v-66q-143 0 -159 -33q-9 -19 -9 -68v-570l499 653q-38 18 -147 18 v66q209 -6 244 -6t238 6v-66q-143 0 -159 -33q-9 -19 -9 -68v-589q0 -49 9 -68q16 -33 159 -33v-66z" />
+<glyph unicode="&#x439;" horiz-adv-x="1261" d="M1204 0q-203 6 -238 6t-244 -6v66q142 0 158 33q9 19 9 68v570l-499 -653q38 -18 148 -18v-66q-203 6 -238 6t-244 -6v66q142 0 158 33q9 19 9 68v589q0 49 -9 68q-16 33 -158 33v66q209 -6 244 -6t238 6v-66q-143 0 -159 -33q-9 -19 -9 -68v-570l499 653q-38 18 -147 18 v66q209 -6 244 -6t238 6v-66q-143 0 -159 -33q-9 -19 -9 -68v-589q0 -49 9 -68q16 -33 159 -33v-66zM892 1398q89 0 89 -96t-113.5 -158.5t-237.5 -62.5t-229 58q-122 67 -122 163t89 96t89 -90t-89 -90q99 -74 262 -74t262 74q-89 0 -89 90t89 90z" />
+<glyph unicode="&#x43a;" horiz-adv-x="1080" d="M409 478l-56 -7v-313q0 -41 9 -59q17 -33 150 -33h8v-66q-203 6 -237 6t-244 -6v66q7 0 23.5 -0.5t54 -0.5t63.5 16t26 77v607q0 41 -9 59q-17 33 -150 33h-8v66q208 -6 243.5 -6t237.5 6v-66q-7 0 -23.5 0.5t-54 0.5t-63.5 -16t-26 -77v-226h92q127 0 178 70 q20 27 53.5 140.5t96.5 158.5q42 30 107.5 30t111.5 -48t46 -118q0 -102 -102 -102q-39 0 -66.5 28.5t-27.5 62t16 60t16 29.5q0 18 -25 18q-57 0 -89 -76l-53 -156q-39 -97 -107 -130q134 -30 196.5 -93.5t62.5 -205t66 -141.5q40 0 57 44q6 16 16 78q4 26 26 26 q27 0 27 -34q0 -75 -27 -128q-34 -67 -101 -67q-85 0 -134 75t-53.5 158.5t-20 119.5t-70.5 71q-108 69 -236 69z" />
+<glyph unicode="&#x43b;" horiz-adv-x="1267" d="M281 81q186 0 186 658q0 63 -6 80q-11 30 -72 37q-10 1 -89 1v66h876v-66q-140 0 -157 -30q-10 -18 -10 -71v-589q0 -53 10 -71q17 -30 157 -30v-66q-203 6 -237.5 6t-244.5 -6v66q140 0 157 30q10 18 10 71v585q0 49 -7 65q-18 40 -149 40q-69 0 -92 -5q-55 -11 -63 -53 q-3 -17 -4 -116q-6 -683 -261 -683q-70 0 -121 48.5t-51 118.5q0 88 86 88q36 0 60 -24.5t24 -61.5q0 -59 -50 -79q18 -9 48 -9z" />
+<glyph unicode="&#x43c;" horiz-adv-x="1428" d="M1362 0q-186 6 -238 6t-227 -6v66h85q60 5 73 32q9 18 9 69l-2 696l-347 -820q-18 -43 -40.5 -43t-40.5 43l-341 805l-2 -2v-629q0 -151 167 -151v-66q-82 6 -166 6t-228 -6v66q167 0 167 151v539q0 50 -9 68q-16 33 -158 33v66h262q41 0 50 -4q13 -7 27 -39l310 -732 l308 732q13 31 26.5 37t53.5 6h261v-66h-85q-60 -5 -73 -32q-9 -18 -9 -69v-589q0 -50 9 -68q16 -33 158 -33v-66z" />
+<glyph unicode="&#x43d;" horiz-adv-x="1178" d="M1120 0q-203 6 -238 6t-244 -6v66q140 0 157 30q10 18 10 71v281h-435v-281q0 -49 9 -68q16 -33 159 -33v-66q-203 6 -238 6t-244 -6v66q140 0 157 30q10 18 10 71v589q0 53 -10 71q-17 30 -157 30v66q209 -6 244 -6t238 6v-66q-143 0 -159 -33q-9 -19 -9 -68v-242h435 v242q0 53 -10 71q-17 30 -157 30v66q209 -6 244 -6t238 6v-66q-140 0 -157 -30q-10 -18 -10 -71v-589q0 -53 10 -71q17 -30 157 -30v-66z" />
+<glyph unicode="&#x43e;" horiz-adv-x="1054" d="M191.5 118.5q-138.5 142.5 -138.5 341.5t138 349.5t336.5 150.5t336.5 -151t138 -350.5t-139 -341t-336 -141.5t-335.5 142.5zM776 188q47 92 47 292.5t-56 292.5q-84 138 -244.5 138t-241.5 -143q-51 -90 -51 -294.5t55 -299.5q83 -144 246.5 -144t244.5 158z" />
+<glyph unicode="&#x43f;" horiz-adv-x="1178" d="M1120 0q-203 6 -237.5 6t-244.5 -6v66q140 0 157 30q10 18 10 71v585q0 54 -15 74q-23 31 -194 31t-198.5 -19.5t-27.5 -85.5v-585q0 -52 11 -71q17 -30 157 -30v-66q-203 6 -237.5 6t-244.5 -6v66q140 0 157 30q10 18 10 71v589q0 53 -10 71q-17 30 -157 30v66h1064v-66 q-140 0 -157 -30q-10 -18 -10 -71v-589q0 -53 10 -71q17 -30 157 -30v-66z" />
+<glyph unicode="&#x440;" horiz-adv-x="1160" d="M360 805q127 141 308 141t310 -146.5t129 -342t-139 -338.5t-337 -143q-78 0 -158.5 42t-105.5 109v-388q0 -42 11 -59q19 -29 114 -29q19 0 41 1v-66q-169 5 -241.5 5t-238.5 -5v66q37 -2 76.5 -2t60.5 14q30 19 30 83v1002q0 51 -10 71.5t-44 28.5q-26 6 -83 6h-30v68 l307 23v-141zM855 176q74 128 74 282t-67 281q-81 154 -218 154q-179 0 -277 -172v-478q0 -46 30 -89q91 -130 230.5 -130t227.5 152z" />
+<glyph unicode="&#x441;" horiz-adv-x="920" d="M868 254q0 -22 -27 -75q-104 -203 -329 -203q-194 0 -326.5 144.5t-132.5 343t132 347.5t330 149q121 0 215 -54q113 -64 113 -170t-97 -106q-42 0 -70.5 28t-28.5 70q0 94 100 99q-79 78 -229 78q-60 0 -120 -34q-168 -94 -168 -402.5t178 -404.5q63 -34 123 -34 q113 0 181 64q40 37 74 109.5t53 72.5q29 0 29 -22z" />
+<glyph unicode="&#x442;" horiz-adv-x="1142" d="M756 857q-75 0 -88 -7q-23 -13 -23 -81v-598q0 -53 12.5 -72t61.5 -26t161 -7v-66q-73 6 -226 6h-168q-152 0 -225 -6v66q133 0 174 7.5t51.5 28t10.5 69.5v598q0 68 -23 81q-12 7 -91 7q-152 0 -193.5 -50t-52.5 -212h-53l25 328h921l26 -328h-54q-11 161 -48 207 q-46 55 -198 55z" />
+<glyph unicode="&#x443;" horiz-adv-x="1151" d="M249 -439q-76 0 -136 50t-60 124q0 91 89 91q39 0 65 -25.5t26 -63.5q0 -81 -85 -91q41 -38 101 -38q93 0 158 92q32 45 68 130l71 170l-321 781q-22 54 -70 68q-21 6 -74 6h-28v68q120 -8 178.5 -8t261.5 8v-68h-4q-116 0 -116 -54q0 -19 250 -616l217 528q14 34 14 50 q0 90 -101 92v68q170 -8 212 -8t134 8v-68h-2q-140 0 -197 -136l-377 -913q-101 -245 -274 -245z" />
+<glyph unicode="&#x444;" horiz-adv-x="1275" d="M1223 460q0 -108 -33 -211.5t-114 -188t-192.5 -84.5t-183.5 125h-2v-186q0 -32 49.5 -164.5t75.5 -179.5l-23 -13l-162 258l-162 -258l-23 13q26 47 75.5 179.5t49.5 164.5v186h-2q-72 -125 -183 -125t-192 84q-148 155 -148 403q0 106 33.5 210.5t114.5 189t192 84.5 t183 -125h2v304q0 32 -49.5 164.5t-75.5 179.5l23 13l162 -258l162 258l23 -13q-26 -47 -75.5 -179.5t-49.5 -164.5v-304h2q72 125 183.5 125t198.5 -92q74 -77 107.5 -182t33.5 -213zM1045 463q0 190 -28 282q-45 148 -133 148q-102 0 -158 -139q-28 -69 -28 -246v-131 q0 -139 26 -206q54 -141 160 -141q94 0 137 156q24 87 24 277zM578 415v131q0 139 -26 206q-54 141 -160 141q-94 0 -137 -156q-24 -87 -24 -277t28 -282q45 -148 133 -148q102 0 158 139q28 69 28 246z" />
+<glyph unicode="&#x445;" horiz-adv-x="1183" d="M1131 0q-91 6 -175.5 6t-261.5 -6v66q77 3 77 54q0 10 -208 285q-192 -223 -192 -272q0 -61 62 -67v-66q-141 6 -221 6t-159 -6v66q159 0 274 128l200 256l-212 276q-71 92 -105 110.5t-147 18.5v68q110 -8 171 -8t264 8v-68q-75 -2 -75 -52q0 -20 184 -255l134 167 q33 41 33 75q0 61 -63 65v68q108 -8 192.5 -8t188.5 8v-68q-152 -3 -255 -109q-26 -27 -197 -244l287 -369q37 -47 92 -60q28 -7 95 -7h17v-66z" />
+<glyph unicode="&#x446;" horiz-adv-x="1178" d="M1120 66l-2 -101q0 -212 94 -231q-68 0 -115 49q-14 16 -64 94t-82 100.5t-99 22.5h-796v66q140 0 157 30q10 18 10 71v589q0 53 -10 71q-17 30 -157 30v66q209 -6 244 -6t238 6v-66q-140 0 -157 -30q-11 -19 -11 -71v-585q0 -54 15 -74q23 -31 202.5 -31t202.5 31 q15 20 15 74v585q0 53 -10 71q-17 30 -157 30v66q209 -6 244 -6t238 6v-66q-140 0 -157 -30q-10 -18 -10 -71v-589q0 -53 10 -71q17 -30 157 -30z" />
+<glyph unicode="&#x447;" horiz-adv-x="1261" d="M1204 0q-203 6 -237.5 6t-244.5 -6v66q140 0 157 30q10 18 10 71v274q-129 -143 -324 -143q-131 0 -236.5 81t-105.5 208q0 214 -5 229q-11 32 -72 40q-12 1 -90 1v66q209 -6 244 -6t238 6v-66q-140 0 -157 -30q-11 -19 -11 -71v-143q0 -102 70.5 -160.5t174.5 -58.5 q137 0 246 109q28 28 28 75v178q0 53 -10 71q-17 30 -157 30v66q209 -6 244 -6t238 6v-66q-140 0 -157 -30q-11 -19 -11 -71v-589q0 -52 11 -71q17 -30 157 -30v-66z" />
+<glyph unicode="&#x448;" horiz-adv-x="1677" d="M1619 0h-1563v66q140 0 157 30q10 18 10 71v589q0 53 -10 71q-17 30 -157 30v66q209 -6 244 -6t238 6v-66q-140 0 -157 -30q-11 -19 -11 -71v-585q0 -49 13 -73t56.5 -28t131 -4t96.5 1q70 6 85 37q10 19 10 61v597q0 49 -11 67q-17 28 -154 28v66q174 -6 237 -6t243 6 v-66q-67 0 -103.5 -3t-49 -22.5t-12.5 -69.5v-597q0 -52 16.5 -71.5t57.5 -23.5t123 -4t124 4t56.5 26t14.5 75v585q0 53 -10 71q-17 30 -157 30v66q209 -6 244 -6t238 6v-66q-140 0 -157 -30q-10 -18 -10 -71v-589q0 -53 10 -71q17 -30 157 -30v-66z" />
+<glyph unicode="&#x449;" horiz-adv-x="1677" d="M1619 66l-2 -101q0 -212 94 -231q-68 0 -115 49q-15 16 -64.5 94t-81.5 100.5t-99 22.5h-1295v66q140 0 157 30q10 18 10 71v589q0 53 -10 71q-17 30 -157 30v66q209 -6 244 -6t238 6v-66q-140 0 -157 -30q-11 -19 -11 -71v-585q0 -49 13 -73t56.5 -28t131 -4t96.5 1 q70 6 85 37q10 19 10 61v597q0 49 -11 67q-17 28 -154 28v66q174 -6 237 -6t243 6v-66q-67 0 -103.5 -3t-49 -22.5t-12.5 -69.5v-597q0 -52 16.5 -71.5t57.5 -23.5t123 -4t124 4t56.5 26t14.5 75v585q0 53 -10 71q-17 30 -157 30v66q209 -6 244 -6t238 6v-66 q-140 0 -157 -30q-10 -18 -10 -71v-589q0 -53 10 -71q17 -30 157 -30z" />
+<glyph unicode="&#x44a;" horiz-adv-x="1451" d="M1305 351q31 -48 31 -100.5t-31 -103.5q-89 -147 -311 -147h-598v66q69 0 105.5 3t49 24t12.5 74v602q0 70 -26 83q-12 5 -98 5q-155 0 -216 -53.5t-65 -208.5h-53l15 328h662v-66h-7q-52 0 -64 -15q-13 -15 -13 -73v-283h289q230 0 318 -135zM942 66q93 0 158 49.5 t65 137.5t-54.5 145.5t-139.5 57.5h-273v-302q0 -62 14 -75t78 -13h152z" />
+<glyph unicode="&#x44b;" horiz-adv-x="1535" d="M1495 0q-203 6 -240.5 6t-241.5 -6v66q139 0 156 29q11 18 11 68v597q0 50 -11 68q-17 29 -156 29v66q203 -6 241 -6t241 6v-66q-80 0 -86 -1q-60 -5 -72 -34q-9 -21 -9 -72v-577q0 -51 9 -72q12 -29 72 -34q6 -1 86 -1v-66zM1004 251q0 -56 -34 -109q-90 -142 -310 -142 h-598v66h9q132 0 148 30q10 18 10 71v589q0 53 -10 71q-16 30 -148 30h-9v66q120 -6 196.5 -6t272.5 6v-66h-9q-132 0 -148 -30q-10 -18 -10 -71v-270h291q127 0 227 -53q122 -65 122 -182zM608 66q93 0 159 50t66 137.5t-56 145t-141 57.5h-272v-302q0 -62 14 -75t78 -13 h152z" />
+<glyph unicode="&#x44c;" horiz-adv-x="1118" d="M975 344q27 -46 27 -94t-26 -95q-86 -155 -316 -155h-598v66h9q132 0 148 30q10 18 10 71v589q0 53 -10 71q-16 30 -148 30h-9v66q120 -6 196.5 -6t272.5 6v-66h-9q-132 0 -148 -30q-10 -18 -10 -71v-270h289q238 0 322 -142zM608 66q93 0 158 49.5t65 138t-54.5 145.5 t-140.5 57h-272v-302q0 -62 14 -75t78 -13h152z" />
+<glyph unicode="&#x44d;" horiz-adv-x="1036" d="M92 953q3 0 107 -86q114 86 259 86q211 0 368 -142t157 -350t-157.5 -349.5t-367.5 -141.5q-141 0 -255 70q-133 82 -133 215q0 30 28 30q21 0 26 -32q15 -106 101 -161.5t199 -55.5q174 0 283 116q90 95 98 289q-69 60 -163 60q-135 0 -250 -109q-55 -52 -110 -52 t-130 38.5t-75 76.5t21 38q3 0 31 -18.5t61 -18.5q67 0 163.5 80.5t198.5 80.5q134 0 251 -94q-18 176 -119 270t-258 94q-188 0 -269 -152q-5 -9 -33 -93q-6 -19 -27 -19t-26 18q-1 4 -1 38v218q0 56 22 56z" />
+<glyph unicode="&#x44e;" horiz-adv-x="1767" d="M1505 807q146 -146 146 -350.5t-147 -345.5t-346.5 -141t-343 129.5t-157.5 322.5h-261v-257q0 -50 11 -69q17 -30 147 -30h9v-66q-202 6 -241 6t-241 -6v66h8q132 0 149 31q10 18 10 72v585q0 54 -10 72q-17 31 -149 31h-8v66q202 -6 241 -6t241 6v-66h-9 q-130 0 -147 -30q-11 -19 -11 -69v-270h261q11 196 156 330.5t345.5 134.5t346.5 -146zM1473 478q0 298 -192 391q-62 30 -125 30t-122 -26q-201 -89 -201 -403t194 -413q61 -31 124 -31t120 27q202 96 202 425z" />
+<glyph unicode="&#x44f;" horiz-adv-x="1166" d="M1103 0q-221 6 -249.5 6t-226.5 -6v66q142 0 158 33q9 19 9 68v272h-169q-86 0 -141 -58q-35 -37 -35 -123q0 -10 0.5 -31t0.5 -32q0 -126 -74.5 -175.5t-189.5 -49.5q-64 0 -108 45t-44 109q0 32 28 32q22 0 26 -30q15 -109 88 -109q44 0 72 74q5 13 31.5 118t51.5 147 q39 64 125 102q-91 21 -157 71q-83 62 -83 143.5t70 141.5q127 109 333 109h484v-66q-142 0 -158 -33q-9 -19 -9 -68v-589q0 -49 9 -68q16 -33 158 -33v-66zM794 486v291q0 65 -27 75q-13 5 -124.5 5t-165.5 -25q-83 -40 -83 -154.5t69 -157.5q54 -34 175 -34h156z" />
+<glyph unicode="&#x450;" horiz-adv-x="933" d="M854 280q27 0 27 -28t-35 -88q-110 -188 -315 -188t-341.5 147.5t-136.5 344.5t127 344.5t312.5 147.5t287 -119t101.5 -302q0 -30 -7.5 -37.5t-38.5 -7.5h-605v-7q0 -210 64 -313q90 -144 242 -144q198 0 290 221q12 29 28 29zM740 539q0 143 -50 243q-64 129 -192 129 q-41 0 -90 -23q-165 -78 -175 -349h507zM353 1300q-28 24 -28 54t23 53t54 23t54 -29l247 -322l-37 -35z" />
+<glyph unicode="&#x451;" horiz-adv-x="933" d="M854 280q27 0 27 -28t-35 -88q-110 -188 -315 -188t-341.5 147.5t-136.5 344.5t127 344.5t312.5 147.5t287 -119t101.5 -302q0 -30 -7.5 -37.5t-38.5 -7.5h-605v-7q0 -210 64 -313q90 -144 242 -144q198 0 290 221q12 29 28 29zM740 539q0 143 -50 243q-64 129 -192 129 q-41 0 -90 -23q-165 -78 -175 -349h507zM779 1318q32 -32 32 -78.5t-32 -79t-78 -32.5t-78.5 33.5t-32.5 78t33 77.5t78.5 33t77.5 -32zM406.5 1318q32.5 -32 32.5 -78.5t-32.5 -79t-78 -32.5t-78.5 33.5t-33 78t33 77.5t78.5 33t78 -32z" />
+<glyph unicode="&#x452;" horiz-adv-x="1168" d="M1115 486q0 -245 -113.5 -462.5t-316.5 -348.5q-139 -90 -291 -90q-40 0 -40 34q0 21 7 24.5t33 7.5q238 34 382 215q127 160 167 414q9 57 9 126q0 181 -64 322q-83 184 -242 184q-123 0 -201 -107.5t-78 -235.5v-413q0 -40 10 -58q18 -33 114 -33q19 0 41 1v-66 q-197 6 -236 6t-243 -6v66q28 -1 71.5 -1t69 16.5t25.5 80.5v983h-173q-24 0 -24 31t24 31h173v70q0 87 -44 108q-21 10 -96 10h-26v67l306 23v-278h416q24 0 24 -31t-24 -31h-416v-390h2q41 93 125 149t184 56q194 0 319.5 -139t125.5 -335z" />
+<glyph unicode="&#x453;" horiz-adv-x="1035" d="M603 1401q22 29 53 29t54 -23t23 -53t-28 -54l-313 -256l-37 35zM535 850q-112 0 -122 -2q-32 -6 -40 -31q-3 -10 -3 -55v-591q0 -47 7 -62q10 -26 51 -34.5t150 -8.5v-66q-80 6 -178 6t-344 -6v66q140 0 157 30q10 18 10 71v583q0 52 -10 70q-16 30 -151 30h-6v67h846 l38 -328h-53q-18 182 -98 229q-55 32 -254 32z" />
+<glyph unicode="&#x454;" horiz-adv-x="1036" d="M966 255q0 -133 -133 -215q-114 -70 -255 -70q-211 0 -368 142t-157 350t157.5 349.5t367.5 141.5q154 0 259 -86q15 11 43 35q53 51 64 51q22 0 22 -56v-218q0 -34 -1 -38q-5 -18 -26 -18t-27 26q-27 111 -107.5 174.5t-194.5 63.5q-159 0 -260.5 -99t-116.5 -265 q117 94 251 94q101 0 198 -80.5t164 -80.5q31 0 58.5 18.5t33.5 18.5q21 0 21 -38t-74.5 -76.5t-130.5 -38.5t-107 48q-121 113 -253 113q-39 0 -101 -20.5t-62 -52.5q0 -171 105.5 -281.5t275.5 -110.5q99 0 184.5 45.5t107.5 133.5q2 18 8 51q6 19 26 19q28 0 28 -30z" />
+<glyph unicode="&#x455;" horiz-adv-x="804" d="M752 274q0 -146 -97 -222t-242 -76t-242 93q-77 -93 -97.5 -93t-20.5 33v322q0 32 27 32q21 0 30 -35q37 -146 92 -214q73 -90 206 -90q103 0 172 48.5t69 146.5q0 147 -223 195q-128 28 -148 33q-82 25 -134 67q-91 75 -91 183q0 134 108 204q92 59 221.5 59t212.5 -61 q60 61 82 61t22 -33v-254q0 -35 -29 -35q-23 0 -31 43l-6 60q-16 87 -81.5 132.5t-158.5 45.5t-157 -34q-81 -43 -81 -129t94 -130q48 -22 169 -46q170 -33 243 -102q91 -86 91 -204z" />
+<glyph unicode="&#x456;" horiz-adv-x="562" d="M510 0q-202 6 -233 6t-224 -6v66l44 -1q66 0 89 13q33 18 33 79v582q0 85 -41 105q-21 11 -103 11h-14v68l298 23v-802q0 -59 51 -73q19 -5 69 -5h31v-66zM335.5 1356q33.5 -33 33.5 -80.5t-33.5 -81t-80.5 -33.5t-80 34.5t-33 80t33.5 79.5t80 34t80 -33z" />
+<glyph unicode="&#x457;" horiz-adv-x="562" d="M510 0q-202 6 -233 6t-224 -6v66l44 -1q66 0 89 13q33 18 33 79v582q0 85 -41 105q-21 11 -103 11h-14v68l298 23v-802q0 -59 51 -73q19 -5 69 -5h31v-66zM539 1318q32 -32 32 -78.5t-32 -79t-78 -32.5t-78.5 33.5t-32.5 78t33 77.5t78.5 33t77.5 -32zM166.5 1318 q32.5 -32 32.5 -78.5t-32.5 -79t-78 -32.5t-78.5 33.5t-33 78t33 77.5t78.5 33t78 -32z" />
+<glyph unicode="&#x458;" horiz-adv-x="588" d="M385 -107q0 -133 -81 -232.5t-211 -99.5q-90 0 -159 40q-83 48 -83 132q0 42 27.5 70t69.5 28t70.5 -28t28.5 -70q0 -76 -74 -96q58 -29 114 -29q158 0 158 281v861q0 39 -9 60q-20 45 -148 45h-27v68l324 23v-1053zM353 1356q33 -33 33 -80.5t-33.5 -81t-80 -33.5 t-79.5 34.5t-33 80t33.5 79.5t80 34t79.5 -33z" />
+<glyph unicode="&#x459;" horiz-adv-x="1640" d="M281 81q186 0 186 658q0 63 -6 80q-11 30 -72 37q-10 1 -89 1v66h876v-66h-43h-9q-69 0 -92 -15q-23 -16 -23 -86v-261h225q118 0 205.5 -63.5t87.5 -178t-87 -184t-206 -69.5h-540v66q140 0 157 30q10 18 10 71v585q0 49 -7 65q-18 40 -149 40q-69 0 -92 -5 q-55 -11 -63 -53q-3 -17 -4 -116q-6 -683 -261 -683q-70 0 -121 48.5t-51 118.5q0 88 86 88q36 0 60 -24.5t24 -61.5q0 -59 -50 -79q18 -9 48 -9zM1356 256q0 82 -38 145.5t-114 63.5h-195v-298q0 -73 32 -90q18 -11 62 -11h7h92q53 0 74.5 6.5t50.5 54t29 129.5z" />
+<glyph unicode="&#x45a;" horiz-adv-x="1660" d="M1546 255q0 -48 -25 -97q-80 -158 -300 -158h-581v66q112 0 130 8q37 18 37 106v268h-437v-281q0 -52 12 -73t45.5 -24.5t110.5 -3.5v-66q-203 6 -238 6t-244 -6v66q78 0 111 3.5t44.5 24.5t11.5 73v589q0 52 -11.5 73t-44.5 24.5t-111 3.5v66q209 -6 244 -6t238 6v-66 q-78 0 -111 -3.5t-45 -24.5t-12 -73v-242h437v229q0 88 -37 106q-18 8 -130 8v66q175 -6 234.5 -6t245.5 6v-66q-140 0 -156 -32q-9 -18 -9 -63v-267h266q123 0 216 -57q109 -67 109 -183zM1317 105q58 59 58 149t-46 150.5t-130 60.5h-244v-304q0 -48 9 -65.5t44.5 -23.5 t128.5 -6t103 1q46 6 77 38z" />
+<glyph unicode="&#x45b;" horiz-adv-x="1181" d="M1129 0q-200 6 -238 6t-244 -6v66q30 -1 70.5 -1t63.5 12q33 19 33 76v519q0 227 -158 227q-130 0 -209.5 -104.5t-79.5 -238.5v-400q0 -39 10 -58q18 -33 117 -33q18 0 38 1v-66q-200 6 -236.5 6t-242.5 -6v66q30 -1 72.5 -1t68 16.5t25.5 80.5v983h-173q-23 0 -23 23 v16q0 23 23 23h173v70q0 87 -44 108q-21 10 -96 10h-26v67l306 23v-278h416q22 0 22 -23v-16q0 -23 -22 -23h-416v-404h2q41 93 125 149t184 56q292 0 292 -314v-502q0 -65 135 -65q15 0 32 1v-66z" />
+<glyph unicode="&#x45c;" horiz-adv-x="1080" d="M409 478l-56 -7v-313q0 -41 9 -59q17 -33 150 -33h8v-66q-203 6 -237 6t-244 -6v66q7 0 23.5 -0.5t54 -0.5t63.5 16t26 77v607q0 41 -9 59q-17 33 -150 33h-8v66q208 -6 243.5 -6t237.5 6v-66q-7 0 -23.5 0.5t-54 0.5t-63.5 -16t-26 -77v-226h92q127 0 178 70 q20 27 53.5 140.5t96.5 158.5q42 30 107.5 30t111.5 -48t46 -118q0 -102 -102 -102q-39 0 -66.5 28.5t-27.5 62t16 60t16 29.5q0 18 -25 18q-57 0 -89 -76l-53 -156q-39 -97 -107 -130q134 -30 196.5 -93.5t62.5 -205t66 -141.5q40 0 57 44q6 16 16 78q4 26 26 26 q27 0 27 -34q0 -75 -27 -128q-34 -67 -101 -67q-85 0 -134 75t-53.5 158.5t-20 119.5t-70.5 71q-108 69 -236 69zM683 1401q22 29 53 29t54 -23t23 -53t-28 -54l-313 -256l-37 35z" />
+<glyph unicode="&#x45d;" horiz-adv-x="1261" d="M1204 0q-203 6 -238 6t-244 -6v66q142 0 158 33q9 19 9 68v570l-499 -653q38 -18 148 -18v-66q-203 6 -238 6t-244 -6v66q142 0 158 33q9 19 9 68v589q0 49 -9 68q-16 33 -158 33v66q209 -6 244 -6t238 6v-66q-143 0 -159 -33q-9 -19 -9 -68v-570l499 653q-38 18 -147 18 v66q209 -6 244 -6t238 6v-66q-143 0 -159 -33q-9 -19 -9 -68v-589q0 -49 9 -68q16 -33 159 -33v-66zM473 1300q-28 24 -28 54t23 53t54 23t54 -29l247 -322l-37 -35z" />
+<glyph unicode="&#x45e;" horiz-adv-x="1151" d="M249 -439q-76 0 -136 50t-60 124q0 91 89 91q39 0 65 -25.5t26 -63.5q0 -81 -85 -91q41 -38 101 -38q93 0 158 92q32 45 68 130l71 170l-321 781q-22 54 -70 68q-21 6 -74 6h-28v68q120 -8 178.5 -8t261.5 8v-68h-4q-116 0 -116 -54q0 -19 250 -616l217 528q14 34 14 50 q0 90 -101 92v68q170 -8 212 -8t134 8v-68h-2q-140 0 -197 -136l-377 -913q-101 -245 -274 -245zM862 1398q89 0 89 -96t-113.5 -158.5t-237.5 -62.5t-229 58q-122 67 -122 163t89 96t89 -90t-89 -90q99 -74 262 -74t262 74q-89 0 -89 90t89 90z" />
+<glyph unicode="&#x45f;" horiz-adv-x="1182" d="M962 793v-574q0 -66 21.5 -93t86.5 -27q13 0 58 1v-100h-451q-28 -143 -33 -277h-105q-6 134 -34 277h-452v100h16q84 0 106 10q44 22 44 109v542q0 64 -25.5 80.5t-67 16.5t-73.5 -1v66q207 -6 243 -6t236 6v-66q-18 1 -35 1q-103 0 -120 -33q-10 -19 -10 -58v-699h447 v702q0 57 -28 72.5t-67 15.5t-72 -1v66q206 -6 243.5 -6t238.5 6v-66q-29 1 -50 1q-36 0 -53 -3q-64 -12 -64 -62z" />
+<glyph unicode="&#x460;" horiz-adv-x="1686" d="M1618 617q0 -252 -109 -438q-131 -222 -366.5 -222t-295.5 247h-8q-60 -247 -295.5 -247t-366.5 222q-109 186 -109 438q0 345 161 546q174 218 511 227v-43q-470 -25 -470 -712q0 -626 295 -626q94 0 156.5 99t62.5 205t-23 210.5t-23 122.5q0 125 105 125t105 -125 q0 -18 -23 -122.5t-23 -210.5t62.5 -205t156.5 -99q295 0 295 626q0 687 -470 712v43q337 -9 511 -227q161 -201 161 -546z" />
+<glyph unicode="&#x461;" horiz-adv-x="1294" d="M1241 430q0 -173 -79 -302q-93 -152 -255 -152q-224 0 -256 267h-8q-32 -267 -256 -267q-162 0 -255 152q-79 129 -79 302q0 244 124.5 385.5t365.5 144.5v-48q-327 -10 -327 -470q0 -169 25 -257q44 -155 169 -155q99 0 149 102q39 79 39 191.5t-23 219.5t-23 122 q0 116 95 116t95 -116q0 -15 -23 -122t-23 -219.5t39 -191.5q50 -102 149 -102q125 0 169 155q25 88 25 257q0 460 -327 470v48q241 -3 365.5 -144.5t124.5 -385.5z" />
+<glyph unicode="&#x462;" horiz-adv-x="1654" d="M957 1534l-59 2q-76 0 -103 -9q-53 -18 -53 -76v-108h477l22 -266h-47q-28 140 -124 181q-58 24 -223 24q-105 0 -105 -67v-494h336q188 0 334 -85q174 -101 174 -269t-135.5 -267.5t-302.5 -99.5h-772v61q62 -2 63 -2q113 0 134 45q5 11 5 42v1069q0 67 -115 67 q-156 0 -216 -27q-93 -42 -119 -178h-46l22 266h474v108q0 32 -9 49q-18 34 -153 34h-40v62q71 -6 115 -6h355q41 0 111 6v-62zM1302 147q88 86 88 221t-87 222t-210 87h-351v-537q0 -53 16.5 -66t69.5 -13h257q129 0 217 86z" />
+<glyph unicode="&#x463;" horiz-adv-x="1386" d="M1243 344q27 -46 27 -94t-26 -95q-86 -155 -316 -155h-598v66l48 -1q68 0 93.5 15.5t25.5 78.5v610q0 54 -12 71t-61 17q-179 0 -227 -43t-60 -219h-53l25 328h391v203q0 32 -49.5 164.5t-75.5 179.5l23 13l166 -258l165 258l23 -13q-26 -47 -75.5 -179.5t-49.5 -164.5 v-203h390l26 -328h-54q-12 174 -59.5 218t-222.5 44q-52 0 -63.5 -17.5t-11.5 -70.5v-283h289q238 0 322 -142zM876 66q93 0 158 49.5t65 137.5t-54.5 145.5t-140.5 57.5h-272v-302q0 -60 14 -74t78 -14h152z" />
+<glyph unicode="&#x464;" horiz-adv-x="2024" d="M649 1284l-55 2q-123 0 -142 -36q-8 -16 -8 -45v-474h316q22 271 216.5 465t465.5 194q193 0 363 -169l99 144q17 25 31 25q21 0 21 -33v-423q0 -26 -28.5 -26t-35.5 32q-34 154 -155 271t-272 117q-104 0 -207 -50q-276 -135 -297 -547h281q128 0 170.5 36t42.5 144h51 v-422h-51q0 108 -42.5 144t-170.5 36h-282q0 -473 322 -611q96 -41 185 -41q179 0 309 130q55 56 77 101.5t47 135.5q8 29 23 29q27 0 27 -22q0 -6 -2 -17q-35 -180 -178.5 -298.5t-327.5 -118.5q-288 0 -486 212.5t-198 501.5h-314v-530q0 -29 8 -45q18 -35 187 -35h10v-61 q-71 6 -115 6h-358q-37 0 -108 -6v61q9 0 27.5 -0.5t28.5 -0.5q121 0 139 36q7 14 7 45v1064q0 31 -7 45q-17 34 -149 34h-46v62q70 -6 112 -6h354q45 0 115 6v-62z" />
+<glyph unicode="&#x465;" horiz-adv-x="1527" d="M1474 686q0 -34 -1 -38q-5 -18 -26 -18t-27 26q-28 115 -108 182t-194 67q-60 0 -120 -34q-153 -86 -167 -357h325q46 0 46 -33t-46 -33h-326q6 -291 178 -384q63 -34 123 -34q113 0 181 64q40 37 74 109.5t53 72.5q29 0 29 -22t-27 -75q-104 -203 -329 -203 q-191 0 -322.5 140t-136.5 332h-283v-281q0 -49 9 -68q16 -33 159 -33v-66q-203 6 -238 6t-244 -6v66q140 0 157 30q10 18 10 71v589q0 53 -10 71q-17 30 -157 30v66q209 -6 244 -6t238 6v-66q-143 0 -159 -33q-9 -19 -9 -68v-242h286q18 185 146.5 315.5t312.5 130.5 q146 0 245 -74q10 7 45.5 40.5t46.5 33.5q22 0 22 -56v-218z" />
+<glyph unicode="&#x466;" horiz-adv-x="1719" d="M1306 6q-110 0 -182 -6v61h5q161 0 161 59q0 48 -25 102l-216 468q-163 -130 -163 -497v-50q0 -28 8 -42q23 -40 150 -40v-61q-76 6 -139 6h-213q-63 0 -139 -6v61q127 0 150 40q8 14 8 42v50q0 353 -153 488l-224 -475q-9 -19 -9 -42q0 -51 46 -76.5t102 -26.5v-61 q-183 6 -244 6t-161 -6v61h2q129 0 193 136l552 1172q20 42 55.5 42t54.5 -42l565 -1223q29 -63 56 -74q25 -11 93 -11h12v-61q-235 6 -345 6zM1015 764l-207 448l-214 -455q157 -119 204 -415h2q48 306 215 422z" />
+<glyph unicode="&#x467;" horiz-adv-x="1332" d="M1279 0q-120 8 -164 8t-276 -8v66h5q117 0 117 44q0 21 -22 63l-144 274q-101 -98 -101 -306v-31q0 -34 40 -42q11 -2 68 -2v-66q-70 5 -116 5h-130q-46 0 -116 -5v66q54 0 68 3q40 8 40 41v31q0 200 -95 300l-123 -231q-25 -47 -25 -78q0 -64 94 -66v-66 q-135 8 -194.5 8t-151.5 -8v66q122 1 198 144l369 697q21 40 50 40t50 -40l399 -760q31 -59 66 -73q20 -8 80 -8h14v-66zM764 506l-138 262l-141 -266q95 -71 136 -228q42 161 143 232z" />
+<glyph unicode="&#x468;" horiz-adv-x="2360" d="M649 1284l-55 2q-123 0 -142 -36q-8 -16 -8 -45v-435h730l282 599q20 42 55.5 42t54.5 -42l565 -1223q29 -63 56 -74q25 -11 93 -11h12v-61q-235 6 -345 6t-182 -6v61h5q161 0 161 59q0 48 -25 102l-216 468q-163 -130 -163 -497v-50q0 -28 8 -42q23 -40 150 -40v-61 q-76 6 -139 6h-213q-63 0 -139 -6v61q127 0 150 40q8 14 8 42v50q0 353 -153 488l-224 -475q-9 -19 -9 -42q0 -51 46 -76.5t102 -26.5v-61q-183 6 -244 6t-161 -6v61h2q129 0 193 136l242 513h-702v-569q0 -29 8 -45q18 -35 187 -35h10v-61q-71 6 -115 6h-358q-37 0 -108 -6 v61q9 0 27.5 -0.5t28.5 -0.5q121 0 139 36q7 14 7 45v1064q0 31 -7 45q-17 34 -149 34h-46v62q70 -6 112 -6h354q45 0 115 6v-62zM1656 764l-207 448l-214 -455q157 -119 204 -415h2q48 306 215 422z" />
+<glyph unicode="&#x469;" horiz-adv-x="1902" d="M1849 0q-120 8 -164 8t-276 -8v66h5q117 0 117 44q0 21 -22 63l-144 274q-101 -98 -101 -306v-31q0 -34 40 -42q11 -2 68 -2v-66q-70 5 -116 5h-130q-46 0 -116 -5v66q54 0 68 3q40 8 40 41v31q0 200 -95 300l-123 -231q-25 -47 -25 -78q0 -64 94 -66v-66 q-135 8 -194.5 8t-151.5 -8v66q122 1 198 144l126 238h-577v-281q0 -49 9 -68q16 -33 159 -33v-66q-203 6 -238 6t-244 -6v66q140 0 157 30q10 18 10 71v589q0 53 -10 71q-17 30 -157 30v66q209 -6 244 -6t238 6v-66q-143 0 -159 -33q-9 -19 -9 -68v-242h612l208 393 q21 40 50 40t50 -40l399 -760q31 -59 66 -73q20 -8 80 -8h14v-66zM1334 506l-138 262l-141 -266q95 -71 136 -228q42 161 143 232z" />
+<glyph unicode="&#x46a;" horiz-adv-x="1588" d="M1520 22q0 -22 -35 -22h-87q-106 0 -146 92q-23 55 -29 184q-8 172 -95.5 295t-252.5 155v-583q0 -28 8 -42q22 -40 150 -40v-61q-76 6 -139 6h-200q-63 0 -139 -6v61q128 0 150 40q8 14 8 42v583q-165 -32 -252.5 -155t-95.5 -295q-6 -129 -29 -184q-40 -92 -146 -92 h-87q-35 0 -35 22q0 15 25 24l46 15q40 20 53 114q4 68 9 136q16 205 141.5 326t333.5 140l-402 491q-13 16 -13 35q0 40 79 40h867q88 0 88 -78q0 -35 -19 -57l-366 -431q209 -18 335 -139.5t142 -326.5q5 -68 9 -136q13 -94 53 -114l46 -15q25 -9 25 -24zM1159 1209 q0 78 -88 78h-469q-79 0 -79 -40q0 -19 13 -35l321 -393l283 333q19 22 19 57z" />
+<glyph unicode="&#x46b;" horiz-adv-x="1215" d="M1164 23q0 -23 -38 -23h-66q-84 0 -116 61q-20 38 -27 135q-19 253 -236 299v-332q0 -71 31 -88q18 -9 83 -9h14v-66l-200 6l-202 -6v66q5 0 18.5 -0.5t20.5 -0.5q53 0 70.5 20.5t17.5 73.5v336q-217 -46 -236 -299q-7 -97 -27 -135q-32 -61 -116 -61h-66q-38 0 -38 23 q0 14 24 23q18 5 36 11q26 13 34 72l6 86q14 142 106.5 225.5t237.5 100.5l-286 312q-13 14 -13 31q0 39 71 39h650q78 0 78 -64q0 -28 -17 -46l-258 -272q145 -17 237.5 -100.5t106.5 -225.5l6 -86q8 -59 34 -72q18 -6 36 -11q24 -9 24 -23zM869 822q0 40 -54 40h-366 q-33 0 -33 -15q0 -8 7 -16l232 -253l203 213q11 12 11 31z" />
+<glyph unicode="&#x46c;" horiz-adv-x="2248" d="M649 1284l-55 2q-123 0 -142 -36q-8 -16 -8 -45v-420h885l-395 483q-13 16 -13 35q0 40 79 40h867q88 0 88 -78q0 -35 -19 -57l-366 -431q209 -18 335 -139.5t142 -326.5q5 -68 9 -136q13 -94 53 -114l46 -15q25 -9 25 -24q0 -22 -35 -22h-87q-106 0 -146 92 q-23 55 -29 184q-8 172 -95.5 295t-252.5 155v-583q0 -28 8 -42q22 -40 150 -40v-61q-76 6 -139 6h-200q-63 0 -139 -6v61q128 0 150 40q8 14 8 42v583q-165 -32 -252.5 -155t-95.5 -295q-6 -129 -29 -184q-40 -92 -146 -92h-87q-35 0 -35 22q0 15 25 24l46 15q40 20 53 114 q4 68 9 136q23 300 271 414h-688v-584q0 -29 8 -45q18 -35 187 -35h10v-61q-71 6 -115 6h-358q-37 0 -108 -6v61q9 0 27.5 -0.5t28.5 -0.5q121 0 139 36q7 14 7 45v1064q0 31 -7 45q-17 34 -149 34h-46v62q70 -6 112 -6h354q45 0 115 6v-62zM1819 1209q0 78 -88 78h-469 q-79 0 -79 -40q0 -19 13 -35l321 -393l283 333q19 22 19 57z" />
+<glyph unicode="&#x46d;" horiz-adv-x="1795" d="M1744 23q0 -23 -38 -23h-66q-84 0 -116 61q-20 38 -27 135q-19 253 -236 299v-332q0 -71 31 -88q18 -9 83 -9h14v-66l-200 6l-202 -6v66q5 0 18.5 -0.5t20.5 -0.5q53 0 70.5 20.5t17.5 73.5v336q-217 -46 -236 -299q-7 -97 -27 -135q-32 -61 -116 -61h-66q-38 0 -38 23 q0 14 24 23q18 5 36 11q26 13 34 72l6 86q18 181 163 268h-524v-316q0 -49 9 -68q16 -33 159 -33v-66q-203 6 -238 6t-244 -6v66q140 0 157 30q10 18 10 71v589q0 53 -10 71q-17 30 -157 30v66q209 -6 244 -6t238 6v-66q-143 0 -159 -33q-9 -19 -9 -68v-207h698l-279 304 q-13 14 -13 31q0 39 71 39h650q78 0 78 -64q0 -28 -17 -46l-258 -272q145 -17 237.5 -100.5t106.5 -225.5l6 -86q8 -59 34 -72q18 -6 36 -11q24 -9 24 -23zM1449 822q0 40 -54 40h-366q-33 0 -33 -15q0 -8 7 -16l232 -253l203 213q11 12 11 31z" />
+<glyph unicode="&#x46e;" horiz-adv-x="1178" d="M621 32l-189 15q-64 0 -107 -54t-43 -107t23 -89.5t67 -36.5t165.5 61.5t192.5 61.5q151 0 202 -94q33 -63 39 -231h-21q-20 85 -44 112q-33 40 -102 40t-177 -49t-168 -49q-105 0 -180 80t-75 181.5t63.5 182t158.5 80.5q31 0 91.5 -9t91.5 -9q286 0 286 241 q0 156 -98.5 247t-255.5 91h-116q-78 -1 -116.5 -1t-38.5 30q0 16 13 22.5t170.5 18t256.5 77.5q150 100 150 257q0 111 -103 174q-87 53 -225.5 53t-242.5 -62.5t-130 -138.5q-4 -20 -17 -58q-10 -20 -35 -20q-41 0 -39 46l9 246q2 49 35 49q26 0 112 -85q127 79 306 85 l-272 175l29 41l294 -152l292 152l29 -41l-274 -179q163 -16 278 -79q147 -80 147 -208q0 -261 -386 -360q172 -25 295 -115q148 -108 148 -265q0 -176 -166 -261q-128 -66 -323 -66z" />
+<glyph unicode="&#x46f;" horiz-adv-x="920" d="M395 50l69 -5q102 0 160.5 54t58.5 154q0 222 -251 222h-118q-55 0 -55 23t29.5 25.5t79.5 5.5q122 8 192 62q86 66 86 151.5t-58.5 121t-151 35.5t-165 -36.5t-94 -91t-36.5 -54.5q-28 0 -28 58v122q0 37 5 47.5t36 8.5q25 -19 77 -54q85 50 206 54l-284 287l29 41 l294 -252l292 252l29 -41l-285 -290q118 -12 200 -55q105 -55 105 -145q0 -170 -254 -242q112 -21 195 -81q102 -73 102 -174q0 -131 -96 -201.5t-231 -70.5l-142 -6q-62 0 -105 -43t-43 -105q0 -80 55 -80q38 0 154 53t176 53q129 0 173 -84q29 -55 34 -204l-18 -2 q-19 75 -38 98q-27 34 -86 34t-154 -42t-144 -42q-91 0 -155 64.5t-64 156t63.5 155t155.5 63.5z" />
+<glyph unicode="&#x470;" horiz-adv-x="1588" d="M460 61l83 -2q139 0 159 40q11 22 11 62v282q-218 9 -356.5 152.5t-155.5 363.5q-5 68 -9 136q-13 94 -53 114l-46 15q-25 9 -25 24q0 22 35 22h87q106 0 146 -92q23 -55 29 -184q8 -179 91 -313q95 -154 257 -185v710q0 25 -7 42q-16 39 -216 39h-30v62q74 -6 143 -6 h382q69 0 143 6v-62h-30q-200 0 -216 -39q-7 -17 -7 -42v-710q162 31 257 185q83 134 91 313q6 129 29 184q40 92 146 92h87q35 0 35 -22q0 -15 -25 -24l-46 -15q-40 -20 -53 -114q-4 -68 -9 -136q-17 -220 -155.5 -363.5t-356.5 -152.5v-282q0 -40 11 -62q20 -40 159 -40 l83 2v-61q-74 6 -143 6h-382q-69 0 -143 -6v61z" />
+<glyph unicode="&#x471;" horiz-adv-x="1254" d="M1201 656q0 -244 -99 -438q-122 -241 -343 -241v-389h-83v389q-414 0 -414 386v415q0 39 -21 73.5t-58 34.5q-79 0 -79 -173q0 -7 3 -84h-55v120q0 84 47 143.5t132 59.5t132.5 -62.5t47.5 -153.5v-351q0 -186 39 -256q55 -100 226 -100v894h83v-894q151 0 248 146 q86 130 86 289q0 70 -42.5 200.5t-42.5 199.5q0 96 67 96q85 0 112 -118q14 -59 14 -186z" />
+<glyph unicode="&#x472;" horiz-adv-x="1445" d="M722 -43q-280 0 -467 214t-187 498.5t186.5 502.5t468 218t468 -217.5t186.5 -503t-187.5 -499t-467.5 -213.5zM1175 696q0 438 -260 590q-92 54 -192 54t-191 -53q-262 -153 -262 -591q0 -469 265 -632q91 -56 185 -56t188 55q267 156 267 633zM869 560q-70 0 -185 56.5 t-155 56.5q-100 0 -138 -113h-61q20 102 85 169.5t164 67.5q66 0 177 -54.5t158 -54.5q95 0 143 121h61q-32 -118 -79 -175q-62 -74 -170 -74z" />
+<glyph unicode="&#x473;" horiz-adv-x="1054" d="M191.5 118.5q-138.5 142.5 -138.5 341.5t138 349.5t336.5 150.5t336.5 -151t138 -350.5t-139 -341t-336 -141.5t-335.5 142.5zM776 188q47 92 47 292.5t-56 292.5q-84 138 -244.5 138t-241.5 -143q-51 -90 -51 -294.5t55 -299.5q83 -144 246.5 -144t244.5 158zM627 385 q-49 0 -127.5 39t-106.5 39q-65 0 -91 -78h-51q34 173 177 173q46 0 122 -37.5t108 -37.5q63 0 95 83h51q-49 -181 -177 -181z" />
+<glyph unicode="&#x474;" horiz-adv-x="1601" d="M1533 1205q0 -92 -91 -92q-38 0 -64 25.5t-26 64.5q0 71 63 91q-23 10 -51 10q-81 0 -134 -134l-470 -1184q-12 -31 -38 -31t-39 2l-426 1248q-12 35 -25 49q-26 28 -164 28v61q138 -6 299 -6t232 6v-61q-165 0 -165 -59q0 -13 9 -39l337 -985l387 975q76 191 197 191 q67 0 118 -47t51 -113z" />
+<glyph unicode="&#x475;" horiz-adv-x="1167" d="M1115 805q0 -75 -74 -75t-74 73q0 52 50 71q-23 10 -50 10q-49 0 -83 -68q-4 -7 -43 -105l-293 -735h-30q-2 1 -5.5 1t-11 -0.5t-11.5 -0.5l-259 763q-30 87 -55 102.5t-123 15.5v66q90 -6 175 -6t264 6v-66h-4q-125 0 -125 -60q0 -5 208 -615l242 598q68 158 154 158 q57 0 102.5 -38.5t45.5 -94.5z" />
+<glyph unicode="&#x476;" horiz-adv-x="1601" d="M1533 1205q0 -92 -91 -92q-38 0 -64 25.5t-26 64.5q0 71 63 91q-23 10 -51 10q-81 0 -134 -134l-470 -1184q-12 -31 -38 -31t-39 2l-426 1248q-12 35 -25 49q-26 28 -164 28v61q138 -6 299 -6t232 6v-61q-165 0 -165 -59q0 -13 9 -39l337 -985l387 975q76 191 197 191 q67 0 118 -47t51 -113zM813 1532q0 28 20 51t44.5 23t43.5 -13l292 -195l-26 -50l-328 123q-46 17 -46 61zM463 1532q0 28 20 51t44.5 23t43.5 -13l292 -195l-26 -50l-328 123q-46 17 -46 61z" />
+<glyph unicode="&#x477;" horiz-adv-x="1167" d="M1115 805q0 -75 -74 -75t-74 73q0 52 50 71q-23 10 -50 10q-49 0 -83 -68q-4 -7 -43 -105l-293 -735h-30q-2 1 -5.5 1t-11 -0.5t-11.5 -0.5l-259 763q-30 87 -55 102.5t-123 15.5v66q90 -6 175 -6t264 6v-66h-4q-125 0 -125 -60q0 -5 208 -615l242 598q68 158 154 158 q57 0 102.5 -38.5t45.5 -94.5zM595 1300q-29 24 -29 54t23.5 53t54 23t53.5 -29l248 -322l-37 -35zM225 1300q-29 24 -29 54t23.5 53t54 23t53.5 -29l248 -322l-37 -35z" />
+<glyph unicode="&#x478;" horiz-adv-x="2481" d="M2429 805q0 -75 -74 -75t-74 73q0 52 50 71q-23 10 -50 10q-49 0 -83 -68q-6 -12 -43 -105l-361 -905q-98 -245 -274 -245q-76 0 -136 50t-60 124q0 91 89 91q39 0 65 -25.5t26 -63.5q0 -81 -85 -91q41 -38 101 -38q93 0 158 92q32 45 86 173l42 100l-261 766 q-30 87 -55 102.5t-123 15.5v66q90 -6 175 -6t264 6v-66h-4q-125 0 -125 -60q0 -5 208 -615l242 598q68 158 154 158q57 0 102.5 -38.5t45.5 -94.5zM722 -43q-280 0 -467 214t-187 498.5t186.5 502.5t468 218t468 -217.5t186.5 -503t-187.5 -499t-467.5 -213.5zM1177 605 q0 216 -65 385q-79 205 -240 296q-96 54 -195.5 54t-187.5 -53q-223 -135 -223 -509q0 -221 68 -401q81 -217 244 -313q95 -56 189 -56t184 55q226 139 226 542z" />
+<glyph unicode="&#x479;" horiz-adv-x="1951" d="M946 481.5q0 -201.5 -127.5 -353.5t-324.5 -152t-319 143.5t-122 341t126.5 348.5t321 151t320 -138.5t125.5 -340zM783 406q0 187 -65 326q-84 180 -250 180q-135 0 -200 -121q-52 -96 -52 -262.5t67 -311.5q87 -187 251 -187q249 0 249 376zM1899 805q0 -75 -74 -75 t-74 73q0 52 50 71q-23 10 -50 10q-49 0 -83 -68q-6 -12 -43 -105l-361 -905q-98 -245 -274 -245q-76 0 -136 50t-60 124q0 91 89 91q39 0 65 -25.5t26 -63.5q0 -81 -85 -91q41 -38 101 -38q93 0 158 92q32 45 86 173l42 100l-261 766q-30 87 -55 102.5t-123 15.5v66 q90 -6 175 -6t264 6v-66h-4q-125 0 -125 -60q0 -5 208 -615l242 598q68 158 154 158q57 0 102.5 -38.5t45.5 -94.5z" />
+<glyph unicode="&#x47a;" horiz-adv-x="1764" d="M1528 1121q168 -178 168 -444.5t-166 -446.5q-196 -212 -575 -231l28 -138q2 -10 2 -18q0 -38 -31.5 -62t-71.5 -24t-71.5 24t-31.5 62q0 8 2 18l28 138q-376 19 -573 227q-168 178 -168 444.5t166 446.5q196 212 575 231l-28 138q-2 10 -2 18q0 38 31.5 62t71.5 24 t71.5 -24t31.5 -62q0 -8 -2 -18l-28 -138q376 -19 573 -227zM1494 656q0 427 -340 584q-100 46 -209 57l-35 -175q-9 -45 -28 -45t-28 47l-35 173q-111 -10 -208 -53q-341 -150 -341 -552q0 -427 340 -584q100 -46 209 -57l35 174q9 45 28 45t28 -47l35 -172q111 10 208 53 q341 150 341 552z" />
+<glyph unicode="&#x47b;" horiz-adv-x="1336" d="M1113 802q170 -124 170 -328.5t-160.5 -328t-397.5 -137.5l24 -118q1 -5 1 -15q0 -31 -25 -50t-57 -19t-57 19t-25 50q0 10 1 15l24 118q-235 14 -388 126q-170 124 -170 328.5t160.5 328t397.5 137.5l-24 118q-1 5 -1 15q0 31 25 50t57 19t57 -19t25 -50q0 -10 -1 -15 l-24 -118q235 -14 388 -126zM1038 210q68 87 68 257.5t-73 262.5q-104 131 -318 149l-25 -124q-7 -36 -21.5 -36t-22.5 38l-25 122q-222 -19 -323 -148q-68 -87 -68 -257.5t73 -262.5q104 -131 319 -149l24 119q7 36 21.5 36t22.5 -38l24 -117q222 18 324 148z" />
+<glyph unicode="&#x47c;" horiz-adv-x="1686" d="M1198 1309q-108 0 -255.5 107t-268.5 107q-157 0 -239 -241l-37 43q79 281 352 281q100 0 203 -59l163 -110q90 -59 150.5 -59t125.5 33l21 -39q-107 -63 -215 -63zM695 1382l7 -49q0 -28 -20.5 -50t-48.5 -22q-79 0 -79 83q0 48 39.5 80.5t89.5 32.5q154 0 243 -161 l-27 -18q-74 129 -177 129q-27 0 -27 -25zM1618 598q0 -243 -113 -426q-133 -215 -366 -215t-292 247h-8q-59 -247 -292 -247t-366 215q-113 183 -113 426q0 462 470 619l13 -41q-168 -68 -231 -216q-49 -113 -49 -321q0 -630 294 -630q94 0 156.5 99t62.5 205t-23 210.5 t-23 122.5q0 125 105 125t105 -125q0 -18 -23 -122.5t-23 -210.5t62.5 -205t156.5 -99q294 0 294 630q0 208 -49 321q-63 148 -231 216l13 41q470 -157 470 -619z" />
+<glyph unicode="&#x47d;" horiz-adv-x="1294" d="M1123 1184q-94 -63 -189 -63t-223.5 107t-235.5 107q-137 0 -210 -241l-37 43q31 125 111 203t197 78t258.5 -114t205.5 -114q45 0 102 33zM493 1194l7 -49q0 -28 -20.5 -50t-48.5 -22q-79 0 -79 83q0 48 39.5 80.5t89.5 32.5q154 0 243 -161l-27 -18q-74 129 -177 129 q-27 0 -27 -25zM1241 430q0 -173 -79 -302q-93 -152 -255 -152q-224 0 -256 267h-8q-32 -267 -256 -267q-162 0 -255 152q-79 129 -79 302q0 244 124.5 385.5t365.5 144.5v-48q-327 -10 -327 -470q0 -169 25 -257q44 -155 169 -155q99 0 149 102q39 79 39 191.5t-23 219.5 t-23 122q0 116 95 116t95 -116q0 -15 -23 -122t-23 -219.5t39 -191.5q50 -102 149 -102q125 0 169 155q25 88 25 257q0 460 -327 470v48q241 -3 365.5 -144.5t124.5 -385.5z" />
+<glyph unicode="&#x47e;" horiz-adv-x="1686" d="M1094 1510h-60q-90 0 -109 -7q-40 -15 -40 -81v-71h-84v71q0 66 -40 81q-19 7 -109 7h-60q-142 0 -186 -30t-56 -137h-63l20 263h1072l20 -263h-63q-12 107 -56 137t-186 30zM1618 617q0 -252 -109 -438q-131 -222 -366.5 -222t-295.5 247h-8q-60 -247 -295.5 -247 t-366.5 222q-109 186 -109 438q0 533 428 701l14 -41q-133 -76 -194 -286q-46 -156 -46 -356q0 -626 295 -626q94 0 156.5 99t62.5 205t-23 210.5t-23 122.5q0 125 105 125t105 -125q0 -18 -23 -122.5t-23 -210.5t62.5 -205t156.5 -99q295 0 295 626q0 200 -46 356 q-61 210 -194 286l14 41q428 -168 428 -701z" />
+<glyph unicode="&#x47f;" horiz-adv-x="1294" d="M1241 430q0 -173 -79 -302q-93 -152 -255 -152q-224 0 -256 267h-8q-32 -267 -256 -267q-162 0 -255 152q-79 129 -79 302q0 244 124.5 385.5t365.5 144.5v-48q-327 -10 -327 -470q0 -169 25 -257q44 -155 169 -155q99 0 149 102q39 79 39 191.5t-23 219.5t-23 122 q0 116 95 116t95 -116q0 -15 -23 -122t-23 -219.5t39 -191.5q50 -102 149 -102q125 0 169 155q25 88 25 257q0 460 -327 470v48q241 -3 365.5 -144.5t124.5 -385.5zM833 1257q-87 0 -108 -8q-40 -15 -40 -80v-154h-74v154q0 66 -41 81q-20 7 -110 7q-155 0 -195.5 -42.5 t-50.5 -199.5h-53l25 328h921l26 -328h-54q-11 156 -51 199t-195 43z" />
+<glyph unicode="&#x480;" horiz-adv-x="1335" d="M1267 854q0 -26 -29 -26t-35 32q-12 60 -47 178q-51 127 -151 208.5t-217.5 81.5t-219.5 -50q-147 -72 -222.5 -224.5t-75.5 -333.5t82 -337.5t240 -224.5q95 -41 170 -41t133 17v-430q0 -27 13.5 -52t91.5 -31h110v-61q-71 6 -117 6h-373q-41 0 -112 -6v61 q8 0 27.5 -0.5t29.5 -0.5q128 0 147 36q9 17 9 49v353q-267 12 -460 204.5t-193 462.5t204 467.5t480 197.5q193 0 363 -169l99 144q17 25 31 25q22 0 22 -33v-503z" />
+<glyph unicode="&#x481;" horiz-adv-x="896" d="M730 906q113 -64 113 -170t-97 -106q-42 0 -70.5 28t-28.5 70q0 94 100 99q-79 78 -229 78q-60 0 -120 -34q-168 -94 -168 -371q0 -119 43.5 -228t134.5 -158q63 -34 122.5 -34t105.5 17v-172q0 -214 -36 -342h-148q37 173 37 311v133q-183 9 -309.5 144t-126.5 323 t135 327t327 139q121 0 215 -54z" />
+<glyph unicode="&#x482;" horiz-adv-x="874" d="M789 960q-64 0 -124 -130l-107 -233l129 -41l-36 -73l-112 73l-152 -325l130 -38l-36 -73l-112 73l-79 -165q-42 -88 -42 -138.5t74 -94.5l-16 -36l-304 144l14 34q44 -15 68 -15q63 0 129 125q1 2 79 182l-122 35l33 73l107 -69l153 326l-124 35l34 73l108 -69l109 231 q36 76 36 122q0 66 -74 97l16 37l304 -144l-14 -35q-40 19 -69 19z" />
+<glyph unicode="&#x483;" horiz-adv-x="0" d="M1054 1372q-94 -63 -189 -63t-223.5 107t-235.5 107q-137 0 -210 -241l-37 43q31 125 111 203t197 78t258.5 -114t205.5 -114q45 0 102 33zM424 1382l7 -49q0 -28 -20.5 -50t-48.5 -22q-79 0 -79 83q0 48 39.5 80.5t89.5 32.5q154 0 243 -161l-27 -18q-74 129 -177 129 q-27 0 -27 -25z" />
+<glyph unicode="&#x484;" horiz-adv-x="0" d="M1003 1352q-85 -63 -182 -63t-211 107.5t-211 107.5t-165 -241l-24 32q66 291 273 291q100 0 229.5 -118.5t186.5 -118.5q37 0 90 31z" />
+<glyph unicode="&#x485;" horiz-adv-x="0" d="M631 1402l11 65q0 32 -37 32q-133 0 -233 -170l-27 18q121 219 313 219q66 0 118 -43t52 -99t-28.5 -87t-71.5 -31t-70 29t-27 67z" />
+<glyph unicode="&#x486;" horiz-adv-x="0" d="M532 1467l10 -65q0 -38 -26.5 -67t-69.5 -29t-72 31t-29 87t52.5 99t118.5 43q191 0 312 -219l-26 -18q-100 170 -233 170q-37 0 -37 -32z" />
+<glyph unicode="&#x487;" horiz-adv-x="0" d="M462 1521q-98 0 -156 -73q-23 -29 -85 -158h-114q70 149 128 206q85 85 221 85q40 0 237 -74t418 -136l-74 -81q-75 24 -274 109l-151 73q-104 49 -150 49z" />
+<glyph unicode="&#x488;" horiz-adv-x="0" d="M2257 1026h-32q-3 82 -79 137.5t-161 55.5t-161 -55.5t-79 -137.5h-32q0 120 77.5 216.5t194.5 96.5t194.5 -96.5t77.5 -216.5zM2519 433h-32q-3 82 -79 137.5t-161 55.5t-161 -55.5t-79 -137.5h-32q0 120 77.5 216.5t194.5 96.5t194.5 -96.5t77.5 -216.5zM1542 1293h-32 q-3 82 -79 137.5t-161 55.5t-161 -55.5t-79 -137.5h-32q0 120 77.5 216.5t194.5 96.5t194.5 -96.5t77.5 -216.5zM2257 -169h-32q-3 82 -79 137.5t-161 55.5t-161 -55.5t-79 -137.5h-32q0 120 77.5 216.5t194.5 96.5t194.5 -96.5t77.5 -216.5zM827 1019h-32q-3 82 -79 137.5 t-161 55.5t-161 -55.5t-79 -137.5h-32q0 120 77.5 216.5t194.5 96.5t194.5 -96.5t77.5 -216.5zM1542 -442h-32q-3 82 -79 137.5t-161 55.5t-161 -55.5t-79 -137.5h-32q0 120 77.5 216.5t194.5 96.5t194.5 -96.5t77.5 -216.5zM565 429h-32q-3 82 -79 137.5t-161 55.5 t-161 -55.5t-79 -137.5h-32q0 120 77.5 216.5t194.5 96.5t194.5 -96.5t77.5 -216.5zM827 -169h-32q-3 82 -79 137.5t-161 55.5t-161 -55.5t-79 -137.5h-32q0 120 77.5 216.5t194.5 96.5t194.5 -96.5t77.5 -216.5z" />
+<glyph unicode="&#x489;" horiz-adv-x="0" d="M2266 1000q0 -19 -27 -19l-62 21q-48 16 -98 16q-73 0 -73 -39q0 -10 13.5 -42.5t13.5 -62.5t-29 -56.5t-70.5 -26.5t-70.5 32.5t-29 76.5q0 82 69.5 128t140 46t146.5 -24.5t76 -49.5zM1609 1593q33 13 49.5 13t16.5 -15.5t-7 -20.5t-47.5 -22t-82.5 -53t-42 -73 q0 -17 60 -46t60 -76.5t-28.5 -77t-78 -29.5t-81.5 43.5t-32 100.5q0 171 213 256zM2308 199q12 -30 12 -48t-15 -18t-20 7t-21.5 47t-53.5 82.5t-73 42.5q-18 0 -47 -60t-76 -60t-76.5 29t-29.5 78.5t43.5 81t100.5 31.5q171 0 256 -213zM992.5 1345q26.5 -30 26.5 -71 t-32.5 -69.5t-76.5 -28.5q-82 0 -127.5 69t-45.5 140.5t17 124.5q31 96 56 96q19 0 19 -26q0 3 -18.5 -52t-18.5 -106q0 -74 39 -74q10 0 42.5 13.5t62.5 13.5t56.5 -30zM1795 -257q0 -39 -17.5 -112t-40.5 -73t-23 25q0 -8 14 44.5t14 94.5q0 92 -46 92q-8 0 -42 -17 t-65 -17t-58 29.5t-27 71.5t33.5 71.5t79.5 29.5q84 0 134 -81q44 -69 44 -158zM624.5 884q29.5 -29 29.5 -78.5t-43 -80.5t-100 -31q-172 0 -257 213q-12 30 -12 47.5t14.5 17.5t20.5 -7.5t22.5 -47t52.5 -82t72 -42.5q18 0 47.5 60t76.5 60t76.5 -29zM1083 -185 q0 -187 -248 -250q-28 -7 -39 -7q-25 0 -25 19q0 13 10.5 19t50.5 16t90 43t50 69q0 14 -52 47.5t-52 77t30.5 72t77.5 28.5t77 -39.5t30 -94.5zM651 201q0 -81 -69 -126.5t-139.5 -45.5t-146.5 24.5t-76 49.5q0 19 27 19q-4 0 52.5 -19t106.5 -19q73 0 73 39q0 10 -14 42.5 t-14 62.5t29.5 56.5t71 26.5t70.5 -32.5t29 -77.5z" />
+<glyph unicode="&#x48a;" horiz-adv-x="1631" d="M1564 1284l-56 2q-122 0 -140 -36q-8 -16 -8 -45v-1064q0 -29 8 -45q18 -35 186 -35h10v-61l-329 -427l-29 22l91 184q66 139 66 176q0 45 -92 45h-288v61q9 0 28 -0.5t29 -0.5q119 0 137 36q8 16 8 45v964l-734 -1008l1 -1q14 -30 90 -35q3 0 30 -0.5t77 0.5v-61 q-71 6 -115 6h-358q-37 0 -108 -6v61q9 0 27.5 -0.5t28.5 -0.5q121 0 139 36q7 14 7 45v1064q0 31 -7 45q-17 34 -149 34h-46v62q70 -6 112 -6h354q45 0 115 6v-62l-55 2q-123 0 -142 -36q-8 -16 -8 -45v-967l734 1009q-15 37 -149 37h-46v62q70 -6 112 -6h356q43 0 113 6 v-62zM1163 1516q0 -85 -140 -130q-101 -33 -211 -33t-211 33q-140 45 -140 130q0 39 25 64.5t64 25.5t64 -25.5t25 -70.5t-38 -70q63 -24 174 -24h74q111 0 174 24q-38 25 -38 70t25 70.5t64 25.5t64 -25.5t25 -64.5z" />
+<glyph unicode="&#x48b;" horiz-adv-x="1261" d="M1048 -45q0 45 -70 45h-256v66q142 0 158 33q9 19 9 68v570l-499 -653q38 -18 148 -18v-66q-203 6 -238 6t-244 -6v66q142 0 158 33q9 19 9 68v589q0 49 -9 68q-16 33 -158 33v66q209 -6 244 -6t238 6v-66q-143 0 -159 -33q-9 -19 -9 -68v-570l499 653q-38 18 -147 18v66 q209 -6 244 -6t238 6v-66q-143 0 -159 -33q-9 -19 -9 -68v-589q0 -49 9 -68q16 -33 159 -33v-66l-246 -336l-39 27q28 36 78.5 134t50.5 130zM892 1398q89 0 89 -96t-113.5 -158.5t-237.5 -62.5t-229 58q-122 67 -122 163t89 96t89 -90t-89 -90q99 -74 262 -74t262 74 q-89 0 -89 90t89 90z" />
+<glyph unicode="&#x48c;" horiz-adv-x="1346" d="M1104 636q174 -101 174 -269t-135.5 -267.5t-302.5 -99.5h-772v61q62 -2 63 -2q113 0 134 45q5 11 5 42v845h-202v62h202v287h164v-287h382v-62h-382v-270h336q188 0 334 -85zM994 147q88 86 88 221t-87 222t-210 87h-351v-537q0 -53 16.5 -66t69.5 -13h257q129 0 217 86 z" />
+<glyph unicode="&#x48d;" horiz-adv-x="1118" d="M975 344q27 -46 27 -94t-26 -95q-86 -155 -316 -155h-598v66h9q132 0 148 30q10 18 10 71v504h-167v62h167v190h135v-190h178v-62h-178v-185h289q238 0 322 -142zM608 66q93 0 158 49.5t65 138t-54.5 145.5t-140.5 57h-272v-302q0 -62 14 -75t78 -13h152z" />
+<glyph unicode="&#x48e;" horiz-adv-x="1295" d="M1074 1249q154 -106 154 -264.5t-130 -256.5t-289 -108l140 -243l-54 -31l-158 273h-293v-473q0 -32 7 -48q17 -37 181 -37h17v-61q-72 6 -133 6h-326q-50 0 -122 -6v61l55 -1q122 0 140 38q7 15 7 48v1051q0 32 -7 48q-16 37 -158 37q-18 0 -37 -1v62h695q174 0 311 -94 zM1024 977q0 161 -75.5 232.5t-237.5 71.5h-186q-53 0 -69.5 -13t-16.5 -66v-532h269l-137 237l54 31l153 -265q246 28 246 304z" />
+<glyph unicode="&#x48f;" horiz-adv-x="1160" d="M360 805q127 141 308 141t310 -146.5t129 -327.5t-105.5 -314.5t-266.5 -169.5l106 -184l-54 -31l-118 205q-19 -2 -38 -2q-78 0 -158.5 42t-105.5 109v-388q0 -42 11 -59q19 -29 114 -29q19 0 41 1v-66q-169 5 -241.5 5t-238.5 -5v66q37 -2 76.5 -2t60.5 14q30 19 30 83 v1002q0 51 -10 71.5t-44 28.5q-26 6 -83 6h-30v68l307 23v-141zM705 39q107 39 165.5 166t58.5 267t-67 267q-81 154 -218 154q-179 0 -277 -172v-478q0 -46 30 -89q91 -130 225 -130q10 0 20 1l-125 215l54 31z" />
+<glyph unicode="&#x490;" horiz-adv-x="1216" d="M530 1281q-51 0 -68.5 -13t-17.5 -66v-1065q0 -22 8 -39q17 -37 223 -37h22v-61q-74 6 -120 6h-382q-55 0 -127 -6v61q8 0 26 -0.5t28 -0.5q124 0 141 38q7 15 7 48v1053q0 31 -7 47q-15 35 -170 35h-25v62h676q170 0 241.5 61t97.5 202h51l-40 -325h-564z" />
+<glyph unicode="&#x491;" horiz-adv-x="934" d="M525 856q-78 0 -106 -11q-48 -20 -48 -86v-588q0 -47 6 -62q10 -26 47 -34t154 -8v-67q-87 6 -203 6h-83h3q0 -1 -240 -6v67h86q60 5 71 28.5t11 71.5v589q0 48 -11 71.5t-71 28.5h-86v67h380q198 0 253 33q80 47 98 229h53l-38 -329h-276z" />
+<glyph unicode="&#x492;" horiz-adv-x="1216" d="M744 1281h-214q-51 0 -68.5 -13.5t-17.5 -65.5v-559h593v-62h-593v-444q0 -22 8 -39q17 -37 223 -37h22v-61q-74 6 -120 6h-382q-55 0 -127 -6v61q8 0 26 -0.5t28 -0.5q124 0 141 38q7 15 7 48v435h-202v62h202v556q0 31 -7 47q-15 35 -170 35h-25v62h1026l55 -442h-49 q-24 212 -82 285q-74 95 -274 95z" />
+<glyph unicode="&#x493;" horiz-adv-x="1035" d="M535 856q-112 0 -122 -2q-32 -6 -40 -31q-3 -10 -3 -55v-305h325v-62h-325v-230q0 -47 7 -62q10 -26 51 -34.5t150 -8.5v-66q-80 6 -178 6t-344 -6v66q140 0 157 30q10 18 10 71v234h-167v62h167v293q0 52 -10 70q-16 30 -151 30h-6v67h846l38 -328h-53q-18 182 -98 229 q-55 32 -254 32z" />
+<glyph unicode="&#x494;" horiz-adv-x="1216" d="M556 793q284 0 463 -162t179 -442t-180.5 -450.5t-461.5 -170.5q-118 0 -233 59t-195 153l43 32q176 -175 392.5 -175t332.5 167q100 145 100 378.5t-102 379.5q-117 169 -338 169q-54 0 -112 -12v-582q0 -22 8 -39q17 -37 223 -37h22v-61q-74 6 -120 6h-382 q-55 0 -127 -6v61q8 0 26 -0.5t28 -0.5q124 0 141 38q7 15 7 48v1053q0 31 -7 47q-15 35 -170 35h-25v62h1026l55 -442h-49q-24 212 -82 285q-74 95 -274 95h-214q-51 0 -68.5 -13t-17.5 -66v-417q56 8 112 8z" />
+<glyph unicode="&#x495;" horiz-adv-x="1035" d="M946 251q0 -113 -58 -230q-153 -310 -568 -463l-14 48q194 72 327 220q150 165 150 357q0 114 -63 186t-176 72q-84 0 -174 -75v-195q0 -47 7 -62q10 -26 51 -34.5t150 -8.5v-66q-80 6 -178 6t-344 -6v66q140 0 157 30q10 18 10 71v589q0 52 -10 70q-16 30 -151 30h-6v67 h846l38 -328h-53q-18 182 -98 229q-55 32 -254 32q-112 0 -122 -2q-32 -6 -40 -31q-3 -10 -3 -55v-325q133 118 247 118q147 0 238 -82.5t91 -227.5z" />
+<glyph unicode="&#x496;" horiz-adv-x="2214" d="M1399 1284l-57 2q-126 0 -142 -40q-6 -15 -6 -44v-447q289 8 434 167q62 67 159 289q67 154 167 154q53 0 92 -41t39 -95q0 -92 -90 -92q-39 0 -65 25.5t-26 56.5t10 53q-41 -17 -97.5 -159.5t-116.5 -215.5q-106 -130 -287 -165v-8q116 -16 221 -77t151 -158 q25 -54 39 -150l25 -181q3 -17 14 -50q24 -47 168 -47h29q0 -10 -0.5 -37.5t-0.5 -41.5q0 -312 87 -376q-93 17 -183 183t-167 197q-50 20 -84 52q-82 76 -82 237q0 13 1 40v40q0 136 -83 239.5t-216 103.5h-138v-559q0 -28 9 -45q17 -33 186 -33h10v-61q-71 6 -120 6h-344 q-49 0 -120 -6v61h10q169 0 186 33q9 17 9 45v559h-138q-133 0 -216 -103.5t-83 -239.5q0 -13 0.5 -40t0.5 -40q0 -318 -330 -318q-83 0 -134.5 65t-51.5 151q0 33 24 33q18 0 24 -31q32 -175 131 -175q88 0 118 158l23 169q16 108 41 162q46 97 151 158t221 77v8 q-181 35 -287 165q-60 73 -116.5 215.5t-97.5 159.5q10 -22 10 -53t-26 -56.5t-65 -25.5q-90 0 -90 92q0 54 39 95t92 41q100 0 167 -154q97 -222 159 -289q145 -159 434 -167v447q0 29 -6 44q-16 40 -142 40l-57 -2v62q70 -6 120 -6h344q50 0 120 6v-62z" />
+<glyph unicode="&#x497;" horiz-adv-x="1611" d="M1567 66l-2 -101q0 -212 94 -231q-86 0 -157 105q-97 146 -134 173q-92 69 -102 215q-5 76 -20 111.5t-70 70.5q-108 69 -236 69l-56 -7v-313q0 -41 9 -59q17 -33 150 -33h8v-66q-203 6 -237 6t-244 -6v66q7 0 23.5 -0.5t54 -0.5t63.5 16t26 77v313l-56 7 q-128 0 -236 -69q-55 -35 -70.5 -71t-20 -119.5t-53.5 -158.5t-134 -75q-67 0 -101 67q-27 53 -27 128q0 34 27 34q22 0 26 -26q10 -62 16 -78q17 -44 57 -44q66 0 66 141.5t62.5 205t196.5 93.5q-68 33 -107 130l-53 156q-32 76 -89 76q-25 0 -25 -18q0 -3 16 -29.5t16 -60 t-27.5 -62t-66.5 -28.5q-102 0 -102 102q0 70 46 118t112 48q148 0 200 -178q37 -124 57 -151q51 -70 178 -70h92v226q0 41 -9 59q-17 33 -150 33h-8v66q208 -6 243.5 -6t237.5 6v-66q-7 0 -23.5 0.5t-54 0.5t-63.5 -16t-26 -77v-226h92q127 0 178 70q20 27 53.5 140.5 t96.5 158.5q42 30 107.5 30t111.5 -48t46 -118q0 -102 -102 -102q-39 0 -66.5 28.5t-27.5 62t16 60t16 29.5q0 18 -25 18q-57 0 -89 -76l-53 -156q-39 -97 -107 -130q134 -30 196.5 -93t62.5 -193q0 -92 20 -124q19 -30 149 -30h8z" />
+<glyph unicode="&#x498;" horiz-adv-x="1244" d="M1176 359q0 -85 -50 -164q-148 -235 -514 -238q172 -70 216 -159q14 -28 14 -55q0 -42 -35 -81q-57 -65 -154 -65q-143 0 -252 149l33 30q69 -95 158 -95q42 0 71.5 22.5t29.5 54.5q0 14 -7 28q-45 89 -186 174q-177 10 -281 67q-78 -70 -98 -70q-33 0 -34 33l-12 275 q-1 32 41 32q22 0 26.5 -6t11.5 -51t26 -79q80 -144 421 -144q160 0 260 93t100 250t-98.5 247t-255.5 90h-116q-78 -1 -116.5 -1t-38.5 30q0 16 13 22.5t170.5 18t256.5 77.5q150 100 150 257q0 111 -103 174q-87 53 -225.5 53t-242.5 -62.5t-130 -138.5q-4 -20 -17 -58 q-10 -20 -35 -20q-41 0 -39 46l9 246q2 49 35 49q26 0 112 -85q136 85 318 85t326 -64q185 -82 185 -227q0 -261 -386 -360q172 -25 295 -115q148 -108 148 -265z" />
+<glyph unicode="&#x499;" horiz-adv-x="920" d="M860 253q0 -59 -36 -116q-97 -152 -346 -166q180 -79 180 -171q0 -54 -48.5 -88t-105.5 -34q-118 0 -208 123l33 30q57 -78 129.5 -78t72.5 57q0 10 -5 21q-33 70 -153 141q-122 6 -198 41l-64 -43q-31 -2 -36 8.5t-5 47.5v122q0 58 28 58q20 0 26 -20q2 -23 17 -71 q45 -85 293.5 -85t248.5 222.5t-251 222.5h-118q-55 0 -55 23t29.5 25.5t79.5 5.5q122 8 192 62q86 66 86 151.5t-58.5 121t-151 35.5t-165 -36.5t-94 -91t-36.5 -54.5q-28 0 -28 58v122q0 37 5 47q4 9 27 9h9q25 -19 77 -54q91 54 218 54t232 -43q136 -57 136 -160 q0 -170 -254 -242q112 -21 195 -81q102 -73 102 -174z" />
+<glyph unicode="&#x49a;" horiz-adv-x="1514" d="M649 1284l-57 2q-126 0 -142 -40q-6 -15 -6 -44v-447q324 0 480 158q72 73 163 294q65 158 167 158q53 0 92 -41t39 -95q0 -92 -90 -92q-39 0 -65 25.5t-26 56.5t10 53q-41 -17 -97.5 -159.5t-116.5 -215.5q-106 -130 -287 -165v-8q116 -16 221 -77t151 -158 q25 -54 39 -150l25 -181q3 -17 14 -50q24 -47 168 -47h29q0 -10 -0.5 -37.5t-0.5 -41.5q0 -312 87 -376q-93 17 -183 183t-167 197q-50 20 -84 52q-82 76 -82 237q0 13 1 40v40q0 136 -83 239.5t-216 103.5h-188v-559q0 -28 9 -45q17 -33 186 -33h10v-61q-71 6 -120 6h-347 q-43 0 -114 -6v61q8 0 26.5 -0.5t28.5 -0.5q125 0 141 40q6 15 6 44v1066q0 27 -7 41q-16 33 -176 33h-19v62q70 -6 119 -6h342q50 0 120 6v-62z" />
+<glyph unicode="&#x49b;" horiz-adv-x="1080" d="M1036 66l-2 -101q0 -212 94 -231q-86 0 -157 105q-97 146 -134 173q-92 69 -102 215q-5 76 -20 111.5t-70 70.5q-108 69 -236 69l-56 -7v-313q0 -41 9 -59q17 -33 150 -33h8v-66q-203 6 -237 6t-244 -6v66q7 0 23.5 -0.5t54 -0.5t63.5 16t26 77v607q0 41 -9 59 q-17 33 -150 33h-8v66q208 -6 243.5 -6t237.5 6v-66q-7 0 -23.5 0.5t-54 0.5t-63.5 -16t-26 -77v-226h92q127 0 178 70q20 27 53.5 140.5t96.5 158.5q42 30 107.5 30t111.5 -48t46 -118q0 -102 -102 -102q-39 0 -66.5 28.5t-27.5 62t16 60t16 29.5q0 18 -25 18 q-57 0 -89 -76l-53 -156q-39 -97 -107 -130q134 -30 196.5 -93t62.5 -193q0 -92 20 -124q19 -30 149 -30h8z" />
+<glyph unicode="&#x49c;" horiz-adv-x="1514" d="M649 1284l-57 2q-126 0 -142 -40q-6 -15 -6 -44v-447q103 0 187 15v276h62v-262q192 51 292 204q4 7 116 253q57 124 153 124q53 0 92 -41t39 -95q0 -92 -90 -92q-39 0 -65 25.5t-26 56.5t10 53q-41 -17 -97.5 -159.5t-116.5 -215.5q-106 -130 -287 -165v-8 q116 -16 221 -77.5t151 -157.5q25 -54 39 -150l25 -181q30 -158 118 -158q99 0 131 175q6 31 24 31q24 0 24 -33q0 -86 -51.5 -151t-134.5 -65q-330 0 -330 318q0 13 1 40v40q0 119 -65 216t-173 120v-393h-62v400h-187v-559q0 -28 9 -45q17 -33 186 -33h10v-61 q-71 6 -120 6h-347q-43 0 -114 -6v61q8 0 26.5 -0.5t28.5 -0.5q125 0 141 40q6 15 6 44v1066q0 27 -7 41q-16 33 -176 33h-19v62q70 -6 119 -6h342q50 0 120 6v-62z" />
+<glyph unicode="&#x49d;" horiz-adv-x="1080" d="M409 478l-56 -7v-313q0 -41 9 -59q17 -33 150 -33h8v-66q-203 6 -237 6t-244 -6v66q7 0 23.5 -0.5t54 -0.5t63.5 16t26 77v607q0 41 -9 59q-17 33 -150 33h-8v66q208 -6 243.5 -6t237.5 6v-66q-7 0 -23.5 0.5t-54 0.5t-63.5 -16t-26 -77v-226h92q17 0 33 1v162h62v-151 q89 28 128.5 169t104.5 188q42 30 107.5 30t111.5 -48t46 -118q0 -102 -102 -102q-39 0 -66.5 28.5t-27.5 62t16 60t16 29.5q0 18 -25 18q-57 0 -89 -76l-53 -156q-39 -97 -107 -130q134 -30 196.5 -93.5t62.5 -205t66 -141.5q40 0 57 44q6 16 16 78q4 26 26 26q27 0 27 -34 q0 -75 -27 -128q-34 -67 -101 -67q-85 0 -134 75t-53.5 158.5t-19.5 119.5q-31 72 -176 117v-253h-62v268q-39 8 -69 8z" />
+<glyph unicode="&#x49e;" horiz-adv-x="1514" d="M649 1284l-57 2q-126 0 -142 -40q-6 -15 -6 -44v-149h372v-62h-372v-236q324 0 480 158q72 73 163 294q65 158 167 158q53 0 92 -41t39 -95q0 -92 -90 -92q-39 0 -65 25.5t-26 56.5t10 53q-41 -17 -97.5 -159.5t-116.5 -215.5q-106 -130 -287 -165v-8q116 -16 221 -77.5 t151 -157.5q25 -54 39 -150l25 -181q30 -158 118 -158q99 0 131 175q6 31 24 31q24 0 24 -33q0 -86 -51.5 -151t-134.5 -65q-330 0 -330 318q0 13 1 40v40q0 136 -83 239.5t-216 103.5h-188v-559q0 -28 9 -45q17 -33 186 -33h10v-61q-71 6 -120 6h-347q-43 0 -114 -6v61 q8 0 26.5 -0.5t28.5 -0.5q125 0 141 40q6 15 6 44v847h-202v62h202v157q0 27 -7 41q-16 33 -176 33h-19v62q70 -6 119 -6h342q50 0 120 6v-62z" />
+<glyph unicode="&#x49f;" horiz-adv-x="1080" d="M409 478l-56 -7v-313q0 -41 9 -59q17 -33 150 -33h8v-66q-203 6 -237 6t-244 -6v66q7 0 23.5 -0.5t54 -0.5t63.5 16t26 77v513h-167v62h167v32q0 41 -9 59q-17 33 -150 33h-8v66q208 -6 243.5 -6t237.5 6v-66q-7 0 -23.5 0.5t-54 0.5t-63.5 -16t-26 -77v-32h166v-62h-166 v-132h92q127 0 178 70q20 27 53.5 140.5t96.5 158.5q42 30 107.5 30t111.5 -48t46 -118q0 -102 -102 -102q-39 0 -66.5 28.5t-27.5 62t16 60t16 29.5q0 18 -25 18q-57 0 -89 -76l-53 -156q-39 -97 -107 -130q134 -30 196.5 -93.5t62.5 -205t66 -141.5q40 0 57 44q6 16 16 78 q4 26 26 26q27 0 27 -34q0 -75 -27 -128q-34 -67 -101 -67q-85 0 -134 75t-53.5 158.5t-20 119.5t-70.5 71q-108 69 -236 69z" />
+<glyph unicode="&#x4a0;" horiz-adv-x="1894" d="M1029 1281l-59 2q-84 0 -107 -11q-39 -20 -39 -94v-423q324 0 480 158q72 73 163 294q65 158 167 158q53 0 92 -41t39 -95q0 -92 -90 -92q-39 0 -65 25.5t-26 56.5t10 53q-41 -17 -97.5 -159.5t-116.5 -215.5q-106 -130 -287 -165v-8q116 -16 221 -77.5t151 -157.5 q25 -54 39 -150l25 -181q30 -158 118 -158q99 0 131 175q6 31 24 31q24 0 24 -33q0 -86 -51.5 -151t-134.5 -65q-330 0 -330 318q0 13 1 40v40q0 136 -83 239.5t-216 103.5h-188v-559q0 -28 9 -45q17 -33 186 -33h10v-61q-71 6 -120 6h-337q-43 0 -114 -6v61q62 -2 63 -2 q113 0 134 45q5 11 5 42v1056q0 52 -17.5 65.5t-68.5 13.5h-101q-200 0 -274 -95q-58 -73 -82 -285h-49l55 442h906v-62z" />
+<glyph unicode="&#x4a1;" horiz-adv-x="1425" d="M754 478l-56 -7v-313q0 -41 9 -59q17 -33 150 -33h8v-66q-203 6 -231 6t-238 -6v66q69 0 105.5 3t49 24t12.5 74v602q0 70 -26 83q-12 5 -98 5q-155 0 -216 -53.5t-65 -208.5h-53l15 328h745v-66q-7 0 -23.5 0.5t-54 0.5t-63.5 -16t-26 -77v-226h92q127 0 178 70 q20 27 53.5 140.5t96.5 158.5q42 30 107.5 30t111.5 -48t46 -118q0 -102 -102 -102q-39 0 -66.5 28.5t-27.5 62t16 60t16 29.5q0 18 -25 18q-57 0 -89 -76l-53 -156q-39 -97 -107 -130q134 -30 196.5 -93.5t62.5 -205t66 -141.5q40 0 57 44q6 16 16 78q4 26 26 26 q27 0 27 -34q0 -75 -27 -128q-34 -67 -101 -67q-85 0 -134 75t-53.5 158.5t-20 119.5t-70.5 71q-108 69 -236 69z" />
+<glyph unicode="&#x4a2;" horiz-adv-x="1480" d="M1413 1284l-56 2q-122 0 -140 -36q-8 -16 -8 -45v-1000q0 -69 14 -97q23 -47 173 -47h24q0 -12 -0.5 -39t-0.5 -40q0 -312 87 -376q-68 13 -125 92q-15 20 -73.5 125.5t-100 141t-130.5 35.5h-245v61q9 0 28 -0.5t29 -0.5q119 0 137 36q8 16 8 45v530h-590v-530 q0 -29 8 -45q18 -35 187 -35h10v-61q-71 6 -115 6h-358q-37 0 -108 -6v61q9 0 27.5 -0.5t28.5 -0.5q121 0 139 36q7 14 7 45v1064q0 31 -7 45q-17 34 -149 34h-46v62q70 -6 112 -6h354q45 0 115 6v-62l-55 2q-123 0 -142 -36q-8 -16 -8 -45v-474h590v474q0 29 -8 45 q-17 34 -148 34h-46v62q70 -6 112 -6h356q43 0 113 6v-62z" />
+<glyph unicode="&#x4a3;" horiz-adv-x="1178" d="M1120 66l-2 -101q0 -212 94 -231q-68 0 -115 49q-14 16 -64 94t-82 100.5t-99 22.5h-214v66q140 0 157 30q10 18 10 71v281h-435v-281q0 -49 9 -68q16 -33 159 -33v-66q-203 6 -238 6t-244 -6v66q140 0 157 30q10 18 10 71v589q0 53 -10 71q-17 30 -157 30v66 q209 -6 244 -6t238 6v-66q-143 0 -159 -33q-9 -19 -9 -68v-242h435v242q0 53 -10 71q-17 30 -157 30v66q209 -6 244 -6t238 6v-66q-140 0 -157 -30q-10 -18 -10 -71v-589q0 -53 10 -71q17 -30 157 -30z" />
+<glyph unicode="&#x4a4;" horiz-adv-x="1980" d="M649 1284l-55 2q-123 0 -142 -36q-8 -16 -8 -45v-474h590v474q0 29 -8 45q-17 34 -148 34h-46v59h1026l55 -442h-49q-24 212 -82 285q-74 95 -274 95h-214q-51 0 -68.5 -13.5t-17.5 -65.5l1 -1061q0 -29 8 -45q18 -35 186 -35h10v-61q-71 6 -113 6h-361q-36 0 -107 -6v61 q9 0 28 -0.5t29 -0.5q119 0 137 36q8 16 8 45v530h-590v-530q0 -29 8 -45q18 -35 187 -35h10v-61q-71 6 -115 6h-358q-37 0 -108 -6v61q9 0 27.5 -0.5t28.5 -0.5q121 0 139 36q7 14 7 45v1064q0 31 -7 45q-17 34 -149 34h-46v62q70 -6 112 -6h354q45 0 115 6v-62z" />
+<glyph unicode="&#x4a5;" horiz-adv-x="1618" d="M1118 850q-112 0 -122 -2q-32 -6 -40 -31q-3 -10 -3 -55v-595q0 -53 10 -71q17 -30 157 -30v-66q-203 6 -238 6t-244 -6v66q140 0 157 30q10 18 10 71v281h-435v-281q0 -49 9 -68q16 -33 159 -33v-66q-203 6 -238 6t-244 -6v66q140 0 157 30q10 18 10 71v589q0 53 -10 71 q-17 30 -157 30v66q209 -6 244 -6t238 6v-66q-143 0 -159 -33q-9 -19 -9 -68v-242h435v242q0 53 -10 71q-17 30 -157 30v60h847l38 -328h-53q-18 182 -98 229q-55 32 -254 32z" />
+<glyph unicode="&#x4a6;" horiz-adv-x="2018" d="M1321 793q284 0 463 -162t179 -442t-180.5 -450.5t-461.5 -170.5q-118 0 -233 59t-195 153l43 32q176 -175 392.5 -175t332.5 167q100 145 100 378.5t-102 379.5q-117 169 -338 169q-54 0 -112 -12v-578q0 -26 6 -41q13 -32 90 -39q5 0 32 -0.5t76 0.5v-61q-71 6 -113 6 h-361q-36 0 -107 -6v61h78q60 0 85 11q39 17 39 69v1141h-590v-1141q0 -26 6 -41q13 -32 90 -39q6 0 33 -0.5t76 0.5v-61q-71 6 -113 6h-360q-37 0 -108 -6v61h78q60 0 85 11q39 17 39 69v1062q0 26 -6 41q-13 32 -90 38h-106v62h1345v-62q-8 0 -29 0.5t-32 0.5 q-121 0 -137 -39q-6 -14 -6 -41v-418q56 8 112 8z" />
+<glyph unicode="&#x4a7;" horiz-adv-x="1594" d="M1541 400q0 -278 -189 -509.5t-462 -332.5l-14 48q220 81 360.5 288t140.5 443q0 131 -45 215q-58 107 -178 107q-94 0 -201 -99v-393q0 -53 10 -71q17 -30 157 -30v-66q-203 6 -237.5 6t-244.5 -6v66q140 0 157 30q10 18 10 71v585q0 54 -15 74q-23 31 -194 31 t-198.5 -20t-27.5 -85v-585q0 -52 11 -71q17 -30 157 -30v-66q-203 6 -237.5 6t-244.5 -6v66q140 0 157 30q10 18 10 71v589q0 53 -10 71q-17 30 -157 30v66h1064v-66q-140 0 -157 -30q-10 -18 -10 -71v-119q157 142 274 142q152 0 233 -110.5t81 -268.5z" />
+<glyph unicode="&#x4a8;" horiz-adv-x="1551" d="M1192 -43q-83 0 -185 46q-112 -46 -285 -46q-279 0 -466.5 214.5t-187.5 498.5t187 502t467 218q25 0 41 -1l9 -53q-27 4 -50 4q-98 0 -190 -53q-262 -151 -262 -591q0 -473 265 -632q93 -56 200 -56t190 40q-334 228 -334 609q0 207 101 402q120 234 310 234t317 -224 q108 -190 108 -390t-92 -372t-252 -266q54 -34 109 -34q175 0 246 166l45 -21q-86 -195 -291 -195zM1225 696q0 136 -56 318q-70 231 -170 231q-123 0 -175 -244q-31 -147 -31 -323.5t55.5 -328t160.5 -251.5q216 176 216 598z" />
+<glyph unicode="&#x4a9;" horiz-adv-x="1190" d="M906 -24q-64 0 -139 30q-85 -30 -213 -30q-204 0 -352.5 143t-148.5 347t148 349t353 145q21 0 39 -1l10 -57q-33 5 -49 5q-70 0 -138 -35q-191 -98 -191 -400t193 -406q67 -36 139 -36t127 19q-239 156 -239 408q0 150 82 284q93 154 236 154t241 -147 q88 -131 88 -271.5t-67.5 -254.5t-179.5 -179q44 -17 79 -17q125 0 180 119l34 -23q-71 -146 -232 -146zM921 483q0 93 -39 211q-49 149 -121 149q-144 0 -144 -386q0 -228 152 -364q152 118 152 390z" />
+<glyph unicode="&#x4aa;" horiz-adv-x="1335" d="M1267 854q0 -26 -29 -26t-35 32q-12 60 -47 178q-51 127 -151 208.5t-217 81.5t-220 -50q-298 -145 -298 -613.5t322 -606.5q96 -41 185 -41q140 0 256 85t159 218q17 52 27 140q4 33 23 33q24 0 24 -35q0 -206 -154 -354q-152 -147 -355 -147h-5h-10q172 -70 216 -159 q14 -28 14 -55q0 -42 -35 -81q-57 -65 -154 -65q-143 0 -252 149l33 30q69 -95 158 -95q42 0 71.5 22.5t29.5 54.5q0 14 -7 28q-48 94 -208 187q-236 52 -388 250.5t-152 449.5q0 289 198.5 503t485.5 214q193 0 363 -169l99 144q17 25 31 25q21 0 21 -33z" />
+<glyph unicode="&#x4ab;" horiz-adv-x="920" d="M868 254q0 -22 -27 -75q-103 -200 -322 -203q191 -83 191 -176q0 -54 -48.5 -88t-105.5 -34q-118 0 -208 123l33 30q57 -78 129.5 -78t72.5 57q0 10 -5 21q-36 76 -193 164q-147 44 -239.5 175t-92.5 291q0 201 132 350t330 149q121 0 215 -54q113 -64 113 -170t-97 -106 q-42 0 -70.5 28t-28.5 70q0 94 100 99q-79 78 -229 78q-60 0 -120 -34q-168 -94 -168 -402.5t178 -404.5q63 -34 123 -34q113 0 181 64q40 37 74 109.5t53 72.5q29 0 29 -22z" />
+<glyph unicode="&#x4ac;" horiz-adv-x="1413" d="M878 1282q-46 0 -65.5 -11.5t-19.5 -53.5v-1071q0 -25 10 -47q18 -38 243 -38h34q0 -12 -0.5 -39t-0.5 -40q0 -312 87 -376q-68 13 -125 92q-15 20 -73.5 125.5t-100 141t-130.5 35.5h-405v61q9 0 35.5 -0.5t40.5 -0.5q184 0 202 39q8 17 8 47v1072q0 43 -29 56 q-17 8 -66 8q-256 0 -321 -62.5t-86 -318.5h-48l36 442h1206l36 -442h-49q-22 262 -88.5 321.5t-330.5 59.5z" />
+<glyph unicode="&#x4ad;" horiz-adv-x="1142" d="M880 66l-2 -101q0 -212 94 -231q-68 0 -115 49q-14 16 -64 94t-82 100.5t-99 22.5h-351v66q133 0 174 7.5t51.5 28t10.5 69.5v598q0 68 -23 81q-12 7 -91 7q-152 0 -193.5 -50t-52.5 -212h-53l25 328h921l26 -328h-54q-11 161 -48 207q-46 55 -198 55q-75 0 -88 -7 q-23 -13 -23 -81v-598q0 -53 12.5 -72t61.5 -26t161 -7z" />
+<glyph unicode="&#x4ae;" horiz-adv-x="1566" d="M1499 1284q-173 0 -252 -128l-381 -619v-388q0 -34 10 -53q15 -29 90 -35h104v-61q-73 6 -127 6h-320q-55 0 -128 -6v61q8 0 25.5 -0.5t27.5 -0.5q124 0 142 36q7 14 7 43v398l-413 675q-34 56 -95 68q-21 4 -121 4v62q126 -6 299.5 -6t246.5 6v-62h-24q-112 0 -112 -48 q0 -14 13 -35l356 -581l325 529q21 34 21 58q0 77 -113 77v62q155 -6 240.5 -6t178.5 6v-62z" />
+<glyph unicode="&#x4af;" horiz-adv-x="1151" d="M654 -322q0 -21 6 -32q11 -20 149 -20v-66q-68 5 -99 5h-255q-30 0 -99 -5v66q7 0 23 -0.5t25 -0.5q90 0 101 20q4 8 4 26v402l-286 703q-24 60 -68 73q-18 6 -83 6h-19v68q120 -8 164 -8t276 8v-68q-122 0 -122 -54q0 -15 252 -634l219 546q13 32 13 50q0 90 -102 92v68 q135 -8 194.5 -8t151.5 8v-68q-142 -1 -198 -142l-247 -617v-418z" />
+<glyph unicode="&#x4b0;" horiz-adv-x="1566" d="M1499 1284q-173 0 -252 -128l-381 -619h400v-62h-400v-326q0 -34 10 -53q15 -29 90 -35h104v-61q-73 6 -127 6h-320q-55 0 -128 -6v61q8 0 25.5 -0.5t27.5 -0.5q124 0 142 36q7 14 7 43v336h-400v62h400l-413 675q-34 56 -95 68q-21 4 -121 4v62q126 -6 299.5 -6t246.5 6 v-62h-24q-112 0 -112 -48q0 -14 13 -35l356 -581l325 529q21 34 21 58q0 77 -113 77v62q155 -6 240.5 -6t178.5 6v-62z" />
+<glyph unicode="&#x4b1;" horiz-adv-x="1151" d="M654 62h291v-62h-291v-322q0 -21 6 -32q11 -20 149 -20v-66q-68 5 -99 5h-255q-30 0 -99 -5v66q7 0 23 -0.5t25 -0.5q90 0 101 20q4 8 4 26v329h-309v62h309v11l-286 703q-24 60 -68 73q-18 6 -83 6h-19v68q120 -8 164 -8t276 8v-68q-122 0 -122 -54q0 -15 252 -634 l219 546q13 32 13 50q0 90 -102 92v68q135 -8 194.5 -8t151.5 8v-68q-142 -1 -198 -142l-247 -617v-34z" />
+<glyph unicode="&#x4b2;" horiz-adv-x="1518" d="M1107 0h-200v61q128 5 128 59q0 10 -320 493l-281 -414q-19 -28 -19 -48q0 -43 38.5 -66t84.5 -24v-61q-74 6 -165 6t-305 -6v61q196 0 285 131l323 477l-362 547q-34 51 -99 64q-24 4 -81 4h-41v62q112 -6 292.5 -6t251.5 6v-62q-128 -5 -128 -58q0 -13 268 -410 l225 333q17 25 17 46q0 43 -37.5 65.5t-83.5 23.5v62q81 -6 163.5 -6t306.5 6v-62q-198 -2 -285 -128l-271 -395l416 -629q35 -53 99 -66q25 -5 85 -5h38q0 -12 -0.5 -39t-0.5 -40q0 -312 87 -376q-68 13 -125 92q-15 20 -73.5 125.5t-100 141t-130.5 35.5z" />
+<glyph unicode="&#x4b3;" horiz-adv-x="1183" d="M1131 66l-2 -101q0 -212 94 -231q-68 0 -115 49q-14 16 -64 94t-82 100.5t-99 22.5h-169v66q77 3 77 54q0 10 -208 285q-192 -223 -192 -272q0 -61 62 -67v-66q-141 6 -221 6t-159 -6v66q159 0 274 128l200 256l-212 276q-71 92 -105 110.5t-147 18.5v68q110 -8 171 -8 t264 8v-68q-75 -2 -75 -52q0 -20 184 -255l134 167q33 41 33 75q0 61 -63 65v68q108 -8 192.5 -8t188.5 8v-68q-152 -3 -255 -109q-26 -27 -197 -244l287 -369q37 -47 92 -60q28 -7 95 -7h17z" />
+<glyph unicode="&#x4b4;" horiz-adv-x="2089" d="M1685 0h-1309v62h106q77 6 90 38q6 15 6 41v1074q0 67 -115 67q-156 0 -216 -27q-93 -42 -119 -178h-46l22 266h1125l22 -266h-47q-28 140 -124 181q-58 24 -223 24q-105 0 -105 -67v-1153h890v1141q0 52 -39 69q-25 11 -85 11h-78v61q71 -6 107 -6h361q42 0 113 6v-61 q-49 1 -76 1t-32 -1q-77 -7 -90 -39q-6 -15 -6 -41v-998q0 -69 14 -97q23 -47 173 -47h24q0 -12 -0.5 -39t-0.5 -40q0 -312 87 -376q-68 13 -125 92q-15 20 -73.5 125.5t-100 141t-130.5 35.5z" />
+<glyph unicode="&#x4b5;" horiz-adv-x="1722" d="M1664 66l-2 -101q0 -212 94 -231q-68 0 -115 49q-14 16 -64 94t-82 100.5t-99 22.5h-1066v66q140 0 157 30q10 18 10 71v602q0 54 -12 71t-61 17q-179 0 -227 -43t-60 -219h-53l25 328h920l26 -328h-54q-12 174 -59.5 218t-222.5 44q-52 0 -63.5 -17.5t-11.5 -70.5v-598 q0 -54 15 -74q23 -31 204 -31h270q178 0 201 31q15 20 15 74v585q0 53 -10 71q-17 30 -157 30v66q209 -6 244 -6t238 6v-66q-140 0 -157 -30q-10 -18 -10 -71v-589q0 -53 10 -71q17 -30 157 -30z" />
+<glyph unicode="&#x4b6;" horiz-adv-x="1601" d="M1535 1284l-59 2q-76 0 -103 -9q-53 -18 -53 -76v-996q0 -69 14 -97q23 -47 173 -47h24q0 -12 -0.5 -39t-0.5 -40q0 -312 87 -376q-68 13 -125 92q-15 20 -73.5 125.5t-100 141t-130.5 35.5h-255v61q8 0 27.5 -0.5t29.5 -0.5q128 0 147 36q9 17 9 49v545 q-190 -218 -438 -218q-187 0 -312.5 111t-125.5 298v327q0 30 -7 43q-18 34 -156 34q-19 0 -39 -1v62q73 -6 156 -6h270q84 0 156 6v-62q-48 1 -60 1q-118 0 -136 -34q-9 -17 -9 -51v-319q0 -149 90.5 -232t237.5 -83q208 0 373 205v430q0 32 -9 49q-18 34 -153 34h-51v62 q71 -6 115 -6h376q41 0 111 6v-62z" />
+<glyph unicode="&#x4b7;" horiz-adv-x="1261" d="M1203 66l-2 -101q0 -212 94 -231q-68 0 -115 49q-14 16 -64 94t-82 100.5t-99 22.5h-213v66q140 0 157 30q10 18 10 71v274q-129 -143 -324 -143q-131 0 -236.5 81t-105.5 208q0 214 -5 229q-11 32 -72 40q-12 1 -90 1v66q209 -6 244 -6t238 6v-66q-140 0 -157 -30 q-11 -19 -11 -71v-143q0 -102 70.5 -160.5t174.5 -58.5q137 0 246 109q28 28 28 75v178q0 53 -10 71q-17 30 -157 30v66q209 -6 244 -6t238 6v-66q-140 0 -157 -30q-11 -19 -11 -71v-589q0 -53 10 -71q17 -30 157 -30z" />
+<glyph unicode="&#x4b8;" horiz-adv-x="1601" d="M1535 1284l-59 2q-76 0 -103 -9q-53 -18 -53 -76v-1057q0 -27 13.5 -52t91.5 -31h110v-61q-71 6 -117 6h-373q-41 0 -112 -6v61q8 0 27.5 -0.5t29.5 -0.5q128 0 147 36q9 17 9 49v545q-156 -179 -353 -211v-181h-62v174h-23q-187 0 -312.5 111t-125.5 298v327q0 30 -7 43 q-18 34 -156 34q-19 0 -39 -1v62q73 -6 156 -6h270q84 0 156 6v-62q-48 1 -60 1q-118 0 -136 -34q-9 -17 -9 -51v-319q0 -137 78 -219t208 -94v478h62v-480q195 8 353 205v430q0 32 -9 49q-18 34 -153 34h-51v62q71 -6 115 -6h376q41 0 111 6v-62z" />
+<glyph unicode="&#x4b9;" horiz-adv-x="1261" d="M1204 0q-203 6 -237.5 6t-244.5 -6v66q140 0 157 30q10 18 10 71v274q-91 -101 -229 -132v-107h-62v97q-17 -1 -33 -1q-131 0 -236.5 81t-105.5 208q0 214 -5 229q-11 32 -72 40q-12 1 -90 1v66q209 -6 244 -6t238 6v-66q-140 0 -157 -30q-11 -19 -11 -71v-143 q0 -98 65 -156t163 -63v308h62v-305q111 17 201 106q28 28 28 75v178q0 53 -10 71q-17 30 -157 30v66q209 -6 244 -6t238 6v-66q-140 0 -157 -30q-11 -19 -11 -71v-589q0 -52 11 -71q17 -30 157 -30v-66z" />
+<glyph unicode="&#x4ba;" horiz-adv-x="1482" d="M649 1284l-55 2q-123 0 -142 -36q-8 -16 -8 -45v-453q154 122 339.5 122t311 -111t125.5 -298v-327q0 -30 7 -43q18 -34 156 -34q19 0 39 1v-62q-73 6 -156 6h-270q-84 0 -156 -6v62q48 -1 60 -1q118 0 136 34q9 17 9 51v319q0 149 -90.5 232t-240.5 83t-270 -101v-538 q0 -29 8 -45q18 -35 187 -35h10v-61q-71 6 -115 6h-358q-37 0 -108 -6v61q9 0 27.5 -0.5t28.5 -0.5q121 0 139 36q7 14 7 45v1064q0 31 -7 45q-17 34 -149 34h-46v62q70 -6 112 -6h354q45 0 115 6v-62z" />
+<glyph unicode="&#x4bb;" horiz-adv-x="1181" d="M1129 0q-200 6 -238 6t-244 -6v66q30 -1 70.5 -1t63.5 12q33 19 33 76v519q0 227 -158 227q-130 0 -209.5 -104.5t-79.5 -238.5v-400q0 -39 10 -58q18 -33 117 -33q18 0 38 1v-66q-200 6 -236.5 6t-242.5 -6v66q30 -1 72.5 -1t68 16.5t25.5 80.5v1115q0 87 -44 108 q-21 10 -96 10h-26v67l306 23v-744h2q41 93 125 149t184 56q292 0 292 -314v-502q0 -65 135 -65q15 0 32 1v-66z" />
+<glyph unicode="&#x4bc;" horiz-adv-x="1902" d="M728 714v-18v-10q0 -247 98 -433q124 -235 356 -235q297 0 487 304q11 20 35 57q12 16 30 16q31 0 31 -36q0 -11 -9 -28q-90 -173 -239 -273.5t-337 -100.5q-280 0 -467 214t-187 498q0 25 3 62q-192 37 -315 131q-146 113 -146 282q0 86 52 157t135 71q57 0 95.5 -36.5 t38.5 -92.5t-37.5 -93.5t-93.5 -37.5q-90 0 -122 75q-6 -17 -6 -29q0 -155 127 -254q105 -81 279 -113q40 250 217.5 424.5t437 174.5t443.5 -201t200 -475h-1106zM1373 1286q-92 54 -192 54t-191 -53q-234 -137 -259 -513h899q-25 376 -257 512z" />
+<glyph unicode="&#x4bd;" horiz-adv-x="1241" d="M1162 280q27 0 27 -28t-35 -88q-110 -188 -315 -188t-341.5 147.5t-136.5 347.5q0 18 1 36q-130 27 -220 98.5t-90 185.5q0 60 36.5 109.5t85.5 49.5t76 -25.5t27 -65t-26 -66t-66 -26.5q-64 0 -84 48q-2 -6 -2 -14q0 -195 268 -249q27 170 148 289t296 119t276.5 -119 t101.5 -302q0 -30 -7.5 -37.5t-38.5 -7.5h-605v-7q0 -210 64 -313q90 -144 242 -144q198 0 290 221q12 29 28 29zM1048 539q0 143 -50 243q-64 129 -192 129q-41 0 -90 -23q-165 -78 -175 -349h507z" />
+<glyph unicode="&#x4be;" horiz-adv-x="1902" d="M728 714v-18q0 -254 99 -443q124 -235 355 -235q297 0 487 304q11 20 35 57q12 16 30 16q31 0 31 -36q0 -11 -9 -28q-165 -317 -477 -366q-34 -113 -41 -272h-115q-7 159 -41 272q-243 39 -399.5 243.5t-156.5 460.5q0 25 3 62q-192 37 -315 131q-146 113 -146 282 q0 86 52 157t135 71q57 0 95.5 -36.5t38.5 -92.5t-37.5 -93.5t-93.5 -37.5q-90 0 -122 75q-6 -17 -6 -29q0 -155 127 -254q105 -81 279 -113q40 250 217.5 424.5t437 174.5t443.5 -201t200 -475h-1106zM1373 1286q-92 54 -192 54t-191 -53q-234 -136 -259 -513h899 q-25 376 -257 512z" />
+<glyph unicode="&#x4bf;" horiz-adv-x="1241" d="M1162 280q27 0 27 -28t-35 -88q-79 -134 -220 -174q-38 -119 -46 -287h-115q-8 168 -45 285q-160 38 -263.5 175t-103.5 308q0 22 1 36q-130 26 -212 92q-98 78 -98 192q0 60 36.5 109.5t85.5 49.5t76 -25.5t27 -65t-26 -66t-66 -26.5q-64 0 -84 48q-2 -6 -2 -14 q0 -196 268 -249q27 170 148 289t296 119t276.5 -119t101.5 -302q0 -30 -7.5 -37.5t-38.5 -7.5h-605v-7q0 -210 64 -313q90 -144 242 -144q198 0 290 221q12 29 28 29zM1048 539q0 143 -50 243q-64 129 -192 129q-41 0 -90 -23q-165 -78 -175 -349h507z" />
+<glyph unicode="&#x4c0;" horiz-adv-x="736" d="M670 1284l-59 2q-75 0 -103 -9q-53 -18 -53 -76v-1057q0 -27 13.5 -52t91.5 -31h110v-61q-71 6 -117 6h-373q-41 0 -112 -6v61q8 0 27.5 -0.5t29.5 -0.5q128 0 147 36q9 17 9 49v1056q0 32 -9 49q-18 34 -153 34h-51v62q71 -6 115 -6h376q41 0 111 6v-62z" />
+<glyph unicode="&#x4c1;" horiz-adv-x="2214" d="M1399 1284l-57 2q-126 0 -142 -40q-6 -15 -6 -44v-447q289 8 434 167q62 67 159 289q67 154 167 154q53 0 92 -41t39 -95q0 -92 -90 -92q-39 0 -65 25.5t-26 56.5t10 53q-41 -17 -97.5 -159.5t-116.5 -215.5q-106 -130 -287 -165v-8q116 -16 221 -77t151 -158 q25 -54 39 -150l25 -181q30 -158 118 -158q99 0 131 175q6 31 24 31q24 0 24 -33q0 -86 -51.5 -151t-134.5 -65q-330 0 -330 318q0 13 1 40v40q0 136 -83 239.5t-216 103.5h-138v-559q0 -28 9 -45q17 -33 186 -33h10v-61q-71 6 -120 6h-344q-49 0 -120 -6v61h10 q169 0 186 33q9 17 9 45v559h-138q-133 0 -216 -103.5t-83 -239.5q0 -13 0.5 -40t0.5 -40q0 -318 -330 -318q-83 0 -134.5 65t-51.5 151q0 33 24 33q18 0 24 -31q32 -175 131 -175q88 0 118 158l23 169q16 108 41 162q46 97 151 158t221 77v8q-181 35 -287 165 q-60 73 -116.5 215.5t-97.5 159.5q10 -22 10 -53t-26 -56.5t-65 -25.5q-90 0 -90 92q0 54 39 95t92 41q100 0 167 -154q97 -222 159 -289q145 -159 434 -167v447q0 29 -6 44q-16 40 -142 40l-57 -2v62q70 -6 120 -6h344q50 0 120 6v-62zM1455 1516q0 -85 -140 -130 q-101 -33 -211 -33t-211 33q-140 45 -140 130q0 39 25 64.5t64 25.5t64 -25.5t25 -70.5t-38 -70q63 -24 174 -24h74q111 0 174 24q-38 25 -38 70t25 70.5t64 25.5t64 -25.5t25 -64.5z" />
+<glyph unicode="&#x4c2;" horiz-adv-x="1611" d="M737 471l-56 7q-128 0 -236 -69q-55 -35 -70.5 -71t-20 -119.5t-53.5 -158.5t-134 -75q-67 0 -101 67q-27 53 -27 128q0 34 27 34q22 0 26 -26q10 -62 16 -78q17 -44 57 -44q66 0 66 141.5t62.5 205t196.5 93.5q-68 33 -107 130l-53 156q-32 76 -89 76q-25 0 -25 -18 q0 -3 16 -29.5t16 -60t-27.5 -62t-66.5 -28.5q-102 0 -102 102q0 70 46 118t112 48q148 0 200 -178q37 -124 57 -151q51 -70 178 -70h92v226q0 41 -9 59q-17 33 -150 33h-8v66q208 -6 243.5 -6t237.5 6v-66q-7 0 -23.5 0.5t-54 0.5t-63.5 -16t-26 -77v-226h92q127 0 178 70 q20 27 53.5 140.5t96.5 158.5q42 30 107.5 30t111.5 -48t46 -118q0 -102 -102 -102q-39 0 -66.5 28.5t-27.5 62t16 60t16 29.5q0 18 -25 18q-57 0 -89 -76l-53 -156q-39 -97 -107 -130q134 -30 196.5 -93.5t62.5 -205t66 -141.5q40 0 57 44q6 16 16 78q4 26 26 26 q27 0 27 -34q0 -75 -27 -128q-34 -67 -101 -67q-85 0 -134 75t-53.5 158.5t-20 119.5t-70.5 71q-108 69 -236 69l-56 -7v-313q0 -41 9 -59q17 -33 150 -33h8v-66q-203 6 -237 6t-244 -6v66q7 0 23.5 -0.5t54 -0.5t63.5 16t26 77v313zM1082 1398q89 0 89 -96t-113.5 -158.5 t-237.5 -62.5t-229 58q-122 67 -122 163t89 96t89 -90t-89 -90q99 -74 262 -74t262 74q-89 0 -89 90t89 90z" />
+<glyph unicode="&#x4c3;" horiz-adv-x="1514" d="M649 1284l-57 2q-126 0 -142 -40q-6 -15 -6 -44v-447q324 0 480 158q72 73 163 294q65 158 167 158q53 0 92 -41t39 -95q0 -92 -90 -92q-39 0 -65 25.5t-26 56.5t10 53q-39 -16 -90.5 -141t-83.5 -176q-74 -120 -192 -178q217 -44 346 -198.5t129 -390.5 q0 -279 -180.5 -449.5t-461.5 -170.5q-118 0 -233 59t-195 153l43 32q176 -175 392.5 -175t332.5 167q100 145 100 375t-96 375q-111 167 -320 176q-105 -20 -261 -32v-559q0 -28 9 -45q17 -33 186 -33h10v-61q-71 6 -120 6h-347q-43 0 -114 -6v61q8 0 26.5 -0.5t28.5 -0.5 q125 0 141 40q6 15 6 44v1066q0 27 -7 41q-16 33 -176 33h-19v62q70 -6 119 -6h342q50 0 120 6v-62z" />
+<glyph unicode="&#x4c4;" horiz-adv-x="1080" d="M409 478l-56 -7v-313q0 -41 9 -59q17 -33 150 -33h8v-66q-203 6 -237 6t-244 -6v66q7 0 23.5 -0.5t54 -0.5t63.5 16t26 77v607q0 41 -9 59q-17 33 -150 33h-8v66q208 -6 243.5 -6t237.5 6v-66q-7 0 -23.5 0.5t-54 0.5t-63.5 -16t-26 -77v-226h92q127 0 178 70 q20 27 53.5 140.5t96.5 158.5q42 30 107.5 30t111.5 -48t46 -118q0 -102 -102 -102q-39 0 -66.5 28.5t-27.5 62t16 60t16 29.5q0 18 -25 18q-65 0 -102 -113q-53 -158 -83 -196q128 -13 205 -94t77 -204t-58 -240q-153 -310 -568 -463l-14 48q194 72 327 220 q150 165 150 357q0 164 -127 238q-97 57 -247 57z" />
+<glyph unicode="&#x4c5;" horiz-adv-x="1554" d="M1488 1281l-59 2q-76 0 -103 -9q-53 -18 -53 -76v-1054q0 -27 13.5 -52t91.5 -31h110v-61l-329 -427l-29 22l91 184q66 139 66 176q0 45 -92 45h-309v61q8 0 27.5 -0.5t29.5 -0.5q128 0 147 36q9 17 9 49v1053q0 32 -9 49q-18 34 -153 34h-67q-188 0 -215 -35 q-11 -14 -11 -63q0 -227 -12 -426q-46 -757 -354 -757q-86 0 -148 60t-62 146q0 45 30 76t74 31t74 -30t30 -75q0 -81 -77 -102q31 -14 75 -14q200 0 256 520q21 195 21 511q0 113 -13 132q-18 27 -187 27v61h1137v-62z" />
+<glyph unicode="&#x4c6;" horiz-adv-x="1267" d="M281 81q186 0 186 658q0 63 -6 80q-11 30 -72 37q-10 1 -89 1v66h876v-66q-140 0 -157 -30q-10 -18 -10 -71v-589q0 -53 10 -71q17 -30 157 -30v-66l-246 -336l-39 27q28 36 78.5 134t50.5 130q0 45 -70 45h-256v66q140 0 157 30q10 18 10 71v585q0 49 -7 65 q-18 40 -149 40q-69 0 -92 -5q-55 -11 -63 -53q-3 -17 -4 -116q-6 -683 -261 -683q-70 0 -121 48.5t-51 118.5q0 88 86 88q36 0 60 -24.5t24 -61.5q0 -59 -50 -79q18 -9 48 -9z" />
+<glyph unicode="&#x4c7;" horiz-adv-x="1480" d="M649 1284l-55 2q-123 0 -142 -36q-8 -16 -8 -45v-474h590v474q0 29 -8 45q-17 34 -148 34h-46v62q70 -6 112 -6h356q43 0 113 6v-62l-56 2q-122 0 -140 -36q-8 -16 -8 -45v-1318q0 -141 -114.5 -235t-247.5 -94t-230 73t-97 190q0 49 30.5 81.5t78.5 32.5t79 -31.5 t31 -78.5q0 -110 -121 -110h-4q71 -114 217 -114q99 0 156 101q47 83 47 190v779h-590v-530q0 -29 8 -45q18 -35 187 -35h10v-61q-71 6 -115 6h-358q-37 0 -108 -6v61q9 0 27.5 -0.5t28.5 -0.5q121 0 139 36q7 14 7 45v1064q0 31 -7 45q-17 34 -149 34h-46v62q70 -6 112 -6 h354q45 0 115 6v-62z" />
+<glyph unicode="&#x4c8;" horiz-adv-x="1178" d="M1120 857q-140 0 -157 -30q-10 -18 -10 -71v-865q0 -132 -84.5 -232t-215.5 -100q-90 0 -159 40q-83 48 -83 132q0 42 27.5 70t69.5 28t70.5 -28t28.5 -70q0 -76 -74 -96q58 -29 114 -29q158 0 158 281v561h-435v-281q0 -49 9 -68q16 -33 159 -33v-66q-203 6 -238 6 t-244 -6v66q140 0 157 30q10 18 10 71v589q0 53 -10 71q-17 30 -157 30v66q209 -6 244 -6t238 6v-66q-143 0 -159 -33q-9 -19 -9 -68v-242h435v242q0 53 -10 71q-17 30 -157 30v66q209 -6 244 -6t238 6v-66z" />
+<glyph unicode="&#x4c9;" horiz-adv-x="1631" d="M1564 1284l-56 2q-122 0 -140 -36q-8 -16 -8 -45v-1064q0 -29 8 -45q18 -35 186 -35h10v-61l-329 -427l-29 22l91 184q66 139 66 176q0 45 -92 45h-288v61q9 0 28 -0.5t29 -0.5q119 0 137 36q8 16 8 45v964l-734 -1008l1 -1q14 -30 90 -35q3 0 30 -0.5t77 0.5v-61 q-71 6 -115 6h-358q-37 0 -108 -6v61q9 0 27.5 -0.5t28.5 -0.5q121 0 139 36q7 14 7 45v1064q0 31 -7 45q-17 34 -149 34h-46v62q70 -6 112 -6h354q45 0 115 6v-62l-55 2q-123 0 -142 -36q-8 -16 -8 -45v-967l734 1009q-15 37 -149 37h-46v62q70 -6 112 -6h356q43 0 113 6 v-62z" />
+<glyph unicode="&#x4ca;" horiz-adv-x="1261" d="M1048 -45q0 45 -70 45h-256v66q142 0 158 33q9 19 9 68v570l-499 -653q38 -18 148 -18v-66q-203 6 -238 6t-244 -6v66q142 0 158 33q9 19 9 68v589q0 49 -9 68q-16 33 -158 33v66q209 -6 244 -6t238 6v-66q-143 0 -159 -33q-9 -19 -9 -68v-570l499 653q-38 18 -147 18v66 q209 -6 244 -6t238 6v-66q-143 0 -159 -33q-9 -19 -9 -68v-589q0 -49 9 -68q16 -33 159 -33v-66l-246 -336l-39 27q28 36 78.5 134t50.5 130z" />
+<glyph unicode="&#x4cb;" horiz-adv-x="1601" d="M1535 1284l-59 2q-76 0 -103 -9q-53 -18 -53 -76v-1056q0 -32 9 -49q19 -36 147 -36h28q21 1 29 1v-61h-255q-89 0 -130.5 -35.5t-100 -141t-73.5 -125.5q-57 -79 -125 -92q87 64 87 376v39q-1 28 -1 40h24q150 0 173 47q14 28 14 97v485q-190 -218 -438 -218 q-187 0 -312.5 111t-125.5 298v327q0 30 -7 43q-18 34 -156 34q-19 0 -39 -1v62q73 -6 156 -6h270q84 0 156 6v-62q-48 1 -60 1q-118 0 -136 -34q-9 -17 -9 -51v-319q0 -149 90.5 -232t237.5 -83q208 0 373 205v430q0 32 -9 49q-18 34 -153 34h-51v62q71 -6 115 -6h376 q41 0 111 6v-62z" />
+<glyph unicode="&#x4cc;" horiz-adv-x="1261" d="M724 -35l-2 101q140 0 157 30q10 18 10 71v274q-129 -143 -324 -143q-131 0 -236.5 81t-105.5 208q0 214 -5 229q-11 32 -72 40q-12 1 -90 1v66q209 -6 244 -6t238 6v-66q-140 0 -157 -30q-11 -19 -11 -71v-143q0 -102 70.5 -160.5t174.5 -58.5q137 0 246 109 q28 28 28 75v178q0 53 -10 71q-17 30 -157 30v66q209 -6 244 -6t238 6v-66q-140 0 -157 -30q-11 -19 -11 -71v-589q0 -53 10 -71q17 -30 157 -30v-66h-213q-67 0 -99 -22.5t-82 -100.5t-64 -94q-47 -49 -115 -49q94 19 94 231z" />
+<glyph unicode="&#x4cd;" horiz-adv-x="1793" d="M1726 1281l-56 2q-125 0 -141 -41q-6 -15 -6 -45v-1058q0 -26 8 -43q17 -35 185 -35h10v-61l-329 -427l-29 22l91 184q66 139 66 176q0 45 -92 45h-273v61h76q63 0 87 10q40 17 40 70v1140h-2l-483 -1245q-14 -36 -36 -36t-39 43l-476 1222h-2v-1064q0 -140 200 -140h3 v-61q-209 6 -229 6t-231 -6v61h3q199 0 199 140v1003q0 22 -6 38q-12 32 -89 39q-6 1 -32.5 1t-74.5 -1v62h341q45 0 61 -42l428 -1102l430 1108q14 36 49 36h349v-62z" />
+<glyph unicode="&#x4ce;" horiz-adv-x="1428" d="M1206 -45q0 45 -70 45h-239v66h85q60 5 73 32q9 18 9 69l-2 696l-347 -820q-18 -43 -40.5 -43t-40.5 43l-341 805l-2 -2v-629q0 -151 167 -151v-66q-82 6 -166 6t-228 -6v66q167 0 167 151v539q0 50 -9 68q-16 33 -158 33v66h262q41 0 50 -4q13 -7 27 -39l310 -732 l308 732q13 31 26.5 37t53.5 6h261v-66h-85q-60 -5 -73 -32q-9 -18 -9 -69v-589q0 -50 9 -68q16 -33 158 -33v-66l-246 -336l-39 27q28 36 78.5 134t50.5 130z" />
+<glyph unicode="&#x4cf;" horiz-adv-x="578" d="M525 0q-193 6 -236 6t-236 -6v66l44 -1q66 0 89 13q33 18 33 79v609q0 61 -33 79q-23 13 -89 13l-44 -1v66q193 -6 236 -6t236 6v-66l-44 1q-66 0 -89 -13q-33 -18 -33 -79v-609q0 -61 33 -79q23 -13 89 -13l44 1v-66z" />
+<glyph unicode="&#x4d0;" horiz-adv-x="1484" d="M1417 0q-127 6 -297.5 6t-244.5 -6v61h5q157 0 157 59q0 29 -39 136l-70 192h-487l-61 -163q-34 -90 -34 -123q0 -51 52 -78q42 -23 97 -23v-61q-189 6 -239.5 6t-187.5 -6v61q174 2 219 133l404 1161q-114 10 -193 43q-107 44 -107 118q0 39 25 64.5t64 25.5t64 -25.5 t25 -70.5t-38 -70q63 -24 174 -24h74q111 0 174 24q-38 25 -38 70t25 70.5t64 25.5t64 -25.5t25 -64.5q0 -74 -107 -118q-79 -33 -193 -43l420 -1215q21 -61 84 -75q19 -5 77 -5q19 0 43 1v-61zM906 510l-222 641l-220 -641h442z" />
+<glyph unicode="&#x4d1;" horiz-adv-x="1070" d="M1018 190q0 -83 -47.5 -142.5t-122.5 -59.5t-120.5 51.5t-52.5 122.5q-35 -85 -111 -135.5t-186.5 -50.5t-205.5 50q-119 62 -119 178q0 179 213 279q131 61 394 76v78q0 110 -60.5 192t-166.5 82q-154 0 -231 -98q46 0 78 -26.5t32 -70t-28.5 -71.5t-71.5 -28 q-98 0 -98 99q0 113 102 178.5t222 65.5q183 0 293 -119q50 -54 63.5 -108t13.5 -144v-427q0 -40 20.5 -74t57.5 -34q79 0 79 175q0 28 -2 80h55v-119zM660 300v214q-171 -6 -291 -71q-152 -82 -152 -236q0 -78 56.5 -130.5t135.5 -52.5q111 0 181 81.5t70 194.5zM762 1398 q89 0 89 -96t-113.5 -158.5t-237.5 -62.5t-229 58q-122 67 -122 163t89 96t89 -90t-89 -90q99 -74 262 -74t262 74q-89 0 -89 90t89 90z" />
+<glyph unicode="&#x4d2;" horiz-adv-x="1484" d="M1417 0q-127 6 -297.5 6t-244.5 -6v61h5q157 0 157 59q0 29 -39 136l-70 192h-487l-61 -163q-34 -90 -34 -123q0 -51 52 -78q42 -23 97 -23v-61q-189 6 -239.5 6t-187.5 -6v61q174 2 219 133l409 1177q14 40 46 40t46 -40l425 -1231q21 -61 84 -75q19 -5 77 -5q19 0 43 1 v-61zM906 510l-222 641l-220 -641h442zM1009 1574q32 -32 32 -78.5t-32 -79t-78 -32.5t-78.5 33.5t-32.5 78t33 77.5t78.5 33t77.5 -32zM636.5 1574q32.5 -32 32.5 -78.5t-32.5 -79t-78 -32.5t-78.5 33.5t-33 78t33 77.5t78.5 33t78 -32z" />
+<glyph unicode="&#x4d3;" horiz-adv-x="1070" d="M1018 190q0 -83 -47.5 -142.5t-122.5 -59.5t-120.5 51.5t-52.5 122.5q-35 -85 -111 -135.5t-186.5 -50.5t-205.5 50q-119 62 -119 178q0 179 213 279q131 61 394 76v78q0 110 -60.5 192t-166.5 82q-154 0 -231 -98q46 0 78 -26.5t32 -70t-28.5 -71.5t-71.5 -28 q-98 0 -98 99q0 113 102 178.5t222 65.5q183 0 293 -119q50 -54 63.5 -108t13.5 -144v-427q0 -40 20.5 -74t57.5 -34q79 0 79 175q0 28 -2 80h55v-119zM660 300v214q-171 -6 -291 -71q-152 -82 -152 -236q0 -78 56.5 -130.5t135.5 -52.5q111 0 181 81.5t70 194.5zM751 1318 q32 -32 32 -78.5t-32 -79t-78 -32.5t-78.5 33.5t-32.5 78t33 77.5t78.5 33t77.5 -32zM378.5 1318q32.5 -32 32.5 -78.5t-32.5 -79t-78 -32.5t-78.5 33.5t-33 78t33 77.5t78.5 33t78 -32z" />
+<glyph unicode="&#x4d4;" horiz-adv-x="1794" d="M681 1280l-168 2v61h1104l55 -443h-49q-25 215 -78 286q-72 96 -273 96h-187q-61 0 -79 -11.5t-18 -67.5v-525h168q130 0 166.5 47.5t36.5 182.5h49v-522h-49q0 135 -36.5 182.5t-166.5 47.5h-168v-476q0 -56 18 -67.5t79 -11.5h187q228 0 311 117q52 75 95 330h49 l-82 -508h-972v61q6 0 19.5 -0.5t49.5 -0.5t59.5 15t23.5 74v467h-318l-147 -413q-10 -28 -10 -44q0 -95 146 -98v-61q-189 6 -243.5 6t-184.5 -6v61q176 0 223 132zM825 678v515q0 79 -81 81l-215 -596h296z" />
+<glyph unicode="&#x4d5;" horiz-adv-x="1495" d="M1415 282q28 0 28 -28.5t-33 -89.5q-103 -188 -301 -188q-218 0 -357 190q-45 -92 -145.5 -141t-221 -49t-213.5 46q-119 58 -119 174q0 180 223 272q167 67 379 67v104q0 110 -59.5 192t-166.5 82q-154 0 -232 -98q110 -1 110 -100q0 -43 -28 -70.5t-71 -27.5 q-99 0 -99 107t102 171.5t222 64.5q228 0 328 -165q138 165 317.5 165t272 -120t92.5 -300q0 -34 -9.5 -39.5t-44.5 -5.5h-585q0 -332 188 -432q64 -33 126 -33q92 0 163.5 58t100.5 149q15 45 33 45zM1082 913q-45 0 -95 -23q-163 -79 -181 -350h495q-16 373 -219 373z M681 283q0 19 -13 81t-13 127q-168 -6 -285 -67q-151 -79 -151 -228q0 -74 55 -123t131 -49q110 0 193 75.5t83 183.5z" />
+<glyph unicode="&#x4d6;" horiz-adv-x="1354" d="M68 0v61q47 -1 53 -1q125 0 142 38q7 16 7 48v1053q0 30 -7 47q-15 36 -152 36q-20 0 -43 -1v62h1108l56 -442h-49q-24 218 -99.5 299t-288.5 81h-263q-54 0 -71 -13.5t-17 -65.5v-474h178q134 0 173.5 46.5t39.5 182.5h51v-521h-51q0 136 -40 183t-173 47h-178v-526 q0 -52 17 -65.5t71 -13.5h273q236 0 326 111q67 84 107 336h49l-84 -508h-1135zM1053 1516q0 -85 -140 -130q-101 -33 -211 -33t-211 33q-140 45 -140 130q0 39 25 64.5t64 25.5t64 -25.5t25 -70.5t-38 -70q63 -24 174 -24h74q111 0 174 24q-38 25 -38 70t25 70.5t64 25.5 t64 -25.5t25 -64.5z" />
+<glyph unicode="&#x4d7;" horiz-adv-x="933" d="M854 280q27 0 27 -28t-35 -88q-110 -188 -315 -188t-341.5 147.5t-136.5 344.5t127 344.5t312.5 147.5t287 -119t101.5 -302q0 -30 -7.5 -37.5t-38.5 -7.5h-605v-7q0 -210 64 -313q90 -144 242 -144q198 0 290 221q12 29 28 29zM740 539q0 143 -50 243q-64 129 -192 129 q-41 0 -90 -23q-165 -78 -175 -349h507zM782 1398q89 0 89 -96t-113.5 -158.5t-237.5 -62.5t-229 58q-122 67 -122 163t89 96t89 -90t-89 -90q99 -74 262 -74t262 74q-89 0 -89 90t89 90z" />
+<glyph unicode="&#x4d8;" horiz-adv-x="1445" d="M722 1390q280 0 467 -214t187 -498.5t-186.5 -502.5t-462 -218t-459.5 201t-200 475h1106v18q0 469 -265 632q-93 57 -187 57q-142 0 -283 -115t-187 -255q-10 -32 -37 -32t-27 26v393q0 33 21 33q14 0 31 -25l87 -127q184 152 395 152zM529 61q92 -54 192 -54t191 53 q234 137 259 513h-899q25 -376 257 -512z" />
+<glyph unicode="&#x4d9;" horiz-adv-x="933" d="M88 772q110 188 315 188t341.5 -147.5t136.5 -344.5t-127 -344.5t-312.5 -147.5t-287 119t-101.5 302q0 30 7.5 37.5t38.5 7.5h605v7q0 210 -64 313q-90 144 -242 144q-198 0 -290 -221q-12 -29 -28 -29q-27 0 -27 28t35 88zM194 397q0 -143 50 -243q64 -129 192 -129 q41 0 90 23q165 78 175 349h-507z" />
+<glyph unicode="&#x4da;" horiz-adv-x="1445" d="M722 1390q280 0 467 -214t187 -498.5t-186.5 -502.5t-462 -218t-459.5 201t-200 475h1106v18q0 469 -265 632q-93 57 -187 57q-142 0 -283 -115t-187 -255q-10 -32 -37 -32t-27 26v393q0 33 21 33q14 0 31 -25l87 -127q184 152 395 152zM529 61q92 -54 192 -54t191 53 q234 137 259 513h-899q25 -376 257 -512zM979 1574q32 -32 32 -78.5t-32 -79t-78 -32.5t-78.5 33.5t-32.5 78t33 77.5t78.5 33t77.5 -32zM606.5 1574q32.5 -32 32.5 -78.5t-32.5 -79t-78 -32.5t-78.5 33.5t-33 78t33 77.5t78.5 33t78 -32z" />
+<glyph unicode="&#x4db;" horiz-adv-x="933" d="M88 772q110 188 315 188t341.5 -147.5t136.5 -344.5t-127 -344.5t-312.5 -147.5t-287 119t-101.5 302q0 30 7.5 37.5t38.5 7.5h605v7q0 210 -64 313q-90 144 -242 144q-198 0 -290 -221q-12 -29 -28 -29q-27 0 -27 28t35 88zM194 397q0 -143 50 -243q64 -129 192 -129 q41 0 90 23q165 78 175 349h-507zM711 1318q32 -32 32 -78.5t-32 -79t-78 -32.5t-78.5 33.5t-32.5 78t33 77.5t78.5 33t77.5 -32zM338.5 1318q32.5 -32 32.5 -78.5t-32.5 -79t-78 -32.5t-78.5 33.5t-33 78t33 77.5t78.5 33t78 -32z" />
+<glyph unicode="&#x4dc;" horiz-adv-x="2214" d="M1399 1284l-57 2q-126 0 -142 -40q-6 -15 -6 -44v-447q289 8 434 167q62 67 159 289q67 154 167 154q53 0 92 -41t39 -95q0 -92 -90 -92q-39 0 -65 25.5t-26 56.5t10 53q-41 -17 -97.5 -159.5t-116.5 -215.5q-106 -130 -287 -165v-8q116 -16 221 -77t151 -158 q25 -54 39 -150l25 -181q30 -158 118 -158q99 0 131 175q6 31 24 31q24 0 24 -33q0 -86 -51.5 -151t-134.5 -65q-330 0 -330 318q0 13 1 40v40q0 136 -83 239.5t-216 103.5h-138v-559q0 -28 9 -45q17 -33 186 -33h10v-61q-71 6 -120 6h-344q-49 0 -120 -6v61h10 q169 0 186 33q9 17 9 45v559h-138q-133 0 -216 -103.5t-83 -239.5q0 -13 0.5 -40t0.5 -40q0 -318 -330 -318q-83 0 -134.5 65t-51.5 151q0 33 24 33q18 0 24 -31q32 -175 131 -175q88 0 118 158l23 169q16 108 41 162q46 97 151 158t221 77v8q-181 35 -287 165 q-60 73 -116.5 215.5t-97.5 159.5q10 -22 10 -53t-26 -56.5t-65 -25.5q-90 0 -90 92q0 54 39 95t92 41q100 0 167 -154q97 -222 159 -289q145 -159 434 -167v447q0 29 -6 44q-16 40 -142 40l-57 -2v62q70 -6 120 -6h344q50 0 120 6v-62zM1368 1574q32 -32 32 -78.5t-32 -79 t-78 -32.5t-78.5 33.5t-32.5 78t33 77.5t78.5 33t77.5 -32zM995.5 1574q32.5 -32 32.5 -78.5t-32.5 -79t-78 -32.5t-78.5 33.5t-33 78t33 77.5t78.5 33t78 -32z" />
+<glyph unicode="&#x4dd;" horiz-adv-x="1611" d="M737 471l-56 7q-128 0 -236 -69q-55 -35 -70.5 -71t-20 -119.5t-53.5 -158.5t-134 -75q-67 0 -101 67q-27 53 -27 128q0 34 27 34q22 0 26 -26q10 -62 16 -78q17 -44 57 -44q66 0 66 141.5t62.5 205t196.5 93.5q-68 33 -107 130l-53 156q-32 76 -89 76q-25 0 -25 -18 q0 -3 16 -29.5t16 -60t-27.5 -62t-66.5 -28.5q-102 0 -102 102q0 70 46 118t112 48q148 0 200 -178q37 -124 57 -151q51 -70 178 -70h92v226q0 41 -9 59q-17 33 -150 33h-8v66q208 -6 243.5 -6t237.5 6v-66q-7 0 -23.5 0.5t-54 0.5t-63.5 -16t-26 -77v-226h92q127 0 178 70 q20 27 53.5 140.5t96.5 158.5q42 30 107.5 30t111.5 -48t46 -118q0 -102 -102 -102q-39 0 -66.5 28.5t-27.5 62t16 60t16 29.5q0 18 -25 18q-57 0 -89 -76l-53 -156q-39 -97 -107 -130q134 -30 196.5 -93.5t62.5 -205t66 -141.5q40 0 57 44q6 16 16 78q4 26 26 26 q27 0 27 -34q0 -75 -27 -128q-34 -67 -101 -67q-85 0 -134 75t-53.5 158.5t-20 119.5t-70.5 71q-108 69 -236 69l-56 -7v-313q0 -41 9 -59q17 -33 150 -33h8v-66q-203 6 -237 6t-244 -6v66q7 0 23.5 -0.5t54 -0.5t63.5 16t26 77v313zM1079 1318q32 -32 32 -78.5t-32 -79 t-78 -32.5t-78.5 33.5t-32.5 78t33 77.5t78.5 33t77.5 -32zM706.5 1318q32.5 -32 32.5 -78.5t-32.5 -79t-78 -32.5t-78.5 33.5t-33 78t33 77.5t78.5 33t78 -32z" />
+<glyph unicode="&#x4de;" horiz-adv-x="1244" d="M879 1574q32 -32 32 -78.5t-32 -79t-78 -32.5t-78.5 33.5t-32.5 78t33 77.5t78.5 33t77.5 -32zM506.5 1574q32.5 -32 32.5 -78.5t-32.5 -79t-78 -32.5t-78.5 33.5t-33 78t33 77.5t78.5 33t78 -32zM1176 359q0 -85 -50 -164q-77 -122 -218.5 -180t-302.5 -58 q-258 0 -386 70q-78 -70 -98 -70q-33 0 -34 33l-12 275q-1 32 41 32q22 0 26.5 -6t11.5 -51t26 -79q80 -144 421 -144q160 0 260 93t100 250t-98.5 247t-255.5 90h-116q-78 -1 -116.5 -1t-38.5 30q0 16 13 22.5t170.5 18t256.5 77.5q150 100 150 257q0 111 -103 174 q-87 53 -225.5 53t-242.5 -62.5t-130 -138.5q-4 -20 -17 -58q-10 -20 -35 -20q-41 0 -39 46l9 246q2 49 35 49q26 0 112 -85q136 85 318 85t326 -64q185 -82 185 -227q0 -261 -386 -360q172 -25 295 -115q148 -108 148 -265z" />
+<glyph unicode="&#x4df;" horiz-adv-x="920" d="M860 253q0 -59 -36 -116q-106 -167 -386 -167q-169 0 -263 43l-64 -43h-9q-23 0 -27 8q-5 11 -5 48v122q0 58 28 58q20 0 26 -20q2 -23 17 -71q45 -85 293.5 -85t248.5 222.5t-251 222.5h-118q-55 0 -55 23t29.5 25.5t79.5 5.5q122 8 192 62q86 66 86 151.5t-58.5 121 t-151 35.5t-165 -36.5t-94 -91t-36.5 -54.5q-28 0 -28 58v122q0 37 5 47.5t36 8.5q25 -19 77 -54q91 54 218 54t232 -43q136 -57 136 -160q0 -170 -254 -242q112 -21 195 -81q102 -73 102 -174zM719 1318q32 -32 32 -78.5t-32 -79t-78 -32.5t-78.5 33.5t-32.5 78t33 77.5 t78.5 33t77.5 -32zM346.5 1318q32.5 -32 32.5 -78.5t-32.5 -79t-78 -32.5t-78.5 33.5t-33 78t33 77.5t78.5 33t78 -32z" />
+<glyph unicode="&#x4e0;" horiz-adv-x="1181" d="M1113 419q0 -210 -159.5 -336t-366 -126t-350 120t-143.5 264q0 56 33.5 107t79.5 51t76 -30.5t30 -69.5t-29 -68.5t-66.5 -29.5t-68.5 24q13 -136 151 -226.5t281 -90.5q330 0 330 440q0 94 -62 189.5t-148 141.5q-39 21 -94 34t-55 29q0 8 291 439h-330 q-205 0 -293.5 -87.5t-100.5 -293.5h-51l22 443h920q34 0 34 -32q0 -17 -14 -38l-287 -425q154 -52 262 -165.5t108 -263.5z" />
+<glyph unicode="&#x4e1;" horiz-adv-x="948" d="M496 478q179 -12 295.5 -121t116.5 -293.5t-137.5 -311t-334.5 -126.5q-121 0 -215 54q-113 64 -113 170t97 106q42 0 70.5 -28t28.5 -70q0 -94 -100 -99q79 -78 221 -78t224 115t82 252.5t-76 220.5t-210 83q-39 0 -84 -12l-37 38l397 405h-325q-126 0 -164 -19 q-60 -30 -72 -141h-54l21 300h721q38 0 38 -28q0 -20 -18 -38z" />
+<glyph unicode="&#x4e2;" horiz-adv-x="1631" d="M1564 1284l-56 2q-122 0 -140 -36q-8 -16 -8 -45v-1064q0 -29 8 -45q18 -35 186 -35h10v-61q-71 6 -113 6h-361q-36 0 -107 -6v61q9 0 28 -0.5t29 -0.5q119 0 137 36q8 16 8 45v964l-734 -1008l1 -1q14 -30 90 -35q3 0 30 -0.5t77 0.5v-61q-71 6 -115 6h-358 q-37 0 -108 -6v61q9 0 27.5 -0.5t28.5 -0.5q121 0 139 36q7 14 7 45v1064q0 31 -7 45q-17 34 -149 34h-46v62q70 -6 112 -6h354q45 0 115 6v-62l-55 2q-123 0 -142 -36q-8 -16 -8 -45v-967l734 1009q-15 37 -149 37h-46v62q70 -6 112 -6h356q43 0 113 6v-62zM1116 1494h-601 v102h601v-102z" />
+<glyph unicode="&#x4e3;" horiz-adv-x="1261" d="M1204 0q-203 6 -238 6t-244 -6v66q142 0 158 33q9 19 9 68v570l-499 -653q38 -18 148 -18v-66q-203 6 -238 6t-244 -6v66q142 0 158 33q9 19 9 68v589q0 49 -9 68q-16 33 -158 33v66q209 -6 244 -6t238 6v-66q-143 0 -159 -33q-9 -19 -9 -68v-570l499 653q-38 18 -147 18 v66q209 -6 244 -6t238 6v-66q-143 0 -159 -33q-9 -19 -9 -68v-589q0 -49 9 -68q16 -33 159 -33v-66zM927 1191h-601v102h601v-102z" />
+<glyph unicode="&#x4e4;" horiz-adv-x="1631" d="M1564 1284l-56 2q-122 0 -140 -36q-8 -16 -8 -45v-1064q0 -29 8 -45q18 -35 186 -35h10v-61q-71 6 -113 6h-361q-36 0 -107 -6v61q9 0 28 -0.5t29 -0.5q119 0 137 36q8 16 8 45v964l-734 -1008l1 -1q14 -30 90 -35q3 0 30 -0.5t77 0.5v-61q-71 6 -115 6h-358 q-37 0 -108 -6v61q9 0 27.5 -0.5t28.5 -0.5q121 0 139 36q7 14 7 45v1064q0 31 -7 45q-17 34 -149 34h-46v62q70 -6 112 -6h354q45 0 115 6v-62l-55 2q-123 0 -142 -36q-8 -16 -8 -45v-967l734 1009q-15 37 -149 37h-46v62q70 -6 112 -6h356q43 0 113 6v-62zM1089 1574 q32 -32 32 -78.5t-32 -79t-78 -32.5t-78.5 33.5t-32.5 78t33 77.5t78.5 33t77.5 -32zM716.5 1574q32.5 -32 32.5 -78.5t-32.5 -79t-78 -32.5t-78.5 33.5t-33 78t33 77.5t78.5 33t78 -32z" />
+<glyph unicode="&#x4e5;" horiz-adv-x="1261" d="M1204 0q-203 6 -238 6t-244 -6v66q142 0 158 33q9 19 9 68v570l-499 -653q38 -18 148 -18v-66q-203 6 -238 6t-244 -6v66q142 0 158 33q9 19 9 68v589q0 49 -9 68q-16 33 -158 33v66q209 -6 244 -6t238 6v-66q-143 0 -159 -33q-9 -19 -9 -68v-570l499 653q-38 18 -147 18 v66q209 -6 244 -6t238 6v-66q-143 0 -159 -33q-9 -19 -9 -68v-589q0 -49 9 -68q16 -33 159 -33v-66zM901 1318q32 -32 32 -78.5t-32 -79t-78 -32.5t-78.5 33.5t-32.5 78t33 77.5t78.5 33t77.5 -32zM528.5 1318q32.5 -32 32.5 -78.5t-32.5 -79t-78 -32.5t-78.5 33.5t-33 78 t33 77.5t78.5 33t78 -32z" />
+<glyph unicode="&#x4e6;" horiz-adv-x="1445" d="M722 -43q-280 0 -467 214t-187 498.5t186.5 502.5t468 218t468 -217.5t186.5 -503t-187.5 -499t-467.5 -213.5zM1175 696q0 438 -260 590q-92 54 -192 54t-191 -53q-262 -153 -262 -591q0 -469 265 -632q91 -56 185 -56t188 55q267 156 267 633zM979 1574 q32 -32 32 -78.5t-32 -79t-78 -32.5t-78.5 33.5t-32.5 78t33 77.5t78.5 33t77.5 -32zM606.5 1574q32.5 -32 32.5 -78.5t-32.5 -79t-78 -32.5t-78.5 33.5t-33 78t33 77.5t78.5 33t78 -32z" />
+<glyph unicode="&#x4e7;" horiz-adv-x="1054" d="M191.5 118.5q-138.5 142.5 -138.5 341.5t138 349.5t336.5 150.5t336.5 -151t138 -350.5t-139 -341t-336 -141.5t-335.5 142.5zM776 188q47 92 47 292.5t-56 292.5q-84 138 -244.5 138t-241.5 -143q-51 -90 -51 -294.5t55 -299.5q83 -144 246.5 -144t244.5 158zM811 1318 q32 -32 32 -78.5t-32 -79t-78 -32.5t-78.5 33.5t-32.5 78t33 77.5t78.5 33t77.5 -32zM438.5 1318q32.5 -32 32.5 -78.5t-32.5 -79t-78 -32.5t-78.5 33.5t-33 78t33 77.5t78.5 33t78 -32z" />
+<glyph unicode="&#x4e8;" horiz-adv-x="1445" d="M722 -43q-280 0 -467 214t-187 498.5t186.5 502.5t468 218t468 -217.5t186.5 -503t-187.5 -499t-467.5 -213.5zM915 1286q-92 54 -192 54t-191 -53q-250 -146 -261 -556h903q-11 410 -259 555zM535 64q91 -56 185 -56t188 55q258 151 267 608h-905q8 -450 265 -607z" />
+<glyph unicode="&#x4e9;" horiz-adv-x="1054" d="M191.5 118.5q-138.5 142.5 -138.5 341.5t138 349.5t336.5 150.5t336.5 -151t138 -350.5t-139 -341t-336 -141.5t-335.5 142.5zM767 773q-84 138 -244.5 138t-241.5 -143q-49 -87 -51 -254h593q-2 171 -56 259zM285 174q83 -144 246.5 -144t244.5 158q46 90 47 260h-593 q2 -181 55 -274z" />
+<glyph unicode="&#x4ea;" horiz-adv-x="1445" d="M722 -43q-280 0 -467 214t-187 498.5t186.5 502.5t468 218t468 -217.5t186.5 -503t-187.5 -499t-467.5 -213.5zM915 1286q-92 54 -192 54t-191 -53q-250 -146 -261 -556h903q-11 410 -259 555zM535 64q91 -56 185 -56t188 55q258 151 267 608h-905q8 -450 265 -607z M979 1574q32 -32 32 -78.5t-32 -79t-78 -32.5t-78.5 33.5t-32.5 78t33 77.5t78.5 33t77.5 -32zM606.5 1574q32.5 -32 32.5 -78.5t-32.5 -79t-78 -32.5t-78.5 33.5t-33 78t33 77.5t78.5 33t78 -32z" />
+<glyph unicode="&#x4eb;" horiz-adv-x="1054" d="M191.5 118.5q-138.5 142.5 -138.5 341.5t138 349.5t336.5 150.5t336.5 -151t138 -350.5t-139 -341t-336 -141.5t-335.5 142.5zM767 773q-84 138 -244.5 138t-241.5 -143q-49 -87 -51 -254h593q-2 171 -56 259zM285 174q83 -144 246.5 -144t244.5 158q46 90 47 260h-593 q2 -181 55 -274zM811 1318q32 -32 32 -78.5t-32 -79t-78 -32.5t-78.5 33.5t-32.5 78t33 77.5t78.5 33t77.5 -32zM438.5 1318q32.5 -32 32.5 -78.5t-32.5 -79t-78 -32.5t-78.5 33.5t-33 78t33 77.5t78.5 33t78 -32z" />
+<glyph unicode="&#x4ec;" horiz-adv-x="1335" d="M582 1390q287 0 485.5 -214t198.5 -503.5t-198 -502.5t-486 -213q-184 0 -327.5 118.5t-178.5 298.5q-2 11 -2 17q0 22 27 22q15 0 23 -29q25 -90 47 -135.5t77 -101.5q130 -130 309 -130q91 0 185 41q322 141 322 595v19l-1 38q-80 45 -202 45q-178 0 -355 -155 q-76 -67 -179.5 -67t-214.5 90q-31 25 -31 51t19 26q-4 0 48.5 -30.5t105.5 -30.5q85 0 161 56l147 110q94 58 224 58t274 -95q-31 381 -294 510q-102 50 -207 50q-151 0 -272 -117t-155 -271q-7 -32 -35.5 -32t-28.5 26v423q0 33 21 33q14 0 31 -25l99 -144 q170 169 363 169zM859 1574q32 -32 32 -78.5t-32 -79t-78 -32.5t-78.5 33.5t-32.5 78t33 77.5t78.5 33t77.5 -32zM486.5 1574q32.5 -32 32.5 -78.5t-32.5 -79t-78 -32.5t-78.5 33.5t-33 78t33 77.5t78.5 33t78 -32z" />
+<glyph unicode="&#x4ed;" horiz-adv-x="1142" d="M135 953q3 0 107 -86q114 86 259 86q211 0 368 -142t157 -350t-157.5 -349.5t-367.5 -141.5q-141 0 -255 70q-133 82 -133 215q0 30 28 30q21 0 26 -32q15 -106 101 -161.5t199 -55.5q174 0 283 116q90 95 98 289q-69 60 -163 60q-135 0 -250 -109q-55 -52 -110 -52 t-130 38.5t-75 76.5t21 38q3 0 31 -18.5t61 -18.5q67 0 163.5 80.5t198.5 80.5q134 0 251 -94q-18 176 -119 270t-258 94q-188 0 -269 -152q-5 -9 -33 -93q-6 -19 -27 -19t-26 18q-1 4 -1 38v218q0 56 22 56zM811 1318q32 -32 32 -78.5t-32 -79t-78 -32.5t-78.5 33.5 t-32.5 78t33 77.5t78.5 33t77.5 -32zM438.5 1318q32.5 -32 32.5 -78.5t-32.5 -79t-78 -32.5t-78.5 33.5t-33 78t33 77.5t78.5 33t78 -32z" />
+<glyph unicode="&#x4ee;" horiz-adv-x="1591" d="M441 -20q-135 0 -214.5 72.5t-79.5 206.5q0 106 99 106q42 0 69.5 -27t27.5 -69.5t-28 -70t-71 -27.5q-14 0 -35 5q20 -70 87 -106t149.5 -36t168.5 135q53 83 136 234l-466 798q-10 19 -37 52q-33 29 -170 29h-9v64q196 -6 246 -6t234 6v-64h-4q-91 0 -91 -41 q0 -14 18 -45l371 -636l345 590q23 39 23 65q0 65 -73 67v64q183 -6 233.5 -6t152.5 6v-64q-171 -2 -248 -134l-550 -940q-133 -228 -284 -228zM1116 1494h-601v102h601v-102z" />
+<glyph unicode="&#x4ef;" horiz-adv-x="1151" d="M249 -439q-76 0 -136 50t-60 124q0 91 89 91q39 0 65 -25.5t26 -63.5q0 -81 -85 -91q41 -38 101 -38q93 0 158 92q32 45 68 130l71 170l-321 781q-22 54 -70 68q-21 6 -74 6h-28v68q120 -8 178.5 -8t261.5 8v-68h-4q-116 0 -116 -54q0 -19 250 -616l217 528q14 34 14 50 q0 90 -101 92v68q170 -8 212 -8t134 8v-68h-2q-140 0 -197 -136l-377 -913q-101 -245 -274 -245zM897 1191h-601v102h601v-102z" />
+<glyph unicode="&#x4f0;" horiz-adv-x="1591" d="M441 -20q-135 0 -214.5 72.5t-79.5 206.5q0 106 99 106q42 0 69.5 -27t27.5 -69.5t-28 -70t-71 -27.5q-14 0 -35 5q20 -70 87 -106t149.5 -36t168.5 135q53 83 136 234l-466 798q-10 19 -37 52q-33 29 -170 29h-9v64q196 -6 246 -6t234 6v-64h-4q-91 0 -91 -41 q0 -14 18 -45l371 -636l345 590q23 39 23 65q0 65 -73 67v64q183 -6 233.5 -6t152.5 6v-64q-171 -2 -248 -134l-550 -940q-133 -228 -284 -228zM1109 1574q32 -32 32 -78.5t-32 -79t-78 -32.5t-78.5 33.5t-32.5 78t33 77.5t78.5 33t77.5 -32zM736.5 1574 q32.5 -32 32.5 -78.5t-32.5 -79t-78 -32.5t-78.5 33.5t-33 78t33 77.5t78.5 33t78 -32z" />
+<glyph unicode="&#x4f1;" horiz-adv-x="1151" d="M249 -439q-76 0 -136 50t-60 124q0 91 89 91q39 0 65 -25.5t26 -63.5q0 -81 -85 -91q41 -38 101 -38q93 0 158 92q32 45 68 130l71 170l-321 781q-22 54 -70 68q-21 6 -74 6h-28v68q120 -8 178.5 -8t261.5 8v-68h-4q-116 0 -116 -54q0 -19 250 -616l217 528q14 34 14 50 q0 90 -101 92v68q170 -8 212 -8t134 8v-68h-2q-140 0 -197 -136l-377 -913q-101 -245 -274 -245zM871 1318q32 -32 32 -78.5t-32 -79t-78 -32.5t-78.5 33.5t-32.5 78t33 77.5t78.5 33t77.5 -32zM498.5 1318q32.5 -32 32.5 -78.5t-32.5 -79t-78 -32.5t-78.5 33.5t-33 78 t33 77.5t78.5 33t78 -32z" />
+<glyph unicode="&#x4f2;" horiz-adv-x="1591" d="M441 -20q-135 0 -214.5 72.5t-79.5 206.5q0 106 99 106q42 0 69.5 -27t27.5 -69.5t-28 -70t-71 -27.5q-14 0 -35 5q20 -70 87 -106t149.5 -36t168.5 135q53 83 136 234l-466 798q-10 19 -37 52q-33 29 -170 29h-9v64q196 -6 246 -6t234 6v-64h-4q-91 0 -91 -41 q0 -14 18 -45l371 -636l345 590q23 39 23 65q0 65 -73 67v64q183 -6 233.5 -6t152.5 6v-64q-171 -2 -248 -134l-550 -940q-133 -228 -284 -228zM1313 1532q0 -44 -46 -61l-328 -123l-26 50l292 195q19 13 43.5 13t44.5 -23t20 -51zM963 1532q0 -44 -46 -61l-328 -123l-26 50 l292 195q19 13 43.5 13t44.5 -23t20 -51z" />
+<glyph unicode="&#x4f3;" horiz-adv-x="1151" d="M523 1401q22 29 53 29t54 -23t23 -53t-28 -54l-313 -256l-37 35zM893 1401q22 29 53 29t54 -23t23 -53t-28 -54l-313 -256l-37 35zM249 -439q-76 0 -136 50t-60 124q0 91 89 91q39 0 65 -25.5t26 -63.5q0 -81 -85 -91q41 -38 101 -38q93 0 158 92q32 45 68 130l71 170 l-321 781q-22 54 -70 68q-21 6 -74 6h-28v68q120 -8 178.5 -8t261.5 8v-68h-4q-116 0 -116 -54q0 -19 250 -616l217 528q14 34 14 50q0 90 -101 92v68q170 -8 212 -8t134 8v-68h-2q-140 0 -197 -136l-377 -913q-101 -245 -274 -245z" />
+<glyph unicode="&#x4f4;" horiz-adv-x="1601" d="M1535 1284l-59 2q-75 0 -103 -9q-53 -18 -53 -76v-1057q0 -27 13.5 -52t91.5 -31h110v-61q-71 6 -117 6h-373q-41 0 -112 -6v61q8 0 27.5 -0.5t29.5 -0.5q128 0 147 36q9 17 9 49v545q-190 -218 -438 -218q-187 0 -312.5 111t-125.5 298v327q0 30 -7 43q-18 34 -156 34 q-19 0 -39 -1v62q73 -6 156 -6h270q84 0 156 6v-62q-48 1 -60 1q-118 0 -136 -34q-9 -17 -9 -51v-319q0 -149 90.5 -232t237.5 -83q208 0 373 205v430q0 32 -9 49q-18 34 -153 34h-51v62q71 -6 115 -6h376q41 0 111 6v-62zM1069 1574q32 -32 32 -78.5t-32 -79t-78 -32.5 t-78.5 33.5t-32.5 78t33 77.5t78.5 33t77.5 -32zM696.5 1574q32.5 -32 32.5 -78.5t-32.5 -79t-78 -32.5t-78.5 33.5t-33 78t33 77.5t78.5 33t78 -32z" />
+<glyph unicode="&#x4f5;" horiz-adv-x="1261" d="M1204 0q-203 6 -237.5 6t-244.5 -6v66q140 0 157 30q10 18 10 71v274q-129 -143 -324 -143q-131 0 -236.5 81t-105.5 208q0 214 -5 229q-11 32 -72 40q-12 1 -90 1v66q209 -6 244 -6t238 6v-66q-140 0 -157 -30q-11 -19 -11 -71v-143q0 -102 70.5 -160.5t174.5 -58.5 q137 0 246 109q28 28 28 75v178q0 53 -10 71q-17 30 -157 30v66q209 -6 244 -6t238 6v-66q-140 0 -157 -30q-11 -19 -11 -71v-589q0 -52 11 -71q17 -30 157 -30v-66zM891 1318q32 -32 32 -78.5t-32 -79t-78 -32.5t-78.5 33.5t-32.5 78t33 77.5t78.5 33t77.5 -32zM518.5 1318 q32.5 -32 32.5 -78.5t-32.5 -79t-78 -32.5t-78.5 33.5t-33 78t33 77.5t78.5 33t78 -32z" />
+<glyph unicode="&#x4f6;" horiz-adv-x="1216" d="M744 1281h-214q-51 0 -68.5 -13t-17.5 -66v-997q0 -69 14 -97q23 -47 173 -47h24q0 -12 -0.5 -39t-0.5 -40q0 -312 87 -376q-68 13 -125 92q-15 20 -73.5 125.5t-100 141t-130.5 35.5h-244v61q8 0 26 -0.5t28 -0.5q124 0 141 38q7 15 7 48v1053q0 31 -7 47 q-15 35 -170 35h-25v62h1026l55 -442h-49q-24 212 -82 285q-74 95 -274 95z" />
+<glyph unicode="&#x4f7;" horiz-adv-x="1035" d="M537 66l-2 -101q0 -212 94 -231q-68 0 -115 49q-14 16 -64 94t-82 100.5t-99 22.5h-213v66q140 0 157 30q10 18 10 71v589q0 52 -10 70q-16 30 -151 30h-6v67h846l38 -328h-53q-18 182 -98 229q-55 32 -254 32q-112 0 -122 -2q-32 -6 -40 -31q-3 -10 -3 -55v-601 q0 -53 10 -71q17 -30 157 -30z" />
+<glyph unicode="&#x4f8;" horiz-adv-x="1986" d="M649 1284l-59 2q-76 0 -103 -9q-53 -18 -53 -76v-480h336q188 0 334 -85q174 -101 174 -269t-135.5 -267.5t-302.5 -99.5h-772v61q62 -2 63 -2q113 0 134 45q5 11 5 42v1055q0 32 -9 49q-18 34 -153 34h-40v62q71 -6 115 -6h355q41 0 111 6v-62zM994 147q88 86 88 221 t-87 222t-210 87h-351v-537q0 -53 16.5 -66t69.5 -13h257q129 0 217 86zM1920 1284l-59 2q-75 0 -103 -9q-53 -18 -53 -76v-1057q0 -27 13.5 -52t91.5 -31h110v-61q-71 6 -117 6h-373q-41 0 -112 -6v61q8 0 27.5 -0.5t29.5 -0.5q128 0 147 36q9 17 9 49v1056q0 32 -9 49 q-18 34 -153 34h-51v62q71 -6 115 -6h376q41 0 111 6v-62zM1249 1574q32 -32 32 -78.5t-32 -79t-78 -32.5t-78.5 33.5t-32.5 78t33 77.5t78.5 33t77.5 -32zM876.5 1574q32.5 -32 32.5 -78.5t-32.5 -79t-78 -32.5t-78.5 33.5t-33 78t33 77.5t78.5 33t78 -32z" />
+<glyph unicode="&#x4f9;" horiz-adv-x="1535" d="M1495 0q-203 6 -240.5 6t-241.5 -6v66q139 0 156 29q11 18 11 68v597q0 50 -11 68q-17 29 -156 29v66q203 -6 241 -6t241 6v-66q-80 0 -86 -1q-60 -5 -72 -34q-9 -21 -9 -72v-577q0 -51 9 -72q12 -29 72 -34q6 -1 86 -1v-66zM1004 251q0 -56 -34 -109q-90 -142 -310 -142 h-598v66h9q132 0 148 30q10 18 10 71v589q0 53 -10 71q-16 30 -148 30h-9v66q120 -6 196.5 -6t272.5 6v-66h-9q-132 0 -148 -30q-10 -18 -10 -71v-270h291q127 0 227 -53q122 -65 122 -182zM608 66q93 0 159 50t66 137.5t-56 145t-141 57.5h-272v-302q0 -62 14 -75t78 -13 h152zM1049 1318q32 -32 32 -78.5t-32 -79t-78 -32.5t-78.5 33.5t-32.5 78t33 77.5t78.5 33t77.5 -32zM636.5 1318q32.5 -32 32.5 -78.5t-32.5 -79t-78 -32.5t-78.5 33.5t-33 78t33 77.5t78.5 33t78 -32z" />
+<glyph unicode="&#x4fa;" horiz-adv-x="1216" d="M744 1281h-214q-51 0 -68.5 -13.5t-17.5 -65.5v-559h593v-62h-593v-444q0 -22 8 -39q17 -37 223 -37h22v-168q0 -133 -81 -232.5t-211 -99.5q-90 0 -159 40q-83 48 -83 132q0 42 27.5 70t69.5 28t70.5 -28t28.5 -70q0 -76 -74 -96q58 -29 114 -29q158 0 158 281v117h-362 q-55 0 -127 -6v61q8 0 26 -0.5t28 -0.5q124 0 141 38q7 15 7 48v435h-202v62h202v556q0 31 -7 47q-15 35 -170 35h-25v62h1026l55 -442h-49q-24 212 -82 285q-74 95 -274 95z" />
+<glyph unicode="&#x4fb;" horiz-adv-x="1035" d="M535 856q-112 0 -122 -2q-32 -6 -40 -31q-3 -10 -3 -55v-305h325v-62h-325v-230q0 -47 7 -62q10 -26 51 -34.5t150 -8.5v-173q0 -133 -81 -232.5t-211 -99.5q-90 0 -159 40q-83 48 -83 132q0 42 27.5 70t69.5 28t70.5 -28t28.5 -70q0 -76 -74 -96q58 -29 114 -29 q158 0 158 281v117h-103q-33 0 -279 -6v66q140 0 157 30q10 18 10 71v234h-167v62h167v293q0 52 -10 70q-16 30 -151 30h-6v67h846l38 -328h-53q-18 182 -98 229q-55 32 -254 32z" />
+<glyph unicode="&#x4fc;" horiz-adv-x="1518" d="M1336 -147q0 -136 -106 -217q-86 -66 -177 -66q-53 0 -97 33t-44 78.5t30.5 74.5t70.5 29t68.5 -29.5t28.5 -67t-21 -64.5q130 24 130 130q0 95 -106 256l-398 603l-281 -414q-19 -28 -19 -48q0 -43 38.5 -66t84.5 -24v-61q-74 6 -165 6t-305 -6v61q196 0 285 131 l323 477l-362 547q-34 51 -99 64q-24 4 -81 4h-41v62q112 -6 292.5 -6t251.5 6v-62q-128 -5 -128 -58q0 -13 268 -410l225 333q17 25 17 46q0 43 -37.5 65.5t-83.5 23.5v62q81 -6 163.5 -6t306.5 6v-62q-198 -2 -285 -128l-271 -395l452 -685q72 -109 72 -223z" />
+<glyph unicode="&#x4fd;" horiz-adv-x="1183" d="M974 74q75 -96 75 -226.5t-109 -213.5q-87 -66 -177 -66q-53 0 -97 33t-44 78.5t30.5 74.5t70.5 29t68.5 -29.5t28.5 -67t-21 -64.5q159 30 159 148q0 113 -94 237l-301 398q-192 -223 -192 -272q0 -61 62 -67v-66q-141 6 -221 6t-159 -6v66q159 0 274 128l200 256 l-212 276q-71 92 -105 110.5t-147 18.5v68q110 -8 171 -8t264 8v-68q-75 -2 -75 -52q0 -20 184 -255l134 167q33 41 33 75q0 61 -63 65v68q108 -8 192.5 -8t188.5 8v-68q-152 -3 -255 -109q-26 -27 -197 -244z" />
+<glyph unicode="&#x4fe;" horiz-adv-x="1518" d="M1450 0q-127 6 -299 6t-244 -6v61q128 5 128 59q0 10 -320 493l-281 -414q-19 -28 -19 -48q0 -43 38.5 -66t84.5 -24v-61q-74 6 -165 6t-305 -6v61q196 0 285 131l323 477l-11 16h-408v62h367l-310 469q-34 51 -99 64q-24 4 -81 4h-41v62q112 -6 292.5 -6t251.5 6v-62 q-128 -5 -128 -58q0 -13 268 -410l225 333q17 25 17 46q0 43 -37.5 65.5t-83.5 23.5v62q81 -6 163.5 -6t306.5 6v-62q-198 -2 -285 -128l-271 -395l9 -14h405v-62h-364l366 -553q35 -53 99 -66q25 -5 85 -5h38v-61z" />
+<glyph unicode="&#x4ff;" horiz-adv-x="1183" d="M1131 0q-91 6 -175.5 6t-261.5 -6v66q77 3 77 54q0 10 -208 285q-192 -223 -192 -272q0 -61 62 -67v-66q-141 6 -221 6t-159 -6v66q159 0 274 128q9 9 195 250h-325v62h287l-169 220q-71 92 -105 110.5t-147 18.5v68q110 -8 171 -8t264 8v-68q-75 -2 -75 -52 q0 -20 184 -255l134 167q33 41 33 75q0 61 -63 65v68q108 -8 192.5 -8t188.5 8v-68q-152 -3 -255 -109q-30 -30 -194 -240h323v-62h-281l242 -311q37 -47 92 -60q28 -7 95 -7h17v-66z" />
+<glyph unicode="&#x500;" horiz-adv-x="1295" d="M1228 0h-695q-174 0 -311 94q-154 106 -154 268t142 262t307 100h335v473q0 32 -7 48q-17 37 -181 37h-17v61q72 -6 133 -6h326q50 0 122 6v-61l-55 1q-122 0 -140 -38q-7 -15 -7 -48v-1051q0 -32 7 -48q16 -37 158 -37q18 0 37 1v-62zM857 141v532h-272 q-313 0 -313 -307q0 -161 75.5 -232.5t237.5 -71.5h186q53 0 69.5 13t16.5 66z" />
+<glyph unicode="&#x501;" horiz-adv-x="1159" d="M793 118q-111 -142 -295 -142t-314.5 144.5t-130.5 340.5t139.5 340.5t336.5 144.5q163 0 270 -133v464q0 88 -47 109q-20 10 -85 10q-16 0 -35 -1v67l308 23v-1300q0 -88 46 -110q20 -10 85 -10q16 0 35 1v-66l-313 -24v142zM793 253v449q0 32 -24 68q-87 129 -236 129 t-238 -138q-65 -100 -65 -300t61 -299q85 -138 224 -138q93 0 185.5 69.5t92.5 159.5z" />
+<glyph unicode="&#x502;" horiz-adv-x="1838" d="M1771 516q-6 0 -22.5 0.5t-25.5 0.5q-72 0 -96 -17.5t-24 -84.5v-169q0 -133 -124 -216q-109 -73 -249 -73q-201 0 -312 127q-112 -84 -265 -84h-120q-174 0 -311 94q-154 106 -154 268t142 262t307 100h335v473q0 32 -7 48q-17 37 -181 37h-17v61q72 -6 133 -6h326 q50 0 122 6v-61l-55 1q-122 0 -140 -38q-7 -15 -7 -48v-970q0 -100 52.5 -159.5t151.5 -59.5t151.5 59.5t52.5 159.5v188q0 52 -11 71q-18 30 -141 30h-16v66q202 -6 249.5 -6t255.5 6v-66zM857 270v403h-272q-313 0 -313 -307q0 -161 75.5 -232.5t237.5 -71.5h48q56 0 86 5 q138 24 138 203z" />
+<glyph unicode="&#x503;" horiz-adv-x="1743" d="M1685 435q-140 0 -157 -30q-11 -19 -11 -71v-69q0 -125 -105.5 -207t-256.5 -82q-234 0 -328 163q-135 -163 -324 -163t-319.5 144.5t-130.5 340.5t139.5 340.5t336.5 144.5q163 0 270 -133v464q0 88 -47 109q-20 10 -85 10q-16 0 -35 -1v67l308 23v-1236 q0 -101 58.5 -160t156.5 -59t156.5 59t58.5 160v85q0 52 -11 71q-17 30 -157 30v66q203 -6 238.5 -6t244.5 6v-66zM793 253v449q0 32 -24 68q-87 129 -236 129t-238 -138q-65 -100 -65 -300t61 -299q85 -138 224 -138q93 0 185.5 69.5t92.5 159.5z" />
+<glyph unicode="&#x504;" horiz-adv-x="1922" d="M1855 516q-6 0 -22.5 0.5t-25.5 0.5q-72 0 -96 -17.5t-24 -84.5v-169q0 -133 -124 -216q-109 -73 -249 -73t-249 73q-124 83 -124 216v129q0 101 -108 203q-123 118 -292 118h-233q-38 0 -38 30q0 16 13 22.5t170.5 18t256.5 77.5q150 100 150 257q0 111 -103 174 q-87 53 -225.5 53t-242.5 -62.5t-130 -138.5q-4 -20 -17 -58q-10 -20 -35 -20q-41 0 -39 46l9 246q2 49 35 49q26 0 112 -85q136 85 318 85t326 -64q185 -82 185 -227q0 -261 -386 -360q172 -25 295 -115q148 -108 148 -265v-132q0 -100 52.5 -159.5t151.5 -59.5t151.5 59.5 t52.5 159.5v188q0 52 -11 71q-18 30 -141 30h-16v66q202 -6 249.5 -6t255.5 6v-66z" />
+<glyph unicode="&#x505;" horiz-adv-x="1580" d="M1562 435q-140 0 -157 -30q-11 -19 -11 -71v-69q0 -125 -105.5 -207t-249.5 -82t-245 68.5t-144 188.5q-55 159 -63 169q-51 73 -198 73h-118q-55 0 -55 23t29.5 25.5t79.5 5.5q122 8 192 62q86 66 86 151.5t-58.5 121t-151 35.5t-165 -36.5t-94 -91t-36.5 -54.5 q-28 0 -28 58v122q0 37 5 47q4 9 27 9h9q25 -19 77 -54q91 54 218 54t232 -43q136 -57 136 -160q0 -170 -254 -242q199 -38 264 -164l62 -210q40 -104 186 -104q98 0 156.5 59t58.5 160v85q0 52 -11 71q-17 30 -157 30v66q203 -6 238.5 -6t244.5 6v-66z" />
+<glyph unicode="&#x506;" horiz-adv-x="1287" d="M938 0h-245v61q9 0 28 -0.5t29 -0.5q119 0 137 36q8 16 8 45v220q0 156 -98.5 246t-255.5 90h-116q-78 -1 -116.5 -1t-38.5 30q0 16 13 22.5t170.5 18t256.5 77.5q150 100 150 257q0 111 -103 174q-87 53 -225.5 53t-242.5 -62.5t-130 -138.5q-4 -20 -17 -58 q-10 -20 -35 -20q-41 0 -39 46l9 246q2 49 35 49q26 0 112 -85q136 85 318 85t326 -64q185 -82 185 -227q0 -261 -386 -360q164 -24 275 -117q128 -107 128 -267v-150q0 -69 14 -97q23 -47 173 -47h24q0 -12 -0.5 -39t-0.5 -40q0 -312 87 -376q-68 13 -125 92 q-15 20 -73.5 125.5t-100 141t-130.5 35.5z" />
+<glyph unicode="&#x507;" horiz-adv-x="1010" d="M998 66l-2 -101q0 -212 94 -231q-68 0 -115 49q-14 16 -64 94t-82 100.5t-99 22.5h-214v66q140 0 157 30q10 18 10 71v86q0 222 -251 222h-118q-55 0 -55 23t29.5 25.5t79.5 5.5q122 8 192 62q86 66 86 151.5t-58.5 121t-151 35.5t-165 -36.5t-94 -91t-36.5 -54.5 q-28 0 -28 58v122q0 37 5 47q4 9 27 9h9q25 -19 77 -54q91 54 218 54t232 -43q136 -57 136 -160q0 -170 -254 -242q268 -51 268 -240v-101q0 -53 10 -71q17 -30 157 -30z" />
+<glyph unicode="&#x508;" horiz-adv-x="2085" d="M1488 1281l-59 2q-76 0 -103 -9q-53 -18 -53 -76v-971q0 -100 52.5 -159.5t151.5 -59.5t151.5 59.5t52.5 159.5v188q0 52 -11 71q-18 30 -141 30h-16v66q202 -6 249.5 -6t255.5 6v-66q-6 0 -22.5 0.5t-25.5 0.5q-72 0 -96 -17.5t-24 -84.5v-169q0 -133 -124 -216 q-109 -73 -248.5 -73t-251.5 76q-127 86 -127 220v945q0 32 -9 49q-18 34 -153 34h-67q-188 0 -215 -35q-11 -14 -11 -63q0 -227 -12 -426q-46 -757 -354 -757q-86 0 -148 60t-62 146q0 45 30 76t74 31t74 -30t30 -75q0 -81 -77 -102q31 -14 75 -14q200 0 256 520 q21 195 21 511q0 113 -13 132q-18 27 -187 27v61h1137v-62z" />
+<glyph unicode="&#x509;" horiz-adv-x="1812" d="M281 81q186 0 186 658q0 63 -6 80q-11 30 -72 37q-10 1 -89 1v66h876v-66q-140 0 -157 -30q-10 -18 -10 -71v-507q0 -101 58.5 -160t156.5 -59t156.5 59t58.5 160v85q0 52 -11 71q-17 30 -157 30v66q203 -6 238.5 -6t244.5 6v-66q-140 0 -157 -30q-11 -19 -11 -71v-69 q0 -125 -105.5 -207t-256.5 -82t-256.5 82t-105.5 207v487q0 47 -8 65q-18 40 -149 40q-69 0 -92 -5q-55 -11 -63 -53q-3 -17 -4 -116q-6 -683 -261 -683q-70 0 -121 48.5t-51 118.5q0 88 86 88q36 0 60 -24.5t24 -61.5q0 -59 -50 -79q18 -9 48 -9z" />
+<glyph unicode="&#x50a;" horiz-adv-x="2021" d="M1413 1284l-56 2q-122 0 -140 -36q-8 -16 -8 -45v-978q0 -100 52.5 -159.5t151.5 -59.5t151.5 59.5t52.5 159.5v188q0 52 -11 71q-18 30 -141 30h-16v66q202 -6 249.5 -6t255.5 6v-66q-6 0 -22.5 0.5t-25.5 0.5q-72 0 -96 -17.5t-24 -84.5v-169q0 -133 -124 -216 q-109 -73 -248.5 -73t-252.5 77q-127 86 -127 220v417h-590v-530q0 -29 8 -45q18 -35 187 -35h10v-61q-71 6 -115 6h-358q-37 0 -108 -6v61q9 0 27.5 -0.5t28.5 -0.5q121 0 139 36q7 14 7 45v1064q0 31 -7 45q-17 34 -149 34h-46v62q70 -6 112 -6h354q45 0 115 6v-62l-55 2 q-123 0 -142 -36q-8 -16 -8 -45v-474h590v474q0 29 -8 45q-17 34 -148 34h-46v62q70 -6 112 -6h356q43 0 113 6v-62z" />
+<glyph unicode="&#x50b;" horiz-adv-x="1756" d="M1698 435q-140 0 -157 -30q-11 -19 -11 -71v-69q0 -125 -105.5 -207t-256.5 -82t-256.5 82t-105.5 207v183h-436v-281q0 -49 9 -68q16 -33 159 -33v-66q-203 6 -238 6t-244 -6v66q140 0 157 30q10 18 10 71v589q0 53 -10 71q-17 30 -157 30v66q209 -6 244 -6t238 6v-66 q-143 0 -159 -33q-9 -19 -9 -68v-242h436v242q0 53 -10 71q-17 30 -157 30v66q209 -6 243.5 -6t237.5 6v-66q-140 0 -157 -30q-10 -18 -10 -71v-507q0 -101 58.5 -160t156.5 -59t156.5 59t58.5 160v85q0 52 -11 71q-17 30 -157 30v66q203 -6 238.5 -6t244.5 6v-66z" />
+<glyph unicode="&#x50c;" horiz-adv-x="1421" d="M1353 516q-6 0 -22.5 0.5t-25.5 0.5q-72 0 -96 -17.5t-24 -84.5v-169q0 -133 -140 -215q-125 -74 -293 -74q-288 0 -486 213t-198 502.5t198.5 503.5t485.5 214q193 0 363 -169l99 144q17 25 31 25q22 0 22 -33v-503q0 -26 -29 -26t-35 32q-12 60 -47 178 q-51 127 -151 208.5t-217 81.5t-220 -50q-298 -145 -298 -613.5t322 -606.5q96 -41 187.5 -41t164 54t72.5 156v188q0 52 -11 71q-18 30 -141 30h-16v66q202 -6 249.5 -6t255.5 6v-66z" />
+<glyph unicode="&#x50d;" horiz-adv-x="1100" d="M1042 435q-140 0 -157 -30q-11 -19 -11 -71v-69q0 -125 -105.5 -207t-256.5 -82q-194 0 -326.5 144.5t-132.5 343t132 347.5t330 149q146 0 245 -74q10 7 45.5 40.5t46.5 33.5q22 0 22 -56v-218q0 -34 -1 -38q-5 -18 -26 -18t-27 26q-28 115 -108 182t-194 67 q-60 0 -120 -34q-168 -94 -168 -402.5t178 -404.5q63 -34 130 -34t128 58t61 158v88q0 52 -11 71q-17 30 -157 30v66q203 -6 238.5 -6t244.5 6v-66z" />
+<glyph unicode="&#x50e;" horiz-adv-x="1606" d="M1538 516q-6 0 -22.5 0.5t-25.5 0.5q-72 0 -96 -17.5t-24 -84.5v-169q0 -133 -124 -216q-109 -73 -248.5 -73t-259.5 83t-120 217v961q0 43 -29 56q-17 8 -66 8q-256 0 -321 -62.5t-86 -318.5h-48l36 442h1206l36 -442h-49q-22 262 -88.5 321.5t-330.5 59.5 q-46 0 -65.5 -11.5t-19.5 -53.5v-990q0 -100 52.5 -159.5t151.5 -59.5t151.5 59.5t52.5 159.5v188q0 52 -11 71q-18 30 -141 30h-16v66q202 -6 249.5 -6t255.5 6v-66z" />
+<glyph unicode="&#x50f;" horiz-adv-x="1448" d="M1390 435q-140 0 -157 -30q-11 -19 -11 -71v-69q0 -125 -105.5 -207t-256.5 -82t-256.5 82t-105.5 207v504q0 68 -23 81q-13 7 -92 7q-152 0 -193.5 -50t-52.5 -212h-53l25 328h921l26 -328h-54q-11 161 -48 207q-46 55 -198 55q-75 0 -88 -7q-23 -13 -23 -81v-520 q0 -101 58.5 -160t156.5 -59t156.5 59t58.5 160v85q0 52 -11 71q-17 30 -157 30v66q203 -6 238.5 -6t244.5 6v-66z" />
+<glyph unicode="&#x510;" horiz-adv-x="1244" d="M1177 321q0 -10 -5 -23q-135 -341 -512 -341q-212 0 -381 94q-204 113 -204 308q0 157 148 265q123 90 295 115q-386 98 -386 360q0 145 185 227q144 64 326 64t318 -85q85 85 112 85q33 0 35 -49l9 -246q2 -46 -39 -46q-25 0 -35 20q-5 20 -17 58q-26 76 -130 138.5 t-242.5 62.5t-225.5 -53q-103 -63 -103 -174q0 -157 150 -257q99 -66 279 -79q66 -4 149 -17q12 -6 12 -22q0 -30 -38.5 -30t-116 0.5t-116.5 0.5q-157 0 -255.5 -90t-98.5 -253.5t107.5 -250.5t281.5 -87q265 0 398 205q14 22 52 101q11 23 25 23q23 0 23 -24z" />
+<glyph unicode="&#x511;" horiz-adv-x="920" d="M835 276q29 0 29 -23t-27 -74q-107 -203 -340 -203q-155 0 -276 61q-151 76 -151 216q0 101 102 174q82 60 195 81q-254 72 -254 242q0 103 136 163q106 47 232.5 47t217.5 -54l77 54h9q32 0 32 -35v-165q0 -36 -28 -36q-16 0 -37 54.5t-93.5 91t-164 36.5t-151 -38.5 t-59.5 -124.5t78.5 -146.5t199.5 -67.5l64 -2q45 -5 45 -28.5t-55 -23.5h-118q-251 0 -251 -223t266 -223q140 0 216 87q28 33 57.5 96.5t48.5 63.5z" />
+<glyph unicode="&#x512;" horiz-adv-x="1554" d="M1488 1281l-59 2q-76 0 -103 -9q-53 -18 -53 -76v-1303q0 -141 -112.5 -234t-245 -93t-229.5 73t-97 190q0 49 30.5 81.5t78.5 32.5t79 -31.5t31 -78.5q0 -110 -121 -110h-4q71 -114 217 -114q99 0 156 101q47 83 47 190v1296q0 32 -9 49q-18 34 -153 34h-71 q-188 0 -215 -35q-11 -14 -11 -63q0 -227 -12 -426q-46 -757 -354 -757q-86 0 -148 60t-62 146q0 45 30 76t74 31t74 -30t30 -75q0 -81 -77 -102q31 -14 75 -14q200 0 256 520q21 195 21 511q0 113 -13 132q-18 27 -187 27v61h1137v-62z" />
+<glyph unicode="&#x513;" horiz-adv-x="1267" d="M281 81q186 0 186 658q0 63 -6 80q-11 30 -72 37q-10 1 -89 1v66h876v-66q-140 0 -157 -30q-10 -18 -10 -71v-863q0 -133 -81 -232.5t-211 -99.5q-90 0 -159 40q-83 48 -83 132q0 42 27.5 70t69.5 28t70.5 -28t28.5 -70q0 -76 -74 -96q58 -29 114 -29q158 0 158 281v863 q0 49 -7 65q-18 40 -159.5 40t-152.5 -58q-3 -17 -4 -116q-6 -683 -261 -683q-70 0 -121 48.5t-51 118.5q0 88 86 88q36 0 60 -24.5t24 -61.5q0 -59 -50 -79q18 -9 48 -9z" />
+<glyph unicode="&#x514;" horiz-adv-x="2261" d="M833 1343l301 -3q175 0 246 6v-62q-128 -5 -128 -58q0 -13 268 -410l225 333q17 25 17 46q0 43 -37.5 65.5t-83.5 23.5v62q81 -6 163.5 -6t306.5 6v-62q-198 -2 -285 -128l-271 -395l416 -629q35 -53 99 -66q25 -5 85 -5h38v-61q-127 6 -299 6t-244 -6v61q128 5 128 59 q0 10 -320 493l-281 -414q-19 -28 -19 -48q0 -43 38.5 -66t84.5 -24v-61q-74 6 -165 6t-305 -6v61q196 0 285 131l323 477l-362 547q-28 42 -68.5 53.5t-118.5 11.5q-188 0 -215 -35q-11 -14 -11 -63q0 -227 -12 -426q-46 -757 -354 -757q-86 0 -148 60t-62 146q0 45 30 76 t74 31t74 -30t30 -75q0 -81 -77 -102q31 -14 75 -14q200 0 256 520q21 195 21 511q0 113 -13 132q-18 27 -187 27v61h482z" />
+<glyph unicode="&#x515;" horiz-adv-x="1813" d="M281 81q186 0 186 658q0 63 -6 80q-11 30 -72 37q-10 1 -89 1v66h828v-68q-75 -2 -75 -52q0 -20 184 -255l134 167q33 41 33 75q0 61 -63 65v68q108 -8 192.5 -8t188.5 8v-68q-152 -3 -255 -109q-26 -27 -197 -244l287 -369q37 -47 92 -60q28 -7 95 -7h17v-66 q-91 6 -175.5 6t-261.5 -6v66q77 3 77 54q0 10 -208 285q-192 -223 -192 -272q0 -61 62 -67v-66q-141 6 -221 6t-159 -6v66q159 0 274 128l200 256l-212 276q-65 84 -104 107.5t-122 23.5t-106 -5q-55 -11 -63 -53q-3 -17 -4 -116q-6 -683 -261 -683q-70 0 -121 48.5 t-51 118.5q0 88 86 88q36 0 60 -24.5t24 -61.5q0 -59 -50 -79q18 -9 48 -9z" />
+<glyph unicode="&#x516;" horiz-adv-x="1850" d="M1782 0q-127 6 -299 6t-244 -6v61q128 5 128 59q0 12 -379 580q-129 -81 -279 -81h-265v-473q0 -32 7 -48q17 -37 181 -37h17v-61q-72 6 -133 6h-326q-50 0 -122 -6v61l55 -1q122 0 140 38q7 15 7 48v1051q0 32 -7 48q-16 37 -158 37q-18 0 -37 -1v62h625q174 0 311 -94 q154 -106 154 -272q0 -79 -41 -149l217 321q17 25 17 46q0 43 -37.5 65.5t-83.5 23.5v62q81 -6 163.5 -6t306.5 6v-62q-198 -2 -285 -128l-271 -395l416 -629q35 -53 99 -66q25 -5 85 -5h38v-61zM954 977q0 161 -75.5 232.5t-237.5 71.5h-116q-53 0 -69.5 -13t-16.5 -66 v-532h202q313 0 313 307z" />
+<glyph unicode="&#x517;" horiz-adv-x="1649" d="M1597 0q-91 6 -175.5 6t-261.5 -6v66q77 3 77 54q0 16 -148 208q-43 -153 -169.5 -252.5t-288.5 -99.5q-78 0 -158.5 42t-105.5 109v-388q0 -42 11 -59q19 -29 114 -29q19 0 41 1v-66q-169 5 -241.5 5t-238.5 -5v66q37 -2 76.5 -2t60.5 14q30 19 30 83v1002 q0 51 -10 71.5t-44 28.5q-26 6 -83 6h-30v68l307 23v-141q127 141 293 141t285.5 -107t155.5 -265l113 141q33 41 33 75q0 61 -63 65v68q108 -8 192.5 -8t188.5 8v-68q-152 -3 -255 -109q-26 -27 -197 -244l287 -369q37 -47 92 -60q28 -7 95 -7h17v-66zM855 176 q74 128 74 282t-67 281q-81 154 -218 154q-179 0 -277 -172v-478q0 -46 30 -89q91 -130 230.5 -130t227.5 152z" />
+<glyph unicode="&#x518;" horiz-adv-x="2128" d="M865 0v61q39 -1 55 -1q126 0 142 35q7 15 7 46v511h-227q-259 0 -259 -297q0 -13 0.5 -40t0.5 -40q0 -318 -330 -318q-83 0 -134.5 65t-51.5 151q0 33 24 33q18 0 24 -31q32 -175 131 -175q88 0 118 158l23 169q16 108 41 162q65 137 224 192q-138 34 -228 102 q-116 87 -116 209q0 167 180 267q151 84 333 84h1128l56 -442h-49q-24 218 -99.5 299t-288.5 81h-243q-54 0 -71 -13.5t-17 -65.5v-496h158q133 0 174 46q39 46 39 176v7h51v-513h-51v5q0 133 -41 179t-172 46h-158v-512q0 -52 17 -65.5t71 -13.5h253q236 0 326 111 q68 84 107 336h49l-84 -508h-1112zM1069 706v513q0 43 -32 56q-18 8 -69 8q-230 0 -313 -35q-144 -60 -144 -256q0 -286 339 -286h219z" />
+<glyph unicode="&#x519;" horiz-adv-x="1639" d="M1560 280q27 0 27 -29t-35 -87q-113 -188 -315 -188t-338 144t-140 341h-128q-37 0 -81 -24.5t-65 -54.5t-21.5 -121t-10.5 -131q-22 -80 -92.5 -120t-174.5 -40q-64 0 -108 45t-44 109q0 32 28 32q20 0 26 -30q21 -109 88 -109q52 0 80 99l55 198q48 121 145 164 q-240 56 -240 204q0 82 70 142q127 109 333 109q48 0 142 -15t144 -15t148 28.5t151 28.5q185 0 284 -131.5t99 -322.5q0 -29 -7.5 -37t-38.5 -8h-605q0 -184 64 -287q89 -144 242 -144q196 0 290 221q12 29 28 29zM1446 506q0 153 -46 260q-64 145 -196 145q-42 0 -90 -23 q-165 -79 -175 -382h507zM836 783q0 84 -168 84q-136 0 -190 -25q-84 -40 -84 -160q0 -89 74 -132.5t170 -43.5h122q6 93 54 199q22 49 22 78z" />
+<glyph unicode="&#x51a;" horiz-adv-x="1457" d="M1390 -19q0 -135 -52 -236q-65 -127 -189 -127t-183 130q-34 73 -56 239q-95 -30 -186 -30q-281 0 -468.5 214t-187.5 498.5t186.5 502.5t468 218t468 -217.5t186.5 -503.5q0 -209 -107 -390.5t-292 -265.5q62 -192 188 -192q138 0 180 166q9 35 21 35q23 0 23 -41z M1180 669q0 455 -262 613q-96 58 -194.5 58t-193.5 -56q-267 -157 -267 -615q0 -213 69 -375q86 -199 259 -263q-28 45 -28 103.5t47.5 107.5t115.5 49q144 0 221 -208q233 172 233 586zM726 248q-50 0 -84.5 -36.5t-34.5 -87t33 -84.5t84 -34q92 0 174 46q-36 196 -172 196 z" />
+<glyph unicode="&#x51b;" horiz-adv-x="1159" d="M1106 -414q-166 5 -243 5t-239 -5v66q37 -2 77 -2t66 16.5t26 80.5v383q-115 -154 -284 -154q-192 0 -324 144.5t-132 340t138 340.5t334 145q92 0 169.5 -54t117.5 -140l81 194h47v-1199q0 -46 12 -67q17 -29 113 -29q19 0 41 1v-66zM799 291v301q0 112 -76 206.5 t-178.5 94.5t-176.5 -72q-138 -134 -138 -362q0 -152 66 -280q81 -155 219 -155q104 0 194 82t90 185z" />
+<glyph unicode="&#x51c;" horiz-adv-x="2087" d="M2019 1284q-152 0 -195 -132l-378 -1156q-13 -39 -38.5 -39t-37.5 37l-328 1003l-323 -1001q-13 -39 -39.5 -39t-38.5 37l-395 1207q-6 19 -23 53q-23 30 -134 30h-21v62q242 -6 344.5 -6t175.5 6v-62h-5q-161 0 -161 -58q0 -15 4 -27l316 -968l275 845l-35 127 q-16 48 -52 64.5t-134 16.5v62q242 -6 344.5 -6t175.5 6v-62h-5q-160 0 -160 -58q0 -15 5 -30l316 -965l296 910q10 31 10 39q0 53 -63 81q-48 22 -109 23v62q155 -6 239 -6t174 6v-62z" />
+<glyph unicode="&#x51d;" horiz-adv-x="1571" d="M1045 -24q-28 0 -42 40l-220 608l-216 -606q-15 -42 -42.5 -42t-44.5 48l-270 757q-19 54 -62 68q-20 6 -78 6h-17v68q143 -8 170.5 -8t260.5 8v-68h-4q-121 0 -121 -56q0 -38 77 -245l137 -366l183 518q-38 105 -54 121q-29 28 -129 28v68q120 -8 189 -8l224 8v-68h-4 q-124 0 -124 -56q0 -11 11 -42l213 -595l195 546q10 28 10 46q0 98 -125 101v68q151 -8 209.5 -8t146.5 8v-68q-131 -3 -179 -136l-252 -703q-14 -40 -42 -40z" />
+<glyph unicode="&#x51e;" horiz-adv-x="1514" d="M649 1284l-57 2q-126 0 -142 -40q-6 -15 -6 -44v-447q376 0 530 217l-297 158l29 55l301 -160l102 231q53 109 145 109q53 0 92 -41t39 -95q0 -92 -90 -92q-39 0 -65 25.5t-26 56.5t10 53q-38 -16 -74 -102q-68 -160 -76 -175l303 -161l-29 -55l-306 162 q-110 -168 -319 -209v-8q117 -16 221.5 -77t150.5 -158q25 -54 39 -150l25 -181q30 -158 118 -158q99 0 131 175q6 31 24 31q24 0 24 -33q0 -86 -51.5 -151t-134.5 -65q-330 0 -330 318q0 13 1 40v40q0 136 -83 239.5t-216 103.5h-188v-559q0 -28 9 -45q17 -33 186 -33h10 v-61q-71 6 -120 6h-347q-43 0 -114 -6v61q8 0 26.5 -0.5t28.5 -0.5q125 0 141 40q6 15 6 44v1066q0 27 -7 41q-16 33 -176 33h-19v62q70 -6 119 -6h342q50 0 120 6v-62z" />
+<glyph unicode="&#x51f;" horiz-adv-x="1080" d="M409 478l-56 -7v-313q0 -41 9 -59q17 -33 150 -33h8v-66q-203 6 -237 6t-244 -6v66q7 0 23.5 -0.5t54 -0.5t63.5 16t26 77v607q0 41 -9 59q-17 33 -150 33h-8v66q208 -6 243.5 -6t237.5 6v-66q-7 0 -23.5 0.5t-54 0.5t-63.5 -16t-26 -77v-226h92q157 0 203 116l-156 63 l23 58l152 -62q21 76 34 104q55 120 175 120q70 0 116 -48t46 -118q0 -102 -102 -102q-39 0 -66.5 28.5t-27.5 62t16 60t16 29.5q0 18 -25 18q-49 0 -79 -55q-12 -22 -44 -123l160 -64l-23 -58l-158 64q-39 -93 -105 -126q134 -30 196.5 -93t62.5 -205t66 -142q40 0 57 44 q6 16 16 78q4 26 26 26q27 0 27 -34q0 -75 -27 -128q-34 -67 -101 -67q-85 0 -134 75t-53.5 158.5t-20 119.5t-70.5 71q-108 69 -236 69z" />
+<glyph unicode="&#x520;" horiz-adv-x="2082" d="M1385 793q284 0 463 -162t179 -442t-180.5 -450.5t-461.5 -170.5q-118 0 -233 59t-195 153l43 32q176 -175 392.5 -175t332.5 167q100 145 100 378.5t-102 379.5q-117 169 -338 169q-54 0 -112 -12v-578q0 -26 6 -41q13 -32 90 -39q5 0 32 -0.5t76 0.5v-61q-71 6 -117 6 h-362q-41 0 -112 -6v61q8 0 27.5 -0.5t29.5 -0.5q128 0 147 36q9 17 9 49v1053q0 32 -9 49q-18 34 -153 34h-67q-188 0 -215 -35q-11 -14 -11 -63q0 -227 -12 -426q-46 -757 -354 -757q-86 0 -148 60t-62 146q0 45 30 76t74 31t74 -30t30 -75q0 -81 -77 -102q31 -14 75 -14 q200 0 256 520q21 195 21 511q0 113 -13 132q-18 27 -187 27v61h1126v-62q-8 0 -29 0.5t-32 0.5q-121 0 -137 -39q-6 -14 -6 -41v-417q56 8 112 8z" />
+<glyph unicode="&#x521;" horiz-adv-x="1650" d="M281 81q186 0 186 658q0 63 -6 80q-11 30 -72 37q-10 1 -89 1v66h876v-66q-140 0 -157 -30q-10 -18 -10 -71v-119q157 142 274 142q152 0 233 -110.5t81 -268.5q0 -278 -189 -509.5t-462 -332.5l-14 48q220 81 360.5 288t140.5 443q0 131 -45 215q-58 107 -178 107 q-94 0 -201 -99v-393q0 -53 10 -71q17 -30 157 -30v-66q-203 6 -237.5 6t-244.5 -6v66q140 0 157 30q10 18 10 71v585q0 49 -7 65q-18 40 -149 40q-69 0 -92 -5q-55 -11 -63 -53q-3 -17 -4 -116q-6 -683 -261 -683q-70 0 -121 48.5t-51 118.5q0 88 86 88q36 0 60 -24.5 t24 -61.5q0 -59 -50 -79q18 -9 48 -9z" />
+<glyph unicode="&#x522;" horiz-adv-x="2018" d="M649 1284l-55 2q-123 0 -142 -36q-8 -16 -8 -45v-474h590v474q0 29 -8 45q-17 34 -148 34h-46v62q70 -6 112 -6h356q43 0 113 6v-64q-8 0 -29 0.5t-32 0.5q-121 0 -137 -39q-6 -14 -6 -41v-418q56 8 112 8q284 0 463 -162t179 -442t-180.5 -450.5t-461.5 -170.5 q-118 0 -233 59t-195 153l43 32q176 -175 392.5 -175t332.5 167q100 145 100 378.5t-102 379.5q-117 169 -338 169q-54 0 -112 -12v-578q0 -26 6 -41q13 -32 90 -39q5 0 32 -0.5t76 0.5v-61q-71 6 -113 6h-361q-36 0 -107 -6v61q9 0 28 -0.5t29 -0.5q119 0 137 36q8 16 8 45 v530h-590v-530q0 -29 8 -45q18 -35 187 -35h10v-61q-71 6 -115 6h-358q-37 0 -108 -6v61q9 0 27.5 -0.5t28.5 -0.5q121 0 139 36q7 14 7 45v1064q0 31 -7 45q-17 34 -149 34h-46v62q70 -6 112 -6h354q45 0 115 6v-62z" />
+<glyph unicode="&#x523;" horiz-adv-x="1594" d="M1541 400q0 -278 -189 -509.5t-462 -332.5l-14 48q220 81 360.5 288t140.5 443q0 131 -45 215q-58 107 -178 107q-94 0 -201 -99v-393q0 -53 10 -71q17 -30 157 -30v-66q-203 6 -238 6t-244 -6v66q140 0 157 30q10 18 10 71v281h-435v-281q0 -49 9 -68q16 -33 159 -33 v-66q-203 6 -238 6t-244 -6v66q140 0 157 30q10 18 10 71v589q0 53 -10 71q-17 30 -157 30v66q209 -6 244 -6t238 6v-66q-143 0 -159 -33q-9 -19 -9 -68v-242h435v242q0 53 -10 71q-17 30 -157 30v66q209 -6 244 -6t238 6v-66q-140 0 -157 -30q-10 -18 -10 -71v-119 q157 142 274 142q152 0 233 -110.5t81 -268.5z" />
+<glyph unicode="&#x524;" horiz-adv-x="1480" d="M1077 0h-245v61h78q60 0 85 11q39 17 39 69v1141h-590v-1141q0 -26 6 -41q13 -32 90 -39q6 0 33 -0.5t76 0.5v-61q-71 6 -113 6h-360q-37 0 -108 -6v61h78q60 0 85 11q39 17 39 69v1062q0 26 -6 41q-13 32 -90 38h-106v62h1345v-62q-8 0 -29 0.5t-32 0.5q-121 0 -137 -39 q-6 -14 -6 -41v-998q0 -69 14 -97q23 -47 173 -47h24q0 -12 -0.5 -39t-0.5 -40q0 -312 87 -376q-68 13 -125 92q-15 20 -73.5 125.5t-100 141t-130.5 35.5z" />
+<glyph unicode="&#x525;" horiz-adv-x="1178" d="M1120 66l-2 -101q0 -212 94 -231q-68 0 -115 49q-14 16 -64 94t-82 100.5t-99 22.5h-214v66q140 0 157 30q10 18 10 71v585q0 54 -15 74q-23 31 -194 31t-198.5 -20t-27.5 -85v-585q0 -52 11 -71q17 -30 157 -30v-66q-203 6 -237.5 6t-244.5 -6v66q140 0 157 30 q10 18 10 71v589q0 53 -10 71q-17 30 -157 30v66h1065v-66q-140 0 -157 -30q-11 -20 -11 -71v-589q0 -53 10 -71q17 -30 157 -30z" />
+<glyph unicode="&#x526;" horiz-adv-x="1482" d="M649 1284l-55 2q-123 0 -142 -36q-8 -16 -8 -45v-453q154 122 339.5 122t311 -111t125.5 -298v-260q0 -69 14 -97q23 -47 173 -47h24q0 -12 -0.5 -39t-0.5 -40q0 -312 87 -376q-68 13 -125 92q-15 20 -73.5 125.5t-100 141t-130.5 35.5h-248v62q48 -1 60 -1q118 0 136 34 q9 17 9 51v319q0 149 -90.5 232t-240.5 83t-270 -101v-538q0 -29 8 -45q18 -35 187 -35h10v-61q-71 6 -115 6h-358q-37 0 -108 -6v61q9 0 27.5 -0.5t28.5 -0.5q121 0 139 36q7 14 7 45v1064q0 31 -7 45q-17 34 -149 34h-46v62q70 -6 112 -6h354q45 0 115 6v-62z" />
+<glyph unicode="&#x527;" horiz-adv-x="1181" d="M1129 66l-2 -101q0 -212 94 -231q-68 0 -115 49q-14 16 -64 94t-82 100.5t-99 22.5h-214v66q30 -1 70.5 -1t63.5 12q33 19 33 76v519q0 227 -158 227q-130 0 -209.5 -104.5t-79.5 -238.5v-400q0 -39 10 -58q18 -33 117 -33q18 0 38 1v-66q-200 6 -236.5 6t-242.5 -6v66 q30 -1 72.5 -1t68 16.5t25.5 80.5v1115q0 87 -44 108q-21 10 -96 10h-26v67l306 23v-744h2q41 93 125 149t184 56q292 0 292 -314v-465q0 -53 10 -71q17 -30 157 -30z" />
+<glyph unicode="&#x528;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x529;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x52a;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x52b;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x52c;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x52d;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x52e;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x52f;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x6f0;" horiz-adv-x="1218" d="M798 510q-53 -164 -85 -335q-129 73 -283 196q38 166 102 344q105 -92 266 -205z" />
+<glyph unicode="&#x660;" horiz-adv-x="1218" d="M798 510q-53 -164 -85 -335q-129 73 -283 196q38 166 102 344q105 -92 266 -205z" />
+<glyph unicode="&#x6f1;" horiz-adv-x="1218" d="M672 0l5 175q0 406 -206 735q-45 72 -129 174l108 244q164 -198 236 -397.5t72 -457.5q0 -135 -47 -473h-39z" />
+<glyph unicode="&#x661;" horiz-adv-x="1218" d="M672 0l5 175q0 406 -206 735q-45 72 -129 174l108 244q164 -198 236 -397.5t72 -457.5q0 -135 -47 -473h-39z" />
+<glyph unicode="&#x6f2;" horiz-adv-x="1218" d="M711 201l-5 -201h-34q-82 346 -97 403q-64 232 -142 379t-226 332l75 229q180 -255 362 -255q118 0 166 72q35 52 51 181l36 2q9 -79 9 -199t-60.5 -198.5t-180.5 -78.5q-15 0 -78 9q42 -89 61 -144q63 -185 63 -531z" />
+<glyph unicode="&#x662;" horiz-adv-x="1218" d="M711 201l-5 -201h-34q-82 346 -97 403q-64 232 -142 379t-226 332l75 229q180 -255 362 -255q118 0 166 72q35 52 51 181l36 2q9 -79 9 -199t-60.5 -198.5t-180.5 -78.5q-15 0 -78 9q42 -89 61 -144q63 -185 63 -531z" />
+<glyph unicode="&#x6f3;" horiz-adv-x="1218" d="M1085 1343l6 -114q0 -291 -220 -291q-137 0 -182 83q-78 -128 -239 -128q72 -142 100 -252.5t28 -251t-39 -389.5h-46q0 352 -67.5 545.5t-279.5 505.5l83 268q122 -202 296.5 -202t213.5 226h36q16 -188 131 -188q119 0 142 188h37z" />
+<glyph unicode="&#x663;" horiz-adv-x="1218" d="M1085 1343l6 -114q0 -291 -220 -291q-137 0 -182 83q-78 -128 -239 -128q72 -142 100 -252.5t28 -251t-39 -389.5h-46q0 352 -67.5 545.5t-279.5 505.5l83 268q122 -202 296.5 -202t213.5 226h36q16 -188 131 -188q119 0 142 188h37z" />
+<glyph unicode="&#x664;" horiz-adv-x="1218" d="M361 188q0 97 104 222q41 49 181 181l-179 67q-128 57 -128 109q0 201 463 554l-35 -217q-267 -99 -267 -156q0 -45 165 -104t165 -95t-148 -186.5t-148 -208.5q0 -92 387 -125l-71 -229q-152 0 -287 33q-202 51 -202 155z" />
+<glyph unicode="&#x665;" horiz-adv-x="1218" d="M1014 711q0 -219 -136 -344.5t-356 -125.5q-124 0 -203 40q-104 53 -104 165q0 169 111 398q127 265 276 265q134 0 273 -132.5t139 -265.5zM930 591q0 92 -170 195t-269 103q-74 0 -119.5 -91t-45.5 -175q0 -175 289 -175q101 0 189 27q126 39 126 116z" />
+<glyph unicode="&#x666;" horiz-adv-x="1218" d="M198 1085l7 225l41 5q27 -63 52 -83q51 -42 165 -42t329 48q-41 -248 -41 -346q0 -316 109 -487q18 -28 89 -116l-43 -258q-73 48 -111 90q-137 151 -137 482q0 91 31 360q-165 -31 -217 -31q-179 0 -226.5 33t-47.5 120z" />
+<glyph unicode="&#x6f7;" horiz-adv-x="1218" d="M1064 1315l-10 -325q-321 -328 -410 -990h-16q-65 313 -161 518q-119 253 -321 434l41 358q332 -388 471 -969h12q86 616 394 974z" />
+<glyph unicode="&#x667;" horiz-adv-x="1218" d="M1064 1315l-10 -325q-321 -328 -410 -990h-16q-65 313 -161 518q-119 253 -321 434l41 358q332 -388 471 -969h12q86 616 394 974z" />
+<glyph unicode="&#x6f8;" horiz-adv-x="1218" d="M1093 378l-41 -358q-177 183 -299 443t-175 533h-8q-67 -352 -128 -519q-88 -241 -268 -463v323q309 285 418 991h21q106 -493 286 -740q72 -98 194 -210z" />
+<glyph unicode="&#x668;" horiz-adv-x="1218" d="M1093 378l-41 -358q-177 183 -299 443t-175 533h-8q-67 -352 -128 -519q-88 -241 -268 -463v323q309 285 418 991h21q106 -493 286 -740q72 -98 194 -210z" />
+<glyph unicode="&#x6f9;" horiz-adv-x="1218" d="M708 706q-122 -43 -212.5 -43t-160.5 42q-87 51 -87 155q0 69 34 173q103 315 333 315q168 0 195 -335q2 -96 8 -288q12 -236 61 -365q18 -48 77 -119l-69 -241q-112 68 -149 232q-30 132 -30 474zM548 1133q-57 0 -126 -46t-69 -100t72 -81q51 -19 101.5 -19t172.5 17 q0 229 -151 229z" />
+<glyph unicode="&#x669;" horiz-adv-x="1218" d="M708 706q-122 -43 -212.5 -43t-160.5 42q-87 51 -87 155q0 69 34 173q103 315 333 315q168 0 195 -335q2 -96 8 -288q12 -236 61 -365q18 -48 77 -119l-69 -241q-112 68 -149 232q-30 132 -30 474zM548 1133q-57 0 -126 -46t-69 -100t72 -81q51 -19 101.5 -19t172.5 17 q0 229 -151 229z" />
+<glyph unicode="&#x66d;" horiz-adv-x="1218" d="M986 1200q0 -73 -73.5 -73t-174.5 35q-20 8 -62 22q-3 -16 -14 -32l60 -28q171 -83 171 -153q0 -28 -22 -50t-50 -22q-70 0 -153 171q-8 21 -28 60q-16 -11 -32 -14l32 -92q25 -71 25 -144.5t-73 -73.5t-73 73.5t35 174.5q8 20 22 62q-16 3 -32 14l-28 -60 q-83 -171 -153 -171q-28 0 -50 22t-22 50q0 70 171 153q21 8 60 28q-11 16 -14 32l-92 -32q-71 -25 -144.5 -25t-73.5 73t73.5 73t174.5 -35q20 -8 62 -22q3 17 13 32q-20 9 -59 28q-171 83 -171 153q0 28 22 50t50 22q70 0 153 -171q8 -20 28 -59q15 10 32 13l-32 92 q-25 71 -25 144.5t73 73.5t73 -73.5t-35 -174.5q-8 -20 -22 -62q18 -3 33 -13l27 59q83 171 153 171q28 0 50 -22t22 -50q0 -70 -171 -153q-20 -8 -59 -27q10 -15 13 -33l92 32q71 25 144.5 25t73.5 -73zM637 1200q0 45 -45 45t-45 -45t45 -45t45 45z" />
+<glyph unicode="&#x6f4;" horiz-adv-x="1218" d="M709 737q-113 0 -190 56q45 -103 58.5 -174t13.5 -208t-58 -402h-40q0 620 -314 1048l85 271q44 -83 143 -237q44 -56 122 -102q30 348 227 348q123 0 231 -132l-9 -14q-126 32 -151 32q-204 0 -266 -250q111 -35 192.5 -35t145 34t129.5 114l26 -9q-65 -340 -345 -340z " />
+<glyph unicode="&#x6f5;" horiz-adv-x="1218" d="M1022 460q0 -134 -71 -252q-83 -137 -208 -137q-66 0 -117 42q-90 -76 -201.5 -76t-182 61t-70.5 168q0 155 147 379q82 124 258 329l-90 87l74 248q461 -459 461 -849zM953 385q0 164 -349 555q-96 -101 -184 -254.5t-88 -263.5q0 -156 145 -156q89 0 191 79 q59 -62 157 -62q50 0 89 27t39 75z" />
+<glyph unicode="&#x6f6;" horiz-adv-x="1218" d="M389 9q0 404 172 686q-331 0 -331 141q0 110 158 302.5t268.5 192.5t272.5 -205l-11 -12q-137 47 -233 47t-181 -25q-122 -35 -122 -108q0 -129 230 -129q172 0 396 102l-51 -216q-110 -38 -217 -138q-260 -243 -304 -638h-47z" />
+<glyph unicode="&#x2000;" horiz-adv-x="1024" />
+<glyph unicode="&#x2001;" d="M0 1606zM2048 1606z" />
+<glyph unicode="&#x2002;" horiz-adv-x="1024" />
+<glyph unicode="&#x2003;" d="M0 1606zM2048 1606z" />
+<glyph unicode="&#x2004;" horiz-adv-x="683" />
+<glyph unicode="&#x2005;" horiz-adv-x="512" />
+<glyph unicode="&#x2006;" horiz-adv-x="341" />
+<glyph unicode="&#x2007;" horiz-adv-x="1043" />
+<glyph unicode="&#x2008;" horiz-adv-x="256" />
+<glyph unicode="&#x2009;" horiz-adv-x="410" />
+<glyph unicode="&#x200a;" horiz-adv-x="128" />
+<glyph unicode="&#xfe00;" horiz-adv-x="0" />
+<glyph unicode="&#x200b;" horiz-adv-x="0" />
+<glyph unicode="&#x200c;" horiz-adv-x="0" />
+<glyph unicode="&#x200d;" horiz-adv-x="0" />
+<glyph unicode="&#x200e;" horiz-adv-x="0" />
+<glyph unicode="&#x200f;" horiz-adv-x="0" />
+<glyph unicode="&#x2010;" horiz-adv-x="512" d="M417 582q0 -41 -37 -41h-246q-39 0 -39 41t39 41h246q37 0 37 -41z" />
+<glyph unicode="&#x2011;" horiz-adv-x="512" />
+<glyph unicode="&#x2012;" horiz-adv-x="1043" d="M948 582q0 -41 -37 -41h-777q-39 0 -39 41t39 41h777q37 0 37 -41z" />
+<glyph unicode="&#x2013;" horiz-adv-x="1024" d="M929 582q0 -41 -37 -41h-758q-39 0 -39 41t39 41h758q37 0 37 -41z" />
+<glyph unicode="&#x2014;" d="M1953 582q0 -41 -37 -41h-1782q-39 0 -39 41t39 41h1782q37 0 37 -41z" />
+<glyph unicode="&#x2015;" d="M1858 582q0 -41 -37 -41h-1782q-39 0 -39 41t39 41h1782q37 0 37 -41z" />
+<glyph unicode="&#x2016;" horiz-adv-x="790" d="M246 -311q0 -41 -41 -41t-41 41v1788q0 39 41 39t41 -39v-1788zM626 -311q0 -41 -41 -41t-41 41v1788q0 39 41 39t41 -39v-1788z" />
+<glyph unicode="&#x2017;" horiz-adv-x="1024" d="M1024 -359q0 -41 -37 -41h-948q-39 0 -39 41t39 41h948q37 0 37 -41zM1024 -139q0 -41 -37 -41h-948q-39 0 -39 41t39 41h948q37 0 37 -41z" />
+<glyph unicode="&#x2018;" horiz-adv-x="536" d="M341.5 935q28.5 -29 28.5 -73.5t-29 -73t-73 -28.5q-68 0 -103 71q-26 55 -26 132q0 205 141 345q29 28 41 28q18 0 18 -21q0 -9 -22 -32q-135 -135 -135 -332q0 -15 4 -24q1 2 5 6q32 31 77 31t73.5 -29z" />
+<glyph unicode="&#x2019;" horiz-adv-x="536" d="M397 1136q0 -206 -141 -346q-29 -28 -41 -28q-18 0 -18 21q0 9 22 32q136 136 136 332q0 15 -4 24q-1 -2 -5 -6q-33 -31 -77.5 -31t-73.5 29t-29 73.5t29 73t73 28.5q69 0 103 -71q26 -55 26 -131z" />
+<glyph unicode="&#x201a;" horiz-adv-x="482" d="M231 204q123 0 123 -203.5t-137 -343.5q-28 -29 -39 -29q-19 0 -19 21q0 8 13 22q140 151 140 331q0 22 -5 29q-27 -31 -74 -31t-76 28.5t-29 73t29.5 73.5t73.5 29z" />
+<glyph unicode="&#x201b;" horiz-adv-x="536" d="M295 1134q-46 0 -83 37q-4 -9 -4 -24q0 -196 136 -332q23 -23 23 -32q0 -21 -19 -21q-11 0 -40 28q-142 140 -142 346q0 76 27 131q34 71 102 71q44 0 73 -28.5t29 -73t-28.5 -73.5t-73.5 -29z" />
+<glyph unicode="&#x201c;" horiz-adv-x="964" d="M714 927q37 37 82 37t74 -29t29 -73.5t-29.5 -73t-73.5 -28.5q-68 0 -102 71q-26 55 -26 132q0 201 142 345q28 28 38 28q20 0 20 -21q0 -8 -23 -32q-135 -135 -135 -332q0 -15 4 -24zM496 935q29 -29 29 -73.5t-29 -73t-73 -28.5q-69 0 -103 71q-27 55 -27 132 q0 203 143 345q28 28 39 28q19 0 19 -21q0 -9 -23 -32q-136 -136 -136 -332q0 -15 4 -24q1 0 7 6q35 31 78 31t72 -29z" />
+<glyph unicode="&#x201d;" horiz-adv-x="964" d="M671 1136q0 -204 -142 -346q-29 -28 -39 -28q-19 0 -19 21q0 9 23 32q135 136 135 332q0 15 -4 24q-1 0 -7 -6q-34 -31 -77.5 -31t-72.5 29t-29 73.5t29.5 73t73.5 28.5q68 0 103 -71q26 -55 26 -131zM251 1171q-37 -37 -84 -37q-44 0 -72.5 29t-28.5 73.5t28.5 73 t72.5 28.5q68 0 103 -71q27 -55 27 -131q0 -202 -143 -346q-28 -28 -38 -28q-20 0 -20 21q0 8 24 32q135 135 135 332q0 15 -4 24z" />
+<glyph unicode="&#x201e;" horiz-adv-x="857" d="M231 204q123 0 123 -203.5t-137 -343.5q-28 -29 -39 -29q-19 0 -19 21q0 8 13 22q140 151 140 331q0 22 -5 29q-27 -31 -74 -31t-76 28.5t-29 73t29.5 73.5t73.5 29zM606 204q123 0 123 -203.5t-137 -343.5q-28 -29 -39 -29q-19 0 -19 21q0 8 13 22q139 151 139 331 q0 22 -5 29q-26 -31 -73 -31t-76.5 28.5t-29.5 73t29.5 73.5t74.5 29z" />
+<glyph unicode="&#x201f;" horiz-adv-x="964" d="M643 1163q-28 -29 -73.5 -29t-82.5 37q-4 -9 -4 -24q0 -197 134 -332q24 -24 24 -32q0 -21 -20 -21q-10 0 -38 28q-143 144 -143 346q0 76 27 131q35 71 103 71q44 0 72.5 -28.5t28.5 -73t-28 -73.5zM269 1309.5q29 -28.5 29 -73t-29 -73.5t-72 -29t-78 31q-2 2 -7 6 q-4 -9 -4 -24q0 -196 136 -332q22 -23 22 -32q0 -21 -18 -21q-11 0 -40 28q-142 142 -142 346q0 76 27 131q34 71 103 71q44 0 73 -28.5z" />
+<glyph unicode="&#x2020;" horiz-adv-x="857" d="M678 962q70 0 70 -65t-70 -65q-43 0 -120.5 21.5t-109.5 25.5q4 -47 25.5 -180.5t21.5 -206.5q0 -501 -39 -783q-5 -38 -27.5 -38t-27.5 38q-38 282 -38 783q0 73 21 206.5t25 180.5q-32 -4 -109 -25.5t-121 -21.5q-71 0 -71 65t71 65q43 0 120 -21.5t110 -25.5 q-2 67 -24 211t-22 222t66 78t66 -78t-22 -222t-25 -211q33 4 110 25.5t120 21.5z" />
+<glyph unicode="&#x2021;" horiz-adv-x="857" d="M748 986q0 -63 -71 -63q-43 0 -119.5 21.5t-110.5 24.5q3 -54 25 -169t22 -183.5t-65 -68.5t-65 68.5t22 183.5t24 169q-33 -3 -110 -24.5t-120 -21.5q-72 0 -72 63q0 66 72 66q44 0 121 -21.5t109 -24.5q-2 55 -24 169.5t-22 175.5q0 75 65 75t65 -75 q0 -61 -22.5 -175.5t-24.5 -169.5q33 3 110 24.5t120 21.5q71 0 71 -66zM748 108q0 -63 -71 -63q-43 0 -119.5 21.5t-110.5 24.5q3 -54 25 -169t22 -183t-65 -68t-65 68t22 183t24 169q-33 -3 -110 -24.5t-120 -21.5q-72 0 -72 63q0 66 72 66q44 0 121 -21.5t109 -24.5 q-2 55 -24 169.5t-22 175.5q0 75 65 75t65 -75q0 -61 -22.5 -175.5t-24.5 -169.5q33 3 110 24.5t120 21.5q71 0 71 -66z" />
+<glyph unicode="&#x2022;" horiz-adv-x="738" d="M698 582q0 -137 -96 -233t-233 -96t-233 96t-96 233t96 233t233 96t233 -96t96 -233z" />
+<glyph unicode="&#x2023;" horiz-adv-x="512" d="M464 582l-399 -248v496z" />
+<glyph unicode="&#x2024;" horiz-adv-x="682" d="M420.5 -25.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5z" />
+<glyph unicode="&#x2025;" horiz-adv-x="1365" d="M420.5 -25.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM1103 -26.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5z" />
+<glyph unicode="&#x2026;" d="M1103 -26.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5zM420.5 -25.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM1786 -26.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79 t79 32.5t80 -33.5z" />
+<glyph unicode="&#x2027;" horiz-adv-x="512" d="M367 494h-222v222h222v-222z" />
+<glyph unicode="&#x2028;" horiz-adv-x="0" />
+<glyph unicode="&#x2029;" horiz-adv-x="0" />
+<glyph unicode="&#x202a;" horiz-adv-x="0" />
+<glyph unicode="&#x202b;" horiz-adv-x="0" />
+<glyph unicode="&#x202c;" horiz-adv-x="0" />
+<glyph unicode="&#x202d;" horiz-adv-x="0" />
+<glyph unicode="&#x202e;" horiz-adv-x="0" />
+<glyph unicode="&#x202f;" horiz-adv-x="256" />
+<glyph unicode="&#x2030;" horiz-adv-x="2342" d="M1331 878q281 0 281 -456t-281 -456t-281 456t281 456zM1358 1470q0 -12 -17 -37l-1037 -1536q-21 -31 -41 -31q-41 0 -41 41q0 13 19 41l920 1364q-106 -70 -270 -70t-301 99q22 -86 22 -222q0 -453 -281 -453t-281 456t281 456q149 0 223 -142q165 -149 331 -149 q235 0 389 195q23 29 43 29q41 0 41 -41zM1493 351v141q0 150 -19 217q-35 130 -143.5 130t-143.5 -128q-18 -67 -18 -216v-145q0 -345 162 -345t162 346zM493 1051q0 205 1 205v-2q-5 132 -34 197l-84 81q-22 7 -46 7q-108 0 -143 -128q-18 -67 -18 -216v-145 q0 -345 162 -345t162 346zM2011 878q281 0 281 -456t-281 -456t-281 456t281 456zM2173 351v141q0 150 -19 217q-35 130 -143.5 130t-143.5 -128q-18 -67 -18 -216v-145q0 -345 162 -345t162 346z" />
+<glyph unicode="&#x2031;" horiz-adv-x="3022" d="M2011 878q281 0 281 -456t-281 -456t-281 456t281 456zM2173 351v141q0 150 -19 217q-35 130 -143.5 130t-143.5 -128q-18 -67 -18 -216v-145q0 -345 162 -345t162 346zM1331 878q281 0 281 -456t-281 -456t-281 456t281 456zM1358 1470q0 -12 -17 -37l-1037 -1536 q-21 -31 -41 -31q-41 0 -41 41q0 13 19 41l920 1364q-106 -70 -270 -70t-301 99q22 -86 22 -222q0 -453 -281 -453t-281 456t281 456q149 0 223 -142q165 -149 331 -149q235 0 389 195q23 29 43 29q41 0 41 -41zM1493 351v141q0 150 -19 217q-35 130 -143.5 130t-143.5 -128 q-18 -67 -18 -216v-145q0 -345 162 -345t162 346zM493 1051q0 205 1 205v-2q-5 132 -34 197l-84 81q-22 7 -46 7q-108 0 -143 -128q-18 -67 -18 -216v-145q0 -345 162 -345t162 346zM2691 878q281 0 281 -456t-281 -456t-281 456t281 456zM2853 351v141q0 150 -19 217 q-35 130 -143.5 130t-143.5 -128q-18 -67 -18 -216v-145q0 -345 162 -345t162 346z" />
+<glyph unicode="&#x2032;" horiz-adv-x="506" d="M481 1458q0 -16 -9 -32l-385 -667q-14 -25 -36 -25t-22 17q0 8 6 26l239 707q18 54 94 54q40 0 76.5 -21.5t36.5 -58.5z" />
+<glyph unicode="&#x2033;" horiz-adv-x="870" d="M481 1458q0 -16 -9 -32l-385 -667q-14 -25 -36 -25t-22 17q0 8 6 26l239 707q18 54 94 54q40 0 76.5 -21.5t36.5 -58.5zM841 1458q0 -16 -9 -32l-385 -667q-14 -25 -36 -25t-22 17q0 8 6 26l239 707q18 54 94 54q40 0 76.5 -21.5t36.5 -58.5z" />
+<glyph unicode="&#x2034;" horiz-adv-x="1230" d="M481 1458q0 -16 -9 -32l-385 -667q-14 -25 -36 -25t-22 17q0 8 6 26l239 707q18 54 94 54q40 0 76.5 -21.5t36.5 -58.5zM841 1458q0 -16 -9 -32l-385 -667q-14 -25 -36 -25t-22 17q0 8 6 26l239 707q18 54 94 54q40 0 76.5 -21.5t36.5 -58.5zM1201 1458q0 -16 -9 -32 l-385 -667q-14 -25 -36 -25t-22 17q0 8 6 26l239 707q18 54 94 54q40 0 76.5 -21.5t36.5 -58.5z" />
+<glyph unicode="&#x2035;" horiz-adv-x="506" d="M481 751q0 -17 -22 -17t-36 25l-385 667q-9 16 -9 32q0 37 36.5 58.5t76.5 21.5q76 0 94 -54l239 -707q6 -18 6 -26z" />
+<glyph unicode="&#x2036;" horiz-adv-x="870" d="M481 751q0 -17 -22 -17t-36 25l-385 667q-9 16 -9 32q0 37 36.5 58.5t76.5 21.5q76 0 94 -54l239 -707q6 -18 6 -26zM841 751q0 -17 -22 -17t-36 25l-385 667q-9 16 -9 32q0 37 36.5 58.5t76.5 21.5q76 0 94 -54l239 -707q6 -18 6 -26z" />
+<glyph unicode="&#x2037;" horiz-adv-x="1230" d="M481 751q0 -17 -22 -17t-36 25l-385 667q-9 16 -9 32q0 37 36.5 58.5t76.5 21.5q76 0 94 -54l239 -707q6 -18 6 -26zM841 751q0 -17 -22 -17t-36 25l-385 667q-9 16 -9 32q0 37 36.5 58.5t76.5 21.5q76 0 94 -54l239 -707q6 -18 6 -26zM1201 751q0 -17 -22 -17t-36 25 l-385 667q-9 16 -9 32q0 37 36.5 58.5t76.5 21.5q76 0 94 -54l239 -707q6 -18 6 -26z" />
+<glyph unicode="&#x2038;" horiz-adv-x="722" d="M697 -395h-138l-199 395l-197 -395h-138l336 673z" />
+<glyph unicode="&#x2039;" horiz-adv-x="717" d="M528 5q0 -27 -48 -27q-20 0 -36 37l-30 68q-79 165 -266 268q-29 14 -86 45q-15 10 -15 25t15 25l87 46q186 100 265 266l26 65q20 41 54 41t34 -27q0 -3 -3 -10q-123 -284 -344 -406q223 -124 344 -406q3 -7 3 -10z" />
+<glyph unicode="&#x203a;" horiz-adv-x="717" d="M670 421q0 -15 -15 -25l-87 -45q-188 -104 -266 -268l-26 -64q-20 -41 -46 -41q-41 0 -41 27q0 5 2 10q116 279 345 406q-227 125 -345 406q-2 4 -2 10q0 27 34 27t50 -36.5t29 -69.5q78 -165 265 -266q31 -14 88 -46q15 -10 15 -25z" />
+<glyph unicode="&#x203b;" horiz-adv-x="1591" d="M1321 100q0 -44 -43 -44q-15 0 -25 10l-458 458l-456 -456q-11 -11 -27 -11q-42 0 -42 42q0 16 11 27l457 456l-457 456q-11 11 -11 27q0 42 42 42q16 0 27 -11l456 -456l458 458q10 10 25 10q43 0 43 -44q0 -14 -10 -24l-458 -458l458 -458q10 -10 10 -24zM875 1109.5 q34 -33.5 34 -80t-33.5 -79.5t-80.5 -33t-80.5 33t-33.5 79.5t34 80t80 33.5t80 -33.5zM1356 582q0 -46 -33.5 -80t-80 -34t-79.5 33.5t-33 80.5t33 80.5t79.5 33.5t80 -34t33.5 -80zM460 582q0 -47 -33 -80.5t-79.5 -33.5t-80 34t-33.5 80t33.5 80t80 34t79.5 -33.5 t33 -80.5zM875.5 214q33.5 -33 33.5 -79.5t-34 -80t-80 -33.5t-80 33.5t-34 80t33.5 79.5t80.5 33t80.5 -33z" />
+<glyph unicode="&#x203c;" horiz-adv-x="1142" d="M418 185q32 -32 32 -76.5t-32 -76.5t-77 -32t-77 32t-32 76.5t32 76.5t77 32t77 -32zM341 383q-25 0 -29 47l-79 932v10q0 40 30 66q34 28 78 28t78 -28q30 -26 30 -66v-10l-79 -934q-4 -45 -29 -45zM878 185q32 -32 32 -76.5t-32 -76.5t-77 -32t-77 32t-32 76.5t32 76.5 t77 32t77 -32zM801 383q-25 0 -29 47l-79 932v10q0 40 30 66q34 28 78 28t78 -28q30 -26 30 -66v-10l-79 -934q-4 -45 -29 -45z" />
+<glyph unicode="&#x203d;" horiz-adv-x="909" d="M822 1167q0 -124 -98 -200q-239 -185 -252 -347l-16 -192q-4 -45 -29 -45t-29 47l-67 792q-1 7 -1 15q0 40 28.5 64.5t68.5 24.5t68.5 -24.5t28.5 -64.5q0 -9 -1 -15l-30 -361q37 66 90 124q69 75 69 193.5t-51 169.5t-172 51q-187 0 -268 -139h2q112 0 112 -93 q0 -94 -94 -94t-94 98q0 126 115 204q101 69 245.5 69t247.5 -59q127 -73 127 -218zM536 109q0 -44 -32.5 -76.5t-76.5 -32.5t-76.5 32.5t-32.5 76.5t32.5 76t76.5 32t76.5 -32t32.5 -76z" />
+<glyph unicode="&#x203e;" horiz-adv-x="1478" d="M1478 1550h-1478v56h1478v-56z" />
+<glyph unicode="&#x203f;" horiz-adv-x="896" d="M985 -224q-192 -218 -446.5 -218t-359.5 218h42q97 -134 333.5 -134t389.5 134h41z" />
+<glyph unicode="&#x2040;" horiz-adv-x="896" d="M943 1125q-96 135 -333 135t-389 -135h-42q192 218 446.5 218t359.5 -218h-42z" />
+<glyph unicode="&#x2041;" horiz-adv-x="952" d="M903 1086l-473 -946l267 -535h-138l-199 395l-197 -395h-138l740 1481h138z" />
+<glyph unicode="&#x2042;" horiz-adv-x="1876" d="M1305 931l-45 -85l-297 197l25 -352h-99l25 352l-293 -197l-49 85l317 155l-317 154l49 86l293 -198l-25 352h98l-24 -352l293 198l49 -86l-317 -154zM1704 240l-50 -85l-292 197l24 -352h-98l24 352l-292 -197l-49 85l317 155l-317 154l49 86l292 -197l-24 352h98 l-24 -353l292 198l50 -85l-318 -155zM906 240l-49 -85l-293 197l25 -352h-99l25 352l-293 -197l-49 85l317 155l-317 154l49 86l293 -197l-25 352h99l-25 -353l293 198l49 -85l-317 -155z" />
+<glyph unicode="&#x2043;" horiz-adv-x="666" d="M555 494h-444v222h444v-222z" />
+<glyph unicode="&#x2044;" horiz-adv-x="0" d="M576 1416q0 -13 -6 -22l-1071 -1649q-11 -17 -35 -17q-40 0 -40 40q0 13 6 22l1071 1649q11 17 35 17q40 0 40 -40z" />
+<glyph unicode="&#x2045;" horiz-adv-x="682" d="M571 -309q0 -41 -68 -41h-391v1864h391q68 0 68 -40.5t-68 -40.5h-309v-810h340q37 0 37 -41t-37 -41h-340v-809h309q68 0 68 -41z" />
+<glyph unicode="&#x2046;" horiz-adv-x="682" d="M570 -350h-391q-68 0 -68 41t68 41h309v809h-340q-37 0 -37 41t37 41h340v810h-309q-68 0 -68 40.5t68 40.5h391v-1864z" />
+<glyph unicode="&#x2047;" horiz-adv-x="1709" d="M1304 185q32 -32 32 -76.5t-32 -76.5t-77 -32t-77 32t-32 76.5t32 76.5t77 32t77 -32zM1543 1350q79 -73 79 -191.5t-98 -191.5q-270 -200 -270 -457v-72q0 -55 -26 -55t-26 49v92q0 267 181 461q69 74 69 182t-28 152q-49 80 -195 80q-187 0 -268 -139q114 0 114 -93.5 t-94 -93.5t-94 102.5t95.5 185.5t252.5 83q207 0 308 -94zM504 185q32 -32 32 -76.5t-32 -76.5t-77 -32t-77 32t-32 76.5t32 76.5t77 32t77 -32zM743 1350q79 -73 79 -191.5t-98 -191.5q-270 -200 -270 -457v-72q0 -55 -26 -55t-26 49v92q0 267 181 461q69 74 69 182 t-28 152q-49 80 -195 80q-187 0 -268 -139q114 0 114 -93.5t-94 -93.5t-94 102.5t95.5 185.5t252.5 83q207 0 308 -94z" />
+<glyph unicode="&#x2048;" horiz-adv-x="1552" d="M504 185q32 -32 32 -76.5t-32 -76.5t-77 -32t-77 32t-32 76.5t32 76.5t77 32t77 -32zM743 1350q79 -73 79 -191.5t-98 -191.5q-270 -200 -270 -457v-72q0 -55 -26 -55t-26 49v92q0 267 181 461q69 74 69 182t-28 152q-49 80 -195 80q-187 0 -268 -139q114 0 114 -93.5 t-94 -93.5t-94 102.5t95.5 185.5t252.5 83q207 0 308 -94zM1288 185q32 -32 32 -76.5t-32 -76.5t-77 -32t-77 32t-32 76.5t32 76.5t77 32t77 -32zM1211 383q-25 0 -29 47l-79 932v10q0 40 30 66q34 28 78 28t78 -28q30 -26 30 -66v-10l-79 -934q-4 -45 -29 -45z" />
+<glyph unicode="&#x2049;" horiz-adv-x="1607" d="M1202 185q32 -32 32 -76.5t-32 -76.5t-77 -32t-77 32t-32 76.5t32 76.5t77 32t77 -32zM1441 1350q79 -73 79 -191.5t-98 -191.5q-270 -200 -270 -457v-72q0 -55 -26 -55t-26 49v92q0 267 181 461q69 74 69 182t-28 152q-49 80 -195 80q-187 0 -268 -139q114 0 114 -93.5 t-94 -93.5t-94 102.5t95.5 185.5t252.5 83q207 0 308 -94zM418 185q32 -32 32 -76.5t-32 -76.5t-77 -32t-77 32t-32 76.5t32 76.5t77 32t77 -32zM341 383q-25 0 -29 47l-79 932v10q0 40 30 66q34 28 78 28t78 -28q30 -26 30 -66v-10l-79 -934q-4 -45 -29 -45z" />
+<glyph unicode="&#x204a;" horiz-adv-x="1024" d="M354 515q-119 0 -288 64q22 38 69.5 73t87.5 35q10 0 22 -4q184 -62 259 -62q157 0 273 192l181 104l-434 -1024q-9 -22 -47 -46t-65 -28l311 846q-189 -150 -369 -150z" />
+<glyph unicode="&#x204b;" horiz-adv-x="964" d="M927 933q0 -358 -447 -358h-5v-982h-69v1642h-177v-1642h-68v1642h-125v51h467q184 0 297 -83q127 -93 127 -270z" />
+<glyph unicode="&#x204c;" horiz-adv-x="1455" d="M1233 0h-419q-248 0 -420 172t-172 420t172 420t420 172h419v-1184zM1164 99v987h-350v-987h350z" />
+<glyph unicode="&#x204d;" horiz-adv-x="1455" d="M1233 592q0 -248 -172 -420t-420 -172h-419v1184h419q248 0 420 -172t172 -420zM641 99v987h-350v-987h350z" />
+<glyph unicode="&#x204e;" horiz-adv-x="987" d="M877 248l-303 -66q2 6 3 15q0 41 -29 67l284 125zM494 283q-25 0 -43 -11l-31 308h148l-31 -308q-18 11 -43 11zM777 -62l-120 -87l-157 267q51 6 70 51zM440 264q-29 -25 -29 -62q0 -10 2 -20l-303 66l46 141zM487 118l-156 -267l-120 87l206 231q20 -45 70 -51z" />
+<glyph unicode="&#x204f;" horiz-adv-x="569" d="M367 851q32 -32 32 -76.5t-32 -76.5t-77 -32t-76.5 31.5t-31.5 76.5t32 77t76.5 32t76.5 -32zM370 184.5q29 -32.5 29 -76t-28.5 -76t-76 -32.5t-73.5 23q0 -218 131 -369q14 -16 14 -27q0 -22 -20 -22q-31 0 -100.5 124t-69.5 277q0 211 114 211q51 0 80 -32.5z" />
+<glyph unicode="&#x2050;" horiz-adv-x="1476" d="M739 1028q-316 0 -481 -179h-57q201 290 538 290t536 -290h-55q-165 179 -481 179zM1275 425q-200 -291 -536.5 -291t-537.5 291h57q165 -178 480.5 -178t481.5 178h55z" />
+<glyph unicode="&#x2051;" horiz-adv-x="987" d="M877 248l-303 -66q2 6 3 15q0 41 -29 67l284 125zM494 283q-25 0 -43 -11l-31 308h148l-31 -308q-18 11 -43 11zM777 -62l-120 -87l-157 267q51 6 70 51zM440 264q-29 -25 -29 -62q0 -10 2 -20l-303 66l46 141zM487 118l-156 -267l-120 87l206 231q20 -45 70 -51z M877 1148l-303 -66q2 6 3 15q0 41 -29 67l284 125zM494 1183q-25 0 -43 -11l-31 308h148l-31 -308q-18 11 -43 11zM777 838l-120 -87l-157 267q51 6 70 51zM440 1164q-29 -25 -29 -62q0 -10 2 -20l-303 66l46 141zM487 1018l-156 -267l-120 87l206 231q20 -45 70 -51z" />
+<glyph unicode="&#x2052;" horiz-adv-x="1520" d="M1336 1416q0 -13 -6 -22l-1071 -1649q-11 -17 -35 -17q-40 0 -40 40q0 13 6 22l1071 1649q11 17 35 17q40 0 40 -40zM468 1295q32 -32 32 -76.5t-32 -76.5t-77 -32t-77 32t-32 76.5t32 76.5t77 32t77 -32zM1206 42q32 -32 32 -76.5t-32 -76.5t-77 -32t-77 32t-32 76.5 t32 76.5t77 32t77 -32z" />
+<glyph unicode="&#x2053;" horiz-adv-x="1058" d="M1021 659q0 -111 -71.5 -195t-175.5 -84t-251.5 116.5t-233.5 116.5q-136 0 -179 -131q-6 -29 -15.5 -65t-27.5 -36q-30 0 -30 57q0 109 72.5 193.5t176 84.5t251 -117t233.5 -117q155 0 192 184q9 49 31 49q28 0 28 -56z" />
+<glyph unicode="&#x2054;" horiz-adv-x="896" d="M943 -442q-96 135 -333 135t-389 -135h-42q192 218 446.5 218t359.5 -218h-42z" />
+<glyph unicode="&#x2055;" horiz-adv-x="660" d="M607 468q0 -27 -18.5 -48t-37.5 -21t-51.5 27t-53.5 27q-32 0 -32 -34q0 -28 65 -37t65 -61q0 -26 -20 -44.5t-46 -18.5q-45 0 -53.5 67.5t-44.5 67.5q-41 0 -41 -39q0 -14 27 -48t27 -57q0 -51 -64.5 -51t-64.5 51q0 18 28 50t28 55q0 39 -39 39q-34 0 -43 -67.5 t-62 -67.5q-23 0 -43 21.5t-20 44.5q0 52 66 58.5t66 38.5t-32 32q-22 0 -53.5 -25.5t-46.5 -25.5q-60 0 -60 63t57 63q21 0 55.5 -25t48.5 -25q34 0 34 29q0 36 -69 44t-69 55q0 24 21 45t45 21q49 0 60 -65t43 -65q38 0 38 37q0 19 -26.5 51t-26.5 51.5t21.5 36.5t46.5 17 t44.5 -18t19.5 -40.5t-27 -53t-27 -47.5q0 -39 43 -39q29 0 37.5 66t61.5 66q60 0 60 -60q0 -54 -65 -59.5t-65 -36.5q0 -37 31 -37q19 0 51 27.5t55 27.5q56 0 56 -63zM283 465q0 -45 47 -45t47 46.5t-44 46.5q-50 0 -50 -48z" />
+<glyph unicode="&#x2056;" horiz-adv-x="1052" d="M961 1079.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5zM961 191.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5zM249 635.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79 t79 32.5t80 -33.5z" />
+<glyph unicode="&#x2057;" horiz-adv-x="1590" d="M1201 1458q0 -16 -9 -32l-385 -667q-14 -25 -36 -25t-22 17q0 8 6 26l239 707q18 54 94 54q40 0 76.5 -21.5t36.5 -58.5zM1561 1458q0 -16 -9 -32l-385 -667q-14 -25 -36 -25t-22 17q0 8 6 26l239 707q18 54 94 54q40 0 76.5 -21.5t36.5 -58.5zM481 1458q0 -16 -9 -32 l-385 -667q-14 -25 -36 -25t-22 17q0 8 6 26l239 707q18 54 94 54q40 0 76.5 -21.5t36.5 -58.5zM841 1458q0 -16 -9 -32l-385 -667q-14 -25 -36 -25t-22 17q0 8 6 26l239 707q18 54 94 54q40 0 76.5 -21.5t36.5 -58.5z" />
+<glyph unicode="&#x2058;" horiz-adv-x="1364" d="M1273 635.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5zM761 1079.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5zM761 191.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79 t79 32.5t80 -33.5zM249 635.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5z" />
+<glyph unicode="&#x2059;" horiz-adv-x="1364" d="M1273 1079.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5zM1273 191.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5zM761 635.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79 t79 32.5t80 -33.5zM249 1079.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5zM249 191.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5z" />
+<glyph unicode="&#x205a;" horiz-adv-x="340" d="M249 1356.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5zM249 148.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5z" />
+<glyph unicode="&#x205b;" horiz-adv-x="1564" d="M861 1572.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5zM1473 660.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5zM249 660.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79 t79 32.5t80 -33.5zM861 -250.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5z" />
+<glyph unicode="&#x205c;" horiz-adv-x="1364" d="M1118 992.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5zM1118 279.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5zM1307 557q0 -41 -37 -41h-547v-545q0 -39 -41 -39t-41 39v545h-545 q-39 0 -39 41t39 41h545v547q0 37 41 37t41 -37v-547h547q37 0 37 -41zM404 992.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5zM404 279.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5z" />
+<glyph unicode="&#x205d;" horiz-adv-x="340" d="M249 1356.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5zM249 148.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5zM249 752.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79 t79 32.5t80 -33.5z" />
+<glyph unicode="&#x205e;" horiz-adv-x="340" d="M249 1572.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5zM249 964.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5zM249 357.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79 t79 32.5t80 -33.5zM249 -250.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5z" />
+<glyph unicode="&#x205f;" horiz-adv-x="455" />
+<glyph unicode="&#x2060;" horiz-adv-x="0" />
+<glyph unicode="&#x2061;" horiz-adv-x="0" />
+<glyph unicode="&#x2062;" horiz-adv-x="0" />
+<glyph unicode="&#x2063;" horiz-adv-x="0" />
+<glyph unicode="&#x2064;" horiz-adv-x="0" />
+<glyph unicode="&#x2065;" horiz-adv-x="0" />
+<glyph unicode="&#x2066;" horiz-adv-x="0" />
+<glyph unicode="&#x2067;" horiz-adv-x="0" />
+<glyph unicode="&#x2068;" horiz-adv-x="0" />
+<glyph unicode="&#x2069;" horiz-adv-x="0" />
+<glyph unicode="&#x206a;" horiz-adv-x="0" />
+<glyph unicode="&#x206b;" horiz-adv-x="0" />
+<glyph unicode="&#x206c;" horiz-adv-x="0" />
+<glyph unicode="&#x206d;" horiz-adv-x="0" />
+<glyph unicode="&#x206e;" horiz-adv-x="0" />
+<glyph unicode="&#x206f;" horiz-adv-x="0" />
+<glyph unicode="&#x2070;" horiz-adv-x="801" d="M676 1362q63 -111 63 -325.5t-59 -321.5q-91 -166 -273.5 -166t-273.5 144q-71 112 -71 331t58 328q91 170 278 170t278 -160zM590 964v173q0 335 -190 335t-190 -336q0 -27 0.5 -80.5t0.5 -80.5q0 -158 25 -238q42 -138 164 -138q190 0 190 365z" />
+<glyph unicode="&#x2071;" horiz-adv-x="441" d="M297 1437q0 -39 -28 -67t-67 -28t-67.5 28t-28.5 67t28.5 67t67.5 28t67 -28t28 -67zM242 583h-40q-17 0 -162 -4v64l43 -1q44 0 57 5q24 10 24 46v387q0 54 -35 65q-9 2 -83 2v65l243 17v-544q0 -35 43 -42q5 0 22.5 -0.5t47.5 0.5v-64q-152 4 -160 4z" />
+<glyph unicode="&#x2072;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2073;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2074;" horiz-adv-x="801" d="M757 808h-156v-120q0 -18 5 -27q10 -19 134 -19h13v-64q-78 5 -105 5h-236q-25 0 -103 -5v64q53 -1 79.5 -1t40.5 4q32 9 32 43v120h-416v56l481 653q15 21 40 21q35 0 35 -47v-620h156v-63zM470 871v476l-352 -476h352z" />
+<glyph unicode="&#x2075;" horiz-adv-x="801" d="M633.5 1089q88.5 -92 88.5 -225t-105.5 -224t-232 -91t-216 75.5t-89.5 187.5q0 84 86 84q36 0 62.5 -21.5t26.5 -58t-30 -58.5q-27 -18 -60 -18h-9q26 -60 86.5 -96.5t127.5 -36.5q103 0 159 86q35 54 35 178t-26 176q-42 84 -126.5 84t-152.5 -55l-67 -56q-32 0 -32 38 v430q0 33 25 33q9 0 22 -4q128 -40 197.5 -40t223.5 43q7 2 9 2q25 0 25 -26q0 -14 -30 -44q-109 -110 -281 -110q-60 0 -122 15v-235q80 59 198.5 59t207 -92z" />
+<glyph unicode="&#x2076;" horiz-adv-x="801" d="M641 1099q94 -92 94 -228t-97 -229t-235 -93q-180 0 -267 158q-69 125 -69 321q0 143 63 264.5t182 184.5q85 45 172.5 45t150 -39.5t62.5 -118t-82 -78.5t-82 74q0 65 73 71q-42 37 -107.5 37t-118.5 -30q-146 -82 -152 -354q67 107 193 107t220 -92zM575 836v69 q0 234 -163 234q-89 0 -135.5 -71.5t-46.5 -165.5q0 -136 27 -196q45 -99 146 -99q172 0 172 229z" />
+<glyph unicode="&#x2077;" horiz-adv-x="801" d="M746 1472q0 -26 -16 -46l-212 -262q-74 -91 -97 -253q-14 -92 -14 -276q0 -86 -82 -86t-82 86q0 256 194 527q1 2 161 203h-373q-65 0 -77.5 -7t-34.5 -128h-60l56 306h56q2 -17 9 -24q21 -20 182 -20h390v-20z" />
+<glyph unicode="&#x2078;" horiz-adv-x="801" d="M735 821q0 -123 -104 -197.5t-229.5 -74.5t-230 66t-104.5 183q0 157 213 257q-171 93 -171 226q0 108 90.5 174.5t200.5 66.5t195 -53q99 -61 99 -163q0 -129 -178 -216q219 -115 219 -269zM605 1306q0 73 -64 117.5t-137.5 44.5t-140 -34.5t-66.5 -93.5t75 -108 q31 -20 187 -109q146 77 146 183zM165 798q0 -86 73.5 -138.5t160 -52.5t163 44.5t76.5 120t-114 144.5q-49 30 -187 104q-172 -86 -172 -222z" />
+<glyph unicode="&#x2079;" horiz-adv-x="801" d="M735 1046q0 -115 -39.5 -225t-138.5 -191t-224 -81q-90 0 -151 34q-76 42 -76 125q0 77 81 77q34 0 58.5 -20.5t24.5 -53.5q0 -60 -66 -72q47 -32 114 -32t119 30q132 77 137 352q-67 -108 -193.5 -108t-220 92.5t-93.5 229.5t99 228t240 91q178 0 262 -158 q67 -125 67 -318zM391 934q90 0 135.5 72t45.5 185t-25 173q-44 104 -142 104t-147 -82q-30 -50 -30 -159v-71q0 -222 163 -222z" />
+<glyph unicode="&#x207a;" horiz-adv-x="1212" d="M1085 976q0 -37 -38 -37h-404v-402q0 -40 -37 -40t-37 40v402h-402q-40 0 -40 37t40 37h402v404q0 38 37 38t37 -38v-404h404q38 0 38 -37z" />
+<glyph unicode="&#x207b;" horiz-adv-x="1212" d="M1085 976q0 -37 -38 -37h-880q-40 0 -40 37t40 37h880q38 0 38 -37z" />
+<glyph unicode="&#x207c;" horiz-adv-x="1212" d="M1047 1208q38 0 38 -37.5t-38 -37.5h-880q-40 0 -40 37.5t40 37.5h880zM1047 819q38 0 38 -37.5t-38 -37.5h-880q-40 0 -40 37.5t40 37.5h880z" />
+<glyph unicode="&#x207d;" horiz-adv-x="531" d="M450 368q0 -22 -24 -22q-11 0 -41 22q-168 122 -242.5 263t-74.5 345t74.5 345t242.5 263q30 22 41 22q24 0 24 -22q0 -10 -21 -29q-222 -196 -222 -579t222 -579q21 -19 21 -29z" />
+<glyph unicode="&#x207e;" horiz-adv-x="531" d="M463 976q0 -204 -74.5 -345t-242.5 -263q-30 -22 -41 -22q-24 0 -24 22q0 10 21 29q222 196 222 579t-222 579q-21 19 -21 29q0 22 24 22q11 0 41 -22q168 -122 242.5 -263t74.5 -345z" />
+<glyph unicode="&#x207f;" horiz-adv-x="905" d="M866 579q-150 4 -188 4t-193 -4v64q32 -1 59.5 -1t46.5 7.5t19 41.5v345q0 141 -108 141q-89 0 -148 -64.5t-59 -153.5v-266q0 -45 52 -50q13 -1 31 -1t41 1v-64q-150 4 -187 4t-192 -4v64q32 -1 61 -1t46 8t17 47v381q0 56 -38 67q-8 2 -53 2h-33v65l245 17v-123 q80 122 227 122q229 0 229 -220v-333q0 -33 90 -33q16 0 35 1v-64z" />
+<glyph unicode="&#x2080;" horiz-adv-x="801" d="M676 514q63 -111 63 -325.5t-59 -321.5q-91 -166 -273.5 -166t-273.5 144q-71 112 -71 331t58 328q91 170 278 170t278 -160zM590 116v173q0 335 -190 335t-190 -336q0 -27 0.5 -80.5t0.5 -80.5q0 -158 25 -238q42 -138 164 -138q190 0 190 365z" />
+<glyph unicode="&#x2081;" horiz-adv-x="801" d="M142 -206l84 -2q93 0 106 24q5 9 5 30v708q-80 -31 -204 -31v62q193 0 290 89h12q38 0 38 -45v-786q0 -18 5 -28q11 -21 175 -21h15v-64q-67 5 -105 5h-316q-38 0 -105 -5v64z" />
+<glyph unicode="&#x2082;" horiz-adv-x="801" d="M79 -269v22q0 26 21 47l300 296q160 158 160 299q0 93 -53.5 154.5t-145.5 61.5q-136 0 -195 -119q98 -2 98 -83q0 -36 -27 -59.5t-64 -23.5q-94 0 -94 87q0 113 93.5 187t219.5 74t228 -74t102 -205q0 -82 -60 -158q-33 -42 -125 -121l-300 -259h300q82 0 95 9.5 t33 125.5h59l-46 -261h-599z" />
+<glyph unicode="&#x2083;" horiz-adv-x="801" d="M735 -22q0 -124 -106.5 -200.5t-229.5 -76.5t-218 54q-114 64 -114 173q0 90 97 90q40 0 69 -24t29 -63q0 -82 -93 -87q74 -85 219 -85q86 0 126 64t40 155q0 220 -176 220q-72 0 -72 -1h3q-47 3 -47 27t91 29.5t133.5 67.5t42.5 153q0 146 -140 146q-122 0 -187 -67 q86 -7 86 -79q0 -80 -89.5 -80t-89.5 81q0 96 100 152q83 47 188 47t192 -47q105 -57 105 -154q0 -81 -55.5 -145.5t-137.5 -96.5q97 -26 165.5 -93t68.5 -160z" />
+<glyph unicode="&#x2084;" horiz-adv-x="801" d="M757 -40h-156v-120q0 -18 5 -27q10 -19 134 -19h13v-64q-78 5 -105 5h-236q-25 0 -103 -5v64q53 -1 79.5 -1t40.5 4q32 9 32 43v120h-416v56l481 653q15 21 40 21q35 0 35 -47v-620h156v-63zM470 23v476l-352 -476h352z" />
+<glyph unicode="&#x2085;" horiz-adv-x="801" d="M633.5 241q88.5 -92 88.5 -225t-105.5 -224t-232 -91t-216 75.5t-89.5 187.5q0 84 86 84q36 0 62.5 -21.5t26.5 -58t-30 -58.5q-27 -18 -60 -18h-9q26 -60 86.5 -96.5t127.5 -36.5q103 0 159 86q35 54 35 178t-26 176q-42 84 -126.5 84t-152.5 -55l-67 -56q-32 0 -32 38 v430q0 33 25 33q9 0 22 -4q128 -40 197.5 -40t223.5 43q7 2 9 2q25 0 25 -26q0 -14 -30 -44q-109 -110 -281 -110q-60 0 -122 15v-235q80 59 198.5 59t207 -92z" />
+<glyph unicode="&#x2086;" horiz-adv-x="801" d="M641 251q94 -92 94 -228t-97 -229t-235 -93q-180 0 -267 158q-69 125 -69 321q0 143 63 264.5t182 184.5q85 45 172.5 45t150 -39.5t62.5 -118t-82 -78.5t-82 74q0 65 73 71q-42 37 -107.5 37t-118.5 -30q-146 -82 -152 -354q67 107 193 107t220 -92zM575 -12v69 q0 234 -163 234q-89 0 -135.5 -71.5t-46.5 -165.5q0 -136 27 -196q45 -99 146 -99q172 0 172 229z" />
+<glyph unicode="&#x2087;" horiz-adv-x="801" d="M746 624q0 -26 -16 -46l-212 -262q-74 -91 -97 -253q-14 -92 -14 -276q0 -86 -82 -86t-82 86q0 256 194 527q1 2 161 203h-373q-65 0 -77.5 -7t-34.5 -128h-60l56 306h56q2 -17 9 -24q21 -20 182 -20h390v-20z" />
+<glyph unicode="&#x2088;" horiz-adv-x="801" d="M735 -27q0 -123 -104 -197.5t-229.5 -74.5t-230 66t-104.5 183q0 157 213 257q-171 93 -171 226q0 108 90.5 174.5t200.5 66.5t195 -53q99 -61 99 -163q0 -129 -178 -216q219 -115 219 -269zM605 458q0 73 -64 117.5t-137.5 44.5t-140 -34.5t-66.5 -93.5t75 -108 q31 -20 187 -109q146 77 146 183zM165 -50q0 -86 73.5 -138.5t160 -52.5t163 44.5t76.5 120t-114 144.5q-49 30 -187 104q-172 -86 -172 -222z" />
+<glyph unicode="&#x2089;" horiz-adv-x="801" d="M735 198q0 -115 -39.5 -225t-138.5 -191t-224 -81q-90 0 -151 34q-76 42 -76 125q0 77 81 77q34 0 58.5 -20.5t24.5 -53.5q0 -60 -66 -72q47 -32 114 -32t119 30q132 77 137 352q-67 -108 -193.5 -108t-220 92.5t-93.5 229.5t99 228t240 91q178 0 262 -158 q67 -125 67 -318zM391 86q90 0 135.5 72t45.5 185t-25 173q-44 104 -142 104t-147 -82q-30 -50 -30 -159v-71q0 -222 163 -222z" />
+<glyph unicode="&#x208a;" horiz-adv-x="1212" d="M1085 128q0 -37 -38 -37h-404v-402q0 -40 -37 -40t-37 40v402h-402q-40 0 -40 37t40 37h402v404q0 38 37 38t37 -38v-404h404q38 0 38 -37z" />
+<glyph unicode="&#x208b;" horiz-adv-x="1212" d="M1085 128q0 -37 -38 -37h-880q-40 0 -40 37t40 37h880q38 0 38 -37z" />
+<glyph unicode="&#x208c;" horiz-adv-x="1212" d="M1047 360q38 0 38 -37.5t-38 -37.5h-880q-40 0 -40 37.5t40 37.5h880zM1047 -29q38 0 38 -37.5t-38 -37.5h-880q-40 0 -40 37.5t40 37.5h880z" />
+<glyph unicode="&#x208d;" horiz-adv-x="531" d="M450 -420q0 -22 -24 -22q-11 0 -41 22q-168 122 -242.5 263t-74.5 345t74.5 345t242.5 263q30 22 41 22q24 0 24 -22q0 -10 -21 -29q-222 -196 -222 -579t222 -579q21 -19 21 -29z" />
+<glyph unicode="&#x208e;" horiz-adv-x="531" d="M463 188q0 -204 -74.5 -345t-242.5 -263q-30 -22 -41 -22q-24 0 -24 22q0 10 21 29q222 196 222 579t-222 579q-21 19 -21 29q0 22 24 22q11 0 41 -22q168 -122 242.5 -263t74.5 -345z" />
+<glyph unicode="&#x208f;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2090;" horiz-adv-x="822" d="M783 -133q0 -62 -40 -103t-102 -41q-98 0 -129 97q-67 -105 -206 -105q-96 0 -170 34q-96 44 -96 128q0 125 165 194q99 41 289 51v43q0 73 -44 122.5t-127 49.5t-139 -47q70 -13 70 -74q0 -34 -25.5 -54.5t-59.5 -20.5q-84 0 -84 76q0 83 81.5 127.5t171.5 44.5 q142 0 227 -82q60 -58 60 -174v-284q0 -62 49 -62q48 0 48 130q0 18 -1 40h62v-90zM494 -60v132q-116 -5 -198 -43q-113 -52 -113 -150q0 -50 40.5 -81t104 -31t115 49t51.5 124z" />
+<glyph unicode="&#x2091;" horiz-adv-x="719" d="M680 -90q0 -23 -28 -65q-86 -130 -240 -130t-263 97.5t-109 239.5t101.5 239.5t237.5 97.5t218.5 -79t82.5 -211q0 -40 -44 -40h-444q0 -129 47 -196q64 -92 173 -92q82 0 124 34t87 114q10 18 27 18q30 0 30 -27zM383 337q-27 0 -63 -15q-114 -48 -125 -213h359 q-2 92 -40 153q-46 75 -131 75z" />
+<glyph unicode="&#x2092;" horiz-adv-x="810" d="M771 46.5q0 -143.5 -111 -237.5t-255.5 -94t-254.5 94.5t-110 238t110 242.5t255.5 99t255.5 -99.5t110 -243zM583 -129q34 60 34 189t-41 189q-60 88 -174.5 88t-172.5 -91q-37 -58 -37 -190t40 -194q59 -91 176.5 -91t174.5 100z" />
+<glyph unicode="&#x2093;" horiz-adv-x="906" d="M867 -270q-86 5 -150 5t-197 -4v64q58 2 58 26q0 5 -147 174q-133 -134 -133 -165.5t47 -35.5v-63q-106 4 -168.5 4t-136.5 -5v65q116 0 204 77q8 7 148 168l-154 177q-54 62 -78.5 72t-112.5 10v66q92 -6 133.5 -6t212.5 6v-65q-56 -1 -56 -25q0 -13 128 -155 q115 127 115 146q0 32 -47 34v65q91 -6 154 -6t151 6v-65q-114 -2 -194 -69q-16 -14 -141 -156l209 -239q36 -41 150 -41h5v-65z" />
+<glyph unicode="&#x2094;" horiz-adv-x="719" d="M68 259q86 130 240 130t263 -97.5t109 -239.5t-101.5 -239.5t-238 -97.5t-218.5 79t-82 211q0 40 44 40h444q0 129 -47 196q-64 92 -173 92q-82 0 -124 -34t-87 -114q-10 -18 -27 -18q-30 0 -30 27q0 23 28 65zM337 -233q27 0 63 15q114 48 125 213h-359q2 -92 40 -153 q46 -75 131 -75z" />
+<glyph unicode="&#x2095;" horiz-adv-x="905" d="M866 -269q-150 4 -188 4t-193 -4v64q33 -1 60 -1t46 7.5t19 41.5v345q0 141 -108 141q-89 0 -148 -64.5t-59 -153.5v-266q0 -24 6 -34q10 -17 77 -17q19 0 41 1v-64q-150 4 -187 4t-192 -4v64q33 -1 61.5 -1t45.5 8t17 47v741q0 56 -38 66q-8 2 -52 2h-34v64l249 17v-471 q78 112 223 112q229 0 229 -219v-334q0 -33 90 -33q16 0 35 1v-64z" />
+<glyph unicode="&#x2096;" horiz-adv-x="873" d="M834 -270q-82 5 -144 5t-188 -4v64h12q45 0 45 23.5t-183 241.5l-90 -69v-142q0 -31 7 -40q11 -14 99 -14h19v-64q-91 4 -157 4t-214 -4v64q9 0 29.5 -0.5t31.5 -0.5q64 0 64 55v741q0 56 -39 66q-7 2 -52 2h-34v64l250 17v-673l210 161q31 24 31 48t-46 25v65 q98 -6 167 -6t145 7v-66q-105 -4 -217 -82t-116 -88q23 -16 92 -104l121 -159q36 -45 67 -58.5t90 -13.5v-65z" />
+<glyph unicode="&#x2097;" horiz-adv-x="454" d="M415 -269q-166 4 -195.5 4t-179.5 -4v64q8 0 29 -0.5t32 -0.5q63 0 63 55v741q0 56 -38 66q-8 2 -86 2v64l249 17v-890q0 -31 9 -40q13 -14 98 -14h19v-64z" />
+<glyph unicode="&#x2098;" horiz-adv-x="1350" d="M1311 -269q-149 4 -188.5 4t-192.5 -4v64q28 -1 58.5 -1t48.5 7.5t18 47.5v331q0 149 -108 149q-88 0 -147 -64.5t-59 -153.5v-267q0 -45 53 -49q12 -1 30 -1t42 1v-64q-149 4 -188 4t-193 -4v64q28 -1 58.5 -1t48.5 7.5t18 47.5v331q0 149 -108 149q-89 0 -148 -64.5 t-59 -153.5v-272q0 -20 6 -29q10 -16 80 -16q17 0 38 1v-64q-149 4 -187 4t-192 -4v64q28 -1 58.5 -1t42.5 5q23 11 23 50v381q0 56 -38 67q-9 2 -53 2h-33v65l245 17v-123q80 122 227 122q177 0 216 -123q78 123 230 123q229 0 229 -225v-28q-1 -19 -1 -28v-272 q0 -34 77 -34q12 0 48 2v-64z" />
+<glyph unicode="&#x2099;" horiz-adv-x="905" d="M866 -269q-150 4 -188 4t-193 -4v64q32 -1 59.5 -1t46.5 7.5t19 41.5v345q0 141 -108 141q-89 0 -148 -64.5t-59 -153.5v-266q0 -45 52 -50q13 -1 31 -1t41 1v-64q-150 4 -187 4t-192 -4v64q32 -1 61 -1t46 8t17 47v381q0 56 -38 67q-8 2 -53 2h-33v65l245 17v-123 q80 122 227 122q229 0 229 -220v-333q0 -33 90 -33q16 0 35 1v-64z" />
+<glyph unicode="&#x209a;" horiz-adv-x="889" d="M746 283q103 -97 103 -237.5t-110.5 -235.5t-244 -95t-199.5 76v-127q0 -20 6 -28q11 -15 75 -15q19 0 43 1v-64q-114 3 -190.5 3t-188.5 -3v64q40 -2 65.5 -2t37.5 6q22 10 22 49v564q0 50 -40 59q-9 2 -38 2q-19 0 -47 -1v65l250 17v-82q93 81 223 81t233 -97z M476 -233q100 0 160 88t60 191t-50 184q-58 95 -153 95q-127 0 -198 -108v-314q0 -54 61.5 -95t119.5 -41z" />
+<glyph unicode="&#x209b;" horiz-adv-x="623" d="M505 -233.5q-78 -51.5 -185 -51.5t-181 58q-53 -58 -73 -58q-26 0 -26 32v214q0 31 30 31q24 0 32 -30q27 -97 74 -146t140 -49q170 0 170 120q0 88 -159 119q-97 19 -112 23q-63 16 -103 46q-72 53 -72 129q0 97 89 146q71 39 167 39t159 -38q41 38 61 38q28 0 28 -32 v-169q0 -33 -32 -33q-23 0 -31 29q-4 24 -7 48q-22 110 -169 110q-169 0 -169 -98q0 -53 72 -80q31 -12 139.5 -30.5t164.5 -66.5q71 -60 71 -154.5t-78 -146z" />
+<glyph unicode="&#x209c;" horiz-adv-x="601" d="M561 -83q0 -83 -44 -142.5t-134 -59.5t-148.5 52.5t-58.5 149.5v382h-136v53q105 3 160 90q46 73 47 185h59v-262h229v-66h-229v-384q0 -144 98 -144t98 208v29h59v-91z" />
+<glyph unicode="&#x209d;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x209e;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x209f;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x20a0;" horiz-adv-x="1372" d="M396 -259v58q123 0 123 49v345q-194 22 -330.5 159t-136.5 338t158.5 343t369.5 142q148 0 275 -110l70 90q16 20 30 20q25 0 25 -31v-340q0 -25 -29 -25t-36 28q-9 40 -35 118q-39 86 -114 138.5t-161 52.5t-161 -33q-221 -97 -221 -407q0 -346 296 -420v303 q0 30 -26.5 38t-96.5 8v59h827l45 -315h-54q-19 153 -76 205t-212 52h-200q-37 0 -47.5 -6t-10.5 -39v-312h127q96 0 124.5 29.5t28.5 125.5h56v-369h-56q0 96 -28.5 125.5t-124.5 29.5h-127v-346q0 -33 10.5 -39t47.5 -6h208q172 0 237 69q54 57 85 233h54l-67 -360h-847z " />
+<glyph unicode="&#x20a1;" horiz-adv-x="1335" d="M1267 854q0 -26 -29 -26t-35 32q-12 60 -47 178q-89 223 -285 277v-1287q112 25 198.5 103.5t122.5 188.5q17 52 27 140q4 33 23 33q24 0 24 -35q0 -173 -113.5 -309t-281.5 -178v-79h-60v69q-29 -4 -62 -4t-68 4v-69h-60v78q-241 48 -397 248.5t-156 454t156.5 454.5 t396.5 250v69h60v-60q35 4 68.5 4t61.5 -3v59h60v-71q120 -31 244 -154l99 144q17 25 31 25q21 0 21 -33zM811 1326q-18 2 -50 2t-80 -10v-1290q49 -11 81 -11t49 1v1308zM270 672q0 -497 351 -626v1254q-27 -9 -53 -22q-298 -145 -298 -606z" />
+<glyph unicode="&#x20a2;" horiz-adv-x="1335" d="M1267 854q0 -26 -29 -26t-35 32q-12 60 -47 178q-51 127 -151 208.5t-217 81.5t-220 -50q-298 -145 -298 -613.5t322 -606.5q54 -23 106 -33v541q0 87 -45 109q-22 10 -106 10h-16v68l297 23v-235q76 235 262 235q60 0 109.5 -36.5t49.5 -85.5t-25.5 -76t-65 -27t-66 26 t-26.5 66q0 64 48 84q-6 2 -14 2q-136 0 -207 -140q-55 -111 -55 -262v-306q122 18 219 99.5t135 199.5q17 52 27 140q4 33 23 33q24 0 24 -35q0 -205 -154 -353t-360 -148q-288 0 -486 213t-198 502.5t198.5 503.5t485.5 214q193 0 363 -169l99 144q17 25 31 25 q21 0 21 -33z" />
+<glyph unicode="&#x20a3;" horiz-adv-x="1271" d="M779 1281h-252q-45 0 -64 -11.5t-19 -67.5v-421h140q132 0 171 48t39 183h48v-522h-48q0 136 -39 183.5t-171 47.5h-140v-344h379q23 0 23 -23v-16q0 -23 -23 -23h-379v-171q0 -27 7 -44q16 -39 209 -39h37v-61q-74 6 -135 6h-373q-49 0 -121 -6v61h75q64 0 88 10 q39 18 39 73v171h-136q-22 0 -22 23v16q0 23 22 23h136v823q0 25 -6 42q-14 39 -166 39h-30v62h1081l54 -442h-49q-24 217 -89 291q-77 89 -286 89z" />
+<glyph unicode="&#x20a4;" horiz-adv-x="1051" d="M958 310q18 0 18 -23t-22 -86q-78 -225 -264 -225q-85 0 -177 56q-32 19 -153 112q-81 -168 -182 -168q-50 0 -78.5 35t-28.5 93t44 99.5t110 41.5q35 0 94 -10q4 50 4 121t-13 238h-221v60h216q-7 83 -10 130h-206v60h203q-3 61 -3 113q0 171 97 299t263 128 q117 0 180 -64t63 -133q0 -27 -20.5 -50t-47.5 -23q-49 0 -61 61q-22 109 -24 112q-27 61 -114 61q-192 0 -192 -294q0 -53 16 -210h364v-60h-359q3 -44 3 -76v-54h356v-60h-357q-6 -197 -65 -374l167 -56q101 -30 172 -30q135 0 189 107l17 45q10 24 22 24zM213 203 q-105 0 -105 -99q0 -89 75 -89q88 0 126 154q-52 34 -96 34z" />
+<glyph unicode="&#x20a5;" horiz-adv-x="1775" d="M1485 6q-40 0 -244 -6v66q26 -1 70 -1t65 13q32 19 32 84v499q0 238 -157 238q-16 0 -32 -2l-257 -396v-346q0 -39 12 -60q18 -30 118 -30q17 0 37 1v-66q-198 6 -237.5 6t-244.5 -6v16l-228 -351q-11 -17 -35 -17q-40 0 -40 40q0 13 6 22l464 714v237q0 238 -158 238 q-130 0 -209.5 -104.5t-79.5 -238.5v-397q0 -47 11 -64q18 -30 114 -30q19 0 40 1v-66q-198 6 -236 6t-243 -6v66q26 -1 69.5 -1t70 16t26.5 81v574q0 87 -44 109q-21 10 -96 10h-26v68l301 23v-225q101 225 316 225q251 0 284 -210q58 130 181 183l286 440q11 17 35 17 q40 0 40 -40q0 -13 -6 -22l-239 -368h15q158 0 224.5 -81t66.5 -243v-42q-1 -27 -1 -41v-409q0 -65 132 -65q17 0 35 1v-66q-198 6 -238 6zM1081 835q-66 -57 -98 -150zM814 162v111l-135 -208h11h9q62 0 83 13q32 19 32 84z" />
+<glyph unicode="&#x20a6;" horiz-adv-x="1480" d="M1209 1139v-295h174v-60h-174v-130h174v-60h-174v-562q0 -32 -26 -32q-16 0 -34 26l-388 568h-436v-393q0 -140 200 -140h3v-61q-208 6 -230 6t-230 -6v61h3q199 0 199 140v393h-181v60h181v130h-181v60h181v389q0 29 -8 35q-19 13 -194 13v62h342q30 0 48 -26l323 -473 h373v301q0 139 -203 139v62q205 -6 231.5 -6t230.5 6v-62h-3q-201 0 -201 -145zM1154 654v130h-332l89 -130h243zM1154 594h-202l202 -296v296zM325 844h265l-246 360q-12 17 -19 25v-385zM325 784v-130h395l-89 130h-306z" />
+<glyph unicode="&#x20a7;" horiz-adv-x="2385" d="M2333 274q0 -146 -97 -222t-242 -76t-242 93q-77 -93 -97.5 -93t-20.5 33v57q-58 -90 -160 -90q-132 0 -203.5 78t-71.5 211v585q-51 -106 -172.5 -168.5t-247.5 -62.5h-335v-473q0 -32 7 -48q17 -37 181 -37h17v-61q-72 6 -133 6h-326q-50 0 -122 -6v61l55 -1 q122 0 140 38q7 15 7 48v1051q0 32 -7 48q-16 37 -158 37q-18 0 -37 -1v62h695q157 0 296 -84.5t164 -226.5q68 114 70 285h53v-394h305v-68h-305v-594q0 -231 144 -231t144 265v36q0 32 27 32q21 0 30 -35q37 -146 92 -214q73 -90 206 -90q103 0 172 48.5t69 146.5 q0 147 -223 195q-128 28 -148 33q-82 25 -134 67q-91 75 -91 183q0 134 108 204q92 59 221.5 59t212.5 -61q60 61 82 61t22 -33v-254q0 -35 -29 -35q-23 0 -31 43l-6 60q-16 87 -81.5 132.5t-158.5 45.5t-157 -34q-81 -43 -81 -129t94 -130q48 -22 169 -46q170 -33 243 -102 q91 -86 91 -204zM1024 977q0 161 -75.5 232.5t-237.5 71.5h-186q-53 0 -69.5 -13t-16.5 -66v-532h272q313 0 313 307z" />
+<glyph unicode="&#x20a8;" horiz-adv-x="1814" d="M1762 274q0 -146 -97 -222t-247 -76q-211 0 -315.5 92t-136.5 287q-23 141 -117 230q-70 67 -183 67h-227v-511q0 -29 7 -46q14 -34 171 -34h26v-61q-74 6 -143 6h-289q-69 0 -143 -6v61q6 0 24.5 -0.5t28.5 -0.5q125 0 142 35q7 15 7 46v1055q0 27 -6 45q-14 40 -167 40 h-29v62h618q183 0 333 -84q180 -100 180 -267q0 -43 -15 -84q89 52 213.5 52t207.5 -61q60 61 82 61t22 -33v-254q0 -35 -29 -35q-23 0 -31 43l-6 60q-16 87 -81.5 132.5t-158.5 45.5t-157 -34q-81 -43 -81 -129t94 -130q48 -22 169 -46q170 -33 243 -102q91 -86 91 -204z M997 992q0 196 -143 256q-84 35 -314 35q-51 0 -69 -7q-32 -14 -32 -57v-523h219q339 0 339 296zM1659 219q0 147 -223 195q-128 28 -148 33q-82 25 -134 67q-91 75 -91 183q0 39 10 73q-92 -68 -218 -99q163 -56 224 -182q23 -48 50 -189t72 -195q67 -81 217 -81 q103 0 172 48.5t69 146.5z" />
+<glyph unicode="&#x20a9;" horiz-adv-x="2087" d="M2019 1284q-152 0 -195 -132l-101 -308h190v-60h-209l-43 -130h252v-60h-271l-196 -598q-13 -39 -38.5 -39t-37.5 37l-196 600h-262l-193 -598q-13 -39 -39.5 -39t-38.5 37l-196 600h-306v60h286l-43 130h-243v60h224l-117 357q-6 19 -23 53q-23 30 -134 30h-21v62 q242 -6 344.5 -6t175.5 6v-62h-5q-161 0 -161 -58q0 -15 4 -27l116 -355h399l76 232l-35 127q-16 48 -52 64.5t-134 16.5v62q242 -6 344.5 -6t175.5 6v-62h-5q-160 0 -160 -58q0 -15 5 -30l115 -352h400l97 297q10 31 10 39q0 53 -63 81q-48 22 -109 23v62q155 -6 239 -6 t174 6v-62zM1652 784h-361l42 -130h277zM1092 844l-50 153l-49 -153h99zM1590 594h-237l119 -363zM1154 654l-42 130h-139l-42 -130h223zM922 784h-361l43 -130h276zM860 594h-236l118 -363z" />
+<glyph unicode="&#x20aa;" horiz-adv-x="1590" d="M1440 295q0 -123 -77 -209t-202 -86h-636v668h151v-563h443q96 0 133 48.5t37 148.5v754h151v-761zM1065 387h-151v366q0 101 -36.5 150t-133.5 49h-443v-952h-151v1056h636q152 0 215.5 -71t63.5 -225v-373z" />
+<glyph unicode="&#x20ab;" horiz-adv-x="1159" d="M1136 1168q0 -23 -23 -23h-173v-960q0 -88 46 -110q20 -10 85 -10q16 0 35 1v-66l-313 -24v142q-111 -142 -295 -142t-314.5 144.5t-130.5 340.5t139.5 340.5t336.5 144.5q163 0 270 -133v332h-415q-22 0 -22 23v16q0 23 22 23h415v70q0 88 -47 109q-20 10 -85 10 q-16 0 -35 -1v67l308 23v-278h173q23 0 23 -23v-16zM1076 -242q0 -23 -23 -23h-889q-22 0 -22 23v16q0 23 22 23h889q23 0 23 -23v-16zM793 253v449q0 32 -24 68q-87 129 -236 129t-238 -138q-65 -100 -65 -300t61 -299q85 -138 224 -138q93 0 185.5 69.5t92.5 159.5z" />
+<glyph unicode="&#x20ac;" horiz-adv-x="1548" d="M1489 1246q0 -7 -6 -20l-93 -196q-11 -23 -27 -23q-32 0 -28 30q2 12 2 24q0 126 -164 213q-105 56 -218 56t-215 -55q-222 -120 -273 -412h842l-56 -117h-799q-1 -26 -1 -63.5t4 -84.5h725l-56 -117h-653q58 -284 270 -405q102 -58 209 -58t211.5 56t186.5 177 q8 12 19 12q24 0 24 -29v-124q-189 -153 -434 -153t-433 148t-250 376h-217l56 117h140q-4 35 -4 72.5t4 75.5h-196l56 117h162q63 229 250 378t426.5 149t424.5 -144q62 23 86.5 23t24.5 -23z" />
+<glyph unicode="&#x20ad;" horiz-adv-x="1519" d="M649 1284l-57 2q-126 0 -142 -40q-6 -15 -6 -44v-445h201l417 397q36 34 36 67q0 61 -91 63v62q69 -6 217.5 -6t201.5 6v-62q-160 -2 -281 -118l-356 -340l47 -69h387q23 0 23 -23v-16q0 -23 -23 -23h-345l367 -539q42 -62 83.5 -78.5t122.5 -16.5v-61q-127 6 -281.5 6 t-225.5 -6v61h4q113 0 113 59q0 22 -31 68l-343 507h-36l-207 -197v-359q0 -28 9 -45q17 -33 186 -33h10v-61q-71 6 -120 6h-347q-43 0 -114 -6v61q8 0 26.5 -0.5t28.5 -0.5q125 0 141 40q6 15 6 44v551h-136q-22 0 -22 23v16q0 23 22 23h136v453q0 27 -7 41q-16 33 -176 33 h-19v62q70 -6 119 -6h342q50 0 120 6v-62zM444 695v-129l136 129h-136z" />
+<glyph unicode="&#x20ae;" horiz-adv-x="1413" d="M878 1282q-46 0 -65.5 -11.5t-19.5 -53.5v-554l429 91v-60l-429 -91v-130l429 91v-60l-429 -91v-267q0 -25 10 -47q18 -38 243 -38h34v-61q-84 6 -154 6h-439q-71 0 -155 -6v61q9 0 35.5 -0.5t40.5 -0.5q184 0 202 39q8 17 8 47v229l-429 -91v60l429 91v130l-429 -91v60 l429 91v593q0 43 -29 56q-17 8 -66 8q-256 0 -321 -62.5t-86 -318.5h-48l36 442h1206l36 -442h-49q-22 262 -88.5 321.5t-330.5 59.5z" />
+<glyph unicode="&#x20af;" horiz-adv-x="1363" d="M1311 -145q0 -279 -149 -279q-157 0 -226 320l-53 245l-274 -541h-151l244 481q-121 -105 -271 -105q-177 0 -278 123t-101 305t120 309.5t304 154.5q-35 39 -132 116.5t-135 128.5q-56 77 -56 173.5t115 152.5q93 44 208 44t208 -54q113 -64 113 -170.5t-98 -106.5 q-43 0 -71 28t-28 71q0 95 101 99q-80 78 -229 78q-80 0 -140 -31q-74 -38 -74 -111q0 -96 139 -210l274 -211q159 -142 192 -295l26 -118l254 502h151l-360 -711l75 -347q17 -74 63 -129.5t114 -55.5q78 0 90 158h35v-14zM730 399q0 187 -210 421q-153 -24 -236 -131.5 t-83 -262.5t59 -262q73 -134 208.5 -134t205.5 125q56 101 56 244z" />
+<glyph unicode="&#x20b0;" horiz-adv-x="1107" d="M1041 -15q0 -145 -117.5 -227.5t-268.5 -82.5l-6 34q95 18 155 106t60 188q0 238 -238 585l-172 -491l-112 269l-148 -260h-134l307 528l106 -248l97 285q-122 176 -161 252q-78 151 -78 281t79 208t205 78q91 0 142.5 -51.5t51.5 -142.5q0 -184 -129 -531 q175 -258 235 -370q126 -236 126 -410zM712 1281q0 126 -89 126q-72 0 -107 -62.5t-35 -140.5q0 -151 141 -354q90 285 90 431z" />
+<glyph unicode="&#x20b1;" horiz-adv-x="1472" d="M1404 864h-199q-47 -112 -171 -178.5t-255 -66.5h-335v-473q0 -32 7 -48q17 -37 181 -37h17v-61q-72 6 -133 6h-326q-50 0 -122 -6v61l55 -1q122 0 140 38q7 15 7 48v718h-99v60h99v130h-99v60h99v83q0 32 -7 48q-16 37 -158 37q-18 0 -37 -1v62h695q131 0 255 -61 t178 -168h208v-60h-186q10 -37 10 -70.5t-5 -59.5h181v-60zM711 1281h-186q-53 0 -69.5 -13t-16.5 -66v-88h567q-54 167 -295 167zM1022 924q2 25 2 60t-5 70h-580v-130h583zM439 864v-194h272q255 0 301 194h-573z" />
+<glyph unicode="&#x20b2;" horiz-adv-x="1472" d="M1405 478q-80 0 -97 -6q-40 -15 -40 -81v-360q0 -29 -16 -29q-42 0 -127 122q-97 -167 -369 -167v-65h-60v68q-269 23 -448.5 230.5t-179.5 482t180.5 483.5t447.5 232v58h60v-56q195 -1 361 -169l99 144q17 25 31 25q21 0 21 -33l1 -503q0 -26 -29 -26t-35 32 q-12 60 -46 177q-51 128 -151.5 209.5t-230.5 81.5q-10 0 -21 -1v-1309q16 -1 32 -1q124 0 208 56q98 65 98 183v126q0 40 -9 56q-23 40 -175 40h-63v59q65 -5 221.5 -5t336.5 5v-59zM579 1282q-309 -152 -309 -608.5t312 -609.5q53 -26 114 -38v1294q-62 -11 -117 -38z" />
+<glyph unicode="&#x20b3;" horiz-adv-x="1374" d="M963 6q-110 0 -182 -6v61h5q161 0 161 59q0 16 -59 199l-24 75h-473l-61 -188q-9 -28 -9 -42q0 -51 47.5 -76.5t104.5 -26.5v-61q-183 6 -244 6t-161 -6v61h2q149 0 193 136l64 197h-156v60h175l42 130h-217v60h237l235 725q14 42 45 42t45 -42l234 -725h237v-60h-218 l42 -130h176v-60h-157l80 -248q6 -20 25 -56q25 -29 141 -29h15v-61q-235 6 -345 6zM783 644l-157 481l-155 -481h312zM844 454l-42 130h-350l-42 -130h434z" />
+<glyph unicode="&#x20b4;" horiz-adv-x="1169" d="M1101 524h-724q-21 -17 -40 -42q-62 -80 -62 -188.5t75 -192.5t189 -84q194 0 311 107t117 250q0 72 30 72q24 0 24 -29v-431q0 -29 -20 -29q-14 0 -34 31l-68 106q-126 -137 -362 -137q-167 0 -277.5 121t-110.5 289q0 83 28 157h-109v60h139q47 79 126 130h-265v60h412 q73 15 216 52q199 61 199 250q0 109 -74.5 183.5t-183.5 74.5q-279 0 -360 -290q-8 -41 -25 -122q-5 -22 -23 -22q-28 0 -28 28v429q0 33 24 33q12 0 29 -27l69 -112q142 139 309 139t278 -111t111 -271q0 -131 -80 -234h160v-60h-219q-53 -43 -118 -67q-6 -2 -252 -63h589 v-60z" />
+<glyph unicode="&#x20b5;" horiz-adv-x="1335" d="M1267 854q0 -26 -29 -26t-35 32q-12 60 -47 178q-50 126 -149 207t-226 83v-1311q139 1 253.5 86t157.5 217q17 52 27 140q4 33 23 33q24 0 24 -35q0 -197 -143.5 -343t-341.5 -157v-66h-60v66q-277 12 -465 222.5t-188 492t188.5 492.5t464.5 224v57h60v-57 q174 -9 334 -168l99 144q17 25 31 25q22 0 22 -33v-503zM568 1278q-298 -145 -298 -613.5t322 -606.5q66 -28 129 -37v1304q-78 -10 -153 -47z" />
+<glyph unicode="&#x20b6;" horiz-adv-x="1355" d="M53 66l68 -2q98 0 98 98v693h-166v68h166v354q0 87 -44 108q-21 10 -106 10h-16v67l306 23v-562h332q107 0 169 151q47 116 49 243h53v-394h305v-68h-305v-594q0 -231 144.5 -231t144.5 290q0 18 -1 67h52v-122q0 -113 -48 -193q-58 -96 -164 -96q-132 0 -203.5 78 t-71.5 211v590h-456v-693q0 -50 13.5 -69t49.5 -23q29 -4 81 -4h24v-66q-220 6 -247.5 6t-226.5 -6v66z" />
+<glyph unicode="&#x20b7;" horiz-adv-x="1107" d="M961 616.5q79 -106.5 79 -256.5t-87.5 -249.5t-232.5 -135.5v-40h-89v25q-31 -3 -69.5 -3t-79.5 6v-28h-89v48q-82 24 -149 63v-111h-89v177q-103 97 -103 222q0 44 29.5 87t71.5 43q78 0 86 -88q56 89 111 89q85 0 119 -94q49 94 120 94q131 0 131 -216v-206 q194 69 194 257q0 102 -58.5 177.5t-170.5 104.5q-88 17 -260 65q-116 43 -186.5 140.5t-70.5 220.5q0 160 111 271t278 111t309 -139l69 112q17 27 29 27q24 0 24 -33v-429q0 -28 -28 -28q-18 0 -23 22q-7 41 -25 122q-80 290 -360 290q-109 0 -183.5 -74.5t-74.5 -183.5 q0 -188 199 -250q85 -19 252 -62q137 -41 216 -147.5zM631 324q0 111 -48 111q-51 0 -80 -82q-21 -62 -21 -126v-202q45 -8 79 -8t70 5v302zM394 332q0 103 -50 103t-79 -82q-21 -62 -21 -126v-114q66 -40 149 -66zM155 325q0 59 -20 59q-38 0 -38 -69.5t58 -131.5v142z" />
+<glyph unicode="&#x20b8;" horiz-adv-x="1200" d="M1130 1187h-1060v156h1060v-156zM1130 904h-452v-904h-156v904h-452v156h1060v-156z" />
+<glyph unicode="&#x20b9;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x20ba;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x20bb;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x20bc;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x20bd;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x20be;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x20bf;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x20c0;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x20c1;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x20c2;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x20c3;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x20c4;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x20c5;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x20c6;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x20c7;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x20c8;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x20c9;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x20ca;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x20cb;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x20cc;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x20cd;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x20ce;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x20cf;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x20d0;" horiz-adv-x="0" d="M1117 1405q0 -39 -45 -39h-959q-56 0 -56 28.5t45 51.5q113 58 179 127q32 33 48 33q31 0 31 -32t-128 -130h840q45 0 45 -39z" />
+<glyph unicode="&#x20d1;" horiz-adv-x="0" d="M1072 1446q45 -23 45 -51.5t-56 -28.5h-959q-45 0 -45 39t45 39h840q-128 98 -128 130t31 32q16 0 48 -33q66 -69 179 -127z" />
+<glyph unicode="&#x20d2;" horiz-adv-x="0" d="M628 -341q0 -41 -41 -41t-41 41v1848q0 39 41 39t41 -39v-1848z" />
+<glyph unicode="&#x20d3;" horiz-adv-x="0" d="M628 -41q0 -41 -41 -41t-41 41v1248q0 39 41 39t41 -39v-1248z" />
+<glyph unicode="&#x20d4;" horiz-adv-x="0" d="M1080 1123q0 -41 -41 -41t-41 41q0 166 -117.5 283.5t-283.5 117.5q-136 0 -242 -81.5t-143 -208.5q118 79 151.5 79t33.5 -34q0 -19 -63.5 -47.5t-163.5 -121.5q-30 -28 -49.5 -28t-28.5 54q-23 139 -61 211q-17 32 -17 45q0 31 35 31t86 -158q46 150 173.5 245.5 t288.5 95.5q200 0 341.5 -141.5t141.5 -341.5z" />
+<glyph unicode="&#x20d5;" horiz-adv-x="0" d="M1160 1392q0 -13 -17 -45q-38 -72 -61 -211q-9 -54 -28.5 -54t-49.5 28q-100 93 -163.5 121.5t-63.5 47.5q0 34 33.5 34t151.5 -79q-37 127 -143 208.5t-242 81.5q-166 0 -283.5 -117.5t-117.5 -283.5q0 -41 -41 -41t-41 41q0 200 141.5 341.5t341.5 141.5 q161 0 288.5 -95.5t173.5 -245.5q51 158 86 158t35 -31z" />
+<glyph unicode="&#x20d6;" horiz-adv-x="0" d="M1117 1405q0 -39 -45 -39h-842q128 -97 128 -129.5t-31 -32.5q-16 0 -48 33q-62 65 -179 127q-43 23 -43 41t43 41q117 62 179 127q32 33 48 33q31 0 31 -32.5t-128 -129.5h842q45 0 45 -39z" />
+<glyph unicode="&#x20d7;" horiz-adv-x="0" d="M1117 1405q0 -18 -43 -41q-117 -62 -179 -127q-32 -33 -48 -33q-31 0 -31 32.5t128 129.5h-842q-45 0 -45 39t45 39h842q-128 97 -128 129.5t31 32.5q16 0 48 -33q62 -65 179 -127q43 -23 43 -41z" />
+<glyph unicode="&#x20d8;" horiz-adv-x="0" d="M995 582q0 -200 -141.5 -341.5t-341.5 -141.5t-341.5 141.5t-141.5 341.5t141.5 341.5t341.5 141.5t341.5 -141.5t141.5 -341.5zM913 582q0 166 -117.5 283.5t-283.5 117.5t-283.5 -117.5t-117.5 -283.5t117.5 -283.5t283.5 -117.5t283.5 117.5t117.5 283.5z" />
+<glyph unicode="&#x20d9;" horiz-adv-x="0" d="M995 582q0 -200 -141.5 -341.5t-337 -141.5t-334.5 130t-152 319q-34 -36 -96 -77t-95 -41q-39 0 -39 41q0 22 25 36q22 10 44 19q90 42 173 168q38 161 169.5 266t300.5 105q200 0 341.5 -141.5t141.5 -341.5zM913 582q0 166 -117.5 283.5t-272.5 117.5t-265.5 -91 t-138.5 -229q69 -98 152 -137q22 -9 44 -19q25 -14 25 -36q0 -41 -39 -41q-33 0 -92.5 39.5t-95.5 75.5q14 -154 128.5 -259t275.5 -105t278.5 117.5t117.5 283.5z" />
+<glyph unicode="&#x20da;" horiz-adv-x="0" d="M995 582q0 -200 -141.5 -341.5t-341.5 -141.5q-169 0 -300.5 105t-169.5 266q-83 126 -173 168q-22 9 -44 19q-25 14 -25 36q0 41 39 41q33 0 95 -41t96 -77q13 189 152 319t334.5 130t337 -141.5t141.5 -341.5zM913 582q0 166 -117.5 283.5t-278.5 117.5t-275.5 -105 t-128.5 -259q36 36 95.5 75.5t92.5 39.5q39 0 39 -41q0 -22 -25 -36q-22 -10 -44 -19q-83 -39 -152 -137q28 -138 138.5 -229t265.5 -91t272.5 117.5t117.5 283.5z" />
+<glyph unicode="&#x20db;" horiz-adv-x="0" d="M1087 1442q0 -41 -30.5 -72t-72 -31t-69.5 30.5t-28 72t29 72t69.5 30.5t71 -30.5t30.5 -71.5zM687 1442q0 -41 -30.5 -72t-72 -31t-69.5 30.5t-28 72t29 72t69.5 30.5t71 -30.5t30.5 -71.5zM287 1442q0 -41 -30.5 -72t-72 -31t-69.5 30.5t-28 72t29 72t69.5 30.5 t71 -30.5t30.5 -71.5z" />
+<glyph unicode="&#x20dc;" horiz-adv-x="0" d="M1222 1442q0 -41 -29.5 -70.5t-71 -29.5t-70.5 29t-29 70t30 71t70.5 30t70 -29.5t29.5 -70.5zM882 1442q0 -41 -29.5 -70.5t-71 -29.5t-70.5 29t-29 70t30 71t70.5 30t70 -29.5t29.5 -70.5zM542 1442q0 -41 -29.5 -70.5t-71 -29.5t-70.5 29t-29 70t30 71t70.5 30 t70 -29.5t29.5 -70.5zM202 1442q0 -41 -29.5 -70.5t-71 -29.5t-70.5 29t-29 70t30 71t70.5 30t70 -29.5t29.5 -70.5z" />
+<glyph unicode="&#x20dd;" horiz-adv-x="0" d="M2083 582q0 -410 -287 -697t-697 -287t-697 287t-287 697t287 697t697 287t697 -287t287 -697zM1983 582q0 368 -258 626t-626.5 258t-626 -257.5t-257.5 -626.5t257.5 -626.5t626 -257.5t626.5 258t258 626z" />
+<glyph unicode="&#x20de;" horiz-adv-x="0" d="M1983 -252q0 -50 -50 -50h-1668q-50 0 -50 50v1668q0 50 50 50h1668q50 0 50 -50v-1668zM1883 -202v1568h-1568v-1568h1568z" />
+<glyph unicode="&#x20df;" horiz-adv-x="0" d="M2102 582q0 -21 -14 -35l-954 -954q-14 -14 -35 -14t-35 14l-954 954q-14 14 -14 35t14 35l954 954q14 14 35 14t35 -14l954 -954q14 -14 14 -35zM1981 582l-882 882l-882 -882l882 -882z" />
+<glyph unicode="&#x20e0;" horiz-adv-x="0" d="M2083 582q0 -410 -287 -697t-697 -287t-697 287t-287 697t287 697t697 287t697 -287t287 -697zM1754 -15q229 251 229 608t-258 615t-615 258t-608 -229zM444 1179q-229 -251 -229 -608.5t257.5 -615t615 -257.5t608.5 229z" />
+<glyph unicode="&#x20e1;" horiz-adv-x="0" d="M1117 1405q0 -18 -43 -41q-117 -62 -179 -127q-32 -33 -48 -33q-31 0 -31 32.5t128 129.5h-714q128 -97 128 -129.5t-31 -32.5q-16 0 -48 33q-62 65 -179 127q-43 23 -43 41t43 41q117 62 179 127q32 33 48 33q31 0 31 -32.5t-128 -129.5h714q-128 97 -128 129.5t31 32.5 q16 0 48 -33q62 -65 179 -127q43 -23 43 -41z" />
+<glyph unicode="&#x20e2;" horiz-adv-x="0" d="M2034 856q3 -121 3 -273t-3 -274q-7 -284 -87 -363t-371 -89t-477 -10t-477 10t-371 89t-87 363q-3 122 -3 273.5t3 273.5q7 285 86.5 363.5t372.5 88t475.5 9.5t476 -9.5t373 -88t86.5 -363.5zM1944 311q3 131 3 272t-3 271q-6 248 -60.5 301.5t-338.5 62.5t-446.5 9 t-446 -9t-338 -62.5t-60.5 -301.5q-3 -130 -3 -271t3 -272q6 -247 61 -301.5t336 -63.5t448 -9t448 9t336 63.5t61 301.5z" />
+<glyph unicode="&#x20e3;" horiz-adv-x="0" d="M2113 -113q0 -137 -96.5 -233t-233.5 -96h-1368q-137 0 -233.5 96t-96.5 233v1367q0 137 96.5 234.5t233.5 97.5h1368q137 0 233.5 -97.5t96.5 -234.5v-1367zM2041 -70v1324q0 124 -88.5 211.5t-212.5 87.5h-1325q-124 0 -211.5 -87.5t-87.5 -211.5v-1324 q0 -124 87.5 -211.5t211.5 -87.5h1325q124 0 212.5 87.5t88.5 211.5zM1920 35q0 -117 -83.5 -201t-200.5 -84h-1180q-117 0 -200 84t-83 201v1178q0 117 83 201t200 84h1180q117 0 200.5 -84t83.5 -201v-1178zM1847 78v1135q0 104 -74 178t-178 74h-1139q-104 0 -178 -74 t-74 -178v-1135q0 -104 74 -179t178 -75h1139q104 0 178 75t74 179z" />
+<glyph unicode="&#x20e4;" horiz-adv-x="0" d="M2198 -138q0 -42 -53 -42h-2092q-53 0 -53 42q0 16 11 34l1046 1682q17 28 42 28t42 -28l1046 -1682q11 -18 11 -34zM2055 -80l-956 1537l-956 -1537h1912z" />
+<glyph unicode="&#x20e5;" horiz-adv-x="0" d="M964 -341q0 -41 -39 -41q-31 0 -40 26l-673 1848q-2 5 -2 13q0 41 39 41q31 0 40 -26l673 -1848q2 -5 2 -13z" />
+<glyph unicode="&#x20e6;" horiz-adv-x="0" d="M468 -341q0 -41 -41 -41t-41 41v1848q0 39 41 39t41 -39v-1848zM788 -341q0 -41 -41 -41t-41 41v1848q0 39 41 39t41 -39v-1848z" />
+<glyph unicode="&#x20e7;" horiz-adv-x="0" d="M1335 39q0 -39 -41 -39t-41 39v1214h-1214q-39 0 -39 41t39 41h1255q14 0 27.5 -13.5t13.5 -27.5v-1255z" />
+<glyph unicode="&#x20e8;" horiz-adv-x="0" d="M1107 -278q0 -41 -30.5 -72t-72 -31t-69.5 30.5t-28 72t29 72t69.5 30.5t71 -30.5t30.5 -71.5zM687 -278q0 -41 -30.5 -72t-72 -31t-69.5 30.5t-28 72t29 72t69.5 30.5t71 -30.5t30.5 -71.5zM267 -278q0 -41 -30.5 -72t-72 -31t-69.5 30.5t-28 72t29 72t69.5 30.5 t71 -30.5t30.5 -71.5z" />
+<glyph unicode="&#x20e9;" horiz-adv-x="0" d="M1089 1332q0 -45 -39 -45t-39 45v122h-848v-122q0 -45 -39 -45t-39 45v200h1004v-200z" />
+<glyph unicode="&#x20ea;" horiz-adv-x="0" d="M1703 582q0 -39 -45 -39h-1485q128 -97 128 -129.5t-31 -32.5q-16 0 -48 33q-62 65 -179 127q-43 23 -43 41t43 41q117 62 179 127q32 33 48 33q31 0 31 -32.5t-128 -129.5h1485q45 0 45 -39z" />
+<glyph unicode="&#x20eb;" horiz-adv-x="0" d="M769 1505q0 -8 -2 -13l-673 -1848q-9 -26 -40 -26q-39 0 -39 41q0 8 2 13l673 1848q9 26 40 26q39 0 39 -41zM1159 1505q0 -8 -2 -13l-673 -1848q-9 -26 -40 -26q-39 0 -39 41q0 8 2 13l673 1848q9 26 40 26q39 0 39 -41z" />
+<glyph unicode="&#x20ec;" horiz-adv-x="0" d="M1061 -202q56 0 56 -28.5t-45 -51.5q-113 -58 -179 -127q-32 -33 -48 -33q-31 0 -31 32t128 130h-840q-45 0 -45 39t45 39h959z" />
+<glyph unicode="&#x20ed;" horiz-adv-x="0" d="M1117 -241q0 -39 -45 -39h-840q128 -98 128 -130t-31 -32q-16 0 -48 33q-66 69 -179 127q-45 23 -45 51.5t56 28.5h959q45 0 45 -39z" />
+<glyph unicode="&#x20ee;" horiz-adv-x="0" d="M1117 -241q0 -39 -45 -39h-842q128 -97 128 -129.5t-31 -32.5q-16 0 -48 33q-62 65 -179 127q-43 23 -43 41t43 41q117 62 179 127q32 33 48 33q31 0 31 -32.5t-128 -129.5h842q45 0 45 -39z" />
+<glyph unicode="&#x20ef;" horiz-adv-x="0" d="M1117 -241q0 -18 -43 -41q-117 -62 -179 -127q-32 -33 -48 -33q-31 0 -31 32.5t128 129.5h-842q-45 0 -45 39t45 39h842q-128 97 -128 129.5t31 32.5q16 0 48 -33q62 -65 179 -127q43 -23 43 -41z" />
+<glyph unicode="&#x20f0;" horiz-adv-x="0" d="M775 1314q0 -47 -43 -47q-14 0 -23 8l-102 86l23 -136q0 -40 -43 -40t-43 40v3l23 133l-102 -86q-9 -8 -22 -8q-44 0 -44 47q0 27 23 35l126 46l-126 47q-23 9 -23 35q0 47 44 47q13 0 22 -8l102 -86l-23 136q0 40 43 40t43 -40v-2l-23 -134l102 86q9 8 23 8q43 0 43 -47 q0 -27 -22 -35l-126 -47l126 -46q22 -8 22 -35z" />
+<glyph unicode="&#x20f1;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x20f2;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x20f3;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x20f4;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x20f5;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x20f6;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x20f7;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x20f8;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x20f9;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x20fa;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x20fb;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x20fc;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x20fd;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x20fe;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x20ff;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2100;" horiz-adv-x="1419" d="M783 715q0 -62 -40 -103t-102 -41q-98 0 -129 97q-67 -105 -206 -105q-96 0 -170 34q-96 44 -96 128q0 125 165 194q99 41 289 51v43q0 73 -44 122.5t-127 49.5t-139 -47q70 -13 70 -74q0 -34 -25.5 -54.5t-59.5 -20.5q-84 0 -84 76q0 83 81.5 127.5t171.5 44.5 q142 0 227 -82q60 -58 60 -174v-284q0 -62 49 -62q48 0 48 130q0 18 -1 40h62v-90zM494 788v132q-116 -5 -198 -43q-113 -52 -113 -150q0 -50 40.5 -81t104 -31t115 49t51.5 124zM1470 1455l-1155 -1746h-89l1155 1746h89zM1380 -90q0 -12 -8 -30q-75 -165 -268 -165 q-142 0 -248 96t-106 238.5t105.5 241t250.5 98.5q91 0 164 -36q92 -45 92 -127q0 -76 -83.5 -76t-83.5 75q0 56 60 72q-56 36 -147 36q-41 0 -85 -22q-121 -61 -121 -258.5t128 -259.5q45 -22 88 -22q83 0 132 43q26 22 52.5 71.5t46.5 49.5q31 0 31 -25z" />
+<glyph unicode="&#x2101;" horiz-adv-x="1433" d="M783 715q0 -62 -40 -103t-102 -41q-98 0 -129 97q-67 -105 -206 -105q-96 0 -170 34q-96 44 -96 128q0 125 165 194q99 41 289 51v43q0 73 -44 122.5t-127 49.5t-139 -47q70 -13 70 -74q0 -34 -25.5 -54.5t-59.5 -20.5q-84 0 -84 76q0 83 81.5 127.5t171.5 44.5 q142 0 227 -82q60 -58 60 -174v-284q0 -62 49 -62q48 0 48 130q0 18 -1 40h62v-90zM494 788v132q-116 -5 -198 -43q-113 -52 -113 -150q0 -50 40.5 -81t104 -31t115 49t51.5 124zM1315 -233.5q-78 -51.5 -185 -51.5t-181 58q-53 -58 -73 -58q-26 0 -26 32v214q0 31 30 31 q24 0 32 -30q27 -97 74 -146t140 -49q170 0 170 120q0 88 -159 119q-97 19 -112 23q-63 16 -103 46q-72 53 -72 129q0 97 89 146q71 39 167 39t159 -38q41 38 61 38q28 0 28 -32v-169q0 -33 -32 -33q-23 0 -31 29q-4 24 -7 48q-22 110 -169 110q-169 0 -169 -98 q0 -53 72 -80q31 -12 139.5 -30.5t164.5 -66.5q71 -60 71 -154.5t-78 -146zM1470 1455l-1155 -1746h-89l1155 1746h89z" />
+<glyph unicode="&#x2102;" horiz-adv-x="1389" d="M1336 258q0 -11 -7 -22q-80 -121 -248.5 -197t-324.5 -76q-318 0 -510 198t-192 516.5t192.5 517t509.5 198.5q97 0 218.5 -46t179.5 -46q41 0 54 46t39 46q32 0 32 -30v-397q0 -34 -32 -34q-22 0 -35 26q-13 35 -44 102q-55 100 -179 182.5t-233 82.5q-192 0 -286 -241 q-69 -176 -69 -406q0 -620 379 -620q249 0 418 156l68 68q15 14 28 14q42 0 42 -38zM1210 1248q-25 -15 -51 -15t-49 3q62 -56 100 -112v124zM332 678q0 412 180 607q-192 -69 -291 -232t-99 -381t106.5 -383.5t313.5 -227.5q-210 159 -210 617z" />
+<glyph unicode="&#x2103;" horiz-adv-x="2024" d="M1957 854q0 -26 -29 -26t-35 32q-12 60 -47 178q-51 127 -151 208.5t-217 81.5t-220 -50q-298 -145 -298 -613.5t322 -606.5q96 -41 185 -41q140 0 256 85t159 218q17 52 27 140q4 33 23 33q24 0 24 -35q0 -205 -154 -353t-360 -148q-288 0 -486 213t-198 502.5 t198.5 503.5t485.5 214q193 0 363 -169l99 144q17 25 31 25q21 0 21 -33zM623.5 1296.5q89.5 -89.5 89.5 -218t-90 -218t-218 -89.5t-217.5 89.5t-89.5 218t89 218t218 89.5t218.5 -89.5zM563 921q65 65 65 158.5t-64.5 158t-158.5 64.5t-158.5 -64.5t-64.5 -158t65 -158.5 t158 -65t158 65z" />
+<glyph unicode="&#x2104;" horiz-adv-x="1370" d="M851 1284l-66 2q-156 0 -177 -36q-8 -14 -10 -35q106 -16 182.5 -73t76.5 -154.5t-97 -97.5q-42 0 -70.5 28t-28.5 70q0 94 100 99q-60 59 -163 74v-867q89 13 145 76q30 34 60.5 100t49.5 66q29 0 29 -22t-27 -75q-86 -168 -257 -197v-102q0 -52 17.5 -65.5t68.5 -13.5 h173q212 0 303 123q70 96 94 324h49l-55 -508h-1026v61q8 0 25.5 -0.5t27.5 -0.5q124 0 142 35q7 14 7 46v107q-157 37 -257 171t-100 303.5t99.5 308t257.5 176.5q0 30 -7 44q-17 33 -185 33h-10v62q71 -6 126 -6h383q47 0 120 6v-62zM424 1137q-180 -90 -180 -404 q0 -320 180 -410v814z" />
+<glyph unicode="&#x2105;" horiz-adv-x="1530" d="M1491 46.5q0 -143.5 -111 -237.5t-255.5 -94t-254.5 94.5t-110 238t110 242.5t255.5 99t255.5 -99.5t110 -243zM1303 -129q34 60 34 189t-41 189q-60 88 -174.5 88t-172.5 -91q-37 -58 -37 -190t40 -194q59 -91 176.5 -91t174.5 100zM1440 1455l-1155 -1746h-89 l1155 1746h89zM670 758q0 -12 -8 -30q-75 -165 -268 -165q-142 0 -248 96t-106 238.5t105.5 241t250.5 98.5q91 0 164 -36q92 -45 92 -127q0 -76 -83.5 -76t-83.5 75q0 56 60 72q-56 36 -147 36q-41 0 -85 -22q-121 -61 -121 -258.5t128 -259.5q45 -22 88 -22q83 0 132 43 q26 22 52.5 71.5t46.5 49.5q31 0 31 -25z" />
+<glyph unicode="&#x2106;" horiz-adv-x="1735" d="M1440 1455l-1155 -1746h-89l1155 1746h89zM1445 -183q-71 -102 -205 -102t-190 55.5t-56 195.5v250q0 67 -30 79q-10 4 -69 4h-25v65l255 17v-483q0 -75 28 -103t108 -28t129.5 62t49.5 149v252q0 56 -39 67q-8 2 -53 2h-33v65l256 17v-517q0 -56 39 -67q8 -2 52 -2h34 v-63l-251 -18v103zM670 758q0 -12 -8 -30q-75 -165 -268 -165q-142 0 -248 96t-106 238.5t105.5 241t250.5 98.5q91 0 164 -36q92 -45 92 -127q0 -76 -83.5 -76t-83.5 75q0 56 60 72q-56 36 -147 36q-41 0 -85 -22q-121 -61 -121 -258.5t128 -259.5q45 -22 88 -22 q83 0 132 43q26 22 52.5 71.5t46.5 49.5q31 0 31 -25z" />
+<glyph unicode="&#x2107;" horiz-adv-x="1259" d="M1245 408q0 -241 -255 -355q-189 -84 -466 -84q-207 0 -337 64q-173 85 -173 270q0 208 155 340q131 111 353 155q-124 41 -175 81q-82 62 -82 166q0 177 174 269q139 73 334 73t316 -72.5t121 -133.5q0 -29 -80 -89.5t-112 -60.5q-3 0 -7.5 1t-6.5 1q38 22 38 69 q0 98 -82 161.5t-190.5 63.5t-214.5 -73t-106 -190.5t128 -189.5q106 -59 241 -59q67 0 115 24l8 -8q-28 -83 -97 -83q-360 0 -508 -164q-89 -98 -89 -203q0 -149 126 -247.5t279 -98.5q186 0 318.5 129t132.5 315q0 83 -46 117q80 0 134 -54t54 -134z" />
+<glyph unicode="&#x2108;" horiz-adv-x="1110" d="M1080 1143q0 -150 -134 -304q-116 -131 -270 -208q176 -67 176 -218q0 -188 -216 -329q-194 -125 -400 -125t-206 131q0 74 59 135t133 61q13 0 13 -18q0 -7 -15.5 -38.5t-15.5 -53.5q0 -101 181 -101q118 0 205.5 69t87.5 184q0 171 -235 211l-65 4q-49 5 -49 20 q0 32 56 63.5t85 34.5l71 7q132 15 233 114q132 130 132 275q0 104 -98 162q-82 50 -192 50t-192 -65l-119 -122q-66 -65 -135 -65q-13 0 -13 13t8 25q93 142 259 237t332 95q124 0 216 -59q108 -68 108 -185z" />
+<glyph unicode="&#x2109;" horiz-adv-x="1971" d="M1479 1281h-252q-45 0 -64 -11.5t-19 -67.5v-501h170q132 0 171 48t39 183h48v-522h-48q0 136 -39 183.5t-171 47.5h-170v-497q0 -27 7 -44q16 -39 209 -39h37v-61q-74 6 -135 6h-373q-49 0 -121 -6v61h75q64 0 88 10q39 18 39 73v1056q0 25 -6 42q-14 39 -166 39h-30v62 h1081l54 -442h-49q-24 217 -89 291q-77 89 -286 89zM623.5 1296.5q89.5 -89.5 89.5 -218t-90 -218t-218 -89.5t-217.5 89.5t-89.5 218t89 218t218 89.5t218.5 -89.5zM563 921q65 65 65 158.5t-64.5 158t-158.5 64.5t-158.5 -64.5t-64.5 -158t65 -158.5t158 -65t158 65z" />
+<glyph unicode="&#x210a;" horiz-adv-x="1004" d="M99 -442q-55 0 -100 26t-45 77q0 92 174 187q55 30 258 112l74 166q-125 -145 -247 -145q-80 0 -128 60.5t-48 139.5t38 181l-48 -59l-27 17q51 71 125 152q219 238 421 238q87 0 124 -54q24 -35 24 -69v-8l59 107l247 20q-231 -391 -370 -682q207 74 381 305l28 -17 q-194 -261 -427 -325q-76 -160 -207 -283q-155 -146 -306 -146zM659 575q0 97 -79 97q-94 0 -239 -259.5t-145 -368.5q0 -29 31 -29q79 0 161.5 79t135.5 169q135 231 135 312zM19 -356q0 -25 21.5 -41t46.5 -16q131 0 282 333q-350 -162 -350 -276z" />
+<glyph unicode="&#x210b;" horiz-adv-x="1688" d="M2176 1284q0 -138 -187 -283q-130 -101 -312 -182l-165 -68q-257 -585 -257 -708q0 -31 40 -31q87 0 207 109t193 213l28 -17q-91 -123 -191 -211q-141 -124 -239 -124t-147 87q-39 70 -39 174t31 193.5t99 227.5q-108 -31 -209 -65q-141 -429 -480 -566 q-129 -52 -268 -52t-236 64q-112 74 -112 205q0 76 48.5 134.5t123.5 58.5q50 0 91.5 -30t41.5 -81.5t-45 -87.5q-13 -10 -108 -33q-70 -18 -70 -66q0 -62 98 -101q77 -31 151 -31q206 0 337 229q63 110 143 274q-185 -73 -358 -215l-19 23q174 149 394 229q169 348 361 576 q-169 -132 -210 -161q-160 -111 -231 -111q-40 0 -66 27t-26 67q0 62 64 149t64 92q0 18 -23 18q-127 0 -416 -354l-25 15q287 369 453 369q45 0 78 -32.5t33 -77.5q0 -69 -60.5 -146t-60.5 -84.5t21 -7.5q40 0 227 142l394 299l17 -21q-112 -110 -192 -316l-121 -353l-3 -8 l221 71q124 205 212 314q334 414 562 414q64 0 103.5 -42.5t39.5 -107.5zM2081 1248q29 60 29 91t-23.5 48t-50.5 17q-152 0 -291 -210q-88 -132 -214 -405q209 87 323 174q144 111 227 285z" />
+<glyph unicode="&#x210c;" horiz-adv-x="1358" d="M823 952q203 -63 329 -207t126 -343t-114 -346q-62 -80 -213.5 -196.5t-178.5 -183.5q-144 162 -276 162q-88 0 -156 -82l-23 19q175 192 304 192q105 0 245 -127q242 164 242 459q0 169 -100 323q-112 173 -269 173q-81 0 -225 -97q143 -169 143 -290t-129 -238 l-221 -182l-151 121l-74 -58l-25 27l222 176l153 -119q90 67 90 153t-78 193l-145 185q-78 116 -78 231q0 151 138 285l249 217q112 -119 233.5 -119t176.5 96l31 -10q-135 -211 -291 -211q-89 0 -244 111q-152 -106 -152 -260.5t125 -272.5q221 118 336 219z" />
+<glyph unicode="&#x210d;" horiz-adv-x="1676" d="M1463 76q48 0 48 -38t-35 -38h-599q-33 0 -33 39q0 36 55 36q78 0 97 19t19 92v446h-467v-457q0 -69 30 -87q20 -12 94 -12q48 0 48 -38t-35 -38h-599q-33 0 -33 39q0 36 57 36q78 0 96.5 19t18.5 92v982q0 69 -31 87q-20 11 -92 11q-49 0 -49 38.5t33 38.5h599 q35 0 35 -37.5t-57 -37.5q-78 0 -96.5 -19t-18.5 -92v-429h467v440q0 69 -31 88q-20 11 -92 11q-48 0 -48 38t33 38h599q35 0 35 -37.5t-57 -37.5q-78 0 -97 -19t-19 -92v-982q0 -69 30 -87q20 -12 95 -12zM1263 175v982q0 72 17 111h-208q18 -38 18 -100v-982 q0 -72 -17 -111h208q-18 38 -18 100zM473 175v982q0 72 17 111h-208q18 -38 18 -100v-982q0 -71 -17 -111h208q-18 38 -18 100z" />
+<glyph unicode="&#x210e;" horiz-adv-x="1062" d="M1062 695q0 -301 -211 -568q-119 -151 -222 -151t-103 78q0 32 22 54.5t55.5 22.5t57.5 -24t35 -24q63 0 127 168q41 110 62.5 217.5t21.5 174.5q0 162 -83.5 162t-159.5 -66q-45 -39 -117 -134q-194 -258 -264 -540q-3 -15 -11 -46q-14 -43 -46 -43q-91 0 -91 39 q0 7 4 23l310 1243q6 24 6 47q0 52 -64.5 71.5t-64.5 24.5q0 36 30 53q55 7 132 18q11 2 64.5 19t72 17t18.5 -15t-17 -83l-251 -1001q99 180 215 310q166 185 305 185q167 0 167 -232z" />
+<glyph unicode="&#x210f;" horiz-adv-x="1162" d="M1165 329q23 0 23 -19.5t-26 -87.5q-94 -246 -253 -246q-76 0 -124.5 49.5t-48.5 125.5q0 37 30 120q133 368 133 492q0 152 -117 152q-137 0 -236.5 -104.5t-135.5 -246.5l-118 -473q-15 -61 -26 -78q-21 -37 -67 -37q-57 0 -57 57q0 22 7 50l253 1009l-162 -59 q-19 -7 -28 -7q-29 0 -29 35q0 19 36 32l202 74l45 178q5 20 5 36q0 37 -78 40.5t-78 24.5q0 24 21 39q6 4 129.5 15t149.5 11t26 -22q0 3 -9 -33l-58 -234l376 137q19 7 28 7q29 0 29 -35q0 -19 -36 -32l-415 -151l-90 -361q135 172 322 172q111 0 176.5 -59.5t65.5 -170.5 t-137 -488q-36 -99 -36 -150q0 -72 58 -72q86 0 145 95q31 49 72 171q15 44 33 44z" />
+<glyph unicode="&#x2110;" horiz-adv-x="1185" d="M1293 819q0 37 -12 106l31 3q13 -71 13 -108q0 -133 -91 -233.5t-226 -147.5q-154 -311 -459 -418q-128 -45 -261 -45t-230 65q-112 74 -112 204q0 80 51.5 137t130.5 57q51 0 87.5 -32.5t36.5 -90t-57 -84.5l-107 -31q-57 -19 -57 -64q0 -59 91 -97q73 -30 143 -30 q164 0 277 135q46 53 165 275q-134 35 -220.5 124.5t-86.5 220.5q0 211 226 381q166 125 418.5 205.5t507.5 83.5l1 -31q-139 0 -225 -113q-70 -92 -136 -286q-25 -76 -70 -238.5t-95 -286.5q115 48 190.5 136t75.5 203zM516 636q0 -152 205 -189l173 361q104 204 222.5 349 t290.5 240q-130 -17 -239 -45q-202 -52 -369.5 -206.5t-248.5 -353.5q-34 -84 -34 -156z" />
+<glyph unicode="&#x2111;" horiz-adv-x="1257" d="M1147 1339q-18 -110 -96 -188t-189 -78t-260.5 108.5t-243.5 108.5t-152.5 -55.5t-58.5 -133t51.5 -125.5t123.5 -48q32 0 57 8l8 -33q-34 -12 -70 -12q-93 0 -154 64t-61 157q0 126 103 208.5t221.5 82.5t224.5 -58q19 -11 161 -107q84 -58 144.5 -58t105 51.5 t58.5 122.5zM1135 920q-68 63 -110.5 63t-69.5 -22.5t-27 -55.5q0 -51 109.5 -219.5t109.5 -282.5q0 -186 -173 -305q-153 -106 -347 -106q-132 0 -227 71q-38 28 -127 132q-61 71 -117.5 71t-94.5 -80l-38 2q31 74 97 123t153 49t174 -80l140 -149q85 -80 174 -80t166 65.5 t77 159.5t-105.5 265t-105.5 264.5t58 157t142 63.5t162 -78z" />
+<glyph unicode="&#x2112;" horiz-adv-x="1465" d="M1744 1260q0 -162 -226 -385q-193 -190 -377 -278l-44 -21q-59 -165 -129.5 -268.5t-200.5 -198.5q173 -82 277 -82q202 0 428 307l26 -17q-250 -325 -480 -325q-106 0 -297 89q-164 -100 -360 -100q-91 0 -169 29q-106 39 -106 110.5t70 106.5q56 28 131 28 q129 0 342 -86q74 141 171 364q-34 -3 -57 -3q-162 0 -282.5 113.5t-120.5 274.5q0 217 240 373q215 139 444 139q80 0 173 -23l-9 -29q-86 20 -160 20q-238 0 -404 -168t-166 -394q0 -134 77 -204.5t212 -70.5q27 0 66 5q287 667 584 826q90 48 164 48t128.5 -51.5 t54.5 -128.5zM1658 1317q0 93 -103 93q-126 0 -227 -161q-73 -118 -139 -337l-81 -296q360 171 513 558q37 94 37 143zM287 225q-55 0 -112.5 -26t-57.5 -74q0 -60 92 -92q66 -22 142 -22q119 0 188 48q23 16 70 79q-199 87 -322 87z" />
+<glyph unicode="&#x2113;" horiz-adv-x="863" d="M945 1347q0 -312 -361 -725q-56 -64 -112 -118l-93 -92q-7 -8 -7 -58q0 -102 39 -190q51 -113 140 -113q107 0 297 188h7q20 0 20 -23q0 -43 -120 -129.5t-208 -86.5q-245 0 -306 255q-107 -112 -131.5 -112t-24.5 19.5t144 159.5q-12 81 -12 154q0 344 207 735 q63 119 168 220t213 101q140 0 140 -185zM892 1365q0 116 -78 116q-90 0 -213 -249q-84 -168 -148 -373t-68 -366q507 539 507 872z" />
+<glyph unicode="&#x2114;" horiz-adv-x="1670" d="M53 66l68 -2q98 0 98 98v919h-112q-68 0 -68 41t68 41h112v114q0 87 -44 108q-21 10 -106 10h-16v67l306 23v-322h371v114q0 88 -47 109q-20 10 -85 10q-16 0 -35 -1v67l307 23v-322h377q68 0 68 -41t-68 -41h-377v-274q121 139 303.5 139t313 -145.5t130.5 -342 t-139 -339.5t-327.5 -143t-290.5 157q-24 -46 -77 -133h-53v1081h-371v-919q0 -50 13.5 -69t49.5 -23q29 -4 81 -4h24v-66q-220 6 -247.5 6t-226.5 -6v66zM1375 162q64 99 64 300t-60 299q-85 138 -225 138q-91 0 -184 -64t-93 -150v-442q0 -45 30 -89q89 -130 234 -130 t234 138z" />
+<glyph unicode="&#x2115;" horiz-adv-x="1540" d="M1347 1343q33 0 33 -33.5t-29 -40.5l-53 -4q-50 -9 -63 -51q-7 -22 -7 -87v-1130q0 -34 -36 -34q-19 0 -30 14l-851 1125v-884q0 -89 28.5 -116t118.5 -27q36 0 36 -37.5t-36 -37.5h-370q-35 0 -35 39q0 34 44 36q66 3 83 13q44 24 44 112v1009q-53 59 -113 59 q-33 0 -33 37.5t33 37.5h407q14 0 26 -16l596 -802v596q0 92 -27 119.5t-119 27.5q-36 0 -36 37.5t36 37.5h353zM1140 129v269l-646 870h-214z" />
+<glyph unicode="&#x2116;" horiz-adv-x="1954" d="M1795 853q89 -91 89 -224.5t-78 -223.5t-208.5 -90t-221 98t-90.5 229t78 216.5t210 85.5t221 -91zM1884 0h-598v112h598v-112zM1273 1370q63 0 112.5 -32.5t49.5 -84t-31 -80.5t-74.5 -29t-90 29t-67.5 29q-53 0 -66 -90q-3 -23 -3 -128v-1015h-45l-619 1107v-652 q0 -167 -10 -228q-24 -141 -109 -189q-65 -38 -136 -38t-119.5 31t-48.5 83t30.5 78.5t72.5 26.5t95 -28.5t74 -28.5q51 0 62 121q1 15 1 154v697q0 91 -5 114q-13 62 -60.5 81.5t-129.5 20.5v37h355l504 -913v435q0 191 5 233q17 141 86.5 200t166.5 59zM1738 526 q0 111 -39 223q-51 148 -139 148q-119 0 -119 -176q0 -109 41 -218q54 -142 145 -142q111 0 111 165z" />
+<glyph unicode="&#x2117;" horiz-adv-x="1975" d="M1915 547q0 -384 -271.5 -655.5t-655 -271.5t-656 272t-272.5 655.5t272 655t656 271.5t655.5 -271.5t271.5 -655.5zM1585.5 -51q247.5 248 247.5 598.5t-247 597.5t-597.5 247t-597.5 -247.5t-247 -597t247.5 -598t597 -248.5t597 248zM1171 1151q162 0 298 -95 t136 -247t-132 -246t-287 -94h-287v-410q0 -39 15.5 -49t49.5 -12q20 -2 54 -2q28 0 66 1v-86q-84 7 -135 7h-293q-42 0 -125 -7v86q56 -1 71 -1q93 0 106 25q5 10 5 29v954q0 25 -5 38q-10 24 -120 24q-26 0 -57 -1v86h640zM1391 806q0 138 -63.5 198.5t-202.5 60.5h-168 q-42 0 -52 -8.5t-10 -47.5v-464h230q266 0 266 261z" />
+<glyph unicode="&#x2118;" horiz-adv-x="1518" d="M1428 1015q0 -156 -83 -296t-221 -239t-241.5 -99t-168 53t-64.5 133t35.5 135t101.5 55q74 0 74 -73q0 -30 -22 -52.5t-83 -40.5q-43 -12 -43 -57t49 -77t101 -32t124 46q116 74 192 253.5t76 331.5q0 72 -39.5 129t-105.5 57t-129 -30q-124 -59 -291 -211t-276 -287 q145 -297 145 -435q0 -84 -34 -165.5t-95.5 -119t-113 -37.5t-109.5 30q-117 61 -117 217q0 97 54 204q29 58 114 181q-61 150 -61 244q0 185 158 366q122 141 318 258l26 -43q-341 -202 -341 -494q0 -83 32 -157q346 367 499 454.5t274.5 87.5t193 -84.5t71.5 -205.5z M431 151q0 132 -150 387q-84 -130 -99 -158q-46 -90 -46 -172.5t46 -143t113.5 -60.5t101.5 42.5t34 104.5z" />
+<glyph unicode="&#x2119;" horiz-adv-x="1207" d="M681 599l-86 2q-14 0 -57 -1v-418q0 -78 33 -96q20 -11 107 -11q34 0 34 -37.5t-34 -37.5h-591q-34 0 -34 39q0 36 40 36q84 0 102.5 16.5t18.5 94.5v975q0 71 -18 89t-94 18q-49 0 -49 37.5t34 37.5h596q214 0 347 -78q165 -96 165 -289t-171 -294q-142 -83 -343 -83z M1120 970q0 219 -250 278q59 -79 59 -271.5t-63 -279.5q254 69 254 273zM821 766q33 64 33 209.5t-30 204.5q-44 88 -180 88q-39 0 -72.5 -19.5t-33.5 -55.5v-518h105q130 0 178 91zM289 1161v-975q0 -72 -15 -111h208q-19 39 -19 107v1011q0 42 23 75h-213q16 -38 16 -107z " />
+<glyph unicode="&#x211a;" horiz-adv-x="1493" d="M1261 -223l127 17q37 0 37 -38q0 -46 -144 -76.5t-224 -30.5q-168 0 -311.5 94t-210.5 248q-233 64 -357.5 248t-124.5 432q0 315 192 511.5t507 196.5t506.5 -196.5t191.5 -511.5q0 -260 -135.5 -446.5t-384.5 -241.5q46 -94 136 -150t195 -56zM1033 95 q165 72 253.5 223.5t88.5 354.5t-91 354.5t-254 222.5q145 -178 145 -576.5t-142 -578.5zM402 671q0 -634 349 -634t349 634t-349 634t-349 -634zM128 671q0 -417 340 -574q-141 182 -141 576.5t144 575.5q-162 -72 -252.5 -223t-90.5 -355zM853 -26q-47 -12 -108 -12 t-119 20q151 -258 431 -258q15 0 50 4q-148 54 -254 246z" />
+<glyph unicode="&#x211b;" horiz-adv-x="1828" d="M1943 1085q0 -103 -94 -200q-117 -122 -372 -183q104 -98 104 -235q0 -66 -35.5 -199.5t-35.5 -196.5q0 -35 23 -35q83 0 302 298l27 -17q-240 -341 -412 -341q-79 0 -130.5 51t-51.5 135.5t78 235.5t78 223q0 34 -20 69q-43 -6 -73 -6q-61 0 -61 31q0 42 63 42 q45 0 113 -32q120 15 206.5 153t86.5 265.5t-121 198.5q-111 -49 -176 -136q-100 -133 -186 -422q-26 -95 -89 -278q-60 -141 -158 -257q-226 -268 -581 -268q-144 0 -241 61q-115 72 -115 209q0 78 52.5 133.5t129.5 55.5q50 0 88.5 -34t38.5 -90.5t-57 -82.5l-107 -31 q-57 -18 -57 -64q0 -61 95 -98q74 -29 147 -29q159 0 275 128q79 87 218 381q51 108 160 318q209 365 528 522q-111 39 -261 39q-248 0 -506.5 -100t-406.5 -275q-103 -122 -103 -252q0 -68 40 -113.5t114.5 -45.5t169.5 70q252 185 273 517h30q14 -95 14 -172 q0 -196 -118 -328.5t-312 -132.5q-102 0 -173 53.5t-71 152.5q0 135 110 268q147 178 413.5 283t517.5 105q156 0 326 -44q89 31 154 48l7 -28q-62 -17 -116 -35q258 -99 258 -285z" />
+<glyph unicode="&#x211c;" horiz-adv-x="1458" d="M988 376v68q1 45 1 66q0 69 -29 131q-36 78 -98 78q-14 0 -127 -47q0 -167 -20 -256q-30 -133 -119 -223q-43 -44 -137.5 -106.5t-130.5 -94.5l-125 141l-68 -51l-22 29l217 168l123 -146q57 31 75 79q13 34 13 112v585q0 432 -217 432q-75 0 -135 -51.5t-60 -125 t64 -133.5l120 -102q64 -68 64 -157t-47 -162.5t-125 -95.5l-6 33q96 39 96 110q0 54 -68 109q-120 96 -126 103q-68 72 -68 169q0 140 100.5 246.5t239.5 106.5q112 0 210 -56.5t119 -156.5q179 87 357 217l160 -124q73 -74 73 -186q0 -170 -256 -286q102 -70 128 -244 q8 -140 18 -277t78 -137q28 0 83 56l23 -31l-219 -174q-159 89 -159 384zM1122 1020q0 82 -61 144.5t-143 62.5q-57 0 -205 -88q22 -102 22 -426q187 69 245 104q142 85 142 203z" />
+<glyph unicode="&#x211d;" horiz-adv-x="1548" d="M1366 75q33 0 33 -37.5t-33 -37.5h-339q-16 0 -25 14l-387 598h-65v-430q0 -71 23 -89t87 -18t64 -36q0 -39 -34 -39h-603q-34 0 -34 39q0 36 67.5 36t87 19t19.5 92v975q0 71 -23.5 89t-87 18t-63.5 37.5t34 37.5h645q201 0 346 -81q177 -99 177 -285q0 -281 -342 -343 q356 -559 453 -559zM925 713q255 58 255 261.5t-263 271.5q72 -88 72 -269t-64 -264zM596 686q186 0 252 54.5t66 221t-54.5 236.5t-200.5 70q-109 0 -109 -75v-507h46zM1231 75q-147 136 -411 564q-48 -17 -118 -24l350 -540h179zM302 1161v-975q0 -71 -18 -111h210 q-19 40 -19 107v1011q0 42 22 75h-214q19 -40 19 -107z" />
+<glyph unicode="&#x211e;" horiz-adv-x="1596" d="M802 -1l-286 7h-326q-50 0 -122 -6v61l55 -1q122 0 140 38q7 15 7 48v1051q0 32 -7 48q-16 37 -158 37q-18 0 -37 -1v62h695q174 0 311 -94q154 -106 154 -272q0 -112 -74.5 -196t-188.5 -127q10 -27 144 -195l105 131q26 32 26 58q0 45 -52 47v68q95 -7 164 -7t160 7 v-68q-127 -2 -210 -87q-25 -26 -159 -196l233 -299q30 -39 77 -48q24 -5 91 -5v-66q-81 5 -150 5t-220 -5v66q63 2 63 38q0 10 -165 225q-151 -173 -151 -216t51 -47v-66q-121 5 -170 5zM1024 977q0 161 -75.5 232.5t-237.5 71.5h-186q-53 0 -69.5 -13t-16.5 -66v-532h272 q313 0 313 307zM779 619h-335v-467q0 -32 7 -48q20 -44 198 -44q133 0 226 103q5 6 161 206l-196 254q-31 -4 -61 -4z" />
+<glyph unicode="&#x211f;" horiz-adv-x="1508" d="M1440 173q0 -86 -51 -151t-135 -65q-330 0 -330 318q0 13 1 40v40q0 158 -76 230q-64 61 -165 67l-245 -526q2 -18 7 -31q14 -34 171 -34h26v-61q-74 6 -143 6h-117l-98 -211q-23 -49 -48 -49q-8 0 -24.5 7.5t-16.5 26t15 49.5l82 177h-82q-69 0 -143 -6v61 q6 0 24.5 -0.5t28.5 -0.5q125 0 142 35q7 15 7 46v1055q0 27 -6 45q-14 40 -167 40h-29v62h618q106 0 215 -34l28 60l-320 148q-48 22 -48 47q0 42 37 42q16 0 46 -14l333 -155q47 -22 47 -44q0 -14 -15 -46l-31 -67q221 -101 221 -288q0 -122 -115 -213q-94 -75 -229 -108 q165 -57 224 -182q25 -52 39 -149l25 -182q31 -158 118 -158q101 0 131 175q5 31 24 31q24 0 24 -33zM997 992q0 130 -61 199l-230 -493q291 19 291 294zM540 1283q-51 0 -69 -7q-32 -14 -32 -57v-523h176l254 545q-85 42 -329 42zM439 652v-333l155 333h-155z" />
+<glyph unicode="&#x2120;" horiz-adv-x="2174" d="M2122 1435l-78 2q-78 0 -78 -45v-707q0 -13 5 -23q9 -17 136 -17h15v-67q-72 5 -99 5h-266q-23 0 -95 -5v67q116 0 136 7t20 34v706l-349 -781q-14 -32 -39 -32t-41 36l-344 767v-656q0 -81 152 -81h4v-66q-160 4 -188.5 4t-190.5 -4v66h4q152 0 152 81v670q0 12 -4 21 q-8 18 -138 18h-14v67h275q43 0 59 -36l317 -710l319 714q14 32 49 32h281v-67zM512 1115q105 -27 170.5 -100.5t65.5 -187.5t-92.5 -195.5t-218.5 -81.5q-175 0 -276 86q-64 -86 -81 -86q-28 0 -28 32v288q0 32 31 32q36 0 36 -60q0 -90 85 -158t232 -68q78 0 134 50 t56 119.5t-43.5 118t-140.5 69.5l-183 39q-90 29 -148.5 96t-58.5 157q0 118 93 193t220 75t234 -87q62 87 78 87q31 0 31 -34v-287q0 -31 -34 -31q-22 0 -28 25l-21 80q-58 185 -265 185q-74 0 -130 -44t-56 -116q0 -104 126 -148z" />
+<glyph unicode="&#x2121;" horiz-adv-x="3030" d="M2631 858l-90 2q-87 0 -99 -19q-5 -8 -5 -25v-710q0 -30 9.5 -35t43.5 -5h133q155 0 215 69.5t79 229.5h63l-45 -365h-813v66q8 0 28 -0.5t31 -0.5q84 0 93 18q4 8 4 20v721q0 11 -4 19q-8 15 -136 15h-16v68q68 -5 100 -5h314q25 0 95 5v-68zM1122 0v66q53 -1 54 -1 q88 0 98 19q4 7 4 26v704q0 16 -5 26q-8 17 -102 17q-22 0 -49 -1v67h876l47 -321h-64q-19 153 -75.5 203.5t-211.5 50.5h-202q-36 0 -45.5 -5t-9.5 -35v-304h124q97 0 124 28.5t27 124.5h65v-374h-65q0 96 -27.5 125t-123.5 29h-124v-339q0 -30 9.5 -35t45.5 -5h210 q172 0 237 67q53 56 85 232h64l-70 -365h-896zM688 857q-53 0 -53 -31v-716q0 -14 6 -25q10 -19 169 -19h46v-67q-80 5 -123 5h-354q-44 0 -124 -5v67q10 0 36 -0.5t40 -0.5q129 0 140 20q4 8 4 25v717q0 30 -60 30q-188 0 -236.5 -38.5t-65.5 -216.5h-62l30 321h950 l30 -321h-63q-17 182 -72 222q-44 33 -238 33z" />
+<glyph unicode="&#x2122;" horiz-adv-x="2444" d="M2392 1435l-78 2q-78 0 -78 -45v-707q0 -13 5 -23q9 -17 136 -17h15v-67q-72 5 -99 5h-266q-23 0 -95 -5v67q116 0 136 7t20 34v706l-349 -781q-14 -32 -39 -32t-41 36l-344 767v-656q0 -81 152 -81h4v-66q-160 4 -188.5 4t-190.5 -4v66h4q152 0 152 81v670q0 12 -4 21 q-8 18 -138 18h-14v67h275q43 0 59 -36l317 -710l319 714q14 32 49 32h281v-67zM688 1436q-53 0 -53 -31v-716q0 -14 6 -25q10 -19 169 -19h46v-67q-80 5 -123 5h-354q-44 0 -124 -5v67q10 0 36 -0.5t40 -0.5q129 0 140 20q4 8 4 25v717q0 30 -60 30q-188 0 -236.5 -38.5 t-65.5 -216.5h-62l30 321h950l30 -321h-63q-17 182 -72 222q-44 33 -238 33z" />
+<glyph unicode="&#x2123;" horiz-adv-x="1536" d="M814 -6q-14 -37 -46.5 -37t-48.5 43l-165 436l-299 -641q-23 -49 -48 -49q-41 0 -41 37q0 14 15 46l333 714l-252 666q-22 57 -81 71q-20 5 -67 5q-20 0 -46 -1v62q213 -6 336 -6t196 6v-62h-18q-144 0 -144 -56q0 -31 172 -477l289 618l-320 148q-48 22 -48 47 q0 42 37 42q16 0 46 -14l333 -155q47 -22 47 -44q0 -14 -15 -46l-328 -702l175 -448l361 950q9 24 9 40q0 94 -143 97v62q153 -6 237.5 -6t177.5 6v-62q-164 -1 -214 -132z" />
+<glyph unicode="&#x2124;" horiz-adv-x="1351" d="M1157 0h-1069q-35 0 -35 39q0 10 749 1229h-147q-326 0 -431 -191l-23 -73q-16 -50 -43 -50q-37 0 -37 33v7l35 314q4 35 33 35h961q35 0 35 -37q0 -12 -4 -19l-744 -1212h277q135 0 247 66.5t173 184.5l38 121q12 32 37 32q37 0 37 -29q0 -3 -1 -7l-56 -407 q-5 -36 -32 -36zM318 1268h-91l-8 -74q42 43 99 74zM1081 1268h-191l-731 -1193h190zM1135 192q-59 -70 -139 -117h123z" />
+<glyph unicode="&#x2125;" horiz-adv-x="904" d="M755.5 304.5q112.5 -119.5 112.5 -305.5t-132 -309.5t-330 -123.5q-121 0 -215 54q-113 64 -113 170t97 106q42 0 70.5 -28t28.5 -70q0 -94 -100 -99q79 -78 229 -78q59 0 120 34q168 94 168 344q0 112 -44.5 210.5t-133.5 146.5q-63 34 -123 34q-113 0 -181 -64 q-40 -37 -74 -109.5t-53 -72.5q-29 0 -29 22.5t32.5 84.5t116.5 133l436 370h-504q-43 0 -43 29q0 17 20 36l517 476h-193q-147 0 -211 -51t-73 -188h-54l19 287h665q43 0 43 -28q0 -16 -20 -34l-520 -479h507q43 0 43 -28q0 -17 -20 -34l-348 -299q177 -17 289.5 -136.5z " />
+<glyph unicode="&#x2126;" horiz-adv-x="1462" d="M984 0q-25 0 -31.5 7t-6.5 33q0 150 101 423t101 423q0 184 -117 322t-300 138t-300 -138t-117 -322q0 -150 101.5 -423t101.5 -423q0 -40 -39 -40h-347l-64 320h49q17 -111 36.5 -144t36.5 -40.5t57 -7.5h214q-27 111 -120 256q-144 223 -153 240q-76 141 -76 272 q0 220 204 364q185 130 416 130t416 -130q204 -144 204 -364q0 -131 -76 -272q-9 -18 -153 -240q-93 -145 -120 -256h214q40 0 57 7.5t36.5 40.5t36.5 144h49l-64 -320h-347z" />
+<glyph unicode="&#x2127;" horiz-adv-x="1462" d="M1216 1215h-214q27 -111 120 -256q144 -223 153 -240q76 -141 76 -272q0 -220 -204 -364q-185 -130 -416 -130t-415 130q-205 144 -205 364q0 131 76 272q9 17 153 240q93 145 120 256h-214q-40 0 -57 -7.5t-36.5 -40.5t-36.5 -144h-49l64 320h347q39 0 39 -40 q0 -150 -101.5 -423t-101.5 -423q0 -184 117 -322t300 -138t300 138t117 322q0 150 -101 423t-101 423q0 26 6.5 33t31.5 7h347l64 -320h-49q-17 111 -36.5 144t-36.5 40.5t-57 7.5z" />
+<glyph unicode="&#x2128;" horiz-adv-x="1358" d="M1184 164q0 -236 -187 -373q-167 -123 -411 -123q-174 0 -270 94q-44 43 -110 173q-47 94 -102 94q-76 0 -86 -103h-32q9 76 66.5 123t133.5 47q122 0 195 -100l112 -186q71 -101 189 -101q291 0 291 402q0 483 -252 483q-146 0 -197 -141l-30 16q39 103 149 143 q-95 39 -143 125l26 21q70 -117 174 -117q123 0 187 101q55 85 55 212q0 169 -72 272q-82 117 -243 117q-138 0 -255.5 -87.5t-117.5 -221.5q0 -54 20 -98l-26 -14q-27 60 -27 116q0 155 132 248.5t306 93.5t315 -96q161 -109 161 -289q0 -135 -108 -239q-91 -88 -234 -135 q179 -38 285 -157.5t106 -299.5z" />
+<glyph unicode="&#x2129;" horiz-adv-x="748" d="M396 662q0 231 -148 231q-102 0 -131 -139q-12 -56 -12 -182v-37h-53v122q0 114 48 194q58 96 164 96q133 0 203 -78t70 -212v-473q0 -86 41 -106q20 -11 103 -11h14v-67l-299 -23v685z" />
+<glyph unicode="&#x212a;" horiz-adv-x="2219" d="M1349 1284l-57 2q-126 0 -142 -40q-6 -15 -6 -44v-636l618 588q36 34 36 67q0 61 -91 63v62q69 -6 217.5 -6t201.5 6v-62q-160 -2 -281 -118l-356 -340l456 -670q42 -62 83.5 -78.5t122.5 -16.5v-61q-127 6 -281.5 6t-225.5 -6v61h4q113 0 113 59q0 22 -31 68l-357 528 l-229 -218v-359q0 -28 9 -45q17 -33 186 -33h10v-61q-71 6 -120 6h-347q-43 0 -114 -6v61q8 0 26.5 -0.5t28.5 -0.5q125 0 141 40q6 15 6 44v1066q0 27 -7 41q-16 33 -176 33h-19v62q70 -6 119 -6h342q50 0 120 6v-62zM623.5 1296.5q89.5 -89.5 89.5 -218t-90 -218 t-218 -89.5t-217.5 89.5t-89.5 218t89 218t218 89.5t218.5 -89.5zM563 921q65 65 65 158.5t-64.5 158t-158.5 64.5t-158.5 -64.5t-64.5 -158t65 -158.5t158 -65t158 65z" />
+<glyph unicode="&#x212b;" horiz-adv-x="1484" d="M1417 0q-127 6 -297.5 6t-244.5 -6v61h5q157 0 157 59q0 29 -39 136l-70 192h-487l-61 -163q-34 -90 -34 -123q0 -51 52 -78q42 -23 97 -23v-61q-189 6 -239.5 6t-187.5 -6v61q174 2 219 133l358 1029q-104 58 -104 178q0 84 58.5 144.5t142.5 60.5t142.5 -59.5 t58.5 -143.5q0 -121 -104 -180l374 -1083q21 -61 84 -75q19 -5 77 -5q19 0 43 1v-61zM873 1403q0 54 -38.5 93.5t-92 39.5t-92.5 -40.5t-39 -94.5t38.5 -93.5t92 -39.5t92.5 40.5t39 94.5zM906 510l-222 641l-220 -641h442z" />
+<glyph unicode="&#x212c;" horiz-adv-x="1734" d="M1828 1119q0 -127 -133 -234q-73 -58 -245 -143q251 -100 251 -297q0 -169 -165.5 -314t-336.5 -145q-66 0 -110 37t-44 101q0 179 214 295l16 -27q-80 -43 -139 -116t-59 -154q0 -40 25.5 -70.5t64.5 -30.5q81 0 189 165q129 198 129 380q0 109 -79 159 q-82 -31 -129.5 -31t-47.5 31q0 46 80 46q42 0 95 -15q99 36 165.5 172.5t66.5 253.5t-72 164q-161 -88 -240 -238q-42 -80 -111 -323l-42 -148q-83 -294 -276 -466q-209 -187 -501 -187q-146 0 -243 60q-116 73 -116 211q0 81 49 135.5t128 54.5q49 0 88.5 -31.5 t39.5 -86.5t-57 -86l-108 -39q-55 -19 -55 -56q0 -62 96 -101q75 -30 149 -30q157 0 273 132q74 82 163 270l129 271q150 314 323 478q116 110 279 196q-117 42 -276 42q-245 0 -488 -87.5t-383 -254.5q-104 -124 -104 -243q0 -65 40.5 -110.5t110 -45.5t169.5 65 q126 82 204.5 216.5t89.5 285.5l27 8q14 -93 14 -151q0 -184 -94 -306q-127 -165 -341 -165q-104 0 -178 51.5t-74 151.5q0 128 111 260q150 178 395.5 267t505.5 89q167 0 327 -45q55 25 147 49l8 -29q-67 -19 -114 -37q199 -88 199 -254z" />
+<glyph unicode="&#x212d;" horiz-adv-x="1257" d="M713 -8q-277 0 -451 226q-160 208 -160 493q0 216 74 405q98 250 279 250q139 0 188 -160l154 193q148 -96 233 -96t139 71l29 -16q-125 -182 -278 -182q-78 0 -201 65q-70 -70 -70 -129q0 -84 106.5 -256t106.5 -260q0 -167 -182 -326l-21 29q66 56 66 138.5 t-96.5 245.5t-96.5 259.5t82 224.5q-8 63 -47 110.5t-98 47.5q-207 0 -207 -465q0 -287 95 -473q123 -242 382 -242q348 0 453 224h33q-133 -377 -512 -377z" />
+<glyph unicode="&#x212e;" horiz-adv-x="1188" d="M1120 648q0 -34 -8.5 -42t-42.5 -8h-755v-294q0 -15 33 -77q101 -194 326 -194q267 0 382 267q14 33 30 33q28 0 28 -33t-41 -100q-64 -105 -176 -164.5t-237 -59.5q-262 0 -426.5 173t-164.5 437q0 229 165.5 396t387.5 167t360.5 -143t138.5 -358zM921 644v211 q-90 243 -293 243q-225 0 -314 -245v-209h607z" />
+<glyph unicode="&#x212f;" horiz-adv-x="940" d="M966 236q0 -17 -46 -67q-179 -193 -439 -193q-157 0 -243 112.5t-86 282.5t92 315.5t252 221.5q107 51 205.5 51t167 -48.5t68.5 -134.5q0 -183 -230 -243q-118 -30 -377 -30q-34 -147 -34 -224q0 -260 191 -260q221 0 365 148q90 93 92 93q22 0 22 -24zM872 776 q0 66 -47 102.5t-115 36.5q-139 0 -243 -119q-85 -98 -128 -249h110q423 0 423 229z" />
+<glyph unicode="&#x2130;" horiz-adv-x="1204" d="M1429 1172q0 -100 -63.5 -183t-161.5 -83q-63 0 -102 45t-39 109q0 121 157 215l20 -22q-122 -103 -122 -220q0 -40 25.5 -69.5t65.5 -29.5q82 0 135 77.5t53 168.5t-61 155.5t-157 64.5q-140 0 -251.5 -125t-111.5 -267q0 -71 33 -137q31 1 68.5 1t98.5 -16 q87 -23 87 -66q0 -49 -79 -49q-100 0 -232 78q-168 -54 -275 -213.5t-107 -340.5q0 -252 261 -252q156 0 278 82t168 228q16 51 16 100t-35.5 92t-104.5 43t-141 -74q-116 -119 -120 -315h-31q-25 61 -25 123q0 126 86.5 215t212.5 89q81 0 136.5 -51.5t55.5 -131.5 q0 -148 -119 -275q-147 -157 -381 -157q-197 0 -334 107q-156 122 -156 312t190 321q151 103 370 139q-120 109 -120 244.5t132 236.5t346 101q146 0 233 -60q101 -70 101 -210zM1010 773q38 0 38 22t-47.5 34t-73.5 12t-55 -4q68 -64 138 -64z" />
+<glyph unicode="&#x2131;" horiz-adv-x="1414" d="M1623 1225q-100 0 -284.5 77.5t-292.5 77.5q-168 0 -338 -100q-135 -79 -232.5 -201t-97.5 -257q0 -72 44 -123.5t115 -51.5q115 0 249 202q104 157 104 280q0 58 -28 127l31 7q70 -156 70 -277q0 -156 -117.5 -264.5t-274.5 -108.5q-99 0 -162.5 55t-63.5 152 q0 206 210 387q270 233 639 233q103 0 189 -16q274 -51 351 -51t146 60l24 -17q-126 -191 -281 -191zM1563 793q0 -47 -46 -94q-16 -15 -86 -68q-2 -165 -61 -261q-94 -15 -165 -34q75 118 130 260q-56 -18 -110 -23q-36 -145 -136 -280q-234 -314 -615 -314 q-181 0 -269.5 83t-88.5 186q0 77 51.5 133.5t128.5 56.5q48 0 88.5 -31.5t40.5 -85t-56 -83.5l-104 -39q-56 -23 -56 -63t63.5 -81.5t164.5 -41.5q157 0 271 130q69 79 159 269l69 146q-194 -29 -346 -178l-22 23q93 89 176 131t206 58q215 441 490 613l22 -22 q-59 -42 -89 -102t-65 -197l-74 -277q57 5 116 25q40 104 56 133q46 81 101.5 81t55.5 -53zM1528 791q0 23 -24 23q-48 0 -69 -141q93 67 93 118z" />
+<glyph unicode="&#x2132;" horiz-adv-x="1271" d="M1203 0h-1081l-54 442h49q24 -217 89 -291q77 -89 286 -89h252q45 0 64 11.5t19 67.5v501h-170q-132 0 -171 -48t-39 -183h-48v522h48q0 -136 39 -183.5t171 -47.5h170v497q0 27 -7 44q-16 39 -209 39h-37v61q74 -6 135 -6h373q49 0 121 6v-61h-75q-64 0 -88 -10 q-39 -18 -39 -73v-1056q0 -25 6 -42q14 -39 166 -39h30v-62z" />
+<glyph unicode="&#x2133;" horiz-adv-x="2418" d="M2539 1341q109 87 142 87t33 -21.5t-47 -87.5t-125 -201.5t-129 -241.5q-347 -726 -347 -829q0 -31 29 -31q54 0 177 132q90 96 153 186l28 -17q-253 -337 -384 -337q-76 0 -117 72t-41 153q0 246 275 626q133 184 460 546q-373 -239 -846 -960l-164 -243 q-29 -43 -91 -123q-61 -69 -96.5 -69t-72 48.5t-36.5 147.5q0 243 229 617q112 182 397 556q-221 -192 -586 -648q-249 -310 -692 -599q-186 -121 -222 -121t-36 25q0 14 45 59q493 488 622 937q32 111 32 198q0 201 -205 201q-236 0 -482.5 -214t-246.5 -446 q0 -81 47.5 -139t127.5 -58q135 0 278.5 223t143.5 375q0 32 -9 95l28 6q48 -138 48 -258q0 -154 -85.5 -277.5t-230.5 -174.5q-71 -25 -137 -25q-110 0 -176.5 62.5t-66.5 171.5q0 182 156 364q134 158 306 244.5t337 86.5t282.5 -93.5t117.5 -255.5q0 -299 -445 -786 q260 204 471.5 467t273.5 332q163 185 317 299q34 25 49 25q29 0 29 -23q0 -11 -13 -34q-158 -275 -350 -774l-118 -315q-27 -75 -74 -228q62 64 271 382q408 621 766 906z" />
+<glyph unicode="&#x2134;" horiz-adv-x="854" d="M458 247l9 -125q0 -13 -19.5 -13t-22.5 11q-9 37 -9 142.5t38.5 246.5t104 216t129.5 75q142 0 142 -194t-115 -397q-132 -233 -303 -233q-143 0 -217.5 91.5t-74.5 237.5q0 243 165.5 448.5t402.5 205.5q70 0 123 -40.5t53 -108.5q0 -17 -21.5 -17t-21.5 20 q0 47 -36.5 76.5t-84.5 29.5q-180 0 -304 -261q-103 -217 -103 -429t119 -212q151 0 261 230q92 194 92 366q0 147 -75 147q-61 0 -123 -96q-50 -77 -79.5 -196.5t-29.5 -220.5z" />
+<glyph unicode="&#x2135;" horiz-adv-x="1417" d="M248 1363l-14 -72q0 -86 94 -182q73 -75 135 -126l360 -297l264 330q-126 102 -126 190q0 139 181 175q-38 -54 -38 -93q0 -64 111.5 -157.5t111.5 -171.5t-89 -128q-28 94 -102 149l-268 -333l213 -179q145 -130 178 -196q21 -42 21 -81q0 -88 -78 -175q-48 -53 -67 -53 t-19 17q0 8 13 43t13 57q0 73 -77 154q-26 28 -135 118l-586 485q-124 -148 -124 -251.5t138 -241.5t138 -215q0 -166 -250 -166q-83 0 -83 31q0 3 46.5 31t46.5 73.5t-51 151.5t-62.5 146.5t-11.5 104.5q0 155 175 368l-142 136q-74 71 -74 149q0 47 26 98q66 129 112 129 q20 0 20 -18z" />
+<glyph unicode="&#x2136;" horiz-adv-x="1366" d="M1186 179l40 2q50 0 50 -41q0 -17 -9 -26l-109 -104q-10 -10 -27 -10h-1006q-35 0 -35 39q0 17 14 33.5t66 61.5t67 45h871v804q0 60 -86 60h-450q-191 0 -272 38q-122 57 -122 226q0 74 35 74q17 0 41 -45.5t29 -50.5q61 -62 289 -62h456q101 0 135 -60q23 -42 23 -152 v-832z" />
+<glyph unicode="&#x2137;" horiz-adv-x="950" d="M757 1223q103 0 103 -91q0 -89 -101 -89h-2q0 -22 35 -366t35 -552t-76 -208q-48 0 -66 167q-80 -84 -98 -84h-462q-35 0 -35 39q0 17 15 34.5t66 61.5t66 44h441v864q-19 0 -61 -0.5t-63 -0.5q-178 0 -261 43q-115 60 -115 222q0 74 35 74q17 0 41.5 -46t28.5 -50 q58 -62 289 -62h185z" />
+<glyph unicode="&#x2138;" horiz-adv-x="1297" d="M1103 1223q104 0 104 -91q0 -89 -102 -89h-2q0 -27 35.5 -371.5t35.5 -549.5t-76 -205q-39 0 -60 119q-14 82 -14 159v848h-541q-191 0 -271 38q-122 57 -122 226q0 74 35 74q17 0 42.5 -46.5t28.5 -49.5q58 -62 287 -62h620z" />
+<glyph unicode="&#x2139;" horiz-adv-x="922" d="M831 1267q0 -68 -54 -116.5t-123 -48.5q-151 0 -151 166q0 62 55 110t118 48q155 0 155 -159zM723 349q28 -11 28 -33.5t-20 -47.5q-228 -290 -462 -290q-133 0 -133 125q0 95 51 225l195 497q4 10 4 20q0 31 -29 31q-42 0 -129 -96t-98 -96q-7 0 -11 4q-18 5 -18 25 t44 72q200 236 410 236q150 0 150 -141q0 -52 -20 -106l-177 -475q-25 -67 -25 -102.5t23 -35.5q39 0 123 93.5t94 94.5z" />
+<glyph unicode="&#x213a;" horiz-adv-x="1457" d="M734 1267q281 0 468.5 -214t187.5 -498.5t-186.5 -502.5t-468 -218t-468 217.5t-186.5 503.5q0 209 107 390.5t292 265.5q-62 192 -188 192q-138 0 -180 -166q-9 -35 -21 -35q-23 0 -23 41q0 135 52 236q65 127 189 127t183 -130q34 -73 56 -239q95 30 186 30z M816.5 1012.5q34.5 36.5 34.5 87t-33 84.5t-84 34q-92 0 -174 -46q36 -196 172 -196q50 0 84.5 36.5zM1195 555q0 213 -69 375q-86 199 -259 263q28 -45 28 -103.5t-47.5 -107.5t-115.5 -49q-144 0 -221 208q-233 -172 -233 -586q0 -455 262 -613q96 -58 194.5 -58t193.5 56 q267 157 267 615z" />
+<glyph unicode="&#x213b;" horiz-adv-x="3003" d="M2950 -1q-122 5 -248 5t-195 -5v67q99 3 99 27q0 3 -234 309q-218 -279 -218 -288q0 -46 95 -48v-67q-71 5 -147 5t-240 -4v66q157 0 222 83l243 311l-273 358q-25 32 -80 39q-11 2 -42 2q-20 0 -50 -1v68q107 -5 240.5 -5t202.5 5v-67q-98 -3 -98 -27q0 -9 193 -253 q174 224 174 232q0 46 -93 48v67q78 -5 146.5 -5t239.5 4v-67q-160 -1 -222 -80l-202 -257l314 -413q26 -34 80 -41q11 -2 42 -2q21 0 51 1v-67zM1835 -1q-122 5 -246.5 5t-195.5 -5v67h25q99 0 99 27q0 18 -79 206h-358q-69 -159 -69 -178q0 -55 115 -55v-66q-145 4 -197 4 t-157 -4v66q138 2 170 81l314 787q14 34 47 34t47 -34l327 -823q15 -38 69 -45q5 -1 27.5 -0.5t61.5 0.5v-67zM612 856h-194q-33 0 -42 -5.5t-9 -34.5v-322h118q97 0 123 30.5t26 123.5h62v-374h-62q0 94 -26 124t-123 30h-118v-319q0 -15 4 -24q9 -19 149 -19h41v-67 q-71 5 -109 5h-301q-30 0 -99 -5v67q117 0 136.5 7.5t19.5 35.5v706q0 13 -4 23q-8 19 -111 19q-19 0 -41 -1v67h855l45 -321h-63q-19 152 -71.5 203t-205.5 51zM1411 366l-152 382l-151 -382h303z" />
+<glyph unicode="&#x213c;" horiz-adv-x="1421" d="M1498 897.5q25 -25.5 25 -67t-34.5 -77t-82.5 -35.5h-254q-6 -81 -6 -127q0 -105 28 -197t73 -174.5t45 -101.5q0 -57 -52.5 -100.5t-111.5 -43.5q-91 0 -140 135q-35 100 -35 235t50 374h-246l-103 -492q-29 -141 -44 -169q-40 -81 -142 -81q-43 0 -86 27t-43 63.5 t55 155.5l101 214q69 152 111 282h-153q-172 0 -230 -75q-36 -47 -65.5 -47t-29.5 28q0 7 6 17q162 282 374 282h930q35 0 60 -25.5zM1448 837q0 11 -10 11h-930q-82 0 -161 -63q45 8 106 8h953q42 0 42 44zM1071 591q0 44 4 105q-47 -230 -47 -373q0 -69 22 -156 q30 -118 78 -118q33 0 60 25t27 46l-100 225q-44 117 -44 246zM468 51q63 0 88 68l119 575q-64 -180 -144.5 -352.5t-117.5 -267.5q17 -23 55 -23z" />
+<glyph unicode="&#x213d;" horiz-adv-x="1424" d="M1509 897q0 -9 -13 -26q-208 -269 -313 -505q-65 -146 -77 -313q-2 -77 -10 -230q-18 -265 -181 -265q-44 0 -72 34.5t-28 79.5q0 108 111 333.5t111 372.5q0 178 -148 268q-122 74 -297.5 74t-248.5 -86l-39 -60q-28 -42 -50 -42q-37 0 -37 37q0 5 3 12 q153 378 482.5 378t419.5 -554q278 530 352 530q35 0 35 -38zM966 685q-95 199 -261.5 199t-280.5 -114q75 25 153 25q241 0 389 -110zM890 -328q0 -39 25 -39q115 0 115 341v32q0 43 2 61l-95 -205q-47 -111 -47 -190z" />
+<glyph unicode="&#x213e;" horiz-adv-x="1268" d="M1167 991q0 -37 -35 -37q-39 0 -39 37q0 133 -129 211q-109 66 -252 66h-121q-55 0 -55 -111v-988q0 -70 51 -86q26 -8 125 -8q41 0 41 -36q0 -39 -35 -39h-631q-34 0 -34 39q0 36 57 36q78 0 96.5 19t18.5 92v975q0 74 -27 92q-19 14 -97 14q-48 0 -48 38t34 38h1048 q32 0 32 -35v-317zM1092 1268h-92q54 -32 92 -74v74zM300 1161v-975q0 -71 -17 -111h197q-19 36 -19 94v988q0 64 21 111h-200q18 -39 18 -107z" />
+<glyph unicode="&#x213f;" horiz-adv-x="1666" d="M1463 76q48 0 48 -38t-35 -38h-599q-33 0 -33 39q0 36 55 36q78 0 97 19t19 92v982q0 63 -22 81.5t-84 18.5h-255q-53 0 -76 -12q-30 -14 -30 -99v-982q0 -69 30 -87q19 -12 94 -12q48 0 48 -38t-35 -38h-599q-33 0 -33 39q0 36 57 36q78 0 96.5 19t18.5 92v982 q0 99 -87 99q-6 0 -17.5 -0.5t-16.5 -0.5q-51 0 -51 38.5t33 38.5h1390q35 0 35 -37.5t-57 -37.5q-77 0 -96.5 -19t-19.5 -92v-982q0 -69 25.5 -84t99.5 -15zM1263 175v982q0 72 17 111h-208q18 -38 18 -100v-982q0 -72 -17 -111h208q-18 38 -18 100zM300 1168v-982 q0 -71 -17 -111h208q-18 38 -18 100v982q0 71 18 111h-213q22 -41 22 -100z" />
+<glyph unicode="&#x2140;" horiz-adv-x="1377" d="M1157 0h-1069q-35 0 -35 39q0 10 383 631l-379 617q-4 7 -4 19q0 37 34 37h1085q31 0 35 -35l34 -314v-7q0 -33 -37 -33q-26 0 -40 44l-26 79q-51 101 -187 151q-109 40 -244 40h-272l368 -598l-366 -595h277q133 0 247 67t173 184q11 41 38 121q12 32 37 32q37 0 37 -29 q0 -3 -1 -7l-56 -407q-5 -36 -32 -36zM1144 1197l-8 71h-90q57 -30 98 -71zM1135 192q-59 -70 -140 -117h124zM715 670l-368 598h-190l367 -598l-353 -573q-6 -11 -15 -22h193z" />
+<glyph unicode="&#x2141;" horiz-adv-x="1438" d="M638 1390q317 0 495 -201.5t178 -516.5t-168 -509q-177 -206 -481 -206q-236 0 -430 100q-52 27 -78.5 46.5t-26.5 47.5t19.5 49t41 21t40.5 -11q210 -123 434 -123q250 0 384.5 162t134.5 423t-140 424.5t-403 163.5q-170 0 -348 -69v-364h311q65 0 65 -65t-65 -65h-376 q-26 0 -45.5 19.5t-19.5 45.5v473q0 74 206 120q154 35 272 35z" />
+<glyph unicode="&#x2142;" horiz-adv-x="1122" d="M1019 22q0 -65 -65 -65t-65 65v1191h-770q-65 0 -65 65t65 65h835q26 0 45.5 -19.5t19.5 -45.5v-1256z" />
+<glyph unicode="&#x2143;" horiz-adv-x="1122" d="M1019 65q0 -26 -19.5 -45.5t-45.5 -19.5h-835q-65 0 -65 65t65 65h770v1191q0 65 65 65t65 -65v-1256z" />
+<glyph unicode="&#x2144;" horiz-adv-x="1131" d="M1050 78q11 -17 11 -39.5t-20.5 -42t-50.5 -19.5t-50 31l-374 589l-375 -589q-20 -31 -50 -31t-50.5 19.5t-20.5 42t11 39.5l420 659v584q0 65 65 65t65 -65v-584z" />
+<glyph unicode="&#x2145;" horiz-adv-x="1410" d="M1393 853q0 -80 -17 -155q-70 -310 -292.5 -504t-534.5 -194h-606l-22 13q-3 7 -3 17q0 36 40 45q14 3 68 3q64 0 87 108l206 970q8 38 8 59q0 41 -41 49q-9 2 -74 2l-22 13q-3 7 -3 20t13.5 28.5t29.5 15.5h605q243 0 400.5 -126.5t157.5 -363.5zM1316 836 q0 299 -274 397q84 -110 84 -314t-85.5 -442.5t-225.5 -359.5q190 67 316.5 222.5t169.5 358.5q15 71 15 138zM1049 906q0 360 -260 360q-120 0 -137 -79l-220 -1033q-2 -9 -2 -14q0 -63 93 -63q372 0 503 618q23 109 23 211zM399 1268q4 -16 4 -43t-9 -69l-206 -970 q-14 -68 -43 -111h220q-11 22 -11 43.5t3 35.5l220 1033q10 47 42 81h-220z" />
+<glyph unicode="&#x2146;" horiz-adv-x="1349" d="M1419 309q0 -112 -89.5 -222.5t-200.5 -110.5q-182 0 -281 113q-143 -113 -293 -113q-181 0 -292 97.5t-111 276.5q0 254 173.5 431.5t426.5 177.5q119 0 210 -73l93 431q3 13 3 24q0 47 -46 47h-6l-53 -3q-39 -2 -39 38q0 35 36 37l380 16h4q41 0 41 -36q0 -2 -1 -6 l-261 -1217q-7 -33 -7 -78q0 -85 31 -85q129 0 188 192q5 24 20 71q12 29 36 29q38 0 38 -37zM1042 60q-11 25 -11 95.5t9 112.5l250 1131l-163 -7q7 -19 7 -43q0 -22 -6 -48l-235 -1108q-2 -13 -7 -38q68 -77 156 -95zM934 767q-48 106 -169.5 106t-196.5 -143 q-43 -83 -79 -250t-36 -253q0 -166 126 -166q134 0 239 132q0 18 3 34zM227 350q0 -216 187 -278q-36 62 -36 162t38.5 271.5t85.5 259.5q25 47 56 83q-152 -60 -241.5 -196.5t-89.5 -301.5z" />
+<glyph unicode="&#x2147;" horiz-adv-x="1175" d="M1195 198q0 -13 -9 -24q-159 -198 -551 -198q-205 0 -344 103.5t-139 302.5q0 264 213 428q195 149 467 149q121 0 213 -49q113 -60 113 -170q0 -189 -264 -253q-139 -34 -414 -34q-25 -103 -25 -187t50 -149.5t130 -65.5q286 0 434 114q18 14 59 57q14 14 28 14 q39 0 39 -38zM1083 740q0 63 -72.5 103.5t-172 40.5t-132 -17t-82.5 -78q-69 -83 -124 -261q583 0 583 212zM227 382q0 -220 209 -298q-56 83 -56 198.5t57 290.5t131 264q-154 -58 -247.5 -176.5t-93.5 -278.5z" />
+<glyph unicode="&#x2148;" horiz-adv-x="894" d="M804 1473q44 -43 44 -112.5t-58.5 -126t-128 -56.5t-114 42.5t-44.5 112.5t58.5 126.5t128.5 56.5t114 -43zM919 314q0 -6 -2 -13q-105 -325 -359 -325q-101 0 -184 48q-99 56 -99 149q0 32 14 70l173 474q23 63 23 114t-25 51q-77 0 -171 -87t-94 -164q0 -37 -37.5 -37 t-37.5 37q0 117 120.5 222.5t230.5 105.5t193 -48q99 -57 99 -151q0 -31 -13 -66l-174 -475q-25 -68 -25 -118t21 -50q149 0 239 187q10 29 34 86q13 26 35 26q39 0 39 -36zM737 1287q36 34 36 72.5t-22 60t-61 21.5t-75.5 -34.5t-36.5 -80.5q0 -73 77 -73q46 0 82 34z M688 760q0 82 -132 115q4 -18 4 -38q0 -70 -28 -146l-173 -474q-9 -26 -9 -44q0 -79 129 -112q-3 15 -3 31q0 72 30 153l174 475q8 23 8 40z" />
+<glyph unicode="&#x2149;" horiz-adv-x="770" d="M839 1472.5q45 -43.5 45 -113.5t-58 -125.5t-128.5 -55.5t-115 42.5t-44.5 112t58 126.5t128 57t115 -43.5zM790 743q0 -18 -5 -41l-180 -830q-32 -148 -193 -236q-141 -77 -309 -77q-87 0 -159 37q-89 46 -89 125q0 64 46.5 110t102 46t88.5 -30.5t33 -77.5 q0 -78 -65 -121q14 -3 24 -3q87 0 149.5 78t83.5 173l175 812q14 66 14 105q0 70 -46 70q-81 0 -162.5 -54t-128.5 -127l-43 -83q-13 -24 -34 -24q-39 0 -39 36q0 7 3 15q52 134 167.5 223.5t242 89.5t216.5 -50q108 -61 108 -166zM773 1286.5q36 33.5 36 72.5t-23.5 60.5 t-62.5 21.5t-74.5 -34.5t-35.5 -80.5q0 -73 78 -73q46 0 82 33.5zM715 743q0 92 -141 129q7 -26 7 -66t-16 -114l-175 -812q-28 -129 -111 -219q218 68 253 227l180 830q3 15 3 25zM-22 -337q7 19 39.5 46.5t32.5 60t-35.5 32.5t-60 -24t-24.5 -57t48 -58z" />
+<glyph unicode="&#x214a;" horiz-adv-x="1595" d="M1299 1039q196 -91 196 -334.5t-202 -339.5q-142 -68 -420 -68h-78v-167h546q65 0 65 -65t-65 -65h-611q-26 0 -45.5 19.5t-19.5 45.5v907h-370v-610q0 -65 -65 -65t-65 65v675q0 26 19.5 45.5t45.5 19.5h435v219q0 65 65 65t65 -65v-219h99q269 0 405 -63zM1198 468 q167 65 167 237t-163 231q-98 36 -303 36h-104v-546h84q213 0 319 42z" />
+<glyph unicode="&#x214b;" horiz-adv-x="1500" d="M1411 1091q0 -73 -42 -136q-20 -31 -105 -119l-166 -177q79 -200 79 -392q0 -121 -72 -215t-190 -94q-87 0 -132 85q-36 68 -36 163q0 130 235 390q-99 258 -319 514q-61 -75 -174.5 -246.5t-113.5 -211.5q0 -85 134 -85h3v-61q-87 6 -199 6t-224 -6v61q116 1 177 49 q44 34 121.5 166.5t128 211t116.5 154.5q-145 173 -266 173q-90 0 -151.5 -63.5t-65.5 -153.5h-48q3 117 79 196.5t193 79.5q172 0 340 -146q163 146 349 146q136 0 242.5 -78.5t106.5 -210.5zM1081 703q91 87 130.5 154t39.5 175t-47 190q-56 99 -158 99q-157 0 -297 -125 q192 -192 332 -493zM1056 223q0 154 -58 326q-202 -218 -202 -345q0 -73 23 -128q30 -76 99 -76t108 78q30 61 30 145z" />
+<glyph unicode="&#x214c;" horiz-adv-x="1483" d="M1293 801q95 -99 95 -237t-127 -231l-30 43q98 74 98 187q0 93 -74 160q-161 -199 -402 -255q18 -126 18 -209q0 -309 -216 -309q-137 0 -194 64t-57 187t29 269q-285 63 -285 246q0 115 126 192q101 62 258 88q17 134 17 222t-52 114q-35 18 -104.5 18t-116.5 -17 q-63 -23 -63 -64.5t40 -51.5q15 -4 73 -4q18 0 18 -19q0 -58 -85 -58h-3q-161 40 -161 192t148 152q32 0 94 -14t88.5 -14t64 15t57.5 15q55 0 55 -74q0 -169 -14 -404q49 6 86 6t71 -2q-3 63 -3 122q0 210 77 284q59 57 143 57q119 0 237 -102q143 -124 143 -365 q0 -80 -49 -203zM1150 1017q0 419 -187 419q-116 0 -152 -124q-19 -64 -19 -219q0 -43 2 -90q202 -22 354 -99q2 50 2 113zM1142 818q-146 93 -343 107q15 -208 46 -407q138 29 209.5 95.5t87.5 204.5zM750 928h-54q-40 0 -114 -10l-27 -414q53 -5 111 -5t128 10 q-17 140 -44 419zM219 679q0 -111 225 -158q24 101 63 305l12 82q-300 -59 -300 -229zM817 245q0 53 -17 212q-71 -11 -133.5 -11t-114.5 5q-6 -140 -6 -234t34 -150.5t100 -56.5q137 0 137 235z" />
+<glyph unicode="&#x214d;" horiz-adv-x="2070" d="M1782 267q105 -27 170.5 -100.5t65.5 -187.5t-92.5 -195.5t-218.5 -81.5q-175 0 -276 86q-64 -86 -81 -86q-28 0 -28 32v288q0 32 31 32q36 0 36 -60q0 -90 85 -158t232 -68q78 0 134 50t56 119.5t-43.5 118t-140.5 69.5l-183 39q-90 29 -148.5 96t-58.5 157 q0 118 93 193t220 75t234 -87q62 87 78 87q31 0 31 -34v-287q0 -31 -34 -31q-22 0 -28 25l-21 80q-58 185 -265 185q-74 0 -130 -44t-56 -116q0 -104 126 -148zM1840 1455l-1155 -1746h-89l1155 1746h89zM1115 578q-122 5 -246.5 5t-195.5 -5v67h25q99 0 99 27q0 18 -79 206 h-358q-69 -159 -69 -178q0 -55 115 -55v-66q-145 4 -197 4t-157 -4v66q138 2 170 81l314 787q14 34 47 34t47 -34l327 -823q15 -38 69 -45q5 0 27.5 -0.5t61.5 0.5v-67zM691 945l-152 382l-151 -382h303z" />
+<glyph unicode="&#x214e;" horiz-adv-x="1003" d="M952 -1h-855l-45 321h63q19 -152 71.5 -203t205.5 -51h194q33 0 42 5.5t9 34.5v322h-118q-97 0 -123 -30.5t-26 -123.5h-62v374h62q0 -94 26 -124t123 -30h118v319q0 15 -4 24q-9 19 -149 19h-41v67q71 -5 109 -5h301q30 0 99 5v-67q-117 0 -136.5 -7.5t-19.5 -35.5v-706 q0 -13 4 -23q8 -19 111 -19q19 0 41 1v-67z" />
+<glyph unicode="&#x214f;" horiz-adv-x="1632" d="M1265 139q-110 -137 -230.5 -137t-227.5 120q-109 -122 -215 -122q-129 0 -231 130q-126 -122 -296 -122l-15 114h3q146 0 260 85q-65 154 -65 268q0 74 30 130q36 70 102.5 70t99.5 -60.5t33 -131.5q0 -158 -103 -295q71 -74 170 -74t179 78q-80 138 -80 279 q0 76 29 132q36 72 101.5 72t100 -60t34.5 -129q0 -135 -94 -302q60 -70 170 -70t192 85q-95 142 -95 278q0 74 35 136t101 62t99.5 -59.5t33.5 -129.5q0 -134 -76 -273q118 -89 272 -91l-13 -114q-178 8 -304 131zM1259 261q64 104 64 199t-68 95q-77 0 -77 -116 q0 -94 81 -178zM802 240q79 112 79 213.5t-66 101.5q-39 0 -58 -39t-19 -82q0 -109 64 -194zM361 252q89 97 89 201t-66 104q-39 0 -58 -40.5t-19 -84.5q0 -108 54 -180z" />
+<glyph unicode="&#x2150;" horiz-adv-x="1722" d="M142 643l67 -2q109 0 123 24q5 9 5 30v708q-80 -31 -204 -31v62q193 0 290 89h12q38 0 38 -45v-786q0 -18 5 -28q11 -21 175 -21h15v-64q-67 5 -112 5h-302q-45 0 -112 -5v64zM1419 1415q0 -13 -6 -22l-1071 -1667q-11 -17 -35 -17q-40 0 -40 40q0 13 6 22l1071 1667 q11 17 35 17q40 0 40 -40zM1686 564q0 -26 -16 -46l-212 -262q-73 -91 -97 -253q-14 -94 -14 -276q0 -86 -82 -86t-82 86q0 258 194 527q1 1 161 203h-353q-84 0 -97 -7t-35 -128h-60l56 306h56q2 -17 9 -24q20 -20 182 -20h390v-20z" />
+<glyph unicode="&#x2151;" horiz-adv-x="1722" d="M1661 138q0 -263 -169 -408q-103 -89 -233 -89q-92 0 -153 35q-74 42 -74 124q0 77 81 77q35 0 59 -21t24 -53q0 -60 -66 -72q47 -32 114.5 -32t118.5 30q132 77 137 352q-67 -108 -185 -108q-141 0 -231.5 95.5t-90.5 229t100 225t239 91.5q78 0 145 -37 q184 -101 184 -439zM142 643l67 -2q109 0 123 24q5 9 5 30v708q-80 -31 -204 -31v62q193 0 290 89h12q38 0 38 -45v-786q0 -18 5 -28q11 -21 175 -21h15v-64q-67 5 -112 5h-302q-45 0 -112 -5v64zM1439 1415q0 -13 -6 -22l-1071 -1667q-11 -17 -35 -17q-40 0 -40 40 q0 13 6 22l1071 1667q11 17 35 17q40 0 40 -40zM1458 107q40 66 40 177.5t-25 171.5q-44 104 -141.5 104t-147.5 -82q-30 -49 -30 -159v-58q0 -105 26 -153q45 -82 137 -82t141 81z" />
+<glyph unicode="&#x2152;" horiz-adv-x="2386" d="M142 643l67 -2q109 0 123 24q5 9 5 30v708q-80 -31 -204 -31v62q193 0 290 89h12q38 0 38 -45v-786q0 -18 5 -28q11 -21 175 -21h15v-64q-67 5 -112 5h-302q-45 0 -112 -5v64zM1419 1415q0 -13 -6 -22l-1071 -1667q-11 -17 -35 -17q-40 0 -40 40q0 13 6 22l1071 1667 q11 17 35 17q40 0 40 -40zM2236 514q63 -111 63 -325.5t-59 -321.5q-91 -166 -277 -166t-277 160q-63 111 -63 325.5t59 321.5q91 166 277 166t277 -160zM1052 -206l67 -2q109 0 123 24q5 9 5 30v708q-80 -31 -204 -31v62q193 0 290 89h12q38 0 38 -45v-786q0 -18 5 -28 q11 -21 175 -21h15v-64q-67 5 -112 5h-302q-45 0 -112 -5v64zM2150 116v173q0 335 -190 335t-190 -365v-173q0 -335 190 -335t190 365z" />
+<glyph unicode="&#x2153;" horiz-adv-x="1722" d="M142 643l67 -2q109 0 123 24q5 9 5 30v708q-80 -31 -204 -31v62q193 0 290 89h12q38 0 38 -45v-786q0 -18 5 -28q11 -21 175 -21h15v-64q-67 5 -112 5h-302q-45 0 -112 -5v64zM1419 1415q0 -13 -6 -22l-1071 -1667q-11 -17 -35 -17q-40 0 -40 40q0 13 6 22l1071 1667 q11 17 35 17q40 0 40 -40zM1655 -82q0 -120 -103.5 -198.5t-231.5 -78.5t-223 56q-110 65 -110 171q0 90 97 90q42 0 70 -24.5t28 -62.5q0 -82 -93 -87q74 -85 219 -85q88 0 131 72q35 58 35 147q0 220 -176 220h-81q-35 0 -35 25.5t90.5 30.5t133.5 67t43 153 q0 146 -140 146q-123 0 -187 -67q86 -8 86 -79q0 -80 -89.5 -80t-89.5 81q0 94 97 150q83 49 191 49t195 -49q102 -57 102 -152q0 -79 -54.5 -144t-138.5 -98q100 -27 167 -94.5t67 -158.5z" />
+<glyph unicode="&#x2154;" horiz-adv-x="1722" d="M79 580v22q0 26 21 47l300 296q160 158 160 299q0 89 -52 152.5t-147 63.5q-136 0 -195 -119q98 -2 98 -83q0 -35 -26.5 -59t-64.5 -24q-94 0 -94 87q0 109 90.5 185t222.5 76t231 -76.5t99 -202.5q0 -82 -61 -159q-32 -40 -124 -120l-300 -259h285q97 0 110 9.5 t33 125.5h59l-46 -261h-599zM1655 -82q0 -120 -103.5 -198.5t-231.5 -78.5t-223 56q-110 65 -110 171q0 90 97 90q42 0 70 -24.5t28 -62.5q0 -82 -93 -87q74 -85 219 -85q88 0 131 72q35 58 35 147q0 220 -176 220h-81q-35 0 -35 25.5t90.5 30.5t133.5 67t43 153 q0 146 -140 146q-123 0 -187 -67q86 -8 86 -79q0 -80 -89.5 -80t-89.5 81q0 94 97 150q83 49 191 49t195 -49q102 -57 102 -152q0 -79 -54.5 -144t-138.5 -98q100 -27 167 -94.5t67 -158.5zM1439 1415q0 -13 -6 -22l-1071 -1667q-11 -17 -35 -17q-40 0 -40 40q0 13 6 22 l1071 1667q11 17 35 17q40 0 40 -40z" />
+<glyph unicode="&#x2155;" horiz-adv-x="1722" d="M142 643l67 -2q109 0 123 24q5 9 5 30v708q-80 -31 -204 -31v62q193 0 290 89h12q38 0 38 -45v-786q0 -18 5 -28q11 -21 175 -21h15v-64q-67 5 -112 5h-302q-45 0 -112 -5v64zM1419 1415q0 -13 -6 -22l-1071 -1667q-11 -17 -35 -17q-40 0 -40 40q0 13 6 22l1071 1667 q11 17 35 17q40 0 40 -40zM1336 273q135 0 220.5 -95t85.5 -222t-102 -221t-235 -94t-219.5 78t-86.5 185q0 84 86 84q37 0 63 -22t26 -56t-26 -56t-63 -22h-10q25 -58 84.5 -95.5t129.5 -37.5q103 0 159 86q35 54 35 177.5t-26 176.5q-42 84 -133.5 84t-165.5 -73 q-38 -38 -47 -38q-32 0 -32 38v430q0 33 25 33q10 0 22 -4q125 -40 197 -40t121.5 13.5t79.5 22.5t32 9q25 0 25 -26q0 -14 -30 -44q-111 -110 -281 -110q-60 0 -122 15v-235q80 59 188 59z" />
+<glyph unicode="&#x2156;" horiz-adv-x="1722" d="M79 580v22q0 26 21 47l300 296q160 158 160 299q0 89 -52 152.5t-147 63.5q-136 0 -195 -119q98 -2 98 -83q0 -35 -26.5 -59t-64.5 -24q-94 0 -94 87q0 109 90.5 185t222.5 76t231 -76.5t99 -202.5q0 -82 -61 -159q-32 -40 -124 -120l-300 -259h285q97 0 110 9.5 t33 125.5h59l-46 -261h-599zM1336 273q135 0 220.5 -95t85.5 -222t-102 -221t-235 -94t-219.5 78t-86.5 185q0 84 86 84q37 0 63 -22t26 -56t-26 -56t-63 -22h-10q25 -58 84.5 -95.5t129.5 -37.5q103 0 159 86q35 54 35 177.5t-26 176.5q-42 84 -133.5 84t-165.5 -73 q-38 -38 -47 -38q-32 0 -32 38v430q0 33 25 33q10 0 22 -4q125 -40 197 -40t121.5 13.5t79.5 22.5t32 9q25 0 25 -26q0 -14 -30 -44q-111 -110 -281 -110q-60 0 -122 15v-235q80 59 188 59zM1429 1415q0 -13 -6 -22l-1071 -1667q-11 -17 -35 -17q-40 0 -40 40q0 13 6 22 l1071 1667q11 17 35 17q40 0 40 -40z" />
+<glyph unicode="&#x2157;" horiz-adv-x="1722" d="M1336 273q135 0 220.5 -95t85.5 -222t-102 -221t-235 -94t-219.5 78t-86.5 185q0 84 86 84q37 0 63 -22t26 -56t-26 -56t-63 -22h-10q25 -58 84.5 -95.5t129.5 -37.5q103 0 159 86q35 54 35 177.5t-26 176.5q-42 84 -133.5 84t-165.5 -73q-38 -38 -47 -38q-32 0 -32 38 v430q0 33 25 33q10 0 22 -4q125 -40 197 -40t121.5 13.5t79.5 22.5t32 9q25 0 25 -26q0 -14 -30 -44q-111 -110 -281 -110q-60 0 -122 15v-235q80 59 188 59zM735 827q0 -120 -103.5 -198.5t-231.5 -78.5t-223 56q-110 65 -110 171q0 90 97 90q42 0 70 -24.5t28 -62.5 q0 -82 -93 -87q74 -85 219 -85q88 0 131 72q35 58 35 147q0 220 -176 220h-81q-35 0 -35 25.5t90.5 30.5t133.5 67t43 153q0 146 -140 146q-123 0 -187 -67q86 -8 86 -79q0 -80 -89.5 -80t-89.5 81q0 94 97 150q83 49 191 49t195 -49q102 -57 102 -152q0 -79 -54.5 -144 t-138.5 -98q100 -27 167 -94.5t67 -158.5zM1419 1415q0 -13 -6 -22l-1071 -1667q-11 -17 -35 -17q-40 0 -40 40q0 13 6 22l1071 1667q11 17 35 17q40 0 40 -40z" />
+<glyph unicode="&#x2158;" horiz-adv-x="1722" d="M757 809h-156v-120q0 -18 5 -27q10 -19 134 -19h13v-64q-78 5 -117 5h-213q-36 0 -114 -5v64l58 -1q76 0 88 20q6 10 6 27v120h-416v56l481 653q15 21 40 21q35 0 35 -47v-620h156v-63zM1336 273q135 0 220.5 -95t85.5 -222t-102 -221t-235 -94t-219.5 78t-86.5 185 q0 84 86 84q37 0 63 -22t26 -56t-26 -56t-63 -22h-10q25 -58 84.5 -95.5t129.5 -37.5q103 0 159 86q35 54 35 177.5t-26 176.5q-42 84 -133.5 84t-165.5 -73q-38 -38 -47 -38q-32 0 -32 38v430q0 33 25 33q10 0 22 -4q125 -40 197 -40t121.5 13.5t79.5 22.5t32 9 q25 0 25 -26q0 -14 -30 -44q-111 -110 -281 -110q-60 0 -122 15v-235q80 59 188 59zM1439 1415q0 -13 -6 -22l-1071 -1667q-11 -17 -35 -17q-40 0 -40 40q0 13 6 22l1071 1667q11 17 35 17q40 0 40 -40zM470 872v476l-352 -476h352z" />
+<glyph unicode="&#x2159;" horiz-adv-x="1722" d="M142 643l67 -2q109 0 123 24q5 9 5 30v708q-80 -31 -204 -31v62q193 0 290 89h12q38 0 38 -45v-786q0 -18 5 -28q11 -21 175 -21h15v-64q-67 5 -112 5h-302q-45 0 -112 -5v64zM1332 283q142 0 232.5 -95.5t90.5 -225t-93.5 -225.5t-238.5 -96q-187 0 -273 170 q-63 124 -63 285.5t61 284.5t184 188q85 45 174 45t150 -40t61 -118t-82 -78t-82 74q0 64 73 71q-42 37 -107 37t-119 -30q-146 -82 -152 -354q68 107 184 107zM1439 1415q0 -13 -6 -22l-1071 -1667q-11 -17 -35 -17q-40 0 -40 40q0 13 6 22l1071 1667q11 17 35 17 q40 0 40 -40zM1495 -72v69q0 102 -28 153q-44 81 -135 81t-136.5 -73t-45.5 -164q0 -135 27 -196q44 -99 144.5 -99t147.5 85q26 48 26 144z" />
+<glyph unicode="&#x215a;" horiz-adv-x="1722" d="M1332 283q142 0 232.5 -95.5t90.5 -225t-93.5 -225.5t-238.5 -96q-187 0 -273 170q-63 124 -63 285.5t61 284.5t184 188q85 45 174 45t150 -40t61 -118t-82 -78t-82 74q0 64 73 71q-42 37 -107 37t-119 -30q-146 -82 -152 -354q68 107 184 107zM416 1182q135 0 220.5 -95 t85.5 -222t-102 -221t-235 -94t-219.5 78t-86.5 185q0 84 86 84q37 0 63 -22t26 -56t-26 -56t-63 -22h-10q25 -58 84.5 -95.5t129.5 -37.5q103 0 159 86q35 54 35 177.5t-26 176.5q-42 84 -133.5 84t-165.5 -73q-38 -38 -47 -38q-32 0 -32 38v430q0 33 25 33q10 0 22 -4 q125 -40 197 -40t121.5 13.5t79.5 22.5t32 9q25 0 25 -26q0 -14 -30 -44q-111 -110 -281 -110q-60 0 -122 15v-235q80 59 188 59zM1429 1415q0 -13 -6 -22l-1071 -1667q-11 -17 -35 -17q-40 0 -40 40q0 13 6 22l1071 1667q11 17 35 17q40 0 40 -40zM1495 -72v69 q0 102 -28 153q-44 81 -135 81t-136.5 -73t-45.5 -164q0 -135 27 -196q44 -99 144.5 -99t147.5 85q26 48 26 144z" />
+<glyph unicode="&#x215b;" horiz-adv-x="1722" d="M142 643l67 -2q109 0 123 24q5 9 5 30v708q-80 -31 -204 -31v62q193 0 290 89h12q38 0 38 -45v-786q0 -18 5 -28q11 -21 175 -21h15v-64q-67 5 -112 5h-302q-45 0 -112 -5v64zM1575 92q80 -79 80 -188t-101 -186t-231.5 -77t-233 67.5t-102.5 181.5q0 157 213 257 q-35 19 -100 66q-71 68 -71 166t88 166.5t202.5 68.5t204.5 -58.5t90 -157.5q0 -128 -178 -216q50 -25 139 -90zM1439 1415q0 -13 -6 -22l-1071 -1667q-11 -17 -35 -17q-40 0 -40 40q0 13 6 22l1071 1667q11 17 35 17q40 0 40 -40zM1525 398q0 69 -61.5 115.5t-141 46.5 t-142.5 -36.5t-63 -94t75 -105.5q34 -22 187 -109q146 77 146 183zM1085 -110q0 -81 70.5 -136t163.5 -55t166 46.5t73 120t-114 142.5q-51 31 -187 104q-172 -86 -172 -222z" />
+<glyph unicode="&#x215c;" horiz-adv-x="1722" d="M1575 92q80 -79 80 -188t-101 -186t-231.5 -77t-233 67.5t-102.5 181.5q0 157 213 257q-35 19 -100 66q-71 68 -71 166t88 166.5t202.5 68.5t204.5 -58.5t90 -157.5q0 -128 -178 -216q50 -25 139 -90zM1439 1415q0 -13 -6 -22l-1071 -1667q-11 -17 -35 -17q-40 0 -40 40 q0 13 6 22l1071 1667q11 17 35 17q40 0 40 -40zM735 827q0 -120 -103.5 -198.5t-231.5 -78.5t-223 56q-110 65 -110 171q0 90 97 90q42 0 70 -24.5t28 -62.5q0 -82 -93 -87q74 -85 219 -85q88 0 131 72q35 58 35 147q0 220 -176 220h-81q-35 0 -35 25.5t90.5 30.5t133.5 67 t43 153q0 146 -140 146q-123 0 -187 -67q86 -8 86 -79q0 -80 -89.5 -80t-89.5 81q0 94 97 150q83 49 191 49t195 -49q102 -57 102 -152q0 -79 -54.5 -144t-138.5 -98q100 -27 167 -94.5t67 -158.5zM1525 398q0 69 -61.5 115.5t-141 46.5t-142.5 -36.5t-63 -94t75 -105.5 q34 -22 187 -109q146 77 146 183zM1085 -110q0 -81 70.5 -136t163.5 -55t166 46.5t73 120t-114 142.5q-51 31 -187 104q-172 -86 -172 -222z" />
+<glyph unicode="&#x215d;" horiz-adv-x="1722" d="M1575 92q80 -79 80 -188t-101 -186t-231.5 -77t-233 67.5t-102.5 181.5q0 157 213 257q-35 19 -100 66q-71 68 -71 166t88 166.5t202.5 68.5t204.5 -58.5t90 -157.5q0 -128 -178 -216q50 -25 139 -90zM416 1182q135 0 220.5 -95t85.5 -222t-102 -221t-235 -94t-219.5 78 t-86.5 185q0 84 86 84q37 0 63 -22t26 -56t-26 -56t-63 -22h-10q25 -58 84.5 -95.5t129.5 -37.5q103 0 159 86q35 54 35 177.5t-26 176.5q-42 84 -133.5 84t-165.5 -73q-38 -38 -47 -38q-32 0 -32 38v430q0 33 25 33q10 0 22 -4q125 -40 197 -40t121.5 13.5t79.5 22.5t32 9 q25 0 25 -26q0 -14 -30 -44q-111 -110 -281 -110q-60 0 -122 15v-235q80 59 188 59zM1429 1415q0 -13 -6 -22l-1071 -1667q-11 -17 -35 -17q-40 0 -40 40q0 13 6 22l1071 1667q11 17 35 17q40 0 40 -40zM1525 398q0 69 -61.5 115.5t-141 46.5t-142.5 -36.5t-63 -94 t75 -105.5q34 -22 187 -109q146 77 146 183zM1085 -110q0 -81 70.5 -136t163.5 -55t166 46.5t73 120t-114 142.5q-51 31 -187 104q-172 -86 -172 -222z" />
+<glyph unicode="&#x215e;" horiz-adv-x="1722" d="M1575 92q80 -79 80 -188t-101 -186t-231.5 -77t-233 67.5t-102.5 181.5q0 157 213 257q-35 19 -100 66q-71 68 -71 166t88 166.5t202.5 68.5t204.5 -58.5t90 -157.5q0 -128 -178 -216q50 -25 139 -90zM746 1473q0 -26 -16 -46l-212 -262q-73 -91 -97 -253 q-14 -94 -14 -276q0 -86 -82 -86t-82 86q0 258 194 527q1 1 161 203h-353q-84 0 -97 -7t-35 -128h-60l56 306h56q2 -17 9 -24q20 -20 182 -20h390v-20zM1399 1415q0 -13 -6 -22l-1071 -1667q-11 -17 -35 -17q-40 0 -40 40q0 13 6 22l1071 1667q11 17 35 17q40 0 40 -40z M1525 398q0 69 -61.5 115.5t-141 46.5t-142.5 -36.5t-63 -94t75 -105.5q34 -22 187 -109q146 77 146 183zM1085 -110q0 -81 70.5 -136t163.5 -55t166 46.5t73 120t-114 142.5q-51 31 -187 104q-172 -86 -172 -222z" />
+<glyph unicode="&#x215f;" horiz-adv-x="939" d="M142 643l67 -2q109 0 123 24q5 9 5 30v708q-80 -31 -204 -31v62q193 0 290 89h12q38 0 38 -45v-786q0 -18 5 -28q11 -21 175 -21h15v-64q-67 5 -112 5h-302q-45 0 -112 -5v64zM1419 1415q0 -13 -6 -22l-1071 -1667q-11 -17 -35 -17q-40 0 -40 40q0 13 6 22l1071 1667 q11 17 35 17q40 0 40 -40z" />
+<glyph unicode="&#x2160;" horiz-adv-x="738" d="M670 1284l-75 2q-140 0 -140 -85v-1057q0 -27 13.5 -52t91.5 -31q4 0 31.5 -0.5t78.5 0.5v-61q-71 6 -111 6h-385q-35 0 -106 -6v61q9 0 28 -0.5t29 -0.5q128 0 147 36q9 17 9 49v1056q0 32 -9 49q-18 34 -153 34h-51v62q70 -6 109 -6h388q35 0 105 6v-62z" />
+<glyph unicode="&#x2161;" horiz-adv-x="1340" d="M1272 1284l-75 2q-140 0 -140 -85v-1057q0 -27 13.5 -52t91.5 -31q4 0 31.5 -0.5t78.5 0.5v-61q-71 6 -111 6h-987q-35 0 -106 -6v61q9 0 28 -0.5t29 -0.5q128 0 147 36q9 17 9 49v1056q0 32 -9 49q-18 34 -153 34h-51v62q70 -6 109 -6h990q35 0 105 6v-62zM670 1284 l-75 2q-140 0 -140 -85v-1057q0 -57 50 -75q27 -9 68.5 -9t63.5 0.5t80 0.5h63q78 6 94 35q9 17 9 49v1056q0 32 -9 49q-15 29 -95 34h-109z" />
+<glyph unicode="&#x2162;" horiz-adv-x="1942" d="M1874 1284l-75 2q-140 0 -140 -85v-1057q0 -27 13.5 -52t91.5 -31q4 0 32 -0.5t78 0.5v-61q-71 6 -111 6h-1589q-35 0 -106 -6v61q9 0 28 -0.5t29 -0.5q128 0 147 36q9 17 9 49v1056q0 32 -9 49q-18 34 -153 34h-51v62q70 -6 109 -6h1592q35 0 105 6v-62zM1272 1284 l-75 2q-140 0 -140 -85v-1057q0 -57 50 -75q27 -9 68.5 -9t63.5 0.5t80 0.5h63q78 6 94 35q9 17 9 49v1056q0 32 -9 49q-15 29 -95 34h-109zM670 1284l-75 2q-140 0 -140 -85v-1057q0 -57 50 -75q27 -9 68.5 -9t63.5 0.5t80 0.5h63q78 6 94 35q9 17 9 49v1056q0 32 -9 49 q-15 29 -95 34h-109z" />
+<glyph unicode="&#x2163;" horiz-adv-x="2138" d="M670 1284l-75 2q-140 0 -140 -85v-1057q0 -27 11 -48q18 -35 194 -35h10v-61q-71 6 -117 6h-373q-41 0 -112 -6v61q9 0 28 -0.5t29 -0.5q128 0 147 36q9 17 9 49v1056q0 32 -9 49q-15 29 -95 34h-109v62q70 -6 115 -6h850q90 0 169 6v-62h-18q-144 0 -144 -56 q0 -33 141 -396l247 -635l361 950q9 24 9 40q0 94 -143 97v62q153 -6 237.5 -6t177.5 6v-62q-164 -1 -214 -132l-440 -1158q-14 -37 -46.5 -37t-48.5 43l-457 1209q-22 57 -81 71q-20 4 -74 4h-39z" />
+<glyph unicode="&#x2164;" horiz-adv-x="1536" d="M814 -6q-14 -37 -46.5 -37t-48.5 43l-457 1209q-22 57 -81 71q-20 5 -68 5q-20 0 -45 -1v62q214 -6 336 -6t196 6v-62h-18q-144 0 -144 -56q0 -33 141 -396l247 -635l361 950q9 24 9 40q0 95 -143 97v62q153 -6 237.5 -6t177.5 6v-62q-164 -1 -214 -132z" />
+<glyph unicode="&#x2165;" horiz-adv-x="2138" d="M2070 1284l-75 2q-140 0 -140 -85v-1057q0 -28 11 -48q19 -35 194 -35h10v-61q-71 6 -117 6h-373q-41 0 -112 -6v61q9 0 28 -0.5t29 -0.5q128 0 147 36q9 17 9 49v1056q0 56 -40 73q-23 10 -122 10t-144 -14q-86 -25 -121 -118l-440 -1158q-14 -37 -46.5 -37t-48.5 43 l-457 1209q-22 57 -81 71q-20 5 -67 5q-20 0 -46 -1v62q213 -6 335.5 -6t196.5 6v-62h-18q-144 0 -144 -56q0 -33 141 -396l247 -635l361 950q9 24 9 40q0 94 -143 97v62q153 -6 213 -6h693q41 0 111 6v-62z" />
+<glyph unicode="&#x2166;" horiz-adv-x="2740" d="M2672 1284l-75 2q-140 0 -140 -85v-1057q0 -28 11 -48q19 -35 194 -35h10v-61q-71 6 -117 6h-975q-41 0 -112 -6v61q9 0 28 -0.5t29 -0.5q128 0 147 36q9 17 9 49v1056q0 56 -40 73q-23 10 -122 10t-144 -14q-86 -25 -121 -118l-440 -1158q-14 -37 -46.5 -37t-48.5 43 l-457 1209q-22 57 -81 71q-20 5 -67 5q-20 0 -46 -1v62q213 -6 335.5 -6t196.5 6v-62h-18q-144 0 -144 -56q0 -33 141 -396l247 -635l361 950q9 24 9 40q0 94 -143 97v62q153 -6 213 -6h1295q41 0 111 6v-62zM2070 1284l-75 2q-140 0 -140 -85v-1057q0 -57 50 -75 q27 -9 68.5 -9t63.5 0.5t80 0.5h63q78 6 94 35q9 17 9 49v1056q0 32 -9 49q-15 29 -95 34h-109z" />
+<glyph unicode="&#x2167;" horiz-adv-x="3342" d="M3274 1284l-75 2q-140 0 -140 -85v-1057q0 -28 11 -48q19 -35 194 -35h10v-61q-71 6 -117 6h-1577q-41 0 -112 -6v61q9 0 28 -0.5t29 -0.5q128 0 147 36q9 17 9 49v1056q0 56 -40 73q-23 10 -122 10t-144 -14q-86 -25 -121 -118l-440 -1158q-14 -37 -46.5 -37t-48.5 43 l-457 1209q-22 57 -81 71q-20 5 -67 5q-20 0 -46 -1v62q213 -6 335.5 -6t196.5 6v-62h-18q-144 0 -144 -56q0 -33 141 -396l247 -635l361 950q9 24 9 40q0 94 -143 97v62q153 -6 213 -6h1897q41 0 111 6v-62zM2672 1284l-75 2q-140 0 -140 -85v-1057q0 -57 50 -75 q27 -9 68.5 -9t63.5 0.5t80 0.5h63q78 6 94 35q9 17 9 49v1056q0 32 -9 49q-15 29 -95 34h-109zM2070 1284l-75 2q-140 0 -140 -85v-1057q0 -57 50 -75q27 -9 68.5 -9t63.5 0.5t80 0.5h63q78 6 94 35q9 17 9 49v1056q0 32 -9 49q-15 29 -95 34h-109z" />
+<glyph unicode="&#x2168;" horiz-adv-x="2120" d="M670 1284l-75 2q-140 0 -140 -85v-1057q0 -57 50 -75q27 -9 130 -9t165 18q96 27 155 114l323 477l-362 547q-34 51 -99 64q-25 4 -81 4h-41v62q112 -6 292 -6t252 6v-62q-128 -5 -128 -58q0 -14 268 -410l225 333q17 25 17 46q0 43 -37.5 65.5t-83.5 23.5v62 q81 -6 164.5 -6t305.5 6v-62q-198 -2 -285 -128l-271 -395l416 -629q35 -53 99 -66q26 -5 86 -5h37v-61q-127 6 -299 6t-244 -6v61q128 5 128 59q0 10 -320 493l-281 -414q-19 -28 -19 -48q0 -43 38.5 -66t84.5 -24v-61q-74 6 -169 6h-791q-41 0 -112 -6v61q9 0 28 -0.5 t29 -0.5q128 0 147 36q9 17 9 49v1056q0 31 -9 49q-14 28 -94 34h-110v62q70 -6 115 -6h376q41 0 111 6v-62z" />
+<glyph unicode="&#x2169;" horiz-adv-x="1518" d="M1450 0q-128 6 -299.5 6t-243.5 -6v61q128 5 128 59q0 10 -320 493l-281 -414q-19 -28 -19 -48q0 -43 38.5 -66t84.5 -24v-61q-74 6 -165 6t-305 -6v61q196 0 285 131l323 477l-362 547q-33 51 -99 64q-25 4 -81 4h-41v62q112 -6 292 -6t252 6v-62q-128 -5 -128 -58 q0 -14 268 -410l225 333q17 25 17 46q0 43 -37.5 65.5t-83.5 23.5v62q81 -6 164.5 -6t305.5 6v-62q-198 -2 -285 -128l-271 -395l416 -629q35 -53 99 -66q26 -5 86 -5h37v-61z" />
+<glyph unicode="&#x216a;" horiz-adv-x="2120" d="M2052 1284l-75 2q-140 0 -140 -85v-1057q0 -28 11 -48q19 -35 194 -35h10v-61q-71 6 -117 6h-856q-100 0 -172 -6v61q128 5 128 59q0 10 -320 493l-281 -414q-19 -28 -19 -48q0 -43 38.5 -66t84.5 -24v-61q-74 6 -165 6t-305 -6v61q196 0 285 131l323 477l-362 547 q-34 51 -99 64q-24 4 -81 4h-41v62q112 -6 292 -6t252 6v-62q-128 -5 -128 -58q0 -14 268 -410l225 333q17 25 17 46q0 43 -37.5 65.5t-83.5 23.5v62q81 -6 164.5 -6t305.5 6v-62q-198 -2 -285 -128l-271 -395l416 -629q35 -53 99 -66q30 -6 75 -6h8q25 1 42.5 1t27.5 -1h27 q128 0 147 36q9 17 9 49v1056q0 32 -9 49q-15 29 -94 34h-110v62q70 -6 115 -6h376q41 0 111 6v-62z" />
+<glyph unicode="&#x216b;" horiz-adv-x="2722" d="M2654 1284l-75 2q-140 0 -140 -85v-1057q0 -28 11 -48q19 -35 194 -35h10v-61q-71 6 -117 6h-1458q-100 0 -172 -6v61q128 5 128 59q0 10 -320 493l-281 -414q-19 -28 -19 -48q0 -43 38.5 -66t84.5 -24v-61q-74 6 -165 6t-305 -6v61q196 0 285 131l323 477l-362 547 q-34 51 -99 64q-24 4 -81 4h-41v62q112 -6 292 -6t252 6v-62q-128 -5 -128 -58q0 -14 268 -410l225 333q17 25 17 46q0 43 -37.5 65.5t-83.5 23.5v62q81 -6 164.5 -6t305.5 6v-62q-198 -2 -285 -128l-271 -395l416 -629q35 -53 99 -66q30 -6 75 -6h8q25 1 42.5 1t27.5 -1h27 q128 0 147 36q9 17 9 49v1056q0 32 -9 49q-15 29 -94 34h-110v62q70 -6 115 -6h978q41 0 111 6v-62zM2052 1284l-75 2q-140 0 -140 -85v-1057q0 -57 50 -75q27 -9 68.5 -9t63.5 0.5t80 0.5h63q78 6 94 35q9 17 9 49v1056q0 32 -9 49q-15 29 -95 34h-109z" />
+<glyph unicode="&#x216c;" horiz-adv-x="1217" d="M697 1284l-66 2q-156 0 -177 -36q-10 -17 -10 -48v-1062q0 -52 17.5 -65.5t68.5 -13.5h173q212 0 303 123q70 96 94 324h49l-55 -508h-1026v61q8 0 25.5 -0.5t27.5 -0.5q124 0 142 35q7 14 7 46v1064q0 32 -7 46q-17 33 -185 33h-10v62q71 -6 126 -6h383q47 0 120 6v-62z " />
+<glyph unicode="&#x216d;" horiz-adv-x="1335" d="M1267 854q0 -26 -29 -26t-35 32q-12 60 -47 178q-51 127 -151 208.5t-217 81.5t-220 -50q-298 -145 -298 -613.5t322 -606.5q96 -41 185 -41q140 0 256 85t159 218q17 52 27 140q4 33 23 33q24 0 24 -35q0 -205 -154 -353t-360 -148q-288 0 -486 213t-198 502.5 t198.5 503.5t485.5 214q193 0 363 -169l99 144q17 25 31 25q22 0 22 -33v-503z" />
+<glyph unicode="&#x216e;" horiz-adv-x="1460" d="M1226 1130q166 -200 166 -466t-172 -465t-432 -199h-720v61l62 -2q108 0 130 31q10 14 10 52v1060q0 36 -10 50q-21 29 -157 29h-35v62h720q263 0 438 -213zM1085 229q110 148 110 436.5t-103 433.5q-129 182 -359 182h-207q-53 0 -70 -13t-17 -66v-1062q0 -53 17.5 -66 t69.5 -13h209q225 0 350 168z" />
+<glyph unicode="&#x216f;" horiz-adv-x="1794" d="M1726 1281l-56 2q-125 0 -141 -41q-6 -15 -6 -45v-1058q0 -26 8 -43q17 -35 185 -35h10v-61q-75 6 -119 6h-334q-38 0 -113 -6v61h76q63 0 87 10q40 17 40 70v1140h-2l-483 -1245q-14 -36 -36 -36t-39 43l-476 1222h-2v-1064q0 -140 200 -140h3v-61q-209 6 -229 6 t-231 -6v61h3q199 0 199 140v1003q0 22 -6 38q-12 32 -89 39q-6 1 -32.5 1t-74.5 -1v62h341q45 0 61 -42l428 -1102l430 1108q14 36 49 36h349v-62z" />
+<glyph unicode="&#x2170;" horiz-adv-x="563" d="M510 0q-202 6 -233 6t-224 -6v66l44 -1q66 0 89 13q33 18 33 79v582q0 85 -41 105q-21 11 -103 11h-14v68l298 23v-802q0 -59 51 -73q19 -5 69 -5h31v-66zM335.5 1356q33.5 -33 33.5 -80.5t-33.5 -81t-80.5 -33.5t-80 34.5t-33 80t33.5 79.5t80 34t80 -33z" />
+<glyph unicode="&#x2171;" horiz-adv-x="1020" d="M792.5 1356q33.5 -33 33.5 -80.5t-33.5 -81t-80.5 -33.5t-80 34.5t-33 80t33.5 79.5t80 34t80 -33zM335.5 1356q33.5 -33 33.5 -80.5t-33.5 -81t-80.5 -33.5t-80 34.5t-33 80t33.5 79.5t80 34t80 -33zM510 0l-223 6q-41 0 -234 -6v66l44 -1q66 0 89 13q33 18 33 79v582 q0 85 -41 105q-21 11 -103 11h-14v68l298 23v-802q0 -59 51 -73q20 -6 59 -6q3 0 6 1q43 0 57.5 -0.5t51 -0.5t59.5 13q33 18 33 79v582q0 85 -41 105q-21 11 -103 11h-14v68l298 23v-802q0 -59 51 -73q19 -5 69 -5h31v-66q-202 6 -223 6z" />
+<glyph unicode="&#x2172;" horiz-adv-x="1477" d="M1249.5 1356q33.5 -33 33.5 -80.5t-33.5 -81t-80.5 -33.5t-80 34.5t-33 80t33.5 79.5t80 34t80 -33zM792.5 1356q33.5 -33 33.5 -80.5t-33.5 -81t-80.5 -33.5t-80 34.5t-33 80t33.5 79.5t80 34t80 -33zM335.5 1356q33.5 -33 33.5 -80.5t-33.5 -81t-80.5 -33.5t-80 34.5 t-33 80t33.5 79.5t80 34t80 -33zM510 0l-223 6q-41 0 -234 -6v66l44 -1q66 0 89 13q33 18 33 79v582q0 85 -41 105q-21 11 -103 11h-14v68l298 23v-802q0 -59 51 -73q20 -6 59 -6q3 0 6 1q43 0 57.5 -0.5t51 -0.5t59.5 13q33 18 33 79v582q0 85 -41 105q-21 11 -103 11h-14 v68l298 23v-802q0 -59 51 -73q20 -6 59 -6q3 0 6 1q43 0 57.5 -0.5t51 -0.5t59.5 13q33 18 33 79v582q0 85 -41 105q-21 11 -103 11h-14v68l298 23v-802q0 -59 51 -73q19 -5 69 -5h31v-66q-202 6 -223 6l-234 -6l-223 6z" />
+<glyph unicode="&#x2173;" horiz-adv-x="1571" d="M997 -24q-29 0 -45 40l-309 760q-24 60 -68 73q-18 6 -83 6h-19v68q120 -8 164 -8t276 8v-68q-122 0 -122 -54q0 -15 252 -634l219 546q13 32 13 50q0 90 -102 92v68q135 -8 194.5 -8t151.5 8v-68q-142 -1 -198 -142l-279 -697q-16 -40 -45 -40zM510 0q-202 6 -233 6 t-224 -6v66l44 -1q66 0 89 13q33 18 33 79v582q0 85 -41 105q-21 11 -103 11h-14v68l298 23v-802q0 -59 51 -73q19 -5 69 -5h31v-66zM335.5 1356q33.5 -33 33.5 -80.5t-33.5 -81t-80.5 -33.5t-80 34.5t-33 80t33.5 79.5t80 34t80 -33z" />
+<glyph unicode="&#x2174;" horiz-adv-x="1152" d="M577 -24q-29 0 -45 40l-309 760q-24 60 -68 73q-18 6 -83 6h-19v68q120 -8 164 -8t276 8v-68q-122 0 -122 -54q0 -15 252 -634l219 546q13 32 13 50q0 90 -102 92v68q135 -8 194.5 -8t151.5 8v-68q-142 -1 -198 -142l-279 -697q-16 -40 -45 -40z" />
+<glyph unicode="&#x2175;" horiz-adv-x="1601" d="M1373.5 1356q33.5 -33 33.5 -80.5t-33.5 -81t-80.5 -33.5t-80 34.5t-33 80t33.5 79.5t80 34t80 -33zM1548 0q-202 6 -233 6t-224 -6v66l44 -1q66 0 89 13q33 18 33 79v582q0 85 -41 105q-21 11 -103 11h-14q-142 -1 -198 -142l-279 -697q-16 -40 -45 -40t-45 40l-309 760 q-24 60 -68 73q-18 6 -83 6h-19v68q120 -8 164 -8t276 8v-68q-122 0 -122 -54q0 -15 252 -634l219 546q13 32 13 50q0 90 -102 92v68q135 -8 188.5 -8t157.5 8l298 23v-802q0 -59 51 -73q19 -5 69 -5h31v-66z" />
+<glyph unicode="&#x2176;" horiz-adv-x="2058" d="M1830.5 1356q33.5 -33 33.5 -80.5t-33.5 -81t-80.5 -33.5t-80 34.5t-33 80t33.5 79.5t80 34t80 -33zM1373.5 1356q33.5 -33 33.5 -80.5t-33.5 -81t-80.5 -33.5t-80 34.5t-33 80t33.5 79.5t80 34t80 -33zM1548 0l-223 6q-41 0 -234 -6v66l44 -1q66 0 89 13q33 18 33 79 v582q0 85 -41 105q-21 11 -103 11h-14q-142 -1 -198 -142l-279 -697q-16 -40 -45 -40t-45 40l-309 760q-24 60 -68 73q-18 6 -83 6h-19v68q120 -8 164 -8t276 8v-68q-122 0 -122 -54q0 -15 252 -634l219 546q13 32 13 50q0 90 -102 92v68q135 -8 188.5 -8t157.5 8l298 23 v-802q0 -59 51 -73q20 -6 59 -6q3 0 6 1q43 0 57.5 -0.5t51 -0.5t59.5 13q33 18 33 79v582q0 85 -41 105q-21 11 -103 11h-14v68l298 23v-802q0 -59 51 -73q19 -5 69 -5h31v-66q-202 6 -223 6z" />
+<glyph unicode="&#x2177;" horiz-adv-x="2515" d="M2287.5 1356q33.5 -33 33.5 -80.5t-33.5 -81t-80.5 -33.5t-80 34.5t-33 80t33.5 79.5t80 34t80 -33zM1830.5 1356q33.5 -33 33.5 -80.5t-33.5 -81t-80.5 -33.5t-80 34.5t-33 80t33.5 79.5t80 34t80 -33zM1373.5 1356q33.5 -33 33.5 -80.5t-33.5 -81t-80.5 -33.5t-80 34.5 t-33 80t33.5 79.5t80 34t80 -33zM1548 0l-223 6q-41 0 -234 -6v66l44 -1q66 0 89 13q33 18 33 79v582q0 85 -41 105q-21 11 -103 11h-14q-142 -1 -198 -142l-279 -697q-16 -40 -45 -40t-45 40l-309 760q-24 60 -68 73q-18 6 -83 6h-19v68q120 -8 164 -8t276 8v-68 q-122 0 -122 -54q0 -15 252 -634l219 546q13 32 13 50q0 90 -102 92v68q135 -8 188.5 -8t157.5 8l298 23v-802q0 -59 51 -73q20 -6 59 -6q3 0 6 1q43 0 57.5 -0.5t51 -0.5t59.5 13q33 18 33 79v582q0 85 -41 105q-21 11 -103 11h-14v68l298 23v-802q0 -59 51 -73 q20 -6 59 -6q3 0 6 1q43 0 57.5 -0.5t51 -0.5t59.5 13q33 18 33 79v582q0 85 -41 105q-21 11 -103 11h-14v68l298 23v-802q0 -59 51 -73q19 -5 69 -5h31v-66q-202 6 -223 6l-234 -6l-223 6z" />
+<glyph unicode="&#x2178;" horiz-adv-x="1641" d="M335.5 1356q33.5 -33 33.5 -80.5t-33.5 -81t-80.5 -33.5t-80 34.5t-33 80t33.5 79.5t80 34t80 -33zM1588 0q-91 6 -175.5 6t-261.5 -6v66q77 3 77 54q0 10 -208 285q-192 -223 -192 -272q0 -61 62 -67v-66q-141 6 -221 6t-159 -6q-202 6 -233 6t-224 -6v66l44 -1 q66 0 89 13q33 18 33 79v582q0 85 -41 105q-21 11 -103 11h-14v68l298 23v-802q0 -58 51 -73q18 -5 79 -5h21q160 1 274 128l200 256l-212 276q-71 92 -105 110.5t-147 18.5v68q110 -8 171 -8t264 8v-68q-75 -2 -75 -52q0 -20 184 -255l134 167q33 41 33 75q0 61 -63 65v68 q108 -8 192.5 -8t188.5 8v-68q-152 -3 -255 -109q-26 -27 -197 -244l287 -369q37 -47 92 -60q28 -7 95 -7h17v-66z" />
+<glyph unicode="&#x2179;" horiz-adv-x="1184" d="M1131 0q-91 6 -175.5 6t-261.5 -6v66q77 3 77 54q0 10 -208 285q-192 -223 -192 -272q0 -61 62 -67v-66q-141 6 -221 6t-159 -6v66q159 0 274 128l200 256l-212 276q-71 92 -105 110.5t-147 18.5v68q110 -8 171 -8t264 8v-68q-75 -2 -75 -52q0 -20 184 -255l134 167 q33 41 33 75q0 61 -63 65v68q108 -8 192.5 -8t188.5 8v-68q-152 -3 -255 -109q-26 -27 -197 -244l287 -369q37 -47 92 -60q28 -7 95 -7h17v-66z" />
+<glyph unicode="&#x217a;" horiz-adv-x="1641" d="M1413.5 1356q33.5 -33 33.5 -80.5t-33.5 -81t-80.5 -33.5t-80 34.5t-33 80t33.5 79.5t80 34t80 -33zM1588 0q-202 6 -233 6t-224 -6q-91 6 -175.5 6t-261.5 -6v66q77 3 77 54q0 10 -208 285q-192 -223 -192 -272q0 -61 62 -67v-66q-141 6 -221 6t-159 -6v66 q159 0 274 128l200 256l-212 276q-71 92 -105 110.5t-147 18.5v68q110 -8 171 -8t264 8v-68q-75 -2 -75 -52q0 -20 184 -255l134 167q33 41 33 75q0 61 -63 65v68q108 -8 192.5 -8t188.5 8v-68q-152 -3 -255 -109q-26 -27 -197 -244l287 -369q37 -47 80.5 -57t87.5 -10h58 q15 -1 51.5 -1t59.5 13q33 18 33 79v582q0 85 -41 105q-21 11 -103 11h-14v68l298 23v-802q0 -59 51 -73q19 -5 69 -5h31v-66z" />
+<glyph unicode="&#x217b;" horiz-adv-x="2098" d="M1870.5 1356q33.5 -33 33.5 -80.5t-33.5 -81t-80.5 -33.5t-80 34.5t-33 80t33.5 79.5t80 34t80 -33zM1413.5 1356q33.5 -33 33.5 -80.5t-33.5 -81t-80.5 -33.5t-80 34.5t-33 80t33.5 79.5t80 34t80 -33zM1588 0l-223 6q-41 0 -234 -6q-91 6 -175.5 6t-261.5 -6v66 q77 3 77 54q0 10 -208 285q-192 -223 -192 -272q0 -61 62 -67v-66q-141 6 -221 6t-159 -6v66q159 0 274 128l200 256l-212 276q-71 92 -105 110.5t-147 18.5v68q110 -8 171 -8t264 8v-68q-75 -2 -75 -52q0 -20 184 -255l134 167q33 41 33 75q0 61 -63 65v68q108 -8 192.5 -8 t188.5 8v-68q-152 -3 -255 -109q-26 -27 -197 -244l287 -369q37 -47 80.5 -57t87.5 -10h58q15 -1 51.5 -1t59.5 13q33 18 33 79v582q0 85 -41 105q-21 11 -103 11h-14v68l298 23v-802q0 -59 51 -73q20 -6 59 -6q3 0 6 1q43 0 57.5 -0.5t51 -0.5t59.5 13q33 18 33 79v582 q0 85 -41 105q-21 11 -103 11h-14v68l298 23v-802q0 -59 51 -73q19 -5 69 -5h31v-66q-202 6 -223 6z" />
+<glyph unicode="&#x217c;" horiz-adv-x="579" d="M53 66l68 -2q98 0 98 98v1115q0 87 -44 108q-21 10 -106 10h-16v67l306 23v-1323q0 -50 13.5 -69t49.5 -23q29 -4 81 -4h24v-66q-220 6 -247.5 6t-226.5 -6v66z" />
+<glyph unicode="&#x217d;" horiz-adv-x="920" d="M868 254q0 -22 -27 -75q-104 -203 -329 -203q-194 0 -326.5 144.5t-132.5 343t132 347.5t330 149q121 0 215 -54q113 -64 113 -170t-97 -106q-42 0 -70.5 28t-28.5 70q0 94 100 99q-79 78 -229 78q-60 0 -120 -34q-168 -94 -168 -402.5t178 -404.5q63 -34 123 -34 q113 0 181 64q40 37 74 109.5t53 72.5q29 0 29 -22z" />
+<glyph unicode="&#x217e;" horiz-adv-x="1159" d="M793 118q-111 -142 -295 -142t-314.5 144.5t-130.5 340.5t139.5 340.5t336.5 144.5q163 0 270 -133v464q0 88 -47 109q-20 10 -85 10q-16 0 -35 -1v67l308 23v-1300q0 -88 46 -110q20 -10 85 -10q16 0 35 1v-66l-313 -24v142zM793 253v449q0 32 -24 68q-87 129 -236 129 t-238 -138q-65 -100 -65 -300t61 -299q85 -138 224 -138q93 0 185.5 69.5t92.5 159.5z" />
+<glyph unicode="&#x217f;" horiz-adv-x="1775" d="M1485 6q-40 0 -244 -6v66q26 -1 70 -1t65 13q32 19 32 84v499q0 238 -157 238q-130 0 -209.5 -104.5t-79.5 -238.5v-401q0 -39 12 -60q18 -30 118 -30q17 0 37 1v-66q-198 6 -237.5 6t-244.5 -6v66q26 -1 70 -1t65 13q32 19 32 84v499q0 238 -158 238 q-130 0 -209.5 -104.5t-79.5 -238.5v-397q0 -47 11 -64q18 -30 114 -30q19 0 40 1v-66q-198 6 -236 6t-243 -6v66q26 -1 69.5 -1t70 16t26.5 81v574q0 87 -44 109q-21 10 -96 10h-26v68l301 23v-225q101 225 316 225q251 0 284 -210q43 95 126.5 152.5t185.5 57.5 q158 0 224.5 -81t66.5 -243v-42q-1 -27 -1 -41v-409q0 -65 132 -65q17 0 35 1v-66q-198 6 -238 6z" />
+<glyph unicode="&#x2180;" horiz-adv-x="2211" d="M1539 1343q263 0 433.5 -206.5t170.5 -472.5t-172 -465t-432 -199h-867q-260 0 -432 199t-172 465t170.5 472.5t433.5 206.5h867zM1836 229q110 148 110 436.5t-103 433.5q-129 182 -359 182h-207q-53 0 -70 -13t-17 -66v-1062q0 -53 17.5 -66t69.5 -13h209 q225 0 350 168zM1021 140v1062q0 53 -17 66t-70 13h-207q-230 0 -359 -182q-103 -145 -103 -433.5t110 -436.5q125 -168 350 -168h209q52 0 69.5 13t17.5 66z" />
+<glyph unicode="&#x2181;" horiz-adv-x="1460" d="M1226 1130q166 -200 166 -466t-172 -465t-432 -199h-720v61l62 -2q108 0 130 31q10 14 10 52v1060q0 36 -10 50q-21 29 -157 29h-35v62h720q263 0 438 -213zM1085 229q110 148 110 436.5t-103 433.5q-129 182 -359 182h-207q-53 0 -70 -13t-17 -66v-209h150 q131 0 216.5 -103.5t85.5 -236.5t-86 -232.5t-216 -99.5h-150v-181q0 -53 17.5 -66t69.5 -13h209q225 0 350 168zM483 382q230 0 230 275t-231 275q-27 0 -35 -7t-8 -33v-471q0 -39 44 -39z" />
+<glyph unicode="&#x2182;" horiz-adv-x="2211" d="M1539 1343q263 0 433.5 -206.5t170.5 -472.5t-172 -465t-432 -199h-867q-260 0 -432 199t-172 465t170.5 472.5t433.5 206.5h867zM1836 229q110 148 110 436.5t-103 433.5q-129 182 -359 182h-207q-53 0 -70 -13t-17 -66v-209h150q131 0 216.5 -103.5t85.5 -236.5 t-86 -232.5t-216 -99.5h-150v-181q0 -53 17.5 -66t69.5 -13h209q225 0 350 168zM1234 382q230 0 230 275t-231 275q-27 0 -35 -7t-8 -33v-471q0 -39 44 -39zM1021 421v471q0 26 -8 33t-34 7q-231 0 -231 -275t230 -275q43 0 43 39zM1021 140v181h-150q-130 0 -216 99.5 t-86 232.5t85.5 236.5t216.5 103.5h150v209q0 53 -17 66t-70 13h-207q-230 0 -359 -182q-103 -145 -103 -433.5t110 -436.5q125 -168 350 -168h209q52 0 69.5 13t17.5 66z" />
+<glyph unicode="&#x2183;" horiz-adv-x="1335" d="M583 1390q287 0 485.5 -214t198.5 -503.5t-198 -502.5t-486 -213q-206 0 -360 148t-154 353q0 35 24 35q19 0 23 -33q10 -88 27 -140q43 -133 159 -218t256 -85q89 0 185 41q322 138 322 606.5t-298 613.5q-103 50 -220 50t-217 -81.5t-151 -208.5q-22 -56 -47 -178 q-6 -32 -35 -32t-29 26l1 503q0 33 21 33q14 0 31 -25l99 -144q170 169 363 169z" />
+<glyph unicode="&#x2184;" horiz-adv-x="920" d="M406 960q198 0 330 -149t132 -347.5t-132.5 -343t-326.5 -144.5q-225 0 -329 203q-27 53 -27 75t29 22q19 0 53 -72.5t74 -109.5q68 -64 181 -64q60 0 123 34q178 96 178 404.5t-168 402.5q-60 34 -120 34q-150 0 -229 -78q100 -5 100 -99q0 -42 -28.5 -70t-70.5 -28 q-97 0 -97 106t113 170q94 54 215 54z" />
+<glyph unicode="&#x2185;" horiz-adv-x="1354" d="M1286 1246q0 -7 -6 -20l-93 -196q-11 -23 -27 -23q-32 0 -28 30q2 12 2 24q0 126 -164 213q-101 54 -199 54t-192 -46q-170 -83 -239.5 -220t-69.5 -339.5t66 -330.5q74 -145 246 -228q97 -47 206 -47q288 0 359 290h121v-809h-174v583q-110 -124 -338 -124 q-292 0 -490 188t-198 476.5t198 478.5t486 190q238 0 423 -144q62 23 86.5 23t24.5 -23z" />
+<glyph unicode="&#x2186;" horiz-adv-x="1396" d="M610 1343h174v-1254l417 547l127 -97l-567 -744h-128l-565 744l127 97l415 -546v1253z" />
+<glyph unicode="&#x2187;" horiz-adv-x="1554" d="M882 1343q263 0 433.5 -206.5t170.5 -472.5t-172 -465t-432 -199h-814v61l62 -2q108 0 130 31q10 14 10 52v1060q0 36 -10 50q-21 29 -157 29h-35v62h814zM1179 229q110 148 110 436.5t-103 433.5q-129 182 -359 182h-301q-53 0 -70 -13t-17 -66v-31h278q208 0 335 -158 t127 -348.5t-128 -342t-332 -151.5h-280v-31q0 -53 17.5 -66t69.5 -13h303q225 0 350 168zM589 211q181 0 296.5 135t115.5 306.5t-108 303.5q-119 147 -304 147h-150v-110h150q131 0 216.5 -103.5t85.5 -236.5t-86 -232.5t-216 -99.5h-150v-110h150zM483 382q230 0 230 275 t-231 275q-27 0 -35 -7t-8 -33v-471q0 -39 44 -39z" />
+<glyph unicode="&#x2188;" horiz-adv-x="2399" d="M1727 1343q263 0 433.5 -206.5t170.5 -472.5t-172 -465t-432 -199h-1055q-260 0 -432 199t-172 465t170.5 472.5t433.5 206.5h1055zM2024 229q110 148 110 436.5t-103 433.5q-129 182 -359 182h-301q-53 0 -70 -13t-17 -66v-31h278q208 0 335 -158t127 -348.5t-128 -342 t-332 -151.5h-280v-31q0 -53 17.5 -66t69.5 -13h303q225 0 350 168zM1434 211q181 0 296.5 135t115.5 306.5t-108 303.5q-119 147 -304 147h-150v-110h150q131 0 216.5 -103.5t85.5 -236.5t-86 -232.5t-216 -99.5h-150v-110h150zM1328 382q230 0 230 275t-231 275 q-27 0 -35 -7t-8 -33v-471q0 -39 44 -39zM1115 421v471q0 26 -8 33t-34 7q-231 0 -231 -275t230 -275q43 0 43 39zM1115 211v110h-150q-130 0 -216 99.5t-86 232.5t85.5 236.5t216.5 103.5h150v110h-150q-185 0 -304 -147q-108 -132 -108 -303.5t115.5 -306.5t296.5 -135 h150zM1115 140v31h-280q-204 0 -332 151.5t-128 342t127 348.5t335 158h278v31q0 53 -17 66t-70 13h-301q-230 0 -359 -182q-103 -145 -103 -433.5t110 -436.5q125 -168 350 -168h303q52 0 69.5 13t17.5 66z" />
+<glyph unicode="&#x2189;" horiz-adv-x="1722" d="M1655 -82q0 -120 -103.5 -198.5t-231.5 -78.5t-223 56q-110 65 -110 171q0 90 97 90q42 0 70 -24.5t28 -62.5q0 -82 -93 -87q74 -85 219 -85q88 0 131 72q35 58 35 147q0 220 -176 220h-81q-35 0 -35 25.5t90.5 30.5t133.5 67t43 153q0 146 -140 146q-123 0 -187 -67 q86 -8 86 -79q0 -80 -89.5 -80t-89.5 81q0 94 97 150q83 49 191 49t195 -49q102 -57 102 -152q0 -79 -54.5 -144t-138.5 -98q100 -27 167 -94.5t67 -158.5zM676 1363q63 -111 63 -325.5t-59 -321.5q-91 -166 -277 -166t-277 160q-63 111 -63 325.5t59 321.5q91 166 277 166 t277 -160zM1419 1415q0 -13 -6 -22l-1071 -1667q-11 -17 -35 -17q-40 0 -40 40q0 13 6 22l1071 1667q11 17 35 17q40 0 40 -40zM590 965v173q0 335 -190 335t-190 -365v-173q0 -335 190 -335t190 365z" />
+<glyph unicode="&#x218a;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x218b;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x218c;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x218d;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x218e;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x218f;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2190;" d="M1931 582q0 -41 -39 -41h-1554q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41q-14 0 -20 19q-33 175 -142 303.5t-278 192.5q-16 6 -16 20t16 23l46 18q282 122 363 428q3 16 9.5 40.5t26.5 26.5q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-59 -266 -288 -432h1554 q39 0 39 -41z" />
+<glyph unicode="&#x2191;" horiz-adv-x="1024" d="M471 1200q-135 -223 -414 -293q-21 0 -23 23q1 -11 1 40q0 13 14 19q22 6 65 19q132 46 229.5 150.5t132.5 238.5q3 23 13 67q6 18 24 18t22 -18q4 -22 13 -66q35 -135 132.5 -239.5t229.5 -150.5q22 -6 65 -19q14 -4 14 -64q0 -18 -22 -18l-6 2q-102 28 -160 59 q-158 84 -248 232v-1481q0 -37 -41 -37t-41 37v1481z" />
+<glyph unicode="&#x2192;" d="M1906 611q25 -11 25 -27t-15 -22l-46 -18q-190 -83 -296 -265q-41 -70 -79 -213q-2 -7 -8 -13t-53 -6q-21 0 -21 27q0 2 8 36q65 274 287 431h-1554q-39 0 -39 41t39 41h1554q-154 111 -238 288q-57 121 -57 179q0 24 21 28q-3 -1 41 -1q15 0 20 -19q14 -55 54 -163 q105 -217 317 -310z" />
+<glyph unicode="&#x2193;" horiz-adv-x="1024" d="M553 -36q136 223 414 293q22 0 22 -18q0 -60 -14 -64q-22 -6 -65 -19q-132 -46 -229.5 -150.5t-132.5 -239.5q-4 -22 -13 -66q-4 -18 -22 -18t-24 18q-4 23 -13 67q-35 134 -132.5 238.5t-229.5 150.5q-22 6 -65 19q-14 6 -14 19q0 51 -1 40q2 23 23 23l6 -2 q104 -29 161 -59q157 -83 247 -232v1481q0 37 41 37t41 -37v-1481z" />
+<glyph unicode="&#x2194;" d="M1917 605q14 -8 14 -22.5t-14 -20.5q-223 -79 -343 -283q-43 -74 -79 -213q-2 -7 -8 -13t-53 -6q-21 0 -21 27q0 2 8 36q65 274 287 431h-1370q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41q-14 0 -20 19q-35 177 -143 305t-277 191q-16 6 -16 20.5t59 39.5 q138 59 233.5 171.5t133.5 261.5q3 15 10 43q5 18 25 20q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-59 -266 -288 -432h1370q-154 111 -238 288q-57 121 -57 179q0 24 21 27h41q15 0 20 -19q49 -191 144 -303t225 -169q19 -6 53 -21z" />
+<glyph unicode="&#x2195;" horiz-adv-x="1024" d="M553 -35q135 222 414 292q20 0 23 -24q-1 9 -1 -39q0 -14 -14 -18q-76 -23 -117.5 -40.5t-90.5 -52.5q-173 -124 -222 -329q-3 -18 -10 -54q-5 -18 -23 -18t-22 18l-18 80q-14 62 -60 137q-109 177 -304 243q-20 4 -59 16q-14 5 -14 63q0 18 22 18l6 -2q102 -28 158 -57 q158 -82 250 -233v1234q-136 -223 -414 -292q-22 0 -22 63q0 13 14 18q20 5 59 16q194 66 304 244q44 72 65 154q3 21 12 62q5 18 23.5 18t22.5 -18q4 -22 13 -66q34 -133 131.5 -237.5t220.5 -150.5l75 -22q14 -5 14 -63q0 -18 -22 -18l-6 2q-277 76 -408 290v-1234z" />
+<glyph unicode="&#x2196;" d="M1924 -274q0 -44 -44 -44q-14 0 -24 10l-1556 1556q19 -77 19 -150q0 -173 -101 -345q-8 -13 -18.5 -13t-30.5 20t-20 30l35 69q56 112 56 249q0 160 -76 283q-40 66 -40 68q0 23 24 23l67 -40q127 -76 273 -76t259 56q71 35 67 35q10 0 30.5 -19t20.5 -31t-12 -19 q-165 -100 -346 -100q-76 0 -149 18l1556 -1556q10 -10 10 -24z" />
+<glyph unicode="&#x2197;" d="M1924 1459q0 -2 -40 -68q-76 -123 -76 -271.5t56 -260.5l35 -69q0 -10 -20 -30t-30.5 -20t-18.5 13q-101 172 -101 345q0 73 19 150l-1556 -1556q-10 -10 -24 -10q-44 0 -44 44q0 14 10 24l1556 1556q-73 -18 -149 -18q-181 0 -346 100q-12 7 -12 19t20.5 31t30.5 19 q-4 0 67 -35q113 -56 259 -56t273 76l67 40q24 0 24 -23z" />
+<glyph unicode="&#x2198;" d="M1924 -295q0 -23 -24 -23l-67 40q-127 76 -273 76t-259 -56q-71 -35 -67 -35q-10 0 -30.5 19t-20.5 31t12 19q165 100 346 100q76 0 149 -18l-1556 1556q-10 10 -10 24q0 44 44 44q14 0 24 -10l1556 -1556q-19 77 -19 150q0 173 101 345q8 13 18.5 13t30.5 -20t20 -30 l-35 -69q-56 -112 -56 -249q0 -160 76 -283q40 -66 40 -68z" />
+<glyph unicode="&#x2199;" d="M1924 1438q0 -14 -10 -24l-1556 -1556q73 18 149 18q181 0 346 -100q12 -7 12 -19t-20.5 -31t-30.5 -19q4 0 -67 35q-113 56 -259 56t-273 -76l-67 -40q-24 0 -24 23q0 2 40 68q76 123 76 271.5t-56 260.5l-35 69q0 10 20 30t30.5 20t18.5 -13q101 -172 101 -345 q0 -73 -19 -150l1556 1556q10 10 24 10q44 0 44 -44z" />
+<glyph unicode="&#x219a;" d="M1931 582q0 -41 -39 -41h-644l-257 -445q-23 -40 -46 -40q-41 0 -41 38q0 15 16 43l233 404h-815q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41q-14 0 -20 19q-33 175 -142 303.5t-278 192.5q-16 6 -16 20t16 23l46 18q282 122 363 428q3 16 9.5 40.5t26.5 26.5 q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-59 -266 -288 -432h863l257 446q23 39 45 39q41 0 41 -38q0 -16 -15 -42l-234 -405h597q39 0 39 -41z" />
+<glyph unicode="&#x219b;" d="M1906 611q25 -11 25 -27t-15 -22l-46 -18q-190 -83 -296 -265q-41 -70 -79 -213q-2 -7 -8 -13t-53 -6q-21 0 -21 27q0 2 8 36q65 274 287 431h-860l-257 -445q-23 -40 -46 -40q-41 0 -41 38q0 15 16 43l233 404h-599q-39 0 -39 41t39 41h647l257 446q23 39 45 39 q41 0 41 -38q0 -16 -15 -42l-234 -405h813q-154 111 -238 288q-57 121 -57 179q0 24 21 28q-3 -1 41 -1q15 0 20 -19q14 -55 54 -163q105 -217 317 -310z" />
+<glyph unicode="&#x219c;" d="M1980 582q0 -14 -11 -27q-105 -121 -164 -167q-101 -78 -205 -78t-206 78q-59 46 -160.5 161t-153.5 156q-83 65 -164 65t-240.5 -114.5t-264.5 -114.5h-73q244 -175 295 -467q0 -27 -20 -27h-41q-18 0 -21 19q-31 171 -144.5 304.5t-276.5 188.5q-15 8 -15 23.5t15 19.5 q163 57 276.5 191t144.5 305q3 19 21 19h41q20 0 20 -27q-51 -292 -295 -467h73q84 0 240.5 114.5t263 114.5t207.5 -77q63 -48 162.5 -161t152.5 -156q84 -66 163 -66t162 66q50 41 148 151q12 14 31 14q39 0 39 -41z" />
+<glyph unicode="&#x219d;" d="M1980 582q0 -16 -15 -20q-163 -57 -276.5 -191t-144.5 -305q-3 -19 -21 -19h-41q-20 0 -20 27q51 292 295 467h-73q-84 0 -240.5 -114.5t-263 -114.5t-207.5 77q-63 48 -162.5 161t-152.5 156q-84 66 -163 66t-162 -66q-50 -41 -148 -151q-12 -14 -31 -14q-39 0 -39 41 q0 14 11 27q105 121 164 167q101 78 205 78t206 -78q59 -46 160.5 -161t153.5 -156q83 -65 164 -65t240.5 114.5t264.5 114.5h73q-244 175 -295 467q0 27 20 27h41q18 0 21 -19q31 -171 144.5 -304.5t276.5 -188.5q15 -7 15 -23z" />
+<glyph unicode="&#x219e;" d="M1931 582q0 -41 -39 -41h-1164q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41q-14 0 -20 19q-33 175 -134.5 295t-234.5 180h-234q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41q-14 0 -20 19q-33 175 -142 303.5t-278 192.5q-16 6 -16 20t16 23l46 18 q282 122 363 428q3 16 9.5 40.5t26.5 26.5q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-59 -266 -288 -432h229q282 122 363 428q3 16 9.5 40.5t26.5 26.5q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-59 -266 -288 -432h1164q39 0 39 -41z" />
+<glyph unicode="&#x219f;" horiz-adv-x="1024" d="M471 1200q-135 -223 -414 -293q-21 0 -23 23q1 -11 1 40q0 13 14 19q22 6 65 19q132 46 229.5 150.5t132.5 238.5q3 23 13 67q6 18 24 18t22 -18q4 -22 13 -66q35 -135 132.5 -239.5t229.5 -150.5q22 -6 65 -19q14 -4 14 -64q0 -18 -22 -18l-6 2q-102 28 -160 59 q-158 84 -248 232v-140q38 -129 134 -228.5t223 -143.5q22 -6 65 -19q14 -4 14 -64q0 -18 -22 -18l-6 2q-102 28 -160 59q-158 84 -248 232v-1161q0 -37 -41 -37t-41 37v1161q-135 -223 -414 -293q-21 0 -23 23q1 -11 1 40q0 13 14 19q22 6 65 19q127 44 223 143.5 t134 227.5v141z" />
+<glyph unicode="&#x21a0;" d="M1931 582q0 -14 -16 -20q-259 -98 -369 -334q-23 -49 -33 -90l-18 -72q-6 -19 -20 -19h-41q-21 3 -21 27q0 4 7 35q60 270 288 432h-234q-133 -60 -226 -170q-94 -111 -132 -258q-3 -16 -10 -41t-21 -25h-41q-21 3 -21 27q0 4 7 35q60 270 288 432h-1164q-39 0 -39 41 t39 41h1164q-229 166 -288 432q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5t230.5 -170.5h229q-229 166 -288 432q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5t230.5 -170.5q16 -5 46 -18q16 -9 16 -23z " />
+<glyph unicode="&#x21a1;" horiz-adv-x="1024" d="M553 -36q136 223 414 293q22 0 22 -18q0 -60 -14 -64q-22 -6 -65 -19q-132 -46 -229.5 -150.5t-132.5 -239.5q-4 -22 -13 -66q-4 -18 -22 -18t-24 18q-4 23 -13 67q-35 134 -132.5 238.5t-229.5 150.5q-22 6 -65 19q-14 6 -14 19q0 51 -1 40q2 23 23 23l6 -2 q104 -29 161 -59q157 -83 247 -232v141q-38 128 -134 227.5t-223 143.5q-22 6 -65 19q-14 6 -14 19q0 51 -1 40q2 23 23 23l6 -2q104 -29 161 -59q157 -83 247 -232v1161q0 37 41 37t41 -37v-1161q136 223 414 293q22 0 22 -18q0 -60 -14 -64q-22 -6 -65 -19 q-127 -44 -223 -143.5t-134 -228.5v-140z" />
+<glyph unicode="&#x21a2;" d="M1963 74q0 -27 -21 -27q-45 0 -36 -1q-20 2 -24 19t-12 48q-38 146 -132.5 257.5t-230.5 170.5h-1169q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41q-14 0 -20 19q-33 175 -142 303.5t-278 192.5q-16 6 -16 20t16 23l46 18q282 122 363 428q3 16 9.5 40.5t26.5 26.5 q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-59 -266 -288 -432h1169q282 122 363 428q3 16 9.5 40.5t26.5 26.5q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-26 -118 -93 -224q-97 -154 -247 -249q150 -95 247 -249q67 -106 93 -224q7 -31 7 -35z" />
+<glyph unicode="&#x21a3;" d="M1963 582q0 -14 -16 -20q-259 -98 -369 -334q-23 -49 -33 -90l-18 -72q-6 -19 -20 -19h-41q-21 3 -21 27q0 4 7 35q60 270 288 432h-1169q-282 -122 -363 -428q-3 -16 -9.5 -40.5t-26.5 -26.5q9 1 -36 1q-21 0 -21 27q0 4 7 35q26 118 93 224q97 154 247 249 q-150 95 -247 249q-67 106 -93 224q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5t230.5 -170.5h1169q-229 166 -288 432q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5t230.5 -170.5q16 -5 46 -18 q16 -9 16 -23z" />
+<glyph unicode="&#x21a4;" d="M1965 44q0 -62 -41 -62t-41 62v497h-1545q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41q-14 0 -20 19q-33 175 -142 303.5t-278 192.5q-16 6 -16 20t16 23l46 18q282 122 363 428q3 16 9.5 40.5t26.5 26.5q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-59 -266 -288 -432 h1545v498q0 61 41 61t41 -61v-1077z" />
+<glyph unicode="&#x21a5;" horiz-adv-x="1024" d="M471 1200q-135 -223 -414 -293q-21 0 -23 23q1 -11 1 40q0 13 14 19q22 6 65 19q132 46 229.5 150.5t132.5 238.5q3 23 13 67q6 18 24 18t22 -18q4 -22 13 -66q35 -135 132.5 -239.5t229.5 -150.5q22 -6 65 -19q14 -4 14 -64q0 -18 -22 -18l-6 2q-102 28 -160 59 q-158 84 -248 232v-1481q0 -37 -41 -37t-41 37v1481zM926 1606q63 0 63 -40.5t-63 -40.5h-828q-63 0 -63 40.5t63 40.5h828z" />
+<glyph unicode="&#x21a6;" d="M1906 611q25 -11 25 -27t-15 -22l-46 -18q-190 -83 -296 -265q-41 -70 -79 -213q-2 -7 -8 -13t-53 -6q-21 0 -21 27q0 2 8 36q65 274 287 431h-1543v-497q0 -62 -41 -62t-41 62v1077q0 61 41 61t41 -61v-498h1543q-154 111 -238 288q-57 121 -57 179q0 24 21 28 q-3 -1 41 -1q15 0 20 -19q14 -55 54 -163q105 -217 317 -310z" />
+<glyph unicode="&#x21a7;" horiz-adv-x="1024" d="M553 -36q136 223 414 293q22 0 22 -18q0 -60 -14 -64q-22 -6 -65 -19q-132 -46 -229.5 -150.5t-132.5 -239.5q-4 -22 -13 -66q-4 -18 -22 -18t-24 18q-4 23 -13 67q-35 134 -132.5 238.5t-229.5 150.5q-22 6 -65 19q-14 6 -14 19q0 51 -1 40q2 23 23 23l6 -2 q104 -29 161 -59q157 -83 247 -232v1481q0 37 41 37t41 -37v-1481zM926 -361q63 0 63 -40.5t-63 -40.5h-828q-63 0 -63 40.5t63 40.5h828z" />
+<glyph unicode="&#x21a8;" horiz-adv-x="1024" d="M553 -35q135 222 414 292q20 0 23 -24q-1 9 -1 -39q0 -14 -14 -18q-76 -23 -117.5 -40.5t-90.5 -52.5q-173 -124 -222 -329q-3 -18 -10 -54q-5 -18 -23 -18t-22 18l-18 80q-14 62 -60 137q-109 177 -304 243q-20 4 -59 16q-14 5 -14 63q0 18 22 18l6 -2q102 -28 158 -57 q158 -82 250 -233v1234q-136 -223 -414 -292q-22 0 -22 63q0 13 14 18q20 5 59 16q194 66 304 244q44 72 65 154q3 21 12 62q5 18 23.5 18t22.5 -18q4 -22 13 -66q34 -133 131.5 -237.5t220.5 -150.5l75 -22q14 -5 14 -63q0 -18 -22 -18l-6 2q-277 76 -408 290v-1234z M926 -361q63 0 63 -40.5t-63 -40.5h-828q-63 0 -63 40.5t63 40.5h828z" />
+<glyph unicode="&#x21a9;" d="M1624 1168l-89 -10q-41 0 -41 44q0 48 130 48q348 0 348 -355q0 -244 -194 -316q-104 -38 -401 -38h-1039q222 -158 288 -432q7 -29 7 -35q0 -28 -37.5 -28t-43 18t-12.5 49q-37 146 -134.5 261t-274.5 188q-16 7 -16 21t62 40q133 56 229 170q114 135 141 294 q7 23 16 27t20 4q50 0 50 -28q0 -6 -7 -35q-65 -270 -288 -432h1159q184 0 271 44q122 62 122 228q0 142 -62 207.5t-204 65.5z" />
+<glyph unicode="&#x21aa;" d="M552 1158l-89 10q-142 0 -204 -65.5t-62 -207.5q0 -166 122 -228q87 -44 271 -44h1159q-223 162 -288 432q-7 29 -7 35q0 28 50 28q24 0 32 -20q4 -16 11 -47q37 -144 133.5 -258t229.5 -170q62 -26 62 -40t-16 -21q-177 -73 -274.5 -188t-134.5 -261q-3 -16 -11 -47 q-7 -20 -44.5 -20t-37.5 28q0 6 7 35q66 274 288 432h-1039q-297 0 -401 38q-194 72 -194 316q0 355 348 355q130 0 130 -48q0 -44 -41 -44z" />
+<glyph unicode="&#x21ab;" d="M1972 895q0 -249 -203 -319q-102 -35 -413 -35v-520q0 -37 -41 -37t-41 37v520h-936q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41q-14 0 -20 19q-33 175 -142 303.5t-278 192.5q-16 6 -16 20t16 23l46 18q282 122 363 428q3 16 9.5 40.5t26.5 26.5q-9 -1 36 -1 q21 0 21 -27q0 -4 -7 -35q-59 -266 -288 -432h936v59q0 261 50 381q78 187 300 187q348 0 348 -355zM1356 623l141 -2q183 0 269 44q124 62 124 230q0 142 -62 207.5t-204 65.5q-184 0 -239 -164q-29 -85 -29 -322v-59z" />
+<glyph unicode="&#x21ac;" d="M1933 582q0 -14 -16 -20q-259 -98 -369 -334q-23 -49 -33 -90l-18 -72q-6 -19 -20 -19h-41q-21 3 -21 27q0 4 7 35q60 270 288 432h-936v-520q0 -37 -41 -37t-41 37v520q-311 0 -413 35q-203 70 -203 319q0 355 348 355q222 0 300 -187q50 -120 50 -381v-59h936 q-229 166 -288 432q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5t230.5 -170.5q16 -5 46 -18q16 -9 16 -23zM551 621l141 2v59q0 237 -29 322q-55 164 -239 164q-142 0 -204 -65.5t-62 -207.5q0 -168 124 -230q86 -44 269 -44z" />
+<glyph unicode="&#x21ad;" horiz-adv-x="2560" d="M2399 582q0 -16 -15 -20q-163 -57 -276.5 -191t-144.5 -305q-3 -19 -21 -19h-41q-20 0 -20 27q51 292 295 467h-72q-84 0 -241 -115t-263 -115t-208 77q-64 48 -163.5 161.5t-151.5 155.5q-83 66 -162.5 66t-240 -115t-264.5 -115h-72q244 -175 295 -467q0 -27 -20 -27 h-41q-18 0 -21 19q-31 171 -144.5 304.5t-276.5 188.5q-15 8 -15 23.5t15 19.5q163 57 276.5 191t144.5 305q3 19 21 19h41q20 0 20 -27q-51 -292 -295 -467h72q82 0 239.5 115t263.5 115t208 -78q59 -46 160.5 -161t153.5 -156q83 -65 163.5 -65t241 115t264.5 115h72 q-244 175 -295 467q0 27 20 27h41q18 0 21 -19q31 -171 144.5 -304.5t276.5 -188.5q15 -7 15 -23z" />
+<glyph unicode="&#x21ae;" horiz-adv-x="2560" d="M2420 611q25 -11 25 -27t-15 -22l-46 -18q-190 -83 -296 -265q-41 -70 -79 -213q-2 -7 -8 -13t-53 -6q-21 0 -21 27q0 2 8 36q65 274 287 431h-924l-257 -445q-23 -40 -46 -40q-41 0 -41 38q0 15 16 43l233 404h-865q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41 q-14 0 -20 19q-33 175 -142 303.5t-278 192.5q-16 6 -16 20t16 23l46 18q282 122 363 428q3 16 9.5 40.5t26.5 26.5q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-59 -266 -288 -432h913l257 446q23 39 45 39q41 0 41 -38q0 -16 -15 -42l-234 -405h877q-154 111 -238 288 q-57 121 -57 179q0 24 21 28q-3 -1 41 -1q15 0 20 -19q14 -55 54 -163q105 -217 317 -310z" />
+<glyph unicode="&#x21af;" d="M1924 1488q0 -21 -18 -31l-992 -573l590 -400l-1113 -643q271 -6 456 -207q8 -9 8 -19t-22 -24t-37 -14q-1 0 -60 52q-156 138 -375 138q-76 0 -147.5 -21t-67.5 -21q-22 0 -22 22q0 9 58 63q166 155 166 406q0 55 -10 102l-16 71q0 12 22.5 26.5t35 14.5t18.5 -18 q29 -89 29 -201q0 -159 -77 -299l1001 579l-589 400l1103 637q7 4 17 4q42 0 42 -44z" />
+<glyph unicode="&#x21b0;" horiz-adv-x="1024" d="M906 41q0 -41 -41 -41t-41 41v1052h-527q126 -107 178 -251q3 -8 3 -15q0 -39 -42 -39q-24 0 -34 22l-27 62q-76 149 -230 236q-27 15 -27 26t27 26q155 88 230 237q8 20 25 59q12 26 36 26q42 0 42 -39q0 -7 -3 -15q-52 -146 -179 -253h569q41 0 41 -41v-1093z" />
+<glyph unicode="&#x21b1;" horiz-adv-x="1024" d="M906 1134q0 -11 -27 -26q-154 -87 -230 -236l-25 -58q-12 -26 -36 -26q-42 0 -42 39q0 7 3 15q52 144 178 251h-527v-1052q0 -41 -41 -41t-41 41v1093q0 41 41 41h569q-127 107 -179 253q-3 8 -3 15q0 39 42 39q24 0 34 -23l27 -62q75 -149 230 -237q27 -15 27 -26z" />
+<glyph unicode="&#x21b2;" horiz-adv-x="1024" d="M906 348q0 -41 -41 -41h-569q127 -107 179 -253q3 -8 3 -15q0 -39 -42 -39q-24 0 -34 23l-27 62q-75 149 -230 237q-27 15 -27 26t27 26q154 87 230 236l25 58q12 26 36 26q42 0 42 -39q0 -7 -3 -15q-52 -144 -178 -251h527v1052q0 41 41 41t41 -41v-1093z" />
+<glyph unicode="&#x21b3;" horiz-adv-x="1024" d="M906 348q0 -11 -27 -26q-155 -88 -230 -237q-8 -20 -25 -59q-12 -26 -36 -26q-42 0 -42 39q0 7 3 15q52 146 179 253h-569q-41 0 -41 41v1093q0 41 41 41t41 -41v-1052h527q-126 107 -178 251q-3 8 -3 15q0 39 42 39q24 0 34 -22l27 -62q76 -149 230 -236q27 -15 27 -26z " />
+<glyph unicode="&#x21b4;" horiz-adv-x="1024" d="M906 318q0 -24 -23 -34l-62 -27q-149 -75 -237 -230q-15 -27 -26 -27t-26 27q-87 154 -236 230l-58 25q-26 12 -26 36q0 42 39 42q7 0 15 -3q144 -52 251 -178v1221h-358q-41 0 -41 41t41 41h399q41 0 41 -41v-1263q107 127 253 179q8 3 15 3q39 0 39 -42z" />
+<glyph unicode="&#x21b5;" d="M1748 582q0 -41 -41 -41h-1369q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41q-14 0 -20 19q-33 175 -142 303.5t-278 192.5q-16 6 -16 20t16 23l46 18q282 122 363 428q3 16 9.5 40.5t26.5 26.5q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-59 -266 -288 -432h1328v818 q0 41 41 41t41 -41v-859z" />
+<glyph unicode="&#x21b6;" d="M1972 4q0 -45 -41 -45t-41 37q0 160 -49 320q-77 251 -244 403q-184 168 -432 168q-295 0 -509.5 -207.5t-217.5 -501.5q107 127 253 179q8 3 15 3q39 0 39 -42q0 -24 -23 -34l-62 -27q-149 -75 -237 -230q-15 -27 -26 -27t-26 27q-87 154 -236 230l-58 25q-26 12 -26 36 q0 42 39 42q7 0 15 -3q144 -52 251 -178q2 328 240.5 559t568.5 231q361 0 594 -309q213 -283 213 -656z" />
+<glyph unicode="&#x21b7;" d="M1997 318q0 -24 -23 -34l-61 -27q-149 -76 -236 -230q-15 -27 -26 -27t-26 27q-88 155 -237 230q-20 8 -59 25q-26 12 -26 36q0 42 39 42q7 0 15 -3q146 -52 253 -179q-3 294 -217.5 501.5t-509.5 207.5q-248 0 -432 -168q-167 -152 -244 -403q-49 -160 -49 -320 q0 -37 -41 -37t-41 45q0 373 213 656q233 309 594 309q330 0 568.5 -231t240.5 -559q107 126 251 178q8 3 15 3q39 0 39 -42z" />
+<glyph unicode="&#x21b8;" d="M1924 -274q0 -44 -44 -44q-14 0 -24 10l-1556 1556q19 -77 19 -150q0 -173 -101 -345q-8 -13 -18.5 -13t-30.5 20t-20 30l35 69q56 112 56 249q0 160 -76 283q-40 66 -40 68q0 23 24 23l67 -40q127 -76 273 -76t259 56q71 35 67 35q10 0 30.5 -19t20.5 -31t-12 -19 q-165 -100 -346 -100q-76 0 -149 18l1556 -1556q10 -10 10 -24zM1931 1565q0 -41 -39 -41h-1738q-39 0 -39 41t39 41h1738q39 0 39 -41z" />
+<glyph unicode="&#x21b9;" d="M1918 -255q0 -63 -41 -63t-41 63v930q0 63 41 63t41 -63v-930zM597 913q223 -136 293 -414q0 -22 -18 -22q-60 0 -64 14q-6 22 -19 65q-46 132 -150.5 229.5t-239.5 132.5q-22 4 -66 13q-18 4 -18 22t18 24q23 4 67 13q134 35 238.5 132.5t150.5 229.5q6 23 19 65 q6 14 19 14q51 0 40 1q23 -2 23 -23l-2 -6q-29 -104 -59 -161q-83 -157 -232 -247h1299q37 0 37 -41t-37 -41h-1299zM1451 251q-223 134 -293 414q0 22 18 22q58 0 64 -14q6 -22 19 -65q67 -192 239 -298q75 -46 164 -67q22 -3 43 -7q28 -7 28 -25.5t-18 -23.5 q-22 -4 -66 -13q-134 -35 -240 -133t-151 -229l-18 -65q-4 -14 -19 -14q-48 0 -39 -1q-24 3 -24 23l2 6q38 139 109 239.5t182 168.5h-1299q-37 0 -37 41t37 41h1299zM212 489q0 -63 -41 -63t-41 63v930q0 63 41 63t41 -63v-930z" />
+<glyph unicode="&#x21ba;" horiz-adv-x="1590" d="M1516 582q0 -297 -211.5 -509.5t-509 -212.5t-509.5 212t-212 510q0 205 111.5 385.5t296.5 264.5q9 5 18 5q39 0 39 -42q0 -25 -23 -35q-164 -75 -263 -235.5t-99 -342.5q0 -265 188.5 -453.5t453 -188.5t452.5 189t188 453q0 183 -97 339t-259 236q38 -109 38 -185 q1 -3 1 -7q0 -71 -9 -120q-4 -21 -23 -29.5t-39 3t-17 36t7 67.5q1 17 1 33q0 148 -81 287q-16 27 -11 36q6 9 37 9h4q174 0 313 90l51 37q13 10 26 10q9 0 18 -5q24 -14 24 -33q0 -10 -7 -22q-4 -6 -10 -11q-118 -100 -279 -128q179 -92 285.5 -266t106.5 -377z" />
+<glyph unicode="&#x21bb;" horiz-adv-x="1590" d="M1516 582q0 -298 -212 -510t-509.5 -212t-509 212.5t-211.5 509.5q0 203 106.5 377t285.5 266q-161 28 -279 128q-6 5 -10 11q-7 12 -7 22q0 19 24 33q9 5 18 5q12 0 23 -8l54 -39q139 -90 313 -90h4q31 0 36.5 -9t-10.5 -36q-81 -139 -81 -287q0 -16 1 -33 q2 -21 6 -56.5t-16 -47t-39 -3t-23 29.5q-9 49 -9 120q0 4 1 7q0 76 38 185q-162 -80 -259 -236t-97 -339q0 -264 188 -453t452.5 -189t453 188.5t188.5 453.5q0 182 -99 342.5t-263 235.5q-23 10 -23 35q0 42 39 42q9 0 18 -5q185 -84 296.5 -264.5t111.5 -385.5z" />
+<glyph unicode="&#x21bc;" d="M1931 582q0 -41 -39 -41h-1710q-67 0 -67 41q0 16 62 41q132 54 230 170t133 258q2 16 11 47q8 20 45 20t37 -28q0 -7 -7 -35q-69 -273 -288 -432h1554q39 0 39 -41z" />
+<glyph unicode="&#x21bd;" d="M1931 582q0 -41 -39 -41h-1554q224 -163 288 -432q7 -30 7 -35q0 -28 -50 -28q-25 0 -30.5 18t-12.5 49q-37 145 -133 258t-230 170q-19 7 -40.5 16t-21.5 25q0 41 67 41h1710q39 0 39 -41z" />
+<glyph unicode="&#x21be;" horiz-adv-x="1024" d="M969 1062q20 -8 20 -45t-28 -37q-7 0 -35 7q-273 69 -432 288v-1554q0 -39 -41 -39t-41 39v1710q0 67 41 67q16 0 41 -62q54 -132 170 -230t258 -133q16 -2 47 -11z" />
+<glyph unicode="&#x21bf;" horiz-adv-x="1024" d="M612 -279q0 -39 -41 -39t-41 39v1554q-159 -219 -432 -288q-28 -7 -35 -7q-28 0 -28 37t20 45q16 4 47 11q142 35 258 133t170 230q25 62 41 62q41 0 41 -67v-1710z" />
+<glyph unicode="&#x21c0;" d="M1931 582q0 -41 -67 -41h-1710q-39 0 -39 41t39 41h1554q-219 159 -288 432q-7 28 -7 35q0 28 37 28t45 -20q4 -16 11 -47q35 -142 133 -258t230 -170q62 -25 62 -41z" />
+<glyph unicode="&#x21c1;" d="M1931 582q0 -16 -21.5 -25t-40.5 -16q-134 -57 -230 -170t-133 -258q-3 -28 -25 -64q-6 -3 -18 -3q-50 0 -50 28q0 5 7 35q64 269 288 432h-1554q-39 0 -39 41t39 41h1710q67 0 67 -41z" />
+<glyph unicode="&#x21c2;" horiz-adv-x="1024" d="M961 200q28 0 28 -37t-20 -45q-16 -4 -47 -11q-142 -35 -258 -133t-170 -230q-25 -62 -41 -62q-41 0 -41 67v1710q0 39 41 39t41 -39v-1554q159 219 432 288q28 7 35 7z" />
+<glyph unicode="&#x21c3;" horiz-adv-x="1024" d="M612 -251q0 -67 -41 -67q-16 0 -41 62q-54 132 -170 230t-258 133q-16 2 -47 11q-20 8 -20 45t28 37q7 0 35 -7q273 -69 432 -288v1554q0 39 41 39t41 -39v-1710z" />
+<glyph unicode="&#x21c4;" d="M1651 995q-223 135 -293 414q0 21 23 23q-11 -1 40 -1q13 0 19 -14q6 -22 19 -65q46 -132 150.5 -229.5t238.5 -132.5q23 -3 67 -13q18 -6 18 -24t-18 -22q-22 -4 -66 -13q-135 -35 -239.5 -132.5t-150.5 -229.5q-6 -22 -19 -65q-4 -14 -64 -14q-18 0 -18 22l2 6 q28 102 59 160q84 158 232 248h-1499q-37 0 -37 41t37 41h1499zM397 231q224 -137 293 -414q0 -20 -24 -23q9 1 -39 1q-15 0 -19 14q-5 22 -18 65q-45 131 -151 229t-240 133q-22 4 -66 13q-18 5 -18 23.5t24.5 24t46.5 8.5q205 48 329 221q46 64 74 144q6 23 19 65 q6 14 64 14q18 0 18 -22l-2 -6q-38 -143 -108 -241.5t-183 -166.5h1499q37 0 37 -41t-37 -41h-1499z" />
+<glyph unicode="&#x21c5;" horiz-adv-x="1704" d="M1233 -36q136 223 414 293q22 0 22 -18q0 -60 -14 -64q-22 -6 -65 -19q-132 -46 -229.5 -150.5t-132.5 -239.5q-4 -22 -13 -66q-4 -18 -22 -18t-24 18q-4 23 -13 67q-35 134 -132.5 238.5t-229.5 150.5q-22 6 -65 19q-14 6 -14 19q0 51 -1 40q2 23 23 23l6 -2 q104 -29 161 -59q157 -83 247 -232v1481q0 37 41 37t41 -37v-1481zM471 1200q-135 -223 -414 -293q-21 0 -23 23q1 -11 1 40q0 13 14 19q22 6 65 19q132 46 229.5 150.5t132.5 238.5q3 23 13 67q6 18 24 18t22 -18q4 -22 13 -66q35 -135 132.5 -239.5t229.5 -150.5 q22 -6 65 -19q14 -4 14 -64q0 -18 -22 -18l-6 2q-102 28 -160 59q-158 84 -248 232v-1481q0 -37 -41 -37t-41 37v1481z" />
+<glyph unicode="&#x21c6;" d="M397 913q223 -136 293 -414q0 -22 -18 -22q-60 0 -64 14q-6 22 -19 65q-46 132 -150.5 229.5t-239.5 132.5q-22 4 -66 13q-18 4 -18 22t18 24q23 4 67 13q134 35 238.5 132.5t150.5 229.5q6 23 19 65q6 14 19 14q51 0 40 1q23 -2 23 -23l-2 -6q-29 -104 -59 -161 q-83 -157 -232 -247h1499q37 0 37 -41t-37 -41h-1499zM1651 313q-223 134 -293 414q0 22 18 22q58 0 64 -14q6 -22 19 -65q67 -192 239 -298q75 -46 164 -67q22 -3 43 -7q28 -7 28 -25.5t-18 -23.5q-22 -4 -66 -13q-134 -35 -240 -133t-151 -229l-18 -65q-4 -14 -19 -14 q-48 0 -39 -1q-24 3 -24 23l2 6q38 139 109 239.5t182 168.5h-1499q-37 0 -37 41t37 41h1499z" />
+<glyph unicode="&#x21c7;" d="M397 881q180 -108 256 -299q-76 -191 -256 -299h1499q37 0 37 -41t-37 -41h-1499q223 -135 293 -414q0 -21 -23 -23q11 1 -40 1q-13 0 -19 14q-6 22 -19 65q-46 132 -150.5 229.5t-238.5 132.5q-23 3 -67 13q-18 6 -18 24t18 22q22 4 66 13q252 65 366 304 q-114 239 -366 304q-22 4 -66 13q-18 4 -18 22t18 24q23 4 67 13q134 35 238.5 132.5t150.5 229.5q6 22 19 65q6 14 19 14q51 0 40 1q23 -2 23 -23l-2 -6q-29 -104 -59 -161q-83 -157 -232 -247h1499q37 0 37 -41t-37 -41h-1499z" />
+<glyph unicode="&#x21c8;" horiz-adv-x="1704" d="M471 1200q-135 -223 -414 -293q-21 0 -23 23q1 -11 1 40q0 13 14 19q22 6 65 19q132 46 229.5 150.5t132.5 238.5q3 23 13 67q6 18 24 18t22 -18q4 -22 13 -66q65 -252 304 -366q239 114 304 366q4 22 13 66q4 18 22 18t24 -18q4 -23 13 -67q35 -134 132.5 -238.5 t229.5 -150.5q22 -6 65 -19q14 -6 14 -19q0 -51 1 -40q-2 -23 -23 -23l-6 2q-104 29 -161 59q-157 83 -247 232v-1481q0 -37 -41 -37t-41 37v1481q-108 -180 -299 -256q-191 76 -299 256v-1481q0 -37 -41 -37t-41 37v1481z" />
+<glyph unicode="&#x21c9;" d="M1651 963q-223 135 -293 414q0 21 23 23q-11 -1 40 -1q13 0 19 -14q6 -22 19 -65q46 -132 150.5 -229.5t238.5 -132.5q23 -3 67 -13q18 -6 18 -24t-18 -22q-22 -4 -66 -13q-252 -65 -366 -304q114 -239 366 -304q22 -4 66 -13q18 -4 18 -22t-18 -24q-23 -4 -67 -13 q-134 -35 -238.5 -132.5t-150.5 -229.5q-6 -22 -19 -65q-6 -14 -19 -14q-51 0 -40 -1q-23 2 -23 23l2 6q29 104 59 161q83 157 232 247h-1499q-37 0 -37 41t37 41h1499q-180 108 -256 299q76 191 256 299h-1499q-37 0 -37 41t37 41h1499z" />
+<glyph unicode="&#x21ca;" horiz-adv-x="1704" d="M1233 -36q135 223 414 293q21 0 23 -23q-1 11 -1 -40q0 -13 -14 -19q-22 -6 -65 -19q-132 -46 -229.5 -150.5t-132.5 -238.5q-3 -23 -13 -67q-6 -18 -24 -18t-22 18q-4 22 -13 66q-65 252 -304 366q-239 -114 -304 -366q-4 -22 -13 -66q-4 -18 -22 -18t-24 18 q-4 23 -13 67q-35 134 -132.5 238.5t-229.5 150.5q-22 6 -65 19q-14 6 -14 19q0 51 -1 40q2 23 23 23l6 -2q104 -29 161 -59q157 -83 247 -232v1481q0 37 41 37t41 -37v-1481q108 180 299 256q191 -76 299 -256v1481q0 37 41 37t41 -37v-1481z" />
+<glyph unicode="&#x21cb;" d="M1931 782q0 -41 -67 -41h-1710q-39 0 -39 41t39 41h1554q-219 159 -288 432q-7 28 -7 35q0 28 37 28t45 -20q4 -16 11 -47q35 -142 133 -258t230 -170q62 -25 62 -41zM1931 382q0 -41 -39 -41h-1554q224 -163 288 -432q7 -30 7 -35q0 -28 -50 -28q-25 0 -30.5 18 t-12.5 49q-37 145 -133 258t-230 170q-19 7 -40.5 16t-21.5 25q0 41 67 41h1710q39 0 39 -41z" />
+<glyph unicode="&#x21cc;" d="M1931 382q0 -16 -21.5 -25t-40.5 -16q-134 -57 -230 -170t-133 -258q-3 -28 -25 -64q-6 -3 -18 -3q-50 0 -50 28q0 5 7 35q64 269 288 432h-1554q-39 0 -39 41t39 41h1710q67 0 67 -41zM1931 782q0 -41 -39 -41h-1710q-67 0 -67 41q0 16 62 41q132 54 230 170t133 258 q2 16 11 47q8 20 45 20t37 -28q0 -7 -7 -35q-69 -273 -288 -432h1554q39 0 39 -41z" />
+<glyph unicode="&#x21cd;" d="M1932 383q0 -41 -37 -41h-462l-142 -246q-23 -40 -46 -40q-41 0 -41 38q0 15 16 43l118 205h-684q45 -44 126 -155t81 -146q0 -20 -23 -23q7 1 -38 1q-11 0 -17 12q-74 142 -162 238q-175 191 -418 272l-71 21q-16 5 -16 20t16 23l68 20q172 56 323 177.5t260 330.5 q6 12 58 12q20 0 20 -28.5t-80.5 -138.5t-126.5 -156h961l143 247q23 39 45 39q41 0 41 -38q0 -16 -15 -42l-119 -206h185q37 0 37 -41t-37 -41h-232l-183 -316h415q37 0 37 -41zM1568 740h-1004q-120 -99 -262 -158q142 -59 262 -158h822z" />
+<glyph unicode="&#x21ce;" horiz-adv-x="2560" d="M2444 605q14 -8 14 -22.5t-14 -20.5q-201 -89 -318.5 -204t-188.5 -255l-32 -70q-7 -14 -59 -14q-21 0 -21 22q0 38 67.5 142.5t113.5 158.5h-833l-142 -246q-23 -40 -46 -40q-41 0 -41 38q0 15 16 43l118 205h-524q43 -47 111.5 -155t68.5 -146q0 -22 -61 -22 q-11 0 -19 19l-30 64q-85 171 -219 285t-287 175q-16 6 -16 20.5t16 22.5q31 13 92 41q276 140 414 417l31 68q7 14 59 14q20 0 20 -22q0 -38 -68 -144.5t-112 -156.5h801l143 247q23 39 45 39q41 0 41 -38q0 -16 -15 -42l-119 -206h556q-48 58 -114.5 160.5t-66.5 140.5 q0 22 62 22q11 0 18 -14l57 -115q31 -55 72 -108q135 -174 332 -269q28 -11 78 -34zM2303 582q-122 66 -219 158h-681l-183 -316h864q97 92 219 158zM1308 740h-832q-97 -92 -219 -158q122 -66 219 -158h650z" />
+<glyph unicode="&#x21cf;" d="M1932 582q0 -15 -14 -20q-36 -10 -107 -34q-357 -136 -546 -497q-6 -12 -58 -12q-20 0 -20 22q0 36 80.5 145.5t126.5 155.5h-961l-142 -246q-23 -40 -46 -40q-41 0 -41 38q0 15 16 43l118 205h-183q-39 0 -39 41t39 41h231l182 316h-413q-39 0 -39 41t39 41h460l143 247 q23 39 45 39q41 0 41 -38q0 -16 -15 -42l-119 -206h684q-50 52 -128.5 158.5t-78.5 142.5q0 20 23 23q-5 -1 38 -1q11 0 17 -12q110 -208 259.5 -329.5t324.5 -178.5q28 -6 69 -20q14 -8 14 -23zM1746 582q-142 59 -262 158h-821l-183 -316h1004q120 99 262 158z" />
+<glyph unicode="&#x21d0;" d="M1932 383q0 -41 -37 -41h-1241q45 -44 126 -155t81 -146q0 -20 -23 -23q7 1 -38 1q-11 0 -17 12q-74 142 -162 238q-175 191 -418 272l-71 21q-16 5 -16 20t16 23l68 20q172 56 323 177.5t260 330.5q6 12 58 12q20 0 20 -28.5t-80.5 -138.5t-126.5 -156h1241q37 0 37 -41 t-37 -41h-1331q-120 -99 -262 -158q142 -59 262 -158h1331q37 0 37 -41z" />
+<glyph unicode="&#x21d1;" horiz-adv-x="1251" d="M1189 755q0 -18 -29 -18t-134.5 78t-160.5 129v-1225q0 -37 -41 -37t-41 37v1315q-99 122 -157 264q-56 -139 -158 -264v-1315q0 -37 -41 -37t-41 37v1225q-47 -47 -156 -127t-145 -80q-23 0 -23 63q0 8 13 15q214 120 330.5 262t173.5 307l24 80q6 18 23 18t22 -18 q48 -163 115.5 -274t163 -199.5t250.5 -175.5q12 -7 12 -60z" />
+<glyph unicode="&#x21d2;" d="M1932 582q0 -15 -14 -20q-36 -10 -107 -34q-357 -136 -546 -497q-6 -12 -58 -12q-20 0 -20 22q0 36 80.5 145.5t126.5 155.5h-1239q-39 0 -39 41t39 41h1329q120 99 262 158q-142 59 -262 158h-1329q-39 0 -39 41t39 41h1239q-50 52 -128.5 158.5t-78.5 142.5q0 20 23 23 q-5 -1 38 -1q11 0 17 -12q110 -208 259.5 -329.5t324.5 -178.5q28 -6 69 -20q14 -8 14 -23z" />
+<glyph unicode="&#x21d3;" horiz-adv-x="1251" d="M1189 364q0 -8 -12 -15q-158 -89 -238 -163q-196 -181 -273 -422q-5 -22 -18 -64q-6 -18 -22.5 -18t-22.5 18q-7 27 -24 81q-56 165 -174.5 309t-329.5 259q-13 7 -13 15v45q0 18 29 18t141 -81.5t154 -125.5v1225q0 37 41 37t41 -37v-1315q101 -125 158 -264 q57 142 157 264v1315q0 37 41 37t41 -37v-1225q46 46 156 126.5t145 80.5q21 0 24 -24q-1 7 -1 -39z" />
+<glyph unicode="&#x21d4;" horiz-adv-x="2560" d="M2444 605q14 -8 14 -22.5t-14 -20.5q-201 -89 -318.5 -204t-188.5 -255l-32 -70q-7 -14 -59 -14q-21 0 -21 22q0 38 67.5 142.5t113.5 158.5h-1452q43 -47 111.5 -155t68.5 -146q0 -22 -61 -22q-11 0 -19 19l-30 64q-88 176 -242 304q-116 97 -264 156q-16 6 -16 20.5 t16 22.5q31 13 92 41q276 140 414 417l31 68q7 14 59 14q20 0 20 -22q0 -38 -68 -144.5t-112 -156.5h1452q-48 58 -114.5 160.5t-66.5 140.5q0 22 62 22q11 0 18 -14l57 -115q31 -55 72 -108q135 -174 332 -269q28 -11 78 -34zM2303 582q-122 66 -219 158h-1608 q-97 -92 -219 -158q122 -66 219 -158h1608q97 92 219 158z" />
+<glyph unicode="&#x21d5;" horiz-adv-x="1251" d="M1189 127q0 -11 -17 -18q-334 -143 -490 -461l-21 -53q-17 -37 -35 -37q-14 0 -21 12q-11 26 -34 76q-101 204 -269 335q-76 59 -223 128q-17 8 -18 27q1 -17 1 36q0 19 30 19t139.5 -69.5t154.5 -110.5v1142q-48 -42 -156.5 -111t-144.5 -69q-23 0 -23 64q0 11 17 18 q343 147 500 477q9 22 28 64q5 10 19 10t22 -20l29 -66q66 -138 187.5 -261.5t307.5 -203.5q17 -7 17 -18v-45q0 -19 -29 -19t-134.5 67.5t-160.5 112.5v-1142q49 42 157 111t144 69q21 0 24 -24q-1 5 -1 -40zM783 -67v1298q-92 99 -157 219q-64 -117 -158 -219v-1298 q94 -102 158 -219q65 120 157 219z" />
+<glyph unicode="&#x21d6;" d="M1924 5q0 -42 -43 -42q-16 0 -25 9l-1297 1298q-157 16 -297 75q59 -138 75 -298l1296 -1297q10 -10 10 -25q0 -43 -43 -43q-15 0 -25 10l-1233 1233q0 -75 -23 -220.5t-58 -145.5q-10 0 -29.5 17.5t-19.5 24t2 13.5q53 191 53 327q0 230 -99 432q-44 90 -44 87 q0 22 23 22q5 0 13 -4q166 -85 275 -111.5t233.5 -26.5t324.5 54h6q11 0 29.5 -17.5t18.5 -27.5t-7 -18q-23 -25 -155 -45t-204 -22l1233 -1234q10 -10 10 -25z" />
+<glyph unicode="&#x21d7;" d="M1924 1460q0 3 -44 -87q-99 -202 -99 -432q0 -136 53 -327q2 -7 2 -13.5t-19.5 -24t-29.5 -17.5q-35 0 -58 145.5t-23 220.5l-1233 -1233q-10 -10 -25 -10q-43 0 -43 43q0 15 10 25l1296 1297q16 160 75 298q-140 -59 -297 -75l-1297 -1298q-9 -9 -25 -9q-43 0 -43 42 q0 15 10 25l1233 1234q-72 2 -204 22t-155 45q-7 8 -7 18t18.5 27.5t26.5 17.5h9q200 -54 324.5 -54t233.5 26.5t275 111.5q8 4 13 4q23 0 23 -22z" />
+<glyph unicode="&#x21d8;" d="M1924 -296q0 -22 -23 -22q-5 0 -13 4q-166 85 -275 111.5t-233.5 26.5t-324.5 -54h-6q-11 0 -29.5 17.5t-18.5 27.5t7 18q23 25 155 45t204 22l-1233 1234q-10 10 -10 25q0 42 43 42q16 0 25 -9l1297 -1298q157 -16 297 -75q-59 138 -75 298l-1296 1297q-10 10 -10 25 q0 43 43 43q15 0 25 -10l1233 -1233q0 75 23 220.5t58 145.5q10 0 29.5 -17.5t19.5 -24t-2 -13.5q-53 -191 -53 -327q0 -230 99 -432q44 -90 44 -87z" />
+<glyph unicode="&#x21d9;" d="M1924 1159q0 -15 -10 -25l-1233 -1234q72 -2 204 -22t155 -45q7 -8 7 -18t-18.5 -27.5t-26.5 -17.5h-9q-200 54 -324.5 54t-233.5 -26.5t-275 -111.5q-8 -4 -13 -4q-23 0 -23 22q0 -3 44 87q99 202 99 432q0 136 -53 327q-2 7 -2 13.5t19.5 24t29.5 17.5q35 0 58 -145.5 t23 -220.5l1233 1233q10 10 25 10q43 0 43 -43q0 -15 -10 -25l-1296 -1297q-16 -160 -75 -298q140 59 297 75l1297 1298q9 9 25 9q43 0 43 -42z" />
+<glyph unicode="&#x21da;" d="M1931 185q0 -41 -37 -41h-1222q71 -117 118 -247q3 -8 3 -15q0 -39 -42 -39q-22 0 -36 27q-18 46 -57 136q-136 277 -394 462l-124 79q-25 17 -25 35t25 35q42 25 124 78q255 182 394 464q18 46 57 135q14 27 36 27q42 0 42 -39q0 -7 -3 -15q-47 -130 -118 -247h1222 q37 0 37 -41t-37 -41h-1277q-132 -186 -317 -315h1590q41 0 41 -41t-41 -41h-1590q186 -131 318 -315h1276q37 0 37 -41z" />
+<glyph unicode="&#x21db;" d="M1931 582q0 -18 -25 -35q-42 -25 -124 -79q-258 -185 -394 -462q-17 -46 -57 -136q-14 -27 -36 -27q-42 0 -42 39q0 7 3 15q47 130 118 247h-1222q-37 0 -37 41t37 41h1276q132 184 318 315h-1590q-41 0 -41 41t41 41h1590q-185 129 -317 315h-1277q-37 0 -37 41t37 41 h1222q-71 117 -118 247q-3 8 -3 15q0 39 42 39q22 0 36 -27q18 -46 57 -135q139 -282 394 -464q42 -25 124 -78q25 -17 25 -35z" />
+<glyph unicode="&#x21dc;" d="M1931 582q0 -20 -10 -29l-190 -170q-13 -12 -31 -12t-31 12l-348 314l-348 -314q-13 -12 -31 -12t-31 12l-176 158h-442q127 -107 179 -253q3 -8 3 -15q0 -39 -42 -39q-24 0 -34 23l-27 62q-75 149 -230 237q-27 15 -27 26t27 26q154 87 230 236l25 58q12 26 36 26 q42 0 42 -39q0 -7 -3 -15q-52 -144 -178 -251h458q16 0 32 -14l158 -142l348 314q13 12 31 12t31 -12l348 -314l160 142q16 14 30 14q41 0 41 -41z" />
+<glyph unicode="&#x21dd;" d="M1931 582q0 -11 -27 -26q-154 -87 -230 -236l-25 -58q-12 -26 -36 -26q-42 0 -42 39q0 7 3 15q52 144 178 251h-458q-16 0 -32 14l-158 142l-348 -314q-13 -12 -31 -12t-31 12l-348 314l-160 -142q-16 -14 -30 -14q-41 0 -41 41q0 20 10 29l190 170q13 12 31 12t31 -12 l348 -314l348 314q13 12 31 12t31 -12l176 -158h442q-127 107 -179 253q-3 8 -3 15q0 39 42 39q24 0 34 -23l27 -62q75 -149 230 -237q27 -15 27 -26z" />
+<glyph unicode="&#x21de;" horiz-adv-x="1024" d="M471 1200q-135 -223 -414 -293q-21 0 -23 23q1 -11 1 40q0 13 14 19q22 6 65 19q132 46 229.5 150.5t132.5 238.5q3 23 13 67q6 18 24 18t22 -18q4 -22 13 -66q35 -135 132.5 -239.5t229.5 -150.5q22 -6 65 -19q14 -4 14 -64q0 -18 -22 -18l-6 2q-102 28 -160 59 q-158 84 -248 232v-718h298q61 0 61 -41t-61 -41h-298v-318h298q61 0 61 -41t-61 -41h-298v-281q0 -37 -41 -37t-41 37v281h-303q-56 0 -56 41t62 41h297v318h-303q-56 0 -56 41t62 41h297v718z" />
+<glyph unicode="&#x21df;" horiz-adv-x="1024" d="M553 -36q136 223 414 293q22 0 22 -18q0 -60 -14 -64q-22 -6 -65 -19q-132 -46 -229.5 -150.5t-132.5 -239.5q-4 -22 -13 -66q-4 -18 -22 -18t-24 18q-4 23 -13 67q-35 134 -132.5 238.5t-229.5 150.5q-22 6 -65 19q-14 6 -14 19q0 51 -1 40q2 23 23 23l6 -2 q104 -29 161 -59q157 -83 247 -232v718h-303q-56 0 -56 41t62 41h297v318h-303q-56 0 -56 41t62 41h297v281q0 37 41 37t41 -37v-281h298q61 0 61 -41t-61 -41h-298v-318h298q61 0 61 -41t-61 -41h-298v-718z" />
+<glyph unicode="&#x21e0;" d="M1931 582q0 -41 -39 -41h-195q-39 0 -39 41t39 41h195q39 0 39 -41zM1531 582q0 -41 -39 -41h-195q-39 0 -39 41t39 41h195q39 0 39 -41zM1131 582q0 -41 -39 -41h-195q-39 0 -39 41t39 41h195q39 0 39 -41zM731 582q0 -41 -39 -41h-354q228 -162 288 -432q7 -31 7 -35 q0 -24 -21 -27h-41q-14 0 -20 19q-33 175 -142 303.5t-278 192.5q-16 6 -16 20t16 23l46 18q282 122 363 428q3 16 9.5 40.5t26.5 26.5q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-59 -266 -288 -432h354q39 0 39 -41z" />
+<glyph unicode="&#x21e1;" horiz-adv-x="1024" d="M471 1200q-135 -223 -414 -293q-21 0 -23 23q1 -11 1 40q0 13 14 19q22 6 65 19q132 46 229.5 150.5t132.5 238.5q3 23 13 67q6 18 24 18t22 -18q4 -22 13 -66q35 -135 132.5 -239.5t229.5 -150.5q22 -6 65 -19q14 -4 14 -64q0 -18 -22 -18l-6 2q-102 28 -160 59 q-158 84 -248 232v-281q0 -37 -41 -37t-41 37v281zM553 521q0 -39 -41 -39t-41 39v195q0 39 41 39t41 -39v-195zM553 121q0 -39 -41 -39t-41 39v195q0 39 41 39t41 -39v-195zM553 -279q0 -39 -41 -39t-41 39v195q0 39 41 39t41 -39v-195z" />
+<glyph unicode="&#x21e2;" d="M1931 582q0 -14 -16 -20q-259 -98 -369 -334q-23 -49 -33 -90l-18 -72q-6 -19 -20 -19h-41q-21 3 -21 27q0 4 7 35q60 270 288 432h-354q-39 0 -39 41t39 41h354q-229 166 -288 432q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5 t230.5 -170.5q16 -5 46 -18q16 -9 16 -23zM1188 582q0 -41 -39 -41h-195q-39 0 -39 41t39 41h195q39 0 39 -41zM788 582q0 -41 -39 -41h-195q-39 0 -39 41t39 41h195q39 0 39 -41zM388 582q0 -41 -39 -41h-195q-39 0 -39 41t39 41h195q39 0 39 -41z" />
+<glyph unicode="&#x21e3;" horiz-adv-x="1024" d="M553 1248q0 -39 -41 -39t-41 39v195q0 39 41 39t41 -39v-195zM553 848q0 -39 -41 -39t-41 39v195q0 39 41 39t41 -39v-195zM553 448q0 -39 -41 -39t-41 39v195q0 39 41 39t41 -39v-195zM553 -36q136 223 414 293q22 0 22 -18q0 -60 -14 -64q-22 -6 -65 -19 q-132 -46 -229.5 -150.5t-132.5 -239.5q-4 -22 -13 -66q-4 -18 -22 -18t-24 18q-4 23 -13 67q-35 134 -132.5 238.5t-229.5 150.5q-22 6 -65 19q-14 6 -14 19q0 51 -1 40q2 23 23 23l6 -2q104 -29 161 -59q157 -83 247 -232v281q0 37 41 37t41 -37v-281z" />
+<glyph unicode="&#x21e4;" d="M1918 582q0 -41 -39 -41h-1354q222 -157 287 -431q8 -34 8 -36q0 -27 -21 -27q-47 0 -53 6t-8 13q-22 84 -35.5 123t-43.5 90q-106 182 -296 265l-47 18q-14 6 -14 22t25 27l40 14q210 91 317 310q24 49 54 163q5 19 20 19q44 0 41 1q21 -4 21 -28q0 -58 -57 -179 q-84 -177 -238 -288h1354q39 0 39 -41zM212 44q0 -62 -41 -62t-41 62v1077q0 61 41 61t41 -61v-1077z" />
+<glyph unicode="&#x21e5;" d="M1918 44q0 -62 -41 -62t-41 62v1077q0 61 41 61t41 -61v-1077zM1721 611q25 -11 25 -27t-15 -22l-46 -18q-190 -83 -296 -265q-41 -70 -79 -213q-2 -7 -8 -13t-53 -6q-21 0 -21 27q0 2 8 36q65 274 287 431h-1354q-39 0 -39 41t39 41h1354q-154 111 -238 288 q-57 121 -57 179q0 24 21 28q-3 -1 41 -1q15 0 20 -19q14 -55 54 -163q105 -217 317 -310z" />
+<glyph unicode="&#x21e6;" d="M1933 380q0 -37 -41 -37h-1005q-27 0 -27 -26v-276q0 -24 -36 -24q-4 0 -13.5 0.5t-15 0.5t-13.5 13q-128 221 -266.5 335t-302.5 169q-27 7 -80 24q-18 7 -18 23t18 23l80 24q164 55 302.5 169t266.5 335q8 13 13.5 13t15 0.5t13.5 0.5q36 0 36 -24v-276q0 -26 27 -26 h1005q41 0 41 -37v-404zM1853 449v266q0 24 -27 24h-1007q-41 0 -41 39v198q-74 -101 -125 -154q-155 -160 -354 -240q199 -80 354 -240q51 -53 125 -154v198q0 39 41 39h1007q27 0 27 24z" />
+<glyph unicode="&#x21e7;" horiz-adv-x="1250" d="M1190 773q0 -36 -24 -36h-276q-26 0 -26 -27v-987q0 -41 -37 -41h-404q-37 0 -37 41v987q0 27 -26 27h-276q-24 0 -24 36q0 4 0.5 13.5t0.5 15t13 13.5q221 128 335 266.5t169 302.5q7 27 24 80q7 18 23 18t23 -18l24 -80q55 -164 169 -302.5t335 -266.5q13 -8 13 -13.5 t0.5 -15t0.5 -13.5zM429 819q39 0 39 -41v-989q0 -27 24 -27h266q24 0 24 27v989q0 41 39 41h198q-101 74 -154 125q-160 155 -240 354q-80 -199 -240 -354q-53 -51 -154 -125h198z" />
+<glyph unicode="&#x21e8;" d="M1933 582q0 -16 -18 -23l-80 -24q-164 -55 -302.5 -169t-266.5 -335q-8 -13 -14 -13h-14q-10 -1 -14 -1q-36 0 -36 24v276q0 26 -27 26h-1005q-41 0 -41 37v404q0 37 41 37h1005q27 0 27 26v276q0 24 36 24h14q9 -1 14.5 -1t13.5 -13q128 -221 266.5 -335t302.5 -169 q27 -7 80 -24q18 -7 18 -23zM1270 778q0 -39 -41 -39h-1007q-27 0 -27 -24v-266q0 -24 27 -24h1007q41 0 41 -39v-198q74 101 125 154q155 160 354 240q-199 80 -354 240q-51 53 -125 154v-198z" />
+<glyph unicode="&#x21e9;" horiz-adv-x="1250" d="M1190 391v-14q-1 -9 -1 -14.5t-13 -13.5q-221 -128 -335 -266.5t-169 -302.5q-7 -27 -24 -80q-7 -18 -23 -18t-23 18l-24 80q-55 164 -169 302.5t-335 266.5q-13 8 -13 13v15q-1 10 -1 14q0 36 24 36h276q26 0 26 27v987q0 41 37 41h404q37 0 37 -41v-987q0 -27 26 -27 h276q24 0 24 -36zM821 345q-39 0 -39 41v989q0 27 -24 27h-266q-24 0 -24 -27v-989q0 -41 -39 -41h-198q101 -74 154 -125q160 -155 240 -354q80 199 240 354q53 51 154 125h-198z" />
+<glyph unicode="&#x21ea;" horiz-adv-x="1250" d="M1190 773q0 -36 -24 -36h-276q-26 0 -26 -27v-357q0 -41 -37 -41h-404q-37 0 -37 41v357q0 27 -26 27h-276q-24 0 -24 36q0 4 0.5 13.5t0.5 15t13 13.5q221 128 335 266.5t169 302.5q7 27 24 80q7 18 23 18t23 -18l24 -80q55 -164 169 -302.5t335 -266.5q13 -8 13 -13.5 t0.5 -15t0.5 -13.5zM864 -277q0 -41 -37 -41h-404q-37 0 -37 41v388q0 41 37 41h404q37 0 37 -41v-388zM429 819q39 0 39 -41v-359q0 -27 24 -27h266q24 0 24 27v359q0 41 39 41h198q-101 74 -154 125q-160 155 -240 354q-80 -199 -240 -354q-53 -51 -154 -125h198z M782 -211v256q0 27 -24 27h-266q-24 0 -24 -27v-256q0 -27 24 -27h266q24 0 24 27z" />
+<glyph unicode="&#x21eb;" horiz-adv-x="1250" d="M1190 773q0 -36 -24 -36h-276q-26 0 -26 -27v-728h163q37 0 37 -41v-218q0 -41 -37 -41h-804q-37 0 -37 41v218q0 41 37 41h163v728q0 27 -26 27h-276q-24 0 -24 36q0 4 0.5 13.5t0.5 15t13 13.5q221 128 335 266.5t169 302.5q7 27 24 80q7 18 23 18t23 -18l24 -80 q55 -164 169 -302.5t335 -266.5q13 -8 13 -13.5t0.5 -15t0.5 -13.5zM429 819q39 0 39 -41v-849q0 -27 -24 -27h-152q-24 0 -24 -27v-86q0 -27 24 -27h666q24 0 24 27v86q0 27 -24 27h-152q-24 0 -24 27v849q0 41 39 41h198q-101 74 -154 125q-160 155 -240 354 q-80 -199 -240 -354q-53 -51 -154 -125h198z" />
+<glyph unicode="&#x21ec;" horiz-adv-x="1250" d="M1190 773q0 -36 -24 -36h-276q-26 0 -26 -27v-728h163q37 0 37 -41v-218q0 -41 -37 -41h-804q-37 0 -37 41v218q0 41 37 41h163v728q0 27 -26 27h-276q-24 0 -24 36q0 4 0.5 13.5t0.5 15t13 13.5q221 128 335 266.5t169 302.5q7 27 24 80q7 18 23 18t23 -18l24 -80 q55 -164 169 -302.5t335 -266.5q13 -8 13 -13.5t0.5 -15t0.5 -13.5zM776 1043q-97 122 -151 255q-54 -133 -151 -255h302zM1019 819q-128 94 -171 142h-446q-43 -48 -171 -142h198q39 0 39 -41v-849q0 -27 -24 -27h-152q-24 0 -24 -27v-86q0 -27 24 -27h666q24 0 24 27v86 q0 27 -24 27h-152q-24 0 -24 27v849q0 41 39 41h198z" />
+<glyph unicode="&#x21ed;" horiz-adv-x="1250" d="M1190 773q0 -36 -24 -36h-276q-26 0 -26 -27v-728h163q37 0 37 -41v-218q0 -41 -37 -41h-804q-37 0 -37 41v218q0 41 37 41h163v728q0 27 -26 27h-276q-24 0 -24 36q0 4 0.5 13.5t0.5 15t13 13.5q221 128 335 266.5t169 302.5q7 27 24 80q7 18 23 18t23 -18l24 -80 q55 -164 169 -302.5t335 -266.5q13 -8 13 -13.5t0.5 -15t0.5 -13.5zM666 -238h292q24 0 24 27v86q0 27 -24 27h-152q-24 0 -24 27v849q0 41 39 41h198q-101 74 -154 125q-119 116 -199 266v-1448zM584 -238v1448q-80 -150 -199 -266q-53 -51 -154 -125h198q39 0 39 -41v-849 q0 -27 -24 -27h-152q-24 0 -24 -27v-86q0 -27 24 -27h292z" />
+<glyph unicode="&#x21ee;" horiz-adv-x="1250" d="M1190 473q0 -36 -24 -36h-276q-26 0 -26 -27v-687q0 -41 -37 -41h-404q-37 0 -37 41v687q0 27 -26 27h-276q-24 0 -24 36q0 4 0.5 13.5t0.5 15t13 13.5q194 113 296 222h-286q-24 0 -24 36q0 4 0.5 13.5t0.5 15t13 13.5q221 128 335 266.5t169 302.5q7 27 24 80 q7 18 23 18t23 -18l24 -80q55 -164 169 -302.5t335 -266.5q13 -8 13 -13.5t0.5 -15t0.5 -13.5q0 -36 -24 -36h-286q102 -109 296 -222q13 -8 13 -13.5t0.5 -15t0.5 -13.5zM625 1182q16 0 23 -18l24 -80q48 -142 140 -265h207q-101 74 -154 125q-160 155 -240 354 q-80 -199 -240 -354q-53 -51 -154 -125h207q92 123 140 265q7 27 24 80q7 18 23 18zM429 519q39 0 39 -41v-689q0 -27 24 -27h266q24 0 24 27v689q0 41 39 41h198q-101 74 -154 125q-160 155 -240 354q-80 -199 -240 -354q-53 -51 -154 -125h198z" />
+<glyph unicode="&#x21ef;" horiz-adv-x="1250" d="M1190 473q0 -36 -24 -36h-276q-26 0 -26 -27v-428h163q37 0 37 -41v-218q0 -41 -37 -41h-804q-37 0 -37 41v218q0 41 37 41h163v428q0 27 -26 27h-276q-24 0 -24 36q0 4 0.5 13.5t0.5 15t13 13.5q194 113 296 222h-286q-24 0 -24 36q0 4 0.5 13.5t0.5 15t13 13.5 q221 128 335 266.5t169 302.5q7 27 24 80q7 18 23 18t23 -18l24 -80q55 -164 169 -302.5t335 -266.5q13 -8 13 -13.5t0.5 -15t0.5 -13.5q0 -36 -24 -36h-286q102 -109 296 -222q13 -8 13 -13.5t0.5 -15t0.5 -13.5zM625 1182q16 0 23 -18l24 -80q48 -142 140 -265h207 q-101 74 -154 125q-160 155 -240 354q-80 -199 -240 -354q-53 -51 -154 -125h207q92 123 140 265q7 27 24 80q7 18 23 18zM429 519q39 0 39 -41v-549q0 -27 -24 -27h-152q-24 0 -24 -27v-86q0 -27 24 -27h666q24 0 24 27v86q0 27 -24 27h-152q-24 0 -24 27v549q0 41 39 41 h198q-101 74 -154 125q-160 155 -240 354q-80 -199 -240 -354q-53 -51 -154 -125h198z" />
+<glyph unicode="&#x21f0;" d="M1933 582q0 -16 -18 -23l-80 -24q-164 -55 -302.5 -169t-266.5 -335q-8 -13 -14 -13h-14q-10 -1 -14 -1q-36 0 -36 24v276q0 26 -27 26h-728v-163q0 -37 -41 -37h-218q-41 0 -41 37v804q0 37 41 37h218q41 0 41 -37v-163h728q27 0 27 26v276q0 24 36 24h14q9 -1 14.5 -1 t13.5 -13q128 -221 266.5 -335t302.5 -169q27 -7 80 -24q18 -7 18 -23zM1270 778q0 -39 -41 -39h-849q-27 0 -27 24v152q0 24 -27 24h-86q-27 0 -27 -24v-666q0 -24 27 -24h86q27 0 27 24v152q0 24 27 24h849q41 0 41 -39v-198q74 101 125 154q155 160 354 240 q-199 80 -354 240q-51 53 -125 154v-198z" />
+<glyph unicode="&#x21f1;" horiz-adv-x="1573" d="M556 860q18 -73 18 -159q0 -159 -100 -336q-1 -2 -3 -5q-16 -16 -28 -3q-17 14 -37 42q-2 7 5 19l29 53q56 117 56 248v22q-6 143 -76 262l-38 56q-9 16 3.5 28.5t29.5 4.5q19 -14 57 -39q130 -76 278 -76q48 0 98 8q81 14 155 49q19 12 59 33q14 6 23 -4q37 -36 37 -44 q0 -11 -13 -19q-94 -53 -172 -77t-163 -24t-160 19l809 -809q26 -26 -3 -55t-55 -3zM1439 1299q0 -41 -68 -41h-1155v-1255q0 -68 -41 -68t-41 68v1269q0 61 35 66q11 2 33 2h1169q68 0 68 -41z" />
+<glyph unicode="&#x21f2;" horiz-adv-x="1573" d="M1439 68q0 -61 -35 -66q-11 -2 -33 -2h-1169q-68 0 -68 41t68 41h1155v1255q0 68 41 68t41 -68v-1269zM451 321q0 11 13 19q94 53 172 77t163 24t160 -19l-809 809q-12 12 -12 25q0 15 15 30t30 15q13 0 25 -12l809 -809q-18 73 -18 159q0 159 100 336q1 2 3 5 q16 16 28 3q17 -14 37 -42q2 -7 -5 -19l-29 -53q-56 -116 -56 -246q0 -12 1 -24q5 -143 75 -262l38 -56q4 -7 4 -13q0 -8 -7 -16q-8 -7 -17 -7q-6 0 -13 3q-19 14 -57 39q-130 76 -278 76q-48 0 -98 -8q-81 -14 -155 -49q-19 -12 -59 -33q-14 -6 -23 4q-37 36 -37 44z" />
+<glyph unicode="&#x21f3;" horiz-adv-x="1250" d="M1190 127q0 -10 -17 -18q-192 -85 -312 -206.5t-184 -258.5q-10 -25 -24 -55.5t-28 -30.5t-28 30.5t-24 55.5q-64 137 -184 258.5t-312 206.5q-17 8 -17 18v40q3 24 23 24h277q26 0 26 27v728q0 27 -26 27h-277q-20 0 -23 24v40q0 10 17 18q192 85 312 206.5t184 258.5 q10 25 24 55.5t28 30.5t28 -30.5t24 -55.5q64 -137 184 -258.5t312 -206.5q17 -8 17 -18v-40q-3 -24 -23 -24h-277q-26 0 -26 -27v-728q0 -27 26 -27h277q20 0 23 -24v-40zM821 109q-39 0 -39 41v864q0 41 39 41h182q-88 57 -138 98q-142 115 -240 297q-98 -182 -240 -297 q-50 -41 -138 -98h182q39 0 39 -41v-864q0 -41 -39 -41h-182q88 -57 138 -98q142 -115 240 -297q98 182 240 297q50 41 138 98h-182z" />
+<glyph unicode="&#x21f4;" d="M1906 611q25 -11 25 -27t-15 -22l-46 -18q-190 -83 -296 -265q-41 -70 -79 -213q-2 -7 -8 -13t-53 -6q-21 0 -21 27q0 2 8 36q65 274 287 431h-515q-16 -145 -125 -243.5t-256 -98.5t-256 98.5t-125 243.5h-277q-39 0 -39 41t39 41h277q16 145 125 243.5t256 98.5 t256 -98.5t125 -243.5h515q-154 111 -238 288q-57 121 -57 179q0 24 21 28q-3 -1 41 -1q15 0 20 -19q14 -55 54 -163q105 -217 317 -310zM812 883q-113 0 -198 -74.5t-100 -185.5h596q-15 111 -100 185.5t-198 74.5zM812 281q113 0 198 74.5t100 185.5h-596 q15 -111 100 -185.5t198 -74.5z" />
+<glyph unicode="&#x21f5;" horiz-adv-x="1706" d="M1153 1200q-134 -223 -414 -293q-22 0 -22 18q0 58 14 64q22 6 65 19q192 67 298 239q46 75 67 164q3 22 8.5 46.5t24 24.5t23.5 -18q4 -22 13 -66q35 -134 133 -240t229 -151l65 -18q14 -4 14 -19q0 -48 1 -39q-3 -24 -23 -24l-6 2q-139 38 -239.5 109t-168.5 182v-1481 q0 -37 -41 -37t-41 37v1481zM553 -36q136 223 414 293q22 0 22 -18q0 -60 -14 -64q-22 -6 -65 -19q-132 -46 -229.5 -150.5t-132.5 -239.5q-4 -22 -13 -66q-4 -18 -22 -18t-24 18q-4 23 -13 67q-35 134 -132.5 238.5t-229.5 150.5q-23 6 -65 19q-14 6 -14 19q0 51 -1 40 q2 23 23 23l6 -2q104 -29 161 -59q157 -83 247 -232v1481q0 37 41 37t41 -37v-1481z" />
+<glyph unicode="&#x21f6;" d="M1651 1164q-223 135 -293 414q0 22 63 22q13 0 19 -14q6 -22 19 -65q46 -132 150.5 -229.5t238.5 -132.5q23 -3 67 -13q18 -6 18 -23t-18 -23q-23 -4 -67 -13q-205 -54 -325 -234q120 -181 325 -235q23 -3 67 -13q18 -6 18 -23t-18 -23q-23 -4 -67 -13 q-205 -54 -325 -234q120 -181 325 -235q23 -3 67 -13q18 -6 18 -23t-18 -23q-23 -4 -67 -13q-134 -35 -238.5 -132.5t-150.5 -229.5q-6 -22 -19 -65q-6 -14 -19 -14q-63 0 -63 22l2 6q29 104 59 161q83 157 232 247h-1499q-37 0 -37 41t37 41h1499q-140 85 -222 230 q82 144 222 229h-1499q-37 0 -37 41t37 41h1499q-140 85 -222 230q82 144 222 229h-1499q-37 0 -37 41t37 41h1499z" />
+<glyph unicode="&#x21f7;" d="M1931 582q0 -41 -39 -41h-578v-395q0 -39 -41 -39t-41 39v395h-894q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41q-14 0 -20 19q-33 175 -142 303.5t-278 192.5q-16 6 -16 20t16 23l46 18q282 122 363 428q3 16 9.5 40.5t26.5 26.5q-9 -1 36 -1q21 0 21 -27 q0 -4 -7 -35q-59 -266 -288 -432h894v397q0 37 41 37t41 -37v-397h578q39 0 39 -41z" />
+<glyph unicode="&#x21f8;" d="M1906 611q25 -11 25 -27t-15 -22l-46 -18q-190 -83 -296 -265q-41 -70 -79 -213q-2 -7 -8 -13t-53 -6q-21 0 -21 27q0 2 8 36q65 274 287 431h-894v-395q0 -39 -41 -39t-41 39v395h-578q-39 0 -39 41t39 41h578v397q0 37 41 37t41 -37v-397h894q-154 111 -238 288 q-57 121 -57 179q0 24 21 28q-3 -1 41 -1q15 0 20 -19q14 -55 54 -163q105 -217 317 -310z" />
+<glyph unicode="&#x21f9;" d="M1918 605q14 -8 14 -22.5t-14 -20.5q-223 -79 -343 -283q-43 -74 -79 -213q-2 -7 -8 -13t-53 -6q-21 0 -21 27q0 2 8 36q65 274 287 431h-644v-395q0 -39 -41 -39t-41 39v395h-644q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41q-14 0 -20 19q-35 177 -143 305 t-277 191q-16 6 -16 20.5t59 39.5q138 59 233.5 171.5t133.5 261.5q3 15 10 43q5 18 25 20q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-59 -266 -288 -432h644v397q0 37 41 37t41 -37v-397h644q-154 111 -238 288q-57 121 -57 179q0 24 21 27h41q15 0 20 -19q49 -191 144 -303 t225 -169q19 -6 53 -21z" />
+<glyph unicode="&#x21fa;" d="M1931 582q0 -41 -39 -41h-378v-395q0 -39 -41 -39t-41 39v395h-218v-395q0 -39 -41 -39t-41 39v395h-794q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41q-14 0 -20 19q-33 175 -142 303.5t-278 192.5q-16 6 -16 20t16 23l46 18q282 122 363 428q3 16 9.5 40.5 t26.5 26.5q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-59 -266 -288 -432h794v397q0 37 41 37t41 -37v-397h218v397q0 37 41 37t41 -37v-397h378q39 0 39 -41z" />
+<glyph unicode="&#x21fb;" d="M1906 611q25 -11 25 -27t-15 -22l-46 -18q-190 -83 -296 -265q-41 -70 -79 -213q-2 -7 -8 -13t-53 -6q-21 0 -21 27q0 2 8 36q65 274 287 431h-794v-395q0 -39 -41 -39t-41 39v395h-218v-395q0 -39 -41 -39t-41 39v395h-378q-39 0 -39 41t39 41h378v397q0 37 41 37 t41 -37v-397h218v397q0 37 41 37t41 -37v-397h794q-154 111 -238 288q-57 121 -57 179q0 24 21 28q-3 -1 41 -1q15 0 20 -19q14 -55 54 -163q105 -217 317 -310z" />
+<glyph unicode="&#x21fc;" d="M1918 605q14 -8 14 -22.5t-14 -20.5q-223 -79 -343 -283q-43 -74 -79 -213q-2 -7 -8 -13t-53 -6q-21 0 -21 27q0 2 8 36q65 274 287 431h-494v-395q0 -39 -41 -39t-41 39v395h-218v-395q0 -39 -41 -39t-41 39v395h-494q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41 q-14 0 -20 19q-35 177 -143 305t-277 191q-16 6 -16 20.5t59 39.5q138 59 233.5 171.5t133.5 261.5q3 15 10 43q5 18 25 20q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-59 -266 -288 -432h494v397q0 37 41 37t41 -37v-397h218v397q0 37 41 37t41 -37v-397h494q-154 111 -238 288 q-57 121 -57 179q0 24 21 27h41q15 0 20 -19q49 -191 144 -303t225 -169q19 -6 53 -21z" />
+<glyph unicode="&#x21fd;" d="M1933 582q0 -41 -37 -41h-1036v-500q0 -24 -36 -24q-4 0 -13.5 0.5t-15 0.5t-13.5 13q-128 221 -266.5 335t-302.5 169q-27 7 -80 24q-18 7 -18 23t18 23l80 24q164 55 302.5 169t266.5 335q8 13 13.5 13t15 0.5t13.5 0.5q36 0 36 -24v-500h1036q37 0 37 -41zM778 188 v788q-74 -101 -125 -154q-155 -160 -354 -240q199 -80 354 -240q51 -53 125 -154z" />
+<glyph unicode="&#x21fe;" d="M1933 582q0 -16 -18 -23l-80 -24q-164 -55 -302.5 -169t-266.5 -335q-8 -13 -14 -13h-14q-10 -1 -14 -1q-36 0 -36 24v500h-1036q-37 0 -37 41t37 41h1036v500q0 24 36 24h14q9 -1 14.5 -1t13.5 -13q128 -221 266.5 -335t302.5 -169q27 -7 80 -24q18 -7 18 -23zM1749 582 q-199 80 -354 240q-51 53 -125 154v-788q74 101 125 154q155 160 354 240z" />
+<glyph unicode="&#x21ff;" d="M1919 605q14 -8 14 -22.5t-14 -20.5q-223 -79 -343 -283q-43 -74 -79 -213q-2 -7 -8 -13t-53 -6q-21 0 -21 27v467h-782v-467q0 -27 -21 -27q-47 0 -53 6t-8 13q-36 139 -79 213q-105 179 -293 263q-17 6 -50 20q-14 6 -14 20.5t14 22.5l53 21q130 57 225 169t144 303 q5 19 20 19h41q21 -3 21 -27v-467h782v467q0 24 21 27h41q15 0 20 -19q49 -191 144 -303t225 -169q19 -6 53 -21zM1771 582q-178 101 -274 281v-562q96 180 274 281zM551 301v562q-96 -180 -274 -281q178 -101 274 -281z" />
+<glyph unicode="&#x2200;" horiz-adv-x="1137" d="M1139 1380q0 -9 -531 -1400q-10 -25 -38 -25t-38 25q-532 1397 -532 1400q0 41 41 41q30 0 39 -24l178 -473h623l180 473q9 24 37 24q41 0 41 -41zM848 842h-557l278 -731z" />
+<glyph unicode="&#x2201;" horiz-adv-x="1024" d="M875 151q0 -139 -141 -210q-102 -51 -222 -51t-222 51q-141 71 -141 210v1186q0 137 142 208q103 51 221 51t221 -51q142 -71 142 -208v-230q0 -60 -60 -60t-60 60v230q0 61 -74.5 100t-168.5 39t-168.5 -39t-74.5 -100v-1186q0 -63 73.5 -102t169.5 -39t169.5 39 t73.5 102v227q0 60 60 60t60 -60v-227z" />
+<glyph unicode="&#x2202;" horiz-adv-x="1087" d="M1036 810q0 -313 -128 -556q-159 -299 -443 -299q-183 0 -308 127t-125 316t130 345q161 193 390 193q108 0 187 -67.5t111 -174.5h2q16 132 16 218q0 199 -76 335q-95 168 -278 168q-208 0 -271 -162q7 1 14 1q38 0 65 -27t27 -64.5t-27.5 -65t-66 -27.5t-65 29 t-26.5 63t19 86q80 218 326.5 218t394.5 -212q132 -188 132 -444zM827 562q0 135 -69.5 232t-198.5 97q-186 0 -284 -182q-34 -63 -53.5 -184t-19.5 -214q0 -131 67 -215t194 -84q180 0 282 194q82 158 82 356z" />
+<glyph unicode="&#x2203;" horiz-adv-x="1137" d="M1022 39q0 -39 -37 -39h-831q-39 0 -39 41t39 41h786v588h-760q-37 0 -37 41t37 41h760v587h-786q-39 0 -39 41t39 41h831q37 0 37 -37v-1345z" />
+<glyph unicode="&#x2204;" horiz-adv-x="1137" d="M1022 39q0 -39 -37 -39h-611l-122 -336q-17 -47 -44 -47q-42 0 -42 38q0 15 8 37l112 308h-132q-39 0 -39 41t39 41h162l214 588h-350q-37 0 -37 41t37 41h380l214 587h-620q-39 0 -39 41t39 41h650l29 80q17 46 43 46q42 0 42 -37q0 -15 -8 -37l-19 -52h94q37 0 37 -37 v-1345zM940 752v587h-79l-213 -587h292zM940 82v588h-322l-214 -588h536z" />
+<glyph unicode="&#x2205;" horiz-adv-x="1591" d="M1518 582q0 -298 -211.5 -510.5t-509.5 -212.5q-205 0 -380 109l-214 -305q-12 -17 -34 -17q-40 0 -40 41q0 13 7 23l214 305q-276 218 -276 567q0 300 211.5 511.5t511.5 211.5q206 0 380 -109l214 306q11 15 33 15q41 0 41 -41q0 -11 -7 -21l-214 -306 q274 -218 274 -567zM1436 582q0 306 -239 499l-733 -1046q154 -94 333 -94q264 0 451.5 188.5t187.5 452.5zM797 1223q-266 0 -453.5 -187.5t-187.5 -453.5q0 -307 241 -500l733 1047q-153 94 -333 94z" />
+<glyph unicode="&#x2206;" horiz-adv-x="1694" d="M1596 17q0 -17 -24 -17h-1450q-24 0 -24 17q0 6 4 14l695 1401q17 35 50.5 35t50.5 -35l694 -1401q4 -8 4 -14zM1346 146l-557 1126l-558 -1126h1115z" />
+<glyph unicode="&#x2207;" horiz-adv-x="1694" d="M1596 1373q0 -6 -4 -14l-695 -1401q-17 -35 -50.5 -35t-50.5 35l-694 1401q-4 8 -4 14q0 17 24 17h1450q24 0 24 -17zM1463 1244h-1115l557 -1126z" />
+<glyph unicode="&#x2208;" horiz-adv-x="1364" d="M1194 41q0 -41 -37 -41h-364q-253 0 -438 166t-185 416t185 416t438 166h364q37 0 37 -41t-37 -41h-358q-201 0 -373 -132t-172 -327h903q37 0 37 -41t-37 -41h-903q0 -195 172 -327t373 -132h358q37 0 37 -41z" />
+<glyph unicode="&#x2209;" horiz-adv-x="1364" d="M1194 41q0 -41 -37 -41h-364q-72 0 -143 15l-128 -351q-17 -47 -44 -47q-42 0 -42 38q0 15 8 37l126 346q-177 63 -288.5 208.5t-111.5 335.5q0 250 185 416t438 166h187l123 337q17 46 43 46q42 0 42 -37q0 -15 -8 -37l-112 -309h89q37 0 37 -41t-37 -41h-119l-167 -459 h286q37 0 37 -41t-37 -41h-316l-162 -446q61 -13 120 -13h358q37 0 37 -41zM799 1082q-201 0 -373 -132t-172 -327h529l167 459h-151zM254 541q0 -144 98.5 -256.5t246.5 -166.5l154 423h-499z" />
+<glyph unicode="&#x220a;" horiz-adv-x="1164" d="M994 41q0 -41 -37 -41h-293q-201 0 -347.5 132t-146.5 330t146.5 330t347.5 132h293q37 0 37 -41t-37 -41h-293q-158 0 -275.5 -96.5t-134.5 -242.5h703q37 0 37 -41t-37 -41h-703q17 -146 134.5 -242.5t275.5 -96.5h293q37 0 37 -41z" />
+<glyph unicode="&#x220b;" horiz-adv-x="1364" d="M1194 582q0 -250 -185 -416t-438 -166h-364q-37 0 -37 41t37 41h358q201 0 373 132t172 327h-903q-37 0 -37 41t37 41h903q0 195 -172 327t-373 132h-358q-37 0 -37 41t37 41h364q253 0 438 -166t185 -416z" />
+<glyph unicode="&#x220c;" horiz-adv-x="1364" d="M1194 582q0 -250 -185 -416t-438 -166h-117l-122 -336q-17 -47 -44 -47q-42 0 -42 38q0 15 8 37l112 308h-159q-37 0 -37 41t37 41h189l167 459h-356q-37 0 -37 41t37 41h386l156 428q-93 31 -184 31h-358q-37 0 -37 41t37 41h364q107 0 207 -33l135 370q17 46 43 46 q42 0 42 -37q0 -15 -8 -37l-135 -372q153 -72 246 -209t93 -310zM1110 623q0 128 -79.5 232.5t-205.5 164.5l-144 -397h429zM1110 541h-459l-167 -459h81q201 0 373 132t172 327z" />
+<glyph unicode="&#x220d;" horiz-adv-x="1164" d="M994 462q0 -198 -146.5 -330t-347.5 -132h-293q-37 0 -37 41t37 41h293q158 0 275.5 96.5t134.5 242.5h-703q-37 0 -37 41t37 41h703q-17 146 -134.5 242.5t-275.5 96.5h-293q-37 0 -37 41t37 41h293q201 0 347.5 -132t146.5 -330z" />
+<glyph unicode="&#x220e;" horiz-adv-x="567" d="M453 39q0 -39 -37 -39h-262q-39 0 -39 39v307q0 37 39 37h262q37 0 37 -37v-307z" />
+<glyph unicode="&#x220f;" horiz-adv-x="1652" d="M1551 -255q0 -35 -27 -35h-478q-27 0 -27 35t27 35h81q72 0 72 55v1549h-746v-1549q0 -55 72 -55h81q27 0 27 -35t-27 -35h-478q-27 0 -27 35t27 35h81q72 0 72 55v1494q0 55 -72 55h-81q-27 0 -27 35t27 35h1396q27 0 27 -35t-27 -35h-81q-72 0 -72 -55v-1494 q0 -55 72 -55h81q27 0 27 -35z" />
+<glyph unicode="&#x2210;" horiz-adv-x="1652" d="M1551 -255q0 -35 -27 -35h-1396q-27 0 -27 35t27 35h81q72 0 72 55v1494q0 55 -72 55h-81q-27 0 -27 35t27 35h478q27 0 27 -35t-27 -35h-81q-72 0 -72 -55v-1549h746v1549q0 55 -72 55h-81q-27 0 -27 35t27 35h478q27 0 27 -35t-27 -35h-81q-72 0 -72 -55v-1494 q0 -55 72 -55h81q27 0 27 -35z" />
+<glyph unicode="&#x2211;" horiz-adv-x="1700" d="M829 1382h-597l560 -778q6 -8 6 -22t-8 -24l-604 -747h680q284 0 439 50q235 77 309 287h50l-148 -438h-1463q-17 0 -17 20q0 6 5 12l628 775l-628 872q-6 8 -6 36.5t19 28.5h1462l149 -410h-51q-80 215 -328 291q-156 47 -457 47z" />
+<glyph unicode="&#x2212;" horiz-adv-x="1591" d="M1421 582q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41z" />
+<glyph unicode="&#x2213;" horiz-adv-x="1591" d="M1477 342q0 -41 -37 -41h-602v-604q0 -37 -41 -37t-41 37v604h-602q-39 0 -39 41t39 41h602v559h-602q-39 0 -39 41t39 41h1286q37 0 37 -41t-37 -41h-602v-559h602q37 0 37 -41z" />
+<glyph unicode="&#x2214;" horiz-adv-x="1591" d="M872 1535.5q27 -33.5 27 -75t-33.5 -69t-75 -27.5t-69 33.5t-27.5 75t34 69t75.5 27.5t68.5 -33.5zM1479 512q0 -41 -37 -41h-604v-627q0 -37 -41 -37t-41 37v627h-602q-39 0 -39 41t39 41h602v627q0 37 41 37t41 -37v-627h604q37 0 37 -41z" />
+<glyph unicode="&#x2215;" horiz-adv-x="1024" d="M889 1505q0 -8 -2 -13l-673 -1848q-9 -26 -40 -26q-39 0 -39 41q0 8 2 13l673 1848q9 26 40 26q39 0 39 -41z" />
+<glyph unicode="&#x2216;" horiz-adv-x="1024" d="M889 -341q0 -41 -39 -41q-31 0 -40 26l-673 1848q-2 5 -2 13q0 41 39 41q31 0 40 -26l673 -1848q2 -5 2 -13z" />
+<glyph unicode="&#x2217;" horiz-adv-x="964" d="M824 416q26 -12 26 -39.5t-16.5 -47t-35.5 -19.5t-31 9l-258 182l30 -319q0 -49 -56.5 -49t-56.5 49v5l29 314l-257 -182q-13 -9 -31.5 -9t-35.5 19.5t-17 47t27 39.5l287 132l-287 132q-27 13 -27 40t17 47t35.5 20t31.5 -9l257 -183l-29 319q0 49 56.5 49t56.5 -49v-5 l-30 -314l258 183q12 9 31 9t35.5 -20t16.5 -47t-26 -40l-287 -132z" />
+<glyph unicode="&#x2218;" horiz-adv-x="580" d="M540 582q0 -104 -73 -177t-177 -73t-177 73t-73 177t73 177t177 73t177 -73t73 -177zM440 582q0 63 -43.5 106.5t-106.5 43.5t-106.5 -43.5t-43.5 -106.5t43.5 -106.5t106.5 -43.5t106.5 43.5t43.5 106.5z" />
+<glyph unicode="&#x2219;" horiz-adv-x="580" d="M540 582q0 -104 -73 -177t-177 -73t-177 73t-73 177t73 177t177 73t177 -73t73 -177z" />
+<glyph unicode="&#x221a;" horiz-adv-x="1706" d="M1747 1565q0 -10 -2 -14l-952 -1975q-9 -18 -56 -18q-13 0 -18 12l-408 897q-129 -98 -135 -98q-29 0 -29 29q0 9 9 16l243 184q8 6 18.5 6t16.5 -14l367 -807l870 1804q9 19 35 19q41 0 41 -41z" />
+<glyph unicode="&#x221b;" horiz-adv-x="1706" d="M1747 1565q0 -10 -2 -14l-952 -1975q-9 -18 -56 -18q-13 0 -18 12l-408 897q-129 -98 -135 -98q-29 0 -29 29q0 9 9 16l243 184q8 6 18.5 6t16.5 -14l367 -807l870 1804q9 19 35 19q41 0 41 -41zM1038 935q0 -118 -97 -192.5t-213.5 -74.5t-203.5 53q-103 62 -103 166 q0 89 91 89t91 -85q0 -79 -83 -85q68 -79 197 -79q151 0 151 209t-160 209q-68 0 -68 -1t4 -1q-44 4 -44 27t35 29q27 1 53 3q80 6 118.5 64.5t38.5 145.5q0 138 -126 138q-111 0 -169 -61q78 -8 78 -77q0 -79 -84.5 -79t-84.5 80q0 92 90 146q77 47 175.5 47t179.5 -47 q95 -55 95 -148q0 -158 -173 -232q89 -26 150.5 -91t61.5 -153z" />
+<glyph unicode="&#x221c;" horiz-adv-x="1706" d="M1747 1565q0 -10 -2 -14l-952 -1975q-9 -18 -56 -18q-13 0 -18 12l-408 897q-129 -98 -135 -98q-29 0 -29 29q0 9 9 16l243 184q8 6 18.5 6t16.5 -14l367 -807l870 1804q9 19 35 19q41 0 41 -41zM1057 903h-143v-105q0 -40 30 -49q10 -3 68 -3h41v-64q-74 5 -166 5h-78 q-92 0 -166 -5v64h41q58 0 68 3q30 9 30 49v105h-381v55l442 628q14 20 38 20q33 0 33 -46v-594h143v-63zM790 966v451l-317 -451h317z" />
+<glyph unicode="&#x221d;" horiz-adv-x="1591" d="M1401 -23q-245 0 -428 277l-45 68q-176 -345 -459 -345q-168 0 -267 154q-87 134 -87 311t90 311q102 152 263.5 152t286.5 -107q84 -72 193 -237q174 344 459 344q39 0 70 -8l2 -63q-28 6 -54 6q-142 0 -262 -114q-100 -95 -164 -245l95 -145q81 -123 138 -177 q93 -89 198 -89q16 0 49 4v-86q-49 -11 -78 -11zM446 813q-132 0 -210 -125q-68 -108 -68 -252t67 -258q79 -135 216 -135q270 0 426 358l-113 177q-70 102 -142.5 168.5t-175.5 66.5z" />
+<glyph unicode="&#x221e;" d="M1542 905q175 0 282 -141.5t107 -322.5t-109 -322.5t-286 -141.5q-134 0 -258.5 73.5t-210.5 189.5l-61 82q-212 -345 -502 -345q-174 0 -281.5 142.5t-107.5 323t109.5 321.5t285.5 141q132 0 258.5 -74.5t210.5 -187.5l61 -82q216 344 502 344zM1569 84 q136 0 222.5 109.5t86.5 253.5t-86 265.5t-229 121.5q-260 0 -465 -349l142 -180q74 -94 148.5 -157.5t180.5 -63.5zM477 799q-137 0 -223 -109.5t-86 -253t87 -265.5t228 -122q260 0 465 348l-133 173q-81 101 -156.5 165t-181.5 64z" />
+<glyph unicode="&#x221f;" horiz-adv-x="1573" d="M1434 41q0 -41 -68 -41h-1139q-61 0 -66 35q-2 11 -2 33v1269q0 68 41 68t41 -68v-1255h1125q68 0 68 -41z" />
+<glyph unicode="&#x2220;" horiz-adv-x="1479" d="M1362 41q0 -41 -37 -41h-1171q-39 0 -39 41q0 18 10 29l1165 1339q10 12 31 12q41 0 41 -41q0 -14 -10 -26l-1106 -1272h1079q37 0 37 -41z" />
+<glyph unicode="&#x2221;" horiz-adv-x="1479" d="M1362 41q0 -41 -37 -41h-430q0 -41 -41 -41q-36 0 -43 41h-657q-39 0 -39 41q0 17 10 29l1165 1380q10 12 31 12q41 0 41 -41q0 -14 -10 -26l-678 -805q84 -98 150.5 -245.5t66.5 -262.5h434q37 0 37 -41zM809 82q-25 255 -191 444l-374 -444h565z" />
+<glyph unicode="&#x2222;" horiz-adv-x="1479" d="M1362 -63q0 -41 -41 -41q-10 0 -14 2l-1166 577q-26 13 -26 37.5t20 34.5l1172 579q4 2 14 2q41 0 41 -41q0 -25 -19 -34l-266 -131q86 -190 86 -408t-86 -412l260 -129q25 -12 25 -36zM1081 512q0 196 -77 373l-756 -373l756 -373q77 177 77 373z" />
+<glyph unicode="&#x2223;" horiz-adv-x="626" d="M354 -401q0 -41 -41 -41t-41 41v1968q0 39 41 39t41 -39v-1968z" />
+<glyph unicode="&#x2224;" horiz-adv-x="626" d="M633 1070q0 -16 -15 -42l-264 -457v-976q0 -37 -41 -37t-41 37v834l-192 -333q-23 -40 -46 -40q-41 0 -41 38q0 15 16 43l263 456v976q0 37 41 37t41 -37v-834l193 334q23 39 45 39q41 0 41 -38z" />
+<glyph unicode="&#x2225;" horiz-adv-x="1024" d="M752 -405q0 -37 -41 -37t-41 37v1974q0 37 41 37t41 -37v-1974zM354 -405q0 -37 -41 -37t-41 37v1974q0 37 41 37t41 -37v-1974z" />
+<glyph unicode="&#x2226;" horiz-adv-x="1024" d="M977 1090q0 -18 -23 -45l-202 -241v-1209q0 -37 -41 -37t-41 37v1112l-316 -377v-735q0 -37 -41 -37t-41 37v638l-139 -166q-27 -32 -46 -32q-40 0 -40 39q0 17 24 46l201 240v1209q0 37 41 37t41 -37v-1111l316 376v735q0 37 41 37t41 -37v-637l139 166q26 31 46 31 q40 0 40 -39z" />
+<glyph unicode="&#x2227;" horiz-adv-x="1364" d="M1249 -4q0 -41 -41 -41q-26 0 -37 25l-489 1103l-489 -1103q-11 -25 -37 -25q-41 0 -41 41q0 11 2 16l526 1188q11 25 39 25t39 -25l526 -1188q2 -5 2 -16z" />
+<glyph unicode="&#x2228;" horiz-adv-x="1364" d="M1249 1183q0 -11 -2 -16l-526 -1188q-11 -25 -39 -25t-39 25l-526 1188q-2 5 -2 16q0 41 41 41q26 0 37 -25l489 -1103l489 1103q11 25 37 25q41 0 41 -41z" />
+<glyph unicode="&#x2229;" horiz-adv-x="1364" d="M1249 -8q0 -37 -41 -37t-41 37v792q0 171 -163 273q-140 86 -322.5 86t-321.5 -87q-163 -101 -163 -272v-792q0 -37 -41 -37t-41 37v799q0 202 189 326q164 108 378 108t379 -107q188 -124 188 -327v-799z" />
+<glyph unicode="&#x222a;" horiz-adv-x="1364" d="M1249 389q0 -203 -188 -327q-165 -107 -379 -107t-379 107q-188 124 -188 327v799q0 37 41 37t41 -37v-793q0 -169 164 -271q140 -87 321.5 -87t321.5 86q163 101 163 272v793q0 37 41 37t41 -37v-799z" />
+<glyph unicode="&#x222b;" horiz-adv-x="1019" d="M814 1606q77 0 141 -42t64 -116t-76 -74t-76 75q0 69 67 78q-47 38 -120 38q-86 0 -126 -118q-30 -89 -45 -268l-18 -279q-25 -376 -100 -924q-23 -165 -90 -274q-88 -144 -231 -144q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75q0 -69 -70 -78q48 -39 121 -39 q98 0 144 118q40 102 66 478t54 602l52 396q24 172 84 277q78 137 210 137z" />
+<glyph unicode="&#x222c;" horiz-adv-x="1559" d="M814 1606q77 0 141 -42t64 -116t-76 -74t-76 75q0 69 67 78q-47 38 -120 38q-86 0 -126 -118q-30 -89 -45 -268l-18 -279q-25 -376 -100 -924q-23 -165 -90 -274q-88 -144 -231 -144q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75q0 -69 -70 -78q48 -39 121 -39 q98 0 144 118q40 102 66 478t54 602l52 396q24 172 84 277q78 137 210 137zM1354 1606q77 0 141 -42t64 -116t-76.5 -74t-76.5 75q0 69 68 78q-47 38 -120 38q-86 0 -126 -118q-30 -89 -45 -268l-18 -279q-25 -377 -100 -924q-23 -165 -90 -274q-88 -144 -231 -144 q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75q0 -69 -70 -78q48 -39 121 -39q98 0 144 118q39 99 64 468t56 604l52 398q24 178 84 283q78 137 210 137z" />
+<glyph unicode="&#x222d;" horiz-adv-x="2099" d="M814 1606q77 0 141 -42t64 -116t-76 -74t-76 75q0 69 67 78q-47 38 -120 38q-86 0 -126 -118q-30 -89 -45 -268l-18 -279q-25 -376 -100 -924q-23 -165 -90 -274q-88 -144 -231 -144q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75q0 -69 -70 -78q48 -39 121 -39 q98 0 144 118q40 102 66 478t54 602l52 396q24 172 84 277q78 137 210 137zM1894 1606q77 0 141 -42t64 -116t-76.5 -74t-76.5 75q0 69 68 78q-47 38 -120 38q-86 0 -126 -118q-30 -89 -45 -268l-18 -279q-25 -376 -100 -924q-23 -165 -90 -274q-88 -144 -231 -144 q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75q0 -69 -70 -78q48 -39 121 -39q98 0 144 118q39 99 64 468t56 604l52 398q24 178 84 283q78 137 210 137zM1354 1606q77 0 141 -42t64 -116t-76.5 -74t-76.5 75q0 69 68 78q-47 38 -120 38q-86 0 -126 -118q-30 -89 -45 -268 l-18 -279q-25 -376 -100 -924q-23 -165 -90 -274q-88 -144 -231 -144q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75q0 -69 -70 -78q48 -39 121 -39q98 0 144 118q39 99 64 468t56 604l52 398q24 178 84 283q78 137 210 137z" />
+<glyph unicode="&#x222e;" horiz-adv-x="1019" d="M814 1606q77 0 141 -42t64 -116t-76 -74t-76 75q0 69 67 78q-47 38 -120 38q-86 0 -126 -118q-35 -104 -60 -511q117 -35 190.5 -133.5t73.5 -231t-97 -238t-239 -118.5l-31 -239q-23 -165 -90 -274q-88 -144 -231 -144q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75 q0 -69 -70 -78q48 -39 121 -39q98 0 144 118q34 86 50 251l18 262q-116 35 -189 133t-73 230t96.5 238t238.5 119l31 237q57 420 294 420zM763 369.5q81 91.5 81 203.5t-61 196.5t-159 117.5q-16 -239 -62 -624q120 15 201 106.5zM282 794.5q-80 -91.5 -80 -203.5t60.5 -196 t157.5 -117q24 319 62 623q-120 -15 -200 -106.5z" />
+<glyph unicode="&#x222f;" horiz-adv-x="1559" d="M1354 1606q77 0 141 -42t64 -116t-76.5 -74t-76.5 75q0 69 68 78q-47 38 -120 38q-86 0 -124 -112.5t-63 -519.5q265 -124 265 -351q0 -261 -338 -381l-29 -225q-23 -165 -90 -274q-88 -144 -231 -144q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75q0 -69 -70 -78 q48 -39 121 -39q98 0 144 118q31 79 46 219q8 114 17 228q-82 -15 -179 -15t-220 34q-17 -135 -27 -206q-23 -165 -90 -274q-88 -144 -231 -144q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75q0 -69 -70 -78q48 -39 121 -39q98 0 144 118q34 87 50 253l18 263 q-262 124 -262 350q0 261 336 380l30 224q57 420 294 420q77 0 141 -42t64 -116t-76 -74t-76 75q0 69 67 78q-47 38 -120 38q-86 0 -126 -118q-35 -103 -56 -447q86 16 182 16t219 -34q40 301 66 382q77 242 255 242zM1384 582q0 189 -220 299q-16 -236 -63 -626 q283 109 283 327zM1027 934q-120 34 -216.5 34t-181.5 -17l-4 -51q-27 -338 -62 -629l-5 -41q120 -34 215.5 -34t181.5 17q35 479 72 721zM202 582q0 -188 218 -298q24 305 63 625q-281 -109 -281 -327z" />
+<glyph unicode="&#x2230;" horiz-adv-x="2099" d="M1894 1606q77 0 141 -42t64 -116t-76.5 -74t-76.5 75q0 69 68 78q-47 38 -120 38q-86 0 -124 -112t-62 -512q263 -134 263 -359q0 -256 -339 -393l-27 -213q-23 -165 -90 -274q-88 -144 -231 -144q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75q0 -69 -70 -78 q48 -39 121 -39q98 0 143 115.5t62 427.5q-200 -54 -410 -57q-5 -36 -14 -108q-23 -165 -90 -274q-88 -144 -231 -144q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75q0 -69 -70 -78q48 -39 121 -39q98 0 144 118q40 103 58 372q-213 17 -396 80l-25 -192q-23 -165 -90 -274 q-88 -144 -231 -144q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75q0 -69 -70 -78q48 -39 121 -39q98 0 144 118q34 87 50 249l18 259q-262 135 -262 358q0 256 338 393q40 305 67 389q78 242 255 242q77 0 141 -42t64 -116t-76 -74t-76 75q0 69 67 78q-47 38 -120 38 q-86 0 -126 -118q-35 -102 -55 -425q202 55 413 58q30 231 70 331q77 195 238 195q77 0 141 -42t64 -116t-76.5 -74t-76.5 75q0 69 68 78q-47 38 -120 38q-86 0 -126 -118q-33 -97 -52 -371q218 -17 399 -79q38 288 66 374q78 235 253 235zM1924 582q0 188 -220 307 q-27 -406 -65 -645q285 124 285 338zM1568 948q-179 63 -395 80q-25 -397 -88 -897q206 4 408 61q27 381 75 756zM1040 1033q-207 -4 -410 -62q-21 -337 -74 -755q177 -62 393 -80q31 447 91 897zM202 582q0 -187 218 -306q18 239 30.5 373.5t34.5 270.5 q-283 -124 -283 -338z" />
+<glyph unicode="&#x2231;" horiz-adv-x="1019" d="M814 1606q77 0 141 -42t64 -116t-76 -74t-76 75q0 69 67 78q-47 38 -120 38q-86 0 -123.5 -111.5t-62.5 -517.5q117 -35 190.5 -133.5t73.5 -231t-97 -238t-239 -118.5l-31 -239q-23 -165 -90 -274q-88 -144 -231 -144q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75 q0 -69 -70 -78q48 -39 121 -39q98 0 144 118q34 88 50 252l18 261q-114 35 -186.5 130t-75.5 214q-113 -102 -144 -102q-23 0 -23 35q0 4 32 20q103 51 135 128q15 37 24 37t24 -37q32 -77 135 -128q31 -15 31 -20q0 -35 -22 -35q-31 0 -144 102q3 -100 63 -181.5 t155 -113.5q27 348 51 535l49 373q24 177 84 283q78 137 210 137zM763 369.5q81 91.5 81 203.5t-61 196.5t-159 117.5q-23 -336 -62 -624q120 15 201 106.5z" />
+<glyph unicode="&#x2232;" horiz-adv-x="1019" d="M814 1606q77 0 141 -42t64 -116t-76 -74t-76 75q0 69 67 78q-47 38 -120 38q-86 0 -126 -118q-35 -104 -60 -511q117 -35 190.5 -133.5t73.5 -231t-97 -238t-239 -118.5l-31 -239q-23 -165 -90 -274q-88 -144 -231 -144q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75 q0 -69 -70 -78q48 -39 121 -39q98 0 144 118q34 86 50 252l18 261q-114 35 -186.5 130t-75.5 214q-113 -102 -144 -102q-23 0 -23 35q0 4 32 20q102 50 135 128q3 11 15 34q32 107 120 179t200 82l31 237q57 420 294 420zM763 369.5q81 91.5 81 203.5t-61 196.5t-159 117.5 q-16 -239 -62 -624q120 15 201 106.5zM368 506q0 -35 -22 -35q-31 0 -144 102q3 -100 63 -181.5t155 -113.5q24 317 62 623q-103 -13 -179 -85t-96 -174q38 -70 130 -116q31 -16 31 -20z" />
+<glyph unicode="&#x2233;" horiz-adv-x="1019" d="M814 1606q77 0 141 -42t64 -116t-76 -74t-76 75q0 69 67 78q-47 38 -120 38q-86 0 -126 -118q-35 -104 -60 -511q117 -35 190.5 -133.5t73.5 -231t-97 -238t-239 -118.5l-31 -239q-23 -165 -90 -274q-88 -144 -231 -144q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75 q0 -69 -70 -78q48 -39 121 -39q98 0 144 118q34 86 50 252l18 261q-190 58 -247 247q-2 2 -15 34q-33 78 -135 128q-32 16 -32 20q0 35 23 35q31 0 144 -102q4 140 100 242.5t235 115.5l31 237q57 420 294 420zM763 369.5q81 91.5 81 203.5t-61 196.5t-159 117.5 q-16 -239 -62 -624q120 15 201 106.5zM346 693q22 0 22 -35q0 -4 -31 -20q-92 -46 -130 -116q35 -183 213 -244q24 317 62 623q-117 -15 -197 -103.5t-83 -206.5q113 102 144 102z" />
+<glyph unicode="&#x2234;" horiz-adv-x="1364" d="M1273.5 192.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM249.5 192.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM761 1078.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79 t79 32.5t80 -33.5z" />
+<glyph unicode="&#x2235;" horiz-adv-x="1364" d="M761.5 192.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM1273 1078.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5zM249 1078.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79 t79 32.5t80 -33.5z" />
+<glyph unicode="&#x2236;" horiz-adv-x="683" d="M421 1078.5q34 -33.5 34 -79t-34 -79t-80 -33.5t-79 33.5t-33 80t33 79t79 32.5t80 -33.5zM421 192.5q34 -33.5 34 -80t-33 -79.5t-80.5 -33t-80 33t-32.5 80t32.5 80t79 33t80.5 -33.5z" />
+<glyph unicode="&#x2237;" horiz-adv-x="1364" d="M1273.5 192.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM249.5 192.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM1273 1078.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79 t79 32.5t80 -33.5zM249 1078.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5z" />
+<glyph unicode="&#x2238;" horiz-adv-x="1591" d="M875.5 1111.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM1421 582q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41z" />
+<glyph unicode="&#x2239;" horiz-adv-x="1591" d="M1475.5 271.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM1475.5 1051.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM1421 582q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41z" />
+<glyph unicode="&#x223a;" horiz-adv-x="1591" d="M1387.5 218.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM363.5 218.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM1387 1104.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79 t79 32.5t80 -33.5zM363 1104.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5zM1421 582q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41z" />
+<glyph unicode="&#x223b;" horiz-adv-x="1591" d="M1477 746q0 -152 -96 -271.5t-244 -119.5q-114 0 -238 88l-208 164q-123 88 -236 88q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q115 0 240 -88l207 -164q124 -88 235 -88q85 0 156 50t104 130q15 36 21 98t30 62 q29 0 29 -63zM875.5 11.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM875.5 1311.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5z" />
+<glyph unicode="&#x223c;" horiz-adv-x="1591" d="M1477 746q0 -152 -96 -271.5t-244 -119.5q-114 0 -238 88l-208 164q-123 88 -236 88q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q115 0 240 -88l207 -164q124 -88 235 -88q85 0 156 50t104 130q15 36 21 98t30 62 q29 0 29 -63z" />
+<glyph unicode="&#x223d;" horiz-adv-x="1591" d="M1477 418q0 -63 -29 -63q-24 0 -28 43.5t-23 116.5q-33 80 -104 130t-156 50q-111 0 -235 -88l-207 -164q-125 -88 -240 -88q-149 0 -244.5 119.5t-95.5 271.5q0 63 28 63q24 0 29 -51q9 -90 38 -142q83 -147 245 -147q113 0 236 88l208 164q124 88 238 88 q148 0 244 -119.5t96 -271.5z" />
+<glyph unicode="&#x223e;" horiz-adv-x="1591" d="M1518 584q0 -14 -11 -27q-105 -121 -164 -167q-101 -78 -205 -78t-206 78q-59 46 -160.5 161t-153.5 156q-83 65 -163 65t-163 -66q-50 -41 -148 -151q-12 -14 -31 -14q-39 0 -39 41q0 14 11 27q105 121 164 167q101 78 205.5 78t205.5 -77q63 -48 162.5 -161t152.5 -156 q84 -66 163 -66t162 66q50 41 148 151q12 14 31 14q39 0 39 -41z" />
+<glyph unicode="&#x223f;" horiz-adv-x="1591" d="M1427 244q0 -28 -28 -39q-168 -67 -271.5 -67t-171.5 40q-117 68 -171 275l-84 332q-66 161 -222 161q-71 0 -262 -61q-9 -3 -13 -3q-39 0 -39 40q0 28 28 39q168 67 271.5 67t171.5 -40q119 -70 174 -276l83 -331q64 -161 220 -161q71 0 262 61q9 3 13 3q39 0 39 -40z " />
+<glyph unicode="&#x2240;" horiz-adv-x="1024" d="M739 -70q0 -29 -63 -29q-152 0 -271.5 96t-119.5 244q0 115 88 239l164 206q88 124 88 237q0 162 -147 245q-44 25 -142 38q-51 7 -51 29q0 28 63 28q152 0 271.5 -95.5t119.5 -244.5q0 -116 -88 -240l-164 -207q-88 -123 -88 -235q0 -84 50.5 -156t129.5 -104 q28 -11 94 -20t66 -31z" />
+<glyph unicode="&#x2241;" horiz-adv-x="1591" d="M1477 746q0 -152 -96 -271.5t-238.5 -119.5t-333.5 158l-241 -417q-23 -40 -46 -40q-41 0 -41 38q0 15 16 43l248 429q-161 129 -290 129q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t239.5 119.5t341 -163l244 423q23 39 45 39 q41 0 41 -38q0 -16 -15 -42l-251 -435q156 -124 282 -124q85 0 156 50t104 130q15 36 21 98t30 62q29 0 29 -63z" />
+<glyph unicode="&#x2242;" horiz-adv-x="1591" d="M1477 438q0 -152 -96 -271.5t-244 -119.5q-114 0 -238 88l-208 164q-123 88 -236 88q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q115 0 240 -88l207 -164q124 -88 235 -88q85 0 156 50t104 130q15 36 21 98t30 62 q29 0 29 -63zM1477 882q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41z" />
+<glyph unicode="&#x2243;" horiz-adv-x="1591" d="M1477 1054q0 -152 -96 -271.5t-244 -119.5q-114 0 -238 88l-208 164q-123 88 -236 88q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q115 0 240 -88l207 -164q124 -88 235 -88q85 0 156 50t104 130q15 36 21 98t30 62 q29 0 29 -63zM1477 282q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41z" />
+<glyph unicode="&#x2244;" horiz-adv-x="1591" d="M1477 282q0 -41 -37 -41h-708l-210 -577q-17 -47 -44 -47q-42 0 -42 38q0 15 8 37l200 549h-490q-39 0 -39 41t39 41h520l171 469q-159 127 -181 142q-107 69 -209 69q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5 q110 0 228 -79l195 -155l225 618q17 46 43 46q42 0 42 -37q0 -15 -8 -37l-232 -638q96 -58 185 -58t160 50t104 130q15 36 21 98t30 62q29 0 29 -63q0 -152 -96 -271.5t-244 -119.5q-109 0 -223 78l-152 -418h678q37 0 37 -41z" />
+<glyph unicode="&#x2245;" horiz-adv-x="1591" d="M1477 1115q0 -152 -96 -271.5t-244 -119.5q-114 0 -238 88l-208 164q-123 88 -236 88q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q115 0 240 -88l207 -164q124 -88 235 -88q85 0 156 50t104 130q15 36 21 98t30 62 q29 0 29 -63zM1477 441q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41zM1477 41q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41z" />
+<glyph unicode="&#x2246;" horiz-adv-x="1591" d="M1477 1115q0 -152 -96 -271.5t-244 -119.5q-114 0 -238 88l-208 164q-123 88 -236 88q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q115 0 240 -88l207 -164q124 -88 235 -88q85 0 156 50t104 130q15 36 21 98t30 62 q29 0 29 -63zM1477 41q0 -41 -37 -41h-789l-170 -294q-23 -40 -46 -40q-41 0 -41 38q0 15 16 43l146 253h-402q-39 0 -39 41t39 41h449l184 318h-633q-39 0 -39 41t39 41h680l114 197q23 39 45 39q41 0 41 -38q0 -16 -15 -42l-90 -156h511q37 0 37 -41t-37 -41h-558 l-184 -318h742q37 0 37 -41z" />
+<glyph unicode="&#x2247;" horiz-adv-x="1591" d="M1477 41q0 -41 -37 -41h-796l-122 -336q-17 -47 -44 -47q-42 0 -42 38q0 15 8 37l112 308h-402q-39 0 -39 41t39 41h432l116 318h-548q-39 0 -39 41t39 41h578l130 357l-189 150q-112 75 -218 75q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63 q0 152 95.5 271.5t244.5 119.5q114 0 237 -86l203 -161l208 570q17 46 43 46q42 0 42 -37q0 -15 -8 -37l-214 -588q86 -47 171 -47t156 50t104 130q15 36 21 98t30 62q29 0 29 -63q0 -152 -96 -271.5t-244 -119.5q-101 0 -205 66l-112 -308h620q37 0 37 -41t-37 -41h-650 l-116 -318h766q37 0 37 -41z" />
+<glyph unicode="&#x2248;" horiz-adv-x="1591" d="M1477 495q0 -152 -96 -271.5t-244 -119.5q-114 0 -238 88l-208 164q-123 88 -236 88q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q115 0 240 -88l207 -164q124 -88 235 -88q85 0 156 50t104 130q15 36 21 98t30 62 q29 0 29 -63zM1477 995q0 -152 -96 -271.5t-244 -119.5q-114 0 -238 88l-208 164q-123 88 -236 88q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q115 0 240 -88l207 -164q124 -88 235 -88q85 0 156 50t104 130q15 36 21 98 t30 62q29 0 29 -63z" />
+<glyph unicode="&#x2249;" horiz-adv-x="1591" d="M1477 495q0 -152 -96 -271.5t-244 -119.5q-101 0 -205 66q-37 23 -176 136l-234 -642q-17 -47 -44 -47q-42 0 -42 38q0 15 8 37l243 667q-121 85 -232 85q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q124 0 266 -107 l107 296q-133 108 -173 133q-102 64 -200 64q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q107 0 219 -74q5 -3 187 -147l242 664q17 46 43 46q42 0 42 -37q0 -15 -8 -37l-250 -686q107 -69 199.5 -69t163.5 50t104 130 q15 36 21 98t30 62q29 0 29 -63q0 -152 -96 -271.5t-244 -119.5q-115 0 -240 90l-108 -297q111 -92 162 -123q94 -56 182.5 -56t159.5 50t104 130q15 36 21 98t30 62q29 0 29 -63z" />
+<glyph unicode="&#x224a;" horiz-adv-x="1591" d="M1477 495q0 -152 -96 -271.5t-244 -119.5q-114 0 -238 88l-208 164q-123 88 -236 88q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q115 0 240 -88l207 -164q124 -88 235 -88q85 0 156 50t104 130q15 36 21 98t30 62 q29 0 29 -63zM1477 995q0 -152 -96 -271.5t-244 -119.5q-114 0 -238 88l-208 164q-123 88 -236 88q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q115 0 240 -88l207 -164q124 -88 235 -88q85 0 156 50t104 130q15 36 21 98 t30 62q29 0 29 -63zM1477 -179q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41z" />
+<glyph unicode="&#x224b;" horiz-adv-x="1591" d="M1477 246q0 -152 -96 -271.5t-244 -119.5q-114 0 -238 88l-208 164q-123 88 -236 88q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q115 0 240 -88l207 -164q124 -88 235 -88q85 0 156 50t104 130q15 36 21 98t30 62 q29 0 29 -63zM1477 746q0 -152 -96 -271.5t-244 -119.5q-114 0 -238 88l-208 164q-123 88 -236 88q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q115 0 240 -88l207 -164q124 -88 235 -88q85 0 156 50t104 130q15 36 21 98 t30 62q29 0 29 -63zM1477 1246q0 -152 -96 -271.5t-244 -119.5q-114 0 -238 88l-208 164q-123 88 -236 88q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q115 0 240 -88l207 -164q124 -88 235 -88q85 0 156 50t104 130 q15 36 21 98t30 62q29 0 29 -63z" />
+<glyph unicode="&#x224c;" horiz-adv-x="1591" d="M1477 787q0 -63 -29 -63q-24 0 -28 43.5t-23 116.5q-33 80 -104 130t-156 50q-111 0 -235 -88l-207 -164q-125 -88 -240 -88q-149 0 -244.5 119.5t-95.5 271.5q0 63 28 63q24 0 29 -51q9 -90 38 -142q83 -147 245 -147q113 0 236 88l208 164q124 88 238 88 q148 0 244 -119.5t96 -271.5zM1477 441q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41zM1477 41q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41z" />
+<glyph unicode="&#x224d;" horiz-adv-x="1591" d="M1477 1025q0 -17 -17 -32q-139 -122 -314.5 -196.5t-348.5 -74.5t-350.5 75t-315.5 196q-16 14 -16 32q0 41 41 41q14 0 24 -8q328 -254 615 -254t616 254q10 8 25 8q41 0 41 -41zM1477 139q0 -41 -41 -41q-15 0 -25 8q-327 254 -616.5 254t-614.5 -254q-10 -8 -24 -8 q-41 0 -41 41q0 18 16 32q138 121 315.5 196t350.5 75t348.5 -74.5t314.5 -196.5q17 -15 17 -32z" />
+<glyph unicode="&#x224e;" horiz-adv-x="1591" d="M1477 782q0 -41 -37 -41h-391q-13 0 -25 13t-12 26q0 87 -64 152t-152 65t-151 -64t-63 -153q0 -39 -39 -39h-389q-39 0 -39 41t39 41h348q17 111 100 183.5t193.5 72.5t195.5 -74t99 -182h350q37 0 37 -41zM1477 382q0 -41 -37 -41h-350q-15 -109 -99 -182.5 t-194.5 -73.5t-195 73t-99.5 183h-348q-39 0 -39 41t39 41h389q39 0 39 -37q0 -90 62.5 -154.5t151.5 -64.5t152.5 65.5t63.5 153.5q0 37 37 37h391q37 0 37 -41z" />
+<glyph unicode="&#x224f;" horiz-adv-x="1591" d="M1477 782q0 -41 -37 -41h-391q-13 0 -25 13t-12 26q0 87 -64 152t-152 65t-151 -64t-63 -153q0 -39 -39 -39h-389q-39 0 -39 41t39 41h348q17 111 100 183.5t193.5 72.5t195.5 -74t99 -182h350q37 0 37 -41zM1477 382q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286 q37 0 37 -41z" />
+<glyph unicode="&#x2250;" horiz-adv-x="1591" d="M875.5 1309.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM1477 782q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41zM1477 382q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41z" />
+<glyph unicode="&#x2251;" horiz-adv-x="1591" d="M1477 782q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41zM1477 382q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41zM875.5 1309.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM876 14q33 -33 33 -79.5 t-33.5 -80t-80 -33.5t-79.5 33t-33 80t33 80t80 33t80 -33z" />
+<glyph unicode="&#x2252;" horiz-adv-x="1591" d="M275.5 1309.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM1475.5 13.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM1477 782q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41z M1477 382q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41z" />
+<glyph unicode="&#x2253;" horiz-adv-x="1591" d="M1475.5 1309.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM275.5 13.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM1477 782q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41z M1477 382q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41z" />
+<glyph unicode="&#x2254;" horiz-adv-x="1971" d="M307.5 861.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM307.5 461.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM1857 782q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41zM1857 382 q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41z" />
+<glyph unicode="&#x2255;" horiz-adv-x="1971" d="M1823.5 861.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM1823.5 461.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM1477 782q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41z M1477 382q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41z" />
+<glyph unicode="&#x2256;" horiz-adv-x="1591" d="M1477 382q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h485q-68 66 -68 158t68 160h-485q-39 0 -39 41t39 41h1286q37 0 37 -41t-37 -41h-488q67 -67 67 -159.5t-69 -158.5h490q37 0 37 -41zM898 479.5q44 43.5 44 102.5t-44 103.5t-103 44.5t-103 -44.5t-44 -103.5 t44 -102.5t103 -43.5t103 43.5z" />
+<glyph unicode="&#x2257;" horiz-adv-x="1591" d="M953 1440q66 -67 66 -158t-67 -157t-157.5 -66t-157 65.5t-66.5 156.5t66.5 158.5t158 67.5t157.5 -67zM1477 782q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41zM1477 382q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41zM898 1179.5 q44 43.5 44 102.5t-44 103.5t-103 44.5t-103 -44.5t-44 -103.5t44 -102.5t103 -43.5t103 43.5z" />
+<glyph unicode="&#x2258;" horiz-adv-x="1591" d="M1477 1089q0 -41 -41 -41q-15 0 -25 8q-327 254 -616.5 254t-614.5 -254q-10 -8 -24 -8q-41 0 -41 41q0 18 16 32q138 121 315.5 196t350.5 75t348.5 -74.5t314.5 -196.5q17 -15 17 -32zM1477 782q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41zM1477 382 q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41z" />
+<glyph unicode="&#x2259;" horiz-adv-x="1591" d="M1148 908q0 -41 -41 -41q-27 0 -45 39l-265 563l-268 -563q-19 -39 -45 -39q-41 0 -41 41q0 5 309 659q18 39 45 39t45 -39l292 -622q14 -30 14 -37zM1477 782q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41zM1477 382q0 -41 -37 -41h-1286q-39 0 -39 41 t39 41h1286q37 0 37 -41z" />
+<glyph unicode="&#x225a;" horiz-adv-x="1591" d="M1148 1565q0 -7 -14 -37l-292 -622q-18 -39 -45 -39t-45 39q-309 654 -309 659q0 41 41 41q26 0 45 -39l268 -563l265 563q18 39 45 39q41 0 41 -41zM1477 782q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41zM1477 382q0 -41 -37 -41h-1286q-39 0 -39 41 t39 41h1286q37 0 37 -41z" />
+<glyph unicode="&#x225b;" horiz-adv-x="1591" d="M837 1320q230 44 236 44t6 -10.5t-7 -13.5l-209 -99l113 -207q0 -13 -13 -13q-5 0 -167 172q-162 -172 -168 -172q-13 0 -13 13l113 207l-206 98q-10 5 -10 15t6 10t236 -44l29 230q1 10 12.5 10t12.5 -10zM1477 782q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286 q37 0 37 -41zM1477 382q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41z" />
+<glyph unicode="&#x225c;" horiz-adv-x="1591" d="M1190 949q0 -37 -33 -37h-723q-33 0 -33 37q0 10 6 20l357 619q10 18 31.5 18t31.5 -18l358 -619q5 -9 5 -20zM1477 782q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41zM1477 382q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41zM1082 990 l-286 496l-287 -496h573z" />
+<glyph unicode="&#x225d;" horiz-adv-x="1591" d="M1335 1495q0 -34 -33 -34q-19 0 -45 36.5t-55 36.5q-44 0 -54 -57q-2 -14 -2 -91v-27h95v-29h-95v-249q0 -52 15 -65t70 -13v-15h-222v15q45 0 57.5 17t12.5 61v249h-72v29h72q0 79 18 118q40 86 137 86q32 0 66.5 -19t34.5 -49zM937 1020q-42 -43 -109.5 -43t-110.5 57 t-43 138.5t44 139.5t118 58t113 -42.5t39 -108.5h-257q0 -69 35 -122.5t105.5 -53.5t103.5 89l13 -9q-9 -60 -51 -103zM516 977v53q-51 -53 -114.5 -53t-104.5 55t-41 131t50 141.5t129 65.5q49 0 81 -31v76q0 96 -29 96q-11 0 -27 -6l-6 14l111 45h18v-429q0 -105 28 -105 q12 0 30 7l4 -14l-110 -46h-19zM1477 782q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41zM1477 382q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41zM822 1342q-82 0 -91 -99h172q-6 99 -81 99zM516 1249q0 36 -25.5 66t-60.5 30q-52 0 -76 -49 t-24 -109t26 -107q31 -59 89 -59q36 0 71 37v191z" />
+<glyph unicode="&#x225e;" horiz-adv-x="1591" d="M1266 987h-272v22q59 0 74 20t15 68v257q0 127 -91 127q-63 0 -142 -75v-28q-1 -13 -1 -43.5t1 -78.5v-151t14.5 -75.5t75.5 -20.5v-22h-278v22q57 0 73 19.5t16 75.5v250q0 129 -93 129q-78 0 -141 -77v-302q0 -49 9 -67q14 -28 80 -28v-22h-272v22q54 0 69 21.5 t15 74.5v237q0 109 -19 124q-9 7 -25.5 7t-39.5 -9l-9 22l166 67h26v-117q64 64 84 79q52 38 107 38q112 0 138 -117q100 117 192 117q145 0 145 -205v-236q0 -59 14 -81t69 -22v-22zM1477 782q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41zM1477 382 q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41z" />
+<glyph unicode="&#x225f;" horiz-adv-x="1591" d="M667 1384q-55 0 -55 73t55 111t129 38t128.5 -41t54.5 -115t-65 -151q-88 -104 -103 -135.5t-18 -91.5h-21q3 63 13.5 97.5t56 124.5t45.5 146t-31 97t-86 41q-93 0 -93 -65q0 -17 15 -45.5t15 -41.5q0 -42 -40 -42zM786 1010q56 0 56 -55.5t-56 -55.5t-56 55.5t56 55.5z M1477 782q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41zM1477 382q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41z" />
+<glyph unicode="&#x2260;" horiz-adv-x="1591" d="M1477 382q0 -41 -37 -41h-768l-291 -505q-23 -40 -46 -40q-41 0 -41 38q0 15 16 43l268 464h-424q-39 0 -39 41t39 41h471l184 318h-655q-39 0 -39 41t39 41h702l292 506q23 39 45 39q41 0 41 -38q0 -16 -15 -42l-268 -465h489q37 0 37 -41t-37 -41h-537l-183 -318h720 q37 0 37 -41z" />
+<glyph unicode="&#x2261;" horiz-adv-x="1591" d="M1477 982q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41zM1477 582q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41zM1477 182q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41z" />
+<glyph unicode="&#x2262;" horiz-adv-x="1591" d="M1477 182q0 -41 -37 -41h-843l-176 -305q-23 -40 -46 -40q-41 0 -41 38q0 15 16 43l152 264h-348q-39 0 -39 41t39 41h396l183 318h-579q-39 0 -39 41t39 41h627l183 318h-810q-39 0 -39 41t39 41h857l177 306q23 39 45 39q41 0 41 -38q0 -16 -15 -42l-153 -265h334 q37 0 37 -41t-37 -41h-381l-184 -318h565q37 0 37 -41t-37 -41h-612l-184 -318h796q37 0 37 -41z" />
+<glyph unicode="&#x2263;" horiz-adv-x="1591" d="M1477 1182q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41zM1477 782q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41zM1477 382q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41zM1477 -18q0 -41 -37 -41h-1286q-39 0 -39 41t39 41 h1286q37 0 37 -41z" />
+<glyph unicode="&#x2264;" horiz-adv-x="1591" d="M1421 31q0 -41 -41 -41q-8 0 -14 3l-1169 552q-27 13 -27 37t27 37l1169 552q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-1090 -514l1090 -514q24 -11 24 -37zM1421 -259q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41z" />
+<glyph unicode="&#x2265;" horiz-adv-x="1591" d="M1421 582q0 -24 -27 -37l-1169 -552q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l1090 514l-1090 514q-24 11 -24 37q0 41 41 41q8 0 14 -3l1169 -552q27 -13 27 -37zM1421 -259q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41z" />
+<glyph unicode="&#x2266;" horiz-adv-x="1591" d="M1421 331q0 -41 -41 -41q-8 0 -14 3l-1169 552q-27 13 -27 37t27 37l1169 552q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-1090 -514l1090 -514q24 -11 24 -37zM1421 41q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1421 -259q0 -41 -37 -41h-1175 q-39 0 -39 41t39 41h1175q37 0 37 -41z" />
+<glyph unicode="&#x2267;" horiz-adv-x="1591" d="M1421 882q0 -24 -27 -37l-1169 -552q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l1090 514l-1090 514q-24 11 -24 37q0 41 41 41q8 0 14 -3l1169 -552q27 -13 27 -37zM1421 41q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1421 -259q0 -41 -37 -41h-1175 q-39 0 -39 41t39 41h1175q37 0 37 -41z" />
+<glyph unicode="&#x2268;" horiz-adv-x="1591" d="M1421 331q0 -41 -41 -41q-8 0 -14 3l-1169 552q-27 13 -27 37t27 37l1169 552q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-1090 -514l1090 -514q24 -11 24 -37zM1421 -259q0 -41 -37 -41h-720l-127 -129q-13 -13 -29 -13q-42 0 -42 42q0 16 13 29l70 71h-340q-39 0 -39 41 t39 41h421l216 218h-637q-39 0 -39 41t39 41h718l127 129q13 13 29 13q42 0 42 -42q0 -16 -13 -29l-70 -71h342q37 0 37 -41t-37 -41h-423l-216 -218h639q37 0 37 -41z" />
+<glyph unicode="&#x2269;" horiz-adv-x="1591" d="M1421 882q0 -24 -27 -37l-1169 -552q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l1090 514l-1090 514q-24 11 -24 37q0 41 41 41q8 0 14 -3l1169 -552q27 -13 27 -37zM1421 -259q0 -41 -37 -41h-720l-127 -129q-13 -13 -29 -13q-42 0 -42 42q0 16 13 29l70 71h-340 q-39 0 -39 41t39 41h421l216 218h-637q-39 0 -39 41t39 41h718l127 129q13 13 29 13q42 0 42 -42q0 -16 -13 -29l-70 -71h342q37 0 37 -41t-37 -41h-423l-216 -218h639q37 0 37 -41z" />
+<glyph unicode="&#x226a;" horiz-adv-x="2211" d="M1421 31q0 -41 -41 -41q-8 0 -14 3l-1169 552q-27 13 -27 37t27 37l1169 552q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-1090 -514l1090 -514q24 -11 24 -37zM2041 31q0 -41 -41 -41q-8 0 -14 3l-1169 552q-27 13 -27 37t27 37l1169 552q6 3 14 3q41 0 41 -41q0 -26 -24 -37 l-1090 -514l1090 -514q24 -11 24 -37z" />
+<glyph unicode="&#x226b;" horiz-adv-x="2211" d="M1421 582q0 -24 -27 -37l-1169 -552q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l1090 514l-1090 514q-24 11 -24 37q0 41 41 41q8 0 14 -3l1169 -552q27 -13 27 -37zM2041 582q0 -24 -27 -37l-1169 -552q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l1090 514l-1090 514 q-24 11 -24 37q0 41 41 41q8 0 14 -3l1169 -552q27 -13 27 -37z" />
+<glyph unicode="&#x226c;" horiz-adv-x="1024" d="M870 582q0 -437 -313 -776q88 -90 184 -154q23 -13 68 -41q12 -8 12 -22q0 -31 -30 -31q-53 0 -279 201q-223 -201 -281 -201q-30 0 -30 31q0 14 12 22q23 13 93.5 59t158.5 136q-313 339 -313 777.5t313 774.5q-88 90 -184 154q-23 13 -68 41q-12 8 -12 22q0 31 29.5 31 t131 -77t150.5 -124q51 48 151 124.5t129 76.5t29 -31q0 -14 -12 -22q-23 -13 -93.5 -59t-158.5 -136q313 -339 313 -776zM770 582q0 412 -258 723q-260 -305 -260 -721t260 -725q258 311 258 723z" />
+<glyph unicode="&#x226d;" horiz-adv-x="1591" d="M1477 1025q0 -17 -17 -32q-139 -122 -314.5 -196.5t-348.5 -74.5t-350.5 75t-315.5 196q-16 14 -16 32q0 41 41 41q14 0 24 -8q328 -254 615 -254t616 254q10 8 25 8q41 0 41 -41zM1477 139q0 -41 -41 -41q-15 0 -25 8q-327 254 -616.5 254t-614.5 -254q-10 -8 -24 -8 q-41 0 -41 41q0 18 16 32q138 121 315.5 196t350.5 75t348.5 -74.5t314.5 -196.5q17 -15 17 -32zM1274 1330q0 -16 -15 -42l-838 -1452q-23 -40 -46 -40q-41 0 -41 38q0 15 16 43l838 1452q23 39 45 39q41 0 41 -38z" />
+<glyph unicode="&#x226e;" horiz-adv-x="1591" d="M1421 31q0 -41 -41 -41q-8 0 -14 3l-618 292l-226 -621q-17 -47 -44 -47q-42 0 -42 38q0 15 8 37l229 628l-476 225q-27 13 -27 37t27 37l706 333l200 549q17 46 43 46q42 0 42 -37q0 -15 -8 -37l-171 -471l357 169q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-427 -202 l-194 -533l621 -293q24 -11 24 -37zM864 845l-557 -263l394 -186z" />
+<glyph unicode="&#x226f;" horiz-adv-x="1591" d="M1421 582q0 -24 -27 -37l-666 -314l-206 -567q-17 -47 -44 -47q-42 0 -42 38q0 15 8 37l178 488l-397 -187q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l467 220l183 502l-650 306q-24 11 -24 37q0 41 41 41q8 0 14 -3l647 -305l231 635q17 46 43 46q42 0 42 -37q0 -15 -8 -37 l-234 -643l448 -211q27 -13 27 -37zM1284 582l-365 172l-152 -416z" />
+<glyph unicode="&#x2270;" horiz-adv-x="1591" d="M1421 -259q0 -41 -37 -41h-827l-35 -95q-17 -47 -44 -47q-42 0 -42 38q0 15 8 37l24 67h-259q-39 0 -39 41t39 41h289l193 530l-494 233q-27 13 -27 37t27 37l732 346l174 477q17 46 43 46q42 0 42 -37q0 -15 -8 -37l-145 -399l331 156q6 3 14 3q41 0 41 -41 q0 -26 -24 -37l-402 -189l-201 -555l603 -284q24 -11 24 -37q0 -41 -41 -41q-8 0 -14 3l-600 283l-180 -494h798q37 0 37 -41zM890 857l-583 -275l412 -194z" />
+<glyph unicode="&#x2271;" horiz-adv-x="1591" d="M1421 -259q0 -41 -37 -41h-827l-35 -95q-17 -47 -44 -47q-42 0 -42 38q0 15 8 37l24 67h-259q-39 0 -39 41t39 41h289l150 411l-423 -200q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l493 233l175 480l-668 315q-24 11 -24 37q0 41 41 41q8 0 14 -3l665 -314l213 585 q17 46 43 46q42 0 42 -37q0 -15 -8 -37l-215 -592l429 -203q27 -13 27 -37t-27 -37l-640 -302l-168 -461h798q37 0 37 -41zM1284 582l-347 164l-144 -395z" />
+<glyph unicode="&#x2272;" horiz-adv-x="1591" d="M1477 46q0 -152 -96 -271.5t-244 -119.5q-114 0 -238 88l-208 164q-123 88 -236 88q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q115 0 240 -88l207 -164q124 -88 235 -88q85 0 156 50t104 130q15 36 21 98t30 62 q29 0 29 -63zM1421 331q0 -41 -41 -41q-8 0 -14 3l-1169 552q-27 13 -27 37t27 37l1169 552q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-1090 -514l1090 -514q24 -11 24 -37z" />
+<glyph unicode="&#x2273;" horiz-adv-x="1591" d="M1477 46q0 -152 -96 -271.5t-244 -119.5q-114 0 -238 88l-208 164q-123 88 -236 88q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q115 0 240 -88l207 -164q124 -88 235 -88q85 0 156 50t104 130q15 36 21 98t30 62 q29 0 29 -63zM1421 882q0 -24 -27 -37l-1169 -552q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l1090 514l-1090 514q-24 11 -24 37q0 41 41 41q8 0 14 -3l1169 -552q27 -13 27 -37z" />
+<glyph unicode="&#x2274;" horiz-adv-x="1591" d="M1477 46q0 -152 -96 -271.5t-244 -119.5q-105 0 -214 71q-16 11 -183 144l-46 -257q-10 -55 -41 -55q-42 0 -42 42q0 10 3 27l52 297q-108 71 -211 71q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q111 0 230 -81 l95 541l-583 276q-27 13 -27 37t27 37l704 332l53 301q10 54 41 54q42 0 42 -41q0 -16 -2 -27l-43 -244l374 177q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-422 -199l-103 -581l525 -248q24 -11 24 -37q0 -41 -41 -41q-8 0 -14 3l-509 240l-99 -560q146 -118 176 -137 q104 -67 196 -67t163 50t104 130q15 36 21 98t30 62q29 0 29 -63zM884 1154l-577 -272l488 -230z" />
+<glyph unicode="&#x2275;" horiz-adv-x="1591" d="M1477 46q0 -152 -96 -271.5t-244 -119.5q-105 0 -214 71q-16 11 -183 144l-46 -257q-10 -55 -41 -55q-42 0 -42 42q0 10 3 27l52 297q-108 71 -211 71q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q111 0 230 -81 l93 526l-553 -261q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l601 283l75 426l-676 319q-24 11 -24 37q0 41 41 41q8 0 14 -3l660 -311l69 392q10 54 41 54q42 0 42 -41q0 -16 -2 -27l-73 -415l432 -204q27 -13 27 -37t-27 -37l-526 -248l-110 -624q146 -118 176 -137 q104 -67 196 -67t163 50t104 130q15 36 21 98t30 62q29 0 29 -63zM1284 882l-337 159l-61 -347z" />
+<glyph unicode="&#x2276;" horiz-adv-x="1591" d="M1421 150q0 -24 -27 -37l-1169 -552q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l1090 514l-1090 514q-24 11 -24 37q0 41 41 41q8 0 14 -3l1169 -552q27 -13 27 -37zM1421 463q0 -41 -41 -41q-8 0 -14 3l-1169 552q-27 13 -27 37t27 37l1169 552q6 3 14 3q41 0 41 -41 q0 -26 -24 -37l-1090 -514l1090 -514q24 -11 24 -37z" />
+<glyph unicode="&#x2277;" horiz-adv-x="1591" d="M1421 1014q0 -24 -27 -37l-1169 -552q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l1090 514l-1090 514q-24 11 -24 37q0 41 41 41q8 0 14 -3l1169 -552q27 -13 27 -37zM1421 -401q0 -41 -41 -41q-8 0 -14 3l-1169 552q-27 13 -27 37t27 37l1169 552q6 3 14 3q41 0 41 -41 q0 -26 -24 -37l-1090 -514l1090 -514q24 -11 24 -37z" />
+<glyph unicode="&#x2278;" horiz-adv-x="1591" d="M1421 150q0 -24 -27 -37l-698 -329l-30 -171q-10 -55 -41 -55q-42 0 -42 42q0 10 3 27l20 114l-381 -180q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l429 202l102 576l-531 250q-24 11 -24 37q0 41 41 41q8 0 14 -3l514 -243l37 208l-579 273q-27 13 -27 37t27 37l699 330 l30 171q10 54 41 54q42 0 42 -41q0 -16 -2 -27l-20 -114l379 179q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-427 -202l-103 -576l530 -250q24 -11 24 -37q0 -41 -41 -41q-8 0 -14 3l-513 242l-37 -207l578 -273q27 -13 27 -37zM879 1284l-572 -270l484 -228zM1284 150l-483 228 l-88 -497z" />
+<glyph unicode="&#x2279;" horiz-adv-x="1591" d="M1421 -401q0 -41 -41 -41q-8 0 -14 3l-654 309l-46 -257q-10 -55 -41 -55q-42 0 -42 42q0 10 3 27l49 279l-438 207q-27 13 -27 37t27 37l532 251l44 246l-548 -259q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l596 281l76 430l-672 317q-24 11 -24 37q0 41 41 41q8 0 14 -3 l655 -309l46 258q10 54 41 54q42 0 42 -41q0 -16 -2 -27l-50 -281l437 -206q27 -13 27 -37t-27 -37l-531 -251l-43 -245l546 258q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-594 -280l-77 -432l671 -316q24 -11 24 -37zM1284 1014l-341 161l-63 -351zM712 341l-405 -191l343 -162 z" />
+<glyph unicode="&#x227a;" horiz-adv-x="1591" d="M1421 35q0 -45 -41 -45q-34 0 -41 39q-28 180 -141.5 282t-284.5 152q-268 78 -704 78q-39 0 -39 41t39 41q436 0 706 80q173 51 285 152t139 284q6 37 41 37q41 0 41 -43q0 -22 -12 -76q-42 -188 -196 -297q-178 -126 -455 -178q269 -47 453 -177q156 -110 198 -295 q12 -52 12 -75z" />
+<glyph unicode="&#x227b;" horiz-adv-x="1591" d="M1421 582q0 -41 -37 -41q-267 0 -500 -31.5t-415.5 -142.5t-216.5 -338q-6 -39 -41 -39q-41 0 -41 45q0 12 8 53q25 130 106 225q172 203 550 269q-435 77 -590 327q-74 119 -74 224q0 43 41 43q35 0 41 -37q35 -232 215 -342t418 -142t499 -32q37 0 37 -41z" />
+<glyph unicode="&#x227c;" horiz-adv-x="1591" d="M1421 35q0 -45 -41 -45q-34 0 -41 39q-28 180 -141.5 282t-284.5 152q-268 78 -704 78q-39 0 -39 41t39 41q436 0 706 80q173 51 285 152t139 284q6 37 41 37q41 0 41 -43q0 -22 -12 -76q-42 -188 -196 -297q-178 -126 -455 -178q269 -47 453 -177q156 -110 198 -295 q12 -52 12 -75zM1194 -275q0 -43 -41 -43q-34 0 -41 37q-23 156 -108.5 252t-221.5 155q-248 107 -573 107q-39 0 -39 41t45 41q257 0 470 -65q261 -80 397 -245q112 -136 112 -280z" />
+<glyph unicode="&#x227d;" horiz-adv-x="1591" d="M1421 582q0 -41 -37 -41q-267 0 -500 -31.5t-415.5 -142.5t-216.5 -338q-6 -39 -41 -39q-41 0 -41 45q0 12 8 53q25 130 106 225q172 203 550 269q-435 77 -590 327q-74 119 -74 224q0 43 41 43q35 0 41 -37q35 -232 215 -342t418 -142t499 -32q37 0 37 -41zM1421 274 q0 -41 -37 -41q-326 0 -573 -107q-137 -60 -221.5 -155t-110.5 -252q-6 -37 -41 -37q-41 0 -41 43q0 9 6 43q24 135 109 237q138 165 397 245q212 65 469 65q43 0 43 -41z" />
+<glyph unicode="&#x227e;" horiz-adv-x="1591" d="M1421 335q0 -45 -41 -45q-34 0 -41 39q-28 180 -141.5 282t-284.5 152q-268 78 -704 78q-39 0 -39 41t39 41q436 0 706 80q173 51 285 152t139 284q6 37 41 37q41 0 41 -43q0 -22 -12 -76q-42 -188 -196 -297q-178 -126 -455 -178q269 -47 453 -177q156 -110 198 -295 q12 -52 12 -75zM1477 46q0 -152 -96 -271.5t-244 -119.5q-114 0 -238 88l-208 164q-123 88 -236 88q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q115 0 240 -88l207 -164q124 -88 235 -88q85 0 156 50t104 130 q15 36 21 98t30 62q29 0 29 -63z" />
+<glyph unicode="&#x227f;" horiz-adv-x="1591" d="M1421 882q0 -41 -37 -41q-267 0 -500 -31.5t-415.5 -142.5t-216.5 -338q-6 -39 -41 -39q-41 0 -41 45q0 12 8 53q25 130 106 225q172 203 550 269q-435 77 -590 327q-74 119 -74 224q0 43 41 43q35 0 41 -37q35 -232 215 -342t418 -142t499 -32q37 0 37 -41zM1477 46 q0 -152 -96 -271.5t-244 -119.5q-114 0 -238 88l-208 164q-123 88 -236 88q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q115 0 240 -88l207 -164q124 -88 235 -88q85 0 156 50t104 130q15 36 21 98t30 62q29 0 29 -63z " />
+<glyph unicode="&#x2280;" horiz-adv-x="1591" d="M1421 35q0 -45 -41 -45q-34 0 -41 39q-28 180 -141.5 282t-284.5 152q-119 35 -256 53l-182 -539q-10 -28 -38 -28q-42 0 -42 39q0 8 2 15l177 523q-152 15 -365 15q-39 0 -39 41t39 41q236 0 404 20l184 546q10 28 38 28q42 0 42 -39q0 -8 -2 -15l-171 -508 q112 19 211 48q173 51 285 152t139 284q6 37 41 37q41 0 41 -43q0 -22 -12 -76q-42 -188 -196 -297q-178 -126 -455 -178q269 -47 453 -177q156 -110 198 -295q12 -52 12 -75z" />
+<glyph unicode="&#x2281;" horiz-adv-x="1591" d="M1421 582q0 -41 -37 -41q-233 0 -437 -24l-182 -540q-10 -28 -38 -28q-42 0 -42 39q0 8 2 15l170 502q-219 -35 -395 -142t-210 -334q-6 -39 -41 -39q-41 0 -41 45q0 12 8 53q25 130 106 225q172 203 550 269q-435 77 -590 327q-74 119 -74 224q0 43 41 43q35 0 41 -37 q35 -232 216 -342t419 -142l19 -3l181 537q10 28 38 28q42 0 42 -39q0 -8 -2 -15l-176 -520q190 -20 395 -20q37 0 37 -41z" />
+<glyph unicode="&#x2282;" horiz-adv-x="1591" d="M1421 41q0 -41 -39 -41h-590q-248 0 -435 168.5t-187 413.5t187 413.5t435 168.5h590q39 0 39 -41t-39 -41h-584q-216 0 -381 -143.5t-165 -356.5t165 -356.5t381 -143.5h584q39 0 39 -41z" />
+<glyph unicode="&#x2283;" horiz-adv-x="1591" d="M1421 582q0 -245 -187 -413.5t-435 -168.5h-590q-39 0 -39 41t39 41h584q216 0 381 143.5t165 356.5t-165 356.5t-381 143.5h-584q-39 0 -39 41t39 41h590q248 0 435 -168.5t187 -413.5z" />
+<glyph unicode="&#x2284;" horiz-adv-x="1591" d="M1421 41q0 -41 -39 -41h-590q-24 0 -47 2l-123 -338q-17 -47 -44 -47q-42 0 -42 38q0 15 8 37l117 322q-208 43 -349.5 200.5t-141.5 367.5q0 245 187 413.5t435 168.5h288l123 337q17 46 43 46q42 0 42 -37q0 -15 -8 -37l-112 -309h214q39 0 39 -41t-39 -41h-244 l-364 -999q12 -1 24 -1h584q39 0 39 -41zM798 1082q-216 0 -381 -143.5t-165 -356.5q0 -185 127 -319.5t311 -170.5l360 990h-252z" />
+<glyph unicode="&#x2285;" horiz-adv-x="1591" d="M1421 582q0 -245 -187 -413.5t-435 -168.5h-255l-122 -336q-17 -47 -44 -47q-42 0 -42 38q0 15 8 37l112 308h-247q-39 0 -39 41t39 41h277l363 997q-28 3 -56 3h-584q-39 0 -39 41t39 41h590q40 0 79 -5l125 342q17 46 43 46q42 0 42 -37q0 -15 -8 -37l-120 -330 q197 -51 329 -205t132 -356zM1339 582q0 176 -117 308t-290 175l-358 -983h219q216 0 381 143.5t165 356.5z" />
+<glyph unicode="&#x2286;" horiz-adv-x="1591" d="M1421 41q0 -41 -39 -41h-590q-248 0 -435 168.5t-187 413.5t187 413.5t435 168.5h590q39 0 39 -41t-39 -41h-584q-216 0 -381 -143.5t-165 -356.5t165 -356.5t381 -143.5h584q39 0 39 -41zM1421 -259q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41z" />
+<glyph unicode="&#x2287;" horiz-adv-x="1591" d="M1421 582q0 -245 -187 -413.5t-435 -168.5h-590q-39 0 -39 41t39 41h584q216 0 381 143.5t165 356.5t-165 356.5t-381 143.5h-584q-39 0 -39 41t39 41h590q248 0 435 -168.5t187 -413.5zM1421 -259q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41z" />
+<glyph unicode="&#x2288;" horiz-adv-x="1591" d="M1421 -259q0 -41 -37 -41h-821l-42 -115q-10 -27 -37 -27q-43 0 -43 40q0 7 3 15l32 87h-267q-39 0 -39 41t39 41h297l90 249q-185 59 -305.5 208.5t-120.5 342.5q0 245 187 413.5t435 168.5h218l59 161q10 28 37 28q43 0 43 -40q0 -8 -3 -16l-49 -133h285q39 0 39 -41 t-39 -41h-315l-362 -992q47 -8 93 -8h584q39 0 39 -41t-39 -41h-590q-58 0 -116 11l-83 -229h791q37 0 37 -41zM798 1082q-216 0 -381 -143.5t-165 -356.5q0 -167 105.5 -295t267.5 -178l355 973h-182z" />
+<glyph unicode="&#x2289;" horiz-adv-x="1591" d="M1421 -259q0 -41 -37 -41h-829l-42 -115q-10 -27 -37 -27q-43 0 -43 40q0 7 3 15l32 87h-259q-39 0 -39 41t39 41h289l79 218h-368q-39 0 -39 41t39 41h398l356 974q-84 26 -170 26h-584q-39 0 -39 41t39 41h590q98 0 192 -30l70 191q10 28 37 28q43 0 43 -40 q0 -8 -3 -16l-70 -192q157 -72 255 -211t98 -312q0 -245 -187 -413.5t-435 -168.5h-135l-79 -218h799q37 0 37 -41zM1339 582q0 147 -83 264.5t-217 180.5l-345 -945h99q216 0 381 143.5t165 356.5z" />
+<glyph unicode="&#x228a;" horiz-adv-x="1591" d="M1421 41q0 -41 -39 -41h-590q-248 0 -435 168.5t-187 413.5t187 413.5t435 168.5h590q39 0 39 -41t-39 -41h-584q-216 0 -381 -143.5t-165 -356.5t165 -356.5t381 -143.5h584q39 0 39 -41zM1421 -259q0 -41 -37 -41h-574l-177 -133q-12 -9 -25 -9q-42 0 -42 43 q0 19 17 32l90 67h-464q-39 0 -39 41t39 41h573l176 133q12 8 25 8q42 0 42 -42q0 -19 -17 -32l-89 -67h465q37 0 37 -41z" />
+<glyph unicode="&#x228b;" horiz-adv-x="1591" d="M1421 582q0 -245 -187 -413.5t-435 -168.5h-590q-39 0 -39 41t39 41h584q216 0 381 143.5t165 356.5t-165 356.5t-381 143.5h-584q-39 0 -39 41t39 41h590q248 0 435 -168.5t187 -413.5zM1421 -259q0 -41 -37 -41h-574l-177 -133q-12 -9 -25 -9q-42 0 -42 43q0 19 17 32 l90 67h-464q-39 0 -39 41t39 41h573l176 133q12 8 25 8q42 0 42 -42q0 -19 -17 -32l-89 -67h465q37 0 37 -41z" />
+<glyph unicode="&#x228c;" horiz-adv-x="1364" d="M1249 389q0 -203 -188 -327q-165 -107 -379 -107t-379 107q-188 124 -188 327v799q0 37 41 37t41 -37v-793q0 -169 164 -271q140 -87 321.5 -87t321.5 86q163 101 163 272v793q0 37 41 37t41 -37v-799zM1188 541h-583q158 -123 214 -336q6 -23 6 -29q0 -31 -35 -31 q-4 0 -11.5 0.5t-11.5 0.5q-19 0 -33 59q-26 112 -98.5 197t-222.5 156q-19 9 -19 25t55 39q105 44 181.5 135t103.5 202q2 13 9 38q9 22 45.5 22t36.5 -31q0 -6 -6 -29q-55 -211 -214 -336h583v-82z" />
+<glyph unicode="&#x228d;" horiz-adv-x="1364" d="M1249 389q0 -203 -188 -327q-165 -107 -379 -107t-379 107q-188 124 -188 327v799q0 37 41 37t41 -37v-793q0 -169 164 -271q140 -87 321.5 -87t321.5 86q163 101 163 272v793q0 37 41 37t41 -37v-799zM1061 394q0 -62 -60 -62q-15 0 -29 10l-262 191l31 -338 q0 -53 -59 -53q-23 0 -42.5 17t-17.5 40l31 334l-262 -191q-14 -10 -29 -10q-59 0 -59 62q0 36 28 49l295 139l-295 139q-28 13 -28 49q0 62 59 62q15 0 29 -10l262 -191l-31 340q0 53 60 53q25 0 43 -17t16 -42l-31 -334l262 191q14 10 29 10q60 0 60 -62q0 -35 -29 -49 l-295 -139l295 -139q29 -14 29 -49z" />
+<glyph unicode="&#x228e;" horiz-adv-x="1364" d="M1249 389q0 -203 -188 -327q-165 -107 -379 -107t-379 107q-188 124 -188 327v799q0 37 41 37t41 -37v-793q0 -169 164 -271q140 -87 321.5 -87t321.5 86q163 101 163 272v793q0 37 41 37t41 -37v-799zM1090 582q0 -41 -37 -41h-330v-330q0 -37 -41 -37t-41 37v330h-330 q-37 0 -37 41t37 41h330v330q0 37 41 37t41 -37v-330h330q37 0 37 -41z" />
+<glyph unicode="&#x228f;" horiz-adv-x="1591" d="M1421 41q0 -41 -37 -41h-1175q-39 0 -39 37v1090q0 37 39 37h1175q37 0 37 -41t-37 -41h-1132v-1000h1132q37 0 37 -41z" />
+<glyph unicode="&#x2290;" horiz-adv-x="1591" d="M1421 37q0 -37 -39 -37h-1175q-37 0 -37 41t37 41h1132v1000h-1132q-37 0 -37 41t37 41h1175q39 0 39 -37v-1090z" />
+<glyph unicode="&#x2291;" horiz-adv-x="1591" d="M1421 41q0 -41 -37 -41h-1175q-39 0 -39 37v1090q0 37 39 37h1175q37 0 37 -41t-37 -41h-1132v-1000h1132q37 0 37 -41zM1421 -318q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41z" />
+<glyph unicode="&#x2292;" horiz-adv-x="1591" d="M1421 37q0 -37 -39 -37h-1175q-37 0 -37 41t37 41h1132v1000h-1132q-37 0 -37 41t37 41h1175q39 0 39 -37v-1090zM1421 -318q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41z" />
+<glyph unicode="&#x2293;" horiz-adv-x="1364" d="M1239 39q0 -39 -41 -39t-41 39v1104h-950v-1104q0 -39 -41 -39t-41 39v1149q0 37 39 37h1038q37 0 37 -37v-1149z" />
+<glyph unicode="&#x2294;" horiz-adv-x="1364" d="M1239 39q0 -39 -37 -39h-1038q-39 0 -39 39v1149q0 37 41 37t41 -37v-1106h950v1106q0 37 41 37t41 -37v-1149z" />
+<glyph unicode="&#x2295;" horiz-adv-x="1591" d="M1307 1093q211 -212 211 -510.5t-211.5 -511t-509.5 -212.5t-510.5 212.5t-212.5 511.5t211.5 510.5t511 211.5t510.5 -212zM837 623h598q-16 241 -187 412.5t-411 186.5v-599zM755 623v599q-241 -16 -412 -187t-186 -412h598zM837 541v-599q239 15 410.5 187t187.5 412 h-598zM755 541h-598q16 -240 187 -411.5t411 -187.5v599z" />
+<glyph unicode="&#x2296;" horiz-adv-x="1591" d="M1421 582q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1307 1093q211 -212 211 -510.5t-211.5 -511t-509.5 -212.5t-510.5 212.5t-212.5 511.5t211.5 510.5t511 211.5t510.5 -212zM1248.5 129.5q187.5 188.5 187.5 453t-187.5 452.5t-452.5 188 t-452.5 -187.5t-187.5 -452.5t188.5 -453.5t452.5 -188.5t451.5 188.5z" />
+<glyph unicode="&#x2297;" horiz-adv-x="1591" d="M1307 1093q211 -212 211 -510.5t-211.5 -511t-509.5 -212.5t-510.5 212.5t-212.5 511.5t211.5 510.5t511 211.5t510.5 -212zM1277 161q159 181 159 421.5t-159 422.5l-423 -423zM1219 1063q-181 160 -423 160t-423 -160l424 -424zM315 1004q-159 -181 -159 -421t158 -422 l423 421zM373 103q182 -162 423.5 -162t423.5 161l-423 423z" />
+<glyph unicode="&#x2298;" horiz-adv-x="1591" d="M1307 1093q211 -212 211 -510.5t-211.5 -511t-509.5 -212.5t-510.5 212.5t-212.5 511.5t211.5 510.5t511 211.5t510.5 -212zM1219 1063q-181 160 -434.5 160t-441 -187.5t-187.5 -453.5q0 -240 160 -422zM1248.5 129.5q187.5 188.5 187.5 441t-159 434.5l-903 -903 q182 -161 434.5 -161t440 188.5z" />
+<glyph unicode="&#x2299;" horiz-adv-x="1578" d="M1538 582q0 -312 -218.5 -530.5t-530.5 -218.5t-530.5 218.5t-218.5 530.5t218.5 530.5t530.5 218.5t530.5 -218.5t218.5 -530.5zM1438 582q0 270 -189.5 459.5t-459.5 189.5t-459.5 -189.5t-189.5 -459.5t189.5 -459.5t459.5 -189.5t459.5 189.5t189.5 459.5zM979 582 q0 -79 -55.5 -134.5t-134.5 -55.5t-134.5 55.5t-55.5 134.5t55.5 134.5t134.5 55.5t134.5 -55.5t55.5 -134.5z" />
+<glyph unicode="&#x229a;" horiz-adv-x="1578" d="M1538 582q0 -312 -218.5 -530.5t-530.5 -218.5t-530.5 218.5t-218.5 530.5t218.5 530.5t530.5 218.5t530.5 -218.5t218.5 -530.5zM1438 582q0 270 -189.5 459.5t-459.5 189.5t-459.5 -189.5t-189.5 -459.5t189.5 -459.5t459.5 -189.5t459.5 189.5t189.5 459.5zM1072 582 q0 -118 -82.5 -200.5t-200.5 -82.5t-200.5 82.5t-82.5 200.5t82.5 200.5t200.5 82.5t200.5 -82.5t82.5 -200.5zM972 582q0 77 -53 130t-130 53t-130 -53t-53 -130t53 -130t130 -53t130 53t53 130z" />
+<glyph unicode="&#x229b;" horiz-adv-x="1591" d="M1307 1093q211 -212 211 -510.5t-211.5 -511t-509.5 -212.5t-510.5 212.5t-212.5 511.5t211.5 510.5t511 211.5t510.5 -212zM1248.5 129.5q187.5 188.5 187.5 453t-187.5 452.5t-452.5 188t-452.5 -187.5t-187.5 -452.5t188.5 -453.5t452.5 -188.5t451.5 188.5zM1174 394 q0 -62 -60 -62q-15 0 -29 10l-262 191l31 -338q0 -53 -59 -53q-23 0 -42.5 17t-17.5 40l31 334l-262 -191q-14 -10 -29 -10q-59 0 -59 62q0 36 28 49l295 139l-295 139q-28 13 -28 49q0 62 59 62q15 0 29 -10l262 -191l-31 340q0 53 60 53q25 0 43 -17t16 -42l-31 -334 l262 191q14 10 29 10q60 0 60 -62q0 -35 -29 -49l-295 -139l295 -139q29 -14 29 -49z" />
+<glyph unicode="&#x229c;" horiz-adv-x="1591" d="M1307 1093q211 -212 211 -510.5t-211.5 -511t-509.5 -212.5t-510.5 212.5t-212.5 511.5t211.5 510.5t511 211.5t510.5 -212zM1248.5 129.5q187.5 188.5 187.5 453t-187.5 452.5t-452.5 188t-452.5 -187.5t-187.5 -452.5t188.5 -453.5t452.5 -188.5t451.5 188.5zM1321 784 q0 -41 -37 -41h-975q-39 0 -39 41t39 41h975q37 0 37 -41zM1321 380q0 -41 -37 -41h-975q-39 0 -39 41t39 41h975q37 0 37 -41z" />
+<glyph unicode="&#x229d;" horiz-adv-x="1591" d="M1307 1093q211 -212 211 -510.5t-211.5 -511t-509.5 -212.5t-510.5 212.5t-212.5 511.5t211.5 510.5t511 211.5t510.5 -212zM1248.5 129.5q187.5 188.5 187.5 453t-187.5 452.5t-452.5 188t-452.5 -187.5t-187.5 -452.5t188.5 -453.5t452.5 -188.5t451.5 188.5zM1221 582 q0 -41 -37 -41h-775q-39 0 -39 41t39 41h775q37 0 37 -41z" />
+<glyph unicode="&#x229e;" horiz-adv-x="1591" d="M1488 -72q0 -39 -37 -39h-1308q-39 0 -39 39v1310q0 37 39 37h1308q37 0 37 -37v-1310zM1406 623v570h-569v-570h569zM755 623v570h-569v-570h569zM1406 -29v570h-569v-570h569zM755 -29v570h-569v-570h569z" />
+<glyph unicode="&#x229f;" horiz-adv-x="1591" d="M1488 -72q0 -39 -37 -39h-1308q-39 0 -39 39v1310q0 37 39 37h1308q37 0 37 -37v-1310zM1406 623v570h-1220v-570h1220zM1406 -29v570h-1220v-570h1220z" />
+<glyph unicode="&#x22a0;" horiz-adv-x="1591" d="M1488 -72q0 -39 -37 -39h-1308q-39 0 -39 39v1310q0 37 39 37h1308q37 0 37 -37v-1310zM1406 -29v1222h-1220v-1222h1220zM1290 129q0 -41 -41 -41q-15 0 -30 15l-422 422l-424 -422q-15 -15 -31 -15q-41 0 -41 41q0 19 10 29l426 424l-426 426q-10 10 -10 27q0 41 41 41 q18 0 31 -13l424 -424l422 424q13 13 30 13q41 0 41 -41q0 -17 -10 -27l-426 -426l426 -424q10 -10 10 -29z" />
+<glyph unicode="&#x22a1;" horiz-adv-x="1591" d="M1488 -72q0 -39 -37 -39h-1308q-39 0 -39 39v1310q0 37 39 37h1308q37 0 37 -37v-1310zM1406 -29v1222h-1220v-1222h1220zM874.5 661.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5z" />
+<glyph unicode="&#x22a2;" horiz-adv-x="1251" d="M1135 711q0 -41 -37 -41h-901v-631q0 -39 -41 -39t-41 39v1345q0 37 41 37t41 -37v-632h901q37 0 37 -41z" />
+<glyph unicode="&#x22a3;" horiz-adv-x="1251" d="M1135 39q0 -39 -41 -39t-41 39v631h-899q-39 0 -39 41t39 41h899v632q0 37 41 37t41 -37v-1345z" />
+<glyph unicode="&#x22a4;" horiz-adv-x="1591" d="M1479 1323q0 -41 -37 -41h-604v-1243q0 -39 -41 -39t-41 39v1243h-602q-39 0 -39 41t39 41h1288q37 0 37 -41z" />
+<glyph unicode="&#x22a5;" horiz-adv-x="1591" d="M1479 41q0 -41 -37 -41h-1288q-39 0 -39 41t39 41h602v1245q0 37 41 37t41 -37v-1245h604q37 0 37 -41z" />
+<glyph unicode="&#x22a6;" horiz-adv-x="751" d="M635 711q0 -41 -37 -41h-401v-631q0 -39 -41 -39t-41 39v1345q0 37 41 37t41 -37v-632h401q37 0 37 -41z" />
+<glyph unicode="&#x22a7;" horiz-adv-x="751" d="M635 512q0 -41 -37 -41h-401v-432q0 -39 -41 -39t-41 39v1345q0 37 41 37t41 -37v-434h401q37 0 37 -41t-37 -41h-401v-315h401q37 0 37 -41z" />
+<glyph unicode="&#x22a8;" horiz-adv-x="1251" d="M1135 512q0 -41 -37 -41h-901v-432q0 -39 -41 -39t-41 39v1345q0 37 41 37t41 -37v-434h901q37 0 37 -41t-37 -41h-901v-315h901q37 0 37 -41z" />
+<glyph unicode="&#x22a9;" horiz-adv-x="1479" d="M1362 711q0 -41 -37 -41h-731v-631q0 -39 -41 -39t-41 39v1345q0 37 41 37t41 -37v-632h731q37 0 37 -41zM197 39q0 -39 -41 -39t-41 39v1345q0 37 41 37t41 -37v-1345z" />
+<glyph unicode="&#x22aa;" horiz-adv-x="1819" d="M1704 711q0 -41 -37 -41h-729v-631q0 -39 -41 -39t-41 39v1345q0 37 41 37t41 -37v-632h729q37 0 37 -41zM567 39q0 -39 -41 -39t-41 39v1345q0 37 41 37t41 -37v-1345zM197 39q0 -39 -41 -39t-41 39v1345q0 37 41 37t41 -37v-1345z" />
+<glyph unicode="&#x22ab;" horiz-adv-x="1479" d="M1362 512q0 -41 -37 -41h-731v-432q0 -39 -41 -39t-41 39v1345q0 37 41 37t41 -37v-434h731q37 0 37 -41t-37 -41h-731v-315h731q37 0 37 -41zM197 39q0 -39 -41 -39t-41 39v1345q0 37 41 37t41 -37v-1345z" />
+<glyph unicode="&#x22ac;" horiz-adv-x="1251" d="M1194 1330q0 -16 -15 -42l-309 -536h228q37 0 37 -41t-37 -41h-276l-481 -834q-23 -40 -46 -40q-41 0 -41 38q0 15 16 43l458 793h-531v-631q0 -39 -41 -39t-41 39v1345q0 37 41 37t41 -37v-632h578l333 577q23 39 45 39q41 0 41 -38z" />
+<glyph unicode="&#x22ad;" horiz-adv-x="1251" d="M1194 1330q0 -16 -15 -42l-195 -338h114q37 0 37 -41t-37 -41h-161l-182 -315h343q37 0 37 -41t-37 -41h-391l-366 -635q-23 -40 -46 -40q-41 0 -41 38q0 15 16 43l343 594h-416v-432q0 -39 -41 -39t-41 39v1345q0 37 41 37t41 -37v-434h692l219 379q23 39 45 39 q41 0 41 -38zM197 868v-315h463l182 315h-645z" />
+<glyph unicode="&#x22ae;" horiz-adv-x="1479" d="M1362 711q0 -41 -37 -41h-493l-238 -413v-218q0 -39 -41 -39t-41 39v76l-161 -279q-23 -40 -46 -40q-41 0 -41 38q0 15 16 43l232 402v1105q0 37 41 37t41 -37v-632h191l333 577q23 39 45 39q41 0 41 -38q0 -16 -15 -42l-309 -536h445q37 0 37 -41zM197 39q0 -39 -41 -39 t-41 39v1345q0 37 41 37t41 -37v-1345zM594 670v-249l144 249h-144z" />
+<glyph unicode="&#x22af;" horiz-adv-x="1479" d="M1362 512q0 -41 -37 -41h-608l-123 -214v-218q0 -39 -41 -39t-41 39v76l-161 -279q-23 -40 -46 -40q-41 0 -41 38q0 15 16 43l232 402v1105q0 37 41 37t41 -37v-434h305l219 379q23 39 45 39q41 0 41 -38q0 -16 -15 -42l-195 -338h331q37 0 37 -41t-37 -41h-378 l-182 -315h560q37 0 37 -41zM197 39q0 -39 -41 -39t-41 39v1345q0 37 41 37t41 -37v-1345zM594 868v-315h76l182 315h-258zM594 471v-50l29 50h-29z" />
+<glyph unicode="&#x22b0;" horiz-adv-x="1591" d="M1381 157q0 -115 -88 -189t-205 -74q-40 0 -40 40t40 40q84 0 148.5 50t64.5 131q0 192 -386 306q-271 80 -706 80q-39 0 -39 41t39 41q435 0 706 80q386 114 386 306q0 81 -64.5 131t-148.5 50q-40 0 -40 40t40 40q117 0 205 -74t88 -189q0 -179 -232 -300 q-160 -83 -391 -125q231 -42 391 -125q232 -121 232 -300z" />
+<glyph unicode="&#x22b1;" horiz-adv-x="1591" d="M1421 582q0 -41 -39 -41q-435 0 -706 -80q-386 -114 -386 -306q0 -81 64.5 -131t148.5 -50q40 0 40 -40t-40 -40q-117 0 -205 74t-88 189q0 179 232 300q160 83 391 125q-231 42 -391 125q-232 121 -232 300q0 115 88 189t205 74q40 0 40 -40t-40 -40q-84 0 -148.5 -50 t-64.5 -131q0 -192 386 -306q271 -80 706 -80q39 0 39 -41z" />
+<glyph unicode="&#x22b2;" horiz-adv-x="1591" d="M1421 25q0 -37 -41 -37q-10 0 -14 2l-1169 553q-27 13 -27 39t20 35l1176 555q4 2 14 2q41 0 41 -37v-1112zM1339 93v976l-1032 -487z" />
+<glyph unicode="&#x22b3;" horiz-adv-x="1591" d="M1421 582q0 -26 -18 -35l-1176 -557q-4 -2 -16 -2q-41 0 -41 37v1112q0 37 41 37q12 0 16 -2l1170 -553q24 -11 24 -37zM1284 582l-1032 487v-976z" />
+<glyph unicode="&#x22b4;" horiz-adv-x="1591" d="M1421 25q0 -37 -41 -37q-10 0 -14 2l-1169 553q-27 13 -27 39t20 35l1176 555q4 2 14 2q41 0 41 -37v-1112zM1339 93v976l-1032 -487zM1421 -318q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41z" />
+<glyph unicode="&#x22b5;" horiz-adv-x="1591" d="M1421 582q0 -26 -18 -35l-1176 -557q-4 -2 -16 -2q-41 0 -41 37v1112q0 37 41 37q12 0 16 -2l1170 -553q24 -11 24 -37zM1284 582l-1032 487v-976zM1421 -318q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41z" />
+<glyph unicode="&#x22b6;" d="M1903 812q95 -96 95 -229.5t-95.5 -230t-223.5 -96.5t-220.5 81.5t-108.5 203.5h-652q-16 -122 -108.5 -203.5t-220.5 -81.5t-223.5 96.5t-95.5 230t95 229.5t223 96t221.5 -82t108.5 -203h652q15 121 108.5 203t221.5 82t223 -96zM618 582q0 100 -72 172t-171.5 72 t-171 -72.5t-71.5 -171.5t71.5 -171.5t171 -72.5t171.5 72t72 172z" />
+<glyph unicode="&#x22b7;" d="M1903 812q95 -96 95 -229.5t-95.5 -230t-223.5 -96.5t-220.5 81.5t-108.5 203.5h-652q-16 -122 -108.5 -203.5t-220.5 -81.5t-223.5 96.5t-95.5 230t95 229.5t223 96t221.5 -82t108.5 -203h652q15 121 108.5 203t221.5 82t223 -96zM1916 582q0 99 -71.5 171.5t-171 72.5 t-171.5 -72t-72 -172t72 -172t171.5 -72t171 72.5t71.5 171.5z" />
+<glyph unicode="&#x22b8;" d="M1853 812q95 -96 95 -229.5t-95.5 -230t-223.5 -96.5t-220.5 81.5t-108.5 203.5h-1163q-37 0 -37 41t37 41h1163q15 121 108.5 203t221.5 82t223 -96zM1866 582q0 99 -71.5 171.5t-171 72.5t-171.5 -72t-72 -172t72 -172t171.5 -72t171 72.5t71.5 171.5z" />
+<glyph unicode="&#x22b9;" horiz-adv-x="1591" d="M837 716q0 -39 -41 -39t-41 39v475q0 37 41 37t41 -37v-475zM1441 582q0 -41 -37 -41h-475q-39 0 -39 41t39 41h475q37 0 37 -41zM701 582q0 -41 -37 -41h-475q-39 0 -39 41t39 41h475q37 0 37 -41zM837 -25q0 -39 -41 -39t-41 39v476q0 37 41 37t41 -37v-476z" />
+<glyph unicode="&#x22ba;" horiz-adv-x="1137" d="M1019 795q0 -22 -20.5 -41.5t-42.5 -19.5h-320v-1096q0 -23 -22 -41t-45 -18q-46 0 -62 43q-4 11 -5 16v1096h-319q-63 0 -63 75q0 20 21 39.5t42 19.5h773q63 0 63 -73z" />
+<glyph unicode="&#x22bb;" horiz-adv-x="1251" d="M1135 1425q0 -12 -2 -16l-469 -987q-12 -25 -38.5 -25t-35.5 18l-471 994q-4 8 -4 16q0 41 41 41q24 0 34 -20l435 -914l432 907q13 27 37 27q41 0 41 -41zM1135 41q0 -41 -37 -41h-944q-39 0 -39 41t39 41h944q37 0 37 -41z" />
+<glyph unicode="&#x22bc;" horiz-adv-x="1251" d="M1135 1425q0 -41 -37 -41h-944q-39 0 -39 41t39 41h944q37 0 37 -41zM1135 41q0 -41 -41 -41q-24 0 -37 27l-432 907l-435 -914q-10 -20 -34 -20q-41 0 -41 41q0 8 4 16l471 994q9 18 35.5 18t38.5 -25l469 -987q2 -4 2 -16z" />
+<glyph unicode="&#x22bd;" horiz-adv-x="1251" d="M1135 1425q0 -41 -37 -41h-944q-39 0 -39 41t39 41h944q37 0 37 -41zM1135 1028q0 -12 -2 -16l-469 -987q-12 -25 -38.5 -25t-35.5 18l-471 994q-4 8 -4 16q0 41 41 41q24 0 34 -20l435 -914l432 907q13 27 37 27q41 0 41 -41z" />
+<glyph unicode="&#x22be;" horiz-adv-x="1573" d="M1434 41q0 -41 -68 -41h-1139q-61 0 -66 35q-2 11 -2 33v1269q0 68 41 68t41 -68v-580q276 -2 473.5 -199t200.5 -476h451q68 0 68 -41zM241 82h592q-3 243 -175 416.5t-417 176.5v-593z" />
+<glyph unicode="&#x22bf;" horiz-adv-x="1820" d="M1671 37q0 -37 -41 -37h-1470q-39 0 -39 41q0 17 18 35l1469 1468q6 6 22 6q41 0 41 -39v-1474zM1589 82v1319l-1319 -1319h1319z" />
+<glyph unicode="&#x22c0;" horiz-adv-x="1364" d="M1249 -4q0 -41 -41 -41q-26 0 -37 25l-489 1103l-487 -1103q-11 -25 -39 -25q-41 0 -41 41q0 7 530 1204q11 25 38 25t38 -25l526 -1188q2 -5 2 -16z" />
+<glyph unicode="&#x22c1;" horiz-adv-x="1364" d="M1249 1184q0 -10 -2 -15l-526 -1189q-11 -25 -38 -25t-38 25q-530 1198 -530 1204q0 41 41 41q28 0 39 -25l487 -1104l489 1104q11 25 37 25q41 0 41 -41z" />
+<glyph unicode="&#x22c2;" horiz-adv-x="1704" d="M1569 -352q0 -50 -60 -50q-17 0 -33 16.5t-16 33.5v1205q0 247 -179.5 415t-428.5 168t-428.5 -168t-179.5 -415v-1205q0 -50 -60 -50q-17 0 -33 16.5t-16 33.5v1216q0 289 215.5 485.5t504.5 196.5t501.5 -199t212.5 -483v-1216z" />
+<glyph unicode="&#x22c3;" horiz-adv-x="1704" d="M1569 280q0 -284 -212.5 -483t-501.5 -199t-504.5 196.5t-215.5 485.5v1216q0 17 16 33.5t33 16.5q60 0 60 -50v-1205q0 -247 179.5 -415t428.5 -168t428.5 168t179.5 415v1205q0 17 16 33.5t33 16.5q60 0 60 -50v-1216z" />
+<glyph unicode="&#x22c4;" horiz-adv-x="738" d="M712 582l-343 -343l-343 343l343 343zM571 582l-202 202l-202 -202l202 -202z" />
+<glyph unicode="&#x22c5;" horiz-adv-x="460" d="M420 582q0 -79 -55.5 -134.5t-134.5 -55.5t-134.5 55.5t-55.5 134.5t55.5 134.5t134.5 55.5t134.5 -55.5t55.5 -134.5z" />
+<glyph unicode="&#x22c6;" horiz-adv-x="1208" d="M1168 766l-349 -255l133 -408l-348 253l-348 -253l133 408l-349 255h431l133 408l133 -408h431z" />
+<glyph unicode="&#x22c7;" horiz-adv-x="1591" d="M875 1109.5q34 -33.5 34 -80t-33.5 -79.5t-80.5 -33t-80.5 33t-33.5 79.5t34 80t80 33.5t80 -33.5zM1421 582q0 -41 -37 -41h-490l417 -417q10 -10 10 -24q0 -44 -43 -44q-15 0 -25 10l-458 458l-456 -456q-11 -11 -27 -11q-42 0 -42 42q0 16 11 27l416 415h-488 q-39 0 -39 41t39 41h488l-416 415q-11 11 -11 27q0 42 42 42q16 0 27 -11l456 -456l458 458q10 10 25 10q43 0 43 -44q0 -14 -10 -24l-417 -417h490q37 0 37 -41zM875.5 214q33.5 -33 33.5 -79.5t-34 -80t-80 -33.5t-80 33.5t-34 80t33.5 79.5t80.5 33t80.5 -33z" />
+<glyph unicode="&#x22c8;" horiz-adv-x="1591" d="M1290 127q0 -39 -41 -39q-15 0 -30 15l-422 422l-424 -422q-15 -15 -31 -15q-41 0 -41 39v912q0 37 41 37q18 0 31 -13l424 -424l422 424q13 13 30 13q41 0 41 -37v-912zM1208 228v708l-354 -354zM737 582l-354 354v-708z" />
+<glyph unicode="&#x22c9;" horiz-adv-x="1591" d="M1290 129q0 -41 -41 -41q-15 0 -30 15l-422 422l-424 -422q-15 -15 -31 -15q-41 0 -41 39v912q0 37 41 37q18 0 31 -13l424 -424l422 424q13 13 30 13q41 0 41 -41q0 -17 -10 -27l-426 -426l426 -424q10 -10 10 -29zM737 582l-354 354v-708z" />
+<glyph unicode="&#x22ca;" horiz-adv-x="1591" d="M1290 127q0 -39 -41 -39q-15 0 -30 15l-422 422l-424 -422q-15 -15 -31 -15q-41 0 -41 41q0 19 10 29l426 424l-426 426q-10 10 -10 27q0 41 41 41q18 0 31 -13l424 -424l422 424q13 13 30 13q41 0 41 -37v-912zM1208 228v708l-354 -354z" />
+<glyph unicode="&#x22cb;" horiz-adv-x="1591" d="M1477 -4q0 -41 -41 -41q-20 0 -31 12l-608 660l-611 -660q-11 -12 -30 -12q-41 0 -41 41q0 18 10 29l614 663l-614 666q-10 11 -10 26q0 41 41 41q19 0 30 -12l1280 -1384q11 -12 11 -29z" />
+<glyph unicode="&#x22cc;" horiz-adv-x="1591" d="M1477 -4q0 -41 -41 -41q-20 0 -31 12l-608 660l-611 -660q-11 -12 -30 -12q-41 0 -41 41q0 18 10 29l1280 1384q11 12 31 12q41 0 41 -41q0 -14 -11 -26l-614 -666l614 -663q11 -12 11 -29z" />
+<glyph unicode="&#x22cd;" horiz-adv-x="1591" d="M1477 726q0 -63 -29 -63q-24 0 -28 43.5t-23 116.5q-33 80 -104 130t-156 50q-111 0 -235 -88l-207 -164q-125 -88 -240 -88q-149 0 -244.5 119.5t-95.5 271.5q0 63 28 63q24 0 29 -51q9 -90 38 -142q83 -147 245 -147q113 0 236 88l208 164q124 88 238 88 q148 0 244 -119.5t96 -271.5zM1477 282q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41z" />
+<glyph unicode="&#x22ce;" horiz-adv-x="1556" d="M1384 1143q0 -35 -38 -41q-120 -19 -198 -64t-140 -141q-117 -181 -153 -419t-36 -486q0 -37 -41 -37t-41 37q0 420 -87 696q-53 168 -156 276.5t-285 137.5q-16 3 -27.5 14.5t-11.5 26.5q0 41 45 41q24 0 77 -12q194 -44 313 -215q126 -185 173 -449q71 384 280 561 q97 82 227 107q41 8 54 8q45 0 45 -41z" />
+<glyph unicode="&#x22cf;" horiz-adv-x="1556" d="M1384 -4q0 -41 -45 -41q-20 0 -76 13q-189 44 -301 201q-133 187 -184 462q-49 -276 -182 -462q-112 -157 -304 -201q-57 -13 -77 -13q-45 0 -45 41q0 16 11 27t28 14q181 30 284.5 139t156.5 275q87 274 87 696q0 37 41 37t41 -37q0 -248 36 -485t149.5 -412.5 t341.5 -212.5q38 -6 38 -41z" />
+<glyph unicode="&#x22d0;" horiz-adv-x="1591" d="M1421 41q0 -41 -39 -41h-590q-248 0 -435 168.5t-187 413.5t187 413.5t435 168.5h590q39 0 39 -41t-39 -41h-584q-216 0 -381 -143.5t-165 -356.5t165 -356.5t381 -143.5h584q39 0 39 -41zM1411 329q0 -38 -39 -38h-555q-129 0 -230 82.5t-101 208.5t101 208.5t230 82.5 h555q39 0 39 -38t-39 -38h-552q-97 0 -175 -60.5t-78 -154.5t78 -154.5t175 -60.5h552q39 0 39 -38z" />
+<glyph unicode="&#x22d1;" horiz-adv-x="1591" d="M1421 582q0 -245 -187 -413.5t-435 -168.5h-590q-39 0 -39 41t39 41h584q216 0 381 143.5t165 356.5t-165 356.5t-381 143.5h-584q-39 0 -39 41t39 41h590q248 0 435 -168.5t187 -413.5zM1105 582q0 -126 -101 -208.5t-230 -82.5h-555q-39 0 -39 38t39 38h552 q97 0 175 60.5t78 154.5t-78 154.5t-175 60.5h-552q-39 0 -39 38t39 38h555q129 0 230 -82.5t101 -208.5z" />
+<glyph unicode="&#x22d2;" horiz-adv-x="1364" d="M1249 389q0 -203 -188 -327q-165 -107 -379 -107t-379 107q-188 124 -188 327v799q0 37 41 37t41 -37v-793q0 -169 164 -271q140 -87 321.5 -87t321.5 86q163 101 163 272v793q0 37 41 37t41 -37v-799zM965 537q0 -108 -86 -172.5t-197.5 -64.5t-197.5 64.5t-86 172.5 v639q0 39 38 39t38 -39v-636q0 -74 65 -116.5t143.5 -42.5t143 42t64.5 117v636q0 39 37.5 39t37.5 -39v-639z" />
+<glyph unicode="&#x22d3;" horiz-adv-x="1364" d="M1249 -8q0 -37 -41 -37t-41 37v792q0 171 -163 273q-140 86 -322.5 86t-321.5 -87q-163 -101 -163 -272v-792q0 -37 -41 -37t-41 37v799q0 202 189 326q164 108 378 108t379 -107q188 -124 188 -327v-799zM965 4q0 -39 -37.5 -39t-37.5 39v636q0 75 -64.5 117t-143 42 t-143.5 -42.5t-65 -116.5v-636q0 -39 -38 -39t-38 39v639q0 108 86 172.5t197.5 64.5t197.5 -64.5t86 -172.5v-639z" />
+<glyph unicode="&#x22d4;" horiz-adv-x="1364" d="M1249 -8q0 -37 -41 -37t-41 37v792q0 161 -145 261q-125 85 -299 97v-998q0 -62 -41 -62t-41 62v998q-175 -12 -299 -97q-145 -100 -145 -261v-792q0 -37 -41 -37t-41 37v799q0 192 171 314q149 107 355 119v197q0 61 41 61t41 -61v-197q206 -12 355 -118 q171 -122 171 -315v-799z" />
+<glyph unicode="&#x22d5;" horiz-adv-x="1024" d="M912 382q0 -41 -61 -41h-99v-746q0 -37 -41 -37t-41 37v746h-316v-746q0 -37 -41 -37t-41 37v746h-104q-56 0 -56 41t62 41h98v318h-104q-56 0 -56 41t62 41h98v746q0 37 41 37t41 -37v-746h316v746q0 37 41 37t41 -37v-746h99q61 0 61 -41t-61 -41h-99v-318h99 q61 0 61 -41zM670 423v318h-316v-318h316z" />
+<glyph unicode="&#x22d6;" horiz-adv-x="1591" d="M1335.5 661.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM1421 31q0 -41 -41 -41q-8 0 -14 3l-1169 552q-27 13 -27 37t27 37l1169 552q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-1090 -514l1090 -514q24 -11 24 -37z" />
+<glyph unicode="&#x22d7;" horiz-adv-x="1591" d="M414.5 661.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM1421 582q0 -24 -27 -37l-1169 -552q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l1090 514l-1090 514q-24 11 -24 37q0 41 41 41q8 0 14 -3l1169 -552q27 -13 27 -37z" />
+<glyph unicode="&#x22d8;" horiz-adv-x="2831" d="M1421 31q0 -41 -41 -41q-8 0 -14 3l-1169 552q-27 13 -27 37t27 37l1169 552q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-1090 -514l1090 -514q24 -11 24 -37zM2041 31q0 -41 -41 -41q-8 0 -14 3l-1169 552q-27 13 -27 37t27 37l1169 552q6 3 14 3q41 0 41 -41q0 -26 -24 -37 l-1090 -514l1090 -514q24 -11 24 -37zM2661 31q0 -41 -41 -41q-8 0 -14 3l-1169 552q-27 13 -27 37t27 37l1169 552q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-1090 -514l1090 -514q24 -11 24 -37z" />
+<glyph unicode="&#x22d9;" horiz-adv-x="2831" d="M1421 582q0 -24 -27 -37l-1169 -552q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l1090 514l-1090 514q-24 11 -24 37q0 41 41 41q8 0 14 -3l1169 -552q27 -13 27 -37zM2041 582q0 -24 -27 -37l-1169 -552q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l1090 514l-1090 514 q-24 11 -24 37q0 41 41 41q8 0 14 -3l1169 -552q27 -13 27 -37zM2661 582q0 -24 -27 -37l-1169 -552q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l1090 514l-1090 514q-24 11 -24 37q0 41 41 41q8 0 14 -3l1169 -552q27 -13 27 -37z" />
+<glyph unicode="&#x22da;" horiz-adv-x="1591" d="M1421 582q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1421 800q0 -45 -39 -45q-6 0 -15 3l-1170 384q-27 9 -27 39t27 39l1170 384q6 2 13 2q41 0 41 -41q0 -31 -25 -39l-1051 -345l1051 -345q25 -8 25 -36zM1421 -16q0 -30 -27 -39l-1170 -384 q-9 -3 -15 -3q-39 0 -39 45q0 28 25 36l1051 345l-1051 345q-25 8 -25 39q0 41 41 41q7 0 13 -2l1170 -384q27 -9 27 -39z" />
+<glyph unicode="&#x22db;" horiz-adv-x="1591" d="M1421 582q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1421 1181q0 -30 -27 -39l-1170 -384q-9 -3 -15 -3q-39 0 -39 45q0 28 25 36l1051 345l-1051 345q-25 8 -25 39q0 41 41 41q7 0 13 -2l1170 -384q27 -9 27 -39zM1421 -397q0 -45 -39 -45q-6 0 -15 3 l-1170 384q-27 9 -27 39t27 39l1170 384q6 2 13 2q41 0 41 -41q0 -31 -25 -39l-1051 -345l1051 -345q25 -8 25 -36z" />
+<glyph unicode="&#x22dc;" horiz-adv-x="1591" d="M1421 -259q0 -41 -41 -41q-8 0 -14 3l-1169 552q-27 13 -27 37t27 37l1169 552q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-1090 -514l1090 -514q24 -11 24 -37zM1421 1133q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41z" />
+<glyph unicode="&#x22dd;" horiz-adv-x="1591" d="M1421 292q0 -24 -27 -37l-1169 -552q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l1090 514l-1090 514q-24 11 -24 37q0 41 41 41q8 0 14 -3l1169 -552q27 -13 27 -37zM1421 1133q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41z" />
+<glyph unicode="&#x22de;" horiz-adv-x="1591" d="M1421 35q0 -45 -41 -45q-34 0 -41 39q-28 180 -141.5 282t-284.5 152q-268 78 -704 78q-39 0 -39 41t39 41q436 0 706 80q173 51 285 152t139 284q6 37 41 37q41 0 41 -43q0 -22 -12 -76q-42 -188 -196 -297q-178 -126 -455 -178q269 -47 453 -177q156 -110 198 -295 q12 -52 12 -75zM1194 1439q0 -144 -112 -280q-136 -165 -397 -245q-213 -65 -470 -65q-45 0 -45 41t39 41q325 0 573 107q136 59 221.5 155t108.5 252q7 37 41 37q41 0 41 -43z" />
+<glyph unicode="&#x22df;" horiz-adv-x="1591" d="M1421 582q0 -41 -37 -41q-267 0 -500 -31.5t-415.5 -142.5t-216.5 -338q-6 -39 -41 -39q-41 0 -41 45q0 12 8 53q25 130 106 225q172 203 550 269q-435 77 -590 327q-74 119 -74 224q0 43 41 43q35 0 41 -37q35 -232 215 -342t418 -142t499 -32q37 0 37 -41zM1421 890 q0 -41 -43 -41q-257 0 -469 65q-259 80 -397 245q-85 102 -109 237q-6 34 -6 43q0 43 41 43q35 0 41 -37q26 -157 110.5 -252t221.5 -155q247 -107 573 -107q37 0 37 -41z" />
+<glyph unicode="&#x22e0;" horiz-adv-x="1591" d="M1421 35q0 -45 -41 -45q-34 0 -41 39q-28 180 -141.5 282t-284.5 152q-100 29 -213 47l-38 -253q278 -80 420 -252q112 -136 112 -280q0 -43 -41 -43q-34 0 -41 37q-23 156 -104 247q-123 138 -359 208l-75 -498q-6 -35 -40 -35q-43 0 -43 36q0 5 1 11l77 507 q-167 38 -360 38q-39 0 -39 41t45 41q194 0 367 -38l37 244q-168 20 -410 20q-39 0 -39 41t39 41q252 0 429 23l81 536q6 35 40 35q43 0 43 -36q0 -5 -1 -11l-78 -511q101 17 192 44q173 51 285 152t139 284q6 37 41 37q41 0 41 -43q0 -22 -12 -76q-42 -188 -196 -297 q-178 -126 -455 -178q269 -47 453 -177q156 -110 198 -295q12 -53 12 -75z" />
+<glyph unicode="&#x22e1;" horiz-adv-x="1591" d="M1421 274q0 -41 -37 -41q-238 0 -435 -57l-75 -500q-6 -35 -40 -35q-43 0 -43 36q0 5 1 11l70 459q-176 -67 -277 -181q-80 -90 -106 -247q-6 -37 -41 -37q-41 0 -41 43q0 9 6 43q24 135 109 237q129 154 364 234l42 275l-30 -4q-234 -31 -418 -142.5t-218 -338.5 q-6 -39 -41 -39q-41 0 -41 45q0 12 8 53q25 130 106 225q172 203 550 269q-435 77 -590 327q-74 119 -74 224q0 43 41 43q35 0 41 -37q35 -232 211 -339q193 -118 475 -152l81 534q6 35 40 35q43 0 43 -36q0 -5 -1 -11l-81 -530q176 -17 364 -17q37 0 37 -41t-37 -41 q-202 0 -382 -18l-39 -258q192 50 415 50q43 0 43 -41z" />
+<glyph unicode="&#x22e2;" horiz-adv-x="1591" d="M1421 -148q0 -41 -37 -41h-809l-53 -147q-17 -47 -44 -47q-42 0 -42 38q0 15 8 37l43 119h-278q-39 0 -39 41t39 41h308l101 277h-409q-39 0 -39 37v1090q0 37 39 37h833l61 167q17 46 43 46q42 0 42 -37q0 -15 -8 -37l-51 -139h255q37 0 37 -41t-37 -41h-284l-364 -1000 h648q37 0 37 -41t-37 -41h-678l-101 -277h779q37 0 37 -41zM252 1252v-1000h396l364 1000h-760z" />
+<glyph unicode="&#x22e3;" horiz-adv-x="1591" d="M1421 -148q0 -41 -37 -41h-809l-53 -147q-17 -47 -44 -47q-42 0 -42 38q0 15 8 37l43 119h-278q-39 0 -39 41t39 41h308l101 277h-411q-37 0 -37 41t37 41h441l364 1000h-805q-37 0 -37 41t37 41h835l61 167q17 46 43 46q42 0 42 -37q0 -15 -8 -37l-51 -139h253 q39 0 39 -37v-1090q0 -37 -39 -37h-676l-101 -277h779q37 0 37 -41zM1339 252v1000h-239l-364 -1000h603z" />
+<glyph unicode="&#x22e4;" horiz-adv-x="1591" d="M1421 141q0 -41 -37 -41h-1175q-39 0 -39 37v1090q0 37 39 37h1175q37 0 37 -41t-37 -41h-1132v-1000h1132q37 0 37 -41zM1421 -218q0 -41 -37 -41h-549l-283 -164q-26 -15 -43 -15q-38 0 -38 41q0 23 40 46l160 92h-462q-39 0 -39 41t39 41h604l284 164q26 15 42 15 q38 0 38 -41q0 -22 -39 -45l-161 -93h407q37 0 37 -41z" />
+<glyph unicode="&#x22e5;" horiz-adv-x="1591" d="M1421 137q0 -37 -39 -37h-1175q-37 0 -37 41t37 41h1132v1000h-1132q-37 0 -37 41t37 41h1175q39 0 39 -37v-1090zM1421 -218q0 -41 -37 -41h-549l-283 -164q-26 -15 -43 -15q-38 0 -38 41q0 23 40 46l160 92h-462q-39 0 -39 41t39 41h604l284 164q26 15 42 15 q38 0 38 -41q0 -22 -39 -45l-161 -93h407q37 0 37 -41z" />
+<glyph unicode="&#x22e6;" horiz-adv-x="1591" d="M1421 331q0 -41 -41 -41q-8 0 -14 3l-1169 552q-27 13 -27 37t27 37l1169 552q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-1090 -514l1090 -514q24 -11 24 -37zM1477 46q0 -152 -96 -271.5t-244 -119.5q-92 0 -185 54q-56 32 -159 118l-324 -259q-13 -10 -26 -10q-42 0 -42 43 q0 18 16 31l311 248q-148 115 -273 115q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q93 0 168 -43t177 -128l322 258q13 9 26 9q42 0 42 -42q0 -18 -16 -31l-309 -247q149 -116 272 -116q85 0 156 50t104 130q15 36 21 98 t30 62q29 0 29 -63z" />
+<glyph unicode="&#x22e7;" horiz-adv-x="1591" d="M1421 882q0 -24 -27 -37l-1169 -552q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l1090 514l-1090 514q-24 11 -24 37q0 41 41 41q8 0 14 -3l1169 -552q27 -13 27 -37zM1477 46q0 -152 -96 -271.5t-244 -119.5q-92 0 -185 54q-56 32 -159 118l-324 -259q-13 -10 -26 -10 q-42 0 -42 43q0 18 16 31l311 248q-148 115 -273 115q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q93 0 168 -43t177 -128l322 258q13 9 26 9q42 0 42 -42q0 -18 -16 -31l-309 -247q149 -116 272 -116q85 0 156 50 t104 130q15 36 21 98t30 62q29 0 29 -63z" />
+<glyph unicode="&#x22e8;" horiz-adv-x="1591" d="M1421 335q0 -45 -41 -45q-34 0 -41 39q-28 180 -141.5 282t-284.5 152q-268 78 -704 78q-39 0 -39 41t39 41q436 0 706 80q173 51 285 152t139 284q6 37 41 37q41 0 41 -43q0 -22 -12 -76q-42 -188 -196 -297q-178 -126 -455 -178q269 -47 453 -177q156 -110 198 -295 q12 -52 12 -75zM1477 46q0 -152 -96 -271.5t-244 -119.5q-92 0 -185 54q-56 32 -159 118l-324 -259q-13 -10 -26 -10q-42 0 -42 43q0 18 16 31l311 248q-148 115 -273 115q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5 q93 0 168 -43t177 -128l322 258q13 9 26 9q42 0 42 -42q0 -18 -16 -31l-309 -247q149 -116 272 -116q85 0 156 50t104 130q15 36 21 98t30 62q29 0 29 -63z" />
+<glyph unicode="&#x22e9;" horiz-adv-x="1591" d="M1421 882q0 -41 -37 -41q-267 0 -500 -31.5t-415.5 -142.5t-216.5 -338q-6 -39 -41 -39q-41 0 -41 45q0 12 8 53q25 130 106 225q172 203 550 269q-435 77 -590 327q-74 119 -74 224q0 43 41 43q35 0 41 -37q35 -232 215 -342t418 -142t499 -32q37 0 37 -41zM1477 46 q0 -152 -96 -271.5t-244 -119.5q-92 0 -185 54q-56 32 -159 118l-324 -259q-13 -10 -26 -10q-42 0 -42 43q0 18 16 31l311 248q-148 115 -273 115q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q93 0 168 -43t177 -128 l322 258q13 9 26 9q42 0 42 -42q0 -18 -16 -31l-309 -247q149 -116 272 -116q85 0 156 50t104 130q15 36 21 98t30 62q29 0 29 -63z" />
+<glyph unicode="&#x22ea;" horiz-adv-x="1591" d="M1421 25q0 -37 -41 -37q-10 0 -14 2l-735 348l-290 -502q-23 -40 -46 -40q-41 0 -41 38q0 15 16 43l286 496l-359 170q-27 13 -27 39t20 35l697 329l221 383q23 39 45 39q41 0 41 -38q0 -16 -15 -42l-162 -281l349 165q4 2 14 2q41 0 41 -37v-1112zM1339 93v976 l-394 -186l-273 -474zM815 822l-508 -240l290 -138z" />
+<glyph unicode="&#x22eb;" horiz-adv-x="1591" d="M1421 582q0 -26 -18 -35l-704 -334l-218 -377q-23 -40 -46 -40q-41 0 -41 38q0 15 16 43l159 275l-342 -162q-4 -2 -16 -2q-41 0 -41 37v1112q0 37 41 37q12 0 16 -2l731 -346l290 503q23 39 45 39q41 0 41 -38q0 -16 -15 -42l-287 -497l365 -172q24 -11 24 -37z M1284 582l-293 138l-220 -381zM917 755l-665 314v-976l389 184z" />
+<glyph unicode="&#x22ec;" horiz-adv-x="1591" d="M1421 -118q0 -41 -37 -41h-898l-64 -177q-17 -47 -44 -47q-42 0 -42 38q0 15 8 37l54 149h-189q-39 0 -39 41t39 41h219l221 606l-452 214q-27 13 -27 39t20 35l681 321l132 363q17 46 43 46q42 0 42 -37q0 -15 -8 -37l-104 -285l390 184q4 2 14 2q41 0 41 -37v-1112 q0 -37 -41 -37q-10 0 -14 2l-642 304l-208 -571h868q37 0 37 -41zM1339 293v976l-402 -190l-185 -508zM831 1029l-524 -247l370 -175z" />
+<glyph unicode="&#x22ed;" horiz-adv-x="1591" d="M1421 -118q0 -41 -37 -41h-898l-64 -177q-17 -47 -44 -47q-42 0 -42 38q0 15 8 37l54 149h-189q-39 0 -39 41t39 41h219l160 438l-361 -171q-4 -2 -16 -2q-41 0 -41 37v1112q0 37 41 37q12 0 16 -2l622 -294l154 423q17 46 43 46q42 0 42 -37q0 -15 -8 -37l-156 -430 l473 -224q24 -11 24 -37t-18 -35l-709 -336l-178 -488h868q37 0 37 -41zM1284 782l-389 183l-161 -444zM821 1001l-569 268v-976l376 178z" />
+<glyph unicode="&#x22ee;" horiz-adv-x="682" d="M420.5 -25.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM420 1347.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5zM420 660.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79 t79 32.5t80 -33.5z" />
+<glyph unicode="&#x22ef;" d="M1103 660.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5zM420.5 661.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM1786 660.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79 t79 32.5t80 -33.5z" />
+<glyph unicode="&#x22f0;" d="M420.5 -25.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM1786 1347.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5zM1103 660.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79 t79 32.5t80 -33.5z" />
+<glyph unicode="&#x22f1;" d="M421 1348.5q33 -32.5 33 -79t-33.5 -80t-79 -33.5t-79.5 33.5t-34 79t34 79t80 33.5t79 -32.5zM1104 661.5q33 -32.5 33 -79t-33.5 -80t-79 -33.5t-79.5 33.5t-34 79t34 79t80 33.5t79 -32.5zM1820 -105q0 -47 -33 -80t-80 -33t-80 33t-33 79.5t33.5 80t80 33.5t79.5 -33 t33 -80z" />
+<glyph unicode="&#x22f2;" horiz-adv-x="1634" d="M1464 41q0 -41 -37 -41h-294q-242 0 -423.5 153t-198.5 388h-304q-37 0 -37 41t37 41h304q17 235 198.5 388t423.5 153h294q37 0 37 -41t-37 -41h-288q-201 0 -373 -132t-172 -327h833q37 0 37 -41t-37 -41h-833q0 -195 172 -327t373 -132h288q37 0 37 -41z" />
+<glyph unicode="&#x22f3;" horiz-adv-x="1364" d="M1194 41q0 -41 -37 -41h-364q-253 0 -438 166t-185 416t185 416t438 166h364q37 0 37 -41t-37 -41h-358q-201 0 -373 -132t-172 -327h858v247q0 37 41 37t41 -37v-574q0 -39 -41 -39t-41 39v245h-858q0 -195 172 -327t373 -132h358q37 0 37 -41z" />
+<glyph unicode="&#x22f4;" horiz-adv-x="1164" d="M994 41q0 -41 -37 -41h-293q-201 0 -347.5 132t-146.5 330t146.5 330t347.5 132h293q37 0 37 -41t-37 -41h-293q-158 0 -275.5 -96.5t-134.5 -242.5h658v187q0 37 41 37t41 -37v-454q0 -39 -41 -39t-41 39v185h-658q17 -146 134.5 -242.5t275.5 -96.5h293q37 0 37 -41z " />
+<glyph unicode="&#x22f5;" horiz-adv-x="1364" d="M1194 41q0 -41 -37 -41h-364q-253 0 -438 166t-185 416t185 416t438 166h364q37 0 37 -41t-37 -41h-358q-201 0 -373 -132t-172 -327h903q37 0 37 -41t-37 -41h-903q0 -195 172 -327t373 -132h358q37 0 37 -41zM880.5 1572.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33 t-80 33t-33 80t33 80t79.5 33t80 -33.5z" />
+<glyph unicode="&#x22f6;" horiz-adv-x="1364" d="M1194 41q0 -41 -37 -41h-364q-253 0 -438 166t-185 416t185 416t438 166h364q37 0 37 -41t-37 -41h-358q-201 0 -373 -132t-172 -327h903q37 0 37 -41t-37 -41h-903q0 -195 172 -327t373 -132h358q37 0 37 -41zM1194 1482q0 -41 -37 -41h-948q-39 0 -39 41t39 41h948 q37 0 37 -41z" />
+<glyph unicode="&#x22f7;" horiz-adv-x="1164" d="M994 41q0 -41 -37 -41h-293q-201 0 -347.5 132t-146.5 330t146.5 330t347.5 132h293q37 0 37 -41t-37 -41h-293q-158 0 -275.5 -96.5t-134.5 -242.5h703q37 0 37 -41t-37 -41h-703q17 -146 134.5 -242.5t275.5 -96.5h293q37 0 37 -41zM994 1185q0 -41 -37 -41h-748 q-39 0 -39 41t39 41h748q37 0 37 -41z" />
+<glyph unicode="&#x22f8;" horiz-adv-x="1364" d="M1194 41q0 -41 -37 -41h-364q-253 0 -438 166t-185 416t185 416t438 166h364q37 0 37 -41t-37 -41h-358q-201 0 -373 -132t-172 -327h903q37 0 37 -41t-37 -41h-903q0 -195 172 -327t373 -132h358q37 0 37 -41zM1194 -318q0 -41 -37 -41h-948q-39 0 -39 41t39 41h948 q37 0 37 -41z" />
+<glyph unicode="&#x22f9;" horiz-adv-x="1364" d="M1194 41q0 -41 -37 -41h-364q-253 0 -438 166t-185 416t185 416t438 166h364q37 0 37 -41t-37 -41h-364q-164 0 -302 -84t-200 -225h866q37 0 37 -41t-37 -41h-893q-12 -53 -12 -109t12 -109h893q37 0 37 -41t-37 -41h-866q62 -141 200 -225t302 -84h364q37 0 37 -41z " />
+<glyph unicode="&#x22fa;" horiz-adv-x="1634" d="M1464 582q0 -41 -37 -41h-304q-17 -235 -198.5 -388t-423.5 -153h-294q-37 0 -37 41t37 41h288q201 0 373 132t172 327h-833q-37 0 -37 41t37 41h833q0 195 -172 327t-373 132h-288q-37 0 -37 41t37 41h294q242 0 423.5 -153t198.5 -388h304q37 0 37 -41z" />
+<glyph unicode="&#x22fb;" horiz-adv-x="1364" d="M1194 582q0 -250 -185 -416t-438 -166h-364q-37 0 -37 41t37 41h358q201 0 373 132t172 327h-858v-245q0 -39 -41 -39t-41 39v574q0 37 41 37t41 -37v-247h858q0 195 -172 327t-373 132h-358q-37 0 -37 41t37 41h364q253 0 438 -166t185 -416z" />
+<glyph unicode="&#x22fc;" horiz-adv-x="1164" d="M994 462q0 -198 -146.5 -330t-347.5 -132h-293q-37 0 -37 41t37 41h293q158 0 275.5 96.5t134.5 242.5h-658v-185q0 -39 -41 -39t-41 39v454q0 37 41 37t41 -37v-187h658q-17 146 -134.5 242.5t-275.5 96.5h-293q-37 0 -37 41t37 41h293q201 0 347.5 -132t146.5 -330z " />
+<glyph unicode="&#x22fd;" horiz-adv-x="1364" d="M1194 582q0 -250 -185 -416t-438 -166h-364q-37 0 -37 41t37 41h358q201 0 373 132t172 327h-903q-37 0 -37 41t37 41h903q0 195 -172 327t-373 132h-358q-37 0 -37 41t37 41h364q253 0 438 -166t185 -416zM1194 1482q0 -41 -39 -41h-948q-37 0 -37 41t37 41h948 q39 0 39 -41z" />
+<glyph unicode="&#x22fe;" horiz-adv-x="1164" d="M994 462q0 -198 -146.5 -330t-347.5 -132h-293q-37 0 -37 41t37 41h293q158 0 275.5 96.5t134.5 242.5h-703q-37 0 -37 41t37 41h703q-17 146 -134.5 242.5t-275.5 96.5h-293q-37 0 -37 41t37 41h293q201 0 347.5 -132t146.5 -330zM994 1185q0 -41 -39 -41h-748 q-37 0 -37 41t37 41h748q39 0 39 -41z" />
+<glyph unicode="&#x22ff;" horiz-adv-x="1547" d="M1377 41q0 -41 -39 -41h-1131q-37 0 -37 39v1345q0 37 37 37h1131q39 0 39 -41t-39 -41h-1086v-587h1060q37 0 37 -41t-37 -41h-1060v-588h1086q39 0 39 -41z" />
+<glyph unicode="&#x2300;" horiz-adv-x="1591" d="M1477 1159q0 -19 -11 -29l-192 -167q125 -164 125 -365q0 -249 -176.5 -426.5t-425 -177.5t-426.5 176l-185 -162q-16 -14 -30 -14q-41 0 -41 43q0 17 10 26l192 168q-122 162 -122 367q0 249 176.5 425.5t422 176.5t427.5 -176l184 162q16 14 31 14q41 0 41 -41z M1159 969q-151 149 -364 149t-366 -152.5t-153 -367.5q0 -178 103 -311zM1317 598q0 173 -105 309l-780 -682q153 -147 366 -147t366 153t153 367z" />
+<glyph unicode="&#x2301;" horiz-adv-x="2176" d="M2068 230q0 -41 -41 -41q-16 0 -26 10l-872 896v-869q0 -39 -41 -39q-19 0 -29 10l-939 965q-12 12 -12 31q0 41 41 41q16 0 26 -10l872 -895v868q0 39 41 39q19 0 29 -10l939 -965q12 -12 12 -31z" />
+<glyph unicode="&#x2302;" horiz-adv-x="1628" d="M1368 0h-1108v761l553 623l555 -623v-761zM1271 97v623l-458 512l-456 -512v-623h914z" />
+<glyph unicode="&#x2303;" horiz-adv-x="1235" d="M1095 1029q0 -18 -23 -18q-2 0 -6 2q-124 27 -251.5 122.5t-196.5 208.5q-69 -112 -197 -208t-252 -123q-4 -2 -6 -2q-23 0 -23 18v45q0 14 15 19q172 38 293.5 169t146.5 306q3 18 22.5 18t22.5 -18q25 -175 146.5 -306t293.5 -169q15 -5 15 -19v-45z" />
+<glyph unicode="&#x2304;" horiz-adv-x="1235" d="M1095 123q0 -14 -15 -19q-172 -38 -293.5 -169t-146.5 -306q-3 -18 -22.5 -18t-22.5 18q-25 175 -146.5 306t-293.5 169q-15 5 -15 19v45q0 18 23 18q2 0 6 -2q124 -27 252 -123t197 -208q69 113 196.5 208.5t251.5 122.5q4 2 6 2q23 0 23 -18v-45z" />
+<glyph unicode="&#x2305;" horiz-adv-x="1235" d="M1095 230q0 -18 -23 -18q-2 0 -6 2q-124 27 -251.5 122.5t-196.5 208.5q-69 -112 -197 -208t-252 -123q-4 -2 -6 -2q-23 0 -23 18v45q0 14 15 19q172 38 293.5 169t146.5 306q3 18 22.5 18t22.5 -18q25 -175 146.5 -306t293.5 -169q15 -5 15 -19v-45zM1141 1023 q0 -41 -68 -41h-910q-68 0 -68 41t68 41h910q68 0 68 -41z" />
+<glyph unicode="&#x2306;" horiz-adv-x="1235" d="M1141 1023q0 -41 -68 -41h-910q-68 0 -68 41t68 41h910q68 0 68 -41zM1095 230q0 -18 -23 -18q-2 0 -6 2q-124 27 -251.5 122.5t-196.5 208.5q-69 -112 -197 -208t-252 -123q-4 -2 -6 -2q-23 0 -23 18v45q0 14 15 19q172 38 293.5 169t146.5 306q3 18 22.5 18t22.5 -18 q25 -175 146.5 -306t293.5 -169q15 -5 15 -19v-45zM1141 1423q0 -41 -68 -41h-910q-68 0 -68 41t68 41h910q68 0 68 -41z" />
+<glyph unicode="&#x2307;" horiz-adv-x="810" d="M604 270q12 -12 12 -30.5t-12 -30.5l-310 -303l136 -136q16 -16 16 -32v-115q0 -39 -41 -39t-41 39v96l-158 156q-12 12 -12 30.5t12 30.5l310 303l-310 304q-12 12 -12 30.5t12 30.5l310 303l-310 303q-12 12 -12 31t12 31l158 155v94q0 39 41 39t41 -39v-112 q0 -17 -16 -33l-136 -135l310 -303q12 -12 12 -31t-12 -31l-310 -303z" />
+<glyph unicode="&#x2308;" horiz-adv-x="909" d="M864 1565q0 -41 -37 -41h-389v-1929q0 -37 -41 -37t-41 37v1974q0 37 39 37h432q37 0 37 -41z" />
+<glyph unicode="&#x2309;" horiz-adv-x="909" d="M551 -405q0 -37 -41 -37t-41 37v1929h-389q-37 0 -37 41t37 41h434q37 0 37 -37v-1974z" />
+<glyph unicode="&#x230a;" horiz-adv-x="909" d="M864 -401q0 -41 -37 -41h-432q-39 0 -39 37v1974q0 37 41 37t41 -37v-1929h389q37 0 37 -41z" />
+<glyph unicode="&#x230b;" horiz-adv-x="909" d="M551 -405q0 -37 -37 -37h-434q-37 0 -37 41t37 41h389v1929q0 37 41 37t41 -37v-1974z" />
+<glyph unicode="&#x230c;" horiz-adv-x="1024" d="M907 1380q0 -41 -37 -41h-673v-673q0 -39 -41 -39t-41 39v718q0 37 37 37h718q37 0 37 -41z" />
+<glyph unicode="&#x230d;" horiz-adv-x="1024" d="M907 666q0 -39 -41 -39t-41 39v673h-673q-37 0 -37 41t37 41h718q37 0 37 -37v-718z" />
+<glyph unicode="&#x230e;" horiz-adv-x="1024" d="M907 -4q0 -41 -37 -41h-718q-37 0 -37 37v719q0 39 41 39t41 -39v-674h673q37 0 37 -41z" />
+<glyph unicode="&#x230f;" horiz-adv-x="1024" d="M907 -8q0 -37 -37 -37h-718q-37 0 -37 41t37 41h673v674q0 39 41 39t41 -39v-719z" />
+<glyph unicode="&#x2310;" horiz-adv-x="1591" d="M1421 688q0 -41 -39 -41h-1013v-428q0 -37 -41 -37t-41 37v473q0 37 37 37h1058q39 0 39 -41z" />
+<glyph unicode="&#x2311;" horiz-adv-x="1036" d="M814 296h-592v592h592v-592zM715 395v394h-394v-394h394z" />
+<glyph unicode="&#x2312;" horiz-adv-x="1574" d="M1496 582q0 -67 -35.5 -67t-35.5 67q0 266 -186 452t-452 186t-452 -186t-186 -452q0 -67 -35.5 -67t-35.5 67q0 296 206.5 502t502.5 206t502.5 -206t206.5 -502z" />
+<glyph unicode="&#x2313;" horiz-adv-x="1574" d="M1496 582q0 -41 -68 -41h-1282q-68 0 -68 41q0 296 206.5 502t502.5 206t502.5 -206t206.5 -502zM787 1220q-255 0 -438 -172.5t-199 -424.5h1274q-16 252 -199 424.5t-438 172.5z" />
+<glyph unicode="&#x2314;" horiz-adv-x="1574" d="M1431 859q0 -24 -49 -47l-595 -278l-595 278q-49 23 -49 47q0 8 5 19q88 188 260 299t379 111t379 -111t260 -299q5 -11 5 -19zM787 1217q-174 0 -323 -89.5t-233 -243.5l556 -259l556 259q-84 154 -233 243.5t-323 89.5z" />
+<glyph unicode="&#x2315;" horiz-adv-x="1148" d="M926 592q0 -147 -102.5 -249.5t-249.5 -102.5q-116 0 -206 65l-264 -264q-31 -31 -50 -31q-39 0 -39 39q0 19 31 50l262 262q-86 98 -86 238t102.5 242.5t249.5 102.5t249.5 -102.5t102.5 -249.5zM753 413q74 74 74 179.5t-73.5 179.5t-179.5 74t-179.5 -74t-73.5 -179.5 t74 -179.5t179 -74t179 74z" />
+<glyph unicode="&#x2316;" horiz-adv-x="1155" d="M1115 640h-189q-13 -121 -101.5 -208.5t-209.5 -99.5v-191h-80v191q-120 13 -208 100.5t-101 207.5h-189v82h189q12 121 100 209t209 101v187h80v-187q121 -12 209.5 -100.5t101.5 -209.5h189v-82zM615 722h211q-12 80 -71.5 140t-139.5 71v-211zM535 722v211 q-80 -12 -138.5 -71.5t-70.5 -139.5h209zM615 640v-208q79 11 138.5 70t72.5 138h-211zM535 640h-209q13 -79 71.5 -137.5t137.5 -70.5v208z" />
+<glyph unicode="&#x2317;" horiz-adv-x="1155" d="M1116 375h-234v-235h-82v235h-444v-235h-82v235h-237v82h237v444h-237v82h237v236h82v-236h444v236h82v-236h234v-82h-234v-444h234v-82zM800 457v444h-444v-444h444z" />
+<glyph unicode="&#x2318;" horiz-adv-x="1155" d="M1077 479.5q64 -64.5 64 -155t-64 -154.5t-154.5 -64t-154.5 64t-64 155v136h-253v-136q0 -90 -64.5 -154.5t-154.5 -64.5t-154 64t-64 154.5t64 155t154 64.5h137v252h-137q-90 0 -154 64.5t-64 155t64 154.5t154.5 64t154.5 -64t64 -155v-136h253v136q0 91 64 155 t154.5 64t154.5 -64t64 -154.5t-64 -155t-154 -64.5h-137v-252h137q90 0 154 -64.5zM1059 1015q0 56 -40 96.5t-96.5 40.5t-96.5 -40t-40 -97v-136h137q56 0 96 40t40 96zM704 544v252h-253v-252h253zM1059 325q0 56 -40 96t-96 40h-137v-136q0 -56 40.5 -96.5t96.5 -40.5 t96 40.5t40 96.5zM369 879v136q0 56 -40.5 96.5t-96.5 40.5t-96 -40.5t-40 -96.5t40 -96t96 -40h137zM369 325v136h-137q-56 0 -96 -40t-40 -96t40 -96.5t96 -40.5t96.5 40.5t40.5 96.5z" />
+<glyph unicode="&#x2319;" horiz-adv-x="1591" d="M1421 582q0 -41 -39 -41h-1058q-37 0 -37 37v473q0 37 41 37t41 -37v-428h1013q39 0 39 -41z" />
+<glyph unicode="&#x231a;" horiz-adv-x="1628" d="M1322 1175q209 -209 209 -507.5t-209 -507.5t-508 -209t-508 209t-209 507.5t209.5 507.5t508 209t507.5 -209zM1272.5 209.5q188.5 188.5 188.5 458t-188.5 458t-458 188.5t-458.5 -188.5t-189 -458t188.5 -458t458.5 -188.5t458.5 188.5zM1255 1108.5 q181 -181.5 181 -441t-181 -441t-441 -181.5t-441 181.5t-181 440.5t181.5 441t441 182t440.5 -181.5zM1423 657q11 0 11 10.5t-11 10.5h-39q-3 143 -70 266l33 19q9 5 4 14q-6 9 -15 4l-33 -19q-73 122 -195 194l20 34q5 9 -4 14t-14 -4l-20 -33q-123 68 -265 70l-1 40 q0 10 -10.5 10t-10.5 -10l1 -40q-143 -2 -266 -70l-20 33q-5 9 -14 4t-4 -14l20 -34q-122 -73 -195 -194l-33 19q-9 5 -14.5 -4t3.5 -14l34 -19q-68 -124 -71 -266h-39q-11 0 -11 -10.5t11 -10.5h39q3 -143 70 -266l-33 -19q-9 -5 -3.5 -14.5t14.5 -3.5l33 19 q73 -122 195 -195l-20 -33q-5 -9 4 -14.5t14 4.5l20 33q123 -68 266 -70l-1 -40q0 -10 10.5 -10t10.5 10l1 40q142 2 265 70l20 -33q5 -10 14 -4.5t4 14.5l-20 33q122 73 195 195l33 -19q9 -6 14.5 3.5t-3.5 14.5l-33 19q67 123 70 266h39zM1280 662h-164q-2 -76 -37 -142 l141 -81q4 -3 1.5 -7t-6.5 -2l-141 82q-39 -66 -104 -104l81 -142q3 -4 -1.5 -6.5t-6.5 1.5l-82 142q-66 -36 -142 -37v-165q0 -4 -5 -4t-5 4v165q-76 1 -142 37l-82 -142q-2 -4 -6.5 -1.5t-1.5 6.5l81 142q-46 27 -79 69q-25 -17 -142 -33l-24 -14q-5 3 -5 9l24 13l46 60 q27 33 54 47q-19 50 -20 103h-164q-4 0 -5 5q1 5 5 5h164q2 77 38 142l-142 82q-4 3 -2 7q3 4 7 2l142 -82q38 65 104 104l-82 141q-3 5 1.5 7.5t6.5 -2.5l82 -141q51 28 110 35q-4 59 -4 123.5t41 132.5q41 -68 41 -132.5t-4 -123.5q59 -7 110 -35l82 141q2 5 6.5 2.5 t1.5 -7.5l-81 -141q65 -39 104 -104l141 82q4 2 6.5 -2t-1.5 -7l-141 -82q35 -65 37 -142h164q4 0 4 -5t-4 -5zM1021.5 460q84.5 85 84.5 202.5t-73 199.5t-183 95q-6 -103 -27 -253q29 -5 29 -37q0 -37 -38 -37q-16 0 -26 9q-67 -58 -201 -157q87 -107 218.5 -107t216 85z M522 667q0 -54 18 -103q55 30 237 95q-1 4 -1 8q0 32 29 37q-21 150 -27 253q-110 -13 -183 -95t-73 -195z" />
+<glyph unicode="&#x231b;" horiz-adv-x="1354" d="M1254 -178q0 -242 -577 -242t-577 242v91q0 126 30 196t208.5 261t178.5 217.5t-180 213t-208.5 260.5t-28.5 222v82q0 221 577 221t577 -221v-82q0 -148 -28.5 -222t-208.5 -260.5t-180 -213t178.5 -217.5t208.5 -261t30 -196v-91zM1158 1407q0 66 -211 97 q-129 18 -270 18t-270 -18q-211 -31 -211 -97q0 -45 154 -85t327 -40t327 40t154 85zM1191 -158v76q0 110 -25.5 169t-209 248.5t-183.5 248t183 249.5t208.5 244t25.5 136v118q-182 -113 -513 -113t-513 113v-118q0 -83 25.5 -136t208.5 -244t183 -249.5t-183.5 -248 t-209 -248.5t-25.5 -169v-76q0 -78 62 -117q129 -81 452 -81t452 81q62 39 62 117zM677 959q184 0 376 122q-41 -67 -118 -151l-132 -139q-36 -39 -88 -109q-16 -31 -23 -88l-15 -107l-15 107q-7 57 -22 87t-85 105l-136 144q-77 84 -118 151q192 -122 376 -122zM677 -265 q-283 0 -448 83q17 64 113 124q18 11 114.5 60t172.5 98q22 22 48 87q26 -65 47.5 -86.5t145.5 -84.5t142 -74q96 -60 113 -124q-165 -83 -448 -83z" />
+<glyph unicode="&#x231c;" horiz-adv-x="1024" d="M907 1380q0 -41 -37 -41h-673v-673q0 -39 -41 -39t-41 39v718q0 37 37 37h718q37 0 37 -41z" />
+<glyph unicode="&#x231d;" horiz-adv-x="1024" d="M907 666q0 -39 -41 -39t-41 39v673h-673q-37 0 -37 41t37 41h718q37 0 37 -37v-718z" />
+<glyph unicode="&#x231e;" horiz-adv-x="1024" d="M907 -4q0 -41 -37 -41h-718q-37 0 -37 37v719q0 39 41 39t41 -39v-674h673q37 0 37 -41z" />
+<glyph unicode="&#x231f;" horiz-adv-x="1024" d="M907 -8q0 -37 -37 -37h-718q-37 0 -37 41t37 41h673v674q0 39 41 39t41 -39v-719z" />
+<glyph unicode="&#x2320;" horiz-adv-x="1329" d="M1329 889q0 -105 -108 -105q-46 0 -75.5 29.5t-29.5 75.5q0 95 95 107q-67 54 -167 54q-119 0 -177 -169q-30 -88 -51 -288t-21 -467v-568h-216v242q0 214 31.5 530t91.5 479q109 297 342 297q107 0 196 -58t89 -159zM0 1606zM1329 -442z" />
+<glyph unicode="&#x2321;" horiz-adv-x="1329" d="M582 1145l-3 209v252h216v-318q0 -304 -65 -748q-34 -232 -125 -382q-122 -200 -322 -200q-108 0 -195.5 57.5t-87.5 160.5q0 46 29.5 75.5t75.5 29.5q107 0 107 -105q0 -97 -97 -108q66 -53 168 -53q135 0 200 163q55 138 77 468t22 499zM0 1606zM1329 -442z" />
+<glyph unicode="&#x2322;" horiz-adv-x="1410" d="M1410 403q0 -23 -25 -23q-11 0 -19 10q-25 33 -79 95q-217 219 -582 219t-582 -219l-79 -95q-8 -10 -19 -10q-25 0 -25 23q0 8 5 16q115 172 302.5 269t397.5 97t397.5 -97t302.5 -269q5 -8 5 -16z" />
+<glyph unicode="&#x2323;" horiz-adv-x="1410" d="M1410 762q0 -8 -5 -16q-115 -172 -302.5 -269t-397.5 -97t-397.5 97t-302.5 269q-5 8 -5 16q0 23 25 23q11 0 19 -10q25 -33 79 -95q217 -219 582 -219t582 219l79 95q8 10 19 10q25 0 25 -23z" />
+<glyph unicode="&#x2324;" horiz-adv-x="1628" d="M1442 1023q0 -46 -73 -46h-390q-73 0 -73 46t73 46h390q73 0 73 -46zM722 1023q0 -46 -73 -46h-390q-73 0 -73 46t73 46h390q73 0 73 -46zM1297 230q0 -23 -28 -23h-3q-1 0 -5 2q-123 27 -249.5 121t-196.5 206q-71 -112 -198 -206q-121 -89 -255 -123h-2q-28 0 -28 23 v45q0 18 18 24q171 38 291.5 167.5t145.5 303.5q3 22 27 22t27 -22q25 -174 145.5 -303.5t291.5 -167.5q19 -6 19 -24v-45z" />
+<glyph unicode="&#x2325;" horiz-adv-x="1628" d="M1362 1023q0 -46 -73 -46h-320q-73 0 -73 46t73 46h320q73 0 73 -46zM1362 46q0 -46 -73 -46h-350q-50 0 -68 63l-260 914h-272q-73 0 -73 46t73 46h333q49 0 67 -63l261 -914h289q73 0 73 -46z" />
+<glyph unicode="&#x2326;" horiz-adv-x="2327" d="M1641 0h-1520q-54 0 -54 54v1220q0 52 54 52h1520q23 0 60 -38l569 -568q30 -30 30 -58t-30 -58l-569 -569q-35 -35 -60 -35zM173 1220v-1114h1463l556 556l-558 558h-1461zM1417 125q-15 -15 -35.5 -15t-54.5 34l-447 447l-447 -447q-34 -34 -54.5 -34t-35.5 15 t-15 35.5t34 54.5l447 447l-447 447q-34 34 -34 54.5t15 35.5t35.5 15t54.5 -34l447 -447l447 447q34 34 54.5 34t35.5 -15t15 -35.5t-34 -54.5l-447 -447l447 -447q34 -34 34 -54.5t-15 -35.5z" />
+<glyph unicode="&#x2327;" horiz-adv-x="1760" d="M1693 54q0 -54 -52 -54h-1520q-54 0 -54 54v1220q0 52 54 52h1520q52 0 52 -52v-1220zM1587 106v1114h-1414v-1114h1414zM1417 125q-15 -15 -35.5 -15t-54.5 34l-447 447l-447 -447q-34 -34 -54.5 -34t-35.5 15t-15 35.5t34 54.5l447 447l-447 447q-34 34 -34 54.5 t15 35.5t35.5 15t54.5 -34l447 -447l447 447q34 34 54.5 34t35.5 -15t15 -35.5t-34 -54.5l-447 -447l447 -447q34 -34 34 -54.5t-15 -35.5z" />
+<glyph unicode="&#x2328;" horiz-adv-x="2196" d="M2062 197q0 -83 -58.5 -141.5t-141.5 -58.5h-1528q-83 0 -141.5 58.5t-58.5 141.5v639q0 83 58.5 141.5t141.5 58.5h1528q83 0 141.5 -58.5t58.5 -141.5v-639zM1962 197v639q0 41 -29.5 70.5t-70.5 29.5h-1528q-41 0 -70.5 -29.5t-29.5 -70.5v-639q0 -41 29.5 -70.5 t70.5 -29.5h1528q41 0 70.5 29.5t29.5 70.5zM1726 757q0 -34 -34 -34h-67q-34 0 -34 34v56q0 34 34 34h67q34 0 34 -34v-56zM1846 627q0 -34 -34 -34h-67q-34 0 -34 34v56q0 34 34 34h67q34 0 34 -34v-56zM1476 757q0 -34 -34 -34h-67q-34 0 -34 34v56q0 34 34 34h67 q34 0 34 -34v-56zM1596 627q0 -34 -34 -34h-67q-34 0 -34 34v56q0 34 34 34h67q34 0 34 -34v-56zM1726 497q0 -34 -34 -34h-67q-34 0 -34 34v56q0 34 34 34h67q34 0 34 -34v-56zM1846 367q0 -34 -34 -34h-67q-34 0 -34 34v56q0 34 34 34h67q34 0 34 -34v-56zM1226 757 q0 -34 -34 -34h-67q-34 0 -34 34v56q0 34 34 34h67q34 0 34 -34v-56zM1346 627q0 -34 -34 -34h-67q-34 0 -34 34v56q0 34 34 34h67q34 0 34 -34v-56zM1476 497q0 -34 -34 -34h-67q-34 0 -34 34v56q0 34 34 34h67q34 0 34 -34v-56zM1596 367q0 -34 -34 -34h-67q-34 0 -34 34 v56q0 34 34 34h67q34 0 34 -34v-56zM1726 237q0 -34 -34 -34h-67q-34 0 -34 34v56q0 34 34 34h67q34 0 34 -34v-56zM976 757q0 -34 -34 -34h-67q-34 0 -34 34v56q0 34 34 34h67q34 0 34 -34v-56zM1096 627q0 -34 -34 -34h-67q-34 0 -34 34v56q0 34 34 34h67q34 0 34 -34v-56 zM1226 497q0 -34 -34 -34h-67q-34 0 -34 34v56q0 34 34 34h67q34 0 34 -34v-56zM1346 367q0 -34 -34 -34h-67q-34 0 -34 34v56q0 34 34 34h67q34 0 34 -34v-56zM726 757q0 -34 -34 -34h-67q-34 0 -34 34v56q0 34 34 34h67q34 0 34 -34v-56zM846 627q0 -34 -34 -34h-67 q-34 0 -34 34v56q0 34 34 34h67q34 0 34 -34v-56zM976 497q0 -34 -34 -34h-67q-34 0 -34 34v56q0 34 34 34h67q34 0 34 -34v-56zM1096 367q0 -34 -34 -34h-67q-34 0 -34 34v56q0 34 34 34h67q34 0 34 -34v-56zM1476 237q0 -34 -34 -34h-817q-34 0 -34 34v56q0 34 34 34h817 q34 0 34 -34v-56zM476 757q0 -34 -34 -34h-67q-34 0 -34 34v56q0 34 34 34h67q34 0 34 -34v-56zM596 627q0 -34 -34 -34h-67q-34 0 -34 34v56q0 34 34 34h67q34 0 34 -34v-56zM726 497q0 -34 -34 -34h-67q-34 0 -34 34v56q0 34 34 34h67q34 0 34 -34v-56zM846 367 q0 -34 -34 -34h-67q-34 0 -34 34v56q0 34 34 34h67q34 0 34 -34v-56zM476 497q0 -34 -34 -34h-67q-34 0 -34 34v56q0 34 34 34h67q34 0 34 -34v-56zM596 367q0 -34 -34 -34h-67q-34 0 -34 34v56q0 34 34 34h67q34 0 34 -34v-56zM476 237q0 -34 -34 -34h-67q-34 0 -34 34v56 q0 34 34 34h67q34 0 34 -34v-56z" />
+<glyph unicode="&#x2329;" horiz-adv-x="795" d="M680 -401q0 -41 -41 -41q-28 0 -37 25q-377 996 -377 1000t377 998q9 25 37 25q41 0 41 -41q0 -9 -371 -983q371 -974 371 -983z" />
+<glyph unicode="&#x232a;" horiz-adv-x="795" d="M567 598q2 -5 2 -15t-374 -1000q-9 -25 -39 -25q-41 0 -41 41q0 3 370 983q-370 980 -370 983q0 41 41 41q30 0 39 -25z" />
+<glyph unicode="&#x232b;" horiz-adv-x="2327" d="M2300 52q0 -52 -54 -52h-1520q-23 0 -61 38l-568 568q-30 30 -30 58t30 58l568 569q36 35 61 35h1520q54 0 54 -54v-1220zM2194 106v1114h-1463l-556 -556l558 -558h1461zM2024 1201q15 -15 15 -35.5t-34 -54.5l-447 -447l447 -447q34 -34 34 -54.5t-15 -35.5t-35.5 -15 t-54.5 34l-447 447l-447 -447q-34 -34 -54.5 -34t-35.5 15t-15 35.5t34 54.5l447 447l-447 447q-34 34 -34 54.5t15 35.5t35.5 15t54.5 -34l447 -447l447 447q34 34 54.5 34t35.5 -15z" />
+<glyph unicode="&#x232c;" horiz-adv-x="1864" d="M1694 166q0 -24 -21 -36l-721 -416q-5 -3 -20 -3t-20 3l-721 416q-21 12 -21 36v832q0 24 21 36l721 416q5 3 20 3t20 -3l721 -416q21 -12 21 -36v-832zM1612 190v784l-680 393l-680 -393v-784l680 -393zM1506 914q0 -43 -40 -43q-12 0 -22 6l-512 296q-21 12 -21 35 q0 43 40 43q10 0 22 -7l512 -296q21 -12 21 -34zM1506 250q0 -22 -21 -34l-512 -296q-12 -7 -22 -7q-40 0 -40 43q0 23 21 35l512 296q10 6 22 6q40 0 40 -43zM420 286q0 -41 -41 -41t-41 41v592q0 41 41 41t41 -41v-592z" />
+<glyph unicode="&#x232d;" horiz-adv-x="1628" d="M1589 1140l-378 -1038l-94 34l378 1038zM999 189q-92 -42 -177 -42t-163 28q-173 63 -251 229q-42 91 -42 184q0 76 28 155q63 174 229 252q92 43 177 43t163 -29q173 -63 251 -229q43 -92 43 -177t-29 -163q-63 -173 -229 -251zM509 1065l-378 -1038l-94 34l378 1038z M1155 594q0 106 -61 194.5t-165 126.5q-58 21 -119 21q-106 0 -195 -61.5t-126 -164.5q-21 -58 -21 -119q0 -106 61 -195t165 -126q60 -22 125.5 -22t137.5 33q129 60 177 194q21 58 21 119z" />
+<glyph unicode="&#x232e;" horiz-adv-x="1628" d="M1614 561q0 -52 -49 -52q-13 0 -41 10q-23 -201 -173.5 -336t-352.5 -135q-175 0 -317 103.5t-194 269.5q-165 -118 -303 -315l-76 -118q-17 -25 -42 -25q-52 0 -52 49q0 13 8 27q178 313 443 488q-2 21 -2 51q0 220 155 377t369 157t368.5 -140.5t170.5 -347.5 q52 -16 56 -19q32 -15 32 -44zM1279 915.5q-124 104.5 -295.5 104.5t-299.5 -129t-129 -310q229 121 504 121q178 0 370 -50q-26 159 -150 263.5zM1060 602q-270 0 -492 -129q36 -147 156.5 -240t282.5 -93t288 117.5t139 289.5q-197 55 -374 55z" />
+<glyph unicode="&#x232f;" horiz-adv-x="1628" d="M1237 789q0 -41 -68 -41h-710q-68 0 -68 41t68 41h710q68 0 68 -41zM1556 453h-1484v73h1484v-73zM1237 189q0 -41 -68 -41h-710q-68 0 -68 41t68 41h710q68 0 68 -41z" />
+<glyph unicode="&#x2330;" horiz-adv-x="1628" d="M1496 976l-280 -976h-1084l280 976h99l-252 -877h887l252 877h98z" />
+<glyph unicode="&#x2331;" horiz-adv-x="1628" d="M1460 640h-590q-13 -121 -101.5 -208.5t-208.5 -99.5v-191h-80v191q-120 13 -215.5 108.5t-95.5 241.5t95.5 241.5t215.5 108.5v187h80v-187q121 -12 209.5 -100.5t100.5 -209.5h590v-82zM560 722h211q-12 80 -71.5 140t-139.5 71v-211zM560 640v-208q79 11 138.5 70 t71.5 138h-210zM480 933q-79 -12 -145.5 -79t-66.5 -171.5t74 -178.5q59 -60 138 -72v501z" />
+<glyph unicode="&#x2332;" horiz-adv-x="1628" d="M1406 592l-1184 -592v1184zM321 642h766l-766 383v-383zM321 543v-383l766 383h-766z" />
+<glyph unicode="&#x2333;" horiz-adv-x="1628" d="M178 540v637l1272 -637h-1272zM278 640h749l-749 375v-375z" />
+<glyph unicode="&#x2334;" horiz-adv-x="1628" d="M1406 0h-1184v1076h99v-977h987v977h98v-1076z" />
+<glyph unicode="&#x2335;" horiz-adv-x="1628" d="M1464 923l-649 -919l-651 919h132l519 -732l517 732h132z" />
+<glyph unicode="&#x2336;" horiz-adv-x="1591" d="M1479 41q0 -41 -37 -41h-1288q-39 0 -39 41t39 41h602v1200h-602q-39 0 -39 41t39 41h1288q37 0 37 -41t-37 -41h-604v-1200h604q37 0 37 -41z" />
+<glyph unicode="&#x2337;" horiz-adv-x="992" d="M888 -72q0 -39 -37 -39h-708q-39 0 -39 39v1310q0 37 39 37h708q37 0 37 -37v-1310zM806 -29v1222h-620v-1222h620z" />
+<glyph unicode="&#x2338;" horiz-adv-x="1591" d="M1488 -72q0 -39 -37 -39h-1308q-39 0 -39 39v1510q0 37 39 37h1308q37 0 37 -37v-1510zM1406 925v468h-1220v-468h1220zM1406 521v322h-1220v-322h1220zM1406 -29v468h-1220v-468h1220z" />
+<glyph unicode="&#x2339;" horiz-adv-x="1591" d="M1488 -72q0 -39 -37 -39h-1308q-39 0 -39 39v1510q0 37 39 37h1308q37 0 37 -37v-1510zM1406 723v670h-1220v-670h1220zM1406 -29v670h-1220v-670h1220zM890 1220q40 -40 40 -95t-40.5 -95.5t-95 -40.5t-93.5 40.5t-39 95.5t38.5 95t94 40t95.5 -40zM930 240 q0 -55 -40.5 -95.5t-95 -40.5t-93.5 40.5t-39 96t38.5 95t94 39.5t95.5 -40t40 -95z" />
+<glyph unicode="&#x233a;" horiz-adv-x="1591" d="M1488 -72q0 -39 -37 -39h-1308q-39 0 -39 39v1510q0 37 39 37h1308q37 0 37 -37v-1510zM1406 1393h-1220v-623l583 582q26 27 52 0l585 -585v626zM1376 681l-581 582l-580 -580l581 -582zM1406 -29v624l-582 -582q-11 -11 -28 -11t-27 11l-583 583v-625h1220z" />
+<glyph unicode="&#x233b;" horiz-adv-x="1591" d="M1488 -72q0 -39 -37 -39h-1308q-39 0 -39 39v1510q0 37 39 37h1308q37 0 37 -37v-1510zM1406 -29v1422h-1220v-1422h1220zM1016 903q92 -92 92 -221.5t-91.5 -221t-221.5 -91.5t-221.5 91.5t-91.5 221.5t91.5 221.5t221 91.5t221.5 -92zM946 531q62 62 62 150t-63 151 t-151 63t-150 -62t-62 -151t62 -151t151 -62t151 62z" />
+<glyph unicode="&#x233c;" horiz-adv-x="1591" d="M1488 -72q0 -39 -37 -39h-1308q-39 0 -39 39v1510q0 37 39 37h1308q37 0 37 -37v-1510zM1406 1393h-1220v-645q25 232 199 389.5t411 157.5t413 -161.5t197 -396.5v656zM1158.5 319q150.5 150 150.5 362t-151.5 363t-363.5 151t-361.5 -150t-149.5 -363t149.5 -363 t362.5 -150t363.5 150zM1406 -29v655q-21 -236 -196 -396.5t-413 -160.5t-412 157.5t-199 389.5v-645h1220z" />
+<glyph unicode="&#x233d;" horiz-adv-x="1591" d="M1320 1079q198 -209 198 -496.5t-198 -497t-483 -225.5v-126q0 -62 -41 -62t-41 62v126q-285 17 -483 226t-198 496.5t197.5 496t483.5 225.5v127q0 61 41 61t41 -61v-127q285 -16 483 -225zM1262 143.5q174 185.5 174 439t-174 438.5t-425 201v-1280q251 16 425 201.5z M329.5 1020.5q-173.5 -184.5 -173.5 -438t174 -438.5t425 -202v1280q-252 -17 -425.5 -201.5z" />
+<glyph unicode="&#x233e;" horiz-adv-x="1578" d="M1222 582q0 -180 -126.5 -306.5t-306.5 -126.5t-306.5 126.5t-126.5 306.5t126.5 306.5t306.5 126.5t306.5 -126.5t126.5 -306.5zM1122 582q0 139 -97 236t-236 97t-236 -97t-97 -236t97 -236t236 -97t236 97t97 236zM1538 582q0 -312 -218.5 -530.5t-530.5 -218.5 t-530.5 218.5t-218.5 530.5t218.5 530.5t530.5 218.5t530.5 -218.5t218.5 -530.5zM1438 582q0 270 -189.5 459.5t-459.5 189.5t-459.5 -189.5t-189.5 -459.5t189.5 -459.5t459.5 -189.5t459.5 189.5t189.5 459.5z" />
+<glyph unicode="&#x233f;" horiz-adv-x="1305" d="M1267 582q0 -41 -37 -41h-558l-174 -478q-17 -47 -46 -47q-40 0 -40 37q0 16 8 38l164 450h-528q-37 0 -37 41t37 41h558l175 479q17 46 45 46q40 0 40 -37q0 -15 -8 -37l-165 -451h529q37 0 37 -41z" />
+<glyph unicode="&#x2340;" horiz-adv-x="1305" d="M1267 582q0 -41 -37 -41h-528l164 -450q8 -22 8 -38q0 -37 -40 -37q-29 0 -46 47l-174 478h-558q-37 0 -37 41t37 41h529l-165 451q-8 22 -8 37q0 37 40 37q28 0 45 -46l175 -479h558q37 0 37 -41z" />
+<glyph unicode="&#x2341;" horiz-adv-x="1591" d="M1488 -72q0 -39 -37 -39h-1308q-39 0 -39 39v1310q0 37 39 37h1308q37 0 37 -37v-1310zM1406 -29v1222h-1220v-1222h1220zM1382 1111l-1114 -1114q-13 -14 -27 -14t-29 15t-15 30q0 14 13 27l1114 1114q12 12 25 12q15 0 30 -15t15 -30q0 -13 -12 -25z" />
+<glyph unicode="&#x2342;" horiz-adv-x="1591" d="M1488 -72q0 -39 -37 -39h-1308q-39 0 -39 39v1310q0 37 39 37h1308q37 0 37 -37v-1310zM1406 -29v1222h-1220v-1222h1220zM1381 55q14 -14 14 -28t-15 -29t-29 -15t-28 14l-1113 1113q-13 13 -13 26q0 14 15 29t30 15q13 0 26 -12z" />
+<glyph unicode="&#x2343;" horiz-adv-x="1591" d="M1488 -72q0 -39 -37 -39h-1308q-39 0 -39 39v1310q0 37 39 37h1308q37 0 37 -37v-1310zM1406 87v990l-1049 -495zM1406 -29v27l-1159 547q-27 13 -27 37t27 37l1159 547v27h-1220v-1222h1220z" />
+<glyph unicode="&#x2344;" horiz-adv-x="1591" d="M1488 -72q0 -39 -39 -39h-1308q-37 0 -37 39v1310q0 37 37 37h1308q39 0 39 -37v-1310zM1406 -29v1222h-1220v-22l1169 -552q27 -13 27 -37t-27 -37l-1169 -552v-22h1220zM1245 582l-1059 499v-998z" />
+<glyph unicode="&#x2345;" d="M1931 582q0 -41 -39 -41h-728v-942q0 -41 -41 -41t-41 41v942h-744q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41q-14 0 -20 19q-33 175 -142 303.5t-278 192.5q-16 6 -16 20t16 23l46 18q282 122 363 428q3 16 9.5 40.5t26.5 26.5q-9 -1 36 -1q21 0 21 -27 q0 -4 -7 -35q-59 -266 -288 -432h744v944q0 39 41 39t41 -39v-944h728q39 0 39 -41z" />
+<glyph unicode="&#x2346;" d="M1931 582q0 -14 -16 -20q-259 -98 -369 -334q-23 -49 -33 -90l-18 -72q-6 -19 -20 -19h-41q-21 3 -21 27q0 4 7 35q60 270 288 432h-544v-942q0 -41 -41 -41t-41 41v942h-928q-39 0 -39 41t39 41h928v944q0 39 41 39t41 -39v-944h544q-229 166 -288 432q-7 31 -7 35 q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5t230.5 -170.5q16 -5 46 -18q16 -9 16 -23z" />
+<glyph unicode="&#x2347;" horiz-adv-x="1591" d="M1488 -72q0 -39 -37 -39h-1308q-39 0 -39 39v1510q0 37 39 37h1308q37 0 37 -37v-1510zM1406 -29v640h-838q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41q-14 0 -20 19q-33 175 -142 303.5t-278 192.5q-16 6 -16 20t16 23l46 18q282 122 363 428q3 16 9.5 40.5 t26.5 26.5q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-59 -266 -288 -432h838v700h-1220v-1422h1220z" />
+<glyph unicode="&#x2348;" horiz-adv-x="1591" d="M1488 -72q0 -39 -39 -39h-1308q-37 0 -37 39v1510q0 37 37 37h1308q39 0 39 -37v-1510zM1406 -29v1422h-1220v-700h838q-229 166 -288 432q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5t230.5 -170.5q16 -5 46 -18q16 -9 16 -23t-16 -20 q-259 -98 -369 -334q-23 -49 -33 -90l-18 -72q-6 -19 -20 -19h-41q-21 3 -21 27q0 4 7 35q60 270 288 432h-838v-640h1220z" />
+<glyph unicode="&#x2349;" horiz-adv-x="1591" d="M471 1228q152 77 333 77t350 -95.5t266.5 -264.5t97.5 -356t-85.5 -349t-240.5 -263l64 -109q15 -27 15 -44.5t-15.5 -26.5t-25.5 -9q-23 0 -46 39l-63 109q-152 -76 -332.5 -76t-350 95t-267 264.5t-97.5 356t85.5 348t240.5 263.5l-64 110q-15 26 -15 43.5t15.5 26.5 t25.5 9q23 0 45 -38zM1151 48q136 90 210.5 233t74.5 308t-86.5 315t-236.5 234.5t-309 84.5t-292 -66zM441 1115q-136 -90 -210.5 -232t-74.5 -307t86.5 -315t236.5 -234.5t309 -84.5t292 66z" />
+<glyph unicode="&#x234a;" horiz-adv-x="1479" d="M1449 225q0 -41 -37 -41h-1345q-39 0 -39 41t39 41h631v1031q0 37 41 37t41 -37v-1031h632q37 0 37 -41zM1449 -172q0 -41 -37 -41h-1345q-39 0 -39 41t39 41h1345q37 0 37 -41z" />
+<glyph unicode="&#x234b;" horiz-adv-x="1694" d="M1596 17q0 -17 -24 -17h-701v-341q0 -41 -41 -41t-41 41v341h-667q-24 0 -24 17q0 6 4 14l687 1385v91q0 39 41 39t41 -39v-21l721 -1455q4 -8 4 -14zM871 146h475l-475 960v-960zM789 146v1126l-558 -1126h558z" />
+<glyph unicode="&#x234c;" horiz-adv-x="1591" d="M1488 -72q0 -39 -37 -39h-1308q-39 0 -39 39v1310q0 37 39 37h1308q37 0 37 -37v-1310zM1406 1193h-1220v-770q168 45 318 187q203 192 259 423q3 17 13 50q6 17 20 17t18.5 -12.5t17.5 -64.5q53 -220 253 -410q153 -145 321 -190v770zM1406 -29v361q-446 163 -610 528 q-164 -365 -610 -528v-361h1220z" />
+<glyph unicode="&#x234d;" horiz-adv-x="1591" d="M1488 -72q0 -39 -37 -39h-1308q-39 0 -39 39v1510q0 37 39 37h1308q37 0 37 -37v-1510zM1406 -29v1422h-1220v-1422h1220zM1319 74q0 -26 -27 -26h-988q-28 0 -28 26q0 6 4 15l473 1121q15 36 45 36t45 -36l472 -1121q4 -9 4 -15zM1119 189l-361 858l-361 -858h722z" />
+<glyph unicode="&#x234e;" horiz-adv-x="1591" d="M1479 41q0 -41 -37 -41h-1288q-39 0 -39 41t39 41h602v241q-160 15 -272.5 135.5t-112.5 284t111.5 286.5t273.5 138v160q0 37 41 37t41 -37v-160q161 -17 271 -139.5t110 -285t-111 -282.5t-270 -137v-241h604q37 0 37 -41zM1142 743q0 130 -87.5 230t-216.5 116v-688 q127 16 215.5 114t88.5 228zM537 974.5q-89 -100.5 -89 -232t89.5 -229.5t218.5 -113v690q-130 -15 -219 -115.5z" />
+<glyph unicode="&#x234f;" horiz-adv-x="1652" d="M1647 482q0 -41 -39 -41h-744v-728q0 -39 -41 -39t-41 39v728h-742q-41 0 -41 41t41 41h742v744q-162 -228 -432 -288q-31 -7 -35 -7q-24 0 -27 21v41q0 14 19 20q175 33 303.5 142t192.5 278q6 16 20 16t23 -16l18 -46q122 -282 428 -363q16 -3 47 -11q18 -5 20 -25 q-1 9 -1 -36q0 -21 -27 -21q-4 0 -35 7q-266 59 -432 288v-744h744q39 0 39 -41z" />
+<glyph unicode="&#x2350;" horiz-adv-x="1591" d="M1488 -72q0 -39 -37 -39h-1308q-39 0 -39 39v1510q0 37 39 37h1308q37 0 37 -37v-1510zM1406 -29v1422h-1220v-1422h569v1156q-163 -228 -432 -288q-32 -7 -35 -7q-24 0 -28 21q1 -3 1 41q0 14 19 20q176 35 305 143q127 108 191 277q6 16 20 16t23 -16q5 -16 18 -46 q95 -221 314 -323q49 -23 89 -33l72 -18q17 -5 20 -25q-1 9 -1 -36q0 -21 -27 -21q-4 0 -35 7q-266 59 -432 288v-1156h569z" />
+<glyph unicode="&#x2351;" horiz-adv-x="1479" d="M1449 1293q0 -41 -37 -41h-1345q-39 0 -39 41t39 41h1345q37 0 37 -41zM1449 896q0 -41 -37 -41h-632v-1031q0 -37 -41 -37t-41 37v1031h-631q-39 0 -39 41t39 41h1345q37 0 37 -41z" />
+<glyph unicode="&#x2352;" horiz-adv-x="1694" d="M1596 1373q0 -6 -4 -14l-687 -1385v-317q0 -39 -41 -39t-41 39v247l-721 1455q-4 8 -4 14q0 17 24 17h701v115q0 41 41 41t41 -41v-115h667q24 0 24 -17zM905 1244v-1126l558 1126h-558zM823 1244h-475l475 -960v960z" />
+<glyph unicode="&#x2353;" horiz-adv-x="1591" d="M1488 -74q0 -37 -39 -37h-1308q-37 0 -37 37v1310q0 39 37 39h1308q39 0 39 -39v-1310zM1406 1193h-1220v-361q446 -163 610 -528q164 365 610 528v361zM1406 -29v770q-168 -45 -318 -187q-203 -192 -259 -423q-3 -17 -13 -50q-6 -17 -20 -17t-18.5 12.5t-17.5 64.5 q-53 220 -253 410q-153 145 -321 190v-770h1220z" />
+<glyph unicode="&#x2354;" horiz-adv-x="1591" d="M1488 -74q0 -37 -39 -37h-1308q-37 0 -37 37v1510q0 39 37 39h1308q39 0 39 -39v-1510zM1406 -29v1422h-1220v-1422h1220zM1316 1290q0 -6 -4 -15l-473 -1121q-15 -36 -45 -36t-45 36l-472 1121q-4 10 -4 15q0 26 27 26h988q28 0 28 -26zM1195 1175h-722l361 -858z" />
+<glyph unicode="&#x2355;" horiz-adv-x="1591" d="M1479 1323q0 -41 -37 -41h-604v-241q159 -17 270 -137t111 -282.5t-110 -285t-271 -139.5v-160q0 -37 -41 -37t-41 37v160q-162 15 -273.5 138.5t-111.5 286.5t112.5 283.5t272.5 135.5v241h-602q-39 0 -39 41t39 41h1288q37 0 37 -41zM1142 621q0 130 -88.5 228 t-215.5 114v-688q129 16 216.5 116t87.5 230zM537.5 851q-89.5 -98 -89.5 -229.5t89 -232t219 -115.5v690q-129 -15 -218.5 -113z" />
+<glyph unicode="&#x2356;" horiz-adv-x="1652" d="M1647 682q0 -41 -39 -41h-744v-744q166 229 432 288q31 7 35 7q27 0 27 -21q0 -45 1 -36q-2 -20 -19 -24t-48 -12q-146 -38 -257.5 -132.5t-170.5 -230.5q-5 -16 -18 -46q-9 -16 -23 -16t-20 16q-98 259 -334 369q-49 23 -90 33l-72 18q-19 6 -19 20v41q3 21 27 21 q4 0 35 -7q270 -60 432 -288v744h-742q-41 0 -41 41t41 41h742v728q0 39 41 39t41 -39v-728h744q39 0 39 -41z" />
+<glyph unicode="&#x2357;" horiz-adv-x="1591" d="M1488 -74q0 -37 -37 -37h-1308q-39 0 -39 37v1510q0 39 39 39h1308q37 0 37 -39v-1510zM1406 -29v1422h-569v-1156q166 229 432 288q31 7 35 7q27 0 27 -21q0 -45 1 -36q-3 -20 -20 -24l-47 -12q-147 -38 -258.5 -132.5t-169.5 -230.5l-18 -46q-9 -16 -23 -16t-20 16 q-97 257 -334 369q-50 23 -90 33l-72 18q-19 6 -19 20q0 44 -1 41q4 21 28 21q3 0 35 -7q269 -60 432 -288v1156h-569v-1422h1220z" />
+<glyph unicode="&#x2358;" horiz-adv-x="1591" d="M1421 382q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM867.5 1357q28.5 -30 28.5 -73.5t-26 -185.5l-54 -295h-44l-54 296q-23 126 -23 166q0 122 97 122q47 0 75.5 -30z" />
+<glyph unicode="&#x2359;" horiz-adv-x="1694" d="M1596 17q0 -17 -24 -17h-1450q-24 0 -24 17q0 6 4 14l695 1401q17 35 50.5 35t50.5 -35l694 -1401q4 -8 4 -14zM1346 146l-557 1126l-558 -1126h1115zM1611 -268q0 -41 -37 -41h-1445q-39 0 -39 41t39 41h1445q37 0 37 -41z" />
+<glyph unicode="&#x235a;" horiz-adv-x="1591" d="M1421 -259q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1550 609q11 -11 11 -27.5t-10 -26.5l-727 -727q-11 -11 -27.5 -11t-27.5 11l-728 729q-10 10 -10 26t11 27l727 727q10 10 26 10t26 -10zM1461 581l-666 666l-664 -664l666 -666z" />
+<glyph unicode="&#x235b;" horiz-adv-x="1591" d="M1421 382q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1016 1303q92 -92 92 -221.5t-91.5 -221t-221.5 -91.5t-221.5 91.5t-91.5 221.5t91.5 221.5t221 91.5t221.5 -92zM946 931q62 62 62 150t-63 151t-151 63t-150 -62t-62 -151t62 -151t151 -62t151 62z " />
+<glyph unicode="&#x235c;" horiz-adv-x="1591" d="M1421 -259q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1307 1093q211 -212 211 -510.5t-211.5 -511t-509.5 -212.5t-510.5 212.5t-212.5 511.5t211.5 510.5t511 211.5t510.5 -212zM1248.5 129.5q187.5 188.5 187.5 453t-187.5 452.5t-452.5 188 t-452.5 -187.5t-187.5 -452.5t188.5 -453.5t452.5 -188.5t451.5 188.5z" />
+<glyph unicode="&#x235d;" horiz-adv-x="1706" d="M1152.5 1150.5q124.5 -126.5 124.5 -300t-126 -297.5t-298.5 -124t-298 123.5t-125.5 297.5t124.5 300.5t299.5 126.5t299.5 -126.5zM1589 -372q0 -31 -24.5 -50.5t-52.5 -19.5t-50 22.5t-22 47.5v1265q0 239 -173.5 401t-414.5 162t-414.5 -162t-173.5 -401v-1265 q0 -31 -24.5 -50.5t-52.5 -19.5t-50 22.5t-22 47.5v1276q0 298 221 500t519 202t516 -204.5t218 -497.5v-1276zM1200 851q0 142 -102 245.5t-245 103.5t-245 -103.5t-102 -245.5t103 -243.5t244 -101.5t244 101.5t103 243.5z" />
+<glyph unicode="&#x235e;" horiz-adv-x="1591" d="M1488 -72q0 -39 -37 -39h-1308q-39 0 -39 39v1510q0 37 39 37h1308q37 0 37 -37v-1510zM1406 -29v1422h-1220v-1422h1220zM867.5 1257q28.5 -30 28.5 -73.5t-26 -185.5l-54 -295h-44l-54 296q-23 126 -23 166q0 122 97 122q47 0 75.5 -30z" />
+<glyph unicode="&#x235f;" horiz-adv-x="1591" d="M1307 1093q211 -212 211 -510.5t-211.5 -511t-509.5 -212.5t-510.5 212.5t-212.5 511.5t211.5 510.5t511 211.5t510.5 -212zM1248.5 129.5q187.5 188.5 187.5 453t-187.5 452.5t-452.5 188t-452.5 -187.5t-187.5 -452.5t188.5 -453.5t452.5 -188.5t451.5 188.5zM1302 731 q0 -15 -12 -21l-373 -176q201 -369 201 -371q0 -22 -23 -22q-11 0 -14 4l-285 303l-281 -299q-8 -8 -18 -8q-23 0 -23 22q0 3 201 371l-368 174q-17 8 -17 23q0 27 25 22l407 -78l51 410q2 18 22.5 18t23.5 -18l51 -410l407 78q25 5 25 -22z" />
+<glyph unicode="&#x2360;" horiz-adv-x="1591" d="M875 1218.5q34 -33.5 34 -79t-34 -79t-80 -33.5t-79 33.5t-33 80t33 79t79 32.5t80 -33.5zM875 332.5q34 -33.5 34 -80t-33 -79.5t-80.5 -33t-80 33t-32.5 80t32.5 80t79 33t80.5 -33.5zM1488 -72q0 -39 -37 -39h-1308q-39 0 -39 39v1510q0 37 39 37h1308q37 0 37 -37 v-1510zM1406 -29v1422h-1220v-1422h1220z" />
+<glyph unicode="&#x2361;" horiz-adv-x="1591" d="M1479 1203q0 -41 -37 -41h-604v-1243q0 -39 -41 -39t-41 39v1243h-602q-39 0 -39 41t39 41h1288q37 0 37 -41zM1387 1558.5q34 -33.5 34 -79t-34 -79t-80 -33.5t-79 33.5t-33 80t33 79t79 32.5t80 -33.5zM363 1558.5q34 -33.5 34 -79t-34 -79t-80 -33.5t-79 33.5t-33 80 t33 79t79 32.5t80 -33.5z" />
+<glyph unicode="&#x2362;" horiz-adv-x="1694" d="M1596 1173q0 -6 -4 -14l-695 -1401q-17 -35 -50.5 -35t-50.5 35l-694 1401q-4 8 -4 14q0 17 24 17h1450q24 0 24 -17zM1463 1044h-1115l557 -1126zM1387 1562.5q34 -33.5 34 -79t-34 -79t-80 -33.5t-79 33.5t-33 80t33 79t79 32.5t80 -33.5zM463 1562.5q34 -33.5 34 -79 t-34 -79t-80 -33.5t-79 33.5t-33 80t33 79t79 32.5t80 -33.5z" />
+<glyph unicode="&#x2363;" horiz-adv-x="1024" d="M903 1558.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5zM279 1558.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5zM1018 731q0 -15 -12 -21l-373 -176q201 -369 201 -371q0 -22 -23 -22 q-10 0 -14 4l-285 303l-281 -299q-8 -8 -18 -8q-23 0 -23 22q0 3 201 371l-368 174q-17 8 -17 23q0 27 25 22l407 -78l51 410q2 18 23 18t23 -18l51 -410l407 78q25 5 25 -22z" />
+<glyph unicode="&#x2364;" horiz-adv-x="1024" d="M903 1558.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5zM279 1558.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5zM670 740q66 -67 66 -158t-67 -157t-157.5 -66t-157 65.5t-66.5 156.5 t66.5 158.5t158 67.5t157.5 -67zM615 479.5q44 43.5 44 102.5t-44 103.5t-103 44.5t-103 -44.5t-44 -103.5t44 -102.5t103 -43.5t103 43.5z" />
+<glyph unicode="&#x2365;" horiz-adv-x="1591" d="M1187 1558.5q34 -33.5 34 -79t-34 -79t-80 -33.5t-79 33.5t-33 80t33 79t79 32.5t80 -33.5zM563 1558.5q34 -33.5 34 -79t-34 -79t-80 -33.5t-79 33.5t-33 80t33 79t79 32.5t80 -33.5zM1307 1093q211 -212 211 -510.5t-211.5 -511t-509.5 -212.5t-510.5 212.5 t-212.5 511.5t211.5 510.5t511 211.5t510.5 -212zM1248.5 129.5q187.5 188.5 187.5 453t-187.5 452.5t-452.5 188t-452.5 -187.5t-187.5 -452.5t188.5 -453.5t452.5 -188.5t451.5 188.5z" />
+<glyph unicode="&#x2366;" horiz-adv-x="1364" d="M1249 546q0 -193 -171 -315q-149 -106 -355 -118v-197q0 -61 -41 -61t-41 61v197q-206 12 -355 119q-171 122 -171 314v799q0 37 41 37t41 -37v-792q0 -161 145 -261q124 -85 299 -97v998q0 62 41 62t41 -62v-998q174 12 299 97q145 100 145 261v792q0 37 41 37t41 -37 v-799z" />
+<glyph unicode="&#x2367;" horiz-adv-x="1591" d="M1421 41q0 -41 -39 -41h-418v-201q0 -41 -41 -41t-41 41v201h-90q-248 0 -435 168.5t-187 413.5t187 413.5t435 168.5h90v203q0 39 41 39t41 -39v-203h418q39 0 39 -41t-39 -41h-418v-1000h418q39 0 39 -41zM882 82v1000h-84q-216 0 -381 -143.5t-165 -356.5t165 -356.5 t381 -143.5h84z" />
+<glyph unicode="&#x2368;" horiz-adv-x="1591" d="M1477 746q0 -152 -96 -271.5t-244 -119.5q-114 0 -238 88l-208 164q-123 88 -236 88q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q115 0 240 -88l207 -164q124 -88 235 -88q85 0 156 50t104 130q15 36 21 98t30 62 q29 0 29 -63zM1393 1508.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5zM369 1508.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5z" />
+<glyph unicode="&#x2369;" horiz-adv-x="1591" d="M1421 582q0 -24 -27 -37l-1169 -552q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l1090 514l-1090 514q-24 11 -24 37q0 41 41 41q8 0 14 -3l1169 -552q27 -13 27 -37zM1393 1508.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5zM369 1508.5 q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5z" />
+<glyph unicode="&#x236a;" horiz-adv-x="1591" d="M1421 582q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM958 50q0 -233 -298 -331v44q91 30 153.5 98.5t62.5 158.5q0 41 -23 41q-10 0 -37.5 -14.5t-48.5 -14.5q-107 0 -107 109q0 51 38.5 85t90.5 34q78 0 123.5 -64.5t45.5 -145.5z" />
+<glyph unicode="&#x236b;" horiz-adv-x="1694" d="M1596 1373q0 -6 -4 -14l-425 -857q20 -3 40 -3q85 0 156 50t104 130q15 36 21 98t30 62q29 0 29 -63q0 -152 -96 -271.5t-244 -119.5q-46 0 -92 13l-218 -440q-17 -35 -50.5 -35t-50.5 35l-370 748q-95 -38 -146 -128q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63 q0 109 52 207t141 147l-276 557q-4 8 -4 14q0 17 24 17h1450q24 0 24 -17zM1463 1244h-1115l201 -406q124 -9 299 -151.5t255 -169.5zM1055 421q-65 31 -208.5 149t-236.5 143l295 -595z" />
+<glyph unicode="&#x236c;" horiz-adv-x="1326" d="M1276 885q0 -100 -50 -191.5t-137 -133.5q-30 -225 -117 -378q-118 -206 -309 -206q-222 0 -344 277q-94 214 -94 471q0 32 3 78q-106 -65 -127 -223q-6 -46 -26 -46q-25 0 -25 56q0 102 50.5 193.5t138.5 132.5q32 224 118 373q116 201 306 201q224 0 344 -279 q94 -217 94 -490q0 -24 -1 -46q74 46 104 123q11 28 18.5 86t27.5 58q26 0 26 -56zM941 736q0 226 -48 414q-73 285 -230 285q-213 0 -266 -496q107 -15 271 -152.5t270 -149.5q3 54 3 99zM385 737q0 -227 48 -418q74 -289 230 -289q214 0 267 505q-105 15 -270 152.5 t-272 149.5q-3 -53 -3 -100z" />
+<glyph unicode="&#x236d;" horiz-adv-x="1221" d="M1150 812q0 -123 -78 -220.5t-191.5 -97.5t-239.5 101v-996q0 -41 -41 -41t-41 41v1063q-129 104 -232 104q-128 0 -191 -115q-19 -32 -30 -111q-7 -46 -28 -46q-28 0 -28 56q0 124 76 217q80 101 193.5 101t239.5 -100v799q0 39 41 39t41 -39v-866q130 -105 232 -105 q78 0 139.5 52.5t75.5 129.5q4 27 7 53q8 37 27 37q28 0 28 -56z" />
+<glyph unicode="&#x236e;" horiz-adv-x="1251" d="M728 1105q0 -46 -32.5 -78.5t-79 -32.5t-78.5 32.5t-32 78.5t32 78t78.5 32t79 -32t32.5 -78zM1135 41q0 -41 -37 -41h-471q-61 -42 -150 -71v44q34 11 63 27h-386q-39 0 -39 41t39 41h485q54 70 54 148q0 41 -23 41q-11 0 -38.5 -14.5t-47.5 -14.5q-107 0 -107 109 q0 51 38 85t91 34q77 0 123 -64.5t46 -152.5t-62 -171h385q37 0 37 -41z" />
+<glyph unicode="&#x236f;" horiz-adv-x="1591" d="M1488 -72q0 -39 -37 -39h-1308q-39 0 -39 39v1510q0 37 39 37h1308q37 0 37 -37v-1510zM1406 923v470h-1220v-470h670l119 206q23 39 45 39q41 0 41 -38q0 -16 -15 -42l-95 -165h455zM1406 523v318h-503l-183 -318h686zM186 841v-318h439l184 318h-623zM1406 -29v470 h-734l-176 -305q-23 -40 -46 -40q-41 0 -41 38q0 15 16 43l153 264h-392v-470h1220z" />
+<glyph unicode="&#x2370;" horiz-adv-x="1591" d="M1488 -72q0 -39 -37 -39h-1308q-39 0 -39 39v1510q0 37 39 37h1308q37 0 37 -37v-1510zM1406 -29v1422h-1220v-1422h1220zM1089 994q0 -123 -112 -250.5t-135 -167.5q-45 -74 -51 -184h-33q6 106 28.5 175t88.5 195t66 217t-49 156.5t-137 65.5q-54 0 -101.5 -27 t-47.5 -77q0 -27 24 -72.5t24 -66.5q0 -68 -64 -68q-43 0 -65.5 40t-22.5 86q0 108 93 172q82 58 194 58q165 0 243 -96q57 -71 57 -156zM843.5 267q25.5 -26 25.5 -63.5t-26 -63.5t-63 -26t-63 26t-26 63.5t25.5 63.5t63.5 26t63.5 -26z" />
+<glyph unicode="&#x2371;" horiz-adv-x="1364" d="M1249 1184q0 -10 -2 -15l-250 -565q134 38 158 174q3 26 9 58t25 32q28 0 28 -56q0 -121 -75.5 -217.5t-193.5 -100.5l-227 -514q-11 -25 -36 -25t-40 25q-1 1 -30 67l-311 698q-66 -31 -95 -84q-23 -40 -36 -121q-8 -46 -28 -46q-28 0 -28 56q0 192 149 282 q-151 342 -151 352q0 41 41 41q28 0 39 -25l149 -337q25 5 50 5q113 0 267.5 -128t243.5 -141l266 601q11 25 37 25q41 0 41 -41zM863 505q-69 21 -217 143q-142 118 -250 118h-9l295 -670z" />
+<glyph unicode="&#x2372;" horiz-adv-x="1364" d="M1249 -4q0 -41 -41 -41q-26 0 -37 25l-266 601q-89 -13 -243.5 -141t-267.5 -128q-25 0 -50 5l-149 -337q-11 -25 -39 -25q-41 0 -41 41q0 10 151 352q-149 90 -149 282q0 56 28 56q20 0 28 -46q13 -81 36 -121q29 -53 95 -84l311 698q9 23 30 67q15 25 40 25t36 -25 l227 -514q118 -4 193.5 -100.5t75.5 -217.5q0 -56 -28 -56q-19 0 -25 32t-9 58q-24 136 -158 174l250 -565q2 -5 2 -15zM863 675l-181 409l-295 -670h9q108 0 250 118q148 122 217 143z" />
+<glyph unicode="&#x2373;" horiz-adv-x="748" d="M695 266q0 -114 -48 -194q-58 -96 -164 -96q-133 0 -203 78t-70 212v473q0 86 -41 106q-20 11 -103 11h-14v67l299 23v-685q0 -231 148 -231q102 0 131 139q12 56 12 182v37h53v-122z" />
+<glyph unicode="&#x2374;" horiz-adv-x="990" d="M184 818q107 142 305 142t323.5 -138.5t125.5 -340t-127.5 -353.5t-329.5 -152q-145 0 -245 113q0 -23 0.5 -79.5t0.5 -84.5q0 -214 -36 -342h-149q37 173 37 311v589q0 209 95 335zM775 406q0 187 -65 326q-84 180 -250 180q-108 0 -166 -84.5t-58 -197.5v-344 q0 -110 89 -183t201 -73q249 0 249 376z" />
+<glyph unicode="&#x2375;" horiz-adv-x="1328" d="M1276 430q0 -173 -79 -302q-93 -152 -255 -152q-185 0 -278 219q-93 -219 -278 -219q-162 0 -255 152q-79 129 -79 302q0 245 124.5 386t365.5 144v-48q-327 -10 -327 -470q0 -412 202 -412q135 0 224 241q-67 140 -67 291q0 219 90 219t90 -219q0 -151 -67 -291 q89 -241 224 -241q202 0 202 412q0 460 -327 470v48q241 -3 365.5 -144.5t124.5 -385.5z" />
+<glyph unicode="&#x2376;" horiz-adv-x="1250" d="M1197 190q0 -84 -46.5 -143t-128.5 -59q-125 0 -173 162q-161 -174 -357 -174t-318 143.5t-122 341t126.5 348.5t321.5 151q160 0 255 -98q75 -78 119 -232q9 -34 58 -273q49 97 77.5 247t28.5 274q0 72 43 72q47 0 47 -72q0 -125 -54.5 -299t-124.5 -293 q49 -233 118 -233q79 0 79 173l-3 85h54v-121zM467 912q-135 0 -200 -121q-52 -96 -52 -262.5t67 -311.5q87 -187 245 -187t307 177l-61 266q-46 196 -106 298q-81 141 -200 141zM1181 -268q0 -41 -37 -41h-1055q-39 0 -39 41t39 41h1055q37 0 37 -41z" />
+<glyph unicode="&#x2377;" horiz-adv-x="883" d="M802 280q28 0 28 -28.5t-34 -86.5q-110 -189 -326 -189q-148 0 -270 66q-148 80 -148 216q0 177 263 238q-93 22 -154 84t-61 153q0 123 132 182q98 45 221 45t210 -28q123 -40 123 -122q0 -33 -24.5 -55.5t-60.5 -22.5t-67 47q-52 77 -61 86q-47 47 -126 47 q-202 0 -202 -194q0 -188 199 -188q22 0 63 11t63 11q86 0 86 -55.5t-87 -55.5q-21 0 -62.5 11t-62.5 11q-214 0 -214 -205q0 -228 255 -228q204 0 290 221q11 29 27 29zM851 -268q0 -41 -37 -41h-735q-39 0 -39 41t39 41h735q37 0 37 -41z" />
+<glyph unicode="&#x2378;" horiz-adv-x="748" d="M695 266q0 -114 -48 -194q-58 -96 -164 -96q-133 0 -203 78t-70 212v473q0 86 -41 106q-20 11 -103 11h-14v67l299 23v-685q0 -231 148 -231q102 0 131 139q12 56 12 182v37h53v-122zM711 -268q0 -41 -37 -41h-595q-39 0 -39 41t39 41h595q37 0 37 -41z" />
+<glyph unicode="&#x2379;" horiz-adv-x="1328" d="M1276 430q0 -173 -79 -302q-93 -152 -255 -152q-185 0 -278 219q-93 -219 -278 -219q-162 0 -255 152q-79 129 -79 302q0 245 124.5 386t365.5 144v-48q-327 -10 -327 -470q0 -412 202 -412q135 0 224 241q-67 140 -67 291q0 219 90 219t90 -219q0 -151 -67 -291 q89 -241 224 -241q202 0 202 412q0 460 -327 470v48q241 -3 365.5 -144.5t124.5 -385.5zM1271 -268q0 -41 -37 -41h-1135q-39 0 -39 41t39 41h1135q37 0 37 -41z" />
+<glyph unicode="&#x237a;" horiz-adv-x="1250" d="M1197 190q0 -84 -46.5 -143t-128.5 -59q-125 0 -173 162q-161 -174 -357 -174t-318 143.5t-122 341t126.5 348.5t321.5 151q160 0 255 -98q75 -78 119 -232q9 -34 58 -273q49 97 77.5 247t28.5 274q0 72 43 72q47 0 47 -72q0 -125 -54.5 -299t-124.5 -293 q49 -233 118 -233q79 0 79 173l-3 85h54v-121zM467 912q-135 0 -200 -121q-52 -96 -52 -262.5t67 -311.5q87 -187 245 -187t307 177l-61 266q-46 196 -106 298q-81 141 -200 141z" />
+<glyph unicode="&#x237b;" horiz-adv-x="1546" d="M1411 782q0 -41 -37 -41h-432q-554 -783 -617 -783q-79 0 -147 191q-58 161 -58 262q0 40 36.5 68t68.5 28t49 -11q7 -4 48.5 -121t97.5 -117q35 0 372 483h-393q-39 0 -39 41t39 41h450l185 264l117 156q39 46 104 92t111 46q16 0 16 -20t-48 -81l-87 -109 q-22 -29 -247 -348h374q37 0 37 -41z" />
+<glyph unicode="&#x237c;" horiz-adv-x="1858" d="M1719 41q0 -41 -68 -41h-1019q-106 -145 -106 -229v-35q107 127 253 179q8 3 15 3q39 0 39 -42q0 -24 -23 -34l-62 -27q-149 -75 -237 -230q-15 -27 -26 -27t-26 27q-87 154 -236 230l-58 25q-26 12 -26 36q0 42 39 42q7 0 15 -3q144 -52 251 -178v34q0 99 90 229h-22 q-61 0 -66 35q-2 11 -2 33v532q-112 100 -158 162q-73 97 -73 197.5t73 197.5q46 62 158 160v20q0 68 41 68t41 -68v-700q110 -97 157 -162q72 -98 72 -193t-66 -200h962q68 0 68 -41zM444 1209q-149 -139 -149 -249.5t149 -249.5v499zM673 277q0 111 -147 250v-445h66 q81 117 81 195z" />
+<glyph unicode="&#x237d;" horiz-adv-x="1591" d="M1563 969q0 -41 -37 -41h-238v-889q0 -39 -37 -39h-908q-39 0 -39 39v929h-237q-39 0 -39 41t39 41h282q37 0 37 -39v-929h820v891q0 37 37 37h283q37 0 37 -41z" />
+<glyph unicode="&#x237e;" horiz-adv-x="1628" d="M1523 517q0 -41 -68 -41h-348v-395h238q37 0 37 -41t-37 -41h-283q-37 0 -37 37v440h-421v-437q0 -39 -37 -39h-282q-39 0 -39 41t39 41h237v394h-349q-68 0 -68 41q0 296 206.5 502t502.5 206t502.5 -206t206.5 -502zM814 1155q-255 0 -438 -172.5t-199 -424.5h1274 q-16 252 -199 424.5t-438 172.5z" />
+<glyph unicode="&#x237f;" horiz-adv-x="626" d="M585 582q0 -103 -65.5 -178.5t-165.5 -90.5v-714q0 -41 -41 -41t-41 41v714q-100 15 -165.5 90.5t-65.5 178.5t65.5 178.5t165.5 90.5v716q0 39 41 39t41 -39v-716q100 -15 165.5 -90.5t65.5 -178.5z" />
+<glyph unicode="&#x2380;" horiz-adv-x="1364" d="M1249 807q0 -11 -2 -16l-526 -1188q-11 -25 -39 -25t-39 25l-526 1188q-2 5 -2 16q0 41 41 41q26 0 37 -25l489 -1103l489 1103q11 25 37 25q41 0 41 -41zM1053 1056q0 -59 -38.5 -101.5t-103.5 -42.5q-98 0 -129 97q-67 -105 -206 -105q-97 0 -171 34q-95 44 -95 128 q0 125 165 194q99 41 289 51v43q0 70 -42.5 121t-127 51t-140.5 -47q70 -13 70 -74q0 -75 -84.5 -75t-84.5 76q0 81 80.5 126.5t172.5 45.5q141 0 227 -82q60 -57 60 -174v-284q0 -62 49 -62t49 106q0 18 -2 64h62v-90zM764 1129v132q-124 -6 -208 -48q-103 -52 -103 -145 q0 -47 39 -79.5t106 -32.5t116.5 51t49.5 122z" />
+<glyph unicode="&#x2381;" d="M1878 324q0 -41 -31 -72t-72.5 -31t-72 30.5t-30.5 73t30 72t72 29.5t73 -30.5t31 -71.5zM1555 324q0 -41 -31 -72t-72.5 -31t-72 30.5t-30.5 73t30 72t72 29.5t73 -30.5t31 -71.5zM1201.5 396.5q30.5 -30.5 30.5 -73t-30 -72.5t-73 -30t-73 30t-30 73t30 73t72.5 30 t73 -30.5zM913 365q0 -59 -38.5 -101.5t-103.5 -42.5q-98 0 -129 97q-67 -105 -206 -105q-97 0 -171 34q-95 44 -95 128q0 125 165 194q99 41 289 51v43q0 70 -42.5 121t-127 51t-140.5 -47q70 -13 70 -74q0 -75 -84.5 -75t-84.5 76q0 81 80.5 126.5t172.5 45.5 q141 0 227 -82q60 -57 60 -174v-284q0 -62 49 -62t49 106q0 18 -2 64h62v-90zM1878 41q0 -41 -37 -41h-1632q-39 0 -39 41t39 41h1632q37 0 37 -41zM624 438v132q-124 -6 -208 -48q-103 -52 -103 -145q0 -47 39 -79.5t106 -32.5t116.5 51t49.5 122z" />
+<glyph unicode="&#x2382;" d="M1843 365q0 -59 -38.5 -101.5t-103.5 -42.5q-98 0 -129 97q-67 -105 -206 -105q-97 0 -171 34q-95 44 -95 128q0 125 165 194q100 41 289 51v43q0 70 -42.5 121t-127 51t-140.5 -47q70 -13 70 -74q0 -75 -84.5 -75t-84.5 76q0 81 80.5 126.5t172.5 45.5q141 0 227 -82 q60 -57 60 -174v-284q0 -62 49 -62t49 106q0 18 -2 64h62v-90zM1878 41q0 -41 -37 -41h-702q-39 0 -39 41t39 41h702q37 0 37 -41zM913 365q0 -59 -38.5 -101.5t-103.5 -42.5q-98 0 -129 97q-67 -105 -206 -105q-97 0 -171 34q-95 44 -95 128q0 125 165 194q100 41 289 51 v43q0 70 -42.5 121t-127 51t-140.5 -47q70 -13 70 -74q0 -75 -84.5 -75t-84.5 76q0 81 80.5 126.5t172.5 45.5q141 0 227 -82q60 -57 60 -174v-284q0 -62 49 -62t49 106q0 18 -2 64h62v-90zM948 41q0 -41 -37 -41h-702q-39 0 -39 41t39 41h702q37 0 37 -41zM1554 438v132 q-124 -6 -208 -48q-103 -52 -103 -145q0 -47 39 -79.5t106 -32.5t116.5 51t49.5 122zM624 438v132q-124 -6 -208 -48q-103 -52 -103 -145q0 -47 39 -79.5t106 -32.5t116.5 51t49.5 122z" />
+<glyph unicode="&#x2383;" horiz-adv-x="1992" d="M1426 1245l-181 -313q-23 37 -56 66l166 288q11 20 29 20q11 0 25 -8q36 -21 17 -53zM1822 582q0 -41 -37 -41h-326v82h326q37 0 37 -41zM775 1048q-40 -18 -71 -42l-137 237q-7 12 -7 23q0 18 23 32q14 7 25 7q18 0 30 -21zM1373 446q0 -59 -38.5 -101.5t-103.5 -42.5 q-98 0 -129 97q-67 -105 -206 -105q-97 0 -171 34q-95 44 -95 128q0 125 165 194q99 41 289 51v43q0 70 -42.5 121t-127 51t-140.5 -47q70 -13 70 -74q0 -75 -84.5 -75t-84.5 76q0 81 80.5 126.5t172.5 45.5q141 0 227 -82q60 -57 60 -174v-284q0 -62 49 -62t49 106 q0 18 -2 64h62v-90zM1171 196q24 -5 48.5 -5t47.5 4l159 -276q7 -11 7 -21q0 -18 -24 -32q-14 -8 -25 -8q-18 0 -29 20zM209 541q-39 0 -39 41t39 41h401q-29 -38 -44 -82h-357zM818 192l-180 -312q-12 -21 -30 -21q-11 0 -25 7q-23 14 -23 32q0 11 7 23l171 296 q38 -16 80 -25zM1084 519v132q-124 -6 -208 -48q-103 -52 -103 -145q0 -47 39 -79.5t106 -32.5t116.5 51t49.5 122z" />
+<glyph unicode="&#x2384;" horiz-adv-x="1920" d="M1618.5 1182q201.5 -204 201.5 -488t-202 -489t-485 -205h-996q-37 0 -37 37v1314q0 35 37 35h995q285 0 486.5 -204zM1575 274q166 178 166 419.5t-166 419t-407 193.5v-1226q241 16 407 194zM680 1113.5q-166 -177.5 -166 -420t167 -420t408 -193.5v1226 q-243 -15 -409 -192.5zM536 334.5q-101 165.5 -101 359t100 358.5t272 255h-628v-1228h630q-172 90 -273 255.5z" />
+<glyph unicode="&#x2385;" horiz-adv-x="1584" d="M1484 37q0 -37 -35 -37h-619v-194q0 -36 -40 -36t-40 36v194h-613q-37 0 -37 37v1314q0 35 37 35h613v165q0 38 40 38t40 -38v-165h619q35 0 35 -35v-1314zM1405 79v1228h-575v-1228h575zM750 79v1228h-571v-1228h571z" />
+<glyph unicode="&#x2386;" d="M2018 610q11 -11 11 -27.5t-10 -26.5l-925 -925q-11 -11 -27.5 -11t-27.5 11l-693 693h116l605 -604l862 862l-864 864l-605 -605l-116 1l695 694q10 10 26 10t26 -10zM1335 582q0 -23 -32 -38q-116 -53 -185 -112t-156 -170q-18 -23 -38 -23q-36 0 -36 47v137h-757 q-61 0 -61 59v200q0 59 61 59l757 -1v138q0 47 36 47q20 0 38 -23q87 -111 156 -170t185 -112q32 -15 32 -38zM970 729q0 -30 -22 -50t-50 -20h-746v-154h746q28 0 50 -20t22 -50v-30q88 103 223 177q-135 74 -223 177v-30z" />
+<glyph unicode="&#x2387;" horiz-adv-x="1784" d="M1535 718q0 -11 -27 -26q-154 -87 -230 -236l-25 -58q-12 -26 -36 -26q-42 0 -42 39q0 7 3 15q52 144 178 251h-349q-94 0 -142 -169l-94 -332q-75 -176 -227 -176h-333q-41 0 -41 41t41 41h333q114 0 171 176l88 325q67 176 204 176h350q-127 107 -179 253q-3 8 -3 15 q0 39 42 39q24 0 34 -23l27 -62q75 -149 230 -237q27 -15 27 -26zM1614 41q0 -41 -37 -41h-696q-39 0 -39 41t39 41h696q37 0 37 -41z" />
+<glyph unicode="&#x2388;" horiz-adv-x="1991" d="M1821 582q0 -41 -37 -41h-168q-14 -209 -153 -369l119 -119q26 -26 -3 -55t-55 -3l-119 119q-159 -140 -368 -154v-165q0 -39 -41 -39t-41 39v165q-210 15 -369 155l-118 -118q-13 -14 -27 -14t-29 15t-15 30q0 14 13 27l118 118q-139 159 -153 368h-166q-39 0 -39 41 t39 41h166q13 210 152 369l-117 117q-13 13 -13 27q0 15 15 30t29 15t27 -14l117 -117q159 140 370 154v167q0 37 41 37t41 -37v-167q210 -14 369 -154l118 119q26 26 55 -3t3 -55l-118 -119q138 -159 152 -369h168q37 0 37 -41zM1348 992q-135 116 -311 130v-441zM1534 623 q-13 176 -129 311l-311 -311h440zM955 681v440q-177 -13 -312 -129zM1534 541h-440l311 -311q116 135 129 311zM897 623l-311 311q-116 -135 -129 -311h440zM1347 172l-310 311v-441q175 14 310 130zM897 541h-440q13 -175 129 -310zM955 43v440l-311 -310 q135 -117 311 -130z" />
+<glyph unicode="&#x2389;" horiz-adv-x="1591" d="M1307 1093q211 -212 211 -510.5t-211.5 -511t-509.5 -212.5t-510.5 212.5t-212.5 511.5t211.5 510.5t511 211.5t510.5 -212zM1234.5 1048.5q-184.5 174.5 -438.5 174.5t-438.5 -174t-200.5 -426h241q23 0 35 -20l363 -590l363 590q12 20 35 20h241q-16 251 -200.5 425.5z M1435 541h-218l-368 -598q236 19 403.5 190t182.5 408zM743 -57l-368 598h-218q15 -236 182.5 -407t403.5 -191z" />
+<glyph unicode="&#x238a;" horiz-adv-x="1591" d="M1307 1093q211 -212 211 -510.5t-211.5 -511t-509.5 -212.5t-510.5 212.5t-212.5 511.5t211.5 510.5t511 211.5t510.5 -212zM1248.5 129.5q187.5 188.5 187.5 453t-187.5 452.5t-452.5 188t-452.5 -187.5t-187.5 -452.5t188.5 -453.5t452.5 -188.5t451.5 188.5zM1432 588 q0 -18 -17 -35l-589 -591q-12 -12 -29 -12t-29 12l-591 591q-17 17 -17 35q0 35 46 35h1180q46 0 46 -35zM1287 541h-982l492 -492z" />
+<glyph unicode="&#x238b;" horiz-adv-x="1591" d="M1307 1093q211 -211 211 -510.5t-211.5 -511t-511.5 -211.5t-510 210.5t-210 510.5q0 222 121 403q20 -58 30 -110q-69 -135 -69 -293q0 -266 186 -452.5t452 -186.5t453.5 187.5t187.5 453t-187 452.5t-452 187q-157 0 -293 -70q-52 10 -110 30q181 122 403 122 q299 0 510 -211zM336 771q0 126 -55 272q-5 14 -5 25q0 15 9.5 24.5t24.5 9.5q11 0 25 -5q146 -55 272 -55q65 0 168 13q28 3 44 -11q11 -11 11 -23q0 -16 -19 -35l-180 -181l610 -610q12 -12 12 -25q0 -15 -15 -30t-30 -15q-13 0 -25 12l-610 610l-181 -180 q-18 -18 -34 -18q-14 0 -26 12q-12 15 -9 42q13 103 13 168zM669 960q-28 -2 -56 -2q-110 0 -227 34q34 -117 34 -227q0 -28 -2 -56z" />
+<glyph unicode="&#x238c;" horiz-adv-x="1592" d="M1488 936q0 -39 -42 -39q-28 0 -39 32q-12 43 -54 139q-76 138 -212 221t-292 83q-316 0 -484 -255q-23 -52 -74 -140q33 2 76.5 2t147 -23.5t103.5 -66t-37 -42.5l-79 28q-79 28 -161.5 28t-168.5 -23q-19 -5 -25 -5q-17 0 -17 17q0 6 14 58.5t14 135.5t-27 161l-27 77 q0 38 42 38q48 0 69 -117q18 -98 18 -174q0 -14 -1 -28q181 411 617 411q204 0 413 -155q226 -166 226 -363zM1404 503q87 -87 87 -209t-86 -208t-209 -86t-209 86t-86 209t86 209t208 86t209 -87zM604 503q87 -87 87 -209t-86 -208t-209 -86t-209 86t-86 209t86 209t208 86 t209 -87zM1347 144q62 62 62 150t-63 151t-151 63t-150 -62t-62 -151t62 -151t151 -62t151 62zM547 144q62 62 62 150t-63 151t-151 63t-150 -62t-62 -151t62 -151t151 -62t151 62z" />
+<glyph unicode="&#x238d;" horiz-adv-x="1591" d="M1463 41q0 -41 -37 -41h-283q-37 0 -37 37v1231h-620v-1229q0 -39 -37 -39h-282q-39 0 -39 41t39 41h237v1229q0 39 39 39h708q37 0 37 -39v-1229h238q37 0 37 -41z" />
+<glyph unicode="&#x238e;" horiz-adv-x="1748" d="M1648 1309q0 -41 -63 -41q-173 0 -271.5 -110t-98.5 -285v-441q0 -182 -135 -307t-318 -125h-621q-41 0 -41 41t41 41h21q149 0 260 101t111 249v441q0 209 122.5 343t329.5 134h622q41 0 41 -41zM985 1268q-173 0 -271.5 -110t-98.5 -285v-441q0 -221 -188 -350h335 q149 0 260 101t111 249v441q0 264 181 395h-329z" />
+<glyph unicode="&#x238f;" horiz-adv-x="1591" d="M1466 707q9 -9 9 -26t-11 -28l-643 -643q-10 -10 -26 -10t-26 10l-642 642q-12 12 -12 27.5t10 25.5l573 573h-524q-39 0 -39 41t39 41h1245q37 0 37 -41t-37 -41h-524zM1376 681l-580 580l-581 -582l580 -580z" />
+<glyph unicode="&#x2390;" horiz-adv-x="1591" d="M1464 707q11 -11 11 -28t-9 -26l-571 -571h524q37 0 37 -41t-37 -41h-1245q-39 0 -39 41t39 41h524l-573 573q-10 10 -10 25.5t12 27.5l642 642q10 10 26 10t26 -10zM1376 679l-581 582l-580 -580l581 -582z" />
+<glyph unicode="&#x2391;" horiz-adv-x="1591" d="M1466 707q9 -9 9 -26t-11 -28l-643 -643q-10 -10 -26 -10t-26 10l-642 642q-12 12 -12 27.5t10 25.5l573 573h-524q-39 0 -39 41t39 41h1245q37 0 37 -41t-37 -41h-524zM1336 721l-540 540l-539 -540h1079zM1334 639h-1079l540 -540z" />
+<glyph unicode="&#x2392;" horiz-adv-x="1591" d="M1464 707q11 -11 11 -28t-9 -26l-571 -571h524q37 0 37 -41t-37 -41h-1245q-39 0 -39 41t39 41h524l-573 573q-10 10 -10 25.5t12 27.5l642 642q10 10 26 10t26 -10zM1334 721l-539 540l-540 -540h1079zM1336 639h-1079l539 -540z" />
+<glyph unicode="&#x2393;" horiz-adv-x="1591" d="M1456 432q0 -41 -37 -41h-283q-39 0 -39 41t39 41h283q37 0 37 -41zM1456 732q0 -41 -37 -41h-1245q-39 0 -39 41t39 41h1245q37 0 37 -41zM975 432q0 -41 -37 -41h-283q-39 0 -39 41t39 41h283q37 0 37 -41zM494 432q0 -41 -37 -41h-283q-39 0 -39 41t39 41h283 q37 0 37 -41z" />
+<glyph unicode="&#x2394;" horiz-adv-x="1654" d="M1636 582l-404 -702h-810l-404 702l404 702h810zM1521 582l-347 602h-694l-347 -602l347 -602h694z" />
+<glyph unicode="&#x2395;" horiz-adv-x="1591" d="M1488 39q0 -39 -37 -39h-1308q-39 0 -39 39v1310q0 37 39 37h1308q37 0 37 -37v-1310zM1406 82v1222h-1220v-1222h1220z" />
+<glyph unicode="&#x2396;" horiz-adv-x="700" d="M621 1344l-468 -698h-22l210 698h280z" />
+<glyph unicode="&#x2397;" horiz-adv-x="1760" d="M1248 1292h-82v106h-106v82h147q41 0 41 -41v-147zM952 1398h-224v82h224v-82zM620 1398h-224v82h224v-82zM288 1398h-106v-106h-82v147q0 41 41 41h147v-82zM1660 -359q0 -41 -41 -41h-1066q-41 0 -41 41v359h-116v82h116v437l-47 29l-82 -145l-168 387l297 34v215 q0 41 41 41h613v104h82v-104h371q41 0 41 -41v-1398zM182 960h-82v224h82v-224zM182 628h-82v224h82v-224zM182 296h-82v224h82v-224zM288 0h-147q-41 0 -41 41v147h82v-106h106v-82zM1578 -318v1316h-984v-164l46 5l-46 -81v-104q141 -93 260 -129q108 -32 258 -32h34v-149 q-18 -1 -63 -1q-239 0 -489 130v-791h984z" />
+<glyph unicode="&#x2398;" horiz-adv-x="1760" d="M1660 892h-82v106h-106v82h147q41 0 41 -41v-147zM1660 560h-82v224h82v-224zM1032 998h-224v82h224v-82zM1660 228h-82v224h82v-224zM1660 -104h-82v224h82v-224zM700 998h-106v-106h-82v147q0 41 41 41h147v-82zM1364 998h-224v82h26v318h-984v-1316h330v38h82v-224 h-82v104h-371q-41 0 -41 41v1398q0 41 41 41h1066q41 0 41 -41v-359h116v-82zM594 560h-82v33q-58 6 -122 6h-33v149q18 1 62 1t93 -5v40h82v-51q212 -41 444 -189l83 145l167 -387l-425 -49l89 156q-202 139 -358 172v-21zM1660 -359q0 -41 -41 -41h-147v82h106v106h82 v-147zM594 228h-82v224h82v-224zM1364 -400h-224v82h224v-82zM1032 -400h-224v82h224v-82zM700 -400h-147q-41 0 -41 41v147h82v-106h106v-82z" />
+<glyph unicode="&#x2399;" horiz-adv-x="2100" d="M2000 37q0 -288 -90.5 -378.5t-378.5 -90.5h-962q-288 0 -378.5 90.5t-90.5 378.5v543q0 270 77 364t314 103v147l402 402h716v-549q237 -9 314 -103t77 -364v-543zM880 1208v259l-259 -259h259zM1527 226v1288h-565v-388h-389v-900h954zM1918 37v543q0 237 -55 308 t-254 77v-821h-1118v821q-199 -6 -254 -77t-55 -308v-543q0 -254 66.5 -320.5t320.5 -66.5h962q254 0 320.5 66.5t66.5 320.5z" />
+<glyph unicode="&#x239a;" horiz-adv-x="2100" d="M2000 469q0 -288 -90.5 -378.5t-378.5 -90.5h-962q-288 0 -378.5 90.5t-90.5 378.5v543q0 288 90 378t379 90h962q289 0 379 -90t90 -378v-543zM1918 469v543q0 254 -66 320t-321 66h-962q-255 0 -321 -66t-66 -320v-543q0 -254 66.5 -320.5t320.5 -66.5h962 q254 0 320.5 66.5t66.5 320.5zM1798 1123l-1229 -928q-31 0 -70 2l1287 980q8 -26 12 -54zM1704 1263l-1345 -1024q-19 16 -33 38l1316 1002q31 -5 62 -16zM1456 1285l-1159 -882q-2 32 -2 62l1077 820h84z" />
+<glyph unicode="&#x239b;" horiz-adv-x="1024" d="M940 1178q0 -19 -41 -43q-237 -140 -410 -415q-264 -419 -264 -1055v-107h-120v107q0 414 118 756q138 397 416 631q51 43 141 98.5t125 55.5t35 -28zM0 1606zM1024 -442z" />
+<glyph unicode="&#x239c;" horiz-adv-x="1024" d="M225 -442h-120v2048h120v-2048zM0 1606zM1024 -442z" />
+<glyph unicode="&#x239d;" horiz-adv-x="1024" d="M940 -14q0 -28 -35 -28t-125 55.5t-141 98.5q-278 234 -416 631q-118 342 -118 756v107h120v-107q0 -636 264 -1055q173 -275 410 -415q41 -24 41 -43zM0 1606zM1024 -442z" />
+<glyph unicode="&#x239e;" horiz-adv-x="1024" d="M919 -442h-120v107q0 636 -264 1055q-173 275 -410 415q-41 24 -41 43q0 28 35 28t125 -55.5t141 -98.5q278 -234 416 -631q118 -342 118 -756v-107zM0 1606zM1024 -442z" />
+<glyph unicode="&#x239f;" horiz-adv-x="1024" d="M919 -442h-120v2048h120v-2048zM0 1606zM1024 -442z" />
+<glyph unicode="&#x23a0;" horiz-adv-x="1024" d="M919 1499q0 -414 -118 -756q-138 -397 -416 -631q-51 -43 -141 -98.5t-125 -55.5t-35 28q0 19 41 43q237 140 410 415q264 419 264 1055v107h120v-107zM0 1606zM1024 -442z" />
+<glyph unicode="&#x23a1;" horiz-adv-x="1024" d="M864 642q55 0 55 -60t-55 -60h-639v-964h-120v1029q0 55 59 55h700zM0 1606zM1024 -442z" />
+<glyph unicode="&#x23a2;" horiz-adv-x="1024" d="M225 -442h-120v2048h120v-2048zM0 1606zM1024 -442z" />
+<glyph unicode="&#x23a3;" horiz-adv-x="1024" d="M864 642q55 0 55 -60t-55 -60h-700q-22 0 -40.5 17t-18.5 40v1027h120v-964h639zM0 1606zM1024 -442z" />
+<glyph unicode="&#x23a4;" horiz-adv-x="1024" d="M919 -442h-120v964h-639q-55 0 -55 60t55 60h700q22 0 40.5 -17t18.5 -40v-1027zM0 1606zM1024 -442z" />
+<glyph unicode="&#x23a5;" horiz-adv-x="1024" d="M919 -442h-120v2048h120v-2048zM0 1606zM1024 -442z" />
+<glyph unicode="&#x23a6;" horiz-adv-x="1024" d="M919 577q0 -55 -59 -55h-700q-55 0 -55 60t55 60h639v964h120v-1029zM0 1606zM1024 -442z" />
+<glyph unicode="&#x23a7;" horiz-adv-x="1024" d="M882 582q0 -31 -28 -31q-104 0 -189.5 -60t-85.5 -156v-777h-134v777q0 145 143 219q111 59 266 59q28 0 28 -31zM0 1606zM1024 -442z" />
+<glyph unicode="&#x23a8;" horiz-adv-x="1024" d="M579 -442h-134v770q0 104 -80 163.5t-195 59.5q-28 0 -28 31t28 31q115 0 195 59.5t80 163.5v770h134v-770q0 -186 -212 -254q212 -68 212 -254v-770zM0 1606zM1024 -442z" />
+<glyph unicode="&#x23a9;" horiz-adv-x="1024" d="M882 582q0 -31 -28 -31q-155 0 -266 59q-143 74 -143 219v777h134v-777q0 -96 85.5 -156t189.5 -60q28 0 28 -31zM0 1606zM1024 -442z" />
+<glyph unicode="&#x23aa;" horiz-adv-x="1024" d="M579 -442h-134v2048h134v-2048zM0 1606zM1024 -442z" />
+<glyph unicode="&#x23ab;" horiz-adv-x="1024" d="M579 -442h-134v777q0 96 -85.5 156t-189.5 60q-28 0 -28 31t28 31q155 0 266 -59q143 -74 143 -219v-777zM0 1606zM1024 -442z" />
+<glyph unicode="&#x23ac;" horiz-adv-x="1024" d="M882 582q0 -31 -28 -31q-115 0 -195 -59.5t-80 -163.5v-770h-134v770q0 186 212 254q-212 68 -212 254v770h134v-770q0 -104 80 -163.5t195 -59.5q28 0 28 -31zM0 1606zM1024 -442z" />
+<glyph unicode="&#x23ad;" horiz-adv-x="1024" d="M579 829q0 -145 -143 -219q-111 -59 -266 -59q-28 0 -28 31t28 31q104 0 189.5 60t85.5 156v777h134v-777zM0 1606zM1024 -442z" />
+<glyph unicode="&#x23ae;" horiz-adv-x="1329" d="M795 -442h-216v2048h216v-2048zM0 1606zM1329 -442z" />
+<glyph unicode="&#x23af;" d="M2131 582q0 -41 -39 -41h-2138q-39 0 -39 41t39 41h2138q39 0 39 -41z" />
+<glyph unicode="&#x23b0;" horiz-adv-x="1024" d="M916 1606q37 0 37 -25t-39 -32q-29 -2 -59 -5q-167 -28 -241.5 -123t-74.5 -266v-1216q0 -208 -107.5 -294.5t-320.5 -86.5q-40 0 -40 27q0 24 39 31q29 2 59 5q165 28 225 129q48 82 48 261v1215q0 380 474 380z" />
+<glyph unicode="&#x23b1;" horiz-adv-x="1024" d="M953 -415q0 -27 -40 -27q-213 0 -320.5 86.5t-107.5 294.5v1216q0 171 -74.5 266t-241.5 123q-30 3 -59 5q-39 7 -39 32t37 25q474 0 474 -380v-1215q0 -179 48 -261q60 -101 225 -129q30 -3 59 -5q39 -7 39 -31z" />
+<glyph unicode="&#x23b2;" horiz-adv-x="2636" d="M1287 745h-894l852 -1169q7 -10 7 -18h-273l-869 1197q-10 14 -10 54t27 40h2186l223 -604h-74q-116 320 -491 431q-232 69 -684 69z" />
+<glyph unicode="&#x23b3;" horiz-adv-x="2636" d="M127 315q-26 0 -26 30q0 6 947 1166l-69 95h273q0 -9 -7 -18l-921 -1124h976q451 0 679 68q373 110 483 431h74l-223 -648h-2186z" />
+<glyph unicode="&#x23b4;" horiz-adv-x="1864" d="M1864 -356q0 -62 -40.5 -62t-40.5 68v309h-1701v-309q0 -68 -41 -68t-41 62v397h1864v-397z" />
+<glyph unicode="&#x23b5;" horiz-adv-x="1864" d="M1864 -41h-1864v397q0 62 40.5 62t40.5 -68v-309h1701v309q0 68 41 68t41 -62v-397z" />
+<glyph unicode="&#x23b6;" horiz-adv-x="1864" d="M1864 363h-1864v397q0 62 40.5 62t40.5 -68v-309h1701v309q0 68 41 68t41 -62v-397zM1864 -356q0 -62 -40.5 -62t-40.5 68v309h-1701v-309q0 -68 -41 -68t-41 62v397h1864v-397z" />
+<glyph unicode="&#x23b7;" horiz-adv-x="1364" d="M1405 1565q0 -8 -2 -14l-610 -1975q-6 -18 -56 -18q-13 0 -18 12l-408 897q-129 -98 -135 -98q-29 0 -29 29q0 9 9 16l243 184q8 6 18.5 6t16.5 -14l350 -769l545 1766q6 19 35 19q41 0 41 -41z" />
+<glyph unicode="&#x23b8;" horiz-adv-x="1591" d="M282 -4q0 -39 -41 -39t-41 39v1175q0 37 41 37t41 -37v-1175z" />
+<glyph unicode="&#x23b9;" horiz-adv-x="1591" d="M1391 -4q0 -39 -41 -39t-41 39v1175q0 37 41 37t41 -37v-1175z" />
+<glyph unicode="&#x23ba;" horiz-adv-x="1591" d="M1391 1167q0 -41 -37 -41h-1115q-39 0 -39 41t39 41h1115q37 0 37 -41z" />
+<glyph unicode="&#x23bb;" horiz-adv-x="1591" d="M1391 1167q0 -41 -37 -41h-1115q-39 0 -39 41t39 41h1115q37 0 37 -41z" />
+<glyph unicode="&#x23bc;" horiz-adv-x="1591" d="M1391 1167q0 -41 -37 -41h-1115q-39 0 -39 41t39 41h1115q37 0 37 -41z" />
+<glyph unicode="&#x23bd;" horiz-adv-x="1591" d="M1391 1167q0 -41 -37 -41h-1115q-39 0 -39 41t39 41h1115q37 0 37 -41z" />
+<glyph unicode="&#x23be;" horiz-adv-x="577" d="M437 1050q40 0 40 -30.5t-44 -30.5h-272v-946q0 -44 -30.5 -44t-30.5 45v961q0 30 10.5 37.5t34.5 7.5h292z" />
+<glyph unicode="&#x23bf;" horiz-adv-x="577" d="M433 61q44 0 44 -30.5t-44 -30.5h-288q-30 0 -37.5 10.5t-7.5 34.5v961q0 45 30.5 45t30.5 -44v-946h272z" />
+<glyph unicode="&#x23c0;" horiz-adv-x="1210" d="M994 944q142 -153 142 -361.5t-142.5 -361.5t-347.5 -169v-187q0 -39 -41 -39t-41 39v187q-206 16 -348 169t-142 362t141.5 361.5t348.5 167.5v225q0 37 41 37t41 -37v-225q206 -15 348 -168zM935.5 279q118.5 129 118.5 303.5t-118 303t-290 144.5v-896 q171 16 289.5 145zM273.5 886.5q-117.5 -128.5 -117.5 -303.5t118 -304t290 -145v896q-173 -15 -290.5 -143.5z" />
+<glyph unicode="&#x23c1;" horiz-adv-x="1210" d="M994 944q142 -153 142 -361.5t-142.5 -361.5t-347.5 -169v-187q0 -39 -41 -39t-41 39v187q-206 16 -348 169t-142 362t141.5 361.5t348.5 167.5v180h-355q-39 0 -39 41t39 41h794q37 0 37 -41t-37 -41h-357v-180q206 -15 348 -168zM935.5 279q118.5 129 118.5 303.5 t-118 303t-290 144.5v-896q171 16 289.5 145zM273.5 886.5q-117.5 -128.5 -117.5 -303.5t118 -304t290 -145v896q-173 -15 -290.5 -143.5z" />
+<glyph unicode="&#x23c2;" horiz-adv-x="1210" d="M994 944q142 -153 142 -361.5t-142.5 -361.5t-347.5 -169v-144h357q37 0 37 -41t-37 -41h-794q-39 0 -39 41t39 41h355v144q-206 16 -348 169t-142 362t141.5 361.5t348.5 167.5v223q0 39 41 39t41 -39v-223q206 -15 348 -168zM935.5 279q118.5 129 118.5 303.5t-118 303 t-290 144.5v-896q171 16 289.5 145zM273.5 886.5q-117.5 -128.5 -117.5 -303.5t118 -304t290 -145v896q-173 -15 -290.5 -143.5z" />
+<glyph unicode="&#x23c3;" horiz-adv-x="1210" d="M1158 94q0 -35 -43 -35h-469v-194q0 -39 -41 -39t-41 39v194h-469q-43 0 -43 35q0 12 6 24l506 1002v217q0 37 41 37t41 -37v-217l506 -1002q6 -12 6 -24zM646 141h402l-402 797v-797zM564 141v797l-402 -797h402z" />
+<glyph unicode="&#x23c4;" horiz-adv-x="1210" d="M1158 94q0 -35 -43 -35h-469v-194q0 -39 -41 -39t-41 39v194h-469q-43 0 -43 35q0 12 6 24l506 1002v172h-355q-39 0 -39 41t39 41h794q37 0 37 -41t-37 -41h-357v-172l506 -1002q6 -12 6 -24zM646 141h402l-402 797v-797zM564 141v797l-402 -797h402z" />
+<glyph unicode="&#x23c5;" horiz-adv-x="1210" d="M1158 94q0 -35 -43 -35h-469v-151h357q37 0 37 -41t-37 -41h-794q-39 0 -39 41t39 41h355v151h-469q-43 0 -43 35q0 12 6 24l506 1002v215q0 39 41 39t41 -39v-215l506 -1002q6 -12 6 -24zM646 141h402l-402 797v-797zM564 141v797l-402 -797h402z" />
+<glyph unicode="&#x23c6;" horiz-adv-x="1210" d="M1167 730q0 -130 -80.5 -241t-196 -111t-244.5 111v-624q0 -39 -41 -39t-41 39v697q-130 112 -235 112q-126 0 -189 -123q-12 -24 -30 -127q-8 -47 -32 -47q-35 0 -35 57q0 130 80 241t196.5 111t244.5 -110v661q0 37 41 37t41 -37v-733q131 -114 235 -114q145 0 201 152 q2 5 18 98q8 47 32 47q35 0 35 -57z" />
+<glyph unicode="&#x23c7;" horiz-adv-x="1210" d="M1167 730q0 -130 -80.5 -241t-196 -111t-244.5 111v-624q0 -39 -41 -39t-41 39v697q-130 112 -235 112q-126 0 -189 -123q-12 -24 -30 -127q-8 -47 -32 -47q-35 0 -35 57q0 130 80 241t196.5 111t244.5 -110v616h-355q-39 0 -39 41t39 41h794q37 0 37 -41t-37 -41h-357 v-688q131 -114 235 -114q145 0 201 152q2 5 18 98q8 47 32 47q35 0 35 -57z" />
+<glyph unicode="&#x23c8;" horiz-adv-x="1210" d="M1167 730q0 -130 -80.5 -241t-196 -111t-244.5 111v-581h357q37 0 37 -41t-37 -41h-794q-39 0 -39 41t39 41h355v654q-130 112 -235 112q-126 0 -189 -123q-12 -24 -30 -127q-8 -47 -32 -47q-35 0 -35 57q0 130 80 241t196.5 111t244.5 -110v659q0 39 41 39t41 -39v-731 q131 -114 235 -114q145 0 201 152q2 5 18 98q8 47 32 47q35 0 35 -57z" />
+<glyph unicode="&#x23c9;" horiz-adv-x="1210" d="M1040 1333q0 -41 -37 -41h-357v-1427q0 -39 -41 -39t-41 39v1427h-355q-39 0 -39 41t39 41h794q37 0 37 -41z" />
+<glyph unicode="&#x23ca;" horiz-adv-x="1210" d="M1040 -133q0 -41 -37 -41h-794q-39 0 -39 41t39 41h355v1427q0 39 41 39t41 -39v-1427h357q37 0 37 -41z" />
+<glyph unicode="&#x23cb;" horiz-adv-x="577" d="M477 44q0 -45 -30.5 -45t-30.5 44v946h-273q-43 0 -43 30.5t39 30.5h293q30 0 37.5 -10.5t7.5 -34.5v-961z" />
+<glyph unicode="&#x23cc;" horiz-adv-x="577" d="M477 45q0 -30 -10.5 -37.5t-34.5 -7.5h-289q-43 0 -43 30.5t43 30.5h273v946q0 44 30.5 44t30.5 -45v-961z" />
+<glyph unicode="&#x23cd;" horiz-adv-x="1372" d="M781 1050l-286 -538h-56l162 538h180zM1272 45q0 -31 -11.5 -38t-33.5 -7h-1082q-45 0 -45 40v965q0 30 10.5 37.5t34.5 7.5h292q40 0 40 -30.5t-44 -30.5h-272v-928h1050v928h-272q-44 0 -44 30.5t40 30.5h292q30 0 37.5 -10.5t7.5 -34.5v-960z" />
+<glyph unicode="&#x23ce;" horiz-adv-x="1757" d="M1587 913q0 -65 -36 -101l-632 -629q-38 -38 -183 -38v-206q0 -46 -35 -46q-18 0 -35 17l-484 485q-12 12 -12 29t12 29l484 485q17 17 35 17q35 0 35 -46v-206h292v741q0 46 35 46q18 0 35 -17l209 -210l210 210q17 17 35 17q35 0 35 -46v-531zM1505 913v432l-169 -169 q-11 -11 -28.5 -11t-28.5 11l-169 169v-642h215l168 167q12 12 12 43zM695 621q-41 0 -41 41v148l-385 -386l385 -386v148q0 41 41 41q152 0 166 14l381 380h-547z" />
+<glyph unicode="&#x23cf;" horiz-adv-x="1628" d="M1406 512h-1184l592 984zM1406 0h-1184v300h1184v-300z" />
+<glyph unicode="&#x23d0;" horiz-adv-x="1024" d="M553 -401q0 -41 -41 -41t-41 41v1966q0 41 41 41t41 -41v-1966z" />
+<glyph unicode="&#x23d1;" horiz-adv-x="1110" d="M1090 429q0 -7 -15 -27q-204 -268 -520 -268t-520 268q-15 20 -15 27q0 18 20 18q11 0 40 -27q184 -173 475 -173t475 173q29 27 40 27q20 0 20 -18z" />
+<glyph unicode="&#x23d2;" horiz-adv-x="1110" d="M1090 429q0 -7 -15 -27q-204 -268 -520 -268t-520 268q-15 20 -15 27q0 18 20 18q11 0 40 -27q184 -173 475 -173t475 173q29 27 40 27q20 0 20 -18zM1090 632q0 -41 -37 -41h-994q-39 0 -39 41t39 41h994q37 0 37 -41z" />
+<glyph unicode="&#x23d3;" horiz-adv-x="1110" d="M1090 829q0 -7 -15 -27q-204 -268 -520 -268t-520 268q-15 20 -15 27q0 18 20 18q11 0 40 -27q184 -173 475 -173t475 173q29 27 40 27q20 0 20 -18zM1090 332q0 -41 -37 -41h-994q-39 0 -39 41t39 41h994q37 0 37 -41z" />
+<glyph unicode="&#x23d4;" horiz-adv-x="2220" d="M2200 429q0 -7 -15 -27q-204 -268 -520 -268t-520 268q-15 20 -15 27q0 18 20 18q11 0 40 -27q184 -173 475 -173t475 173q29 27 40 27q20 0 20 -18zM1090 429q0 -7 -15 -27q-204 -268 -520 -268t-520 268q-15 20 -15 27q0 18 20 18q11 0 40 -27q184 -173 475 -173 t475 173q29 27 40 27q20 0 20 -18zM2200 632q0 -41 -37 -41h-2104q-39 0 -39 41t39 41h2104q37 0 37 -41z" />
+<glyph unicode="&#x23d5;" horiz-adv-x="2220" d="M2200 829q0 -7 -15 -27q-204 -268 -520 -268t-520 268q-15 20 -15 27q0 18 20 18q11 0 40 -27q184 -173 475 -173t475 173q29 27 40 27q20 0 20 -18zM1090 829q0 -7 -15 -27q-204 -268 -520 -268t-520 268q-15 20 -15 27q0 18 20 18q11 0 40 -27q184 -173 475 -173 t475 173q29 27 40 27q20 0 20 -18zM2200 332q0 -41 -37 -41h-2104q-39 0 -39 41t39 41h2104q37 0 37 -41z" />
+<glyph unicode="&#x23d6;" horiz-adv-x="2220" d="M2200 429q0 -7 -15 -27q-204 -268 -537.5 -268t-537.5 262q-204 -262 -537.5 -262t-537.5 268q-15 20 -15 27q0 18 20 18q11 0 40 -27q184 -173 495 -173t495 173q29 27 40 27t40 -27q184 -173 495 -173t495 173q29 27 40 27q20 0 20 -18z" />
+<glyph unicode="&#x23d7;" horiz-adv-x="1110" d="M1090 41q0 -41 -37 -41h-994q-39 0 -39 41t39 41h949v432q0 37 41 37t41 -37v-473z" />
+<glyph unicode="&#x23d8;" horiz-adv-x="1110" d="M1090 41q0 -41 -37 -41h-996q-37 0 -37 41v473q0 37 41 37t41 -37v-432h906v432q0 37 41 37t41 -37v-473z" />
+<glyph unicode="&#x23d9;" horiz-adv-x="1110" d="M1090 41q0 -41 -37 -41h-996q-37 0 -37 41v473q0 37 41 37t41 -37v-432h412v432q0 37 41 37t41 -37v-432h412v432q0 37 41 37t41 -37v-473z" />
+<glyph unicode="&#x23da;" horiz-adv-x="1480" d="M1451 513q0 -41 -37 -41h-1346q-39 0 -39 41t39 41h631v898q0 37 41 37t41 -37v-898h633q37 0 37 -41zM1301 236q0 -41 -37 -41h-1046q-39 0 -39 41t39 41h1046q37 0 37 -41zM1151 -41q0 -41 -37 -41h-746q-39 0 -39 41t39 41h746q37 0 37 -41zM1001 -318q0 -41 -37 -41 h-446q-39 0 -39 41t39 41h446q37 0 37 -41z" />
+<glyph unicode="&#x23db;" d="M1878 390q0 -40 -36 -40h-194v-313q0 -37 -37 -37h-1203q-35 0 -35 37v313h-165q-38 0 -38 40t38 40h165v319q0 35 35 35h1203q37 0 37 -35v-319h194q36 0 36 -40zM1569 430v275h-1117v-275h1117zM1569 79v271h-1117v-271h1117z" />
+<glyph unicode="&#x23dc;" horiz-adv-x="1864" d="M1864 -210q0 -24 -27 -24q-11 0 -20 11q-33 44 -105 127q-291 293 -780 293t-780 -293q-24 -24 -105 -127q-9 -11 -20 -11q-27 0 -27 24q0 10 5 17q153 229 400.5 356.5t526.5 127.5t526.5 -127.5t400.5 -356.5q5 -7 5 -17z" />
+<glyph unicode="&#x23dd;" horiz-adv-x="1864" d="M1864 267q0 -10 -5 -17q-153 -229 -400.5 -356.5t-526.5 -127.5t-526.5 127.5t-400.5 356.5q-5 7 -5 17q0 24 27 24q11 0 20 -11q33 -44 105 -127q291 -293 780 -293t780 293q24 24 105 127q9 11 20 11q27 0 27 -24z" />
+<glyph unicode="&#x23de;" horiz-adv-x="1864" d="M1864 -332q0 -41 -20.5 -41t-24.5 18q-9 154 -94 237q-43 42 -114 54q-34 5 -129 5h-277q-89 0 -132 21q-96 47 -141 202q-45 -155 -141 -202q-42 -21 -131 -21h-277q-95 0 -129 -5q-71 -12 -114 -54q-85 -83 -94 -237q-4 -18 -23 -18q-23 0 -23 41q0 174 78 285 q51 73 116 93q42 13 149 13h313q117 0 181 72t73 190q2 33 21 33t22 -18t4 -35q31 -242 252 -242h313q107 0 149 -13q65 -20 116 -93q77 -109 77 -285z" />
+<glyph unicode="&#x23df;" horiz-adv-x="1864" d="M1864 332q0 -174 -78 -285q-51 -73 -116 -93q-42 -13 -149 -13h-313q-117 0 -181 -72t-73 -190q-2 -33 -21 -33t-22 18t-4 35q-31 242 -252 242h-313q-107 0 -149 13q-65 20 -116 93q-77 109 -77 285q0 41 20.5 41t24.5 -18q9 -154 94 -237q43 -42 114 -54q34 -5 129 -5 h277q89 0 132 -21q96 -47 141 -202q45 155 141 202q42 21 131 21h277q95 0 129 5q71 12 114 54q85 83 94 237q4 18 23 18q23 0 23 -41z" />
+<glyph unicode="&#x23e0;" horiz-adv-x="1864" d="M1442 -56h-1020q-47 0 -188.5 -122.5t-161.5 -155.5h-72l287 390h1290l287 -390h-72q-20 33 -161.5 155.5t-188.5 122.5z" />
+<glyph unicode="&#x23e1;" horiz-adv-x="1864" d="M422 56h1020q47 0 188.5 122.5t161.5 155.5h72l-287 -390h-1290l-287 390h72q20 -33 161.5 -155.5t188.5 -122.5z" />
+<glyph unicode="&#x23e2;" horiz-adv-x="1591" d="M1556 78q0 -78 -83 -78h-1283q-34 0 -58 24t-24 58v6l93 1222q2 31 26.5 53.5t55.5 22.5h725q57 0 77 -53l465 -1222q6 -16 6 -33zM1473 82l-465 1222h-725l-93 -1222h1283z" />
+<glyph unicode="&#x23e3;" horiz-adv-x="1864" d="M1694 166q0 -24 -21 -36l-721 -416q-5 -3 -20 -3t-20 3l-721 416q-21 12 -21 36v832q0 24 21 36l721 416q5 3 20 3t20 -3l721 -416q21 -12 21 -36v-832zM1612 190v784l-680 393l-680 -393v-784l680 -393zM1401 582q0 -192 -138.5 -330.5t-331 -138.5t-330.5 138t-138 331 t138 331t330.5 138t331 -138.5t138.5 -330.5zM1319 582q0 158 -114.5 272.5t-273 114.5t-272.5 -114t-114 -273t114 -273t272.5 -114t273 114.5t114.5 272.5z" />
+<glyph unicode="&#x23e4;" horiz-adv-x="1930" d="M1780 582q0 -41 -37 -41h-1554q-39 0 -39 41t39 41h1554q37 0 37 -41z" />
+<glyph unicode="&#x23e5;" horiz-adv-x="1930" d="M1815 823q0 -12 -8 -26l-448 -776q-12 -21 -36 -21h-1165q-43 0 -43 35q0 12 8 26l448 776q12 21 36 21h1165q43 0 43 -35zM1700 776h-1070l-400 -694h1070z" />
+<glyph unicode="&#x23e6;" horiz-adv-x="1674" d="M1559 584q0 -14 -11 -27q-105 -121 -164 -167q-101 -78 -203 -78t-199 72q-62 46 -161 157h-667q-39 0 -39 41q0 14 11 27q105 121 164 167q101 78 204 78t201 -72q65 -48 162 -159h663q39 0 39 -39zM931 541q138 -147 247.5 -147t247.5 147h-495zM747 623 q-139 149 -250.5 149t-250.5 -149h501z" />
+<glyph unicode="&#x23e7;" d="M1801 916q0 -25 -24 -36l-629 -279q8 -30 8 -59q0 -113 -90 -186l387 -698q6 -11 6 -21q0 -41 -43 -41q-23 0 -35 22l-386 698q-39 -14 -80.5 -14t-84.5 17l-411 -684q-13 -21 -34 -21q-43 0 -43 41q0 12 6 22l412 684q-84 73 -84 181q0 154 143 219l-166 668q-2 8 -2 11 q0 40 43 40q30 0 38 -32l167 -667q13 1 17 1q125 0 198 -107l629 280q9 4 19 4q39 0 39 -43zM640 1071q0 -11 -22 -46q-48 -75 -80 -204q-13 -52 -34 -52q-17 0 -46 32q-89 98 -166 142q-45 26 -45 46q0 32 33.5 32t146.5 -91l-108 433q-2 8 -2 11q0 40 43 40q30 0 38 -32 l108 -432q64 152 103 152q31 0 31 -31z" />
+<glyph unicode="&#x23e8;" horiz-adv-x="1401" d="M1276 514q63 -111 63 -325.5t-59 -321.5q-91 -166 -273.5 -166t-273.5 144q-71 112 -71 331t58 328q91 170 278 170t278 -160zM1190 116v173q0 335 -190 335t-190 -336q0 -27 0.5 -80.5t0.5 -80.5q0 -158 25 -238q42 -138 164 -138q190 0 190 365zM142 -206l84 -2 q93 0 106 24q5 9 5 30v708q-80 -31 -204 -31v62q193 0 290 89h12q38 0 38 -45v-786q0 -18 5 -28q11 -21 175 -21h15v-64q-67 5 -105 5h-316q-38 0 -105 -5v64z" />
+<glyph unicode="&#x23e9;" d="M1942 628l-836 -628v1256zM1042 628l-836 -628v1256z" />
+<glyph unicode="&#x23ea;" d="M1842 0l-836 628l836 628v-1256zM942 0l-836 628l836 628v-1256z" />
+<glyph unicode="&#x23eb;" horiz-adv-x="1656" d="M1456 664h-1256l628 836zM1456 -236h-1256l628 836z" />
+<glyph unicode="&#x23ec;" horiz-adv-x="1656" d="M1456 1400l-628 -836l-628 836h1256zM1456 500l-628 -836l-628 836h1256z" />
+<glyph unicode="&#x23ed;" d="M1918 0h-233v1256h233v-1256zM1577 628l-689 -628v1256zM834 628l-689 -628v1256z" />
+<glyph unicode="&#x23ee;" d="M1903 0l-689 628l689 628v-1256zM1160 0l-689 628l689 628v-1256zM363 0h-233v1256h233v-1256z" />
+<glyph unicode="&#x23ef;" d="M1750 0h-233v1256h233v-1256zM1236 0h-233v1256h233v-1256zM895 628l-689 -628v1256z" />
+<glyph unicode="&#x23f0;" d="M1900 1145q0 -71 -40 -141l-630 357q81 143 235 143q85 0 184 -47l35 61l78 -44l-34 -61q172 -115 172 -268zM148 1145q0 153 172 268l-34 61l78 44l35 -61q99 47 184 47q154 0 235 -143l-630 -357q-40 70 -40 141zM1782 470q0 -357 -276 -585l156 -227q10 -15 10 -30 q0 -44 -44 -44q-18 0 -35 17l-202 206q-171 -95 -367 -95t-367 95l-202 -206q-17 -17 -35 -17q-44 0 -44 44q0 15 10 30l156 227q-276 228 -276 585q0 310 216.5 530.5t525.5 227.5v146h-85q-50 0 -50 50t50 50h202q50 0 50 -50t-50 -50h-85v-146q309 -7 525.5 -227.5 t216.5 -530.5zM1511 440v60h85q-6 122 -61 230l-74 -42l-30 51l74 43q-67 102 -169 169l-43 -74l-51 30l42 74q-108 55 -230 61v-85h-60v85q-122 -6 -230 -61l42 -74l-51 -30l-43 74q-102 -67 -169 -169l74 -43l-30 -51l-74 42q-55 -108 -61 -230h85v-60h-85q6 -122 61 -230 l74 42l30 -51l-74 -43q67 -102 169 -169l43 74l51 -30l-42 -74q108 -55 230 -61v85h60v-85q122 6 230 61l-42 74l51 30l43 -74q102 67 169 169l-74 43l30 51l74 -42q55 108 61 230h-85zM1072 462q-6 -41 -50.5 -41t-46.5 46l-206 156l36 48l204 -154q7 2 16 2t19 -4l373 224 l31 -52z" />
+<glyph unicode="&#x23f1;" d="M1802 1240l-111 -112l-116 112l112 115zM1176 1419h-299v159h299v-159zM1591.5 1148.5q231.5 -230.5 231.5 -565t-233 -564.5t-566 -230t-566 230t-233 564.5t231.5 565t567.5 230.5t567.5 -230.5zM1516.5 92.5q199.5 196.5 199.5 488.5t-200.5 491.5t-491.5 199.5 t-491.5 -199.5t-200.5 -491.5t199.5 -488.5t492.5 -196.5t492.5 196.5zM1369 1107q-12 -18 -31 -56q-20 11 -56 38l35 56zM1586 865l-56 -31q-12 20 -31 60l59 27q10 -18 28 -56zM1652 551h-66v66h66v-66zM1065 1049v-578h-78v577h-47l84 170l86 -169h-45zM1586 295l-35 -55 q-24 12 -55 38l31 52q4 -2 59 -35zM766 1089q-2 -2 -56 -38q-5 12 -31 56q18 12 52 38zM1369 54l-56 -31q-19 28 -31 59q23 14 56 27q12 -18 31 -55zM549 894l-31 -60l-56 31q10 18 28 56zM462 551h-66v66h66v-66zM1060 -47h-66v66h66v-66zM552 278q-2 -5 -55 -38l-35 55 q19 12 59 35zM766 82q-12 -31 -31 -59l-56 31q5 11 31 55q33 -13 56 -27z" />
+<glyph unicode="&#x23f2;" d="M1942 586q0 -468 -391 -754q-220 -162 -523 -162q-379 0 -650.5 267t-271.5 644.5t269.5 647t647 269.5t648.5 -267t271 -645zM1816 588q0 192 -75 338q-110 214 -297 332t-424 118q-325 0 -558 -232.5t-233 -558t233.5 -557.5t560 -232t560 232.5t233.5 559.5zM1662 909 q-9 -4 -63 -36l-36 64l68 44zM1413 1190l-36 -64l-67 40q0 1 36 60q32 -13 67 -36zM991 1272v11q0 11 -3 23h76v-74q-31 1 -50 1t-26 -1q3 32 3 40zM1667 548v79q14 -2 31 -2h11q15 0 33 3l1 -80h-76zM735 1162q-22 -12 -68 -32l-36 60q32 24 64 40q14 -22 40 -68zM1663 259 q-14 -35 -36 -68l-64 36l36 67q22 -11 64 -35zM1164 599q0 -54 -42 -106.5t-95 -52.5t-153 78l-231 201q-25 21 -83.5 59.5t-58.5 64.5t15.5 47.5t39.5 21.5q-5 0 147 -61l268 -94q193 -80 193 -158zM482 942l-36 -69l-68 40q14 21 36 64zM1413 -22l-63 -40l-36 63 q10 10 60 40zM988 -59h76v-77q-14 2 -33 2t-43 -2v77zM374 545h-76v74q14 -2 32 -2h10q16 0 34 3v-75zM482 231q-31 -23 -59 -40q-7 1 -41 56q24 25 56 44q20 -20 44 -60zM727 9q-13 -32 -36 -67q-6 4 -63 36l35 67z" />
+<glyph unicode="&#x23f3;" horiz-adv-x="1552" d="M966 594q281 -199 287 -815h141q58 0 58 -73.5t-58 -73.5h-1236q-58 0 -58 71q0 26 14.5 51t38.5 25h146q0 602 287 808q-281 199 -287 815h-141q-58 0 -58 73.5t58 73.5h1236q58 0 58 -71q0 -26 -14.5 -51t-38.5 -25h-146q0 -602 -287 -808zM989 437q-17 21 -73 68.5 t-56 88t48 81.5q25 21 73 69q171 205 172 658h-754q4 -463 164 -658q17 -21 73 -68.5t56 -88t-48 -81.5q-25 -21 -73 -69q-171 -205 -172 -658h754q-4 463 -164 658zM1028 926q-10 -26 -22 -50h-465q-12 23 -23 50h510zM981 830q-17 -28 -35 -50h-341q-22 27 -37 50h413z M914 747q-19 -16 -56 -50h-170l-54 50h280zM801 175h-50v455h50v-455zM1085 55h-614l9 50h597q3 -17 8 -50zM1097 -60h-641q3 32 5 50h632q2 -23 4 -50zM451 -146q0 17 2 50h646l2 -50h-650z" />
+<glyph unicode="&#x23f4;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x23f5;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x23f6;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x23f7;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x23f8;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x23f9;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x23fa;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x23fb;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x23fc;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x23fd;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x23fe;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x23ff;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2400;" d="M2016 1350h-98v126h-126v98h224v-224zM1664 1476h-224v98h224v-98zM2016 998h-98v224h98v-224zM1312 1476h-224v98h224v-98zM2016 646h-98v224h98v-224zM960 1476h-224v98h224v-98zM2016 294h-98v224h98v-224zM608 1476h-224v98h224v-98zM2016 -58h-98v224h98v-224z M256 1476h-126v-126h-98v224h224v-98zM2016 -410h-224v98h126v126h98v-224zM130 998h-98v224h98v-224zM1664 -410h-224v98h224v-98zM130 646h-98v224h98v-224zM1312 -410h-224v98h224v-98zM130 294h-98v224h98v-224zM960 -410h-224v98h224v-98zM130 -58h-98v224h98v-224z M608 -410h-224v98h224v-98zM256 -410h-224v224h98v-126h126v-98z" />
+<glyph unicode="&#x2401;" d="M1879 582q0 -356 -249.5 -605.5t-606 -249.5t-605.5 249t-249 606t249 606t605.5 249t606 -249.5t249.5 -605.5zM1716 582q0 289 -201.5 490.5t-490.5 201.5t-490.5 -201.5t-201.5 -490.5t201.5 -490.5t490.5 -201.5t490.5 201.5t201.5 490.5zM1431 854q0 -56 -39.5 -96 t-95.5 -40t-96.5 40t-40.5 96t40.5 95.5t96.5 39.5t95.5 -39.5t39.5 -95.5zM849 950q40 -39 40 -95.5t-40.5 -96.5t-96.5 -40t-95.5 40t-39.5 96t39.5 95.5t96 39.5t96.5 -39zM1024 25q-219 0 -358 143.5t-171 366.5h122q79 -332 407 -332t407 332h122q-32 -223 -171 -366.5 t-358 -143.5z" />
+<glyph unicode="&#x2402;" d="M1879 582q0 -356 -249.5 -605.5t-606 -249.5t-605.5 249t-249 606t249 606t605.5 249t606 -249.5t249.5 -605.5zM1431 854q0 56 -39.5 95.5t-95.5 39.5t-96.5 -39.5t-40.5 -95.5t40.5 -96t96.5 -40t95.5 40t39.5 96zM848.5 758q40.5 40 40.5 96.5t-40 95.5t-96.5 39 t-96 -39.5t-39.5 -95.5t39.5 -96t95.5 -40t96.5 40zM1024 203q-328 0 -407 332h-122q32 -223 171 -366.5t358 -143.5t358 143.5t171 366.5h-122q-79 -332 -407 -332z" />
+<glyph unicode="&#x2403;" d="M1706 893q0 -283 -328 -612l-138 -135q-76 -80 -110 -141t-46 -92l-21 -56q-14 -25 -39 -25t-34.5 21t-29 70t-57 105.5t-234.5 252.5q-90 89 -163 185q-164 215 -164 420.5t80.5 342.5t259.5 137q109 0 201 -63.5t141 -165.5q50 104 140.5 166.5t201.5 62.5 q180 0 260 -136t80 -337z" />
+<glyph unicode="&#x2404;" d="M1706 578q0 -15 -11 -27l-119 -116q-269 -280 -467 -651q-15 -35 -51 -99q-13 -19 -34.5 -19t-34.5 19l-51 99q-197 370 -467 651q-41 37 -119 116q-10 11 -10 26.5t10 28.5l79 74q76 74 165 181q190 228 335 497q17 39 58 112q14 19 35 19t34 -19l58 -112 q145 -270 335 -497q89 -106 165 -181q28 -23 79 -74q11 -13 11 -28z" />
+<glyph unicode="&#x2405;" d="M1692 620q72 -115 72 -269.5t-98 -275t-252 -120.5q-95 0 -170.5 49t-75.5 139h-102q0 -131 28.5 -252t28.5 -116q0 -41 -38 -41h-122q-37 0 -37 41q0 -5 28 116t28 252h-102q0 -90 -75.5 -139t-170.5 -49q-154 0 -252 120.5t-98 275t72 269.5q83 134 225 134 q120 0 190 -88l48 94q-158 118 -158 330q0 158 103.5 278.5t259.5 120.5t259.5 -120.5t103.5 -278.5q0 -212 -158 -330l48 -94q70 88 190 88q142 0 225 -134z" />
+<glyph unicode="&#x2406;" d="M1588 760q118 -163 118 -340t-47 -295q-68 -170 -222 -170q-103 0 -178 42q-92 51 -92 146h-102q0 -136 28.5 -254.5t28.5 -113.5q0 -41 -37 -41h-121q-39 0 -39 41q0 1 2 8q56 184 56 360h-103q0 -95 -91 -146q-74 -42 -177 -42q-151 0 -210.5 140.5t-59.5 320.5 t118 343q69 96 248 263q134 125 236 345l43 97q12 25 37 25t39 -25q16 -41 50 -122q87 -190 226 -320q182 -171 249 -262z" />
+<glyph unicode="&#x2407;" d="M1446 582q0 -176 -123 -299t-299 -123t-299 123t-123 299t123 299t299 123t299 -123t123 -299z" />
+<glyph unicode="&#x2408;" d="M2048 -442h-2048v2048h2048v-2048zM1446 582q0 176 -123 299t-299 123t-299 -123t-123 -299t123 -299t299 -123t299 123t123 299z" />
+<glyph unicode="&#x2409;" d="M1879 582q0 -356 -249.5 -605.5t-606 -249.5t-605.5 249t-249 606t249 606t605.5 249t606 -249.5t249.5 -605.5zM1736 582q0 297 -207.5 504.5t-504.5 207.5t-504.5 -207.5t-207.5 -504.5t207.5 -504.5t504.5 -207.5t504.5 207.5t207.5 504.5z" />
+<glyph unicode="&#x240a;" d="M2048 -442h-2048v2048h2048v-2048zM1630 -24q249 249 249 605.5t-249.5 606t-605.5 249.5t-605.5 -249.5t-249.5 -605.5t249.5 -605.5t606 -249.5t605.5 249zM1736 582q0 -297 -207.5 -504.5t-504.5 -207.5t-504.5 207.5t-207.5 504.5t207.5 504.5t504.5 207.5 t504.5 -207.5t207.5 -504.5z" />
+<glyph unicode="&#x240b;" d="M1874 774h-152v380l-328 -325q139 -199 139 -420q0 -281 -200.5 -480t-482 -199t-479 198.5t-197.5 482.5t198 480.5t484 196.5q232 0 432 -152l317 316h-386v151h655v-629zM1382 409q0 221 -153.5 374.5t-374.5 153.5t-375 -153.5t-154 -374.5t154 -374.5t375 -153.5 t374.5 153.5t153.5 374.5z" />
+<glyph unicode="&#x240c;" d="M1504 1386.5q199 -199.5 199 -472t-174.5 -462t-438.5 -226.5v-237h450v-154h-450v-257h-154v257h-450v154h450v238q-261 47 -426 232t-165 458.5t196.5 471t480 197.5t482.5 -199.5zM1551 906q0 220 -154.5 374.5t-374.5 154.5t-374.5 -154.5t-154.5 -374.5t154.5 -374 t374.5 -154t374.5 154t154.5 374z" />
+<glyph unicode="&#x240d;" d="M1587 582q0 -211 -181 -516h-32q86 199 98 232q51 139 51 243q0 180 -136 341t-313 171v-1159q0 -146 -126 -241t-278 -95q-89 0 -149 45t-60 131q0 136 125.5 236t255 100t182.5 -47v1583h50q32 -211 116 -332q33 -47 147 -175.5t166 -217.5q84 -143 84 -299z" />
+<glyph unicode="&#x240e;" d="M1721 -106q0 -146 -126 -241t-278 -95q-89 0 -149 45t-60 131q0 136 125.5 236t255 100t182.5 -47v1128l-731 207v-1264q0 -146 -126 -241t-278 -95q-89 0 -149 45t-60 131q0 136 125.5 236t255 100t182.5 -47v1383l831 -236v-1476z" />
+<glyph unicode="&#x240f;" d="M1942 493h-302q-29 -157 -118 -284l211 -211l-125 -126l-212 212q-136 -93 -283 -118v-302h-178v302q-147 25 -283 118l-212 -212l-126 126l212 211q-89 127 -118 284h-302v178h302q29 157 118 284l-212 211l126 126l212 -212q136 93 283 118v302h178v-302 q147 -25 283 -118l212 212l125 -126l-211 -211q89 -127 118 -284h302v-178zM1468 582q0 185 -129.5 314.5t-315 129.5t-314.5 -129t-129 -314.5t129.5 -315t314.5 -129.5t314.5 129.5t129.5 314.5z" />
+<glyph unicode="&#x2410;" d="M1734 582l-1420 -710v1420z" />
+<glyph unicode="&#x2411;" d="M1734 -128l-1420 710l1420 710v-1420z" />
+<glyph unicode="&#x2412;" d="M1686 279l-662 -687l-662 687l69 -10l533 -309v1244l-533 -309l-69 -10l662 687l662 -687l-69 10l-533 309v-1244l533 309z" />
+<glyph unicode="&#x2413;" d="M1430 1220q0 -40 -4 -76l-102 -918h-43l-100 918q-7 64 -7 90q0 63 34 110t95 47q127 0 127 -171zM874 1220q0 -31 -5 -76l-102 -918h-43l-99 918q-7 65 -7 90q0 63 34 110t95 47q127 0 127 -171zM1427 -86q0 -52 -37 -89t-89 -37t-89 37t-37 89t37 88t89 36t89 -36 t37 -88zM870 -86q0 -52 -36.5 -89t-88.5 -37t-89 37t-37 89t37 88t89 36t88.5 -36t36.5 -88z" />
+<glyph unicode="&#x2414;" d="M1564 1365h-147v-1707h-99v1707h-205v-1707h-101v967q-172 7 -267 38q-140 46 -206 162q-55 97 -55 218q0 247 218 358q108 55 277 55h585v-91z" />
+<glyph unicode="&#x2415;" d="M1147 1254l14 98q0 97 -112 97q-75 0 -126 -52t-51 -120.5t28 -114.5q41 -67 174 -165t199 -171q114 -126 114 -254q0 -214 -225 -349q125 -137 125 -260t-83 -207t-195.5 -84t-190 65.5t-77.5 164.5q0 35 23 62t57 27q77 0 77 -88l-17 -111q0 -39 40 -59.5t94.5 -20.5 t111 51t56.5 117q0 109 -135 228l-252 208q-135 133 -135 278q0 211 225 346q-126 139 -126 262.5t83.5 206.5t195 83t190.5 -63t79 -158t-81 -95q-33 0 -56.5 22.5t-23.5 55.5zM1128 253q156 94 156 216.5t-137 250.5l-228 188q-154 -92 -154 -226q0 -118 135 -243z" />
+<glyph unicode="&#x2416;" d="M1675 275h-1302v620h1302v-620z" />
+<glyph unicode="&#x2417;" d="M964 1572h120v-1462l533 309l69 10l-662 -687l-662 687l69 -10l533 -309v1462zM1619 -442h-1190v120h1190v-120z" />
+<glyph unicode="&#x2418;" d="M1084 -408h-120v1612l-533 -309l-69 -10l662 687l662 -687l-69 10l-533 309v-1612z" />
+<glyph unicode="&#x2419;" d="M964 1572h120v-1612l533 309l69 10l-662 -687l-662 687l69 -10l533 -309v1612z" />
+<glyph unicode="&#x241a;" d="M34 522v120h1612l-309 533l-10 69l687 -662l-687 -662l10 69l309 533h-1612z" />
+<glyph unicode="&#x241b;" d="M2014 522h-1612l309 -533l10 -69l-687 662l687 662l-10 -69l-309 -533h1612v-120z" />
+<glyph unicode="&#x241c;" d="M2014 522h-1794v850h120v-730h1674v-120z" />
+<glyph unicode="&#x241d;" d="M2014 582l-687 -662l10 69l309 533h-1244l309 -533l10 -69l-687 662l687 662l-10 -69l-309 -533h1244l-309 533l-10 69z" />
+<glyph unicode="&#x241e;" d="M1734 0h-1420l710 1420z" />
+<glyph unicode="&#x241f;" d="M1734 1420l-710 -1420l-710 1420h1420z" />
+<glyph unicode="&#x2420;" d="M2016 1350h-98v126h-126v98h224v-224zM1664 1476h-224v98h224v-98zM2016 998h-98v224h98v-224zM1312 1476h-224v98h224v-98zM2016 646h-98v224h98v-224zM960 1476h-224v98h224v-98zM2016 294h-98v224h98v-224zM608 1476h-224v98h224v-98zM2016 -58h-98v224h98v-224z M256 1476h-126v-126h-98v224h224v-98zM2016 -410h-224v98h126v126h98v-224zM130 998h-98v224h98v-224zM1664 -410h-224v98h224v-98zM130 646h-98v224h98v-224zM1312 -410h-224v98h224v-98zM130 294h-98v224h98v-224zM960 -410h-224v98h224v-98zM130 -58h-98v224h98v-224z M608 -410h-224v98h224v-98zM256 -410h-224v224h98v-126h126v-98zM1687 705q0 -153 -141 -212q-45 -19 -228 -19v-217h-152v650h268q253 0 253 -202zM843 615q98 -48 98 -156.5t-98 -166.5q-80 -47 -202.5 -47t-240.5 49v147h9q109 -88 242 -88t133 75q0 51 -99 74 q-154 38 -182 52q-99 50 -99 156.5t95 162.5q79 46 195.5 46t220.5 -42v-141h-8q-95 76 -220 76t-125 -73q0 -50 98 -74q157 -38 183 -50zM1529 701q0 97 -153 97h-58v-215h61q150 0 150 118z" />
+<glyph unicode="&#x2421;" d="M2016 1350h-98v126h-126v98h224v-224zM1664 1476h-224v98h224v-98zM2016 998h-98v224h98v-224zM1312 1476h-224v98h224v-98zM2016 646h-98v224h98v-224zM960 1476h-224v98h224v-98zM2016 294h-98v224h98v-224zM608 1476h-224v98h224v-98zM2016 -58h-98v224h98v-224z M256 1476h-126v-126h-98v224h224v-98zM2016 -410h-224v98h126v126h98v-224zM130 998h-98v224h98v-224zM1664 -410h-224v98h224v-98zM130 646h-98v224h98v-224zM1312 -410h-224v98h224v-98zM130 294h-98v224h98v-224zM960 -410h-224v98h224v-98zM130 -58h-98v224h98v-224z M608 -410h-224v98h224v-98zM256 -410h-224v224h98v-126h126v-98zM1889 257h-453v650h152v-537h301v-113zM1341 257h-455v650h455v-113h-304v-131h282v-113h-282v-180h304v-113zM763.5 783q61.5 -84 61.5 -201t-66.5 -204t-178.5 -110q-53 -11 -133 -11h-221v650h228 q80 0 135 -13q113 -27 174.5 -111zM438 366q229 0 229 216t-229 216h-60v-432h60z" />
+<glyph unicode="&#x2422;" horiz-adv-x="1346" d="M1100 804q75 -125 75 -324t-100 -339q-113 -157 -304 -157q-128 0 -253 69l-10 -53h-145v929l-298 -251v141l298 252v415h155v-284l283 239h168l-451 -380v-225q149 123 304 123q186 0 278 -155zM740 124q275 0 275 343.5t-231 343.5q-131 0 -266 -105v-529 q118 -53 222 -53z" />
+<glyph unicode="&#x2423;" horiz-adv-x="704" d="M704 -264h-704v264h118v-146h468v146h118v-264z" />
+<glyph unicode="&#x2424;" d="M2016 1350h-98v126h-126v98h224v-224zM1664 1476h-224v98h224v-98zM2016 998h-98v224h98v-224zM1312 1476h-224v98h224v-98zM2016 646h-98v224h98v-224zM960 1476h-224v98h224v-98zM2016 294h-98v224h98v-224zM608 1476h-224v98h224v-98zM2016 -58h-98v224h98v-224z M256 1476h-126v-126h-98v224h224v-98zM2016 -410h-224v98h126v126h98v-224zM130 998h-98v224h98v-224zM1664 -410h-224v98h224v-98zM130 646h-98v224h98v-224zM1312 -410h-224v98h224v-98zM130 294h-98v224h98v-224zM960 -410h-224v98h224v-98zM130 -58h-98v224h98v-224z M608 -410h-224v98h224v-98zM256 -410h-224v224h98v-126h126v-98zM1699 257h-453v650h152v-537h301v-113zM1022 257h-150l-288 476v-476h-138v650h188l249 -400v400h139v-650z" />
+<glyph unicode="&#x2425;" d="M1449 1361l-1204 -1204v141l1063 1063h141zM1752 1239l-1385 -1385l-71 71l1385 1385zM1803 866l-1063 -1063h-141l1204 1204v-141z" />
+<glyph unicode="&#x2426;" horiz-adv-x="976" d="M884 1223h-8q-148 92 -337 92q-116 0 -194 -74t-78 -189q0 -231 382 -412v-281h-179v213q-378 184 -378 494q0 178 126.5 284t310 106t355.5 -65v-168zM649 0h-179v187h179v-187z" />
+<glyph unicode="&#x2427;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2428;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2429;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x242a;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x242b;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x242c;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x242d;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x242e;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x242f;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2430;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2431;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2432;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2433;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2434;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2435;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2436;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2437;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2438;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2439;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x243a;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x243b;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x243c;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x243d;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x243e;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x243f;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2440;" horiz-adv-x="1546" d="M1324 966q0 -37 -41 -37t-41 37v373h-428v-1302q0 -37 -37 -37h-518q-37 0 -37 37v418q0 37 41 37t41 -37v-373h428v1302q0 37 37 37h518q37 0 37 -37v-418z" />
+<glyph unicode="&#x2441;" horiz-adv-x="1236" d="M1014 37q0 -37 -41 -37t-41 37v673h-628v-673q0 -39 -41 -39t-41 39v718q0 37 37 37h673v592q0 37 41 37t41 -37v-1347z" />
+<glyph unicode="&#x2442;" horiz-adv-x="1236" d="M1014 664q0 -37 -37 -37h-318v-592q0 -37 -41 -37t-41 37v592h-318q-37 0 -37 37v718q0 39 41 39t41 -39v-673h628v673q0 37 41 37t41 -37v-718z" />
+<glyph unicode="&#x2443;" horiz-adv-x="1236" d="M1014 37q0 -37 -41 -37t-41 37v673h-628v-673q0 -39 -41 -39t-41 39v718q0 37 37 37h318v592q0 37 41 37t41 -37v-592h318q37 0 37 -37v-718z" />
+<glyph unicode="&#x2444;" horiz-adv-x="1236" d="M1014 37q0 -37 -37 -37h-718q-37 0 -37 37v418q0 39 41 39t41 -39v-373h273v1257h-273v-373q0 -39 -41 -39t-41 39v418q0 37 37 37h718q37 0 37 -37v-418q0 -37 -41 -37t-41 37v373h-273v-1257h273v373q0 37 41 37t41 -37v-418z" />
+<glyph unicode="&#x2445;" horiz-adv-x="1628" d="M1406 250l-592 342l592 342v-684zM814 592l-592 -342v684zM1307 421v342l-296 -174zM617 589l-296 174v-342z" />
+<glyph unicode="&#x2446;" horiz-adv-x="1576" d="M1354 960h-432v432h432v-432zM1354 0h-432v432h432v-432zM614 200h-392v984h392v-984z" />
+<glyph unicode="&#x2447;" horiz-adv-x="1604" d="M1382 816h-382v432h382v-432zM900 332h-196v584h196v-584zM604 0h-382v432h382v-432z" />
+<glyph unicode="&#x2448;" horiz-adv-x="1526" d="M1304 960h-382v432h382v-432zM738 0h-196v1184h196v-1184zM418 0h-196v1184h196v-1184z" />
+<glyph unicode="&#x2449;" horiz-adv-x="1804" d="M1582 0h-196v432h196v-432zM1186 0h-382v432h382v-432zM604 0h-382v432h382v-432z" />
+<glyph unicode="&#x244a;" horiz-adv-x="1271" d="M1049 0h-94l-473 1421h94zM789 0h-94l-473 1421h94z" />
+<glyph unicode="&#x244b;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x244c;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x244d;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x244e;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x244f;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2450;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2451;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2452;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2453;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2454;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2455;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2456;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2457;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2458;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2459;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x245a;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x245b;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x245c;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x245d;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x245e;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x245f;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2500;" d="M2048 508h-2048v148h2048v-148z" />
+<glyph unicode="&#x2501;" d="M2048 483h-2048v198h2048v-198z" />
+<glyph unicode="&#x2502;" d="M1098 -442h-148v2048h148v-2048z" />
+<glyph unicode="&#x2503;" d="M1122 -442h-197v2048h197v-2048z" />
+<glyph unicode="&#x2504;" d="M1974 508h-535v148h535v-148zM1291 508h-534v148h534v-148zM609 508h-535v148h535v-148z" />
+<glyph unicode="&#x2505;" d="M1974 483h-535v198h535v-198zM1291 483h-534v198h534v-198zM609 483h-535v198h535v-198z" />
+<glyph unicode="&#x2506;" d="M1098 997h-148v535h148v-535zM1098 315h-148v534h148v-534zM1098 -368h-148v535h148v-535z" />
+<glyph unicode="&#x2507;" d="M1122 997h-197v535h197v-535zM1122 315h-197v534h197v-534zM1122 -368h-197v535h197v-535z" />
+<glyph unicode="&#x2508;" d="M1974 508h-364v148h364v-148zM1462 508h-364v148h364v-148zM950 508h-364v148h364v-148zM438 508h-364v148h364v-148z" />
+<glyph unicode="&#x2509;" d="M1974 483h-364v198h364v-198zM1462 483h-364v198h364v-198zM950 483h-364v198h364v-198zM438 483h-364v198h364v-198z" />
+<glyph unicode="&#x250a;" d="M1098 1168h-148v364h148v-364zM1098 656h-148v364h148v-364zM1098 144h-148v364h148v-364zM1098 -368h-148v364h148v-364z" />
+<glyph unicode="&#x250b;" d="M1122 1168h-197v364h197v-364zM1122 656h-197v364h197v-364zM1122 144h-197v364h197v-364zM1122 -368h-197v364h197v-364z" />
+<glyph unicode="&#x250c;" d="M2048 508h-950v-950h-148v1098h1098v-148z" />
+<glyph unicode="&#x250d;" d="M2048 483h-950v-925h-148v1123h1098v-198z" />
+<glyph unicode="&#x250e;" d="M2048 508h-926v-950h-197v1098h1123v-148z" />
+<glyph unicode="&#x250f;" d="M2048 483h-926v-925h-197v1123h1123v-198z" />
+<glyph unicode="&#x2510;" d="M1098 -442h-148v950h-950v148h1098v-1098z" />
+<glyph unicode="&#x2511;" d="M1098 -442h-148v925h-950v198h1098v-1123z" />
+<glyph unicode="&#x2512;" d="M1123 -442h-198v950h-925v148h1123v-1098z" />
+<glyph unicode="&#x2513;" d="M1123 -442h-198v925h-925v198h1123v-1123z" />
+<glyph unicode="&#x2514;" d="M2048 508h-1098v1098h148v-950h950v-148z" />
+<glyph unicode="&#x2515;" d="M2048 483h-1098v1123h148v-925h950v-198z" />
+<glyph unicode="&#x2516;" d="M2048 508h-1123v1098h197v-950h926v-148z" />
+<glyph unicode="&#x2517;" d="M2048 483h-1123v1123h197v-925h926v-198z" />
+<glyph unicode="&#x2518;" d="M1098 508h-1098v148h950v950h148v-1098z" />
+<glyph unicode="&#x2519;" d="M1098 483h-1098v198h950v925h148v-1123z" />
+<glyph unicode="&#x251a;" d="M1123 508h-1123v148h925v950h198v-1098z" />
+<glyph unicode="&#x251b;" d="M1123 483h-1123v198h925v925h198v-1123z" />
+<glyph unicode="&#x251c;" d="M2048 508h-950v-950h-148v2048h148v-950h950v-148z" />
+<glyph unicode="&#x251d;" d="M2048 483h-950v-925h-148v2048h148v-925h950v-198z" />
+<glyph unicode="&#x251e;" d="M2048 508h-950v-950h-148v1098h-25v950h197v-950h926v-148z" />
+<glyph unicode="&#x251f;" d="M2048 508h-926v-950h-197v950h25v1098h148v-950h950v-148z" />
+<glyph unicode="&#x2520;" d="M2048 508h-926v-950h-197v2048h197v-950h926v-148z" />
+<glyph unicode="&#x2521;" d="M2048 490h-950v-932h-148v925h-25v1123h197v-925h926v-191z" />
+<glyph unicode="&#x2522;" d="M2048 483h-926v-925h-197v1123h25v925h148v-925h950v-198z" />
+<glyph unicode="&#x2523;" d="M2048 483h-926v-925h-197v2048h197v-925h926v-198z" />
+<glyph unicode="&#x2524;" d="M1098 -442h-148v950h-950v148h950v950h148v-2048z" />
+<glyph unicode="&#x2525;" d="M1098 -442h-148v925h-950v198h950v925h148v-2048z" />
+<glyph unicode="&#x2526;" d="M1123 656h-25v-1098h-148v950h-950v148h925v950h198v-950z" />
+<glyph unicode="&#x2527;" d="M1123 -442h-198v950h-925v148h950v950h148v-1098h25v-950z" />
+<glyph unicode="&#x2528;" d="M1123 -442h-198v950h-925v148h925v950h198v-2048z" />
+<glyph unicode="&#x2529;" d="M1123 483h-25v-925h-148v925h-950v198h925v925h198v-1123z" />
+<glyph unicode="&#x252a;" d="M1123 -442h-198v925h-925v198h950v925h148v-925h25v-1123z" />
+<glyph unicode="&#x252b;" d="M1123 -442h-198v925h-925v198h925v925h198v-2048z" />
+<glyph unicode="&#x252c;" d="M2048 508h-950v-950h-148v950h-950v148h2048v-148z" />
+<glyph unicode="&#x252d;" d="M2048 508h-950v-950h-148v925h-950v198h950v-25h1098v-148z" />
+<glyph unicode="&#x252e;" d="M2048 483h-950v-925h-148v950h-950v148h1098v25h950v-198z" />
+<glyph unicode="&#x252f;" d="M2048 483h-950v-925h-148v925h-950v198h2048v-198z" />
+<glyph unicode="&#x2530;" d="M2048 508h-925v-950h-198v950h-925v148h2048v-148z" />
+<glyph unicode="&#x2531;" d="M2048 508h-925v-950h-198v925h-925v198h1123v-25h925v-148z" />
+<glyph unicode="&#x2532;" d="M2048 483h-925v-925h-198v950h-925v148h925v25h1123v-198z" />
+<glyph unicode="&#x2533;" d="M2048 483h-925v-925h-198v925h-925v198h2048v-198z" />
+<glyph unicode="&#x2534;" d="M2048 508h-2048v148h950v950h148v-950h950v-148z" />
+<glyph unicode="&#x2535;" d="M2048 508h-1098v-25h-950v198h950v925h148v-950h950v-148z" />
+<glyph unicode="&#x2536;" d="M2048 483h-950v25h-1098v148h950v950h148v-925h950v-198z" />
+<glyph unicode="&#x2537;" d="M2048 483h-2048v198h950v925h148v-925h950v-198z" />
+<glyph unicode="&#x2538;" d="M2048 508h-2048v148h925v950h198v-950h925v-148z" />
+<glyph unicode="&#x2539;" d="M2048 508h-925v-25h-1123v198h925v925h198v-950h925v-148z" />
+<glyph unicode="&#x253a;" d="M2048 483h-1123v25h-925v148h925v950h198v-925h925v-198z" />
+<glyph unicode="&#x253b;" d="M2048 483h-2048v198h925v925h198v-925h925v-198z" />
+<glyph unicode="&#x253c;" d="M2048 508h-950v-950h-148v950h-950v148h950v950h148v-950h950v-148z" />
+<glyph unicode="&#x253d;" d="M2048 508h-950v-950h-148v925h-950v198h950v925h148v-950h950v-148z" />
+<glyph unicode="&#x253e;" d="M2048 483h-950v-925h-148v950h-950v148h950v950h148v-925h950v-198z" />
+<glyph unicode="&#x253f;" d="M2048 483h-950v-925h-148v925h-950v198h950v925h148v-925h950v-198z" />
+<glyph unicode="&#x2540;" d="M2048 508h-950v-950h-148v950h-950v148h925v950h198v-950h925v-148z" />
+<glyph unicode="&#x2541;" d="M2048 508h-925v-950h-198v950h-925v148h950v950h148v-950h950v-148z" />
+<glyph unicode="&#x2542;" d="M2048 508h-925v-950h-198v950h-925v148h925v950h198v-950h925v-148z" />
+<glyph unicode="&#x2543;" d="M2048 508h-950v-950h-148v925h-950v198h925v925h198v-950h925v-148z" />
+<glyph unicode="&#x2544;" d="M2048 483h-950v-925h-148v950h-950v148h925v950h198v-925h925v-198z" />
+<glyph unicode="&#x2545;" d="M2048 508h-925v-950h-198v925h-925v198h950v925h148v-950h950v-148z" />
+<glyph unicode="&#x2546;" d="M2048 483h-925v-925h-198v950h-925v148h950v950h148v-925h950v-198z" />
+<glyph unicode="&#x2547;" d="M2048 483h-950v-925h-148v925h-950v198h925v925h198v-925h925v-198z" />
+<glyph unicode="&#x2548;" d="M2048 483h-925v-925h-198v925h-925v198h950v925h148v-925h950v-198z" />
+<glyph unicode="&#x2549;" d="M2048 508h-925v-950h-198v925h-925v198h925v925h198v-950h925v-148z" />
+<glyph unicode="&#x254a;" d="M2048 483h-925v-925h-198v950h-925v148h925v950h198v-925h925v-198z" />
+<glyph unicode="&#x254b;" d="M2048 483h-925v-925h-198v925h-925v198h925v925h198v-925h925v-198z" />
+<glyph unicode="&#x254c;" d="M1974 508h-876v148h876v-148zM950 508h-876v148h876v-148z" />
+<glyph unicode="&#x254d;" d="M1974 483h-876v198h876v-198zM950 483h-876v198h876v-198z" />
+<glyph unicode="&#x254e;" d="M1098 656h-148v876h148v-876zM1098 -368h-148v876h148v-876z" />
+<glyph unicode="&#x254f;" d="M1122 656h-197v876h197v-876zM1122 -368h-197v876h197v-876z" />
+<glyph unicode="&#x2550;" d="M2048 360h-2048v148h2048v-148zM2048 656h-2048v148h2048v-148z" />
+<glyph unicode="&#x2551;" d="M950 -442h-148v2048h148v-2048zM1246 -442h-148v2048h148v-2048z" />
+<glyph unicode="&#x2552;" d="M2048 360h-975v-802h-148v1246h1123v-148h-975v-148h975v-148z" />
+<glyph unicode="&#x2553;" d="M2048 508h-802v-950h-148v950h-148v-950h-148v1098h1246v-148z" />
+<glyph unicode="&#x2554;" d="M2048 656h-1098v-1098h-148v1246h1246v-148zM2048 360h-802v-802h-148v950h950v-148z" />
+<glyph unicode="&#x2555;" d="M1098 -442h-148v802h-950v148h950v148h-950v148h1098v-1246z" />
+<glyph unicode="&#x2556;" d="M1246 -442h-148v950h-148v-950h-148v950h-802v148h1246v-1098z" />
+<glyph unicode="&#x2557;" d="M1246 -442h-148v1098h-1098v148h1246v-1246zM950 -442h-148v802h-802v148h950v-950z" />
+<glyph unicode="&#x2558;" d="M2048 360h-1246v1246h148v-802h1098v-148h-1098v-148h1098v-148z" />
+<glyph unicode="&#x2559;" d="M2048 508h-1246v1098h148v-950h148v950h148v-950h802v-148z" />
+<glyph unicode="&#x255a;" d="M2048 656h-950v950h148v-802h802v-148zM2048 360h-1246v1246h148v-1098h1098v-148z" />
+<glyph unicode="&#x255b;" d="M1098 360h-1098v148h950v148h-950v148h950v802h148v-1246z" />
+<glyph unicode="&#x255c;" d="M1246 508h-1246v148h802v950h148v-950h148v950h148v-1098z" />
+<glyph unicode="&#x255d;" d="M950 656h-950v148h802v802h148v-950zM1246 360h-1246v148h1098v1098h148v-1246z" />
+<glyph unicode="&#x255e;" d="M2048 360h-950v-802h-148v2048h148v-802h950v-148h-950v-148h950v-148z" />
+<glyph unicode="&#x255f;" d="M950 -442h-148v2048h148v-2048zM2048 508h-802v-950h-148v2048h148v-950h802v-148z" />
+<glyph unicode="&#x2560;" d="M950 -442h-148v2048h148v-2048zM2048 656h-950v950h148v-802h802v-148zM2048 360h-802v-802h-148v950h950v-148z" />
+<glyph unicode="&#x2561;" d="M1098 -442h-148v802h-950v148h950v148h-950v148h950v802h148v-2048z" />
+<glyph unicode="&#x2562;" d="M1246 -442h-148v2048h148v-2048zM950 -442h-148v950h-802v148h802v950h148v-2048z" />
+<glyph unicode="&#x2563;" d="M1246 -442h-148v2048h148v-2048zM950 656h-950v148h802v802h148v-950zM950 -442h-148v802h-802v148h950v-950z" />
+<glyph unicode="&#x2564;" d="M2048 656h-2048v148h2048v-148zM2048 360h-950v-802h-148v802h-950v148h2048v-148z" />
+<glyph unicode="&#x2565;" d="M2048 508h-802v-950h-148v950h-148v-950h-148v950h-802v148h2048v-148z" />
+<glyph unicode="&#x2566;" d="M2048 656h-2048v148h2048v-148zM2048 360h-802v-802h-148v950h950v-148zM950 -442h-148v802h-802v148h950v-950z" />
+<glyph unicode="&#x2567;" d="M2048 360h-2048v148h2048v-148zM2048 656h-2048v148h950v802h148v-802h950v-148z" />
+<glyph unicode="&#x2568;" d="M2048 508h-2048v148h802v950h148v-950h148v950h148v-950h802v-148z" />
+<glyph unicode="&#x2569;" d="M2048 360h-2048v148h2048v-148zM2048 656h-950v950h148v-802h802v-148zM950 656h-950v148h802v802h148v-950z" />
+<glyph unicode="&#x256a;" d="M2048 360h-950v-802h-148v802h-950v148h950v148h-950v148h950v802h148v-802h950v-148h-950v-148h950v-148z" />
+<glyph unicode="&#x256b;" d="M2048 508h-802v-950h-148v950h-148v-950h-148v950h-802v148h802v950h148v-950h148v950h148v-950h802v-148z" />
+<glyph unicode="&#x256c;" d="M2048 656h-950v950h148v-802h802v-148zM950 656h-950v148h802v802h148v-950zM2048 360h-802v-802h-148v950h950v-148zM950 -442h-148v802h-802v148h950v-950z" />
+<glyph unicode="&#x256d;" d="M2048 508q-397 0 -673.5 -276.5t-276.5 -673.5h-148q0 458 320 778t778 320v-148z" />
+<glyph unicode="&#x256e;" d="M1098 -442h-148q0 397 -276.5 673.5t-673.5 276.5v148q458 0 778 -320t320 -778z" />
+<glyph unicode="&#x256f;" d="M1098 1606q0 -457 -320.5 -777.5t-777.5 -320.5v148q397 0 673.5 276.5t276.5 673.5h148z" />
+<glyph unicode="&#x2570;" d="M2048 508q-457 0 -777.5 320.5t-320.5 777.5h148q0 -397 276.5 -673.5t673.5 -276.5v-148z" />
+<glyph unicode="&#x2571;" d="M2158 1606l-2048 -2048h-220l2048 2048h220z" />
+<glyph unicode="&#x2572;" d="M2158 -442h-220l-2048 2048h220z" />
+<glyph unicode="&#x2573;" d="M2158 -442h-220l-914 914l-914 -914h-220l1024 1024l-1024 1024h220l914 -914l914 914h220l-1024 -1024z" />
+<glyph unicode="&#x2574;" d="M1024 508h-1024v148h1024v-148z" />
+<glyph unicode="&#x2575;" d="M1098 582h-148v1024h148v-1024z" />
+<glyph unicode="&#x2576;" d="M2048 508h-1024v148h1024v-148z" />
+<glyph unicode="&#x2577;" d="M1098 -442h-148v1024h148v-1024z" />
+<glyph unicode="&#x2578;" d="M1024 483h-1024v198h1024v-198z" />
+<glyph unicode="&#x2579;" d="M1123 582h-198v1024h198v-1024z" />
+<glyph unicode="&#x257a;" d="M2048 483h-1024v198h1024v-198z" />
+<glyph unicode="&#x257b;" d="M1123 -442h-198v1024h198v-1024z" />
+<glyph unicode="&#x257c;" d="M2048 483h-1024v25h-1024v148h1024v25h1024v-198z" />
+<glyph unicode="&#x257d;" d="M1123 -442h-198v1024h25v1024h148v-1024h25v-1024z" />
+<glyph unicode="&#x257e;" d="M2048 508h-1024v-25h-1024v198h1024v-25h1024v-148z" />
+<glyph unicode="&#x257f;" d="M1123 582h-25v-1024h-148v1024h-25v1024h198v-1024z" />
+<glyph unicode="&#x2580;" d="M2048 582h-2048v1024h2048v-1024z" />
+<glyph unicode="&#x2581;" d="M2048 -442h-2048v256h2048v-256z" />
+<glyph unicode="&#x2582;" d="M2048 -442h-2048v512h2048v-512z" />
+<glyph unicode="&#x2583;" d="M2048 -442h-2048v768h2048v-768z" />
+<glyph unicode="&#x2584;" d="M2048 -442h-2048v1024h2048v-1024z" />
+<glyph unicode="&#x2585;" d="M2048 -442h-2048v1280h2048v-1280z" />
+<glyph unicode="&#x2586;" d="M2048 -442h-2048v1536h2048v-1536z" />
+<glyph unicode="&#x2587;" d="M2048 -442h-2048v1792h2048v-1792z" />
+<glyph unicode="&#x2588;" d="M2048 -442h-2048v2048h2048v-2048z" />
+<glyph unicode="&#x2589;" d="M1792 -442h-1792v2048h1792v-2048z" />
+<glyph unicode="&#x258a;" d="M1536 -442h-1536v2048h1536v-2048z" />
+<glyph unicode="&#x258b;" d="M1280 -442h-1280v2048h1280v-2048z" />
+<glyph unicode="&#x258c;" d="M1024 -442h-1024v2048h1024v-2048z" />
+<glyph unicode="&#x258d;" d="M768 -442h-768v2048h768v-2048z" />
+<glyph unicode="&#x258e;" d="M512 -442h-512v2048h512v-2048z" />
+<glyph unicode="&#x258f;" d="M256 -442h-256v2048h256v-2048z" />
+<glyph unicode="&#x2590;" d="M2048 -442h-1024v2048h1024v-2048z" />
+<glyph unicode="&#x2591;" d="M1920 1478h-128v128h128v-128zM1664 1478h-128v128h128v-128zM1920 1222h-128v128h128v-128zM1408 1478h-128v128h128v-128zM1664 1222h-128v128h128v-128zM1920 966h-128v128h128v-128zM1152 1478h-128v128h128v-128zM1408 1222h-128v128h128v-128zM1664 966h-128v128 h128v-128zM1920 710h-128v128h128v-128zM896 1478h-128v128h128v-128zM1152 1222h-128v128h128v-128zM1408 966h-128v128h128v-128zM1664 710h-128v128h128v-128zM1920 454h-128v128h128v-128zM640 1478h-128v128h128v-128zM896 1222h-128v128h128v-128zM1152 966h-128v128 h128v-128zM1408 710h-128v128h128v-128zM1664 454h-128v128h128v-128zM1920 198h-128v128h128v-128zM384 1478h-128v128h128v-128zM640 1222h-128v128h128v-128zM896 966h-128v128h128v-128zM1152 710h-128v128h128v-128zM1408 454h-128v128h128v-128zM1664 198h-128v128 h128v-128zM1920 -58h-128v128h128v-128zM128 1478h-128v128h128v-128zM384 1222h-128v128h128v-128zM640 966h-128v128h128v-128zM896 710h-128v128h128v-128zM1152 454h-128v128h128v-128zM1408 198h-128v128h128v-128zM1664 -58h-128v128h128v-128zM1920 -314h-128v128 h128v-128zM128 1222h-128v128h128v-128zM384 966h-128v128h128v-128zM640 710h-128v128h128v-128zM896 454h-128v128h128v-128zM1152 198h-128v128h128v-128zM1408 -58h-128v128h128v-128zM1664 -314h-128v128h128v-128zM128 966h-128v128h128v-128zM384 710h-128v128h128 v-128zM640 454h-128v128h128v-128zM896 198h-128v128h128v-128zM1152 -58h-128v128h128v-128zM1408 -314h-128v128h128v-128zM128 710h-128v128h128v-128zM384 454h-128v128h128v-128zM640 198h-128v128h128v-128zM896 -58h-128v128h128v-128zM1152 -314h-128v128h128v-128z M128 454h-128v128h128v-128zM384 198h-128v128h128v-128zM640 -58h-128v128h128v-128zM896 -314h-128v128h128v-128zM128 198h-128v128h128v-128zM384 -58h-128v128h128v-128zM640 -314h-128v128h128v-128zM128 -58h-128v128h128v-128zM384 -314h-128v128h128v-128z M128 -314h-128v128h128v-128z" />
+<glyph unicode="&#x2592;" d="M1920 1478h-128v128h128v-128zM2048 1350h-128v128h128v-128zM1664 1478h-128v128h128v-128zM1792 1350h-128v128h128v-128zM1920 1222h-128v128h128v-128zM2048 1094h-128v128h128v-128zM1408 1478h-128v128h128v-128zM1536 1350h-128v128h128v-128zM1664 1222h-128v128 h128v-128zM1792 1094h-128v128h128v-128zM1920 966h-128v128h128v-128zM2048 838h-128v128h128v-128zM1152 1478h-128v128h128v-128zM1280 1350h-128v128h128v-128zM1408 1222h-128v128h128v-128zM1536 1094h-128v128h128v-128zM1664 966h-128v128h128v-128zM1792 838h-128 v128h128v-128zM1920 710h-128v128h128v-128zM2048 582h-128v128h128v-128zM896 1478h-128v128h128v-128zM1024 1350h-128v128h128v-128zM1152 1222h-128v128h128v-128zM1280 1094h-128v128h128v-128zM1408 966h-128v128h128v-128zM1536 838h-128v128h128v-128zM1664 710 h-128v128h128v-128zM1792 582h-128v128h128v-128zM1920 454h-128v128h128v-128zM2048 326h-128v128h128v-128zM640 1478h-128v128h128v-128zM768 1350h-128v128h128v-128zM896 1222h-128v128h128v-128zM1024 1094h-128v128h128v-128zM1152 966h-128v128h128v-128zM1280 838 h-128v128h128v-128zM1408 710h-128v128h128v-128zM1536 582h-128v128h128v-128zM1664 454h-128v128h128v-128zM1792 326h-128v128h128v-128zM1920 198h-128v128h128v-128zM2048 70h-128v128h128v-128zM384 1478h-128v128h128v-128zM512 1350h-128v128h128v-128zM640 1222 h-128v128h128v-128zM768 1094h-128v128h128v-128zM896 966h-128v128h128v-128zM1024 838h-128v128h128v-128zM1152 710h-128v128h128v-128zM1280 582h-128v128h128v-128zM1408 454h-128v128h128v-128zM1536 326h-128v128h128v-128zM1664 198h-128v128h128v-128zM1792 70 h-128v128h128v-128zM1920 -58h-128v128h128v-128zM2048 -186h-128v128h128v-128zM128 1478h-128v128h128v-128zM256 1350h-128v128h128v-128zM384 1222h-128v128h128v-128zM512 1094h-128v128h128v-128zM640 966h-128v128h128v-128zM768 838h-128v128h128v-128zM896 710 h-128v128h128v-128zM1024 582h-128v128h128v-128zM1152 454h-128v128h128v-128zM1280 326h-128v128h128v-128zM1408 198h-128v128h128v-128zM1536 70h-128v128h128v-128zM1664 -58h-128v128h128v-128zM1792 -186h-128v128h128v-128zM1920 -314h-128v128h128v-128zM2048 -442 h-128v128h128v-128zM128 1222h-128v128h128v-128zM256 1094h-128v128h128v-128zM384 966h-128v128h128v-128zM512 838h-128v128h128v-128zM640 710h-128v128h128v-128zM768 582h-128v128h128v-128zM896 454h-128v128h128v-128zM1024 326h-128v128h128v-128zM1152 198h-128 v128h128v-128zM1280 70h-128v128h128v-128zM1408 -58h-128v128h128v-128zM1536 -186h-128v128h128v-128zM1664 -314h-128v128h128v-128zM1792 -442h-128v128h128v-128zM128 966h-128v128h128v-128zM256 838h-128v128h128v-128zM384 710h-128v128h128v-128zM512 582h-128v128 h128v-128zM640 454h-128v128h128v-128zM768 326h-128v128h128v-128zM896 198h-128v128h128v-128zM1024 70h-128v128h128v-128zM1152 -58h-128v128h128v-128zM1280 -186h-128v128h128v-128zM1408 -314h-128v128h128v-128zM1536 -442h-128v128h128v-128zM128 710h-128v128h128 v-128zM256 582h-128v128h128v-128zM384 454h-128v128h128v-128zM512 326h-128v128h128v-128zM640 198h-128v128h128v-128zM768 70h-128v128h128v-128zM896 -58h-128v128h128v-128zM1024 -186h-128v128h128v-128zM1152 -314h-128v128h128v-128zM1280 -442h-128v128h128v-128z M128 454h-128v128h128v-128zM256 326h-128v128h128v-128zM384 198h-128v128h128v-128zM512 70h-128v128h128v-128zM640 -58h-128v128h128v-128zM768 -186h-128v128h128v-128zM896 -314h-128v128h128v-128zM1024 -442h-128v128h128v-128zM128 198h-128v128h128v-128zM256 70 h-128v128h128v-128zM384 -58h-128v128h128v-128zM512 -186h-128v128h128v-128zM640 -314h-128v128h128v-128zM768 -442h-128v128h128v-128zM128 -58h-128v128h128v-128zM256 -186h-128v128h128v-128zM384 -314h-128v128h128v-128zM512 -442h-128v128h128v-128zM128 -314 h-128v128h128v-128zM256 -442h-128v128h128v-128z" />
+<glyph unicode="&#x2593;" d="M2048 -314h-128v-128h-128v128h-128v-128h-128v128h-128v-128h-128v128h-128v-128h-128v128h-128v-128h-128v128h-128v-128h-128v128h-128v-128h-128v128h-128v-128h-128v2048h2048v-128h-128v-128h128v-128h-128v-128h128v-128h-128v-128h128v-128h-128v-128h128v-128 h-128v-128h128v-128h-128v-128h128v-128h-128v-128h128v-128zM1792 1350v128h-128v-128h128zM1536 1350v128h-128v-128h128zM1792 1094v128h-128v-128h128zM1280 1350v128h-128v-128h128zM1536 1094v128h-128v-128h128zM1792 838v128h-128v-128h128zM1024 1350v128h-128 v-128h128zM1280 1094v128h-128v-128h128zM1536 838v128h-128v-128h128zM1792 582v128h-128v-128h128zM768 1350v128h-128v-128h128zM1024 1094v128h-128v-128h128zM1280 838v128h-128v-128h128zM1536 582v128h-128v-128h128zM1792 326v128h-128v-128h128zM512 1350v128h-128 v-128h128zM768 1094v128h-128v-128h128zM1024 838v128h-128v-128h128zM1280 582v128h-128v-128h128zM1536 326v128h-128v-128h128zM1792 70v128h-128v-128h128zM256 1350v128h-128v-128h128zM512 1094v128h-128v-128h128zM768 838v128h-128v-128h128zM1024 582v128h-128 v-128h128zM1280 326v128h-128v-128h128zM1536 70v128h-128v-128h128zM1792 -186v128h-128v-128h128zM256 1094v128h-128v-128h128zM512 838v128h-128v-128h128zM768 582v128h-128v-128h128zM1024 326v128h-128v-128h128zM1280 70v128h-128v-128h128zM1536 -186v128h-128 v-128h128zM256 838v128h-128v-128h128zM512 582v128h-128v-128h128zM768 326v128h-128v-128h128zM1024 70v128h-128v-128h128zM1280 -186v128h-128v-128h128zM256 582v128h-128v-128h128zM512 326v128h-128v-128h128zM768 70v128h-128v-128h128zM1024 -186v128h-128v-128 h128zM256 326v128h-128v-128h128zM512 70v128h-128v-128h128zM768 -186v128h-128v-128h128zM256 70v128h-128v-128h128zM512 -186v128h-128v-128h128zM256 -186v128h-128v-128h128z" />
+<glyph unicode="&#x2594;" d="M2048 1350h-2048v256h2048v-256z" />
+<glyph unicode="&#x2595;" d="M2048 -442h-256v2048h256v-2048z" />
+<glyph unicode="&#x2596;" d="M1024 -442h-1024v1024h1024v-1024z" />
+<glyph unicode="&#x2597;" d="M2048 -442h-1024v1024h1024v-1024z" />
+<glyph unicode="&#x2598;" d="M1024 582h-1024v1024h1024v-1024z" />
+<glyph unicode="&#x2599;" d="M2048 -442h-2048v2048h1024v-1024h1024v-1024z" />
+<glyph unicode="&#x259a;" d="M2048 -442h-1024v1024h1024v-1024zM1024 582h-1024v1024h1024v-1024z" />
+<glyph unicode="&#x259b;" d="M2048 582h-1024v-1024h-1024v2048h2048v-1024z" />
+<glyph unicode="&#x259c;" d="M2048 -442h-1024v1024h-1024v1024h2048v-2048z" />
+<glyph unicode="&#x259d;" d="M2048 582h-1024v1024h1024v-1024z" />
+<glyph unicode="&#x259e;" d="M1024 -442h-1024v1024h1024v-1024zM2048 582h-1024v1024h1024v-1024z" />
+<glyph unicode="&#x259f;" d="M2048 -442h-2048v1024h1024v1024h1024v-2048z" />
+<glyph unicode="&#x25a0;" horiz-adv-x="1578" d="M1461 -90h-1344v1344h1344v-1344z" />
+<glyph unicode="&#x25a1;" horiz-adv-x="1578" d="M1461 -90h-1344v1344h1344v-1344zM1361 10v1144h-1144v-1144h1144z" />
+<glyph unicode="&#x25a2;" horiz-adv-x="1628" d="M1406 352q0 -147 -102.5 -249.5t-249.5 -102.5h-480q-147 0 -249.5 102.5t-102.5 249.5v480q0 148 102 250t250 102h480q147 0 249.5 -102.5t102.5 -249.5v-480zM1308 352v480q0 106 -74 180t-180 74h-480q-106 0 -179.5 -73.5t-73.5 -180.5v-480q0 -105 74 -179t179 -74 h480q105 0 179.5 74t74.5 179z" />
+<glyph unicode="&#x25a3;" horiz-adv-x="1578" d="M1461 -90h-1344v1344h1344v-1344zM1361 10v1144h-1144v-1144h1144zM1085 286h-592v592h592v-592z" />
+<glyph unicode="&#x25a4;" horiz-adv-x="1578" d="M1461 -90h-1344v1344h1344v-1344zM1361 943v211h-1144v-211h1144zM1361 632v211h-1144v-211h1144zM1361 321v211h-1144v-211h1144zM1361 10v211h-1144v-211h1144z" />
+<glyph unicode="&#x25a5;" horiz-adv-x="1578" d="M1461 -90h-1344v1344h1344v-1344zM1361 10v1144h-211v-1144h211zM1050 10v1144h-211v-1144h211zM739 10v1144h-211v-1144h211zM428 10v1144h-211v-1144h211z" />
+<glyph unicode="&#x25a6;" horiz-adv-x="1578" d="M1461 -90h-1344v1344h1344v-1344zM1361 943v211h-211v-211h211zM1050 943v211h-211v-211h211zM1361 632v211h-211v-211h211zM739 943v211h-211v-211h211zM1050 632v211h-211v-211h211zM1361 321v211h-211v-211h211zM428 943v211h-211v-211h211zM739 632v211h-211v-211 h211zM1050 321v211h-211v-211h211zM1361 10v211h-211v-211h211zM428 632v211h-211v-211h211zM739 321v211h-211v-211h211zM1050 10v211h-211v-211h211zM428 321v211h-211v-211h211zM739 10v211h-211v-211h211zM428 10v211h-211v-211h211z" />
+<glyph unicode="&#x25a7;" horiz-adv-x="1578" d="M1461 -90h-1344v1344h1344v-1344zM1361 1154h-194l194 -194v194zM1361 521v298l-335 335h-298zM1361 81v298l-775 775h-298zM1290 10l-1073 1073v-298l775 -775h298zM850 10l-633 633v-298l335 -335h298zM217 10h194l-194 194v-194z" />
+<glyph unicode="&#x25a8;" horiz-adv-x="1578" d="M1461 -90h-1344v1344h1344v-1344zM217 1154v-194l194 194h-194zM850 1154h-298l-335 -335v-298zM1290 1154h-298l-775 -775v-298zM1361 785v298l-1073 -1073h298zM1361 345v298l-633 -633h298zM1361 10v194l-194 -194h194z" />
+<glyph unicode="&#x25a9;" horiz-adv-x="1578" d="M1461 -90h-1344v1344h1344v-1344zM1290 1154h-123l62 -61zM1361 960v123l-61 -61zM1158 1022l-132 132h-34l-132 -132l149 -149zM1361 785v34l-132 132l-149 -149l149 -149zM850 1154h-122l61 -61zM1361 521v122l-61 -61zM938 802l-149 149l-149 -149l149 -149zM1158 582 l-149 149l-149 -149l149 -149zM718 1022l-132 132h-34l-132 -132l149 -149zM1361 345v34l-132 132l-149 -149l149 -149zM411 1154h-123l61 -61zM1361 81v123l-61 -62zM278 1022l-61 61v-123zM1290 10l-61 61l-62 -61h123zM498 802l-149 149l-132 -132v-34l132 -132z M1158 142l-149 149l-149 -149l132 -132h34zM718 582l-149 149l-149 -149l149 -149zM938 362l-149 149l-149 -149l149 -149zM278 582l-61 61v-122zM850 10l-61 61l-61 -61h122zM498 362l-149 149l-132 -132v-34l132 -132zM718 142l-149 149l-149 -149l132 -132h34zM278 142 l-61 62v-123zM411 10l-62 61l-61 -61h123z" />
+<glyph unicode="&#x25aa;" horiz-adv-x="738" d="M665 286h-592v592h592v-592z" />
+<glyph unicode="&#x25ab;" horiz-adv-x="738" d="M665 286h-592v592h592v-592zM565 386v392h-392v-392h392z" />
+<glyph unicode="&#x25ac;" horiz-adv-x="1338" d="M1265 286h-1192v592h1192v-592z" />
+<glyph unicode="&#x25ad;" horiz-adv-x="1338" d="M1265 286h-1192v592h1192v-592zM1165 386v392h-992v-392h992z" />
+<glyph unicode="&#x25ae;" horiz-adv-x="738" d="M665 -14h-592v1192h592v-1192z" />
+<glyph unicode="&#x25af;" horiz-adv-x="738" d="M665 -14h-592v1192h592v-1192zM565 86v992h-392v-992h392z" />
+<glyph unicode="&#x25b0;" horiz-adv-x="1638" d="M1565 878l-300 -592h-1192l300 592h1192z" />
+<glyph unicode="&#x25b1;" horiz-adv-x="1638" d="M1565 878l-300 -592h-1192l300 592h1192zM1402 778h-968l-198 -392h968z" />
+<glyph unicode="&#x25b2;" horiz-adv-x="1578" d="M1530 18h-1482l741 1191z" />
+<glyph unicode="&#x25b3;" horiz-adv-x="1578" d="M1530 18h-1482l741 1191zM1350 118l-561 902l-561 -902h1122z" />
+<glyph unicode="&#x25b4;" horiz-adv-x="738" d="M695 334h-652l326 524z" />
+<glyph unicode="&#x25b5;" horiz-adv-x="738" d="M695 334h-652l326 524zM515 434l-146 235l-146 -235h292z" />
+<glyph unicode="&#x25b6;" horiz-adv-x="1356" d="M1308 582l-1191 -741v1482z" />
+<glyph unicode="&#x25b7;" horiz-adv-x="1356" d="M1308 582l-1191 -741v1482zM1119 582l-902 561v-1122z" />
+<glyph unicode="&#x25b8;" horiz-adv-x="645" d="M597 582l-524 -326v652z" />
+<glyph unicode="&#x25b9;" horiz-adv-x="645" d="M597 582l-524 -326v652zM408 582l-235 146v-292z" />
+<glyph unicode="&#x25ba;" horiz-adv-x="1888" d="M1808 582l-1606 -564v1128z" />
+<glyph unicode="&#x25bb;" horiz-adv-x="1888" d="M1808 582l-1606 -564v1128zM1506 582l-1204 423v-846z" />
+<glyph unicode="&#x25bc;" horiz-adv-x="1578" d="M1530 1209l-741 -1191l-741 1191h1482z" />
+<glyph unicode="&#x25bd;" horiz-adv-x="1578" d="M1530 1209l-741 -1191l-741 1191h1482zM1350 1109h-1122l561 -902z" />
+<glyph unicode="&#x25be;" horiz-adv-x="738" d="M695 858l-326 -524l-326 524h652z" />
+<glyph unicode="&#x25bf;" horiz-adv-x="738" d="M695 858l-326 -524l-326 524h652zM515 758h-292l146 -235z" />
+<glyph unicode="&#x25c0;" horiz-adv-x="1356" d="M1239 -159l-1191 741l1191 741v-1482z" />
+<glyph unicode="&#x25c1;" horiz-adv-x="1356" d="M1239 -159l-1191 741l1191 741v-1482zM1139 21v1122l-902 -561z" />
+<glyph unicode="&#x25c2;" horiz-adv-x="645" d="M572 256l-524 326l524 326v-652z" />
+<glyph unicode="&#x25c3;" horiz-adv-x="645" d="M572 256l-524 326l524 326v-652zM472 436v292l-235 -146z" />
+<glyph unicode="&#x25c4;" horiz-adv-x="1888" d="M1686 18l-1606 564l1606 564v-1128z" />
+<glyph unicode="&#x25c5;" horiz-adv-x="1888" d="M1686 18l-1606 564l1606 564v-1128zM1586 159v846l-1204 -423z" />
+<glyph unicode="&#x25c6;" horiz-adv-x="1578" d="M1568 582l-779 -779l-779 779l779 779z" />
+<glyph unicode="&#x25c7;" horiz-adv-x="1578" d="M1568 582l-779 -779l-779 779l779 779zM1427 582l-638 638l-638 -638l638 -638z" />
+<glyph unicode="&#x25c8;" horiz-adv-x="1578" d="M1568 582l-779 -779l-779 779l779 779zM1427 582l-638 638l-638 -638l638 -638zM1132 582l-343 -343l-343 343l343 343z" />
+<glyph unicode="&#x25c9;" horiz-adv-x="1578" d="M1222 582q0 -180 -126.5 -306.5t-306.5 -126.5t-306.5 126.5t-126.5 306.5t126.5 306.5t306.5 126.5t306.5 -126.5t126.5 -306.5zM1538 582q0 -312 -218.5 -530.5t-530.5 -218.5t-530.5 218.5t-218.5 530.5t218.5 530.5t530.5 218.5t530.5 -218.5t218.5 -530.5zM1438 582 q0 270 -189.5 459.5t-459.5 189.5t-459.5 -189.5t-189.5 -459.5t189.5 -459.5t459.5 -189.5t459.5 189.5t189.5 459.5z" />
+<glyph unicode="&#x25ca;" horiz-adv-x="1578" d="M1378 582l-589 -779l-589 779l589 779zM1253 582l-464 613l-464 -613l464 -613z" />
+<glyph unicode="&#x25cb;" horiz-adv-x="1578" d="M1538 582q0 -312 -218.5 -530.5t-530.5 -218.5t-530.5 218.5t-218.5 530.5t218.5 530.5t530.5 218.5t530.5 -218.5t218.5 -530.5zM1438 582q0 270 -189.5 459.5t-459.5 189.5t-459.5 -189.5t-189.5 -459.5t189.5 -459.5t459.5 -189.5t459.5 189.5t189.5 459.5z" />
+<glyph unicode="&#x25cc;" horiz-adv-x="1174" d="M1021 896q0 -23 -18 -38t-41 -15t-38 18t-15 41t17.5 38t41 15t38.5 -18t15 -41zM833 953q-14 0 -27 7q-29 17 -29 49q0 15 8 28q16 28 49 28q14 0 28 -8q28 -16 28 -39.5t-8 -36.5q-16 -28 -49 -28zM1106 751q0 -56 -56 -56t-56 56t56 56t56 -56zM617 1077q9 47 50 47 q7 0 15 -2q47 -8 47 -49q0 -7 -1 -15q-9 -47 -50 -47q-7 0 -15 1q-47 9 -47 50q0 7 1 15zM1136 582q0 -56 -56 -56t-56 56t56 56t56 -56zM446 1058q-1 8 -1 15q0 41 47 49q8 2 15 2q41 0 49 -47q2 -8 2 -15q0 -41 -47 -50q-8 -1 -15 -1q-41 0 -50 47zM1050 357q-56 0 -56 56 t56 56t56 -56t-56 -56zM389 1037q8 -13 8 -36.5t-21 -35.5t-35 -12q-33 0 -49 28q-8 13 -8 28q0 32 29 48q13 8 27 8q33 0 49 -28zM967.5 209q-23.5 0 -41 15t-17.5 38t15 41t38 18t41 -15t18 -38t-15 -41t-38.5 -18zM212 843q-23 0 -41 15t-18 38t15 41t38.5 18t41 -15 t17.5 -38t-15 -41t-38 -18zM882 183q8 -13 8 -36.5t-21 -35.5t-35 -12q-33 0 -49 28q-8 13 -8 28q0 32 29 49q13 7 27 7q33 0 49 -28zM124 695q-56 0 -56 56t56 56t56 -56t-56 -56zM617 87q-1 8 -1 15q0 41 47 50q8 1 15 1q41 0 50 -47q1 -8 1 -15q0 -41 -47 -49 q-8 -2 -15 -2q-41 0 -50 47zM150 582q0 -56 -56 -56t-56 56t56 56t56 -56zM446 106q9 47 50 47q7 0 15 -1q47 -9 47 -50q0 -7 -2 -15q-8 -47 -49 -47q-7 0 -15 2q-47 8 -47 49q0 7 1 15zM180 413q0 -56 -56 -56t-56 56t56 56t56 -56zM340 99q-14 0 -27 8q-29 16 -29 48 q0 15 8 28q16 28 49 28q14 0 35 -12t21 -35.5t-8 -36.5q-16 -28 -49 -28zM265 262q0 -23 -17.5 -38t-41 -15t-38.5 18t-15 41t18 38t41 15t38 -18t15 -41z" />
+<glyph unicode="&#x25cd;" horiz-adv-x="1578" d="M1538 582q0 -312 -218.5 -530.5t-530.5 -218.5t-530.5 218.5t-218.5 530.5t218.5 530.5t530.5 218.5t530.5 -218.5t218.5 -530.5zM1438 582q0 310 -238 504v-1008q238 194 238 504zM1100 11v1142q-121 66 -261 76v-1294q140 10 261 76zM739 -65v1294q-140 -10 -261 -76 v-1142q121 -66 261 -76zM140 582q0 -310 238 -504v1008q-238 -194 -238 -504z" />
+<glyph unicode="&#x25ce;" horiz-adv-x="1578" d="M1538 582q0 -312 -218.5 -530.5t-530.5 -218.5t-530.5 218.5t-218.5 530.5t218.5 530.5t530.5 218.5t530.5 -218.5t218.5 -530.5zM1438 582q0 270 -189.5 459.5t-459.5 189.5t-459.5 -189.5t-189.5 -459.5t189.5 -459.5t459.5 -189.5t459.5 189.5t189.5 459.5zM1288 582 q0 -208 -145.5 -353.5t-353.5 -145.5t-353.5 145.5t-145.5 353.5t145.5 353.5t353.5 145.5t353.5 -145.5t145.5 -353.5zM1188 582q0 167 -116 283t-283 116t-283 -116t-116 -283t116 -283t283 -116t283 116t116 283z" />
+<glyph unicode="&#x25cf;" horiz-adv-x="1578" d="M1538 582q0 -312 -218.5 -530.5t-530.5 -218.5t-530.5 218.5t-218.5 530.5t218.5 530.5t530.5 218.5t530.5 -218.5t218.5 -530.5z" />
+<glyph unicode="&#x25d0;" horiz-adv-x="1578" d="M1538 582q0 -312 -218.5 -530.5t-530.5 -218.5t-530.5 218.5t-218.5 530.5t218.5 530.5t530.5 218.5t530.5 -218.5t218.5 -530.5zM1438 582q0 270 -189.5 459.5t-459.5 189.5v-1298q270 0 459.5 189.5t189.5 459.5z" />
+<glyph unicode="&#x25d1;" horiz-adv-x="1578" d="M1538 582q0 -312 -218.5 -530.5t-530.5 -218.5t-530.5 218.5t-218.5 530.5t218.5 530.5t530.5 218.5t530.5 -218.5t218.5 -530.5zM789 -67v1298q-270 0 -459.5 -189.5t-189.5 -459.5t189.5 -459.5t459.5 -189.5z" />
+<glyph unicode="&#x25d2;" horiz-adv-x="1578" d="M1538 582q0 -312 -218.5 -530.5t-530.5 -218.5t-530.5 218.5t-218.5 530.5t218.5 530.5t530.5 218.5t530.5 -218.5t218.5 -530.5zM1438 582q0 270 -189.5 459.5t-459.5 189.5t-459.5 -189.5t-189.5 -459.5h1298z" />
+<glyph unicode="&#x25d3;" horiz-adv-x="1578" d="M1538 582q0 -312 -218.5 -530.5t-530.5 -218.5t-530.5 218.5t-218.5 530.5t218.5 530.5t530.5 218.5t530.5 -218.5t218.5 -530.5zM1438 582h-1298q0 -270 189.5 -459.5t459.5 -189.5t459.5 189.5t189.5 459.5z" />
+<glyph unicode="&#x25d4;" horiz-adv-x="1578" d="M1538 582q0 -312 -218.5 -530.5t-530.5 -218.5t-530.5 218.5t-218.5 530.5t218.5 530.5t530.5 218.5t530.5 -218.5t218.5 -530.5zM1438 582h-649v649q-270 0 -459.5 -189.5t-189.5 -459.5t189.5 -459.5t459.5 -189.5t459.5 189.5t189.5 459.5z" />
+<glyph unicode="&#x25d5;" horiz-adv-x="1578" d="M1538 582q0 -312 -218.5 -530.5t-530.5 -218.5t-530.5 218.5t-218.5 530.5t218.5 530.5t530.5 218.5t530.5 -218.5t218.5 -530.5zM789 582v649q-270 0 -459.5 -189.5t-189.5 -459.5h649z" />
+<glyph unicode="&#x25d6;" horiz-adv-x="906" d="M789 -167q-312 0 -530.5 218.5t-218.5 530.5t218.5 530.5t530.5 218.5v-1498z" />
+<glyph unicode="&#x25d7;" horiz-adv-x="906" d="M866 582q0 -312 -218.5 -530.5t-530.5 -218.5v1498q312 0 530.5 -218.5t218.5 -530.5z" />
+<glyph unicode="&#x25d8;" d="M2048 -442h-2048v2048h2048v-2048zM1457 582q0 180 -126.5 306.5t-306.5 126.5t-306.5 -126.5t-126.5 -306.5t126.5 -306.5t306.5 -126.5t306.5 126.5t126.5 306.5z" />
+<glyph unicode="&#x25d9;" d="M2048 -442h-2048v2048h2048v-2048zM1773 582q0 312 -218.5 530.5t-530.5 218.5t-530.5 -218.5t-218.5 -530.5t218.5 -530.5t530.5 -218.5t530.5 218.5t218.5 530.5zM1673 582q0 -270 -189.5 -459.5t-459.5 -189.5t-459.5 189.5t-189.5 459.5t189.5 459.5t459.5 189.5 t459.5 -189.5t189.5 -459.5z" />
+<glyph unicode="&#x25da;" d="M2048 582h-275q0 312 -218.5 530.5t-530.5 218.5t-530.5 -218.5t-218.5 -530.5h-275v1024h2048v-1024zM1673 582h-1298q0 270 189.5 459.5t459.5 189.5t459.5 -189.5t189.5 -459.5z" />
+<glyph unicode="&#x25db;" d="M1673 582q0 -270 -189.5 -459.5t-459.5 -189.5t-459.5 189.5t-189.5 459.5h1298zM2048 -442h-2048v1024h275q0 -312 218.5 -530.5t530.5 -218.5t530.5 218.5t218.5 530.5h275v-1024z" />
+<glyph unicode="&#x25dc;" horiz-adv-x="1578" d="M789 1231q-270 0 -459.5 -189.5t-189.5 -459.5h-100q0 312 218.5 530.5t530.5 218.5v-100z" />
+<glyph unicode="&#x25dd;" horiz-adv-x="1578" d="M1538 582h-100q0 270 -189.5 459.5t-459.5 189.5v100q312 0 530.5 -218.5t218.5 -530.5z" />
+<glyph unicode="&#x25de;" horiz-adv-x="1578" d="M1538 582q0 -312 -218.5 -530.5t-530.5 -218.5v100q270 0 459.5 189.5t189.5 459.5h100z" />
+<glyph unicode="&#x25df;" horiz-adv-x="1578" d="M789 -167q-312 0 -530.5 218.5t-218.5 530.5h100q0 -270 189.5 -459.5t459.5 -189.5v-100z" />
+<glyph unicode="&#x25e0;" horiz-adv-x="1578" d="M1538 582h-100q0 270 -189.5 459.5t-459.5 189.5t-459.5 -189.5t-189.5 -459.5h-100q0 312 218.5 530.5t530.5 218.5t530.5 -218.5t218.5 -530.5z" />
+<glyph unicode="&#x25e1;" horiz-adv-x="1578" d="M1538 582q0 -312 -218.5 -530.5t-530.5 -218.5t-530.5 218.5t-218.5 530.5h100q0 -270 189.5 -459.5t459.5 -189.5t459.5 189.5t189.5 459.5h100z" />
+<glyph unicode="&#x25e2;" horiz-adv-x="1578" d="M1461 -90h-1344l1344 1344v-1344z" />
+<glyph unicode="&#x25e3;" horiz-adv-x="1578" d="M117 -90v1344l1344 -1344h-1344z" />
+<glyph unicode="&#x25e4;" horiz-adv-x="1578" d="M117 1254h1344l-1344 -1344v1344z" />
+<glyph unicode="&#x25e5;" horiz-adv-x="1578" d="M1461 1254v-1344l-1344 1344h1344z" />
+<glyph unicode="&#x25e6;" horiz-adv-x="738" d="M698 582q0 -137 -96 -233t-233 -96t-233 96t-96 233t96 233t233 96t233 -96t96 -233zM598 582q0 96 -66.5 162.5t-162.5 66.5t-162.5 -66.5t-66.5 -162.5t66.5 -162.5t162.5 -66.5t162.5 66.5t66.5 162.5z" />
+<glyph unicode="&#x25e7;" horiz-adv-x="1578" d="M1461 -90h-1344v1344h1344v-1344zM1361 10v1144h-572v-1144h572z" />
+<glyph unicode="&#x25e8;" horiz-adv-x="1578" d="M1461 -90h-1344v1344h1344v-1344zM789 10v1144h-572v-1144h572z" />
+<glyph unicode="&#x25e9;" horiz-adv-x="1578" d="M1461 -90h-1344v1344h1344v-1344zM1361 10v1144l-1144 -1144h1144z" />
+<glyph unicode="&#x25ea;" horiz-adv-x="1578" d="M1461 -90h-1344v1344h1344v-1344zM217 1154v-1144l1144 1144h-1144z" />
+<glyph unicode="&#x25eb;" horiz-adv-x="1578" d="M1461 -90h-1344v1344h1344v-1344zM1361 10v1144h-522v-1144h522zM739 10v1144h-522v-1144h522z" />
+<glyph unicode="&#x25ec;" horiz-adv-x="1578" d="M1530 18h-1482l741 1191zM1350 118l-561 902l-561 -902h1122zM873 535q35 -35 35 -83.5t-35 -83.5t-84 -35t-84 35t-35 83.5t35 83.5t84 35t84 -35z" />
+<glyph unicode="&#x25ed;" horiz-adv-x="1578" d="M1530 18h-1482l741 1191zM789 118h561l-561 902v-902z" />
+<glyph unicode="&#x25ee;" horiz-adv-x="1578" d="M1530 18h-1482l741 1191zM789 118v902l-561 -902h561z" />
+<glyph unicode="&#x25ef;" d="M2008 582q0 -410 -287 -697t-697 -287t-697 287t-287 697t287 697t697 287t697 -287t287 -697zM1908 582q0 368 -258 626t-626.5 258t-626 -257.5t-257.5 -626.5t257.5 -626.5t626 -257.5t626.5 258t258 626z" />
+<glyph unicode="&#x25f0;" horiz-adv-x="1578" d="M1461 -90h-1344v1344h1344v-1344zM739 632v522h-522v-522h522zM1361 10v1144h-522v-622h-622v-522h1144z" />
+<glyph unicode="&#x25f1;" horiz-adv-x="1578" d="M1461 -90h-1344v1344h1344v-1344zM1361 10v1144h-1144v-522h622v-622h522zM739 10v522h-522v-522h522z" />
+<glyph unicode="&#x25f2;" horiz-adv-x="1578" d="M1461 -90h-1344v1344h1344v-1344zM1361 632v522h-1144v-1144h522v622h622zM1361 10v522h-522v-522h522z" />
+<glyph unicode="&#x25f3;" horiz-adv-x="1578" d="M1461 -90h-1344v1344h1344v-1344zM1361 632v522h-522v-522h522zM1361 10v522h-622v622h-522v-1144h1144z" />
+<glyph unicode="&#x25f4;" horiz-adv-x="1578" d="M1538 582q0 -312 -218.5 -530.5t-530.5 -218.5t-530.5 218.5t-218.5 530.5t218.5 530.5t530.5 218.5t530.5 -218.5t218.5 -530.5zM739 632v597q-240 -18 -409.5 -187.5t-187.5 -409.5h597zM1248.5 122.5q189.5 189.5 189.5 453t-172.5 449t-426.5 204.5v-697h-697 q19 -254 204.5 -426.5t449 -172.5t453 189.5z" />
+<glyph unicode="&#x25f5;" horiz-adv-x="1578" d="M1538 582q0 -312 -218.5 -530.5t-530.5 -218.5t-530.5 218.5t-218.5 530.5t218.5 530.5t530.5 218.5t530.5 -218.5t218.5 -530.5zM1265.5 139.5q172.5 185.5 172.5 449t-189.5 453t-453 189.5t-449 -172.5t-204.5 -426.5h697v-697q254 19 426.5 204.5zM739 532h-597 q18 -240 187.5 -409.5t409.5 -187.5v597z" />
+<glyph unicode="&#x25f6;" horiz-adv-x="1578" d="M1538 582q0 -312 -218.5 -530.5t-530.5 -218.5t-530.5 218.5t-218.5 530.5t218.5 530.5t530.5 218.5t530.5 -218.5t218.5 -530.5zM1231.5 1058.5q-185.5 172.5 -449 172.5t-453 -189.5t-189.5 -453t172.5 -449t426.5 -204.5v697h697q-19 254 -204.5 426.5zM839 532v-597 q240 18 409.5 187.5t187.5 409.5h-597z" />
+<glyph unicode="&#x25f7;" horiz-adv-x="1578" d="M1538 582q0 -312 -218.5 -530.5t-530.5 -218.5t-530.5 218.5t-218.5 530.5t218.5 530.5t530.5 218.5t530.5 -218.5t218.5 -530.5zM839 632h597q-18 240 -187.5 409.5t-409.5 187.5v-597zM739 532v697q-254 -19 -426.5 -204.5t-172.5 -449t189.5 -453t453 -189.5 t449 172.5t204.5 426.5h-697z" />
+<glyph unicode="&#x25f8;" horiz-adv-x="1578" d="M117 1254h1344l-1344 -1344v1344zM217 1154v-1003l1003 1003h-1003z" />
+<glyph unicode="&#x25f9;" horiz-adv-x="1578" d="M1461 1254v-1344l-1344 1344h1344zM1361 1154h-1003l1003 -1003v1003z" />
+<glyph unicode="&#x25fa;" horiz-adv-x="1578" d="M117 -90v1344l1344 -1344h-1344zM217 10h1003l-1003 1003v-1003z" />
+<glyph unicode="&#x25fb;" horiz-adv-x="1218" d="M1121 70h-1024v1024h1024v-1024zM1021 170v824h-824v-824h824z" />
+<glyph unicode="&#x25fc;" horiz-adv-x="1218" d="M1121 70h-1024v1024h1024v-1024z" />
+<glyph unicode="&#x25fd;" horiz-adv-x="946" d="M862 193h-778v778h778v-778zM762 293v578h-578v-578h578z" />
+<glyph unicode="&#x25fe;" horiz-adv-x="946" d="M862 193h-778v778h778v-778z" />
+<glyph unicode="&#x25ff;" horiz-adv-x="1578" d="M1461 -90h-1344l1344 1344v-1344zM1361 10v1003l-1003 -1003h1003z" />
+<glyph unicode="&#x2600;" d="M1686 460q-29 -2 -29 -29.5t16 -38.5l214 -147l-257 47q-15 3 -31.5 -4.5t-16.5 -22.5q0 -5 193 -239l-233 119q-10 5 -28 5q-39 0 -39 -30q0 -7 121 -257l-209 171q-11 9 -23.5 9t-21 -18t-5.5 -35l44 -247l-157 221q-7 10 -21 10q-33 0 -36 -30l-25 -269l-90 249 q-10 27 -32 27t-30 -21l-91 -249l-20 251q-3 40 -38 40q-17 0 -30 -19l-150 -218l52 275q2 12 -11 23.5t-23.5 11.5t-17.5 -6l-215 -184q125 254 125 265q0 31 -32 31q-6 0 -269 -131l186 221q7 8 7 22t-17 23t-33 6l-273 -57l231 157q22 15 22 36q0 29 -38 32l-257 20 l237 84q34 12 34 36.5t-40 38.5l-245 84l283 20q28 2 28 29t-22 41l-239 149l287 -51q6 -1 11 -1q31 0 31 36q0 10 -5 16l-190 219q275 -132 280 -132q22 0 22 33q0 10 -124 268l207 -171q18 -15 31 -15q31 0 31 30q0 8 -2 17l-56 263l168 -239q6 -8 16 -8q33 0 36 38 l25 273l77 -236q16 -48 40.5 -48t36.5 33l88 247l19 -253q4 -50 38 -50q15 0 31 23l155 222l-52 -259q-3 -16 3.5 -35.5t20 -19.5t26.5 11l219 190l-123 -255q-6 -12 -6 -23q0 -29 33 -29q14 0 30 8l225 113l-165 -201q-14 -17 -14 -34q0 -29 26 -29q6 0 16 2l277 57 l-227 -157q-24 -17 -24 -36q0 -26 38 -29l272 -23l-251 -86q-38 -13 -38 -37q0 -19 30 -30l261 -92zM1429 196.5q167 166.5 167 406t-166.5 406t-406 166.5t-405.5 -167t-166 -405.5t166.5 -405.5t405 -167t405.5 166.5z" />
+<glyph unicode="&#x2601;" d="M968 309l-144 -13q-109 0 -183 59q-53 42 -71.5 51.5t-70.5 9.5t-148 -22.5t-145 -22.5q-206 0 -206 122q0 85 320 132q2 57 19.5 86.5t67.5 80.5q98 244 201 244q27 0 50 -10q15 82 100 168.5t165 86.5q59 0 100 -59q85 148 217 148q94 0 165.5 -62t71.5 -154 q0 -39 -11 -74q38 11 86 11q84 0 142 -58t58 -141q0 -54 -26 -110q19 4 37 4q88 0 186.5 -60t98.5 -142q0 -78 -241 -198q-69 -93 -247 -93q-112 0 -308 -36q-22 -4 -49.5 -4t-109 28t-125.5 28zM1943 597q0 54 -78 82q-56 20 -132 20t-130 -59q24 -36 24 -58 q0 -102 -144 -102q-87 0 -145 33q-26 15 -26 40t26 33q113 -38 147 -38q66 0 66 36q0 17 -58 59q53 82 53 158q0 35 -33.5 54t-71.5 19q-84 0 -145 -56q-14 -4 -28 -4q-34 0 -34 25q0 12 11 25q71 84 207 84q66 0 119.5 -39.5t53.5 -103.5q0 -23 -3 -47q45 60 45 110.5 t-35.5 93t-86.5 42.5q-118 0 -164 -57q-57 2 -73 32q49 53 66.5 81.5t17.5 83t-48.5 92.5t-105.5 38q-119 0 -222 -239q-31 139 -105 139q-56 0 -126.5 -69.5t-70.5 -171.5l-47 -62q-33 92 -60 92q-50 0 -96 -99q-61 -134 -67 -141l-36 -39q-12 -17 -15 -52l170 14 q4 -8 4 -17q0 -30 -28 -58q-123 0 -311 -34q-42 -6 -96 -16t-54 -28q0 -49 128 -49q50 0 146 23t146 23q94 0 175.5 -58.5t150.5 -58.5q214 0 214 118q13 18 34 18t37 -18q0 -74 -54 -119q126 -45 176 -45t179.5 22t152.5 22q125 0 167 69l123 69q90 56 90 88zM900 876 q-6 0 -12 2q-6 63 -13 63q-40 0 -58 -60q-10 -46 -19 -92q-9 -34 -42 -36q-19 39 -25 39q-27 0 -43 -43l-17 -65q-25 -84 -91 -148q63 331 153 331q8 0 16 -3q13 52 46.5 102t75.5 50q71 0 70 -108q-12 -32 -41 -32z" />
+<glyph unicode="&#x2602;" horiz-adv-x="2156" d="M2056 267q0 -52 -20 -52q-15 0 -19 34.5t-6 62.5q-12 76 -63 137.5t-122 61.5q-140 0 -213 -208q-7 -25 -23 -74q-6 -17 -20.5 -17t-19.5 19q-2 38 -25 129q-61 151 -207 151q-163 0 -197 -192q-9 -51 -9 -70v-489q0 -89 -45.5 -145.5t-128.5 -56.5t-138.5 53.5 t-55.5 132.5q0 34 34 34t34 -34q0 -51 35.5 -84.5t86.5 -33.5q110 0 110 134v489q0 19 -9 70q-34 192 -197 192q-146 0 -207 -151q-12 -30 -16.5 -71t-9 -59t-19 -18t-20.5 21l-23 70q-73 208 -213 208q-71 0 -122 -61.5t-63 -137.5q-2 -28 -6 -62.5t-19 -34.5q-20 0 -20 52 q0 337 311 571q278 207 633 229v35q0 34 34 34t34 -34v-35q355 -22 633 -229q311 -234 311 -571z" />
+<glyph unicode="&#x2603;" d="M1602 739q0 -99 -229 -179q161 -109 161 -295q0 -53 -30 -123l-56 -132q-49 -124 -171 -201l139 -9l48 29l26 -4l-72 -46q-54 2 -163 8l-57 18q-130 41 -182 41q-88 0 -197 -61l-42 6v20l40 -6l26 12q-24 0 -116 69l-91 -8l-31 -23l-41 4l4 14l30 -4l30 25l81 8 q-159 125 -159 303.5t91 288.5q-320 79 -320 221q0 80 83 116l-52 73l-75 -25l-86 29l12 13l74 -25l66 21l-66 89l-59 36l-86 -8l-29 -48l-55 -28l-8 14l48 24l22 36l-36 -2l-24 -17l-16 11l34 24l127 7l-52 29l-7 105l-40 36l14 14l45 -42l5 -100l127 -75l111 -151l12 -4 l-83 119q-7 48 -26 142q-2 10 -18.5 50.5t-16.5 56t1 22.5l18 5q-1 -8 -1 -16q0 -40 31 -95l28 66l15 -4l-11 -26l22 14l18 61l15 -2l-19 -69l-38 -23l-24 -38l22 -136l40 -54l65 66v114l17 21v-141l-71 -74l48 -82q62 0 211 -55q-10 14 -10 30q0 53 66 73q-48 47 -48 130 t30 148l-82 -17l7 62l87 26q2 9 2 26q0 63 -23 90q-6 7 -35 21t-29 26q0 49 145 112.5t261 63.5q32 0 32 -25q0 -9 -21 -52.5t-21 -68.5q0 -45 36 -70l70 36l50 -36l-42 -29q184 -73 184 -230q0 -127 -69 -188q71 0 71 -102q97 73 150 73q24 0 57 -17l3 97l-49 76l9 22 l58 -92l-6 -90l29 31l17 123l29 17q18 39 18 118q0 33 -3 74l16 34l21 2l-16 -36q3 -40 3 -73q0 -76 -18 -110l105 52l77 194l12 -13l-63 -164l179 -3l-4 -16l-177 -1l-156 -81l-5 -18l99 28l90 -36l58 12l6 -12l-68 -14l-88 34l-99 -28l-14 -92l-40 -41l14 -15l93 21 l146 -48l75 71l36 8l19 80h17l-18 -78l84 13l4 -15l-135 -25l-59 -62l59 -36l-13 -12q-61 50 -215 87l-82 -21q33 -36 33 -94zM990 1388q-17 19 -17 32t13 46l-22 -12q-14 -25 -14 -38t16 -30zM1038 1550q0 8 -12 15h-22q12 -9 12 -17q0 -50 -267 -138v-18q289 85 289 158z M1293 842q0 34 -34 54q18 -25 18 -56.5t-10 -50.5l22 17q4 19 4 36zM1291 1105q0 152 -184 218q-315 -148 -396 -148q-31 -68 -31 -149q0 -120 102 -158q56 -20 204 -20q21 60 74.5 60t79.5 -35q69 0 113 85q38 71 38 147zM1243 777q8 29 8 51t-44 56l-22 -17 q39 -31 39 -100zM1205 769q0 53 -35 92l-19 -5q14 -12 14 -41t-6 -50l-16 6q6 18 6 40t-24 50.5t-51 28.5q-53 0 -62 -38q42 -30 51 -70q4 -16 4 -91q71 0 128 28q10 28 10 50zM908 733q54 0 136 22q0 73 -48 82q-19 -4 -48 -4q-40 -50 -40 -100zM1195 604v33 q-99 -27 -126 -27v-55q0 -17 8.5 -58t8.5 -65q24 14 47.5 14t57.5 -10q4 102 4 168zM739 797q0 -13 10 -32q61 -26 107 -26q-2 15 -2 24q0 40 27 72q-32 0 -102 19q-40 -20 -40 -57zM665 817q0 -17 7 -34l31 -8q-10 21 -10 29q0 51 54 67l-18 8q-64 -16 -64 -62zM1120 369 q-22 0 -42 -13l-20 -143q69 18 93 18t36 -10v117q-21 31 -67 31zM1222 749q-11 -62 -11 -546q0 -16 16 -46t16 -40t-7 -28.5t-7 -29t8 -25.5l-26 -4v63l-22 -15l-7 -54l-17 -4l4 60l-22 9l-13 -79l-19 8l11 66l-32 7l-18 -83l-24 8l18 73l-36 -13l-20 -64l-20 2q24 37 24 89 q-11 -8 -18 -8q-29 0 -29 29q0 34 35 34q8 0 20 -15l27 193q12 90 12 103.5t-9.5 51.5t-9.5 82t2 162q-105 -20 -140 -20q-74 0 -249 54t-189.5 54t-19.5 -6l30 -48l22 10l8 -12l-72 -32v16l24 9l-45 57q0 1 -3 1.5t-36 -28t-33 -73.5q0 -61 80 -111q48 -29 139.5 -62.5 t92.5 -43.5q-55 -116 -70 -159t-15 -131q0 -234 290 -381q76 36 148.5 36t234.5 -52q89 57 144 145q30 46 75.5 150.5t45.5 174.5q0 122 -121 231q-42 38 -42 45t115.5 65t115.5 117.5t-34 83.5l-26 -10l12 -20l-9 -6l-39 40l24 2l10 21q-30 13 -57.5 13t-115 -58 t-121.5 -58zM1205 103q14 11 14 23t-20 36q-22 11 -47 11t-104 -13l-12 -57q44 9 79.5 9t89.5 -9zM1080 1237q-24 0 -32 -52l-14 14q0 18 14.5 40.5t32 22.5t45.5 -13l-4 -18q-28 6 -42 6zM1130 1191.5q13 -13.5 13 -24.5t-10 -32.5t-20 -21.5q-46 0 -46 57q0 9 15.5 22 t25 13t22.5 -13.5zM1195 1013q0 -37 -26 -37q-20 0 -20 24q0 7 12 20.5t19 13.5q15 0 15 -21zM1071 1058q48 -43 48 -56.5t-20 -13.5t-77.5 27.5t-57.5 45.5q0 40 44 40q15 0 63 -43zM1113 984q9 0 9 -19t-17 -19q-23 0 -23 19t31 19zM902 1145q0 -65 -40 -65q-46 0 -46 59 q0 19 57 33q29 -17 29 -27zM1056 956q0 -32 -21 -32t-21 25t18 25q24 0 24 -18zM990 940q0 -28 -48 -28q-13 0 -13 30q0 20 30.5 20t30.5 -22zM912 972q0 -24 -26 -24t-26 23t19.5 23t32.5 -22zM994 450q30 0 30 -34t-36 -34q-26 0 -26 29q0 10 11 24.5t21 14.5zM1032 257 q0 -38 -28 -38q-35 0 -35 35t27 35q36 0 36 -32zM1128 1170q-11 13 -23 13t-23 -15v-19q15 14 23 14t21 -16zM1004 1084q-24 0 -24 -21q0 -12 53 -37.5t70 -25.5q-84 84 -99 84zM881 1139q-6 16 -15 16t-25 -14l2 -17q11 6 18 6t20 -8v17z" />
+<glyph unicode="&#x2604;" d="M462 -107q-119 -119 -214.5 -119t-171.5 75.5t-76 173.5q0 164 211 318q250 182 617.5 310t739.5 193q257 45 480 45l-225 -74q-418 -146 -857 -465q-173 -126 -504 -457zM20 23q0 -90 70 -159.5t155.5 -69.5t205.5 116l242 235q143 133 261 221q441 327 925 489 q-200 -7 -461 -69q-431 -102 -809 -264q-589 -253 -589 -499zM1581 757q-713 -221 -1103 -638q167 219 490 400.5t613 237.5zM1572 769q-667 -163 -1197 -568q223 213 553 367.5t644 200.5zM333.5 96.5q37.5 -35.5 37.5 -86.5t-38.5 -86t-87.5 -35t-85 36t-36 84.5 t35.5 85.5t86 37t88 -35.5zM318 -58.5q33 27.5 33 68.5t-32.5 69t-73.5 28t-71 -29t-30 -68.5t30.5 -67.5t70.5 -28t73 27.5z" />
+<glyph unicode="&#x2605;" horiz-adv-x="1564" d="M1524 824l-459 -335l175 -537l-458 332l-458 -332l175 537l-459 335h567l175 537l175 -537h567z" />
+<glyph unicode="&#x2606;" horiz-adv-x="1564" d="M1524 824l-459 -335l175 -537l-458 332l-458 -332l175 537l-459 335h567l175 537l175 -537h567zM1217 724h-333l-102 314l-102 -314h-333l270 -197l-103 -313l268 194l268 -194l-103 313z" />
+<glyph unicode="&#x2607;" horiz-adv-x="959" d="M806 240q0 -78 24 -216q-144 25 -216 25q-159 0 -327 -54l-39 119q178 58 343 60l-511 511v88l613 613l88 -88l-569 -569l469 -469q3 170 59 346l119 -39q-53 -165 -53 -327z" />
+<glyph unicode="&#x2608;" horiz-adv-x="1382" d="M1199 240q0 -78 24 -216q-144 25 -216 25q-159 0 -327 -54l-39 119q179 58 343 60l-511 511v88l462 463h-710v-1465h-125v1527l62 63h924l44 -107l-525 -525l469 -468q3 170 59 345l119 -39q-53 -165 -53 -327z" />
+<glyph unicode="&#x2609;" horiz-adv-x="1578" d="M1538 582q0 -312 -218.5 -530.5t-530.5 -218.5t-530.5 218.5t-218.5 530.5t218.5 530.5t530.5 218.5t530.5 -218.5t218.5 -530.5zM1438 582q0 270 -189.5 459.5t-459.5 189.5t-459.5 -189.5t-189.5 -459.5t189.5 -459.5t459.5 -189.5t459.5 189.5t189.5 459.5zM1039 582 q0 -104 -73 -177t-177 -73t-177 73t-73 177t73 177t177 73t177 -73t73 -177z" />
+<glyph unicode="&#x260a;" horiz-adv-x="1938" d="M1773 551q84 -99 84 -237.5t-102.5 -241t-249.5 -102.5t-249.5 102.5t-102.5 246.5t97.5 246t238.5 109q-32 227 -166 376q-148 166 -366 166t-366 -166q-134 -149 -166 -376q141 -7 238.5 -109t97.5 -246t-102.5 -246.5t-249.5 -102.5t-250 102.5t-103 241t84 237.5 t213 119q31 259 192 437.5t412 178.5t412 -178.5t192 -437.5q128 -20 212 -119zM1683.5 143.5q73.5 73.5 73.5 179t-73 178.5t-178.5 73t-179.5 -73.5t-74 -179t73.5 -178.5t179 -73t179 73.5zM588 143q73 73 73 178.5t-73.5 179t-179 73.5t-178.5 -73t-73 -178.5t73.5 -179 t179 -73.5t178.5 73z" />
+<glyph unicode="&#x260b;" horiz-adv-x="1938" d="M1754.5 1183.5q102.5 -102.5 102.5 -241t-84 -237.5t-212 -119q-31 -259 -192 -437.5t-412 -178.5t-412 178.5t-192 437.5q-129 20 -213 119t-84 237.5t103 241t250 102.5t249.5 -102.5t102.5 -246.5t-97.5 -246t-238.5 -109q32 -227 166 -376q148 -166 366 -166t366 166 q134 149 166 376q-141 7 -238.5 109t-97.5 246t102.5 246.5t249.5 102.5t249.5 -102.5zM1684 755q73 73 73 178.5t-73.5 179t-179 73.5t-179 -73t-73.5 -178.5t74 -179t179.5 -73.5t178.5 73zM587.5 755.5q73.5 73.5 73.5 179t-73 178.5t-178.5 73t-179 -73.5t-73.5 -179 t73 -178.5t178.5 -73t179 73.5z" />
+<glyph unicode="&#x260c;" horiz-adv-x="1148" d="M1016 905q0 -19 -31 -50l-262 -262q86 -97 86 -237.5t-102.5 -243t-249.5 -102.5t-249.5 102.5t-102.5 249.5t102.5 249.5t249.5 102.5q118 0 206 -65l264 264q31 31 50 31q39 0 39 -39zM634.5 184q73.5 74 73.5 178.5t-73 177.5t-178 73t-178 -73t-73 -177.5 t73.5 -178.5t177.5 -74t177.5 74z" />
+<glyph unicode="&#x260d;" horiz-adv-x="1591" d="M1543 912q0 -147 -102.5 -249.5t-249.5 -102.5q-118 0 -206 65l-322 -322q86 -97 86 -237.5t-102.5 -243t-249.5 -102.5t-249.5 102.5t-102.5 249.5t102.5 249.5t249.5 102.5q118 0 206 -65l322 322q-86 97 -86 237.5t102.5 243t249.5 102.5t249.5 -102.5t102.5 -249.5z M1368.5 734.5q73.5 73.5 73.5 178t-73 178t-178 73.5t-178 -73.5t-73 -178t73.5 -178t177.5 -73.5t177.5 73.5zM574.5 -106q73.5 74 73.5 178.5t-73 177.5t-178 73t-178 -73t-73 -177.5t73.5 -178.5t177.5 -74t177.5 74z" />
+<glyph unicode="&#x260e;" horiz-adv-x="2090" d="M1945 746q-3 0 -130 5.5t-148 9.5q-67 13 -87 58q-8 18 -8 28.5t3 15.5q126 -30 291.5 -30t203.5 16q0 -5 -14 -34.5t-36.5 -49t-74.5 -19.5zM1888 878q-205 0 -338 38q-12 92 -160 106q-9 -33 -9 -61q0 -68 75.5 -154.5t90.5 -125.5l185 -489q12 -32 12 -77 q0 -115 -66 -115h-1266q-66 0 -66 115q0 45 12 77l185 489q15 39 90.5 125.5t75.5 154.5q0 28 -9 61q-148 -14 -160 -106q-133 -38 -338 -38q-107 0 -166 13q18 170 59 232q51 78 204 122q327 94 746 94t746 -94q153 -44 204 -122q41 -62 59 -232q-59 -13 -166 -13zM515 863 q3 -5 3 -15.5t-8 -28.5q-20 -45 -87 -58q-21 -4 -148 -9.5t-130 -5.5q-52 0 -74.5 19.5t-36.5 49t-14 34.5q38 -16 203.5 -16t291.5 30zM1045 1063q-169 0 -289 -28q19 -68 54 -119q221 9 235 9t235 -9q35 51 54 119q-120 28 -289 28zM1290 264.5q100 101.5 100 244 t-102.5 245t-242.5 102.5t-242.5 -102.5t-102.5 -245t100 -244t245 -101.5t245 101.5zM1206 722q-17 -29 -46 -12t-12 46t46 12t12 -46zM1302 660q17 -29 -12 -46t-46 12t12 46t46 -12zM1342 511.5q0 -33.5 -33.5 -33.5t-33.5 33.5t33.5 33.5t33.5 -33.5zM1045 808 q34 0 34 -33.5t-34 -33.5t-34 33.5t34 33.5zM884 722q-17 29 12 46q11 6 20 6q16 0 26 -18q17 -29 -12 -46t-46 12zM1162 392q-2 2 -2 8t13.5 22t17.5 11q48 -62 118 -95q-4 -14 -17 -25q-77 37 -130 79zM1111 577q29 -29 29 -69t-27.5 -67.5t-67.5 -27.5t-67.5 27.5 t-27.5 67.5t29 69t66 29t66 -29zM846 626q-17 -29 -46 -12t-12 46q11 18 26 18q9 0 20 -6q29 -17 12 -46zM1045 281q34 0 34 -33.5t-34 -33.5t-34 33.5t34 33.5zM815 510.5q0 -33.5 -33.5 -33.5t-33.5 33.5t33.5 33.5t33.5 -33.5zM846 396q17 -29 -12 -46t-46 12 q-6 11 -6 20q0 15 18 26q11 6 20 6q15 0 26 -18zM942 266q-11 -18 -26 -18q-9 0 -20 6q-18 11 -18 26q0 9 6 20q11 18 26 18q9 0 20 -6q18 -11 18 -26q0 -9 -6 -20z" />
+<glyph unicode="&#x260f;" horiz-adv-x="2090" d="M1945 746q-3 0 -130 5.5t-148 9.5q-67 13 -87 58q-8 18 -8 28.5t3 15.5q126 -30 291.5 -30t203.5 16q0 -5 -14 -34.5t-36.5 -49t-74.5 -19.5zM1888 878q-205 0 -338 38q-12 92 -160 106q-9 -33 -9 -61q0 -68 75.5 -154.5t90.5 -125.5l185 -489q12 -32 12 -77 q0 -115 -66 -115h-1266q-66 0 -66 115q0 45 12 77l185 489q15 39 90.5 125.5t75.5 154.5q0 28 -9 61q-148 -14 -160 -106q-133 -38 -338 -38q-107 0 -166 13q18 170 59 232q51 78 204 122q327 94 746 94t746 -94q153 -44 204 -122q41 -62 59 -232q-59 -13 -166 -13zM515 863 q3 -5 3 -15.5t-8 -28.5q-20 -45 -87 -58q-21 -4 -148 -9.5t-130 -5.5q-52 0 -74.5 19.5t-36.5 49t-14 34.5q38 -16 203.5 -16t291.5 30zM1045 1289q-421 0 -732 -92q-124 -37 -165.5 -86.5t-56.5 -177.5q45 -5 111 -5q178 0 297 29q35 88 241 129q138 27 306 27t304 -26 q205 -40 241 -130q119 -29 297 -29q66 0 111 5q-15 128 -56.5 177.5t-165.5 86.5q-311 92 -732 92zM1045 1063q-169 0 -289 -28q19 -68 54 -119q221 9 235 9t235 -9q35 51 54 119q-120 28 -289 28zM1045 875l-247 -10q-20 0 -44 45q-13 -60 -80.5 -132t-83.5 -115l-185 -489 q-9 -24 -9 -74t16 -50h1266q16 0 16 50t-9 74l-185 489q-16 43 -83.5 115t-80.5 132q-24 -45 -44 -45zM1287.5 753.5q102.5 -102.5 102.5 -245t-100 -244t-245 -101.5t-245 101.5t-100 244t102.5 245t242.5 102.5t242.5 -102.5zM1206 722q17 29 -12 46t-46 -12t12 -46t46 12 zM1302 660q-17 29 -46 12t-12 -46t46 -12t12 46zM1342 511.5q0 33.5 -33.5 33.5t-33.5 -33.5t33.5 -33.5t33.5 33.5zM1045 741q34 0 34 33.5t-34 33.5t-34 -33.5t34 -33.5zM930 710q29 17 12 46q-10 18 -26 18q-9 0 -20 -6q-29 -17 -12 -46t46 -12zM1309 338q-70 33 -118 95 q-4 5 -17 -11q-19 -23 -12 -30q53 -42 130 -79q6 -3 14 10q5 8 5 12q0 2 -2 3zM1112.5 440.5q27.5 27.5 27.5 67.5t-29 69t-66 29t-66 -29t-29 -69t27.5 -67.5t67.5 -27.5t67.5 27.5zM846 626q17 29 -12 46q-11 6 -20 6q-15 0 -26 -18q-17 -29 12 -46t46 12zM1045 214 q34 0 34 33.5t-34 33.5t-34 -33.5t34 -33.5zM815 510.5q0 33.5 -33.5 33.5t-33.5 -33.5t33.5 -33.5t33.5 33.5zM846 396q-11 18 -26 18q-9 0 -20 -6q-18 -11 -18 -26q0 -9 6 -20q17 -29 46 -12t12 46zM942 266q6 11 6 20q0 15 -18 26q-11 6 -20 6q-15 0 -26 -18 q-6 -11 -6 -20q0 -15 18 -26q11 -6 20 -6q15 0 26 18z" />
+<glyph unicode="&#x2610;" d="M2016 -410h-1984v1984h1984v-1984zM1866 -260v1684h-1684v-1684h1684z" />
+<glyph unicode="&#x2611;" d="M2016 -410h-1984v1984h1984v-1984zM1866 -260v1684h-1684v-1684h1684zM565.5 -124q-13.5 13 -40.5 69q-125 260 -125 402q0 36 47 69q93 66 158 66q26 0 39 -23l18 -45q72 -170 88 -170q11 0 53 62l474 702q3 4 55 68l110 135q49 60 153 91.5t198 31.5l14 -33 q-66 -74 -190 -225l-426 -563l-295 -457l-72 -123q-11 -23 -43 -57q-23 -13 -112.5 -13t-103 13z" />
+<glyph unicode="&#x2612;" d="M2016 -410h-1984v1984h1984v-1984zM1866 -260v1684h-1684v-1684h1684zM474 -62l12 58q0 9 -9.5 17.5t-9.5 18t50 95.5l49 84q129 221 375 493l-152 418q-23 63 -23 73t21.5 34t33.5 24t34 -18q12 10 32 10q7 3 19.5 17t21.5 14q19 0 37 -37l156 -307l51 63 q280 330 297 330q25 0 72 -39q43 41 46.5 41t8.5 -11.5t24 -33.5t19 -31t-20.5 -28.5t-71.5 -85.5l-291 -377l-23 -33q67 -126 224 -469q-9 -20 -29 -29v-16l-24 -15q-17 -11 -17 -19t10 -28q-3 -18 -25.5 -34.5t-42 -16.5t-77.5 90l-193 297l-405 -628q-34 -25 -107 -25 q-18 0 -45.5 44.5t-27.5 59.5z" />
+<glyph unicode="&#x2613;" horiz-adv-x="1826" d="M1476 106q0 -25 -18.5 -42.5t-43.5 -17.5t-46 23l-152 199q-209 269 -415 478q-238 -239 -352 -438l-89 -186q-19 -37 -54 -37q-61 0 -61 59q0 12 4 23q116 314 466 664l-332 323q-48 44 -139 137q-18 20 -18 43t18.5 41.5t41.5 18.5t43 -18l191 -189l281 -272l301 287 q47 52 145 152q20 19 43 19q61 0 61 -60q0 -20 -21 -47t-141 -145l-302 -290q126 -128 357.5 -399.5t231.5 -325.5z" />
+<glyph unicode="&#x2614;" horiz-adv-x="2156" d="M2056 267q0 -52 -20 -52q-15 0 -19 34.5t-6 62.5q-12 76 -63 137.5t-122 61.5q-140 0 -213 -208q-7 -25 -23 -74q-6 -17 -20.5 -17t-19.5 19q-2 38 -25 129q-61 151 -207 151q-163 0 -197 -192q-9 -51 -9 -70v-489q0 -89 -45.5 -145.5t-128.5 -56.5t-138.5 53.5 t-55.5 132.5q0 34 34 34t34 -34q0 -51 35.5 -84.5t86.5 -33.5q110 0 110 134v489q0 19 -9 70q-34 192 -197 192q-146 0 -207 -151q-12 -30 -16.5 -71t-9 -59t-19 -18t-20.5 21l-23 70q-73 208 -213 208q-71 0 -122 -61.5t-63 -137.5q-2 -28 -6 -62.5t-19 -34.5q-20 0 -20 52 q0 337 311 571q278 207 633 229v35q0 34 34 34t34 -34v-35q355 -22 633 -229q311 -234 311 -571zM1625 1423q-53 0 -53 51q0 82 117 132q-10 -38 -11.5 -88.5t-4.5 -59.5q-9 -35 -48 -35zM1760 1193q-53 0 -53 51q0 82 117 132q-10 -38 -11.5 -88.5t-4.5 -59.5 q-9 -35 -48 -35zM1895 963q-53 0 -53 51q0 82 117 132q-10 -38 -11.5 -88.5t-4.5 -59.5q-9 -35 -48 -35zM1355 1423q-53 0 -53 51q0 82 117 132q-10 -38 -11.5 -88.5t-4.5 -59.5q-9 -35 -48 -35zM1490 1193q-53 0 -53 51q0 82 117 132q-10 -38 -11.5 -88.5t-4.5 -59.5 q-9 -35 -48 -35zM1625 963q-53 0 -53 51q0 82 117 132q-10 -38 -11.5 -88.5t-4.5 -59.5q-9 -35 -48 -35zM1085 1423q-53 0 -53 51q0 82 117 132q-10 -38 -11.5 -88.5t-4.5 -59.5q-9 -35 -48 -35zM1220 1193q-53 0 -53 51q0 82 117 132q-10 -38 -11.5 -88.5t-4.5 -59.5 q-9 -35 -48 -35zM815 1423q-53 0 -53 51q0 82 117 132q-10 -38 -11.5 -88.5t-4.5 -59.5q-9 -35 -48 -35zM950 1193q-53 0 -53 51q0 82 117 132q-10 -38 -11.5 -88.5t-4.5 -59.5q-9 -35 -48 -35zM545 1423q-53 0 -53 51q0 82 117 132q-10 -38 -11.5 -88.5t-4.5 -59.5 q-9 -35 -48 -35zM680 1193q-53 0 -53 51q0 82 117 132q-10 -38 -11.5 -88.5t-4.5 -59.5q-9 -35 -48 -35zM410 1193q-53 0 -53 51q0 82 117 132q-10 -38 -11.5 -88.5t-4.5 -59.5q-9 -35 -48 -35zM545 963q-53 0 -53 51q0 82 117 132q-10 -38 -11.5 -88.5t-4.5 -59.5 q-9 -35 -48 -35zM275 923q-53 0 -53 51q0 82 117 132q-10 -38 -11.5 -88.5t-4.5 -59.5q-9 -35 -48 -35z" />
+<glyph unicode="&#x2615;" horiz-adv-x="2064" d="M1271 1048q0 -132 -129 -204q28 62 28 103q0 107 -69.5 197t-69.5 156q0 148 163 197q-68 -93 -68 -163t72.5 -144t72.5 -142zM993 1055q0 -150 -143 -226q44 67 44 114q0 106 -38 178q-1 2 -70 100q-38 53 -38 119t44 128t112 83q-56 -82 -56 -169.5t72.5 -168.5 t72.5 -158zM704 1048q0 -131 -119 -198q18 59 18 126q0 95 -72.5 176t-72.5 148t50 123t120 74q-69 -52 -69 -159q0 -82 72.5 -144.5t72.5 -145.5zM105 525l-5 86q0 51 13 79q31 65 334 102q217 27 388 27t388 -27q303 -37 334 -102q13 -28 13 -62.5t-2 -57.5q64 40 134 40 q109 0 185.5 -72t76.5 -180q0 -174 -136 -256q-61 -38 -290 -101q-54 -13 -144 -53q-18 -19 -42 -39q-48 -26 -135 -88q-15 -23 -51 -66q-58 -53 -295 -53h-72q-237 0 -295 53q-15 23 -51 66q-20 19 -68 45.5t-67 42.5q-213 178 -213 616zM1839 358q0 56 -40 91.5t-86 35.5 t-97 -33t-56 -65q-9 -67 -20 -135t-36 -130l133 33q76 22 126 53q76 46 76 150zM835 749q-211 0 -423 -31q14 -26 11 -59q206 30 429 30t466 -43q62 -11 55 -11q31 0 102 33q-235 81 -640 81zM1475 515q0 11 -1 84q-80 -40 -287.5 -62t-353.5 -22t-353.5 22t-287.5 62 l-1 -84q0 -205 39 -322q53 -160 196 -249q35 -20 101 -65q11 -10 34 -27q55 -30 247.5 -30t263.5 18l-387 42q302 36 412 163t110 430q122 13 203 30q1 -31 1 -42q0 -282 -87 -454q151 148 151 506z" />
+<glyph unicode="&#x2616;" horiz-adv-x="1566" d="M1454 0h-1342l100 801l571 541l571 -541zM1341 100l-82 653l-476 451l-476 -451l-82 -653h1116z" />
+<glyph unicode="&#x2617;" horiz-adv-x="1566" d="M1454 0h-1342l100 801l571 541l571 -541z" />
+<glyph unicode="&#x2618;" horiz-adv-x="1841" d="M119 607l-11 107q0 200 205 200q98 0 233 -75l214 -134q-23 75 -149 242.5t-126 286.5t70.5 195.5t186.5 76.5q45 0 134 -17.5t126.5 -17.5t96.5 14.5t89 14.5q106 0 159.5 -85.5t53.5 -197.5q0 -88 -133 -262l-193 -250l233 131q123 68 222 68q227 0 227 -242 q0 -40 -17.5 -116.5t-17.5 -116.5l12 -135q0 -87 -62 -133t-156 -46t-220 80q-63 40 -178.5 134.5t-143.5 94.5q-25 0 -25 -29q0 10 4 -44t4 -117t-26.5 -216.5t-55.5 -218t-88.5 -64.5t-59.5 45q0 -2 76 189t76 322t-36 131q-28 0 -112.5 -75.5t-208.5 -142t-213.5 -66.5 t-157 55t-67.5 151q0 45 17.5 131.5t17.5 131.5z" />
+<glyph unicode="&#x2619;" d="M1962 246q-6 -94 -70.5 -161t-146.5 -67t-128.5 37.5t-46.5 106.5q0 18 3 50l4 43q50 -48 117 -48q110 0 133 112q-143 59 -241 158q-117 120 -115 254q-191 -1 -267 -137q168 -85 168 -227q0 -181 -208 -281q-165 -80 -386 -80t-412.5 113.5t-310.5 322.5 q-31 54 -31 102q0 88 87 88q54 0 86 -54q-22 -40 -22 -94.5t43.5 -97t98.5 -42.5t86 18q74 43 94 175q34 221 45 252q51 153 199 246q83 52 194 52t191.5 -65.5t80.5 -174.5q0 -77 -48 -167l5 -6q131 116 257 116q24 0 52 -4q28 76 157.5 167t129.5 158q0 50 -38 80 q207 -4 207 -159q0 -87 -70 -129q-25 -15 -163 -40q-107 -20 -136 -79q152 -29 276.5 -143.5t128.5 -260.5q44 -47 59 -116q-32 -14 -62 -18zM1838 432q0 114 -91.5 203.5t-206.5 94.5q-6 -19 -6 -40q0 -88 111 -172q88 -67 193 -100v14z" />
+<glyph unicode="&#x261a;" horiz-adv-x="1929" d="M1830 882q56 -116 56 -245.5t-62 -276.5l-55 23q57 135 57 250.5t-63 249.5l54 26zM1703 869q53 -113 53 -234.5t-48 -235.5h-143q-115 -125 -224 -175q-41 -5 -78 -5t-100 20l-37 -16l-35 -2q-11 -1 -21 -1q-129 0 -129 109q0 5 2 16q-112 16 -112 111q0 21 11 49 q-90 24 -90 103q0 57 50 87l-36 8l-360 4q-233 3 -233 107q0 62 52.5 85.5t200.5 26.5l409 9l41 38l275 25q190 -55 338 -129h214z" />
+<glyph unicode="&#x261b;" horiz-adv-x="1929" d="M1886 814q0 -104 -233 -107l-360 -4l-36 -8q50 -30 50 -87q0 -79 -90 -103q11 -28 11 -49q0 -95 -112 -111q2 -11 2 -16q0 -109 -129 -109q-10 0 -21 1l-35 2l-37 16q-63 -20 -100 -20t-78 5q-109 50 -224 175h-143q-48 114 -48 235.5t53 234.5h214q148 74 338 129 l275 -25l41 -38l409 -9q148 -3 200.5 -26.5t52.5 -85.5zM296 883q-63 -134 -63 -249.5t57 -250.5l-55 -23q-62 147 -62 276.5t56 245.5l13 27z" />
+<glyph unicode="&#x261c;" horiz-adv-x="1929" d="M1830 882q56 -116 56 -245.5t-62 -276.5l-55 23q57 135 57 250.5t-63 249.5l54 26zM1703 869q53 -113 53 -234.5t-48 -235.5h-143q-115 -125 -224 -175q-41 -5 -78 -5t-100 20l-37 -16l-35 -2q-11 -1 -21 -1q-129 0 -129 109q0 5 2 16q-112 16 -112 111q0 21 11 49 q-90 24 -90 103q0 57 50 87l-36 8l-360 4q-233 3 -233 107q0 62 52.5 85.5t200.5 26.5l409 9l41 38l275 25q190 -55 338 -129h214zM1674 451q31 93 31 184.5t-35 184.5h-182q-254 102 -340 127l-253 -22l-157 -144q44 -39 100 -39q86 0 171 89q92 -52 175 -52h14l17 1 l-2 -50l-23 -1h-13q-77 0 -158 43q-59 -46 -109 -65l90 -1q52 29 104 29q115 0 183 -133l-70 -30q66 -21 121 -115l-62 -28q56 -46 81 -105l-125 -53q51 -7 63.5 -7t37.5 4q116 68 206 183h135zM1104 687q-44 0 -90 -32h-129q-82 0 -82 -46q0 -65 115 -65h4l106 1l190 77 q-38 65 -114 65zM883 455q0 -63 92 -63h6l90 2l194 84q-35 53 -117 64l-104 -46l-146 1q-15 -24 -15 -42zM991 345q0 -75 88 -75h5l39 1l164 77q-22 29 -65 56l-134 -59h-97zM222 813q0 -56 242 -57l227 -1q-10 9 -24 25l116 106l-366 -9q-195 -5 -195 -64z" />
+<glyph unicode="&#x261d;" horiz-adv-x="1929" d="M1290 -65q-113 -53 -234.5 -53t-235.5 48v143q-125 115 -175 224q-5 41 -5 78t20 100l-16 37l-2 35q-1 11 -1 21q0 129 109 129q5 0 16 -2q16 112 111 112q21 0 49 -11q24 90 103 90q57 0 87 -50l8 36l4 360q3 233 107 233q62 0 85.5 -52.5t26.5 -200.5l9 -409l38 -41 l25 -275q-55 -190 -129 -338v-214zM1303 -192q-116 -56 -245.5 -56t-276.5 62l23 55q135 -57 250.5 -57t249.5 63l26 -54zM1234 1416q-56 0 -57 -242l-1 -227q9 10 25 24l106 -116l-9 366q-5 195 -64 195zM1108 534q0 44 -32 90v129q0 82 -46 82q-66 0 -65 -119l1 -106 l77 -190q65 38 65 114zM876 755q-63 0 -63 -92v-6l2 -90l84 -194q53 35 64 117l-46 104l1 146q-24 15 -42 15zM1163 800q0 -86 89 -171q-52 -92 -52 -175v-14l1 -17l-50 2l-1 23v13q0 77 43 158q-46 59 -65 109l-1 -90q29 -52 29 -104q0 -115 -133 -183l-30 70 q-21 -66 -115 -121l-28 62q-46 -56 -105 -81l-53 125q-7 -51 -7 -63.5t4 -37.5q68 -116 183 -206v-135q93 -31 184.5 -31t184.5 35v182q102 254 127 340l-22 253l-144 157q-39 -44 -39 -100zM766 647q-77 0 -75 -93l1 -39l77 -164q29 22 56 65l-59 134v97z" />
+<glyph unicode="&#x261e;" horiz-adv-x="1929" d="M1886 814q0 -104 -233 -107l-360 -4l-36 -8q50 -30 50 -87q0 -79 -90 -103q11 -28 11 -49q0 -95 -112 -111q2 -11 2 -16q0 -109 -129 -109q-10 0 -21 1l-35 2l-37 16q-63 -20 -100 -20t-78 5q-109 50 -224 175h-143q-48 114 -48 235.5t53 234.5h214q148 74 338 129 l275 -25l41 -38l409 -9q148 -3 200.5 -26.5t52.5 -85.5zM296 883q-63 -134 -63 -249.5t57 -250.5l-55 -23q-62 147 -62 276.5t56 245.5l13 27zM1837 813q0 59 -195 64l-366 9l116 -106q-14 -16 -24 -25l227 1q242 1 242 57zM1256 609q0 46 -82 46h-129q-46 32 -90 32 q-76 0 -114 -65l190 -77l106 -1h4q115 0 115 65zM1176 455q0 18 -15 42l-146 -1l-104 46q-82 -11 -117 -64l194 -84l90 -2h6q92 0 92 63zM389 820q-35 -93 -35 -184.5t31 -184.5h135q90 -115 206 -183q25 -4 37.5 -4t63.5 7l-125 53q25 59 81 105l-62 28q55 94 121 115 l-70 30q68 133 183 133q52 0 104 -29l90 1q-50 19 -109 65q-81 -43 -158 -43h-13l-23 1l-2 50l17 -1h14q83 0 175 52q85 -89 171 -89q56 0 100 39l-157 144l-253 22q-86 -25 -340 -127h-182zM1068 345h-97l-134 59q-43 -27 -65 -56l164 -77l39 -1h5q88 0 88 75z" />
+<glyph unicode="&#x261f;" horiz-adv-x="1929" d="M1255 1348q-135 57 -250.5 57t-249.5 -63l-26 54l27 13q116 56 245.5 56t276.5 -62zM1414 920q5 -41 5 -78t-20 -100l16 -37l2 -35q1 -11 1 -21q0 -129 -109 -129q-5 0 -16 2q-16 -112 -111 -112q-21 0 -49 11q-24 -90 -103 -90q-57 0 -87 50l-8 -36l-4 -360 q-3 -233 -107 -233q-62 0 -85.5 52.5t-26.5 200.5l-9 409l-38 41l-25 275q55 190 129 338v214q113 53 234.5 53t235.5 -48v-143q125 -115 175 -224zM1293 570q77 0 75 93l-1 39l-77 164q-29 -22 -56 -65l59 -134v-97zM1367 811q7 51 7 63.5t-4 37.5q-68 116 -183 206v135 q-93 31 -184.5 31t-184.5 -35v-182q-102 -254 -127 -340l22 -253l144 -157q39 44 39 100q0 86 -89 171q52 92 52 175v14l-1 17l50 -2l1 -23v-13q0 -77 -43 -158q46 -59 65 -109l1 90q-29 52 -29 104q0 115 133 183l30 -70q21 66 115 121l28 -62q46 56 105 81zM1183 462 q63 0 63 92v6l-2 90l-84 194q-53 -35 -64 -117l46 -104l-1 -146q24 -15 42 -15zM951 683q0 -44 32 -90v-129q0 -82 46 -82q66 0 65 119l-1 106l-77 190q-65 -38 -65 -114zM825 -199q56 0 57 242l1 227q-9 -10 -25 -24l-106 116l9 -366q5 -195 64 -195z" />
+<glyph unicode="&#x2620;" horiz-adv-x="1490" d="M1209 1184q0 -97 -43 -188t-51 -146l-15 -107q-2 -13 -14 -19l-167 -80l-21 -56q-7 -17 -62.5 -28.5t-87.5 -11.5q-98 0 -139 26q-25 16 -37 70l-167 80q-10 5 -12.5 14.5t-11.5 71t-53.5 144t-44.5 230.5q0 191 134 298.5t329 107.5t329 -107.5t134 -298.5zM743 311 q-87 0 -136 52q-9 12 -28 35l-80 65q-7 6 -26 67t-19 74q0 18 26.5 29t48.5 11q12 0 45 -55t49 -65q31 -19 115 -19t115 13t48.5 47t27.5 57q14 22 39 22q63 0 63 -43l-13 -50q-18 -70 -28 -82t-83 -71q-52 -87 -164 -87zM1400 -255q0 -78 -134 -102q-60 -73 -106.5 -73 t-81.5 63q-10 18 -43 103q-163 135 -294 207q-158 -92 -295 -217q-24 -156 -108 -156q-53 0 -109 81q-139 4 -139 96q0 79 99 114q37 13 164 32q104 77 225 145q-167 81 -281 104q-63 -54 -113 -54q-92 0 -92 80q0 32 53 103q-11 47 -11 73q0 100 84 100q69 0 202 -157 q137 -50 330 -149q109 59 324 149q149 154 203 154q78 0 78 -93q0 -25 -8 -75q52 -68 52 -109q0 -82 -85 -82q-33 0 -128 61q-101 -21 -274 -106l244 -151q244 -29 244 -141zM1158 1184q0 169 -119 262t-293 93t-293 -93t-119 -262q0 -111 44.5 -213t53.5 -163l6 -43 l178 -86q4 -22 20 -62q39 -18 104.5 -18t114.5 19l23 63l173 83q21 152 64 244t43 176zM954 553q-53 -99 -183 -99t-160 17t-98 119l-4 -1q14 -52 30 -93q71 -60 104 -97t108.5 -37t116.5 70q74 60 80 68.5t28 91.5l-4 1zM1349 -255q0 67 -210 92l-335 204q137 67 218.5 102 t173.5 54q99 -64 118 -64q34 0 34 31q0 25 -55 95q11 66 11 89q0 43 -32 40q-48 -19 -169 -144q-215 -90 -352 -164q-218 112 -361 164q-126 149 -172 149q-33 0 -33 -49q0 -23 15 -85q-57 -75 -57 -91q0 -29 36.5 -29t103.5 58q143 -29 405 -156q-204 -115 -315 -197 q-118 -17 -137 -22q-95 -25 -95 -75q0 -44 115 -46q54 -80 82 -80q41 0 60 130q157 144 342 251q161 -89 338 -235q56 -146 80.5 -146t80.5 69q110 19 110 55zM1052 987q0 -143 -117.5 -143t-117.5 131.5t121 131.5q114 0 114 -120zM849 756q0 -67 -72 -67q-14 0 -30 7 q-16 -7 -31 -7q-71 0 -71 66q0 26 37 70q3 4 43 63q10 15 22 15t22 -15q13 -22 43 -63q37 -44 37 -69zM681 987q0 -143 -117 -143t-117 131.5t119 131.5q115 0 115 -120zM797 758q0 -1 -1 -1q-4 0 -49 71q-51 -78 -51 -73q0 -15 20 -15q5 0 31 12q23 -12 30 -12q20 0 20 18z " />
+<glyph unicode="&#x2621;" horiz-adv-x="1320" d="M1208 125q62 0 62 -62.5t-62 -62.5h-842q-111 0 -185 44q-90 54 -90 158t97 202l825 833q47 47 47 83t-39.5 57t-77.5 21h-658q80 -85 159.5 -235.5t79.5 -247.5q0 -63 -62 -63q-38 0 -52 28l-16 60q-50 178 -117 270q-41 56 -203 207q-24 23 -24 49q0 58 69 58h824 q92 0 166.5 -57t74.5 -145.5t-83 -172.5l-825 -834q-61 -62 -61 -114q0 -76 151 -76h842z" />
+<glyph unicode="&#x2622;" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1898 582q0 364 -255 619t-619 255t-619 -255t-255 -619t255 -619t619 -255t619 255t255 619zM1848 582h-650q0 104 -86 152l325 563q188 -108 299.5 -298t111.5 -417z M1148 582q0 -54 -35 -89t-89 -35t-89 35t-35 89t35 89t89 35t89 -35t35 -89zM850 582h-650q0 227 111.5 417t299.5 298l325 -563q-86 -48 -86 -152zM1024 -242q-223 0 -413 109l325 563q39 -22 87 -22t88 22l326 -563q-190 -109 -413 -109z" />
+<glyph unicode="&#x2623;" d="M1536 686q-102 0 -214 -65q-64 -37 -111 -103l-71 37q3 15 3 27q0 92 -85 115l3 80q81 8 145 45q207 119 207 325t-159 378q125 -80 202.5 -214.5t77.5 -252.5t-67 -219q14 1 27 1q233 0 376 -247q78 -135 85 -282q-81 264 -298 351q-59 24 -121 24zM1024 933 q-84 0 -159 -37q-41 21 -71 52q105 65 230 65t230 -65q-30 -31 -71 -52q-75 37 -159 37zM1455 582q0 -122 -60.5 -223t-162.5 -156q-10 39 -12 86q146 97 155 275q40 25 80 36v-18zM905 582q0 -12 3 -27l-71 -37q-47 66 -111 103q-112 65 -214 65q-62 0 -121 -24 q-217 -87 -298 -351q7 147 85 282q143 247 376 247q13 0 27 -1q-67 101 -67 219t77.5 252.5t202.5 214.5q-159 -172 -159 -371q0 -213 207 -332q64 -37 145 -45l3 -80q-85 -23 -85 -115zM1438 -155q-301 0 -414 226q-113 -226 -414 -226q-155 0 -287 68q75 -17 150 -17 q177 0 306 101.5t129 308.5q0 73 -34 148l66 41q33 -32 84 -32t84 32l66 -41q-34 -75 -34 -148q0 -207 129 -308.5t306 -101.5q75 0 150 17q-132 -68 -287 -68zM593 582v18q40 -11 80 -36q9 -178 155 -275q-2 -42 -13 -86q-102 55 -162 156t-60 223z" />
+<glyph unicode="&#x2624;" d="M2016 1491q0 -30 -43 -51.5t-82.5 -21.5t-98.5 17l-112 33q-2 1 -5 1q-15 0 -19 -15l4 -5q95 -54 212 -54q8 0 20 1q1 -78 -110 -78q-88 0 -137 21q-8 3 -51 30.5t-50 27.5t-9 -8q7 -28 74.5 -57.5t101.5 -29.5q4 0 9 1q-33 -82 -136 -82q-76 0 -132.5 46.5t-60.5 46.5 t-4 -7q0 -20 49 -59q48 -38 69 -38h1q-28 -43 -114 -48q-44 -79 -248 -147q73 -48 73 -108q0 -86 -83 -145q97 -52 97 -136t-100 -142q60 -43 60 -110.5t-84 -126.5q89 -56 89 -117t-87 -96q49 -37 49 -87.5t-71 -94.5l72 -52l-11 -23q-53 14 -104 34v-221h-40v221 q-51 -20 -104 -34l-11 23l72 52q-71 44 -71 94.5t49 87.5q-87 35 -87 96t89 117q-84 59 -84 126.5t60 110.5q-100 58 -100 142t97 136q-83 59 -83 145q0 60 73 108q-204 68 -248 147q-86 5 -114 48h1q21 0 69 38q49 39 49 59q0 7 -4 7t-60.5 -46.5t-132.5 -46.5 q-103 0 -136 82q5 -1 9 -1q34 0 101.5 29.5t74.5 57.5q-2 8 -9 8t-50 -27.5t-51 -30.5q-49 -21 -137 -21q-111 0 -110 78q12 -1 20 -1q117 0 212 54l4 5q-4 15 -19 15q-2 0 -31 -9l-81 -24q-64 -18 -103.5 -18t-82.5 21.5t-43 51.5v83h863q-14 -28 -14 -59q0 -87 106 -101 v-153q0 -98 -98 -98q-39 0 -98 34q36 20 69 71q-8 4 -24 10q-36 -48 -73 -78q19 -30 93 -62l148 -56v378q-55 13 -55 56q0 26 24 42t51 16t51 -16t24 -42q0 -43 -55 -56v-378l148 56q74 32 93 62q-37 30 -73 78l-24 -10q33 -51 69 -71q-59 -34 -98 -34q-98 0 -98 98v153 q106 14 106 101q0 31 -14 59h863v-83zM729 1225q0 21 29.5 53t49.5 32t52 -14t48 -14q35 0 35 25q0 29 -47 47.5t-94 18.5t-93 -38t-46 -95q0 -81 88 -133q46 -28 183 -74q24 13 54 26q-140 52 -176 71q-83 44 -83 95zM1191 907q0 53 -79 98l-57 -20q76 -41 76 -96.5 t-74 -92.5l50 -21q84 53 84 132zM1044 819q61 30 61 70t-61 73v-143zM1004 962q-61 -33 -61 -73t61 -70v143zM1385 1240q0 57 -46 95t-93 38t-94 -18.5t-47 -47.5q0 -25 35 -25q16 0 48 14t52 14t49.5 -32t29.5 -53q0 -59 -120 -112l-222 -87q-120 -55 -120 -119 q0 -75 74 -126l139 -73q74 -40 74 -89q0 -58 -130.5 -113.5t-130.5 -126.5q0 -59 64 -105q5 -4 120 -68q64 -35 64 -68q0 -42 -107.5 -88t-107.5 -108q0 -57 161 -115q-113 80 -113 116q0 64 103 103t103 88t-119.5 116t-119.5 117q0 45 69 81l134 68q71 46 71 111t-75 107 l-138 62q-75 37 -75 89q0 72 121 121l226 83q121 58 121 151zM1044 547q74 34 74 71t-74 74v-145zM1004 692q-74 -37 -74 -74t74 -71v145zM939 745q-96 -46 -96 -119.5t99 -125.5q21 12 49 24q-87 40 -87 93t90 99q-35 17 -55 29zM1083 262q82 52 82 112t-59 97 q-21 -11 -52 -25q63 -35 63 -78.5t-67 -86.5q11 -6 33 -19zM1091 367q0 28 -47 54v-113q47 31 47 59zM957 367q0 -28 47 -59v113q-47 -26 -47 -54zM1105 138q0 19 -61 51v-102q61 26 61 51zM943 138q0 -25 61 -51v102q-61 -32 -61 -51zM878 134q0 -50 88 -83l25 13 q-74 33 -74 74q0 35 78 76q-18 9 -30 17q-87 -51 -87 -97zM1132 -58q0 49 -52 81q-19 -7 -30 -12q34 -26 34 -68q0 -22 -40 -59l20 -15q68 39 68 73zM1044 -80q14 15 14 30t-14 31v-61zM1004 -19q-14 -16 -14 -31t14 -30v61zM991 -165l-5 3l-15 -11q6 2 20 8zM1191 1323 q0 -24 -30 -24t-30 19q0 24 30 24t30 -19zM917 1318q0 -19 -30 -19t-30 24q0 19 30 19t30 -24zM1178 1324q0 6 -16.5 6t-16.5 -12q0 -6 16.5 -6t16.5 12zM903 1318q0 12 -16.5 12t-16.5 -6q0 -12 16.5 -12t16.5 6z" />
+<glyph unicode="&#x2625;" horiz-adv-x="1224" d="M1174 308h-495v-700h-133v700h-496v133h467q-132 120 -213 286t-81 343.5t103 286t287 108.5t287 -108.5t103 -286t-81 -343.5t-213 -286h465v-133zM882 1077q0 267 -269 267t-269 -267q0 -144 78 -307t191 -258q113 95 191 258t78 307z" />
+<glyph unicode="&#x2626;" horiz-adv-x="1270" d="M1173 809h-467v-550l353 -248l-67 -95l-286 201v-409h-141v508l-349 244l67 96l282 -198v451h-468v137h468v224h-301v119h301v204h141v-204h303v-119h-303v-224h467v-137z" />
+<glyph unicode="&#x2627;" horiz-adv-x="1480" d="M1268 1256q0 -241 -296 -336q-88 -28 -88 -56t40 -48l-40 -64q-80 40 -80 117.5t144 154.5q123 66 123 203q0 95 -81 149q-70 48 -170 48h-40q-48 0 -48 -56v-840l-160 128v712q0 21 -21.5 38.5t-42.5 17.5h-72v96h464q368 0 368 -264zM1380 0h-376v96h64l-328 240 l-328 -240h72v-96h-384v96h128l416 312l-416 312h-128v96h384v-96h-80l336 -248l328 248h-64v96h376v-96h-128l-424 -312l416 -312h136v-96zM876 -200h-440v96h72q64 0 64 48v208l160 128v-336q0 -48 64 -48h80v-96z" />
+<glyph unicode="&#x2628;" horiz-adv-x="1270" d="M1173 809h-466v-1101h-141v1101h-469v137h469v224h-302v119h302v204h141v-204h302v-119h-302v-224h466v-137z" />
+<glyph unicode="&#x2629;" d="M1827 310h-119v202h-614v-614h202v-119h-544v119h202v614h-614v-202h-119v544h119v-202h614v614h-202v119h544v-119h-202v-614h614v202h119v-544z" />
+<glyph unicode="&#x262a;" horiz-adv-x="1812" d="M1640 825l-209 -151l80 -246l-208 151l-209 -151l80 246l-209 151h258l80 244l79 -244h258zM1106 1381q-265 0 -451.5 -187.5t-186.5 -451.5t184.5 -453.5t446.5 -189.5q94 0 220 40l6 -13q-191 -126 -413 -126q-309 0 -524.5 215.5t-215.5 526t217 524.5t529 214 q222 0 408 -125l-6 -13q-126 39 -214 39z" />
+<glyph unicode="&#x262b;" d="M1402 1550q4 -1 4 -4.5t-1 -4.5q-37 -64 -103 -110.5t-136 -46.5t-122 28q-77 -58 -183 -58t-162.5 60.5t-56.5 162.5q1 6 4 6l48 -34q89 -59 193 -59q64 0 117 83q1 2 5 2h-1q0 -4 66 -42q74 -42 137 -42t187 58q2 1 4 1zM1983 516q0 -319 -220 -577q-39 -46 -68 -65 q-13 -3 -13 10.5t48 113.5q121 252 121 517.5t-151 508.5l-67 97q-55 79 -55 87q0 17 21 17t108 -83q276 -262 276 -626zM1642 632q0 -247 -121.5 -450t-338.5 -328l217 -92q24 -8 70 -27q11 -6 11 -16q0 -17 -40 -17q-125 0 -325 56q-26 -116 -91 -142q-65 26 -91 142 q-200 -56 -325 -56q-40 0 -40 17q0 10 9 15t41 16.5t248 103.5q-217 125 -338.5 328t-121.5 450q0 293 163 528q44 63 63 63q12 0 12 -13t-22 -86q-64 -211 -64 -434q0 -468 375 -710q17 188 17 289.5t-18 398t-18 444.5q0 37 36.5 73.5t73.5 36.5t73.5 -36.5t36.5 -73.5 q0 -148 -18 -444.5t-18 -398t17 -289.5q375 242 375 710q0 223 -64 434q-22 73 -22 86t12 13q19 0 63 -63q163 -235 163 -528zM470 1208q0 -8 -61 -96l-61 -88q-151 -243 -151 -508.5t121 -517.5q48 -100 48 -114q0 -11 -9 -11q-2 0 -4 1q-29 19 -68 65q-220 258 -220 577 q0 364 276 626q87 83 108 83t21 -17z" />
+<glyph unicode="&#x262c;" horiz-adv-x="1724" d="M1474 1115q130 -161 130 -347t-73 -415q-42 -131 -158 -400q-57 245 -359 245q66 -54 128 -140t73 -158q50 -22 50 -77q0 -35 -24.5 -59.5t-59.5 -24.5t-59.5 24.5t-24.5 63.5t34 64q-18 110 -230 248v-281q89 -28 89 -122q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5q0 94 89 122v281q-212 -138 -230 -248q34 -25 34 -64t-24.5 -63.5t-59.5 -24.5t-59.5 24.5t-24.5 59.5q0 55 50 77q11 72 73 158t128 140q-302 0 -359 -245q-116 269 -158 400q-73 229 -73 415t130 347q114 139 293 229q-109 -75 -180 -222.5t-71 -284.5 q0 -225 161 -358q123 -102 370 -167v108h-182l34 93q-116 42 -193 151t-77 243t83 246t222 142q-30 83 -69 132l221 113l221 -113q-39 -49 -69 -132q139 -30 222 -142t83 -246t-77 -243t-193 -151l34 -93h-182v-108q247 65 370 167q161 133 161 358q0 137 -71 284.5 t-180 222.5q179 -90 293 -229zM1196 896q0 225 -211 286q-30 -158 -30 -271t54 -290q187 71 187 275zM715 621q54 177 54 290t-30 271q-211 -61 -211 -286q0 -204 187 -275z" />
+<glyph unicode="&#x262d;" horiz-adv-x="1688" d="M1577 144q19 -19 19 -51.5t-31.5 -64.5t-61.5 -32t-55 25l-223 219q-138 -86 -320 -86q-141 0 -254 59q-124 63 -182 183l-41 -39q54 -43 54 -68q0 -37 -37 -37q-32 0 -64 51q-149 -237 -231 -237q-39 0 -63.5 27.5t-24.5 64.5t26 65q85 92 209 164q-53 38 -53 68 q0 11 14 23t25 12q28 0 65 -54l105 101h72q117 -187 327 -187q90 0 205 58l-504 508l-157 -152l-195 197l328 323l336 -55l-189 -188l520 -521q103 95 103 279t-128.5 374t-298.5 288l8 19q276 -55 449.5 -245.5t173.5 -462t-147 -407.5z" />
+<glyph unicode="&#x262e;" horiz-adv-x="1726" d="M1414.5 1292q226.5 -227 226.5 -551.5t-227 -551.5t-550.5 -227t-551 227.5t-227.5 551t227 551t551.5 227.5t551 -227zM1377 295q164 190 164 452.5t-181 456.5t-447 213v-664zM1306 225l-393 387v-548q224 16 393 161zM366 1203.5q-181 -194.5 -181 -456t165 -451.5 l463 457v664q-266 -19 -447 -213.5zM813 64v548l-392 -387q169 -145 392 -161z" />
+<glyph unicode="&#x262f;" horiz-adv-x="1726" d="M1414.5 1292q226.5 -227 226.5 -551.5t-227 -551.5t-550.5 -227t-551 227.5t-227.5 551t227 551t551.5 227.5t551 -227zM1541 740q0 282 -198 480.5t-480 198.5q-162 0 -306.5 -73t-240.5 -203q80 32 177 32q185 0 297 -115.5t136 -303.5q41 -323 308 -323 q134 0 220.5 86.5t86.5 220.5zM615 740q0 51 -36 87t-87.5 36t-87.5 -35.5t-36 -87.5t36 -87.5t87.5 -35.5t87.5 36t36 87zM1358 740q0 -52 -36 -87.5t-87.5 -35.5t-87.5 36t-36 87t36 87t87.5 36t87.5 -35.5t36 -87.5z" />
+<glyph unicode="&#x2630;" d="M1724 212h-1400v192h1400v-192zM1724 636h-1400v192h1400v-192zM1724 1060h-1400v192h1400v-192z" />
+<glyph unicode="&#x2631;" d="M1724 212h-1400v192h1400v-192zM1724 636h-1400v192h1400v-192zM1724 1060h-516v192h516v-192zM840 1060h-516v192h516v-192z" />
+<glyph unicode="&#x2632;" d="M1724 636h-516v192h516v-192zM840 636h-516v192h516v-192zM1724 212h-1400v192h1400v-192zM1724 1060h-1400v192h1400v-192z" />
+<glyph unicode="&#x2633;" d="M1724 636h-516v192h516v-192zM840 636h-516v192h516v-192zM1724 212h-1400v192h1400v-192zM1724 1060h-516v192h516v-192zM840 1060h-516v192h516v-192z" />
+<glyph unicode="&#x2634;" d="M1724 636h-1400v192h1400v-192zM1724 1060h-1400v192h1400v-192zM1724 212h-516v192h516v-192zM840 212h-516v192h516v-192z" />
+<glyph unicode="&#x2635;" d="M1724 212h-516v192h516v-192zM840 212h-516v192h516v-192zM1724 636h-1400v192h1400v-192zM1724 1060h-516v192h516v-192zM840 1060h-516v192h516v-192z" />
+<glyph unicode="&#x2636;" d="M1724 212h-516v192h516v-192zM840 212h-516v192h516v-192zM1724 636h-516v192h516v-192zM840 636h-516v192h516v-192zM1724 1060h-1400v192h1400v-192z" />
+<glyph unicode="&#x2637;" d="M1724 212h-516v192h516v-192zM840 212h-516v192h516v-192zM1724 636h-516v192h516v-192zM840 636h-516v192h516v-192zM1724 1060h-516v192h516v-192zM840 1060h-516v192h516v-192z" />
+<glyph unicode="&#x2638;" d="M1677 874q-30 56 -93 144q16 16 34 29q49 -112 59 -173zM1964 582q0 -26 -23.5 -43.5t-52.5 -17.5t-93 11t-85 11t-33 -3q-14 -222 -162 -391q5 -8 14 -17q53 -37 151 -120q24 -24 24 -52t-15 -43t-43 -15t-52 24q-37 53 -120 151q-9 9 -17 14q-169 -149 -391 -163 q-3 -13 -3 -33t11 -84t11 -93t-17.5 -52.5t-43.5 -23.5t-43.5 23.5t-17.5 52.5t11 93t11 84t-3 33q-222 14 -391 163q-25 -16 -69.5 -79t-68 -86.5t-51.5 -23.5t-43 15t-15 43t23.5 51.5t76.5 60.5q73 52 89 77q-148 169 -162 391q-12 3 -33 3t-85 -11t-93 -11t-52.5 17.5 t-23.5 43.5t23.5 43.5t52.5 17.5t93 -11t85 -11t33 3q14 222 162 391q-5 8 -14 17q-53 37 -151 120q-24 24 -24 52t15 43t43 15t52 -24q37 -53 120 -151q9 -9 17 -14q169 149 391 163q3 13 3 33t-11 84t-11 93t17.5 52.5t43.5 23.5t43.5 -23.5t17.5 -52.5t-11 -93t-11 -84 t3 -33q222 -14 391 -163q25 16 69.5 79t68 86.5t51.5 23.5t43 -15t15 -43t-23.5 -51.5t-76.5 -60.5q-73 -52 -89 -77q148 -169 162 -391q12 -3 33 -3t85 11t93 11t52.5 -17.5t23.5 -43.5zM1493 0q-73 -36 -186 -67q76 44 153 96q17 -12 33 -29zM370 810q-35 -63 -35 -135 q0 -9 1 -18q-25 7 -52 7q23 105 86 146zM393 252v22q20 -35 86 -123l-25 -28q-18 17 -39.5 61.5t-21.5 67.5zM1528 582q0 209 -147.5 357t-356.5 148t-356.5 -148t-147.5 -357t147.5 -357t356.5 -148t356.5 148t147.5 357zM1162 689q-31 0 -31 31t49 80q15 15 52 39 q57 37 64 56l-17 18l48 48q41 -33 76 -77l-48 -47l-18 17q-19 -7 -50 -54q-72 -111 -125 -111zM1078 996h-25q-4 -8 -4 -25.5t9.5 -59.5t9.5 -64q0 -103 -44 -103t-44 103q0 22 9.5 64t9.5 59.5t-4 25.5h-25v68q27 3 54 3t54 -3v-68zM1508 582q0 -27 -3 -54h-67v25 q-8 4 -25.5 4t-59.5 -9.5t-64 -9.5q-103 0 -103 44t103 44q22 0 64 -9.5t59.5 -9.5t25.5 4v25h67q3 -27 3 -54zM911 1050q-19 -14 -120 -106q-18 10 -39 32q86 68 159 74zM1178 582q0 -65 -45 -110t-109 -45t-109 45t-45 110t45 110t109 45t109 -45t45 -110zM1131 444 q0 31 28 31q34 0 83 -49q15 -15 39 -52q37 -57 56 -64l18 17l48 -47q-35 -44 -76 -77l-48 48l17 18q-7 19 -54 50q-111 72 -111 125zM917 720q0 -31 -31 -31t-80 49q-15 15 -39 52q-37 57 -56 64l-18 -17l-48 47q35 44 76 77l48 -48l-17 -18q7 -19 54 -50q111 -72 111 -125z M1312 192q-80 -53 -142 -71q37 30 101 100q20 -8 41 -29zM862 582q0 -44 -103 -44q-22 0 -64 9.5t-59.5 9.5t-25.5 -4v-25h-67q-3 27 -3 54t3 54h67v-25q8 -4 25.5 -4t59.5 9.5t64 9.5q103 0 103 -44zM1024 97q-27 0 -54 3v68h25q4 8 4 25.5t-9.5 59.5t-9.5 64q0 103 44 103 t44 -103q0 -22 -9.5 -64t-9.5 -59.5t4 -25.5h25v-68q-27 -3 -54 -3zM889 475q28 0 28 -31t-49 -80q-15 -15 -52 -39q-57 -37 -64 -56l17 -18l-48 -48q-41 33 -76 77l48 47l18 -17q19 7 49.5 54t45.5 62q49 49 83 49zM1118 582q0 40 -27.5 67.5t-66.5 27.5t-66.5 -27.5 t-27.5 -67.5t27.5 -67.5t66.5 -27.5t66.5 27.5t27.5 67.5zM1068 582q0 -45 -44 -45t-44 45t44 45t44 -45z" />
+<glyph unicode="&#x2639;" horiz-adv-x="1726" d="M1414.5 1292q226.5 -227 226.5 -551.5t-227 -551.5t-550.5 -227t-551 227.5t-227.5 551t227 551t551.5 227.5t551 -227zM1343.5 259.5q197.5 197.5 197.5 481t-197.5 481t-480 197.5t-480.5 -198.5t-198 -480.5t198 -480t480.5 -198t480 197.5zM1234 987q0 -52 -36 -87.5 t-87.5 -35.5t-87.5 36t-36 87t36 87t87.5 36t87.5 -35.5t36 -87.5zM740 987q0 -52 -36 -87.5t-87.5 -35.5t-87.5 36t-36 87t36 87t87.5 36t87.5 -35.5t36 -87.5zM863 574q-322 0 -395 -321h-62q22 201 140.5 322.5t316.5 121.5t316.5 -121.5t140.5 -322.5h-62 q-73 321 -395 321z" />
+<glyph unicode="&#x263a;" horiz-adv-x="1726" d="M1414.5 1292q226.5 -227 226.5 -551.5t-227 -551.5t-550.5 -227t-551 227.5t-227.5 551t227 551t551.5 227.5t551 -227zM1343.5 259.5q197.5 197.5 197.5 481t-197.5 481t-480 197.5t-480.5 -198.5t-198 -480.5t198 -480t480.5 -198t480 197.5zM1234 987q0 -52 -36 -87.5 t-87.5 -35.5t-87.5 36t-36 87t36 87t87.5 36t87.5 -35.5t36 -87.5zM740 987q0 -52 -36 -87.5t-87.5 -35.5t-87.5 36t-36 87t36 87t87.5 36t87.5 -35.5t36 -87.5zM863 253q-198 0 -316.5 121.5t-140.5 322.5h62q73 -321 395 -321t395 321h62q-22 -201 -140.5 -322.5 t-316.5 -121.5z" />
+<glyph unicode="&#x263b;" horiz-adv-x="1726" d="M1414.5 1292q226.5 -227 226.5 -551.5t-227 -551.5t-550.5 -227t-551 227.5t-227.5 551t227 551t551.5 227.5t551 -227zM1234 987q0 52 -36 87.5t-87.5 35.5t-87.5 -36t-36 -87t36 -87t87.5 -36t87.5 35.5t36 87.5zM740 987q0 52 -36 87.5t-87.5 35.5t-87.5 -36t-36 -87 t36 -87t87.5 -36t87.5 35.5t36 87.5zM863 376q-322 0 -395 321h-62q22 -201 140.5 -322.5t316.5 -121.5t316.5 121.5t140.5 322.5h-62q-73 -321 -395 -321z" />
+<glyph unicode="&#x263c;" horiz-adv-x="1542" d="M1536 666h-252q-24 -132 -98 -237l176 -176l-104 -105l-177 177q-113 -77 -236 -98v-252h-148v252q-123 21 -236 98l-177 -177l-105 105l177 176q-74 105 -98 237h-252v148h252q24 132 98 237l-177 176l105 105l177 -177q113 77 236 98v252h148v-252q123 -21 236 -98 l177 177l104 -105l-176 -176q74 -105 98 -237h252v-148zM1033 478q108 108 108 262.5t-107.5 262t-262.5 107.5t-262.5 -107.5t-107.5 -262t108 -262.5t262 -108t262 108z" />
+<glyph unicode="&#x263d;" horiz-adv-x="1526" d="M1186.5 1299.5q230.5 -230.5 230.5 -561t-231.5 -559.5t-564.5 -229q-267 0 -470 158q-28 22 -28 47q0 45 51 45q6 0 16 -2l243 -49q245 0 416.5 173t171.5 416.5t-170 418t-411 174.5l-250 -50q-10 -2 -16 -2q-51 0 -51 45q0 26 30 48q219 158 474 158 q329 0 559.5 -230.5zM1114.5 249.5q202.5 199.5 202.5 489t-201 490.5t-489 201q-49 0 -96 -6q254 -36 422 -231.5t168 -452t-168 -453t-421 -231.5q43 -6 89 -6q291 0 493.5 199.5z" />
+<glyph unicode="&#x263e;" horiz-adv-x="1526" d="M1417 156q0 -26 -30 -48q-219 -158 -474 -158q-329 0 -559.5 230.5t-230.5 561t231.5 559.5t564.5 229q267 0 470 -158q28 -22 28 -47q0 -45 -51 -45q-6 0 -16 2l-243 49q-245 0 -416.5 -173t-171.5 -416.5t170 -418t411 -174.5l250 50q10 2 16 2q51 0 51 -45zM587 287.5 q-168 195.5 -168 452t168 453t421 231.5q-43 6 -89 6q-291 0 -493.5 -199.5t-202.5 -489t201 -490.5t489 -201q49 0 96 6q-254 36 -422 231.5z" />
+<glyph unicode="&#x263f;" horiz-adv-x="1226" d="M1146 750q0 -205 -134.5 -355.5t-335.5 -173.5v-266h281v-125h-281v-270h-125v270h-281v125h281v265q-201 23 -336 173.5t-135 356.5q0 154 79 281.5t210 194.5q-183 114 -212 379h61q73 -321 395 -321t395 321h62q-29 -265 -213 -379q131 -67 210 -194.5t79 -281.5z M1021 750q0 171 -118.5 290t-289.5 119t-289.5 -119t-118.5 -290t118.5 -289.5t289.5 -118.5t289.5 118.5t118.5 289.5z" />
+<glyph unicode="&#x2640;" horiz-adv-x="1475" d="M1203 1400q192 -192 192 -457t-170 -450t-425 -213v-280h296v-125h-296v-285h-125v285h-296v125h296v280q-255 28 -425 213t-170 450t191.5 457t465.5 192t466 -192zM1270 934q0 222 -155.5 377.5t-377.5 155.5t-377 -155.5t-155 -377.5t155 -377t377 -155t377.5 155 t155.5 377z" />
+<glyph unicode="&#x2641;" horiz-adv-x="1475" d="M1225 689q170 -185 170 -450t-192 -457t-466 -192t-465.5 192t-191.5 457t170 450t425 213v280h-296v125h296v285h125v-285h296v-125h-296v-280q255 -28 425 -213zM1270 248q0 222 -155.5 377t-377.5 155t-377 -155t-155 -377t155 -377.5t377 -155.5t377.5 155.5 t155.5 377.5z" />
+<glyph unicode="&#x2642;" horiz-adv-x="1800" d="M1720 852h-125v426l-350 -349q150 -182 150 -420q0 -274 -192 -466t-466 -192t-465.5 192t-191.5 466t191.5 466t465.5 192q238 0 420 -150l349 349h-426v126h576l64 -64v-576zM1270 509q0 222 -155.5 377.5t-377.5 155.5t-377 -155.5t-155 -377.5t155 -377.5t377 -155.5 t377.5 155.5t155.5 377.5z" />
+<glyph unicode="&#x2643;" horiz-adv-x="1620" d="M1500 -200h-125v383h-1180v125h363q147 0 254.5 121t107.5 280.5t-97.5 265.5t-264 106t-265 -90t-98.5 -253v-63h-125v62q0 215 135 342t353.5 127t352.5 -142.5t134 -368t-177 -387.5h507v1184h125v-1692z" />
+<glyph unicode="&#x2644;" horiz-adv-x="1216" d="M813 910q157 0 255 -91.5t98 -237.5t-111 -373.5t-111 -337.5q0 -44 55 -55q16 -3 90 -3v-125h-62q-87 0 -147.5 49t-60.5 134q0 134 111 361.5t111 339.5q0 214 -222.5 214t-450.5 -289v-696h-125v1350h-193v125h193v217h125v-217h351v-125h-351v-465q223 225 445 225z " />
+<glyph unicode="&#x2645;" horiz-adv-x="1517" d="M1467 381h-369l-62 63v986l62 62h369v-125h-306v-861h306v-125zM954.5 151q52.5 -67 52.5 -160t-73 -167t-175 -74t-175 74t-73 167t52 160.5t133 88.5v712h-165v125h165v415h125v-415h166v-125h-166v-712q81 -22 133.5 -89zM50 381v125h307v861h-307v125h369l63 -62 v-986l-63 -63h-369zM882 0q0 50 -36.5 86.5t-86.5 36.5t-86.5 -36.5t-36.5 -86.5t36.5 -87.5t86.5 -37.5t86.5 37.5t36.5 87.5z" />
+<glyph unicode="&#x2646;" horiz-adv-x="1943" d="M1034 180h200v-125h-200v-255h-125v255h-200v125h200v226q-337 37 -487 229q-135 173 -154 522l-131 -126l-87 90l233 224h87l233 -224l-87 -90l-123 118q15 -292 125 -432.5t391 -182.5v766l-127 -122l-87 90l233 224h87l233 -224l-87 -90l-127 122v-768q276 33 396 190 q105 139 120 427l-123 -118l-87 90l233 224h87l233 -224l-87 -90l-131 126q-19 -353 -153 -520q-146 -182 -488 -229v-228z" />
+<glyph unicode="&#x2647;" horiz-adv-x="1045" d="M995 -200h-832l-63 63v1567l63 62h196q261 0 440 -157.5t179 -415t-179 -416t-440 -158.5h-134v-420h770v-125zM853 920q0 205 -142.5 326t-351.5 121h-134v-897h134q209 0 351.5 122.5t142.5 327.5z" />
+<glyph unicode="&#x2648;" horiz-adv-x="2369" d="M1839 1518q164 0 260.5 -120t96.5 -290t-107 -368h-151q110 196 110 360q0 115 -46 195q-56 99 -162 99q-200 0 -373 -445q-95 -245 -151.5 -602.5t-56.5 -648.5v-93h-148v99q0 276 -54 620t-142 580q-179 478 -386 478q-105 0 -161 -97q-47 -80 -47 -193 q0 -170 110 -352h-150q-108 196 -108 365.5t97 291t261 121.5q311 0 490 -489q117 -322 151 -741h25q28 411 151 742q180 488 491 488z" />
+<glyph unicode="&#x2649;" horiz-adv-x="2159" d="M1986 1369h-26q-138 0 -247 -195l-59 -106q-67 -120 -127.5 -185t-166.5 -107q355 -196 355 -565q0 -257 -188.5 -443.5t-446 -186.5t-447 186.5t-189.5 443.5q0 181 95 327.5t260 237.5q-106 42 -166.5 107t-127.5 185l-59 106q-109 195 -246 195h-27v111h73 q196 0 353 -274l81 -141q77 -133 165.5 -192t234.5 -59t234.5 59t165.5 192l81 141q157 274 352 274h73v-111zM1424 -131.5q143 139.5 143 341t-142 341.5t-345 140t-345.5 -140t-142.5 -342t143.5 -341t344.5 -139t344 139.5z" />
+<glyph unicode="&#x264a;" horiz-adv-x="1975" d="M987 0q-437 0 -814 -99v123q206 55 382 76v1275q-190 18 -382 73v124q332 -92 814.5 -92t814.5 92v-124q-192 -55 -383 -73v-1275q176 -21 383 -76v-123q-378 99 -815 99zM987 1357q-170 0 -284 8v-1256q127 14 284 14t284 -14v1256q-114 -8 -284 -8z" />
+<glyph unicode="&#x264b;" horiz-adv-x="2234" d="M1162 1333q-284 0 -463 -75q227 -113 227 -351q0 -157 -111 -267t-267.5 -110t-265.5 109.5t-109 265.5q0 302 403 459q299 117 674 117t811 -200v-161q-465 213 -899 213zM2061 575q0 -301 -403 -459q-299 -116 -673.5 -116t-811.5 199v161q465 -212 899 -212 q284 0 462 74q-226 116 -226 351q0 156 111.5 266.5t267.5 110.5t265 -109.5t109 -265.5zM1882 375.5q80 79.5 80 195.5t-79.5 198t-196.5 82t-198 -81t-81 -196.5t83 -196.5t197.5 -81t194.5 79.5zM746 710q81 81 81 197t-83 196.5t-198.5 80.5t-194.5 -79t-79 -195 t80 -198.5t196.5 -82.5t197.5 81z" />
+<glyph unicode="&#x264c;" horiz-adv-x="1928" d="M1423 -419q-136 0 -230.5 90.5t-94.5 226.5q0 178 188 578l96 204q111 236 111 384q0 186 -107.5 301t-283.5 115t-281 -100.5t-105 -260t98 -363.5l39 -81q97 -201 97 -296q0 -156 -115.5 -267.5t-275.5 -111.5t-273 114t-113 274.5t111 274.5t268 114q56 0 124 -21 q-108 207 -108 366q0 216 153 349t386 133t383.5 -143.5t150.5 -388.5q0 -132 -41 -254q-21 -64 -102 -240l-69 -150q-184 -400 -184 -515q0 -83 50.5 -140t132.5 -57q105 0 240 119l87 -95q-173 -159 -332 -159zM749 192q78 81 78 197t-78 196.5t-193.5 80.5t-193.5 -81 t-78 -196.5t78 -196.5t193.5 -81t193.5 81z" />
+<glyph unicode="&#x264d;" horiz-adv-x="1912" d="M1739 652q0 -428 -378 -752q18 -130 153 -295h-174q-63 80 -112 212q-139 -79 -340 -111v127q190 39 311 111q-15 96 -15 193v900q0 220 -64 332q-157 -169 -232 -476v-893h-149v987q0 275 -65 382q-153 -178 -231 -441v-928h-148v1075q0 223 -122 405h156 q83 -114 114 -293q75 185 174 293l145 27q100 -128 126 -340q51 160 181 313l143 27q120 -167 120 -369v-282q60 170 127 266l122 45q158 -245 158 -515zM1591 644q0 178 -78 345q-110 -136 -181 -363v-587q259 263 259 605z" />
+<glyph unicode="&#x264e;" horiz-adv-x="1937" d="M1764 592h-629v138q161 104 161 279q0 134 -96.5 228.5t-230.5 94.5t-230.5 -94.5t-96.5 -228.5q0 -175 160 -279v-138h-629v148h441q-120 123 -120 276q0 193 141 328.5t334.5 135.5t334 -135.5t140.5 -328.5q0 -153 -120 -276h440v-148zM1764 148h-1591v148h1591v-148z " />
+<glyph unicode="&#x264f;" horiz-adv-x="2099" d="M1692 -271h-136q-204 0 -292 115q-78 101 -78 313v892q0 225 -65 323q-166 -191 -231 -478v-894h-148v996q0 269 -65 376q-159 -179 -231 -445v-927h-148v1056q0 264 -125 424h159q84 -128 114 -291q70 174 174 291l143 29q100 -117 127 -336q55 157 179 307l146 29 q119 -162 119 -383v-921q0 -122 3 -150q10 -91 52 -136q63 -67 212 -67h91v148l234 -211l-234 -204v144z" />
+<glyph unicode="&#x2650;" horiz-adv-x="1902" d="M1729 686l-146 -23l-75 531l-667 -668l314 -314l-105 -104l-314 314l-461 -459l-102 102l461 459l-314 314l104 105l314 -314l668 667l-531 75l23 146l729 -102z" />
+<glyph unicode="&#x2651;" horiz-adv-x="2246" d="M1967 638q106 -103 106 -258t-106.5 -267.5t-264.5 -112.5q-211 0 -369 164q-100 -261 -159 -333q-106 -127 -324 -127h-134v123h63q152 0 231 58.5t129 175.5q4 10 84 246q-54 95 -76 194q-7 36 -30 210l-37 283q-36 279 -86 385q-129 -152 -220 -405.5t-91 -455.5v-80 h-147v52q0 133 -47 395t-97 357q-61 116 -191 116h-28v122h111q155 0 215 -122q71 -145 129 -487q84 376 280 609l195 38q71 -158 120 -489l27 -181q11 -75 24 -187t39 -193q143 273 395 273q153 0 259 -103zM1877.5 189q72.5 78 72.5 187t-69.5 181t-172.5 72 q-218 0 -342 -340q161 -178 325 -178q114 0 186.5 78z" />
+<glyph unicode="&#x2652;" horiz-adv-x="2182" d="M2009 939l-115 -51l-119 284l-433 -284l-120 284l-428 -284l-120 284l-432 -284l-68 102l555 367l122 -284l430 284l120 -284l430 284zM2008 174l-115 -51l-119 284l-432 -284l-120 284l-428 -284l-121 284l-432 -284l-68 102l555 367l122 -284l430 284l120 -284l430 284 z" />
+<glyph unicode="&#x2653;" horiz-adv-x="1598" d="M952 716h-306q0 -193 -87.5 -394.5t-224.5 -358.5h-161q326 344 326 753h-315v111h315q-20 355 -326 690h153q280 -300 320 -690h306q40 390 320 690h153q-306 -335 -326 -690h315v-111h-315q0 -409 326 -753h-161q-136 155 -224 358.5t-88 394.5z" />
+<glyph unicode="&#x2654;" horiz-adv-x="1903" d="M936 1521l99 -2q48 0 82.5 -29.5t34.5 -76.5v-193l147 44q88 25 150 25q165 0 283 -130q91 -101 91 -279.5t-149 -445.5q-27 -48 -27 -99.5t-80 -167.5q26 -40 26 -103q0 -89 -70 -118q27 -35 27 -88q0 -204 -605.5 -204t-605.5 213q0 45 25 79q-69 35 -69 111t34 119 q-31 56 -69 157q0 13 -3 36t-25 51.5t-60 106.5q-92 190 -92 362t101.5 286t272.5 114q126 0 290 -62v116q0 69 1 80q6 70 93 91q30 7 98 7zM1080 1246v156l-95 -78zM1054 1441q0 14 -27 14h-167q-16 0 -16 -14q0 -1 105 -89q105 88 105 89zM1751 890q0 143 -83.5 235.5 t-225.5 92.5q-45 0 -145.5 -21.5t-125.5 -42.5q25 -52 34 -111q97 115 226 115q104 0 169 -79.5t65 -185.5q0 -178 -151 -469q21 -24 61 -35q8 35 32 77q144 245 144 424zM1531 647q62 160 62 240t-48.5 139t-124.5 59q-142 0 -224 -187q-20 -45 -44 -94q7 -9 17 -9 q50 70 117 70q31 0 66.5 -23t49 -46.5t24.5 -62.5q65 -2 105 -86zM911 1325l-94 76l8 -146zM1080.5 875q54.5 55 54.5 135.5t-57.5 139t-132.5 58.5t-137 -59t-62 -135.5t57.5 -135t140 -58.5t137 55zM1477 540q0 130 -52 130q-23 0 -44 -34l-26 -54q-2 212 -69 212 q-10 0 -30 -17q-38 -34 -45 -96t-7 -63q-12 105 -44 105q-23 0 -34 -26q-16 -92 -35 -141q187 -15 360 -96q26 35 26 80zM1070 783q-50 -35 -124.5 -35t-119.5 26q43 -107 60 -218h133zM1541 63q0 95 -63 95q-52 0 -52 -65q0 -84 62 -84q53 0 53 54zM1362 159q0 50 -23.5 67 t-83 36t-85.5 19q-35 0 -35 -46.5t12 -62.5t70 -42.5t78 -26.5q67 0 67 56zM476 1085q-74 0 -127 -60.5t-53 -139.5t70 -239q49 88 95 88q5 0 10 -1q39 132 139 132q73 0 117 -70q8 0 17 8q-7 27 -44 97q-97 185 -224 185zM986 488q-360 0 -628 -206q18 -22 25 -51 q241 157 548 157h73q284 0 510 -167q32 31 51 96q-285 171 -579 171zM815 555q0 18 -17 72t-30 75t-31.5 21t-28.5 -37l-16 -68q1 45 1 47q0 41 -28 85t-67 44q-3 0 -11 -4q-53 -28 -53 -152q0 -9 4 -27.5t4 -28.5q-20 55 -22 57q-17 31 -48 31q-53 0 -53 -141l44 -96 q163 77 352 114v8zM454 1218q-140 0 -220.5 -99t-80.5 -241.5t105 -349.5l47 -88q24 -46 26 -86q33 17 68 43q-175 355 -175 491t113 222q62 47 114 47q129 0 232 -105q6 32 35 103q-156 63 -264 63zM851 226q0 -59 110.5 -59t110.5 75t-97.5 75t-115.5 -58q-5 -16 -8 -33z M1445 -152q24 0 24 38t-64.5 82t-121.5 66q-162 61 -369 61q-107 0 -255.5 -46.5t-206.5 -113.5q-25 -29 -25 -49q0 -39 48 -39q8 0 32 22q50 46 182 75t224 29h113q69 0 196 -33t166 -70q24 -23 30 -23t16 3q9 -2 11 -2zM764 252q0 29 -32 29q-40 0 -172 -53 q-26 -15 -26 -60.5t15.5 -55t48.5 -9.5t81 22.5t66.5 44t18.5 82.5zM1319 -205q0 29 -98.5 68t-256 39t-214.5 -12.5t-115 -39.5t-58 -55q0 -38 97 -57q65 -12 135 -12h279q70 0 135 12q96 19 96 57zM410 9q61 0 61 74.5t-52 74.5q-62 0 -62 -84q0 -65 53 -65zM966 899 q-45 0 -45 24t47 43.5t58 44.5q1 3 6.5 43t19.5 40q6 0 22 -7l-1 -3q11 -22 11 -42l-8 -57q-25 -86 -110 -86z" />
+<glyph unicode="&#x2655;" horiz-adv-x="1993" d="M370 893l-8 -59q0 -24 54 -66l76 -54q35 -28 44 -28q18 0 18 20t-13 77l-75 332q-71 39 -71 129t95 130q33 14 46.5 14t44.5 -8q105 -27 105 -127q0 -49 -25 -94l91 -260q34 -99 66 -99q22 0 25 23v40l2 21q1 8 25 396q-36 55 -36 108t44 97t109.5 44t106.5 -47.5 t41 -118.5q0 -38 -36 -80v-5v1q1 0 11 -168q1 -91 19 -272q7 -39 23 -39q29 0 47 49l109 310q-34 46 -34 97t47.5 91.5t104 40.5t102 -42.5t45.5 -98.5q0 -89 -79 -132l-61 -286q0 -2 -13.5 -48t-13.5 -70.5t17 -24.5t53 26l73 53q41 32 58 70q-18 43 -18 83 q0 66 49.5 106.5t116.5 40.5t112.5 -38t45.5 -105t-38 -101q-15 -14 -71.5 -40.5t-72.5 -60.5q-100 -217 -106 -287q35 -95 35 -145.5t-43 -101.5v-53q50 -45 50 -130t-39 -119q-16 -7 -46 -24q-5 -12 -16 -35q-94 -192 -591.5 -192t-587.5 227q-88 27 -88 146q0 84 53 128 v51q-43 44 -43 112q0 25 17 68t17 68.5t-41 122.5l-76 175q-10 24 -56 41q-90 32 -90 137q0 59 44.5 102.5t104.5 43.5q87 0 129 -82q12 -23 12 -80zM1480.5 1182.5q30.5 22.5 30.5 58.5t-25 65t-61.5 29t-63 -26.5t-26.5 -60t23.5 -61t57.5 -27.5t64.5 22.5zM1072 1379 q0 34 -26.5 61t-59 27t-61.5 -24.5t-29 -60t24.5 -63t61 -27.5t63.5 26.5t27 60.5zM634 1240q0 95 -104 95q-31 0 -55.5 -28t-24.5 -64t29 -60.5t64.5 -24.5t63 26t27.5 56zM1652 906l9 -42q0 -27 -3 -45q-8 -46 -94.5 -117t-133.5 -71q-27 0 -52.5 15.5t-25.5 46t39 239.5 l31 166q-36 0 -68 17l-60 -177q-47 -135 -66 -159q-33 -41 -77 -41q-78 0 -89 121l-25 388q-24 -18 -55 -18t-59 18l-17 -405q-4 -104 -88 -104q-71 0 -115 113q-3 8 -88 263q-27 -14 -78 -16l53 -263q26 -120 26 -133q0 -45 -22.5 -58t-70 -13t-136 84t-88.5 129 q0 8 8.5 28.5t8.5 44t-26 49.5t-61.5 26t-61 -27.5t-25.5 -64.5t63.5 -78.5t81 -70t69.5 -152.5t52 -153.5t-18.5 -85t-19.5 -60.5l10 -43q286 263 600.5 263t609.5 -263q8 20 8 41.5t-17.5 65.5t-17.5 68q0 46 113 311q16 36 56 61l76 47q38 30 38 68.5t-28 60.5t-64 22 q-102 0 -102 -96zM1562 -79q45 0 45 84.5t-42 84.5q-45 0 -45 -84.5t42 -84.5zM1018 457h-6v-50q0 3 60.5 -69.5t78.5 -90.5l89 -28q101 -36 235 -128q34 52 78 60v52q-197 177 -416 233q-83 21 -119 21zM1153 184q-3 0 -141 -131v-104q180 -11 255 -28q176 -40 174 -138 q56 35 77 87q-61 35 -60 157q-129 100 -241 138q-56 19 -64 19zM1097 221l-112 122l-113 -123l113 -112zM948 457h-13q-27 0 -99 -17q-199 -47 -421 -238v-51q53 -4 70 -60q153 105 332 156q32 27 66 72l65 86v52zM1388 -211q0 11 -46 38.5t-144.5 47.5t-168.5 20h-96 q-74 0 -197.5 -24.5t-145.5 -62.5q-1 -4 -5 -11.5t-4 -8.5q0 -53 150 -78q98 -17 204 -17h171q84 0 165 18q117 27 117 78zM948 -51v104l-132 131q-152 -40 -314 -157v-11q0 -115 -60 -146q21 -50 77 -87q3 94 177 138q114 28 252 28zM404 -79q45 0 45 84.5t-42 84.5 q-45 0 -45 -84.5t42 -84.5z" />
+<glyph unicode="&#x2656;" horiz-adv-x="1698" d="M1618 -342h-1538v280l154 173v106l186 211v488l-208 141v430h293v-199h207v199h274v-199h207v199h294v-430l-209 -141v-488l185 -210v-106l155 -174v-280zM1422 1103v319h-164v-199h-337v199h-144v-199h-337v199h-163v-319h1145zM1339 1036h-981l120 -81h741zM1213 462 v429h-728v-429h728zM1371 224l-155 176h-734l-155 -176h1044zM1398 160h-1099v-74l-136 -153h1372l-137 154v73zM1553 -277v146h-1408v-146h1408z" />
+<glyph unicode="&#x2657;" horiz-adv-x="2156" d="M2076 -381h-265q-2 41 -65 41q-21 0 -152.5 -17t-211 -17t-163.5 40q-99 46 -129 132q-8 22 -12 38q-4 -16 -12 -38q-30 -86 -129 -132q-84 -40 -163.5 -40t-211 17t-152.5 17q-63 0 -65 -41h-265v61q0 82 77 149q105 91 308 91q45 0 133 -12.5t145 -12.5t87.5 18 t71.5 77q-75 15 -125 31t-82 49v304q-165 119 -165 297q0 128 95 237q20 22 141 126l249 212q-101 49 -101 154q0 70 47 117t117 47t117 -47t47 -117q0 -105 -101 -154l194 -164q176 -152 196 -174q95 -109 95 -237q0 -178 -165 -297v-304q-48 -49 -207 -80q41 -59 71.5 -77 t87.5 -18t145 12.5t133 12.5q203 0 308 -91q77 -67 77 -149v-61zM1142 1337q28 27 28 63.5t-27.5 63t-64.5 26.5t-64.5 -26.5t-27.5 -63t28 -63.5t64 -27t64 27zM1513.5 517q45.5 70 45.5 161t-76.5 174t-188.5 180l-216 187l-205 -177q-123 -107 -199.5 -190t-76.5 -174 t45.5 -161t120.5 -100q191 53 315 53t315 -53q75 30 120.5 100zM1703 -148q-47 0 -139 -13t-139 -13q-87 0 -137.5 37t-103.5 121h-70v-30q0 -36 15 -85q53 -174 277 -174q46 0 188.5 16.5t150.5 16.5q64 0 106 -42h156q-39 166 -304 166zM1121 401h-86q-120 0 -272 -52v-48 l58 -39l-58 -65v-61q107 37 233 37h164q126 0 233 -37v61l-58 65l58 39v48q-152 52 -272 52zM1162 106h-168q-91 0 -192 -24q93 -38 208 -38h136q128 0 209 38q-100 24 -193 24zM1042 -46v30h-70q-53 -84 -103.5 -121t-137.5 -37q-47 0 -139 13t-139 13q-265 0 -304 -166 h156q42 42 106 42q8 0 150.5 -16.5t188.5 -16.5q224 0 277 174q15 49 15 85zM1255 725h-143v-144h-70v144h-144v69h144v143h70v-143h143v-69zM1175 290l-97 -61l-97 61l97 65z" />
+<glyph unicode="&#x2658;" horiz-adv-x="1958" d="M1864 652l14 -115q0 -63 -19.5 -186.5t-19.5 -200t35 -182.5q-65 -116 -290 -182q-165 -49 -439 -75l-373 -30q-127 -14 -307 -75l-18 23q0 13 29 156q8 71 35 211q10 37 66 159l38 93q18 40 63 90l92 103q69 81 69 109t-22 48q-44 -13 -76 -31q-23 -4 -51 -4l-141 8 q-29 0 -39 -16l-56 -41q-34 -25 -62.5 -25t-70.5 28.5t-59.5 28.5t-30.5 10.5t-13 22.5q0 67 119 67q22 0 22 14q0 36 -41 36t-87.5 -33.5t-51.5 -33.5q-29 0 -42 25q-50 32 -50 62t21 48q-28 31 -28 59.5t93 77t155 71.5l186 60q98 32 163 70q49 37 153 104q48 15 143 49 q34 20 107 49q2 99 87 147q47 26 167.5 51t152.5 54q155 -100 222 -298q7 -22 24 -65q131 -290 131 -541zM930.5 1108.5q10.5 7.5 10.5 13t-10.5 13t-17.5 7.5t-18 -10.5t-11 -20.5t18 -10t28.5 7.5zM1818 537v6q-55 18 -127 24l2 30q68 -5 121 -21q-3 16 -8 48 q-74 14 -134 18l2 30q58 -3 130 -17q0 15 -2 48q-51 15 -83 15t-52 -2l-2 30q23 2 54 2t81 -13q-2 18 -5 41q-41 10 -101 10q-18 0 -38 -1l-2 30q39 2 67 2t69 -9q-3 16 -9 44q-35 10 -59.5 10t-84.5 -7l-4 30q61 7 85 7t55 -7l-3 14q-29 5 -84 5v30h26q26 0 49 -3 q-4 14 -13 41q-11 1 -19 1q-49 0 -110 -33l-14 26q67 37 124 37h9l-9 28q-26 5 -48.5 5t-96.5 -20l-7 29q78 21 101 21t39 -2l-7 20q-13 -3 -34 -10l-9 29l33 9l-10 25q-55 -6 -129 -44l-13 27q74 38 132 46l-20 54q-62 -15 -135 -64l-17 25q73 49 142 67q-24 63 -61 120 q-90 -108 -177 -143q-15 -34 -61 -67.5t-82.5 -33.5t-90.5 22l23 56q43 -18 64.5 -18t55 25.5t37.5 42.5l20 25q40 13 76 41l-145 -30q-74 -20 -137 -66l-36 48q88 65 225.5 90t192.5 56q-13 16 -28 31q-56 -48 -136 -50l-1 30q67 0 115 40q-6 5 -17 15 q-34 -16 -137.5 -37.5t-144.5 -46.5q-65 -38 -65 -114l-32 -36q-12 -2 -101 -44q27 -26 51 -66l-26 -16q-27 47 -56 70q-18 -6 -36 -11q62 -19 62 -82q-14 -3 -41.5 -21.5t-46.5 -18.5t-49 16.5t-48 14.5l20 29q4 9 11 28q-46 -34 -141 -97q-67 -39 -167 -72l-192 -62 q-44 -16 -81 -32q22 -5 22 -33.5t-40.5 -46.5t-79.5 -20l-8 -56l-14 -6q5 -7 29 -27q86 61 140 61q21 0 41 -9q27 32 60.5 32t65.5 -20.5t32 -44.5q0 -41 -33 -68q-32 -27 -72 -27h-3q-25 -35 -68 -35q-6 0 -13 1q58 -36 65 -36q19 0 77 51q34 30 80 31q30 30 45 41 q49 37 146 43t134 19l10 -28q-28 -10 -135.5 -19.5t-156.5 -56.5l99 -7q32 0 67 16t53.5 16t62 -13.5t82.5 -13.5t120.5 40.5t105.5 81.5q43 73 43 159q0 30 -4 71l60 6q4 -41 4 -77q0 -103 -51 -189q-32 -55 -127 -103.5t-162 -48.5q-25 0 -47 4q2 -12 2 -18 q0 -62 -104 -175.5t-119 -140.5l-45 -108q-24 -49 -62 -150q-9 -69 -33 -207q-8 -29 -22 -88q143 44 252 56l524 48q373 50 491 159q-44 13 -78 29l13 27q41 -20 88 -32l4 5q-6 20 -9 34q-58 12 -105 15l2 30q43 -2 96 -13q-4 18 -7 42q-58 9 -102 12l2 30q41 -3 96 -11 q-2 18 -2 29q-45 11 -99 13l1 29q57 -2 98 -11q1 31 3 57q-52 -13 -99 -32l-12 28q49 21 115 36l3 24h-9q-41 0 -95 -15l-8 28q61 17 102 17q-9 0 14 -1l5 28q-46 19 -103 24l2 30q59 -5 106 -23l3 23q-36 20 -108 21v30q73 -1 112 -20q2 13 5 40q-32 15 -56 15t-54 -4 l-4 30q30 4 55.5 4t60.5 -14q1 19 1 35zM454 711q-13 8 -26 8t-41 -34q38 -6 25 -6q36 0 42 32zM216 855l-3 3q-16 -7 -47 -23q50 6 50 20zM1574 748q0 -149 -63 -243q-32 -48 -137.5 -138.5t-152.5 -174.5l-27 14q46 82 150.5 173t136.5 137q63 92 63 232q0 68 -42 146 l27 15q45 -83 45 -161zM1112 842q-32 -3 -55.5 -3t-63.5 12l8 29q36 -11 56 -11t52 3zM1625 297q-27 3 -53 3t-74 -11l-7 29q53 12 82 12t56 -3zM1625 216q-77 -5 -139 -23l-9 29q63 19 146 24zM973 960q-106 -40 -322 -105l-7 30q63 14 174 53.5t146 50.5zM1610 113h-12 q-58 0 -125 -16l-7 29q71 17 131 17h13v-30zM1188 560q-176 -67 -216.5 -67t-74.5 20l16 26q26 -16 48 -16q47 0 217 65zM1155 495q-113 -59 -168.5 -59t-101.5 23l13 27q38 -20 88 -20t155 55zM604 734l-30 -4q-5 30 -20 68l28 11q17 -42 22 -75zM1447 -4q-95 14 -175.5 14 t-166.5 -29l-10 28q90 31 175.5 31t180.5 -14zM569 695l-30 -1q-2 49 -52 81l17 25q63 -40 65 -105zM477 875q-113 -52 -182 -115l-20 23q69 64 189 119zM1436 -102q-48 7 -85 7t-118 -17.5t-112 -20.5l-3 29q33 3 114.5 21t120 18t87.5 -7z" />
+<glyph unicode="&#x2659;" horiz-adv-x="1588" d="M1508 -374h-1428v101q0 112 59 199t163 124q37 9 84 25q9 7 58 90q162 273 192 475q7 47 7 147h-278v64q0 71 72.5 131t154.5 89q-72 83 -72 195.5t80 192t194 79.5t194 -79.5t80 -191t-73 -195.5l64 -29q164 -85 164 -200v-56h-278v-84q0 -10 8 -65q35 -237 249 -563 q258 -51 297 -273q9 -51 9 -64v-112zM1150 854v5q0 6 -10 28q-38 83 -239 161q99 101 99 217q0 86 -60 146.5t-146 60.5t-146 -60.5t-60 -146.5q0 -113 98 -217q-113 -48 -151 -72q-92 -57 -97 -122h712zM1440 -309v30q0 -5 -2 17q-11 119 -65.5 181.5t-170.5 94.5 q-23 5 -50 13q-9 7 -51 77q-223 375 -223 678v5h-169v-5q0 -326 -255 -730q-6 -11 -17 -25l-96 -28q-194 -73 -194 -308h1293z" />
+<glyph unicode="&#x265a;" horiz-adv-x="1979" d="M1518 1280q177 0 279 -124.5t102 -298t-115 -314.5l-61 -69q-43 -51 -43 -74l27 -26q20 -24 20 -65q0 -82 -74 -92q-3 -27 -7.5 -40t-19.5 -24q26 -42 26 -97t-53 -93v-36q26 -28 26 -78q0 -110 -227 -162q-148 -33 -361 -33t-322 11q-262 26 -339 115q-24 28 -24 74.5 t29 73.5v35q-54 29 -54 104q0 45 26 87q-18 24 -25 61l-2 2q-76 11 -76 79.5t49 102.5q-5 26 -37 65l-60 73q-122 161 -122 328t104 291t279 124q145 0 317 -90v331h419v-331q184 90 319 90zM1680 1129q0 69 -62 69q-56 0 -56 -52q0 -58 49 -58h29q40 0 40 41zM1717 943 q0 -54 58 -54t58 54t-58 54t-58 -54zM1435 1128q0 70 -62 70q-56 0 -56 -51q0 -59 50 -59h28q40 0 40 40zM1670 653q0 -54 55 -54t55 58t-50 58q-60 0 -60 -62zM1125 1407l-63 61l-73 -80l-73 80l-62 -61l73 -82l-63 -73l63 -62l63 71l63 -71l62 62l-62 74zM1651 817 q0 94 -49.5 169t-138.5 75q-1 0 -35 -5q-130 -19 -209 -181q-65 -135 -65 -284q235 -72 380 -82q117 162 117 308zM1107 871q54 49 54 115t-51 120.5t-114 54.5q-41 0 -90.5 -30.5t-68.5 -64.5t-19 -78q0 -67 52.5 -119t113.5 -52t97 28q8 9 26 26zM1572 377q0 50 -55.5 50 t-55.5 -54.5t55.5 -54.5t55.5 59zM664 1129q0 69 -62 69q-56 0 -56 -51q0 -59 49 -59h28q41 0 41 41zM1336 465q0 42 -59.5 42t-59.5 -57q0 -51 56 -51q63 0 63 66zM1045 669q0 48 -48 48q-61 0 -61 -54.5t54.5 -54.5t54.5 61zM1617 49q0 27 -28.5 47.5t-55.5 20.5 t-53 -28.5t-26 -56.5t26 -52.5t58 -24.5q47 0 78 51q1 8 1 25l-2 4q2 6 2 14zM417 1143q0 55 -58.5 55t-58.5 -55t41 -55h28q48 0 48 55zM936 499q0 -55 54.5 -55t54.5 55t-51 55q-58 0 -58 -55zM826 607q0 81 -38.5 197t-88.5 172q-76 85 -174.5 85t-150.5 -80 q-46 -69 -46 -164q0 -146 118 -309q153 13 380 83v16zM1571 208q0 29 -30 46q-240 135 -594 135q-100 0 -234 -34t-226 -82l-49 -24q-28 -18 -28 -43q0 -42 42 -42q8 0 82.5 32.5t80.5 34.5q168 61 379.5 61t428.5 -90q91 -38 103 -38q45 0 45 44zM1135 164q0 46 -47 72 t-98.5 26t-98 -27t-46.5 -77q0 -18 24 -46q40 -48 96 -48t68 3q102 25 102 97zM712 389q43 0 43 59t-55 59t-55 -54q0 -64 67 -64zM209 880q46 0 46 58.5t-54.5 58.5t-54.5 -54q0 -63 63 -63zM309 667q-2 48 -50.5 48t-67.5 -62q16 -54 68.5 -54t50.5 41zM1497 -147 q0 45 -99 93q-68 32 -163.5 57t-273.5 25q-239 0 -436 -119q-42 -25 -42 -50q0 -58 44 -58q11 0 24 4q8 5 23 16q166 116 430 116q112 0 199 -26t163.5 -68t87.5 -42q43 0 43 52zM468 427q-58 0 -58 -54.5t54 -54.5t54 54.5t-50 54.5zM503.5 -16.5q24.5 28.5 24.5 55.5 t-31.5 52.5t-59.5 25.5t-50 -24.5t-22 -55.5t27 -56.5t57 -25.5t54.5 28.5zM1575 790q0 -108 -86 -210l-74 54q39 52 39 143q0 29 -25 29q-28 0 -54.5 -75.5t-39.5 -78.5q-26 -29 -78 -29l-32 3q18 32 27.5 88.5t15.5 74.5q46 137 176.5 137t130.5 -136zM952 868 q-23 0 -54 28.5t-34 45.5t-3 40q0 54 46 89l2 -1q47 -115 155 -145q-50 -57 -112 -57zM731 623q-86 0 -112 80q-34 103 -62 103q-21 0 -21 -49t28 -124l-73 -53q-85 105 -85 209q0 137 118 137q123 0 172 -99l67 -201q-30 -3 -32 -3z" />
+<glyph unicode="&#x265b;" horiz-adv-x="1993" d="M1870 1007.5q43 -42.5 43 -96t-35 -98.5t-81 -45t-67 10q-105 -182 -105 -375q0 -32 27 -67.5t27 -67t-27 -57.5t-27 -51.5t27 -72.5t27 -75.5t-35 -77.5l-63 -89q-9 -52 -28 -85q-75 -128 -428 -128q-442 0 -581 47q-37 13 -70 38q-56 43 -68 108q0 8 -4 22 q-94 104 -94 157q0 30 31 82.5t31 86.5q0 7 -25 41t-29 51q7 41 25 70.5t18 58.5q0 201 -105 384q-14 -10 -58.5 -10t-80 46.5t-35.5 98.5t45.5 94.5t98 42.5t90.5 -39t38 -94.5t-18 -84.5q148 -218 217 -218q44 0 44 76q0 185 -88 411q-130 11 -130 131q0 141 132 141 q141 0 141 -159q0 -48 -37 -78q33 -104 84 -220q77 -172 121 -172q60 0 85 218q15 128 15 274v14q-72 35 -72 123q0 69 44 112.5t108.5 43.5t106 -45t41.5 -105q0 -87 -72 -129q2 -151 10 -249.5t32.5 -182t49.5 -83.5h10q39 0 109 159t94 243q-42 32 -42 94t39.5 102 t100 40t100.5 -32t40 -90q0 -140 -131 -150l-1 -1q-86 -249 -86 -389q0 -97 44 -97q81 0 216 217q-27 32 -27 83t42.5 93.5t97.5 42.5t98 -42.5zM1493 1302q0 52 -51 52q-46 0 -46 -44q0 -52 53 -52q44 0 44 44zM1811 956q0 -4 -4 24q-5 36 -50.5 36t-45.5 -42q0 -55 54 -55 q46 0 46 37zM1091 1450q0 52 -55 52q-41 0 -41 -43q0 -53 53 -53q43 0 43 44zM587 1281q0 64 -44 64q-51 0 -51 -51q0 -45 39 -45h26q30 0 30 32zM1623 4l-87 94l-86 -95l87 -94zM1590 211q0 12 -6 22q-45 77 -155 159q-190 142 -472 142q-8 0 -65 -7q-281 -34 -461 -267 q-28 -36 -28 -49q0 -42 36 -42q22 0 83 52.5t97.5 81t78.5 49.5q123 61 332 61t386 -141q51 -47 113 -98q12 -5 23 -5q38 0 38 42zM282 970q0 46 -48 46t-48 -48.5t43 -48.5q53 0 53 51zM1145 195l-149 155l-148 -155l150 -164zM1511 -217q0 13 -10 28q-61 91 -217 137 t-296 46q-298 0 -462 -147q-44 -39 -44 -64q0 -35 47 -35q5 0 15 11q37 39 104 65q120 47 265 47h167q201 0 321 -74l37 -27q27 -19 39 -19q34 0 34 32zM542 4l-86 94l-86 -95l86 -95z" />
+<glyph unicode="&#x265c;" horiz-adv-x="1698" d="M1618 -342h-1538v280l154 173v106l186 211v488l-208 141v430h293v-199h207v199h274v-199h207v199h294v-430l-209 -141v-488l185 -210v-106l155 -174v-280zM1422 1103h-1145v-12l82 -55h981l82 56v11zM485 891h728v60l7 4l-735 -5v-59zM1213 462h-728v-59l-3 -3l731 3v59z M1398 160v33l-27 31h-1044l-28 -32v-32h1099zM1553 -131v44l-18 20h-1372l-18 -20v-44h1408z" />
+<glyph unicode="&#x265d;" horiz-adv-x="2156" d="M2076 -381h-265q-2 41 -65 41q-21 0 -152.5 -17t-211 -17t-163.5 40q-99 46 -129 132q-8 22 -12 38q-4 -16 -12 -38q-30 -86 -129 -132q-84 -40 -163.5 -40t-211 17t-152.5 17q-63 0 -65 -41h-265v61q0 82 77 149q105 91 308 91q45 0 133 -12.5t145 -12.5t87.5 18 t71.5 77q-75 15 -125 31t-82 49v304q-165 119 -165 297q0 128 95 237q20 22 141 126l249 212q-101 49 -101 154q0 70 47 117t117 47t117 -47t47 -117q0 -105 -101 -154l194 -164q176 -152 196 -174q95 -109 95 -237q0 -178 -165 -297v-304q-48 -49 -207 -80q41 -59 71.5 -77 t87.5 -18t145 12.5t133 12.5q203 0 308 -91q77 -67 77 -149v-61zM1142 1337q28 27 28 63.5t-27.5 63t-64.5 26.5t-64.5 -26.5t-27.5 -63t28 -63.5t64 -27t64 27zM1255 725v69h-143v143h-70v-143h-144v-69h144v-144h70v144h143zM1393 197v104l-58 -39zM1078 470 q-124 0 -315 -53v-68q152 52 272 52h86q120 0 272 -52v68q-191 53 -315 53zM1175 290l-97 65l-97 -65l97 -61zM1160 173h-164q-126 0 -233 -37v-64q121 34 231 34h168q110 0 231 -34v64q-107 37 -233 37zM821 262l-58 39v-104z" />
+<glyph unicode="&#x265e;" horiz-adv-x="1958" d="M1864 652l14 -115q0 -63 -19.5 -186.5t-19.5 -200t35 -182.5q-65 -116 -289 -182q-165 -49 -439 -75l-374 -30q-127 -14 -307 -75l-18 23q0 13 29 156q8 71 35 211q10 37 66 159l38 93q18 40 63 90l92 103q69 81 69 109t-22 48q-44 -13 -76 -31q-23 -4 -51 -4l-141 8 q-29 0 -39 -16l-56 -41q-34 -25 -62.5 -25t-70.5 28.5t-59.5 28.5t-30.5 10.5t-13 22.5q0 67 119 67q22 0 22 14q0 36 -41 36t-87.5 -33.5t-51.5 -33.5q-29 0 -42 25q-50 32 -50 62t21 48q-28 31 -28 59.5t93 77t155 71.5l186 60q98 32 163 70q49 37 153 104q48 15 143 49 q34 20 107 49q2 99 87 147q47 26 167.5 51t152.5 54q155 -101 222 -298q7 -22 24 -65q131 -290 131 -541zM1527 1446l-22 21q-48 -40 -116 -40l1 -30q82 2 137 49zM1680 1224l-10 28q-79 -15 -162 -71l17 -25q83 55 155 68zM1729 1089l-10 28q-28 -7 -52 -14l9 -29z M1711 1139l-11 29q-68 -5 -152 -48l13 -27q84 43 150 46zM1740 1060q-29 6 -57 6t-106 -21l7 -29q74 20 103 20t65 -10zM1729 1003q-57 0 -124 -37l14 -26q61 33 97.5 33t54.5 -4q-3 11 -10 32q-15 2 -32 2zM1712 934h-26v-30q56 0 88 -6l6 30q-32 6 -68 6zM1327 1202 q-36 -28 -62 -28t-59 15l-16 -37q42 -18 77.5 -18t80 33t57.5 66q90 35 179 143l-26 31q-58 -32 -196 -57.5t-212 -81.5l24 -33q61 45 149 65l170 38q-56 -52 -111 -71l-14 -16q-5 -21 -41 -49zM1796 879q-42 13 -72 13t-91 -7l4 -30q60 7 88.5 7t78.5 -18zM1812 802 q-56 15 -87.5 15t-70.5 -2l2 -30q19 1 36 1q70 0 124 -16q-1 11 -4 32zM1696 748q-8 0 -31 -2l2 -30q20 2 29 2q70 0 127 -21q-1 19 -2 32q-58 19 -125 19zM1827 620q-3 20 -3 31q-86 17 -150 21l-2 -30q69 -4 155 -22zM1838 540q0 10 -3 29q-62 22 -142 28l-2 -30 q86 -7 146 -30zM1837 493q-44 23 -75 23t-61 -4l4 -30q30 4 39 4q48 0 90 -25zM1829 421q-49 29 -131 30v-30q77 -1 126 -32q2 11 5 32zM1059 1135q-36 71 -99 101l-13 -27q54 -25 85 -88zM1821 369q-56 26 -124 31l-2 -30q68 -6 122 -32zM1813 317q-20 2 -47.5 2t-88.5 -17 l8 -28q54 15 79 15t45 -2zM909 1186q3 0 -18 -10q-8 0 -24 -5q-12 -6 -20.5 -28.5t-12.5 -28.5l-17 -24q18 2 48 -14.5t49 -16.5t46.5 18.5t41.5 21.5q0 38 -27 62.5t-66 24.5zM1807 270q-80 -18 -136 -41l12 -28q53 21 120 37q0 3 4 32zM1574 748q0 78 -45 161l-27 -15 q42 -78 42 -146q0 -140 -63 -232q-32 -46 -136.5 -137t-150.5 -173l27 -14q47 84 152.5 174.5t137.5 138.5q63 94 63 243zM1109 872q-32 -3 -52 -3t-56 11l-8 -29q40 -12 63.5 -12t55.5 3zM1799 164v6q-53 15 -118 17l-1 -29q66 -2 120 -19q-1 20 -1 25zM1629 327 q-27 3 -56 3t-82 -12l7 -29q48 11 74 11t53 -3zM1248 766q36 99 36 139t-2 70l-40 -3q2 -30 2 -65.5t-34 -128.5q-22 -60 -110 -110t-156 -50q-26 0 -76 13q20 -23 27 -47q30 -6 49 -6q82 0 179.5 57.5t124.5 130.5zM1805 82l-3 31q-64 11 -117 14l-2 -30q56 -4 122 -15z M1821 6q-3 11 -8 32q-70 16 -117 18l-2 -30q54 -3 127 -20zM1625 216l-2 30q-83 -5 -146 -24l9 -29q62 18 139 23zM1826 -33q-63 14 -110 37l-13 -27q43 -21 101 -35q15 16 22 25zM973 960l-9 29q-105 -40 -320 -104l7 -30q63 14 173.5 54t148.5 51zM1610 113v30h-13 q-60 0 -131 -17l7 -29q67 16 125 16h12zM961 523q-22 0 -48 16l-16 -26q34 -20 74.5 -20t216.5 67l-10 28q-170 -65 -217 -65zM1141 521q-105 -55 -155 -55t-88 20l-13 -27q46 -23 101.5 -23t168.5 59zM781 717q-150 0 -233 -86h7q22 0 36 -1q49 47 156.5 56.5t135.5 19.5 l-10 28q-50 -17 -92 -17zM604 734q-5 33 -22 75l-28 -11q15 -38 20 -68zM1451 26q-95 14 -180.5 14t-175.5 -31l10 -28q86 29 166.5 29t175.5 -14zM569 695q-2 65 -65 105l-17 -25q50 -32 52 -81zM477 875l-13 27q-120 -55 -189 -119l20 -23q69 63 182 115zM1440 -72 q-49 7 -87.5 7t-120 -18t-114.5 -21l3 -29q31 3 112 20.5t118 17.5t85 -7zM465 675q20 16 20 40t-50 24t-50 -43q0 -37 37 -37q23 0 43 16zM279 853q0 7 -13 21q-14 0 -61.5 -14.5t-53 -23.5t-5.5 -23q0 -19 18 -19q36 0 75.5 15t39.5 44zM951 1121q0 -10 -13.5 -20 t-23.5 -10q-40 0 -40 22q0 12 14 25.5t25 13.5t24.5 -10.5t13.5 -20.5z" />
+<glyph unicode="&#x265f;" horiz-adv-x="1588" d="M1508 -374h-1428v101q0 112 59 199t163 124q37 9 84 25q9 7 58 90q162 273 192 475q7 47 7 147h-278v64q0 71 72.5 131t154.5 89q-72 83 -72 195.5t80 192t194 79.5t194 -79.5t80 -191t-73 -195.5l64 -29q164 -85 164 -200v-56h-278v-84q0 -10 8 -65q35 -237 249 -563 q258 -51 297 -273q9 -51 9 -64v-112z" />
+<glyph unicode="&#x2660;" horiz-adv-x="1414" d="M1225 855q89 -115 89 -232.5t-79.5 -198t-188.5 -80.5t-192 67t-129 169h-4v-26q0 -491 472 -506l9 -48h-990l9 48q472 15 472 506v26h-4q-46 -102 -129 -169t-192 -67t-188.5 80.5t-79.5 198t89 232.5q46 61 185.5 188t205.5 217q95 127 127 276q32 -149 127 -276 q66 -90 205.5 -217t185.5 -188z" />
+<glyph unicode="&#x2661;" horiz-adv-x="1560" d="M1365 1445q95 -91 95 -227.5t-88 -294.5q-55 -99 -200.5 -282.5t-220.5 -301.5q-123 -192 -171 -370q-48 178 -171 370q-75 118 -220.5 301.5t-200.5 282.5q-88 158 -88 294.5t95 227.5t228.5 91t230.5 -92t126 -222q29 130 126 222t230.5 92t228.5 -91zM1294 951 q84 146 84 257.5t-71 178.5t-176 67q-156 0 -240 -165q-10 -19 -33 -91t-78 -72t-80 78q-8 28 -31 85q-84 165 -240 165q-105 0 -176 -67t-71 -178.5t84 -257.5q50 -87 164 -231q258 -326 350 -519q92 193 350 519q114 144 164 231z" />
+<glyph unicode="&#x2662;" horiz-adv-x="1346" d="M1246 754q-327 -370 -573 -782q-246 412 -573 782q327 370 573 782q246 -412 573 -782zM1137 754q-256 298 -464 626q-208 -328 -464 -626q256 -298 464 -626q208 328 464 626z" />
+<glyph unicode="&#x2663;" horiz-adv-x="1738" d="M1342 1033q126 0 211 -106.5t85 -245.5t-101 -240t-240 -101t-248.5 86t-162.5 212h-4v-52q0 -246 161 -403q65 -63 161 -96q51 -17 184 -43l11 -44h-1060l12 44q132 26 183 43q96 33 161 96q161 157 161 403v52h-4q-53 -126 -162.5 -212t-248.5 -86t-240 101t-101 240 t85 245.5t211 106.5q88 0 205 -63l5 4q-85 130 -85 224q0 145 101 241.5t247 96.5t247 -96.5t101 -241.5q0 -94 -85 -224l5 -4q117 63 205 63z" />
+<glyph unicode="&#x2664;" horiz-adv-x="1414" d="M1225 855q89 -115 89 -232.5t-79.5 -198t-188.5 -80.5t-192 67t-129 169h-4v-26q0 -491 472 -506l9 -48h-990l9 48q472 15 472 506v26h-4q-46 -102 -129 -169t-192 -67t-188.5 80.5t-79.5 198t89 232.5q46 61 185.5 188t205.5 217q95 127 127 276q32 -149 127 -276 q66 -90 205.5 -217t185.5 -188zM1176.5 482.5q55.5 56.5 55.5 142.5t-62.5 167.5t-230 238.5t-232.5 274q-65 -117 -232.5 -274t-230 -238.5t-62.5 -167.5t55.5 -142.5t135.5 -56.5q130 0 320 236l14 17l14 -17q190 -236 320 -236q80 0 135.5 56.5zM832 82q-79 62 -125 153 q-46 -91 -125 -153h250z" />
+<glyph unicode="&#x2665;" horiz-adv-x="1560" d="M1365 1445q95 -91 95 -227.5t-88 -294.5q-55 -99 -200.5 -282.5t-220.5 -301.5q-123 -192 -171 -370q-48 178 -171 370q-75 118 -220.5 301.5t-200.5 282.5q-88 158 -88 294.5t95 227.5t228.5 91t230.5 -92t126 -222q29 130 126 222t230.5 92t228.5 -91z" />
+<glyph unicode="&#x2666;" horiz-adv-x="1346" d="M1246 754q-327 -370 -573 -782q-246 412 -573 782q327 370 573 782q246 -412 573 -782z" />
+<glyph unicode="&#x2667;" horiz-adv-x="1738" d="M1342 1033q126 0 211 -106.5t85 -245.5t-101 -240t-240 -101t-248.5 86t-162.5 212h-4v-52q0 -246 161 -403q65 -63 161 -96q51 -17 184 -43l11 -44h-1060l12 44q132 26 183 43q96 33 161 96q161 157 161 403v52h-4q-53 -126 -162.5 -212t-248.5 -86t-240 101t-101 240 t85 245.5t211 106.5q88 0 205 -63l5 4q-85 130 -85 224q0 145 101 241.5t247 96.5t247 -96.5t101 -241.5q0 -94 -85 -224l5 -4q117 63 205 63zM1479 499q77 77 77 185.5t-64.5 187.5t-149.5 79q-44 0 -118.5 -34.5t-91 -34.5t-25.5 7q-71 56 -71 78q0 11 7 21q92 141 92 210 q0 110 -76.5 183t-189.5 73t-189.5 -73t-76.5 -183q0 -61 49 -139.5t49 -96t-15 -29.5q-65 -52 -79 -52t-21 4q-122 66 -198.5 66t-141 -79t-64.5 -187.5t77 -185.5t191 -77t196 77q45 42 99 131.5t80 89.5h16q15 0 28 -12q13 12 28 12h16q26 0 80 -89.5t99 -131.5 q82 -77 196 -77t191 77zM1036 82q-104 77 -167 205q-63 -128 -167 -205h334z" />
+<glyph unicode="&#x2668;" horiz-adv-x="2100" d="M1456.5 760q93.5 -114 93.5 -207t-57 -239.5t-66 -210.5l-47 35q3 46 30 144.5t27 156.5q0 104 -94 224t-94 231q0 191 138 432l41 -22q-25 -56 -45 -153.5t-20 -160.5q0 -116 93.5 -230zM1047 832.5q93 -182.5 93 -278.5t-56.5 -245t-66.5 -206l-48 35v3q0 37 29.5 139 t29.5 159q0 107 -93 293.5t-93 287t41 229.5t94 211l41 -22q-64 -157 -64 -314q0 -109 93 -291.5zM736 544q0 -75 -57.5 -238.5t-66.5 -202.5l-49 36q5 42 32 142t27 159q0 103 -93.5 222.5t-93.5 220.5t42 230.5t94 212.5l41 -20q-63 -175 -63 -304.5t93.5 -242.5 t93.5 -215zM2050 228q0 -241 -289 -393q-222 -116 -507 -141q-103 -9 -288 -9q-302 0 -574 124q-342 156 -342 420q0 137 143 236q109 76 269 113l9 -59q-115 -23 -194 -80q-100 -71 -100 -173q0 -217 405 -305q238 -52 566 -52q227 0 462 78q313 103 313 279 q0 101 -100 173q-82 60 -194 80l8 59q163 -38 270 -112q143 -99 143 -238z" />
+<glyph unicode="&#x2669;" horiz-adv-x="818" d="M668 -56q0 -147 -128.5 -241.5t-280.5 -94.5q-89 0 -149 45t-60 131q0 136 125.5 236t254.5 100t183 -47v1483h55v-1612z" />
+<glyph unicode="&#x266a;" horiz-adv-x="1280" d="M1180 532q0 -211 -181 -516h-32q86 199 98 232q51 139 51 243q0 180 -135.5 341t-312.5 171v-1059q0 -146 -128.5 -241t-280.5 -95q-89 0 -149 45t-60 131q0 136 125.5 236t255 100t182.5 -47v1483h55q32 -211 116 -332q33 -47 147 -175t166 -218q83 -142 83 -299z" />
+<glyph unicode="&#x266b;" horiz-adv-x="1604" d="M1454 -56q0 -147 -128.5 -241.5t-280.5 -94.5q-89 0 -149 45t-60 131q0 136 125.5 236t254.5 100t183 -47v1037l-731 197v-1156q0 -147 -128.5 -241.5t-280.5 -94.5q-89 0 -149 45t-60 131q0 136 125.5 236t254.5 100t183 -47v1276l841 -227v-1385z" />
+<glyph unicode="&#x266c;" horiz-adv-x="1604" d="M1454 171q0 -147 -128.5 -241.5t-280.5 -94.5q-89 0 -149 45t-60 131q0 136 125.5 236t254.5 100t183 -47v647l-731 -180v-823q0 -147 -128.5 -241.5t-280.5 -94.5q-89 0 -149 45t-60 131q0 136 125.5 236t254.5 100t183 -47v1276l841 207v-1385zM1399 1152v185 l-731 -180v-184z" />
+<glyph unicode="&#x266d;" horiz-adv-x="913" d="M813 439q0 -357 -433 -695q-174 -136 -202 -136t-28 39v1909h55v-891q99 110 284 110q138 0 231 -98.5t93 -237.5zM632 439q0 101 -34 168q-44 88 -135 88q-113 0 -187 -52q-45 -31 -58 -61.5t-13 -87.5v-806q427 382 427 751z" />
+<glyph unicode="&#x266e;" horiz-adv-x="836" d="M686 -392h-55v550l-460 -132q-21 -6 -21 14v1516h55v-551l460 132q21 6 21 -14v-1515zM631 327v631l-426 -122v-631z" />
+<glyph unicode="&#x266f;" horiz-adv-x="836" d="M756 170q0 -20 -20 -26l-93 -27v-359h-55v344l-340 -98v-396h-55v381l-93 -27q-20 -6 -20 14v129q0 20 20 26l93 27v721l-93 -27q-20 -6 -20 14v129q0 20 20 26l93 27v358h55v-343l340 98v395h55v-380l93 27q20 6 20 -14v-129q0 -20 -20 -26l-93 -27v-721l93 27 q20 6 20 -14v-129zM588 271v721l-340 -98v-721z" />
+<glyph unicode="&#x2670;" horiz-adv-x="1470" d="M1433 623q0 -15 -14 -15l-127 60q-128 59 -171 59h-316v-695q0 -43 59 -170l60 -128q0 -14 -15 -14q-9 0 -77.5 85t-96.5 85t-96.5 -85t-77.5 -85q-15 0 -15 14l60 128q59 127 59 170v695h-316q-43 0 -171 -59l-127 -60q-14 0 -14 15q0 9 85 77.5t85 96.5t-85 96.5 t-85 77.5q0 15 14 15l127 -60q128 -59 171 -59h316v309q0 43 -59 170l-60 128q0 14 15 14q9 0 77.5 -85t96.5 -85t96.5 85t77.5 85q15 0 15 -14l-60 -128q-59 -127 -59 -170v-309h316q43 0 171 59l127 60q14 0 14 -15q0 -9 -85 -77.5t-85 -96.5t85 -96.5t85 -77.5z" />
+<glyph unicode="&#x2671;" horiz-adv-x="1581" d="M1531 798q0 -28 -35 -96t-35 -80.5t-14 -12.5q-3 0 -128 59.5t-170 59.5h-288v-696q0 -45 59.5 -170t59.5 -128q0 -14 -12.5 -14t-80.5 -35t-96 -35t-96 35t-80.5 35t-12.5 14q0 3 59.5 128t59.5 170v696h-289q-45 0 -170 -59.5t-128 -59.5q-14 0 -14 12.5t-35 80.5 t-35 96t35 96t35 80.5t14 12.5q3 0 128 -59.5t170 -59.5h289v308q0 45 -59.5 170t-59.5 128q0 14 12.5 14t80.5 35t96 35t96 -35t80.5 -35t12.5 -14q0 -3 -59.5 -128t-59.5 -170v-308h288q45 0 170 59.5t128 59.5q14 0 14 -12.5t35 -80.5t35 -96zM1417 692q49 98 49 105.5 t-49 105.5q-207 -100 -268 -100h-288q-26 0 -45.5 19.5t-19.5 45.5v308q0 61 100 268q-98 49 -105.5 49t-105.5 -49q101 -209 101 -268v-308q0 -26 -19.5 -45.5t-45.5 -19.5h-289q-61 0 -268 100q-49 -98 -49 -105.5t49 -105.5q209 101 268 101h289q26 0 45.5 -19.5 t19.5 -45.5v-696q0 -59 -101 -268q98 -49 105.5 -49t105.5 49q-100 207 -100 268v696q0 26 19.5 45.5t45.5 19.5h288q59 0 268 -101z" />
+<glyph unicode="&#x2672;" d="M1707.5 1282q18.5 -15 18.5 -35t-13 -41l-227 -361l-407 34q-62 5 -62 34q0 21 31 43l48 29l-99 204l-258 -423l-435 263l245 403q62 102 176 102h11l596 -25q119 -5 162 -92l82 -166q83 46 98 46t33.5 -15zM1991 592q37 -59 37 -107.5t-46 -137.5l-269 -520 q-47 -91 -143 -91h-186v-85q0 -45 -45 -45q-22 0 -47 37l-235 354l208 355q23 39 56.5 39t33.5 -28v-71h221l-264 422l432 271zM1005 -236h-468q-130 0 -206 130l-286 490q-25 43 -25 97t20 87l97 158l-73 45q-19 13 -19 42q0 43 61 44l421 6l196 -360q15 -28 15 -44.5 t-15.5 -28.5t-29.5 -12q-9 4 -74 40l-115 -182h501v-512zM1466 878q226 356 226 369.5t-17 13.5t-114 -50l-98 195q-34 67 -124 71l-496 22q54 -28 84 -91l211 -436q-39 -20 -83 -52q26 -13 32 -13zM1991 471q0 52 -38 114l-219 355l-377 -235l256 -413h177q74 0 137.5 53 t63.5 126zM718 1495q-93 0 -156 -103l-214 -352l380 -227l253 411l-79 158q-56 113 -184 113zM1318 258l2 61q0 38 -8 39q-6 -5 -16 -17l-197 -342l216 -326q23 -32 25 -32q12 0 12 16v117h224q68 0 109 78l238 450q-68 -43 -128 -43zM93 825q-11 0 -11 -13t11 -19l89 -52 l-114 -196q-15 -26 -15 -62.5t24 -77.5l253 -437q0 100 26 141l248 394q36 -17 89 -46l6 6l-189 366zM969 -209v446h-491l-92 -147q-23 -37 -23 -109q0 -190 191 -190h415z" />
+<glyph unicode="&#x2673;" d="M1520 569l-445 257l221 13l-273 473l-264 -459l-101 58l365 633l374 -648l123 187v-514zM2032 -201l-815 -1l100 -198l-445 257l445 257l-100 -199h613l-299 517l101 58zM748 -86v-116l-732 1l407 705l-221 13l445 257v-514l-123 187l-306 -533h530zM1172 123h-326v83 h103v303h-113v77q59 1 90.5 16.5t36.5 58.5h108v-455h101v-83z" />
+<glyph unicode="&#x2674;" d="M1520 569l-445 257l221 13l-273 473l-264 -459l-101 58l365 633l374 -648l123 187v-514zM2032 -201l-815 -1l100 -198l-445 257l445 257l-100 -199h613l-299 517l101 58zM748 -86v-116l-732 1l407 705l-221 13l445 257v-514l-123 187l-306 -533h530zM1208 123h-409v81 q255 189 255 287q0 85 -98 85q-68 0 -140 -49h-3v111q77 32 169 32q201 0 201 -159q0 -128 -229 -296h254v-92z" />
+<glyph unicode="&#x2675;" d="M1520 569l-445 257l221 13l-273 473l-264 -459l-101 58l365 633l374 -648l123 187v-514zM2032 -201l-815 -1l100 -198l-445 257l445 257l-100 -199h613l-299 517l101 58zM748 -86v-116l-732 1l407 705l-221 13l445 257v-514l-123 187l-306 -533h530zM1211 283 q0 -171 -225 -171q-110 0 -186 32v110h6q77 -47 155 -47q122 0 122 85q0 53 -58 65q-17 4 -100 4v86q76 0 95 5q54 13 54 64q0 61 -101 61q-74 0 -152 -47h-6v109q82 32 178 32q204 0 204 -131q0 -101 -101 -123v-15q115 -16 115 -119z" />
+<glyph unicode="&#x2676;" d="M1520 569l-445 257l221 13l-273 473l-264 -459l-101 58l365 633l374 -648l123 187v-514zM2032 -201l-815 -1l100 -198l-445 257l445 257l-100 -199h613l-299 517l101 58zM748 -86v-116l-732 1l407 705l-221 13l445 257v-514l-123 187l-306 -533h530zM1214 250h-73v-129 h-120v129h-260v95l248 315h132v-323h73v-87zM1021 337v223l-175 -223h175z" />
+<glyph unicode="&#x2677;" d="M1520 569l-445 257l221 13l-273 473l-264 -459l-101 58l365 633l374 -648l123 187v-514zM2032 -201l-815 -1l100 -198l-445 257l445 257l-100 -199h613l-299 517l101 58zM748 -86v-116l-732 1l407 705l-221 13l445 257v-514l-123 187l-306 -533h530zM1202 303 q0 -95 -65 -143t-166 -48t-174 31v111h7q77 -46 148 -46q122 0 122 91q0 81 -133 81q-21 0 -69 -9t-55 -8v298h370v-93h-252v-103q46 3 65 3q202 0 202 -165z" />
+<glyph unicode="&#x2678;" d="M1520 569l-445 257l221 13l-273 473l-264 -459l-101 58l365 633l374 -648l123 187v-514zM2032 -201l-815 -1l100 -198l-445 257l445 257l-100 -199h613l-299 517l101 58zM748 -86v-116l-732 1l407 705l-221 13l445 257v-514l-123 187l-306 -533h530zM1203 303 q0 -90 -59 -141t-150 -51q-218 0 -218 250q0 308 289 308q42 0 93 -8v-96h-6q-37 17 -88 17q-143 0 -162 -150q72 44 133 44q168 0 168 -173zM1076 296q0 96 -102 96q-34 0 -71 -14v-19q-1 -13 -1 -19q0 -148 92 -148q82 0 82 104z" />
+<glyph unicode="&#x2679;" d="M1520 569l-445 257l221 13l-273 473l-264 -459l-101 58l365 633l374 -648l123 187v-514zM2032 -201l-815 -1l100 -198l-445 257l445 257l-100 -199h613l-299 517l101 58zM748 -86v-116l-732 1l407 705l-221 13l445 257v-514l-123 187l-306 -533h530zM782 568v92h409v-101 l-241 -436h-140l253 445h-281z" />
+<glyph unicode="&#x267a;" d="M1520 569l-445 257l221 13l-273 473l-264 -459l-101 58l365 633l374 -648l123 187v-514zM2032 -201l-815 -1l100 -198l-445 257l445 257l-100 -199h613l-299 517l101 58zM748 -86v-116l-732 1l407 705l-221 13l445 257v-514l-123 187l-306 -533h530z" />
+<glyph unicode="&#x267b;" d="M1675 1261q17 0 17 -13.5t-226 -369.5l-379 29q-6 0 -32 13q2 5 83 52l-211 436q-30 63 -84 91l496 -22q90 -4 124 -71l98 -195q97 50 114 50zM1991 471q0 -73 -63.5 -126t-137.5 -53h-177l-256 413l377 235l219 -355q38 -62 38 -114zM718 1495q128 0 184 -113l79 -158 l-253 -411l-380 227l214 352q63 103 156 103zM1320 319l-2 -61l477 1q60 0 128 43l-238 -450q-41 -78 -109 -78h-224v-117q0 -16 -12 -16q-6 0 -241 358l197 342q3 4 16 17q8 -1 8 -39zM77 405q-24 41 -24 77.5t15 62.5l114 196l-89 52q-11 6 -11 19t11 13l417 4l189 -366 l-6 -6q-53 29 -89 46l-248 -394q-26 -41 -26 -141zM969 -209h-415q-191 0 -191 190q0 72 23 109l92 147h491v-446z" />
+<glyph unicode="&#x267c;" d="M2048 582q0 -426 -299 -725t-725.5 -299t-725 298.5t-298.5 725.5t298.5 725.5t725 298.5t725.5 -299t299 -725zM1424 847q203 319 203 332t-15.5 13t-102.5 -45l-88 175q-30 60 -112 64l-446 20q49 -26 76 -82l189 -392q-35 -18 -74 -47q11 -6 28 -12zM1839 367.5 q57 47.5 57 104t-34 111.5l-197 320l-340 -212l231 -371h159q67 0 124 47.5zM750 1402q-84 0 -140 -92l-193 -317l342 -204l228 370l-71 142q-50 101 -166 101zM1290 289l2 55q0 34 -7 35q-5 -5 -14 -15l-178 -308l195 -293q10 -15 22 -29q11 0 11 14v106h202q61 0 98 70 l214 405q-61 -39 -115 -39zM188 799q-10 0 -10 -11t10 -17l80 -47l-103 -177q-13 -22 -13 -54.5t22 -70.5l227 -394q0 89 24 127l223 355l80 -42l5 6q-4 9 -170 329zM976 -131v401h-442l-82 -132q-21 -34 -21 -98q0 -171 172 -171h373z" />
+<glyph unicode="&#x267d;" d="M2048 582q0 -426 -299 -725t-725.5 -299t-725 298.5t-298.5 725.5t298.5 725.5t725 298.5t725.5 -299t299 -725zM1998 582q0 406 -284 690t-690 284t-690 -284t-284 -690t284 -690t690 -284t690 284t284 690zM1509 1147q87 45 102.5 45t15.5 -13t-203 -332l-342 26 q-4 0 -28 12q2 5 74 47l-189 392q-27 56 -76 82l446 -20q82 -4 112 -64zM1862 583q34 -55 34 -111.5t-57 -104t-124 -47.5h-159l-231 371l340 212zM750 1402q116 0 166 -101l71 -142l-228 -370l-342 204l193 317q56 92 140 92zM1292 344l-2 -55l430 1q53 0 115 39l-214 -405 q-37 -70 -98 -70h-202v-106q0 -14 -11 -14q-14 14 -217 322l178 308q2 4 14 15q7 -1 7 -35zM174 422q-22 38 -22 70.5t13 54.5l103 177l-80 47q-10 6 -10 17t10 11l375 4l170 -329l-5 -6l-80 42l-223 -355q-24 -38 -24 -127zM976 -131h-373q-172 0 -172 171q0 64 21 98 l82 132h442v-401z" />
+<glyph unicode="&#x267e;" d="M2048 582q0 -426 -299 -725t-725 -299t-725 299t-299 725t299 725t725 299t725 -299t299 -725zM1948 582q0 385 -269.5 654.5t-654.5 269.5t-654.5 -269.5t-269.5 -654.5t269.5 -654.5t654.5 -269.5t654.5 269.5t269.5 654.5zM1481 989q154 0 248 -124.5t94 -283.5 t-96 -283.5t-252 -124.5q-237 0 -412 231l-54 72q-186 -303 -442 -303q-153 0 -247.5 125.5t-94.5 284t96.5 282.5t251.5 124q117 0 226.5 -64.5t185.5 -165.5l54 -72q190 302 442 302zM1484 307q102 0 167 84.5t65 194.5t-64.5 205.5t-175 95.5t-214.5 -78t-172 -189 q106 -137 171 -199q121 -114 223 -114zM564 856q-103 0 -167.5 -84.5t-64.5 -194t65 -205.5t175 -96t214 78t172 188q-240 314 -394 314z" />
+<glyph unicode="&#x267f;" d="M540 1322q0 75 53.5 128.5t128.5 53.5t128.5 -53.5t53.5 -127t-50 -126.5t-122 -57l33 -287h351l20 -172h-351l15 -126h557l186 -502l160 57l58 -162l-320 -115l-204 550h-591l-106 921v18zM855 -355q-238 0 -406.5 168.5t-168.5 406.5q0 154 75.5 284.5t202.5 207.5 l23 -202q-125 -118 -125 -286.5t117 -285.5t279 -117t276.5 108.5t124.5 265.5l99 -265q-76 -130 -208.5 -207.5t-288.5 -77.5z" />
+<glyph unicode="&#x2680;" d="M72 -291v1497l529 249h1375v-1432l-416 -314h-1488zM1838 1395h-1223l-379 -178h1306zM1916 52v1320l-336 -202v-1371zM1520 -231v1388h-1388v-1388h1388zM933.5 571.5q45.5 -45.5 45.5 -108t-45 -107.5t-108 -45t-108 45t-45 107t45.5 108t107.5 46t107.5 -45.5z" />
+<glyph unicode="&#x2681;" d="M72 -291v1497l529 249h1375v-1432l-416 -314h-1488zM1838 1395h-1223l-379 -178h1306zM1916 52v1320l-336 -202v-1371zM1520 -231v1388h-1388v-1388h1388zM523.5 981.5q45.5 -45.5 45.5 -108t-45 -107.5t-108 -45t-108 45t-45 107t45.5 108t107.5 46t107.5 -45.5z M1343.5 161.5q45.5 -45.5 45.5 -108t-45 -107.5t-108 -45t-108 45t-45 107t45.5 108t107.5 46t107.5 -45.5z" />
+<glyph unicode="&#x2682;" d="M72 -291v1497l529 249h1375v-1432l-416 -314h-1488zM1838 1395h-1223l-379 -178h1306zM1916 52v1320l-336 -202v-1371zM1520 -231v1388h-1388v-1388h1388zM933.5 571.5q45.5 -45.5 45.5 -108t-45 -107.5t-108 -45t-108 45t-45 107t45.5 108t107.5 46t107.5 -45.5z M523.5 981.5q45.5 -45.5 45.5 -108t-45 -107.5t-108 -45t-108 45t-45 107t45.5 108t107.5 46t107.5 -45.5zM1343.5 161.5q45.5 -45.5 45.5 -108t-45 -107.5t-108 -45t-108 45t-45 107t45.5 108t107.5 46t107.5 -45.5z" />
+<glyph unicode="&#x2683;" d="M72 -291v1497l529 249h1375v-1432l-416 -314h-1488zM1838 1395h-1223l-379 -178h1306zM1916 52v1320l-336 -202v-1371zM1520 -231v1388h-1388v-1388h1388zM523.5 981.5q45.5 -45.5 45.5 -108t-45 -107.5t-108 -45t-108 45t-45 107t45.5 108t107.5 46t107.5 -45.5z M1343.5 161.5q45.5 -45.5 45.5 -108t-45 -107.5t-108 -45t-108 45t-45 107t45.5 108t107.5 46t107.5 -45.5zM1343.5 981.5q45.5 -45.5 45.5 -108t-45 -107.5t-108 -45t-108 45t-45 107t45.5 108t107.5 46t107.5 -45.5zM523.5 161.5q45.5 -45.5 45.5 -108t-45 -107.5 t-108 -45t-108 45t-45 107t45.5 108t107.5 46t107.5 -45.5z" />
+<glyph unicode="&#x2684;" d="M523.5 981.5q45.5 -45.5 45.5 -108t-45 -107.5t-108 -45t-108 45t-45 107t45.5 108t107.5 46t107.5 -45.5zM1343.5 161.5q45.5 -45.5 45.5 -108t-45 -107.5t-108 -45t-108 45t-45 107t45.5 108t107.5 46t107.5 -45.5zM72 -291v1497l529 249h1375v-1432l-416 -314h-1488z M1838 1395h-1223l-379 -178h1306zM1916 52v1320l-336 -202v-1371zM1520 -231v1388h-1388v-1388h1388zM933.5 571.5q45.5 -45.5 45.5 -108t-45 -107.5t-108 -45t-108 45t-45 107t45.5 108t107.5 46t107.5 -45.5zM1343.5 981.5q45.5 -45.5 45.5 -108t-45 -107.5t-108 -45 t-108 45t-45 107t45.5 108t107.5 46t107.5 -45.5zM523.5 161.5q45.5 -45.5 45.5 -108t-45 -107.5t-108 -45t-108 45t-45 107t45.5 108t107.5 46t107.5 -45.5z" />
+<glyph unicode="&#x2685;" d="M1343.5 981.5q45.5 -45.5 45.5 -108t-45 -107.5t-108 -45t-108 45t-45 107t45.5 108t107.5 46t107.5 -45.5zM523.5 161.5q45.5 -45.5 45.5 -108t-45 -107.5t-108 -45t-108 45t-45 107t45.5 108t107.5 46t107.5 -45.5zM72 -291v1497l529 249h1375v-1432l-416 -314h-1488z M1838 1395h-1223l-379 -178h1306zM1916 52v1320l-336 -202v-1371zM1520 -231v1388h-1388v-1388h1388zM523.5 981.5q45.5 -45.5 45.5 -108t-45 -107.5t-108 -45t-108 45t-45 107t45.5 108t107.5 46t107.5 -45.5zM1343.5 161.5q45.5 -45.5 45.5 -108t-45 -107.5t-108 -45 t-108 45t-45 107t45.5 108t107.5 46t107.5 -45.5zM1343.5 571.5q45.5 -45.5 45.5 -108t-45 -107.5t-108 -45t-108 45t-45 107t45.5 108t107.5 46t107.5 -45.5zM523.5 571.5q45.5 -45.5 45.5 -108t-45 -107.5t-108 -45t-108 45t-45 107t45.5 108t107.5 46t107.5 -45.5z" />
+<glyph unicode="&#x2686;" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1898 582q0 364 -255 619t-619 255t-619 -255t-255 -619t255 -619t619 -255t619 255t255 619zM1689 582q0 -68 -48.5 -116.5t-116.5 -48.5t-116.5 48.5t-48.5 116.5 t48.5 116.5t116.5 48.5t116.5 -48.5t48.5 -116.5z" />
+<glyph unicode="&#x2687;" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1898 582q0 364 -255 619t-619 255t-619 -255t-255 -619t255 -619t619 -255t619 255t255 619zM1689 582q0 -68 -48.5 -116.5t-116.5 -48.5t-116.5 48.5t-48.5 116.5 t48.5 116.5t116.5 48.5t116.5 -48.5t48.5 -116.5zM689 582q0 -68 -48.5 -116.5t-116.5 -48.5t-116.5 48.5t-48.5 116.5t48.5 116.5t116.5 48.5t116.5 -48.5t48.5 -116.5z" />
+<glyph unicode="&#x2688;" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1689 582q0 68 -48.5 116.5t-116.5 48.5t-116.5 -48.5t-48.5 -116.5t48.5 -116.5t116.5 -48.5t116.5 48.5t48.5 116.5z" />
+<glyph unicode="&#x2689;" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1689 582q0 68 -48.5 116.5t-116.5 48.5t-116.5 -48.5t-48.5 -116.5t48.5 -116.5t116.5 -48.5t116.5 48.5t48.5 116.5zM689 582q0 68 -48.5 116.5t-116.5 48.5t-116.5 -48.5 t-48.5 -116.5t48.5 -116.5t116.5 -48.5t116.5 48.5t48.5 116.5z" />
+<glyph unicode="&#x268a;" d="M1724 636h-1400v192h1400v-192z" />
+<glyph unicode="&#x268b;" d="M1724 636h-516v192h516v-192zM840 636h-516v192h516v-192z" />
+<glyph unicode="&#x268c;" d="M1724 424h-1400v192h1400v-192zM1724 848h-1400v192h1400v-192z" />
+<glyph unicode="&#x268d;" d="M1724 848h-516v192h516v-192zM840 848h-516v192h516v-192zM1724 424h-1400v192h1400v-192z" />
+<glyph unicode="&#x268e;" d="M1724 424h-516v192h516v-192zM840 424h-516v192h516v-192zM1724 848h-1400v192h1400v-192z" />
+<glyph unicode="&#x268f;" d="M1724 424h-516v192h516v-192zM840 424h-516v192h516v-192zM1724 848h-516v192h516v-192zM840 848h-516v192h516v-192z" />
+<glyph unicode="&#x2690;" d="M1760 323q-164 0 -473.5 97.5t-473.5 97.5q-255 0 -487 -208v-720h-116v1984h116v-197q242 197 484 197q162 0 468 -101t468 -101q36 0 92 5v-1051q-45 -3 -78 -3zM1722 1256q-154 5 -452 103.5t-447 98.5t-275 -70q-78 -43 -222 -161v-767q225 174 487 174 q164 0 462 -93.5t447 -100.5v816z" />
+<glyph unicode="&#x2691;" d="M1760 323q-164 0 -473.5 97.5t-473.5 97.5q-255 0 -487 -208v-720h-116v1984h116v-197q242 197 484 197q162 0 468 -101t468 -101q36 0 92 5v-1051q-45 -3 -78 -3z" />
+<glyph unicode="&#x2692;" horiz-adv-x="2326" d="M2246 671q0 -164 -92 -381q-20 122 -79.5 261t-136.5 199l-83 -10l-435 -447l418 -407q31 -30 31 -78.5t-51 -97t-99 -48.5t-76 29l-404 416l-403 -414q-30 -31 -78.5 -31t-96.5 51t-48 99t29 76l416 404l-434 446l-232 -232q-27 -27 -45 -27t-42 24l-197 197 q-28 28 -28 45.5t27 44.5l219 219q-34 38 -34 83t49 92t95 47t84 -28l219 218q28 28 45 28t45 -28l197 -197q24 -24 24 -42t-27 -45l-233 -232l449 -436l450 438l9 82l-139 140l-66 -26l-101 101l332 331l100 -100l-25 -67q210 -177 304 -303q143 -192 143 -394zM681 -153 q-12 -12 -12 -36t31.5 -58.5t56.5 -34.5t39 14l1019 1047l-87 87zM1778.5 -250.5q34.5 31.5 34.5 56.5t-14 39l-419 407l-102 -105l405 -417q12 -12 36.5 -12t59 31.5zM1198 430l-446 434l-87 -87l433 -445z" />
+<glyph unicode="&#x2693;" horiz-adv-x="1860" d="M980 -392h-100v148q-276 11 -574 396l-71 -131l-155 468l441 -243l-160 -44q86 -100 239 -177.5t280 -81.5v1119h-359v100h221q-54 67 -54 159.5t71 163.5t171 71t171 -71t71 -163.5t-54 -159.5h221v-100h-359v-1119q127 4 280 81.5t239 177.5l-160 44l441 243l-155 -468 l-71 131q-298 -385 -574 -396v-148zM1082 1314q0 63 -44.5 107.5t-107.5 44.5t-107.5 -44.5t-44.5 -107.5t44.5 -107.5t107.5 -44.5t107.5 44.5t44.5 107.5z" />
+<glyph unicode="&#x2694;" d="M2022 263q0 -67 -53.5 -151.5t-122.5 -154.5q-93 -95 -154 -95q-42 0 -99 44q-9 7 -66 58l-133 120q-102 -85 -102 -139t39 -111q-153 40 -153 143t131 211l-285 280l-285 -280q131 -108 131 -212q0 -101 -153 -142q39 57 39 111t-103 139l-113 -102q-75 -68 -85 -76 q-57 -44 -99 -44q-61 0 -154 95q-69 70 -122.5 154.5t-53.5 151.5q0 123 84 194.5t209 71.5q231 0 398 -188l218 215l-728 716q124 -3 251 -96q35 -25 114 -98l451 -434l453 434q36 34 113 98q127 93 252 96l-728 -716l217 -215q167 188 399 188q125 0 209 -71.5t84 -194.5z M1833 96q77 75 77 156t-60 123t-143 42q-157 0 -313 -136q257 -281 296 -281q18 0 68.5 36.5t74.5 59.5zM341 417q-83 0 -143.5 -42t-60.5 -123t88.5 -166.5t130 -85.5t298.5 281q-156 136 -313 136z" />
+<glyph unicode="&#x2695;" horiz-adv-x="1280" d="M1200 972q0 -57 -67 -57t-147 90l-110 -184q154 -166 154 -263q0 -171 -250 -171q-67 0 -159 13l-123 -204q103 -121 103 -200q0 -112 -178 -112q-53 0 -110 7l-126 -208l-57 33l103 188q-153 30 -153 68q0 9 4 16q10 3 27 3l160 -18l105 193q-90 104 -106 127 q-65 88 -65 144q0 105 175 105q58 0 193 -17l142 261q-176 201 -176 306q0 86 68 132.5t161.5 46.5t188.5 -42l99 180q25 45 73 45q69 0 69 -75q0 -25 -12 -45l-111 -183q125 -107 125 -179zM1151 1009q0 26 -26 26q-19 0 -19 -17q0 -22 30 -22q15 0 15 13zM805 1099 q-84 0 -84 -58q0 -45 66 -123l94 171q-34 10 -76 10zM857 572q0 41 -61 118l-107 -178q25 -2 55 -2q113 0 113 62zM404 428q-54 0 -54 -32.5t83 -125.5l80 146q-78 12 -109 12zM462 25q0 27 -27 67l-75 -124q102 2 102 57z" />
+<glyph unicode="&#x2696;" horiz-adv-x="2266" d="M1986 902l-14 67q0 62 78 62q92 0 92 -101q0 -146 -241 -146q-23 0 -44 2q14 47 14 88q15 -2 31 -2q84 0 84 30zM1651 926q-10 -27 -10 -52t6 -55q-165 77 -244 77l-63 -9l-34 147q34 15 86.5 15t121.5 -41zM1259 1038l-46 -199h-160l-46 199l79 72l19 466h56l19 -466z M1756 -412q-331 0 -500 383l12 13q28 -22 60 -39l382 838q-17 48 -17 90q0 72 63 72t63 -72q0 -42 -17 -90l382 -838q32 17 60 39l12 -13q-169 -383 -500 -383zM619 819q6 30 6 55t-10 52l137 82q69 41 121.5 41t86.5 -15l-34 -147l-63 9q-79 0 -244 -77zM294 969l-14 -67 q0 -30 84 -30q16 0 31 2q0 -41 14 -88q-21 -2 -44 -2q-241 0 -241 146q0 101 92 101q78 0 78 -62zM510 -412q-331 0 -500 383l12 13q28 -22 60 -39l382 838q-17 48 -17 90q0 72 63 72t63 -72q0 -42 -17 -90l382 -838q32 17 60 39l12 -13q-169 -383 -500 -383zM2111 -87 l-311 669v-723q179 5 311 54zM1203 974q0 29 -20.5 49t-49.5 20t-49.5 -20t-20.5 -49q0 -69 70 -69t70 69zM1712 -141v723l-311 -669q132 -49 311 -54zM865 -87l-311 669v-723q179 5 311 54zM466 -141v723l-311 -669q132 -49 311 -54z" />
+<glyph unicode="&#x2697;" horiz-adv-x="1896" d="M1645 955q0 -182 -123 -292.5t-314.5 -110.5t-305.5 125t-114 326q0 70 16 139q-163 -68 -321.5 -243.5t-261.5 -363.5q-7 24 -59 63q-48 37 -71 37h-2q187 339 402 553q294 293 590 293q237 0 400.5 -146t163.5 -380zM1285 314v-514h-112v514h-288l-127 -514h-116 l145 583l54 43h776l54 -43l145 -583h-116l-127 514h-288zM205 519q0 -9 -16.5 -9t-62 36.5t-45.5 58.5q0 10 15 10t62 -38t47 -58z" />
+<glyph unicode="&#x2698;" horiz-adv-x="1169" d="M1089 839q0 -107 -73 -231l-137 -219q-73 -137 -73 -273q0 -176 41 -402l-28 -6l-154 324q-83 173 -170 235q-79 42 -226 145q-161 147 -189 342q5 3 13 3q57 0 189 -99q12 30 32 30q57 0 158 -104.5t131 -114.5q4 8 4 34t-24 87q-43 109 -120 162q-136 93 -186 151 q-83 95 -83 232t78.5 240t222 103t229.5 -116.5t86 -262.5q0 -103 -42 -185q-23 -44 -72 -102t-49 -83q0 -60 70 -134q101 77 160 178l59 113q42 63 103 63q21 0 39 -9q11 -50 11 -101zM684 925q50 66 50 162t-64 196q-72 114 -174.5 114t-159.5 -82.5t-57 -194.5t75 -150 q25 26 42.5 26t67.5 -42q23 33 59 33q46 0 49 -44q22 15 34 15t32.5 -16t45.5 -17z" />
+<glyph unicode="&#x2699;" horiz-adv-x="1904" d="M952 -104q-47 0 -92 6l-167 -168q-77 24 -157 66v236q-74 56 -130 130h-236q-42 80 -66 157l168 167q-6 45 -6 92t6 92l-168 167q24 77 66 157h236q56 74 130 130v236q80 42 157 66l167 -168q45 6 92 6t92 -6l167 168q77 -24 157 -66v-236q74 -56 130 -130h236 q42 -80 66 -157l-168 -167q6 -45 6 -92t-6 -92l168 -167q-24 -77 -66 -157h-236q-56 -74 -130 -130v-236q-80 -42 -157 -66l-167 168q-45 -6 -92 -6zM1518 582q0 234 -166 400t-400 166t-400 -166t-166 -400t166 -400t400 -166t400 166t166 400zM1478 582q0 -218 -154 -372 t-372 -154t-372 154t-154 372t154 372t372 154t372 -154t154 -372zM1151 582q0 82 -58.5 140.5t-140.5 58.5t-140.5 -58.5t-58.5 -140.5t58.5 -140.5t140.5 -58.5t140.5 58.5t58.5 140.5z" />
+<glyph unicode="&#x269a;" horiz-adv-x="2242" d="M1235 1342q0 -48 -33 -81t-81 -33t-81 33t-33 81t33 81t81 33t81 -33t33 -81zM1526 888q-91 0 -170 16q44 -68 44 -161.5t-64.5 -170t-163.5 -94.5v-831q0 -49 -51 -49t-51 49v831q-99 18 -163.5 94.5t-64.5 170t44 161.5q-79 -16 -170 -16q-208 0 -387 80 q-206 91 -289 258q66 -12 131 -12q125 0 285 49l121 41q74 23 124 23q115 0 156 -69q18 -32 34.5 -139t60.5 -144q52 39 118 51v181q24 -9 51 -9t51 9v-181q66 -12 118 -51q44 37 60.5 144t34.5 139q41 69 156 69q50 0 117 -22l128 -42q160 -49 285 -49q65 0 131 12 q-83 -167 -289 -258q-179 -80 -387 -80zM1111 1268q54 0 54 79t-54 79q-31 0 -52.5 -26t-21.5 -58q0 -74 74 -74zM1310 752q0 65 -38.5 115t-99.5 67v-364q61 17 99.5 67t38.5 115zM932 752q0 -65 38.5 -115t99.5 -67v364q-61 -17 -99.5 -67t-38.5 -115z" />
+<glyph unicode="&#x269b;" horiz-adv-x="1862" d="M1762 214q0 -209 -311 -209q-90 0 -197 22q-123 -376 -324 -376q-197 0 -320 376q-107 -24 -202 -24q-307 0 -307 211q0 155 185 368q-186 208 -186 363q0 213 302 213q93 0 204 -25q130 380 324 380q201 0 324 -380q113 25 221.5 25t186.5 -42q100 -54 100 -167 q0 -158 -187 -367q187 -210 187 -368zM1685 916q0 191 -284 191q-63 0 -135 -11q37 -123 55 -287q135 -105 220 -190q144 164 144 297zM930 1427q-164 0 -279 -301q133 -29 276 -97q155 70 283 97q-113 301 -280 301zM1277 835q-9 69 -52 253q-98 -23 -250 -78 q149 -76 189.5 -98.5t112.5 -76.5zM1333 597v-37q0 -93 -8 -153q67 55 190 175q-64 68 -186 171q4 -56 4 -156zM1690 250q0 123 -145 295q-89 -90 -224 -194q-18 -159 -55 -283q75 -12 137 -12q287 0 287 194zM882 1006q-127 56 -246 79q-26 -86 -52 -254q97 82 220 138z M1284 377q11 92 11 202t-11 208q-56 39 -171 112q-81 47 -183 89q-167 -63 -350 -201q-14 -119 -14 -204.5t14 -209.5q185 -128 350 -201q144 54 354 205zM1280 325q-112 -72 -171.5 -107t-129.5 -64q159 -63 246 -78q33 113 55 249zM457 1105q-115 0 -188 -39 q-95 -50 -95 -155q0 -130 146 -299q98 105 223 193q15 148 56 287q-76 13 -142 13zM536 407q-8 111 -8 186.5t11 163.5q-112 -86 -193 -179q79 -85 190 -171zM886 154q-204 99 -302 175q25 -169 56 -253q111 19 246 78zM930 -267q169 0 280 305q-133 28 -276 93 q-162 -69 -283 -93q118 -305 279 -305zM175 246q0 -190 286 -190q62 0 138 12q-40 129 -56 283q-106 78 -227 194q-141 -170 -141 -299zM1084 580q0 -61 -46 -103.5t-107 -42.5t-107 42.5t-46 103.5t46 103.5t107 42.5t107 -42.5t46 -103.5zM1047 640q0 25 -37.5 46 t-66.5 24q40 -39 48 -81q2 -1 9 -1q47 0 47 12zM1067 569q1 9 1 21.5t-8 33.5q-34 -12 -64 -12q9 -22 9 -56q30 0 62 13z" />
+<glyph unicode="&#x269c;" horiz-adv-x="1664" d="M1507 793q97 -89 97 -210.5t-86 -204t-202 -82.5q-94 0 -188 103q75 36 75 77q0 27 -43 27q-81 0 -117 -105q38 0 64 -26t26 -64t-26 -64t-64 -26h-18q7 -90 40 -90q17 0 17 23.5t-5 43.5q22 29 56 29q62 0 103.5 -47.5t41.5 -114.5t-46 -111t-127.5 -44t-145.5 66 q-6 -54 -61.5 -139t-65.5 -130q-10 45 -65.5 130t-61.5 139q-64 -66 -145.5 -66t-127.5 44t-46 111t41.5 114.5t103.5 47.5q34 0 56 -29q-5 -20 -5 -43.5t17 -23.5q33 0 40 90h-18q-38 0 -64 26t-26 64t26 64t64 26q-36 105 -117 105q-43 0 -43 -27q0 -41 75 -77 q-94 -103 -188 -103q-116 0 -202 82.5t-86 204t97 210.5t235 89t247 -110q-22 90 -22 163q0 98 100 237t115 211q15 -72 115 -211t100 -237q0 -73 -22 -163q109 110 247 110t235 -89zM1475.5 421q68.5 65 68.5 161.5t-79.5 168t-183.5 71.5q-165 0 -270 -163 q-89 -139 -100 -321h-59q7 96 71 292t64 305q0 69 -57 157l-98 141l-98 -141q-57 -88 -57 -157q0 -109 64 -305t71 -292h-59q-11 182 -100 321q-105 163 -270 163q-104 0 -183.5 -71.5t-79.5 -168t68.5 -161.5t159.5 -65q49 0 97 39q-44 47 -44 82.5t32 60.5t71 25 q81 0 129.5 -66.5t62.5 -158.5h-75q-30 0 -30 -30t30 -30h80v-3q0 -207 -102 -207q-36 0 -57 30q-20 26 -20 59v6q-76 -10 -76 -97q0 -99 101.5 -99t157.5 109q44 85 49 202h60q-2 -46 -26 -140.5t-24 -142t68 -152.5q68 105 68 152.5t-24 142t-26 140.5h60q5 -117 49 -202 q56 -109 157.5 -109t101.5 99q0 87 -76 97v-6q0 -33 -20 -59q-21 -30 -57 -30q-102 0 -102 207v3h80q30 0 30 30t-30 30h-75q14 92 62.5 158.5t129.5 66.5q39 0 71 -25t32 -60.5t-44 -82.5q48 -39 97 -39q91 0 159.5 65z" />
+<glyph unicode="&#x269d;" d="M1953 794q0 -116 -292 -363l-46 54q267 231 267 299q0 59 -341 92q-235 22 -388 22t-254 -7l-5 69q83 6 289 6t402 -22q368 -42 368 -150zM1017 1419q-63 0 -217 -375q-123 -299 -181 -531l-67 17q60 242 182 541q170 418 283 418q116 0 275 -393l-65 -27 q-40 95 -108.5 222.5t-101.5 127.5zM1420 773q80 -196 154.5 -472.5t74.5 -433.5t-95 -157q-126 0 -400 170l37 60q272 -164 359 -164q31 0 31 67q0 155 -74.5 434.5t-150.5 469.5zM95 784q0 126 462 161l6 -70q-107 -9 -221 -30q-178 -33 -178 -68q0 -70 268.5 -297.5 t470.5 -354.5l-36 -59q-205 128 -446 329q-326 273 -326 389zM499 -303q-95 0 -95 158q0 129 51 336l68 -16q-50 -213 -50 -355q0 -56 31 -56q88 0 373.5 176.5t464.5 326.5l44 -53q-177 -149 -430 -310q-327 -207 -457 -207z" />
+<glyph unicode="&#x269e;" d="M1774 904l-54 -127l-1423 603l54 127zM1720 513h-1545v138h1545v-138zM1774 260l-1423 -603l-54 127l1423 603z" />
+<glyph unicode="&#x269f;" d="M1751 1380l-1423 -603l-54 127l1423 603zM1873 513h-1545v138h1545v-138zM1751 -216l-54 -127l-1423 603l54 127z" />
+<glyph unicode="&#x26a0;" d="M1101 155q32 -32 32 -76.5t-32 -76.5t-77 -32t-77 32t-32 76.5t32 76.5t77 32t77 -32zM2032 -201h-2016l1007 1745zM1862 -103l-839 1451l-837 -1451h1676zM1024 253q-34 0 -39 47l-69 632q-1 6 -1 12q0 39 31 64q34 28 78 28t78 -28q31 -25 31 -64q0 -6 -1 -12l-69 -634 q-5 -45 -39 -45z" />
+<glyph unicode="&#x26a1;" horiz-adv-x="963" d="M883 943l-289 -1001l139 23l-293 -365l-84 455l113 -86l80 665l-469 -235l307 1147h346l-352 -809z" />
+<glyph unicode="&#x26a2;" horiz-adv-x="1606" d="M1397 896q129 -129 129 -307t-113 -303.5t-281 -143.5v-171h196v-98h-196v-189h-98v189h-196v98h196v171q-130 14 -231 96q-101 -82 -231 -96v-171h196v-98h-196v-189h-98v189h-196v98h196v171q-168 18 -281 143.5t-113 303.5t129 307t314 129q158 0 280 -99 q122 99 280 99q185 0 314 -129zM1428 582q0 144 -100.5 244.5t-232 100.5t-223.5 -71q94 -120 94 -274t-94 -274q92 -71 223.5 -71t232 100.5t100.5 244.5zM868 582q0 113 -65 203q-65 -90 -65 -203t65 -203q65 90 65 203zM640 582q0 154 94 274q-92 71 -223.5 71 t-232 -100.5t-100.5 -244.5t100.5 -244.5t232 -100.5t223.5 71q-94 120 -94 274z" />
+<glyph unicode="&#x26a3;" horiz-adv-x="1629" d="M1466 282q0 -185 -129 -314t-314 -129q-147 0 -263 85.5t-159 221.5q-40 -7 -78 -7q-185 0 -314 129t-129 314t129 314t314 129q93 0 178 -37l89 154l-175 100l377 152l57 -402l-175 101l-88 -153q115 -85 159 -222q40 7 78 7q93 0 178 -37l89 154l-175 100l377 152 l57 -402l-175 101l-88 -153q180 -132 180 -358zM1368 282q0 144 -100.5 244.5t-244.5 100.5q-29 0 -59 -5q2 -23 2 -40q0 -137 -74.5 -247.5t-196.5 -161.5q34 -105 124 -170.5t204 -65.5q144 0 244.5 100.5t100.5 244.5zM868 582v9q-86 -43 -138 -126t-52 -183v-9 q86 43 138 126t52 183zM523 927q-144 0 -244.5 -100.5t-100.5 -244.5t100.5 -244.5t244.5 -100.5q29 0 59 5q-2 23 -2 40q0 137 74.5 247.5t196.5 161.5q-34 105 -124 170.5t-204 65.5z" />
+<glyph unicode="&#x26a4;" horiz-adv-x="1529" d="M1366 784q0 -178 -120.5 -305t-296.5 -137q-37 -128 -139.5 -214.5t-237.5 -101.5v-171h196v-98h-196v-189h-98v189h-196v98h196v171q-168 18 -281 143.5t-113 300t120.5 301.5t296.5 137q40 140 157.5 229.5t268.5 89.5q93 0 178 -37l89 154l-175 100l377 152l57 -402 l-175 101l-88 -153q180 -132 180 -358zM1181 555q87 97 87 235t-100.5 238.5t-244.5 100.5q-111 0 -199.5 -62.5t-124.5 -163.5q158 -27 262.5 -150t104.5 -287q0 -5 -1 -24q129 16 216 113zM868 466q0 129 -82 225t-207 116q-1 -16 -1 -23q0 -129 82 -225t207 -116 q1 16 1 23zM480 784q0 5 1 24q-129 -16 -216 -113t-87 -235t100.5 -238.5t244.5 -100.5q111 0 199.5 62.5t124.5 163.5q-158 27 -262.5 150t-104.5 287z" />
+<glyph unicode="&#x26a5;" horiz-adv-x="1129" d="M966 582q0 -171 -113 -296.5t-281 -143.5v-171h196v-98h-196v-189h-98v189h-196v98h196v171q-168 18 -281 143.5t-113 303.5t129 307t314 129q93 0 178 -37l89 154l-175 100l377 152l57 -402l-175 101l-88 -153q180 -132 180 -358zM868 582q0 144 -100.5 244.5 t-244.5 100.5t-244.5 -100.5t-100.5 -244.5t100.5 -244.5t244.5 -100.5t244.5 100.5t100.5 244.5z" />
+<glyph unicode="&#x26a6;" horiz-adv-x="1249" d="M966 418q0 -185 -129 -314t-314 -129t-314 129t-129 314t129 314t314 129q93 0 178 -37l85 148l-170 98l49 85l170 -98l75 129l-175 100l377 152l57 -402l-175 101l-74 -129l170 -98l-49 -85l-170 98l-85 -147q180 -132 180 -358zM868 418q0 144 -100.5 244.5 t-244.5 100.5t-244.5 -100.5t-100.5 -244.5t100.5 -244.5t244.5 -100.5t244.5 100.5t100.5 244.5z" />
+<glyph unicode="&#x26a7;" horiz-adv-x="1452" d="M1169 532q0 -171 -113 -296.5t-281 -143.5v-171h196v-98h-196v-189h-98v189h-196v98h196v171q-168 18 -281 143.5t-113 296.5q0 225 180 357l-85 148l-170 -98l-49 85l170 98l-74 129l-175 -101l57 402l377 -152l-175 -100l75 -129l170 98l49 -85l-170 -98l85 -148 q85 37 178 37t178 -37l209 362l-175 100l377 152l57 -402l-175 101l-208 -361q180 -132 180 -358zM1071 532q0 144 -100.5 244.5t-244.5 100.5t-244.5 -100.5t-100.5 -244.5t100.5 -244.5t244.5 -100.5t244.5 100.5t100.5 244.5z" />
+<glyph unicode="&#x26a8;" horiz-adv-x="1046" d="M853 714.5q113 -125.5 113 -303.5t-129 -307t-314 -129t-314 129t-129 307t113 303.5t281 143.5v171h-196v98h196v149h-201l250 320l250 -320h-201v-149h196v-98h-196v-171q168 -18 281 -143.5zM868 418q0 144 -100.5 244.5t-244.5 100.5t-244.5 -100.5t-100.5 -244.5 t100.5 -244.5t244.5 -100.5t244.5 100.5t100.5 244.5z" />
+<glyph unicode="&#x26a9;" horiz-adv-x="1781" d="M1381 533h-149v-196h-98v196h-171q-18 -168 -143.5 -281t-303.5 -113t-307 129t-129 314t129 314t307 129t303.5 -113t143.5 -281h171v196h98v-196h149v201l320 -250l-320 -250v201zM868 582q0 144 -100.5 244.5t-244.5 100.5t-244.5 -100.5t-100.5 -244.5t100.5 -244.5 t244.5 -100.5t244.5 100.5t100.5 244.5z" />
+<glyph unicode="&#x26aa;" horiz-adv-x="1218" d="M1178 582q0 -237 -166 -403t-403 -166t-403 166t-166 403t166 403t403 166t403 -166t166 -403zM1078 582q0 196 -136.5 332.5t-332.5 136.5t-332.5 -136.5t-136.5 -332.5t136.5 -332.5t332.5 -136.5t332.5 136.5t136.5 332.5z" />
+<glyph unicode="&#x26ab;" horiz-adv-x="1218" d="M1178 582q0 -237 -166 -403t-403 -166t-403 166t-166 403t166 403t403 166t403 -166t166 -403z" />
+<glyph unicode="&#x26ac;" horiz-adv-x="946" d="M906 582q0 -180 -126.5 -306.5t-306.5 -126.5t-306.5 126.5t-126.5 306.5t126.5 306.5t306.5 126.5t306.5 -126.5t126.5 -306.5zM806 582q0 139 -97 236t-236 97t-236 -97t-97 -236t97 -236t236 -97t236 97t97 236z" />
+<glyph unicode="&#x26ad;" horiz-adv-x="1606" d="M1526 582q0 -185 -129 -314t-314 -129q-158 0 -280 99q-122 -99 -280 -99q-185 0 -314 129t-129 314t129 314t314 129q158 0 280 -99q122 99 280 99q185 0 314 -129t129 -314zM1428 582q0 144 -100.5 244.5t-232 100.5t-223.5 -71q94 -120 94 -274t-94 -274 q92 -71 223.5 -71t232 100.5t100.5 244.5zM868 582q0 113 -65 203q-65 -90 -65 -203t65 -203q65 90 65 203zM640 582q0 154 94 274q-92 71 -223.5 71t-232 -100.5t-100.5 -244.5t100.5 -244.5t232 -100.5t223.5 71q-94 120 -94 274z" />
+<glyph unicode="&#x26ae;" horiz-adv-x="2030" d="M1950 582q0 -185 -129 -314t-314 -129t-314 129t-129 314v-492h-98v492q0 -185 -129 -314t-314 -129t-314 129t-129 314t129 314t314 129t314 -129t129 -314v492h98v-492q0 185 129 314t314 129t314 -129t129 -314zM1852 582q0 144 -100.5 244.5t-244.5 100.5 t-244.5 -100.5t-100.5 -244.5t100.5 -244.5t244.5 -100.5t244.5 100.5t100.5 244.5zM868 582q0 144 -100.5 244.5t-244.5 100.5t-244.5 -100.5t-100.5 -244.5t100.5 -244.5t244.5 -100.5t244.5 100.5t100.5 244.5z" />
+<glyph unicode="&#x26af;" horiz-adv-x="2530" d="M2450 582q0 -185 -129 -314t-307 -129t-303.5 113t-143.5 281h-604q-18 -168 -143.5 -281t-303.5 -113t-307 129t-129 314t129 314t307 129t303.5 -113t143.5 -281h604q18 168 143.5 281t303.5 113t307 -129t129 -314zM2352 582q0 144 -100.5 244.5t-244.5 100.5 t-244.5 -100.5t-100.5 -244.5t100.5 -244.5t244.5 -100.5t244.5 100.5t100.5 244.5zM868 582q0 144 -100.5 244.5t-244.5 100.5t-244.5 -100.5t-100.5 -244.5t100.5 -244.5t244.5 -100.5t244.5 100.5t100.5 244.5z" />
+<glyph unicode="&#x26b0;" horiz-adv-x="1857" d="M1745 438l-1188 -149l-445 150v435l445 150l1188 -149v-437zM1633 537v239l-1065 134l-344 -116v-275l344 -116z" />
+<glyph unicode="&#x26b1;" horiz-adv-x="1307" d="M1176 719q19 -51 19 -80.5t-50 -136.5q-213 -456 -294 -831l-55 -44h-285l-55 44q-81 375 -294 831q-50 107 -50 136.5t19 80.5q57 151 140.5 232t236.5 129l-38 22l-29 49v274h-155v112h735v-112h-155v-274l-29 -49l-38 -22q153 -48 236.5 -129t140.5 -232zM662 1062 q0 68 92 122v241h-201v-241q92 -54 92 -122q0 -50 -69 -81l-115 -39q-57 -24 -107.5 -68t-90 -129.5t-39.5 -106.5q2 -6 70.5 -161.5t141.5 -345.5t120 -392h195q70 301 318 866q7 15 14 33q0 21 -39.5 106.5t-90 129.5t-107.5 68l-115 39q-69 31 -69 81z" />
+<glyph unicode="&#x26b2;" horiz-adv-x="1046" d="M837 896q129 -129 129 -307t-113 -303.5t-281 -143.5v-458h-98v458q-168 18 -281 143.5t-113 303.5t129 307t314 129t314 -129zM868 582q0 144 -100.5 244.5t-244.5 100.5t-244.5 -100.5t-100.5 -244.5t100.5 -244.5t244.5 -100.5t244.5 100.5t100.5 244.5z" />
+<glyph unicode="&#x26b3;" horiz-adv-x="1316" d="M958 1311q156 -156 156 -370.5t-135.5 -365.5t-337.5 -174v-401h296v-125h-296v-285h-125v285h-296v125h296v522h63q171 0 290.5 119.5t119.5 290.5t-119.5 290.5t-290.5 119.5q-143 0 -300 -122l-77 99q187 148 377 148q223 0 379 -156z" />
+<glyph unicode="&#x26b4;" horiz-adv-x="1480" d="M800 0h296v-125h-296v-285h-125v285h-296v125h296v381l-502 510l567 576l567 -576l-507 -515v-376zM1132 891l-392 398l-392 -398l392 -398z" />
+<glyph unicode="&#x26b5;" horiz-adv-x="1474" d="M1258 798h-371l262 -262l-88 -89l-262 262v-709h296v-125h-296v-285h-125v285h-296v125h296v709l-262 -262l-88 89l262 262h-370v125h370l-262 261l88 89l262 -262v409h125v-409l262 262l88 -89l-262 -261h371v-125z" />
+<glyph unicode="&#x26b6;" horiz-adv-x="1592" d="M859 635h-125v639h125v-639zM1342 561h-186l-360 -428l-360 428h-186v125h244l302 -359l302 359h244v-125zM1502 0h-346l-360 -347l-360 347h-346v125h396l310 -298l310 298h396v-125z" />
+<glyph unicode="&#x26b7;" horiz-adv-x="1014" d="M931 -117q0 -141 -148 -222q-123 -67 -275 -67t-276 68q-149 82 -149 214t119 211q99 65 242 81v1252h125v-279l250 236l86 -91l-275 -259l275 -260l-86 -91l-250 237v-745q142 -16 242 -82q120 -79 120 -203zM691 -244q115 47 115 126t-115 127q-91 38 -185 38t-183 -37 q-115 -47 -115 -126t115 -127q91 -38 185 -38t183 37z" />
+<glyph unicode="&#x26b8;" horiz-adv-x="1234" d="M1061 270q-118 -30 -213 -30t-188 28v-268h296v-125h-296v-285h-125v285h-296v125h296v319q-162 86 -262 238.5t-100 330.5q0 264 204 456t470 192q96 0 214 -30l-1 -8q-202 -2 -333 -212q-114 -183 -114 -398t114 -398q131 -210 333 -212z" />
+<glyph unicode="&#x26b9;" horiz-adv-x="1713" d="M1623 498h-658l329 -570l-108 -63l-329 570l-330 -570l-108 63l329 570h-658v125h658l-329 570l108 63l329 -571l330 571l108 -63l-329 -570h658v-125z" />
+<glyph unicode="&#x26ba;" horiz-adv-x="1364" d="M1274 0h-1184v125h458l-424 1076l117 46l441 -1122l441 1122l117 -46l-424 -1076h458v-125z" />
+<glyph unicode="&#x26bb;" horiz-adv-x="1364" d="M1274 1122h-458l424 -1076l-117 -46l-441 1122l-441 -1122l-117 46l424 1076h-458v125h1184v-125z" />
+<glyph unicode="&#x26bc;" horiz-adv-x="1416" d="M1247 -362h-602v362h-445v1016h1016v-1016h-446v-237h477v-125zM1085 125v766h-760v-766h320v362h125v-362h315z" />
+<glyph unicode="&#x26bd;" d="M2015 582q0 -410 -290.5 -700.5t-700.5 -290.5t-700.5 290.5t-290.5 700.5t290.5 700.5t700.5 290.5t700.5 -290.5t290.5 -700.5zM1880 1018q-98 192 -271 325l5 -58zM1897 971l-4 4h1l-292 294l-277 -93v-346l290 -245l272 84zM1978 474l-87 176l-271 -85l-191 -356 l75 -215l286 9q159 210 188 471zM1305 831v346l-323 165l-296 -232l15 -313l283 -143zM969 1357l-59 178q-333 -39 -569 -278l19 -110l312 -22zM341 1139l-17 100q-215 -229 -253 -541l118 82zM1486 -13l-75 215l-360 102l-263 -212l111 -296l339 -25zM1038 319l-62 317 l-283 143l-283 -251l62 -291l303 -131zM788 -349q115 -29 249 -29t274 44l-75 85l-340 25zM64 582q0 -240 110 -448l132 -84l147 182l-63 295l-195 233l-127 -88q-4 -43 -4 -90zM326 -77l-26 107l-105 67q54 -93 131 -174z" />
+<glyph unicode="&#x26be;" d="M2015 582q0 -410 -290.5 -700.5t-700.5 -290.5t-700.5 290.5t-290.5 700.5t290.5 700.5t700.5 290.5t700.5 -290.5t290.5 -700.5zM1966 582q0 220 -94.5 412t-259.5 324q-66 -56 -120 -117l-70 61q52 60 113 111q-232 151 -511 151t-511 -151q61 -51 113 -111l-70 -61 q-54 61 -120 117q-165 -132 -259.5 -324t-94.5 -412t94.5 -412t259.5 -324q66 56 120 117l70 -61q-52 -60 -113 -111q232 -151 511 -151t511 151q-61 51 -113 111l70 61q54 -61 120 -117q165 132 259.5 324t94.5 412zM1424 1114q-59 -84 -98 -176l-83 31q44 109 111 206z M1291 834q-26 -95 -32 -197h-90q7 117 38 228zM805 969l-83 -31q-39 92 -98 176l70 61q67 -97 111 -206zM1291 330l-84 -31q-31 111 -38 228h90q6 -102 32 -197zM879 637h-90q-6 102 -32 197l84 31q31 -111 38 -228zM1424 50l-70 -61q-67 97 -111 206l83 31q39 -92 98 -176z M879 527q-7 -117 -38 -228l-84 31q26 95 32 197h90zM805 195q-44 -109 -111 -206l-70 61q59 84 98 176z" />
+<glyph unicode="&#x26bf;" d="M1975 -366h-1902v1903h1902v-1903zM1862 -257v1681h-1676v-1681h1676zM1445 1001q0 -276 -326 -343v-482h226v-200h-224v-137h-192v819q-326 67 -326 343q0 159 136 249q118 78 285 78t285 -78q136 -90 136 -249zM1024 842q82 0 145.5 36t63.5 113t-69 116 q-55 33 -140 33t-140 -33q-69 -39 -69 -116t63.5 -113t145.5 -36z" />
+<glyph unicode="&#x26c0;" d="M1709 420q0 -144 -284 -221q-201 -55 -401 -55t-401 55q-284 77 -284 221v339q0 136 289 209q203 52 396 52t396 -52q289 -73 289 -209v-339zM1670 420v214q-24 -30 -53 -51v-258q53 43 53 95zM1537 278v261q-26 -12 -58 -23v-260q36 12 58 22zM1670 742q0 127 -270 193 q-188 46 -376 46t-376 -46q-270 -66 -270 -193q0 -137 266 -209q186 -50 380 -50t380 50q266 72 266 209zM1404 234v258q-15 -3 -46 -10v-259q20 4 46 11zM1300 212v258q-31 -6 -73 -11v-259q27 4 73 12zM1188 453q-83 -9 -190.5 -9t-252.5 26v-258q159 -29 250.5 -29 t192.5 12v258zM706 219v259q-33 7 -80 20v-259q53 -14 80 -20zM565 257v260q-21 7 -60 23v-260q20 -9 60 -23zM378 420q0 -57 62 -102v259q-36 25 -62 57v-214zM1543 761q0 -109 -215 -160q-142 -35 -304 -35t-304 35q-215 51 -215 160t215 160q142 35 303.5 35t304.5 -35 q215 -51 215 -160zM1504 761q0 83 -204 126q-140 30 -276 30t-275 -29q-205 -44 -205 -127t205 -127q139 -29 275 -29t275 29q205 44 205 127zM1188 761q0 -78 -164 -78t-164 78t164 78t164 -78zM899 761q0 -19 47 -29t78.5 -10t78 9.5t46.5 29t-47 29.5t-78 10t-78 -10 t-47 -29zM2048 1606zM0 1606zM2048 -442zM0 -442z" />
+<glyph unicode="&#x26c1;" d="M1709 624q0 -144 -284 -221q-201 -55 -401 -55t-401 55q-284 77 -284 221v339q0 136 289 209q203 52 396 52t396 -52q289 -73 289 -209v-339zM1709 265q0 -144 -284 -221q-201 -54 -401 -54t-401 54q-284 77 -284 221v338q0 -144 284 -221q201 -54 401 -54t401 54 q284 77 284 221v-338zM1670 624v214q-22 -27 -53 -50v-259q53 43 53 95zM1537 482v261q-26 -12 -58 -23v-260q36 12 58 22zM1670 265v213q-22 -27 -53 -50v-258q53 43 53 95zM1670 946q0 127 -270 193q-188 46 -376 46t-376 -46q-270 -66 -270 -193q0 -137 266 -208 q185 -50 379.5 -50t380.5 50q266 71 266 208zM1404 438v259l-46 -11v-258q15 3 46 10zM1300 416v259l-73 -12v-259q27 4 73 12zM1537 123v260q-26 -12 -58 -23v-259q36 12 58 22zM1404 79v258l-46 -11v-257q15 3 46 10zM1188 658q-83 -9 -190.5 -9t-252.5 26v-259 q159 -29 250.5 -29t192.5 12v259zM1300 57v258l-73 -12v-258q27 4 73 12zM706 424v258q-33 7 -80 20v-259q37 -10 80 -19zM1188 298q-83 -9 -190.5 -9t-252.5 26v-258q154 -28 252.5 -28t190.5 11v258zM565 461v260q-36 13 -60 24v-260q29 -13 60 -24zM378 624 q0 -56 62 -101v258q-36 25 -62 57v-214zM706 65v257q-33 7 -80 20v-258q37 -10 80 -19zM565 103v258q-36 13 -60 24v-259q20 -9 60 -23zM378 265q0 -56 62 -101v257q-36 25 -62 57v-213zM1543 966q0 -109 -215 -160q-142 -35 -304 -35t-304 35q-215 51 -215 160t215 160 q142 35 303.5 35t304.5 -35q215 -51 215 -160zM1504 966q0 83 -204 126q-140 30 -276 30t-275 -29q-205 -44 -205 -127t205 -127q139 -29 275 -29t275 29q205 44 205 127zM1188 966q0 -78 -164 -78t-164 78t164 78t164 -78zM899 966q0 -19 47 -29t78.5 -10t78 9.5t46.5 29 t-47 29.5t-78 10t-78 -10t-47 -29zM2048 1606zM0 1606zM2048 -442zM0 -442z" />
+<glyph unicode="&#x26c2;" d="M1709 420q0 -81 -92 -142v300q92 61 92 142v-300zM1537 236q-31 -13 -58 -22v300q16 5 58 23v-301zM1709 759q0 -144 -284 -221q-201 -55 -401 -55t-401 55q-284 77 -284 221q0 136 289 209q203 52 396 52t396 -52q289 -73 289 -209zM1404 193q-30 -8 -46 -11v300l46 12 v-301zM1300 171q-28 -5 -73 -11v300q21 3 73 12v-301zM1188 154q-88 -10 -190 -10t-253 27v301q157 -28 251.5 -28t191.5 11v-301zM706 179q-54 11 -80 18v301q42 -11 80 -19v-300zM565 215q-20 7 -60 24v300q30 -13 60 -23v-301zM339 420v300q0 -84 101 -147v-300 q-101 63 -101 147zM1543 761q0 109 -215 160q-143 35 -304.5 35t-303.5 -35q-215 -51 -215 -160t215 -160q142 -35 304 -35t304 35q215 51 215 160zM1504 761q0 -83 -205 -127q-139 -29 -275 -29t-275 29q-205 44 -205 127t205 127q139 29 275 29t276 -30q204 -43 204 -126z M1188 761q0 78 -164 78t-164 -78t164 -78t164 78zM1024 800q31 0 78 -10t47 -29.5t-46.5 -29t-78 -9.5t-78.5 10t-47 29t47 29t78 10zM2048 1606zM0 1606zM2048 -442zM0 -442z" />
+<glyph unicode="&#x26c3;" d="M1709 624q0 -81 -92 -142v300q92 61 92 142v-300zM1537 441q-31 -13 -58 -22v300q27 9 58 22v-300zM1709 265q0 -81 -92 -142v299q92 61 92 142v-299zM1709 963q0 -144 -284 -221q-201 -54 -401 -54t-401 54q-284 77 -284 221q0 136 289 209q203 52 396 52t396 -52 q289 -73 289 -209zM1404 398l-46 -12v300l46 12v-300zM1300 376l-73 -12v300q21 3 73 12v-300zM1537 82q-31 -13 -58 -22v299q27 9 58 22v-299zM1404 39l-46 -12v299l46 12v-299zM1709 584q0 -144 -282 -221q-202 -55 -403 -55t-403 55q-282 77 -282 221v20q0 -144 282 -220 q201 -55 403 -55t403 55q282 76 282 220v-20zM1188 359q-97 -11 -191.5 -11t-251.5 28v300q151 -27 253 -27t190 10v-300zM1300 17l-73 -12v299q21 3 73 12v-299zM706 383q-38 8 -80 19v300q26 -7 80 -18v-301zM1188 0q-88 -10 -190 -10t-253 27v299q151 -27 253 -27t190 10 v-299zM565 420q-30 10 -60 23v300q30 -13 60 -23v-300zM339 624v300q0 -84 101 -147v-300q-101 63 -101 147zM706 25q-54 11 -80 18v299q26 -7 80 -18v-299zM565 61q-30 10 -60 23v299q30 -13 60 -23v-299zM339 265v299q0 -84 101 -147v-299q-101 63 -101 147zM1543 966 q0 109 -215 160q-143 35 -304.5 35t-303.5 -35q-215 -51 -215 -160t215 -160q142 -35 304 -35t304 35q215 51 215 160zM1504 966q0 -83 -205 -127q-139 -29 -275 -29t-275 29q-205 44 -205 127t205 127q139 29 275 29t276 -30q204 -43 204 -126zM1188 966q0 78 -164 78 t-164 -78t164 -78t164 78zM1024 1005q31 0 78 -10t47 -29.5t-46.5 -29t-78 -9.5t-78.5 10t-47 29t47 29t78 10zM2048 1606zM0 1606zM2048 -442zM0 -442z" />
+<glyph unicode="&#x26c4;" d="M1719 159q0 -516 -695 -516t-695 516q0 297 255 447q-118 119 -118 281q0 110 51 193q141 230 507 230q227 0 377 -95q177 -113 177 -328q0 -166 -114 -281q255 -141 255 -447zM1619 159q0 146 -75 247q-47 63 -130 115.5t-83 67.5q0 10 75.5 110t75.5 188 q0 169 -152 254q-123 69 -306 69t-306 -69q-152 -85 -152 -254q0 -88 75.5 -188t75.5 -110q0 -15 -83 -67.5t-130 -115.5q-75 -101 -75 -247q0 -241 188 -341q141 -75 407 -75t407 75q188 100 188 341zM1269 945q25 -25 25 -58.5t-25.5 -60t-58.5 -26.5t-58 25.5t-25 58.5 t25 59.5t58.5 26.5t58.5 -25zM896 945q25 -25 25 -58.5t-26 -60t-59 -26.5t-57.5 25.5t-24.5 59.5t24.5 59.5t58.5 25.5t59 -25z" />
+<glyph unicode="&#x26c5;" d="M968 309l-144 -13q-110 0 -183 59q-52 42 -71 51.5t-71 9.5t-148 -22.5t-145 -22.5q-206 0 -206 122q0 85 320 132q2 72 43 120q-30 -14 -82 -42l-8 3q42 49 88 114q-10 20 -20 27q-21 -2 -122 -57l-9 2q42 50 89 115l-10 12h-18l-110 -23l-13 3q49 34 113 88v6l-7 14 l-139 15q3 7 67.5 26t64.5 35t-138 61q5 7 78 11.5t74 24.5q-16 22 -37 35l-48 29q-26 15 -28 30l134 -25l17 13v12l-89 100q34 -1 129 -49q15 10 15 20t-55 109v17q10 -6 110 -88l24 16q-8 42 -29 124l7 11l51 -72q28 -40 44 -40q6 0 9 12q0 46 14 132q1 -2 27 -65.5 t39 -65.5q15 8 32 51l31 80q5 -27 9 -85.5t14 -58.5q18 0 52 45l43 63l7 4v-10q0 -21 -11.5 -65.5t-11.5 -59.5t23 -16q33 33 107 88q-2 -15 -55 -129q6 -17 20 -17t61 31.5t64 34.5l-54 -110q57 -2 97 -59q85 148 217 148q94 0 165.5 -62t71.5 -154q0 -39 -11 -74 q38 11 86 11q84 0 142 -58t58 -141q0 -54 -26 -110q19 4 37 4q88 0 186.5 -60t98.5 -142q0 -78 -241 -198q-69 -93 -247 -93q-111 0 -308 -36q-22 -4 -49.5 -4t-109 28t-125.5 28zM1943 597q0 54 -78 82q-56 20 -132 20t-130 -59q24 -36 24 -58q0 -102 -144 -102 q-87 0 -145 33q-26 15 -26 40t26 33q113 -38 147 -38q66 0 66 36q0 17 -58 59q53 82 53 158q0 35 -33.5 54t-71.5 19q-84 0 -145 -56q-14 -4 -28 -4q-34 0 -34 25q0 12 11 25q71 84 207 84q66 0 119.5 -39.5t53.5 -103.5q0 -23 -3 -47q45 60 45 110.5t-35.5 93t-86.5 42.5 q-118 0 -164 -57q-57 2 -73 32q49 53 66.5 81.5t17.5 83t-48.5 92.5t-105.5 38q-119 0 -222 -239q-31 139 -105 139q-56 0 -126.5 -69.5t-70.5 -171.5l-47 -62q-33 92 -60 92q-50 0 -96 -99q-61 -134 -67 -141l-36 -39q-12 -17 -15 -52l170 14q4 -8 4 -17q0 -30 -28 -58 q-123 0 -311 -34q-42 -6 -96 -16t-54 -28q0 -49 128 -49q50 0 146 23t146 23q94 0 175.5 -58.5t150.5 -58.5q214 0 214 118q13 18 34 18t37 -18q0 -74 -54 -119q126 -45 176 -45t179.5 22t152.5 22q125 0 167 69l123 69q90 56 90 88zM838 1256q-90 112 -216.5 112 t-213.5 -87.5t-87 -214t111 -216.5q89 186 176 186q27 0 50 -10q11 59 63.5 127t116.5 103zM900 876q-6 0 -12 2q-6 63 -13 63q-40 0 -58 -60q-10 -46 -19 -92q-9 -34 -42 -36q-19 39 -25 39q-27 0 -43 -43l-17 -65q-25 -84 -91 -148q63 331 153 331q8 0 16 -3 q13 52 46.5 102t75.5 50q71 0 70 -108q-12 -32 -41 -32z" />
+<glyph unicode="&#x26c6;" d="M1966 1231q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM1666 1231q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM1837 931q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38z M1366 1231q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM1537 931q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM1698 631q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38z M1066 1231q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM1869 331q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM1237 931q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38z M1398 631q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM766 1231q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM1569 331q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38z M937 931q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM1720 31q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM1098 631q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38z M466 1231q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM1881 -269q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM1269 331q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38z M637 931q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM1420 31q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM798 631q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38z M166 1231q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM1581 -269q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM969 331q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38z M337 931q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM1120 31q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM498 631q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38z M1281 -269q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM669 331q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM820 31q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38z M198 631q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM981 -269q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM369 331q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM520 31 q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM681 -269q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM69 331q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM220 31 q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM381 -269q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM81 -269q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38z" />
+<glyph unicode="&#x26c7;" d="M1931 1449q0 -22 -17.5 -40t-39 -18t-39.5 17.5t-18 38.5q0 55 57 55t57 -53zM1569 1400q0 -53 -57 -53t-57 53q0 22 17.5 40t39.5 18t39.5 -18t17.5 -40zM1704 1262q57 0 57 -55.5t-55.5 -55.5t-55.5 55.5t54 55.5zM1950 1012q0 -57 -54 -57q-21 0 -39 18t-18 38.5 t18.5 39.5t39.5 19t37 -18t16 -40zM1118 1426q0 54 55.5 54t55.5 -55.5t-53 -55.5q-22 0 -40 17.5t-18 39.5zM1708 859q53 0 53 -55.5t-55.5 -55.5t-55.5 55.5t58 55.5zM1896 656q54 0 54 -55.5t-55.5 -55.5t-55.5 53q0 22 17.5 40t39.5 18zM817 1502q54 0 54 -55.5 t-54 -55.5q-23 0 -40 17.5t-17 40.5q0 53 57 53zM499 1458q54 0 54 -55.5t-54 -55.5q-57 0 -57 55q0 21 18 38.5t39 17.5zM178 1480q53 0 53 -55.5t-53 -55.5q-22 0 -40 17t-18 38q0 56 58 56zM365 1246q18 -16 18 -37.5t-17.5 -39.5t-38.5 -18q-55 0 -55 55.5t53 55.5 q22 0 40 -16zM1719 159q0 -516 -695 -516t-695 516q0 297 255 447q-118 119 -118 281q0 110 51 193q141 230 507 230q227 0 377 -95q177 -113 177 -328q0 -166 -114 -281q255 -141 255 -447zM209 1012q0 -57 -54 -57q-21 0 -39 18t-18 38.5t18.5 39.5t39.5 19t37 -18t16 -40 zM344 859q54 0 54 -55.5t-56 -55.5q-20 0 -37.5 17.5t-17.5 38.5q0 55 57 55zM155 656q54 0 54 -55.5t-54 -55.5q-57 0 -57 53q0 22 17.5 40t39.5 18zM1268.5 826.5q25.5 26.5 25.5 60t-25 58.5t-58.5 25t-58.5 -26.5t-25 -59.5t25 -58.5t58 -25.5t58.5 26.5zM895 826.5 q26 26.5 26 60t-25 58.5t-59 25t-58.5 -25.5t-24.5 -59.5t24.5 -59.5t57.5 -25.5t59 26.5z" />
+<glyph unicode="&#x26c8;" d="M1560 -21q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM968 309l-144 -13q-109 0 -183 59q-53 42 -71.5 51.5t-70.5 9.5t-148 -22.5t-145 -22.5q-206 0 -206 122q0 85 320 132q2 57 19.5 86.5t67.5 80.5q98 244 201 244q27 0 50 -10 q15 82 100 168.5t165 86.5q59 0 100 -59q85 148 217 148q94 0 165.5 -62t71.5 -154q0 -39 -11 -74q38 11 86 11q84 0 142 -58t58 -141q0 -54 -26 -110q19 4 37 4q88 0 186.5 -60t98.5 -142q0 -78 -241 -198q-69 -93 -247 -93q-73 0 -196 -19t-131 -20l-206 -445l-80 96 l-313 -347h-39l339 698l71 -87l61 121q-59 19 -98 19zM1260 -21q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM1410 -321q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM1110 -321q-59 0 -59 56q0 91 131 147 q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM660 -21q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM360 -21q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM510 -321q-59 0 -59 56q0 91 131 147 q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM210 -321q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM1943 597q0 54 -78 82q-56 20 -132 20t-130 -59q24 -36 24 -58q0 -102 -144 -102q-87 0 -145 33q-26 15 -26 40t26 33 q113 -38 147 -38q66 0 66 36q0 17 -58 59q53 82 53 158q0 35 -33.5 54t-71.5 19q-84 0 -145 -56q-14 -4 -28 -4q-34 0 -34 25q0 12 11 25q71 84 207 84q66 0 119.5 -39.5t53.5 -103.5q0 -23 -3 -47q45 60 45 110.5t-35.5 93t-86.5 42.5q-118 0 -164 -57q-57 2 -73 32 q49 53 66.5 81.5t17.5 83t-48.5 92.5t-105.5 38q-119 0 -222 -239q-31 139 -105 139q-56 0 -126.5 -69.5t-70.5 -171.5l-47 -62q-33 92 -60 92q-50 0 -96 -99q-61 -134 -67 -141l-36 -39q-12 -17 -15 -52l170 14q4 -8 4 -17q0 -30 -28 -58q-123 0 -311 -34q-42 -6 -96 -16 t-54 -28q0 -49 128 -49q50 0 146 23t146 23q94 0 175.5 -58.5t150.5 -58.5q214 0 214 118q13 18 34 18t37 -18q0 -74 -54 -119q126 -45 176 -45t179.5 22t152.5 22q125 0 167 69l123 69q90 56 90 88zM1179 256l-66 18l-97 -197l-71 87l-196 -404l200 222l66 -80zM900 876 q-6 0 -12 2q-6 63 -13 63q-40 0 -58 -60q-10 -46 -19 -92q-9 -34 -42 -36q-19 39 -25 39q-27 0 -43 -43l-17 -65q-25 -84 -91 -148q63 331 153 331q8 0 16 -3q13 52 46.5 102t75.5 50q71 0 70 -108q-12 -32 -41 -32z" />
+<glyph unicode="&#x26c9;" horiz-adv-x="1566" d="M1454 1292l-100 -801l-571 -541l-571 541l-100 801h1342zM1341 1192h-1116l82 -653l476 -451l476 451z" />
+<glyph unicode="&#x26ca;" horiz-adv-x="1566" d="M1454 1292l-100 -801l-571 -541l-571 541l-100 801h1342z" />
+<glyph unicode="&#x26cb;" d="M1928 -262q0 -24 -18 -42t-42 -18h-1688q-24 0 -42 18t-18 42v1688q0 24 18 42t42 18h1688q24 0 42 -18t18 -42v-1688zM1808 -202v1568h-1568v-1568h1568zM1768 582q0 -25 -17 -42l-685 -685q-17 -17 -42 -17t-42 17l-685 685q-17 17 -17 42t17 42l685 685q17 17 42 17 t42 -17l685 -685q17 -17 17 -42zM1638 582l-614 614l-614 -614l614 -614z" />
+<glyph unicode="&#x26cc;" d="M1134 692v129l326 326h129v-129l-326 -326h-129zM1588 16h-129l-999 1003v129h127l1001 -1003v-129zM459 17v129l326 326h129v-129l-326 -326h-129z" />
+<glyph unicode="&#x26cd;" d="M1279 1172v-59l-73 -47q-11 42 -36 106h109zM1227 801h-20v-35h-50v-109h-142v109h-682v-109h-142v109h-50v35h-20v67h20v127q0 92 139 382q160 28 394 28t394 -28q139 -290 139 -382v-127h20v-67zM1984 -312h-1173l587 944zM69 1172h109q-25 -64 -36 -106l-73 47v59z M1166 882v98h-164v-98h164zM674 1349q-230 0 -353 -17q-63 -113 -95 -218q205 9 448 9t448 -9q-32 105 -95 218q-123 17 -353 17zM961 942v38h-574v-38h574zM961 882v38h-574v-38h574zM1207 821v27h-1066v-27h1066zM1779 -197l-381 612l-381 -612h762zM346 882v98h-164v-98 h164z" />
+<glyph unicode="&#x26ce;" d="M1917 634q0 -118 -77.5 -197.5t-195.5 -79.5q-39 0 -132 23v-214q0 -201 139 -201q85 0 136 77q-31 -203 -294 -203q-173 0 -247 160q-90 -160 -349 -160q-111 0 -189 33q-106 46 -106 141v745q-28 17 -94 38t-95 21q-69 0 -117.5 -44.5t-48.5 -112.5q0 -92 99 -202 l-75 -76q-59 49 -99.5 130t-40.5 155q0 116 77.5 195.5t193.5 79.5q41 0 115.5 -20.5t84.5 -22.5v469h264v-573l380 -177v750h266v-853q101 -33 123 -33q69 0 117.5 44t48.5 113q0 95 -99 202l76 75q139 -124 139 -282zM1246 144v332l-380 173v-548q0 -115 156 -115 q80 0 152 42t72 116z" />
+<glyph unicode="&#x26cf;" d="M1960 -179l-179 -176l-1120 1113q-282 -330 -484 -875l-89 17q8 289 93 588.5t238 511.5l-311 433l61 64l422 -317q272 203 555 275q227 57 618 60l22 -90q-535 -101 -945 -484z" />
+<glyph unicode="&#x26d0;" d="M1958 871l-29 -51l-87 -5q12 44 22 110zM1005 1421q-51 -41 -84 -74l-40 78l30 51zM1878 1154q-24 -321 -70 -401l-64 -110l17 -10l-33 -58l-17 10l-18 -30l-43 25l-55 -94l-123 71l55 94l-591 341l-54 -94l-123 71l54 94l-43 25l17 30l-17 10l34 58l17 -10l63 110 q48 81 312 262q159 -58 355.5 -171.5t326.5 -222.5zM1776 -374h-160v155q0 159 -135 159h-315v160h315q138 0 216.5 -89.5t78.5 -229.5v-155zM816 562h-413q-86 0 -115 -53q-20 -38 -20 -130t21 -125q28 -45 114 -45h253v-160h-253q-140 0 -217.5 79.5t-77.5 219.5v65 q0 140 78.5 224.5t216.5 84.5h413v-160zM1300 300h-197q-73 0 -94 -28.5t-21 -100.5v-230q0 -139 -88 -229t-227 -90h-633v160h633q72 0 113.5 43t41.5 116v230q0 289 275 289h197v-160zM1820 1135q-98 76 -298 191.5t-313 161.5q-111 -66 -191 -141q392 -204 775 -448 q25 109 27 236zM1765 761l-142 82l-49 -85l142 -82zM1587 863l-497 287l-19 -33l497 -287zM1557 811l-497 287l-19 -33l497 -287zM1734 626l-923 533l-14 -23l924 -533zM1054 1171l-142 82l-49 -85l142 -82z" />
+<glyph unicode="&#x26d1;" d="M1995 524h-220q-7 -112 -33 -216q-70 -277 -255 -438.5t-463 -161.5t-463 161.5t-255 438.5q-26 104 -33 216h-220v81q90 41 208 100q4 106 14 161q35 191 168 350q215 257 581 257t581 -257q133 -159 168 -350q10 -55 14 -161q118 -59 208 -100v-81zM1363 899v179h-243 v241h-193v-243h-242v-178h242v-242h194v243h242zM1621 524h-1194q0 -62 24 -166q51 -226 201.5 -372.5t371.5 -146.5t371.5 146.5t201.5 372.5q24 104 24 166z" />
+<glyph unicode="&#x26d2;" d="M1948 582q0 -385 -269.5 -654.5t-654.5 -269.5t-654.5 269.5t-269.5 654.5t269.5 654.5t654.5 269.5t654.5 -269.5t269.5 -654.5zM1024 1294q-245 0 -436 -147l326 -326v-129h-129l-326 326q-147 -191 -147 -436t148 -437l1001 1001q-192 148 -437 148zM1736 582 q0 245 -148 437l-1001 -1001q192 -148 437 -148t436 147l-326 326v129h129l326 -326q147 191 147 436z" />
+<glyph unicode="&#x26d3;" d="M1778 114q0 -377 -240 -388v-80h-119v76q-244 19 -244 396q0 325 179 375q22 5 65 17v154q-32 6 -94 28q-150 75 -150 376.5t168 364.5q2 1 76 22v77h119v-77q72 -18 101 -34q139 -76 139 -361q0 -369 -244 -392v-158q6 -2 21 -6q132 -31 184 -147q39 -87 39 -243z M873 -354h-130q-9 74 -17 148q-19 76 -88 113h-9q-5 -59 -6 -64q-10 -27 -50.5 -27t-52.5 29q-6 14 -10 62q-71 -20 -93 -108q-6 -24 -17 -153h-130v59q0 9 5 44q19 130 69 197.5t169 90.5v155l-10 5q-129 11 -188 144q-45 99 -45 248q0 368 244 390v158l-50 12 q-100 26 -147 125t-47 195v63h130l14 -154q19 -80 96 -111q3 48 10 64q13 30 52 30t49 -30l8 -64q72 21 96 110q9 33 18 155h130v-53q0 -33 -12 -94q-42 -214 -211 -243q-8 -1 -24 -8v-153q0 -4 25.5 -4t71.5 -24q150 -78 150 -366q0 -332 -216 -387q-20 -5 -31 -9v-150 q25 -7 75 -23q172 -61 172 -372zM1574 811q74 50 74 238.5t-70 253.5q-20 18 -43 18q0 -48 -6 -63q-11 -27 -52 -27q-59 0 -59 84v6h-13q-99 -43 -99 -274.5t112 -248.5q0 46 7 63q12 28 52 28q58 0 58 -83v-8h13q7 0 26 13zM1535 -147q113 20 113 263t-113 263q1 -15 1 -22 q0 -72 -59 -72q-60 0 -60 73q0 10 1 21q-112 -19 -112 -264t112 -262q-1 11 -1 19q0 75 61 75q57 0 57 -85v-9zM742 587q0 89 -21 159q-31 99 -95 106q2 -21 2 -35q0 -59 -57 -59q-59 0 -59 73q0 10 1 21q-113 -20 -113 -253.5t112 -272.5v26q0 64 59 64q42 0 52 -28 q6 -14 3 -62h13q11 0 32 15q71 50 71 246z" />
+<glyph unicode="&#x26d4;" d="M1948 582q0 -385 -269.5 -654.5t-654.5 -269.5t-654.5 269.5t-269.5 654.5t269.5 654.5t654.5 269.5t654.5 -269.5t269.5 -654.5zM1754 412v344h-1460v-344h1460z" />
+<glyph unicode="&#x26d5;" d="M1361 183q0 71 -53 71h-303q-12 0 -41 6q-133 28 -214 122t-81 220t64.5 216t175.5 129q48 17 70 17h311q71 0 71 82v450h275v-603q0 -2 -6 -25q-15 -59 -64 -108.5t-106 -49.5h-365q-151 0 -151 -101q0 -46 35.5 -72t83.5 -26h386l26 -6q115 -25 149 -129q12 -37 12 -51 v-401l194 192l82 -89l-411 -400l-415 397q33 44 81 92l194 -192v259zM690 947q-159 -132 -159 -341t159 -331v-592h-277v1572l-192 -189l-85 88l415 401l415 -401l-81 -88l-195 192v-311z" />
+<glyph unicode="&#x26d6;" d="M1980 582q0 -36 -30 -67l-854 -871q-28 -29 -72 -29t-72 29l-854 871q-30 31 -30 67t30 67l854 871q28 29 72 29t72 -29l854 -871q30 -31 30 -67zM1345 1068h-179v-754l-175 108v-79l264 -303l264 303v79l-174 -108v754zM703 96h179v754l175 -108v79l-264 303l-264 -303 v-79l174 108v-754z" />
+<glyph unicode="&#x26d7;" d="M1980 582q0 -36 -30 -67l-854 -871q-28 -29 -72 -29t-72 29l-854 871q-30 31 -30 67t30 67l854 871q28 29 72 29t72 -29l854 -871q30 -31 30 -67zM1876 582l-852 868l-852 -868l852 -868zM1166 1068h179v-754l174 108v-79l-264 -303l-264 303v79l175 -108v754zM882 96 h-179v754l-174 -108v79l264 303l264 -303v-79l-175 108v-754z" />
+<glyph unicode="&#x26d8;" d="M1875 -353h-803v189h-96v-189h-803v1072l336 422v375h467v-192h96v192h803v-1869zM1072 988v192h-96v-192h96zM1072 656v188h-96v-188h96zM1072 320v188h-96v-188h96zM1072 -16v188h-96v-188h96z" />
+<glyph unicode="&#x26d9;" d="M1072 1324h-96v192h96v-192zM1875 -353h-166v1869h166v-1869zM1072 988h-96v192h96v-192zM1072 656h-96v188h96v-188zM1072 320h-96v188h96v-188zM1072 -16h-96v188h96v-188zM339 -353h-166v1072l336 422v375h166v-433l-336 -422v-1014zM1072 -353h-96v189h96v-189z" />
+<glyph unicode="&#x26da;" d="M1948 1132h-131q-97 0 -170 69t-73 166v139h374v-374zM474 1367q0 -97 -73 -166t-170 -69h-131v374h374v-139zM1948 -342h-374v139q0 97 73 166t170 69h131v-374zM474 -342h-374v374h131q97 0 170 -69t73 -166v-139z" />
+<glyph unicode="&#x26db;" d="M1927 1315q0 -24 -15 -51l-818 -1466q-27 -49 -70 -49t-70 49l-818 1466q-15 27 -15 51q0 68 84 68h1638q84 0 84 -68zM1706 1223h-1364l682 -1222z" />
+<glyph unicode="&#x26dc;" d="M1405 1324h-96v192h96v-192zM2002 -353h-166v1869h166v-1869zM1405 988h-96v192h96v-192zM1405 656h-96v188h96v-188zM1405 320h-96v188h96v-188zM1405 -16h-96v188h96v-188zM1405 -353h-96v189h96v-189zM212 -353h-166v842l666 682v345h166v-413l-666 -682v-774z M878 -353h-166v495h166v-495z" />
+<glyph unicode="&#x26dd;" d="M1958 -352h-1868v1868h1868v-1868zM1717 1416h-1386l693 -693zM1858 -111v1386l-693 -693zM883 582l-693 693v-1386zM1717 -252l-693 693l-693 -693h1386z" />
+<glyph unicode="&#x26de;" d="M1958 -352h-1868v1868h1868v-1868zM1948 582q0 385 -269.5 654.5t-654.5 269.5q-327 0 -580 -203l1301 -1301q203 253 203 580zM100 582q0 -385 269.5 -654.5t654.5 -269.5q327 0 580 203l-1301 1301q-203 -253 -203 -580z" />
+<glyph unicode="&#x26df;" d="M1948 172h-100v37q0 98 -65 169t-162 71q-124 0 -188 -120v499h195q54 0 75 -50l101 -245q71 0 96 -9q48 -16 48 -73v-279zM1809 198q0 -81 -54 -139.5t-134 -58.5t-134 58.5t-54 139.5t54 139.5t134 58.5t134 -58.5t54 -139.5zM1398 172h-795v37q0 98 -65.5 169 t-162.5 71t-162.5 -71t-65.5 -169v-37h-47v769h1298v-769zM560 198q0 -81 -54 -139.5t-134 -58.5t-134 58.5t-54 139.5t54 139.5t134 58.5t134 -58.5t54 -139.5zM1466 775v-242h297l-92 242h-205z" />
+<glyph unicode="&#x26e0;" d="M1426 1118h-96v192h96v-192zM1426 786h-96v188h96v-188zM1426 450h-96v188h96v-188zM1979 -353h-115v1754h-976v-283l-220 -216l-598 614h1909v-1869zM1426 114h-96v188h96v-188zM1426 -223h-96v189h96v-189z" />
+<glyph unicode="&#x26e1;" d="M150 -242v1819l571 -577l-478 -432v-716h97l588 491v-490h792l-659 644l74 74l834 -813h-1819z" />
+<glyph unicode="&#x26e2;" horiz-adv-x="1326" d="M1093 578.5q147 -164.5 147 -394t-169 -398.5t-408 -169t-408 169t-169 398.5t147 394t366 188.5v447q-182 -143 -402 -238v91q370 279 440 468h52q70 -189 440 -468v-91q-220 95 -402 238v-447q219 -24 366 -188.5zM1120 194q0 189 -134 323t-323 134t-323 -134 t-134 -323t134 -323t323 -134t323 134t134 323zM820 194q0 -65 -46 -111t-111 -46t-111 46t-46 111t46 111t111 46t111 -46t46 -111z" />
+<glyph unicode="&#x26e3;" d="M1640 1184q0 -68 -47.5 -116t-115.5 -48t-116 48t-48 116t48 116t116 48t115.5 -48t47.5 -116zM687.5 1298.5q47.5 -49.5 47.5 -117.5t-46.5 -114.5t-115.5 -46.5t-117 47.5t-48 116t48.5 116.5t116 48t115 -49.5zM1661 322q0 -261 -187 -449t-449 -188t-450 187 t-188 440.5t157.5 432t400.5 205.5v561h163v-558q0 -5 15 -5h4q303 -56 447 -306q87 -151 87 -320zM1358 -13q139 138 139 332.5t-139.5 335t-332.5 140.5t-333.5 -140.5t-140.5 -332.5t140.5 -332.5t334 -140.5t332.5 138z" />
+<glyph unicode="&#x26e4;" d="M1948 789l-571 -415l218 -671l-571 415l-571 -415l218 671l-571 415h706l218 672l218 -672h706zM1579 669h-298l57 -175zM1116 789l-92 283l-92 -283h184zM1236 420l-81 249h-262l-81 -249l212 -154zM1367 17l-92 283l-149 -108zM767 669h-298l241 -175zM922 192 l-149 108l-92 -283z" />
+<glyph unicode="&#x26e5;" d="M1331 514l-102 -73l-205 631l-85 -263h-127l212 652zM1948 789l-805 -585l-102 74l538 391h-278l-39 120h686zM1595 -297l-805 585l39 119l538 -390l-86 264l102 74zM1134 669h-665l225 -163l-39 -120l-555 403h995zM1008 106l-555 -403l307 946h126l-205 -632l225 163z " />
+<glyph unicode="&#x26e6;" d="M1948 789l-555 -403l-39 120l225 163h-665l39 120h995zM1236 809h-127l-85 263l-205 -631l-102 73l307 947zM1595 -297l-555 403l102 74l225 -163l-205 632h126zM1007 278l-102 -74l-805 585h686l-39 -120h-278zM1258 288l-805 -585l212 652l102 -74l-86 -264l538 390z " />
+<glyph unicode="&#x26e7;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x26e8;" horiz-adv-x="1566" d="M1454 371q0 -206 -229.5 -433t-441.5 -268q-212 41 -441.5 268t-229.5 433v1051h1342v-1051zM1339 371v936h-1112v-936q0 -161 193 -348.5t363 -234.5q170 47 363 234.5t193 348.5zM1222 619h-342v-343h-194v342h-342v178h342v343h193v-341h343v-179z" />
+<glyph unicode="&#x26e9;" d="M2016 1205h-323v-1541h-204v950h-930v-950h-202v1539h-325v181h1984v-179zM1488 800v404h-928v-404h928z" />
+<glyph unicode="&#x26ea;" d="M1976 230h-111v-520h-379v546l-464 355l-464 -355v-546h-377v518h-109v51l873 616v285h-231v156h230v202h155v-199h231v-157h-230v-287l876 -616v-49zM1254 -290h-460v371q0 80 73 137.5t155.5 57.5t157 -57.5t74.5 -137.5v-371z" />
+<glyph unicode="&#x26eb;" d="M1886 -273h-180v1102h-386v450h-590v-448h-386v-1104h-182v1275h386v449h952v-447h386v-1277z" />
+<glyph unicode="&#x26ec;" d="M1206 1283q75 -75 75 -180.5t-76.5 -180t-180.5 -74.5t-180.5 74.5t-76.5 180t75 180.5t182 75t182 -75zM1737.5 384.5q75.5 -75.5 75.5 -180t-75 -179.5t-180 -75t-180 76t-75 182t74 179t179.5 73t181 -75.5zM672.5 385.5q76.5 -74.5 76.5 -178.5t-78.5 -180.5 t-181.5 -76.5t-178.5 75.5t-75.5 179.5t75.5 179.5t180.5 75.5t181.5 -74.5z" />
+<glyph unicode="&#x26ed;" horiz-adv-x="1610" d="M1570 508h-252q-24 -132 -98 -237l176 -176l-104 -105l-177 177q-113 -77 -236 -98v-252h-148v252q-123 21 -236 98l-177 -177l-105 105l177 176q-74 105 -98 237h-252v148h252q24 132 98 237l-177 176l105 105l177 -177q113 77 236 98v252h148v-252q123 -21 236 -98 l177 177l104 -105l-176 -176q74 -105 98 -237h252v-148zM1074 313q111 111 111 269.5t-110.5 269t-269.5 110.5t-269.5 -110.5t-110.5 -269t111 -269.5t269 -111t269 111z" />
+<glyph unicode="&#x26ee;" d="M1937 508h-400q-24 -132 -98 -237l176 -176l-104 -105l-177 177q-113 -77 -236 -98v-252h-148v252q-123 21 -236 98l-177 -177l-105 105l177 176q-74 105 -98 237h-252v-304h-148v452h400q24 132 98 237l-177 176l105 105l177 -177q113 77 236 98v252h148v-252 q123 -21 236 -98l177 177l104 -105l-176 -176q74 -105 98 -237h252v304h148v-452zM1293 313q111 111 111 269.5t-110.5 269t-269.5 110.5t-269.5 -110.5t-110.5 -269t111 -269.5t269 -111t269 111z" />
+<glyph unicode="&#x26ef;" horiz-adv-x="1610" d="M1570 508h-252q-24 -132 -98 -237l176 -176l-104 -105l-177 177q-113 -77 -236 -98v-252h-148v252q-123 21 -236 98l-177 -177l-105 105l177 176q-74 105 -98 237h-252v148h252q24 132 98 237l-177 176l105 105l177 -177q113 77 236 98v252h148v-252q123 -21 236 -98 l177 177l104 -105l-176 -176q74 -105 98 -237h252v-148zM1074 313q111 111 111 269.5t-110.5 269t-269.5 110.5t-269.5 -110.5t-110.5 -269t111 -269.5t269 -111t269 111zM933 710q52 -52 52 -127.5t-52.5 -128t-127.5 -52.5t-127.5 52.5t-52.5 128t52 127.5t128 52t128 -52 z" />
+<glyph unicode="&#x26f0;" d="M1997 -224h-1590q26 86 91 251q17 35 72 108t71 112q3 52 10 129l62 207l22 81q22 79 70 142.5t69 119.5q4 11 39 158q15 62 70 189.5t68 199.5l51 60q66 -34 176.5 -182.5t156.5 -242.5q28 -71 90 -211l122 -212q101 -190 140 -313q16 -90 62 -266q17 -51 74 -158.5 t74 -171.5zM883 999q-13 -43 -48 -124q-32 -40 -86 -127q-6 -12 -50 -159q-24 -69 -62 -209q-3 -17 -9 -125q-51 -71 -142 -220q-23 -46 -51.5 -135t-43.5 -124h-340q31 70 82 215q8 62 33 183q35 122 171 297q9 56 43.5 153.5t41.5 128t19 72.5q8 21 51 90.5t68 115.5 t39 103l54 48q90 -34 230 -183z" />
+<glyph unicode="&#x26f1;" d="M1982 -272h-1916v179h718l178 649q-24 9 -68 9q-115 0 -181 -33q-62 85 -158.5 139.5t-198 54.5t-168.5 -31q29 123 95.5 250t186.5 218t244.5 125t245 34t199.5 -19q18 63 42 137q19 32 54 32q69 0 69 -59q0 -10 -35 -142q255 -95 415 -272q182 -200 182 -451 q0 -147 -61 -291q-131 160 -348 160q-110 0 -186 -41q-61 92 -196 156l-174 -623h1061v-181zM1760 473l4 54q0 207 -118 360t-319 238q100 -178 100 -373q0 -107 -25 -219q71 5 100 5q138 0 258 -65zM1311 770q0 209 -120 402q-134 -75 -240.5 -207t-141.5 -276q40 6 101 6 q212 0 372 -135q29 115 29 210zM943 1210q-407 0 -590 -359q187 -6 342 -128q40 148 137.5 280t225.5 199q-101 8 -115 8z" />
+<glyph unicode="&#x26f2;" d="M1927 894h-101v142q0 127 -65 236q-74 125 -191 137v94h13q38 0 95 -22q201 -78 243 -377q6 -42 6 -43v-167zM1399 1409q-10 2 -20 2q-60 0 -111.5 -77.5t-51.5 -149.5q0 -12 2 -23h-105v17q0 123 83 223.5t203 101.5v-94zM931 1161h-101q1 6 1 19q0 75 -55.5 152 t-127.5 77v94h8q96 0 172.5 -79.5t96.5 -177.5l6 -28v-57zM1120 847l173 -2v-176h-538v176q182 0 181 1v180h176v-180q1 1 8 1zM222 1045v-151h-101v170q0 13 4.5 37.5t5.5 33.5q10 115 98 232t196 129q29 3 49 7l4 -93q-115 -10 -185.5 -125.5t-70.5 -239.5zM1927 520 q0 -17 -26 -52q-76 -101 -190 -146q-47 -19 -234 -60q-2 -2 -2 -5l66 -447h229v-157h-1492v157h225l70 446l-117 28q-157 40 -248 114q-17 14 -52 59t-35 60v72h1806v-69z" />
+<glyph unicode="&#x26f3;" d="M1087 837v-700q0 -18 -32.5 -32.5t-56.5 -14.5t-53.5 17.5t-29.5 42.5v1406l873 -719h-701zM1968 86q0 -224 -305 -353q-239 -102 -502 -102h-274q-19 0 -56 4.5t-52 5.5q-237 12 -441 114q-258 128 -258 331q0 150 192 271q156 100 331 128q54 6 154 22q1 -140 5 -419 q1 -21 20 -56q29 -53 92.5 -85.5t109.5 -32.5t94 10t107.5 64t59.5 104v415q14 -4 43 -6q203 -13 416 -117q264 -128 264 -298z" />
+<glyph unicode="&#x26f4;" d="M2005 494q0 -4 -8 -46q-58 -304 -192 -515h-1483q-209 264 -279 599h221v80h140l63 421h301v281h258v-281h717l48 -421h94v-98h120v-20zM1366 853v-218h261l-23 218h-238zM1223 635v218h-238v-218h238zM844 635v218h-232l-29 -218h261z" />
+<glyph unicode="&#x26f5;" d="M1936 204q0 -3 -35 -61q-155 -256 -345 -479h-868q-5 0 -69 52q-291 235 -503 481v90h903v1283l906 -1126h-793v-155h804v-85zM922 444h-810l810 1030v-1030zM1133 547h562l-562 718v-718zM812 547v633l-477 -633h477zM745 -229h751q195 229 291 409h-1498 q131 -157 369 -343q85 -66 87 -66z" />
+<glyph unicode="&#x26f6;" d="M1966 861h-168v399q0 36 -34.5 66t-70.5 30h-390v168h448q71 0 143 -65.5t72 -135.5v-462zM745 1356h-390q-36 0 -70.5 -30t-34.5 -66v-399h-168v462q0 70 72 135.5t143 65.5h448v-168zM1966 -159q0 -70 -72 -135.5t-143 -65.5h-448v168h390q36 0 70.5 30t34.5 66v399 h168v-462zM745 -360h-448q-71 0 -143 65.5t-72 135.5v462h168v-399q0 -36 34.5 -66t70.5 -30h390v-168z" />
+<glyph unicode="&#x26f7;" d="M524 1485q65 -65 65 -159.5t-62.5 -156.5t-157 -62t-159.5 64.5t-65 156t65.5 157t157 65.5t156.5 -65zM77 590l137 5l235 324q32 44 91 135q8 29 33 82q92 133 190 133q65 0 115 -32l290 -207q92 -62 119 -88q61 -60 61 -123.5t-81 -174.5q6 -3 5 -3t341 14l24 62 q16 35 51.5 35t54.5 -45t19 -86.5t-18.5 -82.5t-51 -41t-51.5 29.5t-20 60.5q-16 5 -182.5 5t-220.5 -20q-27 -10 -59.5 -64.5t-32.5 -55.5l380 -173l412 230q20 -25 53 -83l-867 -483q-368 -196 -594 -281q-37 -14 -120 -14t-160 35q9 16 18 54q65 -8 110 -8t97 18t126 52 l397 195q34 13 91 54q13 16 26.5 54t17.5 47v12q-29 23 -123.5 58.5t-132.5 63.5q-64 48 -64 122q0 54 77 152l-377 -9q-16 -1 -47 -6q-14 -10 -42 -27q-31 -14 -75.5 -14t-93.5 17t-54 17h-104v55zM539 608q70 0 198 8.5t179 9.5q11 15 27 44l-267 181l-177 -243h40z" />
+<glyph unicode="&#x26f8;" d="M1993 -309h-1938v36q0 54 56 148.5t108 94.5h380v193h-8q-49 0 -137 10q-198 54 -198 252q0 232 217 322q79 33 315 76q33 3 65.5 7.5t61.5 24.5q19 14 19 51v512h784v-1043q0 -62 -53.5 -130t-113.5 -68v-207h283q14 0 53.5 -26.5t72.5 -95.5t33 -110v-47zM1360 -29v195 h-568v-195h568z" />
+<glyph unicode="&#x26f9;" d="M1060.5 1458q62.5 -64 62.5 -152t-63.5 -152.5t-150 -64.5t-151 65t-64.5 151t64.5 151.5t152 65.5t150 -64zM1754 662q57 -57 57 -134.5t-59 -136t-136.5 -58.5t-133.5 57t-56 138t54.5 136t135.5 55t138 -57zM1930 -299h-697q-115 0 -152 89q-12 28 -45 141l-98 339 h-54q-36 -112 -102 -337q-31 -120 -55 -158q-45 -74 -139 -74h-470v79h358l200 687v312l-353 -418q-106 43 -106 141q0 39 39 85l112 132l128 160q95 114 145.5 144t114.5 30h975q-51 -191 -125 -191h-467v-387l210 -695h581v-79z" />
+<glyph unicode="&#x26fa;" d="M1972 611l-101 -866l-654 46v579l-520 32v-574l-621 41l945 1572l949 -814q2 -2 2 -10v-6zM1872 576l-747 673l663 -1322z" />
+<glyph unicode="&#x26fb;" d="M1525.5 -203q-223.5 -154 -501 -154t-506 155t-320.5 413q142 50 232 149.5t90 238t-92 239.5t-230 146q98 261 322 414.5t502 153.5t507 -155.5t321 -412.5q-137 -39 -229.5 -144t-92.5 -243.5t90.5 -239t231.5 -146.5q-101 -260 -324.5 -414zM1024 1395 q-194 0 -355 -89.5t-261 -254.5q108 -49 190.5 -188.5t82.5 -264.5t-81 -263.5t-192 -191.5q90 -160 257.5 -251.5t358.5 -91.5t352 89t259 254q-115 63 -191.5 193t-76.5 261q0 262 241 436q10 7 28 24q-217 338 -612 338z" />
+<glyph unicode="&#x26fc;" d="M1454 726h-862v167h336v598h192v-597h334v-168zM2030 -308h-862v167h332v603h193v-601h337v-169zM877 -308h-859v167h337v603h186v-603h336v-167z" />
+<glyph unicode="&#x26fd;" d="M1970 602q4 -172 4 -317.5t-35 -225.5q-53 -122 -202 -122q-115 0 -169 77q-41 59 -55 170t-14 126v269q0 295 -85 295h-102v-1063h333v-134h-1571v132h310v1400l7 29q18 78 84.5 154t139.5 76h465q60 0 122 -60q85 -83 102 -175q7 -36 7 -27v-182q68 -1 196 -24 q69 -26 95 -100q37 -106 43 -267v-269q0 -166 29 -241q21 -53 67 -53q87 0 87 187q0 405 -34 679q-7 59 -44.5 115.5t-82.5 78.5t-296 106l47 132q94 -29 276 -98q167 -74 223 -218q35 -93 43 -315q2 -56 4 -81zM1114 898v241h-533v-241h533z" />
+<glyph unicode="&#x26fe;" d="M1973 -354h-1898v1900h1898v-1900zM1869 757q0 134 -69 220t-200 86h-115v137h-1066v-559q0 -130 106 -244.5t237 -145.5q42 -10 112 -10h177q101 0 199.5 35t138 79t63.5 100h165q9 0 38 6q214 45 214 296zM1853 131q0 66 -113 104l-169 40q-134 -183 -575 -183 q-524 0 -604 183l-146 -40q-90 -34 -90 -108.5t126 -132.5q268 -123 731.5 -123t729.5 132q110 55 110 128zM1711 759q0 -142 -107 -142h-118v283h118q53 0 80 -42.5t27 -98.5z" />
+<glyph unicode="&#x26ff;" d="M1760 323q-164 0 -473.5 97.5t-473.5 97.5q-255 0 -487 -208v-720h-116v1984h116v-197q242 197 484 197q162 0 468 -101t468 -101q36 0 92 5v-1051q-45 -3 -78 -3zM1722 1256q-154 5 -452 103.5t-447 98.5t-275 -70q-78 -43 -222 -161v-177q225 174 487 174 q164 0 462 -93.5t447 -100.5v226zM1722 666q-154 5 -452 103.5t-447 98.5t-275 -70q-78 -43 -222 -161v-177q225 174 487 174q164 0 462 -93.5t447 -100.5v226z" />
+<glyph unicode="&#x2700;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2701;" horiz-adv-x="2051" d="M553 442q-42 0 -42 -36q0 -10 3 -21q8 -34 8 -59q0 -81 -55 -130t-141 -49t-156 66t-70 150t55 130t135 46q40 0 122 -20.5t122 -20.5q143 0 260 125q-26 58 -92 116q-102 90 -258 129q-47 10 -137 41q-139 66 -139 195q0 74 51 121t132 47t153.5 -67t72.5 -154 q0 -37 -19.5 -79.5t-19.5 -47.5q0 -28 137 -78q87 -32 228 -168l645 37q14 1 29 1q185 0 374 -130l-850 -109l199 -229l-190 -17l-207 234l-291 -23h-59zM225 1092q0 -58 63 -103t117.5 -45t81.5 35.5t27 88.5t-55.5 101t-114.5 48q-119 0 -119 -125zM421.5 240.5 q38.5 35.5 38.5 97t-50.5 102.5t-112 41t-100 -32.5t-38.5 -90.5t52.5 -105.5t112 -47.5t98 35.5z" />
+<glyph unicode="&#x2702;" horiz-adv-x="2027" d="M1728 340q-86 0 -225 51l-612 225q-8 -3 -132.5 -45.5t-209.5 -52.5q-48 -5 -48 -37q0 -6 16.5 -45.5t16.5 -70.5q0 -87 -61.5 -143t-151 -56t-152.5 50t-63 140q0 142 135 199q55 24 173 24q18 0 36 -1h25q128 0 194 38q72 42 84 97q-26 68 -100 101q-70 32 -145 32h-9 l-129 -4h-15q-88 0 -146 32q-109 60 -109 164.5t61.5 158.5t151 54t152.5 -55t63 -135q0 -32 -15.5 -74.5t-15.5 -48.5q0 -32 78 -37q116 -8 316 -94l618 231q150 56 227 56q101 0 191 -84l-774 -297l774 -289q-73 -84 -199 -84zM427 950q35 41 35 103.5t-46 99.5t-108.5 37 t-102 -39.5t-39.5 -100.5t50.5 -101t113 -40t97.5 41zM424 268.5q43 39.5 43 102t-37.5 101t-101.5 38.5t-111 -46.5t-47 -108t44.5 -94t105.5 -32.5t104 39.5z" />
+<glyph unicode="&#x2703;" horiz-adv-x="2051" d="M538 496q0 -5 19.5 -47.5t19.5 -79.5q0 -88 -72.5 -155t-153.5 -67t-132 47t-51 121q0 129 139 195q30 14 137 41q156 39 258 129q65 57 92 117q-117 125 -260 125q-40 0 -122 -20.5t-122 -20.5q-80 0 -135 46t-55 130t70 149.5t156 65.5t141 -48.5t55 -129.5 q0 -26 -8 -60q-3 -11 -3 -21q0 -36 42 -36h59l291 -23l207 234l190 -17l-199 -229l850 -108q-188 -130 -374 -130q-14 0 -29 1l-645 36q-141 -136 -228 -168l-79 -28q-58 -24 -58 -49zM409.5 979.5q50.5 41.5 50.5 103t-38.5 96.5t-98 35t-112 -47.5t-52.5 -105t38.5 -90.5 t100 -33t112 41.5zM458.5 250.5q55.5 47.5 55.5 100.5t-27 88.5t-81.5 35.5t-117.5 -44.5t-63 -102.5q0 -125 119 -125q59 0 114.5 47.5z" />
+<glyph unicode="&#x2704;" horiz-adv-x="2064" d="M1665 154q-139 0 -310 114l-370 246l-45 -27q-72 -43 -88.5 -43t-58 9.5t-78 9.5t-72.5 -14q61 -88 61 -196.5t-90.5 -180.5t-220 -72t-208.5 85t-79 226q0 166 135 248q102 62 303 62h19h7q148 0 148 84q0 73 -147 81q-108 6 -179 15t-126 35q-166 78 -166 274 q0 135 82.5 221t209.5 86t218.5 -76.5t91.5 -195.5q0 -89 -59 -176q25 -11 60.5 -11t98.5 13.5t78 13.5q48 0 103 -55l313 182q222 129 375 129q195 0 293 -147l-668 -396l655 -419q-45 -55 -128 -90t-158 -35zM1677 203q95 0 192 67l-626 400l-211 -129l301 -199 q210 -139 344 -139zM1898 1112q-103 72 -214.5 72t-340.5 -133l-579 -336v-15q0 -97 -92 -124q-36 -10 -146.5 -12.5t-166 -10.5t-101.5 -37q-105 -66 -105 -213q0 -114 67.5 -183t173.5 -69t175.5 61.5t69.5 156t-47 151.5q-15 15 -15 29q0 29 51 46q43 14 114 14h26 q53 -2 77 -2q16 0 20 1q9 2 52 27zM929 901q-22 27 -50.5 27t-83 -10.5t-72.5 -10.5q-150 0 -150 60q0 6 31 50.5t31 115.5q0 102 -71 166.5t-175.5 64.5t-172 -70.5t-67.5 -175.5q0 -167 131 -229q63 -30 178 -35l86 -4q71 -3 106 -12q62 -14 89 -52zM1055 790.5 q26 -30.5 26 -70.5t-24.5 -76t-65.5 -36t-66.5 31.5t-25.5 75.5t24.5 75t65 31t66.5 -30.5zM519.5 1255q53.5 -52 53.5 -130t-52.5 -131.5t-130 -53.5t-129.5 56t-52 130.5t55 127.5t128.5 53t127 -52zM524 416q53 -55 53 -129t-52 -127.5t-127.5 -53.5t-130 53t-54.5 130 t53.5 129.5t129 52.5t128.5 -55zM989 784q-51 0 -51 -58t48 -58t48 58t-45 58zM493.5 1035q36.5 38 36.5 89.5t-36 91t-87.5 39.5t-90 -35.5t-38.5 -89.5t35.5 -93.5t89.5 -39.5t90.5 38zM495.5 193.5q38.5 35.5 38.5 87.5t-33 93.5t-86.5 41.5t-93 -35t-39.5 -89t35.5 -94 t87.5 -40t90.5 35.5z" />
+<glyph unicode="&#x2705;" horiz-adv-x="1787" d="M1687 1239q0 -40 -14 -60l-184 -200l-498 -524l-266 -256q-237 -228 -297 -228h-2l-47 4q-43 4 -140 82q-43 34 -82 80q-18 21 -18 76l-29 248q-12 105 -12 184q0 27 2 51q5 95 10 107.5t52 68.5t67 76t62 33.5t83 13.5t70 -20q29 -25 29 -62.5t20 -154.5l19 -111 q4 -35 26 -90q24 -27 56 -27q15 0 43 27l747 727l158 131q35 29 80.5 29t55 -12t9.5 -60v-133zM1587 1232v90l-136 -113q-42 -38 -292 -282l-418 -409q-90 -88 -147 -88q-78 0 -131 61q-31 36 -45 110.5t-23.5 132.5t-21.5 161q-44 -3 -67 -13q-9 -4 -55.5 -58.5 t-47.5 -62.5q-5 -31 -5 -110.5t41 -431.5l-1 -23q105 -116 149 -121l47 -4q2 0 18 14q284 253 468 441l495 521z" />
+<glyph unicode="&#x2706;" d="M1416 1125q0 -32 -26 -86q-68 -141 -164 -141q-35 0 -100 32q156 111 187 297q103 -49 103 -102zM1998 582q0 -406 -284 -690t-690 -284q-173 0 -328 96q-176 109 -176 272q0 35 18 72l37 72q-30 34 -54 69q28 293 170.5 585t355.5 493q34 3 50 3q92 0 187 -28 q-42 -178 -191 -296q-25 13 -41 13q-91 0 -214 -252q-88 -180 -88 -272q0 -69 53 -85q1 -14 1 -41q0 -179 -117 -291q-28 20 -60 49q-29 -27 -29 -70q0 -131 154 -216q130 -73 272 -73q364 0 619 255t255 619t-255 619t-619 255t-619 -255t-255 -619q0 -338 225 -587 q-23 -13 -38 -13q-88 0 -172 159q-115 217 -115 441q0 406 284 690t690 284t690 -284t284 -690zM956 185q0 -61 -39.5 -139.5t-93.5 -78.5q-32 0 -105 36q123 124 123 295q0 16 -1 33q116 -56 116 -146z" />
+<glyph unicode="&#x2707;" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1898 582q0 364 -255 619t-619 255t-619 -255t-255 -619t255 -619t619 -255t619 255t255 619zM1024 920q-107 0 -190 -55l64 483q48 16 126 16t126 -16l64 -483 q-83 55 -190 55zM1750 308q-10 -50 -49 -117t-77 -101l-450 186q90 44 143 136q48 84 48 173q0 10 -1 20zM1288 582q0 -109 -77.5 -186.5t-186.5 -77.5t-186.5 77.5t-77.5 186.5t77.5 186.5t186.5 77.5t186.5 -77.5t77.5 -186.5zM874 276l-450 -186q-38 34 -77 101t-49 117 l386 297q-1 -10 -1 -20q0 -89 48 -173q53 -92 143 -136z" />
+<glyph unicode="&#x2708;" horiz-adv-x="1940" d="M1123 1053l111 2q66 0 66 -42q0 -33 -41 -43l-67 -6l182 -241q156 0 324.5 -17.5t168.5 -82.5t-168 -82.5t-325 -17.5l-182 -241l67 -6q41 -10 41 -43q0 -42 -66 -42l-111 2l-120 -164l89 -15q19 -7 19 -32q0 -39 -71 -39q-32 0 -106 -5q-57 -81 -140 -182 q-24 -18 -66 -18q-4 0 -82 1q271 609 271 727q0 47 -53 61q-10 3 -90 10l-381 32l-194 -243l-126 -20l92 282l-82 35l82 35l-92 282l126 -20l194 -243l381 32q80 7 90 10q53 14 53 61q0 118 -271 727l82 1q42 0 66 -18q1 -1 140 -182q74 -5 106 -5q71 0 71 -39 q0 -25 -19 -32l-89 -15z" />
+<glyph unicode="&#x2709;" horiz-adv-x="1470" d="M1370 283h-1270v850h1270v-850zM1331 365v688l-426 -320l2 -22l-2 -25zM731 881q121 0 164 -113l436 332h-1194l434 -332q17 48 63 80.5t97 32.5zM897 649q-46 -114 -163 -114t-163 114l-430 -327h1186zM563 686l-2 25l2 22l-426 320v-688z" />
+<glyph unicode="&#x270a;" horiz-adv-x="1637" d="M556 1059l-16 72q0 75 51.5 124.5t126 49.5t169.5 -56q62 117 134 117q141 0 206 -99q37 -57 78 -227q115 -15 147.5 -36.5t58.5 -144t26 -182.5q0 -345 -143 -537q-101 -136 -261.5 -222t-325.5 -86q-311 0 -509 187t-198 497q0 79 48 133q28 30 83.5 60.5t55.5 45.5 q0 21 -9.5 62.5t-9.5 70t40 80.5t76.5 70.5t91.5 27.5l78 -18q2 6 2 11zM1054 1279q-44 0 -76.5 -37t-32.5 -70t22 -89q129 -5 256 -28q-30 113 -48 147q-42 77 -121 77zM724 1223q-101 0 -101 -89q0 -49 37 -127q40 87 117 87q18 0 52 -2t49 -2q-32 71 -55 95 q-36 38 -99 38zM1007 684q-138 11 -246 59q52 -101 86 -191q60 77 160 132zM1455 677q0 155 -53 258q-157 44 -644 76q-41 -53 -41 -91q0 -4 1 -7q42 -149 404 -149q37 0 123 2l39 -61q-197 -54 -295 -128q-137 -103 -137 -275q0 -95 38 -220l-41 -22q-101 135 -101 286 q-20 -7 -43.5 -7t-36.5 5q3 -21 3 -40q0 -165 -137 -165q-90 0 -190 98t-100 187q0 18 5 18q25 0 117.5 -110.5t167.5 -110.5q55 0 55 83q0 54 -122 194t-171 140t-81.5 -38t-32.5 -84q0 -275 174.5 -438.5t450.5 -163.5q144 0 289 78t233 197q126 171 126 488zM465 974 q-9 0 -17 -3q-97 -37 -97 -107q0 -98 169 -300q118 -142 178 -142q76 0 84 73q-58 149 -129 277q-113 202 -188 202z" />
+<glyph unicode="&#x270b;" horiz-adv-x="1557" d="M1457 485q0 -30 -29 -64l-55 -63l-67 -127q-152 -285 -280 -379q-42 -31 -173 -84.5t-212 -53.5q-151 0 -244 32q-1 0 -68 31q-133 61 -185 168q-44 90 -44 249v268q0 5 11 246q0 88 15 263q9 53 53 127t88 74q10 0 28 -8q18 75 33 108q28 56 79 76q10 4 56 2 q30 71 66 95t113 24q33 0 67.5 -43t48.5 -51l52 10q123 -43 142 -148q5 -25 9 -186l7 -284q6 -141 21 -244q2 -11 44 -143q18 9 28 34l19 47q30 62 97.5 117t129.5 55q26 0 76.5 -23t62 -44t11.5 -81zM672 1257q0 23 -10 63.5t-11 48.5q-33 13 -49.5 13t-39 -24t-22.5 -44 q0 3 1 3q2 0 16 -63q26 -118 28 -297l-1 45q-1 0 -1 -346l89 8v593zM497 1194q0 8 -19 53q-40 19 -49 19q-24 0 -41 -30t-17 -56v1q1 0 16 -145q16 -155 27 -410l83 18v550zM763 1024l-7 -114v-259q68 -27 68 -56q0 -20 -15 -20q-22 0 -63 12.5t-63 12.5q-248 0 -400 -123 l-32 -26l-22 34q4 20 44 57l59 49q1 3 1 8q0 270 -29 483l-18 12q-69 -1 -90 -198q-6 -128 -13 -256q-5 -44 -5 -49v-392q0 -35 11 -91q25 -128 80.5 -188.5t181.5 -92.5q64 -16 143.5 -16t163.5 28l149 57q20 6 58 24q92 57 179 182q44 64 131 223q29 53 131 175 q-44 50 -85 50q-101 0 -168 -111l-101 -191h-17q-17 0 -32 11q-30 22 -80 214q-26 99 -28 167l-15 511q-4 138 -66 138q-68 0 -56 -1zM646 91l6 -87q-15 -7 -45 -19l-31 131l67 142q38 66 109 114q15 -17 39 -55q-145 -160 -145 -226z" />
+<glyph unicode="&#x270c;" horiz-adv-x="1197" d="M1054 762q43 -79 43 -201.5t-34 -229t-93 -173.5q-161 -181 -388 -181t-341 125q-55 60 -98 164.5t-43 173t38 112.5q35 42 90 42h5q-16 62 -16 101t45.5 89t83.5 50q15 0 86 -19q-9 37 -79.5 230t-70.5 274q0 49 37 87t86 38q68 0 132 -137q1 -2 73 -199l70 -190l88 229 q48 124 68 162q58 104 122 104q51 0 79 -37t28 -100.5t-45 -199.5l-86 -251l68 -20q36 -14 52 -43zM860 842q137 384 137 437.5t-45 53.5q-38 0 -76 -86l-139 -387zM395 1370q-43 0 -43 -55q0 -102 137 -451q14 17 29 15l100 -11l-133 381q-42 121 -90 121zM718 563l-139 27 l47 -113zM1034 561q0 149 -94 185t-396 61q-16 -28 -16 -53q0 -63 78 -101q48 -23 142 -27h-1q0 1 148 1l16 -33l-8 -19q-91 -17 -150 -71q-135 -123 -135 -219q0 -26 15.5 -75t17.5 -60l-19 -19q-81 70 -86 184h-47q2 -17 2 -38.5t-8 -36.5q-28 -52 -89.5 -52t-129.5 62 q-35 32 -74 110v46l17 -3q17 -39 68.5 -87t88.5 -48q18 0 40 12t22 32t-119 175q-34 45 -64.5 45t-61 -30.5t-30.5 -55.5q0 -52 54 -167.5t110 -157.5q82 -62 232 -62q228 0 352.5 147.5t124.5 354.5zM569 432q0 35 -117 234q-30 50 -48 69.5t-60 26.5q-62 -44 -62 -74 q0 -50 94 -174.5t143.5 -124.5t49.5 43z" />
+<glyph unicode="&#x270d;" horiz-adv-x="1806" d="M914 282l-249 -16q-102 0 -254 47l-110 -120l-152 -58q-37 -14 -43 -14q-11 0 -11 8q0 5 5 14l100 213l19 23l-25 27l64 167q9 38 30 113l60 168q118 116 203.5 185.5t187.5 111.5l125 -72l160 178q33 37 63.5 37t55 -34.5t24.5 -73.5q0 -18 -31 -53l-135 -154l170 -111 q76 -49 154 -51l24 43l307 -20l41 -146l9 -209l-54 -286l-303 -6l-28 108l-187 -39l-188 19q-14 1 -32 1zM1591 262q33 123 33 272.5t-49 260.5h-177l5 -31l20 -209q0 -141 -45 -311zM1386 545q0 100 -43 229l-133 12l-246 150l-116 -131l2 -41v-8q0 -33 -15 -78l-90 -109 l27 -2h5q42 0 165 49q-11 -38 -66 -77l-229 -11q-63 -3 -76.5 -6.5t-73.5 -32.5q-78 -37 -78 -104q0 -29 23 -39q6 -3 45.5 -9.5t48.5 -6.5q37 0 37 49q0 19 -7 54t-5 40q19 0 30 -29t11 -53.5t-13.5 -41.5t-13.5 -19q0 -21 80 -21q19 -2 52 -2t116 15.5t119 17.5l35 -6 q111 -19 161 -19t226 47q22 132 22 183zM696 565q43 0 80 74q32 65 32 109q0 6 -1 12l-162 -189q24 -6 51 -6zM739 1098q-57 0 -190 -121l-115 -105q-43 -39 -53 -52t-25 -56l-53 -154l39 -20l14 -62l-47 -114h33q77 72 112 151l45 103l328 370l-44 35q-31 25 -44 25z M323 539q0 35 -26 51l-72 -176l25 -2h6q67 0 67 127zM174 244q-19 -34 -19 -53t16 -19t99 37q18 8 18 21t-24 47t-37 34q-6 0 -21 -10z" />
+<glyph unicode="&#x270e;" horiz-adv-x="1922" d="M1822 158q0 -56 -95 -56h-3l-555 7q-58 7 -117 43l-868 522l-84 313l166 277l305 51l844 -508q50 -30 63.5 -40t28.5 -38l289 -504q26 -57 26 -67zM1437 676v65l-817 490l58 -215l745 -447q14 48 14 107zM1652 195q39 51 39 83t-49 115l-153 260q-14 -306 -291 -485 l383 -10q47 6 71 37zM1411 522l-756 455l-129 -213l758 -455q99 92 127 213zM624 1022l-69 242l-256 -45l-142 -236l68 -266l248 53zM1249 274l-748 449l-227 -43l850 -510q67 40 125 104zM483 1071q0 -72 -47 -132t-92 -60q-64 0 -64 73q0 57 46.5 123t101.5 66 q24 0 39.5 -22t15.5 -48z" />
+<glyph unicode="&#x270f;" horiz-adv-x="1969" d="M1794 791q75 -50 75 -83.5t-75 -86.5l-420 -295q-46 -33 -55.5 -37t-51.5 -4h-956l-211 245v369l211 227h932q43 0 59 -8t72 -45zM1691 616q11 48 11 94t-19 87l-326 221l-4 -4q76 -174 76 -309.5t-61 -311.5l4 -4zM1339 909q-30 93 -72 166h-858l142 -166h788zM1355 575 q15 51 15 121t-15 148h-804v-269h804zM1345 510h-805l-143 -162h899q26 60 49 162zM495 545v338l-166 192l-174 -192v-326l174 -209zM313 881q80 0 80 -161t-86 -161q-70 0 -70 161t76 161z" />
+<glyph unicode="&#x2710;" horiz-adv-x="1922" d="M1822 1260q0 -11 -26 -68l-289 -504q-18 -34 -92 -78l-844 -508l-305 52l-166 276l84 313l868 523q43 26 57.5 31.5t59.5 11.5l555 6h3q95 0 95 -55zM1642 1024q49 83 49 115.5t-39 83.5q-24 31 -71 37h-35l-348 -11q277 -179 291 -485zM1411 895q-28 121 -127 213 l-758 -455l129 -213zM1249 1143q-58 64 -125 104l-850 -510l227 -43zM1437 741q0 59 -14 107l-745 -447l-58 -215l817 490v65zM624 395l-151 252l-248 53l-68 -266l142 -235l256 -45zM483 346q0 -26 -15.5 -48t-39.5 -22q-55 0 -101.5 66t-46.5 123q0 74 64 74 q44 0 91.5 -60.5t47.5 -132.5z" />
+<glyph unicode="&#x2711;" horiz-adv-x="1990" d="M1140 285q-63 0 -107 41q-28 25 -69 94q-70 117 -141 117q-113 0 -141 -138h-301q-66 0 -92.5 5t-67.5 36q-121 90 -121 274.5t145 270.5q52 31 148 31h289q36 -135 137 -135q67 0 114 65l77 122q53 65 137 65q107 0 436 -201q216 -132 307 -223q-100 -103 -334 -244 q-297 -180 -416 -180zM1210 543q-66 0 -103.5 48t-37.5 117t37.5 117.5t105.5 48.5q93 0 127 -131l195 -8v152q-271 172 -373 172q-69 0 -120 -66l-83 -122q-56 -66 -139 -66q-130 0 -182 145h-242q-81 0 -125 -28q-111 -70 -111 -203t84 -205q50 -43 136 -43h258 q20 64 74 103.5t124 39.5t124 -66l81 -122q49 -66 111 -66q121 0 383 175v149l-195 -8q-35 -133 -129 -133z" />
+<glyph unicode="&#x2712;" horiz-adv-x="2049" d="M1274 213q-93 0 -166 78q-40 43 -67 140.5t-41 120.5q-31 52 -93.5 52t-97.5 -55q-54 -85 -88.5 -109t-124.5 -24h-177q-108 0 -132 3q-81 9 -118 49q-69 75 -69 260t113 245q38 20 262 20h114q88 0 126.5 -18t81 -93t106 -75t92.5 43q16 23 36 95t30.5 100.5t39.5 64.5 q73 92 184.5 92t231.5 -166q103 -142 182 -209q110 -93 250 -118q-235 -44 -430 -326q-118 -170 -245 -170zM1742 690q54 3 54 18.5t-164 22.5l-234 10q-36 109 -127 109q-59 0 -95 -42.5t-36 -100t35 -101t88 -43.5q96 0 135 113h48z" />
+<glyph unicode="&#x2713;" horiz-adv-x="1607" d="M481 -14q-28 -13 -111 -13t-98.5 8.5t-46.5 73.5q-125 259 -125 402q0 36 47 69q94 66 158 66q26 0 39 -22q85 -216 106 -216q11 0 53 62l474 702l165 203q48 59 152 91t199 32l14 -33l-190 -225l-426 -563l-295 -457l-72 -123q-11 -22 -43 -57z" />
+<glyph unicode="&#x2714;" horiz-adv-x="1787" d="M1687 1239q0 -40 -14 -60l-184 -200l-498 -524l-266 -256q-237 -228 -297 -228h-2l-47 4q-43 4 -140 82q-43 34 -82 80q-18 21 -18 76l-29 248q-12 105 -12 184q0 27 2 51q5 95 10 107.5t52 68.5t67 76t62 33.5t83 13.5t70 -20q29 -25 29 -62.5t20 -154.5l19 -111 q4 -35 26 -90q24 -27 56 -27q15 0 43 27l747 727l158 131q35 29 80.5 29t55 -12t9.5 -60v-133z" />
+<glyph unicode="&#x2715;" horiz-adv-x="1617" d="M1517 121l-121 -121l-587 590l-588 -590l-121 121l592 588l-592 587l121 121l588 -590l587 590l121 -123l-590 -585z" />
+<glyph unicode="&#x2716;" horiz-adv-x="1617" d="M1517 356l-354 -356l-354 358l-355 -358l-354 356l358 353l-358 352l354 356l355 -356l354 356l354 -356l-356 -352z" />
+<glyph unicode="&#x2717;" horiz-adv-x="1371" d="M1218 1354q5 0 10.5 -13t24 -33t18.5 -30t-20 -29t-72 -86l-313 -409l63 -127l160 -342q-9 -21 -28 -29v-16q-1 -1 -21 -13.5t-20 -20.5t10 -28q-3 -18 -26 -34.5t-42.5 -16.5t-77.5 90l-192 297l-406 -629q-32 -24 -106 -24q-17 0 -45.5 45t-28.5 58t7.5 39t-3 35.5 t-10.5 20.5t49 95l49 84q79 135 351 464l24 29l-151 418q-23 64 -23 71.5t27 41.5q21 18 30 18t31 -18q12 10 33 10q6 3 18 14q10 17 23 17q19 0 37 -37l155 -308l52 64l100 115q187 215 196 215q25 0 72 -39l23 20q14 21 22 21z" />
+<glyph unicode="&#x2718;" horiz-adv-x="1441" d="M1243 1372l-10 -20q0 -8 14.5 -19t24.5 -11t18.5 2.5t19.5 -13.5l31 -45q0 -8 -13.5 -27t-13.5 -22q-8 3 -436 -498l-10 -12l127 -164l176 -211q-4 -23 -29 -68t-38 -45h-17q-4 0 -14.5 -16.5t-6.5 -26.5t-24.5 -35.5t-33.5 -25.5t-34 18.5t-24 18.5q-2 0 -34.5 -35 t-51.5 -35l-16 4q-53 54 -132.5 169t-97.5 138l-313 -420h-27l-39 43l6 29q0 10 -8 10t-51 -16q-19 9 -48.5 58t-29.5 46q0 6 12.5 22.5t12.5 29.5t-15.5 42t-17.5 39l176 213l166 195q-178 332 -238 537q22 42 74 90q5 -1 23.5 -20t21.5 -19q31 0 29 39q-1 19 15.5 34 t36.5 15t44 -37l242 -362q51 60 257 271.5t222 211.5q6 0 40 -28t34 -44z" />
+<glyph unicode="&#x2719;" horiz-adv-x="1619" d="M1519 475h-473v-475h-473v475h-473v469h473v473h473v-473h473v-469zM1456 532v353h-471v469h-353v-469h-473v-353h473v-469h353v469h471zM1380 610h-471v-471h-201v471h-473v195h473v471h201v-471h471v-195z" />
+<glyph unicode="&#x271a;" horiz-adv-x="1615" d="M1515 475h-473v-475h-475v475h-467v471h467v471h475v-471h473v-471z" />
+<glyph unicode="&#x271b;" horiz-adv-x="1613" d="M1513 586h-588v-586h-239v586h-586v245h586v586h239v-586h588v-245zM913 600v217h-211v-217h211z" />
+<glyph unicode="&#x271c;" horiz-adv-x="1603" d="M1503 481h-477v-481h-453v481h-473v445h473v491h453v-491h477v-445zM1015 498v413h-432v-413h432z" />
+<glyph unicode="&#x271d;" horiz-adv-x="1070" d="M970 856h-335v-856h-197v856h-338v195h338v366h197v-366h335v-195z" />
+<glyph unicode="&#x271e;" horiz-adv-x="1187" d="M1087 717h-285v-717h-227l-178 141v576h-115l-182 155v244h297v301h246l159 -147v-154h136l149 -141v-258zM927 879v186h-290v299h-187v-299h-301v-186h301v-727h187v727h290z" />
+<glyph unicode="&#x271f;" horiz-adv-x="1158" d="M1058 721h-284v-721h-391v721h-283v387h283v309h391v-309h284v-387zM1007 768v289h-282v309h-291v-309h-285v-289h285v-717h291v717h282zM944 831h-281v-718h-166v718h-284v162h284v307h166v-307h281v-162z" />
+<glyph unicode="&#x2720;" horiz-adv-x="1702" d="M104 1163l11 2q12 0 18 -10q231 -415 698 -424q-9 469 -423 699q-11 6 -11 14q0 24 21 24h866q13 0 19 -12q2 -2 2 -11t-11 -15q-416 -231 -422 -699q466 9 697 424q6 10 15 10q24 0 24 -20v-866q0 -12 -7.5 -16.5t-16.5 -4.5t-15 10q-228 413 -697 422q6 -465 422 -696 q11 -6 11 -19q0 -20 -21 -20h-866q-21 0 -21 20q0 13 11 19q414 230 423 696q-468 -9 -698 -422q-6 -10 -13.5 -10t-15.5 2q-10 7 -10 19v866q0 11 10 18z" />
+<glyph unicode="&#x2721;" horiz-adv-x="1474" d="M1374 346h-422l-215 -375l-217 375h-420l207 363l-207 364h420l217 371l215 -371h422l-209 -364zM1245 999h-250l127 -211zM864 1073l-127 227l-131 -227h258zM1243 418l-121 213l-123 -213h244zM1077 709l-168 290h-344l-168 -290l168 -291h344zM475 999h-246l123 -211z M870 346h-254l121 -221zM479 418l-127 213l-127 -213h254z" />
+<glyph unicode="&#x2722;" horiz-adv-x="1666" d="M1251 836q71 24 138 24t122 -40t55 -110.5t-53 -114.5t-116.5 -44t-137.5 24l-108 35q-175 57 -283 66q8 -117 55 -266l35 -111q29 -92 29 -155t-42.5 -118t-112 -55t-111 53.5t-41.5 114.5t26 154l84 299q11 37 11 69q0 8 -1 15q-98 -11 -276 -64l-100 -30 q-90 -27 -150.5 -27t-117 41.5t-56.5 110.5t50 113t117 44t142 -26l119 -41q119 -41 272 -58q-9 112 -69 308l-27 88q-24 78 -24 138t42 115.5t110.5 55.5t112.5 -52t44 -115t-59.5 -247.5t-61.5 -290.5l285 64z" />
+<glyph unicode="&#x2723;" horiz-adv-x="1668" d="M1511.5 847.5q56.5 -55.5 56.5 -140t-59.5 -143t-150.5 -58.5t-177 110q-18 24 -67 60q-38 15 -89 15q-12 0 -24 -1l-37 -2q-20 -95 -112 -110v-56q0 -79 13.5 -103.5t80.5 -78.5q92 -74 92 -162.5t-57 -147.5t-139.5 -59t-142.5 56.5t-60 148t108 180.5q47 39 58.5 72 t11.5 104v43q-102 31 -113 115h-47q-69 0 -102.5 -14.5t-73.5 -69.5q-75 -102 -184 -102q-81 0 -139 61.5t-58 143t58 137t150 55.5t171 -100q44 -55 82 -66.5t125 -11.5h18q11 107 111 117l4 49q1 11 1 22q0 86 -58 133q-64 54 -95.5 97t-31.5 117t59.5 130t139.5 56 t139 -59.5t59 -150.5t-98 -167q-37 -29 -48.5 -40.5t-19.5 -39.5q-16 -42 -16 -92v-16l2 -39q46 -3 78 -37t34 -80l41 -2q12 -1 22 -1q54 0 84 13q36 15 79 68q83 102 174 102t147.5 -55.5z" />
+<glyph unicode="&#x2724;" horiz-adv-x="1670" d="M1570 709q0 -110 -73 -187.5t-178.5 -77.5t-178.5 57l-112 109q-68 61 -156 66q-2 -98 117 -211.5t119 -229.5t-81.5 -190t-189 -74t-185 81t-77.5 189t115.5 220t114.5 215q-102 -7 -213 -121.5t-223.5 -114.5t-190.5 79.5t-78 186.5t79 188t180.5 81t175.5 -60 l114 -112q69 -60 156 -60q-8 96 -121 212t-113 224.5t78 186.5t184 78t187 -74.5t81 -178.5t-57 -177l-108 -112q-60 -70 -64 -159h3q99 0 205 115q107 117 218.5 117t191.5 -78t80 -188z" />
+<glyph unicode="&#x2725;" horiz-adv-x="1677" d="M1536 804q41 -40 41 -94.5t-40.5 -92t-95.5 -37.5q-28 0 -57 16q-2 -61 -39 -103t-95.5 -42t-94 36.5t-35.5 90t33 102.5l-285 -6l-6 -275q58 35 108 35t89.5 -37t39.5 -92.5t-43 -94.5t-98 -44q14 -28 14 -72t-38.5 -83.5t-93 -39.5t-92.5 38t-38 91q0 29 17 66h-6 q-55 0 -97 36q-43 37 -43 94t38 97.5t88.5 40.5t99.5 -35l-5 275l-276 4q33 -45 33 -101.5t-41 -93.5t-98.5 -37t-91 45t-35.5 105q-48 -16 -76 -16q-49 0 -83 39.5t-34 92t40.5 91.5t96.5 39q27 0 56 -13q3 55 42 96.5t94.5 41.5t93.5 -37t38 -85t-35 -110l276 4l5 285 q-39 -39 -96 -39t-94.5 35.5t-37.5 93.5q0 113 144 137q-17 47 -17 66q0 51 37 89t92 38t95 -39.5t40 -99.5q0 -18 -12 -54q58 -5 97.5 -41t39.5 -91.5t-36.5 -94.5t-91.5 -39t-103 39l4 -285l285 -4q-37 50 -37 106t38.5 92t95 36t94.5 -42t40 -98q34 15 55 15q56 0 97 -40 z" />
+<glyph unicode="&#x2726;" horiz-adv-x="1683" d="M1583 709q0 -11 -23 -17q-243 -62 -413 -221q-223 -208 -299 -461q-11 -37 -20 -37h-1q-7 -1 -16 31q-71 258 -240 426q-81 81 -203 157t-227 109q-41 8 -41 23q0 9 35 20q247 76 414 244q195 197 266 418q14 43 22.5 43t18.5 -33q70 -243 257 -426.5t427 -251.5 q43 -17 43 -24z" />
+<glyph unicode="&#x2727;" horiz-adv-x="1683" d="M1583 694q-260 -54 -462 -256.5t-271 -464.5h-37q-54 259 -251.5 453.5t-461.5 267.5v41q254 62 447.5 257.5t265.5 451.5h37q66 -260 268 -455.5t465 -253.5v-41zM1499 715q-196 36 -304 64t-212 87q-85 150 -152 492q-37 -178 -67.5 -285t-88.5 -207q-102 -57 -246 -95 q-53 -14 -259 -56q228 -49 259 -57q147 -39 246 -99q57 -98 97 -238q15 -52 59 -251q34 176 64 283t88 206q101 61 251 100z" />
+<glyph unicode="&#x2728;" d="M1948 482q-202 -7 -251 -69q-40 -50 -49 -259h-31q-6 124 -19 173q-26 100 -100 130q-46 18 -185 26v34q201 6 251 67q42 50 52 258h31q13 -171 21 -204q17 -67 71 -89t209 -34v-33zM1428 800q-294 -14 -407 -52q-137 -48 -187 -178q-46 -118 -55 -408h-34 q-9 287 -56.5 412.5t-173.5 170.5t-415 55v34q289 11 402 49q134 46 185 175q46 116 57 402h36v-10q0 -262 54 -388q55 -128 199 -178q120 -41 395 -50v-34zM1535 49q-104 -1 -148 -7q-98 -13 -127.5 -49t-41 -96.5t-24.5 -215.5h-29q-11 180 -24 228q-21 77 -84 104 t-231 37v35q175 17 234 40t78 95q11 39 27 228h29q20 -197 28 -229q19 -74 78.5 -97.5t234.5 -36.5v-36zM1716 498q-57 25 -86 83q-29 -56 -92 -83q63 -29 92 -89q29 61 86 89zM1067 817q-243 61 -307 289q-31 -125 -98.5 -192t-192.5 -97q125 -31 193.5 -99.5t99.5 -193.5 q32 128 103 195.5t202 97.5zM1278 70q-71 29 -98 101q-29 -74 -112 -103q81 -30 111 -101q27 73 99 103z" />
+<glyph unicode="&#x2729;" horiz-adv-x="1740" d="M1640 909l-436 -383l143 -555l-477 314l-477 -314l125 555l-418 383l565 39l205 496l205 -496zM1570 885l-571 -43l-129 536l-129 -536l-571 43l473 -322l-207 -532l434 381l432 -381l-219 532z" />
+<glyph unicode="&#x272a;" horiz-adv-x="1673" d="M1358 1228.5q215 -215.5 215 -520t-215.5 -521t-520 -216.5t-521 214.5t-216.5 521t215.5 522t521.5 215.5t521 -215.5zM1491 930h-500l-156 461l-153 -461h-496l393 -297l-164 -481l420 299l398 -299l-148 481z" />
+<glyph unicode="&#x272b;" horiz-adv-x="1781" d="M1681 872l-543 -319l232 -582l-492 391l-479 -391l213 582l-512 319l604 -24l164 596l174 -596zM1030 485.5q63 65.5 63 155t-64.5 153.5t-155 64t-155.5 -63.5t-65 -155t66 -155.5t157 -64t154 65.5z" />
+<glyph unicode="&#x272c;" horiz-adv-x="1744" d="M1644 903l-430 -377l143 -555l-483 314l-473 -314l129 555l-430 377l567 43l207 498l207 -498zM1114 641q0 -36 -13 -78l476 318l-568 -43q105 -84 105 -197zM747 842q61 32 128 32t128 -32l-129 534zM1314 29l-215 530q-65 -139 -217 -151zM643 645q0 110 100 193 l-577 43l489 -318q-12 52 -12 82zM874 408q-141 0 -217 151l-211 -530z" />
+<glyph unicode="&#x272d;" horiz-adv-x="1763" d="M1663 885l-455 -350l184 -564l-510 334l-506 -334l160 564l-436 350h567l215 559l219 -559h562zM1507 829h-442l-183 467l-180 -467h-446l344 -274l-127 -457l409 273l408 -273l-146 457zM1323 764l-252 -189l114 -339l-303 206l-311 -206l94 339l-239 189h319l137 366 l142 -366h299z" />
+<glyph unicode="&#x272e;" horiz-adv-x="1730" d="M1347 -14q0 -13 -16.5 -13t-26.5 19l-436 284l-442 -278q-36 -18 -33 -18q-12 0 -12 14q0 5 6 31l121 520l-381 303q-27 27 -27 29q0 12 41 16l504 51l198 465q15 35 25 35q14 0 23 -35l200 -465l498 -51q12 -1 26.5 -3t14.5 -13l-29 -29l-375 -303l115 -527q6 -27 6 -32 zM1409 817l-391 27l-150 375l-150 -375l-393 -27l299 -231l-108 -426l352 243l342 -243l-102 426zM1204 760l-189 -146l70 -268l-217 160l-227 -160l75 268l-180 146h238l94 239l92 -239h244z" />
+<glyph unicode="&#x272f;" horiz-adv-x="1759" d="M1659 889l-453 -340l209 -578l-527 361l-509 -361l198 578l-477 340h590l198 555l195 -555h576zM1548 846h-500l-160 -201zM888 645v696l-170 -495zM1345 61l-184 500l-273 84zM888 645l-682 201l418 -285zM888 377v266l-436 -582z" />
+<glyph unicode="&#x2730;" horiz-adv-x="1947" d="M1847 866l-440 -321l186 -541l-272 10l-301 226l-365 -269l-268 54l176 532l-463 352h582l180 535l24 -2l228 -35l170 -498h436zM1556 866h-506l-170 504l-166 -504h-489l391 -288l-166 -492l430 311l414 -311l-154 492z" />
+<glyph unicode="&#x2731;" horiz-adv-x="1582" d="M1482 479l-161 -268l-383 238l12 -449h-318l13 449l-385 -238l-160 268l401 230l-401 229l160 268l385 -248l-13 459h318l-12 -459l383 248l161 -268l-403 -229z" />
+<glyph unicode="&#x2732;" horiz-adv-x="1537" d="M1437 971l-428 -252l-112 188l424 260zM882 918h-225v499h225v-499zM1437 446l-110 -196l-428 252l110 196zM643 907l-115 -188l-428 252l109 196zM882 0h-225v492h225v-492zM643 502l-424 -252l-117 196l428 252z" />
+<glyph unicode="&#x2733;" horiz-adv-x="1591" d="M1491 668l-646 12l476 -438l-64 -66l-442 471l22 -647h-88l21 647l-424 -471l-68 66l463 438l-641 -12v88l641 -19l-477 434l63 66l443 -475l-29 655h94l-20 -655l442 465l64 -64l-476 -432l646 25v-88z" />
+<glyph unicode="&#x2734;" horiz-adv-x="1679" d="M1579 713q0 -17 -39 -17l-553 -53l342 -422q18 -18 18 -26q0 -13 -10 -13t-33 23l-411 344l-41 -545q-7 -33 -15 -33q-18 0 -18 39l-55 545l-422 -352q-23 -19 -27 -19q-14 0 -14 15q0 10 20 30l350 418l-536 39q-35 3 -35 16q0 9 39 17l530 53l-354 422q-16 19 -16 27 q0 14 10 14t33 -23l422 -346l43 547q6 31 14 31q12 0 16 -37l60 -547l428 369q19 16 26 16q15 0 15 -14q0 -8 -23 -31l-348 -426l551 -45q33 -3 33 -16z" />
+<glyph unicode="&#x2735;" horiz-adv-x="1681" d="M1581 707l-445 -103l238 -399l-17 -17l-387 244l-112 -461h-25l-94 445l-408 -244l-16 16l244 390l-459 108v21l459 102l-244 416l16 16l383 -250l119 453h25l96 -447l414 254l16 -18l-256 -393l453 -111v-22zM1319 1186l-365 -230l-88 -221zM1501 715l-402 94l-221 -94 h623zM845 741v633l-98 -418zM1314 248l-227 356l-213 82zM817 729l-443 447l226 -367zM942 459l-97 219v-633zM807 707l-644 -7l433 -96zM827 686l-457 -461l369 234z" />
+<glyph unicode="&#x2736;" horiz-adv-x="1482" d="M1382 1067q0 -6 -25 -25l-391 -335l383 -338q23 -20 23 -23q0 -10 -12 -10q-1 0 -31 10l-467 158l-105 -502q-10 -31 -19 -31t-17 37l-103 496l-473 -158q-37 -18 -37 2q0 3 27 27l379 332l-394 340q-20 17 -20 20q0 12 10 12q-3 0 29 -8l479 -166l109 510q7 31 16 31 q7 0 14 -35l105 -506l483 166q37 13 37 -4z" />
+<glyph unicode="&#x2737;" horiz-adv-x="1646" d="M1116 1413l-4 -31l-82 -446l475 84q41 7 41 -8q0 -10 -29 -25l-391 -276l391 -277q29 -21 29 -26q0 -13 -10 -13q-3 0 -33 6l-473 95l90 -465q4 -21 4 -32t-12.5 -11t-26.5 28l-266 377l-268 -379q-26 -26 -25 -26q-10 0 -10 10l88 498l-461 -78q-24 -4 -31 -4 q-12 0 -12 9t31 30l383 258l-381 274l-29 29q0 10 12 10l33 -4l455 -84l-84 453q0 1 -2 15q-6 28 10 28q11 0 25 -29l266 -377l258 371q14 28 26.5 28t12.5 -12z" />
+<glyph unicode="&#x2738;" horiz-adv-x="1632" d="M1532 422l-449 39l31 -475l-303 346l-303 -346l34 475l-442 -39l344 301l-344 301l442 -39l-34 447l303 -347l303 347l-31 -447l440 39l-338 -301z" />
+<glyph unicode="&#x2739;" horiz-adv-x="1679" d="M1579 709l-363 -111l262 -258l-356 90l104 -356l-290 266l-103 -369l-92 361l-268 -271l92 359l-361 -92l269 276l-373 105l373 102l-269 276l361 -92l-92 361l268 -271l92 359l103 -369l290 266l-104 -356l356 90l-262 -258z" />
+<glyph unicode="&#x273a;" horiz-adv-x="1613" d="M100 739h557l-520 205l29 70l512 -217l-400 385l55 55l385 -395l-221 508l72 28l201 -512v551h75l-12 -551l199 512l72 -28l-213 -508l385 395l57 -55l-395 -385l505 217l31 -70l-514 -205l553 11v-80l-553 10l514 -207l-31 -72l-505 226l395 -391l-51 -56l-391 404 l225 -514l-72 -29l-211 520l12 -561h-75l6 561l-199 -520l-74 29l215 514l-385 -404l-55 56l400 391l-512 -226l-29 72l520 207l-557 -10v69z" />
+<glyph unicode="&#x273b;" horiz-adv-x="1505" d="M1370.5 1096q34.5 -37 34.5 -91.5t-56 -86.5q-20 -12 -108 -39q-179 -56 -307 -66l184 199q112 121 165 121t87.5 -37zM860 1339q0 -76 -43 -209l-68 -210q-39 81 -78 214t-39 190t33.5 87.5t77.5 30.5q117 0 117 -103zM1346 489q50 -31 50 -85.5t-33.5 -92t-81.5 -37.5 t-173 119l-166 195l297 -64q76 -16 107 -35zM871.5 828.5q51.5 -52.5 51.5 -124t-50.5 -123t-121.5 -51.5t-123.5 51t-52.5 123t50.5 124.5t122.5 52.5t123.5 -52.5zM155 919q-55 32 -55 86t33.5 92t85.5 38t166 -123l184 -199q-137 11 -265.5 52.5t-148.5 53.5zM860 76 q0 -47 -33.5 -75t-81 -28t-80.5 30.5t-33 74.5q0 71 38.5 202.5t78.5 215.5l68 -211q43 -133 43 -209zM397 391q-123 -117 -172 -117t-84 37.5t-35 90t52 82.5q17 10 106 38l299 66z" />
+<glyph unicode="&#x273c;" horiz-adv-x="1505" d="M983 709l-6 -54q0 -40 111 -64q170 -35 206 -50q111 -46 111 -140q0 -49 -36.5 -83.5t-86.5 -34.5q-79 0 -204.5 129t-152.5 129q-2 0 -15 -7l-81 -43q-31 -16 -31 -50.5t40 -146t40 -174t-34 -106t-90 -43.5t-92 42.5t-36 106t36 187t36 147.5t-25.5 32t-57.5 32.5 t-40 24.5q-36 0 -152.5 -132t-201.5 -132q-50 0 -84.5 36t-34.5 84q0 90 109 139q41 18 202 56q109 26 109 61l-4 45l6 66q0 40 -110 65q-175 40 -204 52q-110 45 -110 131q0 51 35.5 88t94 37t137.5 -67q28 -25 105 -109t103 -84q12 0 28.5 13t73.5 39q25 11 25 50.5 t-36 147t-36 167t32 104t83.5 44.5t93 -33.5t41.5 -106.5t-37.5 -186t-37.5 -148t25.5 -43t53.5 -31.5t41 -23.5q45 0 127 99q138 166 226 166q50 0 86 -35.5t36 -85.5q0 -90 -109 -139q-43 -19 -203 -57q-109 -26 -109 -60zM855.5 601q43.5 46 43.5 108.5t-45 106.5 t-108 44t-104.5 -46t-41.5 -109t44.5 -106.5t106 -43.5t105 46z" />
+<glyph unicode="&#x273d;" horiz-adv-x="1453" d="M1353 995q0 -77 -59 -131q-43 -39 -172 -57.5t-205.5 -36.5t-148.5 -61q117 -60 256 -80l131 -19q84 -12 139 -63.5t55 -132.5q0 -28 -8 -76q-73 -66 -145 -66q-106 0 -199 131q-143 201 -248 261l-2 -29v-13q0 -84 68 -237l43 -96q30 -67 30 -121q0 -154 -157 -197 q-160 45 -160 189q0 46 33 135l31 84q65 176 65 264v21q-103 -60 -254 -271q-86 -121 -178 -121q-71 0 -158 66q-10 70 -10 86q0 153 217 186l111 17q160 24 254 82q-105 60 -276.5 85t-221.5 52q-81 43 -81 138q0 10 1 20l6 75q90 66 156 66t124 -52q33 -31 87 -108 q129 -185 223 -229v45q0 81 -67.5 242t-67.5 212q0 144 166 189q62 -21 108.5 -67.5t46.5 -106t-36 -144.5q-101 -239 -101 -361v-9q33 13 62 39l125 139l61 80q98 129 186 129q71 0 158 -66q12 -52 12 -82z" />
+<glyph unicode="&#x273e;" horiz-adv-x="1494" d="M1390 420q0 -35 -3 -80q-131 -72 -207 -72q-113 0 -202 115l-185 240l123 -279q43 -98 43 -147q0 -86 -66 -144q-40 -35 -143 -82q-100 52 -138 86q-68 60 -68 140q0 52 41 147l120 279l-184 -240q-99 -129 -186 -129t-226 86l-8 96q-1 14 -1 27q0 176 249 207l311 39 l-309 34q-141 16 -193 72t-52 179q0 35 3 81q130 92 217.5 92t190.5 -137l188 -250l-123 287q-45 105 -45 160q0 125 213 217q97 -46 137 -81q66 -58 66 -130.5t-39 -165.5l-121 -287l183 250q91 125 200 125q73 0 211 -80l6 -94q1 -12 1 -24q0 -104 -64 -154 q-57 -45 -190 -60l-302 -34l302 -39q145 -19 197.5 -73t52.5 -177zM892 1198q0 147 -144 199q-145 -53 -145 -189q0 -43 29 -125l102 -288h29l102 288q27 76 27 115zM1209 305q67 0 137 55l7 60q0 94 -78 153q-49 37 -142 52l-299 49l-14 -29l197 -231q93 -109 192 -109z M748 752q-47 0 -47 -44t47 -44t47 44t-47 44zM294 305q88 0 184 109l203 231l-19 29l-305 -49q-206 -33 -206 -190q0 -10 1 -21l4 -52q72 -57 138 -57z" />
+<glyph unicode="&#x273f;" horiz-adv-x="1748" d="M860 317l4 -45q0 -114 -53 -186q-85 -115 -236 -115q-119 0 -204 85t-85 212t97 207q62 51 143 66q47 0 47 26q0 13 -18 13q-2 0 -59 -21.5t-109 -21.5q-116 0 -201.5 85.5t-85.5 201t84 202t201 86.5q92 0 162 -50q43 -32 83 -88t50 -56t10 10q0 -2 -51.5 75t-51.5 166 q0 115 85 195t199 80t205 -83t91 -194q0 -48 -24 -112.5t-58 -93.5q-25 -25 -16 -46q18 0 35 35q30 62 104.5 105t144.5 43q121 0 208 -82t87 -198.5t-80 -205t-186.5 -88.5t-151.5 31q-26 18 -38.5 18t-12.5 -12q0 -20 45 -26q97 -12 168.5 -96t71.5 -192.5t-82.5 -192 t-207 -83.5t-207.5 86.5t-83 216.5l4 43q0 25 -14 25t-14 -25zM1049.5 488.5q72.5 72.5 72.5 174t-72.5 174t-175.5 72.5t-176.5 -72t-73.5 -174.5t73.5 -174.5t176.5 -72t175.5 72.5z" />
+<glyph unicode="&#x2740;" horiz-adv-x="1726" d="M1551 1001q75 -80 75 -196t-77.5 -189.5t-196.5 -73.5q-14 0 -29 1l-146 12q273 -148 273 -324q0 -102 -80.5 -181t-182.5 -79q-260 0 -317 377q-18 -92 -32.5 -143t-45.5 -99q-86 -135 -227 -135q-111 0 -191.5 79.5t-80.5 188.5t80 190q51 52 176 122l-117 -6 q-12 -1 -23 -1q-119 0 -209 66q-100 71 -100 194t75.5 200t190.5 77q137 0 305 -168q-73 180 -73 280.5t71 175.5t183.5 75t193 -73.5t80.5 -178.5t-76 -268q176 157 320 157q106 0 181 -80zM1241 594q105 0 184.5 55t79.5 148t-58 145.5t-143 52.5q-183 0 -274 -161l51 -62 l164 39q20 5 33 5q24 0 24 -17t-45 -37l-151 -68v-82q79 -18 135 -18zM974 872q80 110 80 212.5t-51 169.5t-146.5 67t-143.5 -70.5t-48 -174.5t80 -204l76 27l14 170q4 51 23 51q11 0 24 -51l27 -170zM1341 276q0 97 -77.5 171.5t-178.5 99.5l-41 -58l90 -143 q23 -28 23 -45.5t-17 -17.5q-11 0 -45 34l-118 119l-68 -24q-2 -16 -2 -33q0 -109 72 -200t178 -91q75 0 129.5 57t54.5 131zM419 991q-81 0 -138.5 -55t-57.5 -143.5t84 -148.5t186 -60q40 0 131 26v82l-153 64q-52 15 -52 36q0 15 26 15q14 0 34 -4l166 -31l45 59 q-108 160 -271 160zM606 281q-14 0 -14 14t16 43l84 151l-47 60q-242 -86 -242 -277q0 -73 56.5 -128.5t129.5 -55.5q103 0 174 91t71 197q0 19 -3 36l-74 24l-116 -127q-21 -28 -35 -28z" />
+<glyph unicode="&#x2741;" horiz-adv-x="1673" d="M1573 709q0 -191 -205 -230q51 -82 51 -133q0 -78 -66 -150.5t-143 -72.5q-55 0 -149 49q-19 -90 -80 -145.5t-149 -55.5t-146.5 58.5t-69.5 144.5q-84 -53 -135 -53q-94 0 -162.5 68.5t-68.5 162.5q0 48 55 133q-85 11 -145 72t-60 145q0 186 205 228q-53 93 -53 139 q0 89 65 154t154 65q58 0 145 -53q11 96 71.5 152.5t151.5 56.5t150.5 -59t64.5 -146q82 53 136 53q98 0 165.5 -65.5t67.5 -163.5q0 -54 -55 -135q88 -13 146.5 -73t58.5 -146zM1370 1075q0 65 -50.5 113.5t-115.5 48.5q-117 0 -174 -131l-80 -184l18 -13l109 170 q55 86 123 86q47 0 74.5 -30t27.5 -76q0 -65 -88 -119l-172 -106l10 -21l187 84q131 59 131 178zM1005 1221q0 70 -50.5 121t-122 51t-117.5 -54t-46 -129q0 -33 19 -86l67 -186l25 8l-39 191q-6 28 -6 52q0 44 19 77q28 53 81 53q80 0 105 -82q5 -16 5 -36q0 -27 -9 -62 l-50 -197l25 -6l72 188q22 57 22 97zM1521 700q0 76 -52 125t-130 49q-28 0 -84 -22l-188 -74l4 -22l200 43q28 6 53 6q42 0 74 -17q50 -28 50 -93t-72 -93q-19 -7 -43.5 -7t-54.5 7l-205 49l-6 -24l192 -74q55 -21 94.5 -21t79.5 23q88 51 88 145zM469 1241q-66 0 -116 -50 t-50 -116q0 -117 127 -174l182 -82l12 23l-172 100q-84 49 -84 119q0 42 31.5 75t73.5 33q79 0 127 -84l98 -172l27 15l-80 182q-58 131 -176 131zM966 576q54 54 54 130.5t-54.5 131.5t-131 55t-131 -53.5t-54.5 -130.5t54 -132t131.5 -55t131.5 54zM1368 352 q0 106 -123 158l-195 82l-10 -21l178 -106q80 -48 80 -121q0 -38 -32.5 -70t-71.5 -32q-71 0 -119 80l-107 178l-22 -15l86 -186q57 -123 166 -123q73 0 121.5 51.5t48.5 124.5zM1007 195q0 34 -20 86l-74 192l-22 -4l45 -201q6 -26 6 -50q0 -122 -111 -122q-71 0 -98 76 q-5 15 -5 35q0 24 7 55l47 205l-25 8l-71 -192q-19 -52 -19 -96t29 -83q61 -81 134 -81t125 50.5t52 121.5zM413 854q-55 20 -96.5 20t-85.5 -24q-80 -45 -80 -145q0 -72 51.5 -119t122.5 -47q30 0 82 20l193 74l-4 24l-203 -51q-33 -8 -60 -8q-36 0 -61 14q-47 34 -47 93 q0 79 78 102q17 5 39 5q25 0 57 -7l197 -43l6 22zM473 242q-44 0 -73.5 31.5t-29.5 76.5q0 67 84 119l170 106l-8 21l-190 -82q-125 -54 -125 -164q0 -72 48 -124t120 -52q113 0 170 125l86 188l-25 15l-113 -180q-50 -80 -114 -80z" />
+<glyph unicode="&#x2742;" horiz-adv-x="1673" d="M1357 1228.5q216 -215.5 216 -520t-215 -521t-520 -216.5t-521.5 215.5t-216.5 521.5t215.5 521t520.5 215t521 -215.5zM1347 1219l-342 -140q139 -73 201 -205zM696 1090q61 24 145.5 24t137.5 -24l-142 335zM1218 850q25 -82 25 -153.5t-25 -135.5l336 144zM675 1079 l-337 148l131 -353q64 148 206 205zM1083 457q104 101 104 246t-101 251.5t-247 106.5t-251 -100.5t-105 -247t102 -252t248 -105.5t250 101zM1343 193l-135 339q-70 -134 -203 -196zM458 561q-26 85 -26 144.5t26 144.5l-333 -145zM981 328q-72 -25 -141 -25t-144 25 l143 -342zM667 336q-135 73 -194 196l-131 -339z" />
+<glyph unicode="&#x2743;" horiz-adv-x="1509" d="M1409 965q0 -115 -164 -170q-114 -38 -303 -68l-115 -18l100 -17q106 -17 303 -63q177 -56 177 -174q0 -56 -13 -115q-106 -96 -172 -96q-83 0 -234 162q-14 14 -198 235q144 -341 144 -481q0 -85 -48 -126q-28 -25 -127 -63q-97 33 -131 58q-59 44 -59 127.5t55 242.5 l94 242l-94 -117q-223 -278 -336 -278q-59 0 -172 94q-16 72 -16 111q0 117 154 167l309 68l123 23l-357 69q-229 44 -229 191q0 40 16 108q97 97 164 97q118 0 344 -281l94 -117l-94 244q-55 159 -55 241.5t60 126.5q38 27 130 56q101 -38 128 -61q47 -41 47 -128 q0 -138 -144 -479l198 237q150 161 236 161q63 0 170 -97q15 -67 15 -112zM1247 1126q-94 0 -237 -151l-193 -230l530 310q-49 71 -100 71zM648.5 1358q-32.5 -33 -32.5 -118.5t52 -227.5l91 -226v613q-78 -8 -110.5 -41zM1372 449q0 108 -229 171q-76 21 -322 58l530 -303 q21 50 21 74zM133 975q0 -128 356 -195l197 -32l-531 307q-22 -53 -22 -80zM893 160q0 152 -134 473v-610q134 6 134 137zM266 299q153 0 424 381l-529 -307q49 -74 105 -74z" />
+<glyph unicode="&#x2744;" horiz-adv-x="1460" d="M1360 389l-50 -74l-196 117l8 -217l-61 21l-19 241l-278 166v-328l210 -139l-26 -61l-184 121l4 -236h-78l4 236l-184 -121l-27 61l211 139v328l-277 -166l-20 -241l-61 -21l8 217l-197 -117l-47 74l203 115l-195 94l39 55l225 -110l293 166l-293 163l-225 -108l-39 55 l195 92l-203 117l47 72l197 -117l-8 219l61 -20l20 -244l277 -166v328l-211 141l27 62l184 -121l-4 235h78l-4 -235l184 121l26 -62l-210 -141v-328l278 166l19 244l61 20l-8 -219l196 117l50 -72l-203 -117l192 -92l-39 -55l-225 108l-293 -163l293 -166l225 110l39 -55 l-192 -94z" />
+<glyph unicode="&#x2745;" horiz-adv-x="1482" d="M1353 420q29 -15 29 -20.5t-14 -20.5l-19 -21q-19 -45 -24 -45q-12 0 -29 17l-242 147v-315l-276 155l14 -278l1 -27q0 -11 -18 -11q-5 0 -11 1l-29 4l-17 -2q-15 -3 -24 -3q-14 0 -14 7v31l18 278l-272 -155v315l-238 -147q-28 -17 -32.5 -17t-12.5 23l-10 22l-13 13 q-20 27 -20 30.5t10 8.5l271 141l-267 158l267 153l-252 129q-29 15 -29 22t12 19l15 21l4 14q10 31 18 31q12 0 29 -17l248 -145v311l272 -155l-18 286q-1 8 -1 21q-1 13 3 15q2 1 6 1q7 0 18 -2l25 -4l18 2q35 7 35 -4v-29l-6 -284l276 153v-311l234 158q18 18 29 18 q5 0 14 -22l10 -25l12 -12q21 -31 21 -29q0 -6 -29 -23l-244 -139l269 -153l-269 -158zM1015 920v258l-235 -134v-270zM1286 709l-232 127l-239 -127l239 -134zM698 774v270l-231 134v-269zM1015 233v271l-235 137v-276zM657 709l-231 127l-230 -127l230 -134zM698 365v276 l-231 -137v-271z" />
+<glyph unicode="&#x2746;" horiz-adv-x="1470" d="M1370 549l-193 -68l185 -104l-31 -47l-184 106l45 -200l-109 -19l-98 322l-223 123v-252l223 -250l-64 -88l-159 145l8 -217h-72l10 217l-162 -145l-61 88l223 250v252l-223 -123l-98 -322l-111 19l45 200l-184 -106l-29 47l185 104l-193 68l37 102l330 -73l217 131 l-217 131l-330 -74l-37 102l193 68l-185 104l29 47l184 -108l-45 201l111 18l98 -319l223 -125v252l-223 249l61 91l162 -148l-10 219h72l-8 -219l159 148l64 -91l-223 -249v-252l223 125l98 319l109 -18l-45 -201l184 108l31 -47l-185 -104l193 -68l-39 -102l-328 74 l-219 -131l219 -131l328 73z" />
+<glyph unicode="&#x2747;" horiz-adv-x="1668" d="M1462 1268l-451 -416q-30 0 -35 4.5t-4 32.5l420 448q20 -47 70 -69zM729 1288l-2 71q0 39 19 55t87 30q64 -17 72 -21q31 -17 31 -61v-84q-6 -69 -13.5 -142.5t-25.5 -129.5q0 -10 -28.5 -78t-41.5 -68q-25 0 -78 184q-20 69 -20 244zM1484 600h-81l-137 12 q-80 9 -136 27q-9 0 -77 28.5t-68 41.5q0 24 184 77q73 21 244 21q16 0 38.5 0.5t30.5 0.5q40 0 56 -18.5t30 -87.5q-16 -63 -21 -72q-17 -30 -63 -30zM1462 147q-45 -24 -70 -71l-415 448q-2 29 2 35t32 6zM688 889q3 -27 -2.5 -32t-34.5 -5l-457 416q48 21 72 69zM950 709 q0 -51 -36 -87t-87 -36t-87 36t-36 87t36 86.5t87 35.5t87 -35.5t36 -86.5zM185 811l71 -2q91 -1 143 -4t100 -17q185 -53 185 -79q0 -15 -146 -70q-86 -26 -272 -35l-82 -4h-5q-41 0 -58 30q-4 8 -21 75q14 68 30 87t55 19zM729 56l2 71q0 175 20 244q53 184 78 184 q12 0 41 -67t29 -76q37 -114 37 -275v-82q0 -44 -30 -61q-6 -4 -71 -23q-68 14 -87 30t-19 55zM692 522l-420 -446q-22 46 -68 71l449 418q10 1 17 1q13 0 16 -4q4 -6 6 -40z" />
+<glyph unicode="&#x2748;" horiz-adv-x="1668" d="M1470 1309l-407 -410l-45 39l405 414zM1374 537q-50 0 -111 28l-178 97q-63 34 -63 46t20 19l161 97q100 59 171 59q146 0 194 -174q-24 -88 -65 -130t-129 -42zM1005 1253q0 -72 -80 -209l-45 -77q-42 -72 -51 -72q-6 0 -29 41l-59 104q-82 145 -82 201q0 167 178 203 q168 -45 168 -191zM651 938l-45 -39l-404 410l43 43zM1480 119l-43 -43l-413 401l41 47zM951.5 828q49.5 -49 49.5 -119.5t-49 -120t-118.5 -49.5t-119 49.5t-49.5 119t48 119.5t118.5 50t120 -49zM649 707q0 -2 -37 -27l-153 -90q-91 -51 -166 -51q-151 0 -193 170 q43 176 186 176q75 0 166 -52l136 -85q61 -39 61 -41zM1007 170q0 -142 -176 -199q-170 53 -170 201q0 68 50 150l96 157q29 43 30 43q23 0 39 -63q1 -1 83 -136q48 -78 48 -153zM651 477l-410 -401l-45 43l410 405z" />
+<glyph unicode="&#x2749;" horiz-adv-x="1517" d="M1364.5 560.5q52.5 -53.5 52.5 -127.5t-51.5 -124.5t-126.5 -50.5t-128 53.5t-53 128.5q0 14 9 54l-273 155v-319q62 -20 104 -67t42 -116t-52.5 -122.5t-129.5 -53.5t-128 53t-51 121.5t42 117t102 67.5v319l-273 -155q10 -33 10 -64q0 -68 -54 -120t-125.5 -52 t-126 47.5t-54.5 122t51 130.5t130 56t138 -65l269 160l-269 157q-62 -65 -137.5 -65t-128.5 54t-53 128t52 124t127.5 50t128 -52.5t52.5 -127.5q0 -26 -10 -53l273 -158v321q-61 18 -102.5 66t-41.5 117t51.5 121.5t128.5 52.5t129 -52.5t52 -121.5t-42.5 -117t-103.5 -66 v-321l273 158q-9 30 -9 61q0 69 53.5 120.5t126 51.5t126 -47.5t53.5 -122t-50 -129.5t-129 -55t-139 63l-268 -157l268 -160q62 65 137.5 65t128 -53.5z" />
+<glyph unicode="&#x274a;" horiz-adv-x="1677" d="M1355.5 1234q26.5 -28 26.5 -68.5t-30 -68.5q-8 -7 -68 -46l-250 -160l-21 20l162 254q38 59 45 67q28 30 68.5 30t67 -28zM1548 772q29 -27 29 -62.5t-28.5 -63.5t-58.5 -28t-87 13l-295 67v29l295 59q65 13 79 13q37 0 66 -27zM931 1350q0 -5 -16 -80l-63 -295h-29 l-74 338q-5 22 -5 40t5 31q21 60 84 60q39 0 68.5 -28t29.5 -66zM288 1165q0 40 27.5 66t68 26t68.5 -30q6 -7 43 -64l164 -254l-16 -18l-256 160q-55 35 -66 44q-33 30 -33 70zM1357 319q29 -27 29 -66.5t-27 -67t-71 -27.5t-76 49l-197 305l19 16l260 -166q54 -35 63 -43z M974 845q58 -56 58 -136.5t-55.5 -139.5t-136.5 -59t-139 57t-58 138t56 138.5t136.5 57.5t138.5 -56zM934 61q0 -36 -30.5 -63t-66 -27t-64 28.5t-28.5 61.5q0 12 14 80l62 301h29l69 -301q15 -65 15 -80zM100 709q0 37 28 60.5t66 23.5l375 -66v-29l-342 -84 q-19 -5 -34 -5q-19 0 -34 7q-59 26 -59 93zM379 164q-37 0 -63 25.5t-26 63.5t30 66q9 8 63 43l256 166l20 -16l-188 -293q-35 -55 -92 -55z" />
+<glyph unicode="&#x274b;" horiz-adv-x="1664" d="M1564 709q0 -107 -116 -107q-20 0 -86 10l-371 56l-19 -47l351 -234q69 -46 69 -101t-31.5 -92.5t-82 -37.5t-85.5 30q-18 15 -59 72l-221 305l-41 -18l74 -408q5 -27 5 -48.5t-5 -37.5q-24 -80 -106 -80t-117 68q-12 23 -12 54q0 15 3 32l76 420l-45 18l-215 -297 q-80 -110 -129 -110t-82 32t-33 77q0 77 93 141l309 215l-19 45l-364 -52q-84 -12 -90 -12q-115 0 -115 107q0 52 37 87t88 35q21 0 82 -12l362 -71l19 43l-303 200q-62 41 -78 57q-35 36 -35 87t36.5 83.5t83 32.5t83.5 -38q10 -10 55 -72l215 -293l45 20l-74 410 q-6 30 -6 52q0 18 4 30q23 84 111 84q51 0 85 -38t34 -89q0 -25 -10 -84l-62 -365l41 -20l234 340q54 78 122 78q47 0 81 -38t34 -93.5t-65 -100.5l-347 -241l19 -45l366 71q62 12 86 12q49 0 85 -35t36 -87z" />
+<glyph unicode="&#x274c;" horiz-adv-x="1373" d="M1273 1121l-416 -415l414 -415l-169 -169l-414 415l-414 -415l-174 174l415 414l-415 414l169 169l415 -414l415 416z" />
+<glyph unicode="&#x274d;" horiz-adv-x="1845" d="M346 1250q231 194 573.5 194t584 -199.5t241.5 -537.5t-253 -544q-235 -192 -579.5 -192t-578.5 201.5t-234 536.5t246 541zM1493 705q0 274 -194.5 469.5t-469.5 195.5t-471.5 -191t-196.5 -467t195.5 -472.5t471.5 -196.5t470.5 194t194.5 468z" />
+<glyph unicode="&#x274e;" horiz-adv-x="1613" d="M1513 0h-1413v1417h1413v-1417zM1393 1121l-174 174l-415 -416l-415 414l-169 -169l415 -414l-415 -414l174 -174l414 415l414 -415l169 169l-414 415z" />
+<glyph unicode="&#x274f;" horiz-adv-x="1617" d="M1517 0h-1198v217h-219v1200h1194v-213h223v-1204zM1237 274v1082h-1078v-1082h1078z" />
+<glyph unicode="&#x2750;" horiz-adv-x="1617" d="M1517 213h-223v-213h-1194v1200h219v217h1198v-1204zM1237 61v1082h-1078v-1082h1078z" />
+<glyph unicode="&#x2751;" horiz-adv-x="1613" d="M1513 0h-1171l-242 236v1181h1165l248 -243v-1174zM1253 252v1100h-1090v-1100h1090z" />
+<glyph unicode="&#x2752;" horiz-adv-x="1613" d="M100 0v1182l242 235h1171v-1173l-248 -244h-1165zM1253 66v1099h-1090v-1099h1090z" />
+<glyph unicode="&#x2753;" horiz-adv-x="1439" d="M1339 994q0 -173 -129 -301q-21 -21 -235 -177q-118 -86 -118 -166v-8h-395q0 171 121 309q57 66 224 190q121 90 121 142q0 68 -78 101q-57 24 -151.5 24t-284 -49.5t-314.5 -102.5v387q104 44 299 80.5t315 36.5q234 0 415 -113q210 -132 210 -353zM885 -2 q0 -93 -66.5 -159.5t-159.5 -66.5t-159 66.5t-66 159.5t66 159.5t159 66.5t159.5 -66.5t66.5 -159.5z" />
+<glyph unicode="&#x2754;" horiz-adv-x="1439" d="M1339 994q0 -173 -129 -301q-21 -21 -235 -177q-118 -86 -118 -166v-8h-395q0 171 121 309q57 66 224 190q121 90 121 142q0 68 -78 101q-57 24 -151.5 24t-284 -49.5t-314.5 -102.5v387q104 44 299 80.5t315 36.5q234 0 415 -113q210 -132 210 -353zM885 -2 q0 -93 -66.5 -159.5t-159.5 -66.5t-159 66.5t-66 159.5t66 159.5t159 66.5t159.5 -66.5t66.5 -159.5zM1239 994q0 176 -183 280q-152 86 -342 86q-237 0 -514 -87v-174q329 109 514 109q123 0 209 -50q105 -61 105 -175q0 -86 -100 -173l-200 -157q-120 -102 -152 -211h199 q37 85 163 172q172 120 202 150q99 98 99 230zM785 -2q0 51 -37.5 88.5t-88.5 37.5t-88 -37.5t-37 -88.5t37 -88.5t88 -37.5t88.5 37.5t37.5 88.5z" />
+<glyph unicode="&#x2755;" horiz-adv-x="825" d="M725 1469l-140 -1127h-345l-140 1127h625zM638 -2q0 -93 -66.5 -159.5t-159.5 -66.5t-159 66.5t-66 159.5t66 159.5t159 66.5t159.5 -66.5t66.5 -159.5zM612 1369h-399l115 -927h169zM538 -2q0 51 -37.5 88.5t-88.5 37.5t-88 -37.5t-37 -88.5t37 -88.5t88 -37.5 t88.5 37.5t37.5 88.5z" />
+<glyph unicode="&#x2756;" horiz-adv-x="1662" d="M1562 700l-329 -290l-304 303l308 307zM1134 1114l-303 -303l-305 305l305 328zM731 713l-305 -303l-326 303l322 307zM1140 307l-309 -336l-305 336l305 307z" />
+<glyph unicode="&#x2757;" horiz-adv-x="840" d="M681 1255q0 -199 -223 -964h-76q-34 105 -101 359q-122 463 -122 605q0 112 75 190.5t186 78.5t186 -78.5t75 -190.5zM589 78q70 -69 70 -166t-72 -168t-167 -71t-167 71t-72 166t72 166t169 71t167 -69z" />
+<glyph unicode="&#x2758;" horiz-adv-x="341" d="M241 0h-141v1417h141v-1417z" />
+<glyph unicode="&#x2759;" horiz-adv-x="624" d="M524 0h-424v1417h424v-1417z" />
+<glyph unicode="&#x275a;" horiz-adv-x="907" d="M807 0h-707v1417h707v-1417z" />
+<glyph unicode="&#x275b;" horiz-adv-x="862" d="M675 1043q87 -86 87 -213t-97 -210t-243 -83t-234 103.5t-88 257.5q0 255 144.5 400.5t464.5 145.5l18 -49q-255 0 -381 -121q-61 -58 -61 -113.5t55 -55.5q-3 0 43.5 12t87.5 12q117 0 204 -86z" />
+<glyph unicode="&#x275c;" horiz-adv-x="862" d="M762 1083q0 -255 -144.5 -400.5t-464.5 -145.5l-18 49q255 0 381 121q61 58 61 113.5t-55 55.5q3 0 -43.5 -12t-87.5 -12q-117 0 -204 86t-87 213t97 210t243 83t234 -103.5t88 -257.5z" />
+<glyph unicode="&#x275d;" horiz-adv-x="1425" d="M1234 1068.5q91 -92.5 91 -223t-92 -218.5t-224 -88q-203 0 -291 211q-28 -90 -109.5 -150t-176.5 -61h-3q-148 0 -238 105q-91 106 -91 259q0 230 175 390q166 151 381 151h24l41 -51h-11q-136 0 -264 -71q-133 -73 -174 -200q78 39 145 39q184 0 279 -164 q50 200 200.5 323.5t354.5 123.5h18l41 -51h-10q-130 0 -264 -73q-139 -76 -174 -198q78 39 151 39q130 0 221 -92.5z" />
+<glyph unicode="&#x275e;" horiz-adv-x="1425" d="M1325 1079q0 -229 -175 -389q-167 -151 -383 -151h-22l-41 51h11q136 0 264 70q133 73 174 200q-82 -41 -146 -41q-180 0 -280 166q-48 -200 -199.5 -323t-355.5 -123h-17l-41 51h7q134 0 267 74q138 75 173 196q-81 -37 -150 -37q-130 0 -220.5 92t-90.5 222.5 t91.5 218.5t221.5 88q208 0 291 -211q29 91 111.5 151t177.5 60q150 0 241 -106t91 -259z" />
+<glyph unicode="&#x275f;" horiz-adv-x="862" d="M762 112q0 -255 -144.5 -400.5t-464.5 -145.5l-18 49q255 0 381 121q61 58 61 113.5t-55 55.5q3 0 -43.5 -12t-87.5 -12q-117 0 -204 86t-87 213t97 210t243 83t234 -103.5t88 -257.5z" />
+<glyph unicode="&#x2760;" horiz-adv-x="1425" d="M1325 108q0 -229 -175 -389q-167 -151 -383 -151h-22l-41 51h11q136 0 264 70q133 73 174 200q-82 -41 -146 -41q-180 0 -280 166q-48 -200 -199.5 -323t-355.5 -123h-17l-41 51h7q134 0 267 74q138 75 173 196q-81 -37 -150 -37q-130 0 -220.5 92t-90.5 222.5 t91.5 218.5t221.5 88q208 0 291 -211q29 91 111.5 151t177.5 60q150 0 241 -106t91 -259z" />
+<glyph unicode="&#x2761;" horiz-adv-x="1556" d="M1126 1257h-31v-696q0 -409 -56.5 -569t-169.5 -257.5t-260 -97.5t-249 84t-102 221q0 97 64.5 168.5t160.5 71.5q65 0 117.5 -46t52.5 -106t-32 -98.5t-87 -38.5q-69 0 -69 -60t57 -94t121 -34q119 0 201 86t120 211.5t43 431.5l-350 -27q-19 -1 -39 -1q-192 0 -340 110 q-178 133 -178 356q0 135 66.5 244t190 170t488.5 61h162v213l88 21v-234h361l-37 -53q-88 -37 -293 -37zM1009 1255h-194q-31 -223 -31 -327.5t4 -159.5l19 -238q110 -53 202 -61v786z" />
+<glyph unicode="&#x2762;" horiz-adv-x="1085" d="M985 1151q0 -91 -49 -170q-32 -52 -61 -73t-116 -59t-137.5 -87t-79.5 -152q-29 103 -78.5 151.5t-136 86.5t-114 56.5t-58.5 64.5q-55 82 -55 194q0 178 131 241q88 42 305.5 42t301.5 -35q147 -60 147 -260zM748 468q85 -85 85 -205.5t-85 -206t-205.5 -85.5 t-205.5 85.5t-85 206t85 205.5t205.5 85t205.5 -85z" />
+<glyph unicode="&#x2763;" horiz-adv-x="1171" d="M585 1202q26 99 90 170.5t166 71.5t166 -80.5t64 -189t-43.5 -188t-161.5 -130.5q-223 -96 -281 -248q-34 93 -100.5 146t-153 91t-115.5 58t-59 66q-57 86 -57 196.5t62 194.5t180 84q91 0 157 -73t86 -169zM792.5 468q85.5 -85 85.5 -205.5t-85.5 -206t-206 -85.5 t-205 85.5t-84.5 206t85 205.5t205 85t205.5 -85z" />
+<glyph unicode="&#x2764;" horiz-adv-x="1920" d="M1820 909q0 -149 -81 -265.5t-220 -166.5l-129 -47q-334 -122 -430 -348q-95 225 -432 348l-129 47q-129 47 -214 163t-85 267q0 185 115 305.5t288.5 120.5t293 -100.5t163.5 -261.5q50 164 165 263t289.5 99t290 -120t115.5 -304z" />
+<glyph unicode="&#x2765;" horiz-adv-x="1425" d="M1251 651q-147 0 -272 -119q-91 -86 -160 -276q-105 -285 -363 -285q-148 0 -252 106.5t-104 247.5t89 241.5t222 125.5v33q-132 23 -221.5 124.5t-89.5 244.5t108.5 246.5t256.5 103.5t251 -105q51 -52 122 -229.5t175 -253.5q123 -90 238 -90h45l29 4v-123l-29 4h-45z " />
+<glyph unicode="&#x2766;" horiz-adv-x="1808" d="M1748 1292q0 -136 -151.5 -244.5t-293.5 -108.5q-92 0 -208 52l-147 -322q-7 15 -7 45q0 134 76 313l-300 180q-203 118 -299.5 118t-164 -64.5t-67.5 -149.5q0 -47 29.5 -89.5t29.5 -49.5q0 -30 -33 -56.5t-64 -26.5q-88 0 -88 102q0 142 137 283t269.5 141t307.5 -129 l-10 76q81 92 171 92t147 -74.5t57 -168.5q0 -50 -20 -141q111 -71 230 -71q72 0 131.5 43t59.5 106t-39 96t-39 58q0 65 38.5 111t103.5 46t104.5 -50t39.5 -117zM1552 523q0 -180 -152 -299q-33 -25 -282 -157q-152 -81 -152 -169q0 -54 41 -92.5t95 -38.5q155 0 193 162 q4 22 8.5 43t18 34.5t51.5 13.5t71 -23.5t33 -63.5q0 -108 -143 -175q-116 -53 -239 -53q-301 0 -528.5 219t-227.5 519q0 181 78 304q92 146 263 146q110 0 178 -83q63 -75 63 -174q0 -10 -1 -20l23 -9q127 221 320 221q126 0 207.5 -89t81.5 -216zM1029 1090q14 42 14 100 t-38 118t-100 60q-80 0 -80 -87q0 -94 204 -191z" />
+<glyph unicode="&#x2767;" d="M2024 544q0 -48 -31 -102q-119 -209 -310.5 -322.5t-412.5 -113.5t-386 80q-208 100 -208 281q0 142 168 227q-76 136 -267 137q2 -134 -115 -254q-98 -99 -241 -158q23 -112 133 -112q67 0 117 48l4 -46q3 -29 3 -47q0 -69 -46.5 -106.5t-128.5 -37.5t-146.5 67 t-70.5 161q-30 4 -62 18q15 69 59 116q4 146 128.5 260.5t276.5 143.5q-29 59 -136 79q-138 25 -163 40q-70 42 -70 129q0 155 207 159q-38 -30 -38 -80q0 -67 129.5 -158t157.5 -167q28 4 52 4q126 0 257 -116l5 6q-48 90 -48 167q0 109 80.5 174.5t191.5 65.5t194 -52 q148 -93 199 -246q11 -31 45 -252q20 -132 94 -175q31 -18 86 -18t98.5 42.5t43.5 97t-22 94.5q32 54 86 54q87 0 87 -88zM514 690q0 21 -6 40q-115 -5 -206.5 -94.5t-91.5 -203.5v-14q105 33 193 100q111 84 111 172z" />
+<glyph unicode="&#x2768;" horiz-adv-x="948" d="M49 582q0 409 209 653.5t612 301.5l29 -41q-234 -52 -384 -303.5t-150 -610.5t150 -610.5t384 -303.5l-29 -41q-403 57 -612 301.5t-209 653.5z" />
+<glyph unicode="&#x2769;" horiz-adv-x="870" d="M860 582q0 -409 -209 -653.5t-612 -301.5l-29 41q234 52 384 303.5t150 610.5t-150 610.5t-384 303.5l29 41q403 -57 612 -301.5t209 -653.5z" />
+<glyph unicode="&#x276a;" horiz-adv-x="815" d="M82 582q0 488 356 920h295q-229 -412 -229 -920t229 -920h-295q-356 432 -356 920z" />
+<glyph unicode="&#x276b;" horiz-adv-x="779" d="M715 582q0 -488 -356 -920h-295q229 412 229 920t-229 920h295q356 -432 356 -920z" />
+<glyph unicode="&#x276c;" horiz-adv-x="692" d="M629 -367h-291l-275 949l275 949h291l-277 -949z" />
+<glyph unicode="&#x276d;" horiz-adv-x="692" d="M629 582l-275 -949h-291l277 949l-277 949h291z" />
+<glyph unicode="&#x276e;" horiz-adv-x="1053" d="M1016 -131h-398l-581 713l581 713h398l-584 -713z" />
+<glyph unicode="&#x276f;" horiz-adv-x="1053" d="M1016 582l-581 -713h-398l584 713l-584 713h398z" />
+<glyph unicode="&#x2770;" horiz-adv-x="1128" d="M1032 -367h-661l-275 949l275 949h661l-276 -949z" />
+<glyph unicode="&#x2771;" horiz-adv-x="1128" d="M1032 582l-275 -949h-661l276 949l-276 949h661z" />
+<glyph unicode="&#x2772;" horiz-adv-x="651" d="M545 -336l-60 -33l-379 228v1446l379 228l60 -33l-301 -221v-1394z" />
+<glyph unicode="&#x2773;" horiz-adv-x="487" d="M463 -141l-379 -228l-60 33l301 221v1394l-301 221l60 33l379 -228v-1446z" />
+<glyph unicode="&#x2774;" horiz-adv-x="1024" d="M549 -378q-162 0 -218.5 72.5t-56.5 300t-1 251.5q-10 164 -55 227q-56 77 -200 93v32q144 16 200 93q45 63 55 227q1 24 1 251.5t56.5 300t218.5 72.5h457l-1 -57q-136 -5 -185.5 -48t-49.5 -273t-1 -251q-9 -170 -54 -231q-57 -78 -199 -100q142 -22 199 -100 q45 -61 54 -231q1 -21 1 -251t49.5 -273t185.5 -48l1 -57h-457z" />
+<glyph unicode="&#x2775;" horiz-adv-x="1024" d="M751 246q-1 -24 -1 -251.5t-56.5 -300t-218.5 -72.5h-457l1 57q136 5 185.5 48t49.5 273t1 251q9 170 54 231q57 78 199 100q-142 22 -199 100q-45 61 -54 231q-1 21 -1 251t-49.5 273t-185.5 48l-1 57h457q162 0 218.5 -72.5t56.5 -300t1 -251.5q10 -164 55 -227 q56 -77 200 -93v-32q-144 -16 -200 -93q-45 -63 -55 -227z" />
+<glyph unicode="&#x2776;" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1355 17v75h-152q-60 0 -60 61v992h-59q-170 -92 -391 -106v-72h172q63 0 63 -54v-736q0 -85 -83 -85h-119v-75h629z" />
+<glyph unicode="&#x2777;" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1194 227h-374q72 80 243.5 205.5t232.5 199.5q90 112 90 245t-102 214t-249 81t-250.5 -84.5t-103.5 -231.5q0 -75 33.5 -133t96.5 -58t101 36.5t38 93t-43 84.5 q-9 5 -81 31q-43 16 -43 44q0 60 61.5 96.5t125.5 36.5q170 0 170 -210q0 -136 -95 -286q-58 -91 -205 -255t-197 -244v-69h737l25 389h-82q-14 -86 -31 -122q-31 -63 -98 -63z" />
+<glyph unicode="&#x2778;" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM891 564l91 12q171 0 171 -252.5t-195 -252.5q-49 0 -107 24t-58 65q0 15 55.5 55t55.5 94t-34.5 86.5t-92.5 32.5t-92 -45t-34 -112q0 -139 110 -213q95 -65 252 -65t263 76 q121 87 121 249q0 236 -267 307q224 91 224 267q0 136 -103.5 208t-236.5 72t-227 -67.5t-94 -186.5q0 -57 33 -98.5t85.5 -41.5t86 32t33.5 81t-45.5 89t-45.5 54q0 58 114 58q174 0 174 -217.5t-155 -217.5l-73 6q-56 0 -56 -49.5t47 -49.5z" />
+<glyph unicode="&#x2779;" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1360 296v90h-161v782h-76l-553 -762v-110h416v-112q0 -74 -55 -89q-13 -3 -116 -3v-75h505v75q-64 0 -81 5q-40 13 -40 61v138h161zM986 386h-335l335 464v-464z" />
+<glyph unicode="&#x277a;" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1278.5 101q115.5 108 115.5 280.5t-106 278.5t-270 106q-96 0 -215 -54l17 223q96 -16 177 -16q192 0 278 123q42 60 42 114q0 16 -12 16q-4 0 -34 -10q-79 -26 -202 -26 t-307 37l-35 -519q-42 -59 -42 -94q0 -48 50 -48q59 0 59 111q96 55 169 55q181 0 181 -284q0 -321 -195 -321q-49 0 -97 18q-62 23 -62 63q0 12 61.5 49.5t61.5 92.5t-35 88t-93 33t-94.5 -46t-36.5 -113q0 -125 98 -195t229 -70q182 0 297.5 108z" />
+<glyph unicode="&#x277b;" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1037 -7q173 0 275 109.5t102 278t-91 251.5t-211 83t-225 -112v19q0 478 213 478q69 0 69 -45q0 -10 -16.5 -44t-16.5 -71t30.5 -70t82.5 -33t87 38.5t35 94.5q0 97 -91 153 q-77 49 -180 49q-191 0 -321 -161q-145 -180 -145 -477q0 -222 88 -367q106 -174 315 -174zM1043 607q137 0 137 -269t-145 -269q-83 0 -122 106q-27 75 -27 189t47 178.5t110 64.5z" />
+<glyph unicode="&#x277c;" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1398 1147h-557q-61 0 -105 16h-32l-54 -404h74q31 129 54.5 157t74.5 28h398l-204 -365q-161 -288 -161 -459q0 -127 116 -127q88 0 121 80q14 33 23.5 144.5t38.5 314.5 q42 202 213 545v70z" />
+<glyph unicode="&#x277d;" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1414 363q0 125 -63 196.5t-190 125.5q198 102 198 248q0 114 -114 182q-96 57 -229 57t-236 -90t-103 -231q0 -186 214 -288q-257 -87 -257 -276q0 -147 121 -226 q103 -68 268.5 -68t278 98.5t112.5 271.5zM1211 908q0 -117 -113 -201q-122 44 -170 76q-91 60 -91 143t52 128.5t134 45.5t135 -52.5t53 -139.5zM962 534q181 -70 241.5 -123.5t60.5 -143t-67 -144.5t-168.5 -55t-159.5 62.5t-58 167.5q0 172 151 236z" />
+<glyph unicode="&#x277e;" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1414 643q0 218 -87 359q-105 170 -310 170q-176 0 -279.5 -110t-103.5 -287q0 -136 81.5 -228.5t215.5 -92.5q106 0 232 104q-3 -350 -114 -446q-51 -44 -112 -44t-61 42 q0 15 17 50t17 57q0 49 -32 83t-84 34t-87 -40.5t-35 -97.5q0 -94 95 -152q82 -51 182 -51q189 0 318 163q147 185 147 487zM1168 841q0 -106 -31 -179q-43 -100 -134 -100q-138 0 -138 250q0 287 151.5 287t151.5 -258z" />
+<glyph unicode="&#x277f;" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1668 203q73 160 73 376.5t-72 378.5q-94 214 -285.5 214t-287.5 -213q-72 -160 -72 -376t75 -380q98 -210 285.5 -210t283.5 210zM867 17v75q-57 0 -72 5q-35 11 -35 56v992 h-59q-103 -56 -169 -77.5t-169 -28.5v-72h119q63 0 63 -54v-736q0 -66 -46 -80q-14 -5 -103 -5v-75h471zM1385 1097q110 0 110 -513t-115 -513q-110 0 -110 485q0 541 115 541z" />
+<glyph unicode="&#x2780;" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1898 582q0 364 -255 619t-619 255t-619 -255t-255 -619t255 -619t619 -255t619 255t255 619zM1348 46h-648v149h225v642h-225v137h3q241 0 250 148h175v-927h220v-149z" />
+<glyph unicode="&#x2781;" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1898 582q0 364 -255 619t-619 255t-619 -255t-255 -619t255 -619t619 -255t619 255t255 619zM1416 46h-784v164q175 139 258 212q165 147 214 230.5t49 155.5 q0 166 -195 166q-139 0 -283 -96h-15v195q147 67 319.5 67t273.5 -70q116 -81 116 -244t-172 -348q-85 -92 -310 -268h529v-164z" />
+<glyph unicode="&#x2782;" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1898 582q0 364 -255 619t-619 255t-619 -255t-255 -619t255 -619t619 -255t619 255t255 619zM1412 368q0 -171 -132 -263q-115 -81 -302.5 -81t-341.5 68v193h20 q148 -93 304 -93q238 0 238 189q0 114 -110 145q-48 14 -203 14v156q136 0 190 17q104 31 104 134q0 127 -199 127q-146 0 -296 -93h-17v191q155 68 323 68t268 -53q129 -67 129 -210q0 -89 -58.5 -157.5t-147.5 -86.5v-11q231 -35 231 -254z" />
+<glyph unicode="&#x2783;" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1898 582q0 364 -255 619t-619 255t-619 -255t-255 -619t255 -619t619 -255t619 255t255 619zM1412 321h-154v-276h-201v276h-516v184l511 613h206v-642h154v-155zM1057 476 v436l-363 -436h363z" />
+<glyph unicode="&#x2784;" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1898 582q0 364 -255 619t-619 255t-619 -255t-255 -619t255 -619t619 -255t619 255t255 619zM1407 398q0 -180 -129 -281q-117 -93 -306.5 -93t-330.5 63v195h21 q147 -90 292 -90q240 0 240 202q0 175 -268 175q-65 0 -111.5 -8.5t-130.5 -20.5v578h704v-165h-504v-230q52 4 118 4q405 0 405 -329z" />
+<glyph unicode="&#x2785;" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1898 582q0 364 -255 619t-619 255t-619 -255t-255 -619t255 -619t619 -255t619 255t255 619zM1339 655.5q94 -90.5 94 -257t-113.5 -270.5t-286.5 -104q-216 0 -323 145 q-94 129 -94 352q0 286 133 445q143 172 424 172q91 0 163 -17v-174h-18q-65 31 -157 31q-144 0 -230 -81.5t-101 -225.5q123 75 252 75q163 0 257 -90.5zM1221 393q0 200 -217 200q-89 0 -176 -42q-2 -40 -2 -67q0 -310 208 -310q93 0 140 61.5t47 157.5z" />
+<glyph unicode="&#x2786;" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1898 582q0 364 -255 619t-619 255t-619 -255t-255 -619t255 -619t619 -255t619 255t255 619zM631 953v165h787v-187l-485 -885h-232l510 907h-580z" />
+<glyph unicode="&#x2787;" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1898 582q0 364 -255 619t-619 255t-619 -255t-255 -619t255 -619t619 -255t619 255t255 619zM1441 345q0 -157 -126.5 -240.5t-294 -83.5t-280.5 72q-133 85 -133 246 q0 177 205 264v5q-176 86 -176 248q0 140 130 220q110 67 260.5 67t256.5 -59q130 -73 130 -213q0 -164 -185 -245v-5q213 -85 213 -276zM1207 855q0 71 -53.5 107t-126 36t-121.5 -30q-60 -35 -60 -99.5t109 -129.5q56 -34 158 -65q94 78 94 181zM1230 332q0 56 -27.5 93 t-127.5 78l-147 53q-112 -75 -112 -195q0 -89 62.5 -141.5t149.5 -52.5t144.5 42.5t57.5 122.5z" />
+<glyph unicode="&#x2788;" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1898 582q0 364 -255 619t-619 255t-619 -255t-255 -619t255 -619t619 -255t619 255t255 619zM1433 645q0 -286 -139.5 -453t-419.5 -167q-95 0 -162 18v174h17 q67 -32 158 -32q145 0 230.5 81t100.5 227q-126 -75 -252 -75q-162 0 -256 90t-94 256.5t115 271t287 104.5q415 0 415 -495zM1222 680q0 310 -206 310q-92 0 -140.5 -62.5t-48.5 -157.5q0 -199 218 -199q93 0 175 42q2 54 2 67z" />
+<glyph unicode="&#x2789;" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1898 582q0 364 -255 619t-619 255t-619 -255t-255 -619t255 -619t619 -255t619 255t255 619zM1663 955q58 -128 58 -374.5t-57 -372.5q-84 -184 -300 -184t-299 184 q-57 127 -57 374t57 374q84 184 299 184t299 -185zM867 46h-448v149h125v642h-125v137h4q76 0 110 34q35 34 39 114h175v-927h120v-149zM1509 541v82q0 359 -145 359t-145 -352v-86q0 -361 145 -361t145 358z" />
+<glyph unicode="&#x278a;" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1366 17v157h-232v977h-185q-9 -156 -264 -156h-3v-144h238v-677h-238v-157h684z" />
+<glyph unicode="&#x278b;" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1437 17v173h-557q237 186 327 282q181 194 181 366.5t-123 257.5q-106 74 -288.5 74t-336.5 -70v-206h16q152 101 298 101q206 0 206 -175q0 -75 -46 -155 q-80 -140 -503 -475v-173h826z" />
+<glyph unicode="&#x278c;" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1433 356q0 112 -65.5 181.5t-178.5 86.5v12q93 19 155.5 91t62.5 166q0 150 -136 222q-105 55 -283 55t-340 -71v-202h18q158 98 312 98q209 0 209 -134q0 -108 -111 -142 q-56 -17 -199 -17v-164q163 0 214 -15q116 -33 116 -153q0 -199 -250 -199q-165 0 -321 98h-21v-204q161 -71 359 -71t320 85q139 97 139 277z" />
+<glyph unicode="&#x278d;" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1433 307v163h-162v677h-217l-539 -646v-194h544v-291h212v291h162zM1059 470h-383l383 460v-460z" />
+<glyph unicode="&#x278e;" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM666 538q156 30 255 30q282 0 282 -184q0 -108 -70.5 -160.5t-182.5 -52.5q-153 0 -308 95h-22v-206q148 -66 348 -66t324 98q136 106 136 296q0 347 -427 347q-73 0 -125 -4 v242h532v174h-742v-609z" />
+<glyph unicode="&#x278f;" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1033 -6q182 0 302 109.5t120 285t-99 271t-271 95.5q-135 0 -265 -79q16 152 106.5 237.5t241.5 85.5q98 0 166 -32h19v183q-77 18 -172 18q-296 0 -447 -181 q-140 -167 -140 -469q0 -235 99 -370q113 -154 340 -154zM1232 383q0 -101 -49.5 -166t-147.5 -65q-220 0 -220 327q0 31 2 70q93 45 186 45q229 0 229 -211z" />
+<glyph unicode="&#x2790;" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1439 1147h-829v-174h611l-537 -956h244l511 933v197z" />
+<glyph unicode="&#x2791;" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1464 332q0 202 -225 291v5q195 85 195 259q0 147 -138 224q-111 62 -269.5 62t-274.5 -71q-137 -84 -137 -231q0 -172 186 -262v-5q-217 -91 -217 -278q0 -169 141 -259 q119 -76 295.5 -76t300.5 81q143 95 143 260zM1217 870q0 -110 -99 -191q-282 86 -282 204q0 68 58 103t134 35t132.5 -38t56.5 -113zM1241 318q0 -84 -61 -128.5t-152.5 -44.5t-157 55t-65.5 149q0 127 118 206l155 -56q106 -44 134.5 -83t28.5 -98z" />
+<glyph unicode="&#x2792;" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1455 648q0 522 -437 522q-182 0 -303 -110t-121 -285t99 -270.5t270 -95.5q134 0 265 79q-16 -153 -105.5 -238.5t-242.5 -85.5q-97 0 -167 33h-18v-183q71 -19 171 -19 q295 0 448 182q141 170 141 471zM1233 685q0 -22 -2 -70q-88 -45 -185 -45q-230 0 -230 210q0 100 51.5 166t148.5 66q217 0 217 -327z" />
+<glyph unicode="&#x2793;" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1698 188q61 134 61 393t-62 394q-89 195 -315.5 195t-314.5 -195q-60 -134 -60 -393.5t60 -392.5q88 -195 315.5 -195t315.5 194zM859 17v157h-127v977h-184 q-4 -84 -41 -121q-36 -35 -117 -35h-4v-144h132v-677h-132v-157h473zM1535 519q0 -358 -152.5 -358t-152.5 353v144q0 346 152.5 346t152.5 -355v-130z" />
+<glyph unicode="&#x2794;" horiz-adv-x="1890" d="M100 569v279h1184l-443 450h367l582 -589l-582 -590h-367l443 450h-1184z" />
+<glyph unicode="&#x2795;" horiz-adv-x="1613" d="M1513 586h-588v-586h-239v586h-586v245h586v586h239v-586h588v-245z" />
+<glyph unicode="&#x2796;" horiz-adv-x="1613" d="M1513 586h-1413v245h1413v-245z" />
+<glyph unicode="&#x2797;" horiz-adv-x="1613" d="M1513 586h-1413v245h1413v-245zM925 1172h-239v245h239v-245zM925 0h-239v245h239v-245z" />
+<glyph unicode="&#x2798;" horiz-adv-x="1558" d="M1458 193l-774 104l172 231l-756 441l180 254l666 -568l160 238z" />
+<glyph unicode="&#x2799;" horiz-adv-x="1951" d="M1851 709l-805 -422l164 366l-1110 -137v385l1110 -137l-164 366z" />
+<glyph unicode="&#x279a;" horiz-adv-x="1558" d="M1458 1223l-352 -701l-160 238l-666 -567l-180 253l756 441l-172 231z" />
+<glyph unicode="&#x279b;" horiz-adv-x="1939" d="M1839 709l-615 -136l-587 -233l-13 6l219 344l-743 -26v90l743 -27l-219 342l13 8l587 -233z" />
+<glyph unicode="&#x279c;" horiz-adv-x="1955" d="M1376 166q-88 -100 -167.5 -100t-133 53t-53.5 135t71 160l127 106h-884q-114 0 -164 39q-72 56 -72 143t54 141t173 54h893l-114 109q-84 80 -84 156.5t53.5 133t133.5 56.5t161 -92l485 -551z" />
+<glyph unicode="&#x279d;" horiz-adv-x="1953" d="M1409 677h-1309v64h1309v410l444 -442l-444 -442v410z" />
+<glyph unicode="&#x279e;" horiz-adv-x="2034" d="M1934 582l-621 -502l78 318l-1291 -72l63 256l-63 254l1291 -71l-78 320z" />
+<glyph unicode="&#x279f;" horiz-adv-x="2042" d="M1942 582l-622 -460l71 248l-627 -35l72 247l-72 246l627 -34l-71 248zM776 582l-72 -251l-188 -9l71 260l-71 260l188 -10zM500 582l-70 -265l-114 -6l71 271l-71 271l114 -6zM233 582l-72 -280l-61 -3l71 283l-71 283l61 -2z" />
+<glyph unicode="&#x27a0;" horiz-adv-x="2134" d="M2034 582q-460 -187 -651 -602h-18l42 256l-409 -22l71 368l-71 368l409 -21l-42 255h18q191 -416 651 -602zM1012 582l-72 -372l-177 -8l71 380l-71 382l177 -10zM741 582l-71 -385l-122 -7l70 392l-70 394l122 -8zM399 582l-71 406l80 -5l70 -401l-70 -400l-80 -4z M228 582q0 3 -24 -138l-47 -276l-57 -2l71 416l-71 416l57 -2z" />
+<glyph unicode="&#x27a1;" horiz-adv-x="2134" d="M2034 582l-651 -602h-18l42 256l-1307 -70v832l1307 -69l-42 255h18z" />
+<glyph unicode="&#x27a2;" horiz-adv-x="1949" d="M1849 709l-1749 -508l602 508l-602 508zM1656 709l-1308 360l446 -360h862z" />
+<glyph unicode="&#x27a3;" horiz-adv-x="1949" d="M1849 709l-1749 -508l602 508l-602 508zM1656 709h-862l-446 -361z" />
+<glyph unicode="&#x27a4;" horiz-adv-x="1935" d="M1835 709l-1735 -709l412 709l-412 708z" />
+<glyph unicode="&#x27a5;" horiz-adv-x="1963" d="M1144 340h-669q-194 0 -281 92q-62 66 -78 135.5t-16 184.5v493h82v-33q0 -170 85 -223q62 -39 241 -39h636v172l719 -475l-719 -475v168z" />
+<glyph unicode="&#x27a6;" horiz-adv-x="1963" d="M1144 465h-634q-181 0 -242 -38q-86 -52 -86 -222v-33h-82v494q0 113 16.5 183t77.5 134q90 94 281 94h669v168l719 -475l-719 -475v170z" />
+<glyph unicode="&#x27a7;" horiz-adv-x="1007" d="M362 0h-262v1233h262v295l545 -911l-545 -912v295z" />
+<glyph unicode="&#x27a8;" horiz-adv-x="1865" d="M909 145v191h-809v747h809v193h22q140 -226 360 -375.5t474 -179.5v-19q-242 -37 -438 -157q-115 -70 -265 -240q-97 -109 -131 -160h-22z" />
+<glyph unicode="&#x27a9;" horiz-adv-x="1771" d="M862 90v322h-762v594h762v321h282l527 -618l-527 -619h-282zM915 954h-762v-491h762v-330l512 576l-512 575v-330z" />
+<glyph unicode="&#x27aa;" horiz-adv-x="1771" d="M835 90v322h-735v594h735v321h254l582 -618l-582 -619h-254zM1058 954h-749v-491h749v-330l541 576l-541 575v-330z" />
+<glyph unicode="&#x27ab;" horiz-adv-x="1832" d="M815 395h-715v264l371 377h788l139 174l334 -376v-238l-917 -389v188zM1687 821l-287 324l-122 -152h-791l-344 -354h850l-121 -162z" />
+<glyph unicode="&#x27ac;" horiz-adv-x="1832" d="M100 1022h715v188l917 -389v-237l-334 -377l-139 174h-788l-371 377v264zM1687 596l-815 344l121 -162h-850l344 -354h791l122 -152z" />
+<glyph unicode="&#x27ad;" horiz-adv-x="1482" d="M604 252h-328l-176 168v692h504v215l778 -663l-602 -574l-176 129v33zM657 1053h-500v-598h500v-203l528 500l-528 454v-153z" />
+<glyph unicode="&#x27ae;" horiz-adv-x="1482" d="M604 305h-504v692l176 168h328v33l176 129l602 -573l-778 -664v215zM657 963h-500v-598h500v-154l528 455l-528 499v-202z" />
+<glyph unicode="&#x27af;" horiz-adv-x="1849" d="M1187 354h-946l-141 140l141 266l-137 321h1083v187l562 -559l-562 -551v196zM1237 1028h-1051l111 -268l-140 -266h1080v-109l381 375l-381 391v-123z" />
+<glyph unicode="&#x27b0;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x27b1;" horiz-adv-x="1849" d="M1187 336h-1083l137 321l-141 267l141 139h946v197l562 -551l-562 -559v186zM1237 924h-1080l140 -267l-111 -268h1051v-123l381 391l-381 375v-108z" />
+<glyph unicode="&#x27b2;" horiz-adv-x="1613" d="M1513 709q0 -291 -213.5 -500t-595.5 -209q-198 0 -367 61q-229 83 -237 242h725v-246l639 652l-639 651v-246h-725q24 161 223 236q177 67 381 67q346 0 563 -182q246 -206 246 -526z" />
+<glyph unicode="&#x27b3;" horiz-adv-x="1994" d="M1527 328q-69 75 -69 181t69 175h-450l-248 -356h-729l268 381l-268 383h729l248 -359h450q-69 72 -69 178t69 181q125 -307 367 -383q-246 -85 -367 -381zM1013 733l-215 307h-100l213 -307h102zM845 733l-213 307h-100l211 -307h102zM680 733l-213 307h-105l215 -307 h103zM1011 684h-100l-209 -305h98zM512 733l-215 307h-99l213 -307h101zM845 684h-100l-211 -305h103zM680 684h-105l-209 -305h107zM510 684h-101l-207 -305h99z" />
+<glyph unicode="&#x27b4;" horiz-adv-x="1638" d="M993 862q0 -129 33 -309l-533 446l-33 342l533 -446v-33zM1228 125q-83 0 -143 -21q1 55 51.5 107.5t104.5 60.5l-256 215l49 60l256 -215q6 64 47 120t100 72l-6 -61q0 -170 107 -369l-15 -18q-150 49 -295 49zM977 492l-342 -29l-535 448l346 27z" />
+<glyph unicode="&#x27b5;" horiz-adv-x="1828" d="M1374 434q-29 46 -29 116.5t39 117.5h-334v82h334q-41 53 -41 123.5t31 109.5q106 -162 354 -262v-25q-247 -101 -354 -262zM1040 750h-692l-248 235h694q114 -136 246 -235zM1040 668l-244 -244h-696l248 244h692z" />
+<glyph unicode="&#x27b6;" horiz-adv-x="1638" d="M1228 1292q145 0 295 49l15 -18q-107 -199 -107 -369l6 -61q-59 16 -100 72t-47 120l-256 -215l-49 60l256 215q-54 8 -104.5 60.5t-51.5 107.5q60 -21 143 -21zM977 926l-531 -447h-16l-330 27l535 448l18 -4zM993 555v-33l-533 -446l33 342l533 446q-33 -180 -33 -309z " />
+<glyph unicode="&#x27b7;" horiz-adv-x="1877" d="M1777 -39q-141 47 -331 47t-388 -39q205 205 385 226l-192 159q-186 154 -305 154q-77 0 -166.5 -38t-149.5 -93l-530 444q159 152 354 152q77 0 146 -27q-56 103 -56 234t91 278l530 -444q-80 -125 -80 -271q0 -104 67 -193q41 -55 148 -144l189 -158l-3 41q-1 11 -1 22 q0 156 157 355v-82q0 -361 135 -623z" />
+<glyph unicode="&#x27b8;" horiz-adv-x="2037" d="M1282 674q-229 0 -318 -64q-64 -46 -113 -139.5t-59 -177.5h-692q13 140 93 255t208 161q-260 101 -301 415h692q18 -187 144 -295q66 -57 166 -75q61 -11 184 -11h246q-142 142 -150 420q240 -322 555 -454q-274 -110 -555 -455q23 286 150 420h-250z" />
+<glyph unicode="&#x27b9;" horiz-adv-x="1877" d="M1642 836v-82q-157 199 -157 354q0 11 1 22l3 41l-189 -157q-106 -88 -148 -144q-67 -90 -67 -194q0 -145 80 -270l-530 -445q-91 147 -91 278t56 234q-69 -27 -146 -27q-195 0 -354 152l530 444q60 -55 149.5 -93t166.5 -38q120 0 305 154l192 160q-181 21 -385 225 q198 -39 388 -39t331 47q-135 -262 -135 -622z" />
+<glyph unicode="&#x27ba;" horiz-adv-x="1759" d="M1288 309q-50 -78 -122 -78t-114.5 41.5t-42.5 106.5t53.5 118t122.5 78l283 103l51 12l-4 4l-452 -37l-463 -108q-227 -53 -275 -53q-102 0 -163.5 55.5t-61.5 157.5q0 215 225 215q41 0 262 -52l451 -106l477 -41l4 4l-309 105q-78 27 -140.5 82t-62.5 122.5 t43.5 107.5t108.5 40q105 0 149 -121q57 -157 127.5 -231t223.5 -115v-21q-134 -32 -212.5 -103.5t-125.5 -201.5q-9 -30 -33 -84z" />
+<glyph unicode="&#x27bb;" horiz-adv-x="1842" d="M1195 352.5q-44 71.5 -44 145t31 115.5t100 83v4h-49q-115 0 -227.5 -35t-216 -125t-152.5 -120q-85 -51 -178 -51t-166 75q-37 38 -75.5 151.5t-117.5 113.5q78 16 117 126.5t86 158.5q62 63 170 63t216 -86q182 -146 206 -160q147 -86 348 -86h39v4q-133 74 -133 193 q0 76 45 149.5t112 112.5q26 -137 157 -270t279 -205q-145 -66 -277 -198.5t-159 -268.5q-67 39 -111 110.5z" />
+<glyph unicode="&#x27bc;" horiz-adv-x="1953" d="M1777 821q76 -73 76 -117.5t-80 -119.5l-184 -172q-88 -82 -132 -82t-91 23t-47 59q0 19 22.5 66.5t22.5 70.5q0 51 -93 51h-114q-107 0 -140.5 -16.5t-101.5 -100.5l-65 -80q-59 -73 -83.5 -84.5t-117.5 -11.5h-451q-98 0 -98 62q0 21 16 45l25 37l121 196q26 35 26 60 t-53 108l-90 141q-45 71 -45 95q0 59 115 59h446q81 0 102.5 -9t71.5 -69l80 -96q70 -83 101 -100t133 -17h116q49 0 63 4q36 9 36 40t-22.5 76t-22.5 60q0 82 135 82q53 0 110 -55z" />
+<glyph unicode="&#x27bd;" horiz-adv-x="2035" d="M1872 815q63 -64 63 -106.5t-63 -106.5l-336 -340q-75 -76 -126 -76t-85.5 35t-34.5 75.5t8 72.5l25 100q10 40 10 59q0 62 -74 62t-110 -43q-15 -17 -74 -123l-78 -139q-48 -86 -114 -111q-47 -18 -162 -18h-467q-154 0 -154 149q0 40 20 103l72 227q14 44 14 72.5 t-14 72.5l-72 228q-20 63 -20 108q0 146 154 146h467q110 0 157 -16q70 -24 113 -101l84 -152q52 -94 64 -109q44 -57 104 -57q90 0 90 62q0 19 -10 59l-25 101q-8 32 -8 72t34.5 75t85.5 35t126 -76z" />
+<glyph unicode="&#x27be;" horiz-adv-x="1941" d="M1841 709q-336 -204 -527 -506h-124q211 322 483 506q-286 196 -486 505h127q166 -280 527 -505zM100 788v97h1047q-162 166 -248 329h114q142 -231 390 -426h-1303zM100 530v99h1303q-239 -187 -385 -426h-115q109 198 244 327h-1047z" />
+<glyph unicode="&#x27bf;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x27c0;" horiz-adv-x="1573" d="M1434 41q0 -41 -68 -41h-1139q-61 0 -66 35q-2 11 -2 33v1269q0 68 41 68t41 -68v-1192l884 1017q13 15 30 15q43 0 43 -42q0 -14 -11 -27l-892 -1026h1071q68 0 68 -41z" />
+<glyph unicode="&#x27c1;" d="M1986 35q0 -35 -44 -35h-1836q-44 0 -44 35q0 14 9 28l918 1466q14 23 35 23t35 -23l918 -1466q9 -14 9 -28zM1868 82l-844 1348l-844 -1348h1688zM1461 326q0 -35 -44 -35h-786q-44 0 -44 35q0 14 9 28l393 627q16 25 35 25t35 -25l393 -627q9 -14 9 -28zM1343 373 l-319 509l-319 -509h638z" />
+<glyph unicode="&#x27c2;" horiz-adv-x="1591" d="M1479 41q0 -41 -37 -41h-1288q-39 0 -39 41t39 41h602v1245q0 37 41 37t41 -37v-1245h604q37 0 37 -41z" />
+<glyph unicode="&#x27c3;" horiz-adv-x="1591" d="M1421 41q0 -41 -39 -41h-590q-248 0 -435 168.5t-187 413.5t187 413.5t435 168.5h590q39 0 39 -41t-39 -41h-584q-216 0 -381 -143.5t-165 -356.5t165 -356.5t381 -143.5h584q39 0 39 -41zM1301 810q95 -95 95 -228.5t-94.5 -228t-227.5 -94.5t-227.5 94.5t-94.5 228 t95 228.5t227 95t227 -95zM1243.5 411.5q70.5 70.5 70.5 170t-71 170.5t-169 71t-169 -71t-71 -170.5t70.5 -170t169.5 -70.5t169.5 70.5z" />
+<glyph unicode="&#x27c4;" horiz-adv-x="1591" d="M1421 582q0 -245 -187 -413.5t-435 -168.5h-590q-39 0 -39 41t39 41h584q216 0 381 143.5t165 356.5t-165 356.5t-381 143.5h-584q-39 0 -39 41t39 41h590q248 0 435 -168.5t187 -413.5zM744.5 810.5q94.5 -94.5 94.5 -228t-95 -228.5t-227 -95t-227 95t-95 228.5 t94.5 228t227.5 94.5t227.5 -94.5zM686 412q71 71 71 170.5t-70.5 170t-169.5 70.5t-169.5 -70.5t-70.5 -170t71 -170.5t169 -71t169 71z" />
+<glyph unicode="&#x27c5;" horiz-adv-x="1024" d="M739 -317q0 -33 -63 -33q-173 0 -282 143.5t-109 310t88 337.5l164 285q88 169 88 323q0 236 -147 345q-43 32 -142 52q-51 10 -51 35q0 33 63 33q173 0 282 -143.5t109 -311t-88 -338.5l-164 -285q-88 -169 -88 -321q0 -236 147 -345q43 -32 142 -52q51 -10 51 -35z" />
+<glyph unicode="&#x27c6;" horiz-adv-x="1024" d="M651 441q88 -171 88 -337.5t-109 -310t-282 -143.5q-63 0 -63 33q0 25 56.5 36t79.5 18.5t57 32.5q147 109 147 345q0 152 -88 321l-164 285q-88 171 -88 338.5t109 311t282 143.5q63 0 63 -33q0 -25 -56.5 -36t-79.5 -18.5t-57 -32.5q-147 -109 -147 -345 q0 -154 88 -323z" />
+<glyph unicode="&#x27c7;" horiz-adv-x="1364" d="M1249 1183q0 -11 -2 -16l-526 -1188q-11 -25 -39 -25t-39 25l-526 1188q-2 5 -2 16q0 41 41 41q26 0 37 -25l489 -1103l489 1103q11 25 37 25q41 0 41 -41zM791 867q0 -45 -32 -77t-77 -32t-77 32t-32 77t32 77t77 32t77 -32t32 -77z" />
+<glyph unicode="&#x27c8;" horiz-adv-x="1991" d="M1821 41q0 -41 -39 -41h-590q-248 0 -435 168.5t-187 413.5t187 413.5t435 168.5h590q39 0 39 -41t-39 -41h-584q-216 0 -381 -143.5t-165 -356.5t165 -356.5t381 -143.5h584q39 0 39 -41zM569 -311q0 -41 -39 -41q-33 0 -40 26l-488 1788q-2 7 -2 13q0 41 39 41 q33 0 40 -26l488 -1788q2 -7 2 -13z" />
+<glyph unicode="&#x27c9;" horiz-adv-x="1991" d="M1421 582q0 -245 -187 -413.5t-435 -168.5h-590q-39 0 -39 41t39 41h584q216 0 381 143.5t165 356.5t-165 356.5t-381 143.5h-584q-39 0 -39 41t39 41h590q248 0 435 -168.5t187 -413.5zM1991 1475q0 -6 -2 -13l-488 -1788q-7 -26 -40 -26q-39 0 -39 41q0 6 2 13 l488 1788q7 26 40 26q39 0 39 -41z" />
+<glyph unicode="&#x27ca;" horiz-adv-x="1194" d="M1024 582q0 -41 -37 -41h-349v-846q0 -37 -41 -37t-41 37v846h-347q-39 0 -39 41t39 41h347v846q0 37 41 37t41 -37v-846h349q37 0 37 -41z" />
+<glyph unicode="&#x27cb;" horiz-adv-x="1174" d="M964 1505q0 -8 -2 -13l-673 -1848q-9 -26 -40 -26q-39 0 -39 41q0 8 2 13l673 1848q9 26 40 26q39 0 39 -41z" />
+<glyph unicode="&#x27cc;" horiz-adv-x="1221" d="M1083 1294q0 -41 -41 -41h-787q63 -225 63 -483t-60 -494q-5 -24 -19 -70q-12 -29 -38 -29q-42 0 -42 39q0 7 2 14q75 268 75 537t-75 514q-3 10 -3 17q0 37 42 37h842q41 0 41 -41z" />
+<glyph unicode="&#x27cd;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x27ce;" horiz-adv-x="1591" d="M1488 -72q0 -39 -37 -39h-1308q-39 0 -39 39v1310q0 37 39 37h1308q37 0 37 -37v-1310zM1406 -29v1222h-1220v-1222h44l527 1189q11 25 38.5 25t39.5 -25l526 -1189h45zM1271 -29l-475 1072l-474 -1072h949z" />
+<glyph unicode="&#x27cf;" horiz-adv-x="1591" d="M1488 -74q0 -37 -39 -37h-1308q-37 0 -37 37v1310q0 39 37 39h1308q39 0 39 -39v-1310zM1270 1193h-949l476 -1072zM1406 -29v1222h-44l-526 -1189q-12 -25 -39.5 -25t-38.5 25l-527 1189h-45v-1222h1220z" />
+<glyph unicode="&#x27d0;" horiz-adv-x="1591" d="M1550 609q11 -11 11 -27.5t-10 -26.5l-727 -727q-11 -11 -27.5 -11t-27.5 11l-728 729q-10 10 -10 26t11 27l727 727q10 10 26 10t26 -10zM1461 581l-666 666l-664 -664l666 -666zM1046 582q0 -104 -73 -177t-177.5 -73t-177 73t-72.5 177t72.5 177t177 73t177.5 -73 t73 -177z" />
+<glyph unicode="&#x27d1;" horiz-adv-x="1364" d="M1249 -4q0 -41 -41 -41q-26 0 -37 25l-489 1103l-489 -1103q-11 -25 -37 -25q-41 0 -41 41q0 11 2 16l526 1188q11 25 39 25t39 -25l526 -1188q2 -5 2 -16zM791 312q0 -45 -32 -77t-77 -32t-77 32t-32 77t32 77t77 32t77 -32t32 -77z" />
+<glyph unicode="&#x27d2;" horiz-adv-x="1364" d="M1264 623q0 -253 -166 -438t-416 -185t-416 185t-166 438v364q0 37 41 37t41 -37v-358q0 -201 132 -373t327 -172v903q0 37 41 37t41 -37v-903q195 0 327 172t132 373v358q0 37 41 37t41 -37v-364z" />
+<glyph unicode="&#x27d3;" horiz-adv-x="1024" d="M907 -8q0 -37 -37 -37h-718q-37 0 -37 41t37 41h673v674q0 39 41 39t41 -39v-719zM526 445q0 -45 -32 -77t-77 -32t-77 32t-32 77t32 77t77 32t77 -32t32 -77z" />
+<glyph unicode="&#x27d4;" horiz-adv-x="1024" d="M907 1380q0 -41 -37 -41h-673v-673q0 -39 -41 -39t-41 39v718q0 37 37 37h718q37 0 37 -41zM714 931q0 -45 -32 -77t-77 -32t-77 32t-32 77t32 77t77 32t77 -32t32 -77z" />
+<glyph unicode="&#x27d5;" d="M1933 -100q0 -59 -61 -59q-22 0 -45 23l-633 633l-636 -633q-23 -23 -47 -23h-359q-37 0 -37 41t37 41h298v1318h-298q-37 0 -37 41t37 41h359q27 0 47 -20l636 -635l633 635q20 20 45 20q61 0 61 -55v-1368zM1851 -45v1257l-627 -630zM1163 582l-631 632v-1261z" />
+<glyph unicode="&#x27d6;" d="M1933 -118q0 -41 -37 -41h-359q-24 0 -47 23l-636 633l-633 -633q-23 -23 -45 -23q-61 0 -61 59v1368q0 55 61 55q25 0 45 -20l633 -635l636 635q20 20 47 20h359q37 0 37 -41t-37 -41h-298v-1318h298q37 0 37 -41zM1516 -47v1261l-631 -632zM824 582l-627 630v-1257z " />
+<glyph unicode="&#x27d7;" horiz-adv-x="2383" d="M2268 -118q0 -41 -37 -41h-359q-22 0 -45 23l-633 633l-636 -633q-23 -23 -47 -23h-359q-37 0 -37 41t37 41h298v1318h-298q-37 0 -37 41t37 41h359q27 0 47 -20l636 -635l633 635q20 20 45 20h359q37 0 37 -41t-37 -41h-298v-1318h298q37 0 37 -41zM1851 -45v1257 l-627 -630zM1163 582l-631 632v-1261z" />
+<glyph unicode="&#x27d8;" horiz-adv-x="1591" d="M1506 41q0 -41 -39 -41h-1345q-37 0 -37 41t37 41h632v1402q0 39 41 39t41 -39v-1402h631q39 0 39 -41z" />
+<glyph unicode="&#x27d9;" horiz-adv-x="1591" d="M1506 1482q0 -41 -39 -41h-631v-1402q0 -39 -41 -39t-41 39v1402h-632q-37 0 -37 41t37 41h1345q39 0 39 -41z" />
+<glyph unicode="&#x27da;" d="M2002 512q0 -41 -37 -41h-701v-432q0 -39 -41 -39t-41 39v1345q0 37 41 37t41 -37v-434h701q37 0 37 -41t-37 -41h-701v-315h701q37 0 37 -41zM867 39q0 -39 -41 -39t-41 39v432h-701q-37 0 -37 41t37 41h701v315h-701q-37 0 -37 41t37 41h701v434q0 37 41 37t41 -37 v-1345z" />
+<glyph unicode="&#x27db;" d="M2032 711q0 -41 -37 -41h-731v-631q0 -39 -41 -39t-41 39v1345q0 37 41 37t41 -37v-632h731q37 0 37 -41zM867 39q0 -39 -41 -39t-41 39v631h-731q-37 0 -37 41t37 41h731v632q0 37 41 37t41 -37v-1345z" />
+<glyph unicode="&#x27dc;" d="M1948 582q0 -41 -37 -41h-1163q-16 -122 -108.5 -203.5t-220.5 -81.5t-223.5 96.5t-95.5 230t95 229.5t223 96t221.5 -82t108.5 -203h1163q37 0 37 -41zM668 582q0 100 -72 172t-171.5 72t-171 -72.5t-71.5 -171.5t71.5 -171.5t171 -72.5t171.5 72t72 172z" />
+<glyph unicode="&#x27dd;" horiz-adv-x="1756" d="M1671 582q0 -41 -39 -41h-1380v-631q0 -39 -41 -39t-41 39v1345q0 37 41 37t41 -37v-632h1380q39 0 39 -41z" />
+<glyph unicode="&#x27de;" horiz-adv-x="1756" d="M1586 -90q0 -39 -41 -39t-41 39v631h-1380q-39 0 -39 41t39 41h1380v632q0 37 41 37t41 -37v-1345z" />
+<glyph unicode="&#x27df;" horiz-adv-x="722" d="M722 -301q0 -41 -37 -41h-646q-39 0 -39 41t39 41h281v1118q-121 15 -203 108.5t-82 221.5t96 223t229.5 95t230 -95.5t96.5 -223.5t-81.5 -220.5t-203.5 -108.5v-1118h283q37 0 37 -41zM533 1010q72 72 72 171.5t-72.5 171t-171.5 71.5t-171.5 -71.5t-72.5 -171 t72 -171.5t172 -72t172 72z" />
+<glyph unicode="&#x27e0;" horiz-adv-x="1364" d="M682 -353q-25 0 -39 25l-503 910l503 910q14 25 39 25t39 -25l503 -910l-503 -910q-14 -25 -39 -25zM1098 623l-416 752l-416 -752h832zM1098 541h-832l416 -752z" />
+<glyph unicode="&#x27e1;" horiz-adv-x="1946" d="M1831 590q0 -23 -34 -38q-60 -25 -178 -80q-353 -186 -532 -532q-2 -4 -75 -174q-15 -34 -39 -34t-39 34q-23 58 -75 174q-179 346 -532 532q-14 7 -178 80q-34 15 -34 38t34 38q60 25 178 80q353 186 532 532q2 4 75 174q15 34 39 34t39 -34q23 -58 75 -174 q179 -346 532 -532q14 -7 178 -80q34 -15 34 -38zM1674 590q-492 218 -701 698q-209 -480 -701 -698q492 -218 701 -698q209 480 701 698z" />
+<glyph unicode="&#x27e2;" horiz-adv-x="2141" d="M2131 582q0 -23 -34 -38q-60 -25 -178 -80q-353 -186 -532 -532q-2 -4 -75 -174q-15 -34 -39 -34t-39 34q-23 58 -75 174q-179 346 -532 532q-22 11 -171 77h-407q-39 0 -39 41t39 41h407q57 24 171 77q353 186 532 532q2 4 75 174q15 34 39 34t39 -34q23 -58 75 -174 q179 -346 532 -532q14 -7 178 -80q34 -15 34 -38zM1974 582q-492 218 -701 698q-209 -480 -701 -698q492 -218 701 -698q209 480 701 698z" />
+<glyph unicode="&#x27e3;" horiz-adv-x="2141" d="M2131 582q0 -41 -39 -41h-407q-57 -24 -171 -77q-353 -186 -532 -532q-2 -4 -75 -174q-15 -34 -39 -34t-39 34q-23 58 -75 174q-179 346 -532 532q-14 7 -178 80q-34 15 -34 38t34 38q60 25 178 80q353 186 532 532q2 4 75 174q15 34 39 34t39 -34q23 -58 75 -174 q179 -346 532 -532q22 -11 171 -77h407q39 0 39 -41zM1569 582q-492 218 -701 698q-209 -480 -701 -698q492 -218 701 -698q209 480 701 698z" />
+<glyph unicode="&#x27e4;" d="M1948 -2q0 -39 -37 -39h-1168q-39 0 -39 39v543h-495q-39 0 -39 41t39 41h495v545q0 37 39 37h1168q37 0 37 -37v-1170zM1866 41v1082h-1080v-1082h1080z" />
+<glyph unicode="&#x27e5;" d="M1948 582q0 -41 -39 -41h-495v-543q0 -39 -39 -39h-1168q-37 0 -37 39v1170q0 37 37 37h1168q39 0 39 -37v-545h495q39 0 39 -41zM1332 41v1082h-1080v-1082h1080z" />
+<glyph unicode="&#x27e6;" horiz-adv-x="682" d="M571 -309q0 -41 -68 -41h-391v1864h391q68 0 68 -40.5t-68 -40.5h-109v-1701h109q68 0 68 -41zM313 -268v1701h-120v-1701h120z" />
+<glyph unicode="&#x27e7;" horiz-adv-x="682" d="M570 -350h-391q-68 0 -68 41t68 41h109v1701h-109q-68 0 -68 40.5t68 40.5h391v-1864zM489 -268v1701h-120v-1701h120z" />
+<glyph unicode="&#x27e8;" horiz-adv-x="666" d="M558 -312q0 -38 -42 -38q-23 0 -43 47l-382 885l382 885q20 47 43 47q42 0 42 -38q0 -17 -8 -36l-371 -858l371 -858q8 -19 8 -36z" />
+<glyph unicode="&#x27e9;" horiz-adv-x="666" d="M150 -350q-42 0 -42 38q0 17 8 36l371 858l-371 858q-8 19 -8 36q0 38 42 38q23 0 43 -47l382 -885l-382 -885q-20 -47 -43 -47z" />
+<glyph unicode="&#x27ea;" horiz-adv-x="966" d="M558 -312q0 -38 -42 -38q-23 0 -43 47l-382 885l382 885q20 47 43 47q42 0 42 -38q0 -17 -8 -36l-371 -858l371 -858q8 -19 8 -36zM858 -312q0 -38 -42 -38q-23 0 -43 47l-382 885l382 885q20 47 43 47q42 0 42 -38q0 -17 -8 -36l-371 -858l371 -858q8 -19 8 -36z" />
+<glyph unicode="&#x27eb;" horiz-adv-x="966" d="M150 -350q-42 0 -42 38q0 17 8 36l371 858l-371 858q-8 19 -8 36q0 38 42 38q23 0 43 -47l382 -885l-382 -885q-20 -47 -43 -47zM450 -350q-42 0 -42 38q0 17 8 36l371 858l-371 858q-8 19 -8 36q0 38 42 38q23 0 43 -47l382 -885l-382 -885q-20 -47 -43 -47z" />
+<glyph unicode="&#x27ec;" horiz-adv-x="873" d="M663 -275q46 -35 46 -55t-17 -20q-77 0 -228 118q-193 150 -300 331v966q107 181 300 331q151 118 228 118q17 0 17 -20t-46 -55q-142 -109 -231 -332v-1050q89 -223 231 -332zM393 -53q-24 49 -42 94v1082q21 54 41 94q-107 -112 -147 -175v-920q38 -60 148 -175z" />
+<glyph unicode="&#x27ed;" horiz-adv-x="873" d="M181 -350q-17 0 -17 20t46 55q142 109 231 332v1050q-89 223 -231 332q-46 35 -46 55t17 20q77 0 228 -118q193 -150 300 -331v-966q-107 -181 -300 -331q-151 -118 -228 -118zM628 122v920q-38 60 -148 175q24 -49 42 -94v-1082q-21 -52 -50 -110q94 92 156 191z" />
+<glyph unicode="&#x27ee;" horiz-adv-x="582" d="M474 -332q0 -18 -19 -18q-10 0 -46 29q-156 128 -216 212t-82 212q-14 79 -17 195.5t-3 283.5t3 283.5t17 195.5q22 128 82 212t216 212q36 29 46 29q19 0 19 -18q0 -9 -24 -32q-90 -87 -131 -176q-70 -154 -70 -532v-347q0 -379 70 -533q41 -89 131 -176q24 -23 24 -32z " />
+<glyph unicode="&#x27ef;" horiz-adv-x="582" d="M491 582q0 -167 -3 -283.5t-17 -195.5q-22 -128 -82 -212t-216 -212q-36 -29 -46 -29q-19 0 -19 18q0 9 24 32q90 87 131 176q70 154 70 532v347q0 379 -70 533q-41 89 -131 176q-24 23 -24 32q0 18 19 18q10 0 46 -29q156 -128 216 -212t82 -212q14 -79 17 -195.5 t3 -283.5z" />
+<glyph unicode="&#x27f0;" horiz-adv-x="1602" d="M1540 846q0 -42 -39 -42q-6 0 -44 13t-105 47v-1145q0 -37 -41 -37t-41 37v1188q-141 82 -258 192v-1380q0 -37 -41 -37t-41 37v1464q-78 88 -129 179q-51 -91 -129 -179v-1464q0 -37 -41 -37t-41 37v1380q-117 -110 -258 -192v-1188q0 -37 -41 -37t-41 37v1145 q-67 -34 -105 -47t-44 -13q-39 0 -39 42q0 22 27 36q46 18 135 57q281 138 464 394q25 42 78 124q17 25 35 25t35 -25q25 -42 78 -124q183 -256 464 -394q46 -17 135 -57q27 -14 27 -36z" />
+<glyph unicode="&#x27f1;" horiz-adv-x="1602" d="M1540 318q0 -22 -27 -36q-46 -18 -135 -57q-281 -138 -464 -394q-25 -42 -78 -124q-17 -25 -35 -25t-35 25q-25 42 -78 124q-183 256 -464 394q-46 17 -135 57q-27 14 -27 36q0 42 39 42q6 0 44 -13t105 -47v1145q0 37 41 37t41 -37v-1188q141 -82 258 -192v1380 q0 37 41 37t41 -37v-1464q78 -88 129 -179q51 91 129 179v1464q0 37 41 37t41 -37v-1380q117 110 258 192v1188q0 37 41 37t41 -37v-1145q67 34 105 47t44 13q39 0 39 -42z" />
+<glyph unicode="&#x27f2;" horiz-adv-x="1024" d="M995 582q0 -200 -141.5 -341.5t-341.5 -141.5q-91 0 -190 38.5t-152 102.5q-10 12 -10 27q0 42 42 42q12 0 26 -11q144 -117 284 -117q166 0 283.5 117.5t117.5 283.5t-117.5 283.5t-278.5 117.5t-275.5 -105t-128.5 -259q36 36 95.5 75.5t92.5 39.5q39 0 39 -41 q0 -22 -25 -36q-22 -10 -44 -19q-90 -42 -177 -174q-13 -20 -24 -20t-24 20q-87 132 -177 174q-22 9 -44 19q-25 14 -25 36q0 41 39 41q33 0 95 -41t96 -77q13 189 152 319t334.5 130t337 -141.5t141.5 -341.5z" />
+<glyph unicode="&#x27f3;" horiz-adv-x="1024" d="M1224 693q0 -22 -25 -36q-22 -10 -44 -19q-90 -42 -177 -174q-13 -20 -24 -20t-24 20q-87 132 -177 174q-22 9 -44 19q-25 14 -25 36q0 41 39 41q33 0 92.5 -39.5t95.5 -75.5q-14 154 -128.5 259t-275.5 105t-278.5 -117.5t-117.5 -283.5t117.5 -283.5t283.5 -117.5 q140 0 284 117q14 11 26 11q42 0 42 -42q0 -15 -10 -27q-53 -64 -152 -102.5t-190 -38.5q-200 0 -341.5 141.5t-141.5 341.5t141.5 341.5t337 141.5t334.5 -130t152 -319q34 36 96 77t95 41q39 0 39 -41z" />
+<glyph unicode="&#x27f4;" horiz-adv-x="3008" d="M2866 611q25 -11 25 -27t-15 -22l-46 -18q-190 -83 -296 -265q-41 -70 -79 -213q-2 -7 -8 -13t-53 -6q-21 0 -21 27q0 2 8 36q65 274 287 431h-591q-16 -284 -224.5 -483t-495.5 -199t-496.5 198.5t-225.5 483.5h-481q-39 0 -39 41t39 41h481q16 286 224.5 484t497 198 t496.5 -198.5t224 -483.5h591q-154 111 -238 288q-57 121 -57 179q0 24 21 28q-3 -1 41 -1q15 0 20 -19q14 -55 54 -163q105 -217 317 -310zM1397 623h598q-16 241 -187 412.5t-411 186.5v-599zM1315 623v599q-241 -16 -412 -187t-186 -412h598zM1397 541v-599 q239 15 410.5 187t187.5 412h-598zM1315 541h-598q16 -240 187 -411.5t411 -187.5v599z" />
+<glyph unicode="&#x27f5;" horiz-adv-x="3008" d="M2891 582q0 -41 -39 -41h-2514q222 -157 287 -431q8 -34 8 -36q0 -27 -21 -27q-47 0 -53 6t-8 13q-22 84 -35.5 123t-43.5 90q-106 182 -296 265l-47 18q-14 6 -14 22t25 27l40 14q210 91 317 310q24 49 54 163q5 19 20 19q44 0 41 1q21 -4 21 -28q0 -58 -57 -179 q-84 -177 -238 -288h2514q39 0 39 -41z" />
+<glyph unicode="&#x27f6;" horiz-adv-x="3008" d="M2866 611q25 -11 25 -27t-15 -22l-46 -18q-190 -83 -296 -265q-41 -70 -79 -213q-2 -7 -8 -13t-53 -6q-21 0 -21 27q0 2 8 36q65 274 287 431h-2514q-39 0 -39 41t39 41h2514q-154 111 -238 288q-57 121 -57 179q0 24 21 28q-3 -1 41 -1q15 0 20 -19q14 -55 54 -163 q105 -217 317 -310z" />
+<glyph unicode="&#x27f7;" horiz-adv-x="3008" d="M2866 611q25 -11 25 -27t-15 -22l-46 -18q-190 -83 -296 -265q-41 -70 -79 -213q-2 -7 -8 -13t-53 -6q-21 0 -21 27q0 2 8 36q65 274 287 431h-2330q222 -157 287 -431q8 -34 8 -36q0 -27 -21 -27q-47 0 -53 6t-8 13q-22 84 -35.5 123t-43.5 90q-106 182 -296 265l-47 18 q-14 6 -14 22t25 27l40 14q210 91 317 310q24 49 54 163q5 19 20 19q44 0 41 1q21 -4 21 -28q0 -58 -57 -179q-84 -177 -238 -288h2330q-154 111 -238 288q-57 121 -57 179q0 24 21 28q-3 -1 41 -1q15 0 20 -19q14 -55 54 -163q105 -217 317 -310z" />
+<glyph unicode="&#x27f8;" horiz-adv-x="3008" d="M2891 383q0 -41 -37 -41h-2200q45 -44 126 -155t81 -146q0 -20 -23 -23q7 1 -38 1q-11 0 -17 12q-74 142 -162 238q-175 191 -418 272l-71 21q-16 5 -16 20t16 23l68 20q172 56 323 177.5t260 330.5q6 12 58 12q20 0 20 -28.5t-80.5 -138.5t-126.5 -156h2200q37 0 37 -41 t-37 -41h-2290q-120 -99 -262 -158q142 -59 262 -158h2290q37 0 37 -41z" />
+<glyph unicode="&#x27f9;" horiz-adv-x="3008" d="M2891 582q0 -15 -14 -20q-36 -10 -107 -34q-357 -136 -546 -497q-6 -12 -58 -12q-20 0 -20 22q0 36 80.5 145.5t126.5 155.5h-2198q-39 0 -39 41t39 41h2288q120 99 262 158q-142 59 -262 158h-2288q-39 0 -39 41t39 41h2198q-50 52 -128.5 158.5t-78.5 142.5q0 20 23 23 q-5 -1 38 -1q11 0 17 -12q110 -208 259.5 -329.5t324.5 -178.5q28 -6 69 -20q14 -8 14 -23z" />
+<glyph unicode="&#x27fa;" horiz-adv-x="3008" d="M2892 605q14 -8 14 -22.5t-14 -20.5q-201 -89 -318.5 -204t-188.5 -255l-32 -70q-7 -14 -59 -14q-21 0 -21 22q0 38 67.5 142.5t113.5 158.5h-1900q43 -47 111.5 -155t68.5 -146q0 -22 -61 -22q-11 0 -19 19l-30 64q-88 175 -241 303q-116 98 -265 157q-16 6 -16 20.5 t16 22.5q31 13 92 41q276 140 414 417l31 68q7 14 59 14q20 0 20 -22q0 -38 -68 -144.5t-112 -156.5h1900q-48 58 -114.5 160.5t-66.5 140.5q0 22 62 22q11 0 18 -14l57 -115q31 -55 72 -108q135 -174 332 -269q28 -11 78 -34zM2751 582q-122 66 -219 158h-2056 q-97 -92 -219 -158q122 -66 219 -158h2056q97 92 219 158z" />
+<glyph unicode="&#x27fb;" horiz-adv-x="3008" d="M2925 44q0 -62 -41 -62t-41 62v497h-2505q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41q-14 0 -20 19q-33 175 -142 303.5t-278 192.5q-16 6 -16 20t16 23l46 18q282 122 363 428q3 16 9.5 40.5t26.5 26.5q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-59 -266 -288 -432 h2505v498q0 61 41 61t41 -61v-1077z" />
+<glyph unicode="&#x27fc;" horiz-adv-x="3008" d="M2866 611q25 -11 25 -27t-15 -22l-46 -18q-190 -83 -296 -265q-41 -70 -79 -213q-2 -7 -8 -13t-53 -6q-21 0 -21 27q0 2 8 36q65 274 287 431h-2503v-497q0 -62 -41 -62t-41 62v1077q0 61 41 61t41 -61v-498h2503q-154 111 -238 288q-57 121 -57 179q0 24 21 28 q-3 -1 41 -1q15 0 20 -19q14 -55 54 -163q105 -217 317 -310z" />
+<glyph unicode="&#x27fd;" horiz-adv-x="3008" d="M2925 44q0 -62 -41 -62t-41 62v298h-2189q45 -44 126 -155t81 -146q0 -20 -23 -23q7 1 -38 1q-11 0 -17 12q-74 142 -162 238q-175 191 -418 272l-71 21q-16 5 -16 20t16 23l68 20q172 56 323 177.5t260 330.5q6 12 58 12q20 0 20 -28.5t-80.5 -138.5t-126.5 -156h2189 v299q0 61 41 61t41 -61v-1077zM2843 424v316h-2279q-120 -99 -262 -158q142 -59 262 -158h2279z" />
+<glyph unicode="&#x27fe;" horiz-adv-x="3008" d="M2891 582q0 -15 -14 -20q-36 -10 -107 -34q-357 -136 -546 -497q-6 -12 -58 -12q-20 0 -20 22q0 36 80.5 145.5t126.5 155.5h-2188v-298q0 -62 -41 -62t-41 62v1077q0 61 41 61t41 -61v-299h2188q-50 52 -128.5 158.5t-78.5 142.5q0 20 23 23q-5 -1 38 -1q11 0 17 -12 q110 -208 259.5 -329.5t324.5 -178.5q28 -6 69 -20q14 -8 14 -23zM165 740v-316h2278q120 99 262 158q-142 59 -262 158h-2278z" />
+<glyph unicode="&#x27ff;" horiz-adv-x="3008" d="M2891 582q0 -11 -27 -26q-154 -87 -230 -236l-25 -58q-12 -26 -36 -26q-42 0 -42 39q0 7 3 15q52 144 178 251h-658q-16 0 -32 14l-158 142l-348 -314q-13 -12 -31 -12t-31 12l-348 314l-348 -314q-13 -12 -31 -12t-31 12l-348 314l-160 -142q-16 -14 -30 -14 q-41 0 -41 41q0 20 10 29l190 170q13 12 31 12t31 -12l348 -314l348 314q13 12 31 12t31 -12l348 -314l348 314q13 12 31 12t31 -12l176 -158h642q-127 107 -179 253q-3 8 -3 15q0 39 42 39q24 0 34 -23l27 -62q75 -149 230 -237q27 -15 27 -26z" />
+<glyph unicode="&#x2900;" d="M1931 582q0 -14 -16 -20q-259 -98 -369 -334q-23 -49 -33 -90l-18 -72q-6 -19 -20 -19h-41q-21 3 -21 27q0 4 7 35q60 270 288 432h-234q-133 -60 -226 -170q-94 -111 -132 -258q-3 -16 -10 -41t-21 -25h-41q-21 3 -21 27q0 4 7 35q60 270 288 432h-667v-395 q0 -39 -41 -39t-41 39v395h-415q-39 0 -39 41t39 41h415v397q0 37 41 37t41 -37v-397h667q-229 166 -288 432q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5t230.5 -170.5h229q-229 166 -288 432q-7 31 -7 35q0 27 21 27q45 0 36 1 q20 -2 24 -19t12 -48q38 -146 132.5 -257.5t230.5 -170.5q16 -5 46 -18q16 -9 16 -23z" />
+<glyph unicode="&#x2901;" d="M1931 582q0 -14 -16 -20q-259 -98 -369 -334q-23 -49 -33 -90l-18 -72q-6 -19 -20 -19h-41q-21 3 -21 27q0 4 7 35q60 270 288 432h-234q-133 -60 -226 -170q-94 -111 -132 -258q-3 -16 -10 -41t-21 -25h-41q-21 3 -21 27q0 4 7 35q60 270 288 432h-567v-395 q0 -39 -41 -39t-41 39v395h-218v-395q0 -39 -41 -39t-41 39v395h-215q-39 0 -39 41t39 41h215v397q0 37 41 37t41 -37v-397h218v397q0 37 41 37t41 -37v-397h567q-229 166 -288 432q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5 t230.5 -170.5h229q-229 166 -288 432q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5t230.5 -170.5q16 -5 46 -18q16 -9 16 -23z" />
+<glyph unicode="&#x2902;" d="M1932 383q0 -41 -37 -41h-581v-196q0 -39 -41 -39t-41 39v196h-578q45 -44 126 -155t81 -146q0 -20 -23 -23q7 1 -38 1q-11 0 -17 12q-74 142 -162 238q-175 191 -418 272l-71 21q-16 5 -16 20t16 23l68 20q172 56 323 177.5t260 330.5q6 12 58 12q20 0 20 -28.5 t-80.5 -138.5t-126.5 -156h578v198q0 37 41 37t41 -37v-198h581q37 0 37 -41t-37 -41h-581v-316h581q37 0 37 -41zM1232 424v316h-668q-120 -99 -262 -158q142 -59 262 -158h668z" />
+<glyph unicode="&#x2903;" d="M1932 582q0 -15 -14 -20q-36 -10 -107 -34q-357 -136 -546 -497q-6 -12 -58 -12q-20 0 -20 22q0 36 80.5 145.5t126.5 155.5h-578v-196q0 -39 -41 -39t-41 39v196h-579q-39 0 -39 41t39 41h579v316h-579q-39 0 -39 41t39 41h579v198q0 37 41 37t41 -37v-198h578 q-50 52 -128.5 158.5t-78.5 142.5q0 20 23 23q-5 -1 38 -1q11 0 17 -12q110 -208 259.5 -329.5t324.5 -178.5q28 -6 69 -20q14 -8 14 -23zM816 740v-316h668q120 99 262 158q-142 59 -262 158h-668z" />
+<glyph unicode="&#x2904;" horiz-adv-x="2560" d="M2444 605q14 -8 14 -22.5t-14 -20.5q-201 -89 -318.5 -204t-188.5 -255l-32 -70q-7 -14 -59 -14q-21 0 -21 22q0 38 67.5 142.5t113.5 158.5h-685v-196q0 -39 -41 -39t-41 39v196h-685q43 -47 111.5 -155t68.5 -146q0 -22 -61 -22q-11 0 -19 19l-30 64q-85 169 -230 295 q-121 103 -276 165q-16 6 -16 20.5t16 22.5q31 13 92 41q276 140 414 417l31 68q7 14 59 14q20 0 20 -22q0 -38 -68 -144.5t-112 -156.5h685v198q0 37 41 37t41 -37v-198h685q-48 58 -114.5 160.5t-66.5 140.5q0 22 62 22q11 0 18 -14l57 -115q31 -55 72 -108 q135 -174 332 -269q28 -11 78 -34zM1321 740v-316h763q97 92 219 158q-122 66 -219 158h-763zM1239 424v316h-763q-97 -92 -219 -158q122 -66 219 -158h763z" />
+<glyph unicode="&#x2905;" d="M1931 582q0 -14 -16 -20q-259 -98 -369 -334q-23 -49 -33 -90l-18 -72q-6 -19 -20 -19h-41q-21 3 -21 27q0 4 7 35q60 270 288 432h-234q-133 -60 -226 -170q-94 -111 -132 -258q-3 -16 -10 -41t-21 -25h-41q-21 3 -21 27q0 4 7 35q60 270 288 432h-1153v-497 q0 -62 -41 -62t-41 62v1077q0 61 41 61t41 -61v-498h1153q-229 166 -288 432q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5t230.5 -170.5h229q-229 166 -288 432q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48 q38 -146 132.5 -257.5t230.5 -170.5q16 -5 46 -18q16 -9 16 -23z" />
+<glyph unicode="&#x2906;" d="M1965 44q0 -62 -41 -62t-41 62v298h-1229q45 -44 126 -155t81 -146q0 -20 -23 -23q7 1 -38 1q-11 0 -17 12q-74 142 -162 238q-175 191 -418 272l-71 21q-16 5 -16 20t16 23l68 20q172 56 323 177.5t260 330.5q6 12 58 12q20 0 20 -28.5t-80.5 -138.5t-126.5 -156h1229 v299q0 61 41 61t41 -61v-1077zM1883 424v316h-1319q-120 -99 -262 -158q142 -59 262 -158h1319z" />
+<glyph unicode="&#x2907;" d="M1932 582q0 -15 -14 -20q-36 -10 -107 -34q-357 -136 -546 -497q-6 -12 -58 -12q-20 0 -20 22q0 36 80.5 145.5t126.5 155.5h-1229v-298q0 -62 -41 -62t-41 62v1077q0 61 41 61t41 -61v-299h1229q-50 52 -128.5 158.5t-78.5 142.5q0 20 23 23q-5 -1 38 -1q11 0 17 -12 q110 -208 259.5 -329.5t324.5 -178.5q28 -6 69 -20q14 -8 14 -23zM165 740v-316h1319q120 99 262 158q-142 59 -262 158h-1319z" />
+<glyph unicode="&#x2908;" horiz-adv-x="1024" d="M553 -36q136 223 414 293q22 0 22 -18q0 -60 -14 -64q-22 -6 -65 -19q-132 -46 -229.5 -150.5t-132.5 -239.5q-4 -22 -13 -66q-4 -18 -22 -18t-24 18q-4 23 -13 67q-35 134 -132.5 238.5t-229.5 150.5q-22 6 -65 19q-14 6 -14 19q0 51 -1 40q2 23 23 23l6 -2 q104 -29 161 -59q157 -83 247 -232v835h-347q-37 0 -37 41t37 41h347v564q0 37 41 37t41 -37v-564h345q39 0 39 -41t-39 -41h-345v-835z" />
+<glyph unicode="&#x2909;" horiz-adv-x="1024" d="M471 1200q-135 -223 -414 -293q-21 0 -23 23q1 -11 1 40q0 13 14 19q22 6 65 19q132 46 229.5 150.5t132.5 238.5q3 23 13 67q6 18 24 18t22 -18q4 -22 13 -66q35 -135 132.5 -239.5t229.5 -150.5q22 -6 65 -19q14 -4 14 -64q0 -18 -22 -18l-6 2q-102 28 -160 59 q-158 84 -248 232v-835h345q39 0 39 -41t-39 -41h-345v-564q0 -37 -41 -37t-41 37v564h-347q-37 0 -37 41t37 41h347v835z" />
+<glyph unicode="&#x290a;" horiz-adv-x="1602" d="M1540 846q0 -42 -39 -42q-7 0 -15 3q-129 47 -247 118v-1206q0 -37 -41 -37t-41 37v1261q-186 132 -315 317v-1574q0 -41 -41 -41t-41 41v1574q-131 -186 -315 -318v-1260q0 -37 -41 -37t-41 37v1206q-117 -71 -247 -118q-8 -3 -15 -3q-39 0 -39 42q0 22 27 36 q46 18 136 57q277 136 462 394l79 124q17 25 35 25t35 -25q25 -42 78 -124q182 -255 464 -394q46 -18 135 -57q27 -14 27 -36z" />
+<glyph unicode="&#x290b;" horiz-adv-x="1602" d="M1540 318q0 -22 -27 -36q-46 -18 -135 -57q-282 -139 -464 -394q-25 -42 -78 -124q-17 -25 -35 -25t-35 25q-25 42 -79 124q-185 258 -462 394q-46 17 -136 57q-27 14 -27 36q0 42 39 42q7 0 15 -3q130 -47 247 -118v1206q0 37 41 37t41 -37v-1260q184 -132 315 -318 v1574q0 41 41 41t41 -41v-1574q129 185 315 317v1261q0 37 41 37t41 -37v-1206q118 71 247 118q8 3 15 3q39 0 39 -42z" />
+<glyph unicode="&#x290c;" d="M1931 582q0 -41 -37 -41h-624q-39 0 -39 41t39 41h624q37 0 37 -41zM1041 582q0 -41 -39 -41h-664q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41q-14 0 -20 19q-33 175 -142 303.5t-278 192.5q-16 6 -16 20t16 23l46 18q282 122 363 428q3 16 9.5 40.5t26.5 26.5 q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-59 -266 -288 -432h664q39 0 39 -41z" />
+<glyph unicode="&#x290d;" d="M1931 582q0 -14 -16 -20q-259 -98 -369 -334q-23 -49 -33 -90l-18 -72q-6 -19 -20 -19h-41q-21 3 -21 27q0 4 7 35q60 270 288 432h-664q-39 0 -39 41t39 41h664q-229 166 -288 432q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5 t230.5 -170.5q16 -5 46 -18q16 -9 16 -23zM815 582q0 -41 -39 -41h-624q-37 0 -37 41t37 41h624q39 0 39 -41z" />
+<glyph unicode="&#x290e;" d="M1931 582q0 -41 -37 -41h-304q-39 0 -39 41t39 41h304q37 0 37 -41zM1361 582q0 -41 -37 -41h-304q-39 0 -39 41t39 41h304q37 0 37 -41zM791 582q0 -41 -39 -41h-414q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41q-14 0 -20 19q-33 175 -142 303.5t-278 192.5 q-16 6 -16 20t16 23l46 18q282 122 363 428q3 16 9.5 40.5t26.5 26.5q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-59 -266 -288 -432h414q39 0 39 -41z" />
+<glyph unicode="&#x290f;" d="M1931 582q0 -14 -16 -20q-259 -98 -369 -334q-23 -49 -33 -90l-18 -72q-6 -19 -20 -19h-41q-21 3 -21 27q0 4 7 35q60 270 288 432h-414q-39 0 -39 41t39 41h414q-229 166 -288 432q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5 t230.5 -170.5q16 -5 46 -18q16 -9 16 -23zM1065 582q0 -41 -39 -41h-304q-37 0 -37 41t37 41h304q39 0 39 -41zM495 582q0 -41 -39 -41h-304q-37 0 -37 41t37 41h304q39 0 39 -41z" />
+<glyph unicode="&#x2910;" d="M1963 582q0 -14 -16 -20q-259 -98 -369 -334q-23 -49 -33 -90l-18 -72q-6 -19 -20 -19h-41q-21 3 -21 27q0 4 7 35q60 270 288 432h-234q-133 -60 -226 -170q-94 -111 -132 -258q-3 -16 -10 -41t-21 -25h-41q-21 3 -21 27q0 4 7 35q60 270 288 432h-54q-39 0 -39 41 t39 41h54q-229 166 -288 432q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5t230.5 -170.5h229q-229 166 -288 432q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5t230.5 -170.5q16 -5 46 -18q16 -9 16 -23z M1087 582q0 -41 -39 -41h-194q-37 0 -37 41t37 41h194q39 0 39 -41zM647 582q0 -41 -39 -41h-37q-282 -122 -363 -428q-3 -16 -9.5 -40.5t-26.5 -26.5q9 1 -36 1q-21 0 -21 27q0 4 7 35q26 118 93 224q97 154 247 249q-150 95 -247 249q-67 106 -93 224q-7 31 -7 35 q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5t230.5 -170.5h37q39 0 39 -41z" />
+<glyph unicode="&#x2911;" d="M1931 582q0 -14 -16 -21.5t-46 -19.5q-282 -122 -363 -428q-3 -16 -9.5 -40.5t-26.5 -26.5q9 1 -36 1q-21 0 -21 27q0 4 7 35q59 266 288 432h-54q-39 0 -39 41t39 41h54q-228 162 -288 432q-7 31 -7 35q0 24 21 27h41q14 0 20 -19q33 -175 142 -303.5t278 -192.5 q16 -6 16 -20zM1445 582q0 -41 -39 -41h-54q-37 0 -37 41t37 41h54q39 0 39 -41zM1145 582q0 -41 -39 -41h-54q-37 0 -37 41t37 41h54q39 0 39 -41zM845 582q0 -41 -39 -41h-54q-37 0 -37 41t37 41h54q39 0 39 -41zM545 582q0 -41 -39 -41h-54q-37 0 -37 41t37 41h54 q39 0 39 -41zM245 582q0 -41 -39 -41h-54q-37 0 -37 41t37 41h54q39 0 39 -41z" />
+<glyph unicode="&#x2912;" horiz-adv-x="1024" d="M471 1200q-135 -223 -414 -293q-21 0 -23 23q1 -11 1 40q0 13 14 19q22 6 65 19q132 46 229.5 150.5t132.5 238.5q3 23 13 67q6 18 24 18t22 -18q4 -22 13 -66q35 -135 132.5 -239.5t229.5 -150.5q22 -6 65 -19q14 -4 14 -64q0 -18 -22 -18l-6 2q-102 28 -160 59 q-158 84 -248 232v-1481q0 -37 -41 -37t-41 37v1481zM926 1606q63 0 63 -40.5t-63 -40.5h-828q-63 0 -63 40.5t63 40.5h828z" />
+<glyph unicode="&#x2913;" horiz-adv-x="1024" d="M553 -36q136 223 414 293q22 0 22 -18q0 -60 -14 -64q-22 -6 -65 -19q-132 -46 -229.5 -150.5t-132.5 -239.5q-4 -22 -13 -66q-4 -18 -22 -18t-24 18q-4 23 -13 67q-35 134 -132.5 238.5t-229.5 150.5q-22 6 -65 19q-14 6 -14 19q0 51 -1 40q2 23 23 23l6 -2 q104 -29 161 -59q157 -83 247 -232v1481q0 37 41 37t41 -37v-1481zM926 -361q63 0 63 -40.5t-63 -40.5h-828q-63 0 -63 40.5t63 40.5h828z" />
+<glyph unicode="&#x2914;" d="M1963 582q0 -14 -16 -20q-259 -98 -369 -334q-23 -49 -33 -90l-18 -72q-6 -19 -20 -19h-41q-21 3 -21 27q0 4 7 35q60 270 288 432h-759v-395q0 -39 -41 -39t-41 39v395h-328q-282 -122 -363 -428q-3 -16 -9.5 -40.5t-26.5 -26.5q9 1 -36 1q-21 0 -21 27q0 4 7 35 q26 118 93 224q97 154 247 249q-150 95 -247 249q-67 106 -93 224q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5t230.5 -170.5h328v397q0 37 41 37t41 -37v-397h759q-229 166 -288 432q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19 t12 -48q38 -146 132.5 -257.5t230.5 -170.5q16 -5 46 -18q16 -9 16 -23z" />
+<glyph unicode="&#x2915;" d="M1963 582q0 -14 -16 -20q-259 -98 -369 -334q-23 -49 -33 -90l-18 -72q-6 -19 -20 -19h-41q-21 3 -21 27q0 4 7 35q60 270 288 432h-569v-395q0 -39 -41 -39t-41 39v395h-218v-395q0 -39 -41 -39t-41 39v395h-218q-282 -122 -363 -428q-3 -16 -9.5 -40.5t-26.5 -26.5 q9 1 -36 1q-21 0 -21 27q0 4 7 35q26 118 93 224q97 154 247 249q-150 95 -247 249q-67 106 -93 224q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5t230.5 -170.5h218v397q0 37 41 37t41 -37v-397h218v397q0 37 41 37t41 -37v-397h569 q-229 166 -288 432q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5t230.5 -170.5q16 -5 46 -18q16 -9 16 -23z" />
+<glyph unicode="&#x2916;" d="M1963 582q0 -14 -16 -20q-259 -98 -369 -334q-23 -49 -33 -90l-18 -72q-6 -19 -20 -19h-41q-21 3 -21 27q0 4 7 35q60 270 288 432h-234q-133 -60 -226 -170q-94 -111 -132 -258q-3 -16 -10 -41t-21 -25h-41q-21 3 -21 27q0 4 7 35q60 270 288 432h-779 q-282 -122 -363 -428q-3 -16 -9.5 -40.5t-26.5 -26.5q9 1 -36 1q-21 0 -21 27q0 4 7 35q26 118 93 224q97 154 247 249q-150 95 -247 249q-67 106 -93 224q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5t230.5 -170.5h779q-229 166 -288 432 q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5t230.5 -170.5h229q-229 166 -288 432q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5t230.5 -170.5q16 -5 46 -18q16 -9 16 -23z" />
+<glyph unicode="&#x2917;" d="M1963 582q0 -14 -16 -20q-259 -98 -369 -334q-23 -49 -33 -90l-18 -72q-6 -19 -20 -19h-41q-21 3 -21 27q0 4 7 35q60 270 288 432h-234q-133 -60 -226 -170q-94 -111 -132 -258q-3 -16 -10 -41t-21 -25h-41q-21 3 -21 27q0 4 7 35q60 270 288 432h-509v-395 q0 -39 -41 -39t-41 39v395h-188q-282 -122 -363 -428q-3 -16 -9.5 -40.5t-26.5 -26.5q9 1 -36 1q-21 0 -21 27q0 4 7 35q26 118 93 224q97 154 247 249q-150 95 -247 249q-67 106 -93 224q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5 t230.5 -170.5h188v397q0 37 41 37t41 -37v-397h509q-229 166 -288 432q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5t230.5 -170.5h229q-229 166 -288 432q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5 t230.5 -170.5q16 -5 46 -18q16 -9 16 -23z" />
+<glyph unicode="&#x2918;" horiz-adv-x="2248" d="M2163 582q0 -14 -16 -20q-259 -98 -369 -334q-23 -49 -33 -90l-18 -72q-6 -19 -20 -19h-41q-21 3 -21 27q0 4 7 35q60 270 288 432h-234q-133 -60 -226 -170q-94 -111 -132 -258q-3 -16 -10 -41t-21 -25h-41q-21 3 -21 27q0 4 7 35q60 270 288 432h-469v-395 q0 -39 -41 -39t-41 39v395h-218v-395q0 -39 -41 -39t-41 39v395h-128q-282 -122 -363 -428q-3 -16 -9.5 -40.5t-26.5 -26.5q9 1 -36 1q-21 0 -21 27q0 4 7 35q26 118 93 224q97 154 247 249q-150 95 -247 249q-67 106 -93 224q-7 31 -7 35q0 27 21 27q45 0 36 1 q20 -2 24 -19t12 -48q38 -146 132.5 -257.5t230.5 -170.5h128v397q0 37 41 37t41 -37v-397h218v397q0 37 41 37t41 -37v-397h469q-229 166 -288 432q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5t230.5 -170.5h229q-229 166 -288 432 q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5t230.5 -170.5q16 -5 46 -18q16 -9 16 -23z" />
+<glyph unicode="&#x2919;" d="M1931 74q0 -27 -21 -27q-45 0 -36 -1q-20 2 -24 19t-12 48q-38 146 -132.5 257.5t-230.5 170.5h-1321q-39 0 -39 41t39 41h1321q282 122 363 428q3 16 9.5 40.5t26.5 26.5q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-26 -118 -93 -224q-97 -154 -247 -249q150 -95 247 -249 q67 -106 93 -224q7 -31 7 -35z" />
+<glyph unicode="&#x291a;" d="M1931 582q0 -41 -39 -41h-1321q-282 -122 -363 -428q-3 -16 -9.5 -40.5t-26.5 -26.5q9 1 -36 1q-21 0 -21 27q0 4 7 35q26 118 93 224q97 154 247 249q-150 95 -247 249q-67 106 -93 224q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5 t230.5 -170.5h1321q39 0 39 -41z" />
+<glyph unicode="&#x291b;" d="M1931 74q0 -27 -21 -27q-45 0 -36 -1q-20 2 -24 19t-12 48q-38 146 -132.5 257.5t-230.5 170.5h-229q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41q-14 0 -20 19q-33 175 -134.5 295t-234.5 180h-936q-39 0 -39 41t39 41h931q282 122 363 428q3 16 9.5 40.5 t26.5 26.5q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-59 -266 -288 -432h229q282 122 363 428q3 16 9.5 40.5t26.5 26.5q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-26 -118 -93 -224q-97 -154 -247 -249q150 -95 247 -249q67 -106 93 -224q7 -31 7 -35z" />
+<glyph unicode="&#x291c;" d="M1931 582q0 -41 -39 -41h-936q-133 -60 -226 -170q-94 -111 -132 -258q-3 -16 -10 -41t-21 -25h-41q-21 3 -21 27q0 4 7 35q60 270 288 432h-229q-282 -122 -363 -428q-3 -16 -9.5 -40.5t-26.5 -26.5q9 1 -36 1q-21 0 -21 27q0 4 7 35q26 118 93 224q97 154 247 249 q-150 95 -247 249q-67 106 -93 224q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5t230.5 -170.5h229q-229 166 -288 432q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5t230.5 -170.5h931q39 0 39 -41z" />
+<glyph unicode="&#x291d;" d="M1931 582q0 -41 -39 -41h-1154q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41q-14 0 -20 19q-33 175 -142 303.5t-278 192.5q-16 6 -16 20t16 23l46 18q282 122 363 428q3 16 9.5 40.5t26.5 26.5q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-59 -266 -288 -432h1154 q39 0 39 -41zM427 582l-156 -156l-156 156l156 156z" />
+<glyph unicode="&#x291e;" d="M1931 582l-156 -156l-156 156l156 156zM1531 582q0 -14 -16 -20q-259 -98 -369 -334q-23 -49 -33 -90l-18 -72q-6 -19 -20 -19h-41q-21 3 -21 27q0 4 7 35q60 270 288 432h-1154q-39 0 -39 41t39 41h1154q-229 166 -288 432q-7 31 -7 35q0 27 21 27q45 0 36 1 q20 -2 24 -19t12 -48q38 -146 132.5 -257.5t230.5 -170.5q16 -5 46 -18q16 -9 16 -23z" />
+<glyph unicode="&#x291f;" d="M1965 44q0 -62 -41 -62t-41 62v497h-1145q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41q-14 0 -20 19q-33 175 -142 303.5t-278 192.5q-16 6 -16 20t16 23l46 18q282 122 363 428q3 16 9.5 40.5t26.5 26.5q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-59 -266 -288 -432 h1145v498q0 61 41 61t41 -61v-1077zM427 582l-156 -156l-156 156l156 156z" />
+<glyph unicode="&#x2920;" d="M1931 582l-156 -156l-156 156l156 156zM1506 611q25 -11 25 -27t-15 -22l-46 -18q-190 -83 -296 -265q-41 -70 -79 -213q-2 -7 -8 -13t-53 -6q-21 0 -21 27q0 2 8 36q65 274 287 431h-1143v-497q0 -62 -41 -62t-41 62v1077q0 61 41 61t41 -61v-498h1143 q-154 111 -238 288q-57 121 -57 179q0 24 21 28q-3 -1 41 -1q15 0 20 -19q14 -55 54 -163q105 -217 317 -310z" />
+<glyph unicode="&#x2921;" d="M1924 -295q0 -23 -24 -23l-67 40q-127 76 -273 76t-259 -56q-71 -35 -67 -35q-10 0 -30.5 19t-20.5 31t12 19q165 100 346 100q76 0 149 -18l-1390 1390q19 -77 19 -150q0 -173 -101 -345q-8 -13 -18.5 -13t-30.5 20t-20 30l35 69q56 112 56 249q0 160 -76 283 q-40 66 -40 68q0 23 24 23l67 -40q127 -76 273 -76t259 56q71 35 67 35q10 0 30.5 -19t20.5 -31t-12 -19q-165 -100 -346 -100q-76 0 -149 18l1390 -1390q-19 77 -19 150q0 173 101 345q8 13 18.5 13t30.5 -20t20 -30l-35 -69q-56 -112 -56 -249q0 -160 76 -283 q40 -66 40 -68z" />
+<glyph unicode="&#x2922;" d="M1924 1459q0 -2 -40 -68q-76 -123 -76 -271.5t56 -260.5l35 -69q0 -10 -20 -30t-30.5 -20t-18.5 13q-101 172 -101 345q0 73 19 150l-1390 -1390q73 18 149 18q181 0 346 -100q12 -7 12 -19t-20.5 -31t-30.5 -19q4 0 -67 35q-113 56 -259 56t-273 -76l-67 -40 q-24 0 -24 23q0 2 40 68q76 123 76 271.5t-56 260.5l-35 69q0 10 20 30t30.5 20t18.5 -13q101 -172 101 -345q0 -73 -19 -150l1390 1390q-73 -18 -149 -18q-181 0 -346 100q-12 7 -12 19t20.5 31t30.5 19q-4 0 67 -35q113 -56 259 -56t273 76l67 40q24 0 24 -23z" />
+<glyph unicode="&#x2923;" horiz-adv-x="1503" d="M1277 375q102 -131 102 -247.5t-122 -235.5t-244.5 -119t-246.5 122q-68 67 -68 103.5t42 36.5q15 0 28 -12q18 -24 56 -70q95 -98 187.5 -98t186.5 94.5t94 187.5q0 119 -172 291l-820 820q19 -77 19 -150q0 -173 -101 -345q-8 -13 -18.5 -13t-30.5 20t-20 30l35 69 q56 112 56 249q0 160 -76 283q-40 66 -40 68q0 23 24 23l67 -40q127 -76 273 -76t259 56q71 35 67 35q10 0 30.5 -19t20.5 -31t-12 -19q-165 -100 -346 -100q-76 0 -149 18l735 -735q142 -142 184 -196z" />
+<glyph unicode="&#x2924;" horiz-adv-x="1503" d="M1379 1459q0 -2 -41 -68q-75 -123 -75 -271.5t56 -260.5l35 -69q0 -10 -20 -30t-30.5 -20t-18.5 13q-101 172 -101 345q0 73 19 150l-820 -820q-172 -172 -172 -291q0 -93 94 -187.5t186.5 -94.5t187.5 98q17 25 56 70q13 12 28 12q42 0 42 -36.5t-68 -103.5 q-124 -122 -246.5 -122t-244.5 119t-122 235.5t102 247.5q42 54 184 196l735 735q-73 -18 -149 -18q-181 0 -346 100q-12 7 -12 19t20.5 31t30.5 19q-4 0 67 -35q113 -56 259 -56t273 76l67 40q24 0 24 -23z" />
+<glyph unicode="&#x2925;" horiz-adv-x="1503" d="M1379 -204q0 -23 -24 -23l-67 40q-127 76 -273 76t-259 -56q-71 -35 -67 -35q-10 0 -30.5 19t-20.5 31t12 19q165 100 346 100q76 0 149 -18l-735 735q-142 142 -184 196q-102 131 -102 247.5t122 235.5t244.5 119t246.5 -122q68 -67 68 -103.5t-42 -36.5q-15 0 -28 12 q-18 24 -56 70q-95 98 -187.5 98t-186.5 -94.5t-94 -187.5q0 -119 172 -291l820 -820q-19 77 -19 150q0 173 101 345q8 13 18.5 13t30.5 -20t20 -30l-35 -69q-56 -112 -56 -249q0 -160 75 -283q41 -66 41 -68z" />
+<glyph unicode="&#x2926;" horiz-adv-x="1503" d="M1257 1363q122 -119 122 -235.5t-102 -247.5q-42 -54 -184 -196l-735 -735q73 18 149 18q181 0 346 -100q12 -7 12 -19t-20.5 -31t-30.5 -19q4 0 -67 35q-113 56 -259 56t-273 -76l-67 -40q-24 0 -24 23q0 2 40 68q76 123 76 271.5t-56 260.5l-35 69q0 10 20 30t30.5 20 t18.5 -13q101 -172 101 -345q0 -73 -19 -150l820 820q172 172 172 291q0 93 -94 187.5t-186.5 94.5t-187.5 -98q-17 -25 -56 -70q-13 -12 -28 -12q-42 0 -42 36.5t68 103.5q124 122 246.5 122t244.5 -119z" />
+<glyph unicode="&#x2927;" d="M1924 -274q0 -44 -44 -44q-14 0 -24 10l-832 832l-832 -832q-10 -10 -24 -10q-44 0 -44 44q0 14 10 24l832 832l-666 666q19 -77 19 -150q0 -173 -101 -345q-8 -13 -18.5 -13t-30.5 20t-20 30l35 69q56 112 56 249q0 160 -76 283q-40 66 -40 68q0 23 24 23l67 -40 q127 -76 273 -76t259 56q71 35 67 35q10 0 30.5 -19t20.5 -31t-12 -19q-165 -100 -346 -100q-76 0 -149 18l666 -666l666 666q-73 -18 -149 -18q-181 0 -346 100q-12 7 -12 19t20.5 31t30.5 19q-4 0 67 -35q113 -56 259 -56t273 76l67 40q24 0 24 -23q0 -2 -40 -68 q-76 -123 -76 -271.5t56 -260.5l35 -69q0 -10 -20 -30t-30.5 -20t-18.5 13q-101 172 -101 345q0 73 19 150l-666 -666l832 -832q10 -10 10 -24z" />
+<glyph unicode="&#x2928;" d="M1924 -295q0 -23 -24 -23l-67 40q-127 76 -273 76t-259 -56q-71 -35 -67 -35q-10 0 -30.5 19t-20.5 31t12 19q165 100 346 100q76 0 149 -18l-666 666l-832 -832q-10 -10 -24 -10q-44 0 -44 44q0 14 10 24l832 832l-832 832q-10 10 -10 24q0 44 44 44q14 0 24 -10 l832 -832l666 666q-73 -18 -149 -18q-181 0 -346 100q-12 7 -12 19t20.5 31t30.5 19q-4 0 67 -35q113 -56 259 -56t273 76l67 40q24 0 24 -23q0 -2 -40 -68q-76 -123 -76 -271.5t56 -260.5l35 -69q0 -10 -20 -30t-30.5 -20t-18.5 13q-101 172 -101 345q0 73 19 150 l-666 -666l666 -666q-19 77 -19 150q0 173 101 345q8 13 18.5 13t30.5 -20t20 -30l-35 -69q-56 -112 -56 -249q0 -160 76 -283q40 -66 40 -68z" />
+<glyph unicode="&#x2929;" d="M1924 -295q0 -23 -24 -23l-67 40q-127 76 -273 76t-259 -56q-71 -35 -67 -35q-10 0 -30.5 19t-20.5 31t12 19q165 100 346 100q76 0 149 -18l-666 666l-666 -666q73 18 149 18q181 0 346 -100q12 -7 12 -19t-20.5 -31t-30.5 -19q4 0 -67 35q-113 56 -259 56t-273 -76 l-67 -40q-24 0 -24 23q0 2 40 68q76 123 76 271.5t-56 260.5l-35 69q0 10 20 30t30.5 20t18.5 -13q101 -172 101 -345q0 -73 -19 -150l666 666l-832 832q-10 10 -10 24q0 44 44 44q14 0 24 -10l832 -832l832 832q10 10 24 10q44 0 44 -44q0 -14 -10 -24l-832 -832l666 -666 q-19 77 -19 150q0 173 101 345q8 13 18.5 13t30.5 -20t20 -30l-35 -69q-56 -112 -56 -249q0 -160 76 -283q40 -66 40 -68z" />
+<glyph unicode="&#x292a;" d="M1924 -274q0 -44 -44 -44q-14 0 -24 10l-832 832l-666 -666q73 18 149 18q181 0 346 -100q12 -7 12 -19t-20.5 -31t-30.5 -19q4 0 -67 35q-113 56 -259 56t-273 -76l-67 -40q-24 0 -24 23q0 2 40 68q76 123 76 271.5t-56 260.5l-35 69q0 10 20 30t30.5 20t18.5 -13 q101 -172 101 -345q0 -73 -19 -150l666 666l-666 666q19 -77 19 -150q0 -173 -101 -345q-8 -13 -18.5 -13t-30.5 20t-20 30l35 69q56 112 56 249q0 160 -76 283q-40 66 -40 68q0 23 24 23l67 -40q127 -76 273 -76t259 56q71 35 67 35q10 0 30.5 -19t20.5 -31t-12 -19 q-165 -100 -346 -100q-76 0 -149 18l666 -666l832 832q10 10 24 10q44 0 44 -44q0 -14 -10 -24l-832 -832l832 -832q10 -10 10 -24z" />
+<glyph unicode="&#x292b;" d="M1924 1438q0 -14 -10 -24l-1722 -1722q-10 -10 -24 -10q-44 0 -44 44q0 14 10 24l1722 1722q10 10 24 10q44 0 44 -44zM124 1438q0 44 44 44q14 0 24 -10l774 -774l-58 -58l-774 774q-10 10 -10 24zM1924 -274q0 -44 -44 -44q-14 0 -24 10l-774 774l58 58l774 -774 q10 -10 10 -24z" />
+<glyph unicode="&#x292c;" d="M1924 1438q0 -14 -10 -24l-774 -774l-58 58l774 774q10 10 24 10q44 0 44 -44zM1924 -274q0 -44 -44 -44q-14 0 -24 10l-1722 1722q-10 10 -10 24q0 44 44 44q14 0 24 -10l1722 -1722q10 -10 10 -24zM168 -318q-44 0 -44 44q0 14 10 24l774 774l58 -58l-774 -774 q-10 -10 -24 -10z" />
+<glyph unicode="&#x292d;" d="M1924 -295q0 -23 -24 -23l-67 40q-127 76 -273 76t-259 -56q-71 -35 -67 -35q-10 0 -30.5 19t-20.5 31t12 19q165 100 346 100q76 0 149 -18l-1556 1556q-10 10 -10 24q0 44 44 44q14 0 24 -10l1556 -1556q-19 77 -19 150q0 173 101 345q8 13 18.5 13t30.5 -20t20 -30 l-35 -69q-56 -112 -56 -249q0 -160 76 -283q40 -66 40 -68zM1924 1459q0 -2 -40 -68q-76 -123 -76 -271.5t56 -260.5l35 -69q0 -10 -20 -30t-30.5 -20t-18.5 13q-101 172 -101 345q0 73 19 150l-608 -608l-58 58l608 608q-73 -18 -149 -18q-181 0 -346 100q-12 7 -12 19 t20.5 31t30.5 19q-4 0 67 -35q113 -56 259 -56t273 76l67 40q24 0 24 -23zM168 -318q-44 0 -44 44q0 14 10 24l774 774l58 -58l-774 -774q-10 -10 -24 -10z" />
+<glyph unicode="&#x292e;" d="M1924 1459q0 -2 -40 -68q-76 -123 -76 -271.5t56 -260.5l35 -69q0 -10 -20 -30t-30.5 -20t-18.5 13q-101 172 -101 345q0 73 19 150l-1556 -1556q-10 -10 -24 -10q-44 0 -44 44q0 14 10 24l1556 1556q-73 -18 -149 -18q-181 0 -346 100q-12 7 -12 19t20.5 31t30.5 19 q-4 0 67 -35q113 -56 259 -56t273 76l67 40q24 0 24 -23zM124 1438q0 44 44 44q14 0 24 -10l774 -774l-58 -58l-774 774q-10 10 -10 24zM1924 -295q0 -23 -24 -23l-67 40q-127 76 -273 76t-259 -56q-71 -35 -67 -35q-10 0 -30.5 19t-20.5 31t12 19q165 100 346 100 q76 0 149 -18l-608 608l58 58l608 -608q-19 77 -19 150q0 173 101 345q8 13 18.5 13t30.5 -20t20 -30l-35 -69q-56 -112 -56 -249q0 -160 76 -283q40 -66 40 -68z" />
+<glyph unicode="&#x292f;" d="M1924 1459q0 -2 -40 -68q-76 -123 -76 -271.5t56 -260.5l35 -69q0 -10 -20 -30t-30.5 -20t-18.5 13q-101 172 -101 345q0 73 19 150l-608 -608l-58 58l608 608q-73 -18 -149 -18q-181 0 -346 100q-12 7 -12 19t20.5 31t30.5 19q-4 0 67 -35q113 -56 259 -56t273 76l67 40 q24 0 24 -23zM1924 -274q0 -44 -44 -44q-14 0 -24 10l-1722 1722q-10 10 -10 24q0 44 44 44q14 0 24 -10l1722 -1722q10 -10 10 -24zM168 -318q-44 0 -44 44q0 14 10 24l774 774l58 -58l-774 -774q-10 -10 -24 -10z" />
+<glyph unicode="&#x2930;" d="M124 1438q0 44 44 44q14 0 24 -10l774 -774l-58 -58l-774 774q-10 10 -10 24zM1924 -295q0 -23 -24 -23l-67 40q-127 76 -273 76t-259 -56q-71 -35 -67 -35q-10 0 -30.5 19t-20.5 31t12 19q165 100 346 100q76 0 149 -18l-608 608l58 58l608 -608q-19 77 -19 150 q0 173 101 345q8 13 18.5 13t30.5 -20t20 -30l-35 -69q-56 -112 -56 -249q0 -160 76 -283q40 -66 40 -68zM1924 1438q0 -14 -10 -24l-1722 -1722q-10 -10 -24 -10q-44 0 -44 44q0 14 10 24l1722 1722q10 10 24 10q44 0 44 -44z" />
+<glyph unicode="&#x2931;" d="M1924 1459q0 -2 -40 -68q-76 -123 -76 -271.5t56 -260.5l35 -69q0 -10 -20 -30t-30.5 -20t-18.5 13q-101 172 -101 345q0 73 19 150l-1556 -1556q-10 -10 -24 -10q-44 0 -44 44q0 14 10 24l1556 1556q-73 -18 -149 -18q-181 0 -346 100q-12 7 -12 19t20.5 31t30.5 19 q-4 0 67 -35q113 -56 259 -56t273 76l67 40q24 0 24 -23zM319 1098q0 -173 -101 -345q-8 -13 -18.5 -13t-30.5 20t-20 30l35 69q56 112 56 249q0 160 -76 283q-40 66 -40 68q0 23 24 23l67 -40q127 -76 273 -76t259 56q71 35 67 35q10 0 30.5 -19t20.5 -31t-12 -19 q-165 -100 -346 -100q-76 0 -149 18l608 -608l-58 -58l-608 608q19 -77 19 -150zM1924 -274q0 -44 -44 -44q-14 0 -24 10l-774 774l58 58l774 -774q10 -10 10 -24z" />
+<glyph unicode="&#x2932;" d="M1924 -274q0 -44 -44 -44q-14 0 -24 10l-1556 1556q19 -77 19 -150q0 -173 -101 -345q-8 -13 -18.5 -13t-30.5 20t-20 30l35 69q56 112 56 249q0 160 -76 283q-40 66 -40 68q0 23 24 23l67 -40q127 -76 273 -76t259 56q71 35 67 35q10 0 30.5 -19t20.5 -31t-12 -19 q-165 -100 -346 -100q-76 0 -149 18l1556 -1556q10 -10 10 -24zM1924 1459q0 -2 -40 -68q-76 -123 -76 -271.5t56 -260.5l35 -69q0 -10 -20 -30t-30.5 -20t-18.5 13q-101 172 -101 345q0 73 19 150l-608 -608l-58 58l608 608q-73 -18 -149 -18q-181 0 -346 100q-12 7 -12 19 t20.5 31t30.5 19q-4 0 67 -35q113 -56 259 -56t273 76l67 40q24 0 24 -23zM168 -318q-44 0 -44 44q0 14 10 24l774 774l58 -58l-774 -774q-10 -10 -24 -10z" />
+<glyph unicode="&#x2933;" d="M1980 582q0 -16 -15 -20q-163 -57 -276.5 -191t-144.5 -305q-3 -19 -21 -19h-41q-20 0 -20 27q51 292 295 467h-73q-84 0 -240.5 -114.5t-263 -114.5t-207.5 77q-63 48 -162.5 161t-152.5 156q-84 66 -163 66t-162 -66q-50 -41 -148 -151q-12 -14 -31 -14q-39 0 -39 41 q0 14 11 27q105 121 164 167q101 78 205 78t206 -78q59 -46 160.5 -161t153.5 -156q83 -65 164 -65t240.5 114.5t264.5 114.5h73q-244 175 -295 467q0 27 20 27h41q18 0 21 -19q31 -171 144.5 -304.5t276.5 -188.5q15 -7 15 -23z" />
+<glyph unicode="&#x2934;" horiz-adv-x="1731" d="M1098 1324q-135 -223 -414 -293q-21 0 -23 23q1 -11 1 40q0 13 14 19q22 6 65 19q132 46 229.5 150.5t132.5 238.5q3 23 13 67q6 18 24 18t22 -18q4 -22 13 -66q35 -135 132.5 -239.5t229.5 -150.5q22 -6 65 -19q14 -4 14 -64q0 -18 -22 -18l-6 2q-102 28 -160 59 q-158 84 -248 232v-429q0 -244 -194 -316q-104 -38 -401 -38h-431q-39 0 -39 41t39 41h551q184 0 271 44q122 62 122 228v429z" />
+<glyph unicode="&#x2935;" horiz-adv-x="1731" d="M1180 -160q136 223 414 293q22 0 22 -18q0 -60 -14 -64q-22 -6 -65 -19q-132 -46 -229.5 -150.5t-132.5 -239.5q-4 -22 -13 -66q-4 -18 -22 -18t-24 18q-4 23 -13 67q-35 134 -132.5 238.5t-229.5 150.5q-22 6 -65 19q-14 6 -14 19q0 51 -1 40q2 23 23 23l6 -2 q104 -29 161 -59q157 -83 247 -232v429q0 166 -122 228q-87 44 -271 44h-551q-39 0 -39 41t39 41h431q297 0 401 -38q194 -72 194 -316v-429z" />
+<glyph unicode="&#x2936;" horiz-adv-x="1731" d="M397 541q223 -136 293 -414q0 -22 -18 -22q-60 0 -64 14q-6 22 -19 65q-46 132 -150.5 229.5t-239.5 132.5q-22 4 -66 13q-18 4 -18 22t18 24q23 4 67 13q134 35 238.5 132.5t150.5 229.5q6 22 19 65q6 14 19 14q51 0 40 1q23 -2 23 -23l-2 -6q-29 -104 -59 -161 q-83 -157 -232 -247h429q166 0 228 122q44 87 44 271v551q0 39 41 39t41 -39v-431q0 -297 -38 -401q-72 -194 -316 -194h-429z" />
+<glyph unicode="&#x2937;" horiz-adv-x="1731" d="M898 623q-223 135 -293 414q0 21 23 23q-11 -1 40 -1q13 0 19 -14q6 -22 19 -65q46 -132 150.5 -229.5t238.5 -132.5q23 -3 67 -13q18 -6 18 -24t-18 -22q-22 -4 -66 -13q-135 -35 -239.5 -132.5t-150.5 -229.5q-6 -22 -19 -65q-4 -14 -64 -14q-18 0 -18 22l2 6 q28 102 59 160q84 158 232 248h-429q-244 0 -316 194q-38 104 -38 401v431q0 39 41 39t41 -39v-551q0 -184 44 -271q62 -122 228 -122h429z" />
+<glyph unicode="&#x2938;" horiz-adv-x="1024" d="M706.5 1141q120.5 -253 120.5 -512.5t-118.5 -500.5t-323.5 -409q16 1 35 1q67 0 166 -16q126 -22 126 -71q0 -42 -38 -42l-77 27q-78 27 -161 27t-169 -23q-19 -5 -25 -5q-17 0 -17 17q0 6 14 58.5t14 135t-28 161.5l-28 79q0 37 42.5 37t66 -103.5t23.5 -147t-2 -78.5 q418 368 418 853q0 397 -278 729l-136 138q-14 15 -14 30q0 43 41 43q15 0 28 -11q200 -164 320.5 -417z" />
+<glyph unicode="&#x2939;" horiz-adv-x="1024" d="M827 68l-28 -79q-28 -79 -28 -161.5t23 -168.5q5 -19 5 -25q0 -17 -17 -17q-6 0 -58.5 14t-135.5 14t-161 -27l-77 -27q-38 0 -38 42q0 49 126 71q99 16 166 16q19 0 35 -1q-205 168 -323.5 409t-118.5 500.5t120.5 512.5t320.5 417q13 11 28 11q41 0 41 -43 q0 -15 -14 -30q-47 -44 -136 -138q-278 -332 -278 -729q0 -485 418 -853q-2 35 -2 78.5t23.5 147t66 103.5t42.5 -37z" />
+<glyph unicode="&#x293a;" d="M2013 743q0 -41 -43 -41q-15 0 -30 14q-44 47 -138 136q-332 278 -729 278q-485 0 -853 -418q35 2 78.5 2t147 -23.5t103.5 -66t-37 -42.5l-79 28q-79 28 -161.5 28t-168.5 -23q-19 -5 -25 -5q-17 0 -17 17q0 6 14 58.5t14 135.5t-27 161l-27 77q0 38 42 38q49 0 71 -126 q16 -99 16 -166q0 -19 -1 -35q168 205 409 323.5t500.5 118.5t512.5 -120.5t417 -320.5q11 -13 11 -28z" />
+<glyph unicode="&#x293b;" d="M1971 697q-49 0 -71 126q-16 99 -16 166q0 19 1 35q-168 -205 -409 -323.5t-500.5 -118.5t-512.5 120.5t-417 320.5q-11 13 -11 28q0 41 43 41q15 0 30 -14q44 -47 138 -136q332 -278 729 -278q485 0 853 418q-35 -2 -78.5 -2t-147 23.5t-103.5 66t37 42.5l79 -28 q79 -28 161.5 -28t168.5 23q19 5 25 5q17 0 17 -17q0 -6 -14 -58.5t-14 -135.5t27 -161l27 -77q0 -38 -42 -38z" />
+<glyph unicode="&#x293c;" d="M1986 982q-27 -78 -27 -161t23 -169q5 -19 5 -25q0 -17 -17 -17q-6 0 -58.5 14t-135 14t-161.5 -28l-79 -28q-37 0 -37 42.5t103.5 66t147 23.5t78.5 -2q-368 418 -853 418q-397 0 -729 -278l-138 -136q-15 -14 -30 -14q-43 0 -43 41q0 15 11 28q164 200 417 320.5 t512.5 120.5t500.5 -118.5t409 -323.5q-1 16 -1 35q0 67 16 166q22 126 71 126q42 0 42 -38zM1260 582q0 -41 -39 -41h-574q-37 0 -37 41t37 41h574q39 0 39 -41z" />
+<glyph unicode="&#x293d;" d="M2013 743q0 -41 -43 -41q-15 0 -30 14q-44 47 -138 136q-332 278 -729 278q-485 0 -853 -418q35 2 78.5 2t147 -23.5t103.5 -66t-37 -42.5l-79 28q-79 28 -161.5 28t-168.5 -23q-19 -5 -25 -5q-17 0 -17 17q0 6 14 58.5t14 135.5t-27 161l-27 77q0 38 42 38q49 0 71 -126 q16 -99 16 -166q0 -19 -1 -35q168 205 409 323.5t500.5 118.5t512.5 -120.5t417 -320.5q11 -13 11 -28zM1438 582q0 -41 -37 -41h-247v-245q0 -39 -41 -39t-41 39v245h-245q-39 0 -39 41t39 41h245v247q0 37 41 37t41 -37v-247h247q37 0 37 -41z" />
+<glyph unicode="&#x293e;" d="M1687 732q0 -321 -231.5 -538t-556.5 -217t-553 225q2 -23 2 -72.5t-22.5 -152t-65 -102.5t-42.5 38q0 -3 27.5 79.5t27.5 163t-14 131.5t-14 58q0 17 17 17q6 0 57.5 -14t133 -14t164.5 28t78 28q38 0 38 -42.5t-103.5 -66t-153 -23.5t-72.5 2q204 -200 495 -200 t499.5 192.5t208.5 478.5q0 209 -114 424q-61 115 -144 210l-47 51q-10 11 -10 25q0 43 41 43q15 0 32 -16q143 -136 232.5 -338.5t89.5 -397.5z" />
+<glyph unicode="&#x293f;" d="M1687 -87q0 -38 -42.5 -38t-65 102.5t-22.5 152t2 72.5q-228 -225 -553 -225t-556.5 217t-231.5 538q0 195 89.5 397.5t232.5 338.5q17 16 32 16q41 0 41 -43q0 -14 -13 -28l-44 -48q-83 -95 -144 -210q-114 -215 -114 -424q0 -286 208.5 -478.5t499.5 -192.5t495 200 q-23 -2 -72.5 -2t-153 23.5t-103.5 66t38 42.5q-5 0 78 -28t164.5 -28t133 14t57.5 14q17 0 17 -17q0 -7 -14 -58t-14 -131.5t28 -163.5z" />
+<glyph unicode="&#x2940;" horiz-adv-x="1591" d="M1312.5 1087q205.5 -211 205.5 -507t-211.5 -508.5t-509.5 -212.5t-510.5 212.5t-212.5 510.5q0 263 168.5 464.5t427.5 247.5q152 89 222 227q8 20 25 59q13 26 36 26q42 0 42 -39q0 -7 -3 -15q-55 -143 -178 -247q293 -7 498.5 -218zM1248.5 129.5 q187.5 188.5 187.5 450.5t-181.5 449t-441.5 194v-1q125 -105 179 -246q3 -8 3 -15q0 -39 -42 -39q-23 0 -33 23l-28 61q-63 124 -194 209q-234 -36 -388 -216t-154 -417q0 -264 188.5 -452.5t452.5 -188.5t451.5 188.5z" />
+<glyph unicode="&#x2941;" horiz-adv-x="1591" d="M1518 582q0 -298 -212.5 -510.5t-510.5 -212.5t-509.5 212.5t-211.5 508.5t205.5 507t498.5 218q-123 104 -178 247q-3 8 -3 15q0 39 42 39q23 0 33 -23l28 -62q70 -138 222 -227q259 -46 427.5 -247.5t168.5 -464.5zM1436 582q0 237 -154 417t-388 216 q-131 -85 -194 -209q-8 -20 -25 -58q-13 -26 -36 -26q-42 0 -42 39q0 7 3 15q54 141 179 246v1q-260 -7 -441.5 -194t-181.5 -449t187.5 -450.5t451.5 -188.5t452.5 188.5t188.5 452.5z" />
+<glyph unicode="&#x2942;" d="M1651 995q-223 135 -293 414q0 21 23 23q-11 -1 40 -1q13 0 19 -14q6 -22 19 -65q46 -132 150.5 -229.5t238.5 -132.5q23 -3 67 -13q18 -6 18 -24t-18 -22q-22 -4 -66 -13q-135 -35 -239.5 -132.5t-150.5 -229.5q-6 -22 -19 -65q-4 -14 -64 -14q-18 0 -18 22l2 6 q28 102 59 160q84 158 232 248h-1499q-37 0 -37 41t37 41h1499zM397 231q224 -137 293 -414q0 -20 -24 -23q9 1 -39 1q-15 0 -19 14q-5 22 -18 65q-45 131 -151 229t-240 133q-22 4 -66 13q-18 5 -18 23.5t24.5 24t46.5 8.5q205 48 329 221q46 64 74 144q6 23 19 65 q6 14 64 14q18 0 18 -22l-2 -6q-38 -143 -108 -241.5t-183 -166.5h639q37 0 37 -41t-37 -41h-639z" />
+<glyph unicode="&#x2943;" d="M397 913q223 -136 293 -414q0 -22 -18 -22q-60 0 -64 14q-6 22 -19 65q-46 132 -150.5 229.5t-239.5 132.5q-22 4 -66 13q-18 4 -18 22t18 24q23 4 67 13q134 35 238.5 132.5t150.5 229.5q6 23 19 65q6 14 19 14q51 0 40 1q23 -2 23 -23l-2 -6q-29 -104 -59 -161 q-83 -157 -232 -247h1499q37 0 37 -41t-37 -41h-1499zM1651 313q-223 134 -293 414q0 22 18 22q58 0 64 -14q6 -22 19 -65q67 -192 239 -298q75 -46 164 -67q22 -3 43 -7q28 -7 28 -25.5t-18 -23.5q-22 -4 -66 -13q-134 -35 -240 -133t-151 -229l-18 -65q-4 -14 -19 -14 q-48 0 -39 -1q-24 3 -24 23l2 6q38 139 109 239.5t182 168.5h-639q-37 0 -37 41t37 41h639z" />
+<glyph unicode="&#x2944;" d="M1651 995q-224 137 -293 414q0 20 24 23q-9 -1 39 -1q15 0 19 -14q5 -22 18 -65q45 -131 151 -229t240 -133q22 -4 66 -13q18 -5 18 -23.5t-24.5 -24t-46.5 -8.5q-205 -48 -329 -221q-46 -64 -74 -144q-6 -23 -19 -65q-6 -14 -64 -14q-18 0 -18 22l2 6q38 143 108 241.5 t183 166.5h-639q-37 0 -37 41t37 41h639zM397 231q223 -135 293 -414q0 -21 -23 -23q11 1 -40 1q-13 0 -19 14q-6 22 -19 65q-46 132 -150.5 229.5t-238.5 132.5q-23 3 -67 13q-18 6 -18 24t18 22q22 4 66 13q135 35 239.5 132.5t150.5 229.5q6 22 19 65q4 14 64 14 q18 0 18 -22l-2 -6q-28 -102 -59 -160q-84 -158 -232 -248h1499q37 0 37 -41t-37 -41h-1499z" />
+<glyph unicode="&#x2945;" d="M1651 895q-223 135 -293 414q0 21 23 23q-11 -1 40 -1q13 0 19 -14q6 -22 19 -65q46 -132 150.5 -229.5t238.5 -132.5q23 -3 67 -13q18 -6 18 -24t-18 -22q-22 -4 -66 -13q-135 -35 -239.5 -132.5t-150.5 -229.5q-6 -22 -19 -65q-4 -14 -64 -14q-18 0 -18 22l2 6 q28 102 59 160q84 158 232 248h-1499q-37 0 -37 41t37 41h1499zM965 272q0 -41 -37 -41h-347v-345q0 -39 -41 -39t-41 39v345h-345q-39 0 -39 41t39 41h345v347q0 37 41 37t41 -37v-347h347q37 0 37 -41z" />
+<glyph unicode="&#x2946;" d="M397 813q223 -136 293 -414q0 -22 -18 -22q-60 0 -64 14q-6 22 -19 65q-46 132 -150.5 229.5t-239.5 132.5q-22 4 -66 13q-18 4 -18 22t18 24q23 4 67 13q134 35 238.5 132.5t150.5 229.5q6 22 19 65q6 14 19 14q51 0 40 1q23 -2 23 -23l-2 -6q-29 -104 -59 -161 q-83 -157 -232 -247h1499q37 0 37 -41t-37 -41h-1499zM1933 272q0 -41 -39 -41h-345v-345q0 -39 -41 -39t-41 39v345h-347q-37 0 -37 41t37 41h347v347q0 37 41 37t41 -37v-347h345q39 0 39 -41z" />
+<glyph unicode="&#x2947;" d="M1906 611q25 -11 25 -27t-15 -22l-46 -18q-190 -83 -296 -265q-41 -70 -79 -213q-2 -7 -8 -13t-53 -6q-21 0 -21 27q0 2 8 36q65 274 287 431h-906l274 -274q13 -13 13 -27t-15 -29t-29 -15t-27 13l-315 315l-315 -315q-13 -13 -27 -13t-29 15t-15 29t13 27l274 274h-450 q-39 0 -39 41t39 41h450l-275 275q-26 26 3 55t55 3l316 -316l316 316q26 26 55 -3t3 -55l-275 -275h906q-154 111 -238 288q-57 121 -57 179q0 24 21 28q-3 -1 41 -1q15 0 20 -19q14 -55 54 -163q105 -217 317 -310z" />
+<glyph unicode="&#x2948;" d="M1917 605q14 -8 14 -22.5t-14 -20.5q-223 -79 -343 -283q-43 -74 -79 -213q-2 -7 -8 -13t-53 -6q-21 0 -21 27q0 2 8 36q65 274 287 431h-354q-15 -124 -109 -208t-221 -84t-221 84t-109 208h-356q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41q-14 0 -20 19 q-35 177 -143 305t-277 191q-16 6 -16 20.5t59 39.5q138 59 233.5 171.5t133.5 261.5q3 15 10 43q5 18 25 20q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-59 -266 -288 -432h356q15 124 109 208t221 84t221 -84t109 -208h354q-154 111 -238 288q-57 121 -57 179q0 24 21 27h41 q15 0 20 -19q49 -191 144 -303t225 -169q19 -6 53 -21zM1024 835q-94 0 -164.5 -60.5t-85.5 -151.5h500q-15 91 -85.5 151.5t-164.5 60.5zM1024 329q94 0 164.5 60.5t85.5 151.5h-500q15 -91 85.5 -151.5t164.5 -60.5z" />
+<glyph unicode="&#x2949;" horiz-adv-x="1024" d="M471 1200q-135 -223 -414 -293q-21 0 -23 23q1 -11 1 40q0 13 14 19q22 6 65 19q132 46 229.5 150.5t132.5 238.5q3 23 13 67q6 18 24 18t22 -18q4 -22 13 -66q35 -135 132.5 -239.5t229.5 -150.5q22 -6 65 -19q14 -4 14 -64q0 -18 -22 -18l-6 2q-102 28 -160 59 q-158 84 -248 232v-140q38 -129 134 -228.5t223 -143.5q22 -6 65 -19q14 -4 14 -64q0 -18 -22 -18l-6 2q-102 28 -160 59q-158 84 -248 232v-535q124 -15 208 -109t84 -226.5t-97.5 -230t-235.5 -97.5t-235.5 97.5t-97.5 230t84 226.5t208 109v535q-135 -223 -414 -293 q-21 0 -23 23q1 -11 1 40q0 13 14 19q22 6 65 19q127 44 223 143.5t134 227.5v141zM765 15q0 105 -74 179t-179 74t-179 -74t-74 -179t74 -179t179 -74t179 74t74 179z" />
+<glyph unicode="&#x294a;" d="M1931 582q0 -16 -21.5 -25t-40.5 -16q-134 -57 -230 -170t-133 -258q-3 -28 -25 -64q-6 -3 -18 -3q-50 0 -50 28q0 5 7 35q64 269 288 432h-1526q-67 0 -67 41q0 16 62 41q132 54 230 170t133 258q2 16 11 47q8 20 45 20t37 -28q0 -7 -7 -35q-69 -273 -288 -432h1526 q67 0 67 -41z" />
+<glyph unicode="&#x294b;" d="M1931 582q0 -41 -67 -41h-1526q219 -159 288 -432q7 -28 7 -35q0 -28 -37 -28t-45 20q-4 16 -11 47q-35 142 -133 258t-230 170q-62 25 -62 41q0 41 67 41h1526q-224 163 -288 432q-7 30 -7 35q0 28 50 28q25 0 30.5 -18t12.5 -49q37 -145 133 -258t230 -170 q19 -7 40.5 -16t21.5 -25z" />
+<glyph unicode="&#x294c;" horiz-adv-x="1142" d="M1087 1062q20 -8 20 -45t-28 -37q-7 0 -35 7q-273 69 -432 288v-1526q0 -67 -41 -67q-16 0 -41 62q-54 132 -170 230t-258 133q-16 2 -47 11q-20 8 -20 45t28 37q7 0 35 -7q273 -69 432 -288v1526q0 67 41 67q16 0 41 -62q54 -132 170 -230t258 -133q16 -2 47 -11z" />
+<glyph unicode="&#x294d;" horiz-adv-x="1142" d="M1079 200q28 0 28 -37t-20 -45q-16 -4 -47 -11q-142 -35 -258 -133t-170 -230q-25 -62 -41 -62q-41 0 -41 67v1526q-159 -219 -432 -288q-28 -7 -35 -7q-28 0 -28 37t20 45q16 4 47 11q142 35 258 133t170 230q25 62 41 62q41 0 41 -67v-1526q159 219 432 288q28 7 35 7z " />
+<glyph unicode="&#x294e;" d="M1931 582q0 -41 -67 -41h-1682q-67 0 -67 41q0 16 62 41q132 54 230 170t133 258q2 16 11 47q8 20 45 20t37 -28q0 -7 -7 -35q-69 -273 -288 -432h1370q-219 159 -288 432q-7 28 -7 35q0 28 37 28t45 -20q4 -16 11 -47q35 -142 133 -258t230 -170q62 -25 62 -41z" />
+<glyph unicode="&#x294f;" horiz-adv-x="1024" d="M961 200q28 0 28 -37t-20 -45q-16 -4 -47 -11q-142 -35 -258 -133t-170 -230q-25 -62 -41 -62q-41 0 -41 67v1682q0 67 41 67q16 0 41 -62q54 -132 170 -230t258 -133q16 -2 47 -11q20 -8 20 -45t-28 -37q-7 0 -35 7q-273 69 -432 288v-1370q159 219 432 288q28 7 35 7z " />
+<glyph unicode="&#x2950;" d="M1931 582q0 -16 -62 -41q-132 -54 -230 -170t-133 -258q-2 -16 -11 -47q-8 -20 -45 -20t-37 28q0 7 7 35q69 273 288 432h-1370q219 -159 288 -432q7 -28 7 -35q0 -28 -37 -28t-45 20q-4 16 -11 47q-35 142 -133 258t-230 170q-62 25 -62 41q0 41 67 41h1682q67 0 67 -41 z" />
+<glyph unicode="&#x2951;" horiz-adv-x="1024" d="M612 -251q0 -67 -41 -67q-16 0 -41 62q-54 132 -170 230t-258 133q-16 2 -47 11q-20 8 -20 45t28 37q7 0 35 -7q273 -69 432 -288v1370q-159 -219 -432 -288q-28 -7 -35 -7q-28 0 -28 37t20 45q16 4 47 11q142 35 258 133t170 230q25 62 41 62q41 0 41 -67v-1682z" />
+<glyph unicode="&#x2952;" d="M1931 582q0 -41 -39 -41h-1650q-67 0 -67 41q0 16 62 41q132 54 230 170t133 258q2 16 11 47q8 20 45 20t37 -28q0 -7 -7 -35q-69 -273 -288 -432h1494q39 0 39 -41zM165 44q0 -62 -41 -62t-41 62v1077q0 61 41 61t41 -61v-1077z" />
+<glyph unicode="&#x2953;" d="M1963 44q0 -62 -41 -62t-41 62v1077q0 61 41 61t41 -61v-1077zM1871 582q0 -41 -67 -41h-1650q-39 0 -39 41t39 41h1494q-219 159 -288 432q-7 28 -7 35q0 28 37 28t45 -20q4 -16 11 -47q35 -142 133 -258t230 -170q62 -25 62 -41z" />
+<glyph unicode="&#x2954;" horiz-adv-x="1024" d="M1053 1489q0 -41 -61 -41h-1077q-62 0 -62 41t62 41h1077q61 0 61 -41zM969 1002q20 -8 20 -45t-28 -37q-7 0 -35 7q-273 69 -432 288v-1494q0 -39 -41 -39t-41 39v1650q0 67 41 67q16 0 41 -62q54 -132 170 -230t258 -133q16 -2 47 -11z" />
+<glyph unicode="&#x2955;" horiz-adv-x="1024" d="M961 260q28 0 28 -37t-20 -45q-16 -4 -47 -11q-142 -35 -258 -133t-170 -230q-25 -62 -41 -62q-41 0 -41 67v1650q0 39 41 39t41 -39v-1494q159 219 432 288q28 7 35 7zM1053 -309q0 -41 -61 -41h-1077q-62 0 -62 41t62 41h1077q61 0 61 -41z" />
+<glyph unicode="&#x2956;" d="M1931 582q0 -41 -39 -41h-1494q219 -159 288 -432q7 -28 7 -35q0 -28 -37 -28t-45 20q-4 16 -11 47q-35 142 -133 258t-230 170q-62 25 -62 41q0 41 67 41h1650q39 0 39 -41zM165 44q0 -62 -41 -62t-41 62v1077q0 61 41 61t41 -61v-1077z" />
+<glyph unicode="&#x2957;" d="M1963 44q0 -62 -41 -62t-41 62v1077q0 61 41 61t41 -61v-1077zM1871 582q0 -16 -62 -41q-132 -54 -230 -170t-133 -258q-2 -16 -11 -47q-8 -20 -45 -20t-37 28q0 7 7 35q69 273 288 432h-1494q-39 0 -39 41t39 41h1650q67 0 67 -41z" />
+<glyph unicode="&#x2958;" horiz-adv-x="1024" d="M1053 1489q0 -41 -61 -41h-1077q-62 0 -62 41t62 41h1077q61 0 61 -41zM494 -279q0 -39 -41 -39t-41 39v1494q-159 -219 -432 -288q-28 -7 -35 -7q-28 0 -28 37t20 45q16 4 47 11q142 35 258 133t170 230q25 62 41 62q41 0 41 -67v-1650z" />
+<glyph unicode="&#x2959;" horiz-adv-x="1024" d="M494 -191q0 -67 -41 -67q-16 0 -41 62q-54 132 -170 230t-258 133q-16 2 -47 11q-20 8 -20 45t28 37q7 0 35 -7q273 -69 432 -288v1494q0 39 41 39t41 -39v-1650zM1053 -309q0 -41 -61 -41h-1077q-62 0 -62 41t62 41h1077q61 0 61 -41z" />
+<glyph unicode="&#x295a;" d="M1965 44q0 -62 -41 -62t-41 62v497h-1701q-67 0 -67 41q0 16 62 41q132 54 230 170t133 258q2 16 11 47q8 20 45 20t37 -28q0 -7 -7 -35q-69 -273 -288 -432h1545v498q0 61 41 61t41 -61v-1077z" />
+<glyph unicode="&#x295b;" d="M1931 582q0 -41 -67 -41h-1701v-497q0 -62 -41 -62t-41 62v1077q0 61 41 61t41 -61v-498h1545q-219 159 -288 432q-7 28 -7 35q0 28 37 28t45 -20q4 -16 11 -47q35 -142 133 -258t230 -170q62 -25 62 -41z" />
+<glyph unicode="&#x295c;" horiz-adv-x="1024" d="M1053 -311q0 -41 -61 -41h-1077q-62 0 -62 41t62 41h497v1701q0 67 41 67q16 0 41 -62q54 -132 170 -230t258 -133q16 -2 47 -11q20 -8 20 -45t-28 -37q-7 0 -35 7q-273 69 -432 288v-1545h498q61 0 61 -41z" />
+<glyph unicode="&#x295d;" horiz-adv-x="1024" d="M1053 1491q0 -41 -61 -41h-498v-1545q159 219 432 288q28 7 35 7q28 0 28 -37t-20 -45q-16 -4 -47 -11q-142 -35 -258 -133t-170 -230q-25 -62 -41 -62q-41 0 -41 67v1701h-497q-62 0 -62 41t62 41h1077q61 0 61 -41z" />
+<glyph unicode="&#x295e;" d="M1965 43q0 -61 -41 -61t-41 61v498h-1545q219 -159 288 -432q7 -28 7 -35q0 -28 -37 -28t-45 20q-4 16 -11 47q-35 142 -133 258t-230 170q-62 25 -62 41q0 41 67 41h1701v497q0 62 41 62t41 -62v-1077z" />
+<glyph unicode="&#x295f;" d="M1931 582q0 -16 -62 -41q-132 -54 -230 -170t-133 -258q-2 -16 -11 -47q-8 -20 -45 -20t-37 28q0 7 7 35q69 273 288 432h-1545v-498q0 -61 -41 -61t-41 61v1077q0 62 41 62t41 -62v-497h1701q67 0 67 -41z" />
+<glyph unicode="&#x2960;" horiz-adv-x="1024" d="M1171 -311q0 -41 -62 -41h-1077q-61 0 -61 41t61 41h498v1545q-159 -219 -432 -288q-28 -7 -35 -7q-28 0 -28 37t20 45q16 4 47 11q142 35 258 133t170 230q25 62 41 62q41 0 41 -67v-1701h497q62 0 62 -41z" />
+<glyph unicode="&#x2961;" horiz-adv-x="1024" d="M1171 1491q0 -41 -62 -41h-497v-1701q0 -67 -41 -67q-16 0 -41 62q-54 132 -170 230t-258 133q-16 2 -47 11q-20 8 -20 45t28 37q7 0 35 -7q273 -69 432 -288v1545h-498q-61 0 -61 41t61 41h1077q62 0 62 -41z" />
+<glyph unicode="&#x2962;" d="M1931 342q0 -41 -39 -41h-1554q224 -163 288 -432q7 -30 7 -35q0 -28 -50 -28q-25 0 -30.5 18t-12.5 49q-37 145 -133 258t-230 170q-19 7 -40.5 16t-21.5 25q0 41 67 41h1710q39 0 39 -41zM1931 822q0 -41 -39 -41h-1710q-67 0 -67 41q0 16 62 41q132 54 230 170 t133 258q2 16 11 47q8 20 45 20t37 -28q0 -7 -7 -35q-69 -273 -288 -432h1554q39 0 39 -41z" />
+<glyph unicode="&#x2963;" horiz-adv-x="1622" d="M1567 1054q20 -8 20 -45t-28 -37q-7 0 -35 7q-273 69 -432 288v-1554q0 -39 -41 -39t-41 39v1710q0 67 41 67q16 0 41 -62q54 -132 170 -230t258 -133q16 -2 47 -11zM612 -287q0 -39 -41 -39t-41 39v1554q-163 -224 -432 -288q-30 -7 -35 -7q-28 0 -28 50q0 25 18 30.5 t49 12.5q145 37 258 133t170 230q7 19 16 40.5t25 21.5q41 0 41 -67v-1710z" />
+<glyph unicode="&#x2964;" d="M1931 342q0 -16 -21.5 -25t-40.5 -16q-134 -57 -230 -170t-133 -258q-3 -28 -25 -64q-6 -3 -18 -3q-50 0 -50 28q0 5 7 35q64 269 288 432h-1554q-39 0 -39 41t39 41h1710q67 0 67 -41zM1931 822q0 -41 -67 -41h-1710q-39 0 -39 41t39 41h1554q-219 159 -288 432 q-7 28 -7 35q0 28 37 28t45 -20q4 -16 11 -47q35 -142 133 -258t230 -170q62 -25 62 -41z" />
+<glyph unicode="&#x2965;" horiz-adv-x="1622" d="M1559 192q28 0 28 -37t-20 -45q-16 -4 -47 -11q-142 -35 -258 -133t-170 -230q-25 -62 -41 -62q-41 0 -41 67v1710q0 39 41 39t41 -39v-1554q159 219 432 288q28 7 35 7zM612 -259q0 -67 -41 -67q-16 0 -25 21.5t-16 40.5q-57 134 -170 230t-258 133q-28 3 -64 25 q-3 6 -3 18q0 50 28 50q5 0 35 -7q269 -64 432 -288v1554q0 39 41 39t41 -39v-1710z" />
+<glyph unicode="&#x2966;" d="M1931 292q0 -41 -67 -41h-1710q-39 0 -39 41t39 41h1554q-219 159 -288 432q-7 28 -7 35q0 28 37 28t45 -20q4 -16 11 -47q35 -142 133 -258t230 -170q62 -25 62 -41zM1931 872q0 -41 -39 -41h-1710q-67 0 -67 41q0 16 62 41q132 54 230 170t133 258q2 16 11 47 q8 20 45 20t37 -28q0 -7 -7 -35q-69 -273 -288 -432h1554q39 0 39 -41z" />
+<glyph unicode="&#x2967;" d="M1931 872q0 -41 -39 -41h-1554q219 -159 288 -432q7 -28 7 -35q0 -28 -37 -28t-45 20q-4 16 -11 47q-35 142 -133 258t-230 170q-62 25 -62 41q0 41 67 41h1710q39 0 39 -41zM1931 292q0 -16 -62 -41q-132 -54 -230 -170t-133 -258q-2 -16 -11 -47q-8 -20 -45 -20t-37 28 q0 7 7 35q69 273 288 432h-1554q-39 0 -39 41t39 41h1710q67 0 67 -41z" />
+<glyph unicode="&#x2968;" d="M1931 872q0 -41 -67 -41h-1710q-39 0 -39 41t39 41h1554q-219 159 -288 432q-7 28 -7 35q0 28 37 28t45 -20q4 -16 11 -47q35 -142 133 -258t230 -170q62 -25 62 -41zM1931 292q0 -41 -39 -41h-1710q-67 0 -67 41q0 16 62 41q132 54 230 170t133 258q2 16 11 47 q8 20 45 20t37 -28q0 -7 -7 -35q-69 -273 -288 -432h1554q39 0 39 -41z" />
+<glyph unicode="&#x2969;" d="M1931 872q0 -16 -62 -41q-132 -54 -230 -170t-133 -258q-2 -16 -11 -47q-8 -20 -45 -20t-37 28q0 7 7 35q69 273 288 432h-1554q-39 0 -39 41t39 41h1710q67 0 67 -41zM1931 292q0 -41 -39 -41h-1554q219 -159 288 -432q7 -28 7 -35q0 -28 -37 -28t-45 20q-4 16 -11 47 q-35 142 -133 258t-230 170q-62 25 -62 41q0 41 67 41h1710q39 0 39 -41z" />
+<glyph unicode="&#x296a;" d="M1931 872q0 -41 -39 -41h-1710q-67 0 -67 41q0 16 62 41q132 54 230 170t133 258q2 16 11 47q8 20 45 20t37 -28q0 -7 -7 -35q-69 -273 -288 -432h1554q39 0 39 -41zM1931 292q0 -41 -39 -41h-1738q-39 0 -39 41t39 41h1738q39 0 39 -41z" />
+<glyph unicode="&#x296b;" d="M1931 872q0 -41 -39 -41h-1738q-39 0 -39 41t39 41h1738q39 0 39 -41zM1931 292q0 -41 -39 -41h-1554q219 -159 288 -432q7 -28 7 -35q0 -28 -37 -28t-45 20q-4 16 -11 47q-35 142 -133 258t-230 170q-62 25 -62 41q0 41 67 41h1710q39 0 39 -41z" />
+<glyph unicode="&#x296c;" d="M1931 872q0 -41 -67 -41h-1710q-39 0 -39 41t39 41h1554q-219 159 -288 432q-7 28 -7 35q0 28 37 28t45 -20q4 -16 11 -47q35 -142 133 -258t230 -170q62 -25 62 -41zM1931 292q0 -41 -39 -41h-1738q-39 0 -39 41t39 41h1738q39 0 39 -41z" />
+<glyph unicode="&#x296d;" d="M1931 872q0 -41 -39 -41h-1738q-39 0 -39 41t39 41h1738q39 0 39 -41zM1931 292q0 -16 -62 -41q-132 -54 -230 -170t-133 -258q-2 -16 -11 -47q-8 -20 -45 -20t-37 28q0 7 7 35q69 273 288 432h-1554q-39 0 -39 41t39 41h1710q67 0 67 -41z" />
+<glyph unicode="&#x296e;" horiz-adv-x="1622" d="M1559 192q28 0 28 -37t-20 -45q-16 -4 -47 -11q-142 -35 -258 -133t-170 -230q-25 -62 -41 -62q-41 0 -41 67v1710q0 39 41 39t41 -39v-1554q159 219 432 288q28 7 35 7zM612 -287q0 -39 -41 -39t-41 39v1554q-163 -224 -432 -288q-30 -7 -35 -7q-28 0 -28 50 q0 25 18 30.5t49 12.5q145 37 258 133t170 230q7 19 16 40.5t25 21.5q41 0 41 -67v-1710z" />
+<glyph unicode="&#x296f;" horiz-adv-x="1622" d="M1567 1054q20 -8 20 -45t-28 -37q-7 0 -35 7q-273 69 -432 288v-1554q0 -39 -41 -39t-41 39v1710q0 67 41 67q16 0 41 -62q54 -132 170 -230t258 -133q16 -2 47 -11zM612 -259q0 -67 -41 -67q-16 0 -25 21.5t-16 40.5q-57 134 -170 230t-258 133q-28 3 -64 25q-3 6 -3 18 q0 50 28 50q5 0 35 -7q269 -64 432 -288v1554q0 39 41 39t41 -39v-1710z" />
+<glyph unicode="&#x2970;" d="M1792 582q0 -122 -147 -189q-114 -51 -251 -51h-1239q-39 0 -39 41t39 41h1239q97 0 191 33q125 45 125 125t-125 125q-94 33 -191 33h-1239q-39 0 -39 41t39 41h1239q137 0 251 -51q147 -67 147 -189z" />
+<glyph unicode="&#x2971;" d="M1906 611q25 -11 25 -27t-15 -22l-46 -18q-190 -83 -296 -265q-41 -70 -79 -213q-2 -7 -8 -13t-53 -6q-21 0 -21 27q0 2 8 36q65 274 287 431h-1554q-39 0 -39 41t39 41h1554q-154 111 -238 288q-57 121 -57 179q0 24 21 28q-3 -1 41 -1q15 0 20 -19q14 -55 54 -163 q105 -217 317 -310zM1015 1102q0 -41 -37 -41h-724q-39 0 -39 41t39 41h724q37 0 37 -41zM1015 842q0 -41 -37 -41h-724q-39 0 -39 41t39 41h724q37 0 37 -41z" />
+<glyph unicode="&#x2972;" d="M1906 611q25 -11 25 -27t-15 -22l-46 -18q-190 -83 -296 -265q-41 -70 -79 -213q-2 -7 -8 -13t-53 -6q-21 0 -21 27q0 2 8 36q65 274 287 431h-1554q-39 0 -39 41t39 41h1554q-154 111 -238 288q-57 121 -57 179q0 24 21 28q-3 -1 41 -1q15 0 20 -19q14 -55 54 -163 q105 -217 317 -310zM1018 1057q0 -101 -59.5 -179t-153.5 -78t-217.5 102t-196.5 102q-123 0 -157 -153q-11 -51 -30 -51q-28 0 -28 56q0 110 55 186t153 76t221.5 -102t195.5 -102q53 0 97 35t55 86l8 49q9 34 26 34q31 0 31 -61z" />
+<glyph unicode="&#x2973;" d="M1931 582q0 -41 -39 -41h-1554q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41q-14 0 -20 19q-33 175 -142 303.5t-278 192.5q-16 6 -16 20t16 23l46 18q282 122 363 428q3 16 9.5 40.5t26.5 26.5q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-59 -266 -288 -432h1554 q39 0 39 -41zM1873 303q0 -101 -59.5 -179t-153.5 -78t-217.5 102t-196.5 102q-123 0 -157 -153q-11 -51 -30 -51q-28 0 -28 56q0 110 55 186t153 76t221.5 -102t195.5 -102q53 0 97 35t55 86l8 49q9 34 26 34q31 0 31 -61z" />
+<glyph unicode="&#x2974;" d="M1931 582q0 -14 -16 -20q-259 -98 -369 -334q-23 -49 -33 -90l-18 -72q-6 -19 -20 -19h-41q-21 3 -21 27q0 4 7 35q60 270 288 432h-1554q-39 0 -39 41t39 41h1554q-229 166 -288 432q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5 t230.5 -170.5q16 -5 46 -18q16 -9 16 -23zM1015 303q0 -101 -59.5 -179t-153.5 -78t-217.5 102t-196.5 102q-123 0 -157 -153q-11 -51 -30 -51q-28 0 -28 56q0 110 55 186t153 76t221.5 -102t195.5 -102q53 0 97 35t55 86l8 49q9 34 26 34q31 0 31 -61z" />
+<glyph unicode="&#x2975;" d="M1931 582q0 -14 -16 -20q-259 -98 -369 -334q-23 -49 -33 -90l-18 -72q-6 -19 -20 -19h-41q-21 3 -21 27q0 4 7 35q60 270 288 432h-1554q-39 0 -39 41t39 41h1554q-229 166 -288 432q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5 t230.5 -170.5q16 -5 46 -18q16 -9 16 -23zM1015 303q0 -101 -59.5 -179t-153.5 -78t-217.5 102t-196.5 102q-123 0 -157 -153q-11 -51 -30 -51q-28 0 -28 56q0 110 55 186t153 76t221.5 -102t195.5 -102q53 0 97 35t55 86l8 49q9 34 26 34q31 0 31 -61zM1015 -37 q0 -101 -59.5 -179t-153.5 -78t-217.5 102t-196.5 102q-123 0 -157 -153q-11 -51 -30 -51q-28 0 -28 56q0 110 55 186t153 76t221.5 -102t195.5 -102q53 0 97 35t55 86l8 49q9 34 26 34q31 0 31 -61z" />
+<glyph unicode="&#x2976;" horiz-adv-x="1591" d="M1421 349q0 -41 -41 -41q-8 0 -14 3l-1169 552q-27 13 -27 37t27 37l1169 552q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-1090 -514l1090 -514q24 -11 24 -37zM1421 0q0 -41 -37 -41h-1035q126 -107 178 -251q3 -8 3 -15q0 -39 -42 -39q-24 0 -34 22l-27 62q-76 149 -230 236 q-27 15 -27 26t27 26q155 88 230 237q8 20 25 59q12 26 36 26q42 0 42 -39q0 -7 -3 -15q-52 -146 -179 -253h1036q37 0 37 -41z" />
+<glyph unicode="&#x2977;" d="M2030 31q0 -41 -41 -41q-8 0 -14 3l-1160 548h-477q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41q-14 0 -20 19q-33 175 -142 303.5t-278 192.5q-16 6 -16 20t16 23l46 18q282 122 363 428q3 16 9.5 40.5t26.5 26.5q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35 q-59 -266 -288 -432h477l1160 548q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-1001 -473h697q39 0 39 -41t-39 -41h-697l1001 -473q24 -11 24 -37z" />
+<glyph unicode="&#x2978;" horiz-adv-x="1591" d="M1421 900q0 -24 -27 -37l-1169 -552q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l1090 514l-1090 514q-24 11 -24 37q0 41 41 41q8 0 14 -3l1169 -552q27 -13 27 -37zM1421 0q0 -11 -27 -26q-154 -87 -230 -236l-25 -58q-12 -26 -36 -26q-42 0 -42 39q0 7 3 15q52 144 178 251 h-1035q-37 0 -37 41t37 41h1036q-127 107 -179 253q-3 8 -3 15q0 39 42 39q24 0 34 -23l27 -62q75 -149 230 -237q27 -15 27 -26z" />
+<glyph unicode="&#x2979;" horiz-adv-x="1591" d="M1421 459q0 -41 -39 -41h-590q-254 0 -438 145.5t-184 386.5t184 386.5t438 145.5h590q39 0 39 -41t-39 -41h-584q-223 0 -384.5 -120.5t-161.5 -329.5t161.5 -329.5t384.5 -120.5h584q39 0 39 -41zM1421 0q0 -11 -27 -26q-154 -87 -230 -236l-25 -58q-12 -26 -36 -26 q-42 0 -42 39q0 7 3 15q52 144 178 251h-1035q-37 0 -37 41t37 41h1036q-127 107 -179 253q-3 8 -3 15q0 39 42 39q24 0 34 -23l27 -62q75 -149 230 -237q27 -15 27 -26z" />
+<glyph unicode="&#x297a;" d="M2041 41q0 -41 -39 -41h-480q-237 0 -420 155t-200 386h-564q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41q-14 0 -20 19q-33 175 -142 303.5t-278 192.5q-16 6 -16 20t16 23l46 18q282 122 363 428q3 16 9.5 40.5t26.5 26.5q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35 q-59 -266 -288 -432h564q17 231 200 386t420 155h480q39 0 39 -41t-39 -41h-474q-205 0 -366 -130.5t-178 -328.5h908q39 0 39 -41t-39 -41h-908q17 -198 178 -328.5t366 -130.5h474q39 0 39 -41z" />
+<glyph unicode="&#x297b;" horiz-adv-x="1591" d="M1421 950q0 -241 -184 -386.5t-438 -145.5h-590q-39 0 -39 41t39 41h584q223 0 384.5 120.5t161.5 329.5t-161.5 329.5t-384.5 120.5h-584q-39 0 -39 41t39 41h590q254 0 438 -145.5t184 -386.5zM1421 0q0 -41 -37 -41h-1035q126 -107 178 -251q3 -8 3 -15q0 -39 -42 -39 q-24 0 -34 22l-27 62q-76 149 -230 236q-27 15 -27 26t27 26q155 88 230 237q8 20 25 59q12 26 36 26q42 0 42 -39q0 -7 -3 -15q-52 -146 -179 -253h1036q37 0 37 -41z" />
+<glyph unicode="&#x297c;" horiz-adv-x="1386" d="M552 1158l-89 10q-142 0 -204 -65.5t-62 -207.5q0 -166 122 -228q87 -44 271 -44h642q39 0 39 -41t-39 -41h-642q-184 0 -271 -44q-122 -62 -122 -228q0 -142 62 -207.5t204 -65.5l89 10q41 0 41 -44q0 -48 -130 -48q-348 0 -348 355q0 240 188 313q-188 73 -188 313 q0 355 348 355q130 0 130 -48q0 -44 -41 -44z" />
+<glyph unicode="&#x297d;" horiz-adv-x="1386" d="M923 1168l-89 -10q-41 0 -41 44q0 48 130 48q348 0 348 -355q0 -240 -188 -313q188 -73 188 -313q0 -355 -348 -355q-130 0 -130 48q0 44 41 44l89 -10q142 0 204 65.5t62 207.5q0 166 -122 228q-87 44 -271 44h-642q-39 0 -39 41t39 41h642q184 0 271 44q122 62 122 228 q0 142 -62 207.5t-204 65.5z" />
+<glyph unicode="&#x297e;" horiz-adv-x="1406" d="M117 1158l10 -89q0 -41 -44 -41q-48 0 -48 130q0 348 355 348q240 0 313 -188q73 188 313 188q355 0 355 -348q0 -130 -48 -130q-44 0 -44 41l10 89q0 142 -65.5 204t-207.5 62q-166 0 -228 -122q-44 -87 -44 -271v-642q0 -39 -41 -39t-41 39v642q0 184 -44 271 q-62 122 -228 122q-142 0 -207.5 -62t-65.5 -204z" />
+<glyph unicode="&#x297f;" horiz-adv-x="1406" d="M1289 6l-10 89q0 41 44 41q48 0 48 -130q0 -348 -355 -348q-240 0 -313 188q-73 -188 -313 -188q-355 0 -355 348q0 130 48 130q44 0 44 -41l-10 -89q0 -142 65.5 -204t207.5 -62q166 0 228 122q44 87 44 271v642q0 39 41 39t41 -39v-642q0 -184 44 -271 q62 -122 228 -122q142 0 207.5 62t65.5 204z" />
+<glyph unicode="&#x2980;" horiz-adv-x="1422" d="M1150 -405q0 -37 -41 -37t-41 37v1974q0 37 41 37t41 -37v-1974zM752 -405q0 -37 -41 -37t-41 37v1974q0 37 41 37t41 -37v-1974zM354 -405q0 -37 -41 -37t-41 37v1974q0 37 41 37t41 -37v-1974z" />
+<glyph unicode="&#x2981;" horiz-adv-x="946" d="M906 582q0 -180 -126.5 -306.5t-306.5 -126.5t-306.5 126.5t-126.5 306.5t126.5 306.5t306.5 126.5t306.5 -126.5t126.5 -306.5z" />
+<glyph unicode="&#x2982;" horiz-adv-x="711" d="M542 743q0 -77 -55.5 -131.5t-131.5 -54.5t-131 55t-55 131t55 131t131 55t131.5 -54.5t55.5 -131.5zM542 104q0 -77 -55.5 -131.5t-131.5 -54.5t-131 55t-55 131t55 131t131 55t131.5 -54.5t55.5 -131.5zM460 743q0 42 -31 73t-73.5 31t-73.5 -31t-31 -73t31 -73 t73.5 -31t73.5 31t31 73zM460 104q0 42 -31 73t-73.5 31t-73.5 -31t-31 -73t31 -73t73.5 -31t73.5 31t31 73z" />
+<glyph unicode="&#x2983;" horiz-adv-x="983" d="M809.5 -305q17.5 -3 17.5 -24t-41 -21q-391 0 -391 342v313q0 226 -262 254q-33 4 -33 23t33 23q262 28 262 254v313q0 342 391 342q41 0 41 -21t-17.5 -24t-44.5 -6v-1762q27 -3 44.5 -6zM477 1132v-277q0 -112 -41.5 -177.5t-145.5 -95.5q104 -30 145.5 -95.5 t41.5 -177.5v-277q0 -260 206 -318v1736q-206 -58 -206 -318z" />
+<glyph unicode="&#x2984;" horiz-adv-x="983" d="M883 582q0 -19 -33 -23q-262 -28 -262 -254v-313q0 -342 -391 -342q-41 0 -41 21t17.5 24t44.5 6v1762q-27 3 -44.5 6t-17.5 24t41 21q391 0 391 -342v-313q0 -226 262 -254q33 -4 33 -23zM506 855v277q0 260 -206 318v-1736q206 58 206 318v277q0 112 41.5 177.5 t145.5 95.5q-104 30 -145.5 95.5t-41.5 177.5z" />
+<glyph unicode="&#x2985;" horiz-adv-x="875" d="M721 -275q46 -36 46 -55.5t-17 -19.5q-77 0 -228 118q-431 337 -431 814t431 814q151 118 228 118q17 0 17 -19.5t-46 -55.5q-163 -127 -246.5 -372t-83.5 -485t83.5 -485t246.5 -372zM460 -74q-151 290 -151 651t142 648q-278 -277 -278 -648t287 -651z" />
+<glyph unicode="&#x2986;" horiz-adv-x="875" d="M784 582q0 -477 -431 -814q-151 -118 -228 -118q-17 0 -17 19.5t46 55.5q163 127 246.5 372t83.5 485t-83.5 485t-246.5 372q-46 36 -46 55.5t17 19.5q77 0 228 -118q431 -337 431 -814zM415 -74q287 280 287 651t-278 648q142 -287 142 -648t-151 -651z" />
+<glyph unicode="&#x2987;" horiz-adv-x="682" d="M574 -332q0 -18 -19 -18q-11 0 -46 29q-226 186 -322 396t-96 507t96 507t322 396q35 29 46 29q19 0 19 -18v-1828zM173 582q0 -506 319 -786v1565q-172 -159 -245.5 -341.5t-73.5 -437.5z" />
+<glyph unicode="&#x2988;" horiz-adv-x="682" d="M574 582q0 -297 -96 -507t-322 -396q-35 -29 -46 -29q-19 0 -19 18v1828q0 18 19 18q11 0 46 -29q226 -186 322 -396t96 -507zM492 582q0 255 -73.5 437.5t-245.5 341.5v-1565q319 280 319 786z" />
+<glyph unicode="&#x2989;" horiz-adv-x="666" d="M558 -312q0 -38 -42 -38q-23 0 -43 47l-382 885l382 885q20 47 43 47q42 0 42 -38v-1788zM476 -105v1374l-297 -687z" />
+<glyph unicode="&#x298a;" horiz-adv-x="666" d="M150 -350q-42 0 -42 38v1788q0 38 42 38q23 0 43 -47l382 -885l-382 -885q-20 -47 -43 -47zM487 582l-297 687v-1374z" />
+<glyph unicode="&#x298b;" horiz-adv-x="682" d="M571 -201q0 -41 -68 -41h-391v1848h391q68 0 68 -40.5t-68 -40.5h-309v-1685h309q68 0 68 -41zM571 -401q0 -41 -37 -41h-383q-39 0 -39 41t39 41h383q37 0 37 -41z" />
+<glyph unicode="&#x298c;" horiz-adv-x="682" d="M570 -242h-391q-68 0 -68 41t68 41h309v1685h-309q-68 0 -68 40.5t68 40.5h391v-1848zM570 -401q0 -41 -37 -41h-383q-39 0 -39 41t39 41h383q37 0 37 -41z" />
+<glyph unicode="&#x298d;" horiz-adv-x="682" d="M571 -309q0 -41 -68 -41h-391v1864h391q68 0 68 -40.5t-68 -40.5h-252l228 -228q13 -13 13 -27t-15 -29t-29 -15t-27 13l-227 227v-1642h309q68 0 68 -41z" />
+<glyph unicode="&#x298e;" horiz-adv-x="682" d="M570 -350h-391q-68 0 -68 41t68 41h251l-227 227q-13 13 -13 27t15 29t29 15t27 -13l227 -227v1643h-309q-68 0 -68 40.5t68 40.5h391v-1864z" />
+<glyph unicode="&#x298f;" horiz-adv-x="682" d="M571 -309q0 -41 -68 -41h-391v1864h391q68 0 68 -40.5t-68 -40.5h-309v-1643l227 227q13 13 27 13t29 -15t15 -29t-13 -27l-227 -227h251q68 0 68 -41z" />
+<glyph unicode="&#x2990;" horiz-adv-x="682" d="M570 -350h-391q-68 0 -68 41t68 41h309v1642l-227 -227q-13 -13 -27 -13t-29 15t-15 29t13 27l228 228h-252q-68 0 -68 40.5t68 40.5h391v-1864z" />
+<glyph unicode="&#x2991;" horiz-adv-x="666" d="M558 -312q0 -38 -42 -38q-23 0 -43 47l-382 885l382 885q20 47 43 47q42 0 42 -38q0 -17 -8 -36l-371 -858l371 -858q8 -19 8 -36zM531.5 661.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5z" />
+<glyph unicode="&#x2992;" horiz-adv-x="666" d="M150 -350q-42 0 -42 38q0 17 8 36l371 858l-371 858q-8 19 -8 36q0 38 42 38q23 0 43 -47l382 -885l-382 -885q-20 -47 -43 -47zM327 582q0 -47 -33 -80t-80 -33t-80 33t-33 79.5t33.5 80t80 33.5t79.5 -33t33 -80z" />
+<glyph unicode="&#x2993;" horiz-adv-x="1591" d="M1421 31q0 -41 -41 -41q-8 0 -14 3l-531 251q70 -209 222 -391l136 -138q14 -15 14 -30q0 -43 -41 -43q-15 0 -28 11q-297 243 -402 637l-539 255q-27 13 -27 37t27 37l539 255q105 394 402 637q13 11 28 11q41 0 41 -43q0 -15 -14 -30q-47 -44 -136 -138 q-152 -182 -222 -391l531 251q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-591 -279q-27 -116 -27 -235t27 -235l591 -279q24 -11 24 -37zM697 582q0 95 17 192l-407 -192l407 -192q-17 97 -17 192z" />
+<glyph unicode="&#x2994;" horiz-adv-x="1591" d="M1421 582q0 -24 -27 -37l-539 -255q-105 -394 -402 -637q-13 -11 -28 -11q-41 0 -41 43q0 15 14 30q47 44 136 138q152 182 222 391l-531 -251q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l591 279q27 116 27 235t-27 235l-591 279q-24 11 -24 37q0 41 41 41q8 0 14 -3 l531 -251q-70 209 -222 391l-136 138q-14 15 -14 30q0 43 41 43q15 0 28 -11q297 -243 402 -637l539 -255q27 -13 27 -37zM894 582q0 -95 -17 -192l407 192l-407 192q17 -97 17 -192z" />
+<glyph unicode="&#x2995;" horiz-adv-x="1591" d="M1421 582q0 -24 -27 -37l-570 -269q69 -227 233 -423l136 -138q14 -15 14 -30q0 -43 -41 -43q-15 0 -28 11q-275 225 -387 588l-265 -125q67 -138 171 -263l136 -138q14 -15 14 -30q0 -43 -41 -43q-15 0 -28 11q-205 168 -326 428l-187 -88q-6 -3 -14 -3q-41 0 -41 41 q0 26 24 37l186 88q-83 214 -83 426t83 426l-186 88q-24 11 -24 37q0 41 41 41q8 0 14 -3l187 -88q121 260 326 428q13 11 28 11q41 0 41 -43q0 -15 -14 -30q-47 -44 -136 -138q-104 -125 -171 -263l265 -125q112 363 387 588q13 11 28 11q41 0 41 -43q0 -15 -14 -30 q-47 -44 -136 -138q-164 -196 -233 -423l570 -269q27 -13 27 -37zM779 582q0 -114 25 -226l480 226l-480 226q-25 -112 -25 -226zM379 582q0 -201 75 -391l275 129q-32 133 -32 262t32 262l-275 129q-75 -190 -75 -391z" />
+<glyph unicode="&#x2996;" horiz-adv-x="1591" d="M1421 31q0 -41 -41 -41q-8 0 -14 3l-187 88q-121 -260 -326 -428q-13 -11 -28 -11q-41 0 -41 43q0 15 14 30q47 44 136 138q104 125 171 263l-265 125q-112 -363 -387 -588q-13 -11 -28 -11q-41 0 -41 43q0 15 14 30q47 44 136 138q164 196 233 423l-570 269 q-27 13 -27 37t27 37l570 269q-69 227 -233 423l-136 138q-14 15 -14 30q0 43 41 43q15 0 28 -11q275 -225 387 -588l265 125q-67 138 -171 263l-136 138q-14 15 -14 30q0 43 41 43q15 0 28 -11q205 -168 326 -428l187 88q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-186 -88 q83 -214 83 -426t-83 -426l186 -88q24 -11 24 -37zM1212 582q0 201 -75 391l-275 -129q32 -133 32 -262t-32 -262l275 -129q75 190 75 391zM812 582q0 114 -25 226l-480 -226l480 -226q25 112 25 226z" />
+<glyph unicode="&#x2997;" horiz-adv-x="873" d="M663 -275q46 -35 46 -55t-17 -20q-77 0 -228 118q-193 150 -300 331v966q107 181 300 331q151 118 228 118q17 0 17 -20t-46 -55q-142 -109 -231 -332v-1050q89 -223 231 -332z" />
+<glyph unicode="&#x2998;" horiz-adv-x="873" d="M181 -350q-17 0 -17 20t46 55q142 109 231 332v1050q-89 223 -231 332q-46 35 -46 55t17 20q77 0 228 -118q193 -150 300 -331v-966q-107 -181 -300 -331q-151 -118 -228 -118z" />
+<glyph unicode="&#x2999;" horiz-adv-x="410" d="M268 1452q0 -63 -63 -63t-63 63t63 63q25 0 44 -19t19 -44zM268 1162q0 -63 -63 -63t-63 63t63 63q25 0 44 -19t19 -44zM268 872q0 -63 -63 -63t-63 63t63 63q25 0 44 -19t19 -44zM268 582q0 -63 -63 -63t-63 63t63 63q25 0 44 -19t19 -44zM268 292q0 -63 -63 -63t-63 63 t63 63q25 0 44 -19t19 -44zM268 2q0 -63 -63 -63t-63 63t63 63q25 0 44 -19t19 -44zM268 -288q0 -63 -63 -63t-63 63t63 63q25 0 44 -19t19 -44z" />
+<glyph unicode="&#x299a;" horiz-adv-x="706" d="M564 203q0 -18 -12 -31l-314 -348l142 -160q14 -16 14 -30q0 -41 -41 -41q-20 0 -29 10l-170 190q-12 13 -12 31t12 31l314 348l-314 348q-12 13 -12 31t12 31l314 348l-314 348q-12 13 -12 31t12 31l170 190q9 10 29 10q41 0 41 -41q0 -14 -14 -30l-142 -160l314 -348 q12 -13 12 -31t-12 -31l-314 -348l314 -348q12 -13 12 -31z" />
+<glyph unicode="&#x299b;" horiz-adv-x="1479" d="M1362 41q0 -41 -39 -41h-939q21 -69 43 -110t22 -49q0 -42 -42 -42q-20 0 -32 18q-48 76 -75 183h-148q-37 0 -37 41t37 41h132q-7 52 -7 101q0 189 90 351.5t243 262.5l-249 286q-10 12 -10 26q0 41 41 41q21 0 31 -12l260 -299q154 77 327 77q37 0 37 -40t-37 -40 q-143 0 -273 -59l615 -707q10 -11 10 -29zM357 183q0 -52 8 -101h866l-568 654q-141 -88 -223.5 -234.5t-82.5 -318.5z" />
+<glyph unicode="&#x299c;" horiz-adv-x="1573" d="M1434 41q0 -41 -68 -41h-1139q-61 0 -66 35q-2 11 -2 33v1269q0 68 41 68t41 -68v-571h645q37 0 37 -37v-647h443q68 0 68 -41zM841 82v602h-600v-602h600z" />
+<glyph unicode="&#x299d;" horiz-adv-x="1573" d="M621.5 462.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM1434 41q0 -41 -68 -41h-1139q-61 0 -66 35q-2 11 -2 33v1269q0 68 41 68t41 -68v-473q25 2 51 2q304 0 518.5 -215t214.5 -518q0 -26 -2 -51h343q68 0 68 -41zM945 133 q0 270 -191.5 461.5t-461.5 191.5q-26 0 -51 -2v-702h702q2 25 2 51z" />
+<glyph unicode="&#x299e;" horiz-adv-x="1479" d="M1362 41q0 -41 -37 -41h-1171q-39 0 -39 41q0 18 10 29l929 1068q10 12 31 12q41 0 41 -41q0 -14 -10 -26l-870 -1001h1079q37 0 37 -41z" />
+<glyph unicode="&#x299f;" horiz-adv-x="1479" d="M1362 41q0 -41 -37 -41h-1171q-39 0 -39 41q0 28 24 44l1159 781q9 6 20 6q44 0 44 -42q0 -21 -18 -33l-1059 -715h1040q37 0 37 -41z" />
+<glyph unicode="&#x29a0;" horiz-adv-x="1479" d="M1342 617q20 -10 20 -34.5t-26 -37.5l-839 -415q25 -26 48.5 -45.5t121.5 -82.5q19 -12 19 -34q0 -41 -39 -41q-9 0 -17 4q-119 62 -208 162l-252 -125q-4 -2 -14 -2q-41 0 -41 41q0 24 25 36l231 114q-135 191 -135 425t134 424l-236 117q-19 9 -19 34q0 41 41 41 q10 0 14 -2l252 -125q89 100 208 162q8 4 17 4q39 0 39 -41q0 -22 -19 -34q-40 -24 -118 -79q-27 -23 -52 -49zM443 970q-127 -174 -127 -388.5t128 -388.5l785 389z" />
+<glyph unicode="&#x29a1;" horiz-adv-x="1480" d="M1395 574q0 -39 -41 -39q-22 0 -34 19q-24 40 -79 118q-38 44 -83 82l-383 -776q-10 -20 -34.5 -20t-37.5 26l-381 770q-45 -38 -72 -70t-90 -130q-12 -19 -34 -19q-41 0 -41 39q0 9 4 17q73 139 197 237l-160 323q-2 4 -2 14q0 41 41 41q24 0 36 -25l151 -307 q178 111 388 111t387 -110l154 312q9 19 34 19q41 0 41 -41q0 -10 -2 -14l-160 -323q124 -98 197 -237q4 -8 4 -17zM740 905q-190 0 -352 -103l352 -710l351 710q-161 103 -351 103z" />
+<glyph unicode="&#x29a2;" horiz-adv-x="1479" d="M1362 1109q0 -18 -10 -29l-929 -1068q-10 -12 -31 -12q-41 0 -41 41q0 14 10 26l870 1001h-1079q-37 0 -37 41t37 41h1171q39 0 39 -41z" />
+<glyph unicode="&#x29a3;" horiz-adv-x="1479" d="M1362 41q0 -41 -39 -41h-1171q-37 0 -37 41t37 41h1079l-870 1001q-10 12 -10 26q0 41 41 41q21 0 31 -12l929 -1068q10 -11 10 -29z" />
+<glyph unicode="&#x29a4;" horiz-adv-x="1479" d="M1362 41q0 -41 -37 -41h-1171q-39 0 -39 41q0 18 10 29l929 1068q10 12 31 12q41 0 41 -41q0 -14 -10 -26l-870 -1001h1079q37 0 37 -41zM1362 -223q0 -41 -37 -41h-1171q-39 0 -39 41t39 41h1171q37 0 37 -41z" />
+<glyph unicode="&#x29a5;" horiz-adv-x="1479" d="M1362 41q0 -41 -39 -41h-1171q-37 0 -37 41t37 41h1079l-870 1001q-10 12 -10 26q0 41 41 41q21 0 31 -12l929 -1068q10 -11 10 -29zM1362 -223q0 -41 -37 -41h-1171q-39 0 -39 41t39 41h1171q37 0 37 -41z" />
+<glyph unicode="&#x29a6;" horiz-adv-x="2016" d="M1899 41q0 -41 -37 -41h-1154q-24 0 -48 41l-560 971q-4 7 -4 17q0 42 44 42q21 0 31 -18l561 -971h1130q37 0 37 -41z" />
+<glyph unicode="&#x29a7;" horiz-adv-x="2016" d="M1899 1030q0 -41 -37 -41h-1130l-561 -971q-10 -18 -31 -18q-44 0 -44 42q0 10 4 17l560 971q24 41 48 41h1154q37 0 37 -41z" />
+<glyph unicode="&#x29a8;" horiz-adv-x="1479" d="M1362 41q0 -41 -37 -41h-148q-27 -107 -75 -183q-12 -18 -32 -18q-42 0 -42 42q0 8 22 49t43 110h-939q-39 0 -39 41q0 18 10 29l615 707q-130 59 -273 59q-37 0 -37 40t37 40q173 0 327 -77l250 287q-48 -7 -96 -7q-113 0 -212 39q-20 8 -25 28q-4 20 11 38q10 12 25 12 q6 0 14 -3q24 -8 78 -22.5t135 -14.5t181 35q17 6 27 6q7 0 10 -3q9 -7 -1 -54t-10 -129.5t41 -182.5l24 -50q15 -33 -1 -51q-16 -17 -31 -17q-13 0 -26 11q-5 4 -9 12q-73 131 -73 291v9l-239 -276q153 -100 243 -262.5t90 -351.5q0 -49 -7 -101h132q37 0 37 -41zM1120 183 q0 172 -82.5 318.5t-223.5 234.5l-568 -654h866q8 49 8 101z" />
+<glyph unicode="&#x29a9;" horiz-adv-x="1479" d="M1362 41q0 -41 -39 -41h-939q21 -69 43 -110t22 -49q0 -42 -42 -42q-20 0 -32 18q-48 76 -75 183h-148q-37 0 -37 41t37 41h132q-7 52 -7 101q0 189 90 351.5t243 262.5l-239 276v-9q0 -160 -73 -291q-4 -8 -9 -12q-13 -11 -26 -11q-16 0 -31 17q-16 18 -5 40.5t28 60.5 q41 100 41 182.5t-10 129.5t-2 54q4 3 11 3q10 0 27 -6q100 -35 181 -35t149 17q20 7 54 17q13 4 23 4q17 0 26 -10q15 -18 10.5 -38t-24.5 -28q-99 -39 -212 -39q-48 0 -96 7l250 -287q154 77 327 77q37 0 37 -40t-37 -40q-143 0 -273 -59l615 -707q10 -11 10 -29zM357 183 q0 -52 8 -101h866l-568 654q-141 -88 -223.5 -234.5t-82.5 -318.5z" />
+<glyph unicode="&#x29aa;" horiz-adv-x="1479" d="M1362 993q0 -41 -37 -41h-132q7 -52 7 -101q0 -190 -90 -352t-243 -262l239 -276v9q0 159 73 290q4 8 9 12q13 12 26 12q16 0 31 -18q16 -18 5 -40q-69 -138 -69 -265q0 -60 10 -107.5t1 -54.5q-3 -3 -9 -3q-10 0 -28 7q-100 35 -181 35t-149 -17q-20 -7 -54 -17.5t-49 7 t-11 37.5q5 20 25 28q99 39 212 39q48 0 96 -8l-250 287q-154 -76 -327 -76q-37 0 -37 40t37 40q143 0 273 59l-615 707q-10 11 -10 29q0 41 39 41h939q-21 68 -61 142q-4 8 -4 17q0 41 42 41q20 0 32 -18q48 -76 75 -182h148q37 0 37 -41zM1120 850q0 52 -8 102h-866 l568 -654q141 88 223.5 234.5t82.5 317.5z" />
+<glyph unicode="&#x29ab;" horiz-adv-x="1479" d="M1362 993q0 -18 -10 -29l-615 -707q130 -59 273 -59q37 0 37 -40t-37 -40q-173 0 -327 76l-250 -287q48 8 96 8q113 0 212 -39q20 -8 24.5 -28t-10.5 -38q-11 -12 -25 -12q-7 0 -14 2l-64 21q-68 17 -149 17t-181 -35q-18 -7 -28 -7q-6 0 -10 3q-8 7 2 54.5t10 129.5 t-41 182l-27 57q-12 26 4 44q15 18 31 18q13 0 26 -12q5 -4 9 -12q73 -131 73 -290v-9l239 276q-153 100 -243 262t-90 352q0 49 7 101h-132q-37 0 -37 41t37 41h148q27 106 75 182q12 18 32 18q42 0 42 -41q0 -9 -4 -17q-40 -74 -61 -142h939q39 0 39 -41zM357 850 q0 -171 82.5 -317.5t223.5 -234.5l568 654h-866q-8 -50 -8 -102z" />
+<glyph unicode="&#x29ac;" horiz-adv-x="1615" d="M1522 1040q-35 -100 -35 -181t17 -149q7 -20 17.5 -54t-8.5 -50q-15 -13 -29 -13q-15 0 -28 15q-3 4 -7 13q-39 100 -39 213q0 48 7 95l-287 -250q77 -154 77 -327q0 -37 -40 -37t-40 37q0 145 -59 273l-707 -615q-11 -10 -29 -10q-41 0 -41 39v939q-67 -20 -108.5 -42.5 t-50.5 -22.5q-42 0 -42 42q0 20 18 32q75 48 183 75v148q0 37 41 37t41 -37v-132q50 7 101 7q189 0 351.5 -90t262.5 -243l276 239h-12q-158 0 -288 73q-8 5 -12 9q-12 13 -12 26q0 16 18 31q18 16 40.5 5t60.5 -28q101 -41 183.5 -41t129.5 9.5t54 2.5q2 -3 2 -10 q0 -10 -6 -28zM474 1005q-52 0 -101 -8v-866l654 568q-88 140 -234.5 223t-318.5 83z" />
+<glyph unicode="&#x29ad;" horiz-adv-x="1615" d="M1525 955q0 -42 -42 -42q-9 0 -50.5 22.5t-108.5 42.5v-939q0 -39 -41 -39q-18 0 -29 10l-707 615q-59 -128 -59 -273q0 -37 -40 -37t-40 37q0 173 77 327l-287 250q7 -47 7 -95q0 -113 -39 -213q-4 -9 -7 -13q-13 -15 -28 -15q-14 0 -29 13q-14 11 -14 27q0 6 2 13 l21 64q17 68 17 149t-35 181q-6 18 -6 28q0 7 3 10q6 7 53 -2.5t129.5 -9.5t183.5 41l57 27q26 12 44 -4q18 -15 18 -31q0 -13 -12 -26q-4 -4 -12 -9q-130 -73 -288 -73h-12l276 -239q100 153 262.5 243t351.5 90q51 0 101 -7v132q0 37 41 37t41 -37v-148q108 -27 183 -75 q18 -12 18 -32zM1141 1005q-172 0 -318.5 -83t-234.5 -223l654 -568v866q-49 8 -101 8z" />
+<glyph unicode="&#x29ae;" horiz-adv-x="1615" d="M1522 207q6 -18 6 -28q0 -7 -2 -9q-7 -8 -54 1.5t-129.5 9.5t-183.5 -41l-57 -27q-26 -12 -44 4q-18 15 -18 31q0 13 12 26q4 4 12 9q130 73 288 73h12l-276 239q-100 -153 -262.5 -243t-351.5 -90q-51 0 -101 7v-132q0 -37 -41 -37t-41 37v148q-108 27 -183 75 q-18 12 -18 32q0 42 42 42q9 0 50.5 -22.5t108.5 -42.5v939q0 39 41 39q18 0 29 -10l707 -615q59 128 59 273q0 37 40 37t40 -37q0 -173 -77 -327l287 -250q-7 47 -7 95q0 113 39 213q4 9 7 13q13 15 28 15q14 0 29 -13q14 -11 14 -27q0 -6 -3 -12l-20 -65q-17 -68 -17 -149 t35 -181zM474 242q172 0 318.5 83t234.5 223l-654 568v-866q49 -8 101 -8z" />
+<glyph unicode="&#x29af;" horiz-adv-x="1615" d="M1525 292q0 -20 -18 -32q-75 -48 -183 -75v-148q0 -37 -41 -37t-41 37v132q-50 -7 -101 -7q-189 0 -351.5 90t-262.5 243l-276 -239h12q158 0 288 -73q8 -5 12 -9q12 -13 12 -26q0 -16 -18 -31q-18 -16 -40.5 -5t-60.5 28q-101 41 -183.5 41t-129.5 -9.5t-53 -1.5 q-3 2 -3 9q0 10 6 28q35 100 35 181t-17 149q-7 20 -17.5 54t8.5 50q15 13 29 13q15 0 28 -15q3 -4 7 -13q39 -100 39 -213q0 -48 -7 -95l287 250q-77 154 -77 327q0 37 40 37t40 -37q0 -145 59 -273l707 615q11 10 29 10q41 0 41 -39v-939q67 20 108.5 42.5t50.5 22.5 q42 0 42 -42zM1141 242q52 0 101 8v866l-654 -568q88 -140 234.5 -223t318.5 -83z" />
+<glyph unicode="&#x29b0;" horiz-adv-x="1592" d="M1307 1093q211 -212 211 -498.5t-184 -493.5l107 -106q27 -27 27 -46q0 -39 -39 -39q-19 0 -46 27l-106 106q-206 -184 -492 -184t-498.5 212.5t-212.5 499.5t183 492l-106 106q-27 27 -27 46q0 39 39 39q19 0 46 -27l106 -106q206 184 493.5 184t498.5 -212zM1276 160 q160 182 160 434.5t-187.5 440.5t-441 188t-434.5 -160zM315 1005q-159 -181 -159 -434t188.5 -441.5t440.5 -188.5t434 160z" />
+<glyph unicode="&#x29b1;" horiz-adv-x="1592" d="M1422 1565q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1335 1063q183 -205 183 -492t-212.5 -499.5t-498.5 -212.5t-492 184l-106 -106q-27 -27 -46 -27q-39 0 -39 39q0 19 27 46l107 106q-184 207 -184 493.5t211 498.5t498.5 212t493.5 -184l106 106 q27 27 46 27q39 0 39 -39q0 -19 -27 -46zM1219 1063q-181 160 -435 160t-441 -188t-187 -440.5t160 -434.5zM1247.5 129.5q188.5 188.5 188.5 441.5t-159 434l-904 -904q182 -160 434 -160t440.5 188.5z" />
+<glyph unicode="&#x29b2;" horiz-adv-x="1592" d="M953 1536q66 -67 66 -158t-67 -157t-157.5 -66t-157 65.5t-66.5 156.5t66.5 158.5t158 67.5t157.5 -67zM1335 803q183 -205 183 -492t-212.5 -499.5t-498.5 -212.5t-492 184l-106 -106q-27 -27 -46 -27q-39 0 -39 39q0 19 27 46l107 106q-184 207 -184 493.5t211 498.5 t498.5 212t493.5 -184l106 106q27 27 46 27q39 0 39 -39q0 -19 -27 -46zM898 1275.5q44 43.5 44 102.5t-44 103.5t-103 44.5t-103 -44.5t-44 -103.5t44 -102.5t103 -43.5t103 43.5zM1219 803q-181 160 -435 160t-441 -188t-187 -440.5t160 -434.5zM1247.5 -130.5 q188.5 188.5 188.5 441.5t-159 434l-904 -904q182 -160 434 -160t440.5 188.5z" />
+<glyph unicode="&#x29b3;" horiz-adv-x="1592" d="M1276 1396q0 -18 -43 -41q-117 -62 -179 -127q-32 -33 -48 -33q-31 0 -31 32.5t128 129.5h-741q-45 0 -45 39t45 39h741q-128 97 -128 129.5t31 32.5q16 0 48 -33q62 -65 179 -127q43 -23 43 -41zM1335 853q183 -205 183 -492t-212.5 -499.5t-498.5 -212.5t-492 184 l-106 -106q-27 -27 -46 -27q-39 0 -39 39q0 19 27 46l107 106q-184 207 -184 493.5t211 498.5t498.5 212t493.5 -184l106 106q27 27 46 27q39 0 39 -39q0 -19 -27 -46zM1219 853q-181 160 -435 160t-441 -188t-187 -440.5t160 -434.5zM1247.5 -80.5q188.5 188.5 188.5 441.5 t-159 434l-904 -904q182 -160 434 -160t440.5 188.5z" />
+<glyph unicode="&#x29b4;" horiz-adv-x="1592" d="M1276 1396q0 -39 -45 -39h-741q128 -97 128 -129.5t-31 -32.5q-17 0 -48 33q-63 65 -179 127q-43 23 -43 41t43 41q116 62 179 127q31 33 48 33q31 0 31 -32.5t-128 -129.5h741q45 0 45 -39zM1335 853q183 -205 183 -492t-212.5 -499.5t-498.5 -212.5t-492 184l-106 -106 q-27 -27 -46 -27q-39 0 -39 39q0 19 27 46l107 106q-184 207 -184 493.5t211 498.5t498.5 212t493.5 -184l106 106q27 27 46 27q39 0 39 -39q0 -19 -27 -46zM1219 853q-181 160 -435 160t-441 -188t-187 -440.5t160 -434.5zM1247.5 -80.5q188.5 188.5 188.5 441.5t-159 434 l-904 -904q182 -160 434 -160t440.5 188.5z" />
+<glyph unicode="&#x29b5;" horiz-adv-x="2205" d="M2035 582q0 -41 -61 -41h-150q-16 -284 -224.5 -483t-495.5 -199t-496.5 198.5t-225.5 483.5h-151q-61 0 -61 41t61 41h151q16 286 224.5 484t497 198t496.5 -198.5t224 -483.5h150q61 0 61 -41zM1541.5 1048.5q-184.5 174.5 -438.5 174.5t-438.5 -174t-200.5 -426h1278 q-16 251 -200.5 425.5zM1104 -59q253 0 437.5 174.5t200.5 425.5h-1278q16 -251 201.5 -425.5t438.5 -174.5z" />
+<glyph unicode="&#x29b6;" horiz-adv-x="1592" d="M1307 1093q211 -212 211 -510.5t-211.5 -511t-509.5 -212.5t-510.5 212.5t-212.5 511.5t211.5 510.5t511 211.5t510.5 -212zM1262 143.5q174 185.5 174 439t-174 438.5t-425 201v-1280q251 16 425 201.5zM329.5 1020.5q-173.5 -184.5 -173.5 -438t174 -438.5t425 -202 v1280q-252 -17 -425.5 -201.5z" />
+<glyph unicode="&#x29b7;" horiz-adv-x="1592" d="M1307 1093q211 -212 211 -510.5t-211.5 -511t-509.5 -212.5t-510.5 212.5t-212.5 511.5t211.5 510.5t511 211.5t510.5 -212zM1248.5 129.5q187.5 188.5 187.5 453t-187.5 452.5t-452.5 188t-452.5 -187.5t-187.5 -452.5t188.5 -453.5t452.5 -188.5t451.5 188.5zM989 96 q0 -39 -41 -39t-41 39v975q0 37 41 37t41 -37v-975zM685 96q0 -39 -41 -39t-41 39v975q0 37 41 37t41 -37v-975z" />
+<glyph unicode="&#x29b8;" horiz-adv-x="1592" d="M1307 1093q211 -212 211 -510.5t-211.5 -511t-509.5 -212.5t-510.5 212.5t-212.5 511.5t211.5 510.5t511 211.5t510.5 -212zM1436 582q0 265 -187.5 453t-440 188t-433.5 -158l903 -903q158 181 158 420zM317 1007q-161 -181 -161 -435t188.5 -442.5t441.5 -188.5 t435 163z" />
+<glyph unicode="&#x29b9;" horiz-adv-x="1592" d="M1307 1093q211 -212 211 -510.5t-211.5 -511t-509.5 -212.5t-510.5 212.5t-212.5 511.5t211.5 510.5t511 211.5t510.5 -212zM1248.5 129.5q187.5 188.5 187.5 453t-187.5 452.5t-452.5 188t-452.5 -187.5t-187.5 -452.5t188.5 -453.5t452.5 -188.5t451.5 188.5zM1321 282 q0 -41 -37 -41h-974q-39 0 -39 41t39 41h445v847q0 37 41 37t41 -37v-847h447q37 0 37 -41z" />
+<glyph unicode="&#x29ba;" horiz-adv-x="1592" d="M1307 1093q211 -212 211 -510.5t-211.5 -511t-509.5 -212.5t-510.5 212.5t-212.5 511.5t211.5 510.5t511 211.5t510.5 -212zM837 623h598q-16 241 -187 412.5t-411 186.5v-599zM755 623v599q-241 -16 -412 -187t-186 -412h598zM797 -59q253 0 437.5 174.5t200.5 425.5 h-1278q16 -251 201.5 -425.5t438.5 -174.5z" />
+<glyph unicode="&#x29bb;" horiz-adv-x="1592" d="M1335 1063q183 -206 183 -480.5t-184 -481.5l107 -106q27 -27 27 -46q0 -39 -39 -39q-19 0 -46 27l-106 106q-206 -184 -480.5 -184t-480.5 185l-107 -107q-27 -27 -46 -27q-39 0 -39 39q0 19 27 46l107 107q-184 206 -184 481t183 480l-106 106q-27 27 -27 46 q0 39 39 39q19 0 46 -27l106 -106q206 184 481.5 184t480.5 -184l106 106q27 27 46 27q39 0 39 -39q0 -19 -27 -46zM1219 1063q-181 160 -423 160t-423 -160l423 -423zM1276 160q160 182 160 422.5t-159 422.5l-423 -423zM315 1005q-159 -181 -159 -422t160 -423l422 422z M374 102q182 -161 422.5 -161t422.5 160l-423 423z" />
+<glyph unicode="&#x29bc;" horiz-adv-x="1592" d="M1307 1093q211 -212 211 -510.5t-211.5 -511t-509.5 -212.5t-510.5 212.5t-212.5 511.5t211.5 510.5t511 211.5t510.5 -212zM1248.5 129.5q187.5 188.5 187.5 453t-187.5 452.5t-452.5 188t-452.5 -187.5t-187.5 -452.5t188.5 -453.5t452.5 -188.5t451.5 188.5zM1241 969 l-831 -831q-14 -14 -28 -14t-29 15t-15 29t14 28l831 831q12 12 25 12q15 0 30 -15t15 -30q0 -13 -12 -25zM664 829q0 -47 -34 -81t-81 -34t-79.5 32.5t-32.5 80.5t33 81t81 33t80.5 -32.5t32.5 -79.5zM1155 337q0 -48 -33 -81t-81 -33t-80.5 32.5t-32.5 79.5t34 81t81 34 t79.5 -32.5t32.5 -80.5z" />
+<glyph unicode="&#x29bd;" horiz-adv-x="1592" d="M1320 987.5q198 -209.5 198 -497t-198.5 -497.5t-483.5 -225v-149q0 -61 -41 -61t-41 61v149q-284 17 -482 226t-198 496.5t197.5 496t482.5 225.5v215q-107 -126 -251 -178q-8 -3 -15 -3q-39 0 -39 42q0 24 23 34l61 27q149 76 236 230q15 27 26 27t26 -27 q88 -155 237 -230q20 -8 59 -25q26 -12 26 -36q0 -42 -39 -42q-7 0 -15 3q-146 52 -253 179v-216q286 -15 484 -224.5zM1261.5 51.5q174.5 185.5 174.5 439t-174 439t-426 200.5v-1280q251 16 425.5 201.5zM329.5 928.5q-173.5 -184.5 -173.5 -438t174 -438.5t424 -202v1280 q-251 -17 -424.5 -201.5z" />
+<glyph unicode="&#x29be;" horiz-adv-x="1578" d="M1118 582q0 -137 -96 -233t-233 -96t-233 96t-96 233t96 233t233 96t233 -96t96 -233zM1538 582q0 -312 -218.5 -530.5t-530.5 -218.5t-530.5 218.5t-218.5 530.5t218.5 530.5t530.5 218.5t530.5 -218.5t218.5 -530.5zM1438 582q0 270 -189.5 459.5t-459.5 189.5 t-459.5 -189.5t-189.5 -459.5t189.5 -459.5t459.5 -189.5t459.5 189.5t189.5 459.5zM1018 582q0 96 -66.5 162.5t-162.5 66.5t-162.5 -66.5t-66.5 -162.5t66.5 -162.5t162.5 -66.5t162.5 66.5t66.5 162.5z" />
+<glyph unicode="&#x29bf;" horiz-adv-x="1578" d="M1538 582q0 -312 -218.5 -530.5t-530.5 -218.5t-530.5 218.5t-218.5 530.5t218.5 530.5t530.5 218.5t530.5 -218.5t218.5 -530.5zM1438 582q0 270 -189.5 459.5t-459.5 189.5t-459.5 -189.5t-189.5 -459.5t189.5 -459.5t459.5 -189.5t459.5 189.5t189.5 459.5zM1118 582 q0 -137 -96 -233t-233 -96t-233 96t-96 233t96 233t233 96t233 -96t96 -233z" />
+<glyph unicode="&#x29c0;" horiz-adv-x="1592" d="M1307 1093q211 -212 211 -510.5t-211.5 -511t-509.5 -212.5t-510.5 212.5t-212.5 511.5t211.5 510.5t511 211.5t510.5 -212zM1248.5 129.5q187.5 188.5 187.5 453t-187.5 452.5t-452.5 188t-452.5 -187.5t-187.5 -452.5t188.5 -453.5t452.5 -188.5t451.5 188.5zM1233 207 q0 -41 -41 -41q-9 0 -14 2l-926 377q-26 11 -26 37.5t20 34.5l932 379q5 2 14 2q41 0 41 -41q0 -26 -19 -34l-839 -341l833 -339q25 -10 25 -36z" />
+<glyph unicode="&#x29c1;" horiz-adv-x="1592" d="M1307 1093q211 -212 211 -510.5t-211.5 -511t-509.5 -212.5t-510.5 212.5t-212.5 511.5t211.5 510.5t511 211.5t510.5 -212zM1248.5 129.5q187.5 188.5 187.5 453t-187.5 452.5t-452.5 188t-452.5 -187.5t-187.5 -452.5t188.5 -453.5t452.5 -188.5t451.5 188.5zM1346 617 q20 -8 20 -34.5t-26 -37.5l-926 -377q-5 -2 -14 -2q-41 0 -41 41q0 26 25 36l833 339l-839 341q-19 8 -19 34q0 41 41 41q9 0 14 -2z" />
+<glyph unicode="&#x29c2;" horiz-adv-x="1982" d="M1908.5 739.5q67.5 -66.5 67.5 -158t-67 -157.5t-158 -66t-157 67t-66 157.5t65.5 157t156.5 66.5t158.5 -66.5zM1307 1093q211 -212 211 -510.5t-211.5 -511t-509.5 -212.5t-510.5 212.5t-212.5 511.5t211.5 510.5t511 211.5t510.5 -212zM1899 582q0 59 -44.5 103 t-103.5 44t-102.5 -44t-43.5 -103t43.5 -103t102.5 -44t103.5 44t44.5 103zM1248.5 129.5q187.5 188.5 187.5 453t-187.5 452.5t-452.5 188t-452.5 -187.5t-187.5 -452.5t188.5 -453.5t452.5 -188.5t451.5 188.5z" />
+<glyph unicode="&#x29c3;" horiz-adv-x="1987" d="M1981 430q0 -41 -37 -41h-452q-65 -231 -257.5 -380.5t-437.5 -149.5q-298 0 -510.5 212.5t-212.5 511.5t211.5 510.5t511.5 211.5q246 0 438.5 -149.5t256.5 -380.5h452q37 0 37 -41t-37 -41h-434q8 -55 8 -111t-9 -111h435q37 0 37 -41zM1248.5 129.5 q187.5 188.5 187.5 453t-187.5 452.5t-452.5 188t-452.5 -187.5t-187.5 -452.5t188.5 -453.5t452.5 -188.5t451.5 188.5z" />
+<glyph unicode="&#x29c4;" horiz-adv-x="1592" d="M1488 -72q0 -39 -37 -39h-1308q-39 0 -39 39v1310q0 37 39 37h1308q37 0 37 -37v-1310zM186 1193v-1163l1163 1163h-1163zM1406 -29v1163l-1163 -1163h1163z" />
+<glyph unicode="&#x29c5;" horiz-adv-x="1592" d="M1488 -72q0 -39 -39 -39h-1308q-37 0 -37 39v1310q0 37 37 37h1308q39 0 39 -37v-1310zM1406 1193h-1163l1163 -1163v1163zM186 -29h1163l-1163 1163v-1163z" />
+<glyph unicode="&#x29c6;" horiz-adv-x="1592" d="M1488 -72q0 -39 -37 -39h-1308q-39 0 -39 39v1310q0 37 39 37h1308q37 0 37 -37v-1310zM1406 -29v1222h-1220v-1222h1220zM1175 394q0 -62 -60 -62q-15 0 -29 10l-262 191l31 -338q0 -53 -59 -53q-23 0 -42.5 17t-17.5 40l31 334l-262 -191q-14 -10 -29 -10q-59 0 -59 62 q0 36 28 49l295 139l-295 139q-28 13 -28 49q0 62 59 62q15 0 29 -10l262 -191l-31 340q0 53 60 53q25 0 43 -17t16 -42l-31 -334l262 191q14 10 29 10q60 0 60 -62q0 -35 -29 -49l-295 -139l295 -139q29 -14 29 -49z" />
+<glyph unicode="&#x29c7;" horiz-adv-x="1592" d="M1488 -72q0 -39 -37 -39h-1308q-39 0 -39 39v1310q0 37 39 37h1308q37 0 37 -37v-1310zM1406 -29v1222h-1220v-1222h1220zM1023.5 810.5q94.5 -94.5 94.5 -228t-95 -228.5t-227 -95t-227 95t-95 228.5t94.5 228t227.5 94.5t227.5 -94.5zM965 412q71 71 71 170.5 t-70.5 170t-169.5 70.5t-169.5 -70.5t-70.5 -170t71 -170.5t169 -71t169 71z" />
+<glyph unicode="&#x29c8;" horiz-adv-x="1592" d="M1488 -72q0 -39 -37 -39h-1308q-39 0 -39 39v1310q0 37 39 37h1308q37 0 37 -37v-1310zM1406 -29v1222h-1220v-1222h1220zM1268 148q0 -39 -37 -39h-868q-39 0 -39 39v870q0 37 39 37h868q37 0 37 -37v-870zM1186 191v782h-780v-782h780z" />
+<glyph unicode="&#x29c9;" horiz-adv-x="2282" d="M2178 -372q0 -39 -37 -39h-1308q-39 0 -39 39v561h-651q-39 0 -39 39v1310q0 37 39 37h1308q37 0 37 -37v-563h653q37 0 37 -37v-1310zM2096 -329v1222h-608v-665q0 -39 -37 -39h-575v-518h1220zM1406 271v622h-530v-622h530zM1406 975v518h-1220v-1222h608v667 q0 37 39 37h573z" />
+<glyph unicode="&#x29ca;" horiz-adv-x="1592" d="M1515 -76q0 -35 -43 -35h-1352q-43 0 -43 35q0 12 6 24l676 1355q14 28 36.5 28t36.5 -28l677 -1355q6 -12 6 -24zM1406 -29l-610 1222l-610 -1222h1220zM875.5 1572.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5z" />
+<glyph unicode="&#x29cb;" horiz-adv-x="1592" d="M1515 -76q0 -35 -43 -35h-1352q-43 0 -43 35q0 12 6 24l676 1355q14 28 36.5 28t36.5 -28l677 -1355q6 -12 6 -24zM1406 -29l-610 1222l-610 -1222h1220zM1515 -326q0 -41 -37 -41h-1362q-39 0 -39 41t39 41h1362q37 0 37 -41z" />
+<glyph unicode="&#x29cc;" horiz-adv-x="1592" d="M1515 -76q0 -35 -43 -35h-1352q-43 0 -43 35q0 12 6 24l676 1355q14 28 36.5 28t36.5 -28l677 -1355q6 -12 6 -24zM1406 -29l-610 1222l-610 -1222h1220z" />
+<glyph unicode="&#x29cd;" horiz-adv-x="1592" d="M1615 -70q0 -41 -37 -41h-1562q-39 0 -39 41t39 41h78l665 1332q14 28 36.5 28t36.5 -28l666 -1332h80q37 0 37 -41zM1406 -29l-610 1222l-610 -1222h1220z" />
+<glyph unicode="&#x29ce;" horiz-adv-x="1839" d="M1669 932q0 -28 -36 -39l-1410 -445q-8 -3 -16 -3q-37 0 -37 42v888q0 42 37 42q8 0 16 -3l1410 -443q36 -11 36 -39zM1669 -213q0 -42 -37 -42q-8 0 -16 3l-1410 445q-36 11 -36 39t36 39l1410 443q8 3 15 3q38 0 38 -42v-888zM1484 932l-1232 387v-776zM1587 -157v776 l-1232 -387z" />
+<glyph unicode="&#x29cf;" horiz-adv-x="1978" d="M1808 144q0 -62 -41 -62t-41 62v877q0 61 41 61t41 -61v-877zM1584 137q0 -42 -37 -42q-6 0 -16 3l-1410 445q-36 11 -36 39t36 39l1410 443q10 3 15 3q38 0 38 -42v-888zM1502 193v776l-1232 -387z" />
+<glyph unicode="&#x29d0;" horiz-adv-x="1978" d="M1893 582q0 -28 -36 -39l-1410 -445q-10 -3 -16 -3q-37 0 -37 42v888q0 42 38 42q5 0 15 -3l1410 -443q36 -11 36 -39zM252 144q0 -62 -41 -62t-41 62v877q0 61 41 61t41 -61v-877zM1708 582l-1232 387v-776z" />
+<glyph unicode="&#x29d1;" horiz-adv-x="1591" d="M1290 127q0 -39 -41 -39q-15 0 -30 15l-422 422l-424 -422q-15 -15 -31 -15q-41 0 -41 39v912q0 37 41 37q18 0 31 -13l424 -424l422 424q13 13 30 13q41 0 41 -37v-912zM1208 228v708l-354 -354z" />
+<glyph unicode="&#x29d2;" horiz-adv-x="1591" d="M1290 127q0 -39 -41 -39q-15 0 -30 15l-422 422l-424 -422q-15 -15 -31 -15q-41 0 -41 39v912q0 37 41 37q18 0 31 -13l424 -424l422 424q13 13 30 13q41 0 41 -37v-912zM737 582l-354 354v-708z" />
+<glyph unicode="&#x29d3;" horiz-adv-x="1591" d="M1290 127q0 -39 -41 -39q-15 0 -30 15l-422 422l-424 -422q-15 -15 -31 -15q-41 0 -41 39v912q0 37 41 37q18 0 31 -13l424 -424l422 424q13 13 30 13q41 0 41 -37v-912z" />
+<glyph unicode="&#x29d4;" horiz-adv-x="1591" d="M1290 129q0 -41 -41 -41q-15 0 -30 15l-422 422l-424 -422q-15 -15 -31 -15q-41 0 -41 39v912q0 37 41 37q18 0 31 -13l424 -424l422 424q13 13 30 13q41 0 41 -41q0 -17 -10 -27l-426 -426l426 -424q10 -10 10 -29z" />
+<glyph unicode="&#x29d5;" horiz-adv-x="1591" d="M1290 127q0 -39 -41 -39q-15 0 -30 15l-422 422l-424 -422q-15 -15 -31 -15q-41 0 -41 41q0 19 10 29l426 424l-426 426q-10 10 -10 27q0 41 41 41q18 0 31 -13l424 -424l422 424q13 13 30 13q41 0 41 -37v-912z" />
+<glyph unicode="&#x29d6;" horiz-adv-x="1362" d="M1175 127q0 -41 -39 -41h-912q-37 0 -37 41q0 18 13 31l424 424l-424 422q-13 13 -13 30q0 41 37 41h912q39 0 39 -41q0 -15 -15 -30l-422 -422l422 -424q15 -15 15 -31zM1035 993h-708l354 -354zM1035 168l-354 354l-354 -354h708z" />
+<glyph unicode="&#x29d7;" horiz-adv-x="1362" d="M1175 127q0 -41 -39 -41h-912q-37 0 -37 41q0 18 13 31l424 424l-424 422q-13 13 -13 30q0 41 37 41h912q39 0 39 -41q0 -15 -15 -30l-422 -422l422 -424q15 -15 15 -31z" />
+<glyph unicode="&#x29d8;" horiz-adv-x="706" d="M564 -176q0 -18 -12 -31l-170 -190q-9 -10 -29 -10q-41 0 -41 41q0 14 14 30l142 160l-314 348q-12 13 -12 31t12 31l314 348l-314 348q-12 13 -12 31t12 31l314 348l-142 160q-14 16 -14 30q0 41 41 41q20 0 29 -10l170 -190q12 -13 12 -31t-12 -31l-314 -348l314 -348 q12 -13 12 -31t-12 -31l-314 -348l314 -348q12 -13 12 -31z" />
+<glyph unicode="&#x29d9;" horiz-adv-x="706" d="M564 203q0 -18 -12 -31l-314 -348l142 -160q14 -16 14 -30q0 -41 -41 -41q-20 0 -29 10l-170 190q-12 13 -12 31t12 31l314 348l-314 348q-12 13 -12 31t12 31l314 348l-314 348q-12 13 -12 31t12 31l170 190q9 10 29 10q41 0 41 -41q0 -14 -14 -30l-142 -160l314 -348 q12 -13 12 -31t-12 -31l-314 -348l314 -348q12 -13 12 -31z" />
+<glyph unicode="&#x29da;" horiz-adv-x="1206" d="M564 -176q0 -18 -12 -31l-170 -190q-9 -10 -29 -10q-41 0 -41 41q0 14 14 30l142 160l-314 348q-12 13 -12 31t12 31l314 348l-314 348q-12 13 -12 31t12 31l314 348l-142 160q-14 16 -14 30q0 41 41 41q20 0 29 -10l170 -190q12 -13 12 -31t-12 -31l-314 -348l314 -348 q12 -13 12 -31t-12 -31l-314 -348l314 -348q12 -13 12 -31zM1064 -176q0 -18 -12 -31l-170 -190q-9 -10 -29 -10q-41 0 -41 41q0 14 14 30l142 160l-314 348q-12 13 -12 31t12 31l314 348l-314 348q-12 13 -12 31t12 31l314 348l-142 160q-14 16 -14 30q0 41 41 41 q20 0 29 -10l170 -190q12 -13 12 -31t-12 -31l-314 -348l314 -348q12 -13 12 -31t-12 -31l-314 -348l314 -348q12 -13 12 -31z" />
+<glyph unicode="&#x29db;" horiz-adv-x="1206" d="M564 203q0 -18 -12 -31l-314 -348l142 -160q14 -16 14 -30q0 -41 -41 -41q-20 0 -29 10l-170 190q-12 13 -12 31t12 31l314 348l-314 348q-12 13 -12 31t12 31l314 348l-314 348q-12 13 -12 31t12 31l170 190q9 10 29 10q41 0 41 -41q0 -14 -14 -30l-142 -160l314 -348 q12 -13 12 -31t-12 -31l-314 -348l314 -348q12 -13 12 -31zM1064 203q0 -18 -12 -31l-314 -348l142 -160q14 -16 14 -30q0 -41 -41 -41q-20 0 -29 10l-170 190q-12 13 -12 31t12 31l314 348l-314 348q-12 13 -12 31t12 31l314 348l-314 348q-12 13 -12 31t12 31l170 190 q9 10 29 10q41 0 41 -41q0 -14 -14 -30l-142 -160l314 -348q12 -13 12 -31t-12 -31l-314 -348l314 -348q12 -13 12 -31z" />
+<glyph unicode="&#x29dc;" d="M1931 442q0 -182 -109 -323.5t-286 -141.5q-134 0 -258.5 73.5t-210.5 189.5l-61 82q-212 -345 -502 -345q-174 0 -281.5 142.5t-107.5 323t109.5 321.5t285.5 141q131 0 257.5 -74.5t211.5 -187.5l119 -158q100 -133 157 -202.5t132.5 -134t181.5 -64.5 q136 0 222.5 109.5t86.5 248.5q0 27 26.5 27t26.5 -27zM477 799q-137 0 -223 -109.5t-86 -253t87 -265.5t228 -122q260 0 465 348l-133 173q-81 101 -156.5 165t-181.5 64z" />
+<glyph unicode="&#x29dd;" d="M1841 963q0 -24 -23 -24q-10 0 -18 11q-28 43 -91 124q-255 286 -685 286t-685 -286q-17 -19 -91 -124q-8 -11 -18 -11q-23 0 -23 24q0 9 4 16q131 218 347 345.5t466 127.5t466 -127.5t347 -345.5q4 -7 4 -16zM1542 905q175 0 282 -141.5t107 -322.5t-109 -322.5 t-286 -141.5q-134 0 -258.5 74t-210.5 189l-61 82q-212 -345 -502 -345q-174 0 -281.5 142.5t-107.5 323t109.5 321.5t285.5 141q132 0 258.5 -74.5t210.5 -187.5l61 -82q216 344 502 344zM1569 84q136 0 222.5 109.5t86.5 253.5t-86 265.5t-229 121.5q-260 0 -465 -349 l142 -180q74 -94 148.5 -157.5t180.5 -63.5zM477 799q-137 0 -223 -109.5t-86 -253t87 -265.5t228 -122q260 0 465 348l-133 173q-81 101 -156.5 165t-181.5 64z" />
+<glyph unicode="&#x29de;" d="M1542 905q175 0 282 -141.5t107 -322.5t-109 -322.5t-286 -141.5q-134 0 -258 74q-125 74 -214 193v-310q0 -62 -41 -62t-41 62v351q-206 -308 -478 -308q-174 0 -281.5 142.5t-107.5 323t109.5 321.5t285.5 141q132 0 258 -75q126 -73 214 -191v372q0 61 41 61t41 -61 v-413q209 307 478 307zM1569 84q136 0 222.5 109.5t86.5 253.5t-86 265.5t-229 121.5q-260 0 -465 -349l142 -180q74 -94 148.5 -157.5t180.5 -63.5zM477 799q-137 0 -223 -109.5t-86 -253t87 -265.5t228 -122q260 0 465 348l-133 173q-81 101 -156.5 165t-181.5 64z" />
+<glyph unicode="&#x29df;" horiz-adv-x="2275" d="M2064 812q95 -96 95 -229.5t-95.5 -230t-223.5 -96.5t-220.5 81.5t-108.5 203.5h-748q-16 -122 -108.5 -203.5t-220.5 -81.5t-223.5 96.5t-95.5 230t95 229.5t223 96t221.5 -82t108.5 -203h748q15 121 108.5 203t221.5 82t223 -96zM2077 582q0 99 -71.5 171.5t-171 72.5 t-171.5 -72t-72 -172t72 -172t171.5 -72t171 72.5t71.5 171.5zM683 582q0 100 -72 172t-171.5 72t-171 -72.5t-71.5 -171.5t71.5 -171.5t171 -72.5t171.5 72t72 172z" />
+<glyph unicode="&#x29e0;" horiz-adv-x="1591" d="M1488 -72q0 -39 -37 -39h-1238l-109 109v1240q0 37 39 37h1238l107 -107v-1240zM1406 -29v1152h-1150v-1152h1150z" />
+<glyph unicode="&#x29e1;" horiz-adv-x="1590" d="M1420 182q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1420 582q0 -41 -41 -41h-1162q-44 0 -44 33q0 24 24 39l1162 725q16 10 29 10q32 0 32 -41v-725zM1338 623v606l-969 -606h969z" />
+<glyph unicode="&#x29e2;" horiz-adv-x="1497" d="M1359 37q0 -37 -37 -37h-1145q-39 0 -39 37v731q0 39 41 39t41 -39v-686h488v660q0 37 41 37t41 -37v-660h487v686q0 39 41 39t41 -39v-731z" />
+<glyph unicode="&#x29e3;" horiz-adv-x="1590" d="M1420 382q0 -41 -37 -41h-479l-242 -419q-23 -39 -46 -39q-41 0 -41 37q0 17 15 43l218 378h-304l-242 -419q-23 -39 -46 -39q-41 0 -41 37q0 17 15 43l218 378h-199q-39 0 -39 41t39 41h247l184 318h-431q-39 0 -39 41t39 41h478l242 419q23 39 45 39q41 0 41 -37 q0 -17 -15 -43l-218 -378h305l242 419q23 39 45 39q41 0 41 -37q0 -17 -15 -43l-218 -378h201q37 0 37 -41t-37 -41h-248l-184 -318h432q37 0 37 -41zM1040 741h-305l-184 -318h305z" />
+<glyph unicode="&#x29e4;" horiz-adv-x="1590" d="M1420 382q0 -41 -37 -41h-479l-242 -419q-23 -39 -46 -39q-41 0 -41 37q0 17 15 43l218 378h-304l-242 -419q-23 -39 -46 -39q-41 0 -41 37q0 17 15 43l218 378h-199q-39 0 -39 41t39 41h247l184 318h-431q-39 0 -39 41t39 41h478l242 419q23 39 45 39q41 0 41 -37 q0 -17 -15 -43l-218 -378h305l242 419q23 39 45 39q41 0 41 -37q0 -17 -15 -43l-218 -378h201q37 0 37 -41t-37 -41h-248l-184 -318h432q37 0 37 -41zM1040 741h-305l-184 -318h305zM1216 1545q0 -101 -59.5 -179t-153.5 -78t-217.5 102t-196.5 102q-123 0 -157 -153 q-11 -51 -30 -51q-28 0 -28 56q0 110 55 186t153 76t221.5 -102t195.5 -102q53 0 97 35t55 86l8 49q9 34 26 34q31 0 31 -61z" />
+<glyph unicode="&#x29e5;" horiz-adv-x="1590" d="M1420 182q0 -41 -37 -41h-595l-126 -219q-23 -39 -46 -39q-41 0 -41 37q0 17 15 43l103 178h-305l-126 -219q-23 -39 -46 -39q-41 0 -41 37q0 17 15 43l103 178h-84q-39 0 -39 41t39 41h131l184 318h-315q-39 0 -39 41t39 41h362l184 318h-546q-39 0 -39 41t39 41h593 l127 219q23 39 45 39q41 0 41 -37q0 -17 -15 -43l-103 -178h305l127 219q23 39 45 39q41 0 41 -37q0 -17 -15 -43l-103 -178h86q37 0 37 -41t-37 -41h-133l-184 -318h317q37 0 37 -41t-37 -41h-364l-183 -318h547q37 0 37 -41zM1155 941h-305l-184 -318h305zM924 541h-305 l-183 -318h304z" />
+<glyph unicode="&#x29e6;" horiz-adv-x="1593" d="M1466 107q0 -39 -41 -39t-41 39v232h-1175v-232q0 -39 -41 -39t-41 39v952q0 37 41 37t41 -37v-234h1175v234q0 37 41 37t41 -37v-952zM1384 421v322h-1175v-322h1175z" />
+<glyph unicode="&#x29e7;" horiz-adv-x="1346" d="M1198 382q0 -41 -37 -41h-447v-245q0 -39 -41 -39t-41 39v245h-445q-39 0 -39 41t39 41h445v318h-445q-39 0 -39 41t39 41h445v247q0 37 41 37t41 -37v-247h447q37 0 37 -41t-37 -41h-447v-318h447q37 0 37 -41z" />
+<glyph unicode="&#x29e8;" horiz-adv-x="1592" d="M1515 1296q0 -12 -6 -24l-677 -1355q-14 -28 -36.5 -28t-36.5 28l-676 1355q-6 12 -6 24q0 35 43 35h1352q43 0 43 -35zM796 1249v-1222l610 1222h-610z" />
+<glyph unicode="&#x29e9;" horiz-adv-x="1592" d="M1515 1296q0 -12 -6 -24l-677 -1355q-14 -28 -36.5 -28t-36.5 28l-676 1355q-6 12 -6 24q0 35 43 35h1352q43 0 43 -35zM796 1249h-610l610 -1222v1222z" />
+<glyph unicode="&#x29ea;" horiz-adv-x="1592" d="M1550 803q11 -11 11 -27.5t-10 -26.5l-715 -715v-298q107 127 253 179q8 3 15 3q39 0 39 -42q0 -24 -23 -34l-62 -27q-149 -75 -237 -230q-15 -27 -26 -27t-26 27q-87 154 -236 230l-58 25q-26 12 -26 36q0 42 39 42q7 0 15 -3q144 -52 251 -178v300l-713 714 q-10 10 -10 26t11 27l727 727q10 10 26 10t26 -10z" />
+<glyph unicode="&#x29eb;" horiz-adv-x="1218" d="M1198 582l-589 -779l-589 779l589 779z" />
+<glyph unicode="&#x29ec;" horiz-adv-x="1592" d="M1307 1287q211 -212 211 -505t-198.5 -503t-483.5 -225v-318q107 127 253 179q8 3 15 3q39 0 39 -42q0 -24 -23 -34l-62 -27q-149 -75 -237 -230q-15 -27 -26 -27t-26 27q-87 154 -236 230l-58 25q-26 12 -26 36q0 42 39 42q7 0 15 -3q144 -52 251 -178v317 q-284 17 -482 226t-198 502.5t211.5 505t511 211.5t510.5 -212zM1248.5 323.5q187.5 188.5 187.5 453t-187.5 452.5t-452.5 188t-452.5 -187.5t-187.5 -452.5t188.5 -453.5t452.5 -188.5t451.5 188.5z" />
+<glyph unicode="&#x29ed;" horiz-adv-x="1592" d="M1307 1287q211 -212 211 -505t-198.5 -503t-483.5 -225v-318q107 127 253 179q8 3 15 3q39 0 39 -42q0 -24 -23 -34l-62 -27q-149 -75 -237 -230q-15 -27 -26 -27t-26 27q-87 154 -236 230l-58 25q-26 12 -26 36q0 42 39 42q7 0 15 -3q144 -52 251 -178v317 q-284 17 -482 226t-198 502.5t211.5 505t511 211.5t510.5 -212z" />
+<glyph unicode="&#x29ee;" horiz-adv-x="1024" d="M984 148q0 -39 -37 -39h-394v-369h309q62 0 62 -41t-62 -41h-701q-61 0 -61 41t61 41h310v369h-392q-39 0 -39 39v870q0 37 39 37h392v369h-310q-61 0 -61 41t61 41h701q62 0 62 -41t-62 -41h-309v-369h394q37 0 37 -37v-870zM902 191v782h-780v-782h780z" />
+<glyph unicode="&#x29ef;" horiz-adv-x="1024" d="M984 148q0 -39 -37 -39h-394v-369h309q62 0 62 -41t-62 -41h-701q-61 0 -61 41t61 41h310v369h-392q-39 0 -39 39v870q0 37 39 37h392v369h-310q-61 0 -61 41t61 41h701q62 0 62 -41t-62 -41h-309v-369h394q37 0 37 -37v-870z" />
+<glyph unicode="&#x29f0;" horiz-adv-x="1024" d="M991 611q10 -10 10 -28t-10 -28l-438 -438v-377h309q62 0 62 -41t-62 -41h-701q-61 0 -61 41t61 41h310v377l-438 438q-10 10 -10 28t10 28l438 438v375h-310q-61 0 -61 41t61 41h701q62 0 62 -41t-62 -41h-309v-375zM902 582l-391 391l-389 -391l389 -389z" />
+<glyph unicode="&#x29f1;" horiz-adv-x="1024" d="M991 611q10 -10 10 -28t-10 -28l-438 -438v-377h309q62 0 62 -41t-62 -41h-701q-61 0 -61 41t61 41h310v377l-438 438q-10 10 -10 28t10 28l438 438v375h-310q-61 0 -61 41t61 41h701q62 0 62 -41t-62 -41h-309v-375z" />
+<glyph unicode="&#x29f2;" horiz-adv-x="1024" d="M964 582q0 -176 -119.5 -306t-291.5 -145v-391h309q62 0 62 -41t-62 -41h-701q-61 0 -61 41t61 41h310v391q-173 16 -292 146t-119 305.5t118.5 305t292.5 145.5v391h-310q-61 0 -61 41t61 41h701q62 0 62 -41t-62 -41h-309v-391q173 -15 292 -145t119 -306zM882 582 q0 153 -108.5 262t-261.5 109t-261.5 -108.5t-108.5 -261.5t109.5 -262.5t261 -109.5t260.5 109t109 262z" />
+<glyph unicode="&#x29f3;" horiz-adv-x="1024" d="M964 582q0 -176 -119.5 -306t-291.5 -145v-391h309q62 0 62 -41t-62 -41h-701q-61 0 -61 41t61 41h310v391q-173 16 -292 146t-119 305.5t118.5 305t292.5 145.5v391h-310q-61 0 -61 41t61 41h701q62 0 62 -41t-62 -41h-309v-391q173 -15 292 -145t119 -306z" />
+<glyph unicode="&#x29f4;" d="M307.5 861.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM307.5 461.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM1906 611q25 -11 25 -27t-15 -22l-46 -18q-190 -83 -296 -265q-41 -70 -79 -213 q-2 -7 -8 -13t-53 -6q-21 0 -21 27q0 2 8 36q65 274 287 431h-1154q-39 0 -39 41t39 41h1154q-154 111 -238 288q-57 121 -57 179q0 24 21 28q-3 -1 41 -1q15 0 20 -19q14 -55 54 -163q105 -217 317 -310z" />
+<glyph unicode="&#x29f5;" horiz-adv-x="569" d="M569 -312q0 -38 -42 -38q-30 0 -43 47l-476 1743q-8 29 -8 36q0 38 42 38q30 0 43 -47l476 -1743q8 -29 8 -36z" />
+<glyph unicode="&#x29f6;" horiz-adv-x="569" d="M569 1565q0 -41 -37 -41h-493q-39 0 -39 41t39 41h493q37 0 37 -41zM569 1384q0 -7 -8 -36l-476 -1743q-13 -47 -43 -47q-42 0 -42 38q0 7 8 36l476 1743q13 47 43 47q42 0 42 -38z" />
+<glyph unicode="&#x29f7;" horiz-adv-x="1146" d="M998 582q0 -41 -37 -41h-334l223 -817q8 -29 8 -36q0 -38 -42 -38q-30 0 -43 47l-230 844h-356q-39 0 -39 41t39 41h333l-223 817q-8 29 -8 36q0 38 42 38q30 0 43 -47l230 -844h357q37 0 37 -41z" />
+<glyph unicode="&#x29f8;" horiz-adv-x="669" d="M669 1568q0 -9 -8 -36l-576 -1927q-14 -47 -43 -47q-42 0 -42 38q0 9 8 36l576 1927q14 47 43 47q42 0 42 -38z" />
+<glyph unicode="&#x29f9;" horiz-adv-x="669" d="M669 -404q0 -38 -42 -38q-29 0 -43 47l-576 1927q-8 27 -8 36q0 38 42 38q29 0 43 -47l576 -1927q8 -27 8 -36z" />
+<glyph unicode="&#x29fa;" horiz-adv-x="1646" d="M1498 582q0 -41 -37 -41h-447v-445q0 -39 -41 -39t-41 39v445h-218v-445q0 -39 -41 -39t-41 39v445h-445q-39 0 -39 41t39 41h445v447q0 37 41 37t41 -37v-447h218v447q0 37 41 37t41 -37v-447h447q37 0 37 -41z" />
+<glyph unicode="&#x29fb;" horiz-adv-x="1946" d="M1798 582q0 -41 -37 -41h-447v-445q0 -39 -41 -39t-41 39v445h-218v-445q0 -39 -41 -39t-41 39v445h-218v-445q0 -39 -41 -39t-41 39v445h-445q-39 0 -39 41t39 41h445v447q0 37 41 37t41 -37v-447h218v447q0 37 41 37t41 -37v-447h218v447q0 37 41 37t41 -37v-447h447 q37 0 37 -41z" />
+<glyph unicode="&#x29fc;" horiz-adv-x="1024" d="M944 -341q0 -41 -43 -41q-16 0 -32 19l-111 156q-235 326 -508 621q-46 45 -131 139q-11 14 -11 29t11 29l131 139q272 294 508 621q35 54 111 156q16 19 32 19q43 0 43 -41q0 -11 -8 -24q-260 -409 -731 -899q471 -490 731 -899q8 -13 8 -24z" />
+<glyph unicode="&#x29fd;" horiz-adv-x="1024" d="M916 582q0 -15 -11 -29l-131 -139q-273 -295 -508 -621q-35 -54 -111 -156q-16 -19 -32 -19q-43 0 -43 41q0 11 8 24q260 409 731 899q-471 490 -731 899q-8 13 -8 24q0 41 43 41q16 0 32 -19l111 -156q236 -327 508 -621q46 -45 131 -139q11 -14 11 -29z" />
+<glyph unicode="&#x29fe;" horiz-adv-x="1591" d="M1421 582q0 -22 -31 -82t-35 -73q-209 114 -287 114h-231v-231q0 -79 114 -287q-13 -5 -73 -36t-82.5 -31t-82.5 31t-72 36q114 208 114 287v231h-232q-78 0 -287 -114q-4 13 -35 73t-31 82t31 82t35 73q208 -114 287 -114h232v232q0 78 -114 287q12 4 72 35t82.5 31 t82.5 -31t73 -35q-114 -209 -114 -287v-232h231q79 0 287 114q4 -13 35 -73t31 -82z" />
+<glyph unicode="&#x29ff;" horiz-adv-x="1591" d="M1421 582q0 -22 -31 -82t-35 -73q-209 114 -287 114h-545q-78 0 -287 -114q-4 13 -35 73t-31 82t31 82t35 73q208 -114 287 -114h545q79 0 287 114q4 -13 35 -73t31 -82z" />
+<glyph unicode="&#x2a00;" d="M1214 582q0 -79 -55.5 -134.5t-134.5 -55.5t-134.5 55.5t-55.5 134.5t55.5 134.5t134.5 55.5t134.5 -55.5t55.5 -134.5zM2008 582q0 -410 -287 -697t-697 -287t-697 287t-287 697t287 697t697 287t697 -287t287 -697zM1908 582q0 368 -258 626t-626.5 258t-626 -257.5 t-257.5 -626.5t257.5 -626.5t626 -257.5t626.5 258t258 626z" />
+<glyph unicode="&#x2a01;" d="M1713 1271q285 -286 285 -688.5t-286 -689t-687.5 -286.5t-688 286.5t-286.5 689.5t285.5 688.5t689 285.5t688.5 -286zM1635 -29q254 255 254 611.5t-253.5 611t-611.5 254.5t-611.5 -253.5t-253.5 -611.5t254.5 -612.5t611 -254.5t610.5 255zM1866 582q0 -54 -48 -54 h-740v-740q0 -48 -54 -48t-54 48v740h-737q-51 0 -51 54t51 54h737v737q0 51 54 51t54 -51v-737h740q48 0 48 -54z" />
+<glyph unicode="&#x2a02;" d="M1713 1271q285 -286 285 -688.5t-286 -689t-687.5 -286.5t-688 286.5t-286.5 689.5t285.5 688.5t689 285.5t688.5 -286zM1635 -29q254 255 254 611.5t-253.5 611t-611.5 254.5t-611.5 -253.5t-253.5 -611.5t254.5 -612.5t611 -254.5t610.5 255zM1624 59q16 -16 16 -33 q0 -19 -20.5 -39.5t-39.5 -20.5q-17 0 -33 16l-523 524l-521 -522q-17 -17 -35 -17q-20 0 -39.5 19.5t-19.5 39.5q0 18 17 35l522 521l-522 521q-17 17 -17 35q0 20 19.5 39.5t39.5 19.5q18 0 35 -17l521 -522l523 524q16 16 33 16q19 0 39.5 -20.5t20.5 -39.5 q0 -17 -16 -33l-524 -523z" />
+<glyph unicode="&#x2a03;" horiz-adv-x="1704" d="M1569 280q0 -284 -212.5 -483t-501.5 -199t-504.5 196.5t-215.5 485.5v1216q0 17 16 33.5t33 16.5q60 0 60 -50v-1205q0 -247 179.5 -415t428.5 -168t428.5 168t179.5 415v1205q0 17 16 33.5t33 16.5q60 0 60 -50v-1216zM931 660.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5 t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5z" />
+<glyph unicode="&#x2a04;" horiz-adv-x="1704" d="M1569 280q0 -284 -212.5 -483t-501.5 -199t-504.5 196.5t-215.5 485.5v1216q0 17 16 33.5t33 16.5q60 0 60 -50v-1205q0 -247 179.5 -415t428.5 -168t428.5 168t179.5 415v1205q0 17 16 33.5t33 16.5q60 0 60 -50v-1216zM1394 582q0 -54 -48 -54h-440v-440q0 -48 -54 -48 t-54 48v440h-437q-51 0 -51 54t51 54h437v437q0 51 54 51t54 -51v-437h440q48 0 48 -54z" />
+<glyph unicode="&#x2a05;" horiz-adv-x="1704" d="M1569 -340q0 -52 -54.5 -52t-54.5 52v1787h-1216v-1787q0 -52 -54.5 -52t-54.5 52v1847q0 19 16.5 34t35.5 15h1332q50 0 50 -49v-1847z" />
+<glyph unicode="&#x2a06;" horiz-adv-x="1704" d="M1569 -343q0 -49 -50 -49h-1332q-19 0 -35.5 15t-16.5 34v1847q0 52 54.5 52t54.5 -52v-1787h1216v1787q0 52 54.5 52t54.5 -52v-1847z" />
+<glyph unicode="&#x2a07;" horiz-adv-x="1864" d="M1749 -4q0 -41 -41 -41q-26 0 -37 25l-489 1103l-204 -463l269 -608q2 -5 2 -16q0 -41 -41 -41q-26 0 -37 25l-238 538l-238 -538q-11 -25 -39 -25q-41 0 -41 41q0 14 272 625l-205 462l-487 -1103q-11 -25 -39 -25q-41 0 -41 41q0 7 530 1204q11 25 38 25t38 -25 l211 -477l213 477q11 25 38 25t38 -25l526 -1188q2 -5 2 -16z" />
+<glyph unicode="&#x2a08;" horiz-adv-x="1864" d="M1749 1184q0 -10 -2 -15l-526 -1189q-11 -25 -38 -25t-38 25l-213 477l-211 -477q-11 -25 -38 -25t-38 25q-530 1198 -530 1204q0 41 41 41q28 0 39 -25l487 -1104l205 463q-272 612 -272 625q0 41 41 41q28 0 39 -25l238 -538l238 538q11 25 37 25q41 0 41 -41 q0 -10 -2 -15l-270 -609l205 -464l489 1104q11 25 37 25q41 0 41 -41z" />
+<glyph unicode="&#x2a09;" horiz-adv-x="2132" d="M1678 27q0 -57 -57 -57q-20 0 -32 12l-523 524l-521 -522q-13 -13 -35 -13q-55 0 -55 55q0 22 13 35l522 521l-522 521q-13 13 -13 35q0 55 55 55q22 0 35 -13l521 -522l523 524q12 12 32 12q57 0 57 -57q0 -20 -12 -32l-524 -523l524 -523q12 -12 12 -32z" />
+<glyph unicode="&#x2a0a;" horiz-adv-x="1700" d="M829 1382h-597l304 -423q67 24 136 24q166 0 283.5 -117.5t117.5 -283.5t-117.5 -283.5t-283.5 -117.5q-84 0 -160 33l-326 -403h680q284 0 439 50q235 77 309 287h50l-148 -438h-1463q-17 0 -17 20q0 6 5 12l410 506q-180 119 -180 334q0 180 135 300l-365 507 q-6 8 -6 36.5t19 28.5h1462l149 -410h-51q-80 215 -328 291q-156 47 -457 47zM1023 582q0 145 -103 248t-248 103q-54 0 -105 -16l225 -313q6 -8 6 -22t-8 -24l-245 -303q62 -24 127 -24q145 0 248 103t103 248zM321 582q0 -191 161 -295l187 230l-234 324 q-114 -104 -114 -259z" />
+<glyph unicode="&#x2a0b;" horiz-adv-x="1314" d="M399 -442q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75q0 -69 -70 -78q48 -39 121 -39q98 0 144 118q30 76 45 210h-531q-21 0 -21 24q0 9 5 15l467 576l-467 648q-6 8 -6 35.5t23 27.5h667q24 128 74 217q78 137 210 137q77 0 141 -42t64 -116t-76 -74t-76 75 q0 69 67 78q-47 38 -120 38q-86 0 -126 -118q-24 -70 -38 -195h316l118 -325h-50q-80 215 -392 246l-17 -273q-22 -334 -94 -880q188 4 298 47q154 60 205 206h49l-117 -347h-449q-71 -368 -313 -368zM646 1180h-437l410 -569q6 -8 6 -22t-8 -24l-441 -545h421 q25 446 79 873l38 286q-52 1 -68 1z" />
+<glyph unicode="&#x2a0c;" horiz-adv-x="2639" d="M2434 1606q77 0 141 -42t64 -116t-76.5 -74t-76.5 75q0 69 68 78q-47 38 -120 38q-86 0 -126 -118q-30 -89 -45 -268l-18 -279q-25 -376 -100 -924q-23 -165 -90 -274q-88 -144 -231 -144q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75q0 -69 -71 -78q48 -39 122 -39 q98 0 144 118q39 99 64 468t54 600l54 402q58 420 294 420zM1894 1606q77 0 141 -42t64 -116t-76.5 -74t-76.5 75q0 69 68 78q-47 38 -120 38q-86 0 -126 -118q-30 -89 -45 -268l-18 -279q-25 -376 -100 -924q-23 -165 -90 -274q-88 -144 -231 -144q-78 0 -141 41.5t-63 116 t76.5 74.5t76.5 -75q0 -69 -70 -78q48 -39 121 -39q98 0 144 118q39 99 64 468t54 600l54 402q24 178 84 283q78 137 210 137zM1354 1606q77 0 141 -42t64 -116t-76.5 -74t-76.5 75q0 69 68 78q-47 38 -120 38q-86 0 -126 -118q-30 -89 -45 -268l-18 -279 q-25 -376 -100 -924q-23 -165 -90 -274q-88 -144 -231 -144q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75q0 -69 -70 -78q48 -39 121 -39q98 0 144 118q39 99 64 468t55 600l53 402q24 178 84 283q78 137 210 137zM814 1606q77 0 141 -42t64 -116t-76 -74t-76 75q0 69 67 78 q-47 38 -120 38q-86 0 -126 -118q-30 -89 -45 -268l-18 -279q-25 -377 -100 -924q-23 -165 -90 -274q-88 -144 -231 -144q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75q0 -69 -70 -78q48 -39 121 -39q98 0 144 118q40 102 66 478t54 598l52 397q24 175 84 280 q78 137 210 137z" />
+<glyph unicode="&#x2a0d;" horiz-adv-x="1019" d="M814 1606q77 0 141 -42t64 -116t-76 -74t-76 75q0 69 67 78q-47 38 -120 38q-87 0 -126 -118q-30 -91 -45 -269l-19 -288q-9 -149 -21 -271h269q33 0 33 -37t-33 -37h-276q-12 -116 -28 -245l-43 -324q-23 -165 -90 -274q-88 -144 -231 -144q-78 0 -141 41.5t-63 116 t76.5 74.5t76.5 -75q0 -69 -70 -78q48 -39 121 -39q98 0 144 118q40 103 58.5 370t36.5 459h-268q-35 0 -35 37t35 37h275q21 204 70 567q57 420 294 420z" />
+<glyph unicode="&#x2a0e;" horiz-adv-x="1019" d="M814 1606q77 0 141 -42t64 -116t-76 -74t-76 75q0 69 67 78q-47 38 -120 38q-87 0 -126 -118q-31 -93 -42.5 -250.5t-20.5 -296.5l-7 -101h254q33 0 33 -37t-33 -37h-260q-12 -150 -28 -286h288q33 0 33 -37t-33 -37h-297q-30 -247 -51.5 -400.5t-88.5 -262.5 q-88 -144 -231 -144q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75q0 -69 -70 -78q48 -39 121 -39q98 0 141 111t64 415q9 132 18 241h-252q-35 0 -35 37t35 37h258q14 162 28 286h-286q-35 0 -35 37t35 37h295q17 144 50 387q57 420 294 420z" />
+<glyph unicode="&#x2a0f;" horiz-adv-x="1019" d="M814 1606q77 0 141 -42t64 -116t-76 -74t-76 75q0 69 67 78q-47 38 -120 38q-87 0 -126 -118q-30 -91 -45 -269l-19 -281q-9 -142 -18 -246q341 124 343 124q37 0 37 -38q0 -26 -21 -34l-367 -133q-15 -147 -31 -272l-42 -322q-23 -165 -90 -274q-88 -144 -231 -144 q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75q0 -69 -70 -78q48 -39 121 -39q98 0 144 118q40 103 59 379t32 417q-337 -123 -343 -123q-37 0 -37 38q0 26 23 34l365 133q20 201 73 592q57 420 294 420z" />
+<glyph unicode="&#x2a10;" horiz-adv-x="1019" d="M814 1606q77 0 141 -42t64 -116t-76 -74t-76 75q0 69 67 78q-47 38 -120 38q-87 0 -124 -112t-62 -517q110 -33 176 -116q6 -8 6 -15q0 -24 -24 -24q-9 0 -18 9q-76 74 -143 97q-22 -318 -63 -624q76 9 160 67q9 6 15 6q24 0 24 -25q0 -9 -10 -18q-76 -67 -195 -78 l-31 -239q-23 -165 -90 -274q-88 -144 -231 -144q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75q0 -69 -70 -78q48 -39 121 -39q98 0 144 118q34 88 50 252l18 261q-116 35 -189 133.5t-73 230t96.5 237.5t238.5 119l31 237q57 420 294 420zM282 794.5q-80 -91.5 -80 -203.5 t60.5 -196t157.5 -117q28 359 62 623q-120 -15 -200 -106.5z" />
+<glyph unicode="&#x2a11;" horiz-adv-x="1019" d="M814 1606q77 0 141 -42t64 -116t-76 -74t-76 75q0 69 67 78q-47 38 -120 38q-86 0 -123.5 -111.5t-62.5 -517.5q117 -35 190.5 -133.5t73.5 -231t-97 -238t-239 -118.5l-31 -239q-23 -165 -90 -274q-88 -144 -231 -144q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75 q0 -69 -70 -78q48 -39 121 -39q98 0 144 118q40 103 66 483.5t68 701.5q-117 -14 -197 -103t-83 -207q113 102 144 102q22 0 22 -35q0 -5 -31 -20q-103 -51 -135 -128q-15 -37 -24 -37t-24 37q-32 77 -135 128q-32 16 -32 20q0 35 23 35q31 0 144 -102q4 139 100 242 t235 116l31 237q57 420 294 420zM763 369.5q81 91.5 81 203.5t-61 196.5t-159 117.5q-23 -336 -62 -624q120 15 201 106.5z" />
+<glyph unicode="&#x2a12;" horiz-adv-x="1019" d="M628 582q0 -43 -31 -74t-74 -31t-74 31t-31 74t31 74t74 31t74 -31t31 -74zM814 1606q77 0 141 -42t64 -116t-76 -74t-76 75q0 69 67 78q-47 38 -120 38q-87 0 -124 -112t-61 -502h229q34 0 34 -33v-670q0 -35 -34 -35h-302l-31 -237q-23 -165 -90 -274 q-88 -144 -231 -144q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75q0 -69 -70 -78q48 -39 121 -39q98 0 144 118q36 92 52 267l18 278h426v642h-361l37 283q57 420 294 420z" />
+<glyph unicode="&#x2a13;" horiz-adv-x="1019" d="M628 582q0 -43 -31 -74t-74 -31t-74 31t-31 74t31 74t74 31t74 -31t31 -74zM814 1606q77 0 141 -42t64 -116t-76 -74t-76 75q0 69 67 78q-47 38 -120 38q-86 0 -126 -118q-35 -104 -60 -511q117 -35 190.5 -133.5t73.5 -231t-97 -238t-239 -118.5l-31 -239 q-23 -165 -90 -274q-88 -144 -231 -144q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75q0 -69 -70 -78q48 -39 121 -39q98 0 144 118q36 93 53 275q9 144 19 287q50 -17 103 -17q132 0 226.5 94.5t94.5 226.5t-94.5 226.5t-226.5 94.5q-25 0 -41 -2l38 285q57 420 294 420z " />
+<glyph unicode="&#x2a14;" horiz-adv-x="1108" d="M844 582q0 -43 -31 -74t-74 -31t-74.5 31t-31.5 74t31.5 74t74.5 31t74 -31t31 -74zM1108 582q0 -152 -108.5 -260.5t-260.5 -108.5q-93 0 -177 46l-37 -283q-23 -165 -90 -274q-88 -144 -231 -144q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75q0 -69 -70 -78 q48 -39 121 -39q98 0 144 118q40 103 58 361.5t30 397.5q34 -96 117.5 -155t185.5 -59q132 0 226.5 94.5t94.5 226.5t-94.5 226.5t-226.5 94.5q-181 0 -275 -155q19 167 56 438q57 420 294 420q77 0 141 -42t64 -116t-76 -74t-76 75q0 69 67 78q-47 38 -120 38 q-86 0 -126 -118q-35 -103 -60 -513q54 17 111 17q152 0 260.5 -108.5t108.5 -260.5z" />
+<glyph unicode="&#x2a15;" horiz-adv-x="1019" d="M814 1606q77 0 141 -42t64 -116t-76 -74t-76 75q0 69 67 78q-47 38 -120 38q-86 0 -126 -118q-35 -104 -60 -511q117 -35 190.5 -133.5t73.5 -231t-97 -238t-239 -118.5l-31 -239q-23 -165 -90 -274q-88 -144 -231 -144q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75 q0 -69 -70 -78q48 -39 121 -39q98 0 144 118q34 87 50 251l18 262q-116 35 -189 133.5t-73 230t96.5 237.5t238.5 119l31 237q57 420 294 420zM844 582q0 132 -94.5 226.5t-226.5 94.5t-226.5 -94.5t-94.5 -226.5t94.5 -226.5t226.5 -94.5t226.5 94.5t94.5 226.5zM628 582 q0 -43 -31 -74t-74 -31t-74 31t-31 74t31 74t74 31t74 -31t31 -74z" />
+<glyph unicode="&#x2a16;" horiz-adv-x="1019" d="M814 1606q77 0 141 -42t64 -116t-76 -74t-76 75q0 69 67 78q-47 38 -120 38q-87 0 -124 -112.5t-61 -501.5h229q34 0 34 -33v-670q0 -35 -34 -35h-302l-31 -237q-23 -165 -90 -274q-88 -144 -231 -144q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75q0 -69 -70 -78 q48 -39 121 -39q98 0 144 118q33 86 49 244l18 253h-226q-35 0 -35 35v670q0 33 35 33h300l31 235q55 420 294 420zM844 261v642h-218q-21 -326 -64 -642h282zM202 903v-642h216q26 345 65 642h-281z" />
+<glyph unicode="&#x2a17;" horiz-adv-x="1117" d="M914 922l-51 -5q-25 0 -25 27t76 27q203 0 203 -206q0 -133 -98 -178q-64 -29 -215 -29h-144q-14 -134 -30 -260l-42 -322q-23 -165 -90 -274q-88 -144 -231 -144q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75q0 -69 -70 -78q48 -39 121 -39q98 0 141 111t62 386t37 463 h-376q58 -43 114.5 -126t56.5 -145q0 -19 -22.5 -19t-29.5 27q-25 98 -83 166.5t-131 96.5q-36 14 -36 24t36 24q73 28 133 98.5t78 151.5q2 9 7 27q6 13 27 13t21 -18q0 -8 -4 -22q-44 -160 -167 -250h381q22 218 71 580q57 420 294 420q77 0 141 -42t64 -116t-76 -74 t-76 75q0 69 67 78q-47 38 -120 38q-87 0 -126 -118q-31 -93 -46 -269q-23 -399 -40 -572h175q105 0 156 26q72 36 72 133q0 157 -154 157z" />
+<glyph unicode="&#x2a18;" horiz-adv-x="1020" d="M1020 148q0 -39 -38 -39q-14 0 -23 9l-369 369q-8 -78 -24 -197l-41 -314q-23 -165 -90 -274q-88 -144 -231 -144q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75q0 -69 -70 -78q48 -39 121 -39q99 0 144 118q40 105 58 367.5t29 383.5l-347 -348q-9 -9 -24 -9 q-38 0 -38 37q0 15 10 25l411 410l-411 410q-10 10 -10 25q0 37 38 37q14 0 24 -10l368 -367q18 170 64 509q57 420 294 420q77 0 141 -42t64 -116t-76 -74t-76 75q0 69 67 78q-47 38 -120 38q-87 0 -126 -118q-31 -93 -46 -269q-19 -331 -32 -481l349 349q9 9 23 9 q38 0 38 -39q0 -13 -9 -22l-412 -412l412 -412q9 -9 9 -22z" />
+<glyph unicode="&#x2a19;" horiz-adv-x="1019" d="M814 1606q77 0 141 -42t64 -116t-76 -74t-76 75q0 69 67 78q-47 38 -120 38q-86 0 -126 -118q-35 -104 -60 -510q127 -35 207.5 -141t80.5 -238v-377q0 -25 -24.5 -25t-24.5 25v377q0 113 -67 204t-175 125q-24 -357 -100 -911q-23 -165 -90 -274q-88 -144 -231 -144 q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75q0 -69 -70 -78q48 -39 121 -39q98 0 144 118q40 102 66 481.5t68 702.5q-129 -15 -216.5 -113.5t-87.5 -228.5v-377q0 -25 -24 -25t-24 25v377q0 152 103.5 265t255.5 126l31 237q57 420 294 420z" />
+<glyph unicode="&#x2a1a;" horiz-adv-x="1019" d="M814 1606q77 0 141 -42t64 -116t-76 -74t-76 75q0 69 67 78q-47 38 -120 38q-86 0 -126 -118q-30 -89 -45 -268l-18 -279q-22 -336 -63 -636q130 15 217.5 113t87.5 229v377q0 25 24.5 25t24.5 -25v-377q0 -153 -104 -266t-256 -126l-31 -238q-23 -165 -90 -274 q-88 -144 -231 -144q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75q0 -69 -70 -78q48 -39 121 -39q98 0 144 118q34 87 50 251l18 261q-127 36 -206.5 141t-79.5 237v377q0 25 24 25t24 -25v-377q0 -112 67.5 -203.5t174.5 -125.5q27 351 52 541l48 368q24 178 84 283 q78 137 210 137z" />
+<glyph unicode="&#x2a1b;" horiz-adv-x="1019" d="M992 1569q0 -37 -33 -37h-897q-35 0 -35 37t35 37h897q33 0 33 -37zM814 1442q77 0 141 -42t64 -116t-76 -74t-76 75q0 69 67 78q-47 38 -120 38q-86 0 -126 -118q-32 -92 -43.5 -250t-28 -415.5t-70.5 -641.5q-23 -166 -90 -274q-87 -144 -231 -144q-78 0 -141 41.5 t-63 116t76.5 74.5t76.5 -75q0 -70 -70 -78q49 -39 121 -39q97 0 144 118q40 101 65 467.5t56 614t35 272.5q26 143 79 235q78 137 210 137z" />
+<glyph unicode="&#x2a1c;" horiz-adv-x="1019" d="M814 1606q77 0 141 -42t64 -116t-76 -74t-76 75q0 69 67 78q-47 38 -120 38q-86 0 -126 -118q-32 -92 -43.5 -250t-28 -415.5t-70.5 -641.5q-23 -166 -90 -274q-87 -144 -231 -144q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75q0 -70 -70 -78q49 -39 121 -39 q97 0 144 118q40 101 65 467.5t56 614t35 272.5q26 143 79 235q78 137 210 137zM992 -405q0 -37 -33 -37h-897q-35 0 -35 37t35 37h897q33 0 33 -37z" />
+<glyph unicode="&#x2a1d;" horiz-adv-x="1883" d="M1683 -100q0 -59 -61 -59q-22 0 -45 23l-633 633l-636 -633q-23 -23 -47 -23q-61 0 -61 59v1368q0 21 18 38t44 17t46 -20l636 -635l633 635q20 20 45 20q61 0 61 -55v-1368zM1601 -45v1257l-627 -630zM913 582l-631 632v-1261z" />
+<glyph unicode="&#x2a1e;" horiz-adv-x="1817" d="M1617 -305q0 -44 -35 -44q-14 0 -28 9l-1416 887q-23 14 -23 35t23 35l1416 887q14 9 28 9q35 0 35 -44v-1774zM1535 -231v1626l-1298 -813z" />
+<glyph unicode="&#x2a1f;" horiz-adv-x="711" d="M542 743q0 -77 -55.5 -131.5t-131.5 -54.5t-131 55t-55 131t55 131t131 55t131.5 -54.5t55.5 -131.5zM508 211q37 -57 37 -165.5t-71 -248t-175 -198.5q-12 -6 -23 -6q-41 0 -41 43v6q4 15 19 27q149 119 191 273q-42 -24 -90 -24q-76 0 -131 55t-55 131t55 131t131 55 q103 0 153 -79zM460 743q0 42 -31 73t-73.5 31t-73.5 -31t-31 -73t31 -73t73.5 -31t73.5 31t31 73zM460 104q0 42 -31 73t-73.5 31t-73.5 -31t-31 -73t31 -73t73.5 -31t73.5 31t31 73z" />
+<glyph unicode="&#x2a20;" horiz-adv-x="2190" d="M2020 582q0 -24 -27 -37l-1168 -552q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l1088 514l-1088 514q-24 11 -24 37q0 41 41 41q8 0 14 -3l1168 -552q27 -13 27 -37zM1420 582q0 -24 -27 -37l-1168 -552q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l1088 514l-1088 514 q-24 11 -24 37q0 41 41 41q8 0 14 -3l1168 -552q27 -13 27 -37z" />
+<glyph unicode="&#x2a21;" horiz-adv-x="1024" d="M969 1062q20 -8 20 -45t-28 -37q-7 0 -35 7q-273 69 -432 288v-1554q0 -39 -41 -39t-41 39v1710q0 67 41 67q16 0 41 -62q54 -132 170 -230t258 -133q16 -2 47 -11z" />
+<glyph unicode="&#x2a22;" horiz-adv-x="1592" d="M965 1438q0 -69 -50 -119t-119 -50t-119 50t-50 119t50 118.5t119 49.5t119 -49.5t50 -118.5zM1422 582q0 -41 -37 -41h-548v-546q0 -39 -41 -39t-41 39v546h-546q-39 0 -39 41t39 41h546v548q0 37 41 37t41 -37v-548h548q37 0 37 -41zM873 1361q32 32 32 76.5t-32 76.5 t-77 32t-77 -32t-32 -76.5t32 -76.5t77 -32t77 32z" />
+<glyph unicode="&#x2a23;" horiz-adv-x="1592" d="M1149 1340l-29 -41l-324 201l-322 -201l-29 41l351 266zM1422 582q0 -41 -37 -41h-548v-546q0 -39 -41 -39t-41 39v546h-546q-39 0 -39 41t39 41h546v548q0 37 41 37t41 -37v-548h548q37 0 37 -41z" />
+<glyph unicode="&#x2a24;" horiz-adv-x="1592" d="M1041 1470q-65 -57 -119 -57t-136 49.5t-130 49.5q-80 0 -165 -98l-35 30q74 85 95 105q65 57 119 57t136 -49.5t130 -49.5q79 0 165 99l35 -31q-74 -85 -95 -105zM1422 582q0 -41 -37 -41h-548v-546q0 -39 -41 -39t-41 39v546h-546q-39 0 -39 41t39 41h546v548 q0 37 41 37t41 -37v-548h548q37 0 37 -41z" />
+<glyph unicode="&#x2a25;" horiz-adv-x="1592" d="M1422 582q0 -41 -37 -41h-548v-546q0 -39 -41 -39t-41 39v546h-546q-39 0 -39 41t39 41h546v548q0 37 41 37t41 -37v-548h548q37 0 37 -41zM873 -257q32 -32 32 -76.5t-32 -76.5t-77 -32t-77 32t-32 76.5t32 76.5t77 32t77 -32z" />
+<glyph unicode="&#x2a26;" horiz-adv-x="1592" d="M1422 582q0 -41 -37 -41h-548v-546q0 -39 -41 -39t-41 39v546h-546q-39 0 -39 41t39 41h546v548q0 37 41 37t41 -37v-548h548q37 0 37 -41zM1041 -385q-65 -57 -119 -57t-136 49.5t-130 49.5q-80 0 -165 -98l-35 30q74 85 95 105q65 57 119 57t136 -49.5t130 -49.5 q79 0 165 99l35 -31q-74 -85 -95 -105z" />
+<glyph unicode="&#x2a27;" horiz-adv-x="1592" d="M1422 582q0 -41 -37 -41h-548v-546q0 -39 -41 -39t-41 39v546h-546q-39 0 -39 41t39 41h546v548q0 37 41 37t41 -37v-548h548q37 0 37 -41zM969 -286v14q0 23 14 38l201 211q107 112 107 211q0 64 -34.5 108t-96.5 44q-89 0 -128 -81q65 0 65 -61t-64 -61t-64 64 q0 80 62 134t149.5 54t155.5 -54.5t68 -146.5q0 -68 -57 -133q-22 -25 -70 -69l-196 -178h180q72 0 79 6t21 89h45l-32 -189h-405z" />
+<glyph unicode="&#x2a28;" horiz-adv-x="1592" d="M1422 582q0 -41 -37 -41h-570q10 -9 22 -33q60 -113 129 -179q33 -32 33 -48q0 -31 -32.5 -31t-129.5 128v-383q0 -39 -41 -39t-41 39v383q-97 -128 -129.5 -128t-32.5 31q0 16 33 48q69 66 129 179q6 12 22 33h-568q-39 0 -39 41t39 41h546v548q0 37 41 37t41 -37v-548 h548q37 0 37 -41z" />
+<glyph unicode="&#x2a29;" horiz-adv-x="1592" d="M1422 582q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM877 1224q-33 -33 -83 -33t-78.5 32.5t-28.5 76t29 76t85 32.5t91 -58t35 -157q0 -152 -76.5 -274.5t-110.5 -122.5q-20 0 -20 22q0 8 14 23q148 157 148 352q0 30 -5 31z" />
+<glyph unicode="&#x2a2a;" horiz-adv-x="1592" d="M1422 582q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM875.5 214q33.5 -33 33.5 -79.5t-34 -80t-80 -33.5t-80 33.5t-34 80t33.5 79.5t80.5 33t80.5 -33z" />
+<glyph unicode="&#x2a2b;" horiz-adv-x="1592" d="M370.5 1109.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM1380.5 213.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM1422 582q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41z" />
+<glyph unicode="&#x2a2c;" horiz-adv-x="1592" d="M370.5 213.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM1380.5 1109.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM1422 582q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41z" />
+<glyph unicode="&#x2a2d;" horiz-adv-x="1592" d="M1422 582q0 -41 -37 -41h-548v-546q0 -39 -41 -39t-41 39v546h-546q-39 0 -39 41t39 41h546v548q0 37 41 37t41 -37v-548h548q37 0 37 -41zM834 -100q0 -41 -39 -41q-298 0 -509.5 212.5t-211.5 511t211 510.5t510 212q39 0 39 -41t-39 -41q-265 0 -452 -188t-187 -452.5 t187.5 -453t451.5 -188.5q39 0 39 -41z" />
+<glyph unicode="&#x2a2e;" horiz-adv-x="1592" d="M1307 1093q211 -212 211 -510.5t-211.5 -511t-509.5 -212.5q-39 0 -39 41t39 41q264 0 451.5 188.5t187.5 453t-187 452.5t-452 188q-39 0 -39 41t39 41q299 0 510 -212zM1422 582q0 -41 -37 -41h-548v-546q0 -39 -41 -39t-41 39v546h-546q-39 0 -39 41t39 41h546v548 q0 37 41 37t41 -37v-548h548q37 0 37 -41z" />
+<glyph unicode="&#x2a2f;" horiz-adv-x="1592" d="M1322 98q0 -42 -42 -42q-16 0 -27 11l-457 457l-457 -457q-11 -11 -27 -11q-42 0 -42 42q0 16 11 27l457 457l-458 458q-10 10 -10 25q0 43 43 43q15 0 25 -10l458 -458l458 458q10 10 25 10q43 0 43 -43q0 -15 -10 -25l-458 -458l457 -457q11 -11 11 -27z" />
+<glyph unicode="&#x2a30;" horiz-adv-x="1592" d="M873 1396q32 -32 32 -76.5t-32 -76.5t-77 -32t-77 32t-32 76.5t32 76.5t77 32t77 -32zM1241 969l-387 -387l386 -386q14 -14 14 -28t-15 -29t-29 -15t-28 14l-386 386l-386 -386q-14 -14 -28 -14t-29 15t-15 29t14 28l386 386l-387 387q-13 13 -13 27t15 29t29 15t27 -13 l387 -387l387 387q13 13 27 13t29 -15t15 -29t-13 -27z" />
+<glyph unicode="&#x2a31;" horiz-adv-x="1592" d="M1241 969l-387 -387l386 -386q14 -14 14 -28t-15 -29t-29 -15t-28 14l-386 386l-386 -386q-14 -14 -28 -14t-29 15t-15 29t14 28l386 386l-387 387q-13 13 -13 27t15 29t29 15t27 -13l387 -387l387 387q13 13 27 13t29 -15t15 -29t-13 -27zM1322 -41q0 -41 -37 -41h-976 q-39 0 -39 41t39 41h976q37 0 37 -41z" />
+<glyph unicode="&#x2a32;" horiz-adv-x="1592" d="M1322 98q0 -42 -42 -42h-968q-42 0 -42 42q0 16 11 27l457 457l-458 458q-10 10 -10 25q0 43 43 43q15 0 25 -10l458 -458l458 458q10 10 25 10q43 0 43 -43q0 -15 -10 -25l-458 -458l457 -457q11 -11 11 -27zM1182 138l-386 386l-386 -386h772z" />
+<glyph unicode="&#x2a33;" horiz-adv-x="1592" d="M1522 98q0 -42 -42 -42q-16 0 -27 11l-457 457l-142 -142l257 -257q11 -11 11 -27q0 -42 -42 -42q-16 0 -27 11l-257 257l-257 -257q-11 -11 -27 -11q-42 0 -42 42q0 16 11 27l257 257l-142 142l-457 -457q-11 -11 -27 -11q-42 0 -42 42q0 16 11 27l457 457l-458 458 q-10 10 -10 25q0 43 43 43q15 0 25 -10l458 -458l142 142l-258 258q-10 10 -10 25q0 43 43 43q15 0 25 -10l258 -258l258 258q10 10 25 10q43 0 43 -43q0 -15 -10 -25l-258 -258l142 -142l458 458q10 10 25 10q43 0 43 -43q0 -15 -10 -25l-458 -458l457 -457q11 -11 11 -27z M938 582l-142 142l-142 -142l142 -142z" />
+<glyph unicode="&#x2a34;" horiz-adv-x="1592" d="M1240 196q13 -13 13 -26q0 -14 -15 -29t-30 -15q-13 0 -26 12l-386 386l-386 -386q-26 -26 -55 3t-3 55l386 386l-386 386q-13 14 -13 27q0 15 15 30t29 15t27 -14l386 -386l386 386q14 14 28 14t29 -15t15 -29t-14 -28l-386 -386zM834 -100q0 -41 -39 -41 q-298 0 -509.5 212.5t-211.5 511t211 510.5t510 212q39 0 39 -41t-39 -41q-265 0 -452 -188t-187 -452.5t187.5 -453t451.5 -188.5q39 0 39 -41z" />
+<glyph unicode="&#x2a35;" horiz-adv-x="1592" d="M1307 1093q211 -212 211 -510.5t-211.5 -511t-509.5 -212.5q-39 0 -39 41t39 41q264 0 451.5 188.5t187.5 453t-187 452.5t-452 188q-39 0 -39 41t39 41q299 0 510 -212zM1240 196q13 -13 13 -26q0 -14 -15 -29t-30 -15q-13 0 -26 12l-386 386l-386 -386q-12 -12 -25 -12 q-15 0 -30 15t-15 30q0 13 12 25l386 386l-386 386q-13 14 -13 27q0 15 15 30t29 15t27 -14l386 -386l386 386q14 14 28 14t29 -15t15 -29t-14 -28l-386 -386z" />
+<glyph unicode="&#x2a36;" horiz-adv-x="1592" d="M1149 1340l-29 -41l-324 201l-322 -201l-29 41l351 266zM1307 1093q211 -212 211 -510.5t-211.5 -511t-509.5 -212.5t-510.5 212.5t-212.5 511.5t211.5 510.5t511 211.5t510.5 -212zM1248.5 129.5q187.5 188.5 187.5 453t-187.5 452.5t-452.5 188t-452.5 -187.5 t-187.5 -452.5t188.5 -453.5t452.5 -188.5t451.5 188.5zM1240 196q13 -13 13 -26q0 -14 -15 -29t-30 -15q-13 0 -26 12l-386 386l-386 -386q-12 -12 -25 -12q-15 0 -30 15t-15 30q0 13 12 25l386 386l-386 386q-13 14 -13 27q0 15 15 30t29 15t27 -14l386 -386l386 386 q14 14 28 14t29 -15t15 -29t-14 -28l-386 -386z" />
+<glyph unicode="&#x2a37;" horiz-adv-x="1592" d="M1307 1093q211 -212 211 -510.5t-211.5 -511t-509.5 -212.5t-510.5 212.5t-212.5 511.5t211.5 510.5t511 211.5t510.5 -212zM1248.5 129.5q187.5 188.5 187.5 453t-187.5 452.5t-452.5 188t-452.5 -187.5t-187.5 -452.5t188.5 -453.5t452.5 -188.5t451.5 188.5z M1165 951.5q153 -153.5 153 -369t-153 -369.5t-368 -154t-369 154t-154 370t153 369t369 153t369 -153.5zM1106.5 271q129.5 130 129.5 311.5t-129 311t-311 129.5t-311 -129t-129 -311t130 -312t310.5 -130t310 130zM1100 337q12 -12 12 -25q0 -15 -15 -30t-30 -15 q-13 0 -25 12l-245 245l-244 -245q-12 -12 -25 -12q-15 0 -30 15t-15 30q0 13 12 25l244 245l-244 244q-14 14 -14 28t15 29t29 15t28 -14l244 -244l245 244q14 14 28 14t29 -15t15 -29t-14 -28l-245 -244z" />
+<glyph unicode="&#x2a38;" horiz-adv-x="1592" d="M1307 1093q211 -212 211 -510.5t-211.5 -511t-509.5 -212.5t-510.5 212.5t-212.5 511.5t211.5 510.5t511 211.5t510.5 -212zM1248.5 129.5q187.5 188.5 187.5 453t-187.5 452.5t-452.5 188t-452.5 -187.5t-187.5 -452.5t188.5 -453.5t452.5 -188.5t451.5 188.5zM1421 582 q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM876 1009.5q34 -33.5 34 -80t-33.5 -79.5t-80.5 -33t-80.5 33t-33.5 79.5t34 80t80 33.5t80 -33.5zM876.5 314q33.5 -33 33.5 -79.5t-34 -80t-80 -33.5t-80 33.5t-34 80t33.5 79.5t80.5 33t80.5 -33z" />
+<glyph unicode="&#x2a39;" horiz-adv-x="1592" d="M1515 -76q0 -35 -43 -35h-1352q-43 0 -43 35q0 12 6 24l676 1355q14 28 36.5 28t36.5 -28l677 -1355q6 -12 6 -24zM1406 -29l-610 1222l-610 -1222h1220zM1162 388q0 -41 -37 -41h-288v-288q0 -37 -41 -37t-41 37v288h-285q-39 0 -39 41t39 41h285v285q0 39 41 39t41 -39 v-285h288q37 0 37 -41z" />
+<glyph unicode="&#x2a3a;" horiz-adv-x="1592" d="M1515 -76q0 -35 -43 -35h-1352q-43 0 -43 35q0 12 6 24l676 1355q14 28 36.5 28t36.5 -28l677 -1355q6 -12 6 -24zM1406 -29l-610 1222l-610 -1222h1220zM1162 388q0 -41 -37 -41h-655q-39 0 -39 41t39 41h655q37 0 37 -41z" />
+<glyph unicode="&#x2a3b;" horiz-adv-x="1592" d="M1515 -76q0 -35 -43 -35h-1352q-43 0 -43 35q0 12 6 24l676 1355q14 28 36.5 28t36.5 -28l677 -1355q6 -12 6 -24zM1406 -29l-610 1222l-610 -1222h1220zM1057 184q12 -12 12 -25q0 -15 -15 -30t-30 -15q-13 0 -25 12l-203 204l-202 -202q-13 -14 -27 -14t-29 15t-15 30 q0 13 13 27l202 201l-202 202q-13 13 -13 27q0 15 15 30t29 15t27 -14l202 -202l203 204q12 12 25 12q15 0 30 -15t15 -30q0 -13 -12 -25l-203 -204z" />
+<glyph unicode="&#x2a3c;" horiz-adv-x="1592" d="M1372 580q0 -39 -41 -39h-1072q-39 0 -39 41t39 41h1031v433q0 37 41 37t41 -37v-476z" />
+<glyph unicode="&#x2a3d;" horiz-adv-x="1592" d="M1372 582q0 -41 -39 -41h-1072q-41 0 -41 39v476q0 37 41 37t41 -37v-433h1031q39 0 39 -41z" />
+<glyph unicode="&#x2a3e;" horiz-adv-x="711" d="M542 743q0 -77 -55.5 -131.5t-131.5 -54.5t-131 55t-55 131t55 131t131 55t131.5 -54.5t55.5 -131.5zM508 211q37 -57 37 -165.5t-71 -248t-175 -198.5q-12 -6 -23 -6q-41 0 -41 43v6q4 15 19 27q149 119 191 273q-42 -24 -90 -24q-76 0 -131 55t-55 131t55 131t131 55 q103 0 153 -79zM460 743q0 42 -31 73t-73.5 31t-73.5 -31t-31 -73t31 -73t73.5 -31t73.5 31t31 73zM460 104q0 42 -31 73t-73.5 31t-73.5 -31t-31 -73t31 -73t73.5 -31t73.5 31t31 73z" />
+<glyph unicode="&#x2a3f;" horiz-adv-x="1876" d="M1745 -150q31 0 31 -46t-31 -46h-1614q-30 0 -30 46v17q0 29 30 29q158 0 169.5 15t11.5 44v1354q0 32 -15 38q-30 13 -166 13q-31 0 -31 46t33 46h555q36 0 34 -43l-1 -20q-1 -29 -31 -29q-159 0 -169.5 -15t-10.5 -41v-1408h856v1414q0 31 -18.5 39t-68.5 9t-87 2.5 t-37 28.5v34q0 29 33 29h555q33 0 33 -43v-10q-1 -7 -1 -10q0 -29 -30 -29q-159 0 -172 -18q-9 -12 -9 -42v-1353q0 -32 15 -38q30 -13 166 -13z" />
+<glyph unicode="&#x2a40;" horiz-adv-x="1364" d="M1249 -8q0 -37 -41 -37t-41 37v792q0 171 -163 273q-140 86 -322.5 86t-321.5 -87q-163 -101 -163 -272v-792q0 -37 -41 -37t-41 37v799q0 202 189 326q164 108 378 108t379 -107q188 -124 188 -327v-799zM759 659q32 -32 32 -76.5t-32 -76.5t-77 -32t-77 32t-32 76.5 t32 76.5t77 32t77 -32z" />
+<glyph unicode="&#x2a41;" horiz-adv-x="1364" d="M1249 389q0 -203 -188 -327q-165 -107 -379 -107t-379 107q-188 124 -188 327v799q0 37 41 37t41 -37v-793q0 -169 164 -271q140 -87 321.5 -87t321.5 86q163 101 163 272v793q0 37 41 37t41 -37v-799zM1108 582q0 -41 -37 -41h-776q-39 0 -39 41t39 41h776q37 0 37 -41z " />
+<glyph unicode="&#x2a42;" horiz-adv-x="1364" d="M1249 389q0 -203 -188 -327q-165 -107 -379 -107t-379 107q-188 124 -188 327v799q0 37 41 37t41 -37v-793q0 -169 164 -271q140 -87 321.5 -87t321.5 86q163 101 163 272v793q0 37 41 37t41 -37v-799zM1208 1482q0 -41 -37 -41h-976q-39 0 -39 41t39 41h976q37 0 37 -41 z" />
+<glyph unicode="&#x2a43;" horiz-adv-x="1364" d="M1249 -8q0 -37 -41 -37t-41 37v792q0 171 -163 273q-140 86 -322.5 86t-321.5 -87q-163 -101 -163 -272v-792q0 -37 -41 -37t-41 37v799q0 202 189 326q164 108 378 108t379 -107q188 -124 188 -327v-799zM1208 1482q0 -41 -37 -41h-976q-39 0 -39 41t39 41h976 q37 0 37 -41z" />
+<glyph unicode="&#x2a44;" horiz-adv-x="1364" d="M1249 -8q0 -37 -41 -37t-41 37v792q0 171 -163 273q-140 86 -322.5 86t-321.5 -87q-163 -101 -163 -272v-792q0 -37 -41 -37t-41 37v799q0 202 189 326q164 108 378 108t379 -107q188 -124 188 -327v-799zM1006 16q0 -41 -41 -41q-26 0 -37 25l-246 553l-246 -553 q-11 -25 -37 -25q-41 0 -41 41q0 11 2 16l283 638q11 25 39 25t39 -25l283 -638q2 -5 2 -16z" />
+<glyph unicode="&#x2a45;" horiz-adv-x="1364" d="M1249 389q0 -203 -188 -327q-165 -107 -379 -107t-379 107q-188 124 -188 327v799q0 37 41 37t41 -37v-793q0 -169 164 -271q140 -87 321.5 -87t321.5 86q163 101 163 272v793q0 37 41 37t41 -37v-799zM1006 1164q0 -11 -2 -16l-283 -638q-11 -25 -39 -25t-39 25 l-283 638q-2 5 -2 16q0 41 41 41q26 0 37 -25l246 -553l246 553q11 25 37 25q41 0 41 -41z" />
+<glyph unicode="&#x2a46;" horiz-adv-x="1364" d="M1249 1216q0 -203 -188 -327q-165 -107 -379 -107t-379 107q-188 124 -188 327v299q0 37 41 37t41 -37v-293q0 -169 164 -271q140 -87 321.5 -87t321.5 86q163 101 163 272v293q0 37 41 37t41 -37v-299zM1249 -351q0 -37 -41 -37t-41 37v292q0 171 -163 273 q-140 86 -322.5 86t-321.5 -87q-163 -101 -163 -272v-292q0 -37 -41 -37t-41 37v299q0 202 189 326q164 108 378 108t379 -107q188 -124 188 -327v-299z" />
+<glyph unicode="&#x2a47;" horiz-adv-x="1364" d="M1249 819q0 -37 -41 -37t-41 37v293q0 171 -163 272q-140 86 -321.5 86t-321.5 -87q-164 -102 -164 -271v-293q0 -37 -41 -37t-41 37v299q0 203 188 327q165 107 379 107t379 -107q188 -124 188 -327v-299zM1249 46q0 -203 -188 -327q-165 -107 -379 -107t-378 108 q-189 124 -189 326v299q0 37 41 37t41 -37v-292q0 -171 163 -272q139 -87 321.5 -87t322.5 86q163 102 163 273v292q0 37 41 37t41 -37v-299z" />
+<glyph unicode="&#x2a48;" horiz-adv-x="1364" d="M1249 1216q0 -203 -188 -327q-165 -107 -379 -107t-379 107q-188 124 -188 327v299q0 37 41 37t41 -37v-293q0 -169 164 -271q140 -87 321.5 -87t321.5 86q163 101 163 272v293q0 37 41 37t41 -37v-299zM1249 -351q0 -37 -41 -37t-41 37v292q0 171 -163 273 q-140 86 -322.5 86t-321.5 -87q-163 -101 -163 -272v-292q0 -37 -41 -37t-41 37v299q0 202 189 326q164 108 378 108t379 -107q188 -124 188 -327v-299zM1207 582q0 -41 -37 -41h-974q-39 0 -39 41t39 41h974q37 0 37 -41z" />
+<glyph unicode="&#x2a49;" horiz-adv-x="1364" d="M1249 819q0 -37 -41 -37t-41 37v293q0 171 -163 272q-140 86 -321.5 86t-321.5 -87q-164 -102 -164 -271v-293q0 -37 -41 -37t-41 37v299q0 203 188 327q165 107 379 107t379 -107q188 -124 188 -327v-299zM1249 46q0 -203 -188 -327q-165 -107 -379 -107t-378 108 q-189 124 -189 326v299q0 37 41 37t41 -37v-292q0 -171 163 -272q139 -87 321.5 -87t322.5 86q163 102 163 273v292q0 37 41 37t41 -37v-299zM1207 582q0 -41 -37 -41h-974q-39 0 -39 41t39 41h974q37 0 37 -41z" />
+<glyph unicode="&#x2a4a;" horiz-adv-x="2416" d="M2301 389q0 -203 -188 -327q-165 -107 -379 -107q-160 0 -310 69t-216 195q-66 -126 -216 -195t-310 -69q-214 0 -379 107q-188 124 -188 327v799q0 37 41 37t41 -37v-793q0 -169 164 -271q140 -87 321.5 -87t321.5 86q163 101 163 272v793q0 37 41 37t41 -37v-793 q0 -169 164 -271q140 -87 321.5 -87t321.5 86q163 101 163 272v793q0 37 41 37t41 -37v-799z" />
+<glyph unicode="&#x2a4b;" horiz-adv-x="2416" d="M2301 -8q0 -37 -41 -37t-41 37v792q0 171 -163 273q-140 86 -322.5 86t-321.5 -87q-163 -101 -163 -272v-792q0 -37 -41 -37t-41 37v792q0 171 -163 273q-140 86 -322.5 86t-321.5 -87q-163 -101 -163 -272v-792q0 -37 -41 -37t-41 37v799q0 202 189 326q164 108 378 108 q161 0 310.5 -69t215.5 -195q67 125 216.5 194.5t309.5 69.5q214 0 379 -107q188 -124 188 -327v-799z" />
+<glyph unicode="&#x2a4c;" horiz-adv-x="1364" d="M1308 1184q0 -41 -37 -41h-22v-754q0 -203 -188 -327q-165 -107 -379 -107t-379 107q-188 124 -188 327v754h-20q-39 0 -39 41t39 41h1176q37 0 37 -41zM1167 395v748h-970v-748q0 -169 164 -271q140 -87 321.5 -87t321.5 86q163 101 163 272z" />
+<glyph unicode="&#x2a4d;" horiz-adv-x="1364" d="M1308 -4q0 -41 -37 -41h-1176q-39 0 -39 41t39 41h20v754q0 202 189 326q164 108 378 108t379 -107q188 -124 188 -327v-754h22q37 0 37 -41zM1167 37v747q0 171 -163 273q-140 86 -322.5 86t-321.5 -87q-163 -101 -163 -272v-747h970z" />
+<glyph unicode="&#x2a4e;" horiz-adv-x="1364" d="M1239 39q0 -39 -37 -39h-1038q-39 0 -39 39v1149q0 37 41 37t41 -37v-1106h950v1106q0 37 41 37t41 -37v-1149zM1039 239q0 -39 -37 -39h-638q-39 0 -39 39v949q0 37 41 37t41 -37v-906h550v906q0 37 41 37t41 -37v-949z" />
+<glyph unicode="&#x2a4f;" horiz-adv-x="1364" d="M1239 39q0 -39 -41 -39t-41 39v1104h-950v-1104q0 -39 -41 -39t-41 39v1149q0 37 39 37h1038q37 0 37 -37v-1149zM1039 39q0 -39 -41 -39t-41 39v904h-550v-904q0 -39 -41 -39t-41 39v949q0 37 39 37h638q37 0 37 -37v-949z" />
+<glyph unicode="&#x2a50;" horiz-adv-x="1364" d="M1308 1184q0 -41 -37 -41h-22v-754q0 -203 -188 -327q-165 -107 -379 -107t-379 107q-188 124 -188 327v754h-20q-39 0 -39 41t39 41h1176q37 0 37 -41zM1167 395v748h-970v-748q0 -169 164 -271q140 -87 321.5 -87t321.5 86q163 101 163 272zM1061 394q0 -62 -60 -62 q-15 0 -29 10l-262 191l31 -338q0 -53 -59 -53q-23 0 -42.5 17t-17.5 40l31 334l-262 -191q-14 -10 -29 -10q-59 0 -59 62q0 36 28 49l295 139l-295 139q-28 13 -28 49q0 62 59 62q15 0 29 -10l262 -191l-31 340q0 53 60 53q25 0 43 -17t16 -42l-31 -334l262 191 q14 10 29 10q60 0 60 -62q0 -35 -29 -49l-295 -139l295 -139q29 -14 29 -49z" />
+<glyph unicode="&#x2a51;" horiz-adv-x="1364" d="M1249 -4q0 -41 -41 -41q-26 0 -37 25l-489 1103l-489 -1103q-11 -25 -37 -25q-41 0 -41 41q0 11 2 16l526 1188q11 25 39 25t39 -25l526 -1188q2 -5 2 -16zM761.5 1572.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5z" />
+<glyph unicode="&#x2a52;" horiz-adv-x="1364" d="M1249 1183q0 -11 -2 -16l-526 -1188q-11 -25 -39 -25t-39 25l-526 1188q-2 5 -2 16q0 41 41 41q26 0 37 -25l489 -1103l489 1103q11 25 37 25q41 0 41 -41zM762 -234q33 -33 33 -79.5t-33.5 -80t-80 -33.5t-79.5 33t-33 80t33 80t80 33t80 -33z" />
+<glyph unicode="&#x2a53;" horiz-adv-x="1364" d="M1249 -4q0 -41 -41 -41q-26 0 -37 25l-489 1103l-489 -1103q-11 -25 -37 -25q-41 0 -41 41q0 11 2 16l526 1188q11 25 39 25t39 -25l526 -1188q2 -5 2 -16zM1006 -4q0 -41 -41 -41q-26 0 -37 25l-246 553l-246 -553q-11 -25 -37 -25q-41 0 -41 41q0 11 2 16l283 638 q11 25 39 25t39 -25l283 -638q2 -5 2 -16z" />
+<glyph unicode="&#x2a54;" horiz-adv-x="1364" d="M1249 1183q0 -11 -2 -16l-526 -1188q-11 -25 -39 -25t-39 25l-526 1188q-2 5 -2 16q0 41 41 41q26 0 37 -25l489 -1103l489 1103q11 25 37 25q41 0 41 -41zM1006 1183q0 -11 -2 -16l-283 -638q-11 -25 -39 -25t-39 25l-283 638q-2 5 -2 16q0 41 41 41q26 0 37 -25 l246 -553l246 553q11 25 37 25q41 0 41 -41z" />
+<glyph unicode="&#x2a55;" horiz-adv-x="1664" d="M1549 -4q0 -41 -41 -41q-26 0 -37 25l-489 1103l-105 -236l370 -835q2 -5 2 -16q0 -41 -41 -41q-26 0 -37 25l-339 765l-339 -765q-11 -25 -37 -25q-41 0 -41 41q0 11 2 16l370 835l-105 236l-489 -1103q-11 -25 -37 -25q-41 0 -41 41q0 11 2 16l526 1188q11 25 39 25 t39 -25l111 -251l111 251q11 25 39 25t39 -25l526 -1188q2 -5 2 -16z" />
+<glyph unicode="&#x2a56;" horiz-adv-x="1664" d="M1549 1183q0 -11 -2 -16l-526 -1188q-11 -25 -39 -25t-39 25l-111 251l-111 -251q-11 -25 -39 -25t-39 25l-526 1188q-2 5 -2 16q0 41 41 41q26 0 37 -25l489 -1103l105 236l-370 835q-2 5 -2 16q0 41 41 41q26 0 37 -25l339 -765l339 765q11 25 37 25q41 0 41 -41 q0 -11 -2 -16l-370 -835l105 -236l489 1103q11 25 37 25q41 0 41 -41z" />
+<glyph unicode="&#x2a57;" horiz-adv-x="1691" d="M1581 1171q0 -21 -12 -31l-1339 -1165q-11 -10 -29 -10q-41 0 -41 39v1171q0 37 41 37t41 -37v-1079l1272 1106q12 10 26 10q41 0 41 -41z" />
+<glyph unicode="&#x2a58;" horiz-adv-x="1691" d="M1531 2q0 -37 -41 -37t-41 37v1079l-1272 -1106q-12 -10 -26 -10q-41 0 -41 41q0 21 12 31l1339 1165q11 10 29 10q41 0 41 -39v-1171z" />
+<glyph unicode="&#x2a59;" horiz-adv-x="1364" d="M1249 -212q0 -41 -41 -41q-26 0 -37 25l-314 708l-136 -308q-11 -25 -39 -25t-39 25l-136 308l-314 -708q-11 -25 -37 -25q-41 0 -41 41q0 12 2 16l344 778l-344 778q-2 4 -2 16q0 41 41 41q26 0 37 -25l314 -708l136 309q11 25 39 25t39 -25l136 -309l314 708 q11 25 37 25q41 0 41 -41q0 -12 -2 -16l-344 -778l344 -778q2 -4 2 -16zM812 582l-130 294l-130 -294l130 -293z" />
+<glyph unicode="&#x2a5a;" horiz-adv-x="1414" d="M1299 -3q0 -41 -41 -41q-26 0 -37 24l-473 1004v-989q0 -39 -41 -39t-41 39v989l-473 -1004q-11 -24 -37 -24q-41 0 -41 41q0 8 3 15l552 1169q13 27 37 27t37 -27l552 -1169q3 -7 3 -15z" />
+<glyph unicode="&#x2a5b;" horiz-adv-x="1414" d="M1299 1167q0 -8 -3 -14l-552 -1170q-13 -27 -37 -27t-37 27l-552 1170q-3 6 -3 14q0 41 41 41q26 0 37 -24l473 -1004v989q0 39 41 39t41 -39v-989l473 1004q11 24 37 24q41 0 41 -41z" />
+<glyph unicode="&#x2a5c;" horiz-adv-x="1364" d="M1249 -4q0 -41 -41 -41q-26 0 -37 25l-249 561h-480l-249 -561q-11 -25 -37 -25q-41 0 -41 41q0 11 2 16l234 529h-155q-39 0 -39 41t39 41h192l255 577q11 25 39 25t39 -25l255 -577h194q37 0 37 -41t-37 -41h-157l234 -529q2 -5 2 -16zM886 623l-204 460l-204 -460h408 z" />
+<glyph unicode="&#x2a5d;" horiz-adv-x="1364" d="M1249 1183q0 -11 -2 -16l-241 -544h164q37 0 37 -41t-37 -41h-200l-249 -562q-11 -25 -39 -25t-39 25l-249 562h-198q-39 0 -39 41t39 41h162l-241 544q-2 5 -2 16q0 41 41 41q26 0 37 -25l255 -576h468l255 576q11 25 37 25q41 0 41 -41zM879 541h-394l197 -445z" />
+<glyph unicode="&#x2a5e;" horiz-adv-x="1364" d="M1249 -4q0 -41 -41 -41q-26 0 -37 25l-489 1103l-489 -1103q-11 -25 -37 -25q-41 0 -41 41q0 11 2 16l526 1188q11 25 39 25t39 -25l526 -1188q2 -5 2 -16zM1249 1565q0 -41 -37 -41h-1058q-39 0 -39 41t39 41h1058q37 0 37 -41zM1249 1325q0 -41 -37 -41h-1058 q-39 0 -39 41t39 41h1058q37 0 37 -41z" />
+<glyph unicode="&#x2a5f;" horiz-adv-x="1364" d="M1249 -4q0 -41 -41 -41q-26 0 -37 25l-489 1103l-489 -1103q-11 -25 -37 -25q-41 0 -41 41q0 11 2 16l526 1188q11 25 39 25t39 -25l526 -1188q2 -5 2 -16zM1249 -281q0 -41 -37 -41h-1058q-39 0 -39 41t39 41h1058q37 0 37 -41z" />
+<glyph unicode="&#x2a60;" horiz-adv-x="1364" d="M1249 -4q0 -41 -41 -41q-26 0 -37 25l-489 1103l-489 -1103q-11 -25 -37 -25q-41 0 -41 41q0 11 2 16l526 1188q11 25 39 25t39 -25l526 -1188q2 -5 2 -16zM1249 -161q0 -41 -37 -41h-1058q-39 0 -39 41t39 41h1058q37 0 37 -41zM1249 -401q0 -41 -37 -41h-1058 q-39 0 -39 41t39 41h1058q37 0 37 -41z" />
+<glyph unicode="&#x2a61;" horiz-adv-x="1164" d="M906 633q0 -11 -2 -16l-283 -638q-11 -25 -39 -25t-39 25l-283 638q-2 5 -2 16q0 41 41 41q26 0 37 -25l246 -553l246 553q11 25 37 25q41 0 41 -41zM1049 -281q0 -41 -37 -41h-858q-39 0 -39 41t39 41h858q37 0 37 -41z" />
+<glyph unicode="&#x2a62;" horiz-adv-x="1364" d="M1249 1183q0 -11 -2 -16l-526 -1188q-11 -25 -39 -25t-39 25l-526 1188q-2 5 -2 16q0 41 41 41q26 0 37 -25l489 -1103l489 1103q11 25 37 25q41 0 41 -41zM1249 1565q0 -41 -37 -41h-1058q-39 0 -39 41t39 41h1058q37 0 37 -41zM1249 1325q0 -41 -37 -41h-1058 q-39 0 -39 41t39 41h1058q37 0 37 -41z" />
+<glyph unicode="&#x2a63;" horiz-adv-x="1364" d="M1249 1183q0 -11 -2 -16l-526 -1188q-11 -25 -39 -25t-39 25l-526 1188q-2 5 -2 16q0 41 41 41q26 0 37 -25l489 -1103l489 1103q11 25 37 25q41 0 41 -41zM1249 -161q0 -41 -37 -41h-1058q-39 0 -39 41t39 41h1058q37 0 37 -41zM1249 -401q0 -41 -37 -41h-1058 q-39 0 -39 41t39 41h1058q37 0 37 -41z" />
+<glyph unicode="&#x2a64;" horiz-adv-x="1712" d="M1552 -94q0 -43 -35 -43q-12 0 -24 6l-1355 676q-28 14 -28 36.5t28 36.5l1355 677q12 6 24 6q35 0 35 -43v-1352zM1470 623v569l-1140 -569h1140zM1470 541h-1140l1140 -569v569z" />
+<glyph unicode="&#x2a65;" horiz-adv-x="1712" d="M1574 618q28 -14 28 -36.5t-28 -36.5l-1355 -676q-12 -6 -24 -6q-35 0 -35 43v1352q0 43 35 43q12 0 24 -6zM242 623h1140l-1140 569v-569zM242 541v-569l1140 569h-1140z" />
+<glyph unicode="&#x2a66;" horiz-adv-x="1592" d="M875.5 11.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM1422 382q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1422 782q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41z" />
+<glyph unicode="&#x2a67;" horiz-adv-x="1592" d="M1422 982q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1422 582q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1422 182q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM876 1512q33 -33 33 -79.5t-33.5 -80t-80 -33.5 t-79.5 33t-33 80t33 80t80 33t80 -33z" />
+<glyph unicode="&#x2a68;" horiz-adv-x="1592" d="M1422 182q0 -41 -37 -41h-348v-146q0 -39 -41 -39t-41 39v146h-318v-146q0 -39 -41 -39t-41 39v146h-346q-39 0 -39 41t39 41h346v318h-346q-39 0 -39 41t39 41h346v318h-346q-39 0 -39 41t39 41h346v148q0 37 41 37t41 -37v-148h318v148q0 37 41 37t41 -37v-148h348 q37 0 37 -41t-37 -41h-348v-318h348q37 0 37 -41t-37 -41h-348v-318h348q37 0 37 -41zM955 623v318h-318v-318h318zM955 223v318h-318v-318h318z" />
+<glyph unicode="&#x2a69;" horiz-adv-x="1592" d="M1422 182q0 -41 -37 -41h-148v-146q0 -39 -41 -39t-41 39v146h-318v-146q0 -39 -41 -39t-41 39v146h-318v-146q0 -39 -41 -39t-41 39v146h-146q-39 0 -39 41t39 41h146v318h-146q-39 0 -39 41t39 41h146v318h-146q-39 0 -39 41t39 41h146v148q0 37 41 37t41 -37v-148h318 v148q0 37 41 37t41 -37v-148h318v148q0 37 41 37t41 -37v-148h148q37 0 37 -41t-37 -41h-148v-318h148q37 0 37 -41t-37 -41h-148v-318h148q37 0 37 -41zM1155 623v318h-318v-318h318zM755 623v318h-318v-318h318zM1155 223v318h-318v-318h318zM755 223v318h-318v-318h318z " />
+<glyph unicode="&#x2a6a;" horiz-adv-x="1592" d="M1477 746q0 -152 -96 -271.5t-244 -119.5q-114 0 -238 88l-208 164q-123 88 -236 88q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q115 0 240 -88l207 -164q124 -88 235 -88q85 0 156 50t104 130q15 36 21 98t30 62 q29 0 29 -63zM876 1204q33 -33 33 -79.5t-33.5 -80t-80 -33.5t-79.5 33t-33 80t33 80t80 33t80 -33z" />
+<glyph unicode="&#x2a6b;" horiz-adv-x="1592" d="M1477 746q0 -152 -96 -271.5t-244 -119.5q-114 0 -238 88l-208 164q-123 88 -236 88q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q115 0 240 -88l207 -164q124 -88 235 -88q85 0 156 50t104 130q15 36 21 98t30 62 q29 0 29 -63zM475.5 311.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM1275.5 1011.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5z" />
+<glyph unicode="&#x2a6c;" horiz-adv-x="1592" d="M1477 1115q0 -152 -96 -271.5t-244 -119.5q-114 0 -238 88l-208 164q-123 88 -236 88q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q115 0 240 -88l207 -164q124 -88 235 -88q85 0 156 50t104 130q15 36 21 98t30 62 q29 0 29 -63zM1477 95q0 -152 -96 -271.5t-244 -119.5q-114 0 -238 88l-208 164q-123 88 -236 88q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q115 0 240 -88l207 -164q124 -88 235 -88q85 0 156 50t104 130q15 36 21 98 t30 62q29 0 29 -63zM1477 441q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41z" />
+<glyph unicode="&#x2a6d;" horiz-adv-x="1592" d="M1477 441q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41zM1477 41q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41zM1477 1115q0 -152 -96 -271.5t-244 -119.5q-114 0 -238 88l-208 164q-123 88 -236 88q-162 0 -245 -147q-29 -52 -38 -142 q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q115 0 240 -88l207 -164q124 -88 235 -88q85 0 156 50t104 130q15 36 21 98t30 62q29 0 29 -63zM876 1573q33 -33 33 -79.5t-33.5 -80t-80 -33.5t-79.5 33t-33 80t33 80t80 33t80 -33z" />
+<glyph unicode="&#x2a6e;" horiz-adv-x="1591" d="M837 1320q230 44 236 44t6 -10.5t-7 -13.5l-209 -99l113 -207q0 -13 -13 -13q-5 0 -167 172q-162 -172 -168 -172q-13 0 -13 13l113 207l-206 98q-10 5 -10 15t6 10t236 -44l29 230q1 10 12.5 10t12.5 -10zM1477 782q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286 q37 0 37 -41zM1477 382q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41z" />
+<glyph unicode="&#x2a6f;" horiz-adv-x="1592" d="M1477 495q0 -152 -96 -271.5t-244 -119.5q-114 0 -238 88l-208 164q-123 88 -236 88q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q115 0 240 -88l207 -164q124 -88 235 -88q85 0 156 50t104 130q15 36 21 98t30 62 q29 0 29 -63zM1477 995q0 -152 -96 -271.5t-244 -119.5q-114 0 -238 88l-208 164q-123 88 -236 88q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q115 0 240 -88l207 -164q124 -88 235 -88q85 0 156 50t104 130q15 36 21 98 t30 62q29 0 29 -63zM1149 1340l-29 -41l-324 201l-322 -201l-29 41l351 266z" />
+<glyph unicode="&#x2a70;" horiz-adv-x="1592" d="M1477 856q0 -152 -96 -271.5t-244 -119.5q-114 0 -238 88l-208 164q-123 88 -236 88q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q115 0 240 -88l207 -164q124 -88 235 -88q85 0 156 50t104 130q15 36 21 98t30 62 q29 0 29 -63zM1477 182q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41zM1477 -218q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41zM1477 1356q0 -152 -96 -271.5t-244 -119.5q-114 0 -238 88l-208 164q-123 88 -236 88q-162 0 -245 -147 q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q115 0 240 -88l207 -164q124 -88 235 -88q85 0 156 50t104 130q15 36 21 98t30 62q29 0 29 -63z" />
+<glyph unicode="&#x2a71;" horiz-adv-x="1592" d="M1422 1474q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1422 1074q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1422 274q0 -41 -37 -41h-548v-546q0 -39 -41 -39t-41 39v546h-546q-39 0 -39 41t39 41h546v548q0 37 41 37t41 -37v-548h548 q37 0 37 -41z" />
+<glyph unicode="&#x2a72;" horiz-adv-x="1592" d="M1422 89q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1422 -311q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1422 889q0 -41 -37 -41h-548v-548q0 -37 -41 -37t-41 37v548h-546q-39 0 -39 41t39 41h546v546q0 39 41 39t41 -39v-546h548 q37 0 37 -41z" />
+<glyph unicode="&#x2a73;" horiz-adv-x="1591" d="M1477 391q0 -152 -96 -271.5t-244 -119.5q-114 0 -238 88l-208 164q-123 88 -236 88q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q115 0 240 -88l207 -164q124 -88 235 -88q85 0 156 50t104 130q15 36 21 98t30 62 q29 0 29 -63zM1477 1137q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41zM1477 737q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41z" />
+<glyph unicode="&#x2a74;" d="M687.5 861.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM307.5 861.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM687.5 461.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80 t79.5 33t80 -33.5zM307.5 461.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM1925 782q0 -41 -37 -41h-974q-39 0 -39 41t39 41h974q37 0 37 -41zM1925 382q0 -41 -37 -41h-974q-39 0 -39 41t39 41h974q37 0 37 -41z" />
+<glyph unicode="&#x2a75;" d="M1900 782q0 -41 -37 -41h-678q-39 0 -39 41t39 41h678q37 0 37 -41zM1900 382q0 -41 -37 -41h-678q-39 0 -39 41t39 41h678q37 0 37 -41zM902 782q0 -41 -37 -41h-678q-39 0 -39 41t39 41h678q37 0 37 -41zM902 382q0 -41 -37 -41h-678q-39 0 -39 41t39 41h678 q37 0 37 -41z" />
+<glyph unicode="&#x2a76;" horiz-adv-x="3046" d="M2898 782q0 -41 -37 -41h-678q-39 0 -39 41t39 41h678q37 0 37 -41zM2898 382q0 -41 -37 -41h-678q-39 0 -39 41t39 41h678q37 0 37 -41zM1900 782q0 -41 -37 -41h-678q-39 0 -39 41t39 41h678q37 0 37 -41zM1900 382q0 -41 -37 -41h-678q-39 0 -39 41t39 41h678 q37 0 37 -41zM902 782q0 -41 -37 -41h-678q-39 0 -39 41t39 41h678q37 0 37 -41zM902 382q0 -41 -37 -41h-678q-39 0 -39 41t39 41h678q37 0 37 -41z" />
+<glyph unicode="&#x2a77;" horiz-adv-x="1592" d="M1422 782q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1422 382q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1175.5 11.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM575.5 11.5q33.5 -33.5 33.5 -80 t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM1176 1312q33 -33 33 -79.5t-33.5 -80t-80 -33.5t-79.5 33t-33 80t33 80t80 33t80 -33zM576 1312q33 -33 33 -79.5t-33.5 -80t-80 -33.5t-79.5 33t-33 80t33 80t80 33t80 -33z" />
+<glyph unicode="&#x2a78;" horiz-adv-x="1592" d="M1422 982q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1422 582q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1422 182q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1389 1512q33 -33 33 -79.5t-33.5 -80t-80 -33.5 t-79.5 33t-33 80t33 80t80 33t80 -33zM1047 1512q33 -33 33 -79.5t-33.5 -80t-80 -33.5t-79.5 33t-33 80t33 80t80 33t80 -33zM705 1512q33 -33 33 -79.5t-33.5 -80t-80 -33.5t-79.5 33t-33 80t33 80t80 33t80 -33zM363 1512q33 -33 33 -79.5t-33.5 -80t-80 -33.5t-79.5 33 t-33 80t33 80t80 33t80 -33z" />
+<glyph unicode="&#x2a79;" horiz-adv-x="1591" d="M1421 31q0 -41 -41 -41q-8 0 -14 3l-1169 552q-27 13 -27 37t27 37l1169 552q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-1090 -514l1090 -514q24 -11 24 -37zM1354 741q66 -67 66 -158t-67 -157t-157.5 -66t-157 65.5t-66.5 156.5t66.5 158.5t158 67.5t157.5 -67zM1299 480.5 q44 43.5 44 102.5t-44 103.5t-103 44.5t-103 -44.5t-44 -103.5t44 -102.5t103 -43.5t103 43.5z" />
+<glyph unicode="&#x2a7a;" horiz-adv-x="1591" d="M1421 582q0 -24 -27 -37l-1169 -552q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l1090 514l-1090 514q-24 11 -24 37q0 41 41 41q8 0 14 -3l1169 -552q27 -13 27 -37zM619 582q0 -91 -66.5 -156.5t-157 -65.5t-157.5 66t-67 157t66 158t157.5 67t158 -67.5t66.5 -158.5z M498 480.5q44 43.5 44 102.5t-44 103.5t-103 44.5t-103 -44.5t-44 -103.5t44 -102.5t103 -43.5t103 43.5z" />
+<glyph unicode="&#x2a7b;" horiz-adv-x="1591" d="M1421 31q0 -41 -41 -41q-8 0 -14 3l-1169 552q-27 13 -27 37t27 37l1169 552q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-1090 -514l1090 -514q24 -11 24 -37zM267 1384q-55 0 -55 73t55 111t129 38t128.5 -41t54.5 -115t-65 -151q-88 -104 -103 -135.5t-18 -91.5h-21 q3 63 13.5 97.5t56 124.5t45.5 146t-31 97t-86 41q-93 0 -93 -65q0 -17 15 -45.5t15 -41.5q0 -42 -40 -42zM386 1010q56 0 56 -55.5t-56 -55.5t-56 55.5t56 55.5z" />
+<glyph unicode="&#x2a7c;" horiz-adv-x="1591" d="M1421 582q0 -24 -27 -37l-1169 -552q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l1090 514l-1090 514q-24 11 -24 37q0 41 41 41q8 0 14 -3l1169 -552q27 -13 27 -37zM1067 1384q-55 0 -55 73t55 111t129 38t128.5 -41t54.5 -115t-65 -151q-88 -104 -103 -135.5t-18 -91.5h-21 q3 63 13.5 97.5t56 124.5t45.5 146t-31 97t-86 41q-93 0 -93 -65q0 -17 15 -45.5t15 -41.5q0 -42 -40 -42zM1186 1010q56 0 56 -55.5t-56 -55.5t-56 55.5t56 55.5z" />
+<glyph unicode="&#x2a7d;" horiz-adv-x="1591" d="M1421 31q0 -41 -41 -41q-10 0 -14 2l-1169 553q-27 13 -27 37.5t20 33.5l1176 555q4 5 14 5q41 0 41 -41q0 -26 -18 -35l-1096 -518l1090 -514q24 -11 24 -37zM1421 -367q0 -41 -41 -41q-8 0 -14 3l-1176 555q-20 9 -20 34q0 41 41 41q12 0 16 -2l1176 -555q18 -8 18 -35 z" />
+<glyph unicode="&#x2a7e;" horiz-adv-x="1591" d="M1401 616q20 -9 20 -33.5t-27 -37.5l-1169 -553q-4 -2 -14 -2q-41 0 -41 41q0 26 24 37l1090 514l-1096 518q-18 9 -18 35q0 41 41 41q10 0 14 -5zM1421 184q0 -25 -20 -34l-1176 -555q-6 -3 -14 -3q-41 0 -41 41q0 27 18 35l1176 555q4 2 16 2q41 0 41 -41z" />
+<glyph unicode="&#x2a7f;" horiz-adv-x="1591" d="M1421 31q0 -41 -41 -41q-10 0 -14 2l-1169 553q-27 13 -27 37.5t20 33.5l1176 555q4 5 14 5q41 0 41 -41q0 -26 -18 -35l-1096 -518l1090 -514q24 -11 24 -37zM1421 -367q0 -41 -41 -41q-8 0 -14 3l-1176 555q-20 9 -20 34q0 41 41 41q12 0 16 -2l1176 -555q18 -8 18 -35 zM1335.5 661.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5z" />
+<glyph unicode="&#x2a80;" horiz-adv-x="1591" d="M1401 616q20 -9 20 -33.5t-27 -37.5l-1169 -553q-4 -2 -14 -2q-41 0 -41 41q0 26 24 37l1090 514l-1096 518q-18 9 -18 35q0 41 41 41q10 0 14 -5zM1421 184q0 -25 -20 -34l-1176 -555q-6 -3 -14 -3q-41 0 -41 41q0 27 18 35l1176 555q4 2 16 2q41 0 41 -41zM414.5 661.5 q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5z" />
+<glyph unicode="&#x2a81;" horiz-adv-x="1591" d="M1421 31q0 -41 -41 -41q-10 0 -14 2l-1169 553q-27 13 -27 37.5t20 33.5l1176 555q4 5 14 5q41 0 41 -41q0 -26 -18 -35l-1096 -518l1090 -514q24 -11 24 -37zM1421 -367q0 -41 -41 -41q-8 0 -14 3l-1176 555q-20 9 -20 34q0 41 41 41q12 0 16 -2l1176 -555q18 -8 18 -35 zM362.5 1161.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5z" />
+<glyph unicode="&#x2a82;" horiz-adv-x="1591" d="M1401 616q20 -9 20 -33.5t-27 -37.5l-1169 -553q-4 -2 -14 -2q-41 0 -41 41q0 26 24 37l1090 514l-1096 518q-18 9 -18 35q0 41 41 41q10 0 14 -5zM1421 184q0 -25 -20 -34l-1176 -555q-6 -3 -14 -3q-41 0 -41 41q0 27 18 35l1176 555q4 2 16 2q41 0 41 -41z M1387.5 1161.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5z" />
+<glyph unicode="&#x2a83;" horiz-adv-x="1591" d="M1421 31q0 -41 -41 -41q-10 0 -14 2l-1169 553q-27 13 -27 37.5t20 33.5l1176 555q4 5 14 5q41 0 41 -41q0 -26 -18 -35l-1096 -518l1090 -514q24 -11 24 -37zM1421 -367q0 -41 -41 -41q-8 0 -14 3l-1176 555q-20 9 -20 34q0 41 41 41q12 0 16 -2l1176 -555q18 -8 18 -35 zM1362.5 1561.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5z" />
+<glyph unicode="&#x2a84;" horiz-adv-x="1591" d="M1401 616q20 -9 20 -33.5t-27 -37.5l-1169 -553q-4 -2 -14 -2q-41 0 -41 41q0 26 24 37l1090 514l-1096 518q-18 9 -18 35q0 41 41 41q10 0 14 -5zM1421 184q0 -25 -20 -34l-1176 -555q-6 -3 -14 -3q-41 0 -41 41q0 27 18 35l1176 555q4 2 16 2q41 0 41 -41z M387.5 1561.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5z" />
+<glyph unicode="&#x2a85;" horiz-adv-x="1591" d="M1421 463q0 -41 -41 -41q-8 0 -14 3l-1169 552q-27 13 -27 37t27 37l1169 552q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-1090 -514l1090 -514q24 -11 24 -37zM1477 310q0 -158 -103 -250t-236.5 -92t-346 142t-334.5 142t-202.5 -71.5t-80.5 -153.5q0 -59 -29.5 -59 t-29.5 59q0 156 104 248t237.5 92t345.5 -141.5t334.5 -141.5t203 72t80.5 154q0 57 28.5 57t28.5 -57zM1477 -100q0 -158 -103 -250t-236.5 -92t-346 142t-334.5 142t-202.5 -71.5t-80.5 -153.5q0 -59 -29.5 -59t-29.5 59q0 156 104 248t237.5 92t345.5 -141.5 t334.5 -141.5t203 72t80.5 154q0 57 28.5 57t28.5 -57z" />
+<glyph unicode="&#x2a86;" horiz-adv-x="1591" d="M1421 1014q0 -24 -27 -37l-1169 -552q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l1090 514l-1090 514q-24 11 -24 37q0 41 41 41q8 0 14 -3l1169 -552q27 -13 27 -37zM1477 310q0 -158 -103 -250t-236.5 -92t-346 142t-334.5 142t-202.5 -71.5t-80.5 -153.5q0 -59 -29.5 -59 t-29.5 59q0 156 104 248t237.5 92t345.5 -141.5t334.5 -141.5t203 72t80.5 154q0 57 28.5 57t28.5 -57zM1477 -100q0 -158 -103 -250t-236.5 -92t-346 142t-334.5 142t-202.5 -71.5t-80.5 -153.5q0 -59 -29.5 -59t-29.5 59q0 156 104 248t237.5 92t345.5 -141.5 t334.5 -141.5t203 72t80.5 154q0 57 28.5 57t28.5 -57z" />
+<glyph unicode="&#x2a87;" horiz-adv-x="1591" d="M1421 31q0 -41 -41 -41q-8 0 -14 3l-1169 552q-27 13 -27 37t27 37l1169 552q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-1090 -514l1090 -514q24 -11 24 -37zM1421 -259q0 -41 -37 -41h-574l-177 -133q-12 -9 -25 -9q-42 0 -42 43q0 19 17 32l90 67h-464q-39 0 -39 41t39 41 h573l176 133q12 8 25 8q42 0 42 -42q0 -19 -17 -32l-89 -67h465q37 0 37 -41z" />
+<glyph unicode="&#x2a88;" horiz-adv-x="1591" d="M1421 582q0 -24 -27 -37l-1169 -552q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l1090 514l-1090 514q-24 11 -24 37q0 41 41 41q8 0 14 -3l1169 -552q27 -13 27 -37zM1421 -259q0 -41 -37 -41h-574l-177 -133q-12 -9 -25 -9q-42 0 -42 43q0 19 17 32l90 67h-464q-39 0 -39 41 t39 41h573l176 133q12 8 25 8q42 0 42 -42q0 -19 -17 -32l-89 -67h465q37 0 37 -41z" />
+<glyph unicode="&#x2a89;" horiz-adv-x="1591" d="M1421 463q0 -41 -41 -41q-8 0 -14 3l-1169 552q-27 13 -27 37t27 37l1169 552q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-1090 -514l1090 -514q24 -11 24 -37zM1477 -100q0 -158 -103 -250t-226 -92t-255 77l-221 141l-199 -205q-12 -13 -29 -13q-42 0 -42 42q0 16 13 28 l180 186q-71 28 -138 28q-122 0 -202.5 -71.5t-80.5 -153.5q0 -59 -29.5 -59t-29.5 59q0 156 104 248t238 92q102 0 217 -62l173 179q-180 115 -188 119q-108 59 -216 59t-188.5 -71.5t-80.5 -153.5q0 -59 -29.5 -59t-29.5 59q0 156 104 248t227 92t255 -77l220 -140 l198 203q12 13 29 13q42 0 42 -42q0 -15 -13 -28l-178 -184q71 -28 138 -28q122 0 202.5 72t80.5 154q0 57 28.5 57t28.5 -57q0 -158 -103 -250t-237 -92q-102 0 -218 62l-173 -178q179 -114 188 -119q108 -59 216.5 -59t189 72t80.5 154q0 57 28.5 57t28.5 -57z" />
+<glyph unicode="&#x2a8a;" horiz-adv-x="1591" d="M1421 1014q0 -24 -27 -37l-1169 -552q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l1090 514l-1090 514q-24 11 -24 37q0 41 41 41q8 0 14 -3l1169 -552q27 -13 27 -37zM1477 -100q0 -158 -103 -250t-226 -92t-255 77l-221 141l-199 -205q-12 -13 -29 -13q-42 0 -42 42 q0 16 13 28l180 186q-71 28 -138 28q-122 0 -202.5 -71.5t-80.5 -153.5q0 -59 -29.5 -59t-29.5 59q0 156 104 248t238 92q102 0 217 -62l173 179q-180 115 -188 119q-108 59 -216 59t-188.5 -71.5t-80.5 -153.5q0 -59 -29.5 -59t-29.5 59q0 156 104 248t227 92t255 -77 l220 -140l198 203q12 13 29 13q42 0 42 -42q0 -15 -13 -28l-178 -184q71 -28 138 -28q122 0 202.5 72t80.5 154q0 57 28.5 57t28.5 -57q0 -158 -103 -250t-237 -92q-102 0 -218 62l-173 -178q179 -114 188 -119q108 -59 216.5 -59t189 72t80.5 154q0 57 28.5 57t28.5 -57z " />
+<glyph unicode="&#x2a8b;" horiz-adv-x="1591" d="M1421 732q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1421 432q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1421 900q0 -45 -39 -45q-4 0 -15 3l-1170 334q-27 8 -27 39t27 39l1170 334q7 2 13 2q41 0 41 -41q0 -32 -25 -39l-1032 -295 l1032 -295q25 -7 25 -36zM1421 -66q0 -31 -27 -39l-1170 -334q-11 -3 -15 -3q-39 0 -39 45q0 29 25 36l1032 295l-1032 295q-25 7 -25 39q0 41 41 41q6 0 13 -2l1170 -334q27 -8 27 -39z" />
+<glyph unicode="&#x2a8c;" horiz-adv-x="1591" d="M1421 732q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1421 432q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1421 1231q0 -31 -27 -39l-1170 -334q-11 -3 -15 -3q-39 0 -39 45q0 29 25 36l1032 295l-1032 295q-25 7 -25 39q0 41 41 41 q6 0 13 -2l1170 -334q27 -8 27 -39zM1421 -397q0 -45 -39 -45q-4 0 -15 3l-1170 334q-27 8 -27 39t27 39l1170 334q7 2 13 2q41 0 41 -41q0 -32 -25 -39l-1032 -295l1032 -295q25 -7 25 -36z" />
+<glyph unicode="&#x2a8d;" horiz-adv-x="1591" d="M1477 -318q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41zM1477 454q0 -152 -96 -271.5t-244 -119.5q-114 0 -238 88l-208 164q-123 88 -236 88q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q115 0 240 -88 l207 -164q124 -88 235 -88q85 0 156 50t104 130q15 36 21 98t30 62q29 0 29 -63zM1421 651q0 -45 -39 -45q-7 0 -15 3l-1170 434q-27 10 -27 39t27 39l1170 434q5 2 13 2q41 0 41 -41q0 -30 -25 -39l-1063 -395l1063 -395q25 -9 25 -36z" />
+<glyph unicode="&#x2a8e;" horiz-adv-x="1591" d="M1477 -318q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41zM1477 454q0 -152 -96 -271.5t-244 -119.5q-114 0 -238 88l-208 164q-123 88 -236 88q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q115 0 240 -88 l207 -164q124 -88 235 -88q85 0 156 50t104 130q15 36 21 98t30 62q29 0 29 -63zM1421 1082q0 -29 -27 -39l-1170 -434q-8 -3 -15 -3q-39 0 -39 45q0 27 25 36l1063 395l-1063 395q-25 9 -25 39q0 41 41 41q8 0 13 -2l1170 -434q27 -10 27 -39z" />
+<glyph unicode="&#x2a8f;" horiz-adv-x="1591" d="M1421 900q0 -45 -39 -45q-4 0 -15 3l-1170 334q-27 8 -27 39t27 39l1170 334q7 2 13 2q41 0 41 -41q0 -32 -25 -39l-1032 -295l1032 -295q25 -7 25 -36zM1477 705q0 -146 -96.5 -234.5t-236.5 -88.5t-352 142.5t-335 142.5q-101 0 -192 -55.5t-91 -150.5q0 -39 -29.5 -39 t-29.5 39q0 145 97.5 233t237.5 88t351.5 -142t335.5 -142q101 0 185 52q98 60 98 155q0 37 28.5 37t28.5 -37zM1421 -66q0 -31 -27 -39l-1170 -334q-11 -3 -15 -3q-39 0 -39 45q0 29 25 36l1032 295l-1032 295q-25 7 -25 39q0 41 41 41q6 0 13 -2l1170 -334q27 -8 27 -39z " />
+<glyph unicode="&#x2a90;" horiz-adv-x="1591" d="M1421 1231q0 -31 -27 -39l-1170 -334q-11 -3 -15 -3q-39 0 -39 45q0 29 25 36l1032 295l-1032 295q-25 7 -25 39q0 41 41 41q6 0 13 -2l1170 -334q27 -8 27 -39zM1477 705q0 -146 -96.5 -234.5t-236.5 -88.5t-352 142.5t-335 142.5q-101 0 -192 -55.5t-91 -150.5 q0 -39 -29.5 -39t-29.5 39q0 145 97.5 233t237.5 88t351.5 -142t335.5 -142q101 0 185 52q98 60 98 155q0 37 28.5 37t28.5 -37zM1421 -397q0 -45 -39 -45q-4 0 -15 3l-1170 334q-27 8 -27 39t27 39l1170 334q7 2 13 2q41 0 41 -41q0 -32 -25 -39l-1032 -295l1032 -295 q25 -7 25 -36z" />
+<glyph unicode="&#x2a91;" horiz-adv-x="1591" d="M1421 -101q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1421 -401q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1421 900q0 -45 -39 -45q-4 0 -15 3l-1170 334q-27 8 -27 39t27 39l1170 334q7 2 13 2q41 0 41 -41q0 -32 -25 -39 l-1032 -295l1032 -295q25 -7 25 -36zM1421 497q0 -31 -27 -39l-1170 -334q-7 -2 -13 -2q-41 0 -41 41q0 32 25 39l1032 295l-1032 295q-25 7 -25 36q0 45 39 45q4 0 15 -3l1170 -334q27 -8 27 -39z" />
+<glyph unicode="&#x2a92;" horiz-adv-x="1591" d="M1421 -101q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1421 -401q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1421 1231q0 -31 -27 -39l-1170 -334q-11 -3 -15 -3q-39 0 -39 45q0 29 25 36l1032 295l-1032 295q-25 7 -25 39q0 41 41 41 q6 0 13 -2l1170 -334q27 -8 27 -39zM1421 163q0 -41 -41 -41q-6 0 -13 2l-1170 334q-27 8 -27 39t27 39l1170 334q11 3 15 3q39 0 39 -45q0 -29 -25 -36l-1032 -295l1032 -295q25 -7 25 -39z" />
+<glyph unicode="&#x2a93;" horiz-adv-x="1591" d="M1421 881q0 -41 -41 -41q-7 0 -14 2l-1169 343q-27 8 -27 36.5t20 34.5l1176 345q17 5 19 5q36 0 36 -41q0 -30 -18 -35l-1047 -307l1041 -305q24 -7 24 -37zM1421 583q0 -41 -41 -41q-4 0 -14 3l-1176 345q-20 6 -20 34q0 41 41 41q9 0 16 -2l1176 -345q18 -5 18 -35z M1401 272q20 -6 20 -34.5t-27 -36.5l-1169 -343q-7 -2 -14 -2q-41 0 -41 41q0 30 24 37l1041 305l-1047 307q-18 5 -18 35q0 41 36 41q2 0 19 -5zM1421 -60q0 -28 -20 -34l-1176 -345q-10 -3 -14 -3q-41 0 -41 41q0 30 18 35l1176 345q7 2 16 2q41 0 41 -41z" />
+<glyph unicode="&#x2a94;" horiz-adv-x="1591" d="M1401 1256q20 -6 20 -34.5t-27 -36.5l-1169 -343q-7 -2 -14 -2q-41 0 -41 41q0 30 24 37l1041 305l-1047 307q-18 5 -18 35q0 41 36 41q2 0 19 -5zM1421 924q0 -28 -20 -34l-1176 -345q-10 -3 -14 -3q-41 0 -41 41q0 30 18 35l1176 345q7 2 16 2q41 0 41 -41zM1421 -103 q0 -41 -41 -41q-7 0 -14 2l-1169 343q-27 8 -27 36.5t20 34.5l1176 345q17 5 19 5q36 0 36 -41q0 -30 -18 -35l-1047 -307l1041 -305q24 -7 24 -37zM1421 -401q0 -41 -41 -41q-4 0 -14 3l-1176 345q-20 6 -20 34q0 41 41 41q9 0 16 -2l1176 -345q18 -5 18 -35z" />
+<glyph unicode="&#x2a95;" horiz-adv-x="1591" d="M1421 1333q0 -27 -18 -35l-1176 -555q-4 -2 -16 -2q-41 0 -41 41q0 25 20 34l1176 555q6 3 14 3q41 0 41 -41zM1421 -169q0 -41 -41 -41q-10 0 -14 5l-1176 555q-20 9 -20 33.5t27 37.5l1169 553q4 2 14 2q41 0 41 -41q0 -26 -24 -37l-1090 -514l1096 -518q18 -9 18 -35z " />
+<glyph unicode="&#x2a96;" horiz-adv-x="1591" d="M1421 782q0 -41 -41 -41q-12 0 -16 2l-1176 555q-18 8 -18 35q0 41 41 41q8 0 14 -3l1176 -555q20 -9 20 -34zM1394 421q27 -13 27 -37.5t-20 -33.5l-1176 -555q-4 -5 -14 -5q-41 0 -41 41q0 26 18 35l1096 518l-1090 514q-24 11 -24 37q0 41 41 41q10 0 14 -2z" />
+<glyph unicode="&#x2a97;" horiz-adv-x="1591" d="M1421 1333q0 -27 -18 -35l-1176 -555q-4 -2 -16 -2q-41 0 -41 41q0 25 20 34l1176 555q6 3 14 3q41 0 41 -41zM1421 -169q0 -41 -41 -41q-10 0 -14 5l-1176 555q-20 9 -20 33.5t27 37.5l1169 553q4 2 14 2q41 0 41 -41q0 -26 -24 -37l-1090 -514l1096 -518q18 -9 18 -35z M1336 464q33 -33 33 -79.5t-33.5 -80t-80 -33.5t-79.5 33t-33 80t33 80t80 33t80 -33z" />
+<glyph unicode="&#x2a98;" horiz-adv-x="1591" d="M1421 782q0 -41 -41 -41q-12 0 -16 2l-1176 555q-18 8 -18 35q0 41 41 41q8 0 14 -3l1176 -555q20 -9 20 -34zM1394 421q27 -13 27 -37.5t-20 -33.5l-1176 -555q-4 -5 -14 -5q-41 0 -41 41q0 26 18 35l1096 518l-1090 514q-24 11 -24 37q0 41 41 41q10 0 14 -2zM415 464 q33 -33 33 -79.5t-33.5 -80t-80 -33.5t-79.5 33t-33 80t33 80t80 33t80 -33z" />
+<glyph unicode="&#x2a99;" horiz-adv-x="1591" d="M1421 -259q0 -41 -41 -41q-8 0 -14 3l-1169 552q-27 13 -27 37t27 37l1169 552q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-1090 -514l1090 -514q24 -11 24 -37zM1421 1133q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1421 1433q0 -41 -37 -41h-1175 q-39 0 -39 41t39 41h1175q37 0 37 -41z" />
+<glyph unicode="&#x2a9a;" horiz-adv-x="1591" d="M1421 292q0 -24 -27 -37l-1169 -552q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l1090 514l-1090 514q-24 11 -24 37q0 41 41 41q8 0 14 -3l1169 -552q27 -13 27 -37zM1421 1133q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1421 1433q0 -41 -37 -41h-1175 q-39 0 -39 41t39 41h1175q37 0 37 -41z" />
+<glyph unicode="&#x2a9b;" horiz-adv-x="1591" d="M1421 1135q0 -27 -18 -35l-1176 -555q-4 -2 -16 -2q-41 0 -41 41q0 25 20 34l1176 555q6 3 14 3q41 0 41 -41zM1421 -367q0 -41 -41 -41q-10 0 -14 5l-1176 555q-20 9 -20 33.5t27 37.5l1169 553q4 2 14 2q41 0 41 -41q0 -26 -24 -37l-1090 -514l1096 -518q18 -9 18 -35z M1421 1532q0 -27 -18 -35l-1176 -555q-4 -2 -16 -2q-41 0 -41 41q0 25 20 34l1176 555q6 3 14 3q41 0 41 -41z" />
+<glyph unicode="&#x2a9c;" horiz-adv-x="1591" d="M1421 584q0 -41 -41 -41q-12 0 -16 2l-1176 555q-18 8 -18 35q0 41 41 41q8 0 14 -3l1176 -555q20 -9 20 -34zM1394 223q27 -13 27 -37.5t-20 -33.5l-1176 -555q-4 -5 -14 -5q-41 0 -41 41q0 26 18 35l1096 518l-1090 514q-24 11 -24 37q0 41 41 41q10 0 14 -2zM1421 981 q0 -41 -41 -41q-12 0 -16 2l-1176 555q-18 8 -18 35q0 41 41 41q8 0 14 -3l1176 -555q20 -9 20 -34z" />
+<glyph unicode="&#x2a9d;" horiz-adv-x="1591" d="M1477 1411q0 -152 -96 -271.5t-244 -119.5q-114 0 -238 88l-208 164q-123 88 -236 88q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q115 0 240 -88l207 -164q124 -88 235 -88q85 0 156 50t104 130q15 36 21 98t30 62 q29 0 29 -63zM1421 -304q0 -41 -41 -41q-8 0 -14 3l-1169 552q-27 13 -27 37t27 37l1169 552q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-1090 -514l1090 -514q24 -11 24 -37z" />
+<glyph unicode="&#x2a9e;" horiz-adv-x="1591" d="M1477 1411q0 -152 -96 -271.5t-244 -119.5q-114 0 -238 88l-208 164q-123 88 -236 88q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q115 0 240 -88l207 -164q124 -88 235 -88q85 0 156 50t104 130q15 36 21 98t30 62 q29 0 29 -63zM1421 247q0 -24 -27 -37l-1169 -552q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l1090 514l-1090 514q-24 11 -24 37q0 41 41 41q8 0 14 -3l1169 -552q27 -13 27 -37z" />
+<glyph unicode="&#x2a9f;" horiz-adv-x="1591" d="M1421 -101q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1421 -401q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1477 1529q0 -146 -96.5 -234.5t-236.5 -88.5t-352 142.5t-335 142.5q-101 0 -192 -55.5t-91 -150.5q0 -39 -29.5 -39 t-29.5 39q0 145 97.5 233t237.5 88t351.5 -142t335.5 -142q101 0 185 52q98 60 98 155q0 37 28.5 37t28.5 -37zM1421 81q0 -41 -41 -41q-7 0 -14 3l-1169 502q-27 12 -27 37t27 37l1169 502q7 3 14 3q41 0 41 -41q0 -27 -24 -37l-1081 -464l1081 -464q24 -10 24 -37z" />
+<glyph unicode="&#x2aa0;" horiz-adv-x="1591" d="M1421 -101q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1421 -401q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1477 1529q0 -146 -96.5 -234.5t-236.5 -88.5t-352 142.5t-335 142.5q-101 0 -192 -55.5t-91 -150.5q0 -39 -29.5 -39 t-29.5 39q0 145 97.5 233t237.5 88t351.5 -142t335.5 -142q101 0 185 52q98 60 98 155q0 37 28.5 37t28.5 -37zM1421 582q0 -25 -27 -37l-1169 -502q-7 -3 -14 -3q-41 0 -41 41q0 27 24 37l1081 464l-1081 464q-24 10 -24 37q0 41 41 41q7 0 14 -3l1169 -502q27 -12 27 -37z " />
+<glyph unicode="&#x2aa1;" horiz-adv-x="1591" d="M1421 314q0 -41 -41 -41q-10 0 -14 2l-569 270q-27 13 -27 37.5t20 33.5l576 272q8 4 14 4q41 0 41 -41q0 -27 -18 -35l-496 -234l490 -231q24 -11 24 -37zM1421 31q0 -41 -41 -41q-10 0 -14 2l-1169 553q-27 13 -27 37.5t20 33.5l1176 556q8 4 14 4q41 0 41 -41 q0 -26 -18 -35l-1096 -518l1090 -514q24 -11 24 -37z" />
+<glyph unicode="&#x2aa2;" horiz-adv-x="1591" d="M1401 616q20 -9 20 -33.5t-27 -37.5l-1169 -553q-4 -2 -14 -2q-41 0 -41 41q0 26 24 37l1090 514l-1096 518q-18 9 -18 35q0 41 41 41q6 0 14 -4zM801 616q20 -9 20 -33.5t-27 -37.5l-569 -270q-4 -2 -14 -2q-41 0 -41 41q0 26 24 37l490 231l-496 234q-18 8 -18 35 q0 41 41 41q6 0 14 -4z" />
+<glyph unicode="&#x2aa3;" horiz-adv-x="2211" d="M1421 31q0 -41 -41 -41q-8 0 -14 3l-1169 552q-27 13 -27 37t27 37l1169 552q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-1090 -514l1090 -514q24 -11 24 -37zM2041 31q0 -41 -41 -41q-8 0 -14 3l-1169 552q-27 13 -27 37t27 37l1169 552q6 3 14 3q41 0 41 -41q0 -26 -24 -37 l-1090 -514l1090 -514q24 -11 24 -37zM2041 -318q0 -41 -37 -41h-1795q-39 0 -39 41t39 41h1795q37 0 37 -41z" />
+<glyph unicode="&#x2aa4;" horiz-adv-x="1591" d="M1421 31q0 -41 -41 -41q-8 0 -14 3l-570 269l-571 -269q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l507 239l-504 238q-27 13 -27 37t27 37l504 238l-507 239q-24 11 -24 37q0 41 41 41q8 0 14 -3l570 -269l571 269q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-507 -239l504 -238 q27 -13 27 -37t-27 -37l-504 -238l507 -239q24 -11 24 -37zM1284 582l-488 230l-489 -230l489 -230z" />
+<glyph unicode="&#x2aa5;" horiz-adv-x="2891" d="M1421 582q0 -24 -27 -37l-1169 -552q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l1090 514l-1090 514q-24 11 -24 37q0 41 41 41q8 0 14 -3l1169 -552q27 -13 27 -37zM2721 31q0 -41 -41 -41q-8 0 -14 3l-1169 552q-27 13 -27 37t27 37l1169 552q6 3 14 3q41 0 41 -41 q0 -26 -24 -37l-1090 -514l1090 -514q24 -11 24 -37z" />
+<glyph unicode="&#x2aa6;" horiz-adv-x="1742" d="M1416 1152q156 -265 156 -567.5t-155 -570.5q-14 -24 -37 -24q-8 0 -14 3l-1169 552q-27 13 -27 37t27 37l1169 552q6 3 14 3q24 0 36 -22zM1363 84q127 233 127 498.5t-127 497.5l-1056 -498z" />
+<glyph unicode="&#x2aa7;" horiz-adv-x="1742" d="M1572 582q0 -24 -27 -37l-1169 -552q-6 -3 -14 -3q-23 0 -37 24q-155 268 -155 570.5t156 567.5q12 22 36 22q8 0 14 -3l1169 -552q27 -13 27 -37zM379 1080q-127 -232 -127 -497.5t127 -498.5l1056 498z" />
+<glyph unicode="&#x2aa8;" horiz-adv-x="1742" d="M1416 1152q156 -265 156 -567.5t-155 -570.5q-14 -24 -37 -24q-8 0 -14 3l-1169 552q-27 13 -27 37t27 37l1169 552q6 3 14 3q24 0 36 -22zM1363 84q127 233 127 498.5t-127 497.5l-1056 -498zM1421 -367q0 -41 -41 -41q-8 0 -14 3l-1176 555q-20 9 -20 34q0 41 41 41 q12 0 16 -2l1176 -555q18 -8 18 -35z" />
+<glyph unicode="&#x2aa9;" horiz-adv-x="1742" d="M1572 582q0 -24 -27 -37l-1169 -552q-6 -3 -14 -3q-23 0 -37 24q-155 268 -155 570.5t156 567.5q12 22 36 22q8 0 14 -3l1169 -552q27 -13 27 -37zM379 1080q-127 -232 -127 -497.5t127 -498.5l1056 498zM1572 184q0 -25 -20 -34l-1176 -555q-6 -3 -14 -3q-41 0 -41 41 q0 27 18 35l1176 555q4 2 16 2q41 0 41 -41z" />
+<glyph unicode="&#x2aaa;" horiz-adv-x="1591" d="M1421 31q0 -41 -41 -41q-8 0 -14 3l-1169 552q-27 13 -27 37t27 37l1169 552q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-1003 -473h988q39 0 39 -41t-39 -41h-988l1003 -473q24 -11 24 -37z" />
+<glyph unicode="&#x2aab;" horiz-adv-x="1591" d="M1421 582q0 -24 -27 -37l-1169 -552q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l1003 473h-988q-39 0 -39 41t39 41h988l-1003 473q-24 11 -24 37q0 41 41 41q8 0 14 -3l1169 -552q27 -13 27 -37z" />
+<glyph unicode="&#x2aac;" horiz-adv-x="1591" d="M1421 31q0 -41 -41 -41q-8 0 -14 3l-1169 552q-27 13 -27 37t27 37l1169 552q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-1003 -473h988q39 0 39 -41t-39 -41h-988l1003 -473q24 -11 24 -37zM1421 -259q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41z" />
+<glyph unicode="&#x2aad;" horiz-adv-x="1591" d="M1421 582q0 -24 -27 -37l-1169 -552q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l1003 473h-988q-39 0 -39 41t39 41h988l-1003 473q-24 11 -24 37q0 41 41 41q8 0 14 -3l1169 -552q27 -13 27 -37zM1421 -259q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41z" />
+<glyph unicode="&#x2aae;" horiz-adv-x="1592" d="M1422 582q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1422 182q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1422 982q0 -41 -37 -41h-336q-13 0 -25 13t-12 26q0 87 -64 152t-152 65t-151 -64t-63 -153q0 -39 -39 -39h-334q-39 0 -39 41 t39 41h293q17 111 100 183.5t193.5 72.5t195.5 -74t99 -182h295q37 0 37 -41z" />
+<glyph unicode="&#x2aaf;" horiz-adv-x="1591" d="M1421 35q0 -45 -41 -45q-34 0 -41 39q-28 180 -141.5 282t-284.5 152q-268 78 -704 78q-39 0 -39 41t39 41q436 0 706 80q173 51 285 152t139 284q6 37 41 37q41 0 41 -43q0 -22 -12 -76q-42 -188 -196 -297q-178 -126 -455 -178q269 -47 453 -177q156 -110 198 -295 q12 -52 12 -75zM1421 -259q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41z" />
+<glyph unicode="&#x2ab0;" horiz-adv-x="1591" d="M1421 -259q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1421 582q0 -41 -37 -41q-267 0 -500 -31.5t-415.5 -142.5t-216.5 -338q-6 -39 -41 -39q-41 0 -41 45q0 12 8 53q25 130 106 225q172 203 550 269q-435 77 -590 327q-74 119 -74 224q0 43 41 43 q35 0 41 -37q35 -232 215 -342t418.5 -142t498.5 -32q37 0 37 -41z" />
+<glyph unicode="&#x2ab1;" horiz-adv-x="1591" d="M1421 35q0 -45 -41 -45q-34 0 -41 39q-28 180 -141.5 282t-284.5 152q-268 78 -704 78q-39 0 -39 41t39 41q436 0 706 80q173 51 285 152t139 284q6 37 41 37q41 0 41 -43q0 -22 -12 -76q-42 -188 -196 -297q-178 -126 -455 -178q269 -47 453 -177q156 -110 198 -295 q12 -52 12 -75zM1421 -259q0 -41 -37 -41h-574l-177 -133q-12 -9 -25 -9q-42 0 -42 43q0 19 17 32l90 67h-464q-39 0 -39 41t39 41h573l176 133q12 8 25 8q42 0 42 -42q0 -19 -17 -32l-89 -67h465q37 0 37 -41z" />
+<glyph unicode="&#x2ab2;" horiz-adv-x="1591" d="M1421 582q0 -41 -37 -41q-267 0 -500 -31.5t-415.5 -142.5t-216.5 -338q-6 -39 -41 -39q-41 0 -41 45q0 12 8 53q25 130 106 225q172 203 550 269q-435 77 -590 327q-74 119 -74 224q0 43 41 43q35 0 41 -37q35 -232 215 -342t418.5 -142t498.5 -32q37 0 37 -41z M1421 -259q0 -41 -37 -41h-574l-177 -133q-12 -9 -25 -9q-42 0 -42 43q0 19 17 32l90 67h-464q-39 0 -39 41t39 41h573l176 133q12 8 25 8q42 0 42 -42q0 -19 -17 -32l-89 -67h465q37 0 37 -41z" />
+<glyph unicode="&#x2ab3;" horiz-adv-x="1591" d="M1421 335q0 -45 -41 -45q-34 0 -41 39q-28 180 -141.5 282t-284.5 152q-268 78 -704 78q-39 0 -39 41t39 41q436 0 706 80q173 51 285 152t139 284q6 37 41 37q41 0 41 -43q0 -22 -12 -76q-42 -188 -196 -297q-178 -126 -455 -178q269 -47 453 -177q156 -110 198 -295 q12 -52 12 -75zM1421 41q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1421 -259q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41z" />
+<glyph unicode="&#x2ab4;" horiz-adv-x="1591" d="M1421 41q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1421 -259q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1421 882q0 -41 -37 -41q-267 0 -500 -31.5t-415.5 -142.5t-216.5 -338q-6 -39 -41 -39q-41 0 -41 45q0 12 8 53 q25 130 106 225q172 203 550 269q-435 77 -590 327q-74 119 -74 224q0 43 41 43q35 0 41 -37q35 -232 215 -342t418.5 -142t498.5 -32q37 0 37 -41z" />
+<glyph unicode="&#x2ab5;" horiz-adv-x="1591" d="M1421 335q0 -45 -41 -45q-34 0 -41 39q-28 180 -141.5 282t-284.5 152q-268 78 -704 78q-39 0 -39 41t39 41q436 0 706 80q173 51 285 152t139 284q6 37 41 37q41 0 41 -43q0 -22 -12 -76q-42 -188 -196 -297q-178 -126 -455 -178q269 -47 453 -177q156 -110 198 -295 q12 -53 12 -75zM1421 -259q0 -41 -37 -41h-720l-127 -129q-13 -13 -29 -13q-42 0 -42 42q0 16 13 29l70 71h-340q-39 0 -39 41t39 41h421l216 218h-637q-39 0 -39 41t39 41h718l127 129q13 13 29 13q42 0 42 -42q0 -16 -13 -29l-70 -71h342q37 0 37 -41t-37 -41h-423 l-216 -218h639q37 0 37 -41z" />
+<glyph unicode="&#x2ab6;" horiz-adv-x="1591" d="M1421 882q0 -41 -37 -41q-267 0 -500 -31.5t-415.5 -142.5t-216.5 -338q-6 -39 -41 -39q-41 0 -41 45q0 12 8 53q25 130 106 225q172 203 550 269q-435 77 -590 327q-74 119 -74 224q0 43 41 43q35 0 41 -37q35 -232 215 -342t418.5 -142t498.5 -32q37 0 37 -41z M1421 -259q0 -41 -37 -41h-720l-127 -129q-13 -13 -29 -13q-42 0 -42 42q0 16 13 29l70 71h-340q-39 0 -39 41t39 41h421l216 218h-637q-39 0 -39 41t39 41h718l127 129q13 13 29 13q42 0 42 -42q0 -16 -13 -29l-70 -71h342q37 0 37 -41t-37 -41h-423l-216 -218h639 q37 0 37 -41z" />
+<glyph unicode="&#x2ab7;" horiz-adv-x="1591" d="M1421 465q0 -45 -41 -45q-34 0 -41 39q-28 180 -141.5 282t-284.5 152q-268 78 -704 78q-39 0 -39 41t39 41q436 0 706 80q173 51 285 152t139 284q6 37 41 37q41 0 41 -43q0 -22 -12 -76q-42 -188 -196 -297q-178 -126 -455 -178q269 -47 453 -177q156 -110 198 -295 q12 -53 12 -75zM1475 310q0 -158 -103 -250t-236.5 -92t-346 142t-334.5 142t-202.5 -71.5t-80.5 -153.5q0 -59 -29.5 -59t-29.5 59q0 156 104 248t237.5 92t345.5 -141.5t334.5 -141.5t203 72t80.5 154q0 57 28.5 57t28.5 -57zM1475 -100q0 -158 -103 -250t-236.5 -92 t-346 142t-334.5 142t-202.5 -71.5t-80.5 -153.5q0 -59 -29.5 -59t-29.5 59q0 156 104 248t237.5 92t345.5 -141.5t334.5 -141.5t203 72t80.5 154q0 57 28.5 57t28.5 -57z" />
+<glyph unicode="&#x2ab8;" horiz-adv-x="1591" d="M1421 1012q0 -41 -37 -41q-267 0 -500 -31.5t-415.5 -142.5t-216.5 -338q-6 -39 -41 -39q-41 0 -41 45q0 12 8 53q25 130 106 225q172 203 550 269q-435 77 -590 327q-74 119 -74 224q0 43 41 43q35 0 41 -37q35 -232 215 -342t418.5 -142t498.5 -32q37 0 37 -41z M1475 310q0 -158 -103 -250t-236.5 -92t-346 142t-334.5 142t-202.5 -71.5t-80.5 -153.5q0 -59 -29.5 -59t-29.5 59q0 156 104 248t237.5 92t345.5 -141.5t334.5 -141.5t203 72t80.5 154q0 57 28.5 57t28.5 -57zM1475 -100q0 -158 -103 -250t-236.5 -92t-346 142t-334.5 142 t-202.5 -71.5t-80.5 -153.5q0 -59 -29.5 -59t-29.5 59q0 156 104 248t237.5 92t345.5 -141.5t334.5 -141.5t203 72t80.5 154q0 57 28.5 57t28.5 -57z" />
+<glyph unicode="&#x2ab9;" horiz-adv-x="1591" d="M1421 465q0 -45 -41 -45q-34 0 -41 39q-28 180 -141.5 282t-284.5 152q-268 78 -704 78q-39 0 -39 41t39 41q436 0 706 80q173 51 285 152t139 284q6 37 41 37q41 0 41 -43q0 -22 -12 -76q-42 -188 -196 -297q-178 -126 -455 -178q269 -47 453 -177q156 -110 198 -295 q12 -53 12 -75zM1475 -100q0 -158 -103 -250t-226 -92t-255 77l-221 141l-199 -205q-12 -13 -29 -13q-42 0 -42 42q0 16 13 28l180 186q-71 28 -138 28q-122 0 -202.5 -71.5t-80.5 -153.5q0 -59 -29.5 -59t-29.5 59q0 156 104 248t238 92q102 0 217 -62l173 179 q-180 115 -188 119q-108 59 -216 59t-188.5 -71.5t-80.5 -153.5q0 -59 -29.5 -59t-29.5 59q0 156 104 248t227 92t255 -77l220 -140l198 203q12 13 29 13q42 0 42 -42q0 -15 -13 -28l-178 -184q71 -28 138 -28q122 0 202.5 72t80.5 154q0 57 28.5 57t28.5 -57 q0 -158 -103 -250t-237 -92q-102 0 -218 62l-173 -178q179 -114 188 -119q108 -59 216.5 -59t189 72t80.5 154q0 57 28.5 57t28.5 -57z" />
+<glyph unicode="&#x2aba;" horiz-adv-x="1591" d="M1421 1012q0 -41 -37 -41q-267 0 -500 -31.5t-415.5 -142.5t-216.5 -338q-6 -39 -41 -39q-41 0 -41 45q0 12 8 53q25 130 106 225q172 203 550 269q-435 77 -590 327q-74 119 -74 224q0 43 41 43q35 0 41 -37q35 -232 215 -342t418.5 -142t498.5 -32q37 0 37 -41z M1475 -100q0 -158 -103 -250t-226 -92t-255 77l-221 141l-199 -205q-12 -13 -29 -13q-42 0 -42 42q0 16 13 28l180 186q-71 28 -138 28q-122 0 -202.5 -71.5t-80.5 -153.5q0 -59 -29.5 -59t-29.5 59q0 156 104 248t238 92q102 0 217 -62l173 179q-180 115 -188 119 q-108 59 -216 59t-188.5 -71.5t-80.5 -153.5q0 -59 -29.5 -59t-29.5 59q0 156 104 248t227 92t255 -77l220 -140l198 203q12 13 29 13q42 0 42 -42q0 -15 -13 -28l-178 -184q71 -28 138 -28q122 0 202.5 72t80.5 154q0 57 28.5 57t28.5 -57q0 -158 -103 -250t-237 -92 q-102 0 -218 62l-173 -178q179 -114 188 -119q108 -59 216.5 -59t189 72t80.5 154q0 57 28.5 57t28.5 -57z" />
+<glyph unicode="&#x2abb;" d="M1878 31q0 -43 -41 -43q-35 0 -41 37q-27 183 -139 284t-285 152q-270 80 -506 80q-39 0 -39 41t39 41q236 0 506 80q173 51 285 152t139 284q6 37 41 37q41 0 41 -43q0 -22 -12 -76q-42 -188 -196 -297q-178 -126 -455 -178q277 -52 455 -178q154 -109 196 -297 q12 -54 12 -76zM1221 31q0 -43 -41 -43q-35 0 -41 37q-27 183 -139 284t-285 152q-270 80 -506 80q-39 0 -39 41t39 41q236 0 506 80q173 51 285 152t139 284q6 37 41 37q41 0 41 -43q0 -22 -12 -76q-42 -188 -196 -297q-178 -126 -455 -178q277 -52 455 -178 q154 -109 196 -297q12 -54 12 -76z" />
+<glyph unicode="&#x2abc;" d="M1878 582q0 -41 -39 -41q-236 0 -506 -80q-173 -51 -285 -152t-139 -284q-6 -37 -41 -37q-41 0 -41 43q0 22 12 76q42 188 196 297q178 126 455 178q-277 52 -455 178q-154 109 -196 297q-12 54 -12 76q0 43 41 43q35 0 41 -37q27 -183 139 -284t285 -152 q270 -80 506 -80q39 0 39 -41zM1221 582q0 -41 -39 -41q-236 0 -506 -80q-173 -51 -285 -152t-139 -284q-6 -37 -41 -37q-41 0 -41 43q0 22 12 76q42 188 196 297q178 126 455 178q-277 52 -455 178q-154 109 -196 297q-12 54 -12 76q0 43 41 43q35 0 41 -37 q27 -183 139 -284t285 -152q270 -80 506 -80q39 0 39 -41z" />
+<glyph unicode="&#x2abd;" horiz-adv-x="1591" d="M1421 41q0 -41 -39 -41h-590q-248 0 -435 168.5t-187 413.5t187 413.5t435 168.5h590q39 0 39 -41t-39 -41h-584q-216 0 -381 -143.5t-165 -356.5t165 -356.5t381 -143.5h584q39 0 39 -41zM875 661.5q34 -33.5 34 -80t-33 -79.5t-80.5 -33t-80 33t-32.5 80t32.5 80t79 33 t80.5 -33.5z" />
+<glyph unicode="&#x2abe;" horiz-adv-x="1591" d="M1421 582q0 -245 -187 -413.5t-435 -168.5h-590q-39 0 -39 41t39 41h584q216 0 381 143.5t165 356.5t-165 356.5t-381 143.5h-584q-39 0 -39 41t39 41h590q248 0 435 -168.5t187 -413.5zM875 661.5q34 -33.5 34 -80t-33 -79.5t-80.5 -33t-80 33t-32.5 80t32.5 80t79 33 t80.5 -33.5z" />
+<glyph unicode="&#x2abf;" horiz-adv-x="1190" d="M1020 623q0 -41 -37 -41h-319q-201 0 -347.5 132t-146.5 330t146.5 330t347.5 132h319q37 0 37 -41t-37 -41h-319q-167 0 -289.5 -108t-122.5 -272t122.5 -272t289.5 -108h319q37 0 37 -41zM1020 83q0 -41 -37 -41h-347v-345q0 -39 -41 -39t-41 39v345h-345q-39 0 -39 41 t39 41h345v347q0 37 41 37t41 -37v-347h347q37 0 37 -41z" />
+<glyph unicode="&#x2ac0;" horiz-adv-x="1190" d="M1020 1044q0 -198 -146.5 -330t-347.5 -132h-319q-37 0 -37 41t37 41h319q167 0 289.5 108t122.5 272t-122.5 272t-289.5 108h-319q-37 0 -37 41t37 41h319q201 0 347.5 -132t146.5 -330zM1020 83q0 -41 -37 -41h-347v-345q0 -39 -41 -39t-41 39v345h-345q-39 0 -39 41 t39 41h345v347q0 37 41 37t41 -37v-347h347q37 0 37 -41z" />
+<glyph unicode="&#x2ac1;" horiz-adv-x="1190" d="M1020 623q0 -41 -37 -41h-319q-201 0 -347.5 132t-146.5 330t146.5 330t347.5 132h319q37 0 37 -41t-37 -41h-319q-167 0 -289.5 -108t-122.5 -272t122.5 -272t289.5 -108h319q37 0 37 -41zM969 399l-316 -316l315 -315q13 -13 13 -27t-15 -29t-29 -15t-27 13l-315 315 l-315 -315q-13 -13 -27 -13t-29 15t-15 29t13 27l315 315l-316 316q-12 12 -12 25q0 15 15 30t30 15q13 0 25 -12l316 -316l316 316q12 12 25 12q15 0 30 -15t15 -30q0 -13 -12 -25z" />
+<glyph unicode="&#x2ac2;" horiz-adv-x="1190" d="M1020 1044q0 -198 -146.5 -330t-347.5 -132h-319q-37 0 -37 41t37 41h319q167 0 289.5 108t122.5 272t-122.5 272t-289.5 108h-319q-37 0 -37 41t37 41h319q201 0 347.5 -132t146.5 -330zM969 399l-316 -316l315 -315q13 -13 13 -27t-15 -29t-29 -15t-27 13l-315 315 l-315 -315q-13 -13 -27 -13t-29 15t-15 29t13 27l315 315l-316 316q-12 12 -12 25q0 15 15 30t30 15q13 0 25 -12l316 -316l316 316q12 12 25 12q15 0 30 -15t15 -30q0 -13 -12 -25z" />
+<glyph unicode="&#x2ac3;" horiz-adv-x="1190" d="M1020 -261q0 -41 -37 -41h-774q-39 0 -39 41t39 41h774q37 0 37 -41zM754.5 1351.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM1020 41q0 -41 -37 -41h-319q-201 0 -347.5 132t-146.5 330t146.5 330t347.5 132h319q37 0 37 -41 t-37 -41h-319q-167 0 -289.5 -108t-122.5 -272t122.5 -272t289.5 -108h319q37 0 37 -41z" />
+<glyph unicode="&#x2ac4;" horiz-adv-x="1190" d="M1020 -261q0 -41 -37 -41h-774q-39 0 -39 41t39 41h774q37 0 37 -41zM754.5 1351.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM1020 462q0 -198 -146.5 -330t-347.5 -132h-319q-37 0 -37 41t37 41h319q167 0 289.5 108t122.5 272 t-122.5 272t-289.5 108h-319q-37 0 -37 41t37 41h319q201 0 347.5 -132t146.5 -330z" />
+<glyph unicode="&#x2ac5;" horiz-adv-x="1591" d="M1421 341q0 -41 -39 -41h-590q-248 0 -435 168.5t-187 413.5t187 413.5t435 168.5h590q39 0 39 -41t-39 -41h-584q-216 0 -381 -143.5t-165 -356.5t165 -356.5t381 -143.5h584q39 0 39 -41zM1421 41q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1421 -259 q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41z" />
+<glyph unicode="&#x2ac6;" horiz-adv-x="1591" d="M1421 882q0 -245 -187 -413.5t-435 -168.5h-590q-39 0 -39 41t39 41h584q216 0 381 143.5t165 356.5t-165 356.5t-381 143.5h-584q-39 0 -39 41t39 41h590q248 0 435 -168.5t187 -413.5zM1421 41q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1421 -259 q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41z" />
+<glyph unicode="&#x2ac7;" horiz-adv-x="1591" d="M1421 131q0 -41 -39 -41h-590q-248 0 -435 168.5t-187 413.5t187 413.5t435 168.5h590q39 0 39 -41t-39 -41h-584q-216 0 -381 -143.5t-165 -356.5t165 -356.5t381 -143.5h584q39 0 39 -41zM1421 -114q0 -137 -88 -232.5t-217 -95.5t-324 136.5t-299 136.5t-186.5 -62 t-82.5 -154q0 -57 -27 -57t-27 57q0 137 89 231.5t218 94.5t323.5 -136t299 -136t187 62.5t82.5 154.5q0 55 26 55t26 -55z" />
+<glyph unicode="&#x2ac8;" horiz-adv-x="1591" d="M1421 672q0 -245 -187 -413.5t-435 -168.5h-590q-39 0 -39 41t39 41h584q216 0 381 143.5t165 356.5t-165 356.5t-381 143.5h-584q-39 0 -39 41t39 41h590q248 0 435 -168.5t187 -413.5zM1421 -114q0 -137 -88 -232.5t-217 -95.5t-324 136.5t-299 136.5t-186.5 -62 t-82.5 -154q0 -57 -27 -57t-27 57q0 137 89 231.5t218 94.5t323.5 -136t299 -136t187 62.5t82.5 154.5q0 55 26 55t26 -55z" />
+<glyph unicode="&#x2ac9;" horiz-adv-x="1190" d="M1020 401q0 -41 -37 -41h-319q-201 0 -347.5 132t-146.5 330t146.5 330t347.5 132h319q37 0 37 -41t-37 -41h-319q-167 0 -289.5 -108t-122.5 -272t122.5 -272t289.5 -108h319q37 0 37 -41zM1020 196q0 -111 -53.5 -194.5t-158.5 -83.5q-84 0 -215.5 111.5t-207 111.5 t-117 -51t-41.5 -125q0 -47 -28.5 -47t-28.5 57q0 111 50 187q58 89 163 89q84 0 215.5 -111t207 -111t117.5 51.5t42 125.5q0 45 27.5 45t27.5 -55zM1020 -164q0 -111 -53.5 -194.5t-158.5 -83.5q-84 0 -215.5 111.5t-207 111.5t-117 -51t-41.5 -125q0 -47 -28.5 -47 t-28.5 57q0 111 50 187q58 89 163 89q84 0 215.5 -111t207 -111t117.5 51.5t42 125.5q0 45 27.5 45t27.5 -55z" />
+<glyph unicode="&#x2aca;" horiz-adv-x="1190" d="M1020 822q0 -198 -146.5 -330t-347.5 -132h-319q-37 0 -37 41t37 41h319q167 0 289.5 108t122.5 272t-122.5 272t-289.5 108h-319q-37 0 -37 41t37 41h319q201 0 347.5 -132t146.5 -330zM1020 196q0 -111 -53.5 -194.5t-158.5 -83.5q-84 0 -215.5 111.5t-207 111.5 t-117 -51t-41.5 -125q0 -47 -28.5 -47t-28.5 57q0 111 50 187q58 89 163 89q84 0 215.5 -111t207 -111t117.5 51.5t42 125.5q0 45 27.5 45t27.5 -55zM1020 -164q0 -111 -53.5 -194.5t-158.5 -83.5q-84 0 -215.5 111.5t-207 111.5t-117 -51t-41.5 -125q0 -47 -28.5 -47 t-28.5 57q0 111 50 187q58 89 163 89q84 0 215.5 -111t207 -111t117.5 51.5t42 125.5q0 45 27.5 45t27.5 -55z" />
+<glyph unicode="&#x2acb;" horiz-adv-x="1591" d="M1421 341q0 -41 -39 -41h-590q-248 0 -435 168.5t-187 413.5t187 413.5t435 168.5h590q39 0 39 -41t-39 -41h-584q-216 0 -381 -143.5t-165 -356.5t165 -356.5t381 -143.5h584q39 0 39 -41zM1421 -259q0 -41 -37 -41h-720l-127 -129q-13 -13 -29 -13q-42 0 -42 42 q0 16 13 29l70 71h-340q-39 0 -39 41t39 41h421l216 218h-637q-39 0 -39 41t39 41h718l127 129q13 13 29 13q42 0 42 -42q0 -16 -13 -29l-70 -71h342q37 0 37 -41t-37 -41h-423l-216 -218h639q37 0 37 -41z" />
+<glyph unicode="&#x2acc;" horiz-adv-x="1591" d="M1421 882q0 -245 -187 -413.5t-435 -168.5h-590q-39 0 -39 41t39 41h584q216 0 381 143.5t165 356.5t-165 356.5t-381 143.5h-584q-39 0 -39 41t39 41h590q248 0 435 -168.5t187 -413.5zM1421 -259q0 -41 -37 -41h-720l-127 -129q-13 -13 -29 -13q-42 0 -42 42 q0 16 13 29l70 71h-340q-39 0 -39 41t39 41h421l216 218h-637q-39 0 -39 41t39 41h718l127 129q13 13 29 13q42 0 42 -42q0 -16 -13 -29l-70 -71h342q37 0 37 -41t-37 -41h-423l-216 -218h639q37 0 37 -41z" />
+<glyph unicode="&#x2acd;" d="M1878 1123q0 -41 -37 -41h-1589v-1000h802q37 0 37 -41t-37 -41h-845q-39 0 -39 37v1090q0 37 39 37h1632q37 0 37 -41z" />
+<glyph unicode="&#x2ace;" d="M1878 37q0 -37 -39 -37h-845q-37 0 -37 41t37 41h802v1000h-1589q-37 0 -37 41t37 41h1632q39 0 39 -37v-1090z" />
+<glyph unicode="&#x2acf;" horiz-adv-x="1591" d="M1421 41q0 -41 -39 -41h-590q-248 0 -435 168.5t-187 413.5t187 413.5t435 168.5h590q39 0 39 -41v-1082zM1339 82v1000h-541q-216 0 -381 -143.5t-165 -356.5t165 -356.5t381 -143.5h541z" />
+<glyph unicode="&#x2ad0;" horiz-adv-x="1591" d="M1421 582q0 -245 -187 -413.5t-435 -168.5h-590q-39 0 -39 41v1082q0 41 39 41h590q248 0 435 -168.5t187 -413.5zM1339 582q0 213 -165 356.5t-381 143.5h-541v-1000h541q216 0 381 143.5t165 356.5z" />
+<glyph unicode="&#x2ad1;" horiz-adv-x="1591" d="M1421 41q0 -41 -39 -41h-590q-248 0 -435 168.5t-187 413.5t187 413.5t435 168.5h590q39 0 39 -41v-1082zM1339 82v1000h-541q-216 0 -381 -143.5t-165 -356.5t165 -356.5t381 -143.5h541zM1421 -318q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41z" />
+<glyph unicode="&#x2ad2;" horiz-adv-x="1591" d="M1421 582q0 -245 -187 -413.5t-435 -168.5h-590q-39 0 -39 41v1082q0 41 39 41h590q248 0 435 -168.5t187 -413.5zM1339 582q0 213 -165 356.5t-381 143.5h-541v-1000h541q216 0 381 143.5t165 356.5zM1421 -318q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175 q37 0 37 -41z" />
+<glyph unicode="&#x2ad3;" horiz-adv-x="1190" d="M1020 711q0 -41 -37 -41h-319q-201 0 -347.5 132t-146.5 330t146.5 330t347.5 132h319q37 0 37 -41t-37 -41h-319q-167 0 -289.5 -108t-122.5 -272t122.5 -272t289.5 -108h319q37 0 37 -41zM1020 32q0 -198 -146.5 -330t-347.5 -132h-319q-37 0 -37 41t37 41h319 q167 0 289.5 108t122.5 272t-122.5 272t-289.5 108h-319q-37 0 -37 41t37 41h319q201 0 347.5 -132t146.5 -330z" />
+<glyph unicode="&#x2ad4;" horiz-adv-x="1190" d="M1020 1132q0 -198 -146.5 -330t-347.5 -132h-319q-37 0 -37 41t37 41h319q167 0 289.5 108t122.5 272t-122.5 272t-289.5 108h-319q-37 0 -37 41t37 41h319q201 0 347.5 -132t146.5 -330zM1020 -389q0 -41 -37 -41h-319q-201 0 -347.5 132t-146.5 330t146.5 330 t347.5 132h319q37 0 37 -41t-37 -41h-319q-167 0 -289.5 -108t-122.5 -272t122.5 -272t289.5 -108h319q37 0 37 -41z" />
+<glyph unicode="&#x2ad5;" horiz-adv-x="1190" d="M1020 711q0 -41 -37 -41h-319q-201 0 -347.5 132t-146.5 330t146.5 330t347.5 132h319q37 0 37 -41t-37 -41h-319q-167 0 -289.5 -108t-122.5 -272t122.5 -272t289.5 -108h319q37 0 37 -41zM1020 -389q0 -41 -37 -41h-319q-201 0 -347.5 132t-146.5 330t146.5 330 t347.5 132h319q37 0 37 -41t-37 -41h-319q-167 0 -289.5 -108t-122.5 -272t122.5 -272t289.5 -108h319q37 0 37 -41z" />
+<glyph unicode="&#x2ad6;" horiz-adv-x="1190" d="M1020 1132q0 -198 -146.5 -330t-347.5 -132h-319q-37 0 -37 41t37 41h319q167 0 289.5 108t122.5 272t-122.5 272t-289.5 108h-319q-37 0 -37 41t37 41h319q201 0 347.5 -132t146.5 -330zM1020 32q0 -198 -146.5 -330t-347.5 -132h-319q-37 0 -37 41t37 41h319 q167 0 289.5 108t122.5 272t-122.5 272t-289.5 108h-319q-37 0 -37 41t37 41h319q201 0 347.5 -132t146.5 -330z" />
+<glyph unicode="&#x2ad7;" horiz-adv-x="2200" d="M2030 41q0 -41 -37 -41h-319q-201 0 -347.5 132t-146.5 330t146.5 330t347.5 132h319q37 0 37 -41t-37 -41h-319q-167 0 -289.5 -108t-122.5 -272t122.5 -272t289.5 -108h319q37 0 37 -41zM1020 462q0 -198 -146.5 -330t-347.5 -132h-319q-37 0 -37 41t37 41h319 q167 0 289.5 108t122.5 272t-122.5 272t-289.5 108h-319q-37 0 -37 41t37 41h319q201 0 347.5 -132t146.5 -330z" />
+<glyph unicode="&#x2ad8;" horiz-adv-x="2200" d="M2030 41q0 -41 -37 -41h-319q-189 0 -332.5 119t-159.5 302h-164q-16 -183 -159.5 -302t-332.5 -119h-319q-37 0 -37 41t37 41h319q155 0 274 95t136 244h-427q-39 0 -39 41t39 41h427q-17 149 -136 244t-274 95h-319q-37 0 -37 41t37 41h319q189 0 332.5 -119 t159.5 -302h164q16 183 159.5 302t332.5 119h319q37 0 37 -41t-37 -41h-319q-155 0 -274 -95t-136 -244h427q39 0 39 -41t-39 -41h-427q17 -149 136 -244t274 -95h319q37 0 37 -41z" />
+<glyph unicode="&#x2ad9;" horiz-adv-x="1364" d="M1264 37q0 -37 -41 -37t-41 37v358q0 201 -132 373t-327 172v-903q0 -37 -41 -37t-41 37v903q-195 0 -327 -172t-132 -373v-358q0 -37 -41 -37t-41 37v364q0 253 166 438t416 185t416 -185t166 -438v-364z" />
+<glyph unicode="&#x2ada;" horiz-adv-x="1364" d="M1264 137q0 -37 -41 -37t-41 37v258q0 201 -132 373t-327 172v-903q0 -37 -41 -37t-41 37v903q-195 0 -327 -172t-132 -373v-258q0 -37 -41 -37t-41 37v264q0 242 153 423.5t388 198.5v189h-247q-37 0 -37 41t37 41h574q39 0 39 -41t-39 -41h-245v-189 q235 -17 388 -198.5t153 -423.5v-264z" />
+<glyph unicode="&#x2adb;" horiz-adv-x="1364" d="M1264 137q0 -37 -41 -37t-41 37v258q0 201 -132 373t-327 172v-903q0 -37 -41 -37t-41 37v903q-195 0 -327 -172t-132 -373v-258q0 -37 -41 -37t-41 37v264q0 242 153 423.5t388 198.5v234q0 37 41 37t41 -37v-234q235 -17 388 -198.5t153 -423.5v-264z" />
+<glyph unicode="&#x2adc;" horiz-adv-x="1364" d="M1284 594q0 -227 -188 -410.5t-413.5 -183.5t-414 184t-188.5 410q0 40 42 40q28 0 39 -34l12 -54q13 -58 31 -104q128 -335 437 -358v1003q0 37 41 37t41 -37v-1003q309 23 437 358q18 46 26 84t18 73t38 35q42 0 42 -40z" />
+<glyph unicode="&#x2add;" horiz-adv-x="1364" d="M1284 594q0 -227 -188 -410.5t-414 -183.5q-144 0 -260 60l-79 -137q-12 -21 -30 -21q-11 0 -25 8q-23 13 -23 32q0 10 7 22l81 139q-95 70 -184 225.5t-89 265.5q0 40 42 40q28 0 39 -34l12 -54q57 -246 222 -370l246 427v484q0 37 41 37t41 -37v-342l207 359 q19 32 54.5 11.5t16.5 -52.5l-278 -482v-497q309 23 437 358q18 46 26 84t18 73t38 35q42 0 42 -40zM641 84v355l-177 -307q82 -41 177 -48z" />
+<glyph unicode="&#x2ade;" horiz-adv-x="878" d="M708 -90q0 -39 -41 -39t-41 39v631h-502q-39 0 -39 41t39 41h502v632q0 37 41 37t41 -37v-1345z" />
+<glyph unicode="&#x2adf;" horiz-adv-x="1591" d="M1506 582q0 -41 -39 -41h-631v-502q0 -39 -41 -39t-41 39v502h-632q-37 0 -37 41t37 41h1345q39 0 39 -41z" />
+<glyph unicode="&#x2ae0;" horiz-adv-x="1591" d="M1506 41q0 -41 -39 -41h-1345q-37 0 -37 41t37 41h632v502q0 39 41 39t41 -39v-502h631q39 0 39 -41z" />
+<glyph unicode="&#x2ae1;" horiz-adv-x="1591" d="M1479 41q0 -41 -37 -41h-1288q-39 0 -39 41t39 41h602v1245q0 37 41 37t41 -37v-1245h604q37 0 37 -41zM1105 738q34 -16 136 -35.5t159 -74t57 -146.5t-68 -145t-169.5 -53t-169.5 65q-53 -65 -67.5 -65t-14.5 23v225q0 23 19 23q15 0 21 -25q26 -103 64 -150 q51 -63 144 -63q169 0 169 137q0 71 -68 106q-31 16 -138 41.5t-147 58.5q-64 52 -64 136.5t70 130t160.5 45.5t148.5 -42q40 42 56.5 42t16.5 -23v-178q0 -24 -20 -24q-16 0 -20 25.5t-6 46.5q-22 125 -167 125q-168 0 -168 -114q0 -60 66 -92z" />
+<glyph unicode="&#x2ae2;" horiz-adv-x="1251" d="M1135 232q0 -41 -37 -41h-901v-281q0 -39 -41 -39t-41 39v1345q0 37 41 37t41 -37v-282h901q37 0 37 -41t-37 -41h-901v-268h901q37 0 37 -41t-37 -41h-901v-268h901q37 0 37 -41z" />
+<glyph unicode="&#x2ae3;" horiz-adv-x="1479" d="M1362 39q0 -39 -41 -39t-41 39v1345q0 37 41 37t41 -37v-1345zM965 39q0 -39 -41 -39t-41 39v631h-731q-37 0 -37 41t37 41h731v632q0 37 41 37t41 -37v-1345z" />
+<glyph unicode="&#x2ae4;" horiz-adv-x="1251" d="M1135 39q0 -39 -41 -39t-41 39v432h-901q-37 0 -37 41t37 41h901v315h-901q-37 0 -37 41t37 41h901v434q0 37 41 37t41 -37v-1345z" />
+<glyph unicode="&#x2ae5;" horiz-adv-x="1479" d="M1362 39q0 -39 -41 -39t-41 39v1345q0 37 41 37t41 -37v-1345zM965 39q0 -39 -41 -39t-41 39v432h-731q-37 0 -37 41t37 41h731v315h-731q-37 0 -37 41t37 41h731v434q0 37 41 37t41 -37v-1345z" />
+<glyph unicode="&#x2ae6;" horiz-adv-x="1479" d="M1362 711q0 -41 -37 -41h-731v-631q0 -39 -41 -39t-41 39v631h-315v-631q0 -39 -41 -39t-41 39v1345q0 37 41 37t41 -37v-632h315v632q0 37 41 37t41 -37v-632h731q37 0 37 -41z" />
+<glyph unicode="&#x2ae7;" horiz-adv-x="1591" d="M1506 582q0 -41 -39 -41h-631v-502q0 -39 -41 -39t-41 39v502h-632q-37 0 -37 41t37 41h1345q39 0 39 -41zM1506 882q0 -41 -39 -41h-1345q-37 0 -37 41t37 41h1345q39 0 39 -41z" />
+<glyph unicode="&#x2ae8;" horiz-adv-x="1591" d="M1506 41q0 -41 -39 -41h-1345q-37 0 -37 41t37 41h632v502q0 39 41 39t41 -39v-502h631q39 0 39 -41zM1506 -259q0 -41 -39 -41h-1345q-37 0 -37 41t37 41h1345q39 0 39 -41z" />
+<glyph unicode="&#x2ae9;" horiz-adv-x="1591" d="M1506 882q0 -41 -39 -41h-1345q-37 0 -37 41t37 41h632v502q0 39 41 39t41 -39v-502h631q39 0 39 -41zM1506 582q0 -41 -39 -41h-631v-502q0 -39 -41 -39t-41 39v502h-632q-37 0 -37 41t37 41h1345q39 0 39 -41z" />
+<glyph unicode="&#x2aea;" horiz-adv-x="1591" d="M1479 1323q0 -41 -37 -41h-404v-1243q0 -39 -41 -39t-41 39v1243h-318v-1243q0 -39 -41 -39t-41 39v1243h-402q-39 0 -39 41t39 41h1288q37 0 37 -41z" />
+<glyph unicode="&#x2aeb;" horiz-adv-x="1591" d="M1479 41q0 -41 -37 -41h-1288q-39 0 -39 41t39 41h402v1243q0 39 41 39t41 -39v-1243h318v1243q0 39 41 39t41 -39v-1243h404q37 0 37 -41z" />
+<glyph unicode="&#x2aec;" horiz-adv-x="1592" d="M1372 37q0 -37 -41 -37t-41 37v422h-953q-48 0 -82.5 37t-34.5 86t34.5 86t82.5 37h994q41 0 41 -39v-629zM1290 541v82h-953q-35 0 -35 -41t35 -41h953z" />
+<glyph unicode="&#x2aed;" horiz-adv-x="1592" d="M1372 582q0 -49 -34.5 -86t-82.5 -37h-953v-422q0 -37 -41 -37t-41 37v629q0 39 41 39h994q48 0 82.5 -37t34.5 -86zM1290 582q0 41 -35 41h-953v-82h953q35 0 35 41z" />
+<glyph unicode="&#x2aee;" horiz-adv-x="455" d="M283 -4q0 -41 -41 -41t-41 41v414l-156 -160q-15 -16 -30 -16q-13 0 -27 14t-14 28t14 29l213 223v312q0 43 41 43t41 -43v-226l155 160q15 15 30 15t28 -13q15 -15 15 -30q0 -13 -13 -27l-215 -223v-500z" />
+<glyph unicode="&#x2aef;" horiz-adv-x="722" d="M590.5 1410.5q96.5 -95.5 96.5 -223.5t-81.5 -220.5t-203.5 -108.5v-1163q0 -37 -41 -37t-41 37v1163q-121 15 -203 108.5t-82 221.5t96 223t229.5 95t230 -95.5zM533 1010q72 72 72 171.5t-72.5 171t-171.5 71.5t-171.5 -71.5t-72.5 -171t72 -171.5t172 -72t172 72z" />
+<glyph unicode="&#x2af0;" horiz-adv-x="722" d="M605.5 197.5q81.5 -92.5 81.5 -220.5t-96.5 -223.5t-230 -95.5t-229.5 95t-96 223t82 221.5t203 108.5v1163q0 37 41 37t41 -37v-1163q122 -16 203.5 -108.5zM532.5 -188.5q72.5 71.5 72.5 171t-72 171.5t-172 72t-172 -72t-72 -171.5t72.5 -171t171.5 -71.5t171.5 71.5z " />
+<glyph unicode="&#x2af1;" horiz-adv-x="722" d="M722 1465q0 -41 -37 -41h-283v-1118q122 -16 203.5 -108.5t81.5 -220.5t-96.5 -223.5t-230 -95.5t-229.5 95t-96 223t82 221.5t203 108.5v1118h-281q-39 0 -39 41t39 41h646q37 0 37 -41zM532.5 -188.5q72.5 71.5 72.5 171t-72 171.5t-172 72t-172 -72t-72 -171.5 t72.5 -171t171.5 -71.5t171.5 71.5z" />
+<glyph unicode="&#x2af2;" horiz-adv-x="797" d="M690 -4q0 -41 -41 -41t-41 41v588l-399 -238v-350q0 -41 -41 -41t-41 41v301l-94 -55q-13 -8 -24 -8q-19 0 -32 22q-8 14 -8 25q0 19 23 32l135 80v447q0 43 41 43t41 -43v-400l399 238v162q0 43 41 43t41 -43v-113l94 55q13 8 24 8q19 0 32 -22q8 -14 8 -25 q0 -19 -23 -32l-135 -80v-635z" />
+<glyph unicode="&#x2af3;" horiz-adv-x="1592" d="M1477 746q0 -152 -96 -271.5t-244 -119.5q-51 0 -101 16v-776q0 -37 -41 -37t-41 37v812q-56 33 -158.5 118t-157.5 117v-1047q0 -37 -41 -37t-41 37v1084q-50 16 -101 16q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5 q51 0 101 -16v776q0 37 41 37t41 -37v-812q58 -32 160.5 -117t155.5 -117v1046q0 37 41 37t41 -37v-1083q50 -17 101 -17q85 0 156 50t104 130q15 36 21 98t30 62q29 0 29 -63z" />
+<glyph unicode="&#x2af4;" horiz-adv-x="1422" d="M1150 -205q0 -37 -41 -37t-41 37v1574q0 37 41 37t41 -37v-1574zM752 -205q0 -37 -41 -37t-41 37v1574q0 37 41 37t41 -37v-1574zM354 -205q0 -37 -41 -37t-41 37v1574q0 37 41 37t41 -37v-1574z" />
+<glyph unicode="&#x2af5;" horiz-adv-x="1990" d="M1820 582q0 -41 -37 -41h-349v-846q0 -37 -41 -37t-41 37v846h-316v-846q0 -37 -41 -37t-41 37v846h-316v-846q0 -37 -41 -37t-41 37v846h-347q-39 0 -39 41t39 41h347v846q0 37 41 37t41 -37v-846h316v846q0 37 41 37t41 -37v-846h316v846q0 37 41 37t41 -37v-846h349 q37 0 37 -41z" />
+<glyph unicode="&#x2af6;" horiz-adv-x="683" d="M421 1160.5q34 -33.5 34 -79t-34 -79t-80 -33.5t-79 33.5t-33 80t33 79t79 32.5t80 -33.5zM421 660.5q34 -33.5 34 -79t-34 -79t-80 -33.5t-79 33.5t-33 80t33 79t79 32.5t80 -33.5zM421 160.5q34 -33.5 34 -79t-34 -79t-80 -33.5t-79 33.5t-33 80t33 79t79 32.5 t80 -33.5z" />
+<glyph unicode="&#x2af7;" horiz-adv-x="2506" d="M2336 184q0 -41 -41 -41q-7 0 -14 3l-844 399q-27 13 -27 37t27 37l844 399q7 3 14 3q41 0 41 -41q0 -26 -24 -37l-765 -361l765 -361q24 -11 24 -37zM2336 -108q0 -41 -41 -41q-7 0 -14 3l-1464 691q-27 13 -27 37t27 37l1464 691q7 3 14 3q41 0 41 -41q0 -26 -24 -37 l-1385 -653l1385 -653q24 -11 24 -37zM2336 -401q0 -41 -41 -41q-7 0 -14 3l-2084 984q-27 13 -27 37t27 37l2084 984q7 3 14 3q41 0 41 -41q0 -26 -24 -37l-2005 -946l2005 -946q24 -11 24 -37z" />
+<glyph unicode="&#x2af8;" horiz-adv-x="2506" d="M2336 582q0 -24 -27 -37l-2084 -984q-7 -3 -14 -3q-41 0 -41 41q0 26 24 37l2005 946l-2005 946q-24 11 -24 37q0 41 41 41q7 0 14 -3l2084 -984q27 -13 27 -37zM1716 582q0 -24 -27 -37l-1464 -691q-7 -3 -14 -3q-41 0 -41 41q0 26 24 37l1385 653l-1385 653 q-24 11 -24 37q0 41 41 41q7 0 14 -3l1464 -691q27 -13 27 -37zM1096 582q0 -24 -27 -37l-844 -399q-7 -3 -14 -3q-41 0 -41 41q0 26 24 37l765 361l-765 361q-24 11 -24 37q0 41 41 41q7 0 14 -3l844 -399q27 -13 27 -37z" />
+<glyph unicode="&#x2af9;" horiz-adv-x="1591" d="M1421 428q0 -41 -41 -41q-10 0 -14 2l-1169 553q-27 13 -27 37.5t20 33.5l1176 555q4 5 14 5q41 0 41 -41q0 -26 -18 -35l-1096 -518l1090 -514q24 -11 24 -37zM1421 30q0 -41 -41 -41q-8 0 -14 3l-1176 555q-20 9 -20 34q0 41 41 41q12 0 16 -2l1176 -555q18 -8 18 -35z M1421 -367q0 -41 -41 -41q-8 0 -14 3l-1176 555q-20 9 -20 34q0 41 41 41q12 0 16 -2l1176 -555q18 -8 18 -35z" />
+<glyph unicode="&#x2afa;" horiz-adv-x="1591" d="M1401 1013q20 -9 20 -33.5t-27 -37.5l-1169 -553q-4 -2 -14 -2q-41 0 -41 41q0 26 24 37l1090 514l-1096 518q-18 9 -18 35q0 41 41 41q10 0 14 -5zM1421 581q0 -25 -20 -34l-1176 -555q-6 -3 -14 -3q-41 0 -41 41q0 27 18 35l1176 555q4 2 16 2q41 0 41 -41zM1421 184 q0 -25 -20 -34l-1176 -555q-6 -3 -14 -3q-41 0 -41 41q0 27 18 35l1176 555q4 2 16 2q41 0 41 -41z" />
+<glyph unicode="&#x2afb;" horiz-adv-x="1469" d="M669 1568q0 -9 -8 -36l-576 -1927q-14 -47 -43 -47q-42 0 -42 38q0 9 8 36l576 1927q14 47 43 47q42 0 42 -38zM1069 1568q0 -9 -8 -36l-576 -1927q-14 -47 -43 -47q-42 0 -42 38q0 9 8 36l576 1927q14 47 43 47q42 0 42 -38zM1469 1568q0 -9 -8 -36l-576 -1927 q-14 -47 -43 -47q-42 0 -42 38q0 9 8 36l576 1927q14 47 43 47q42 0 42 -38z" />
+<glyph unicode="&#x2afc;" horiz-adv-x="1422" d="M1150 -405q0 -37 -41 -37t-41 37v1974q0 37 41 37t41 -37v-1974zM752 -405q0 -37 -41 -37t-41 37v1974q0 37 41 37t41 -37v-1974zM354 -405q0 -37 -41 -37t-41 37v1974q0 37 41 37t41 -37v-1974z" />
+<glyph unicode="&#x2afd;" horiz-adv-x="1069" d="M669 1568q0 -9 -8 -36l-576 -1927q-14 -47 -43 -47q-42 0 -42 38q0 9 8 36l576 1927q14 47 43 47q42 0 42 -38zM1069 1568q0 -9 -8 -36l-576 -1927q-14 -47 -43 -47q-42 0 -42 38q0 9 8 36l576 1927q14 47 43 47q42 0 42 -38z" />
+<glyph unicode="&#x2afe;" horiz-adv-x="790" d="M518 -125q0 -48 -37 -82.5t-86 -34.5t-86 34.5t-37 82.5v1414q0 48 37 82.5t86 34.5t86 -34.5t37 -82.5v-1414zM436 -125v1414q0 35 -41 35t-41 -35v-1414q0 -35 41 -35t41 35z" />
+<glyph unicode="&#x2aff;" horiz-adv-x="790" d="M518 -325q0 -48 -37 -82.5t-86 -34.5t-86 34.5t-37 82.5v1814q0 48 37 82.5t86 34.5t86 -34.5t37 -82.5v-1814zM436 -325v1814q0 35 -41 35t-41 -35v-1814q0 -35 41 -35t41 35z" />
+<glyph unicode="&#x2b00;" d="M1943 -49q12 -12 12 -29t-9 -26l-286 -285q-10 -10 -26.5 -10t-28.5 12l-1122 1123q-8 8 -19 8t-19 -8l-195 -195q-7 -7 -16 -7t-28.5 17.5t-19.5 23.5t2 14q53 201 53 331q0 228 -99 428l-44 88q0 22 23 22q-2 0 87 -44q198 -98 428 -98q61 0 176.5 27t165.5 27 q9 0 26.5 -19.5t17.5 -28.5t-7 -16l-195 -195q-7 -7 -7 -18t8 -19zM1840 -96q7 7 7 17t-9 19l-1123 1124q-13 13 -13 29t11 27l140 140q-128 -20 -212 -20q-217 0 -405 80q81 -190 81 -405q0 -78 -21 -212l140 140q11 11 28 11t29 -12l1123 -1124q8 -8 19 -8t17 6z" />
+<glyph unicode="&#x2b01;" d="M1812 920q0 -130 53 -331q2 -8 2 -14t-19.5 -23.5t-28.5 -17.5t-16 7l-195 195q-8 8 -19 8t-19 -8l-1122 -1123q-12 -12 -28.5 -12t-26.5 10l-286 285q-9 9 -9 26t12 29l1122 1123q8 8 8 19t-7 18l-195 195q-7 7 -7 16t17.5 28.5t26.5 19.5q50 0 165.5 -27t176.5 -27 q230 0 428 98l87 44q23 0 23 -22l-44 -88q-99 -200 -99 -428zM1412 1240q-84 0 -212 20l140 -140q11 -11 11 -27t-13 -29l-1123 -1124q-9 -9 -9 -19t7 -17l188 -188q6 -6 17 -6t19 8l1123 1124q12 12 29 12t28 -11l140 -140q-21 134 -21 212q0 215 81 405q-188 -80 -405 -80 z" />
+<glyph unicode="&#x2b02;" d="M1932 -399q2 0 -87 44q-198 98 -428 98q-61 0 -176.5 -27t-165.5 -27q-9 0 -26.5 19.5t-17.5 28.5t7 16l195 195q7 7 7 18t-8 19l-1122 1123q-12 12 -12 29t9 26l286 285q10 10 26.5 10t28.5 -12l1122 -1123q8 -8 19 -8t19 8l195 195q7 7 16 7t28.5 -17.5t19.5 -23.5 t-2 -14q-53 -201 -53 -331q0 -228 99 -428l44 -88q0 -22 -23 -22zM1736 144q0 78 21 212l-140 -140q-11 -11 -28 -11t-29 12l-1123 1124q-8 8 -19 8t-17 -6l-188 -188q-7 -7 -7 -17t9 -19l1123 -1124q13 -13 13 -29t-11 -27l-140 -140q128 20 212 20q217 0 405 -80 q-81 190 -81 405z" />
+<glyph unicode="&#x2b03;" d="M1946 1163q9 -9 9 -26t-12 -29l-1122 -1123q-8 -8 -8 -19t7 -18l195 -195q7 -7 7 -16t-17.5 -28.5t-26.5 -19.5q-50 0 -165.5 27t-176.5 27q-230 0 -428 -98l-87 -44q-23 0 -23 22l44 88q99 200 99 428q0 130 -53 331q-2 8 -2 14t19.5 23.5t28.5 17.5t16 -7l195 -195 q8 -8 19 -8t19 8l1122 1123q12 12 28.5 12t26.5 -10zM1838 1119q9 9 9 19t-7 17l-188 188q-6 6 -17 6t-19 -8l-1123 -1124q-12 -12 -29 -12t-28 11l-140 140q21 -134 21 -212q0 -215 -81 -405q188 80 405 80q84 0 212 -20l-140 140q-11 11 -11 27t13 29z" />
+<glyph unicode="&#x2b04;" horiz-adv-x="2548" d="M2433 582q0 -16 -18 -23l-80 -24q-164 -55 -302.5 -169t-266.5 -335q-8 -13 -14 -13h-14q-10 -1 -14 -1q-36 0 -36 24v276q0 26 -27 26h-774q-27 0 -27 -26v-276q0 -24 -36 -24q-4 0 -13.5 0.5t-15 0.5t-13.5 13q-128 221 -266.5 335t-302.5 169q-27 7 -80 24 q-18 7 -18 23t18 23l80 24q164 55 302.5 169t266.5 335q8 13 13.5 13t15 0.5t13.5 0.5q36 0 36 -24v-276q0 -26 27 -26h774q27 0 27 26v276q0 24 36 24h14q9 -1 14.5 -1t13.5 -13q128 -221 266.5 -335t302.5 -169q27 -7 80 -24q18 -7 18 -23zM1770 778q0 -39 -41 -39h-910 q-41 0 -41 39v198q-74 -101 -125 -154q-155 -160 -354 -240q199 -80 354 -240q51 -53 125 -154v198q0 39 41 39h910q41 0 41 -39v-198q74 101 125 154q155 160 354 240q-199 80 -354 240q-51 53 -125 154v-198z" />
+<glyph unicode="&#x2b05;" d="M1933 380q0 -37 -41 -37h-1005q-27 0 -27 -26v-276q0 -24 -36 -24q-4 0 -13.5 0.5t-15 0.5t-13.5 13q-128 221 -266.5 335t-302.5 169q-27 7 -80 24q-18 7 -18 23t18 23l80 24q164 55 302.5 169t266.5 335q8 13 13.5 13t15 0.5t13.5 0.5q36 0 36 -24v-276q0 -26 27 -26 h1005q41 0 41 -37v-404z" />
+<glyph unicode="&#x2b06;" horiz-adv-x="1250" d="M1190 773q0 -36 -24 -36h-276q-26 0 -26 -27v-987q0 -41 -37 -41h-404q-37 0 -37 41v987q0 27 -26 27h-276q-24 0 -24 36q0 4 0.5 13.5t0.5 15t13 13.5q221 128 335 266.5t169 302.5q7 27 24 80q7 18 23 18t23 -18l24 -80q55 -164 169 -302.5t335 -266.5q13 -8 13 -13.5 t0.5 -15t0.5 -13.5z" />
+<glyph unicode="&#x2b07;" horiz-adv-x="1250" d="M1190 391v-14q-1 -9 -1 -14.5t-13 -13.5q-221 -128 -335 -266.5t-169 -302.5q-7 -27 -24 -80q-7 -18 -23 -18t-23 18l-24 80q-55 164 -169 302.5t-335 266.5q-13 8 -13 13v15q-1 10 -1 14q0 36 24 36h276q26 0 26 27v987q0 41 37 41h404q37 0 37 -41v-987q0 -27 26 -27 h276q24 0 24 -36z" />
+<glyph unicode="&#x2b08;" d="M1943 -49q12 -12 12 -29t-9 -26l-286 -285q-10 -10 -26.5 -10t-28.5 12l-1122 1123q-8 8 -19 8t-19 -8l-195 -195q-7 -7 -16 -7t-28.5 17.5t-19.5 23.5t2 14q53 201 53 331q0 228 -99 428l-44 88q0 22 23 22q-2 0 87 -44q198 -98 428 -98q61 0 176.5 27t165.5 27 q9 0 26.5 -19.5t17.5 -28.5t-7 -16l-195 -195q-7 -7 -7 -18t8 -19z" />
+<glyph unicode="&#x2b09;" d="M1812 920q0 -130 53 -331q2 -8 2 -14t-19.5 -23.5t-28.5 -17.5t-16 7l-195 195q-8 8 -19 8t-19 -8l-1122 -1123q-12 -12 -28.5 -12t-26.5 10l-286 285q-9 9 -9 26t12 29l1122 1123q8 8 8 19t-7 18l-195 195q-7 7 -7 16t17.5 28.5t26.5 19.5q50 0 165.5 -27t176.5 -27 q230 0 428 98l87 44q23 0 23 -22l-44 -88q-99 -200 -99 -428z" />
+<glyph unicode="&#x2b0a;" d="M1932 -399q2 0 -87 44q-198 98 -428 98q-61 0 -176.5 -27t-165.5 -27q-9 0 -26.5 19.5t-17.5 28.5t7 16l195 195q7 7 7 18t-8 19l-1122 1123q-12 12 -12 29t9 26l286 285q10 10 26.5 10t28.5 -12l1122 -1123q8 -8 19 -8t19 8l195 195q7 7 16 7t28.5 -17.5t19.5 -23.5 t-2 -14q-53 -201 -53 -331q0 -228 99 -428l44 -88q0 -22 -23 -22z" />
+<glyph unicode="&#x2b0b;" d="M1946 1163q9 -9 9 -26t-12 -29l-1122 -1123q-8 -8 -8 -19t7 -18l195 -195q7 -7 7 -16t-17.5 -28.5t-26.5 -19.5q-50 0 -165.5 27t-176.5 27q-230 0 -428 -98l-87 -44q-23 0 -23 22l44 88q99 200 99 428q0 130 -53 331q-2 8 -2 14t19.5 23.5t28.5 17.5t16 -7l195 -195 q8 -8 19 -8t19 8l1122 1123q12 12 28.5 12t26.5 -10z" />
+<glyph unicode="&#x2b0c;" horiz-adv-x="2548" d="M2433 582q0 -16 -18 -23l-80 -24q-164 -55 -302.5 -169t-266.5 -335q-8 -13 -14 -13h-14q-10 -1 -14 -1q-36 0 -36 24v276q0 26 -27 26h-774q-27 0 -27 -26v-276q0 -24 -36 -24q-4 0 -13.5 0.5t-15 0.5t-13.5 13q-128 221 -266.5 335t-302.5 169q-27 7 -80 24 q-18 7 -18 23t18 23l80 24q164 55 302.5 169t266.5 335q8 13 13.5 13t15 0.5t13.5 0.5q36 0 36 -24v-276q0 -26 27 -26h774q27 0 27 26v276q0 24 36 24h14q9 -1 14.5 -1t13.5 -13q128 -221 266.5 -335t302.5 -169q27 -7 80 -24q18 -7 18 -23z" />
+<glyph unicode="&#x2b0d;" horiz-adv-x="1250" d="M1190 267v-14q-1 -9 -1 -14.5t-13 -13.5q-221 -128 -335 -266.5t-169 -302.5q-7 -27 -24 -80q-7 -18 -23 -18t-23 18l-24 80q-55 164 -169 302.5t-335 266.5q-13 8 -13 13v15q-1 10 -1 14q0 36 24 36h276q26 0 26 27v504q0 27 -26 27h-276q-24 0 -24 36q0 4 0.5 13.5 t0.5 15t13 13.5q221 128 335 266.5t169 302.5q7 27 24 80q7 18 23 18t23 -18l24 -80q55 -164 169 -302.5t335 -266.5q13 -8 13 -13.5t0.5 -15t0.5 -13.5q0 -36 -24 -36h-276q-26 0 -26 -27v-504q0 -27 26 -27h276q24 0 24 -36z" />
+<glyph unicode="&#x2b0e;" d="M1931 153q0 -24 -23 -34l-62 -27q-149 -75 -237 -230q-15 -27 -26 -27t-26 27q-87 154 -236 230l-58 25q-26 12 -26 36q0 42 39 42q7 0 15 -3q144 -52 251 -178v527h-1386q-41 0 -41 41t41 41h1427q41 0 41 -41v-569q107 127 253 179q8 3 15 3q39 0 39 -42z" />
+<glyph unicode="&#x2b0f;" d="M1931 1011q0 -42 -39 -42q-7 0 -15 3q-146 52 -253 179v-569q0 -41 -41 -41h-1427q-41 0 -41 41t41 41h1386v527q-107 -126 -251 -178q-8 -3 -15 -3q-39 0 -39 42q0 24 23 34l61 27q149 76 236 230q15 27 26 27t26 -27q88 -155 237 -230q20 -8 59 -25q26 -12 26 -36z" />
+<glyph unicode="&#x2b10;" d="M1931 582q0 -41 -41 -41h-1386v-527q107 126 251 178q8 3 15 3q39 0 39 -42q0 -24 -23 -34l-61 -27q-149 -76 -236 -230q-15 -27 -26 -27t-26 27q-88 155 -237 230q-20 8 -59 25q-26 12 -26 36q0 42 39 42q7 0 15 -3q146 -52 253 -179v569q0 41 41 41h1427q41 0 41 -41z " />
+<glyph unicode="&#x2b11;" d="M1931 582q0 -41 -41 -41h-1427q-41 0 -41 41v569q-107 -127 -253 -179q-8 -3 -15 -3q-39 0 -39 42q0 24 23 34l62 27q149 75 237 230q15 27 26 27t26 -27q87 -154 236 -230l58 -25q26 -12 26 -36q0 -42 -39 -42q-7 0 -15 3q-144 52 -251 178v-527h1386q41 0 41 -41z" />
+<glyph unicode="&#x2b12;" horiz-adv-x="1578" d="M1461 -90h-1344v1344h1344v-1344zM1361 10v572h-1144v-572h1144z" />
+<glyph unicode="&#x2b13;" horiz-adv-x="1578" d="M1461 -90h-1344v1344h1344v-1344zM1361 582v572h-1144v-572h1144z" />
+<glyph unicode="&#x2b14;" horiz-adv-x="1578" d="M1461 -90h-1344v1344h1344v-1344zM217 10h1144l-1144 1144v-1144z" />
+<glyph unicode="&#x2b15;" horiz-adv-x="1578" d="M1461 -90h-1344v1344h1344v-1344zM1361 1154h-1144l1144 -1144v1144z" />
+<glyph unicode="&#x2b16;" horiz-adv-x="1578" d="M1568 582l-779 -779l-779 779l779 779zM1427 582l-638 638v-1276z" />
+<glyph unicode="&#x2b17;" horiz-adv-x="1578" d="M1568 582l-779 -779l-779 779l779 779zM789 -56v1276l-638 -638z" />
+<glyph unicode="&#x2b18;" horiz-adv-x="1578" d="M1568 582l-779 -779l-779 779l779 779zM1427 582h-1276l638 -638z" />
+<glyph unicode="&#x2b19;" horiz-adv-x="1578" d="M1568 582l-779 -779l-779 779l779 779zM1427 582l-638 638l-638 -638h1276z" />
+<glyph unicode="&#x2b1a;" horiz-adv-x="1578" d="M1461 1102h-100v52h-52v100h152v-152zM1223 1154h-152v100h152v-100zM1461 864h-100v152h100v-152zM984 1154h-152v100h152v-100zM1461 625h-100v152h100v-152zM746 1154h-152v100h152v-100zM1461 387h-100v152h100v-152zM507 1154h-152v100h152v-100zM1461 148h-100v152 h100v-152zM269 1154h-52v-52h-100v152h152v-100zM1461 -90h-152v100h52v52h100v-152zM217 864h-100v152h100v-152zM1223 -90h-152v100h152v-100zM217 625h-100v152h100v-152zM984 -90h-152v100h152v-100zM217 387h-100v152h100v-152zM746 -90h-152v100h152v-100zM217 148 h-100v152h100v-152zM507 -90h-152v100h152v-100zM269 -90h-152v152h100v-52h52v-100z" />
+<glyph unicode="&#x2b1b;" d="M1908 -302h-1768v1768h1768v-1768z" />
+<glyph unicode="&#x2b1c;" d="M1908 -302h-1768v1768h1768v-1768zM1808 -202v1568h-1568v-1568h1568z" />
+<glyph unicode="&#x2b1d;" horiz-adv-x="580" d="M515 357h-450v450h450v-450z" />
+<glyph unicode="&#x2b1e;" horiz-adv-x="580" d="M515 357h-450v450h450v-450zM415 457v250h-250v-250h250z" />
+<glyph unicode="&#x2b1f;" horiz-adv-x="1734" d="M1636 833l-294 -903h-950l-294 903l769 558z" />
+<glyph unicode="&#x2b20;" horiz-adv-x="1734" d="M1636 833l-294 -903h-950l-294 903l769 558zM1518 795l-651 472l-651 -472l249 -765h804z" />
+<glyph unicode="&#x2b21;" horiz-adv-x="1638" d="M1521 177l-702 -404l-702 404v810l702 404l702 -404v-810zM1421 235v694l-602 347l-602 -347v-694l602 -347z" />
+<glyph unicode="&#x2b22;" horiz-adv-x="1638" d="M1521 177l-702 -404l-702 404v810l702 404l702 -404v-810z" />
+<glyph unicode="&#x2b23;" horiz-adv-x="1654" d="M1636 582l-404 -702h-810l-404 702l404 702h810z" />
+<glyph unicode="&#x2b24;" d="M2008 582q0 -410 -287 -697t-697 -287t-697 287t-287 697t287 697t697 287t697 -287t287 -697z" />
+<glyph unicode="&#x2b25;" horiz-adv-x="946" d="M924 582l-451 -451l-451 451l451 451z" />
+<glyph unicode="&#x2b26;" horiz-adv-x="946" d="M924 582l-451 -451l-451 451l451 451zM783 582l-310 310l-310 -310l310 -310z" />
+<glyph unicode="&#x2b27;" horiz-adv-x="738" d="M710 582l-341 -451l-341 451l341 451z" />
+<glyph unicode="&#x2b28;" horiz-adv-x="946" d="M814 582l-341 -451l-341 451l341 451zM689 582l-216 285l-216 -285l216 -285z" />
+<glyph unicode="&#x2b29;" horiz-adv-x="738" d="M712 582l-343 -343l-343 343l343 343z" />
+<glyph unicode="&#x2b2a;" horiz-adv-x="580" d="M549 582l-259 -343l-259 343l259 343z" />
+<glyph unicode="&#x2b2b;" horiz-adv-x="738" d="M628 582l-259 -343l-259 343l259 343zM503 582l-134 177l-134 -177l134 -177z" />
+<glyph unicode="&#x2b2c;" horiz-adv-x="1750" d="M1710 582q0 -260 -300 -416q-247 -128 -535 -128t-535 128q-300 156 -300 416t300 416q247 128 535 128t535 -128q300 -156 300 -416z" />
+<glyph unicode="&#x2b2d;" horiz-adv-x="1750" d="M1710 582q0 -260 -300 -416q-247 -128 -535 -128t-535 128q-300 156 -300 416t300 416q247 128 535 128t535 -128q300 -156 300 -416zM1610 582q0 196 -246 327q-221 117 -489 117t-489 -117q-246 -131 -246 -327t246 -327q221 -117 489 -117t489 117q246 131 246 327z " />
+<glyph unicode="&#x2b2e;" horiz-adv-x="1288" d="M1188 582q0 -288 -128 -535q-156 -300 -416 -300t-416 300q-128 247 -128 535t128 535q156 300 416 300t416 -300q128 -247 128 -535z" />
+<glyph unicode="&#x2b2f;" horiz-adv-x="1288" d="M1188 582q0 -288 -128 -535q-156 -300 -416 -300t-416 300q-128 247 -128 535t128 535q156 300 416 300t416 -300q128 -247 128 -535zM1088 582q0 268 -117 489q-131 246 -327 246t-327 -246q-117 -221 -117 -489t117 -489q131 -246 327 -246t327 246q117 221 117 489z " />
+<glyph unicode="&#x2b30;" d="M1931 582q0 -41 -39 -41h-277q-16 -145 -125 -243.5t-256 -98.5t-256 98.5t-125 243.5h-515q222 -157 287 -431q8 -34 8 -36q0 -27 -21 -27q-47 0 -53 6t-8 13q-22 84 -35.5 123t-43.5 90q-106 182 -296 265l-47 18q-14 6 -14 22t25 27l40 14q210 91 317 310 q24 49 54 163q5 19 20 19q44 0 41 1q21 -4 21 -28q0 -58 -57 -179q-84 -177 -238 -288h515q16 145 125 243.5t256 98.5t256 -98.5t125 -243.5h277q39 0 39 -41zM1234 883q-113 0 -198 -74.5t-100 -185.5h596q-15 111 -100 185.5t-198 74.5zM1234 281q113 0 198 74.5 t100 185.5h-596q15 -111 100 -185.5t198 -74.5z" />
+<glyph unicode="&#x2b31;" d="M397 0q223 -135 293 -414q0 -22 -63 -22q-13 0 -19 14q-6 22 -19 65q-46 132 -150.5 229.5t-238.5 132.5q-23 3 -67 13q-18 6 -18 23t18 23q23 4 67 13q205 54 325 235q-120 180 -325 234q-23 3 -67 13q-18 6 -18 23t18 23q23 4 67 13q205 54 325 235q-120 180 -325 234 q-23 3 -67 13q-18 6 -18 23t18 23q23 4 67 13q134 35 238.5 132.5t150.5 229.5q6 22 19 65q6 14 19 14q63 0 63 -22l-2 -6q-29 -104 -59 -161q-83 -157 -232 -247h1499q37 0 37 -41t-37 -41h-1499q140 -85 222 -229q-82 -145 -222 -230h1499q37 0 37 -41t-37 -41h-1499 q140 -85 222 -229q-82 -145 -222 -230h1499q37 0 37 -41t-37 -41h-1499z" />
+<glyph unicode="&#x2b32;" horiz-adv-x="3008" d="M2891 582q0 -41 -39 -41h-481q-16 -285 -225.5 -483.5t-496.5 -198.5t-495.5 199t-224.5 483h-591q222 -157 287 -431q8 -34 8 -36q0 -27 -21 -27q-47 0 -53 6t-8 13q-22 84 -35.5 123t-43.5 90q-106 182 -296 265l-47 18q-14 6 -14 22t25 27l40 14q210 91 317 310 q24 49 54 163q5 19 20 19q44 0 41 1q21 -4 21 -28q0 -58 -57 -179q-84 -177 -238 -288h591q16 285 224 483.5t496.5 198.5t497 -198t224.5 -484h481q39 0 39 -41zM1692 623h597q-15 241 -186 412t-411 187v-599zM1610 623v599q-241 -15 -412 -186.5t-187 -412.5h599z M1692 541v-599q239 16 410 187.5t187 411.5h-597zM1610 541h-599q16 -240 187.5 -412t411.5 -187v599z" />
+<glyph unicode="&#x2b33;" horiz-adv-x="3008" d="M2891 582q0 -41 -41 -41q-14 0 -30 14l-160 142l-348 -314q-13 -12 -31 -12t-31 12l-348 314l-348 -314q-13 -12 -31 -12t-31 12l-348 314l-158 -142q-16 -14 -32 -14h-658q126 -107 178 -251q3 -8 3 -15q0 -39 -42 -39q-24 0 -34 22l-27 62q-76 149 -230 236 q-27 15 -27 26t27 26q155 88 230 237q8 20 25 59q12 26 36 26q42 0 42 -39q0 -7 -3 -15q-52 -146 -179 -253h642l176 158q13 12 31 12t31 -12l348 -314l348 314q13 12 31 12t31 -12l348 -314l348 314q13 12 31 12t31 -12l190 -170q10 -9 10 -29z" />
+<glyph unicode="&#x2b34;" d="M1931 582q0 -41 -39 -41h-415v-395q0 -39 -41 -39t-41 39v395h-667q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41q-14 0 -20 19q-33 175 -134.5 295t-234.5 180h-234q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41q-14 0 -20 19q-33 175 -142 303.5t-278 192.5 q-16 6 -16 20t16 23l46 18q282 122 363 428q3 16 9.5 40.5t26.5 26.5q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-59 -266 -288 -432h229q282 122 363 428q3 16 9.5 40.5t26.5 26.5q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-59 -266 -288 -432h667v397q0 37 41 37t41 -37v-397h415 q39 0 39 -41z" />
+<glyph unicode="&#x2b35;" d="M1931 582q0 -41 -39 -41h-215v-395q0 -39 -41 -39t-41 39v395h-218v-395q0 -39 -41 -39t-41 39v395h-567q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41q-14 0 -20 19q-33 175 -134.5 295t-234.5 180h-234q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41 q-14 0 -20 19q-33 175 -142 303.5t-278 192.5q-16 6 -16 20t16 23l46 18q282 122 363 428q3 16 9.5 40.5t26.5 26.5q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-59 -266 -288 -432h229q282 122 363 428q3 16 9.5 40.5t26.5 26.5q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35 q-59 -266 -288 -432h567v397q0 37 41 37t41 -37v-397h218v397q0 37 41 37t41 -37v-397h215q39 0 39 -41z" />
+<glyph unicode="&#x2b36;" d="M1931 44q0 -62 -41 -62t-41 62v497h-1153q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41q-14 0 -20 19q-33 175 -134.5 295t-234.5 180h-234q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41q-14 0 -20 19q-33 175 -142 303.5t-278 192.5q-16 6 -16 20t16 23l46 18 q282 122 363 428q3 16 9.5 40.5t26.5 26.5q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-59 -266 -288 -432h229q282 122 363 428q3 16 9.5 40.5t26.5 26.5q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-59 -266 -288 -432h1153v498q0 61 41 61t41 -61v-1077z" />
+<glyph unicode="&#x2b37;" d="M1963 74q0 -27 -21 -27q-45 0 -36 -1q-20 2 -24 19t-12 48q-38 146 -132.5 257.5t-230.5 170.5h-37q-39 0 -39 41t39 41h37q282 122 363 428q3 16 9.5 40.5t26.5 26.5q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-26 -118 -93 -224q-97 -154 -247 -249q150 -95 247 -249 q67 -106 93 -224q7 -31 7 -35zM1261 582q0 -41 -37 -41h-194q-39 0 -39 41t39 41h194q37 0 37 -41zM1023 74q0 -24 -21 -27h-41q-14 0 -20 19q-33 175 -134.5 295t-234.5 180h-234q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41q-14 0 -20 19q-33 175 -142 303.5 t-278 192.5q-16 6 -16 20t16 23l46 18q282 122 363 428q3 16 9.5 40.5t26.5 26.5q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-59 -266 -288 -432h229q282 122 363 428q3 16 9.5 40.5t26.5 26.5q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-59 -266 -288 -432h54q39 0 39 -41t-39 -41 h-54q228 -162 288 -432q7 -31 7 -35z" />
+<glyph unicode="&#x2b38;" d="M1931 582q0 -41 -37 -41h-54q-39 0 -39 41t39 41h54q37 0 37 -41zM1631 582q0 -41 -37 -41h-54q-39 0 -39 41t39 41h54q37 0 37 -41zM1331 582q0 -41 -37 -41h-54q-39 0 -39 41t39 41h54q37 0 37 -41zM1031 582q0 -41 -37 -41h-54q-39 0 -39 41t39 41h54q37 0 37 -41z M731 582q0 -41 -37 -41h-54q-39 0 -39 41t39 41h54q37 0 37 -41zM633 74q0 -27 -21 -27q-45 0 -36 -1q-20 2 -24 19t-12 48q-38 146 -132.5 257.5t-230.5 170.5q-16 5 -46 18q-16 9 -16 23t16 20q259 98 369 334q23 49 33 90l18 72q6 19 20 19h41q21 -3 21 -27q0 -4 -7 -35 q-60 -270 -288 -432h54q39 0 39 -41t-39 -41h-54q229 -166 288 -432q7 -31 7 -35z" />
+<glyph unicode="&#x2b39;" d="M1963 74q0 -27 -21 -27q-45 0 -36 -1q-20 2 -24 19t-12 48q-38 146 -132.5 257.5t-230.5 170.5h-328v-395q0 -39 -41 -39t-41 39v395h-759q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41q-14 0 -20 19q-33 175 -142 303.5t-278 192.5q-16 6 -16 20t16 23l46 18 q282 122 363 428q3 16 9.5 40.5t26.5 26.5q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-59 -266 -288 -432h759v397q0 37 41 37t41 -37v-397h328q282 122 363 428q3 16 9.5 40.5t26.5 26.5q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-26 -118 -93 -224q-97 -154 -247 -249 q150 -95 247 -249q67 -106 93 -224q7 -31 7 -35z" />
+<glyph unicode="&#x2b3a;" d="M1963 74q0 -27 -21 -27q-45 0 -36 -1q-20 2 -24 19t-12 48q-38 146 -132.5 257.5t-230.5 170.5h-218v-395q0 -39 -41 -39t-41 39v395h-218v-395q0 -39 -41 -39t-41 39v395h-569q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41q-14 0 -20 19q-33 175 -142 303.5 t-278 192.5q-16 6 -16 20t16 23l46 18q282 122 363 428q3 16 9.5 40.5t26.5 26.5q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-59 -266 -288 -432h569v397q0 37 41 37t41 -37v-397h218v397q0 37 41 37t41 -37v-397h218q282 122 363 428q3 16 9.5 40.5t26.5 26.5q-9 -1 36 -1 q21 0 21 -27q0 -4 -7 -35q-26 -118 -93 -224q-97 -154 -247 -249q150 -95 247 -249q67 -106 93 -224q7 -31 7 -35z" />
+<glyph unicode="&#x2b3b;" d="M1963 74q0 -27 -21 -27q-45 0 -36 -1q-20 2 -24 19t-12 48q-38 146 -132.5 257.5t-230.5 170.5h-779q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41q-14 0 -20 19q-33 175 -134.5 295t-234.5 180h-234q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41q-14 0 -20 19 q-33 175 -142 303.5t-278 192.5q-16 6 -16 20t16 23l46 18q282 122 363 428q3 16 9.5 40.5t26.5 26.5q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-59 -266 -288 -432h229q282 122 363 428q3 16 9.5 40.5t26.5 26.5q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-59 -266 -288 -432h779 q282 122 363 428q3 16 9.5 40.5t26.5 26.5q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-26 -118 -93 -224q-97 -154 -247 -249q150 -95 247 -249q67 -106 93 -224q7 -31 7 -35z" />
+<glyph unicode="&#x2b3c;" d="M1963 74q0 -27 -21 -27q-45 0 -36 -1q-20 2 -24 19t-12 48q-38 146 -132.5 257.5t-230.5 170.5h-188v-395q0 -39 -41 -39t-41 39v395h-509q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41q-14 0 -20 19q-33 175 -134.5 295t-234.5 180h-234q228 -162 288 -432 q7 -31 7 -35q0 -24 -21 -27h-41q-14 0 -20 19q-33 175 -142 303.5t-278 192.5q-16 6 -16 20t16 23l46 18q282 122 363 428q3 16 9.5 40.5t26.5 26.5q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-59 -266 -288 -432h229q282 122 363 428q3 16 9.5 40.5t26.5 26.5q-9 -1 36 -1 q21 0 21 -27q0 -4 -7 -35q-59 -266 -288 -432h509v397q0 37 41 37t41 -37v-397h188q282 122 363 428q3 16 9.5 40.5t26.5 26.5q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-26 -118 -93 -224q-97 -154 -247 -249q150 -95 247 -249q67 -106 93 -224q7 -31 7 -35z" />
+<glyph unicode="&#x2b3d;" horiz-adv-x="2248" d="M2163 74q0 -27 -21 -27q-45 0 -36 -1q-20 2 -24 19t-12 48q-38 146 -132.5 257.5t-230.5 170.5h-128v-395q0 -39 -41 -39t-41 39v395h-218v-395q0 -39 -41 -39t-41 39v395h-469q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41q-14 0 -20 19q-33 175 -134.5 295 t-234.5 180h-234q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41q-14 0 -20 19q-33 175 -142 303.5t-278 192.5q-16 6 -16 20t16 23l46 18q282 122 363 428q3 16 9.5 40.5t26.5 26.5q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-59 -266 -288 -432h229q282 122 363 428 q3 16 9.5 40.5t26.5 26.5q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-59 -266 -288 -432h469v397q0 37 41 37t41 -37v-397h218v397q0 37 41 37t41 -37v-397h128q282 122 363 428q3 16 9.5 40.5t26.5 26.5q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-26 -118 -93 -224 q-97 -154 -247 -249q150 -95 247 -249q67 -106 93 -224q7 -31 7 -35z" />
+<glyph unicode="&#x2b3e;" d="M1980 582q0 -41 -39 -41q-19 0 -31 14q-98 110 -148 151q-83 66 -162 66t-163 -66q-53 -43 -152.5 -156t-162.5 -161q-101 -77 -207.5 -77t-263 114.5t-240.5 114.5h-73q244 -175 295 -467q0 -27 -20 -27h-41q-18 0 -21 19q-31 171 -144.5 305t-276.5 191q-15 4 -15 20 t15 23q163 55 276.5 188.5t144.5 304.5q3 19 21 19h41q20 0 20 -27q-51 -292 -295 -467h73q105 0 264.5 -114.5t240.5 -114.5t164 65q52 41 153.5 156t160.5 161q102 78 206 78t205 -78q59 -46 164 -167q11 -13 11 -27z" />
+<glyph unicode="&#x2b3f;" d="M1931 582q0 -41 -39 -41h-450l274 -274q13 -13 13 -27t-15 -29t-29 -15t-27 13l-315 315l-315 -315q-13 -13 -27 -13t-29 15t-15 29t13 27l274 274h-906q222 -157 287 -431q8 -34 8 -36q0 -27 -21 -27q-47 0 -53 6t-8 13q-22 84 -35.5 123t-43.5 90q-106 182 -296 265 l-47 18q-14 6 -14 22t25 27l40 14q210 91 317 310q24 49 54 163q5 19 20 19q44 0 41 1q21 -4 21 -28q0 -58 -57 -179q-84 -177 -238 -288h906l-275 275q-26 26 3 55t55 3l316 -316l316 316q26 26 55 -3t3 -55l-275 -275h450q39 0 39 -41z" />
+<glyph unicode="&#x2b40;" d="M1831 1102q0 -41 -39 -41h-724q-37 0 -37 41t37 41h724q39 0 39 -41zM1831 842q0 -41 -39 -41h-724q-37 0 -37 41t37 41h724q39 0 39 -41zM1931 582q0 -41 -39 -41h-1554q222 -157 287 -431q8 -34 8 -36q0 -27 -21 -27q-47 0 -53 6t-8 13q-22 84 -35.5 123t-43.5 90 q-106 182 -296 265l-47 18q-14 6 -14 22t25 27l40 14q210 91 317 310q24 49 54 163q5 19 20 19q44 0 41 1q21 -4 21 -28q0 -58 -57 -179q-84 -177 -238 -288h1554q39 0 39 -41z" />
+<glyph unicode="&#x2b41;" d="M1870 856q0 -56 -28 -56q-19 0 -30 51q-34 153 -157 153q-73 0 -196.5 -102t-217.5 -102t-153.5 78t-59.5 179q0 61 31 61q17 0 26 -34l8 -49q11 -51 55 -86t97 -35q72 0 195.5 102t221.5 102t153 -76t55 -186zM1931 582q0 -41 -39 -41h-1554q222 -157 287 -431 q8 -34 8 -36q0 -27 -21 -27q-47 0 -53 6t-8 13q-22 84 -35.5 123t-43.5 90q-106 182 -296 265l-47 18q-14 6 -14 22t25 27l40 14q210 91 317 310q24 49 54 163q5 19 20 19q44 0 41 1q21 -4 21 -28q0 -58 -57 -179q-84 -177 -238 -288h1554q39 0 39 -41z" />
+<glyph unicode="&#x2b42;" d="M1873 102q0 -56 -28 -56q-19 0 -30 51q-34 153 -157 153q-73 0 -196.5 -102t-217.5 -102t-153.5 78t-59.5 179q0 61 31 61q17 0 26 -34l8 -49q11 -51 55 -86t97 -35q72 0 195.5 102t221.5 102t153 -76t55 -186zM1931 582q0 -41 -39 -41h-1554q228 -162 288 -432 q7 -31 7 -35q0 -24 -21 -27h-41q-14 0 -20 19q-33 175 -142 303.5t-278 192.5q-16 6 -16 20t16 23l46 18q282 122 363 428q3 16 9.5 40.5t26.5 26.5q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-59 -266 -288 -432h1554q39 0 39 -41zM1873 -238q0 -56 -28 -56q-19 0 -30 51 q-34 153 -157 153q-73 0 -196.5 -102t-217.5 -102t-153.5 78t-59.5 179q0 61 31 61q17 0 26 -34l8 -49q11 -51 55 -86t97 -35q72 0 195.5 102t221.5 102t153 -76t55 -186z" />
+<glyph unicode="&#x2b43;" d="M2030 582q0 -14 -16 -20q-259 -98 -369 -334q-23 -49 -33 -90l-18 -72q-6 -19 -20 -19h-41q-21 3 -21 27q0 4 7 35q60 270 288 432h-477l-1160 -548q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l1001 473h-697q-39 0 -39 41t39 41h697l-1001 473q-24 11 -24 37q0 41 41 41 q8 0 14 -3l1160 -548h477q-229 166 -288 432q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5t230.5 -170.5q16 -5 46 -18q16 -9 16 -23z" />
+<glyph unicode="&#x2b44;" d="M2041 582q0 -14 -16 -20q-259 -98 -369 -334q-23 -49 -33 -90l-18 -72q-6 -19 -20 -19h-41q-21 3 -21 27q0 4 7 35q60 270 288 432h-564q-17 -231 -200 -386t-420 -155h-480q-39 0 -39 41t39 41h474q205 0 366 130.5t178 328.5h-908q-39 0 -39 41t39 41h908 q-17 198 -178 328.5t-366 130.5h-474q-39 0 -39 41t39 41h480q237 0 420 -155t200 -386h564q-229 166 -288 432q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5t230.5 -170.5q16 -5 46 -18q16 -9 16 -23z" />
+<glyph unicode="&#x2b45;" horiz-adv-x="2032" d="M1916 72q0 -41 -37 -41h-1145q34 -67 47 -105t13 -44q0 -39 -42 -39q-22 0 -36 27q-18 46 -57 135q-138 281 -394 464q-42 25 -124 78q-25 17 -25 35t25 35q42 25 124 78q256 183 394 464q17 46 57 135q14 27 36 27q42 0 42 -39q0 -6 -13 -44t-47 -105h1145q37 0 37 -41 t-37 -41h-1188q-82 -141 -192 -258h1380q37 0 37 -41t-37 -41h-1464q-88 -78 -179 -129q91 -51 179 -129h1464q37 0 37 -41t-37 -41h-1380q110 -117 192 -258h1188q37 0 37 -41z" />
+<glyph unicode="&#x2b46;" horiz-adv-x="2032" d="M1916 582q0 -18 -25 -35q-42 -25 -124 -78q-256 -183 -394 -464q-17 -46 -57 -135q-14 -27 -36 -27q-42 0 -42 39q0 6 13 44t47 105h-1145q-37 0 -37 41t37 41h1188q82 141 192 258h-1380q-37 0 -37 41t37 41h1464q88 78 179 129q-91 51 -179 129h-1464q-37 0 -37 41 t37 41h1380q-110 117 -192 258h-1188q-37 0 -37 41t37 41h1145q-34 67 -47 105t-13 44q0 39 42 39q22 0 36 -27q18 -46 57 -135q138 -281 394 -464q42 -25 124 -78q25 -17 25 -35z" />
+<glyph unicode="&#x2b47;" d="M1906 611q25 -11 25 -27t-15 -22l-46 -18q-190 -83 -296 -265q-41 -70 -79 -213q-2 -7 -8 -13t-53 -6q-21 0 -21 27q0 2 8 36q65 274 287 431h-1554q-39 0 -39 41t39 41h1554q-154 111 -238 288q-57 121 -57 179q0 24 21 28q-3 -1 41 -1q15 0 20 -19q14 -55 54 -163 q105 -217 317 -310zM1018 856q0 -56 -28 -56q-19 0 -30 51q-34 153 -157 153q-73 0 -196.5 -102t-217.5 -102t-153.5 78t-59.5 179q0 61 31 61q17 0 26 -34l8 -49q11 -51 55 -86t97 -35q72 0 195.5 102t221.5 102t153 -76t55 -186z" />
+<glyph unicode="&#x2b48;" d="M1931 582q0 -14 -16 -20q-259 -98 -369 -334q-23 -49 -33 -90l-18 -72q-6 -19 -20 -19h-41q-21 3 -21 27q0 4 7 35q60 270 288 432h-1554q-39 0 -39 41t39 41h1554q-229 166 -288 432q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5 t230.5 -170.5q16 -5 46 -18q16 -9 16 -23zM1015 102q0 -56 -28 -56q-19 0 -30 51q-34 153 -157 153q-73 0 -196.5 -102t-217.5 -102t-153.5 78t-59.5 179q0 61 31 61q17 0 26 -34l8 -49q11 -51 55 -86t97 -35q72 0 195.5 102t221.5 102t153 -76t55 -186zM1015 -238 q0 -56 -28 -56q-19 0 -30 51q-34 153 -157 153q-73 0 -196.5 -102t-217.5 -102t-153.5 78t-59.5 179q0 61 31 61q17 0 26 -34l8 -49q11 -51 55 -86t97 -35q72 0 195.5 102t221.5 102t153 -76t55 -186z" />
+<glyph unicode="&#x2b49;" d="M1870 1057q0 -101 -59.5 -179t-153.5 -78t-217.5 102t-196.5 102q-123 0 -157 -153q-11 -51 -30 -51q-28 0 -28 56q0 110 55 186t153 76t221.5 -102t195.5 -102q53 0 97 35t55 86l8 49q9 34 26 34q31 0 31 -61zM1931 582q0 -41 -39 -41h-1554q222 -157 287 -431 q8 -34 8 -36q0 -27 -21 -27q-47 0 -53 6t-8 13q-22 84 -35.5 123t-43.5 90q-106 182 -296 265l-47 18q-14 6 -14 22t25 27l40 14q210 91 317 310q24 49 54 163q5 19 20 19q44 0 41 1q21 -4 21 -28q0 -58 -57 -179q-84 -177 -238 -288h1554q39 0 39 -41z" />
+<glyph unicode="&#x2b4a;" d="M1873 303q0 -101 -59.5 -179t-153.5 -78t-217.5 102t-196.5 102q-123 0 -157 -153q-11 -51 -30 -51q-28 0 -28 56q0 110 55 186t153 76t221.5 -102t195.5 -102q53 0 97 35t55 86l8 49q9 34 26 34q31 0 31 -61zM1931 582q0 -41 -39 -41h-1554q228 -162 288 -432 q7 -31 7 -35q0 -24 -21 -27h-41q-14 0 -20 19q-33 175 -142 303.5t-278 192.5q-16 6 -16 20t16 23l46 18q282 122 363 428q3 16 9.5 40.5t26.5 26.5q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-59 -266 -288 -432h1554q39 0 39 -41zM1873 -37q0 -101 -59.5 -179t-153.5 -78 t-217.5 102t-196.5 102q-123 0 -157 -153q-11 -51 -30 -51q-28 0 -28 56q0 110 55 186t153 76t221.5 -102t195.5 -102q53 0 97 35t55 86l8 49q9 34 26 34q31 0 31 -61z" />
+<glyph unicode="&#x2b4b;" d="M1931 582q0 -41 -39 -41h-1554q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41q-14 0 -20 19q-33 175 -142 303.5t-278 192.5q-16 6 -16 20t16 23l46 18q282 122 363 428q3 16 9.5 40.5t26.5 26.5q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-59 -266 -288 -432h1554 q39 0 39 -41zM1873 102q0 -56 -28 -56q-19 0 -30 51q-34 153 -157 153q-73 0 -196.5 -102t-217.5 -102t-153.5 78t-59.5 179q0 61 31 61q17 0 26 -34l8 -49q11 -51 55 -86t97 -35q72 0 195.5 102t221.5 102t153 -76t55 -186z" />
+<glyph unicode="&#x2b4c;" d="M1931 582q0 -14 -16 -20q-259 -98 -369 -334q-23 -49 -33 -90l-18 -72q-6 -19 -20 -19h-41q-21 3 -21 27q0 4 7 35q60 270 288 432h-1554q-39 0 -39 41t39 41h1554q-229 166 -288 432q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5 t230.5 -170.5q16 -5 46 -18q16 -9 16 -23zM1015 102q0 -56 -28 -56q-19 0 -30 51q-34 153 -157 153q-73 0 -196.5 -102t-217.5 -102t-153.5 78t-59.5 179q0 61 31 61q17 0 26 -34l8 -49q11 -51 55 -86t97 -35q72 0 195.5 102t221.5 102t153 -76t55 -186z" />
+<glyph unicode="&#x2b4d;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b4e;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b4f;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b50;" horiz-adv-x="1208" d="M1168 766l-349 -255l133 -408l-348 253l-348 -253l133 408l-349 255h431l133 408l133 -408h431zM862 666h-198l-60 185l-60 -185h-198l161 -117l-60 -184l157 115l157 -115l-60 184z" />
+<glyph unicode="&#x2b51;" horiz-adv-x="908" d="M868 722l-265 -194l101 -310l-265 192l-265 -192l101 310l-265 194h328l101 310l101 -310h328z" />
+<glyph unicode="&#x2b52;" horiz-adv-x="908" d="M868 722l-265 -194l101 -310l-265 192l-265 -192l101 310l-265 194h328l101 310l101 -310h328zM562 622h-95l-28 87l-28 -87h-95l77 -56l-29 -87l75 54l75 -54l-29 87z" />
+<glyph unicode="&#x2b53;" horiz-adv-x="1644" d="M1578 582l-558 -769l-903 294v950l903 294z" />
+<glyph unicode="&#x2b54;" horiz-adv-x="1644" d="M1578 582l-558 -769l-903 294v950l903 294zM1454 582l-472 651l-765 -249v-804l765 -249z" />
+<glyph unicode="&#x2b55;" d="M1948 582q0 -385 -269.5 -654.5t-654.5 -269.5t-654.5 269.5t-269.5 654.5t269.5 654.5t654.5 269.5t654.5 -269.5t269.5 -654.5zM1748 582q0 302 -211 513t-513 211t-513 -211t-211 -513t211 -513t513 -211t513 211t211 513z" />
+<glyph unicode="&#x2b56;" d="M1995 655q0 -277 -202 -471q-178 -172 -464 -238q-131 -30 -305 -30q-376 0 -651 177q-320 206 -320 562q0 254 175 440q156 165 416 247q165 52 382 52q374 0 650 -178q319 -207 319 -561zM1826 655q0 287 -269 446q-225 133 -533 133q-189 0 -321 -39 q-213 -63 -337 -188q-144 -145 -144 -350q0 -288 269 -447q225 -134 533 -134q432 0 655 223q147 147 147 356zM1445 987q226 -115 226 -332.5t-226 -331.5q-179 -91 -420.5 -91t-418.5 90q-224 114 -224 332t223 333q177 92 418.5 92t421.5 -92zM1376 389q198 94 198 266.5 t-197 265.5q-155 73 -350 73t-353 -74q-200 -94 -200 -264t201 -265q159 -75 352.5 -75t348.5 73z" />
+<glyph unicode="&#x2b57;" d="M1848 582q0 -341 -241.5 -582.5t-582.5 -241.5t-582.5 241.5t-241.5 582.5t241.5 582.5t582.5 241.5t582.5 -241.5t241.5 -582.5zM1679 582q0 271 -192 463t-463 192t-463 -192t-192 -463t192 -463t463 -192t463 192t192 463zM1519 582q0 -205 -145 -350t-350 -145 t-350 145t-145 350t145 350t350 145t350 -145t145 -350zM1427 582q0 167 -118 285t-285 118t-285 -118t-118 -285t118 -285t285 -118t285 118t118 285z" />
+<glyph unicode="&#x2b58;" d="M1758 582q0 -306 -214 -520t-520 -214t-520 214t-214 520t214 520t520 214t520 -214t214 -520zM1558 582q0 223 -155.5 378.5t-378.5 155.5t-378.5 -155.5t-155.5 -378.5t155.5 -378.5t378.5 -155.5t378.5 155.5t155.5 378.5z" />
+<glyph unicode="&#x2b59;" d="M1948 582q0 -385 -269.5 -654.5t-654.5 -269.5t-654.5 269.5t-269.5 654.5t269.5 654.5t654.5 269.5t654.5 -269.5t269.5 -654.5zM1024 1306q-246 0 -438 -145l438 -438l438 438q-192 145 -438 145zM1748 582q0 246 -145 438l-438 -438l438 -438q145 192 145 438z M300 582q0 -246 145 -438l438 438l-438 438q-145 -192 -145 -438zM1024 -142q246 0 438 145l-438 438l-438 -438q192 -145 438 -145z" />
+<glyph unicode="&#x2b5a;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b5b;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b5c;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b5d;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b5e;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b5f;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b60;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b61;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b62;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b63;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b64;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b65;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b66;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b67;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b68;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b69;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b6a;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b6b;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b6c;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b6d;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b6e;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b6f;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b70;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b71;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b72;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b73;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b74;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b75;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b76;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b77;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b78;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b79;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b7a;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b7b;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b7c;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b7d;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b7e;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b7f;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b80;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b81;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b82;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b83;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b84;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b85;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b86;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b87;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b88;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b89;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b8a;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b8b;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b8c;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b8d;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b8e;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b8f;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b90;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b91;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b92;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b93;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b94;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b95;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b96;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b97;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b98;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b99;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b9a;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b9b;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b9c;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b9d;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b9e;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2b9f;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2ba0;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2ba1;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2ba2;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2ba3;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2ba4;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2ba5;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2ba6;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2ba7;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2ba8;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2ba9;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2baa;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bab;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bac;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bad;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bae;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2baf;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bb0;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bb1;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bb2;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bb3;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bb4;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bb5;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bb6;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bb7;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bb8;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bb9;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bba;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bbb;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bbc;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bbd;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bbe;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bbf;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bc0;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bc1;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bc2;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bc3;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bc4;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bc5;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bc6;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bc7;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bc8;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bc9;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bca;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bcb;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bcc;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bcd;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bce;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bcf;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bd0;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bd1;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bd2;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bd3;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bd4;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bd5;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bd6;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bd7;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bd8;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bd9;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bda;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bdb;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bdc;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bdd;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bde;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bdf;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2be0;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2be1;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2be2;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2be3;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2be4;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2be5;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2be6;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2be7;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2be8;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2be9;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bea;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2beb;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bec;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bed;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bee;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bef;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bf0;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bf1;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bf2;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bf3;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bf4;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bf5;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bf6;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bf7;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bf8;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bf9;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bfa;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bfb;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bfc;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bfd;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bfe;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2bff;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2e00;" horiz-adv-x="774" d="M662 1454h-438v-438h-112v550h550v-112z" />
+<glyph unicode="&#x2e01;" horiz-adv-x="774" d="M662 1454h-438v-438h-112v550h550v-112zM632 1122q0 -31 -22.5 -53.5t-53.5 -22.5t-53.5 22.5t-22.5 53.5t22.5 53.5t53.5 22.5t53.5 -22.5t22.5 -53.5z" />
+<glyph unicode="&#x2e02;" horiz-adv-x="618" d="M506 1566q-263 -254 -283 -634l-111 7q14 347 247 627h147z" />
+<glyph unicode="&#x2e03;" horiz-adv-x="618" d="M506 939l-111 -7q-20 380 -283 634h147q233 -280 247 -627z" />
+<glyph unicode="&#x2e04;" horiz-adv-x="744" d="M506 1566q-263 -254 -283 -634l-111 7q14 347 247 627h147zM632 1122q0 -31 -22.5 -53.5t-53.5 -22.5t-53.5 22.5t-22.5 53.5t22.5 53.5t53.5 22.5t53.5 -22.5t22.5 -53.5z" />
+<glyph unicode="&#x2e05;" horiz-adv-x="744" d="M632 939l-111 -7q-20 380 -283 634h147q233 -280 247 -627zM264 1122q0 -31 -22.5 -53.5t-53.5 -22.5t-53.5 22.5t-22.5 53.5t22.5 53.5t53.5 22.5t53.5 -22.5t22.5 -53.5z" />
+<glyph unicode="&#x2e06;" horiz-adv-x="1212" d="M1100 1454h-438v-438h-112v438h-438v112h988v-112z" />
+<glyph unicode="&#x2e07;" horiz-adv-x="1212" d="M1100 1454h-438v-438h-112v438h-438v112h988v-112zM1070 1122q0 -31 -22.5 -53.5t-53.5 -22.5t-53.5 22.5t-22.5 53.5t22.5 53.5t53.5 22.5t53.5 -22.5t22.5 -53.5z" />
+<glyph unicode="&#x2e08;" horiz-adv-x="841" d="M593 1454q-93 0 -130 -66q-25 -44 -52.5 -190t-58.5 -205q-50 -98 -148 -98q-25 0 -92 14l19 110q55 -12 78 -12q33 0 49 53q3 9 36.5 156t72 218.5t87 101.5t131.5 30q33 0 87 -5l-10 -111q-42 4 -69 4zM729 1122q0 -31 -22.5 -53.5t-53.5 -22.5t-53.5 22.5t-22.5 53.5 t22.5 53.5t53.5 22.5t53.5 -22.5t22.5 -53.5z" />
+<glyph unicode="&#x2e09;" horiz-adv-x="784" d="M593 1454q-93 0 -130 -66q-25 -44 -52.5 -190t-58.5 -205q-50 -98 -148 -98q-25 0 -92 14l19 110q55 -12 78 -12q33 0 49 53q3 9 36.5 156t72 218.5t87 101.5t131.5 30q33 0 87 -5l-10 -111q-42 4 -69 4z" />
+<glyph unicode="&#x2e0a;" horiz-adv-x="784" d="M580 895q-98 0 -148 98q-31 59 -59 205t-52 190q-37 66 -130 66q-27 0 -69 -4l-10 111q54 5 87 5q83 0 131 -30q98 -60 151 -276l31 -142q12 -53 22 -81q15 -30 39.5 -30t79.5 12l19 -110q-66 -14 -92 -14z" />
+<glyph unicode="&#x2e0b;" horiz-adv-x="814" d="M702 976h-590v590h590v-590zM590 1088v366h-366v-366h366z" />
+<glyph unicode="&#x2e0c;" horiz-adv-x="787" d="M675 1072l-79 -79l-484 484l79 79z" />
+<glyph unicode="&#x2e0d;" horiz-adv-x="787" d="M675 1477l-484 -484l-79 79l484 484z" />
+<glyph unicode="&#x2e0e;" horiz-adv-x="1392" d="M691 1442l54 13q61 0 61 -60q0 -68 -92 -68q-54 0 -88.5 38.5t-34.5 93.5q0 121 179 147v-36q-115 -17 -115 -88q0 -40 36 -40zM800 1164h-208v56h208v-56zM930 991h-468v56h468v-56zM1050 798h-708v56h708v-56zM1280 554h-465q-21 -108 -119 -108t-119 108h-465v56h465 q21 108 119 108t119 -108h465v-56zM1050 310h-708v56h708v-56zM930 117h-468v56h468v-56zM800 -56h-208v56h208v-56zM706 -278l-54 -13q-61 0 -61 60q0 68 92 68q54 0 88.5 -38.5t34.5 -93.5q0 -121 -179 -147v36q115 17 115 88q0 40 -36 40zM696 662q-45 0 -62 -52h124 q-17 52 -62 52zM696 502q45 0 62 52h-124q17 -52 62 -52z" />
+<glyph unicode="&#x2e0f;" horiz-adv-x="0" d="M1024 -336h-2048v112h2048v-112z" />
+<glyph unicode="&#x2e10;" horiz-adv-x="0" d="M1024 -336h-1843l-136 -106l-69 89l166 129h1882v-112z" />
+<glyph unicode="&#x2e11;" horiz-adv-x="0" d="M-1024 -336v112h1882l166 -129l-69 -89l-136 106h-1843z" />
+<glyph unicode="&#x2e12;" horiz-adv-x="607" d="M495 -80q0 -147 -114 -235q-95 -74 -253 -97l-16 110l55 9q89 15 152.5 71.5t63.5 141.5q0 182 -271 222l16 110q158 -23 253 -97q114 -88 114 -235z" />
+<glyph unicode="&#x2e13;" horiz-adv-x="1186" d="M340 982q0 -47 -33.5 -80.5t-80.5 -33.5t-80.5 33.5t-33.5 80.5t33.5 80.5t80.5 33.5t80.5 -33.5t33.5 -80.5zM1069 1514l-850 -1909l-102 46l850 1909zM1074 182q0 -47 -33.5 -80.5t-80.5 -33.5t-80.5 33.5t-33.5 80.5t33.5 80.5t80.5 33.5t80.5 -33.5t33.5 -80.5z" />
+<glyph unicode="&#x2e14;" horiz-adv-x="1441" d="M1329 716q0 -141 -84 -270l-93 60q72 106 72 195q0 129 -89 243l-943 -944l-80 80l944 943q-107 83 -221.5 83t-216.5 -66l-60 94q128 83 270 83q201 0 351 -150t150 -351z" />
+<glyph unicode="&#x2e15;" horiz-adv-x="1442" d="M629 112q89 0 195 72l60 -93q-137 -91 -254 -91q-201 0 -359.5 154t-158.5 354q0 140 84 270l94 -60q-66 -102 -66 -216.5t83 -221.5l943 944l80 -80l-944 -943q114 -89 243 -89z" />
+<glyph unicode="&#x2e16;" horiz-adv-x="1151" d="M1039 975q0 -43 -30.5 -73.5t-73.5 -30.5t-73.5 30.5t-30.5 73.5t30.5 73.5t73.5 30.5t73.5 -30.5t30.5 -73.5zM1039 496q-590 -157 -798 -486h-129q188 353 662 529q-474 176 -662 529h129q208 -329 798 -486v-86zM1039 103q0 -43 -30.5 -73.5t-73.5 -30.5t-73.5 30.5 t-30.5 73.5t30.5 73.5t73.5 30.5t73.5 -30.5t30.5 -73.5z" />
+<glyph unicode="&#x2e17;" horiz-adv-x="781" d="M669 834l-501 -288l-56 96l501 288zM669 434l-501 -288l-56 96l501 288z" />
+<glyph unicode="&#x2e18;" horiz-adv-x="886" d="M671 1277q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM630 0h-112v120q-406 112 -406 420q0 133 105 210t243 77q29 0 58 -4v167h112v-782q66 -13 144 -21l-11 -111q-80 8 -133 18v-94zM460 715 q-89 0 -162.5 -45.5t-73.5 -129.5q0 -213 294 -304v474q-29 5 -58 5z" />
+<glyph unicode="&#x2e19;" horiz-adv-x="1333" d="M1011 1348l-8 -64l4 -8l54 86q49 76 114 79q1 -14 1 -21q0 -38 -39.5 -94.5t-39.5 -86.5q107 48 136.5 48t29.5 -22q0 -37 -97 -86l-131 -67q-23 -18 -52 -68q18 -13 44.5 -13t83.5 24t92.5 24t35.5 -24q0 -51 -161.5 -99t-176 -58.5t-34.5 -56.5q6 -2 13 -4 q42 0 123.5 23t109 23t38.5 -2v-57q-13 -4 -156.5 -30t-191.5 -59q-27 -18 -47 -82q8 -4 34.5 -4t116 25t118.5 25t39 -2v-51q-181 -55 -396 -114q-22 -40 -38 -87l3 -3q6 0 90 26t254 60v-56l-245 -76q-133 -42 -185 -81q-4 -3 -33 -63q63 2 186.5 40t190.5 38v-85 q-18 -5 -200 -37.5t-241 -66.5q-32 -19 -37 -58q15 -8 63 -8t169 28.5t183 28.5q5 -14 5 -21q0 -71 -201 -107l-264 -42q-38 -14 -94 -129.5t-103 -115.5q-25 0 -63 22.5t-38 49.5t68 120t68 127q0 69 -39.5 202.5t-39.5 202.5t40 69q33 0 69 -118l64 -211q60 53 60 115.5 t-46 181.5t-46 184t39 65q28 0 50 -80l23 -106q12 -44 40 -85q44 69 41 95l-29 259q0 45 55 61q18 -161 59 -255q30 30 35.5 39t5.5 49.5t-19.5 133.5t-19.5 140q0 87 51 87q18 0 29 -8q5 -26 12.5 -130.5t31.5 -156.5q45 56 45 68t-19.5 84t-19.5 194.5t51 122.5 q11 0 19.5 -15t27 -123.5t31.5 -141.5q45 53 45 65q0 -4 -10 47t-10 137.5t17 126.5q32 0 38.5 -89.5t30.5 -117.5q31 30 31 87l-4 84q0 96 44 96q1 0 6 -2q16 -15 16 -45z" />
+<glyph unicode="&#x2e1a;" horiz-adv-x="808" d="M696 1141q0 -40 -28 -69t-68 -29t-69 29t-29 69t29 68t69 28t68 -28t28 -68zM306 1141q0 -40 -28 -69t-68 -29t-69 29t-29 69t29 68t69 28t68 -28t28 -68zM696 631h-584v112h584v-112z" />
+<glyph unicode="&#x2e1b;" horiz-adv-x="1206" d="M708 1205q43 -43 43 -103.5t-42.5 -105t-104 -44.5t-105.5 44t-44 105.5t44.5 104t105 42.5t103.5 -43zM1094 776q-16 -131 -75.5 -198.5t-149 -67.5t-242 121t-247.5 121q-125 0 -158 -200l-110 19q49 293 268 293q99 0 202 -63q15 -9 158 -116q84 -63 136 -63 q80 0 108 173zM669 1101q0 65 -65 65q-28 0 -47.5 -19t-19.5 -46t20 -47t47 -20t46 19.5t19 47.5z" />
+<glyph unicode="&#x2e1c;" horiz-adv-x="787" d="M675 -328l-79 -79l-484 484l79 79z" />
+<glyph unicode="&#x2e1d;" horiz-adv-x="787" d="M675 77l-484 -484l-79 79l484 484z" />
+<glyph unicode="&#x2e1e;" horiz-adv-x="1206" d="M700 1101q0 -40 -28 -69t-68 -29t-69 29t-29 69t29 68t69 28t68 -28t28 -68zM1094 776q-16 -131 -75.5 -198.5t-149 -67.5t-242 121t-247.5 121q-125 0 -158 -200l-110 19q49 293 268 293q99 0 202 -63q15 -9 158 -116q84 -63 136 -63q80 0 108 173z" />
+<glyph unicode="&#x2e1f;" horiz-adv-x="1206" d="M1094 776q-16 -131 -75.5 -198.5t-149 -67.5t-242 121t-247.5 121q-125 0 -158 -200l-110 19q49 293 268 293q99 0 202 -63q15 -9 158 -116q84 -63 136 -63q80 0 108 173zM700 275q0 -40 -28 -69t-68 -29t-69 29t-29 69t29 68t69 28t68 -28t28 -68z" />
+<glyph unicode="&#x2e20;" horiz-adv-x="673" d="M561 631h-337v-863h-112v1838h112v-863h337v-112z" />
+<glyph unicode="&#x2e21;" horiz-adv-x="673" d="M561 -232h-112v863h-337v112h337v863h112v-1838z" />
+<glyph unicode="&#x2e22;" horiz-adv-x="571" d="M459 1493h-235v-806h-112v862l56 57h291v-113z" />
+<glyph unicode="&#x2e23;" horiz-adv-x="571" d="M459 687h-112v806h-235v113h291l56 -57v-862z" />
+<glyph unicode="&#x2e24;" horiz-adv-x="571" d="M459 -232h-291l-56 57v862h112v-806h235v-113z" />
+<glyph unicode="&#x2e25;" horiz-adv-x="571" d="M112 -232v113h235v806h112v-862l-56 -57h-291z" />
+<glyph unicode="&#x2e26;" horiz-adv-x="1326" d="M1214 160h-543q-246 0 -402.5 141.5t-156.5 385.5t156.5 385.5t402.5 141.5h543v-112h-543q-200 0 -323.5 -109t-123.5 -306t123.5 -306t323.5 -109h543v-112z" />
+<glyph unicode="&#x2e27;" horiz-adv-x="1326" d="M1214 687q0 -244 -156.5 -385.5t-402.5 -141.5h-543v112h543q200 0 323.5 109t123.5 306t-123.5 306t-323.5 109h-543v112h543q246 0 402.5 -141.5t156.5 -385.5z" />
+<glyph unicode="&#x2e28;" horiz-adv-x="1082" d="M574 -332q0 -18 -19 -18q-11 0 -46 29q-226 186 -322 396t-96 507t96 507t322 396q35 29 46 29q19 0 19 -18q0 -8 -24 -32q-300 -295 -300 -882t300 -882q24 -24 24 -32zM974 -332q0 -18 -19 -18q-11 0 -46 29q-226 186 -322 396t-96 507t96 507t322 396q35 29 46 29 q19 0 19 -18q0 -8 -24 -32q-300 -295 -300 -882t300 -882q24 -24 24 -32z" />
+<glyph unicode="&#x2e29;" horiz-adv-x="1082" d="M591 582q0 -297 -96 -507t-322 -396q-35 -29 -46 -29q-19 0 -19 18q0 8 24 32q300 295 300 882t-300 882q-24 24 -24 32q0 18 19 18q11 0 46 -29q226 -186 322 -396t96 -507zM991 582q0 -297 -96 -507t-322 -396q-35 -29 -46 -29q-19 0 -19 18q0 8 24 32q300 295 300 882 t-300 882q-24 24 -24 32q0 18 19 18q11 0 46 -29q226 -186 322 -396t96 -507z" />
+<glyph unicode="&#x2e2a;" horiz-adv-x="1426" d="M1314 942q0 -41 -30 -71t-71 -30t-71 30t-30 71t30 71t71 30t71 -30t30 -71zM314 942q0 -41 -30 -71t-71 -30t-71 30t-30 71t30 71t71 30t71 -30t30 -71zM814 101q0 -41 -30 -71t-71 -30t-71 30t-30 71t30 71t71 30t71 -30t30 -71z" />
+<glyph unicode="&#x2e2b;" horiz-adv-x="1426" d="M814 942q0 -41 -30 -71t-71 -30t-71 30t-30 71t30 71t71 30t71 -30t30 -71zM1314 101q0 -41 -30 -71t-71 -30t-71 30t-30 71t30 71t71 30t71 -30t30 -71zM314 101q0 -41 -30 -71t-71 -30t-71 30t-30 71t30 71t71 30t71 -30t30 -71z" />
+<glyph unicode="&#x2e2c;" horiz-adv-x="1267" d="M1155 942q0 -41 -30 -71t-71 -30t-71 30t-30 71t30 71t71 30t71 -30t30 -71zM314 942q0 -41 -30 -71t-71 -30t-71 30t-30 71t30 71t71 30t71 -30t30 -71zM1155 101q0 -41 -30 -71t-71 -30t-71 30t-30 71t30 71t71 30t71 -30t30 -71zM314 101q0 -41 -30 -71t-71 -30 t-71 30t-30 71t30 71t71 30t71 -30t30 -71z" />
+<glyph unicode="&#x2e2d;" horiz-adv-x="1426" d="M814 1082q0 -41 -30 -71t-71 -30t-71 30t-30 71t30 71t71 30t71 -30t30 -71zM1314 582q0 -41 -30 -71t-71 -30t-71 30t-30 71t30 71t71 30t71 -30t30 -71zM814 582q0 -41 -30 -71t-71 -30t-71 30t-30 71t30 71t71 30t71 -30t30 -71zM314 582q0 -41 -30 -71t-71 -30 t-71 30t-30 71t30 71t71 30t71 -30t30 -71zM814 82q0 -41 -30 -71t-71 -30t-71 30t-30 71t30 71t71 30t71 -30t30 -71z" />
+<glyph unicode="&#x2e2e;" horiz-adv-x="849" d="M224 958q0 -200 227 -200q85 0 165 37l80 -51v-360h-112v280q-66 -18 -133 -18q-149 0 -244 82.5t-95 229.5q0 191 202 309q158 93 376 116l12 -112q-170 -18 -301 -84q-177 -89 -177 -229zM737 97q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5 t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x2e2f;" horiz-adv-x="506" d="M309 1252.5q85 -119.5 85 -210.5t-49 -149.5t-132 -58.5h-46v112h46q69 0 69 89q0 67 -85 182t-85 186.5t56 125t125 53.5h46v-112h-46q-23 0 -46 -20.5t-23 -49t85 -148z" />
+<glyph unicode="&#x2e30;" horiz-adv-x="738" d="M698 582q0 -137 -96 -233t-233 -96t-233 96t-96 233t96 233t233 96t233 -96t96 -233zM598 582q0 96 -66.5 162.5t-162.5 66.5t-162.5 -66.5t-66.5 -162.5t66.5 -162.5t162.5 -66.5t162.5 66.5t66.5 162.5z" />
+<glyph unicode="&#x2e31;" horiz-adv-x="300" d="M260 582q0 -46 -32 -78t-78 -32t-78 32t-32 78t32 78t78 32t78 -32t32 -78z" />
+<glyph unicode="&#x2e32;" horiz-adv-x="1720" d="M1586 759q-165 32 -299 32t-281 -41q222 -150 222 -395q0 -144 -111.5 -249.5t-256.5 -105.5t-256 105.5t-111 249.5q0 245 221 395q-147 41 -278.5 41t-301.5 -32l-22 118q181 34 305 34q237 0 443 -84q205 84 443 84q124 0 305 -34zM1108 355q0 221 -248 341 q-247 -120 -247 -341q0 -95 75.5 -165t171.5 -70t172 70t76 165z" />
+<glyph unicode="&#x2e33;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2e34;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2e35;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2e36;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2e37;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2e38;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2e39;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2e3a;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2e3b;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2e3c;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2e3d;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2e3e;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x2e3f;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x3008;" horiz-adv-x="795" d="M680 -401q0 -41 -41 -41q-28 0 -37 25q-377 996 -377 1000t377 998q9 25 37 25q41 0 41 -41q0 -9 -371 -983q371 -974 371 -983z" />
+<glyph unicode="&#x3009;" horiz-adv-x="795" d="M193 1581q377 -994 377 -998t-377 -1000q-9 -25 -37 -25q-41 0 -41 41q0 9 371 983q-371 974 -371 983q0 41 41 41q28 0 37 -25z" />
+<glyph unicode="&#x300a;" horiz-adv-x="1105" d="M680 -401q0 -41 -41 -41q-28 0 -37 25q-377 996 -377 1000t377 998q9 25 37 25q41 0 41 -41q0 -9 -371 -983q371 -974 371 -983zM990 -401q0 -41 -41 -41q-28 0 -37 25q-377 996 -377 1000t377 998q9 25 37 25q41 0 41 -41q0 -9 -371 -983q371 -974 371 -983z" />
+<glyph unicode="&#x300b;" horiz-adv-x="1105" d="M193 1581q377 -994 377 -998t-377 -1000q-9 -25 -37 -25q-41 0 -41 41q0 9 371 983q-371 974 -371 983q0 41 41 41q28 0 37 -25zM503 1581q377 -994 377 -998t-377 -1000q-9 -25 -37 -25q-41 0 -41 41q0 9 371 983q-371 974 -371 983q0 41 41 41q28 0 37 -25z" />
+<glyph unicode="&#x300c;" horiz-adv-x="682" d="M503 1514q68 0 68 -40.5t-68 -40.5h-309v-1783h-82v1864h391z" />
+<glyph unicode="&#x300d;" horiz-adv-x="682" d="M570 -350h-391q-68 0 -68 41t68 41h309v1782h82v-1864z" />
+<glyph unicode="&#x300e;" horiz-adv-x="860" d="M581 1514q168 0 168 -140.5t-168 -140.5h-187v-1583h-282v1864h469zM581 1314q87 0 87 59.5t-87 59.5h-388v-1702h120v1583h268z" />
+<glyph unicode="&#x300f;" horiz-adv-x="860" d="M748 -350h-469q-168 0 -168 140.5t168 140.5h187v1583h282v-1864zM667 -269v1702h-120v-1583h-268q-87 0 -87 -59.5t87 -59.5h388z" />
+<glyph unicode="&#x3010;" horiz-adv-x="787" d="M623 -329q0 -21 -52 -21h-407v1864h407q52 0 52 -21q0 -11 -11 -20q-44 -33 -127 -105q-239 -247 -239 -786t239 -786q16 -16 127 -105q11 -9 11 -20z" />
+<glyph unicode="&#x3011;" horiz-adv-x="787" d="M623 -350h-407q-52 0 -52 21q0 11 11 20q44 33 127 105q239 247 239 786t-239 786q-16 16 -127 105q-11 9 -11 20q0 21 52 21h407v-1864z" />
+<glyph unicode="&#x3014;" horiz-adv-x="718" d="M276 1092v-1020q0 -47 122.5 -188.5t155.5 -161.5v-72l-390 287v1290l390 287v-72q-33 -20 -155.5 -161.5t-122.5 -188.5z" />
+<glyph unicode="&#x3015;" horiz-adv-x="718" d="M442 72v1020q0 47 -122.5 188.5t-155.5 161.5v72l390 -287v-1290l-390 -287v72q33 20 155.5 161.5t122.5 188.5z" />
+<glyph unicode="&#x3016;" horiz-adv-x="951" d="M787 -329q0 -21 -52 -21h-571v1864h571q52 0 52 -21q0 -11 -11 -20q-44 -33 -127 -105q-239 -247 -239 -786t239 -786q16 -16 127 -105q11 -9 11 -20zM328 582q0 247 55 454q70 261 214 396h-351v-1700h351q-144 134 -214 396q-55 207 -55 454z" />
+<glyph unicode="&#x3017;" horiz-adv-x="951" d="M787 -350h-571q-52 0 -52 21q0 11 11 20q44 32 127 105q239 247 239 786t-239 786q-16 16 -127 105q-11 9 -11 20q0 21 52 21h571v-1864zM705 -268v1700h-351q144 -134 214 -396q55 -207 55 -454t-55 -454q-70 -261 -214 -396h351z" />
+<glyph unicode="&#x3018;" horiz-adv-x="758" d="M410 1152v-1140q0 -41 72.5 -152t111.5 -138v-72l-430 287v1290l430 287v-72q-39 -27 -111.5 -138t-72.5 -152zM328 12v1140q0 39 35 109l-117 -78v-1202l117 -78q-35 70 -35 109z" />
+<glyph unicode="&#x3019;" horiz-adv-x="758" d="M348 12v1140q0 41 -72.5 152t-111.5 138v72l430 -287v-1290l-430 -287v72q39 27 111.5 138t72.5 152zM430 1152v-1140q0 -39 -35 -109l117 78v1202l-117 78q35 -70 35 -109z" />
+<glyph unicode="&#x301a;" horiz-adv-x="682" d="M571 -309q0 -41 -68 -41h-391v1864h391q68 0 68 -40.5t-68 -40.5h-109v-1701h109q68 0 68 -41zM313 -268v1701h-120v-1701h120z" />
+<glyph unicode="&#x301b;" horiz-adv-x="682" d="M570 -350h-391q-68 0 -68 41t68 41h109v1701h-109q-68 0 -68 40.5t68 40.5h391v-1864zM489 -268v1701h-120v-1701h120z" />
+<glyph unicode="&#x301c;" horiz-adv-x="1591" d="M1477 418q0 -63 -29 -63q-24 0 -28 43.5t-23 116.5q-33 80 -104 130t-156 50q-111 0 -235 -88l-207 -164q-125 -88 -240 -88q-149 0 -244.5 119.5t-95.5 271.5q0 63 28 63q24 0 29 -51q9 -90 38 -142q83 -147 245 -147q113 0 236 88l208 164q124 88 238 88 q148 0 244 -119.5t96 -271.5z" />
+<glyph unicode="&#x301d;" horiz-adv-x="870" d="M481 751q0 -17 -22 -17t-36 25l-385 667q-9 16 -9 32q0 37 36.5 58.5t76.5 21.5q76 0 94 -54l239 -707q6 -18 6 -26zM841 751q0 -17 -22 -17t-36 25l-385 667q-9 16 -9 32q0 37 36.5 58.5t76.5 21.5q76 0 94 -54l239 -707q6 -18 6 -26z" />
+<glyph unicode="&#x301e;" horiz-adv-x="870" d="M481 1458q0 -16 -9 -32l-385 -667q-14 -25 -36 -25t-22 17q0 8 6 26l239 707q18 54 94 54q40 0 76.5 -21.5t36.5 -58.5zM841 1458q0 -16 -9 -32l-385 -667q-14 -25 -36 -25t-22 17q0 8 6 26l239 707q18 54 94 54q40 0 76.5 -21.5t36.5 -58.5z" />
+<glyph unicode="&#x301f;" horiz-adv-x="870" d="M481 287q0 -16 -9 -32l-385 -667q-14 -25 -36 -25t-22 17q0 8 6 26l239 707q18 54 94 54q40 0 76.5 -21.5t36.5 -58.5zM841 287q0 -16 -9 -32l-385 -667q-14 -25 -36 -25t-22 17q0 8 6 26l239 707q18 54 94 54q40 0 76.5 -21.5t36.5 -58.5z" />
+<glyph unicode="&#x306e;" horiz-adv-x="1919" d="M1697 1131q154 -171 154 -417.5t-174 -434.5q-150 -163 -400 -255q-211 -78 -301 -78q-39 0 -39 33q0 24 131 61q199 56 365 188q255 202 255 494q0 438 -465 564q-92 25 -239 25q-34 0 -72 -2q137 -96 137 -139.5t-54 -50.5l-53 -142q-107 -289 -232 -527 q-205 -388 -343 -388q-31 0 -42 17.5t-19 31.5l-64 28q-91 47 -137 176q-37 103 -37 228q0 485 441 737q208 119 486 119q182 0 312 -38q250 -73 390 -230zM803 1050q39 123 39 152t-11.5 62t-27.5 33q-37 0 -145.5 -42.5t-211 -139t-160.5 -199.5q-81 -144 -81 -332 t47.5 -285t114.5 -97q37 0 80 53q21 26 78 129q157 285 278 666z" />
+<glyph unicode="&#x4dc0;" d="M1724 1353h-1400v153h1400v-153zM1724 1014h-1400v153h1400v-153zM1724 675h-1400v153h1400v-153zM1724 336h-1400v153h1400v-153zM1724 -3h-1400v153h1400v-153zM1724 -342h-1400v153h1400v-153z" />
+<glyph unicode="&#x4dc1;" d="M1724 1353h-516v153h516v-153zM1724 1014h-516v153h516v-153zM1724 675h-516v153h516v-153zM840 1353h-516v153h516v-153zM1724 336h-516v153h516v-153zM840 1014h-516v153h516v-153zM1724 -3h-516v153h516v-153zM840 675h-516v153h516v-153zM1724 -342h-516v153h516 v-153zM840 336h-516v153h516v-153zM840 -3h-516v153h516v-153zM840 -342h-516v153h516v-153z" />
+<glyph unicode="&#x4dc2;" d="M1724 1353h-516v153h516v-153zM1724 675h-516v153h516v-153zM1724 1014h-1400v153h1400v-153zM840 1353h-516v153h516v-153zM1724 336h-516v153h516v-153zM1724 -3h-516v153h516v-153zM840 675h-516v153h516v-153zM840 336h-516v153h516v-153zM1724 -342h-1400v153h1400 v-153zM840 -3h-516v153h516v-153z" />
+<glyph unicode="&#x4dc3;" d="M1724 1014h-516v153h516v-153zM1724 1353h-1400v153h1400v-153zM1724 675h-516v153h516v-153zM1724 336h-516v153h516v-153zM840 1014h-516v153h516v-153zM840 675h-516v153h516v-153zM1724 -342h-516v153h516v-153zM1724 -3h-1400v153h1400v-153zM840 336h-516v153h516 v-153zM840 -342h-516v153h516v-153z" />
+<glyph unicode="&#x4dc4;" d="M1724 1353h-516v153h516v-153zM1724 675h-516v153h516v-153zM1724 1014h-1400v153h1400v-153zM840 1353h-516v153h516v-153zM1724 336h-1400v153h1400v-153zM840 675h-516v153h516v-153zM1724 -3h-1400v153h1400v-153zM1724 -342h-1400v153h1400v-153z" />
+<glyph unicode="&#x4dc5;" d="M1724 1353h-1400v153h1400v-153zM1724 1014h-1400v153h1400v-153zM1724 336h-516v153h516v-153zM1724 675h-1400v153h1400v-153zM1724 -342h-516v153h516v-153zM1724 -3h-1400v153h1400v-153zM840 336h-516v153h516v-153zM840 -342h-516v153h516v-153z" />
+<glyph unicode="&#x4dc6;" d="M1724 1353h-516v153h516v-153zM1724 1014h-516v153h516v-153zM1724 675h-516v153h516v-153zM840 1353h-516v153h516v-153zM1724 336h-516v153h516v-153zM840 1014h-516v153h516v-153zM840 675h-516v153h516v-153zM1724 -342h-516v153h516v-153zM1724 -3h-1400v153h1400 v-153zM840 336h-516v153h516v-153zM840 -342h-516v153h516v-153z" />
+<glyph unicode="&#x4dc7;" d="M1724 1353h-516v153h516v-153zM1724 675h-516v153h516v-153zM1724 1014h-1400v153h1400v-153zM840 1353h-516v153h516v-153zM1724 336h-516v153h516v-153zM1724 -3h-516v153h516v-153zM840 675h-516v153h516v-153zM1724 -342h-516v153h516v-153zM840 336h-516v153h516 v-153zM840 -3h-516v153h516v-153zM840 -342h-516v153h516v-153z" />
+<glyph unicode="&#x4dc8;" d="M1724 1353h-1400v153h1400v-153zM1724 675h-516v153h516v-153zM1724 1014h-1400v153h1400v-153zM1724 336h-1400v153h1400v-153zM840 675h-516v153h516v-153zM1724 -3h-1400v153h1400v-153zM1724 -342h-1400v153h1400v-153z" />
+<glyph unicode="&#x4dc9;" d="M1724 1353h-1400v153h1400v-153zM1724 1014h-1400v153h1400v-153zM1724 336h-516v153h516v-153zM1724 675h-1400v153h1400v-153zM1724 -3h-1400v153h1400v-153zM840 336h-516v153h516v-153zM1724 -342h-1400v153h1400v-153z" />
+<glyph unicode="&#x4dca;" d="M1724 1353h-516v153h516v-153zM1724 1014h-516v153h516v-153zM1724 675h-516v153h516v-153zM840 1353h-516v153h516v-153zM840 1014h-516v153h516v-153zM1724 336h-1400v153h1400v-153zM840 675h-516v153h516v-153zM1724 -3h-1400v153h1400v-153zM1724 -342h-1400v153 h1400v-153z" />
+<glyph unicode="&#x4dcb;" d="M1724 1353h-1400v153h1400v-153zM1724 1014h-1400v153h1400v-153zM1724 336h-516v153h516v-153zM1724 675h-1400v153h1400v-153zM1724 -3h-516v153h516v-153zM1724 -342h-516v153h516v-153zM840 336h-516v153h516v-153zM840 -3h-516v153h516v-153zM840 -342h-516v153h516 v-153z" />
+<glyph unicode="&#x4dcc;" d="M1724 1353h-1400v153h1400v-153zM1724 1014h-1400v153h1400v-153zM1724 675h-1400v153h1400v-153zM1724 -3h-516v153h516v-153zM1724 336h-1400v153h1400v-153zM1724 -342h-1400v153h1400v-153zM840 -3h-516v153h516v-153z" />
+<glyph unicode="&#x4dcd;" d="M1724 1014h-516v153h516v-153zM1724 1353h-1400v153h1400v-153zM1724 675h-1400v153h1400v-153zM840 1014h-516v153h516v-153zM1724 336h-1400v153h1400v-153zM1724 -3h-1400v153h1400v-153zM1724 -342h-1400v153h1400v-153z" />
+<glyph unicode="&#x4dce;" d="M1724 1353h-516v153h516v-153zM1724 1014h-516v153h516v-153zM1724 675h-516v153h516v-153zM840 1353h-516v153h516v-153zM840 1014h-516v153h516v-153zM1724 -3h-516v153h516v-153zM1724 336h-1400v153h1400v-153zM840 675h-516v153h516v-153zM1724 -342h-516v153h516 v-153zM840 -3h-516v153h516v-153zM840 -342h-516v153h516v-153z" />
+<glyph unicode="&#x4dcf;" d="M1724 1353h-516v153h516v-153zM1724 1014h-516v153h516v-153zM840 1353h-516v153h516v-153zM1724 336h-516v153h516v-153zM1724 675h-1400v153h1400v-153zM840 1014h-516v153h516v-153zM1724 -3h-516v153h516v-153zM1724 -342h-516v153h516v-153zM840 336h-516v153h516 v-153zM840 -3h-516v153h516v-153zM840 -342h-516v153h516v-153z" />
+<glyph unicode="&#x4dd0;" d="M1724 1353h-516v153h516v-153zM1724 1014h-1400v153h1400v-153zM840 1353h-516v153h516v-153zM1724 336h-516v153h516v-153zM1724 675h-1400v153h1400v-153zM1724 -3h-516v153h516v-153zM840 336h-516v153h516v-153zM1724 -342h-1400v153h1400v-153zM840 -3h-516v153h516 v-153z" />
+<glyph unicode="&#x4dd1;" d="M1724 1014h-516v153h516v-153zM1724 1353h-1400v153h1400v-153zM1724 675h-516v153h516v-153zM840 1014h-516v153h516v-153zM1724 336h-1400v153h1400v-153zM840 675h-516v153h516v-153zM1724 -342h-516v153h516v-153zM1724 -3h-1400v153h1400v-153zM840 -342h-516v153 h516v-153z" />
+<glyph unicode="&#x4dd2;" d="M1724 1353h-516v153h516v-153zM1724 1014h-516v153h516v-153zM1724 675h-516v153h516v-153zM840 1353h-516v153h516v-153zM1724 336h-516v153h516v-153zM840 1014h-516v153h516v-153zM840 675h-516v153h516v-153zM1724 -3h-1400v153h1400v-153zM840 336h-516v153h516 v-153zM1724 -342h-1400v153h1400v-153z" />
+<glyph unicode="&#x4dd3;" d="M1724 1353h-1400v153h1400v-153zM1724 675h-516v153h516v-153zM1724 1014h-1400v153h1400v-153zM1724 336h-516v153h516v-153zM1724 -3h-516v153h516v-153zM840 675h-516v153h516v-153zM1724 -342h-516v153h516v-153zM840 336h-516v153h516v-153zM840 -3h-516v153h516 v-153zM840 -342h-516v153h516v-153z" />
+<glyph unicode="&#x4dd4;" d="M1724 1014h-516v153h516v-153zM1724 1353h-1400v153h1400v-153zM1724 336h-516v153h516v-153zM1724 675h-1400v153h1400v-153zM840 1014h-516v153h516v-153zM1724 -3h-516v153h516v-153zM840 336h-516v153h516v-153zM1724 -342h-1400v153h1400v-153zM840 -3h-516v153h516 v-153z" />
+<glyph unicode="&#x4dd5;" d="M1724 1014h-516v153h516v-153zM1724 1353h-1400v153h1400v-153zM1724 675h-516v153h516v-153zM840 1014h-516v153h516v-153zM1724 -3h-516v153h516v-153zM1724 336h-1400v153h1400v-153zM840 675h-516v153h516v-153zM1724 -342h-1400v153h1400v-153zM840 -3h-516v153h516 v-153z" />
+<glyph unicode="&#x4dd6;" d="M1724 1014h-516v153h516v-153zM1724 1353h-1400v153h1400v-153zM1724 675h-516v153h516v-153zM1724 336h-516v153h516v-153zM840 1014h-516v153h516v-153zM1724 -3h-516v153h516v-153zM840 675h-516v153h516v-153zM1724 -342h-516v153h516v-153zM840 336h-516v153h516 v-153zM840 -3h-516v153h516v-153zM840 -342h-516v153h516v-153z" />
+<glyph unicode="&#x4dd7;" d="M1724 1353h-516v153h516v-153zM1724 1014h-516v153h516v-153zM1724 675h-516v153h516v-153zM840 1353h-516v153h516v-153zM1724 336h-516v153h516v-153zM840 1014h-516v153h516v-153zM1724 -3h-516v153h516v-153zM840 675h-516v153h516v-153zM840 336h-516v153h516v-153z M1724 -342h-1400v153h1400v-153zM840 -3h-516v153h516v-153z" />
+<glyph unicode="&#x4dd8;" d="M1724 1353h-1400v153h1400v-153zM1724 1014h-1400v153h1400v-153zM1724 336h-516v153h516v-153zM1724 675h-1400v153h1400v-153zM1724 -3h-516v153h516v-153zM840 336h-516v153h516v-153zM1724 -342h-1400v153h1400v-153zM840 -3h-516v153h516v-153z" />
+<glyph unicode="&#x4dd9;" d="M1724 1014h-516v153h516v-153zM1724 1353h-1400v153h1400v-153zM1724 675h-516v153h516v-153zM840 1014h-516v153h516v-153zM1724 336h-1400v153h1400v-153zM840 675h-516v153h516v-153zM1724 -3h-1400v153h1400v-153zM1724 -342h-1400v153h1400v-153z" />
+<glyph unicode="&#x4dda;" d="M1724 1014h-516v153h516v-153zM1724 1353h-1400v153h1400v-153zM1724 675h-516v153h516v-153zM1724 336h-516v153h516v-153zM840 1014h-516v153h516v-153zM1724 -3h-516v153h516v-153zM840 675h-516v153h516v-153zM840 336h-516v153h516v-153zM1724 -342h-1400v153h1400 v-153zM840 -3h-516v153h516v-153z" />
+<glyph unicode="&#x4ddb;" d="M1724 1353h-516v153h516v-153zM1724 1014h-1400v153h1400v-153zM840 1353h-516v153h516v-153zM1724 675h-1400v153h1400v-153zM1724 336h-1400v153h1400v-153zM1724 -342h-516v153h516v-153zM1724 -3h-1400v153h1400v-153zM840 -342h-516v153h516v-153z" />
+<glyph unicode="&#x4ddc;" d="M1724 1353h-516v153h516v-153zM1724 675h-516v153h516v-153zM1724 1014h-1400v153h1400v-153zM840 1353h-516v153h516v-153zM1724 336h-516v153h516v-153zM840 675h-516v153h516v-153zM1724 -342h-516v153h516v-153zM1724 -3h-1400v153h1400v-153zM840 336h-516v153h516 v-153zM840 -342h-516v153h516v-153z" />
+<glyph unicode="&#x4ddd;" d="M1724 1014h-516v153h516v-153zM1724 1353h-1400v153h1400v-153zM1724 675h-1400v153h1400v-153zM840 1014h-516v153h516v-153zM1724 -3h-516v153h516v-153zM1724 336h-1400v153h1400v-153zM1724 -342h-1400v153h1400v-153zM840 -3h-516v153h516v-153z" />
+<glyph unicode="&#x4dde;" d="M1724 1353h-516v153h516v-153zM1724 1014h-1400v153h1400v-153zM840 1353h-516v153h516v-153zM1724 675h-1400v153h1400v-153zM1724 -3h-516v153h516v-153zM1724 336h-1400v153h1400v-153zM1724 -342h-516v153h516v-153zM840 -3h-516v153h516v-153zM840 -342h-516v153 h516v-153z" />
+<glyph unicode="&#x4ddf;" d="M1724 1353h-516v153h516v-153zM1724 1014h-516v153h516v-153zM840 1353h-516v153h516v-153zM1724 675h-1400v153h1400v-153zM840 1014h-516v153h516v-153zM1724 336h-1400v153h1400v-153zM1724 -342h-516v153h516v-153zM1724 -3h-1400v153h1400v-153zM840 -342h-516v153 h516v-153z" />
+<glyph unicode="&#x4de0;" d="M1724 1353h-1400v153h1400v-153zM1724 1014h-1400v153h1400v-153zM1724 675h-1400v153h1400v-153zM1724 -3h-516v153h516v-153zM1724 336h-1400v153h1400v-153zM1724 -342h-516v153h516v-153zM840 -3h-516v153h516v-153zM840 -342h-516v153h516v-153z" />
+<glyph unicode="&#x4de1;" d="M1724 1353h-516v153h516v-153zM1724 1014h-516v153h516v-153zM840 1353h-516v153h516v-153zM1724 675h-1400v153h1400v-153zM840 1014h-516v153h516v-153zM1724 336h-1400v153h1400v-153zM1724 -3h-1400v153h1400v-153zM1724 -342h-1400v153h1400v-153z" />
+<glyph unicode="&#x4de2;" d="M1724 1014h-516v153h516v-153zM1724 1353h-1400v153h1400v-153zM1724 336h-516v153h516v-153zM1724 675h-1400v153h1400v-153zM840 1014h-516v153h516v-153zM1724 -3h-516v153h516v-153zM1724 -342h-516v153h516v-153zM840 336h-516v153h516v-153zM840 -3h-516v153h516 v-153zM840 -342h-516v153h516v-153z" />
+<glyph unicode="&#x4de3;" d="M1724 1353h-516v153h516v-153zM1724 1014h-516v153h516v-153zM1724 675h-516v153h516v-153zM840 1353h-516v153h516v-153zM840 1014h-516v153h516v-153zM1724 -3h-516v153h516v-153zM1724 336h-1400v153h1400v-153zM840 675h-516v153h516v-153zM1724 -342h-1400v153h1400 v-153zM840 -3h-516v153h516v-153z" />
+<glyph unicode="&#x4de4;" d="M1724 1353h-1400v153h1400v-153zM1724 675h-516v153h516v-153zM1724 1014h-1400v153h1400v-153zM1724 -3h-516v153h516v-153zM1724 336h-1400v153h1400v-153zM840 675h-516v153h516v-153zM1724 -342h-1400v153h1400v-153zM840 -3h-516v153h516v-153z" />
+<glyph unicode="&#x4de5;" d="M1724 1014h-516v153h516v-153zM1724 1353h-1400v153h1400v-153zM1724 336h-516v153h516v-153zM1724 675h-1400v153h1400v-153zM840 1014h-516v153h516v-153zM1724 -3h-1400v153h1400v-153zM840 336h-516v153h516v-153zM1724 -342h-1400v153h1400v-153z" />
+<glyph unicode="&#x4de6;" d="M1724 1353h-516v153h516v-153zM1724 675h-516v153h516v-153zM1724 1014h-1400v153h1400v-153zM840 1353h-516v153h516v-153zM1724 -3h-516v153h516v-153zM1724 336h-1400v153h1400v-153zM840 675h-516v153h516v-153zM1724 -342h-516v153h516v-153zM840 -3h-516v153h516 v-153zM840 -342h-516v153h516v-153z" />
+<glyph unicode="&#x4de7;" d="M1724 1353h-516v153h516v-153zM1724 1014h-516v153h516v-153zM840 1353h-516v153h516v-153zM1724 336h-516v153h516v-153zM1724 675h-1400v153h1400v-153zM840 1014h-516v153h516v-153zM1724 -342h-516v153h516v-153zM1724 -3h-1400v153h1400v-153zM840 336h-516v153h516 v-153zM840 -342h-516v153h516v-153z" />
+<glyph unicode="&#x4de8;" d="M1724 1014h-516v153h516v-153zM1724 1353h-1400v153h1400v-153zM1724 675h-516v153h516v-153zM1724 336h-516v153h516v-153zM840 1014h-516v153h516v-153zM840 675h-516v153h516v-153zM1724 -3h-1400v153h1400v-153zM840 336h-516v153h516v-153zM1724 -342h-1400v153 h1400v-153z" />
+<glyph unicode="&#x4de9;" d="M1724 1353h-1400v153h1400v-153zM1724 675h-516v153h516v-153zM1724 1014h-1400v153h1400v-153zM1724 336h-516v153h516v-153zM1724 -3h-516v153h516v-153zM840 675h-516v153h516v-153zM840 336h-516v153h516v-153zM1724 -342h-1400v153h1400v-153zM840 -3h-516v153h516 v-153z" />
+<glyph unicode="&#x4dea;" d="M1724 1353h-516v153h516v-153zM1724 1014h-1400v153h1400v-153zM840 1353h-516v153h516v-153zM1724 675h-1400v153h1400v-153zM1724 336h-1400v153h1400v-153zM1724 -3h-1400v153h1400v-153zM1724 -342h-1400v153h1400v-153z" />
+<glyph unicode="&#x4deb;" d="M1724 1353h-1400v153h1400v-153zM1724 1014h-1400v153h1400v-153zM1724 675h-1400v153h1400v-153zM1724 336h-1400v153h1400v-153zM1724 -342h-516v153h516v-153zM1724 -3h-1400v153h1400v-153zM840 -342h-516v153h516v-153z" />
+<glyph unicode="&#x4dec;" d="M1724 1353h-516v153h516v-153zM1724 1014h-1400v153h1400v-153zM840 1353h-516v153h516v-153zM1724 336h-516v153h516v-153zM1724 675h-1400v153h1400v-153zM1724 -3h-516v153h516v-153zM1724 -342h-516v153h516v-153zM840 336h-516v153h516v-153zM840 -3h-516v153h516 v-153zM840 -342h-516v153h516v-153z" />
+<glyph unicode="&#x4ded;" d="M1724 1353h-516v153h516v-153zM1724 1014h-516v153h516v-153zM1724 675h-516v153h516v-153zM840 1353h-516v153h516v-153zM840 1014h-516v153h516v-153zM1724 336h-1400v153h1400v-153zM840 675h-516v153h516v-153zM1724 -342h-516v153h516v-153zM1724 -3h-1400v153h1400 v-153zM840 -342h-516v153h516v-153z" />
+<glyph unicode="&#x4dee;" d="M1724 1353h-516v153h516v-153zM1724 1014h-1400v153h1400v-153zM840 1353h-516v153h516v-153zM1724 336h-516v153h516v-153zM1724 675h-1400v153h1400v-153zM1724 -342h-516v153h516v-153zM1724 -3h-1400v153h1400v-153zM840 336h-516v153h516v-153zM840 -342h-516v153 h516v-153z" />
+<glyph unicode="&#x4def;" d="M1724 1353h-516v153h516v-153zM1724 675h-516v153h516v-153zM1724 1014h-1400v153h1400v-153zM840 1353h-516v153h516v-153zM1724 336h-1400v153h1400v-153zM840 675h-516v153h516v-153zM1724 -342h-516v153h516v-153zM1724 -3h-1400v153h1400v-153zM840 -342h-516v153 h516v-153z" />
+<glyph unicode="&#x4df0;" d="M1724 1353h-516v153h516v-153zM1724 1014h-1400v153h1400v-153zM840 1353h-516v153h516v-153zM1724 675h-1400v153h1400v-153zM1724 -3h-516v153h516v-153zM1724 336h-1400v153h1400v-153zM1724 -342h-1400v153h1400v-153zM840 -3h-516v153h516v-153z" />
+<glyph unicode="&#x4df1;" d="M1724 1014h-516v153h516v-153zM1724 1353h-1400v153h1400v-153zM1724 675h-1400v153h1400v-153zM840 1014h-516v153h516v-153zM1724 336h-1400v153h1400v-153zM1724 -342h-516v153h516v-153zM1724 -3h-1400v153h1400v-153zM840 -342h-516v153h516v-153z" />
+<glyph unicode="&#x4df2;" d="M1724 1353h-516v153h516v-153zM1724 1014h-516v153h516v-153zM840 1353h-516v153h516v-153zM1724 336h-516v153h516v-153zM1724 675h-1400v153h1400v-153zM840 1014h-516v153h516v-153zM1724 -3h-516v153h516v-153zM840 336h-516v153h516v-153zM1724 -342h-1400v153h1400 v-153zM840 -3h-516v153h516v-153z" />
+<glyph unicode="&#x4df3;" d="M1724 1014h-516v153h516v-153zM1724 1353h-1400v153h1400v-153zM1724 675h-516v153h516v-153zM840 1014h-516v153h516v-153zM1724 -3h-516v153h516v-153zM1724 336h-1400v153h1400v-153zM840 675h-516v153h516v-153zM1724 -342h-516v153h516v-153zM840 -3h-516v153h516 v-153zM840 -342h-516v153h516v-153z" />
+<glyph unicode="&#x4df4;" d="M1724 1353h-1400v153h1400v-153zM1724 675h-516v153h516v-153zM1724 1014h-1400v153h1400v-153zM1724 -3h-516v153h516v-153zM1724 336h-1400v153h1400v-153zM840 675h-516v153h516v-153zM1724 -342h-516v153h516v-153zM840 -3h-516v153h516v-153zM840 -342h-516v153h516 v-153z" />
+<glyph unicode="&#x4df5;" d="M1724 1353h-516v153h516v-153zM1724 1014h-516v153h516v-153zM840 1353h-516v153h516v-153zM1724 336h-516v153h516v-153zM1724 675h-1400v153h1400v-153zM840 1014h-516v153h516v-153zM1724 -3h-1400v153h1400v-153zM840 336h-516v153h516v-153zM1724 -342h-1400v153 h1400v-153z" />
+<glyph unicode="&#x4df6;" d="M1724 1353h-516v153h516v-153zM1724 1014h-516v153h516v-153zM840 1353h-516v153h516v-153zM1724 675h-1400v153h1400v-153zM840 1014h-516v153h516v-153zM1724 -3h-516v153h516v-153zM1724 336h-1400v153h1400v-153zM1724 -342h-1400v153h1400v-153zM840 -3h-516v153 h516v-153z" />
+<glyph unicode="&#x4df7;" d="M1724 1014h-516v153h516v-153zM1724 1353h-1400v153h1400v-153zM1724 675h-1400v153h1400v-153zM840 1014h-516v153h516v-153zM1724 -3h-516v153h516v-153zM1724 336h-1400v153h1400v-153zM1724 -342h-516v153h516v-153zM840 -3h-516v153h516v-153zM840 -342h-516v153 h516v-153z" />
+<glyph unicode="&#x4df8;" d="M1724 1353h-1400v153h1400v-153zM1724 675h-516v153h516v-153zM1724 1014h-1400v153h1400v-153zM1724 336h-1400v153h1400v-153zM840 675h-516v153h516v-153zM1724 -342h-516v153h516v-153zM1724 -3h-1400v153h1400v-153zM840 -342h-516v153h516v-153z" />
+<glyph unicode="&#x4df9;" d="M1724 1353h-516v153h516v-153zM1724 1014h-1400v153h1400v-153zM840 1353h-516v153h516v-153zM1724 336h-516v153h516v-153zM1724 675h-1400v153h1400v-153zM1724 -3h-1400v153h1400v-153zM840 336h-516v153h516v-153zM1724 -342h-1400v153h1400v-153z" />
+<glyph unicode="&#x4dfa;" d="M1724 1353h-1400v153h1400v-153zM1724 675h-516v153h516v-153zM1724 1014h-1400v153h1400v-153zM1724 336h-516v153h516v-153zM840 675h-516v153h516v-153zM1724 -342h-516v153h516v-153zM1724 -3h-1400v153h1400v-153zM840 336h-516v153h516v-153zM840 -342h-516v153 h516v-153z" />
+<glyph unicode="&#x4dfb;" d="M1724 1353h-516v153h516v-153zM1724 675h-516v153h516v-153zM1724 1014h-1400v153h1400v-153zM840 1353h-516v153h516v-153zM1724 336h-516v153h516v-153zM840 675h-516v153h516v-153zM1724 -3h-1400v153h1400v-153zM840 336h-516v153h516v-153zM1724 -342h-1400v153 h1400v-153z" />
+<glyph unicode="&#x4dfc;" d="M1724 1353h-1400v153h1400v-153zM1724 675h-516v153h516v-153zM1724 1014h-1400v153h1400v-153zM1724 336h-516v153h516v-153zM840 675h-516v153h516v-153zM1724 -3h-1400v153h1400v-153zM840 336h-516v153h516v-153zM1724 -342h-1400v153h1400v-153z" />
+<glyph unicode="&#x4dfd;" d="M1724 1353h-516v153h516v-153zM1724 1014h-516v153h516v-153zM840 1353h-516v153h516v-153zM1724 675h-1400v153h1400v-153zM840 1014h-516v153h516v-153zM1724 -3h-516v153h516v-153zM1724 336h-1400v153h1400v-153zM1724 -342h-516v153h516v-153zM840 -3h-516v153h516 v-153zM840 -342h-516v153h516v-153z" />
+<glyph unicode="&#x4dfe;" d="M1724 1353h-516v153h516v-153zM1724 675h-516v153h516v-153zM1724 1014h-1400v153h1400v-153zM840 1353h-516v153h516v-153zM1724 -3h-516v153h516v-153zM1724 336h-1400v153h1400v-153zM840 675h-516v153h516v-153zM1724 -342h-1400v153h1400v-153zM840 -3h-516v153h516 v-153z" />
+<glyph unicode="&#x4dff;" d="M1724 1014h-516v153h516v-153zM1724 1353h-1400v153h1400v-153zM1724 336h-516v153h516v-153zM1724 675h-1400v153h1400v-153zM840 1014h-516v153h516v-153zM1724 -342h-516v153h516v-153zM1724 -3h-1400v153h1400v-153zM840 336h-516v153h516v-153zM840 -342h-516v153 h516v-153z" />
+<glyph unicode="&#x4e2d;" horiz-adv-x="1790" d="M1722 1054q0 -30 -83 -40v-643q-69 -56 -106.5 -56t-37.5 36v82h-582v-682q-63 -57 -100 -57q-15 0 -29.5 12t-14.5 27v700h-555v-77q-69 -56 -102 -56q-44 0 -44 49v841l157 -82h544v361h31q12 0 147 -24q47 -8 47 -27.5t-29 -35.5t-52 -20v-254h562l67 77 q180 -112 180 -131zM1495 512v519h-582v-519h582zM769 512v519h-555v-519h555z" />
+<glyph unicode="&#xf700;" horiz-adv-x="1364" d="M1358 0q-126 4 -160 4t-160 -4v67l47 -2q72 0 72 73v700q0 169 -159 271q-137 87 -317 87t-316 -87q-158 -100 -158 -271v-700q0 -56 36 -68q11 -4 48 -4q16 0 35 1v-67q-126 4 -160 4t-160 -4v67l47 -2q72 0 72 73v706q0 203 183 326q160 108 374 108t374 -108 q183 -123 183 -326v-706q0 -56 36 -68q11 -4 48 -4q16 0 35 1v-67z" />
+<glyph unicode="&#xf701;" horiz-adv-x="1364" d="M1239 1140v-706q0 -203 -183 -326q-160 -108 -374 -108t-374 108q-183 123 -183 326v706q0 56 -36 68q-11 4 -48 4q-16 0 -35 -1v67q126 -4 160 -4t160 4v-67l-47 2q-72 0 -72 -73v-700q0 -169 159 -271q137 -87 317 -87t316 87q158 100 158 271v700q0 56 -36 68 q-11 4 -48 4q-16 0 -35 -1v67q126 -4 160 -4t160 4v-67l-47 2q-72 0 -72 -73z" />
+<glyph unicode="&#xf702;" horiz-adv-x="1591" d="M1421 331q0 -41 -41 -41q-8 0 -14 3l-1169 552q-27 13 -27 37t27 37l1169 552q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-1090 -514l1090 -514q24 -11 24 -37zM1421 -259q0 -41 -37 -41h-548v-103q0 -39 -41 -39t-41 39v103h-545q-39 0 -39 41t39 41h545v218h-545 q-39 0 -39 41t39 41h545v105q0 37 41 37t41 -37v-105h548q37 0 37 -41t-37 -41h-548v-218h548q37 0 37 -41z" />
+<glyph unicode="&#xf703;" horiz-adv-x="1591" d="M1421 882q0 -24 -27 -37l-1169 -552q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l1090 514l-1090 514q-24 11 -24 37q0 41 41 41q8 0 14 -3l1169 -552q27 -13 27 -37zM1421 -259q0 -41 -37 -41h-548v-103q0 -39 -41 -39t-41 39v103h-545q-39 0 -39 41t39 41h545v218h-545 q-39 0 -39 41t39 41h545v105q0 37 41 37t41 -37v-105h548q37 0 37 -41t-37 -41h-548v-218h548q37 0 37 -41z" />
+<glyph unicode="&#xf704;" horiz-adv-x="1591" d="M1421 397q0 -41 -41 -41q-8 0 -14 3l-1169 552q-27 13 -27 37t27 37l1169 552q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-1090 -514l1090 -514q24 -11 24 -37zM1407 99q20 0 20 -22t-11 -49q-45 -109 -146.5 -183t-216.5 -74q-148 0 -255 136l-169 254q-105 136 -248 136 q-101 0 -174 -56q-45 -35 -87.5 -98t-55.5 -63q-19 0 -19 21.5t11 48.5q45 109 146.5 183t216.5 74q148 0 261 -136l175 -254q106 -136 235 -136q102 0 176 57q45 34 86.5 97.5t54.5 63.5z" />
+<glyph unicode="&#xf705;" horiz-adv-x="1591" d="M1421 948q0 -24 -27 -37l-1169 -552q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l1090 514l-1090 514q-24 11 -24 37q0 41 41 41q8 0 14 -3l1169 -552q27 -13 27 -37zM1446 420q0 -156 -90.5 -254.5t-244.5 -98.5q-56 0 -167.5 16t-167.5 16q-158 0 -244 -105 q-68 -83 -68 -181q0 -48 18.5 -112.5t18.5 -75.5q0 -21 -17 -21q-22 0 -46 45q-49 91 -49 201q0 163 96.5 260.5t258.5 97.5q55 0 163 -13.5t163 -13.5q156 0 234 95q68 82 68 181q0 51 -19.5 116.5t-19.5 72.5q0 21 18 21q22 0 47 -46q48 -90 48 -201z" />
+<glyph unicode="&#xf706;" horiz-adv-x="1591" d="M1421 150q0 -24 -27 -37l-557 -263v-251q0 -41 -41 -41t-41 41v212l-530 -250q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l561 265v498l-561 265q-24 11 -24 37q0 41 41 41q8 0 14 -3l530 -250v225l-558 263q-27 13 -27 37t27 37l558 263v253q0 39 41 39t41 -39v-214l529 250 q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-560 -264v-500l560 -264q24 -11 24 -37q0 -41 -41 -41q-8 0 -14 3l-529 250v-225l557 -263q27 -13 27 -37zM755 803v422l-448 -211zM1284 150l-447 211v-422z" />
+<glyph unicode="&#xf707;" horiz-adv-x="1591" d="M1421 -401q0 -41 -41 -41q-8 0 -14 3l-528 249v-211q0 -41 -41 -41t-41 41v250l-559 264q-27 13 -27 37t27 37l559 264v225l-531 -251q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l562 265v498l-562 265q-24 11 -24 37q0 41 41 41q8 0 14 -3l531 -251v215q0 39 41 39t41 -39 v-253l556 -263q27 -13 27 -37t-27 -37l-556 -263v-224l528 249q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-559 -264v-500l559 -264q24 -11 24 -37zM1284 1014l-446 210v-420zM756 -62v424l-449 -212z" />
+<glyph unicode="&#xf708;" horiz-adv-x="1591" d="M1421 -259q0 -41 -37 -41h-578l-35 -95q-17 -47 -44 -47q-42 0 -42 38q0 15 8 37l24 67h-508q-39 0 -39 41t39 41h538l80 218h-35q-248 0 -435 168.5t-187 413.5t187 413.5t435 168.5h590q39 0 39 -41t-39 -41h-584q-216 0 -381 -143.5t-165 -356.5t165 -356.5 t381 -143.5h59l165 454q17 46 43 46q42 0 42 -37q0 -15 -8 -37l-155 -426h438q39 0 39 -41t-39 -41h-468l-79 -218h549q37 0 37 -41z" />
+<glyph unicode="&#xf709;" horiz-adv-x="1591" d="M1421 -259q0 -41 -37 -41h-818l-35 -95q-17 -47 -44 -47q-42 0 -42 38q0 15 8 37l24 67h-268q-39 0 -39 41t39 41h298l80 218h-378q-39 0 -39 41t39 41h408l165 454q17 46 43 46q42 0 42 -37q0 -15 -8 -37l-155 -426h89q216 0 381 143.5t165 356.5t-165 356.5t-381 143.5 h-584q-39 0 -39 41t39 41h590q248 0 435 -168.5t187 -413.5t-187 -413.5t-435 -168.5h-125l-79 -218h789q37 0 37 -41z" />
+<glyph unicode="&#xf70a;" horiz-adv-x="1364" d="M1358 0q-126 4 -160 4t-160 -4v67l47 -2q72 0 72 73v1054h-950v-1054q0 -56 36 -68q11 -4 48 -4q16 0 35 1v-67q-126 4 -160 4t-160 -4v67l47 -2q72 0 72 73v1099q0 37 39 37h1038q37 0 37 -37v-1099q0 -56 36 -68q11 -4 48 -4q16 0 35 1v-67z" />
+<glyph unicode="&#xf70b;" horiz-adv-x="1364" d="M1239 1140v-1101q0 -39 -37 -39h-1038q-39 0 -39 39v1101q0 56 -36 68q-11 4 -48 4q-16 0 -35 -1v67q126 -4 160 -4t160 4v-67l-47 2q-72 0 -72 -73v-1058h950v1058q0 56 -36 68q-11 4 -48 4q-16 0 -35 -1v67q126 -4 160 -4t160 4v-67l-47 2q-72 0 -72 -73z" />
+<glyph unicode="&#xf70c;" horiz-adv-x="1591" d="M1307 1093q211 -212 211 -510.5t-211.5 -511t-509.5 -212.5t-510.5 212.5t-212.5 511.5t211.5 510.5t511 211.5t510.5 -212zM1248.5 129.5q187.5 188.5 187.5 453t-187.5 452.5t-452.5 188t-452.5 -187.5t-187.5 -452.5t188.5 -453.5t452.5 -188.5t451.5 188.5zM1351 582 q0 -41 -37 -41h-477v-477q0 -37 -41 -37t-41 37v477h-476q-39 0 -39 41t39 41h476v476q0 39 41 39t41 -39v-476h477q37 0 37 -41z" />
+<glyph unicode="&#xf70d;" horiz-adv-x="1591" d="M1307 1093q211 -212 211 -510.5t-211.5 -511t-509.5 -212.5t-510.5 212.5t-212.5 511.5t211.5 510.5t511 211.5t510.5 -212zM1248.5 129.5q187.5 188.5 187.5 453t-187.5 452.5t-452.5 188t-452.5 -187.5t-187.5 -452.5t188.5 -453.5t452.5 -188.5t451.5 188.5zM1201 219 q0 -43 -43 -43q-15 0 -25 10l-337 338l-337 -337q-10 -10 -26 -10q-42 0 -42 42q0 16 10 26l337 337l-337 336q-10 10 -10 27q0 42 42 42q15 0 26 -11l337 -336l337 337q10 10 25 10q43 0 43 -43q0 -15 -10 -25l-337 -337l337 -338q10 -10 10 -25z" />
+<glyph unicode="&#xf70e;" horiz-adv-x="1591" d="M1307 1093q211 -212 211 -510.5t-211.5 -511t-509.5 -212.5t-510.5 212.5t-212.5 511.5t211.5 510.5t511 211.5t510.5 -212zM1388 825q-73 178 -233.5 288t-358 110t-359 -110t-233.5 -288h1184zM1436 582q0 82 -20 161h-1240q-20 -79 -20 -161t21 -161h1238 q21 79 21 161zM797 -59q197 0 357.5 110.5t233.5 287.5h-1184q73 -177 234.5 -287.5t358.5 -110.5z" />
+<glyph unicode="&#xf70f;" horiz-adv-x="1591" d="M1421 800q0 -45 -39 -45q-6 0 -15 3l-1170 384q-27 9 -27 39t27 39l1170 384q6 2 13 2q41 0 41 -41q0 -31 -25 -39l-1051 -345l1051 -345q25 -8 25 -36zM1421 392q0 -45 -39 -45q-6 0 -15 3l-1172 385q-25 8 -25 39q0 41 41 41q7 0 13 -2l1172 -385q25 -8 25 -36z M1421 -16q0 -30 -27 -39l-1170 -384q-9 -3 -15 -3q-39 0 -39 45q0 28 25 36l1051 345l-1051 345q-25 8 -25 39q0 41 41 41q7 0 13 -2l1170 -384q27 -9 27 -39z" />
+<glyph unicode="&#xf710;" horiz-adv-x="1591" d="M1421 1181q0 -30 -27 -39l-1170 -384q-9 -3 -15 -3q-39 0 -39 45q0 28 25 36l1051 345l-1051 345q-25 8 -25 39q0 41 41 41q7 0 13 -2l1170 -384q27 -9 27 -39zM1421 774q0 -31 -25 -39l-1172 -385q-9 -3 -15 -3q-39 0 -39 45q0 28 25 36l1172 385q6 2 13 2q41 0 41 -41z M1421 -397q0 -45 -39 -45q-6 0 -15 3l-1170 384q-27 9 -27 39t27 39l1170 384q6 2 13 2q41 0 41 -41q0 -31 -25 -39l-1051 -345l1051 -345q25 -8 25 -36z" />
+<glyph unicode="&#xf711;" horiz-adv-x="1024" d="M788 1113v-1072q0 -41 -39 -41h-476q-37 0 -37 41t37 41h433v1031q0 39 41 39t41 -39z" />
+<glyph unicode="&#xf712;" horiz-adv-x="1024" d="M788 41q0 -41 -37 -41h-476q-39 0 -39 41v1072q0 39 41 39t41 -39v-1031h433q37 0 37 -41z" />
+<glyph unicode="&#xf713;" horiz-adv-x="1591" d="M1421 -353q0 -41 -41 -41q-8 0 -14 3l-1169 552q-27 13 -27 37t27 37l1169 552q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-1090 -514l1090 -514q24 -11 24 -37zM1202 1296q0 -163 -96.5 -260.5t-258.5 -97.5q-55 0 -163 13.5t-163 13.5q-156 0 -234 -95q-68 -82 -68 -181 q0 -51 19.5 -116.5t19.5 -72.5q0 -21 -18 -21q-22 0 -47 46q-48 90 -48 201q0 156 90.5 254.5t244.5 98.5q56 0 167.5 -16t167.5 -16q158 0 244 105q68 83 68 181q0 48 -18.5 112.5t-18.5 75.5q0 21 17 21q22 0 46 -45q49 -91 49 -201z" />
+<glyph unicode="&#xf714;" horiz-adv-x="1591" d="M1421 198q0 -24 -27 -37l-1169 -552q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l1090 514l-1090 514q-24 11 -24 37q0 41 41 41q8 0 14 -3l1169 -552q27 -13 27 -37zM1527 1066q19 0 19 -21.5t-11 -48.5q-45 -109 -146.5 -183t-216.5 -74q-148 0 -261 136l-175 254 q-106 136 -235 136q-102 0 -176 -57q-45 -34 -86.5 -97.5t-54.5 -63.5q-20 0 -20 22t11 49q45 109 146.5 183t216.5 74q148 0 255 -136l169 -254q105 -136 248 -136q101 0 174 56q45 35 87.5 98t55.5 63z" />
+<glyph unicode="&#xf715;" horiz-adv-x="1591" d="M1421 31q0 -41 -41 -41q-8 0 -14 3l-1169 552q-27 13 -27 37t27 37l1169 552q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-1003 -473h988q39 0 39 -41t-39 -41h-988l1003 -473q24 -11 24 -37zM1421 -367q0 -41 -41 -41q-8 0 -14 3l-1176 555q-20 9 -20 34q0 41 41 41 q12 0 16 -2l1176 -555q18 -8 18 -35z" />
+<glyph unicode="&#xf716;" horiz-adv-x="1591" d="M1421 582q0 -24 -27 -37l-1169 -552q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l1003 473h-988q-39 0 -39 41t39 41h988l-1003 473q-24 11 -24 37q0 41 41 41q8 0 14 -3l1169 -552q27 -13 27 -37zM1421 184q0 -25 -20 -34l-1176 -555q-6 -3 -14 -3q-41 0 -41 41q0 27 18 35 l1176 555q4 2 16 2q41 0 41 -41z" />
+<glyph unicode="&#xf717;" horiz-adv-x="1591" d="M1421 -259q0 -41 -37 -41h-618l-35 -95q-17 -47 -44 -47q-42 0 -42 38q0 15 8 37l24 67h-468q-39 0 -39 41t39 41h498l80 218h-578q-39 0 -39 41t39 41h608l79 218h-104q-248 0 -435 168.5t-187 413.5t187 413.5t435 168.5h590q39 0 39 -41t-39 -41h-584 q-216 0 -381 -143.5t-165 -356.5t165 -356.5t381 -143.5h128l107 294q17 46 43 46q42 0 42 -37q0 -15 -8 -37l-97 -266h369q39 0 39 -41t-39 -41h-398l-80 -218h480q37 0 37 -41t-37 -41h-509l-80 -218h589q37 0 37 -41z" />
+<glyph unicode="&#xf718;" horiz-adv-x="1591" d="M1421 -259q0 -41 -37 -41h-878l-35 -95q-17 -47 -44 -47q-42 0 -42 38q0 15 8 37l24 67h-208q-39 0 -39 41t39 41h238l80 218h-318q-39 0 -39 41t39 41h348l79 218h-427q-39 0 -39 41t39 41h457l107 294q17 46 43 46q42 0 42 -37q0 -15 -8 -37l-97 -266h40 q216 0 381 143.5t165 356.5t-165 356.5t-381 143.5h-584q-39 0 -39 41t39 41h590q248 0 435 -168.5t187 -413.5t-187 -413.5t-435 -168.5h-75l-80 -218h740q37 0 37 -41t-37 -41h-769l-80 -218h849q37 0 37 -41z" />
+<glyph unicode="&#xfe10;" horiz-adv-x="512" d="M326 33q-33 -33 -83 -33t-78.5 32.5t-28.5 76t29 76t85 32.5t91 -58t35 -157q0 -152 -76.5 -274.5t-110.5 -122.5q-20 0 -20 22q0 8 14 23q148 157 148 352q0 30 -5 31z" />
+<glyph unicode="&#xfe11;" horiz-adv-x="512" d="M262 -219l16 90q0 85 -83.5 147.5t-170.5 62.5q47 50 141 50q125 0 225 -111.5t100 -238.5q0 -46 -34 -80t-80 -34t-80 34t-34 80z" />
+<glyph unicode="&#xfe12;" horiz-adv-x="512" d="M333 185q32 -32 32 -76.5t-32 -76.5t-77 -32t-77 32t-32 76.5t32 76.5t77 32t77 -32z" />
+<glyph unicode="&#xfe13;" horiz-adv-x="547" d="M378 104q0 -42 -31 -73t-73.5 -31t-73.5 31t-31 73t31 73t73.5 31t73.5 -31t31 -73zM378 743q0 -42 -31 -73t-73.5 -31t-73.5 31t-31 73t31 73t73.5 31t73.5 -31t31 -73z" />
+<glyph unicode="&#xfe14;" horiz-adv-x="569" d="M387 774q0 -45 -31.5 -76.5t-76.5 -31.5t-77 32t-32 76.5t32 76.5t76.5 32t76.5 -32t32 -77zM348 23q-26 -23 -73.5 -23t-76 32.5t-28.5 76t29 76t80 32.5q114 0 114 -211q0 -153 -69.5 -277t-100.5 -124q-20 0 -20 22q0 11 14 27q131 151 131 369z" />
+<glyph unicode="&#xfe15;" horiz-adv-x="682" d="M418 185q32 -32 32 -76.5t-32 -76.5t-77 -32t-77 32t-32 76.5t32 76.5t77 32t77 -32zM341 383q-25 0 -29 47l-79 932v10q0 40 30 66q34 28 78 28t78 -28q30 -26 30 -66v-10l-79 -934q-4 -45 -29 -45z" />
+<glyph unicode="&#xfe16;" horiz-adv-x="909" d="M504 185q32 -32 32 -76.5t-32 -76.5t-77 -32t-77 32t-32 76.5t32 76.5t77 32t77 -32zM743 1350q79 -73 79 -191.5t-98 -191.5q-270 -200 -270 -457v-72q0 -55 -26 -55t-26 49v92q0 267 181 461q69 74 69 182t-28 152q-49 80 -195 80q-187 0 -268 -139q114 0 114 -93.5 t-94 -93.5t-94 102.5t95.5 185.5t252.5 83q207 0 308 -94z" />
+<glyph unicode="&#xfe17;" horiz-adv-x="1864" d="M1864 -370q0 -52 -21 -52q-11 0 -20 11q-32 44 -105 127q-249 239 -786 239t-786 -239l-105 -127q-9 -11 -20 -11q-21 0 -21 52v507h1864v-507zM1782 55h-1700v-291q282 273 853.5 273t846.5 -271v289z" />
+<glyph unicode="&#xfe18;" horiz-adv-x="1864" d="M1864 -137h-1864v507q0 52 21 52q11 0 20 -11q32 -44 105 -127q249 -239 786 -239t786 239l105 127q9 11 20 11q21 0 21 -52v-507zM1782 -55v291q-282 -273 -853.5 -273t-846.5 271v-289h1700z" />
+<glyph unicode="&#xfe19;" horiz-adv-x="800" d="M479 1399.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5zM479 191.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5zM479 795.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79 t79 32.5t80 -33.5z" />
+<glyph unicode="&#xfe1a;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#xfe1b;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#xfe1c;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#xfe1d;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#xfe1e;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#xfe1f;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#xfe20;" horiz-adv-x="0" d="M587 1475q-623 0 -989 -314q-23 -20 -132 -137q-11 -12 -26 -12q-34 0 -34 26q0 9 6 17q203 255 517.5 388.5t657.5 133.5v-102z" />
+<glyph unicode="&#xfe21;" horiz-adv-x="0" d="M594 1038q0 -26 -34 -26q-15 0 -26 12q-42 48 -132 137q-367 314 -989 314v102q344 0 658 -133.5t517 -388.5q6 -8 6 -17z" />
+<glyph unicode="&#xfe22;" horiz-adv-x="0" d="M63 1500q-240 0 -316 -304h-56q31 177 145.5 290t267 113t386.5 -99l97 -41v-123l-139 59q-247 105 -385 105z" />
+<glyph unicode="&#xfe23;" horiz-adv-x="0" d="M309 1599q-35 -171 -140 -287t-263 -116t-426 112l-67 28v123l107 -46q270 -116 410 -116q252 0 323 302h56z" />
+<glyph unicode="&#xfe24;" horiz-adv-x="0" d="M1244 1462h-672v114h672v-114z" />
+<glyph unicode="&#xfe25;" horiz-adv-x="0" d="M572 1462h-672v114h672v-114z" />
+<glyph unicode="&#xfe26;" horiz-adv-x="0" d="M1244 1462h-1344v114h1344v-114z" />
+<glyph unicode="&#xfe27;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#xfe28;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#xfe29;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#xfe2a;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#xfe2b;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#xfe2c;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#xfe2d;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#xfe2e;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#xfe2f;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#xfe30;" horiz-adv-x="800" d="M479.5 875q33.5 -34 33.5 -79.5t-33.5 -79t-80 -33.5t-79 33t-32.5 79t33.5 80t79 34t79 -34zM513 113q0 -47 -33 -80t-80 -33t-80 33t-33 79.5t33.5 80t80 33.5t79.5 -33t33 -80z" />
+<glyph unicode="&#xfe31;" horiz-adv-x="626" d="M354 -308q0 -39 -41 -39t-41 39v1782q0 37 41 37t41 -37v-1782z" />
+<glyph unicode="&#xfe32;" horiz-adv-x="626" d="M354 204q0 -39 -41 -39t-41 39v758q0 37 41 37t41 -37v-758z" />
+<glyph unicode="&#xfe33;" horiz-adv-x="626" d="M354 -8q0 -39 -41 -39t-41 39v1182q0 37 41 37t41 -37v-1182z" />
+<glyph unicode="&#xfe34;" horiz-adv-x="810" d="M604 270q12 -12 12 -30.5t-12 -30.5l-310 -303l136 -136q16 -16 16 -32v-115q0 -39 -41 -39t-41 39v96l-158 156q-12 12 -12 30.5t12 30.5l310 303l-310 304q-12 12 -12 30.5t12 30.5l310 303l-310 303q-12 12 -12 31t12 31l158 155v94q0 39 41 39t41 -39v-112 q0 -17 -16 -33l-136 -135l310 -303q12 -12 12 -31t-12 -31l-310 -303z" />
+<glyph unicode="&#xfe35;" horiz-adv-x="1864" d="M1864 -210q0 -24 -27 -24q-11 0 -20 11q-33 44 -105 127q-291 293 -780 293t-780 -293q-24 -24 -105 -127q-9 -11 -20 -11q-27 0 -27 24q0 10 5 17q153 229 400.5 356.5t526.5 127.5t526.5 -127.5t400.5 -356.5q5 -7 5 -17z" />
+<glyph unicode="&#xfe36;" horiz-adv-x="1864" d="M1864 267q0 -10 -5 -17q-153 -229 -400.5 -356.5t-526.5 -127.5t-526.5 127.5t-400.5 356.5q-5 7 -5 17q0 24 27 24q11 0 20 -11q33 -44 105 -127q291 -293 780 -293t780 293q24 24 105 127q9 11 20 11q27 0 27 -24z" />
+<glyph unicode="&#xfe37;" horiz-adv-x="1864" d="M1864 -332q0 -41 -20.5 -41t-24.5 18q-9 154 -94 237q-43 42 -114 54q-34 5 -129 5h-277q-89 0 -132 21q-96 47 -141 202q-45 -155 -141 -202q-42 -21 -131 -21h-277q-95 0 -129 -5q-71 -12 -114 -54q-85 -83 -94 -237q-4 -18 -23 -18q-23 0 -23 41q0 174 78 285 q51 73 116 93q42 13 149 13h313q117 0 181 72t73 190q2 33 21 33t22 -18t4 -35q31 -242 252 -242h313q107 0 149 -13q65 -20 116 -93q77 -109 77 -285z" />
+<glyph unicode="&#xfe38;" horiz-adv-x="1864" d="M1864 332q0 -174 -78 -285q-51 -73 -116 -93q-42 -13 -149 -13h-313q-117 0 -181 -72t-73 -190q-2 -33 -21 -33t-22 18t-4 35q-31 242 -252 242h-313q-107 0 -149 13q-65 20 -116 93q-77 109 -77 285q0 41 20.5 41t24.5 -18q9 -154 94 -237q43 -42 114 -54q34 -5 129 -5 h277q89 0 132 -21q96 -47 141 -202q45 155 141 202q42 21 131 21h277q95 0 129 5q71 12 114 54q85 83 94 237q4 18 23 18q23 0 23 -41z" />
+<glyph unicode="&#xfe39;" horiz-adv-x="1864" d="M1442 -56h-1020q-47 0 -188.5 -122.5t-161.5 -155.5h-72l287 390h1290l287 -390h-72q-20 33 -161.5 155.5t-188.5 122.5z" />
+<glyph unicode="&#xfe3a;" horiz-adv-x="1864" d="M422 56h1020q47 0 188.5 122.5t161.5 155.5h72l-287 -390h-1290l-287 390h72q20 -33 161.5 -155.5t188.5 -122.5z" />
+<glyph unicode="&#xfe3b;" horiz-adv-x="1864" d="M1864 -366q0 -52 -21 -52q-11 0 -20 11q-33 44 -105 127q-247 239 -786 239t-786 -239q-16 -16 -105 -127q-9 -11 -20 -11q-21 0 -21 52v407h1864v-407z" />
+<glyph unicode="&#xfe3c;" horiz-adv-x="1864" d="M1864 -41h-1864v407q0 52 21 52q11 0 20 -11q33 -44 105 -127q247 -239 786 -239t786 239q16 16 105 127q9 11 20 11q21 0 21 -52v-407z" />
+<glyph unicode="&#xfe3d;" horiz-adv-x="1864" d="M1864 -390q0 -42 -38 -42q-12 0 -41 15l-853 444l-853 -444q-29 -15 -41 -15q-38 0 -38 42q0 24 39 44l893 465l893 -465q39 -20 39 -44zM1864 -101q0 -42 -38 -42q-12 0 -41 15l-853 444l-853 -444q-29 -15 -41 -15q-38 0 -38 42q0 24 39 44l893 465l893 -465 q39 -20 39 -44z" />
+<glyph unicode="&#xfe3e;" horiz-adv-x="1864" d="M1864 77q0 -24 -39 -44l-893 -465l-893 465q-39 20 -39 44q0 42 38 42q12 0 41 -15l853 -444l853 444q29 15 41 15q38 0 38 -42zM1864 366q0 -24 -39 -44l-893 -465l-893 465q-39 20 -39 44q0 42 38 42q12 0 41 -15l853 -444l853 444q29 15 41 15q38 0 38 -42z" />
+<glyph unicode="&#xfe3f;" horiz-adv-x="1864" d="M1864 -200q0 -42 -38 -42q-12 0 -41 15l-853 444l-853 -444q-29 -15 -41 -15q-38 0 -38 42q0 24 39 44l893 465l893 -465q39 -20 39 -44z" />
+<glyph unicode="&#xfe40;" horiz-adv-x="1864" d="M1864 267q0 -24 -39 -44l-893 -465l-893 465q-39 20 -39 44q0 42 38 42q12 0 41 -15l853 -444l853 444q29 15 41 15q38 0 38 -42z" />
+<glyph unicode="&#xfe41;" horiz-adv-x="1556" d="M1556 -350q0 -68 -40.5 -68t-40.5 68v309h-1475v82h1556v-391z" />
+<glyph unicode="&#xfe42;" horiz-adv-x="1556" d="M1556 -41h-1556v391q0 68 40.5 68t40.5 -68v-309h1475v-82z" />
+<glyph unicode="&#xfe43;" horiz-adv-x="1556" d="M1556 -350q0 -68 -41 -68t-41 68v109h-1474v82h1474v118h-1474v82h1556v-391z" />
+<glyph unicode="&#xfe44;" horiz-adv-x="1556" d="M1556 -41h-1556v391q0 68 41 68t41 -68v-109h1474v-82h-1474v-118h1474v-82z" />
+<glyph unicode="&#xfe45;" horiz-adv-x="1315" d="M1174 442q0 -96 -66 -154.5t-167 -58.5t-178 62q-46 37 -62.5 72.5t-31.5 105.5q-30 142 -135 227.5t-251 85.5q-79 0 -142 -24q138 205 428 205q220 0 412.5 -152.5t192.5 -368.5z" />
+<glyph unicode="&#xfe46;" horiz-adv-x="1315" d="M1174 442q0 -96 -66 -154.5t-167 -58.5t-178 62q-46 37 -62.5 72.5t-31.5 105.5q-30 142 -135 227.5t-251 85.5q-79 0 -142 -24q138 205 428 205q220 0 412.5 -152.5t192.5 -368.5zM569 903q-145 0 -253 -62q158 -10 267 -107t145 -253q15 -64 25.5 -88.5t47.5 -54.5 q62 -49 142.5 -49t128.5 45q42 40 42 107v14v3q-33 198 -187.5 321.5t-357.5 123.5z" />
+<glyph unicode="&#xfe47;" horiz-adv-x="1864" d="M1864 -356q0 -62 -40.5 -62t-40.5 68v309h-1701v-309q0 -68 -41 -68t-41 62v397h1864v-397z" />
+<glyph unicode="&#xfe48;" horiz-adv-x="1864" d="M1864 -41h-1864v397q0 62 40.5 62t40.5 -68v-309h1701v309q0 68 41 68t41 -62v-397z" />
+<glyph unicode="&#xfe49;" horiz-adv-x="1074" d="M1074 1506q0 -41 -39 -41h-196q-39 0 -39 41t39 41h196q39 0 39 -41zM674 1506q0 -41 -39 -41h-196q-39 0 -39 41t39 41h196q39 0 39 -41zM274 1506q0 -41 -39 -41h-196q-39 0 -39 41t39 41h196q39 0 39 -41z" />
+<glyph unicode="&#xfe4a;" horiz-adv-x="1074" d="M1074 1506q0 -41 -39 -41h-296q-39 0 -39 41t39 41h296q39 0 39 -41zM624 1506q0 -41 -39 -41h-96q-39 0 -39 41t39 41h96q39 0 39 -41zM374 1506q0 -41 -39 -41h-296q-39 0 -39 41t39 41h296q39 0 39 -41z" />
+<glyph unicode="&#xfe4b;" horiz-adv-x="2076" d="M2026 1375q0 -41 -39 -41h-112q-17 0 -33 16l-135 136l-303 -310q-12 -12 -31 -12t-31 12l-303 310l-303 -310q-12 -12 -30.5 -12t-30.5 12l-303 310l-136 -136q-16 -16 -32 -16h-115q-39 0 -39 41t39 41h96l156 158q12 12 30.5 12t30.5 -12l303 -310l304 310 q12 12 30.5 12t30.5 -12l303 -310l303 310q12 12 31 12t31 -12l155 -158h94q39 0 39 -41z" />
+<glyph unicode="&#xfe4c;" horiz-adv-x="2076" d="M2026 262q0 -41 -39 -41h-112q-17 0 -33 16l-135 136l-303 -310q-12 -12 -31 -12t-31 12l-303 310l-303 -310q-12 -12 -30.5 -12t-30.5 12l-303 310l-136 -136q-16 -16 -32 -16h-115q-39 0 -39 41t39 41h96l156 158q12 12 30.5 12t30.5 -12l303 -310l304 310 q12 12 30.5 12t30.5 -12l303 -310l303 310q12 12 31 12t31 -12l155 -158h94q39 0 39 -41zM2026 762q0 -41 -39 -41h-112q-17 0 -33 16l-135 136l-303 -310q-12 -12 -31 -12t-31 12l-303 310l-303 -310q-12 -12 -30.5 -12t-30.5 12l-303 310l-136 -136q-16 -16 -32 -16h-115 q-39 0 -39 41t39 41h96l156 158q12 12 30.5 12t30.5 -12l303 -310l304 310q12 12 30.5 12t30.5 -12l303 -310l303 310q12 12 31 12t31 -12l155 -158h94q39 0 39 -41z" />
+<glyph unicode="&#xfe4d;" horiz-adv-x="1074" d="M1074 -300q0 -41 -39 -41h-196q-39 0 -39 41t39 41h196q39 0 39 -41zM674 -300q0 -41 -39 -41h-196q-39 0 -39 41t39 41h196q39 0 39 -41zM274 -300q0 -41 -39 -41h-196q-39 0 -39 41t39 41h196q39 0 39 -41z" />
+<glyph unicode="&#xfe4e;" horiz-adv-x="1074" d="M1074 -300q0 -41 -39 -41h-296q-39 0 -39 41t39 41h296q39 0 39 -41zM624 -300q0 -41 -39 -41h-96q-39 0 -39 41t39 41h96q39 0 39 -41zM374 -300q0 -41 -39 -41h-296q-39 0 -39 41t39 41h296q39 0 39 -41z" />
+<glyph unicode="&#xfe4f;" horiz-adv-x="2076" d="M2026 -211q0 -41 -39 -41h-112q-17 0 -33 16l-135 136l-303 -310q-12 -12 -31 -12t-31 12l-303 310l-303 -310q-12 -12 -30.5 -12t-30.5 12l-303 310l-136 -136q-16 -16 -32 -16h-115q-39 0 -39 41t39 41h96l156 158q12 12 30.5 12t30.5 -12l303 -310l304 310 q12 12 30.5 12t30.5 -12l303 -310l303 310q12 12 31 12t31 -12l155 -158h94q39 0 39 -41z" />
+<glyph unicode="&#xfe61;" horiz-adv-x="987" d="M877 1148l-303 -66q2 6 3 15q0 41 -29 67l284 125zM494 1183q-25 0 -43 -11l-31 308h148l-31 -308q-18 11 -43 11zM777 838l-120 -87l-157 267q51 6 70 51zM440 1164q-29 -25 -29 -62q0 -10 2 -20l-303 66l46 141zM487 1018l-156 -267l-120 87l206 231q20 -45 70 -51z " />
+<glyph unicode="&#xfff9;" horiz-adv-x="0" />
+<glyph unicode="&#xfffa;" horiz-adv-x="0" />
+<glyph unicode="&#xfffb;" horiz-adv-x="0" />
+<glyph unicode="&#xfffc;" d="M2023 -72q0 -142 -101.5 -242.5t-243.5 -100.5h-1308q-142 0 -243.5 100.5t-101.5 242.5v1308q0 142 101.5 243.5t243.5 101.5h1308q142 0 243.5 -101.5t101.5 -243.5v-1308zM1922 -29v1265q0 117 -85 200t-202 83h-1265q-117 0 -200.5 -83t-83.5 -200v-1265 q0 -117 83.5 -200.5t200.5 -83.5h554v-92h83v75h89v-75h82v75h90v-75h82v75h82q18 -81 106 -81q33 0 82 22v73h-30q-27 -24 -48.5 -24t-27.5 27h121q117 0 202 83.5t85 200.5zM1805 849q0 -183 -228 -183q-82 0 -140 11v113h7q53 -20 111.5 -20t81.5 31.5t23 103.5v273h-140 v101h285v-430zM1401 858q0 -95 -70 -139t-170 -44h-274v604h265q208 0 208 -137q0 -87 -90 -127v-13q131 -26 131 -144zM1823 393h-192v-498h-145v498h-193v106h530v-106zM826 977q0 -146 -82.5 -230t-227.5 -84t-228 84.5t-83 230t82.5 229.5t228.5 84t228 -84t82 -230z M1538 -391q-90 0 -90 93.5t90 93.5q32 0 62 -15v-41h-3q-27 24 -52 24q-52 0 -52 -62t53 -62q25 0 52 24h2v-40q-33 -15 -62 -15zM1033 -117q-145 0 -226 84t-81 229t82 230.5t225 85.5q107 0 212 -51v-138h-9q-96 83 -181 83t-131 -60t-46 -151t45.5 -148.5t134 -57.5 t180.5 82h7v-136q-116 -52 -212 -52zM1428 -240h-98v-38h92v-32h-92v-78h-42v180h140v-32zM1256 -240h-98v-38h92v-32h-92v-78h-42v180h140v-32zM1084 -240h-97v-38h91v-32h-91v-78h-43v180h140v-32zM674 -105h-433v604h433v-106h-288v-120h266v-106h-266v-166h288v-106z M1033 1036l70 -2q108 0 108 78q0 66 -95 66h-83v-142zM1033 776l84 -2q133 0 133 86q0 83 -125 83l-92 -2v-165zM516 765q82 0 120 62t38 149.5t-38 149t-120 61.5q-159 0 -159 -210q0 -87 38.5 -149.5t120.5 -62.5z" />
+<glyph unicode="&#xfffd;" d="M1877 180q99 0 99 -90.5t-101 -90.5h-50v181h52zM1798 148h-98v-38h92v-32h-92v-78h-42v180h140v-32zM1626 148h-98v-38h92v-32h-92v-78h-42v180h140v-32zM1474 200v-71h-8v71h-172v-220h80q-181 -204 -350 -422q-436 561 -942 1024q506 463 942 1024q436 -561 942 -1024 q-200 -183 -390 -382h-102zM1454 148h-97v-38h91v-32h-91v-78h-43v180h140v-32zM1377 58h67l-67 -75v75zM1873 30q59 0 59 59.5t-64 59.5v-119h5zM1134 135l-2 98q0 99 29 164t121 150.5t116 118.5q58 81 58 194q0 164 -132 251q-114 75 -274 75t-345 -56v-195 q176 76 310 76q86 0 149 -36.5t63 -121.5t-130.5 -252.5t-155.5 -231t-25 -234.5h218zM1134 -178v218h-218v-218h218z" />
+<glyph unicode="&#x1d300;" d="M1724 636h-304v192h304v-192zM1176 636h-304v192h304v-192zM628 636h-304v192h304v-192z" />
+<glyph unicode="&#x1d301;" d="M1724 424h-304v192h304v-192zM1176 424h-304v192h304v-192zM628 424h-304v192h304v-192zM1724 848h-516v192h516v-192zM840 848h-516v192h516v-192z" />
+<glyph unicode="&#x1d302;" d="M1724 848h-304v192h304v-192zM1176 848h-304v192h304v-192zM628 848h-304v192h304v-192zM1724 424h-1400v192h1400v-192z" />
+<glyph unicode="&#x1d303;" d="M1724 424h-304v192h304v-192zM1176 424h-304v192h304v-192zM628 424h-304v192h304v-192zM1724 848h-1400v192h1400v-192z" />
+<glyph unicode="&#x1d304;" d="M1724 848h-304v192h304v-192zM1176 848h-304v192h304v-192zM628 848h-304v192h304v-192zM1724 424h-516v192h516v-192zM840 424h-516v192h516v-192z" />
+<glyph unicode="&#x1d305;" d="M1724 424h-304v192h304v-192zM1176 424h-304v192h304v-192zM628 424h-304v192h304v-192zM1724 848h-304v192h304v-192zM1176 848h-304v192h304v-192zM628 848h-304v192h304v-192z" />
+<glyph unicode="&#x1d306;" d="M1724 0h-1400v192h1400v-192zM1724 424h-1400v192h1400v-192zM1724 848h-1400v192h1400v-192zM1724 1272h-1400v192h1400v-192z" />
+<glyph unicode="&#x1d307;" d="M1724 0h-516v192h516v-192zM840 0h-516v192h516v-192zM1724 424h-1400v192h1400v-192zM1724 848h-1400v192h1400v-192zM1724 1272h-1400v192h1400v-192z" />
+<glyph unicode="&#x1d308;" d="M1724 0h-304v192h304v-192zM1176 0h-304v192h304v-192zM628 0h-304v192h304v-192zM1724 424h-1400v192h1400v-192zM1724 848h-1400v192h1400v-192zM1724 1272h-1400v192h1400v-192z" />
+<glyph unicode="&#x1d309;" d="M1724 1272h-1400v192h1400v-192zM1724 424h-516v192h516v-192zM840 424h-516v192h516v-192zM1724 0h-1400v192h1400v-192zM1724 848h-1400v192h1400v-192z" />
+<glyph unicode="&#x1d30a;" d="M1724 0h-516v192h516v-192zM840 0h-516v192h516v-192zM1724 848h-1400v192h1400v-192zM1724 1272h-1400v192h1400v-192zM1724 424h-516v192h516v-192zM840 424h-516v192h516v-192z" />
+<glyph unicode="&#x1d30b;" d="M1724 0h-304v192h304v-192zM1176 0h-304v192h304v-192zM628 0h-304v192h304v-192zM1724 848h-1400v192h1400v-192zM1724 1272h-1400v192h1400v-192zM1724 424h-516v192h516v-192zM840 424h-516v192h516v-192z" />
+<glyph unicode="&#x1d30c;" d="M1724 424h-304v192h304v-192zM1176 424h-304v192h304v-192zM628 424h-304v192h304v-192zM1724 0h-1400v192h1400v-192zM1724 848h-1400v192h1400v-192zM1724 1272h-1400v192h1400v-192z" />
+<glyph unicode="&#x1d30d;" d="M1724 424h-304v192h304v-192zM1176 424h-304v192h304v-192zM628 424h-304v192h304v-192zM1724 0h-516v192h516v-192zM840 0h-516v192h516v-192zM1724 848h-1400v192h1400v-192zM1724 1272h-1400v192h1400v-192z" />
+<glyph unicode="&#x1d30e;" d="M1724 0h-304v192h304v-192zM1176 0h-304v192h304v-192zM628 0h-304v192h304v-192zM1724 424h-304v192h304v-192zM1176 424h-304v192h304v-192zM628 424h-304v192h304v-192zM1724 848h-1400v192h1400v-192zM1724 1272h-1400v192h1400v-192z" />
+<glyph unicode="&#x1d30f;" d="M1724 1272h-1400v192h1400v-192zM1724 0h-1400v192h1400v-192zM1724 424h-1400v192h1400v-192zM1724 848h-516v192h516v-192zM840 848h-516v192h516v-192z" />
+<glyph unicode="&#x1d310;" d="M1724 0h-516v192h516v-192zM840 0h-516v192h516v-192zM1724 848h-516v192h516v-192zM840 848h-516v192h516v-192zM1724 424h-1400v192h1400v-192zM1724 1272h-1400v192h1400v-192z" />
+<glyph unicode="&#x1d311;" d="M1724 0h-304v192h304v-192zM1176 0h-304v192h304v-192zM628 0h-304v192h304v-192zM1724 848h-516v192h516v-192zM840 848h-516v192h516v-192zM1724 424h-1400v192h1400v-192zM1724 1272h-1400v192h1400v-192z" />
+<glyph unicode="&#x1d312;" d="M1724 1272h-1400v192h1400v-192zM1724 424h-516v192h516v-192zM840 424h-516v192h516v-192zM1724 0h-1400v192h1400v-192zM1724 848h-516v192h516v-192zM840 848h-516v192h516v-192z" />
+<glyph unicode="&#x1d313;" d="M1724 0h-516v192h516v-192zM840 0h-516v192h516v-192zM1724 424h-516v192h516v-192zM840 424h-516v192h516v-192zM1724 848h-516v192h516v-192zM840 848h-516v192h516v-192zM1724 1272h-1400v192h1400v-192z" />
+<glyph unicode="&#x1d314;" d="M1724 0h-304v192h304v-192zM1176 0h-304v192h304v-192zM628 0h-304v192h304v-192zM1724 424h-516v192h516v-192zM840 424h-516v192h516v-192zM1724 848h-516v192h516v-192zM840 848h-516v192h516v-192zM1724 1272h-1400v192h1400v-192z" />
+<glyph unicode="&#x1d315;" d="M1724 424h-304v192h304v-192zM1176 424h-304v192h304v-192zM628 424h-304v192h304v-192zM1724 0h-1400v192h1400v-192zM1724 848h-516v192h516v-192zM840 848h-516v192h516v-192zM1724 1272h-1400v192h1400v-192z" />
+<glyph unicode="&#x1d316;" d="M1724 424h-304v192h304v-192zM1176 424h-304v192h304v-192zM628 424h-304v192h304v-192zM1724 848h-516v192h516v-192zM840 848h-516v192h516v-192zM1724 0h-516v192h516v-192zM840 0h-516v192h516v-192zM1724 1272h-1400v192h1400v-192z" />
+<glyph unicode="&#x1d317;" d="M1724 0h-304v192h304v-192zM1176 0h-304v192h304v-192zM628 0h-304v192h304v-192zM1724 424h-304v192h304v-192zM1176 424h-304v192h304v-192zM628 424h-304v192h304v-192zM1724 848h-516v192h516v-192zM840 848h-516v192h516v-192zM1724 1272h-1400v192h1400v-192z" />
+<glyph unicode="&#x1d318;" d="M1724 848h-304v192h304v-192zM1176 848h-304v192h304v-192zM628 848h-304v192h304v-192zM1724 1272h-1400v192h1400v-192zM1724 0h-1400v192h1400v-192zM1724 424h-1400v192h1400v-192z" />
+<glyph unicode="&#x1d319;" d="M1724 848h-304v192h304v-192zM1176 848h-304v192h304v-192zM628 848h-304v192h304v-192zM1724 1272h-1400v192h1400v-192zM1724 0h-516v192h516v-192zM840 0h-516v192h516v-192zM1724 424h-1400v192h1400v-192z" />
+<glyph unicode="&#x1d31a;" d="M1724 848h-304v192h304v-192zM1176 848h-304v192h304v-192zM628 848h-304v192h304v-192zM1724 1272h-1400v192h1400v-192zM1724 0h-304v192h304v-192zM1176 0h-304v192h304v-192zM628 0h-304v192h304v-192zM1724 424h-1400v192h1400v-192z" />
+<glyph unicode="&#x1d31b;" d="M1724 848h-304v192h304v-192zM1176 848h-304v192h304v-192zM628 848h-304v192h304v-192zM1724 1272h-1400v192h1400v-192zM1724 424h-516v192h516v-192zM840 424h-516v192h516v-192zM1724 0h-1400v192h1400v-192z" />
+<glyph unicode="&#x1d31c;" d="M1724 848h-304v192h304v-192zM1176 848h-304v192h304v-192zM628 848h-304v192h304v-192zM1724 1272h-1400v192h1400v-192zM1724 0h-516v192h516v-192zM840 0h-516v192h516v-192zM1724 424h-516v192h516v-192zM840 424h-516v192h516v-192z" />
+<glyph unicode="&#x1d31d;" d="M1724 848h-304v192h304v-192zM1176 848h-304v192h304v-192zM628 848h-304v192h304v-192zM1724 1272h-1400v192h1400v-192zM1724 0h-304v192h304v-192zM1176 0h-304v192h304v-192zM628 0h-304v192h304v-192zM1724 424h-516v192h516v-192zM840 424h-516v192h516v-192z" />
+<glyph unicode="&#x1d31e;" d="M1724 848h-304v192h304v-192zM1176 848h-304v192h304v-192zM628 848h-304v192h304v-192zM1724 1272h-1400v192h1400v-192zM1724 424h-304v192h304v-192zM1176 424h-304v192h304v-192zM628 424h-304v192h304v-192zM1724 0h-1400v192h1400v-192z" />
+<glyph unicode="&#x1d31f;" d="M1724 424h-304v192h304v-192zM1176 424h-304v192h304v-192zM628 424h-304v192h304v-192zM1724 0h-516v192h516v-192zM840 0h-516v192h516v-192zM1724 848h-304v192h304v-192zM1176 848h-304v192h304v-192zM628 848h-304v192h304v-192zM1724 1272h-1400v192h1400v-192z " />
+<glyph unicode="&#x1d320;" d="M1724 0h-304v192h304v-192zM1176 0h-304v192h304v-192zM628 0h-304v192h304v-192zM1724 424h-304v192h304v-192zM1176 424h-304v192h304v-192zM628 424h-304v192h304v-192zM1724 848h-304v192h304v-192zM1176 848h-304v192h304v-192zM628 848h-304v192h304v-192z M1724 1272h-1400v192h1400v-192z" />
+<glyph unicode="&#x1d321;" d="M1724 1272h-516v192h516v-192zM840 1272h-516v192h516v-192zM1724 0h-1400v192h1400v-192zM1724 424h-1400v192h1400v-192zM1724 848h-1400v192h1400v-192z" />
+<glyph unicode="&#x1d322;" d="M1724 0h-516v192h516v-192zM840 0h-516v192h516v-192zM1724 424h-1400v192h1400v-192zM1724 848h-1400v192h1400v-192zM1724 1272h-516v192h516v-192zM840 1272h-516v192h516v-192z" />
+<glyph unicode="&#x1d323;" d="M1724 0h-304v192h304v-192zM1176 0h-304v192h304v-192zM628 0h-304v192h304v-192zM1724 424h-1400v192h1400v-192zM1724 848h-1400v192h1400v-192zM1724 1272h-516v192h516v-192zM840 1272h-516v192h516v-192z" />
+<glyph unicode="&#x1d324;" d="M1724 1272h-516v192h516v-192zM840 1272h-516v192h516v-192zM1724 424h-516v192h516v-192zM840 424h-516v192h516v-192zM1724 0h-1400v192h1400v-192zM1724 848h-1400v192h1400v-192z" />
+<glyph unicode="&#x1d325;" d="M1724 0h-516v192h516v-192zM840 0h-516v192h516v-192zM1724 424h-516v192h516v-192zM840 424h-516v192h516v-192zM1724 848h-1400v192h1400v-192zM1724 1272h-516v192h516v-192zM840 1272h-516v192h516v-192z" />
+<glyph unicode="&#x1d326;" d="M1724 0h-304v192h304v-192zM1176 0h-304v192h304v-192zM628 0h-304v192h304v-192zM1724 424h-516v192h516v-192zM840 424h-516v192h516v-192zM1724 848h-1400v192h1400v-192zM1724 1272h-516v192h516v-192zM840 1272h-516v192h516v-192z" />
+<glyph unicode="&#x1d327;" d="M1724 424h-304v192h304v-192zM1176 424h-304v192h304v-192zM628 424h-304v192h304v-192zM1724 0h-1400v192h1400v-192zM1724 1272h-516v192h516v-192zM840 1272h-516v192h516v-192zM1724 848h-1400v192h1400v-192z" />
+<glyph unicode="&#x1d328;" d="M1724 424h-304v192h304v-192zM1176 424h-304v192h304v-192zM628 424h-304v192h304v-192zM1724 848h-1400v192h1400v-192zM1724 0h-516v192h516v-192zM840 0h-516v192h516v-192zM1724 1272h-516v192h516v-192zM840 1272h-516v192h516v-192z" />
+<glyph unicode="&#x1d329;" d="M1724 0h-304v192h304v-192zM1176 0h-304v192h304v-192zM628 0h-304v192h304v-192zM1724 424h-304v192h304v-192zM1176 424h-304v192h304v-192zM628 424h-304v192h304v-192zM1724 1272h-516v192h516v-192zM840 1272h-516v192h516v-192zM1724 848h-1400v192h1400v-192z" />
+<glyph unicode="&#x1d32a;" d="M1724 1272h-516v192h516v-192zM840 1272h-516v192h516v-192zM1724 0h-1400v192h1400v-192zM1724 424h-1400v192h1400v-192zM1724 848h-516v192h516v-192zM840 848h-516v192h516v-192z" />
+<glyph unicode="&#x1d32b;" d="M1724 0h-516v192h516v-192zM840 0h-516v192h516v-192zM1724 848h-516v192h516v-192zM840 848h-516v192h516v-192zM1724 424h-1400v192h1400v-192zM1724 1272h-516v192h516v-192zM840 1272h-516v192h516v-192z" />
+<glyph unicode="&#x1d32c;" d="M1724 0h-304v192h304v-192zM1176 0h-304v192h304v-192zM628 0h-304v192h304v-192zM1724 848h-516v192h516v-192zM840 848h-516v192h516v-192zM1724 424h-1400v192h1400v-192zM1724 1272h-516v192h516v-192zM840 1272h-516v192h516v-192z" />
+<glyph unicode="&#x1d32d;" d="M1724 1272h-516v192h516v-192zM840 1272h-516v192h516v-192zM1724 424h-516v192h516v-192zM840 424h-516v192h516v-192zM1724 0h-1400v192h1400v-192zM1724 848h-516v192h516v-192zM840 848h-516v192h516v-192z" />
+<glyph unicode="&#x1d32e;" d="M1724 0h-516v192h516v-192zM840 0h-516v192h516v-192zM1724 424h-516v192h516v-192zM840 424h-516v192h516v-192zM1724 848h-516v192h516v-192zM840 848h-516v192h516v-192zM1724 1272h-516v192h516v-192zM840 1272h-516v192h516v-192z" />
+<glyph unicode="&#x1d32f;" d="M1724 0h-304v192h304v-192zM1176 0h-304v192h304v-192zM628 0h-304v192h304v-192zM1724 424h-516v192h516v-192zM840 424h-516v192h516v-192zM1724 848h-516v192h516v-192zM840 848h-516v192h516v-192zM1724 1272h-516v192h516v-192zM840 1272h-516v192h516v-192z" />
+<glyph unicode="&#x1d330;" d="M1724 424h-304v192h304v-192zM1176 424h-304v192h304v-192zM628 424h-304v192h304v-192zM1724 0h-1400v192h1400v-192zM1724 848h-516v192h516v-192zM840 848h-516v192h516v-192zM1724 1272h-516v192h516v-192zM840 1272h-516v192h516v-192z" />
+<glyph unicode="&#x1d331;" d="M1724 424h-304v192h304v-192zM1176 424h-304v192h304v-192zM628 424h-304v192h304v-192zM1724 848h-516v192h516v-192zM840 848h-516v192h516v-192zM1724 0h-516v192h516v-192zM840 0h-516v192h516v-192zM1724 1272h-516v192h516v-192zM840 1272h-516v192h516v-192z" />
+<glyph unicode="&#x1d332;" d="M1724 0h-304v192h304v-192zM1176 0h-304v192h304v-192zM628 0h-304v192h304v-192zM1724 424h-304v192h304v-192zM1176 424h-304v192h304v-192zM628 424h-304v192h304v-192zM1724 848h-516v192h516v-192zM840 848h-516v192h516v-192zM1724 1272h-516v192h516v-192z M840 1272h-516v192h516v-192z" />
+<glyph unicode="&#x1d333;" d="M1724 848h-304v192h304v-192zM1176 848h-304v192h304v-192zM628 848h-304v192h304v-192zM1724 1272h-516v192h516v-192zM840 1272h-516v192h516v-192zM1724 0h-1400v192h1400v-192zM1724 424h-1400v192h1400v-192z" />
+<glyph unicode="&#x1d334;" d="M1724 848h-304v192h304v-192zM1176 848h-304v192h304v-192zM628 848h-304v192h304v-192zM1724 1272h-516v192h516v-192zM840 1272h-516v192h516v-192zM1724 0h-516v192h516v-192zM840 0h-516v192h516v-192zM1724 424h-1400v192h1400v-192z" />
+<glyph unicode="&#x1d335;" d="M1724 0h-304v192h304v-192zM1176 0h-304v192h304v-192zM628 0h-304v192h304v-192zM1724 424h-1400v192h1400v-192zM1724 848h-304v192h304v-192zM1176 848h-304v192h304v-192zM628 848h-304v192h304v-192zM1724 1272h-516v192h516v-192zM840 1272h-516v192h516v-192z" />
+<glyph unicode="&#x1d336;" d="M1724 848h-304v192h304v-192zM1176 848h-304v192h304v-192zM628 848h-304v192h304v-192zM1724 1272h-516v192h516v-192zM840 1272h-516v192h516v-192zM1724 424h-516v192h516v-192zM840 424h-516v192h516v-192zM1724 0h-1400v192h1400v-192z" />
+<glyph unicode="&#x1d337;" d="M1724 848h-304v192h304v-192zM1176 848h-304v192h304v-192zM628 848h-304v192h304v-192zM1724 1272h-516v192h516v-192zM840 1272h-516v192h516v-192zM1724 0h-516v192h516v-192zM840 0h-516v192h516v-192zM1724 424h-516v192h516v-192zM840 424h-516v192h516v-192z" />
+<glyph unicode="&#x1d338;" d="M1724 848h-304v192h304v-192zM1176 848h-304v192h304v-192zM628 848h-304v192h304v-192zM1724 1272h-516v192h516v-192zM840 1272h-516v192h516v-192zM1724 0h-304v192h304v-192zM1176 0h-304v192h304v-192zM628 0h-304v192h304v-192zM1724 424h-516v192h516v-192z M840 424h-516v192h516v-192z" />
+<glyph unicode="&#x1d339;" d="M1724 424h-304v192h304v-192zM1176 424h-304v192h304v-192zM628 424h-304v192h304v-192zM1724 0h-1400v192h1400v-192zM1724 848h-304v192h304v-192zM1176 848h-304v192h304v-192zM628 848h-304v192h304v-192zM1724 1272h-516v192h516v-192zM840 1272h-516v192h516v-192z " />
+<glyph unicode="&#x1d33a;" d="M1724 424h-304v192h304v-192zM1176 424h-304v192h304v-192zM628 424h-304v192h304v-192zM1724 0h-516v192h516v-192zM840 0h-516v192h516v-192zM1724 848h-304v192h304v-192zM1176 848h-304v192h304v-192zM628 848h-304v192h304v-192zM1724 1272h-516v192h516v-192z M840 1272h-516v192h516v-192z" />
+<glyph unicode="&#x1d33b;" d="M1724 0h-304v192h304v-192zM1176 0h-304v192h304v-192zM628 0h-304v192h304v-192zM1724 424h-304v192h304v-192zM1176 424h-304v192h304v-192zM628 424h-304v192h304v-192zM1724 848h-304v192h304v-192zM1176 848h-304v192h304v-192zM628 848h-304v192h304v-192z M1724 1272h-516v192h516v-192zM840 1272h-516v192h516v-192z" />
+<glyph unicode="&#x1d33c;" d="M1724 1272h-304v192h304v-192zM1176 1272h-304v192h304v-192zM628 1272h-304v192h304v-192zM1724 0h-1400v192h1400v-192zM1724 424h-1400v192h1400v-192zM1724 848h-1400v192h1400v-192z" />
+<glyph unicode="&#x1d33d;" d="M1724 1272h-304v192h304v-192zM1176 1272h-304v192h304v-192zM628 1272h-304v192h304v-192zM1724 424h-1400v192h1400v-192zM1724 848h-1400v192h1400v-192zM1724 0h-516v192h516v-192zM840 0h-516v192h516v-192z" />
+<glyph unicode="&#x1d33e;" d="M1724 0h-304v192h304v-192zM1176 0h-304v192h304v-192zM628 0h-304v192h304v-192zM1724 1272h-304v192h304v-192zM1176 1272h-304v192h304v-192zM628 1272h-304v192h304v-192zM1724 424h-1400v192h1400v-192zM1724 848h-1400v192h1400v-192z" />
+<glyph unicode="&#x1d33f;" d="M1724 1272h-304v192h304v-192zM1176 1272h-304v192h304v-192zM628 1272h-304v192h304v-192zM1724 424h-516v192h516v-192zM840 424h-516v192h516v-192zM1724 0h-1400v192h1400v-192zM1724 848h-1400v192h1400v-192z" />
+<glyph unicode="&#x1d340;" d="M1724 1272h-304v192h304v-192zM1176 1272h-304v192h304v-192zM628 1272h-304v192h304v-192zM1724 0h-516v192h516v-192zM840 0h-516v192h516v-192zM1724 424h-516v192h516v-192zM840 424h-516v192h516v-192zM1724 848h-1400v192h1400v-192z" />
+<glyph unicode="&#x1d341;" d="M1724 0h-304v192h304v-192zM1176 0h-304v192h304v-192zM628 0h-304v192h304v-192zM1724 1272h-304v192h304v-192zM1176 1272h-304v192h304v-192zM628 1272h-304v192h304v-192zM1724 424h-516v192h516v-192zM840 424h-516v192h516v-192zM1724 848h-1400v192h1400v-192z " />
+<glyph unicode="&#x1d342;" d="M1724 1272h-304v192h304v-192zM1176 1272h-304v192h304v-192zM628 1272h-304v192h304v-192zM1724 848h-1400v192h1400v-192zM1724 424h-304v192h304v-192zM1176 424h-304v192h304v-192zM628 424h-304v192h304v-192zM1724 0h-1400v192h1400v-192z" />
+<glyph unicode="&#x1d343;" d="M1724 424h-304v192h304v-192zM1176 424h-304v192h304v-192zM628 424h-304v192h304v-192zM1724 848h-1400v192h1400v-192zM1724 1272h-304v192h304v-192zM1176 1272h-304v192h304v-192zM628 1272h-304v192h304v-192zM1724 0h-516v192h516v-192zM840 0h-516v192h516v-192z " />
+<glyph unicode="&#x1d344;" d="M1724 0h-304v192h304v-192zM1176 0h-304v192h304v-192zM628 0h-304v192h304v-192zM1724 424h-304v192h304v-192zM1176 424h-304v192h304v-192zM628 424h-304v192h304v-192zM1724 1272h-304v192h304v-192zM1176 1272h-304v192h304v-192zM628 1272h-304v192h304v-192z M1724 848h-1400v192h1400v-192z" />
+<glyph unicode="&#x1d345;" d="M1724 1272h-304v192h304v-192zM1176 1272h-304v192h304v-192zM628 1272h-304v192h304v-192zM1724 0h-1400v192h1400v-192zM1724 424h-1400v192h1400v-192zM1724 848h-516v192h516v-192zM840 848h-516v192h516v-192z" />
+<glyph unicode="&#x1d346;" d="M1724 1272h-304v192h304v-192zM1176 1272h-304v192h304v-192zM628 1272h-304v192h304v-192zM1724 0h-516v192h516v-192zM840 0h-516v192h516v-192zM1724 424h-1400v192h1400v-192zM1724 848h-516v192h516v-192zM840 848h-516v192h516v-192z" />
+<glyph unicode="&#x1d347;" d="M1724 0h-304v192h304v-192zM1176 0h-304v192h304v-192zM628 0h-304v192h304v-192zM1724 1272h-304v192h304v-192zM1176 1272h-304v192h304v-192zM628 1272h-304v192h304v-192zM1724 848h-516v192h516v-192zM840 848h-516v192h516v-192zM1724 424h-1400v192h1400v-192z " />
+<glyph unicode="&#x1d348;" d="M1724 1272h-304v192h304v-192zM1176 1272h-304v192h304v-192zM628 1272h-304v192h304v-192zM1724 424h-516v192h516v-192zM840 424h-516v192h516v-192zM1724 0h-1400v192h1400v-192zM1724 848h-516v192h516v-192zM840 848h-516v192h516v-192z" />
+<glyph unicode="&#x1d349;" d="M1724 1272h-304v192h304v-192zM1176 1272h-304v192h304v-192zM628 1272h-304v192h304v-192zM1724 0h-516v192h516v-192zM840 0h-516v192h516v-192zM1724 424h-516v192h516v-192zM840 424h-516v192h516v-192zM1724 848h-516v192h516v-192zM840 848h-516v192h516v-192z" />
+<glyph unicode="&#x1d34a;" d="M1724 0h-304v192h304v-192zM1176 0h-304v192h304v-192zM628 0h-304v192h304v-192zM1724 1272h-304v192h304v-192zM1176 1272h-304v192h304v-192zM628 1272h-304v192h304v-192zM1724 424h-516v192h516v-192zM840 424h-516v192h516v-192zM1724 848h-516v192h516v-192z M840 848h-516v192h516v-192z" />
+<glyph unicode="&#x1d34b;" d="M1724 424h-304v192h304v-192zM1176 424h-304v192h304v-192zM628 424h-304v192h304v-192zM1724 848h-516v192h516v-192zM840 848h-516v192h516v-192zM1724 1272h-304v192h304v-192zM1176 1272h-304v192h304v-192zM628 1272h-304v192h304v-192zM1724 0h-1400v192h1400v-192 z" />
+<glyph unicode="&#x1d34c;" d="M1724 424h-304v192h304v-192zM1176 424h-304v192h304v-192zM628 424h-304v192h304v-192zM1724 848h-516v192h516v-192zM840 848h-516v192h516v-192zM1724 1272h-304v192h304v-192zM1176 1272h-304v192h304v-192zM628 1272h-304v192h304v-192zM1724 0h-516v192h516v-192z M840 0h-516v192h516v-192z" />
+<glyph unicode="&#x1d34d;" d="M1724 0h-304v192h304v-192zM1176 0h-304v192h304v-192zM628 0h-304v192h304v-192zM1724 424h-304v192h304v-192zM1176 424h-304v192h304v-192zM628 424h-304v192h304v-192zM1724 1272h-304v192h304v-192zM1176 1272h-304v192h304v-192zM628 1272h-304v192h304v-192z M1724 848h-516v192h516v-192zM840 848h-516v192h516v-192z" />
+<glyph unicode="&#x1d34e;" d="M1724 848h-304v192h304v-192zM1176 848h-304v192h304v-192zM628 848h-304v192h304v-192zM1724 1272h-304v192h304v-192zM1176 1272h-304v192h304v-192zM628 1272h-304v192h304v-192zM1724 0h-1400v192h1400v-192zM1724 424h-1400v192h1400v-192z" />
+<glyph unicode="&#x1d34f;" d="M1724 848h-304v192h304v-192zM1176 848h-304v192h304v-192zM628 848h-304v192h304v-192zM1724 1272h-304v192h304v-192zM1176 1272h-304v192h304v-192zM628 1272h-304v192h304v-192zM1724 0h-516v192h516v-192zM840 0h-516v192h516v-192zM1724 424h-1400v192h1400v-192z " />
+<glyph unicode="&#x1d350;" d="M1724 848h-304v192h304v-192zM1176 848h-304v192h304v-192zM628 848h-304v192h304v-192zM1724 1272h-304v192h304v-192zM1176 1272h-304v192h304v-192zM628 1272h-304v192h304v-192zM1724 0h-304v192h304v-192zM1176 0h-304v192h304v-192zM628 0h-304v192h304v-192z M1724 424h-1400v192h1400v-192z" />
+<glyph unicode="&#x1d351;" d="M1724 848h-304v192h304v-192zM1176 848h-304v192h304v-192zM628 848h-304v192h304v-192zM1724 1272h-304v192h304v-192zM1176 1272h-304v192h304v-192zM628 1272h-304v192h304v-192zM1724 424h-516v192h516v-192zM840 424h-516v192h516v-192zM1724 0h-1400v192h1400v-192 z" />
+<glyph unicode="&#x1d352;" d="M1724 848h-304v192h304v-192zM1176 848h-304v192h304v-192zM628 848h-304v192h304v-192zM1724 1272h-304v192h304v-192zM1176 1272h-304v192h304v-192zM628 1272h-304v192h304v-192zM1724 0h-516v192h516v-192zM840 0h-516v192h516v-192zM1724 424h-516v192h516v-192z M840 424h-516v192h516v-192z" />
+<glyph unicode="&#x1d353;" d="M1724 848h-304v192h304v-192zM1176 848h-304v192h304v-192zM628 848h-304v192h304v-192zM1724 1272h-304v192h304v-192zM1176 1272h-304v192h304v-192zM628 1272h-304v192h304v-192zM1724 0h-304v192h304v-192zM1176 0h-304v192h304v-192zM628 0h-304v192h304v-192z M1724 424h-516v192h516v-192zM840 424h-516v192h516v-192z" />
+<glyph unicode="&#x1d354;" d="M1724 848h-304v192h304v-192zM1176 848h-304v192h304v-192zM628 848h-304v192h304v-192zM1724 1272h-304v192h304v-192zM1176 1272h-304v192h304v-192zM628 1272h-304v192h304v-192zM1724 424h-304v192h304v-192zM1176 424h-304v192h304v-192zM628 424h-304v192h304v-192 zM1724 0h-1400v192h1400v-192z" />
+<glyph unicode="&#x1d355;" d="M1724 848h-304v192h304v-192zM1176 848h-304v192h304v-192zM628 848h-304v192h304v-192zM1724 1272h-304v192h304v-192zM1176 1272h-304v192h304v-192zM628 1272h-304v192h304v-192zM1724 424h-304v192h304v-192zM1176 424h-304v192h304v-192zM628 424h-304v192h304v-192 zM1724 0h-516v192h516v-192zM840 0h-516v192h516v-192z" />
+<glyph unicode="&#x1d356;" d="M1724 848h-304v192h304v-192zM1176 848h-304v192h304v-192zM628 848h-304v192h304v-192zM1724 1272h-304v192h304v-192zM1176 1272h-304v192h304v-192zM628 1272h-304v192h304v-192zM1724 0h-304v192h304v-192zM1176 0h-304v192h304v-192zM628 0h-304v192h304v-192z M1724 424h-304v192h304v-192zM1176 424h-304v192h304v-192zM628 424h-304v192h304v-192z" />
+<glyph unicode="&#x1d360;" d="M1724 486h-1400v192h1400v-192z" />
+<glyph unicode="&#x1d361;" d="M1724 274h-1400v192h1400v-192zM1724 698h-1400v192h1400v-192z" />
+<glyph unicode="&#x1d362;" d="M1724 62h-1400v192h1400v-192zM1724 486h-1400v192h1400v-192zM1724 910h-1400v192h1400v-192z" />
+<glyph unicode="&#x1d363;" d="M1724 -150h-1400v192h1400v-192zM1724 274h-1400v192h1400v-192zM1724 698h-1400v192h1400v-192zM1724 1122h-1400v192h1400v-192z" />
+<glyph unicode="&#x1d364;" d="M1724 -362h-1400v192h1400v-192zM1724 62h-1400v192h1400v-192zM1724 486h-1400v192h1400v-192zM1724 910h-1400v192h1400v-192zM1724 1334h-1400v192h1400v-192z" />
+<glyph unicode="&#x1d365;" d="M1724 -362h-1400v192h604v1696h192v-1696h604v-192z" />
+<glyph unicode="&#x1d366;" d="M1724 -362h-1400v192h1400v-192zM1724 62h-1400v192h604v1272h192v-1272h604v-192z" />
+<glyph unicode="&#x1d367;" d="M1724 -362h-1400v192h1400v-192zM1724 62h-1400v192h1400v-192zM1724 486h-1400v192h604v848h192v-848h604v-192z" />
+<glyph unicode="&#x1d368;" d="M1724 486h-1400v192h1400v-192zM1724 62h-1400v192h1400v-192zM1724 -362h-1400v192h1400v-192zM1724 910h-1400v192h604v424h192v-424h604v-192z" />
+<glyph unicode="&#x1d369;" horiz-adv-x="840" d="M516 -150h-192v1464h192v-1464z" />
+<glyph unicode="&#x1d36a;" horiz-adv-x="1264" d="M516 -150h-192v1464h192v-1464zM940 -150h-192v1464h192v-1464z" />
+<glyph unicode="&#x1d36b;" horiz-adv-x="1688" d="M516 -150h-192v1464h192v-1464zM940 -150h-192v1464h192v-1464zM1364 -150h-192v1464h192v-1464z" />
+<glyph unicode="&#x1d36c;" horiz-adv-x="2112" d="M1364 -150h-192v1464h192v-1464zM1788 -150h-192v1464h192v-1464zM516 -150h-192v1464h192v-1464zM940 -150h-192v1464h192v-1464z" />
+<glyph unicode="&#x1d36d;" horiz-adv-x="2536" d="M1364 -150h-192v1464h192v-1464zM1788 -150h-192v1464h192v-1464zM2212 -150h-192v1464h192v-1464zM516 -150h-192v1464h192v-1464zM940 -150h-192v1464h192v-1464z" />
+<glyph unicode="&#x1d36e;" d="M1724 1334h-604v-1696h-192v1696h-604v192h1400v-192z" />
+<glyph unicode="&#x1d36f;" d="M1724 1334h-392v-1696h-192v1696h-232v-1696h-192v1696h-392v192h1400v-192z" />
+<glyph unicode="&#x1d370;" d="M1724 1334h-180v-1696h-192v1696h-232v-1696h-192v1696h-232v-1696h-192v1696h-180v192h1400v-192z" />
+<glyph unicode="&#x1d371;" horiz-adv-x="2472" d="M2148 1334h-180v-1696h-192v1696h-232v-1696h-192v1696h-232v-1696h-192v1696h-232v-1696h-192v1696h-180v192h1824v-192z" />
+<glyph unicode="&#x1d400;" horiz-adv-x="1460" d="M265 6l-206 -6v100q168 0 175 18l425 1213q12 36 71 36t71 -36l430 -1231h169v-100l-292 6l-329 -6v100h161l-86 247h-422l-78 -231q-3 -8 27.5 -11t124.5 -5v-100zM819 446l-176 503l-176 -503h352z" />
+<glyph unicode="&#x1d401;" horiz-adv-x="1333" d="M1274 366q0 -174 -121.5 -270t-300.5 -96h-793v100h185v1142h-185v101h738q175 0 291 -81q132 -93 132 -260q0 -118 -82 -196.5t-204 -103.5q145 -17 242.5 -106t97.5 -230zM891 825q43 73 43 170t-26 160q-35 87 -111 87h-289v-505h235q97 0 148 88zM978 371 q0 103 -29 180q-40 109 -125 109h-316v-560h289q94 0 142 94q39 74 39 177z" />
+<glyph unicode="&#x1d402;" horiz-adv-x="1310" d="M1251 460q0 -202 -147 -342t-349 -140q-314 0 -505 189.5t-191 503t191 503.5t505 190q172 0 307 -119l125 111q8 8 36 8t28 -23v-486q0 -28 -65 -28q-35 0 -46 28l-8 64q-18 133 -114.5 239t-225.5 106q-240 0 -351 -184q-74 -122 -74 -409.5t74 -409.5 q110 -182 355 -182q149 0 252.5 114t103.5 264q0 32 76 32q23 0 23 -29z" />
+<glyph unicode="&#x1d403;" horiz-adv-x="1442" d="M1233 1139q150 -187 150 -476.5t-158 -476t-440 -186.5h-726v100h185v1142h-185v101h726q286 0 448 -204zM1013 243q74 108 74 397t-56 414q-86 188 -322 188h-191v-1142h191q206 0 304 143z" />
+<glyph unicode="&#x1d404;" horiz-adv-x="1280" d="M59 0v100h185v1142h-185v101h1045l62 -480h-100q-25 207 -89 284q-78 95 -276 95h-172v-494h38q114 0 152 61q28 44 28 160v8h99v-558h-99v6q0 133 -40.5 178t-171.5 45h-6v-548h188q215 0 302 122q61 84 101 322h100l-90 -544h-1071z" />
+<glyph unicode="&#x1d405;" horiz-adv-x="1197" d="M387 6l-328 -6v100h185v1142h-185v101h1019l60 -480h-99q-25 204 -84 280q-76 99 -268 99h-158v-520h32q113 0 149 65q25 45 25 164h100v-557h-100q0 136 -37 183q-36 46 -164 46h-5v-523h232v-100z" />
+<glyph unicode="&#x1d406;" horiz-adv-x="1447" d="M1110 534l278 6v-99h-135v-415q0 -26 -25 -26t-93.5 37t-99.5 61q-90 -120 -280 -120q-314 0 -505 189.5t-191 503t191 503.5t505 190q170 0 309 -119l124 111q9 8 37 8t28 -23v-486q0 -28 -66 -28q-34 0 -45 28q-2 20 -6 55q-15 136 -112.5 245t-229.5 109 q-242 0 -353 -184q-74 -122 -74 -408.5t74 -408.5q111 -184 360 -184q68 0 117.5 45t49.5 112v205h-245v99z" />
+<glyph unicode="&#x1d407;" horiz-adv-x="1516" d="M1130 1337l327 6v-101h-183v-1142h183v-100l-327 6l-327 -6v100h183v548h-457v-548h184v-100l-326 6l-328 -6v100h185v1142h-185v101l328 -6l326 6v-101h-184v-494h457v494h-183v101z" />
+<glyph unicode="&#x1d408;" horiz-adv-x="793" d="M397 1337l337 6v-101h-194v-1142h194v-100l-337 6l-338 -6v100h195v1142h-195v101z" />
+<glyph unicode="&#x1d409;" horiz-adv-x="1025" d="M689 1337l277 6v-101h-139v-964q0 -152 -143 -233q-117 -67 -264.5 -67t-244.5 56q-116 68 -116 189q0 66 45 110t110 44t109 -45t44 -109q0 -101 -91 -141q58 -26 132.5 -26t113.5 79q31 60 31 150v957h-241v101z" />
+<glyph unicode="&#x1d40a;" horiz-adv-x="1503" d="M1246 1337l170 6v-101q-161 0 -178 -17l-399 -398l449 -709q11 -18 156 -18v-100l-257 6l-327 -6v100q114 0 128 16l-333 529l-126 -126v-419h184v-100l-326 6l-328 -6v100h185v1142h-185v101l328 -6l326 6v-101h-184v-580l567 565q-24 15 -126 15v101z" />
+<glyph unicode="&#x1d40b;" horiz-adv-x="1143" d="M387 1337l374 6v-101h-232v-1142h132q164 0 245 148q55 101 76 296h102l-61 -544h-964v100h185v1142h-185v101z" />
+<glyph unicode="&#x1d40c;" horiz-adv-x="1843" d="M59 100q185 0 185 18v1124h-185v101h445q37 0 51 -36l368 -982l368 982q14 36 50 36h443v-101h-185v-1142h185v-100l-309 6l-311 -6v100h183v1125l-444 -1190q-13 -35 -58 -35t-58 35l-431 1158v-1075q0 -10 33.5 -13t149.5 -5v-100l-239 6l-241 -6v100z" />
+<glyph unicode="&#x1d40d;" horiz-adv-x="1516" d="M1218 1337l239 6v-101q-183 0 -183 -17v-1193q0 -32 -82 -32q-12 0 -20 11l-816 1130v-1023q0 -10 33.5 -13t149.5 -5v-100l-239 6l-241 -6v100q185 0 185 18v1124h-185v101h449q14 0 23 -12l631 -875v769q0 9 -38 12t-146 5v101z" />
+<glyph unicode="&#x1d40e;" horiz-adv-x="1366" d="M684 1364q296 0 459 -199t163 -499t-164.5 -494t-457.5 -194t-459 193.5t-166 494t159 492.5q170 206 466 206zM999 704q0 574 -316 574t-316 -586q0 -623 316 -623t316 635z" />
+<glyph unicode="&#x1d40f;" horiz-adv-x="1278" d="M387 6l-328 -6v100h185v1142h-185v101h700q194 0 319 -94q140 -104 140 -289.5t-143 -287.5q-126 -90 -316 -90h-230v-482h184v-100zM879 747q32 53 32 213.5t-34 212.5q-46 69 -195 69h-164v-571h164q152 0 197 76z" />
+<glyph unicode="&#x1d410;" horiz-adv-x="1379" d="M1319 -10q0 -140 -48 -240q-62 -129 -190 -129t-186 131q-30 69 -52 244q-82 -18 -159 -18q-293 0 -459 193.5t-166 494t159 492.5q170 206 466 206t459 -199t163 -501q0 -208 -81 -368q-91 -179 -267 -259q61 -110 146 -110q100 0 133 44q1 1 14 40q8 24 33 24 q35 0 35 -45zM1011 671q0 607 -327.5 607t-327.5 -623q0 -182 21 -283q34 -159 131 -243q-1 77 49 127.5t127 50.5q124 0 205 -147q80 89 107 242q15 91 15 269zM684 230q-37 0 -67.5 -24t-30.5 -60q0 -82 98 -82q72 0 136 40q-37 126 -136 126z" />
+<glyph unicode="&#x1d411;" horiz-adv-x="1532" d="M1369 157q0 74 55 74q49 0 49 -41q0 -83 -54 -147.5t-135 -64.5q-430 0 -430 265v170q0 83 -41.5 151.5t-119.5 68.5h-175v-533h183v-100l-320 6l-322 -6v100h185v1142h-185v101h638q208 0 354 -78q182 -98 182 -288q0 -118 -83 -198.5t-206 -116.5q133 -59 175 -168 q16 -41 42 -239.5t121 -198.5q71 0 87 101zM872 766.5q55 56.5 55 212.5t-55.5 209.5t-210.5 53.5h-143v-532h143q156 0 211 56.5z" />
+<glyph unicode="&#x1d412;" horiz-adv-x="986" d="M927 403q0 -182 -100.5 -303.5t-289 -121.5t-320.5 99l-93 -90q-9 -9 -37 -9t-28 26v418q0 24 78 24q21 0 24 -52t16 -93q72 -222 371 -222q89 0 135 65.5t46 150t-39.5 148.5t-148.5 93l-205 48q-124 41 -200.5 144.5t-76.5 238.5q0 175 103 286t273 111t284 -98l90 90 q8 8 37 8t29 -23v-419q0 -26 -76 -26q-20 0 -24.5 30.5t-6.5 55.5q-18 128 -109.5 209t-219.5 81q-85 0 -133 -57.5t-48 -150.5t63 -147q48 -41 139 -62l176 -39q133 -36 212 -154t79 -259z" />
+<glyph unicode="&#x1d413;" horiz-adv-x="1335" d="M669 6l-406 -6v100h263v1142h-96q-131 0 -196 -74q-53 -60 -75 -305h-100l42 480h1133l42 -480h-100q-14 190 -50 261q-59 118 -221 118h-94v-1142h263v-100z" />
+<glyph unicode="&#x1d414;" horiz-adv-x="1490" d="M1190 1337l240 6v-101q-184 0 -184 -17v-781q0 -207 -126.5 -336.5t-344 -129.5t-374.5 121.5t-157 344.5v798h-185v101l328 -6l326 6v-101h-184v-798q0 -172 43 -253q59 -112 222.5 -112t251.5 100t88 273v773q0 15 -184 17v101z" />
+<glyph unicode="&#x1d415;" horiz-adv-x="1511" d="M1255 1337l197 6v-101q-160 0 -166 -17l-457 -1206q-13 -35 -73.5 -35t-73.5 35l-461 1223h-162v101l286 -6l327 6v-101h-158l329 -868l323 853q-20 14 -153 15v101z" />
+<glyph unicode="&#x1d416;" horiz-adv-x="2058" d="M1817 1337l182 6v-101q-150 0 -156 -17l-405 -1206q-11 -34 -80 -34q-37 0 -49 34l-280 831l-279 -831q-12 -34 -81 -34q-38 0 -49 34l-411 1223h-150v101l274 -6l329 6v-101h-163l279 -827l198 591l-80 236h-148v101l274 -6l326 6v-101h-161l278 -827l272 812 q-25 14 -173 15v101z" />
+<glyph unicode="&#x1d417;" horiz-adv-x="1487" d="M1105 1337l239 6v-101q-213 0 -224 -17l-278 -439l412 -686h173v-100l-288 6l-333 -6v100h141l-264 438l-269 -422q26 -16 164 -16v-100l-281 6l-238 -6v100h21q190 0 201 18l337 527l-362 597h-170v101l287 -6l331 6v-101h-138l210 -349l213 334q-27 15 -164 15v101z " />
+<glyph unicode="&#x1d418;" horiz-adv-x="1534" d="M1278 1337l197 6v-101q-169 0 -179 -17l-393 -689v-436h186v-100l-322 6l-322 -6v100h185v436l-399 706h-172v101l293 -6l335 6v-101h-141l314 -555l308 540q-21 15 -133 15v101z" />
+<glyph unicode="&#x1d419;" horiz-adv-x="1106" d="M95 0q-36 0 -36 73q0 9 658 1169h-171q-362 0 -361 -379h-100l24 480h890q36 0 36 -67q0 -11 -656 -1168h184q210 0 303 127q80 110 80 329h101l-36 -564h-916z" />
+<glyph unicode="&#x1d41a;" horiz-adv-x="1042" d="M997 60q0 -60 -34 -60h-144q-63 0 -116.5 33t-53.5 92v16q-88 -165 -255 -165q-131 0 -231 61q-118 72 -118 195q0 177 207 267q154 66 361 68v83q0 94 -41.5 160t-130.5 66q-56 0 -113 -10q44 -41 44 -100.5t-37.5 -98t-95 -38.5t-96.5 38t-39 96q0 196 345 196 q163 0 276 -69q134 -82 134 -235v-508q0 -26 69 -36t69 -51zM613 272v220q-121 0 -218.5 -71.5t-97.5 -188.5q0 -65 31.5 -119.5t91.5 -54.5q80 0 136.5 66.5t56.5 147.5z" />
+<glyph unicode="&#x1d41b;" horiz-adv-x="1147" d="M673 946q200 0 314 -139t114 -347t-123 -346t-331 -138q-135 0 -255 122l-97 -98h-107v1263q0 56 -126 56h-17v108l376 15v-591q130 95 252 95zM803 209q24 83 24 252.5t-21 250.5q-39 152 -155 152q-57 0 -118 -38.5t-99 -89.5v-548q80 -130 194 -130q131 0 175 151z " />
+<glyph unicode="&#x1d41c;" horiz-adv-x="885" d="M839 232q0 -6 -2 -12q-87 -244 -343 -244q-207 0 -328 140t-121 350t121 351.5t328 141.5q124 0 208 -38q114 -50 114 -158q0 -57 -38 -95.5t-95.5 -38.5t-96 38t-38.5 97.5t39 94.5q-43 9 -91 9q-176 0 -176 -400t214 -400q132 0 180 120q6 21 22 55q14 18 58.5 18 t44.5 -29z" />
+<glyph unicode="&#x1d41d;" horiz-adv-x="1147" d="M476 -24q-201 0 -316 141t-115 348.5t123 344t331 136.5q126 0 226 -77v394q0 56 -134 56h-9v108l376 15v-1278q0 -58 134 -58h9v-106l-389 -12v83q-118 -95 -236 -95zM520 864q-131 0 -175 -149q-25 -83 -25 -252t21 -251q39 -154 160 -154t211 143v555 q-78 108 -192 108z" />
+<glyph unicode="&#x1d41e;" horiz-adv-x="953" d="M908 227q0 -102 -141 -181q-123 -70 -236 -70q-217 0 -351.5 140t-134.5 353.5t125 351.5t329 138t306.5 -127t102.5 -333q0 -42 -33 -42h-555v-4q0 -385 233 -385q163 0 223 112q13 28 25 57q18 32 47 32q60 0 60 -42zM702 535q0 124 -40 217q-53 124 -160 124 q-182 0 -182 -334v-7h382z" />
+<glyph unicode="&#x1d41f;" horiz-adv-x="875" d="M305 6l-260 -6v106h145v711h-116v106h116v222q0 157 144 242q119 69 288 69q81 0 144 -53t63 -133q0 -55 -38 -94t-93.5 -39t-94 38.5t-38.5 98t46 98.5h-9q-94 0 -143 -67.5t-49 -164.5v-217h201v-106h-189v-711h182v-106z" />
+<glyph unicode="&#x1d420;" horiz-adv-x="1049" d="M354 169l151 3q219 0 328 -56q150 -77 150 -275q0 -148 -173 -217q-124 -49 -296.5 -49t-297.5 51q-171 70 -171 215q0 124 143 175q-79 69 -79 185t67 199q-97 82 -97 231t112.5 233.5t263 84.5t250.5 -65q78 75 188 75q47 0 79 -38.5t32 -82t-26.5 -70.5t-66.5 -27 t-67 26.5t-27 56t4 43.5q-28 -8 -60 -29q74 -85 74 -207q0 -150 -111.5 -235.5t-254.5 -85.5t-233 51q-19 -31 -19 -68q0 -124 137 -124zM597 597v66q0 96 -22 140q-31 64 -117 64q-140 0 -140 -204v-66q0 -203 140 -203q86 0 117 63q22 45 22 140zM796 -159q0 120 -262 120 h-198q-103 0 -103 -120q0 -97 98 -145q76 -38 183 -38t184 39q98 49 98 144z" />
+<glyph unicode="&#x1d421;" horiz-adv-x="1200" d="M311 6l-266 -6v106h143v1157q0 56 -138 56h-5v108l377 15v-679q105 183 302 183q286 0 286 -298v-542h145v-106l-268 6l-249 -6v106h128v568q0 190 -68 190q-117 0 -190.5 -96t-73.5 -216v-446h143v-106z" />
+<glyph unicode="&#x1d422;" horiz-adv-x="599" d="M442 1279q0 -68 -49 -117.5t-117 -49.5t-116.5 49t-48.5 117.5t48.5 117t116.5 48.5t117 -48.5t49 -116.5zM305 6l-260 -6v106h143v649q0 58 -132 58h-4v106l370 17v-830h131v-106z" />
+<glyph unicode="&#x1d423;" horiz-adv-x="489" d="M394 1395q49 -49 49 -116.5t-49 -117t-117.5 -49.5t-117 49t-48.5 118t48.5 117t117 48t117.5 -49zM443 -102q0 -138 -112 -226t-254 -88q-106 0 -184 44q-95 53 -95 151q0 56 38.5 95t95 39t96 -38.5t39.5 -100t-48 -100.5q33 -7 62 -7q72 0 105 88q24 63 24 151v849 q0 58 -153 58h-5v106l391 17v-1038z" />
+<glyph unicode="&#x1d424;" horiz-adv-x="1125" d="M881 917l149 6v-106q-140 0 -160 -19l-235 -219l306 -454q13 -19 138 -19v-106l-207 6l-259 -6v106h12q55 0 65 17l-209 311l-70 -63v-265h141v-106l-251 6l-256 -6v106h143v1157q0 56 -138 56h-5v108l376 15v-916l293 274q-15 16 -92 17v106z" />
+<glyph unicode="&#x1d425;" horiz-adv-x="611" d="M305 6l-260 -6v106h143v1157q0 56 -138 56h-5v108l377 15v-1336h143v-106z" />
+<glyph unicode="&#x1d426;" horiz-adv-x="1775" d="M311 6l-266 -6v106h143v649q0 58 -138 58h-5v106l367 17v-191q46 90 129.5 145.5t182.5 55.5q233 0 274 -181q109 181 302 181q287 0 287 -298v-542h143v-106l-266 6l-251 -6v106h128v569q0 189 -67 189q-117 0 -190.5 -96t-73.5 -216v-446h145v-106l-268 6l-249 -6v106 h128v569q0 189 -68 189q-117 0 -190.5 -96t-73.5 -216v-446h143v-106z" />
+<glyph unicode="&#x1d427;" horiz-adv-x="1200" d="M311 6l-266 -6v106h143v649q0 58 -138 58h-5v106l367 17v-191q46 90 129.5 145.5t182.5 55.5q286 0 286 -298v-542h145v-106l-268 6l-249 -6v106h128v568q0 190 -68 190q-117 0 -190.5 -96t-73.5 -216v-446h143v-106z" />
+<glyph unicode="&#x1d428;" horiz-adv-x="1042" d="M175.5 107.5q-130.5 131.5 -130.5 350.5t128.5 360t347.5 141t347.5 -141.5t128.5 -359.5t-130 -350t-345.5 -132t-346 131.5zM697 222q24 84 24 257.5t-24 253.5q-44 143 -174 143t-176 -138q-27 -82 -27 -252t25 -259q46 -159 177 -159t175 154z" />
+<glyph unicode="&#x1d429;" horiz-adv-x="1147" d="M311 -397l-266 -6v105h143v1076q0 35 -135 35h-8v106l376 17v-86q127 96 259 96q199 0 310 -139.5t111 -347t-123 -345.5t-331 -138q-122 0 -213 72v-346h143v-105zM792 214q35 107 35 245t-30 240q-46 154 -146 154q-126 0 -217 -118v-559q72 -118 189 -118t169 156z " />
+<glyph unicode="&#x1d42a;" horiz-adv-x="1147" d="M835 -397l-266 -6v105h143v361q-106 -87 -233 -87q-202 0 -318 140.5t-116 348t122 344.5t329 137q156 0 262 -152l106 142h94v-1234h143v-105zM725 640q0 16 -17 54q-71 159 -185.5 159t-166.5 -152q-37 -106 -37 -242t32 -243q47 -158 145 -158q149 0 229 170v412z" />
+<glyph unicode="&#x1d42b;" horiz-adv-x="894" d="M305 6l-260 -6v106h143v649q0 58 -138 58h-5v106l354 17v-161q62 171 214 171q90 0 162.5 -45.5t72.5 -129.5q0 -55 -38.5 -92.5t-94 -37.5t-93 37t-37.5 92.5t34 93.5h-6q-192 0 -192 -394v-364h183v-106z" />
+<glyph unicode="&#x1d42c;" horiz-adv-x="771" d="M725 289q0 -313 -339 -313q-117 0 -195 57q-87 -57 -107 -57q-39 0 -39 26v289q0 26 68 26q26 0 39 -26l22 -73q52 -160 212 -160q183 0 183 159q0 88 -93 130q-28 13 -155.5 43t-201.5 99.5t-74 172.5q0 150 93.5 223.5t247.5 73.5q95 0 162 -36q69 36 97 36t28 -25 v-229q0 -28 -49 -28q-5 0 -15.5 0.5t-15.5 0.5q-19 0 -25 32t-10 58q-29 116 -176 116q-74 0 -127.5 -35.5t-53.5 -109t96 -107.5l160 -35q120 -28 194 -107.5t74 -200.5z" />
+<glyph unicode="&#x1d42d;" horiz-adv-x="744" d="M698 232q0 -99 -58.5 -177.5t-154.5 -78.5q-312 0 -312 256v585h-128v84q140 0 210 147q55 113 56 271h107v-396h247v-106h-247v-579q0 -170 88 -170t88 208q0 24 -2 80h106v-124z" />
+<glyph unicode="&#x1d42e;" horiz-adv-x="1200" d="M551 -24q-363 0 -363 266v513q0 58 -138 58h-5v106l389 17v-723q0 -84 25 -119.5t113.5 -35.5t141 84.5t52.5 181.5v431q0 58 -139 58h-5v106l388 17v-772q0 -58 140 -58h5v-106l-378 -12v131q-87 -143 -226 -143z" />
+<glyph unicode="&#x1d42f;" horiz-adv-x="1094" d="M887 917l162 6v-106h-12q-118 0 -126 -19l-292 -769q-14 -37 -71.5 -37t-71.5 37l-300 788h-131v106l231 -6l267 6v-106h-115l187 -497l183 480q-11 17 -110 17v106z" />
+<glyph unicode="&#x1d430;" horiz-adv-x="1502" d="M1302 917l155 6v-106h-11q-110 0 -117 -19l-269 -769q-13 -37 -69.5 -37t-69.5 37l-168 488l-171 -488q-13 -37 -70 -37t-70 37l-274 788h-123v106l225 -6l222 6v-106h-76l164 -469l116 330l-49 139h-94v106l177 -6l247 6v-106h-118l181 -522l176 505q4 15 -127 17v106z " />
+<glyph unicode="&#x1d431;" horiz-adv-x="1118" d="M843 917l193 6v-106h-16q-158 0 -171 -19l-202 -281l277 -411h149v-106l-224 6l-256 -6v106h91l-162 240l-160 -223q19 -16 97 -17v-106l-222 6l-192 -6v106h16q156 0 169 19l229 313l-258 379h-146v106l221 -6l256 6v-106h-90l142 -205l134 188q-18 16 -94 17v106z" />
+<glyph unicode="&#x1d432;" horiz-adv-x="1101" d="M892 917l164 6v-106h-12q-119 0 -127 -19l-368 -958q-41 -107 -124 -181.5t-188 -74.5q-79 0 -135.5 59t-56.5 138q0 52 37 87.5t88.5 35.5t87.5 -36t36 -87q0 -82 -70 -112q8 -2 13 -2q136 0 200 173l59 160l-312 817h-132v106l230 -6l267 6v-106h-115l188 -491l181 474 q-19 17 -109 17v106z" />
+<glyph unicode="&#x1d433;" horiz-adv-x="867" d="M83 0q-38 0 -38 60q0 11 7 22l483 757h-90q-149 0 -207 -67.5t-58 -220.5h-104l25 372h678q38 0 38 -56q0 -12 -6 -21l-480 -755h99q167 0 227 91q40 62 58 246h106l-38 -428h-700z" />
+<glyph unicode="&#x1d434;" horiz-adv-x="1388" d="M239 4l-149 -4q-23 0 -23 19q0 33 37 38q145 20 229 161l690 1152q20 33 48.5 33t33.5 -43l119 -1226q6 -55 36 -69q17 -8 72.5 -8t55.5 -20q0 -37 -35 -37l-185 4h-143l-99 -4q-29 0 -29 22q0 29 24 34l91 10q59 10 59 55q0 57 -13.5 161.5t-15.5 125.5l-5 56h-501 l-149 -247q-36 -59 -36 -92q0 -46 54.5 -64t54.5 -24q0 -37 -36 -37zM1032 521l-66 661l-395 -661h461z" />
+<glyph unicode="&#x1d435;" horiz-adv-x="1294" d="M1317 1280q117 -75 117 -213.5t-137 -245.5q-116 -90 -271 -120q123 -11 211.5 -84t88.5 -194t-100 -233q-89 -97 -204 -143.5t-229 -46.5h-673q-53 0 -53 22q0 37 68 38h36q73 1 94 32q10 14 20 54l264 1057q8 31 8 45q0 29 -46 35q-5 1 -63 1t-58 22q0 37 47 37h639 q142 0 241 -63zM1228 927q45 78 45 164t-61.5 140.5t-161.5 54.5h-255q-55 0 -72 -12t-30 -65l-121 -491h281q117 0 218 54.5t157 154.5zM1161 446q0 106 -63.5 169t-169.5 63h-370l-137 -553q-7 -28 -7 -45q0 -23 66 -23h266q164 0 289.5 113.5t125.5 275.5z" />
+<glyph unicode="&#x1d436;" horiz-adv-x="1425" d="M1401 846l7 107q0 159 -75 260q-84 114 -226 114t-276 -67q-209 -105 -333 -344t-124 -488q0 -184 103.5 -298.5t284.5 -114.5q141 0 272 82t208 208q8 13 73 164q9 21 24 21q21 0 21 -17.5t-16 -59.5q-74 -192 -244.5 -323.5t-369.5 -131.5q-232 0 -374.5 150 t-142.5 384q0 334 267 613.5t598 279.5q216 0 323 -186q154 186 164 186q18 0 18 -12t-39 -173l-84 -335q-12 -37 -33 -37q-26 0 -26 18z" />
+<glyph unicode="&#x1d437;" horiz-adv-x="1407" d="M1526 850q0 -316 -236.5 -583t-547.5 -267h-622q-53 0 -53 22q0 31 45 37q35 0 83 1t68 28q11 15 22 58l264 1057q8 31 8 45q0 29 -46 35q-7 1 -64 1t-57 22q0 37 46 37h640q210 0 330 -140t120 -353zM1308 567q63 178 63 349t-91.5 270.5t-262.5 99.5h-216 q-55 0 -72.5 -12t-30.5 -65l-271 -1084q-7 -28 -7 -45q0 -23 67 -23h224q420 0 597 510z" />
+<glyph unicode="&#x1d438;" horiz-adv-x="1260" d="M1459 1321q0 11 -5 -30l-41 -343q-5 -44 -26 -44t-21 22q0 2 6 34.5t6 110.5q0 134 -82 181q-59 34 -199 34h-301q-49 0 -64.5 -12.5t-28.5 -62.5l-122 -487h201q112 0 157 35.5t82 158.5q10 35 27 35q21 0 21 -13q0 -5 -26 -110l-87 -352q-10 -41 -28 -41q-21 0 -21 19 q0 1 9.5 34t9.5 76t-7 57q-22 44 -147 44h-205l-136 -542q-8 -32 -8 -45q0 -23 45 -23h309q222 0 333 94q83 71 182 299q23 53 40 53q20 0 20 -18.5t-187 -450.5q-10 -24 -19.5 -29t-39.5 -5h-1000q-39 0 -39 22q0 32 46 37q36 1 71 1q70 2 87 44q5 13 13 42l266 1065 q8 31 8 39q0 29 -48 34h-69q-52 0 -52 23q0 36 47 36h980q43 0 43 -22z" />
+<glyph unicode="&#x1d439;" horiz-adv-x="1231" d="M198 4l-101 -4q-30 0 -30 22q0 25 16 32t50 7h63q53 4 70 32q8 13 18 53l266 1065q8 31 8 39q0 29 -49 34h-69q-51 0 -51 23q0 36 48 36h952q41 0 41 -22l-44 -373q-6 -44 -27 -44t-21 22l6 42q7 49 7 115t-18 105q-45 98 -255 98h-289q-46 0 -60 -14.5t-26 -60.5 l-127 -514h191q108 0 157 38q32 24 65.5 108.5t43.5 84.5q19 0 19 -15q0 -6 -28 -123l-85 -340q-10 -39 -26 -39q-22 0 -22 22q0 1 10 34t10 74t-8 57q-22 44 -143 44h-199l-126 -503q-8 -31 -8 -42t6 -20q11 -17 110 -19t99 -23q0 -35 -49 -35l-113 4h-282z" />
+<glyph unicode="&#x1d43a;" horiz-adv-x="1423" d="M1375 529l102 4q25 0 25 -25t-29 -32q-9 -2 -44.5 -2t-47.5 -7q-25 -15 -42 -73q-39 -136 -57 -226t-39 -160q-3 -6 -15 -6q-34 0 -79 128q-136 -172 -417 -172q-233 0 -376 150t-143 384q0 334 265 613.5t597 279.5q212 0 325 -184q153 184 163 184q18 0 18 -13 q0 -16 -55 -241t-67.5 -264t-33.5 -39q-25 0 -25 18l8 107q0 160 -80 267t-234 107q-130 0 -264 -68q-210 -107 -332 -341t-122 -483q0 -188 105 -304t291 -116q101 0 201 40t146 115q16 25 45.5 126.5t29.5 126t-4 30.5q-16 23 -201 23q-16 0 -16 21q0 36 54 36z" />
+<glyph unicode="&#x1d43b;" horiz-adv-x="1416" d="M1536 1339l98 4q29 0 29 -22q0 -34 -89 -38t-108 -33q-10 -14 -19 -51l-269 -1074q-4 -16 -4 -33q0 -33 83.5 -34.5t83.5 -20.5q0 -37 -38 -37l-102 4h-260l-99 -4q-28 0 -28 19q0 31 35 37q5 1 60 1q91 0 117 62q1 2 12 51l125 501h-596l-136 -546q-4 -16 -4 -33 q0 -33 83.5 -34.5t83.5 -20.5q0 -37 -37 -37l-104 4h-258l-100 -4q-28 0 -28 19q0 41 68 41h38q70 0 92 32q8 12 19 54l265 1057q8 31 8 45q0 29 -48 35q-4 1 -62.5 1t-58.5 22q0 37 37 37l101 -4h262l99 4q30 0 30 -22q0 -34 -89.5 -38t-109.5 -33q-8 -11 -18 -51 l-118 -471h594l120 475q7 31 7 45q0 29 -47 35q-4 1 -63 1t-59 22q0 37 39 37l100 -4h263z" />
+<glyph unicode="&#x1d43c;" horiz-adv-x="687" d="M812 1339l94 4q29 0 29 -20q0 -27 -17 -35q-4 -2 -87 -5t-103 -33q-5 -8 -17 -53l-267 -1056q-7 -27 -7 -45q0 -30 46 -36q4 -1 67 -1t63 -24q0 -35 -44 -35l-96 4h-282l-94 -4q-30 0 -30 19q0 38 47 38q140 0 162 36q6 9 17 53l265 1059q9 35 9 43q0 36 -88.5 37 t-88.5 21q0 37 37 37l104 -4h281z" />
+<glyph unicode="&#x1d43d;" horiz-adv-x="930" d="M1050 1339l100 4q27 0 27 -22q0 -31 -62 -36.5t-70 -10.5q-21 -14 -34 -67l-234 -925q-34 -137 -155.5 -230.5t-262.5 -93.5q-101 0 -172 56.5t-71 154.5q0 147 117 147q79 0 79 -73q0 -46 -35 -79.5t-81 -33.5q-12 0 -26 4q30 -136 185 -136q100 0 181 102q67 84 95 195 l227 899q8 31 8 46.5t-6 24.5q-13 21 -200 21q-15 0 -15 22q0 35 55 35l195 -4h155z" />
+<glyph unicode="&#x1d43e;" horiz-adv-x="1449" d="M1607 1339l65 4q24 0 24 -22q0 -29 -35 -35q-138 -25 -312 -154l-363 -281q-24 -18 -36 -29q3 -14 58 -144l226 -532q24 -54 47 -70q8 -5 63 -16t55 -23q0 -37 -34 -37l-187 4l-211 -4q-26 0 -26 19q0 38 36 38q97 0 97 62q0 26 -251 607l-300 -234l-77 -304 q-19 -74 -19 -96q0 -33 83.5 -34.5t83.5 -20.5q0 -37 -37 -37l-112 4h-237l-111 -4q-30 0 -30 22q0 32 46 37q35 1 84 2t68 31q9 15 19 54l265 1057q8 31 8 45q0 37 -107 37q-60 0 -60 21q0 37 37 37l110 -4h239l111 4q30 0 30 -20q0 -24 -16 -34q-3 -2 -83.5 -6t-98.5 -31 q-9 -13 -19 -53l-163 -649l771 599q75 58 75 99q0 26 -36.5 35t-36.5 25q0 35 48 35l175 -4h74z" />
+<glyph unicode="&#x1d43f;" horiz-adv-x="1125" d="M821 1339l112 4q29 0 29 -20q0 -38 -50 -40t-103 -2q-71 -4 -91 -33q-9 -13 -20 -56l-267 -1067q-8 -32 -8 -45q0 -23 44 -23h211q201 0 316 106q94 86 169 289q19 51 35 51q19 0 19 -15.5t-159 -450.5q-4 -13 -19 -32q-8 -5 -34 -5h-899q-39 0 -39 22q0 32 46 37 q35 1 84 2t68 31q8 13 19 54l265 1057q8 31 8 45q0 29 -45 35q-5 1 -63.5 2t-58.5 21q0 37 37 37l114 -4h280z" />
+<glyph unicode="&#x1d440;" horiz-adv-x="1725" d="M272 4l-179 -4q-26 0 -26 22q0 32 49 38q75 10 99 22q61 30 83 119l251 1002q8 31 8 45q0 29 -45 35q-5 1 -63.5 2t-58.5 21q0 37 47 37h261q30 0 38 -7t12 -37l148 -1125l717 1135q21 34 62 34h257q40 0 40 -20q0 -26 -15 -34q-4 -3 -84 -6.5t-99 -32.5q-6 -10 -17 -51 l-270 -1074q-4 -16 -4 -33q0 -33 84 -34.5t84 -20.5q0 -37 -38 -37l-103 4h-246l-97 -4q-31 0 -31 22q0 32 46 37q36 1 84.5 2t68.5 32q9 14 19 53l285 1138h-2l-791 -1250q-22 -34 -41 -34t-26 53l-163 1221h-2l-271 -1082q-9 -36 -9 -51q0 -49 41 -68q19 -9 67.5 -15 t48.5 -21q0 -37 -36 -37z" />
+<glyph unicode="&#x1d441;" horiz-adv-x="1416" d="M1460 1339l179 4q24 0 24 -22q0 -32 -48 -38q-74 -9 -99 -22q-61 -32 -84 -125l-275 -1096q-10 -40 -31 -40q-16 0 -30 35l-469 1166q-11 27 -20 41l-264 -1050q-9 -36 -9 -51q0 -49 41 -68q19 -9 67.5 -15t48.5 -21q0 -37 -36 -37l-183 4l-179 -4q-26 0 -26 19 q0 34 48 41q78 10 100 21q60 30 83 120l260 1041l7 26q0 14 -88.5 16t-88.5 22q0 37 48 37h258q36 0 50 -34l421 -1046l222 886q8 36 8 52q0 47 -40 66q-18 9 -66.5 16.5t-48.5 22.5q0 37 35 37l90 -4h95z" />
+<glyph unicode="&#x1d442;" horiz-adv-x="1427" d="M1546 861q0 -333 -258 -618t-587 -285q-222 0 -355 147.5t-133 372.5q0 330 260 618.5t585 288.5q224 0 356 -148.5t132 -375.5zM1388 933q0 171 -87 289.5t-253 118.5q-241 0 -441 -243q-104 -127 -165 -312.5t-61 -358.5t78 -289q90 -134 256 -134q286 0 492 331 q181 293 181 598z" />
+<glyph unicode="&#x1d443;" horiz-adv-x="1252" d="M207 4l-110 -4q-30 0 -30 22q0 32 48 37q36 1 83 2t66 29q11 15 21 56l264 1057q8 31 8 45q0 29 -46 35q-5 1 -63 1t-58 22q0 37 46 37h616q151 0 256 -69q122 -81 122 -224q0 -181 -186 -310q-167 -115 -357 -115h-330l-126 -500q-4 -16 -4 -35q0 -32 83.5 -33t83.5 -20 q0 -37 -37 -37l-111 4h-239zM1264 1092q0 194 -269 194h-194q-55 0 -72.5 -12t-30.5 -65l-133 -538h277q296 0 390 254q32 85 32 167z" />
+<glyph unicode="&#x1d444;" horiz-adv-x="1427" d="M1546 861q0 -271 -168 -508.5t-423 -341.5q5 -99 24 -145q32 -75 113 -75q144 0 231 196q13 30 22 30q17 0 17 -23t-30 -99q-107 -276 -290 -276q-157 0 -157 205q0 51 12 165q-101 -31 -196 -31q-222 0 -355 147.5t-133 372.5q0 330 260 618.5t585 288.5 q224 0 356 -148.5t132 -375.5zM1388 920q0 174 -87 297.5t-255 123.5q-143 0 -284 -101q-176 -126 -283 -359.5t-107 -461.5q0 -135 56.5 -246t173.5 -151q-17 32 -17 64q0 77 60.5 140t136.5 63q148 0 167 -218q308 181 410 622q29 130 29 227zM902 69q0 180 -120 180 q-60 0 -108.5 -50t-48.5 -111q0 -86 88.5 -86t187.5 43q1 10 1 24z" />
+<glyph unicode="&#x1d445;" horiz-adv-x="1430" d="M204 4l-109 -4q-28 0 -28 19q0 32 28 39q4 1 55 1q94 0 115 33q10 15 20 54l264 1057q8 31 8 45q0 29 -48 35q-4 1 -62.5 1t-58.5 22q0 37 46 37h543q159 0 281 -67q148 -81 148 -226t-151 -256q-121 -89 -284 -125q192 -61 192 -233q0 -16 -18.5 -143.5t-18.5 -184.5 q0 -110 82 -110q65 0 110 53q27 31 53 90.5t37 59.5q22 0 22 -19.5t-23 -66.5q-75 -157 -205 -157q-105 0 -175.5 52t-70.5 153q0 52 30.5 154t30.5 152q0 92 -63.5 138t-158.5 46h-237l-131 -528q-4 -16 -4 -33q0 -33 83.5 -34.5t83.5 -20.5q0 -37 -37 -37l-112 4h-237z M1238 1082q0 204 -295 204h-142q-55 0 -72.5 -12t-30.5 -65l-129 -517h222q318 0 416 237q31 76 31 153z" />
+<glyph unicode="&#x1d446;" horiz-adv-x="1052" d="M217 428l-15 -123q0 -145 95 -217.5t241.5 -72.5t257.5 114t111 258q0 97 -48.5 150t-213.5 90t-222 74q-111 72 -111 241.5t148 306t327 136.5q201 0 277 -150q117 150 129 150q17 0 17 -11t-27 -124l-79 -315q-11 -38 -28 -38q-21 0 -21 17l9 113q0 304 -283 304 q-134 0 -244 -101t-110 -226t99 -179q46 -25 198.5 -60.5t204.5 -86.5q95 -92 95 -228q0 -189 -149 -340.5t-338 -151.5q-231 0 -331 150q-112 -150 -125 -150q-20 0 -20 18q0 -6 9 30l100 402q9 38 28 38t19 -18z" />
+<glyph unicode="&#x1d447;" horiz-adv-x="1404" d="M508 4l-125 -4q-30 0 -30 19q0 29 18 36q4 2 59.5 2.5t114 6t75 24.5t28.5 65l265 1066q11 44 11 46q0 21 -54 21h-145q-182 0 -264 -89q-43 -47 -122 -259q-12 -33 -27 -33q-20 0 -20 19q0 1 128 382q4 14 18 33q7 4 31 4h1086q50 0 50 -22q0 -3 -4 -27l-56 -347 q-7 -42 -26.5 -42t-19.5 28t10.5 93t10.5 99q0 99 -68 136q-48 26 -187.5 26t-154.5 -5q-30 -10 -46 -73l-265 -1058q-9 -35 -9 -49t7 -23q14 -18 124.5 -21t110.5 -21q0 -37 -42 -37l-125 4h-357z" />
+<glyph unicode="&#x1d448;" horiz-adv-x="1439" d="M1570 1339l90 4q26 0 26 -22q0 -31 -35 -38q-30 -3 -61 -5q-69 -13 -95.5 -50.5t-46.5 -116.5l-150 -590q-11 -52 -42 -155q-62 -165 -207.5 -286.5t-310 -121.5t-268 104t-103.5 267q0 57 18 129l171 688q24 96 24 102q0 29 -48 35q-4 1 -63.5 1t-59.5 22q0 37 38 37 l110 -4h245l108 4q30 0 30 -22q0 -33 -91.5 -38t-108.5 -34q-8 -13 -17 -50l-193 -773q-21 -83 -21 -152q0 -116 61.5 -187.5t176.5 -71.5q169 0 302.5 131.5t177.5 305.5l176 697q8 31 8 52q0 50 -40 69q-18 8 -66.5 14t-48.5 22q0 37 35 37z" />
+<glyph unicode="&#x1d449;" horiz-adv-x="1514" d="M1593 1339l147 4q21 0 21 -20q0 -32 -36 -37q-139 -20 -228 -162l-710 -1128q-23 -38 -52 -38t-35 48l-157 1212q-6 49 -42 62q-17 6 -65.5 6t-48.5 22q0 35 47 35l163 -4h157l89 4q27 0 27 -20q0 -37 -47 -37q-125 0 -125 -55v-7l139 -1059l618 979q28 46 28 76 q0 44 -53 61t-53 25q0 37 36 37z" />
+<glyph unicode="&#x1d44a;" horiz-adv-x="2052" d="M2137 1339l140 4q22 0 22 -22q0 -30 -35 -35q-82 -14 -120.5 -47t-85.5 -115l-647 -1128q-21 -38 -41 -38q-25 0 -28 46l-73 1017l-586 -1025q-21 -38 -40 -38q-26 0 -29 46l-86 1207q-4 52 -23 66q-7 5 -62.5 8t-55.5 21q0 37 34 37l95 -4h102l213 4q29 0 29 -22 q0 -33 -43 -35q-134 -9 -134 -68v-5l74 -1014l508 895q-5 77 -19 168q-14 19 -73 23t-59 21q0 37 35 37l197 -4l213 4q28 0 28 -20q0 -35 -44 -37q-133 -8 -133 -50v-14l71 -1023l536 939q28 49 28 73q0 54 -64 68.5t-64 26.5q0 37 34 37z" />
+<glyph unicode="&#x1d44b;" horiz-adv-x="1418" d="M1557 1339l84 4q24 0 24 -22q0 -29 -38 -35q-122 -19 -179 -53t-152 -133l-325 -349l261 -610q27 -61 55 -75q5 -2 70.5 -7t65.5 -22q0 -37 -35 -37l-100 4h-226l-102 -4q-30 0 -30 19q0 32 34 38q103 22 106 58l-217 508l-364 -393q-82 -86 -82 -115q0 -42 45.5 -54 t45.5 -26q0 -35 -49 -35l-274 4l-84 -4q-24 0 -24 19q0 33 39 38q173 26 301 160l427 454l-234 547q-20 49 -57 61q-15 5 -71 6.5t-56 20.5q0 37 35 37l209 -4h112l107 4q30 0 30 -22q0 -26 -61 -41t-82 -52l186 -430l344 371q30 33 30 59q0 40 -45 52.5t-45 27.5 q0 35 49 35z" />
+<glyph unicode="&#x1d44c;" horiz-adv-x="1543" d="M1695 1339l71 4q24 0 24 -20q0 -31 -40 -37q-130 -20 -228 -115q-25 -25 -45 -47l-493 -567q-19 -22 -30 -65l-70 -283q-26 -104 -26 -117q0 -29 47 -34h68q55 0 55 -23q0 -35 -44 -35l-101 4h-245l-106 -4q-28 0 -28 19q0 33 38 38h63q88 0 111 66q15 44 58 214.5 t43 190t-8 41.5l-243 653q-17 46 -64 58q-16 4 -65.5 6t-49.5 20q0 37 34 37l102 -4h227l102 4q30 0 30 -22q0 -34 -74 -38t-75 -42l234 -634l467 537q56 65 56 96.5t-43 43t-43 22.5q0 37 36 37l174 -4h81z" />
+<glyph unicode="&#x1d44d;" horiz-adv-x="1105" d="M1352 1327q0 -22 -21 -45l-1080 -1222h341q229 0 341 97q88 77 170 310q18 52 33 52q20 0 20 -20q0 -39 -143 -462q-4 -13 -19 -32q-7 -5 -41 -5h-838q-48 0 -48 15q0 24 25 52l1078 1219h-322q-204 0 -311 -79q-90 -67 -169 -268q-14 -35 -28 -35q-20 0 -20 20 q0 37 115 382q4 14 19 33q8 4 39 4h812q47 0 47 -16z" />
+<glyph unicode="&#x1d44e;" horiz-adv-x="1096" d="M1100 329q22 0 22 -22t-26 -106q-70 -225 -197 -225q-74 0 -125.5 45.5t-63.5 119.5q-139 -165 -277 -165t-209.5 102t-71.5 233t55 268t182.5 258.5t269 121.5t202.5 -143q15 102 92 102q56 0 56 -55q0 -15 -28 -123q-22 -99 -71 -296l-46 -167q-24 -87 -24 -157 q0 -101 67 -101q89 0 164 266q12 44 29 44zM665 915q-222 0 -334 -455q-37 -150 -37 -232q0 -209 139 -209q87 0 176.5 76t111.5 162l116 462q0 21 -16 64q-49 132 -156 132z" />
+<glyph unicode="&#x1d44f;" horiz-adv-x="1008" d="M474 821q130 138 259.5 138t202 -102.5t72.5 -233t-47 -248.5q-62 -157 -189.5 -278t-269 -121t-213.5 110q-61 94 -61 234q0 80 59 314l159 630q26 103 26 117q0 36 -77.5 41t-77.5 24q0 25 21 39q3 2 130.5 14t145.5 12q25 0 25 -22q0 -5 -7 -33zM865 707 q0 208 -138 208q-78 0 -160 -66.5t-121 -143.5q-5 -9 -50.5 -194t-45.5 -270q0 -222 146 -222q218 0 332 451q37 147 37 237z" />
+<glyph unicode="&#x1d450;" horiz-adv-x="951" d="M955 260q21 0 21 -21t-43 -68q-180 -195 -441 -195q-155 0 -247.5 102t-92.5 259q0 227 173.5 424.5t397.5 197.5q96 0 173.5 -48t77.5 -138q0 -52 -30 -91.5t-81 -39.5q-74 0 -74 71q0 51 38.5 78t91.5 27q-44 97 -193 97q-91 0 -183 -70q-139 -106 -208 -362 q-37 -137 -37 -231t50.5 -163.5t148.5 -69.5q213 0 358 141l51 55q41 45 49 45z" />
+<glyph unicode="&#x1d451;" horiz-adv-x="1096" d="M1168 1489q0 -9 -6 -33l-308 -1220q-14 -55 -14 -116q0 -101 67 -101q93 0 164 266q12 44 29 44q22 0 22 -22.5t-29 -115t-61 -139.5q-52 -76 -129.5 -76t-129 45.5t-63.5 119.5q-139 -165 -277 -165t-209.5 102t-71.5 234t48 250q63 156 180 267q137 130 278 130 t203 -143l133 529q7 28 7 36q0 37 -78.5 41t-78.5 24q0 25 21 39q3 2 131.5 14t146.5 12q25 0 25 -22zM665 915q-222 0 -334 -455q-37 -150 -37 -232q0 -209 139 -209q87 0 176.5 76t111.5 162l116 462q0 21 -16 64q-49 132 -156 132z" />
+<glyph unicode="&#x1d452;" horiz-adv-x="940" d="M966 236q0 -17 -46 -67q-179 -193 -439 -193q-157 0 -243 112.5t-86 282.5t91.5 315.5t252.5 221.5q107 51 205.5 51t167 -48.5t68.5 -134.5q0 -183 -230 -243q-118 -30 -377 -30q-34 -147 -34 -224q0 -260 191 -260q221 0 365 148q90 93 92 93q22 0 22 -24zM872 776 q0 66 -47 102.5t-115 36.5q-139 0 -243 -119q-85 -98 -128 -249h110q423 0 423 229z" />
+<glyph unicode="&#x1d453;" horiz-adv-x="675" d="M860 1391q0 -48 -31 -84t-78 -36q-74 0 -74 70q0 94 112 108q-47 40 -120 40t-108 -103q-12 -35 -35 -157l-55 -291h193q39 0 39 -23q0 -42 -48 -42h-198q-8 -55 -53 -288l-103 -519q-115 -508 -338 -508q-70 0 -125.5 37.5t-55.5 94t31.5 93t78.5 36.5q73 0 73 -70 q0 -44 -32.5 -73t-78.5 -34q41 -41 109 -41q80 0 130 139q18 49 49 210l178 923h-160q-37 0 -37 25q0 40 49 40h162q50 289 81 371q84 223 258 223q72 0 129.5 -36.5t57.5 -104.5z" />
+<glyph unicode="&#x1d454;" horiz-adv-x="1007" d="M1007 863q0 -7 -7 -35l-240 -971q-14 -55 -56 -113q-137 -186 -405.5 -186t-268.5 124q0 47 31 81t78 34q74 0 74 -74.5t-88 -98.5q73 -23 174 -23t181.5 56t121.5 149q29 65 49 154l38 173q-123 -136 -256.5 -136t-205.5 100t-72 231t55 264.5t172 242.5 q136 124 276 124t203 -143q8 102 90 102q56 0 56 -55zM663 915q-220 0 -329 -434q-37 -148 -37 -232q0 -209 139 -209q77 0 174 79.5t116 155.5l102 417l8 31q0 17 -14 56q-49 136 -159 136z" />
+<glyph unicode="&#x1d455;" horiz-adv-x="1162" d="M1165 329q23 0 23 -19.5t-26 -87.5q-94 -246 -253 -246q-76 0 -124.5 49.5t-48.5 125.5q0 37 30 120q133 368 133 492q0 152 -117 152q-137 0 -236.5 -104.5t-135.5 -246.5l-118 -473q-15 -61 -26 -78q-21 -37 -67 -37q-57 0 -57 57q0 22 7 50l317 1262q5 20 5 36 q0 37 -78 40.5t-78 24.5q0 24 21 39q6 4 129.5 15t149.5 11t26 -22q0 3 -9 -33l-166 -669q135 172 322 172q111 0 176.5 -59.5t65.5 -170.5t-137 -488q-36 -99 -36 -150q0 -72 58 -72q86 0 145 95q31 49 72 171q15 44 33 44z" />
+<glyph unicode="&#x1d456;" horiz-adv-x="657" d="M660 329q23 0 23 -19t-27 -89q-95 -245 -254 -245q-76 0 -123.5 49.5t-47.5 125.5q0 39 26 111l116 297q83 220 83 288t-58 68q-89 0 -148 -96q-30 -50 -72 -175q-13 -39 -30 -39q-25 0 -25 20.5t27 89.5q96 244 254 244q75 0 124 -50t49 -124q0 -36 -22 -99l-117 -306 q-86 -227 -86 -294t58 -67q86 0 145 95q31 49 72 171q15 44 33 44zM642.5 1408.5q21.5 -21.5 21.5 -56.5t-34 -67t-75 -32q-71 0 -71 72q0 41 33 73t68.5 32t57 -21.5z" />
+<glyph unicode="&#x1d457;" horiz-adv-x="714" d="M735 1358q0 -41 -33.5 -73t-74.5 -32q-74 0 -74 72q0 41 34 73t75 32q73 0 73 -72zM654 763q0 -39 -9 -75l-202 -802q-35 -138 -149 -233t-254 -95q-71 0 -128.5 31t-57.5 95q0 46 32 79.5t78 33.5q74 0 74 -69q0 -84 -94 -104q45 -23 96 -23q99 0 174 95q61 77 89 188 l207 818q15 59 15 114q0 99 -69 99q-89 0 -161 -80q-43 -49 -89.5 -139.5t-59.5 -90.5q-23 0 -23 21q0 14 30 74q128 259 309 259q83 0 137.5 -56t54.5 -140z" />
+<glyph unicode="&#x1d458;" horiz-adv-x="1039" d="M628 186l17 117q0 167 -251 195l-102 -407q-31 -115 -93 -115q-57 0 -57 57q0 22 7 50l313 1246q9 36 9 52q0 36 -76.5 41t-76.5 24q0 23 21 39q3 2 130 14t149.5 12t22.5 -22q0 3 -9 -33l-222 -896q83 31 184 138q153 162 169 175q100 86 202 86q60 0 104 -35.5 t44 -88.5t-31.5 -88.5t-79.5 -35.5q-72 0 -72 69q0 97 111 109q-28 26 -78 26q-82 0 -173 -72q-48 -38 -148 -148t-176 -156q316 -41 316 -235q0 -31 -13 -90t-13 -90q0 -105 71 -105q113 0 188 266q12 44 31 44q22 0 22 -24t-29 -102q-84 -227 -215 -227q-88 0 -142 60.5 t-54 149.5z" />
+<glyph unicode="&#x1d459;" horiz-adv-x="571" d="M642 1489q0 -9 -6 -33l-308 -1220q-15 -59 -15 -116q0 -101 67 -101q94 0 164 266q12 44 32 44t20 -25.5t-25 -103.5q-72 -224 -197 -224q-83 0 -137 56t-54 140q0 37 10 77l270 1080q12 48 12 52q0 36 -78 40.5t-78 24.5q0 26 22 39q7 4 128 15t147 11t26 -22z" />
+<glyph unicode="&#x1d45a;" horiz-adv-x="1843" d="M1846 329q22 0 22 -20.5t-25 -86.5q-94 -246 -254 -246q-76 0 -124 49.5t-48 125.5q0 37 30 120q132 365 132 492q0 152 -116 152q-191 0 -319 -210q-27 -44 -39 -79l-132 -522q-17 -67 -26 -84q-23 -44 -69 -44q-57 0 -57 54q0 6 23 99l117 474q26 105 26 160 q0 152 -116 152q-162 0 -297 -177q-65 -86 -107 -254l-59 -277q-14 -72 -49 -185q-25 -46 -74 -46q-56 0 -56 54q0 25 26 127l56 221l63 217q36 130 36 225t-68 95q-91 0 -161 -257q-14 -53 -33 -53q-25 0 -25 21q0 26 31 118.5t62 138.5q53 76 133.5 76t133 -54.5 t57.5 -137.5q137 192 336 192q230 0 242 -211q142 211 351 211q111 0 176 -59.5t65 -171t-136 -487.5q-36 -100 -36 -150q0 -72 58 -72q87 0 145 95q31 49 72 171q15 44 33 44z" />
+<glyph unicode="&#x1d45b;" horiz-adv-x="1250" d="M1252 329q24 0 24 -19.5t-26 -87.5q-94 -246 -254 -246q-76 0 -124.5 49.5t-48.5 125.5q0 38 30 120q134 368 134 492q0 152 -116 152q-163 0 -297 -177q-46 -61 -57 -92t-42 -156l-82 -339q-8 -47 -34 -129q-25 -46 -74 -46q-56 0 -56 54q0 26 26 128l56 220l63 218 q36 133 36 226t-68 93q-90 0 -161 -257q-15 -53 -33 -53q-25 0 -25 21q0 27 31.5 119t62.5 137q52 77 132.5 77t133 -54.5t57.5 -137.5q137 192 336 192q111 0 176.5 -59.5t65.5 -173t-136 -485.5q-37 -101 -37 -150q0 -72 58 -72q86 0 146 95q33 53 72 171q14 44 31 44z " />
+<glyph unicode="&#x1d45c;" horiz-adv-x="1057" d="M1057 597q0 -228 -173 -424.5t-398 -196.5q-151 0 -242.5 104t-91.5 257q0 226 174.5 424t397.5 198q150 0 241.5 -104.5t91.5 -257.5zM871 441q41 141 41 236.5t-49 166.5t-142 71q-181 0 -308 -224q-43 -76 -79 -210t-36 -226.5t48.5 -164t141.5 -71.5q260 0 383 422z " />
+<glyph unicode="&#x1d45d;" horiz-adv-x="1095" d="M99 -420l-87 -5q-25 0 -25 21q0 38 58.5 43t67.5 12q21 16 34 69l245 982q17 68 17 114q0 99 -68 99q-93 0 -161 -257q-14 -53 -33 -53q-24 0 -24 21q0 26 31.5 120t60.5 137q52 76 129 76t129.5 -46.5t64.5 -119.5q130 166 281 166q132 0 208 -109q68 -96 68 -228 t-55.5 -268t-181.5 -257t-269.5 -121t-201.5 146l-85 -332q-27 -104 -27 -119q0 -26 79.5 -30.5t79.5 -27.5q0 -38 -58 -38zM954 707q0 208 -139 208q-80 0 -176 -79.5t-115 -157.5l-106 -427q-6 -24 -6 -43.5t11 -52.5q45 -136 160 -136q216 0 332 451q39 152 39 237z" />
+<glyph unicode="&#x1d45e;" horiz-adv-x="1030" d="M512 -420l-99 -5q-29 0 -29 21q0 33 30 41q9 2 56 2q88 0 114 67q30 78 55 190l48 214l-2 3q-124 -137 -257 -137t-204.5 102t-71.5 234t56 269t182.5 257.5t269 120.5t206.5 -157q21 36 71 95t71.5 59t21.5 -13q0 -2 -1 -5l-304 -1226q-7 -28 -7 -41q0 -26 79 -29.5 t79 -24.5q0 -42 -39 -42l-102 5h-223zM665 915q-222 0 -334 -455q-37 -150 -37 -232q0 -209 139 -209q86 0 176.5 76.5t111.5 161.5l116 462q0 21 -16 64q-49 132 -156 132z" />
+<glyph unicode="&#x1d45f;" horiz-adv-x="994" d="M818 959q66 0 121 -34.5t55 -89t-32 -89.5t-79 -35q-73 0 -73 69q0 89 104 109q-38 26 -98 26q-131 0 -241 -156q-38 -54 -47 -78.5t-64 -248.5q-25 -90 -69 -271q-7 -43 -31 -126q-25 -59 -80 -59t-55 54q0 25 26 127l56 221l63 218q36 133 36 226t-68 93 q-93 0 -161 -257q-14 -53 -33 -53q-25 0 -25 21q0 28 31.5 121t61.5 136q52 76 130 76t129.5 -48t62.5 -124q118 172 280 172z" />
+<glyph unicode="&#x1d460;" horiz-adv-x="942" d="M942 773q0 -45 -24 -80t-68 -35q-62 0 -62 59q0 38 31.5 61.5t70.5 23.5q-32 113 -201.5 113t-229.5 -128q-20 -43 -20 -72q0 -68 76 -105q30 -15 147 -46.5t155 -67.5q71 -68 71 -163q0 -65 -36 -138q-108 -219 -394 -219q-117 0 -201 46q-105 56 -105 163q0 55 29 95 t82 40q75 0 75 -69q0 -52 -40 -81q-33 -26 -76 -26q-7 0 -15 1q45 -126 253.5 -126t286.5 151q26 51 26 93q0 87 -79 128q-32 15 -155 44q-213 49 -213 209q0 55 29 118q91 197 334 197q98 0 175.5 -47t77.5 -139z" />
+<glyph unicode="&#x1d461;" horiz-adv-x="709" d="M773 899q0 -40 -63 -40h-200l-165 -669q-7 -28 -7 -68q0 -103 68 -103q152 0 272 262q6 13 21 38q8 9 17 9q24 0 24 -19q0 -12 -31 -73q-133 -260 -309 -260q-85 0 -139 55.5t-54 140.5q0 34 23 126l141 561h-214q-38 0 -38 22q0 42 63 42h206l89 361q18 75 80 75t62 -54 q0 -14 -9 -49l-85 -333h213q35 0 35 -24z" />
+<glyph unicode="&#x1d462;" horiz-adv-x="1190" d="M1164 285q13 44 32 44t19 -25t-28.5 -114.5t-59.5 -136.5q-52 -77 -133 -77q-148 0 -186 148q-122 -148 -251.5 -148t-197 67.5t-67.5 191t106 406.5q58 155 58 202q0 72 -58 72q-89 0 -148 -96q-32 -52 -72 -175q-13 -39 -30 -39q-25 0 -25 20.5t27 89.5q96 244 254 244 q75 0 124 -50t49 -124q0 -45 -37 -143q-118 -313 -118 -444q0 -179 135 -179q121 0 218 132q11 15 29 47q1 2 15 60l140 570q27 110 91 110q59 0 59 -56q0 -8 -22 -96l-82 -324l-47 -169q-26 -99 -26 -173q0 -101 66 -101q89 0 166 266z" />
+<glyph unicode="&#x1d463;" horiz-adv-x="1061" d="M1061 813q0 -83 -34 -225q-146 -612 -452 -612q-281 0 -281 265q0 126 104 400q58 153 58 202q0 72 -58 72q-89 0 -148 -96q-29 -47 -72 -175q-13 -39 -30 -39q-25 0 -25 20t27 89q97 245 254 245q75 0 124 -50t49 -124q0 -42 -43 -155q-109 -287 -109 -418 q0 -193 158 -193q228 0 360 439q33 110 33 172t-51 146t-51 87q0 37 31 66.5t68 29.5q88 0 88 -146z" />
+<glyph unicode="&#x1d464;" horiz-adv-x="1536" d="M1536 813q0 -96 -53 -304.5t-118 -327.5q-112 -205 -285 -205q-207 0 -264 155q-87 -155 -222.5 -155t-217.5 68.5t-82 200.5q0 92 44 226l79 217q39 108 39 155q0 72 -58 72q-82 0 -137 -80q-32 -46 -64.5 -138t-48.5 -92q-25 0 -25 20t25 85q96 249 256 249 q74 0 123.5 -50t49.5 -124q0 -42 -37 -141q-113 -303 -113 -424q0 -201 173 -201q71 0 130 64t67 137q15 139 46 269.5t85 340.5q30 108 92 108q58 0 58 -56q0 -7 -30 -128l-91 -366q-29 -117 -29 -176q0 -193 162 -193q200 0 323 410q40 133 40 202t-52 147.5t-52 84.5 q0 37 32 66.5t69 29.5q86 0 86 -146z" />
+<glyph unicode="&#x1d465;" horiz-adv-x="1112" d="M1112 826q0 -46 -33.5 -80.5t-79.5 -34.5q-71 0 -71 69q0 89 95 107q-48 28 -110 28q-141 0 -208 -227q-119 -406 -119 -523q0 -146 117 -146q100 0 170 80q42 47 83.5 138.5t59.5 91.5q21 0 21 -23.5t-30 -85.5q-117 -244 -310 -244q-176 0 -225 171q-86 -171 -225 -171 q-74 0 -128 29q-68 35 -68 103q0 46 32 81t78 35q73 0 73 -70q0 -86 -95 -106q49 -29 111 -29q146 0 211 250l75 300q39 153 39 202q0 144 -118 144q-156 0 -240 -179q-13 -37 -44 -108q-12 -23 -26 -23q-24 0 -24 21q0 26 30 88q119 245 310 245q171 0 225 -172 q81 172 227 172q74 0 129 -30q68 -36 68 -103z" />
+<glyph unicode="&#x1d466;" horiz-adv-x="1107" d="M1107 882q0 -9 -7 -37l-213 -850q-44 -175 -184.5 -306t-313.5 -131q-90 0 -155 49.5t-65 137.5q0 54 30.5 93.5t82.5 39.5q73 0 73 -67q0 -42 -33 -75t-75 -33q-10 0 -21 3q33 -105 163 -105q261 0 381 473l-3 2q-95 -100 -217.5 -100t-190 66t-67.5 192.5t106 406.5 q58 153 58 202q0 72 -58 72q-89 0 -148 -96q-29 -48 -72 -175q-13 -39 -30 -39q-25 0 -25 20.5t27 89.5q96 244 254 244q75 0 124 -50t49 -124q0 -40 -37 -139q-118 -316 -118 -448q0 -179 133 -179q84 0 156 60t93 143l162 641q19 75 80 75t61 -56z" />
+<glyph unicode="&#x1d467;" horiz-adv-x="940" d="M969 942q0 -31 -99 -151t-318.5 -318t-309.5 -299q26 9 70.5 9t133.5 -35t137 -35q176 0 262 181q14 30 27 30q23 0 23 -24.5t-31 -86.5q-118 -237 -305 -237q-63 0 -138 81.5t-127 81.5t-92 -34t-74.5 -81.5t-43.5 -47.5q-24 0 -24 17q0 29 102.5 154t318 315.5 t300.5 291.5q-16 -2 -49.5 -2t-123 34.5t-137.5 34.5q-120 0 -182 -102q-15 -25 -25 -25q-24 0 -24 21t25 70q89 174 231 174q61 0 135 -82t126.5 -82t119.5 82t69 82q23 0 23 -17z" />
+<glyph unicode="&#x1d468;" horiz-adv-x="1470" d="M252 6l-158 -6q-27 0 -27 47.5t34 52.5q46 3 92 5q56 7 75 43l666 1208q20 36 52 36h80q31 0 36 -36l158 -1252q121 0 139.5 -6t18.5 -30.5t-9.5 -46t-23.5 -21.5l-264 6l-290 -6q-25 0 -25 41t14.5 50t52.5 9.5t101 7.5l-34 271h-441l-145 -261q44 -17 99 -17 q39 0 39 -41q0 -60 -31 -60zM927 480l-71 550l-302 -550h373z" />
+<glyph unicode="&#x1d469;" horiz-adv-x="1312" d="M1340 1284q112 -71 112 -214t-109 -245q-97 -93 -245 -123q120 -15 195.5 -83t75.5 -173t-50 -198q-134 -248 -455 -248h-770q-27 0 -27 42.5t22 53.5q10 4 55 4.5t116 5.5l241 1132q-122 0 -146.5 4.5t-24.5 38.5q0 16 9.5 39t23.5 23h734q150 0 243 -59zM1168 1087 q0 155 -123 155h-271q-13 0 -23 -1l-99 -504h232q128 0 206 108t78 242zM1091 475q0 185 -135 185h-319l-111 -559l20 -1h265q133 0 212 126q68 108 68 249z" />
+<glyph unicode="&#x1d46a;" horiz-adv-x="1326" d="M1381 867l3 63q0 139 -64 235q-74 111 -206 111q-445 0 -582 -563q-42 -171 -42 -296q0 -170 94.5 -260t265.5 -90q131 0 244.5 82t172.5 205q12 41 40 120q6 15 83 15q20 0 20 -25.5t-24.5 -92.5t-41.5 -98q-83 -152 -233 -229.5t-332 -77.5q-254 0 -410.5 138.5 t-156.5 390.5q0 181 73 359q103 248 306 385t473 137q204 0 315 -140q66 63 159 140h38q21 0 21 -23q1 -3 1 -4.5t-1 -1.5l-104 -499q-4 -18 -33.5 -19t-56.5 -1q-22 4 -22 39z" />
+<glyph unicode="&#x1d46b;" horiz-adv-x="1433" d="M1552 859q0 -339 -199 -589q-216 -270 -544 -270h-715q-27 0 -27 45.5t34 54.5q61 0 159 6l241 1132q-128 0 -144 4q-27 7 -27 39q0 16 9.5 39t23.5 23h730q220 0 339.5 -130.5t119.5 -353.5zM1285 940q0 302 -296 302h-197q-14 0 -24 -1l-234 -1140l21 -1h192 q211 0 333 144q94 111 149.5 325t55.5 371z" />
+<glyph unicode="&#x1d46c;" horiz-adv-x="1251" d="M1256 907l7 114q0 135 -69 183q-55 38 -197 38h-167q-31 0 -48 -4l-106 -491h44q90 0 139.5 25.5t71.5 106.5q6 29 15 63.5t28 34.5h62q28 0 28 -35q0 -2 -105 -500q-5 -24 -52.5 -24t-54.5 11t-7 20t7.5 46.5t7.5 70.5q0 62 -79 77q-25 5 -125 5l-116 -546q20 -2 42 -2 h152q186 0 282 68t170 243l43 110q10 23 25 23h62q27 0 27 -35q0 -18 -178 -485q-9 -24 -25 -24h-1046q-27 0 -27 43t24 53q10 4 55 4.5t114 5.5l241 1132q-40 4 -144 4q-27 0 -27 39q0 62 33 62h1017q11 0 19.5 -14.5t7.5 -25.5l-35 -408q-2 -27 -35 -32h-54q-27 0 -27 44z " />
+<glyph unicode="&#x1d46d;" horiz-adv-x="1170" d="M379 6l-285 -6q-27 0 -27 43t24 53q10 4 55 4.5t114 5.5l241 1132q-130 0 -144 4q-27 8 -27 39q0 62 33 62h991q10 0 18.5 -14.5t7.5 -25.5l-34 -408q-2 -26 -35 -31q-3 -1 -53 -1q-25 0 -25 39l6 125q0 131 -68 177q-55 38 -192 38h-147q-34 0 -50 -4l-111 -516h42 q89 0 136 25.5t69 106.5q6 29 15.5 63t28.5 34h60q26 0 26 -34q0 -2 -105 -500q-4 -20 -34 -24h-14q-11 0 -37 1t-26 39l15 107q0 61 -75 77q-26 6 -121 6l-110 -519q24 -2 91.5 -2.5t97.5 -1.5q27 -7 27 -40q0 -16 -10 -38t-24 -22z" />
+<glyph unicode="&#x1d46e;" horiz-adv-x="1449" d="M1286 534l238 6q25 0 25 -39q0 -56 -40 -61l-106 -3q-20 -89 -44.5 -211.5t-43.5 -208.5q-5 -17 -26.5 -17t-77.5 36t-76 62q-115 -132 -363.5 -132t-404 138.5t-155.5 390.5q0 183 74 361.5t205 301.5q231 218 571 218q202 0 315 -140q66 63 159 140h29q21 0 21 -23 q0 -2 -1 -6l-103 -499q-4 -19 -20 -19h-82q-20 0 -20 32l3 69q0 139 -54 232q-67 114 -197 114q-441 0 -579 -562q-41 -166 -41 -294q0 -173 96.5 -263t270.5 -90q86 0 157 44.5t88 123.5l41 202l-202 4q-25 0 -25 39q0 60 32 60z" />
+<glyph unicode="&#x1d46f;" horiz-adv-x="1493" d="M1428 1337l306 6q25 0 25 -43t-20 -53q-10 -5 -68.5 -5t-105.5 -6l-238 -1132q120 0 145.5 -4.5t25.5 -39.5q0 -16 -10 -38t-24 -22l-309 6l-276 -6q-26 0 -26 42t22 53q10 5 54 5.5t118 5.5l114 542h-505l-115 -544q121 0 146 -4.5t25 -39.5q0 -16 -9.5 -38t-24.5 -22 l-299 6l-285 -6q-27 0 -27 42t22 53q10 5 54 5.5t117 5.5l241 1132q-129 0 -144 4q-27 8 -27 39q0 62 48 62l284 -6l286 6q25 0 25 -43t-14.5 -50.5t-73 -7.5t-105.5 -6l-104 -489h506l104 491q-128 0 -143 4q-27 8 -27 39q0 62 33 62z" />
+<glyph unicode="&#x1d470;" horiz-adv-x="724" d="M668 1337l297 6q26 0 26 -43t-21 -53q-10 -5 -73 -5t-110 -6l-237 -1132q137 0 151 -4q27 -7 27 -40q0 -17 -9.5 -38.5t-24.5 -21.5l-306 6l-296 -6q-25 0 -25 42.5t23 53.5q10 4 56 4.5t123 5.5l241 1132q-51 0 -154 4q-26 3 -26 39q0 62 48 62z" />
+<glyph unicode="&#x1d471;" horiz-adv-x="951" d="M955 1337l237 6q25 0 25 -40q0 -59 -51 -64q-48 -1 -95 -1l-206 -968q-65 -304 -458 -304q-114 0 -195 49q-97 58 -97 165q0 72 40.5 131t108.5 59q46 0 75.5 -34.5t29.5 -85.5t-30.5 -101t-81.5 -65q51 -39 132.5 -39t142.5 85q47 66 68 163l200 945q-188 0 -199 4 q-26 9 -26 39q0 62 33 62z" />
+<glyph unicode="&#x1d472;" horiz-adv-x="1458" d="M1548 1337l125 6q25 0 25 -48t-33 -53q-16 0 -49 -1q-71 -4 -137 -46q-8 0 -463 -373l307 -708q9 -7 74 -11.5t65 -42.5q0 -60 -32 -60l-233 6l-292 -6q-25 0 -25 39q0 56 43 62q48 4 96 9l-226 528l-169 -137l-83 -397h17q47 0 127 -4q27 -4 27 -40q0 -16 -9.5 -38 t-24.5 -22l-299 6l-285 -6q-27 0 -27 42.5t22 53.5q10 4 55 4.5t116 5.5l241 1132q-48 0 -144 4q-27 3 -27 39q0 62 48 62l284 -6l286 6q25 0 25 -43.5t-20 -52.5q-10 -5 -69 -5t-104 -6l-128 -603l732 598q-35 11 -86 11q-27 0 -27 39q0 62 33 62z" />
+<glyph unicode="&#x1d473;" horiz-adv-x="1151" d="M662 1337l331 6q25 0 25 -50t-32 -51h-18q-68 0 -188 -6l-240 -1134q20 -2 141 -2q175 0 277 134q53 69 141 287q7 19 31 24q27 0 53 -1q27 -4 27 -32.5t-152 -487.5q-8 -24 -25 -24h-939q-27 0 -27 42t22 53q10 5 54 5.5t117 5.5l241 1132q-129 0 -144 4q-27 7 -27 39 q0 62 48 62z" />
+<glyph unicode="&#x1d474;" horiz-adv-x="1743" d="M287 6l-193 -6q-27 0 -27 47t34 53l91 4q69 5 73 25l236 1109q-40 4 -145 4q-26 0 -26 39q0 62 33 62h374q34 0 40 -36l177 -1046l617 1046q22 36 55 36h358q25 0 25 -42.5t-15 -50.5t-73.5 -8t-103.5 -6l-240 -1132q35 -4 145 -4q27 0 27 -40q0 -16 -10 -38t-24 -22 l-262 6l-253 -6q-26 0 -26 42t22 53q10 5 54 5.5t118 5.5l239 1136l-714 -1207q-21 -35 -58 -35t-43 35l-200 1182l-234 -1099q32 -13 82.5 -15t60.5 -3q27 -4 27 -40q0 -16 -10 -38t-24 -22z" />
+<glyph unicode="&#x1d475;" horiz-adv-x="1472" d="M1518 1337l195 6q25 0 25 -47.5t-31 -53.5q-46 -2 -104 -6t-62 -23l-252 -1189q-5 -24 -25 -24h-83q-14 0 -22 15l-577 1152l-224 -1049q30 -12 82 -14.5t61 -3.5q27 -4 27 -40q0 -16 -10 -38t-24 -22l-207 6l-193 -6q-27 0 -27 47t34 53l91 4q69 5 73 25l236 1111 q-130 0 -144 2q-27 4 -27 39q0 62 33 62h392q44 0 52 -16l466 -926l174 824q-29 12 -67.5 14t-73.5 3q-26 3 -26 39q0 62 42 62z" />
+<glyph unicode="&#x1d476;" horiz-adv-x="1390" d="M1512 865q0 -358 -219 -620q-233 -279 -581 -279q-236 0 -369 134t-133 370q0 358 224 632t575 274q236 0 369.5 -137t133.5 -374zM1178 582q60 217 60 371t-54 238q-64 99 -193 99q-309 0 -443 -511q-57 -216 -57 -371.5t50 -242.5q63 -108 191 -108q302 0 446 525z" />
+<glyph unicode="&#x1d477;" horiz-adv-x="1258" d="M379 6l-285 -6q-27 0 -27 47.5t34 52.5l61 1q33 0 98 5l241 1132q-20 2 -95.5 2t-75.5 41q0 17 10 39.5t23 22.5h703q162 0 262 -69q115 -80 115 -235q0 -105 -51 -199q-139 -257 -487 -257h-262l-102 -479q124 0 144 -4q27 -5 27 -40q0 -17 -9.5 -38.5t-24.5 -21.5z M1161 1105q0 137 -188 137h-181q-14 0 -24 -1l-112 -571h185q141 0 201 56.5t89.5 182.5t29.5 196z" />
+<glyph unicode="&#x1d478;" horiz-adv-x="1401" d="M1512 862q0 -273 -137.5 -506t-379.5 -345q45 -106 109 -106q76 0 114 42q15 17 38 68.5t51 51.5q51 0 51 -50q0 -116 -102 -256t-218 -140t-148 130q-13 54 -13 223q-81 -15 -165 -15q-236 0 -369 134.5t-133 371.5q0 359 216 626q231 285 583 285q237 0 370 -138 t133 -376zM1243 976q0 135 -61.5 224.5t-190.5 89.5q-166 0 -297 -154q-90 -106 -153 -349t-63 -417.5t102 -273.5q0 85 56 148t140 63q112 0 178 -178q133 107 211 370.5t78 476.5zM775 229q-49 0 -88.5 -34.5t-39.5 -82.5q0 -59 75.5 -59t152.5 31q0 145 -100 145z" />
+<glyph unicode="&#x1d479;" horiz-adv-x="1537" d="M374 6l-280 -6q-27 0 -27 41t16 50t58.5 9.5t118.5 5.5l241 1132q-20 2 -95.5 2t-75.5 41q0 16 9.5 39t23.5 23h634q178 0 292 -61q147 -78 147 -240q0 -138 -99.5 -236t-243.5 -142q135 -67 135 -212q0 -48 -16 -143.5t-16 -143.5q0 -120 79 -120q83 0 125 119 q4 14 14 39.5t25 25.5h50q27 0 27 -35q0 -3 -2 -12q-22 -96 -93.5 -156t-168.5 -60q-349 0 -349 221q0 49 25 144.5t25 154t-39.5 103t-106.5 44.5h-164l-111 -529q122 0 145.5 -4.5t23.5 -39.5q0 -16 -9.5 -38t-23.5 -22zM1151 1099q0 143 -211 143h-153q-10 0 -19 -1 l-104 -531h156q139 0 207.5 51t101.5 182q22 86 22 156z" />
+<glyph unicode="&#x1d47a;" horiz-adv-x="1000" d="M1027 934l4 69q0 280 -260 280q-108 0 -185 -75.5t-77 -190.5t111 -146l234 -63q100 -27 153.5 -118t53.5 -201q0 -204 -141.5 -363.5t-342.5 -159.5q-229 0 -339 113l-106 -109l-11 -4h-38q-22 0 -22 24q0 6 93 441q3 15 80 15q23 0 22 -29q0 1 -1 0q0 -4 -2 -12l-4 -23 q-5 -29 -5 -63q0 -131 99 -197q84 -55 223 -55q114 0 190.5 88.5t76.5 204.5q0 135 -111 167l-215 56q-122 41 -175 124.5t-53 184.5t42 198q125 286 436 286q192 0 284 -112q51 54 119 112h39q20 -7 20 -23q0 -1 -92 -439q-3 -17 -33 -19h-44q-23 5 -23 39z" />
+<glyph unicode="&#x1d47b;" horiz-adv-x="1338" d="M711 6l-360 -6q-26 0 -26 46t32 54q105 3 236 8l239 1132q-20 2 -103 2q-131 0 -198 -60.5t-110 -193.5q-9 -34 -31 -101q-9 -24 -25 -24h-51q-27 0 -27 35q0 20 124 421q7 24 25 24h1103q9 0 18 -15t7 -25l-50 -408q-4 -26 -30 -31q-3 -1 -47 -1q-27 0 -27 39 q0 4 7.5 66t7.5 105q0 118 -74 151q-42 18 -131.5 18t-106.5 -4l-240 -1132q91 0 217 -6q26 -5 26 -40q0 -60 -31 -60z" />
+<glyph unicode="&#x1d47c;" horiz-adv-x="1488" d="M1534 1337l196 6q25 0 25 -47t-32 -54q-46 -2 -103.5 -5.5t-62.5 -23.5l-165 -776q-44 -205 -200.5 -338t-359 -133t-326.5 91q-141 102 -141 292q0 61 9 103l168 786q-126 0 -148 5t-22 38q0 62 33 62l276 -6l309 6q25 0 25 -44t-23 -53q-9 -4 -68 -4t-103 -6l-167 -792 q-23 -108 -23 -170q0 -207 223 -207q177 0 293 107.5t154 285.5l162 765q-20 8 -140 17q-27 2 -27 39q0 62 33 62z" />
+<glyph unicode="&#x1d47d;" horiz-adv-x="1519" d="M1608 1337l151 6q26 0 26 -40q0 -61 -48 -61q-121 0 -149 -47l-692 -1193q-21 -36 -52 -36h-81q-32 0 -38 36l-192 1236q-91 0 -122 4q-26 4 -26 39q0 62 44 62l244 -6l290 6q26 0 26 -41t-14 -50.5t-66.5 -9.5t-84.5 -7l146 -932l533 924q-39 15 -109 15q-27 0 -27 39 q0 62 33 62z" />
+<glyph unicode="&#x1d47e;" horiz-adv-x="2096" d="M2201 1337l136 6q26 0 26 -40q0 -61 -50 -61q-107 0 -132 -47l-635 -1193q-16 -30 -53 -35q-6 -1 -68 -1q-30 0 -34 36l-100 900l-478 -900q-16 -30 -53 -35q-5 -1 -68 -1q-30 0 -33 36l-136 1236q-79 0 -111 4q-27 4 -27 39q0 17 10 39.5t24 22.5l245 -6l288 6 q27 0 27 -42t-15.5 -50.5t-69.5 -8.5t-87 -7l99 -889l370 698l-21 194h-20q-62 0 -90 4t-28 39q0 62 33 62l246 -6l288 6q27 0 27 -42t-19 -52q-11 -7 -65 -7t-86 -7l97 -889l466 879q-46 17 -130 17q-26 0 -26 39q0 62 43 62z" />
+<glyph unicode="&#x1d47f;" horiz-adv-x="1436" d="M1411 1337l184 6q25 0 25 -40.5t-13.5 -50.5t-44.5 -10q-151 0 -195 -51l-357 -416l267 -669q50 -1 136 -6q26 -4 26 -40q0 -60 -33 -60l-263 6l-295 -6q-25 0 -25 40.5t12.5 49.5t57.5 12t72 8l-179 448l-374 -440q31 -12 69.5 -14.5t43.5 -3.5q27 -4 27 -40 q0 -16 -10 -38t-24 -22l-242 6l-184 -6q-25 0 -25 47.5t31 52.5q153 0 211 44q5 1 12 7l427 503l-233 582q-42 5 -74 5t-62 1q-27 3 -27 39q0 17 10 39.5t24 22.5l263 -6l295 6q27 0 27 -41t-13.5 -50t-53.5 -11t-76 -8l145 -364l302 356q-44 17 -112 17q-27 0 -27 39 q0 62 33 62z" />
+<glyph unicode="&#x1d480;" horiz-adv-x="1540" d="M1627 1337l152 6q27 0 27 -40q0 -61 -51 -61q-127 0 -168 -51l-517 -655l-91 -432q33 -4 143 -4q27 0 27 -40q0 -60 -33 -60l-294 6l-281 -6q-26 0 -26 42.5t22 52.5q10 5 54.5 5.5t118.5 5.5l91 430l-256 700q-42 5 -73 5t-60 1q-27 3 -27 39q0 62 45 62l254 -6l300 6 q26 0 26 -40.5t-13.5 -50.5t-57 -10t-76.5 -6l204 -559l437 554q-4 2 -79 10q-41 5 -41 40q0 62 33 62z" />
+<glyph unicode="&#x1d481;" horiz-adv-x="1087" d="M1313 1343q23 0 23 -32t-17 -54l-908 -1149h192q173 0 272.5 67.5t160.5 228.5q13 46 44 136q9 24 75 24q27 0 27 -35q0 -12 -62.5 -242.5t-71.5 -258.5t-26 -28h-926q-23 0 -23 34.5t18 57.5l909 1150h-180q-293 0 -397 -239q-12 -39 -39 -116q-9 -24 -76 -24 q-25 0 -25 35q0 11 49.5 203t57 217t25.5 25h898z" />
+<glyph unicode="&#x1d482;" horiz-adv-x="1182" d="M1207 308q0 -4 -2 -12q-78 -320 -251 -320q-167 0 -231 112q-112 -112 -257.5 -112t-229.5 97t-84 255q0 241 137 427q151 204 383 204q112 0 185 -86q39 49 112 49q39 0 72 -28.5t33 -67.5q0 -10 -4 -29l-119 -569q-11 -53 -11 -95q0 -72 38 -72q86 0 118 208 q2 21 10 52q10 19 55.5 19t45.5 -32zM817 767q-37 106 -139 106t-171 -152q-36 -80 -72 -250t-36 -268q0 -142 100 -142q111 0 203 131q0 16 4 35z" />
+<glyph unicode="&#x1d483;" horiz-adv-x="995" d="M1073 606q0 -238 -151.5 -434t-382.5 -196q-152 0 -240.5 97t-89.5 248q15 42 15 92t2 59l182 861q0 4 1 12q-6 0 -20 -0.5t-22 -0.5q-84 0 -84 48q0 19 10 43t26 25l319 16h4q33 0 33 -36q0 -18 -35 -178l-81 -367q90 64 193 64q155 0 238 -98t83 -255zM826 730 q0 143 -99 143q-110 0 -200 -125l-60 -298q-33 -164 -33 -231q0 -158 108 -158t176 151q34 78 71 251t37 267z" />
+<glyph unicode="&#x1d484;" horiz-adv-x="1004" d="M1014.5 221q16.5 -21 16.5 -35.5t-5 -22.5q-124 -187 -479 -187q-176 0 -285.5 97.5t-109.5 271.5q0 250 171 432t419 182q103 0 178 -46q90 -55 90 -151q0 -64 -42 -117.5t-105 -53.5q-91 0 -91 107.5t89 140.5q-47 34 -115 34q-222 0 -311 -391q-33 -145 -33 -230 q0 -191 170 -191q216 0 339 118l69 66q18 -3 34.5 -24z" />
+<glyph unicode="&#x1d485;" horiz-adv-x="1136" d="M1207 308q0 -4 -2 -12q-79 -320 -251 -320q-167 0 -231 112q-112 -112 -257.5 -112t-229.5 97t-84 255q0 241 137 427q151 204 383 204q99 0 172 -73l97 459h-44q-81 0 -81 47q0 18 10.5 42.5t26.5 25.5l317 16h4q32 0 32 -36q0 -2 -1 -6l-256 -1217q-9 -43 -9 -84 q0 -72 38 -72q85 0 117 202q2 24 11 58q11 19 56 19t45 -32zM817 767q-37 106 -139 106t-171 -152q-36 -80 -72 -250t-36 -268q0 -142 100 -142q111 0 203 132q1 17 4 34z" />
+<glyph unicode="&#x1d486;" horiz-adv-x="998" d="M1009 221.5q18 -23.5 18 -36t-7 -22.5q-132 -187 -478 -187q-177 0 -283.5 103.5t-106.5 280.5q0 253 166.5 426t418.5 173q104 0 184.5 -54.5t80.5 -153.5q0 -190 -208 -258q-121 -39 -366 -40q-27 -118 -27 -198.5t41.5 -137t124.5 -56.5q217 0 329 109q77 75 80 75 q15 0 33 -23.5zM850 754q0 51 -33.5 85t-84.5 34q-209 0 -282 -334q400 0 400 215z" />
+<glyph unicode="&#x1d487;" horiz-adv-x="735" d="M980 1320q0 -62 -37 -113.5t-86.5 -51.5t-75 30t-25.5 71q0 94 74 142q-32 10 -63 10t-57 -44l-66 -422h239q28 0 28 -54.5t-33 -54.5h-249l-76 -503q-46 -306 -65 -376q-57 -219 -179 -325q-80 -70 -163 -70t-150 46t-67 118t37 123.5t87.5 51.5t76.5 -29.5t26 -70.5 q0 -97 -74 -142q26 -11 53 -11q55 0 87 130q8 30 30 177l132 881h-203q-29 0 -29 42q0 19 10 43t26 24h214q37 247 84 354q89 197 270 197q88 0 156 -45t68 -128z" />
+<glyph unicode="&#x1d488;" horiz-adv-x="1016" d="M1001 894q24 -28 24 -55.5t-3 -41.5l-202 -954q-30 -142 -179 -219q-126 -65 -286 -65q-328 0 -328 153q0 62 37.5 113.5t88 51.5t75.5 -30t25 -71q0 -75 -50 -122q50 -9 138 -9t151.5 63.5t90.5 165.5l37 181q-91 -63 -189 -63q-155 0 -240.5 96t-85.5 253 q0 238 143.5 428t374.5 190q115 0 185 -86q41 49 130 49q39 0 63 -28zM768 770q-35 103 -138 103t-171 -147q-35 -78 -71 -247t-36 -261q0 -140 102 -140q107 0 200 125z" />
+<glyph unicode="&#x1d489;" horiz-adv-x="1327" d="M1352 308q0 -2 -2 -9q-29 -127 -110.5 -225t-198.5 -98q-88 0 -159 53.5t-71 138.5q0 29 27 114l68 211q44 149 44 264.5t-83 115.5q-146 0 -264 -181q-32 -49 -50 -135l-100 -470q-9 -44 -50.5 -77.5t-88.5 -33.5t-76 32t-29 81q0 9 1 14l263 1242h-40q-85 0 -85 47 q0 19 10 43t26 25l318 16h4q32 0 30 -36q-1 -23 -17 -97l-108 -510q120 126 257 126t220 -56q97 -65 97 -184.5t-121 -499.5q-23 -72 -23 -115t23 -43q119 0 169 194q5 27 18 66q12 19 56.5 19t44.5 -32z" />
+<glyph unicode="&#x1d48a;" horiz-adv-x="750" d="M534 1427.5q39 48.5 86.5 48.5t72 -31.5t24.5 -80.5t-38.5 -97.5t-86.5 -48.5t-72.5 31t-24.5 80.5t39 98zM775 308q0 -2 -2 -9q-34 -127 -106 -215q-88 -108 -203 -108q-88 0 -158.5 53.5t-70.5 138.5q0 33 14 75l159 474q23 69 23 112.5t-25 43.5q-60 0 -108 -65 q-39 -51 -50.5 -99.5t-26.5 -93.5q-11 -21 -56 -21t-45 31q0 109 102 221.5t200 112.5t168 -53.5t70 -139.5q0 -33 -13 -72l-160 -475q-24 -71 -24 -114.5t27 -43.5q110 0 164 186q6 29 21 74q11 19 55.5 19t44.5 -32z" />
+<glyph unicode="&#x1d48b;" horiz-adv-x="658" d="M707 1444.5q25 -31.5 25 -81t-38 -97.5t-86.5 -48t-73.5 31t-25 80t38.5 98t86.5 49t73 -31.5zM667 751q0 -26 -5 -49l-177 -830q-29 -137 -156 -225t-272 -88q-76 0 -139 42.5t-63 109t38.5 116.5t88.5 50t75 -30t25 -71q0 -83 -58 -128q17 -3 20 -3q75 0 136 91 q47 71 66 160l172 812q12 57 12 92q0 73 -39 73q-81 0 -142 -72q-39 -45 -74.5 -125t-44.5 -80h-59q-23 0 -23 29q0 7 2 13q43 129 141.5 225t222.5 96q99 0 176 -56.5t77 -151.5z" />
+<glyph unicode="&#x1d48c;" horiz-adv-x="1207" d="M959 302l-17 -163q0 -78 40 -78q99 0 139 200q4 24 14 60q11 19 55.5 19t44.5 -32q0 -2 -2 -9q-32 -120 -93 -207q-81 -116 -181.5 -116t-177 60.5t-76.5 159.5l9 96q0 122 -183 156l-79 -362q-10 -44 -51 -77t-87.5 -33t-75.5 32t-29 81q0 9 1 14l261 1230q0 4 1 12 q-38 1 -77 3q-47 7 -47 44q0 19 10 43t26 25l318 16h4q32 0 32 -36q0 -2 -1 -6l-180 -852q52 35 158.5 147t162.5 155q98 75 174.5 75t124.5 -56t48 -127t-30 -124q-37 -66 -105 -66q-41 0 -72 30.5t-31 80.5t35.5 98.5t92.5 50.5q-13 27 -41 27q-89 0 -244 -134 q-17 -14 -214 -206q122 0 222 -54q121 -65 121 -177z" />
+<glyph unicode="&#x1d48d;" horiz-adv-x="686" d="M714 1440q0 -2 -1 -6l-256 -1217q-9 -43 -9 -84q0 -72 37 -72q85 0 119 207q2 20 10 53q8 19 39 19q52 0 52 -32q0 -3 -2 -12q-73 -320 -241 -320q-99 0 -176 55.5t-77 150.5q0 23 6 51l232 1100q0 4 1 12q-9 1 -41 1q-83 0 -83 46q0 66 35 68l319 16h4q32 0 32 -36z" />
+<glyph unicode="&#x1d48e;" horiz-adv-x="1885" d="M1910 308q0 -2 -2 -9q-36 -132 -108 -218q-89 -105 -210 -105q-88 0 -159 53.5t-71 138.5q0 31 13 75l81 257q44 150 44 261.5t-66 111.5q-75 0 -133 -55q-31 -30 -75 -96t-50.5 -82t-10.5 -34l-111 -520q-9 -44 -51 -77t-86.5 -33t-75 29.5t-30.5 73.5q0 13 2 22 l109 512q18 85 18 138q0 122 -83 122q-77 0 -143 -64t-117 -178l-29 -141q-25 -136 -86 -404q-13 -46 -52.5 -78t-85.5 -32t-76.5 29.5t-30.5 73.5q0 8 3 22l127 607q12 57 12 92q0 73 -39 73q-56 0 -78 -112q-28 -145 -28 -146q-13 -21 -41 -21q-71 0 -71 31q0 94 76.5 214 t163 120t159 -41t89.5 -118q65 79 119.5 119t132.5 40q270 0 309 -177q135 177 285 177q280 0 280 -248q0 -117 -121 -492q-24 -74 -24 -116t24 -42q115 0 165 187q6 30 20 73q12 19 62 19t50 -32z" />
+<glyph unicode="&#x1d48f;" horiz-adv-x="1326" d="M1351 308q0 -5 -1 -9q-32 -123 -102 -212q-87 -111 -197 -111q-89 0 -159 53t-70 139q0 34 12 75l80 250q44 148 44 264t-83 116q-129 0 -245 -181q-22 -34 -35 -61q-1 -3 -32 -149l-55 -263q-8 -45 -28 -133q-13 -47 -52.5 -78.5t-85.5 -31.5t-76.5 29.5t-30.5 73.5 q0 8 3 22l127 607q12 57 12 92q0 73 -39 73q-62 0 -92 -111l-36 -147q-12 -21 -36 -21q-54 0 -54 31q0 94 76.5 214t163 120t159 -41t89.5 -118q131 159 269 159t221 -56q98 -65 98 -192q0 -99 -43 -249l-79 -243q-23 -72 -23 -115t23 -43q115 0 166 187q5 30 19 73 q12 19 42 19q50 0 50 -32z" />
+<glyph unicode="&#x1d490;" horiz-adv-x="1062" d="M1139 584q0 -252 -169.5 -430t-420.5 -178q-180 0 -288.5 98t-108.5 276q0 253 170.5 431t422.5 178q179 0 286.5 -98.5t107.5 -276.5zM890 693q0 180 -152 180q-136 0 -216 -138q-51 -87 -85.5 -247.5t-34.5 -245.5q0 -181 153 -181q136 0 215 137q50 87 85 249.5 t35 245.5z" />
+<glyph unicode="&#x1d491;" horiz-adv-x="1038" d="M203 -417l-190 -5q-27 0 -27 47t36 59q9 3 79 6l217 1027q10 47 10 83q0 73 -39 73q-51 0 -79 -72q-12 -29 -31 -117t-38 -88h-47q-23 0 -23 29q0 94 76.5 214t164.5 120q170 0 232 -113q113 113 258.5 113t229 -98t83.5 -255q0 -240 -136 -425q-149 -205 -380 -205 q-104 0 -176 72l-76 -360l49 2q77 0 77 -47q0 -65 -36 -65zM869 730q0 143 -100 143q-114 0 -204 -131q-1 -8 -6 -35l-108 -540q36 -106 138 -106t170 152q37 81 73.5 252t36.5 265z" />
+<glyph unicode="&#x1d492;" horiz-adv-x="1098" d="M692 -417l-221 -5q-29 0 -29 47.5t45 60.5q15 4 87 4h18l74 349q-91 -63 -190 -63q-156 0 -240 97t-84 255q0 241 137 427q151 204 383 204q115 0 185 -86q23 22 92 54t90 32t40 -12t19 -25q0 -1 -1 -5l-261 -1229l50 2q78 0 78 -47q0 -65 -36 -65zM817 767 q-37 106 -139 106t-170 -152q-37 -81 -73 -251t-36 -267q0 -142 100 -142q112 0 201 124z" />
+<glyph unicode="&#x1d493;" horiz-adv-x="998" d="M968.5 901.5q55.5 -57.5 55.5 -130.5t-39 -129t-102 -56q-41 0 -70 30.5t-29 71.5q0 125 109 156q-21 29 -76.5 29t-125.5 -54.5t-83 -116.5l-128 -616q-9 -44 -52 -77t-87.5 -33t-75 29.5t-30.5 73.5q0 8 3 22l127 607q12 57 12 92q0 73 -39 73q-84 0 -116 -203 q-2 -20 -12 -55q-10 -21 -36 -21q-54 0 -54 31q0 94 76.5 214t164.5 120q172 0 235 -122q103 122 237 122q80 0 135.5 -57.5z" />
+<glyph unicode="&#x1d494;" horiz-adv-x="831" d="M870 771q0 -58 -29.5 -104t-84.5 -46q-80 0 -80 89t70 123q-48 40 -133.5 40t-143.5 -40t-58 -118q0 -61 77 -89l127 -30q220 -54 220 -253q0 -83 -39 -163q-100 -204 -392 -204q-127 0 -213 41q-114 54 -114 167q0 66 36 121t99 55q41 0 66 -30.5t25 -72.5 q0 -115 -93 -149q63 -47 174.5 -47t182.5 43q87 51 87 151q0 75 -88 108l-151 36q-86 22 -136 82t-50 146q0 158 103 245t263 87q107 0 182 -40q93 -50 93 -148z" />
+<glyph unicode="&#x1d495;" horiz-adv-x="922" d="M947 308q0 -4 -2 -10q-42 -124 -139.5 -223t-205.5 -99t-185 55.5t-77 150.5q0 23 6 51l123 581h-177q-29 0 -29 42q0 19 10.5 43t26.5 24h192l68 333q9 44 52.5 77.5t86 33.5t75.5 -29t33 -67q0 -6 -5 -30l-67 -318h176q28 0 28 -43q0 -18 -10.5 -42t-25.5 -24h-190 l-125 -586q-11 -52 -11 -95q0 -73 39 -73q136 0 215 192q7 26 26 69q14 19 53 19t39 -32z" />
+<glyph unicode="&#x1d496;" horiz-adv-x="1286" d="M1068 -24q-169 0 -231 114q-100 -114 -239.5 -114t-227 68.5t-87.5 208.5q0 103 39 236l75 228q23 72 23 114t-23 42q-118 0 -168 -192q-5 -22 -19 -66q-8 -19 -20 -19h-47q-23 0 -23 29q0 103 99.5 218.5t194.5 115.5t165.5 -53.5t70.5 -139.5q0 -27 -26 -109l-65 -201 q-40 -139 -40 -246q0 -149 105 -149t192 137q0 13 5 35l126 598q9 44 51.5 77.5t86.5 33.5t75.5 -31.5t31.5 -73.5q0 -8 -3 -22l-124 -587q-12 -57 -12 -95q0 -72 38 -72q81 0 115 194q3 26 15 66q11 19 50.5 19t39.5 -32q-83 -332 -243 -332z" />
+<glyph unicode="&#x1d497;" horiz-adv-x="1080" d="M1079 766q0 -218 -121 -479q-144 -311 -330 -311q-343 0 -343 285q0 101 39 232l73 224q23 73 23 114.5t-23 41.5q-119 0 -168 -191q-4 -24 -19 -67q-11 -21 -36 -21q-54 0 -54 31q0 103 99.5 218.5t194.5 115.5t165.5 -53.5t70.5 -139.5q0 -26 -26 -107l-63 -197 q-40 -136 -40 -239q0 -162 131 -162q156 0 266 339q38 117 38 167.5t-72 112t-72 117.5t41 110t103 54t96 -69q27 -53 27 -126z" />
+<glyph unicode="&#x1d498;" horiz-adv-x="1578" d="M1551 891q27 -54 27 -144t-47 -275q-81 -317 -208 -426q-82 -70 -166 -70q-229 0 -303 116q-80 -116 -207 -116q-362 0 -362 292q0 99 37 219l75 230q23 72 23 114t-23 42q-117 0 -167 -187q-5 -24 -20 -71q-8 -19 -20 -19h-47q-23 0 -23 29q0 103 99.5 218.5 t194.5 115.5t165.5 -53.5t70.5 -139.5q0 -27 -26 -106l-63 -195q-39 -133 -39 -236q0 -168 147 -168q88 0 147 130q-6 44 -6 86.5t13 103.5l96 450q10 45 51.5 78t85.5 33t75 -31.5t31 -73.5q0 -13 -2 -22l-94 -439q-19 -89 -19 -153q0 -162 132 -162q139 0 236 321 q39 130 39 183t-71.5 114.5t-71.5 117.5t40.5 110t102.5 54t97 -70z" />
+<glyph unicode="&#x1d499;" horiz-adv-x="1077" d="M1041.5 903q60.5 -56 60.5 -132t-36.5 -130.5t-98.5 -54.5q-42 0 -67 29.5t-25 76t28 91t74 58.5q-34 32 -89 32t-97 -65q-32 -49 -46 -114l-84 -395q-19 -89 -19 -140q0 -98 99 -98q70 0 137 56.5t91 126.5q7 30 25 77q12 19 51.5 19t39.5 -32q0 -2 -2 -9 q-41 -136 -129.5 -229.5t-217.5 -93.5q-187 0 -255 123q-32 -51 -90.5 -87t-115.5 -36q-91 0 -158.5 55t-67.5 143q0 65 37 119.5t99 54.5q40 0 65.5 -30.5t25.5 -75.5t-28 -90.5t-74 -59.5q31 -31 87.5 -31t93.5 58.5t51 123.5l81 386q21 100 21 146q0 98 -99 98 q-71 0 -136 -55t-91 -126q-7 -26 -25 -77q-8 -19 -21 -19h-48q-23 0 -23 29q0 118 124.5 226t244.5 108q201 0 271 -124q78 124 188 124q88 0 148.5 -56z" />
+<glyph unicode="&#x1d49a;" horiz-adv-x="1192" d="M1192 837q0 -9 -60 -298l-120 -559q-41 -175 -193 -298t-329 -123q-103 0 -184 42q-101 52 -101 145q0 64 37 115.5t98 51.5q41 0 71.5 -30t30.5 -71q0 -98 -80 -143q48 -24 116 -24q119 0 206 141q63 102 96 249q-74 -59 -178 -59q-143 0 -231 69t-88 208q0 103 39 236 l75 228q23 73 23 114.5t-23 41.5q-56 0 -103.5 -61.5t-63.5 -125.5q-3 -17 -12 -51q-13 -41 -44 -41q-54 0 -54 31q0 103 99.5 218.5t194.5 115.5t165.5 -53.5t70.5 -139.5q0 -26 -26 -108l-64 -202q-41 -140 -41 -246q0 -149 106 -149q101 0 187 130l135 640 q9 44 51.5 77.5t86.5 33.5t75.5 -31.5t31.5 -73.5z" />
+<glyph unicode="&#x1d49b;" horiz-adv-x="993" d="M1022 929q0 -7 -19 -34q-163 -230 -427 -475l-236 -220q113 9 340 21q135 5 180 64l18 37q14 26 27 26h57q27 0 27 -31q0 -6 -2 -13q-98 -328 -350 -328q-65 0 -149.5 70t-139.5 70t-114 -48l-94 -92h-19q-62 0 -62 28q0 14 3 19q88 155 310 373q7 6 364 336 q-100 -8 -219.5 -14t-140.5 -9t-42 -20t-29 -18q15 2 -46 2q-27 0 -27 29q0 9 9 37q71 220 255 220q64 0 149 -70t133 -70t99 70t67 70q78 0 78 -30z" />
+<glyph unicode="&#x1d49c;" horiz-adv-x="1762" d="M230 -17q-119 0 -205.5 70.5t-86.5 186.5q0 78 51.5 132.5t129.5 54.5q47 0 84 -31.5t37 -77.5q0 -64 -56 -91l-104 -33q-56 -20 -56 -64q0 -57 78 -91q61 -27 127 -27q257 0 532 311q-107 153 -107 289q0 95 50.5 156.5t142.5 61.5q142 0 241 -134q268 303 435 444 q269 227 538 299q-96 -128 -151 -219q-97 -159 -260.5 -538t-294.5 -605q257 25 414 257l26 -17q-180 -253 -460 -273l-25 -44q-105 -3 -269 -11q38 64 52 101q-192 63 -310 208q-287 -315 -553 -315zM1179 381q0 -69 -14 -156l241 385l160 266q134 205 394 502 q-239 -102 -466 -306q-132 -118 -387 -403q72 -115 72 -288zM1065 672q-56 61 -137 61t-139.5 -72t-58.5 -149.5t54 -162.5zM1102 119q45 144 45 284.5t-62 240.5l-282 -321q112 -134 299 -204z" />
+<glyph unicode="&#x1d49d;" horiz-adv-x="1734" d="M1828 1119q0 -127 -133 -234q-73 -58 -245 -143q251 -100 251 -297q0 -169 -165.5 -314t-336.5 -145q-66 0 -110 37t-44 101q0 179 214 295l16 -27q-80 -43 -139 -116t-59 -154q0 -40 25.5 -70.5t64.5 -30.5q81 0 189 165q129 198 129 380q0 109 -79 159 q-82 -31 -129.5 -31t-47.5 31q0 46 80 46q42 0 95 -15q99 36 165.5 172.5t66.5 253.5t-72 164q-161 -88 -240 -238q-42 -80 -111 -323l-42 -148q-83 -294 -276 -466q-209 -187 -501 -187q-146 0 -243 60q-116 73 -116 211q0 81 49 135.5t128 54.5q49 0 88.5 -31.5 t39.5 -86.5t-57 -86l-108 -39q-55 -19 -55 -56q0 -62 96 -101q75 -30 149 -30q157 0 273 132q74 82 163 270l129 271q150 314 323 478q116 110 279 196q-117 42 -276 42q-245 0 -488 -87.5t-383 -254.5q-104 -124 -104 -243q0 -65 40.5 -110.5t110 -45.5t169.5 65 q126 82 204.5 216.5t89.5 285.5l27 8q14 -93 14 -151q0 -184 -94 -306q-127 -165 -341 -165q-104 0 -178 51.5t-74 151.5q0 128 111 260q150 178 395.5 267t505.5 89q167 0 327 -45q55 25 147 49l8 -29q-67 -19 -114 -37q199 -88 199 -254z" />
+<glyph unicode="&#x1d49e;" horiz-adv-x="1533" d="M1801 1270q0 -178 -241 -347q-192 -134 -411 -194q-70 -19 -215 -43q-81 -160 -109 -235q-52 -136 -52 -252q0 -186 200 -186q128 0 245.5 71t179.5 184q44 81 44 150t-35.5 116t-96.5 47q-80 0 -163.5 -88.5t-107.5 -289.5h-30q-20 83 -20 136q0 116 87 197.5t204 81.5 q84 0 140 -53t56 -136q0 -157 -148.5 -301.5t-355.5 -144.5q-169 0 -294.5 112t-125.5 279q0 140 91 314q-146 26 -247 116t-101 220t86 232q158 188 474 188q70 0 161 -12l-5 -31q-59 9 -131 9q-163 0 -295 -110q-187 -156 -187 -345t260 -238q145 215 356 402t432 279 q113 47 186 47t121 -50.5t48 -124.5zM1729 1328q0 38 -30 61.5t-69 23.5q-241 0 -678 -695q109 20 167 37q299 87 499 346q111 144 111 227z" />
+<glyph unicode="&#x1d49f;" horiz-adv-x="1715" d="M1756 819q0 -203 -84 -412q-169 -421 -545 -421q-112 0 -257 60q-189 -60 -296.5 -60t-187.5 25q-115 36 -115 110q0 103 194 103q155 0 369 -83q70 77 141 223l126 259q191 393 435 604q-100 94 -196 133.5t-231 39.5q-388 0 -592 -350q-106 -182 -106 -336 q0 -198 195 -198q199 0 333 207q119 182 119 392q0 34 -5 92h33q5 -57 5 -88q0 -221 -129 -416q-144 -218 -355 -218q-145 0 -235.5 96.5t-90.5 241.5q0 232 272 427q250 179 556 179q268 0 453 -180q80 67 183 111l13 -28q-105 -42 -164 -110q86 -108 124 -195t38 -208z M1711 757q0 248 -143 434q-62 -81 -110 -252l-95 -345q-54 -170 -142.5 -288t-259.5 -216q139 -65 227 -65q114 0 242 94t204.5 278.5t76.5 359.5zM770 86q-249 104 -357.5 104t-108.5 -70q0 -56 98 -84q69 -20 147 -20q116 0 221 70z" />
+<glyph unicode="&#x1d4a0;" horiz-adv-x="1204" d="M1429 1172q0 -100 -63.5 -183t-161.5 -83q-63 0 -102 45t-39 109q0 121 157 215l20 -22q-122 -103 -122 -220q0 -40 25.5 -69.5t65.5 -29.5q82 0 135 77.5t53 168.5t-61 155.5t-157 64.5q-140 0 -251.5 -125t-111.5 -267q0 -71 33 -137q31 1 68.5 1t98.5 -16 q87 -23 87 -66q0 -49 -79 -49q-100 0 -232 78q-168 -54 -275 -213.5t-107 -340.5q0 -252 261 -252q156 0 278 82t168 228q16 51 16 100t-35.5 92t-104.5 43t-141 -74q-116 -119 -120 -315h-31q-25 61 -25 123q0 126 86.5 215t212.5 89q81 0 136.5 -51.5t55.5 -131.5 q0 -148 -119 -275q-147 -157 -381 -157q-197 0 -334 107q-156 122 -156 312t190 321q151 103 370 139q-120 109 -120 244.5t132 236.5t346 101q146 0 233 -60q101 -70 101 -210zM1010 773q38 0 38 22t-47.5 34t-73.5 12t-55 -4q68 -64 138 -64z" />
+<glyph unicode="&#x1d4a1;" horiz-adv-x="1414" d="M1623 1225q-100 0 -284.5 77.5t-292.5 77.5q-168 0 -338 -100q-135 -79 -232.5 -201t-97.5 -257q0 -72 44 -123.5t115 -51.5q115 0 249 202q104 157 104 280q0 58 -28 127l31 7q70 -156 70 -277q0 -156 -117.5 -264.5t-274.5 -108.5q-99 0 -162.5 55t-63.5 152 q0 206 210 387q270 233 639 233q103 0 189 -16q274 -51 351 -51t146 60l24 -17q-126 -191 -281 -191zM1563 793q0 -47 -46 -94q-16 -15 -86 -68q-2 -165 -61 -261q-94 -15 -165 -34q75 118 130 260q-56 -18 -110 -23q-36 -145 -136 -280q-234 -314 -615 -314 q-181 0 -269.5 83t-88.5 186q0 77 51.5 133.5t128.5 56.5q48 0 88.5 -31.5t40.5 -85t-56 -83.5l-104 -39q-56 -23 -56 -63t63.5 -81.5t164.5 -41.5q157 0 271 130q69 79 159 269l69 146q-194 -29 -346 -178l-22 23q93 89 176 131t206 58q215 441 490 613l22 -22 q-59 -42 -89 -102t-65 -197l-74 -277q57 5 116 25q40 104 56 133q46 81 101.5 81t55.5 -53zM1528 791q0 23 -24 23q-48 0 -69 -141q93 67 93 118z" />
+<glyph unicode="&#x1d4a2;" horiz-adv-x="1462" d="M1202 56q-146 -81 -366 -81t-326 107q-76 77 -76 161.5t50.5 135.5t114.5 51t101.5 -30t37.5 -86.5t-53 -81.5l-100 -30q-53 -18 -53 -62q0 -63 103 -101q79 -29 156 -29q112 0 192 74q53 49 124 170l69 118q49 84 152 186q-186 -105 -318.5 -105t-253.5 131 q-63 -5 -87 -5q-160 0 -282 107.5t-122 265.5q0 185 171 318q139 108 343 154l6 -28q-162 -38 -264 -160q-150 -179 -150 -369q0 -122 87 -189.5t213 -67.5q34 0 63 4q-55 92 -55 205q0 233 204 409q231 199 494 199q79 0 133.5 -44.5t54.5 -122.5q0 -144 -165 -320 q-196 -209 -412 -295q-79 -32 -165 -52q44 -111 177.5 -111t281 83t267.5 193l21 -22q-78 -82 -110 -183q-6 -19 -46 -210.5t-212 -286.5zM1521 1291q0 43 -31 70.5t-75 27.5q-139 0 -317 -216q-136 -165 -220 -344q-50 -108 -60 -204q285 54 504 299q199 222 199 367z" />
+<glyph unicode="&#x1d4a3;" horiz-adv-x="1688" d="M2176 1284q0 -138 -187 -283q-130 -101 -312 -182l-165 -68q-257 -585 -257 -708q0 -31 40 -31q87 0 207 109t193 213l28 -17q-91 -123 -191 -211q-141 -124 -239 -124t-147 87q-39 70 -39 174t31 193.5t99 227.5q-108 -31 -209 -65q-141 -429 -480 -566 q-129 -52 -268 -52t-236 64q-112 74 -112 205q0 76 48.5 134.5t123.5 58.5q50 0 91.5 -30t41.5 -81.5t-45 -87.5q-13 -10 -108 -33q-70 -18 -70 -66q0 -62 98 -101q77 -31 151 -31q206 0 337 229q63 110 143 274q-185 -73 -358 -215l-19 23q174 149 394 229q169 348 361 576 q-169 -132 -210 -161q-160 -111 -231 -111q-40 0 -66 27t-26 67q0 62 64 149t64 92q0 18 -23 18q-127 0 -416 -354l-25 15q287 369 453 369q45 0 78 -32.5t33 -77.5q0 -69 -60.5 -146t-60.5 -84.5t21 -7.5q40 0 227 142l394 299l17 -21q-112 -110 -192 -316l-121 -353l-3 -8 l221 71q124 205 212 314q334 414 562 414q64 0 103.5 -42.5t39.5 -107.5zM2081 1248q29 60 29 91t-23.5 48t-50.5 17q-152 0 -291 -210q-88 -132 -214 -405q209 87 323 174q144 111 227 285z" />
+<glyph unicode="&#x1d4a4;" horiz-adv-x="1185" d="M1293 819q0 37 -12 106l31 3q13 -71 13 -108q0 -133 -91 -233.5t-226 -147.5q-154 -311 -459 -418q-128 -45 -261 -45t-230 65q-112 74 -112 204q0 80 51.5 137t130.5 57q51 0 87.5 -32.5t36.5 -90t-57 -84.5l-107 -31q-57 -19 -57 -64q0 -59 91 -97q73 -30 143 -30 q164 0 277 135q46 53 165 275q-134 35 -220.5 124.5t-86.5 220.5q0 211 226 381q166 125 418.5 205.5t507.5 83.5l1 -31q-139 0 -225 -113q-70 -92 -136 -286q-25 -76 -70 -238.5t-95 -286.5q115 48 190.5 136t75.5 203zM516 636q0 -152 205 -189l173 361q104 204 222.5 349 t290.5 240q-130 -17 -239 -45q-202 -52 -369.5 -206.5t-248.5 -353.5q-34 -84 -34 -156z" />
+<glyph unicode="&#x1d4a5;" horiz-adv-x="1089" d="M1109 32q0 -130 -138 -219q-106 -70 -256 -95l-1 30q137 25 209 68q155 93 155 218q0 80 -59 126t-142 50q-135 -255 -315 -428q-235 -224 -476 -224q-82 0 -126.5 62t-44.5 146q0 190 259 328q181 98 420 143l298 515q135 234 242 363q150 181 332 278 q-207 -13 -322 -48q-195 -59 -383.5 -222.5t-276.5 -347.5q-41 -86 -41 -144.5t38 -89t91.5 -30.5t108.5 31l16 -27q-62 -34 -119 -34q-100 0 -153.5 74t-53.5 178q0 426 693 627q224 65 558 70l1 -30q-143 0 -258 -139q-84 -102 -176 -309q-18 -41 -125.5 -310t-172.5 -403 q95 -9 156.5 -62t61.5 -145zM-25 -299q0 -48 32.5 -80.5t80.5 -32.5q146 0 488 614q-197 -37 -388 -181q-213 -160 -213 -320z" />
+<glyph unicode="&#x1d4a6;" horiz-adv-x="1674" d="M1418 454q0 -59 -16 -197.5t-16 -154.5q0 -41 23 -41q78 0 272 273l26 -17q-239 -328 -403 -328q-74 0 -120.5 53.5t-46.5 127.5t71.5 231.5t71.5 226.5q0 24 -19 55q-56 -24 -96.5 -24t-40.5 36q0 48 73 48q23 0 81 -18q77 31 128 101q29 39 79 145q205 430 589 463 l1 -30q-102 -7 -169 -46q-84 -49 -162 -189q-113 -201 -150 -248q-112 -143 -286 -216q110 -87 110 -251zM1118 1121q-314 -267 -429 -267q-39 0 -67 26.5t-28 64.5q0 61 64 149t64 91q0 20 -26 20q-123 0 -403 -352l-26 20q294 363 450 363q43 0 73 -27.5t30 -69.5 q0 -72 -59.5 -154t-59.5 -89t14 -7q55 0 271.5 165t358.5 325l26 -20q-139 -156 -215 -402l-145 -467q-98 -241 -289 -374t-429 -133q-144 0 -239 56q-117 69 -117 203q0 83 49.5 139t131.5 56q50 0 85.5 -32.5t35.5 -88.5t-57 -83l-106 -31q-57 -19 -57 -64q0 -64 100 -98 q74 -26 154 -26q144 0 246 100q83 82 210 361q172 379 389 646z" />
+<glyph unicode="&#x1d4a7;" horiz-adv-x="1465" d="M1744 1260q0 -162 -226 -385q-193 -190 -377 -278l-44 -21q-59 -165 -129.5 -268.5t-200.5 -198.5q173 -82 277 -82q202 0 428 307l26 -17q-250 -325 -480 -325q-106 0 -297 89q-164 -100 -360 -100q-91 0 -169 29q-106 39 -106 110.5t70 106.5q56 28 131 28 q129 0 342 -86q74 141 171 364q-34 -3 -57 -3q-162 0 -282.5 113.5t-120.5 274.5q0 217 240 373q215 139 444 139q80 0 173 -23l-9 -29q-86 20 -160 20q-238 0 -404 -168t-166 -394q0 -134 77 -204.5t212 -70.5q27 0 66 5q287 667 584 826q90 48 164 48t128.5 -51.5 t54.5 -128.5zM1658 1317q0 93 -103 93q-126 0 -227 -161q-73 -118 -139 -337l-81 -296q360 171 513 558q37 94 37 143zM287 225q-55 0 -112.5 -26t-57.5 -74q0 -60 92 -92q66 -22 142 -22q119 0 188 48q23 16 70 79q-199 87 -322 87z" />
+<glyph unicode="&#x1d4a8;" horiz-adv-x="2093" d="M2214 1341q109 87 142 87t33 -21.5t-47 -87.5t-125 -201.5t-129 -241.5q-347 -725 -347 -829q0 -31 29 -31q54 0 177 132q90 96 153 186l28 -17q-253 -337 -384 -337q-76 0 -117 72t-41 153q0 246 275 626q133 184 460 546q-373 -239 -846 -960l-164 -243 q-29 -43 -91 -123q-61 -69 -96.5 -69t-72 48.5t-36.5 147.5q0 243 229 617q112 182 397 556q-289 -247 -663 -750l-139 -187q-81 -106 -148 -178q-237 -254 -476 -254q-122 0 -207.5 63t-85.5 180q0 81 51.5 143.5t130.5 62.5q48 0 85.5 -32.5t37.5 -79.5q0 -64 -70 -100 l-99 -24q-60 -15 -60 -64q0 -62 84 -95q63 -24 137 -24q167 0 310 124q89 78 217 235l202 252q119 155 368 455q207 229 338 324q35 25 49 25q29 0 29 -23q0 -11 -13 -34q-158 -275 -350 -774l-118 -315q-27 -75 -74 -228q62 64 271 382q408 621 766 906z" />
+<glyph unicode="&#x1d4a9;" horiz-adv-x="1650" d="M2090 1109l-74 4q-51 0 -107 -55q-114 -112 -476 -764l-14 -196l-265 -121q43 582 79 793.5t92.5 336t158.5 256.5q-213 -162 -366 -409q-45 -72 -198 -339.5t-272 -400.5q-208 -232 -431 -232q-115 0 -199 63.5t-84 175.5q0 84 59 144t143 60q50 0 87.5 -34t37.5 -88 t-56 -85q-8 -5 -122 -18q-79 -9 -79 -67q0 -61 80 -95q62 -26 132 -26q145 0 260.5 94t324.5 409l285 449q182 285 402 442q45 32 60 32q21 0 21 -19q0 -13 -19 -51.5t-34 -103.5t-32 -279l-48 -611q22 42 201 342q44 76 138 223q192 282 325 282q62 0 62 -53q0 -59 -72 -59 z" />
+<glyph unicode="&#x1d4aa;" horiz-adv-x="1193" d="M1491 1265q0 -46 -30 -118l-33 11q27 61 27 105q0 71 -59.5 111.5t-133.5 40.5q-183 0 -382 -192q-144 -139 -276.5 -397t-192.5 -480q-36 -134 -36 -206q0 -131 135 -131q341 0 639 576q158 306 158 476q0 107 -99.5 107t-233.5 -144q-109 -117 -209.5 -322t-131.5 -367 q-7 -34 -20 -135h-32q23 292 208 615q219 383 420 383q80 0 118 -60t38 -144q0 -251 -250 -582q-327 -434 -603 -434q-158 0 -247 130q-77 114 -77 279q0 313 270 610q162 179 364 301q240 146 441 146q86 0 152 -46q76 -51 76 -133z" />
+<glyph unicode="&#x1d4ab;" horiz-adv-x="1455" d="M1633 1344q173 -128 173 -282t-134 -268q-112 -94 -273 -135q-51 -13 -146 -27q-91 -288 -231 -425q-233 -227 -543 -227q-178 0 -268 80.5t-90 186.5q0 81 51.5 137t131.5 56q48 0 88 -32.5t40 -79.5q0 -66 -57 -94l-107 -33q-57 -19 -57 -64q0 -59 87 -95 q69 -28 138 -28q146 0 251.5 105.5t283.5 495.5q-128 -12 -250 -97l-19 22q119 93 283 106q235 507 571 692q-103 71 -309 71t-440.5 -99.5t-356.5 -257.5q-87 -113 -87 -218q0 -72 42.5 -116.5t114.5 -44.5q154 0 326 221q127 163 131 359h26q16 -91 16 -163 q0 -194 -121 -330t-313 -136q-108 0 -181.5 52.5t-73.5 163.5t96 232q131 166 368.5 266t443 100t364.5 -75q75 39 162 62l6 -27q-86 -25 -137 -54zM1631 1161q0 79 -52 155q-120 -81 -188 -236q-31 -69 -69 -204l-59 -210q142 30 232 139q136 166 136 356z" />
+<glyph unicode="&#x1d4ac;" horiz-adv-x="1419" d="M1512 1056q0 -230 -249 -503q-188 -206 -448 -373q244 -81 327 -81q112 0 284 235l26 -17q-246 -339 -494 -339q-107 0 -313 100q-188 -97 -336 -97q-75 0 -129 27q-69 35 -69 109.5t98 122.5q79 39 170 39q134 0 370 -75q239 221 394 546q129 270 129 446 q0 203 -171 203q-180 0 -364.5 -114t-291 -274t-106.5 -294q0 -79 48.5 -129t135 -50t173.5 89t162 240t75 268q0 30 -9 90l29 6q49 -147 49 -266q0 -186 -134.5 -326t-319.5 -140q-107 0 -174 57.5t-67 163.5q0 144 114.5 311.5t305 283t373 115.5t297.5 -102t115 -272z M276 209q-133 0 -133 -101q0 -96 169 -96q138 0 290 85q-216 112 -326 112z" />
+<glyph unicode="&#x1d4ad;" horiz-adv-x="1828" d="M1943 1085q0 -103 -94 -200q-117 -122 -372 -183q104 -98 104 -235q0 -66 -35.5 -199.5t-35.5 -196.5q0 -35 23 -35q83 0 302 298l27 -17q-240 -341 -412 -341q-79 0 -130.5 51t-51.5 135.5t78 235.5t78 223q0 34 -20 69q-43 -6 -73 -6q-61 0 -61 31q0 42 63 42 q45 0 113 -32q120 15 206.5 153t86.5 265.5t-121 198.5q-111 -49 -176 -136q-100 -133 -186 -422q-26 -95 -89 -278q-60 -141 -158 -257q-226 -268 -581 -268q-144 0 -241 61q-115 72 -115 209q0 78 52.5 133.5t129.5 55.5q50 0 88.5 -34t38.5 -90.5t-57 -82.5l-107 -31 q-57 -18 -57 -64q0 -61 95 -98q74 -29 147 -29q159 0 275 128q79 87 218 381q51 108 160 318q209 365 528 522q-111 39 -261 39q-248 0 -506.5 -100t-406.5 -275q-103 -122 -103 -252q0 -68 40 -113.5t114.5 -45.5t169.5 70q252 185 273 517h30q14 -95 14 -172 q0 -196 -118 -328.5t-312 -132.5q-102 0 -173 53.5t-71 152.5q0 135 110 268q147 178 413.5 283t517.5 105q156 0 326 -44q89 31 154 48l7 -28q-62 -17 -116 -35q258 -99 258 -285z" />
+<glyph unicode="&#x1d4ae;" horiz-adv-x="1433" d="M1821 1255q0 -152 -215 -371q-179 -182 -436 -297q-69 -203 -166 -322q-231 -285 -585 -285q-137 0 -238 62q-119 72 -119 201q0 80 52 138t131 58q50 0 88.5 -35t38.5 -92t-56 -83l-105 -31q-56 -18 -56 -63q0 -58 86 -93q68 -27 136 -27q135 0 234 87q76 67 145 202 l107 231q-283 3 -404 212q-51 88 -51 178q0 209 242 371q215 144 449 144q79 0 169 -21l-4 -27q-101 17 -161 17q-190 0 -338 -115t-209 -299q-29 -87 -29 -166q0 -123 79.5 -193.5t204.5 -70.5q22 0 66 3q123 276 223 435q150 241 322 357q118 80 207 80t140.5 -54.5 t51.5 -130.5zM1738 1320q0 89 -96 89q-225 0 -378 -490q-31 -97 -85 -295q351 162 515 536q44 100 44 160z" />
+<glyph unicode="&#x1d4af;" horiz-adv-x="1298" d="M1612 1215q-90 0 -274 81.5t-329 81.5t-294 -88.5t-242 -198.5q-114 -135 -114 -263q0 -71 45 -124t115 -53q126 0 242.5 174.5t116.5 308.5q0 27 -15 94l26 9q63 -128 63 -243q0 -159 -114.5 -268.5t-274.5 -109.5q-104 0 -170 55.5t-66 169t104 248.5q265 344 751 344 q121 0 284 -34.5t256.5 -34.5t145.5 58l24 -18q-84 -189 -280 -189zM753 43q-156 -64 -305.5 -64t-247.5 65q-112 74 -112 206q0 78 50 134t127 56q49 0 89.5 -32.5t40.5 -79.5q0 -65 -57 -93l-107 -34q-57 -19 -57 -60q0 -59 95 -98q76 -31 146 -31q150 0 262 121 q73 79 159 254q65 140 208 403q174 278 386 404l15 -24q-70 -58 -119 -188q-19 -53 -72 -257.5t-122 -328.5q-142 -255 -379 -353z" />
+<glyph unicode="&#x1d4b0;" horiz-adv-x="1785" d="M1407 39q0 -19 21 -19q46 0 131 62q125 91 233 252l28 -17q-85 -119 -180 -208q-135 -125 -232 -125q-65 0 -103 55t-38 121.5t43 168.5q-121 -158 -183 -219q-131 -130 -230.5 -130t-148 81t-48.5 191t79 253q31 56 154 229t177 267q85 150 85 236t-85 127 q-64 31 -158 31q-266 0 -511 -237t-245 -456q0 -73 45 -122.5t118 -49.5q140 0 276 227t136 378q0 23 -10 89l31 4q46 -140 46 -257q0 -208 -151 -350q-133 -125 -298 -125q-100 0 -163 54t-63 153q0 169 136 343.5t303.5 276.5t339.5 102t288 -93t116 -257q0 -119 -79 -261 q-9 -16 -60 -92l-156 -227q-218 -316 -218 -433q0 -51 55 -51q39 0 98 30q150 77 354 393q31 48 209.5 344.5t310.5 481.5q107 11 243 16q-164 -238 -320 -515l-219 -391q-40 -68 -113 -205q-44 -91 -44 -126z" />
+<glyph unicode="&#x1d4b1;" horiz-adv-x="1381" d="M648 12q-86 -49 -105.5 -49t-19.5 18q0 3 47.5 83t75 253.5t42 245.5t40.5 144q84 231 322 483l-271 -202q-106 -72 -173 -72q-43 0 -75.5 26t-32.5 75.5t64 138.5t64 96q0 13 -22 13q-119 0 -412 -353l-25 18q99 129 203 226q153 142 248 142q45 0 75 -29t30 -82 t-58 -140.5t-58 -89.5q0 -11 17 -11q64 0 313 193q168 131 310 258l21 -18q-32 -43 -92 -133q-70 -114 -135 -378q-39 -157 -64 -234q-116 -355 -369 -608q259 137 549 486q23 27 251.5 335t395.5 441q107 85 256 129l6 -29q-184 -52 -356 -227q-97 -99 -242 -301l-197 -270 q-100 -131 -187 -224q-209 -224 -436 -354z" />
+<glyph unicode="&#x1d4b2;" horiz-adv-x="1958" d="M1523 11q-18 -35 -45 -35t-73.5 73.5t-46.5 226t70.5 297.5t244.5 392t232 347q-344 -432 -557 -654q-320 -333 -660 -554q-186 -121 -222 -121t-36 25q0 14 45 59q493 488 622 937q32 111 32 198q0 201 -205 201q-236 0 -482.5 -214t-246.5 -446q0 -81 47.5 -139 t127.5 -58q135 0 278.5 223t143.5 375q0 32 -9 95l28 6q48 -138 48 -258q0 -154 -85.5 -277.5t-230.5 -174.5q-71 -25 -137 -25q-110 0 -176.5 62.5t-66.5 171.5q0 182 156 364q134 158 306 244.5t335 86.5q264 0 364 -195q38 -74 38 -157q0 -358 -533 -793l-310 -253 q460 250 907 744q463 557 501 605.5t54 48.5q26 0 26 -22q0 -9 -128 -324.5t-171 -429.5q-129 -337 -193 -586q189 371 343 587q228 320 478 467l18 -25q-275 -159 -557 -589q-100 -153 -194 -338z" />
+<glyph unicode="&#x1d4b3;" horiz-adv-x="1593" d="M1902 1367q68 0 123 -36.5t55 -93t-33 -89.5t-76.5 -33t-73.5 25t-30 66t35.5 72t35.5 36q0 23 -38 23q-201 0 -436 -399q-294 -500 -294 -787q0 -130 80 -130q118 0 350 313l27 -18q-253 -325 -376 -325q-117 0 -117 182q0 155 70 331q-275 -354 -606 -475 q-129 -47 -234.5 -47t-186.5 56t-81 157q0 77 52 129.5t129 52.5q50 0 89.5 -30t39.5 -77.5t-32 -76t-79.5 -28.5t-87.5 39t-48 39q-30 0 -30 -55q0 -87 82 -135q68 -40 160 -40t171 40t165 130q187 196 349.5 494t162.5 522q0 204 -213 204q-173 0 -343 -116 q-151 -105 -255 -268.5t-104 -296.5q0 -75 47 -131.5t120 -56.5q51 0 92 21q93 48 207.5 236t114.5 345q0 41 -12 99l30 6q51 -162 51 -273q0 -191 -131.5 -331.5t-320.5 -140.5q-101 0 -165.5 63.5t-64.5 164.5q0 140 109 310t277 285t356.5 115t302.5 -141 q92 -114 92 -254q0 -60 -19 -144q135 211 232 318q139 154 280 154z" />
+<glyph unicode="&#x1d4b4;" horiz-adv-x="1448" d="M737 -24q-145 0 -249 61q-124 73 -124 209q0 80 52.5 134.5t131.5 54.5q53 0 91 -32t38 -90t-57 -86l-107 -33q-57 -20 -57 -60t55 -75q77 -49 192 -49q167 0 278 129q60 69 160 275l197 395q-111 -145 -179 -208q-125 -115 -236 -115q-72 0 -121 56t-49 129 q0 103 75 243q18 33 140 224q75 117 75 167q0 97 -181 97q-226 0 -420 -192q-76 -76 -135.5 -178t-59.5 -190q0 -121 106 -121q84 0 179 112q68 81 119.5 185.5t60.5 216.5h28q5 -62 5 -82q0 -166 -101 -308q-111 -157 -270 -157t-159 153q0 145 118 293.5t253 223.5 t269.5 75t231.5 -73t97 -199q0 -85 -41 -165q-5 -9 -128.5 -210t-123.5 -241q0 -29 41 -29q146 0 397 333l153 201q150 187 300 309l23 -19q-71 -80 -131.5 -182.5t-107.5 -275.5l-89 -332q-103 -319 -366 -474q-170 -100 -374 -100z" />
+<glyph unicode="&#x1d4b5;" horiz-adv-x="1411" d="M1836 1381q0 -80 -92.5 -186t-176.5 -148q-50 -25 -127 -39l-168 -213q-31 -43 -99 -125q-70 -76 -173 -157q174 -114 174 -282q0 -38 -9 -79q93 29 144.5 65.5t108.5 113.5l26 -17q-58 -84 -120 -125t-167 -71q-84 -241 -270.5 -400.5t-428.5 -159.5q-198 0 -198 185 q0 201 613 351q76 151 76 282q0 47 -20 88q-195 -124 -333 -124q-36 0 -67 19.5t-31 54.5q0 78 97 125q79 38 175 38t199 -48q119 93 170.5 149.5t256.5 328.5h-15q-83 0 -205 69l-236 134q-140 71 -253 71q-152 0 -245 -123.5t-93 -280.5q0 -61 18 -154l-32 -4 q-18 91 -18 157q0 236 167.5 392.5t404.5 156.5q269 0 462 -240q43 -53 58 -70t42 -32q101 151 146 205q115 140 189 140q50 0 50 -47zM1799 1372q0 24 -23 24q-52 0 -147 -117t-145 -204q16 -2 28 -2q73 0 180 113t107 186zM762 546q-69 0 -122 -21q-73 -28 -73 -86.5 t70 -58.5q96 0 276 109q-54 57 -151 57zM332 -278q0 -129 126 -129q102 0 236 186q89 124 163 281q-155 -41 -310 -123q-215 -113 -215 -215z" />
+<glyph unicode="&#x1d4b6;" horiz-adv-x="1044" d="M844 45q-77 -59 -147 -59t-109.5 38t-39.5 90t19 126q-170 -254 -333 -254q-83 0 -140.5 62t-57.5 142.5t35 168.5l-43 -56l-28 17q280 390 566 390q168 0 175 -120l53 86l252 35q-356 -596 -356 -668q0 -19 23 -19q78 0 189 121q32 34 149 187l28 -17l-119 -151 q-68 -82 -116 -119zM575 314q131 218 131 261t-25.5 67.5t-62.5 24.5q-81 0 -232 -227q-188 -282 -188 -376q0 -40 56 -40q77 0 183 111q80 82 138 179z" />
+<glyph unicode="&#x1d4b7;" horiz-adv-x="871" d="M273 48q0 -28 41 -28q115 0 287 173q-69 60 -69 153q0 139 118 287q65 82 126 82q73 0 73 -97q0 -180 -197 -417q18 -5 38 -5q57 0 109 46q23 20 79 92l27 -17q-59 -76 -91 -102q-58 -49 -124 -49q-30 0 -60 11q-194 -191 -341 -191q-76 0 -123.5 47t-47.5 123 q0 115 121 335q24 44 193 315q-48 -48 -100 -115l-99 -128l-206 -258l-27 17q68 91 263 328l287 351l228 367l233 19q-190 -288 -413 -669q-325 -556 -325 -670zM773 483q0 20 -16 36t-36 16q-59 0 -103.5 -73t-44.5 -138t50 -109q150 179 150 268z" />
+<glyph unicode="&#x1d4b8;" horiz-adv-x="746" d="M285 -14q-105 0 -177.5 66t-72.5 170q0 61 29 129l-36 -48l-28 17q278 390 558 390q81 0 143.5 -37.5t62.5 -113.5q0 -44 -28 -73t-67.5 -29t-68.5 25t-29 61q0 61 56 85q31 13 31 20q0 28 -50 28q-107 0 -244.5 -242t-137.5 -365q0 -46 65 -46q140 0 265 98 q79 62 197 211l26 -17q-129 -166 -208 -228q-128 -101 -286 -101z" />
+<glyph unicode="&#x1d4b9;" horiz-adv-x="1028" d="M680 39q0 -15 20 -15q74 0 186 123q34 37 149 187l27 -18l-149 -178q-63 -75 -116 -113.5t-120.5 -38.5t-107.5 38.5t-40 91.5t22 114q-173 -244 -346 -244q-82 0 -136.5 56t-54.5 134t42 166l-28 -37l-28 17q280 392 545 392q148 0 173 -148l389 640l249 9 q-676 -1040 -676 -1176zM570 324q114 170 116.5 185t2.5 45.5t-25 73t-68 42.5q-83 0 -254.5 -257.5t-171.5 -348.5q0 -39 43 -39q156 0 357 299z" />
+<glyph unicode="&#x1d4ba;" horiz-adv-x="744" d="M290 -14q-113 0 -188.5 63.5t-75.5 175.5q0 44 13 91l-11 -13l-28 17q18 30 52 35q69 144 164 221q166 134 356.5 134t190.5 -144q0 -69 -68 -136q-134 -132 -406 -132q-63 -139 -63 -225q0 -50 63 -50q139 0 265 98q89 68 197 211l27 -17q-126 -162 -206 -226 q-130 -103 -282 -103zM658 624q0 56 -61 56q-128 0 -295 -353q117 3 218 83q138 109 138 214z" />
+<glyph unicode="&#x1d4bb;" horiz-adv-x="609" d="M1096.5 1345.5q35.5 -29.5 35.5 -84t-52 -147.5q-143 -257 -612 -589q-75 -169 -235 -502q167 31 383 308l27 -18q-108 -140 -184 -205q-117 -101 -243 -120q-102 -226 -226 -430h-229q120 202 275 505q-44 41 -44 84.5t28 75.5t66 32q18 0 45 -8l101 203 q-153 -73 -206 -148l-26 18q59 87 252 176q148 291 318 521q263 358 444 358q47 0 82.5 -29.5zM1046 1310q0 34 -41 34q-97 0 -192 -136q-65 -93 -166 -303l-156 -325q211 151 319 291q142 182 210 352q26 65 26 87z" />
+<glyph unicode="&#x1d4bc;" horiz-adv-x="1004" d="M99 -442q-55 0 -100 26t-45 77q0 92 174 187q55 30 258 112l74 166q-125 -145 -247 -145q-80 0 -128 60.5t-48 139.5t38 181l-48 -59l-27 17q51 71 125 152q219 238 421 238q87 0 124 -54q24 -35 24 -69v-8l59 107l247 20q-231 -391 -370 -682q207 74 381 305l28 -17 q-194 -261 -427 -325q-76 -160 -207 -283q-155 -146 -306 -146zM659 575q0 97 -79 97q-94 0 -239 -259.5t-145 -368.5q0 -29 31 -29q79 0 161.5 79t135.5 169q135 231 135 312zM19 -356q0 -25 21.5 -41t46.5 -16q131 0 282 333q-350 -162 -350 -276z" />
+<glyph unicode="&#x1d4bd;" horiz-adv-x="1112" d="M754 -14q-68 0 -107.5 45.5t-39.5 129t70 203.5q38 65 118.5 167.5t80.5 124.5q0 15 -20 15q-97 0 -346 -291q-30 -34 -305 -384l-257 -10l496 834l-417 -515l-27 17q29 39 207 256l314 387q11 12 29 36l203 368l241 10l-687 -1189q423 525 564 525q61 0 94 -48t33 -112 q0 -96 -66 -217q-38 -69 -113 -170.5t-75 -119.5q0 -24 37 -24q74 0 188 124q34 36 150 186l26 -17q-58 -78 -183 -225q-103 -106 -208 -106z" />
+<glyph unicode="&#x1d4be;" horiz-adv-x="572" d="M738 1131.5q28 -29.5 28 -80.5t-40.5 -92t-91 -41t-79.5 29.5t-29 78.5t43 92t92 43t77 -29.5zM371 46q-77 -60 -148.5 -60t-110 44.5t-38.5 109.5q0 91 127 309l109 188q-112 -103 -282 -332l-28 17q175 231 331 378l263 13q-370 -592 -370 -671q0 -17 24 -17 q103 0 317 290l14 19l27 -18l-119 -151q-67 -81 -116 -119z" />
+<glyph unicode="&#x1d4bf;" horiz-adv-x="614" d="M773 1058q0 -56 -42 -97.5t-91 -41.5t-80 31.5t-31 80t42.5 89.5t98.5 41q103 0 103 -103zM-292 -442q-55 0 -100 26t-45 77q0 93 179 202q115 71 266 128l323 626q-164 -121 -304 -315l-27 17q144 207 354 352l256 29q-237 -393 -372 -677q110 20 217 118q63 58 166 190 l26 -18q-109 -141 -184 -206q-119 -104 -243 -119q-96 -203 -230.5 -316.5t-281.5 -113.5zM-372 -356q0 -25 21.5 -41t46.5 -16q127 0 289 358q-110 -52 -212 -126q-145 -105 -145 -175z" />
+<glyph unicode="&#x1d4c0;" horiz-adv-x="1026" d="M1006 1387q-188 -307 -793 -1383l-249 -16l480 832l-417 -515l-27 17q39 53 107 137l377 463q26 29 65 80l212 368zM649 -14q-174 0 -174 123q0 59 52.5 155t52.5 117t-10 35q-10 -2 -44.5 -15.5t-57 -13.5t-22.5 18q0 37 124 46q24 2 56 29l127 142q86 93 149 93 q46 0 87 -33t41 -74.5t-26.5 -69t-62 -27.5t-61.5 23t-26 53.5t23.5 58t23.5 28.5q0 8 -12 8q-47 0 -131.5 -104t-138.5 -138q124 -51 124 -156q0 -51 -33.5 -140t-33.5 -99q0 -20 23 -20q73 0 186 124q28 31 148 185l27 -17l-119 -151q-66 -81 -116 -120q-77 -60 -176 -60z " />
+<glyph unicode="&#x1d4c1;" horiz-adv-x="592" d="M298 170q-50 -99 -50 -122.5t20 -23.5q76 0 195 144l136 165l28 -17q-141 -178 -166 -204q-121 -126 -216 -126q-62 0 -100 40.5t-38 112t58 191t276 486.5l-413 -511l-28 17q94 127 232 292l265 317q65 80 171 249l118 190l232 17l-287 -463q-58 -92 -223 -380 q-73 -123 -210 -374z" />
+<glyph unicode="&#x1d4c2;" horiz-adv-x="1665" d="M1315 -14q-140 0 -140 163q0 101 56 213q11 22 98 144.5t87 144t-21 21.5q-57 0 -166 -105q-198 -190 -415 -560l-268 -14q89 137 206 354t117 290q0 22 -18 22q-116 0 -556 -649l-269 -16q363 556 363 663q0 12 -10 12q-75 0 -351 -366l-28 17q132 174 185 232 q144 158 233 158q58 0 91 -40t33 -110.5t-43 -164.5q-15 -32 -88 -160l135 180q79 100 146 171q117 124 217 124q60 0 91.5 -45.5t31.5 -108.5q0 -111 -102 -305q328 459 484 459q64 0 99.5 -50.5t35.5 -117.5q0 -127 -143 -342q-93 -140 -93 -155q0 -22 26 -22 q71 0 184 126l149 183l26 -17l-119 -151q-68 -82 -116 -119q-77 -59 -148 -59z" />
+<glyph unicode="&#x1d4c3;" horiz-adv-x="1187" d="M827 -14q-151 0 -151 173q0 95 67 209q34 58 112 158t78 125q0 16 -21 16q-162 0 -615 -652l-276 -30q370 551 370 665q0 18 -14 18q-75 0 -350 -365l-27 17l134 173q86 105 156 161t133 56q120 0 120 -131q0 -80 -50 -190q-19 -42 -93 -177q185 242 310.5 370t215.5 128 q64 0 99.5 -45t35.5 -115t-34 -158q-16 -41 -115.5 -187t-99.5 -164.5t33 -18.5q85 0 197 119q30 32 152 191l27 -17l-119 -151q-68 -83 -115 -119q-77 -59 -160 -59z" />
+<glyph unicode="&#x1d4c4;" horiz-adv-x="794" d="M541 132q7 -7 21 -7q77 0 239 207l28 -17q-85 -108 -123 -144q-85 -80 -164 -80q-20 0 -38 5q-127 -110 -231.5 -110t-169 68.5t-64.5 169.5q0 56 33 139l-45 -60l-27 17q280 390 550 390q197 0 197 -187q0 -183 -206 -391zM678 565q0 109 -81 109q-106 0 -237 -241.5 t-131 -363.5q0 -47 55 -47q90 0 187 91q-11 17 -11 35q0 59 63 59q7 0 15 -2q140 221 140 360z" />
+<glyph unicode="&#x1d4c5;" horiz-adv-x="1079" d="M727 -17q-147 0 -147 158q0 109 68 226q34 56 115 157t81 133q0 13 -18 13q-57 0 -148 -84t-350 -367l-78 -85l-328 -576h-233l750 1256l-413 -512l-26 18q82 110 278 348l271 332l118 199h192l-529 -926q103 115 317 335q113 105 190 105q60 0 95 -50t35 -112 q0 -92 -67 -212q-35 -62 -113 -169.5t-78 -130.5q0 -20 31 -20q81 0 195 122q38 41 151 191l26 -18q-164 -232 -272 -299q-51 -32 -113 -32z" />
+<glyph unicode="&#x1d4c6;" horiz-adv-x="964" d="M688 -154q0 -122 -63.5 -205t-181.5 -83q-136 0 -136 143.5t132 389.5q-127 -110 -216 -110t-138 63t-49 141.5t36 174.5l-45 -60l-27 17q279 393 551 393q145 0 159 -133l61 105l245 22l-376 -658q134 29 331 283l28 -17q-189 -246 -342 -297q31 -83 31 -169zM676 578 q0 39 -22 67t-60 28q-95 0 -244.5 -253.5t-149.5 -370.5q0 -35 35 -35q65 0 152.5 74.5t155.5 188.5q133 225 133 301zM613 -318q42 74 42 165t-31 172q-180 -337 -180 -400q0 -26 28 -26q91 0 141 89z" />
+<glyph unicode="&#x1d4c7;" horiz-adv-x="774" d="M574.5 45.5q-76.5 -59.5 -149.5 -59.5t-115.5 49t-42.5 115q0 107 108.5 284.5t108.5 197.5q0 14 -112 71l-194 -207q-51 -60 -150 -192l-28 17q53 74 168 211l177 188q-23 25 -23 53t25 54t52 26q37 0 37 -36q0 -24 -43 -90l125 -57q84 -38 112 -64.5t28 -69.5t-27 -101 l-51 -94q-145 -278 -145 -297.5t18 -19.5q97 0 328 309l28 -17l-15 -20q-143 -191 -219.5 -250.5z" />
+<glyph unicode="&#x1d4c8;" horiz-adv-x="680" d="M253 -14q-101 0 -178 52.5t-77 152.5t94 100q37 0 66 -25t29 -67.5t-53 -72t-53 -39.5q0 -19 22 -31t42 -12q75 0 163 171q75 145 75 310q0 28 -7 88q-6 52 -6 83v8q-207 -222 -342 -400l-28 17q116 154 371 434q19 116 97 116q26 0 26 -18.5t-87 -111.5q-1 -15 -1 -16 q0 -40 80 -181t80 -244q0 -75 -35 -154q45 41 156 187l27 -17q-122 -165 -192 -225q-123 -105 -269 -105z" />
+<glyph unicode="&#x1d4c9;" horiz-adv-x="611" d="M254 47q0 -23 32 -23q70 0 185 126q29 32 147 184l27 -17q-153 -192 -166 -206q-119 -126 -215 -126q-65 0 -107 46.5t-42 123.5t83 229l246 437l-417 -516l-27 17q75 101 266 332l284 347l51 79q71 110 127 186l226 18l-186 -300h192l1 -35h-217q-490 -816 -490 -902z " />
+<glyph unicode="&#x1d4ca;" horiz-adv-x="1098" d="M897 45q-77 -59 -148.5 -59t-111.5 40.5t-40 110.5t57 192l98 190q-190 -283 -331 -421q-112 -110 -199 -110q-59 0 -97.5 41.5t-38.5 101.5q0 127 224 503q-108 -97 -282 -331l-28 17q56 75 174 219q49 54 157 157l262 16q-95 -155 -271 -472q-86 -172 -86 -193.5 t23 -21.5q53 0 199.5 157.5t374.5 515.5l270 14l-163 -280q-94 -165 -141 -270t-47 -122t20 -17q72 0 185 124q33 36 148 185l27 -17l-119 -151q-68 -82 -116 -119z" />
+<glyph unicode="&#x1d4cb;" horiz-adv-x="943" d="M762 166q-31 0 -61 11q-189 -191 -330 -191q-91 0 -141 54t-50 142.5t58 201.5q33 62 100 160t67 117q0 7 -16 7q-85 0 -361 -365l-28 17q98 129 134 173q85 103 155 160t133 57q119 0 119 -152q0 -113 -107 -298.5t-107 -207.5q0 -34 51 -34q114 0 295 174 q-71 46 -71 150q0 154 116 288q69 80 128 80q76 0 76 -100t-65 -217q-37 -67 -133 -192q20 -5 37 -5q57 0 109 45q25 22 80 91l26 -17q-58 -74 -91 -101q-57 -48 -123 -48zM864 508q0 34 -35 34q-66 0 -128 -77t-62 -144t53 -105q172 205 172 292z" />
+<glyph unicode="&#x1d4cc;" horiz-adv-x="1354" d="M1188 173q-32 0 -65 12q-181 -199 -326 -199q-78 0 -128.5 57.5t-50.5 136.5q0 106 105 308l-169 -232q-105 -138 -182 -198t-143 -60t-102.5 43t-36.5 107q0 124 219 486q-108 -98 -282 -331l-27 17q56 75 173 219q52 59 157 157l270 15q-204 -294 -333 -562 q-38 -79 -38 -98t24 -19q143 0 569 664l272 15q-75 -106 -208.5 -353t-133.5 -313q0 -27 45 -27q123 0 299 186q-54 45 -54 142q0 137 95 272q77 109 146 109q74 0 74 -93q0 -163 -213 -424q21 -7 43 -7q71 0 174 129l27 -17q-56 -72 -85 -96q-54 -46 -115 -46zM1289 525 q0 33 -33 33q-50 0 -111.5 -74.5t-61.5 -167.5q0 -55 34 -88q51 58 111.5 154t60.5 143z" />
+<glyph unicode="&#x1d4cd;" horiz-adv-x="902" d="M953 610q0 -86 -88 -86q-58 0 -81 48q-1 3 -6.5 33t-13.5 30q-25 0 -83 -91.5t-86 -149.5v-20q0 -65 -26 -174.5t-26 -136.5q0 -40 34 -40q70 0 184 125q36 39 148 184l26 -17l-14 -19q-136 -185 -214.5 -247.5t-154.5 -62.5q-154 0 -200 267q-144 -267 -262 -267 q-45 0 -79.5 30.5t-34.5 75.5q0 93 96 93q57 0 82 -47.5t34 -47.5q40 0 160 226q8 100 29.5 206.5t21.5 126t-22 19.5q-75 0 -351 -365l-26 17q133 176 186 234q143 156 236 156q134 0 169 -244q136 244 255 244q45 0 76 -27.5t31 -72.5z" />
+<glyph unicode="&#x1d4ce;" horiz-adv-x="1122" d="M216 -442q-55 0 -100 26t-45 77q0 92 171 187q60 32 256 112l222 454q-140 -194 -193 -255q-155 -178 -252 -178q-65 0 -99 49t-34 116q0 106 71 230q45 78 124 172.5t79 107.5t-21 13q-89 0 -367 -369l-28 17q296 393 412 393q57 0 90.5 -46.5t33.5 -106.5 q0 -90 -70 -215q-39 -69 -120 -180.5t-81 -131.5q0 -16 22 -16q111 0 436 458q45 64 132 215l256 19q-68 -114 -195 -345l-174 -347q24 8 71 25q135 56 316 290l27 -17q-200 -257 -367 -315l-67 -22q-220 -417 -506 -417zM136 -356q0 -25 21.5 -41t46.5 -16q127 0 277 333 q-345 -160 -345 -276z" />
+<glyph unicode="&#x1d4cf;" horiz-adv-x="880" d="M892 710q37 0 37 -38.5t-48 -102.5q-73 -97 -218 -174q-97 -159 -196 -232q96 -40 122 -99q121 36 298 265l27 -18q-185 -238 -311 -277q18 -55 18 -107q0 -162 -137 -265.5t-305 -103.5q-37 0 -62 32.5t-25 70.5q0 103 143 221q115 94 239 144q7 27 7 47q0 45 -35 72 q-77 -56 -102 -69q-57 -31 -117.5 -31t-60.5 48q0 43 74 69q56 19 104 19t94 -8q96 76 179 212q-84 -23 -144.5 -23t-108 32.5t-47.5 86.5t33.5 115.5t33.5 66.5t-6 5q-74 0 -352 -368l-26 18l156 201q158 191 266.5 191t108.5 -105q0 -53 -44.5 -120t-44.5 -73 q0 -18 54 -18t137 19q183 297 259 297zM142 -340q0 -65 37 -65q74 0 174 163q74 122 112 234q-323 -181 -323 -332z" />
+<glyph unicode="&#x1d4d0;" horiz-adv-x="1567" d="M1551 70q0 -25 -53 -58q-116 -71 -189.5 -71t-97.5 65q-43 119 -61 318h-400q-126 0 -133 2q-282 -424 -403 -424q-65 0 -122.5 49t-57.5 113q0 31 23 92t48 61l5 -1q5 -3 9 -19q11 -47 57.5 -80.5t96.5 -33.5q90 0 334 360q289 426 495 868h11v12q0 29 58.5 63t82.5 34 t28 -13q-1 3 -1 -89q0 -983 97 -1222q19 -46 59 -46q9 0 42.5 16t52.5 16t19 -12zM759 433h381q-29 366 -29 753q-190 -398 -445 -789q48 36 93 36z" />
+<glyph unicode="&#x1d4d1;" horiz-adv-x="1309" d="M706 694l-100 -10q-18 0 -18 13q0 27 69 68q19 11 151.5 58t169.5 67q161 86 161 217q0 81 -58.5 126.5t-141.5 45.5q-341 0 -558 -833q-70 -268 -157 -405q-19 -30 -65.5 -57.5t-72.5 -27.5t-26 9.5t3 15.5q109 223 151 389q107 429 171 885q-85 -48 -111 -48t-26 12 q0 31 126.5 99.5t165.5 68.5q19 0 19 -14q0 -6 -11 -83l-34 -213q232 310 554 310q97 0 168 -52t71 -145q0 -223 -387 -394q135 -23 223.5 -107.5t88.5 -216.5q0 -223 -241 -378q-213 -137 -449 -137q-77 0 -169 36.5t-116 97.5q2 28 60 63t80 35t35 -15l25 -28 q87 -81 217 -81q168 0 279 79.5t111 231.5t-106.5 235t-251.5 83z" />
+<glyph unicode="&#x1d4d2;" horiz-adv-x="1049" d="M1124 1264q0 -49 -39.5 -147t-67 -137.5t-73 -66.5t-71.5 -27t-26 13l55 113q55 114 55 167q0 99 -113 99q-401 0 -546 -569q-30 -117 -30 -229q0 -178 78 -291q90 -129 261 -129q140 0 238 121l42 59q21 29 67 56t71.5 27t25.5 -10t-4 -16q-90 -145 -253 -245t-337 -100 t-272 135q-86 119 -86 309q0 119 31 237q85 323 295 528q233 227 549 227q150 0 150 -124z" />
+<glyph unicode="&#x1d4d3;" horiz-adv-x="1442" d="M1304 1248q202 -117 202 -364.5t-183 -461.5q-164 -193 -425 -307.5t-506 -114.5h-219q-18 0 -18 12q0 47 121 93q225 554 270 1130q-241 -4 -312 -120q-7 -21 -24 -61q-17 -31 -66 -62t-75.5 -31t-27.5 11q24 60 53 115q82 119 260 187.5t342 68.5h185q260 0 423 -95z M1338 804q0 228 -190 340q-154 91 -399 91h-42q-57 -563 -294 -1127h108q278 0 494 135q236 148 302 404q21 82 21 157z" />
+<glyph unicode="&#x1d4d4;" horiz-adv-x="1068" d="M1144 1256q0 -103 -102 -163q-50 -29 -74 -29t-24 13q0 3 16 36t16 58q0 107 -182 107q-246 0 -297 -205q-7 -28 -7 -55q0 -114 116 -175q93 -49 218 -49q19 0 19 -13q0 -27 -60 -62t-91 -35q-155 0 -271.5 -96t-152.5 -248q-7 -29 -7 -56q0 -107 98 -167 q83 -52 190.5 -52t170.5 41.5t133 135.5q22 29 68.5 55t71 26t24.5 -12q0 -5 -6 -14q-94 -142 -259 -241t-328 -99q-128 0 -222 56q-111 66 -111 186q0 29 9 64q35 139 149.5 259.5t255.5 190.5q-183 65 -183 220q0 183 215 326q194 129 387 129q220 0 220 -132z" />
+<glyph unicode="&#x1d4d5;" horiz-adv-x="1504" d="M1611 1269q0 -14 -3 -23q-9 -28 -63 -60t-78 -32t-25 11q1 -9 1 22q0 48 -124 48h-360q-60 -268 -153 -531h489q20 0 20 -10q0 -39 -57 -78.5t-98 -39.5q-21 0 -18 20h-378q-97 -248 -200 -448q-60 -115 -201 -184q-37 -18 -59 -18q-6 0 -11 1q-23 -12 -43 -12 q-181 0 -233 153q0 1 -1 4q0 28 59.5 62.5t90.5 34.5q15 0 24 -19l17 -36q54 -86 169 -89q9 10 24 39q295 584 407 1151q-234 -5 -307 -116q-7 -11 -28 -65q-11 -30 -63.5 -61.5t-78.5 -31.5t-26 16q0 29 39 90q83 130 262.5 203t353.5 73h494q158 0 158 -74z" />
+<glyph unicode="&#x1d4d6;" horiz-adv-x="1146" d="M1228 1256q0 -48 -46 -128q-117 -199 -229 -199q-19 0 -19 14q0 4 63 92.5t63 135.5q0 107 -210 107q-403 0 -526 -480q-23 -90 -23 -179q0 -155 71 -257q82 -118 230 -118q107 0 198 73.5t142 179.5q15 46 49 136q12 31 63 62t77.5 31t26.5 -17q0 -21 -57 -227 q-198 -716 -632 -716q-190 0 -315 86q-5 3 -5 10q0 29 58 63t90 34q7 0 14 -4q144 -81 291 -81q164 0 300 439q-206 -180 -427 -180q-169 0 -255.5 114t-86.5 289q0 99 24 188q78 289 303 476.5t519 187.5q249 0 249 -132z" />
+<glyph unicode="&#x1d4d7;" horiz-adv-x="1582" d="M1609 1331q0 -6 -3 -12q-162 -325 -239 -555q-107 -318 -107 -592q0 -156 88 -156q45 5 47 6t11.5 30t64 61t80 32t25.5 -12l-2 -5q-30 -90 -142.5 -155t-206 -65t-119.5 69q-15 39 -15 143q0 230 116 586q-40 -22 -67 -22h-532q-64 -232 -152 -475q-18 -56 -62 -164 q-14 -29 -64 -58.5t-76 -29.5t-26 10q0 4 2 9q141 350 244 763q66 266 66 410q0 36 -24 61t-60 25q-171 0 -222 -111q-7 -24 -24 -70q-13 -30 -66.5 -61.5t-77.5 -31.5t-25 11q26 66 47 109q73 122 211.5 192t287.5 70q122 0 122 -110q0 -144 -78 -460q39 21 67 21h540 q116 316 207 465q17 29 65 57t73.5 28t25.5 -13z" />
+<glyph unicode="&#x1d4d8;" horiz-adv-x="1213" d="M1300 1331q0 -28 -57.5 -62t-91.5 -34h-235q-69 -61 -186 -526q-61 -242 -91 -321q-66 -178 -175 -280h357q36 0 46 9t24.5 43.5t65 65t77.5 30.5t28 -11q-44 -110 -161.5 -177.5t-235.5 -67.5h-647q-17 0 -17 12q0 29 69 69q46 27 80 27h175q82 0 172 284q18 57 98 378 t216 465h-192q-250 0 -310 -57q-17 -16 -37 -65q-13 -31 -64 -62t-74.5 -31t-28.5 6v10q0 38 46 103q145 204 642 204h489q18 0 18 -12z" />
+<glyph unicode="&#x1d4d9;" horiz-adv-x="1454" d="M1559 1332q0 -29 -57.5 -63t-89.5 -34q-134 0 -274 -398q-31 -87 -152 -531q-59 -214 -248.5 -377t-405.5 -163q-140 0 -236 80t-96 217q0 64 14 93t65 59.5t76 30.5t26 -11q-13 -22 -13 -86q0 -123 84.5 -199t212.5 -76t230 116q86 98 124 240l55 227q148 580 382 778 h-272q-241 0 -344 -192l-39 -99q-13 -32 -63 -62.5t-77.5 -30.5t-27.5 12q0 1 1 4q60 200 263.5 338t418.5 138h425q18 0 18 -11z" />
+<glyph unicode="&#x1d4da;" horiz-adv-x="1345" d="M1319 1189l5 34q0 81 -67 81q-103 0 -366.5 -173t-292.5 -266q-3 -10 -3 -27q0 -147 165.5 -473t289.5 -326q168 0 237 109q8 19 26 58q30 61 92 61q25 0 25 -16q0 -4 -1 -7q-35 -128 -171.5 -207.5t-278.5 -79.5q-152 0 -334 346q-167 318 -167 492q0 92 168 232.5 t378 250.5t303 110q114 0 114 -117q0 -57 -49 -87q-28 -17 -50.5 -17t-22.5 22zM559 1375q0 -218 -75.5 -519t-164.5 -562q-29 -90 -92 -249q-14 -29 -65 -59t-77 -30t-26 12q0 6 15 46l73 198q219 623 240 1043q-102 -48 -120.5 -48t-18.5 12q0 33 127.5 100.5t164.5 67.5 q19 0 19 -12z" />
+<glyph unicode="&#x1d4db;" horiz-adv-x="1148" d="M1230 276q0 -1 -1 -4q-37 -123 -165.5 -219t-244.5 -96t-313.5 56t-300.5 56q-94 -113 -183 -113q-19 0 -19 11t76 96q120 133 184 385q24 103 82 306q209 634 653 634q78 0 120 -52.5t42 -119.5t-10.5 -97.5t-74.5 -67t-90.5 -36.5t-27.5 9q11 28 11 85.5t-33 107 t-96 49.5q-138 0 -257 -300q-52 -131 -128 -426q-53 -205 -160 -360q36 9 68 9q104 0 304 -56t304 -56q29 0 47 39l23 63q11 32 74 69.5t89.5 37.5t26.5 -10z" />
+<glyph unicode="&#x1d4dc;" horiz-adv-x="2115" d="M2147 70q0 -37 -94 -82t-138 -45q-77 0 -93 70q-9 41 -9 134q0 300 97 873l-529 -615q-180 -201 -319 -328q-11 -10 -19.5 -10t-14.5 8q-172 243 -317 1032q-68 -316 -187 -635q-213 -570 -345 -570q-48 0 -111.5 27.5t-63.5 64.5t23.5 95.5t49.5 60.5q77 -67 156 -67 q61 0 143 175q27 58 111 284q113 303 175 681q3 28 13 81q8 30 51.5 56.5t75.5 26.5q20 0 28 -38l6 -57q17 -102 36 -197q114 -573 238 -834q153 145 318 332l617 724q57 70 67 70q14 0 14 -21.5t-15 -83.5t-56.5 -321.5t-57.5 -441.5t-16 -279.5t9 -137.5q11 -50 53 -51 q51 32 77.5 32t26.5 -13z" />
+<glyph unicode="&#x1d4dd;" horiz-adv-x="1859" d="M1977 1523q15 0 15 -31t-24 -90t-50 -59q-199 0 -290 -80l1 -1l-94 -318q-122 -442 -229 -914l-2 6q-5 -29 -48 -56.5t-74 -27.5q-17 0 -70 84q-98 156 -167 326q-143 354 -272 775q-58 -340 -167 -694q-166 -541 -314 -541q-48 0 -113.5 26.5t-65.5 67.5q0 32 23.5 93 t49.5 61q-8 0 51 -33.5t113.5 -33.5t112.5 134q19 42 65 186q151 465 196 901q3 28 48 55.5t68 27.5t27 -10l27 -94q126 -426 294 -842q73 -180 171 -333q269 1196 395 1318q101 97 323 97z" />
+<glyph unicode="&#x1d4de;" horiz-adv-x="1467" d="M1532 949q0 -123 -31 -240q-80 -299 -347 -525.5t-569 -226.5q-222 0 -344 149.5t-122 376.5q0 270 161 507.5t411 367.5q54 28 76.5 28t22.5 -11q0 -20 -58 -59l-102 -69q-160 -120 -251.5 -300.5t-91.5 -385.5t111.5 -350.5t325 -145.5t382.5 169.5t228 398.5 q30 117 30 231q0 171 -69 282q-83 132 -241 132t-281 -259q-9 -25 -32 -72q-18 -31 -65.5 -60t-74.5 -29t-27 13q0 5 1 7q78 204 233 347q176 163 364.5 163t280.5 -135q79 -116 79 -304z" />
+<glyph unicode="&#x1d4df;" horiz-adv-x="1346" d="M1442 1032q0 -36 -11 -79q-60 -234 -317 -392t-512 -158q-19 0 -19 12q0 29 58 62.5t90 33.5q191 0 340.5 94.5t192.5 270.5q10 41 10 71q0 151 -167 229q-128 59 -299 59h-102q-50 -452 -207 -924q-39 -124 -120 -321q-17 -30 -65.5 -59t-74.5 -29t-26 10q0 2 3 9 q272 675 330 1314q-234 -4 -305 -111l-31 -70q-14 -30 -65 -61.5t-77 -31.5t-27 11q24 60 53 115q83 119 260 187.5t342 68.5h244q187 0 323 -63q179 -83 179 -248z" />
+<glyph unicode="&#x1d4e0;" horiz-adv-x="1499" d="M1360.5 25q47.5 30 75.5 30t28 -17.5t-27 -62.5q-55 -91 -169 -156t-220 -65q-148 0 -425 95.5t-425 95.5q-17 0 -17 14q0 27 59.5 61.5t89.5 34.5h26q290 0 424 47q216 76 353.5 281t137.5 437q0 192 -103.5 325t-290.5 133q-228 0 -398.5 -198.5t-170.5 -429.5 q0 -144 81 -241.5t222 -97.5q94 0 172 39.5t99.5 39.5t21.5 -13q0 -22 -66 -64q-177 -112 -346.5 -112t-260.5 102t-91 261q0 304 280 564t589 260q204 0 317 -137t113 -346q0 -319 -235 -577q-213 -233 -536 -338l251 -84q145 -43 260 -43q62 0 82 25l36 75q16 32 63.5 62z " />
+<glyph unicode="&#x1d4e1;" horiz-adv-x="1560" d="M1647 243q0 -6 -5 -13q-78 -115 -206.5 -194t-259.5 -79q-100 0 -182 150l-129 280q-76 150 -158 150q-18 0 -18 12q0 26 60.5 62t89.5 36q155 0 271.5 74t151.5 217q11 46 11 76q0 221 -475 221h-92q-43 -431 -196 -884q-35 -109 -116 -306q-16 -30 -65 -59t-75 -29 t-26 10q0 4 2 9q262 625 316 1259q-242 -5 -310 -119q-8 -21 -24.5 -56.5t-67 -67t-76.5 -31.5t-27 11q24 60 53 115q84 120 260.5 188t341.5 68h233q512 0 512 -246q0 -171 -160 -322q-135 -127 -320 -191q50 -56 99 -166l95 -214q75 -139 152 -139q89 0 139 58 q75 89 113 111t63 22t25 -13z" />
+<glyph unicode="&#x1d4e2;" horiz-adv-x="1248" d="M1270 1198q0 -102 -83 -150q-50 -29 -74.5 -29t-24.5 17q0 1 7 30.5t7 45.5q0 69 -52 105q-89 61 -226 61q-222 0 -265 -175q-7 -28 -7 -54q0 -151 238 -259q157 -71 226 -126q118 -95 118 -217q0 -210 -249 -359q-218 -131 -444 -131q-253 0 -364 176q-32 51 -32 110 q0 157 154 247q46 27 72 27t26 -12q0 -22 -49 -55q-34 -64 -34 -120t28 -100q106 -165 328 -165q329 0 387 234q9 36 9 64q0 113 -114 203q-66 52 -215 120q-253 116 -253 284t205 300q183 118 352.5 118t268.5 -67q60 -41 60 -123z" />
+<glyph unicode="&#x1d4e3;" horiz-adv-x="1463" d="M1568 1400q0 -29 -54 -73q-85 -69 -164.5 -86.5t-364.5 -17.5q-44 -110 -110.5 -381t-115.5 -399q-82 -211 -204 -321h280q17 0 17 -11q0 -27 -71 -69t-102 -42h-439q-17 0 -17 11q0 29 71.5 70t104.5 41q123 0 252 503q77 302 80 312q62 220 108 286h-428 q-88 0 -148 -164q-5 -18 -17.5 -51.5t-76.5 -71t-99 -37.5q-11 0 -15 5v10q0 24 39 99q74 141 200.5 235.5t273.5 94.5h708q97 0 140 6q91 62 135 62q17 0 17 -11z" />
+<glyph unicode="&#x1d4e4;" horiz-adv-x="1337" d="M1329.5 1314.5q49.5 29.5 76 29.5t26.5 -8t-87.5 -248t-201.5 -694q-43 -171 -43 -289q0 -42 40 -52q47 29 73.5 29t26.5 -12q0 -35 -90.5 -80t-129.5 -45q-89 0 -89 72q0 124 39 289q11 47 78 283q-174 -245 -352 -405q-253 -227 -461 -227q-97 0 -144 66.5t-47 167.5 q0 130 120 414l122 282q81 200 81 274t-56 74q-51 0 -107 -34t-81.5 -34t-25.5 13q0 20 45 53q149 110 302 110q97 0 97 -92q0 -79 -80 -271l-121 -272q-128 -299 -128 -432q0 -85 37.5 -148t117.5 -63q125 0 349 252q154 173 286 377.5t187 341.5q21 75 76 219 q15 30 64.5 59.5z" />
+<glyph unicode="&#x1d4e5;" horiz-adv-x="1214" d="M1301 1116q0 -54 -16 -114q-127 -477 -776 -996q-7 -28 -49.5 -55t-65 -27t-25.5 5.5t-4 10.5v7q0 9 8.5 43t27.5 211t19 349q0 696 -328 696q-21 0 -21 14q0 26 49 54.5t77 28.5q368 0 368 -717q0 -215 -32 -459q214 173 392 366q239 259 286 433q3 11 3 29 q0 73 -50 120t-124 47q-14 0 -14 31t23.5 90.5t49.5 59.5q96 0 149 -64.5t53 -162.5z" />
+<glyph unicode="&#x1d4e6;" horiz-adv-x="2033" d="M2041 1137q0 -360 -542 -1042q-147 -185 -163 -185t-17 30q-23 668 -186 1199q-264 -519 -628 -991l-179 -221q-15 -17 -29 -17q-10 0 -10 26.5t15 73.5q94 295 94 644q0 592 -304 592q-21 0 -21 14q0 26 49 54.5t77 28.5q326 0 326 -594q0 -223 -45 -501 q370 470 625 975q-11 33 -11 38q0 25 47.5 53.5t75.5 28.5q21 0 32 -34t19 -63q166 -553 193 -1067q162 196 298 403q197 301 197 431q0 149 -127 149q-13 0 -13 30.5t22.5 90.5t48.5 60q80 0 118 -60.5t38 -145.5z" />
+<glyph unicode="&#x1d4e7;" horiz-adv-x="1418" d="M1519 1234q0 -32 -6 -54q-33 -123 -604 -465l35 -371q22 -236 130 -236q132 96 172 96q13 0 17 -7q-20 -88 -121 -142.5t-197 -54.5t-135 88q-24 52 -35 170l-33 359q-240 -142 -296 -178q-226 -145 -241 -199q-6 -22 -6 -46q0 -86 59 -86q19 0 19 -11q0 -28 -58.5 -62.5 t-90.5 -34.5q-97 0 -97 108q0 29 7 55q36 132 698 520l-32 315q-23 237 -129 237l-81 -61q-52 -35 -92 -35q-18 0 -18 15.5t21 49.5q39 62 129.5 100.5t177.5 38.5t126 -89q23 -51 35 -169l30 -303q181 108 246 151q186 123 198 175q4 17 4 40q0 87 -61 87q-17 0 -17 12 q0 28 59 62t90 34q97 0 97 -109z" />
+<glyph unicode="&#x1d4e8;" horiz-adv-x="1397" d="M1410 1117q0 -53 -14 -108q-122 -485 -604 -950q-109 -105 -228 -195q-172 -129 -251 -129q-208 0 -250 210q-1 5 -1 22.5t20 63t44 45.5q9 0 13 -21q35 -171 219 -171q86 0 297 173q12 142 12 304q0 885 -393 885q-16 -25 -52.5 -46t-62 -21t-25.5 13q0 8 10 21 q42 54 109.5 92t131.5 38q258 0 362 -349q65 -218 65 -560q0 -120 -8 -243q170 167 326 390q201 288 201 446q0 73 -46.5 119.5t-119.5 46.5q-16 0 -16 30t19 75t43 45q94 0 146.5 -65t52.5 -161z" />
+<glyph unicode="&#x1d4e9;" horiz-adv-x="1348" d="M1444 1332q0 -6 -12 -21q-202 -250 -491 -536q165 -3 165 -64q0 -28 -33.5 -51.5t-62.5 -23.5q-21 0 -21 26.5t-135 27.5q-294 -284 -574 -523q43 8 118.5 8t294.5 -26.5t330 -26.5q7 0 19 9q38 28 56 77l33 94q13 32 77 69.5t89.5 37.5t26.5 -10q-197 -399 -458 -399 q-111 0 -330 27.5t-330 27.5q-47 0 -102.5 -27.5t-76.5 -27.5t-21 11q0 14 32 42l704 637h-208q-24 0 -24 17q0 25 34 46.5t60 21.5h223q195 198 369 401q-29 -8 -81 -8t-202.5 27.5t-232.5 27.5t-113.5 -20.5t-64.5 -103.5q-13 -33 -75.5 -70t-89 -37t-28.5 10q16 39 46 95 q72 104 215 175t272 71q77 0 227.5 -27t226.5 -27l4 -2q76 57 127 57q17 0 17 -12z" />
+<glyph unicode="&#x1d4ea;" horiz-adv-x="1241" d="M1020 58q-166 0 -166 275q0 52 5 155q-98 -202 -242 -345t-243 -143t-147 91q-38 72 -38 175q0 240 145 422t336 182q116 0 250 -72q20 71 163 71q8 0 29 -1q-102 -158 -102 -502q0 -167 79 -167q105 0 283 197q121 134 225 294l60 -42q-142 -254 -324 -422t-313 -168z M895 672q-158 104 -270 104t-196.5 -139.5t-84.5 -334.5q0 -155 101 -155q76 0 242 224z" />
+<glyph unicode="&#x1d4eb;" horiz-adv-x="1030" d="M1148 534q-74 0 -145 20q11 -38 11 -77q0 -189 -132.5 -333t-319.5 -144q-130 0 -215 78t-85 207q0 88 34 261l128 650q-36 -7 -66 -7q-165 0 -164 171q51 -48 153 -48t261 49l-180 -906q-18 -91 -18 -170.5t47 -141.5t132 -62q133 0 215 124q73 109 73 249q0 77 -25 149 q-77 26 -137 68q-82 57 -82 117q0 29 21 68q206 -16 314 -179q101 -48 211 -48t228 69l39 -62q-134 -102 -298 -102z" />
+<glyph unicode="&#x1d4ec;" horiz-adv-x="896" d="M533 -22q-154 0 -243 103.5t-89 259.5q0 214 158 371.5t373 157.5q71 0 126 -24q72 -33 72 -94q0 -87 -144 -126q8 18 8 35q0 124 -133 124q-113 0 -209 -128t-96 -279q0 -114 60 -196.5t170 -82.5q282 0 660 585l65 -39q-151 -253 -325 -427q-241 -240 -453 -240z" />
+<glyph unicode="&#x1d4ed;" horiz-adv-x="1236" d="M986 0q-154 0 -154 249q0 110 18 219q-94 -169 -200 -291q-156 -177 -282 -177q-94 0 -141 90q-38 72 -38 175q0 241 144 423t335 182q115 0 248 -72l83 412q-66 -14 -125 -14t-90 37t-47 114q56 -37 185 -37t258 51l-167 -838q-28 -141 -28 -240q0 -132 75 -132 t244 170.5t285 362.5l63 -40q-137 -251 -340.5 -447.5t-325.5 -196.5zM891 672q-157 104 -268 104t-195 -140t-84 -334q0 -155 101 -155q74 0 241 224q46 61 205 301z" />
+<glyph unicode="&#x1d4ee;" horiz-adv-x="917" d="M488 0q-144 0 -221 92.5t-77 239.5q0 216 140.5 377t353.5 161q92 0 155 -47t63 -136q0 -136 -164.5 -242t-380.5 -106v-5q0 -220 190 -220q194 0 416 201q170 155 304 370l67 -36q-134 -249 -349 -433q-254 -216 -497 -216zM753 697q0 97 -87 97q-121 0 -210 -135 q-73 -111 -92 -247q138 7 252 76q137 83 137 209z" />
+<glyph unicode="&#x1d4ef;" horiz-adv-x="567" d="M337 -28q-19 -96 -19 -154.5t19 -93.5q-75 -25 -117 -25q-63 0 -63 72q0 58 25 183l135 675h-16q-115 0 -199 -56q20 109 75 136q32 15 158 15q39 197 60 264q47 148 129 233q136 140 308 140q56 0 108.5 -26.5t52.5 -75.5t-99 -105q-27 118 -125 118q-131 0 -208 -218 q-25 -74 -75 -330h298q150 0 237 20q-34 -77 -82 -99q-36 -16 -472 -16z" />
+<glyph unicode="&#x1d4f0;" horiz-adv-x="1119" d="M448 -442q-103 0 -172 39q-85 48 -85 143q0 132 247 280l365 189l26 271q-66 -135 -203 -259.5t-265 -124.5q-86 0 -137 58.5t-51 145.5q0 211 160.5 390.5t350.5 179.5q99 0 211 -56q10 65 40 89.5t152 34.5q-62 -129 -124 -621q313 161 508 373l63 -40 q-186 -230 -576 -450q-9 -127 -16 -186q-25 -233 -208 -363q-130 -93 -286 -93zM868 679q-99 106 -215.5 106t-216.5 -142t-100 -302q0 -113 83 -113q101 0 256 179q117 134 193 272zM350 -252q0 -106 153 -106q292 0 292 466l-264 -150q-181 -118 -181 -210z" />
+<glyph unicode="&#x1d4f1;" horiz-adv-x="1175" d="M1054 62q-129 0 -162 175q-4 23 -18 326q-8 175 -77 175q-111 0 -286.5 -309.5t-175.5 -370.5q0 -21 14 -38q-38 -20 -90 -20q-68 0 -68 61q0 54 17 123l31 132l178 889q-51 -19 -104 -19q-149 0 -148 175q73 -55 171 -55q136 0 262 55l-125 -633q-32 -123 -89 -372 q228 514 466 514q128 0 164 -157q16 -66 16 -257q0 -257 71 -257q76 0 234 204q101 130 192 281l63 -35q-126 -251 -280.5 -419t-255.5 -168z" />
+<glyph unicode="&#x1d4f2;" horiz-adv-x="695" d="M443 898q-32 0 -32 44t19 90h11q54 0 151.5 53t146.5 99q-32 -101 -121 -177q-127 -109 -175 -109zM444 0q-88 0 -140 57.5t-52 146.5q0 31 35 201t35 248q0 43 -26 72q90 22 125 22q57 0 57 -76t-37 -251t-37 -211q0 -95 80 -95q121 0 317 229q134 156 246 341l64 -39 q-135 -236 -279 -400q-215 -245 -388 -245z" />
+<glyph unicode="&#x1d4f3;" horiz-adv-x="447" d="M444 898q-31 0 -31 45.5t17 88.5h11q53 0 152 53.5t147 98.5q-32 -101 -121 -177q-127 -109 -175 -109zM470 667q0 -51 -23 -168l-79 -402q-52 -264 -141 -373q-136 -166 -307 -166q-56 0 -113 26.5t-57 77.5t101 121q-3 -18 -3 -26q0 -49 33.5 -87t81.5 -38 q123 0 189 186q19 54 66 290l57 289q38 193 38 246.5t-25 81.5q92 22 124 22q58 0 58 -80z" />
+<glyph unicode="&#x1d4f4;" horiz-adv-x="1017" d="M869 77q-111 0 -243.5 127.5t-199.5 251.5q-55 -270 -55 -331.5t19 -97.5q-78 -27 -117 -27q-63 0 -63 72q0 58 25 184l187 945q-70 -26 -120 -26q-90 0 -90 81q0 29 16 94q55 -55 147 -55t229 66l-170 -863q90 109 216 221q170 151 247 151q38 0 82 -103 q-87 -10 -214 -87.5t-203 -152.5q193 -305 336 -305q64 0 134 49.5t173 181t164 233.5l65 -37q-106 -196 -237 -350q-187 -222 -328 -222z" />
+<glyph unicode="&#x1d4f5;" horiz-adv-x="637" d="M450 0q-98 0 -149 74.5t-51 176.5q0 57 24 178l152 767q-29 -5 -53 -5q-176 0 -175 165q92 -52 207.5 -52t201.5 57l-177 -921q-24 -125 -24 -171q0 -128 94 -128q89 0 182 100t309 445l61 -42q-120 -229 -249 -392q-199 -252 -353 -252z" />
+<glyph unicode="&#x1d4f6;" horiz-adv-x="1685" d="M1520 0q-158 0 -158 207q0 88 36.5 259t36.5 202.5t-34 31.5q-84 0 -287 -312.5t-203 -357.5q0 -6 3 -15q-60 -16 -72 -16q-72 0 -72 70q0 20 24 124l49 242q35 171 35 217t-37 46q-82 0 -243.5 -295.5t-161.5 -351.5q0 -16 13 -32q-42 -19 -77 -19q-80 0 -80 87 q0 8 25.5 231.5t25.5 313t-38 133.5q89 33 125 33q68 0 68 -81q0 -30 -18 -209l-22 -219q274 581 487 581q93 0 93 -134q0 -47 -41 -258l-45 -232q100 210 218 374q179 250 312 250q116 0 116 -136q0 -86 -40 -252t-40 -255.5t66 -89.5q147 0 452 548l64 -36 q-332 -649 -580 -649z" />
+<glyph unicode="&#x1d4f7;" horiz-adv-x="1265" d="M1139 20q-129 0 -161 185q-6 33 -15 344q-6 185 -72 185q-96 0 -326 -404q-130 -229 -130 -275q0 -19 10 -36q-42 -19 -75 -19q-78 0 -78 87q0 41 24 256t24 294t-37 128q96 35 131 35q59 0 59 -87q0 -52 -15 -205l-21 -214q271 576 488 576q124 0 156 -185 q4 -24 17 -344q7 -185 72.5 -185t149 102t275.5 424l64 -37q-330 -625 -540 -625z" />
+<glyph unicode="&#x1d4f8;" horiz-adv-x="1051" d="M1217 549q-89 0 -193 34q2 -16 2 -31q0 -214 -145.5 -383t-356.5 -169q-156 0 -252 99.5t-96 265.5t123.5 297.5t297.5 131.5q30 0 55 -6q-19 31 -19 63t25 65q188 -15 311 -190q129 -88 266 -88q88 0 192 61l39 -64q-123 -86 -249 -86zM869 528q0 65 -19 121 q-62 19 -117 62q-31 7 -65 7q-139 0 -235.5 -120.5t-96.5 -263.5q0 -103 58 -175.5t159 -72.5q130 0 223 129t93 313z" />
+<glyph unicode="&#x1d4f9;" horiz-adv-x="959" d="M1038 548q0 -212 -146.5 -370t-357.5 -158q-110 0 -185 48l-46 -237q-19 -98 -19 -154.5t20 -93.5q-75 -25 -118 -25q-63 0 -63 72q0 49 26 181l212 1077q-62 -13 -123 -13t-91 36.5t-47 113.5q58 -38 184 -38t259 53l-59 -296q130 126 263.5 126t212 -95.5t78.5 -226.5z M887 484q0 103 -48.5 183t-151 80t-226.5 -120l-88 -441q76 -90 189 -90q146 0 235.5 119t89.5 269z" />
+<glyph unicode="&#x1d4fa;" horiz-adv-x="997" d="M875 -169q-19 -95 -19 -153t20 -95q-75 -25 -118 -25q-63 0 -63 72q0 55 25 181l131 659q-264 -470 -484 -470q-93 0 -141 92q-37 72 -37 175q0 239 145 421t335 182q113 0 247 -72q22 70 195 70q-44 -74 -65 -178zM891 672q-158 104 -268.5 104t-194.5 -140t-84 -334 q0 -155 101 -155q75 0 242 224q13 18 204 301z" />
+<glyph unicode="&#x1d4fb;" horiz-adv-x="848" d="M1066 788q0 -55 -116 -143q-28 60 -82 60q-99 0 -249 -206q-78 -107 -157 -253q-74 -135 -74 -209q0 -6 1 -12q-51 -25 -83 -25q-79 0 -79 69q0 38 27 162l49 234q25 128 25 223q0 43 -26 74q78 27 132 27t54 -67q0 -46 -14 -106l-25 -115l-43 -224q111 215 228 364 q181 229 329 229q39 0 71 -22.5t32 -59.5z" />
+<glyph unicode="&#x1d4fc;" horiz-adv-x="673" d="M684 178q0 -123 -100.5 -206.5t-226.5 -83.5q-68 0 -127 35.5t-59 99.5q0 113 324 267q-88 141 -110 182q-63 120 -63 197q0 146 169 234q105 -38 105 -100q0 -87 -133 -165l155 -284q230 137 409 343l61 -39q-163 -218 -430 -368q26 -57 26 -112zM504.5 17 q41.5 46 41.5 102.5t-18 101.5q-226 -121 -226 -188q0 -62 92 -62q69 0 110.5 46z" />
+<glyph unicode="&#x1d4fd;" horiz-adv-x="689" d="M935 833h-429q-106 -347 -106 -519.5t129 -172.5q71 0 146.5 56.5t107.5 124.5q21 -36 21 -64q0 -76 -127 -167t-231 -91t-161 99q-47 83 -47 197.5t38 270.5l74 266h-130q-77 0 -129 -24q39 74 69 99t103 25h117q40 140 71 183q55 74 174 74q19 0 36 -1 q-59 -77 -123 -256h404q106 0 162 27q-19 -80 -53.5 -103.5t-115.5 -23.5z" />
+<glyph unicode="&#x1d4fe;" horiz-adv-x="1224" d="M1066 43q-175 0 -175 305q0 74 5 144q-83 -171 -190 -304q-152 -188 -279 -188q-88 0 -138 61.5t-50 151.5q0 127 82 443q22 85 22 110t-15 50l106 1q69 0 69 -52q0 -33 -54 -220.5t-54 -297.5t78 -110q126 0 324 318q161 259 161 368q0 15 -9 29q62 18 107 18 q67 0 67 -41q0 -8 -42 -171t-42 -320t81 -157q181 0 456 505l64 -38q-314 -605 -574 -605z" />
+<glyph unicode="&#x1d4ff;" horiz-adv-x="885" d="M1019 716q0 -67 -130 -270q-174 -271 -267 -370q-30 -31 -66.5 -51t-133.5 -26q17 65 17 117q0 183 -76.5 410.5t-191.5 352.5q65 34 119 34q85 0 171 -221.5t123 -533.5q294 373 320 661q115 -43 115 -103z" />
+<glyph unicode="&#x1d500;" horiz-adv-x="1313" d="M1388 714q0 -213 -147 -483q-130 -239 -283 -239q-174 0 -174 269q0 12 6 204q-95 -215 -190.5 -338t-246.5 -123q20 71 20 155q0 184 -46.5 402.5t-136.5 319.5q70 32 117 32q171 0 217 -711l1 -21q105 135 178 282q90 179 90 299v13q63 24 102 24q67 0 67 -50 q0 -8 -23 -139.5t-23 -281.5q0 -214 98 -214q90 0 158.5 154.5t68.5 359.5q0 144 -73 174q68 54 129 54q91 0 91 -142z" />
+<glyph unicode="&#x1d501;" horiz-adv-x="1008" d="M1180 280q-182 -212 -358 -212t-308 208q-155 -213 -193 -414q-92 54 -92 113q0 119 240 374q-48 82 -99 214t-51 202q0 65 152 89q-5 -16 -5 -30q0 -141 119 -370q200 228 200 361q0 7 -1 14q31 4 51 4q83 0 83 -45q0 -111 -294 -401q113 -178 244 -178q230 0 492 476 l64 -37q-135 -241 -244 -368z" />
+<glyph unicode="&#x1d502;" horiz-adv-x="902" d="M1048 780q0 -76 -120 -302q-278 -525 -580 -767q-157 -126 -266 -126t-109 87q0 40 18 83q45 -27 105 -27q224 0 428 296q-30 189 -109.5 392t-187.5 321q56 48 108.5 48t94.5 -49t109 -254t95 -328q258 408 280 716q134 -17 134 -90z" />
+<glyph unicode="&#x1d503;" horiz-adv-x="975" d="M907 27q0 -187 -122 -328t-306 -141q-91 0 -157 40.5t-66 126.5q0 103 173 236q124 95 268 162q-64 29 -132 29q-114 0 -235 -56q-2 16 -2 32q0 99 69 125q44 64 157 200l196 237q-81 -23 -181.5 -36t-126.5 -19q-84 -20 -132 -69q16 137 69 187q43 40 230.5 40.5 t247.5 51.5q27 -40 27 -85t-66 -128l-280 -355q48 7 84 7q119 0 208 -73q290 195 497 479l63 -39q-171 -272 -509 -514q26 -64 26 -110zM791 -51q0 58 -31 113q-120 -61 -224 -141q-148 -116 -148 -198q0 -91 115.5 -91t201.5 98t86 219z" />
+<glyph unicode="&#x1d504;" horiz-adv-x="1358" d="M537 860v191q0 116 -42 199q-54 106 -159 106q-70 0 -133.5 -55t-63.5 -122.5t61 -128.5l112 -106q61 -69 61 -148.5t-51.5 -146t-122.5 -90.5l-13 31q95 31 95 92t-61 116l-118 106q-63 71 -63 163q0 131 106 232.5t238 101.5q170 0 259 -104.5t89 -276.5v-158 q0 -196 -84 -306q-43 -58 -241 -212q88 -86 239 -197q150 95 283 168v711q0 183 -135 285l24 26q74 -57 160 -57q50 0 164.5 57.5t169.5 65.5v-47q-215 -25 -215 -391v-605q0 -194 106 -194q35 0 92 43l19 -37q-140 -70 -228 -180q-14 25 -101 116q-51 53 -58 160 q-171 -97 -205 -120q-115 -75 -176 -156q-153 210 -357 246v18q219 94 290 234q59 114 59 370z" />
+<glyph unicode="&#x1d505;" horiz-adv-x="1561" d="M1454 498q0 -217 -197 -370q-182 -142 -405 -142q-128 0 -247 67q-43 24 -152.5 108.5t-161.5 84.5q-83 0 -146 -117l-28 18q129 207 307 207q37 0 68 -8q91 90 120 189.5t29 246.5q0 15 1 55v64q0 428 -222 428q-66 0 -132.5 -48t-66.5 -112q0 -83 110.5 -185 t110.5 -191q0 -190 -194 -254l-8 32q112 41 112 109q0 46 -57 98q-99 92 -105 99q-57 68 -57 151q0 148 106 255.5t255 107.5q206 0 290 -174q236 86 340 184l176 -103q84 -65 84 -176q0 -139 -202 -278q272 -102 272 -346zM1233 1030q0 88 -60.5 156.5t-151 68.5 t-220.5 -79q29 -100 29 -283q0 -61 -3 -131q153 19 258 72q148 74 148 196zM1307 367q0 156 -120.5 260t-279.5 104q-46 0 -82 -8q-17 -136 -105 -227l-192 -166l220 -170q141 -101 245 -101q129 0 221.5 89.5t92.5 218.5z" />
+<glyph unicode="&#x1d506;" horiz-adv-x="1257" d="M713 -8q-277 0 -451 226q-160 208 -160 493q0 216 74 405q98 250 279 250q139 0 188 -160l154 193q148 -96 233 -96t139 71l29 -16q-125 -182 -278 -182q-78 0 -201 65q-70 -70 -70 -129q0 -84 106.5 -256t106.5 -260q0 -167 -182 -326l-21 29q66 56 66 138.5 t-96.5 245.5t-96.5 259.5t82 224.5q-8 63 -47 110.5t-98 47.5q-207 0 -207 -465q0 -287 95 -473q123 -242 382 -242q348 0 453 224h33q-133 -377 -512 -377z" />
+<glyph unicode="&#x1d507;" horiz-adv-x="1561" d="M1452 633q0 -261 -150 -444q-160 -197 -415 -197q-105 0 -209 55l-162 103q-87 55 -151 55q-89 0 -168 -113l-29 17q128 221 321 221q52 0 101 -19q67 89 67 150t-66.5 179.5t-66.5 210.5t75 188q18 24 146 155q-56 12 -169.5 12t-233.5 -46q-160 -62 -160 -179 q0 -29 17 -55l-23 -13q-41 47 -41 127q0 167 178 262q145 76 328 76q316 0 563.5 -216.5t247.5 -528.5zM1399 563q0 252 -173 421t-429 204q-135 -114 -135 -207q0 -60 70.5 -175t70.5 -199t-63 -171l-115 -141l188 -118q113 -66 209 -66q177 0 282 141q95 127 95 311z" />
+<glyph unicode="&#x1d508;" horiz-adv-x="1257" d="M719 -8q-279 0 -454 228q-161 209 -161 497q0 215 76 403q100 246 281 246q143 0 184 -168l158 201q142 -96 231 -96t144 71l26 -18q-131 -180 -280 -180q-92 0 -201 65q-72 -72 -72 -131t63 -176q1 -3 99 -170q144 190 254 190q106 0 145 -147l-153 -109 q-36 127 -109 127q-53 0 -116 -98q32 -80 32 -145q0 -142 -184 -314l-23 27q70 63 70 145t-97 245.5t-97 258.5t83 221q-8 63 -45.5 111.5t-95.5 48.5q-213 0 -213 -461q0 -299 96 -481q125 -238 398 -238q139 0 254 52q137 60 184 174l29 -2q-56 -179 -188 -278t-318 -99z " />
+<glyph unicode="&#x1d509;" horiz-adv-x="1358" d="M1145 649q-117 0 -117 -197v-16q102 -145 102 -293q0 -182 -144 -315t-321 -133t-317.5 123.5t-140.5 290.5q0 95 82 239t82 188t-40 67.5t-85 23.5l8 30h12q90 0 167 -59.5t77 -150t-75 -225.5t-75 -210q0 -117 92 -195.5t219.5 -78.5t217.5 83t90 207.5t-77 247.5 l-143 202q-77 119 -77 224q0 189 145 396q-37 12 -195 94q-110 57 -204.5 57t-166 -50.5t-71.5 -127t48 -129.5t114.5 -53t130.5 47l4 -37q-70 -49 -149.5 -49t-137 68t-57.5 157q0 135 115 225.5t245.5 90.5t311.5 -92.5t243.5 -92.5t98.5 40q33 36 33 92v10h35 q0 -114 -79.5 -195.5t-193.5 -81.5q-52 0 -92 14q-74 -120 -74 -211q0 -144 209 -393q0 153 22 220q40 122 161 122q70 0 112 -67l-45 -146q-49 39 -100 39z" />
+<glyph unicode="&#x1d50a;" horiz-adv-x="1561" d="M1440 539q0 -246 -176 -396.5t-426 -150.5q-299 0 -482.5 207.5t-183.5 511.5q0 212 107 414q128 241 321 241q137 0 197 -139q100 97 164 176q133 -121 237 -121q82 0 145 78l25 -23q-152 -180 -281 -180q-94 0 -215 92q-100 -74 -100 -170.5t133 -312.5q62 160 234 160 q136 0 218.5 -122t82.5 -265zM1249 563q0 137 -18 201q-35 119 -137 119q-66 0 -109 -52.5t-53 -121.5q41 -99 41 -160q0 -121 -79.5 -216t-199.5 -147l-12 27q133 76 133 172.5t-92 279.5t-92 288t131 245q-37 131 -160 131q-229 0 -229 -559q0 -343 63 -498 q101 -247 393 -247q250 0 346 152q74 120 74 386z" />
+<glyph unicode="&#x1d50b;" horiz-adv-x="1358" d="M823 952q203 -63 329 -207t126 -343t-114 -346q-62 -80 -213.5 -196.5t-178.5 -183.5q-144 162 -276 162q-88 0 -156 -82l-23 19q175 192 304 192q105 0 245 -127q242 164 242 459q0 169 -100 323q-112 173 -269 173q-81 0 -225 -97q143 -169 143 -290t-129 -238 l-221 -182l-151 121l-74 -58l-25 27l222 176l153 -119q90 67 90 153t-78 193l-145 185q-78 116 -78 231q0 151 138 285l249 217q112 -119 233.5 -119t176.5 96l31 -10q-135 -211 -291 -211q-89 0 -244 111q-152 -106 -152 -260.5t125 -272.5q221 118 336 219z" />
+<glyph unicode="&#x1d50c;" horiz-adv-x="1257" d="M1147 1339q-18 -110 -96 -188t-189 -78t-260.5 108.5t-243.5 108.5t-152.5 -55.5t-58.5 -133t51.5 -125.5t123.5 -48q32 0 57 8l8 -33q-34 -12 -70 -12q-93 0 -154 64t-61 157q0 126 103 208.5t221.5 82.5t224.5 -58q19 -11 161 -107q84 -58 144.5 -58t105 51.5 t58.5 122.5zM1135 920q-68 63 -110.5 63t-69.5 -22.5t-27 -55.5q0 -51 109.5 -219.5t109.5 -282.5q0 -186 -173 -305q-153 -106 -347 -106q-132 0 -227 71q-38 28 -127 132q-61 71 -117.5 71t-94.5 -80l-38 2q31 74 97 123t153 49t174 -80l140 -149q85 -80 174 -80t166 65.5 t77 159.5t-105.5 265t-105.5 264.5t58 157t142 63.5t162 -78z" />
+<glyph unicode="&#x1d50d;" horiz-adv-x="1257" d="M854 1051q-105 0 -209 61l-165 115q-93 61 -170 61t-128 -57.5t-51 -134t55 -131t121 -54.5t115 31l22 -29q-67 -36 -133 -36q-94 0 -155.5 66t-61.5 161q0 126 102.5 210.5t220 84.5t219.5 -63l160 -120q81 -61 144 -61t108.5 40.5t51.5 104.5l28 -4 q-15 -104 -92 -174.5t-182 -70.5zM1141 190q0 -203 -164 -354t-371 -151q-153 0 -248 91q-37 36 -119 171q-56 92 -114 92q-75 0 -90 -113h-37q14 89 75 149t155 60t178 -100l134 -187q82 -100 177 -100q123 0 196.5 91.5t73.5 215t-126 332t-126 318t62 195t156 85.5 t155 -82l-16 -29q-56 78 -131 78q-43 0 -76 -31t-33 -75q0 -84 144.5 -312t144.5 -344z" />
+<glyph unicode="&#x1d50e;" horiz-adv-x="1358" d="M666 709q-31 0 -172 -43q96 -123 96 -255.5t-135 -246.5l-234 -172l-135 137l-68 -53l-14 35l203 161l135 -143q102 55 102 144t-133 312t-133 341q0 203 138 335t343 132t311 -128q56 -67 112 -236q43 -128 94 -128q22 0 67 12v-34l-373 -107q87 -49 147 -215l82 -278 q45 -138 103 -138q30 0 80 35v-43q-124 -69 -188 -141q-117 89 -164 200q-23 53 -68 250q-60 267 -196 267zM805 1236q-59 107 -185.5 107t-200 -88.5t-73.5 -224.5t129 -332l592 174q-121 27 -179 152z" />
+<glyph unicode="&#x1d50f;" horiz-adv-x="1257" d="M1174 291q-51 -117 -168 -208t-234.5 -91t-275 98t-224.5 98q-112 0 -174 -112l-26 16q129 228 325 234q56 77 56 153.5t-107.5 229t-107.5 260.5q0 165 133 297.5t291 132.5t298 -119t140 -266q0 -89 -76 -208t-76 -159q0 -59 68 -102l-19 -27q-168 98 -168 250 q0 67 61.5 180t61.5 178q0 104 -89 171t-196.5 67t-198.5 -68.5t-91 -175.5t98 -250t98 -223q0 -115 -137 -323q69 -16 218.5 -109.5t240 -93.5t155.5 54.5t93 133.5z" />
+<glyph unicode="&#x1d510;" horiz-adv-x="1864" d="M1804 975l17 2v-35q-128 -28 -172.5 -92.5t-44.5 -200.5v-280q0 -219 98 -219q43 0 96 49l21 -25l-228 -182q-116 108 -145 195q-21 63 -21 276.5t47 303.5q62 121 275 189q-150 29 -195 132l-35 174q-18 86 -108 86q-190 0 -190 -411l6 -218q0 -294 -84 -431 q-68 -111 -324 -296l-135 135l-76 -64l-22 29l221 174l135 -135q100 70 100 357v6l-2 575q0 274 -153 274q-82 0 -127 -74t-45 -161v-438q0 -264 -107 -405q-58 -78 -321 -273l-125 135l-74 -59l-25 28l218 168l131 -129q114 70 114 350v433q0 425 -217 425 q-78 0 -139.5 -57t-61.5 -131.5t66 -136.5l121 -105q65 -69 65 -154.5t-43 -158t-116 -106.5l-17 26q92 46 92 123q0 53 -65 108q-112 95 -123 107q-66 76 -66 178q0 150 100 251.5t249 101.5q108 0 196 -64.5t115 -167.5q49 229 254 229q241 0 272 -239q8 110 71 174.5 t173 64.5q181 0 232 -102q15 -30 31 -193q10 -108 91 -116z" />
+<glyph unicode="&#x1d511;" horiz-adv-x="1458" d="M1147 -8q-115 114 -147.5 198.5t-32.5 281t58 290.5t257 192q-141 27 -179.5 70.5t-59 182.5t-125.5 139q-87 0 -135 -84q-40 -70 -40 -164v-533q0 -276 -247 -459q-55 -34 -154 -118l-137 143l-80 -63l-25 28l228 176l139 -143q88 57 88 248v399q0 232 -24 342 q-50 221 -201 221q-82 0 -145.5 -56t-63.5 -127t64 -128l125 -113q67 -75 67 -166t-46.5 -162t-121.5 -104l-6 35q92 50 92 112.5t-66 120.5l-130 114q-68 77 -68 175q0 142 106 245.5t248 103.5q107 0 195.5 -62t132.5 -164q16 101 80 165.5t163 64.5q192 0 248 -112 q3 -5 41 -205q20 -103 120 -103h9v-33q-153 -11 -205 -136q-32 -79 -32 -259q0 -379 135 -379q45 0 98 49l23 -31q-163 -102 -246 -192z" />
+<glyph unicode="&#x1d512;" horiz-adv-x="1561" d="M1303 1156q163 -204 163 -487t-172.5 -480t-455.5 -197q-124 0 -240 61q-29 15 -173 113q-90 61 -149 61q-103 0 -167 -125l-27 17q39 96 115 167.5t172 80.5q65 77 65 150t-109.5 201.5t-109.5 233.5q0 226 229 424q37 -45 97 -45t161.5 22.5t153.5 22.5q272 0 447 -220 zM1314 290q101 154 101 377.5t-131.5 372t-365.5 148.5q-54 0 -159.5 -20.5t-169.5 -20.5t-105 54q-23 31 -54 122q-96 -89 -96 -205q0 -86 111.5 -219.5t111.5 -232.5q0 -141 -147 -297q92 -20 272 -138t315 -118q200 0 317 177z" />
+<glyph unicode="&#x1d513;" horiz-adv-x="1561" d="M1391 961q-217 0 -217 -125q0 -52 99 -164.5t99 -206.5q0 -154 -150.5 -300.5t-306.5 -146.5q-68 0 -155 50q-21 -184 -60 -385h-47q-54 268 -59 456q-108 76 -186 76t-156 -90l-25 22q131 186 320 186q22 0 45 -3v583q0 447 -221 447q-74 0 -147.5 -58.5t-73.5 -125.5 t67 -130l131 -122q70 -78 70 -163t-50.5 -150t-127.5 -97l-7 37q97 29 97 106q0 50 -67 105q-111 93 -124 108q-67 76 -67 174q0 146 99.5 251.5t244.5 105.5q105 0 195 -65t132 -165q41 232 250 232q113 0 193 -64t80 -165.5t15 -132.5q24 -46 103 -46h7v-34zM1079 1196 q0 65 -35 112.5t-98 47.5q-98 0 -146 -107q-36 -80 -36 -192v-781q177 -155 289 -155q79 0 133.5 55.5t54.5 138.5t-103.5 201t-103.5 213t76.5 163.5t179.5 94.5q-111 19 -161 61.5t-50 147.5z" />
+<glyph unicode="&#x1d514;" horiz-adv-x="1561" d="M1366 2q-83 0 -170 104q-169 -114 -360 -114q-123 0 -239 60q-28 15 -174 113q-90 60 -149 60q-103 0 -168 -125l-26 17q38 97 114.5 168t172.5 80q65 77 65 150t-109.5 202t-109.5 235q0 224 229 422q39 -45 98 -45t160.5 22.5t153.5 22.5q272 0 447 -220 q163 -204 163 -481.5t-145 -451.5q88 -100 141 -100t92 59l4 -45q-87 -133 -190 -133zM1290 262q123 158 123 392t-130.5 383t-367.5 149q-53 0 -158.5 -19.5t-158.5 -19.5q-76 0 -116 53q-20 27 -54 121q-96 -89 -96 -205q0 -86 111.5 -219.5t111.5 -232.5 q0 -146 -147 -297q93 -20 273 -138t314 -118q89 0 164 41q-95 139 -168 139q-46 0 -84 -45l-26 22q134 129 206 129q56 0 113 -46q18 -14 90 -89z" />
+<glyph unicode="&#x1d515;" horiz-adv-x="1458" d="M988 376v68q1 45 1 66q0 69 -29 131q-36 78 -98 78q-14 0 -127 -47q0 -167 -20 -256q-30 -133 -119 -223q-43 -44 -137.5 -106.5t-130.5 -94.5l-125 141l-68 -51l-22 29l217 168l123 -146q57 31 75 79q13 34 13 112v585q0 432 -217 432q-75 0 -135 -51.5t-60 -125 t64 -133.5l120 -102q64 -68 64 -157t-47 -162.5t-125 -95.5l-6 33q96 39 96 110q0 54 -68 109q-120 96 -126 103q-68 72 -68 169q0 140 100.5 246.5t239.5 106.5q112 0 210 -56.5t119 -156.5q179 87 357 217l160 -124q73 -74 73 -186q0 -170 -256 -286q102 -70 128 -244 q8 -140 18 -277t78 -137q28 0 83 56l23 -31l-219 -174q-159 89 -159 384zM1122 1020q0 82 -61 144.5t-143 62.5q-57 0 -205 -88q22 -102 22 -426q187 69 245 104q142 85 142 203z" />
+<glyph unicode="&#x1d516;" horiz-adv-x="1561" d="M1124 1104q-67 0 -229.5 68.5t-271.5 68.5q-187 0 -292 -170q-89 -145 -89 -344q0 -543 678 -543q510 0 510 299q0 85 -62 143t-149 58t-229.5 -68.5t-230.5 -68.5t-165.5 59t-77.5 154q0 69 49 112l21 -24q-31 -31 -31 -73t30.5 -67.5t71.5 -25.5q67 0 202 73.5 t243 73.5q155 0 259.5 -106.5t104.5 -261.5q0 -222 -191 -354q-169 -115 -401 -115q-302 0 -487.5 212t-185.5 519q0 255 158 453t405 198q101 0 261.5 -65.5t234.5 -65.5q116 0 184 109l29 -11q-129 -237 -349 -237z" />
+<glyph unicode="&#x1d517;" horiz-adv-x="1358" d="M903 -8q-107 0 -294.5 100.5t-272.5 100.5q-122 0 -201 -142l-31 15q58 104 155.5 184t202 80t228.5 -66q72 76 72 132.5t-65.5 165t-65.5 192.5q0 125 176 315l-227 109q-135 59 -230.5 59t-163 -52.5t-67.5 -130t42.5 -124t111.5 -46.5q16 0 32 3l-8 -29q-18 -6 -43 -6 q-81 0 -126.5 58.5t-45.5 142.5q0 135 117.5 229t263 94t335 -98t275.5 -98q132 0 230 149l28 -18q-186 -271 -366 -271q-49 0 -119 19q-88 -78 -88 -137t69.5 -170t69.5 -189q0 -147 -178 -313q217 -121 323 -121q154 0 267 182l30 -16q-184 -303 -436 -303z" />
+<glyph unicode="&#x1d518;" horiz-adv-x="1358" d="M532 924l3 -177q0 -124 -37.5 -199.5t-165.5 -172.5q180 -161 309 -232l283 195v661q0 208 -129 285l24 37q75 -51 148 -51t186.5 63.5t175.5 63.5v-37q-149 -19 -203 -203q-32 -110 -32 -311v-438q0 -242 102 -242q47 0 107 47l12 -39q-169 -88 -246 -182 q-106 126 -109 132q-38 62 -38 167q-161 -102 -244.5 -161t-161.5 -138q-45 72 -165.5 156t-200.5 98v14q121 65 167 178q35 85 35 231l-4 195q0 361 -135 361q-42 0 -98 -43l-19 35q113 66 252 184q114 -107 149 -207t35 -270z" />
+<glyph unicode="&#x1d519;" horiz-adv-x="1561" d="M1242 906q-71 -34 -71 -93t99.5 -171.5t99.5 -197.5q0 -181 -180.5 -316.5t-368.5 -135.5q-119 0 -228 66q-28 16 -162 122q-84 66 -140 66q-85 0 -162 -111l-33 15q164 211 336 211q22 0 45 -3q123 73 123 338v269q0 142 -42 238q-57 130 -181 130q-65 0 -129 -52 t-64 -120t65 -124l119 -97q64 -65 64 -160q0 -172 -160 -245l-10 28q94 45 94 111q0 44 -68 100q-113 93 -126 107q-68 74 -68 161q0 143 105.5 242.5t249.5 99.5q219 0 301 -190q57 195 251 195q178 0 239 -105q24 -41 48 -198q17 -109 84 -115l-6 -35q-69 -2 -124 -30z M780 1028l11 -229q0 -254 -277 -459q53 -22 214 -161q131 -111 232 -111t183 67.5t82 160.5t-97.5 204.5t-97.5 204t87 165.5q70 60 177 91q-147 33 -190 134q-16 83 -34 164.5t-114 81.5q-176 0 -176 -313z" />
+<glyph unicode="&#x1d51a;" horiz-adv-x="1864" d="M540 660l-3 169q0 502 -222 502q-70 0 -122 -54.5t-52 -123t59 -123.5l114 -108q61 -72 61 -172q0 -164 -168 -246l-17 31q105 52 105 113.5t-61 116.5l-121 108q-64 73 -64 169q0 135 103.5 237.5t238.5 102.5q90 0 169 -55t120 -139q16 93 84.5 144.5t163.5 51.5 q191 0 256 -180q12 86 79 134t156 48q180 0 230 -105l35 -193q18 -97 116 -97h10v-33q-71 0 -143 -35.5t-72 -98t104.5 -175t104.5 -217.5q0 -151 -125.5 -285.5t-275.5 -134.5q-94 0 -206.5 80t-172.5 80q-36 0 -151 -84t-218.5 -84t-222.5 87t-178 87q-82 0 -135 -88 l-27 19q131 198 275 198q26 0 53 -10q120 80 120 363zM1212 1151l13 -354q0 -174 -38 -289t-140 -256q60 29 114 29q81 0 194.5 -83t178 -83t111.5 50.5t47 127.5t-115 198.5t-115 215.5t72.5 166.5t171.5 103.5q-146 19 -188 115l-32 166q-19 85 -114 85q-74 0 -117 -57.5 t-43 -134.5zM711 1130l12 -366q0 -165 -64 -277.5t-204 -205.5q30 -13 152.5 -98t178.5 -85t127 68q125 118 125 528v262q0 385 -166 385q-78 0 -119.5 -64.5t-41.5 -146.5z" />
+<glyph unicode="&#x1d51b;" horiz-adv-x="1257" d="M586 496v166h-271v90h271v36q0 441 -232 441q-87 0 -176 -74l-20 31q191 109 272 213q264 -110 303 -346q26 106 121 200q50 49 186 146l131 -146l35 31l19 -31l-181 -149l-131 149q-153 -103 -153 -292v-209h293v-90h-293v-101q0 -142 65 -250q77 -127 209 -127 q80 0 178 86l13 -30q-108 -85 -165.5 -135t-107.5 -113l-215 143q-79 67 -135 225q-23 -105 -127 -209q-48 -48 -192 -159l-148 155l-57 -45l-21 29l199 170l156 -158q94 79 134 156.5t40 196.5z" />
+<glyph unicode="&#x1d51c;" horiz-adv-x="1458" d="M721 1111l6 -165q0 -267 -44.5 -365.5t-250.5 -250.5l223 -162q64 46 117 78l25 -27q-128 -73 -248 -201q-161 171 -342 201v21q219 102 278 218q47 93 47 353v217q0 122 -42 209q-55 113 -164 113q-77 0 -138 -55.5t-61 -131.5q0 -54 62 -107q111 -97 115 -102 q63 -71 63 -159t-48.5 -162t-121.5 -90l-11 30q93 31 93 101q0 52 -63 107q-112 98 -116 104q-63 72 -63 166q0 146 102 246t250 100q220 0 295 -209q36 211 217 211q221 0 300 -244q46 -143 46 -424.5t-36 -434.5q-53 -222 -207 -376q-56 -55 -176.5 -141t-139.5 -101 q-137 109 -241 109t-168 -74l-25 19q147 178 315 178q123 0 222 -103q108 69 151 130q79 110 102 427q11 140 11 463q0 529 -183 529q-151 0 -151 -245z" />
+<glyph unicode="&#x1d51d;" horiz-adv-x="1358" d="M1184 164q0 -236 -187 -373q-167 -123 -411 -123q-174 0 -270 94q-44 43 -110 173q-47 94 -102 94q-76 0 -86 -103h-32q9 76 66.5 123t133.5 47q122 0 195 -100l112 -186q71 -101 189 -101q291 0 291 402q0 483 -252 483q-146 0 -197 -141l-30 16q39 103 149 143 q-95 39 -143 125l26 21q70 -117 174 -117q123 0 187 101q55 85 55 212q0 169 -72 272q-82 117 -243 117q-138 0 -255.5 -87.5t-117.5 -221.5q0 -54 20 -98l-26 -14q-27 60 -27 116q0 155 132 248.5t306 93.5t315 -96q161 -109 161 -289q0 -135 -108 -239q-91 -88 -234 -135 q179 -38 285 -157.5t106 -299.5z" />
+<glyph unicode="&#x1d51e;" horiz-adv-x="932" d="M336 -10q-119 82 -162 181t-43 257t46 260.5t171 185.5q51 31 141 107q163 -117 345 -150v-22q-72 -12 -72 -129v-426q0 -133 67 -133q35 0 82 39l2 -43q-69 -38 -180 -129q-112 92 -112 180q-191 -94 -285 -178zM285 440q0 -317 143 -317q66 0 193 90v518 q-55 61 -236 123q-100 -47 -100 -414z" />
+<glyph unicode="&#x1d51f;" horiz-adv-x="932" d="M848 516q0 -208 -62 -302q-36 -54 -140 -108.5t-148 -123.5q-220 117 -373 155v17q57 20 57 102v702q0 115 -21 168q-29 73 -116 117l12 29q82 -35 143.5 -35t164.5 42.5t151 49.5l4 -37q-194 -24 -194 -258v-233l153 73q79 39 135 80q234 -114 234 -438zM692 440 q0 387 -190 387q-66 0 -178 -59l2 -535q0 -27 105 -75.5t140 -48.5q121 0 121 331z" />
+<glyph unicode="&#x1d520;" horiz-adv-x="729" d="M516 760q-49 0 -147 84q-56 -52 -56 -316q0 -166 22 -245q40 -148 161 -148q65 0 172 53l16 -30q-151 -58 -260 -166q-161 87 -214 199q-44 94 -44 266t30 242t108 137l159 137q80 -107 139 -107q41 0 74 27l16 -19q-70 -114 -176 -114z" />
+<glyph unicode="&#x1d521;" horiz-adv-x="932" d="M769 862q101 -124 101 -362t-91 -323l-273 -185q-213 149 -393 160v20q84 17 84 107v538q163 31 284 80l-228 108q-149 83 -149 180t123 169l19 -25q-56 -35 -56 -72q0 -78 247.5 -185t331.5 -210zM711 434q0 177 -24 253q-39 123 -163 187q-14 -6 -190 -63v-569 q206 -119 278 -119q99 0 99 311z" />
+<glyph unicode="&#x1d522;" horiz-adv-x="831" d="M152 514q0 158 40 237.5t133 130.5q32 17 222 97l192 -352l-436 -195q9 -116 81 -208.5t181 -92.5q72 0 197 70v-43q-195 -92 -287 -168q-193 105 -258 207.5t-65 316.5zM440 895q-91 -34 -118 -81.5t-27 -146.5t6 -194l297 133z" />
+<glyph unicode="&#x1d523;" horiz-adv-x="629" d="M190 1059l-16 174q0 59 40.5 105t90.5 46t107.5 -31.5t81 -31.5t35 25t3.5 53h33q4 -15 4 -41q0 -65 -36.5 -118.5t-98.5 -53.5q-36 0 -93 33.5t-81 33.5q-43 0 -43 -57q0 -135 107 -209q93 -65 235 -65v-78h-178q0 -341 -70 -1159h-30q-68 851 -68 1159h-160v76 q137 6 137 139z" />
+<glyph unicode="&#x1d524;" horiz-adv-x="932" d="M774 666v-390q0 -64 43 -150.5t43 -139.5q0 -147 -138 -232q-118 -71 -276 -71q-323 0 -323 170q0 36 27 77l159 -36q-18 -34 -18 -70q0 -105 170 -105q108 0 177 44q83 53 83 155q0 45 -40 133t-46 129q-176 -76 -309 -170q-222 127 -222 418q0 207 63 303 q36 56 143 117t155 135q140 -137 397 -176v-23q-88 -18 -88 -118zM272 736q-20 -57 -20 -199t18 -227q36 -175 148 -175q43 0 217 94v486q-29 39 -109 75l-147 64q-79 -36 -107 -118z" />
+<glyph unicode="&#x1d525;" horiz-adv-x="932" d="M852 420q0 -501 -397 -742h-62q309 198 309 678q0 169 -31 288q-50 192 -169 192q-71 0 -187 -70v-563q38 -46 99 -92l98 67l12 -35q-101 -62 -190 -151q-96 112 -232 133v18q74 13 74 115v737q0 108 -20 161q-27 74 -107 118l14 31q71 -39 129 -39t160 42t154 46v-39 q-191 -35 -191 -258v-242q167 56 310 160q131 -106 179 -236t48 -319z" />
+<glyph unicode="&#x1d526;" horiz-adv-x="526" d="M201 1342q31 26 72 26t77.5 -20.5t36.5 -60.5t-42 -102l-69 -91q-106 118 -106 184q0 38 31 64zM188 215l13 490q0 96 -64 96q-34 0 -76 -27v35q127 79 211 166q53 -64 88.5 -97.5t85.5 -48.5v-18q-100 -12 -106 -141q-10 -213 -10 -414q0 -123 63 -123q32 0 109 43v-41 q-114 -63 -209 -143q-105 91 -105 223z" />
+<glyph unicode="&#x1d527;" horiz-adv-x="526" d="M201 1345.5q31 26.5 72 26.5t77.5 -20.5t36.5 -60.5t-42 -102l-69 -91q-106 112 -106 182q0 39 31 65.5zM346 651v-694q0 -135 72 -172v-33q-38 10 -68 10q-63 0 -150 -45t-122 -47l-8 35q137 41 137 328v655q0 129 -51 129q-37 0 -95 -37v35q133 83 211 166 q95 -119 174 -145v-17q-100 -15 -100 -168z" />
+<glyph unicode="&#x1d528;" horiz-adv-x="970" d="M634 315q0 32 4 105q-156 88 -177 88t-129 -77v-228q37 -44 99 -92l98 67l12 -35q-102 -63 -190 -151q-95 112 -232 133v18q74 12 74 115v737q0 107 -20 161q-27 75 -107 118l14 31q70 -39 128 -39t160.5 42t154.5 46v-39q-191 -35 -191 -258v-267q236 172 274 172 q51 0 130 -75.5t79 -126.5q-5 -6 -51 -38l-193 -133l120 -61q91 -50 91 -76v-188q0 -155 69 -155q20 0 82 36l13 -34q-79 -46 -185 -119q-127 57 -127 323zM515 861q-22 0 -94.5 -51.5t-88.5 -68.5v-264q31 19 347 226q-14 48 -66.5 103t-97.5 55z" />
+<glyph unicode="&#x1d529;" horiz-adv-x="526" d="M211 283v708q0 205 -129 256l14 31q74 -21 126 -21t142.5 47.5t139.5 49.5l2 -37q-154 -15 -154 -320v-749q0 -37 25 -82t54 -45t77 43l8 -39l-92 -62q-51 -37 -84 -73q-93 114 -213 116v19q84 11 84 158z" />
+<glyph unicode="&#x1d52a;" horiz-adv-x="1561" d="M1194 322l10 311q0 192 -90 192q-13 0 -254 -114v-711h-141v631q0 200 -82 200q-36 0 -260 -120v-711h-141v700q0 131 -64 131q-37 0 -106 -51l-19 33q143 94 209 156q104 -54 123 -217q244 120 356 217q121 -85 123 -217q259 113 387 219q93 -116 197 -148v-22 q-101 -3 -101 -121v-416q0 -155 72 -155q14 0 82 36l10 -34q-61 -37 -184 -119q-127 57 -127 330z" />
+<glyph unicode="&#x1d52b;" horiz-adv-x="1032" d="M696 315l13 322q0 188 -93 188q-10 0 -256 -116v-709h-141v700q0 131 -63 131q-40 0 -105 -51l-20 33q133 85 211 156q96 -53 118 -217q259 113 388 219q93 -116 196 -148l2 -22q-102 -3 -102 -121v-416q0 -155 69 -155q19 0 82 36l13 -34q-77 -45 -185 -119 q-127 57 -127 323z" />
+<glyph unicode="&#x1d52c;" horiz-adv-x="932" d="M870 432q0 -147 -59 -221q-31 -39 -131.5 -96t-147.5 -123q-215 132 -397 151v23q80 7 80 80v596h8q180 0 398 135q151 -89 207 -233q42 -111 42 -312zM710 216q13 39 13 195q0 443 -223 443q-82 0 -146 -47v-567q81 -67 262 -129q74 41 94 105z" />
+<glyph unicode="&#x1d52d;" horiz-adv-x="1032" d="M965 559q0 -216 -87 -319l-239 -222q-112 77 -199 117q-14 -150 -59 -448h-29q-43 179 -51 465h-18q-81 0 -138 -37l-8 28q87 87 164 117v467q0 129 -84 129q-38 0 -84 -27v39q114 56 199 113q85 -74 112 -172q179 81 299 174q222 -134 222 -424zM821 481q0 359 -170 359 q-79 0 -211 -80v-502q95 -27 262 -129q83 53 107 157q12 55 12 195z" />
+<glyph unicode="&#x1d52e;" horiz-adv-x="932" d="M797 670l8 -430q0 -373 -57 -568h-31q-52 177 -64 473q-194 -69 -311 -153q-126 80 -169.5 188t-43.5 275.5t55 251.5q32 48 135 117t158 147q74 -63 190.5 -111t217.5 -59v-19q-88 -14 -88 -112zM399 840q-70 0 -100 -142q-18 -87 -18 -198q0 -383 161 -383q49 0 110 25 l103 48v543q-245 107 -256 107z" />
+<glyph unicode="&#x1d52f;" horiz-adv-x="729" d="M360 571v-368q0 -22 49.5 -51t75 -29t121.5 70l19 -27l-117 -81q-64 -48 -107 -93q-179 123 -301 143v15q119 16 119 139v354q0 195 -100 195q-19 0 -86 -37v41q96 64 170 135q71 -50 97 -97t52 -147q70 145 219 248l134 -145l-130 -113l-104 123q-111 -114 -111 -275z " />
+<glyph unicode="&#x1d530;" horiz-adv-x="831" d="M724 537q73 -71 73 -185.5t-106 -210.5l-197 -153q-88 108 -209 108q-87 0 -150 -69l-26 24q144 158 268 158q96 0 198 -107q103 62 103 177q0 80 -49.5 140t-128.5 60q-40 0 -77 -41q-11 -12 -54 -76q-107 14 -171.5 85.5t-64.5 178.5t96 201l179 146q69 -101 188 -101 q77 0 131 72l31 -24q-138 -152 -243 -152t-196 90q-83 -47 -83 -153q0 -73 54.5 -140t125.5 -67q54 0 125 114q110 -4 183 -75z" />
+<glyph unicode="&#x1d531;" horiz-adv-x="629" d="M215 240v587h-178v70q155 0 213 164q36 100 39 293h65v-441h211v-86h-211v-643q80 -69 98.5 -69t53.5 24l63 43v-43q-69 -47 -200 -151q-114 117 -236 139v14q82 21 82 99z" />
+<glyph unicode="&#x1d532;" horiz-adv-x="1032" d="M371 631l-9 -305q0 -195 76 -195q65 0 273 123l-2 444q-1 107 -80 107v35q103 53 151 129h70v-740q0 -110 59 -110q30 0 82 35l6 -37q-65 -36 -192 -117q-96 69 -96 200v11q-173 -86 -198 -100q-133 -72 -175 -119q-70 97 -201 141v14q92 31 92 160v381q0 156 -84 156 q-25 0 -77 -31l-17 33q115 56 203 129q119 -51 119 -344z" />
+<glyph unicode="&#x1d533;" horiz-adv-x="932" d="M844 506q0 -212 -99 -311l-251 -203q-183 136 -373 145v25q92 29 92 104v430q0 47 -14 86q-20 54 -58 54q-25 0 -82 -33l-4 35q112 62 187 127q103 -83 110 -168q124 49 287 168q130 -87 172 -200q33 -86 33 -259zM692 438v109q0 287 -157 287q-48 0 -183 -78v-457 q0 -71 89 -121q29 -17 151 -61q100 40 100 321z" />
+<glyph unicode="&#x1d534;" horiz-adv-x="1458" d="M1378 535q0 -149 -40.5 -246.5t-151.5 -175.5l-79 -55q-44 -32 -69 -66q-47 42 -147 94.5t-151 52.5t-134 -50t-112 -97q-204 158 -321 158h-9v24q78 19 78 131v383q0 162 -76 162q-29 0 -76 -33v41l162 107q117 -44 127 -191q111 63 328 201q122 -74 147 -178 q204 74 322 178q202 -100 202 -440zM1229 506q0 140 -17 208q-33 132 -131 132q-44 0 -105 -30l-114 -58v-461q0 -53 95.5 -114.5t152.5 -61.5q119 0 119 385zM719 336v356q0 148 -113 148q-51 0 -227 -109v-467q0 -33 14 -49t88.5 -55t93.5 -39q71 0 111 76q33 62 33 139z " />
+<glyph unicode="&#x1d535;" horiz-adv-x="831" d="M487 676v-119h144v-78h-144v-117q0 -80 32 -143q41 -80 107 -80t140 66l8 -35l-194 -178q-137 64 -211 203q-64 -117 -191 -203l-119 119l109 110l104 -96q74 71 74 180v174h-139v78h139v8q0 273 -149 273q-57 0 -107 -37l-16 24q68 48 200 154q145 -76 193 -197 q57 108 203 197l112 -121l-125 -108l-94 98q-76 -56 -76 -172z" />
+<glyph unicode="&#x1d536;" horiz-adv-x="1032" d="M866 728q39 -115 39 -343.5t-89 -394t-296 -307.5h-69q188 128 255 302q52 136 52 394q0 463 -195 463q-58 0 -190 -84v-553q35 -44 71 -51q37 27 80 55l15 -33q-103 -66 -189 -162q-76 96 -209 127v19q58 10 75 44t17 99v399q0 154 -71 154q-31 0 -92 -31v35 q113 58 194 123q91 -62 109 -182q208 102 297 182q144 -103 196 -255z" />
+<glyph unicode="&#x1d537;" horiz-adv-x="729" d="M406 520q118 -49 191 -173.5t73 -266t-73 -261.5q-85 -141 -224 -141q-108 0 -175 88.5t-67 209t119 253.5l18 -14q-63 -87 -63 -246q0 -97 31 -165q42 -91 129 -91q161 0 161 252q0 168 -50 288q-69 163 -214 163q-57 0 -143 -43l-2 37q158 67 217 103q137 84 137 173 q0 70 -48 115t-122 45t-225 -82v41q189 93 299 178q106 -45 152 -80q79 -60 79 -146t-51 -138.5t-149 -98.5z" />
+<glyph unicode="&#x1d538;" horiz-adv-x="1521" d="M1332 81q11 -2 37.5 -8.5t26.5 -39.5t-33 -33h-577q-35 0 -35 37.5t35 37.5q27 0 74 18t47 39q0 57 -72 253h-424q-27 -123 -27 -189q0 -97 50 -116q22 -5 45 -9q25 -7 25 -32q0 -39 -35 -39h-383q-33 0 -33 37.5t33 37.5q87 0 119 83l460 1200q8 21 34 21t35 -21 l504 -1159q45 -103 94 -118zM982 132q0 -31 -20 -57h258q-23 29 -51 94l-467 1075l-69 -179l37 -84q112 -254 170 -400l76 -197q66 -170 66 -252zM807 459q-97 245 -206 492q-62 -162 -171 -492h377zM309 196q0 12 1 25l-35 -90q-12 -30 -33 -56h90q-23 40 -23 121z" />
+<glyph unicode="&#x1d539;" horiz-adv-x="1313" d="M1254 366q0 -189 -193 -288q-153 -78 -362 -78h-611q-35 0 -35 39q0 36 69 36t94.5 19t25.5 92v971q0 81 -41 101q-21 10 -113 10q-35 0 -35 37.5t35 37.5h611q479 0 479 -343q0 -171 -212 -279q129 -37 208.5 -131t79.5 -224zM1103 1000q0 224 -259 260 q82 -99 82 -272.5t-105 -257.5q282 134 282 270zM851 1000q0 106 -42 179q-52 89 -150 89q-39 0 -72.5 -19.5t-33.5 -55.5v-460h2q152 0 224 59.5t72 207.5zM1179 366q0 129 -93 206q-66 55 -205 96q106 -85 106 -302q0 -170 -83 -267q275 70 275 267zM912 366 q0 149 -54.5 220.5t-198.5 71.5h-106v-509q0 -36 33.5 -55t72.5 -19q253 0 253 291zM317 1157v-971q0 -70 -21 -111h204q-22 33 -22 74v1044q0 42 22 75h-204q21 -41 21 -111z" />
+<glyph unicode="&#x1d53a;" horiz-adv-x="1381" d="M1323 257q0 -13 -7 -24q-78 -120 -245.5 -195t-321.5 -75q-314 0 -505 197t-191 512t191 511t505 196q95 0 215 -45.5t176 -45.5q38 0 51 45.5t41 45.5q35 0 35 -33v-391q0 -36 -35 -36q-23 0 -36 27q-13 34 -44 100q-54 98 -175 178.5t-228 80.5q-188 0 -281 -237 q-68 -173 -68 -407t67 -387q93 -211 306 -211q246 0 410 152l66 68q17 16 30 16q44 0 44 -42zM1192 1222q-22 -9 -44 -9t-37 1q48 -44 81 -91v99zM325 671q0 390 167 587q-172 -68 -268 -221.5t-96 -369.5t104.5 -374t288.5 -220q-196 165 -196 598z" />
+<glyph unicode="&#x1d53b;" horiz-adv-x="1410" d="M692 1343q297 0 487.5 -175.5t190.5 -477t-185 -496t-493 -194.5h-606l-25 13q-8 13 -8 26t8 25q21 14 91 14q64 0 64 108v970q0 80 -27 98q-18 12 -103 12l-25 13q-8 13 -8 26q0 38 34 38h605zM1199 334.5q96 153.5 96 357.5t-100 343.5t-273 197.5q174 -177 174 -538 q0 -405 -163 -578q170 64 266 217.5zM1021 695q0 214 -73 369q-96 202 -285 202q-121 0 -121 -79v-1033q0 -38 33.5 -57.5t73.5 -19.5q372 0 372 618zM291 1156v-970q0 -68 -19 -111h219q-24 35 -24 79v1033q0 46 25 81h-219q18 -40 18 -112z" />
+<glyph unicode="&#x1d53c;" horiz-adv-x="1434" d="M1194 0h-1109q-42 0 -42 39q0 36 42 36q85 0 108 16q31 20 31 95v978q0 74 -36 93q-21 11 -103 11q-42 0 -42 37.5t42 37.5h1071q33 -13 33 -35v-319q0 -35 -37 -35q-14 0 -31 13q-9 18 -12.5 54.5t-11.5 53.5q-46 98 -153.5 145.5t-229.5 47.5h-125q-54 0 -54 -106v-429 q283 0 283 276q0 36 37.5 36t37.5 -36v-591q0 -33 -37.5 -33t-37.5 33q0 238 -283 238v-475q0 -106 54 -106h145q130 0 252 86.5t188 208.5q11 21 20.5 65.5t19.5 64.5q18 14 32 14t26.5 -13t10.5 -28l-55 -439q-1 -9 -10 -21q-19 -13 -24 -13zM1114 1268h-98q59 -34 98 -79 v79zM818 630v143q-40 -48 -98 -76q59 -25 98 -67zM1178 241q-80 -102 -188 -166h168zM460 181v981q0 61 20 106h-201q20 -39 20 -104v-978q0 -70 -21 -111h202q-20 45 -20 106z" />
+<glyph unicode="&#x1d53d;" horiz-adv-x="1300" d="M1167 991q0 -37 -35 -37q-39 0 -39 37q0 133 -129 211q-110 66 -252 66h-121q-55 0 -55 -111v-424q286 0 286 276q0 36 36 36t36 -36v-591q0 -33 -36 -33t-36 33q0 238 -286 238v-487q0 -70 51 -86q26 -8 125 -8q41 0 41 -36q0 -39 -35 -39h-631q-34 0 -34 39q0 36 57 36 q78 0 96.5 19t18.5 92v975q0 74 -27 92q-19 14 -97 14q-48 0 -48 38t34 38h1048q32 0 32 -35v-317zM1092 1268h-92q54 -32 92 -74v74zM819 632v139q-40 -46 -98 -74q58 -25 98 -65zM300 1161v-975q0 -71 -17 -111h197q-19 36 -19 94v988q0 64 21 111h-200q18 -39 18 -107z " />
+<glyph unicode="&#x1d53e;" horiz-adv-x="1434" d="M1448 535q0 -27 -25.5 -33t-48.5 -12q-88 -50 -88 -141v-227q0 -16 -19 -30q-79 -58 -238 -93.5t-280 -35.5q-314 0 -505 197t-191 512t191 511t505 196q97 0 213 -45.5t177 -45.5q38 0 51 45.5t41 45.5q35 0 35 -33v-391q0 -36 -35 -36q-24 0 -37 27q-12 34 -41 101 q-50 96 -174 177t-230 81q-187 0 -280 -237q-68 -173 -68 -397q0 -633 355 -633q224 0 224 87v224q0 63 -51 106t-115 43q-34 0 -34 37t34 37h599q35 0 35 -37zM1191 1222q-22 -9 -43 -9t-34 1q45 -42 77 -86v94zM1055 349v-224q0 -24 -6 -44q107 28 162 63v205q0 80 51 148 h-268q61 -62 61 -148zM224.5 1037q-96.5 -154 -96.5 -362t90.5 -359.5t252.5 -222.5q-145 177 -145 572.5t166 592.5q-171 -67 -267.5 -221z" />
+<glyph unicode="&#x1d53f;" horiz-adv-x="1676" d="M1463 76q48 0 48 -38t-35 -38h-599q-33 0 -33 39q0 36 55 36q78 0 97 19t19 92v446h-467v-457q0 -69 30 -87q20 -12 94 -12q48 0 48 -38t-35 -38h-599q-33 0 -33 39q0 36 57 36q78 0 96.5 19t18.5 92v982q0 69 -31 87q-20 11 -92 11q-49 0 -49 38.5t33 38.5h599 q35 0 35 -37.5t-57 -37.5q-78 0 -96.5 -19t-18.5 -92v-429h467v440q0 69 -31 88q-20 11 -92 11q-48 0 -48 38t33 38h599q35 0 35 -37.5t-57 -37.5q-78 0 -97 -19t-19 -92v-982q0 -69 30 -87q20 -12 95 -12zM1263 175v982q0 72 17 111h-208q18 -38 18 -100v-982 q0 -72 -17 -111h208q-18 38 -18 100zM473 175v982q0 72 17 111h-208q18 -38 18 -100v-982q0 -71 -17 -111h208q-18 38 -18 100z" />
+<glyph unicode="&#x1d540;" horiz-adv-x="901" d="M687 76q50 0 50 -38t-35 -38h-614q-35 0 -35 39q0 36 66.5 36t90 19.5t23.5 91.5v975q0 74 -31 93q-21 13 -100 13q-49 0 -49 38t35 38h614q35 0 35 -37.5t-66.5 -37.5t-90 -19.5t-23.5 -91.5v-971q0 -78 24 -94t106 -16zM308 1161v-975q0 -70 -20 -111h213 q-19 40 -19 111v971q0 70 20 111h-214q20 -39 20 -107z" />
+<glyph unicode="&#x1d541;" horiz-adv-x="1131" d="M940 1343q35 0 35 -37.5t-57 -37.5q-78 0 -96.5 -19t-18.5 -92v-937q0 -186 -128 -282q-113 -85 -305 -85q-119 0 -209 51q-108 61 -108 171q0 57 43 97.5t100 40.5t100 -40.5t43 -87.5t-27.5 -92.5t-27.5 -48.5q0 -17 77 -17q47 0 83 34t36 80v1120q0 69 -36 91 q-25 16 -94 16t-69 37.5t34 37.5h625zM555 1161v-1120q0 -50 -25 -92q198 59 198 271v937q0 72 17 111h-213q23 -41 23 -107zM211 -38q4 17 28.5 56.5t24.5 60t-20.5 40t-47.5 19.5t-47.5 -19.5t-20.5 -43.5q0 -71 83 -113z" />
+<glyph unicode="&#x1d542;" horiz-adv-x="1637" d="M1478.5 75q34.5 0 34.5 -37.5t-34 -37.5h-502q-34 0 -34 39q0 24 26 33q1 0 29 4t28 8q0 12 -55 78l-370 444l-52 -51v-373q0 -71 22.5 -89t86 -18t63.5 -36q0 -39 -34 -39h-599q-35 0 -35 39q0 36 57 36q78 0 97 19t19 92v975q0 78 -32 96q-20 11 -106 11 q-35 0 -35 37.5t35 37.5h599q34 0 34 -37.5t-57 -37.5q-78 0 -96.5 -19t-18.5 -92v-479l419 402q42 40 42 86t-24 74t-60 28q-32 0 -32 37.5t32 37.5h479q35 0 35 -37q0 -29 -32 -37q-27 -4 -54 -9q-79 -23 -173 -101q-35 -29 -149 -138l-212 -204l575 -690q49 -52 83.5 -52 zM1085 1176v-1q67 56 123 93h-150q27 -42 27 -92zM1340 75q0 1 -71 85l-511 614l-111 -106l415 -495q39 -48 39 -89v-9h239zM474 182v975q0 72 17 111h-208q18 -39 18 -107v-975q0 -71 -17 -111h208q-18 39 -18 107z" />
+<glyph unicode="&#x1d543;" horiz-adv-x="1352" d="M1189 0h-1102q-34 0 -34 39q0 36 57 36q78 0 96.5 19t18.5 92v975q0 71 -22.5 89t-86 18t-63.5 37.5t34 37.5h581q35 0 35 -37.5t-41 -37.5q-84 0 -102.5 -16.5t-18.5 -94.5v-971q0 -111 55 -111h135q129 0 254.5 69t188.5 179l24 71q17 49 44 49q14 0 26 -12t10 -26 l-55 -377q-4 -28 -34 -28zM1171 194q-65 -70 -155 -119h138zM466 186v971q0 72 15 111h-200q19 -40 19 -107v-975q0 -71 -17 -111h204q-21 47 -21 111z" />
+<glyph unicode="&#x1d544;" horiz-adv-x="1990" d="M1798 75q36 0 36 -37.5t-36 -37.5h-589q-34 0 -34 34t33 41q13 1 46 6.5t61.5 35.5t28.5 69v986l-483 -1149q-10 -23 -33 -23t-33 23l-484 1149v-954q0 -89 28.5 -116t118.5 -27q36 0 36 -37.5t-36 -37.5h-370q-35 0 -35 39q0 34 44 36q66 3 83 13q44 24 44 112v1050 q-51 18 -129 18q-34 0 -34 37.5t34 37.5h430q22 0 31 -22l377 -900l379 900q9 22 30 22h444q35 0 35 -37q0 -26 -26 -35q-23 -3 -54.5 -8.5t-60 -36t-28.5 -69.5v-971q0 -52 45.5 -81.5t100.5 -29.5zM1577 186v971q0 70 38 111h-196v-1082q0 -68 -38 -111h236 q-40 46 -40 111zM892 324l-395 944h-145l469 -1113z" />
+<glyph unicode="&#x1d545;" horiz-adv-x="1540" d="M1347 1343q33 0 33 -33.5t-29 -40.5l-53 -4q-50 -9 -63 -51q-7 -22 -7 -87v-1130q0 -34 -36 -34q-19 0 -30 14l-851 1125v-884q0 -89 28.5 -116t118.5 -27q36 0 36 -37.5t-36 -37.5h-370q-35 0 -35 39q0 34 44 36q66 3 83 13q44 24 44 112v1009q-53 59 -113 59 q-33 0 -33 37.5t33 37.5h407q14 0 26 -16l596 -802v596q0 92 -27 119.5t-119 27.5q-36 0 -36 37.5t36 37.5h353zM1140 129v269l-646 870h-214z" />
+<glyph unicode="&#x1d546;" horiz-adv-x="1493" d="M1258.5 1183q191.5 -196 191.5 -511.5t-191.5 -512t-506.5 -196.5t-507 196.5t-192 512t192 511.5t507 196t506.5 -196zM1284 314.5q91 151.5 91 357t-91 356.5t-254 222q145 -178 145 -578t-144 -580q162 71 253 222.5zM1100 671.5q0 633.5 -349 633.5t-349 -633.5 t349 -633.5t349 633.5zM473 93q-146 180 -146 577.5t144 578.5q-162 -71 -252.5 -222t-90.5 -355.5t91 -356t254 -222.5z" />
+<glyph unicode="&#x1d547;" horiz-adv-x="1207" d="M681 599l-86 2q-14 0 -57 -1v-418q0 -78 33 -96q20 -11 107 -11q34 0 34 -37.5t-34 -37.5h-591q-34 0 -34 39q0 36 40 36q84 0 102.5 16.5t18.5 94.5v975q0 71 -18 89t-94 18q-49 0 -49 37.5t34 37.5h596q214 0 347 -78q165 -96 165 -289t-171 -294q-142 -83 -343 -83z M1120 970q0 219 -250 278q59 -79 59 -271.5t-63 -279.5q254 69 254 273zM821 766q33 64 33 209.5t-30 204.5q-44 88 -180 88q-39 0 -72.5 -19.5t-33.5 -55.5v-518h105q130 0 178 91zM289 1161v-975q0 -72 -15 -111h208q-19 39 -19 107v1011q0 42 23 75h-213q16 -38 16 -107z " />
+<glyph unicode="&#x1d548;" horiz-adv-x="1493" d="M1261 -223l127 17q37 0 37 -38q0 -46 -144 -76.5t-224 -30.5q-168 0 -311.5 94t-210.5 248q-233 64 -357.5 248t-124.5 432q0 315 192 511.5t507 196.5t506.5 -196.5t191.5 -511.5q0 -260 -135.5 -446.5t-384.5 -241.5q46 -94 136 -150t195 -56zM1033 95 q165 72 253.5 223.5t88.5 354.5t-91 354.5t-254 222.5q145 -178 145 -576.5t-142 -578.5zM402 671q0 -634 349 -634t349 634t-349 634t-349 -634zM128 671q0 -417 340 -574q-141 182 -141 576.5t144 575.5q-162 -72 -252.5 -223t-90.5 -355zM853 -26q-47 -12 -108 -12 t-119 20q151 -258 431 -258q15 0 50 4q-148 54 -254 246z" />
+<glyph unicode="&#x1d549;" horiz-adv-x="1548" d="M1366 75q33 0 33 -37.5t-33 -37.5h-339q-16 0 -25 14l-387 598h-65v-430q0 -71 23 -89t87 -18t64 -36q0 -39 -34 -39h-603q-34 0 -34 39q0 36 67.5 36t87 19t19.5 92v975q0 71 -23.5 89t-87 18t-63.5 37.5t34 37.5h645q201 0 346 -81q177 -99 177 -285q0 -281 -342 -343 q356 -559 453 -559zM925 713q255 58 255 261.5t-263 271.5q72 -88 72 -269t-64 -264zM596 686q186 0 252 54.5t66 221t-54.5 236.5t-200.5 70q-109 0 -109 -75v-507h46zM1231 75q-147 136 -411 564q-48 -17 -118 -24l350 -540h179zM302 1161v-975q0 -71 -18 -111h210 q-19 40 -19 107v1011q0 42 22 75h-214q19 -40 19 -107z" />
+<glyph unicode="&#x1d54a;" horiz-adv-x="1127" d="M1038 377q0 -199 -175 -308q-148 -93 -359 -93q-48 0 -138.5 28t-132 28t-80.5 -28t-45 -28q-38 0 -38 37v409q0 52 38 52q35 0 35 -37v-17q0 -128 118 -248.5t245 -120.5t193 48t66 166.5t-116 206.5q-66 50 -226 119.5t-244 139.5q-126 107 -126 248q0 200 123 300 t328 100q48 0 140.5 -27t133.5 -27t81 27t47 27q37 0 37 -33v-361q0 -37 -37 -37q-26 0 -39.5 39.5t-23.5 73.5q-33 89 -139 166.5t-199.5 77.5t-153.5 -54t-60 -148.5t148 -177.5q27 -15 234 -102q365 -154 365 -446zM868 1170v100q-36 -17 -73 -20q43 -38 73 -80zM963 377 q0 188 -194 308l-359 173q-194 102 -194 247q0 75 32 135q-120 -82 -120 -261q0 -145 185 -248l342 -172q185 -116 185 -290q0 -83 -27 -143q150 90 150 251zM220 107q-43 40 -75 88v-108q37 18 75 20z" />
+<glyph unicode="&#x1d54b;" horiz-adv-x="1366" d="M1234 973q0 -36 -37.5 -36t-37.5 36q0 127 -111 209t-243 84v-1084q0 -74 37 -94q22 -11 101 -11q52 0 52 -38.5t-36 -38.5h-633q-33 0 -33 33.5t29 40.5q7 1 61 1t76.5 23.5t22.5 87.5v1080q-104 -1 -198.5 -54t-136.5 -143q-8 -50 -27 -117q-9 -15 -30 -15 q-37 0 -37 36v335q0 35 35 35h1112q34 0 34 -35v-335zM1159 1268h-108q66 -35 108 -84v84zM128 1268v-88q42 53 101 88h-101zM730 182v1086h-173v-1082q0 -69 -23 -111h217q-21 40 -21 107z" />
+<glyph unicode="&#x1d54c;" horiz-adv-x="1562" d="M1409 1306q0 -28 -29 -37q-26 -5 -51 -11q-92 -37 -92 -246v-519q0 -247 -131 -388.5t-372 -141.5t-380.5 121t-139.5 354v723q0 71 -18 89t-94 18q-49 0 -49 37.5t34 37.5h591q34 0 34 -37q0 -30 -29 -36q-7 -2 -61.5 -2t-73 -24.5t-18.5 -86.5v-714q0 -176 39 -263 q58 -129 214 -129q366 0 366 445v516q0 256 -136 256q-36 0 -36 37.5t36 37.5h363q33 0 33 -37zM1228 1268h-69q21 -28 35 -63q14 36 34 63zM455 443v714q0 69 21 111h-203q16 -38 16 -107v-723q0 -307 272 -380q-106 110 -106 385z" />
+<glyph unicode="&#x1d54d;" horiz-adv-x="1581" d="M1429 1343q35 0 35 -37.5t-35 -37.5q-87 0 -123 -87l-497 -1196q-9 -22 -34 -22t-35 22l-525 1158q-47 104 -95 118q-11 2 -39 10t-28 35q0 37 35 37h579q34 0 34 -37.5t-34 -37.5q-122 0 -122 -55q0 -122 330 -841q118 276 159 390q93 257 93 399q0 70 -29 93 q-10 7 -54 17q-29 5 -29 35q0 37 34 37h380zM1202 1161q0 -18 -1 -38l36 87q13 31 35 58h-91q21 -40 21 -107zM470 1213q0 31 13 55h-252q23 -28 52 -94l490 -1080l70 168q-373 798 -373 951z" />
+<glyph unicode="&#x1d54e;" horiz-adv-x="2114" d="M1949 1343q34 0 34 -37.5t-34 -37.5q-50 0 -79 -82l-425 -1196q-10 -27 -36.5 -27t-36.5 27l-329 869l-380 -874q-10 -22 -36.5 -22t-36.5 27l-410 1159q-23 66 -31 81q-21 38 -51 38q-45 0 -45 37.5t35 37.5h483q34 0 34 -37.5t-34 -37.5q-74 0 -74 -43q0 -119 101 -417 l155 -423l250 579l-74 195q-33 86 -79 103q-21 5 -42 12t-21 32q0 37 34 37h539q35 0 35 -37.5t-35 -37.5q-24 0 -62 -15.5t-38 -35.5q0 -107 99 -389l151 -395q95 262 120 347q64 214 64 355q0 108 -56 128q-22 5 -45.5 11t-23.5 32q0 37 36 37h344zM1826 1268h-84 q27 -42 27 -127v-6v-9l30 85q12 32 27 57zM1185 1217q0 27 16 51h-247q41 -51 70 -134l54 -157l329 -869l71 198q-293 736 -293 911zM422 1225q0 23 9 43h-218q13 -25 38 -94l380 -1075l79 182q-141 372 -183 499q-105 313 -105 445z" />
+<glyph unicode="&#x1d54f;" horiz-adv-x="1534" d="M1400 39q0 -39 -34 -39h-588q-34 0 -34 37.5t34 37.5q133 0 133 30q0 67 -202 355l-40 57l-216 -247q-43 -49 -43 -93t23 -73t58 -29t35 -37.5t-34 -37.5h-405q-34 0 -34 39q0 23 26 33q22 6 45 11q60 18 250 233l244 277q-60 96 -289 428l-80 120q-59 85 -88 104l-60 21 q-40 14 -40 40q0 37 34 37h569q34 0 34 -37.5t-34 -37.5q-103 0 -103 -30q0 -47 212 -355l144 191q38 50 38 111.5t-53.5 79t-53.5 41.5q0 37 36 37h458q34 0 34 -37q0 -30 -40 -40l-64 -8q-127 -26 -279 -227l-170 -224q438 -679 496 -716q25 -8 53 -18t28 -34zM1120 1268 h-109q17 -32 19 -80q49 51 90 80zM486 1238q0 16 5 30h-248q36 -33 73 -90l556 -831q114 -182 114 -242q0 -16 -5 -30h248q-3 3 -46 63t-283 420l-318 475q-96 153 -96 205zM362 75q-24 39 -27 84q-50 -50 -90 -84h117z" />
+<glyph unicode="&#x1d550;" horiz-adv-x="1511" d="M1393 1306q0 -23 -32 -37q-62 -27 -117 -102q-4 -5 -85 -135l-274 -440v-374q0 -96 23.5 -119.5t125.5 -23.5q34 0 34 -37.5t-34 -37.5h-619q-33 0 -33 39q0 36 39 36q95 0 118 22.5t23 111.5v306l-348 623q-17 34 -58 98q-21 25 -62 33t-41 37q0 37 35 37h500 q33 0 33 -33t-40 -42q-32 -4 -63 -9q1 -20 36 -82l289 -515l252 408q20 32 20 77.5t-35.5 83t-85.5 37.5q-36 0 -36 37.5t36 37.5h366q33 0 33 -37zM1232 1268h-86q22 -28 33 -62q38 48 53 62zM810 218v348l-345 615q-19 37 -23 87h-216q6 -8 53 -93l358 -640v-326 q0 -89 -22 -134h218q-23 46 -23 143z" />
+<glyph unicode="&#x1d551;" horiz-adv-x="1351" d="M1157 0h-1069q-35 0 -35 39q0 10 749 1229h-147q-326 0 -431 -191l-23 -73q-16 -50 -43 -50q-37 0 -37 33v7l35 314q4 35 33 35h961q35 0 35 -37q0 -12 -4 -19l-744 -1212h277q135 0 247 66.5t173 184.5l38 121q12 32 37 32q37 0 37 -29q0 -3 -1 -7l-56 -407 q-5 -36 -32 -36zM318 1268h-91l-8 -74q42 43 99 74zM1081 1268h-191l-731 -1193h190zM1135 192q-59 -70 -139 -117h123z" />
+<glyph unicode="&#x1d552;" horiz-adv-x="1411" d="M1173 75q61 0 61 -37.5t-36 -37.5h-222q-181 0 -210 102q-39 -52 -121 -82.5t-156 -30.5q-163 0 -281 47q-163 64 -163 201q0 185 281 271q192 59 435 59v77q0 100 -57 170t-155 70q-49 0 -155 -24q43 -44 43 -106t-48.5 -98.5t-107.5 -36.5t-107.5 36t-48.5 94 q0 210 427 210q183 0 322 -65q180 -84 180 -245v-515q0 -59 119 -59zM979 134v515q0 144 -211 205q68 -89 68 -210v-377q0 -48 -16 -91q16 -60 44 -80.5t112 -20.5h16q-13 25 -13 59zM200 749q0 -19 22 -37t58.5 -18t59 18.5t22.5 43.5t-20 50l-44 45q-98 -35 -98 -102z M761 267v225q-148 -1 -268 -55q-155 -71 -155 -200q0 -69 55 -121.5t136.5 -52.5t156.5 57t75 147zM120 237q0 -116 203 -157q-60 70 -60 157q0 120 95 202q-238 -68 -238 -202z" />
+<glyph unicode="&#x1d553;" horiz-adv-x="1350" d="M1065 795q135 -128 135 -341.5t-146 -339t-365 -125.5q-176 0 -297 122l-97 -111h-216q-34 0 -34 37.5t34 37.5q59 0 59 116v1010q0 117 -59 117q-34 0 -34 37.5t34 37.5h306q35 0 35 -34v-527q126 91 298 91q212 0 347 -128zM921 115q204 102 204 346t-202 343 q79 -113 79 -343t-81 -346zM652 63q275 0 275 392.5t-248 392.5q-160 0 -259 -122v-529q84 -134 232 -134zM345 1318h-155q23 -50 23 -117v-1010q0 -67 -23 -116h71l84 97v1146z" />
+<glyph unicode="&#x1d554;" horiz-adv-x="1109" d="M960 759q0 -58 -39.5 -99t-97 -41t-98 41t-40.5 99t36 96q-66 29 -136 29q-247 0 -247 -410.5t294 -410.5q95 0 160 58q39 36 73.5 101.5t48.5 65.5q42 0 42 -30q0 -9 -3 -17q-43 -121 -141 -186.5t-229 -65.5q-228 0 -383 129.5t-155 353.5t154.5 355.5t383.5 131.5 q377 0 377 -200zM824 694q61 0 61 63t-68 94q-57 -53 -57 -92q0 -65 64 -65zM369 103q-106 129 -106 368t78 361q-221 -107 -221 -367.5t249 -361.5z" />
+<glyph unicode="&#x1d555;" horiz-adv-x="1317" d="M1165 75q35 0 35 -37.5t-35 -37.5h-340v86q-110 -97 -269 -97q-219 0 -365 125.5t-146 339t135 341.5t347 128q171 0 298 -91v369q0 117 -58 117q-35 0 -35 37.5t35 37.5h306q34 0 34 -34v-1168q0 -116 58 -116zM1032 191v1127h-155q23 -49 23 -117v-1126h155 q-23 49 -23 116zM565 848q-248 0 -248 -392.5t275 -392.5q148 0 233 134v529q-99 122 -260 122zM322 115q-80 117 -80 344.5t79 343.5q-201 -100 -201 -342.5t202 -345.5z" />
+<glyph unicode="&#x1d556;" horiz-adv-x="1242" d="M1119 504q0 -44 -37 -44h-743v-5q0 -183 40 -267q58 -125 220 -125q223 0 356 131q82 81 90 81q34 0 34 -25t-29 -64q-147 -197 -458 -197q-240 0 -393.5 127t-153.5 355t155 358t378.5 130t382 -120t158.5 -335zM898 535h145q-17 215 -232 306q87 -123 87 -306zM823 535 q0 135 -53 231q-66 118 -191.5 118t-189.5 -117q-50 -93 -50 -227v-5h484zM340 832q-220 -107 -220 -359t212 -356q-70 114 -70 352t78 363z" />
+<glyph unicode="&#x1d557;" horiz-adv-x="873" d="M935 1266q0 -55 -42 -98t-97.5 -43t-99 42.5t-43.5 101.5t52 106q-13 10 -31 10q-193 0 -193 -368v-94h146q35 0 35 -37.5t-35 -37.5h-146v-657q0 -87 33 -109l38 -14q20 -8 20 -31q0 -37 -34 -37h-399q-34 0 -34 37.5t34 37.5q58 0 58 116v657h-117q-35 0 -35 37.5 t35 37.5h117v132q0 193 111.5 299t305.5 106q321 0 321 -194zM860 1266q0 67 -78 96q-4 -22 -29 -45t-25 -49t21 -47t46 -21t45 20.5t20 45.5zM272 1055v-864q0 -67 -23 -116h176q-19 38 -19 116v826q0 243 80 352q-214 -60 -214 -314z" />
+<glyph unicode="&#x1d558;" horiz-adv-x="1390" d="M413 154l168 2q259 0 392 -47q215 -77 215 -286q0 -153 -225 -221q-147 -44 -351 -44t-348 44q-219 68 -219 221q0 125 178 176q-104 91 -104 230q0 106 67 188q-105 84 -105 221q0 159 165 246q133 69 326.5 69t307.5 -66q101 77 231 77q52 0 91 -38t39 -84t-28.5 -74.5 t-68 -28.5t-68.5 28.5t-29 57.5t6 46q-56 -10 -108 -34q81 -84 81 -199q0 -160 -164 -246q-132 -69 -317 -69t-293 52q-17 -28 -17 -60q0 -62 57.5 -111.5t120.5 -49.5zM1166 836q0 40 -43 51v-26q-1 -18 -1 -25q0 -22 22 -22t22 22zM951 638q0 165 -190 218q47 -74 47 -212 t-39 -211q182 66 182 205zM705 471q28 53 28 169t-31 169q-41 69 -149.5 69t-149.5 -74q-28 -53 -28 -169t31 -169q41 -69 149.5 -69t149.5 74zM347 420q-47 75 -47 213t39 210q-183 -66 -183 -205q0 -81 54 -138t137 -80zM610 82l-197 -3q-135 0 -216 119q8 -34 57 -114.5 t49 -105.5q0 -5 -1 -9q45 44 132 44h205q330 0 330 -196q0 -90 -54 -150q198 49 198 156q0 259 -503 259zM894 -183q0 121 -268 121h-192q-63 0 -84.5 -28.5t-21.5 -92.5q0 -100 97 -151q77 -41 186 -41t186 41q97 51 97 151zM306 -332q-53 60 -53 144t28 131l-95 -40 q-66 -31 -66 -80q0 -106 186 -155z" />
+<glyph unicode="&#x1d559;" horiz-adv-x="1352" d="M1175 75q35 0 35 -37.5t-35 -37.5h-399q-35 0 -35 37.5t35 37.5q59 0 59 116v469q0 188 -107 188q-122 0 -215 -95t-93 -217v-345q0 -116 59 -116q35 0 35 -37.5t-35 -37.5h-400q-34 0 -34 37.5t34 37.5q59 0 59 116v1010q0 117 -59 117q-34 0 -34 37.5t34 37.5h306 q35 0 35 -34v-619q54 84 144 133.5t189 49.5q364 0 364 -291v-441q0 -116 58 -116zM1042 191v441q0 170 -169 205q37 -68 37 -177v-469q0 -66 -23 -116h177q-22 48 -22 116zM345 191v1127h-155q23 -50 23 -117v-1010q0 -66 -23 -116h177q-22 49 -22 116z" />
+<glyph unicode="&#x1d55a;" horiz-adv-x="633" d="M440 1245q0 -67 -49 -116t-116 -49t-115 49t-48 116t48 115.5t115 48.5t116 -48.5t49 -115.5zM479 75q35 0 35 -37.5t-35 -37.5h-400q-34 0 -34 37.5t34 37.5q59 0 59 108v560q0 105 -59 105q-34 0 -34 37.5t34 37.5h306q35 0 35 -34v-698q0 -116 59 -116zM338 1182 q27 27 27 62.5t-27 62.5t-63 27t-62 -26.5t-26 -63t26.5 -63t62 -26.5t62.5 27zM345 191v657h-155q23 -47 23 -105v-560q0 -60 -23 -108h177q-22 49 -22 116z" />
+<glyph unicode="&#x1d55b;" horiz-adv-x="947" d="M757 1245q0 -67 -48 -116t-115 -49t-116 49t-49 116t49 115.5t116 48.5t115 -48.5t48 -115.5zM738 -4q0 -193 -112 -298.5t-306 -105.5q-320 0 -320 194q0 55 42 98t97.5 43t99 -42.5t43.5 -100.5t-52 -106q18 -11 41 -11q185 0 185 325v738q0 118 -59 118 q-35 0 -35 37.5t35 37.5h306q35 0 35 -34v-893zM655.5 1181.5q26.5 26.5 26.5 63t-26 63t-62 26.5t-63 -26.5t-27 -62.5t27 -63t62.5 -27t62 26.5zM663 -4v852h-155q23 -50 23 -118v-738q0 -202 -74 -307q206 63 206 311zM139 -304q68 63 68 88.5t-21 46.5t-46 21t-45 -20.5 t-20 -45.5q0 -62 64 -90z" />
+<glyph unicode="&#x1d55c;" horiz-adv-x="1265" d="M1065 75q35 0 35 -37.5t-35 -37.5h-430q-36 0 -36 35.5t40.5 38.5t47.5 11q-2 22 -50 83l-190 239l-27 -23v-197q0 -112 59 -112q35 0 35 -37.5t-35 -37.5h-400q-34 0 -34 37.5t34 37.5q59 0 59 116v1010q0 117 -59 117q-34 0 -34 37.5t34 37.5h306q35 0 35 -34v-875 l225 204q52 47 52 98t-38 62t-38 39q0 36 34 36h369q35 0 35 -37.5t-35 -37.5q-95 0 -385 -266l293 -369q110 -138 133 -138zM839 848h-75q7 -21 8 -49q35 28 67 49zM950 75q-131 126 -360 441q-35 -34 -77 -69q158 -192 216 -275q29 -41 34 -97h187zM345 187v1131h-155 q23 -50 23 -117v-1010q0 -66 -23 -116h178q-23 48 -23 112z" />
+<glyph unicode="&#x1d55d;" horiz-adv-x="710" d="M479 75q35 0 35 -37.5t-35 -37.5h-400q-34 0 -34 37.5t34 37.5q59 0 59 112v1018q0 67 -24 93q-10 11 -45 24q-24 10 -24 35q0 36 34 36h306q35 0 35 -34v-1168q0 -116 59 -116zM345 191v1127h-154q22 -42 22 -113v-1018q0 -63 -23 -112h177q-22 49 -22 116z" />
+<glyph unicode="&#x1d55e;" horiz-adv-x="2099" d="M1871 75q35 0 35 -37.5t-35 -37.5h-399q-35 0 -35 37.5t35 37.5q59 0 59 116v462q0 195 -106 195q-122 0 -215 -95t-93 -217v-345q0 -116 58 -116q35 0 35 -37.5t-35 -37.5h-399q-35 0 -35 37.5t35 37.5q59 0 59 116v462q0 195 -107 195q-122 0 -215 -95t-93 -217v-345 q0 -116 59 -116q35 0 35 -37.5t-35 -37.5h-400q-34 0 -34 37.5t34 37.5q59 0 59 116v539q0 118 -59 118q-34 0 -34 37.5t34 37.5h306q35 0 35 -34v-149q54 84 144 133.5t189 49.5q302 0 353 -200q135 200 344 200q363 0 363 -291v-441q0 -116 58 -116zM1738 191v441 q0 170 -169 205q37 -68 37 -184v-462q0 -66 -23 -116h177q-22 48 -22 116zM1042 191v345q0 45 12 90q-27 102 -62.5 149t-119.5 64q38 -70 38 -186v-462q0 -66 -23 -116h177q-22 48 -22 116zM345 191v657h-156q24 -50 24 -118v-539q0 -66 -23 -116h177q-22 49 -22 116z" />
+<glyph unicode="&#x1d55f;" horiz-adv-x="1403" d="M1175 75q35 0 35 -37.5t-35 -37.5h-399q-35 0 -35 37.5t35 37.5q59 0 59 116v469q0 188 -107 188q-122 0 -215 -95t-93 -217v-345q0 -116 59 -116q35 0 35 -37.5t-35 -37.5h-400q-34 0 -34 37.5t34 37.5q59 0 59 116v539q0 118 -59 118q-34 0 -34 37.5t34 37.5h306 q35 0 35 -34v-149q54 84 144 133.5t189 49.5q364 0 364 -291v-441q0 -116 58 -116zM1042 191v441q0 170 -169 205q37 -68 37 -177v-469q0 -67 -23 -116h177q-22 48 -22 116zM345 191v657h-155q23 -50 23 -118v-539q0 -67 -23 -116h177q-22 49 -22 116z" />
+<glyph unicode="&#x1d560;" horiz-adv-x="1281" d="M589 959q235 0 390.5 -133t155.5 -361t-157.5 -352t-388.5 -124t-387.5 124t-156.5 352t154.5 361t389.5 133zM852 121q208 104 208 345t-201 354q58 -101 58 -345.5t-65 -353.5zM810 205q32 84 32 277.5t-35 274.5q-56 127 -218 127t-217 -127q-35 -81 -35 -275t31 -277 q55 -142 221 -142t221 142zM326 121q-64 109 -64 351t58 348q-200 -112 -200 -353.5t206 -345.5z" />
+<glyph unicode="&#x1d561;" horiz-adv-x="1330" d="M688 923q219 0 365 -125.5t146 -339t-134.5 -341.5t-346.5 -128q-172 0 -298 91v-436q0 -33 -35 -33h-306q-34 0 -34 37.5t34 37.5q59 0 59 117v927q0 118 -59 118q-34 0 -34 37.5t34 37.5h341v-96q109 96 268 96zM923 108q201 100 201 343.5t-203 345.5q80 -116 80 -344 t-78 -345zM679 63q247 0 247 392.5t-274 392.5q-147 0 -232 -135v-528q98 -122 259 -122zM345 -314v1162h-155q23 -50 23 -118v-927q0 -67 -23 -117h155z" />
+<glyph unicode="&#x1d562;" horiz-adv-x="1347" d="M1199 -354q0 -35 -34 -35h-307q-34 0 -34 33v436q-126 -91 -299 -91q-212 0 -346 128t-134 341.5t146 339t365 125.5q174 0 295 -122l98 112h216q34 0 34 -37.5t-34 -37.5q-59 0 -59 -118v-917q0 -71 24 -98q10 -11 39.5 -22t29.5 -37zM899 -314h154q-22 43 -22 117v917 q0 68 23 118h-71l-87 -99l3 -4v-1049zM591 848q-274 0 -274 -392.5t247 -392.5q161 0 260 122v528q-85 135 -233 135zM322 796q-202 -102 -202 -345t200 -342q-78 116 -78 344t80 343z" />
+<glyph unicode="&#x1d563;" horiz-adv-x="1023" d="M900 751q0 -54 -37.5 -92t-91.5 -38t-92 38t-38 95t30 94q-127 -3 -197 -161q-54 -123 -54 -270v-226q0 -116 59 -116q34 0 34 -37.5t-34 -37.5h-400q-34 0 -34 37.5t34 37.5q59 0 59 116v539q0 118 -59 118q-34 0 -34 37.5t34 37.5h306q35 0 35 -34v-163q79 197 253 197 q87 0 157 -45t70 -127zM716 751q0 -55 54.5 -55t54.5 56t-75 83q-34 -46 -34 -84zM345 191v657h-155q23 -50 23 -118v-539q0 -67 -23 -116h177q-22 49 -22 116z" />
+<glyph unicode="&#x1d564;" horiz-adv-x="1248" d="M1106 302q0 -166 -193 -250q-145 -63 -337 -63q-257 0 -370 64q-89 -64 -125 -64t-36 28v298q0 35 37.5 35t37.5 -35q0 -124 174 -196q136 -56 282 -56q95 0 158 34q80 43 80 130q0 97 -199 150l-371 89q-199 69 -199 209q0 155 199 230q144 54 355.5 54t307.5 -40 q68 40 111 40q28 0 28 -28v-239q0 -35 -37.5 -35t-37.5 35q0 92 -157 148q-123 44 -242 44q-234 0 -234 -130q0 -78 199 -127q337 -83 370 -96q199 -79 199 -229zM971 840v28q-10 -5 -22 -12q12 -8 22 -16zM1031 302q0 116 -199 177l-370 90q-199 63 -199 185q0 48 19 85 q-162 -55 -162 -164q0 -101 199 -154l371 -89q199 -68 199 -205q0 -67 -30 -116q172 64 172 191zM157 110q-20 16 -37 32v-57z" />
+<glyph unicode="&#x1d565;" horiz-adv-x="945" d="M771 923q35 0 35 -37.5t-35 -37.5h-244v-577q0 -193 85.5 -193t85.5 216q0 41 37.5 41t37.5 -35q0 -147 -41 -218q-54 -93 -191 -93q-302 0 -302 260v599h-159q-35 0 -35 37.5t35 37.5q243 0 290 329q17 119 89 119q68 0 68 -92v-356h244zM452 271v1004l-46 -187 q-27 -99 -103 -165h11v-674q0 -168 184 -183q-46 70 -46 205z" />
+<glyph unicode="&#x1d566;" horiz-adv-x="1406" d="M1175 75q35 0 35 -37.5t-35 -37.5h-306q-34 0 -34 34v149q-54 -84 -144 -133.5t-189 -49.5q-364 0 -364 292v438q0 118 -59 118q-34 0 -34 37.5t34 37.5h400q35 0 35 -37.5t-35 -37.5q-59 0 -59 -118v-468q0 -187 107 -187q122 0 215 95t93 217v343q0 118 -59 118 q-35 0 -35 37.5t35 37.5h399q35 0 35 -37.5t-35 -37.5q-58 0 -58 -118v-539q0 -116 58 -116zM910 730v-655h155q-23 49 -23 116v539q0 68 23 118h-178q23 -49 23 -118zM345 262v468q0 68 24 118h-179q23 -49 23 -118v-438q0 -170 169 -206q-37 68 -37 176z" />
+<glyph unicode="&#x1d567;" horiz-adv-x="1409" d="M1233 923q34 0 34 -37.5t-34 -37.5q-66 0 -145.5 -75t-110.5 -145l-266 -599q-18 -40 -101.5 -40t-102.5 41l-316 680q-16 35 -53 86.5t-59 51.5q-34 0 -34 37.5t34 37.5h397q35 0 35 -36t-40 -38t-47 -11q1 -20 31 -84l255 -542l212 476q22 49 22 88q0 59 -57.5 70.5 t-57.5 40.5q0 36 35 36h369zM1060 848h-56q9 -19 13 -42q21 23 43 42zM574 69q15 -5 33 -5t40 6q6 13 21 53l-302 642q-15 34 -17 83h-156q38 -48 66 -106z" />
+<glyph unicode="&#x1d568;" horiz-adv-x="1990" d="M1814 923q34 0 34 -37.5t-34 -37.5q-66 0 -145.5 -75t-110.5 -145l-267 -599q-18 -40 -101 -40t-102 41l-193 413l-184 -414q-18 -40 -101.5 -40t-102.5 41l-316 680q-16 35 -53 86.5t-59 51.5q-34 0 -34 37.5t34 37.5h397q35 0 35 -36t-40 -38t-47 -11q1 -20 31 -84 l255 -542l143 322q-138 314 -193 314q-35 0 -35 37.5t35 37.5h396q36 0 36 -36t-40.5 -38t-47.5 -11q1 -20 31 -84l255 -542l213 476q21 47 21 88q0 59 -57 70.5t-57 40.5q0 36 34 36h370zM1641 848h-57q9 -19 13 -43q22 24 44 43zM1155 69q15 -5 32.5 -5t39.5 6q6 13 21 53 q-221 456 -302 642q-14 34 -17 83h-155q47 -60 99 -171l62 -143zM574 69q16 -5 33.5 -5t39.5 6l22 50q-221 458 -303 645q-14 34 -17 83h-156q38 -48 66 -106z" />
+<glyph unicode="&#x1d569;" horiz-adv-x="1324" d="M1125 75q35 0 35 -37.5t-35 -37.5h-430q-34 0 -34 35t30 39q40 4 47 12q-6 27 -183 239l-97 -90q-52 -48 -52 -98.5t38.5 -61.5t38.5 -39q0 -36 -35 -36h-369q-34 0 -34 37.5t34 37.5q70 0 224 127q46 38 204 185l-256 322q-111 139 -131 139q-35 0 -35 37.5t35 37.5h429 q35 0 35 -35.5t-39.5 -38t-47.5 -11.5q4 -34 149 -207l74 71q38 46 38 91.5t-38 56t-38 37.5q0 36 33 36h369q36 0 36 -37.5t-36 -37.5q-68 0 -205 -111q-43 -36 -184 -167l288 -364q104 -131 142 -131zM902 848h-77q8 -22 8 -52q37 30 69 52zM995 75q-23 24 -71 84 l-309 392l-117 139q-64 84 -77 158h-183l366 -462l124 -149q70 -89 89 -162h178zM339 75q-8 22 -8 52q-37 -29 -71 -52h79z" />
+<glyph unicode="&#x1d56a;" horiz-adv-x="1430" d="M1254 923q34 0 34 -37.5t-34 -37.5q-66 0 -144.5 -74.5t-110.5 -145.5l-364 -807q-46 -102 -135 -166.5t-197 -64.5q-258 0 -258 185q0 56 42.5 99t98 43t98 -43t42.5 -101t-50 -105q13 -3 27 -3q113 0 182 66q52 49 104 168l-378 811q-17 36 -53 87t-58 51 q-34 0 -34 37.5t34 37.5h396q36 0 36 -39q0 -32 -40 -35t-48 -11q1 -21 31 -84l255 -543l214 477q22 49 22 88q0 59 -57.5 70.5t-57.5 40.5q0 36 35 36h368zM1082 848h-56q9 -19 13 -42q21 23 43 42zM682 134q-214 441 -295 631q-15 33 -19 83h-154q37 -47 65 -106l348 -746 zM184 -315q67 62 67 88.5t-21 47.5t-45 21t-44.5 -21t-20.5 -46q0 -63 64 -90z" />
+<glyph unicode="&#x1d56b;" horiz-adv-x="1156" d="M965 868q0 -14 -9 -26l-575 -767h157q310 0 340 230q5 39 6 42q7 20 35 20q37 0 35 -36l-23 -331h-849q-37 0 -37 59q0 12 11 27l572 762h-133q-309 0 -339 -230q-5 -38 -7 -42q-8 -20 -35 -20q-39 0 -36 36l23 331h826q38 0 38 -55zM209 848h-38l-2 -35q18 19 40 35z M866 848h-144l-580 -773h145zM863 108q-18 -18 -39 -33h37z" />
+<glyph unicode="&#x1d56c;" horiz-adv-x="1655" d="M1027 233q0 43 -9 79l-383 -339q-57 88 -143.5 149.5t-179.5 61.5q-56 0 -109 -37t-80 -89l-24 7q38 139 338 345q28 19 40 30t25 35q32 57 32 314q0 485 -247 485q-63 0 -114.5 -35t-51.5 -99t80 -95q124 -49 147 -69q80 -65 80 -216q0 -223 -275 -305v31 q48 15 105.5 47.5t57.5 63.5q0 28 -88.5 75t-129.5 89q-76 77 -76 197q0 181 125 294.5t308 113.5q456 0 456 -464q0 -187 -83 -285q-68 -81 -346 -211q233 -36 379 -184l162 139v698q0 122 -90 282q15 0 27 9q65 -95 105 -233q44 123 214 185q132 48 293 48v-29q-8 1 -19 1 q-56 0 -108 -46t-52 -101v-883q0 -25 21 -44t46 -19q54 0 115 60v-32q-62 -60 -344 -284q-78 31 -141 106t-63 154z" />
+<glyph unicode="&#x1d56d;" horiz-adv-x="1750" d="M1607 903l44 3q23 0 20 -20q-115 -19 -189.5 -33.5t-104.5 -31.5q249 -102 249 -298q0 -233 -296 -409q-237 -141 -435 -141q-129 0 -261 80q-26 16 -201 150q-106 80 -171 80q-115 0 -121 -151h-36q0 161 117 247.5t285 91.5q43 102 43 375q0 428 -240 428 q-53 0 -98.5 -31t-45.5 -78t70 -93q111 -74 131 -93q70 -68 70 -163q0 -122 -107 -218.5t-231 -97.5v29q53 1 102 26q61 30 61 77q0 27 -85.5 87t-116.5 115t-31 155q0 168 168 279q149 98 326 98q114 0 217.5 -53t143.5 -151q37 204 298 204q165 0 237.5 -83t87.5 -253 q0 -23 7 -68q18 -59 93 -59zM919 1148l15 -205q0 -100 -21 -210l518 133q-187 3 -248 115q-20 35 -46 205q-17 110 -98 110q-120 0 -120 -148zM1393 289q0 156 -167 283.5t-329 129.5q-59 -89 -162 -148q-52 -30 -201 -90q108 -2 239 -94l215 -171q121 -91 203.5 -91 t142 50.5t59.5 130.5z" />
+<glyph unicode="&#x1d56e;" horiz-adv-x="1653" d="M1602 1209q0 -12 -56 -68t-105.5 -81.5t-133 -25.5t-198 67.5t-109.5 67.5q-25 0 -49.5 -27.5t-24.5 -53.5q0 -47 92 -146q139 -152 169 -194q92 -126 92 -242.5t-102.5 -196.5t-227.5 -80q-267 0 -330 361h34q11 -96 70 -192q70 -115 154 -115q36 0 65 21.5t29 56.5 q0 68 -80 152l-149 149q-80 94 -80 188q0 70 68 153q44 52 120 115.5t76 70.5q0 49 -59.5 86t-112.5 37q-161 0 -226 -257q-39 -156 -39 -387q0 -293 95 -445q118 -189 394 -189q208 0 357.5 110t201.5 309h35q-102 -480 -690 -480q-343 0 -590 206t-247 543 q0 266 183.5 455t448.5 189q219 0 292 -166l278 173q84 -173 224 -173q71 0 131 45v-36z" />
+<glyph unicode="&#x1d56f;" horiz-adv-x="1709" d="M1604 632q0 -288 -193 -473.5t-482 -185.5q-145 0 -374.5 109t-294.5 109q-125 0 -141 -135q-18 0 -36 9q35 159 155.5 252t284.5 93q67 0 173 -26t170 -57q60 32 60 78.5t-103 88.5q-172 69 -193 81q-103 61 -103 154t166 301q-19 4 -45 4q-196 0 -344 -45 q-221 -67 -221 -215q0 -82 71.5 -129.5t157.5 -47.5q36 0 155 22v-27q-117 -25 -155 -25q-283 0 -283 299q0 242 244 382q204 118 465 118q350 0 596 -188q270 -207 270 -546zM1543 500q0 228 -287 392q-249 142 -496 142q-23 0 -41.5 -24t-18.5 -48q0 -30 129 -76t184 -80 q109 -71 109 -178q0 -77 -77 -175q-15 -19 -134 -146q207 -107 334 -107t212.5 81.5t85.5 218.5z" />
+<glyph unicode="&#x1d570;" horiz-adv-x="1729" d="M1637 1231q-28 -61 -139 -118t-195 -57t-152 42q-39 23 -130 109q-29 -2 -55 -23t-26 -52t63 -114l114 -150q40 -55 90 -150q37 240 204 240q92 0 157 -59t65 -138.5t-43.5 -121.5t-108 -42t-107 36t-42.5 97.5t83 141.5q-17 34 -49 34q-68 0 -103 -66q-29 -53 -29 -107 t19 -117.5t19 -97.5q0 -131 -105 -207t-240.5 -76t-222.5 114.5t-87 253.5h38q0 -96 66 -205t156 -109q72 0 72 79q0 56 -136 230.5t-136 283t89 195.5q33 32 183 134q-58 101 -200 101q-253 0 -253 -691q0 -284 78 -419q102 -177 366 -177q172 0 326.5 71.5t234.5 208.5 q10 -9 15 -20q-77 -155 -257 -233.5t-375 -78.5q-344 0 -588 203.5t-244 541.5q0 271 175 459.5t444 188.5q159 0 271 -101q40 -36 45 -36q37 0 298 150q62 -157 209 -157q88 0 161 74q-7 -40 -18 -65z" />
+<glyph unicode="&#x1d571;" horiz-adv-x="1624" d="M1140 846l-108 9q-61 0 -61 -72q0 -100 137 -247q-9 78 -9 83q0 91 62 139.5t145 48.5t144.5 -44t61.5 -111t-42 -106t-108 -39q-151 0 -151 125q0 67 61 113q-10 11 -29 11q-48 0 -77 -43t-29 -94q0 -90 128 -265.5t128 -297.5q0 -228 -217 -372q-191 -126 -417 -126 t-410 109q-214 126 -214 324q0 90 57 188q23 40 92.5 131t69.5 123q0 58 -70.5 58t-128.5 -60t-90 -133q-14 2 -27 11q109 252 334 252q120 0 205 -76.5t85 -185t-112.5 -259.5t-112.5 -237q0 -104 90.5 -159t214.5 -55t221.5 67.5t97.5 199.5l-323 646q0 102 78 203 q36 47 155 159l-361 148q-171 67 -275 67t-171 -41q-81 -49 -81 -140.5t99 -147.5q84 -48 184 -48q181 0 300 137l34 -20q-135 -146 -343 -146q-149 0 -238.5 76t-89.5 222q0 188 169 299q147 96 333 96t366 -81q1 -1 204.5 -115t271.5 -114q103 0 103 65t-80 109 q-31 17 -138 53v29q254 -62 254 -211q0 -132 -126 -200q-102 -55 -246 -55z" />
+<glyph unicode="&#x1d572;" horiz-adv-x="1864" d="M1799 541q0 -274 -284 -434q-236 -134 -533 -134q-364 0 -616 169q-290 195 -290 542q0 275 196 478.5t470 203.5q164 0 301 -99q33 23 146 81l-11 -40q-50 -24 -110 -61q40 -36 98 -128l-35 -9q-43 71 -97 119q-78 -42 -78 -108q0 -45 73 -166t128 -192q191 85 191 148 q0 8 -57 66.5t-57 117.5q0 114 160 191q133 64 261 64v-36q-63 -10 -89 -19q-52 -20 -61 -59q104 -54 120 -66q62 -47 62 -110.5t-77.5 -119.5t-149.5 -76q42 -9 126 -30q213 -63 213 -293zM1384 451q0 327 -101 327q-17 0 -110 -47q83 -107 83 -234t-103 -212t-236 -85 q-162 0 -253 159q-40 71 -52 157h36q56 -265 213 -265q72 0 72 65q0 58 -68 147q-124 161 -126 164q-68 106 -68 207q0 127 112 246q64 70 217 176q-101 56 -190 56q-188 0 -254 -232q-36 -129 -36 -412t65 -435q99 -231 366 -231q237 0 335 105t98 344z" />
+<glyph unicode="&#x1d573;" horiz-adv-x="1747" d="M1694 451q0 -171 -126 -305q-97 -103 -288 -199l-311 -144q-33 -17 -101 -48q-87 142 -213 142q-55 0 -95 -35t-40 -89q0 -90 108 -146q89 -47 189.5 -47t214 50t184.5 125l27 -7q-169 -190 -427 -190q-130 0 -220 56q-107 67 -107 196t103.5 218t241.5 89 q97 0 181 -57.5t127 -147.5q175 85 175 346q0 204 -114 339.5t-315 135.5q-92 0 -181 -58q58 -93 70 -117q35 -70 35 -130q0 -156 -167 -266q-149 -99 -313 -99q-118 0 -210.5 69t-92.5 184q0 63 46 108t107.5 45t109 -40t47.5 -104t-56 -124.5t-56 -61.5q0 -54 107 -54 q68 0 119.5 39t51.5 104.5t-80 171.5q-144 189 -150 198q-80 127 -80 243q0 141 162 238q36 21 249.5 108.5t384.5 178.5q75 -211 274 -211q144 0 233 128q14 -2 14 -25.5t-75 -102.5q-179 -188 -398 -188q-123 0 -201.5 55.5t-148.5 170.5q-162 -68 -162 -177t155 -314 q186 109 243 135q138 62 268 62q205 0 353 -123.5t148 -324.5z" />
+<glyph unicode="&#x1d574;" horiz-adv-x="1458" d="M1310 1193q0 -105 -92.5 -173.5t-196 -68.5t-324.5 113.5t-340 113.5q-79 0 -143 -40t-64 -115q0 -168 240 -168q117 0 195 42l-2 -36q-102 -38 -208 -38t-178 47q-85 55 -85 164q0 157 137.5 255.5t300.5 98.5q123 0 338 -90.5t267 -90.5q94 0 94 49q0 60 -105 105 q10 10 9 25q157 -68 157 -193zM1137 861q-69 0 -69 -56q0 -39 110 -237.5t110 -284.5q0 -175 -176 -274q-146 -81 -336 -81q-273 0 -397 121q-59 57 -119 225q-43 121 -103 121q-87 0 -87 -160q0 -62 13 -109h-52q-2 21 -2 63v46q0 125 78.5 209.5t202.5 84.5 q185 0 258 -148q8 -16 30.5 -79.5t74.5 -196.5q64 -148 177 -148q59 0 104.5 35t45.5 93q0 79 -108.5 259t-108.5 294.5t84 194.5t210 80q167 0 278 -191l-27 -27q-76 166 -191 166z" />
+<glyph unicode="&#x1d575;" horiz-adv-x="1451" d="M1323 1169q0 -172 -86 -273.5t-255 -101.5q-126 0 -263 89l-224 167q-129 89 -226.5 89t-152.5 -58.5t-55 -147.5q0 -123 87.5 -199.5t219.5 -76.5t240 83q3 -15 16 -27q-116 -85 -266 -85t-243 84t-93 232q0 181 151.5 301.5t337.5 120.5q145 0 296 -94q67 -41 202 -154 t184 -113q96 0 95 164h35zM1326 523q-14 66 -66.5 122.5t-122 56.5t-69.5 -56q0 -29 86 -159t121 -199q73 -139 73 -241q0 -225 -233 -367q-201 -122 -456 -122t-385 144q-65 71 -128 264q-47 142 -101 142q-90 0 -90 -117q0 -45 29 -130h-4q-18 0 -29 -9q-34 86 -34 148 q0 114 90 179t208 65q200 0 278 -161l110 -298q78 -166 240 -166q80 0 149 42t69 117q0 58 -161.5 310.5t-161.5 375t102.5 207.5t236.5 85q207 0 291 -233h-42z" />
+<glyph unicode="&#x1d576;" horiz-adv-x="1604" d="M655 644q-54 0 -54 -20q0 1 60.5 -91.5t60.5 -231.5t-103 -233.5t-237 -94.5t-235 62q-118 72 -118 189q0 63 46 109t112.5 46t120 -43.5t53.5 -111.5q0 -27 -22.5 -75t-22.5 -76t35.5 -49.5t65.5 -21.5q58 0 98.5 40.5t40.5 98.5q0 93 -127 205q-215 192 -235 215 q-127 148 -127 327q0 243 270 374q213 104 485 104t461 -144q206 -158 206 -421v-29h-29q0 245 -172.5 392.5t-421.5 147.5q-163 0 -281 -83t-118 -230t65 -275l-4 91q0 179 93.5 278.5t271.5 99.5q284 0 383 -260q34 -89 34 -161l-332 -50q117 -36 131 -42q76 -34 93 -92 q0 -1 6 -46l17 -127l14 -131q20 -71 88.5 -71t143.5 61q11 -12 18 -27l-374 -274q-204 74 -233 206q-9 39 -13 183.5t-38 200.5q-48 81 -176 81zM940 789q0 82 -59 149t-139 67q-109 0 -150 -84q-29 -59 -29 -178q0 -46 5 -77l372 76v47z" />
+<glyph unicode="&#x1d577;" horiz-adv-x="1285" d="M1211 655q-122 -171 -241 -171t-206 81.5t-87 194.5q0 78 105.5 203.5t105.5 180.5q0 97 -95 149q-77 42 -186 42t-187 -37q-104 -48 -104 -147q0 -74 139 -202t139 -219.5t-94 -168.5q-27 -22 -206 -142q30 7 72 7q98 0 294.5 -121t279.5 -121q166 0 191 173h29 q0 -161 -129.5 -272.5t-292.5 -111.5q-125 0 -247 74q-25 15 -186 137q-97 74 -159 74q-84 0 -101 -132h-36q6 33 22 98q26 77 111 140l142 90q70 45 70 87q0 18 -90 101.5t-134 141.5q-78 103 -78 194q0 188 183 297q153 91 355 91t364 -87q197 -106 197 -290 q0 -96 -57 -182q-21 -32 -91 -108.5t-70 -113.5q0 -47 67 -47q98 0 184 135q12 -14 27 -18z" />
+<glyph unicode="&#x1d578;" horiz-adv-x="2154" d="M1468 1068l10 -286q0 -99 -13 -158q-30 -135 -193 -321l-296 -330l-256 204q-60 -61 -159 -182q-12 14 -27 18l334 397q15 -15 81 -68l168 -136q0 44 -9 197l-22 380q-3 81 -14 244q-25 234 -128 234q-71 0 -71 -117q0 -67 26.5 -196.5t26.5 -208t-27 -140.5 q-41 -94 -226 -303l-285 -323l-249 204q-49 -46 -119 -137l-36 27l312 357l240 -195q7 22 7 68t-6.5 132t-8.5 167l-7 218q-14 196 -63 304q-65 143 -201 143t-136 -110q0 -62 84 -107q149 -79 155 -84q84 -65 84 -177q0 -227 -235 -285q-81 -20 -133 -20v29q65 0 129 19 q89 26 89 75q0 30 -87.5 73t-125.5 79q-74 69 -74 180q0 194 129 313.5t324 119.5q112 0 214.5 -52.5t157.5 -144.5q49 197 283 197q217 0 325 -182q27 90 114 136t180.5 46t163.5 -34q90 -44 113 -130q10 -39 10 -173.5t106 -134.5q11 0 24 3v-27q-141 0 -186 -48.5 t-45 -190.5q0 -425 130 -425q20 0 108 52q10 -17 18 -25l-381 -260q-168 140 -196 233q-11 37 -11 142q0 278 52 354q70 103 347 170q-71 9 -143 17q-79 12 -126 64q-30 33 -34.5 134.5t-10.5 122.5q-18 64 -91 64t-99 -70q-15 -40 -15 -136z" />
+<glyph unicode="&#x1d579;" horiz-adv-x="1752" d="M962 1115l16 -204v-249q0 -149 -211 -353q-50 -49 -372 -343l-249 218q-16 -11 -128 -106l-18 18l350 328l260 -211v319q0 351 -81 581q-6 18 -13 29q-73 119 -206 119q-153 0 -153 -110q0 -59 86 -105q148 -78 160 -88q86 -67 86 -180q0 -145 -137 -243 q-80 -57 -238 -57v29q74 0 136 18q89 25 89 76q0 29 -89.5 72.5t-128.5 78.5q-76 70 -76 177q0 201 133.5 319t337.5 118q137 0 242 -45q128 -55 173 -166q22 211 280 211q196 0 266 -108q42 -64 47 -201.5t38 -156.5q32 -19 87 -19h6v-26q-26 2 -53 2q-118 0 -163 -80 q-34 -59 -34 -212.5t7 -203.5q22 -161 109 -161q45 0 132 58l11 -18l-383 -267q-172 79 -220 220q-22 65 -22 224q0 213 58 282t357 151q-113 19 -145 29q-80 25 -118 81q-22 32 -30.5 127t-19.5 125q-22 62 -84 62q-95 0 -95 -159z" />
+<glyph unicode="&#x1d57a;" horiz-adv-x="1716" d="M1640 650q0 -304 -203.5 -490.5t-510.5 -186.5q-132 0 -295 78q-47 23 -255 145q-133 78 -192 78q-106 0 -148 -142h-36q37 144 165 237t277 93t399 -139t405 -139t248.5 111.5t93.5 278.5q0 284 -283 373q-83 26 -121 26h-381q-75 0 -149.5 60t-74.5 136.5t56 140.5 q-6 2 -14 2q-59 0 -110 -46t-51 -104.5t101 -198t101 -223.5q0 -119 -124 -193q-106 -63 -229.5 -63t-208 76t-84.5 194h29q0 -78 53 -147t128 -69t75 59q0 14 -75.5 136.5t-75.5 195.5q0 210 241 335q197 102 430 102q353 0 576 -178q243 -193 243 -538z" />
+<glyph unicode="&#x1d57b;" horiz-adv-x="1743" d="M545 563l9 285q0 448 -227 448q-46 0 -100 -23t-54 -62t76 -102q128 -106 142 -120q76 -78 76 -155q0 -124 -97.5 -211.5t-225.5 -106.5v27q44 2 97 28t53 64q0 27 -88 70t-130 86q-76 78 -76 203q0 170 142.5 271t304 101t274.5 -49q139 -59 183 -178q67 227 316 227 q115 0 202 -47q106 -58 106 -164q0 -34 -22.5 -96.5t-22.5 -96.5q0 -55 60 -68q19 -4 67 -5q17 0 36 1v-29q-126 -2 -140 -3q-88 -7 -129 -39q13 -33 57 -50l85 -31q130 -55 130 -177q0 -196 -191.5 -388.5t-376.5 -192.5q-69 0 -188 38l-164 -458h-43q-42 100 -71 249 l-45 256q-21 104 -80.5 141.5t-173.5 37.5q-56 0 -93.5 -60t-49.5 -61q0 180 97 282q90 95 252 95h23l5 5q-5 24 -5 58zM1436 208q40 40 40 83t-100 101q-177 104 -184 109q-100 73 -100 161t101 148q91 55 179 55q11 0 21 -1q-242 16 -242 255v72q0 54 -16 76.5t-70 22.5 q-74 0 -112 -107q-27 -77 -27 -169v-633q370 -213 429 -213q41 0 81 40z" />
+<glyph unicode="&#x1d57c;" horiz-adv-x="2001" d="M1140 983l-317 -11q-296 0 -296 190q0 92 61 148q-6 2 -16 2q-41 0 -99 -47t-58 -119q0 -45 116.5 -187t116.5 -235q0 -118 -110.5 -201t-233.5 -83t-203 82t-101 209h36q2 -76 60.5 -158t136 -82t77.5 70q0 24 -102.5 146t-102.5 215q0 226 265 348q207 96 458 96 t441 -94q211 -104 312 -308q68 -137 68 -219v-400q0 -56 33 -94t88 -38q78 0 105 56q16 35 16 107v16h36q1 -41 1 -51q0 -361 -212 -361q-153 0 -153 190q0 32 5.5 90.5t6.5 80.5q-99 -173 -263.5 -270.5t-377.5 -97.5t-458 137q-200 112 -257 112t-108 -48q-16 -15 -77 -89 l-18 11q66 157 195 247t296 90q131 0 364 -110t363 -110q183 0 280 102t97 286q0 382 -471 382z" />
+<glyph unicode="&#x1d57d;" horiz-adv-x="1801" d="M1624 802l-113 8q-56 0 -96 -21q26 -13 54.5 -56t28.5 -71v-453q0 -41 61 -41q42 0 139 61l11 -18q-26 -20 -202.5 -129t-185.5 -109q-33 0 -96 49q-103 80 -103 182v420q0 43 -32.5 73.5t-66.5 30.5t-36 -15q-5 -65 -28 -206q-54 -237 -188 -376q-152 -158 -381 -158 q-128 0 -221 76.5t-93 201.5q0 173 186 173q76 0 129 -40.5t53 -112t-36 -97.5q-18 -13 -76.5 -25t-82.5 -37q5 -110 139 -110q200 0 200 366v239q0 241 -39 407q-65 276 -226 276q-58 0 -107.5 -34t-49.5 -89t80 -107q135 -88 147 -99q80 -73 80 -176q0 -139 -122 -218 q-105 -67 -252 -67v29q202 14 202 79q0 34 -84 89.5t-117 93.5q-71 79 -71 191q0 179 154 287q137 97 324 97q321 0 415 -233q10 60 41 116q64 117 237 117q38 0 116 -12.5t156 -83t78 -155.5v-229q0 -56 79 -56q30 0 56 13q-9 -14 -7 -33q-22 -8 -54 -8zM1417 820 q-77 0 -166 78t-89 154q0 238 -85 238q-114 0 -114 -182q0 -12 2 -40l22 -303l451 56q-11 -1 -21 -1z" />
+<glyph unicode="&#x1d57e;" horiz-adv-x="1624" d="M1148 944q-109 0 -310 78.5t-311 78.5q-176 0 -295.5 -110t-119.5 -284q0 -231 244 -331q172 -71 443 -71q713 0 713 262q0 70 -42 118t-115 48t-194 -91q-182 -135 -185 -137q-144 -81 -310.5 -81t-280.5 93.5t-114 245.5q0 105 77.5 162t176.5 57t204 -40v-36 q-124 45 -202.5 45t-147.5 -42.5t-69 -123.5q0 -51 33 -93t76.5 -42t181 78t202.5 106q146 65 258 65q192 0 327 -81q162 -97 162 -277q0 -271 -223 -429q-198 -139 -481 -139q-341 0 -555.5 192.5t-214.5 529.5q0 281 199 476t481 195q152 0 385.5 -105.5t262.5 -105.5 q93 0 126 119h36q-90 -330 -418 -330z" />
+<glyph unicode="&#x1d57f;" horiz-adv-x="1523" d="M1207 34q-102 -61 -259 -61t-327 70q-73 30 -228.5 115.5t-204.5 85.5t-86.5 -45t-37.5 -95q0 -11 3 -23h-36q0 168 107.5 271t276.5 103q99 0 215 -41.5t124 -41.5q36 0 36 29q0 34 -78 79q-115 68 -145 94q-78 68 -78 151t73 158q30 31 138 111q-78 48 -194 82t-205 34 q-240 0 -240 -163q0 -81 69 -132.5t146.5 -51.5t151.5 35v-33q-93 -32 -145 -32q-113 0 -194.5 72.5t-81.5 183.5q0 197 157 305q137 94 325 94t381 -92q95 -45 260 -153.5t207 -108.5q69 0 69 61q0 68 -76.5 118t-154.5 63v36q270 -87 270 -233q0 -115 -101 -179 q-85 -54 -220 -54t-397 136q-27 -13 -27 -35q0 -30 84 -78q122 -69 155 -96q84 -69 84 -149q0 -132 -233 -272q67 -55 213 -111.5t228 -56.5q121 0 193 173l30 -11q-33 -88 -102 -177.5t-145 -134.5z" />
+<glyph unicode="&#x1d580;" horiz-adv-x="1476" d="M65 267q28 0 64.5 16t36.5 40v662q0 41 -28.5 67.5t-69.5 26.5t-95 -45l-18 20l328 312q89 -46 158 -109q93 -85 93 -158v-774q60 -38 150 -81l144 117v624q0 38 -40 63.5t-83 25.5q-10 0 -19 -2v29q80 5 180.5 90.5t138.5 165.5q159 -211 341 -256v-29q-9 2 -21 2 q-127 0 -127 -80v-649q0 -37 27.5 -65.5t62 -28.5t109.5 45q7 -9 9 -20l-347 -303q-119 83 -137 98q-84 71 -92 131q-2 39 -7 116l-390 -345q-195 207 -424 265v36q73 -7 56 -7z" />
+<glyph unicode="&#x1d581;" horiz-adv-x="1752" d="M1534 1061l-7 -109q0 -64 47 -75q48 -6 97 -11q-25 -20 -73.5 -20t-117 15.5t-94.5 15.5t-43 -15t-17 -32q0 -40 80 -79q115 -58 147 -86q80 -68 80 -176q0 -228 -249 -386q-205 -130 -408 -130q-136 0 -283 94q-5 3 -230 173q-123 94 -201 94q-106 0 -136 -157 q-16 9 -34 7q13 94 100.5 187.5t179.5 110.5q25 5 164 18q43 77 43 144v221q0 431 -229 431q-54 0 -95 -23q-51 -27 -51 -77q0 -65 71 -104l140 -78q74 -59 74 -164q0 -141 -142 -231q-103 -65 -248 -65v27h4q198 0 198 96q0 36 -71 83q-110 74 -130 93q-71 66 -71 147 q0 169 171 275q147 91 327 91q330 0 411 -227q17 130 77.5 178.5t200.5 48.5t229 -80t89 -225zM834 398l256 -192q130 -98 196 -98t120 39.5t54 101t-102 129.5l-188 119q-102 76 -102 160q0 150 271 231q-89 39 -126.5 101t-48.5 166q-1 27 -9 79q-15 62 -83 62 q-32 0 -63 -34t-31 -66v-330q0 -131 -147 -235q-70 -49 -263 -135h4q112 0 262 -98z" />
+<glyph unicode="&#x1d582;" horiz-adv-x="2306" d="M2008 904q-44 0 -88.5 -16.5t-44.5 -55.5t76 -82q110 -62 140 -91q76 -71 76 -181q0 -198 -204 -359q-185 -146 -364 -146q-89 0 -191 53q-44 22 -138.5 86.5t-125.5 64.5q-16 0 -93 -60.5t-132 -90.5q-95 -53 -177 -53q-114 0 -288 113.5t-250 113.5q-50 0 -86.5 -42 t-36.5 -93l-36 7q0 125 117.5 246.5t241.5 121.5q44 0 87 -16q74 82 74 430q0 451 -204 451q-54 0 -105.5 -37.5t-51.5 -91.5t75 -106l148 -103q78 -68 78 -155q0 -125 -121 -233t-247 -108v29q57 0 126 33.5t69 83.5q0 35 -79 74q-110 53 -145 85q-79 69 -79 179 q0 190 147.5 300.5t343.5 110.5q225 0 357 -159q48 77 75 105q52 54 113 54q116 0 205 -159q139 159 374 159q293 0 371 -208q12 -83 49 -200q19 -25 33.5 -28.5t45 -3.5t46.5 -4q-39 -18 -181 -18zM2003 224q0 55 -100 115q-177 107 -186 114q-100 80 -100 179 q0 163 272 270q-31 5 -92 20q-104 34 -141 136l-42 166q-28 81 -116 81q-63 0 -130 -54t-67 -116q0 -44 65 -119q116 -134 119 -139q65 -88 65 -166q0 -186 -222 -307q19 1 57.5 1t93.5 -15.5t191.5 -133t218.5 -117.5q36 0 75 25.5t39 59.5zM1288 444q0 53 -117 180.5 t-117 214.5q0 140 195 350q-106 72 -190 72t-164 -72q70 -137 70 -276q0 -384 -431 -489q82 -25 184 -85l141 -88q91 -51 163 -51t169 82t97 162z" />
+<glyph unicode="&#x1d583;" horiz-adv-x="1492" d="M1422 1144q0 -80 -52.5 -136.5t-126 -56.5t-131.5 44.5t-58 105.5t90 186q-7 18 -38 18q-99 0 -158 -135q-46 -106 -46 -221v-202h244q36 0 73.5 38t38.5 74h30q0 -87 -42 -173q-51 -103 -129 -103h-209q-4 -9 -4 -27q0 -124 49 -212q61 -109 175 -109q92 0 263 122 l-3 -34q-462 -350 -471 -350q-45 0 -186 92q-75 49 -109 96t-63 135h-7q-60 -323 -319 -323q-96 0 -175.5 60.5t-79.5 148.5t51.5 142.5t132 54.5t132 -44.5t51.5 -112.5t-43 -111q-20 -21 -91 -68q3 -41 56 -41q137 0 210 145q57 115 57 268v168h-229q-35 0 -71 -38 t-39 -74h-29q35 140 49 173q46 103 128 103h186q5 11 5 36q0 125 -72.5 215t-187.5 90t-243 -115q-2 11 -9 25l397 368q150 -25 288 -122.5t170 -231.5q67 354 289 354q107 0 181.5 -58.5t74.5 -163.5z" />
+<glyph unicode="&#x1d584;" horiz-adv-x="1653" d="M505 -366l-33 6q-9 0 -12 -6q67 -45 217 -45q216 0 307.5 89t114.5 289.5t23 227.5v601q0 82 -16 241.5t-38 193.5q-38 59 -79 59q-94 0 -94 -151q0 -50 15.5 -149t15.5 -149q0 -176 -69 -263t-323 -197q14 -17 36.5 -20.5t44.5 -6.5q118 -22 240 -148q54 45 127 99 l18 -20l-394 -312q-43 87 -134.5 152.5t-184.5 65.5q-113 0 -168 -104h-36q41 111 171 206q121 88 228 88h16q52 132 52 476q0 186 -29 276q-50 157 -194 157q-60 0 -110.5 -33.5t-50.5 -88.5t72 -107q117 -84 134 -101q72 -76 72 -198.5t-79 -216.5t-212 -135l-9 18 q49 17 110.5 61.5t61.5 84t-74 78.5q-105 56 -139 89q-74 75 -74 203q0 188 138 305t329 117q120 0 221 -50.5t138 -153.5q39 195 226 195q250 0 365 -297q82 -211 82 -511q0 -991 -828 -991q-151 0 -275 40q-176 57 -176 175q0 162 217.5 162t217.5 -146 q0 -72 -52.5 -113.5t-126.5 -41.5z" />
+<glyph unicode="&#x1d585;" horiz-adv-x="1344" d="M1256 85q0 -274 -208 -411q-177 -116 -464 -116t-416 121q-71 67 -113.5 206.5t-81.5 139.5q-72 0 -72 -225v-6h-36q0 170 38 239q53 97 203 97t226.5 -101t76.5 -250q0 -190 181 -190q160 0 211 157q27 85 27 303.5t-40 328.5q-67 183 -256 183q-132 0 -241.5 -83 t-126.5 -211h-43q19 100 93.5 189.5t169.5 115.5q-227 72 -227 229q0 70 49.5 113.5t117 43.5t116.5 -34.5t49 -93.5t-41 -91q-12 -10 -64 -33.5t-52 -48.5q0 -67 184 -67q267 0 267 309q0 397 -323 397q-155 0 -262 -91.5t-117 -244.5h-36q0 199 173 310q148 95 367.5 95 t389.5 -95q207 -116 207 -326q0 -323 -482 -365q260 -49 386 -139q170 -123 170 -355z" />
+<glyph unicode="&#x1d586;" horiz-adv-x="1088" d="M854 439l-6 -135q0 -160 66 -160q33 0 72 27l17 -19q-173 -113 -259 -201q-167 96 -180 206q-120 -72 -290 -206q-52 23 -107 69.5t-65 89.5t-10 126v167q0 244 24 284.5t136 79.5q180 62 342 172q153 -151 360 -195q11 -7 13 -19q-113 -18 -113 -81v-205zM386 191 q0 -62 55 -62q34 0 121 57v482q-112 55 -176 108v-585z" />
+<glyph unicode="&#x1d587;" horiz-adv-x="1016" d="M919 374q0 -137 -58 -200q-41 -44 -162.5 -81.5t-179.5 -69t-89 -72.5q-189 183 -373 223v25q8 -2 26.5 -2t46 22t27.5 50v645q0 41 -45 139.5t-76 125.5l25 17q55 -74 96 -157l38 69q23 39 49 62q107 95 439 95v-25q-19 2 -38 2q-79 0 -138.5 -46t-59.5 -123v-312 l318 178q95 -104 113 -134q41 -67 41 -170v-261zM625 689q0 27 -21.5 49.5t-48.5 22.5q-53 0 -106 -45v-449l176 -132v554z" />
+<glyph unicode="&#x1d588;" horiz-adv-x="895" d="M100 231q-10 46 -10 198q0 258 53 328q30 39 94 57l401 125l144 -267l-239 -129l-155 296l-7 4q-4 -4 -4 -10v-452q0 -18 24 -70q61 -133 224 -133q88 0 176 57l17 -25q-259 -136 -400 -259q-141 69 -193 107q-104 77 -125 173z" />
+<glyph unicode="&#x1d589;" horiz-adv-x="1013" d="M872 784q31 -85 31 -292t-24 -270.5t-110 -94.5l-162 -52q-96 -40 -141 -124q-178 153 -402 214l4 17q74 10 74 57v501q55 -22 115 -22q143 0 142 71q-16 9 -54 23q-239 84 -239 237q0 103 77 161t184 58q44 0 72 -9v-27q-17 6 -49 6q-127 0 -127 -55.5t85 -88.5l97 -30 q147 -46 227 -83q153 -70 200 -197zM611 659q0 46 -63 84t-113 39v-517q98 -47 176 -108v502z" />
+<glyph unicode="&#x1d58a;" horiz-adv-x="927" d="M181 113q-88 100 -88 301t33 270t143 119q24 11 333 136l223 -316l-435 -256q29 -90 101.5 -146t165.5 -56q40 0 105.5 32.5t83.5 37.5v-5q0 -11 -6 -18q-9 -8 -85.5 -55.5t-222.5 -156.5q-19 -20 -63 -49q-215 78 -288 162zM577 515l-191 303v-411z" />
+<glyph unicode="&#x1d58b;" horiz-adv-x="740" d="M632 691h-127q-42 -420 -172 -1130h-34q-127 698 -155 1124q-26 6 -55.5 6t-58.5 -6v33q10 -1 18 -1q75 0 92 89q4 23 4 146q0 316 170 316q63 0 140.5 -58.5t80.5 -58.5q29 0 29 91v23h38q3 -22 3 -50q0 -261 -160 -261q-67 0 -134 49.5t-84 49.5q-43 0 -43 -48 q0 -65 83 -117t157 -61q86 -10 162 -10q24 0 46 1v-127z" />
+<glyph unicode="&#x1d58c;" horiz-adv-x="1031" d="M960 -113q0 -162 -162 -253q-134 -75 -310 -75q-132 0 -227 31q-140 47 -140 151q0 58 45 91.5t105.5 33.5t112 -31.5t51.5 -86t-35 -82.5q-18 -14 -80 -39q18 -39 120 -39t177 39q95 49 95 146q0 51 -55 134t-72 122t-27 121q-13 -8 -143 -103.5t-140 -95.5t-76 49.5 t-76 64.5q-30 45 -30 83v509q0 50 151 108q213 82 322 174q150 -139 350 -188q10 -2 30 -7q13 -5 14 -21q-34 -1 -70 -18t-36 -46v-564q0 -1 53 -67.5t53 -140.5zM392 197q0 -25 13 -50.5t33 -25.5t124 67v473q-61 7 -170 87v-551z" />
+<glyph unicode="&#x1d58d;" horiz-adv-x="1011" d="M903 188q0 -14 -21.5 -111t-68.5 -184.5t-145 -153.5q-15 -10 -120 -64l-226 -116q-7 16 -17 27q135 36 221.5 157t86.5 263v672q0 28 -20 49t-48 21q-45 0 -119 -63v-497q0 -44 57 -44q34 0 64 19v-25q-194 -107 -259 -187q-40 55 -116 106l-136 81q34 0 67 17.5 t33 47.5v719q0 93 -115 257l19 17q67 -92 94 -157q13 10 26 46t14 38q73 142 494 142v-25q-15 1 -29 1q-90 0 -151.5 -41t-61.5 -127v-348l331 214q40 -18 93 -101.5t53 -127.5v-522z" />
+<glyph unicode="&#x1d58e;" horiz-adv-x="655" d="M384 1234q42 -34 42 -81.5t-60.5 -112.5t-102.5 -65q-30 0 -89 87q-32 47 -32 93t46 79.5t100 33.5t96 -34zM136 155v553q0 13 -14 26.5t-34.5 13.5t-55.5 -36l-17 19l273 208q141 -137 253 -178q-3 -7 -54.5 -17t-51.5 -36v-504q0 -47 63 -47q34 0 77 29q1 -10 8 -19 l-286 -216q-47 13 -104 87t-57 117z" />
+<glyph unicode="&#x1d58f;" horiz-adv-x="592" d="M384 1234q42 -34 42 -84t-58 -112.5t-105 -62.5q-30 0 -89 87q-32 47 -32 92.5t46.5 79.5t100 34t95.5 -34zM66 -376h-151v28q24 -4 49 -4q65 0 118.5 34t53.5 95v931q0 32 -43 32q-20 0 -61 -28l-17 19l273 208q65 -69 253 -187q-106 -38 -106 -72v-727 q0 -44 44.5 -125.5t82.5 -101.5q-9 -8 -26 -32q-55 65 -103 157q-4 -15 -13 -44q-26 -76 -144 -129.5t-210 -53.5z" />
+<glyph unicode="&#x1d590;" horiz-adv-x="1134" d="M513 470q-2 0 -87 -48v-240q0 -38 53 -38q25 0 53 13l9 -17q-110 -70 -158 -104t-95 -85q-58 65 -252 182q100 21 100 70v719q0 93 -115 257l19 17q67 -92 94 -157q79 226 405 226h114v-25q-19 2 -38 2q-76 0 -132.5 -51.5t-56.5 -126.5v-339l174 117q145 97 157.5 97 t77 -57t81 -81.5t16.5 -42t-1 -25.5l-176 -110q93 -80 137 -180q28 -64 62 -218q12 -54 55 -54q12 0 34 2.5t32 2.5l-293 -225q-25 7 -68 49t-58 111l-18 135q-13 74 -58.5 149t-66.5 75zM681 608q-110 132 -152 132t-103 -51v-233z" />
+<glyph unicode="&#x1d591;" horiz-adv-x="698" d="M61 178q14 -13 35.5 -13t39.5 19v738q0 51 -39.5 126t-81.5 122l25 26q67 -92 94 -155h4q42 166 278 210q76 14 101 14h94v-25q-12 2 -22 2q-61 0 -112 -51t-51 -112v-854q0 -68 76 -68q44 0 109 36q-1 -15 8 -26q-102 -59 -318 -216q-42 55 -117 113l-133 97q2 9 10 17z " />
+<glyph unicode="&#x1d592;" horiz-adv-x="1584" d="M1353 588l6 -355q0 -76 64 -76q14 0 84 19l-279 -225q-50 18 -106 86t-56 118v547q0 12 -18 29t-30 17q-40 0 -115 -63v-503l57 -59q-50 -1 -118.5 -61.5t-82.5 -110.5q-118 155 -231 172l2 17q83 14 83 63v511q0 34 -51 34q-25 0 -115 -55v-511q0 1 58 -59 q-50 -1 -118 -61t-84 -111q-44 63 -117 113.5t-144 58.5q8 15 43 22.5t44 13.5q28 20 28 121v347q0 106 -74 106q-43 0 -64 -36l-19 26l269 216q60 -14 122 -84t63 -130l275 214q162 -79 181 -212l324 212q89 -117 231 -178q-2 -8 -42.5 -18.5t-55 -41.5t-14.5 -113z" />
+<glyph unicode="&#x1d593;" horiz-adv-x="1139" d="M625 155v547q0 46 -57 46q-30 0 -112 -55v-511q0 -7 26 -31t29 -28q-49 0 -117 -61t-84 -111q-39 59 -117 114t-142 58q5 15 43 23.5t44 12.5q27 18 27 262t-11 272q-16 40 -62 40t-67 -36l-19 26l272 216q96 -51 129.5 -85.5t52.5 -126.5l333 212q89 -117 231 -178 q-2 -7 -42 -15.5t-54.5 -44t-14.5 -127.5v-189q0 -156 13.5 -192t52 -36t79.5 29q1 -10 8 -19l-279 -216q-49 17 -105.5 86.5t-56.5 117.5z" />
+<glyph unicode="&#x1d594;" horiz-adv-x="1011" d="M867 750q30 -80 30 -270t-28 -259.5t-117 -101.5l-163 -47q-93 -36 -129 -121q-178 157 -396 216q40 29 72 72v543q202 12 293 32q154 34 264 125q132 -75 174 -189zM604 653q0 47 -63 87.5t-113 41.5v-517q118 -59 176 -108v496z" />
+<glyph unicode="&#x1d595;" horiz-adv-x="1079" d="M982 470l12 -133q0 -66 -29 -121q-18 -35 -74 -59l-107 -44q-51 -20 -98 -62t-63 -94l-127 87q-55 -304 -127 -483h-26q-62 174 -77 273l-48 304q-32 27 -80 27q-84 0 -84 -83q0 -11 1 -23q-19 12 -19 59q0 95 42 167.5t130 76.5v352q-130 72 -130 172q0 120 82.5 175.5 t208.5 55.5v-27q-44 0 -85 -13q-57 -17 -57 -51q0 -29 99.5 -64t125.5 -71q17 -23 48 -143l344 199q98 -73 125 -218q13 -69 13 -259zM689 674q0 30 -25.5 55.5t-57.5 25.5t-108 -45v-409q127 -57 191 -123v496z" />
+<glyph unicode="&#x1d596;" horiz-adv-x="1011" d="M854 659v-549q0 -108 -44 -276l-79 -273h-25q-112 235 -148 596q-188 -117 -284 -206q-181 98 -181 197v509q0 42 127 100l170 68q103 48 176 114q149 -138 388 -195q12 -8 13 -21q-37 -1 -75 -16.5t-38 -47.5zM386 250q0 -30 29 -68t58 -38q10 0 48 20.5t41 21.5v475 q-103 38 -176 87v-498z" />
+<glyph unicode="&#x1d597;" horiz-adv-x="933" d="M477 246q0 -35 39 -62t76 -27q58 0 180 93l17 -19l-380 -280q-60 53 -189 140l-163 70l71 23q35 11 56 43v424q0 61 -70 61q-35 0 -82 -36l-17 19l286 244q157 -74 180 -233l248 220l168 -239q-59 -65 -210 -202q-42 71 -151 233l-59 -53v-419z" />
+<glyph unicode="&#x1d598;" horiz-adv-x="1018" d="M946 409q0 -115 -98 -214l-282 -259q-65 40 -179 74t-187.5 34t-110.5 -57q-8 7 -17 9q107 140 191 277q-178 92 -178 214q0 92 81 170q13 13 139.5 107t182.5 175q95 -100 190 -100q64 0 113 35t49 97q0 97 -101 152q-83 45 -192 45t-196.5 -57t-102.5 -164h-34 q9 122 108.5 185.5t236 63.5t245 -78t108.5 -217q0 -113 -142 -250l-8 -29l-1 3q83 -18 134 -75.5t51 -140.5zM625 612q-152 0 -288 136q-32 -34 -32 -78q0 -77 58.5 -141.5t130 -64.5t142 52.5t95.5 117.5q-51 -22 -106 -22zM740 220q0 90 -52.5 152t-135.5 62t-154 -51 t-105 -125q194 0 424 -129q23 44 23 91z" />
+<glyph unicode="&#x1d599;" horiz-adv-x="765" d="M66 171q37 -6 45 -6t30 12.5t22 25.5v488h-127q6 21 36 33l57 24q172 98 293 439h32v-367h207v-129h-205v-409q0 -96 80 -96q48 0 123 49l17 -17l-330 -267q-142 180 -280 193v27z" />
+<glyph unicode="&#x1d59a;" horiz-adv-x="1139" d="M98.5 147.5q39.5 8.5 53 39t13.5 260.5t-11 258t-54 28q-14 0 -85 -19l280 225q51 -19 106 -84.5t55 -116.5v-550q0 -17 18 -30.5t36.5 -13.5t108.5 55v509q0 9 -21 27l-36 32q48 1 116.5 62t86.5 110q37 -61 114.5 -114t144.5 -58q-6 -16 -40.5 -22t-47.5 -16 q-26 -20 -26 -73v-431q0 -28 23.5 -48t56.5 -20t68 36q0 -15 8 -26l-269 -216q-67 23 -124.5 85.5t-59.5 128.5l-325 -214q-89 116 -231 180q2 8 41.5 16.5z" />
+<glyph unicode="&#x1d59b;" horiz-adv-x="1054" d="M939 351q0 -70 -10 -105q-19 -68 -100 -106q-96 -36 -284 -113q-57 -26 -93 -76q-74 72 -181.5 139t-192.5 84v25h3q97 0 97 70v430q-129 71 -129 172q0 118 99 175q79 46 207 46q20 0 50 -2q0 -23 6 -34q-22 6 -57 6q-134 0 -134 -55q0 -27 104 -67.5t113 -51.5 q16 -21 23 -58l15 -69l303 186q96 -67 128.5 -147.5t32.5 -210.5v-238zM647 702q0 23 -23.5 45t-53 22t-99.5 -44v-458l176 -132v567z" />
+<glyph unicode="&#x1d59c;" horiz-adv-x="1469" d="M1392 725q5 -37 5 -241.5t-6 -231.5q-12 -54 -89 -87l-214 -79q-125 -53 -181 -135q-202 157 -345 187q30 22 72 59v511q0 61 -68 61q-34 0 -110 -48v-518q0 -33 74 -51l2 -14q-60 -15 -133 -73t-104 -114q-24 59 -96.5 124t-132.5 77v17q39 3 60 9t37 27v494 q-121 63 -121 169.5t89 166.5t198 60q32 0 61 -5q-1 -21 9 -34q-24 6 -57 6q-128 0 -128 -55q0 -27 97 -62t109 -48q35 -37 35 -139l317 189q66 -66 157 -186l313 184l71 -74q70 -76 79 -146zM1102 710q0 22 -22 40.5t-50.5 18.5t-105.5 -44v-503l178 -72v560z" />
+<glyph unicode="&#x1d59d;" horiz-adv-x="1049" d="M93 15q-52 0 -106 -64q0 82 50.5 172.5t128 90.5t158.5 -49q34 39 68 132q-6 24 -90 184.5t-105 190.5q-32 46 -78.5 46t-93.5 -42l-19 19q252 244 276 244q89 0 167 -118l102 -194l134 312q132 -70 176 -70q71 0 87 85h25q-16 -105 -56 -180q-55 -104 -139 -104 q-55 0 -148 48q-23 -39 -62 -120q1 -3 146 -289q20 -48 70 -133q34 -41 70 -41q7 0 119 28v-25l-409 -187l-155 314l-142 -314q-95 64 -174 64z" />
+<glyph unicode="&#x1d59e;" horiz-adv-x="1047" d="M939 195q0 -120 -45 -219q-101 -222 -536 -415l-8 25q130 38 213.5 159.5t83.5 260.5v672q0 26 -19.5 51.5t-50.5 25.5t-108 -62v-477q0 -45 57 -45q39 0 85 28q-40 -51 -140.5 -123.5t-139.5 -118.5q-117 147 -238 187v27q85 1 85 41v502q-129 71 -129 170t80 167 t179 68q16 0 31 -2v-27q-10 1 -31 1t-65 -17t-44 -48q0 -22 50 -41l90 -33q71 -30 101 -88q20 -39 35 -131l326 214q43 -40 90.5 -113t47.5 -118v-521z" />
+<glyph unicode="&#x1d59f;" horiz-adv-x="815" d="M740 25q0 -190 -121.5 -328t-308.5 -138q-138 0 -224 100t-86 241q0 329 356 475q-29 25 -42 25q-63 0 -124.5 -43t-74 -43t-28 13t-15.5 27q0 33 68 51q104 27 127 39q68 37 68 107t-34.5 115.5t-86 45.5t-125.5 -51l-17 26l358 252q99 -98 112 -113q62 -75 62 -141 q0 -85 -80 -145q-41 -31 -155 -80q43 -7 125 -26l208 79q-1 -16 10 -26l-178 -70q101 -56 153.5 -162.5t52.5 -229.5zM421 -185q15 101 15 299t-69 236q-246 -95 -246 -450q0 -114 29 -195q42 -117 134 -117q104 0 137 227z" />
+<glyph unicode="&#x1d5a0;" horiz-adv-x="1223" d="M1206 0h-174l-132 379h-591l-132 -379h-165l483 1343h228zM850 518l-246 697l-247 -697h493z" />
+<glyph unicode="&#x1d5a1;" horiz-adv-x="1227" d="M912 1287q137 -71 137 -246t-179 -264v-18q140 -29 216.5 -119.5t76.5 -229.5q0 -192 -138 -301t-391 -109h-469v1343h391q250 0 356 -56zM878 1022q0 51 -17 87q-37 77 -161 89q-61 6 -151 6h-220v-407h238q159 0 235 49t76 176zM992 403q0 158 -116 219q-71 37 -259 37 h-288v-520h244q234 0 319 59q100 70 100 205z" />
+<glyph unicode="&#x1d5a2;" horiz-adv-x="1250" d="M739 -24q-299 0 -469 169q-181 182 -181 525q0 167 46 298q92 259 338 353q120 46 267 46q215 0 448 -116v-202h-4q-213 179 -456 179q-208 0 -338 -142.5t-130 -414t139 -420.5q125 -135 331 -135q257 0 455 179h3v-199q-62 -29 -190 -79q-130 -41 -259 -41z" />
+<glyph unicode="&#x1d5a3;" horiz-adv-x="1381" d="M1285 670q0 -172 -74.5 -323.5t-214.5 -239.5q-171 -107 -499 -107h-332v1343h328q336 0 505 -106q287 -181 287 -567zM1113 673q0 530 -609 530h-175v-1063h175q264 0 406 91q203 132 203 442z" />
+<glyph unicode="&#x1d5a4;" horiz-adv-x="1130" d="M1035 0h-870v1343h870v-145h-706v-388h706v-145h-706v-520h706v-145z" />
+<glyph unicode="&#x1d5a5;" horiz-adv-x="1026" d="M1008 1198h-679v-399h584v-145h-584v-654h-164v1343h843v-145z" />
+<glyph unicode="&#x1d5a6;" horiz-adv-x="1390" d="M778 115q177 0 331 64v346h-360v143h522v-570q-270 -124 -485 -124q-156 0 -286 43q-262 88 -361 348q-50 131 -50 308q0 324 186 509t511 185q234 0 484 -119v-202h-6q-99 76 -186 116q-145 66 -323 66q-239 0 -367 -153t-128 -402.5t133.5 -403.5t384.5 -154z" />
+<glyph unicode="&#x1d5a7;" horiz-adv-x="1346" d="M1178 0h-164v665h-685v-665h-164v1343h164v-533h685v533h164v-1343z" />
+<glyph unicode="&#x1d5a8;" horiz-adv-x="748" d="M624 0h-515v123h175v1097h-175v123h515v-123h-176v-1097h176v-123z" />
+<glyph unicode="&#x1d5a9;" horiz-adv-x="809" d="M643 346q0 -177 -105.5 -271t-284.5 -94q-112 0 -228 25v155h1q117 -40 203 -40q160 0 211 77q39 59 39 216v800h-284v129h448v-997z" />
+<glyph unicode="&#x1d5aa;" horiz-adv-x="1240" d="M333 0h-163v1343h163v-720l663 720h196l-592 -631l621 -712h-212l-534 608l-142 -152v-456z" />
+<glyph unicode="&#x1d5ab;" horiz-adv-x="993" d="M1000 0h-835v1343h164v-1198h671v-145z" />
+<glyph unicode="&#x1d5ac;" horiz-adv-x="1512" d="M1346 0h-163v1196l-386 -822h-97l-383 823v-1197h-152v1343h232l363 -766l351 766h235v-1343z" />
+<glyph unicode="&#x1d5ad;" horiz-adv-x="1340" d="M1175 0h-209l-649 1238v-1238h-152v1343h265l593 -1132v1132h152v-1343z" />
+<glyph unicode="&#x1d5ae;" horiz-adv-x="1411" d="M1321 671q0 -331 -166.5 -515t-450.5 -184q-140 0 -254 47q-231 94 -318 355q-43 130 -43 297q0 329 164 514.5t451 185.5q143 0 257 -47q231 -97 317 -355q43 -131 43 -298zM1150 671q0 240 -100 388q-116 171 -345 171t-346 -171q-99 -147 -99 -387.5t100 -387.5 q117 -171 345.5 -171t344.5 171q100 147 100 387z" />
+<glyph unicode="&#x1d5af;" horiz-adv-x="1077" d="M1029 940q0 -178 -116 -296q-137 -138 -398 -138h-186v-506h-164v1343h357q120 0 203 -20q184 -45 263 -190q41 -76 41 -193zM487 645q209 0 290 83t81 218.5t-102 202.5q-82 54 -243 54h-184v-558h158z" />
+<glyph unicode="&#x1d5b0;" horiz-adv-x="1411" d="M793 -17q-48 -8 -89 -8q-140 0 -254 47q-231 94 -318 354q-43 129 -43 296q0 329 164 514t451 185q143 0 257 -47q231 -96 317 -355q43 -130 43 -297q0 -246 -99.5 -414t-271.5 -237q4 -112 51 -171.5t170 -59.5q84 0 162 31h15v-152q-97 -23 -207 -23q-154 0 -247 84.5 t-101 252.5zM1050 286q100 147 100 386.5t-100 386.5q-116 171 -345 171t-345 -170q-100 -147 -100 -387t100 -387q117 -171 345.5 -171t344.5 171z" />
+<glyph unicode="&#x1d5b1;" horiz-adv-x="1244" d="M1031 981q0 -281 -280 -392l502 -589h-212l-449 540h-263v-540h-164v1343h369q121 0 202 -16q176 -34 255 -170q40 -69 40 -176zM859 968q0 235 -312 235h-218v-528h188q182 0 262 75t80 218z" />
+<glyph unicode="&#x1d5b2;" horiz-adv-x="1223" d="M1126 380q0 -171 -143 -287.5t-391 -116.5t-486 106v213h2q214 -179 489 -179q141 0 236 49q122 62 122 190q0 91 -44 136.5t-138 70.5q-105 19 -314 60q-345 73 -345 365q0 184 162 290q140 90 335 90q249 0 461 -92v-201h-2q-180 153 -460 153q-124 0 -214 -49 q-111 -60 -111 -174q0 -168 201 -215q116 -19 345 -68q295 -78 295 -341z" />
+<glyph unicode="&#x1d5b3;" horiz-adv-x="1101" d="M1108 1198h-480v-1198h-163v1198h-480v145h1123v-145z" />
+<glyph unicode="&#x1d5b4;" horiz-adv-x="1311" d="M1161 538q0 -300 -133 -433t-376.5 -133t-374.5 134.5t-131 431.5v805h163v-814q0 -196 66 -294q83 -123 278.5 -123t278.5 123q66 98 66 289v819h163v-805z" />
+<glyph unicode="&#x1d5b5;" horiz-adv-x="1223" d="M1206 1343l-483 -1343h-228l-483 1343h175l426 -1210l427 1210h166z" />
+<glyph unicode="&#x1d5b6;" horiz-adv-x="1776" d="M1711 1343l-345 -1343h-189l-289 1151l-281 -1151h-185l-352 1343h168l288 -1153l284 1153h169l286 -1164l287 1164h159z" />
+<glyph unicode="&#x1d5b7;" horiz-adv-x="1226" d="M1168 1343l-458 -664l457 -679h-188l-370 565l-379 -565h-177l463 671l-452 672h187l366 -558l374 558h177z" />
+<glyph unicode="&#x1d5b8;" horiz-adv-x="1099" d="M628 0h-163v571l-469 772h180l371 -614l375 614h173l-467 -753v-590z" />
+<glyph unicode="&#x1d5b9;" horiz-adv-x="1226" d="M1132 0h-1033v158l831 1040h-801v145h983v-153l-840 -1045h860v-145z" />
+<glyph unicode="&#x1d5ba;" horiz-adv-x="1016" d="M870 0h-154v98q-40 -29 -124 -79q-95 -45 -215 -45t-205.5 83.5t-85.5 210.5q0 195 173 272q122 53 457 70v24q0 101 -72 142q-57 32 -180 32t-288 -63h-8v158q154 42 301 42q197 0 299 -74.5t102 -244.5v-626zM246 278q0 -159 194 -159q135 0 276 108v257 q-126 -7 -193.5 -13t-126.5 -23q-150 -42 -150 -170z" />
+<glyph unicode="&#x1d5bb;" horiz-adv-x="1054" d="M890 794q75 -126 75 -340t-118.5 -347t-285.5 -133q-128 0 -253 69l-10 -43h-145v1286h155v-460q149 123 304 123q186 0 278 -155zM530 114q275 0 275 343.5t-231 343.5q-131 0 -266 -105v-529q118 -53 222 -53z" />
+<glyph unicode="&#x1d5bc;" horiz-adv-x="882" d="M540 -21q-208 0 -330.5 122t-122.5 349t119 360.5t334 133.5q144 0 295 -76v-173h-8q-147 115 -294 115t-221 -105q-64 -91 -64 -244.5t69 -250t216 -96.5q96 0 172 39t122 76h8v-171q-164 -79 -295 -79z" />
+<glyph unicode="&#x1d5bd;" horiz-adv-x="1054" d="M902 0h-156v97q-141 -123 -297 -123q-186 0 -281 154q-79 128 -79 340t119.5 346.5t290.5 134.5q126 0 247 -63v400h156v-1286zM526 806q-144 0 -215 -106q-61 -91 -61 -242q0 -336 236 -336q127 0 260 105v530q-111 49 -220 49z" />
+<glyph unicode="&#x1d5be;" horiz-adv-x="1008" d="M925 445h-680q0 -164 91.5 -247.5t236.5 -83.5q78 0 175.5 32t150.5 80h8v-170q-184 -77 -332 -77q-230 0 -358.5 124t-128.5 346.5t118 361t320.5 138.5t300.5 -112t98 -307v-85zM528 821q-118 0 -195 -70t-88 -187h529q-1 257 -246 257z" />
+<glyph unicode="&#x1d5bf;" horiz-adv-x="595" d="M649 1135h-8q-79 23 -139 23q-107 0 -148.5 -47.5t-41.5 -156.5v-31h280v-131h-276v-792h-155v792h-105v131h105v31q0 340 318 340q84 0 170 -17v-142z" />
+<glyph unicode="&#x1d5c0;" horiz-adv-x="1054" d="M902 105q0 -455 -435 -455q-140 0 -281 40v159h8q150 -59 293 -59t205 72q54 61 54 179v85q-139 -112 -297 -112q-185 0 -279 141q-81 121 -81 327.5t119.5 336.5t288.5 130q130 0 249 -66l10 40h146v-818zM525 809q-142 0 -208.5 -94t-66.5 -242q0 -315 235 -315 q136 0 261 96v503q-115 52 -221 52z" />
+<glyph unicode="&#x1d5c1;" horiz-adv-x="1071" d="M925 0h-156v526q0 149 -34 206q-42 69 -161.5 69t-265.5 -112v-689h-155v1286h155v-465q155 128 310 128q307 0 307 -350v-599z" />
+<glyph unicode="&#x1d5c2;" horiz-adv-x="464" d="M320 1078h-175v161h175v-161zM310 0h-155v923h155v-923z" />
+<glyph unicode="&#x1d5c3;" horiz-adv-x="583" d="M440 1078h-175v161h175v-161zM431 -22q0 -152 -77.5 -240t-227.5 -88q-92 0 -177 24v148h8q82 -33 139 -33q114 0 150 66q29 53 29 194v743h-192v131h348v-945z" />
+<glyph unicode="&#x1d5c4;" horiz-adv-x="1001" d="M315 0h-156v1286h156v-825l449 462h195l-429 -426l461 -497h-205l-370 404l-101 -96v-308z" />
+<glyph unicode="&#x1d5c5;" horiz-adv-x="464" d="M310 0h-155v1286h155v-1286z" />
+<glyph unicode="&#x1d5c6;" horiz-adv-x="1646" d="M1500 0h-156v526q0 150 -28 203q-38 72 -153 72t-265 -116q6 -44 6 -94v-591h-155v526q0 151 -28 204q-38 71 -152.5 71t-260.5 -112v-689h-155v923h155v-102q155 128 299 128q190 0 258 -150q178 150 338 150q297 0 297 -350v-599z" />
+<glyph unicode="&#x1d5c7;" horiz-adv-x="1071" d="M925 0h-156v526q0 149 -34 206q-42 69 -161.5 69t-265.5 -112v-689h-155v923h155v-102q155 128 310 128q307 0 307 -350v-599z" />
+<glyph unicode="&#x1d5c8;" horiz-adv-x="1027" d="M940 461q0 -212 -109.5 -349.5t-317 -137.5t-316.5 137t-109 350t109 350.5t316.5 137.5t317 -138t109.5 -350zM779 461.5q0 353.5 -265.5 353.5t-265.5 -353.5t265.5 -353.5t265.5 353.5z" />
+<glyph unicode="&#x1d5c9;" horiz-adv-x="1054" d="M890 796q75 -124 75 -337t-119 -345t-289 -132q-131 0 -249 64v-386h-155v1263h155v-97q146 123 304 123q186 0 278 -153zM805 469q0 332 -232 332q-127 0 -265 -105v-523q114 -52 222 -52q275 0 275 348z" />
+<glyph unicode="&#x1d5ca;" horiz-adv-x="1054" d="M902 -340h-156v444q-142 -122 -296 -122q-185 0 -281 152q-80 128 -80 339t119.5 343.5t288.5 132.5q129 0 249 -66l10 40h146v-1263zM525 809q-143 0 -214 -104q-61 -89 -61 -239q0 -336 234 -336q129 0 262 105v522q-116 52 -221 52z" />
+<glyph unicode="&#x1d5cb;" horiz-adv-x="722" d="M729 754h-8q-66 15 -145 15q-128 0 -268 -114v-655h-155v923h155v-136q170 136 308 136q50 0 113 -10v-159z" />
+<glyph unicode="&#x1d5cc;" horiz-adv-x="882" d="M812 266q0 -146 -128 -223q-106 -65 -272 -65t-321 77v175h8q160 -121 336 -121q219 0 219 137q0 63 -47 94q-30 20 -105 37q-62 11 -184 39q-223 59 -223 248q0 118 98 199.5t273 81.5t310 -69v-166h-8q-142 104 -312 104q-78 0 -132 -26q-70 -34 -70 -104 q0 -98 148 -133l185 -38q225 -52 225 -247z" />
+<glyph unicode="&#x1d5cd;" horiz-adv-x="667" d="M445 -18q-289 0 -289 320v490h-105v131h105v265h156v-265h320v-131h-320v-420q0 -143 26 -190q35 -64 147 -64q66 0 139 30h8v-140q-100 -26 -187 -26z" />
+<glyph unicode="&#x1d5ce;" horiz-adv-x="1071" d="M918 0h-155v102q-163 -128 -309 -128q-308 0 -308 350v599h156v-526q0 -148 34 -205q43 -70 164 -70t263 112v689h155v-923z" />
+<glyph unicode="&#x1d5cf;" horiz-adv-x="1001" d="M951 923l-373 -923h-157l-371 923h169l286 -735l283 735h163z" />
+<glyph unicode="&#x1d5d0;" horiz-adv-x="1385" d="M1314 923l-241 -923h-143l-238 711l-235 -711h-143l-243 923h162l169 -715l231 715h128l236 -715l161 715h156z" />
+<glyph unicode="&#x1d5d1;" horiz-adv-x="1001" d="M952 0h-196l-262 354l-263 -354h-181l360 460l-357 463h196l260 -349l261 349h182l-363 -454z" />
+<glyph unicode="&#x1d5d2;" horiz-adv-x="1001" d="M951 923l-539 -1263h-166l172 385l-368 878h169l283 -684l286 684h163z" />
+<glyph unicode="&#x1d5d3;" horiz-adv-x="889" d="M822 0h-745v115l538 678h-527v130h720v-111l-540 -681h554v-131z" />
+<glyph unicode="&#x1d5d4;" horiz-adv-x="1375" d="M1360 0h-325l-93 278h-520l-93 -278h-316l485 1343h377zM869 498l-187 558l-187 -558h374z" />
+<glyph unicode="&#x1d5d5;" horiz-adv-x="1349" d="M1185 1039q0 -195 -196 -284v-31q139 -28 212 -108t73 -211q0 -188 -142 -296.5t-405 -108.5h-571v1343h506q267 0 380 -58q143 -74 143 -246zM845.5 885q16.5 38 16.5 80.5t-19 80.5q-35 72 -166 75q-57 2 -159 2h-48v-323h70q188 0 238.5 23.5t67 61.5zM924 315 q22 42 22 104t-28 102q-48 71 -208 73l-240 1v-375h41l209 1q156 3 204 94z" />
+<glyph unicode="&#x1d5d6;" horiz-adv-x="1280" d="M804 207q190 0 389 182h15v-303q-60 -27 -182 -73q-133 -39 -278 -39q-305 0 -487.5 179t-182.5 509.5t180.5 518.5t490.5 188q152 0 252.5 -28t206.5 -80v-308h-19q-137 119 -258 162q-61 21 -129 21q-266 0 -361 -251q-34 -89 -34 -216q0 -244 130 -364 q107 -98 267 -98z" />
+<glyph unicode="&#x1d5d7;" horiz-adv-x="1472" d="M1394 670q0 -171 -77 -323.5t-217 -239.5q-172 -107 -486 -107h-458v1343h472q307 0 475 -106q291 -183 291 -567zM876 281q191 110 191 395.5t-209 393.5q-93 48 -283 48h-103v-892h103q204 0 301 55z" />
+<glyph unicode="&#x1d5d8;" horiz-adv-x="1206" d="M1097 0h-941v1343h941v-234h-627v-269h582v-234h-582v-372h627v-234z" />
+<glyph unicode="&#x1d5d9;" horiz-adv-x="1147" d="M1088 1109h-618v-288h573v-234h-573v-587h-314v1343h932v-234z" />
+<glyph unicode="&#x1d5da;" horiz-adv-x="1438" d="M889 193q46 0 103 5v300h-267v227h588v-651q-265 -102 -520 -102q-337 0 -526 186t-189 507t191 512.5t535 191.5q267 0 504 -116v-296h-18q-169 128 -291 166q-72 21 -153 21q-191 0 -315 -120t-124 -350t122.5 -355.5t359.5 -125.5z" />
+<glyph unicode="&#x1d5db;" horiz-adv-x="1486" d="M1329 0h-315v606h-542v-606h-316v1343h316v-503h542v503h315v-1343z" />
+<glyph unicode="&#x1d5dc;" horiz-adv-x="958" d="M851 0h-755v212h220v919h-220v212h755v-212h-220v-919h220v-212z" />
+<glyph unicode="&#x1d5dd;" horiz-adv-x="975" d="M825 1343v-955q0 -185 -127 -297t-371 -112q-179 0 -304 24v250h14q119 -45 213 -45q183 0 232 107q28 59 28 244v563h-308v221h623z" />
+<glyph unicode="&#x1d5de;" horiz-adv-x="1365" d="M472 0h-316v1343h316v-652l503 652h360l-511 -620l539 -723h-385l-409 560l-97 -121v-439z" />
+<glyph unicode="&#x1d5df;" horiz-adv-x="1123" d="M1094 0h-938v1343h316v-1109h622v-234z" />
+<glyph unicode="&#x1d5e0;" horiz-adv-x="1685" d="M1533 0h-313v982l-275 -659h-218l-275 659v-982h-296v1343h377l312 -713l312 713h376v-1343z" />
+<glyph unicode="&#x1d5e1;" horiz-adv-x="1502" d="M1347 0h-310l-594 984v-984h-287v1343h390l514 -826v826h287v-1343z" />
+<glyph unicode="&#x1d5e2;" horiz-adv-x="1508" d="M1251 1183.5q180 -187.5 180 -511t-179.5 -512t-497 -188.5t-497 188.5t-179.5 512t179.5 511t496.5 187.5t497 -187.5zM998 1033q-93 110 -241.5 110t-249 -114.5t-100.5 -353.5t98 -357t250.5 -118t250 120t97.5 354t-105 359z" />
+<glyph unicode="&#x1d5e3;" horiz-adv-x="1296" d="M1234 925q0 -198 -117 -318q-157 -159 -414 -159h-231v-448h-316v1343h555q232 0 363 -88q160 -107 160 -330zM838.5 734q68.5 59 68.5 184.5t-112 171.5q-68 28 -248 28h-75v-443h114q184 0 252.5 59z" />
+<glyph unicode="&#x1d5e4;" horiz-adv-x="1508" d="M1431 674q0 -239 -105.5 -411t-316.5 -244q4 -110 54 -153.5t149.5 -43.5t176.5 36h15v-214q-120 -27 -275 -27q-202 0 -303 94t-111 270q-309 18 -473 201t-164 499t179.5 503t496.5 187t497 -187t180 -510zM1103 677q0 233 -99 350t-247.5 117t-249 -114t-100.5 -351.5 t98 -355.5t250.5 -118t250 119.5t97.5 352.5z" />
+<glyph unicode="&#x1d5e5;" horiz-adv-x="1386" d="M470 504v-504h-314v1343h566q240 0 357 -72q158 -96 158 -290q0 -147 -66.5 -239.5t-208.5 -162.5l441 -579h-384l-366 504h-183zM834 769q75 60 75 174t-101 156q-53 23 -197 23h-141v-402h122q179 0 242 49z" />
+<glyph unicode="&#x1d5e6;" horiz-adv-x="1256" d="M1200 416q0 -225 -201 -343q-166 -97 -420 -97t-496 100v303h17q226 -181 502 -181q113 0 163.5 21t80 49.5t29.5 84.5q0 105 -159 143q-107 21 -317 76q-308 102 -308 377q0 209 198 323q163 95 403 95t455 -87v-290h-16q-194 156 -444 156q-102 0 -175 -29 q-95 -39 -95 -121q0 -63 45 -95.5t161 -56.5l142 -31q268 -57 365 -175q70 -85 70 -222z" />
+<glyph unicode="&#x1d5e7;" horiz-adv-x="1204" d="M1176 1109h-419v-1109h-316v1109h-419v234h1154v-234z" />
+<glyph unicode="&#x1d5e8;" horiz-adv-x="1440" d="M1301 482q0 -247 -146.5 -378.5t-435.5 -131.5t-435.5 131.5t-146.5 377.5v862h318v-841q0 -149 62.5 -224.5t200.5 -75.5t202 72.5t64 227.5v841h317v-861z" />
+<glyph unicode="&#x1d5e9;" horiz-adv-x="1352" d="M1336 1343l-478 -1343h-366l-479 1343h331l335 -999l336 999h321z" />
+<glyph unicode="&#x1d5ea;" horiz-adv-x="2012" d="M1974 1343l-353 -1343h-360l-253 940l-246 -940h-359l-354 1343h329l218 -997l260 997h322l248 -997l228 997h320z" />
+<glyph unicode="&#x1d5eb;" horiz-adv-x="1352" d="M1329 0h-363l-297 465l-304 -465h-344l465 677l-455 666h361l288 -441l296 441h345l-458 -652z" />
+<glyph unicode="&#x1d5ec;" horiz-adv-x="1303" d="M812 0h-316v504l-491 839h357l300 -549l289 549h344l-483 -823v-520z" />
+<glyph unicode="&#x1d5ed;" horiz-adv-x="1222" d="M1163 0h-1097v236l686 873h-653v234h1028v-241l-685 -868h721v-234z" />
+<glyph unicode="&#x1d5ee;" horiz-adv-x="1124" d="M992 0h-293v98q-41 -32 -126 -84q-84 -39 -204 -39t-209 80.5t-89 209.5q0 270 377 319q122 15 252 23v4q0 135 -246 135q-105 0 -276 -65h-27v222q175 46 377 46t312 -54q152 -76 152 -267v-628zM371 288q0 -56 34 -84.5t125.5 -28.5t168.5 66v192q-86 -7 -236 -34 q-92 -28 -92 -111z" />
+<glyph unicode="&#x1d5ef;" horiz-adv-x="1177" d="M1024 800q79 -123 79 -325t-108 -341q-117 -152 -313 -152q-138 0 -246 64l-13 -46h-283v1279h296v-452q153 121 303 121q191 0 285 -148zM798 468q0 257 -191 257q-88 0 -171 -49v-464q55 -20 129 -20q233 0 233 276z" />
+<glyph unicode="&#x1d5f0;" horiz-adv-x="990" d="M621 -25q-251 0 -400 121.5t-149 366t164 373.5q143 112 375 112q168 0 323 -73v-253h-41q-60 51 -102 73q-78 42 -167 42q-122 0 -184 -77t-62 -202q0 -271 251 -271q102 0 175 42q40 24 89 70h41v-252q-151 -72 -313 -72z" />
+<glyph unicode="&#x1d5f1;" horiz-adv-x="1177" d="M1037 0h-296v96q-148 -121 -296 -121q-187 0 -286 152q-85 130 -85 340.5t127 351.5q118 129 295 129q117 0 245 -62v393h296v-1279zM612 732q-233 0 -233 -274q0 -258 197 -258q88 0 165 55v453q-58 24 -129 24z" />
+<glyph unicode="&#x1d5f2;" horiz-adv-x="1118" d="M1049 407h-678q14 -224 307 -224q181 0 321 106h32v-237q-190 -77 -385 -77q-258 0 -406 109q-168 124 -168 366t143.5 372t381.5 130q452 0 452 -442v-103zM573 767q-190 0 -202 -187h384q-5 187 -182 187z" />
+<glyph unicode="&#x1d5f3;" horiz-adv-x="711" d="M738 1062h-22q-71 20 -119 20q-88 0 -118.5 -32t-30.5 -120v-7h228v-201h-218v-722h-296v722h-127v201h127v25q0 339 362 339q123 0 214 -16v-209z" />
+<glyph unicode="&#x1d5f4;" horiz-adv-x="1177" d="M1037 106q0 -251 -133.5 -352.5t-379.5 -101.5q-188 0 -351 40v231h36q144 -57 285.5 -57t194 54t52.5 170v18q-116 -95 -263 -95q-404 0 -404 472q0 212 118.5 337.5t299.5 125.5q141 0 248 -66l10 41h287v-817zM612 732q-233 0 -233 -254q0 -238 197 -238q87 0 165 51 v418q-55 23 -129 23z" />
+<glyph unicode="&#x1d5f5;" horiz-adv-x="1199" d="M1067 0h-298v458q0 145 -28 198t-120.5 53t-184.5 -55v-654h-296v1279h296v-458q163 127 313 127q318 0 318 -347v-601z" />
+<glyph unicode="&#x1d5f6;" horiz-adv-x="575" d="M444 1054h-312v225h312v-225zM436 0h-296v923h296v-923z" />
+<glyph unicode="&#x1d5f7;" horiz-adv-x="678" d="M539 1054h-315v225h315v-225zM539 -16q0 -154 -94.5 -243t-249.5 -89t-243 22v212h23q60 -20 120 -20q93 0 126 67q22 46 22 152v637h-175v201h471v-939z" />
+<glyph unicode="&#x1d5f8;" horiz-adv-x="1129" d="M436 0h-296v1279h296v-764l319 408h341l-332 -398l355 -525h-344l-259 402l-80 -98v-304z" />
+<glyph unicode="&#x1d5f9;" horiz-adv-x="575" d="M436 0h-296v1279h296v-1279z" />
+<glyph unicode="&#x1d5fa;" horiz-adv-x="1781" d="M1649 0h-298v461q0 149 -20 192q-28 56 -130 56q-64 0 -159 -55v-654h-297v461q0 149 -22 192q-28 56 -129 56q-67 0 -158 -55v-654h-296v923h296v-102q162 127 300 127q191 0 271 -160q190 160 337 160q305 0 305 -347v-601z" />
+<glyph unicode="&#x1d5fb;" horiz-adv-x="1199" d="M1067 0h-298v458q0 145 -28 198t-120.5 53t-184.5 -55v-654h-296v923h296v-102q163 127 313 127q318 0 318 -347v-601z" />
+<glyph unicode="&#x1d5fc;" horiz-adv-x="1155" d="M1083 461q0 -234 -135.5 -362t-370.5 -128t-370 128.5t-135 361.5t135.5 362t370.5 129t370 -128.5t135 -362.5zM671 197q105 54 105 260q0 229 -119 274q-37 14 -80 14q-90 0 -144 -62.5t-54 -219t52.5 -221t148.5 -64.5q53 0 91 19z" />
+<glyph unicode="&#x1d5fd;" horiz-adv-x="1177" d="M1023 800q80 -125 80 -338.5t-123.5 -346.5t-297.5 -133q-125 0 -246 64v-385h-296v1262h296v-96q153 121 303 121q189 0 284 -148zM798 468q0 257 -191 257q-88 0 -171 -49v-465q46 -18 129 -18q233 0 233 275z" />
+<glyph unicode="&#x1d5fe;" horiz-adv-x="1177" d="M1037 -339h-296v429q-143 -115 -296 -115q-188 0 -287 152q-84 130 -84 340.5t127 351.5q118 129 295 129q118 0 244 -66l10 41h287v-1262zM612 732q-233 0 -233 -274q0 -258 197 -258q88 0 165 55v453q-58 24 -129 24z" />
+<glyph unicode="&#x1d5ff;" horiz-adv-x="837" d="M809 641h-27q-37 13 -140.5 13t-205.5 -36v-618h-296v923h296v-136q162 139 303 139q40 0 70 -3v-282z" />
+<glyph unicode="&#x1d600;" horiz-adv-x="999" d="M105 292q169 -120 351.5 -120t182.5 76q0 39 -42 58q-16 8 -78 19t-189 38q-248 65 -248 276q0 160 165 244q129 65 317.5 65t335.5 -65v-234h-25q-149 102 -319.5 102t-170.5 -75q0 -43 44 -63q19 -9 84.5 -21t199.5 -41q229 -58 229 -258q0 -168 -165 -253 q-129 -65 -333.5 -65t-365.5 73v244h27z" />
+<glyph unicode="&#x1d601;" horiz-adv-x="767" d="M498 -18q-173 0 -257 70t-84 239v431h-122v201h122v264h296v-264h277v-201h-277v-327q0 -116 14 -149q26 -63 126 -63q62 0 112 28h25v-203q-102 -26 -232 -26z" />
+<glyph unicode="&#x1d602;" horiz-adv-x="1199" d="M1059 0h-295v102q-168 -127 -314 -127q-318 0 -318 347v601h298v-458q0 -145 28 -198t123.5 -53t182.5 55v654h295v-923z" />
+<glyph unicode="&#x1d603;" horiz-adv-x="1094" d="M1069 923l-356 -923h-335l-353 923h313l213 -635l212 635h306z" />
+<glyph unicode="&#x1d604;" horiz-adv-x="1649" d="M1612 923l-286 -923h-314l-188 622l-185 -622h-318l-284 923h311l157 -636l198 636h262l187 -636l156 636h304z" />
+<glyph unicode="&#x1d605;" horiz-adv-x="1126" d="M1105 0h-346l-197 276l-202 -276h-339l364 461l-358 462h345l194 -271l195 271h340l-360 -455z" />
+<glyph unicode="&#x1d606;" horiz-adv-x="1096" d="M1071 923l-513 -1262h-320l146 346l-359 916h310l221 -597l211 597h304z" />
+<glyph unicode="&#x1d607;" horiz-adv-x="1004" d="M936 0h-867v190l487 517h-467v216h838v-187l-479 -516h488v-220z" />
+<glyph unicode="&#x1d608;" horiz-adv-x="1240" d="M1114 0h-166l-44 382h-590l-221 -382h-171l792 1343h226zM886 515l-87 701l-408 -701h495z" />
+<glyph unicode="&#x1d609;" horiz-adv-x="1245" d="M939 748q222 -50 222 -259q0 -112 -55 -215q-149 -274 -564 -274h-484l308 1343h380q132 0 178 -5q103 -10 168 -50q96 -60 96 -177q-1 -119 -68 -207q-66 -89 -181 -138v-18zM1008 1059q0 75 -51 111q-60 40 -246 40h-210l-96 -418h244q156 0 240 49q119 69 119 218z M950 314q38 76 38 167.5t-82 142.5q-62 38 -253 38h-277l-123 -529h256q120 0 196 13q176 31 245 168z" />
+<glyph unicode="&#x1d60a;" horiz-adv-x="1268" d="M1299 1059q-175 175 -426 175t-417 -204t-166 -516q0 -190 97.5 -297t284.5 -107q256 0 492 186h1l-41 -197q-244 -123 -483 -123t-383 129t-144 375q0 379 218.5 633t585.5 254q218 0 424 -115l-39 -193h-4z" />
+<glyph unicode="&#x1d60b;" horiz-adv-x="1392" d="M412 0h-353l309 1343h306q324 0 483 -107q192 -130 192 -403q0 -226 -111 -423q-112 -197 -305 -303.5t-521 -106.5zM1176 814q0 395 -520 395h-155l-249 -1075h196q260 0 426 95q147 85 224.5 245t77.5 340z" />
+<glyph unicode="&#x1d60c;" horiz-adv-x="1147" d="M1236 1343l-31 -139h-707l-90 -398h706l-32 -138h-706l-122 -529h706l-32 -139h-869l308 1343h869z" />
+<glyph unicode="&#x1d60d;" horiz-adv-x="1041" d="M1210 1343l-31 -139h-678l-95 -409h583l-32 -138h-582l-152 -657h-165l309 1343h843z" />
+<glyph unicode="&#x1d60e;" horiz-adv-x="1410" d="M899 1234q-150 0 -264 -60q-226 -120 -306 -388q-39 -130 -39 -261q0 -417 426 -417q162 0 328 62l79 361h-358l31 137h522l-131 -569l-104 -43q-200 -82 -388 -82q-266 0 -423.5 132t-157.5 393q0 378 225.5 623t611.5 245q240 0 468 -118l-39 -195h-7 q-191 180 -474 180z" />
+<glyph unicode="&#x1d60f;" horiz-adv-x="1366" d="M1379 1343l-308 -1343h-163l153 668h-685l-154 -668h-163l308 1343h163l-122 -537h685l123 537h163z" />
+<glyph unicode="&#x1d610;" horiz-adv-x="759" d="M827 1343l-27 -117h-179l-254 -1109h177l-26 -117h-517l27 117h176l254 1109h-174l26 117h517z" />
+<glyph unicode="&#x1d611;" horiz-adv-x="821" d="M145 -19q-111 0 -221 25l35 149h3q111 -40 194 -40q159 0 227 82q51 61 86 215l184 808h-293l29 123h457l-228 -996q-40 -175 -165.5 -270.5t-307.5 -95.5z" />
+<glyph unicode="&#x1d612;" horiz-adv-x="1259" d="M1380 1343l-728 -642l478 -701h-193l-415 610l-193 -165l-102 -445h-165l310 1343h165l-167 -719l806 719h204z" />
+<glyph unicode="&#x1d613;" horiz-adv-x="1008" d="M925 139l-32 -139h-835l309 1343h165l-277 -1204h670z" />
+<glyph unicode="&#x1d614;" horiz-adv-x="1534" d="M1549 1343l-309 -1343h-165l274 1182l-567 -808h-96l-194 841l-281 -1215h-153l309 1343h234l182 -767l532 767h234z" />
+<glyph unicode="&#x1d615;" horiz-adv-x="1360" d="M1378 1343l-309 -1343h-201l-372 1237l-285 -1237h-153l309 1343h257l340 -1131l261 1131h153z" />
+<glyph unicode="&#x1d616;" horiz-adv-x="1432" d="M1389 870q0 -370 -205 -625q-219 -273 -567 -273q-240 0 -371 131t-131 371q0 372 212.5 634.5t558.5 262.5q240 0 371.5 -130.5t131.5 -370.5zM858 1238q-131 0 -237 -61q-212 -122 -293 -399q-40 -134 -40 -276q0 -182 90 -289.5t269 -107.5q253 0 410.5 217t158.5 522 q0 181 -90.5 287.5t-267.5 106.5z" />
+<glyph unicode="&#x1d617;" horiz-adv-x="1093" d="M542 509h-202l-117 -509h-165l309 1343h348q224 0 330 -83.5t105 -235.5q0 -227 -181 -379q-162 -136 -427 -136zM974 993q0 107 -70 161.5t-229 54.5h-173l-132 -568h170q207 0 309 85q125 105 125 267z" />
+<glyph unicode="&#x1d618;" horiz-adv-x="1432" d="M710 -19l-48 -3q-21 -2 -45 -2q-239 0 -371 130t-132 381t116.5 476.5t337.5 334.5q145 73 318 73q240 0 372 -130.5t132 -369.5q0 -285 -138 -522.5t-385 -328.5l-4 -39q-2 -18 -2 -28q0 -100 48 -136t132 -36t174 31h14l-29 -142q-101 -24 -212 -24q-284 0 -284 258 q0 21 6 77zM1215 845q0 181 -90 287t-267 106q-131 0 -236 -61q-213 -122 -294 -398q-39 -134 -39 -275q0 -182 90 -289.5t268 -107.5q254 0 411 216.5t157 521.5z" />
+<glyph unicode="&#x1d619;" horiz-adv-x="1263" d="M726 1343q231 0 332.5 -75t100.5 -214q0 -166 -103.5 -292.5t-281.5 -179.5l383 -582h-192l-352 543h-266l-124 -543h-165l308 1343h360zM980 1013q0 95 -62.5 145.5t-208.5 50.5h-208l-124 -538h198q178 0 277 75q128 99 128 267z" />
+<glyph unicode="&#x1d61a;" horiz-adv-x="1241" d="M1196 1089q-76 69 -198 107t-251 38t-230 -60q-123 -72 -123 -209t165 -178q106 -21 314 -70q255 -70 255 -276q0 -192 -169 -328.5t-434 -136.5t-484 109l41 196h4q85 -81 210 -126.5t266.5 -45.5t250.5 59q136 75 136 222q0 132 -149 174l-293 64q-291 67 -291 295 q0 214 189 338q162 106 396 106t437 -96l-38 -182h-4z" />
+<glyph unicode="&#x1d61b;" horiz-adv-x="1118" d="M1310 1343l-32 -139h-478l-278 -1204h-165l278 1204h-479l31 139h1123z" />
+<glyph unicode="&#x1d61c;" horiz-adv-x="1330" d="M545 -28q-412 0 -412 356q0 90 27 208l186 807h165l-187 -812q-24 -108 -24 -182q0 -243 276 -243q194 0 303 122q86 98 131 295l189 820h165l-185 -803q-71 -305 -231.5 -436.5t-402.5 -131.5z" />
+<glyph unicode="&#x1d61d;" horiz-adv-x="1240" d="M1391 1343l-792 -1343h-227l-175 1343h171l147 -1209l704 1209h172z" />
+<glyph unicode="&#x1d61e;" horiz-adv-x="1805" d="M1904 1343l-640 -1343h-195l-38 1149l-535 -1149h-186l-52 1343h166l35 -1152l539 1152h169l35 -1163l543 1163h159z" />
+<glyph unicode="&#x1d61f;" horiz-adv-x="1244" d="M1370 1343l-619 -668l309 -675h-179l-248 555l-507 -555h-179l626 674l-307 669h179l245 -549l500 549h180z" />
+<glyph unicode="&#x1d620;" horiz-adv-x="1116" d="M1291 1343l-635 -751l-136 -592h-165l131 569l-295 774h175l234 -617l515 617h176z" />
+<glyph unicode="&#x1d621;" horiz-adv-x="1244" d="M1309 1343l-33 -145l-1062 -1059h847l-32 -139h-1032l34 155l1053 1049h-796l32 139h989z" />
+<glyph unicode="&#x1d622;" horiz-adv-x="1030" d="M824 -13q-159 0 -178 121q-79 -57 -166 -95.5t-198 -38.5t-180.5 62.5t-69.5 169.5q0 212 192 309q166 83 525 94q12 54 12 75q0 73 -61 104q-49 26 -168 26t-290 -68h-8l30 156q167 43 313 43q343 0 343 -224q0 -41 -12 -95l-100 -433q-3 -13 -3 -24q0 -52 54 -52 q40 0 103 25h8l-28 -134q-86 -21 -118 -21zM196 235q0 -122 167 -122q135 0 299 114l60 260q-267 -11 -389 -61q-137 -57 -137 -191z" />
+<glyph unicode="&#x1d623;" horiz-adv-x="1054" d="M984 631q0 -275 -154.5 -466t-365.5 -191q-140 0 -252 71l-20 -45h-146l297 1286h155l-106 -460q175 123 315 123t208.5 -86.5t68.5 -231.5zM463 108q167 0 262.5 147t95.5 349t-180 202q-115 0 -279 -110l-122 -528q112 -60 223 -60z" />
+<glyph unicode="&#x1d624;" horiz-adv-x="882" d="M868 702q-128 114 -269 114q-172 0 -274 -152q-89 -133 -89 -314q0 -242 231 -242q143 0 318 120h9l-33 -169q-177 -80 -315 -80q-175 0 -274.5 88t-99.5 267t85.5 333.5t247.5 228.5q106 48 239 48t267 -75l-33 -167h-10z" />
+<glyph unicode="&#x1d625;" horiz-adv-x="1062" d="M837 169q0 -52 54 -52q40 0 103 25h8l-29 -134q-85 -21 -117 -21q-159 0 -179 120l-15 -10q-180 -123 -315 -123t-206 89t-71 234q0 267 153 459.5t370 192.5q144 0 251 -63l93 400h155l-252 -1093q-3 -13 -3 -24zM592 813q-165 0 -268 -154q-91 -136 -91 -339t184 -203 q111 0 275 110l123 530q-108 56 -223 56z" />
+<glyph unicode="&#x1d626;" horiz-adv-x="1008" d="M954 651q0 -68 -30 -203h-680q-9 -44 -9 -90q0 -123 74 -186.5t198 -63.5q180 0 349 116h9l-34 -168q-51 -19 -158 -52q-106 -25 -190 -25q-186 0 -298 87t-112 266q0 248 156.5 432.5t400.5 184.5q150 0 237 -75t87 -223zM801 639q0 187 -204 187q-119 0 -209 -73.5 t-122 -190.5h527q8 43 8 77z" />
+<glyph unicode="&#x1d627;" horiz-adv-x="595" d="M654 1164q-102 0 -152.5 -52t-75.5 -158l-8 -31h280l-30 -124h-275l-180 -799h-157l180 799h-105l30 124h105l7 31q73 340 386 340q86 0 171 -17l-33 -136h-8q-67 23 -135 23z" />
+<glyph unicode="&#x1d628;" horiz-adv-x="1052" d="M293 -350q-144 0 -276 40l36 155h8q132 -59 276.5 -59t213.5 68.5t98 190.5l19 81q-91 -61 -154.5 -86.5t-155.5 -25.5q-141 0 -214 85.5t-73 228.5q0 248 150 434.5t370 186.5q146 0 250 -66l19 40h146l-188 -821q-52 -227 -175.5 -339.5t-349.5 -112.5zM591 815 q-160 0 -259 -134.5t-99 -324.5q0 -204 188 -204q119 0 276 102l115 503q-112 58 -221 58z" />
+<glyph unicode="&#x1d629;" horiz-adv-x="1071" d="M971 712q0 -52 -14 -113l-139 -599h-155l121 526q21 89 21 141q0 139 -158 139q-110 0 -286 -117l-159 -689h-156l297 1286h155l-107 -465q183 128 325 128q255 0 255 -237z" />
+<glyph unicode="&#x1d62a;" horiz-adv-x="571" d="M499 1239l-37 -161h-175l37 161h175zM344 -18q-239 0 -239 208q0 51 14 112l143 621h155l-127 -551q-21 -93 -21 -141q0 -119 143 -119q70 0 144 30h8l-28 -134q-106 -26 -192 -26z" />
+<glyph unicode="&#x1d62b;" horiz-adv-x="583" d="M621 1239l-37 -161h-177l38 161h176zM-47 -350q-94 0 -175 24l32 141h8q70 -31 132 -31q112 0 162 71q34 49 67 194l173 749h-193l29 125h350l-218 -945q-76 -328 -367 -328z" />
+<glyph unicode="&#x1d62c;" horiz-adv-x="993" d="M1060 923l-526 -436l360 -487h-188l-295 406l-134 -109l-68 -297h-157l298 1286h157l-192 -827l541 464h204z" />
+<glyph unicode="&#x1d62d;" horiz-adv-x="571" d="M344 -18q-239 0 -239 208q0 51 14 112l227 984h156l-212 -914q-21 -93 -21 -141q0 -119 143 -119q70 0 144 30h8l-28 -134q-106 -26 -192 -26z" />
+<glyph unicode="&#x1d62e;" horiz-adv-x="1647" d="M1547 719q0 -56 -15 -120l-139 -599h-155l121 526q23 96 23 150q0 130 -152 130q-103 0 -282 -121q-4 -51 -14 -94l-137 -591h-155l122 526q23 103 23 150q0 130 -152 130q-96 0 -274 -117l-159 -689h-156l213 923h156l-24 -102q184 128 316 128q189 0 229 -150 q206 150 367 150q244 0 244 -230z" />
+<glyph unicode="&#x1d62f;" horiz-adv-x="1071" d="M971 712q0 -52 -14 -113l-139 -599h-155l121 526q21 89 21 141q0 139 -158 139q-110 0 -286 -117l-159 -689h-156l213 923h156l-24 -102q183 128 325 128q255 0 255 -237z" />
+<glyph unicode="&#x1d630;" horiz-adv-x="1027" d="M954 597q0 -260 -149.5 -441.5t-382.5 -181.5q-165 0 -256.5 94t-91.5 267.5t80.5 329.5t233.5 233q100 51 218 51q165 0 256.5 -93.5t91.5 -258.5zM792 584q0 235 -211 235q-155 0 -250.5 -139.5t-95.5 -339.5q0 -236 212 -236q157 0 251 140t94 340z" />
+<glyph unicode="&#x1d631;" horiz-adv-x="1054" d="M984 631q0 -274 -154.5 -461.5t-366.5 -187.5q-146 0 -251 66l-89 -388h-155l291 1263h156l-23 -97q175 123 316 123q276 0 276 -318zM462 116q165 0 262 143t97 345t-180 202q-115 0 -279 -110l-121 -523q106 -57 221 -57z" />
+<glyph unicode="&#x1d632;" horiz-adv-x="1054" d="M354 -18q-284 0 -284 315q0 267 153 459.5t370 192.5q144 0 251 -63l19 37h145l-292 -1263h-155l103 444q-173 -122 -310 -122zM592 814q-165 0 -268 -155q-91 -136 -91 -335.5t184 -199.5q113 0 277 111l121 522q-109 57 -223 57z" />
+<glyph unicode="&#x1d633;" horiz-adv-x="722" d="M653 775q-131 0 -301 -120l-149 -655h-157l211 923h157l-31 -136q195 136 333 136q52 0 111 -10l-35 -154h-9q-62 16 -130 16z" />
+<glyph unicode="&#x1d634;" horiz-adv-x="882" d="M814 715q-129 105 -290 105q-91 0 -154 -35q-78 -43 -78 -126t127 -114q57 -11 170 -37q193 -47 193 -201q0 -136 -122 -232.5t-309.5 -96.5t-336.5 81l35 166h8q53 -46 116 -75q97 -47 196 -47q248 0 248 170q0 75 -131 105q-57 12 -169 38q-189 53 -189 205 q0 130 115 227t302.5 97t309.5 -72l-33 -158h-8z" />
+<glyph unicode="&#x1d635;" horiz-adv-x="667" d="M269 231q0 -119 144 -119q70 0 144 30h8l-29 -134q-105 -26 -191 -26q-239 0 -239 208q0 51 14 112l115 495h-105l28 126h105l62 265h155l-62 -265h321l-28 -126h-321l-99 -425q-22 -92 -22 -141z" />
+<glyph unicode="&#x1d636;" horiz-adv-x="1075" d="M853 169q0 -52 54 -52q39 0 103 25h8l-28 -134q-85 -21 -118 -21q-164 0 -179 125q-188 -138 -339 -138q-253 0 -253 235q0 54 14 115l138 599h155l-121 -526q-21 -89 -21 -138q0 -142 159 -142q116 0 286 117l158 689h156l-169 -730q-3 -13 -3 -24z" />
+<glyph unicode="&#x1d637;" horiz-adv-x="1000" d="M1046 923l-587 -923h-154l-158 923h159l116 -735l453 735h171z" />
+<glyph unicode="&#x1d638;" horiz-adv-x="1385" d="M1409 923l-429 -923h-145l-93 713l-381 -713h-144l-58 923h159l24 -714l377 714h130l90 -714l307 714h163z" />
+<glyph unicode="&#x1d639;" horiz-adv-x="1001" d="M1059 923l-471 -465l258 -458h-175l-191 354l-346 -354h-191l474 467l-258 456h175l190 -352l344 352h191z" />
+<glyph unicode="&#x1d63a;" horiz-adv-x="1000" d="M1044 923l-831 -1263h-171l269 394l-167 869h159l131 -687l441 687h169z" />
+<glyph unicode="&#x1d63b;" horiz-adv-x="889" d="M911 923l-26 -111l-689 -688h553l-29 -124h-746l27 115l686 684h-528l29 124h723z" />
+<glyph unicode="&#x1d63c;" horiz-adv-x="1400" d="M1267 0h-317l-30 281h-517l-158 -281h-326l794 1343h379zM899 495l-59 560l-316 -560h375z" />
+<glyph unicode="&#x1d63d;" horiz-adv-x="1373" d="M611 0h-562l310 1343h477q192 0 314 -54q168 -74 168 -239q0 -121 -65 -200q-64 -77 -206 -120l-8 -31q119 -36 171.5 -93t52.5 -161q-2 -242 -218 -356q-169 -89 -434 -89zM791 1123h-168l-75 -323h177q119 0 188 48.5t69 142.5q1 71 -51.5 101.5t-139.5 30.5zM694 595 h-193l-87 -375h194q332 0 333 216q0 84 -61 121.5t-186 37.5z" />
+<glyph unicode="&#x1d63e;" horiz-adv-x="1303" d="M915 1136q-228 0 -362 -193q-119 -171 -119 -412q0 -324 297 -324q220 0 447 182h11l-74 -301q-62 -28 -190 -75q-131 -39 -275 -39q-266 0 -408 132t-142 378q0 389 240 638q238 247 592 247q267 0 454 -106l-75 -310h-21q-168 183 -375 183z" />
+<glyph unicode="&#x1d63f;" horiz-adv-x="1499" d="M515 0h-466l310 1343h422q336 0 490 -110q194 -138 194 -408q0 -222 -116 -419q-115 -197 -303.5 -301.5t-530.5 -104.5zM742 1124h-117l-210 -904h163q111 0 169 16q213 56 316 257q69 134 70 297q0 98 -35 169q-55 110 -180 146q-65 19 -176 19z" />
+<glyph unicode="&#x1d640;" horiz-adv-x="1228" d="M1300 1343l-52 -229h-627l-65 -277h582l-54 -230h-581l-88 -378h627l-52 -229h-941l310 1343h941z" />
+<glyph unicode="&#x1d641;" horiz-adv-x="1168" d="M1290 1343l-54 -234h-617l-67 -288h572l-53 -234h-572l-136 -587h-314l310 1343h931z" />
+<glyph unicode="&#x1d642;" horiz-adv-x="1464" d="M966 1144q-122 0 -221 -51q-195 -100 -273 -330q-38 -114 -38 -237q0 -169 92 -250q93 -83 298 -83q48 0 99 5l70 300h-268l53 227h588l-151 -650q-296 -103 -523 -103q-280 0 -436 134q-156 133 -156 378q0 388 245 638q243 247 628 247q289 0 509 -114l-73 -298h-20 q-194 187 -423 187z" />
+<glyph unicode="&#x1d643;" horiz-adv-x="1513" d="M1533 1343l-310 -1343h-317l141 607h-542l-140 -607h-316l310 1343h316l-117 -506h541l118 506h316z" />
+<glyph unicode="&#x1d644;" horiz-adv-x="975" d="M1054 1343l-49 -212h-219l-212 -919h219l-49 -212h-755l49 212h219l212 919h-219l49 212h755z" />
+<glyph unicode="&#x1d645;" horiz-adv-x="992" d="M211 -21q-172 0 -294 24l59 256h17q113 -46 202 -46q145 0 217 71t119 271l131 567h-307l51 221h623l-209 -902q-54 -236 -202 -349t-407 -113z" />
+<glyph unicode="&#x1d646;" horiz-adv-x="1390" d="M1535 1343l-661 -621l398 -722h-346l-304 566l-159 -141l-98 -425h-316l309 1343h316l-147 -639l643 639h365z" />
+<glyph unicode="&#x1d647;" horiz-adv-x="1144" d="M1041 234l-55 -234h-937l310 1343h316l-255 -1109h621z" />
+<glyph unicode="&#x1d648;" horiz-adv-x="1716" d="M1737 1343l-310 -1343h-315l223 966l-415 -643h-218l-127 674l-230 -997h-296l310 1343h373l148 -713l476 713h381z" />
+<glyph unicode="&#x1d649;" horiz-adv-x="1530" d="M1550 1343l-310 -1343h-272l-404 987l-228 -987h-287l310 1343h365l348 -831l191 831h287z" />
+<glyph unicode="&#x1d64a;" horiz-adv-x="1536" d="M669 -28q-270 0 -420 141q-148 139 -148 382v6q1 365 231.5 617.5t603.5 252.5q270 0 420 -141q149 -141 149 -380q-1 -363 -218 -609q-236 -269 -618 -269zM891 1149q-180 0 -317 -170q-140 -172 -140 -455q0 -161 74 -245q75 -85 207 -85q189 0 322 178t134 451 q0 150 -72 237q-73 89 -208 89z" />
+<glyph unicode="&#x1d64b;" horiz-adv-x="1320" d="M612 448h-144l-103 -448h-316l310 1343h470q266 0 390 -80q136 -86 136 -282q-1 -278 -246 -419q-198 -114 -497 -114zM1016 944q0 174 -240 174h-153l-102 -443h144q163 0 256.5 69.5t94.5 199.5z" />
+<glyph unicode="&#x1d64c;" horiz-adv-x="1536" d="M693 -22h-24q-269 0 -419 140q-149 140 -149 384v3q2 363 232.5 614.5t603.5 251.5q270 0 420 -141q148 -138 148 -374v-6q-1 -274 -133 -490q-65 -106 -163 -192t-228 -136q-8 -29 -11 -76q0 -70 43.5 -102t136.5 -32t174 36h12l-50 -214q-127 -27 -248 -27 q-179 0 -268 69q-87 67 -87 194q0 38 10 98zM892 1150q-180 0 -318 -170q-139 -170 -139 -452q0 -160 73 -244q75 -85 208 -85q189 0 322 177.5t134 448.5q0 150 -72 237q-73 88 -208 88z" />
+<glyph unicode="&#x1d64d;" horiz-adv-x="1411" d="M871 1343q241 0 369 -82q128 -81 128 -242q0 -165 -96 -275q-96 -108 -278 -170l303 -574h-351l-250 504h-217l-116 -504h-314l310 1343h512zM806 1122h-183l-94 -402h190q143 0 225 62q81 61 82 164q0 99 -57 138q-57 38 -163 38z" />
+<glyph unicode="&#x1d64e;" horiz-adv-x="1279" d="M791 1146q-295 0 -296 -165q0 -36 12 -61q24 -47 144 -89q63 -22 147 -45q189 -52 273 -110q132 -89 132 -243q-1 -228 -188 -343q-187 -114 -488 -114t-526 99l65 304h20q197 -181 496 -181t300 174q0 33 -13 57q-26 48 -141 89q-108 31 -320 105q-234 97 -234 305 q0 233 223 349q174 90 447.5 90t468.5 -85l-62 -292h-18q-169 156 -442 156z" />
+<glyph unicode="&#x1d64f;" horiz-adv-x="1226" d="M1380 1343l-54 -234h-419l-255 -1109h-317l256 1109h-418l53 234h1154z" />
+<glyph unicode="&#x1d650;" horiz-adv-x="1466" d="M646 -26q-520 0 -520 373q0 72 20 157l195 839h318l-193 -832q-15 -66 -15 -115q0 -92 55 -140q55 -49 177.5 -49t197.5 68t108 210l199 858h318l-195 -839q-65 -278 -219 -404t-446 -126z" />
+<glyph unicode="&#x1d651;" horiz-adv-x="1377" d="M1538 1343l-789 -1343h-365l-169 1343h323l106 -1017l559 1017h335z" />
+<glyph unicode="&#x1d652;" horiz-adv-x="2049" d="M2176 1343l-645 -1343h-347l-56 956l-462 -956h-361l-53 1343h330l-3 -999l482 999h321l37 -999l439 999h318z" />
+<glyph unicode="&#x1d653;" horiz-adv-x="1377" d="M1522 1343l-619 -666l320 -677h-343l-204 470l-420 -470h-340l632 690l-315 653h342l201 -445l405 445h341z" />
+<glyph unicode="&#x1d654;" horiz-adv-x="1327" d="M1497 1343l-670 -820l-121 -523h-316l115 500l-298 843h338l175 -556l417 556h360z" />
+<glyph unicode="&#x1d655;" horiz-adv-x="1244" d="M1328 1343l-54 -233l-915 -880h749l-54 -230h-1096l53 229l917 884h-680l52 230h1028z" />
+<glyph unicode="&#x1d656;" horiz-adv-x="1173" d="M871 -13q-206 0 -235 126q-17 -13 -90 -60t-135.5 -62.5t-133.5 -15.5q-111 0 -186 62.5t-75 170.5q0 306 433 368q132 19 285 28q6 35 6 41q0 105 -216 105q-117 0 -294 -65h-27l43 218q181 46 377 46q420 0 420 -232q0 -43 -11 -89l-95 -411q-7 -32 31 -32q62 0 120 28 h25l-46 -198q-113 -28 -196 -28zM325 256q0 -87 136 -87q87 0 187 72l45 195q-139 -12 -182 -20q-119 -22 -160 -73q-26 -33 -26 -87z" />
+<glyph unicode="&#x1d657;" horiz-adv-x="1177" d="M1124 628q0 -262 -153 -450q-157 -196 -383 -196q-155 0 -248 64l-22 -46h-285l295 1279h297l-104 -452q176 121 312 121q291 0 291 -320zM741 310q69 106 69 263.5t-150 157.5q-70 0 -174 -55l-107 -464q64 -25 133 -25q149 0 229 123z" />
+<glyph unicode="&#x1d658;" horiz-adv-x="990" d="M925 622q-95 115 -242.5 115t-230.5 -100t-83 -246q0 -204 215 -204q144 0 276 112h42l-63 -252q-164 -72 -329 -72q-202 0 -325.5 99.5t-123.5 287.5q0 265 190 425.5t456 160.5q177 0 323 -73l-63 -253h-42z" />
+<glyph unicode="&#x1d659;" horiz-adv-x="1218" d="M1014 185q62 0 120 28h25l-46 -198q-114 -28 -196 -28q-207 0 -236 126l-99 -66q-71 -47 -126 -59.5t-105 -12.5q-145 0 -219.5 92.5t-74.5 241.5q0 261 158 450t378 189q131 0 246 -62l92 393h297l-245 -1062q-8 -32 31 -32zM668 738q-139 0 -219.5 -111t-80.5 -272 t156 -161q71 0 170 61l104 453q-63 30 -130 30z" />
+<glyph unicode="&#x1d65a;" horiz-adv-x="1118" d="M1078 622q0 -98 -40 -215h-685v-19q0 -205 273 -205q166 0 335 106h33l-55 -237q-175 -77 -386.5 -77t-340.5 88q-150 102 -150 305q0 251 163.5 417.5t436.5 166.5q416 0 416 -330zM785 633q0 134 -156 134q-180 0 -248 -187h399q5 30 5 53z" />
+<glyph unicode="&#x1d65b;" horiz-adv-x="711" d="M856 1062q-59 20 -131 20t-109.5 -34t-58.5 -118l-1 -7h228l-44 -195h-219l-168 -728h-298l169 728h-127l44 195h127l6 24q41 169 139.5 254.5t294.5 85.5q132 0 218 -16l-48 -209h-22z" />
+<glyph unicode="&#x1d65c;" horiz-adv-x="1177" d="M343 -348q-187 0 -345 40l46 227h36q149 -58 262 -58q158 0 222 53q67 55 98 194q-139 -95 -270 -95q-330 0 -330 314q0 249 142.5 435t383.5 186q157 0 248 -66l20 41h289l-186 -817q-57 -250 -222 -358q-148 -96 -394 -96zM667 739q-142 0 -218 -104.5t-76 -250.5 q0 -150 159 -150q75 0 172 57l94 418q-66 30 -131 30z" />
+<glyph unicode="&#x1d65d;" horiz-adv-x="1199" d="M1114 714q0 -53 -13 -113l-139 -601h-300l106 458q25 106 25 153q0 104 -127 104q-71 0 -184 -61l-152 -654h-297l295 1279h297l-105 -458q192 127 332 127q262 0 262 -234z" />
+<glyph unicode="&#x1d65e;" horiz-adv-x="736" d="M635 1279l-52 -225h-314l52 225h314zM372 -18q-285 0 -285 200q0 45 15 109l145 632h297l-122 -528q-23 -99 -23 -129q0 -88 113 -88q62 0 120 28h25l-46 -198q-107 -26 -239 -26z" />
+<glyph unicode="&#x1d65f;" horiz-adv-x="678" d="M727 1279l-52 -225h-314l52 225h314zM434 3q-38 -164 -148.5 -257.5t-269.5 -93.5t-246 22l48 212h23q56 -20 116 -20q148 1 189 180l156 676h-175l47 201h473z" />
+<glyph unicode="&#x1d660;" horiz-adv-x="1129" d="M1204 923l-427 -402l246 -521h-311l-182 408l-131 -117l-68 -291h-297l295 1279h297l-176 -764l413 408h341z" />
+<glyph unicode="&#x1d661;" horiz-adv-x="736" d="M372 -18q-285 0 -285 200q0 45 15 109l228 988h296l-204 -884q-23 -100 -23 -129q0 -88 113 -88q62 0 120 28h25l-46 -198q-107 -26 -239 -26z" />
+<glyph unicode="&#x1d662;" horiz-adv-x="1781" d="M1697 718q0 -53 -15 -117l-138 -601h-300l107 461q28 121 28 162q0 92 -120 92q-56 0 -171 -61l-151 -654h-299l107 461q27 117 27 159q0 95 -119 95q-57 0 -171 -61l-152 -654h-297l214 923h297l-24 -102q192 127 321 127q191 0 241 -160q221 160 365 160 q250 0 250 -230z" />
+<glyph unicode="&#x1d663;" horiz-adv-x="1199" d="M1114 714q0 -52 -14 -113l-138 -601h-300l106 458q24 107 24 154q0 103 -126 103q-70 0 -185 -61l-151 -654h-297l213 923h297l-24 -102q194 127 332 127q263 0 263 -234z" />
+<glyph unicode="&#x1d664;" horiz-adv-x="1154" d="M1097 585q0 -267 -168 -440.5t-442 -173.5q-192 0 -309 92.5t-117 280.5t92.5 338t261.5 222q114 48 256 48q191 0 308.5 -90.5t117.5 -276.5zM526 173q114 0 188.5 112.5t74.5 288.5t-154 176q-118 0 -192 -114t-74 -288.5t157 -174.5z" />
+<glyph unicode="&#x1d665;" horiz-adv-x="1177" d="M1123 628q0 -265 -157 -455.5t-378 -190.5q-142 0 -248 64l-88 -385h-298l292 1262h297l-22 -96q177 121 316.5 121t212.5 -86.5t73 -233.5zM512 187q146 0 222 112.5t76 272t-150 159.5q-70 0 -174 -55l-107 -465q54 -24 133 -24z" />
+<glyph unicode="&#x1d666;" horiz-adv-x="1177" d="M351 -25q-145 0 -219.5 92.5t-74.5 241.5q0 270 161 454.5t375 184.5q133 0 244 -66l20 41h289l-292 -1262h-298l100 429q-48 -31 -146 -84q-74 -31 -159 -31zM667 738q-139 0 -219.5 -113t-80.5 -272t157 -159q70 0 170 61l104 453q-63 30 -131 30z" />
+<glyph unicode="&#x1d667;" horiz-adv-x="837" d="M825 641q-39 13 -140.5 13t-211.5 -36l-143 -618h-297l214 923h297l-31 -136q189 139 335 139q40 0 69 -3l-66 -282h-26z" />
+<glyph unicode="&#x1d668;" horiz-adv-x="999" d="M910 649q-132 102 -319 102t-187 -92q0 -56 164.5 -92t233.5 -76q110 -65 110 -184q0 -179 -183 -266q-139 -66 -365.5 -66t-374.5 73l57 244h27q50 -43 142.5 -81.5t206.5 -38.5q199 0 199 89q0 40 -74 66q-12 4 -132.5 32t-190.5 70q-111 67 -111 183q0 181 179 269 q137 67 350.5 67t347.5 -65l-55 -234h-25z" />
+<glyph unicode="&#x1d669;" horiz-adv-x="767" d="M414 266q0 -88 113 -88q62 0 120 28h24l-46 -198q-106 -26 -238 -26q-285 0 -285 200q0 44 15 109l100 437h-122l46 195h121l61 264h297l-61 -264h278l-46 -195h-277l-77 -333q-23 -100 -23 -129z" />
+<glyph unicode="&#x1d66a;" horiz-adv-x="1239" d="M937 -13q-214 0 -236 129q-209 -141 -353 -141q-263 0 -263 230q0 57 14 117l139 601h300l-107 -458q-24 -106 -24 -161t31 -75.5t99 -20.5t181 61l152 654h297l-164 -706v-7q0 -25 31 -25q62 0 120 28h25l-46 -198q-113 -28 -196 -28z" />
+<glyph unicode="&#x1d66b;" horiz-adv-x="1092" d="M1166 923l-569 -923h-337l-140 923h305l67 -635l356 635h318z" />
+<glyph unicode="&#x1d66c;" horiz-adv-x="1649" d="M1719 923l-483 -923h-314l-61 622l-312 -622h-318l-87 923h302l27 -636l328 636h263l56 -636l286 636h313z" />
+<glyph unicode="&#x1d66d;" horiz-adv-x="1126" d="M1207 923l-472 -463l263 -460h-319l-149 284l-274 -284h-341l479 469l-260 454h319l147 -281l265 281h342z" />
+<glyph unicode="&#x1d66e;" horiz-adv-x="1096" d="M1178 923l-805 -1262h-325l236 357l-152 905h302l80 -605l351 605h313z" />
+<glyph unicode="&#x1d66f;" horiz-adv-x="1004" d="M1031 923l-42 -178l-599 -533h485l-49 -212h-867l43 182l606 533h-464l48 208h839z" />
+<glyph unicode="&#x1d670;" horiz-adv-x="1140" d="M1086 66q0 -66 -87 -66h-239q-85 0 -85 66q0 50 42 63q18 6 82 6l-51 227h-356l-50 -227q64 0 82 -6q41 -13 41 -63q0 -66 -85 -66h-239q-88 0 -88 66q0 52 45 65q17 4 87 4l266 1151q12 54 36 68.5t83.5 14.5t82 -15t35.5 -70l266 -1149q68 0 86 -6q46 -13 46 -63z M715 497l-145 690l-145 -690h290z" />
+<glyph unicode="&#x1d671;" horiz-adv-x="1140" d="M1075 366q0 -156 -111.5 -261t-269.5 -105h-540q-89 0 -89 66q0 54 54 66q14 4 57 4q18 0 40 -1v1073l-55 -1q-96 0 -96 70q0 66 89 66h497q151 0 264 -96t113 -245q0 -103 -67.5 -183t-170.5 -116q123 -29 204 -121t81 -216zM593 765q114 0 199 63t85 166t-68.5 158.5 t-166.5 55.5h-276v-443h227zM646 135q112 0 194.5 64t82.5 173t-71.5 184t-180.5 75h-305v-496h280z" />
+<glyph unicode="&#x1d672;" horiz-adv-x="1140" d="M1058 368q0 -166 -137.5 -279t-307 -113t-298 118.5t-187.5 291.5q-46 134 -46 286t46 286q59 172 187 290.5t293 118.5t289 -105q27 58 34 68q25 37 61 37q66 0 66 -90v-305q0 -48 -14.5 -70t-59 -22t-57 14.5t-23.5 59.5q-70 279 -284 279q-119 0 -211 -93 q-175 -178 -175 -468q0 -134 41 -254.5t133.5 -214t213.5 -93.5q85 0 159 46t103 122l22 99q10 39 24 52t51 13q77 0 77 -74z" />
+<glyph unicode="&#x1d673;" horiz-adv-x="1140" d="M967 1108q115 -198 115 -445t-116 -438q-136 -225 -365 -225h-453q-90 0 -90 66q0 53 48 65q16 4 68 4h23v1073l-45 -1q-94 0 -94 68t90 68h453q230 0 366 -235zM844 315q86 151 86 348.5t-85 353.5q-103 191 -286 191h-211v-1073h211q182 0 285 180z" />
+<glyph unicode="&#x1d674;" horiz-adv-x="1140" d="M203 1208l-59 -2q-97 0 -97 71q0 66 83 66h827q71 0 83 -42q5 -17 5 -48v-169q0 -82 -76.5 -82t-76.5 90v116h-537v-445h287q-1 34 -1 43q0 82 78 82q75 0 75 -82v-221q0 -82 -75 -82q-57 0 -71 38q-6 15 -6 70v17h-287v-493h587v150q0 48 14.5 69t61.5 21q75 0 75 -80 v-205q0 -53 -17 -71.5t-71 -18.5h-875q-83 0 -83 66q0 56 56 67q11 2 100 2v1073z" />
+<glyph unicode="&#x1d675;" horiz-adv-x="1140" d="M225 1208l-62 -2q-101 0 -101 68.5t83 68.5h845q71 0 83 -42q5 -17 5 -48v-169q0 -82 -77 -82q-74 0 -74 90v116h-550v-469h299l-2 43q0 82 79 82q74 0 74 -83v-219q0 -83 -74 -83q-57 0 -71 38q-6 17 -6 87h-299v-469h114q88 0 88 -69q0 -66 -80 -66h-354q-83 0 -83 66 q0 71 100 71l63 -2v1073z" />
+<glyph unicode="&#x1d676;" horiz-adv-x="1140" d="M1074 527q0 -68 -95 -68h-8v-369q0 -90 -76 -90q-77 0 -77 85v7q-101 -116 -261 -116t-286 130q-108 111 -156.5 261.5t-48.5 305t42 284.5q54 169 162 280q127 130 278 130t266 -99q40 99 90 99q67 0 67 -90v-305q0 -92 -78 -92q-60 0 -75 65q-6 33 -24 99 q-28 81 -88.5 135t-139.5 54q-113 0 -205 -111q-142 -171 -142 -451q0 -278 139 -449q92 -112 207.5 -112t183.5 121q51 91 65 228h-92q-88 0 -88 67t88 67h261q91 0 91 -66z" />
+<glyph unicode="&#x1d677;" horiz-adv-x="1140" d="M1097 66q0 -66 -81 -66h-275q-80 0 -80 68q0 52 50 64q14 3 92 3v496h-466v-496h26q17 1 26 1q91 0 91 -70q0 -66 -81 -66h-275q-81 0 -81 66q0 54 49 66q13 3 93 3v1073h-25q-16 -1 -24 -1q-93 0 -93 68t81 68h275q81 0 81 -68q0 -52 -51 -64q-14 -3 -92 -3v-443h466 v443h-26q-16 -1 -25 -1q-91 0 -91 70q0 66 80 66h275q81 0 81 -68q0 -52 -51 -64q-14 -3 -92 -3v-1073h26q17 1 26 1q91 0 91 -70z" />
+<glyph unicode="&#x1d678;" horiz-adv-x="1140" d="M974 66q0 -66 -84 -66h-639q-85 0 -85 67.5t91 67.5h237v1073h-237q-91 0 -91 69q0 66 84 66h640q84 0 84 -67.5t-91 -67.5h-237v-1073h237q91 0 91 -69z" />
+<glyph unicode="&#x1d679;" horiz-adv-x="1140" d="M1017 1277q0 -56 -56 -67q-11 -2 -61 -2h-38v-913q0 -146 -112 -232.5t-255 -86.5t-245 53q-127 66 -127 189q0 103 98 103q40 0 68.5 -28t28.5 -66.5t-18 -59.5q65 -57 175 -57t172 51t62 147v900h-180q-89 0 -89 69q0 66 89 66h398q90 0 90 -66z" />
+<glyph unicode="&#x1d67a;" horiz-adv-x="1140" d="M1085 66q0 -66 -84 -66h-178q-83 0 -83 67.5t88 67.5l-308 548l-204 -257v-291h23q15 1 22 1q93 0 93 -70q0 -66 -84 -66h-232q-84 0 -84 68q0 51 49 63q16 4 89 4v1073h-23q-14 -1 -22 -1q-93 0 -93 70q0 66 85 66h231q84 0 84 -68q0 -51 -49 -63q-16 -4 -89 -4v-584 l463 584q-90 0 -90 67.5t84 67.5h207q84 0 84 -66q0 -50 -43 -63q-18 -6 -83 -6l-335 -422l369 -651q57 0 77 -7q36 -14 36 -62z" />
+<glyph unicode="&#x1d67b;" horiz-adv-x="1140" d="M238 1208l-69 -2q-100 0 -100 68.5t81 68.5h370q84 0 84 -67.5t-90 -67.5h-124v-1073h531v150q0 48 14 69t62 21q74 0 74 -82v-203q0 -46 -14 -68t-73 -22h-834q-81 0 -81 66q0 69 88 69h81v1073z" />
+<glyph unicode="&#x1d67c;" horiz-adv-x="1140" d="M1109 66q0 -66 -88 -66h-181q-87 0 -87 66q0 49 38 62q19 7 78 7v1048h-2q-15 -67 -59 -200l-118 -362q-10 -43 -43 -124q-30 -49 -73 -49t-66.5 29.5t-117.5 324t-116 381.5h-3v-1048q60 0 79 -7q39 -13 39 -62q0 -66 -88 -66h-181q-89 0 -89 66q0 49 39 62q20 7 79 7 v1073q-60 0 -79 7q-39 13 -39 62q0 66 89 66h123q79 0 107 -53q4 -9 29 -83l146 -447q17 -52 46 -156h2q15 73 59 207l147 444q18 54 40 71t79 17h123q88 0 88 -66q0 -49 -38 -62q-19 -7 -78 -7v-1073q60 0 78 -7q38 -13 38 -62z" />
+<glyph unicode="&#x1d67d;" horiz-adv-x="1140" d="M1084 1275q0 -52 -51 -64q-14 -3 -92 -3v-1118q0 -68 -32 -82q-18 -8 -65.5 -8t-72.5 15t-43 64l-404 1099h-2v-1043h26q17 1 25 1q92 0 92 -70q0 -66 -82 -66h-246q-82 0 -82 68q0 52 51 64q14 3 92 3v1073h-25q-17 -1 -25 -1q-93 0 -93 70q0 66 82 66h156 q52 0 76.5 -15.5t42.5 -63.5l404 -1100h2v1044h-25q-17 -1 -25 -1q-93 0 -93 68t81 68h247q81 0 81 -68z" />
+<glyph unicode="&#x1d67e;" horiz-adv-x="1140" d="M1035 567q0 -172 -14 -266q-28 -192 -144 -264q-96 -61 -301 -61t-301 61q-116 72 -144 264q-14 94 -14 266v210q0 171 14 265q28 192 144 264q95 61 301 61t301 -61q115 -72 144 -264q14 -94 14 -265v-210zM883 514v315q0 227 -39 297q-60 107 -268 107t-268 -107 q-39 -70 -39 -297v-315q0 -227 39 -297q60 -107 268 -107t268 107q39 70 39 297z" />
+<glyph unicode="&#x1d67f;" horiz-adv-x="1140" d="M227 1208l-57 -2q-99 0 -99 71q0 66 90 66h492q172 0 294 -115.5t122 -287t-121.5 -287t-294.5 -115.5h-274v-403l57 2q99 0 99 -71q0 -66 -90 -66h-284q-90 0 -90 66q0 56 57 67q11 2 61 2h38v1073zM917 941q0 120 -91 193.5t-213 73.5h-234v-536h234q122 0 213 74.5 t91 194.5z" />
+<glyph unicode="&#x1d680;" horiz-adv-x="1140" d="M1035 567q0 -172 -14 -266q-32 -217 -179 -283l111 -201q22 -39 22 -72t-39 -54q-20 -11 -38 -11q-43 0 -78 63l-132 238q-49 -5 -112 -5q-205 0 -302 61q-115 72 -143 264q-14 94 -14 266v210q0 171 14 265q28 192 144 264q95 61 301 61t301 -61q115 -72 144 -264 q14 -94 14 -265v-210zM883 514v315q0 227 -39 297q-60 107 -268 107t-268 -107q-39 -70 -39 -297v-315q0 -227 39 -297q60 -107 268 -107q21 0 40 1l-64 115q-22 38 -22 71.5t39 54.5q20 11 38 11q43 0 78 -63l86 -154q75 40 98 138q14 63 14 230z" />
+<glyph unicode="&#x1d681;" horiz-adv-x="1140" d="M865 390l-2 -113q0 -167 64 -167q24 0 33 39l8 59q9 66 74 66q78 0 78 -70q0 -88 -53 -158t-138 -70q-114 0 -174 101q-34 59 -41 155v163q0 102 -49 148q-65 61 -165 61h-185v-469h26q16 1 25 1q93 0 93 -70q0 -66 -89 -66h-262q-88 0 -88 66q0 54 51 66q12 3 64 3h29 v1073h-25q-16 -1 -26 -1q-93 0 -93 68t88 68h390q168 0 297.5 -102t129.5 -266q0 -202 -188 -306q79 -62 103.5 -124t24.5 -155zM474 739q114 0 206 63t92 172.5t-92 171.5t-206 62h-159v-469h159z" />
+<glyph unicode="&#x1d682;" horiz-adv-x="1140" d="M927 626q105 -106 105 -267.5t-122 -272t-291 -110.5q-228 0 -363 101q-24 -101 -81 -101q-67 0 -67 90v290q0 90 78 90q43 0 55.5 -16t18.5 -62q16 -130 103 -190q100 -68 257 -68q108 0 189 69t81 175q0 191 -245 248q-85 17 -252 60q-126 39 -205.5 129t-79.5 215 q0 159 124 260t298 101t296 -103q23 103 81 103q66 0 66 -90v-290q0 -90 -77 -90q-37 0 -51 12.5t-22 47t-26 99.5q-67 177 -281 177q-101 0 -182.5 -60.5t-81.5 -157.5q0 -75 50 -130.5t125 -75.5l179 -39q125 -28 190 -53t131 -91z" />
+<glyph unicode="&#x1d683;" horiz-adv-x="1140" d="M1088 1084q0 -82 -77 -82q-74 0 -74 90v116h-290v-1073h114q88 0 88 -69q0 -66 -81 -66h-394q-81 0 -81 67.5t88 67.5h114v1073h-293v-116q0 -47 -14 -68.5t-61 -21.5q-75 0 -75 82v169q0 61 21.5 75.5t68.5 14.5h858q72 0 84 -42q4 -17 4 -48v-169z" />
+<glyph unicode="&#x1d684;" horiz-adv-x="1140" d="M829 1208l-58 -2q-98 0 -98 71q0 66 91 66h283q90 0 90 -66q0 -56 -56 -67q-11 -2 -62 -2h-38v-760q0 -185 -115 -328.5t-295.5 -143.5t-296.5 143.5t-116 328.5v760l-58 -2q-97 0 -97 71q0 66 90 66h284q90 0 90 -66q0 -55 -56 -67q-12 -2 -62 -2h-38v-749 q0 -230 154 -318q53 -31 104.5 -31t104.5 31q155 89 155 318v749z" />
+<glyph unicode="&#x1d685;" horiz-adv-x="1140" d="M1107 1277q0 -50 -42 -63q-19 -6 -83 -6l-291 -1144q-14 -52 -39 -67t-82.5 -15t-82 15t-38.5 69l-290 1142q-65 0 -84 6q-42 13 -42 63q0 66 91 66h224q90 0 90 -66q0 -50 -41 -63q-19 -6 -82 -6l213 -854q28 -111 40 -196h3q18 112 85 378l170 672q-64 0 -83 6 q-41 13 -41 63q0 66 91 66h224q90 0 90 -66z" />
+<glyph unicode="&#x1d686;" horiz-adv-x="1140" d="M1122 1275q0 -67 -75 -67h-9l-157 -1149q-11 -77 -91 -77q-64 0 -88 55q-4 8 -31 130l-68 311q-13 55 -30 167h-2q-7 -56 -65 -328t-70 -291q-26 -44 -86 -44q-79 0 -90 77l-158 1149h-2q-82 0 -82 67q0 68 90 68h174q88 0 88 -68q0 -52 -51 -64q-13 -3 -64 -3h-28 l115 -869q17 -126 17 -172h2q9 100 105 524q3 24 17 68q24 48 89 48t89 -51q1 -2 24 -105l51 -229q33 -149 43 -255h2q2 58 36 310l97 731h-26q-16 -1 -25 -1q-93 0 -93 68t88 68h174q90 0 90 -68z" />
+<glyph unicode="&#x1d687;" horiz-adv-x="1140" d="M1085 66q0 -66 -83 -66h-242q-82 0 -82 66q0 69 99 69l-216 426l-203 -426q104 0 104 -69q0 -66 -84 -66h-242q-82 0 -82 66q0 53 47 65q15 4 89 4l293 580l-263 493h-23q-16 -1 -24 -1q-95 0 -95 70q0 66 83 66h243q81 0 81 -66q0 -69 -94 -69l170 -320l155 320 q-102 0 -102 69q0 66 81 66h243q83 0 83 -68q0 -51 -48 -63q-16 -4 -90 -4l-248 -491l309 -582h23q15 1 23 1q95 0 95 -70z" />
+<glyph unicode="&#x1d688;" horiz-adv-x="1140" d="M1104 1277q0 -69 -88 -69h-46l-325 -672v-401h52q92 0 92 -69q0 -66 -79 -66h-280q-79 0 -79 66q0 69 92 69h52v401l-325 672h-46q-88 0 -88 69q0 66 79 66h246q79 0 79 -66q0 -45 -30 -60q-20 -9 -71 -9l231 -518l231 518q-51 0 -71 9q-30 15 -30 60q0 66 79 66h246 q79 0 79 -66z" />
+<glyph unicode="&#x1d689;" horiz-adv-x="1140" d="M1046 90q0 -53 -17.5 -71.5t-70.5 -18.5h-781q-83 0 -83 75q0 37 22 69l724 1064h-568v-116q0 -90 -77 -90q-74 0 -74 83v168q0 61 25 77q18 13 65 13h741q83 0 83 -75q0 -37 -22 -69l-724 -1064h605v157q0 91 76 91t76 -83v-210z" />
+<glyph unicode="&#x1d68a;" horiz-adv-x="1140" d="M1081 66q0 -46 -34 -59q-18 -7 -73 -7q-181 0 -230 68q-124 -81 -313 -81q-136 0 -244.5 78.5t-108.5 209.5q0 179 246 260q162 54 395 58q1 219 -308 219q-29 0 -43 -1q-48 -3 -48 -42q0 -6 -5 -18q-27 -63 -86 -63q-95 0 -95 98q0 156 310 156q171 0 288 -78 q135 -90 135 -253v-464q42 -16 128 -16t86 -65zM719 287v180q-162 -4 -290 -37q-204 -51 -204 -155q0 -75 70 -116t168 -41t159 29.5t79 57t18 82.5z" />
+<glyph unicode="&#x1d68b;" horiz-adv-x="1140" d="M399 832q114 104 283.5 104t288 -144.5t118.5 -331.5t-127.5 -330t-314.5 -143q-142 0 -248 109v-10q0 -86 -73.5 -86t-73.5 87v1090h-96q-86 0 -86 66t87 66h156q52 0 69 -18.5t17 -69.5v-389zM641 118q130 0 214.5 106t84.5 237.5t-78 238t-204 106.5q-99 0 -179 -72 t-80 -169v-157q0 -108 69 -199t173 -91z" />
+<glyph unicode="&#x1d68c;" horiz-adv-x="1140" d="M1000 233q0 -31 -30 -80q-101 -166 -341 -166q-197 0 -334 139.5t-137 336.5q0 91 36 181q120 298 461 298q319 0 319 -156q0 -42 -27.5 -70t-69.5 -28q-61 0 -82 48q-6 28 -13 56q-16 20 -91 20q-276 0 -359 -213q-26 -67 -26 -136q0 -141 98 -243t238 -102q81 0 126 28 t86 99q19 33 28.5 40.5t42.5 7.5q75 0 75 -60z" />
+<glyph unicode="&#x1d68d;" horiz-adv-x="1140" d="M1003 131q86 0 86 -65.5t-88 -65.5h-157q-59 0 -72 22q-13 20 -13 77v8q-116 -120 -270 -120q-181 0 -300 145t-119 332.5t126 329.5t313 142q142 0 250 -95v336h-97q-84 0 -84 66t87 66h156q52 0 69 -18.5t17 -69.5v-1090h96zM759 414v153q0 95 -73.5 167t-168.5 72 q-130 0 -215 -105.5t-85 -236.5t78 -238.5t194 -107.5t193 92.5t77 203.5z" />
+<glyph unicode="&#x1d68e;" horiz-adv-x="1140" d="M1017 233q0 -33 -33 -82q-110 -164 -351 -164q-201 0 -346 138.5t-145 336t133.5 339t327.5 141.5t304 -127.5t110 -325.5q0 -47 -19 -63.5t-67 -16.5h-638q24 -127 124 -209t227.5 -82t191.5 72q9 10 30 48t32 46.5t43 8.5q76 0 76 -60zM602 812q-114 0 -199 -80 t-107 -195h568q-22 275 -262 275z" />
+<glyph unicode="&#x1d68f;" horiz-adv-x="1140" d="M1002 1192q0 -38 -27 -66t-64 -28t-65 28t-30 64h-2q-205 0 -205 -167v-100h260q85 0 85 -67q0 -64 -85 -64h-260v-661h215q88 0 88 -65.5t-88 -65.5h-580q-88 0 -88 65.5t88 65.5h218v661h-218q-86 0 -86 64q0 67 88 67h216v112q0 132 99 208.5t235 76.5q206 0 206 -128 z" />
+<glyph unicode="&#x1d690;" horiz-adv-x="1140" d="M1092 832q0 -37 -24 -62.5t-61 -25.5q-66 0 -83 73q-68 -5 -125 -37q56 -92 56 -187q0 -145 -104 -245t-249 -100q-106 0 -192 55q-13 -31 -13 -61q0 -101 96 -107q43 -3 112 -3h49q238 0 351 -64q149 -85 149 -220q0 -162 -175 -236q-127 -54 -312 -54t-320 57 q-181 77 -181 228t158 246q-50 67 -50 152.5t43 148.5q-68 86 -68 203q0 142 105 242.5t248 100.5q115 0 208 -64q101 74 226 74q61 0 108.5 -28.5t47.5 -85.5zM648 442q60 64 60 150.5t-60.5 151.5t-146 65t-145 -65.5t-59.5 -152t60 -150t145.5 -63.5t145.5 64zM929 -152 q0 107 -140 142q-73 19 -226 19q-22 0 -66 0.5t-66 0.5q-95 0 -159 -34q-83 -42 -83 -127.5t152 -131.5q110 -34 222 -34t219 34q147 46 147 131z" />
+<glyph unicode="&#x1d691;" horiz-adv-x="1140" d="M1026 131q88 0 88 -65.5t-86 -65.5h-327q-87 0 -87 65.5t87 65.5h84v487q0 92 -24 132q-32 56 -120 56q-119 0 -192.5 -86.5t-73.5 -208.5v-380h94q86 0 86 -65.5t-84 -65.5h-341q-85 0 -85 65.5t87 65.5h95v1046h-97q-85 0 -85 66t87 66h156q72 0 83 -45q4 -16 4 -43 v-398q113 113 280 113q277 0 277 -308v-497h94z" />
+<glyph unicode="&#x1d692;" horiz-adv-x="1140" d="M639 1275.5q31 -31.5 31 -76t-31 -75.5t-75.5 -31t-76 31t-31.5 75.5t31.5 76t76 31.5t75.5 -31.5zM895 131q88 0 88 -65.5t-81 -65.5h-646q-81 0 -81 65.5t88 65.5h259v661h-240q-89 0 -89 65.5t82 65.5h310q68 0 80 -38q5 -17 5 -49v-705h225z" />
+<glyph unicode="&#x1d693;" horiz-adv-x="1140" d="M639 1275.5q31 -31.5 31 -76t-31 -75.5t-75.5 -31t-76 31t-31.5 75.5t31.5 76t76 31.5t75.5 -31.5zM710 -48q0 -173 -107.5 -283.5t-280.5 -110.5q-297 0 -297 163q0 41 28.5 70t68 29t68 -30t28.5 -68q0 -12 -4 -24q66 -9 119 -9q115 0 172.5 78.5t57.5 187.5v837h-278 q-86 0 -86 64q0 67 88 67h337q66 0 79 -35q7 -17 7 -52v-884z" />
+<glyph unicode="&#x1d694;" horiz-adv-x="1140" d="M946 131l58 2q96 0 96 -68q0 -65 -81 -65h-265q-78 0 -78 65q0 49 39 61q15 5 62 5h17l-253 332l-172 -160v-172h105q84 0 84 -65.5t-78 -65.5h-342q-79 0 -79 65.5t86 65.5h103v1046h-103q-86 0 -86 66t79 66h145q52 0 69 -18.5t17 -69.5v-754l346 325l-67 -2 q-98 0 -98 66.5t79 66.5h344q81 0 81 -66.5t-100 -66.5l-63 2l-264 -246z" />
+<glyph unicode="&#x1d695;" horiz-adv-x="1140" d="M931 131q86 0 86 -65.5t-80 -65.5h-716q-79 0 -79 65.5t87 65.5h277v1046h-279q-85 0 -85 66t81 66h345q52 0 68 -18.5t16 -69.5v-1090h279z" />
+<glyph unicode="&#x1d696;" horiz-adv-x="1140" d="M120 925l58 -2q84 0 86 -65q85 78 191.5 78t155.5 -111q80 111 212 111q191 0 191 -286v-519q63 0 81 -5q41 -13 41 -61q0 -65 -87 -65h-161q-90 0 -90 66q0 65 93 65h3v525q0 150 -79 150q-90 0 -139 -106q-38 -82 -38 -185v-384q63 0 82 -5q42 -13 42 -61 q0 -65 -89 -65h-161q-86 0 -86 66q0 65 90 65h3v525q0 150 -78 150q-90 0 -139 -106q-38 -82 -38 -185v-384q63 0 81 -5q41 -13 41 -61q0 -65 -87 -65h-189q-88 0 -88 65q0 48 42 61q17 5 64 5h17v661q-63 0 -81 5q-42 13 -42 61q0 67 98 67z" />
+<glyph unicode="&#x1d697;" horiz-adv-x="1140" d="M1026 131q88 0 88 -65.5t-86 -65.5h-327q-87 0 -87 65.5t87 65.5h84v487q0 92 -24 132q-32 56 -120 56q-119 0 -192.5 -86.5t-73.5 -208.5v-380h94q86 0 86 -65.5t-84 -65.5h-341q-85 0 -85 65.5t87 65.5h95v661h-97q-85 0 -85 64q0 67 87 67h156q58 0 72.5 -21t14.5 -79 q113 113 280 113q277 0 277 -308v-497h94z" />
+<glyph unicode="&#x1d698;" horiz-adv-x="1140" d="M580 942q188 0 313 -144.5t125 -335t-125.5 -333t-313 -142.5t-313 142.5t-125.5 333t125.5 335t313.5 144.5zM580 812q-127 0 -209.5 -102.5t-82.5 -234.5t81 -244.5t210.5 -112.5t210 112t80.5 245t-81.5 235t-208.5 102z" />
+<glyph unicode="&#x1d699;" horiz-adv-x="1140" d="M399 832q114 104 283.5 104t288 -144.5t118.5 -331.5t-127.5 -330t-314.5 -143q-142 0 -248 109v-407h95q88 0 88 -67q0 -64 -87 -64h-339q-86 0 -86 64q0 67 87 67h95v1103h-96q-86 0 -86 64q0 67 87 67h156q53 0 70 -19q16 -17 16 -66v-6zM641 118q130 0 214.5 106 t84.5 237.5t-78 238t-204 106.5q-99 0 -179 -72t-80 -169v-157q0 -108 69 -199t173 -91z" />
+<glyph unicode="&#x1d69a;" horiz-adv-x="1140" d="M1110 -378q0 -64 -85 -64h-357q-85 0 -85 65.5t85 65.5h105v426q-117 -128 -296.5 -128t-304 143t-124.5 333.5t133 331.5t324 141q159 0 268 -117q-1 25 -1 38q0 79 74.5 79t74.5 -89v-1158h104q85 0 85 -67zM773 414v85q0 116 -72.5 211.5t-184.5 95.5 q-136 0 -228.5 -103t-92.5 -238t84 -241t205 -106t205 91t84 205z" />
+<glyph unicode="&#x1d69b;" horiz-adv-x="1140" d="M1067 803q0 -39 -26 -65.5t-65 -26.5t-64.5 28t-27.5 67q-172 0 -279 -117t-107 -291v-267h239q87 0 87 -65.5t-87 -65.5h-560q-85 0 -85 65.5t85 65.5h175v661h-175q-85 0 -85 65.5t85 65.5h236q89 0 89 -87q0 -13 -2 -37.5t-2 -35.5q151 173 360 173t209 -133z" />
+<glyph unicode="&#x1d69c;" horiz-adv-x="1140" d="M813 501q181 -72 181 -226.5t-137 -228.5q-109 -59 -273 -59t-275 81q-20 -81 -79 -81q-65 0 -65 88v207q0 88 75 88q38 0 48 -10.5t27 -51.5q44 -107 102 -148.5t172 -41.5q273 0 273 150q0 99 -181 140l-335 70q-181 61 -181 204.5t143 209.5q108 50 252 50t240 -44 q8 44 64 44q65 0 65 -88v-147q0 -87 -74 -87q-56 0 -69 50q-19 75 -35 92q-46 50 -184 50q-94 0 -166 -22q-105 -32 -105 -101q0 -76 181 -112q290 -58 336 -76z" />
+<glyph unicode="&#x1d69d;" horiz-adv-x="1140" d="M1033 270q0 -130 -99 -206.5t-235 -76.5t-218 73.5t-82 209.5v522h-188q-85 0 -85 64q0 67 87 67h186v175q0 88 74 88t74 -88v-175h352q84 0 84 -67q0 -64 -84 -64h-352v-518q0 -156 165 -156q152 0 172 154q6 49 15 61q14 21 58 21q76 0 76 -84z" />
+<glyph unicode="&#x1d69e;" horiz-adv-x="1140" d="M1028 131q86 0 86 -65.5t-88 -65.5h-156q-86 0 -85 68q-107 -81 -254 -81q-304 0 -304 256v549h-97q-85 0 -85 64q0 67 87 67h156q64 0 79 -31q8 -19 8 -56v-580q0 -87 46 -117q33 -21 130.5 -21t165.5 56.5t68 160.5v457h-96q-85 0 -85 64q0 67 88 67h156q70 0 80 -42 q4 -16 4 -45v-705h96z" />
+<glyph unicode="&#x1d69f;" horiz-adv-x="1140" d="M812 792l-55 -2q-90 0 -90 68q0 65 79 65h263q80 0 80 -67q0 -52 -55 -63q-8 -1 -48 -1h-48l-246 -729q-13 -38 -37.5 -55t-74.5 -17q-90 0 -115 74l-246 727l-57 -2q-92 0 -92 66.5t78 66.5h264q79 0 79 -67q0 -51 -53 -62q-10 -2 -57 -2h-36l235 -690z" />
+<glyph unicode="&#x1d6a0;" horiz-adv-x="1140" d="M1105 858q0 -46 -35 -59q-17 -7 -62 -7h-12l-128 -719q-9 -48 -27.5 -65t-72 -17t-84.5 37q-15 18 -54 175.5t-44 203.5h-2q-9 -64 -48 -209.5t-49 -161.5q-27 -45 -87 -45t-80 16t-29 66l-130 719q-56 0 -74 7q-34 13 -34 59q0 65 90 65h245q90 0 90 -67q0 -64 -90 -64 h-103l110 -638h2q63 295 100 355q29 46 79.5 46t67.5 -15t33 -58q64 -171 88 -328h3l106 638h-104q-90 0 -90 65.5t90 65.5h246q89 0 89 -65z" />
+<glyph unicode="&#x1d6a1;" horiz-adv-x="1140" d="M993 131q89 0 89 -65.5t-83 -65.5h-263q-78 0 -78 65q0 46 34 59q19 7 73 7l-191 263l-185 -263h21q91 0 91 -65.5t-79 -65.5h-263q-82 0 -82 65.5t87 65.5h87l265 344l-253 317h-86q-87 0 -87 64q0 67 80 67h266q78 0 78 -65q0 -45 -32 -58q-19 -8 -71 -8l163 -217 l159 217q-53 0 -72 7q-34 14 -34 59q0 65 79 65h264q81 0 81 -67q0 -64 -88 -64h-86l-244 -317l275 -344h85z" />
+<glyph unicode="&#x1d6a2;" horiz-adv-x="1140" d="M1087 856q0 -52 -56 -62q-9 -2 -58 -2h-37l-316 -930q-42 -122 -124.5 -213t-194.5 -91q-73 0 -125 51t-52 123q0 93 94 93q40 0 66 -26t26 -59t-11 -54q109 6 171 124q12 22 39 97.5t27 89.5t-312 795q-8 0 -27.5 -0.5t-29.5 -0.5q-95 0 -95 66t81 66h264q78 0 78 -65 q0 -52 -49 -64q-10 -2 -56 -2h-35l198 -513q17 -42 46 -127h2q15 67 55 184l155 456q-8 0 -26.5 -0.5t-28.5 -0.5q-92 0 -92 66t79 66h263q81 0 81 -67z" />
+<glyph unicode="&#x1d6a3;" horiz-adv-x="1140" d="M1053 80q0 -80 -49 -80h-819q-79 0 -79 73q0 39 48 85l667 634h-532q0 -9 0.5 -27t0.5 -28q0 -87 -77 -87q-72 0 -72 79v107q0 58 20 72.5t67 14.5h736q80 0 80 -73q0 -40 -47 -85l-669 -634h577v81q0 88 74 88t74 -80v-140z" />
+<glyph unicode="&#x1d6a4;" horiz-adv-x="657" d="M660 329q23 0 23 -19t-27 -89q-95 -245 -254 -245q-76 0 -123.5 49.5t-47.5 125.5q0 39 26 111l116 297q83 220 83 288t-58 68q-89 0 -148 -96q-30 -50 -72 -175q-13 -39 -30 -39q-25 0 -25 20.5t27 89.5q96 244 254 244q75 0 124 -50t49 -124q0 -36 -22 -99l-117 -306 q-86 -227 -86 -294t58 -67q86 0 145 95q31 49 72 171q15 44 33 44z" />
+<glyph unicode="&#x1d6a5;" horiz-adv-x="714" d="M654 763q0 -39 -9 -75l-202 -802q-35 -138 -149 -233t-254 -95q-71 0 -128.5 31t-57.5 95q0 46 32 79.5t78 33.5q74 0 74 -69q0 -84 -94 -104q45 -23 96 -23q99 0 174 95q61 77 89 188l207 818q15 59 15 114q0 99 -69 99q-89 0 -161 -80q-43 -49 -89.5 -139.5 t-59.5 -90.5q-23 0 -23 21q0 13 30 74q128 259 309 259q83 0 137.5 -56t54.5 -140z" />
+<glyph unicode="&#x1d6a6;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x1d6a7;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x1d6a8;" horiz-adv-x="1460" d="M265 6l-206 -6v100q168 0 175 18l425 1213q12 36 71 36t71 -36l430 -1231h169v-100l-292 6l-329 -6v100h161l-86 247h-422l-78 -231q-3 -8 27.5 -11t124.5 -5v-100zM819 446l-176 503l-176 -503h352z" />
+<glyph unicode="&#x1d6a9;" horiz-adv-x="1333" d="M1274 366q0 -174 -121.5 -270t-300.5 -96h-793v100h185v1142h-185v101h738q175 0 291 -81q132 -93 132 -260q0 -118 -82 -196.5t-204 -103.5q145 -17 242.5 -106t97.5 -230zM891 825q43 73 43 170t-26 160q-35 87 -111 87h-289v-505h235q97 0 148 88zM978 371 q0 103 -29 180q-40 109 -125 109h-316v-560h289q94 0 142 94q39 74 39 177z" />
+<glyph unicode="&#x1d6aa;" horiz-adv-x="1143" d="M387 6l-328 -6v100h185v1142h-185v101h964l61 -480h-102q-22 198 -72 272q-70 107 -249 107h-132v-1142h232v-100z" />
+<glyph unicode="&#x1d6ab;" horiz-adv-x="1192" d="M526 1331q13 37 71.5 37t71.5 -37l464 -1331h-1074zM757 245l-247 704l-246 -704h493z" />
+<glyph unicode="&#x1d6ac;" horiz-adv-x="1280" d="M59 0v100h185v1142h-185v101h1045l62 -480h-100q-25 207 -89 284q-78 95 -276 95h-172v-494h38q114 0 152 61q28 44 28 160v8h99v-558h-99v6q0 133 -40.5 178t-171.5 45h-6v-548h188q215 0 302 122q61 84 101 322h100l-90 -544h-1071z" />
+<glyph unicode="&#x1d6ad;" horiz-adv-x="1106" d="M95 0q-36 0 -36 73q0 9 658 1169h-171q-362 0 -361 -379h-100l24 480h890q36 0 36 -67q0 -11 -656 -1168h184q210 0 303 127q80 110 80 329h101l-36 -564h-916z" />
+<glyph unicode="&#x1d6ae;" horiz-adv-x="1516" d="M1130 1337l327 6v-101h-183v-1142h183v-100l-327 6l-327 -6v100h183v548h-457v-548h184v-100l-326 6l-328 -6v100h185v1142h-185v101l328 -6l326 6v-101h-184v-494h457v494h-183v101z" />
+<glyph unicode="&#x1d6af;" horiz-adv-x="1366" d="M684 1364q296 0 459 -199t163 -499t-164.5 -494t-457.5 -194t-459 193.5t-166 494t159 492.5q170 206 466 206zM999 704q0 574 -316 574t-316 -586q0 -623 316 -623t316 635zM924 486h-100v67h-286v-67h-100v377h100v-66h286v66h100v-377z" />
+<glyph unicode="&#x1d6b0;" horiz-adv-x="793" d="M397 1337l337 6v-101h-194v-1142h194v-100l-337 6l-338 -6v100h195v1142h-195v101z" />
+<glyph unicode="&#x1d6b1;" horiz-adv-x="1503" d="M1246 1337l170 6v-101q-161 0 -178 -17l-399 -398l449 -709q11 -18 156 -18v-100l-257 6l-327 -6v100q114 0 128 16l-333 529l-126 -126v-419h184v-100l-326 6l-328 -6v100h185v1142h-185v101l328 -6l326 6v-101h-184v-580l567 565q-24 15 -126 15v101z" />
+<glyph unicode="&#x1d6b2;" horiz-adv-x="1351" d="M246 6l-187 -6v100h14q133 0 139 18l394 1213q12 36 69.5 36t69.5 -36l399 -1231h147v-100l-278 6l-333 -6v100h163l-259 802l-255 -786q16 -11 157 -16v-100z" />
+<glyph unicode="&#x1d6b3;" horiz-adv-x="1843" d="M59 100q185 0 185 18v1124h-185v101h445q37 0 51 -36l368 -982l368 982q14 36 50 36h443v-101h-185v-1142h185v-100l-309 6l-311 -6v100h183v1125l-444 -1190q-13 -35 -58 -35t-58 35l-431 1158v-1075q0 -10 33.5 -13t149.5 -5v-100l-239 6l-241 -6v100z" />
+<glyph unicode="&#x1d6b4;" horiz-adv-x="1516" d="M1218 1337l239 6v-101q-183 0 -183 -17v-1193q0 -32 -82 -32q-12 0 -20 11l-816 1130v-1023q0 -10 33.5 -13t149.5 -5v-100l-239 6l-241 -6v100q185 0 185 18v1124h-185v101h449q14 0 23 -12l631 -875v769q0 9 -38 12t-146 5v101z" />
+<glyph unicode="&#x1d6b5;" horiz-adv-x="1259" d="M916 1115h-580q-127 0 -144.5 -16t-22.5 -152h-99l18 396h1084l17 -396h-100q-3 134 -21 151t-152 17zM1009 495h-99v89h-560v-89h-99v407h99v-90h560v90h99v-407zM322 228h621q114 0 132.5 16.5t23.5 172.5h100l-16 -417h-1106l-18 417h100q5 -156 23 -172.5t140 -16.5z " />
+<glyph unicode="&#x1d6b6;" horiz-adv-x="1366" d="M684 1364q296 0 459 -199t163 -499t-164.5 -494t-457.5 -194t-459 193.5t-166 494t159 492.5q170 206 466 206zM999 704q0 574 -316 574t-316 -586q0 -623 316 -623t316 635z" />
+<glyph unicode="&#x1d6b7;" horiz-adv-x="1516" d="M387 6l-328 -6v100h185v1142h-185v101h1398v-101h-183v-1142h183v-100l-327 6l-327 -6v100h183v1142h-457v-1142h184v-100z" />
+<glyph unicode="&#x1d6b8;" horiz-adv-x="1278" d="M387 6l-328 -6v100h185v1142h-185v101h700q194 0 319 -94q140 -104 140 -289.5t-143 -287.5q-126 -90 -316 -90h-230v-482h184v-100zM879 747q32 53 32 213.5t-34 212.5q-46 69 -195 69h-164v-571h164q152 0 197 76z" />
+<glyph unicode="&#x1d6b9;" horiz-adv-x="1366" d="M684 1364q296 0 459 -199t163 -499t-164.5 -494t-457.5 -194t-459 193.5t-166 494t159 492.5q170 206 466 206zM684 1278q-304 0 -316 -530h631q-11 530 -315 530zM368 648q9 -579 315 -579t316 579h-631z" />
+<glyph unicode="&#x1d6ba;" horiz-adv-x="1310" d="M91 0q-32 0 -32 35q0 10 11 22l502 551l-506 650q-7 9 -7 47t32 38h1099l61 -480h-99q-29 234 -143 312q-96 67 -342 67h-239l394 -506q7 -9 7 -21t-9 -22l-509 -556h348q250 0 347 64q118 79 146 316h99l-61 -517h-1099z" />
+<glyph unicode="&#x1d6bb;" horiz-adv-x="1335" d="M669 6l-406 -6v100h263v1142h-96q-131 0 -196 -74q-53 -60 -75 -305h-100l42 480h1133l42 -480h-100q-14 190 -50 261q-59 118 -221 118h-94v-1142h263v-100z" />
+<glyph unicode="&#x1d6bc;" horiz-adv-x="1421" d="M711 6l-372 -6v100h229v560q0 461 -245 461h-15q-115 0 -138 -58l-8 -26q-5 -9 -25 -9h-42q-36 0 -36 35q0 115 75.5 202t188.5 87q158 0 264 -133q84 -107 124 -281q37 172 123 281q105 133 262 133q113 0 189.5 -87.5t76.5 -201.5q0 -35 -55 -35h-21q-22 0 -27 8 q-5 14 -9 27q-23 58 -135 58h-19q-242 0 -242 -461v-560h231v-100z" />
+<glyph unicode="&#x1d6bd;" horiz-adv-x="1330" d="M667 1337l362 6v-101h-232v-207q185 -16 314 -97q160 -101 160 -267.5t-160 -266.5q-127 -79 -314 -97v-207h232v-100l-362 6l-365 -6v100h232v207q-186 18 -313 97q-160 100 -160 266.5t159 267.5q130 81 314 97v207h-232v101zM976 671q0 121 -29 179q-40 80 -150 101 v-559q110 22 150 100q29 58 29 179zM356 671q0 -121 29 -179q39 -78 149 -100v559q-109 -21 -149 -101q-29 -58 -29 -179z" />
+<glyph unicode="&#x1d6be;" horiz-adv-x="1487" d="M1105 1337l239 6v-101q-213 0 -224 -17l-278 -439l412 -686h173v-100l-288 6l-333 -6v100h141l-264 438l-269 -422q26 -16 164 -16v-100l-281 6l-238 -6v100h21q190 0 201 18l337 527l-362 597h-170v101l287 -6l331 6v-101h-138l210 -349l213 334q-27 15 -164 15v101z " />
+<glyph unicode="&#x1d6bf;" horiz-adv-x="1421" d="M701 1337l363 6v-101h-231v-837q180 77 180 405q0 257 115 257h202q32 0 32 -47q0 -17 -16 -24l-30 -12q-38 -22 -38 -181q0 -212 -117 -340.5t-328 -153.5v-209h231v-100l-363 6l-362 -6v100h229v209q-208 27 -316 157t-108 342q0 147 -39 176q-46 3 -46 51q0 32 32 32 h201q116 0 116 -257q0 -320 160 -401v833h-229v101z" />
+<glyph unicode="&#x1d6c0;" horiz-adv-x="1358" d="M878 0q-32 0 -32 39q0 145 61 428.5t61 428.5q0 391 -289 391t-289 -391q0 -145 61 -428.5t61 -428.5q0 -39 -32 -39h-347l-74 399h101q23 -151 45 -170t193 -19q-34 84 -127.5 229.5t-125.5 211.5q-61 127 -61 244q0 233 189 360q163 109 407.5 109t407.5 -109 q188 -127 188 -360q0 -116 -61 -243q-33 -69 -127 -214.5t-128 -227.5h77q94 0 117 17.5t45 171.5h99l-71 -399h-349z" />
+<glyph unicode="&#x1d6c1;" horiz-adv-x="1696" d="M1598 1366q0 -10 -4 -18l-689 -1387q-19 -39 -57 -39t-57 39l-689 1387q-4 8 -4 18q0 25 32 25h1436q32 0 32 -25zM1445 1230h-1077l538 -1088z" />
+<glyph unicode="&#x1d6c2;" horiz-adv-x="1284" d="M1234 240q0 -97 -58.5 -174.5t-152.5 -77.5q-207 0 -270 129q-13 -17 -41 -47q-104 -94 -233 -94q-202 0 -318 140.5t-116 348t122 344.5t329 137q156 0 262 -152l106 142h94v-690q0 -168 86 -168q67 0 83 117q4 27 4 101q0 29 -1 66h104v-122zM725 650q0 12 -17 49 q-72 154 -186 154t-166 -152q-37 -106 -37 -242t32 -243q47 -158 145 -158q146 0 229 176v416z" />
+<glyph unicode="&#x1d6c3;" horiz-adv-x="1053" d="M1001 455q0 -199 -125 -339t-321 -140q-149 0 -215 93q0 -335 -48 -498h-240q47 208 47 341v1058q0 490 408 490q183 0 309 -91.5t126 -264t-152 -290.5q115 -64 163 -146t48 -213zM714 168q46 81 46 182t-32 210t-88 169q-50 -18 -96 -18t-101.5 30t-55.5 68.5t45.5 64 t94 25.5t108.5 -19q58 86 58 211.5t-41 195.5q-51 87 -155 87q-158 0 -158 -303v-776q0 -87 67.5 -156t160 -69t147.5 98z" />
+<glyph unicode="&#x1d6c4;" horiz-adv-x="1031" d="M861 959q118 0 118 -120t-133 -368q-36 -66 -211 -353q35 -207 35 -372q0 -186 -126 -186q-122 0 -122 204q0 99 30.5 228.5t75.5 211.5q-19 143 -86 315q-90 226 -185 226q-113 0 -127 -152h-78v17q0 349 167 349q228 0 373 -661q103 228 131 413q17 116 31 154 q34 94 107 94z" />
+<glyph unicode="&#x1d6c5;" horiz-adv-x="1003" d="M776 821q175 -152 175 -365.5t-132 -346.5t-333 -133t-317.5 115.5t-116.5 294.5t105.5 304t270.5 172l-184 142q-89 87 -89 207q0 72 67 133q130 116 303 116q123 0 208 -38q114 -50 114 -158q0 -57 -38.5 -95.5t-95 -38.5t-95.5 38.5t-39 97.5t39 94q-43 9 -104 9 t-149 -42t-88 -107q0 -92 175 -194q267 -155 324 -205zM674 186q36 85 36 189t-33.5 198t-85.5 152.5t-89 58.5q-209 0 -209 -367q0 -128 48 -225q61 -122 172.5 -122t160.5 116z" />
+<glyph unicode="&#x1d6c6;" horiz-adv-x="904" d="M576 451l-87 15q-81 0 -122 -63t-41 -148q0 -185 170 -185q148 0 218 117l30 63q18 27 62.5 27t44.5 -39q0 -6 -2 -12q-41 -119 -143.5 -184.5t-242.5 -65.5t-260 57q-151 73 -151 207q0 194 334 249q-112 15 -192 71q-97 67 -97 168q0 127 142 187q104 44 251 44 q314 0 314 -163q0 -97 -111 -97q-40 0 -74 19.5t-34 56.5l13 58q0 40 -80 40q-187 0 -187 -167q0 -175 155 -175l90 16q73 0 73 -50q0 -46 -73 -46z" />
+<glyph unicode="&#x1d6c7;" horiz-adv-x="860" d="M439 203l203 12q110 0 186.5 -82.5t76.5 -193.5q0 -158 -99 -254.5t-257 -96.5q-65 0 -113 23q-63 29 -63 87q0 43 34.5 68.5t70.5 25.5t90.5 -13.5t93.5 -13.5t72.5 35.5t33.5 83.5t-30.5 76.5t-77.5 28.5l-185 -13q-423 0 -423 452q0 205 64.5 357.5t206.5 338.5 q-69 9 -118 51t-49 108q0 138 192 178l11 -39q-86 -42 -86 -126q0 -43 29.5 -76.5t71.5 -34.5q230 244 366 244q74 0 74 -58q0 -101 -159 -178q-130 -62 -251 -69q-224 -286 -224 -612q0 -137 63.5 -223t195.5 -86z" />
+<glyph unicode="&#x1d6c8;" horiz-adv-x="1286" d="M928 -37v698q0 207 -69 207q-120 0 -196 -98t-76 -221v-549h-246v684q0 176 -91 176t-91 -217q0 -32 2 -80h-109v128q0 102 61.5 182.5t167.5 80.5t183 -44q93 -53 105 -157q105 201 316 201q154 0 221 -75t67 -231v-736q0 -133 47 -341h-244q-48 163 -48 392z" />
+<glyph unicode="&#x1d6c9;" horiz-adv-x="1104" d="M947 1225q105 -206 105 -494t-106 -495q-135 -260 -395 -260t-393 260q-106 205 -106 493t106 496q134 263 394.5 263t394.5 -263zM772 787q0 607 -219.5 607t-219.5 -596v-11h439zM772 678h-439q0 -608 219.5 -608t219.5 608z" />
+<glyph unicode="&#x1d6ca;" horiz-adv-x="741" d="M694 240q0 -97 -58.5 -174.5t-152.5 -77.5q-295 0 -295 252v517q0 58 -137 58h-5v104l366 17v-690q0 -168 92 -168q67 0 83 117q3 29 3 118v49h104v-122z" />
+<glyph unicode="&#x1d6cb;" horiz-adv-x="1134" d="M1077 0h-306l-299 444l-62 -74v-370h-222v754q0 58 -137 58h-5v107l374 16v-414q24 27 70 84q124 174 171 220q113 110 249 110t136 -106q0 -41 -30 -67.5t-75.5 -26.5t-86 29t-77.5 29q-82 0 -178 -162l340 -506q13 -20 138 -20v-105z" />
+<glyph unicode="&#x1d6cc;" horiz-adv-x="1163" d="M1111 337q0 -350 -167 -350q-99 0 -182 123q-61 90 -96 214l-96 335l-287 -659h-231l425 984q-37 138 -54 179q-50 114 -124 114q-112 0 -128 -152h-77v17q0 349 166 349q99 0 183 -123q61 -91 96 -214l189 -659q44 -154 55 -179q49 -114 123 -114q111 0 127 151h78v-16z " />
+<glyph unicode="&#x1d6cd;" horiz-adv-x="1286" d="M1236 240q0 -97 -58.5 -174.5t-152.5 -77.5q-211 0 -270 139q-101 -139 -268 -139q-82 0 -144 25q0 -311 -37 -442h-254q45 198 45 332v1020h245v-612q0 -237 159 -237q147 0 231 131q-12 64 -12 153v565h240v-677q0 -168 86 -168q67 0 83 117q4 29 4 93q0 33 -1 74h104 v-122z" />
+<glyph unicode="&#x1d6ce;" horiz-adv-x="1045" d="M992 833q0 -127 -117 -327l-281 -480q-29 -50 -87 -50t-74 50l-218 682q-24 75 -55 99q-29 23 -102 23h-6v67q152 2 240 60h95l232 -726l146 261q39 70 39 116t-26.5 123t-26.5 122.5t37 75.5t85 30t83.5 -40t35.5 -86z" />
+<glyph unicode="&#x1d6cf;" horiz-adv-x="957" d="M439 203l203 12q110 0 186.5 -82.5t76.5 -193.5q0 -158 -99 -254.5t-257 -96.5q-65 0 -113 23q-63 29 -63 87q0 43 34.5 68.5t70.5 25.5t90.5 -13.5t93.5 -13.5t72.5 35.5t33.5 83.5t-30.5 76.5t-77.5 28.5l-185 -13q-199 0 -311 105t-112 303q0 238 207 394 q-71 54 -71 150t87 196q-69 9 -118 51t-49 108q0 138 192 178l11 -39q-86 -42 -86 -126q0 -43 29.5 -76.5t71.5 -34.5q230 244 366 244q73 0 73 -58q0 -101 -159 -178q-130 -62 -250 -69q-80 -91 -80 -164t59 -115q139 68 321 68q41 0 85 -20t44 -56q0 -58 -96 -95 q-76 -30 -158 -30t-184 15q-105 -73 -147 -129q-60 -78 -60 -179t105 -163q89 -53 194 -53z" />
+<glyph unicode="&#x1d6d0;" horiz-adv-x="1054" d="M182 107.5q-130 131.5 -130 350.5t128 360t347.5 141t347 -141.5t127.5 -359.5t-129.5 -350t-345 -132t-345.5 131.5zM761 408q0 176 -48 296q-68 169 -217 169q-203 0 -203 -330q0 -173 51 -300q71 -173 218 -173q199 0 199 338z" />
+<glyph unicode="&#x1d6d1;" horiz-adv-x="1235" d="M1182 763h-264v-109q0 -342 103 -518q26 -44 26 -64q0 -45 -35 -70.5t-82 -25.5q-88 0 -140 197q-39 146 -39 273v317h-160l-75 -627q-19 -160 -128.5 -160t-109.5 92q0 14 12 48q94 268 159 647h-178q-51 0 -107.5 -41t-64.5 -41q-46 0 -46 49t72 121t186 72h871v-160z " />
+<glyph unicode="&#x1d6d2;" horiz-adv-x="1074" d="M97 471q0 217 118.5 352.5t334 135.5t344 -142.5t128.5 -359t-130.5 -349t-343.5 -132.5q-151 0 -227 105q0 -353 -46 -510h-223q45 198 45 332v568zM781 408q0 171 -50 295q-70 170 -215 170q-99 0 -151 -86q-44 -72 -44 -177v-315q0 -89 84.5 -157t175.5 -68 q200 0 200 338z" />
+<glyph unicode="&#x1d6d3;" horiz-adv-x="945" d="M439 203l182 12q109 0 186 -83t77 -193q0 -156 -99.5 -253.5t-256.5 -97.5q-66 0 -114 23q-62 29 -62 87q0 42 35 68t70.5 26t90.5 -13.5t94 -13.5t72 35.5t33 83.5t-31 76.5t-77 28.5l-164 -13q-198 0 -310.5 105.5t-112.5 314t147 386t363 177.5q123 0 208 -38 q114 -50 114 -158q0 -57 -38.5 -95.5t-95 -38.5t-95.5 38.5t-39 97.5t39 94q-43 9 -91 9q-159 0 -267.5 -121.5t-108.5 -282.5q0 -118 66.5 -189.5t184.5 -71.5z" />
+<glyph unicode="&#x1d6d4;" horiz-adv-x="1147" d="M1097 763h-235q103 -132 103 -332.5t-124.5 -327.5t-332 -127t-333 126.5t-125.5 337.5t124 347t335 136h588v-160zM733 392q0 251 -95 371h-209q-147 0 -147 -241q0 -167 49 -288q68 -167 210 -167q192 0 192 325z" />
+<glyph unicode="&#x1d6d5;" horiz-adv-x="1025" d="M972 763h-302v-527q0 -169 86 -169q67 0 83 118q5 31 5 110q0 26 -1 58h105v-123q0 -98 -59 -176t-154 -78q-309 0 -309 254v533h-155q-51 0 -107.5 -41t-64.5 -41q-46 0 -46 49t72 121t186 72h661v-160z" />
+<glyph unicode="&#x1d6d6;" horiz-adv-x="1257" d="M1205 487q0 -217 -126.5 -364t-339.5 -147q-188 0 -293 100.5t-105 287.5v319q0 176 -91 176t-91 -217q0 -17 2 -80h-109v127q0 102 61.5 183t159.5 81q292 0 292 -250v-319q0 -314 211 -314q153 0 231 146q63 116 63 284q0 296 -234 371l12 70q165 -18 261 -150t96 -304 z" />
+<glyph unicode="&#x1d6d7;" horiz-adv-x="1364" d="M1135 824q184 -137 184 -363t-187 -357q-161 -113 -397 -127l-1 -400h-105l1 400q-237 14 -398 127q-187 131 -187 357t184 363q161 120 401 133l-1 224h105l1 -224q239 -13 400 -133zM735 71q149 19 229 136t80 279.5t-80 266.5t-229 120v-802zM630 873 q-150 -16 -230 -120t-80 -266.5t80 -279.5t230 -136v802z" />
+<glyph unicode="&#x1d6d8;" horiz-adv-x="1104" d="M1052 -91q0 -349 -166 -349q-101 0 -184 122q-66 96 -94 215l-42 181l-275 -516h-239l443 829q-35 157 -56 213q-54 141 -136 141q-113 0 -127 -152h-78v17q0 349 167 349q101 0 185 -122q67 -97 93 -215l22 -98l223 418h239l-390 -732l32 -143q66 -293 179 -293t127 152 h77v-17z" />
+<glyph unicode="&#x1d6d9;" horiz-adv-x="1327" d="M1275 603q0 -239 -86 -409q-110 -217 -325 -217v-400h-110v400q-413 0 -413 391v315q0 176 -91 176t-91 -217q0 -16 2 -80h-109v127q0 102 61.5 183t159.5 81q292 0 292 -250v-263q0 -165 22 -234q40 -128 167 -135v882h110v-882q115 14 186.5 135.5t71.5 246.5 q0 80 -19 145l-35 119q-16 59 -16 109q0 127 100 127q123 0 123 -350z" />
+<glyph unicode="&#x1d6da;" horiz-adv-x="1403" d="M1351 433q0 -182 -93 -311q-103 -146 -278 -146q-197 0 -278 133q-81 -133 -278 -133q-175 0 -279 145q-93 130 -93 312q0 260 150 391.5t415 134.5l-19 -86q-170 -4 -229 -160q-36 -95 -36 -300q0 -343 122 -343q63 0 119 58.5t85 128.5q-64 132 -64 272 q0 239 106.5 239t106.5 -239q0 -142 -63 -272q29 -70 84.5 -128.5t118.5 -58.5q133 0 133 315q0 215 -38 317q-61 166 -238 171l-19 86q265 -3 415 -134.5t150 -391.5z" />
+<glyph unicode="&#x1d6db;" horiz-adv-x="1311" d="M1231 824q0 -88 -15 -189q-99 -670 -631 -670q-195 0 -316 80q-189 125 -189 356.5t163.5 381t404.5 149.5q218 0 304 -211q19 140 19 229q0 426 -354 426q-173 0 -261 -130q44 -8 73 -42t29 -81t-36 -83t-85 -36t-86 35t-37 81.5t28 109.5q101 226 378 226t444 -174.5 t167 -457.5zM926 552q0 127 -66 216.5t-188 89.5q-180 0 -258 -141q-31 -57 -50.5 -193.5t-19.5 -228.5q0 -242 240 -242q182 0 272 164q70 128 70 335z" />
+<glyph unicode="&#x1d6dc;" horiz-adv-x="959" d="M640 775l13 58q0 40 -137 40q-223 0 -223 -321v-9v-14h287q55 0 55 -49t-55 -49h-280q41 -361 262 -361q137 0 207 117l30 63q18 27 62.5 27t44.5 -39q0 -6 -2 -12q-41 -119 -143.5 -184.5t-232.5 -65.5q-216 0 -346 131.5t-130 350.5t128 360t348 141q121 0 206 -29 q125 -41 125 -134q0 -97 -111 -97q-40 0 -74 19.5t-34 56.5z" />
+<glyph unicode="&#x1d6dd;" horiz-adv-x="1442" d="M1390 712q0 -38 -29 -38t-78 13q-6 -268 -115 -465q-136 -246 -378 -246q-449 0 -449 388v119q0 176 -90 176t-90 -151v-19h-109v27q0 84 60.5 160.5t160.5 76.5q292 0 292 -310v-59q0 -144 37 -216q52 -98 183 -98q219 0 219 602v71q-502 130 -502 460q0 124 80.5 204.5 t204.5 80.5q249 0 382 -246q104 -192 115 -471q106 0 106 -59zM792 1394q-80 0 -129.5 -61t-49.5 -143q0 -247 391 -362q-1 195 -33 334q-53 232 -179 232z" />
+<glyph unicode="&#x1d6de;" horiz-adv-x="1070" d="M1017 303q0 -327 -178 -327q-186 0 -186 426l-242 -181q-24 -245 -173 -245q-63 0 -97.5 51t-34.5 117q0 167 218 320v37q0 257 -109 257q-97 0 -96 -181h-65q-2 46 -2 56q0 121 30 205q44 121 140.5 121t144.5 -95.5t48 -332.5l242 186q25 242 168 242q68 0 103 -49.5 t35 -120.5q0 -166 -217 -317v-33q0 -263 108 -263q97 0 96 180h65q2 -41 2 -53z" />
+<glyph unicode="&#x1d6df;" horiz-adv-x="1200" d="M717 956q193 0 312 -151.5t119 -361.5t-138.5 -338t-363.5 -128v-400h-113v400q-220 0 -350.5 131t-130.5 353t130 360t353 138q-45 -35 -62 -93q-137 -43 -137 -372q0 -187 21 -266q41 -157 173 -157h3v531q0 157 22 227q40 127 162 127zM865 467q0 400 -155 400 q-64 0 -64 -138v-658h2q146 0 192 136q25 73 25 260z" />
+<glyph unicode="&#x1d6e0;" horiz-adv-x="1069" d="M788 -373l-238 -13q-194 0 -272 29q-125 47 -171.5 195t-46.5 617q0 222 128 363t347 141t346.5 -141.5t127.5 -359.5t-129.5 -350t-344.5 -132q-264 0 -357 196v-25q0 -133 12 -179q25 -96 114 -125q52 -17 390 -17q135 0 193 -31q82 -43 82 -167q0 -56 -47 -56 q-21 0 -41.5 27.5t-92.5 27.5zM769 408q0 176 -49 296q-68 169 -217 169q-203 0 -203 -330q0 -173 51 -300q71 -173 218 -173q200 0 200 338z" />
+<glyph unicode="&#x1d6e1;" horiz-adv-x="1728" d="M1675 765h-242q112 -127 112 -342q0 -173 -88 -296q-99 -139 -265 -139q-188 0 -265 126q-77 -126 -253.5 -126t-275.5 139q-88 123 -88 296q0 213 110 340h-149q-51 0 -107.5 -41t-64.5 -41q-46 0 -46 49t72 121t186 72h1364v-158zM1287 389q0 276 -84 374h-552 q-84 -98 -84 -374q0 -311 125 -311q60 0 112.5 55t80.5 122q-61 124 -61 233q0 203 103 203t103 -203q0 -109 -61 -233q28 -67 80.5 -122t112.5 -55q125 0 125 311z" />
+<glyph unicode="&#x1d6e2;" horiz-adv-x="1388" d="M239 4l-149 -4q-23 0 -23 19q0 33 37 38q145 20 229 161l690 1152q20 33 48.5 33t33.5 -43l119 -1226q6 -55 36 -69q17 -8 72.5 -8t55.5 -20q0 -37 -35 -37l-185 4h-143l-99 -4q-29 0 -29 22q0 29 24 34l91 10q59 10 59 55q0 57 -13.5 161.5t-15.5 125.5l-5 56h-501 l-149 -247q-36 -59 -36 -92q0 -46 54.5 -64t54.5 -24q0 -37 -36 -37zM1032 521l-66 661l-395 -661h461z" />
+<glyph unicode="&#x1d6e3;" horiz-adv-x="1294" d="M1317 1280q117 -75 117 -213.5t-137 -245.5q-116 -90 -271 -120q123 -11 211.5 -84t88.5 -194t-100 -233q-89 -97 -204 -143.5t-229 -46.5h-673q-53 0 -53 22q0 37 68 38h36q73 1 94 32q10 14 20 54l264 1057q8 31 8 45q0 29 -46 35q-5 1 -63 1t-58 22q0 37 47 37h639 q142 0 241 -63zM1228 927q45 78 45 164t-61.5 140.5t-161.5 54.5h-255q-55 0 -72 -12t-30 -65l-121 -491h281q117 0 218 54.5t157 154.5zM1161 446q0 106 -63.5 169t-169.5 63h-370l-137 -553q-7 -28 -7 -45q0 -23 66 -23h266q164 0 289.5 113.5t125.5 275.5z" />
+<glyph unicode="&#x1d6e4;" horiz-adv-x="1179" d="M189 4l-92 -4q-30 0 -30 22q0 25 16 32t50 7h63q53 4 70 32q8 13 18 53l266 1065q8 31 8 39q0 29 -49 34h-69q-51 0 -51 23q0 36 49 36h895q45 0 45 -22l-45 -373q-5 -44 -26 -44t-21 22q0 10 6.5 51.5t6.5 105.5q0 123 -70 168q-54 35 -185 35h-253q-47 0 -61.5 -14.5 t-26.5 -60.5l-268 -1074q-8 -31 -8 -39q0 -39 107.5 -41t107.5 -22q0 -35 -49 -35l-104 4h-300z" />
+<glyph unicode="&#x1d6e5;" horiz-adv-x="1074" d="M1011 35l2 -10q0 -25 -41 -25h-881q-24 0 -24 16t11 35l755 1317q20 35 48.5 35t32.5 -45zM846 130l-77 1028l-547 -953q-15 -25 -30 -75h654z" />
+<glyph unicode="&#x1d6e6;" horiz-adv-x="1260" d="M1459 1321q0 11 -5 -30l-41 -343q-5 -44 -26 -44t-21 22q0 2 6 34.5t6 110.5q0 134 -82 181q-59 34 -199 34h-301q-49 0 -64.5 -12.5t-28.5 -62.5l-122 -487h201q112 0 157 35.5t82 158.5q10 35 27 35q21 0 21 -13q0 -5 -26 -110l-87 -352q-10 -41 -28 -41q-21 0 -21 19 q0 1 9.5 34t9.5 76t-7 57q-22 44 -147 44h-205l-136 -542q-8 -32 -8 -45q0 -23 45 -23h309q222 0 333 94q83 71 182 299q23 53 40 53q20 0 20 -18.5t-187 -450.5q-10 -24 -19.5 -29t-39.5 -5h-1000q-39 0 -39 22q0 32 46 37q36 1 71 1q70 2 87 44q5 13 13 42l266 1065 q8 31 8 39q0 29 -48 34h-69q-52 0 -52 23q0 36 47 36h980q43 0 43 -22z" />
+<glyph unicode="&#x1d6e7;" horiz-adv-x="1105" d="M1352 1327q0 -22 -21 -45l-1080 -1222h341q229 0 341 97q88 77 170 310q18 52 33 52q20 0 20 -20q0 -39 -143 -462q-4 -13 -19 -32q-7 -5 -41 -5h-838q-48 0 -48 15q0 24 25 52l1078 1219h-322q-204 0 -311 -79q-90 -67 -169 -268q-14 -35 -28 -35q-20 0 -20 20 q0 37 115 382q4 14 19 33q8 4 39 4h812q47 0 47 -16z" />
+<glyph unicode="&#x1d6e8;" horiz-adv-x="1416" d="M1536 1339l98 4q29 0 29 -22q0 -34 -89 -38t-108 -33q-10 -14 -19 -51l-269 -1074q-4 -16 -4 -33q0 -33 83.5 -34.5t83.5 -20.5q0 -37 -38 -37l-102 4h-260l-99 -4q-28 0 -28 19q0 31 35 37q5 1 60 1q91 0 117 62q1 2 12 51l125 501h-596l-136 -546q-4 -16 -4 -33 q0 -33 83.5 -34.5t83.5 -20.5q0 -37 -37 -37l-104 4h-258l-100 -4q-28 0 -28 19q0 41 68 41h38q70 0 92 32q8 12 19 54l265 1057q8 31 8 45q0 29 -48 35q-4 1 -62.5 1t-58.5 22q0 37 37 37l101 -4h262l99 4q30 0 30 -22q0 -34 -89.5 -38t-109.5 -33q-8 -11 -18 -51 l-118 -471h594l120 475q7 31 7 45q0 29 -47 35q-4 1 -63 1t-59 22q0 37 39 37l100 -4h263z" />
+<glyph unicode="&#x1d6e9;" horiz-adv-x="1427" d="M1546 861q0 -333 -258 -618t-587 -285q-222 0 -355 147.5t-133 372.5q0 330 260 618.5t585 288.5q224 0 356 -148.5t132 -375.5zM1388 933q0 171 -87 289.5t-253 118.5q-241 0 -441 -243q-104 -128 -165 -313t-61 -358t78 -289q90 -134 256 -134q286 0 492 331 q181 293 181 598zM1278 785q0 -10 -50 -204q-10 -41 -28 -41t-18 21q0 9 10 46h-655q-14 -67 -33.5 -67t-19.5 21q0 7 49 203q10 41 27 41q21 0 21 -20q0 -10 -10 -47h653q14 67 34 67t20 -20z" />
+<glyph unicode="&#x1d6ea;" horiz-adv-x="687" d="M812 1339l94 4q29 0 29 -20q0 -27 -17 -35q-4 -2 -87 -5t-103 -33q-5 -8 -17 -53l-267 -1056q-7 -27 -7 -45q0 -30 46 -36q4 -1 67 -1t63 -24q0 -35 -44 -35l-96 4h-282l-94 -4q-30 0 -30 19q0 38 47 38q140 0 162 36q6 9 17 53l265 1059q9 35 9 43q0 36 -88.5 37 t-88.5 21q0 37 37 37l104 -4h281z" />
+<glyph unicode="&#x1d6eb;" horiz-adv-x="1449" d="M1607 1339l65 4q24 0 24 -22q0 -29 -35 -35q-138 -25 -312 -154l-363 -281q-24 -18 -36 -29q3 -14 58 -144l226 -532q24 -54 47 -70q8 -5 63 -16t55 -23q0 -37 -34 -37l-187 4l-211 -4q-26 0 -26 19q0 38 36 38q97 0 97 62q0 26 -251 607l-300 -234l-77 -304 q-19 -74 -19 -96q0 -33 83.5 -34.5t83.5 -20.5q0 -37 -37 -37l-112 4h-237l-111 -4q-30 0 -30 22q0 32 46 37q35 1 84 2t68 31q9 15 19 54l265 1057q8 31 8 45q0 37 -107 37q-60 0 -60 21q0 37 37 37l110 -4h239l111 4q30 0 30 -20q0 -24 -16 -34q-3 -2 -83.5 -6t-98.5 -31 q-9 -13 -19 -53l-163 -649l771 599q75 58 75 99q0 26 -36.5 35t-36.5 25q0 35 48 35l175 -4h74z" />
+<glyph unicode="&#x1d6ec;" horiz-adv-x="1284" d="M226 4l-138 -4q-21 0 -21 19q0 34 27 38q138 23 215 158l660 1153q21 35 49.5 35t31.5 -45l90 -1228q4 -51 27 -65q8 -4 62.5 -7.5t54.5 -20.5q0 -37 -36 -37l-97 4h-101l-217 -4q-26 0 -26 19q0 35 41 38q134 10 134 76q0 7 -1 20l-75 1005l-548 -953q-30 -52 -30 -79 q0 -51 56.5 -64t56.5 -27q0 -35 -46 -35z" />
+<glyph unicode="&#x1d6ed;" horiz-adv-x="1725" d="M272 4l-179 -4q-26 0 -26 22q0 32 49 38q75 10 99 22q61 30 83 119l251 1002q8 31 8 45q0 29 -45 35q-5 1 -63.5 2t-58.5 21q0 37 47 37h261q30 0 38 -7t12 -37l148 -1125l717 1135q21 34 62 34h257q40 0 40 -20q0 -26 -15 -34q-4 -3 -84 -6.5t-99 -32.5q-6 -10 -17 -51 l-270 -1074q-4 -16 -4 -33q0 -33 84 -34.5t84 -20.5q0 -37 -38 -37l-103 4h-246l-97 -4q-31 0 -31 22q0 32 46 37q36 1 84.5 2t68.5 32q9 14 19 53l285 1138h-2l-791 -1250q-22 -34 -41 -34t-26 53l-163 1221h-2l-271 -1082q-9 -36 -9 -51q0 -49 41 -68q19 -9 67.5 -15 t48.5 -21q0 -37 -36 -37z" />
+<glyph unicode="&#x1d6ee;" horiz-adv-x="1416" d="M1460 1339l179 4q24 0 24 -22q0 -32 -48 -38q-74 -9 -99 -22q-61 -32 -84 -125l-275 -1096q-10 -40 -31 -40q-16 0 -30 35l-469 1166q-11 27 -20 41l-264 -1050q-9 -36 -9 -51q0 -49 41 -68q19 -9 67.5 -15t48.5 -21q0 -37 -36 -37l-183 4l-179 -4q-26 0 -26 19 q0 34 48 41q78 10 100 21q60 30 83 120l260 1041l7 26q0 14 -88.5 16t-88.5 22q0 37 48 37h258q36 0 50 -34l421 -1046l222 886q8 36 8 52q0 47 -40 66q-18 9 -66.5 16.5t-48.5 22.5q0 37 35 37l90 -4h95z" />
+<glyph unicode="&#x1d6ef;" horiz-adv-x="1288" d="M1401 1079l15 117q0 27 -102 27h-765q-95 0 -109 -13t-38 -85t-40 -72q-19 0 -19 20q0 12 6 31l63 202q12 37 53 37h987q37 0 37 -14.5t-43 -233.5q-8 -42 -26.5 -42t-18.5 26zM1202 826q0 -7 -6 -30l-56 -215q-11 -41 -26 -41q-20 0 -20 21q0 10 16 71h-660 q-23 -92 -42 -92q-23 0 -18 21l58 244q10 41 28 41q22 0 22 -20q0 -8 -18 -73h660q21 93 40 93q22 0 22 -20zM1234 311q21 0 21 -21.5t-81 -259.5q-8 -23 -15.5 -26.5t-34.5 -3.5h-999q-43 0 -43 19q0 4 13 71l36 178q10 43 24 43q22 0 22 -20q0 -1 -10 -48t-10 -115 q55 -7 123 -7h755q103 0 114.5 13t40.5 95t44 82z" />
+<glyph unicode="&#x1d6f0;" horiz-adv-x="1427" d="M1546 861q0 -333 -258 -618t-587 -285q-222 0 -355 147.5t-133 372.5q0 330 260 618.5t585 288.5q224 0 356 -148.5t132 -375.5zM1388 933q0 171 -87 289.5t-253 118.5q-241 0 -441 -243q-104 -127 -165 -312.5t-61 -358.5t78 -289q90 -134 256 -134q286 0 492 331 q181 293 181 598z" />
+<glyph unicode="&#x1d6f1;" horiz-adv-x="1414" d="M187 4l-92 -4q-28 0 -28 19q0 39 44 40l86 2q53 5 69 32q8 12 18 53l268 1069q6 24 6 35q0 34 -87 34h-15q-67 0 -67 21q0 38 46 38h1187q40 0 40 -20q0 -27 -12.5 -33t-88.5 -7t-96 -34q-10 -15 -19 -53l-268 -1071q-4 -16 -4 -33q0 -33 83.5 -34.5t83.5 -20.5 q0 -37 -38 -37l-96 4h-273l-92 -4q-28 0 -28 19q0 38 46 38q131 0 154 36q7 11 17 53l286 1140h-596l-290 -1161q-4 -16 -4 -33q0 -33 83.5 -34.5t83.5 -20.5q0 -37 -37 -37l-97 4h-273z" />
+<glyph unicode="&#x1d6f2;" horiz-adv-x="1252" d="M207 4l-110 -4q-30 0 -30 22q0 32 48 37q36 1 83 2t66 29q11 15 21 56l264 1057q8 31 8 45q0 29 -46 35q-5 1 -63 1t-58 22q0 37 46 37h616q151 0 256 -69q122 -81 122 -224q0 -181 -186 -310q-167 -115 -357 -115h-330l-126 -500q-4 -16 -4 -35q0 -32 83.5 -33t83.5 -20 q0 -37 -37 -37l-111 4h-239zM1264 1092q0 194 -269 194h-194q-55 0 -72.5 -12t-30.5 -65l-133 -538h277q296 0 390 254q32 85 32 167z" />
+<glyph unicode="&#x1d6f3;" horiz-adv-x="1427" d="M1546 861q0 -333 -258 -618t-587 -285q-222 0 -355 147.5t-133 372.5q0 330 260 618.5t585 288.5q224 0 356 -148.5t132 -375.5zM1388 933q0 171 -87 289.5t-253 118.5q-241 0 -441 -243q-120 -147 -183 -370h941q23 110 23 205zM381 428q0 -174 78 -290 q90 -134 256 -134q224 0 406 213q158 185 230 454h-941q-29 -126 -29 -243z" />
+<glyph unicode="&#x1d6f4;" horiz-adv-x="1324" d="M1432 928l8 114q0 157 -107 209q-70 35 -245 35h-508l256 -615q-2 -10 -19 -25l-617 -571h549q244 0 348 61q70 42 125 130q24 38 83 162q14 28 27 28q20 0 20 -19q0 -3 -68.5 -189.5t-76.5 -206.5t-23 -38q-6 -3 -39 -3h-1019q-52 0 -52 19q0 9 19 26l600 553l-298 703 q-2 42 56 42h1021q53 0 50 -24l-45 -368q-5 -47 -25 -47t-20 24z" />
+<glyph unicode="&#x1d6f5;" horiz-adv-x="1404" d="M508 4l-125 -4q-30 0 -30 19q0 29 18 36q4 2 59.5 2.5t114 6t75 24.5t28.5 65l265 1066q11 44 11 46q0 21 -54 21h-145q-182 0 -264 -89q-43 -47 -122 -259q-12 -33 -27 -33q-20 0 -20 19q0 1 128 382q4 14 18 33q7 4 31 4h1086q50 0 50 -22q0 -3 -4 -27l-56 -347 q-7 -42 -26.5 -42t-19.5 28t10.5 93t10.5 99q0 99 -68 136q-48 26 -187.5 26t-154.5 -5q-30 -10 -46 -73l-265 -1058q-9 -35 -9 -49t7 -23q14 -18 124.5 -21t110.5 -21q0 -37 -42 -37l-125 4h-357z" />
+<glyph unicode="&#x1d6f6;" horiz-adv-x="1429" d="M562 4l-126 -4q-33 0 -33 19q0 38 46 38q142 0 173 15t49 87l85 333q80 316 80 448q0 296 -211 296q-154 0 -237 -168q-16 -32 -37.5 -32t-21.5 16q0 22 30 83q112 230 300 230q274 0 274 -379q0 -21 -7 -110q79 199 191 324q147 165 322 165q91 0 139.5 -61.5 t48.5 -164.5t-45 -103q-21 0 -21 16l4 44q0 64 -45.5 102t-111.5 38q-305 0 -463 -588q-84 -314 -109 -427t-25 -125t7 -20q14 -16 111 -18t97 -23q0 -35 -50 -35l-131 4h-283z" />
+<glyph unicode="&#x1d6f7;" horiz-adv-x="1300" d="M1130 1339l128 4q29 0 29 -20q0 -30 -20 -37q-9 -3 -46 -3h-23q-128 0 -155 -39q-11 -17 -47 -162q163 -12 282 -93q141 -95 141 -241t-124 -269q-192 -190 -503 -217q-39 -154 -39 -162q0 -40 107 -42t107 -23q0 -35 -49 -35l-119 4h-285l-127 -4q-32 0 -32 19 q0 26 21 36q4 3 84.5 4t104.5 10q38 16 59 83l25 107q-165 15 -283 94q-141 96 -141 243.5t127 270.5q104 103 238 154t262 61q38 143 38 159.5t-5 23.5q-12 18 -107 18h-31q-41 0 -55.5 4t-14.5 19q0 37 40 37l127 -4h286zM1256 785q0 228 -269 256l-185 -740 q314 34 418 304q36 92 36 180zM389 558q0 -229 270 -257l184 740q-325 -35 -425 -319q-29 -84 -29 -164z" />
+<glyph unicode="&#x1d6f8;" horiz-adv-x="1418" d="M1557 1339l84 4q24 0 24 -22q0 -29 -38 -35q-122 -19 -179 -53t-152 -133l-325 -349l261 -610q27 -61 55 -75q5 -2 70.5 -7t65.5 -22q0 -37 -35 -37l-100 4h-226l-102 -4q-30 0 -30 19q0 32 34 38q103 22 106 58l-217 508l-364 -393q-82 -86 -82 -115q0 -42 45.5 -54 t45.5 -26q0 -35 -49 -35l-274 4l-84 -4q-24 0 -24 19q0 33 39 38q173 26 301 160l427 454l-234 547q-20 49 -57 61q-15 5 -71 6.5t-56 20.5q0 37 35 37l209 -4h112l107 4q30 0 30 -22q0 -26 -61 -41t-82 -52l186 -430l344 371q30 33 30 59q0 40 -45 52.5t-45 27.5 q0 35 49 35z" />
+<glyph unicode="&#x1d6f9;" horiz-adv-x="1418" d="M1184 1339l126 4q30 0 30 -20q0 -27 -20 -36q-4 -2 -100.5 -4.5t-119.5 -31.5q-13 -16 -24 -59l-223 -887q290 70 412 507q48 174 118 233q54 46 131 47q21 -1 61.5 0t40.5 -21q0 -11 -29 -19q-80 -20 -125 -102q-22 -38 -60 -160q-150 -483 -559 -528q-37 -148 -37 -163 t9 -26.5t107 -14t98 -23.5q0 -35 -48 -35l-121 4h-284l-127 -4q-33 0 -33 19q0 37 41 40q52 1 112.5 2t84.5 25q14 15 55 176q-318 44 -318 357q0 54 23 159.5t23 160.5q0 94 -71 113q-25 7 -25 19q0 19 44 22h2q108 0 144 -23q48 -31 48 -131q0 -60 -26 -177t-26 -177 q0 -235 194 -282l224 891q7 31 7 46.5t-5 24.5q-11 17 -109 19.5t-98 21.5q0 37 38 37l127 -4h288z" />
+<glyph unicode="&#x1d6fa;" horiz-adv-x="1356" d="M1504 989q0 -150 -113 -314q-46 -67 -217 -258.5t-222 -303.5h158q106 0 132 31q3 4 41 81.5t56 77.5q22 0 22 -18.5t-65.5 -147t-76 -133t-39.5 -4.5h-250q-50 0 -50 19q0 98 222 447q116 183 157 269q79 164 79 302t-87.5 223t-229.5 85q-106 0 -214 -53 q-168 -83 -253 -239t-85 -351q0 -83 22.5 -246.5t22.5 -246.5q0 -171 -24 -196q-13 -13 -49 -13h-266q-29 0 -35 16q-2 5 -2 115t4 141t21 31q21 0 24 -29q-2 20 -2 -46q0 -88 13.5 -101.5t101.5 -13.5h167q2 9 2 22q0 112 -82.5 321t-82.5 322q0 261 233 440 q215 167 484 167q194 0 331 -99q152 -110 152 -297z" />
+<glyph unicode="&#x1d6fb;" horiz-adv-x="1794" d="M1794 1373q0 -6 -4 -14l-695 -1401q-17 -35 -50.5 -35t-50.5 35l-694 1401q-4 8 -4 14q0 17 24 17h1450q24 0 24 -17zM1661 1244h-1115l557 -1126z" />
+<glyph unicode="&#x1d6fc;" horiz-adv-x="1203" d="M1216 959q23 0 23 -23t-9 -72q-26 -142 -93 -310t-146 -263q-1 -43 -1 -78q0 -194 68 -194q56 0 98 63t50 63q23 0 23 -16.5t-14 -41.5q-61 -111 -162 -111q-146 0 -194 194q-185 -194 -388 -194q-154 0 -236.5 101.5t-82.5 259.5q0 229 158.5 425.5t381.5 196.5 q157 0 235 -133q64 -109 64 -277v-186q134 191 199 550q8 46 26 46zM849 311l3 206q0 398 -171 398q-179 0 -292 -248q-91 -201 -91 -407q0 -241 178 -241q183 0 377 203q-4 47 -4 89z" />
+<glyph unicode="&#x1d6fd;" horiz-adv-x="1169" d="M1128 1458q82 -76 82 -194t-67 -221t-169 -163q143 -103 143 -312t-145 -402.5t-361 -193.5t-290 264l-138 -551q-28 -112 -86.5 -112t-58.5 56q0 13 6 37l322 1282q58 232 188 391q158 195 368 195q124 0 206 -76zM845 880q-38 15 -96 15t-97 -22q35 -10 75 -10h37 q41 0 81 17zM1084 1312q0 72 -43.5 125.5t-113.5 53.5q-216 0 -368 -382q-52 -129 -162 -570q-37 -148 -37 -209q0 -123 57.5 -218t172.5 -95q192 0 297 234q82 182 82 402q0 126 -68 192q-73 -26 -186 -26t-113 52q0 67 160 67q82 0 145 -25q80 58 128.5 174.5t48.5 224.5z " />
+<glyph unicode="&#x1d6fe;" horiz-adv-x="1309" d="M1267 938q42 0 42 -38.5t-176 -397t-199 -440.5l-41 -286q-39 -218 -114 -218q-46 0 -46 61q0 88 31 201l62 215q32 122 32 227q0 554 -347 554q-218 0 -335 -243q-16 -34 -31 -34q-22 0 -22 27.5t39 104.5q146 288 376 288q200 0 295 -263q64 -175 73 -433 q120 318 249 573q52 102 112 102z" />
+<glyph unicode="&#x1d6ff;" horiz-adv-x="1057" d="M1146 1398q0 -45 -33 -80t-78 -35q-74 0 -74 69q0 37 26.5 67.5t63.5 36.5q-72 45 -156 45t-140.5 -36.5t-56.5 -106.5t93 -198q154 -209 173 -243q93 -160 93 -320q0 -228 -173 -424.5t-398 -196.5q-151 0 -242.5 104t-91.5 257q0 223 175.5 423t390.5 200q21 0 50 -4 q-124 241 -124 367q0 222 250 222q83 0 157 -33q95 -42 95 -114zM778 213q107 171 107 341t-84 343q-36 18 -80 18q-182 0 -308 -224q-43 -76 -79 -210t-36 -226.5t48.5 -164t141.5 -71.5q169 0 290 194z" />
+<glyph unicode="&#x1d700;" horiz-adv-x="1006" d="M1006 840q0 -27 -24.5 -52.5t-53 -25.5t-107.5 28t-125 28q-124 0 -228 -35q-147 -48 -147 -145q0 -55 74 -93q84 37 212.5 37t128.5 -56q0 -64 -158 -64q-116 0 -185 28q-66 -33 -119 -89t-53 -117q0 -91 104 -133q75 -31 183 -31q194 0 289 78q28 23 53 23q47 0 47 -34 q0 -23 -38 -69q-118 -142 -370 -142q-132 0 -227 63q-110 73 -110 198q0 84 54 159t134 120q-82 59 -82 147q0 136 169 223q142 73 292 73q70 0 166 -30q121 -37 121 -89zM682 524q-47 13 -108 13t-116 -19q38 -10 81 -10h70q39 0 73 16z" />
+<glyph unicode="&#x1d701;" horiz-adv-x="844" d="M753 1493l-9 -76q0 -47 21 -92q59 24 161 24q144 0 144 -53q0 -65 -187 -65q-90 0 -132 38q-200 -117 -343.5 -367t-143.5 -486.5t202 -306.5l200 -69q101 -35 146 -76q62 -55 62 -150t-70 -175.5t-167 -80.5q-72 0 -137.5 41t-65.5 63.5t23 21.5q113 -83 173.5 -83 t97.5 46t37 102q0 101 -158 160l-153 51q-91 31 -144 68q-158 108 -158 337q0 266 168 541.5t404 398.5q-27 51 -27 116q0 94 36 94q20 0 20 -22zM923 1305h-49q-42 0 -75 -15q25 -16 63 -16h37q75 0 120 19q-48 12 -96 12z" />
+<glyph unicode="&#x1d702;" horiz-adv-x="1118" d="M1118 730q0 -58 -18 -129l-244 -969q-19 -74 -80 -74t-61 54q0 14 6 38l247 974q19 75 19 139q0 152 -116 152q-163 0 -297 -177q-70 -92 -117 -281l-52 -253q-20 -100 -46 -182q-24 -46 -74 -46q-56 0 -56 54q0 24 26 126l56 222l63 218q36 133 36 226t-68 93 q-93 0 -161 -257q-14 -53 -33 -53q-25 0 -25 21q0 26 31 118.5t62 138.5q53 76 133.5 76t133 -54.5t57.5 -137.5q137 192 336 192q111 0 176.5 -59.5t65.5 -169.5z" />
+<glyph unicode="&#x1d703;" horiz-adv-x="977" d="M1024 1370q46 -115 46 -293.5t-69 -407.5t-201 -428q-177 -265 -360 -265q-140 0 -204 161q-46 115 -46 290t68 406.5t200 430.5q176 268 362 268q140 0 204 -162zM938 1219q0 270 -120 270q-115 0 -244 -236q-84 -153 -164 -466h459q69 265 69 432zM321 288 q0 -269 121 -269q109 0 232 214q102 178 180 488h-464q-69 -284 -69 -433z" />
+<glyph unicode="&#x1d704;" horiz-adv-x="698" d="M724 309q0 -14 -31 -73q-136 -260 -309 -260q-85 0 -139 55.5t-54 140.5q0 35 23 126l139 551q28 110 91 110q59 0 59 -53q0 -13 -11 -57l-163 -659q-7 -28 -7 -68q0 -103 68 -103q153 0 272 262q6 13 21 38q8 9 17 9q24 0 24 -19z" />
+<glyph unicode="&#x1d705;" horiz-adv-x="1113" d="M628 186l17 117q0 166 -249 195l-111 -445q-19 -77 -81 -77t-62 57q0 22 7 50l200 799q19 77 81 77t62 -57q0 -22 -7 -50l-73 -291q88 29 208 136q190 169 199 175q116 87 214 87q80 0 80 -71q0 -43 -33 -74.5t-76 -31.5q-72 0 -72 69q0 26 12 46q-94 -37 -244.5 -182 t-233.5 -176q316 -40 316 -235q0 -31 -13 -90t-13 -90q0 -105 71 -105q112 0 188 266q12 44 31 44q22 0 22 -24t-29 -102q-84 -227 -215 -227q-88 0 -142 60.5t-54 149.5z" />
+<glyph unicode="&#x1d706;" horiz-adv-x="1102" d="M1102 -7q0 -18 -45 -18q-81 0 -107 19.5t-54 92.5q-62 162 -194 554l-403 -483q-49 -68 -141 -167q-26 -18 -46 -18q-61 0 -61 57q0 29 43 72q575 581 587 594l-145 412q-89 246 -100 268q-26 57 -53 70q-22 6 -48 14.5t-26 23.5q0 24 39 24q212 0 266 -155l432 -1251 q20 -57 38 -81.5t18 -27.5z" />
+<glyph unicode="&#x1d707;" horiz-adv-x="1161" d="M1165 329q22 0 22 -24.5t-25 -103.5q-71 -225 -197 -225q-73 0 -124 44t-65 116q-118 -160 -285 -160q-135 0 -211 70l-95 -378q-30 -110 -90.5 -110t-60.5 54q0 10 7 38l308 1232q19 77 81.5 77t62.5 -54q0 -10 -29 -125l-99 -392q-28 -111 -28 -176q0 -193 162 -193 q137 0 248 155q28 39 39 83l152 606q19 75 81 75t62 -56q0 -6 -25 -110l-55 -223l-63 -212q-35 -125 -35 -221.5t66.5 -96.5t113.5 104q20 43 52 162q12 44 30 44z" />
+<glyph unicode="&#x1d708;" horiz-adv-x="1159" d="M1159 905q0 -28 -18 -83q-93 -284 -306 -491t-502 -306q-82 -28 -157 -28q-23 0 -23 17q0 2 1 5l192 770q6 24 6 43q0 37 -79 38t-79 24q0 33 47 43q49 4 147 13t106 9q25 0 25 -17q0 -8 -50 -209l-167 -671q284 94 459 320q132 169 258 503q28 74 84 74t56 -54z" />
+<glyph unicode="&#x1d709;" horiz-adv-x="938" d="M725 1493l-8 -84q0 -42 12 -70q62 10 168 10q144 0 144 -53q0 -65 -181 -65q-104 0 -143 45q-108 -50 -180 -152t-72 -217.5t75 -179.5q85 27 203 27q150 0 150 -55q0 -62 -184 -62q-98 0 -167 16l-31 8q-19 0 -64 -35q-211 -162 -211 -338q0 -130 187 -205l230 -92 q141 -56 157 -66q81 -50 81 -138.5t-68 -158.5t-157 -70q-82 0 -156.5 41.5t-74.5 64t22 20.5v-1q36 -30 100 -56t109.5 -26t77.5 36.5t32 82.5t-38 77q-14 12 -201.5 83.5t-245.5 106.5q-160 98 -160 237t96 265.5t225 198.5q-146 80 -146 229.5t121 264.5q104 100 256 145 q-15 34 -15 94q0 94 35 94q22 0 22 -22zM895 1305h-58q-42 0 -72 -9q28 -22 76 -22h48q57 0 102 19q-48 12 -96 12zM843 696q-71 15 -131 15t-120 -15q38 -16 87 -16h69q60 0 95 16z" />
+<glyph unicode="&#x1d70a;" horiz-adv-x="1057" d="M1057 597q0 -228 -173 -424.5t-398 -196.5q-151 0 -242.5 104t-91.5 257q0 226 174.5 424t397.5 198q150 0 241.5 -104.5t91.5 -257.5zM871 441q41 141 41 236.5t-49 166.5t-142 71q-181 0 -308 -224q-43 -76 -79 -210t-36 -226.5t48.5 -164t141.5 -71.5q260 0 383 422z " />
+<glyph unicode="&#x1d70b;" horiz-adv-x="1212" d="M1271 875q0 -71 -102 -71h-244q-42 -183 -42 -367t58 -335q16 -42 16 -48q0 -31 -26.5 -54.5t-57.5 -23.5q-91 0 -91 265q0 178 93 563h-248q-42 -168 -179 -680q-7 -33 -31 -95q-30 -53 -74 -53q-60 0 -60 57q0 15 17 53q197 446 277 718h-130q-87 0 -158 -51 q-44 -32 -89 -89.5t-56 -57.5q-25 0 -25 18t55 97q140 202 288 202h728q81 0 81 -48z" />
+<glyph unicode="&#x1d70c;" horiz-adv-x="1069" d="M1069 597q0 -228 -173.5 -424.5t-398.5 -196.5q-145 0 -206 155l-106 -427q-7 -37 -26 -94q-29 -52 -76 -52q-60 0 -60 54q0 6 8 38l206 820q46 184 176 327q147 162 321 162q152 0 243.5 -104t91.5 -258zM882 441q40 138 40 235t-48.5 168t-141.5 71q-231 0 -357 -445 q-62 -219 -62 -248t15 -67q54 -136 171 -136q261 0 383 422z" />
+<glyph unicode="&#x1d70d;" horiz-adv-x="923" d="M880 947q94 -17 94 -53.5t-37 -36.5q-5 0 -33 13q-89 41 -167 41q-165 0 -311 -105q-161 -115 -161 -274q0 -85 41.5 -132t129.5 -98q82 -43 242 -134q63 -38 89.5 -72.5t26.5 -98.5q0 -90 -66 -162.5t-156 -72.5q-32 0 -83 14t-51 36t25 22q16 0 52 -11.5t57 -11.5 q44 0 71.5 35t27.5 80q0 66 -85 114l-204 114q-115 64 -164 122q-66 77 -66 189q0 208 191 351t406 143q67 0 131 -12z" />
+<glyph unicode="&#x1d70e;" horiz-adv-x="1186" d="M1247 876q0 -69 -99 -69h-189q78 -99 78 -238q0 -217 -172 -405t-387 -188q-147 0 -236.5 102t-89.5 251q0 221 170 407.5t389 186.5h462q74 0 74 -47zM894 598q0 95 -55 152t-150 57q-183 0 -299 -195q-99 -167 -99 -363q0 -96 47.5 -163.5t139.5 -67.5q167 0 298 212 q118 190 118 368z" />
+<glyph unicode="&#x1d70f;" horiz-adv-x="1050" d="M1110 875q0 -71 -100 -71h-330l-145 -737q-18 -91 -85 -91q-60 0 -60 55q0 8 11 44l223 729h-176q-89 0 -161 -51q-43 -32 -87.5 -89.5t-55.5 -57.5q-24 0 -24 18t55 97q140 202 285 202h580q70 0 70 -48z" />
+<glyph unicode="&#x1d710;" horiz-adv-x="1061" d="M1061 813q0 -83 -34 -225q-146 -612 -452 -612q-281 0 -281 265q0 126 104 400q58 153 58 202q0 72 -58 72q-89 0 -148 -96q-29 -47 -72 -175q-13 -39 -30 -39q-25 0 -25 20t27 89q97 245 254 245q75 0 124 -50t49 -124q0 -42 -43 -155q-109 -287 -109 -418 q0 -193 158 -193q228 0 360 439q33 110 33 172t-51 146t-51 87q0 37 31 66.5t68 29.5q88 0 88 -146z" />
+<glyph unicode="&#x1d711;" horiz-adv-x="1207" d="M1161 531q0 -206 -189 -377t-431 -178l-77 -302q-9 -39 -22 -81q-9 -8 -21 -8q-24 0 -24 22q0 5 30 123l61 246q-180 10 -284.5 113.5t-104.5 252.5q0 207 189.5 377.5t430.5 177.5l117 468q11 41 31 41q23 0 24 -21l-119 -488q195 -14 300 -131q89 -99 89 -235z M1029 573q0 129 -74.5 201t-194.5 79l-209 -833q214 17 346 187.5t132 365.5zM231 300q0 -139 88 -214q72 -60 179 -66l209 833q-214 -19 -351 -196q-125 -160 -125 -357z" />
+<glyph unicode="&#x1d712;" horiz-adv-x="1141" d="M1161 937q0 -6 -467 -640q44 -181 108 -369q95 -277 159 -317q16 -10 33 -10q58 0 96 59t45 59q24 0 24 -19.5t-17 -47.5q-57 -94 -163.5 -94t-167.5 45q-73 54 -152 301l-82 260l-440 -596q-7 -10 -21 -10q-21 0 -21 20q0 10 467 640q-189 697 -300 697 q-52 0 -95.5 -58.5t-50.5 -58.5q-24 0 -24 20q0 14 20 45q62 96 171.5 96t180.5 -61q54 -46 126 -255q10 -30 89 -290l425 582q18 24 34 24q23 0 23 -22z" />
+<glyph unicode="&#x1d713;" horiz-adv-x="1363" d="M1363 813q0 -301 -179 -555q-198 -280 -487 -282l-50 -219q-43 -179 -52 -189t-20 -10q-25 0 -25 19q0 9 33 138l66 264q-349 25 -349 304q0 101 78 287t78 265.5t-58 79.5q-84 0 -139 -80q-31 -46 -63 -138t-48 -92q-25 0 -25 19t24 82q97 253 257 253q74 0 123.5 -51 t49.5 -126q0 -41 -39 -145q-103 -275 -103 -370q0 -217 228 -243l360 1442q11 45 29 45q25 0 25 -20q0 -5 -7 -33l-359 -1439q203 0 385 198t182 403q0 68 -51.5 155t-51.5 88q0 37 32 66.5t69 29.5q87 0 87 -146z" />
+<glyph unicode="&#x1d714;" horiz-adv-x="1379" d="M1379 813q0 -100 -40 -252q-60 -227 -159 -376q-138 -209 -323 -209q-173 0 -189 212q-135 -212 -307 -212q-209 0 -209 299q0 269 159 551q62 110 84 110t22 -23q0 -8 -17 -35q-188 -298 -188 -510q0 -101 37 -166q47 -82 140 -82q155 0 281 200q31 310 108 310 q38 0 38 -45q0 -79 -83 -274q11 -191 152 -191q158 0 282 167t124 331q0 68 -50 156t-50 89q0 37 31 66.5t69 29.5q88 0 88 -146z" />
+<glyph unicode="&#x1d715;" horiz-adv-x="1167" d="M1167 936q0 -145 -55 -329q-80 -266 -224 -437q-181 -215 -421 -215q-259 0 -350 230q-27 68 -27 134q0 238 187 427.5t415 189.5q108 0 177.5 -66.5t86.5 -175.5h2q56 216 56 360.5t-68 244.5q-78 116 -225 116q-196 0 -294 -161h5q38 0 65 -27t27 -65t-27 -65t-65 -27 t-65 27t-27 55.5t3 38.5q38 125 143.5 200t238.5 75q210 0 332 -164q110 -148 110 -366zM919 621q0 118 -56 194t-171 76q-185 0 -309 -182q-46 -68 -90.5 -223t-44.5 -251t59.5 -159.5t165.5 -63.5q151 0 267 138q90 108 143 277q36 116 36 194z" />
+<glyph unicode="&#x1d716;" horiz-adv-x="928" d="M928 894q0 -33 -32 -33q-17 0 -83.5 27t-102.5 27q-138 0 -240 -115q-83 -94 -128 -244h376q42 0 42 -29q0 -35 -71 -35h-363q-30 -129 -30 -225t49.5 -172t141.5 -76q93 0 282 95q21 1 21 -25q0 -22 -80 -58.5t-122.5 -45.5t-95.5 -9q-157 0 -248.5 113.5t-91.5 284 t90 312.5t254 222q104 51 214 51q218 0 218 -65z" />
+<glyph unicode="&#x1d717;" horiz-adv-x="1257" d="M1257 734q0 -23 -19 -23q-27 0 -100 19q-65 -253 -195 -466q-175 -288 -370 -288q-282 0 -282 244q0 77 30.5 203t30.5 193q0 99 -67.5 99t-100.5 -55t-36 -55q-25 0 -25 21q0 63 50.5 98t125.5 35t128 -56t53 -140q0 -35 -30 -159t-30 -211q0 -174 159 -174 q124 0 254 258q89 175 163 494q-349 113 -349 365q0 134 93 265t223.5 131t189.5 -159q40 -108 40 -262t-44 -338q108 -23 108 -39zM1073 1237q0 252 -116 252q-108 0 -184.5 -118t-76.5 -233q0 -218 313 -322q64 284 64 421z" />
+<glyph unicode="&#x1d718;" horiz-adv-x="981" d="M1007 912q0 -27 -11 -66q-49 -175 -267 -321q-22 -112 -22 -212q0 -200 94 -200q57 0 102.5 97t64.5 97t19 -20q-78 -311 -245 -311q-95 0 -95 185q0 141 49 343l-350 -236q-79 -292 -197 -292q-46 0 -46 56q0 14 7 41q52 204 275 350q22 105 22 201q0 198 -97 198 q-53 0 -102 -100t-67 -100t-18 24q0 8 2 16q71 297 244 297q98 0 98 -180q0 -139 -49 -333l347 233q84 280 190 280q52 0 52 -47z" />
+<glyph unicode="&#x1d719;" horiz-adv-x="1212" d="M1212 642q0 -253 -183.5 -459.5t-433.5 -206.5q-36 0 -69 5q-29 -178 -67 -370q-33 -53 -79 -53q-56 0 -56 54q0 36 40 160l74 223q-286 62 -286 360q0 219 146 479q58 104 91 104q23 0 23 -19q0 -4 -25 -37q-177 -231 -177 -465q0 -260 265 -311q41 140 113 356t114 294 q109 203 259 203q251 0 251 -317zM1157 598q0 244 -216 244q-116 0 -200 -125q-63 -95 -112 -269l-61 -250q-19 -75 -19 -94q0 -11 52 -11q155 0 293 81.5t200.5 207.5t62.5 216z" />
+<glyph unicode="&#x1d71a;" horiz-adv-x="1057" d="M1057 597q0 -228 -173 -424.5t-398 -196.5q-125 0 -212.5 75t-112.5 199q-46 -170 -46 -251q0 -165 130 -215l245 -44q125 -22 125 -126q0 -25 -6 -56h-34q-45 65 -195 65h-35q-23 -1 -35 -1q-131 0 -188 42q-85 61 -85 234q0 139 68.5 382t127.5 349q78 142 209.5 236 t281.5 94t241.5 -104.5t91.5 -257.5zM871 441q41 140 41 235.5t-49 167t-142 71.5q-182 0 -308 -224q-43 -77 -79 -210.5t-36 -226t48.5 -164t141.5 -71.5q260 0 383 422z" />
+<glyph unicode="&#x1d71b;" horiz-adv-x="1471" d="M1530 875q0 -71 -100 -71h-51q-4 -252 -138 -515q-160 -313 -384 -313q-173 0 -189 212q-135 -212 -307 -212q-209 0 -209 299q0 268 159 551q62 110 84 110t22 -23q0 -8 -17 -35q-188 -295 -188 -510q0 -101 37 -166q47 -82 140 -82q155 0 281 200q31 310 108 310 q38 0 38 -45q0 -80 -83 -274q11 -191 152 -191q206 0 318 252q84 189 91 432q-232 3 -460 61q-331 84 -331 240q0 112 129 176q103 51 228 51q441 0 511 -409h89q70 0 70 -48zM904 1264q-98 0 -173 -28q-105 -40 -105 -121q0 -113 286 -162q174 -30 381 -30 q-25 157 -128 249t-261 92z" />
+<glyph unicode="&#x1d71c;" horiz-adv-x="1470" d="M252 6l-158 -6q-27 0 -27 47.5t34 52.5q46 3 92 5q56 7 75 43l666 1208q20 36 52 36h80q31 0 36 -36l158 -1252q121 0 139.5 -6t18.5 -30.5t-9.5 -46t-23.5 -21.5l-264 6l-290 -6q-25 0 -25 41t14.5 50t52.5 9.5t101 7.5l-34 271h-441l-145 -261q44 -17 99 -17 q39 0 39 -41q0 -60 -31 -60zM927 480l-71 550l-302 -550h373z" />
+<glyph unicode="&#x1d71d;" horiz-adv-x="1312" d="M1340 1284q112 -71 112 -214t-109 -245q-97 -93 -245 -123q120 -15 195.5 -83t75.5 -173t-50 -198q-134 -248 -455 -248h-770q-27 0 -27 42.5t22 53.5q10 4 55 4.5t116 5.5l241 1132q-122 0 -146.5 4.5t-24.5 38.5q0 16 9.5 39t23.5 23h734q150 0 243 -59zM1168 1087 q0 155 -123 155h-271q-13 0 -23 -1l-99 -504h232q128 0 206 108t78 242zM1091 475q0 185 -135 185h-319l-111 -559l20 -1h265q133 0 212 126q68 108 68 249z" />
+<glyph unicode="&#x1d71e;" horiz-adv-x="1146" d="M379 6l-285 -6q-27 0 -27 43t24 53q10 4 55 4.5t114 5.5l241 1132q-130 0 -144 4q-27 8 -27 39q0 62 33 62h966q27 0 27 -34v-6l-34 -408q-2 -26 -34 -31q-4 -1 -53 -1q-27 0 -27 44l6 129q0 121 -54.5 163.5t-178.5 42.5h-158q-21 0 -41 -4l-241 -1134q25 -2 92 -2.5 t97 -1.5q27 -7 27 -40q0 -16 -10 -38t-24 -22z" />
+<glyph unicode="&#x1d71f;" horiz-adv-x="1124" d="M1010 0h-903q-37 0 -37 26q0 18 16 48l675 1282q19 36 89.5 36t74.5 -36l135 -1305q0 -4 1 -10q0 -41 -51 -41zM745 238l-77 752l-394 -752h471z" />
+<glyph unicode="&#x1d720;" horiz-adv-x="1251" d="M1256 907l7 114q0 135 -69 183q-55 38 -197 38h-167q-31 0 -48 -4l-106 -491h44q90 0 139.5 25.5t71.5 106.5q6 29 15 63.5t28 34.5h62q28 0 28 -35q0 -2 -105 -500q-5 -24 -52.5 -24t-54.5 11t-7 20t7.5 46.5t7.5 70.5q0 62 -79 77q-25 5 -125 5l-116 -546q20 -2 42 -2 h152q186 0 282 68t170 243l43 110q10 23 25 23h62q27 0 27 -35q0 -18 -178 -485q-9 -24 -25 -24h-1046q-27 0 -27 43t24 53q10 4 55 4.5t114 5.5l241 1132q-40 4 -144 4q-27 0 -27 39q0 62 33 62h1017q11 0 19.5 -14.5t7.5 -25.5l-35 -408q-2 -27 -35 -32h-54q-27 0 -27 44z " />
+<glyph unicode="&#x1d721;" horiz-adv-x="1087" d="M1313 1343q23 0 23 -32t-17 -54l-908 -1149h192q173 0 272.5 67.5t160.5 228.5q13 46 44 136q9 24 75 24q27 0 27 -35q0 -12 -62.5 -242.5t-71.5 -258.5t-26 -28h-926q-23 0 -23 34.5t18 57.5l909 1150h-180q-293 0 -397 -239q-12 -39 -39 -116q-9 -24 -76 -24 q-25 0 -25 35q0 11 49.5 203t57 217t25.5 25h898z" />
+<glyph unicode="&#x1d722;" horiz-adv-x="1493" d="M1428 1337l306 6q25 0 25 -43t-20 -53q-10 -5 -68.5 -5t-105.5 -6l-238 -1132q120 0 145.5 -4.5t25.5 -39.5q0 -16 -10 -38t-24 -22l-309 6l-276 -6q-26 0 -26 42t22 53q10 5 54 5.5t118 5.5l114 542h-505l-115 -544q121 0 146 -4.5t25 -39.5q0 -16 -9.5 -38t-24.5 -22 l-299 6l-285 -6q-27 0 -27 42t22 53q10 5 54 5.5t117 5.5l241 1132q-129 0 -144 4q-27 8 -27 39q0 62 48 62l284 -6l286 6q25 0 25 -43t-14.5 -50.5t-73 -7.5t-105.5 -6l-104 -489h506l104 491q-128 0 -143 4q-27 8 -27 39q0 62 33 62z" />
+<glyph unicode="&#x1d723;" horiz-adv-x="1390" d="M1512 865q0 -358 -219 -620q-233 -279 -581 -279q-236 0 -369 134t-133 370q0 358 224 632t575 274q236 0 369.5 -137t133.5 -374zM1178 582q60 217 60 371t-54 238q-64 99 -193 99q-309 0 -443 -511q-57 -216 -57 -371.5t50 -242.5q63 -108 191 -108q302 0 446 525z M661 860h10l34 -1q26 -1 26 -39q0 -3 -5 -28h329q8 50 19.5 58.5t65.5 8.5q27 0 27 -35l-66 -313q-5 -24 -75 -24q-26 0 -26 40q0 3 5 28h-331q-8 -52 -18 -60t-64 -8q-27 0 -27 35q0 5 65 314q4 20 31 24z" />
+<glyph unicode="&#x1d724;" horiz-adv-x="724" d="M668 1337l297 6q26 0 26 -43t-21 -53q-10 -5 -73 -5t-110 -6l-237 -1132q137 0 151 -4q27 -7 27 -40q0 -17 -9.5 -38.5t-24.5 -21.5l-306 6l-296 -6q-25 0 -25 42.5t23 53.5q10 4 56 4.5t123 5.5l241 1132q-51 0 -154 4q-26 3 -26 39q0 62 48 62z" />
+<glyph unicode="&#x1d725;" horiz-adv-x="1458" d="M1548 1337l125 6q25 0 25 -48t-33 -53q-16 0 -49 -1q-71 -4 -137 -46q-8 0 -463 -373l307 -708q9 -7 74 -11.5t65 -42.5q0 -60 -32 -60l-233 6l-292 -6q-25 0 -25 39q0 56 43 62q48 4 96 9l-226 528l-169 -137l-83 -397h17q47 0 127 -4q27 -4 27 -40q0 -16 -9.5 -38 t-24.5 -22l-299 6l-285 -6q-27 0 -27 42.5t22 53.5q10 4 55 4.5t116 5.5l241 1132q-48 0 -144 4q-27 3 -27 39q0 62 48 62l284 -6l286 6q25 0 25 -43.5t-20 -52.5q-10 -5 -69 -5t-104 -6l-128 -603l732 598q-35 11 -86 11q-27 0 -27 39q0 62 33 62z" />
+<glyph unicode="&#x1d726;" horiz-adv-x="1368" d="M236 6l-142 -6q-27 0 -27 48.5t34 51.5q41 3 82 7q50 9 66 41l637 1208q19 36 50 36h78q34 0 38 -36l128 -1252q18 0 85 -2q51 -2 51 -42q0 -60 -32 -60l-251 6l-293 -6q-27 0 -27 40.5t18 52.5q12 7 50.5 7.5t103.5 7.5l-92 882l-458 -872q24 -10 68.5 -14t45.5 -4 q27 -4 27 -40q0 -16 -10 -38t-24 -22z" />
+<glyph unicode="&#x1d727;" horiz-adv-x="1743" d="M287 6l-193 -6q-27 0 -27 47t34 53l91 4q69 5 73 25l236 1109q-40 4 -145 4q-26 0 -26 39q0 62 33 62h374q34 0 40 -36l177 -1046l617 1046q22 36 55 36h358q25 0 25 -42.5t-15 -50.5t-73.5 -8t-103.5 -6l-240 -1132q35 -4 145 -4q27 0 27 -40q0 -16 -10 -38t-24 -22 l-262 6l-253 -6q-26 0 -26 42t22 53q10 5 54 5.5t118 5.5l239 1136l-714 -1207q-21 -35 -58 -35t-43 35l-200 1182l-234 -1099q32 -13 82.5 -15t60.5 -3q27 -4 27 -40q0 -16 -10 -38t-24 -22z" />
+<glyph unicode="&#x1d728;" horiz-adv-x="1472" d="M1518 1337l195 6q25 0 25 -47.5t-31 -53.5q-46 -2 -104 -6t-62 -23l-252 -1189q-5 -24 -25 -24h-83q-14 0 -22 15l-577 1152l-224 -1049q30 -12 82 -14.5t61 -3.5q27 -4 27 -40q0 -16 -10 -38t-24 -22l-207 6l-193 -6q-27 0 -27 47t34 53l91 4q69 5 73 25l236 1111 q-130 0 -144 2q-27 4 -27 39q0 62 33 62h392q44 0 52 -16l466 -926l174 824q-29 12 -67.5 14t-73.5 3q-26 3 -26 39q0 62 42 62z" />
+<glyph unicode="&#x1d729;" horiz-adv-x="1229" d="M1306 992l14 110v13q-34 5 -122 5h-633q-100 0 -132 -7q-18 -24 -29 -63l-20 -73q-8 -24 -25 -24h-55q-26 0 -26 35q0 10 84 331q6 24 25 24h1053q10 0 19 -15t8 -25l-53 -318q-5 -27 -31 -32h-50q-27 0 -27 39zM463 905h10l37 -1q27 -1 27 -39q0 -3 -11 -57h567 q15 75 19 80q12 16 75 16q27 0 27 -35q0 -3 -75 -354q-5 -25 -41.5 -25t-43.5 2q-21 7 -21 39q0 4 14 56h-568q-16 -75 -21 -81q-12 -15 -76 -15q-27 0 -27 35q0 3 75 355q4 19 33 24zM247 372l-17 -132q0 -6 2 -11q44 -8 135 -8h620q109 0 149 10q20 29 32 79 q24 101 45 101h55q27 0 27 -36q0 -4 -88 -351q-6 -24 -25 -24h-1073q-27 0 -27 35v4l57 340q4 27 31 32h51q26 0 26 -39z" />
+<glyph unicode="&#x1d72a;" horiz-adv-x="1390" d="M1512 865q0 -358 -219 -620q-233 -279 -581 -279q-236 0 -369 134t-133 370q0 358 224 632t575 274q236 0 369.5 -137t133.5 -374zM1178 582q60 217 60 371t-54 238q-64 99 -193 99q-309 0 -443 -511q-57 -216 -57 -371.5t50 -242.5q63 -108 191 -108q302 0 446 525z" />
+<glyph unicode="&#x1d72b;" horiz-adv-x="1495" d="M379 6l-285 -6q-27 0 -27 43t23 53q9 4 54 4.5t116 5.5l241 1132h-17q-47 0 -127 4q-27 3 -27 39q0 62 33 62h1370q26 0 26 -43t-21 -53q-10 -5 -69 -5t-104 -6l-238 -1132h17q47 0 127 -4q27 -4 27 -40q0 -16 -10 -38t-24 -22l-299 6l-286 -6q-26 0 -26 42.5t23 53.5 q9 4 54 4.5t117 5.5l239 1136h-504l-241 -1138h17q47 0 127 -4q27 -4 27 -40q0 -16 -9.5 -38t-24.5 -22z" />
+<glyph unicode="&#x1d72c;" horiz-adv-x="1258" d="M379 6l-285 -6q-27 0 -27 47.5t34 52.5l61 1q33 0 98 5l241 1132q-20 2 -95.5 2t-75.5 41q0 17 10 39.5t23 22.5h703q162 0 262 -69q115 -80 115 -235q0 -105 -51 -199q-139 -257 -487 -257h-262l-102 -479q124 0 144 -4q27 -5 27 -40q0 -17 -9.5 -38.5t-24.5 -21.5z M1161 1105q0 137 -188 137h-181q-14 0 -24 -1l-112 -571h185q141 0 201 56.5t89.5 182.5t29.5 196z" />
+<glyph unicode="&#x1d72d;" horiz-adv-x="1390" d="M1512 865q0 -358 -219 -620q-233 -279 -581 -279q-236 0 -369 134t-133 370q0 358 224 632t575 274q236 0 369.5 -137t133.5 -374zM1217 747q21 119 21 239.5t-54 204.5q-64 99 -193 99q-313 0 -443 -511l-8 -32h677zM518 648q-27 -138 -27 -267t50 -216 q63 -108 191 -108q302 0 446 525q10 33 17 66h-677z" />
+<glyph unicode="&#x1d72e;" horiz-adv-x="1283" d="M1354 902l4 69q0 171 -114 231q-78 40 -263 40h-292q249 -518 249 -530t-10 -22l-565 -555h367q191 0 285 36q131 52 204 201q15 40 48 119q11 25 33 25q43 0 48 -1q23 -6 23 -39.5t-146 -451.5q-8 -24 -25 -24h-1099q-27 0 -27 35q0 18 10 28l564 555l-308 640 q-5 11 -5 25.5t10 37t24 22.5h1099q10 0 19 -14.5t8 -25.5l-34 -408q-2 -26 -31 -31q-3 -1 -49 -1q-27 0 -27 39z" />
+<glyph unicode="&#x1d72f;" horiz-adv-x="1338" d="M711 6l-360 -6q-26 0 -26 46t32 54q105 3 236 8l239 1132q-20 2 -103 2q-131 0 -198 -60.5t-110 -193.5q-9 -34 -31 -101q-9 -24 -25 -24h-51q-27 0 -27 35q0 20 124 421q7 24 25 24h1103q9 0 18 -15t7 -25l-50 -408q-4 -26 -30 -31q-3 -1 -47 -1q-27 0 -27 39 q0 4 7.5 66t7.5 105q0 118 -74 151q-42 18 -131.5 18t-106.5 -4l-240 -1132q91 0 217 -6q26 -5 26 -40q0 -60 -31 -60z" />
+<glyph unicode="&#x1d730;" horiz-adv-x="1438" d="M761 6l-329 -6q-27 0 -27 45.5t34 54.5q90 0 205 6l116 555q21 99 21 183q0 285 -180 285q-134 0 -166 -51l-16 -40q-12 -24 -32 -24h-35q-24 0 -24 29.5t33 95.5q105 212 308 212q162 0 241 -155q60 -120 62 -299q75 181 179 299q138 155 296 155q91 0 144.5 -67.5 t53.5 -168.5t-45 -101h-34q-21 0 -22 20q1 6 1 34q0 61 -143.5 61t-249.5 -178q-77 -131 -114 -306l-114 -541q25 -2 90 -2t98 -2q27 -5 27 -40q0 -17 -9.5 -38.5t-23.5 -21.5z" />
+<glyph unicode="&#x1d731;" horiz-adv-x="1333" d="M966 1337l322 6q25 0 25 -50t-32 -51h-18q-67 0 -187 -6l-43 -199q151 0 271 -76q138 -88 138 -231q0 -184 -196 -311q-173 -114 -368 -114l-42 -201q24 -2 89 -2t101 -2q26 -6 26 -40q0 -17 -9.5 -38.5t-23.5 -21.5l-335 6l-322 -6q-26 0 -26 46t33 54q94 0 206 6 l43 201q-145 0 -262 79q-132 89 -132 227q0 179 189 306q169 114 358 116l43 203q-50 4 -188 4q-26 0 -26 39q0 17 9 39.5t23 22.5zM1165 781q0 145 -153 174l-110 -565q263 45 263 391zM501 561q0 -140 138 -170l109 559q-247 -55 -247 -389z" />
+<glyph unicode="&#x1d732;" horiz-adv-x="1436" d="M1411 1337l184 6q25 0 25 -40.5t-13.5 -50.5t-44.5 -10q-151 0 -195 -51l-357 -416l267 -669q50 -1 136 -6q26 -4 26 -40q0 -60 -33 -60l-263 6l-295 -6q-25 0 -25 40.5t12.5 49.5t57.5 12t72 8l-179 448l-374 -440q31 -12 69.5 -14.5t43.5 -3.5q27 -4 27 -40 q0 -16 -10 -38t-24 -22l-242 6l-184 -6q-25 0 -25 47.5t31 52.5q153 0 211 44q5 1 12 7l427 503l-233 582q-42 5 -74 5t-62 1q-27 3 -27 39q0 17 10 39.5t24 22.5l263 -6l295 6q27 0 27 -41t-13.5 -50t-53.5 -11t-76 -8l145 -364l302 356q-44 17 -112 17q-27 0 -27 39 q0 62 33 62z" />
+<glyph unicode="&#x1d733;" horiz-adv-x="1504" d="M1074 1337l321 6q25 0 25 -49.5t-31 -51.5h-18q-68 0 -189 -6l-176 -839q219 69 298 421q56 249 177 249h195q27 0 27 -35.5t-29 -43.5q-9 -1 -28 -6q-56 -22 -96 -188q-53 -226 -192 -350q-57 -50 -172.5 -94.5t-198.5 -44.5l-43 -201q21 -2 87 -2t101 -2q27 -5 27 -40 q0 -17 -9.5 -38.5t-24.5 -21.5l-333 6l-322 -6q-27 0 -27 45t34 55q83 1 204 6l43 201q-159 22 -255 113.5t-96 246.5q0 42 13 123t13 130t-34 67.5t-34 40.5q0 39 28 39h197q94 0 94 -147q0 -51 -18 -151t-18 -151q0 -175 128 -222l179 842q-48 4 -167 4q-48 0 -48 39 q0 62 33 62z" />
+<glyph unicode="&#x1d734;" horiz-adv-x="1392" d="M1537 985q0 -146 -87 -292q-52 -88 -189.5 -246.5t-187.5 -242.5h81q110 0 126 13t49 95t49 82h51q27 0 27 -36q0 -4 -64.5 -166.5t-71 -177t-20.5 -14.5h-371q-27 0 -27 35q0 2 2 12q28 132 146.5 377.5t134.5 283.5q77 189 77 340q0 250 -255 250q-231 0 -349 -206 q-95 -167 -95 -417q0 -72 10.5 -217.5t10.5 -218.5q0 -239 -46 -239h-380q-28 0 -27 39l7 323q0 32 78 32q24 0 24 -49v-31q-1 -21 -1 -47.5t5 -52.5q39 -10 218 -10q-12 82 -96.5 278t-84.5 321.5t66 248.5q87 162 253 243t363 81h78q211 0 342 -88q154 -102 154 -303z" />
+<glyph unicode="&#x1d735;" horiz-adv-x="1804" d="M1804 1366q0 -10 -4 -18l-689 -1387q-19 -39 -57 -39t-57 39l-689 1387q-4 8 -4 18q0 25 32 25h1436q32 0 32 -25zM1651 1230h-1077l538 -1088z" />
+<glyph unicode="&#x1d736;" horiz-adv-x="1284" d="M1312 903q0 -3 -1 -8q-54 -298 -233 -550v-15q0 -271 54 -271q23 0 62.5 45t61.5 45q43 0 43 -30q0 -61 -69 -102t-140 -41t-137 46.5t-96 119.5q-198 -166 -325 -166q-175 0 -277.5 97.5t-102.5 271.5q0 240 156 427t392 187q174 0 278 -147q94 -131 94 -312 q45 74 143 381q11 34 19.5 44.5t43 10.5t34.5 -33zM695 873q-94 0 -180 -157q-64 -116 -90.5 -229t-26.5 -190q0 -236 157 -236q104 0 279 171q-11 180 -21 360q-30 281 -118 281z" />
+<glyph unicode="&#x1d737;" horiz-adv-x="1222" d="M1252 1207q0 -205 -134 -351q114 -98 114 -284q0 -243 -152 -426.5t-389.5 -183.5t-349.5 206l-121 -574q-5 -22 -60.5 -22t-55.5 36q0 14 15 81t75 359l193 907q52 223 178 367q149 171 358 171q135 0 232 -77.5t97 -208.5zM811 856h-39q-79 0 -87 -30q20 -13 86 -13 t108 33q-30 10 -68 10zM1026 1238q0 174 -145 174q-150 0 -258 -173q-77 -123 -127.5 -340t-78 -365.5t-27.5 -180.5q0 -124 68.5 -214.5t188.5 -90.5q162 0 261 216q79 174 79 359q0 81 -25 145q-80 -40 -182 -40q-187 0 -187 93q0 121 225 121q69 0 126 -15q82 181 82 311 z" />
+<glyph unicode="&#x1d738;" horiz-adv-x="1196" d="M817 -442q-47 0 -47 67v8q4 105 84 394q37 134 37 212q0 228 -47 327q-70 149 -272 149q-163 0 -213 -90q-10 -27 -30 -66q-18 -21 -65 -21t-47 32q0 5 2 12q42 158 133 258q108 119 257 119q169 0 269 -198q70 -138 97 -348q162 439 216 511q15 20 36 20q53 0 54 -32 l-81 -180q-64 -142 -164 -417q-23 -58 -57 -176q-3 -39 -11 -121.5t-40 -237.5q-47 -222 -111 -222z" />
+<glyph unicode="&#x1d739;" horiz-adv-x="1074" d="M1151 1345q0 -59 -39 -98.5t-98.5 -39.5t-99 39t-39.5 98.5t41 98.5q-48 10 -94 10q-191 0 -191 -93q0 -49 127 -176l154 -147q81 -82 123 -164.5t42 -198.5q0 -241 -118 -451q-140 -247 -363 -247q-193 0 -311 88q-133 98 -133 285q0 220 143.5 387.5t361.5 217.5 q-125 220 -125 354q0 239 292 239q124 0 211 -40q116 -53 116 -162zM772 247q51 145 51 288.5t-115 332.5q-209 -70 -293 -379q-34 -125 -34 -220q0 -207 222 -207q103 0 169 185z" />
+<glyph unicode="&#x1d73a;" horiz-adv-x="1034" d="M1095 817q0 -35 -21 -64.5t-54 -29.5t-68 16q-97 44 -244 44t-237 -30q-130 -44 -130 -137q0 -40 25 -72q109 51 272.5 51t163.5 -84q0 -113 -212 -113q-147 0 -232 45q-103 -75 -103 -173q0 -71 132 -110q95 -28 191 -28q200 0 300 71q8 6 32 31t49 25q45 0 45 -49 q0 -28 -47 -86q-120 -148 -414 -148q-156 0 -259 55q-130 70 -130 212t134 253q-44 51 -44 118.5t44 135.5q135 209 479 209q85 0 192 -34q136 -44 136 -108zM705 511q-30 10 -107 10t-152 -27q56 -22 174 -22q73 0 85 39z" />
+<glyph unicode="&#x1d73b;" horiz-adv-x="959" d="M1028 1224q0 -124 -219 -124q-73 0 -111 64q-151 -119 -253 -326t-102 -397q0 -230 190 -295l221 -76q67 -23 108.5 -86t41.5 -150t-70.5 -181t-166.5 -94q-65 0 -141 24q-99 31 -99 79q0 45 37 45h3q129 -62 177 -62q24 0 42.5 27.5t18.5 52.5q0 79 -148 131 q-103 36 -167.5 62.5t-106.5 60.5q-147 116 -147 363t155 506t375 403q-5 35 -5 78q0 173 66 173q51 0 51 -58q0 -26 -13.5 -75t-13.5 -75q58 21 102 21q175 0 175 -91zM899 1215q-18 14 -55 14t-76 -18q16 -25 53 -25q75 0 78 29z" />
+<glyph unicode="&#x1d73c;" horiz-adv-x="1176" d="M1177 711q0 -58 -10 -105l-198 -937q-9 -45 -52 -78t-85.5 -33t-75 28.5t-32.5 67.5q0 16 3 30l196 929q18 85 18 151q0 109 -66 109q-129 0 -245 -181q-24 -37 -32.5 -55t-37.5 -163q-23 -130 -80 -388q-12 -46 -52.5 -78t-86 -32t-76 29.5t-30.5 73.5q0 8 3 22l127 607 q12 57 12 92q0 73 -39 73q-63 0 -93 -112l-35 -146q-13 -21 -36 -21q-54 0 -54 31q0 94 76.5 214t163 120t159 -41t89.5 -118q132 159 291 159q278 0 278 -248z" />
+<glyph unicode="&#x1d73d;" horiz-adv-x="1061" d="M1137 1036q0 -335 -152 -659q-188 -401 -475 -401q-167 0 -253 153q-68 123 -68 305q0 333 153 658q189 401 476 401q167 0 252 -153q67 -122 67 -304zM902 1202q0 206 -90 206q-176 0 -300 -618h335q55 277 55 412zM425 266q0 -205 91 -205q180 0 301 619h-334 q-58 -293 -58 -414z" />
+<glyph unicode="&#x1d73e;" horiz-adv-x="840" d="M844 308q0 -4 -2 -10q-43 -125 -140 -223.5t-205 -98.5t-185 55.5t-77 150.5q0 22 6 51l128 615q9 44 50.5 78t87 34t75 -33t29.5 -79q0 -9 -1 -14l-127 -606q-11 -52 -11 -95q0 -73 39 -73q70 0 127.5 58.5t87.5 133.5q7 27 26 69q15 19 53.5 19t38.5 -32z" />
+<glyph unicode="&#x1d73f;" horiz-adv-x="1193" d="M669 196l9 96q0 129 -148 157l-78 -363q-9 -44 -51.5 -77t-88 -33t-74.5 32t-29 79q0 9 1 14l159 747q9 44 50.5 78t87 34t75 -33t29.5 -79q0 -9 -1 -14l-54 -260q65 35 182.5 146t168.5 148q104 74 197 74q41 0 66.5 -30.5t25.5 -81t-37.5 -99t-87.5 -48.5t-75 31 t-25 74q0 11 5 33q-76 -42 -192 -152t-149 -136q113 -5 201.5 -65t88.5 -166q0 -27 -9.5 -81.5t-9.5 -81.5q0 -78 41 -78q100 0 138 200q3 23 15 60q12 19 39 19q50 0 50 -32q0 -2 -2 -9q-87 -323 -262 -323q-102 0 -179 60.5t-77 159.5z" />
+<glyph unicode="&#x1d740;" horiz-adv-x="1203" d="M1244 -14h-198q-22 0 -47.5 17t-33.5 37l-199 535l-441 -546q-43 -53 -86.5 -53t-69 32.5t-25.5 72.5q0 63 47 107l532 503l-210 563q-32 86 -44 102q-27 39 -93 54q-32 7 -32 36q0 41 64 41q246 0 312 -69q21 -22 40 -73l438 -1174q12 -32 70 -157q1 -28 -24 -28z" />
+<glyph unicode="&#x1d741;" horiz-adv-x="1315" d="M1318 308q0 -95 -76.5 -213.5t-165.5 -118.5q-177 0 -235 123q-113 -123 -248 -123q-112 0 -181 30l-71 -337q-9 -44 -52 -77.5t-85 -33.5t-74.5 28.5t-32.5 67.5q0 16 3 30l248 1163q9 44 50.5 78t87 34t75 -33t29.5 -79q0 -9 -1 -14l-98 -457q-20 -93 -20 -153 q0 -162 132 -162q60 0 127.5 50t94.5 108q4 9 31 146.5t99 465.5q11 45 52.5 78t85.5 33t75 -31.5t31 -73.5q0 -13 -2 -22l-124 -587q-11 -52 -11 -95q0 -72 38 -72q76 0 115 196q3 26 13 64q10 19 50 19t40 -32z" />
+<glyph unicode="&#x1d742;" horiz-adv-x="1194" d="M1279 860q0 -124 -106 -301q-232 -388 -719 -546q-65 -21 -84 -21h-105q-16 0 -27 14q-10 10 -10 22q0 4 1 7l165 780q0 4 1 13q-6 0 -20 -0.5t-22 -0.5q-83 0 -83 48q0 65 37 67l318 17h4q33 0 33 -37q0 -1 -1 -5l-170 -801q273 114 439 440q22 43 59 133l46 158 q15 46 54 79t82.5 33t75.5 -29.5t32 -69.5z" />
+<glyph unicode="&#x1d743;" horiz-adv-x="936" d="M1003 1224q0 -124 -219 -124q-72 0 -111 64q-143 -141 -143 -355q0 -64 13 -103q82 29 150 29q187 0 187 -90q0 -124 -219 -124q-109 0 -192 42q-150 -130 -150 -273q0 -100 141 -157l370 -150q101 -41 101 -164q0 -93 -70 -176.5t-161 -83.5q-64 0 -166.5 29.5 t-102.5 74t39 44.5q3 0 16 -6q119 -56 199 -56q40 0 40 59q0 32 -36 47l-349 141q-96 39 -156 119t-60 188t66 225.5t164 196.5q-90 84 -90 225.5t111 262t261 173.5q0 6 -0.5 19.5t-0.5 20.5q0 180 64 180q42 0 42 -58q0 -26 -7.5 -73t-8.5 -66q45 10 93 10q185 0 185 -91z M873 1215q-18 14 -55.5 14t-76.5 -18q16 -25 51 -25q76 0 81 29zM753 635q-21 14 -64.5 14t-97.5 -18q31 -25 94 -25t68 29z" />
+<glyph unicode="&#x1d744;" horiz-adv-x="1062" d="M1139 584q0 -252 -169.5 -430t-420.5 -178q-180 0 -288.5 98t-108.5 276q0 253 170.5 431t422.5 178q179 0 286.5 -98.5t107.5 -276.5zM890 693q0 180 -152 180q-136 0 -216 -138q-51 -87 -85.5 -247.5t-34.5 -245.5q0 -181 153 -181q136 0 215 137q50 87 85 249.5 t35 245.5z" />
+<glyph unicode="&#x1d745;" horiz-adv-x="1292" d="M1363.5 896.5q20.5 -26.5 20.5 -67t-30.5 -80t-76.5 -39.5h-207q-9 -96 -9 -166q0 -148 89 -360q18 -42 18 -63q0 -54 -46 -100.5t-100 -46.5q-73 0 -112 122q-29 89 -29 184q0 171 54 430h-195l-100 -483q-28 -138 -40 -163q-38 -88 -128 -88q-41 0 -75.5 29t-34.5 64 t51 155l91 214q65 157 100 272h-96q-135 0 -190 -72q-10 -19 -40 -45q-8 -3 -20 -3q-54 0 -54 32q0 8 6 19q148 282 325 282h775q33 0 53.5 -26.5z" />
+<glyph unicode="&#x1d746;" horiz-adv-x="1130" d="M1144 602q0 -243 -148.5 -434.5t-384.5 -191.5q-116 0 -188 78l-83 -385q-10 -44 -52 -77.5t-84.5 -33.5t-75 28.5t-32.5 67.5q0 16 3 30l168 796q42 198 184.5 338.5t336.5 140.5q159 0 257.5 -99t98.5 -258zM894 720q0 153 -112 153q-122 0 -196 -158q-42 -87 -78 -264 l-59 -287q38 -103 148 -103q178 0 261 396q36 171 36 263z" />
+<glyph unicode="&#x1d747;" horiz-adv-x="892" d="M956 870q0 -68 -54 -68q-6 0 -67.5 35.5t-100.5 35.5q-144 0 -265 -89t-121 -227q0 -110 104 -171l287 -167q98 -57 98 -178q0 -98 -72 -185.5t-168 -87.5q-48 0 -104.5 16t-56.5 51q0 42 40 42q19 0 54 -11.5t54 -11.5q44 0 44 67q0 47 -41 71l-262 152 q-173 100 -173 308t177 357.5t402 149.5t225 -89z" />
+<glyph unicode="&#x1d748;" horiz-adv-x="1309" d="M1382.5 896.5q20.5 -26.5 20.5 -66.5t-30.5 -80t-76.5 -40h-178q30 -83 30 -168q0 -232 -182 -399t-417 -167q-176 0 -287 98.5t-111 271.5q0 249 166 413t416 164h596q33 0 53.5 -26.5zM892 616q0 174 -177 174q-152 0 -232.5 -186.5t-80.5 -353.5q0 -190 153 -190 q158 0 257 208q80 169 80 348z" />
+<glyph unicode="&#x1d749;" horiz-adv-x="1172" d="M1235.5 896.5q20.5 -26.5 20.5 -67t-30 -80t-76 -39.5h-335l-81 -606q-7 -51 -49 -89.5t-87.5 -38.5t-78.5 28t-33 60t7 56l172 590h-153q-135 0 -190 -72q-9 -14 -28 -38q-12 -10 -33 -10q-53 0 -53 32q0 6 7 19q147 282 324 282h643q33 0 53.5 -26.5z" />
+<glyph unicode="&#x1d74a;" horiz-adv-x="1064" d="M1079 766q0 -218 -121 -479q-144 -311 -330 -311q-343 0 -343 285q0 101 39 232l73 224q23 73 23 114.5t-23 41.5q-119 0 -168 -191q-4 -24 -19 -67q-11 -21 -36 -21q-54 0 -54 31q0 103 99.5 218.5t194.5 115.5t165.5 -53.5t70.5 -139.5q0 -26 -26 -107l-63 -197 q-40 -136 -40 -239q0 -162 131 -162q156 0 266 339q38 117 38 167.5t-72 112t-72 117.5t41 110t103 54t96 -69q27 -53 27 -126z" />
+<glyph unicode="&#x1d74b;" horiz-adv-x="1360" d="M1434 517q0 -251 -226 -406q-195 -133 -461 -144l-70 -326q-14 -64 -64 -64q-18 0 -37 14t-19 28t5 37l68 315q-200 19 -324 116q-144 113 -144 306q0 252 221 405q190 131 456 144l92 427q14 64 64 64q18 0 37 -14t19 -28t-5 -37l-89 -413q202 -17 330 -115 q147 -113 147 -309zM1187 567q0 267 -248 293l-174 -809q204 19 313 159t109 357zM409 341q0 -259 238 -290l174 807q-199 -23 -305.5 -162.5t-106.5 -354.5z" />
+<glyph unicode="&#x1d74c;" horiz-adv-x="1346" d="M1442 891q0 -21 -16 -40l-468 -547q65 -303 151.5 -481t131 -178t79 59t36.5 59h47q23 0 23 -30q0 -64 -73 -119t-140 -55q-127 0 -192 21q-98 30 -148 117q-68 119 -127 400l-427 -501q-15 -18 -38 -18q-41 0 -41 51q0 22 14 38l467 548q-62 299 -147.5 478.5 t-137.5 179.5q-61 0 -84 -71q-2 -11 -7 -29q-11 -19 -51 -19t-40 32q0 64 72 118.5t138 54.5q128 0 194 -20q99 -30 155.5 -126t120.5 -390l428 499q17 20 38 20q42 0 42 -51z" />
+<glyph unicode="&#x1d74d;" horiz-adv-x="1389" d="M1231.5 679.5q-72.5 61.5 -72.5 117.5t41 110t104.5 54t98 -63.5t34.5 -150t-36 -224.5q-57 -219 -215.5 -380.5t-369.5 -166.5l-72 -335q-14 -64 -64 -64q-18 0 -37 14t-19 28t5 37l69 322q-159 3 -275 82q-133 91 -133 241q0 86 38 211l69 205q23 72 23 114t-23 42 q-112 0 -165 -184q-6 -25 -22 -74q-8 -19 -20 -19h-47q-23 0 -23 29q0 103 99.5 218.5t194.5 115.5t165.5 -53.5t70.5 -139.5q0 -27 -24 -100l-59 -176q-37 -120 -37 -210q0 -180 188 -211l280 1300q14 64 64 64q18 0 37 -14t19 -28t-5 -37l-278 -1293q245 8 416 337 q53 102 53 170q0 50 -72.5 111.5z" />
+<glyph unicode="&#x1d74e;" horiz-adv-x="1354" d="M1112 909.5q51 51.5 121.5 51.5t106 -62t35.5 -158.5t-45 -244.5q-83 -273 -272 -426q-116 -94 -214 -94q-121 0 -189 143q-146 -143 -274 -143t-186 124q-43 93 -43 232q0 236 174 503q70 107 107 107q51 0 50 -51q-4 -3 -38 -61q-171 -293 -171 -405q0 -206 148 -206 q90 0 196 85q0 325 160 325q85 0 85 -96.5t-82 -244.5q51 -69 137 -69q116 0 211.5 103t95.5 220q0 64 -82 134.5t-82 115.5q0 66 51 117.5z" />
+<glyph unicode="&#x1d74f;" horiz-adv-x="1345" d="M1345 940q0 -129 -50 -305q-190 -670 -725 -670q-196 0 -305 80q-145 106 -145 277q0 249 188.5 429.5t460.5 180.5q218 0 274 -211q60 218 60 342q0 313 -303 313q-174 0 -280 -132q92 -24 92 -118q0 -50 -36 -86t-86 -36t-86 36t-36 79.5t34 106.5q125 230 408 230 q244 0 389.5 -137t145.5 -379zM998 606q0 252 -215 252q-182 0 -278 -141q-43 -63 -89 -233.5t-46 -254.5q0 -176 211 -176q182 0 295 164q44 64 83 188t39 201z" />
+<glyph unicode="&#x1d750;" horiz-adv-x="861" d="M922 912q0 -64 -50 -64h-116q-229 0 -302 -285h345q41 0 41 -55.5t-51 -55.5h-358q-19 -106 -19 -159q0 -231 221 -231q47 0 113 36l122 71q39 -4 39 -74q0 -44 -119 -81.5t-179 -37.5q-200 0 -327.5 105.5t-127.5 301.5q0 248 170.5 412t419.5 164h141q37 0 37 -47z" />
+<glyph unicode="&#x1d751;" horiz-adv-x="1209" d="M1333 730q0 -54 -35 -54q-20 0 -62 14q-58 -255 -186 -453q-167 -261 -377 -261q-348 0 -348 259q0 71 15 141l43 202q12 56 12 92q0 73 -39 73q-45 0 -71 -54q-15 -33 -30.5 -109t-27.5 -96t-35 -20q-54 0 -54 31q0 94 76.5 214t170.5 120t171 -56t77 -152q0 -15 -7 -49 l-42 -204q-22 -107 -22 -171.5t22.5 -100t93.5 -35.5q126 0 218 287q24 75 93 398q-337 110 -337 371q0 140 97 258t241.5 118t225.5 -152q65 -122 65 -288q0 -120 -29 -280q81 -1 81 -43zM1058 1208q0 200 -97 200t-156 -92.5t-59 -194.5q0 -191 262 -290q50 251 50 377z " />
+<glyph unicode="&#x1d752;" horiz-adv-x="1178" d="M1219 822q0 -184 -320 -341q-31 -139 -31 -197q0 -113 94 -113q59 0 117 80.5t71 80.5q29 0 29 -28q0 -4 -3 -14q-90 -314 -272 -314q-134 0 -134 195q0 106 34 245l-301 -186q-80 -252 -211 -252q-113 0 -113 122q0 205 316 357q35 144 35 187q0 117 -91 117 q-61 0 -118 -79.5t-66 -79.5q-27 0 -27 27q0 6 2 13q93 317 261 317q137 0 137 -209q0 -69 -34 -226l299 181q72 254 214 254q52 0 82 -41.5t30 -95.5z" />
+<glyph unicode="&#x1d753;" horiz-adv-x="1409" d="M1428 598q0 -252 -219.5 -433t-500.5 -181q-29 0 -49 2l-40 -280q-21 -144 -140 -144q-41 0 -68.5 24.5t-27.5 54.5t39.5 137t78.5 228q-182 37 -289 138t-107 241q0 80 48.5 226t138.5 251q33 39 74.5 39t41.5 -29q0 -9 -29 -40q-83 -93 -128.5 -226.5t-45.5 -191.5 q0 -188 361 -227q119 334 212 480q159 250 370 250q132 0 206 -91.5t74 -227.5zM1325 540q0 82 -60 132t-151 50q-172 0 -301 -168q-63 -84 -85 -158.5t-40 -217.5q272 0 430 82q207 106 207 280z" />
+<glyph unicode="&#x1d754;" horiz-adv-x="1062" d="M636 -390l-225 -12q-199 0 -252 23q-118 51 -118 225q0 137 75 434l44 175q56 220 211.5 362t373.5 142q179 0 286.5 -98.5t107.5 -276.5q0 -252 -169.5 -430t-422 -178t-350.5 179l-25 -100q-20 -81 -20 -123q0 -88 80 -120q37 -15 211 -15h148q114 0 161 -18 q70 -27 70 -104q0 -28 -9 -64q-13 -53 -57 -53q-6 0 -36.5 26t-83.5 26zM890 693q0 180 -152 180q-136 0 -216 -138q-51 -87 -85.5 -247.5t-34.5 -245.5q0 -181 153 -181q136 0 215 137q50 87 85 249.5t35 245.5z" />
+<glyph unicode="&#x1d755;" horiz-adv-x="1452" d="M1515.5 896.5q20.5 -26.5 20.5 -67t-30 -80t-76 -39.5h-57q-17 -232 -156 -463q-164 -271 -373 -271q-121 0 -189 143q-146 -143 -274 -143t-186 124q-43 93 -43 232q0 235 174 503q69 107 107 107q50 0 50 -51v1q-7 0 -105 -178q-104 -191 -104 -289q0 -206 148 -206 q90 0 196 85q0 325 160 325q85 0 85 -96.5t-82 -244.5q51 -69 137 -69q290 0 341 492q-324 7 -541 126q-161 90 -161 206t121.5 189.5t241.5 73.5q195 0 319 -97q121 -95 121 -277v-9h102q33 0 53.5 -26.5zM921 1248q-79 0 -145 -35q-81 -43 -81 -115q0 -90 250 -139 q162 -31 344 -36q-6 156 -107.5 240.5t-260.5 84.5z" />
+<glyph unicode="&#x1d756;" horiz-adv-x="1375" d="M1360 0h-325l-93 278h-520l-93 -278h-316l485 1343h377zM869 498l-187 558l-187 -558h374z" />
+<glyph unicode="&#x1d757;" horiz-adv-x="1349" d="M1185 1039q0 -195 -196 -284v-31q139 -28 212 -108t73 -211q0 -188 -142 -296.5t-405 -108.5h-571v1343h506q267 0 380 -58q143 -74 143 -246zM845.5 885q16.5 38 16.5 80.5t-19 80.5q-35 72 -166 75q-57 2 -159 2h-48v-323h70q188 0 238.5 23.5t67 61.5zM924 315 q22 42 22 104t-28 102q-48 71 -208 73l-240 1v-375h41l209 1q156 3 204 94z" />
+<glyph unicode="&#x1d758;" horiz-adv-x="1123" d="M1094 1109h-622v-1109h-316v1343h938v-234z" />
+<glyph unicode="&#x1d759;" horiz-adv-x="1428" d="M1405 0h-1382l502 1343h377zM1004 232l-295 821l-295 -821h590z" />
+<glyph unicode="&#x1d75a;" horiz-adv-x="1206" d="M1097 0h-941v1343h941v-234h-627v-269h582v-234h-582v-372h627v-234z" />
+<glyph unicode="&#x1d75b;" horiz-adv-x="1222" d="M1163 0h-1097v236l686 873h-653v234h1028v-241l-685 -868h721v-234z" />
+<glyph unicode="&#x1d75c;" horiz-adv-x="1486" d="M1329 0h-315v606h-542v-606h-316v1343h316v-503h542v503h315v-1343z" />
+<glyph unicode="&#x1d75d;" horiz-adv-x="1508" d="M1251 1183.5q180 -187.5 180 -511t-179.5 -512t-497 -188.5t-497 188.5t-179.5 512t179.5 511t496.5 187.5t497 -187.5zM998 1033q-93 110 -241.5 110t-249 -114.5t-100.5 -353.5t98 -357t250.5 -118t250 120t97.5 354t-105 359zM953 545h-397v253h397v-253z" />
+<glyph unicode="&#x1d75e;" horiz-adv-x="958" d="M851 0h-755v212h220v919h-220v212h755v-212h-220v-919h220v-212z" />
+<glyph unicode="&#x1d75f;" horiz-adv-x="1365" d="M472 0h-316v1343h316v-652l503 652h360l-511 -620l539 -723h-385l-409 560l-97 -121v-439z" />
+<glyph unicode="&#x1d760;" horiz-adv-x="1375" d="M1360 0h-328l-350 1027l-350 -1027h-318l492 1343h361z" />
+<glyph unicode="&#x1d761;" horiz-adv-x="1685" d="M1533 0h-313v982l-275 -659h-218l-275 659v-982h-296v1343h377l312 -713l312 713h376v-1343z" />
+<glyph unicode="&#x1d762;" horiz-adv-x="1502" d="M1347 0h-310l-594 984v-984h-287v1343h390l514 -826v826h287v-1343z" />
+<glyph unicode="&#x1d763;" horiz-adv-x="1264" d="M1151 1090h-1042v253h1042v-253zM1106 571h-952v252h952v-252zM1151 0h-1042v253h1042v-253z" />
+<glyph unicode="&#x1d764;" horiz-adv-x="1508" d="M1251 1183.5q180 -187.5 180 -511t-179.5 -512t-497 -188.5t-497 188.5t-179.5 512t179.5 511t496.5 187.5t497 -187.5zM998 1033q-93 110 -241.5 110t-249 -114.5t-100.5 -353.5t98 -357t250.5 -118t250 120t97.5 354t-105 359z" />
+<glyph unicode="&#x1d765;" horiz-adv-x="1486" d="M1329 0h-315v1109h-542v-1109h-316v1343h1173v-1343z" />
+<glyph unicode="&#x1d766;" horiz-adv-x="1296" d="M1234 925q0 -198 -117 -318q-157 -159 -414 -159h-231v-448h-316v1343h555q232 0 363 -88q160 -107 160 -330zM838.5 734q68.5 59 68.5 184.5t-112 171.5q-68 28 -248 28h-75v-443h114q184 0 252.5 59z" />
+<glyph unicode="&#x1d767;" horiz-adv-x="1508" d="M1251 1183.5q180 -187.5 180 -511t-179.5 -512t-497 -188.5t-497 188.5t-179.5 512t179.5 511t496.5 187.5t497 -187.5zM998 1033q-93 110 -241.5 110t-243.5 -108q-76 -87 -98 -245h680q-20 151 -97 243zM411 576q18 -166 105 -271t239.5 -105t239 107t103.5 269h-687z " />
+<glyph unicode="&#x1d768;" horiz-adv-x="1207" d="M1149 0h-1070v243l483 455l-467 407v238h1024v-234h-649l447 -385v-57l-468 -433h700v-234z" />
+<glyph unicode="&#x1d769;" horiz-adv-x="1204" d="M1176 1109h-419v-1109h-316v1109h-419v234h1154v-234z" />
+<glyph unicode="&#x1d76a;" horiz-adv-x="1280" d="M795 358v-358h-314v358q0 267 -96 484q-126 285 -363 294v233q125 -3 233 -57.5t222.5 -204t160.5 -303.5q47 154 161 303.5t222 204t233 57.5v-233q-237 -9 -363 -294q-96 -217 -96 -484z" />
+<glyph unicode="&#x1d76b;" horiz-adv-x="1693" d="M1629 682q0 -247 -166 -387q-81 -69 -190 -108t-267 -50v-150h-314v150q-451 32 -580 324q-43 96 -43 221q0 489 623 537v139h314v-139q459 -26 581 -314q42 -97 42 -223zM1240.5 449.5q61.5 86.5 61.5 231.5q0 302 -296 341v-690q173 31 234.5 117.5zM396 688 q0 -181 88 -266q66 -64 208 -90v691q-155 -24 -225.5 -107.5t-70.5 -227.5z" />
+<glyph unicode="&#x1d76c;" horiz-adv-x="1352" d="M1329 0h-363l-297 465l-304 -465h-344l465 677l-455 666h361l288 -441l296 441h345l-458 -652z" />
+<glyph unicode="&#x1d76d;" horiz-adv-x="1737" d="M1632 981q0 -276 -163 -460.5t-443 -227.5v-293h-310v293q-280 43 -443 227.5t-163 460.5v362h311v-362q0 -362 295 -442v804h310v-804q295 80 295 442v362h311v-362z" />
+<glyph unicode="&#x1d76e;" horiz-adv-x="1497" d="M1465 0h-615v362q126 86 176 170t50 239t-84 263.5t-243.5 108.5t-243.5 -108.5t-84 -263.5t50.5 -239t176.5 -170v-362h-615v234h427v24q-368 160 -368 541q0 249 180 410.5t476.5 161.5t476.5 -161.5t180 -410.5q0 -381 -368 -541v-24h428v-234z" />
+<glyph unicode="&#x1d76f;" horiz-adv-x="1428" d="M1405 1343l-503 -1343h-377l-502 1343h1382zM1004 1111h-590l295 -821z" />
+<glyph unicode="&#x1d770;" horiz-adv-x="1376" d="M1304 775q-221 -52 -221 -316.5t214 -327.5l-89 -192q-151 54 -239 183q-134 -151 -380.5 -151t-381.5 128t-135 362t135 362.5t383 128.5t382 -155q89 122 243 171zM822 461q0 149 -56.5 216.5t-188.5 67.5q-198 0 -198 -283.5t198 -283.5q132 0 188.5 67t56.5 216z" />
+<glyph unicode="&#x1d771;" horiz-adv-x="1295" d="M1221 400q0 -204 -153.5 -321t-364.5 -117q-142 0 -267 66v-468h-296v1386q0 195 144 307.5t331.5 112.5t313.5 -82q146 -96 146 -262q0 -135 -114 -240q120 -43 190 -148t70 -234zM917 404q0 209 -184 209q-78 0 -172 -32l-46 197h4q110 0 181 57q72 58 72 169 q0 61 -43.5 110t-104.5 49q-188 0 -188 -208v-733q98 -51 242 -51q239 0 239 233z" />
+<glyph unicode="&#x1d772;" horiz-adv-x="1505" d="M533 -442q-137 0 -137 135q0 84 87 237t87 233q0 138 -99 342q-112 232 -232 232q-37 0 -124 -43l-55 217q104 34 181 34q380 0 531 -549q171 265 424 527h299q-464 -510 -654 -869q-31 -58 -65 -173.5t-55 -163.5q-71 -159 -188 -159z" />
+<glyph unicode="&#x1d773;" horiz-adv-x="1155" d="M918 773q164 -139 164 -354t-141.5 -331.5t-360.5 -116.5t-355 99q-153 112 -153 322q0 306 316 404q-241 77 -241 257q0 133 125.5 221.5t355.5 88.5q148 0 388 -127v-233h-26q-220 163 -361 163q-180 0 -180 -76q0 -66 164 -144q228 -108 305 -173zM775 408 q0 205 -160 294q-111 -18 -173.5 -99.5t-62.5 -190t50.5 -171.5t150.5 -63q195 0 195 230z" />
+<glyph unicode="&#x1d774;" horiz-adv-x="985" d="M933 46q-198 -71 -390.5 -71t-307.5 50q-160 69 -160 230.5t193 222.5v6q-163 47 -163 198t164 218q118 49 282 49t347 -53v-220h-32q-135 66 -267 66q-186 0 -186 -88q0 -65 85 -81q24 -4 135 -4h103v-188h-139q-101 0 -135 -9q-78 -19 -78 -89q0 -101 218 -101 q165 0 299 86h32v-222z" />
+<glyph unicode="&#x1d775;" horiz-adv-x="1002" d="M1019 -61q0 -191 -158 -288q-130 -81 -334 -81q-33 0 -84 6v222q89 -15 135 -15q180 0 180 97.5t-150 97.5q-230 0 -353 52q-180 78 -180 276q0 379 408 791q-121 24 -273 105l59 220h36q121 -111 277 -111q90 0 194.5 29.5t161.5 81.5h38v-211q-601 -473 -601 -833 q0 -135 135 -161l275 -23q166 -27 217 -159q17 -44 17 -96z" />
+<glyph unicode="&#x1d776;" horiz-adv-x="1297" d="M1165 -440h-298v949q0 115 -18 153q-29 62 -127.5 62t-223.5 -84v-640h-296v679q0 50 -50 50q-14 0 -29 -2l-52 207q76 11 134 11q168 0 241 -108q161 112 340 112t279 -99.5t100 -271.5v-1018z" />
+<glyph unicode="&#x1d777;" horiz-adv-x="1331" d="M1278 609h-79q-14 -258 -131 -429q-143 -209 -402.5 -209t-402.5 209q-117 171 -131 429h-79v201h87q32 233 148 378q141 175 377.5 175t377.5 -175q116 -145 148 -378h87v-201zM884 810q-48 346 -220 346t-217 -346h437zM491 336q62 -158 175.5 -158t173.5 158 q43 112 52 273h-453q9 -162 52 -273z" />
+<glyph unicode="&#x1d778;" horiz-adv-x="757" d="M687 41q-75 -54 -202 -54t-202 48q-88 56 -88 171v502q0 28 -31 22l-53 204q80 11 134 11q106 0 176 -57.5t70 -160.5v-510q0 -27 35 -27t109 51z" />
+<glyph unicode="&#x1d779;" horiz-adv-x="1191" d="M491 0h-296v708q0 28 -31 22l-53 204q80 11 134 11q106 0 176 -57.5t70 -160.5v-206l339 402h351l-350 -416l343 -507h-344l-259 402l-80 -101v-301z" />
+<glyph unicode="&#x1d77a;" horiz-adv-x="1257" d="M1240 -2q-75 -11 -160 -11t-145.5 33.5t-96.5 122.5l-172 426l-316 -569h-300l490 883q-101 262 -182 262q-94 0 -204 -77l-56 221q142 77 270 77q167 0 274 -106q83 -80 153 -254l318 -786q8 -20 23 -20t52 5z" />
+<glyph unicode="&#x1d77b;" horiz-adv-x="1372" d="M1302 41q-76 -54 -215.5 -54t-215.5 69q-108 -100 -250 -100q-102 0 -185 54v-97q0 -103 31.5 -175.5t104.5 -159.5v-20h-334q-98 151 -98 355v1010h296v-675q73 -67 190 -67t184 71v671h296v-706q0 -27 33.5 -27t110.5 51z" />
+<glyph unicode="&#x1d77c;" horiz-adv-x="1202" d="M1130 798q0 -199 -140 -429q-74 -122 -276 -369h-274l-233 692q-12 34 -24 41q-13 6 -60 0l-52 201q77 11 129 11q211 0 280 -206l146 -433q218 284 218 473q0 95 -47 118v26h266q67 -55 67 -125z" />
+<glyph unicode="&#x1d77d;" horiz-adv-x="978" d="M985 -50q0 -191 -158 -288q-131 -81 -334 -81q-37 0 -84 6v222q85 -15 135 -15q180 0 180 98q0 89 -135 97q-241 14 -350 67q-168 82 -168 288q0 131 79 231t206 131v9q-93 21 -156 97.5t-63 171.5q0 183 138 287q124 95 298.5 95t356.5 -53v-220h-32q-135 66 -267 66 q-80 0 -133 -39.5t-53 -124.5t77.5 -137.5t174.5 -52.5h177v-213h-263q-89 0 -160.5 -57.5t-71.5 -148.5t71 -132q51 -29 209.5 -45.5t222.5 -52.5q103 -59 103 -206z" />
+<glyph unicode="&#x1d77e;" horiz-adv-x="1155" d="M1083 461q0 -234 -135.5 -362t-370.5 -128t-370 128.5t-135 361.5t135.5 362t370.5 129t370 -128.5t135 -362.5zM671 197q105 54 105 260q0 229 -119 274q-37 14 -80 14q-90 0 -144 -62.5t-54 -219t52.5 -221t148.5 -64.5q53 0 91 19z" />
+<glyph unicode="&#x1d77f;" horiz-adv-x="1416" d="M1416 722h-231v-505q0 -27 35 -27t109 51l52 -200q-75 -54 -202 -54t-202 48q-88 56 -88 171v516h-268v-722h-296v722h-86q-84 0 -157 -95h-29v205q95 91 230 91h1133v-201z" />
+<glyph unicode="&#x1d780;" horiz-adv-x="1225" d="M140 461q0 233 135.5 362t370 129t370 -128.5t135.5 -358.5t-127.5 -361.5t-352.5 -131.5q-112 0 -235 65v-477h-296v901zM671 180q173 0 173 282.5t-199 282.5q-209 0 -209 -286v-228q99 -51 235 -51z" />
+<glyph unicode="&#x1d781;" horiz-adv-x="946" d="M942 -50q0 -191 -158 -288q-130 -81 -334 -81q-36 0 -84 6v222q87 -15 135 -15q180 0 180 98q0 91 -131.5 96.5t-200.5 28.5q-139 46 -208 166t-69 275q0 232 147 361t383 129q166 0 315 -71v-247h-38q-121 111 -267 111q-113 0 -173 -66.5t-60 -180.5q0 -194 125 -257 q43 -22 174 -45.5t184 -60.5q80 -57 80 -181z" />
+<glyph unicode="&#x1d782;" horiz-adv-x="1281" d="M1273 722h-279q89 -142 89 -261q0 -234 -135 -362t-370 -128t-370.5 128t-135.5 361.5t136 362.5t370 129q73 0 137.5 -14.5t71.5 -14.5h486v-201zM580 178q197 0 197 283.5t-199 283.5t-199 -283.5t201 -283.5z" />
+<glyph unicode="&#x1d783;" horiz-adv-x="1040" d="M1032 722h-331v-505q0 -27 35 -27t109 51l52 -200q-75 -54 -202 -54t-202 48q-88 56 -88 171v516h-166q-84 0 -157 -95h-29v205q95 91 230 91h749v-201z" />
+<glyph unicode="&#x1d784;" horiz-adv-x="1468" d="M1273 708v-199q0 -245 -142 -391.5t-397 -146.5t-397 146.5t-142 391.5v199q0 28 -31 22l-53 204q80 11 134 11q106 0 176 -57.5t70 -160.5v-205q0 -344 243 -344t243 344v205q0 103 70 160.5t176 57.5q54 0 134 -11l-53 -204q-31 6 -31 -22z" />
+<glyph unicode="&#x1d785;" horiz-adv-x="1655" d="M1583 457q0 -258 -274 -395q-137 -69 -332 -88v-414h-298v416q-252 28 -410 131q-197 129 -197 350t197 350q158 104 410 132v124h298v-124q252 -28 409 -131q197 -129 197 -351zM1277 456q0 220 -300 273v-543q300 53 300 270zM379 456q0 -217 300 -270v543 q-300 -53 -300 -273z" />
+<glyph unicode="&#x1d786;" horiz-adv-x="1225" d="M1077 -227q11 0 34 3l52 -207q-75 -11 -144 -11q-111 0 -193 73q-62 55 -121 168l-94 191l-259 -430h-301l414 687l-182 325q-29 52 -93 151q-8 11 -18 11t-49 -7l-52 207q75 11 133.5 11t130 -27.5t100.5 -78.5l189 -329l249 414h301l-404 -670l263 -458q13 -23 44 -23z " />
+<glyph unicode="&#x1d787;" horiz-adv-x="1708" d="M1578 694q0 -645 -576 -715v-419h-296v419q-576 70 -576 715v229h297v-226q0 -205 47 -317q65 -153 232 -195v878h296v-878q167 42 232 195q47 112 47 317v226h297v-229z" />
+<glyph unicode="&#x1d788;" horiz-adv-x="1545" d="M1470 412q0 -141 -63 -259q-96 -180 -339 -180q-183 0 -291 132h-10q-108 -132 -296 -132t-292 121.5t-104 317.5q0 271 215 511h317v-19q-232 -199 -232 -486q0 -239 144 -239q43 0 84 30t41 71v329h256v-329q0 -42 41 -71.5t85 -29.5q144 0 144 239q0 285 -232 486v19 h317q215 -230 215 -511z" />
+<glyph unicode="&#x1d789;" horiz-adv-x="1178" d="M1099 725q0 -161 -47 -313q-137 -441 -539 -441q-190 0 -315.5 108.5t-125.5 299t116.5 325t307.5 134.5q162 0 292 -111v31q1 21 1 31q0 290 -264 290q-113 0 -289 -90h-16v236q176 75 372 75q276 0 398 -153q109 -138 109 -422zM778 557q-85 75 -185 75t-152 -72.5 t-52 -183.5q0 -198 163 -198q189 0 226 379z" />
+<glyph unicode="&#x1d78a;" horiz-adv-x="1019" d="M615 170q170 0 285 107h40v-234q-150 -68 -318 -68q-249 0 -399.5 122t-150.5 365t165 374q142 112 377 112q176 0 326 -69v-235h-40q-128 109 -290 109q-208 0 -245 -183h417v-189h-424q23 -211 257 -211z" />
+<glyph unicode="&#x1d78b;" horiz-adv-x="1186" d="M1178 567h-177q-11 -230 -126 -397q-134 -195 -350 -195q-307 0 -381 284q-7 24 -19.5 27.5t-58.5 -2.5l-52 207q75 11 114 11q190 0 258 -209q39 -119 140.5 -119t146.5 154q29 99 30 239q-49 -1 -92 -1q-284 0 -381 75q-129 100 -129 276t138.5 313t315.5 137 q204 0 322 -196q88 -145 119 -381h182v-223zM525 1165q-79 0 -130 -80t-51 -164q0 -131 189 -131h177q-10 375 -185 375z" />
+<glyph unicode="&#x1d78c;" horiz-adv-x="1243" d="M939 536v-151q0 -170 138 -170q34 0 107 7v-211q-98 -33 -180 -33q-303 0 -315 393q-55 -36 -132 -92q-46 -188 -322 -306l-170 77q68 212 245 341q4 37 4 74q0 156 -32.5 202.5t-115.5 46.5q-19 0 -92 -13v223q119 26 178 26q302 0 309 -391q67 43 142 76 q58 222 332 319l158 -84q-78 -207 -254 -334z" />
+<glyph unicode="&#x1d78d;" horiz-adv-x="1539" d="M1308 832q159 -125 159 -354t-166 -361q-147 -118 -387 -133v-426h-294v429q-230 17 -377 127q-171 128 -171 337t121 351.5t319 142.5q46 0 96 -11l-52 -201q-11 2 -27 2q-79 0 -119 -84q-31 -64 -31 -153q0 -271 241 -312v458q0 131 89.5 216t220.5 85q234 0 378 -113z M1162 487q0 101 -54 181t-151 80q-43 0 -43 -95v-471q248 30 248 305z" />
+<glyph unicode="&#x1d78e;" horiz-adv-x="1225" d="M140 461q0 233 135.5 362t370 129t370 -128.5t135.5 -358.5t-127.5 -361.5t-352.5 -131.5q-112 0 -235 65v-13q0 -265 260 -265q127 0 272 57h36v-211q-162 -39 -351 -39q-513 0 -513 473v422zM671 180q173 0 173 282.5t-199 282.5q-209 0 -209 -286v-228q99 -51 235 -51 z" />
+<glyph unicode="&#x1d78f;" horiz-adv-x="1703" d="M1668 722h-190q71 -142 71 -296.5t-63 -272.5q-97 -180 -339 -180q-183 0 -291 132h-10q-108 -132 -296 -132t-292 121.5t-104 303.5t73 324h-192v201h1633v-201zM1249 418q0 164 -80 304h-635q-80 -141 -80 -304q0 -239 144 -239q43 0 84 30t41 71v229h256v-229 q0 -42 41 -71.5t85 -29.5q144 0 144 239z" />
+<glyph unicode="&#x1d790;" horiz-adv-x="1400" d="M1267 0h-317l-30 281h-517l-158 -281h-326l794 1343h379zM899 495l-59 560l-316 -560h375z" />
+<glyph unicode="&#x1d791;" horiz-adv-x="1373" d="M611 0h-562l310 1343h477q192 0 314 -54q168 -74 168 -239q0 -121 -65 -200q-64 -77 -206 -120l-8 -31q119 -36 171.5 -93t52.5 -161q-2 -242 -218 -356q-169 -89 -434 -89zM791 1123h-168l-75 -323h177q119 0 188 48.5t69 142.5q1 71 -51.5 101.5t-139.5 30.5zM694 595 h-193l-87 -375h194q332 0 333 216q0 84 -61 121.5t-186 37.5z" />
+<glyph unicode="&#x1d792;" horiz-adv-x="1144" d="M1296 1343l-55 -234h-620l-256 -1109h-316l310 1343h937z" />
+<glyph unicode="&#x1d793;" horiz-adv-x="1454" d="M1302 0h-1381l812 1343h377zM965 226l-107 829l-488 -829h595z" />
+<glyph unicode="&#x1d794;" horiz-adv-x="1228" d="M1300 1343l-52 -229h-627l-65 -277h582l-54 -230h-581l-88 -378h627l-52 -229h-941l310 1343h941z" />
+<glyph unicode="&#x1d795;" horiz-adv-x="1244" d="M1328 1343l-54 -233l-915 -880h749l-54 -230h-1096l53 229l917 884h-680l52 230h1028z" />
+<glyph unicode="&#x1d796;" horiz-adv-x="1513" d="M1533 1343l-310 -1343h-317l141 607h-542l-140 -607h-316l310 1343h316l-117 -506h541l118 506h316z" />
+<glyph unicode="&#x1d797;" horiz-adv-x="1536" d="M936 1371q258 0 413.5 -135t155.5 -391.5t-128.5 -478t-356.5 -325.5q-152 -69 -351 -69q-262 0 -415 135.5t-153 393.5q0 368 234.5 619t600.5 251zM1171 822q0 144 -65 230q-72 97 -217.5 97t-254 -103.5t-154.5 -239t-46 -278.5q0 -334 281 -334q150 0 259 108 q197 192 197 520zM1031 800l-58 -256h-397l58 256h397z" />
+<glyph unicode="&#x1d798;" horiz-adv-x="975" d="M1054 1343l-49 -212h-219l-212 -919h219l-49 -212h-755l49 212h219l212 919h-219l49 212h755z" />
+<glyph unicode="&#x1d799;" horiz-adv-x="1390" d="M1535 1343l-661 -621l398 -722h-346l-304 566l-159 -141l-98 -425h-316l309 1343h316l-147 -639l643 639h365z" />
+<glyph unicode="&#x1d79a;" horiz-adv-x="1400" d="M1267 0h-318l-113 1030l-591 -1030h-325l804 1343h360z" />
+<glyph unicode="&#x1d79b;" horiz-adv-x="1716" d="M1737 1343l-310 -1343h-315l223 966l-415 -643h-218l-127 674l-230 -997h-296l310 1343h373l148 -713l476 713h381z" />
+<glyph unicode="&#x1d79c;" horiz-adv-x="1530" d="M1550 1343l-310 -1343h-272l-404 987l-228 -987h-287l310 1343h365l348 -831l191 831h287z" />
+<glyph unicode="&#x1d79d;" horiz-adv-x="1287" d="M1353 1343l-57 -249h-1041l56 249h1042zM1187 821l-57 -249h-951l56 249h952zM1101 249l-58 -249h-1041l57 249h1042z" />
+<glyph unicode="&#x1d79e;" horiz-adv-x="1536" d="M669 -28q-270 0 -420 141q-148 139 -148 382v6q1 365 231.5 617.5t603.5 252.5q270 0 420 -141q149 -141 149 -380q-1 -363 -218 -609q-236 -269 -618 -269zM891 1149q-180 0 -317 -170q-140 -172 -140 -455q0 -161 74 -245q75 -85 207 -85q189 0 322 178t134 451 q0 150 -72 237q-73 89 -208 89z" />
+<glyph unicode="&#x1d79f;" horiz-adv-x="1513" d="M1533 1343l-310 -1343h-317l257 1113h-541l-257 -1113h-316l310 1343h1174z" />
+<glyph unicode="&#x1d7a0;" horiz-adv-x="1320" d="M612 448h-144l-103 -448h-316l310 1343h470q266 0 390 -80q136 -86 136 -282q-1 -278 -246 -419q-198 -114 -497 -114zM1016 944q0 174 -240 174h-153l-102 -443h144q163 0 256.5 69.5t94.5 199.5z" />
+<glyph unicode="&#x1d7a1;" horiz-adv-x="1536" d="M669 -28q-270 0 -420 141q-148 139 -148 382v6q1 365 231.5 617.5t603.5 252.5q270 0 420 -141q149 -141 149 -380q-1 -363 -218 -609q-236 -269 -618 -269zM891 1149q-180 0 -313 -164q-63 -78 -101 -188h694v22v8q0 140 -69 229q-70 93 -211 93zM715 194q189 0 320 175 q72 97 106 218h-705q-2 -29 -2 -63q0 -161 74 -245q75 -85 207 -85z" />
+<glyph unicode="&#x1d7a2;" horiz-adv-x="1229" d="M1320 1343l-53 -229h-654l363 -388l-14 -60l-580 -437h711l-52 -229h-1070l54 235l597 461l-380 412l55 235h1023z" />
+<glyph unicode="&#x1d7a3;" horiz-adv-x="1226" d="M1380 1343l-54 -234h-419l-255 -1109h-317l256 1109h-418l53 234h1154z" />
+<glyph unicode="&#x1d7a4;" horiz-adv-x="1304" d="M484 651q0 470 -311 485l54 233q125 -2 220.5 -56.5t174.5 -204t90 -305.5q82 154 231.5 303.5t269.5 203.5t245 59l-54 -233q-239 -7 -430 -290q-146 -217 -208 -484l-84 -362h-313l82 354q33 146 33 297z" />
+<glyph unicode="&#x1d7a5;" horiz-adv-x="1724" d="M1489 326q-202 -167 -560 -188l-35 -151h-312l35 152q-377 34 -481 264q-33 74 -33 164v5q0 144 53 259q106 233 390 329q141 47 320 58l32 140h313l-33 -141q250 -23 383 -133q132 -108 132 -297q-1 -292 -204 -461zM1364 760q0 119 -64 188q-51 54 -165 78l-162 -696 q200 24 295 137t96 293zM822 1026q-201 -24 -295 -138q-95 -116 -95 -296q0 -99 49 -168q50 -69 180 -93z" />
+<glyph unicode="&#x1d7a6;" horiz-adv-x="1377" d="M1522 1343l-619 -666l320 -677h-343l-204 470l-420 -470h-340l632 690l-315 653h342l201 -445l405 445h341z" />
+<glyph unicode="&#x1d7a7;" horiz-adv-x="1737" d="M207 803q0 82 22 178l83 362h311l-83 -362q-18 -79 -18 -142q0 -239 210 -300l186 804h310l-185 -804q312 80 396 442l84 362h311l-84 -362q-65 -279 -271 -462.5t-493 -225.5l-68 -293h-310l67 293q-215 34 -341.5 165.5t-126.5 344.5z" />
+<glyph unicode="&#x1d7a8;" horiz-adv-x="1524" d="M1498 934q0 -60 -17 -135q-87 -381 -492 -541l-6 -24h428l-55 -234h-614l83 362q142 84 214 168.5t105 231.5q15 67 15 121q0 123 -66 191.5t-189 68.5q-192 0 -312.5 -158t-120.5 -357q0 -144 152 -266l-84 -362h-614l54 234h427l6 24q-262 127 -262 388q0 345 294 564 q217 161 513 161t438 -161q103 -117 103 -276z" />
+<glyph unicode="&#x1d7a9;" horiz-adv-x="1454" d="M1594 1343l-813 -1343h-376l-192 1343h1381zM1141 1111h-590l106 -822z" />
+<glyph unicode="&#x1d7aa;" horiz-adv-x="1376" d="M1072 353q0 -175 151 -222l-134 -192q-139 54 -197 183q-169 -151 -426 -151q-184 0 -290 80q-120 90 -120 267q0 65 18 143q53 231 217 361t413 130t347 -155q118 122 283 171l44 -193q-142 -31 -224 -151t-82 -271zM840 580q0 165 -197 165t-263 -286q-17 -74 -17 -128 q0 -153 150 -153q138 0 208 70.5t103 212.5q16 69 16 119z" />
+<glyph unicode="&#x1d7ab;" horiz-adv-x="1295" d="M1217 498q0 -235 -202 -391q-187 -145 -428 -145q-141 0 -251 66l-108 -468h-296l320 1386q44 192 212 306t372 114q147 0 251 -61q126 -74 126 -210q0 -178 -178 -313q182 -70 182 -284zM828.5 258.5q84.5 87.5 84.5 221t-145 133.5q-79 0 -180 -32v197h4q112 0 196 58 q84 59 109 168q4 17 4 35q0 52 -32 88t-83 36q-188 0 -236 -208l-170 -733q87 -51 225.5 -51t223 87.5z" />
+<glyph unicode="&#x1d7ac;" horiz-adv-x="1505" d="M598 -283q-108 -159 -222 -159t-114 93.5t135.5 263t152.5 248.5q9 41 9 106q0 142 -42 278q-58 190 -166 190q-38 0 -134 -43l-5 217q111 34 189 34q380 0 404 -549q231 265 546 527h299q-591 -518 -855 -869q-42 -56 -103 -172.5t-94 -164.5z" />
+<glyph unicode="&#x1d7ad;" horiz-adv-x="1155" d="M744 1166q-199 0 -199 -93q0 -56 128 -125q184 -98 238 -145q128 -111 128 -270q0 -52 -14 -113q-49 -213 -216 -331t-391 -118q-176 0 -287 67q-135 82 -135 257.5t118.5 311t303.5 189.5q-188 65 -188 210q0 22 6 47q48 199 301 277q107 33 253.5 33t356.5 -127 l-53 -233h-26q-181 163 -324 163zM467 178q123 0 191.5 98t68.5 228.5t-104 197.5q-132 -21 -222.5 -129.5t-90.5 -242.5q0 -152 157 -152z" />
+<glyph unicode="&#x1d7ae;" horiz-adv-x="985" d="M664 742q-209 0 -209 -107q0 -52 82 -64q16 -2 121 -2h103l-44 -188h-178q-198 0 -198 -116q0 -83 196 -83q165 0 319 86h32l-51 -222q-214 -71 -419 -71q-399 0 -399 214.5t253 288.5l1 6q-122 37 -122 156q0 164 187 247q142 62 315.5 62t344.5 -53l-51 -220h-32 q-120 66 -251 66z" />
+<glyph unicode="&#x1d7af;" horiz-adv-x="1002" d="M341 326q0 -98 139 -113t274 -28q144 -37 144 -183q0 -28 -8 -63q-43 -188 -218 -285q-150 -84 -359 -84q-35 0 -82 6l51 222q83 -15 131 -15q206 0 206 122q0 73 -131 73q-467 0 -467 247q0 36 10 81q85 377 591 791q-116 25 -249 105l110 220h36q95 -111 251 -111 q94 0 204 30.5t178 80.5h38l-49 -211q-705 -469 -793 -833q-7 -29 -7 -52z" />
+<glyph unicode="&#x1d7b0;" horiz-adv-x="1297" d="M1253 685q0 -51 -13 -107l-235 -1018h-298l219 949q21 91 21 122q0 93 -121 93q-95 0 -239 -84l-148 -640h-296l157 679q2 9 2 19q0 31 -46 31q-11 0 -24 -2l-4 207q78 11 136 11q168 0 216 -108q187 112 372 112q136 0 218.5 -66t82.5 -198z" />
+<glyph unicode="&#x1d7b1;" horiz-adv-x="1331" d="M504 -29q-204 0 -308 133q-93 119 -93 329q0 86 16 176h-79l46 201h87q87 239 242 384q179 169 411 169q205 0 303.5 -126t98.5 -336q0 -49 -4 -91h87l-46 -201h-79q-76 -267 -239 -438q-190 -200 -443 -200zM922 906q0 250 -144 250q-174 0 -298 -346h437q5 50 5 96z M409 426q0 -248 145 -248q115 0 213 164q67 111 112 267h-453q-17 -97 -17 -183z" />
+<glyph unicode="&#x1d7b2;" horiz-adv-x="757" d="M368 -13q-240 0 -240 164q0 25 7 55l116 502q1 4 1 8q0 19 -27 14l-6 204q82 11 152 11t128.5 -40.5t58.5 -122.5q0 -24 -7 -55l-117 -510q-1 -5 -1 -7q0 -20 31.5 -20t118.5 51l6 -200q-87 -54 -221 -54z" />
+<glyph unicode="&#x1d7b3;" horiz-adv-x="1191" d="M250 716q0 19 -27 14l-5 204q82 11 152 11t128.5 -41t58.5 -123q0 -24 -7 -54l-48 -206l432 402h351l-446 -416l226 -507h-344l-166 402l-104 -101l-69 -301h-296q164 712 164 716z" />
+<glyph unicode="&#x1d7b4;" horiz-adv-x="1257" d="M1083 -2q-79 -11 -162 -11t-136.5 32.5t-69.5 123.5l-74 426l-447 -569h-300l694 883q-40 262 -122 262q-94 0 -222 -77l-5 221q160 77 288 77q165 0 247 -102q66 -82 97 -258l137 -786q3 -20 22 -20q15 0 49 5z" />
+<glyph unicode="&#x1d7b5;" horiz-adv-x="1372" d="M1100 211q0 -21 30 -21t120 51l6 -200q-88 -54 -228 -54t-200 69q-131 -100 -273 -100q-102 0 -172 54q-37 -160 -37 -211q0 -100 73 -221l-5 -20h-334q-37 88 -37 176t21 179l234 1010h296l-156 -675q58 -67 174.5 -67t200.5 71l155 671h296z" />
+<glyph unicode="&#x1d7b6;" horiz-adv-x="1202" d="M1209 829q0 -14 -4 -31q-49 -203 -244 -435q-98 -117 -356 -363h-274l-73 692q-5 44 -35 44q-17 0 -40 -3l-5 201q80 11 131 11q211 0 233 -206l46 -433q334 334 334 527q0 48 -27 64l6 26h266q42 -42 42 -94z" />
+<glyph unicode="&#x1d7b7;" horiz-adv-x="978" d="M790 1159q-92 0 -160 -53.5t-68 -137t71 -126.5q59 -37 141 -37h177l-49 -213h-263q-106 0 -195.5 -74t-89.5 -177q0 -80 87 -104q43 -12 173.5 -15t171.5 -28q89 -54 89 -170q0 -29 -8 -64q-42 -181 -222 -288q-160 -95 -359 -95q-35 0 -82 6l52 225q78 -14 132 -14 q205 0 205 124q0 84 -90 84q-205 0 -303 32q-170 56 -170 215.5t111 290t269 166.5l2 9q-74 17 -119 75t-45 135q0 28 7 59q41 180 194.5 281t329 101t345.5 -53l-51 -220h-32q-119 66 -251 66z" />
+<glyph unicode="&#x1d7b8;" horiz-adv-x="1155" d="M1101 605q0 -65 -18 -144q-53 -231 -217.5 -360.5t-401.5 -129.5q-183 0 -290 80q-120 89 -120 267q0 64 18 143q53 230 217.5 360.5t400.5 130.5q184 0 297.5 -84.5t113.5 -262.5zM793 586q0 159 -151 159q-44 0 -78 -11q-94 -30 -148 -157t-54 -242q0 -157 153 -157 q195 0 260 281q18 78 18 127z" />
+<glyph unicode="&#x1d7b9;" horiz-adv-x="1416" d="M1129 211q0 -21 31.5 -21t119.5 51l5 -200q-88 -54 -220 -54q-240 0 -240 164q0 25 7 55l119 516h-268l-167 -722h-296l167 722h-86q-84 0 -179 -95h-29l47 205q116 91 251 91h1133l-46 -201h-231z" />
+<glyph unicode="&#x1d7ba;" horiz-adv-x="1225" d="M1216 605q0 -66 -18 -144q-51 -224 -208.5 -356.5t-384.5 -132.5q-112 0 -220 65l-110 -477h-296l208 901q53 230 217.5 360.5t401.5 130.5q184 0 290 -80q120 -90 120 -267zM908 587q0 158 -150 158q-209 0 -275 -286l-53 -228q88 -51 223 -51q174 0 238 279 q17 74 17 128z" />
+<glyph unicode="&#x1d7bb;" horiz-adv-x="946" d="M963 630q-95 111 -238.5 111t-224.5 -102t-81 -239t119 -180l221 -51q119 -37 119 -149q0 -31 -9 -70q-43 -187 -218 -285q-151 -84 -359 -84q-36 0 -82 6l51 222q83 -15 131 -15q206 0 206 123q0 66 -116 72q-69 4 -109 8.5t-81 19.5q-192 69 -192 302q0 68 17 139 q55 230 229 360t414 130q165 0 298 -71l-57 -247h-38z" />
+<glyph unicode="&#x1d7bc;" horiz-adv-x="1281" d="M1092 542q0 -40 -9 -81q-51 -230 -216 -360t-402 -130q-184 0 -297.5 85t-113.5 262q0 66 18 143q54 231 217.5 361t401.5 130q73 0 128.5 -14.5t74.5 -14.5h486l-47 -201h-279q38 -96 38 -180zM793 587q0 158 -150 158q-199 0 -265 -286q-17 -74 -17 -124 q0 -157 154 -157q196 0 261 281q17 74 17 128z" />
+<glyph unicode="&#x1d7bd;" horiz-adv-x="1040" d="M645 211q0 -21 31.5 -21t119.5 51l5 -200q-88 -54 -220 -54q-240 0 -240 164q0 25 7 55l119 516h-166q-84 0 -179 -95h-29l47 205q116 91 251 91h749l-46 -201h-331z" />
+<glyph unicode="&#x1d7be;" horiz-adv-x="1468" d="M1358 731q-22 0 -27 -23l-46 -199q-57 -248 -233.5 -393t-429.5 -145q-197 0 -315.5 96t-118.5 287q0 71 33 202t33 160q0 19 -27 14l-6 204q82 11 151.5 11t128.5 -41t59 -123q0 -24 -14 -82l-35 -144q-24 -108 -24 -176q0 -201 182 -201q244 0 323 344l47 205 q23 102 106 160t190 58q55 0 132 -11l-100 -204q-5 1 -9 1z" />
+<glyph unicode="&#x1d7bf;" horiz-adv-x="1655" d="M1629 555q0 -162 -104.5 -288.5t-262.5 -199.5t-363 -93l-95 -414h-298l96 416q-205 23 -336 102q-172 103 -172 282q0 44 12 97q50 220 277 349q183 105 441 133l28 124h298l-28 -124q205 -23 335 -101q172 -103 172 -283zM1317 515q0 169 -244 214l-125 -543 q151 25 249 99q120 91 120 230zM405 398q0 -167 245 -212l125 543q-151 -26 -250 -101q-120 -91 -120 -230z" />
+<glyph unicode="&#x1d7c0;" horiz-adv-x="1225" d="M967 -227q12 0 34 3l4 -207q-79 -11 -146 -11q-111 0 -176 73q-50 55 -83 169l-49 190l-359 -430h-301l573 687l-107 325q-15 54 -58 151q-7 11 -19.5 11t-46.5 -7l-4 207q78 11 134.5 11t123 -27t84.5 -79l113 -329l344 414h301l-558 -670l157 -458q8 -23 39 -23z" />
+<glyph unicode="&#x1d7c1;" horiz-adv-x="1708" d="M187 448q0 102 28 240l56 235h297l-55 -229q-30 -141 -30 -233q0 -225 194 -276l202 878h296l-202 -878q157 37 254 164q76 99 125 274q4 12 70 300h297l-53 -229q-149 -646 -741 -715l-96 -419h-296l96 419q-442 54 -442 469z" />
+<glyph unicode="&#x1d7c2;" horiz-adv-x="1545" d="M1345 950q134 -181 134 -367t-89 -349q-143 -261 -435 -261q-183 0 -260 132h-10q-138 -132 -322 -132q-149 0 -232.5 78t-83.5 225q0 62 17 136q67 292 362 538l181 -129q-109 -102 -182.5 -240t-73.5 -270t103 -132q44 0 91.5 30.5t56.5 70.5l76 329h256l-76 -329 q-2 -9 -2 -16q0 -37 33.5 -61t71.5 -24q107 0 168 143q47 111 47 246.5t-72 252.5z" />
+<glyph unicode="&#x1d7c3;" horiz-adv-x="1178" d="M1116 856q0 -341 -162 -593q-188 -292 -511 -292q-173 0 -287 92.5t-114 261.5q0 206 136 359.5t339 153.5q163 0 281 -111q11 87 11 123q0 229 -237 229q-116 0 -299 -90h-16l25 236q185 75 380 75q231 0 342.5 -107t111.5 -337zM601 632q-115 0 -178 -86t-63 -205 q0 -163 144 -163q190 0 266 379q-76 75 -169 75z" />
+<glyph unicode="&#x1d7c4;" horiz-adv-x="1019" d="M677 753q-208 0 -287 -183h417l-44 -189h-424q-2 -16 -2 -36q0 -175 211 -175q170 0 309 107h40l-54 -234q-166 -68 -348 -68t-299 75q-141 90 -141 276q0 62 16 132q54 236 231 363t424 127q176 0 310 -69l-54 -235h-40q-105 109 -265 109z" />
+<glyph unicode="&#x1d7c5;" horiz-adv-x="1186" d="M364 -25q-249 0 -302 184q-9 31 -13 93q-2 36 -27 36q-15 0 -45 -4l-5 207q75 11 117 11q103 0 149.5 -51.5t61 -164t113.5 -112.5t179 151q53 101 87 242q-49 -1 -92 -1q-203 0 -292 35q-148 57 -148 227q0 200 183.5 369.5t385.5 169.5q314 0 314 -445q0 -61 -7 -132 h182l-51 -223h-177q-64 -230 -218 -398q-179 -194 -395 -194zM759 977q0 188 -120 188q-85 0 -163.5 -98t-78.5 -185q0 -92 163 -92h177q22 107 22 187z" />
+<glyph unicode="&#x1d7c6;" horiz-adv-x="1243" d="M911 314q0 -99 109 -99q35 0 108 7l-48 -211q-105 -33 -188 -33q-240 0 -240 248q0 66 16 145q-71 -40 -154 -92q-89 -188 -392 -306l-152 77q117 213 323 341q44 129 44 224q0 99 -113 99q-21 0 -95 -13l51 223q125 26 184 26q237 0 237 -239q0 -67 -18 -152 q76 42 160 76q109 223 405 319l139 -84q-126 -207 -331 -334q-45 -164 -45 -222z" />
+<glyph unicode="&#x1d7c7;" horiz-adv-x="1539" d="M1535 600q0 -55 -15 -120q-52 -228 -246 -360q-176 -121 -422 -136l-98 -426h-294l99 429q-187 14 -307 95q-145 98 -145 271q0 49 13 106q45 200 199.5 343t352.5 143q47 0 94 -11l-99 -201q-11 2 -26 2q-100 0 -165 -128q-54 -106 -54 -217q0 -172 183 -204l106 458 q30 129 138 215t241 86q188 0 306 -77q139 -90 139 -268zM1225 565q0 183 -153 183q-43 0 -65 -95l-109 -471q256 30 318 305q9 40 9 78z" />
+<glyph unicode="&#x1d7c8;" horiz-adv-x="1225" d="M1216 605q0 -66 -18 -144q-51 -223 -209 -356t-384 -133q-112 0 -220 65q-15 -59 -15 -106q0 -172 211 -172q89 0 209 33q29 11 76 24h36l-49 -211q-171 -39 -360 -39q-424 0 -424 319q0 68 20 154l98 422q54 231 217.5 361t400.5 130q184 0 297.5 -85t113.5 -262z M907 587q0 158 -150 158q-210 0 -275 -286l-52 -228q88 -51 223 -51q173 0 237 279q17 74 17 128z" />
+<glyph unicode="&#x1d7c9;" horiz-adv-x="1545" d="M1479 578q0 -181 -89 -344q-143 -261 -435 -261q-183 0 -260 132h-10q-138 -132 -322 -132q-149 0 -232.5 78t-83.5 225q0 62 17 136q54 232 235 421h313l-4 -19q-40 -29 -79 -76q-178 -214 -178 -430q0 -129 103 -129q44 0 91.5 30.5t56.5 70.5l71 309h256l-71 -309 q-2 -9 -2 -16q0 -37 33.5 -61t71.5 -24q107 0 168 143q47 110 47 217t-28 187q-212 29 -378 106q-235 110 -235 273q0 89 68 135.5t162 46.5q207 0 353 -100q124 -84 245 -273q95 1 196 9l-49 -201q-12 -2 -48 -6q17 -67 17 -138zM789 1129q-55 0 -55 -51q0 -33 60 -68 q117 -67 290 -87q-168 206 -295 206z" />
+<glyph unicode="&#x1d7ca;" horiz-adv-x="1273" d="M387 6l-328 -6v100h185v1142h-185v101h1094l61 -480h-102q-22 198 -72 272q-70 107 -249 107h-262v-429h394l61 -480h-102q-22 198 -72 272q-70 107 -249 107h-32v-612h232v-100z" />
+<glyph unicode="&#x1d7cb;" horiz-adv-x="1070" d="M1020 763h-559q-167 0 -167 -83q0 -20 13.5 -80t13.5 -96v-137q64 28 144 28h300v-142h-361q-46 0 -64.5 -22.5t-18.5 -84.5v-65q0 -353 -46 -510h-223q45 198 45 332v532q0 217 118.5 352.5t332.5 135.5h472v-160z" />
+<glyph unicode="&#x1d7cc;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x1d7cd;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x1d7ce;" horiz-adv-x="1042" d="M889 1129q71 -161 71 -463t-72 -460q-103 -229 -367 -229t-368 231q-71 159 -71 460.5t73 463.5q105 233 368 233t366 -236zM685 474v436q0 192 -14 238q-42 135 -150.5 135t-151.5 -135q-12 -38 -12 -245v-461q0 -173 15 -236q33 -145 151 -145t150 161q12 60 12 252z " />
+<glyph unicode="&#x1d7cf;" horiz-adv-x="1042" d="M532 6l-358 -6v106h228v1054q-115 -34 -258 -34v106q291 0 432 133h50q34 0 34 -32v-1227h238v-106z" />
+<glyph unicode="&#x1d7d0;" horiz-adv-x="1042" d="M105 0v82q0 6 8 16l319 400q209 262 209 468q0 115 -41 194q-52 100 -157 100q-87 0 -152 -58q123 -27 123 -152q0 -66 -44.5 -110.5t-110.5 -44.5t-110 44.5t-44 110.5q0 145 118.5 230t269.5 85q185 0 314.5 -109t129.5 -290q0 -148 -132 -288l-245 -219l-199 -190h210 q199 0 212 12q27 26 48 190h106l-65 -471h-767z" />
+<glyph unicode="&#x1d7d1;" horiz-adv-x="1042" d="M954 380q0 -192 -137 -297.5t-335 -105.5q-154 0 -274 87t-120 235q0 69 48 115.5t117 46.5t116 -47t47 -115q0 -131 -127 -162q81 -62 193 -62q96 0 128 120q16 63 16 198q0 292 -148 292h-102q-27 0 -27 57q0 22 39.5 26t71.5 6q143 17 143 304q0 198 -121 198 q-101 0 -169 -68q56 -8 93 -50t37 -101.5t-43 -102.5t-106 -43t-106.5 42t-43.5 106q0 132 102 219t251 87t261 -62q140 -76 140 -227q0 -118 -76 -209.5t-192 -138.5q142 -31 233 -120.5t91 -227.5z" />
+<glyph unicode="&#x1d7d2;" horiz-adv-x="1042" d="M695 6l-338 -6v106h203v217h-501v107l642 911q13 19 90 19q38 0 38 -38v-892h154v-107h-154v-217h154v-106zM582 430v581l-410 -581h410z" />
+<glyph unicode="&#x1d7d3;" horiz-adv-x="1042" d="M821.5 733.5q115.5 -120.5 115.5 -320.5t-138.5 -318t-348.5 -118q-146 0 -245.5 105t-99.5 252q0 61 41.5 102t102.5 41t102.5 -41.5t41.5 -101.5t-39.5 -103.5t-99.5 -43.5q70 -112 193.5 -112t163.5 124q22 69 22 223q0 348 -119 348q-79 0 -129.5 -30.5t-87 -71.5 t-43.5 -41h-37q-11 0 -22.5 11.5t-11.5 22.5v672q0 27 34 32q225 -66 313 -66t213 40q69 26 84 26q29 0 29 -55q0 -34 -76 -109q-169 -166 -383 -166q-50 0 -95 8v-255q88 66 212 66q192 0 307.5 -120.5z" />
+<glyph unicode="&#x1d7d4;" horiz-adv-x="1042" d="M545 876q196 0 302.5 -123.5t106.5 -325.5t-114.5 -326t-317.5 -124q-434 0 -434 697q0 285 129 474q148 217 420 217q119 0 192 -74.5t73 -193.5q0 -56 -39 -95t-96 -39t-95.5 38t-38.5 93t33.5 92.5t84.5 43.5q-40 46 -114 46q-162 0 -221 -178q-35 -107 -36 -313 q58 91 165 91zM662 356v179q0 133 -10 167q-24 90 -120 90q-150 0 -150 -340q0 -377 140 -377q99 0 129 88q11 32 11 193z" />
+<glyph unicode="&#x1d7d5;" horiz-adv-x="1042" d="M968 1270q0 -6 -143 -200.5t-144 -195.5q-86 -122 -112 -366q-13 -121 -13 -395q0 -57 -38 -96.5t-96 -39.5t-96.5 38.5t-38.5 97.5q0 416 287 803l118 159h-218q-232 0 -246 -14q-27 -28 -48 -189h-106l72 538h108q1 -67 338 -67h376v-73z" />
+<glyph unicode="&#x1d7d6;" horiz-adv-x="1042" d="M954 400q0 -193 -119.5 -308t-308.5 -115t-313.5 93t-124.5 272q0 210 221 339q-165 109 -165 310q0 170 104 272t268.5 102t266.5 -75q115 -84 115 -237q0 -170 -175 -277q231 -145 231 -376zM733 1053q0 98 -58 160.5t-150.5 62.5t-154 -38.5t-61.5 -116.5t75 -126 l246 -159q103 89 103 217zM276 342q0 -116 65.5 -191.5t174.5 -75.5t179.5 54.5t70.5 155.5t-99 165l-262 169q-129 -101 -129 -277z" />
+<glyph unicode="&#x1d7d7;" horiz-adv-x="1042" d="M954 674q0 -281 -117 -470q-139 -227 -403 -227q-128 0 -211 72t-83 198q0 57 39.5 96t96 39t95 -39.5t38.5 -95.5q0 -112 -107 -132q45 -40 132 -40q147 0 199 185q28 101 29 304q-59 -94 -166 -94q-195 0 -301.5 124t-106.5 326t119 323.5t325 121.5q422 0 422 -691z M662 925q0 351 -130 351q-152 0 -152 -325v-150q0 -126 11 -162q25 -86 119 -86q102 0 135 146q17 73 17 226z" />
+<glyph unicode="&#x1d7d8;" horiz-adv-x="1394" d="M1133 1162q101 -170 101 -497t-102 -493q-129 -209 -434.5 -209t-434.5 208q-102 166 -102 494t101 498q128 216 435.5 216t435.5 -217zM1101 276q58 139 58 388t-56 391q-66 167 -222 221q60 -100 60 -294v-645q0 -170 -67 -275q159 51 227 214zM866 337v645 q0 322 -168 322q-171 0 -171 -328v-618q0 -320 171 -320q92 0 136 110q32 79 32 189zM452 358v618q0 199 61 300q-155 -55 -221 -222q-56 -141 -56 -390t57 -388q68 -162 226 -213q-67 106 -67 295z" />
+<glyph unicode="&#x1d7d9;" horiz-adv-x="1394" d="M1050 75q66 0 66 -37.5t-54 -37.5h-704q-52 0 -52 37.5t65 37.5h173v1139q-100 -30 -212 -30q-54 0 -54 38q0 32 43 36q148 14 212 31q108 30 186 103h112q34 0 34 -33v-1284h185zM790 75v1242h-43q-60 -51 -128 -78v-1164h171z" />
+<glyph unicode="&#x1d7da;" horiz-adv-x="1394" d="M1138 970q0 -111 -130 -256q-86 -95 -279 -250t-235 -198h367q115 0 153 48q28 35 44 158h75l-62 -472h-834v74q0 5 10 17l342 407q211 251 211 472q0 146 -29 220q-46 114 -169 114q-85 0 -176 -88q65 -3 108 -49.5t43 -112t-47 -112t-113 -46.5t-113 46.5t-47 112.5 q0 147 122 235.5t274 88.5q213 0 341 -96q144 -107 144 -313zM1063 970q0 259 -263 319q75 -99 75 -309t-144 -420l98 85q234 206 234 325zM502 1055q0 83 -79 86l-71 3q-20 -42 -20 -83t24.5 -65.5t60.5 -24.5t60.5 24.5t24.5 59.5zM861 191h-432l-98 -116h674l20 151 q-58 -35 -164 -35z" />
+<glyph unicode="&#x1d7db;" horiz-adv-x="1394" d="M1167 374q0 -199 -130 -305t-319.5 -106t-325.5 75q-164 92 -164 253q0 70 49 118.5t118.5 48.5t117 -49t47.5 -117t-47 -115.5t-114 -51.5q99 -87 228 -87q154 0 154 341q0 310 -158 310h-94q-37 0 -37 37.5t112 37.5q86 0 127 126q29 87 29 197q0 217 -133 217 q-103 0 -190 -83q62 -4 106 -48.5t44 -107t-43 -106t-106.5 -43.5t-108 43.5t-44.5 106.5q0 156 137 241q117 72 279 72t274 -66q135 -80 135 -228q0 -250 -332 -356q389 -88 389 -355zM1035 1085q0 88 -70 143.5t-182 70.5q52 -78 52 -231t-59 -265q259 102 259 282z M512 1066q0 31 -23 54.5t-56 25.5l-56 3q-17 -38 -17 -76t22.5 -60t55.5 -22q74 0 74 75zM1092 374q0 179 -282 270q46 -95 46 -265q0 -234 -72 -336q143 19 225.5 103.5t82.5 227.5zM459 228.5q26 26.5 26 64t-26 64t-64 26.5t-65 -27t-27 -71.5t26 -88.5l66 4 q38 2 64 28.5z" />
+<glyph unicode="&#x1d7dc;" horiz-adv-x="1394" d="M1132 75q66 0 66 -37.5t-55 -37.5h-596q-55 0 -55 37.5t66 37.5h146v275h-508v85l632 901q30 43 97 43q101 0 101 -76v-878h106q66 0 66 -37.5t-66 -37.5h-106v-275h106zM951 74v1226q-6 4 -30 4t-32 -11l-110 -157v-1062h172zM704 425v604l-424 -604h424z" />
+<glyph unicode="&#x1d7dd;" horiz-adv-x="1394" d="M386 734q136 128 318.5 128t318 -127.5t135.5 -323.5t-150 -322t-358 -126q-176 0 -294.5 97.5t-118.5 270.5q0 60 41.5 102t101.5 42t101.5 -42t41.5 -106t-47 -103.5t-116 -41.5q76 -144 225 -144q188 0 188 350q0 403 -124 403q-81 0 -143 -41q-36 -23 -76 -69.5 t-55 -46.5q-58 0 -58 32v683q0 30 31 30q3 0 8 -2q208 -66 343 -66t340 66q6 2 9 2q27 0 27 -41v-12q0 -34 -92 -104.5t-148 -99.5q-150 -77 -299 -77q-58 0 -150 17v-328zM931 1268q-135 -32 -254 -32t-285 51v-151q88 -16 155.5 -16t185 43t198.5 105zM772 52 q138 33 224.5 131.5t86.5 232.5t-82.5 232.5t-210.5 128.5q58 -105 58 -389q0 -232 -76 -336zM320 256q128 3 128 73.5t-68 70.5t-68 -69q0 -39 8 -75z" />
+<glyph unicode="&#x1d7de;" horiz-adv-x="1394" d="M732 881q224 0 350 -116.5t126 -340.5t-140.5 -342.5t-369.5 -118.5q-295 0 -418 221q-93 169 -93 473.5t131 498.5q150 223 425 223q155 0 269 -59q143 -74 143 -215q0 -57 -39 -96.5t-96 -39.5t-97 39.5t-40 94.5t33.5 93.5t86.5 46.5q-87 61 -229 61q-128 0 -183 -203 q-36 -132 -36 -313q70 93 177 93zM1080 1105q0 38 -19 71q-53 -8 -68 -15q-35 -16 -35 -56q0 -61 61 -61t61 61zM1133 425q0 308 -267 368q56 -86 64 -250q2 -36 2 -105q0 -271 -65 -379q266 75 266 366zM857 438q0 365 -149 365q-153 0 -153 -279v-146q0 -340 143 -340 q107 0 142 157q17 79 17 243zM589 1279q-160 -57 -243.5 -222.5t-83.5 -399.5t55 -376q67 -171 225 -221q-62 108 -62 318v410q0 338 109 491z" />
+<glyph unicode="&#x1d7df;" horiz-adv-x="1394" d="M358 1412q8 -69 379 -69h451v-61q0 -14 -141.5 -201.5t-151.5 -202.5q-166 -257 -166 -775q0 -58 -39.5 -99t-97.5 -41t-98 41t-40 99q0 254 159 529q102 176 334 449h-346q-253 0 -268 -14q-33 -30 -50 -192h-75l73 537h77zM320 1139q52 17 281 17h411q47 61 81 112 h-356q-303 0 -393 51zM529 103q0 -65 62.5 -65t62.5 65q0 330 65 558q-190 -296 -190 -558z" />
+<glyph unicode="&#x1d7e0;" horiz-adv-x="1394" d="M1255 395q0 -207 -181 -327q-157 -105 -371 -105t-369 81q-195 102 -195 297t301 339q-231 134 -231 316.5t160 289.5q139 93 325 93t322 -68q171 -87 171 -249t-244 -285q312 -162 312 -382zM1112 1061q0 123 -141 189q60 -81 60 -184t-57 -184q138 90 138 179z M956 1061q0 109 -74.5 176t-177 67t-183 -45.5t-80.5 -126.5t90 -130l300 -162q125 92 125 221zM1028 127q152 100 152 265t-241 302q-73 42 -444 242q-129 70 -129 189q0 39 11 73q-93 -82 -93 -202t170 -235q80 -54 216 -125l242 -125q158 -86 158 -234q0 -83 -42 -150z M485 122.5q85 -84.5 206.5 -84.5t212.5 65t91 171.5t-119 170.5l-320 173q-156 -103 -156 -282q0 -129 85 -213.5zM413 90q-88 102 -88 242.5t83 245.5q-194 -113 -194 -242q0 -164 199 -246z" />
+<glyph unicode="&#x1d7e1;" horiz-adv-x="1394" d="M1114 1158q94 -169 94 -473.5t-131 -498.5q-150 -223 -425 -223q-155 0 -269 59q-143 74 -143 215q0 57 39 97t95.5 40t97 -40t40.5 -95t-34 -92.5t-86 -45.5q90 -63 229 -63q127 0 182 203q36 132 36 313q-68 -91 -177 -91q-224 0 -349.5 115.5t-125.5 339.5t140 342.5 t369 118.5q296 0 418 -221zM805 63q160 56 244 221.5t84 400t-56 376.5q-67 171 -225 221q61 -106 61 -317v-411q0 -340 -108 -491zM839 819v146q0 339 -143 339q-111 0 -144 -171q-14 -74 -14 -260q0 -334 147 -334q154 0 154 280zM463 873q0 303 64 410 q-265 -75 -265 -373.5t265 -357.5q-64 101 -64 321zM437 237q0 62 -63 62q-59 0 -59 -62q0 -37 17 -69q55 8 69 14q36 15 36 55z" />
+<glyph unicode="&#x1d7e2;" horiz-adv-x="1137" d="M944 1141q79 -164 79 -470t-78 -470q-109 -229 -379.5 -229t-379.5 228q-77 163 -77 469.5t78 470.5q109 230 378.5 230t378.5 -229zM800 255q54 128 54 419.5t-55 414.5q-66 146 -233 146q-87 0 -145 -37q-110 -71 -133 -289q-11 -109 -11 -239q0 -287 53 -412 q63 -151 235 -151t235 148z" />
+<glyph unicode="&#x1d7e3;" horiz-adv-x="1137" d="M948 0h-712v123h279v926h-279v109q149 1 216 38q88 48 96 151h126v-1224h274v-123z" />
+<glyph unicode="&#x1d7e4;" horiz-adv-x="1137" d="M1024 0h-894v180l187 161q91 79 210.5 196t169.5 186q102 138 102 263t-75 183.5t-195 58.5q-185 0 -365 -118v179q169 82 364 82t310 -87q130 -97 130 -279q0 -147 -68.5 -256t-186 -225t-218.5 -204l-206 -179h735v-141z" />
+<glyph unicode="&#x1d7e5;" horiz-adv-x="1137" d="M1005 395q0 -138 -75 -243q-128 -180 -404 -180q-206 0 -390 83v178h3q180 -118 383 -118q149 0 231.5 79t82.5 217t-89 200q-74 50 -227 50h-74v136h56q130 0 211 51q96 61 96 184q0 102 -82 153q-68 43 -187 43q-185 0 -366 -118v178q171 83 371 83q304 0 400 -178 q32 -61 32 -142q0 -110 -77 -192.5t-188 -104.5v-26q49 -8 104 -31q189 -78 189 -302z" />
+<glyph unicode="&#x1d7e6;" horiz-adv-x="1137" d="M1055 382h-199v-382h-158v382h-644v200l647 761h155v-830h199v-131zM698 513v641l-545 -641h545z" />
+<glyph unicode="&#x1d7e7;" horiz-adv-x="1137" d="M845 425q0 267 -362 267q-115 0 -272 -32v683h794v-144h-635v-377q86 8 158 8q217 0 337 -84q149 -103 149 -311t-129 -335.5t-346 -127.5t-385 77v180h3q179 -114 370 -114q150 0 234 82.5t84 227.5z" />
+<glyph unicode="&#x1d7e8;" horiz-adv-x="1137" d="M1044 433q0 -199 -129.5 -330t-326.5 -131t-320 121q-159 156 -159 504.5t162.5 559.5t487.5 211q93 0 154 -19v-161q-73 39 -181 39q-198 0 -315.5 -125t-137.5 -351q88 54 160.5 77.5t167.5 23.5q169 0 281 -79q156 -110 156 -340zM588 105q143 0 215.5 87.5t72.5 243 t-109 233.5q-69 49 -207.5 49t-279.5 -78q-4 -48 -4 -90q0 -258 112 -365q84 -80 200 -80z" />
+<glyph unicode="&#x1d7e9;" horiz-adv-x="1137" d="M124 1199v144h904v-194l-605 -1149h-176l647 1199h-770z" />
+<glyph unicode="&#x1d7ea;" horiz-adv-x="1137" d="M1034 371q0 -185 -139.5 -293.5t-333.5 -108.5t-323 99q-143 108 -143 299q0 233 248 346v15q-111 59 -161.5 126.5t-50.5 169.5q0 165 139 263q123 87 296 87t293 -80q139 -92 139 -258q0 -90 -55.5 -177t-167.5 -138v-16q129 -56 194 -134.5t65 -199.5zM836 1034 q0 107 -80.5 164t-190.5 57t-183 -50q-85 -57 -85 -160q0 -130 152 -206q110 -55 222 -88q165 111 165 283zM863 354q0 95 -43.5 146t-139.5 97q-16 7 -231 87q-187 -103 -187 -303q0 -129 87 -210t217.5 -81t213.5 68t83 196z" />
+<glyph unicode="&#x1d7eb;" horiz-adv-x="1137" d="M1023 753q0 -177 -40 -321q-81 -292 -323 -402q-122 -56 -287 -56q-95 0 -155 19v161q75 -39 182 -39q202 0 317.5 123t134.5 353q-96 -58 -169 -79.5t-159 -21.5q-168 0 -281 79q-156 109 -156 340q0 199 129.5 330t328 131t320.5 -120q158 -155 158 -497zM855 792 q0 261 -110 366q-83 79 -213 79t-203.5 -88.5t-73.5 -243.5t110 -232q69 -49 201 -49q150 0 286 78q1 23 2 42t1 48z" />
+<glyph unicode="&#x1d7ec;" horiz-adv-x="1257" d="M1166 672q0 -172 -30 -307q-59 -262 -258 -349q-102 -44 -252 -44q-288 0 -414 172t-126 526.5t126.5 527t413.5 172.5q151 0 253 -45q199 -89 258 -351q29 -130 29 -302zM821 376q27 99 27 297.5t-26 294.5q-49 180 -196 180t-196 -181q-26 -95 -26 -294t28 -298 q50 -181 194.5 -181t194.5 182z" />
+<glyph unicode="&#x1d7ed;" horiz-adv-x="1257" d="M1090 0h-865v208h283v759h-283v192q145 2 215 37q92 45 105 151h269v-1139h276v-208z" />
+<glyph unicode="&#x1d7ee;" horiz-adv-x="1257" d="M1175 0h-1023v203q274 204 432 360q206 205 206 359q0 101 -64 156.5t-181 55.5q-167 0 -349 -124h-9v279q193 80 432 80t366.5 -104t127.5 -295q0 -238 -253 -478q-79 -75 -163 -140l-158 -121h636v-231z" />
+<glyph unicode="&#x1d7ef;" horiz-adv-x="1257" d="M1140 401q0 -200 -149 -314.5t-418 -114.5t-462 81v276h16q194 -118 386 -118q155 0 230.5 52.5t75.5 160.5q0 66 -30 103q-54 65 -190 68q-62 1 -115 1h-59v214h61q89 0 140 6q108 13 149 73q23 33 23 87.5t-25 84.5q-60 73 -237.5 73t-371.5 -116h-14v271 q209 82 446.5 82t373 -82.5t135.5 -245.5q0 -109 -66 -194.5t-187 -112.5v-39q192 -27 264 -166q24 -48 24 -130z" />
+<glyph unicode="&#x1d7f0;" horiz-adv-x="1257" d="M1194 317h-183v-321h-300v321h-650v239l620 787h330v-807h183v-219zM711 536v558l-438 -558h438z" />
+<glyph unicode="&#x1d7f1;" horiz-adv-x="1257" d="M1146 450q0 -217 -152 -347.5t-415 -130.5t-446 78v277h18q194 -116 365 -116t241 63.5t70 163t-83.5 152t-249.5 52.5q-116 0 -288 -42h-23v743h925v-231h-630v-257q86 5 178.5 5t177.5 -21q312 -78 312 -389z" />
+<glyph unicode="&#x1d7f2;" horiz-adv-x="1257" d="M829 1368q96 0 231 -20v-241h-16q-91 42 -218 42q-179 0 -279.5 -90.5t-125.5 -284.5q95 59 170.5 84.5t161.5 25.5q157 0 262 -75q158 -112 158 -357q0 -214 -142.5 -347t-380.5 -133q-387 0 -502 331q-42 123 -42 294q0 361 169 559q181 212 554 212zM423 639l-2 -95 q0 -218 86 -310q55 -60 141.5 -60t141.5 60q65 73 65 202q0 195 -160 230q-46 10 -110.5 10t-161.5 -37z" />
+<glyph unicode="&#x1d7f3;" horiz-adv-x="1257" d="M126 1112v231h1021v-253l-601 -1090h-350l631 1112h-701z" />
+<glyph unicode="&#x1d7f4;" horiz-adv-x="1257" d="M1178 369q0 -205 -183 -312q-151 -88 -371 -88q-277 0 -421 115q-129 102 -129 272q0 98 56.5 173.5t207.5 138.5v26q-123 58 -175.5 138t-52.5 186q0 180 178 277q144 79 341.5 79t334.5 -66q180 -87 180 -265q0 -93 -57 -165.5t-185 -128.5v-27q146 -57 211 -145 t65 -208zM817 899q19 42 19 114.5t-60.5 115.5t-142.5 43t-145.5 -37t-63.5 -104t33.5 -101t81.5 -55q87 -38 209 -77q50 59 69 101zM497 619q-113 -106 -113 -216.5t74 -169.5t171 -59t156 38q79 52 79 133t-35 118q-53 56 -228 118z" />
+<glyph unicode="&#x1d7f5;" horiz-adv-x="1257" d="M420 -26q-123 0 -231 20v241h17q92 -42 217 -42q253 0 355 187q36 64 53 187q-105 -61 -170.5 -85t-162.5 -24q-157 0 -262 75q-157 112 -157 345.5t150 362.5t385.5 129t371.5 -132q160 -156 160 -505t-171 -545q-186 -214 -555 -214zM829 704l3 96q0 216 -84 308 q-55 60 -144 60q-136 0 -189 -143q-18 -50 -18 -120q0 -239 254 -239q90 0 178 38z" />
+<glyph unicode="&#x1d7f6;" horiz-adv-x="1140" d="M846 1231q103 -114 146.5 -263.5t43.5 -300t-47.5 -301.5t-147.5 -260q-120 -130 -272.5 -130t-275.5 135q-103 115 -146 263t-43 301.5t47 303t148 258.5q120 130 272.5 130t274.5 -136zM765 237q119 180 119 461q0 270 -128 431q-82 104 -186.5 104t-186.5 -105 q-128 -161 -128 -433q0 -278 119 -458q85 -127 196 -127t195 127z" />
+<glyph unicode="&#x1d7f7;" horiz-adv-x="1140" d="M853 134q87 0 87 -67t-79 -67h-568q-80 0 -80 67t88 67h200v927q-111 -96 -228 -96q-73 0 -73 66q0 39 18.5 50.5t62.5 17.5q143 20 239 215q26 53 67 53q66 0 66 -90v-1143h200z" />
+<glyph unicode="&#x1d7f8;" horiz-adv-x="1140" d="M1033 148l-2 -58q0 -60 -22 -75t-67 -15h-744q-91 0 -91 68q0 30 34 59l486 409q252 212 252 402q0 138 -103.5 216.5t-246.5 78.5q-86 0 -158 -45.5t-98 -124.5q30 -26 30 -68t-28 -71t-70 -29t-70 30t-28 75q0 162 133 264.5t300 102.5q201 0 346 -116t145 -313 q0 -219 -240 -439l-435 -365h523v9q0 47 10 65q15 30 67 30q77 0 77 -90z" />
+<glyph unicode="&#x1d7f9;" horiz-adv-x="1140" d="M1050 383q0 -180 -145.5 -293.5t-327.5 -113.5t-318 72q-169 88 -169 251q0 45 27.5 74t70 29t71 -28t28.5 -70t-27 -66q72 -128 314 -128q125 0 224 76t99 198.5t-100.5 197.5t-229.5 75h-100q-88 0 -88 69q0 40 26 54q15 9 42.5 11.5t89.5 6.5q136 9 205 66 q92 76 92 191q0 87 -91 137q-75 41 -169 41q-171 0 -243 -68q19 -24 19 -62t-28 -67.5t-69.5 -29.5t-69.5 30t-28 74q0 138 148 206q112 51 268 51t276 -76q138 -87 138 -234q0 -205 -184 -323q110 -50 179.5 -143t69.5 -208z" />
+<glyph unicode="&#x1d7fa;" horiz-adv-x="1140" d="M1083 437q0 -65 -89 -65h-171v-238h136q88 0 88 -67t-82 -67h-408q-82 0 -82 67t88 67h137v238h-554q-58 0 -73.5 20t-15.5 66.5t20 77.5l501 787q20 31 36.5 38.5t42 7.5t47.5 0.5t33 0.5q49 0 67.5 -20t18.5 -71v-774h171q89 0 89 -68zM700 505v768l-488 -768h488z" />
+<glyph unicode="&#x1d7fb;" horiz-adv-x="1140" d="M907.5 727q124.5 -128 124.5 -314.5t-149 -311.5t-344 -125q-161 0 -288 86q-143 96 -143 250q0 45 27.5 75.5t70.5 30.5t70.5 -29t27.5 -72t-28 -68q71 -139 263 -139q136 0 238.5 87.5t102.5 215.5t-79 218t-200 90q-169 0 -277 -110q-32 -33 -66 -33q-70 0 -70 90v585 q0 53 17.5 71.5t70.5 18.5h591q87 0 87 -67t-87 -67h-528v-417q118 63 264 63q180 0 304.5 -128z" />
+<glyph unicode="&#x1d7fc;" horiz-adv-x="1140" d="M904.5 739.5q125.5 -130.5 125.5 -317t-133.5 -316.5t-322.5 -130q-249 0 -370 229q-94 178 -94 452q0 203 86.5 379t253.5 266q120 65 244.5 65t211 -56.5t86.5 -169.5q0 -45 -27 -74.5t-70 -29.5t-71 28.5t-28 69.5t22 63q-42 35 -120 35q-179 0 -303 -160 q-109 -141 -128 -330q139 127 325.5 127t312 -130.5zM790.5 202q87.5 92 87.5 221t-83.5 220t-204 91t-213.5 -68t-93 -178q0 -11 3.5 -41t1.5 -47q71 -290 285 -290q129 0 216.5 92z" />
+<glyph unicode="&#x1d7fd;" horiz-adv-x="1140" d="M1050 1275q0 -28 -50 -75q-355 -332 -453 -853q-8 -94 -28 -283q-12 -88 -74 -88q-77 0 -77 103q0 307 121 605t334 525h-580v-9q0 -47 -10 -65q-15 -30 -67 -30q-76 0 -76 91v92q0 90 76 90q55 0 70 -35h725q89 0 89 -68z" />
+<glyph unicode="&#x1d7fe;" horiz-adv-x="1140" d="M1050 383q0 -179 -148 -293t-331.5 -114t-332 114.5t-148.5 292.5q0 122 90.5 214t215.5 127q-113 37 -194 111.5t-81 179.5q0 158 150 261q133 91 299 91t307 -97t141 -255q0 -200 -274 -291q125 -36 215.5 -128t90.5 -213zM766 847q101 63 101 165.5t-94.5 161.5 t-202.5 59t-195 -55q-101 -63 -101 -165t94 -161.5t202.5 -59.5t195.5 55zM897 385q0 122 -100.5 197t-226 75t-226.5 -75.5t-101 -197t100.5 -198t226.5 -76.5t226.5 76.5t100.5 198.5z" />
+<glyph unicode="&#x1d7ff;" horiz-adv-x="1140" d="M1030 686q0 -199 -80.5 -375.5t-238.5 -268.5q-114 -66 -242.5 -66t-213.5 48q-106 59 -106 178q0 104 98 104q41 0 69 -28.5t28 -68t-20 -62.5q55 -37 145 -37q173 0 289 164q100 141 115 326q-139 -127 -325.5 -127t-312 130.5t-125.5 318.5t137 316.5t329 128.5 q245 0 363 -231q91 -179 91 -450zM849 921l2 20q0 35 -28.5 100t-54.5 98q-75 94 -199 94t-215 -91.5t-91 -221t83 -221t203 -91.5t214.5 69t94.5 178z" />
+<glyph unicode="&#x1f000;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM793 820l207 39q15 0 66 -24.5t55 -30.5t4 -19t-32.5 -62.5 t-37.5 -60.5q-26 -66 -72 -171h-34q-11 29 -17 32t-25 3t-122 -17q0 1 -6 -5q222 -206 501 -262q24 -5 74 -14q12 -3 22 -22q-143 -37 -196 -37t-64 5q-96 38 -332 278q-5 -5 -5 -8v-210l7 -97q0 -68 -37 -138q-59 39 -59 91l28 141l-2 179l-198 -157q-156 -119 -212 -119 h-54l237 162q135 98 198 197q-5 5 -37.5 5t-63.5 -12q-10 -4 -17 -30q-21 0 -24.5 6.5t-50.5 119t-90 161.5v34h54q1 0 30 -16q1 -1 31.5 -1t206.5 52v79l-119 -14q-30 0 -83 27l202 39v80l-42 136q68 -17 126 -53q-22 -114 -24 -114v1q0 -13 14 -21l136 29q32 -2 73 -27 q-53 -28 -203 -67q-15 -3 -27 -22v-62q2 -3 14 -3zM948 573q36 138 36 170.5t-12 41.5h-124q-14 0 -69 -19v-59q30 -9 46 -6l24 6q63 0 71 -29q-31 -17 -141 -46v-58q9 -12 47 -12zM722 756h-27l-185 -36l64 -193l112 17q15 -4 35 -14v84q-2 6 -7 7q-55 -6 -76.5 -6t-26.5 2 q-15 4 -31 27l142 35v77z" />
+<glyph unicode="&#x1f001;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM690 813l-62 -4q-43 0 -83 31l113 19q76 16 83 48l15 71 q5 29 5 71.5t-17 95.5h54q11 0 42 -23.5t34 -30.5l-60 -176q45 0 96 12.5t58 12.5t69 -18q-21 -35 -116 -54t-117.5 -37t-39.5 -63l-32 -87q22 -5 45 -6l377 60q22 -2 78 -27.5t56 -55.5q0 -2 -19 -47t-21 -57t-14 -181q-25 -355 -122 -355q-5 0 -11 2l-117 161q36 -9 71 -9 h36q44 26 60 92q1 6 13 108q0 95 -2 98l4 81v14q0 42 -10 64q-24 52 -96 52t-168 -24q7 -13 35 -34l-103 -126h146q-19 -22 -90 -33.5t-88 -18.5v-76l125 15q54 0 91 -30q0 -5 -10 -17.5t-16 -12.5l-180 -4q-11 -19 -16 -56l-8 -52q-3 -15 -6 -45q-8 -39 -37 -55 q-1 90 -14 185q-3 3 -8 9q-100 -28 -117 -28t-40.5 13.5t-24.5 28.5q64 10 195 38v79q-53 -14 -86 -14t-67 20q65 7 182 34q9 3 46.5 58t37.5 63v45q-8 5 -23 3l-370 -49v-421q0 -9 -29 -57q-49 15 -49 83l18 194q0 137 -33 205l-13 26v36h37q3 0 26 -14t29 -14h-2 q0 3 247 36q50 48 49 142q-8 6 -36 6zM704 506q-11 -11 -27 -11t-38.5 31t-22.5 42v32h44q25 0 38 -40q9 -24 9 -39q0 -9 -3 -15z" />
+<glyph unicode="&#x1f002;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM1323 673q0 -4 -18.5 -31t-22.5 -37q-24 -48 -39.5 -132 t-40.5 -203q-18 -71 -62 -126.5t-61 -55.5t-23 15q-13 45 -45 134q-21 49 -96 49q-23 0 -428 -35q-3 -1 -14 -24q-7 -21 -33 -58q-30 115 -39 189q-25 205 -96 313l130 -10h4q33 0 177 28v147q0 9 -12 42t-22 36q-1 1 -60.5 11.5t-89.5 42.5q8 0 108 11.5t298 51.5 q186 38 186 40h-1q85 0 85 -32q0 -17 -43 -34.5t-77.5 -22.5t-138.5 -26q30 -32 64 -86l-39 -129q2 -2 16 -2l274 39q22 0 90.5 -39.5t68.5 -65.5zM687 867v-160h29q16 0 97 18v229l-186 -29q60 -40 60 -58zM918 534l55 10q57 0 71 -44q-35 -27 -105 -27t-106.5 28.5 t-36.5 109.5q0 38 7 74q-39 -10 -123 -18q-19 -121 -32 -156q-33 -91 -114 -126v12q14 27 48 107t34 95v51l-177 -29v-18q0 -4 6 -41q15 -90 23 -265l480 49q43 0 70 -25q10 -10 48 -63h30q27 35 51 153.5t24 191t-18.5 86.5t-100.5 14h-185v-147q37 -22 51 -22z" />
+<glyph unicode="&#x1f003;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM864 977l-25 82v19q90 -29 120 -68l-39 -310v-118l6 -2 q170 111 179 197h32q14 0 44 -26t40 -43l-305 -170v-254q0 -18 23 -36q46 -36 137.5 -36t136.5 43.5t84 168.5q2 -84 41 -217q-34 -35 -106.5 -59.5t-134.5 -24.5q-172 0 -213 97q-20 46 -20 50v707zM612 167l18 135q0 15 -6 44l-241 -170q-20 2 -93 77q209 53 351 142v225 q-6 6 -14 6l-177 -53h-1q-27 0 -67 39q63 25 196 62q22 3 53 5q10 14 10 46.5t-19 107.5l-34 139h36q11 0 40.5 -24.5t35 -33t11.5 -28.5l-17 -117v-609q0 -5 -13 -36t-17 -43q-52 17 -52 86z" />
+<glyph unicode="&#x1f004;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM832 1101l-18 -95v-109q4 -3 21 -3l266 32q23 0 81 -33t78 -53 q-82 -84 -99 -105q-53 -65 -53 -113q0 -4 6 -46h-111l-150 -11q-24 -1 -40 8l-3 -317q-9 -75 -20 -148.5t-31 -122.5q-23 45 -23 70v119l7 79v278q0 18 -32 13q-40 0 -184 -12q-22 -39 -29 -62q-7 0 -15 11q-23 53 -32 124.5t-17 99.5l-65 150h11l100 -10q53 0 122 13 l128 23l13 8q1 12 1 24q0 105 -53 261h78q27 0 45 -24t18 -49zM1079 799q0 45 -11 56q-9 9 -40 9q-9 0 -19 -1l-176 -15q-6 0 -18 11v-254h53q-7 0 51 9q160 25 160 185zM739 594v240l-247 -36q17 -73 24 -143q0 -28 5 -86z" />
+<glyph unicode="&#x1f005;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM1408 599q-2 0 -75.5 -18.5t-111.5 -18.5t-53 12 q-43 35 -213 218l-109 123q-69 76 -113 109q18 12 33 12q45 0 71 -43q63 35 63 115q0 11 -1 23h15q28 0 76 -15l19 -22l-142 -124q36 -46 83 -93q37 19 81.5 71.5t52.5 94.5q61 -31 94 -54q-23 -38 -82 -71l-112 -65q142 -177 424 -254zM832 707l102 42q8 0 74 -36l-33 -77 q-14 -31 -14 -59q0 -7 1 -13q15 -14 38 -17l60 -8q55 -8 55 -18q0 -23 -99 -41q-95 0 -95 81l4 78q0 35 -11 57q-52 -12 -75 -31q-18 -109 -26 -130q-30 -79 -107 -110q73 95 73 204q0 51 -18 95h37zM915 374l-99 -28q-9 0 -32.5 10t-29.5 21l216 61q18 -6 51.5 -27.5 t33.5 -41.5q0 -5 -36 -63.5t-46 -77.5l92 -66q60 -51 60 -92q0 -1 -11 -42q-57 30 -189 141q-103 -95 -232 -95h-24q57 25 163 93q35 31 35 36q0 15 -46 49l-85 61q54 -13 161 -55q14 6 31 41.5t17 50.5q0 24 -30 24zM463 402l89 8q15 0 52 -16.5t37 -33.5q0 -4 -9.5 -30.5 t-15.5 -62t-44 -160.5q-26 -59 -75 -79q-33 36 -111 137q102 -22 102 -24h-1q36 0 56 64t20 113t-46 49q-38 0 -133 -70q-19 6 -19 26q0 3 29.5 57t37.5 75.5t8 104.5q59 -34 87 -34t55 24.5t27 48.5v52l-108 28q-134 -153 -285 -212l248 259q-43 42 -103 122h55 q16 0 36 -24l35 -46q48 44 94 196q-6 5 -16 5l-87 -14q-17 0 -64 23q185 66 190.5 66t92.5 -48l-187 -311q9 -9 17 -9l121 39q30 0 74 -48l-88 -109q10 -6 35 -51q-54 -6 -161 -20q-11 -2 -18.5 -15.5t-26.5 -79.5z" />
+<glyph unicode="&#x1f006;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM1428 -117q0 -125 -117 -125h-994q-117 0 -117 125v1398 q0 125 117 125h994q117 0 117 -125v-1398zM1394 -117v1398q0 91 -83 91h-994q-83 0 -83 -91v-1398q0 -91 83 -91h994q83 0 83 91z" />
+<glyph unicode="&#x1f007;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM441 1026l90 -3q117 0 274 25l299 49q23 0 69.5 -20t46.5 -44 t-55 -24l-109 14q-152 0 -361 -35.5t-199 -35.5q-16 0 -54 18t-38 39q0 17 37 17zM878 463q-6 6 -39 6q-18 0 -96 -7q0 -27 -15 -84q-2 2 -15.5 37.5t-26.5 35.5q-26 0 -78.5 -12.5t-83 -12.5t-63.5 34l226 25l-46 89h51q-5 0 32 -15q-2 -19 15 -73q17 2 147 22 q21 23 22 69.5t3 53.5l43 -24q33 -20 33 -29q0 2 -32 -51q6 -6 22.5 -6t52.5 10.5t50.5 10.5t41 -13.5t31.5 -22.5v-16q-11 -11 -28 -11l-104 7q-71 0 -96 -20l-68 -71q4 9 21 68zM576 -127l-10 -52q0 -8 4 -12h-23q-12 0 -15 15q-3 61 -16 180q-2 14 -19 72q20 -3 59 -10 l203 31l2 3v45q-6 6 -40 6t-50 -15q-20 18 -48 104t-45 111q120 6 171 13.5t116.5 24t80.5 16.5q30 0 83 -51q-15 -26 -45 -83q-16 -42 -66 -120q-24 21 -49.5 21t-65.5 -17v-44q8 -5 22 -3l254 28h2q21 0 86 -43q-16 -34 -32 -146.5t-79 -166.5q-23 31 -97 112 q60 -10 69 -10q51 0 51 87v94q-17 24 -55 24q-135 0 -228 -27v-56q13 -12 32 -12t57 19q-11 8 -11 33q25 -3 60 -29.5t35 -54.5t-24 -28q-11 0 -33 24.5t-29 28.5l-208 -60q-14 -4 -29.5 10t-18.5 28q44 7 130 25q1 3 1 8v40q-3 19 -27.5 19t-147.5 -12l-13 -4v-92zM826 296 l23 6q26 0 36 -26q-25 -17 -81 -31v-45h64q30 0 48 41.5t18 65.5t-8 48h-122v-52q13 -7 22 -7zM760 340l-77 -13q-7 0 -27 10l24 -158q52 5 81 15v48q-45 3 -50 0q-7 6 -17 19q2 1 67 21q-2 53 -1 58z" />
+<glyph unicode="&#x1f008;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM1007 1221l-175 -29q-99 -17 -151 -17t-107 44l372 58h6 q46 0 70 -40q0 -14 -15 -16zM1105 913q27 0 78 -17.5t51 -48.5t-23 -29l-275 18q-23 1 -50 1q-128 0 -336 -31q-64 -9 -70 -9q-63 0 -86 48q29 12 58 12h124zM878 463q-6 6 -39 6q-18 0 -96 -7q0 -27 -15 -84q-2 2 -15.5 37.5t-26.5 35.5q-26 0 -78.5 -12.5t-83 -12.5 t-63.5 34l226 25l-46 89h51q-5 0 32 -15q-2 -19 15 -73q17 2 147 22q21 23 22 69.5t3 53.5l43 -24q33 -20 33 -29q0 2 -32 -51q6 -6 22.5 -6t52.5 10.5t50.5 10.5t41 -13.5t31.5 -22.5v-16q-11 -11 -28 -11l-104 7q-71 0 -96 -20l-68 -71q4 9 21 68zM576 -127l-10 -52 q0 -8 4 -12h-23q-12 0 -15 15q-3 61 -16 180q-2 14 -19 72q20 -3 59 -10l203 31l2 3v45q-6 6 -40 6t-50 -15q-20 18 -48 104t-45 111q120 6 171 13.5t116.5 24t80.5 16.5q30 0 83 -51q-15 -26 -45 -83q-16 -42 -66 -120q-24 21 -49.5 21t-65.5 -17v-44q8 -5 22 -3l254 28h2 q21 0 86 -43q-16 -34 -32 -146.5t-79 -166.5q-23 31 -97 112q60 -10 69 -10q51 0 51 87v94q-17 24 -55 24q-135 0 -228 -27v-56q13 -12 32 -12t57 19q-11 8 -11 33q25 -3 60 -29.5t35 -54.5t-24 -28q-11 0 -33 24.5t-29 28.5l-208 -60q-14 -4 -29.5 10t-18.5 28q44 7 130 25 q1 3 1 8v40q-3 19 -27.5 19t-147.5 -12l-13 -4v-92zM826 296l23 6q26 0 36 -26q-25 -17 -81 -31v-45h64q30 0 48 41.5t18 65.5t-8 48h-122v-52q13 -7 22 -7zM760 340l-77 -13q-7 0 -27 10l24 -158q52 5 81 15v48q-45 3 -50 0q-7 6 -17 19q2 1 67 21q-2 53 -1 58z" />
+<glyph unicode="&#x1f009;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM1047 1281q-23 -17 -48 -24.5t-135 -27t-164.5 -19.5t-97.5 30 l383 79q20 -4 62 -15v-23zM708 984q-23 0 -85 30l295 58q68 -6 94 -37q-20 -21 -34 -22q-33 -1 -95 -6q-177 -21 -177 -23h2zM1245 767q0 -21 -37 -23q-3 0 -44 8q-74 13 -221 13t-315.5 -24.5t-159.5 -24.5q-49 0 -85 44l738 79q51 0 87.5 -22.5t36.5 -49.5zM878 463 q-6 6 -39 6q-18 0 -96 -7q0 -27 -15 -84q-2 2 -15.5 37.5t-26.5 35.5q-26 0 -78.5 -12.5t-83 -12.5t-63.5 34l226 25l-46 89h51q-5 0 32 -15q-2 -19 15 -73q17 2 147 22q21 23 22 69.5t3 53.5l43 -24q33 -20 33 -29q0 2 -32 -51q6 -6 22.5 -6t52.5 10.5t50.5 10.5t41 -13.5 t31.5 -22.5v-16q-11 -11 -28 -11l-104 7q-71 0 -96 -20l-68 -71q4 9 21 68zM576 -127l-10 -52q0 -8 4 -12h-23q-12 0 -15 15q-3 61 -16 180q-2 14 -19 72q20 -3 59 -10l203 31l2 3v45q-6 6 -40 6t-50 -15q-20 18 -48 104t-45 111q120 6 171 13.5t116.5 24t80.5 16.5 q30 0 83 -51q-15 -26 -45 -83q-16 -42 -66 -120q-24 21 -49.5 21t-65.5 -17v-44q8 -5 22 -3l254 28h2q21 0 86 -43q-16 -34 -32 -146.5t-79 -166.5q-23 31 -97 112q60 -10 69 -10q51 0 51 87v94q-17 24 -55 24q-135 0 -228 -27v-56q13 -12 32 -12t57 19q-11 8 -11 33 q25 -3 60 -29.5t35 -54.5t-24 -28q-11 0 -33 24.5t-29 28.5l-208 -60q-14 -4 -29.5 10t-18.5 28q44 7 130 25q1 3 1 8v40q-3 19 -27.5 19t-147.5 -12l-13 -4v-92zM826 296l23 6q26 0 36 -26q-25 -17 -81 -31v-45h64q30 0 48 41.5t18 65.5t-8 48h-122v-52q13 -7 22 -7z M760 340l-77 -13q-7 0 -27 10l24 -158q52 5 81 15v48q-45 3 -50 0q-7 6 -17 19q2 1 67 21q-2 53 -1 58z" />
+<glyph unicode="&#x1f00a;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM434 1259l73 -14l588 64q14 0 62.5 -30.5t48.5 -49.5 q0 -3 -21.5 -36t-27.5 -49q-2 -16 -15 -80l-33 -160q-27 -111 -92 -167q-13 10 -15 19q-23 91 -35 104.5t-74 13.5l-305 -28q-15 0 -43 7q-9 -14 -14 -38h-12q-13 0 -15 15q-10 92 -34 275q-5 32 -26.5 85t-21.5 48q0 21 12 21zM878 463q-6 6 -39 6q-18 0 -96 -7 q0 -27 -15 -84q-2 2 -15.5 37.5t-26.5 35.5q-26 0 -78.5 -12.5t-83 -12.5t-63.5 34l226 25l-46 89h51q-5 0 32 -15q-2 -19 15 -73q17 2 147 22q21 23 22 69.5t3 53.5l43 -24q33 -20 33 -29q0 2 -32 -51q6 -6 22.5 -6t52.5 10.5t50.5 10.5t41 -13.5t31.5 -22.5v-16 q-11 -11 -28 -11l-104 7q-71 0 -96 -20l-68 -71q4 9 21 68zM576 -127l-10 -52q0 -8 4 -12h-23q-12 0 -15 15q-3 61 -16 180q-2 14 -19 72q20 -3 59 -10l203 31l2 3v45q-6 6 -40 6t-50 -15q-20 18 -48 104t-45 111q120 6 171 13.5t116.5 24t80.5 16.5q30 0 83 -51 q-15 -26 -45 -83q-16 -42 -66 -120q-24 21 -49.5 21t-65.5 -17v-44q8 -5 22 -3l254 28h2q21 0 86 -43q-16 -34 -32 -146.5t-79 -166.5q-23 31 -97 112q60 -10 69 -10q51 0 51 87v94q-17 24 -55 24q-135 0 -228 -27v-56q13 -12 32 -12t57 19q-11 8 -11 33q25 -3 60 -29.5 t35 -54.5t-24 -28q-11 0 -33 24.5t-29 28.5l-208 -60q-14 -4 -29.5 10t-18.5 28q44 7 130 25q1 3 1 8v40q-3 19 -27.5 19t-147.5 -12l-13 -4v-92zM669 1173l-4 45l4 5q-28 -1 -165 -14l35 -327h76l310 45q17 -1 49.5 -31t35.5 -32q19 19 49 139.5t30 173.5t-18.5 64 t-62.5 11l-162 -15q19 -11 49 -34q-17 -86 -17 -111t13.5 -31t37.5 -6l56 7q38 0 55 -37q-8 -9 -13 -12q-51 -15 -88 -15q-113 0 -113 101l4 80q0 59 -50 59q-2 0 -35.5 -4t-50.5 -4q5 -10 20 -25.5t15 -36.5t-26 -78.5t-46.5 -86t-53.5 -45.5l-24 -13q-8 0 -6.5 -1.5 t5.5 16.5q91 104 91 213zM826 296l23 6q26 0 36 -26q-25 -17 -81 -31v-45h64q30 0 48 41.5t18 65.5t-8 48h-122v-52q13 -7 22 -7zM760 340l-77 -13q-7 0 -27 10l24 -158q52 5 81 15v48q-45 3 -50 0q-7 6 -17 19q2 1 67 21q-2 53 -1 58z" />
+<glyph unicode="&#x1f00b;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM1040 831l113 8q78 0 113 -59q-14 -2 -37 -8l-335 -4l-208 -31 q-12 -4 -36 9t-26 32l152 12q8 6 12 20q54 168 54 190.5t-10 22.5l-60 -11q-28 0 -53 15q0 9 4 12q40 4 117 20q12 3 26 53q13 42 13 90q0 10 -1 20l-102 31v13l298 67q25 -5 54 -21v-17q-39 -18 -110.5 -34t-90.5 -22q25 -37 25 -34.5t-43 -126.5q34 0 81.5 14.5t54.5 14.5 t45 -22t38 -36q0 -3 -22 -35q-39 -59 -66 -183zM715 1363q0 -11 -56.5 -91t-56.5 -76q0 14 9 -18t9 -53l-4 -157q0 -3 -17 -226q-7 -101 -32 -101q-16 0 -26 29.5t-10 52.5l43 376q0 17 -6 40l-104 -99q-56 -52 -102 -55q216 233 253 365q3 12 9 63q1 10 15 16 q76 -35 76 -66zM878 463q-6 6 -39 6q-18 0 -96 -7q0 -27 -15 -84q-2 2 -15.5 37.5t-26.5 35.5q-26 0 -78.5 -12.5t-83 -12.5t-63.5 34l226 25l-46 89h51q-5 0 32 -15q-2 -19 15 -73q17 2 147 22q21 23 22 69.5t3 53.5l43 -24q33 -20 33 -29q0 2 -32 -51q6 -6 22.5 -6 t52.5 10.5t50.5 10.5t41 -13.5t31.5 -22.5v-16q-11 -11 -28 -11l-104 7q-71 0 -96 -20l-68 -71q4 9 21 68zM576 -127l-10 -52q0 -8 4 -12h-23q-12 0 -15 15q-3 61 -16 180q-2 14 -19 72q20 -3 59 -10l203 31l2 3v45q-6 6 -40 6t-50 -15q-20 18 -48 104t-45 111 q120 6 171 13.5t116.5 24t80.5 16.5q30 0 83 -51q-15 -26 -45 -83q-16 -42 -66 -120q-24 21 -49.5 21t-65.5 -17v-44q8 -5 22 -3l254 28h2q21 0 86 -43q-16 -34 -32 -146.5t-79 -166.5q-23 31 -97 112q60 -10 69 -10q51 0 51 87v94q-17 24 -55 24q-135 0 -228 -27v-56 q13 -12 32 -12t57 19q-11 8 -11 33q25 -3 60 -29.5t35 -54.5t-24 -28q-11 0 -33 24.5t-29 28.5l-208 -60q-14 -4 -29.5 10t-18.5 28q44 7 130 25q1 3 1 8v40q-3 19 -27.5 19t-147.5 -12l-13 -4v-92zM1018.5 992q7.5 32 7.5 39t-5 13h-78q-6 0 -22.5 -7.5t-18.5 -11.5 l-59 -224h22l113 15q25 58 29 101t11.5 75zM826 296l23 6q26 0 36 -26q-25 -17 -81 -31v-45h64q30 0 48 41.5t18 65.5t-8 48h-122v-52q13 -7 22 -7zM760 340l-77 -13q-7 0 -27 10l24 -158q52 5 81 15v48q-45 3 -50 0q-7 6 -17 19q2 1 67 21q-2 53 -1 58z" />
+<glyph unicode="&#x1f00c;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM852 1310q36 -30 36 -65t-33 -35q-26 0 -76 50t-60 80h72 q25 0 61 -30zM1096 1146q31 0 76 -15.5t45 -40t-64 -25.5l-178 7q-23 1 -47 1q-119 0 -260 -25q-169 -29 -179 -29q-41 0 -77 38zM1089 763q0 -13 -12 -50q-12 -5 -14 -5q-11 0 -51 56l-148 209q225 -97 225 -210zM656 969q16 -4 51.5 -24t35.5 -35.5t-19 -30.5l-34 -27 q-177 -143 -210 -143h-23q117 110 129 123q69 77 70 137zM878 463q-6 6 -39 6q-18 0 -96 -7q0 -27 -15 -84q-2 2 -15.5 37.5t-26.5 35.5q-26 0 -78.5 -12.5t-83 -12.5t-63.5 34l226 25l-46 89h51q-5 0 32 -15q-2 -19 15 -73q17 2 147 22q21 23 22 69.5t3 53.5l43 -24 q33 -20 33 -29q0 2 -32 -51q6 -6 22.5 -6t52.5 10.5t50.5 10.5t41 -13.5t31.5 -22.5v-16q-11 -11 -28 -11l-104 7q-71 0 -96 -20l-68 -71q4 9 21 68zM576 -127l-10 -52q0 -8 4 -12h-23q-12 0 -15 15q-3 61 -16 180q-2 14 -19 72q20 -3 59 -10l203 31l2 3v45q-6 6 -40 6 t-50 -15q-20 18 -48 104t-45 111q120 6 171 13.5t116.5 24t80.5 16.5q30 0 83 -51q-15 -26 -45 -83q-16 -42 -66 -120q-24 21 -49.5 21t-65.5 -17v-44q8 -5 22 -3l254 28h2q21 0 86 -43q-16 -34 -32 -146.5t-79 -166.5q-23 31 -97 112q60 -10 69 -10q51 0 51 87v94 q-17 24 -55 24q-135 0 -228 -27v-56q13 -12 32 -12t57 19q-11 8 -11 33q25 -3 60 -29.5t35 -54.5t-24 -28q-11 0 -33 24.5t-29 28.5l-208 -60q-14 -4 -29.5 10t-18.5 28q44 7 130 25q1 3 1 8v40q-3 19 -27.5 19t-147.5 -12l-13 -4v-92zM826 296l23 6q26 0 36 -26 q-25 -17 -81 -31v-45h64q30 0 48 41.5t18 65.5t-8 48h-122v-52q13 -7 22 -7zM760 340l-77 -13q-7 0 -27 10l24 -158q52 5 81 15v48q-45 3 -50 0q-7 6 -17 19q2 1 67 21q-2 53 -1 58z" />
+<glyph unicode="&#x1f00d;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM1144 1175q69 -26 69 -42t-19 -21l-176 -41q-117 -29 -194 -62 v-84q0 14 6 -42q8 -68 52 -92q31 -15 100 -15q116 0 145 41q3 4 46 110l33 -152q-7 -20 -22 -27q-106 -43 -188 -43q-23 0 -75 8q-94 14 -125 115q-1 2 -25 164q-1 2 -4 2l-272 -95q-53 8 -83 38q226 53 356 106v225q0 16 -38 143h43q10 0 76 -46q-10 -44 -24 -139 q0 -156 -4 -159q5 -5 10 -5zM878 463q-6 6 -39 6q-18 0 -96 -7q0 -27 -15 -84q-2 2 -15.5 37.5t-26.5 35.5q-26 0 -78.5 -12.5t-83 -12.5t-63.5 34l226 25l-46 89h51q-5 0 32 -15q-2 -19 15 -73q17 2 147 22q21 23 22 69.5t3 53.5l43 -24q33 -20 33 -29q0 2 -32 -51 q6 -6 22.5 -6t52.5 10.5t50.5 10.5t41 -13.5t31.5 -22.5v-16q-11 -11 -28 -11l-104 7q-71 0 -96 -20l-68 -71q4 9 21 68zM576 -127l-10 -52q0 -8 4 -12h-23q-12 0 -15 15q-3 61 -16 180q-2 14 -19 72q20 -3 59 -10l203 31l2 3v45q-6 6 -40 6t-50 -15q-20 18 -48 104t-45 111 q120 6 171 13.5t116.5 24t80.5 16.5q30 0 83 -51q-15 -26 -45 -83q-16 -42 -66 -120q-24 21 -49.5 21t-65.5 -17v-44q8 -5 22 -3l254 28h2q21 0 86 -43q-16 -34 -32 -146.5t-79 -166.5q-23 31 -97 112q60 -10 69 -10q51 0 51 87v94q-17 24 -55 24q-135 0 -228 -27v-56 q13 -12 32 -12t57 19q-11 8 -11 33q25 -3 60 -29.5t35 -54.5t-24 -28q-11 0 -33 24.5t-29 28.5l-208 -60q-14 -4 -29.5 10t-18.5 28q44 7 130 25q1 3 1 8v40q-3 19 -27.5 19t-147.5 -12l-13 -4v-92zM826 296l23 6q26 0 36 -26q-25 -17 -81 -31v-45h64q30 0 48 41.5t18 65.5 t-8 48h-122v-52q13 -7 22 -7zM760 340l-77 -13q-7 0 -27 10l24 -158q52 5 81 15v48q-45 3 -50 0q-7 6 -17 19q2 1 67 21q-2 53 -1 58z" />
+<glyph unicode="&#x1f00e;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM1270 784q-47 -16 -82 -16q-94 0 -151 27q-24 22 -49 64 l-143 249q-61 102 -92 143.5t-69 68.5q-8 7 -8 14.5t5 12.5h46q50 0 96 -84l48 -100q108 -152 157 -208q107 -121 198 -142q7 -2 44 -29zM385 758h-26q254 222 254 377v11h29q19 0 52 -70q0 -12 -115 -169q-30 -42 -66 -70q-99 -79 -128 -79zM878 463q-6 6 -39 6 q-18 0 -96 -7q0 -27 -15 -84q-2 2 -15.5 37.5t-26.5 35.5q-26 0 -78.5 -12.5t-83 -12.5t-63.5 34l226 25l-46 89h51q-5 0 32 -15q-2 -19 15 -73q17 2 147 22q21 23 22 69.5t3 53.5l43 -24q33 -20 33 -29q0 2 -32 -51q6 -6 22.5 -6t52.5 10.5t50.5 10.5t41 -13.5t31.5 -22.5 v-16q-11 -11 -28 -11l-104 7q-71 0 -96 -20l-68 -71q4 9 21 68zM576 -127l-10 -52q0 -8 4 -12h-23q-12 0 -15 15q-3 61 -16 180q-2 14 -19 72q20 -3 59 -10l203 31l2 3v45q-6 6 -40 6t-50 -15q-20 18 -48 104t-45 111q120 6 171 13.5t116.5 24t80.5 16.5q30 0 83 -51 q-15 -26 -45 -83q-16 -42 -66 -120q-24 21 -49.5 21t-65.5 -17v-44q8 -5 22 -3l254 28h2q21 0 86 -43q-16 -34 -32 -146.5t-79 -166.5q-23 31 -97 112q60 -10 69 -10q51 0 51 87v94q-17 24 -55 24q-135 0 -228 -27v-56q13 -12 32 -12t57 19q-11 8 -11 33q25 -3 60 -29.5 t35 -54.5t-24 -28q-11 0 -33 24.5t-29 28.5l-208 -60q-14 -4 -29.5 10t-18.5 28q44 7 130 25q1 3 1 8v40q-3 19 -27.5 19t-147.5 -12l-13 -4v-92zM826 296l23 6q26 0 36 -26q-25 -17 -81 -31v-45h64q30 0 48 41.5t18 65.5t-8 48h-122v-52q13 -7 22 -7zM760 340l-77 -13 q-7 0 -27 10l24 -158q52 5 81 15v48q-45 3 -50 0q-7 6 -17 19q2 1 67 21q-2 53 -1 58z" />
+<glyph unicode="&#x1f00f;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM780 1157l152 63q39 0 73 -47q-1 -2 -2 -8q-48 -33 -81.5 -133 t-33.5 -181t35 -104q21 -14 102 -14t112 21q45 31 63 133q1 4 15 19l16 -173q0 -36 -62.5 -53t-114.5 -17q-203 0 -212 169l46 267v41q-4 3 -23 3q-53 0 -114 -42q-20 -117 -85 -220q-79 -128 -196 -170q-51 -19 -47 -20h-26q113 63 192 175t109 221q-2 3 -6 3l-181 -57 q-16 -2 -36 15.5t-24 33.5q71 9 174 31q26 3 73 20q10 6 22.5 59.5t12.5 82.5t-5 81l-9 22v33q70 -21 109 -58q-9 -17 -32.5 -81t-23.5 -78v-35q2 -2 8 -2zM878 463q-6 6 -39 6q-18 0 -96 -7q0 -27 -15 -84q-2 2 -15.5 37.5t-26.5 35.5q-26 0 -78.5 -12.5t-83 -12.5 t-63.5 34l226 25l-46 89h51q-5 0 32 -15q-2 -19 15 -73q17 2 147 22q21 23 22 69.5t3 53.5l43 -24q33 -20 33 -29q0 2 -32 -51q6 -6 22.5 -6t52.5 10.5t50.5 10.5t41 -13.5t31.5 -22.5v-16q-11 -11 -28 -11l-104 7q-71 0 -96 -20l-68 -71q4 9 21 68zM576 -127l-10 -52 q0 -8 4 -12h-23q-12 0 -15 15q-3 61 -16 180q-2 14 -19 72q20 -3 59 -10l203 31l2 3v45q-6 6 -40 6t-50 -15q-20 18 -48 104t-45 111q120 6 171 13.5t116.5 24t80.5 16.5q30 0 83 -51q-15 -26 -45 -83q-16 -42 -66 -120q-24 21 -49.5 21t-65.5 -17v-44q8 -5 22 -3l254 28h2 q21 0 86 -43q-16 -34 -32 -146.5t-79 -166.5q-23 31 -97 112q60 -10 69 -10q51 0 51 87v94q-17 24 -55 24q-135 0 -228 -27v-56q13 -12 32 -12t57 19q-11 8 -11 33q25 -3 60 -29.5t35 -54.5t-24 -28q-11 0 -33 24.5t-29 28.5l-208 -60q-14 -4 -29.5 10t-18.5 28q44 7 130 25 q1 3 1 8v40q-3 19 -27.5 19t-147.5 -12l-13 -4v-92zM826 296l23 6q26 0 36 -26q-25 -17 -81 -31v-45h64q30 0 48 41.5t18 65.5t-8 48h-122v-52q13 -7 22 -7zM760 340l-77 -13q-7 0 -27 10l24 -158q52 5 81 15v48q-45 3 -50 0q-7 6 -17 19q2 1 67 21q-2 53 -1 58z" />
+<glyph unicode="&#x1f010;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM185 753l50 -3q37 0 107 23t118 23t116 -27.5t107 -68.5l232 47 q79 16 83 18q45 14 65.5 42.5t65.5 132.5q108 250 207 313q22 14 71 14t86 -43.5t37 -107.5t-8 -100q-19 -87 -208 -362q32 -7 49 -14q-5 -10 -46.5 -69t-41.5 -64l9 -54q0 -66 -29.5 -101.5t-96.5 -75.5l-3 -11q-27 -29 -125 -92t-113 -86.5t-19 -57.5t-7 -64 q-11 18 -36 52q-19 -16 -54 -59q-9 16 -9 33t23 73q-14 10 -71 10h-11q6 21 24.5 29t36.5 15q-9 14 -41 22q-1 13 -7 19h-7q-66 0 -133 -59q14 32 37 77q-6 3 -15.5 3t-34.5 -5t-39 -5q58 45 154.5 59.5t128.5 38.5q-154 9 -246 51t-160 127l-112 157q-43 56 -104 82 q-14 6 -127 38q54 30 97 30zM1433 1244q-8 0 -17.5 -11.5t-9.5 -19.5v-12h19q17 0 28 31q-12 12 -20 12zM1506 1151l-4 14h-3q-21 0 -21 -21q0 -11 10 -25q18 21 18 32zM1353 1187h17q24 30 36 60h-16q-25 -15 -37 -29v-31zM1392 1149v-12h17q15 22 47 64l-42 -25 q-22 -14 -22 -27zM1292 1163v-22q28 7 45 22q-4 41 0 63q-45 -53 -45 -63zM1374 1149l-4 20h-12q-19 -10 -28 -34l-16 -47h16q44 29 44 61zM1452 1099l6 -34q0 -1 -1 -7q-11 7 -20 26q-24 -40 -59 -110q8 -9 27 -22q23 34 23 39.5t-9 13.5t-9 16.5t12 12.5q9 -17 19 -22 q5 8 47 92q-8 3 -27 22q-9 -13 -9 -27zM1491 1009l6 49q0 14 -7 18l-50 -101l-1 -8q14 -14 14 -22t-3 -8q-5 9 -15 25q-22 -26 -22 -32.5t7.5 -18t7.5 -20.5l-2 -4l-25 25q-20 -20 -20 -35t24 -29q80 109 80 130l-18 29l9 9q7 -7 15 -7zM1334 1037q-49 -62 -49 -73.5 t5 -15.5h16q17 36 86 162h-8q-16 -25 -50 -73zM1278 1053v-30q23 18 50 45q-10 0 -16 -2q-9 9 -15 21q-1 -4 -10 -16.5t-9 -17.5zM1243.5 1099.5q-22.5 -40.5 -22.5 -51t5 -14.5q23 7 43.5 37t36.5 31l3 20q-24 0 -35 7q3 6 3 22q-11 -11 -33.5 -51.5zM1399 940q-4 1 -31 15 q0 -4 -12 -27q7 -6 20 -19q15 15 23 31zM1254.5 953.5q19.5 23.5 19.5 33.5t-12 32q-41 -50 -41 -55v-33q14 -1 33.5 22.5zM1358 802q14 0 34 30l-27 38l-26 -49q0 -19 19 -19zM1213 638l75 12q43 80 43 89.5t-20 27t-31 17.5t-20 -12q25 -23 25 -30.5t-5 -11.5 q-8 14 -29 20.5t-27 13.5v11q26 20 58 20t62 -43q12 12 12 23q0 -1 -35 43q42 62 42 68l-12 33q-23 -46 -75 -117l-5 9l199 365q-52 -45 -102 -151q-25 -45 -114 -220q-12 6 -13 14q-9 -2 -26 -8q-2 -1 -27 -33.5t-34 -32.5t-28 21q-5 -10 -15 -19v-62q16 -8 26 -8 q28 0 27.5 36.5t17.5 45.5v-38q9 -5 28 -14v-20q-10 -3 -24 4q4 -7 4 -21t-19 -32h42zM1238 1022q-19 -3 -21.5 -3t-8.5 7q-32 -70 -32 -81q51 35 52 54zM1221 885v-51q25 13 39 42l28 57q-9 0 -23 8q-44 -44 -44 -56zM1150 930q-29 -53 -29 -70t5 -22q55 36 55 81 q-17 11 -31 11zM1190.5 823q23.5 50 23.5 66.5t-9 33.5l-59 -142q1 -6 4 -18q17 10 40.5 60zM1108 827q-41 -74 -41 -82t2 -14q25 11 62 88q-9 0 -23 8zM1126 663q-36 0 -38 53q-10 -1 -29 -7q-12 31 -12 36.5t5 15.5l-7 9q-4 -4 -6 -34q9 -26 36 -62t46 -36q6 0 46 31 q-37 -6 -41 -6zM490 438l32 11q8 0 7 -16q-15 -12 -18 -22q38 -70 226 -108q138 -29 250 -29t184 35q93 46 93 134q0 8 -12 52l-212 -90q-108 -49 -151 -65t-109 -16q-197 0 -197 109q0 16 15 16l16 -46q9 -25 25 -26q-7 10 -7 26t16 21q9 -8 9 -20q0 14 -3 -33 q35 -14 60 -18q-21 40 -21 50t9 17q9 -22 26 -70q35 -7 58 -7q65 0 150 37l162 71q45 18 133 57q-5 -1 -285 -97q-44 -18 -134 -44l-5 2q7 14 27.5 20t39.5 11l376 145l2 7l-256 -94q-103 -38 -119.5 -38t-19.5 6q6 11 15.5 16t107.5 35q306 95 343 126q8 7 15 19l-19 5 l-407 -164l-30 6l374 157h-15q-40 0 -144.5 -29t-162.5 -58.5t-50 -29.5q-8 0 -6 9q39 39 95 59l109 38l-86 23q-14 0 -39 -12.5t-37.5 -12.5t-16.5 12q13 25 150 25h11q-40 51 -51 98l-327 -72q0 -105 -59 -145l-5 5q43 89 43 112.5t-9 38.5q-19 32 -91.5 59t-110.5 27 t-96.5 -18t-60.5 -19q9 -8 25 -25q-13 -13 -37.5 -13t-33.5 3q53 -39 81 -73l84 -122q48 -68 74 -68zM1023 251l-91 7q-11 0 -65.5 -42.5t-54.5 -50.5v-15q51 -17 61 -17q24 0 161 118h-11zM862 114q-9 0 -47 10q9 -20 31 -58q-5 -6 -27 -52q28 28 40.5 28t24.5 -19v22 q0 30 6 41q12 22 117 95t121 92h-13q-28 -13 -82 -46l-81 -69q-56 -44 -90 -44zM759 210l-36 3q-12 0 -69 -19q14 0 25 -5q0 -10 -7 -21q38 10 65 10t23 -2q6 -11 29 -19q0 28 37 55l70 51h-15q-9 0 -54 -26.5t-68 -26.5zM235 727l-53 7q-10 0 -29 -6q26 -5 77 -19z M1253 714l-17 -15q0 4 3 8q-9 9 -40 26h35zM873 567q9 -8 9 -28.5t-37 -61.5l19 35q12 21 12 34t-3 21zM825 579q0 -43 -56 -105l31 56q15 27 15 51t-3 32l7 -7q6 -6 6 -27zM761 579q0 -43 -56 -105l30 56q15 28 15 51.5t-3 31.5q14 -12 14 -34zM454 667q-18 -18 -39.5 -18 t-56.5 37q35 12 46.5 12t49.5 -15v-16z" />
+<glyph unicode="&#x1f011;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM814 1338q51 0 102 4q-4 -170 -4 -341t4 -341q-51 4 -102 4 l-102 -4q4 171 4 341.5t-4 340.5q51 -4 102 -4zM814 500q51 0 102 4q-4 -170 -4 -341t4 -341q-51 4 -102 4l-102 -4q4 170 4 341t-4 341q51 -4 102 -4zM756 1059h116q0 116 3 240q-30 -1 -61 -1l-61 1q3 -124 3 -240zM872 981v40h-116v-40h116zM872 943h-116q0 -114 -3 -240 q30 1 61 1l61 -1q-3 131 -3 240zM756 221h116q0 116 3 240q-30 -1 -61 -1l-61 1q3 -124 3 -240zM872 143v40h-116v-40h116zM872 105h-116q0 -114 -3 -240q30 1 61 1l61 -1q-3 131 -3 240z" />
+<glyph unicode="&#x1f012;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM814 1338q51 0 102 4q-4 -170 -4 -341t4 -341q-51 4 -102 4 l-102 -4q4 171 4 341.5t-4 340.5q51 -4 102 -4zM1214 500q51 0 102 4q-4 -170 -4 -341t4 -341q-51 4 -102 4l-102 -4q4 170 4 341t-4 341q51 -4 102 -4zM414 500q51 0 102 4q-4 -170 -4 -341t4 -341q-51 4 -102 4l-102 -4q4 170 4 341t-4 341q51 -4 102 -4zM756 1059h116 q0 116 3 240q-30 -1 -61 -1l-61 1q3 -124 3 -240zM872 981v40h-116v-40h116zM872 943h-116q0 -114 -3 -240q30 1 61 1l61 -1q-3 131 -3 240zM1156 221h116q0 116 3 240q-31 -1 -61 -1l-61 1q3 -124 3 -240zM1272 143v40h-116v-40h116zM1272 105h-116q0 -114 -3 -240 q31 1 61 1l61 -1q-3 131 -3 240zM356 221h116q0 116 3 240q-31 -1 -61 -1l-61 1q3 -124 3 -240zM472 143v40h-116v-40h116zM472 105h-116q0 -114 -3 -240q31 1 61 1l61 -1q-3 131 -3 240z" />
+<glyph unicode="&#x1f013;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM1214 1338q51 0 102 4q-4 -170 -4 -341t4 -341q-51 4 -102 4 l-102 -4q4 171 4 341.5t-4 340.5q51 -4 102 -4zM414 1338q51 0 102 4q-4 -170 -4 -341t4 -341q-51 4 -102 4l-102 -4q4 171 4 341.5t-4 340.5q51 -4 102 -4zM1214 500q51 0 102 4q-4 -170 -4 -341t4 -341q-51 4 -102 4l-102 -4q4 170 4 341t-4 341q51 -4 102 -4zM414 500 q51 0 102 4q-4 -170 -4 -341t4 -341q-51 4 -102 4l-102 -4q4 170 4 341t-4 341q51 -4 102 -4zM1156 1059h116q0 116 3 240q-31 -1 -61 -1l-61 1q3 -124 3 -240zM1272 981v40h-116v-40h116zM1272 943h-116q0 -114 -3 -240q31 1 61 1l61 -1q-3 131 -3 240zM356 1059h116 q0 116 3 240q-31 -1 -61 -1l-61 1q3 -124 3 -240zM1156 221h116q0 116 3 240q-31 -1 -61 -1l-61 1q3 -124 3 -240zM472 981v40h-116v-40h116zM1272 143v40h-116v-40h116zM472 943h-116q0 -114 -3 -240q31 1 61 1l61 -1q-3 131 -3 240zM1272 105h-116q0 -114 -3 -240 q31 1 61 1l61 -1q-3 131 -3 240zM356 221h116q0 116 3 240q-31 -1 -61 -1l-61 1q3 -124 3 -240zM472 143v40h-116v-40h116zM472 105h-116q0 -114 -3 -240q31 1 61 1l61 -1q-3 131 -3 240z" />
+<glyph unicode="&#x1f014;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM1214 1338q51 0 102 4q-4 -170 -4 -341t4 -341q-51 4 -102 4 l-102 -4q4 171 4 341.5t-4 340.5q51 -4 102 -4zM414 1338q51 0 102 4q-4 -170 -4 -341t4 -341q-51 4 -102 4l-102 -4q4 171 4 341.5t-4 340.5q51 -4 102 -4zM1214 500q51 0 102 4q-4 -170 -4 -341t4 -341q-51 4 -102 4l-102 -4q4 170 4 341t-4 341q51 -4 102 -4zM414 500 q51 0 102 4q-4 -170 -4 -341t4 -341q-51 4 -102 4l-102 -4q4 170 4 341t-4 341q51 -4 102 -4zM1156 1059h116q0 116 3 240q-31 -1 -61 -1l-61 1q3 -124 3 -240zM1272 981v40h-116v-40h116zM1272 943h-116q0 -114 -3 -240q31 1 61 1l61 -1q-3 131 -3 240zM356 1059h116 q0 116 3 240q-31 -1 -61 -1l-61 1q3 -124 3 -240zM1156 221h116q0 116 3 240q-31 -1 -61 -1l-61 1q3 -124 3 -240zM472 981v40h-116v-40h116zM1272 143v40h-116v-40h116zM472 943h-116q0 -114 -3 -240q31 1 61 1l61 -1q-3 131 -3 240zM1272 105h-116q0 -114 -3 -240 q31 1 61 1l61 -1q-3 131 -3 240zM356 221h116q0 116 3 240q-31 -1 -61 -1l-61 1q3 -124 3 -240zM472 143v40h-116v-40h116zM472 105h-116q0 -114 -3 -240q31 1 61 1l61 -1q-3 131 -3 240zM814 919q51 0 102 4q-4 -170 -4 -341t4 -341q-51 4 -102 4l-102 -4q4 171 4 341 t-4 341q51 -4 102 -4zM756 640h116q0 116 3 240q-30 -2 -61 -2l-61 2q3 -124 3 -240zM872 562v40h-116v-40h116zM872 524h-116q0 -114 -3 -240q30 2 61 2l61 -2q-3 131 -3 240z" />
+<glyph unicode="&#x1f015;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM814 1338q51 0 102 4q-4 -170 -4 -341t4 -341q-51 4 -102 4 l-102 -4q4 171 4 341.5t-4 340.5q51 -4 102 -4zM814 500q51 0 102 4q-4 -170 -4 -341t4 -341q-51 4 -102 4l-102 -4q4 170 4 341t-4 341q51 -4 102 -4zM756 1059h116q0 116 3 240q-30 -1 -61 -1l-61 1q3 -124 3 -240zM872 981v40h-116v-40h116zM872 943h-116q0 -114 -3 -240 q30 1 61 1l61 -1q-3 131 -3 240zM756 221h116q0 116 3 240q-30 -1 -61 -1l-61 1q3 -124 3 -240zM872 143v40h-116v-40h116zM872 105h-116q0 -114 -3 -240q30 1 61 1l61 -1q-3 131 -3 240zM1214 1338q51 0 102 4q-4 -170 -4 -341t4 -341q-51 4 -102 4l-102 -4q4 171 4 341.5 t-4 340.5q51 -4 102 -4zM414 1338q51 0 102 4q-4 -170 -4 -341t4 -341q-51 4 -102 4l-102 -4q4 171 4 341.5t-4 340.5q51 -4 102 -4zM1214 500q51 0 102 4q-4 -170 -4 -341t4 -341q-51 4 -102 4l-102 -4q4 170 4 341t-4 341q51 -4 102 -4zM414 500q51 0 102 4 q-4 -170 -4 -341t4 -341q-51 4 -102 4l-102 -4q4 170 4 341t-4 341q51 -4 102 -4zM1156 1059h116q0 116 3 240q-31 -1 -61 -1l-61 1q3 -124 3 -240zM1272 981v40h-116v-40h116zM1272 943h-116q0 -114 -3 -240q31 1 61 1l61 -1q-3 131 -3 240zM356 1059h116q0 116 3 240 q-31 -1 -61 -1l-61 1q3 -124 3 -240zM1156 221h116q0 116 3 240q-31 -1 -61 -1l-61 1q3 -124 3 -240zM472 981v40h-116v-40h116zM1272 143v40h-116v-40h116zM472 943h-116q0 -114 -3 -240q31 1 61 1l61 -1q-3 131 -3 240zM1272 105h-116q0 -114 -3 -240q31 1 61 1l61 -1 q-3 131 -3 240zM356 221h116q0 116 3 240q-31 -1 -61 -1l-61 1q3 -124 3 -240zM472 143v40h-116v-40h116zM472 105h-116q0 -114 -3 -240q31 1 61 1l61 -1q-3 131 -3 240z" />
+<glyph unicode="&#x1f016;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM916 924q-51 4 -102 4l-102 -4q3 128 3 257t-3 259q51 -4 102 -4 l102 4q-3 -129 -3 -258t3 -258zM1316 324q-51 4 -102 4l-102 -4q3 128 3 257.5t-3 258.5q51 -4 102 -4l102 4q-3 -129 -3 -258t3 -258zM916 324q-51 4 -102 4l-102 -4q3 128 3 257.5t-3 258.5q51 -4 102 -4l102 4q-3 -129 -3 -258t3 -258zM1316 -276q-51 4 -102 4l-102 -4 q3 128 3 257t-3 259q51 -4 102 -4l102 4q-3 -129 -3 -258t3 -258zM516 324q-51 4 -102 4l-102 -4q3 128 3 257.5t-3 258.5q51 -4 102 -4l102 4q-3 -129 -3 -258t3 -258zM916 -276q-51 4 -102 4l-102 -4q3 128 3 257t-3 259q51 -4 102 -4l102 4q-3 -129 -3 -258t3 -258z M516 -276q-51 4 -102 4l-102 -4q3 128 3 257t-3 259q51 -4 102 -4l102 4q-3 -129 -3 -258t3 -258zM872 1240q0 14 3 157q-30 -1 -61 -1l-61 1l3 -157h116zM872 1162v40h-116v-40h116zM1272 640q0 14 3 157q-31 -1 -61 -1l-61 1l3 -157h116zM872 1124h-116q0 -11 -3 -157 q30 1 61 1l61 -1q-3 136 -3 157zM1272 562v40h-116v-40h116zM1272 524h-116q0 -11 -3 -157q31 1 61 1l61 -1q-3 136 -3 157zM872 640q0 14 3 157q-30 -1 -61 -1l-61 1l3 -157h116zM872 562v40h-116v-40h116zM1272 40q0 14 3 157q-31 -1 -61 -1l-61 1l3 -157h116zM872 524 h-116q0 -11 -3 -157q30 1 61 1l61 -1q-3 136 -3 157zM1272 -38v40h-116v-40h116zM472 640q0 14 3 157q-31 -1 -61 -1l-61 1l3 -157h116zM1272 -76h-116q0 -11 -3 -157q31 1 61 1l61 -1q-3 136 -3 157zM472 562v40h-116v-40h116zM872 40q0 14 3 157q-30 -1 -61 -1l-61 1 l3 -157h116zM472 524h-116q0 -11 -3 -157q31 1 61 1l61 -1q-3 136 -3 157zM872 -38v40h-116v-40h116zM872 -76h-116q0 -11 -3 -157q30 1 61 1l61 -1q-3 136 -3 157zM472 40q0 14 3 157q-31 -1 -61 -1l-61 1l3 -157h116zM472 -38v40h-116v-40h116zM472 -76h-116 q0 -11 -3 -157q31 1 61 1l61 -1q-3 136 -3 157z" />
+<glyph unicode="&#x1f017;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM414 1338q51 0 102 4q-4 -177 -4 -358l244 355q27 -22 58 -45 q31 23 58 45l244 -355q0 187 -4 358q51 -4 102 -4t102 4q-4 -170 -4 -340.5t4 -341.5q-51 4 -102 4l-102 -4v16l-16 -13l-282 409l-282 -409l-16 13v-16q-51 4 -102 4l-102 -4q4 171 4 341.5t-4 340.5q51 -4 102 -4zM1214 -174q-51 0 -102 -4q4 177 4 358l-244 -355 q-27 22 -58 45q-31 -23 -58 -45l-244 355q0 -187 4 -358q-51 4 -102 4t-102 -4q4 170 4 341t-4 341q51 -4 102 -4l102 4v-16l16 13l282 -409l282 409l16 -13v16q51 -4 102 -4l102 4q-4 -170 -4 -341t4 -341q-51 4 -102 4zM1156 1059h116q0 116 3 240q-31 -1 -61 -1l-61 1 q3 -124 3 -240zM1272 981v40h-116v-40h116zM887 1244l-24 36l-14 -11zM1272 943h-116q0 -93 -3 -240q31 1 61 1l61 -1q-3 126 -3 240zM998 1082l-86 125l-74 -101l65 -91zM1043 1018l-23 33l-95 -67l23 -33zM1116 915l-51 72l-95 -67l135 -198l8 6zM865 1210q-52 33 -100 70 l-135 -198l95 -67zM703 984l-95 67l-23 -33l95 -67zM356 1059h116q0 116 3 240q-31 -1 -61 -1l-61 1q3 -124 3 -240zM1156 221h116q0 114 3 240q-31 -1 -61 -1l-61 1q3 -131 3 -240zM658 920l-95 67l-51 -72q0 -39 3 -187l8 -6zM472 981v40h-116v-40h116zM1272 143v40h-116 v-40h116zM1116 249q0 39 -3 187l-8 6l-135 -198l95 -67zM472 943h-116q0 -114 -3 -240q31 1 61 1l61 -1q-3 131 -3 240zM1272 105h-116q0 -116 -3 -240q31 1 61 1l61 -1q-3 124 -3 240zM1043 146l-95 67l-23 -33l95 -67zM998 82l-95 67l-140 -195q52 -33 100 -70zM658 244 l-135 198l-8 -6l-3 -187l51 -72zM703 180l-23 33l-95 -67l23 -33zM790 58l-65 91l-95 -67l86 -125zM356 221h116q0 93 3 240q-31 -1 -61 -1l-61 1q3 -126 3 -240zM779 -105l-38 25l24 -36zM472 143v40h-116v-40h116zM472 105h-116q0 -116 -3 -240q31 1 61 1l61 -1 q-3 124 -3 240z" />
+<glyph unicode="&#x1f018;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM1316 924q-51 4 -102 4l-102 -4q3 128 3 257t-3 259 q51 -4 102 -4l102 4q-3 -129 -3 -258t3 -258zM916 924q-51 4 -102 4l-102 -4q3 128 3 257t-3 259q51 -4 102 -4l102 4q-3 -129 -3 -258t3 -258zM1316 324q-51 4 -102 4l-102 -4q3 128 3 257.5t-3 258.5q51 -4 102 -4l102 4q-3 -129 -3 -258t3 -258zM516 924q-51 4 -102 4 l-102 -4q3 128 3 257t-3 259q51 -4 102 -4l102 4q-3 -129 -3 -258t3 -258zM916 324q-51 4 -102 4l-102 -4q3 128 3 257.5t-3 258.5q51 -4 102 -4l102 4q-3 -129 -3 -258t3 -258zM1316 -276q-51 4 -102 4l-102 -4q3 128 3 257t-3 259q51 -4 102 -4l102 4q-3 -129 -3 -258 t3 -258zM516 324q-51 4 -102 4l-102 -4q3 128 3 257.5t-3 258.5q51 -4 102 -4l102 4q-3 -129 -3 -258t3 -258zM916 -276q-51 4 -102 4l-102 -4q3 128 3 257t-3 259q51 -4 102 -4l102 4q-3 -129 -3 -258t3 -258zM516 -276q-51 4 -102 4l-102 -4q3 128 3 257t-3 259 q51 -4 102 -4l102 4q-3 -129 -3 -258t3 -258zM1272 1240q0 14 3 157q-31 -1 -61 -1l-61 1l3 -157h116zM1272 1162v40h-116v-40h116zM1272 1124h-116q0 -11 -3 -157q31 1 61 1l61 -1q-3 136 -3 157zM872 1240q0 14 3 157q-30 -1 -61 -1l-61 1l3 -157h116zM872 1162v40h-116 v-40h116zM1272 640q0 14 3 157q-31 -1 -61 -1l-61 1l3 -157h116zM872 1124h-116q0 -11 -3 -157q30 1 61 1l61 -1q-3 136 -3 157zM1272 562v40h-116v-40h116zM472 1240q0 14 3 157q-31 -1 -61 -1l-61 1l3 -157h116zM1272 524h-116q0 -11 -3 -157q31 1 61 1l61 -1 q-3 136 -3 157zM472 1162v40h-116v-40h116zM872 640q0 14 3 157q-30 -1 -61 -1l-61 1l3 -157h116zM472 1124h-116q0 -11 -3 -157q31 1 61 1l61 -1q-3 136 -3 157zM872 562v40h-116v-40h116zM1272 40q0 14 3 157q-31 -1 -61 -1l-61 1l3 -157h116zM872 524h-116q0 -11 -3 -157 q30 1 61 1l61 -1q-3 136 -3 157zM1272 -38v40h-116v-40h116zM472 640q0 14 3 157q-31 -1 -61 -1l-61 1l3 -157h116zM1272 -76h-116q0 -11 -3 -157q31 1 61 1l61 -1q-3 136 -3 157zM472 562v40h-116v-40h116zM872 40q0 14 3 157q-30 -1 -61 -1l-61 1l3 -157h116zM472 524 h-116q0 -11 -3 -157q31 1 61 1l61 -1q-3 136 -3 157zM872 -38v40h-116v-40h116zM872 -76h-116q0 -11 -3 -157q30 1 61 1l61 -1q-3 136 -3 157zM472 40q0 14 3 157q-31 -1 -61 -1l-61 1l3 -157h116zM472 -38v40h-116v-40h116zM472 -76h-116q0 -11 -3 -157q31 1 61 1l61 -1 q-3 136 -3 157z" />
+<glyph unicode="&#x1f019;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM1370 577q0 -230 -163 -393t-393 -163t-393 163t-163 393 t163 393t393 163t393 -163t163 -393zM1330 577q0 214 -151 365t-365 151t-365 -151t-151 -365t151 -365t365 -151t365 151t151 365zM1270 577q0 -189 -133.5 -322.5t-322.5 -133.5t-322.5 133.5t-133.5 322.5t133.5 322.5t322.5 133.5t322.5 -133.5t133.5 -322.5zM1230 577 q0 172 -122 294t-294 122t-294 -122t-122 -294t122 -294t294 -122t294 122t122 294zM1206 574q0 -50 -32.5 -80.5t-83.5 -30.5h-79q56 -96 56 -135.5t-35 -73.5t-83.5 -34t-83.5 44q-9 11 -51 85q-42 -74 -52 -86q-34 -41 -83 -41t-84.5 32t-35.5 71t58 138h-79 q-50 0 -83 33.5t-33 83.5t32.5 80.5t83.5 30.5h79q-56 96 -56 135.5t35 73.5t83.5 34t83.5 -44q9 -11 51 -85q42 74 52 86q34 41 83 41t84.5 -32t35.5 -71t-58 -138h79q50 0 83 -33.5t33 -83.5zM1166 577q0 74 -76 74h-148l74 128q13 22 13 47t-23.5 45.5t-59 20.5 t-58.5 -39l-74 -128l-74 128q-24 41 -58 41t-57.5 -22t-23.5 -48t11 -45l74 -128h-148q-76 0 -76 -74t76 -74h148l-74 -128q-13 -22 -13 -47t23.5 -45.5t59 -20.5t58.5 39l74 128l74 -128q24 -41 58 -41t57.5 22t23.5 48t-11 45l-74 128h148q76 0 76 74zM934 577 q0 -50 -35 -85t-85 -35t-85 35t-35 85t35 85t85 35t85 -35t35 -85zM894 577q0 33 -23.5 56.5t-56.5 23.5t-56.5 -23.5t-23.5 -56.5t23.5 -56.5t56.5 -23.5t56.5 23.5t23.5 56.5zM854 577q0 -40 -40 -40t-40 40t40 40t40 -40z" />
+<glyph unicode="&#x1f01a;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM1231 1027q0 -173 -122 -295t-295 -122t-295 122t-122 295 t122 295t295 122t295 -122t122 -295zM1231 127q0 -173 -122 -295t-295 -122t-295 122t-122 295t122 295t295 122t295 -122t122 -295zM1201 1027q0 160 -113.5 273.5t-273.5 113.5t-273.5 -113.5t-113.5 -273.5t113.5 -273.5t273.5 -113.5t273.5 113.5t113.5 273.5zM1201 127 q0 160 -113.5 273.5t-273.5 113.5t-273.5 -113.5t-113.5 -273.5t113.5 -273.5t273.5 -113.5t273.5 113.5t113.5 273.5zM1156 1027q0 -142 -100 -242t-242 -100t-242 100t-100 242t100 242t242 100t242 -100t100 -242zM1156 127q0 -142 -100 -242t-242 -100t-242 100 t-100 242t100 242t242 100t242 -100t100 -242zM1126 1027q0 129 -91.5 220.5t-220.5 91.5t-220.5 -91.5t-91.5 -220.5t91.5 -220.5t220.5 -91.5t220.5 91.5t91.5 220.5zM1126 127q0 129 -91.5 220.5t-220.5 91.5t-220.5 -91.5t-91.5 -220.5t91.5 -220.5t220.5 -91.5 t220.5 91.5t91.5 220.5zM1108 1025q0 -83 -87 -83h-59q42 -72 42 -102t-26.5 -55.5t-62.5 -25.5t-63 33q-6 8 -38 64q-31 -55 -39 -64q-26 -31 -62.5 -31t-63.5 24t-27 52.5t44 103.5l-59 1q-87 1 -87 86t87 85h59q-42 72 -42 101.5t26.5 55t62.5 25.5t63 -33q6 -8 38 -64 q31 55 39 64q26 31 62.5 31t63.5 -24t27 -52.5t-44 -103.5h59q38 0 62.5 -25t24.5 -63zM1108 125q0 -83 -87 -83h-59q42 -72 42 -102t-26.5 -55.5t-62.5 -25.5t-63 33q-6 8 -38 64q-31 -55 -39 -64q-26 -31 -62.5 -31t-63.5 24t-27 52.5t44 103.5l-59 1q-87 1 -87 86t87 85 h59q-42 72 -42 101.5t26.5 55t62.5 25.5t63 -33q6 -8 38 -64q31 55 39 64q26 31 62.5 31t63.5 -24t27 -52.5t-44 -103.5h59q38 0 62.5 -25t24.5 -63zM1021 972q57 0 57 55.5t-57 55.5h-111l56 96q9 15 9 34t-18 34.5t-44 15.5t-43 -29l-56 -96l-55 96q-18 31 -46 31 q-59 0 -59 -56q0 -14 9 -30l55 -96h-111q-57 0 -57 -55t57 -56l111 -1l-55 -95q-10 -17 -10 -35.5t18 -34t44.5 -15.5t43.5 29l55 96l56 -96q18 -31 45 -31q59 0 59 56q0 17 -8 31l-56 96h111zM1021 72q57 0 57 55.5t-57 55.5h-111l56 96q9 15 9 34t-18 34.5t-44 15.5 t-43 -29l-56 -96l-55 96q-18 31 -46 31q-59 0 -59 -56q0 -14 9 -30l55 -96h-111q-57 0 -57 -55t57 -56l111 -1l-55 -95q-10 -17 -10 -35.5t18 -34t44.5 -15.5t43.5 29l55 96l56 -96q18 -31 45 -31q59 0 59 56q0 17 -8 31l-56 96h111zM904 1027q0 -37 -26.5 -63.5 t-63.5 -26.5t-63.5 26.5t-26.5 63.5t26.5 63.5t63.5 26.5t63.5 -26.5t26.5 -63.5zM904 127q0 -37 -26.5 -63.5t-63.5 -26.5t-63.5 26.5t-26.5 63.5t26.5 63.5t63.5 26.5t63.5 -26.5t26.5 -63.5zM874 1027q0 60 -60 60t-60 -60t60 -60t60 60zM874 127q0 60 -60 60t-60 -60 t60 -60t60 60zM844 1027q0 -30 -30 -30t-30 30t30 30t30 -30zM844 127q0 -30 -30 -30t-30 30t30 30t30 -30z" />
+<glyph unicode="&#x1f01b;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM792 1177q0 -115 -81.5 -196.5t-196.5 -81.5t-196.5 81.5 t-81.5 196.5t81.5 196.5t196.5 81.5t196.5 -81.5t81.5 -196.5zM1092 577q0 -115 -81.5 -196.5t-196.5 -81.5t-196.5 81.5t-81.5 196.5t81.5 196.5t196.5 81.5t196.5 -81.5t81.5 -196.5zM1392 -23q0 -115 -81.5 -196.5t-196.5 -81.5t-196.5 81.5t-81.5 196.5t81.5 196.5 t196.5 81.5t196.5 -81.5t81.5 -196.5zM772 1177q0 107 -75.5 182.5t-182.5 75.5t-182.5 -75.5t-75.5 -182.5t75.5 -182.5t182.5 -75.5t182.5 75.5t75.5 182.5zM1072 577q0 107 -75.5 182.5t-182.5 75.5t-182.5 -75.5t-75.5 -182.5t75.5 -182.5t182.5 -75.5t182.5 75.5 t75.5 182.5zM1372 -23q0 107 -75.5 182.5t-182.5 75.5t-182.5 -75.5t-75.5 -182.5t75.5 -182.5t182.5 -75.5t182.5 75.5t75.5 182.5zM742 1177q0 -94 -67 -161t-161 -67t-161 67t-67 161t67 161t161 67t161 -67t67 -161zM1042 577q0 -94 -67 -161t-161 -67t-161 67t-67 161 t67 161t161 67t161 -67t67 -161zM1342 -23q0 -94 -67 -161t-161 -67t-161 67t-67 161t67 161t161 67t161 -67t67 -161zM722 1177q0 86 -61 147t-147 61t-147 -61t-61 -147t61 -147t147 -61t147 61t61 147zM1022 577q0 86 -61 147t-147 61t-147 -61t-61 -147t61 -147t147 -61 t147 61t61 147zM1322 -23q0 86 -61 147t-147 61t-147 -61t-61 -147t61 -147t147 -61t147 61t61 147zM710 1175q0 -55 -58 -55h-39q28 -48 28 -64q0 -58 -60 -58q-30 0 -67 65q-36 -63 -68 -63q-60 0 -60 54q0 17 29 66h-39q-58 0 -58 59q0 55 58 55h39q-28 48 -28 64 q0 58 60 58q30 0 67 -65q36 63 68 63q60 0 60 -54q0 -17 -29 -66h39q58 0 58 -59zM1010 575q0 -55 -58 -55h-39q28 -48 28 -64q0 -58 -60 -58q-30 0 -67 65q-36 -63 -68 -63q-60 0 -60 54q0 17 29 66h-39q-58 0 -58 59q0 55 58 55h39q-28 48 -28 64q0 58 60 58q30 0 67 -65 q36 63 68 63q60 0 60 -54q0 -17 -29 -66h39q58 0 58 -59zM1310 -25q0 -55 -58 -55h-39q28 -48 28 -64q0 -58 -60 -58q-30 0 -67 65q-36 -63 -68 -63q-60 0 -60 54q0 17 29 66h-39q-58 0 -58 59q0 55 58 55h39q-28 48 -28 64q0 58 60 58q30 0 67 -65q36 63 68 63q60 0 60 -54 q0 -17 -29 -66h39q58 0 58 -59zM690 1177q0 37 -38 37h-74l37 64q7 12 7 22q0 35 -39 35q-20 0 -32 -20l-37 -64l-37 64q-12 21 -30 21q-40 0 -40 -38q0 -10 6 -20l37 -64h-74q-38 0 -38 -37t38 -37h74l-37 -64q-7 -12 -7 -22q0 -35 39 -35q20 0 32 20l37 64l37 -64 q12 -21 30 -21q40 0 40 38q0 10 -6 20l-37 64h74q38 0 38 37zM990 577q0 37 -38 37h-74l37 64q7 12 7 22q0 35 -39 35q-20 0 -32 -20l-37 -64l-37 64q-12 21 -30 21q-40 0 -40 -38q0 -10 6 -20l37 -64h-74q-38 0 -38 -37t38 -37h74l-37 -64q-7 -12 -7 -22q0 -35 39 -35 q20 0 32 20l37 64l37 -64q12 -21 30 -21q40 0 40 38q0 10 -6 20l-37 64h74q38 0 38 37zM1290 -23q0 37 -38 37h-74l37 64q7 12 7 22q0 35 -39 35q-20 0 -32 -20l-37 -64l-37 64q-12 21 -30 21q-40 0 -40 -38q0 -10 6 -20l37 -64h-74q-38 0 -38 -37t38 -37h74l-37 -64 q-7 -12 -7 -22q0 -35 39 -35q20 0 32 20l37 64l37 -64q12 -21 30 -21q40 0 40 38q0 10 -6 20l-37 64h74q38 0 38 37zM574 1177q0 -60 -60 -60t-60 60t60 60t60 -60zM874 577q0 -60 -60 -60t-60 60t60 60t60 -60zM1174 -23q0 -60 -60 -60t-60 60t60 60t60 -60zM554 1177 q0 40 -40 40t-40 -40t40 -40t40 40zM854 577q0 40 -40 40t-40 -40t40 -40t40 40zM1154 -23q0 40 -40 40t-40 -40t40 -40t40 40zM534 1177q0 -20 -20 -20t-20 20t20 20t20 -20zM834 577q0 -20 -20 -20t-20 20t20 20t20 -20zM1134 -23q0 -20 -20 -20t-20 20t20 20t20 -20z" />
+<glyph unicode="&#x1f01c;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM1392 897q0 -115 -81.5 -196.5t-196.5 -81.5t-196.5 81.5 t-81.5 196.5t81.5 196.5t196.5 81.5t196.5 -81.5t81.5 -196.5zM792 897q0 -115 -81.5 -196.5t-196.5 -81.5t-196.5 81.5t-81.5 196.5t81.5 196.5t196.5 81.5t196.5 -81.5t81.5 -196.5zM1392 257q0 -115 -81.5 -196.5t-196.5 -81.5t-196.5 81.5t-81.5 196.5t81.5 196.5 t196.5 81.5t196.5 -81.5t81.5 -196.5zM792 257q0 -115 -81.5 -196.5t-196.5 -81.5t-196.5 81.5t-81.5 196.5t81.5 196.5t196.5 81.5t196.5 -81.5t81.5 -196.5zM1372 897q0 107 -75.5 182.5t-182.5 75.5t-182.5 -75.5t-75.5 -182.5t75.5 -182.5t182.5 -75.5t182.5 75.5 t75.5 182.5zM772 897q0 107 -75.5 182.5t-182.5 75.5t-182.5 -75.5t-75.5 -182.5t75.5 -182.5t182.5 -75.5t182.5 75.5t75.5 182.5zM1372 257q0 107 -75.5 182.5t-182.5 75.5t-182.5 -75.5t-75.5 -182.5t75.5 -182.5t182.5 -75.5t182.5 75.5t75.5 182.5zM772 257 q0 107 -75.5 182.5t-182.5 75.5t-182.5 -75.5t-75.5 -182.5t75.5 -182.5t182.5 -75.5t182.5 75.5t75.5 182.5zM1342 897q0 -94 -67 -161t-161 -67t-161 67t-67 161t67 161t161 67t161 -67t67 -161zM742 897q0 -94 -67 -161t-161 -67t-161 67t-67 161t67 161t161 67t161 -67 t67 -161zM1342 257q0 -94 -67 -161t-161 -67t-161 67t-67 161t67 161t161 67t161 -67t67 -161zM742 257q0 -94 -67 -161t-161 -67t-161 67t-67 161t67 161t161 67t161 -67t67 -161zM1322 897q0 86 -61 147t-147 61t-147 -61t-61 -147t61 -147t147 -61t147 61t61 147z M722 897q0 86 -61 147t-147 61t-147 -61t-61 -147t61 -147t147 -61t147 61t61 147zM1322 257q0 86 -61 147t-147 61t-147 -61t-61 -147t61 -147t147 -61t147 61t61 147zM722 257q0 86 -61 147t-147 61t-147 -61t-61 -147t61 -147t147 -61t147 61t61 147zM1310 895 q0 -55 -58 -55h-39q28 -48 28 -64q0 -58 -60 -58q-30 0 -67 65q-36 -63 -68 -63q-60 0 -60 54q0 17 29 66h-39q-58 0 -58 59q0 55 58 55h39q-28 48 -28 64q0 58 60 58q30 0 67 -65q36 63 68 63q60 0 60 -54q0 -17 -29 -66h39q58 0 58 -59zM710 895q0 -55 -58 -55h-39 q28 -48 28 -64q0 -58 -60 -58q-30 0 -67 65q-36 -63 -68 -63q-60 0 -60 54q0 17 29 66h-39q-58 0 -58 59q0 55 58 55h39q-28 48 -28 64q0 58 60 58q30 0 67 -65q36 63 68 63q60 0 60 -54q0 -17 -29 -66h39q58 0 58 -59zM1310 255q0 -55 -58 -55h-39q28 -48 28 -64 q0 -58 -60 -58q-30 0 -67 65q-36 -63 -68 -63q-60 0 -60 54q0 17 29 66h-39q-58 0 -58 59q0 55 58 55h39q-28 48 -28 64q0 58 60 58q30 0 67 -65q36 63 68 63q60 0 60 -54q0 -17 -29 -66h39q58 0 58 -59zM710 255q0 -55 -58 -55h-39q28 -48 28 -64q0 -58 -60 -58 q-30 0 -67 65q-36 -63 -68 -63q-60 0 -60 54q0 17 29 66h-39q-58 0 -58 59q0 55 58 55h39q-28 48 -28 64q0 58 60 58q30 0 67 -65q36 63 68 63q60 0 60 -54q0 -17 -29 -66h39q58 0 58 -59zM1290 897q0 37 -38 37h-74l37 64q7 12 7 22q0 35 -39 35q-20 0 -32 -20l-37 -64 l-37 64q-12 21 -30 21q-40 0 -40 -38q0 -10 6 -20l37 -64h-74q-38 0 -38 -37t38 -37h74l-37 -64q-7 -12 -7 -22q0 -35 39 -35q20 0 32 20l37 64l37 -64q12 -21 30 -21q40 0 40 38q0 10 -6 20l-37 64h74q38 0 38 37zM690 897q0 37 -38 37h-74l37 64q7 12 7 22q0 35 -39 35 q-20 0 -32 -20l-37 -64l-37 64q-12 21 -30 21q-40 0 -40 -38q0 -10 6 -20l37 -64h-74q-38 0 -38 -37t38 -37h74l-37 -64q-7 -12 -7 -22q0 -35 39 -35q20 0 32 20l37 64l37 -64q12 -21 30 -21q40 0 40 38q0 10 -6 20l-37 64h74q38 0 38 37zM1290 257q0 37 -38 37h-74l37 64 q7 12 7 22q0 35 -39 35q-20 0 -32 -20l-37 -64l-37 64q-12 21 -30 21q-40 0 -40 -38q0 -10 6 -20l37 -64h-74q-38 0 -38 -37t38 -37h74l-37 -64q-7 -12 -7 -22q0 -35 39 -35q20 0 32 20l37 64l37 -64q12 -21 30 -21q40 0 40 38q0 10 -6 20l-37 64h74q38 0 38 37zM690 257 q0 37 -38 37h-74l37 64q7 12 7 22q0 35 -39 35q-20 0 -32 -20l-37 -64l-37 64q-12 21 -30 21q-40 0 -40 -38q0 -10 6 -20l37 -64h-74q-38 0 -38 -37t38 -37h74l-37 -64q-7 -12 -7 -22q0 -35 39 -35q20 0 32 20l37 64l37 -64q12 -21 30 -21q40 0 40 38q0 10 -6 20l-37 64h74 q38 0 38 37zM1174 897q0 -60 -60 -60t-60 60t60 60t60 -60zM574 897q0 -60 -60 -60t-60 60t60 60t60 -60zM1174 257q0 -60 -60 -60t-60 60t60 60t60 -60zM574 257q0 -60 -60 -60t-60 60t60 60t60 -60zM1154 897q0 40 -40 40t-40 -40t40 -40t40 40zM554 897q0 40 -40 40 t-40 -40t40 -40t40 40zM1154 257q0 40 -40 40t-40 -40t40 -40t40 40zM554 257q0 40 -40 40t-40 -40t40 -40t40 40zM1134 897q0 -20 -20 -20t-20 20t20 20t20 -20zM534 897q0 -20 -20 -20t-20 20t20 20t20 -20zM1134 257q0 -20 -20 -20t-20 20t20 20t20 -20zM534 257 q0 -20 -20 -20t-20 20t20 20t20 -20z" />
+<glyph unicode="&#x1f01d;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM1392 1177q0 -115 -81.5 -196.5t-196.5 -81.5t-196.5 81.5 t-81.5 196.5t81.5 196.5t196.5 81.5t196.5 -81.5t81.5 -196.5zM792 1177q0 -115 -81.5 -196.5t-196.5 -81.5t-196.5 81.5t-81.5 196.5t81.5 196.5t196.5 81.5t196.5 -81.5t81.5 -196.5zM1092 577q0 -115 -81.5 -196.5t-196.5 -81.5t-196.5 81.5t-81.5 196.5t81.5 196.5 t196.5 81.5t196.5 -81.5t81.5 -196.5zM1392 -23q0 -115 -81.5 -196.5t-196.5 -81.5t-196.5 81.5t-81.5 196.5t81.5 196.5t196.5 81.5t196.5 -81.5t81.5 -196.5zM792 -23q0 -115 -81.5 -196.5t-196.5 -81.5t-196.5 81.5t-81.5 196.5t81.5 196.5t196.5 81.5t196.5 -81.5 t81.5 -196.5zM1372 1177q0 107 -75.5 182.5t-182.5 75.5t-182.5 -75.5t-75.5 -182.5t75.5 -182.5t182.5 -75.5t182.5 75.5t75.5 182.5zM772 1177q0 107 -75.5 182.5t-182.5 75.5t-182.5 -75.5t-75.5 -182.5t75.5 -182.5t182.5 -75.5t182.5 75.5t75.5 182.5zM1072 577 q0 107 -75.5 182.5t-182.5 75.5t-182.5 -75.5t-75.5 -182.5t75.5 -182.5t182.5 -75.5t182.5 75.5t75.5 182.5zM1372 -23q0 107 -75.5 182.5t-182.5 75.5t-182.5 -75.5t-75.5 -182.5t75.5 -182.5t182.5 -75.5t182.5 75.5t75.5 182.5zM772 -23q0 107 -75.5 182.5t-182.5 75.5 t-182.5 -75.5t-75.5 -182.5t75.5 -182.5t182.5 -75.5t182.5 75.5t75.5 182.5zM1342 1177q0 -94 -67 -161t-161 -67t-161 67t-67 161t67 161t161 67t161 -67t67 -161zM742 1177q0 -94 -67 -161t-161 -67t-161 67t-67 161t67 161t161 67t161 -67t67 -161zM1042 577 q0 -94 -67 -161t-161 -67t-161 67t-67 161t67 161t161 67t161 -67t67 -161zM1342 -23q0 -94 -67 -161t-161 -67t-161 67t-67 161t67 161t161 67t161 -67t67 -161zM742 -23q0 -94 -67 -161t-161 -67t-161 67t-67 161t67 161t161 67t161 -67t67 -161zM1322 1177q0 86 -61 147 t-147 61t-147 -61t-61 -147t61 -147t147 -61t147 61t61 147zM722 1177q0 86 -61 147t-147 61t-147 -61t-61 -147t61 -147t147 -61t147 61t61 147zM1022 577q0 86 -61 147t-147 61t-147 -61t-61 -147t61 -147t147 -61t147 61t61 147zM1322 -23q0 86 -61 147t-147 61t-147 -61 t-61 -147t61 -147t147 -61t147 61t61 147zM722 -23q0 86 -61 147t-147 61t-147 -61t-61 -147t61 -147t147 -61t147 61t61 147zM1310 1175q0 -55 -58 -55h-39q28 -48 28 -64q0 -58 -60 -58q-30 0 -67 65q-36 -63 -68 -63q-60 0 -60 54q0 17 29 66h-39q-58 0 -58 59 q0 55 58 55h39q-28 48 -28 64q0 58 60 58q30 0 67 -65q36 63 68 63q60 0 60 -54q0 -17 -29 -66h39q58 0 58 -59zM710 1175q0 -55 -58 -55h-39q28 -48 28 -64q0 -58 -60 -58q-30 0 -67 65q-36 -63 -68 -63q-60 0 -60 54q0 17 29 66h-39q-58 0 -58 59q0 55 58 55h39 q-28 48 -28 64q0 58 60 58q30 0 67 -65q36 63 68 63q60 0 60 -54q0 -17 -29 -66h39q58 0 58 -59zM1010 575q0 -55 -58 -55h-39q28 -48 28 -64q0 -58 -60 -58q-30 0 -67 65q-36 -63 -68 -63q-60 0 -60 54q0 17 29 66h-39q-58 0 -58 59q0 55 58 55h39q-28 48 -28 64 q0 58 60 58q30 0 67 -65q36 63 68 63q60 0 60 -54q0 -17 -29 -66h39q58 0 58 -59zM1310 -25q0 -55 -58 -55h-39q28 -48 28 -64q0 -58 -60 -58q-30 0 -67 65q-36 -63 -68 -63q-60 0 -60 54q0 17 29 66h-39q-58 0 -58 59q0 55 58 55h39q-28 48 -28 64q0 58 60 58q30 0 67 -65 q36 63 68 63q60 0 60 -54q0 -17 -29 -66h39q58 0 58 -59zM710 -25q0 -55 -58 -55h-39q28 -48 28 -64q0 -58 -60 -58q-30 0 -67 65q-36 -63 -68 -63q-60 0 -60 54q0 17 29 66h-39q-58 0 -58 59q0 55 58 55h39q-28 48 -28 64q0 58 60 58q30 0 67 -65q36 63 68 63q60 0 60 -54 q0 -17 -29 -66h39q58 0 58 -59zM1290 1177q0 37 -38 37h-74l37 64q7 12 7 22q0 35 -39 35q-20 0 -32 -20l-37 -64l-37 64q-12 21 -30 21q-40 0 -40 -38q0 -10 6 -20l37 -64h-74q-38 0 -38 -37t38 -37h74l-37 -64q-7 -12 -7 -22q0 -35 39 -35q20 0 32 20l37 64l37 -64 q12 -21 30 -21q40 0 40 38q0 10 -6 20l-37 64h74q38 0 38 37zM690 1177q0 37 -38 37h-74l37 64q7 12 7 22q0 35 -39 35q-20 0 -32 -20l-37 -64l-37 64q-12 21 -30 21q-40 0 -40 -38q0 -10 6 -20l37 -64h-74q-38 0 -38 -37t38 -37h74l-37 -64q-7 -12 -7 -22q0 -35 39 -35 q20 0 32 20l37 64l37 -64q12 -21 30 -21q40 0 40 38q0 10 -6 20l-37 64h74q38 0 38 37zM990 577q0 37 -38 37h-74l37 64q7 12 7 22q0 35 -39 35q-20 0 -32 -20l-37 -64l-37 64q-12 21 -30 21q-40 0 -40 -38q0 -10 6 -20l37 -64h-74q-38 0 -38 -37t38 -37h74l-37 -64 q-7 -12 -7 -22q0 -35 39 -35q20 0 32 20l37 64l37 -64q12 -21 30 -21q40 0 40 38q0 10 -6 20l-37 64h74q38 0 38 37zM1290 -23q0 37 -38 37h-74l37 64q7 12 7 22q0 35 -39 35q-20 0 -32 -20l-37 -64l-37 64q-12 21 -30 21q-40 0 -40 -38q0 -10 6 -20l37 -64h-74 q-38 0 -38 -37t38 -37h74l-37 -64q-7 -12 -7 -22q0 -35 39 -35q20 0 32 20l37 64l37 -64q12 -21 30 -21q40 0 40 38q0 10 -6 20l-37 64h74q38 0 38 37zM690 -23q0 37 -38 37h-74l37 64q7 12 7 22q0 35 -39 35q-20 0 -32 -20l-37 -64l-37 64q-12 21 -30 21q-40 0 -40 -38 q0 -10 6 -20l37 -64h-74q-38 0 -38 -37t38 -37h74l-37 -64q-7 -12 -7 -22q0 -35 39 -35q20 0 32 20l37 64l37 -64q12 -21 30 -21q40 0 40 38q0 10 -6 20l-37 64h74q38 0 38 37zM1174 1177q0 -60 -60 -60t-60 60t60 60t60 -60zM574 1177q0 -60 -60 -60t-60 60t60 60t60 -60z M874 577q0 -60 -60 -60t-60 60t60 60t60 -60zM1174 -23q0 -60 -60 -60t-60 60t60 60t60 -60zM574 -23q0 -60 -60 -60t-60 60t60 60t60 -60zM1154 1177q0 40 -40 40t-40 -40t40 -40t40 40zM554 1177q0 40 -40 40t-40 -40t40 -40t40 40zM854 577q0 40 -40 40t-40 -40t40 -40 t40 40zM1154 -23q0 40 -40 40t-40 -40t40 -40t40 40zM554 -23q0 40 -40 40t-40 -40t40 -40t40 40zM1134 1177q0 -20 -20 -20t-20 20t20 20t20 -20zM534 1177q0 -20 -20 -20t-20 20t20 20t20 -20zM834 577q0 -20 -20 -20t-20 20t20 20t20 -20zM1134 -23q0 -20 -20 -20t-20 20 t20 20t20 -20zM534 -23q0 -20 -20 -20t-20 20t20 20t20 -20z" />
+<glyph unicode="&#x1f01e;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM1392 1177q0 -115 -81.5 -196.5t-196.5 -81.5t-196.5 81.5 t-81.5 196.5t81.5 196.5t196.5 81.5t196.5 -81.5t81.5 -196.5zM792 1177q0 -115 -81.5 -196.5t-196.5 -81.5t-196.5 81.5t-81.5 196.5t81.5 196.5t196.5 81.5t196.5 -81.5t81.5 -196.5zM1392 577q0 -115 -81.5 -196.5t-196.5 -81.5t-196.5 81.5t-81.5 196.5t81.5 196.5 t196.5 81.5t196.5 -81.5t81.5 -196.5zM792 577q0 -115 -81.5 -196.5t-196.5 -81.5t-196.5 81.5t-81.5 196.5t81.5 196.5t196.5 81.5t196.5 -81.5t81.5 -196.5zM1392 -23q0 -115 -81.5 -196.5t-196.5 -81.5t-196.5 81.5t-81.5 196.5t81.5 196.5t196.5 81.5t196.5 -81.5 t81.5 -196.5zM792 -23q0 -115 -81.5 -196.5t-196.5 -81.5t-196.5 81.5t-81.5 196.5t81.5 196.5t196.5 81.5t196.5 -81.5t81.5 -196.5zM1372 1177q0 107 -75.5 182.5t-182.5 75.5t-182.5 -75.5t-75.5 -182.5t75.5 -182.5t182.5 -75.5t182.5 75.5t75.5 182.5zM772 1177 q0 107 -75.5 182.5t-182.5 75.5t-182.5 -75.5t-75.5 -182.5t75.5 -182.5t182.5 -75.5t182.5 75.5t75.5 182.5zM1372 577q0 107 -75.5 182.5t-182.5 75.5t-182.5 -75.5t-75.5 -182.5t75.5 -182.5t182.5 -75.5t182.5 75.5t75.5 182.5zM772 577q0 107 -75.5 182.5t-182.5 75.5 t-182.5 -75.5t-75.5 -182.5t75.5 -182.5t182.5 -75.5t182.5 75.5t75.5 182.5zM1372 -23q0 107 -75.5 182.5t-182.5 75.5t-182.5 -75.5t-75.5 -182.5t75.5 -182.5t182.5 -75.5t182.5 75.5t75.5 182.5zM772 -23q0 107 -75.5 182.5t-182.5 75.5t-182.5 -75.5t-75.5 -182.5 t75.5 -182.5t182.5 -75.5t182.5 75.5t75.5 182.5zM1342 1177q0 -94 -67 -161t-161 -67t-161 67t-67 161t67 161t161 67t161 -67t67 -161zM742 1177q0 -94 -67 -161t-161 -67t-161 67t-67 161t67 161t161 67t161 -67t67 -161zM1342 577q0 -94 -67 -161t-161 -67t-161 67 t-67 161t67 161t161 67t161 -67t67 -161zM742 577q0 -94 -67 -161t-161 -67t-161 67t-67 161t67 161t161 67t161 -67t67 -161zM1342 -23q0 -94 -67 -161t-161 -67t-161 67t-67 161t67 161t161 67t161 -67t67 -161zM742 -23q0 -94 -67 -161t-161 -67t-161 67t-67 161t67 161 t161 67t161 -67t67 -161zM1322 1177q0 86 -61 147t-147 61t-147 -61t-61 -147t61 -147t147 -61t147 61t61 147zM722 1177q0 86 -61 147t-147 61t-147 -61t-61 -147t61 -147t147 -61t147 61t61 147zM1322 577q0 86 -61 147t-147 61t-147 -61t-61 -147t61 -147t147 -61t147 61 t61 147zM722 577q0 86 -61 147t-147 61t-147 -61t-61 -147t61 -147t147 -61t147 61t61 147zM1322 -23q0 86 -61 147t-147 61t-147 -61t-61 -147t61 -147t147 -61t147 61t61 147zM722 -23q0 86 -61 147t-147 61t-147 -61t-61 -147t61 -147t147 -61t147 61t61 147zM1310 1175 q0 -55 -58 -55h-39q28 -48 28 -64q0 -58 -60 -58q-30 0 -67 65q-36 -63 -68 -63q-60 0 -60 54q0 17 29 66h-39q-58 0 -58 59q0 55 58 55h39q-28 48 -28 64q0 58 60 58q30 0 67 -65q36 63 68 63q60 0 60 -54q0 -17 -29 -66h39q58 0 58 -59zM710 1175q0 -55 -58 -55h-39 q28 -48 28 -64q0 -58 -60 -58q-30 0 -67 65q-36 -63 -68 -63q-60 0 -60 54q0 17 29 66h-39q-58 0 -58 59q0 55 58 55h39q-28 48 -28 64q0 58 60 58q30 0 67 -65q36 63 68 63q60 0 60 -54q0 -17 -29 -66h39q58 0 58 -59zM1310 575q0 -55 -58 -55h-39q28 -48 28 -64 q0 -58 -60 -58q-30 0 -67 65q-36 -63 -68 -63q-60 0 -60 54q0 17 29 66h-39q-58 0 -58 59q0 55 58 55h39q-28 48 -28 64q0 58 60 58q30 0 67 -65q36 63 68 63q60 0 60 -54q0 -17 -29 -66h39q58 0 58 -59zM710 575q0 -55 -58 -55h-39q28 -48 28 -64q0 -58 -60 -58 q-30 0 -67 65q-36 -63 -68 -63q-60 0 -60 54q0 17 29 66h-39q-58 0 -58 59q0 55 58 55h39q-28 48 -28 64q0 58 60 58q30 0 67 -65q36 63 68 63q60 0 60 -54q0 -17 -29 -66h39q58 0 58 -59zM1310 -25q0 -55 -58 -55h-39q28 -48 28 -64q0 -58 -60 -58q-30 0 -67 65 q-36 -63 -68 -63q-60 0 -60 54q0 17 29 66h-39q-58 0 -58 59q0 55 58 55h39q-28 48 -28 64q0 58 60 58q30 0 67 -65q36 63 68 63q60 0 60 -54q0 -17 -29 -66h39q58 0 58 -59zM710 -25q0 -55 -58 -55h-39q28 -48 28 -64q0 -58 -60 -58q-30 0 -67 65q-36 -63 -68 -63 q-60 0 -60 54q0 17 29 66h-39q-58 0 -58 59q0 55 58 55h39q-28 48 -28 64q0 58 60 58q30 0 67 -65q36 63 68 63q60 0 60 -54q0 -17 -29 -66h39q58 0 58 -59zM1290 1177q0 37 -38 37h-74l37 64q7 12 7 22q0 35 -39 35q-20 0 -32 -20l-37 -64l-37 64q-12 21 -30 21 q-40 0 -40 -38q0 -10 6 -20l37 -64h-74q-38 0 -38 -37t38 -37h74l-37 -64q-7 -12 -7 -22q0 -35 39 -35q20 0 32 20l37 64l37 -64q12 -21 30 -21q40 0 40 38q0 10 -6 20l-37 64h74q38 0 38 37zM690 1177q0 37 -38 37h-74l37 64q7 12 7 22q0 35 -39 35q-20 0 -32 -20l-37 -64 l-37 64q-12 21 -30 21q-40 0 -40 -38q0 -10 6 -20l37 -64h-74q-38 0 -38 -37t38 -37h74l-37 -64q-7 -12 -7 -22q0 -35 39 -35q20 0 32 20l37 64l37 -64q12 -21 30 -21q40 0 40 38q0 10 -6 20l-37 64h74q38 0 38 37zM1290 577q0 37 -38 37h-74l37 64q7 12 7 22q0 35 -39 35 q-20 0 -32 -20l-37 -64l-37 64q-12 21 -30 21q-40 0 -40 -38q0 -10 6 -20l37 -64h-74q-38 0 -38 -37t38 -37h74l-37 -64q-7 -12 -7 -22q0 -35 39 -35q20 0 32 20l37 64l37 -64q12 -21 30 -21q40 0 40 38q0 10 -6 20l-37 64h74q38 0 38 37zM690 577q0 37 -38 37h-74l37 64 q7 12 7 22q0 35 -39 35q-20 0 -32 -20l-37 -64l-37 64q-12 21 -30 21q-40 0 -40 -38q0 -10 6 -20l37 -64h-74q-38 0 -38 -37t38 -37h74l-37 -64q-7 -12 -7 -22q0 -35 39 -35q20 0 32 20l37 64l37 -64q12 -21 30 -21q40 0 40 38q0 10 -6 20l-37 64h74q38 0 38 37zM1290 -23 q0 37 -38 37h-74l37 64q7 12 7 22q0 35 -39 35q-20 0 -32 -20l-37 -64l-37 64q-12 21 -30 21q-40 0 -40 -38q0 -10 6 -20l37 -64h-74q-38 0 -38 -37t38 -37h74l-37 -64q-7 -12 -7 -22q0 -35 39 -35q20 0 32 20l37 64l37 -64q12 -21 30 -21q40 0 40 38q0 10 -6 20l-37 64h74 q38 0 38 37zM690 -23q0 37 -38 37h-74l37 64q7 12 7 22q0 35 -39 35q-20 0 -32 -20l-37 -64l-37 64q-12 21 -30 21q-40 0 -40 -38q0 -10 6 -20l37 -64h-74q-38 0 -38 -37t38 -37h74l-37 -64q-7 -12 -7 -22q0 -35 39 -35q20 0 32 20l37 64l37 -64q12 -21 30 -21q40 0 40 38 q0 10 -6 20l-37 64h74q38 0 38 37zM1174 1177q0 -60 -60 -60t-60 60t60 60t60 -60zM574 1177q0 -60 -60 -60t-60 60t60 60t60 -60zM1174 577q0 -60 -60 -60t-60 60t60 60t60 -60zM574 577q0 -60 -60 -60t-60 60t60 60t60 -60zM1174 -23q0 -60 -60 -60t-60 60t60 60t60 -60z M574 -23q0 -60 -60 -60t-60 60t60 60t60 -60zM1154 1177q0 40 -40 40t-40 -40t40 -40t40 40zM554 1177q0 40 -40 40t-40 -40t40 -40t40 40zM1154 577q0 40 -40 40t-40 -40t40 -40t40 40zM554 577q0 40 -40 40t-40 -40t40 -40t40 40zM1154 -23q0 40 -40 40t-40 -40t40 -40 t40 40zM554 -23q0 40 -40 40t-40 -40t40 -40t40 40zM1134 1177q0 -20 -20 -20t-20 20t20 20t20 -20zM534 1177q0 -20 -20 -20t-20 20t20 20t20 -20zM1134 577q0 -20 -20 -20t-20 20t20 20t20 -20zM534 577q0 -20 -20 -20t-20 20t20 20t20 -20zM1134 -23q0 -20 -20 -20 t-20 20t20 20t20 -20zM534 -23q0 -20 -20 -20t-20 20t20 20t20 -20z" />
+<glyph unicode="&#x1f01f;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM1499 945q0 -90 -63.5 -153.5t-153.5 -63.5t-153.5 63.5 t-63.5 153.5t63.5 153.5t153.5 63.5t153.5 -63.5t63.5 -153.5zM1031 1095q0 -90 -63.5 -153.5t-153.5 -63.5t-153.5 63.5t-63.5 153.5t63.5 153.5t153.5 63.5t153.5 -63.5t63.5 -153.5zM563 1245q0 -90 -63.5 -153.5t-153.5 -63.5t-153.5 63.5t-63.5 153.5t63.5 153.5 t153.5 63.5t153.5 -63.5t63.5 -153.5zM1331 445q0 -90 -63.5 -153.5t-153.5 -63.5t-153.5 63.5t-63.5 153.5t63.5 153.5t153.5 63.5t153.5 -63.5t63.5 -153.5zM1331 -55q0 -90 -63.5 -153.5t-153.5 -63.5t-153.5 63.5t-63.5 153.5t63.5 153.5t153.5 63.5t153.5 -63.5 t63.5 -153.5zM731 445q0 -90 -63.5 -153.5t-153.5 -63.5t-153.5 63.5t-63.5 153.5t63.5 153.5t153.5 63.5t153.5 -63.5t63.5 -153.5zM731 -55q0 -90 -63.5 -153.5t-153.5 -63.5t-153.5 63.5t-63.5 153.5t63.5 153.5t153.5 63.5t153.5 -63.5t63.5 -153.5zM1483 945 q0 83 -59 142t-142 59t-142 -59t-59 -142t59 -142t142 -59t142 59t59 142zM1015 1095q0 83 -59 142t-142 59t-142 -59t-59 -142t59 -142t142 -59t142 59t59 142zM547 1245q0 83 -59 142t-142 59t-142 -59t-59 -142t59 -142t142 -59t142 59t59 142zM1315 445q0 83 -59 142 t-142 59t-142 -59t-59 -142t59 -142t142 -59t142 59t59 142zM1315 -55q0 83 -59 142t-142 59t-142 -59t-59 -142t59 -142t142 -59t142 59t59 142zM715 445q0 83 -59 142t-142 59t-142 -59t-59 -142t59 -142t142 -59t142 59t59 142zM715 -55q0 83 -59 142t-142 59t-142 -59 t-59 -142t59 -142t142 -59t142 59t59 142zM1460 945q0 -74 -52 -126t-126 -52t-126 52t-52 126t52 126t126 52t126 -52t52 -126zM992 1095q0 -74 -52 -126t-126 -52t-126 52t-52 126t52 126t126 52t126 -52t52 -126zM524 1245q0 -74 -52 -126t-126 -52t-126 52t-52 126 t52 126t126 52t126 -52t52 -126zM1292 445q0 -74 -52 -126t-126 -52t-126 52t-52 126t52 126t126 52t126 -52t52 -126zM1292 -55q0 -74 -52 -126t-126 -52t-126 52t-52 126t52 126t126 52t126 -52t52 -126zM692 445q0 -74 -52 -126t-126 -52t-126 52t-52 126t52 126t126 52 t126 -52t52 -126zM692 -55q0 -74 -52 -126t-126 -52t-126 52t-52 126t52 126t126 52t126 -52t52 -126zM1444 945q0 67 -47.5 114.5t-114.5 47.5t-114.5 -47.5t-47.5 -114.5t47.5 -114.5t114.5 -47.5t114.5 47.5t47.5 114.5zM976 1095q0 67 -47.5 114.5t-114.5 47.5 t-114.5 -47.5t-47.5 -114.5t47.5 -114.5t114.5 -47.5t114.5 47.5t47.5 114.5zM508 1245q0 67 -47.5 114.5t-114.5 47.5t-114.5 -47.5t-47.5 -114.5t47.5 -114.5t114.5 -47.5t114.5 47.5t47.5 114.5zM1276 445q0 67 -47.5 114.5t-114.5 47.5t-114.5 -47.5t-47.5 -114.5 t47.5 -114.5t114.5 -47.5t114.5 47.5t47.5 114.5zM1276 -55q0 67 -47.5 114.5t-114.5 47.5t-114.5 -47.5t-47.5 -114.5t47.5 -114.5t114.5 -47.5t114.5 47.5t47.5 114.5zM676 445q0 67 -47.5 114.5t-114.5 47.5t-114.5 -47.5t-47.5 -114.5t47.5 -114.5t114.5 -47.5 t114.5 47.5t47.5 114.5zM676 -55q0 67 -47.5 114.5t-114.5 47.5t-114.5 -47.5t-47.5 -114.5t47.5 -114.5t114.5 -47.5t114.5 47.5t47.5 114.5zM1390 989q45 0 45 -44t-45 -44h-31q22 -38 22 -50q0 -45 -46 -45q-25 0 -53 50q-28 -49 -53 -49q-47 0 -47 42q0 13 23 52h-31 q-45 0 -45 44t45 44h31q-22 38 -22 50q0 45 46 45q25 0 53 -50q28 49 53 49q47 0 47 -42q0 -13 -23 -52h31zM922 1139q45 0 45 -44t-45 -44h-31q22 -38 22 -50q0 -45 -46 -45q-25 0 -53 50q-28 -49 -53 -49q-47 0 -47 42q0 13 23 52h-31q-45 0 -45 44t45 44h31 q-22 38 -22 50q0 45 46 45q25 0 53 -50q28 49 53 49q47 0 47 -42q0 -13 -23 -52h31zM454 1289q45 0 45 -44t-45 -44h-31q22 -38 22 -50q0 -45 -46 -45q-25 0 -53 50q-28 -49 -53 -49q-47 0 -47 42q0 13 23 52h-31q-45 0 -45 44t45 44h31q-22 38 -22 50q0 45 46 45 q25 0 53 -50q28 49 53 49q47 0 47 -42q0 -13 -23 -52h31zM1222 489q45 0 45 -44t-45 -44h-31q22 -38 22 -50q0 -45 -46 -45q-25 0 -53 50q-28 -49 -53 -49q-47 0 -47 42q0 13 23 52h-31q-45 0 -45 44t45 44h31q-22 38 -22 50q0 45 46 45q25 0 53 -50q28 49 53 49 q47 0 47 -42q0 -13 -23 -52h31zM1222 -11q45 0 45 -44t-45 -44h-31q22 -38 22 -50q0 -45 -46 -45q-25 0 -53 50q-28 -49 -53 -49q-47 0 -47 42q0 13 23 52h-31q-45 0 -45 44t45 44h31q-22 38 -22 50q0 45 46 45q25 0 53 -50q28 49 53 49q47 0 47 -42q0 -13 -23 -52h31z M622 489q45 0 45 -44t-45 -44h-31q22 -38 22 -50q0 -45 -46 -45q-25 0 -53 50q-28 -49 -53 -49q-47 0 -47 42q0 13 23 52h-31q-45 0 -45 44t45 44h31q-22 38 -22 50q0 45 46 45q25 0 53 -50q28 49 53 49q47 0 47 -42q0 -13 -23 -52h31zM622 -11q45 0 45 -44t-45 -44h-31 q22 -38 22 -50q0 -45 -46 -45q-25 0 -53 50q-28 -49 -53 -49q-47 0 -47 42q0 13 23 52h-31q-45 0 -45 44t45 44h31q-22 38 -22 50q0 45 46 45q25 0 53 -50q28 49 53 49q47 0 47 -42q0 -13 -23 -52h31zM1419 945q0 29 -29 29h-58l29 50q5 9 5 17q0 27 -30 27q-16 0 -25 -15 l-29 -50l-29 50q-9 16 -24 16q-30 0 -30 -30q0 -8 4 -15l29 -50h-58q-29 0 -29 -29t29 -29h58l-29 -50q-5 -9 -5 -17q0 -27 30 -27q16 0 25 15l29 50l29 -50q9 -16 24 -16q30 0 30 30q0 8 -4 15l-29 50h58q29 0 29 29zM951 1095q0 29 -29 29h-58l29 50q5 9 5 17q0 27 -30 27 q-16 0 -25 -15l-29 -50l-29 50q-9 16 -24 16q-30 0 -30 -30q0 -8 4 -15l29 -50h-58q-29 0 -29 -29t29 -29h58l-29 -50q-5 -9 -5 -17q0 -27 30 -27q16 0 25 15l29 50l29 -50q9 -16 24 -16q30 0 30 30q0 8 -4 15l-29 50h58q29 0 29 29zM483 1245q0 29 -29 29h-58l29 50 q5 9 5 17q0 27 -30 27q-16 0 -25 -15l-29 -50l-29 50q-9 16 -24 16q-30 0 -30 -30q0 -8 4 -15l29 -50h-58q-29 0 -29 -29t29 -29h58l-29 -50q-5 -9 -5 -17q0 -27 30 -27q16 0 25 15l29 50l29 -50q9 -16 24 -16q30 0 30 30q0 8 -4 15l-29 50h58q29 0 29 29zM1251 445 q0 29 -29 29h-58l29 50q5 9 5 17q0 27 -30 27q-16 0 -25 -15l-29 -50l-29 50q-9 16 -24 16q-30 0 -30 -30q0 -8 4 -15l29 -50h-58q-29 0 -29 -29t29 -29h58l-29 -50q-5 -9 -5 -17q0 -27 30 -27q16 0 25 15l29 50l29 -50q9 -16 24 -16q30 0 30 30q0 8 -4 15l-29 50h58 q29 0 29 29zM1251 -55q0 29 -29 29h-58l29 50q5 9 5 17q0 27 -30 27q-16 0 -25 -15l-29 -50l-29 50q-9 16 -24 16q-30 0 -30 -30q0 -8 4 -15l29 -50h-58q-29 0 -29 -29t29 -29h58l-29 -50q-5 -9 -5 -17q0 -27 30 -27q16 0 25 15l29 50l29 -50q9 -16 24 -16q30 0 30 30 q0 8 -4 15l-29 50h58q29 0 29 29zM651 445q0 29 -29 29h-58l29 50q5 9 5 17q0 27 -30 27q-16 0 -25 -15l-29 -50l-29 50q-9 16 -24 16q-30 0 -30 -30q0 -8 4 -15l29 -50h-58q-29 0 -29 -29t29 -29h58l-29 -50q-5 -9 -5 -17q0 -27 30 -27q16 0 25 15l29 50l29 -50 q9 -16 24 -16q30 0 30 30q0 8 -4 15l-29 50h58q29 0 29 29zM651 -55q0 29 -29 29h-58l29 50q5 9 5 17q0 27 -30 27q-16 0 -25 -15l-29 -50l-29 50q-9 16 -24 16q-30 0 -30 -30q0 -8 4 -15l29 -50h-58q-29 0 -29 -29t29 -29h58l-29 -50q-5 -9 -5 -17q0 -27 30 -27q16 0 25 15 l29 50l29 -50q9 -16 24 -16q30 0 30 30q0 8 -4 15l-29 50h58q29 0 29 29zM1329 945q0 -47 -47 -47t-47 47t47 47t47 -47zM861 1095q0 -47 -47 -47t-47 47t47 47t47 -47zM393 1245q0 -47 -47 -47t-47 47t47 47t47 -47zM1161 445q0 -47 -47 -47t-47 47t47 47t47 -47zM1161 -55 q0 -47 -47 -47t-47 47t47 47t47 -47zM561 445q0 -47 -47 -47t-47 47t47 47t47 -47zM561 -55q0 -47 -47 -47t-47 47t47 47t47 -47zM1313 945q0 31 -31 31t-31 -31t31 -31t31 31zM845 1095q0 31 -31 31t-31 -31t31 -31t31 31zM377 1245q0 31 -31 31t-31 -31t31 -31t31 31z M1145 445q0 31 -31 31t-31 -31t31 -31t31 31zM1145 -55q0 31 -31 31t-31 -31t31 -31t31 31zM545 445q0 31 -31 31t-31 -31t31 -31t31 31zM545 -55q0 31 -31 31t-31 -31t31 -31t31 31zM1298 945q0 -16 -16 -16t-16 16t16 16t16 -16zM830 1095q0 -16 -16 -16t-16 16t16 16 t16 -16zM362 1245q0 -16 -16 -16t-16 16t16 16t16 -16zM1130 445q0 -16 -16 -16t-16 16t16 16t16 -16zM1130 -55q0 -16 -16 -16t-16 16t16 16t16 -16zM530 445q0 -16 -16 -16t-16 16t16 16t16 -16zM530 -55q0 -16 -16 -16t-16 16t16 16t16 -16z" />
+<glyph unicode="&#x1f020;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM1306 1266q0 -88 -62.5 -150t-150.5 -62t-150 62t-62 150 t62 150.5t150 62.5t150.5 -62.5t62.5 -150.5zM1306 808q0 -88 -62.5 -150.5t-150.5 -62.5t-150 62.5t-62 150.5t62 150t150 62t150.5 -62t62.5 -150zM747 1266q0 -88 -62 -150t-150 -62t-150.5 62t-62.5 150t62.5 150.5t150.5 62.5t150 -62.5t62 -150.5zM1306 349 q0 -88 -62.5 -150.5t-150.5 -62.5t-150 62.5t-62 150.5t62 150t150 62t150.5 -62t62.5 -150zM747 808q0 -88 -62 -150.5t-150 -62.5t-150.5 62.5t-62.5 150.5t62.5 150t150.5 62t150 -62t62 -150zM1306 -110q0 -88 -62.5 -150t-150.5 -62t-150 62t-62 150t62 150.5t150 62.5 t150.5 -62.5t62.5 -150.5zM747 349q0 -88 -62 -150.5t-150 -62.5t-150.5 62.5t-62.5 150.5t62.5 150t150.5 62t150 -62t62 -150zM747 -110q0 -88 -62 -150t-150 -62t-150.5 62t-62.5 150t62.5 150.5t150.5 62.5t150 -62.5t62 -150.5zM1291 1266q0 82 -58 139.5t-140 57.5 t-139.5 -57.5t-57.5 -139.5t57.5 -139.5t139.5 -57.5t140 57.5t58 139.5zM1291 808q0 82 -58 139.5t-140 57.5t-139.5 -57.5t-57.5 -139.5t57.5 -140t139.5 -58t140 58t58 140zM732 1266q0 82 -57.5 139.5t-139.5 57.5t-140 -57.5t-58 -139.5t58 -139.5t140 -57.5 t139.5 57.5t57.5 139.5zM1291 349q0 82 -58 139.5t-140 57.5t-139.5 -57.5t-57.5 -139.5t57.5 -139.5t139.5 -57.5t140 57.5t58 139.5zM732 808q0 82 -57.5 139.5t-139.5 57.5t-140 -57.5t-58 -139.5t58 -140t140 -58t139.5 58t57.5 140zM1291 -110q0 82 -58 139.5 t-140 57.5t-139.5 -57.5t-57.5 -139.5t57.5 -139.5t139.5 -57.5t140 57.5t58 139.5zM732 349q0 82 -57.5 139.5t-139.5 57.5t-140 -57.5t-58 -139.5t58 -139.5t140 -57.5t139.5 57.5t57.5 139.5zM732 -110q0 82 -57.5 139.5t-139.5 57.5t-140 -57.5t-58 -139.5t58 -139.5 t140 -57.5t139.5 57.5t57.5 139.5zM1268 1266q0 -72 -51.5 -123t-123.5 -51t-123 51t-51 123t51 123.5t123 51.5t123.5 -51.5t51.5 -123.5zM1268 808q0 -72 -51.5 -123.5t-123.5 -51.5t-123 51.5t-51 123.5t51 123t123 51t123.5 -51t51.5 -123zM709 1266q0 -72 -51 -123 t-123 -51t-123.5 51t-51.5 123t51.5 123.5t123.5 51.5t123 -51.5t51 -123.5zM1268 349q0 -72 -51.5 -123t-123.5 -51t-123 51t-51 123t51 123t123 51t123.5 -51t51.5 -123zM709 808q0 -72 -51 -123.5t-123 -51.5t-123.5 51.5t-51.5 123.5t51.5 123t123.5 51t123 -51t51 -123 zM1268 -110q0 -72 -51.5 -123t-123.5 -51t-123 51t-51 123t51 123t123 51t123.5 -51t51.5 -123zM709 349q0 -72 -51 -123t-123 -51t-123.5 51t-51.5 123t51.5 123t123.5 51t123 -51t51 -123zM709 -110q0 -72 -51 -123t-123 -51t-123.5 51t-51.5 123t51.5 123t123.5 51 t123 -51t51 -123zM1252 1266q0 66 -46.5 112.5t-112.5 46.5t-112.5 -46.5t-46.5 -112.5t46.5 -112.5t112.5 -46.5t112.5 46.5t46.5 112.5zM1252 808q0 66 -46.5 112.5t-112.5 46.5t-112.5 -46.5t-46.5 -112.5t46.5 -113t112.5 -47t112.5 47t46.5 113zM694 1266 q0 66 -46.5 112.5t-112.5 46.5t-112.5 -46.5t-46.5 -112.5t46.5 -112.5t112.5 -46.5t112.5 46.5t46.5 112.5zM1252 349q0 66 -46.5 112.5t-112.5 46.5t-112.5 -46.5t-46.5 -112.5t46.5 -112.5t112.5 -46.5t112.5 46.5t46.5 112.5zM694 808q0 66 -46.5 112.5t-112.5 46.5 t-112.5 -46.5t-46.5 -112.5t46.5 -113t112.5 -47t112.5 47t46.5 113zM1252 -110q0 66 -46.5 112.5t-112.5 46.5t-112.5 -46.5t-46.5 -112.5t46.5 -112.5t112.5 -46.5t112.5 46.5t46.5 112.5zM694 349q0 66 -46.5 112.5t-112.5 46.5t-112.5 -46.5t-46.5 -112.5t46.5 -112.5 t112.5 -46.5t112.5 46.5t46.5 112.5zM694 -110q0 66 -46.5 112.5t-112.5 46.5t-112.5 -46.5t-46.5 -112.5t46.5 -112.5t112.5 -46.5t112.5 46.5t46.5 112.5zM1243 1265q0 -42 -44 -42h-30q21 -36 21 -49q0 -44 -45 -44q-24 0 -52 49q-27 -48 -52 -48q-45 0 -45 42 q0 12 22 50h-30q-45 0 -45 43.5t45 43.5h30q-21 36 -21 49q0 44 45 44q23 0 51 -50q28 49 53 49q45 0 45 -42q0 -12 -22 -50h30q44 0 44 -45zM1243 806q0 -42 -44 -42h-30q21 -36 21 -49q0 -44 -45 -44q-24 0 -52 49q-27 -48 -52 -48q-45 0 -45 42q0 12 22 50h-30 q-45 0 -45 45q0 42 45 42h30q-21 36 -21 49q0 44 45 44q23 0 51 -49q27 48 53 48q45 0 45 -42q0 -12 -22 -50h30q44 0 44 -45zM685 1265q0 -42 -45 -42h-30q21 -36 21 -49q0 -44 -45 -44q-23 0 -51 49q-27 -48 -53 -48q-45 0 -45 42q0 12 22 50h-30q-44 0 -44 43.5t44 43.5 h30q-21 36 -21 49q0 44 45 44q24 0 52 -50q28 49 52 49q45 0 45 -42q0 -12 -22 -50h30q45 0 45 -45zM1199 392q44 0 44 -43.5t-44 -43.5h-30q21 -36 21 -49q0 -44 -45 -44q-24 0 -52 50q-28 -49 -52 -49q-45 0 -45 42q0 12 22 50h-30q-45 0 -45 45q0 42 45 42h30 q-21 36 -21 49q0 44 45 44q23 0 51 -49q27 48 53 48q45 0 45 -41q0 -13 -22 -51h30zM685 806q0 -42 -45 -42h-30q21 -36 21 -49q0 -44 -45 -44q-23 0 -51 49q-27 -48 -53 -48q-45 0 -45 42q0 12 22 50h-30q-44 0 -44 45q0 42 44 42h30q-21 36 -21 49q0 44 45 44q24 0 52 -49 q27 48 52 48q45 0 45 -42q0 -12 -22 -50h30q45 0 45 -45zM1243 -111q0 -42 -44 -42h-30q21 -36 21 -49q0 -44 -45 -44q-24 0 -52 49q-27 -48 -52 -48q-45 0 -45 41q0 13 22 51h-30q-45 0 -45 43.5t45 43.5h30q-21 36 -21 49q0 44 45 44q23 0 51 -50q28 49 53 49q45 0 45 -42 q0 -12 -22 -50h30q44 0 44 -45zM640 392q45 0 45 -43.5t-45 -43.5h-30q21 -36 21 -49q0 -44 -45 -44q-23 0 -51 50q-28 -49 -53 -49q-45 0 -45 42q0 12 22 50h-30q-44 0 -44 45q0 42 44 42h30q-21 36 -21 49q0 44 45 44q24 0 52 -49q27 48 52 48q45 0 45 -41q0 -13 -22 -51 h30zM685 -111q0 -42 -45 -42h-30q21 -36 21 -49q0 -44 -45 -44q-23 0 -51 49q-27 -48 -53 -48q-45 0 -45 41q0 13 22 51h-30q-44 0 -44 43.5t44 43.5h30q-21 36 -21 49q0 44 45 44q24 0 52 -50q28 49 52 49q45 0 45 -42q0 -12 -22 -50h30q45 0 45 -45zM1199 1238 q29 0 29 28.5t-29 28.5h-57l29 48q5 8 5 17q0 27 -30 27q-15 0 -24 -15l-29 -49l-28 49q-9 15 -23 15q-30 0 -30 -28q0 -9 4 -16l28 -48h-56q-29 0 -29 -28.5t29 -28.5h56l-28 -49q-5 -9 -5 -17q0 -26 29 -26q16 0 25 15l28 49l29 -49q9 -16 23 -16q30 0 30 29q0 8 -4 15 l-29 49h57zM1199 779q29 0 29 28.5t-29 28.5h-57l29 49q5 8 5 16q0 27 -30 27q-15 0 -24 -15l-29 -49l-28 49q-9 16 -23 16q-30 0 -30 -29q0 -8 4 -15l28 -49h-56q-29 0 -29 -28.5t29 -28.5h56l-28 -49q-5 -9 -5 -16q0 -27 29 -27q16 0 25 15l28 49l29 -49q9 -16 23 -16 q30 0 30 29q0 8 -4 15l-29 49h57zM640 1238q29 0 29 28.5t-29 28.5h-56l28 48q5 9 5 17q0 27 -29 27q-16 0 -25 -15l-28 -49l-29 49q-9 15 -23 15q-30 0 -30 -28q0 -9 4 -16l29 -48h-57q-29 0 -29 -28.5t29 -28.5h57l-29 -49q-5 -8 -5 -17q0 -26 30 -26q15 0 24 15l29 49 l28 -49q9 -16 23 -16q30 0 30 29q0 8 -4 15l-28 49h56zM1228 349q0 28 -29 28h-57l29 49q5 8 5 17q0 26 -30 26q-15 0 -24 -15l-29 -49l-28 49q-9 16 -23 16q-30 0 -30 -29q0 -8 4 -15l28 -49h-56q-29 0 -29 -28t29 -28h56l-28 -49q-5 -9 -5 -17q0 -27 29 -27q16 0 25 15 l28 49l29 -49q9 -15 23 -15q30 0 30 28q0 9 -4 16l-29 49h57q29 0 29 28zM640 779q29 0 29 28.5t-29 28.5h-56l28 49q5 9 5 16q0 27 -29 27q-16 0 -25 -15l-28 -49l-29 49q-9 16 -23 16q-30 0 -30 -29q0 -8 4 -15l29 -49h-57q-29 0 -29 -28.5t29 -28.5h57l-29 -49 q-5 -8 -5 -16q0 -27 30 -27q15 0 24 15l29 49l28 -49q9 -16 23 -16q30 0 30 29q0 8 -4 15l-28 49h56zM1228 -110q0 28 -29 28h-57l29 49q5 8 5 17q0 27 -30 27q-15 0 -24 -15l-29 -49l-28 49q-9 15 -23 15q-30 0 -30 -28q0 -9 4 -16l28 -49h-56q-29 0 -29 -28t29 -28h56 l-28 -49q-5 -9 -5 -17q0 -26 29 -26q16 0 25 15l28 49l29 -49q9 -16 23 -16q30 0 30 29q0 8 -4 15l-29 49h57q29 0 29 28zM669 349q0 28 -29 28h-56l28 49q5 9 5 17q0 26 -29 26q-16 0 -25 -15l-28 -49l-29 49q-9 16 -23 16q-30 0 -30 -29q0 -8 4 -15l29 -49h-57 q-29 0 -29 -28t29 -28h57l-29 -49q-5 -8 -5 -17q0 -27 30 -27q15 0 24 15l29 49l28 -49q9 -15 23 -15q30 0 30 28q0 9 -4 16l-28 49h56q29 0 29 28zM669 -110q0 28 -29 28h-56l28 49q5 9 5 17q0 27 -29 27q-16 0 -25 -15l-28 -49l-29 49q-9 15 -23 15q-30 0 -30 -28 q0 -9 4 -16l29 -49h-57q-29 0 -29 -28t29 -28h57l-29 -49q-5 -8 -5 -17q0 -26 30 -26q15 0 24 15l29 49l28 -49q9 -16 23 -16q30 0 30 29q0 8 -4 15l-28 49h56q29 0 29 28zM1139 1266q0 -46 -46 -46t-46 46t46 46t46 -46zM1093 853q46 0 46 -45.5t-46 -45.5t-46 45.5 t46 45.5zM581 1266q0 -46 -46 -46t-46 46t46 46t46 -46zM1139 349q0 -46 -46 -46t-46 46t46 46t46 -46zM535 853q46 0 46 -45.5t-46 -45.5t-46 45.5t46 45.5zM1139 -110q0 -46 -46 -46t-46 46t46 46t46 -46zM581 349q0 -46 -46 -46t-46 46t46 46t46 -46zM581 -110 q0 -46 -46 -46t-46 46t46 46t46 -46zM1124 1266.5q0 30.5 -30.5 30.5t-30.5 -30.5t30.5 -30.5t30.5 30.5zM1124 807.5q0 30.5 -30.5 30.5t-30.5 -30.5t30.5 -30.5t30.5 30.5zM565 1266.5q0 30.5 -30.5 30.5t-30.5 -30.5t30.5 -30.5t30.5 30.5zM1124 348.5q0 30.5 -30.5 30.5 t-30.5 -30.5t30.5 -30.5t30.5 30.5zM565 807.5q0 30.5 -30.5 30.5t-30.5 -30.5t30.5 -30.5t30.5 30.5zM1124 -109.5q0 30.5 -30.5 30.5t-30.5 -30.5t30.5 -30.5t30.5 30.5zM565 348.5q0 30.5 -30.5 30.5t-30.5 -30.5t30.5 -30.5t30.5 30.5zM565 -109.5q0 30.5 -30.5 30.5 t-30.5 -30.5t30.5 -30.5t30.5 30.5zM1109 1266.5q0 -15.5 -15.5 -15.5t-15.5 15.5t15.5 15.5t15.5 -15.5zM1109 807.5q0 -15.5 -15.5 -15.5t-15.5 15.5t15.5 15.5t15.5 -15.5zM550 1266.5q0 -15.5 -15.5 -15.5t-15.5 15.5t15.5 15.5t15.5 -15.5zM1109 349q0 -15 -15.5 -15 t-15.5 15t15.5 15t15.5 -15zM550 807.5q0 -15.5 -15.5 -15.5t-15.5 15.5t15.5 15.5t15.5 -15.5zM1109 -110q0 -15 -15.5 -15t-15.5 15t15.5 15t15.5 -15zM550 349q0 -15 -15.5 -15t-15.5 15t15.5 15t15.5 -15zM550 -110q0 -15 -15.5 -15t-15.5 15t15.5 15t15.5 -15z" />
+<glyph unicode="&#x1f021;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM1499 1145q0 -90 -63.5 -153.5t-153.5 -63.5t-153.5 63.5 t-63.5 153.5t63.5 153.5t153.5 63.5t153.5 -63.5t63.5 -153.5zM1031 1145q0 -90 -63.5 -153.5t-153.5 -63.5t-153.5 63.5t-63.5 153.5t63.5 153.5t153.5 63.5t153.5 -63.5t63.5 -153.5zM1499 577q0 -90 -63.5 -153.5t-153.5 -63.5t-153.5 63.5t-63.5 153.5t63.5 153.5 t153.5 63.5t153.5 -63.5t63.5 -153.5zM563 1145q0 -90 -63.5 -153.5t-153.5 -63.5t-153.5 63.5t-63.5 153.5t63.5 153.5t153.5 63.5t153.5 -63.5t63.5 -153.5zM1031 577q0 -90 -63.5 -153.5t-153.5 -63.5t-153.5 63.5t-63.5 153.5t63.5 153.5t153.5 63.5t153.5 -63.5 t63.5 -153.5zM1499 9q0 -90 -63.5 -153.5t-153.5 -63.5t-153.5 63.5t-63.5 153.5t63.5 153.5t153.5 63.5t153.5 -63.5t63.5 -153.5zM563 577q0 -90 -63.5 -153.5t-153.5 -63.5t-153.5 63.5t-63.5 153.5t63.5 153.5t153.5 63.5t153.5 -63.5t63.5 -153.5zM1031 9 q0 -90 -63.5 -153.5t-153.5 -63.5t-153.5 63.5t-63.5 153.5t63.5 153.5t153.5 63.5t153.5 -63.5t63.5 -153.5zM563 9q0 -90 -63.5 -153.5t-153.5 -63.5t-153.5 63.5t-63.5 153.5t63.5 153.5t153.5 63.5t153.5 -63.5t63.5 -153.5zM1483 1145q0 83 -59 142t-142 59t-142 -59 t-59 -142t59 -142t142 -59t142 59t59 142zM1015 1145q0 83 -59 142t-142 59t-142 -59t-59 -142t59 -142t142 -59t142 59t59 142zM1483 577q0 83 -59 142t-142 59t-142 -59t-59 -142t59 -142t142 -59t142 59t59 142zM547 1145q0 83 -59 142t-142 59t-142 -59t-59 -142 t59 -142t142 -59t142 59t59 142zM1015 577q0 83 -59 142t-142 59t-142 -59t-59 -142t59 -142t142 -59t142 59t59 142zM1483 9q0 83 -59 142t-142 59t-142 -59t-59 -142t59 -142t142 -59t142 59t59 142zM547 577q0 83 -59 142t-142 59t-142 -59t-59 -142t59 -142t142 -59 t142 59t59 142zM1015 9q0 83 -59 142t-142 59t-142 -59t-59 -142t59 -142t142 -59t142 59t59 142zM547 9q0 83 -59 142t-142 59t-142 -59t-59 -142t59 -142t142 -59t142 59t59 142zM1460 1145q0 -74 -52 -126t-126 -52t-126 52t-52 126t52 126t126 52t126 -52t52 -126z M992 1145q0 -74 -52 -126t-126 -52t-126 52t-52 126t52 126t126 52t126 -52t52 -126zM1460 577q0 -74 -52 -126t-126 -52t-126 52t-52 126t52 126t126 52t126 -52t52 -126zM524 1145q0 -74 -52 -126t-126 -52t-126 52t-52 126t52 126t126 52t126 -52t52 -126zM992 577 q0 -74 -52 -126t-126 -52t-126 52t-52 126t52 126t126 52t126 -52t52 -126zM1460 9q0 -74 -52 -126t-126 -52t-126 52t-52 126t52 126t126 52t126 -52t52 -126zM524 577q0 -74 -52 -126t-126 -52t-126 52t-52 126t52 126t126 52t126 -52t52 -126zM992 9q0 -74 -52 -126 t-126 -52t-126 52t-52 126t52 126t126 52t126 -52t52 -126zM524 9q0 -74 -52 -126t-126 -52t-126 52t-52 126t52 126t126 52t126 -52t52 -126zM1444 1145q0 67 -47.5 114.5t-114.5 47.5t-114.5 -47.5t-47.5 -114.5t47.5 -114.5t114.5 -47.5t114.5 47.5t47.5 114.5zM976 1145 q0 67 -47.5 114.5t-114.5 47.5t-114.5 -47.5t-47.5 -114.5t47.5 -114.5t114.5 -47.5t114.5 47.5t47.5 114.5zM1444 577q0 67 -47.5 114.5t-114.5 47.5t-114.5 -47.5t-47.5 -114.5t47.5 -114.5t114.5 -47.5t114.5 47.5t47.5 114.5zM508 1145q0 67 -47.5 114.5t-114.5 47.5 t-114.5 -47.5t-47.5 -114.5t47.5 -114.5t114.5 -47.5t114.5 47.5t47.5 114.5zM976 577q0 67 -47.5 114.5t-114.5 47.5t-114.5 -47.5t-47.5 -114.5t47.5 -114.5t114.5 -47.5t114.5 47.5t47.5 114.5zM1444 9q0 67 -47.5 114.5t-114.5 47.5t-114.5 -47.5t-47.5 -114.5 t47.5 -114.5t114.5 -47.5t114.5 47.5t47.5 114.5zM508 577q0 67 -47.5 114.5t-114.5 47.5t-114.5 -47.5t-47.5 -114.5t47.5 -114.5t114.5 -47.5t114.5 47.5t47.5 114.5zM976 9q0 67 -47.5 114.5t-114.5 47.5t-114.5 -47.5t-47.5 -114.5t47.5 -114.5t114.5 -47.5t114.5 47.5 t47.5 114.5zM508 9q0 67 -47.5 114.5t-114.5 47.5t-114.5 -47.5t-47.5 -114.5t47.5 -114.5t114.5 -47.5t114.5 47.5t47.5 114.5zM1390 1189q45 0 45 -44t-45 -44h-31q22 -38 22 -50q0 -45 -46 -45q-25 0 -53 50q-28 -49 -53 -49q-47 0 -47 42q0 13 23 52h-31q-45 0 -45 44 t45 44h31q-22 38 -22 50q0 45 46 45q25 0 53 -50q28 49 53 49q47 0 47 -42q0 -13 -23 -52h31zM922 1189q45 0 45 -44t-45 -44h-31q22 -38 22 -50q0 -45 -46 -45q-25 0 -53 50q-28 -49 -53 -49q-47 0 -47 42q0 13 23 52h-31q-45 0 -45 44t45 44h31q-22 38 -22 50q0 45 46 45 q25 0 53 -50q28 49 53 49q47 0 47 -42q0 -13 -23 -52h31zM1390 621q45 0 45 -44t-45 -44h-31q22 -38 22 -50q0 -45 -46 -45q-25 0 -53 50q-28 -49 -53 -49q-47 0 -47 42q0 13 23 52h-31q-45 0 -45 44t45 44h31q-22 38 -22 50q0 45 46 45q25 0 53 -50q28 49 53 49 q47 0 47 -42q0 -13 -23 -52h31zM454 1189q45 0 45 -44t-45 -44h-31q22 -38 22 -50q0 -45 -46 -45q-25 0 -53 50q-28 -49 -53 -49q-47 0 -47 42q0 13 23 52h-31q-45 0 -45 44t45 44h31q-22 38 -22 50q0 45 46 45q25 0 53 -50q28 49 53 49q47 0 47 -42q0 -13 -23 -52h31z M922 621q45 0 45 -44t-45 -44h-31q22 -38 22 -50q0 -45 -46 -45q-25 0 -53 50q-28 -49 -53 -49q-47 0 -47 42q0 13 23 52h-31q-45 0 -45 44t45 44h31q-22 38 -22 50q0 45 46 45q25 0 53 -50q28 49 53 49q47 0 47 -42q0 -13 -23 -52h31zM1390 53q45 0 45 -44t-45 -44h-31 q22 -38 22 -50q0 -45 -46 -45q-25 0 -53 50q-28 -49 -53 -49q-47 0 -47 42q0 13 23 52h-31q-45 0 -45 44t45 44h31q-22 38 -22 50q0 45 46 45q25 0 53 -50q28 49 53 49q47 0 47 -42q0 -13 -23 -52h31zM454 621q45 0 45 -44t-45 -44h-31q22 -38 22 -50q0 -45 -46 -45 q-25 0 -53 50q-28 -49 -53 -49q-47 0 -47 42q0 13 23 52h-31q-45 0 -45 44t45 44h31q-22 38 -22 50q0 45 46 45q25 0 53 -50q28 49 53 49q47 0 47 -42q0 -13 -23 -52h31zM922 53q45 0 45 -44t-45 -44h-31q22 -38 22 -50q0 -45 -46 -45q-25 0 -53 50q-28 -49 -53 -49 q-47 0 -47 42q0 13 23 52h-31q-45 0 -45 44t45 44h31q-22 38 -22 50q0 45 46 45q25 0 53 -50q28 49 53 49q47 0 47 -42q0 -13 -23 -52h31zM454 53q45 0 45 -44t-45 -44h-31q22 -38 22 -50q0 -45 -46 -45q-25 0 -53 50q-28 -49 -53 -49q-47 0 -47 42q0 13 23 52h-31 q-45 0 -45 44t45 44h31q-22 38 -22 50q0 45 46 45q25 0 53 -50q28 49 53 49q47 0 47 -42q0 -13 -23 -52h31zM1419 1145q0 29 -29 29h-58l29 50q5 9 5 17q0 27 -30 27q-16 0 -25 -15l-29 -50l-29 50q-9 16 -24 16q-30 0 -30 -30q0 -8 4 -15l29 -50h-58q-29 0 -29 -29t29 -29 h58l-29 -50q-5 -9 -5 -17q0 -27 30 -27q16 0 25 15l29 50l29 -50q9 -16 24 -16q30 0 30 30q0 8 -4 15l-29 50h58q29 0 29 29zM951 1145q0 29 -29 29h-58l29 50q5 9 5 17q0 27 -30 27q-16 0 -25 -15l-29 -50l-29 50q-9 16 -24 16q-30 0 -30 -30q0 -8 4 -15l29 -50h-58 q-29 0 -29 -29t29 -29h58l-29 -50q-5 -9 -5 -17q0 -27 30 -27q16 0 25 15l29 50l29 -50q9 -16 24 -16q30 0 30 30q0 8 -4 15l-29 50h58q29 0 29 29zM1419 577q0 29 -29 29h-58l29 50q5 9 5 17q0 27 -30 27q-16 0 -25 -15l-29 -50l-29 50q-9 16 -24 16q-30 0 -30 -30 q0 -8 4 -15l29 -50h-58q-29 0 -29 -29t29 -29h58l-29 -50q-5 -9 -5 -17q0 -27 30 -27q16 0 25 15l29 50l29 -50q9 -16 24 -16q30 0 30 30q0 8 -4 15l-29 50h58q29 0 29 29zM483 1145q0 29 -29 29h-58l29 50q5 9 5 17q0 27 -30 27q-16 0 -25 -15l-29 -50l-29 50q-9 16 -24 16 q-30 0 -30 -30q0 -8 4 -15l29 -50h-58q-29 0 -29 -29t29 -29h58l-29 -50q-5 -9 -5 -17q0 -27 30 -27q16 0 25 15l29 50l29 -50q9 -16 24 -16q30 0 30 30q0 8 -4 15l-29 50h58q29 0 29 29zM951 577q0 29 -29 29h-58l29 50q5 9 5 17q0 27 -30 27q-16 0 -25 -15l-29 -50l-29 50 q-9 16 -24 16q-30 0 -30 -30q0 -8 4 -15l29 -50h-58q-29 0 -29 -29t29 -29h58l-29 -50q-5 -9 -5 -17q0 -27 30 -27q16 0 25 15l29 50l29 -50q9 -16 24 -16q30 0 30 30q0 8 -4 15l-29 50h58q29 0 29 29zM1419 9q0 29 -29 29h-58l29 50q5 9 5 17q0 27 -30 27q-16 0 -25 -15 l-29 -50l-29 50q-9 16 -24 16q-30 0 -30 -30q0 -8 4 -15l29 -50h-58q-29 0 -29 -29t29 -29h58l-29 -50q-5 -9 -5 -17q0 -27 30 -27q16 0 25 15l29 50l29 -50q9 -16 24 -16q30 0 30 30q0 8 -4 15l-29 50h58q29 0 29 29zM483 577q0 29 -29 29h-58l29 50q5 9 5 17q0 27 -30 27 q-16 0 -25 -15l-29 -50l-29 50q-9 16 -24 16q-30 0 -30 -30q0 -8 4 -15l29 -50h-58q-29 0 -29 -29t29 -29h58l-29 -50q-5 -9 -5 -17q0 -27 30 -27q16 0 25 15l29 50l29 -50q9 -16 24 -16q30 0 30 30q0 8 -4 15l-29 50h58q29 0 29 29zM951 9q0 29 -29 29h-58l29 50q5 9 5 17 q0 27 -30 27q-16 0 -25 -15l-29 -50l-29 50q-9 16 -24 16q-30 0 -30 -30q0 -8 4 -15l29 -50h-58q-29 0 -29 -29t29 -29h58l-29 -50q-5 -9 -5 -17q0 -27 30 -27q16 0 25 15l29 50l29 -50q9 -16 24 -16q30 0 30 30q0 8 -4 15l-29 50h58q29 0 29 29zM483 9q0 29 -29 29h-58 l29 50q5 9 5 17q0 27 -30 27q-16 0 -25 -15l-29 -50l-29 50q-9 16 -24 16q-30 0 -30 -30q0 -8 4 -15l29 -50h-58q-29 0 -29 -29t29 -29h58l-29 -50q-5 -9 -5 -17q0 -27 30 -27q16 0 25 15l29 50l29 -50q9 -16 24 -16q30 0 30 30q0 8 -4 15l-29 50h58q29 0 29 29zM1329 1145 q0 -47 -47 -47t-47 47t47 47t47 -47zM861 1145q0 -47 -47 -47t-47 47t47 47t47 -47zM1329 577q0 -47 -47 -47t-47 47t47 47t47 -47zM393 1145q0 -47 -47 -47t-47 47t47 47t47 -47zM861 577q0 -47 -47 -47t-47 47t47 47t47 -47zM1329 9q0 -47 -47 -47t-47 47t47 47t47 -47z M393 577q0 -47 -47 -47t-47 47t47 47t47 -47zM861 9q0 -47 -47 -47t-47 47t47 47t47 -47zM393 9q0 -47 -47 -47t-47 47t47 47t47 -47zM1313 1145q0 31 -31 31t-31 -31t31 -31t31 31zM845 1145q0 31 -31 31t-31 -31t31 -31t31 31zM1313 577q0 31 -31 31t-31 -31t31 -31t31 31 zM377 1145q0 31 -31 31t-31 -31t31 -31t31 31zM845 577q0 31 -31 31t-31 -31t31 -31t31 31zM1313 9q0 31 -31 31t-31 -31t31 -31t31 31zM377 577q0 31 -31 31t-31 -31t31 -31t31 31zM845 9q0 31 -31 31t-31 -31t31 -31t31 31zM377 9q0 31 -31 31t-31 -31t31 -31t31 31z M1298 1145q0 -16 -16 -16t-16 16t16 16t16 -16zM830 1145q0 -16 -16 -16t-16 16t16 16t16 -16zM1298 577q0 -16 -16 -16t-16 16t16 16t16 -16zM362 1145q0 -16 -16 -16t-16 16t16 16t16 -16zM830 577q0 -16 -16 -16t-16 16t16 16t16 -16zM1298 9q0 -16 -16 -16t-16 16t16 16 t16 -16zM362 577q0 -16 -16 -16t-16 16t16 16t16 -16zM830 9q0 -16 -16 -16t-16 16t16 16t16 -16zM362 9q0 -16 -16 -16t-16 16t16 16t16 -16z" />
+<glyph unicode="&#x1f022;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM559 1291l-26 3q-18 0 -81 -63l58 107q30 57 30 81t-2 34h23 q17 0 37 -35l-63 -108q2 -2 14 -2l168 46q9 0 33 -8v-16zM733 1153l54 14q21 0 52 -35h-125q-17 -85 -17 -97v-14l60 -19q32 -10 36 -32q-5 -5 -16 -5h1q0 2 -82 22l-26 -77q-15 -40 -53 -58q-13 24 -36 70q18 -6 34.5 -6t28 25t11.5 37v23h-157q-1 0 -65 -22q-5 5 -5 13 t24 40t37 56v12l-38 -8q-13 0 -30 17q53 8 77 15q12 42 12 71q0 23 -7 38q29 -1 47 2.5t64 17t50 13.5q28 0 62 -37q-15 -29 -15 -55v-9q13 -12 22 -12zM376 1176l36 5q14 0 23 -19v-20h-33q-3 0 -26 34zM368 1211v-291q0 -5 -19 -43q-32 22 -27 51l25 180q-1 22 -6 69 q-74 -140 -160 -179q126 153 156 230q-17 0 -56.5 -7.5t-45 -7.5t-33.5 14q51 13 145 52v116l-24 58h25q6 0 41 -26l-21 -138q8 -7 36 -8t31 -2q-2 -13 -23 -23l-40 -18q-4 -21 -4 -27zM1369 249q0 -92 -65.5 -157.5t-157.5 -65.5q-35 0 -69 11q43 -59 43 -141.5t-65.5 -148 t-157.5 -65.5t-157.5 66t-65.5 158q-67 -92 -181 -92q-92 0 -157.5 65t-65.5 147.5t42.5 141.5t111.5 81q-69 22 -111.5 81t-42.5 141t65.5 147.5t157.5 65.5q114 0 181 -92q0 92 65.5 157.5t157.5 65.5t157.5 -65.5t65.5 -147.5t-43 -141q34 11 69 11q92 0 157.5 -65.5 t65.5 -157.5zM672 1222q-16 16 -25 16t-49.5 -8.5t-58.5 -10.5q-7 -59 -15 -91q51 7 148 18v76zM668 1022q-2 5 -1 32.5t1 72.5q-51 -7 -147 -22q-13 -30 -32 -83h179zM1339 249q0 80 -56.5 136.5t-127.5 56.5t-122 -37q-9 14 -23 31q80 58 80 147t-56.5 145.5t-136.5 56.5 t-136.5 -56.5t-56.5 -136.5q0 -31 9 -59q-16 -4 -36 -12q-19 59 -70.5 96t-122.5 37t-127.5 -56.5t-56.5 -136.5t56.5 -136.5t136.5 -56.5q-1 -15 -1 -19t1 -19q-80 0 -136.5 -57t-56.5 -137t56.5 -136t127.5 -56t122.5 37t70.5 96q20 -8 36 -12q-9 -28 -9 -60 q0 -80 56.5 -136.5t136.5 -56.5t136.5 56.5t56.5 145.5t-80 147q14 17 23 31q50 -36 121.5 -36t128 56.5t56.5 136.5zM616.5 1195.5q9.5 -9.5 9.5 -22t-8 -20.5q-31 8 -30 30v22h12q7 0 16.5 -9.5zM605 1062q0 -9 -7 -26q-8 -2 -19.5 9t-11.5 18v33q38 -7 38 -34zM1008 249 q0 -92 -65.5 -157.5t-157.5 -65.5t-157.5 65.5t-65.5 157.5t65.5 157.5t157.5 65.5t157.5 -65.5t65.5 -157.5zM978 249q0 80 -56.5 136.5t-136.5 56.5t-136.5 -56.5t-56.5 -136.5t56.5 -136.5t136.5 -56.5t136.5 56.5t56.5 136.5z" />
+<glyph unicode="&#x1f023;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM533 1291l79 17q31 0 52 -23q-2 3 -2 -13v-192l14 -141 q0 -35 -41 -91q-24 26 -76 77q9 0 62 2q13 11 13 118q0 12 -4 120q-4 9 -39.5 9t-64.5 -18q-14 9 -15.5 41t-2.5 60q-5 37 -11 37t-10 -3t-5 -3q6 25 17 53q-9 3 -39 3l-61 -5q-8 -5 -8 -21l1 -27q-13 3 -21.5 24.5t-21.5 17.5l-99 -18q-23 -3 -48 24q43 6 76 10q29 0 76 15 l-35 56q5 5 19.5 5t42.5 -18q2 -18 8 -49h19l96 15q10 12 12.5 38t4.5 49h11q6 0 41 -26q-6 -13 -24 -49q15 -8 53 0t44 8q29 0 48 -26q0 -4 -8 -12h-149q-18 -30 -38 -55q14 -9 34 -9zM474 1121l55 14q25 0 41 -19l-47 -98q-21 14 -38.5 14t-34.5 -9q1 13 2 -57q1 -7 1 -14 q0 -58 -12 -79q-21 16 -21 38l9 53v19q1 0 -6 7q-51 -55 -115 -70q28 22 99 93q-1 2 -16 2t-32 -11l-33 87v15h100q1 8 6 23l-43 19q9 0 26 8.5t17 20t-14 39.5q30 -8 45 -15q0 4 -7 -38q-4 -1 43 -1q-9 -4 -42 -29q6 -12 17 -12zM552 941q-35 8 -92 55h30h1q13 0 61 -32 v-23zM283 1266l73 14q6 0 44 -18q-12 -26 -18 -62l-11 -68q-17 3 -45.5 3t-48.5 -13q0 -2 -4.5 -96.5t-22.5 -150.5q-27 15 -27 48q0 2 7 27q18 58 18 164.5t-17 154.5zM1126 650q136 0 225 -115.5t89 -245t-76 -241.5t-190 -112q-68 0 -101 50l-64 136q-48 100 -88 100 q-35 0 -34 -48l2 -5q13 18 55 31q-6 -11 -6 -27.5t19 -59t19 -60t-18 -27.5l-35 -18q15 -6 30.5 -31t15.5 -40.5t-32 -69t-32 -57.5q0 -16 20 -16q33 0 62.5 65t37.5 112q5 -21 5 -65t-26 -99q-32 -69 -90 -69q-19 0 -55 19t-40 19t-40 -19t-55 -19q-58 0 -90 69 q-26 55 -26 99t5 65q8 -47 37.5 -112t62.5 -65q20 0 20 16q0 4 -32 57.5t-32 69t15.5 40.5t30.5 31l-35 18q-18 10 -18 27.5t19 60t19 59t-6 27.5q21 -7 55 -31l2 5q1 48 -34 48q-40 0 -88 -100l-64 -136q-33 -50 -101 -50q-114 0 -190 112t-76 241.5t89 245t225 115.5 q92 0 155 -88q53 205 152 205t152 -205q63 88 155 88zM623 1192v65q0 23 -35 23q12 0 -6 -1.5t-27.5 -4t-15.5 5.5v-46l40 11q13 0 19 -19q-40 -14 -59 -14v-20h84zM513 1051q0 1 7 51q-6 12 -12 10q-24 -3 -51 -10q0 -28 -3 -52q40 1 59 1zM354 1206l-4 43l4 6h-26 q-5 0 -23 -3.5t-24 -4.5q-8 -13 -8 -19.5t2 -13.5t2 -8q35 7 51 7t19 -12q-34 -15 -62 -15q-6 0 -12 1q8 -28 7 -41q57 8 65.5 13.5t8.5 46.5zM362 1033q34 3 47.5 3t21.5 -3v63q-27 -3 -69 -11q3 -49 0 -52zM1176 -40q102 0 172 108t70 223.5t-86 221t-206 105.5 q-76 0 -125 -58q-26 -32 -69 -123t-78 -125l-4 -1q-8 0 -8 9l54 96q55 98 55 131.5t-27 93.5q-45 97 -105 97t-105 -97q-27 -60 -27 -93.5t55 -131.5l54 -96q0 -9 -8 -9l-4 1q-35 34 -78 125t-69 123q-49 58 -125 58q-120 0 -206 -105.5t-86 -221t70 -223.5t172 -108 q63 0 103 73l60 137q37 73 92 73q41 0 55 -50l22 -84h50l22 84q14 50 55 50q55 0 92 -73l60 -137q40 -73 103 -73zM936 35q15 13 15 23t-40 108q-9 -18 -9 -30t18 -39t18 -36t-3 -9q-28 57 -57 67q17 -26 17 -50.5t-7 -33.5h48zM760 119q-29 -10 -57 -67q-3 0 -3 9t18 36 t18 39t-9 30q-40 -98 -40 -108t15 -23h48q-7 9 -7 33.5t17 50.5zM920 -224q-42 0 -42 29q0 6 33 65.5t33 65.5q0 30 -30 56.5t-60 27.5q14 37 14 73l-16 -47q-8 -27 -21 -26q14 28 14 67h-52q0 -39 14 -67q-13 -1 -21 26l-16 47q0 -36 14 -73q-30 -1 -60 -27.5t-30 -56.5 q0 -6 33 -65.5t33 -65.5q0 -29 -42 -29q-26 0 -51 32q5 -47 50.5 -47t101.5 40q56 -40 101.5 -40t50.5 47q-25 -32 -51 -32zM499 1091q-12 -17 -35 -33q6 13 15 41q4 0 20 -8zM410 1047h-16q-13 20 -18 34h19q11 -10 15 -10v-24z" />
+<glyph unicode="&#x1f024;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1283 1199l-3 323h-83l-11 -162q0 -18 36 -71zM1544 1408q0 114 -104 114h-145v-259l-5 -59q-3 -34 6 -54q29 -65 125.5 -190.5t122.5 -167.5v616zM1003 1522h-132 l72 -150q11 28 60 48l73 24q-67 78 -73 78zM1544 748q0 2 -36 27t-42 34q-37 70 -105 187l-103 152q-28 47 -53 85l-102 142q-25 -1 -58 -22.5t-33 -51t18 -44.5q39 -31 59 -58q134 -182 187 -268q14 -28 42 -78q36 -49 89 -128q54 -72 137 -206v229zM1330 591v12 q-6 46 -9 134q2 41 1 43q-27 52 -113 181q-4 7 -16 7l-7 -420q21 13 62 30q32 7 82 13zM1185 353l-5 59q0 50 33 78.5t85 28.5t61 -33t11 -89.5t7 -134.5l11 -173q3 -38 6 -97.5t8 -120t14 -199.5q1 -16 24 -30q104 0 104 114v436q-3 13 -4 39q1 1 2 1t2 2v218 q-21 -5 -45 -14q-16 71 -69 162l-99 170v-65l14 -120q0 -20 -16 -20l-37 7q-40 0 -89 -38l94 21q23 0 55 -26l-62 8q-37 0 -55.5 -13.5t-61.5 -57.5q-3 3 -2.5 11.5t13.5 28.5l12 20q-12 0 -19 -7l-6 404q0 42 1 51q7 9 17 25l-226 299q51 113 127 113q27 0 40 -13l37 -47 q3 40 3 85.5t-3 85.5h-133q24 -32 74 -88l-92 -35q-57 -25 -57 -70q0 -7 1 -14q-3 0 -19 -3q-69 156 -107 210h-646q-104 0 -104 -114v-871q170 81 277 81q8 0 9 -1q-50 -38 -130 -57l-156 -38v-102q122 105 271 172q36 16 65 16l46 -7q8 0 100.5 37t125.5 37q-11 0 36 -13 v-38q-38 -21 -71 -32q42 -27 56 -27l57 7q25 0 46 -12l40 -22h34l-131 106q58 -22 149 -106.5t99 -148.5q97 -5 178 -36zM1366 0v146q0 70 -33 305q-4 29 -59 29q-71 0 -71 -67q0 -3 16 -96.5t21.5 -137.5t16.5 -277q5 -51 10 -110v-150q88 6 141 8q-7 12 -16 33 q-7 158 -16.5 237t-9.5 80zM152 264q89 0 130 -13v-13q0 -31 -116 -53q-29 -7 -82 -17v-98q24 -2 24 -23q0 -12 -24 -27v-17q0 -22 2 -27q3 -6 10 -25q12 -98 12 -113v-145q7 -15 37 -33t43 -18h1057v108l-17 145l-4 198q-4 77 -30 219q-30 9 -78 25q-128 44 -196 44 l-157 -5q51 -20 111 -38q31 -9 66 -55l65 -85q51 -62 51 -81.5t-1 -21.5q-46 63 -119 109l-128 73q-23 9 -56 33q-5 21 -18 64h-33q-82 0 -291 -103v-70q4 25 27 25q17 0 22 -3v-147q-1 -82 -37 -234q-5 -23 -31 -23q-1 0 -7 6l-35 247q-3 32 11 52l45 64q0 8 -5 9 l-265 -269q15 112 182 286l-171 -109q-6 6 -6 12q72 49 257 152l68 40q71 32 197 62.5t197.5 30.5t132.5 -9q-40 100 -100 126q-10 -10 -14 -10l-25 10q-7 0 -22.5 -11t-20.5 -13l-294 -99q-153 -57 -235 -111q60 131 400 275q-40 30 -60.5 30t-242.5 -118q-23 -17 -76 -52 l153 169h-20q-48 -43 -114 -97l-237 -126v-122q61 20 68 20zM886 1322q2 -2 2 2t-13 30q28 -18 37 -63l-116 87q34 -9 90 -56zM535 965q33 0 33 67q0 150 -37 188h-35q-23 -48 -79 -85q115 204 115 292q0 16 -2 30h22q11 0 48 -37l-92 -177q5 -5 12 -5l156 46q20 -5 48 -19 q0 -15 -16 -19q-50 -7 -154 -25l49 -30v-256l4 -29q2 -14 -7 -26q-57 17 -99 88q13 -3 34 -3zM264 1206l133 35q16 0 33 -12q-16 -18 -60.5 -30.5t-52.5 -16.5l13 -30q5 -13 5 -50.5t-9 -101.5t-21 -74q-20 9 -23 50l21 155q-5 57 -43 57q-8 0 -11 -1q-56 -79 -107 -94 q76 106 106 162q52 94 55 166h22q14 0 38 -42l-106 -171q2 -2 7 -2zM685 266l-183 -391q12 86 22 278q4 67 30 119q36 71 102 80q-3 -9 -14 -26q13 -26 43 -19v-41z" />
+<glyph unicode="&#x1f025;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM356 1340l-105 -21q-18 0 -42 24q48 5 142 21l-36 60 q17 0 38 -2.5t27 -19.5t7 -34q12 -7 19.5 -7t93.5 12l5 5q3 27 9 86h22q7 0 20.5 -11.5t13.5 -18.5t-25 -49q11 -5 46 1.5t52.5 6.5t39.5 -18q1 -10 -4 -20h-142q-28 -29 -58 -64q6 14 13 58l-2 3q-49 -7 -94 -8l-11 -36q-32 32 -29 32zM429 1136l21 30q10 15 17 29t16.5 14 t36.5 -27zM1202 647q27 -27 27 -61t-35 -58l-321 -222q-5 7 -12 12l222 321q24 35 58 35t61 -27zM375 1223l-49 11q-8 0 -81 -52q43 54 78 112q14 -4 38 -15q-6 -14 -18 -29q4 -2 25 -2l203 32q12 2 46 -11.5t34 -30.5l-14 -37v-252q0 -14 -23.5 -55.5t-43.5 -41.5 q-5 0 -28 30l-39 50q24 -6 46 -6q53 0 53 181q0 69 -5 91q-9 46 -45 50zM1049 751q28 -22 28 -49t-14 -49l-212 -327q-5 3 -16 6l82 381q13 60 70 60q34 0 62 -22zM1328 432q0 -57 -60 -70l-381 -82q-3 11 -6 16l327 212q22 14 49 14t49 -28t22 -62zM503 972q-21 0 -92 78 h36q8 0 36 -16.5t34 -23.5v-30q-8 -8 -14 -8zM329 1121l-16 -4q-27 0 -51 57h30q15 1 37 -30v-23zM410 1113l80 8q26 0 48 -12q0 -9 -12 -20h-106l-20 -10v-155q0 -7 -19 -26q-27 12 -18 51.5t9 42.5v62l-81 -71q-46 -41 -92 -41l79 61q47 36 62 69q-14 3 -57 -4t-56 -7 t-46 20q88 4 185 23q9 7 9 22.5t-17 75.5l14 4q16 0 38 -15v-78zM895 735q0 -6 -2 -17l-71 -383q-8 1 -16 0l-71 383q-2 11 -2 17q0 72 81 72t81 -72zM1362 259q0 -81 -72 -81q-6 0 -17 2l-383 71q1 8 0 16l383 71q11 2 17 2q72 0 72 -81zM565 653q-14 22 -14 49t28 49 t62 22q57 0 70 -60l82 -381q-11 -3 -16 -6zM1328 86q0 -34 -22 -62t-49 -28t-49 14l-327 212q3 5 6 16l381 -82q60 -13 60 -70zM434 528q-35 24 -35 58t27 61t61 27t58 -35l222 -321q-7 -5 -12 -12zM880 259q0 -66 -66 -66t-66 66t66 66t66 -66zM1194 -10q35 -24 35 -58 t-27 -61t-61 -27t-58 35l-222 321q7 5 12 12zM300 432q0 34 22 62t49 28t49 -14l327 -212q-3 -5 -6 -16l-381 82q-60 13 -60 70zM1063 -135q14 -22 14 -49t-28 -49t-62 -22q-57 0 -70 60l-82 381q11 3 16 6zM338 178q-72 0 -72 81t72 81q6 0 17 -2l383 -71q-1 -8 0 -16 l-383 -71q-11 -2 -17 -2zM895 -217q0 -72 -81 -72t-81 72q0 6 2 17l71 383q8 -1 16 0l71 -383q2 -11 2 -17zM420 10q-22 -14 -49 -14t-49 28t-22 62q0 57 60 70l381 82q3 -11 6 -16zM641 -255q-34 0 -62 22t-28 49t14 49l212 327q5 -3 16 -6l-82 -381q-13 -60 -70 -60z M545 -121q-24 -35 -58 -35t-61 27t-27 61t35 58l321 222q5 -7 12 -12zM1183 544q26 18 26 42.5t-21.5 46t-46 21.5t-42.5 -26l-186 -270zM1046 664q11 17 11 36t-23 36t-48 17q-41 0 -50 -44l-68 -320zM1308 431q0 26 -16.5 48.5t-36 22.5t-36.5 -11l-275 -178l320 68 q44 9 44 50zM875 735q0 52 -61 52t-61 -52q0 -2 2 -13l59 -323l59 323q2 11 2 13zM1342 259q0 61 -52 61q-2 0 -13 -2l-323 -59l323 -59q11 -2 13 -2q52 0 52 61zM643 753q-25 0 -49 -17t-24 -35t12 -37l178 -275l-68 320q-9 44 -49 44zM1308 86q0 42 -44 51l-320 68 l275 -178q19 -12 37 -12t35 23t17 48zM529 628q-18 26 -42 26t-46 -22t-22 -46t26 -42l270 -186zM860 259q0 46 -46 46t-46 -46t46 -46t46 46zM1187 -114q22 22 22 46t-26 42l-270 186l186 -270q18 -26 42 -26t46 22zM409 491q-19 12 -37 12t-35 -24t-17 -49q0 -40 44 -49 l320 -68zM1034 -218q24 17 24 35t-12 37l-178 275l68 -320q9 -44 49 -44q25 0 49 17zM338 320q-52 0 -52 -61t52 -61q2 0 13 2l323 59l-323 59q-11 2 -13 2zM875 -217q0 2 -2 13l-59 323l-59 -323q-2 -11 -2 -13q0 -52 61 -52t61 52zM320 88q0 -25 17 -49t35 -24t37 12 l275 178l-320 -68q-44 -9 -44 -49zM582 -146q-12 -19 -12 -37t24 -35t49 -17q40 0 49 44l68 320zM445 -26q-26 -18 -26 -42t22 -46t46 -22t42 26l186 270z" />
+<glyph unicode="&#x1f026;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM481 1284l88 28h65q-14 -19 -65 -34q-24 -4 -81 -20 q-34 -12 -34 -28v-25q1 -1 3 -2l235 46l25 -8q18 -8 26 -30l-197 -28q193 -171 345 -189q0 -4 8 -12q-56 -19 -107 -19t-60 5t-87 73l-83 91q-46 50 -73 50q-43 0 -63 -35l-43 -73q5 -20 24 -12l141 28l75 -43q-5 -25 -9 -58q2 16 2 -45v-93q0 -21 -29 -65q-13 0 -28.5 34.5 t-29.5 47.5h-8q-44 0 -100 -9q-13 -20 -21 -55q-24 9 -24 30l-6 214q-20 -20 -62 -56q-94 -71 -123 -71h-2h-19q205 138 237 237q-5 3 -20 3l-98 -18q-30 0 -41 27q54 2 167 23q18 6 20 37v26q-5 -3 -22 -3q-23 0 -66 5q33 3 89 20q12 8 21 53q-70 7 -106 7q0 4 -8 12 q39 6 109 22q8 14 8 28t-5.5 42.5t-1.5 42.5h15q15 0 52 -28q0 -1 -21 -65q10 -9 19 -9l113 28q13 0 37 -8v-12q-56 -13 -163 -45q-5 -2 -14.5 -18.5t-9.5 -23.5v-14zM1042 239q-101 0 -110 123q-34 -81 -114 -81q-116 0 -124 165l39 208q-4 93 -85 195l76 -39 q41 -21 67 -56q41 73 121 117l-31 -75q-25 -63 -25 -93t26 -98l44 -113q7 -28 14 -87q19 47 44 91l59 96q36 65 36 106.5t-13 108.5q58 -56 89 -130q62 42 153 55l-70 -67q-42 -44 -49 -75q-9 -108 -19 -215q-23 -136 -128 -136zM1427 259l-46 -31q-31 -24 -44 -52 q-29 -66 -94 -198q-17 -32 -115 -97q-48 -29 -133 -94q9 35 23 101q45 250 235 327q12 5 51 18t123 26zM1001 57v-137h-81v140q0 10 40 193l76 -33q-35 -102 -35 -163zM1012 -300l-66 -47q-17 21 -34 53q-67 126 -83 206q-36 183 -36 291v6v47q6 -10 15 -4q20 0 62 4 q17 -220 28 -278q30 -161 114 -278zM962 355q0 -84 82 -84q105 0 105 174v110q0 25 20.5 63.5t36.5 53.5q-34 -18 -75 -48q0 52 -23 88q1 -7 1 -14q0 -55 -42 -128l-67 -109q-38 -65 -38 -106zM566 882l4 88q0 91 -46 92l-113 -19l1 -73q68 17 92.5 17t27.5 -15 q-59 -20 -85.5 -20t-34.5 3v-73q29 2 67 8t40 6q-11 0 47 -14zM761 656l-39 -207q0 -51 24 -95.5t70 -44.5q93 0 93 110q0 49 -40.5 149t-40.5 133t13 78q-18 -26 -38 -71q1 -9 -2 -28q-18 32 -64 86q24 -70 24 -110zM1326 214h-13q-11 -5 -42 -17q-182 -70 -227 -325 q132 71 178 124q27 31 58.5 113t45.5 105zM993 210l-16 4q-30 -106 -29 -147v-117h25v139q0 12 10.5 53.5t10.5 52.5t-1 15zM845 224l-20 -3v-58l5 -57q12 -228 116 -403q6 -8 12 -8l11 12q-69 116 -92.5 231.5t-31.5 285.5z" />
+<glyph unicode="&#x1f027;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM438 1055l141 31q11 0 65 -29l-91 -110q72 -74 291 -109 q11 -2 23 -13q-88 -32 -135 -32t-126 62t-82.5 62t-17 -12.5t-18.5 -14.5q-123 -58 -149 -58q-2 0 -21.5 4.5t-29.5 4.5q120 26 208 99q-1 7 -45 38t-59 31q-4 0 -42.5 -37.5t-58 -51.5t-64 -37t-51.5 -22h-15q180 114 240 242v9q-6 6 -7 6l-28 -3v149q0 12 -18 65l40 -3 q23 0 37 21l22 45v10q-3 2 -21 2l-126 -18q-8 0 -29.5 11.5t-24.5 23.5l453 54q57 0 69 -35l-283 -31q6 -3 15 -10q-18 -23 -57 -60q3 -3 18 -1l79 14q58 10 62 10q27 0 64 -30q-19 -36 -27 -115.5t-28 -101.5q-35 21 -41 21t-58.5 -8t-76.5 -10l-6 -5l21 -21l-24 -36 q1 -1 12 -1zM1122 551l-75 -129q-8 -13 -27.5 -13.5t-30.5 10.5t-10.5 30.5t13.5 27.5zM812 482q-40 0 -40 38v5l40 254l40 -259q0 -38 -40 -38zM1052 242q0 40 38 40h5l254 -40l-259 -40q-38 0 -38 40zM1122 -67l-130 75q-13 8 -13.5 27.5t10.5 30.5t30.5 10.5t27.5 -13.5z M636 419q-11 -11 -30.5 -10.5t-27.5 13.5l-75 129l130 -74q13 -8 13.5 -27.5t-10.5 -30.5zM1032 242q0 -91 -64.5 -155.5t-155.5 -64.5t-155.5 64.5t-64.5 155.5t64.5 155.5t155.5 64.5t155.5 -64.5t64.5 -155.5zM572 242q0 -40 -38 -40h-5l-254 40l259 40q38 0 38 -40z M812 2q40 0 40 -38v-5l-40 -254l-40 259q0 38 40 38zM636 66q11 -11 10.5 -30.5t-13.5 -27.5l-130 -75l75 130q8 13 27.5 13.5t30.5 -10.5zM602 1211v115q-21 7 -32 7l-166 -25q-5 -32 1 -45q92 25 117 25t34 -16l-6 -6q-70 -18 -129 -18h-16v-52l128 28q8 -1 23 -6v-12 q-32 -16 -76 -20l-82 -9v-45h25q4 0 27 6t71.5 11.5t62.5 4.5q18 46 18 57zM463 1037l-37 3q-16 0 -32 -16q19 -8 69.5 -33t55.5 -25q13 0 30.5 31.5t17.5 39t-2 14t-2 7.5q-63 -21 -100 -21zM980 242q0 70 -49 119t-119 49t-119 -49t-49 -119t49 -119t119 -49t119 49 t49 119z" />
+<glyph unicode="&#x1f028;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM807 1264q-103 -62 -112 -61h-15q73 96 71 113q27 -15 40 -25.5 t16 -26.5zM832 889q-68 0 -96 28q-16 16 -41.5 81t-62.5 113q-22 -67 -84.5 -137.5t-117.5 -77.5q-4 6 -3 9q25 17 70 55q119 128 119 379q0 97 -21 121h33h4q20 0 39 -21q6 -6 5 -19l-42 -265q21 -62 94 -141t141 -99l23 -14q-30 -12 -60 -12zM552 1150q-20 4 -38 33 t-18 36t5 12q17 1 39.5 -15t22.5 -34zM337 1206l-111 -31q-21 0 -51 30l191 33v104q-2 2 -11 2l-81 -24l85 58q48 36 61 72q27 -11 69 -37l-106 -57q8 -8 32 -23q-11 -70 -14 -70v3q0 -8 6 -14h9q4 0 19.5 9t17 9t25.5 -12q-8 -16 -35 -22t-37.5 -17.5t-9.5 -37.5l1 -43 q3 -2 46 -11.5t43 -36.5q0 -13 -13 -25q-37 25 -70 53q-9 -18 -9 -44v-152q0 -19 -26 -97q-27 11 -27 58q0 8 14 83.5t14 123t-6 71.5q-11 -25 -42 -74q-13 -15 -70 -64t-68 -49h-19q166 131 187 230q-1 2 -14 2zM923 761l13 4q2 0 21 -21q-1 -2 -1 24q23 -17 62 -49l7 -17 q2 -1 18 -1q7 -19 24 -56q9 8 17 25q15 -17 39 -51q16 -29 16 -52t-32 -121q6 -6 7 -6q31 0 296 159v-49q-50 -20 -136.5 -75.5t-95.5 -60.5l45 -20q30 -14 38 -33q17 -40 36 -114q-15 1 -20 -3q16 -26 16 -62q0 -3 -1 -6q-1 -40 5 -57h-21q-5 -19 -1 -49q-16 -9 -20 -30.5 t-8 -40.5q-24 19 -77 49q2 -18 -15.5 -53t-16.5 -56l-18 17q-69 -92 -68 -92q-5 0 -28 15q-6 -10 -21 -28q-1 -1 -24 -5q-15 -15 -40 -45l-10 11l-143 -103q35 88 35 113q0 2 -9 5q-3 21 6 40q0 1 -5.5 4t-5.5 8l14 40q0 1 -5 14q-1 1 -15 3q-14 14 -32 70l-60 -46 q2 17 0 25q-26 -15 -34 -15l-16 7l-36 -17q-4 0 -9.5 3.5t-9.5 3.5h1q0 -2 -84 -21q14 44 14 35q0 8 -13 21q-20 -10 -33.5 -10t-24 3.5t-14.5 3.5q11 0 -45 -14q1 21 -4 21l-61 -9l-22 -9l-21 4q-2 0 -76 -21q37 35 96 108l44 42q-4 17 13.5 50t36.5 45q-9 13 -49 13 q13 29 22 41.5t28 27.5q-3 15 16.5 25t21 14t-2.5 10l50 54l42 30q-30 34 -96 96q7 3 21 14q-8 7 -64 44q0 1 4 5q-65 33 -113 50l82 -2q7 0 64 16q16 1 49 2q7 10 7 20q13 1 43 -3q3 3 -4 10h67q0 -5 -11 44l56 -8l22 7q6 0 33 -10q5 2 14 21l27 -14l17 3l33 -11 q0 21 -7 85h43l52 -21l10 4q3 0 16.5 -11t18.5 -11zM609 -5l13 -3q5 0 23 17.5t22 20.5q7 -6 14 -24l43 24q10 -10 15 -10q29 28 45 39q10 -32 34 -95h25q9 -26 5 -56.5t-5 -20.5q5 -46 5 -72q0 -20 -3 -28q44 36 81 59q5 1 14 2l35 45l10 -11q17 22 39 39q7 -8 22 -18 q25 36 77 101q1 7 2 17q7 9 12 11q9 24 10 42q5 6 24 6t55 -28q6 12 17 36q0 22 5 66h18v27l-28 77q0 12 21 24q-7 23 -26 65q-12 21 -116 48q-3 6 -8 15q-34 8 -34 35l32 113q0 9 -7.5 32.5t-15.5 26.5q-16 -13 -28 -18q-8 22 -32 63q-11 4 -26 17q-3 11 -13 26 q-11 -11 -19 -11t-36 34q-8 0 -18 2l-26 17q-4 0 -4 -1.5t-8.5 -1.5t-51.5 17q0 4 5 -35t-5 -53h-23l-43 21l-51 -7l-27 6q-8 1 -24.5 -1t-19.5 -2q6 -12 0.5 -20t-109.5 -30l-10 -20q-21 7 -35 7l-36 -5q-11 -7 -11 -12q20 -6 29 -20q-2 -8 7 -15q29 -16 41 -34 q-15 -15 -14 -19l85 -98q-87 -70 -85 -97q-61 -34 -81 -73q17 -8 46 -24q-20 -19 -52 -59q-4 -11 -14 -29q-1 -7 9 -25q-22 -18 -58 -52q-7 -15 -23 -37q12 6 21 6l16 -7l60 18q3 0 10 -18q28 7 29 7l25 -11q16 0 25.5 13t16.5 16l49 -71q21 14 34 14zM1012 365 q-51 -73 -121 -108q-40 -20 -126.5 -41t-129.5 -44q-8 8 -8 17l195 67q103 35 177 117q8 -8 13 -8z" />
+<glyph unicode="&#x1f029;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM888 1053q-94 -27 -138 -27t-110 48l-124 94q-48 -49 -149 -102 q-99 -53 -155 -53h-2h-32q137 63 154 72q86 47 143 109q-65 69 -92 69q2 0 -77 -45l102 122q61 80 61 134q43 -14 69 -31v-21q-48 -45 -70 -76q2 -2 12 -2l127 39q24 -1 52 -51l-124 -135q0 -6 3 -8q75 -55 175 -88zM570 981l-17 -4q-22 0 -59 32l-65 59h61q18 1 49 -25.5 t31 -38.5v-23zM588 830q-10 -12 -31.5 -12t-72.5 40l-87 72h65h3q31 0 90 -40q27 -19 33 -60zM1300 22l-38 -56l-151 90l6 -167l-47 16l-15 185l-214 128v-252l162 -108l-20 -46l-142 93l3 -182h-60l3 182l-141 -93l-21 46l162 108v252l-213 -128l-15 -185l-47 -16l6 167 l-152 -90l-36 56l156 89l-150 72l30 43l173 -85l226 128l-226 125l-173 -83l-30 43l150 70l-156 91l36 55l152 -90l-6 168l47 -15l15 -188l213 -128v253l-162 109l21 47l141 -93l-3 181h60l-3 -181l142 93l20 -47l-162 -109v-253l214 128l15 188l47 15l-6 -168l151 90 l38 -55l-156 -91l148 -70l-30 -43l-174 83l-225 -125l225 -128l174 85l30 -43l-148 -72zM570 1329q-54 -6 -75 -6t-43 11q-26 -25 -51 -59q32 -13 49 -24.5t48 -29.5q30 35 72 108z" />
+<glyph unicode="&#x1f02a;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM1058 1049q0 -4 -10 -19q-31 -51 -32.5 -156t-4.5 -123 q-13 -71 -72 -127l-33 95q-15 32 -69 32q9 0 -176 -15q-17 -39 -21 -73q-36 15 -40 60q0 -5 1 -5t1 77v158q0 16 -14 56.5t-21 51.5h18q79 0 96 8q7 3 38 75.5t31 84.5q0 32 -33 27l-235 -32q-24 7 -48.5 16.5t-32.5 32.5l704 71q65 0 119 -51q-6 -13 -27 -19l-408 -10 l43 -42l-106 -138q4 -8 15 -8l207 32h2q20 0 63 -22q45 -23 45 -37zM1035 433l58 14q32 0 60 -26q-17 -17 -73.5 -22.5t-64.5 -10t-62 -78.5q0 1 10 71q-7 3 -47.5 3t-87.5 -8q-8 -28 -19 -86q-15 16 -24 66q-13 10 -22 10l-37 -7q-14 0 -31 12v6q29 7 77 27q3 10 -15 43.5 t-20 37.5q14 2 25 2q55 0 55 -51q0 -13 -3 -29q3 -2 26 -2h-3q0 2 126 15q21 24 21 75q0 23 -4 51h44q8 0 41 -33q-14 -21 -39 -64v-10q6 -6 9 -6zM1270 64q-38 -23 -105 -23t-135 71l-126 141l-96 -137q-65 -84 -133 -115q-13 -4 -37 -16q0 12 1 16q176 129 222 319 q19 -7 47 -25q0 -6 5 -18q97 -119 267 -182zM984 108q0 -18 -44.5 -30t-62 -12t-49.5 19q84 44 120 44t36 -21zM1100 -53q0 -4 -22 -33q-34 -45 -34 -58.5t13 -32.5q-75 -9 -240 -27q-8 -8 -19 -23q-17 61 -25 99.5t-19 67t-11 40.5t11 12q3 0 26 -7.5t34 -7.5l189 36 q18 -3 57.5 -22.5t39.5 -43.5zM567 264l-88 -8q-15 0 -43 13q68 23 135 53v14q0 27 -3 70l-6 109q-9 14 -9 16v29q45 -13 84 -32v-12q0 4 -1 4q-4 0 -30 -121l2 -79q21 7 36 7t50 -8q-1 -11 -31 -25l-58 -26q0 -34 7 -97l45 27q23 13 42 11q-93 -76 -93 -88v-266v1 q-3 0 -36 -76h-1q-13 0 -38 34l-52 71l40 -3q14 0 22.5 6t18.5 54t10 66v83q-1 2 -3 3l-164 -116h-2q-29 0 -49 51q103 32 218 121v108zM952 975q0 49 -3 59q-9 28 -48 28l-249 -29v-109l180 28l38 -6q21 -4 29 -20q-43 -27 -108 -30l-135 -8v-116h58l132 28q55 -12 80 -39 q26 85 26 214zM982 -131q16 17 16 47.5t-8 46.5h-121q-25 0 -62 -15v-112h93h3q47 0 79 33z" />
+<glyph unicode="&#x1f02b;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 98 -70 111v-1873q70 17 70 110zM1405 -358v1880h-70v-1880h70zM1266 -358v1880h-70v-1880h70zM1127 -358v1880h-70v-1880h70zM988 -358v1880h-70 v-1880h70zM849 -358v1880h-70v-1880h70zM710 -358v1880h-70v-1880h70zM571 -358v1880h-70v-1880h70zM432 -358v1880h-70v-1880h70zM293 -358v1880h-70v-1880h70zM84 1408v-1652q0 -98 70 -111v1873q-70 -17 -70 -110z" />
+<glyph unicode="&#x1f02c;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x1f02d;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x1f02e;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x1f02f;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x1f030;" d="M2033 90q0 -50 -50 -50h-1918q-50 0 -50 50v984q0 50 50 50h1918q50 0 50 -50v-984zM1983 90v984h-1918v-984h1918zM1933 140h-884v884h884v-884zM999 140h-884v884h884v-884z" />
+<glyph unicode="&#x1f031;" d="M2033 90q0 -50 -50 -50h-1918q-50 0 -50 50v984q0 50 50 50h1918q50 0 50 -50v-984zM1983 90v984h-934v-984h934zM999 90v984h-934v-984h934z" />
+<glyph unicode="&#x1f032;" d="M2033 90q0 -50 -50 -50h-1918q-50 0 -50 50v984q0 50 50 50h1918q50 0 50 -50v-984zM1983 90v984h-934v-984h934zM999 90v984h-934v-984h934zM1613 582q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f033;" d="M2033 90q0 -50 -50 -50h-1918q-50 0 -50 50v984q0 50 50 50h1918q50 0 50 -50v-984zM1983 90v984h-934v-984h934zM999 90v984h-934v-984h934zM1313 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1913 257 q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f034;" d="M1613 582q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM2033 90q0 -50 -50 -50h-1918q-50 0 -50 50v984q0 50 50 50h1918q50 0 50 -50v-984zM1983 90v984h-934v-984h934zM999 90v984h-934v-984h934zM1313 907 q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1913 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f035;" d="M1313 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1913 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM2033 90q0 -50 -50 -50h-1918q-50 0 -50 50 v984q0 50 50 50h1918q50 0 50 -50v-984zM1983 90v984h-934v-984h934zM999 90v984h-934v-984h934zM1913 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1313 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5 t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f036;" d="M1313 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1913 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1613 582q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM2033 90q0 -50 -50 -50h-1918q-50 0 -50 50v984q0 50 50 50h1918q50 0 50 -50v-984zM1983 90v984h-934v-984h934zM999 90v984h-934v-984h934zM1913 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5 t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1313 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f037;" d="M1913 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1313 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1313 907q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1913 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM2033 90q0 -50 -50 -50h-1918q-50 0 -50 50v984q0 50 50 50h1918q50 0 50 -50v-984z M1983 90v984h-934v-984h934zM999 90v984h-934v-984h934zM1913 582q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1313 582q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5 t28.5 -68.5z" />
+<glyph unicode="&#x1f038;" d="M2033 90q0 -50 -50 -50h-1918q-50 0 -50 50v984q0 50 50 50h1918q50 0 50 -50v-984zM1983 90v984h-934v-984h934zM999 90v984h-934v-984h934zM629 582q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f039;" d="M1613 582q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM2033 90q0 -50 -50 -50h-1918q-50 0 -50 50v984q0 50 50 50h1918q50 0 50 -50v-984zM1983 90v984h-934v-984h934zM999 90v984h-934v-984h934zM629 582 q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f03a;" d="M1313 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1913 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM2033 90q0 -50 -50 -50h-1918q-50 0 -50 50 v984q0 50 50 50h1918q50 0 50 -50v-984zM1983 90v984h-934v-984h934zM999 90v984h-934v-984h934zM629 582q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f03b;" d="M1313 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1913 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1613 582q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM2033 90q0 -50 -50 -50h-1918q-50 0 -50 50v984q0 50 50 50h1918q50 0 50 -50v-984zM1983 90v984h-934v-984h934zM999 90v984h-934v-984h934zM629 582q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5 t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f03c;" d="M1913 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1313 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1313 907q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1913 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM2033 90q0 -50 -50 -50h-1918q-50 0 -50 50v984q0 50 50 50h1918q50 0 50 -50v-984z M1983 90v984h-934v-984h934zM999 90v984h-934v-984h934zM629 582q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f03d;" d="M1913 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1313 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1313 907q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1913 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1613 582q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5 t68.5 -28.5t28.5 -68.5zM2033 90q0 -50 -50 -50h-1918q-50 0 -50 50v984q0 50 50 50h1918q50 0 50 -50v-984zM1983 90v984h-934v-984h934zM999 90v984h-934v-984h934zM629 582q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5 t28.5 -68.5z" />
+<glyph unicode="&#x1f03e;" d="M1913 582q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1313 582q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1913 907q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1313 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1313 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5 t68.5 -28.5t28.5 -68.5zM1913 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM2033 90q0 -50 -50 -50h-1918q-50 0 -50 50v984q0 50 50 50h1918q50 0 50 -50v-984zM1983 90v984h-934v-984h934zM999 90v984h-934v-984 h934zM629 582q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f03f;" d="M2033 90q0 -50 -50 -50h-1918q-50 0 -50 50v984q0 50 50 50h1918q50 0 50 -50v-984zM1983 90v984h-934v-984h934zM999 90v984h-934v-984h934zM329 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM929 257 q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f040;" d="M1613 582q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM2033 90q0 -50 -50 -50h-1918q-50 0 -50 50v984q0 50 50 50h1918q50 0 50 -50v-984zM1983 90v984h-934v-984h934zM999 90v984h-934v-984h934zM329 907 q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM929 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f041;" d="M1313 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1913 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM2033 90q0 -50 -50 -50h-1918q-50 0 -50 50 v984q0 50 50 50h1918q50 0 50 -50v-984zM1983 90v984h-934v-984h934zM999 90v984h-934v-984h934zM329 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM929 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5 t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f042;" d="M1313 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1913 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1613 582q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM2033 90q0 -50 -50 -50h-1918q-50 0 -50 50v984q0 50 50 50h1918q50 0 50 -50v-984zM1983 90v984h-934v-984h934zM999 90v984h-934v-984h934zM329 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5 t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM929 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f043;" d="M1913 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1313 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1313 907q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1913 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM2033 90q0 -50 -50 -50h-1918q-50 0 -50 50v984q0 50 50 50h1918q50 0 50 -50v-984z M1983 90v984h-934v-984h934zM999 90v984h-934v-984h934zM329 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM929 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5 t28.5 -68.5z" />
+<glyph unicode="&#x1f044;" d="M1913 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1313 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1313 907q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1913 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1613 582q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5 t68.5 -28.5t28.5 -68.5zM2033 90q0 -50 -50 -50h-1918q-50 0 -50 50v984q0 50 50 50h1918q50 0 50 -50v-984zM1983 90v984h-934v-984h934zM999 90v984h-934v-984h934zM329 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5 t28.5 -68.5zM929 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f045;" d="M1913 582q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1313 582q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1913 907q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1313 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1313 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5 t68.5 -28.5t28.5 -68.5zM1913 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM2033 90q0 -50 -50 -50h-1918q-50 0 -50 50v984q0 50 50 50h1918q50 0 50 -50v-984zM1983 90v984h-934v-984h934zM999 90v984h-934v-984 h934zM329 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM929 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f046;" d="M629 582q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM2033 90q0 -50 -50 -50h-1918q-50 0 -50 50v984q0 50 50 50h1918q50 0 50 -50v-984zM1983 90v984h-934v-984h934zM999 90v984h-934v-984h934zM329 907 q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM929 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f047;" d="M629 582q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1613 582q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM2033 90q0 -50 -50 -50h-1918q-50 0 -50 50 v984q0 50 50 50h1918q50 0 50 -50v-984zM1983 90v984h-934v-984h934zM999 90v984h-934v-984h934zM329 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM929 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5 t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f048;" d="M629 582q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1313 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1913 257q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM2033 90q0 -50 -50 -50h-1918q-50 0 -50 50v984q0 50 50 50h1918q50 0 50 -50v-984zM1983 90v984h-934v-984h934zM999 90v984h-934v-984h934zM329 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5 t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM929 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f049;" d="M629 582q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1313 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1913 257q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1613 582q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM2033 90q0 -50 -50 -50h-1918q-50 0 -50 50v984q0 50 50 50h1918q50 0 50 -50v-984z M1983 90v984h-934v-984h934zM999 90v984h-934v-984h934zM329 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM929 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5 t28.5 -68.5z" />
+<glyph unicode="&#x1f04a;" d="M629 582q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1913 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1313 257q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1313 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1913 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5 t68.5 -28.5t28.5 -68.5zM2033 90q0 -50 -50 -50h-1918q-50 0 -50 50v984q0 50 50 50h1918q50 0 50 -50v-984zM1983 90v984h-934v-984h934zM999 90v984h-934v-984h934zM329 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5 t28.5 -68.5zM929 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f04b;" d="M629 582q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1913 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1313 257q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1313 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1913 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5 t68.5 -28.5t28.5 -68.5zM1613 582q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM2033 90q0 -50 -50 -50h-1918q-50 0 -50 50v984q0 50 50 50h1918q50 0 50 -50v-984zM1983 90v984h-934v-984h934zM999 90v984h-934v-984 h934zM329 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM929 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f04c;" d="M629 582q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1913 582q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1313 582q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1913 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1313 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5 t68.5 -28.5t28.5 -68.5zM1313 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1913 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM2033 90q0 -50 -50 -50 h-1918q-50 0 -50 50v984q0 50 50 50h1918q50 0 50 -50v-984zM1983 90v984h-934v-984h934zM999 90v984h-934v-984h934zM329 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM929 257q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f04d;" d="M329 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM929 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM2033 90q0 -50 -50 -50h-1918q-50 0 -50 50v984 q0 50 50 50h1918q50 0 50 -50v-984zM1983 90v984h-934v-984h934zM999 90v984h-934v-984h934zM929 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5 t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f04e;" d="M329 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM929 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1613 582q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM2033 90q0 -50 -50 -50h-1918q-50 0 -50 50v984q0 50 50 50h1918q50 0 50 -50v-984zM1983 90v984h-934v-984h934zM999 90v984h-934v-984h934zM929 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5 t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f04f;" d="M329 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM929 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1313 907q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1913 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM2033 90q0 -50 -50 -50h-1918q-50 0 -50 50v984q0 50 50 50h1918q50 0 50 -50v-984z M1983 90v984h-934v-984h934zM999 90v984h-934v-984h934zM929 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5 t28.5 -68.5z" />
+<glyph unicode="&#x1f050;" d="M329 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM929 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1313 907q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1913 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1613 582q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5 t68.5 -28.5t28.5 -68.5zM2033 90q0 -50 -50 -50h-1918q-50 0 -50 50v984q0 50 50 50h1918q50 0 50 -50v-984zM1983 90v984h-934v-984h934zM999 90v984h-934v-984h934zM929 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5 t28.5 -68.5zM329 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f051;" d="M329 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM929 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1913 907q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1313 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1313 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5 t68.5 -28.5t28.5 -68.5zM1913 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM2033 90q0 -50 -50 -50h-1918q-50 0 -50 50v984q0 50 50 50h1918q50 0 50 -50v-984zM1983 90v984h-934v-984h934zM999 90v984h-934v-984 h934zM929 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f052;" d="M329 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM929 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1913 907q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1313 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1313 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5 t68.5 -28.5t28.5 -68.5zM1913 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1613 582q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM2033 90q0 -50 -50 -50 h-1918q-50 0 -50 50v984q0 50 50 50h1918q50 0 50 -50v-984zM1983 90v984h-934v-984h934zM999 90v984h-934v-984h934zM929 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 257q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f053;" d="M329 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM929 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1913 582q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1313 582q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1913 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5 t68.5 -28.5t28.5 -68.5zM1313 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1313 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1913 257 q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM2033 90q0 -50 -50 -50h-1918q-50 0 -50 50v984q0 50 50 50h1918q50 0 50 -50v-984zM1983 90v984h-934v-984h934zM999 90v984h-934v-984h934zM929 907q0 -40 -28.5 -68.5 t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f054;" d="M329 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM929 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM629 582q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM2033 90q0 -50 -50 -50h-1918q-50 0 -50 50v984q0 50 50 50h1918q50 0 50 -50v-984zM1983 90v984h-934v-984h934zM999 90v984h-934v-984h934zM929 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5 t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f055;" d="M329 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM929 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM629 582q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1613 582q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM2033 90q0 -50 -50 -50h-1918q-50 0 -50 50v984q0 50 50 50h1918q50 0 50 -50v-984z M1983 90v984h-934v-984h934zM999 90v984h-934v-984h934zM929 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5 t28.5 -68.5z" />
+<glyph unicode="&#x1f056;" d="M329 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM929 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM629 582q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1313 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1913 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5 t68.5 -28.5t28.5 -68.5zM2033 90q0 -50 -50 -50h-1918q-50 0 -50 50v984q0 50 50 50h1918q50 0 50 -50v-984zM1983 90v984h-934v-984h934zM999 90v984h-934v-984h934zM929 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5 t28.5 -68.5zM329 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f057;" d="M329 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM929 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM629 582q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1313 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1913 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5 t68.5 -28.5t28.5 -68.5zM1613 582q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM2033 90q0 -50 -50 -50h-1918q-50 0 -50 50v984q0 50 50 50h1918q50 0 50 -50v-984zM1983 90v984h-934v-984h934zM999 90v984h-934v-984 h934zM929 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f058;" d="M329 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM929 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM629 582q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1913 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1313 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5 t68.5 -28.5t28.5 -68.5zM1313 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1913 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM2033 90q0 -50 -50 -50 h-1918q-50 0 -50 50v984q0 50 50 50h1918q50 0 50 -50v-984zM1983 90v984h-934v-984h934zM999 90v984h-934v-984h934zM929 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 257q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f059;" d="M329 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM929 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM629 582q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1913 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1313 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5 t68.5 -28.5t28.5 -68.5zM1313 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1913 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1613 582 q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM2033 90q0 -50 -50 -50h-1918q-50 0 -50 50v984q0 50 50 50h1918q50 0 50 -50v-984zM1983 90v984h-934v-984h934zM999 90v984h-934v-984h934zM929 907q0 -40 -28.5 -68.5 t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f05a;" d="M329 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM929 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM629 582q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1913 582q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1313 582q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5 t68.5 -28.5t28.5 -68.5zM1913 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1313 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1313 907 q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1913 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM2033 90q0 -50 -50 -50h-1918q-50 0 -50 50v984 q0 50 50 50h1918q50 0 50 -50v-984zM1983 90v984h-934v-984h934zM999 90v984h-934v-984h934zM929 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5 t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f05b;" d="M929 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 907q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM929 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM2033 90q0 -50 -50 -50h-1918q-50 0 -50 50v984q0 50 50 50h1918q50 0 50 -50v-984z M1983 90v984h-934v-984h934zM999 90v984h-934v-984h934zM929 582q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 582q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5 t28.5 -68.5z" />
+<glyph unicode="&#x1f05c;" d="M929 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 907q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM929 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1613 582q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5 t68.5 -28.5t28.5 -68.5zM2033 90q0 -50 -50 -50h-1918q-50 0 -50 50v984q0 50 50 50h1918q50 0 50 -50v-984zM1983 90v984h-934v-984h934zM999 90v984h-934v-984h934zM929 582q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5 t28.5 -68.5zM329 582q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f05d;" d="M929 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 907q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM929 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1313 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5 t68.5 -28.5t28.5 -68.5zM1913 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM2033 90q0 -50 -50 -50h-1918q-50 0 -50 50v984q0 50 50 50h1918q50 0 50 -50v-984zM1983 90v984h-934v-984h934zM999 90v984h-934v-984 h934zM929 582q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 582q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f05e;" d="M929 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 907q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM929 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1313 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5 t68.5 -28.5t28.5 -68.5zM1913 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1613 582q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM2033 90q0 -50 -50 -50 h-1918q-50 0 -50 50v984q0 50 50 50h1918q50 0 50 -50v-984zM1983 90v984h-934v-984h934zM999 90v984h-934v-984h934zM929 582q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 582q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f05f;" d="M929 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 907q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM929 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1913 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5 t68.5 -28.5t28.5 -68.5zM1313 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1313 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1913 257 q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM2033 90q0 -50 -50 -50h-1918q-50 0 -50 50v984q0 50 50 50h1918q50 0 50 -50v-984zM1983 90v984h-934v-984h934zM999 90v984h-934v-984h934zM929 582q0 -40 -28.5 -68.5 t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 582q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f060;" d="M929 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 907q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM929 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1913 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5 t68.5 -28.5t28.5 -68.5zM1313 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1313 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1913 257 q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1613 582q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM2033 90q0 -50 -50 -50h-1918q-50 0 -50 50v984 q0 50 50 50h1918q50 0 50 -50v-984zM1983 90v984h-934v-984h934zM999 90v984h-934v-984h934zM929 582q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 582q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5 t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f061;" d="M929 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 907q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM929 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1913 582q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5 t68.5 -28.5t28.5 -68.5zM1313 582q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1913 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1313 257 q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1313 907q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1913 257q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5 t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM2033 90q0 -50 -50 -50h-1918q-50 0 -50 50v984q0 50 50 50h1918q50 0 50 -50v-984zM1983 90v984h-934v-984h934zM999 90v984h-934v-984h934zM929 582q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5 t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 582q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f062;" horiz-adv-x="1114" d="M1099 -377q0 -50 -50 -50h-984q-50 0 -50 50v1918q0 50 50 50h984q50 0 50 -50v-1918zM1049 -377v1918h-984v-1918h984zM999 607h-884v884h884v-884zM999 -327h-884v884h884v-884z" />
+<glyph unicode="&#x1f063;" horiz-adv-x="1114" d="M1099 -377q0 -50 -50 -50h-984q-50 0 -50 50v1918q0 50 50 50h984q50 0 50 -50v-1918zM1049 607v934h-984v-934h984zM1049 -377v934h-984v-934h984z" />
+<glyph unicode="&#x1f064;" horiz-adv-x="1114" d="M1099 -377q0 -50 -50 -50h-984q-50 0 -50 50v1918q0 50 50 50h984q50 0 50 -50v-1918zM1049 607v934h-984v-934h984zM1049 -377v934h-984v-934h984zM654 90q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f065;" horiz-adv-x="1114" d="M1099 -377q0 -50 -50 -50h-984q-50 0 -50 50v1918q0 50 50 50h984q50 0 50 -50v-1918zM1049 607v934h-984v-934h984zM1049 -377v934h-984v-934h984zM979 390q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 -210 q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f066;" horiz-adv-x="1114" d="M654 90q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1099 -377q0 -50 -50 -50h-984q-50 0 -50 50v1918q0 50 50 50h984q50 0 50 -50v-1918zM1049 607v934h-984v-934h984zM1049 -377v934h-984v-934h984zM979 390 q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 -210q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f067;" horiz-adv-x="1114" d="M979 390q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 -210q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1099 -377q0 -50 -50 -50h-984q-50 0 -50 50 v1918q0 50 50 50h984q50 0 50 -50v-1918zM1049 607v934h-984v-934h984zM1049 -377v934h-984v-934h984zM979 -210q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 390q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5 t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f068;" horiz-adv-x="1114" d="M979 390q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 -210q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM654 90q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1099 -377q0 -50 -50 -50h-984q-50 0 -50 50v1918q0 50 50 50h984q50 0 50 -50v-1918zM1049 607v934h-984v-934h984zM1049 -377v934h-984v-934h984zM979 -210q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5 t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 390q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f069;" horiz-adv-x="1114" d="M979 -210q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 390q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM979 390q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 -210q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1099 -377q0 -50 -50 -50h-984q-50 0 -50 50v1918q0 50 50 50h984q50 0 50 -50v-1918z M1049 607v934h-984v-934h984zM1049 -377v934h-984v-934h984zM979 90q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 90q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5 t28.5 -68.5z" />
+<glyph unicode="&#x1f06a;" horiz-adv-x="1114" d="M1099 -377q0 -50 -50 -50h-984q-50 0 -50 50v1918q0 50 50 50h984q50 0 50 -50v-1918zM1049 607v934h-984v-934h984zM1049 -377v934h-984v-934h984zM654 1074q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f06b;" horiz-adv-x="1114" d="M654 90q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1099 -377q0 -50 -50 -50h-984q-50 0 -50 50v1918q0 50 50 50h984q50 0 50 -50v-1918zM1049 607v934h-984v-934h984zM1049 -377v934h-984v-934h984zM654 1074 q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f06c;" horiz-adv-x="1114" d="M979 390q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 -210q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1099 -377q0 -50 -50 -50h-984q-50 0 -50 50 v1918q0 50 50 50h984q50 0 50 -50v-1918zM1049 607v934h-984v-934h984zM1049 -377v934h-984v-934h984zM654 1074q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f06d;" horiz-adv-x="1114" d="M979 390q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 -210q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM654 90q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1099 -377q0 -50 -50 -50h-984q-50 0 -50 50v1918q0 50 50 50h984q50 0 50 -50v-1918zM1049 607v934h-984v-934h984zM1049 -377v934h-984v-934h984zM654 1074q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5 t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f06e;" horiz-adv-x="1114" d="M979 -210q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 390q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM979 390q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 -210q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1099 -377q0 -50 -50 -50h-984q-50 0 -50 50v1918q0 50 50 50h984q50 0 50 -50v-1918z M1049 607v934h-984v-934h984zM1049 -377v934h-984v-934h984zM654 1074q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f06f;" horiz-adv-x="1114" d="M979 -210q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 390q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM979 390q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 -210q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM654 90q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5 t68.5 -28.5t28.5 -68.5zM1099 -377q0 -50 -50 -50h-984q-50 0 -50 50v1918q0 50 50 50h984q50 0 50 -50v-1918zM1049 607v934h-984v-934h984zM1049 -377v934h-984v-934h984zM654 1074q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5 t28.5 -68.5z" />
+<glyph unicode="&#x1f070;" horiz-adv-x="1114" d="M979 90q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 90q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM979 -210q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 390q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM979 390q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5 t68.5 -28.5t28.5 -68.5zM329 -210q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1099 -377q0 -50 -50 -50h-984q-50 0 -50 50v1918q0 50 50 50h984q50 0 50 -50v-1918zM1049 607v934h-984v-934h984zM1049 -377v934 h-984v-934h984zM654 1074q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f071;" horiz-adv-x="1114" d="M1099 -377q0 -50 -50 -50h-984q-50 0 -50 50v1918q0 50 50 50h984q50 0 50 -50v-1918zM1049 607v934h-984v-934h984zM1049 -377v934h-984v-934h984zM979 1374q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 774 q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f072;" horiz-adv-x="1114" d="M654 90q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1099 -377q0 -50 -50 -50h-984q-50 0 -50 50v1918q0 50 50 50h984q50 0 50 -50v-1918zM1049 607v934h-984v-934h984zM1049 -377v934h-984v-934h984zM979 1374 q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 774q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f073;" horiz-adv-x="1114" d="M979 390q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 -210q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1099 -377q0 -50 -50 -50h-984q-50 0 -50 50 v1918q0 50 50 50h984q50 0 50 -50v-1918zM1049 607v934h-984v-934h984zM1049 -377v934h-984v-934h984zM979 1374q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 774q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5 t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f074;" horiz-adv-x="1114" d="M979 390q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 -210q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM654 90q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1099 -377q0 -50 -50 -50h-984q-50 0 -50 50v1918q0 50 50 50h984q50 0 50 -50v-1918zM1049 607v934h-984v-934h984zM1049 -377v934h-984v-934h984zM979 1374q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5 t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 774q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f075;" horiz-adv-x="1114" d="M979 -210q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 390q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM979 390q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 -210q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1099 -377q0 -50 -50 -50h-984q-50 0 -50 50v1918q0 50 50 50h984q50 0 50 -50v-1918z M1049 607v934h-984v-934h984zM1049 -377v934h-984v-934h984zM979 1374q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 774q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5 t28.5 -68.5z" />
+<glyph unicode="&#x1f076;" horiz-adv-x="1114" d="M979 -210q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 390q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM979 390q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 -210q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM654 90q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5 t68.5 -28.5t28.5 -68.5zM1099 -377q0 -50 -50 -50h-984q-50 0 -50 50v1918q0 50 50 50h984q50 0 50 -50v-1918zM1049 607v934h-984v-934h984zM1049 -377v934h-984v-934h984zM979 1374q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5 t28.5 -68.5zM329 774q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f077;" horiz-adv-x="1114" d="M979 90q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 90q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM979 -210q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 390q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM979 390q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5 t68.5 -28.5t28.5 -68.5zM329 -210q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1099 -377q0 -50 -50 -50h-984q-50 0 -50 50v1918q0 50 50 50h984q50 0 50 -50v-1918zM1049 607v934h-984v-934h984zM1049 -377v934 h-984v-934h984zM979 1374q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 774q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f078;" horiz-adv-x="1114" d="M654 1074q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1099 -377q0 -50 -50 -50h-984q-50 0 -50 50v1918q0 50 50 50h984q50 0 50 -50v-1918zM1049 607v934h-984v-934h984zM1049 -377v934h-984v-934h984zM979 1374 q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 774q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f079;" horiz-adv-x="1114" d="M654 1074q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM654 90q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1099 -377q0 -50 -50 -50h-984q-50 0 -50 50 v1918q0 50 50 50h984q50 0 50 -50v-1918zM1049 607v934h-984v-934h984zM1049 -377v934h-984v-934h984zM979 1374q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 774q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5 t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f07a;" horiz-adv-x="1114" d="M654 1074q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM979 390q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 -210q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1099 -377q0 -50 -50 -50h-984q-50 0 -50 50v1918q0 50 50 50h984q50 0 50 -50v-1918zM1049 607v934h-984v-934h984zM1049 -377v934h-984v-934h984zM979 1374q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5 t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 774q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f07b;" horiz-adv-x="1114" d="M654 1074q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM979 390q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 -210q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM654 90q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1099 -377q0 -50 -50 -50h-984q-50 0 -50 50v1918q0 50 50 50h984q50 0 50 -50v-1918z M1049 607v934h-984v-934h984zM1049 -377v934h-984v-934h984zM979 1374q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 774q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5 t28.5 -68.5z" />
+<glyph unicode="&#x1f07c;" horiz-adv-x="1114" d="M654 1074q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM979 -210q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 390q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM979 390q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 -210q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5 t68.5 -28.5t28.5 -68.5zM1099 -377q0 -50 -50 -50h-984q-50 0 -50 50v1918q0 50 50 50h984q50 0 50 -50v-1918zM1049 607v934h-984v-934h984zM1049 -377v934h-984v-934h984zM979 1374q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5 t28.5 -68.5zM329 774q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f07d;" horiz-adv-x="1114" d="M654 1074q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM979 -210q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 390q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM979 390q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 -210q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5 t68.5 -28.5t28.5 -68.5zM654 90q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1099 -377q0 -50 -50 -50h-984q-50 0 -50 50v1918q0 50 50 50h984q50 0 50 -50v-1918zM1049 607v934h-984v-934h984zM1049 -377v934h-984 v-934h984zM979 1374q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 774q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f07e;" horiz-adv-x="1114" d="M654 1074q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM979 90q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 90q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM979 -210q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 390q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5 t68.5 -28.5t28.5 -68.5zM979 390q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 -210q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1099 -377q0 -50 -50 -50 h-984q-50 0 -50 50v1918q0 50 50 50h984q50 0 50 -50v-1918zM1049 607v934h-984v-934h984zM1049 -377v934h-984v-934h984zM979 1374q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 774q0 -40 -28.5 -68.5 t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f07f;" horiz-adv-x="1114" d="M979 1374q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 774q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1099 -377q0 -50 -50 -50h-984q-50 0 -50 50 v1918q0 50 50 50h984q50 0 50 -50v-1918zM1049 607v934h-984v-934h984zM1049 -377v934h-984v-934h984zM979 774q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 1374q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5 t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f080;" horiz-adv-x="1114" d="M979 1374q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 774q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM654 90q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1099 -377q0 -50 -50 -50h-984q-50 0 -50 50v1918q0 50 50 50h984q50 0 50 -50v-1918zM1049 607v934h-984v-934h984zM1049 -377v934h-984v-934h984zM979 774q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5 t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 1374q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f081;" horiz-adv-x="1114" d="M979 1374q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 774q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM979 390q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 -210q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1099 -377q0 -50 -50 -50h-984q-50 0 -50 50v1918q0 50 50 50h984q50 0 50 -50v-1918z M1049 607v934h-984v-934h984zM1049 -377v934h-984v-934h984zM979 774q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 1374q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5 t28.5 -68.5z" />
+<glyph unicode="&#x1f082;" horiz-adv-x="1114" d="M979 1374q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 774q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM979 390q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 -210q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM654 90q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5 t68.5 -28.5t28.5 -68.5zM1099 -377q0 -50 -50 -50h-984q-50 0 -50 50v1918q0 50 50 50h984q50 0 50 -50v-1918zM1049 607v934h-984v-934h984zM1049 -377v934h-984v-934h984zM979 774q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5 t28.5 -68.5zM329 1374q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f083;" horiz-adv-x="1114" d="M979 1374q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 774q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM979 -210q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 390q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM979 390q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5 t68.5 -28.5t28.5 -68.5zM329 -210q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1099 -377q0 -50 -50 -50h-984q-50 0 -50 50v1918q0 50 50 50h984q50 0 50 -50v-1918zM1049 607v934h-984v-934h984zM1049 -377v934 h-984v-934h984zM979 774q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 1374q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f084;" horiz-adv-x="1114" d="M979 1374q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 774q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM979 -210q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 390q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM979 390q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5 t68.5 -28.5t28.5 -68.5zM329 -210q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM654 90q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1099 -377q0 -50 -50 -50 h-984q-50 0 -50 50v1918q0 50 50 50h984q50 0 50 -50v-1918zM1049 607v934h-984v-934h984zM1049 -377v934h-984v-934h984zM979 774q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 1374q0 -40 -28.5 -68.5 t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f085;" horiz-adv-x="1114" d="M979 1374q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 774q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM979 90q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 90q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM979 -210q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5 t68.5 -28.5t28.5 -68.5zM329 390q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM979 390q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 -210 q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1099 -377q0 -50 -50 -50h-984q-50 0 -50 50v1918q0 50 50 50h984q50 0 50 -50v-1918zM1049 607v934h-984v-934h984zM1049 -377v934h-984v-934h984zM979 774 q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 1374q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f086;" horiz-adv-x="1114" d="M979 1374q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 774q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM654 1074q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1099 -377q0 -50 -50 -50h-984q-50 0 -50 50v1918q0 50 50 50h984q50 0 50 -50v-1918zM1049 607v934h-984v-934h984zM1049 -377v934h-984v-934h984zM979 774q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5 t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 1374q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f087;" horiz-adv-x="1114" d="M979 1374q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 774q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM654 1074q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM654 90q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1099 -377q0 -50 -50 -50h-984q-50 0 -50 50v1918q0 50 50 50h984q50 0 50 -50v-1918z M1049 607v934h-984v-934h984zM1049 -377v934h-984v-934h984zM979 774q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 1374q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5 t28.5 -68.5z" />
+<glyph unicode="&#x1f088;" horiz-adv-x="1114" d="M979 1374q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 774q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM654 1074q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM979 390q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 -210q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5 t68.5 -28.5t28.5 -68.5zM1099 -377q0 -50 -50 -50h-984q-50 0 -50 50v1918q0 50 50 50h984q50 0 50 -50v-1918zM1049 607v934h-984v-934h984zM1049 -377v934h-984v-934h984zM979 774q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5 t28.5 -68.5zM329 1374q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f089;" horiz-adv-x="1114" d="M979 1374q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 774q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM654 1074q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM979 390q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 -210q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5 t68.5 -28.5t28.5 -68.5zM654 90q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1099 -377q0 -50 -50 -50h-984q-50 0 -50 50v1918q0 50 50 50h984q50 0 50 -50v-1918zM1049 607v934h-984v-934h984zM1049 -377v934h-984 v-934h984zM979 774q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 1374q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f08a;" horiz-adv-x="1114" d="M979 1374q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 774q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM654 1074q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM979 -210q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 390q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5 t68.5 -28.5t28.5 -68.5zM979 390q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 -210q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1099 -377q0 -50 -50 -50 h-984q-50 0 -50 50v1918q0 50 50 50h984q50 0 50 -50v-1918zM1049 607v934h-984v-934h984zM1049 -377v934h-984v-934h984zM979 774q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 1374q0 -40 -28.5 -68.5 t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f08b;" horiz-adv-x="1114" d="M979 1374q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 774q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM654 1074q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM979 -210q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 390q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5 t68.5 -28.5t28.5 -68.5zM979 390q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 -210q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM654 90 q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1099 -377q0 -50 -50 -50h-984q-50 0 -50 50v1918q0 50 50 50h984q50 0 50 -50v-1918zM1049 607v934h-984v-934h984zM1049 -377v934h-984v-934h984zM979 774 q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 1374q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f08c;" horiz-adv-x="1114" d="M979 1374q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 774q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM654 1074q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM979 90q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 90q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5 t68.5 -28.5t28.5 -68.5zM979 -210q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 390q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM979 390 q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 -210q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1099 -377q0 -50 -50 -50h-984q-50 0 -50 50v1918 q0 50 50 50h984q50 0 50 -50v-1918zM1049 607v934h-984v-934h984zM1049 -377v934h-984v-934h984zM979 774q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 1374q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5 t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f08d;" horiz-adv-x="1114" d="M979 774q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 1374q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM979 1374q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 774q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1099 -377q0 -50 -50 -50h-984q-50 0 -50 50v1918q0 50 50 50h984q50 0 50 -50v-1918z M1049 607v934h-984v-934h984zM1049 -377v934h-984v-934h984zM979 1074q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 1074q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5 t28.5 -68.5z" />
+<glyph unicode="&#x1f08e;" horiz-adv-x="1114" d="M979 774q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 1374q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM979 1374q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 774q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM654 90q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5 t68.5 -28.5t28.5 -68.5zM1099 -377q0 -50 -50 -50h-984q-50 0 -50 50v1918q0 50 50 50h984q50 0 50 -50v-1918zM1049 607v934h-984v-934h984zM1049 -377v934h-984v-934h984zM979 1074q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5 t28.5 -68.5zM329 1074q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f08f;" horiz-adv-x="1114" d="M979 774q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 1374q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM979 1374q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 774q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM979 390q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5 t68.5 -28.5t28.5 -68.5zM329 -210q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1099 -377q0 -50 -50 -50h-984q-50 0 -50 50v1918q0 50 50 50h984q50 0 50 -50v-1918zM1049 607v934h-984v-934h984zM1049 -377v934 h-984v-934h984zM979 1074q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 1074q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f090;" horiz-adv-x="1114" d="M979 774q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 1374q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM979 1374q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 774q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM979 390q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5 t68.5 -28.5t28.5 -68.5zM329 -210q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM654 90q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1099 -377q0 -50 -50 -50 h-984q-50 0 -50 50v1918q0 50 50 50h984q50 0 50 -50v-1918zM1049 607v934h-984v-934h984zM1049 -377v934h-984v-934h984zM979 1074q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 1074q0 -40 -28.5 -68.5 t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f091;" horiz-adv-x="1114" d="M979 774q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 1374q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM979 1374q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 774q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM979 -210q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5 t68.5 -28.5t28.5 -68.5zM329 390q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM979 390q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 -210 q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1099 -377q0 -50 -50 -50h-984q-50 0 -50 50v1918q0 50 50 50h984q50 0 50 -50v-1918zM1049 607v934h-984v-934h984zM1049 -377v934h-984v-934h984zM979 1074 q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 1074q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f092;" horiz-adv-x="1114" d="M979 774q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 1374q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM979 1374q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 774q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM979 -210q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5 t68.5 -28.5t28.5 -68.5zM329 390q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM979 390q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 -210 q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM654 90q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1099 -377q0 -50 -50 -50h-984q-50 0 -50 50v1918 q0 50 50 50h984q50 0 50 -50v-1918zM1049 607v934h-984v-934h984zM1049 -377v934h-984v-934h984zM979 1074q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 1074q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5 t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f093;" horiz-adv-x="1114" d="M979 774q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 1374q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM979 1374q0 -40 -28.5 -68.5t-68.5 -28.5 t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 774q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM979 90q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5 t68.5 -28.5t28.5 -68.5zM329 90q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM979 -210q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 390 q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM979 390q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 -210q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5 t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM1099 -377q0 -50 -50 -50h-984q-50 0 -50 50v1918q0 50 50 50h984q50 0 50 -50v-1918zM1049 607v934h-984v-934h984zM1049 -377v934h-984v-934h984zM979 1074q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5 t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5zM329 1074q0 -40 -28.5 -68.5t-68.5 -28.5t-68.5 28.5t-28.5 68.5t28.5 68.5t68.5 28.5t68.5 -28.5t28.5 -68.5z" />
+<glyph unicode="&#x1f094;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x1f095;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x1f096;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x1f097;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x1f098;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x1f099;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x1f09a;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x1f09b;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x1f09c;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x1f09d;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x1f09e;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x1f09f;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x1f0a0;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM1403 -188h-1178v1540h1178v-1540zM1379 -164v1492h-1130v-1492 h1130zM1373 1178l-108 -144l-109 144l109 144zM1156 1178l-108 -144l-109 144l109 144zM1373 880l-108 -144l-109 144l109 144zM928 1178l-108 -144l-109 144l109 144zM1156 880l-108 -144l-109 144l109 144zM1373 582l-108 -144l-109 144l109 144zM700 1178l-108 -144 l-109 144l109 144zM928 880l-108 -144l-109 144l109 144zM1156 582l-108 -144l-109 144l109 144zM1373 284l-108 -144l-109 144l109 144zM472 1178l-109 -144l-108 144l108 144zM700 880l-108 -144l-109 144l109 144zM928 582l-108 -144l-109 144l109 144zM1156 284 l-108 -144l-109 144l109 144zM1373 -14l-108 -144l-109 144l109 144zM472 880l-109 -144l-108 144l108 144zM700 582l-108 -144l-109 144l109 144zM928 284l-108 -144l-109 144l109 144zM1156 -14l-108 -144l-109 144l109 144zM472 582l-109 -144l-108 144l108 144zM700 284 l-108 -144l-109 144l109 144zM928 -14l-108 -144l-109 144l109 144zM472 284l-109 -144l-108 144l108 144zM700 -14l-108 -144l-109 144l109 144zM472 -14l-109 -144l-108 144l108 144z" />
+<glyph unicode="&#x1f0a1;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM321 1252h-79v25h24l-16 46h-74l-16 -46h24v-25h-79v25h25 l54 155h-24v23h106v-23h-24l54 -155h25v-25zM1494 68q0 -12 -20 -35l-58 -66l-59 66q-20 22 -20 35q0 37 36 37q32 0 39 -26q-8 58 -22 84q9 -3 25.5 -3t25.5 3q-14 -26 -22 -84q7 26 41 26t34 -37zM1085 713q78 -85 78 -158.5t-42.5 -119.5t-107.5 -46q-120 0 -181 136h-1 q0 -296 262 -304l4 -27h-566l4 27q263 8 263 304h-2q-61 -136 -181 -136q-65 0 -107.5 46t-42.5 119.5t78 158.5l156 152q92 100 115 207q23 -107 115 -207zM291 1096q0 -37 -36 -37q-32 0 -39 26q8 -58 22 -84q-9 3 -25.5 3t-25.5 -3q14 26 22 84q-7 -26 -41 -26t-34 37 q0 12 20 35l58 66l59 -66q20 -22 20 -35zM1523 -113h-25l-54 -155h24v-23h-106v23h24l-54 155h-25v25h79v-25h-24l16 -46h74l16 46h-24v25h79v-25zM243 1347l-28 85h-4l-28 -85h60zM1445 -183h-60l28 -85h4z" />
+<glyph unicode="&#x1f0a2;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM910 1221q33 -37 33 -59t-17.5 -40.5t-41.5 -18.5t-44.5 16 t-20.5 39q9 -62 15 -91t22 -59q-15 5 -42 5t-42 -5q21 39 37 150q0 -23 -20.5 -39t-44.5 -16t-41.5 18.5t-17.5 40.5t33 59l96 109zM146 1252q0 20 10 45t44 50t40.5 34.5t6.5 19.5q0 33 -33 33q-36 0 -36 -48v-8h-27v9q0 71 61 71q64 0 64 -55q0 -17 -9 -29t-48.5 -43 t-42.5 -53h76l1 46h24l-1 -72h-130zM1494 68q0 -12 -20 -35l-58 -66l-59 66q-20 22 -20 35q0 37 36 37q32 0 39 -26q-8 58 -22 84q9 -3 25.5 -3t25.5 3q-14 -26 -22 -84q7 26 41 26t34 -37zM291 1096q0 -37 -36 -37q-32 0 -39 26q8 -58 22 -84q-9 3 -25.5 3t-25.5 -3 q14 26 22 84q-7 -26 -41 -26t-34 37q0 12 20 35l58 66l59 -66q20 -22 20 -35zM1482 -88q0 -20 -10 -45t-44 -50t-40.5 -34.5t-6.5 -19.5q0 -33 33 -33q36 0 36 48v8h27v-9q0 -71 -61 -71q-64 0 -64 55q0 17 9 29t48.5 43t42.5 53h-76l-1 -46h-24l1 72h130zM925.5 43 q17.5 -18 17.5 -40t-33 -59l-96 -109l-96 109q-33 37 -33 59t17.5 40t41.5 18t44.5 -16t20.5 -39q-9 63 -15 92t-22 59q15 -5 42 -5t42 5q-21 -39 -37 -151q0 23 20.5 39t44.5 16t41.5 -18z" />
+<glyph unicode="&#x1f0a3;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM910 1221q33 -37 33 -59t-17.5 -40.5t-41.5 -18.5t-44.5 16 t-20.5 39q9 -62 15 -91t22 -59q-15 5 -42 5t-42 -5q21 39 37 150q0 -23 -20.5 -39t-44.5 -16t-41.5 18.5t-17.5 40.5t33 59l96 109zM214 1272q39 0 39 37q0 36 -55 36h-5v25q51 0 51 32t-30 32q-34 0 -35 -40h-28q0 34 17.5 49t42.5 15q61 0 61 -54q0 -33 -28 -46 q38 -11 38 -44.5t-21 -49.5t-49 -16q-71 0 -71 72h28q1 -48 45 -48zM1494 68q0 -12 -20 -35l-58 -66l-59 66q-20 22 -20 35q0 37 36 37q32 0 39 -26q-8 58 -22 84q9 -3 25.5 -3t25.5 3q-14 -26 -22 -84q7 26 41 26t34 -37zM910 650q33 -38 33 -59.5t-17.5 -39.5t-41.5 -18 t-44.5 15.5t-20.5 38.5q9 -62 15 -91t22 -59q-15 5 -42 5t-42 -5q21 39 37 150q0 -23 -20.5 -38.5t-44.5 -15.5t-41.5 18t-17.5 39.5t33 59.5l96 110zM291 1096q0 -37 -36 -37q-32 0 -39 26q8 -58 22 -84q-9 3 -25.5 3t-25.5 -3q14 26 22 84q-7 -26 -41 -26t-34 37 q0 12 20 35l58 66l59 -66q20 -22 20 -35zM1414 -108q-39 0 -39 -37q0 -36 55 -36h5v-25q-51 0 -51 -32t30 -32q34 0 35 40h28q0 -34 -17.5 -49t-42.5 -15q-61 0 -61 54q0 33 28 46q-38 11 -38 44.5t21 49.5t49 16q71 0 71 -72h-28q-1 48 -45 48zM925.5 43q17.5 -18 17.5 -40 t-33 -59l-96 -109l-96 109q-33 37 -33 59t17.5 40t41.5 18t44.5 -16t20.5 -39q-9 63 -15 92t-22 59q15 -5 42 -5t42 5q-21 -39 -37 -151q0 23 20.5 39t44.5 16t41.5 -18z" />
+<glyph unicode="&#x1f0a4;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM1249 1221q33 -37 33 -59t-17.5 -40.5t-41.5 -18.5t-44.5 16 t-20.5 39q9 -62 15 -91t22 -59q-15 5 -42 5t-42 -5q21 39 37 150q0 -23 -20.5 -39t-44.5 -16t-41.5 18.5t-17.5 40.5t33 59l96 109zM571 1221q33 -37 33 -59t-17.5 -40.5t-41.5 -18.5t-44.5 16t-20.5 39q9 -62 15 -91t22 -59q-15 5 -42 5t-42 -5q21 39 37 150 q0 -23 -20.5 -39t-44.5 -16t-41.5 18.5t-17.5 40.5t33 59l96 109zM282 1306h-33v-30h19v-24h-67v24h21v30h-68l-13 23l85 127h23v-126h33v-24zM1494 68q0 -12 -20 -35l-58 -66l-59 66q-20 22 -20 35q0 37 36 37q32 0 39 -26q-8 58 -22 84q9 -3 25.5 -3t25.5 3 q-14 -26 -22 -84q7 26 41 26t34 -37zM291 1096q0 -37 -36 -37q-32 0 -39 26q8 -58 22 -84q-9 3 -25.5 3t-25.5 -3q14 26 22 84q-7 -26 -41 -26t-34 37q0 12 20 35l58 66l59 -66q20 -22 20 -35zM1379 -292v126h-33v24h33v30h-19v24h67v-24h-21v-30h68l13 -23l-85 -127h-23z M1264.5 43q17.5 -18 17.5 -40t-33 -59l-96 -109l-96 109q-33 37 -33 59t17.5 40t41.5 18t44.5 -16t20.5 -39q-9 63 -15 92t-22 59q15 -5 42 -5t42 5q-21 -39 -37 -151q0 23 20.5 39t44.5 16t41.5 -18zM586.5 43q17.5 -18 17.5 -40t-33 -59l-96 -109l-96 109q-33 37 -33 59 t17.5 40t41.5 18t44.5 -16t20.5 -39q-9 63 -15 92t-22 59q15 -5 42 -5t42 5q-21 -39 -37 -151q0 23 20.5 39t44.5 16t41.5 -18zM222 1330v80l-53 -80h53zM1406 -166v-80l53 80h-53z" />
+<glyph unicode="&#x1f0a5;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM1249 1221q33 -37 33 -59t-17.5 -40.5t-41.5 -18.5t-44.5 16 t-20.5 39q9 -62 15 -91t22 -59q-15 5 -42 5t-42 -5q21 39 37 150q0 -23 -20.5 -39t-44.5 -16t-41.5 18.5t-17.5 40.5t33 59l96 109zM571 1221q33 -37 33 -59t-17.5 -40.5t-41.5 -18.5t-44.5 16t-20.5 39q9 -62 15 -91t22 -59q-15 5 -42 5t-42 -5q21 39 37 150 q0 -23 -20.5 -39t-44.5 -16t-41.5 18.5t-17.5 40.5t33 59l96 109zM281 1316q0 -68 -70 -68q-64 0 -68 68h26q5 -44 42 -44q41 0 41 43.5t-38 43.5q-25 0 -41 -24q-9 9 -20 14l7 106h109v-54h-25v27h-62l-5 -60q20 16 42 16q62 0 62 -68zM1494 68q0 -12 -20 -35l-58 -66 l-59 66q-20 22 -20 35q0 37 36 37q32 0 39 -26q-8 58 -22 84q9 -3 25.5 -3t25.5 3q-14 -26 -22 -84q7 26 41 26t34 -37zM910 650q33 -38 33 -59.5t-17.5 -39.5t-41.5 -18t-44.5 15.5t-20.5 38.5q9 -62 15 -91t22 -59q-15 5 -42 5t-42 -5q21 39 37 150q0 -23 -20.5 -38.5 t-44.5 -15.5t-41.5 18t-17.5 39.5t33 59.5l96 110zM291 1096q0 -37 -36 -37q-32 0 -39 26q8 -58 22 -84q-9 3 -25.5 3t-25.5 -3q14 26 22 84q-7 -26 -41 -26t-34 37q0 12 20 35l58 66l59 -66q20 -22 20 -35zM1417 -108q-41 0 -41 -43.5t38 -43.5q25 0 41 24q9 -9 20 -14 l-7 -106h-109v54h25v-27h62l5 60q-20 -16 -42 -16q-62 0 -62 68t70 68q64 0 68 -68h-26q-5 44 -42 44zM1264.5 43q17.5 -18 17.5 -40t-33 -59l-96 -109l-96 109q-33 37 -33 59t17.5 40t41.5 18t44.5 -16t20.5 -39q-9 63 -15 92t-22 59q15 -5 42 -5t42 5q-21 -39 -37 -151 q0 23 20.5 39t44.5 16t41.5 -18zM586.5 43q17.5 -18 17.5 -40t-33 -59l-96 -109l-96 109q-33 37 -33 59t17.5 40t41.5 18t44.5 -16t20.5 -39q-9 63 -15 92t-22 59q15 -5 42 -5t42 5q-21 -39 -37 -151q0 23 20.5 39t44.5 16t41.5 -18z" />
+<glyph unicode="&#x1f0a6;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM1249 1221q33 -37 33 -59t-17.5 -40.5t-41.5 -18.5t-44.5 16 t-20.5 39q9 -62 15 -91t22 -59q-15 5 -42 5t-42 -5q21 39 37 150q0 -23 -20.5 -39t-44.5 -16t-41.5 18.5t-17.5 40.5t33 59l96 109zM1249 650q33 -38 33 -59.5t-17.5 -39.5t-41.5 -18t-44.5 15.5t-20.5 38.5q9 -62 15 -91t22 -59q-15 5 -42 5t-42 -5q21 39 37 150 q0 -23 -20.5 -38.5t-44.5 -15.5t-41.5 18t-17.5 39.5t33 59.5l96 110zM571 1221q33 -37 33 -59t-17.5 -40.5t-41.5 -18.5t-44.5 16t-20.5 39q9 -62 15 -91t22 -59q-15 5 -42 5t-42 -5q21 39 37 150q0 -23 -20.5 -39t-44.5 -16t-41.5 18.5t-17.5 40.5t33 59l96 109zM221 1381 q56 0 56 -66.5t-61 -66.5q-32 0 -51 26t-19 78q0 106 71 106q57 0 59 -63h-26q-5 39 -35 39q-41 0 -42 -76q21 23 48 23zM1494 68q0 -12 -20 -35l-58 -66l-59 66q-20 22 -20 35q0 37 36 37q32 0 39 -26q-8 58 -22 84q9 -3 25.5 -3t25.5 3q-14 -26 -22 -84q7 26 41 26t34 -37 zM291 1096q0 -37 -36 -37q-32 0 -39 26q8 -58 22 -84q-9 3 -25.5 3t-25.5 -3q14 26 22 84q-7 -26 -41 -26t-34 37q0 12 20 35l58 66l59 -66q20 -22 20 -35zM1482 -188q0 -106 -71 -106q-57 0 -59 63h26q5 -39 35 -39q41 0 42 76q-21 -23 -48 -23q-56 0 -56 66.5t61 66.5 q32 0 51 -26t19 -78zM1264.5 43q17.5 -18 17.5 -40t-33 -59l-96 -109l-96 109q-33 37 -33 59t17.5 40t41.5 18t44.5 -16t20.5 -39q-9 63 -15 92t-22 59q15 -5 42 -5t42 5q-21 -39 -37 -151q0 23 20.5 39t44.5 16t41.5 -18zM571 650q33 -38 33 -59.5t-17.5 -39.5t-41.5 -18 t-44.5 15.5t-20.5 38.5q9 -62 15 -91t22 -59q-15 5 -42 5t-42 -5q21 39 37 150q0 -23 -20.5 -38.5t-44.5 -15.5t-41.5 18t-17.5 39.5t33 59.5l96 110zM586.5 43q17.5 -18 17.5 -40t-33 -59l-96 -109l-96 109q-33 37 -33 59t17.5 40t41.5 18t44.5 -16t20.5 -39q-9 63 -15 92 t-22 59q15 -5 42 -5t42 5q-21 -39 -37 -151q0 23 20.5 39t44.5 16t41.5 -18zM215 1272q37 0 37 41t-35 41q-22 0 -43 -26q7 -56 41 -56zM1413 -108q-37 0 -37 -41t35 -41q22 0 43 26q-7 56 -41 56z" />
+<glyph unicode="&#x1f0a7;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM1249 1221q33 -37 33 -59t-17.5 -40.5t-41.5 -18.5t-44.5 16 t-20.5 39q9 -62 15 -91t22 -59q-15 5 -42 5t-42 -5q21 39 37 150q0 -23 -20.5 -39t-44.5 -16t-41.5 18.5t-17.5 40.5t33 59l96 109zM1249 650q33 -38 33 -59.5t-17.5 -39.5t-41.5 -18t-44.5 15.5t-20.5 38.5q9 -62 15 -91t22 -59q-15 5 -42 5t-42 -5q21 39 37 150 q0 -23 -20.5 -38.5t-44.5 -15.5t-41.5 18t-17.5 39.5t33 59.5l96 110zM910 904q33 -37 33 -59t-17.5 -40.5t-41.5 -18.5t-44.5 16t-20.5 39q9 -62 15 -91t22 -59q-15 5 -42 5t-42 -5q21 39 37 150q0 -23 -20.5 -39t-44.5 -16t-41.5 18.5t-17.5 40.5t33 59l96 109zM571 1221 q33 -37 33 -59t-17.5 -40.5t-41.5 -18.5t-44.5 16t-20.5 39q9 -62 15 -91t22 -59q-15 5 -42 5t-42 -5q21 39 37 150q0 -23 -20.5 -39t-44.5 -16t-41.5 18.5t-17.5 40.5t33 59l96 109zM220 1276h23v-24h-80v24h28q5 85 52 152h-70v-27h-24v54h127v-22q-56 -67 -56 -157z M1494 68q0 -12 -20 -35l-58 -66l-59 66q-20 22 -20 35q0 37 36 37q32 0 39 -26q-8 58 -22 84q9 -3 25.5 -3t25.5 3q-14 -26 -22 -84q7 26 41 26t34 -37zM291 1096q0 -37 -36 -37q-32 0 -39 26q8 -58 22 -84q-9 3 -25.5 3t-25.5 -3q14 26 22 84q-7 -26 -41 -26t-34 37 q0 12 20 35l58 66l59 -66q20 -22 20 -35zM1479 -291h-127v22q56 67 56 157h-23v24h80v-24h-28q-5 -85 -52 -152h70v27h24v-54zM1264.5 43q17.5 -18 17.5 -40t-33 -59l-96 -109l-96 109q-33 37 -33 59t17.5 40t41.5 18t44.5 -16t20.5 -39q-9 63 -15 92t-22 59q15 -5 42 -5 t42 5q-21 -39 -37 -151q0 23 20.5 39t44.5 16t41.5 -18zM571 650q33 -38 33 -59.5t-17.5 -39.5t-41.5 -18t-44.5 15.5t-20.5 38.5q9 -62 15 -91t22 -59q-15 5 -42 5t-42 -5q21 39 37 150q0 -23 -20.5 -38.5t-44.5 -15.5t-41.5 18t-17.5 39.5t33 59.5l96 110zM586.5 43 q17.5 -18 17.5 -40t-33 -59l-96 -109l-96 109q-33 37 -33 59t17.5 40t41.5 18t44.5 -16t20.5 -39q-9 63 -15 92t-22 59q15 -5 42 -5t42 5q-21 -39 -37 -151q0 23 20.5 39t44.5 16t41.5 -18z" />
+<glyph unicode="&#x1f0a8;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM1249 1221q33 -37 33 -59t-17.5 -40.5t-41.5 -18.5t-44.5 16 t-20.5 39q9 -62 15 -91t22 -59q-15 5 -42 5t-42 -5q21 39 37 150q0 -23 -20.5 -39t-44.5 -16t-41.5 18.5t-17.5 40.5t33 59l96 109zM1249 650q33 -38 33 -59.5t-17.5 -39.5t-41.5 -18t-44.5 15.5t-20.5 38.5q9 -62 15 -91t22 -59q-15 5 -42 5t-42 -5q21 39 37 150 q0 -23 -20.5 -38.5t-44.5 -15.5t-41.5 18t-17.5 39.5t33 59.5l96 110zM910 904q33 -37 33 -59t-17.5 -40.5t-41.5 -18.5t-44.5 16t-20.5 39q9 -62 15 -91t22 -59q-15 5 -42 5t-42 -5q21 39 37 150q0 -23 -20.5 -39t-44.5 -16t-41.5 18.5t-17.5 40.5t33 59l96 109zM571 1221 q33 -37 33 -59t-17.5 -40.5t-41.5 -18.5t-44.5 16t-20.5 39q9 -62 15 -91t22 -59q-15 5 -42 5t-42 -5q21 39 37 150q0 -23 -20.5 -39t-44.5 -16t-41.5 18.5t-17.5 40.5t33 59l96 109zM282 1307q0 -59 -70.5 -59t-70.5 59q0 37 36 51q-29 17 -29 47q0 53 64 53t64 -53 q0 -30 -29 -47q35 -14 35 -51zM1494 68q0 -12 -20 -35l-58 -66l-59 66q-20 22 -20 35q0 37 36 37q32 0 39 -26q-8 58 -22 84q9 -3 25.5 -3t25.5 3q-14 -26 -22 -84q7 26 41 26t34 -37zM291 1096q0 -37 -36 -37q-32 0 -39 26q8 -58 22 -84q-9 3 -25.5 3t-25.5 -3q14 26 22 84 q-7 -26 -41 -26t-34 37q0 12 20 35l58 66l59 -66q20 -22 20 -35zM1487 -143q0 -37 -36 -51q29 -17 29 -47q0 -53 -64 -53t-64 53q0 30 29 47q-35 14 -35 51q0 59 70.5 59t70.5 -59zM925.5 392q17.5 -18 17.5 -40t-33 -59l-96 -109l-96 109q-33 37 -33 59t17.5 40t41.5 18 t44.5 -16t20.5 -39q-9 63 -15 92t-22 59q15 -5 42 -5t42 5q-21 -39 -37 -151q0 23 20.5 39t44.5 16t41.5 -18zM1264.5 43q17.5 -18 17.5 -40t-33 -59l-96 -109l-96 109q-33 37 -33 59t17.5 40t41.5 18t44.5 -16t20.5 -39q-9 63 -15 92t-22 59q15 -5 42 -5t42 5 q-21 -39 -37 -151q0 23 20.5 39t44.5 16t41.5 -18zM571 650q33 -38 33 -59.5t-17.5 -39.5t-41.5 -18t-44.5 15.5t-20.5 38.5q9 -62 15 -91t22 -59q-15 5 -42 5t-42 -5q21 39 37 150q0 -23 -20.5 -38.5t-44.5 -15.5t-41.5 18t-17.5 39.5t33 59.5l96 110zM586.5 43 q17.5 -18 17.5 -40t-33 -59l-96 -109l-96 109q-33 37 -33 59t17.5 40t41.5 18t44.5 -16t20.5 -39q-9 63 -15 92t-22 59q15 -5 42 -5t42 5q-21 -39 -37 -151q0 23 20.5 39t44.5 16t41.5 -18zM249 1402q0 32 -37.5 32t-37.5 -32t37.5 -32t37.5 32zM253 1308.5 q0 36.5 -41.5 36.5t-41.5 -36.5t41.5 -36.5t41.5 36.5zM1458 -144.5q0 36.5 -41.5 36.5t-41.5 -36.5t41.5 -36.5t41.5 36.5zM1454 -238q0 32 -37.5 32t-37.5 -32t37.5 -32t37.5 32z" />
+<glyph unicode="&#x1f0a9;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM1249 1221q33 -37 33 -59t-17.5 -40.5t-41.5 -18.5t-44.5 16 t-20.5 39q9 -62 15 -91t22 -59q-15 5 -42 5t-42 -5q21 39 37 150q0 -23 -20.5 -39t-44.5 -16t-41.5 18.5t-17.5 40.5t33 59l96 109zM1249 841q33 -37 33 -59t-17.5 -40.5t-41.5 -18.5t-44.5 15.5t-20.5 38.5q9 -61 15 -90t22 -59q-15 5 -42 5t-42 -5q21 40 37 149 q0 -23 -20.5 -38.5t-44.5 -15.5t-41.5 18.5t-17.5 40.5t33 59l96 109zM571 1221q33 -37 33 -59t-17.5 -40.5t-41.5 -18.5t-44.5 16t-20.5 39q9 -62 15 -91t22 -59q-15 5 -42 5t-42 -5q21 39 37 150q0 -23 -20.5 -39t-44.5 -16t-41.5 18.5t-17.5 40.5t33 59l96 109zM277 1354 q0 -106 -71 -106q-56 0 -58 63h25q5 -39 36 -39q40 0 41 76q-21 -23 -47 -23q-57 0 -57 66.5t61 66.5q32 0 51 -26t19 -78zM1264.5 423.5q17.5 -17.5 17.5 -39t-33 -59.5l-96 -110l-96 110q-33 38 -33 59.5t17.5 39t41.5 17.5t44.5 -15.5t20.5 -38.5q-9 63 -15 92t-22 59 q15 -5 42 -5t42 5q-21 -39 -37 -151q0 23 20.5 38.5t44.5 15.5t41.5 -17.5zM1494 68q0 -12 -20 -35l-58 -66l-59 66q-20 22 -20 35q0 37 36 37q32 0 39 -26q-8 58 -22 84q9 -3 25.5 -3t25.5 3q-14 -26 -22 -84q7 26 41 26t34 -37zM910 650q33 -38 33 -59.5t-17.5 -39.5 t-41.5 -18t-44.5 15.5t-20.5 38.5q9 -62 15 -91t22 -59q-15 5 -42 5t-42 -5q21 39 37 150q0 -23 -20.5 -38.5t-44.5 -15.5t-41.5 18t-17.5 39.5t33 59.5l96 110zM291 1096q0 -37 -36 -37q-32 0 -39 26q8 -58 22 -84q-9 3 -25.5 3t-25.5 -3q14 26 22 84q-7 -26 -41 -26 t-34 37q0 12 20 35l58 66l59 -66q20 -22 20 -35zM571 841q33 -37 33 -59t-17.5 -40.5t-41.5 -18.5t-44.5 15.5t-20.5 38.5q9 -61 15 -90t22 -59q-15 5 -42 5t-42 -5q21 40 37 149q0 -23 -20.5 -38.5t-44.5 -15.5t-41.5 18.5t-17.5 40.5t33 59l96 109zM1425 -161 q57 0 57 -66.5t-61 -66.5q-32 0 -51 26t-19 78q0 106 71 106q56 0 58 -63h-25q-5 39 -36 39q-40 0 -41 -76q21 23 47 23zM1264.5 43q17.5 -18 17.5 -40t-33 -59l-96 -109l-96 109q-33 37 -33 59t17.5 40t41.5 18t44.5 -16t20.5 -39q-9 63 -15 92t-22 59q15 -5 42 -5t42 5 q-21 -39 -37 -151q0 23 20.5 39t44.5 16t41.5 -18zM586.5 423.5q17.5 -17.5 17.5 -39t-33 -59.5l-96 -110l-96 110q-33 38 -33 59.5t17.5 39t41.5 17.5t44.5 -15.5t20.5 -38.5q-9 63 -15 92t-22 59q15 -5 42 -5t42 5q-21 -39 -37 -151q0 23 20.5 38.5t44.5 15.5t41.5 -17.5z M586.5 43q17.5 -18 17.5 -40t-33 -59l-96 -109l-96 109q-33 37 -33 59t17.5 40t41.5 18t44.5 -16t20.5 -39q-9 63 -15 92t-22 59q15 -5 42 -5t42 5q-21 -39 -37 -151q0 23 20.5 39t44.5 16t41.5 -18zM209 1434q-37 0 -37 -41t34 -41q22 0 43 26q-6 56 -40 56zM1419 -270 q37 0 37 41t-34 41q-22 0 -43 -26q6 -56 40 -56z" />
+<glyph unicode="&#x1f0aa;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM1249 1221q33 -37 33 -59t-17.5 -40.5t-41.5 -18.5t-44.5 16 t-20.5 39q9 -62 15 -91t22 -59q-15 5 -42 5t-42 -5q21 39 37 150q0 -23 -20.5 -39t-44.5 -16t-41.5 18.5t-17.5 40.5t33 59l96 109zM1249 841q33 -37 33 -59t-17.5 -40.5t-41.5 -18.5t-44.5 15.5t-20.5 38.5q9 -61 15 -90t22 -59q-15 5 -42 5t-42 -5q21 40 37 149 q0 -23 -20.5 -38.5t-44.5 -15.5t-41.5 18.5t-17.5 40.5t33 59l96 109zM910 1031q33 -37 33 -59t-17.5 -40.5t-41.5 -18.5t-44.5 16t-20.5 39q9 -62 15 -91t22 -59q-15 5 -42 5t-42 -5q21 39 37 150q0 -23 -20.5 -39t-44.5 -16t-41.5 18.5t-17.5 40.5t33 59l96 109zM571 1221 q33 -37 33 -59t-17.5 -40.5t-41.5 -18.5t-44.5 16t-20.5 39q9 -62 15 -91t22 -59q-15 5 -42 5t-42 -5q21 39 37 150q0 -23 -20.5 -39t-44.5 -16t-41.5 18.5t-17.5 40.5t33 59l96 109zM314 1353q0 -105 -61.5 -105t-61.5 105t61.5 105t61.5 -105zM1264.5 423.5 q17.5 -17.5 17.5 -39t-33 -59.5l-96 -110l-96 110q-33 38 -33 59.5t17.5 39t41.5 17.5t44.5 -15.5t20.5 -38.5q-9 63 -15 92t-22 59q15 -5 42 -5t42 5q-21 -39 -37 -151q0 23 20.5 38.5t44.5 15.5t41.5 -17.5zM191 1252h-83v24h28v154h-28v25h56v-179h27v-24zM1494 68 q0 -12 -20 -35l-58 -66l-59 66q-20 22 -20 35q0 37 36 37q32 0 39 -26q-8 58 -22 84q9 -3 25.5 -3t25.5 3q-14 -26 -22 -84q7 26 41 26t34 -37zM291 1096q0 -37 -36 -37q-32 0 -39 26q8 -58 22 -84q-9 3 -25.5 3t-25.5 -3q14 26 22 84q-7 -26 -41 -26t-34 37q0 12 20 35 l58 66l59 -66q20 -22 20 -35zM1520 -291h-56v179h-27v24h83v-24h-28v-154h28v-25zM571 841q33 -37 33 -59t-17.5 -40.5t-41.5 -18.5t-44.5 15.5t-20.5 38.5q9 -61 15 -90t22 -59q-15 5 -42 5t-42 -5q21 40 37 149q0 -23 -20.5 -38.5t-44.5 -15.5t-41.5 18.5t-17.5 40.5 t33 59l96 109zM1437 -189q0 -105 -61.5 -105t-61.5 105t61.5 105t61.5 -105zM1264.5 43q17.5 -18 17.5 -40t-33 -59l-96 -109l-96 109q-33 37 -33 59t17.5 40t41.5 18t44.5 -16t20.5 -39q-9 63 -15 92t-22 59q15 -5 42 -5t42 5q-21 -39 -37 -151q0 23 20.5 39t44.5 16 t41.5 -18zM925.5 265q17.5 -18 17.5 -40t-33 -59l-96 -109l-96 109q-33 37 -33 59t17.5 40t41.5 18t44.5 -16t20.5 -39q-9 63 -15 92t-22 59q15 -5 42 -5t42 5q-21 -39 -37 -151q0 23 20.5 39t44.5 16t41.5 -18zM586.5 423.5q17.5 -17.5 17.5 -39t-33 -59.5l-96 -110 l-96 110q-33 38 -33 59.5t17.5 39t41.5 17.5t44.5 -15.5t20.5 -38.5q-9 63 -15 92t-22 59q15 -5 42 -5t42 5q-21 -39 -37 -151q0 23 20.5 38.5t44.5 15.5t41.5 -17.5zM586.5 43q17.5 -18 17.5 -40t-33 -59l-96 -109l-96 109q-33 37 -33 59t17.5 40t41.5 18t44.5 -16 t20.5 -39q-9 63 -15 92t-22 59q15 -5 42 -5t42 5q-21 -39 -37 -151q0 23 20.5 39t44.5 16t41.5 -18zM285 1353q0 81 -32.5 81t-32.5 -81t32.5 -81t32.5 81zM1408 -189q0 81 -32.5 81t-32.5 -81t32.5 -81t32.5 81z" />
+<glyph unicode="&#x1f0ab;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM285 1429h-28v-110q0 -80 -71 -80q-46 0 -56 48l26 9 q10 -31 33 -31q37 0 37 53v111h-41v26h100v-26zM1494 68q0 -12 -20 -35l-58 -66l-59 66q-20 22 -20 35q0 37 36 37q32 0 39 -26q-8 58 -22 84q9 -3 25.5 -3t25.5 3q-14 -26 -22 -84q7 26 41 26t34 -37zM1284 -166h-940v1496h940v-1496zM291 1096q0 -37 -36 -37q-32 0 -39 26 q8 -58 22 -84q-9 3 -25.5 3t-25.5 -3q14 26 22 84q-7 -26 -41 -26t-34 37q0 12 20 35l58 66l59 -66q20 -22 20 -35zM1439 -101q-37 0 -37 -53v-111h41v-26h-100v26h28v110q0 80 71 80q46 0 56 -48l-26 -9q-10 31 -33 31zM1162 1196v25h-14q-6 -5 -6 -11q0 -15 12 -14h8z M1150 1057l-3 -13q0 -7 18 -17q-3 -2 -7 -2q-14 0 -14 24q0 2 12 29q6 20 24.5 74.5t18.5 62.5q0 35 -43 35t-43 -39q0 -8 8.5 -25t21.5 -17h14q1 8 5 21q-23 -2 -23 17.5t18 19.5q13 1 13 -11q0 -52 -22 -52q-9 0 -11 2q6 -28 6 -31q2 6 7 16v-3q-32 -86 -32 -96t9 -36 q15 -14 35 -14q40 0 40 40.5t-30 40.5q-11 0 -20 -20q11 0 16 -2q13 -11 13 -20t-11 -13q5 22 5 23q-2 1 -8 6h-17zM1188 1081q-3 12 -14 33l-11 -28q18 0 25 -5zM1225 988v4h-18v-4h18zM1178 960q-17 0 -21 -2q22 1 46.5 3.5t31.5 -3.5q-2 14 -2 25zM1239 1000l5 -56 q0 -25 -10 -66h-35l73 -43v483h-180l-55 -123q13 -29 13 -37.5t-1 -6.5q-18 34 -18 41.5t13 33.5h-167l-10 -13q-8 -21 -8 -42t8 -32q39 0 39 -30q0 -39 -42 -39q-7 0 -13 2v-28q48 -34 128 -34q40 0 44 14v35q-14 -5 -21 -15q0 13 5 20q13 1 23.5 17t10.5 17q6 2 17 7 q-7 37 -7 43l15 -45q-11 -5 -28 -14q-9 -12 -6.5 -37.5t1.5 -29.5q-11 -19 -27 -20t-30 -1l112 -62q5 6 11 36t22 30q5 0 12 -3q-20 21 -20 48l26 81q0 4 -12 37l-6 6q-11 24 -11 36q0 46 47 46t47 -38l-26 -96l29 -77q0 -19 -21 -42q35 0 53 -3zM1233 938v11h-24 q-13 1 -57 -11h81zM1230 910v15q-12 -3 -56 1v-6q36 -10 48 -10h8zM1207 985l-12 6h-79l-16 -54q16 -8 43 -24q5 40 11 63q19 3 53 9zM1230 902h-55q-3 3 -2 8h-16q4 -5 29.5 -14t32.5 -9t11 3v12zM1170 920v4l-18 3v-5zM880 1130q-9 0 -17 -17l2 -14q-5 4 -10 5q2 12 3 33 q-10 50 -10 49t8 38h-20q-12 -21 -12 -52q0 -89 40 -89q34 0 34 29q-3 18 -18 18zM814 1190q0 6 1 20t-1 17h-10q-16 -16 -16 -49t11.5 -66.5t28.5 -33.5q-3 0 12 3q-26 50 -26 109zM780 1173q0 5 8 51h-23q-14 -16 -14 -46.5t2.5 -51t15 -33.5t15.5 -13t17 4q-21 27 -21 89 zM756 1090q-18 30 -18 61.5t13 69.5q-4 1 -6 3q-11 0 -14 -6q-17 -32 -17 -58q0 -82 29 -82q-4 0 13 3v9zM712 1224q-32 -62 -32 -85t4 -32q10 -27 30 -26v9q-10 29 -10 61.5t18 72.5h-10zM845 1055v20l-4 -4l-72 4q-22 0 -51 -11q-8 -10 -23 -26l-4 4q10 7 15 19 q-4 3 -12 6q-21 -43 -21 -51t14 -14q1 0 2 16t13 21q-6 -11 -1.5 -22.5t16.5 -12.5q-3 26 14 35q-1 -31 3 -34h17q-3 29 11 34q3 15 3 -37h15q-4 17 4.5 33t23.5 12q4 9 14 20q0 -9 -4 -15t-4 -11q5 -15 -1 -23q-1 8 -5 20h-14q-9 -8 -9 -18q0 -18 18.5 -18t30 19t11.5 34z M1272 458v96l-51 21l-11 -11zM650 1038q-12 -11 -12 -14t3 -19q18 -3 23 -3q-4 18 0 36h-14zM1011 652q-4 -1 -25.5 -1t-27.5 2v351q-36 3 -106 27q-20 -37 -62 -37q8 0 -18 3t-32 -4v-347h-60v143q1 30 -19 76.5t-40 65.5t-25 19t-57 -23q92 -47 115 -144l14 -152h353 l60 308q-2 0 -10 4l-41 -204q-6 -29 -19 -87zM356 1318v-460l296 138q-21 -1 -21 21t24.5 27t30.5 30q-6 5 -13 13q-8 31 -8 49.5t28 94.5l-24 87h-313zM1144 392l29 -49l-16 -34h17q25 0 25 30q0 13 -11 25q-18 18 -18 28l19 55q0 16 -21.5 31t-28.5 31q1 23 -1 53 q-6 13 -21 15.5t-26 3.5q-18 8 -27.5 35.5t-25.5 37.5q-2 -9 -6 -23q12 -5 14 -21l5 -31q28 -6 66 -32q-5 -15 4 -59q5 -9 23 -21t18 -21zM487 779l-29 50q0 4 15 29h-28q-16 -22 -16 -30.5t31 -39.5v-11q0 -9 -1 -11l-20 -47q0 -11 12.5 -20t31.5 -24q9 -10 9 -36.5 t1 -28.5q10 -19 31 -22l21 -3q15 -8 25.5 -35.5t22.5 -34.5q6 18 6 23q-12 4 -14.5 21t-4.5 32q-10 8 -33.5 13t-33.5 20l4 45q-2 10 -25.5 26t-23.5 27zM1272 -154v465l-296 -137q7 -2 24 -13q1 -22 -10 -30q-12 -4 -31 -12q-5 -8 -14 -24q13 -13 15 -18q6 -23 6 -40.5 t-3.5 -31.5t-14.5 -39t-11 -26l24 -94h311zM617 512q9 1 28 1t25 -2v-348q43 0 112 -27q12 33 44.5 33.5t63.5 1.5v347h58q-1 -16 -1 -32q0 -91 22 -182q10 -15 25 -42q23 -45 43 -45q5 0 55 22q-91 52 -110 129q-13 54 -16 168h-356l-61 -302q2 -3 7 -9q12 53 28 135 t33 152zM992 150q0 4 -8 14h-19q6 -17 0 -35h10q17 -1 17 21zM943 162q0 -17 -7 -33q4 -3 -9 -21q2 -2 3 -6h9q19 38 19 35v22zM439 593l-83 121v-112l71 -19q9 0 12 10zM934 159q-13 3 -17 3q0 -10 -17 -37q0 3 2.5 15.5t1.5 17.5q-3 7 -14 7q3 0 -10 -3q10 -20 -7 -36 l-4 4q4 17 -1 32h-14q5 -37 -32 -46q-5 -13 -10 -17h-3v7q2 15 9 43q2 -8 10 -23q17 11 17 21q0 15 -19 15q-39 0 -38 -56v-14h77q-4 0 51 11q13 18 13 21.5t5 17.5v17zM914 -60q36 52 36 87.5t-21 58.5h-10q9 -25 9 -51q0 -28 -10 -57q-12 -36 -12 -30q0 -3 8 -8zM892 -57 q24 16 24 81t-34 65q-4 0 -10 -6q18 -36 18 -65.5t-13 -74.5h15zM830 83q21 -32 21 -72.5t-11 -70.5h26q14 41 14 70q-4 76 -37 76zM815 86h-14q21 -12 21 -93q0 -21 -4 -34.5t4 -18.5h6q6 0 10.5 22t4.5 51q-8 73 -28 73zM763 84q-30 0 -30 -25q0 -20 22 -20q11 0 11 29 q18 -10 8 -30q9 -31 9 -40.5t-8 -54.5q12 -3 17 -3q7 9 13 22l4 37q0 53 -13 69t-33 16zM780 95v27q-36 35 -122 35q-37 0 -45 -7q-3 -7 -6 -10v-30q16 1 22 13l2 -11q-1 -4 -5 -9q-17 -7 -21 -13q-16 -25 -32 -28q26 -71 26 -86.5t-10 -35.5h167q16 16 16 45t-6 46l-12 -2 q-29 0 -29 34q0 4 8.5 16.5t15.5 14t31 1.5zM479 242l-18 4v-8zM458 257h15q-18 21 -46 20h-26l-3 -12q60 0 60 -1v-7zM433 175h82l16 57q-20 12 -44 22l-8 -63q-28 -5 -82 -12q17 -5 28 -1zM458 243q-16 8 -57 7l-3 -7h60zM398 227v-10h16q15 0 42 11q8 -8 6 -8q4 0 17 7 h-81zM473 207h-78q4 -12 3 -24q19 8 53 24l7 -6q2 2 15 6zM500 162q13 -22 13 -38.5t-17 -58.5l-9 -23q0 -17 14 -42.5t14 -36.5q0 -49 -44 -49q-17 0 -34.5 13t-15.5 32l26 93q-8 20 -22 61q16 -27 31 -27q1 0 17 21q-19 -2 -24 11q25 -8 16 -8h8q6 12 6 17q0 12 -15 12 q-6 0 -16 -16q0 2 -3 7q13 14 19 14q17 0 17 -22q0 -5 -27.5 -74t-27.5 -92q0 -37 43.5 -37t43.5 42t-31 42h-13q-2 -8 -7 -21q-1 1 -1 3q0 13 21 59q25 53 25 79q0 42 -40 42q-34 0 -43 -27q1 -8 -2 -20q-4 9 -4 17t19 26q-27 0 -43 3q-7 68 -7 78.5t10 45.5h37l-78 41 v-483h180q58 127 58 130v-2q-4 0 -29 92q11 4 28 11q4 9 8 27q-4 6 -4 7q7 11 1 34q10 21 26 21h30l-113 64q-6 -19 -23 -67q-13 -2 -18 -1zM460 80q-12 0 -20 9q4 -12 14 -31q0 10 6 22zM491 6q-6 29 -6 31q-6 -12 -14 -31h20zM1023 1218q-2 -5 -8 -14q-57 -3 -70 -11 q8 16 40 19t38 6zM993 1185q8 0 -30 -10q13 6 40 14q-2 0 -6 -3q3 -3 21 1q-3 -11 -8 -33q-17 2 -47 14q12 3 32 13q5 4 -2 4zM1034 1111h11q-16 -6 -27 -6q13 6 16 6zM1018 1090q-21 -12 -29.5 -12t-14.5 1zM982 1098q-13 -3 -13 -15q-4 7 0 15h13zM789 1062q-1 -5 -5 -16 q-1 2 -4 7q4 3 9 9zM763 1058l-7 -10l-3 3l6 9zM736 1056l-8 -15l-4 1l9 15zM759 977q0 -16 59 -27h34q78 0 95 26v-303q1 -22 -95 -22t-96 33zM624 1096q0 -57 -59 -57q-51 0 -51 52q0 10 10 31l-5 1q-16 -27 -16 -53.5t32 -92.5h-70q31 66 31 92.5t-15 53.5l-6 -1 q10 -21 10 -31q0 -52 -51 -52q-58 0 -58 57q0 36 57 105.5t67 94.5q9 -25 66.5 -94.5t57.5 -105.5zM1252 68q0 -36 -57 -105.5t-67 -94.5q-9 25 -66.5 94.5t-57.5 105.5q0 57 59 57q51 0 51 -52q0 -10 -10 -31l5 -1q16 27 16 53.5t-32 92.5h70q-31 -66 -31 -92.5t15 -53.5 l6 1q-10 21 -10 31q0 52 51 52q58 0 58 -57zM874 194q-23 23 -81 23t-98 -14q-9 -4 -9 -11l-3 301q0 20 20 21q11 1 91 1t80 -16v-305zM907 121l-7 -9l-3 2l6 10zM880 119l-8 -12l-4 2l9 12zM849 116l-6 -9l-4 2l6 9zM652 86q14 0 -42 -9q50 12 36 12q13 0 19 -6 q-2 -9 -5 -12q2 6 2 11q-4 4 -10 4zM607 60l-20 -6v4l20 6v-4zM665 -11l-34 -13v3l32 14zM667 1q-2 0 -57 -24q1 2 8 33q16 1 49 -9zM685 -26q-3 -8 -27 -16t-37 -8l-13 3q3 0 5.5 5.5t4.5 6.5q5 -1 10 -1q22 0 57 10zM455 -46l3 22h20q9 -8 9 -17q0 -17 -20 -17 q-12 0 -12 12zM992 1162l-3 10l-14 -7q16 -3 17 -3zM942 681v266q-38 -24 -97.5 -24t-77.5 26v-257q0 -30 87 -32h11q77 0 77 21zM851.5 503.5q-12.5 1.5 -76.5 1.5t-70 -1q-18 -3 -16 -22v-262q17 23 91 23t83 -21v271q1 9 -11.5 10.5zM656 -1v5h-17v-5h17zM475 -52 q9 8 9 9t-3 14h-18v-23h12zM890 819q0 -16 -15 -16t-19 11q4 -26 10 -37q-4 1 -11 1t-12 -1q7 11 10 37q-3 -11 -18 -11t-15 16q0 6 9 16l26 29l26 -29q9 -10 9 -16zM810 347q0 -5 -9 -15l-25 -30l-27 30q-9 9 -9 15q0 17 15.5 17t18.5 -12q-4 26 -10 37q4 -1 11.5 -1 t11.5 1q-6 -11 -10 -37q3 12 18 12t15 -17z" />
+<glyph unicode="&#x1f0ac;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM283 1267q-43 -19 -72 -19q-102 0 -102 105t102 105q34 0 72 -18 v-36h-6q-32 26 -68 26q-67 0 -67 -77t68 -77q37 0 67 26h6v-35zM1494 68q0 -12 -20 -35l-58 -66l-59 66q-20 22 -20 35q0 37 36 37q32 0 39 -26q-8 58 -22 84q9 -3 25.5 -3t25.5 3q-14 -26 -22 -84q7 26 41 26t34 -37zM1284 -166h-940v1496h940v-1496zM291 1096 q0 -37 -36 -37q-32 0 -39 26q8 -58 22 -84q-9 3 -25.5 3t-25.5 -3q14 26 22 84q-7 -26 -41 -26t-34 37q0 12 20 35l58 66l59 -66q20 -22 20 -35zM1345 -103q43 19 72 19q102 0 102 -105t-102 -105q-34 0 -72 18v36h6q32 -26 68 -26q67 0 67 77t-68 77q-37 0 -67 -26h-6v35z M1272 1318h-234q12 -28 60 -68q-5 -10 -37 -26t-32 -63v-13l13 3q2 -43 26 -68q8 -2 34 -27q33 -10 33 -40t-15 -57q79 -10 152 -98v457zM1024 1181l-7 -17v-24h6q3 -1 6 -1h1q-6 4 -6 16v26zM1009 1170q-1 5 -6 26q-4 -19 -4 -45q2 2 10 19zM994 1185l-6 24q-7 -38 -7 -52 q10 16 13 28zM955 1169l14 43l-6 9l-11 -52q0 -15 14 -29l10 3l-3 8q0 10 1.5 30.5t1.5 30.5q-12 -23 -12 -34t2 -20l-2 -6q-9 9 -9 17zM1027 1130q-10 0 -25 10q1 -18 22 -19zM1047 1074v20q-6 2 -21 18v-21q-7 9 -21 24l-2 -3q0 -12 15.5 -24.5t28.5 -13.5zM1078 1038 q0 -16 -13 -16h-30q4 -1 19 -10.5t19.5 -9.5t15.5 7t15 8q-8 -6 -23 -19q16 8 42 15q-4 8 -31 18q6 4 18 13q-9 3 -23 2q-3 10 -5.5 19.5t-16.5 8.5q13 -27 13 -36zM988 1086q0 -19 44 -27q-13 -4 -32 -4q13 -5 53 -5q-9 -3 -53 -12q10 -1 35 -1t34 -3l3 7q0 16 -32.5 29 t-37.5 21q-1 17 -14 36v-41zM1110 1005q-10 0 -24 -19q11 4 36 7l-3 12h-9zM970 1104q3 -9 3 -14.5t-3 -15.5l-3 8q-1 -3 -1 -14t16 -16l-9 76q-5 -17 -6 -30zM1069 981q0 22 -38 33t-46 18q2 -17 34.5 -30.5t34.5 -33.5l8 6l3 -9q4 8 4 16zM1044 956q0 30 -34 39t-40 37 q-12 -23 -12 -27q0 -29 41.5 -32.5t41.5 -9t-6 -15.5l-9 5l9 7l-9 5l-6 -9l3 -12h18q3 4 3 12zM739 1245q0 4 -6 9q-6 -12 -6 -31q12 18 12 22zM849 941l39 -14q13 0 41.5 22.5t28.5 35t-10 28.5q-55 -49 -113 -50l-7 3v3q4 -1 10 -1q35 0 81.5 26.5t46.5 52.5l-9 33v22 q1 15 1 22l-10 40l4 59q0 22 -54 38t-84 16q-72 0 -72 -33v-23q20 5 23 5q49 0 49 -48l-7 -75v-11q3 -4 9 -4t12.5 2t8.5 2.5t7 14.5q5 0 5 -9q0 -16 -21 -16t-36 15q0 2 9 9q6 34 6 73t-50 39q-8 0 -18 -10l-1 -12q0 -11 9 -11q2 0 21 11l6 -2q-7 -3 -20 -12l3 -1l21 4 q20 0 20 -19q0 -10 -11 -20q-11 6 -21.5 6t-12.5 -6l-6 6q-5 -14 -5 -28q0 -99 75 -152l-4 -1q-5 0 -38 34h-15q22 -70 60 -70zM1006 945q0 -5 3 -18q-7 4 -15 21q0 -8 9 -27h24l5 9q-20 13 -24 27q-1 -2 -2 -6v-6zM721 1218v23h-6v-23h6zM783 1160q-1 1 -14 9h-9l5 -9h18z M634 1295q-2 9 -8 23h-13q6 -8 21 -23zM1248 671v12q-55 46 -159 141l3 -15q77 -91 156 -138zM1034 794l2 -28q-15 -15 -15 -18.5t10 -22.5q31 130 98 214q-4 12 -15 12q-3 0 -18 -17l-29 -24q-1 -2 -1 0.5t4 -36.5q-8 -7 -22 -23q2 -10 4 -33q-18 -12 -18 -24zM645 1265v12 h-6v-12h6zM724 1193v12q-8 -7 -21 -24q8 3 21 12zM724 1176l-4 5l-11 -17l5 -1zM1152 704l28 3v-44q3 -1 24 -1.5t20 -16.5q7 1 13 6v15q-39 32 -147 134q-7 3 -13 3q0 -11 -3 -18q25 5 25 -29l-1 -10q15 0 30 -2q7 -6 9 -23t15 -17zM564 1314v4h-12l-6 -4h18zM610 1259 l-4 9l-5 -2l5 -9zM1028 802q18 11 18 24t-9 28q10 5 27 18q0 12 -4 33l30 30q0 9 7 19l-1 6h-15q-57 -90 -89 -274l2 -6q12 5 12 23q11 11 12 45q4 8 13 24q-3 17 -3 30zM969 956l-5 18q-25 -27 -78 -78q64 4 83 60zM699 1125v-13l36 64q-36 -37 -36 -51zM577 1318h-2 q-10 -24 -10 -30.5t7.5 -18t7.5 -16.5t-3 -10.5t-3 -9.5q-6 1 -12 15q0 -11 -3 -15q2 -18 20 -18q8 0 12 5q0 66 -2 58l9 -7q-3 5 -3 19q14 -6 23 -19q-3 5 -5 16l6 3l-16 18l1 10h-19l-6 -8q-2 4 -2 8zM618 1212q4 -10 13.5 -10t28.5 19q-25 0 -35 5q8 5 18 4q-3 1 -16 8 q-6 -2 -18 -5zM727 1142l-4 1l-11 -18l5 -1zM1189.5 654q-18.5 0 -20.5 22.5t-8 22.5q-29 0 -31 3q-3 15 -5 30q-7 8 -25 8t-8 -2q-2 13 -6 36h-15q-5 -3 -5 -10q0 -17 60 -70.5t84 -66.5l5 26q-7 1 -25.5 1zM1272 582v17q-28 22 -40 22t-34 -22q17 6 32 6q10 0 10 -10v-13 h32zM558 1262v42q-5 -5 -9 -15q2 -9 9 -27zM604 1217q0 -32 32 -32q5 0 15 5q-6 -1 -11 -1q-28 0 -36 37v-9zM1062 749q-15 -11 -15 -21.5t57 -58.5t81 -64l13 12l-118 111q-1 -9 -11 -12q-1 12 6 18zM865 896q9 10 9 14t-9 22v-36zM745 1037l-3 3l-13 -15l3 -3zM843 935 q-14 -12 -14 -21t9 -18q-5 21 17 24q-2 9 -12 15zM1071 647l28 3q16 0 18.5 -19t7.5 -22q31 1 43 -21l5 9q-1 3 -128 114q0 -4 -13 -24q4 1 7 1q28 0 32 -41zM757 1035q-36 -22 -38 -22t-6.5 1.5t-6.5 1.5l5 -18q8 2 25 7l2 -1l-6 -6q14 0 28 15zM946 903q-17 0 -69 -18 q17 -62 23 -109l4 -8q40 108 42 135zM1153 582v20l-24 -5q6 -5 24 -15zM1030 701v17q-6 -2 -15 -9q0 -9 7 -17zM726 969q0 -26 63 -64q-4 10 2.5 10t12.5 -7q3 6 10 16q-35 35 -54 69q-15 -3 -34 -10v-14zM1107 617q0 27 -12 27q-6 0 -20 -8q10 -10 32 -25v6zM1060 650 l-4 28q-13 0 -24 -6q10 -16 28 -22zM873 777q7 7 7 18.5t-9 39.5t-10 40q-6 -12 -6 -21q0 -66 18 -77zM872 872l13 -81q0 -19 -17 -19q-14 0 -18 71q-1 -11 0.5 -46.5t14.5 -35.5q18 0 28 20zM675 1019l-20 7q-19 0 -28 -16q-2 -18 -13 -26.5t-14 -14.5q6 -14 15 -15l1 11 l-3 4q4 5 11.5 4t13 -1t10.5 9t22.5 9t21 3.5t8.5 32.5q16 4 41 24q-15 -12 -44 -12h-3q4 12 23.5 19t20.5 14q-19 -3 -50 -16q-5 -4 -8 -20t-5 -16zM931 765q-14 0 -19 -11v-18q5 -10 16.5 -10t22.5 10v18q-6 11 -20 11zM982 697q0 21 -21 21t-21 -21t21 -21t21 21z M811 879h-4l-9 -72h4zM816 764h14q13 43 13 87v6l-3 13l-2 -51q-2 -30 -14 -46l-12 2l9 6q2 33 9 100q-6 -43 -29 -102q-1 -7 -3 22q-1 -10 -4 -34q9 -3 22 -3zM804 891q-47 13 -93 90l-5 -9q31 -69 72 -184q12 16 16.5 46.5t9.5 56.5zM991 670q-22 0 -22 -19.5t21 -19.5 q8 0 19 11v18q-11 10 -18 10zM1041 612q-10 9 -19.5 9t-18.5 -9v-23q9 -10 18 -10t20 10v23zM1051 576q-22 0 -22 -21q0 -18 21 -18q10 0 19 9v19q-11 11 -18 11zM869 729l-3 18h-6l3 -18h6zM855 726v21h-6v-21h6zM1083 481q19 0 19 21t-19 21q-9 0 -20 -10v-21 q11 -11 20 -11zM1132 457q0 17 -19 17q-12 0 -21 -9v-20q8 -9 19 -9q21 0 21 21zM814 747v5h-12v-5h12zM1161 421q-9 8 -17.5 8t-18.5 -11v-19q8 -9 17 -9t19 9v22zM990 561v17q-6 -2 -15 -9q0 -9 7 -17zM796 747l-3 8l-6 -2l5 -9zM1020 543q-10 -8 -29 -21v-11q8 -5 24 -13 q0 26 5 45zM1054 486l-9 12q-6 -15 -16 -26q5 -4 10 -15q6 9 15 29zM994 501l-7 -15q0 -7 9 -44q42 52 42 63t-8 18q-2 -11 -4 -34l-3 -2q-16 0 -29 14zM699 1148l-3 25q0 9 7.5 27t7.5 36.5t-19 31.5l-38 25v-25q24 -22 24 -59q0 -30 -41 -30q-15 0 -28.5 13t-19.5 16 q-12 1 -34 13q-18 21 -18 57l7 26q-5 11 -2 14h-186v-720q13 3 40 8q2 -13 7 -36q18 2 53 13q-34 22 -82 69q29 91 56 130q20 12 56 42q19 33 61 96q14 10 39 33q-2 7 32 37q-1 42 45 42q1 0 9 -3q-5 9 -5 15q0 24 30 39q-6 17 -6 32zM1081 436q-5 -10 -33 -12v-40 q16 17 33 52zM987 489l-8 12v-20zM1038 432q7 3 14.5 3t16.5 -3v31l-7 8q-12 -14 -53 -74q8 0 24 -7q5 14 5 42zM1024 465q-24 -34 -24 -41.5t5 -11.5q1 2 33 45q-10 -1 -14 8zM1047 384l-9 -5q-7 2 -21 5q1 -15 13 -27q6 8 17 27zM976 405l-6 -27l30 -20q-6 -15 -6 -23.5 t2 -12.5q24 -5 24 -36v-13q28 -5 28 -45q18 5 18 21l-24 48q-49 97 -69 169q-6 49 -27 128q-6 12 -27 13l-4 -7q0 -4 8 -12t8 -14l-9 -24h-1l7 23q0 4 -18 25l-1 5l1 9l-6 6h-10q30 -234 136 -402q11 9 11 33v7q-18 11 -27 21q8 27 -26 47l2 34q-9 5 -24 17q0 54 1 37 q-4 3 -9 11q18 -9 18 -18zM700 591l20 -30l-2 -9l6 -6h11q-31 234 -137 402q-10 -9 -10 -33v-7q17 -11 27 -21q-9 -27 25 -47q0 -4 -1 -16t0 -18q8 -5 24 -17q0 -54 -2 -37q4 -3 9 -11q-18 9 -18 18l6 27l-30 20q6 15 6 23.5t-1 12.5q-24 5 -24 36v13q-29 5 -29 45 q-18 -5 -18 -21l24 -48q49 -97 69 -169q6 -49 27 -128q6 -12 27 -13l5 7q-1 4 -9 12t-8 14l9 24h2zM862 716h-23q-2 3 -3.5 10.5t5.5 58.5q-7 -20 -18 -60q-14 -9 -35 -9q-2 -30 -4 -134l-26 -78q-8 -18 -17 -53q1 10 13 -40q-1 10 -4 30q3 7 14 7h23q2 -3 6 -12 q0 -6 -6 -57q7 20 17 60q13 9 34 9q3 75 3 116v18q10 32 22 64t22 67q-1 -10 -11 40q0 -10 3 -30q-4 -7 -15 -7zM612 780q-2 15 -14 27q-6 -8 -16 -27l9 5q6 -2 21 -5zM604 699q24 34 24 41.5t-4 11.5q-2 -2 -33 -45q9 1 13 -8zM591 732q-8 -3 -15.5 -3t-16.5 3v-31l8 -8 q11 14 52 74q-8 0 -24 7q-5 -14 -4 -42zM649 663v20l-7 -8zM580 740v40q-16 -17 -33 -52q5 10 33 12zM1084 -140q5 -11 2 -14h186v720q-13 -3 -39 -8l-8 36q-18 -2 -52 -13q33 -22 81 -69q-29 -91 -56 -130q-20 -12 -55 -42q-20 -33 -62 -96q-14 -10 -39 -33q2 -7 -31 -37 q0 -42 -45 -42q-2 0 -9 3q4 -9 4 -15q0 -24 -30 -39q6 -17 6 -32l-7 -33l3 -25q0 -9 -7.5 -27t-7.5 -36.5t18.5 -31.5t38.5 -25v25q-24 22 -24 59q0 30 40 30q15 0 28.5 -13t19.5 -16q12 -1 35 -13q18 -21 18 -57zM634 663l8 15q0 7 -9 44q-42 -52 -42 -63t7 -18q2 11 5 34 l3 2q15 0 28 -14zM600 692q-6 4 -11 15q-6 -9 -15 -29l9 -12q6 15 17 26zM637 642v11q-8 5 -24 13q0 -26 -4 -45q9 8 28 21zM841 411l-4 9l-5 -3l3 -8zM654 595q-1 9 -8 17l-7 -9v-17q5 2 15 9zM486 774q-9 0 -18 -9v-22q8 -8 16.5 -8t19.5 11v19q-9 9 -18 9zM826 412v5h-12 v-5h12zM517 728q-21 0 -21 -21q0 -17 20 -17q11 0 21 9v20q-9 9 -20 9zM546 683q-20 0 -20 -21t20 -21q8 0 19 10v21q-11 11 -19 11zM779 417v21h-6v-21h6zM769 417l-3 18h-6l3 -18h6zM600 609q0 18 -21 18q-11 0 -20 -9v-19q11 -11 18 -11q23 0 23 21zM607 585 q-9 0 -19 -10v-23q9 -9 18.5 -9t18.5 9v23q-9 10 -18 10zM637 494q23 0 23 19.5t-21 19.5q-9 0 -20 -11v-18q11 -10 18 -10zM922 192q-31 69 -72 184q-12 -16 -16 -46l-9 -57q46 -13 93 -90zM812 400h-14q-13 -43 -13 -87v-6l3 -13l2 51q2 30 14 46l12 -2l-9 -6 q-2 -33 -9 -100q6 43 29 102q1 7 3 -22q1 10 4 34q-9 3 -22 3zM831 357h-5l-9 -72h5zM688 467q0 21 -21 21t-21 -21t21 -21t21 21zM717 428q-6 10 -17.5 10t-21.5 -10v-18q5 -11 19 -11t20 11v18zM954 145l19 -7q19 0 29 16q1 18 9 25q14 10 18 16q-7 14 -15 15l-2 -11l3 -4 q-4 -5 -11.5 -4t-13 1t-10.5 -9t-11 -9q-29 0 -32.5 -3.5t-8.5 -32.5q-16 -4 -40 -24q14 12 43 12h3q-4 -12 -23.5 -19t-19.5 -14q18 3 49 16q5 4 8 20t6 16zM756 292l-13 81q0 19 17 19q14 0 18 -71q1 11 -0.5 46.5t-14.5 35.5q-18 0 -28 -20zM774 310q0 66 -18 77 q-8 -7 -8 -18.5t9 -39.5t11 -40q6 12 6 21zM597 492q-11 16 -29 22l5 -28q12 0 24 6zM522 547q0 -27 12 -27q5 0 19 8q-10 10 -31 25v-6zM903 195q0 26 -63 64q3 -10 -3.5 -10t-11.5 7l-11 -16q35 -35 54 -69q15 3 35 10v14zM614 455q-1 9 -8 17l-7 -9v-17q5 2 15 9z M499 567q-6 5 -24 15v-20zM751 279q-17 62 -22 109l-5 8q-40 -108 -42 -135q17 0 69 18zM909 151q2 0 6.5 -1.5t6.5 -1.5l-4 18q-9 -2 -26 -7l-1 1l6 6q-15 0 -29 -15l3 -22q36 22 38 22zM558 517l-29 -3q-16 0 -18.5 19t-6.5 22q-32 -1 -44 21l-4 -9q0 -3 127 -114 q0 4 14 24q-4 -1 -8 -1q-27 0 -31 41zM786 229q13 12 13 21t-9 18q5 -21 -16 -24q1 -9 12 -15zM900 139l-3 3l-14 -15l3 -3zM763 268q-9 -10 -9 -14t9 -22v36zM567 415q15 11 15 21.5t-57.5 58.5t-80.5 64l-14 -12l119 -111q0 9 10 12q1 -12 -6 -18zM1024 -53q0 32 -31 32 q-6 0 -15 -5q6 1 10 1q28 0 36 -37v9zM1080 -125l-9 27v-42q4 5 9 15zM399 559q-11 0 -11 15v8h-32v-17q28 -22 40 -22t34 22q-17 -6 -31 -6zM562 400q0 17 -60 70.5t-84 66.5l-4 -26q6 -1 27 -1q16 0 18 -22.5t9 -22.5q28 0 30 -3l6 -30q6 -8 24 -8t9 2q1 -13 6 -36h15 q4 3 4 10zM916 39l-4 1l-11 -18l5 -1zM1010.5 -48.5q-4.5 10.5 -14 10.5t-27.5 -19q24 0 34 -5q-8 -5 -18 -4q3 -1 17 -8q5 2 18 5q-5 10 -9.5 20.5zM1050 -51q-9 0 -12 -5q0 -66 1 -58l-9 7q3 -5 3 -19q-14 6 -22 19q2 -5 4 -16l-6 -3l17 -18l-2 -10h19q3 4 7 8q1 -4 1 -8 h2q10 24 10 30.5t-7.5 18t-7.5 16.5t3 10.5t3 9.5q6 -1 12 -15q0 11 3 15q-2 18 -19 18zM930 39v13q-13 -21 -36 -64q36 37 36 51zM742 268q-64 -4 -82 -60l4 -18q25 27 78 78zM600 362q-18 -11 -18 -24t9 -28q-10 -5 -27 -18q0 -12 5 -33q-11 -10 -30 -30q-1 -9 -8 -19 l2 -6h15q56 90 88 274l-1 6q-13 -5 -12 -23q-12 -11 -12 -45q-5 -8 -14 -24q3 -17 3 -30zM1027 -102l-4 9l-5 -2l5 -9zM1065 -150v-4h11l7 4h-18zM477 460l-29 -3v44q-3 1 -24 1.5t-19 16.5q-8 -1 -14 -6v-15q39 -32 147 -134q7 -3 14 -3q-1 11 3 18q-26 -5 -26 29l2 10 q-16 0 -30 2q-8 6 -10 23t-14 17zM919 0l-4 1l-11 -13l5 -5zM925 -17q-8 -3 -21 -12v-12q8 7 21 24zM990 -113v12h-6v-12h6zM593 398q15 15 15 18.5t-11 22.5q-31 -130 -97 -214q3 -12 15 -12q2 0 14.5 12.5t31.5 28.5q1 2 1.5 -0.5t-4.5 36.5q8 7 23 23q-3 10 -5 33 q18 12 18 20t-1 17.5t0 14.5zM540 340l-3 15q-78 91 -156 138v-12zM1015 -154q-6 8 -21 23q2 -9 8 -23h13zM846 4q0 -1 13 -9h9l-4 9h-18zM913 -77v23h-6v-23h6zM622 219q0 5 -3 18q7 -4 15 -21q0 8 -9 27h-24l-4 -9q19 -13 24 -27q0 2 1 6v6zM784 57q-4 0 -4 9 q0 16 20.5 16t36.5 -15q-1 -2 -9 -9q-6 -34 -6 -73t49 -39q8 0 18 10q2 22 2 12q0 11 -9 11q-3 0 -21 -11l-6 2q6 3 19 12l-3 1l-21 -4q-19 0 -19 19q0 10 10 20q11 -6 21.5 -6t13.5 6l6 -6q4 14 4 28q0 99 -75 152l5 1q4 0 37 -34h15q-22 70 -60 70l-28 -6l-39 14 q-14 0 -42.5 -22.5t-28.5 -35t11 -28.5q54 49 112 50l8 -3v-3q-5 1 -11 1q-35 0 -81 -26.5t-46 -52.5l9 -33l-2 -44l11 -40l-5 -59q0 -22 54 -38t84 -16q72 0 72 33v23q-20 -5 -22 -5q-50 0 -50 48l8 75v11q-4 4 -10 4t-12.5 -2t-8.5 -2.5t-7 -14.5zM889 -81q0 -4 6 -9 q6 12 6 31q-12 -18 -12 -22zM670 159q0 29 -41 32.5t-41 9t6 15.5l9 -5l-9 -7l9 -5l6 9l-3 12h-18q-3 -4 -3 -12q0 -30 33.5 -39t39.5 -37q12 23 12 27zM559 183q0 -22 38 -33t46 -18q-2 17 -34.5 30.5t-34.5 33.5l-7 -6l-3 9q-5 -8 -5 -16zM658 60q-3 9 -3 14.5t3 15.5 l3 -8q1 3 2 8q0 17 -17 22l9 -76q5 17 6 30zM519 159q9 0 24 19q-12 -4 -36 -7l3 -12h9zM640 78q0 19 -43 27q12 4 31 4q-13 5 -52 5q8 3 52 12l-10 1q-50 0 -59 3l-3 -7q0 -16 32.5 -29t38.5 -21q0 -17 13 -36v41zM594 142l-39 20q-5 0 -16 -7t-14 -8l22 19q-16 -8 -42 -15 q4 -8 32 -18q-7 -4 -18 -13q8 -3 22 -2q3 -10 5.5 -19.5t17.5 -8.5q-14 27 -14 36q0 16 14 16h30zM625 52q0 12 -15.5 24.5t-27.5 13.5v-20q5 -2 21 -18v21q6 -9 21 -24zM627 24q-2 18 -23 19l-3 -9q10 0 26 -10zM673 -5l-13 -43l6 -9l10 52q0 15 -13 29l-11 -3l3 -8 q0 -10 -1.5 -30.5t-1.5 -30.5q12 23 12 45l-1 9l1 6q9 -9 9 -17zM648 7q-11 -16 -14 -28l6 -24q7 38 8 52zM630 13q-3 -2 -11 -19q1 -5 6 -26q4 19 5 45zM604 -17l8 17v24h-7q-3 1 -5 1h-2q6 -4 6 -16v-26zM600 3v13l-14 -3q-2 43 -25 68q-9 2 -35 27q-33 10 -33 40t15 57 q-79 10 -152 98v-457h234q-12 28 -59 68q4 10 36.5 26t32.5 63zM873 1214.5q-15 -0.5 -21 -0.5q23 12 36 12t30.5 -10.5t18.5 -19.5q-17 19 -33 19t-31 -0.5zM843 1161q13 21 29.5 21t32.5 -4t25 -5q-7 -21 -21 -30l1 5l-3 4q-17 -2 -51 -12q-5 7 -13 21zM865 1188l-15 -10 l-3 4l15 11zM1023 981l-26 -4q-18 0 -27 16q12 -11 23 -12l4 3q-19 13 -24 26q8 -12 26.5 -18.5t23.5 -10.5zM841 1059l14 2v-12h-42q-3 0 -17 7q0 4 9 11h9q-6 0 -10 -6l16 -2h21zM579 1290h-6v14h6v-14zM949 932l-16 -8l-3 3l19 9v-4zM840 1014q-9 5 -15 5t-12.5 -4.5 t-8.5 -4.5q5 12 13 12t23 -8zM1134 626l-2 -5l-6 2l2 6zM696 1005l-15 -10l-3 4l13 11zM624 1096q0 -57 -59 -57q-51 0 -51 52q0 10 10 31l-5 1q-16 -27 -16 -53.5t32 -92.5h-70q31 66 31 92.5t-15 53.5l-6 -1q10 -21 10 -31q0 -52 -51 -52q-58 0 -58 57q0 36 57 105.5 t67 94.5q9 -25 66.5 -94.5t57.5 -105.5zM1027 597l-4 -2l-5 8l5 3zM1087 498h-6l-3 7l5 2zM1117 453h-9v6h9v-6zM1146 408l-3 -2l-5 8l5 1zM1065 448l-6 -4l-3 4l4 5zM1009 472h-7v6h7v-6zM1014 435l-3 -11l-6 3l4 8h5zM1033 403h-4l-5 8l5 1zM943 531l-9 -42q0 -3 11.5 -11 t11.5 -13l-8 -35q0 -1 2 -6q-5 7 -5 15l3 26q-5 6 -21 21l12 36q0 12 -16 21q17 -9 19 -12zM942 457l-5 -3l-4 9l4 2zM696 701l-5 -2l-4 8l4 3zM839 711l-23 -129q-8 -60 -21 -126l-8 -3l18 129q20 120 26 126zM685 633l9 42q0 3 -11 11t-11 13l7 35q0 1 -1 6q4 -7 4 -15 l-3 -26q5 -6 21 -21l-12 -36q0 -12 17 -21q-18 9 -20 12zM604 753l-4 -1l-5 9h5zM624 737l-5 -8h-4l3 11zM627 686h-8v6h8v-6zM573 716l-5 -5l-4 5l6 4zM490 750l-4 -1l-3 7l3 2zM520 705h-9v6h9v-6zM550 659l-4 -2l-5 9h6zM610 561l-4 -3l-5 9l5 2zM1253 68 q0 -36 -57.5 -105.5t-67.5 -94.5q-9 25 -66.5 94.5t-57.5 105.5q0 57 59 57q51 0 51 -52q0 -10 -10 -31l5 -1q16 27 16 53.5t-32 92.5h70q-31 -66 -31 -92.5t15 -53.5l6 1q-10 21 -10 31q0 52 51 52q59 0 59 -57zM951 165l-14 -11l-4 5l15 10zM502 541l-1 -6l-6 3l1 5z M825 154q-6 -12 -14 -12t-22 8q8 -5 14 -5t12.5 4.5t9.5 4.5zM699 237l-20 -9v4l17 8zM1056 -140h-6v14h6v-14zM787 105l-13 -2v12h42q2 0 16 -7q0 -4 -9 -11h-9q6 0 11 6l-17 2h-21zM606 183l25 4q18 0 27 -16q-12 11 -22 12l-5 -3q19 -13 24 -26q-8 12 -26.5 18.5 t-22.5 10.5zM781 -18l-15 -11l-3 5l15 10zM786 3q-14 -21 -30.5 -21t-32.5 4t-24 5q6 21 21 30l-2 -5l3 -4q17 2 51 12q5 -7 14 -21zM777 -50q-24 -12 -37 -12t-30.5 10.5t-18.5 19.5q17 -19 33 -19t31 0.5t22 0.5zM895 1164q-13 0 -30 9q2 -7 8 -21l19 5zM763 -9 q-2 7 -7 21l-20 -5l-3 -7q13 0 30 -9z" />
+<glyph unicode="&#x1f0ad;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM316 1353q0 -88 -82 -103q18 -11 26.5 -11t22.5 4l-13 -32 q-3 -1 -13 -1.5t-34 11t-36.5 11.5t-22.5 -9l-11 17q10 10 20 15q-66 25 -66 99q0 46 29 75t75 29t75.5 -29.5t29.5 -75.5zM1494 68q0 -12 -20 -35l-58 -66l-59 66q-20 22 -20 35q0 37 36 37q32 0 39 -26q-8 58 -22 84q9 -3 25.5 -3t25.5 3q-14 -26 -22 -84q7 26 41 26 t34 -37zM1284 -166h-940v1496h940v-1496zM291 1096q0 -37 -36 -37q-32 0 -39 26q8 -58 22 -84q-9 3 -25.5 3t-25.5 -3q14 26 22 84q-7 -26 -41 -26t-34 37q0 12 20 35l58 66l59 -66q20 -22 20 -35zM1521 -190q0 -46 -29 -75t-75 -29t-75.5 29.5t-29.5 75.5q0 88 82 103 q-18 11 -26.5 11t-22.5 -4l13 32q3 1 13 1.5t34 -11t36.5 -11.5t22.5 9l11 -17q-10 -10 -20 -15q66 -25 66 -99zM1174 1148q23 53 23 56.5t-17 37.5l-9 -18q2 4 8 8q0 -47 -5 -84zM1073 1315h-15q0 -20 -1 -21q-2 10 -25 21q15 -23 15 -26.5t-2 -1.5q-21 2 -30 31h-9v-14 q-1 -5 22.5 -20.5t28.5 -26.5q0 8 -5 17q20 0 14 -2q1 5 -6 18q1 1 13 -3v28zM1025 1232q17 -3 24 -19q4 21 0 42q-6 -10 -14 -10l-21 2q-15 0 -29 -30q19 3 49 1q-5 4 -21 12zM1038 1207l-4 1l-5 -9l4 -1zM1272 1318h-185l3 -4q-3 -63 -3 -77.5t4.5 -38t18 -78t13.5 -74 t-11 -66.5q-1 -2 -20 -30q17 -13 49 -40v174q0 -5 -9 29q-1 11 -6 52.5t-4 61.5q11 -11 32 -27q8 18 26 50q10 -16 31 -44q13 9 25 16l-17 -91q-7 -15 -16 -42q-1 -21 -4 -62l-2 -134q0 -26 2.5 -29.5t72.5 -73.5v528zM1150 628h9l29 13l9 453q7 14 17 37q3 28 14 80 q-25 -11 -40 -50l-16 -39l-12 47q-10 31 -31 47v-9l13 -89q4 -7 8 -19v-471zM744 1318v-36q14 18 23 36h-23zM911 1318l-45 -18q-6 0 -4 1l37 17h-20q-17 0 -31 -38q6 -1 5 -4q-16 -20 -34.5 -69t-19.5 -53q5 0 7 -3v-69q0 -17 -13 -41t-29 -27l-27 -4q-12 -2 -17 -18 q14 -3 30 -1t55 30q17 29 20.5 102.5t5 81t5.5 11.5l2 -124q11 -26 53.5 -51.5t63 -25.5t26.5 3q26 14 39 47q28 71 27 95v48q-3 0 -7 -1q0 -17 -20 -17q10 0 -30 7v-13q0 12 7 -47q-18 -14 -27 -20q-1 2 -4 6q24 24 24 25l-11 56q0 51 33 51q3 0 11 -2.5t8.5 -2.5t15.5 6 q-2 11 -18 20l-16 8q-7 7 -25 34q-17 -35 -50.5 -43t-66.5 -15q0 5 3 5q32 8 75 20q17 6 25 33h-10q-6 -16 -45 -30t-47.5 -14t-10.5 1q13 17 45.5 23t41.5 20h-37zM673 1312q1 1 4 1q13 0 58 -29v34h-83q3 -12 11 -31q23 -35 23 -81.5t-26 -93.5h12l152 206h-38 q-13 -21 -39 -46q-1 -13 -5.5 -38.5t-41.5 -36.5q0 9 11.5 20t14.5 16.5t9 29.5h-16q-7 -3 -18 -3h-2q14 6 31 15q-28 20 -57 37zM992 1015l-42 -8q-27 0 -76 32q-12 12 -36 33q-9 -38 -22 -61q-3 -4 -49 -33q17 -7 48 -15q100 -14 126.5 -14t110.5 22q-50 44 -60 44z M780 1079q0 -24 -23 -34q-5 -4 -15 -8q-3 -7 -9 -19h14q9 -1 24.5 15.5t21.5 36.5q5 16 5 55q0 13 -1 28l-47 -101q11 2 18 18t10 18q2 -2 2 -9zM845 1302l-139 -233l-91 -121q0 3 3 -9q5 -1 12 -3q115 145 215 366zM1170 578q-1 4 -3 10l-117 -26v-7zM402 988l24 6 q4 0 6 -2v-27q6 0 7 -1q-7 -4 -13 -2q19 -13 26 -22q3 3 -10 3q10 -8 26 -23q-8 -4 -12 -3q5 -1 35 -17q-11 13 -36 37q8 0 12 -6q2 8 27 21q-9 -6 -20 -26q5 13 20.5 14t29.5 2t19 12q-7 -10 -26.5 -10t-22.5 -1v2q9 3 42 8h-36q13 4 50 9q2 -1 2 -6q-12 -19 -39.5 -23 t-36.5 -11q15 -10 27 -25l113 104q62 60 80 105q-27 -1 -47 2q26 68 26 87.5t-32 122.5h-287v-531l115 82q-4 -9 -13 -9q13 -23 16 -39q6 6 12 6v11q1 14 -13 34l19 16q-21 19 -38 19q-41 0 -41 -30q0 -5 6 -22q-22 18 -22 30.5t14 24.5q2 -7 -3 -14t-5 -7.5t3 -17.5 q0 14 23 43q-8 -1 -8 2q18 7 37 5q-14 14 -37 31q2 -3 -14 -29q-8 8 -18 25q4 3 8 9q-6 -3 -14 -8q0 -4 4 10q-8 4 -19 25l28 2q1 -1 1.5 -2.5t1.5 -2.5q0 2 3 7zM283 1353q0 77 -71.5 77t-71.5 -77t71.5 -77t71.5 77zM1199 398l3 20l-147 31q3 14 3 31q0 19 -4 40 q-6 41 -23 54q66 17 192 64h-17l-171 -52q-4 0 -14 4q0 161 55 333q-71 -29 -121.5 -29t-72.5 5t-70 21q4 -13 13 -33q79 -97 121.5 -155t64.5 -116h-3q-110 112 -205 180q-42 31 -136 87t-101.5 56t-29.5 -15l145 -72q15 -11 42 -27q111 -54 246 -181q20 -17 46 -50 q2 -5 -5 -41q-2 -13 -2 -28q0 -28 8 -66q6 -27 28 -46q1 10 14 21l134 -39q4 1 7 3zM1147 326q0 13 14 -31q2 6 6 6q-3 26 -8 38h-9q-3 3 -3 -13zM1155 350q10 0 14 -23q7 20 12 57l-109 34h-17q6 -48 22 -142q6 -6 14 -16q0 25 1 70q3 4 7 6q71 14 56 14zM1157 291 q-9 31 -19 45q-2 1 -10 -3q7 -1 11 -5q-5 -4 -10 -4q5 -13 11 -44q6 11 17 11zM532 906l-4 2l-3 -7l3 -2zM1108 332v-22q0 16 10 -40q9 1 13 5l-13 57h-10zM1228 196v28q-4 3 -9 9q-7 -8 -12 -18q8 0 11 -2v-7q-6 -13 -10 -13q-10 0 -11 -1q2 -3 3 -11l17 2q-1 5 -5 9l10 9 q4 -5 6 -5zM1168 247l-34 19l25 -25q3 5 9 6zM517 902q-12 -12 -12 -16t2 -11t2 -9zM1110 267q0 2 -3 16t-3 22q0 -10 -2 -27.5t-2 -23.5q10 4 10 13zM388 962q5 6 7.5 6t7.5 -5v-8q3 3 14 18q6 -6 9 -2l-3 17q-6 -1 -18 -6q5 -3 8 -8l-7 -6q-4 1 -14 4q1 4 2 11h-14 q-3 -10 8 -21zM514 853v10h-5v-10h5zM507 829q0 3 -11 55q-5 -3 -15 -12q12 -30 14 -46q3 3 12 3zM444 909v5h-15v-5h15zM395 949v-10q6 -2 12 -8l11 21q-11 -3 -23 -3zM500 816v10h-4v-10h4zM560 747q0 13 -22 125q-6 9 -13 25q-1 -26 -5 -77q-24 -7 -63 -20q-6 11 -14 32 l-9 -63q55 -14 126 -37v15zM465 808v23q-6 10 -11 24q-5 -5 -9 -6q5 -12 10 -41h10zM1272 -154v591q-3 -69 -130 -169q19 -14 33 -14t36 21l1 -9q-3 -6 -11 -17q19 15 19 21v15q-1 0 -6 -5q-7 13 -7 18t2 3q16 -17 16 -29.5t-19.5 -23.5t-34.5 -8q13 -11 33 -31v10 q0 4 15 19q12 -12 15 -23q6 2 7 1q-1 -2 -5 -4.5t-5 -4.5q8 1 10 -2q-2 -2 -10 -2q-1 3 -7 -25q-2 2 -2 10q-6 -13 -15 -13t-9.5 2t-2 7t-1.5 8t5 8q-8 0 -13 3q2 2 11 2q-22 18 -36 25q-12 -18 -26 -18q-6 0 -1 3t18 15q-9 -6 -27 -6q6 0 6 -5q-13 -3 -37 -9h34 q-35 -10 -47 -4q7 21 34 24.5t37 8.5l-22 22q-97 -67 -201 -182q24 -11 29 -22l-13 -83q2 -11 53 -128h274zM1345 -189q0 -77 71.5 -77t71.5 77t-71.5 77t-71.5 -77zM607 561l8 34v73q0 40 -33 72q-4 -9 -16 -23l-136 39q-2 -9 -6 -23l147 -32v-13q0 -70 20 -108 q-69 -19 -188 -64l10 -3l176 54q-2 0 13 -6q-1 -122 -43 -323q81 16 131 16t129 -10q-163 179 -204 291h2q41 -42 106 -103q57 -46 207 -146l126 -69q9 0 20 12q-26 22 -82 47q-180 83 -306 200q-81 75 -81 85zM573 591v10l-126 -35q3 -2 3 -11zM1013 219q4 0 -15 6 q-110 -146 -199 -335q87 166 214 329zM891 146q-25 1 -43 -34t-18 -69.5t1 -29.5l43 99q-10 -5 -15 -18l-9 -23q-2 1 -2 18t13.5 24.5t27.5 17.5q6 9 2 15zM636 149l31 5q67 0 122 -55q26 82 63 82h4q-111 28 -156 28t-56.5 -2t-28.5 -7l-39 -10q57 -41 60 -41zM974 -151v9 q-39 68 -39 130v21q13 48 13 38q0 7 -13 8l-139 -204h41q1 18 36 50q1 13 5 35q7 28 46 38q-16 -16 -36 -65q24 7 36 2q-12 -3 -34 -12q16 -9 58 -39q-26 2 -60 27q1 -14 -2 -23q-2 9 -9 26q-7 -15 -21 -41h118zM904 173l-39 2q-19 0 -36 -24t-20 -37q-2 -57 -9 -149 q-5 -42 -38 -67q-7 -5 -48 -9t-57 -29q2 -3 5 -7q22 19 57.5 26.5t51.5 13.5q33 13 47 134q2 32 5 64q11 62 77 67q8 15 4 15zM638 22l14 -61q0 -10 -8 -27q-9 -23 -24 -23q-50 0 -35 3q-2 2 -2 5h31q19 0 24 23q-19 -5 -23.5 -5t-36.5 10v-29l12 -24q11 -1 27.5 -12 t20.5 -31q11 18 44 41q16 2 41.5 6t55.5 22q17 35 17 92t-4 63q-41 71 -121 71q-22 0 -24 -1q-28 -14 -47 -63.5t-19 -96.5v-11h33q18 0 24 -21q6 4 6 10.5t-5 27t-8 24.5t-3 8.5t10 14t17 9.5t4.5 -2.5t-12 -11t-9.5 -11.5zM799 -111l-4 1l-6 -12l4 -1zM490 -26 q-27 39 -27 81q0 4 1 5q4 -1 11 -5v455q-7 0 -25 -3q-4 -151 -22 -451q-8 -12 -17 -34q-3 -28 -12 -74q20 11 33 43.5t21 39.5q16 -43 24 -62t22 -26v11q1 12 -8 74q-1 4 -14 24q14 -44 13 -78zM753 -149q15 0 16 13q-2 -1 -31 -13h15zM778 -113q-42 -11 -92 -29l6 -7 q43 9 62 14.5t24 21.5zM625 -47q-3 6 -10 7v-9zM544 -154v27q0 38 -10 84l-17 84q-12 76 -12 90.5t8 47.5q7 12 18 34q-36 32 -52 35v-181q0 -3 6.5 -15t8 -25.5t4.5 -36.5t7.5 -34t4.5 -16t-7 -5t-31 18q-5 -15 -26 -37q-23 23 -34 32q-12 -11 -15 -11t-8 4q3 29 14 83 q5 5 12 16q11 34 11 102v11v142q-21 21 -70 63v-512h188zM623 -138q0 5 -23.5 22.5t-25.5 26.5v-21q-7 3 -8 8q0 -29 2 -24q-3 1 -10 8q-1 -8 -6 -25q15 -3 18 -3q0 19 -1 18q8 -3 15 -15h12q-8 15 -20 27q2 2 9.5 -5t33.5 -26q4 4 4 9zM449 16l-18 -45l17 -42q8 8 8 17 q0 -1 -5 -6l-6 9q9 14 4 17v50zM1162 1104q-14 9 -16 27t-9 59q8 -15 19 -43q1 -15 6 -43zM964 1263q-7 -12 -35 -12.5t-35 -8.5q-2 12 8 12q39 3 62 9zM924 1231h-13v4h13v-4zM910 1198q15 0 -30 11q6 12 2 20q11 -1 29 2q-4 -2 -13 -6q45 -4 52 -13q-29 -14 -40 -14z M941 1133h-5v7h5v-7zM947 1126h-7v5h7v-5zM963 1106q12 0 28 -4q0 -2 3 -6l6 5q-5 -5 -6 -13q-26 5 -35 5t-25 -5q5 10 4 10q4 0 3 -1t3 -1zM1186 1090l-8 -336l-4 -44q-2 -23 -19 -27l8 407q8 5 23 0zM963 1069h-18v4h18v-4zM846 888l102 -9l64 8l26 10h12q-9 -45 -22 -130 q-3 -6 -7 -28t-11 -85l-40 68q-37 60 -124 166zM624 1096q0 -57 -59 -57q-51 0 -51 52q0 10 10 31l-5 1q-16 -27 -16 -53.5t32 -92.5h-70q31 66 31 92.5t-15 53.5l-6 -1q10 -21 10 -31q0 -52 -51 -52q-58 0 -58 57q0 36 57 105.5t67 94.5q9 -25 66.5 -94.5t57.5 -105.5z M1250 189h-4l-3 6l4 1zM1252 181h-16l3 5zM1253 68q0 -36 -57.5 -105.5t-67.5 -94.5q-9 25 -66.5 94.5t-57.5 105.5q0 57 59 57q51 0 51 -52q0 -10 -10 -31l5 -1q16 27 16 53.5t-32 92.5h70q-31 -66 -31 -92.5t15 -53.5l6 1q-10 21 -10 31q0 52 51 52q59 0 59 -57zM780 265 l-105 2q-61 0 -102 -13q15 46 27 142.5t13 102.5q58 -106 167 -234zM675 93h-31v5h31v-5zM684 63h-22q-16 0 -31 18q11 -8 20.5 -8t41.5 8q2 -2 6 -10zM461 68h-19l19 418v-418zM690 29q0 5 -4.5 5t-16 -3.5t-15.5 -3.5q28 10 32 10t4 -8zM680 -35q27 9 35 9t36 -11 q-4 -10 -45 -16q-2 -2 0 -4q-3 2 -23 2q3 15 -3 20zM722 -61h-12v4h12v-4zM684 -81q44 0 41 -1l-9 -6h-46q8 7 14 7zM938 1209q12 0 3 10q-1 -3 -2 -5.5t-1 -4.5zM900 1218h-12l-2 -5q4 -2 11 -7q0 8 3 12zM1003 819q0 14 -41 54q-14 -21 -14 -43.5t9 -31.5q16 6 22 3 q3 -11 10 -27v10q-4 7 -5 19q19 -4 19 16zM666 303q12 29 12 40.5t-6 26.5q-8 0 -24 2q-7 10 -10 25q2 -9 1 -26q-24 4 -24 -14q0 -13 24.5 -32t26.5 -22z" />
+<glyph unicode="&#x1f0ae;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM302 1252h-82v25h22l-64 81l66 71h-24v26h80v-26h-22l-62 -71 l64 -81h22v-25zM203 1429h-25v-152h23v-25h-80v25h25v152h-25v26h82v-26zM1494 68q0 -12 -20 -35l-58 -66l-59 66q-20 22 -20 35q0 37 36 37q32 0 39 -26q-8 58 -22 84q9 -3 25.5 -3t25.5 3q-14 -26 -22 -84q7 26 41 26t34 -37zM1284 -166h-940v1496h940v-1496zM291 1096 q0 -37 -36 -37q-32 0 -39 26q8 -58 22 -84q-9 3 -25.5 3t-25.5 -3q14 26 22 84q-7 -26 -41 -26t-34 37q0 12 20 35l58 66l59 -66q20 -22 20 -35zM1507 -291h-82v26h25v152h-23v25h80v-25h-25v-152h25v-26zM1408 -265v-26h-80v26h22l62 71l-64 81h-22v25h82v-25h-22l64 -81 l-66 -71h24zM1169 1208v7h-5v-7h5zM1073 1063l-2 -44q31 -7 31 -27q0 -15 -11 -28t-15 -43q28 -14 65 -26l3 298q19 33 38 52q24 -34 33 -52l8 -348q17 -7 49 -19v492h-161q-59 -91 -59 -108.5t10.5 -68.5t10.5 -78zM1057 1298l26 -8q1 3 11 23h-327q5 -2 15 -7 q-7 -7 -10 -7q13 -15 32.5 -15t31.5 11q-1 6 0 13q-3 0 11 -5q2 7 7 8q2 -4 6 -8q6 6 9 4l-8 -11q35 -14 44 -14t37 11q0 16 -1 15q7 -1 11 -5q0 9 6 8q3 -3 3 -11q6 6 18 6q-5 -5 -11 -13q18 -9 32.5 -9t30.5 6q-3 6 -3 18q6 -1 10 -5q0 9 7 8q2 -4 6 -8q4 5 12 3 q-1 -3 -6 -8zM1176 1189l10 -36q0 -10 -6.5 -43t-6.5 -70.5t10.5 -73t10.5 -48.5t-9 -43q-6 -12 -14 -32q-1 -13 -6 -38l19 -76q15 0 23 -3v454q-1 7 -4 19l-14 8q0 3 -7 17q-6 -26 -6 -35zM670 1284l3 -18h394q7 3 9 12q-34 9 -30 9l-47 -13q-9 0 -28 8l-19 8l-52 -14 q-21 0 -32 8t-13 8q-30 -16 -48.5 -16t-31 7t-13.5 7q-36 -14 -54 -14t-38 8zM1092 1002q-10 8 -27.5 8t-9.5 -3q11 37 11 46.5t-8 61.5t-9 77q-18 -58 -18 -78v-92q0 -55 -1 -46q10 5 25.5 5t24.5 -18q4 3 12 8v31zM1160 1044l18 98q0 3 -6.5 28.5t-7.5 37.5q-9 -20 -9 -43 t-3 -32l-8 -410h23v9q-12 43 -12 63.5t10.5 67t10.5 43t-8 56t-8 82.5zM956 1132l17 -3v10l-12 3q-1 -5 -5 -10zM1269 815q-22 -22 -43 -37v-42q29 11 37 34zM707 1282q33 0 44 17q-4 4 -13 10q17 0 23 3h-107q6 -6 14 -19q43 -11 39 -11zM809 977l22 -6q6 0 6.5 7.5 t11.5 21.5q2 -2 2 -11.5t-9 -37.5q-6 -17 -17.5 -17t-15.5 8q15 0 20 3v17l-19 3l-8 -3q-6 -9 -6 -15q0 -32 34 -32q15 0 24.5 24.5t15.5 41.5q2 -1 2 -17.5t-12 -35.5t-28 -25h14q26 -2 38 29q1 15 14 31v-7q-6 -19 -21 -51h9q19 4 38 55q3 -3 3 -2.5t-6 -39.5q31 21 28 21 q6 0 24 -18q-4 10 -12 24q5 3 6 1q20 -41 49 -43q-20 8 -34 63l3 5l3 -2q8 -64 50 -64q38 0 38 42q0 26 -24 26q-9 0 -15 -3l3 -17h12q2 2 6 5l2 -9q-7 -7 -11 -7t-17 7q-14 68 -14 51l5 56v67q-14 -2 -29.5 -2t-29.5 5q10 -46 10 -57t-7 -16q-19 -12 -25 -19l-2 17 q8 5 23 18q-16 75 -18 75v-2q0 28 20 50q17 -5 52 -6l9 -9v-4l-2 -2h-38q-5 4 -14 10q-5 -11 -16 -33q23 6 31 6q-10 2 -11 7l20 2q10 -6 24 -18q7 27 22 68h-172q-24 -43 -41 -164q-4 -26 -20 -72zM1074 701h185l-34 -24q2 -3 7 -9l40 33q-2 0 -2 14q-64 6 -113 6.5 t-83 -6.5v-14zM848 1213h-23q-27 -38 -40 -140.5t-51 -143.5q22 5 53 24q23 40 38 166q2 17 23 94zM1142 679v7h-4v-7h4zM1147 644q0 -12 -3 -16q-7 10 -12 10v-17q4 2 21 2t47 -2l2 -2q-1 -3 -27 -3q-16 0 -41 1v-23q30 -2 88 -10v112q-35 -6 -72 -10v-15q29 4 49 -1 q-38 -11 -52 0v-26q31 5 52 1q-12 -1 -52 -1zM687 922q11 0 29 5q20 11 29 26q22 40 28.5 98t12.5 105q5 20 25 57h-20q-12 -20 -39 -106q-8 -46 -18.5 -98.5t-34.5 -79.5q-6 -7 -12 -7zM1129 662v-12h15q-4 3 -10 8q1 2 10 4h-15zM780 1213h-20q-19 -26 -29 -64.5 t-16 -68.5q-6 -53 -21 -91.5t-22.5 -45.5t-30.5 -17h30q20 -1 35.5 26.5t29.5 127.5q3 21 44 133zM1207 561q0 22 -25 22t-25 -22t25 -22t25 22zM604 946l17 -12q63 0 76 106q6 54 15 78.5t39 94.5h-57q-33 -27 -52 -159q-2 -12 -17 -71q-7 -4 -13.5 -4t-9.5 3q23 9 23 19 q0 14 -22 14t-22 -28.5t25 -28.5q18 0 24 6q22 22 29 60t15.5 89t38.5 90q-10 -25 -24 -75q-7 -51 -20 -121q-20 -60 -65 -61zM819 826l19 2q6 0 11 -13q12 8 12 14.5t-8 48.5q-7 -1 -20.5 -19.5t-13.5 -23.5v-9zM945 904q-29 -16 -73 -87q-14 -46 -46 -99l-18 75 q-9 23 -19 55t-37 72q33 -98 48.5 -149t22.5 -106q27 77 51 129t71 110zM833 812h-4l-3 -15h5zM927 562q0 -4 10 56t60 135.5t119 140.5q-133 -68 -193 -256q-15 -47 -15 -72q0 -88 45 -174q54 -105 145 -128q37 -10 48 -10t35 7h-11q-38 0 -78 18q-46 21 -58 33 q-107 105 -107 250zM680 1228q0 2 -32 90h-292v-437l200 83q9 3 13 10q3 19 19 49q22 1 40 1q13 91 49 174q3 7 3 30zM1236 289l-49 125q-31 79 -60 114q-9 10 -51 38l45 32q-3 2 -7 4q-18 -9 -59 -33q73 -49 111 -136l55 -147q-3 0 15 3zM1121 473q0 11 -23 18.5t-27 17.5 q-3 14 -14 39q-44 12 -44 26t21 16.5t30 6.5q7 15 7 24q3 6 25 8.5t22 18.5l-5 20q-4 15 5 20h-15q-16 -14 -49 -28.5t-56 -30.5q-20 -9 -52 -26q-11 -9 -11 -22t20 -25l35 -21q51 -41 69 -72q45 -73 57 -115t29 -75h23q-7 40 -34 101q3 18 3 31q0 22 -7 32q-8 0 -20 3 q11 44 11 33zM853 558q0 -129 95 -301h23q-27 43 -70 131q-29 83 -29 145q0 148 113 299q16 21 54 54l-11 3q-12 0 -48 -43q-63 -76 -95 -154.5t-32 -133.5zM772 641q0 -218 -168 -357q5 0 9 -4q6 0 15 7q160 146 160 349q0 124 -60 213q-10 15 -30 61h-23q97 -145 97 -269z M537 677l5 -17q11 -1 28 -7q-1 -5 -1 -10q0 -29 49 -38v-9q0 -13 -45 -24q-6 -9 -18 -25q-10 0 -28 -2q-12 -15 -12 -16.5t3 -20t3 -27.5q10 2 28 8q17 14 44 33q62 28 78.5 38t16.5 33.5t-29.5 33t-72.5 64.5t-51.5 75.5t-38.5 124.5q-10 6 -19 6h-14q-8 -43 -8 -38l17 -35 v-36q10 -8 24 -22q5 -10 4 -42q13 -4 38 -16q-1 12 -1 -31zM405 880q0 -44 37.5 -129t112.5 -150q-11 -10 -45 -29q2 -5 3 -12q22 10 65 38q-23 18 -54 46q-74 86 -109 245q-10 -2 -10 -9zM1272 -154v442l-217 -82q8 -15 8 -27q0 -30 -38 -30q-21 0 -26 10 q-19 -35 -25.5 -105t-31.5 -101l51 -107h279zM803 361l-5 2q-2 -4 -1 -17q0 9 6 15zM893 258q-73 116 -88 183q-25 -69 -110 -177q-7 -10 -17 -14q2 -2 5 -7q69 70 122 177q34 -108 81 -169zM814 321v14q-13 0 -17 -2l-10 12q-2 1 -6 0q-5 -2 -6 -13q0 12 9 -49zM904 -46 l27 3q31 41 34 106q6 133 61 133q6 0 13 -14l-4 -4q-9 5 -18 4.5t-9 -10.5q0 4 3 -13h28q8 13 8 27q0 26 -29 26t-36 -14q-18 -42 -24.5 -63t-9 -76t-28.5 -95q-6 7 -6 10.5t7.5 32t11 52t15.5 88.5q10 41 27 60.5t46 16.5l-41 4q-31 -14 -47 -70q-2 -9 -15.5 -82.5 t-29.5 -121.5h16zM445 633q-27 0 -27 -23q0 -27 29 -27q10 0 21 11v28q-11 11 -23 11zM969 238q-11 0 -31 -14t-31 -38.5t-24.5 -112.5t-29.5 -116h21q25 68 35.5 136.5t18.5 87.5q17 40 56 57h-15zM406 585q2 -2 2 -24.5t-1.5 -48t-0.5 -39.5q31 7 75 11v14q-28 -4 -47 1 q12 3 47 3q1 5 9 13q3 -7 14 -10q0 10 -3 33t3 31zM496 481l-3 12h-5l3 -12h5zM938 240q-5 -1 -18 -2.5t-32.5 -30.5t-22.5 -41q-5 -33 -14 -100t-29 -109q17 -3 20 -3q20 47 27 101l13 99q13 54 56 86zM900 240h-14q-6 1 -26.5 -17t-25.5 -30t-17.5 -93t-31.5 -143l23 -3 q22 50 29.5 100t13.5 96q12 58 49 90zM717 637q0 54 -42 141.5t-102 112t-96 24.5q-2 0 -44 -9h13q104 0 176 -76q77 -82 77 -201q0 -85 -27.5 -142t-109.5 -157l-49 -48q5 -5 3 -7q-5 3 -16 8l-6 -257q1 -19 -3 -57l-32 -55q-20 26 -45 81q-12 79 -12 271q-1 19 -3 53 q-17 14 -43 30v-503h172v3q55 102 55 122q0 3 -7 39q-14 79 -14 146q-31 -5 -31 26q0 8 13 26.5t13 32.5q0 9 -36 33q196 165 196 363zM557 447v18h-193l-6 -7q3 -3 3 -11h196zM400 494l-37 -26h13q10 7 24 26zM613 25l-22 -62q0 -3 6 -9h169q21 39 35 125.5t23 113.5l-23 8 q-4 0 -6 -2q-3 6 2.5 20t12.5 14t12 -7q-2 -2 -15 1l-6 -11q0 -17 18.5 -17t18.5 30q0 22 -28 22q6 0 -21 -3q-8 -23 -23 -60q-4 10 -4 20t14 32t22 23l-14 4q-25 -11 -32.5 -30t-12.5 -36l-4 5q4 24 22 61q-21 -8 -36 -22q-2 -18 -12 -39q0 9 3 25t3 20q-13 -6 -31 -23 q-4 8 -21 22q0 -4 5 -14t0 -16q-15 36 -45 46q11 -2 20 -22.5t9 -32t-3 -12.5l-14 44q-7 19 -38 19q-40 0 -40 -41q0 -23 32 -32q-1 -1 -9 -1t-29 16q-15 -14 -15 -25q0 -20 22 -20t20 1q-7 -30 -10 -52l22 -128q17 74 17 144.5t-11 92.5h-12q-2 -3 -6 -6q2 17 13 17 q24 0 24 -78l-1 -45q-1 -45 -1 -67q10 11 26.5 11t30.5 -10q-4 -4 -3 -6q8 5 8 12.5t-5 20.5q-8 21 -8 44q19 14 30 26l1 -12q-2 -9 -20 -21q15 -71 15 -76q0 -28 -25 -52q-7 5 -25 4t-28 10v8l1 1h18q17 0 35 -10l16 31q-41 -6 -35 -6t9 -2v-3q-2 -2 -12 -2q-12 0 -29 19z M971 -134q-16 14 -36.5 14t-52.5 -7q7 -2 19 -10q-15 -6 -23 -6h82q9 1 11 9zM361 376v-27l39 32v33q-7 -1 -23 -14.5t-16 -23.5zM866 -143v7q-7 -2 -11 9q-8 4 -22 4t-37 -6q1 -8 -8 -14h78zM442 272q0 2 12 -36t12 -63t-5.5 -76.5t-5.5 -49t9 -107.5l17 41l8 454h-28 q8 -29 8 -57q0 -31 -10 -62q-17 -52 -17 -44zM684 -120l54 13q26 0 43 -18q18 18 43 18t28 -1q31 -12 24 -12q3 0 12 6q13 7 37.5 7t43.5 -4q-2 5 -6 12h-400q17 -18 27 -18l48 13q15 0 22 -4zM430 441l-22 -3q4 -147 19 -438l22 -48q-7 71 -7 93q0 20 10 73l8 49 q0 3 -13 54.5t-13 54.5q0 -14 10 19q19 58 19 102t-33 44zM594 -139l-37 11q-15 0 -20 -15l243 -3q-4 3 -12 12q-3 11 -18.5 11t-31.5 -1.5t-22 -1.5q3 -5 -0.5 -10t-15.5 -5t-18 9l5 6q-11 3 -34 3q-13 0 -31 -1q5 -4 3 -12zM937 1192q-7 -17 -17 -18q-20 0 -58 -5 q4 11 25 15l41 8h9zM1045 1015l-3 -10l-4 1l4 9h3zM881 1160h17q-2 -3 -5 -8q10 -3 31 -11q-1 -7 -3 -9l-39 -8l-31 8q0 6 -3 9q38 19 33 19zM1010 1021l-11 -3q-11 0 -22 8l-19 12q11 2 36 -12h7q4 4 -1 10q4 0 10 -3v-12zM920 1060q33 0 25 4q-10 -4 -33 -11q-5 15 1 15 q4 -8 7 -8zM1011 945h-4l-5 33h4zM1049.5 921q-7.5 -3 -14.5 -3t-22 21q8 -13 24 -13t28 8q-2 -7 -5 -8.5t-10.5 -4.5zM965 1014l14 -6q4 0 4 4q0 -4 -1 -6.5t-1 -5.5q-16 10 -42 10t-38 -10q1 3 1 18q0 -3 3 -10q7 7 30.5 7t29.5 -1zM865 1023l40 16h21q0 -5 -5 -10 q-55 -11 -46 -11h-21q-6 11 -3 18h13q-4 -1 -11 -4v-7q2 -2 12 -2zM1150 600h-4v12h4v-12zM624 1096q0 -57 -59 -57q-51 0 -51 52q0 10 10 31l-5 1q-16 -27 -16 -53.5t32 -92.5h-70q31 66 31 92.5t-15 53.5l-6 -1q10 -21 10 -31q0 -52 -51 -52q-58 0 -58 57q0 36 57 105.5 t67 94.5q9 -25 66.5 -94.5t57.5 -105.5zM1253 68q0 -36 -57.5 -105.5t-67.5 -94.5q-9 25 -66.5 94.5t-57.5 105.5q0 57 59 57q51 0 51 -52q0 -10 -10 -31l5 -1q16 27 16 53.5t-32 92.5h70q-31 -66 -31 -92.5t15 -53.5l6 1q-10 21 -10 31q0 52 51 52q59 0 59 -57zM487 555h-4 v10h4v-10zM487 531h-4v7h4v-7zM782 148v-12l-6 -6q-4 4 -8 4q7 1 12 6q0 8 2 8zM710 138q30 11 37 16l25 -4q-13 5 -40 -16l-22 -6v10zM709 171h-12v5h12v-5zM693 174h-12v5h12v-5zM721 157l-42 -11q-4 0 -22 12q4 0 15.5 -0.5t26 -0.5t33.5 10v-13zM677 177h-15v4h15v-4z M581 245l22 4q15 -8 19 -15q3 -5 9 -31q0 -8 -2 -15v9q0 49 -35 49q-6 0 -13 -1zM686 102q22 15 28.5 15t12.5 -9q-7 4 -13 4zM576 242l-6 -7l-3 3l7 6zM672 135q0 -7 -4.5 -7t-18.5 9t-21 11q22 -4 44 -13zM784 26q-30 -20 -35 -20t-9.5 2t-6.5 2q1 0 5 3q-20 10 -31 18 q12 12 39 12t39 -11q0 -2 -1 -6zM630 133q-8 8 -3 13q1 -4 -2 -7q3 -2 5 -6zM734 -8q27 0 38 9q-6 -8 -19 -18q-21 -5 -39 -5h-6h-12q11 14 38 14zM593 64q-10 48 -10 65t12 35q0 3 -4 -24q-2 -11 -2 -25q0 -22 4 -51zM921 1135q-3 7 -13 9q5 -5 5.5 -7.5t7.5 -1.5z M871 1150q-11 -5 -15 -15q8 -2 12 -6q0 3 1.5 10.5t1.5 10.5zM780 28q-2 4 -7 7q-2 -5 -6 -12q5 3 13 5zM725 26q-1 9 -4 9q-4 -1 -7 -4q7 -6 9 -6q1 0 2 1z" />
+<glyph unicode="&#x1f0af;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x1f0b0;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x1f0b1;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM321 1252h-79v25h24l-16 46h-74l-16 -46h24v-25h-79v25h25 l54 155h-24v23h106v-23h-24l54 -155h25v-25zM1499 4q0 -41 -41.5 -41t-41.5 37q0 -37 -42 -37t-42 41q0 23 84 161q83 -137 83 -161zM960 700q0 -45 -58 -143l-88 -139l-88 139q-58 98 -58 143q0 72 71 72q26 0 50.5 -19.5t24.5 -44.5q0 25 24.5 44.5t50.5 19.5q71 0 71 -72 zM296 1160q0 -23 -84 -161q-83 137 -83 161q0 41 41.5 41t41.5 -37q0 37 42 37t42 -41zM1523 -113h-25l-54 -155h24v-23h-106v23h24l-54 155h-25v25h79v-25h-24l16 -46h74l16 46h-24v25h79v-25zM243 1347l-28 85h-4l-28 -85h60zM1445 -183h-60l28 -85h4z" />
+<glyph unicode="&#x1f0b2;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM960 1258q0 -45 -58 -143l-88 -139l-88 139q-58 98 -58 143 q0 72 71 72q26 0 50.5 -19.5t24.5 -44.5q0 25 24.5 44.5t50.5 19.5q71 0 71 -72zM146 1252q0 20 10 45t44 50t40.5 34.5t6.5 19.5q0 33 -33 33q-36 0 -36 -48v-8h-27v9q0 71 61 71q64 0 64 -55q0 -17 -9 -29t-48.5 -43t-42.5 -53h76l1 46h24l-1 -72h-130zM1499 4 q0 -41 -41.5 -41t-41.5 37q0 -37 -42 -37t-42 41q0 23 84 161q83 -137 83 -161zM296 1160q0 -23 -84 -161q-83 137 -83 161q0 41 41.5 41t41.5 -37q0 37 42 37t42 -41zM1482 -88q0 -20 -10 -45t-44 -50t-40.5 -34.5t-6.5 -19.5q0 -33 33 -33q36 0 36 48v8h27v-9 q0 -71 -61 -71q-64 0 -64 55q0 17 9 29t48.5 43t42.5 53h-76l-1 -46h-24l1 72h130zM960 -94q0 -72 -71 -72q-26 0 -50.5 19.5t-24.5 44.5q0 -25 -24.5 -44.5t-50.5 -19.5q-71 0 -71 72q0 45 58 143l88 139l88 -139q58 -98 58 -143z" />
+<glyph unicode="&#x1f0b3;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM960 1258q0 -45 -58 -143l-88 -139l-88 139q-58 98 -58 143 q0 72 71 72q26 0 50.5 -19.5t24.5 -44.5q0 25 24.5 44.5t50.5 19.5q71 0 71 -72zM214 1272q39 0 39 37q0 36 -55 36h-5v25q51 0 51 32t-30 32q-34 0 -35 -40h-28q0 34 17.5 49t42.5 15q61 0 61 -54q0 -33 -28 -46q38 -11 38 -44.5t-21 -49.5t-49 -16q-71 0 -71 72h28 q1 -48 45 -48zM1499 4q0 -41 -41.5 -41t-41.5 37q0 -37 -42 -37t-42 41q0 23 84 161q83 -137 83 -161zM960 700q0 -45 -58 -143l-88 -139l-88 139q-58 98 -58 143q0 72 71 72q26 0 50.5 -19.5t24.5 -44.5q0 25 24.5 44.5t50.5 19.5q71 0 71 -72zM296 1160q0 -23 -84 -161 q-83 137 -83 161q0 41 41.5 41t41.5 -37q0 37 42 37t42 -41zM1414 -108q-39 0 -39 -37q0 -36 55 -36h5v-25q-51 0 -51 -32t30 -32q34 0 35 40h28q0 -34 -17.5 -49t-42.5 -15q-61 0 -61 54q0 33 28 46q-38 11 -38 44.5t21 49.5t49 16q71 0 71 -72h-28q-1 48 -45 48zM960 -94 q0 -72 -71 -72q-26 0 -50.5 19.5t-24.5 44.5q0 -25 -24.5 -44.5t-50.5 -19.5q-71 0 -71 72q0 45 58 143l88 139l88 -139q58 -98 58 -143z" />
+<glyph unicode="&#x1f0b4;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM1286 1258q0 -45 -58 -143l-88 -139l-88 139q-57 98 -57 143 q0 72 71 72q26 0 50 -19.5t24 -44.5q0 25 24.5 44.5t50.5 19.5q71 0 71 -72zM634 1258q0 -45 -58 -143l-88 -139l-88 139q-58 98 -58 143q0 72 71 72q26 0 50.5 -19.5t24.5 -44.5q0 25 24.5 44.5t50.5 19.5q71 0 71 -72zM282 1306h-33v-30h19v-24h-67v24h21v30h-68l-13 23 l85 127h23v-126h33v-24zM1499 4q0 -41 -41.5 -41t-41.5 37q0 -37 -42 -37t-42 41q0 23 84 161q83 -137 83 -161zM296 1160q0 -23 -84 -161q-83 137 -83 161q0 41 41.5 41t41.5 -37q0 37 42 37t42 -41zM1379 -292v126h-33v24h33v30h-19v24h67v-24h-21v-30h68l13 -23l-85 -127 h-23zM1286 -94q0 -72 -71 -72q-26 0 -50.5 19.5t-24.5 44.5q0 -25 -24 -44.5t-50 -19.5q-71 0 -71 72q0 45 57 143l88 139l88 -139q58 -98 58 -143zM634 -94q0 -72 -71 -72q-26 0 -50.5 19.5t-24.5 44.5q0 -25 -24.5 -44.5t-50.5 -19.5q-71 0 -71 72q0 45 58 143l88 139 l88 -139q58 -98 58 -143zM222 1330v80l-53 -80h53zM1406 -166v-80l53 80h-53z" />
+<glyph unicode="&#x1f0b5;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM1286 1258q0 -45 -58 -143l-88 -139l-88 139q-57 98 -57 143 q0 72 71 72q26 0 50 -19.5t24 -44.5q0 25 24.5 44.5t50.5 19.5q71 0 71 -72zM634 1258q0 -45 -58 -143l-88 -139l-88 139q-58 98 -58 143q0 72 71 72q26 0 50.5 -19.5t24.5 -44.5q0 25 24.5 44.5t50.5 19.5q71 0 71 -72zM281 1316q0 -68 -70 -68q-64 0 -68 68h26 q5 -44 42 -44q41 0 41 43.5t-38 43.5q-25 0 -41 -24q-9 9 -20 14l7 106h109v-54h-25v27h-62l-5 -60q20 16 42 16q62 0 62 -68zM1499 4q0 -41 -41.5 -41t-41.5 37q0 -37 -42 -37t-42 41q0 23 84 161q83 -137 83 -161zM960 700q0 -45 -58 -143l-88 -139l-88 139 q-58 98 -58 143q0 72 71 72q26 0 50.5 -19.5t24.5 -44.5q0 25 24.5 44.5t50.5 19.5q71 0 71 -72zM296 1160q0 -23 -84 -161q-83 137 -83 161q0 41 41.5 41t41.5 -37q0 37 42 37t42 -41zM1417 -108q-41 0 -41 -43.5t38 -43.5q25 0 41 24q9 -9 20 -14l-7 -106h-109v54h25v-27 h62l5 60q-20 -16 -42 -16q-62 0 -62 68t70 68q64 0 68 -68h-26q-5 44 -42 44zM1286 -94q0 -72 -71 -72q-26 0 -50.5 19.5t-24.5 44.5q0 -25 -24 -44.5t-50 -19.5q-71 0 -71 72q0 45 57 143l88 139l88 -139q58 -98 58 -143zM634 -94q0 -72 -71 -72q-26 0 -50.5 19.5 t-24.5 44.5q0 -25 -24.5 -44.5t-50.5 -19.5q-71 0 -71 72q0 45 58 143l88 139l88 -139q58 -98 58 -143z" />
+<glyph unicode="&#x1f0b6;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM1286 1258q0 -45 -58 -143l-88 -139l-88 139q-57 98 -57 143 q0 72 71 72q26 0 50 -19.5t24 -44.5q0 25 24.5 44.5t50.5 19.5q71 0 71 -72zM1286 700q0 -45 -58 -143l-88 -139l-88 139q-57 98 -57 143q0 72 71 72q26 0 50 -19.5t24 -44.5q0 25 24.5 44.5t50.5 19.5q71 0 71 -72zM634 1258q0 -45 -58 -143l-88 -139l-88 139 q-58 98 -58 143q0 72 71 72q26 0 50.5 -19.5t24.5 -44.5q0 25 24.5 44.5t50.5 19.5q71 0 71 -72zM221 1381q56 0 56 -66.5t-61 -66.5q-32 0 -51 26t-19 78q0 106 71 106q57 0 59 -63h-26q-5 39 -35 39q-41 0 -42 -76q21 23 48 23zM1499 4q0 -41 -41.5 -41t-41.5 37 q0 -37 -42 -37t-42 41q0 23 84 161q83 -137 83 -161zM296 1160q0 -23 -84 -161q-83 137 -83 161q0 41 41.5 41t41.5 -37q0 37 42 37t42 -41zM1482 -188q0 -106 -71 -106q-57 0 -59 63h26q5 -39 35 -39q41 0 42 76q-21 -23 -48 -23q-56 0 -56 66.5t61 66.5q32 0 51 -26 t19 -78zM1286 -94q0 -72 -71 -72q-26 0 -50.5 19.5t-24.5 44.5q0 -25 -24 -44.5t-50 -19.5q-71 0 -71 72q0 45 57 143l88 139l88 -139q58 -98 58 -143zM634 700q0 -45 -58 -143l-88 -139l-88 139q-58 98 -58 143q0 72 71 72q26 0 50.5 -19.5t24.5 -44.5q0 25 24.5 44.5 t50.5 19.5q71 0 71 -72zM634 -94q0 -72 -71 -72q-26 0 -50.5 19.5t-24.5 44.5q0 -25 -24.5 -44.5t-50.5 -19.5q-71 0 -71 72q0 45 58 143l88 139l88 -139q58 -98 58 -143zM215 1272q37 0 37 41t-35 41q-22 0 -43 -26q7 -56 41 -56zM1413 -108q-37 0 -37 -41t35 -41 q22 0 43 26q-7 56 -41 56z" />
+<glyph unicode="&#x1f0b7;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM1286 1258q0 -45 -58 -143l-88 -139l-88 139q-57 98 -57 143 q0 72 71 72q26 0 50 -19.5t24 -44.5q0 25 24.5 44.5t50.5 19.5q71 0 71 -72zM1286 700q0 -45 -58 -143l-88 -139l-88 139q-57 98 -57 143q0 72 71 72q26 0 50 -19.5t24 -44.5q0 25 24.5 44.5t50.5 19.5q71 0 71 -72zM960 954q0 -45 -58 -143l-88 -139l-88 139 q-58 98 -58 143q0 72 71 72q26 0 50.5 -20t24.5 -45q0 25 24.5 45t50.5 20q71 0 71 -72zM634 1258q0 -45 -58 -143l-88 -139l-88 139q-58 98 -58 143q0 72 71 72q26 0 50.5 -19.5t24.5 -44.5q0 25 24.5 44.5t50.5 19.5q71 0 71 -72zM220 1276h23v-24h-80v24h28q5 85 52 152 h-70v-27h-24v54h127v-22q-56 -67 -56 -157zM1499 4q0 -41 -41.5 -41t-41.5 37q0 -37 -42 -37t-42 41q0 23 84 161q83 -137 83 -161zM296 1160q0 -23 -84 -161q-83 137 -83 161q0 41 41.5 41t41.5 -37q0 37 42 37t42 -41zM1479 -291h-127v22q56 67 56 157h-23v24h80v-24h-28 q-5 -85 -52 -152h70v27h24v-54zM1286 -94q0 -72 -71 -72q-26 0 -50.5 19.5t-24.5 44.5q0 -25 -24 -44.5t-50 -19.5q-71 0 -71 72q0 45 57 143l88 139l88 -139q58 -98 58 -143zM634 700q0 -45 -58 -143l-88 -139l-88 139q-58 98 -58 143q0 72 71 72q26 0 50.5 -19.5 t24.5 -44.5q0 25 24.5 44.5t50.5 19.5q71 0 71 -72zM634 -94q0 -72 -71 -72q-26 0 -50.5 19.5t-24.5 44.5q0 -25 -24.5 -44.5t-50.5 -19.5q-71 0 -71 72q0 45 58 143l88 139l88 -139q58 -98 58 -143z" />
+<glyph unicode="&#x1f0b8;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM1286 1258q0 -45 -58 -143l-88 -139l-88 139q-57 98 -57 143 q0 72 71 72q26 0 50 -19.5t24 -44.5q0 25 24.5 44.5t50.5 19.5q71 0 71 -72zM1286 700q0 -45 -58 -143l-88 -139l-88 139q-57 98 -57 143q0 72 71 72q26 0 50 -19.5t24 -44.5q0 25 24.5 44.5t50.5 19.5q71 0 71 -72zM960 954q0 -45 -58 -143l-88 -139l-88 139 q-58 98 -58 143q0 72 71 72q26 0 50.5 -20t24.5 -45q0 25 24.5 45t50.5 20q71 0 71 -72zM634 1258q0 -45 -58 -143l-88 -139l-88 139q-58 98 -58 143q0 72 71 72q26 0 50.5 -19.5t24.5 -44.5q0 25 24.5 44.5t50.5 19.5q71 0 71 -72zM282 1307q0 -59 -70.5 -59t-70.5 59 q0 37 36 51q-29 17 -29 47q0 53 64 53t64 -53q0 -30 -29 -47q35 -14 35 -51zM1499 4q0 -41 -41.5 -41t-41.5 37q0 -37 -42 -37t-42 41q0 23 84 161q83 -137 83 -161zM296 1160q0 -23 -84 -161q-83 137 -83 161q0 41 41.5 41t41.5 -37q0 37 42 37t42 -41zM1487 -143 q0 -37 -36 -51q29 -17 29 -47q0 -53 -64 -53t-64 53q0 30 29 47q-35 14 -35 51q0 59 70.5 59t70.5 -59zM960 237q0 -72 -71 -72q-26 0 -50.5 19.5t-24.5 44.5q0 -25 -24.5 -44.5t-50.5 -19.5q-71 0 -71 72q0 45 58 143l88 139l88 -139q58 -98 58 -143zM1286 -94 q0 -72 -71 -72q-26 0 -50.5 19.5t-24.5 44.5q0 -25 -24 -44.5t-50 -19.5q-71 0 -71 72q0 45 57 143l88 139l88 -139q58 -98 58 -143zM634 700q0 -45 -58 -143l-88 -139l-88 139q-58 98 -58 143q0 72 71 72q26 0 50.5 -19.5t24.5 -44.5q0 25 24.5 44.5t50.5 19.5q71 0 71 -72 zM634 -94q0 -72 -71 -72q-26 0 -50.5 19.5t-24.5 44.5q0 -25 -24.5 -44.5t-50.5 -19.5q-71 0 -71 72q0 45 58 143l88 139l88 -139q58 -98 58 -143zM249 1402q0 32 -37.5 32t-37.5 -32t37.5 -32t37.5 32zM253 1308.5q0 36.5 -41.5 36.5t-41.5 -36.5t41.5 -36.5t41.5 36.5z M1458 -144.5q0 36.5 -41.5 36.5t-41.5 -36.5t41.5 -36.5t41.5 36.5zM1454 -238q0 32 -37.5 32t-37.5 -32t37.5 -32t37.5 32z" />
+<glyph unicode="&#x1f0b9;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM1286 1258q0 -45 -58 -143l-88 -139l-88 139q-57 98 -57 143 q0 72 71 72q26 0 50 -19.5t24 -44.5q0 25 24.5 44.5t50.5 19.5q71 0 71 -72zM1286 877q0 -45 -58 -143l-88 -138l-88 138q-57 98 -57 143q0 73 71 73q26 0 50 -20t24 -45q0 25 24.5 45t50.5 20q71 0 71 -73zM634 1258q0 -45 -58 -143l-88 -139l-88 139q-58 98 -58 143 q0 72 71 72q26 0 50.5 -19.5t24.5 -44.5q0 25 24.5 44.5t50.5 19.5q71 0 71 -72zM277 1354q0 -106 -71 -106q-56 0 -58 63h25q5 -39 36 -39q40 0 41 76q-21 -23 -47 -23q-57 0 -57 66.5t61 66.5q32 0 51 -26t19 -78zM1286 286q0 -72 -71 -72q-26 0 -50.5 20t-24.5 45 q0 -25 -24 -45t-50 -20q-71 0 -71 72q0 45 57 143l88 139l88 -139q58 -98 58 -143zM1499 4q0 -41 -41.5 -41t-41.5 37q0 -37 -42 -37t-42 41q0 23 84 161q83 -137 83 -161zM960 700q0 -45 -58 -143l-88 -139l-88 139q-58 98 -58 143q0 72 71 72q26 0 50.5 -19.5t24.5 -44.5 q0 25 24.5 44.5t50.5 19.5q71 0 71 -72zM296 1160q0 -23 -84 -161q-83 137 -83 161q0 41 41.5 41t41.5 -37q0 37 42 37t42 -41zM634 877q0 -45 -58 -143l-88 -138l-88 138q-58 98 -58 143q0 73 71 73q26 0 50.5 -20t24.5 -45q0 25 24.5 45t50.5 20q71 0 71 -73zM1425 -161 q57 0 57 -66.5t-61 -66.5q-32 0 -51 26t-19 78q0 106 71 106q56 0 58 -63h-25q-5 39 -36 39q-40 0 -41 -76q21 23 47 23zM1286 -94q0 -72 -71 -72q-26 0 -50.5 19.5t-24.5 44.5q0 -25 -24 -44.5t-50 -19.5q-71 0 -71 72q0 45 57 143l88 139l88 -139q58 -98 58 -143zM634 286 q0 -72 -71 -72q-26 0 -50.5 20t-24.5 45q0 -25 -24.5 -45t-50.5 -20q-71 0 -71 72q0 45 58 143l88 139l88 -139q58 -98 58 -143zM634 -94q0 -72 -71 -72q-26 0 -50.5 19.5t-24.5 44.5q0 -25 -24.5 -44.5t-50.5 -19.5q-71 0 -71 72q0 45 58 143l88 139l88 -139 q58 -98 58 -143zM209 1434q-37 0 -37 -41t34 -41q22 0 43 26q-6 56 -40 56zM1419 -270q37 0 37 41t-34 41q-22 0 -43 -26q6 -56 40 -56z" />
+<glyph unicode="&#x1f0ba;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM1286 1258q0 -45 -58 -143l-88 -139l-88 139q-57 98 -57 143 q0 72 71 72q26 0 50 -19.5t24 -44.5q0 25 24.5 44.5t50.5 19.5q71 0 71 -72zM1286 877q0 -45 -58 -143l-88 -138l-88 138q-57 98 -57 143q0 73 71 73q26 0 50 -20t24 -45q0 25 24.5 45t50.5 20q71 0 71 -73zM960 1080q0 -45 -58 -143l-88 -138l-88 138q-58 98 -58 143 q0 73 71 73q26 0 50.5 -20t24.5 -45q0 25 24.5 45t50.5 20q71 0 71 -73zM634 1258q0 -45 -58 -143l-88 -139l-88 139q-58 98 -58 143q0 72 71 72q26 0 50.5 -19.5t24.5 -44.5q0 25 24.5 44.5t50.5 19.5q71 0 71 -72zM314 1353q0 -105 -61.5 -105t-61.5 105t61.5 105 t61.5 -105zM1286 286q0 -72 -71 -72q-26 0 -50.5 20t-24.5 45q0 -25 -24 -45t-50 -20q-71 0 -71 72q0 45 57 143l88 139l88 -139q58 -98 58 -143zM191 1252h-83v24h28v154h-28v25h56v-179h27v-24zM1499 4q0 -41 -41.5 -41t-41.5 37q0 -37 -42 -37t-42 41q0 23 84 161 q83 -137 83 -161zM296 1160q0 -23 -84 -161q-83 137 -83 161q0 41 41.5 41t41.5 -37q0 37 42 37t42 -41zM1520 -291h-56v179h-27v24h83v-24h-28v-154h28v-25zM634 877q0 -45 -58 -143l-88 -138l-88 138q-58 98 -58 143q0 73 71 73q26 0 50.5 -20t24.5 -45q0 25 24.5 45 t50.5 20q71 0 71 -73zM1437 -189q0 -105 -61.5 -105t-61.5 105t61.5 105t61.5 -105zM1286 -94q0 -72 -71 -72q-26 0 -50.5 19.5t-24.5 44.5q0 -25 -24 -44.5t-50 -19.5q-71 0 -71 72q0 45 57 143l88 139l88 -139q58 -98 58 -143zM960 110q0 -72 -71 -72q-26 0 -50.5 20 t-24.5 45q0 -25 -24.5 -45t-50.5 -20q-71 0 -71 72q0 45 58 143l88 139l88 -139q58 -98 58 -143zM634 286q0 -72 -71 -72q-26 0 -50.5 20t-24.5 45q0 -25 -24.5 -45t-50.5 -20q-71 0 -71 72q0 45 58 143l88 139l88 -139q58 -98 58 -143zM634 -94q0 -72 -71 -72 q-26 0 -50.5 19.5t-24.5 44.5q0 -25 -24.5 -44.5t-50.5 -19.5q-71 0 -71 72q0 45 58 143l88 139l88 -139q58 -98 58 -143zM285 1353q0 81 -32.5 81t-32.5 -81t32.5 -81t32.5 81zM1408 -189q0 81 -32.5 81t-32.5 -81t32.5 -81t32.5 81z" />
+<glyph unicode="&#x1f0bb;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM285 1429h-28v-110q0 -80 -71 -80q-46 0 -56 48l26 9 q10 -31 33 -31q37 0 37 53v111h-41v26h100v-26zM1499 4q0 -41 -41.5 -41t-41.5 37q0 -37 -42 -37t-42 41q0 23 84 161q83 -137 83 -161zM1284 -166h-940v1496h940v-1496zM296 1160q0 -23 -84 -161q-83 137 -83 161q0 41 41.5 41t41.5 -37q0 37 42 37t42 -41zM1439 -101 q-37 0 -37 -53v-111h41v-26h-100v26h28v110q0 80 71 80q46 0 56 -48l-26 -9q-10 31 -33 31zM1272 1318h-49q24 -13 42 -38l7 -455v493zM1125 1245q0 13 10 34q-26 -8 -45 -39t-19 -55q0 -86 56 -103q-5 9 -5 22q0 49 42 57v29q-39 18 -39 55zM1165 1042l-6 -103q0 -10 9 -23 l22 364q23 18 30 18q19 0 30 -29v-436q7 -7 12 -8v451q-32 37 -38 37t-26 -13t-21.5 -18t-11.5 -240zM1087 1043q48 0 48 -43q0 -30 -18 -45q12 -8 30 -22l16 217q-35 -19 -35 -34.5t6 -33.5t6 -8q0 -1 -4 -5q-32 11 -52.5 43t-20.5 70.5t21 63.5q38 44 60 44q6 0 4 -2 q-15 -40 -15 -42q0 -39 30 -47l6 89l44 30h-147l-58 -123q14 -27 40 -178q17 26 39 26zM876 1279l60 16q16 0 33.5 -12t24.5 -12q34 0 43 45h-18q-15 -24 -20 -24q-12 0 -25 13.5t-31 13.5t-38 -8t-26 -8t-18 6.5t-16.5 8t-35 1.5t-53.5 -5.5t-28 -5.5l-38 10h-34l27 -8 q34 -15 47 -15l74 13q21 0 43.5 -14.5t28.5 -14.5zM1264 807v15q-98 92 -150 125q-3 1 -10 -2q34 -20 94.5 -76.5t65.5 -61.5zM1122 996q0 36 -35 36q-32 0 -32 -34q0 -29 31 -29q16 0 16 20t-18 20q-3 -7 -12 -16l-4 4q4 17 19 17q22 0 22 -20q0 -32 -29 -32q-1 0 -13 3 q-11 14 -24 35q-8 45 -20.5 103t-16.5 71q-10 25 -47 23q22 -31 47 -142q2 -9 8.5 -25.5t6.5 -21t-1 -2.5q-9 4 -12.5 13.5t-20.5 80t-44 102.5l-71 12q-3 0 -3.5 -6.5t-1.5 -6.5q-11 18 -29 18h-11q15 -40 15 -44.5t-1 -5.5q-2 3 -14 27.5t-30 29.5q-8 0 -24 3l57 -140 q39 -83 100 -118q-57 69 -82 175q2 3 5.5 -2t11.5 -21q12 -50 50 -109t80 -67q-49 40 -73 110q-39 114 -41 118q3 3 4 2q15 -15 39 -92t49 -109.5t59 -32.5q2 0 13.5 2t17.5 2q-10 8 -24 21q7 0 18.5 -8.5t23.5 -8.5q41 0 41 45zM1183 809l-8 -5h-20q-7 11 -3 24t3 18 q-28 -10 -44 -3v37q-26 -16 -37.5 -16t-11.5 16q0 3 2.5 14t2.5 15l-44 -35q38 -32 115 -90q48 -31 126 -124v62q-33 0 -33 15q7 31 1 36l-21 -8q-5 0 -14 4q3 30 0 40h-14zM680 1055l-6 -44q0 -23 23 -23q6 0 54 10t61 16t30 20q-20 31 -43 108.5t-53 91.5q-16 7 -43 6h-21 v-15q0 -48 -17 -71q-20 -28 -20 -35t9.5 -15.5t16.5 -15.5q0 -5 4 -15q8 -2 20 -6v-22l-4 -5q-5 10 -11 15zM848 1017q2 0 2 -1q0 -2 -62 -22l56 -8h32q-22 31 -28 31zM808 981l-34 7q-2 0 -24 -3.5t-32 -3.5q87 -16 87 -18q0 -1 -2 -1h104q-15 17 -44 17.5t-55 1.5z M1049 297q84 156 95.5 244t11.5 111.5t-13.5 76t-32.5 70.5q38 -82 38 -155q0 -168 -102 -331l-58 95q58 177 87 329q2 13 2 54v31q-22 -239 -100 -413zM651 938l-16 -9q33 -96 173 -261q33 106 161 240l-137 -7q-94 0 -159 27zM632 1120l37 58v71q0 1 -42 69h-271v-572 l116 77q-4 8 -34 61q24 35 71 83l29 -29q2 10 4 25q8 24 64 57q4 3 18 23q11 -13 11 -34.5t-25 -36t-49 -26.5q-3 -6 -9 -15l30 -32l108 77q-7 3 -14 7q-8 8 -8 21v38q-1 4 -4 10q4 14 -4 35q0 1 -14 13.5t-14 19.5zM710 634h262l-3 5h-266zM985 613q-5 6 -6 9h-266 q3 -3 8 -9h264zM520 909l-15 42q-10 -5 -15 -15q15 -11 30 -27zM1125 294q0 -2 -3 -6q14 -9 35 -25l7 7q-19 25 -28 24h-11zM513 900q-21 22 -32 27q-2 -3 -7 -9q13 -10 36 -24q1 3 3 6zM1138 295l32 -16q6 0 7 4q-7 6 -16 18q2 2 10 2l-24 41q-18 -4 -92 -64q14 -16 42 -42 q7 -2 17 -6q-7 16 -23 46q36 43 38 43q16 0 30 -17h-24q3 -2 3 -9zM522 935q15 -30 15 -34t-14.5 -25.5t-24 -21.5t-39.5 15q9 -15 21 -41q53 35 90 69q-11 14 -34 35q-6 0 -14 3zM1151 251q-5 7 -27 27h-12l32 -33q2 3 7 6zM500 884l-26 25h-10q-1 -14 33 -31q2 2 3 6z M1135 238q0 2 -25 28q5 -16 16 -45zM460 893h-9q0 -2 -2 -7l37 -22q3 3 4 7q-29 22 -30 22zM661 534h264q-2 9 -6 12h-263q5 -5 5 -12zM674 518h262l-4 6h-266zM993 251q0 27 -77 135q-28 41 -96 113q-47 -83 -81 -135t-83 -100l126 4q82 0 116 -8q79 -21 79 -23h-1 q17 0 17 14zM512 715q-32 -98 -32 -174t34 -159q5 -12 12 -7q-7 10 -17 32q-24 72 -24 133q0 163 102 319l61 -98q-54 -159 -73.5 -256t-19.5 -107.5t2 -25.5t2 -20q10 174 97 409l-66 114q-46 -62 -78 -160zM818 -149l80 8q18 0 20 -1q33 -11 22 -12h332v564l-121 -59 q34 -54 34 -63.5t-67 -76.5l-22 23h-12q8 -22 -12 -42q-27 -19 -70 -60q-14 19 -14 38t22 29q68 28 68 47q0 4 -14 16t-20.5 12t-53 -35.5t-54.5 -45.5q20 -4 22 -18q-2 -15 -3 -39l13 -55q24 -11 24 -22.5t-19 -35t-19 -32.5v-62q0 1 47 -78l-17 -2q-55 31 -80.5 31t-45 -8 t-34 -8t-39.5 14.5t-40 14.5t-27.5 -7.5t-23.5 -7.5t-30.5 11.5t-32.5 11.5t-16 -1q-24 -10 -24 -29q0 3 3 -14h14q22 21 26.5 21t19.5 -12t36 -12l55 10zM846 208h-122q0 -5 8 -13h75q3 0 28 -5.5t28 -5.5q-16 0 44 10q-57 14 -61 14zM779 156q-3 0 63 25q7 0 -17 1.5 t-71 1.5q21 -28 25 -28zM921 184q-50 0 -138 -43q23 -34 44 -97t27 -77q8 -8 21 -23q63 -9 63 -11h-3h11q0 47 5 63.5t17.5 35t12.5 24.5t-2 8q-27 7 -24 33l-14 8q-3 9 -11 25l9 2q5 -10 12 -16v57q-3 4 -8 10q-14 1 -22 1zM397 420q0 -7 -8 -22q17 0 44 -1q-3 -33 1 -44 q39 7 29 7q12 0 19 -9q-5 -20 -5 -35q44 8 35 8q5 0 8 -5q0 -13 2 -35q13 8 32 16h9q4 -19 0 -39q13 10 41 38q-43 29 -125 91q-27 22 -115 117v-69q15 3 33 0v-18zM708 196l28 -48q19 -32 31.5 -71.5t12.5 -45t-2 -7.5l-45 104q-28 61 -78 92h-15q35 -28 59 -86l33 -95 l17 -45q0 -6 -5 -1q-9 11 -51 122q-29 107 -104 116l5 -5q-6 0 -16 1t-13 1l26 -26h-3q-11 3 -19 10t-23 7q-43 0 -43 -44q0 -38 36 -38q31 0 31 31.5t-23 31.5t-23 -22q0 -14 20 -14q2 6 9 15l4 -4q-6 -17 -17 -17q-24 0 -24 29q0 24 28 24q12 0 28 -15q19 -45 27.5 -102 t10.5 -64l26 -47q18 -6 30 -5q-10 14 -23 37q-12 53 -25.5 103t-12.5 51q22 -31 36.5 -99t41.5 -97q39 -12 54.5 -12t25.5 5q14 -12 40 -12l-20 41h2q12 -19 40 -46q11 -1 30 -4l-55 134q-30 70 -92 117zM360 362q0 -11 70 -68.5t91 -66.5l-157 141zM539 132q-46 0 -46 47 q0 16 15 41q-12 12 -30 25l-13 -221q33 28 33 46.5t-13 31.5l4 4q74 -31 74 -111.5t-84 -109.5q-1 1 1 9q13 18 13 41.5t-31 41.5q-1 -31 -7 -90q-44 -31 -47 -31t-45 28l-7 455v-493h206l58 136q-16 32 -41 179q-8 -29 -40 -29zM366 -112q39 -24 40.5 -24t40.5 25 q1 19 4 50l12 316l-5 -3q-8 -135 -23 -357l-24 -18q2 0 -33 18v436q-7 7 -12 8v-451zM555 2q0 26 -15 57t-38 31q-2 0 -2 -19t-1 -23q-5 -18 -34 -36l-3 -16v-11q39 -15 39 -56q0 -17 -8 -30q62 24 62 103zM1017 966l-4 -2l-13 17l3 2zM757 1198q-30 5 -70 28l22 -6 q16 -1 48 -22zM687 1195q10 -5 16.5 -5t1.5 5q10 -1 36 -15q-6 3 -23 3l31 -15q-7 -2 -29 6q-9 -9 -1 -9q-14 1 -24 -4q0 18 -8 34zM749 1072q-9 -8 -13 -8t-62 25q14 3 32 -8.5t26 -11.5t12 5v12q-8 4 -15 -3q2 10 8 10t12 -6v-15zM694 1101q-12 -3 -13 -3t-23 15 q18 1 25 -10q10 6 11 12v-14zM625 1236q0 -38 -59 -120.5t-55 -103.5q-4 32 -59 109t-55 107.5t17 47t36 16.5q44 0 54 -35q0 -10 3 -33h6q5 68 60 68q23 0 37.5 -18.5t14.5 -37.5zM817 841q0 -7 -24 -48q-24 41 -24 48q0 12 12 12t12 -11q0 11 12 11t12 -12zM832 366 q25 -40 25 -50t-12 -10t-13 11q0 -11 -12 -11t-12 12q0 7 24 48zM1241 -48q0 -59 -52 -59q-41 0 -61 68v-2q-11 -66 -60.5 -66t-49.5 61q0 28 54.5 108.5t57.5 107.5q-3 -30 54 -104.5t57 -113.5zM936 71h16q5 0 17 -12q-7 0 -22 10h-7q-2 -4 -7 -7q3 3 3 9zM876 96l3 12h18 q7 0 54 -23h-14l-34 18h-20q-2 2 -2 -4l7 -15q7 2 10 8q0 -13 -11 -13q-11 12 -11 17zM906 -13l-8 -2q-7 0 -13 6q-2 5 -6 14l14 6h47q-11 -15 1 -34q-14 8 -18 8l-9 -3zM882 -23q1 0 52 -17q6 -10 6 -13q-19 4 -41 10t-25 20h8zM717 -27q-20 31 -46.5 110.5t-53.5 118.5 q26 -26 51 -96zM909 -1v5l-12 3v-5zM905 -10l-12 6l-1 -4l11 -5z" />
+<glyph unicode="&#x1f0bc;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM283 1267q-43 -19 -72 -19q-102 0 -102 105t102 105q34 0 72 -18 v-36h-6q-32 26 -68 26q-67 0 -67 -77t68 -77q37 0 67 26h6v-35zM1499 4q0 -41 -41.5 -41t-41.5 37q0 -37 -42 -37t-42 41q0 23 84 161q83 -137 83 -161zM1284 -166h-940v1496h940v-1496zM296 1160q0 -23 -84 -161q-83 137 -83 161q0 41 41.5 41t41.5 -37q0 37 42 37t42 -41z M1345 -103q43 19 72 19q102 0 102 -105t-102 -105q-34 0 -72 18v36h6q32 -26 68 -26q67 0 67 77t-68 77q-37 0 -67 -26h-6v35zM1036 1230q-2 -6 -6 -19q-3 4 -3 18q-2 -4 -7 -12l-6 12v-18l6 -8h10q6 13 6 27zM1059 1178l-2 -36q6 0 16 -7t19 -7l3 3q6 0 31 -18l-6 -6l-13 5 q-8 0 -12 -12q30 -2 37 -26l-15 -3q10 -5 26 -19q-22 -3 -36 0q17 -14 28 -36l-3 -3q-9 4 -27 13q4 -14 15 -42q10 3 22.5 3t34.5 -27q-21 0 -34 3q17 -18 49 -57q4 -10 15 -28q4 -5 65 -45v485h-203q9 -7 9 -17t-13.5 -42.5t-13.5 -50.5zM1110 1116v6l-15 5v-6zM1000 1200 q8 7 8 14t-5 18v-14q0 -10 -1 -15q-6 32 -14 45q1 -17 12 -48zM1053 1157v28q-9 10 -15 11q2 -15 15 -39zM990 1202v10q0 19 -18 44l6 -38q0 -10 -6 -16h18zM1030 1148q8 15 8 28t-18 21q5 -29 10 -49zM1114 1086q-1 9 -8 9t-14 -9h22zM1018 1163v4q0 8 -7 20v-39q7 8 7 15z M1108 1067l-3 7h-6l5 -7h4zM997 1151q9 9 9 16t-7 18q-5 3 -14 5q3 -9 3 -33l8 7q2 -2 1 -13zM961 1173l8 45q0 50 -32 50h-13q6 -15 15 -47q1 -17 3 -35.5t15 -28.5h21l3 19l-15 5q0 -7 -5 -8zM1069 1095v5l-21 7v-6zM1012 1131q-7 0 -21.5 7t-24.5 7v-2q0 -9 12.5 -20 t23.5 -11h57q1 6 3 19h-50zM1114 1034q-9 5 -27 16q-1 2 -27 30q7 4 12 5q-6 5 -61 15q-14 6 -42 15v-12q11 -19 22 -23h6q21 0 60 -12q18 -13 57 -34zM1039 1068h-10q2 -2 27 -15q-8 15 -17 15zM1008 1026q14 -6 37.5 -6t43.5 -21t24 -24l-10 33q-8 20 -27 26l-44 12 q-25 8 -47 30l-4 -32q14 -25 31 -27l-4 8v1zM1078 987v5l-10 4l-2 -6zM1066 1007v4l-46 6v-4zM1189 745q9 9 9 18.5t-22 29.5q3 6 3 14l-2 7q-2 -9 -12 -21q-8 10 -18 38v-69q5 -5 15 -14l9 12q1 -4 6 -10q0 19 9 24q2 -7 3 -29zM921 986q54 9 54 57.5t-33 125.5 q-3 5 -11 47t-22 50.5t-50.5 8.5t-105.5 -17t-69 -52q0 3 1 3q3 0 23 -67q24 -82 44 -114q37 -60 98 -60q32 0 57.5 20t38.5 23zM1140 750v-3q-2 0 -14 129q-12 -15 -38 -69t-26 -68t8.5 -35.5t21.5 -21.5q9 0 28.5 28t19.5 40zM855 962q-37 0 -55 13l-37 29l5 -12l-5 -12 q2 -20 38.5 -34t60.5 -14q98 0 135 81l-22 4q-57 -55 -120 -55zM1227 720q-8 6 -13.5 6t-15.5 -2q-70 -98 -70 -91q0 -14 19 -21q-3 5 -6 18l5 10q17 -3 37 -3h2q-12 18 -12 32l3 7q13 -1 22 -1h15q-8 10 -22 33q12 3 36 12zM688 1115q9 9 9 25.5t-22 56.5v-24q0 -9 6.5 -28 t6.5 -30zM1188 729l-6 3q-9 -1 -35 -33.5t-30 -35.5l-4 -12l10 -5q38 25 65 83zM1165 741h-10l-56 -66v-12q39 19 66 78zM1249 514h17l6 8v39q-17 -7 -42 -27q13 0 19 -3v-17zM1272 617q-40 -74 -87 -74t-45 40l1 2q11 -35 35 -35q1 0 9 3l-69 71v-14q0 -28 18 -54.5 t48 -26.5q53 0 90 67v21zM1272 497v12q-12 -12 -24 -22h10q5 2 14 10zM712 1095q0 12 -7 26q-7 -18 -32.5 -26.5t-27.5 -24.5q28 3 60 19l1 -3q0 -13 -25 -20t-29 -13v-10q13 -6 24 -6q35 0 36 30q-11 -10 -37 -24v3q37 16 37 49zM1213 519q-14 0 -22 -5q12 -16 22 -16h15 q1 7 6 21h-21zM901 876q-5 0 -18 -9t-17 -10q-4 16 -14 16q-15 0 -20 -19q-9 -33 28 -33q41 0 51 36q5 19 -10 19zM1054 620q0 -18 20.5 -18t20.5 20t-20.5 20t-20.5 -22zM858 810q-3 0 -28 5q15 -17 29.5 -17t38.5 21q-37 -9 -40 -9zM613 1005l63 -10q13 0 33 13 q-2 -18 -18.5 -18t-38 3t-31.5 3q14 -19 36 -17t27 2l-23 -33q0 -33 30 -33q24 0 24 23q-11 -17 -24 -17q-10 0 -10 20q0 11 25 19q-7 1 -13 8q-19 -11 -21 -11q7 14 25.5 22.5t35.5 15.5l2 -5q-4 -9 -35 -22h23q8 0 22 30q5 -10 2 -30q12 10 12 22t-14 39.5t-22 29.5 q-24 -30 -44 -30l-40 8q-20 0 -27 -17l66 -3q1 0 31 11q-10 -21 -37 -21l-42 6q-8 0 -17 -8zM1204 480v9q-23 15 -28 15q-32 0 -45 -32l7 -7q11 4 35 9l3 -2q-3 -9 -3 -16t3 -12h12q16 9 16 36zM778 877q0 21 -21 21t-21 -21t21 -21t21 21zM699 948q-5 0 -12 -7 q5 -12 12 -12l1 9v3q-1 3 -1 7zM848 737q27 0 37 34q4 17 -13 20q-6 -13 -20 -20q-4 9 -15 17q-6 -6 -13 -18q-9 -33 24 -33zM1066 571q0 22 -20 22t-20 -22t20 -22t20 22zM595 978q0 -10 3 -19h15q7 7 8 15q-5 3 -20 3l-6 13v-12zM681 1130q0 43 -27 102q-8 17 -51 67 l26 19h-273v-511q11 18 24.5 31.5t54.5 58.5q4 14 21 35q17 13 59.5 24t56.5 21.5t29 38t38 31.5q-5 9 -5 22t23.5 29t23.5 32zM824 725q9 -12 19.5 -12t26.5 15q-13 -3 -46 -3zM1159 435v25q-21 -6 -55 -30v-10q6 2 21 4l4 -6q0 -8 -4 -19q4 -2 15 -3q19 26 19 39zM728 850 q-20 0 -20 -20t20 -20t20 20t-20 20zM1038 525q0 21 -20.5 21t-20.5 -21t20.5 -21t20.5 21zM1242 477q-34 -24 -103.5 -102t-64.5 -101q23 42 84.5 106.5t83.5 96.5zM828 654q25 0 32 26q3 10 -10 19q-1 -3 -12 -12q-8 13 -13 12l-10 -10q-2 -7 2.5 -21t10.5 -14zM1147 520 l-12 2q-80 -95 -120 -218q38 85 132 216zM723 786q0 21 -20.5 21t-20.5 -21t20.5 -21t20.5 21zM808 316q0 -35 23 -35q-7 39 -7 87q0 75 18 172q16 85 51.5 195t64.5 158q-35 -11 -59 -104l-70 -267q-21 -82 -21 -206zM809 647q9 -12 18 -12t18 12h-36zM1009 483 q-11 11 -21.5 11t-15.5 -8v-21q5 -10 16 -10t21 10v18zM1062 363l25 7q7 0 6 -24q7 1 11 3q10 23 10 29v30q-47 -15 -52 -45zM582 882h-5l3 -18q5 2 23 11q-15 7 -21 7zM818 612q-8 0 -8 9q-3 -2 -8 -19t14 -17t25 24q2 7 0 17q-28 -14 -23 -14zM574 848q-11 0 -12 19 q-7 -7 -15 -24l5 -28q38 19 39 39q-12 -6 -17 -6zM691 736q0 21 -20 21t-20 -21t18 -21q22 0 22 21zM978 428q0 21 -18 21q-23 0 -23 -21t20.5 -21t20.5 21zM1054 316q11 0 12 -19q7 7 15 24l-4 28q-39 -19 -39 -39q11 6 16 6zM823 549q9 27 -10.5 27t-25.5 -24q-2 -7 0 -16 q28 13 23 13q8 0 8 -9q4 3 5 9zM1047 282h4l-3 18q-5 -2 -22 -11q14 -7 21 -7zM567 801l-26 -7q-7 0 -6 24q-7 -1 -10 -3q-11 -23 -11 -29v-30q47 15 53 45zM657 699q-6 10 -17 10t-21 -10v-18q11 -11 21.5 -11t16.5 8v21zM818 515q-8 12 -17 12t-19 -12h36zM820 846 q0 35 -23 35q5 -27 5 -67q0 -76 -18 -199q-7 -50 -46 -174.5t-68 -171.5q35 11 59 103l11 41q9 31 24 93l34 133q22 87 22 207zM946 378q0 21 -20 21t-20 -21t20 -21t20 21zM613 860q-38 -85 -132 -216l12 -2q80 95 120 218zM800 507q-26 0 -32 -25q-3 -10 9 -20q2 3 13 12 q8 -12 13 -12q3 4 10 11q2 6 -2.5 20t-10.5 14zM555 890q-24 -42 -85.5 -106.5t-82.5 -96.5q33 24 102.5 102t65.5 101zM631 639q0 21 -20 21t-20 -21t20 -21t20 21zM880 336q0 -22 20.5 -22t20.5 20t-20.5 20t-20.5 -18zM469 729v-25q21 6 56 30v10q-7 -2 -21 -4l-5 6 q0 8 5 19q-5 2 -15 3q-20 -26 -20 -39zM804 437q-9 12 -19.5 12t-26.5 -15q12 3 46 3zM1272 -157v511q-11 -17 -15 -24q-23 -20 -63 -66q-5 -13 -21 -35q-18 -12 -60.5 -23.5t-56.5 -21.5t-29 -38t-37 -32q4 -9 4 -21.5t-23 -28.5t-23 -33q0 -43 27 -102q7 -16 51 -67 q-13 -8 -27 -19h273zM1033 183q0 10 -3 19h-15q-7 -7 -7 -15q4 -3 19 -3l6 -13v12zM603 593q0 22 -20.5 22t-20.5 -22t20.5 -22t20.5 22zM779 425q-27 0 -36 -35q-4 -16 13 -19q6 12 20 19q4 -8 15 -16q5 5 13 18q8 33 -25 33zM873 266q19 0 19 21t-19 21q-23 0 -23 -21 t23 -21zM928 223v-3q1 -2 2 -7q4 0 12 7q-6 12 -12 12zM453 692q3 9 3 16t-3 12h-12q-17 -9 -17 -36v-9q23 -15 29 -15q31 0 45 32l-8 7q-11 -4 -34 -9zM1017 141l-66 3q-2 0 -32 -11q10 21 38 21l42 -6q7 0 16 8l-63 10q-13 0 -33 -13q2 18 18.5 18t38 -3t32.5 -3 q-16 21 -37.5 18t-25.5 -3l22 33q0 33 -30 33q-24 0 -24 -23q11 17 23 17t12 -20q0 -10 -26 -19q7 -1 14 -8q18 11 21 11q-8 -14 -27 -22l-35 -16l-1 5q3 9 34 22h-22q-9 0 -23 -30q-5 11 -1 30q-12 -9 -12 -21.5t13.5 -40t22.5 -29.5q23 30 43 30l41 -8q19 0 27 17z M797 347q-14 16 -29 16t-38 -21q37 9 40 9t27 -4zM574 542q0 20 -20 20t-20 -20t20 -20t20 20zM415 666h-15q-1 -7 -6 -21h21q14 0 23 5q-13 16 -23 16zM796 308q9 33 -30 33t-49 -36q-5 -20 10 -20q5 0 18 9t17 11q4 -17 14 -17q15 0 20 20zM381 677h-11q-5 -2 -14 -10v-12 q12 12 25 22zM952 124q-35 0 -36 -30q11 11 38 24v-3q-38 -15 -38 -49q0 -12 8 -26q6 18 31.5 27t28.5 24q-29 -2 -60 -19l-2 3q0 14 25 20.5t29 12.5v10q-13 6 -24 6zM513 554q0 28 -18.5 54.5t-48.5 26.5q-53 0 -90 -67v-21q40 74 87 74t46 -40l-2 -2q-11 35 -34 35 q-2 0 -9 -3q22 -24 69 -71v14zM379 650h-16q-4 -4 -7 -8v-39q17 7 43 27q-14 0 -20 3v17zM529 489v12q-39 -19 -66 -78h11zM516 513l-11 5q-38 -25 -64 -83l6 -3q8 1 34 33.5t30 35.5zM954 -12q0 10 -7 28.5t-7 29.5q-9 -9 -9 -25.5t23 -56.5v24zM501 531q0 14 -20 21 q3 -5 6 -18l-4 -10q-18 3 -38 3h-1q11 -18 12 -32l-3 -7q-14 1 -23 1h-15q8 -10 23 -33q-13 -3 -36 -12q7 -6 18 -6l10 2q71 98 71 91zM766 229q-98 0 -135 -81l23 -4q56 55 120 55q36 0 54 -13l37 -29l-4 12l4 12q-2 20 -38.5 34t-60.5 14zM567 425q0 14 -9 35.5t-20 21.5 t-30 -28t-19 -40v3q2 0 13 -129q12 15 38.5 69t26.5 68zM945 -45q0 -3 -1 -3q-3 0 -24 68q-24 82 -44 114q-37 59 -98 59q-32 0 -57.5 -19.5t-38.5 -23.5l26 25q-54 -9 -54 -57t33 -126q2 -4 10 -46t24 -53q12 -7 48.5 -7t106 17t69.5 52zM439 419q-9 -9 -9 -18.5t23 -29.5 q-3 -6 -3 -11t1 -10q2 9 12 21q8 -10 18 -38v69q-5 5 -15 14l-9 -12q-1 4 -6 10q0 -19 -9 -24q-2 7 -3 29zM609 144v4l-47 6v-4zM562 171l-12 3v-5l11 -4zM621 135q-15 6 -38.5 6t-43.5 21.5t-23 23.5q13 -50 31 -57l51 -14q23 -7 45 -30l5 32q-15 26 -32 27l5 -8v-1z M589 93h11q-3 2 -27 15q7 -15 16 -15zM660 46v12q-12 20 -23 23h-3q-22 0 -63 12q-18 14 -57 34q9 -5 27 -16q1 -1 27 -30q-7 -4 -12 -5q6 -5 62 -15q13 -5 42 -15zM663 16v2q0 10 -13 20.5t-23 10.5h-57q-2 -6 -3 -19h49q7 0 21.5 -7t25.5 -7zM580 54v6l-21 6v-5zM667 -12 l-7 -45q0 -50 31 -50h14q-7 16 -15 47q-2 17 -4 36t-14 28h-21l-3 -19l15 -5q-1 8 4 8zM631 10q-9 -9 -9 -15.5t8 -18.5q4 -2 13 -5q-3 10 -3 33l-7 -7q-3 3 -2 13zM529 87l-4 7h-5l3 -7h6zM618 -26v39q-8 -7 -8 -15v-4q0 -7 8 -20zM525 66q4 0 12 9h-23q1 -9 11 -9zM598 13 q-7 -14 -7 -27.5t18 -21.5q-6 30 -11 49zM639 -41v-10q0 -18 18 -44l-6 38q0 11 6 16h-18zM591 -35q-3 15 -15 39v-28q8 -10 15 -11zM628 -39q-7 -7 -7 -14t4 -18v14q0 11 2 15q5 -31 13 -45q-1 17 -12 48zM534 34v6l-15 5v-6zM577 -47l-7 30v19q1 12 1 17q-6 1 -16 7.5 t-18 6.5l-3 -3q-7 0 -32 18l6 6l14 -5q7 0 12 12q-31 3 -38 26l15 3q-10 5 -25 19q21 3 36 0q-18 14 -29 36l3 3q9 -4 27 -13q-4 14 -15 42q-10 -3 -22.5 -3t-34.5 27q21 0 35 -3q-18 18 -50 57q-4 10 -15 28q-4 5 -65 45v-485h203q-9 7 -9 10q0 18 13.5 50.5t13.5 49.5z M615 -68v18l-6 8h-11q-6 -13 -6 -27q2 7 6 19q3 -4 3 -18q2 5 8 12q1 -4 6 -12zM918 1223q-35 13 -52.5 13t-55.5 -16q14 22 51 22t57 -19zM901 1184l-34 -11q-10 0 -35 8q7 39 30 39q15 0 53 -23v-3q0 -2 -9 -30l1 11q0 9 -6 9zM855 1163l-5 -2l-3 9h5zM988 1008l-10 -12 l-3 5l10 10zM1173 775l-8 -1l-6 1l9 12q2 -4 5 -12zM1161 766l-5 -9l-4 3l4 9zM727 1212q1 0 6 -1q-11 0 -43 -17q5 18 37 18zM789 1076q-18 0 -23 25q-1 19 -3 38q-5 4 -15 13h-24l-1 -7l4 -9l-18 21q7 12 20 18l1 3l2 -1q5 2 15 5q-4 5 -13.5 5t-24.5 -17q12 24 24.5 24 t22.5 -10v6q0 7 -5 16q17 -11 17 -64v-15q0 -44 16 -44q5 0 13.5 8.5t14 8.5t11.5 -5q3 7 2 20q4 -5 4 -24v-2q-51 -13 -40 -13zM937 965l-10 -8l-3 5l10 7zM847 1061l-69 -18v7q7 13 26 16l36 7q2 -4 7 -12zM877 987h-4v9h4v-9zM835 1043q-13 -14 -22.5 -14t-20.5 6h6 q5 -1 7 -1h5q12 0 25 9zM868 992l-7 -12l-5 4l9 11zM904 951l-13 -4v6l13 3v-5zM835 1019q2 0 -31 -18v12q17 6 31 6zM876 944h-11v6h11v-6zM844 941l-12 4l2 5l10 -5v-4zM814 950l-4 -2l-3 9h3zM736 1017h-6v17h6v-17zM625 1236q0 -38 -59 -120.5t-55 -103.5q-4 32 -59 109 t-55 107.5t17 47t36 16.5q44 0 54 -35q0 -10 3 -33h6q5 68 60 68q23 0 37.5 -18.5t14.5 -37.5zM993 473h-8v6h8v-6zM643 685h-7v6h7v-6zM1241 -48q0 -59 -52 -59q-40 0 -61 68v-2q-10 -66 -59.5 -66t-49.5 61q0 28 54 108.5t57 107.5q-3 -30 54 -104.5t57 -113.5zM898 127 h-6v17h6v-17zM822 204h-3l-5 7l5 2zM796 216l-1 -5l-11 5v4zM763 211h-10v6h10v-6zM825 148q-18 -5 -32 -6q-2 0 32 18v-12zM738 208l-14 -3v5l14 4v-6zM772 177l-9 -11l-3 3l8 12zM837 126q-3 0 -8 0.5t-14 0.5t-22 -9q13 14 22.5 14t21.5 -6zM756 165h-5v9h5v-9zM850 111 q-7 -12 -26 -15.5t-35 -7.5q-3 5 -8 12l69 18v-7zM705 199l-11 -7l-3 4l11 8zM919 -9q-12 -24 -24.5 -24t-21.5 10v-6q0 -7 4 -16q-16 11 -16 64v15q0 44 -17 44q-5 0 -13.5 -8.5t-14 -8.5t-11.5 5q-3 -7 -1 -20q-5 6 -5 24v2q51 13 41 13q17 0 22 -24q1 -19 3 -39 q5 -4 15 -13h24l2 7l-5 9l18 -21q-7 -11 -20 -18l-1 -3l-2 2q-5 -2 -14 -6q3 -5 12.5 -5t24.5 17zM901 -51q-1 0 -6 1q11 0 44 17q-6 -18 -38 -18zM477 404l-5 -9l-4 3l4 9zM469 389l-9 -12q-2 4 -4 12l7 1zM654 160l-11 -10l-3 3l11 12zM781 -9h-4l-3 7l4 2zM727 -23l35 11 q9 0 34 -8q-7 -39 -30 -39q-15 0 -52 23v3q0 3 9 30l-2 -11q0 -9 6 -9zM819 -59q-15 -22 -52 -22t-56 19q34 -13 51.5 -13t56.5 16zM892 1202q-22 15 -31.5 15t-14.5 -14q41 1 46 -1zM876 1190q-9 -2 -26 -5l23 -4zM736 1175l-4 2l-3 -2l-2 -6l5 -2zM738 1157v4h-15v-4h15z M805 1062q-16 0 -16 -12l37 12h-21zM823 99q16 0 17 12l-38 -12h21zM906 0v4h-15v-4h15zM901 -8l-4 2l-5 -8l4 -1l3 1zM778 -24l-22 4l-3 -9q8 3 25 5zM736 -41q22 -15 31.5 -15t15.5 14q-42 0 -47 1z" />
+<glyph unicode="&#x1f0bd;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM316 1353q0 -88 -82 -103q18 -11 26.5 -11t22.5 4l-13 -32 q-3 -1 -13 -1.5t-34 11t-36.5 11.5t-22.5 -9l-11 17q10 10 20 15q-66 25 -66 99q0 46 29 75t75 29t75.5 -29.5t29.5 -75.5zM1499 4q0 -41 -41.5 -41t-41.5 37q0 -37 -42 -37t-42 41q0 23 84 161q83 -137 83 -161zM1284 -166h-940v1496h940v-1496zM296 1160q0 -23 -84 -161 q-83 137 -83 161q0 41 41.5 41t41.5 -37q0 37 42 37t42 -41zM1521 -190q0 -46 -29 -75t-75 -29t-75.5 29.5t-29.5 75.5q0 88 82 103q-18 11 -26.5 11t-22.5 -4l13 32q3 1 13 1.5t34 -11t36.5 -11.5t22.5 9l11 -17q-10 -10 -20 -15q66 -25 66 -99zM1016 1315h-35 q10 -21 19 -30q6 -3 16 -11v41zM1120 1185q-26 61 -26 74.5t8 58.5h-75q-2 -12 4 -34q43 32 48.5 32t7.5 -2q-2 -10 -53 -44q26 -4 45 -13l-4 -4l-40 2q4 -34 52 -66l-22 -2q-23 3 -37 32q-14 25 -10 38q0 1 -15 8.5t-44 52.5h-30l130 -162q28 29 61 29zM1178 892l-4 -21 q0 -11 6 -19l61 -83q10 -16 31 -47v596h-156l-16 -32q0 -47 28 -105q-56 -9 -75 -47l93 -141q-10 -13 -39 -37q16 -21 25 -27l5 13l4 -20q2 -9 13 -9v12q-6 12 -6 32l-8 -13q-1 15 10 32q2 -20 9 -55h10q0 12 1 12h2v-13q-1 -34 -17 -103q7 37 21 101q10 -10 11 -10 q11 8 9.5 31t9.5 34q8 -65 10 -65v2q0 -13 -12 -28q-3 0 -8 -3q-6 7 -18 13zM840 1318h-27q23 -11 44 -15q-15 15 -17 15zM1208 930q0 -3 -6 12q1 -19 -7 -32t-8 -14q0 -12 13 -12q4 11 4 17q-1 -6 -7 -6t-7 1q1 1 9 2l9 11v21zM938 1187q-1 4 -1 -50t16 -90q23 -52 110 -65 l-29 -1q-59 6 -84 44q-10 15 -20 54q2 -7 2 28v85q0 3 -11.5 21t-13.5 24q0 -24 -5 -73l-4 -48q0 -88 62 -142q26 -22 87 -22l26 4q17 3 24 -3zM1164 907q-3 0 -9 -1.5t-9 -1.5q11 -16 18 -22v25zM731 1318q-24 -17 -24 -24.5t4 -11.5q1 21 32 36h-12zM1182 838q-5 10 -9 15 q-5 -14 -7 -29q4 2 16 14zM696 1301q0 3 4 -11q9 18 21 27q-25 3 -25 -16zM779 1234q-2 2 -6 3q-4 -5 -9 -12h9q6 4 6 9zM759 1274l-22 -3q-3 0 -12 9q16 4 27 4q40 0 40 -43q0 -38 -11.5 -55t-11.5 -19.5t3 -9.5q20 -11 20 -18q0 -6 -5 -1t-15.5 11.5t-10.5 14t10.5 29 t12.5 28.5q-37 -7 -41.5 -7t-19.5 5q-6 -30 -6 -47q0 -42 60 -133q5 -3 15 -3t93 29l13 153q0 77 -92 90q-6 1 -18 7t-16 6t-29.5 -17t-25.5 -26v-33q34 5 36 5q-8 0 34 -10v9q-10 25 -28 25zM1147 751l10 -3l56 21q4 1 5 -1l-72 -34l6 -7l10 8q-3 0 6 -5l71 24 q-15 27 -47 74q-2 1 -6 1q-20 -14 -58 -43q6 -1 9 -4l51 34q-9 -18 -33 -33.5t-27 -20.5q15 7 12 7q6 0 6 -3l55 31h2l-67 -48q2 -2 3 -6zM1092 698l3 -26h9q47 18 114 65q-63 -16 -63 -18h1q-15 0 -41 59q13 8 36 64h-2q-20 0 -38 -51q-19 -53 -19 -93zM1129 784h-4l-3 -9 l4 -1zM810 1026l20 -3q26 3 42 6t20 -3l-2 31q-27 -12 -80 -31zM708 1167q-58 -116 -58 -143v-9q8 2 20 6q-2 21 10 43l23 40q1 -11 -10.5 -32t-11.5 -29.5t6 -14.5q6 2 34 57l1 -9q-4 -9 -10 -32q20 4 39 14q-19 40 -43 109zM782 1026q-7 5 -25 23q-10 -6 -32 -12 q55 -11 57 -11zM900 1023q-64 -13 -89 -13t-48 4.5t-35.5 10.5t-16.5 6t-56 -23q94 -30 149.5 -30t111.5 14q-6 11 -16 31zM1071 943q-19 -4 -45 -4t-54 11q-18 7 -15 7q-96 -18 -142 -18q-100 0 -196 44l-65 -30q15 -12 37 -26q123 -48 222 -48t229 48q11 7 29 16zM807 796 q36 36 36 44t-18 8t-18 -9q0 9 -17 9t-17 -8.5t34 -43.5zM691 1318h-335v-494q60 53 228 158q-1 8 -1 17q0 37 31 91l56 98q22 51 21 87v43zM895 875h-7l-87 -209l-81 217l78 -233zM283 1353q0 77 -71.5 77t-71.5 -77t71.5 -77t71.5 77zM1081 508v82q0 3 -3 18q-7 35 -7 106 t29 113q5 7 54 56q-32 48 -48 68q-26 -11 -71 -36v-474q0 -3 4.5 -13.5t4.5 -14.5q-7 15 -14 35v465l-9 -3v-175q-23 -4 -47.5 -7.5t-42.5 -18.5l82 171v20l-99 -201q3 1 5 2l-36 -66q-57 7 -146 22l-60 146q-33 78 -55 107l106 -264q155 -12 159 -20q1 -23 14 -71 q22 -47 114 -49q7 -2 7 -17t-1 -16q-5 12 -19 29l110 -274l-62 165q6 6 6 -6q29 32 32 59q12 83 12 103l-13 152q0 26 11 79q4 25 59 93q-30 -23 -40.5 -35.5t-25.5 -47t-15 -38.5l13 -188q0 -91 -14 -117q0 16 3 39zM647 670l-109 274l-4 -4l104 -270h9zM623 437 q50 0 97 26l-91 -177q5 -9 4 -14l125 262q49 -5 151 -19q108 -238 108 -249.5t-2 -9.5q-86 32 -161.5 32t-104.5 -4q-15 -5 -41 -11q-31 -2 -82.5 -24t-55.5 -23q6 2 39 2t64 -8t21 -8q3 0 31 5l40 7q29 4 65 4q90 0 197 -42l65 30q-33 21 -73 39q6 5 5 8l-106 259 q-86 10 -160 22q0 -9 -4 38q-6 76 -128 85q0 26 -9 52v-462l6 3v177zM928 283l-78 232l-97 -224h8l87 209zM1345 -189q0 -77 71.5 -77t71.5 77t-71.5 77t-71.5 -77zM947 -90l10 -49q0 -7 -7 -15h322v489q-113 -109 -214 -150q1 -9 1 -17q0 -37 -12 -62l-40 -61 q-60 -99 -60 -135zM876 328q0 6 -35 42q-35 -36 -35 -42q0 -11 17.5 -11t17.5 10q0 -10 17.5 -10t17.5 11zM587 787q-46 -50 -46 -144l16 -160q0 -45 -11 -93t-62 -94q81 54 81 164l-11 161q0 70 27 149q1 2 5 4q2 -3 -4 -17t-17 -52q-3 -26 -3 -69l10 -163q0 -119 -82 -184 q20 -25 52 -72l64 37v485q0 -6 -11 38q-8 -1 -10 1q2 2 2 9zM916 135l-54 5q7 -4 24 -17q12 6 30 12zM528 620q-38 -34 -79 -92.5t-49 -93.5q31 62 64 108q23 26 64 78zM746 144q30 10 71 10t57.5 -2t33.5 -7.5t31 -5.5t8 3q-9 -18 -27 -51q4 12 6 34l-38 -11 q27 -41 45 -107q3 7 29 60.5t29 86.5h-9q-5 -2 -11 -6q1 -17 -11 -40l-22 -43q-1 3 -1 8t10 23.5t10 22.5v24q-2 0 -5 2q23 12 34 16q-64 30 -171 30q-26 0 -93 -11q4 -4 24 -36zM495 437q-1 4 -4 8q-2 -4 -6 -10q3 1 10 2zM823 143h-24q-18 -2 -53 -2q6 -19 5 -28 q42 21 72 30zM522 394l-4 1l-5 -9l4 -2zM549 435v64h-9q-60 -23 -115 -64q60 15 61 15q14 0 28 -25t15 -34q-17 -10 -42 -69q21 4 41.5 48t20.5 65zM488 424l-60 -24q-4 0 -5 1q20 11 62 32l-7 6q-26 -8 -73 -21l29 -47q30 20 70 52q-3 0 -10 -7q-8 8 -6 8zM916 -59l-7 1v-6 q1 4 7 5zM498 403l-62 -32q9 -19 21 -31l56 43q-2 3 -6 4q-28 -15 -51 -32q3 15 28.5 29.5t28.5 25.5q-2 -4 -7 -10zM400 434h-4l-3 -9l4 -2zM877 -105l20 3q15 0 19 -6q-31 -7 -32 -7q-38 0 -38 55q0 15 12 39t14 30q-10 6 -26 23q5 5 31 -15q3 -26 -20 -57l3 -7q29 4 58 0 q6 32 6 54.5t-28 70.5q-7 20 -30 49q-10 6 -36.5 6t-72.5 -29q-17 -132 -17 -147t13.5 -44t28.5 -38q19 -3 52 -12q37 -15 30 -15q4 0 51 27q6 14 6 29.5t-3 22.5q-16 -8 -25.5 -8t-35.5 13v-14q0 -5 8 -14t12 -9zM862 -65h10q1 5 5 9l-18 -2q3 -3 3 -7zM479 345 q-6 -3 -18 -12q10 -9 9 -14zM945 -127q0 5 -5 9q-1 -21 -29 -31h10q24 2 24 22zM934 -128q0 10 -4 18q-1 -15 -38 -38q19 1 42 20zM495 265l-12 23q-2 -12 -6 -29q6 6 18 6zM504 246l-9 11l-4 -3l9 -10zM496 236l-3 10l-4 -1l3 -9h4zM743 64q0 66 -38 109.5t-109 43.5 q-2 0 -22.5 -3t-29.5 -3q9 -14 14 -24q5 0 10 -3q-1 -2 -2 -3q13 -19 23 -31q7 0 22 -2q-8 -3 -20 -2l112 -159q0 12 0.5 32.5t0.5 22.5q0 137 -125 142q-2 1 -4 3l48 1q13 -4 35 -14q25 -15 33 -27q19 -33 20 -49v-26q0 -40 2 -94l24 -42q-1 10 -1 24q0 21 2 48q5 47 5 56z M501 224h-4l-3 -12h4zM444 272q-8 -26 -8 -25t3 -8l4 21q2 10 13 8zM473 225v10h-5v-10h5zM475 178v23h-4v-23h4zM531 -154l10 61q0 50 -31 83l46 13q24 6 37 48l-98 133q39 23 39 34t-23 25q-4 -16 -15 -44q-4 17 -7.5 33.5t-13.5 18.5v-48v-9q0 -29 11 -55q9 -8 24 -23 q2 -12 1 -17l13 16q4 -7 0 -15q2 2 12 2q15 0 16 -25q-12 -7 -23 -7q7 -4 18 -16q-3 -3 -18 0q5 -9 1 -18q-12 -10 -21 -10t-12 16q-16 -8 -13 -8q-2 5 -2 13l-14 -3q-14 0 -14 19t17 19q-1 5 -10 13h21v35q0 3 -4 14q-9 22 -17 120h-9q0 -23 -15 -65q-8 63 -9 63v-2 q0 14 6 20v-18q2 25 22 16q-6 3 -18 8l16 2q7 -7 12 -8l3 17l-113 169v-620h175zM526 96l-2 -17h20l-8 17h-10zM505 112q-11 -3 -23 -3q4 -8 18 -15q5 17 5 18zM518 76q0 16 -17 16q-8 0 -16 -9v-15q8 -8 16 -8q17 0 17 16zM557 -99q0 -11 -10 -52h77q-4 14 -2 36 q-57 -34 -61 -34t-1 1q22 29 59 47q-19 3 -49 13h46v14q0 20 -49 51l25 2q37 -17 43 -69q15 -7 31.5 -20t27.5 -44h31l-136 167q-15 -30 -60 -32q28 -30 28 -80zM526 39q-10 13 -18 13q-2 -5 -8 -11q3 -3 4 -7q8 2 22 5zM462 70l5 -20h12q3 17 3 18q-17 2 -20 2zM678 -154 q-2 23 -35 47q0 -9 -1 -47h36zM1164 1078l-5 -30q0 -4 6.5 -17.5t7.5 -17.5q4 -16 7 -44l-2 -38q1 17 -5 58q-2 -4 -2 -19q0 6 -8.5 37.5t-15.5 40.5q-3 1 -11 1q-1 7 0 19q-2 2 -6 2t-12 -13q-1 1 0 11q-5 4 -6 4l-7 -2q-3 0 -16 22q2 2 3 6h16l4 4l-15 17q6 1 19 -2 q0 3 -6 17q10 9 20 9t18 -16q7 7 10 13q0 -13 3 -21q3 3 9 8h12q5 -17 5 -28q-4 -4 -20 -10l13 -13zM864 1277l-43 -3q-6 0 -16 10q7 -5 29 -2.5t30 -4.5zM1147 932h-5v12h5v-12zM1048 1021q-5 -1 -10 -1q-31 0 -47 22q-18 26 -17 56v21q3 -59 27 -80.5t47 -17.5zM836 1216 l-23 6l-3 9q0 19 35 19q16 0 34 -13q2 -4 3 -10q-32 -11 -46 -11zM808 1151l-2 -4l-19 11l1 4zM820 1096l-34 5q-15 0 -21 -1l-3 -4v10h66v-10h-8zM812 1084l-38 3v5l38 -3v-5zM805 1058h-20v5h20v-5zM625 1236q0 -38 -59 -120.5t-55 -103.5q-4 32 -59 109t-55 107.5t17 47 t36 16.5q44 0 54 -35q0 -10 3 -33h6q5 68 60 68q23 0 37.5 -18.5t14.5 -37.5zM1017 515h-19q-22 0 -40 6q-39 15 -51 49.5t-12 45.5q0 61 55 94q20 12 37 12h30v-207zM1064 415l-6 -18l-3 2l5 16h4zM719 627q29 -29 29 -78.5t-42 -82.5q-22 -17 -50 -16h-29v206h21 q42 0 71 -29zM1241 -48q0 -59 -52 -59q-40 0 -61 68v-2q-10 -66 -59.5 -66t-49.5 61q0 28 54 108.5t57 107.5q-3 -30 54 -104.5t57 -113.5zM856 109h-22v4h22v-4zM867 77l-38 3v5l38 -3v-5zM813 72l39 -4q18 0 30 8v-13h-7q-22 0 -62 9zM630 146q18 0 37 -50q1 -2 1 -6 l-1 -1v-21q2 19 -13 44.5t-38 33.5h14zM800 -81q-3 0 -17.5 4.5t-22.5 6.5q-3 23 37 23q22 0 34 -12q-12 -22 -31 -22zM817 -107l-22 -3q-9 0 -21 7h59q1 -3 5 -9q-9 5 -21 5zM1159 1104l23 -2q0 4 -8 20h-9zM1141 1137h-20l-3 -9q6 -4 14 -8q9 8 9 17zM1156 1096 q0 16 -16.5 16t-16.5 -16t16.5 -16t16.5 16zM1162 1063q-12 12 -18 12q-5 -17 -5 -18q9 2 23 6zM1097 1096l5 -21h10q1 6 5 18q-16 3 -20 3zM1173 989v7h-5v-7h5zM831 1225q-6 3 -6 12q-6 -6 -10 -6q13 -6 16 -6zM823 -62q-4 3 -12 8q6 -6 5 -11q3 1 7 3zM777 -57l-2 3 l-7 -7l3 -2z" />
+<glyph unicode="&#x1f0be;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM302 1252h-82v25h22l-64 81l66 71h-24v26h80v-26h-22l-62 -71 l64 -81h22v-25zM203 1429h-25v-152h23v-25h-80v25h25v152h-25v26h82v-26zM1499 4q0 -41 -41.5 -41t-41.5 37q0 -37 -42 -37t-42 41q0 23 84 161q83 -137 83 -161zM1284 -166h-940v1496h940v-1496zM296 1160q0 -23 -84 -161q-83 137 -83 161q0 41 41.5 41t41.5 -37 q0 37 42 37t42 -41zM1507 -291h-82v26h25v152h-23v25h80v-25h-25v-152h25v-26zM1408 -265v-26h-80v26h22l62 71l-64 81h-22v25h82v-25h-22l64 -81l-66 -71h24zM1205 1136q6 33 -7 43v-46zM1174 1133l15 3v53q-6 5 -15 9v-65zM1165 1184q0 19 -12 27v-75h12v48zM1200 1284 q0 21 -24 21q-7 0 -10 -1q-10 -10 -25 -33q-46 -74 -71 -74h-4q5 -11 5 -26q0 -21 -9 -50q-9 -31 -9 -19q0 -5 10 -24q3 5 51 108t62 103q13 2 13 -10q0 -4 -4 -8q-5 11 -11 13q-6 -6 -6 -11.5t6 -11.5h14q12 11 12 23zM1132 1197h-4l-7 -13l4 -2zM1141 1138q1 34 1 54 t-1 24l-12 -12q10 -8 6 -26.5t-9 -39.5h15zM1200 1096q18 4 18 18t-15 13h-56q58 -31 53 -31zM1062 1203q12 0 30 12l-51 25q-3 -8 -9 -20q34 -17 30 -17zM1095 1122q0 14 11 -52h80q6 17 8 22l-73 45q3 17 12 50q-38 -50 -38 -65zM1065 1179q-1 10 -13 19l-20 16v-21 q20 -10 33 -14zM1062 1143l4 26q-9 6 -34 18v-22q14 -7 30 -22zM1186 1057v7h-80q-1 -4 -3 -7h83zM1272 1318h-187l-43 -67q45 -30 53 -30t37.5 44t31.5 46t11 2q30 0 30 -29t-26 -29q-5 0 -18 14q-10 -18 -19 -41q26 -15 70 -53q-1 -17 1 -42q10 -30 10 -19q0 -22 -25 -21 q-2 -5 -9 -28l83 -309v562zM1061 1140l-23 13q4 -14 11 -41q5 8 12 28zM1194 1024l-96 4v-8zM660 1272l22 -6h360q6 13 12 20q-17 -7 -27.5 -7t-23.5 2t-23 8t-12 6l-53 -13q-13 0 -30 6.5t-18 6.5q-35 -16 -53 -16l-44 18q-2 0 -16.5 -9t-33.5 -9l-46 13q-5 0 -17 -6 q0 3 3 -14zM1080 989q15 80 15 84.5t-2 18.5t-2 20q-25 -52 -25 -46q0 -3 6 -14q10 -21 8 -63zM1080 975v13h-5v-13h5zM1254 740q-12 49 -37 140q-45 7 -127 22zM686 1122q-3 -8 -3 -24t3 -40v-65q0 -5 -14.5 -27t-23.5 -22q-17 0 -17 17q0 10 11 12v-18h9q9 4 9 10t-24 23 q0 6 -1.5 16.5t-1.5 9t18 61.5q-9 -17 -22 -51q3 -35 -5.5 -45t-8.5 -16q0 -32 24 -32q15 0 28 9q7 8 22 20v-3q-20 -31 -35 -30l11 -1l40 26v-3q-14 -20 -22 -25q10 2 46 41q4 -29 -24 -41q18 14 42 31q12 -26 25 -26q-10 14 -10 22.5t3 8.5q2 -14 20 -30t32 -16 q-9 2 -21.5 19.5t-12.5 25.5q0 6 1 4q34 -45 49 -45q23 0 23 28q0 10 -10 20h10q-11 28 -11 36q7 -11 20 -26q7 6 10 3q-11 -21 -11 -28q0 -33 35 -33q30 0 38.5 11t10.5 11q-9 -18 -21 -29h11q12 -1 30 11l18 22q2 -2 -1 -10.5t-13 -17.5h9q30 12 30 55t-21 99.5t-23 84.5 t-6 49q2 2 6 2q0 -54 30 -128.5t30 -95.5t-9 -41q-5 -6 -11 -17q20 8 31 20q6 -5 4 -5q2 0 10 8q16 23 16 50t-23.5 97.5t-23.5 118.5h-112l-3 -18q0 -44 26 -122.5t26 -87t-1 -9.5q-58 143 -58 221q0 7 1 14h-25q-6 -23 -6 -42t26.5 -95t26.5 -95.5t-1 -21.5q-4 11 -7 18 q3 4 4 13q-55 134 -55 208q0 8 1 15h-180q0 -17 -1 -29h43q-2 1 13 8q15 -16 15 -43.5t-18 -94.5q23 -17 23 -23.5t-2 -8.5q-3 5 -11 15q-18 14 -18 19q0 17 18 65q-3 3 -9 6q-16 -6 -27 -6t-24 3zM746 1158q0 2 -9 19q-17 -3 -51 -8v-28q3 1 50 6q-8 4 -17 4t-26 -6 q0 -3 3 9h35q7 -1 15 -8v12zM743 1135h-10q0 -2 10 -10v10zM1100 849q33 -35 42.5 -59t9.5 -66t-35 -97t-89 -76q-1 -3 -1 -7q78 20 123 120v-154h16v262q25 -15 106 -102l4 14l-204 205l-4 -8zM701 1128q-3 5 -10 9q-1 -2 -5 -3q12 -7 15 -6zM663 1084l-16 -58v-35 q5 24 15 63q1 -29 7 -81l8 38v163q-1 -2 -21 -91q0 5 5 10q2 -3 2 -9zM1024 669q0 40 24 177q10 43 27 127q-28 -67 -132 -76l-21 -402h94l8 76v98zM725 878q0 -25 30 -44q36 29 35 43.5t-12 14.5l-20 -11l-10 11h-17q-6 -12 -6 -14zM673 1207.5q0 11.5 -13 54.5t-30 56 h-274v-473q131 92 219 117q19 5 42 25q-1 8 -1 18q10 26 27 76q10 73 20 94t10 32.5zM935 899l-26 3q-7 0 -10 -1q-78 -86 -132 -157q11 -5 12 -11l4 -16q0 -4 -7 -20t-9 -22q-14 -5 -57 -11v-86q59 34 165 181l51 58q9 20 9 56v7v19zM1270 342l-18 3q-6 0 -94 -51l27 -4 q16 0 47.5 19t37.5 33zM773 734l-10 4l-1 -3l9 -5zM1068 486q-4 -5 -6 -48.5t-1 -46.5l4 -4q4 46 4 77q0 12 -1 22zM738 763v4l-18 3v-5zM1035 393l-2 88h-5l3 -88h4zM769 697v5h-12v-5h12zM707 810q0 21 -14 54.5t-26 44.5q-9 2 -24 7q-34 14 -36 44h-11q-26 0 -163 -78 q9 1 17 1q44 0 92 -25q58 -31 65 -86h10q11 4 90 7v31zM764 688q-76 0 -76 3q16 2 32 2t33 -2v17l-4 -3q-45 -3 -60 2v3q1 2 75 2q-2 8 -6 12h-64q-6 1 -6 4h71v12q-24 2 -68 9q18 2 47 8q-3 0 -22 8.5t-37.5 8.5t-38.5 -2l-28 -4l-4 6v-101q30 -6 42 -6l96 8q1 7 4 8l7 -6 q7 0 7 11zM912 388l45 -3q1 0 59 8v90q-24 4 -59 4q-26 0 -58 -2l-21 -1q-1 -7 -5 -11q-5 5 -4 6h-10v-13q44 2 63 2q12 0 13 -1q-14 -2 -28 -2q-18 0 -37 3v-18q19 3 37 3q14 0 28 -2l-2 -4l-84 -3q4 -7 7 -2q-3 1 -3 3h7q3 -3 5 -10q30 0 65 -5q-21 0 -63 -3l-3 -5 q24 -4 68 -14q-12 -3 -44 -3q-1 -4 -3 -7q24 1 27 -10zM1018 387q-55 -10 -59 -10l-12 -1h-28v-29q0 -43 38 -103q10 -1 22 -4t46 -39q53 11 165 73q-5 -1 -10 -1q-33 0 -94 23q-26 10 -47 41t-21 50zM866 454v5h-12v-5h12zM596 679l-3 88h-4l2 -88h5zM906 389v4l-18 3v-5z M563 769l-4 4q-4 -46 -4 -77q0 -12 1 -22q4 5 6 48.5t1 46.5zM858 423v4h-9v-4h9zM481 867q-11 4 -27.5 4t-54.5 -27t-44 -29q14 -7 19.5 -7t51 27t55.5 32zM846 418q0 7 -6 25q0 5 16 40q18 5 56 12v85q-49 -26 -161 -178q-25 -24 -54 -60q-8 -18 -8 -54v-15v-16h33 q74 72 134 158q-4 0 -10 3zM1272 -154v455q-113 -68 -244 -111q-11 -19 -22 -27q0 -14 -4 -38q-11 -21 -27 -61l-12 -65q-1 -4 -6.5 -14t-5.5 -12q0 -42 45 -127h276zM839 262l22 10q7 0 28 -16l9 6v17q0 5 -14.5 24t-23.5 19t-21 -16.5t-12 -30t12 -13.5zM557 97l-13 56 q0 47 40 75t96 29l24 404h-96q-4 -83 -16 -228q-21 -146 -66 -338q0 13 12 -43q19 50 19 45zM471 640h-10q4 -21 -1 -37l-9 -221l-97 97q-1 -4 -4 -7l204 -205v9q0 1 -91 92q15 181 115 227q5 4 16 11h-9q-84 -27 -114 -125v159zM961 62q19 75 19 100q0 5 -1 8q3 -1 6 -1 q26 0 26 26.5t-29 26.5q-13 0 -23 -3q-5 -5 -17 -13q8 11 23 23q-6 1 -47 -30q-3 2 14 25q-3 -1 -21 -10q3 11 11 18h-13q-21 -15 -31 -28q-7 8 -21 22q5 -19 5 -25q-33 40 -45 36q26 -26 26 -35.5t-2 -10.5q-13 47 -53 47q-21 0 -21 -23q0 -13 11 -23q-2 -1 -6 -1t-5 -1 q5 -5 1 -10l-14 -2q-1 0 -1 2l5 30q0 28 -38 28q-10 0 -41 -18l-4 4q6 10 16 16h-11q-14 0 -25.5 -11.5t-16.5 -14.5v7q3 6 9 17q-7 -2 -18 -6q-3 -2 -14 -23t-11 -35.5t12.5 -50.5t30.5 -81t18 -63q0 -19 -4 -23l-3 2q-3 24 -13 70l-37 102q-9 23 -9 43.5t20 58.5 q-35 -19 -35 -32q0 -62 32 -147l11 -31q4 -17 4 -37t-1 -22q-7 34 -21 88q-39 111 -39 119.5t8 38.5q-23 -10 -23 -53q0 -12 23.5 -90t23.5 -121h112q3 17 3 40t-9 55t-15 56q-26 58 -26 67t2 10q57 -113 57 -207q0 -10 -1 -20h23v77v-1q-3 0 -24 73q-25 82 -25 113 q0 9 26 14q6 0 21 -9v-18q-10 -9 -16 -9t-8 1q2 1 5 7q8 0 11 3v14l-23 3q-8 -17 -8 -15.5t6.5 -27.5t27.5 -85.5t21 -97.5v-42h180q-4 9 0 33q-19 -8 -34 -8t-16 1t-4 6q6 8 21 7t28 -3q1 31 -1 36q-4 -13 -28 -13t-17 3q-7 1 -10 5q0 -11 -3 -16q0 3 -4 5l-2 37l15 70 q-15 7 -23 20l9 2q9 -7 22 -23l-15 -62q3 -11 3 -22q6 1 10 4q-6 0 -8 2q1 2 4 7l30 2q8 0 26 -5v62l-6 58q0 53 35 53q18 0 18 -15q0 -5 -8 -9q0 16 -3 21l-14 -3q1 -9 1 -20q0 -30 -8 -79q1 11 1 25q0 25 -4 61l-12 -41l8 -62q1 -11 1 -23q0 -36 -5 -80q8 35 23 90 q23 59 23 60v33q-3 -16 -10.5 -44.5t-20.5 -60.5q-2 1 -3 2zM541 239l-174 171l47 -150q45 -7 127 -21zM661 -133l50 13q17 0 30.5 -6.5t15.5 -6.5q39 13 56.5 13t44.5 -19q10 19 39.5 19t54.5 -16q12 6 12 13t-9 16h-373q-3 -7 -9 -18q12 5 37 5t27 -1q27 -12 24 -12z M531 132v5l-96 3v-5zM588 8q-4 14 -11 42q-10 -16 -14 -28q11 -4 25 -14zM544 -62l37 -16l10 19q-18 17 -28 17q-35 0 -65.5 -55t-47.5 -55q-32 0 -32 33q0 22 28 22q7 0 21 -8l17 41l-70 45q0 18 -2 47q-1 4 -6.5 12t-5.5 11q0 18 25 18q9 16 9 38t-14 67l-64 208v-536h190 q24 43 37 69zM440 104v-10h71q8 0 9 10h-80zM594 -26v20q-19 14 -34 22v-21q17 -8 34 -21zM591 -50v18q-11 7 -31 16v-9q7 -7 31 -25zM506 -12q22 40 22 49.5t-8 51.5h-83q-1 -8 -5 -20q19 -11 70 -44q-3 -16 -10 -48q7 5 14 11zM428 65q-20 0 -20 -14v-8q14 -9 42 -9l29 1 q-46 30 -51 30zM557 -36l-5 27q0 20 9 50t9 19q0 2 -9 29l-96 -205q-8 -15 -19 -15q-3 5 -12 15q1 2 4 6l10 -13q3 3 7 3v18l-10 3q-19 0 -19 -22.5t21 -22.5q12 0 48 54.5t55 54.5q4 0 7 -1zM489 -55l5 13q-10 5 -5 33t5 30h-10l-5 -30v-43q-7 0 10 -3zM473 23h-15v-47 q0 -11 15 -26v73zM452 26q-1 0 -18 -3q3 -5 3 -29t15 -30v62zM425 29q-7 -7 -7 -24.5t10 -22.5q0 32 -3 47zM1004 1146h-5v7h5v-7zM1003 1139q0 5 25 -55q21 -53 21 -100v-11q0 23 -2 32q-41 135 -44 135v-1zM935 1206q0 -49 25 -123.5t29 -96.5l-54 161v59zM851 1165l-29 4 l-13 -2q-7 0 -37 14q9 -2 37.5 -0.5t41.5 -15.5zM835 1147l-31 3v4l31 -2v-5zM853 1125l-17 -5h-45l-6 6q14 20 38 20t30 -12v-9zM908 987q-7 0 -30 -3q-2 6 -9 21l13 -19q6 0 14 7q0 7 -4 15q4 -9 16 -21zM885 952q0 -10 12 -10t21 13q3 -24 -19 -24l-22 14q1 10 13 22 q-5 -10 -5 -15zM787 1041q-6 0 -25 9q-5 0 30 -6q4 5 3 11l3 -11zM828 968v12q0 -2 10 -12h-10zM809 965l16 2q-9 -4 -13 -19l12 -12q5 0 13 8q-3 -9 -11 -13q-9 5 -17 17v17zM729 1003l29 7q13 0 39 -10q-19 3 -68 3zM780 982h-26v5h26v-5zM625 1236q0 -38 -58.5 -120.5 t-55.5 -103.5q-4 32 -59 109t-55 107.5t17 47t36 16.5q44 0 54 -35q0 -10 3 -33h6q5 68 60 68q23 0 37.5 -18.5t14.5 -37.5zM1242 -48q0 -59 -53 -59q-40 0 -61 68v-2q-10 -66 -59.5 -66t-49.5 61q0 28 54 108.5t57 107.5q-3 -30 54.5 -104.5t57.5 -113.5zM871 169h-28v5h28 v-5zM894 153l-31 -4q-19 0 -38 10q34 -5 38 -5t29 5q0 -6 2 -6zM812 205q0 13 -19 17h13q4 -11 13 -33q-5 3 -13 5q6 6 6 11zM791 217l-3 -11l-4 2l4 9h3zM861 108l-25 5q-6 0 -8 -3q1 4 3 8h10q1 0 20 -10zM899 48l-9 -9l-3 2l9 9zM760 148q-5 9 -19 23q2 2 7 4 q6 -17 12 -27zM767 27q5 10 31 10t40 -4q-6 -15 -37 -30q3 0 -8 3q5 -2 11 2q-13 2 -37 19zM851 -23l-49 -3q-26 0 -29 23q12 -8 38.5 -8.5t39.5 -11.5zM690 -6v-20q1 26 -20 87t-25 83q1 -3 15 -38q19 -45 31 -94q-1 -8 -1 -18zM846 1130l-2 3l-6 -3v-4zM806 1125 q-1 3 -1.5 5t-1.5 5q-4 -3 -11 -6h-1q0 -1 15 -4zM830 31h-10q1 -4 3 -7z" />
+<glyph unicode="&#x1f0bf;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x1f0c0;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x1f0c1;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM321 1252h-79v25h24l-16 46h-74l-16 -46h24v-25h-79v25h25 l54 155h-24v23h106v-23h-24l54 -155h25v-25zM1490 63l-74 -100l-75 100l75 100zM942 595l-128 -172l-128 172l128 171zM287 1101l-75 -100l-74 100l74 100zM1523 -113h-25l-54 -155h24v-23h-106v23h24l-54 155h-25v25h79v-25h-24l16 -46h74l16 46h-24v25h79v-25zM243 1347 l-28 85h-4l-28 -85h60zM1445 -183h-60l28 -85h4z" />
+<glyph unicode="&#x1f0c2;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM942 1159l-128 -171l-128 171l128 171zM146 1252q0 20 10 45 t44 50t40.5 34.5t6.5 19.5q0 33 -33 33q-36 0 -36 -48v-8h-27v9q0 71 61 71q64 0 64 -55q0 -17 -9 -29t-48.5 -43t-42.5 -53h76l1 46h24l-1 -72h-130zM1490 63l-74 -100l-75 100l75 100zM287 1101l-75 -100l-74 100l74 100zM1482 -88q0 -20 -10 -45t-44 -50t-40.5 -34.5 t-6.5 -19.5q0 -33 33 -33q36 0 36 48v8h27v-9q0 -71 -61 -71q-64 0 -64 55q0 17 9 29t48.5 43t42.5 53h-76l-1 -46h-24l1 72h130zM942 5l-128 -171l-128 171l128 171z" />
+<glyph unicode="&#x1f0c3;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM942 1159l-128 -171l-128 171l128 171zM214 1272q39 0 39 37 q0 36 -55 36h-5v25q51 0 51 32t-30 32q-34 0 -35 -40h-28q0 34 17.5 49t42.5 15q61 0 61 -54q0 -33 -28 -46q38 -11 38 -44.5t-21 -49.5t-49 -16q-71 0 -71 72h28q1 -48 45 -48zM1490 63l-74 -100l-75 100l75 100zM942 595l-128 -172l-128 172l128 171zM287 1101l-75 -100 l-74 100l74 100zM1414 -108q-39 0 -39 -37q0 -36 55 -36h5v-25q-51 0 -51 -32t30 -32q34 0 35 40h28q0 -34 -17.5 -49t-42.5 -15q-61 0 -61 54q0 33 28 46q-38 11 -38 44.5t21 49.5t49 16q71 0 71 -72h-28q-1 48 -45 48zM942 5l-128 -171l-128 171l128 171z" />
+<glyph unicode="&#x1f0c4;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM1268 1159l-128 -171l-128 171l128 171zM616 1159l-128 -171 l-128 171l128 171zM282 1306h-33v-30h19v-24h-67v24h21v30h-68l-13 23l85 127h23v-126h33v-24zM1490 63l-74 -100l-75 100l75 100zM287 1101l-75 -100l-74 100l74 100zM1379 -292v126h-33v24h33v30h-19v24h67v-24h-21v-30h68l13 -23l-85 -127h-23zM1268 5l-128 -171 l-128 171l128 171zM616 5l-128 -171l-128 171l128 171zM222 1330v80l-53 -80h53zM1406 -166v-80l53 80h-53z" />
+<glyph unicode="&#x1f0c5;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM1268 1159l-128 -171l-128 171l128 171zM616 1159l-128 -171 l-128 171l128 171zM281 1316q0 -68 -70 -68q-64 0 -68 68h26q5 -44 42 -44q41 0 41 43.5t-38 43.5q-25 0 -41 -24q-9 9 -20 14l7 106h109v-54h-25v27h-62l-5 -60q20 16 42 16q62 0 62 -68zM1490 63l-74 -100l-75 100l75 100zM942 595l-128 -172l-128 172l128 171zM287 1101 l-75 -100l-74 100l74 100zM1417 -108q-41 0 -41 -43.5t38 -43.5q25 0 41 24q9 -9 20 -14l-7 -106h-109v54h25v-27h62l5 60q-20 -16 -42 -16q-62 0 -62 68t70 68q64 0 68 -68h-26q-5 44 -42 44zM1268 5l-128 -171l-128 171l128 171zM616 5l-128 -171l-128 171l128 171z" />
+<glyph unicode="&#x1f0c6;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM1268 1159l-128 -171l-128 171l128 171zM1268 595l-128 -172 l-128 172l128 171zM616 1159l-128 -171l-128 171l128 171zM221 1381q56 0 56 -66.5t-61 -66.5q-32 0 -51 26t-19 78q0 106 71 106q57 0 59 -63h-26q-5 39 -35 39q-41 0 -42 -76q21 23 48 23zM1490 63l-74 -100l-75 100l75 100zM287 1101l-75 -100l-74 100l74 100zM1482 -188 q0 -106 -71 -106q-57 0 -59 63h26q5 -39 35 -39q41 0 42 76q-21 -23 -48 -23q-56 0 -56 66.5t61 66.5q32 0 51 -26t19 -78zM1268 5l-128 -171l-128 171l128 171zM616 595l-128 -172l-128 172l128 171zM616 5l-128 -171l-128 171l128 171zM215 1272q37 0 37 41t-35 41 q-22 0 -43 -26q7 -56 41 -56zM1413 -108q-37 0 -37 -41t35 -41q22 0 43 26q-7 56 -41 56z" />
+<glyph unicode="&#x1f0c7;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM1268 1159l-128 -171l-128 171l128 171zM1268 595l-128 -172 l-128 172l128 171zM942 848l-128 -171l-128 171l128 172zM616 1159l-128 -171l-128 171l128 171zM220 1276h23v-24h-80v24h28q5 85 52 152h-70v-27h-24v54h127v-22q-56 -67 -56 -157zM1490 63l-74 -100l-75 100l75 100zM287 1101l-75 -100l-74 100l74 100zM1479 -291h-127 v22q56 67 56 157h-23v24h80v-24h-28q-5 -85 -52 -152h70v27h24v-54zM1268 5l-128 -171l-128 171l128 171zM616 595l-128 -172l-128 172l128 171zM616 5l-128 -171l-128 171l128 171z" />
+<glyph unicode="&#x1f0c8;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM1268 1159l-128 -171l-128 171l128 171zM1268 595l-128 -172 l-128 172l128 171zM942 848l-128 -171l-128 171l128 172zM616 1159l-128 -171l-128 171l128 171zM282 1307q0 -59 -70.5 -59t-70.5 59q0 37 36 51q-29 17 -29 47q0 53 64 53t64 -53q0 -30 -29 -47q35 -14 35 -51zM1490 63l-74 -100l-75 100l75 100zM287 1101l-75 -100 l-74 100l74 100zM1487 -143q0 -37 -36 -51q29 -17 29 -47q0 -53 -64 -53t-64 53q0 30 29 47q-35 14 -35 51q0 59 70.5 59t70.5 -59zM942 341l-128 -171l-128 171l128 171zM1268 5l-128 -171l-128 171l128 171zM616 595l-128 -172l-128 172l128 171zM616 5l-128 -171 l-128 171l128 171zM249 1402q0 32 -37.5 32t-37.5 -32t37.5 -32t37.5 32zM253 1308.5q0 36.5 -41.5 36.5t-41.5 -36.5t41.5 -36.5t41.5 36.5zM1458 -144.5q0 36.5 -41.5 36.5t-41.5 -36.5t41.5 -36.5t41.5 36.5zM1454 -238q0 32 -37.5 32t-37.5 -32t37.5 -32t37.5 32z" />
+<glyph unicode="&#x1f0c9;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM1268 1159l-128 -171l-128 171l128 171zM1268 779l-128 -172 l-128 172l128 171zM616 1159l-128 -171l-128 171l128 171zM277 1354q0 -106 -71 -106q-56 0 -58 63h25q5 -39 36 -39q40 0 41 76q-21 -23 -47 -23q-57 0 -57 66.5t61 66.5q32 0 51 -26t19 -78zM1268 385l-128 -171l-128 171l128 172zM1490 63l-74 -100l-75 100l75 100z M942 595l-128 -172l-128 172l128 171zM287 1101l-75 -100l-74 100l74 100zM616 779l-128 -172l-128 172l128 171zM1425 -161q57 0 57 -66.5t-61 -66.5q-32 0 -51 26t-19 78q0 106 71 106q56 0 58 -63h-25q-5 39 -36 39q-40 0 -41 -76q21 23 47 23zM1268 5l-128 -171 l-128 171l128 171zM616 385l-128 -171l-128 171l128 172zM616 5l-128 -171l-128 171l128 171zM209 1434q-37 0 -37 -41t34 -41q22 0 43 26q-6 56 -40 56zM1419 -270q37 0 37 41t-34 41q-22 0 -43 -26q6 -56 40 -56z" />
+<glyph unicode="&#x1f0ca;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM1268 1159l-128 -171l-128 171l128 171zM1268 779l-128 -172 l-128 172l128 171zM942 975l-128 -171l-128 171l128 171zM616 1159l-128 -171l-128 171l128 171zM314 1353q0 -105 -61.5 -105t-61.5 105t61.5 105t61.5 -105zM1268 385l-128 -171l-128 171l128 172zM191 1252h-83v24h28v154h-28v25h56v-179h27v-24zM1490 63l-74 -100 l-75 100l75 100zM287 1101l-75 -100l-74 100l74 100zM1520 -291h-56v179h-27v24h83v-24h-28v-154h28v-25zM616 779l-128 -172l-128 172l128 171zM1437 -189q0 -105 -61.5 -105t-61.5 105t61.5 105t61.5 -105zM1268 5l-128 -171l-128 171l128 171zM942 214l-128 -171 l-128 171l128 171zM616 385l-128 -171l-128 171l128 172zM616 5l-128 -171l-128 171l128 171zM285 1353q0 81 -32.5 81t-32.5 -81t32.5 -81t32.5 81zM1408 -189q0 81 -32.5 81t-32.5 -81t32.5 -81t32.5 81z" />
+<glyph unicode="&#x1f0cb;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM285 1429h-28v-110q0 -80 -71 -80q-46 0 -56 48l26 9 q10 -31 33 -31q37 0 37 53v111h-41v26h100v-26zM1490 63l-74 -100l-75 100l75 100zM1284 -166h-940v1496h940v-1496zM287 1101l-75 -100l-74 100l74 100zM1439 -101q-37 0 -37 -53v-111h41v-26h-100v26h28v110q0 80 71 80q46 0 56 -48l-26 -9q-10 31 -33 31zM1153 910h32 v136q7 -1 21 -7v-129h9v126q2 0 7 -5v-121h9v284q-38 24 -35 24t-38 -21q0 -75 -1 -77q-59 31 -79 80v-19q-1 -20 28 -65.5t47 -53.5v-152zM1069 1002q26 0 26 22t-19 22l-13 -3l-3 -10q0 -13 16 -18q5 4 8 10t2 6q2 -2 2 -8q0 -13 -13 -13q-8 0 -15 7l-69 208h-22 q14 -21 38 -122l10 -37q0 -4 -1 -5q-13 62 -53 164h-22q30 -61 38 -117t31 -94q13 -22 45 -19l-16 16q21 -9 30 -9zM626 1313l77 -25q5 0 32 7.5t42.5 7.5t38.5 -14t33 -14t26 7.5t30.5 7.5t29 -11.5t27.5 -11.5t27 12.5t12 30.5h-16q-10 -22 -22 -22t-23 12.5t-30 12.5 l-65 -15q-3 0 -14.5 6.5t-16 7.5t-37 1t-46 -5t-28.5 -5l-39 10h-38zM1229 829q0 -4 1.5 -9.5t1.5 -7.5q33 37 29 57zM1223 882v22h-72v-22h72zM1029 988q-39 37 -69 152q-10 40 -27 83h-19q15 -45 33 -109t25 -79q21 -43 57 -47zM1223 854v22h-75v-22h75zM981 999 q-25 36 -43.5 114.5t-34.5 109.5h-25q20 -40 59 -176zM1223 823v25h-75v-25h75zM938 1027q-14 23 -30 94t-43 104h-20q2 -10 6 -27l31 -90q19 -52 56 -81zM915 1031q8 0 -50 -31h76q-18 31 -26 31zM708 1059l30 13q6 0 4 -3q4 -7 0 -10l-40 -8q25 -87 50 -87q18 0 125 54 q18 11 26 27l-61 150q-3 -3 -18 -3q-38 0 -52 14l21 2q15 1 47 -13l-10 31h-151v-35l8 -32q15 10 23.5 10t23.5 -7l2 27q-17 0 -52 20l58 2q5 -14 5 -22l-18 -86q15 -5 17 -11l6 -12h-2q-8 11 -29 22q4 15 10 44q-16 -11 -42 0v-37l8 -34q8 -1 14 -7q-5 -2 -12 -6zM724 1152 q12 0 3 9q0 -6 -3 -9zM689 1150q9 -3 10.5 -5.5t-1.5 16.5q-3 -4 -9 -11zM1082 984h-9l-248 -320l6 -6zM661 1018h-18q-1 2 -5 6v10q2 2 6 2q0 -5 3 -13q7 2 11 6l-2 14h-20q-5 -6 -5 -14q0 -24 20 -24q12 0 31 13q5 -11 -12 -20q26 2 26 26q0 1 -9 40t-9 56v46q-8 47 -8 50 l-7 -43l13 -98q0 -25 -15 -57zM1120 904q-146 -180 -242 -310q96 112 140 168t102 142zM1223 800v17h-74v-18q27 4 51 1v-590q-9 -7 -12 -6t-9 6v584l-5 -588l16 -8q3 0 15 8v594h18zM1140 722q-80 -91 -80 -128t12.5 -57t62.5 -82v14q0 3 -26 42t-31.5 51t-5.5 32.5 t33.5 64t34.5 63.5zM1224 794h-7v-589q-32 -15 -29 -15q-7 0 -25 12v594h-12v-603q39 -16 36 -16q6 0 37 24v593zM921 905l40 -8q6 0 58 26q4 3 18 25h-14q5 0 5 -1q0 -3 -65 -12q-83 -12 -154 -12q-174 0 -257 70q24 11 68 36q4 5 10 14q6 5 16 5t17 -7q6 29 6 42l-13 100 q7 41 4 47l-62 84h439l-35 -88q17 -35 35 -104.5t21 -78.5q6 8 17 8q30 0 30 -30t-23 -35q23 -9 63 -30v105q-30 14 -54 63t-24 90q0 5 1 12q31 -65 85 -95v65q39 30 43.5 30t42.5 -35v-281q13 -9 33 -21v429h-916v-424q15 11 41 32q1 13 2 36l39 25q5 0 3 -2q-6 -3 -20 -12 l-20 -13q0 -113 -1 -115q-1 1 -31 39v-11q-1 -11 32 -50v-458h12v592q24 14 27.5 14t23.5 -14v-594h17v595q-11 7 -32 22q39 -16 34 -16l35 15q18 0 43 -28t42 -28l26 2q21 0 35.5 -13t17.5 -13l41 8q15 0 24.5 -9t23.5 -9t28 6l21 10l53 -16q4 0 15.5 8t32.5 8zM785 858 q-155 0 -277 85v-6q75 -62 177 -75l23 -6q46 -3 79 -3q124 0 194 26q-39 -8 -87 -11l-51 -5q-42 -5 -58 -5zM1260 298q4 4 4 13t-14.5 23t-22.5 28v-19q-1 -4 33 -45zM813 664q-53 72 -135 173q-7 2 -12 3l145 -182zM1120 281l-236 295l-6 -7l223 -280zM875 585 q-30 40 -56 70l-55 -73l57 -68q20 24 54 71zM759 603q0 3 -190 242q-34 43 -46 43h-1l237 -294v9zM828 511q126 -183 142 -183l6 2zM836 313q-96 0 -180 -25h8q4 0 24 5.5t42 6.5l76 6q20 2 48 2q159 0 279 -80q-93 85 -297 85zM550 515q25 33 25 73t-23 70l-47 59v-22 q55 -71 55 -98t-3 -38t-31.5 -52t-28.5 -49v-8zM440 964q3 0 -19 -11l5 -4q12 8 15 5.5t7 -5.5v-584l6 582q0 17 -14 17zM812 506q-1 2 -3 5l-254 -322q5 -5 12 -6zM968 -42l3 39l-12 103q1 2 6 23t16.5 21t15.5 -4v-12l-2 -2q-2 0 -6 4q2 2 2 8h-12v-3q0 -1 -3 -9 q-3 0 -6.5 -11t-3.5 -19.5t4.5 -31t5.5 -29.5l2 -62l-3 -37q21 -32 55 -90h241v413q-14 -8 -39 -24q0 -13 -1 -35q-36 -33 -48 -33q-80 0 -130 65q-8 9 -26 9l-24 -2q-11 0 -27 13t-27 13l-38 -8q-10 0 -20 9t-27.5 9t-31.5 -8t-21 -8l-47 16l-53 -16l-32 8q-16 0 -32.5 -9 t-24.5 -12t-24 -30h13q5 0 19 7q48 7 131 17q26 1 67 1q180 0 257 -67l-69 -36q-3 -2 -8.5 -12t-13.5 -10t-15 3q9 1 25 5v19q0 14 -16 14t-20 -3t-15 -10l-2 8q6 5 11 12q-4 0 -13 -3q-10 -8 -10 -18l17 -70v-64q0 -2 6 -22.5t6 -28.5zM910 18q-5 -6 -9 -6l7 -7q0 3 1 6.5 t1 6.5zM956 -64l3 20q0 38 -20 60q9 -19 -14 -19q-3 0 -24 8q0 -20 -3 -33q18 2 53 -17l-58 -2q0 13 -5 28l15 77q-6 5 -18 23q9 -5 28 -19q-3 -15 -12 -44q29 16 45 0v45l-5 24q-10 -1 -15 2l7 13q-4 2 -8 2q-31 -14 -27 -14q-2 0 -7 11q29 12 34 12t8 -2v16q0 12 -14 38.5 t-21.5 29.5t-15.5 3q-26 0 -119 -53q-18 -11 -31 -25l64 -153q0 5 3.5 5t51.5 -6q6 -1 15 -11l-24 -1q-17 -2 -44 12q4 -11 10 -30h148zM720 131h-1q0 3 55 35l-83 -8q27 -27 29 -27zM481 337v17h-80v-17h80zM789 -62v12q1 12 -25 76.5t-32.5 75t-32.5 36.5q16 -31 31 -93 t22 -78t21 -29h16zM481 311v20h-80v-20h80zM759 -64l-59 179q-4 13 -13.5 22t-30.5 24q24 -30 43 -109.5t36 -115.5h24zM481 283v22h-80v-22h80zM622 172h-11q33 -29 51 -88l18 -77q9 -34 24 -68h20q-23 69 -37 119q-33 114 -65 114zM481 257v20h-80v-20h80zM836 -149l80 10 q2 0 38 -5t53 -6q-11 -1 -47 11.5t-51 12.5t-36 -7.5t-29.5 -7.5t-29.5 13q-27 17 -43 17l-55 -15l-58 23q-34 0 -42 -43h16q17 23 27 23t24.5 -13t24 -13t26.5 6.5t32 6.5t34 -6.5t36 -6.5zM595 156l-27 8q-28 -5 -28 -16q0 -27 19 -27q4 0 16 5v15q-6 5 -12.5 5t-12.5 -6 q5 -5 -1 -7l-2 12q10 9 18 9t12 -9q22 -51 52 -152q8 -18 20 -54h17q-5 8 -12 21q-33 99 -33 139q0 6 1 4q12 -57 52 -164h22q-17 37 -32 101.5t-19 76.5q-18 55 -51 55h-14q6 -6 15 -16zM481 249h-14v-70q-2 -45 -4 -66v136h-12v-131q-9 1 -23 5v126h-11l1 -126v126h-14 v-279q33 -26 37.5 -26t35.5 26q0 69 1 71q19 0 41 -25l40 -47q-10 88 -78 133v147zM559 113q-29 0 -29 36q0 7 9.5 19t15.5 10l-65 32v-104q31 -16 55.5 -70t24.5 -74t-1 -21q-32 70 -84 95v-68q-15 -11 -44 -30l-43 30v288q-14 9 -42 24v-434h239l38 95q-13 31 -54 182 q-10 -10 -20 -10zM1197 1200q23 0 23 -46q0 -23 -6 -57v81l-17 17q-4 -1 -24 -15q0 -53 -4 -65v66q26 19 28 19zM1206 1105q-7 0 -22 6v60q4 3 10 8q6 -2 12 -8v-66zM820 1155q-4 -11 -21 -11t-35 8q17 17 30.5 17t25.5 -14zM830 1067q-2 3 -3 3q9 -5 3 -16q-4 1 -6 -2 q6 7 6 15zM761 1102q12 -6 17 -6t9 3q-4 -6 -17 -4l-23 3zM820 1050q-19 -2 -56 19h14q-4 -1 42 -19zM792 1033q-5 5 -27 5t-38 1l-3 6q-11 1 49 1q12 0 19 -13zM774 1019h-39v5h39v-5zM635 1155q-74 -96 -112 -160q-26 46 -116 157q64 64 116 153q35 -51 112 -150zM839 584 l-18 -24l-20 23l19 25q10 -12 19 -24zM1221 12q-64 -64 -116 -153q-35 51 -112 150q74 96 112 160q26 -46 116 -157zM901 140h-23l3 4zM910 116h-20q13 0 -39 3q-1 3 -6 9q12 -6 61 -4l4 4v-12zM862 93l-31 15h-23q-6 -9 -2 -16q-10 21 18 21q40 0 46 -20h-8zM883 56 q8 0 -23 13h11q3 0 20 -8q-4 -5 -8 -5zM854 69l-4 -10l-3 1l3 9h4zM870 14q-16 -17 -31.5 -17t-26.5 15q14 14 28 14t30 -12zM429 -1v60q7 0 22 -6v-63l-11 -8q-11 10 -11 17zM440 -31q-2 0 22 15q0 27 4 65v-66q-10 -9 -26 -22q-19 13 -24 27q1 39 5 78v-78q13 -19 19 -19z M817 1152q-1 4 -6 9q-2 -4 -3 -12zM782 1161q-2 0 -10 -9q4 -1 7 -3q3 3 3 12zM827 18q-6 -6 -9 -6l6 -7q1 3 1.5 6.5t1.5 6.5z" />
+<glyph unicode="&#x1f0cc;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM283 1267q-43 -19 -72 -19q-102 0 -102 105t102 105q34 0 72 -18 v-36h-6q-32 26 -68 26q-67 0 -67 -77t68 -77q37 0 67 26h6v-35zM1490 63l-74 -100l-75 100l75 100zM1284 -166h-940v1496h940v-1496zM287 1101l-75 -100l-74 100l74 100zM1345 -103q43 19 72 19q102 0 102 -105t-102 -105q-34 0 -72 18v36h6q32 -26 68 -26q67 0 67 77 t-68 77q-37 0 -67 -26h-6v35zM1011 1088l19 12q17 0 17 -38q10 -16 34 -45q11 0 24 -10l2 -3l-3 -5q-12 2 -45 -12q31 3 45 -13l31 -32q14 -10 45.5 -15.5t46.5 -14t45 -59.5v465h-241l83 -85q-56 -7 -82 -58q-6 -21 -30 -69v-14q3 -4 9 -4zM1000 1182h-6l-3 -36h6z M1018 1166q0 2 -9 19q1 -6 1 -13q0 -25 -16 -63q24 21 24 57zM994 1145h-4l-5 -15h5zM987 1158v30q-1 -3 -24 -61h3l1 -5l-1 -9q21 22 21 45zM940 1110q35 63 35 79t-14 25h-12q5 -21 -2 -42.5t-7 -29.5v-32zM937 1178l-16 -60q0 -10 19 -30.5t21 -25.5q5 -28 18 -57v2 q6 3 15 3q33 0 47.5 -20.5t18.5 -20.5q32 0 44 -12q-2 23 -18 23l-18 -3q-10 0 -21.5 20.5t-20.5 28.5q-20 -10 -24 -10q-15 0 -23 18q-1 14 -9 40q-4 6 -22 19t-18 28l16 60q0 21 -16 37zM984 1122h-5l-6 -25h5zM1039 1083q-24 -16 -31 -16t-18 13q11 -25 24.5 -25t24.5 16 v12zM828 1238v15h-5v-15h5zM985 1061q-1 -2 -1 -13.5t16 -28.5q0 7 -7 15q28 0 48 -8h12q-8 13 -34 17.5t-34 17.5zM835 1178q18 25 18 35.5t-9 27.5q0 -32 -9 -63zM835 1140q36 50 36 81t-22 32q7 -23 7 -40t-21 -62v-11zM909 1182q0 5 -2 17q1 -13 -26 -47.5t-31 -51.5 q-1 2 -1 4q0 20 24.5 48.5t24.5 52t-24 42.5q6 -25 6 -42.5t-17 -47t-17 -43.5t4 -23q59 70 59 91zM835 1224v8q-4 -6 -13 -18q0 -12 12 -12v11q1 8 1 11zM958 1047q0 13 -24.5 33t-24.5 31.5t10.5 34t10.5 38t-11 31.5q2 -29 -9.5 -59t-11.5 -42.5t18 -35.5t18 -37t-13 -19 h12q9 5 9 25v20q10 -16 10 -24.5t-8.5 -20.5t-13.5 -12q-20 0 -20 19q0 9 8 14q-12 -5 -12 -12q0 -29 28 -29q24 0 24 45zM828 1146v12h-5v-12h5zM1272 657q0 25 -57 118t-84 124l70 -123q24 -46 34 -73.5t31 -55.5q6 4 6 10zM825 1137v8h-5v-8h5zM1188 722l-3 -38l33 -22 v-21q0 -13 -2 -20q12 5 17 56q-12 5 -33 18v10q0 37 -2 42q-16 2 -39 26q5 25 5 34v6q-14 7 -39 23v3q0 38 -6 43l-11 -55q26 -11 44 -23v-9l-5 -36q3 -3 22 -13.5t19 -23.5zM772 899l90 -5q11 0 110 104l-5 7q-23 -12 -37 -12q-32 0 -32 33q0 17 20 26q-11 10 -30 31 q-8 1 -14.5 -7.5t-11.5 -8.5q-9 0 -30.5 31.5t-21.5 41.5l4 38q-6 17 -12 51q-1 1 -21 13l18 6v15q-38 9 -88 9h-17q-11 -20 -16.5 -62t-15.5 -70.5t-10 -36.5v-20q25 8 29 8q-7 0 12 -8q0 3 1 8l-1 13l7 -9v-9q-7 -6 -19 -6q5 -22 16 -22q7 0 11 3q4 -5 4 -14l-9 -4 q-19 -36 -19 -41q0 -22 49 -22q76 0 120 69q4 6 9 6q-20 -53 -106 -86q0 -30 2.5 -43.5t13.5 -26.5zM1209 629v31q-20 7 -33 21q2 20 1 47q-14 7 -39 25v47q-29 13 -39 25q1 15 8 57q-8 -6 -14 -7l-1 -5l4 -10q-1 -4 -12 -9q12 -46 51.5 -142.5t56.5 -96.5t17 17zM1180 600 q0 5 -37.5 71.5t-70.5 177.5q28 -123 95 -253l10 -5q2 4 3 9zM1272 543q-7 0 -32 -20h18l2 -1v-6q-9 -11 -15 -14q9 0 27 9v32zM1059 775l-48 70l-63 -73l48 -68zM1201 603l20 6q16 0 19 -32q-13 -9 -25 -9h-9q-6 6 -6 17q-22 -42 -41 -42q-8 0 -19 6q-23 -26 -26 -26 q-11 0 -19 18l9 18q-32 -25 -32 -42q0 10 6 -13q59 0 191 69q-1 14 -17.5 29.5t-26.5 15.5t-24 -15zM1164 571v6h-15v-6h15zM688 1035v12h-6v-12h6zM1272 560v2q-100 -45 -180 -67q34 0 92 21t88 44zM1156 559q-6 0 -24 11.5t-24 11.5q5 0 -12 -5q17 1 35.5 -12t27.5 -13 q20 0 25 30h-3q-13 -23 -25 -23zM1225 499q-1 2 -1 7t4 13q-23 -9 -69 -24q12 -1 23 -6q-6 -12 -15 -17q34 9 78 27h-20zM1132 552v4h-12v-4h12zM1272 492v6l-146 -53q54 1 146 47zM1096 573l-4 4l-8 -9l3 -4zM1082 582h-15q-17 -4 -31 -5q5 -5 6 -12l11 11h9q1 -8 7 -17 q5 17 13 23zM828 813l7 -3q5 0 17.5 18t14.5 24h-102q14 -52 28 -94q27 18 27 42q0 2 -3 9q3 4 11 4zM1144 478q0 10 12 15q-22 -4 -58 -16q-1 -23 19 -23q-14 0 50 17h-18q-5 4 -5 7zM1004 609q0 20 -20 20t-20 -20t20 -20t20 20zM1038 554q0 20 -20 20t-20 -20t20 -20 t20 20zM1073 502q0 20 -20 20t-20 -20t20 -20t20 20zM681 1001l3 21q0 7 -7.5 19t-7.5 19.5t3 12.5q-10 3 -26 13q2 52 38 182q0 4 -29 50h-299v-634q38 9 57 21.5t53 86.5q18 10 51 33q13 25 44 69q29 34 80 47t100 24q-1 10 -30.5 12t-29.5 24zM1103 454q0 20 -20 20 t-20 -20t20 -20t20 20zM644 887q0 20 -20 20t-20 -20t20 -20t20 20zM673 843q0 20 -20 20t-20 -20t20 -20t20 20zM880 710h-16v-157q3 -8 16 -17v174zM793 722q-7 -23 -7 -30.5t7 -23.5v54zM775 710q0 7 -3 14h-12l15 -26v12zM705 792q0 20 -20 20t-20 -20t20 -20t20 20z M823 722q-13 0 -14.5 -27.5t-1.5 -48.5q2 -5 9 -12q0 11 6 22h10q6 -11 6 -19.5t-12 -20.5l32 -51v145q-17 12 -35 12zM732 745q0 20 -20 20t-20 -20t20 -20t20 20zM764 696q0 20 -20 20t-20 -20t20 -20t20 20zM595 827v22h-6v-22h6zM793 649q0 20 -20 20t-20 -20t20 -20 t20 20zM1060 366l3 -14l-4 -1l-11 3q0 -8 -6 -20q9 3 26 14v39q-8 -15 -8 -21zM1084 387l-6 -41q-3 -20 -30 -19v-31q1 6 3 19q6 6 27 18zM821 602q0 20 -20 20t-20 -20t20 -20t20 20zM580 837v31q-1 -6 -3 -19q-6 -6 -27 -18l-6 -54l6 41q3 20 30 19zM849 553q0 20 -20 20 t-20 -20t20 -20t20 20zM568 798l-3 14l5 1l10 -3q0 8 6 20q-9 -3 -25 -14v-39q7 15 7 21zM877 506q0 20 -20 20t-20 -20t20 -20t20 20zM1039 315v22h-6v-22h6zM904 462q0 20 -20 20t-20 -20t20 -20t20 20zM936 413q0 20 -20 20t-20 -20t20 -20t20 20zM792 508q-6 10 -6 19 t12 21q-11 17 -31 51v-145q16 -12 34 -12q13 0 14.5 27t2.5 49l-9 12q-1 -11 -6 -22h-11zM965 366q0 20 -20 20t-20 -20t20 -20t20 20zM849 454q0 -8 3 -14h12q-5 8 -15 26v-12zM831 442q8 22 8 30t-8 24v-54zM761 454v157q-4 8 -17 17v-174h17zM994 315q0 20 -20 20 t-20 -20t20 -20t20 20zM1023 271q0 20 -20 20t-20 -20t20 -20t20 20zM565 710q0 20 -20 20t-20 -20t20 -20t20 20zM948 163l-3 -21q0 -7 7.5 -19t7.5 -19.5t-3 -12.5q9 -3 25 -13q-2 -52 -37 -182q0 -4 28 -50h299v634q-38 -9 -57 -21.5t-53 -86.5q-18 -10 -51 -33 q-13 -25 -43 -69q-30 -34 -81 -47t-99 -24q0 -10 30 -12t30 -24zM595 662q0 20 -20 20t-20 -20t20 -20t20 20zM630 610q0 20 -20 20t-20 -20t20 -20t20 20zM664 555q0 20 -20 20t-20 -20t20 -20t20 20zM511 710q14 0 -49 -17h18q4 -4 4 -7q0 -10 -12 -15q22 4 59 16 q0 23 -20 23zM801 351l-8 3q-5 0 -17.5 -18t-13.5 -24h102q-15 52 -29 94q-27 -18 -27 -42q0 -2 3 -9q-3 -4 -10 -4zM592 587q-5 5 -6 12l-10 -11h-9q-2 8 -8 17q-5 -17 -13 -23h15q17 4 31 5zM544 596l-3 4l-9 -9l5 -4zM502 719q-54 -1 -146 -47v-6zM508 608v4h-12v-4h12z M469 669q-12 1 -22 6q5 12 15 17q-35 -9 -78 -27h19q4 -8 -3 -20q23 9 69 24zM469 612q-20 0 -25 -30h3q13 23 25 23q6 0 24 -11.5t24 -11.5q-5 0 12 5q-17 -1 -35.5 12t-27.5 13zM537 669q-35 0 -93 -21t-88 -44v-2q100 45 181 67zM946 117v12h-6v-12h6zM480 587v6h-15v-6 h15zM427 561l-19 -6q-17 0 -20 32q13 9 26 9h9q5 -6 6 -17q21 42 40 42q8 0 20 -6q22 26 25 26q11 0 20 -18l-9 -18q31 25 31 42q0 -10 -6 13q-59 0 -190 -69q0 -14 16.5 -29.5t26.5 -15.5t24 15zM680 392l-48 68l-63 -71l48 -70zM356 621h1q6 0 31 20h-18l-1 1v6 q8 11 15 14q-10 0 -28 -9v-32zM556 315q-28 123 -94 253l-11 5q-2 -8 -2 -9q0 -7 37 -72q37 -66 70 -177zM544 313q-12 46 -51.5 142.5t-56 96.5t-16.5 -17v-31q19 -7 33 -21q-3 -20 -2 -47q14 -7 39 -25v-47q29 -13 39 -25q-1 -15 -7 -57q7 6 13 7l2 5l-5 10q1 4 12 9z M819 24l-5 -38q6 -17 12 -51q1 -1 21 -13l-18 -6v-15q38 -9 89 -9h16q11 20 16.5 62t15.5 70.5t10 36.5v20q-25 -8 -28 -8q6 0 -12 8q-1 -3 -2 -8l2 -13l-8 9v9q7 6 20 6q-6 22 -17 22q-7 0 -10 -3q-5 5 -5 14l9 4q20 36 20 41q0 22 -50 22q-76 0 -120 -69q-4 -6 -9 -6 q20 53 107 86q-1 30 -3.5 43.5t-13.5 26.5l-90 5q-11 0 -109 -104l4 -7q23 12 38 12q31 0 31 -33q0 -17 -19 -26l30 -31q7 -1 13.5 7.5t11.5 8.5q9 0 31 -31.5t22 -41.5zM441 442l3 38q-12 7 -33 22v21q0 13 1 20q-12 -5 -16 -56q11 -5 33 -18v-10q0 -37 1 -42q16 -2 39 -26 q-4 -25 -4 -34v-6q13 -7 39 -23v-3q0 -38 6 -43l10 55q-26 11 -43 23v9l4 36q-3 3 -21.5 13.5t-18.5 23.5zM808 19v8h-4v-8h4zM357 507q0 -25 56.5 -118t84.5 -124q-25 41 -60 105t-45 91.5t-30 55.5q-6 -4 -6 -10zM805 6v12h-4v-12h4zM718.5 8q11.5 30 11.5 42.5t-18 35.5 t-18 37t14 19h-12q-9 -5 -9 -25v-20q-11 16 -11 24.5t8.5 20.5t14.5 12q19 0 19 -19q0 -9 -7 -14q12 5 12 12q0 29 -29 29q-24 0 -24 -45q0 -13 25 -33t25 -31.5t-10.5 -34t-10.5 -38t10 -31.5q-2 29 9.5 59zM795 -38q-2 -8 -2 -22v-8q4 6 14 18q-1 12 -12 12zM765.5 6.5 q17.5 29.5 17.5 43.5t-5 23q-58 -70 -58 -91q0 -5 1 -17q-1 13 26 47.5t31 51.5q1 -2 1.5 -13t-24.5 -39.5t-25 -52t24 -42.5q-6 25 -6 42.5t17.5 47zM793 24q-36 -50 -36 -81t23 -32q-8 23 -8 40t21 62v11zM793 -14q-18 -25 -18 -35.5t9 -27.5q0 32 9 63zM643 103 q1 2 1.5 13.5t-16.5 28.5q0 -7 8 -15q-29 0 -48 8h-12q7 -13 33 -17.5t34 -17.5zM805 -89v15h-4v-15h4zM639 84q-12 25 -25.5 25t-24.5 -16v-12q24 16 31 16t19 -13zM655 67h-4l-6 -25h4zM543 184l18 3q9 0 20.5 -20.5t21.5 -28.5q19 10 24 10q14 0 22 -18q1 -14 9 -40 q4 -6 22.5 -19t18.5 -26t-8.5 -32t-8.5 -35t17 -32l-5 20q-3 12 -3 21.5t8.5 28.5t8.5 29.5t-19.5 31t-21.5 25.5q-5 28 -18 57v-2q-6 -3 -15 -3q-33 0 -47.5 20.5t-18.5 20.5q-32 0 -43 12q1 -23 18 -23zM688 22v32q-34 -63 -34 -79t13 -25h12q-5 21 2 42.5t7 29.5zM642 6 v-30q0 3 24 61h-3l-2 5l2 9q-21 -22 -21 -45zM643 34h-4l-5 -15h5zM610 -2q0 -2 9 -19q-1 6 -1 13q0 25 16 63q-24 -21 -24 -57zM637 18h-6l-3 -36h6zM618 76q-5 0 -10.5 -6t-9.5 -6q-16 0 -16 38q-11 16 -35 45q-11 0 -24 10l-1 3l3 5q11 -2 45 12q-32 -3 -46 13l-31 32 q-14 10 -45.5 15.5t-46.5 14t-45 59.5v-465h241l-83 85q56 7 83 58q5 21 30 69v14q-4 4 -9 4zM721 1212h-34q25 9 33 9q64 0 63 -39q-16 30 -62 30zM712 1140q-13 36 -13 45.5t4 13.5h11q16 -11 51 -30v-12q-5 -7 -15 -14l1 12q-8 -5 -31 -7zM1159 714l-10 -4v12zM1029 773 l-28 -31l-22 31l28 33zM846 830q-12 0 -12 12h12v-12zM635 1155q-74 -96 -112 -160q-26 46 -116 157q64 64 117 153q34 -51 111 -150zM807 830v12l7 7q8 -4 8 -9v-4l-5 -6h-10zM778 846q6 3 12 3h3v-16l-12 -3q-1 5 -3 16zM805 804q-4 -2 -10 -7l-5 16h12zM989 609 q0 -5 -5 -5t-5 5t5 5t5 -5zM1023 554q0 -5 -5 -5t-5 5t5 5t5 -5zM1058 502q0 -5 -5 -5t-5 5t5 5t5 -5zM1088 454q0 -5 -5 -5t-5 5t5 5t5 -5zM831 715q10 -10 10 -22.5t-13 -19.5q-8 15 -8 25.5t11 16.5zM629 887q0 -5 -5 -5t-5 5t5 5t5 -5zM658 843q0 -5 -5 -5t-5 5t5 5 t5 -5zM690 792q0 -5 -5 -5t-5 5t5 5t5 -5zM717 745q0 -5 -5 -5t-5 5t5 5t5 -5zM749 696q0 -5 -5 -5t-5 5t5 5t5 -5zM778 649q0 -5 -5 -5t-5 5t5 5t5 -5zM806 602q0 -5 -5 -5t-5 5t5 5t5 -5zM834 553q0 -5 -5 -5t-5 5t5 5t5 -5zM862 506q0 -5 -5 -5t-5 5t5 5t5 -5zM889 462 q0 -5 -5 -5t-5 5t5 5t5 -5zM921 413q0 -5 -5 -5t-5 5t5 5t5 -5zM950 366q0 -5 -5 -5t-5 5t5 5t5 -5zM979 315q0 -5 -5 -5t-5 5t5 5t5 -5zM1008 271q0 -5 -5 -5t-5 5t5 5t5 -5zM797 491q7 -15 7 -26t-10 -16q-11 9 -11 22t14 20zM550 710q0 -5 -5 -5t-5 5t5 5t5 -5zM580 662 q0 -5 -5 -5t-5 5t5 5t5 -5zM615 610q0 -5 -5 -5t-5 5t5 5t5 -5zM649 555q0 -5 -5 -5t-5 5t5 5t5 -5zM838 351h-12l-3 9q4 2 11 7zM850 318q-6 -3 -12 -3h-3v16l12 3q1 -5 3 -16zM807 324v4l4 6h11v-12l-8 -7q-7 4 -7 9zM1222 12q-65 -64 -117 -153q-35 51 -112 150 q75 96 112 160q26 -46 117 -157zM783 322v12q11 0 12 -12h-12zM649 391l-28 -33l-22 33l28 31zM480 442l-11 8l11 4v-12zM916 24q14 -36 14 -45.5t-5 -13.5h-10q-17 11 -51 30v12q4 7 15 14l-2 -12q8 5 32 7zM909 -57q-65 0 -63 39q15 -30 61 -30h35q-26 -9 -33 -9z M736 1173v5l-10 4l-2 -4zM736 1161l-7 5l-3 -8l3 -4zM903 6l-3 4l-8 -7l8 -5zM904 -14l-12 5v-5l11 -4z" />
+<glyph unicode="&#x1f0cd;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM316 1353q0 -88 -82 -103q18 -11 26.5 -11t22.5 4l-13 -32 q-3 -1 -13 -1.5t-34 11t-36.5 11.5t-22.5 -9l-11 17q10 10 20 15q-66 25 -66 99q0 46 29 75t75 29t75.5 -29.5t29.5 -75.5zM1490 63l-74 -100l-75 100l75 100zM1284 -166h-940v1496h940v-1496zM287 1101l-75 -100l-74 100l74 100zM1521 -190q0 -46 -29 -75t-75 -29 t-75.5 29.5t-29.5 75.5q0 88 82 103q-18 11 -26.5 11t-22.5 -4l13 32q3 1 13 1.5t34 -11t36.5 -11.5t22.5 9l11 -17q-10 -10 -20 -15q66 -25 66 -99zM1272 1318h-91q-29 -62 -29 -94.5t11 -58.5q14 -20 28 -60l-34 -25q-26 -19 -26 -34.5t49 -54.5l92 -73v400zM1176 1115 q-35 79 -35 102t24 98h-155q14 -25 44 -50q3 15 10 43q6 -15 13 -52q53 54 60 54t5 -2q1 -6 -58 -65q17 -4 50 -14h-50q15 -64 84 -111q-11 -1 -44 19t-44.5 43.5t-18.5 56.5q-24 12 -41 25.5t-42 52.5h-25q1 -28 69.5 -112t117.5 -118zM889 1315v-9q13 -9 31 -17 q-8 27 -19 26h-12zM858 1309q0 -14 30 -31t43 -17q-6 15 -30.5 29t-27.5 25h-12zM1215 890q-7 15 -14 17q-52 0 -84.5 12t-69.5 69q-14 22 -21 60q0 11 -3 28l5 4q3 1 5 -2q22 -123 96 -151q33 -13 57 -8q-9 12 -25 14.5t-25 8.5q-39 24 -54 54q-7 26 -26 73q-4 7 -53 56 v-43v-11q0 -58 37 -116q5 -8 29 -33q3 -3 34.5 -18t44.5 -14h67zM826 1315h-10q-47 -59 -45 -62q26 21 55 62zM793 1315q-3 -6 -18 -25.5t-15 -26.5t2 -10q6 29 43 62h-12zM761 1315q-14 -13 -14 -23t7 -21q10 16 25 44h-18zM984 1147q0 25 -38 84q-15 24 -33.5 30t-50.5 24 q-7 12 -22 31q-6 -22 -41.5 -53t-35.5 -45q0 -27 2 -81.5t73 -141.5q19 -1 38.5 -1t47.5 19l60 42v92zM753 982q34 -9 98.5 -9t150.5 14l-11 54l-46 -31q-48 -27 -79 -27q-13 0 -33 4q-13 22 -29 38zM1033 941l-40 8q-11 0 -27 -11.5t-23 -11.5l-47 10q-15 0 -24 -9t-21 -9 l-50 16l-41 -16q-17 0 -36 13t-15 13q-7 0 -30 -22q5 -2 6 -6q14 0 27.5 -4t87 -7t47.5 -3q110 0 197 26q-6 9 -11 13zM902 845l-103 -5q-60 0 -116 11t-63.5 14t-12.5 3t-15 -9q100 -30 188 -30l57 3q24 0 31 -5l292 48q-40 6 -45.5 6t-93.5 -18t-119 -18zM597 939l27 6 q-2 -27 -30 -27q-11 0 -12 1q12 0 34 20q-22 -5 -24 -5h-18q-15 1 -23 1q12 0 28 -5q-5 -3 -14 -3q8 0 12 -5q-17 -3 -42 -2q0 -6 -3 -9q11 1 27 -22t21 -26q25 14 53 32q6 11 5 37l-3 32q3 39 29 91.5t48 104.5q2 53 25 158h-381v-472l102 -56q0 120 17 120q8 0 9 -1 q-7 -3 -14 -2l15 -5q5 -3 4 -6q17 -3 39 -21q3 -7 2 -43q28 17 41 30l-32 42q-15 0 -41 4q6 1 18 6q-5 12 -29 12q-39 0 -39 -29q0 -14 1 -13q-5 0 -6 2q-11 30 -11 26q0 5 10.5 17.5t32 12.5t30.5 -2q-13 20 -21 20l-9 -3q-8 0 -8 15q0 -4 -4 -9q-3 2 -3 10 q-10 -10 -12 -10q-16 0 -16 17q0 8 13 10q-10 0 -21 5q3 3 16 2q-11 11 -11 17.5t5 10.5h17q3 -4 9 -10q1 8 5 21q5 -15 5 -24q5 11 12 11q13 0 13 -12q0 -3 -8 -16q10 0 13 -5q-6 -3 -18 -2q10 -4 14 -22q24 -17 29 -37q16 13 44 13zM283 1353q0 77 -71.5 77t-71.5 -77 t71.5 -77t71.5 77zM1262 428l-21 49q0 3 11 21q13 23 13 36t-13 34t-13 25.5t10 17.5t16 31q0 17 -37 50q-72 64 -138 76q-13 0 -41 3l158 107h-11q-20 2 -49.5 -21.5t-63.5 -44.5l-101 -65q-155 -104 -162 -104t-36 8l39 173h-12l-30 -128v125h-7l-18 -165l-156 44 q13 -12 17 -19l55 -19q177 -45 276 -53q33 -59 58.5 -94.5t61.5 -57.5q8 -7 22 -17l172 -87v75zM477 1002h12q2 5 3 12q-11 3 -12 3q-3 -5 -3 -15zM1167 343v13h-11q-16 0 -41 -12q10 0 27.5 -0.5t24.5 -0.5zM1122 330q-6 5 -9 5t-3 -4q3 -2 3 -6h54l3 12h-47q1 -5 -1 -7z M455 1005q0 15 -15 15q-3 -6 3 -18q5 1 12 3zM511 949l-9 9l-2 -3l9 -9zM1020 424l6 17q0 1 -9 19q-7 -6 -12 -17q9 -9 15 -19zM1110 308h60q-2 4 -6 8q-35 -2 -54 0v-8zM489 978h-17l2 -15l15 3v12zM450 993q0 -7 15 -15l6 6v12q-6 3 -14 6q-7 -2 -7 -9zM523 916v9l-11 22 q1 -10 -4 -17q6 -6 15 -14zM1193 272q-3 -10 -17 -23q9 2 10 1q-4 -4 -20 -14q28 2 27 36zM452 986h-12l-2 -15l14 -3q5 9 0 18zM1063 318l31 -34q14 -15 23 -15t20.5 3.5t17.5 3.5q-15 4 -42 17q-12 28 -9 47q-16 -8 -41 -22zM467 879h31q5 -8 13 -7q-3 3 -3 9 q-16 3 -41 19v-21zM437 912q0 3 4 -10q7 17 29 36q-7 -1 -20 -10t-13 -16zM1179 188q-2 3 -4 3t-13 -9q3 -3 3 -9h13q1 5 5 12q3 1 7 4l3 12l-12 3q1 -5 -2 -16zM1125 228q-4 16 -12 32q2 3 10 3q-12 6 -21 6q9 -13 23 -41zM1186 152l16 3v14q-10 5 -16 6l-5 -9q0 3 5 -14z M464 865q2 -4 24 -4t22 -3t4 -3t7 4l-3 9q-20 1 -54 -3zM1129 220v7h-4v-7h4zM617 717l7 18q0 6 -7 18q-12 -12 -12 -17q0 5 12 -19zM1136 200q15 -14 14.5 -14t11.5 3v12q-24 1 -26 -1zM521 851q-13 -2 -54 0l-3 -14h41q1 3 4 8q4 -8 9 -8zM1159 157q5 10 0 21 q-4 -2 -17 -9v-11q1 -1 17 -1zM473 811l32 6q1 2 4 7l6 -5q6 0 6 3v9h-55q-2 -16 -2 -17zM374 771l21 -61q0 -3 -9 -20q-15 -28 -15 -40t4.5 -22t13.5 -23.5t9 -17t-14.5 -24.5t-14.5 -23q0 -27 61 -76q33 -27 58 -36.5t50 -16.5q17 -1 46 -5l-155 -107q19 0 23 3l287 188 q72 46 78.5 46t29.5 -7l-36 -173h17l28 136l2 -28q-7 -42 -11 -108h21q0 56 13 162l134 -34q1 4 3 10q-195 64 -332 69q-13 28 -42 77q-73 97 -270 181v-50zM1345 -189q0 -77 71.5 -77t71.5 77t-71.5 77t-71.5 -77zM1094 240l-31 -2q-18 0 -37 4q21 3 59 3q-10 0 -12 2 q10 3 26 13q-27 33 -43 49l-64 -44q0 -25 -9 -104q-6 -33 -35.5 -93.5t-42 -92.5t-13 -68.5t-16.5 -60.5h399v493l-99 48v-66q0 -18 -7 -31q-42 13 -54 10q5 -5 6 -9q22 -4 46 -13q1 3 2 5q3 -9 -3 -19l-13 8h-9q0 -8 1 -7q-19 -2 -27 -7q16 -12 30 -12q35 0 40 47 q11 -13 11 -27q0 -36 -43 -36q-13 0 -27 5q9 -15 13 -25l13 2q6 0 12 -8q0 9 5 18q2 -7 2 -23q5 10 12 10q13 0 13 -9t-5 -13q11 0 21 -5q-6 -3 -18 -2q10 -7 10 -20t-13 -13q-4 0 -13 4q-1 5 -3 9q-2 -7 -6 -19q-6 11 -6 16q2 -10 -18 -10q-14 0 -14 17q0 10 13 15 q-14 0 -19 3q10 3 19 2q-11 -2 -14.5 5.5t0.5 16.5q-17 16 -24 40q-25 -18 -33 -18h-64v11q3 15 25 15t33 -4q-12 -3 -49 -2q0 -9 -3 -12l56 -3q13 0 20 7zM471 299l44 -6q3 0 53 11q107 23 181 26q17 2 53 4q57 3 70 3h4l147 -28q11 0 16 9q-25 9 -51 16q-16 1 -50 6 t-138.5 5t-328.5 -46zM599 236q33 -8 44 -8t22.5 11.5t23.5 11.5t24 -8t24.5 -8t19.5 9.5t25 9.5t29.5 -8t15 -8t18 8t32 8t26 -7t22.5 -17l34 31q-63 11 -137 11l-163 -11q-24 -6 -69 -13q6 -7 9 -12zM774 186q23 0 53 -37l57 46l-92 9q-53 0 -158 -19q7 -19 14 -54 q67 55 126 55zM647 111q3 -27 3.5 -55t5.5 -53q21 -54 42 -80q6 -8 47 -27t46 -48q9 30 44.5 52t35.5 61q0 77 -24.5 133.5t-47.5 76.5q-7 7 -26.5 7t-34.5 -5.5t-53 -29t-38 -32.5zM883 -130v31q-17 -26 -30 -52h20q10 29 10 21zM862 -92l-35 -23q-21 -16 -18 -37q4 2 11 6 zM642 55q0 86 -42 151q-53 82 -151 82q-4 0 -14 -1.5t-13 -1.5q3 -15 21.5 -16.5t34.5 -2.5q32 -8 50 -15.5t35 -30.5q45 -60 45 -121q0 -13 -1 -15q-8 20 -9 33q-5 48 -50 97q-40 42 -85 42q-6 0 -13 -1q19 -14 56 -35q33 -11 45 -32.5t22 -55.5q0 -6 2 -14q29 -34 67 -92 v29zM773 -151v17q0 8 -30.5 24.5t-36.5 20.5q0 -14 28 -32.5t29 -29.5h10zM747 -151v9l-31 19q0 -26 31 -28zM684 -154v9q-23 52 -48 84q-61 79 -102.5 110.5t-38 31.5t-37.5 -27q32 -45 32 -102t-24 -106h160q-22 38 -46 56q-1 -16 -9 -43q-6 19 -11 55q-23 -23 -66 -60 l-4 4q2 11 29 37t28 28q-30 9 -49 21q11 3 49 -1v9q-22 67 -81 96l17 2q35 -17 64.5 -53t29.5 -66q19 -9 37 -23q42 -34 42 -62h28zM500 131q0 17 -144 125v-410h91q27 52 27 110t-32 97q58 45 58 78zM852 1228q7 0 15 -0.5t19.5 0.5t33.5 1q1 -5 6 -9q-12 2 -37 4t-37 4z M934 1175q-15 -8 -25.5 -8t-45.5 13q3 6 42 19l-13 7h17q8 0 25 -17v-14zM885 1114l-4 -10l-3 1l3 9h4zM837 1181q0 -22 -14 -57v-11q3 0 7 -4l14 8q4 0 13.5 -7t13.5 -8q-15 -1 -25 2q-3 -7 1 -16l-31 22q2 18 13 60q2 -1 -18 -1t-43 11v20q17 8 23 8h19l-23 -6 q13 -1 42 -5q-9 24 -24 25.5t-31 2.5q13 7 25 7q38 0 38 -51zM811 1064l30 -2q5 0 42 8v-21q-23 8 -37 8t-32 -3q-3 3 -3 10zM868 1040q-12 -7 -18.5 -7t-20.5 7q18 -3 39 0zM862 1019l-25 3v4l25 -2v-5zM1247.5 434.5q1.5 -6.5 1.5 -15t-6 -32.5q-20 4 -63 28l-51 28v302 q18 -5 69 -37.5t51 -58t-23 -51.5q23 -32 23 -55.5t-10.5 -48t-10.5 -17.5q0 -2 9 -19t10.5 -23.5zM1089 665l-63 -71l-48 68l63 73zM635 1155q-74 -96 -112 -160q-26 46 -116 157q64 64 117 153q34 -51 111 -150zM920 625q-2 0 -26 6.5t-42 7.5l96 64q-1 -17 -1 -36.5 t1 -41.5h-28zM861 495h-4v9h4v-9zM685 552h34q-3 0 -3 -1q0 -2 63 -11l-93 -67l-5 4q4 59 4 75zM1222 12q-65 -64 -117 -153q-35 51 -112 150q75 96 112 160q26 -46 117 -157zM650 502l-63 -73l-48 70l63 71zM385 661l21 47q0 2 -8 18q-13 24 -13 42t6 30h8q8 0 108 -58 v-300h-10l-25 14q-87 50 -87 80q0 16 21 53l-21 42v32zM792 145h-21v5h21v-5zM766 129q14 7 19.5 7t19.5 -7q-17 4 -39 0zM776 112q42 0 45 -1q-5 -2 -11 -6q-13 5 -33 1t-27 2v15q16 -11 26 -11zM779 55q-5 10 -13.5 10t-14.5 -10q-1 5 3.5 10.5t16 5.5t23.5 -9l3 -7h-18z M858 -59l-29 -4q-32 0 -32 64q0 11 13 58q-23 25 -23 22q9 -3 31 -19q-4 -21 -13 -63l29 4q12 0 29 -12v-19q-10 -5 -37 -10q8 0 13 3q-2 5 -31 8q1 -10 17 -25q12 1 33 -7zM698 -3q17 6 29.5 6t40.5 -11q0 -5 -39 -22q2 -3 13 -3q-39 -6 -44 30zM779 -60l-26 2l-20 -2 q-14 0 -22 12q4 -1 14 -4q18 0 51 -2zM928 1178v12l-10 -12h10zM889 1190q-6 0 -18 -7q8 -2 22 -7q-4 2 -4 14zM827 1177v13h-5v-13h5zM792 1178q-7 7 -8 14q-3 -4 -8 -12zM1059 663l-22 33l-28 -33l22 -31zM925 638l6 19q0 5 -6 18q-12 -12 -12 -17q0 4 12 -20zM712 507 l6 19q0 3 -6 15q-12 -12 -12 -14q0 5 12 -20zM619 501l-22 31l-28 -31l22 -33zM853 -20v9h-4v-9h4zM849 -32v4h-7v-4h7zM806 -6q3 0 3 -12q3 5 9 12h-12zM763 -12q-8 3 -20 9l2 -15q7 0 18 6zM706 -6v-12q3 5 10 12h-10zM726 -30v5h-10v-5h10z" />
+<glyph unicode="&#x1f0ce;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM302 1252h-82v25h22l-64 81l66 71h-24v26h80v-26h-22l-62 -71 l64 -81h22v-25zM203 1429h-25v-152h23v-25h-80v25h25v152h-25v26h82v-26zM1490 63l-74 -100l-75 100l75 100zM1284 -166h-940v1496h940v-1496zM287 1101l-75 -100l-74 100l74 100zM1507 -291h-82v26h25v152h-23v25h80v-25h-25v-152h25v-26zM1408 -265v-26h-80v26h22l62 71 l-64 81h-22v25h82v-25h-22l64 -81l-66 -71h24zM1114 1237q-7 -51 -7 -58.5t3.5 -39.5t3.5 -47q6 44 59 57v30q-63 30 -59 58zM1234 1228q0 5 -10 14l-3 -367q2 -7 7 -12zM1112 1056q-13 44 -13 95t13 131q-42 -68 -42 -129t42 -107v10zM1192 874v368q-8 -10 -8 -14l-3 -348 q4 -2 11 -6zM1047 1170l21 -143q0 -76 -42 -108l133 -37h15v256h-16q-40 -36 -40 -67q0 -3 4 -22.5t5 -25.5q-62 60 -62 145q0 34 19 77.5t45 57.5q-11 -34 -11 -47.5t17.5 -36t37.5 -23.5q0 30 3 37q15 28 33 28q2 0 29 -23v-377q2 0 36 -8v465h-169q-58 -96 -58 -148z M886 1292l12 3q4 0 4 -6q-3 -3 -11 -3q24 -17 43.5 -17t30.5 5q-2 5 -8 11q8 5 24 5q-12 0 18 -10q-2 -3 -8 -8q6 -5 6 -8q34 -6 47 -6t18 1l32 59h-424q4 -23 20 -23q-5 11 -3 16q-3 0 10 -6l8 8q2 -2 2 -10q9 2 10 0q-1 -6 -5 -7q27 -6 35.5 -6t27.5 5q-2 7 -6 11h14l5 5 h6q5 -3 15 -10q0 -3 -5 -8q23 -11 31 -11t17 1.5t12 1.5q-6 10 -3 15q9 2 25 1v-9zM724 1274l-19 10h-17q7 -10 17 -28l192 -28q20 -3 41 -5.5t52.5 -8.5t34.5 -5h13q4 12 14 36q-28 -5 -36 -5t-24 10.5t-18 10.5l-40 -11q-18 0 -24.5 3t-18.5 12t-15 9l-40 -11 q-13 0 -29 9.5t-19 9.5l-46 -8h-18zM870 944l30 11q6 0 4 -2q-9 -6 -26 -15q13 -7 22.5 -7t33.5 16l4 -4q-6 -5 -17 -13h2q73 0 73 81q0 32 -18 86q-1 7 3 9q1 -2 4 -7q25 -92 25 -104.5t-16.5 -39t-39.5 -34.5h14q13 -1 28 13q30 29 30 99q0 15 -1 32v2q14 -25 14 -52 q0 -55 -36 -88q59 20 59 94q0 -3 -29 135h-20v-22q3 -12 3 -38q-9 10 -13 36.5t-4 28.5h-29q17 -15 2 -36q-4 14 -10 41q-16 0 -28 3q1 -6 -7 -10q1 11 -10 13l-20 5v-30l36 -133q0 -23 -9 -38v40q-8 42 -18 66l-17 44q0 22 -4 53h-33v-42q0 7 27 -90q1 -3 1 -26 q0 -43 -27 -43q-17 0 -17 17q0 3 6 9q5 -16 16 -21q12 12 12 15q0 19 -16 19q-34 0 -34 -26q0 -47 50 -47zM1151 657q2 22 -8 36q-9 5 -19 15q-2 18 -10 50q-15 11 -35 36q0 15 -7 40q-12 8 -28 23q-12 18 -17 53l2 -53q19 -14 40 -48q1 -12 5 -34q32 -7 39 -71 q19 -12 38 -47zM681 916q-9 0 -29 -6l-14 2q23 -10 38 -10q48 0 92 63q2 -15 -23 -39.5t-37 -28.5t-25 -9q13 -7 32 -7t43 14q46 26 55 69q2 21 4.5 40t26 19t31.5 -13v8q-2 17 -21 72q-16 48 -16 83v11l-113 19q-8 0 -10 -3q-8 -28 -23 -76q-13 -22 -33 -61q10 -5 20 -9 q13 -7 13 -16t-1 -15q31 -10 31 -25q0 -6 -4 -9q-11 18 -16 18h-8l-12 -46q-10 -22 -36 -22q-8 0 -22 12v10q10 9 16.5 9t7.5 -1v-7l-13 3q-2 -12 -2 -15l17 -6q21 0 14 31q-20 14 -29 14q-26 0 -26 -26q0 -40 41 -40t81 42q1 -2 1 -4q0 -16 -51 -45zM741 883h12q68 5 90 55 l-22 22q-7 -27 -32 -52t-48 -25zM1250 657l-11 35q0 9 12.5 9t21.5 -10q0 17 -3 36q-24 -5 -36 -14q-126 -100 -174 -349q6 2 17.5 7t16.5 7q-2 0 -16 13q1 13 20 13t22 11l-29 30q4 4 3 11q28 4 42 9q-3 4 -16 13.5t-13 20.5t23 11l14 -3q5 0 11 6v9q-24 22 -24 29 q0 17 50 17v9l-21 21q11 17 16 17h34q-10 32 -10 35q0 12 10 12l31 -11q3 0 9 6zM954 692l7 -76q9 -154 87 -328q-1 14 -25 80q-1 8 -4 21q-57 146 -57 309q0 50 19 132q2 2 6 5l119 -233l4 11q-19 43 -59 127q-18 28 -35 57.5t-17 62.5t16 52q-12 1 -36.5 -63.5 t-24.5 -156.5zM1102 591l-115 230l-17 -94v-6q0 -25 6 -121q6 -111 59 -234q17 122 67 225zM572 897l44 17l-15 45q0 32 35 32t35 -26q0 -5 -1 -10q9 10 13 48q5 6 5 15t-7 17q-13 11 -33 31q13 17 19.5 28t22.5 57.5t16 53.5t-53 113h-292v-507q27 5 38 11v165q31 21 70 23 l62 -108q7 17 23 48q9 15 19 15t12 -1q-4 -23 -13 -67zM581 950v10h-5v-10h5zM741 664v-10h158v-197q0 -20 16 -145q4 -2 9 -6l-17 263q0 197 63 333h-10q-27 -57 -39.5 -117t-23.5 -121h-156zM568 952q-17 -12 -32 -58h-7l-58 107h-13l11 -8q-1 -1 -4 -8q1 -8 10.5 -41 t7.5 -47l-30 104h-10l-3 -12q6 0 8 -2q-3 -2 -4 -5q17 -77 17 -84.5t-6 -8.5l-18 105q-1 0 -18 -3q4 -4 10 -9q0 -107 -2 -108q-6 33 -11 114q-5 -1 -11 -2v-162q57 23 155 66q14 35 14 42t-3 12.5t-3 7.5zM1069 289q-12 -19 -12 -29t2 -19.5t2 -12.5q12 10 18 31.5t16 28.5 q19 -23 66 -118q3 2 7 3v12q-9 0 -11 2q2 1 7 3q-5 35 -20 88q3 3 4 2q20 -69 32 -105l6 9v24q-10 35 -14 80l23 -105q6 3 7 8q-6 -1 -8 1q3 1 7 5q-2 34 -5 102q1 3 5 4l2 -2q9 -70 9 -110q3 0 9 3q-2 3 -4 9q2 2 4 8l2 139zM854 589q-19 28 -44 57l-43 -59l46 -59z M732 519v171v6q0 44 -25 172v-22q1 9 4 -26q14 -174 14 -243q0 -145 -60 -302q26 46 41 111l29 127q149 0 153 6h-156zM1055 225v18h-4v-18h4zM1265 -151v522q-14 -6 -33 -11q-5 -109 -9 -170q-30 -20 -66 -23q-35 69 -62 110l-14 -35q-13 -25 -30 -25q-5 0 -7 2 q1 10 5 32.5t5 33.5q-25 -6 -44 -22q13 -15 13 -38q0 -39 -33 -39q-21 0 -30 20q-1 7 -4 19q-9 -8 -11 -31t-9 -28q10 -7 12.5 -18t4.5 -19q25 -17 25 -20t-19.5 -32t-21.5 -36q-3 -28 -20 -74l64 -118h284zM643 366q16 93 16 130q0 83 -38 230q-10 29 -27 85 q-39 -166 -53 -195t-14 -31v1q3 0 42 -74zM655 325q0 1 11 46.5t11 119.5t-5 103l-12 72q-13 59 -73 226h-10l60 -185q32 -115 32 -221t-22 -146l-123 233q-4 -1 -8 -4l124 -247q-7 -16 -31 -57h9q5 1 11 5q9 18 26 55zM886 298h-16q-10 1 -23 -3q-38 -13 -62 -53l26 -25 q5 23 31.5 50t43.5 31zM417 515l-32 8q0 -50 -13 -50q-5 0 -13 8q0 -5 -1.5 -18.5t-1.5 -17.5q137 76 193 294q6 24 17 74l-34 -11q13 -13 13 -17q0 -15 -13.5 -16.5t-25.5 -3.5q3 -6 14.5 -14t11.5 -19.5t-14.5 -14.5t-27.5 -5q26 -24 26 -35t-12 -11q-30 -2 -33 -8l15 -15 q9 -9 9 -18q0 -16 -16 -16l-28 3q-1 -4 -3 -7q16 -20 16 -29t-2 -11h-40l6 -43q-5 -7 -11 -7zM968 197l21 -9q29 0 29 37q0 31 -42.5 31t-77.5 -39v3q26 49 75 49q9 0 18 -1q-30 7 -43.5 7t-51.5 -19q-3 19 53 33q-12 4 -26 4q-73 0 -105 -69q-3 -20 -5 -40q-8 -32 -35 -32 q-17 0 -20 11v-6q0 -27 16 -75q15 -43 15 -74q0 -7 -1 -13l115 -21q17 0 21 51q0 8 2 20l44 67q-37 8 -33 39q-4 7 -17 12.5t-13 13t2 9.5q17 -16 15 -16h9q2 19 5 38t26 29q2 1 16 2.5t22 -10.5v-13q-10 -9 -15.5 -9t-8.5 5q5 1 13 6v12l-13 3q-7 0 -13 -6q3 -12 3 -30z M472 509q0 -9 15.5 -25.5t17.5 -22.5q0 -16 4 -39q14 -10 33 -31q1 -17 10 -45q11 -8 30 -26q9 -13 15 -48l4 20q-2 12 -7 32q-18 17 -40 47q0 12 -5 31q-8 5 -19 13q-18 19 -20 60q-7 4 -17 11q-12 11 -21 35v-12zM777 20l-34 128q0 51 31 51q17 0 17 -15q0 -7 -3 -9 q-1 5 -6 16h-20q-3 -8 -3 -18q12 -11 21 -11q29 0 29 32q0 36 -41 36l-43 -10q-2 0 -8 6q15 11 34 16l-22 4q-11 0 -32 -16q-7 14 -7 15t27 11h-35q-10 1 -31 -22t-21 -60t11.5 -69.5t11.5 -37.5t-2 -7q-32 53 -32 131q0 14 26 48q12 14 26 19q-32 -1 -51 -29.5t-19 -55.5 l11 -93v-2q-22 34 -22 89.5t36 88.5q-62 -26 -62 -91q0 -22 13 -73t14 -68q15 -3 25 -3v17l-3 20h7q5 -13 10 -39h23q0 17 2 20q3 0 5 -4q-1 -27 24 -27q8 0 12 3q0 12 2 15q7 -8 6 -18q13 0 28 -5v22q1 20 -11.5 50.5t-18.5 57.5t-6 20q0 10 8 44q2 2 6 2l4 -4 q-10 -21 -10 -36t14.5 -52t18.5 -52.5t4 -51.5q12 -3 36 0v17zM840 -94l47 10q12 0 29 -6q5 -5 16 -12l4 12q-5 8 -11 21l-318 51q-9 0 -14.5 -16t-7.5 -20q7 2 22.5 2t31 -9.5t13.5 -9.5l45 8q16 0 38.5 -9t16.5 -9l41 5q18 0 31 -9t16 -9zM957 -151v11q0 4 -9 15t-14 12 q2 -2 5 -8l-2 -1h-11q-3 -6 -9 -6q-3 2 -3 10l-11 -2q-6 0 -4.5 0t3.5 9q-2 9 -7 8h-42q7 -2 -1 -10l-6 3q8 0 -12 -10q-1 1 -5 9q-3 0 -8 3q1 13 -11 16t-25.5 3t-25.5 -4q12 -6 11 -9q-6 -2 -18 0q0 -10 -4 -11q-5 5 -5 13q-10 0 -14 -2v3q1 4 9 11q-3 2 -6 7q-47 2 -62 2 h-6q5 -11 6 -12t-16 2q-5 -11 -9 -11q-4 8 -2 13q-8 -1 -12 -5l-4 5q8 15 8 13q-3 1 -60 1l-29 -78h411zM508 120q0 16 -3 24t-1 10q65 -58 65 -142q0 -28 -1 -31q-26 -80 -65 -104l8 43q0 44 -60 61q0 -37 -2 -39q-5 -11 -34 -31l-31 31v377q-4 0 -26 5v-478h163 q1 2 31.5 72t29.5 100l-23 144q1 61 42 96l-147 40v-264q54 23 54 86zM445 300h-7l-6 -365q6 1 10 6zM512 -107q44 55 44 125t-39 113q18 -91 18 -115q0 -81 -23 -123zM394 313v-375q4 -3 11 -9v382zM522 -9l-4 95q-5 -10 -16 -29l-48 -37q0 -9 -4 -27q17 -9 37.5 -21.5 t27.5 -34.5q2 19 7 54zM945 1127q3 -14 15.5 -52.5t12.5 -72t-21 -55.5q13 25 13 47.5t-10 63.5l-18 73q3 -1 8 -4zM790 1151q-11 13 -35.5 17t-34.5 16q21 -4 62 -13q9 -6 8 -11v-9zM714 1158l23 3q4 0 24 -13.5t22 -16.5q-18 -4 -55 -14q-5 26 -14 41zM772 1031l-3 -11 h-27q-13 0 -41 20q11 -2 29 -7l30 -8q8 7 -1 15q13 0 13 -9zM697 1067l21 -13q6 0 11 11v-13q-9 -3 -10 -3t-42 18h20zM637 1155q-74 -96 -111 -160q-26 46 -117 157q64 64 117 153q34 -51 111 -150zM1032 515q-43 69 -43 71.5t49 75.5q32 -72 35 -72v1zM640 591l-46 -76 l-43 75l43 74q25 -32 46 -73zM1224 12q-64 -64 -117 -153q-34 51 -111 150q74 96 111 160q26 -46 117 -157zM860 214q-3 1 -3 6t12.5 17t17.5 14q-6 -9 -27 -37zM954 111l-37 9q-7 0 -12 -5q0 12 -2 13h15q2 0 36 -17zM859 148l3 9h35q10 0 33 -18q-21 7 -49 13h-12 q-2 -2 3 -13q-13 -1 -13 9zM887 60h19q2 -14 14 -38q-11 -2 -27 6t-23 7l29 -20q-18 6 -50 31q29 14 38 14zM695 37q-39 118 -39 128t11 29t19 23q0 -1 -14 -28q-1 -9 -5 -28l28 -99v-25zM772 1139l-28 15l-1 -3l28 -15zM767 1128q-6 5 -15 9q-1 -6 -3 -9h18zM746 1131v9 l-7 6q0 -9 -6 -21q9 2 13 6zM886 37q3 0 7 -3q0 12 8 20h-10q-1 -3 -5 -8v-9zM883 45q-1 7 -4 7q-5 -2 -12 -4q9 -4 13 -4q2 0 3 1z" />
+<glyph unicode="&#x1f0cf;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM394 1318q0 -43 -30.5 -73.5t-73.5 -30.5t-73.5 29.5t-30.5 72.5 t30.5 73.5t73.5 30.5t73.5 -29.5t30.5 -72.5zM1368 786l29 7q56 0 56 -56q0 -22 -17 -38.5t-39 -16.5q-56 0 -58 53q-114 50 -153 134q-17 36 -26 72t-16.5 36t-34 -19.5t-32.5 -27.5q18 -76 18 -120q0 -103 -65.5 -220t-65.5 -177t11 -75.5t64.5 -33.5t74.5 -35 q40 -31 40 -88q0 -30 -11 -48q26 -14 26 -39q0 -43 -43 -43q-36 0 -44 40q-34 -10 -58 -10q-53 0 -99.5 66.5t-73 66.5t-26.5 -17q0 -11 13.5 -40.5t13.5 -41.5q0 -47 -61 -74q-47 -21 -90 -21t-84 6q2 -37 -37 -37t-39 36q0 11 8 23q-55 43 -55 94q0 23 8 36q36 30 76 42.5 t40 25.5q0 22 -25 22l-61 -13q-41 0 -64 33q-6 -4 -15 -4q-40 0 -40 39t40 39q7 0 14 -3q28 40 81 40q22 0 67 -12t66.5 -12t20.5 10l-2 5q-32 4 -77 17q-49 40 -85 115.5t-36 138.5q0 17 8 45.5t8 38.5q0 70 -21 121q-87 48 -117 48q-16 0 -39 -40t-23 -50.5t9 -26t9 -29.5 t-16.5 -30t-35.5 -16q-50 0 -50 52q0 30 32 47q-4 19 -4 27q0 281 190 281q27 0 89 -20.5t90 -35.5q69 57 173 57q50 0 71 -10q9 2 50 31q64 45 179 45q209 0 217 -213q0 -42 9 -125q18 -72 38 -72zM1442 -152q0 -43 -30.5 -73.5t-73.5 -30.5t-73.5 29.5t-30.5 72.5 t30.5 73.5t73.5 30.5t73.5 -29.5t30.5 -72.5zM1440 737.5q0 42.5 -44 42.5t-44 -42.5t44 -42.5t44 42.5zM1254 1135q-43 48 -153 48t-218 -80v-5q0 -72 47 -140q146 89 192 89q71 0 98 -72l-1 -11l-23 40q-27 39 -72.5 39t-187.5 -91q62 -36 84 -36t66 39t54.5 39t13.5 -2 q13 -27 17 -43l7 -27q1 -3 16 -36q34 -78 148 -134l14 22q-26 22 -34 50t-14.5 133.5t-27.5 138.5q-3 4 -8 12t-18 27zM796 416l5 -46q0 -8 -5 -13h30q11 0 65 21.5t58 27.5q3 84 25 121q69 116 77 133q30 67 30 150q0 17 -16 111q-4 -2 -18.5 -11.5t-21.5 -9.5 q-113 12 -141 104q-9 31 -15 90q-33 20 -61 20t-35 -3q-61 -35 -94 -159q24 5 59 5q124 0 211 -57l12 -88q5 -39 5 -117t-10 -111q-23 -74 -104 -147q-3 -2 -56 -21zM372 1345h-63l-19 59l-19 -59h-64l51 -38l-20 -60l52 38l52 -38l-21 60zM589 848l90 -14q22 0 68.5 17.5 t75.5 17.5q57 0 128 -76q-4 33 -13 99q-80 52 -206.5 52t-186.5 -53l-27 -26l12 -46q16 29 59 29zM871 762q0 50 -58 50q-30 0 -60 -29q8 1 16 1q45 0 102 -24v2zM825 745q0 -18 -24 -18q-28 0 -28 34q0 9 4 15h-24v-10q0 -10 13.5 -26t24.5 -16h14q44 0 65 29q-17 6 -51 17 q6 -16 6 -25zM627 1060q-97 -70 -130 -181q18 23 45.5 71.5t84.5 109.5zM635 765q-8 -2 -16 1q7 -8 7 -27q4 4 9 26zM640 767q-3 32 -38.5 32t-51.5 -46q28 20 52 20t38 -6zM579 718q20 0 32 6q-16 -2 -24.5 8t-5.5 17.5t3 8.5q-17 -4 -36 -13q3 -27 31 -27zM951 710v29 q-63 -80 -151 -80q-37 0 -82.5 15t-57 15t-15.5 -1q0 -6 2 -13l5 -26q-21 14 -30 26q-30 -16 -52 -16q-42 0 -51 30q-4 -15 -4 -28q0 -87 55 -165l27 -39q7 -11 30 -35q11 -12 61 -12q2 0 26.5 4.5t51.5 7.5q55 5 106 57.5t65 100.5t14 130zM1156 94q0 30 -30 30t-30 -30 q0 -27 30 -27t30 27zM1421 -181l-51 38l20 60l-52 -38l-52 38l21 -60l-51 -38h63l19 -59l19 59h64zM323 773.5q0 36.5 -38 36.5t-38 -36.5t38 -36.5t38 36.5zM839 116l-27 79q0 34 37 34t83 -67.5t87 -67.5t80.5 28.5t39.5 63t-17 55.5q-26 33 -141 70q-32 35 -32 73v6 l-74 -30q-38 -15 -75 -15t-63 9.5t-28 12.5q1 1 1 0l-40 -5l-122 23q-57 0 -63 -38q11 -22 0 -41q0 -38 52 -38l55 13q39 0 39 -34q0 -20 -53 -41.5t-62 -31.5t-9 -38.5t23 -55.5t58 -28q50 -19 114 -19t100.5 28.5t36.5 54.5zM479 323q0 26 -25.5 26t-25.5 -26t25.5 -26 t25.5 26zM604 25q0 23 -24 23t-24 -23t24 -23t24 23zM567 892h12q-14 -13 -23 -14q6 14 11 14zM643 614l128 -17q30 0 72 10l5 6h16v-13q-11 -10 -35 -42q-75 -96 -153 -96q-57 0 -57 41q0 14 18 38q-41 42 -41 51q0 22 47 22zM553 641q-12 -6 -12 -23t9 -37 q-14 21 -14 36.5t17 23.5zM262 776l-3 11q5 10 16 14q0 -3 -6.5 -11.5t-6.5 -13.5zM753 583l-103 8q-8 0 -24 -7v-12q0 -26 47 -32q-10 -1 -19 -3q-17 -3 -17 -26v-2q13 -16 39 -16q82 0 164 103h-8q-30 -13 -79 -13z" />
+<glyph unicode="&#x1f0d0;" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="&#x1f0d1;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM321 1252h-79v25h24l-16 46h-74l-16 -46h24v-25h-79v25h25 l54 155h-24v23h106v-23h-24l54 -155h25v-25zM1456 110q41 0 41 -38.5t-41 -38.5q-3 0 -23 10q21 -32 21 -37q0 -39 -38 -39t-38 39q0 7 20 37q-20 -10 -23 -10q-40 0 -40 38.5t40 38.5q29 0 36 -29v18q0 40 -19 70q8 -3 24 -3t24 3q-19 -30 -19 -70v-18q7 29 35 29zM956 581 q0 -26 -22.5 -46.5t-48.5 -20.5q-49 0 -62 52v-31q0 -69 34 -123q-13 5 -43 5t-43 -5q34 54 34 123v31q-13 -52 -62 -52q-26 0 -48.5 20.5t-22.5 46.5q0 68 71 68q9 0 41 -16l-24 29q-12 14 -12 34q0 70 66 70t66 -70q0 -20 -12 -34l-24 -29q32 16 41 16q71 0 71 -68z M253 1131q40 0 40 -38.5t-40 -38.5q-29 0 -36 29v-18q0 -40 19 -70q-8 3 -24 3t-24 -3q19 30 19 70v18q-7 -29 -35 -29q-41 0 -41 38.5t41 38.5q3 0 23 -10q-21 32 -21 37q0 39 38 39t38 -39q0 -7 -20 -37q20 10 23 10zM1523 -113h-25l-54 -155h24v-23h-106v23h24l-54 155 h-25v25h79v-25h-24l16 -46h74l16 46h-24v25h79v-25zM243 1347l-28 85h-4l-28 -85h60zM1445 -183h-60l28 -85h4z" />
+<glyph unicode="&#x1f0d2;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM956 1145q0 -26 -22.5 -46.5t-48.5 -20.5q-49 0 -62 52v-31 q0 -69 34 -123q-13 5 -43 5t-43 -5q34 54 34 123v31q-13 -52 -62 -52q-26 0 -48.5 20.5t-22.5 46.5q0 69 71 69q7 0 41 -17l-24 29q-12 14 -12 34q0 70 66 70t66 -70q0 -20 -12 -34l-24 -29q34 17 41 17q71 0 71 -69zM146 1252q0 20 10 45t44 50t40.5 34.5t6.5 19.5 q0 33 -33 33q-36 0 -36 -48v-8h-27v9q0 71 61 71q64 0 64 -55q0 -17 -9 -29t-48.5 -43t-42.5 -53h76l1 46h24l-1 -72h-130zM1456 110q41 0 41 -38.5t-41 -38.5q-3 0 -23 10q21 -32 21 -37q0 -39 -38 -39t-38 39q0 7 20 37q-20 -10 -23 -10q-40 0 -40 38.5t40 38.5 q29 0 36 -29v18q0 40 -19 70q8 -3 24 -3t24 3q-19 -30 -19 -70v-18q7 29 35 29zM253 1131q40 0 40 -38.5t-40 -38.5q-29 0 -36 29v-18q0 -40 19 -70q-8 3 -24 3t-24 -3q19 30 19 70v18q-7 -29 -35 -29q-41 0 -41 38.5t41 38.5q3 0 23 -10q-21 32 -21 37q0 39 38 39t38 -39 q0 -7 -20 -37q20 10 23 10zM1482 -88q0 -20 -10 -45t-44 -50t-40.5 -34.5t-6.5 -19.5q0 -33 33 -33q36 0 36 48v8h27v-9q0 -71 -61 -71q-64 0 -64 55q0 17 9 29t48.5 43t42.5 53h-76l-1 -46h-24l1 72h130zM956 19q0 -69 -71 -69q-7 0 -41 17l24 -29q12 -15 12 -35 q0 -69 -66 -69t-66 69q0 20 12 35l24 29q-34 -17 -41 -17q-71 0 -71 69q0 26 22.5 46.5t48.5 20.5q49 0 62 -52v31q0 69 -34 123q13 -5 43 -5t43 5q-34 -54 -34 -123v-31q13 52 62 52q26 0 48.5 -20.5t22.5 -46.5z" />
+<glyph unicode="&#x1f0d3;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM956 1145q0 -26 -22.5 -46.5t-48.5 -20.5q-49 0 -62 52v-31 q0 -69 34 -123q-13 5 -43 5t-43 -5q34 54 34 123v31q-13 -52 -62 -52q-26 0 -48.5 20.5t-22.5 46.5q0 69 71 69q7 0 41 -17l-24 29q-12 14 -12 34q0 70 66 70t66 -70q0 -20 -12 -34l-24 -29q34 17 41 17q71 0 71 -69zM214 1272q39 0 39 37q0 36 -55 36h-5v25q51 0 51 32 t-30 32q-34 0 -35 -40h-28q0 34 17.5 49t42.5 15q61 0 61 -54q0 -33 -28 -46q38 -11 38 -44.5t-21 -49.5t-49 -16q-71 0 -71 72h28q1 -48 45 -48zM1456 110q41 0 41 -38.5t-41 -38.5q-3 0 -23 10q21 -32 21 -37q0 -39 -38 -39t-38 39q0 7 20 37q-20 -10 -23 -10 q-40 0 -40 38.5t40 38.5q29 0 36 -29v18q0 40 -19 70q8 -3 24 -3t24 3q-19 -30 -19 -70v-18q7 29 35 29zM956 581q0 -26 -22.5 -46.5t-48.5 -20.5q-49 0 -62 52v-31q0 -69 34 -123q-13 5 -43 5t-43 -5q34 54 34 123v31q-13 -52 -62 -52q-26 0 -48.5 20.5t-22.5 46.5 q0 68 71 68q9 0 41 -16l-24 29q-12 14 -12 34q0 70 66 70t66 -70q0 -20 -12 -34l-24 -29q32 16 41 16q71 0 71 -68zM253 1131q40 0 40 -38.5t-40 -38.5q-29 0 -36 29v-18q0 -40 19 -70q-8 3 -24 3t-24 -3q19 30 19 70v18q-7 -29 -35 -29q-41 0 -41 38.5t41 38.5q3 0 23 -10 q-21 32 -21 37q0 39 38 39t38 -39q0 -7 -20 -37q20 10 23 10zM1414 -108q-39 0 -39 -37q0 -36 55 -36h5v-25q-51 0 -51 -32t30 -32q34 0 35 40h28q0 -34 -17.5 -49t-42.5 -15q-61 0 -61 54q0 33 28 46q-38 11 -38 44.5t21 49.5t49 16q71 0 71 -72h-28q-1 48 -45 48zM956 19 q0 -69 -71 -69q-7 0 -41 17l24 -29q12 -15 12 -35q0 -69 -66 -69t-66 69q0 20 12 35l24 29q-34 -17 -41 -17q-71 0 -71 69q0 26 22.5 46.5t48.5 20.5q49 0 62 -52v31q0 69 -34 123q13 -5 43 -5t43 5q-34 -54 -34 -123v-31q13 52 62 52q26 0 48.5 -20.5t22.5 -46.5z" />
+<glyph unicode="&#x1f0d4;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM1282 1145q0 -26 -22.5 -46.5t-48.5 -20.5q-49 0 -62 52v-31 q0 -67 35 -123q-13 5 -43.5 5t-43.5 -5q35 56 35 123v31q-13 -52 -63 -52q-26 0 -48.5 20.5t-22.5 46.5q0 69 71 69q7 0 41 -17l-24 29q-12 14 -12 34q0 70 66 70t66 -70q0 -20 -12 -34l-23 -29q34 17 40 17q71 0 71 -69zM630 1145q0 -26 -22.5 -46.5t-48.5 -20.5 q-49 0 -62 52v-31q0 -69 34 -123q-13 5 -43 5t-43 -5q34 54 34 123v31q-13 -52 -62 -52q-26 0 -48.5 20.5t-22.5 46.5q0 69 71 69q6 0 40 -17l-23 29q-12 14 -12 34q0 70 66 70t66 -70q0 -20 -12 -34l-24 -29q34 17 41 17q71 0 71 -69zM282 1306h-33v-30h19v-24h-67v24h21 v30h-68l-13 23l85 127h23v-126h33v-24zM1456 110q41 0 41 -38.5t-41 -38.5q-3 0 -23 10q21 -32 21 -37q0 -39 -38 -39t-38 39q0 7 20 37q-20 -10 -23 -10q-40 0 -40 38.5t40 38.5q29 0 36 -29v18q0 40 -19 70q8 -3 24 -3t24 3q-19 -30 -19 -70v-18q7 29 35 29zM253 1131 q40 0 40 -38.5t-40 -38.5q-29 0 -36 29v-18q0 -40 19 -70q-8 3 -24 3t-24 -3q19 30 19 70v18q-7 -29 -35 -29q-41 0 -41 38.5t41 38.5q3 0 23 -10q-21 32 -21 37q0 39 38 39t38 -39q0 -7 -20 -37q20 10 23 10zM1379 -292v126h-33v24h33v30h-19v24h67v-24h-21v-30h68l13 -23 l-85 -127h-23zM1282 19q0 -69 -71 -69q-6 0 -40 17q12 -14 23.5 -29t11.5 -35q0 -69 -66 -69t-66 69q0 20 12 35l24 29q-34 -17 -41 -17q-71 0 -71 69q0 26 22.5 46.5t48.5 20.5q50 0 63 -52v31q0 67 -35 123q13 -5 43.5 -5t43.5 5q-35 -56 -35 -123v-31q13 52 62 52 q26 0 48.5 -20.5t22.5 -46.5zM630 19q0 -69 -71 -69q-7 0 -41 17l24 -29q12 -15 12 -35q0 -69 -66 -69t-66 69q0 20 11.5 35t23.5 29q-34 -17 -40 -17q-71 0 -71 69q0 26 22.5 46.5t48.5 20.5q49 0 62 -52v31q0 69 -34 123q13 -5 43 -5t43 5q-34 -54 -34 -123v-31 q13 52 62 52q26 0 48.5 -20.5t22.5 -46.5zM222 1330v80l-53 -80h53zM1406 -166v-80l53 80h-53z" />
+<glyph unicode="&#x1f0d5;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM1282 1145q0 -26 -22.5 -46.5t-48.5 -20.5q-49 0 -62 52v-31 q0 -67 35 -123q-13 5 -43.5 5t-43.5 -5q35 56 35 123v31q-13 -52 -63 -52q-26 0 -48.5 20.5t-22.5 46.5q0 69 71 69q7 0 41 -17l-24 29q-12 14 -12 34q0 70 66 70t66 -70q0 -20 -12 -34l-23 -29q34 17 40 17q71 0 71 -69zM630 1145q0 -26 -22.5 -46.5t-48.5 -20.5 q-49 0 -62 52v-31q0 -69 34 -123q-13 5 -43 5t-43 -5q34 54 34 123v31q-13 -52 -62 -52q-26 0 -48.5 20.5t-22.5 46.5q0 69 71 69q6 0 40 -17l-23 29q-12 14 -12 34q0 70 66 70t66 -70q0 -20 -12 -34l-24 -29q34 17 41 17q71 0 71 -69zM281 1316q0 -68 -70 -68q-64 0 -68 68 h26q5 -44 42 -44q41 0 41 43.5t-38 43.5q-25 0 -41 -24q-9 9 -20 14l7 106h109v-54h-25v27h-62l-5 -60q20 16 42 16q62 0 62 -68zM1456 110q41 0 41 -38.5t-41 -38.5q-3 0 -23 10q21 -32 21 -37q0 -39 -38 -39t-38 39q0 7 20 37q-20 -10 -23 -10q-40 0 -40 38.5t40 38.5 q29 0 36 -29v18q0 40 -19 70q8 -3 24 -3t24 3q-19 -30 -19 -70v-18q7 29 35 29zM956 581q0 -26 -22.5 -46.5t-48.5 -20.5q-49 0 -62 52v-31q0 -69 34 -123q-13 5 -43 5t-43 -5q34 54 34 123v31q-13 -52 -62 -52q-26 0 -48.5 20.5t-22.5 46.5q0 68 71 68q9 0 41 -16l-24 29 q-12 14 -12 34q0 70 66 70t66 -70q0 -20 -12 -34l-24 -29q32 16 41 16q71 0 71 -68zM253 1131q40 0 40 -38.5t-40 -38.5q-29 0 -36 29v-18q0 -40 19 -70q-8 3 -24 3t-24 -3q19 30 19 70v18q-7 -29 -35 -29q-41 0 -41 38.5t41 38.5q3 0 23 -10q-21 32 -21 37q0 39 38 39 t38 -39q0 -7 -20 -37q20 10 23 10zM1417 -108q-41 0 -41 -43.5t38 -43.5q25 0 41 24q9 -9 20 -14l-7 -106h-109v54h25v-27h62l5 60q-20 -16 -42 -16q-62 0 -62 68t70 68q64 0 68 -68h-26q-5 44 -42 44zM1282 19q0 -69 -71 -69q-6 0 -40 17q12 -14 23.5 -29t11.5 -35 q0 -69 -66 -69t-66 69q0 20 12 35l24 29q-34 -17 -41 -17q-71 0 -71 69q0 26 22.5 46.5t48.5 20.5q50 0 63 -52v31q0 67 -35 123q13 -5 43.5 -5t43.5 5q-35 -56 -35 -123v-31q13 52 62 52q26 0 48.5 -20.5t22.5 -46.5zM630 19q0 -69 -71 -69q-7 0 -41 17l24 -29 q12 -15 12 -35q0 -69 -66 -69t-66 69q0 20 11.5 35t23.5 29q-34 -17 -40 -17q-71 0 -71 69q0 26 22.5 46.5t48.5 20.5q49 0 62 -52v31q0 69 -34 123q13 -5 43 -5t43 5q-34 -54 -34 -123v-31q13 52 62 52q26 0 48.5 -20.5t22.5 -46.5z" />
+<glyph unicode="&#x1f0d6;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM1282 1145q0 -26 -22.5 -46.5t-48.5 -20.5q-49 0 -62 52v-31 q0 -67 35 -123q-13 5 -43.5 5t-43.5 -5q35 56 35 123v31q-13 -52 -63 -52q-26 0 -48.5 20.5t-22.5 46.5q0 69 71 69q7 0 41 -17l-24 29q-12 14 -12 34q0 70 66 70t66 -70q0 -20 -12 -34l-23 -29q34 17 40 17q71 0 71 -69zM1282 581q0 -26 -22.5 -46.5t-48.5 -20.5 q-49 0 -62 52v-31q0 -67 35 -123q-13 5 -43.5 5t-43.5 -5q35 56 35 123v31q-13 -52 -63 -52q-26 0 -48.5 20.5t-22.5 46.5q0 68 71 68q9 0 41 -16l-24 29q-12 14 -12 34q0 70 66 70t66 -70q0 -20 -12 -34l-23 -29q32 16 40 16q71 0 71 -68zM630 1145q0 -26 -22.5 -46.5 t-48.5 -20.5q-49 0 -62 52v-31q0 -69 34 -123q-13 5 -43 5t-43 -5q34 54 34 123v31q-13 -52 -62 -52q-26 0 -48.5 20.5t-22.5 46.5q0 69 71 69q6 0 40 -17l-23 29q-12 14 -12 34q0 70 66 70t66 -70q0 -20 -12 -34l-24 -29q34 17 41 17q71 0 71 -69zM221 1381q56 0 56 -66.5 t-61 -66.5q-32 0 -51 26t-19 78q0 106 71 106q57 0 59 -63h-26q-5 39 -35 39q-41 0 -42 -76q21 23 48 23zM1456 110q41 0 41 -38.5t-41 -38.5q-3 0 -23 10q21 -32 21 -37q0 -39 -38 -39t-38 39q0 7 20 37q-20 -10 -23 -10q-40 0 -40 38.5t40 38.5q29 0 36 -29v18 q0 40 -19 70q8 -3 24 -3t24 3q-19 -30 -19 -70v-18q7 29 35 29zM253 1131q40 0 40 -38.5t-40 -38.5q-29 0 -36 29v-18q0 -40 19 -70q-8 3 -24 3t-24 -3q19 30 19 70v18q-7 -29 -35 -29q-41 0 -41 38.5t41 38.5q3 0 23 -10q-21 32 -21 37q0 39 38 39t38 -39q0 -7 -20 -37 q20 10 23 10zM1482 -188q0 -106 -71 -106q-57 0 -59 63h26q5 -39 35 -39q41 0 42 76q-21 -23 -48 -23q-56 0 -56 66.5t61 66.5q32 0 51 -26t19 -78zM1282 19q0 -69 -71 -69q-6 0 -40 17q12 -14 23.5 -29t11.5 -35q0 -69 -66 -69t-66 69q0 20 12 35l24 29q-34 -17 -41 -17 q-71 0 -71 69q0 26 22.5 46.5t48.5 20.5q50 0 63 -52v31q0 67 -35 123q13 -5 43.5 -5t43.5 5q-35 -56 -35 -123v-31q13 52 62 52q26 0 48.5 -20.5t22.5 -46.5zM630 581q0 -26 -22.5 -46.5t-48.5 -20.5q-49 0 -62 52v-31q0 -69 34 -123q-13 5 -43 5t-43 -5q34 54 34 123v31 q-13 -52 -62 -52q-26 0 -48.5 20.5t-22.5 46.5q0 68 71 68q8 0 40 -16l-23 29q-12 14 -12 34q0 70 66 70t66 -70q0 -20 -12 -34l-24 -29q32 16 41 16q71 0 71 -68zM630 19q0 -69 -71 -69q-7 0 -41 17l24 -29q12 -15 12 -35q0 -69 -66 -69t-66 69q0 20 11.5 35t23.5 29 q-34 -17 -40 -17q-71 0 -71 69q0 26 22.5 46.5t48.5 20.5q49 0 62 -52v31q0 69 -34 123q13 -5 43 -5t43 5q-34 -54 -34 -123v-31q13 52 62 52q26 0 48.5 -20.5t22.5 -46.5zM215 1272q37 0 37 41t-35 41q-22 0 -43 -26q7 -56 41 -56zM1413 -108q-37 0 -37 -41t35 -41 q22 0 43 26q-7 56 -41 56z" />
+<glyph unicode="&#x1f0d7;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM1282 1145q0 -26 -22.5 -46.5t-48.5 -20.5q-49 0 -62 52v-31 q0 -67 35 -123q-13 5 -43.5 5t-43.5 -5q35 56 35 123v31q-13 -52 -63 -52q-26 0 -48.5 20.5t-22.5 46.5q0 69 71 69q7 0 41 -17l-24 29q-12 14 -12 34q0 70 66 70t66 -70q0 -20 -12 -34l-23 -29q34 17 40 17q71 0 71 -69zM1282 581q0 -26 -22.5 -46.5t-48.5 -20.5 q-49 0 -62 52v-31q0 -67 35 -123q-13 5 -43.5 5t-43.5 -5q35 56 35 123v31q-13 -52 -63 -52q-26 0 -48.5 20.5t-22.5 46.5q0 68 71 68q9 0 41 -16l-24 29q-12 14 -12 34q0 70 66 70t66 -70q0 -20 -12 -34l-23 -29q32 16 40 16q71 0 71 -68zM956 834q0 -26 -22.5 -46.5 t-48.5 -20.5q-49 0 -62 52v-30q0 -69 34 -123q-13 5 -43 5t-43 -5q34 54 34 123v30q-13 -52 -62 -52q-26 0 -48.5 20.5t-22.5 46.5q0 69 71 69q7 0 41 -17l-24 29q-12 15 -12 35q0 70 66 70t66 -70q0 -20 -12 -35l-24 -29q34 17 41 17q71 0 71 -69zM630 1145 q0 -26 -22.5 -46.5t-48.5 -20.5q-49 0 -62 52v-31q0 -69 34 -123q-13 5 -43 5t-43 -5q34 54 34 123v31q-13 -52 -62 -52q-26 0 -48.5 20.5t-22.5 46.5q0 69 71 69q6 0 40 -17l-23 29q-12 14 -12 34q0 70 66 70t66 -70q0 -20 -12 -34l-24 -29q34 17 41 17q71 0 71 -69z M220 1276h23v-24h-80v24h28q5 85 52 152h-70v-27h-24v54h127v-22q-56 -67 -56 -157zM1456 110q41 0 41 -38.5t-41 -38.5q-3 0 -23 10q21 -32 21 -37q0 -39 -38 -39t-38 39q0 7 20 37q-20 -10 -23 -10q-40 0 -40 38.5t40 38.5q29 0 36 -29v18q0 40 -19 70q8 -3 24 -3t24 3 q-19 -30 -19 -70v-18q7 29 35 29zM253 1131q40 0 40 -38.5t-40 -38.5q-29 0 -36 29v-18q0 -40 19 -70q-8 3 -24 3t-24 -3q19 30 19 70v18q-7 -29 -35 -29q-41 0 -41 38.5t41 38.5q3 0 23 -10q-21 32 -21 37q0 39 38 39t38 -39q0 -7 -20 -37q20 10 23 10zM1479 -291h-127v22 q56 67 56 157h-23v24h80v-24h-28q-5 -85 -52 -152h70v27h24v-54zM1282 19q0 -69 -71 -69q-6 0 -40 17q12 -14 23.5 -29t11.5 -35q0 -69 -66 -69t-66 69q0 20 12 35l24 29q-34 -17 -41 -17q-71 0 -71 69q0 26 22.5 46.5t48.5 20.5q50 0 63 -52v31q0 67 -35 123q13 -5 43.5 -5 t43.5 5q-35 -56 -35 -123v-31q13 52 62 52q26 0 48.5 -20.5t22.5 -46.5zM630 581q0 -26 -22.5 -46.5t-48.5 -20.5q-49 0 -62 52v-31q0 -69 34 -123q-13 5 -43 5t-43 -5q34 54 34 123v31q-13 -52 -62 -52q-26 0 -48.5 20.5t-22.5 46.5q0 68 71 68q8 0 40 -16l-23 29 q-12 14 -12 34q0 70 66 70t66 -70q0 -20 -12 -34l-24 -29q32 16 41 16q71 0 71 -68zM630 19q0 -69 -71 -69q-7 0 -41 17l24 -29q12 -15 12 -35q0 -69 -66 -69t-66 69q0 20 11.5 35t23.5 29q-34 -17 -40 -17q-71 0 -71 69q0 26 22.5 46.5t48.5 20.5q49 0 62 -52v31 q0 69 -34 123q13 -5 43 -5t43 5q-34 -54 -34 -123v-31q13 52 62 52q26 0 48.5 -20.5t22.5 -46.5z" />
+<glyph unicode="&#x1f0d8;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM1282 1145q0 -26 -22.5 -46.5t-48.5 -20.5q-49 0 -62 52v-31 q0 -67 35 -123q-13 5 -43.5 5t-43.5 -5q35 56 35 123v31q-13 -52 -63 -52q-26 0 -48.5 20.5t-22.5 46.5q0 69 71 69q7 0 41 -17l-24 29q-12 14 -12 34q0 70 66 70t66 -70q0 -20 -12 -34l-23 -29q34 17 40 17q71 0 71 -69zM1282 581q0 -26 -22.5 -46.5t-48.5 -20.5 q-49 0 -62 52v-31q0 -67 35 -123q-13 5 -43.5 5t-43.5 -5q35 56 35 123v31q-13 -52 -63 -52q-26 0 -48.5 20.5t-22.5 46.5q0 68 71 68q9 0 41 -16l-24 29q-12 14 -12 34q0 70 66 70t66 -70q0 -20 -12 -34l-23 -29q32 16 40 16q71 0 71 -68zM956 834q0 -26 -22.5 -46.5 t-48.5 -20.5q-49 0 -62 52v-30q0 -69 34 -123q-13 5 -43 5t-43 -5q34 54 34 123v30q-13 -52 -62 -52q-26 0 -48.5 20.5t-22.5 46.5q0 69 71 69q7 0 41 -17l-24 29q-12 15 -12 35q0 70 66 70t66 -70q0 -20 -12 -35l-24 -29q34 17 41 17q71 0 71 -69zM630 1145 q0 -26 -22.5 -46.5t-48.5 -20.5q-49 0 -62 52v-31q0 -69 34 -123q-13 5 -43 5t-43 -5q34 54 34 123v31q-13 -52 -62 -52q-26 0 -48.5 20.5t-22.5 46.5q0 69 71 69q6 0 40 -17l-23 29q-12 14 -12 34q0 70 66 70t66 -70q0 -20 -12 -34l-24 -29q34 17 41 17q71 0 71 -69z M282 1307q0 -59 -70.5 -59t-70.5 59q0 37 36 51q-29 17 -29 47q0 53 64 53t64 -53q0 -30 -29 -47q35 -14 35 -51zM1456 110q41 0 41 -38.5t-41 -38.5q-3 0 -23 10q21 -32 21 -37q0 -39 -38 -39t-38 39q0 7 20 37q-20 -10 -23 -10q-40 0 -40 38.5t40 38.5q29 0 36 -29v18 q0 40 -19 70q8 -3 24 -3t24 3q-19 -30 -19 -70v-18q7 29 35 29zM253 1131q40 0 40 -38.5t-40 -38.5q-29 0 -36 29v-18q0 -40 19 -70q-8 3 -24 3t-24 -3q19 30 19 70v18q-7 -29 -35 -29q-41 0 -41 38.5t41 38.5q3 0 23 -10q-21 32 -21 37q0 39 38 39t38 -39q0 -7 -20 -37 q20 10 23 10zM1487 -143q0 -37 -36 -51q29 -17 29 -47q0 -53 -64 -53t-64 53q0 30 29 47q-35 14 -35 51q0 59 70.5 59t70.5 -59zM1282 19q0 -69 -71 -69q-6 0 -40 17q12 -14 23.5 -29t11.5 -35q0 -69 -66 -69t-66 69q0 20 12 35l24 29q-34 -17 -41 -17q-71 0 -71 69 q0 26 22.5 46.5t48.5 20.5q50 0 63 -52v31q0 67 -35 123q13 -5 43.5 -5t43.5 5q-35 -56 -35 -123v-31q13 52 62 52q26 0 48.5 -20.5t22.5 -46.5zM956 344q0 -69 -71 -69q-7 0 -41 17l24 -29q12 -15 12 -35q0 -70 -66 -70t-66 70q0 20 12 35l24 29q-34 -17 -41 -17 q-71 0 -71 69q0 26 22.5 46.5t48.5 20.5q49 0 62 -52v30q0 69 -34 123q13 -5 43 -5t43 5q-34 -54 -34 -123v-30q13 52 62 52q26 0 48.5 -20.5t22.5 -46.5zM630 581q0 -26 -22.5 -46.5t-48.5 -20.5q-49 0 -62 52v-31q0 -69 34 -123q-13 5 -43 5t-43 -5q34 54 34 123v31 q-13 -52 -62 -52q-26 0 -48.5 20.5t-22.5 46.5q0 68 71 68q8 0 40 -16l-23 29q-12 14 -12 34q0 70 66 70t66 -70q0 -20 -12 -34l-24 -29q32 16 41 16q71 0 71 -68zM630 19q0 -69 -71 -69q-7 0 -41 17l24 -29q12 -15 12 -35q0 -69 -66 -69t-66 69q0 20 11.5 35t23.5 29 q-34 -17 -40 -17q-71 0 -71 69q0 26 22.5 46.5t48.5 20.5q49 0 62 -52v31q0 69 -34 123q13 -5 43 -5t43 5q-34 -54 -34 -123v-31q13 52 62 52q26 0 48.5 -20.5t22.5 -46.5zM249 1402q0 32 -37.5 32t-37.5 -32t37.5 -32t37.5 32zM253 1308.5q0 36.5 -41.5 36.5t-41.5 -36.5 t41.5 -36.5t41.5 36.5zM1458 -144.5q0 36.5 -41.5 36.5t-41.5 -36.5t41.5 -36.5t41.5 36.5zM1454 -238q0 32 -37.5 32t-37.5 -32t37.5 -32t37.5 32z" />
+<glyph unicode="&#x1f0d9;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM1282 1145q0 -26 -22.5 -46.5t-48.5 -20.5q-49 0 -62 52v-31 q0 -67 35 -123q-13 5 -43.5 5t-43.5 -5q35 56 35 123v31q-13 -52 -63 -52q-26 0 -48.5 20.5t-22.5 46.5q0 69 71 69q7 0 41 -17l-24 29q-12 14 -12 34q0 70 66 70t66 -70q0 -20 -12 -34l-23 -29q34 17 40 17q71 0 71 -69zM1282 765q0 -26 -22.5 -47t-48.5 -21q-49 0 -62 52 v-30q0 -67 35 -123q-13 5 -43.5 5t-43.5 -5q35 56 35 123v30q-13 -52 -63 -52q-26 0 -48.5 21t-22.5 47q0 68 71 68q9 0 41 -16l-24 29q-12 14 -12 34q0 70 66 70t66 -70q0 -20 -12 -34l-23 -29q32 16 40 16q71 0 71 -68zM630 1145q0 -26 -22.5 -46.5t-48.5 -20.5 q-49 0 -62 52v-31q0 -69 34 -123q-13 5 -43 5t-43 -5q34 54 34 123v31q-13 -52 -62 -52q-26 0 -48.5 20.5t-22.5 46.5q0 69 71 69q6 0 40 -17l-23 29q-12 14 -12 34q0 70 66 70t66 -70q0 -20 -12 -34l-24 -29q34 17 41 17q71 0 71 -69zM277 1354q0 -106 -71 -106 q-56 0 -58 63h25q5 -39 36 -39q40 0 41 76q-21 -23 -47 -23q-57 0 -57 66.5t61 66.5q32 0 51 -26t19 -78zM1282 399q0 -68 -71 -68q-8 0 -40 16l23 -29q12 -14 12 -34q0 -70 -66 -70t-66 70q0 20 12 34l24 29q-32 -16 -41 -16q-71 0 -71 68q0 26 22.5 47t48.5 21 q50 0 63 -52v30q0 67 -35 123q13 -5 43.5 -5t43.5 5q-35 -56 -35 -123v-30q13 52 62 52q26 0 48.5 -21t22.5 -47zM1456 110q41 0 41 -38.5t-41 -38.5q-3 0 -23 10q21 -32 21 -37q0 -39 -38 -39t-38 39q0 7 20 37q-20 -10 -23 -10q-40 0 -40 38.5t40 38.5q29 0 36 -29v18 q0 40 -19 70q8 -3 24 -3t24 3q-19 -30 -19 -70v-18q7 29 35 29zM956 581q0 -26 -22.5 -46.5t-48.5 -20.5q-49 0 -62 52v-31q0 -69 34 -123q-13 5 -43 5t-43 -5q34 54 34 123v31q-13 -52 -62 -52q-26 0 -48.5 20.5t-22.5 46.5q0 68 71 68q9 0 41 -16l-24 29q-12 14 -12 34 q0 70 66 70t66 -70q0 -20 -12 -34l-24 -29q32 16 41 16q71 0 71 -68zM253 1131q40 0 40 -38.5t-40 -38.5q-29 0 -36 29v-18q0 -40 19 -70q-8 3 -24 3t-24 -3q19 30 19 70v18q-7 -29 -35 -29q-41 0 -41 38.5t41 38.5q3 0 23 -10q-21 32 -21 37q0 39 38 39t38 -39 q0 -7 -20 -37q20 10 23 10zM630 765q0 -26 -22.5 -47t-48.5 -21q-49 0 -62 52v-30q0 -69 34 -123q-13 5 -43 5t-43 -5q34 54 34 123v30q-13 -52 -62 -52q-26 0 -48.5 21t-22.5 47q0 68 71 68q8 0 40 -16l-23 29q-12 14 -12 34q0 70 66 70t66 -70q0 -20 -12 -34l-24 -29 q32 16 41 16q71 0 71 -68zM1425 -161q57 0 57 -66.5t-61 -66.5q-32 0 -51 26t-19 78q0 106 71 106q56 0 58 -63h-25q-5 39 -36 39q-40 0 -41 -76q21 23 47 23zM1282 19q0 -69 -71 -69q-6 0 -40 17q12 -14 23.5 -29t11.5 -35q0 -69 -66 -69t-66 69q0 20 12 35l24 29 q-34 -17 -41 -17q-71 0 -71 69q0 26 22.5 46.5t48.5 20.5q50 0 63 -52v31q0 67 -35 123q13 -5 43.5 -5t43.5 5q-35 -56 -35 -123v-31q13 52 62 52q26 0 48.5 -20.5t22.5 -46.5zM630 399q0 -68 -71 -68q-9 0 -41 16l24 -29q12 -14 12 -34q0 -70 -66 -70t-66 70q0 20 12 34 l23 29q-32 -16 -40 -16q-71 0 -71 68q0 26 22.5 47t48.5 21q49 0 62 -52v30q0 69 -34 123q13 -5 43 -5t43 5q-34 -54 -34 -123v-30q13 52 62 52q26 0 48.5 -21t22.5 -47zM630 19q0 -69 -71 -69q-7 0 -41 17l24 -29q12 -15 12 -35q0 -69 -66 -69t-66 69q0 20 11.5 35t23.5 29 q-34 -17 -40 -17q-71 0 -71 69q0 26 22.5 46.5t48.5 20.5q49 0 62 -52v31q0 69 -34 123q13 -5 43 -5t43 5q-34 -54 -34 -123v-31q13 52 62 52q26 0 48.5 -20.5t22.5 -46.5zM209 1434q-37 0 -37 -41t34 -41q22 0 43 26q-6 56 -40 56zM1419 -270q37 0 37 41t-34 41 q-22 0 -43 -26q6 -56 40 -56z" />
+<glyph unicode="&#x1f0da;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM1282 1145q0 -26 -22.5 -46.5t-48.5 -20.5q-49 0 -62 52v-31 q0 -67 35 -123q-13 5 -43.5 5t-43.5 -5q35 56 35 123v31q-13 -52 -63 -52q-26 0 -48.5 20.5t-22.5 46.5q0 69 71 69q7 0 41 -17l-24 29q-12 14 -12 34q0 70 66 70t66 -70q0 -20 -12 -34l-23 -29q34 17 40 17q71 0 71 -69zM1282 765q0 -26 -22.5 -47t-48.5 -21q-49 0 -62 52 v-30q0 -67 35 -123q-13 5 -43.5 5t-43.5 -5q35 56 35 123v30q-13 -52 -63 -52q-26 0 -48.5 21t-22.5 47q0 68 71 68q9 0 41 -16l-24 29q-12 14 -12 34q0 70 66 70t66 -70q0 -20 -12 -34l-23 -29q32 16 40 16q71 0 71 -68zM956 961q0 -26 -22.5 -46.5t-48.5 -20.5 q-49 0 -62 52v-30q0 -69 34 -123q-13 5 -43 5t-43 -5q34 54 34 123v30q-13 -52 -62 -52q-26 0 -48.5 20.5t-22.5 46.5q0 69 71 69q7 0 41 -17l-24 29q-12 15 -12 35q0 69 66 69t66 -69q0 -20 -12 -35l-24 -29q34 17 41 17q71 0 71 -69zM630 1145q0 -26 -22.5 -46.5 t-48.5 -20.5q-49 0 -62 52v-31q0 -69 34 -123q-13 5 -43 5t-43 -5q34 54 34 123v31q-13 -52 -62 -52q-26 0 -48.5 20.5t-22.5 46.5q0 69 71 69q6 0 40 -17l-23 29q-12 14 -12 34q0 70 66 70t66 -70q0 -20 -12 -34l-24 -29q34 17 41 17q71 0 71 -69zM314 1353 q0 -105 -61.5 -105t-61.5 105t61.5 105t61.5 -105zM1282 399q0 -68 -71 -68q-8 0 -40 16l23 -29q12 -14 12 -34q0 -70 -66 -70t-66 70q0 20 12 34l24 29q-32 -16 -41 -16q-71 0 -71 68q0 26 22.5 47t48.5 21q50 0 63 -52v30q0 67 -35 123q13 -5 43.5 -5t43.5 5 q-35 -56 -35 -123v-30q13 52 62 52q26 0 48.5 -21t22.5 -47zM191 1252h-83v24h28v154h-28v25h56v-179h27v-24zM1456 110q41 0 41 -38.5t-41 -38.5q-3 0 -23 10q21 -32 21 -37q0 -39 -38 -39t-38 39q0 7 20 37q-20 -10 -23 -10q-40 0 -40 38.5t40 38.5q29 0 36 -29v18 q0 40 -19 70q8 -3 24 -3t24 3q-19 -30 -19 -70v-18q7 29 35 29zM253 1131q40 0 40 -38.5t-40 -38.5q-29 0 -36 29v-18q0 -40 19 -70q-8 3 -24 3t-24 -3q19 30 19 70v18q-7 -29 -35 -29q-41 0 -41 38.5t41 38.5q3 0 23 -10q-21 32 -21 37q0 39 38 39t38 -39q0 -7 -20 -37 q20 10 23 10zM1520 -291h-56v179h-27v24h83v-24h-28v-154h28v-25zM630 765q0 -26 -22.5 -47t-48.5 -21q-49 0 -62 52v-30q0 -69 34 -123q-13 5 -43 5t-43 -5q34 54 34 123v30q-13 -52 -62 -52q-26 0 -48.5 21t-22.5 47q0 68 71 68q8 0 40 -16l-23 29q-12 14 -12 34 q0 70 66 70t66 -70q0 -20 -12 -34l-24 -29q32 16 41 16q71 0 71 -68zM1437 -189q0 -105 -61.5 -105t-61.5 105t61.5 105t61.5 -105zM1282 19q0 -69 -71 -69q-6 0 -40 17q12 -14 23.5 -29t11.5 -35q0 -69 -66 -69t-66 69q0 20 12 35l24 29q-34 -17 -41 -17q-71 0 -71 69 q0 26 22.5 46.5t48.5 20.5q50 0 63 -52v31q0 67 -35 123q13 -5 43.5 -5t43.5 5q-35 -56 -35 -123v-31q13 52 62 52q26 0 48.5 -20.5t22.5 -46.5zM956 217q0 -69 -71 -69q-7 0 -41 17l24 -29q12 -15 12 -35q0 -69 -66 -69t-66 69q0 20 12 35l24 29q-34 -17 -41 -17 q-71 0 -71 69q0 26 22.5 46.5t48.5 20.5q49 0 62 -52v30q0 69 -34 123q13 -5 43 -5t43 5q-34 -54 -34 -123v-30q13 52 62 52q26 0 48.5 -20.5t22.5 -46.5zM630 399q0 -68 -71 -68q-9 0 -41 16l24 -29q12 -14 12 -34q0 -70 -66 -70t-66 70q0 20 12 34l23 29q-32 -16 -40 -16 q-71 0 -71 68q0 26 22.5 47t48.5 21q49 0 62 -52v30q0 69 -34 123q13 -5 43 -5t43 5q-34 -54 -34 -123v-30q13 52 62 52q26 0 48.5 -21t22.5 -47zM630 19q0 -69 -71 -69q-7 0 -41 17l24 -29q12 -15 12 -35q0 -69 -66 -69t-66 69q0 20 11.5 35t23.5 29q-34 -17 -40 -17 q-71 0 -71 69q0 26 22.5 46.5t48.5 20.5q49 0 62 -52v31q0 69 -34 123q13 -5 43 -5t43 5q-34 -54 -34 -123v-31q13 52 62 52q26 0 48.5 -20.5t22.5 -46.5zM285 1353q0 81 -32.5 81t-32.5 -81t32.5 -81t32.5 81zM1408 -189q0 81 -32.5 81t-32.5 -81t32.5 -81t32.5 81z" />
+<glyph unicode="&#x1f0db;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM285 1429h-28v-110q0 -80 -71 -80q-46 0 -56 48l26 9 q10 -31 33 -31q37 0 37 53v111h-41v26h100v-26zM1456 110q41 0 41 -38.5t-41 -38.5q-3 0 -23 10q21 -32 21 -37q0 -39 -38 -39t-38 39q0 7 20 37q-20 -10 -23 -10q-40 0 -40 38.5t40 38.5q29 0 36 -29v18q0 40 -19 70q8 -3 24 -3t24 3q-19 -30 -19 -70v-18q7 29 35 29z M1284 -166h-940v1496h940v-1496zM253 1131q40 0 40 -38.5t-40 -38.5q-29 0 -36 29v-18q0 -40 19 -70q-8 3 -24 3t-24 -3q19 30 19 70v18q-7 -29 -35 -29q-41 0 -41 38.5t41 38.5q3 0 23 -10q-21 32 -21 37q0 39 38 39t38 -39q0 -7 -20 -37q20 10 23 10zM1439 -101 q-37 0 -37 -53v-111h41v-26h-100v26h28v110q0 80 71 80q46 0 56 -48l-26 -9q-10 31 -33 31zM1044 1233l14 -34v-75q0 -2 1.5 -29.5t1.5 -40.5q23 5 23 -22q0 -41 -32 -44q89 -36 85.5 -36t21.5 8v261q-11 -1 -15 2q27 27 46 40q16 -12 48 -40q-3 -3 -15 -2v-295 q32 -5 49 -15v407h-180q-6 -9 -11 -25q34 -3 42 -33q3 -10 3 -49t-2 -47q-4 53 -4 72q0 20 -10 35q-12 16 -22.5 16t-14.5 -4q28 -14 33 -46l2 -52l-2 2q-14 89 -31 89q2 0 -10 -12q20 -10 29 -56.5t34 -66.5q0 19 -1 18q7 -11 10 -24h-10q-30 14 -40.5 63t-25.5 63 q-17 -24 -17 -28zM974 1175l21 2q15 0 36 -10l-3 12q-8 0 -10 2q2 1 13 -1v28q-6 -6 -32 -10.5t-25 -22.5zM1209 954v4h-10v-4h10zM1057 1023l6 8l-4 10q9 -4 9 -10q-6 -16 -18 -16q-19 0 -19 19q0 15 17 23v51q1 15 4 41t3 24t-9 51q-9 -9 -9 -15q1 -20 1 -39q0 -46 -8 -88 q-12 -59 -12 -46q0 -21 19 -28q6 0 13 -2q-4 -4 -8.5 -4t-27.5 23q-1 -3 -4 -6q9 -22 37.5 -22t28.5 32q0 20 -18 20q-11 0 -19 -12q3 -11 18 -14zM997 1151q-11 11 -11 20q-5 -1 -12 -3q2 -2 3 -9q7 -2 20 -8zM1217 931v18q-7 -11 -49 -17q44 0 49 -1zM1217 908v16 q-41 -1 -52 0v-13h10q0 5 2 7q2 -2 1 -10h39zM1209 951l-32 6q-20 0 -41 -8v-83l28 -2q-1 35 -1 53.5t1 19.5q17 1 45 14zM1179 867l27 -6h11v25q-10 -9 -31 0q13 3 31 -2v21h-52v-13q8 1 11 5l2 -9q-2 -2 -10 -2v-15l9 3q2 0 2 -7zM943 1086l-3 -11h11q12 0 41 11 q-24 94 -24 88q0 7 6 19t9 15q19 -2 48 9v15h-153q-28 -40 -35.5 -116t-15.5 -95q10 -4 54.5 -30t66.5 -26q68 0 83 183l-23 -2q-5 0 -29 7v-14q0 -3 9 -24t9 -24q0 7 -25 -34l-4 4q2 4 3 11l-32 -2q-5 17 -5 12q0 6 2 4h7zM1131 861v88q-16 5 -43 16v-125zM796 1070l10 -19 q0 -23 -17 -23t-17 16q0 4 1 5q8 -12 16 -16q5 3 12 8v18q-6 6 -17 6q-22 0 -22 -26.5t25.5 -26.5t32 23t13 90t28.5 107h-25q-18 -29 -24 -77t-11 -69t-5 -16zM704 1121l-17 4q-22 0 -22 -19q0 -4 9 -17q3 -1 6 -1q3 24 27 24q11 0 13 -1q-29 -2 -29 -24q0 -4 12 -14 q5 23 24 23q11 0 14 -1q-9 -2 -19 -4.5t-10 -11.5l6 -18q5 -3 9 -7q2 26 23 26q12 0 14 -3q-5 3 -17 -2t-12 -12t21 -30q-4 9 3.5 24t15.5 15t12 -2q10 22 15.5 75.5t21.5 86.5h-20q-16 -27 -23 -68.5t-13 -57.5q-3 3 -1 3q4 43 23 123h-28q-9 -18 -13.5 -52t-11.5 -47 q0 53 11 99h-20q-12 -13 -17.5 -50.5t-16.5 -53.5q5 -2 10 -7zM978 965l-34 -8q-29 0 -69 29t-51 29q4 0 -10 -4l124 -93l57 27q-3 3 -7 14q-3 6 -10 6zM777 944l-26 -2q-2 0 -16 31h-11q1 -3 -15 -3q2 20 -18 32v-31q160 -126 187 -231q10 34 116 79v39q-7 -4 -11.5 -19 t-15.5 -20q-8 6 -24 15q-2 -2 -11 -20q-6 -11 -12.5 -11t-8.5 2q-3 18 -17 42q-8 -4 -23 -10q-5 13 -16 38q-3 1 -8 1l-15 -2q-10 0 -12 14t-4 25l-23 -3q-12 0 -16 34zM1029 912l18 52q0 19 -28 30v-197q-1 -28 -1 -49q0 -32 2 -50q5 -31 3 -35l15 1q8 -4 2 -15h-12l-4 2 v-66v-13q0 -43 16 -121q30 -146 117 -236v15q-14 5 -16 22.5t-3 34.5q-15 6 -40 22q-11 13 -6 36t3.5 27.5t-29.5 26.5q3 43 3 62q0 9 -1 13q-2 9 -13 19t-11 14l14 41q0 7 -13.5 27.5t-13.5 33.5l19 54l-16 55l16 38l-21 57l18 50zM356 1318v-379q22 13 44 21q0 42 2 54 q64 19 65 19t-1 -2v-47l238 71q-45 44 -45 45q0 27 28 28q13 4 15 31t2.5 40.5t7.5 33.5l-51 85h-305zM1015 996h-12q-5 -8 -16 -22q16 -26 18 -52l3 -332q8 -170 84 -308q-92 125 -141 206l-92 165q-33 56 -104 152l-67 70q-75 66 -163 101l-17 7h-14q33 -16 76 -40 q170 -93 298 -316.5t164 -270.5l61 -80q26 -32 45 -49q-95 119 -118 326l-5 31v412zM861 598q0 19 -22 19q-9 0 -23 -15q0 22 -1 22q-4 12 -19 12q-21 0 -21 -21q0 -9 6 -18q7 -2 15 -9q-27 -8 -27 -16q0 -28 19.5 -28t21.5 17q1 6 4 17q8 -4 11 -29q13 7 15 6q-8 10 -21 29 q16 -9 24 -9q18 0 18 23zM490 941q112 -139 120 -359v-406q-7 0 12 -3l14 24q-19 60 -19 71v314q0 69 -27 167t-59 138q6 -1 15 -13q66 -82 152.5 -233.5t108.5 -187.5q121 -191 257 -242q26 -10 64 -22q-174 70 -281 221l-20 24q-56 88 -89 151q-120 231 -248 356zM594 264 l-18 -53q0 -24 28 -33l-2 399q-9 232 -133 380q-3 -14 -3 -15q9 0 12 -7q2 -23 9 -53q19 -9 43 -29q4 -7 -4 -49q14 -12 30 -31q-3 -24 -3 -68q1 -10 13 -20t12 -17t-8 -22.5t-8 -16t4 -14.5q25 -37 25 -49l-15 -51l13 -53l-16 -46l21 -55l-18 -50q0 -9 9 -24t9 -23z M851 223l21 5q9 0 19 -32q10 5 16.5 5t12 -15t14.5 -18v30q-173 143 -184 231q-22 -35 -108 -72q-14 -6 -14 -22.5t5 -23.5q2 2 8.5 21t13.5 19t18 -13h9q14 28 23 28t18 -41h13q4 -1 6 3t5 4h7q1 0 16 -39q16 5 24 5t12.5 -20t5.5 -22q11 6 21 6t13 -14t5 -25zM885 15 q-3 -63 -11 -80h20q15 16 17.5 43.5t5.5 39.5l2 -58q-3 -8 -7 -24l57 -90h303v378l-49 -15q0 -43 -1 -53l-58 -23q-6 0 -5 2v53l-240 -74l29 -20q15 -11 15 -22t-1 -12q-1 8 -16 21q-11 -23 -29 -23q-4 0 -4 3q21 0 21 23q0 8 -15 15q1 -26 -23 -26q-8 0 -9 1q24 7 24 20 q0 18 -15 22q5 -27 -23 -27q-8 0 -12 4q-2 -1 12 -1t14 19t-20 25q5 -39 -23 -39q-5 1 -8 2q-8 -59 -35 -164h17q13 18 21 66.5t20 69.5q-9 -91 -27 -136h29q5 14 22 94h2v-14zM650 204l34 8q17 0 23 -4l94 -54q1 0 8 7l-123 93q-19 -10 -55 -27q2 -9 8 -23h11zM827 98 l-10 26q0 17 19 17q15 0 15 -12q0 -6 -2 -3l-10 10h-9q-8 -9 -8 -12q0 -19 22 -19q17 0 17 26t-25 26q-35 0 -44 -103q-3 -33 -8.5 -60t-21.5 -59h28l18 40q5 78 12 99t7 24zM536 207v122q-17 -6 -47 -18v-88zM683 83l2 11h-16q-2 -4 -20 -3q2 2 2 6q-3 -4 -20 -11l26 -86 q-3 -11 -6 -24t-14 -15q-17 3 -45 -9v-17h151q28 40 36.5 114.5t16.5 98.5q-95 56 -116 56t-30 -6q-24 -16 -40.5 -76.5t-15.5 -89.5v-8q35 3 54 -8l-23 66q0 4 12.5 16t15.5 17q2 -3 2 -18l19 2q12 0 17 -9q-3 -3 -8 -7zM455 288v10l-6 -2q-4 0 -4 4t-1 5l-19 3h-19v-20h49 zM413 218l30 -6q16 0 43 11v83l-28 2q2 -36 2 -55t-2 -20q-17 1 -45 -15zM457 265v12q-4 0 -8 -5q-2 4 -5 9l-19 4h-19v-20h51zM457 246v14q-6 1 -51 0v-14h51zM406 240v-20q6 9 28 14t24 6h-52zM649 10q-10 5 -16 5q6 -12 6 -15q9 5 10 10zM611 148q-1 25 -32.5 25 t-31.5 -29q0 -24 17 -24l19 9q0 12 -6 17q2 0 -15 -5l-5 4q5 9 15 9q19 0 19 -18.5t-18 -20.5q6 -18 1.5 -58.5t-4.5 -51.5t12 -57q1 41 5 113q2 12 9.5 42.5t7.5 38.5t-11 16q-8 2 -23 5l22 2q17 -11 19 -17zM423 211v4h-12v-4h12zM602 16l-1 3l-7 -3v-4zM651 -6l-20 -2 q-4 0 -40 7q8 -3 24 -11q-15 -1 -23 4l2 -27q0 3 12.5 4.5t33.5 5.5q11 5 11 19zM520 -19q0 -65 25 -85h12q0 -7 3 9q-18 7 -30 59t-32 67q0 -10 -2 -13q-1 3 -5 5v14q2 1 4 1q19 0 40 -53q3 -22 10 -57q3 -13 17 -17q16 27 16 29l-12 41v25q0 42 -2 106q-9 4 -22 16 q-3 5 -3 16t11.5 25t19.5 12q-89 36 -84 36q-5 0 -23 -6l3 -262q3 -1 10 -5q-15 -14 -46 -38q-13 14 -46 40q3 3 16 2v295q-16 5 -44 16v-413h172q10 20 13 30q-44 11 -44 94q0 38 1 46q0 -10 4 -83q4 -51 40 -51q4 0 7 6q-29 18 -30 35q-4 45 -4 54t2 10q0 -2 3 -6z M928 1193h-48q3 7 35 10t40 5q-22 -15 -27 -15zM929 1179h-31v4h31v-4zM912 1151q-4 0 -16 18q-12 -5 -12 -13q-5 5 -12 6q23 15 40 15t36 -12q-14 -14 -36 -14zM898 1154l-1 -4l-9 3v4zM1039 967l-3 -12h-10q-1 12 1 15zM936 1033h59l-4 -6l-55 -3q-3 1 -10 -2q13 11 10 11 zM976 1009h-12v4h12v-4zM952 1009h-9v4h9v-4zM1039 865q0 -7 -3 -10h-9q-3 1 -3 7l3 6zM1042 763l-3 -12h-10q-1 12 0 15zM616 1181.5q18 -17.5 18 -35t-14.5 -38.5t-29.5 -21q-63 0 -73 59q-9 -7 -9 -29t16 -67h-47q16 61 16 66q0 18 -10 30l-15 -38q-8 -19 -43 -19 q-58 0 -58 55t56 55q26 0 42 -16l6 5v6q-26 18 -26 51q0 53 56 53q21 0 39.5 -18t18.5 -39.5t-35 -50.5l9 -7q12 16 38.5 16t44.5 -17.5zM1052 554l-3 -12h-12q-1 11 0 15zM1065 462l-3 -12h-12q-1 12 0 15zM1089 359h-13q-1 11 0 15h13v-15zM1118 275q-3 0 -3 6t3 9l13 -3 l-3 -12h-10zM507 894l-3 -12h-9q-1 6 -1 9.5t1 5.5zM537 798q-3 0 -3 6l3 7l12 -3q0 -7 -3 -10h-9zM560 706v13l15 -3q0 -7 -3 -10h-12zM576 615q-3 0 -3 6l3 7l12 -3q0 -7 -3 -10h-9zM1261 20q0 -55 -56 -55q-26 0 -42 16l-6 -5v-6q26 -18 26 -51q0 -53 -56 -53 q-21 0 -39.5 18t-18.5 39.5t35 50.5l-9 7q-12 -16 -38.5 -16t-44.5 17.5t-18 35t14.5 38.5t29.5 21q63 0 73 -59q9 7 9 29t-16 67h47q-16 -61 -16 -66q0 -18 10 -30l15 38q8 19 43 19q58 0 58 -55zM584 508v12l15 -3q-1 -7 -3 -9h-12zM596 406h-12q-2 11 0 15h12v-15z M924 50q12 -6 17.5 -6t18.5 13q-2 -11 -18.5 -15.5t-18.5 -17.5l6 13q5 9 -5 13zM599 313l-3 -12h-10q-1 12 1 15zM654 156h-7v4h7v-4zM701 151q-9 -18 -36 -18t-37 7q3 3 3 9q9 -5 35 -5t35 7zM587 202q-4 0 -4 6t4 9l12 -3l-3 -12h-9zM720 21q15 0 31 -12l-31 -16 q7 -4 13 0q-10 -5 -24 -5q4 -1 11 3q-1 0 -23 2q-4 4 -11 8l8 16zM568 133l-2 -3l-7 7l3 2zM714 -37l-17 3q-15 0 -29 -7q12 14 34.5 16t43.5 3q-20 -15 -32 -15zM740 13l-18 2q5 -5 6 -12q12 6 12 10z" />
+<glyph unicode="&#x1f0dc;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM283 1267q-43 -19 -72 -19q-102 0 -102 105t102 105q34 0 72 -18 v-36h-6q-32 26 -68 26q-67 0 -67 -77t68 -77q37 0 67 26h6v-35zM1456 110q41 0 41 -38.5t-41 -38.5q-3 0 -23 10q21 -32 21 -37q0 -39 -38 -39t-38 39q0 7 20 37q-20 -10 -23 -10q-40 0 -40 38.5t40 38.5q29 0 36 -29v18q0 40 -19 70q8 -3 24 -3t24 3q-19 -30 -19 -70v-18 q7 29 35 29zM1284 -166h-940v1496h940v-1496zM253 1131q40 0 40 -38.5t-40 -38.5q-29 0 -36 29v-18q0 -40 19 -70q-8 3 -24 3t-24 -3q19 30 19 70v18q-7 -29 -35 -29q-41 0 -41 38.5t41 38.5q3 0 23 -10q-21 32 -21 37q0 39 38 39t38 -39q0 -7 -20 -37q20 10 23 10z M1345 -103q43 19 72 19q102 0 102 -105t-102 -105q-34 0 -72 18v36h6q32 -26 68 -26q67 0 67 77t-68 77q-37 0 -67 -26h-6v35zM1272 1318h-232l36 -17l3 -6l-43 -40q-25 -27 -25 -50q0 -51 39 -79q10 -2 29 -11q6 -14 25 -39l37 -26q5 -5 5 -49q0 -10 -12 -34q23 -32 68 -84 l-2 -15q7 5 20 18q16 27 52 76v356zM1079 1106q-3 8 -20 8t-25 1q0 27 -26 53q-3 17 -10 51v-27q0 -23 12 -36t13.5 -21.5t7.5 -32.5q2 0 7.5 0.5t8.5 0.5q-12 -6 -33 -6q3 -10 11 -10q14 6 27 6h1l-6 -9q10 4 32 12v10zM986 1192q0 -24 24 -63l-24 99v-36zM944 1223 q0 -22 17.5 -60t19.5 -57l2 6q-12 49 -39 143v-32zM966 1201q0 -15 29 -123q-4 43 -10 96t-19 66v-39zM1043 1072l24 6q22 0 18 -30q10 5 10 15q0 24 -22 24q-9 0 -35 -14q2 0 5 -1zM1115 977q25 0 25 29.5t-21 29.5h-13q25 -22 25 -33q0 -18 -22 -24q2 -1 6 -2zM1115 992 q6 0 13 3q-2 22 -18 29l11 -20q-1 0 -2 -4l-9 12l2 -20h3zM1241 817l-5 -35l2 -10q16 69 34 108v36h-6v6h6v31q-22 -26 -46 -87t-24 -84q28 -2 28 27q0 4 -7 11.5t-8 9.5q2 5 9 5q17 0 17 -18zM969 1117v16h-4v-16h4zM1098 1004q0 18 -22 29q13 -41 13 -30q0 -14 -19 -18 l10 -5q18 6 18 24zM1085 998v8h-5v-8h5zM1031 989l15 -3q21 0 21 25t-42 52v-18q0 -8 18 -27l6 6q7 -8 7 -18q-11 -12 -25 -17zM1020 1037v29h-4v-29h4zM1010 1039v27h-6v-27h6zM1244 712q0 -7 4 -11l24 59v100q-28 -72 -28 -148zM1019 1015q0 -8 13 -14q-1 10 -6 23 q-7 -1 -7 -9zM1203 826v9h-6v-9h6zM1013 1010v23q-16 -10 -23 -26q5 3 15 5l3 -2q-8 -9 -25 -9h-6q3 -6 19.5 -6t16.5 15zM1227 766v4h-13v-4h13zM761 1211q-2 8 -5 11l-3 -8zM995 982l-5 1l-3 -7l5 -2zM1193 788q0 8 -11 8q-4 -3 -10 -9v-20q4 -2 12 -9l6 3q0 9 -5 14 q8 16 8 13zM1268 707q-8 -4 -8 -10t3.5 -14t4.5 -12v36zM758 1204l-14 -5h11zM791 1192l-5 -66q0 -15 3 -30q33 0 39 -2q-12 -4 -24 -4q-28 0 -28 25q0 11 3.5 30.5t3.5 29.5l-15 -18q0 12 6 21.5t6 10.5l-4 7q-10 -24 -42 -28l-5 -8l-10 6v-39q0 -39 30.5 -96t66.5 -57 q54 0 102 42q-6 -18 -40.5 -31.5t-53 -13.5t-60.5 23v-27q0 -6 34 -30h-4q-13 0 -28.5 18t-22.5 19l-5 -10q13 -22 87 -59l-12 -3q-20 10 -76 42v-13q0 -56 73 -56q164 0 177 15q35 40 35 93l-61 -50q-38 -28 -71 -31q12 11 12 18t-15 14q27 11 73 46v24l3 -4l3 3l-4 4 l-2 -3v20q13 -9 18 -9q20 0 20 19t-21.5 51.5t-19.5 47.5q-10 -16 -10 -35t16.5 -35.5t16.5 -22t-6 -10.5q-3 3 -14 9v16q-22 24 -22 36l9 62q0 79 -25 108.5t-121 29.5q-21 0 -55.5 -9.5t-34.5 -25.5v-33l38 8q42 0 42 -39zM984 962v11h-6v-11h6zM1209 719q2 7 -9 33 l-4 -25l4 -8h9zM758 1180v4h-17v-4h17zM972 965h-4l-3 -10l4 -2zM735 1208l-3 14q-9 -3 -21 -24q0 -8 8 -14q6 8 16 24zM962 956h-5l-4 -15h6zM1233 623l14 -39l-1 -2h7q-11 38 -13 102.5t-5 67.5q-6 -2 -18 -4q6 -44 6 -57l-9 -42q0 -2 3 -9h10q-7 5 -12 12l5 6h9 q7 -4 9 -12q-5 -19 -5 -23zM1158 752q-18 0 -18 -21t18 -21q8 0 18 9v20q-13 13 -18 13zM950 950h-5l-3 -19h5zM695 1214l7 24v17q-12 -10 -13.5 -36t-4 -31.5t-13.5 -19.5t-11 -18.5t11 -4.5q18 13 20 32zM1197 697v-5q0 -30 3 -37l12 25q-15 5 -15 17zM690 1151 q16 11 16 26t-1 19q-3 -20 -15 -45zM936 941h-4l-3 -10l4 -2zM923 922v16h-6v-16h6zM702 1148l-1 5l-17 -14l3 -4zM1157 677v-10q5 -6 9 -6h3l7 7l-9 9h-10zM911 935h-5l-3 -22h5zM1128 704q-19 0 -19 -20t19 -20q8 0 20 12v16q-13 12 -20 12zM710 1139q-24 -8 -47 -28h12 q15 8 35 28zM1158 641q-8 0 -15 -16h17q6 0 13 16h-15zM1209 579l-3 13h-5l3 -13h5zM1251 549l-3 3l-14 -17l5 -3zM660 1081v-9q5 -3 16.5 -3t22.5 7l-13 -1h-8l38 21q-6 -1 -20.5 -4.5t-21.5 -3.5l33 30q-47 -20 -47 -37zM1230 577l-33 -6q-8 0 -14 6v-19q5 -6 11.5 -6 t41.5 9q-4 6 -6 16zM1272 519h-2v-39l2 1v38zM1146 616h-25q37 -11 69 -15q-29 15 -44 15zM1246 513v3q0 6 -9 6h-1v-2q-2 -3 -2 -6v-13q12 6 12 12zM720 1016q14 0 15 23q-8 -6 -36 -23h21zM1176 546v25h-6v-25h6zM843 853h53q68 0 78 9q0 7 7 15l-9 3q-27 -8 -225 -8 q32 -19 96 -19zM1246 498l-21 -6l-9 -14h38q4 5 7 11q-4 9 -15 9zM705 989q7 -6 16.5 -6t25.5 17q-17 -7 -42 -11zM675 1009l36 -8q16 0 30 17q-28 -9 -45.5 -9t-35.5 7q21 5 46 12t25 23q0 8 -11 9q-23 -8 -69 -26q8 0 12 -3q-9 -17 -28 -22l6 -14h10q20 14 24 14zM873 838 q44 0 99 10h-208q65 -10 109 -10zM1224 547q-11 0 -17.5 -12t-11.5 -13v21q-10 -12 -10 -30.5t7 -58.5q13 7 18 17q-9 4 -16 13q15 13 30 18v45zM1240 448h15l3 11l-33 4q-3 -3 -3 -12q5 -3 18 -3zM1159 540l-7 22q0 3 10 33q-50 15 -82 30v-28l3 7q2 -12 5 -37q0 11 4 16 l4 -4v-26q0 9 6 27q6 -45 6 -66q0 33 3 54h2q3 -15 3 -35q0 15 6 34q1 -18 6 -51q1 10 6 30q4 -19 4 -33l6 21q3 -10 3 -27q1 7 6 21l6 -15v27zM683 991v4h-11v-4h11zM1197 415l24 2h16l11 -2l-2 -6l2 -6q16 3 16 22.5t-19.5 19.5t-26.5 -18q-8 8 -14 11q4 5 9 18 q-8 -5 -16 -12v-29zM957 838l-30 -6h-171q1 -35 9 -89q3 12 29 47h94q41 0 60 -59q21 45 21 57v50h-12zM1258 391q-6 6 -14 6t-14 -13l6 -6h19zM626 1007q-7 8 -16.5 8t-16.5 -14q10 3 33 6zM704 976q-33 10 -61 10t-52 -39q54 33 74.5 33t38.5 -4zM659 974q-22 0 -38 -24 h21q18 0 38 17q-14 7 -21 7zM356 1318v-446q12 4 23.5 13t13.5 9t6 -1q-17 -9 -17 -19t6 -16q7 15 18 15t13.5 -29.5t15.5 -30.5q19 29 19 49.5t-13 33.5l3 1h1q17 -7 17 -21t-3.5 -28.5t-2.5 -22.5l40 35q10 4 27 16q22 27 41 61q0 7 -7 12q45 8 69 48h-20q-5 0 -11 -7 q-6 -8 -14 -5q0 20 32 34t38 42q2 7 2 48.5t8.5 56t13 26.5t5.5 60q-26 14 -74 46l26 20h-276zM1182 435q0 19 -9.5 25t-17.5 12q15 10 16 20h-18q-11 0 -34.5 -19.5t-23.5 -34t18.5 -55.5t33.5 -41q67 0 77 67h-9l-26 -27q-13 0 -21 2q5 3 5 12q5 4 9 9q-4 7 -30 24 q20 0 30 -5v11zM1222 297q11 10 11 23.5t-21 31.5q2 -19 10 -55zM626 800l2 14q0 15 -18 15t-18 -18q0 -12 8.5 -16.5t8.5 -6.5q-24 -6 -24 -14q0 -23 16 -23q12 0 16 10t7 19q7 -3 8 -24q4 1 13 4q-6 8 -17 25q14 -7 20 -7q17 0 17 17t-25 18q-5 -4 -14 -13zM867 770h-34 q-2 0 -35 -1q-19 -20 -43 -69q-1 -20 -5 -62q-6 -19 -12 -47t-18 -64q-26 -63 -22 -78q5 -55 65 -55h34q2 0 35 1q19 20 44 69q0 20 4.5 50.5t10.5 67.5q17 41 42 125v8q-6 55 -66 55zM1002 364l-2 -14q0 -15 18 -15t18 18q0 12 -8.5 16.5t-8.5 6.5q24 6 24 14q0 23 -16 23 q-12 0 -16 -10t-7 -19q-7 3 -8 24q-4 -1 -13 -4q6 -8 17 -25q-14 7 -20 7q-17 0 -17 -17t25 -18q5 4 14 13zM406 867q-10 -10 -10 -23.5t21 -31.5q-3 19 -11 55zM510 691.5q24 19.5 24 34t-19 55.5t-34 41q-67 0 -76 -67h9l25 27q13 0 21 -2q-5 -3 -4 -12q-6 -4 -9 -9 q3 -7 30 -24q-21 0 -30 5v-11q0 -19 9 -25l18 -12q-16 -10 -17 -20h18q11 0 35 19.5zM1272 -154v446q-12 -4 -23.5 -13t-13.5 -9t-5 1q16 9 16 19t-6 16q-7 -15 -16 -15q-13 0 -15.5 29.5t-14.5 30.5q-20 -29 -20 -49.5t14 -33.5l-3 -1h-2q-16 7 -16 21t3 28.5t3 22.5 l-41 -35q-10 -4 -27 -16q-22 -27 -41 -61q0 -7 8 -12q-46 -8 -69 -48h19q5 0 11 7t15 5q-1 -20 -33 -34t-38 -42q-1 -7 -1 -48.5t-9 -56t-13.5 -26.5t-4.5 -60q25 -14 73 -46l-26 -20h276zM988 214q-19 0 -38 -17q14 -7 21 -7q22 0 38 24h-21zM1039 217q-55 -33 -75 -33 t-38 4q33 -10 60.5 -10t52.5 39zM1004 157q7 -8 16.5 -8t16.5 14q-11 -3 -33 -6zM384 767q8 0 15 13l-6 6h-20l-3 -13q6 -6 14 -6zM673 326l30 6h171q-1 35 -9 89q-3 -12 -29 -47h-94q-41 0 -60 59q-21 -45 -21 -57v-50h12zM432 749l-24 -2h-17l-10 2l1 6l-1 6 q-17 -3 -17 -24q0 -18 19.5 -18t27.5 18q7 -8 13 -11q-4 -5 -9 -18q8 5 17 12v29zM958 169v4h-11v-4h11zM469 624l8 -22q0 -3 -11 -33q50 -15 83 -30v28l-3 -7q-3 12 -6 37q0 -11 -3 -16l-5 4v26q0 -9 -6 -27q-6 45 -6 66q0 -33 -3 -54h-1q-4 15 -4 35q0 -15 -5 -34 q-2 18 -6 51l-6 -30q-5 19 -5 33l-6 -21q-3 10 -3 27q-1 -7 -6 -21l-6 15v-27zM388 716h-15l-3 -11l33 -4q3 3 3 12q-5 3 -18 3zM433 621q11 12 11 30.5t-8 58.5q-13 -7 -18 -17q9 -4 17 -13q-16 -13 -30 -18v-45q10 0 16.5 12t11.5 13v-21zM757 326q-44 0 -99 -10h208 q-65 10 -109 10zM955 155l-36 8q-16 0 -30 -17q27 9 44.5 9t36.5 -7q-21 -5 -46 -12t-25 -23q0 -8 11 -9q23 8 69 26q-9 0 -12 3q8 17 28 22l-6 14h-10q-20 -14 -24 -14zM925 175q-7 6 -17 6t-25 -17q17 7 42 11zM382 666l21 6l9 14h-37q-5 -5 -8 -11q4 -9 15 -9zM787 311 h-53q-69 0 -78 -9q-1 -7 -7 -15l9 -3q27 8 225 8q-32 19 -96 19zM459 593v25h-6v-25h6zM910 148q-15 0 -15 -23q8 6 36 23h-21zM394 650v13q-12 -6 -12 -12v-3q0 -6 9 -6h2v2q1 3 1 6zM482 548h26q-38 11 -69 15q28 -15 43 -15zM358 645v39l-2 -1v-38h2zM399 587l33 6 q7 0 13 -6v19q-5 6 -11.5 6t-40.5 -9q3 -6 6 -16zM970 83v9q-6 3 -17 3t-22 -7q12 1 13 1h8l-38 -21q6 1 20 4.5t22 3.5q-12 -10 -33 -30q47 20 47 37zM394 629l-4 3l-12 -17l3 -3zM427 572l-3 13h-4l3 -13h4zM469 539q-7 0 -14 -16h15q8 0 15 16h-16zM967 53h-12 q-15 -8 -35 -28q24 8 47 28zM500 460q20 0 20 20t-20 20q-8 0 -19 -12v-16q12 -12 19 -12zM727 251h-5l-3 -22h5zM472 487v10q-6 6 -9 6h-3l-8 -7l9 -9h11zM946 25l-3 4l-15 -13l1 -5zM713 226v16h-6v-16h6zM701 233l-4 2l-3 -12h4zM940 13q-16 -11 -16 -26t1 -19 q2 20 15 45zM958.5 -4q11.5 14 11.5 18.5t-11 4.5q-18 -13 -20 -32l-4 -37q-1 -4 -4 -12t-3 -12v-17q11 10 13 36t4 31.5t13.5 19.5zM431 467v5q0 30 -3 37l-12 -25q15 -5 15 -17zM688 233h-5l-3 -19h5zM488 433q0 21 -18 21q-8 0 -18 -9v-20q13 -13 18 -13q18 0 18 21z M406 473l9 42q-1 2 -3 9h-11q7 -5 12 -12l-4 -6h-9q-8 4 -9 12q4 19 4 24.5t-7 18.5t-6 19v2h-7q11 -38 13 -102.5t6 -67.5q5 2 18 4q-6 44 -6 57zM677 223h-6l-3 -15h5zM919 -34q0 8 -8 14q-6 -8 -16 -24l3 -14q8 3 21 24zM665 209l-4 2l-3 -12h4zM889 -20v4h-17v-4h17z M419 445q-1 -3 -1 -5.5t10 -27.5l5 25l-5 8h-9zM652 191v11h-6v-11h6zM692 73l-9 -62q0 -79 24.5 -108.5t121.5 -29.5q21 0 55.5 9.5t34.5 25.5v33l-38 -8q-42 0 -42 39l5 66q0 15 -3 30q-33 0 -39 2q11 4 24 4q28 0 28 -25q0 -11 -3.5 -30.5t-3.5 -29.5q4 6 15 18 q0 -12 -6 -21.5t-6 -10.5l4 -7q9 24 42 28l5 8l10 -6v39q0 39 -31 96t-66 57q-55 0 -102 -42q5 18 39.5 31.5t53 13.5t61.5 -23v27q0 6 -34 30h4q12 0 28 -18t23 -19l5 10q-14 22 -87 59l12 3q20 -10 76 -42v13q0 56 -73 56q-165 0 -177 -15q-35 -40 -35 -93l61 50 q37 28 71 31q-12 -11 -12 -18t15 -14q-28 -11 -73 -46v-24l-3 4l-3 -3l4 -4l2 3v-20q-13 9 -18 9q-20 0 -20 -19t21.5 -51.5t19.5 -47.5q10 16 10 35t-16.5 35.5t-16.5 22t6 10.5q3 -3 14 -9v-16q22 -24 22 -36zM886 -35h-11l-3 -5zM361 457q7 4 7 10t-3.5 14t-3.5 12v-36z M436 376q0 -8 10 -8q4 3 11 9v20q-5 2 -12 9l-6 -3q0 -9 4 -14q-7 -16 -7 -13zM643 188l-5 2l-3 -8l5 -1zM877 -50l-8 3q2 -8 5 -11zM415 394v4h-14v-4h14zM653 163q-4 6 -20 6t-16 -15v-23q15 10 23 26q-5 -3 -15 -5l-3 2q7 9 25 9h6zM431 329v9h-6v-9h6zM611 149 q0 8 -13 14q1 -10 6 -23q7 1 7 9zM385 452q0 7 -5 11l-24 -59v-100q29 72 29 148zM626 98v27h-6v-27h6zM614 98v29h-4v-29h4zM599 175l-15 3q-21 0 -21 -25t42 -52v18q0 8 -18 27l-6 -6q-7 8 -7 18q11 12 25 17zM550 158v8h-5v-8h5zM532 160q0 -18 22 -29q-13 41 -13 30 q0 14 19 18l-10 5q-18 -6 -18 -24zM665 31v16h-4v-16h4zM388 347l4 35l-1 10q-17 -69 -35 -108v-36h6v-6h-6v-31q22 26 46 87t25 84q-29 2 -29 -27q0 -4 7 -11.5t8 -9.5q-2 -5 -9 -5q-16 0 -16 18zM515 172q-6 0 -13 -3q2 -22 18 -29l-11 20l2 4l9 -12l-2 20h-3zM499 161 q0 18 22 24q-2 1 -6 2q-25 0 -25 -29.5t21 -29.5h13q-25 22 -25 33zM587 92l-24 -6q-22 0 -18 30q-10 -5 -10 -15q0 -24 22 -24q9 0 35 14q-2 0 -5 1zM664 -37q0 15 -29 123q4 -43 9.5 -96t19.5 -66v39zM686 -59q0 22 -17.5 60t-19.5 57l-2 -6q12 -49 39 -143v32zM644 -28 q0 24 -24 63l24 -99v36zM632 -28q0 23 -12 36t-14 21.5t-7 32.5q-3 0 -8.5 -0.5t-7.5 -0.5q11 6 33 6q-4 10 -11 10q-14 -6 -27 -6h-1l6 9l-32 -12v-10q3 -8 36 -8l9 -1q0 -27 26 -53q3 -17 10 -51v27zM619 -41q0 51 -39 79q-11 2 -29 11q-7 14 -25 39l-37 26q-5 5 -5 49 q0 10 12 34q-24 32 -68 84l2 15q-8 -5 -20 -18q-17 -27 -52 -76v-356h231l-35 17l-3 6l45 43q23 24 23 47zM1248 865h-6v13h6v-13zM1244 853l-2 -6q-5 4 -12 13h11zM891 1231l-25 -9q-6 2 -5 6l-1 -2v-10q4 -4 10 -6q-13 -5 -33 -11q2 4 3 11l-3 9q-6 -3 -9 -17q-6 9 -6 14 q0 21 36 21h27q25 0 36 -17q-29 11 -30 11zM902 1174q-2 1 -4.5 1t-7.5 -3v12q-25 -12 -41 -13l-4 -11q-14 13 -14 20q0 19 33 19l25 -3q17 -3 23 2v-20l-10 -18v14zM992 1042h-5l-3 15h5zM987 1031l-7 -10l-3 3l6 10zM960 1024l-3 1l3 14v-15zM824 1058h-30q-6 0 -15 2 l-3 10q16 5 24 5h16q3 0 23 -3v-12q-10 -2 -15 -2zM812 1034l-17 3v6l17 -3v-6zM813 1024h-18v4h18v-4zM879 928h-9v6h9v-6zM851 925h-8v6h8v-6zM834 928h-16v6h16v-6zM616 1181.5q18 -17.5 18 -35t-14.5 -38.5t-29.5 -21q-63 0 -73 59q-9 -7 -9 -29t16 -67h-47q16 61 16 66 q0 18 -10 30l-15 -38q-8 -19 -43 -19q-58 0 -58 55t56 55q26 0 42 -16l6 5v6q-26 18 -26 51q0 53 56 53q21 0 39.5 -18t18.5 -39.5t-35 -50.5l9 -7q12 16 38.5 16t44.5 -17.5zM779 421q-16 0 -19 51q-11 -10 -24 -9q14 11 20 21q-32 10 -29 29.5t45 27.5q-3 10 -6 33 q8 -5 16 -14q0 3 2.5 14.5t5 20t2.5 12.5q-10 -10 -21 -11q4 11 24 27l-22 8q-11 4 -8 20t40 29q-4 10 -10 30q12 -7 19 -15q25 48 37 48q16 0 19 -51q11 10 24 9q-14 -11 -20 -21q33 -10 29 -30q-3 -19 -45 -27q3 -10 6 -33q-8 5 -15 14q-4 -7 -9 -22q-2 -23 -2 -25 q11 10 21 11q-4 -11 -24 -27l22 -8q11 -4 8 -20t-40 -29q4 -10 10 -30q-12 7 -19 15q-24 -48 -37 -48zM1261 20q0 -55 -56 -55q-26 0 -42 16l-6 -5v-6q26 -18 26 -51q0 -53 -56 -53q-21 0 -39.5 18t-18.5 39.5t35 50.5l-9 7q-12 -16 -38.5 -16t-44.5 17.5t-18 35t14.5 38.5 t29.5 21q63 0 73 -59q9 7 9 29t-16 67h47q-16 -61 -16 -66q0 -18 10 -30l15 38q8 19 43 19q58 0 58 -55zM812 230h-16v6h16v-6zM787 233h-8v6h8v-6zM760 230h-9v6h9v-6zM835 136h-18v4h18v-4zM835 121l-17 3v6l17 -3v-6zM830 89h-16q-4 0 -23 3v12q10 2 15 2h30q5 0 15 -2 l3 -10q-17 -5 -24 -5zM673 139l-3 -14v15zM653 140l-6 -10l-4 3l7 10zM646 107h-5l-3 15h5zM799 -16q0 -19 -33 -19l-25 3q-17 3 -23 -2v20l10 18v-14q2 -1 4.5 -1t7.5 3v-12q25 12 41 13l4 11q14 -13 14 -20zM739 -67l25 9q6 -2 5 -6l1 2v10q-4 4 -10 6q12 5 33 11 q-2 -4 -3 -11l3 -9q5 3 9 17q6 -9 6 -14q0 -21 -36 -21h-27q-26 0 -36 17q29 -11 30 -11zM398 304h-10l-3 7l1 6q5 -4 12 -13zM386 286h-6v13h6v-13zM852 1211l-3 14h-4l3 -14h4zM876 1186h-19l3 -8q9 1 16 8zM849 734q-18 0 -23 -31q0 -6 -1 -18l9 -5q4 1 20 14q3 40 -5 40 zM875 670q-16 0 -19 -16.5t13 -16.5q11 0 21 9l2 10q-11 14 -17 14zM831 634q26 21 1 37q-8 -7 -10 -19.5t9 -17.5zM794 634q13 0 16.5 18t-13 18t-20 -18t16.5 -18zM821 619q-15 0 -22 -37t9.5 -37t23.5 37t-11 37zM836 530q-13 0 -16.5 -18t13 -18t19.5 18q1 3 1 5 q0 13 -17 13zM798 493q10 9 10 23q0 10 -9 14q-26 -21 -1 -37zM761 527q-11 0 -21 -9l-2 -10q11 -14 17 -14q16 0 19 16.5t-13 16.5zM781 430q18 0 24 31q-1 6 0 18l-8 5q-5 -1 -21 -14q-3 -40 5 -40zM773 -22l-3 8q-10 -1 -16 -8h19zM785 -61l-3 14h-4l3 -14h4z" />
+<glyph unicode="&#x1f0dd;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM316 1353q0 -88 -82 -103q18 -11 26.5 -11t22.5 4l-13 -32 q-3 -1 -13 -1.5t-34 11t-36.5 11.5t-22.5 -9l-11 17q10 10 20 15q-66 25 -66 99q0 46 29 75t75 29t75.5 -29.5t29.5 -75.5zM1456 110q41 0 41 -38.5t-41 -38.5q-3 0 -23 10q21 -32 21 -37q0 -39 -38 -39t-38 39q0 7 20 37q-20 -10 -23 -10q-40 0 -40 38.5t40 38.5 q29 0 36 -29v18q0 40 -19 70q8 -3 24 -3t24 3q-19 -30 -19 -70v-18q7 29 35 29zM1284 -166h-940v1496h940v-1496zM253 1131q40 0 40 -38.5t-40 -38.5q-29 0 -36 29v-18q0 -40 19 -70q-8 3 -24 3t-24 -3q19 30 19 70v18q-7 -29 -35 -29q-41 0 -41 38.5t41 38.5q3 0 23 -10 q-21 32 -21 37q0 39 38 39t38 -39q0 -7 -20 -37q20 10 23 10zM1521 -190q0 -46 -29 -75t-75 -29t-75.5 29.5t-29.5 75.5q0 88 82 103q-18 11 -26.5 11t-22.5 -4l13 32q3 1 13 1.5t34 -11t36.5 -11.5t22.5 9l11 -17q-10 -10 -20 -15q66 -25 66 -99zM1272 1318h-96 q-22 -21 -22 -86t31 -99q3 -3 9 -14q-21 -1 -45.5 -2.5t-48.5 -24.5q30 -38 79 -76l93 -72v374zM1143 1249q0 34 24 69h-168q12 -26 53 -44q-2 21 2 32q4 -9 10 -32l29 24q16 13 24 10q1 -2 5 -6q-24 -23 -33.5 -26t-17.5 -11q14 -5 45 -19v-2q-14 2 -33 3h-15q8 -17 25 -48 q19 -17 53 -50l-5 -3q-24 8 -67 44q-9 13 -23 67q-55 13 -74 61h-34q57 -81 68 -94q45 -59 79 -82l25 -17h62q-34 43 -34 124zM1025 1070q-8 14 -22 44l-27 102q-30 98 -60 98l-13 -2q4 -1 11 -4q23 -28 51 -109t60 -129zM1099 971q-12 20 -41.5 45.5t-41 39.5t-25.5 53 l-54 144q-26 60 -51 60h-1h-14q16 -6 40 -25q12 -17 29 -68.5t44 -122.5q46 -107 115 -126zM845 1319h-14q5 -6 40.5 -22t41.5 -40q40 -151 69.5 -207t80.5 -99.5t89 -49.5q11 -3 35 -9q-36 34 -53 43q-22 8 -64 30q-69 55 -98 139l-56 162q-10 21 -22 28q-38 25 -49 25z M741 1314l-1 4l-12 -6l1 -4zM759 1316h-9q-8 1 -22 -24q12 5 31 24zM723 1313l-3 1l-4 -8h4zM797 1029l22 -4q5 0 51 12q73 46 73 62.5t-15.5 78t-17.5 73.5t-11 20q-23 9 -59.5 27t-52.5 18q5 0 -52 -26q2 -41 6.5 -108t55.5 -153zM955 1086l-69 -47q-33 -22 -64 -22 t-42 21q-13 -4 -29 -14q101 -14 115.5 -14t113.5 16zM875 1004l-128 10h-12q51 -20 132 -20q2 0 51.5 5t72.5 6q-2 4 -6 9q-3 1 -9 1l-26 -5q-29 -6 -75 -6zM982 957l-39 27q-6 0 -16 -18.5t-20.5 -18.5t-23 15.5t-20.5 15.5t-20.5 -15.5t-21 -15.5t-22 18.5t-22.5 18.5 t-22 -13.5t-19 -13.5q-12 0 -25 45h-10q-16 -16 -35 -30q6 -5 17 -11q73 -27 166 -27t190 22q-2 4 -28 30q-22 -29 -29 -29zM1097 610l-11 37q11 9 21 9t17.5 -10t15.5 -16h10q0 15 1 43q8 12 21 12t19 -13.5t10 -25.5h13q2 13 5 30t15 17q18 0 26 -50h15q-4 25 0 49 q-28 6 -53 6q-102 0 -184 -83q16 4 46 -19h13v14zM975 936h-26q-70 -61 -120 -179q63 111 146 179zM1147 546q-42 0 -42 -37q0 -23 12 -37q22 17 60 59q-9 15 -30 15zM771 783q-20 107 -71 165q-5 1 -15 4q54 -75 86 -169zM799 800q0 -9 3 -12q-2 -2 -13 -1q0 -10 4.5 -10 t10.5 5l7 -5h9q0 2 3 6q-3 3 -11 4q-1 4 -3 13h-10zM283 1353q0 77 -71.5 77t-71.5 -77t71.5 -77t71.5 77zM1156 335q1 3 18.5 11t27.5 8t24 -34v150l-105 -125l25 -51q0 6 3 8q5 -5 5 -8q0 7 2 41zM515 999l6 -10q2 3 10 3q15 0 15 -10.5t-11 -15.5q9 0 19 -5q-8 -3 -15 2 l1 -11q-11 -13 -13 -13t-22 13v3q-15 -14 -17 -21q7 3 27.5 -11.5t26 -14.5t13.5 8t18 4q-5 -31 -44 -31t-58 37q2 -33 39 -79q6 6 134 120q-7 23 -7 49q0 72 63 189q8 16 8 31.5t-3 78.5l3 3h-352v-599q25 19 30 95l-4 41q-1 26 6 35t42.5 26t35.5 25t-9 15q-10 4 -28.5 13 t-18.5 28t4 26q-1 -11 25 -25t30 -21t11 -35q5 5 23 17h-8l-8 18q0 11 12 11.5t16 -8.5q-5 9 0 19zM776 772v9h-5v-9h5zM1224 284q1 29 -17 46q-2 5 -5 5q7 -18 22 -51zM541 980q0 6 -4 9l-12 -3l3 -13h9q4 1 4 7zM1182 321q-2 4 -7 7q-2 -2 -4 -6q2 -2 11 -1zM1214 278 q0 -17 -14 39q-4 1 -10 5q4 4 8 4q-2 2 -3 7h-13q6 -21 19 -62q13 -2 13 7zM995 554l20 2q12 0 35 -8q7 7 7 12t-15.5 18.5t-12.5 27.5q-58 -59 -58 -157q0 -39 26 -108q-3 28 38 40v15l-34 -1q-22 -1 -22 20q0 17 22 21t24 12q-2 2 -26.5 9t-21.5 27q7 11 29 11t27 8 q-6 9 -23 17.5t-17 17.5zM512 973q0 -7 3 -10q6 0 9 3q-1 2 -3 7h-9zM535 951q0 6 -3 9l-13 -3l3 -12h10q3 0 3 6zM508 968q2 12 0 15h-15l3 -15h12zM1195 266q-4 18 -17 49l-4 -9q5 -12 11 -43q-4 0 10 3zM1176 255l-11 57q0 -52 -1 -57h12zM1159 269l-6 12l-4 -1l6 -12z M519 913l-14 9l-2 -4l15 -9zM523 900q-9 0 -39 26q8 -31 45 -31q4 0 17 6q2 -1 -23 -1zM460 974q-3 8 -20 15t-21 13q-1 -20 39 -39q-8 6 -27 19q12 0 29 -8zM861 572q0 8 -26 16l15 9q6 9 6 18q0 21 -21 21q-16 0 -20 -12v-22q-15 15 -23 15q-23 0 -23 -19q0 -23 19 -23 q7 0 24 9q-4 -6 -21 -29q2 1 14 -6q0 12 11 29q2 -3 4.5 -18.5t21.5 -15.5t19 28zM1205 174q-2 23 -37 36q17 -15 25 -17q1 -1 -2 -4q-10 5 -35 24q1 -16 25 -27zM1139 257q-23 21 -36 21t-33 -9q19 4 50 -17q-5 9 -26 21q2 3 6 3t36 -24q3 2 3 5zM458 918h-13q4 -16 12 -44 q0 39 1 44zM451 853q-4 20 -12 57q-4 -1 -10 -3q4 -19 16 -54h6zM1107 208v15l-15 -3l3 -12h12zM1131 182q1 11 0 15l-13 -3l3 -12h10zM1115 195v10h-10v-10h10zM436 848q-9 22 -13 54h-10q5 -29 13 -54h10zM1238 347l-6 -67q-2 -2 -15.5 -9.5t-36 -18t-22.5 -17.5 q0 -12 22 -23q34 -19 34 -42q0 -9 -6 -15q-14 21 -24 25q-6 0 -16 4q-14 11 -24 39l-26 -20q5 1 12 2q9 -10 9 -15q0 -14 -13 -14q-5 0 -10 5q2 -6 -2 -13q-1 4 -5 13q-8 -8 -12 -8q-10 0 -13 10q1 7 1 17q-2 0 -7 4q2 3 13 2q-14 23 11 23q7 0 11 -11q2 1 6 5q3 -2 3 -10 q6 6 15 17q-15 7 -28.5 20t-29.5 13l-27 -12h-3q18 33 42.5 33t38.5 -12l25 -22l-41 78l-131 -121l6 -45q0 -35 -7.5 -60t-42 -93t-34.5 -96.5t11 -66.5h356v708q-34 -54 -34 -90v-117zM1102 179q1 12 -1 15l-15 -3l3 -12h13zM394 884q0 5 19 -41h10q-5 17 -23 52zM465 857 q-26 -23 -40.5 -23t-20 11t-10.5 23l15 -144l92 118l-39 76q0 -13 9 -22q-2 -2 -7 1q0 -4 1 -18t0 -22zM1345 -189q0 -77 71.5 -77t71.5 77t-71.5 77t-71.5 -77zM832 402v12q-9 0 -11 -2q-5 5 -6.5 5t-13.5 -6q1 -7 8 -9t3 -13h10q1 14 10 13zM936 224q-60 88 -83 170 q9 -75 64 -162zM657 724q0 47 -28 113q-3 -28 -36 -45v-12q16 -2 31 -3q21 -4 21 -20q0 -4 -1 -8q-6 -4 -35 -13q-1 -1 -5 -8l24 -13q18 -9 18 -21t-42 -15q-5 -1 -8 -3q1 -7 17.5 -16.5t16.5 -20.5q0 -15 -58 -15v-12q21 -16 21 -36q0 -14 -15.5 -14t-35.5 15h-13 q4 -16 11 -48l-20 -9q-4 0 -15.5 11.5t-14.5 11.5h-14q-2 -5 -2 -26t-20 -21q-12 0 -19 16.5t-8 17.5h-15q0 -47 -18 -47q-14 0 -23 41q-1 3 -5 9q-7 0 -10 -4v-51q6 7 25 4l28 -4q102 0 175 73.5t73 172.5zM502 646l4 28q0 5 -7.5 16t-13 11t-54.5 -56q0 -8 11 -14.5 t25.5 -6.5t34.5 22zM789 420q-61 -121 -143 -175h31q87 91 112 175zM846 194l40 27q16 0 21 -16t10 -29q14 9 44 30q-66 36 -181.5 36t-189.5 -20q6 -11 27 -25q5 26 19 26t24 -13t20 -16q5 4 12 19t21 15t29 -14t22.5 -14t17 14t21 14t24.5 -17t19 -17zM633 155h22 q3 0 17 5q20 6 89.5 6t90 -6.5t38.5 -0.5q-86 17 -112 17l-145 -11v-10zM669 87q13 14 33 25l44 26q26 14 48 14h24q26 -18 30 -18q-12 0 25 12l-107 14q-56 0 -122 -14q8 -20 25 -59zM875 -50q-5 1 -13 2q5 -5 6 -12q3 1 7 10zM843 -48q-5 -1 -13 -2q2 -2 4 -5.5t3 -4.5 q2 8 6 12zM844 16l-14 -35v-24q24 3 53 0v23q1 26 -19.5 87.5t-42.5 77.5q-38 0 -58.5 -8t-53.5 -32.5t-33 -33.5q0 -2 12.5 -43t16 -65t27.5 -69l51 -18q6 -2 46 -28q14 17 45 33q12 6 12 12.5t-2 27t-2 31.5q0 -8 -6 -17l-30 -5q-5 0 -15 5v-10q5 -10 21 -12t26 -8 q-2 -2 -17 -2q-39 0 -39 48q0 25 16 67q-27 17 -20 24q12 -15 19 -16.5t7 -9.5zM904 -154v21l-12 -21h12zM899 -117l-4 8q-6 -8 -43 -35q-1 -4 -3 -10h17q4 7 18.5 20t14.5 17zM807 -154q-10 8 -44.5 20t-46.5 34q-17 57 -60 189q-4 6 -11 21q-16 44 -68 94t-97 65 q0 1 -45 9q18 -19 62 -41.5t51 -27.5q69 -45 99 -119l41 -133q7 -28 33 -74q9 -8 86 -37zM757 -154h20q-7 5 -20 12q-53 22 -73 77l-25 93q-49 141 -140 176q36 -29 95 -96q18 -30 35.5 -95.5t29.5 -89t40.5 -50.5t37.5 -27zM737 -154q-66 44 -90 138.5t-61 136.5 q28 -46 52.5 -136t64.5 -139h34zM483 50q-12 0 -34 -4q31 -43 31 -96.5t-24 -103.5h173q0 9 -21 28t-32 21q1 -24 -2 -39q-3 13 -12 39q-21 -18 -59 -44q-4 4 -4 6q0 8 20 23l35 27q-12 4 -47 20q5 5 20 0t18 -5h9v11q0 17 -69 87q2 1 10.5 1t33.5 -18.5t28 -25.5 q15 -34 17 -58q77 -37 75 -73h34q-4 20 -88.5 112t-111.5 92zM356 -154h74q13 16 29 43q6 22 6 49t-30 117l-31 67l56 7q34 5 53 27q-27 37 -157 135v-445zM897 1264h-4q-26 0 -67 13h9q29 -2 62 -13zM862 1251l30 -2l3 -27h-39q-16 0 -33 11q10 5 16 11.5t23 6.5zM741 1240 q4 11 19 11t32 -8l2 9q-1 15 -16 18l-30 7h28q10 0 18 -15t8 -17t-16 -82q16 -9 20 -25q-6 9 -17 15t-11 15l13 45q0 7 -2 9h-48v18zM823 1153q-7 -3 -29 11h12q11 -11 17 -11zM810 1107q-22 0 -32 -5q0 5 1 10q8 3 62 5v-18q-9 8 -31 8zM828 1083h-22q-7 0 -17 10 q12 0 38 3q1 0 1 -13zM823 1061l-23 -3v5l23 3v-5zM616 1181.5q18 -17.5 18 -35t-14.5 -38.5t-29.5 -21q-63 0 -73 59q-9 -7 -9 -29t16 -67h-47q16 61 16 66q0 18 -10 30l-15 -38q-8 -19 -43 -19q-58 0 -58 55t56 55q26 0 42 -16l6 5v6q-26 18 -26 51q0 53 56 53 q21 0 39.5 -18t18.5 -39.5t-35 -50.5l9 -7q12 16 38.5 16t44.5 -17.5zM1261 20q0 -55 -56 -55q-26 0 -42 16l-6 -5v-6q26 -18 26 -51q0 -53 -56 -53q-21 0 -39.5 18t-18.5 39.5t35 50.5l-9 7q-12 -16 -38.5 -16t-44.5 17.5t-18 35t14.5 38.5t29.5 21q63 0 73 -59q9 7 9 29 t-16 67h47q-16 -61 -16 -66q0 -18 10 -30l15 38q8 19 43 19q58 0 58 -55zM825 114h-14q-9 -1 -10 7q17 0 24 -7zM829 84q-10 6 -25 6t-11 -3v13h25q10 0 15 -9q-3 -3 -4 -7zM843 66l-60 -2q0 2 -1.5 10t-1.5 10q9 -10 32.5 -10t33.5 4q-3 -2 -3 -12zM818 17q-6 10 -12 10 t-8 -3q-1 8 5 8t27 -15h-12zM766 -73l-36 8v26q2 -7 18 -4l24 4q-11 0 29 -12q-34 -22 -35 -22zM887 1237h1q0 1 -14 3q0 -3 -1 -6t-1 -7q4 4 15 10zM849 1228q-3 5 -9 10q-1 -2 -5 -4q4 -1 14 -6zM791 1231l-7 7q0 -4 -6 -10q5 1 13 3zM759 1228q-4 4 -10 15q-1 -5 -3 -13 q5 -1 13 -2zM786 -51q-6 0 -14 4q2 -4 10 -10q1 6 4 6zM747 -50q-4 -2 -10 -6q2 -2 8 -4q0 6 2 10z" />
+<glyph unicode="&#x1f0de;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM302 1252h-82v25h22l-64 81l66 71h-24v26h80v-26h-22l-62 -71 l64 -81h22v-25zM203 1429h-25v-152h23v-25h-80v25h25v152h-25v26h82v-26zM1456 110q41 0 41 -38.5t-41 -38.5q-3 0 -23 10q21 -32 21 -37q0 -39 -38 -39t-38 39q0 7 20 37q-20 -10 -23 -10q-40 0 -40 38.5t40 38.5q29 0 36 -29v18q0 40 -19 70q8 -3 24 -3t24 3 q-19 -30 -19 -70v-18q7 29 35 29zM1284 -166h-940v1496h940v-1496zM253 1131q40 0 40 -38.5t-40 -38.5q-29 0 -36 29v-18q0 -40 19 -70q-8 3 -24 3t-24 -3q19 30 19 70v18q-7 -29 -35 -29q-41 0 -41 38.5t41 38.5q3 0 23 -10q-21 32 -21 37q0 39 38 39t38 -39q0 -7 -20 -37 q20 10 23 10zM1507 -291h-82v26h25v152h-23v25h80v-25h-25v-152h25v-26zM1408 -265v-26h-80v26h22l62 71l-64 81h-22v25h82v-25h-22l64 -81l-66 -71h24zM1136 934q13 264 16 264q3 14 19 18q8 -6 17 -17q3 -75 8.5 -192t5.5 -120l70 -39v470h-214q-1 -5 -21.5 -47t-20.5 -53 t5.5 -27.5t8 -40t13.5 -103.5q3 -4 13 -9q7 -5 7 -19.5t-21 -25.5zM1026 1273l-23 -2l-40 19q-2 0 -16.5 -9.5t-27.5 -9.5t-33 11l-20 10q-4 0 -17 -9t-28.5 -9t-29.5 9t-14.5 9t-13.5 -11.5t-26.5 -11.5t-27 10.5t-15.5 10.5t-10 -6l-8 -5l-14 2l8 -23h350q2 7 6 15z M1181 947l-11 123l3 45q3 46 2 62.5t-9 30.5q-7 -6 -11 -50l-16 -459h12l16 7q4 30 4 48q0 10 -1 17q-2 6 -2 16q0 23 6 67q7 66 7 93zM943 1200l9 -35q2 -43 7 -128q3 -6 8 -17q6 3 15 8q-9 60 -12 160q11 -30 17 -90.5t6 -61.5h12v35q-7 41 -7 90v13l21 -133q14 3 10 3v20 v8q0 41 -9 96q-2 10 -24 40q0 -18 -2 -21q-14 21 -20.5 21t-14.5 -7q-1 2 -4 7h-12v-8zM1052 1021q0 9 -8 17h-15q16 -16 9 -33q13 7 14 16zM945 1058v95q0 17 -16 55h-15q13 -45 13 -56v-73q0 -3 -1 -9q-3 -12 7 -55q6 4 20 3q-8 55 -8 40zM1017 991q14 15 14 22t-11 17 h-15q10 -8 10.5 -19t1.5 -20zM958 1001q-12 11 -17 11t-18 -13q-1 60 -16 190q-3 7 -10 19h-9l7 -46v-130q0 -11 12 -35t25.5 -24t25.5 11v17zM1005 1014l-6 6h-15q11 -8 12 -31q6 12 9 25zM969 981q13 11 13 18.5t-13 15.5v-34zM748 1148q-10 -5 -16.5 -5t-11.5 5 q11 -13 13 -13q9 0 15 13zM716 1135q-1 5 -2 13q-5 -2 -10 -6q1 -2 6 -3.5t6 -3.5zM1283 666q0 14 -12 16q-69 0 -89 16q-8 6 -11 6t-15 -7q-19 -12 -34 -12t-17 2q1 19 -19 19t-20 -17q0 -10 12 -15l22 -7l147 -2q-3 -7 2.5 -14.5t11.5 -7.5q22 0 22 23zM672 1000l3 14 q0 14 -18 14q-24 0 -24 -21q0 -29 32 -29q11 0 15.5 2.5t24.5 23.5q5 -21 -40 -38h19q8 -1 22 14.5t14 16.5q-2 -37 -28 -41q18 -3 47 33q-6 -12 -15 -34q11 2 21 14t15 15q3 -8 -1 -16q10 5 15 5t10 -5q-1 10 4 13q12 -15 15 -21q-1 19 0 21q14 -23 24 -29q-10 24 -13 35 l4 4l17 -27q13 -17 37 -13q-12 -1 -19 4q-23 15 -23 27.5t2 14.5q4 -9 12 -23q12 -14 24 -14t22 9t10 17q0 18 -20 18q-10 0 -16 -6v-11q8 0 21 -4q-6 -7 -12 -7q-17 0 -17 17q0 23 34 20v24l-5 26v100q0 -8 -22 45h-166v-60q5 7 15 14l-15 -21q20 18 31.5 18t38.5 -17 q-20 -12 -36 -12q7 0 -34 7l-3 -42q2 -13 2 -25q0 -28 -8 -50q-12 -31 -22.5 -31t-16.5 9l4 4q14 -2 19 -2zM1209 648l-47 -6l44 -4q3 3 3 10zM1209 618v9h-43l-3 -9h46zM684 1109v81q-7 -20 -14 -59l-2 -90q4 10 5 52.5t6 54.5q1 -13 5 -39zM1209 609h-46q5 -6 46 -7v7z M1160 624h-9q1 -3 5 -7q3 3 4 7zM1158 586q0 3 4.5 3t0.5 -6l47 4l-60 3l5 -7q3 0 3 3zM1200 572l-49 4q-12 16 -12 37.5t9.5 30t48.5 11.5q-20 4 -45.5 4t-33.5 -5l-60 -46q33 -5 47 -14.5t48 -54.5q21 14 47 33zM684 1026v28h-5v-28h5zM680 1219.5q0 4.5 -24 44.5t-37 54 h-263v-447l211 98l57 29q1 10 14 29q10 8 18 9q5 128 14.5 153.5t9.5 30zM1141 467q6 10 6 32t-15 42q-32 45 -81 45q-88 0 -88 -96q0 -31 27 -56.5t65.5 -25.5t75.5 53q3 4 10 6zM1089 400q-8 0 -21 -6q1 -2 4 -11q28 -17 32 -17h11q-7 34 -26 34zM463 914l43 -6 q64 -3 142 -73t114 -144q8 -16 27 -32q6 6 12 6v11q2 58 -90 247q-6 12 -14 16q96 -209 96 -265q0 -6 -4 -10l-19 31q-52 96 -128.5 161t-149.5 65q-9 0 -29 -7zM1052 348q7 0 21 23q-3 0 -19 14q-14 -14 -20 -17q7 -20 18 -20zM870 536q23 23 23 51.5t-23 50t-51.5 21.5 t-50.5 -22.5t-22 -49t23 -50.5t50.5 -24t50.5 23zM1039 397l-22 3q-19 0 -23 -33q50 14 45 30zM589 813q-1 0 -21 -19l22 -17q2 4 17 19q-17 17 -18 17zM852 507q3 0 -14 -3q14 -67 26 -101l29 -78q16 -36 51 -95q-24 53 -67 159q-1 6 -32 111q6 3 8 0q134 -252 298 -252 q11 0 23 7h-12q-94 0 -198 103q-11 10 -60 79.5t-52 69.5zM680 664q0 55 -63 95q9 -2 34 36h-12q-23 -11 -33 -19q-2 -6 -8 -15h-21q-3 21 -48 34q5 -12 16 -33q10 0 25 -2q-68 -26 -68 -85q0 -39 25.5 -65.5t67 -26.5t71.5 39q14 3 14 42zM958 -53.5q0 -6.5 24 -41.5 l40 -59h250l-1 444l-258 -121q7 -37 -31 -39q-6 -130 -15 -153.5t-9 -30zM483 592q17 -5 17 -32.5t-9.5 -36.5t-45.5 -9q17 -7 42 -7t35 8l59 46q-41 4 -59 27l-31 41q-1 1 -3 1q-18 -11 -50 -33q22 -2 45 -5zM487 558v9h-4v-9h4zM478 576v10h-49v-10h49zM478 558v11h-46 l-3 -11h49zM959 77l-2 -31q-2 -30 -1 -63q0 -4 5.5 8t7.5 21l1 114q-7 -39 -4 -62.5t-4 -37.5q-3 20 -3 51zM476 552h-44q-1 -2 0 -13h41zM479 530h-47l-3 -9q25 3 50 9zM966 170l-3 -14q0 -12 21 -12t21 22t-27 22t-39 -24q-3 -4 -7 0q16 40 44 39l-13 1q-14 0 -28 -12 q-5 -7 -17 -20q9 37 26 39q-12 0 -23 -11l-21 -22q-3 8 4.5 18t5.5 16q-8 -4 -18 -16.5t-15 -10.5v9l5 7q-17 -6 -23 -3q2 -5 -7 -12q-7 10 -16 27q6 -18 3 -27q-16 32 -35 38q21 -12 21 -40q0 -7 -3 -9q-19 42 -34 42q-5 0 -8 -1q29 0 29 -36q0 -9 -1 -10q-14 37 -40.5 37 t-26.5 -22.5t21 -22.5q7 0 12 6v15q-16 0 -20 2q9 9 14 9q17 0 17 -17q0 -23 -22 -23q-4 0 -8 1t-6 1q5 -15 5 -27v-75q0 -27 6 -50q8 -15 21 -43h163v60q-13 -13 -28.5 -13t-43.5 19q19 12 37 12t33 -7l3 84q3 62 31 62q10 0 14 -9q0 1 -24 1zM937 28l-10 2q1 -1 0 -9 q5 2 10 7zM573 481q0 7 -9 17h-172q9 25 -12.5 25t-21.5 -17.5t15.5 -19.5t36 -3t30.5 -3.5t17.5 -8t10.5 -5.5q-8 0 14.5 9t43.5 9q6 0 10 -12t20.5 -12t16.5 21zM943 24l-3 3l-13 -11l3 -4zM924 20q-11 14 -16.5 14t-17.5 -12q2 0 6.5 2t4 2t23.5 -6zM890 29l-1 3l-9 -3 v-4zM659 173q0 -10 12 -21q3 2 7 3q-9 17 -9 30q-10 -2 -10 -12zM657 150q-13 7 -11 28q-8 -6 -13 -17q3 -13 24 -11zM756 -39v9q-13 40 -13 78v103q0 9 -14 27t-31.5 18t-17.5 -17q0 -22 21 -22l15 13q1 -2 4 -5l4 -107q2 -62 17 -97h15zM625 175q-15 0 -15 -15 q0 -8 17 -24q2 2 6 4q-8 12 -8 35zM696 33q0 -37 16 -72h18q-16 56 -16 71v98l-5 21h-23q10 -51 10 -43v-75zM601 162h-12l-3 -13l8 -18h15q-8 17 -8 31zM701 -39v9q-12 34 -15.5 96t-8.5 80q-6 0 -17 -5l11 -159q-9 27 -13 76t-9 72h-10v-42q3 -32 3 -96l-20 136 q-5 -2 -12 -3l10 -87q4 -43 19 -77h10v21q7 -9 11 -21h15q0 4 4 8q4 -5 4 -8h18zM468 110l-2 -28v-73q0 11 8 -48l10 51l15 459h-11q-20 -7 -20 -44q0 -13 3 -31q2 -9 2 -23l-15 -159zM946 -120l23 10q7 0 10 -2q-3 7 -8 20h-352q-2 -4 -7 -12q31 0 37.5 -1.5t17 -8t13 -6.5 t12 7.5t28.5 7.5t34.5 -9t18.5 -9t17.5 9t25 9t33 -9t12.5 -9q2 0 14.5 10.5t29 10.5t33.5 -15q14 -3 8 -3zM578 -154l28 64q17 36 17 45.5t-6 33t-8 48t-11 77.5q-4 11 -13 17.5t-9 19.5t21 23l-88 56h-9q-4 -89 -14 -267q-16 -10 -17 -10q5 0 -13 10l-18 314q-13 9 -82 50 v-481h222zM806 1182l32 6q25 0 31 -20q-22 1 -63 6q-9 2 -18 16q15 -8 18 -8zM874 1136q-28 -11 -37.5 -11t-38.5 14q23 17 33 17t33 -6q-3 5 -34 11h27q9 1 17 -16v-9zM775 1139q0 -2 -24 -73q7 -3 21 -10v-10q-2 2 -29 20q29 64 29 74q0 34 -58 34q-10 0 -15 -5 q6 11 25.5 12t27.5 6h12q11 -66 11 -48zM805 1071q0 -9 -8 -17q-11 7 -25 12q15 0 27 -4q6 5 6 9zM802 1038l24 -10h20l2 11q-5 6 -10 4l12 3v-17q-11 -9 -39 -9q-4 -6 -3 -18q-3 10 -25.5 10t-29.5 -1l-9 -6q0 -5 2 17q15 -4 25 -5h33q-6 7 -16 21h14zM793 998h-36v5h36v-5 zM756 1041q-5 -21 -40 -21q-17 0 -17 16q0 -3 6 13l15 -7l-14 2l-2 -2v-7q5 -4 10.5 -4t41.5 10zM616 1181.5q18 -17.5 18 -35t-14.5 -38.5t-29.5 -21q-63 0 -73 59q-9 -7 -9 -29t16 -67h-47q16 61 16 66q0 18 -10 30l-15 -38q-7 -19 -43 -19q-58 0 -58 55t56 55 q26 0 42 -16l6 5v6q-26 18 -26 51q0 53 56 53q21 0 39.5 -18t18.5 -39.5t-35 -50.5l9 -7q12 16 38.5 16t44.5 -17.5zM1081 419q-20 -6 -27 -6t-16.5 1.5t-13.5 1.5l8 69q-1 1 -4 2l-59 -19q-3 6 -3 23t11 50l74 -23q72 24 72 26h-1q9 0 19 -43v-24l-6 -6q-20 5 -58 16h-7 q1 1 11 -59v-9zM824 651q6 -26 16 -26v-10q0 3 -3 -5h-13q-2 2 -2 -4t10 -20h12q2 4 2 18q3 1 7 1t10 -7.5t10.5 -7.5t7.5 1q1 -2 3 -4q-5 -10 -18 -12q-6 -4 -5 -12h-12q-1 0 -3 9t-11 9t-13 -9q6 -10 15 -10v-18q-12 -1 -11 -11.5t-5 -14.5q-8 0 -13 22q-4 2 -10 10 q1 3 16 14v15q-4 4 -14 4q-2 -6 -10 -21q-6 5 -17 13q-10 -1 -22 12q10 1 30 20h11l8 -19h7q2 1 7 5v15q-4 1 -13 5q0 4 -3 11q15 6 16 27h10zM667 628l-76 26q-14 0 -72 -26q-11 44 -11 30v34q6 6 8 6t55 -13q-4 24 -8 57v11q11 6 29.5 6t27.5 -6q-4 -22 -11 -66 q-1 -2 6.5 -2t50.5 19q12 -7 12 -41.5t-11 -34.5zM1261 20q0 -55 -56 -55q-26 0 -42 16l-6 -5v-6q26 -18 26 -51q0 -53 -56 -53q-21 0 -39.5 18t-18.5 39.5t35 50.5l-9 7q-12 -16 -38.5 -16t-44.5 17.5t-18 35t14.5 38.5t29.5 21q63 0 73 -59q9 7 9 29t-16 67h47 q-16 -61 -16 -66q0 -18 10 -30l15 38q8 19 43 19q58 0 58 -55zM940 132q0 -5 -6 -12l-13 4q9 -1 14 1l2 2v8q-3 4 -10 4t-14.5 -3.5t-30.5 -3.5q3 4 9 11q37 3 27 3q22 0 22 -14zM882 166h-36v5h36v-5zM830 167q13 -13 37 -13t26 11q0 -7 -1 -18q-38 5 -57 3q1 4 -5 17z M849 112q3 0 17 -10q-10 -3 -22 5h-7q1 -5 -4 -10q0 4 5 15h11zM881 -2l47 -6q3 0 11 8q0 -16 -21 -16l-18 3q-4 0 -20 -8q-16 39 -16 60l23 62q-8 5 -23 21l5 1q5 -6 26 -16l-26 -77q0 -17 12 -32zM837 131l-27 13q-15 0 -20 -14q9 -6 16 -2q-6 -7 -15 -7q-3 5 -3 17 q7 8 35 8t27 -15h-13zM916 4h-10v5h10v-5zM804 13q11 0 -32 9q4 -3 13 -11q-10 5 -20 16l6 -3q2 2 -4 9q18 9 36 9t40 -9q-19 -20 -39 -20zM808 4l-17 3v4l17 -2v-5zM794 -5l27 2q29 0 32 -16q-6 3 -25 3l-28 -2q-13 0 -30 20q22 -7 24 -7zM866 1139l-6 7q-5 -5 -12 -13 q-2 0 18 6zM851 1145l-19 -5q-3 0 -9 2.5t-9 2.5q8 -8 8 -12h26q0 9 3 12zM817 1136q-3 2 -4 7q-3 -1 -7 -4zM806 37q-4 0 -18 -15q30 9 19 9q6 0 14 -10q-1 16 -15 16zM784 24q1 5 1 8q0 2 -1 2l-1 -0.5t-3.5 -1.5t-6.5 -2q7 -2 11 -6z" />
+<glyph unicode="&#x1f0df;" horiz-adv-x="1628" d="M1578 -244q0 -148 -138 -148h-1252q-138 0 -138 148v1652q0 148 138 148h1252q138 0 138 -148v-1652zM1544 -244v1652q0 114 -104 114h-1252q-104 0 -104 -114v-1652q0 -114 104 -114h1252q104 0 104 114zM394 1318q0 -43 -30.5 -73.5t-73.5 -30.5t-73.5 29.5t-30.5 72.5 t30.5 73.5t73.5 30.5t73.5 -29.5t30.5 -72.5zM250 783l29 -7q20 0 38 72q4 20 9 125q8 213 217 213q115 0 179 -45q17 -14 50 -31q21 10 71 10q104 0 173 -57q28 15 90 35.5t89 20.5q190 0 190 -281q0 -8 -4 -27q32 -17 32 -47q0 -52 -51 -52q-20 0 -36 16t-16 30t9.5 29.5 t9.5 26t-23 50.5t-39 40q-30 0 -117 -48q-21 -51 -21 -121q0 -10 8 -38.5t8 -45.5q0 -63 -36 -138.5t-85 -115.5q-12 -9 -77 -17l-2 -5q-1 -10 20.5 -10t66.5 12t67 12q53 0 81 -40q7 3 14 3q39 0 39 -39t-39 -39q-9 0 -15 4q-23 -33 -64 -33l-61 13q-25 0 -25 -22 q0 -13 40 -25.5t76 -42.5q8 -13 8 -36q0 -51 -55 -94q8 -12 8 -23q0 -36 -39 -36t-37 37q-41 -6 -84 -6t-90 21q-61 27 -61 74q0 12 13.5 41.5t13.5 40.5q0 17 -26.5 17t-73 -66.5t-99.5 -66.5q-25 0 -59 10q-8 -40 -43 -40q-43 0 -43 43q0 26 25 39q-10 16 -10 48 q0 57 39 88q22 17 75 35t64.5 34.5t11.5 75.5t-65.5 176t-65.5 220q0 44 18 120q-6 8 -33 27.5t-34 19.5t-15 -33t-28 -75q-40 -85 -152 -134q-2 -53 -58 -53q-22 0 -39 16.5t-17 38.5q0 56 56 56zM1442 -152q0 -43 -30.5 -73.5t-73.5 -30.5t-73.5 29.5t-30.5 72.5 t30.5 73.5t73.5 30.5t73.5 -29.5t30.5 -72.5zM1400 763.5q0 36.5 -38.5 36.5t-38.5 -36.5t38.5 -36.5t38.5 36.5zM1150 869q-33 111 -130 181q54 -57 80.5 -104t49.5 -77zM1045 789q-35 0 -38 -32q14 6 37.5 6t50.5 -20q-15 46 -50 46zM1068 708q28 0 31 27q-19 9 -36 13v-4 q5 -12 -3.5 -22t-23.5 -8q12 -6 32 -6zM968 824l90 14q43 0 59 -29l12 46l-27 26q-60 53 -186.5 53t-206.5 -52q-5 -33 -14 -99q71 76 129 76q32 0 77.5 -17.5t66.5 -17.5zM1028 756q-8 -3 -16 -1q2 -11 9 -26q0 19 7 27zM834 802q-58 0 -58 -50v-2q57 24 102 24q8 0 16 -1 q-30 29 -60 29zM354.5 1253q26.5 27 26.5 64.5t-26.5 64t-64.5 26.5t-65 -27t-27 -64.5t27 -64t65 -26.5t64.5 27zM894 756v10h-24q4 -6 4 -15q0 -34 -28 -34q-24 0 -24 18q0 9 6 25q-17 -6 -51 -17q21 -29 65 -29h14q11 0 24.5 16t13.5 26zM1219 313q0 26 -25.5 26 t-25.5 -26t25.5 -26t25.5 26zM846 360l5 46q-24 7 -56 21q-81 73 -104 147q-12 37 -12 181l19 135q87 57 211 57q35 0 59 -5q-33 124 -94 159q-7 3 -35 3t-61 -20q-6 -59 -15 -90q-28 -92 -142 -104q-8 0 -21.5 9.5t-17.5 11.5q-16 -94 -16 -111q0 -83 30 -150 q8 -17 77 -133q22 -37 25 -121q4 -6 58 -27.5t65 -21.5h30q-5 5 -5 13zM764 1088v5q-108 80 -218.5 80t-153.5 -48q-10 -18 -28 -45t-21.5 -101t-14.5 -154q-11 -39 -37 -61l14 -22q114 56 148 134q6 12 11.5 27t10.5 33.5t18 45.5q3 2 13 2t54.5 -39t66.5 -39t84 36 q-142 91 -188 91t-73 -39l-22 -40l-1 11q27 72 96 72q48 0 194 -89q47 68 47 140zM1132 651q0 8 -5 28q-10 -30 -50 -30q-22 0 -52 16q-9 -12 -30 -26l5 26q2 7 2 13q-4 1 -15.5 1t-57 -15t-83.5 -15q-87 0 -150 80v-29q0 -83 13 -130.5t64.5 -100t106.5 -57.5 q29 -3 53 -7.5t50 -4.5t36.5 11t30.5 36l26 39q56 80 56 165zM1403 -217q27 27 27 64.5t-27 64t-65 26.5t-64.5 -27t-26.5 -64.5t26.5 -64t64.5 -26.5t65 27zM1091 15q0 23 -24 23t-24 -23t24 -23t24 23zM1162 337q-5 38 -63 38l-122 -23q-7 0 -20.5 2.5t-19.5 2.5q1 1 1 0 q-31 -22 -79.5 -22t-86.5 15l-74 30v-6q0 -38 -32 -73q-57 -18 -90.5 -32t-50.5 -36t-17 -57t39.5 -63.5t80.5 -28.5t87 67.5t83 67.5t37 -34l-27 -79q0 -26 36.5 -54.5t100.5 -28.5t114 19q35 1 58 28t23 55.5t-9 38.5t-62 31.5t-53 41.5q0 34 39 34l55 -13q52 0 52 38 q-11 19 0 41zM295 727.5q0 42.5 -44 42.5t-44 -42.5t44 -42.5t44 42.5zM551 84q0 30 -30 30t-30 -30q0 -27 30 -27t30 27zM1388 777l-4 -11q0 5 -6 13.5t-6 11.5q11 -4 16 -14zM1080 882q5 0 11 -14q-9 1 -23 14h12zM1094 631q16 -8 16 -23.5t-15 -36.5q11 23 11 38.5 t-12 21.5zM372 1345l-51 -38l21 -60l-52 38l-52 -38l20 60l-51 38h64l19 59l19 -59h63zM876 587l128 17q47 0 47 -22q0 -8 -43 -51q20 -26 20 -38q0 -41 -57 -41q-79 0 -154 96q-10 14 -35 42v13h17l4 -6q41 -10 73 -10zM1421 -181h-64l-19 -59l-19 59h-63l51 38l-21 60 l52 -38l52 38l-20 -60zM323 1329h-26l-7 22l-8 -22h-25l20 -15l-8 -23l21 14l20 -14l-8 23zM997 581l-103 -8q-49 0 -79 13h-8q82 -103 164 -103q25 0 37 16q5 0 -1 16q-3 8 -33 15q47 6 47 32v12q-16 7 -24 7zM1371 -165l-20 15l8 23l-21 -14l-20 14l8 -23l-21 -15h26 l7 -22l8 22h25z" />
+</font>
+</defs></svg> 
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/Symbola.ttf b/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/Symbola.ttf
new file mode 100644
index 0000000..52337df
Binary files /dev/null and b/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/Symbola.ttf differ
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/Symbola.woff b/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/Symbola.woff
new file mode 100644
index 0000000..b9bba23
Binary files /dev/null and b/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/Symbola.woff differ
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/stixgeneral-bundle/STIXFontLicense2010.txt b/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/stixgeneral-bundle/STIXFontLicense2010.txt
new file mode 100644
index 0000000..e6d9705
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/stixgeneral-bundle/STIXFontLicense2010.txt
@@ -0,0 +1,103 @@
+STIX Font License
+
+24 May 2010
+
+Copyright (c) 2001-2010 by the STI Pub Companies, consisting of the American 
+Institute of Physics, the American Chemical Society, the American Mathematical 
+Society, the American Physical Society, Elsevier, Inc., and The Institute of 
+Electrical and Electronic Engineers, Inc. (www.stixfonts.org), with Reserved 
+Font Name STIX Fonts, STIX Fonts (TM) is a  trademark of The Institute of 
+Electrical and Electronics Engineers, Inc.      
+
+Portions copyright (c) 1998-2003 by MicroPress, Inc. (www.micropress-inc.com), 
+with Reserved Font Name TM Math. To obtain additional mathematical fonts, please 
+contact MicroPress, Inc., 68-30 Harrow Street, Forest Hills, NY 11375, USA, 
+Phone: (718) 575-1816. 
+
+Portions copyright (c) 1990 by Elsevier, Inc. 
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1. 
+This license is copied below, and is also available with a FAQ at: 
+http://scripts.sil.org/OFL 
+
+--------------------------------------------------------------------------- 
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 
+--------------------------------------------------------------------------- 
+
+PREAMBLE 
+
+The goals of the Open Font License (OFL) are to stimulate worldwide development 
+of collaborative font projects, to support the font creation efforts of academic 
+and linguistic communities, and to provide a free and open framework in which 
+fonts may be shared and improved in partnership with others. 
+
+The OFL allows the licensed fonts to be used, studied, modified and redistributed 
+freely as long as they are not sold by themselves. The fonts, including any 
+derivative works, can be bundled, embedded, redistributed and/or sold with any 
+software provided that any reserved names are not used by derivative works. The 
+fonts and derivatives, however, cannot be released under any other type of license. 
+The requirement for fonts to remain under this license does not apply to any 
+document created using the fonts or their derivatives. 
+
+DEFINITIONS 
+
+"Font Software" refers to the set of files released by the Copyright Holder(s) under
+this license and clearly marked as such. This may include source files, build 
+scripts and documentation. 
+
+"Reserved Font Name" refers to any names specified as such after the copyright 
+statement(s). 
+
+"Original Version" refers to the collection of Font Software components as 
+distributed by the Copyright Holder(s). 
+
+"Modified Version" refers to any derivative made by adding to, deleting, or 
+substituting -- in part or in whole -- any of the components of the Original Version, 
+by changing formats or by porting the Font Software to a new environment. 
+
+"Author" refers to any designer, engineer, programmer, technical writer or other 
+person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS 
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of the 
+Font Software, to use, study, copy, merge, embed, modify, redistribute, and sell 
+modified and unmodified copies of the Font Software, subject to the following 
+conditions: 
+
+1) Neither the Font Software nor any of its individual components, in Original or 
+Modified Versions, may be sold by itself. 
+
+2) Original or Modified Versions of the Font Software may be bundled, redistributed 
+and/or sold with any software, provided that each copy contains the above copyright 
+notice and this license. These can be included either as stand-alone text files, 
+human-readable headers or in the appropriate machine-readable metadata fields within 
+text or binary files as long as those fields can be easily viewed by the user. 
+
+3) No Modified Version of the Font Software may use the Reserved Font Name(s) unless 
+explicit written permission is granted by the corresponding Copyright Holder. This 
+restriction only applies to the primary font name as presented to the users. 
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font Software shall 
+not be used to promote, endorse or advertise any Modified Version, except to 
+acknowledge the contribution(s) of the Copyright Holder(s) and the Author(s) or with 
+their explicit written permission. 
+
+5) The Font Software, modified or unmodified, in part or in whole, must be distributed 
+entirely under this license, and must not be distributed under any other license. The 
+requirement for fonts to remain under this license does not apply to any document 
+created using the Font Software. 
+
+TERMINATION 
+
+This license becomes null and void if any of the above conditions are not met. 
+
+DISCLAIMER 
+
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A 
+PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER 
+RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, 
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR 
+INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/stixgeneral-bundle/stixgeneral-webfont.eot b/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/stixgeneral-bundle/stixgeneral-webfont.eot
new file mode 100644
index 0000000..7fb79c7
Binary files /dev/null and b/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/stixgeneral-bundle/stixgeneral-webfont.eot differ
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/stixgeneral-bundle/stixgeneral-webfont.svg b/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/stixgeneral-bundle/stixgeneral-webfont.svg
new file mode 100644
index 0000000..d5a38c9
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/stixgeneral-bundle/stixgeneral-webfont.svg
@@ -0,0 +1,3318 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>
+This is a custom SVG webfont generated by Font Squirrel.
+Designer    : MicroPress Inc., with final additions and corrections provided by Coen Hoffman, Elsevier (retired)
+Foundry URL : http://www.stixfonts.org
+</metadata>
+<defs>
+<font id="webfontZXtFAA5Q" horiz-adv-x="685" >
+<font-face units-per-em="1000" ascent="750" descent="-250" />
+<missing-glyph horiz-adv-x="250" />
+<glyph unicode="IJ" horiz-adv-x="747" d="M728 662v-19q-61 -5 -76.5 -20.5t-15.5 -73.5v-364q0 -199 -167 -199q-46 0 -73.5 19t-27.5 53q0 20 14.5 36t34.5 16q33 0 49 -42q2 -5 5 -14l5 -12q1 -5 4 -9.5t7 -6.5t10 -2q22 0 29.5 15.5t7.5 54.5v456q0 59 -15 73.5t-78 19.5v19h287zM315 0h-297v19q63 2 80 18.5 t17 74.5v439q0 58 -16 73t-81 19v19h297v-19q-63 -3 -80.5 -19t-17.5 -73v-439q0 -56 18 -73.5t80 -19.5v-19z" />
+<glyph unicode="ij" horiz-adv-x="538" d="M453 457v-457q0 -107 -43.5 -162.5t-126.5 -55.5q-41 0 -67 15.5t-26 39.5q0 16 12 27.5t29 11.5q23 0 48 -32q23 -28 42 -28q23 0 34 18q14 25 14 121v379q0 60 -32 60q-24 0 -40 -3l-5 -1v16q80 25 156 54zM454 632q0 -22 -15 -36.5t-37 -14.5q-21 0 -35.5 14.5 t-14.5 36.5q0 21 15 36t36 15t36 -15t15 -36zM180 632q0 -22 -15 -36.5t-37 -14.5q-21 0 -35.5 14.5t-14.5 36.5q0 21 15 36t36 15q22 0 36.5 -15t14.5 -36zM253 0h-237v15q52 3 65.5 18t13.5 71v227q0 35 -7 49t-26 14q-24 0 -42 -5v16l155 55l4 -4v-351q0 -56 12.5 -71 t61.5 -19v-15z" />
+<glyph unicode="&#xfb00;" horiz-adv-x="605" d="M187 450h189q1 61 8 94.5t26 66.5q42 72 141 72q45 0 74.5 -17.5t29.5 -44.5q0 -17 -12 -29t-30 -12q-24 0 -45 36q-24 39 -53 39q-56 0 -56 -89v-116h115v-32h-115v-315q0 -56 15.5 -71t77.5 -17v-15h-245v15q43 3 55.5 19t12.5 70v314h-188v-314q0 -57 11 -71t57 -18 v-15h-235v15q54 3 68.5 18.5t14.5 70.5v314h-82v32h82q1 60 8 93.5t27 67.5q42 72 141 72q44 0 70.5 -17.5t26.5 -44.5q0 -17 -12 -29t-30 -12q-12 0 -18.5 6.5t-19.5 29.5q-24 39 -53 39q-56 0 -56 -89v-116z" />
+<glyph unicode="&#xfb01;" horiz-adv-x="558" d="M523 0h-220v15q46 4 57 18t11 66v261q0 38 -16.5 47.5t-86.5 9.5h-84v-327q0 -42 13.5 -57t54.5 -18v-15h-220v15q42 1 55 17t13 64v321h-67v33h68q9 80 21.5 116t50.5 70q55 47 147 47q59 0 92 -18t33 -50q0 -41 -35 -41q-14 0 -28 13t-25 29t-29 29t-39 13 q-45 0 -75 -32q-20 -20 -25 -47t-5 -84v-45h154q46 0 114 11l5 -4q-2 -53 -2 -99v-259q0 -47 14.5 -63.5t53.5 -20.5v-15z" />
+<glyph unicode="&#xfb02;" horiz-adv-x="556" d="M522 0h-215v15q39 4 52.5 17.5t13.5 53.5v332h-188v-337q0 -37 14 -49.5t56 -16.5v-15h-224v15q45 4 57.5 19.5t12.5 72.5v311h-70v32h72q0 78 12.5 118t52.5 76q44 39 100 39q21 0 58.5 -12.5t52.5 -12.5q5 0 33 12.5t40 12.5l5 -2v-598q0 -40 12.5 -52t52.5 -16v-15z M373 450v142q-7 -8 -18 -8q-18 0 -27.5 7.5t-22.5 29.5q-21 35 -53 35q-67 0 -67 -156v-50h188z" />
+<glyph unicode="&#xfb03;" horiz-adv-x="832" d="M797 0h-220v15q46 4 57 18t11 66v261q0 38 -16.5 48t-86.5 10h-84v-328q0 -42 13.5 -57t54.5 -18v-15h-220v15q46 4 57 18t11 63v322h-187v-315q0 -55 11.5 -69t56.5 -19v-15h-235v15q54 3 68.5 18t14.5 70v315h-82v32h82q1 60 8 93t27 67q42 72 141 72q44 0 71 -17.5 t27 -44.5q0 -17 -12 -29t-30 -12q-12 0 -19 7t-20 29q-15 23 -24 31.5t-25 8.5q-60 0 -60 -90v-115h188q9 80 21.5 116t50.5 70q55 47 147 47q59 0 92 -18t33 -50q0 -41 -35 -41q-17 0 -34.5 20t-39 40.5t-47.5 20.5q-47 0 -75 -29q-20 -20 -25 -47t-5 -84v-45h154 q46 0 114 11l5 -4q-2 -53 -2 -99v-259q0 -47 14.5 -63.5t53.5 -20.5v-15z" />
+<glyph unicode="&#xfb04;" horiz-adv-x="830" d="M796 0h-215v15q39 4 52.5 17.5t13.5 53.5v332h-188v-337q0 -37 14 -49.5t56 -16.5v-15h-224v15q45 4 57.5 19.5t12.5 72.5v311h-188v-314q0 -56 16 -71.5t77 -17.5v-15h-260v15q54 3 68.5 18.5t14.5 70.5v314h-82v32h82q1 60 8 93.5t27 67.5q42 72 141 72 q45 0 74.5 -17.5t29.5 -44.5q0 -17 -12 -29t-30 -12q-24 0 -45 36q-24 39 -53 39q-56 0 -56 -89v-116h190q0 78 12.5 118t52.5 76q44 39 100 39q21 0 58.5 -12.5t52.5 -12.5q5 0 33 12.5t40 12.5l5 -2v-598q0 -40 12.5 -52t52.5 -16v-15zM647 450v142q-7 -8 -18 -8 q-18 0 -27.5 7.5t-22.5 29.5q-21 34 -53 34q-67 0 -67 -155v-50h188z" />
+<glyph unicode="fj" horiz-adv-x="541" d="M452 461l5 -4q-2 -66 -2 -99v-358q0 -96 -39.5 -157t-130.5 -61q-33 0 -63 13t-30 42q0 17 12 28t29 11q21 0 46 -30t44 -30q21 0 34 18q14 21 14 121v405q0 28 -6 38q-13 19 -78 19h-19h-84v-327q0 -42 13.5 -57t54.5 -18v-15h-220v15q43 1 55.5 18t12.5 63v321h-67v33 h68q11 89 23 120q16 37 49 66q54 47 147 47q20 0 38.5 -2.5t39.5 -9t34 -21t13 -35.5q0 -41 -35 -41q-14 0 -28 13t-25 29t-29 29t-39 13q-45 0 -75 -32q-30 -31 -30 -105v-26v-45h154q44 0 114 11z" />
+<glyph unicode=" "  horiz-adv-x="250" />
+<glyph unicode="&#x09;" horiz-adv-x="250" />
+<glyph unicode="&#xa0;" horiz-adv-x="250" />
+<glyph unicode="!" horiz-adv-x="333" d="M175 176l-42 381q-3 30 -3 43q0 76 53 76q25 0 39 -22t14 -59q0 -16 -2 -38l-45 -381h-14zM236 42q0 -22 -15.5 -36.5t-38.5 -14.5q-22 0 -37 14.5t-15 37.5t15.5 38.5t37.5 15.5t37.5 -16t15.5 -39z" />
+<glyph unicode="&#x22;" horiz-adv-x="408" d="M299 431h-21q-32 174 -32 202q0 19 12 31t31 12q18 0 30 -12t12 -29q0 -13 -4.5 -41l-12.5 -77zM130 431h-21q-32 174 -32 202q0 19 12 31t31 12q18 0 30 -11.5t12 -29.5q0 -50 -32 -204z" />
+<glyph unicode="#" horiz-adv-x="500" d="M495 405h-104l-20 -134h99v-55h-108l-31 -216h-58l31 216h-134l-33 -216h-58l33 216h-106v55h115l21 134h-109v55h117l31 202h58l-31 -202h133l30 202h58l-30 -202h96v-55zM333 405h-133l-21 -134h134z" />
+<glyph unicode="$" horiz-adv-x="500" d="M264 637v-246q85 -46 118 -71.5t55 -59.5q21 -32 21 -90q0 -81 -49.5 -119t-144.5 -51v-87h-34v87q-64 0 -104 11.5t-82 39.5v130h15q16 -74 60 -113.5t111 -39.5v282q-105 59 -141.5 100t-36.5 103q0 70 51 108t127 43v63h34v-63q115 -7 161 -53v-111h-15 q-15 62 -50.5 96t-95.5 41zM230 407v230q-104 -21 -104 -105q0 -33 20.5 -57.5t83.5 -67.5zM264 293v-265q62 13 88 39.5t26 79.5q0 46 -23 76t-91 70z" />
+<glyph unicode="%" horiz-adv-x="747" d="M686 213q0 -91 -50 -161.5t-114 -70.5q-51 0 -86 40t-35 98q0 80 58.5 145.5t130.5 65.5q46 0 71 -30.5t25 -86.5zM663 215q0 39 -17.5 63t-45.5 24q-29 0 -49 -23q-33 -35 -55.5 -93.5t-22.5 -109.5q0 -29 16 -48.5t40 -19.5q52 0 93 63.5t41 143.5zM621 706l-430 -724 h-47l394 658q-28 -32 -54.5 -44.5t-66.5 -12.5q-35 0 -76 14q4 -23 4 -44q0 -52 -22 -104t-58 -86q-38 -37 -86 -37q-50 0 -84 39.5t-34 97.5q0 85 58 149t135 64q26 0 60 -28q47 -39 96 -39q46 0 72 15t95 82h44zM321 569q0 22 -4.5 30t-20.5 16q-23 11 -44 34 q-31 -15 -44 -26.5t-28 -36.5q-48 -76 -48 -163q0 -31 15.5 -50.5t41.5 -19.5q53 0 92.5 65t39.5 151z" />
+<glyph unicode="&#x26;" horiz-adv-x="778" d="M735 111l15 -11q-22 -54 -61 -83.5t-90 -29.5q-82 0 -170 91q-56 -49 -105.5 -70t-110.5 -21q-82 0 -126.5 38t-44.5 112q0 61 40.5 117.5t116.5 100.5l38 22q-35 85 -35 149q0 66 43.5 108t108.5 42q61 0 99 -33t38 -91q0 -55 -34.5 -93t-120.5 -75q56 -121 132 -206 q50 67 71 106.5t21 73.5q0 23 -14 33t-51 14v21h216v-21q-35 0 -54.5 -13t-39.5 -46l-39 -62l-43 -71q-19 -30 -44 -63q37 -47 72.5 -69.5t79.5 -22.5q29 0 48.5 11.5t43.5 41.5zM438 556q0 37 -22 62.5t-56 25.5q-35 0 -57 -23t-22 -60q0 -40 8 -70.5t32 -74.5q63 29 90 62 t27 78zM404 104q-86 101 -152 239q-65 -42 -91.5 -79.5t-26.5 -89.5q0 -62 34.5 -98t89.5 -36q64 0 146 64z" />
+<glyph unicode="'" horiz-adv-x="180" d="M101 431h-21q-32 174 -32 203q0 18 12.5 30t30.5 12q20 0 31 -11t11 -29q0 -45 -32 -205z" />
+<glyph unicode="(" horiz-adv-x="333" d="M304 -161l-12 -16q-116 66 -180 182t-64 247q0 277 247 424l9 -16q-102 -87 -136 -171.5t-34 -233.5q0 -148 35 -240t135 -176z" />
+<glyph unicode=")" horiz-adv-x="333" d="M29 660l12 16q114 -68 179 -184t65 -245q0 -273 -247 -424l-9 16q103 85 136.5 169.5t33.5 235.5q0 152 -33.5 243.5t-136.5 172.5z" />
+<glyph unicode="*" horiz-adv-x="500" d="M268 471l9 -6q37 -24 96 -34q34 -5 47 -14.5t13 -28.5q0 -17 -10 -28t-26 -11q-25 0 -60 44q-23 28 -69 58l-8 5v-9q0 -56 20 -110q9 -25 9 -33q0 -15 -12.5 -27t-27.5 -12q-14 0 -25 11t-11 25t12 47q16 43 16 99v9q-40 -25 -52 -36q-12 -12 -41 -45q-22 -25 -43 -25 q-17 0 -27 10t-10 26q0 19 14.5 29t48.5 16q35 7 53.5 14t49.5 26q-43 26 -97 37q-37 8 -52 18t-15 28q0 16 9 26.5t24 10.5q20 0 49 -32q42 -47 89 -73v13q0 41 -15 91q-11 33 -11 52q0 14 10.5 24t25.5 10t26 -10.5t11 -25.5q0 -16 -11 -47q-17 -45 -17 -83v-24 q34 20 58 42q5 5 18 20l22 22q8 8 18.5 15.5t18.5 7.5q17 0 27 -10.5t10 -27.5q0 -20 -11.5 -29.5t-40.5 -13.5q-56 -9 -112 -41z" />
+<glyph unicode="+" d="M636 220h-261v-261h-66v261h-261v66h261v261h66v-261h261v-66z" />
+<glyph unicode="," horiz-adv-x="250" d="M83 -141l-10 19q83 56 83 107q0 13 -14 13q-4 0 -13.5 -2t-15.5 -2q-58 0 -58 51q0 26 16.5 41.5t43.5 15.5q34 0 57 -24.5t23 -62.5q0 -46 -30.5 -89t-81.5 -67z" />
+<glyph unicode="-" horiz-adv-x="333" d="M285 194h-246v63h246v-63z" />
+<glyph unicode="." horiz-adv-x="250" d="M181 43q0 -22 -16.5 -38t-39.5 -16t-39 16t-16 39t16.5 39.5t39.5 16.5q22 0 38.5 -17t16.5 -40z" />
+<glyph unicode="/" horiz-adv-x="278" d="M287 676l-228 -690h-68l229 690h67z" />
+<glyph unicode="0" horiz-adv-x="500" d="M476 330q0 -67 -13 -126.5t-38.5 -109.5t-70.5 -79t-104 -29q-61 0 -107 31t-71 83t-36.5 111t-11.5 125q0 93 23 167.5t76.5 123.5t130.5 49q98 0 160 -96t62 -250zM380 325q0 158 -33.5 241.5t-98.5 83.5q-62 0 -95 -84t-33 -237q0 -154 33 -235.5t97 -81.5 q63 0 96.5 81.5t33.5 231.5z" />
+<glyph unicode="1" horiz-adv-x="500" d="M394 0h-276v15q55 3 75 20.5t20 59.5v449q0 49 -30 49q-14 0 -45 -12l-27 -10v14l179 91l9 -3v-597q0 -33 20 -47t75 -14v-15z" />
+<glyph unicode="2" horiz-adv-x="500" d="M474 137l-54 -137h-391v12l178 189q70 73 100 134t30 126q0 67 -37 104t-102 37q-54 0 -85.5 -28t-61.5 -102l-21 5q17 93 68.5 146t139.5 53q83 0 134 -50t51 -126q0 -113 -128 -248l-165 -176h234q33 0 52.5 13t43.5 54z" />
+<glyph unicode="3" horiz-adv-x="500" d="M61 510l-16 4q23 75 72 118.5t124 43.5q70 0 113 -38t43 -99q0 -82 -93 -138q55 -24 83 -53q44 -49 44 -129t-46 -140q-34 -46 -97.5 -69.5t-134.5 -23.5q-112 0 -112 57q0 16 12 26t29 10q25 0 61 -26q44 -31 86 -31q55 0 92.5 44.5t37.5 108.5q0 115 -104 145 q-31 10 -102 10v14q56 19 84 36q81 46 81 134q0 50 -28.5 76t-79.5 26q-90 0 -149 -106z" />
+<glyph unicode="4" horiz-adv-x="500" d="M473 167h-103v-167h-78v167h-280v64l314 445h44v-445h103v-64zM292 231v343l-240 -343h240z" />
+<glyph unicode="5" horiz-adv-x="500" d="M438 681l-36 -85q-6 -13 -27 -13h-194l-40 -85q110 -21 159 -45.5t91 -82.5q35 -48 35 -127q0 -72 -23.5 -121t-74.5 -87q-68 -49 -170 -49q-57 0 -92 17t-35 45q0 38 45 38q36 0 74 -31q39 -32 71 -32q52 0 93.5 52t41.5 117q0 96 -67 150q-87 70 -213 70q-12 0 -12 8 l1 5l109 237h207q17 0 26.5 5t21.5 21z" />
+<glyph unicode="6" horiz-adv-x="500" d="M446 684l2 -16q-118 -19 -197 -95.5t-99 -189.5q58 45 127 45q88 0 138.5 -56t50.5 -153q0 -98 -51 -160q-59 -73 -159 -73q-122 0 -177 101q-47 86 -47 192q0 164 109 276q62 64 127.5 90.5t175.5 38.5zM378 188q0 194 -135 194q-50 0 -83 -26.5t-33 -89.5 q0 -117 36.5 -184.5t105.5 -67.5q53 0 81 47.5t28 126.5z" />
+<glyph unicode="7" horiz-adv-x="500" d="M449 646l-212 -654h-65l198 596h-215q-43 0 -64 -15t-53 -67l-18 9l60 147h369v-16z" />
+<glyph unicode="8" horiz-adv-x="500" d="M445 155q0 -77 -53.5 -123t-143.5 -46q-84 0 -138 46t-54 117q0 53 26 90.5t104 92.5q-75 62 -99.5 100t-24.5 88q0 71 54.5 113.5t139.5 42.5q73 0 120.5 -41.5t47.5 -101.5q0 -55 -28.5 -88t-105.5 -74q90 -60 122.5 -107t32.5 -109zM355 533q0 52 -29 83.5t-80 31.5 t-80.5 -26.5t-29.5 -72.5t29.5 -83.5t95.5 -76.5q51 30 72.5 63.5t21.5 80.5zM271 272l-59 40q-44 -36 -62 -70.5t-18 -83.5q0 -68 34.5 -106t92.5 -38q49 0 79.5 30.5t30.5 79.5q0 45 -23 79t-75 69z" />
+<glyph unicode="9" horiz-adv-x="500" d="M59 -22l-3 20q115 20 194.5 97t109.5 199q-58 -57 -150 -57q-81 0 -130.5 56t-49.5 147q0 101 59.5 168.5t148.5 67.5q95 0 157 -76q64 -80 64 -206q0 -88 -30.5 -165.5t-89.5 -131.5q-62 -56 -121 -80.5t-159 -38.5zM362 355v39q0 254 -132 254q-47 0 -73 -34 q-15 -20 -25 -60t-10 -80q0 -89 33.5 -141.5t89.5 -52.5q40 0 78.5 19.5t38.5 55.5z" />
+<glyph unicode=":" horiz-adv-x="278" d="M192 403q0 -23 -16 -39t-39 -16t-39.5 16.5t-16.5 38.5q0 24 16 40t40 16q22 0 38.5 -16.5t16.5 -39.5zM192 44q0 -22 -16 -38.5t-39 -16.5t-39.5 16.5t-16.5 38.5q0 24 16 40t40 16q22 0 38.5 -16.5t16.5 -39.5z" />
+<glyph unicode=";" horiz-adv-x="278" d="M191 403q0 -23 -16.5 -39t-38.5 -16q-23 0 -39.5 16.5t-16.5 38.5q0 24 16 40t40 16q22 0 38.5 -16.5t16.5 -39.5zM107 -141l-10 19q83 54 83 106q0 5 -4 9.5t-10 4.5q-3 0 -13 -2t-15 -2q-58 0 -58 52q0 24 17 40t42 16q34 0 57 -24.5t23 -64.5q0 -47 -30 -88t-82 -66z " />
+<glyph unicode="&#x3c;" d="M621 -24l-565 273v10l565 275v-65l-432 -215l432 -215v-63z" />
+<glyph unicode="=" d="M637 320h-589v66h589v-66zM637 120h-589v66h589v-66z" />
+<glyph unicode="&#x3e;" d="M621 249l-565 -273v63l432 215l-432 215v65l565 -275v-10z" />
+<glyph unicode="?" horiz-adv-x="444" d="M244 164h-17q2 72 44 177q51 126 51 187q0 51 -31.5 84.5t-77.5 33.5q-36 0 -65 -19t-29 -43q0 -19 19 -38.5t19 -35.5q0 -19 -11 -31t-30 -12q-21 0 -34.5 18t-13.5 48q0 62 46 102.5t118 40.5q75 0 128.5 -43.5t53.5 -114.5q0 -45 -20 -82.5t-85 -114.5 q-49 -59 -65 -157zM290 45q0 -22 -15 -37.5t-37 -15.5q-25 0 -39.5 15.5t-14.5 37.5q0 23 15.5 38t38.5 15q21 0 36.5 -16t15.5 -37z" />
+<glyph unicode="@" horiz-adv-x="921" d="M688 73l12 -30q-120 -57 -218 -57q-157 0 -261.5 97t-104.5 244q0 84 38 158t103 122q93 69 224 69q139 0 233.5 -84.5t94.5 -208.5q0 -97 -55 -168.5t-129 -71.5q-34 0 -59.5 20.5t-29.5 52.5h-2q-50 -72 -125 -72q-38 0 -63 30.5t-25 81.5q0 96 66 182q53 70 128 70 q54 0 73 -52h2l9 38h69l-65 -254q-2 -10 -2 -17q0 -47 42 -47q49 0 87.5 60.5t38.5 136.5q0 112 -84.5 192t-202.5 80q-140 0 -220 -115q-62 -89 -62 -208q0 -131 79.5 -214t207.5 -83q102 0 201 48zM572 404q0 60 -46 60q-51 0 -98 -70q-36 -54 -36 -120q0 -40 16 -63.5 t44 -23.5q44 0 76 58q44 83 44 159z" />
+<glyph unicode="A" horiz-adv-x="722" d="M707 0h-255v19q40 0 55 9q14 7 14 24q0 26 -19 70l-41 94h-262l-46 -114q-9 -23 -9 -42q0 -23 16.5 -32t53.5 -9v-19h-199v19q42 4 61 30.5t65 136.5l206 488h20l246 -563q22 -52 39.5 -70t54.5 -22v-19zM447 257l-116 275l-115 -275h231z" />
+<glyph unicode="B" horiz-adv-x="667" d="M422 349v-1q75 -12 122 -55q49 -44 49 -115q0 -83 -65 -130.5t-174 -47.5h-337v19q59 2 77.5 19.5t18.5 74.5v437q0 58 -17 73.5t-79 19.5v19h280q129 0 195.5 -43.5t66.5 -123.5q0 -68 -41 -104q-29 -25 -96 -42zM215 366h92q150 0 150 124q0 64 -44.5 99.5t-132.5 35.5 h-41q-24 0 -24 -32v-227zM215 326v-244q0 -25 13.5 -35t48.5 -10q68 0 100 7.5t63 35.5q38 33 38 99q0 76 -47 107q-11 8 -22 13.5t-19.5 9t-22.5 6.5l-21 5q-8 1 -27 2l-28 2q-9 0 -35.5 1t-40.5 1z" />
+<glyph unicode="C" horiz-adv-x="667" d="M614 131l19 -18q-89 -127 -273 -127q-145 0 -236 89q-96 94 -96 250q0 146 90 247q94 104 243 104q64 0 119 -15q63 -18 69 -18q33 0 42 33h20l9 -227h-23q-16 72 -52 111q-71 76 -161 76q-111 0 -175.5 -81.5t-64.5 -213.5q0 -161 72 -239q67 -72 178 -72q66 0 114 23 t106 78z" />
+<glyph unicode="D" horiz-adv-x="722" d="M16 662h270q195 0 300 -91q99 -85 99 -237q0 -183 -136 -270q-99 -64 -252 -64h-281v19q58 4 73 20.5t15 75.5v435q0 58 -15 73.5t-73 19.5v19zM206 583v-499q0 -27 9.5 -37t38.5 -10q78 0 126 11t92 41q104 70 104 239q0 145 -95 228q-43 38 -94 53.5t-128 15.5 q-29 0 -41 -9t-12 -33z" />
+<glyph unicode="E" horiz-adv-x="611" d="M597 169l-46 -169h-539v19q57 4 72 20.5t15 74.5v436q0 56 -15.5 73t-71.5 20v19h530l4 -143h-25q-11 67 -39 86t-115 19h-131q-22 0 -28.5 -6.5t-6.5 -29.5v-220h151q63 0 83.5 18t29.5 78h23v-234h-23q-9 63 -29 80t-84 17h-151v-243q0 -30 21 -38.5t80 -8.5h36 q107 0 152 26t79 106h28z" />
+<glyph unicode="F" horiz-adv-x="556" d="M546 519h-25q-11 68 -37.5 86.5t-116.5 18.5h-132q-21 0 -27.5 -7.5t-6.5 -31.5v-217h142q63 0 84.5 18t28.5 77h23v-233h-23q-6 61 -27 79t-86 18h-142v-215q0 -57 16.5 -73.5t74.5 -19.5v-19h-281v19q57 4 72.5 21.5t15.5 82.5v428q0 55 -15 71.5t-72 20.5v19h529z" />
+<glyph unicode="G" horiz-adv-x="722" d="M709 354v-18q-44 -4 -57 -18t-13 -62v-200q-86 -70 -254 -70q-78 0 -149.5 28t-120.5 79q-83 87 -83 234q0 166 107 263q94 86 239 86q64 0 133 -23q27 -10 44 -10q16 0 28 9.5t17 23.5h22l8 -211h-23q-32 78 -71 116q-58 55 -146 55q-100 0 -167 -69q-77 -77 -77 -243 q0 -138 72 -218t191 -80q57 0 95 18t38 43v157q0 58 -14.5 72.5t-74.5 19.5v18h256z" />
+<glyph unicode="H" horiz-adv-x="722" d="M703 0h-279v19q58 4 73 22.5t15 82.5v191h-303v-202q0 -55 16 -73t71 -21l1 -19h-279v19q59 4 74 21.5t15 81.5v426q0 58 -15.5 74t-73.5 21v19h280v-19q-56 -5 -72.5 -21.5t-16.5 -73.5v-189h303v189q0 58 -15.5 74t-73.5 21v19h280v-19q-56 -5 -72.5 -21.5t-16.5 -73.5 v-437q0 -53 16.5 -70.5t72.5 -21.5v-19z" />
+<glyph unicode="I" horiz-adv-x="333" d="M315 0h-297v19q63 2 80 18.5t17 74.5v439q0 58 -16 73t-81 19v19h297v-19q-63 -3 -80.5 -19t-17.5 -73v-439q0 -56 18 -73.5t80 -19.5v-19z" />
+<glyph unicode="J" horiz-adv-x="373" d="M354 662v-19q-61 -5 -76.5 -20.5t-15.5 -73.5v-364q0 -199 -167 -199q-46 0 -73.5 19t-27.5 53q0 20 14.5 36t34.5 16q33 0 49 -42q2 -5 5 -14l5 -12q1 -5 4 -9.5t7 -6.5t10 -2q22 0 29.5 15.5t7.5 54.5v456q0 59 -15 73.5t-78 19.5v19h287z" />
+<glyph unicode="K" horiz-adv-x="722" d="M723 0h-303v19l27 1q42 1 42 24q0 18 -32.5 56.5t-104.5 113.5l-100 103l-26 -21v-185q0 -56 16 -71.5t73 -20.5v-19h-282v19q59 3 75 22t16 84v424q0 56 -16 73t-74 21v19h282v-19q-61 -4 -75.5 -20t-14.5 -75v-200l178 164q43 40 60.5 61t17.5 38q0 16 -8.5 23t-32.5 8 l-25 1v19h259v-19q-51 -4 -77.5 -17.5t-78.5 -63.5l-186 -178l234 -256q62 -68 91.5 -88.5t64.5 -20.5v-19z" />
+<glyph unicode="L" horiz-adv-x="611" d="M598 174l-48 -174h-538v19q55 3 71 21t16 75v431q0 59 -14.5 76t-72.5 21v19h283v-19q-61 -4 -77.5 -20.5t-16.5 -74.5v-464q0 -28 17.5 -36.5t72.5 -8.5h70q121 0 169 61q20 27 42 74h26z" />
+<glyph unicode="M" horiz-adv-x="889" d="M864 0h-280v19q59 4 74.5 22.5t15.5 81.5v449l-255 -572h-14l-252 549v-398q0 -81 17 -105t76 -27v-19h-234v19q44 3 63 13t26.5 35.5t7.5 83.5v398q0 57 -17 73.5t-78 20.5v19h198l231 -502l221 502h199v-19q-54 -1 -70.5 -19t-16.5 -74v-438q0 -53 16.5 -71t71.5 -22 v-19z" />
+<glyph unicode="N" horiz-adv-x="722" d="M707 662v-19q-51 -5 -66 -18q-16 -14 -22.5 -38t-6.5 -80v-518h-18l-441 549v-388q0 -76 17 -99.5t76 -31.5v-19h-234v19q62 7 79.5 29.5t17.5 101.5v440q-26 32 -44 42.5t-53 10.5v19h170l386 -483v340q0 76 -19 98q-12 13 -26.5 17.5t-52.5 8.5v19h237z" />
+<glyph unicode="O" horiz-adv-x="722" d="M688 331q0 -154 -91 -249.5t-236 -95.5q-146 0 -236.5 96t-90.5 252q0 152 90.5 247t236.5 95t236.5 -97.5t90.5 -247.5zM574 337q0 85 -24 152.5t-67 103.5q-56 47 -123 47q-85 0 -143 -67q-32 -36 -50.5 -102.5t-18.5 -138.5q0 -182 90 -265q49 -45 124 -45 q78 0 129 48q83 80 83 267z" />
+<glyph unicode="P" horiz-adv-x="557" d="M16 662h259q142 0 217 -63q50 -42 50 -119q0 -80 -57 -131q-42 -38 -86 -49.5t-128 -11.5q-29 0 -69 3v-179q0 -57 16.5 -73.5t77.5 -19.5v-19h-280v19q58 4 71 21t13 82v429q0 56 -14.5 72t-69.5 20v19zM202 589v-258q34 -3 61 -3q81 0 125.5 39.5t44.5 107.5 q0 81 -46 115.5t-150 34.5q-21 0 -28 -7.5t-7 -28.5z" />
+<glyph unicode="Q" horiz-adv-x="722" d="M701 -177h-48q-249 0 -347 124l-41 52q-60 21 -93.5 42.5t-61.5 58.5q-76 101 -76 232q0 156 92 250t235 94q144 0 235.5 -94.5t91.5 -248.5q0 -88 -26 -152t-82 -117q-31 -31 -65.5 -46t-88.5 -25q53 -76 119.5 -111.5t155.5 -40.5v-18zM574 338q0 86 -24 153.5 t-67 103.5q-54 45 -125 45q-86 0 -144 -71q-30 -35 -48 -99t-18 -135q0 -154 58 -235q24 -35 67.5 -56.5t87.5 -21.5q87 0 149 72q30 34 47 101t17 143z" />
+<glyph unicode="R" horiz-adv-x="667" d="M660 0h-162l-238 308l-56 -2v-194q0 -57 15.5 -73t73.5 -20v-19h-276v19q57 5 71 22t14 83v427q0 56 -14 72t-71 20v19h272q137 0 209 -59q49 -40 49 -120q0 -136 -181 -164l200 -253q21 -26 40 -35t54 -12v-19zM204 583v-240q72 1 107 8t70 26q57 32 57 114 q0 134 -183 134q-27 0 -39 -8.5t-12 -33.5z" />
+<glyph unicode="S" horiz-adv-x="556" d="M469 463h-25q-17 62 -41 94q-61 78 -145 78q-46 0 -73.5 -26.5t-27.5 -68.5q0 -20 10 -39t21.5 -32.5t40.5 -33.5t47 -31l60 -35q81 -47 118 -93.5t37 -102.5q0 -83 -58 -135t-146 -52q-65 0 -118 23q-26 11 -47 11q-12 0 -20 -9t-8 -24h-22l-29 212h22q67 -177 206 -177 q53 0 86 31.5t33 80.5q0 47 -29 79q-48 52 -168 116q-122 65 -122 172q0 80 49 127.5t125 47.5q53 0 105 -22q27 -12 44 -12q26 0 32 34h21z" />
+<glyph unicode="T" horiz-adv-x="611" d="M593 492h-24q-16 82 -45 105t-109 23h-59v-509q0 -57 17 -73t79 -19v-19h-292v19q63 4 78.5 21t15.5 83v497h-60q-81 0 -109.5 -23.5t-43.5 -104.5h-24l7 170h562z" />
+<glyph unicode="U" horiz-adv-x="722" d="M705 662v-19q-61 -6 -77.5 -29.5t-16.5 -97.5v-255q0 -77 -11 -121t-43 -81q-64 -73 -202 -73q-109 0 -170 46q-81 60 -81 217v310q0 50 -15.5 65t-74.5 19v19h283v-19q-60 -5 -75.5 -21.5t-15.5 -72.5v-312q0 -65 8 -100t36 -62q47 -45 128 -45q101 0 152 59 q23 28 30 61.5t7 99.5v263q0 78 -17 102t-77 28v19h232z" />
+<glyph unicode="V" horiz-adv-x="722" d="M697 662v-19q-31 -1 -51 -19.5t-41 -71.5l-222 -563h-15l-244 544q-32 71 -51 90t-57 20v19h265v-19l-28 -2q-45 -3 -45 -31q0 -20 39 -107l152 -342l147 369q19 48 19 72q0 7 -1.5 12.5t-3.5 9.5t-7.5 7t-8.5 4.5t-11 3t-11.5 2t-14 1.5t-14.5 1v19h204z" />
+<glyph unicode="W" horiz-adv-x="944" d="M932 662v-19q-40 -8 -54.5 -19.5t-28.5 -50.5q-114 -306 -204 -584h-15l-160 423l-154 -423h-15q-34 101 -101 285l-91 249q-25 72 -45.5 95.5t-58.5 24.5v19h244v-19q-37 -1 -50.5 -8t-13.5 -23q0 -17 11 -47l144 -376l104 283l-28 75q-24 65 -41 80t-61 16v19h265v-19 q-77 -2 -77 -35q0 -13 17 -58l143 -364l126 339q17 48 17 77q0 40 -70 41v19h197z" />
+<glyph unicode="X" horiz-adv-x="722" d="M704 0h-296v19l26 2q50 3 50 29q0 22 -51 98l-95 141l-119 -149q-53 -66 -53 -89q0 -15 16.5 -22t59.5 -10v-19h-232v19q39 4 63.5 23t81.5 91l156 195l-106 155q-70 102 -101 128.5t-82 31.5v19h301v-19l-29 -1q-23 -1 -34.5 -7t-11.5 -22q0 -6 1.5 -12.5t6.5 -15.5 l8 -17l12 -20l15 -22l19 -28l21 -30l44 -64l112 140q40 49 40 67q0 17 -14 24t-54 8v19h237v-19q-48 -3 -76 -21.5t-76 -77.5l-143 -177l192 -274q29 -42 50 -55.5t61 -18.5v-19z" />
+<glyph unicode="Y" horiz-adv-x="722" d="M703 662v-19q-44 -4 -69.5 -25t-68.5 -87l-148 -228v-192q0 -57 19 -73t84 -19v-19h-306v19q68 5 84.5 21.5t16.5 82.5v171l-131 192q-68 100 -97 127.5t-65 29.5v19h279v-19l-24 -1q-47 -1 -47 -26q0 -21 18 -47l146 -221l145 222q14 21 14 42q-1 17 -15.5 23.5 t-52.5 7.5v19h218z" />
+<glyph unicode="Z" horiz-adv-x="612" d="M598 176l-25 -176h-563v15l437 609h-214q-99 0 -134 -35q-18 -19 -25.5 -37.5t-15.5 -60.5h-26l21 171h525v-15l-432 -609h252q78 0 117 28q23 16 34 37.5t26 72.5h23z" />
+<glyph unicode="[" horiz-adv-x="333" d="M299 -156h-211v818h211v-25h-83q-26 0 -39 -11t-13 -37v-666q0 -54 52 -54h83v-25z" />
+<glyph unicode="\" horiz-adv-x="278" d="M287 -14h-68l-228 690h67z" />
+<glyph unicode="]" horiz-adv-x="333" d="M245 -156h-211v25h88q26 0 36.5 11t10.5 35v668q0 54 -51 54h-84v25h211v-818z" />
+<glyph unicode="^" horiz-adv-x="469" d="M446 297h-68l-143 289l-143 -289h-68l181 365h60z" />
+<glyph unicode="_" horiz-adv-x="500" d="M500 -125h-500v50h500v-50z" />
+<glyph unicode="`" horiz-adv-x="333" d="M242 507h-40l-154 96q-30 19 -30 43q0 32 36 32q21 0 43 -23z" />
+<glyph unicode="a" horiz-adv-x="444" d="M442 66v-28q-38 -48 -90 -48q-57 0 -64 73h-1q-64 -73 -145 -73q-47 0 -76 27.5t-29 76.5q0 70 70 117q48 32 180 81v54q0 45 -21.5 67.5t-56.5 22.5q-30 0 -50 -14.5t-20 -34.5q0 -9 3 -20t3 -22q0 -15 -13.5 -28t-32.5 -13q-17 0 -30 13t-13 33q0 48 51 80 q47 30 115 30q81 0 118 -45q18 -21 23 -42.5t5 -68.5v-191q0 -66 31 -66q20 0 43 19zM287 127v141q-92 -32 -128 -66q-34 -31 -34 -77q0 -38 19 -57.5t50 -19.5q33 0 58 16q21 15 28 28t7 35z" />
+<glyph unicode="b" horiz-adv-x="500" d="M153 681v-305q16 38 52.5 61t82.5 23q79 0 129.5 -63t50.5 -157q0 -110 -67 -180t-167 -70q-61 0 -113 20.5t-52 45.5v510q0 37 -9 47.5t-40 10.5q-7 0 -17 -2v17l30 9l115 35zM153 318v-244q0 -23 28.5 -37.5t68.5 -14.5q59 0 93 43q37 46 37 132q0 98 -39 153 q-33 47 -89 47q-40 0 -69.5 -23.5t-29.5 -55.5z" />
+<glyph unicode="c" horiz-adv-x="444" d="M398 156l14 -9q-43 -84 -82 -115q-51 -42 -115 -42q-83 0 -136.5 62.5t-53.5 159.5q0 127 84 197q62 51 135 51q63 0 108.5 -30.5t45.5 -72.5q0 -17 -14 -29.5t-33 -12.5q-35 0 -48 46l-6 22q-8 28 -20 38t-39 10q-61 0 -98.5 -48t-37.5 -126q0 -86 43 -140.5t112 -54.5 q43 0 74 21t67 73z" />
+<glyph unicode="d" horiz-adv-x="500" d="M491 42l-147 -52l-4 3v64q-48 -67 -128 -67q-83 0 -134 59.5t-51 155.5q0 106 61 180.5t147 74.5q54 0 105 -43v156q0 31 -9 41t-37 10q-14 0 -22 -1v16q91 24 147 44l5 -2v-567q0 -35 8.5 -46t35.5 -11q6 0 23 1v-16zM340 102v230q0 40 -30.5 70t-71.5 30q-57 0 -91 -51 t-34 -136q0 -92 37.5 -147.5t100.5 -55.5q47 0 74 32q15 17 15 28z" />
+<glyph unicode="e" horiz-adv-x="444" d="M408 164l16 -7q-60 -167 -209 -167q-88 0 -139 61.5t-51 165.5q0 107 57 175t150 68q90 0 139 -69q29 -40 34 -114h-308q4 -63 12.5 -96t33.5 -67q42 -55 111 -55q49 0 82.5 24t71.5 81zM99 309h204q-9 63 -29.5 89t-68.5 26q-42 0 -70 -29.5t-36 -85.5z" />
+<glyph unicode="f" horiz-adv-x="333" d="M21 450h82q1 60 8 93.5t27 67.5q42 72 141 72q45 0 74.5 -17.5t29.5 -44.5q0 -17 -12 -29t-30 -12q-24 0 -45 36q-24 39 -53 39q-56 0 -56 -89v-116h122v-32h-122v-314q0 -56 16 -71.5t77 -17.5v-15h-260v15q54 3 68.5 18.5t14.5 70.5v314h-82v32z" />
+<glyph unicode="g" horiz-adv-x="500" d="M470 388h-83q19 -43 19 -84q0 -77 -52 -116t-104 -39q-11 0 -38 3l-19 2q-20 -6 -40 -27t-20 -36q0 -23 78 -27l129 -6q55 -2 88 -31t33 -76q0 -58 -60 -105q-83 -64 -200 -64q-72 0 -122.5 28.5t-50.5 68.5q0 28 22 55.5t76 66.5q-32 15 -42.5 26t-10.5 27q0 29 46 69 q23 19 43 40q-50 25 -71.5 56t-21.5 78q0 68 48.5 115.5t118.5 47.5q40 0 80 -15l22 -8q29 -10 55 -10h77v-39zM152 338v-3q0 -72 28.5 -116.5t74.5 -44.5q34 0 54 24.5t20 65.5q0 66 -30 121q-25 47 -73 47q-35 0 -54.5 -25t-19.5 -69zM433 -64q0 28 -27.5 38.5t-96.5 10.5 q-99 0 -162 13q-30 -36 -39.5 -52.5t-9.5 -33.5q0 -33 39.5 -53t105.5 -20q85 0 137.5 26.5t52.5 70.5z" />
+<glyph unicode="h" horiz-adv-x="500" d="M487 0h-212v15q44 5 56 20t12 67v198q0 106 -74 106q-30 0 -55 -14t-57 -49v-241q0 -52 12 -67t56 -20v-15h-216v15q43 6 53.5 20t10.5 67v471q0 32 -9.5 41.5t-41.5 9.5q-9 0 -12 -1v16l27 8q77 23 115 36l5 -3v-304q35 45 69 64.5t78 19.5q123 0 123 -159v-199 q0 -52 9.5 -65.5t50.5 -21.5v-15z" />
+<glyph unicode="i" horiz-adv-x="278" d="M180 632q0 -22 -15 -36.5t-37 -14.5q-21 0 -35.5 14.5t-14.5 36.5q0 21 15 36t36 15q22 0 36.5 -15t14.5 -36zM253 0h-237v15q52 3 65.5 18t13.5 71v227q0 35 -7 49t-26 14q-24 0 -42 -5v16l155 55l4 -4v-351q0 -56 12.5 -71t61.5 -19v-15z" />
+<glyph unicode="j" horiz-adv-x="278" d="M193 457v-457q0 -107 -43.5 -162.5t-126.5 -55.5q-41 0 -67 15.5t-26 39.5q0 16 12 27.5t29 11.5q23 0 48 -32q23 -28 42 -28q23 0 34 18q14 25 14 121v379q0 60 -32 60q-24 0 -40 -3l-5 -1v16q80 25 156 54zM194 632q0 -22 -15 -36.5t-37 -14.5q-21 0 -35.5 14.5 t-14.5 36.5q0 21 15 36t36 15t36 -15t15 -36z" />
+<glyph unicode="k" horiz-adv-x="500" d="M505 0h-218v15h19q21 0 21 15q0 9 -11 23l-150 198v-184q0 -26 12.5 -38t42.5 -13l20 -1v-15h-234v15q54 9 64.5 18.5t10.5 48.5v482q0 36 -9 48.5t-34 12.5q-6 0 -32 -2v16l30 8q60 16 125 36l4 -2v-420l137 122q23 21 23 35q0 10 -10.5 13.5t-39.5 4.5v14h204v-15 q-50 0 -88.5 -21.5t-127.5 -104.5l-29 -27l153 -194q54 -69 117 -73v-15z" />
+<glyph unicode="l" horiz-adv-x="278" d="M257 0h-236v15q47 4 62 19.5t15 57.5v469q0 36 -9 50t-33 14q-21 0 -37 -2v16q95 23 158 44l5 -4v-592q0 -42 14 -55.5t61 -16.5v-15z" />
+<glyph unicode="m" horiz-adv-x="778" d="M775 0h-218v15q42 4 53.5 17.5t11.5 57.5v206q0 60 -17.5 86t-59.5 26q-35 0 -59.5 -14t-47.5 -47v-252q0 -48 14.5 -63.5t57.5 -16.5v-15h-224v15q44 3 56 14.5t12 56.5v211q0 111 -65 111q-28 0 -59.5 -12.5t-46.5 -30.5q-13 -15 -13 -17v-278q0 -32 14 -42.5t54 -12.5 v-15h-222v15q42 1 56 15.5t14 57.5v248q0 37 -8 51.5t-27 14.5q-15 0 -32 -4v17q68 19 139 45l8 -3v-74h2q45 47 79.5 62t73.5 15q79 0 106 -84q78 84 163 84q116 0 116 -180v-203q0 -33 10 -45.5t33 -14.5l26 -2v-15z" />
+<glyph unicode="n" horiz-adv-x="500" d="M485 0h-208l1 15q37 3 49.5 21.5t12.5 68.5v199q0 101 -73 101q-25 0 -47 -12t-56 -45v-276q0 -30 13.5 -42t51.5 -15v-15h-211v15q38 3 50 18.5t12 60.5v243q0 37 -7 51t-28 14q-20 0 -29 -4v17q70 20 137 45l8 -3v-78h1q71 81 144 81q57 0 87.5 -40t30.5 -114v-221 q0 -40 12 -53t49 -17v-15z" />
+<glyph unicode="o" horiz-adv-x="500" d="M470 231q0 -105 -62.5 -173t-162.5 -68q-92 0 -154 67.5t-62 170.5q0 104 62 168t163 64q93 0 154.5 -63.5t61.5 -165.5zM380 204q0 114 -50 178q-40 50 -95 50q-52 0 -84 -42.5t-32 -116.5q0 -128 53 -205q34 -50 90 -50q55 0 86.5 49.5t31.5 136.5z" />
+<glyph unicode="p" horiz-adv-x="500" d="M159 458v-77q63 79 144 79q73 0 120 -60t47 -153q0 -109 -60.5 -183t-149.5 -74q-31 0 -52.5 9t-48.5 34v-157q0 -47 16 -60.5t72 -14.5v-18h-242v17q44 4 57 17t13 52v468q0 35 -8 46t-33 11q-16 0 -25 -1v16q70 21 144 51zM159 334v-246q0 -22 34.5 -44t69.5 -22 q54 0 87.5 51t33.5 134q0 88 -33.5 140.5t-89.5 52.5q-35 0 -68.5 -22t-33.5 -44z" />
+<glyph unicode="q" horiz-adv-x="500" d="M488 -217h-236v17q53 4 71 19t18 57v188q-68 -74 -157 -74q-70 0 -115 60t-45 155q0 108 63.5 181.5t156.5 73.5q56 0 116 -35l54 32h11v-598q0 -32 12 -43.5t51 -15.5v-17zM341 127v206q0 98 -93 98q-64 0 -101 -51t-37 -139q0 -52 15.5 -96.5t40.5 -66.5q30 -27 75 -27 q53 0 88 32q12 11 12 44z" />
+<glyph unicode="r" horiz-adv-x="333" d="M160 458v-92q38 54 63.5 74t56.5 20q26 0 40.5 -14t14.5 -39q0 -21 -10.5 -33t-28.5 -12q-19 0 -40 20q-16 15 -26 15q-21 0 -45.5 -29t-24.5 -53v-225q0 -43 17 -58t68 -17v-15h-240v15q48 9 59.5 20t11.5 49v250q0 33 -7.5 46.5t-26.5 13.5q-16 0 -35 -4v16 q63 20 148 54z" />
+<glyph unicode="s" horiz-adv-x="389" d="M156 301l104 -63q50 -30 69 -56t19 -67q0 -50 -41.5 -87.5t-98.5 -37.5q-47 0 -73 9q-27 9 -46 9q-17 0 -24 -12h-13v157h16q16 -73 46 -107t81 -34q37 0 60 21t23 53q0 46 -53 75l-54 30q-120 67 -120 145q0 58 37.5 90.5t100.5 32.5q44 0 67 -11q18 -8 28 -8q7 0 16 10 h11l5 -136h-15q-17 68 -42.5 95.5t-70.5 27.5q-34 0 -54.5 -17t-20.5 -51q0 -17 11.5 -36.5t31.5 -31.5z" />
+<glyph unicode="t" horiz-adv-x="278" d="M266 77l13 -11q-48 -76 -121 -76q-88 0 -88 127v301h-53q-4 3 -4 7q0 8 17 19q38 22 97 107q2 3 9.5 12.5t10.5 15.5q7 0 7 -13v-116h101v-32h-101v-286q0 -48 12 -69t40 -21q30 0 60 35z" />
+<glyph unicode="u" horiz-adv-x="500" d="M480 50v-14q-78 -21 -137 -45l-5 3v82h-2q-63 -86 -143 -86q-57 0 -89.5 35t-32.5 93v251q0 37 -13 51t-49 16v14h146v-323q0 -34 20.5 -56.5t50.5 -22.5q49 0 84 31q13 12 18 22.5t5 35.5v231q0 39 -14 50.5t-60 14.5v17h158v-343q0 -35 11.5 -46t45.5 -11h6z" />
+<glyph unicode="v" horiz-adv-x="500" d="M477 450v-15q-23 -2 -34 -15t-31 -63l-128 -321q-20 -50 -28 -50t-18 26q-2 3 -4 10t-4 11l-120 287q-32 76 -47 94.5t-44 20.5v15h196v-15q-26 -2 -36 -8t-10 -19q0 -16 9 -38l102 -256l99 259q6 15 6 30q0 28 -47 32v15h139z" />
+<glyph unicode="w" horiz-adv-x="722" d="M694 450v-15q-15 -5 -22 -14.5t-19 -39.5l-138 -346q-20 -49 -28 -49q-5 0 -8.5 6.5t-15.5 36.5l-91 236l-112 -240q-18 -39 -25 -39q-9 0 -26 44l-135 342q-15 39 -25 50t-28 13v15h180v-15q-26 -3 -36 -10t-10 -23q0 -15 6 -30l99 -261l91 199l-20 56q-14 40 -27.5 53 t-41.5 16v15h203v-15q-35 -5 -46.5 -12t-11.5 -23t17 -60l84 -224l90 222q17 42 17 67q0 12 -9.5 18.5t-34.5 11.5v15h123z" />
+<glyph unicode="x" horiz-adv-x="500" d="M479 0h-201v15q25 2 32.5 6.5t7.5 17.5q0 9 -6 18l-91 140l-79 -123q-20 -31 -20 -41q0 -18 40 -18v-15h-145v15q25 2 38.5 11.5t34.5 39.5l114 165l-94 144q-23 35 -39 47.5t-38 12.5h-9v15h207v-15q-43 -1 -43 -22t46 -89q13 -18 14 -20q5 6 30 44q5 9 12 19t10.5 16 t7.5 12t5.5 10.5t1.5 7.5q0 19 -40 22v15h158v-15q-51 -2 -81 -44l-83 -120l128 -196q39 -60 82 -60v-15z" />
+<glyph unicode="y" horiz-adv-x="500" d="M475 450v-15q-18 -2 -29 -13t-21 -38l-150 -409q-39 -106 -78.5 -149.5t-96.5 -43.5q-32 0 -51 16.5t-19 41.5q0 19 12.5 32.5t30.5 13.5q29 0 52 -13q13 -7 26 -7q21 0 50 44q14 20 27 57t13 51q0 13 -42 101l-132 282q-13 29 -53 35v14h205v-15q-32 -1 -44.5 -7 t-12.5 -20q0 -11 13 -41l112 -250l97 276q4 9 4 18q0 24 -46 24v15h133z" />
+<glyph unicode="z" horiz-adv-x="444" d="M418 136l-15 -136h-376v15l266 405h-135q-47 0 -63.5 -16.5t-23.5 -71.5h-18l4 118h346v-15l-269 -405h133q84 0 106 27q14 17 27 83z" />
+<glyph unicode="{" horiz-adv-x="480" d="M350 -170v-11q-84 1 -121 25q-44 28 -44 115v177q0 52 -17.5 75t-67.5 39q50 15 67.5 38t17.5 75v178q0 87 44 114q38 24 121 25v-11q-52 -13 -71.5 -40t-19.5 -83v-168q0 -62 -19 -88t-75 -41q56 -14 75 -40t19 -88v-168q0 -56 19.5 -83t71.5 -40z" />
+<glyph unicode="|" horiz-adv-x="200" d="M133 -14h-66v690h66v-690z" />
+<glyph unicode="}" horiz-adv-x="480" d="M295 540v-177q0 -52 17.5 -75t67.5 -38q-50 -16 -67.5 -39t-17.5 -75v-178q0 -87 -44 -114q-38 -24 -121 -25v11q52 13 71.5 40t19.5 83v168q0 62 19 88t75 41q-56 14 -75 39.5t-19 88.5v168q0 56 -19.5 83t-71.5 40v11q84 -1 121 -25q44 -28 44 -115z" />
+<glyph unicode="~" horiz-adv-x="541" d="M466 325l36 -51q-32 -47 -61 -66.5t-64 -19.5q-10 0 -17.5 0.5t-16.5 3.5l-14 4q-5 1 -15 6l-16 7q-4 2 -19 10.5t-22 11.5q-50 25 -97 25q-26 0 -48.5 -19.5t-35.5 -53.5l-36 50q44 87 125 87q25 0 46 -6t71 -28l18 -8q15 -8 25.5 -12.5t26 -9t26.5 -4.5q31 0 49.5 18 t38.5 55z" />
+<glyph unicode="&#xa1;" horiz-adv-x="330" d="M202 417q0 -23 -15.5 -39t-38.5 -16q-22 0 -37 16t-15 39q0 22 15 36.5t38 14.5t38 -14.5t15 -36.5zM156 282l44 -381q2 -18 2 -39q0 -35 -14.5 -57.5t-38.5 -22.5q-53 0 -53 79q0 14 2 38l45 383h13z" />
+<glyph unicode="&#xa2;" horiz-adv-x="500" d="M435 164l13 -8q-25 -52 -43.5 -78t-44.5 -49q-44 -38 -102 -38q-26 0 -57 9l-49 -138h-34l51 150q-50 28 -74 64q-42 61 -42 143q0 101 63.5 171t156.5 70q21 0 51 -5l44 124h35l-47 -135q75 -30 75 -84q0 -20 -12 -32.5t-31 -12.5t-32 11.5t-26 40.5l-101 -291 q31 -12 59 -12q44 0 76 22t71 78zM198 98l115 323q-23 9 -47 9q-61 0 -98.5 -46.5t-37.5 -123.5q0 -54 15.5 -91t52.5 -71z" />
+<glyph unicode="&#xa3;" horiz-adv-x="500" d="M344 328h-121q1 -20 1 -61q0 -31 -25 -156q84 -35 149 -35q68 0 113 49q15 16 23 16q6 0 6 -5q0 -14 -14.5 -42.5t-30.5 -45.5q-52 -55 -122 -55q-33 0 -63.5 13t-81.5 48q-30 -36 -51 -49t-47 -13q-31 0 -49.5 16.5t-18.5 45.5q0 34 25 55t66 21q22 0 46 -5q3 12 3 21 q0 47 -16 149l-5 33h-108v45h107q-7 36 -7 69q0 107 53 170.5t142 63.5q56 0 93 -26.5t37 -66.5q0 -23 -14 -38t-36 -15t-30 13.5t-9 53.5q-1 52 -56 52q-45 0 -70 -36t-25 -101q0 -44 11 -139h125v-45zM142 76q0 7 -17.5 12.5t-36.5 5.5q-50 0 -50 -37q0 -17 11.5 -27 t30.5 -10q28 0 47 25q15 18 15 31z" />
+<glyph unicode="&#xa4;" horiz-adv-x="500" d="M522 40l-48 -50l-98 98q-59 -41 -125 -41q-68 0 -127 41l-96 -98l-50 50l98 96q-41 59 -41 126q0 69 41 126l-98 98l50 48l96 -96q61 39 127 39q69 0 125 -39l98 96l48 -48l-96 -98q39 -58 39 -125q0 -66 -39 -127zM397 264q0 62 -43 105.5t-105 43.5q-60 0 -103 -44 t-43 -106q0 -63 43.5 -107.5t104.5 -44.5q62 0 104 44.5t42 108.5z" />
+<glyph unicode="&#xa5;" horiz-adv-x="500" d="M512 662v-19q-39 -8 -65.5 -32t-52.5 -75l-92 -184h146v-40h-166l-7 -14v-76h173v-40h-173v-73q0 -53 16 -71t64 -19v-19h-244v19q50 2 64.5 20.5t14.5 80.5v62h-174v40h174v76l-7 14h-167v40h144l-95 173q-41 74 -62 95t-56 23v19h243v-19q-36 -1 -50.5 -7t-14.5 -21 q0 -20 13 -46l118 -221l112 220q14 26 14 45q0 13 -14.5 21.5t-36.5 8.5h-14v19h195z" />
+<glyph unicode="&#xa6;" horiz-adv-x="200" d="M133 400h-66v276h66v-276zM133 -14h-66v276h66v-276z" />
+<glyph unicode="&#xa7;" horiz-adv-x="500" d="M200 513l137 -113q89 -74 89 -155q0 -55 -33 -87.5t-89 -32.5h-12q56 -49 75 -78t19 -68q0 -57 -39.5 -92t-104.5 -35q-58 0 -98 29t-40 71q0 23 15.5 38.5t38.5 15.5q20 0 34 -12t14 -30q0 -22 -23 -41q-11 -9 -11 -15q0 -14 21.5 -24.5t49.5 -10.5q40 0 63.5 21 t23.5 56q0 29 -20.5 55.5t-68.5 59.5q-92 63 -131.5 114.5t-39.5 106.5q0 51 32.5 85t81.5 34q16 0 26 -1q-60 50 -80 80t-20 70q0 55 38.5 88.5t100.5 33.5q55 0 91.5 -28t36.5 -70q0 -25 -13.5 -39t-37.5 -14q-21 0 -34 12t-13 31q0 26 26 44q8 7 8 11q0 14 -18 23t-44 9 q-38 0 -61.5 -19.5t-23.5 -51.5q0 -42 34 -71zM374 211q0 41 -53 94q-80 78 -131 78q-29 0 -48 -19t-19 -47q0 -42 46 -88q84 -83 136 -83q27 0 48 20t21 45z" />
+<glyph unicode="&#xa8;" horiz-adv-x="333" d="M316 572q0 -20 -15 -34.5t-36 -14.5q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5t35 -15t15 -35zM117 572q0 -20 -15 -34.5t-36 -14.5q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5t35 -15t15 -35z" />
+<glyph unicode="&#xa9;" horiz-adv-x="760" d="M547 248l-17 -76q-2 -10 -52.5 -20.5t-95.5 -10.5q-88 0 -140 51.5t-52 136.5q0 92 61 147.5t160 55.5q55 0 107 -22q13 -6 13 -17v-71h-17q-6 44 -34 67t-70 23q-66 0 -104.5 -48.5t-38.5 -126.5q0 -82 40.5 -129t107.5 -47q41 0 68.5 20.5t47.5 66.5h16zM722 330 q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM667 334q0 124 -85.5 212t-204.5 88q-115 0 -199.5 -90.5t-84.5 -212.5q0 -124 85 -213.5t203 -89.5t202 90t84 216z" />
+<glyph unicode="&#xaa;" horiz-adv-x="276" d="M270 442v-18q-31 -30 -59 -30q-20 0 -30 10t-15 34q-47 -44 -91 -44q-31 0 -51 19t-20 49q0 32 22 51q20 17 41 27t90 36v30q0 42 -36 42q-17 0 -31 -7t-14 -16q0 -2 2 -14q1 -3 1 -8q0 -10 -9 -17.5t-22 -7.5q-14 0 -23 9t-9 22q0 29 30.5 48t77.5 19q105 0 105 -96 v-115q0 -21 2.5 -28t10.5 -7q15 0 28 12zM158 474v77q-53 -19 -72 -33t-19 -33q0 -18 11 -31t27 -13q19 0 42 11q11 10 11 22z" />
+<glyph unicode="&#xab;" horiz-adv-x="500" d="M42 227l81 73l48 44l56 53q22 19 26 19q11 0 11 -11q0 -6 -50 -72l-84 -106q23 -27 84 -107q50 -65 50 -76t-12 -11q-4 0 -27 21l-54 54l-48 46zM234 227l81 73l48 44l56 53q22 19 26 19q11 0 11 -11q0 -6 -50 -72l-84 -106q23 -27 84 -107q50 -65 50 -76t-12 -11 q-4 0 -27 21l-54 54l-48 46z" />
+<glyph unicode="&#xac;" horiz-adv-x="600" d="M552 115h-66v212h-438v66h504v-278z" />
+<glyph unicode="&#xad;" horiz-adv-x="333" d="M285 194h-246v63h246v-63z" />
+<glyph unicode="&#xae;" horiz-adv-x="760" d="M567 152h-64q-28 0 -71 79q-15 27 -52 83h-48v-92q0 -35 7 -44t40 -11v-15h-160l1 15q35 3 41.5 11t6.5 44v230q0 33 -7 41.5t-40 11.5v15h172q56 0 87 -26.5t31 -71.5q0 -32 -20 -59t-59 -39l57 -79q39 -53 78 -85v-8zM332 333h43q32 0 50.5 24t18.5 61q0 83 -74 83h-38 v-168zM722 329q0 -144 -99 -243.5t-242 -99.5q-145 0 -244 100t-99 246q0 145 100.5 244.5t246.5 99.5q140 0 238.5 -101.5t98.5 -245.5zM667 330q0 127 -84.5 215.5t-204.5 88.5q-115 0 -200 -90.5t-85 -212.5q0 -124 85 -213.5t203 -89.5q117 0 201.5 89.5t84.5 212.5z " />
+<glyph unicode="&#xaf;" horiz-adv-x="333" d="M322 547h-311v54h311v-54z" />
+<glyph unicode="&#xb0;" horiz-adv-x="400" d="M343 533q0 -60 -41.5 -101.5t-101.5 -41.5q-61 0 -102 41.5t-41 102.5q0 60 42 101t103 41q58 0 99.5 -42t41.5 -101zM304 534q0 44 -31.5 76t-74.5 32q-41 0 -71.5 -32.5t-30.5 -76.5q0 -45 30.5 -77t73.5 -32t73.5 32.5t30.5 77.5z" />
+<glyph unicode="&#xb1;" d="M637 242h-262v-209h-66v209h-261v66h261v194h66v-194h262v-66zM637 -87h-589v66h589v-66z" />
+<glyph unicode="&#xb2;" horiz-adv-x="300" d="M296 355l-39 -85h-251v24l101 108q78 84 78 138q0 32 -20.5 54t-50.5 22q-54 0 -88 -74l-25 15q22 64 55 91.5t95 27.5q58 0 92 -30.5t34 -78.5q0 -37 -19 -70.5t-67 -80.5l-84 -81h113q40 0 58 27z" />
+<glyph unicode="&#xb3;" horiz-adv-x="300" d="M204 511v-2q43 -11 65 -41.5t22 -68.5q0 -60 -52 -98.5t-135 -38.5q-40 0 -65.5 16t-25.5 40q0 31 37 31q15 0 41 -19q27 -20 51 -20q30 0 49 20t19 51q0 39 -23.5 60.5t-65.5 21.5q-4 0 -28 -3v29q52 18 73.5 37.5t21.5 46.5q0 47 -56 47q-27 0 -46.5 -13t-39.5 -45 l-25 19q27 51 58.5 73t76.5 22q46 0 77 -24t31 -59q0 -52 -60 -82z" />
+<glyph unicode="&#xb4;" horiz-adv-x="333" d="M93 507l147 148q23 23 42 23q35 0 35 -32q0 -23 -30 -42l-154 -97h-40z" />
+<glyph unicode="&#xb5;" horiz-adv-x="500" d="M430 450v-354q0 -69 31 -69q19 0 51 29v-9q-26 -33 -43.5 -45t-45.5 -12q-30 0 -52.5 24t-23.5 66h-2q-49 -90 -131 -90q-43 0 -71 17.5t-52 56.5q1 -24 19 -100.5t18 -104.5q0 -77 -48 -77q-21 0 -32.5 21.5t-11.5 55.5q0 29 12 107t12 88v396h88v-295q0 -51 22 -77 t62 -26q79 0 110 63v335h88z" />
+<glyph unicode="&#xb6;" horiz-adv-x="592" d="M532 -154h-154v794h-58v-794h-155v22q58 4 73.5 22t15.5 81v302q-99 8 -146.5 52.5t-47.5 145.5q0 98 50 144.5t159 46.5h263v-19q-56 -5 -72 -24.5t-16 -76.5v-583q0 -54 15.5 -70.5t72.5 -20.5v-22zM254 295v345q-69 -7 -93.5 -43.5t-24.5 -123.5t27 -129t91 -49z" />
+<glyph unicode="&#xb7;" horiz-adv-x="250" d="M181 253q0 -22 -16.5 -38t-39.5 -16t-39 16t-16 39t16.5 39.5t39.5 16.5q22 0 38.5 -17t16.5 -40z" />
+<glyph unicode="&#xb8;" horiz-adv-x="333" d="M174 0l-25 -65q15 3 26 3q41 0 63.5 -18t22.5 -51q0 -39 -33.5 -61.5t-91.5 -22.5q-45 0 -84 16l14 31q36 -12 65 -12q25 0 40 12t15 32q0 19 -12 27.5t-41 8.5q-17 0 -28 -4l-7 5l41 99h35z" />
+<glyph unicode="&#xb9;" horiz-adv-x="300" d="M248 270h-191v24q32 2 42.5 9t10.5 24v254q0 30 -9 30q-12 0 -42 -14v24l118 55l14 -4v-339q0 -20 13 -29.5t44 -9.5v-24z" />
+<glyph unicode="&#xba;" horiz-adv-x="310" d="M304 542q0 -63 -43.5 -105.5t-109.5 -42.5q-63 0 -104 39t-41 100q0 64 42 103.5t111 39.5q64 0 104.5 -37.5t40.5 -96.5zM231 516q0 56 -23 91.5t-60 35.5q-31 0 -50 -20.5t-19 -53.5q0 -63 25 -108q19 -34 56 -34q71 0 71 89z" />
+<glyph unicode="&#xbb;" horiz-adv-x="500" d="M265 222l-81 -73l-47 -45l-58 -52q-21 -19 -25 -19q-11 0 -11 11q0 6 50 72l84 106q-23 27 -84 107q-50 65 -50 76t12 11q4 0 26 -22l56 -53l47 -46zM458 222l-81 -73l-47 -45l-58 -52q-21 -19 -25 -19q-11 0 -11 11q0 6 50 72l84 106q-23 27 -84 107q-50 65 -50 76 t12 11q4 0 26 -22l56 -53l47 -46z" />
+<glyph unicode="&#xbc;" horiz-adv-x="750" d="M632 676l-450 -690h-49l453 690h46zM713 90h-55v-90h-70v90h-180v49l203 266h47v-258h55v-57zM588 147v179l-135 -179h135zM223 270h-181v24q32 2 42.5 9t10.5 24v254q0 30 -9 30q-12 0 -42 -14v24l108 55l14 -4v-339q0 -20 13 -29.5t44 -9.5v-24z" />
+<glyph unicode="&#xbd;" horiz-adv-x="750" d="M741 85l-39 -85h-251v24l101 108q78 84 78 138q0 32 -20.5 54t-50.5 22q-54 0 -88 -74l-25 15q22 64 55 91.5t95 27.5q58 0 92 -30.5t34 -78.5q0 -37 -19 -70.5t-67 -80.5l-84 -81h113q40 0 58 27zM595 676l-450 -690h-49l453 690h46zM217 270h-181v24q32 2 42.5 9 t10.5 24v254q0 30 -9 30q-12 0 -42 -14v24l108 55l14 -4v-339q0 -20 13 -29.5t44 -9.5v-24z" />
+<glyph unicode="&#xbe;" horiz-adv-x="750" d="M204 511v-2q43 -11 65 -41.5t22 -68.5q0 -60 -52 -98.5t-135 -38.5q-40 0 -65.5 16t-25.5 40q0 31 37 31q15 0 41 -19q27 -20 51 -20q30 0 49 20t19 51q0 39 -23.5 60.5t-65.5 21.5q-4 0 -28 -3v29q52 18 73.5 37.5t21.5 46.5q0 47 -56 47q-27 0 -46.5 -13t-39.5 -45 l-25 19q27 51 58.5 73t76.5 22q46 0 77 -24t31 -59q0 -52 -60 -82zM637 676l-450 -690h-49l453 690h46zM718 90h-55v-90h-70v90h-180v49l203 266h47v-258h55v-57zM593 147v179l-135 -179h135z" />
+<glyph unicode="&#xbf;" horiz-adv-x="444" d="M260 416q0 -23 -15.5 -39t-38.5 -16q-22 0 -37 16t-15 39q0 22 15 36.5t38 14.5t38 -14.5t15 -36.5zM200 294h17q-2 -84 -58 -206q-37 -80 -37 -157q0 -50 31.5 -84.5t77.5 -34.5q36 0 65 19t29 43q0 11 -17 31q-21 24 -21 43t11 30t30 11q48 0 48 -62t-46.5 -103.5 t-115.5 -41.5q-41 0 -81.5 16t-66.5 42q-36 36 -36 97q0 45 20.5 83.5t84.5 119.5q49 61 65 154z" />
+<glyph unicode="&#xc0;" horiz-adv-x="722" d="M451 757h-40l-154 96q-30 19 -30 43q0 32 36 32q21 0 43 -23zM707 0h-255v19q40 0 55 9q14 7 14 24q0 26 -19 70l-41 94h-262l-46 -114q-9 -23 -9 -42q0 -23 16.5 -32t53.5 -9v-19h-199v19q42 4 61 30.5t65 136.5l206 488h20l246 -563q22 -52 39.5 -70t54.5 -22v-19z M447 257l-116 275l-115 -275h231z" />
+<glyph unicode="&#xc1;" horiz-adv-x="722" d="M276 757l147 148q23 23 42 23q35 0 35 -32q0 -23 -30 -42l-154 -97h-40zM707 0h-255v19q40 0 55 9q14 7 14 24q0 26 -19 70l-41 94h-262l-46 -114q-9 -23 -9 -42q0 -23 16.5 -32t53.5 -9v-19h-199v19q42 4 61 30.5t65 136.5l206 488h20l246 -563q22 -52 39.5 -70 t54.5 -22v-19zM447 257l-116 275l-115 -275h231z" />
+<glyph unicode="&#xc2;" horiz-adv-x="722" d="M513 757h-34l-122 103l-121 -103h-34l124 167h62zM707 0h-255v19q40 0 55 9q14 7 14 24q0 26 -19 70l-41 94h-262l-46 -114q-9 -23 -9 -42q0 -23 16.5 -32t53.5 -9v-19h-199v19q42 4 61 30.5t65 136.5l206 488h20l246 -563q22 -52 39.5 -70t54.5 -22v-19zM447 257 l-116 275l-115 -275h231z" />
+<glyph unicode="&#xc3;" horiz-adv-x="722" d="M707 0h-255v19q40 0 55 9q14 7 14 24q0 26 -19 70l-41 94h-262l-46 -114q-9 -23 -9 -42q0 -23 16.5 -32t53.5 -9v-19h-199v19q42 4 61 30.5t65 136.5l206 488h20l246 -563q22 -52 39.5 -70t54.5 -22v-19zM447 257l-116 275l-115 -275h231zM495 888h29q-16 -57 -40 -81.5 t-65 -24.5q-32 0 -81 24l-23 11q-24 11 -41 11q-35 0 -51 -46h-29q11 49 37.5 75t63.5 26q34 0 70 -18l24 -12q29 -15 53 -15q17 0 28.5 11t24.5 39z" />
+<glyph unicode="&#xc4;" horiz-adv-x="722" d="M508 822q0 -20 -15 -34.5t-36 -14.5q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5t35 -15t15 -35zM309 822q0 -20 -15 -34.5t-36 -14.5q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5t35 -15t15 -35zM707 0h-255v19q40 0 55 9q14 7 14 24q0 26 -19 70l-41 94 h-262l-46 -114q-9 -23 -9 -42q0 -23 16.5 -32t53.5 -9v-19h-199v19q42 4 61 30.5t65 136.5l206 488h20l246 -563q22 -52 39.5 -70t54.5 -22v-19zM447 257l-116 275l-115 -275h231z" />
+<glyph unicode="&#xc5;" horiz-adv-x="722" d="M459 861q0 -41 -29.5 -70t-71.5 -29q-41 0 -69.5 29t-28.5 71q0 41 29.5 70t71.5 29q40 0 69 -29.5t29 -70.5zM425 862q0 27 -19.5 46t-47.5 19q-26 0 -45 -19.5t-19 -45.5q0 -28 19 -47t45 -19q28 0 47.5 19t19.5 47zM707 0h-255v19q40 0 55 9q14 7 14 24q0 26 -19 70 l-41 94h-262l-46 -114q-9 -23 -9 -42q0 -23 16.5 -32t53.5 -9v-19h-199v19q42 4 61 30.5t65 136.5l206 488h20l246 -563q22 -52 39.5 -70t54.5 -22v-19zM447 257l-116 275l-115 -275h231z" />
+<glyph unicode="&#xc6;" horiz-adv-x="889" d="M863 168l-44 -168h-509v19l17 2q45 5 58 22.5t13 68.5v148h-176q-92 -175 -92 -212q0 -23 67 -29h1v-19h-198v19q32 5 49 19.5t39 58.5l245 484q9 17 9 28q0 33 -90 33v20h564v-141h-23q-10 68 -42 86.5t-142 18.5h-84q-28 0 -28 -37v-223h104q77 0 107.5 19.5t31.5 78.5 h21v-235h-21q-7 59 -28.5 79.5t-73.5 20.5h-141v-235q0 -38 11 -47t59 -9h73q85 0 122.5 24t76.5 106h24zM398 299v319l-158 -319h158z" />
+<glyph unicode="&#xc7;" horiz-adv-x="667" d="M614 131l19 -18q-43 -61 -115 -94t-158 -33q-15 0 -24 1l-20 -52q15 3 26 3q41 0 63.5 -18t22.5 -51q0 -39 -33.5 -61.5t-91.5 -22.5q-45 0 -84 16l14 31q36 -12 65 -12q25 0 40 12t15 32q0 19 -12 27.5t-41 8.5q-17 0 -28 -4l-7 5l37 89q-113 15 -186 91q-88 93 -88 248 q0 188 139 287q85 60 195 60q78 0 147 -24q29 -9 40 -9q32 0 41 33h21l9 -226h-23q-11 78 -74 132t-141 54q-108 0 -173 -79.5t-65 -210.5q0 -159 67 -238q66 -78 181 -78q62 0 114 24t108 77z" />
+<glyph unicode="&#xc8;" horiz-adv-x="611" d="M402 757h-40l-154 96q-30 19 -30 43q0 32 36 32q21 0 43 -23zM597 169l-46 -169h-539v19q57 4 72 20.5t15 74.5v436q0 56 -15.5 73t-71.5 20v19h530l4 -143h-25q-11 67 -39 86t-115 19h-131q-22 0 -28.5 -6.5t-6.5 -29.5v-220h151q63 0 83.5 18t29.5 78h23v-234h-23 q-9 63 -29 80t-84 17h-151v-243q0 -30 21 -38.5t80 -8.5h36q107 0 152 26t79 106h28z" />
+<glyph unicode="&#xc9;" horiz-adv-x="611" d="M245 757l147 148q23 23 42 23q35 0 35 -32q0 -23 -30 -42l-154 -97h-40zM597 169l-46 -169h-539v19q57 4 72 20.5t15 74.5v436q0 56 -15.5 73t-71.5 20v19h530l4 -143h-25q-11 67 -39 86t-115 19h-131q-22 0 -28.5 -6.5t-6.5 -29.5v-220h151q63 0 83.5 18t29.5 78h23 v-234h-23q-9 63 -29 80t-84 17h-151v-243q0 -30 21 -38.5t80 -8.5h36q107 0 152 26t79 106h28z" />
+<glyph unicode="&#xca;" horiz-adv-x="611" d="M483 757h-34l-122 103l-121 -103h-34l124 167h62zM597 169l-46 -169h-539v19q57 4 72 20.5t15 74.5v436q0 56 -15.5 73t-71.5 20v19h530l4 -143h-25q-11 67 -39 86t-115 19h-131q-22 0 -28.5 -6.5t-6.5 -29.5v-220h151q63 0 83.5 18t29.5 78h23v-234h-23q-9 63 -29 80 t-84 17h-151v-243q0 -30 21 -38.5t80 -8.5h36q107 0 152 26t79 106h28z" />
+<glyph unicode="&#xcb;" horiz-adv-x="611" d="M475 822q0 -20 -15 -34.5t-36 -14.5q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5t35 -15t15 -35zM276 822q0 -20 -15 -34.5t-36 -14.5q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5t35 -15t15 -35zM597 169l-46 -169h-539v19q57 4 72 20.5t15 74.5v436 q0 56 -15.5 73t-71.5 20v19h530l4 -143h-25q-11 67 -39 86t-115 19h-131q-22 0 -28.5 -6.5t-6.5 -29.5v-220h151q63 0 83.5 18t29.5 78h23v-234h-23q-9 63 -29 80t-84 17h-151v-243q0 -30 21 -38.5t80 -8.5h36q107 0 152 26t79 106h28z" />
+<glyph unicode="&#xcc;" horiz-adv-x="333" d="M269 757h-40l-154 96q-30 19 -30 43q0 32 36 32q21 0 43 -23zM315 0h-297v19q63 2 80 18.5t17 74.5v439q0 58 -16 73t-81 19v19h297v-19q-63 -3 -80.5 -19t-17.5 -73v-439q0 -56 18 -73.5t80 -19.5v-19z" />
+<glyph unicode="&#xcd;" horiz-adv-x="333" d="M64 757l147 148q23 23 42 23q35 0 35 -32q0 -23 -30 -42l-154 -97h-40zM315 0h-297v19q63 2 80 18.5t17 74.5v439q0 58 -16 73t-81 19v19h297v-19q-63 -3 -80.5 -19t-17.5 -73v-439q0 -56 18 -73.5t80 -19.5v-19z" />
+<glyph unicode="&#xce;" horiz-adv-x="333" d="M321 757h-34l-122 103l-121 -103h-34l124 167h62zM307 0h-297v19q63 2 80 18.5t17 74.5v439q0 58 -16 73t-81 19v19h297v-19q-63 -3 -80.5 -19t-17.5 -73v-439q0 -56 18 -73.5t80 -19.5v-19z" />
+<glyph unicode="&#xcf;" horiz-adv-x="333" d="M315 822q0 -20 -15 -34.5t-36 -14.5q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5t35 -15t15 -35zM116 822q0 -20 -15 -34.5t-36 -14.5q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5t35 -15t15 -35zM314 0h-297v19q63 2 80 18.5t17 74.5v439q0 58 -16 73 t-81 19v19h297v-19q-63 -3 -80.5 -19t-17.5 -73v-439q0 -56 18 -73.5t80 -19.5v-19z" />
+<glyph unicode="&#xd0;" horiz-adv-x="722" d="M16 662h270q188 0 293.5 -86.5t105.5 -241.5q0 -76 -29 -142.5t-81 -109.5q-100 -82 -275 -82h-284v19q57 4 72.5 20t15.5 70v206h-83v44h83v194q0 55 -14.5 70t-73.5 20v19zM206 315v-237q0 -24 11 -32.5t40 -8.5q125 0 197 41q122 71 122 249q0 168 -122 250 q-70 48 -199 48q-29 0 -39 -8t-10 -31v-227h146v-44h-146z" />
+<glyph unicode="&#xd1;" horiz-adv-x="722" d="M707 662v-19q-51 -5 -66 -18q-16 -14 -22.5 -38t-6.5 -80v-518h-18l-441 549v-388q0 -76 17 -99.5t76 -31.5v-19h-234v19q62 7 79.5 29.5t17.5 101.5v440q-26 32 -44 42.5t-53 10.5v19h170l386 -483v340q0 76 -19 98q-12 13 -26.5 17.5t-52.5 8.5v19h237zM489 888h29 q-16 -57 -40 -81.5t-65 -24.5q-32 0 -81 24l-23 11q-24 11 -41 11q-35 0 -51 -46h-29q11 49 37.5 75t63.5 26q34 0 70 -18l24 -12q29 -15 53 -15q17 0 28.5 11t24.5 39z" />
+<glyph unicode="&#xd2;" horiz-adv-x="722" d="M450 757h-40l-154 96q-30 19 -30 43q0 32 36 32q21 0 43 -23zM688 331q0 -154 -91 -249.5t-236 -95.5q-146 0 -236.5 96t-90.5 252q0 152 90.5 247t236.5 95t236.5 -97.5t90.5 -247.5zM574 337q0 85 -24 152.5t-67 103.5q-56 47 -123 47q-85 0 -143 -67 q-32 -36 -50.5 -102.5t-18.5 -138.5q0 -182 90 -265q49 -45 124 -45q78 0 129 48q83 80 83 267z" />
+<glyph unicode="&#xd3;" horiz-adv-x="722" d="M259 757l147 148q23 23 42 23q35 0 35 -32q0 -23 -30 -42l-154 -97h-40zM688 331q0 -154 -91 -249.5t-236 -95.5q-146 0 -236.5 96t-90.5 252q0 152 90.5 247t236.5 95t236.5 -97.5t90.5 -247.5zM574 337q0 85 -24 152.5t-67 103.5q-56 47 -123 47q-85 0 -143 -67 q-32 -36 -50.5 -102.5t-18.5 -138.5q0 -182 90 -265q49 -45 124 -45q78 0 129 48q83 80 83 267z" />
+<glyph unicode="&#xd4;" horiz-adv-x="722" d="M510 757h-34l-122 103l-121 -103h-34l124 167h62zM688 331q0 -154 -91 -249.5t-236 -95.5q-146 0 -236.5 96t-90.5 252q0 152 90.5 247t236.5 95t236.5 -97.5t90.5 -247.5zM574 337q0 85 -24 152.5t-67 103.5q-56 47 -123 47q-85 0 -143 -67q-32 -36 -50.5 -102.5 t-18.5 -138.5q0 -182 90 -265q49 -45 124 -45q78 0 129 48q83 80 83 267z" />
+<glyph unicode="&#xd5;" horiz-adv-x="722" d="M688 331q0 -154 -91 -249.5t-236 -95.5q-146 0 -236.5 96t-90.5 252q0 152 90.5 247t236.5 95t236.5 -97.5t90.5 -247.5zM574 337q0 85 -24 152.5t-67 103.5q-56 47 -123 47q-85 0 -143 -67q-32 -36 -50.5 -102.5t-18.5 -138.5q0 -182 90 -265q49 -45 124 -45 q78 0 129 48q83 80 83 267zM489 888h29q-16 -57 -40 -81.5t-65 -24.5q-32 0 -81 24l-23 11q-24 11 -41 11q-35 0 -51 -46h-29q11 49 37.5 75t63.5 26q34 0 70 -18l24 -12q29 -15 53 -15q17 0 28.5 11t24.5 39z" />
+<glyph unicode="&#xd6;" horiz-adv-x="722" d="M503 822q0 -20 -15 -34.5t-36 -14.5q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5t35 -15t15 -35zM304 822q0 -20 -15 -34.5t-36 -14.5q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5t35 -15t15 -35zM688 331q0 -154 -91 -249.5t-236 -95.5q-146 0 -236.5 96 t-90.5 252q0 152 90.5 247t236.5 95t236.5 -97.5t90.5 -247.5zM574 337q0 85 -24 152.5t-67 103.5q-56 47 -123 47q-85 0 -143 -67q-32 -36 -50.5 -102.5t-18.5 -138.5q0 -182 90 -265q49 -45 124 -45q78 0 129 48q83 80 83 267z" />
+<glyph unicode="&#xd7;" horiz-adv-x="640" d="M597 22l-46 -47l-231 230l-231 -230l-46 46l230 231l-230 231l47 46l230 -230l231 230l46 -45l-230 -232z" />
+<glyph unicode="&#xd8;" horiz-adv-x="722" d="M658 734l-88 -130q57 -53 79 -99q39 -81 39 -173q0 -154 -91.5 -250t-237.5 -96q-91 0 -175 50l-79 -116h-49l95 139q-33 30 -49.5 50.5t-29.5 48.5q-38 78 -38 172q0 152 91.5 249t236.5 97q88 0 175 -49l72 107h49zM194 123l308 452q-62 65 -141 65q-98 0 -155.5 -83.5 t-57.5 -226.5q0 -120 46 -207zM527 540l-308 -452q60 -66 142 -66q99 0 156 82.5t57 225.5q0 120 -47 210z" />
+<glyph unicode="&#xd9;" horiz-adv-x="722" d="M453 757h-40l-154 96q-30 19 -30 43q0 32 36 32q21 0 43 -23zM705 662v-19q-61 -6 -77.5 -29.5t-16.5 -97.5v-255q0 -77 -11 -121t-43 -81q-64 -73 -202 -73q-109 0 -170 46q-81 60 -81 217v310q0 50 -15.5 65t-74.5 19v19h283v-19q-60 -5 -75.5 -21.5t-15.5 -72.5v-312 q0 -65 8 -100t36 -62q47 -45 128 -45q101 0 152 59q23 28 30 61.5t7 99.5v263q0 78 -17 102t-77 28v19h232z" />
+<glyph unicode="&#xda;" horiz-adv-x="722" d="M264 757l147 148q23 23 42 23q35 0 35 -32q0 -23 -30 -42l-154 -97h-40zM705 662v-19q-61 -6 -77.5 -29.5t-16.5 -97.5v-255q0 -77 -11 -121t-43 -81q-64 -73 -202 -73q-109 0 -170 46q-81 60 -81 217v310q0 50 -15.5 65t-74.5 19v19h283v-19q-60 -5 -75.5 -21.5 t-15.5 -72.5v-312q0 -65 8 -100t36 -62q47 -45 128 -45q101 0 152 59q23 28 30 61.5t7 99.5v263q0 78 -17 102t-77 28v19h232z" />
+<glyph unicode="&#xdb;" horiz-adv-x="722" d="M511 757h-34l-122 103l-121 -103h-34l124 167h62zM705 662v-19q-61 -6 -77.5 -29.5t-16.5 -97.5v-255q0 -77 -11 -121t-43 -81q-64 -73 -202 -73q-109 0 -170 46q-81 60 -81 217v310q0 50 -15.5 65t-74.5 19v19h283v-19q-60 -5 -75.5 -21.5t-15.5 -72.5v-312 q0 -65 8 -100t36 -62q47 -45 128 -45q101 0 152 59q23 28 30 61.5t7 99.5v263q0 78 -17 102t-77 28v19h232z" />
+<glyph unicode="&#xdc;" horiz-adv-x="722" d="M503 822q0 -20 -15 -34.5t-36 -14.5q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5t35 -15t15 -35zM304 822q0 -20 -15 -34.5t-36 -14.5q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5t35 -15t15 -35zM705 662v-19q-61 -6 -77.5 -29.5t-16.5 -97.5v-255 q0 -77 -11 -121t-43 -81q-64 -73 -202 -73q-109 0 -170 46q-81 60 -81 217v310q0 50 -15.5 65t-74.5 19v19h283v-19q-60 -5 -75.5 -21.5t-15.5 -72.5v-312q0 -65 8 -100t36 -62q47 -45 128 -45q101 0 152 59q23 28 30 61.5t7 99.5v263q0 78 -17 102t-77 28v19h232z" />
+<glyph unicode="&#xdd;" horiz-adv-x="722" d="M266 757l147 148q23 23 42 23q35 0 35 -32q0 -23 -30 -42l-154 -97h-40zM703 662v-19q-44 -4 -69.5 -25t-68.5 -87l-148 -228v-192q0 -57 19 -73t84 -19v-19h-306v19q68 5 84.5 21.5t16.5 82.5v171l-131 192q-68 100 -97 127.5t-65 29.5v19h279v-19l-24 -1 q-47 -1 -47 -26q0 -21 18 -47l146 -221l145 222q14 21 14 42q-1 17 -15.5 23.5t-52.5 7.5v19h218z" />
+<glyph unicode="&#xde;" horiz-adv-x="556" d="M202 532h80q120 0 190 -49t70 -132q0 -49 -26 -92t-70 -67q-61 -34 -175 -34q-29 0 -69 3v-52q0 -55 17.5 -71.5t76.5 -18.5v-19h-280v19q57 5 70.5 21.5t13.5 79.5v433q0 54 -14 69t-70 21v19h277v-19q-61 -5 -76.5 -24t-14.5 -87zM202 461v-260q33 -3 57 -3 q174 0 174 147q0 78 -47.5 113.5t-151.5 35.5q-19 0 -25.5 -6.5t-6.5 -26.5z" />
+<glyph unicode="&#xdf;" horiz-adv-x="500" d="M73 84v370q0 116 43.5 172.5t134.5 56.5q78 0 124 -41t46 -111q0 -54 -28.5 -85.5t-108.5 -68.5q82 -16 122 -51q62 -53 62 -140q0 -83 -51.5 -139t-127.5 -56q-43 0 -70 20.5t-27 52.5q0 20 13 34t32 14q17 0 29 -11.5t13 -28.5l2 -22q1 -16 8 -23t21 -7q28 0 40 18 q24 33 24 112q0 202 -132 207q-32 1 -32 17q0 12 29 15q95 10 95 127q0 66 -24 103t-67 37q-40 0 -63 -29t-23 -78v-549h-145v15q38 3 49.5 16t11.5 53z" />
+<glyph unicode="&#xe0;" horiz-adv-x="444" d="M442 66v-28q-38 -48 -90 -48q-57 0 -64 73h-1q-64 -73 -145 -73q-47 0 -76 27.5t-29 76.5q0 70 70 117q48 32 180 81v54q0 45 -21.5 67.5t-56.5 22.5q-30 0 -50 -14.5t-20 -34.5q0 -9 3 -20t3 -22q0 -15 -13.5 -28t-32.5 -13q-17 0 -30 13t-13 33q0 48 51 80 q47 30 115 30q81 0 118 -45q18 -21 23 -42.5t5 -68.5v-191q0 -66 31 -66q20 0 43 19zM287 127v141q-92 -32 -128 -66q-34 -31 -34 -77q0 -38 19 -57.5t50 -19.5q33 0 58 16q21 15 28 28t7 35zM317 507h-40l-154 96q-30 19 -30 43q0 32 36 32q21 0 43 -23z" />
+<glyph unicode="&#xe1;" horiz-adv-x="444" d="M119 507l147 148q23 23 42 23q35 0 35 -32q0 -23 -30 -42l-154 -97h-40zM442 66v-28q-38 -48 -90 -48q-57 0 -64 73h-1q-64 -73 -145 -73q-47 0 -76 27.5t-29 76.5q0 70 70 117q48 32 180 81v54q0 45 -21.5 67.5t-56.5 22.5q-30 0 -50 -14.5t-20 -34.5q0 -9 3 -20t3 -22 q0 -15 -13.5 -28t-32.5 -13q-17 0 -30 13t-13 33q0 48 51 80q47 30 115 30q81 0 118 -45q18 -21 23 -42.5t5 -68.5v-191q0 -66 31 -66q20 0 43 19zM287 127v141q-92 -32 -128 -66q-34 -31 -34 -77q0 -38 19 -57.5t50 -19.5q33 0 58 16q21 15 28 28t7 35z" />
+<glyph unicode="&#xe2;" horiz-adv-x="444" d="M381 507h-34l-122 103l-121 -103h-34l124 167h62zM442 66v-28q-38 -48 -90 -48q-57 0 -64 73h-1q-64 -73 -145 -73q-47 0 -76 27.5t-29 76.5q0 70 70 117q48 32 180 81v54q0 45 -21.5 67.5t-56.5 22.5q-30 0 -50 -14.5t-20 -34.5q0 -9 3 -20t3 -22q0 -15 -13.5 -28 t-32.5 -13q-17 0 -30 13t-13 33q0 48 51 80q47 30 115 30q81 0 118 -45q18 -21 23 -42.5t5 -68.5v-191q0 -66 31 -66q20 0 43 19zM287 127v141q-92 -32 -128 -66q-34 -31 -34 -77q0 -38 19 -57.5t50 -19.5q33 0 58 16q21 15 28 28t7 35z" />
+<glyph unicode="&#xe3;" horiz-adv-x="444" d="M360 638h29q-16 -57 -40 -81.5t-65 -24.5q-32 0 -81 24l-23 11q-24 11 -41 11q-35 0 -51 -46h-29q11 49 37 75t64 26q34 0 70 -18l24 -12q28 -15 53 -15q17 0 28.5 11t24.5 39zM442 66v-28q-38 -48 -90 -48q-57 0 -64 73h-1q-64 -73 -145 -73q-47 0 -76 27.5t-29 76.5 q0 70 70 117q48 32 180 81v54q0 45 -21.5 67.5t-56.5 22.5q-30 0 -50 -14.5t-20 -34.5q0 -9 3 -20t3 -22q0 -15 -13.5 -28t-32.5 -13q-17 0 -30 13t-13 33q0 48 51 80q47 30 115 30q81 0 118 -45q18 -21 23 -42.5t5 -68.5v-191q0 -66 31 -66q20 0 43 19zM287 127v141 q-92 -32 -128 -66q-34 -31 -34 -77q0 -38 19 -57.5t50 -19.5q33 0 58 16q21 15 28 28t7 35z" />
+<glyph unicode="&#xe4;" horiz-adv-x="444" d="M373 572q0 -20 -15 -34.5t-36 -14.5q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5t35 -15t15 -35zM174 572q0 -20 -15 -34.5t-36 -14.5q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5t35 -15t15 -35zM442 66v-28q-38 -48 -90 -48q-57 0 -64 73h-1 q-64 -73 -145 -73q-47 0 -76 27.5t-29 76.5q0 70 70 117q48 32 180 81v54q0 45 -21.5 67.5t-56.5 22.5q-30 0 -50 -14.5t-20 -34.5q0 -9 3 -20t3 -22q0 -15 -13.5 -28t-32.5 -13q-17 0 -30 13t-13 33q0 48 51 80q47 30 115 30q81 0 118 -45q18 -21 23 -42.5t5 -68.5v-191 q0 -66 31 -66q20 0 43 19zM287 127v141q-92 -32 -128 -66q-34 -31 -34 -77q0 -38 19 -57.5t50 -19.5q33 0 58 16q21 15 28 28t7 35z" />
+<glyph unicode="&#xe5;" horiz-adv-x="444" d="M324 613q0 -41 -29.5 -70t-71.5 -29q-41 0 -69.5 29t-28.5 71q0 41 29.5 70t71.5 29q40 0 69 -29.5t29 -70.5zM290 614q0 27 -19.5 46t-47.5 19q-26 0 -45 -19.5t-19 -45.5q0 -28 19 -47t45 -19q28 0 47.5 19t19.5 47zM442 66v-28q-38 -48 -90 -48q-57 0 -64 73h-1 q-64 -73 -145 -73q-47 0 -76 27.5t-29 76.5q0 70 70 117q48 32 180 81v54q0 45 -21.5 67.5t-56.5 22.5q-30 0 -50 -14.5t-20 -34.5q0 -9 3 -20t3 -22q0 -15 -13.5 -28t-32.5 -13q-17 0 -30 13t-13 33q0 48 51 80q47 30 115 30q81 0 118 -45q18 -21 23 -42.5t5 -68.5v-191 q0 -66 31 -66q20 0 43 19zM287 127v141q-92 -32 -128 -66q-34 -31 -34 -77q0 -38 19 -57.5t50 -19.5q33 0 58 16q21 15 28 28t7 35z" />
+<glyph unicode="&#xe6;" horiz-adv-x="667" d="M620 154l12 -5q-39 -84 -79 -116q-48 -40 -118 -40q-44 0 -74 16t-55 54q-50 -42 -81.5 -56t-70.5 -14q-51 0 -83.5 29.5t-32.5 77.5q0 21 1.5 35.5t7.5 33t17.5 31t31.5 25t49 20.5l129 36v63q0 49 -13.5 69.5t-47.5 20.5q-28 0 -48 -12.5t-20 -29.5q0 -7 1.5 -19.5 t1.5 -22.5q0 -21 -12 -33.5t-32 -12.5t-32 13t-12 35q0 46 46 77t113 31q37 0 63 -10.5t55 -36.5q34 27 59 37t60 10q76 0 114 -43t46 -140h-262q1 -75 6 -108t21 -62q13 -23 38.5 -36.5t56.5 -13.5q43 0 75.5 22t68.5 75zM355 307h166q-1 66 -19.5 94t-59.5 28 q-43 0 -63 -28t-24 -94zM274 201v52q-91 -33 -120 -58t-29 -70q0 -38 16.5 -62.5t49.5 -24.5q28 0 65 18t37 32l-1 1v2q-18 59 -18 110z" />
+<glyph unicode="&#xe7;" horiz-adv-x="444" d="M398 156l14 -9q-39 -79 -82 -115.5t-104 -41.5l-21 -55q15 3 26 3q41 0 63.5 -18t22.5 -51q0 -39 -33.5 -61.5t-91.5 -22.5q-45 0 -84 16l14 31q36 -12 65 -12q25 0 40 12t15 32q0 19 -12 27.5t-41 8.5q-17 0 -28 -4l-7 5l38 91q-76 10 -121.5 70.5t-45.5 149.5 q0 128 84 197q62 51 135 51q63 0 108.5 -30.5t45.5 -72.5q0 -17 -14 -29.5t-33 -12.5q-35 0 -48 46l-6 22q-8 28 -20 38t-39 10q-61 0 -98.5 -48t-37.5 -126q0 -86 43 -140.5t112 -54.5q43 0 74 21t67 73z" />
+<glyph unicode="&#xe8;" horiz-adv-x="444" d="M408 164l16 -7q-60 -167 -209 -167q-88 0 -139 61.5t-51 165.5q0 107 57 175t150 68q90 0 139 -69q29 -40 34 -114h-308q4 -63 12.5 -96t33.5 -67q42 -55 111 -55q49 0 82.5 24t71.5 81zM99 309h204q-9 63 -29.5 89t-68.5 26q-42 0 -70 -29.5t-36 -85.5zM310 507h-40 l-154 96q-30 19 -30 43q0 32 36 32q21 0 43 -23z" />
+<glyph unicode="&#xe9;" horiz-adv-x="444" d="M116 507l147 148q23 23 42 23q35 0 35 -32q0 -23 -30 -42l-154 -97h-40zM408 164l16 -7q-60 -167 -209 -167q-88 0 -139 61.5t-51 165.5q0 107 57 175t150 68q90 0 139 -69q29 -40 34 -114h-308q4 -63 12.5 -96t33.5 -67q42 -55 111 -55q49 0 82.5 24t71.5 81zM99 309 h204q-9 63 -29.5 89t-68.5 26q-42 0 -70 -29.5t-36 -85.5z" />
+<glyph unicode="&#xea;" horiz-adv-x="444" d="M380 507h-34l-122 103l-121 -103h-34l124 167h62zM408 164l16 -7q-60 -167 -209 -167q-88 0 -139 61.5t-51 165.5q0 107 57 175t150 68q90 0 139 -69q29 -40 34 -114h-308q4 -63 12.5 -96t33.5 -67q42 -55 111 -55q49 0 82.5 24t71.5 81zM99 309h204q-9 63 -29.5 89 t-68.5 26q-42 0 -70 -29.5t-36 -85.5z" />
+<glyph unicode="&#xeb;" horiz-adv-x="444" d="M372 572q0 -20 -15 -34.5t-36 -14.5q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5t35 -15t15 -35zM173 572q0 -20 -15 -34.5t-36 -14.5q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5t35 -15t15 -35zM408 164l16 -7q-60 -167 -209 -167q-88 0 -139 61.5 t-51 165.5q0 107 57 175t150 68q90 0 139 -69q29 -40 34 -114h-308q4 -63 12.5 -96t33.5 -67q42 -55 111 -55q49 0 82.5 24t71.5 81zM99 309h204q-9 63 -29.5 89t-68.5 26q-42 0 -70 -29.5t-36 -85.5z" />
+<glyph unicode="&#xec;" horiz-adv-x="278" d="M243 0h-237v15q52 3 65.5 18t13.5 71v227q0 35 -7 49t-26 14q-24 0 -42 -5v16l154 55l5 -4v-351q0 -56 12.5 -71t61.5 -19v-15zM230 507h-40l-154 96q-30 19 -30 43q0 32 36 32q21 0 43 -23z" />
+<glyph unicode="&#xed;" horiz-adv-x="278" d="M253 0h-237v15q52 3 65.5 18t13.5 71v227q0 35 -7 49t-26 14q-24 0 -42 -5v16l154 55l5 -4v-351q0 -56 12.5 -71t61.5 -19v-15zM49 507l147 148q23 23 42 23q35 0 35 -32q0 -23 -30 -42l-154 -97h-40z" />
+<glyph unicode="&#xee;" horiz-adv-x="278" d="M294 507h-34l-122 103l-121 -103h-34l124 167h62zM220 0h-237v15q52 3 65.5 18t13.5 71v227q0 35 -7 49t-26 14q-24 0 -42 -5v16l154 55l5 -4v-351q0 -56 12.5 -71t61.5 -19v-15z" />
+<glyph unicode="&#xef;" horiz-adv-x="278" d="M227 0h-237v15q52 3 65.5 18t13.5 71v227q0 35 -7 49t-26 14q-24 0 -42 -5v16l154 55l5 -4v-351q0 -56 12.5 -71t61.5 -19v-15zM288 572q0 -20 -15 -34.5t-36 -14.5q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5t35 -15t15 -35zM89 572q0 -20 -15 -34.5t-36 -14.5 q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5t35 -15t15 -35z" />
+<glyph unicode="&#xf0;" horiz-adv-x="500" d="M424 656l-91 -48q138 -116 138 -323q0 -113 -53 -198q-62 -97 -173 -97q-95 0 -155.5 62t-60.5 165q0 105 63 174t154 69q36 0 60.5 -12t60.5 -48q-11 56 -32.5 95.5t-64.5 79.5l-123 -65l-33 30l121 64q-49 41 -134 55l42 24q97 -6 153 -47l95 50zM381 202 q0 103 -40.5 166.5t-105.5 63.5q-50 0 -83 -43.5t-33 -107.5q0 -41 8 -84t23.5 -84.5t45 -68t67.5 -26.5q53 0 85.5 49.5t32.5 134.5z" />
+<glyph unicode="&#xf1;" horiz-adv-x="500" d="M392 638h29q-16 -57 -40 -81.5t-65 -24.5q-32 0 -81 24l-23 11q-24 11 -41 11q-35 0 -51 -46h-29q11 49 37 75t64 26q34 0 70 -18l24 -12q28 -15 53 -15q17 0 28.5 11t24.5 39zM485 0h-208l1 15q37 3 49.5 21.5t12.5 68.5v199q0 101 -73 101q-25 0 -47 -12t-56 -45v-276 q0 -30 13.5 -42t51.5 -15v-15h-211v15q38 3 50 18.5t12 60.5v243q0 37 -7 51t-28 14q-20 0 -29 -4v17q70 20 137 45l8 -3v-78h1q71 81 144 81q57 0 87.5 -40t30.5 -114v-221q0 -40 12 -53t49 -17v-15z" />
+<glyph unicode="&#xf2;" horiz-adv-x="500" d="M470 231q0 -105 -62.5 -173t-162.5 -68q-92 0 -154 67.5t-62 170.5q0 104 62 168t163 64q93 0 154.5 -63.5t61.5 -165.5zM380 204q0 114 -50 178q-40 50 -95 50q-52 0 -84 -42.5t-32 -116.5q0 -128 53 -205q34 -50 90 -50q55 0 86.5 49.5t31.5 136.5zM332 507h-40 l-154 96q-30 19 -30 43q0 32 36 32q21 0 43 -23z" />
+<glyph unicode="&#xf3;" horiz-adv-x="500" d="M154 507l147 148q23 23 42 23q35 0 35 -32q0 -23 -30 -42l-154 -97h-40zM470 231q0 -105 -62.5 -173t-162.5 -68q-92 0 -154 67.5t-62 170.5q0 104 62 168t163 64q93 0 154.5 -63.5t61.5 -165.5zM380 204q0 114 -50 178q-40 50 -95 50q-52 0 -84 -42.5t-32 -116.5 q0 -128 53 -205q34 -50 90 -50q55 0 86.5 49.5t31.5 136.5z" />
+<glyph unicode="&#xf4;" horiz-adv-x="500" d="M401 507h-34l-122 103l-121 -103h-34l124 167h62zM470 231q0 -105 -62.5 -173t-162.5 -68q-92 0 -154 67.5t-62 170.5q0 104 62 168t163 64q93 0 154.5 -63.5t61.5 -165.5zM380 204q0 114 -50 178q-40 50 -95 50q-52 0 -84 -42.5t-32 -116.5q0 -128 53 -205 q34 -50 90 -50q55 0 86.5 49.5t31.5 136.5z" />
+<glyph unicode="&#xf5;" horiz-adv-x="500" d="M470 231q0 -105 -62.5 -173t-162.5 -68q-92 0 -154 67.5t-62 170.5q0 104 62 168t163 64q93 0 154.5 -63.5t61.5 -165.5zM380 204q0 114 -50 178q-40 50 -95 50q-52 0 -84 -42.5t-32 -116.5q0 -128 53 -205q34 -50 90 -50q55 0 86.5 49.5t31.5 136.5zM381 638h29 q-16 -57 -40 -81.5t-65 -24.5q-32 0 -81 24l-23 11q-24 11 -41 11q-35 0 -51 -46h-29q11 49 37.5 75t63.5 26q34 0 70 -18l24 -12q29 -15 53 -15q17 0 28.5 11t24.5 39z" />
+<glyph unicode="&#xf6;" horiz-adv-x="500" d="M394 572q0 -20 -15 -34.5t-36 -14.5q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5t35 -15t15 -35zM195 572q0 -20 -15 -34.5t-36 -14.5q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5t35 -15t15 -35zM470 231q0 -105 -62.5 -173t-162.5 -68q-92 0 -154 67.5 t-62 170.5q0 104 62 168t163 64q93 0 154.5 -63.5t61.5 -165.5zM380 204q0 114 -50 178q-40 50 -95 50q-52 0 -84 -42.5t-32 -116.5q0 -128 53 -205q34 -50 90 -50q55 0 86.5 49.5t31.5 136.5z" />
+<glyph unicode="&#xf7;" horiz-adv-x="564" d="M338 459q0 -22 -16.5 -38t-39.5 -16t-39 16t-16 39t16.5 39.5t39.5 16.5q22 0 38.5 -17t16.5 -40zM338 44q0 -22 -16.5 -38t-39.5 -16t-39 16t-16 39t16.5 39.5t39.5 16.5q22 0 38.5 -17t16.5 -40zM534 220h-504v66h504v-66z" />
+<glyph unicode="&#xf8;" horiz-adv-x="500" d="M437 551l-65 -125q98 -67 98 -192q0 -104 -64 -174t-159 -70q-47 0 -93 21l-65 -123h-37l73 140q-45 36 -65 73q-31 57 -31 126q0 102 61.5 167.5t158.5 65.5q44 0 92 -18l57 109h39zM158 92l159 304q-37 36 -80 36q-53 0 -85.5 -42.5t-32.5 -112.5q0 -101 39 -185z M340 366l-161 -306q35 -42 82 -42q56 0 87.5 48.5t31.5 136.5q0 87 -40 163z" />
+<glyph unicode="&#xf9;" horiz-adv-x="500" d="M480 50v-14q-78 -21 -137 -45l-5 3v82h-2q-63 -86 -143 -86q-57 0 -89.5 35t-32.5 93v251q0 37 -13 51t-49 16v14h146v-323q0 -34 20.5 -56.5t50.5 -22.5q49 0 84 31q13 12 18 22.5t5 35.5v231q0 39 -14 50.5t-60 14.5v17h158v-343q0 -35 11.5 -46t45.5 -11h6zM339 507 h-40l-154 96q-30 19 -30 43q0 32 36 32q21 0 43 -23z" />
+<glyph unicode="&#xfa;" horiz-adv-x="500" d="M156 507l147 148q23 23 42 23q35 0 35 -32q0 -23 -30 -42l-154 -97h-40zM480 50v-14q-78 -21 -137 -45l-5 3v82h-2q-63 -86 -143 -86q-57 0 -89.5 35t-32.5 93v251q0 37 -13 51t-49 16v14h146v-323q0 -34 20.5 -56.5t50.5 -22.5q49 0 84 31q13 12 18 22.5t5 35.5v231 q0 39 -14 50.5t-60 14.5v17h158v-343q0 -35 11.5 -46t45.5 -11h6z" />
+<glyph unicode="&#xfb;" horiz-adv-x="500" d="M401 507h-34l-122 103l-121 -103h-34l124 167h62zM480 50v-14q-78 -21 -137 -45l-5 3v82h-2q-63 -86 -143 -86q-57 0 -89.5 35t-32.5 93v251q0 37 -13 51t-49 16v14h146v-323q0 -34 20.5 -56.5t50.5 -22.5q49 0 84 31q13 12 18 22.5t5 35.5v231q0 39 -14 50.5t-60 14.5 v17h158v-343q0 -35 11.5 -46t45.5 -11h6z" />
+<glyph unicode="&#xfc;" horiz-adv-x="500" d="M393 572q0 -20 -15 -34.5t-36 -14.5q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5t35 -15t15 -35zM194 572q0 -20 -15 -34.5t-36 -14.5q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5t35 -15t15 -35zM480 50v-14q-78 -21 -137 -45l-5 3v82h-2 q-63 -86 -143 -86q-57 0 -89.5 35t-32.5 93v251q0 37 -13 51t-49 16v14h146v-323q0 -34 20.5 -56.5t50.5 -22.5q49 0 84 31q13 12 18 22.5t5 35.5v231q0 39 -14 50.5t-60 14.5v17h158v-343q0 -35 11.5 -46t45.5 -11h6z" />
+<glyph unicode="&#xfd;" horiz-adv-x="500" d="M143 507l147 148q23 23 42 23q35 0 35 -32q0 -23 -30 -42l-154 -97h-40zM475 450v-15q-18 -2 -29 -13t-21 -38l-150 -409q-39 -106 -78.5 -149.5t-96.5 -43.5q-32 0 -51 16.5t-19 41.5q0 19 12.5 32.5t30.5 13.5q29 0 52 -13q13 -7 26 -7q21 0 50 44q14 20 27 57t13 51 q0 13 -42 101l-132 282q-13 29 -53 35v14h205v-15q-32 -1 -44.5 -7t-12.5 -20q0 -11 13 -41l112 -250l97 276q4 9 4 18q0 24 -46 24v15h133z" />
+<glyph unicode="&#xfe;" horiz-adv-x="500" d="M159 679v-299q59 80 144 80q78 0 122.5 -57t44.5 -156q0 -109 -60.5 -183t-149.5 -74q-31 0 -52.5 9t-48.5 34v-154q0 -48 15.5 -62.5t70.5 -15.5v-18h-240v18q44 4 57 17.5t13 53.5v696q0 33 -9.5 44.5t-39.5 11.5q-7 0 -17 -2v17q89 24 144 44zM159 332v-242 q0 -23 34 -45.5t69 -22.5q56 0 89 53.5t33 137.5q0 187 -123 187q-32 0 -67 -23t-35 -45z" />
+<glyph unicode="&#xff;" horiz-adv-x="500" d="M396 572q0 -20 -15 -34.5t-36 -14.5q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5t35 -15t15 -35zM197 572q0 -20 -15 -34.5t-36 -14.5q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5t35 -15t15 -35zM475 450v-15q-18 -2 -29 -13t-21 -38l-150 -409 q-39 -106 -78.5 -149.5t-96.5 -43.5q-32 0 -51 16.5t-19 41.5q0 19 12.5 32.5t30.5 13.5q29 0 52 -13q13 -7 26 -7q21 0 50 44q14 20 27 57t13 51q0 13 -42 101l-132 282q-13 29 -53 35v14h205v-15q-32 -1 -44.5 -7t-12.5 -20q0 -11 13 -41l112 -250l97 276q4 9 4 18 q0 24 -46 24v15h133z" />
+<glyph unicode="&#x100;" horiz-adv-x="722" d="M511 719h-311v54h311v-54zM707 0h-255v19q40 0 55 9q14 7 14 24q0 26 -19 70l-41 94h-262l-46 -114q-9 -23 -9 -42q0 -23 16.5 -32t53.5 -9v-19h-199v19q42 4 61 30.5t65 136.5l206 488h20l246 -563q22 -52 39.5 -70t54.5 -22v-19zM447 257l-116 275l-115 -275h231z" />
+<glyph unicode="&#x101;" horiz-adv-x="444" d="M380 507h-311v54h311v-54zM442 66v-28q-38 -48 -90 -48q-57 0 -64 73h-1q-64 -73 -145 -73q-47 0 -76 27.5t-29 76.5q0 70 70 117q48 32 180 81v54q0 45 -21.5 67.5t-56.5 22.5q-30 0 -50 -14.5t-20 -34.5q0 -9 3 -20t3 -22q0 -15 -13.5 -28t-32.5 -13q-17 0 -30 13 t-13 33q0 48 51 80q47 30 115 30q81 0 118 -45q18 -21 23 -42.5t5 -68.5v-191q0 -66 31 -66q20 0 43 19zM287 127v141q-92 -32 -128 -66q-34 -31 -34 -77q0 -38 19 -57.5t50 -19.5q33 0 58 16q21 15 28 28t7 35z" />
+<glyph unicode="&#x102;" horiz-adv-x="722" d="M470 876h29q-18 -157 -142 -157q-69 0 -104 41.5t-35 115.5h29q20 -97 112 -97q40 0 64.5 21.5t46.5 75.5zM707 0h-255v19q40 0 55 9q14 7 14 24q0 26 -19 70l-41 94h-262l-46 -114q-9 -23 -9 -42q0 -23 16.5 -32t53.5 -9v-19h-199v19q42 4 61 30.5t65 136.5l206 488h20 l246 -563q22 -52 39.5 -70t54.5 -22v-19zM447 257l-116 275l-115 -275h231z" />
+<glyph unicode="&#x103;" horiz-adv-x="444" d="M343 664h29q-18 -157 -142 -157q-69 0 -104 41.5t-35 115.5h29q20 -97 112 -97q40 0 64.5 21.5t46.5 75.5zM442 66v-28q-38 -48 -90 -48q-57 0 -64 73h-1q-64 -73 -145 -73q-47 0 -76 27.5t-29 76.5q0 70 70 117q48 32 180 81v54q0 45 -21.5 67.5t-56.5 22.5 q-30 0 -50 -14.5t-20 -34.5q0 -9 3 -20t3 -22q0 -15 -13.5 -28t-32.5 -13q-17 0 -30 13t-13 33q0 48 51 80q47 30 115 30q81 0 118 -45q18 -21 23 -42.5t5 -68.5v-191q0 -66 31 -66q20 0 43 19zM287 127v141q-92 -32 -128 -66q-34 -31 -34 -77q0 -38 19 -57.5t50 -19.5 q33 0 58 16q21 15 28 28t7 35z" />
+<glyph unicode="&#x104;" horiz-adv-x="722" d="M561 0h-109v19q40 0 55 9q14 7 14 24q0 26 -19 70l-41 94h-262l-46 -114q-9 -23 -9 -42q0 -23 16.5 -32t53.5 -9v-19h-199v19q42 4 61 30.5t65 136.5l206 488h20l246 -563q22 -52 39.5 -70t54.5 -22v-19h-100q-44 -35 -44 -70q0 -39 38 -39q32 0 71 36l20 -16 q-28 -41 -52.5 -58.5t-58.5 -17.5q-33 0 -53.5 19.5t-20.5 54.5q0 53 54 91zM447 257l-116 275l-115 -275h231z" />
+<glyph unicode="&#x105;" horiz-adv-x="444" d="M452 -73l20 -16q-28 -41 -52.5 -58.5t-58.5 -17.5q-33 0 -53.5 19.5t-20.5 54.5q0 49 44 84q-37 11 -43 70h-1q-64 -73 -145 -73q-47 0 -76 27.5t-29 76.5q0 70 70 117q48 32 180 81v54q0 45 -21.5 67.5t-56.5 22.5q-30 0 -50 -14.5t-20 -34.5q0 -9 3 -20t3 -22 q0 -15 -13.5 -28t-32.5 -13q-17 0 -30 13t-13 33q0 48 51 80q47 30 115 30q81 0 118 -45q18 -21 23 -42.5t5 -68.5v-191q0 -66 31 -66q20 0 43 19v-28q-29 -37 -64 -45q-35 -32 -35 -63q0 -39 38 -39q32 0 71 36zM287 127v141q-92 -32 -128 -66q-34 -31 -34 -77 q0 -38 19 -57.5t50 -19.5q33 0 58 16q21 15 28 28t7 35z" />
+<glyph unicode="&#x106;" horiz-adv-x="667" d="M293 719l147 148q23 23 42 23q35 0 35 -32q0 -23 -30 -42l-154 -97h-40zM614 131l19 -18q-89 -127 -273 -127q-145 0 -236 89q-96 94 -96 250q0 146 90 247q94 104 243 104q64 0 119 -15q63 -18 69 -18q33 0 42 33h20l9 -227h-23q-16 72 -52 111q-71 76 -161 76 q-111 0 -175.5 -81.5t-64.5 -213.5q0 -161 72 -239q67 -72 178 -72q66 0 114 23t106 78z" />
+<glyph unicode="&#x107;" horiz-adv-x="444" d="M177 507l147 148q23 23 42 23q35 0 35 -32q0 -23 -30 -42l-154 -97h-40zM398 156l14 -9q-43 -84 -82 -115q-51 -42 -115 -42q-83 0 -136.5 62.5t-53.5 159.5q0 127 84 197q62 51 135 51q63 0 108.5 -30.5t45.5 -72.5q0 -17 -14 -29.5t-33 -12.5q-35 0 -48 46l-6 22 q-8 28 -20 38t-39 10q-61 0 -98.5 -48t-37.5 -126q0 -86 43 -140.5t112 -54.5q43 0 74 21t67 73z" />
+<glyph unicode="&#x108;" horiz-adv-x="667" d="M510 719h-34l-122 103l-121 -103h-34l124 167h62zM614 131l19 -18q-89 -127 -273 -127q-145 0 -236 89q-96 94 -96 250q0 146 90 247q94 104 243 104q64 0 119 -15q63 -18 69 -18q33 0 42 33h20l9 -227h-23q-16 72 -52 111q-71 76 -161 76q-111 0 -175.5 -81.5 t-64.5 -213.5q0 -161 72 -239q67 -72 178 -72q66 0 114 23t106 78z" />
+<glyph unicode="&#x109;" horiz-adv-x="444" d="M376 507h-34l-122 103l-121 -103h-34l124 167h62zM398 156l14 -9q-43 -84 -82 -115q-51 -42 -115 -42q-83 0 -136.5 62.5t-53.5 159.5q0 127 84 197q62 51 135 51q63 0 108.5 -30.5t45.5 -72.5q0 -17 -14 -29.5t-33 -12.5q-35 0 -48 46l-6 22q-8 28 -20 38t-39 10 q-61 0 -98.5 -48t-37.5 -126q0 -86 43 -140.5t112 -54.5q43 0 74 21t67 73z" />
+<glyph unicode="&#x10a;" horiz-adv-x="667" d="M450 784q0 -21 -14.5 -35t-35.5 -14q-20 0 -34.5 14.5t-14.5 34.5q0 21 13.5 35.5t35.5 14.5q23 0 36.5 -14t13.5 -36zM614 131l19 -18q-89 -127 -273 -127q-145 0 -236 89q-96 94 -96 250q0 146 90 247q94 104 243 104q64 0 119 -15q63 -18 69 -18q33 0 42 33h20l9 -227 h-23q-16 72 -52 111q-71 76 -161 76q-111 0 -175.5 -81.5t-64.5 -213.5q0 -161 72 -239q67 -72 178 -72q66 0 114 23t106 78z" />
+<glyph unicode="&#x10b;" horiz-adv-x="444" d="M301 572q0 -21 -14.5 -35t-35.5 -14q-20 0 -34.5 14.5t-14.5 34.5q0 21 13.5 35.5t35.5 14.5q23 0 36.5 -14t13.5 -36zM398 156l14 -9q-43 -84 -82 -115q-51 -42 -115 -42q-83 0 -136.5 62.5t-53.5 159.5q0 127 84 197q62 51 135 51q63 0 108.5 -30.5t45.5 -72.5 q0 -17 -14 -29.5t-33 -12.5q-35 0 -48 46l-6 22q-8 28 -20 38t-39 10q-61 0 -98.5 -48t-37.5 -126q0 -86 43 -140.5t112 -54.5q43 0 74 21t67 73z" />
+<glyph unicode="&#x10c;" horiz-adv-x="667" d="M543 886l-124 -167h-64l-123 167h35l120 -103l121 103h35zM614 131l19 -18q-89 -127 -273 -127q-145 0 -236 89q-96 94 -96 250q0 146 90 247q94 104 243 104q64 0 119 -15q63 -18 69 -18q33 0 42 33h20l9 -227h-23q-16 72 -52 111q-71 76 -161 76q-111 0 -175.5 -81.5 t-64.5 -213.5q0 -161 72 -239q67 -72 178 -72q66 0 114 23t106 78z" />
+<glyph unicode="&#x10d;" horiz-adv-x="444" d="M396 674l-124 -167h-64l-123 167h35l120 -103l121 103h35zM398 156l14 -9q-43 -84 -82 -115q-51 -42 -115 -42q-83 0 -136.5 62.5t-53.5 159.5q0 127 84 197q62 51 135 51q63 0 108.5 -30.5t45.5 -72.5q0 -17 -14 -29.5t-33 -12.5q-35 0 -48 46l-6 22q-8 28 -20 38 t-39 10q-61 0 -98.5 -48t-37.5 -126q0 -86 43 -140.5t112 -54.5q43 0 74 21t67 73z" />
+<glyph unicode="&#x10e;" horiz-adv-x="722" d="M496 886l-124 -167h-64l-123 167h35l120 -103l121 103h35zM16 662h270q195 0 300 -91q99 -85 99 -237q0 -183 -136 -270q-99 -64 -252 -64h-281v19q58 4 73 20.5t15 75.5v435q0 58 -15 73.5t-73 19.5v19zM206 583v-499q0 -27 9.5 -37t38.5 -10q78 0 126 11t92 41 q104 70 104 239q0 145 -95 228q-43 38 -94 53.5t-128 15.5q-29 0 -41 -9t-12 -33z" />
+<glyph unicode="&#x10f;" horiz-adv-x="586" d="M492 458l-9 19q82 56 82 107q0 13 -14 13q-2 0 -7 -2q-12 -2 -20 -2q-28 0 -43.5 13.5t-15.5 37.5q0 25 16.5 41t42.5 16q34 0 57 -25.5t23 -63.5q0 -45 -31 -87t-81 -67zM491 42l-147 -52l-4 3v64q-48 -67 -128 -67q-83 0 -134 59.5t-51 155.5q0 106 61 180.5t147 74.5 q54 0 105 -43v156q0 31 -9 41t-37 10q-14 0 -22 -1v16q91 24 147 44l5 -2v-567q0 -35 8.5 -46t35.5 -11q6 0 23 1v-16zM340 102v230q0 40 -30.5 70t-71.5 30q-57 0 -91 -51t-34 -136q0 -92 37.5 -147.5t100.5 -55.5q47 0 74 32q15 17 15 28z" />
+<glyph unicode="&#x110;" horiz-adv-x="722" d="M16 662h270q188 0 293.5 -86.5t105.5 -241.5q0 -76 -29 -142.5t-81 -109.5q-100 -82 -275 -82h-284v19q57 4 72.5 20t15.5 70v206h-83v44h83v194q0 55 -14.5 70t-73.5 20v19zM206 315v-237q0 -24 11 -32.5t40 -8.5q125 0 197 41q122 71 122 249q0 168 -122 250 q-70 48 -199 48q-29 0 -39 -8t-10 -31v-227h146v-44h-146z" />
+<glyph unicode="&#x111;" horiz-adv-x="500" d="M507 522h-83v-408q0 -35 8.5 -46t35.5 -11q6 0 23 1v-16l-147 -52l-4 3v64q-48 -67 -128 -67q-83 0 -134 59.5t-51 155.5q0 106 61 180.5t147 74.5q54 0 105 -43v105h-175v39h175v12q0 31 -9 41t-37 10q-14 0 -22 -1v16q91 24 147 44l5 -2v-120h83v-39zM340 102v230 q0 40 -30.5 70t-71.5 30q-57 0 -91 -51t-34 -136q0 -92 37.5 -147.5t100.5 -55.5q47 0 74 32q15 17 15 28z" />
+<glyph unicode="&#x112;" horiz-adv-x="611" d="M461 719h-311v54h311v-54zM597 169l-46 -169h-539v19q57 4 72 20.5t15 74.5v436q0 56 -15.5 73t-71.5 20v19h530l4 -143h-25q-11 67 -39 86t-115 19h-131q-22 0 -28.5 -6.5t-6.5 -29.5v-220h151q63 0 83.5 18t29.5 78h23v-234h-23q-9 63 -29 80t-84 17h-151v-243 q0 -30 21 -38.5t80 -8.5h36q107 0 152 26t79 106h28z" />
+<glyph unicode="&#x113;" horiz-adv-x="444" d="M381 507h-311v54h311v-54zM408 164l16 -7q-60 -167 -209 -167q-88 0 -139 61.5t-51 165.5q0 107 57 175t150 68q90 0 139 -69q29 -40 34 -114h-308q4 -63 12.5 -96t33.5 -67q42 -55 111 -55q49 0 82.5 24t71.5 81zM99 309h204q-9 63 -29.5 89t-68.5 26q-42 0 -70 -29.5 t-36 -85.5z" />
+<glyph unicode="&#x114;" horiz-adv-x="611" d="M423 876h29q-18 -157 -142 -157q-69 0 -104 41.5t-35 115.5h29q20 -97 112 -97q40 0 64.5 21.5t46.5 75.5zM597 169l-46 -169h-539v19q57 4 72 20.5t15 74.5v436q0 56 -15.5 73t-71.5 20v19h530l4 -143h-25q-11 67 -39 86t-115 19h-131q-22 0 -28.5 -6.5t-6.5 -29.5v-220 h151q63 0 83.5 18t29.5 78h23v-234h-23q-9 63 -29 80t-84 17h-151v-243q0 -30 21 -38.5t80 -8.5h36q107 0 152 26t79 106h28z" />
+<glyph unicode="&#x115;" horiz-adv-x="444" d="M333 664h29q-18 -157 -142 -157q-69 0 -104 41.5t-35 115.5h29q20 -97 112 -97q40 0 64.5 21.5t46.5 75.5zM408 164l16 -7q-60 -167 -209 -167q-88 0 -139 61.5t-51 165.5q0 107 57 175t150 68q90 0 139 -69q29 -40 34 -114h-308q4 -63 12.5 -96t33.5 -67q42 -55 111 -55 q49 0 82.5 24t71.5 81zM99 309h204q-9 63 -29.5 89t-68.5 26q-42 0 -70 -29.5t-36 -85.5z" />
+<glyph unicode="&#x116;" horiz-adv-x="611" d="M350 784q0 -21 -14.5 -35t-35.5 -14q-20 0 -34.5 14.5t-14.5 34.5q0 21 13.5 35.5t35.5 14.5q23 0 36.5 -14t13.5 -36zM597 169l-46 -169h-539v19q57 4 72 20.5t15 74.5v436q0 56 -15.5 73t-71.5 20v19h530l4 -143h-25q-11 67 -39 86t-115 19h-131q-22 0 -28.5 -6.5 t-6.5 -29.5v-220h151q63 0 83.5 18t29.5 78h23v-234h-23q-9 63 -29 80t-84 17h-151v-243q0 -30 21 -38.5t80 -8.5h36q107 0 152 26t79 106h28z" />
+<glyph unicode="&#x117;" horiz-adv-x="444" d="M290 572q0 -21 -14.5 -35t-35.5 -14q-20 0 -34.5 14.5t-14.5 34.5q0 21 13.5 35.5t35.5 14.5q23 0 36.5 -14t13.5 -36zM408 164l16 -7q-60 -167 -209 -167q-88 0 -139 61.5t-51 165.5q0 107 57 175t150 68q90 0 139 -69q29 -40 34 -114h-308q4 -63 12.5 -96t33.5 -67 q42 -55 111 -55q49 0 82.5 24t71.5 81zM99 309h204q-9 63 -29.5 89t-68.5 26q-42 0 -70 -29.5t-36 -85.5z" />
+<glyph unicode="&#x118;" horiz-adv-x="611" d="M382 0h-370v19q57 4 72 20.5t15 74.5v436q0 56 -15.5 73t-71.5 20v19h530l4 -143h-25q-11 67 -39 86t-115 19h-131q-22 0 -28.5 -6.5t-6.5 -29.5v-220h151q63 0 83.5 18t29.5 78h23v-234h-23q-9 63 -29 80t-84 17h-151v-243q0 -30 21 -38.5t80 -8.5h36q107 0 152 26 t79 106h28l-46 -169h-123q-44 -35 -44 -70q0 -39 38 -39q32 0 71 36l20 -16q-28 -41 -52.5 -58.5t-58.5 -17.5q-33 0 -53.5 19.5t-20.5 54.5q0 53 54 91z" />
+<glyph unicode="&#x119;" horiz-adv-x="444" d="M346 -73l20 -16q-28 -41 -52.5 -58.5t-58.5 -17.5q-33 0 -53.5 19.5t-20.5 54.5q0 47 41 81h-7q-88 0 -139 61.5t-51 165.5q0 107 57 175t150 68q90 0 139 -69q29 -40 34 -114h-308q4 -63 12.5 -96t33.5 -67q42 -55 111 -55q49 0 82.5 24t71.5 81l16 -7 q-46 -127 -144 -157q-43 -36 -43 -70q0 -39 38 -39q32 0 71 36zM99 309h204q-9 63 -29.5 89t-68.5 26q-42 0 -70 -29.5t-36 -85.5z" />
+<glyph unicode="&#x11a;" horiz-adv-x="611" d="M469 886l-124 -167h-64l-123 167h35l120 -103l121 103h35zM597 169l-46 -169h-539v19q57 4 72 20.5t15 74.5v436q0 56 -15.5 73t-71.5 20v19h530l4 -143h-25q-11 67 -39 86t-115 19h-131q-22 0 -28.5 -6.5t-6.5 -29.5v-220h151q63 0 83.5 18t29.5 78h23v-234h-23 q-9 63 -29 80t-84 17h-151v-243q0 -30 21 -38.5t80 -8.5h36q107 0 152 26t79 106h28z" />
+<glyph unicode="&#x11b;" horiz-adv-x="444" d="M396 674l-124 -167h-64l-123 167h35l120 -103l121 103h35zM408 164l16 -7q-60 -167 -209 -167q-88 0 -139 61.5t-51 165.5q0 107 57 175t150 68q90 0 139 -69q29 -40 34 -114h-308q4 -63 12.5 -96t33.5 -67q42 -55 111 -55q49 0 82.5 24t71.5 81zM99 309h204 q-9 63 -29.5 89t-68.5 26q-42 0 -70 -29.5t-36 -85.5z" />
+<glyph unicode="&#x11c;" horiz-adv-x="722" d="M509 719h-34l-122 103l-121 -103h-34l124 167h62zM709 354v-18q-44 -4 -57 -18t-13 -62v-200q-86 -70 -254 -70q-78 0 -149.5 28t-120.5 79q-83 87 -83 234q0 166 107 263q94 86 239 86q64 0 133 -23q27 -10 44 -10q16 0 28 9.5t17 23.5h22l8 -211h-23q-32 78 -71 116 q-58 55 -146 55q-100 0 -167 -69q-77 -77 -77 -243q0 -138 72 -218t191 -80q57 0 95 18t38 43v157q0 58 -14.5 72.5t-74.5 19.5v18h256z" />
+<glyph unicode="&#x11d;" horiz-adv-x="500" d="M405 507h-34l-122 103l-121 -103h-34l124 167h62zM470 388h-83q19 -43 19 -84q0 -77 -52 -116t-104 -39q-11 0 -38 3l-19 2q-20 -6 -40 -27t-20 -36q0 -23 78 -27l129 -6q55 -2 88 -31t33 -76q0 -58 -60 -105q-83 -64 -200 -64q-72 0 -122.5 28.5t-50.5 68.5 q0 28 22 55.5t76 66.5q-32 15 -42.5 26t-10.5 27q0 29 46 69q23 19 43 40q-50 25 -71.5 56t-21.5 78q0 68 48.5 115.5t118.5 47.5q40 0 80 -15l22 -8q29 -10 55 -10h77v-39zM152 338v-3q0 -72 28.5 -116.5t74.5 -44.5q34 0 54 24.5t20 65.5q0 66 -30 121q-25 47 -73 47 q-35 0 -54.5 -25t-19.5 -69zM433 -64q0 28 -27.5 38.5t-96.5 10.5q-99 0 -162 13q-30 -36 -39.5 -52.5t-9.5 -33.5q0 -33 39.5 -53t105.5 -20q85 0 137.5 26.5t52.5 70.5z" />
+<glyph unicode="&#x11e;" horiz-adv-x="722" d="M495 876h29q-18 -157 -142 -157q-69 0 -104 41.5t-35 115.5h29q20 -97 112 -97q40 0 64.5 21.5t46.5 75.5zM709 354v-18q-44 -4 -57 -18t-13 -62v-200q-86 -70 -254 -70q-78 0 -149.5 28t-120.5 79q-83 87 -83 234q0 166 107 263q94 86 239 86q64 0 133 -23 q27 -10 44 -10q16 0 28 9.5t17 23.5h22l8 -211h-23q-32 78 -71 116q-58 55 -146 55q-100 0 -167 -69q-77 -77 -77 -243q0 -138 72 -218t191 -80q57 0 95 18t38 43v157q0 58 -14.5 72.5t-74.5 19.5v18h256z" />
+<glyph unicode="&#x11f;" horiz-adv-x="500" d="M351 664h29q-18 -157 -142 -157q-69 0 -104 41.5t-35 115.5h29q20 -97 112 -97q40 0 64.5 21.5t46.5 75.5zM470 388h-83q19 -43 19 -84q0 -77 -52 -116t-104 -39q-11 0 -38 3l-19 2q-20 -6 -40 -27t-20 -36q0 -23 78 -27l129 -6q55 -2 88 -31t33 -76q0 -58 -60 -105 q-83 -64 -200 -64q-72 0 -122.5 28.5t-50.5 68.5q0 28 22 55.5t76 66.5q-32 15 -42.5 26t-10.5 27q0 29 46 69q23 19 43 40q-50 25 -71.5 56t-21.5 78q0 68 48.5 115.5t118.5 47.5q40 0 80 -15l22 -8q29 -10 55 -10h77v-39zM152 338v-3q0 -72 28.5 -116.5t74.5 -44.5 q34 0 54 24.5t20 65.5q0 66 -30 121q-25 47 -73 47q-35 0 -54.5 -25t-19.5 -69zM433 -64q0 28 -27.5 38.5t-96.5 10.5q-99 0 -162 13q-30 -36 -39.5 -52.5t-9.5 -33.5q0 -33 39.5 -53t105.5 -20q85 0 137.5 26.5t52.5 70.5z" />
+<glyph unicode="&#x120;" horiz-adv-x="722" d="M420 784q0 -21 -14.5 -35t-35.5 -14q-20 0 -34.5 14.5t-14.5 34.5q0 21 13.5 35.5t35.5 14.5q23 0 36.5 -14t13.5 -36zM709 354v-18q-44 -4 -57 -18t-13 -62v-200q-86 -70 -254 -70q-78 0 -149.5 28t-120.5 79q-83 87 -83 234q0 166 107 263q94 86 239 86q64 0 133 -23 q27 -10 44 -10q16 0 28 9.5t17 23.5h22l8 -211h-23q-32 78 -71 116q-58 55 -146 55q-100 0 -167 -69q-77 -77 -77 -243q0 -138 72 -218t191 -80q57 0 95 18t38 43v157q0 58 -14.5 72.5t-74.5 19.5v18h256z" />
+<glyph unicode="&#x121;" horiz-adv-x="500" d="M300 572q0 -21 -14.5 -35t-35.5 -14q-20 0 -34.5 14.5t-14.5 34.5q0 21 13.5 35.5t35.5 14.5q23 0 36.5 -14t13.5 -36zM470 388h-83q19 -43 19 -84q0 -77 -52 -116t-104 -39q-11 0 -38 3l-19 2q-20 -6 -40 -27t-20 -36q0 -23 78 -27l129 -6q55 -2 88 -31t33 -76 q0 -58 -60 -105q-83 -64 -200 -64q-72 0 -122.5 28.5t-50.5 68.5q0 28 22 55.5t76 66.5q-32 15 -42.5 26t-10.5 27q0 29 46 69q23 19 43 40q-50 25 -71.5 56t-21.5 78q0 68 48.5 115.5t118.5 47.5q40 0 80 -15l22 -8q29 -10 55 -10h77v-39zM152 338v-3q0 -72 28.5 -116.5 t74.5 -44.5q34 0 54 24.5t20 65.5q0 66 -30 121q-25 47 -73 47q-35 0 -54.5 -25t-19.5 -69zM433 -64q0 28 -27.5 38.5t-96.5 10.5q-99 0 -162 13q-30 -36 -39.5 -52.5t-9.5 -33.5q0 -33 39.5 -53t105.5 -20q85 0 137.5 26.5t52.5 70.5z" />
+<glyph unicode="&#x122;" horiz-adv-x="722" d="M709 354v-18q-44 -4 -57 -18t-13 -62v-200q-86 -70 -254 -70q-78 0 -149.5 28t-120.5 79q-83 87 -83 234q0 166 107 263q94 86 239 86q64 0 133 -23q27 -10 44 -10q16 0 28 9.5t17 23.5h22l8 -211h-23q-32 78 -71 116q-58 55 -146 55q-100 0 -167 -69q-77 -77 -77 -243 q0 -138 72 -218t191 -80q57 0 95 18t38 43v157q0 58 -14.5 72.5t-74.5 19.5v18h256zM358 -280l-10 19q83 56 83 107q0 13 -14 13q-4 0 -13.5 -2t-15.5 -2q-58 0 -58 51q0 26 16.5 41.5t43.5 15.5q34 0 57 -24.5t23 -62.5q0 -46 -30.5 -89t-81.5 -67z" />
+<glyph unicode="&#x123;" horiz-adv-x="500" d="M293 766l9 -19q-82 -57 -82 -106q0 -14 14 -14q2 0 7 2q12 2 20 2q28 0 43.5 -13.5t15.5 -37.5q0 -25 -16.5 -41t-42.5 -16q-34 0 -57 25.5t-23 63.5q0 45 31 87t81 67zM470 388h-83q19 -43 19 -84q0 -77 -52 -116t-104 -39q-11 0 -38 3l-19 2q-20 -6 -40 -27t-20 -36 q0 -23 78 -27l129 -6q55 -2 88 -31t33 -76q0 -58 -60 -105q-83 -64 -200 -64q-72 0 -122.5 28.5t-50.5 68.5q0 28 22 55.5t76 66.5q-32 15 -42.5 26t-10.5 27q0 29 46 69q23 19 43 40q-50 25 -71.5 56t-21.5 78q0 68 48.5 115.5t118.5 47.5q40 0 80 -15l22 -8q29 -10 55 -10 h77v-39zM152 338v-3q0 -72 28.5 -116.5t74.5 -44.5q34 0 54 24.5t20 65.5q0 66 -30 121q-25 47 -73 47q-35 0 -54.5 -25t-19.5 -69zM433 -64q0 28 -27.5 38.5t-96.5 10.5q-99 0 -162 13q-30 -36 -39.5 -52.5t-9.5 -33.5q0 -33 39.5 -53t105.5 -20q85 0 137.5 26.5t52.5 70.5 z" />
+<glyph unicode="&#x124;" horiz-adv-x="722" d="M518 719h-34l-122 103l-121 -103h-34l124 167h62zM703 0h-279v19q58 4 73 22.5t15 82.5v191h-303v-202q0 -55 16 -73t71 -21l1 -19h-279v19q59 4 74 21.5t15 81.5v426q0 58 -15.5 74t-73.5 21v19h280v-19q-56 -5 -72.5 -21.5t-16.5 -73.5v-189h303v189q0 58 -15.5 74 t-73.5 21v19h280v-19q-56 -5 -72.5 -21.5t-16.5 -73.5v-437q0 -53 16.5 -70.5t72.5 -21.5v-19z" />
+<glyph unicode="&#x125;" horiz-adv-x="500" d="M376 719h-34l-122 103l-121 -103h-34l124 167h62zM487 0h-212v15q44 5 56 20t12 67v198q0 106 -74 106q-30 0 -55 -14t-57 -49v-241q0 -52 12 -67t56 -20v-15h-216v15q43 6 53.5 20t10.5 67v471q0 32 -9.5 41.5t-41.5 9.5q-9 0 -12 -1v16l27 8q77 23 115 36l5 -3v-304 q35 45 69 64.5t78 19.5q123 0 123 -159v-199q0 -52 9.5 -65.5t50.5 -21.5v-15z" />
+<glyph unicode="&#x126;" horiz-adv-x="723" d="M702 0h-279v19q58 4 73 22.5t15 82.5v191h-303v-202q0 -55 16.5 -73t71.5 -21v-19h-279v19q59 4 74 21.5t15 81.5v354h-89v44h89v28q0 58 -15.5 74t-73.5 21v19h280v-19q-56 -5 -72.5 -21.5t-16.5 -73.5v-28h303v28q0 58 -15.5 74t-73.5 21v19h280v-19 q-56 -5 -72.5 -21.5t-16.5 -73.5v-28h88v-44h-88v-365q0 -53 16.5 -70.5t72.5 -21.5v-19zM511 359v117h-303v-117h303z" />
+<glyph unicode="&#x127;" horiz-adv-x="500" d="M487 0h-212v15q44 5 56 20t12 67v198q0 106 -74 106q-30 0 -55 -14t-57 -49v-241q0 -52 12 -67t56 -20v-15h-216v15q43 6 53.5 20t10.5 67v410h-65v54h65v7q0 32 -9.5 41.5t-41.5 9.5q-9 0 -12 -1v16l27 8q77 23 115 36l5 -3v-114h162v-54h-162v-136q35 45 69 64.5 t78 19.5q123 0 123 -159v-199q0 -52 9.5 -65.5t50.5 -21.5v-15z" />
+<glyph unicode="&#x128;" horiz-adv-x="333" d="M302 850h29q-16 -57 -40 -81.5t-65 -24.5q-32 0 -81 24l-23 11q-24 11 -41 11q-35 0 -51 -46h-29q11 49 37 75t64 26q34 0 70 -18l24 -12q28 -15 53 -15q17 0 28.5 11t24.5 39zM315 0h-297v19q63 2 80 18.5t17 74.5v439q0 58 -16 73t-81 19v19h297v-19q-63 -3 -80.5 -19 t-17.5 -73v-439q0 -56 18 -73.5t80 -19.5v-19z" />
+<glyph unicode="&#x129;" horiz-adv-x="278" d="M276 638h29q-16 -57 -40 -81.5t-65 -24.5q-32 0 -81 24l-23 11q-24 11 -41 11q-35 0 -51 -46h-29q11 49 37 75t64 26q34 0 70 -18l24 -12q28 -15 53 -15q17 0 28.5 11t24.5 39zM253 0h-237v15q52 3 65.5 18t13.5 71v227q0 35 -7 49t-26 14q-24 0 -42 -5v16l154 55l5 -4 v-351q0 -56 12.5 -71t61.5 -19v-15z" />
+<glyph unicode="&#x12a;" horiz-adv-x="333" d="M322 719h-311v54h311v-54zM315 0h-297v19q63 2 80 18.5t17 74.5v439q0 58 -16 73t-81 19v19h297v-19q-63 -3 -80.5 -19t-17.5 -73v-439q0 -56 18 -73.5t80 -19.5v-19z" />
+<glyph unicode="&#x12b;" horiz-adv-x="278" d="M253 0h-237v15q52 3 65.5 18t13.5 71v227q0 35 -7 49t-26 14q-24 0 -42 -5v16l154 55l5 -4v-351q0 -56 12.5 -71t61.5 -19v-15zM290 507h-311v54h311v-54z" />
+<glyph unicode="&#x12c;" horiz-adv-x="333" d="M276 876h29q-18 -157 -142 -157q-69 0 -104 41.5t-35 115.5h29q20 -97 112 -97q40 0 64.5 21.5t46.5 75.5zM315 0h-297v19q63 2 80 18.5t17 74.5v439q0 58 -16 73t-81 19v19h297v-19q-63 -3 -80.5 -19t-17.5 -73v-439q0 -56 18 -73.5t80 -19.5v-19z" />
+<glyph unicode="&#x12d;" horiz-adv-x="278" d="M251 664h29q-18 -157 -142 -157q-69 0 -104 41.5t-35 115.5h29q20 -97 112 -97q40 0 64.5 21.5t46.5 75.5zM253 0h-237v15q52 3 65.5 18t13.5 71v227q0 35 -7 49t-26 14q-24 0 -42 -5v16l154 55l5 -4v-351q0 -56 12.5 -71t61.5 -19v-15z" />
+<glyph unicode="&#x12e;" horiz-adv-x="333" d="M174 0h-156v19q63 2 80 18.5t17 74.5v439q0 58 -16 73t-81 19v19h297v-19q-63 -3 -80.5 -19t-17.5 -73v-439q0 -56 18 -73.5t80 -19.5v-19h-95q-44 -35 -44 -70q0 -39 38 -39q32 0 71 36l20 -16q-28 -41 -52.5 -58.5t-58.5 -17.5q-33 0 -53.5 19.5t-20.5 54.5q0 53 54 91 z" />
+<glyph unicode="&#x12f;" horiz-adv-x="278" d="M146 0h-130v15q52 3 65.5 18t13.5 71v227q0 35 -7 49t-26 14q-24 0 -42 -5v16l155 55l4 -4v-351q0 -56 12.5 -71t61.5 -19v-15h-61q-44 -35 -44 -70q0 -39 38 -39q32 0 71 36l20 -16q-28 -41 -52.5 -58.5t-58.5 -17.5q-33 0 -53.5 19.5t-20.5 54.5q0 53 54 91zM180 632 q0 -22 -15 -36.5t-37 -14.5q-21 0 -35.5 14.5t-14.5 36.5q0 21 15 36t36 15q22 0 36.5 -15t14.5 -36z" />
+<glyph unicode="&#x130;" horiz-adv-x="333" d="M215 784q0 -21 -14.5 -35t-35.5 -14q-20 0 -34.5 14.5t-14.5 34.5q0 21 13.5 35.5t35.5 14.5q23 0 36.5 -14t13.5 -36zM315 0h-297v19q63 2 80 18.5t17 74.5v439q0 58 -16 73t-81 19v19h297v-19q-63 -3 -80.5 -19t-17.5 -73v-439q0 -56 18 -73.5t80 -19.5v-19z" />
+<glyph unicode="&#x131;" horiz-adv-x="278" d="M253 0h-237v15q52 3 65.5 18t13.5 71v227q0 35 -7 49t-26 14q-24 0 -42 -5v16l154 55l5 -4v-351q0 -56 12.5 -71t61.5 -19v-15z" />
+<glyph unicode="&#x134;" horiz-adv-x="373" d="M367 719h-34l-122 103l-121 -103h-34l124 167h62zM354 662v-19q-61 -5 -76.5 -20.5t-15.5 -73.5v-364q0 -199 -167 -199q-46 0 -73.5 19t-27.5 53q0 20 14.5 36t34.5 16q33 0 49 -42q2 -5 5 -14l5 -12q1 -5 4 -9.5t7 -6.5t10 -2q22 0 29.5 15.5t7.5 54.5v456 q0 59 -15 73.5t-78 19.5v19h287z" />
+<glyph unicode="&#x135;" horiz-adv-x="278" d="M295 507h-34l-122 103l-121 -103h-34l124 167h62zM193 457v-457q0 -107 -43.5 -162.5t-126.5 -55.5q-41 0 -67 15.5t-26 39.5q0 16 12 27.5t29 11.5q23 0 48 -32q23 -28 42 -28q23 0 34 18q14 25 14 121v379q0 60 -32 60q-24 0 -40 -3l-5 -1v16q80 25 156 54z" />
+<glyph unicode="&#x136;" horiz-adv-x="722" d="M723 0h-303v19l27 1q42 1 42 24q0 18 -32.5 56.5t-104.5 113.5l-100 103l-26 -21v-185q0 -56 16 -71.5t73 -20.5v-19h-282v19q59 3 75 22t16 84v424q0 56 -16 73t-74 21v19h282v-19q-61 -4 -75.5 -20t-14.5 -75v-200l178 164q43 40 60.5 61t17.5 38q0 16 -8.5 23t-32.5 8 l-25 1v19h259v-19q-51 -4 -77.5 -17.5t-78.5 -63.5l-186 -178l234 -256q62 -68 91.5 -88.5t64.5 -20.5v-19zM328 -280l-10 19q83 56 83 107q0 13 -14 13q-4 0 -13.5 -2t-15.5 -2q-58 0 -58 51q0 26 16.5 41.5t43.5 15.5q34 0 57 -24.5t23 -62.5q0 -46 -30.5 -89t-81.5 -67z " />
+<glyph unicode="&#x137;" horiz-adv-x="500" d="M505 0h-218v15h19q21 0 21 15q0 9 -11 23l-150 198v-184q0 -26 12.5 -38t42.5 -13l20 -1v-15h-234v15q54 9 64.5 18.5t10.5 48.5v482q0 36 -9 48.5t-34 12.5q-6 0 -32 -2v16l30 8q60 16 125 36l4 -2v-420l137 122q23 21 23 35q0 10 -10.5 13.5t-39.5 4.5v14h204v-15 q-50 0 -88.5 -21.5t-127.5 -104.5l-29 -27l153 -194q54 -69 117 -73v-15zM188 -280l-10 19q83 56 83 107q0 13 -14 13q-4 0 -13.5 -2t-15.5 -2q-58 0 -58 51q0 26 16.5 41.5t43.5 15.5q34 0 57 -24.5t23 -62.5q0 -46 -30.5 -89t-81.5 -67z" />
+<glyph unicode="&#x138;" horiz-adv-x="542" d="M532 0h-130q-23 13 -40 28t-36 44q-14 22 -35 62t-29 54q-28 48 -38 54q-40 -2 -54 -2v-162q0 -37 17 -48q16 -14 59 -14v-16h-241v16q48 0 60 11q17 11 17 50v305q0 39 -16 50q-14 10 -61 11v16h241v-16q-46 -2 -59 -11q-17 -11 -17 -51v-105l45 4q30 3 57 28 q30 26 52 88q12 35 34 49t60 14q31 0 54 -14t23 -38q0 -18 -15 -29.5t-33 -11.5q-25 0 -41 19.5t-24 19.5q-12 0 -18 -7t-11 -23q-22 -73 -69 -109q16 -6 31 -22q14 -15 48.5 -76.5t39.5 -69.5q44 -63 129 -83v-15z" />
+<glyph unicode="&#x139;" horiz-adv-x="611" d="M131 719l147 148q23 23 42 23q35 0 35 -32q0 -23 -30 -42l-154 -97h-40zM598 174l-48 -174h-538v19q55 3 71 21t16 75v431q0 59 -14.5 76t-72.5 21v19h283v-19q-61 -4 -77.5 -20.5t-16.5 -74.5v-464q0 -28 17.5 -36.5t72.5 -8.5h70q121 0 169 61q20 27 42 74h26z" />
+<glyph unicode="&#x13a;" horiz-adv-x="278" d="M29 719l147 148q23 23 42 23q35 0 35 -32q0 -23 -30 -42l-154 -97h-40zM257 0h-236v15q47 4 62 19.5t15 57.5v469q0 36 -9 50t-33 14q-21 0 -37 -2v16q95 23 158 44l5 -4v-592q0 -42 14 -55.5t61 -16.5v-15z" />
+<glyph unicode="&#x13b;" horiz-adv-x="611" d="M598 174l-48 -174h-538v19q55 3 71 21t16 75v431q0 59 -14.5 76t-72.5 21v19h283v-19q-61 -4 -77.5 -20.5t-16.5 -74.5v-464q0 -28 17.5 -36.5t72.5 -8.5h70q121 0 169 61q20 27 42 74h26zM258 -280l-10 19q83 56 83 107q0 13 -14 13q-4 0 -13.5 -2t-15.5 -2 q-58 0 -58 51q0 26 16.5 41.5t43.5 15.5q34 0 57 -24.5t23 -62.5q0 -46 -30.5 -89t-81.5 -67z" />
+<glyph unicode="&#x13c;" horiz-adv-x="278" d="M257 0h-236v15q47 4 62 19.5t15 57.5v469q0 36 -9 50t-33 14q-21 0 -37 -2v16q95 23 158 44l5 -4v-592q0 -42 14 -55.5t61 -16.5v-15zM98 -280l-10 19q83 56 83 107q0 13 -14 13q-4 0 -13.5 -2t-15.5 -2q-58 0 -58 51q0 26 16.5 41.5t43.5 15.5q34 0 57 -24.5t23 -62.5 q0 -46 -30.5 -89t-81.5 -67z" />
+<glyph unicode="&#x13d;" horiz-adv-x="611" d="M378 440l-9 19q82 56 82 107q0 13 -14 13q-2 0 -7 -2q-12 -2 -20 -2q-28 0 -43.5 13.5t-15.5 37.5q0 25 16.5 41t42.5 16q34 0 57 -25.5t23 -63.5q0 -45 -31 -87t-81 -67zM598 174l-48 -174h-538v19q55 3 71 21t16 75v431q0 59 -14.5 76t-72.5 21v19h283v-19 q-61 -4 -77.5 -20.5t-16.5 -74.5v-464q0 -28 17.5 -36.5t72.5 -8.5h70q121 0 169 61q20 27 42 74h26z" />
+<glyph unicode="&#x13e;" horiz-adv-x="381" d="M250 459l-9 19q82 56 82 107q0 13 -14 13q-2 0 -7 -2q-12 -2 -20 -2q-28 0 -43.5 13.5t-15.5 37.5q0 25 16.5 41t42.5 16q34 0 57 -25.5t23 -63.5q0 -45 -31 -87t-81 -67zM257 0h-236v15q47 4 62 19.5t15 57.5v469q0 36 -9 50t-33 14q-21 0 -37 -2v16q95 23 158 44l5 -4 v-592q0 -42 14 -55.5t61 -16.5v-15z" />
+<glyph unicode="&#x13f;" horiz-adv-x="620" d="M615 174l-48 -174h-538v19q55 3 71 21t16 75v431q0 59 -14.5 76t-72.5 21v19h283v-19q-61 -4 -77.5 -20.5t-16.5 -74.5v-464q0 -28 17.5 -36.5t72.5 -8.5h70q121 0 169 61q20 27 42 74h26zM456 345q0 -22 -16.5 -38t-39.5 -16t-39 16t-16 39t16.5 39.5t39.5 16.5 q22 0 38.5 -17t16.5 -40z" />
+<glyph unicode="&#x140;" horiz-adv-x="370" d="M257 0h-236v15q47 4 62 19.5t15 57.5v469q0 36 -9 50t-33 14q-21 0 -37 -2v16q95 23 158 44l5 -4v-592q0 -42 14 -55.5t61 -16.5v-15zM354 342q0 -22 -16.5 -38t-39.5 -16t-39 16t-16 39t16.5 39.5t39.5 16.5q22 0 38.5 -17t16.5 -40z" />
+<glyph unicode="&#x141;" horiz-adv-x="611" d="M597 174l-49 -174h-538v19q54 2 71 21t17 71v169l-87 -53v49l87 54v221q0 55 -16 72t-71 20v19h282v-19q-57 -3 -75 -20t-18 -72v-172l155 95v-49l-155 -94v-249q0 -26 17 -34.5t71 -8.5h63q101 0 148 33q37 27 72 102h26z" />
+<glyph unicode="&#x142;" horiz-adv-x="278" d="M259 429l-77 -53v-290q0 -43 13 -54.5t63 -16.5v-15h-238v15q50 4 64 17t14 57v230l-78 -54v44l78 54v199q0 38 -8.5 50.5t-33.5 12.5q-12 0 -37 -5v19q95 23 158 44l5 -3v-260l77 53v-44z" />
+<glyph unicode="&#x143;" horiz-adv-x="722" d="M279 719l147 148q23 23 42 23q35 0 35 -32q0 -23 -30 -42l-154 -97h-40zM707 662v-19q-51 -5 -66 -18q-16 -14 -22.5 -38t-6.5 -80v-518h-18l-441 549v-388q0 -76 17 -99.5t76 -31.5v-19h-234v19q62 7 79.5 29.5t17.5 101.5v440q-26 32 -44 42.5t-53 10.5v19h170 l386 -483v340q0 76 -19 98q-12 13 -26.5 17.5t-52.5 8.5v19h237z" />
+<glyph unicode="&#x144;" horiz-adv-x="500" d="M191 507l147 148q23 23 42 23q35 0 35 -32q0 -23 -30 -42l-154 -97h-40zM485 0h-208l1 15q37 3 49.5 21.5t12.5 68.5v199q0 101 -73 101q-25 0 -47 -12t-56 -45v-276q0 -30 13.5 -42t51.5 -15v-15h-211v15q38 3 50 18.5t12 60.5v243q0 37 -7 51t-28 14q-20 0 -29 -4v17 q70 20 137 45l8 -3v-78h1q71 81 144 81q57 0 87.5 -40t30.5 -114v-221q0 -40 12 -53t49 -17v-15z" />
+<glyph unicode="&#x145;" horiz-adv-x="722" d="M707 662v-19q-51 -5 -66 -18q-16 -14 -22.5 -38t-6.5 -80v-518h-18l-441 549v-388q0 -76 17 -99.5t76 -31.5v-19h-234v19q62 7 79.5 29.5t17.5 101.5v440q-26 32 -44 42.5t-53 10.5v19h170l386 -483v340q0 76 -19 98q-12 13 -26.5 17.5t-52.5 8.5v19h237zM318 -280 l-10 19q83 56 83 107q0 13 -14 13q-4 0 -13.5 -2t-15.5 -2q-58 0 -58 51q0 26 16.5 41.5t43.5 15.5q34 0 57 -24.5t23 -62.5q0 -46 -30.5 -89t-81.5 -67z" />
+<glyph unicode="&#x146;" horiz-adv-x="500" d="M485 0h-208l1 15q37 3 49.5 21.5t12.5 68.5v199q0 101 -73 101q-25 0 -47 -12t-56 -45v-276q0 -30 13.5 -42t51.5 -15v-15h-211v15q38 3 50 18.5t12 60.5v243q0 37 -7 51t-28 14q-20 0 -29 -4v17q70 20 137 45l8 -3v-78h1q71 81 144 81q57 0 87.5 -40t30.5 -114v-221 q0 -40 12 -53t49 -17v-15zM213 -280l-10 19q83 56 83 107q0 13 -14 13q-4 0 -13.5 -2t-15.5 -2q-58 0 -58 51q0 26 16.5 41.5t43.5 15.5q34 0 57 -24.5t23 -62.5q0 -46 -30.5 -89t-81.5 -67z" />
+<glyph unicode="&#x147;" horiz-adv-x="722" d="M519 886l-124 -167h-64l-123 167h35l120 -103l121 103h35zM707 662v-19q-51 -5 -66 -18q-16 -14 -22.5 -38t-6.5 -80v-518h-18l-441 549v-388q0 -76 17 -99.5t76 -31.5v-19h-234v19q62 7 79.5 29.5t17.5 101.5v440q-26 32 -44 42.5t-53 10.5v19h170l386 -483v340 q0 76 -19 98q-12 13 -26.5 17.5t-52.5 8.5v19h237z" />
+<glyph unicode="&#x148;" horiz-adv-x="500" d="M406 674l-124 -167h-64l-123 167h35l120 -103l121 103h35zM485 0h-208l1 15q37 3 49.5 21.5t12.5 68.5v199q0 101 -73 101q-25 0 -47 -12t-56 -45v-276q0 -30 13.5 -42t51.5 -15v-15h-211v15q38 3 50 18.5t12 60.5v243q0 37 -7 51t-28 14q-20 0 -29 -4v17q70 20 137 45 l8 -3v-78h1q71 81 144 81q57 0 87.5 -40t30.5 -114v-221q0 -40 12 -53t49 -17v-15z" />
+<glyph unicode="&#x149;" horiz-adv-x="590" d="M47 459l-9 19q82 56 82 107q0 13 -14 13q-2 0 -7 -2q-12 -2 -20 -2q-28 0 -43.5 13.5t-15.5 37.5q0 25 16.5 41t42.5 16q34 0 57 -25.5t23 -63.5q0 -45 -31 -87t-81 -67zM566 0h-208l1 15q37 3 49.5 21.5t12.5 68.5v199q0 101 -73 101q-25 0 -47 -12t-56 -45v-276 q0 -30 13.5 -42t51.5 -15v-15h-211v15q38 3 50 18.5t12 60.5v243q0 37 -7 51t-28 14q-20 0 -29 -4v17q70 20 137 45l8 -3v-78h1q71 81 144 81q57 0 87.5 -40t30.5 -114v-221q0 -40 12 -53t49 -17v-15z" />
+<glyph unicode="&#x14a;" horiz-adv-x="710" d="M190 662v-120q65 136 194 136q94 0 161 -50t97.5 -125t30.5 -164q0 -60 -17 -121t-48.5 -114.5t-85 -87.5t-118.5 -34q-48 0 -78 25.5t-30 67.5q0 29 17 52.5t46 23.5q30 0 47 -19.5t17 -45.5q0 -6 -4 -22.5t-4 -20.5q0 -24 22 -24q56 0 91.5 80t35.5 212 q0 146 -52 233.5t-144 87.5q-59 0 -107 -49.5t-67 -140.5v-331q0 -38 12.5 -66.5t37.5 -28.5h14v-16h-223v16q36 0 46.5 19t10.5 57v455q0 49 -13.5 73.5t-48.5 24.5h-14v17h174z" />
+<glyph unicode="&#x14b;" horiz-adv-x="504" d="M424 306v-306q0 -107 -43.5 -162.5t-126.5 -55.5q-41 0 -67 15.5t-26 39.5q0 16 12 27.5t29 11.5q23 0 48 -32q23 -28 42 -28q23 0 34 18q14 25 14 121v349q0 101 -73 101q-25 0 -47 -12t-56 -45v-276q0 -30 13.5 -42t51.5 -15v-15h-211v15q38 3 50 18.5t12 60.5v243 q0 37 -7 51t-28 14q-20 0 -29 -4v17q70 20 137 45l8 -3v-78h1q71 81 144 81q57 0 87.5 -40t30.5 -114z" />
+<glyph unicode="&#x14c;" horiz-adv-x="722" d="M516 719h-311v54h311v-54zM688 331q0 -154 -91 -249.5t-236 -95.5q-146 0 -236.5 96t-90.5 252q0 152 90.5 247t236.5 95t236.5 -97.5t90.5 -247.5zM574 337q0 85 -24 152.5t-67 103.5q-56 47 -123 47q-85 0 -143 -67q-32 -36 -50.5 -102.5t-18.5 -138.5q0 -182 90 -265 q49 -45 124 -45q78 0 129 48q83 80 83 267z" />
+<glyph unicode="&#x14d;" horiz-adv-x="500" d="M404 507h-311v54h311v-54zM470 231q0 -105 -62.5 -173t-162.5 -68q-92 0 -154 67.5t-62 170.5q0 104 62 168t163 64q93 0 154.5 -63.5t61.5 -165.5zM380 204q0 114 -50 178q-40 50 -95 50q-52 0 -84 -42.5t-32 -116.5q0 -128 53 -205q34 -50 90 -50q55 0 86.5 49.5 t31.5 136.5z" />
+<glyph unicode="&#x14e;" horiz-adv-x="722" d="M471 876h29q-18 -157 -142 -157q-69 0 -104 41.5t-35 115.5h29q20 -97 112 -97q40 0 64.5 21.5t46.5 75.5zM688 331q0 -154 -91 -249.5t-236 -95.5q-146 0 -236.5 96t-90.5 252q0 152 90.5 247t236.5 95t236.5 -97.5t90.5 -247.5zM574 337q0 85 -24 152.5t-67 103.5 q-56 47 -123 47q-85 0 -143 -67q-32 -36 -50.5 -102.5t-18.5 -138.5q0 -182 90 -265q49 -45 124 -45q78 0 129 48q83 80 83 267z" />
+<glyph unicode="&#x14f;" horiz-adv-x="500" d="M362 664h29q-18 -157 -142 -157q-69 0 -104 41.5t-35 115.5h29q20 -97 112 -97q40 0 64.5 21.5t46.5 75.5zM470 231q0 -105 -62.5 -173t-162.5 -68q-92 0 -154 67.5t-62 170.5q0 104 62 168t163 64q93 0 154.5 -63.5t61.5 -165.5zM380 204q0 114 -50 178q-40 50 -95 50 q-52 0 -84 -42.5t-32 -116.5q0 -128 53 -205q34 -50 90 -50q55 0 86.5 49.5t31.5 136.5z" />
+<glyph unicode="&#x150;" horiz-adv-x="722" d="M327 719l146 148q23 23 43 23q34 0 34 -30q0 -27 -29 -45l-154 -96h-40zM171 719l146 148q23 23 43 23q34 0 34 -30q0 -27 -29 -45l-154 -96h-40zM688 331q0 -154 -91 -249.5t-236 -95.5q-146 0 -236.5 96t-90.5 252q0 152 90.5 247t236.5 95t236.5 -97.5t90.5 -247.5z M574 337q0 85 -24 152.5t-67 103.5q-56 47 -123 47q-85 0 -143 -67q-32 -36 -50.5 -102.5t-18.5 -138.5q0 -182 90 -265q49 -45 124 -45q78 0 129 48q83 80 83 267z" />
+<glyph unicode="&#x151;" horiz-adv-x="500" d="M230 507l146 148q23 23 43 23q34 0 34 -30q0 -27 -29 -45l-154 -96h-40zM74 507l146 148q23 23 43 23q34 0 34 -30q0 -27 -29 -45l-154 -96h-40zM470 231q0 -105 -62.5 -173t-162.5 -68q-92 0 -154 67.5t-62 170.5q0 104 62 168t163 64q93 0 154.5 -63.5t61.5 -165.5z M380 204q0 114 -50 178q-40 50 -95 50q-52 0 -84 -42.5t-32 -116.5q0 -128 53 -205q34 -50 90 -50q55 0 86.5 49.5t31.5 136.5z" />
+<glyph unicode="&#x152;" horiz-adv-x="889" d="M885 168l-44 -168h-343q-30 0 -95.5 -3t-88.5 -3q-59 0 -117 25.5t-93 68.5q-74 91 -74 241q0 192 129 285q75 54 183 54q17 0 65 -3q54 -3 113 -3h318v-141h-23q-9 66 -39 85.5t-122 19.5h-53q-41 0 -55.5 -8t-14.5 -27v-225h101q76 0 102.5 19t32.5 79h21v-234h-21 q-7 58 -28.5 78.5t-74.5 20.5h-133v-236q0 -30 12 -42.5t48 -12.5h113q49 0 86 30t71 100h24zM431 133v392q0 56 -21.5 81.5t-72.5 25.5q-92 0 -143.5 -79t-51.5 -224q0 -136 42 -211q49 -87 147 -87q53 0 76.5 24t23.5 78z" />
+<glyph unicode="&#x153;" horiz-adv-x="722" d="M679 145l11 -6q-39 -81 -80 -115t-99 -34q-46 0 -75.5 22t-52.5 73q-28 -52 -62 -73.5t-85 -21.5q-91 0 -148.5 64t-57.5 164q0 59 21.5 113t58.5 85q50 44 122 44q46 0 80 -17t72 -59q31 42 60 59t70 17q81 0 126 -62q30 -40 34 -121h-254q5 -113 36.5 -166.5 t92.5 -53.5q36 0 65.5 20t64.5 68zM579 307v27q0 42 -22.5 69.5t-56.5 27.5q-80 0 -81 -124h160zM343 195q0 236 -117 236q-43 0 -74 -36q-32 -37 -32 -140q0 -124 37 -188q30 -51 83 -51q50 0 76.5 46t26.5 133z" />
+<glyph unicode="&#x154;" horiz-adv-x="667" d="M215 719l147 148q23 23 42 23q35 0 35 -32q0 -23 -30 -42l-154 -97h-40zM660 0h-162l-238 308l-56 -2v-194q0 -57 15.5 -73t73.5 -20v-19h-276v19q57 5 71 22t14 83v427q0 56 -14 72t-71 20v19h272q137 0 209 -59q49 -40 49 -120q0 -136 -181 -164l200 -253 q21 -26 40 -35t54 -12v-19zM204 583v-240q72 1 107 8t70 26q57 32 57 114q0 134 -183 134q-27 0 -39 -8.5t-12 -33.5z" />
+<glyph unicode="&#x155;" horiz-adv-x="333" d="M66 507l147 148q23 23 42 23q35 0 35 -32q0 -23 -30 -42l-154 -97h-40zM160 458v-92q38 54 63.5 74t56.5 20q26 0 40.5 -14t14.5 -39q0 -21 -10.5 -33t-28.5 -12q-19 0 -40 20q-16 15 -26 15q-21 0 -45.5 -29t-24.5 -53v-225q0 -43 17 -58t68 -17v-15h-240v15 q48 9 59.5 20t11.5 49v250q0 33 -7.5 46.5t-26.5 13.5q-16 0 -35 -4v16q63 20 148 54z" />
+<glyph unicode="&#x156;" horiz-adv-x="667" d="M660 0h-162l-238 308l-56 -2v-194q0 -57 15.5 -73t73.5 -20v-19h-276v19q57 5 71 22t14 83v427q0 56 -14 72t-71 20v19h272q137 0 209 -59q49 -40 49 -120q0 -136 -181 -164l200 -253q21 -26 40 -35t54 -12v-19zM204 583v-240q72 1 107 8t70 26q57 32 57 114 q0 134 -183 134q-27 0 -39 -8.5t-12 -33.5zM308 -280l-10 19q83 56 83 107q0 13 -14 13q-4 0 -13.5 -2t-15.5 -2q-58 0 -58 51q0 26 16.5 41.5t43.5 15.5q34 0 57 -24.5t23 -62.5q0 -46 -30.5 -89t-81.5 -67z" />
+<glyph unicode="&#x157;" horiz-adv-x="333" d="M160 458v-92q38 54 63.5 74t56.5 20q26 0 40.5 -14t14.5 -39q0 -21 -10.5 -33t-28.5 -12q-19 0 -40 20q-16 15 -26 15q-21 0 -45.5 -29t-24.5 -53v-225q0 -43 17 -58t68 -17v-15h-240v15q48 9 59.5 20t11.5 49v250q0 33 -7.5 46.5t-26.5 13.5q-16 0 -35 -4v16 q63 20 148 54zM118 -280l-10 19q83 56 83 107q0 13 -14 13q-4 0 -13.5 -2t-15.5 -2q-58 0 -58 51q0 26 16.5 41.5t43.5 15.5q34 0 57 -24.5t23 -62.5q0 -46 -30.5 -89t-81.5 -67z" />
+<glyph unicode="&#x158;" horiz-adv-x="667" d="M446 886l-124 -167h-64l-123 167h35l120 -103l121 103h35zM660 0h-162l-238 308l-56 -2v-194q0 -57 15.5 -73t73.5 -20v-19h-276v19q57 5 71 22t14 83v427q0 56 -14 72t-71 20v19h272q137 0 209 -59q49 -40 49 -120q0 -136 -181 -164l200 -253q21 -26 40 -35t54 -12v-19z M204 583v-240q72 1 107 8t70 26q57 32 57 114q0 134 -183 134q-27 0 -39 -8.5t-12 -33.5z" />
+<glyph unicode="&#x159;" horiz-adv-x="333" d="M321 674l-124 -167h-64l-123 167h35l120 -103l121 103h35zM160 458v-92q38 54 63.5 74t56.5 20q26 0 40.5 -14t14.5 -39q0 -21 -10.5 -33t-28.5 -12q-19 0 -40 20q-16 15 -26 15q-21 0 -45.5 -29t-24.5 -53v-225q0 -43 17 -58t68 -17v-15h-240v15q48 9 59.5 20t11.5 49 v250q0 33 -7.5 46.5t-26.5 13.5q-16 0 -35 -4v16q63 20 148 54z" />
+<glyph unicode="&#x15a;" horiz-adv-x="556" d="M201 719l147 148q23 23 42 23q35 0 35 -32q0 -23 -30 -42l-154 -97h-40zM469 463h-25q-17 62 -41 94q-61 78 -145 78q-46 0 -73.5 -26.5t-27.5 -68.5q0 -20 10 -39t21.5 -32.5t40.5 -33.5t47 -31l60 -35q81 -47 118 -93.5t37 -102.5q0 -83 -58 -135t-146 -52 q-65 0 -118 23q-26 11 -47 11q-12 0 -20 -9t-8 -24h-22l-29 212h22q67 -177 206 -177q53 0 86 31.5t33 80.5q0 47 -29 79q-48 52 -168 116q-122 65 -122 172q0 80 49 127.5t125 47.5q53 0 105 -22q27 -12 44 -12q26 0 32 34h21z" />
+<glyph unicode="&#x15b;" horiz-adv-x="389" d="M117 507l147 148q23 23 42 23q35 0 35 -32q0 -23 -30 -42l-154 -97h-40zM156 301l104 -63q50 -30 69 -56t19 -67q0 -50 -41.5 -87.5t-98.5 -37.5q-47 0 -73 9q-27 9 -46 9q-17 0 -24 -12h-13v157h16q16 -73 46 -107t81 -34q37 0 60 21t23 53q0 46 -53 75l-54 30 q-120 67 -120 145q0 58 37.5 90.5t100.5 32.5q44 0 67 -11q18 -8 28 -8q7 0 16 10h11l5 -136h-15q-17 68 -42.5 95.5t-70.5 27.5q-34 0 -54.5 -17t-20.5 -51q0 -17 11.5 -36.5t31.5 -31.5z" />
+<glyph unicode="&#x15c;" horiz-adv-x="556" d="M426 719h-34l-122 103l-121 -103h-34l124 167h62zM469 463h-25q-17 62 -41 94q-61 78 -145 78q-46 0 -73.5 -26.5t-27.5 -68.5q0 -20 10 -39t21.5 -32.5t40.5 -33.5t47 -31l60 -35q81 -47 118 -93.5t37 -102.5q0 -83 -58 -135t-146 -52q-65 0 -118 23q-26 11 -47 11 q-12 0 -20 -9t-8 -24h-22l-29 212h22q67 -177 206 -177q53 0 86 31.5t33 80.5q0 47 -29 79q-48 52 -168 116q-122 65 -122 172q0 80 49 127.5t125 47.5q53 0 105 -22q27 -12 44 -12q26 0 32 34h21z" />
+<glyph unicode="&#x15d;" horiz-adv-x="389" d="M351 507h-34l-122 103l-121 -103h-34l124 167h62zM156 301l104 -63q50 -30 69 -56t19 -67q0 -50 -41.5 -87.5t-98.5 -37.5q-47 0 -73 9q-27 9 -46 9q-17 0 -24 -12h-13v157h16q16 -73 46 -107t81 -34q37 0 60 21t23 53q0 46 -53 75l-54 30q-120 67 -120 145 q0 58 37.5 90.5t100.5 32.5q44 0 67 -11q18 -8 28 -8q7 0 16 10h11l5 -136h-15q-17 68 -42.5 95.5t-70.5 27.5q-34 0 -54.5 -17t-20.5 -51q0 -17 11.5 -36.5t31.5 -31.5z" />
+<glyph unicode="&#x15e;" horiz-adv-x="556" d="M225 -99l36 86q-50 3 -92 22q-26 11 -47 11q-12 0 -20 -9t-8 -24h-22l-29 212h22q67 -177 206 -177q53 0 86 31.5t33 80.5q0 47 -29 79q-48 52 -168 116q-122 65 -122 172q0 80 49 127.5t125 47.5q53 0 105 -22q27 -12 44 -12q26 0 32 34h21l22 -213h-25q-17 62 -41 94 q-61 78 -145 78q-46 0 -73.5 -26.5t-27.5 -68.5q0 -20 10 -39t21.5 -32.5t40.5 -33.5t47 -31l60 -35q81 -47 118 -93.5t37 -102.5q0 -81 -55 -132.5t-140 -54.5l-20 -51q15 3 26 3q41 0 63.5 -18t22.5 -51q0 -39 -33.5 -61.5t-91.5 -22.5q-45 0 -84 16l14 31q36 -12 65 -12 q25 0 40 12t15 32q0 19 -12 27.5t-41 8.5q-17 0 -28 -4z" />
+<glyph unicode="&#x15f;" horiz-adv-x="389" d="M145 -99l37 90q-30 2 -47 8q-27 9 -46 9q-17 0 -24 -12h-13v157h16q16 -73 46 -107t81 -34q37 0 60 21t23 53q0 46 -53 75l-54 30q-120 67 -120 145q0 58 37.5 90.5t100.5 32.5q44 0 67 -11q18 -8 28 -8q7 0 16 10h11l5 -136h-15q-17 68 -42.5 95.5t-70.5 27.5 q-34 0 -54.5 -17t-20.5 -51q0 -17 11.5 -36.5t31.5 -31.5l104 -63q50 -30 69 -56t19 -67q0 -48 -38.5 -84.5t-92.5 -40.5l-21 -55q15 3 26 3q41 0 63.5 -18t22.5 -51q0 -39 -33.5 -61.5t-91.5 -22.5q-45 0 -84 16l14 31q36 -12 65 -12q25 0 40 12t15 32q0 19 -12 27.5 t-41 8.5q-17 0 -28 -4z" />
+<glyph unicode="&#x160;" horiz-adv-x="556" d="M429 924l-124 -167h-64l-123 167h35l120 -103l121 103h35zM469 463h-25q-17 62 -41 94q-61 78 -145 78q-46 0 -73.5 -26.5t-27.5 -68.5q0 -20 10 -39t21.5 -32.5t40.5 -33.5t47 -31l60 -35q81 -47 118 -93.5t37 -102.5q0 -83 -58 -135t-146 -52q-65 0 -118 23 q-26 11 -47 11q-12 0 -20 -9t-8 -24h-22l-29 212h22q67 -177 206 -177q53 0 86 31.5t33 80.5q0 47 -29 79q-48 52 -168 116q-122 65 -122 172q0 80 49 127.5t125 47.5q53 0 105 -22q27 -12 44 -12q26 0 32 34h21z" />
+<glyph unicode="&#x161;" horiz-adv-x="389" d="M349 674l-124 -167h-64l-123 167h35l120 -103l121 103h35zM143 301l104 -63q50 -30 69 -56t19 -67q0 -50 -41.5 -87.5t-98.5 -37.5q-47 0 -73 9q-27 9 -46 9q-17 0 -24 -12h-13v157h16q16 -73 46 -107t81 -34q37 0 60 21t23 53q0 46 -53 75l-54 30q-120 67 -120 145 q0 58 37.5 90.5t100.5 32.5q44 0 67 -11q18 -8 28 -8q7 0 16 10h11l5 -136h-15q-17 68 -42.5 95.5t-70.5 27.5q-34 0 -54.5 -17t-20.5 -51q0 -17 11.5 -36.5t31.5 -31.5z" />
+<glyph unicode="&#x162;" horiz-adv-x="611" d="M286 0h-126v19q63 4 78.5 21t15.5 83v497h-60q-81 0 -109.5 -23.5t-43.5 -104.5h-24l7 170h562l7 -170h-24q-16 82 -45 105t-109 23h-59v-509q0 -57 17 -73t79 -19v-19h-131l-25 -65q15 3 26 3q41 0 63.5 -18t22.5 -51q0 -39 -33.5 -61.5t-91.5 -22.5q-45 0 -84 16l14 31 q36 -12 65 -12q25 0 40 12t15 32q0 19 -12 27.5t-41 8.5q-17 0 -28 -4l-7 5z" />
+<glyph unicode="&#x163;" horiz-adv-x="278" d="M88 -99l39 94q-57 21 -57 122v301h-53q-4 3 -4 7q0 8 17 19q38 22 97 107q2 3 9.5 12.5t10.5 15.5q7 0 7 -13v-116h101v-32h-101v-286q0 -48 12 -69t40 -21q30 0 60 35l13 -11q-48 -75 -119 -76l-21 -55q15 3 26 3q41 0 63.5 -18t22.5 -51q0 -39 -33.5 -61.5t-91.5 -22.5 q-45 0 -84 16l14 31q36 -12 65 -12q25 0 40 12t15 32q0 19 -12 27.5t-41 8.5q-17 0 -28 -4z" />
+<glyph unicode="&#x164;" horiz-adv-x="611" d="M461 886l-124 -167h-64l-123 167h35l120 -103l121 103h35zM593 492h-24q-16 82 -45 105t-109 23h-59v-509q0 -57 17 -73t79 -19v-19h-292v19q63 4 78.5 21t15.5 83v497h-60q-81 0 -109.5 -23.5t-43.5 -104.5h-24l7 170h562z" />
+<glyph unicode="&#x165;" horiz-adv-x="315" d="M221 458l-9 19q82 56 82 107q0 13 -14 13q-2 0 -7 -2q-12 -2 -20 -2q-28 0 -43.5 13.5t-15.5 37.5q0 25 16.5 41t42.5 16q34 0 57 -25.5t23 -63.5q0 -45 -31 -87t-81 -67zM266 77l13 -11q-48 -76 -121 -76q-88 0 -88 127v301h-53q-4 3 -4 7q0 8 17 19q38 22 97 107 q2 3 9.5 12.5t10.5 15.5q7 0 7 -13v-116h51v-32h-51v-286q0 -48 12 -69t40 -21q30 0 60 35z" />
+<glyph unicode="&#x166;" horiz-adv-x="613" d="M593 492h-24q-16 82 -45 105t-109 23h-59v-264h126v-44h-126v-201q0 -57 17 -73t79 -19v-19h-292v19q63 4 78.5 21t15.5 83v189h-128v44h128v264h-60q-81 0 -109.5 -23.5t-43.5 -104.5h-24l7 170h562z" />
+<glyph unicode="&#x167;" horiz-adv-x="279" d="M267 82l13 -11q-47 -76 -119 -76q-90 0 -90 131v109h-60v44h60v144h-49q-8 0 -8 7q0 5 4.5 9.5t15 11.5t14.5 10q31 26 63 71l37 52q7 0 7 -12v-117h101v-32h-101v-144h97v-44h-97v-100q0 -49 13 -68.5t39 -19.5q29 0 60 35z" />
+<glyph unicode="&#x168;" horiz-adv-x="722" d="M705 662v-19q-61 -6 -77.5 -29.5t-16.5 -97.5v-255q0 -77 -11 -121t-43 -81q-64 -73 -202 -73q-109 0 -170 46q-81 60 -81 217v310q0 50 -15.5 65t-74.5 19v19h283v-19q-60 -5 -75.5 -21.5t-15.5 -72.5v-312q0 -65 8 -100t36 -62q47 -45 128 -45q101 0 152 59 q23 28 30 61.5t7 99.5v263q0 78 -17 102t-77 28v19h232zM505 849h29q-16 -57 -40 -81.5t-65 -24.5q-32 0 -81 24l-23 11q-24 11 -41 11q-35 0 -51 -46h-29q11 49 37.5 75t63.5 26q34 0 70 -18l24 -12q29 -15 53 -15q17 0 28.5 11t24.5 39z" />
+<glyph unicode="&#x169;" horiz-adv-x="500" d="M376 638h29q-16 -57 -40 -81.5t-65 -24.5q-32 0 -81 24l-23 11q-24 11 -41 11q-35 0 -51 -46h-29q11 49 37 75t64 26q34 0 70 -18l24 -12q28 -15 53 -15q17 0 28.5 11t24.5 39zM480 50v-14q-78 -21 -137 -45l-5 3v82h-2q-63 -86 -143 -86q-57 0 -89.5 35t-32.5 93v251 q0 37 -13 51t-49 16v14h146v-323q0 -34 20.5 -56.5t50.5 -22.5q49 0 84 31q13 12 18 22.5t5 35.5v231q0 39 -14 50.5t-60 14.5v17h158v-343q0 -35 11.5 -46t45.5 -11h6z" />
+<glyph unicode="&#x16a;" horiz-adv-x="722" d="M510 719h-311v54h311v-54zM705 662v-19q-61 -6 -77.5 -29.5t-16.5 -97.5v-255q0 -77 -11 -121t-43 -81q-64 -73 -202 -73q-109 0 -170 46q-81 60 -81 217v310q0 50 -15.5 65t-74.5 19v19h283v-19q-60 -5 -75.5 -21.5t-15.5 -72.5v-312q0 -65 8 -100t36 -62 q47 -45 128 -45q101 0 152 59q23 28 30 61.5t7 99.5v263q0 78 -17 102t-77 28v19h232z" />
+<glyph unicode="&#x16b;" horiz-adv-x="500" d="M405 507h-311v54h311v-54zM480 50v-14q-78 -21 -137 -45l-5 3v82h-2q-63 -86 -143 -86q-57 0 -89.5 35t-32.5 93v251q0 37 -13 51t-49 16v14h146v-323q0 -34 20.5 -56.5t50.5 -22.5q49 0 84 31q13 12 18 22.5t5 35.5v231q0 39 -14 50.5t-60 14.5v17h158v-343 q0 -35 11.5 -46t45.5 -11h6z" />
+<glyph unicode="&#x16c;" horiz-adv-x="722" d="M483 876h29q-18 -157 -142 -157q-69 0 -104 41.5t-35 115.5h29q20 -97 112 -97q40 0 64.5 21.5t46.5 75.5zM705 662v-19q-61 -6 -77.5 -29.5t-16.5 -97.5v-255q0 -77 -11 -121t-43 -81q-64 -73 -202 -73q-109 0 -170 46q-81 60 -81 217v310q0 50 -15.5 65t-74.5 19v19 h283v-19q-60 -5 -75.5 -21.5t-15.5 -72.5v-312q0 -65 8 -100t36 -62q47 -45 128 -45q101 0 152 59q23 28 30 61.5t7 99.5v263q0 78 -17 102t-77 28v19h232z" />
+<glyph unicode="&#x16d;" horiz-adv-x="500" d="M352 664h29q-18 -157 -142 -157q-69 0 -104 41.5t-35 115.5h29q20 -97 112 -97q40 0 64.5 21.5t46.5 75.5zM480 50v-14q-78 -21 -137 -45l-5 3v82h-2q-63 -86 -143 -86q-57 0 -89.5 35t-32.5 93v251q0 37 -13 51t-49 16v14h146v-323q0 -34 20.5 -56.5t50.5 -22.5 q49 0 84 31q13 12 18 22.5t5 35.5v231q0 39 -14 50.5t-60 14.5v17h158v-343q0 -35 11.5 -46t45.5 -11h6z" />
+<glyph unicode="&#x16e;" horiz-adv-x="722" d="M465 798q0 -41 -29.5 -70t-71.5 -29q-41 0 -69.5 29t-28.5 71q0 41 29.5 70t71.5 29q40 0 69 -29.5t29 -70.5zM431 799q0 27 -19.5 46t-47.5 19q-26 0 -45 -19.5t-19 -45.5q0 -28 19 -47t45 -19q28 0 47.5 19t19.5 47zM705 662v-19q-61 -6 -77.5 -29.5t-16.5 -97.5v-255 q0 -77 -11 -121t-43 -81q-64 -73 -202 -73q-109 0 -170 46q-81 60 -81 217v310q0 50 -15.5 65t-74.5 19v19h283v-19q-60 -5 -75.5 -21.5t-15.5 -72.5v-312q0 -65 8 -100t36 -62q47 -45 128 -45q101 0 152 59q23 28 30 61.5t7 99.5v263q0 78 -17 102t-77 28v19h232z" />
+<glyph unicode="&#x16f;" horiz-adv-x="500" d="M349 611q0 -41 -29.5 -70t-71.5 -29q-41 0 -69.5 29t-28.5 71q0 41 29.5 70t71.5 29q40 0 69 -29.5t29 -70.5zM315 612q0 27 -19.5 46t-47.5 19q-26 0 -45 -19.5t-19 -45.5q0 -28 19 -47t45 -19q28 0 47.5 19t19.5 47zM480 50v-14q-78 -21 -137 -45l-5 3v82h-2 q-63 -86 -143 -86q-57 0 -89.5 35t-32.5 93v251q0 37 -13 51t-49 16v14h146v-323q0 -34 20.5 -56.5t50.5 -22.5q49 0 84 31q13 12 18 22.5t5 35.5v231q0 39 -14 50.5t-60 14.5v17h158v-343q0 -35 11.5 -46t45.5 -11h6z" />
+<glyph unicode="&#x170;" horiz-adv-x="722" d="M338 719l146 148q23 23 43 23q34 0 34 -30q0 -27 -29 -45l-154 -96h-40zM182 719l146 148q23 23 43 23q34 0 34 -30q0 -27 -29 -45l-154 -96h-40zM705 662v-19q-61 -6 -77.5 -29.5t-16.5 -97.5v-255q0 -77 -11 -121t-43 -81q-64 -73 -202 -73q-109 0 -170 46 q-81 60 -81 217v310q0 50 -15.5 65t-74.5 19v19h283v-19q-60 -5 -75.5 -21.5t-15.5 -72.5v-312q0 -65 8 -100t36 -62q47 -45 128 -45q101 0 152 59q23 28 30 61.5t7 99.5v263q0 78 -17 102t-77 28v19h232z" />
+<glyph unicode="&#x171;" horiz-adv-x="500" d="M211 507l146 148q23 23 43 23q34 0 34 -30q0 -27 -29 -45l-154 -96h-40zM55 507l146 148q23 23 43 23q34 0 34 -30q0 -27 -29 -45l-154 -96h-40zM480 50v-14q-78 -21 -137 -45l-5 3v82h-2q-63 -86 -143 -86q-57 0 -89.5 35t-32.5 93v251q0 37 -13 51t-49 16v14h146v-323 q0 -34 20.5 -56.5t50.5 -22.5q49 0 84 31q13 12 18 22.5t5 35.5v231q0 39 -14 50.5t-60 14.5v17h158v-343q0 -35 11.5 -46t45.5 -11h6z" />
+<glyph unicode="&#x172;" horiz-adv-x="722" d="M497 -73l20 -16q-28 -41 -52.5 -58.5t-58.5 -17.5q-33 0 -53.5 19.5t-20.5 54.5q0 44 37 77h-14q-109 0 -170 46q-81 60 -81 217v310q0 50 -15.5 65t-74.5 19v19h283v-19q-60 -5 -75.5 -21.5t-15.5 -72.5v-312q0 -65 8 -100t36 -62q47 -45 128 -45q101 0 152 59 q23 28 30 61.5t7 99.5v263q0 78 -17 102t-77 28v19h232v-19q-61 -6 -77.5 -29.5t-16.5 -97.5v-255q0 -77 -11 -121t-43 -81q-47 -54 -136 -68q-33 -30 -33 -61q0 -39 38 -39q32 0 71 36z" />
+<glyph unicode="&#x173;" horiz-adv-x="500" d="M338 4v72h-2q-63 -86 -143 -86q-57 0 -89.5 35t-32.5 93v251q0 37 -13 51t-49 16v14h146v-323q0 -34 20.5 -56.5t50.5 -22.5q49 0 84 31q13 12 18 22.5t5 35.5v231q0 39 -14 50.5t-60 14.5v17h158v-343q0 -35 11.5 -46t45.5 -11h6v-14q-51 -14 -89 -27q-44 -35 -44 -70 q0 -39 38 -39q32 0 71 36l20 -16q-28 -41 -52.5 -58.5t-58.5 -17.5q-33 0 -53.5 19.5t-20.5 54.5q0 49 47 86z" />
+<glyph unicode="&#x174;" horiz-adv-x="944" d="M627 719h-34l-122 103l-121 -103h-34l124 167h62zM932 662v-19q-40 -8 -54.5 -19.5t-28.5 -50.5q-114 -306 -204 -584h-15l-160 423l-154 -423h-15q-34 101 -101 285l-91 249q-25 72 -45.5 95.5t-58.5 24.5v19h244v-19q-37 -1 -50.5 -8t-13.5 -23q0 -17 11 -47l144 -376 l104 283l-28 75q-24 65 -41 80t-61 16v19h265v-19q-77 -2 -77 -35q0 -13 17 -58l143 -364l126 339q17 48 17 77q0 40 -70 41v19h197z" />
+<glyph unicode="&#x175;" horiz-adv-x="722" d="M528 507h-34l-122 103l-121 -103h-34l124 167h62zM694 450v-15q-15 -5 -22 -14.5t-19 -39.5l-138 -346q-20 -49 -28 -49q-5 0 -8.5 6.5t-15.5 36.5l-91 236l-112 -240q-18 -39 -25 -39q-9 0 -26 44l-135 342q-15 39 -25 50t-28 13v15h180v-15q-26 -3 -36 -10t-10 -23 q0 -15 6 -30l99 -261l91 199l-20 56q-14 40 -27.5 53t-41.5 16v15h203v-15q-35 -5 -46.5 -12t-11.5 -23t17 -60l84 -224l90 222q17 42 17 67q0 12 -9.5 18.5t-34.5 11.5v15h123z" />
+<glyph unicode="&#x176;" horiz-adv-x="722" d="M517 719h-34l-122 103l-121 -103h-34l124 167h62zM703 662v-19q-44 -4 -69.5 -25t-68.5 -87l-148 -228v-192q0 -57 19 -73t84 -19v-19h-306v19q68 5 84.5 21.5t16.5 82.5v171l-131 192q-68 100 -97 127.5t-65 29.5v19h279v-19l-24 -1q-47 -1 -47 -26q0 -21 18 -47 l146 -221l145 222q14 21 14 42q-1 17 -15.5 23.5t-52.5 7.5v19h218z" />
+<glyph unicode="&#x177;" horiz-adv-x="500" d="M405 507h-34l-122 103l-121 -103h-34l124 167h62zM475 450v-15q-18 -2 -29 -13t-21 -38l-150 -409q-39 -106 -78.5 -149.5t-96.5 -43.5q-32 0 -51 16.5t-19 41.5q0 19 12.5 32.5t30.5 13.5q29 0 52 -13q13 -7 26 -7q21 0 50 44q14 20 27 57t13 51q0 13 -42 101l-132 282 q-13 29 -53 35v14h205v-15q-32 -1 -44.5 -7t-12.5 -20q0 -11 13 -41l112 -250l97 276q4 9 4 18q0 24 -46 24v15h133z" />
+<glyph unicode="&#x178;" horiz-adv-x="722" d="M518 822q0 -20 -15 -34.5t-36 -14.5q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5t35 -15t15 -35zM319 822q0 -20 -15 -34.5t-36 -14.5q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5t35 -15t15 -35zM703 662v-19q-44 -4 -69.5 -25t-68.5 -87l-148 -228v-192 q0 -57 19 -73t84 -19v-19h-306v19q68 5 84.5 21.5t16.5 82.5v171l-131 192q-68 100 -97 127.5t-65 29.5v19h279v-19l-24 -1q-47 -1 -47 -26q0 -21 18 -47l146 -221l145 222q14 21 14 42q-1 17 -15.5 23.5t-52.5 7.5v19h218z" />
+<glyph unicode="&#x179;" horiz-adv-x="612" d="M238 719l147 148q23 23 42 23q35 0 35 -32q0 -23 -30 -42l-154 -97h-40zM598 176l-25 -176h-563v15l437 609h-214q-99 0 -134 -35q-18 -19 -25.5 -37.5t-15.5 -60.5h-26l21 171h525v-15l-432 -609h252q78 0 117 28q23 16 34 37.5t26 72.5h23z" />
+<glyph unicode="&#x17a;" horiz-adv-x="444" d="M154 507l147 148q23 23 42 23q35 0 35 -32q0 -23 -30 -42l-154 -97h-40zM418 136l-15 -136h-376v15l266 405h-135q-47 0 -63.5 -16.5t-23.5 -71.5h-18l4 118h346v-15l-269 -405h133q84 0 106 27q14 17 27 83z" />
+<glyph unicode="&#x17b;" horiz-adv-x="612" d="M369 784q0 -21 -14.5 -35t-35.5 -14q-20 0 -34.5 14.5t-14.5 34.5q0 21 13.5 35.5t35.5 14.5q23 0 36.5 -14t13.5 -36zM598 176l-25 -176h-563v15l437 609h-214q-99 0 -134 -35q-18 -19 -25.5 -37.5t-15.5 -60.5h-26l21 171h525v-15l-432 -609h252q78 0 117 28 q23 16 34 37.5t26 72.5h23z" />
+<glyph unicode="&#x17c;" horiz-adv-x="444" d="M287 572q0 -21 -14.5 -35t-35.5 -14q-20 0 -34.5 14.5t-14.5 34.5q0 21 13.5 35.5t35.5 14.5q23 0 36.5 -14t13.5 -36zM418 136l-15 -136h-376v15l266 405h-135q-47 0 -63.5 -16.5t-23.5 -71.5h-18l4 118h346v-15l-269 -405h133q84 0 106 27q14 17 27 83z" />
+<glyph unicode="&#x17d;" horiz-adv-x="612" d="M464 924l-124 -167h-64l-123 167h35l120 -103l121 103h35zM598 176l-25 -176h-563v15l437 609h-214q-99 0 -134 -35q-18 -19 -25.5 -37.5t-15.5 -60.5h-26l21 171h525v-15l-432 -609h252q78 0 117 28q23 16 34 37.5t26 72.5h23z" />
+<glyph unicode="&#x17e;" horiz-adv-x="444" d="M384 674l-124 -167h-64l-123 167h35l120 -103l121 103h35zM418 136l-15 -136h-376v15l266 405h-135q-47 0 -63.5 -16.5t-23.5 -71.5h-18l4 118h346v-15l-269 -405h133q84 0 106 27q14 17 27 83z" />
+<glyph unicode="&#x17f;" horiz-adv-x="334" d="M76 450h27q0 61 8 94q32 139 168 139q38 0 64 -12q40 -18 40 -50q0 -17 -12.5 -29t-28.5 -12q-25 0 -45 34q-24 41 -53 41q-57 0 -57 -91v-476q0 -43 18 -58q17 -13 75 -15v-15h-260v15q51 3 65 16q18 13 18 59v328h-27v32z" />
+<glyph unicode="&#x180;" horiz-adv-x="500" d="M157 509v-133q16 38 52.5 61t82.5 23q79 0 129.5 -63t50.5 -157q0 -110 -67 -180t-167 -70q-61 0 -113 20.5t-52 45.5v453h-92v31h92v26q0 37 -9 47.5t-40 10.5q-7 0 -17 -2v17l30 9l115 35l5 -2v-141h187v-31h-187zM157 318v-244q0 -23 28.5 -37.5t68.5 -14.5 q53 0 91.5 40.5t38.5 137.5q0 27 -5.5 56.5t-18 63.5t-39.5 55.5t-65 21.5q-40 0 -69.5 -23.5t-29.5 -55.5z" />
+<glyph unicode="&#x188;" horiz-adv-x="500" d="M398 156l14 -9q-34 -73 -80.5 -115t-117.5 -42q-85 0 -137 64.5t-52 155.5q0 69 26.5 124.5t74.5 87.5q55 38 120 38q39 0 79 -16q3 51 34 83t82 32q27 0 48.5 -16t21.5 -42q0 -28 -25 -28q-14 0 -22 9.5t-11 21t-11.5 21t-22.5 9.5q-40 0 -40 -83q0 -10 0.5 -25.5 t0.5 -19.5q18 -23 18 -47q0 -19 -13.5 -31.5t-32.5 -12.5q-25 0 -37 18t-14.5 40t-16 40t-40.5 18q-68 0 -105 -48.5t-37 -129.5q0 -75 40.5 -133t112.5 -58q48 0 80 24t63 70z" />
+<glyph unicode="&#x190;" horiz-adv-x="580" d="M526 168l36 -9q-1 -58 -60 -107q-71 -58 -197 -58q-66 0 -124 15t-103 57t-45 106q0 65 37.5 117t99.5 63q-66 31 -96 60.5t-30 85.5q0 61 42.5 104.5t100.5 62t122 19.5q59 0 107 -14q40 -11 71.5 -41.5t31.5 -65.5q0 -23 -13 -41.5t-34 -18.5q-45 0 -64 81 q-6 24 -36.5 40t-58.5 16q-165 0 -165 -166q0 -97 134 -97q9 0 51.5 5.5t53.5 5.5q16 0 31 -7.5t15 -21.5q0 -18 -26.5 -30t-47.5 -12q-8 0 -41.5 2.5t-39.5 2.5q-68 0 -104.5 -37t-36.5 -104q0 -127 190 -127q88 0 130 21.5t69 92.5z" />
+<glyph unicode="&#x192;" horiz-adv-x="434" d="M62 437h114q13 137 51 203t108 66q36 0 63.5 -19.5t27.5 -48.5q0 -19 -12 -32t-30 -13q-16 0 -28.5 8.5t-12.5 24.5q0 13 4.5 23.5t4.5 15.5q0 12 -21 12q-27 0 -40 -18q-32 -44 -32 -222h119v-31h-120q-1 -117 -17.5 -271t-33.5 -197q-39 -97 -115 -97q-36 0 -61 19.5 t-25 49.5q0 21 11 33t31 12q17 0 28 -10t11 -26q0 -15 -6 -27q-5 -9 -5 -14q2 -13 21 -13q69 0 69 174q0 23 -1 80t-1 69q0 77 8 218h-110v31z" />
+<glyph unicode="&#x195;" horiz-adv-x="735" d="M427 287v-161q0 -36 26 -65.5t61 -29.5q71 0 118.5 64.5t47.5 137.5q0 42 -10.5 73t-25.5 47t-30 27.5t-25.5 22.5t-10.5 25t14 23t29 9q28 0 47 -23t27.5 -59.5t11.5 -65.5t3 -57q0 -70 -21 -128t-70.5 -97.5t-121.5 -39.5q-76 0 -115 32t-39 106v172q0 106 -76 106 q-55 0 -110 -63v-241q0 -49 12 -66t56 -21v-15h-216v15q44 5 54 20.5t10 65.5v477q0 30 -10.5 38t-37.5 8q-8 0 -15 -1v16q80 23 142 44l5 -3v-304q18 23 31 36.5t45.5 30.5t69.5 17q35 0 60 -13.5t37 -30.5t18.5 -44.5t7.5 -43.5t1 -41z" />
+<glyph unicode="&#x199;" horiz-adv-x="500" d="M505 0h-218v15h19q21 0 21 16q0 9 -21 36l-140 184v-184q0 -29 13.5 -39t41.5 -12l20 -1v-15h-234v15q52 9 63.5 18t11.5 47v385q0 89 64 153.5t159 64.5q38 0 65.5 -15t27.5 -41q0 -16 -12.5 -27t-27.5 -11q-22 0 -47 30t-42 30q-39 0 -71 -40t-32 -99v-249l137 122 q23 20 23 35q0 17 -50 17v15h204v-15q-45 0 -80 -18q-44 -23 -125 -98l-40 -37l155 -197q24 -30 47.5 -46t36.5 -19.5t31 -4.5v-15z" />
+<glyph unicode="&#x19a;" horiz-adv-x="278" d="M257 0h-236v15q47 4 62 19.5t15 57.5v255h-77v31h77v183q0 36 -9 50t-33 14q-21 0 -37 -2v16q95 23 158 44l5 -4v-301h75v-31h-75v-260q0 -42 14 -55.5t61 -16.5v-15z" />
+<glyph unicode="&#x19b;" horiz-adv-x="520" d="M516 0h-133v15q46 0 46 24q0 9 -4 18l-97 276l-112 -250q-13 -30 -13 -41q0 -14 12.5 -20t44.5 -7v-15h-205v15q40 5 53 34l132 282q42 91 42 101q0 14 -17 61l-194 -194v54l177 176q-4 8 -6 11q-29 44 -50 44q-13 0 -26 -7q-23 -13 -52 -13q-18 0 -30.5 13.5t-12.5 32.5 q0 25 19 41.5t51 16.5q45 0 77.5 -25.5t61.5 -82.5l106 108v-54l-88 -90l168 -458q10 -27 21 -38t29 -13v-15z" />
+<glyph unicode="&#x19e;" horiz-adv-x="500" d="M485 -233h-208l1 15q37 3 49.5 21.5t12.5 68.5v432q0 101 -73 101q-25 0 -47 -12t-56 -45v-276q0 -30 13.5 -42t51.5 -15v-15h-211v15q38 3 50 18.5t12 60.5v243q0 37 -7 51t-28 14q-20 0 -29 -4v17q70 20 137 45l8 -3v-78h1q71 81 144 81q57 0 87.5 -40t30.5 -114v-454 q0 -40 12 -53t49 -17v-15z" />
+<glyph unicode="&#x1a0;" horiz-adv-x="722" d="M552 627h-14q70 -45 110 -122.5t40 -173.5q0 -154 -91 -249.5t-236 -95.5q-146 0 -236.5 96t-90.5 252q0 152 90.5 247t236.5 95q69 0 127 -23q30 -8 55 -8q31 0 43 4.5t12 18.5q-34 19 -34 46q0 15 13.5 27.5t32.5 12.5q21 0 35 -15t14 -41q0 -55 -66 -68q-19 -3 -41 -3 zM574 337q0 85 -24 152.5t-67 103.5q-56 47 -123 47q-85 0 -143 -67q-32 -36 -50.5 -102.5t-18.5 -138.5q0 -182 90 -265q49 -45 124 -45q78 0 129 48q83 80 83 267z" />
+<glyph unicode="&#x1a1;" horiz-adv-x="545" d="M471 382l-1 4q-34 25 -34 47q0 15 13.5 28t32.5 13t34 -15.5t15 -40.5q0 -56 -67 -69l-20 -4q26 -49 26 -114q0 -105 -62.5 -173t-162.5 -68q-92 0 -154 67.5t-62 170.5q0 104 62 168t163 64q57 0 103.5 -25t75.5 -70q12 1 25 6.5t13 10.5zM380 204q0 114 -50 178 q-40 50 -95 50q-52 0 -84 -42.5t-32 -116.5q0 -128 53 -205q34 -50 90 -50q55 0 86.5 49.5t31.5 136.5z" />
+<glyph unicode="&#x1a5;" horiz-adv-x="500" d="M159 535v-154q63 79 144 79q73 0 120 -60t47 -153q0 -109 -60.5 -183t-149.5 -74q-31 0 -52.5 9t-48.5 34v-157q0 -47 16 -60.5t72 -14.5v-18h-242v17q44 4 57 17t13 52v582q0 98 40 158t130 60q38 0 65.5 -15t27.5 -41q0 -16 -12.5 -27t-27.5 -11q-22 0 -47 30t-42 30 q-50 0 -50 -100zM159 334v-246q0 -22 34.5 -44t69.5 -22q54 0 87.5 51t33.5 134q0 88 -33.5 140.5t-89.5 52.5q-35 0 -68.5 -22t-33.5 -44z" />
+<glyph unicode="&#x1aa;" horiz-adv-x="432" d="M412 -177q0 -29 -29.5 -42.5t-62.5 -13.5q-83 0 -128 52t-45 136q0 96 24.5 275.5t27.5 256.5q-30 -24 -69 -24q-45 0 -77.5 32.5t-32.5 77.5t32.5 78t77.5 33q72 0 113.5 -57.5t41.5 -132.5q0 -95 -27 -300.5t-27 -302.5q0 -90 51 -90q18 0 43 30t47 30q16 0 28 -11 t12 -27zM201 545q-2 105 -65 105q-36 0 -59 -20.5t-23 -56.5q0 -31 22 -53.5t54 -22.5q24 0 43.5 13.5t27.5 34.5z" />
+<glyph unicode="&#x1ab;" horiz-adv-x="290" d="M266 77l13 -11q-2 -29 -2 -89q0 -32 -0.5 -50t-3.5 -44.5t-9.5 -41.5t-17 -30t-28.5 -22t-42 -7q-38 0 -65.5 15t-27.5 41q0 16 12.5 27t27.5 11q22 0 47 -30t42 -30q38 0 38 155q0 17 -0.5 28.5t-1 17t-0.5 7.5q-2 -3 -12.5 -10.5t-31.5 -15.5t-42 -8q-92 0 -92 127v301 h-53q-4 2 -4 7q0 6 6 11l17 12q12 8 21 17q21 20 43 48.5t34.5 47t13.5 18.5q6 0 6 -13v-116h101v-32h-101v-286q0 -17 1 -28t5 -27.5t15.5 -25.5t29.5 -9q31 0 61 35z" />
+<glyph unicode="&#x1ad;" horiz-adv-x="310" d="M17 418l-3 7q0 3 12 14l26 23q15 13 18 17q0 91 41 147.5t129 56.5q34 0 63.5 -13.5t29.5 -42.5q0 -15 -12 -26.5t-27 -11.5q-22 0 -47 30t-43 30q-50 0 -50 -100v-99h101v-32h-101v-288q0 -24 2 -39.5t14 -32t35 -16.5q32 0 61 35l13 -11q-49 -76 -120 -76 q-89 0 -89 127v301h-53z" />
+<glyph unicode="&#x1af;" horiz-adv-x="766" d="M750 682l-1 4q-35 23 -35 46q0 15 13.5 28.5t33.5 13.5q19 0 34 -15t15 -41q0 -32 -22.5 -50t-57.5 -22l-34 -4q-55 -7 -70 -31t-15 -95v-255q0 -77 -11 -121t-43 -81q-64 -73 -202 -73q-109 0 -170 46q-81 60 -81 217v310q0 50 -15.5 65t-74.5 19v19h283v-19 q-60 -5 -75.5 -21.5t-15.5 -72.5v-312q0 -65 8 -100t36 -62q47 -45 128 -45q101 0 152 59q23 28 30 61.5t7 99.5v263q0 78 -17 102t-77 28v19h231q14 0 30 7t16 13z" />
+<glyph unicode="&#x1b0;" horiz-adv-x="500" d="M259 450h158q20 0 40.5 5.5t20.5 13.5q0 10 -17 22t-17 33q0 14 12.5 25.5t33.5 11.5q18 0 33.5 -15.5t15.5 -40.5q0 -33 -25.5 -52.5t-67.5 -19.5h-29v-326q0 -35 11.5 -46t45.5 -11h6v-14q-78 -21 -137 -45l-5 3v82h-2q-63 -86 -143 -86q-57 0 -89.5 35t-32.5 93v251 q0 37 -13 51t-49 16v14h146v-323q0 -34 20.5 -56.5t50.5 -22.5q49 0 84 31q13 12 18 22.5t5 35.5v231q0 39 -14 50.5t-60 14.5v17z" />
+<glyph unicode="&#x1b5;" horiz-adv-x="612" d="M598 176l-25 -176h-563v15l216 302h-124v43h155l190 264h-214q-99 0 -134 -35q-18 -19 -25.5 -37.5t-15.5 -60.5h-26l21 171h525v-15l-204 -287h145v-43h-175l-198 -279h252q78 0 117 28q23 16 34 37.5t26 72.5h23z" />
+<glyph unicode="&#x1ba;" horiz-adv-x="381" d="M360 429l-191 -186q37 17 66 17q56 0 90 -34.5t34 -88.5q0 -58 -61 -106q-121 -67 -172 -101q-35 -23 -35 -67q0 -30 24 -50t63 -20q28 0 49.5 15t26.5 40q13 64 52 64q22 0 35 -13t13 -31q0 -16 -11 -36t-32 -34q-51 -32 -125 -32q-49 0 -91 29q-51 36 -51 98 q0 71 67 113q56 35 134 75q36 19 36 58q0 30 -23 47.5t-66 17.5q-38 0 -60.5 -10t-51.5 -38q-14 11 -20 18l211 212h-165q-25 0 -52.5 -24t-32.5 -61h-17l32 149h324v-21z" />
+<glyph unicode="&#x1bb;" horiz-adv-x="500" d="M482 360v-46q-45 -1 -135 -1q-11 -16 -52 -61l-165 -176h234q36 0 55.5 15.5t40.5 51.5l14 -6l-54 -137h-391v12l178 189q60 64 87 112l-272 1v46h296q19 51 19 101q0 66 -36.5 103.5t-102.5 37.5q-59 0 -89.5 -32t-57.5 -98l-21 5q17 92 68 145.5t140 53.5 q80 0 132.5 -48.5t52.5 -127.5q0 -69 -43 -140h102z" />
+<glyph unicode="&#x1be;" horiz-adv-x="500" d="M212 447l3 -62q7 1 23 1q82 0 135.5 -62t53.5 -145q0 -95 -52 -143t-149 -48q-50 0 -101.5 28.5t-51.5 74.5q0 19 13.5 31.5t32.5 12.5t30.5 -13t17.5 -32t13 -38t22 -32t38 -13q31 0 53 29.5t30 64t8 64.5q0 61 -44.5 97t-105.5 36h-20v149h-77v31h77v61h47l3 -61h78 v-31h-77z" />
+<glyph unicode="&#x1c0;" horiz-adv-x="160" d="M105 0h-51v736h51v-736z" />
+<glyph unicode="&#x1c1;" horiz-adv-x="280" d="M105 0h-51v736h51v-736zM225 0h-51v736h51v-736z" />
+<glyph unicode="&#x1c2;" horiz-adv-x="435" d="M400 272h-157v-272h-51v272h-158v51h158v90h-158v51h158v272h51v-272h157v-51h-157v-90h157v-51z" />
+<glyph unicode="&#x1c3;" horiz-adv-x="333" d="M177 176l-45 381q-2 22 -2 38q0 37 14 59t39 22q53 0 53 -76q0 -13 -3 -43l-42 -381h-14zM236 43q0 -23 -15 -37.5t-37 -14.5q-23 0 -38.5 14.5t-15.5 36.5q0 23 15.5 39t37.5 16t37.5 -15.5t15.5 -38.5z" />
+<glyph unicode="&#x1f0;" horiz-adv-x="278" d="M294 674l-124 -167h-64l-123 167h35l120 -103l121 103h35zM193 457v-457q0 -107 -43.5 -162.5t-126.5 -55.5q-41 0 -67 15.5t-26 39.5q0 16 12 27.5t29 11.5q23 0 48 -32q23 -28 42 -28q23 0 34 18q14 25 14 121v379q0 60 -32 60q-24 0 -40 -3l-5 -1v16q80 25 156 54z " />
+<glyph unicode="&#x1fa;" horiz-adv-x="722" d="M379 646l234 -535q22 -52 39.5 -70t54.5 -22v-19h-255v19q40 0 55 9q14 7 14 24q0 26 -19 70l-41 94h-262l-46 -114q-9 -23 -9 -42q0 -23 16.5 -32t53.5 -9v-19h-199v19q42 4 61 30.5t65 136.5l194 460q-24 8 -40 29t-16 48q0 33 23.5 56t57.5 23q32 0 55 -23.5t23 -56.5 q0 -27 -16.5 -48t-42.5 -28zM447 257l-116 275l-115 -275h231zM405 724q0 19 -14 32t-34 13q-17 0 -31 -13.5t-14 -31.5q0 -20 13.5 -34t31.5 -14q21 0 34.5 14t13.5 34zM256 798l141 121q14 12 20.5 15.5t19.5 3.5q25 0 25 -26q0 -16 -32 -35l-141 -79h-33z" />
+<glyph unicode="&#x1fb;" horiz-adv-x="444" d="M330 611q0 -41 -29.5 -70t-71.5 -29q-41 0 -69.5 29t-28.5 71q0 41 29.5 70t71.5 29q40 0 69 -29.5t29 -70.5zM296 612q0 27 -19.5 46t-47.5 19q-26 0 -45 -19.5t-19 -45.5q0 -28 19 -47t45 -19q28 0 47.5 19t19.5 47zM118 719l147 148q23 23 42 23q35 0 35 -32 q0 -23 -30 -42l-154 -97h-40zM442 66v-28q-38 -48 -90 -48q-57 0 -64 73h-1q-64 -73 -145 -73q-47 0 -76 27.5t-29 76.5q0 70 70 117q48 32 180 81v54q0 45 -21.5 67.5t-56.5 22.5q-30 0 -50 -14.5t-20 -34.5q0 -9 3 -20t3 -22q0 -15 -13.5 -28t-32.5 -13q-17 0 -30 13 t-13 33q0 48 51 80q47 30 115 30q81 0 118 -45q18 -21 23 -42.5t5 -68.5v-191q0 -66 31 -66q20 0 43 19zM287 127v141q-92 -32 -128 -66q-34 -31 -34 -77q0 -38 19 -57.5t50 -19.5q33 0 58 16q21 15 28 28t7 35z" />
+<glyph unicode="&#x1fc;" horiz-adv-x="889" d="M863 168l-44 -168h-509v19l17 2q45 5 58 22.5t13 68.5v148h-176q-92 -175 -92 -212q0 -23 67 -29h1v-19h-198v19q32 5 49 19.5t39 58.5l245 484q9 17 9 28q0 33 -90 33v20h564v-141h-23q-10 68 -42 86.5t-142 18.5h-84q-28 0 -28 -37v-223h104q77 0 107.5 19.5t31.5 78.5 h21v-235h-21q-7 59 -28.5 79.5t-73.5 20.5h-141v-235q0 -38 11 -47t59 -9h73q85 0 122.5 24t76.5 106h24zM398 299v319l-158 -319h158zM433 719l147 148q23 23 42 23q35 0 35 -32q0 -23 -30 -42l-154 -97h-40z" />
+<glyph unicode="&#x1fd;" horiz-adv-x="667" d="M620 154l12 -5q-39 -84 -79 -116q-48 -40 -118 -40q-44 0 -74 16t-55 54q-50 -42 -81.5 -56t-70.5 -14q-51 0 -83.5 29.5t-32.5 77.5q0 21 1.5 35.5t7.5 33t17.5 31t31.5 25t49 20.5l129 36v63q0 49 -13.5 69.5t-47.5 20.5q-28 0 -48 -12.5t-20 -29.5q0 -7 1.5 -19.5 t1.5 -22.5q0 -21 -12 -33.5t-32 -12.5t-32 13t-12 35q0 46 46 77t113 31q37 0 63 -10.5t55 -36.5q34 27 59 37t60 10q76 0 114 -43t46 -140h-262q1 -75 6 -108t21 -62q13 -23 38.5 -36.5t56.5 -13.5q43 0 75.5 22t68.5 75zM355 307h166q-1 66 -19.5 94t-59.5 28 q-43 0 -63 -28t-24 -94zM274 201v52q-91 -33 -120 -58t-29 -70q0 -38 16.5 -62.5t49.5 -24.5q28 0 65 18t37 32l-1 1v2q-18 59 -18 110zM218 507l147 148q23 23 42 23q35 0 35 -32q0 -23 -30 -42l-154 -97h-40z" />
+<glyph unicode="&#x1fe;" horiz-adv-x="722" d="M658 734l-88 -130q57 -53 79 -99q39 -81 39 -173q0 -154 -91.5 -250t-237.5 -96q-91 0 -175 50l-79 -116h-49l95 139q-33 30 -49.5 50.5t-29.5 48.5q-38 78 -38 172q0 152 91.5 249t236.5 97q88 0 175 -49l72 107h49zM194 123l308 452q-62 65 -141 65q-98 0 -155.5 -83.5 t-57.5 -226.5q0 -120 46 -207zM527 540l-308 -452q60 -66 142 -66q99 0 156 82.5t57 225.5q0 120 -47 210zM245 719l147 148q23 23 42 23q35 0 35 -32q0 -23 -30 -42l-154 -97h-40z" />
+<glyph unicode="&#x1ff;" horiz-adv-x="500" d="M437 551l-65 -125q98 -67 98 -192q0 -104 -64 -174t-159 -70q-47 0 -93 21l-65 -123h-37l73 140q-45 36 -65 73q-31 57 -31 126q0 102 61.5 167.5t158.5 65.5q44 0 92 -18l57 109h39zM158 92l159 304q-37 36 -80 36q-53 0 -85.5 -42.5t-32.5 -112.5q0 -101 39 -185z M340 366l-161 -306q35 -42 82 -42q56 0 87.5 48.5t31.5 136.5q0 87 -40 163zM131 507l147 148q23 23 42 23q35 0 35 -32q0 -23 -30 -42l-154 -97h-40z" />
+<glyph unicode="&#x221;" horiz-adv-x="671" d="M424 681v-591q0 -25 22 -59l28 44q10 16 29.5 39t42 34t47.5 11t42 -21t17 -47q0 -37 -31 -65q-41 -36 -127 -36h-34q-39 -64 -77 -140h-36q33 68 77 144q-26 6 -48 23.5t-29 42.5q-53 -70 -135 -70q-88 0 -136.5 62.5t-48.5 152.5q0 97 57 176t151 79q54 0 105 -43v156 q0 30 -9.5 41t-32.5 11q-6 0 -26 -2v16q86 22 147 44zM480 20h26q43 0 79.5 16t36.5 53q0 15 -9 27.5t-24 12.5q-18 0 -35 -10.5t-32 -31t-22.5 -33t-19.5 -34.5zM340 102v230q0 40 -31 70t-71 30q-45 0 -74.5 -32t-40 -71.5t-10.5 -83.5q0 -48 11.5 -91.5t44.5 -77.5 t82 -34q46 0 74 32q15 18 15 28z" />
+<glyph unicode="&#x234;" horiz-adv-x="429" d="M182 679v-568q0 -55 22 -80l28 44q10 16 29.5 39t42 34t47.5 11t42 -21t17 -47q0 -37 -31 -65q-41 -36 -127 -36h-34q-39 -64 -77 -140h-36q33 68 77 144q-84 16 -84 123v444q0 33 -9 48.5t-39 15.5q-11 0 -31 -2v16q94 23 158 44zM238 20h26q43 0 79.5 16t36.5 53 q0 15 -9 27.5t-24 12.5q-18 0 -34 -9.5t-32.5 -32.5t-22 -31.5t-20.5 -35.5z" />
+<glyph unicode="&#x235;" horiz-adv-x="672" d="M424 306v-216q0 -33 24 -57q15 26 26.5 42.5t30.5 38.5t40.5 33.5t45.5 11.5q27 0 44.5 -21.5t17.5 -48.5q0 -89 -162 -89h-24q-48 -78 -83 -150h-36q39 76 81 150h-152v15q40 3 51.5 24t11.5 66v199q0 101 -73 101q-46 0 -103 -57v-276q0 -32 16 -43.5t49 -13.5v-15 h-211v15q39 2 50.5 19.5t11.5 59.5v251q0 17 -1.5 27t-9.5 20t-24 10q-17 0 -29 -4v17q71 20 137 45l8 -3v-78h1q71 81 144 81q62 0 90 -44t28 -110zM623 90q0 16 -11 28t-27 12q-41 0 -99 -100q4 0 11 -0.5t10 -0.5q18 0 35 2.5t37 8t32 18.5t12 32z" />
+<glyph unicode="&#x236;" horiz-adv-x="401" d="M154 418v-286q0 -76 22 -101l28 44q10 16 29.5 39t42 34t47.5 11t42 -21t17 -47q0 -37 -31 -65q-41 -36 -127 -36h-34q-42 -72 -77 -140h-36q30 64 76 144q-83 16 -83 123v301h-53q-4 3 -4 7q0 8 17 19q42 27 97 107q14 18 20 28q7 1 7 -13v-116h101v-32h-101zM210 20h26 q43 0 79.5 16t36.5 53q0 15 -9 27.5t-24 12.5q-18 0 -35 -10.5t-32 -31t-22.5 -33t-19.5 -34.5z" />
+<glyph unicode="&#x237;" horiz-adv-x="278" d="M193 457v-457q0 -107 -43.5 -162.5t-126.5 -55.5q-41 0 -67 15.5t-26 39.5q0 16 12 27.5t29 11.5q23 0 48 -32q23 -28 42 -28q23 0 34 18q14 25 14 121v379q0 60 -32 60q-24 0 -40 -3l-5 -1v16q80 25 156 54z" />
+<glyph unicode="&#x250;" horiz-adv-x="444" d="M162 387h1q64 73 145 73q47 0 76 -27.5t29 -76.5q0 -70 -70 -117q-48 -32 -180 -81v-54q0 -45 21.5 -67.5t56.5 -22.5q30 0 50 14.5t20 34.5q0 9 -3 20t-3 22q0 15 13.5 28t32.5 13q17 0 30 -13t13 -33q0 -48 -51 -80q-47 -30 -115 -30q-81 0 -118 45q-18 21 -23 42.5 t-5 68.5v191q0 66 -31 66q-20 0 -43 -19v28q38 48 90 48q57 0 64 -73zM163 323v-141q92 32 128 66q34 31 34 77q0 38 -19 57.5t-50 19.5q-33 0 -58 -16q-21 -15 -28 -28t-7 -35z" />
+<glyph unicode="&#x251;" horiz-adv-x="500" d="M491 58v-16l-147 -52l-4 3v61h-2q-43 -64 -129 -64q-16 0 -34.5 3.5t-46 17t-49 36t-37 66t-15.5 101.5q0 99 61.5 172.5t145.5 73.5q57 0 106 -43l63 43h21v-346q0 -17 1 -25t5 -17t14.5 -12t28.5 -3q11 0 18 1zM340 102v230q-5 48 -35 74t-68 26q-49 0 -86.5 -45.5 t-37.5 -139.5q0 -103 41 -154t97 -51q32 0 57.5 16.5t31.5 43.5z" />
+<glyph unicode="&#x252;" horiz-adv-x="500" d="M178 396h2q43 64 129 64q16 0 34.5 -3.5t46 -17t49 -36t37 -66t15.5 -101.5q0 -99 -61.5 -172.5t-145.5 -73.5q-57 0 -106 43l-63 -43h-21v346q0 17 -1 25t-5 17t-14.5 12t-28.5 3q-11 0 -18 -1v16l147 52l4 -3v-61zM178 348v-230q5 -48 35 -74t68 -26q49 0 86.5 45.5 t37.5 139.5q0 103 -41 154t-97 51q-32 0 -57.5 -16.5t-31.5 -43.5z" />
+<glyph unicode="&#x253;" horiz-adv-x="500" d="M153 510v-134q12 31 47.5 57.5t87.5 26.5q85 0 132.5 -66.5t47.5 -157.5q0 -29 -7 -60.5t-25 -65t-44 -60t-68 -43.5t-94 -17q-54 0 -107.5 20t-53.5 46v409q0 89 64 153.5t159 64.5q38 0 65.5 -15t27.5 -41q0 -16 -12.5 -27t-27.5 -11q-22 0 -47 30t-42 30 q-39 0 -71 -40t-32 -99zM153 316v-243q0 -24 30 -37.5t64 -13.5q41 0 69 17.5t41 47t18 56.5t5 56q0 80 -32.5 139t-97.5 59q-32 0 -64.5 -21.5t-32.5 -59.5z" />
+<glyph unicode="&#x254;" horiz-adv-x="444" d="M24 293l-14 9q43 84 82 115q51 42 115 42q83 0 136.5 -62.5t53.5 -159.5q0 -127 -84 -197q-62 -51 -135 -51q-63 0 -108.5 30.5t-45.5 72.5q0 17 14 29.5t33 12.5q35 0 48 -46l6 -22q8 -28 20 -38t39 -10q61 0 98.5 48t37.5 126q0 86 -43 140.5t-112 54.5 q-43 0 -74 -20.5t-67 -73.5z" />
+<glyph unicode="&#x255;" horiz-adv-x="444" d="M84 -160l79 158q-64 25 -101 80t-37 135q0 115 67.5 181t153.5 66q64 0 107 -31q45 -33 45 -70q0 -18 -12.5 -31t-34.5 -13q-18 0 -30.5 13t-17.5 33q-6 24 -9 33.5t-10.5 20t-19 13.5t-31.5 3q-18 0 -38 -7.5t-42 -25.5t-36.5 -55.5t-14.5 -89.5q0 -54 29 -105.5 t74 -87.5q43 54 65.5 71.5t61.5 17.5t62 -20t23 -54q0 -40 -31.5 -65.5t-90.5 -25.5h-22q-45 0 -73 6l-80 -150h-36zM384 76q0 47 -51 47q-23 0 -41 -11t-28.5 -24.5t-33.5 -46.5q37 -21 68 -21q51 0 68.5 15t17.5 41z" />
+<glyph unicode="&#x256;" horiz-adv-x="553" d="M424 681v-796q0 -84 46 -84q17 0 42 30t47 30q16 0 28 -11t12 -27q0 -29 -29.5 -42.5t-63.5 -13.5q-43 0 -74.5 14t-49 35t-27.5 54t-12.5 62.5t-2.5 69.5v55q-43 -67 -131 -67q-89 0 -135.5 65.5t-46.5 158.5q0 92 59 169t148 77q57 0 106 -43v156q0 30 -9 40.5 t-32 10.5q-17 0 -27 -1v16q86 22 147 44zM340 102v230q0 41 -31.5 70.5t-71.5 29.5q-64 0 -94 -57.5t-30 -127.5q0 -49 11.5 -92.5t44.5 -78t82 -34.5q27 0 58 17.5t31 42.5z" />
+<glyph unicode="&#x257;" horiz-adv-x="587" d="M340 417v48q0 98 39.5 158t129.5 60q38 0 65.5 -15t27.5 -41q0 -16 -12.5 -27t-27.5 -11q-22 0 -47 30t-42 30q-30 0 -39.5 -26.5t-9.5 -83.5v-425q0 -17 1 -25t5 -17t13.5 -12t25.5 -3q15 0 22 1v-16l-147 -52l-4 3v64q-48 -67 -127 -67q-61 0 -108 34q-78 57 -78 183 q0 105 61 179t146 74q57 0 106 -43zM340 102v225q0 48 -32 76.5t-71 28.5q-49 0 -86.5 -45.5t-37.5 -139.5q0 -104 41 -154.5t98 -50.5q32 0 57 16.5t31 43.5z" />
+<glyph unicode="&#x258;" horiz-adv-x="444" d="M350 277h-311q8 94 54.5 138.5t121.5 44.5q33 0 66.5 -13t65.5 -40t52 -77t20 -116q0 -105 -51 -164.5t-136 -59.5q-41 0 -76.5 14.5t-57.5 35t-40 46t-26 42t-12 29.5l16 7q12 -20 22 -33t29.5 -32.5t46 -29.5t57.5 -10q60 0 105.5 49t53.5 169zM141 309h206 q-11 63 -38.5 89t-71.5 26q-23 0 -40 -8t-26 -18t-16 -28.5t-9 -29.5t-5 -31z" />
+<glyph unicode="&#x259;" horiz-adv-x="444" d="M30 286l-16 7q4 13 12 29.5t26 42t40 46t57.5 35t76.5 14.5q85 0 136 -59.5t51 -164.5q0 -66 -20 -116t-52 -77t-65.5 -40t-66.5 -13q-75 0 -121.5 44.5t-54.5 138.5h311q-8 120 -53.5 169t-105.5 49q-31 0 -57.5 -10t-46 -29.5t-29.5 -32.5t-22 -33zM341 141h-206 q3 -20 5 -31t9 -29.5t16 -28.5t26 -18t40 -8q44 0 71.5 26t38.5 89z" />
+<glyph unicode="&#x25a;" horiz-adv-x="657" d="M621 293l30 -12q-9 -29 -31.5 -50t-51.5 -21q-50 0 -67 30.5t-17 83.5q0 12 0.5 34t0.5 27l-79 -47q31 -55 31 -113q0 -86 -65.5 -162t-150.5 -76q-76 0 -127.5 46t-57.5 122l289 167q-19 43 -55 71.5t-80 28.5q-69 0 -133 -51l-17 9q42 44 72 62t80 18q130 0 200 -99 l119 69l6 -4v-14q0 -1 -1 -54.5t-1 -64.5q0 -22 15.5 -37.5t37.5 -15.5q36 0 53 53zM335 296l-259 -152q0 -48 28.5 -82t76.5 -34q72 0 118 61.5t46 135.5q0 33 -10 71z" />
+<glyph unicode="&#x25b;" horiz-adv-x="438" d="M377 84l12 -12q-71 -86 -179 -86q-76 0 -131 34q-26 16 -42.5 44.5t-16.5 58.5q0 31 16.5 59t44.5 43q30 16 82 24v2q-116 24 -116 107q0 52 45 84.5t119 32.5q69 0 113 -30q21 -14 32 -34t11 -36q0 -18 -13 -31t-35 -13q-18 0 -30.5 15t-17.5 34q-11 37 -19.5 49.5 t-26.5 12.5q-39 0 -64.5 -26t-25.5 -64q0 -39 35 -68q23 -20 75 -21v-30h-11q-53 0 -86.5 -29t-33.5 -75q0 -47 30 -77t77 -30q79 0 156 62z" />
+<glyph unicode="&#x25c;" horiz-adv-x="438" d="M246 251v-2q52 -8 82 -24q28 -15 44.5 -43t16.5 -59q0 -30 -16.5 -58.5t-42.5 -44.5q-55 -34 -131 -34q-108 0 -179 86l12 12q78 -62 156 -62q47 0 77 30t30 77q0 46 -33.5 75t-86.5 29h-11v30q52 1 75 21q35 29 35 68q0 38 -25.5 64t-64.5 26q-18 0 -26.5 -12.5 t-19.5 -49.5q-5 -19 -17.5 -34t-30.5 -15q-22 0 -35 13t-13 31q0 16 11 36t32 34q44 30 113 30q74 0 119 -32.5t45 -84.5q0 -83 -116 -107z" />
+<glyph unicode="&#x25d;" horiz-adv-x="623" d="M573 293l30 -12q-8 -29 -31 -50t-52 -21q-27 0 -44.5 9.5t-25.5 28.5t-11 37t-3 44q0 17 0.5 33t0.5 23l-75 -43q-5 -38 -38.5 -60.5t-77.5 -30.5v-2q143 -22 143 -126q0 -67 -59 -102t-131 -35q-109 0 -179 86l12 12q78 -62 156 -62q46 0 76.5 30t30.5 77 q0 53 -37.5 78.5t-93.5 25.5v30q46 1 78 23.5t32 65.5q0 38 -26 64t-64 26q-19 0 -29.5 -17.5t-14.5 -38t-17 -38t-35 -17.5q-19 0 -32.5 12.5t-13.5 31.5q0 33 28 57t61.5 33.5t66.5 9.5q60 0 108.5 -25.5t54.5 -78.5l102 59l6 -4l-1 -30q-1 -16 -1 -103q0 -22 15.5 -37.5 t37.5 -15.5q20 0 34.5 16t18.5 37z" />
+<glyph unicode="&#x25e;" horiz-adv-x="479" d="M287 251v-2q143 -22 143 -126q0 -67 -59 -102t-131 -35q-110 0 -165 67t-55 181q0 106 58 173.5t161 67.5q64 0 114 -29t50 -88q0 -83 -116 -107zM205 233v30q46 1 78 23t32 66q0 38 -26 64t-64 26q-46 0 -79.5 -36.5t-47 -81.5t-13.5 -89q0 -42 13.5 -89t45.5 -85.5 t76 -38.5q47 0 81.5 30t34.5 77q0 53 -38 78.5t-93 25.5z" />
+<glyph unicode="&#x25f;" horiz-adv-x="315" d="M296 210h-82v-210q0 -107 -43.5 -162.5t-126.5 -55.5q-41 0 -67 15.5t-26 39.5q0 16 12 27.5t29 11.5q23 0 48 -32q23 -28 42 -28q23 0 34 18q14 25 14 121v255h-122v31h122v137q0 43 -20 55q-16 9 -55 12v15h236v-15q-44 -4 -58 -16q-19 -16 -19 -62v-126h82v-31z" />
+<glyph unicode="&#x260;" horiz-adv-x="594" d="M372 435v30q0 98 39.5 158t129.5 60q38 0 65.5 -15t27.5 -41q0 -16 -12.5 -27t-27.5 -11q-22 0 -47 30t-42 30q-18 0 -28.5 -8.5t-15 -31.5t-5.5 -41.5t-1 -57.5v-537q0 -83 -63.5 -134t-165.5 -51q-70 0 -120.5 23.5t-50.5 55.5q0 16 10.5 26.5t26.5 10.5q15 0 26.5 -9 t23.5 -25t18 -22q36 -32 84 -32q62 0 99 45q30 36 30 99v93q-65 -67 -142 -67q-80 0 -139.5 70t-59.5 165q0 103 69.5 178.5t163.5 75.5q56 0 107 -40zM373 88v225q0 52 -30 87q-38 43 -88 43q-56 0 -93.5 -54.5t-37.5 -135.5q0 -87 44.5 -148t108.5 -61q54 0 96 44z" />
+<glyph unicode="&#x261;" horiz-adv-x="537" d="M455 482v-509q0 -89 -68 -137t-161 -48q-51 0 -111 19.5t-60 59.5q0 16 10.5 26.5t26.5 10.5t31 -14t27 -30t37 -30t57 -14q61 0 95 41t34 103v93q-65 -67 -142 -67q-86 0 -142.5 73.5t-56.5 161.5q0 99 67.5 176.5t165.5 77.5q60 0 119 -51l9 8q4 3 7 8l6 6q2 3 5 8.5 t4.5 8t5 9.5t5.5 10h29zM373 88v225q0 51 -33.5 90.5t-84.5 39.5q-64 0 -97.5 -60.5t-33.5 -129.5q0 -47 16 -93.5t52 -81t85 -34.5q54 0 96 44z" />
+<glyph unicode="&#x262;" horiz-adv-x="570" d="M539 235v-12q-30 -2 -40 -12t-10 -42v-131q0 -15 -76.5 -32t-111.5 -17q-134 0 -207 70q-64 63 -64 168q0 99 83 165q74 58 177 58q21 0 97 -14q35 -7 40 -7q24 0 32 21h16l5 -142h-16q-24 51 -53 78q-42 36 -110 36q-78 0 -123 -42q-61 -58 -61 -169q0 -90 53 -142.5 t141 -52.5q36 0 69.5 10t33.5 29v105q0 40 -11.5 51t-54.5 12v12h191z" />
+<glyph unicode="&#x263;" horiz-adv-x="500" d="M480 450v-15q-9 -1 -16.5 -5t-12.5 -8t-9.5 -12t-5.5 -12l-6 -14q-4 -10 -4 -11l-110 -299l52 -108q26 -52 26 -99t-29.5 -74t-76.5 -27q-104 0 -104 86q0 43 19 81l45 92l-145 309l-31 67q-13 28 -53 34v15h205v-15q-57 -3 -57 -26q0 -12 9 -33l116 -259l93 264 q8 24 8 30q0 24 -46 24v15h133zM267 -13l-29 -68q-11 -27 -11 -56q0 -64 41 -64q24 0 39.5 16.5t15.5 40.5q0 17 -14 47z" />
+<glyph unicode="&#x264;" horiz-adv-x="500" d="M266 263l83 125q1 1 7 10l7 10q1 2 6.5 9.5t8 9.5t7.5 7t9 7t10 4.5t12 3.5t13 1q23 0 40 -17t17 -40q0 -24 -22 -64l-10 26q-4 10 -15 20.5t-25 10.5q-31 0 -63 -49l-65 -100q2 -4 14 -24l20 -32q7 -12 16.5 -30t14 -33t4.5 -26q0 -43 -32.5 -72.5t-76.5 -29.5 q-43 0 -69.5 22t-26.5 64q0 25 30 68l43 60l-90 137q-29 45 -59 45q-18 0 -29 -13t-16 -28t-7 -16q-9 25 -9 42q0 32 23.5 55.5t54.5 23.5q34 0 58.5 -21.5t48.5 -59.5zM284 85q0 9 -5.5 22.5t-10.5 22.5t-16 26t-12 19l-16 -21l-19 -27q-7 -10 -13.5 -26t-6.5 -28 q0 -21 15 -32.5t36 -11.5q23 0 35.5 16.5t12.5 39.5z" />
+<glyph unicode="&#x265;" horiz-adv-x="500" d="M491 450v-15q-43 -6 -53.5 -20t-10.5 -67v-471q0 -32 9.5 -41.5t41.5 -9.5q9 0 12 1v-16l-27 -8q-77 -23 -115 -36l-5 3v304q-35 -45 -69 -64.5t-78 -19.5q-123 0 -123 159v199q0 52 -9.5 65.5t-50.5 21.5v15h212v-15q-44 -5 -56 -20t-12 -67v-198q0 -106 74 -106 q30 0 55 14t57 49v241q0 52 -12 67t-56 20v15h216z" />
+<glyph unicode="&#x266;" horiz-adv-x="500" d="M487 0h-212v15q41 5 54.5 18.5t13.5 60.5v206q0 106 -77 106q-55 0 -109 -63v-246q0 -50 14 -64t54 -18v-15h-216v15q42 6 53 19.5t11 64.5v399q0 78 52 131.5t131 53.5q72 0 121.5 -20.5t49.5 -52.5q0 -16 -10.5 -26.5t-26.5 -10.5q-6 0 -12 1.5t-9.5 3.5t-8.5 8l-8 8 q-3 2 -10 11l-10 13q-32 40 -72 40q-41 0 -75 -42q-28 -33 -28 -80v-160q63 84 146 84q124 0 124 -159v-199q0 -53 10.5 -66.5t49.5 -20.5v-15z" />
+<glyph unicode="&#x267;" horiz-adv-x="481" d="M427 298v-313q0 -94 -48.5 -156t-140.5 -62q-38 0 -65.5 15t-27.5 41q0 16 12.5 27t27.5 11q22 0 47 -30t42 -30q69 0 69 139v360q0 106 -77 106q-55 0 -109 -63v-241q0 -54 13.5 -68.5t54.5 -18.5v-15h-216v15q42 5 53 19.5t11 67.5v396q0 78 52 131.5t131 53.5 q72 0 121.5 -20.5t49.5 -52.5q0 -16 -10.5 -26.5t-26.5 -10.5q-5 0 -9 1t-7 1.5t-7 3.5l-6 5q-2 1 -6.5 6t-6 7t-7.5 9.5t-8 10.5q-32 41 -72 41q-42 0 -76 -42q-28 -33 -28 -80v-160q62 84 146 84q124 0 124 -162z" />
+<glyph unicode="&#x268;" horiz-adv-x="278" d="M180 632q0 -22 -15 -36.5t-37 -14.5q-21 0 -35.5 14.5t-14.5 36.5q0 21 15 36t36 15q22 0 36.5 -15t14.5 -36zM253 0h-237v15q52 3 65.5 18t13.5 71v126h-79v31h79v70q0 35 -7 49t-26 14q-24 0 -42 -5v16l155 55l4 -4v-195h74v-31h-74v-125q0 -56 12.5 -71t61.5 -19v-15z " />
+<glyph unicode="&#x269;" horiz-adv-x="333" d="M295 80l16 -12q-23 -31 -56 -54.5t-67 -23.5q-54 0 -75 33t-21 102v210q0 33 -7.5 46t-25.5 13q-24 0 -42 -5v16q13 4 53 18l64 23q26 8 32 8q10 0 10 -20v-330q0 -32 15.5 -46t37.5 -14q31 0 66 36z" />
+<glyph unicode="&#x26a;" horiz-adv-x="258" d="M231 0h-210v18q45 1 55.5 15.5t10.5 56.5v274q0 41 -10 53.5t-56 14.5v18h210v-18q-45 -1 -54.5 -15t-9.5 -58v-264q0 -42 10.5 -59t53.5 -18v-18z" />
+<glyph unicode="&#x26b;" horiz-adv-x="350" d="M311 425h29q-16 -57 -40 -81.5t-65 -24.5q-13 0 -19 1v-233q0 -42 14 -55.5t61 -16.5v-15h-236v15q47 4 62 19.5t15 57.5v261l-1 1q-24 11 -41 11q-35 0 -51 -46h-29q11 49 37.5 75t63.5 26q7 0 21 -2v143q0 36 -9 50t-33 14q-21 0 -37 -2v16q95 23 158 44l5 -4v-295 q25 -10 42 -10t28.5 11.5t24.5 39.5z" />
+<glyph unicode="&#x26c;" horiz-adv-x="375" d="M351 360l11 -13q-5 -7 -14.5 -17t-43 -34t-72.5 -38v-174q0 -40 15 -53.5t60 -15.5v-15h-236v15q45 4 61 19t16 56v149q-10 -2 -29 -2q-44 0 -75.5 31t-31.5 75t32 75.5t75 31.5q9 0 29 -5v119q0 34 -9.5 47.5t-33.5 13.5q-12 0 -36 -2v16q93 23 159 44l4 -2v-391 q75 26 119 70zM148 276v141q-10 4 -16 4q-23 0 -45.5 -22t-22.5 -46q0 -30 18.5 -51.5t47.5 -24.5q6 -1 18 -1z" />
+<glyph unicode="&#x26d;" horiz-adv-x="302" d="M173 681v-741q0 -39 1 -57.5t5.5 -41.5t15 -31.5t28.5 -8.5q17 0 42 30t47 30q15 0 27.5 -11t12.5 -27q0 -26 -27.5 -41t-65.5 -15q-90 0 -130 60t-40 158v579q0 34 -9.5 47.5t-34.5 13.5q-11 0 -35 -2v16q93 23 159 44z" />
+<glyph unicode="&#x26e;" horiz-adv-x="549" d="M506 400l-164 -204q16 3 32 3q67 0 115.5 -53t48.5 -145q0 -59 -20.5 -105.5t-54 -73.5t-71.5 -41t-76 -14q-60 0 -106 31q-21 14 -32 34t-11 36q0 18 13 31t36 13q16 0 29.5 -14.5t18.5 -37.5q10 -40 21 -52t49 -12q17 0 36.5 7.5t41.5 25.5t36.5 55.5t14.5 89.5 q0 82 -42 121.5t-110 39.5q-10 0 -52 -19l-14 11l214 259h-277v-302q0 -41 14.5 -53t60.5 -16v-15h-236v15q42 3 59.5 17.5t17.5 54.5v477q0 34 -9.5 47.5t-33.5 13.5t-36 -2v16q102 25 158 44l5 -2v-231h324v-50z" />
+<glyph unicode="&#x26f;" horiz-adv-x="778" d="M770 450v-15q-42 -1 -56 -15.5t-14 -57.5v-248q0 -37 8 -51.5t27 -14.5q15 0 32 4v-17q-68 -19 -139 -45l-8 3v74h-2q-45 -47 -79.5 -62t-73.5 -15q-79 0 -106 84q-78 -84 -163 -84q-116 0 -116 180v203q0 33 -10 45.5t-33 14.5l-26 2v15h218v-15q-42 -4 -53.5 -17.5 t-11.5 -57.5v-206q0 -60 17.5 -86t59.5 -26q35 0 59.5 14t47.5 47v252q0 48 -14.5 63.5t-57.5 16.5v15h224v-15q-44 -3 -56 -14.5t-12 -56.5v-211q0 -111 65 -111q28 0 59.5 12.5t46.5 30.5q13 15 13 17v278q0 32 -14 42.5t-54 12.5v15h222z" />
+<glyph unicode="&#x270;" horiz-adv-x="803" d="M785 -233h-240v15q45 8 58 19t13 50v216q-66 -77 -147 -77q-46 0 -70.5 20.5t-39.5 63.5q-81 -84 -162 -84q-117 0 -117 178v206q0 56 -41 59l-28 2v15h218v-15q-40 -5 -52.5 -17t-12.5 -55v-208q0 -34 3.5 -55t21.5 -39.5t52 -18.5q38 0 61.5 15.5t45.5 45.5v258 q0 26 -4.5 41.5t-16.5 22t-21 8t-30 2.5v15h224v-15q-43 -3 -55.5 -14.5t-12.5 -54.5v-214q0 -110 66 -110q31 0 60.5 14t43.5 27.5t14 17.5v282q0 18 -4.5 28.5t-16 15.5t-20 6t-27.5 2v15h222v-15q-19 0 -28.5 -2t-21 -8t-16 -21t-4.5 -39v-508q0 -25 5.5 -40.5 t18.5 -22.5t25.5 -9t35.5 -3v-15z" />
+<glyph unicode="&#x271;" horiz-adv-x="778" d="M706 282v-297q0 -94 -48.5 -156t-140.5 -62q-38 0 -65.5 15t-27.5 41q0 16 12.5 27t27.5 11q22 0 47 -30t42 -30q69 0 69 139v354q0 24 -2 40t-9 35t-23 29t-42 10q-39 0 -63.5 -16t-44.5 -45v-259q0 -25 5 -41t17.5 -22t21.5 -8t28 -2v-15h-224v15q4 1 16 2t14.5 1.5 t11 2.5t10.5 4.5t6.5 7.5t5.5 11l2 16q2 9 2 21v220q0 50 -17 78.5t-47 28.5q-32 0 -62 -14t-44 -27.5t-14 -18.5v-280q0 -18 4 -28.5t15.5 -15.5t20 -6.5t28.5 -2.5v-15h-222v15q39 1 54.5 13t15.5 56v254q0 41 -9.5 52.5t-25.5 11.5t-32 -4v17q69 19 140 45l7 -2v-76 q46 45 79 61.5t75 16.5q45 0 69.5 -22.5t37.5 -62.5q75 85 163 85q116 0 116 -178z" />
+<glyph unicode="&#x272;" horiz-adv-x="529" d="M514 0h-208v15q24 3 34.5 7.5t19.5 22.5t9 54v205q0 50 -16.5 75.5t-58.5 25.5q-25 0 -47.5 -13.5t-53.5 -43.5v-363q0 -98 -40 -158t-130 -60q-38 0 -65.5 15t-27.5 41q0 16 12.5 27t27.5 11q22 0 47 -30t42 -30q18 0 28.5 8.5t15 31.5t5.5 41.5t1 57.5v402q0 27 -6 41 t-12 16.5t-17 2.5q-21 0 -29 -4v17q70 20 137 45l8 -3v-79q73 82 144 82q51 0 85 -35t34 -119v-225q0 -36 12.5 -49.5t48.5 -16.5v-15z" />
+<glyph unicode="&#x273;" horiz-adv-x="533" d="M424 308v-368q0 -39 1 -57.5t5.5 -41.5t15 -31.5t28.5 -8.5q17 0 42 30t47 30q15 0 27.5 -11t12.5 -27q0 -26 -27.5 -41t-65.5 -15q-90 0 -130 60t-40 158v319q0 50 -16.5 75.5t-58.5 25.5t-101 -57v-277q0 -28 13.5 -41t51.5 -15v-15h-211v15q36 3 49 17.5t13 57.5v250 q0 28 -6 42.5t-12 17t-17 2.5q-21 0 -29 -4v17q70 20 137 45l8 -3v-79q75 82 144 82q49 0 84 -34t35 -118z" />
+<glyph unicode="&#x274;" horiz-adv-x="602" d="M561 450v-18q-38 -4 -52 -13q-21 -18 -21 -81v-346h-14l-333 368v-254q0 -52 12 -67.5t58 -20.5v-18h-182v18q51 5 64 19.5t13 68.5v289q-21 23 -35 30t-42 7v18h133l291 -324v220q0 54 -14 68q-8 14 -61 18v18h183z" />
+<glyph unicode="&#x275;" horiz-adv-x="500" d="M470 231q0 -103 -62 -172t-156 -69q-98 0 -160.5 68.5t-62.5 169.5q0 106 61.5 169t161.5 63q94 0 156 -63t62 -166zM119 247h261q0 87 -38.5 136t-89.5 49q-54 0 -93 -48.5t-40 -136.5zM380 214h-260q0 -85 40 -140.5t92 -55.5q50 0 89 55.5t39 140.5z" />
+<glyph unicode="&#x276;" horiz-adv-x="720" d="M697 110l-34 -112h-270q-25 0 -77 -2t-68 -2q-48 0 -94 17.5t-72 46.5q-59 65 -59 163q0 129 100 192q59 37 148 37q11 0 49 -2q42 -3 90 -3h251v-96h-19q-6 45 -29 57.5t-98 12.5h-42q-31 0 -42 -5t-11 -18v-150h77q63 0 84 12.5t25 53.5h18v-159h-18q-5 39 -22.5 53 t-61.5 14h-102v-159q0 -20 9.5 -28.5t36.5 -8.5h89q40 0 68.5 19.5t56.5 66.5h17zM339 88v265q0 37 -16.5 54t-55.5 17q-74 0 -115.5 -52.5t-41.5 -150.5q0 -92 34 -143q40 -58 118 -58q41 0 59 16t18 52z" />
+<glyph unicode="&#x277;" horiz-adv-x="667" d="M629 194q0 -82 -50.5 -140t-130.5 -58t-115 84q-35 -84 -115 -84t-130.5 58t-50.5 140q0 125 88 203t209 78q116 0 205.5 -78.5t89.5 -202.5zM533 210q0 121 -56 183t-143 62t-144 -62t-57 -183q0 -26 4 -52.5t13 -55t29 -46.5t47 -18q31 0 53.5 22t22.5 54 q0 22 -13 71.5t-13 79.5q0 61 57 61t57 -61q0 -30 -13 -79.5t-13 -71.5q0 -32 22.5 -54t53.5 -22q27 0 47 18t29 46.5t13 55t4 52.5z" />
+<glyph unicode="&#x278;" horiz-adv-x="667" d="M375 599v-164q105 -9 178 -63.5t73 -151.5q0 -94 -73.5 -155.5t-177.5 -67.5v-146q0 -42 15 -54.5t60 -14.5v-15h-236v15q45 3 61 17.5t16 54.5v143q-104 6 -177.5 67.5t-73.5 155.5q0 97 73 151.5t178 63.5v161q0 40 -16 54.5t-61 17.5v15h236v-15q-45 -2 -60 -14.5 t-15 -54.5zM375 407v-382q72 10 111.5 66.5t39.5 130.5q0 78 -39 129t-112 56zM291 25v382q-73 -5 -112 -56t-39 -129q0 -74 40 -130.5t111 -66.5z" />
+<glyph unicode="&#x279;" horiz-adv-x="370" d="M360 450v-15q-48 -9 -59.5 -20t-11.5 -49v-250q0 -33 7.5 -46.5t26.5 -13.5q16 0 35 4v-16q-63 -20 -148 -54l-5 2v92q-38 -54 -63.5 -74t-56.5 -20q-26 0 -40.5 14t-14.5 39q0 21 10.5 33t28.5 12q19 0 40 -20q17 -15 26 -15q21 0 45.5 29t24.5 53v225q0 43 -17 58 t-68 17v15h240z" />
+<glyph unicode="&#x27a;" horiz-adv-x="370" d="M364 0h-159v84q-37 -53 -63 -73.5t-57 -20.5q-26 0 -40.5 14.5t-14.5 39.5q0 19 10 31.5t28 12.5q19 0 38.5 -17.5t29.5 -17.5q20 0 44.5 29t24.5 53v424q0 36 -9 51t-33 15q-13 0 -37 -2v16q93 23 159 44l4 -2v-597q0 -42 14.5 -53.5t60.5 -15.5v-15z" />
+<glyph unicode="&#x27b;" horiz-adv-x="418" d="M289 366v-249q0 -316 50 -316q17 0 42 30t47 30q15 0 27.5 -11t12.5 -27q0 -26 -27.5 -41t-65.5 -15q-46 0 -80.5 32t-53 82t-27.5 101t-9 99q-60 -91 -121 -91q-25 0 -39.5 14.5t-14.5 39.5q0 19 10 31.5t28 12.5q19 0 38.5 -17.5t30.5 -17.5q18 0 43 29t25 53v225 q0 25 -5.5 40.5t-18.5 22.5t-25.5 9t-35.5 3v15h240v-15q-45 -8 -58 -19t-13 -50z" />
+<glyph unicode="&#x27c;" horiz-adv-x="333" d="M160 458v-92q37 53 62.5 73.5t57.5 20.5q27 0 41 -14.5t14 -39.5q0 -19 -10 -31.5t-28 -12.5q-19 0 -38.5 17.5t-30.5 17.5q-18 0 -43 -29t-25 -52v-459q0 -25 5.5 -40.5t18.5 -22.5t25.5 -9t35.5 -3v-15h-240v15q45 8 58 19t13 50v483q0 21 -3 34t-9 18t-10.5 6.5 t-12.5 1.5q-16 0 -34 -4v16q79 26 148 54z" />
+<glyph unicode="&#x27d;" horiz-adv-x="370" d="M160 315v-375q0 -39 1 -57.5t5.5 -41.5t15 -31.5t28.5 -8.5q17 0 42 30t47 30q15 0 27.5 -11t12.5 -27q0 -26 -27.5 -41t-65.5 -15q-90 0 -130 60t-40 158v349q0 21 -3 34t-9 18t-10.5 6.5t-12.5 1.5q-16 0 -34 -4v16q79 26 148 54l5 -2v-92q38 55 63 74.5t58 19.5 q25 0 39.5 -14.5t14.5 -39.5q0 -19 -10 -31.5t-28 -12.5q-19 0 -38.5 17.5t-30.5 17.5q-19 0 -43.5 -29t-24.5 -53z" />
+<glyph unicode="&#x27e;" horiz-adv-x="315" d="M74 76v176q0 98 40 158t130 60q38 0 65.5 -15t27.5 -41q0 -16 -12.5 -27t-27.5 -11q-22 0 -47 30t-42 30q-18 0 -28.5 -8.5t-15 -31.5t-5.5 -41.5t-1 -57.5v-221q0 -37 11.5 -48.5t52.5 -14.5v-13h-212v13q41 3 52.5 14t11.5 49z" />
+<glyph unicode="&#x27f;" horiz-adv-x="350" d="M332 0h-212v13q41 3 52.5 14.5t11.5 48.5v221q0 39 -1 57.5t-5.5 41.5t-15 31.5t-28.5 8.5q-17 0 -42 -30t-47 -30q-15 0 -27.5 11t-12.5 27q0 26 27.5 41t65.5 15q90 0 130 -60t40 -158v-176q0 -38 11.5 -49t52.5 -14v-13z" />
+<glyph unicode="&#x280;" horiz-adv-x="475" d="M470 0h-120l-144 209h-37v-106q0 -47 14.5 -65t53.5 -20v-18h-216v18q40 1 56 23q11 15 11 57v257q0 51 -14 67q-16 20 -53 24v18h222q76 0 123 -34t47 -88q0 -86 -121 -120l114 -170q24 -34 54 -34h10v-18zM169 242h17q50 0 79 16q55 28 55 84q0 41 -27.5 65.5 t-75.5 24.5q-20 0 -48 -7v-183z" />
+<glyph unicode="&#x281;" horiz-adv-x="475" d="M470 446h-10q-30 0 -54 -34l-114 -170q121 -34 121 -120q0 -54 -47 -88t-123 -34h-222v18q37 4 53 24q14 16 14 67v257q0 42 -11 57q-16 22 -56 23v18h216v-18q-39 -2 -53.5 -20t-14.5 -65v-106h37l144 209h120v-18zM169 222v-183q28 -7 48 -7q48 0 75.5 24.5t27.5 65.5 q0 56 -55 84q-29 16 -79 16h-17z" />
+<glyph unicode="&#x282;" horiz-adv-x="389" d="M156 300l104 -63q50 -30 69 -56t19 -67q0 -50 -41.5 -87.5t-98.5 -37.5q-47 0 -73 9q-27 9 -46 9h-6q-2 -64 -2 -96q0 -95 38 -95q17 0 42 30t47 30q15 0 27.5 -11t12.5 -27q0 -26 -27.5 -41t-65.5 -15q-64 0 -84.5 28t-20.5 88q0 14 1 46.5t1 51.5v156h16 q16 -73 46 -107t81 -34q37 0 60 21t23 53q0 46 -53 75l-54 30q-120 67 -120 145q0 58 37.5 90.5t100.5 32.5q44 0 67 -11q18 -8 28 -8q7 0 16 10h11l5 -136h-15q-17 68 -42.5 95.5t-70.5 27.5q-34 0 -54.5 -17t-20.5 -51q0 -17 11.5 -36.5t31.5 -31.5z" />
+<glyph unicode="&#x283;" horiz-adv-x="322" d="M111 -109v574q0 218 168 218q38 0 65.5 -15t27.5 -41q0 -16 -12.5 -27t-27.5 -11q-22 0 -47 30t-42 30t-27.5 -10.5t-14.5 -31t-5 -34.5t-1 -36v-582q0 -83 -43.5 -135.5t-128.5 -52.5q-38 0 -65.5 15t-27.5 41q0 16 12.5 27t27.5 11q22 0 47 -30t42 -30q52 0 52 90z" />
+<glyph unicode="&#x284;" horiz-adv-x="304" d="M109 31v400q0 41 3 73t13.5 67.5t28.5 58.5t49.5 38t75.5 15q34 0 63.5 -13.5t29.5 -42.5q0 -15 -12 -26.5t-27 -11.5q-22 0 -46.5 30t-43.5 30q-50 0 -50 -120v-498h77v-31h-77q0 -62 -14.5 -108.5t-54 -78t-101.5 -31.5q-38 0 -65.5 14.5t-27.5 40.5q0 15 11 27t29 12 q22 0 47 -30t42 -30q12 0 20.5 4t14 13.5t9 18.5t4.5 27.5t1.5 32.5t0.5 40v48h-77v31h77z" />
+<glyph unicode="&#x285;" horiz-adv-x="400" d="M278 252v-312q0 -39 1 -57.5t5.5 -41.5t15 -31.5t28.5 -8.5q17 0 42 30t47 30q15 0 27.5 -11t12.5 -27q0 -26 -27.5 -41t-65.5 -15q-90 0 -130 60t-40 158v312q0 39 -1 57.5t-5.5 41.5t-15 31.5t-28.5 8.5q-17 0 -42 -30t-47 -30q-15 0 -27.5 11t-12.5 27q0 26 27.5 41 t65.5 15q90 0 130 -60t40 -158z" />
+<glyph unicode="&#x286;" horiz-adv-x="437" d="M161 11v459q0 213 168 213q33 0 63 -13.5t30 -42.5q0 -15 -12 -26.5t-27 -11.5q-24 0 -48.5 30t-41.5 30q-48 0 -48 -105v-572q46 -34 70.5 -86.5t24.5 -110.5q0 -6 -2 -18h-26v14q0 106 -67 169q-15 -173 -143 -173q-51 0 -88 37.5t-37 88.5t37 88t89 37q37 0 58 -7z M161 -114v98q-24 9 -59 9q-40 0 -70 -29.5t-30 -70.5q0 -40 30 -70.5t70 -30.5q59 0 59 94z" />
+<glyph unicode="&#x287;" horiz-adv-x="278" d="M225 32h53q4 -3 4 -7q0 -8 -17 -19q-38 -22 -97 -107q-2 -3 -9.5 -12.5t-10.5 -15.5q-7 0 -7 13v116h-101v32h101v286q0 48 -12 69t-40 21q-30 0 -60 -35l-13 11q48 76 121 76q88 0 88 -127v-301z" />
+<glyph unicode="&#x288;" horiz-adv-x="270" d="M154 418v-560q0 -57 15 -57q13 0 21.5 9.5t13 21t14.5 21t24 9.5q16 0 28.5 -11t12.5 -28q0 -26 -28 -41t-66 -15t-62.5 10.5t-36.5 32.5t-16 46.5t-4 60.5v501h-53q-4 2 -4 7q0 6 6 11l17 12q12 8 21 17q40 41 90 114q7 0 7 -13v-116h101v-32h-101z" />
+<glyph unicode="&#x289;" horiz-adv-x="500" d="M480 49v-13q-78 -21 -137 -45l-5 3v82h-2q-63 -86 -143 -86q-57 0 -89.5 35t-32.5 93v112h-62v31h62v108q0 37 -13 51t-49 16v14h146v-189h178v107q0 39 -14 50.5t-60 14.5v17h158v-189h62v-31h-62v-123q0 -35 11.5 -46.5t45.5 -11.5h6zM333 137v93h-178v-103 q0 -34 20.5 -56.5t50.5 -22.5q49 0 84 31q13 12 18 22.5t5 35.5z" />
+<glyph unicode="&#x28a;" horiz-adv-x="537" d="M490 430h-38q-16 0 -28.5 -11.5t-12.5 -25.5q0 -20 10 -30q8 -7 21.5 -24.5t29.5 -54t16 -71.5q0 -93 -64 -158t-156 -65q-91 0 -155.5 65t-64.5 154q0 37 17 75.5t29 54t21 24.5q10 10 10 28q0 17 -12.5 28t-28.5 11h-38v20h140q-50 -141 -50 -246q0 -32 7 -75 q8 -51 42 -85t83 -34t83 34t42 85q7 43 7 76q0 106 -50 245h140v-20z" />
+<glyph unicode="&#x28b;" horiz-adv-x="500" d="M193 457v-331q0 -36 26 -65.5t61 -29.5q71 0 118.5 64.5t47.5 137.5q0 51 -16 86.5t-35 49t-35 28.5t-16 30q0 14 14.5 23.5t28.5 9.5q28 0 47 -23t27.5 -59.5t11.5 -65.5t3 -57q0 -69 -21 -127t-70.5 -98t-121.5 -40q-75 0 -114.5 32t-39.5 106v206q0 19 -1 29 t-9.5 20.5t-24.5 10.5q-14 0 -42 -4v16q80 24 156 54z" />
+<glyph unicode="&#x28c;" horiz-adv-x="500" d="M454 0h-196v15q26 2 36 8t10 19q0 16 -9 38l-102 256l-99 -259q-6 -15 -6 -30q0 -28 47 -32v-15h-139v15q23 2 34 15t31 63l128 321q20 50 28 50q7 0 18 -26l128 -308q32 -76 47 -94.5t44 -20.5v-15z" />
+<glyph unicode="&#x28d;" horiz-adv-x="722" d="M694 0h-180v15q26 3 36 10t10 23q0 15 -6 30l-99 261l-91 -199l20 -56q14 -40 27.5 -53t41.5 -16v-15h-203v15q35 5 46.5 12t11.5 23t-17 60l-84 224l-90 -222q-17 -42 -17 -67q0 -12 9.5 -18.5t34.5 -11.5v-15h-123v15q15 5 22 14.5t19 39.5l138 346q20 49 28 49 q5 0 8.5 -6.5t15.5 -36.5l91 -236l112 240q18 39 25 39q9 0 26 -44l135 -342q15 -39 25 -50t28 -13v-15z" />
+<glyph unicode="&#x28e;" horiz-adv-x="444" d="M459 0h-205v15q32 1 44.5 7t12.5 20q0 11 -13 41l-112 250l-97 -276q-4 -9 -4 -18q0 -24 46 -24v-15h-133v15q18 2 29 13t21 38l150 409q39 106 78.5 149.5t96.5 43.5q32 0 51 -16.5t19 -41.5q0 -19 -12.5 -32.5t-30.5 -13.5q-29 0 -52 13q-13 7 -26 7q-21 0 -50 -44 q-14 -20 -27 -57t-13 -51q0 -13 42 -101l132 -282q13 -29 53 -35v-14z" />
+<glyph unicode="&#x28f;" horiz-adv-x="587" d="M564 464v-18q-36 -3 -53 -16.5t-55 -62.5l-119 -155v-106q0 -21 1.5 -33t8 -26.5t21 -21.5t37.5 -7v-18h-216v18q23 0 38 6.5t20.5 20.5t7 24t1.5 27v110l-104 133q-54 69 -76.5 87t-52.5 20v18h210v-18l-21 -1q-19 -1 -23.5 -4.5t-4.5 -13.5q0 -9 19 -32l115 -151 l116 151q12 17 12 34q0 9 -6.5 12.5t-33.5 4.5v18h158z" />
+<glyph unicode="&#x290;" horiz-adv-x="528" d="M400 140l18 -4q-18 -220 -18 -250q0 -37 9 -53.5t31 -16.5q17 0 42 30t47 30q15 0 27.5 -11t12.5 -27q0 -26 -27.5 -41t-65.5 -15q-61 0 -82.5 35.5t-21.5 95.5q0 18 2 49.5t2 37.5h-349v15l266 405h-142q-20 0 -34 -5t-21.5 -10.5t-12.5 -19.5t-7 -23t-5 -30h-18l4 118 h346v-15l-269 -405h133q82 0 106 27q14 15 27 83z" />
+<glyph unicode="&#x291;" horiz-adv-x="507" d="M134 30h114q78 120 129 127q18 2 25 2q39 0 62 -20t23 -54q0 -39 -30 -62t-90 -23h-99q-43 -73 -78 -150h-36q32 74 76 150h-203v15l266 405h-141q-25 0 -40 -4.5t-23 -19.5t-10.5 -25.5t-7.5 -38.5h-18l4 118h346v-15zM286 30h82q86 0 86 56q0 47 -51 47q-13 0 -26 -3 q-33 -8 -91 -100z" />
+<glyph unicode="&#x292;" horiz-adv-x="413" d="M360 400l-164 -204q16 3 32 3q67 0 115.5 -53t48.5 -145q0 -112 -68 -173t-156 -61q-58 0 -104 31q-21 14 -32 34t-11 36q0 18 13 31t36 13q18 0 30.5 -15.5t16.5 -34.5q10 -42 22 -54t49 -12q17 0 36.5 7.5t41.5 25.5t36.5 55.5t14.5 89.5q0 82 -42 121.5t-110 39.5 q-10 0 -52 -19l-14 11l214 259h-199q-50 0 -64 -18.5t-20 -67.5h-18l24 150h324v-50z" />
+<glyph unicode="&#x293;" horiz-adv-x="431" d="M398 435l-178 -268q2 0 7 0.5t9 0.5q64 0 119 -46.5t55 -125.5q0 -84 -40 -138.5t-100 -75.5l46 -87h-37l-43 77q-21 -5 -77 -5q-147 0 -147 90q0 35 23 57t65 22t72.5 -27t79.5 -99q68 38 68 164q0 67 -43 114t-110 47q-14 0 -56 -19l-14 11l191 293h-138 q-50 0 -64 -19.5t-20 -68.5h-18l4 118h346v-15zM221 -202q-69 104 -104 104q-17 0 -26 -12.5t-9 -31.5q0 -32 29.5 -47t63.5 -15q39 0 46 2z" />
+<glyph unicode="&#x294;" horiz-adv-x="450" d="M160 102v254q57 0 101 46t44 106q0 57 -24 107.5t-68 50.5q-24 0 -42.5 -19.5t-23.5 -44.5q-13 -64 -52 -64q-22 0 -35 13t-13 31q0 16 11 36t32 34q46 31 113 31q56 0 97 -17t61.5 -45t29.5 -56t9 -58q0 -78 -46 -118.5t-110 -52.5v-234q0 -56 15 -70.5t64 -16.5v-15 h-237v15q50 3 62 19t12 68z" />
+<glyph unicode="&#x295;" horiz-adv-x="450" d="M204 102v234q-64 12 -110 52.5t-46 118.5q0 30 9 58t29.5 56t61.5 45t97 17q67 0 113 -31q21 -14 32 -34t11 -36q0 -18 -13 -31t-35 -13q-39 0 -52 64q-5 25 -23.5 44.5t-42.5 19.5q-44 0 -68 -50.5t-24 -107.5q0 -60 44 -106t101 -46v-254q0 -52 12 -68t62 -19v-15h-237 v15q49 2 64 16.5t15 70.5z" />
+<glyph unicode="&#x296;" horiz-adv-x="450" d="M244 560v-227q64 -12 110 -52.5t46 -118.5q0 -30 -9 -58t-29.5 -56t-61.5 -45t-97 -17q-67 0 -113 31q-21 14 -32 34t-11 36q0 18 13 31t35 13q39 0 52 -64q5 -25 23.5 -44.5t42.5 -19.5q44 0 68 50.5t24 107.5q0 60 -44 106t-101 46v247q0 52 -12 68t-62 19v15h237v-15 q-49 -2 -64 -16.5t-15 -70.5z" />
+<glyph unicode="&#x297;" horiz-adv-x="450" d="M410 -39v-38q0 -61 -51.5 -107t-113.5 -46q-63 0 -114 46t-51 108v378q0 70 55.5 114t127.5 44q53 0 90 -32.5t37 -84.5q0 -21 -10.5 -41t-29.5 -20q-11 0 -20 8.5t-9 19.5q0 10 7 25.5t7 24.5q0 27 -19 46t-46 19q-38 0 -72 -28.5t-34 -66.5v-398q0 -46 32.5 -81 t78.5 -35q53 0 82.5 34.5t29.5 86.5q0 8 -2 24h25z" />
+<glyph unicode="&#x298;" horiz-adv-x="723" d="M421 331q0 -26 -18 -44.5t-44 -18.5t-45 18.5t-19 44.5t18.5 44.5t45.5 18.5q26 0 44 -18.5t18 -44.5zM690 330q0 -148 -89.5 -247.5t-237.5 -99.5q-139 0 -234.5 96.5t-95.5 251.5t93 251.5t239 96.5t235.5 -99t89.5 -250zM597 333q0 137 -65 227.5t-173 90.5 q-101 0 -167 -85t-66 -233q0 -138 62 -227.5t174 -89.5q96 0 165.5 92.5t69.5 224.5z" />
+<glyph unicode="&#x299;" horiz-adv-x="460" d="M309 245v-1q135 -24 135 -119q0 -58 -51 -91.5t-138 -33.5h-240v18q44 0 60 16.5t16 54.5v281q0 36 -16 53.5t-60 22.5v18h203q198 0 198 -117q0 -47 -27 -69.5t-80 -32.5zM172 260h53q60 0 86 20t26 64q0 88 -131 88h-16q-18 0 -18 -22v-150zM172 226v-162 q0 -19 10.5 -25.5t38.5 -6.5q133 0 133 93q0 27 -9 46t-22.5 29.5t-36 16.5t-43 7.5t-50.5 1.5h-21z" />
+<glyph unicode="&#x29a;" horiz-adv-x="479" d="M163 249v2q-116 24 -116 107q0 59 50 88t114 29q103 0 161 -67.5t58 -173.5q0 -114 -55 -181t-165 -67q-72 0 -131 35t-59 102q0 104 143 126zM245 263v-30q-55 0 -93 -25.5t-38 -78.5q0 -47 34.5 -77t81.5 -30q44 0 76 38.5t45.5 85.5t13.5 89q0 44 -13.5 89t-47 81.5 t-79.5 36.5q-38 0 -64 -26t-26 -64q0 -44 32 -66t78 -23z" />
+<glyph unicode="&#x29b;" horiz-adv-x="600" d="M485 171v-133q0 -15 -77.5 -32t-105.5 -17q-122 0 -197.5 59.5t-75.5 176.5q0 100 78 162.5t180 62.5q22 0 43.5 -3t54.5 -10.5t43 -9.5q2 43 28 69.5t68 26.5q23 0 41 -13t18 -34q0 -23 -21 -23q-18 0 -28.5 24.5t-27.5 24.5q-33 0 -33 -68q0 -21 5 -126h-17 q-46 115 -165 115q-88 0 -135 -60t-47 -150t53 -143.5t143 -53.5q30 0 66 9t36 30v109q0 38 -12 46.5t-55 11.5v13h193v-13q-32 -2 -42.5 -11.5t-10.5 -39.5z" />
+<glyph unicode="&#x29c;" horiz-adv-x="572" d="M560 0h-216v18q45 2 56 16t11 60v126h-242v-126q0 -41 12.5 -57.5t54.5 -18.5v-18h-215v18q45 3 56 17t11 62v282q0 41 -11.5 52.5t-55.5 14.5v18h215v-18q-43 -3 -55 -14.5t-12 -52.5v-126h242v126q0 42 -11 52.5t-56 14.5v18h216v-18q-44 -3 -56 -15t-12 -52v-289 q0 -40 13.5 -55.5t54.5 -16.5v-18z" />
+<glyph unicode="&#x29d;" horiz-adv-x="387" d="M284 632q0 -22 -15 -36.5t-37 -14.5q-20 0 -35 15.5t-15 35.5t15 35.5t35 15.5q21 0 36.5 -15t15.5 -36zM412 -233h-40q-13 18 -29 36l-38 42l-31 34q-46 -112 -167 -112q-51 0 -90.5 33.5t-39.5 84.5q0 48 39 81.5t87 33.5q27 0 96 -20v359q0 55 -35 55q-14 0 -42 -4v16 q80 24 156 54l5 -3v-537q69 -66 129 -153zM199 -94v38q-42 21 -92 21q-36 0 -65.5 -20.5t-29.5 -54.5q0 -40 32 -64t74 -24q81 0 81 104z" />
+<glyph unicode="&#x29e;" horiz-adv-x="519" d="M499 -189l-30 -8q-60 -16 -125 -36l-4 2v420l-137 -122q-23 -21 -23 -35q0 -10 10.5 -13.5t39.5 -4.5v-14h-204v15q50 0 88.5 21.5t127.5 104.5l29 27l-153 194q-54 69 -117 73v15h218v-15h-19q-21 0 -21 -15q0 -9 11 -23l150 -198v184q0 26 -12.5 38t-42.5 13l-20 1v15 h234v-15q-54 -9 -64.5 -18.5t-10.5 -48.5v-482q0 -36 9 -48.5t34 -12.5q6 0 32 2v-16z" />
+<glyph unicode="&#x29f;" horiz-adv-x="470" d="M441 127l-35 -127h-385v18q38 1 49 14.5t11 50.5v294q0 41 -9.5 53.5t-50.5 15.5v18h193v-18q-41 -2 -50.5 -16.5t-9.5 -53.5v-312q0 -20 12.5 -26t52.5 -6h50q89 0 123 43q14 19 30 52h19z" />
+<glyph unicode="&#x2a0;" horiz-adv-x="600" d="M362 426l3 37q4 55 34 87t72 32q53 0 85 -18q34 -19 34 -53q0 -13 -8.5 -23t-25.5 -10q-30 0 -45 28q-17 33 -40 33q-46 0 -46 -87v-593q0 -32 12 -43.5t51 -15.5v-17h-236v17q53 4 71 19t18 57v188q-68 -74 -157 -74q-70 0 -115 60t-45 155q0 108 63.5 181.5t156.5 73.5 q55 0 118 -34zM341 127v206q0 98 -93 98q-64 0 -101 -51t-37 -139q0 -52 15.5 -96.5t40.5 -66.5q30 -27 75 -27q53 0 88 32q12 11 12 44z" />
+<glyph unicode="&#x2a1;" horiz-adv-x="450" d="M161 193v161q58 0 101.5 46.5t43.5 105.5q0 30 -8 64.5t-30 64t-53 29.5q-23 0 -38 -13t-22 -32t-13 -38t-17.5 -32t-30.5 -13t-32.5 12.5t-13.5 31.5q0 45 50 74t99 29q90 0 147 -44.5t57 -131.5q0 -72 -42 -116t-115 -57v-141h78v-31h-78v-69q0 -40 15 -58t65 -20v-15 h-237v15q50 3 62 19t12 68v60h-77v31h77z" />
+<glyph unicode="&#x2a2;" horiz-adv-x="450" d="M205 193v141q-73 13 -115 57t-42 116q0 87 57 131.5t147 44.5q49 0 99 -29t50 -74q0 -19 -13.5 -31.5t-32.5 -12.5t-30.5 13t-17.5 32t-13 38t-22 32t-38 13q-31 0 -53 -29.5t-30 -64t-8 -64.5q0 -59 43.5 -105.5t101.5 -46.5v-161h77v-31h-77v-60q0 -52 12 -68t62 -19 v-15h-237v15q50 2 65 20t15 58v69h-78v31h78z" />
+<glyph unicode="&#x2a3;" horiz-adv-x="802" d="M775 126l-15 -136h-416l-4 3v64q-48 -67 -128 -67q-83 0 -134 59.5t-51 155.5q0 106 61 180.5t147 74.5q54 0 105 -43v156q0 31 -9 41t-37 10q-14 0 -22 -1v16q91 24 147 44l5 -2v-241h336v-15l-269 -405h133q84 0 106 27q14 17 27 83zM650 410h-135q-47 0 -63.5 -16.5 t-23.5 -71.5h-4v-208q0 -30 5 -41zM340 102v230q0 40 -30.5 70t-71.5 30q-57 0 -91 -51t-34 -136q0 -92 37.5 -147.5t100.5 -55.5q47 0 74 32q15 17 15 28z" />
+<glyph unicode="&#x2a4;" horiz-adv-x="743" d="M690 400l-164 -204q16 3 32 3q68 0 116 -55t48 -148q0 -59 -21 -105t-55 -72t-71.5 -39t-76.5 -13q-58 0 -104 31q-21 14 -32 34t-11 36q0 18 12.5 31t33.5 13q41 0 55 -67q5 -26 17.5 -37.5t48.5 -11.5q17 0 36.5 7.5t41.5 25.5t36.5 55.5t14.5 89.5q0 82 -42 121.5 t-110 39.5q-16 0 -42 -23q-12 -11 -25 -26l-22 -26l-25 -33l-27 -35l-14 1v64q-14 -19 -25 -30.5t-40 -24t-66 -12.5q-26 0 -54 9.5t-58.5 31.5t-50 68t-19.5 109q0 104 61 178t146 74q57 0 106 -43v156q0 19 -1.5 27.5t-11.5 16t-31 7.5q-16 0 -24 -1v16q86 22 147 44l5 -2 v-231h266v-50zM643 386h-219v-261zM340 104v224q0 47 -32 75.5t-71 28.5q-49 0 -86.5 -45.5t-37.5 -139.5q0 -104 41 -154.5t101 -50.5q31 0 58 21t27 41z" />
+<glyph unicode="&#x2a5;" horiz-adv-x="864" d="M491 20h114q78 120 129 127q18 2 25 2q39 0 62 -20t23 -54q0 -39 -30 -62t-90 -23h-99q-43 -73 -78 -150h-36q32 74 76 150h-243l-4 3v64q-48 -67 -128 -67q-83 0 -134 59.5t-51 155.5q0 106 61 180.5t147 74.5q54 0 105 -43v156q0 31 -9 41t-37 10q-14 0 -22 -1v16 q91 24 147 44l5 -2v-241h336v-15zM643 20h82q86 0 86 56q0 47 -51 47q-12 0 -26 -3q-33 -8 -91 -100zM650 410h-141q-25 0 -40 -4.5t-23 -19.5t-10.5 -25.5t-7.5 -38.5h-4v-208q0 -30 5 -41zM340 102v230q0 40 -30.5 70t-71.5 30q-57 0 -91 -51t-34 -136q0 -92 37.5 -147.5 t100.5 -55.5q47 0 74 32q15 17 15 28z" />
+<glyph unicode="&#x2a6;" horiz-adv-x="536" d="M303 302l104 -63q50 -30 69 -56t19 -67q0 -50 -41.5 -88t-98.5 -38q-44 0 -73 10q-27 9 -46 9q-6 0 -9 1q-31 -20 -69 -20q-88 0 -88 127v301h-53q-4 3 -4 7q0 8 17 19q38 22 97 107q14 21 20 28q7 0 7 -13v-116h120q30 10 62 10q44 0 67 -11q18 -8 28 -8q7 0 16 10h11 l5 -136h-15q-17 68 -42.5 95.5t-70.5 27.5q-34 0 -54.5 -17t-20.5 -51q0 -17 11.5 -36.5t31.5 -31.5zM266 77l13 -11l-16 -23q32 -31 79 -31q37 0 60 21.5t23 53.5q0 46 -53 75l-54 30q-120 67 -120 145q0 50 28 81h-72v-286q0 -48 12 -69t40 -21q30 0 60 35z" />
+<glyph unicode="&#x2a7;" horiz-adv-x="483" d="M154 450h125q0 82 16 129q36 104 152 104q38 0 65.5 -15t27.5 -41q0 -16 -12.5 -27t-27.5 -11q-22 0 -47 30t-42 30q-48 0 -48 -102v-593q0 -82 -44 -134.5t-128 -52.5q-38 0 -65.5 15t-27.5 41q0 16 12.5 27t27.5 11q22 0 47 -30t42 -30q52 0 52 90v143 q-71 -44 -117 -44q-92 0 -92 126v302h-53q-4 2 -4 6q0 7 6 12t18 13t20 16q8 7 14.5 14l14.5 16l11 14l13 17l10 16l14 18l13 19q7 0 7 -13v-116zM279 63v355h-125v-287q0 -89 51 -89q39 0 74 21z" />
+<glyph unicode="&#x2a8;" horiz-adv-x="650" d="M154 418v-286q0 -48 12 -69t40 -21q41 0 93 24q-49 63 -49 153q0 115 67.5 181t153.5 66q64 0 107 -31q45 -33 45 -70q0 -18 -12.5 -31t-34.5 -13q-36 0 -48 46q-6 24 -9 33.5t-10.5 20t-19 13.5t-31.5 3q-18 0 -38 -7.5t-42 -25.5t-36.5 -55.5t-14.5 -89.5 q0 -76 56 -146q52 33 84 45t74 12q40 0 70 -24.5t30 -64.5q0 -42 -32 -66.5t-91 -24.5q-88 0 -130 15q-33 12 -68 39q-50 -30 -85.5 -42t-76.5 -12q-88 0 -88 127v301h-53q-4 3 -4 7q0 8 17 19q38 22 97 107q2 3 9.5 12.5t10.5 15.5q7 0 7 -13v-116h101v-32h-101zM609 82 q0 27 -21.5 44.5t-47.5 17.5q-34 0 -58 -10t-79 -44q64 -64 119 -64q51 0 69 15.5t18 40.5z" />
+<glyph unicode="&#x2ae;" horiz-adv-x="619" d="M612 450v-14q-43 -6 -53.5 -20t-10.5 -67v-471q0 -32 9.5 -41.5t41.5 -9.5q9 0 12 1v-16l-27 -8q-77 -23 -115 -36l-5 3v304q-34 -45 -68.5 -64.5t-78.5 -19.5q-123 0 -123 159v182q0 52 -10.5 78t-39.5 26q-17 0 -42 -30t-47 -30q-15 0 -27.5 11t-12.5 27 q0 26 27.5 40.5t65.5 14.5q90 0 130 -60t40 -157v-101q0 -106 74 -106q30 0 55 14t57 49v241q0 52 -12 67t-56 20v14h216z" />
+<glyph unicode="&#x2af;" horiz-adv-x="679" d="M548 349v-458q0 -90 52 -90q17 0 42 30t47 30q15 0 27.5 -11t12.5 -27q0 -26 -27.5 -41t-65.5 -15q-85 0 -128.5 52.5t-43.5 135.5v120q-34 -45 -68.5 -64.5t-78.5 -19.5q-123 0 -123 159v182q0 52 -10.5 78t-39.5 26q-17 0 -42 -30t-47 -30q-15 0 -27.5 11t-12.5 27 q0 26 27.5 40.5t65.5 14.5q90 0 130 -60t40 -157v-101q0 -106 74 -106q30 0 55 14t57 49v241q0 52 -12 67t-56 20v14h216v-14q-43 -6 -53.5 -20t-10.5 -67z" />
+<glyph unicode="&#x2b0;" horiz-adv-x="378" d="M365 336h-159v11q33 4 42.5 15t9.5 47v153q0 79 -57 79q-40 0 -83 -48v-181q0 -38 9.5 -50t41.5 -15v-11h-162v11q32 4 40 14.5t8 48.5v356q0 24 -6.5 31t-31.5 7q-6 0 -9 -1v12l106 33l4 -2v-228q47 62 108 62q95 0 95 -115v-149q0 -41 7 -52.5t37 -16.5v-11z" />
+<glyph unicode="&#x2b1;" horiz-adv-x="378" d="M365 336h-159v11q31 4 41.5 14t10.5 45v155q0 80 -58 80q-41 0 -82 -48v-185q0 -37 10 -47.5t41 -13.5v-11h-162v11q32 5 40 14.5t8 48.5v299q0 58 39.5 98.5t98.5 40.5q53 0 90.5 -15.5t37.5 -39.5q0 -11 -8 -19t-20 -8q-5 0 -9 1.5t-7 2.5t-7 5t-6 7l-7 8q-5 6 -8 9 q-24 30 -53 30q-31 0 -57 -32q-21 -24 -21 -59v-120q47 62 109 62q94 0 94 -119v-149q0 -39 7.5 -49.5t36.5 -15.5v-11z" />
+<glyph unicode="&#x2b2;" horiz-adv-x="300" d="M244 813q0 -16 -11 -27t-28 -11q-16 0 -27 11t-11 27t11 27.5t27 11.5q17 0 28 -11t11 -28zM243 681v-347q0 -80 -32.5 -122.5t-95.5 -42.5q-31 0 -51 11.5t-20 30.5q0 12 9 20.5t22 8.5q17 0 37 -24q16 -21 31 -21q19 0 26 13q11 21 11 92v288q0 45 -25 45q-6 0 -30 -2 l-4 -1v12q59 18 119 41z" />
+<glyph unicode="&#x2b3;" horiz-adv-x="252" d="M121 680v-69q28 40 47 55t43 15q19 0 30 -10.5t11 -29.5q0 -33 -29 -33q-15 0 -30 15q-14 11 -20 11q-16 0 -34 -22t-18 -40v-168q0 -32 12.5 -43.5t50.5 -13.5v-11h-179v11q36 7 44.5 15.5t8.5 36.5v188q0 25 -6 35t-20 10q-10 0 -26 -3v12q54 17 111 40z" />
+<glyph unicode="&#x2b4;" horiz-adv-x="277" d="M257 680v-11q-36 -7 -44.5 -15.5t-8.5 -36.5v-188q0 -25 6 -35t20 -10q10 0 26 3v-12q-54 -17 -111 -40l-4 1v69q-28 -40 -47 -55t-43 -15q-19 0 -30 10.5t-11 29.5q0 33 29 33q15 0 30 -15q14 -11 20 -11q16 0 34 22t18 40v168q0 32 -12.5 43.5t-50.5 13.5v11h179z" />
+<glyph unicode="&#x2b5;" horiz-adv-x="325" d="M204 620v-199q0 -227 37 -227q13 0 31.5 22.5t35.5 22.5q11 0 20.5 -8t9.5 -21q0 -19 -21 -30.5t-49 -11.5q-45 0 -75.5 42.5t-41 93t-10.5 101.5q-28 -40 -47 -55t-43 -15q-41 0 -41 40q0 33 29 33q14 0 28.5 -13t21.5 -13q16 0 34 22t18 40v174q0 29 -15 39.5t-48 11.5 v11h179v-11q-34 -6 -43.5 -14.5t-9.5 -34.5z" />
+<glyph unicode="&#x2b6;" horiz-adv-x="390" d="M379 667h-8q-27 0 -45 -25l-94 -130q100 -25 100 -88q0 -39 -39 -64t-102 -25h-185v13q32 3 44 18q12 12 12 49v193q0 30 -9 42q-13 16 -47 17v13h180v-13q-32 -2 -44.5 -15t-12.5 -47v-84h31l120 159h99v-13zM129 497v-134q28 -5 40 -5q40 0 63 18t23 48q0 40 -46 62 q-22 11 -65 11h-15z" />
+<glyph unicode="&#x2b7;" horiz-adv-x="520" d="M512 680v-11q-11 -4 -16.5 -11t-14.5 -29l-104 -261q-15 -37 -21 -37q-5 0 -18 33l-68 177l-85 -180q-13 -30 -18 -30q-7 0 -20 34l-101 257q-12 29 -19.5 37.5t-20.5 9.5v11h135v-11q-19 -2 -26.5 -7.5t-7.5 -17.5q0 -13 4 -22l74 -197l69 150l-15 42q-11 30 -21 40 t-31 12v11h153v-11q-27 -4 -35.5 -9t-8.5 -17t13 -45l63 -169l68 167q12 32 12 51q0 16 -33 22v11h93z" />
+<glyph unicode="&#x2b8;" horiz-adv-x="370" d="M361 680v-12q-14 -2 -22.5 -9.5t-15.5 -28.5l-113 -309q-29 -80 -59 -112.5t-73 -32.5q-24 0 -38 12t-14 31q0 14 9.5 24.5t22.5 10.5q23 0 39 -10q10 -5 20 -5q15 0 37 33q10 15 20 43.5t10 38.5t-31 76l-100 213q-10 22 -39 25v12h154v-12q-43 -1 -43 -20q0 -11 10 -31 l84 -189l73 209q3 7 3 13q0 18 -35 18v12h101z" />
+<glyph unicode="&#x2b9;" horiz-adv-x="208" d="M90 432l93 212q10 23 19.5 31.5t25.5 8.5q29 0 29 -32q0 -14 -19 -41l-131 -190z" />
+<glyph unicode="&#x2ba;" horiz-adv-x="305" d="M19 432l93 212q10 23 19.5 31.5t25.5 8.5q29 0 29 -32q0 -14 -19 -41l-131 -190zM157 432l93 212q10 23 19.5 31.5t25.5 8.5q29 0 29 -32q0 -14 -19 -41l-131 -190z" />
+<glyph unicode="&#x2bb;" horiz-adv-x="333" d="M191 686l9 -19q-44 -28 -63 -57.5t-19 -48.5q0 -14 14 -14q2 0 10 2t14 2q24 0 43 -11.5t19 -38.5q0 -29 -18 -43.5t-40 -14.5q-11 0 -23 3.5t-26 13t-23 30t-9 49.5q0 47 41 92t71 55z" />
+<glyph unicode="&#x2bc;" horiz-adv-x="333" d="M106 443l-9 19q44 28 63 57.5t19 48.5q0 14 -14 14q-2 0 -10 -2t-14 -2q-24 0 -43 11.5t-19 38.5q0 29 18 43.5t40 14.5q11 0 23 -3.5t26 -13t23 -30t9 -49.5q0 -47 -41 -92t-71 -55z" />
+<glyph unicode="&#x2bd;" horiz-adv-x="333" d="M200 462l-9 -19q-30 10 -71 55t-41 92q0 29 9 49.5t23 30t26 13t23 3.5q22 0 40 -14.5t18 -43.5q0 -27 -19 -38.5t-43 -11.5q-6 0 -14 2t-10 2q-14 0 -14 -14q0 -19 19 -48.5t63 -57.5z" />
+<glyph unicode="&#x2be;" horiz-adv-x="198" d="M35 680h30q41 0 69.5 -28.5t28.5 -68.5q0 -41 -28.5 -69.5t-69.5 -28.5h-30v37h30q25 0 43 18t18 43t-17.5 42.5t-43.5 17.5h-30v37z" />
+<glyph unicode="&#x2bf;" horiz-adv-x="198" d="M163 485h-30q-41 0 -69.5 28.5t-28.5 69.5q0 40 28.5 68.5t69.5 28.5h30v-37h-30q-26 0 -43.5 -17.5t-17.5 -42.5t18 -43t43 -18h30v-37z" />
+<glyph unicode="&#x2c0;" horiz-adv-x="326" d="M93 446h12q54 0 88.5 30t34.5 75q0 46 -19.5 86t-55.5 40q-17 0 -32 -16t-19 -34q-11 -52 -41 -52q-17 0 -27.5 10.5t-10.5 24.5q0 32 34 55q37 25 90 25q156 0 156 -151q0 -69 -44 -116t-105 -47q-13 0 -18 1l-6 -82h-37v151z" />
+<glyph unicode="&#x2c1;" horiz-adv-x="326" d="M196 295l-6 82q-5 -1 -18 -1q-61 0 -105 47t-44 116q0 151 156 151q53 0 90 -25q34 -23 34 -55q0 -14 -10.5 -24.5t-27.5 -10.5q-30 0 -41 52q-4 18 -19 34t-32 16q-36 0 -55.5 -40t-19.5 -86q0 -45 34.5 -75t88.5 -30h12v-151h-37z" />
+<glyph unicode="&#x2c2;" horiz-adv-x="317" d="M285 419l-252 153v30l252 153v-68l-163 -100l163 -100v-68z" />
+<glyph unicode="&#x2c3;" horiz-adv-x="317" d="M285 572l-252 -153v68l163 100l-163 100v68l252 -153v-30z" />
+<glyph unicode="&#x2c4;" horiz-adv-x="317" d="M327 461h-68l-100 163l-100 -163h-68l153 252h30z" />
+<glyph unicode="&#x2c5;" horiz-adv-x="317" d="M327 713l-153 -252h-30l-153 252h68l100 -163l100 163h68z" />
+<glyph unicode="&#x2c6;" horiz-adv-x="333" d="M322 507h-34l-122 103l-121 -103h-34l124 167h62z" />
+<glyph unicode="&#x2c7;" horiz-adv-x="333" d="M322 674l-124 -167h-64l-123 167h35l120 -103l121 103h35z" />
+<glyph unicode="&#x2c8;" horiz-adv-x="278" d="M159 448h-40v265h40v-265z" />
+<glyph unicode="&#x2c9;" horiz-adv-x="334" d="M322 547h-311v54h311v-54z" />
+<glyph unicode="&#x2ca;" horiz-adv-x="333" d="M93 509l136 136q34 34 59 34q32 0 32 -36q0 -17 -35 -39l-152 -95h-40z" />
+<glyph unicode="&#x2cb;" horiz-adv-x="333" d="M249 509h-40l-152 95q-35 22 -35 39q0 36 32 36q25 0 59 -34z" />
+<glyph unicode="&#x2cc;" horiz-adv-x="278" d="M159 -195h-40v265h40v-265z" />
+<glyph unicode="&#x2cd;" horiz-adv-x="334" d="M323 -159h-312v55h312v-55z" />
+<glyph unicode="&#x2ce;" horiz-adv-x="333" d="M249 -192h-40l-154 96q-30 19 -30 43q0 32 36 32q21 0 43 -23z" />
+<glyph unicode="&#x2cf;" horiz-adv-x="333" d="M84 -192l147 148q23 23 42 23q35 0 35 -32q0 -23 -30 -42l-154 -97h-40z" />
+<glyph unicode="&#x2d0;" horiz-adv-x="333" d="M244 460l-55 -161h-45l-55 161h155zM244 19h-155l55 161h45z" />
+<glyph unicode="&#x2d1;" horiz-adv-x="333" d="M244 460l-55 -161h-45l-55 161h155z" />
+<glyph unicode="&#x2d2;" horiz-adv-x="333" d="M72 365h45q60 0 102.5 -42.5t42.5 -102.5t-42.5 -102.5t-102.5 -42.5h-45v55h45q37 0 63.5 26t26.5 64t-26.5 64t-63.5 26h-45v55z" />
+<glyph unicode="&#x2d3;" horiz-adv-x="333" d="M261 75h-45q-60 0 -102.5 42.5t-42.5 102.5t42.5 102.5t102.5 42.5h45v-55h-45q-38 0 -64 -26t-26 -64t26 -64t64 -26h45v-55z" />
+<glyph unicode="&#x2d4;" horiz-adv-x="333" d="M281 18h-230v40h95v147h40v-147h95v-40z" />
+<glyph unicode="&#x2d5;" horiz-adv-x="333" d="M281 165h-95v-147h-40v147h-95v40h230v-40z" />
+<glyph unicode="&#x2d6;" horiz-adv-x="333" d="M263 100h-77v-74h-38v74h-77v44h77v74h38v-74h77v-44z" />
+<glyph unicode="&#x2d7;" horiz-adv-x="333" d="M263 100h-192v44h192v-44z" />
+<glyph unicode="&#x2d8;" horiz-adv-x="335" d="M279 664h29q-18 -157 -142 -157q-69 0 -104 41.5t-35 115.5h29q20 -97 112 -97q40 0 64.5 21.5t46.5 75.5z" />
+<glyph unicode="&#x2d9;" horiz-adv-x="333" d="M217 572q0 -21 -14.5 -35t-35.5 -14q-20 0 -34.5 14.5t-14.5 34.5q0 21 13.5 35.5t35.5 14.5q23 0 36.5 -14t13.5 -36z" />
+<glyph unicode="&#x2da;" horiz-adv-x="333" d="M266 611q0 -41 -29.5 -70t-71.5 -29q-41 0 -69.5 29t-28.5 71q0 41 29.5 70t71.5 29q40 0 69 -29.5t29 -70.5zM232 612q0 27 -19.5 46t-47.5 19q-26 0 -45 -19.5t-19 -45.5q0 -28 19 -47t45 -19q28 0 47.5 19t19.5 47z" />
+<glyph unicode="&#x2db;" horiz-adv-x="333" d="M229 -73l20 -16q-28 -41 -52.5 -58.5t-58.5 -17.5q-33 0 -53.5 19.5t-20.5 54.5q0 53 54 91h46q-44 -35 -44 -70q0 -39 38 -39q32 0 71 36z" />
+<glyph unicode="&#x2dc;" horiz-adv-x="333" d="M302 638h29q-16 -57 -40 -81.5t-65 -24.5q-32 0 -81 24l-23 11q-24 11 -41 11q-35 0 -51 -46h-29q11 49 37 75t64 26q34 0 70 -18l24 -12q28 -15 53 -15q17 0 28.5 11t24.5 39z" />
+<glyph unicode="&#x2dd;" horiz-adv-x="333" d="M153 507l146 148q23 23 43 23q34 0 34 -30q0 -27 -29 -45l-154 -96h-40zM-3 507l146 148q23 23 43 23q34 0 34 -30q0 -27 -29 -45l-154 -96h-40z" />
+<glyph unicode="&#x2de;" horiz-adv-x="298" d="M243 322l20 -56q-10 -34 -24 -52q-22 -28 -60 -28q-27 0 -56 49q-28 48 -52 100q-4 -7 -10 -13.5t-12.5 -11t-14.5 -9l-13 -7.5l-11 -5q-6 -3 -7 -3l-3 48q2 1 9.5 6.5t13.5 9.5t14.5 12t16.5 18q17 22 27 63q1 -2 7.5 -22t12.5 -36t15.5 -39t20.5 -43.5t22 -35.5 q16 -21 30 -21q21 0 36 27q9 17 18 49z" />
+<glyph unicode="&#x2df;" horiz-adv-x="333" d="M284 628l-83 -85l81 -81l-34 -37l-83 83l-81 -83l-32 35l80 83l-84 85l36 34l81 -83l86 83z" />
+<glyph unicode="&#x2e0;" horiz-adv-x="378" d="M335 684v-10q-7 0 -13 -3.5t-9.5 -6t-7.5 -10.5l-5 -10q-2 -3 -5.5 -12.5t-3.5 -10.5l-76 -191q5 -11 17 -33t18.5 -36t12.5 -34.5t6 -38.5q0 -32 -19 -50.5t-51 -18.5q-71 0 -71 58q0 42 40 122l-65 157q-30 73 -42 93q-14 24 -37 25v10h133v-10q-31 0 -31 -21 q0 -10 14.5 -49t37 -93t23.5 -56q3 8 23 57.5t34 88t14 50.5q0 23 -31 23v10h94zM223 280q0 20 -42 93q-2 -6 -10.5 -26t-12.5 -34t-4 -28q0 -17 8 -30.5t24 -13.5t26.5 11t10.5 28z" />
+<glyph unicode="&#x2e1;" horiz-adv-x="215" d="M197 336h-176v11q35 3 46 15t11 43v352q0 27 -6.5 37.5t-24.5 10.5q-16 0 -28 -2v12q76 19 118 33l4 -3v-444q0 -31 10.5 -41.5t45.5 -12.5v-11z" />
+<glyph unicode="&#x2e2;" horiz-adv-x="291" d="M233 573h-11q-23 91 -80 91q-23 0 -39.5 -13t-16.5 -35q0 -32 45 -60q8 -5 39 -23t45 -29q46 -34 46 -74q0 -46 -34 -74q-29 -25 -80 -25q-23 0 -45 7q-20 7 -40 9q-12 -2 -15 -11h-11v115h12q18 -104 98 -104q26 0 43 15t17 40q0 24 -25 46q-16 12 -57 35t-60 41 q-28 28 -28 64q0 42 32 68q31 25 73 25q9 0 40 -9q27 -8 31 -8q9 0 12 11h9v-102z" />
+<glyph unicode="&#x2e3;" horiz-adv-x="380" d="M372 336h-160v12q19 1 25.5 4.5t6.5 14.5q0 6 -5 14l-72 98l-63 -84q-16 -26 -16 -33q0 -14 32 -14v-12h-115v12q19 1 28.5 8.5t28.5 31.5l91 118l-75 114q-19 29 -31 38.5t-30 9.5h-7v12h164v-12q-34 -1 -34 -17q0 -10 9 -24l39 -63l42 60q11 15 11 27q0 16 -32 17v12 h126v-12q-41 -2 -64 -35l-66 -95l101 -143q33 -47 66 -47v-12z" />
+<glyph unicode="&#x2e4;" horiz-adv-x="341" d="M166 415v166q-50 9 -85.5 40.5t-35.5 91.5q0 53 35 95t118 42q51 0 87 -24q34 -23 34 -54q0 -14 -10.5 -24.5t-27.5 -10.5q-30 0 -40 50q-4 19 -18.5 34.5t-32.5 15.5q-34 0 -53 -39.5t-19 -83.5q0 -46 34.5 -82t78.5 -36v-181q0 -40 9.5 -52.5t47.5 -14.5v-12h-184v12 q39 2 50.5 13t11.5 54z" />
+<glyph unicode="&#x2e5;" horiz-adv-x="413" d="M373 0h-50v612h-275v50h325v-662z" />
+<glyph unicode="&#x2e6;" horiz-adv-x="405" d="M365 0h-50v431h-275v50h275v181h50v-662z" />
+<glyph unicode="&#x2e7;" horiz-adv-x="405" d="M365 0h-50v306h-275v50h275v306h50v-662z" />
+<glyph unicode="&#x2e8;" horiz-adv-x="405" d="M365 0h-50v181h-275v50h275v431h50v-662z" />
+<glyph unicode="&#x2e9;" horiz-adv-x="405" d="M365 0h-325v50h275v612h50v-662z" />
+<glyph unicode="&#x2ec;" horiz-adv-x="333" d="M311 70l-132 -217h-26l-132 217h69l76 -120l76 120h69z" />
+<glyph unicode="&#x2ed;" horiz-adv-x="405" d="M395 611h-385v54h385v-54zM395 507h-385v54h385v-54z" />
+<glyph unicode="&#x300;" horiz-adv-x="0" d="M-147 507h-40l-154 96q-30 19 -30 43q0 32 36 32q21 0 43 -23z" />
+<glyph unicode="&#x301;" horiz-adv-x="0" d="M-371 507l145 148q22 23 43 23q36 0 36 -32q0 -24 -30 -43l-154 -96h-40z" />
+<glyph unicode="&#x302;" horiz-adv-x="0" d="M-75 507h-34l-122 103l-121 -103h-34l124 167h62z" />
+<glyph unicode="&#x303;" horiz-adv-x="0" d="M-94 638h29q-16 -57 -40 -81.5t-65 -24.5q-32 0 -81 24q-46 22 -64 22q-35 0 -51 -46h-29q11 49 37 75t64 26q34 0 70 -18q55 -28 77 -28q17 0 28.5 11.5t24.5 39.5z" />
+<glyph unicode="&#x304;" horiz-adv-x="0" d="M-74 547h-311v54h311v-54z" />
+<glyph unicode="&#x305;" horiz-adv-x="0" d="M20 770h-500v50h500v-50z" />
+<glyph unicode="&#x306;" horiz-adv-x="0" d="M-121 664h29q-18 -157 -142 -157q-69 0 -104 41.5t-35 115.5h29q20 -97 112 -97q40 0 64.5 21.5t46.5 75.5z" />
+<glyph unicode="&#x307;" horiz-adv-x="0" d="M-181 572q0 -21 -14.5 -35t-35.5 -14q-20 0 -34.5 14.5t-14.5 34.5q0 21 13.5 35.5t35.5 14.5q23 0 36.5 -14t13.5 -36z" />
+<glyph unicode="&#x308;" horiz-adv-x="0" d="M-81 572q0 -20 -15 -34.5t-36 -14.5q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5t35 -15t15 -35zM-280 572q0 -20 -15 -34.5t-36 -14.5q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5t35 -15t15 -35z" />
+<glyph unicode="&#x309;" horiz-adv-x="0" d="M-261 581h12q33 0 54.5 20t21.5 50q0 31 -11.5 54t-33.5 23q-14 0 -22 -10t-10.5 -22t-9.5 -22t-19 -10t-20 8.5t-8 19.5q0 24 24 41q25 18 61 18q104 0 104 -108q0 -49 -29.5 -82.5t-70.5 -33.5h-8l-2 -35h-33v89z" />
+<glyph unicode="&#x30a;" horiz-adv-x="0" d="M-130 611q0 -41 -29.5 -70t-71.5 -29q-41 0 -69.5 29t-28.5 71q0 41 29.5 70t71.5 29q40 0 69 -29.5t29 -70.5zM-164 612q0 27 -19.5 46t-47.5 19q-26 0 -45 -19.5t-19 -45.5q0 -28 19 -47t45 -19q28 0 47.5 19t19.5 47z" />
+<glyph unicode="&#x30b;" horiz-adv-x="0" d="M-245 507l146 148q23 23 43 23q34 0 34 -30q0 -27 -29 -45l-154 -96h-40zM-401 507l146 148q23 23 43 23q34 0 34 -30q0 -27 -29 -45l-154 -96h-40z" />
+<glyph unicode="&#x30c;" horiz-adv-x="0" d="M-74 674l-124 -167h-64l-123 167h35l120 -103l121 103h35z" />
+<glyph unicode="&#x30d;" horiz-adv-x="0" d="M-195 500h-55v200h55v-200z" />
+<glyph unicode="&#x30e;" horiz-adv-x="0" d="M-133 500h-55v200h55v-200zM-272 500h-54v200h54v-200z" />
+<glyph unicode="&#x30f;" horiz-adv-x="0" d="M-22 507h-40l-154 96q-29 18 -29 45q0 30 34 30q20 0 43 -23zM-178 507h-40l-154 96q-29 18 -29 45q0 30 34 30q20 0 43 -23z" />
+<glyph unicode="&#x310;" horiz-adv-x="0" d="M-181 717q0 -21 -14.5 -35t-35.5 -14q-20 0 -34.5 14.5t-14.5 34.5q0 21 13.5 35.5t35.5 14.5q23 0 36.5 -14t13.5 -36zM-121 664h29q-18 -157 -142 -157q-69 0 -104 41.5t-35 115.5h29q20 -97 112 -97q40 0 64.5 21.5t46.5 75.5z" />
+<glyph unicode="&#x311;" horiz-adv-x="0" d="M-92 507h-29q-22 54 -46.5 75.5t-64.5 21.5q-92 0 -112 -97h-29q0 74 35 115.5t104 41.5q124 0 142 -157z" />
+<glyph unicode="&#x312;" horiz-adv-x="0" d="M-187 745l9 -19q-44 -28 -63 -57.5t-19 -48.5q0 -14 14 -14q2 0 10 2t14 2q24 0 43 -11.5t19 -38.5q0 -29 -18 -43.5t-40 -14.5q-11 0 -23 3.5t-26 13t-23 30t-9 49.5q0 47 41 92t71 55z" />
+<glyph unicode="&#x313;" horiz-adv-x="0" d="M-272 502l-9 19q44 28 63 57.5t19 48.5q0 14 -14 14q-2 0 -10 -2t-14 -2q-24 0 -43 11.5t-19 38.5q0 29 18 43.5t40 14.5q11 0 23 -3.5t26 -13t23 -30t9 -49.5q0 -47 -41 -92t-71 -55z" />
+<glyph unicode="&#x314;" horiz-adv-x="0" d="M-178 521l-9 -19q-30 10 -71 55t-41 92q0 29 9 49.5t23 30t26 13t23 3.5q22 0 40 -14.5t18 -43.5q0 -27 -19 -38.5t-43 -11.5q-6 0 -14 2t-10 2q-14 0 -14 -14q0 -19 19 -48.5t63 -57.5z" />
+<glyph unicode="&#x315;" horiz-adv-x="0" d="M-58 502l-9 19q44 28 63 57.5t19 48.5q0 14 -14 14q-2 0 -10 -2t-14 -2q-24 0 -43 11.5t-19 38.5q0 29 18 43.5t40 14.5q11 0 23 -3.5t26 -13t23 -30t9 -49.5q0 -47 -41 -92t-71 -55z" />
+<glyph unicode="&#x316;" horiz-adv-x="0" d="M-127 -224h-40l-154 96q-30 19 -30 43q0 32 36 32q21 0 43 -23z" />
+<glyph unicode="&#x317;" horiz-adv-x="0" d="M-371 -224l145 148q22 23 43 23q36 0 36 -32q0 -24 -30 -43l-154 -96h-40z" />
+<glyph unicode="&#x318;" horiz-adv-x="0" d="M-210 -283h-40v95h-147v40h147v95h40v-230z" />
+<glyph unicode="&#x319;" horiz-adv-x="0" d="M-80 -188h-147v-95h-40v230h40v-95h147v-40z" />
+<glyph unicode="&#x31a;" horiz-adv-x="0" d="M-80 531h-55v149h-245v55h300v-204z" />
+<glyph unicode="&#x31b;" horiz-adv-x="0" d="M-36 345v22q27 6 27 15q0 2 -17.5 17t-17.5 34q0 15 13.5 28t32.5 13t34 -15.5t15 -40.5q0 -38 -33 -57q-19 -11 -54 -16z" />
+<glyph unicode="&#x31c;" horiz-adv-x="0" d="M-232 -266h-30q-40 0 -69 29t-29 69t28.5 68.5t69.5 28.5h30v-37h-30q-26 0 -43.5 -17.5t-17.5 -42.5q0 -26 17.5 -43.5t43.5 -17.5h30v-37z" />
+<glyph unicode="&#x31d;" horiz-adv-x="0" d="M-115 -240h-230v40h95v147h40v-147h95v-40z" />
+<glyph unicode="&#x31e;" horiz-adv-x="0" d="M-115 -93h-95v-147h-40v147h-95v40h230v-40z" />
+<glyph unicode="&#x31f;" horiz-adv-x="0" d="M-134 -168h-77v-82h-38v82h-77v44h77v71h38v-71h77v-44z" />
+<glyph unicode="&#x320;" horiz-adv-x="0" d="M-134 -168h-192v44h192v-44z" />
+<glyph unicode="&#x321;" horiz-adv-x="0" d="M1 75v-223q0 -58 -31 -98.5t-77 -40.5q-53 0 -90.5 15.5t-37.5 39.5q0 11 8 19t20 8q7 0 14 -3.5t9.5 -6t10 -11.5t9.5 -11q27 -31 54 -31q56 0 56 91v252h55z" />
+<glyph unicode="&#x322;" horiz-adv-x="0" d="M1 75v-252q0 -91 56 -91q27 0 54 31q3 3 8 9l7 9q3 3 7.5 7t9.5 5.5t11 1.5q12 0 20 -8t8 -19q0 -24 -37.5 -39.5t-90.5 -15.5q-46 0 -77 40.5t-31 98.5v223h55z" />
+<glyph unicode="&#x323;" horiz-adv-x="0" d="M-181 -168q0 -21 -14.5 -35t-35.5 -14q-20 0 -34.5 14.5t-14.5 34.5q0 21 13.5 35.5t35.5 14.5q23 0 36.5 -14t13.5 -36z" />
+<glyph unicode="&#x324;" horiz-adv-x="0" d="M-81 -168q0 -21 -15 -35.5t-36 -14.5q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5t35 -14.5t15 -34.5zM-280 -168q0 -21 -15 -35.5t-36 -14.5q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5t35 -14.5t15 -34.5z" />
+<glyph unicode="&#x325;" horiz-adv-x="0" d="M-130 -168q0 -41 -29.5 -70.5t-71.5 -29.5q-41 0 -69.5 29t-28.5 71q0 41 29.5 70t71.5 29q40 0 69 -29.5t29 -69.5zM-164 -168q0 27 -19.5 46t-47.5 19q-26 0 -45 -19.5t-19 -45.5q0 -28 19 -47t45 -19q28 0 47.5 19t19.5 47z" />
+<glyph unicode="&#x326;" horiz-adv-x="0" d="M-272 -353l-9 19q44 28 63 57.5t19 48.5q0 14 -14 14q-2 0 -10 -2t-14 -2q-24 0 -43 11.5t-19 38.5q0 29 18 43.5t40 14.5q11 0 23 -3.5t26 -13t23 -30t9 -49.5q0 -47 -41 -92t-71 -55z" />
+<glyph unicode="&#x327;" horiz-adv-x="0" d="M-212 0l-25 -65q15 3 26 3q41 0 63.5 -18t22.5 -51q0 -39 -33.5 -61.5t-91.5 -22.5q-45 0 -84 16l14 31q36 -12 65 -12q25 0 40 12t15 32q0 19 -12 27.5t-41 8.5q-17 0 -28 -4l-7 5l41 99h35z" />
+<glyph unicode="&#x328;" horiz-adv-x="0" d="M-157 -73l20 -16q-28 -41 -52.5 -58.5t-58.5 -17.5q-33 0 -53.5 19.5t-20.5 54.5q0 53 54 91h46q-44 -35 -44 -70q0 -39 38 -39q32 0 71 36z" />
+<glyph unicode="&#x329;" horiz-adv-x="0" d="M-210 -234h-40v132h40v-132z" />
+<glyph unicode="&#x32a;" horiz-adv-x="0" d="M-73 -235h-55v82h-202v-82h-55v137h312v-137z" />
+<glyph unicode="&#x32b;" horiz-adv-x="0" d="M-75 -110v-35q0 -38 -23.5 -60t-63.5 -22q-23 0 -43 10t-25 24q-15 -34 -61 -34q-41 0 -65 22.5t-24 59.5v35h40v-36q0 -41 47 -41q23 0 33 9.5t10 31.5v36h40v-35q0 -20 13 -31t33 -11q49 0 49 42v35h40z" />
+<glyph unicode="&#x32c;" horiz-adv-x="0" d="M-74 -73l-124 -167h-64l-123 167h35l120 -103l121 103h35z" />
+<glyph unicode="&#x32d;" horiz-adv-x="0" d="M-74 -240h-34l-122 103l-121 -103h-34l124 167h62z" />
+<glyph unicode="&#x32e;" horiz-adv-x="0" d="M-118 -68h29q-18 -157 -142 -157q-69 0 -104 41.5t-35 115.5h29q20 -97 112 -97q40 0 64.5 21.5t46.5 75.5z" />
+<glyph unicode="&#x32f;" horiz-adv-x="0" d="M-89 -216h-29q-22 54 -46.5 75.5t-64.5 21.5q-92 0 -112 -97h-29q0 74 35 115.5t104 41.5q124 0 142 -157z" />
+<glyph unicode="&#x330;" horiz-adv-x="0" d="M-94 -113h29q-16 -57 -40 -81.5t-65 -24.5q-32 0 -81 24q-46 22 -64 22q-35 0 -51 -46h-29q11 49 37 75t64 26q34 0 70 -18q55 -28 77 -28q17 0 28.5 11.5t24.5 39.5z" />
+<glyph unicode="&#x331;" horiz-adv-x="0" d="M-74 -195h-311v54h311v-54z" />
+<glyph unicode="&#x332;" horiz-adv-x="0" d="M20 -191h-500v50h500v-50z" />
+<glyph unicode="&#x333;" horiz-adv-x="0" d="M20 -300h-500v50h500v-50zM20 -191h-500v50h500v-50z" />
+<glyph unicode="&#x334;" horiz-adv-x="0" d="M-100 320h29q-16 -57 -40 -81.5t-65 -24.5q-32 0 -81 24q-46 22 -64 22q-35 0 -51 -46h-29q11 49 37 75t64 26q34 0 70 -18q55 -28 77 -28q17 0 28.5 11.5t24.5 39.5z" />
+<glyph unicode="&#x335;" horiz-adv-x="0" d="M-78 230h-306v44h306v-44z" />
+<glyph unicode="&#x336;" horiz-adv-x="0" d="M20 230h-500v44h500v-44z" />
+<glyph unicode="&#x337;" horiz-adv-x="0" d="M-41 580l-285 -654h-54l285 654h54z" />
+<glyph unicode="&#x338;" horiz-adv-x="0" d="M31 662l-357 -818h-54l357 818h54z" />
+<glyph unicode="&#x339;" horiz-adv-x="0" d="M-280 -71h30q41 0 69.5 -28.5t28.5 -68.5t-29 -69t-69 -29h-30v37h30q26 0 43.5 17.5t17.5 43.5q0 25 -17.5 42.5t-43.5 17.5h-30v37z" />
+<glyph unicode="&#x33a;" horiz-adv-x="0" d="M-73 -190h-312v137h55v-82h202v82h55v-137z" />
+<glyph unicode="&#x33b;" horiz-adv-x="0" d="M-147 -227h-166v174h166v-174zM-187 -187v94h-86v-94h86z" />
+<glyph unicode="&#x33c;" horiz-adv-x="0" d="M-79 -91v-51q-36 22 -69 22q-39 0 -71 -69h-20q-14 25 -21 36t-23 22t-38 11q-24 0 -59 -22v51q39 26 65 26q53 0 85 -53q37 53 86 53q27 0 65 -26z" />
+<glyph unicode="&#x33d;" horiz-adv-x="0" d="M-135 688l-67 -68l65 -65l-26 -30l-67 67l-66 -65l-26 28l64 65l-68 68l29 27l67 -67l68 67z" />
+<glyph unicode="&#x33e;" horiz-adv-x="0" d="M-177 829v-29q-46 -16 -46 -51q0 -18 22 -64q24 -49 24 -81q0 -41 -24.5 -65t-81.5 -40v29q28 13 39.5 24.5t11.5 28.5q0 22 -28 77q-18 36 -18 70q0 38 26 64t75 37z" />
+<glyph unicode="&#x33f;" horiz-adv-x="0" d="M20 770h-500v50h500v-50zM20 878h-500v50h500v-50z" />
+<glyph unicode="&#x346;" horiz-adv-x="0" d="M-68 538h-54v89h-173v-89h-55v143h282v-143z" />
+<glyph unicode="&#x34c;" horiz-adv-x="0" d="M-85 777h29q-16 -57 -40 -81.5t-65 -24.5q-32 0 -81 24l-23 11q-24 11 -41 11q-35 0 -51 -46h-29q11 49 37.5 75t63.5 26q34 0 70 -18l24 -12q29 -15 53 -15q17 0 28.5 11t24.5 39zM-85 638h29q-16 -57 -40 -81.5t-65 -24.5q-32 0 -81 24l-23 11q-24 11 -41 11 q-35 0 -51 -46h-29q11 49 37.5 75t63.5 26q34 0 70 -18l24 -12q29 -15 53 -15q17 0 28.5 11t24.5 39z" />
+<glyph unicode="&#x359;" horiz-adv-x="0" d="M-87 -157q0 -13 -17 -22q-5 -3 -41 -12.5t-65 -26.5q25 -14 62.5 -24t43.5 -14q15 -7 15 -23q0 -11 -7 -18.5t-20 -7.5q-14 0 -43 31.5t-56 46.5q0 -27 10.5 -66t10.5 -47q0 -9 -8.5 -18t-17.5 -9q-10 0 -18.5 9t-8.5 18q0 8 10 47t10 66q-21 -11 -50 -40t-34 -32 q-9 -6 -18 -6q-12 0 -19 6.5t-7 15.5q0 20 14 27q7 4 47 15t60 23q-20 12 -61 23.5t-49 16.5q-13 8 -13 21q0 11 7 20.5t18 9.5q5 0 15 -5q7 -4 37.5 -34t52.5 -42q0 28 -10 68t-10 48q0 10 8.5 18.5t18.5 8.5q9 0 17.5 -8.5t8.5 -18.5q0 -8 -10.5 -47.5t-10.5 -67.5 q30 16 56.5 44t31.5 31q10 5 15 5q11 0 18 -9.5t7 -20.5z" />
+<glyph unicode="&#x35c;" horiz-adv-x="0" d="M266 -76h29q0 -40 -25.5 -70t-62 -46t-86 -26t-86.5 -12.5t-74 -2.5t-74 2.5t-86.5 12.5t-86 26t-62 46t-25.5 70h29q6 -29 44 -50t91 -30.5t94.5 -13t75.5 -3.5t75.5 3.5t94.5 13t91 30.5t44 50z" />
+<glyph unicode="&#x360;" horiz-adv-x="0" d="M336 618h29q-18 -101 -172 -101q-107 0 -265 39q-92 22 -155 22h-8q-117 1 -131 -46h-29q18 101 172 101q69 0 158 -21q162 -40 262 -40h8q117 -1 131 46z" />
+<glyph unicode="&#x361;" horiz-adv-x="0" d="M295 507h-29q-6 29 -44 50t-91 30.5t-94.5 13t-75.5 3.5t-75.5 -3.5t-94.5 -13t-91 -30.5t-44 -50h-29q0 40 25.5 70t62 46t86 26t86.5 12.5t74 2.5t74 -2.5t86.5 -12.5t86 -26t62 -46t25.5 -70z" />
+<glyph unicode="&#x362;" horiz-adv-x="0" d="M355 -160v-15q-46 -19 -113 -95l-19 19l27 33q6 8 6 14q0 9 -12 9h-639v55h640q3 0 7.5 3.5t4.5 7.5q0 3 -7 12l-27 33l20 19q65 -75 112 -95z" />
+<glyph unicode="&#x37e;" horiz-adv-x="278" d="M191 403q0 -23 -16.5 -39t-38.5 -16q-23 0 -39.5 16.5t-16.5 38.5q0 24 16 40t40 16q22 0 38.5 -16.5t16.5 -39.5zM107 -141l-10 19q83 54 83 106q0 5 -4 9.5t-10 4.5q-3 0 -13 -2t-15 -2q-58 0 -58 52q0 24 17 40t42 16q34 0 57 -24.5t23 -64.5q0 -47 -30 -88t-82 -66z " />
+<glyph unicode="&#x384;" horiz-adv-x="277" d="M113 507l59 132q11 23 38 23q11 0 20.5 -7.5t9.5 -21.5q0 -13 -27 -45l-66 -81h-34z" />
+<glyph unicode="&#x385;" horiz-adv-x="333" d="M113 507l59 132q11 23 38 23q11 0 20.5 -7.5t9.5 -21.5q0 -13 -27 -45l-66 -81h-34zM316 557q0 -20 -15 -35t-35 -15t-34.5 15t-14.5 35q0 19 14.5 34t34.5 15t35 -14.5t15 -34.5zM117 557q0 -20 -15 -35t-35 -15t-34.5 15t-14.5 35q0 19 15 34t34 15q20 0 35 -14.5 t15 -34.5z" />
+<glyph unicode="&#x386;" horiz-adv-x="722" d="M707 0h-255v19l45 4q10 1 17 9.5t7 19.5q0 26 -19 70l-41 94h-262l-46 -114q-9 -23 -9 -42q0 -23 16.5 -32t53.5 -9v-19h-199v19q42 4 61 30.5t65 136.5l206 488h20l246 -563q22 -52 39.5 -70t54.5 -22v-19zM447 257l-116 275l-115 -275h231zM113 528l59 132q11 23 38 23 q11 0 20.5 -7.5t9.5 -21.5q0 -13 -27 -45l-66 -81h-34z" />
+<glyph unicode="&#x387;" horiz-adv-x="278" d="M192 403q0 -23 -16 -39t-39 -16t-39.5 16.5t-16.5 38.5q0 24 16 40t40 16q22 0 38.5 -16.5t16.5 -39.5z" />
+<glyph unicode="&#x388;" horiz-adv-x="750" d="M8 528l59 132q11 23 38 23q11 0 20.5 -7.5t9.5 -21.5q0 -13 -27 -45l-66 -81h-34zM737 169l-46 -169h-539v19q57 4 72 20.5t15 74.5v436q0 56 -15.5 73t-71.5 20v19h529l5 -143h-25q-8 49 -28 68.5t-74.5 28t-182.5 8.5q-22 0 -28.5 -6.5t-6.5 -29.5v-220h151 q63 0 83.5 18t29.5 78h23v-234h-23q-9 63 -29 80t-84 17h-151v-243q0 -30 21 -38.5t80 -8.5q132 0 182.5 25.5t84.5 106.5h28z" />
+<glyph unicode="&#x389;" horiz-adv-x="850" d="M8 528l59 132q11 23 38 23q11 0 20.5 -7.5t9.5 -21.5q0 -13 -27 -45l-66 -81h-34zM836 0h-279v19q58 4 73 22.5t15 82.5v191h-303v-202q0 -55 16 -73t71 -21l1 -19h-279v19q59 4 74 21.5t15 81.5v426q0 58 -15.5 74t-73.5 21v19h280v-19q-56 -5 -72.5 -21.5t-16.5 -73.5 v-189h303v189q0 58 -15.5 74t-73.5 21v19h280v-19q-56 -5 -72.5 -21.5t-16.5 -73.5v-437q0 -53 16.5 -70.5t72.5 -21.5v-19z" />
+<glyph unicode="&#x38a;" horiz-adv-x="470" d="M8 528l59 132q11 23 38 23q11 0 20.5 -7.5t9.5 -21.5q0 -13 -27 -45l-66 -81h-34zM449 0h-297v19q63 2 80 18.5t17 74.5v439q0 58 -16 73t-81 19v19h297v-19q-63 -3 -80.5 -19t-17.5 -73v-439q0 -56 18 -73.5t80 -19.5v-19z" />
+<glyph unicode="&#x38c;" horiz-adv-x="722" d="M8 528l59 132q11 23 38 23q11 0 20.5 -7.5t9.5 -21.5q0 -13 -27 -45l-66 -81h-34zM688 331q0 -154 -91 -249.5t-236 -95.5q-146 0 -236.5 96t-90.5 252q0 152 90.5 247t236.5 95t236.5 -97.5t90.5 -247.5zM574 337q0 85 -24 152.5t-67 103.5q-56 47 -123 47 q-85 0 -143 -67q-32 -36 -50.5 -102.5t-18.5 -138.5q0 -182 90 -265q49 -45 124 -45q78 0 129 48q83 80 83 267z" />
+<glyph unicode="&#x38e;" horiz-adv-x="840" d="M818 658v-19q-17 5 -32 5q-103 0 -178.5 -102t-75.5 -238v-193q0 -57 19 -73t84 -19v-19h-306v19q68 5 84.5 21.5t16.5 82.5v172q-22 175 -73 251.5t-132 77.5q-24 0 -73 -18l-8 16q26 23 63 37.5t71 14.5q192 0 230 -239h2q21 104 92.5 170t151.5 66q39 0 64 -13zM8 528 l59 132q11 23 38 23q11 0 20.5 -7.5t9.5 -21.5q0 -13 -27 -45l-66 -81h-34z" />
+<glyph unicode="&#x38f;" horiz-adv-x="744" d="M715 0h-286l7 161q62 15 101.5 85t39.5 153q0 109 -54.5 175t-150.5 66t-150.5 -72t-54.5 -169q0 -78 38.5 -149t101.5 -89l9 -161h-287v171h25q1 -45 14.5 -60.5t47.5 -15.5h151l-2 37q-106 30 -159 94t-53 171q0 109 87.5 194t231.5 85t231.5 -81.5t87.5 -197.5 q0 -204 -215 -265l-2 -37h154q59 0 62 74h25v-169zM8 528l59 132q11 23 38 23q11 0 20.5 -7.5t9.5 -21.5q0 -13 -27 -45l-66 -81h-34z" />
+<glyph unicode="&#x390;" horiz-adv-x="340" d="M286 107l15 -8q-52 -109 -113 -109q-59 0 -59 88v266q0 49 -33 49q-23 0 -42 -4v18q63 19 155 53l4 -4v-377q0 -23 20 -23q16 0 25.5 9.5t27.5 41.5zM113 507l59 132q11 23 38 23q11 0 20.5 -7.5t9.5 -21.5q0 -13 -27 -45l-66 -81h-34zM316 557q0 -20 -15 -35t-35 -15 t-34.5 15t-14.5 35q0 19 14.5 34t34.5 15t35 -14.5t15 -34.5zM117 557q0 -20 -15 -35t-35 -15t-34.5 15t-14.5 35q0 19 15 34t34 15q20 0 35 -14.5t15 -34.5z" />
+<glyph unicode="&#x391;" horiz-adv-x="722" d="M707 0h-255v19l45 4q10 1 17 9.5t7 19.5q0 26 -19 70l-41 94h-262l-46 -114q-9 -23 -9 -42q0 -23 16.5 -32t53.5 -9v-19h-199v19q42 4 61 30.5t65 136.5l206 488h20l246 -563q22 -52 39.5 -70t54.5 -22v-19zM447 257l-116 275l-115 -275h231z" />
+<glyph unicode="&#x392;" horiz-adv-x="667" d="M422 349v-1q80 -14 125.5 -56.5t45.5 -113.5q0 -83 -65 -130.5t-174 -47.5h-337v19q59 2 77.5 19.5t18.5 74.5v437q0 58 -17 73.5t-79 19.5v19h280q129 0 195.5 -43.5t66.5 -123.5q0 -65 -34.5 -98.5t-102.5 -47.5zM215 366h63q179 0 179 124q0 72 -49.5 103.5 t-168.5 31.5q-24 0 -24 -32v-227zM215 326v-244q0 -25 13.5 -35t48.5 -10q96 0 148.5 30t52.5 112q0 85 -52 116t-146 31h-65z" />
+<glyph unicode="&#x393;" horiz-adv-x="587" d="M577 494h-25q-8 75 -36.5 102.5t-103.5 27.5h-175q-21 0 -28.5 -8t-7.5 -32v-471q0 -58 16 -74.5t75 -19.5v-19h-281v19q57 4 72.5 22t15.5 83v427q0 55 -15 71.5t-72 20.5v19h560z" />
+<glyph unicode="&#x394;" horiz-adv-x="722" d="M675 0h-627l299 674h20zM524 92l-193 440l-195 -440h388z" />
+<glyph unicode="&#x395;" horiz-adv-x="611" d="M597 169l-46 -169h-539v19q57 4 72 20.5t15 74.5v436q0 56 -15.5 73t-71.5 20v19h530l4 -143h-25q-8 49 -28 68.5t-74.5 28t-182.5 8.5q-22 0 -28.5 -6.5t-6.5 -29.5v-220h151q63 0 83.5 18t29.5 78h23v-234h-23q-9 63 -29 80t-84 17h-151v-243q0 -30 21 -38.5t80 -8.5 q132 0 182.5 25.5t84.5 106.5h28z" />
+<glyph unicode="&#x396;" horiz-adv-x="612" d="M598 176l-25 -176h-563v15l437 609h-214q-99 0 -134 -35q-18 -19 -25.5 -37.5t-15.5 -60.5h-26l21 171h525v-15l-432 -609h252q78 0 117 28q23 16 34 37.5t26 72.5h23z" />
+<glyph unicode="&#x397;" horiz-adv-x="722" d="M703 0h-279v19q58 4 73 22.5t15 82.5v191h-303v-202q0 -55 16 -73t71 -21l1 -19h-279v19q59 4 74 21.5t15 81.5v426q0 58 -15.5 74t-73.5 21v19h280v-19q-56 -5 -72.5 -21.5t-16.5 -73.5v-189h303v189q0 58 -15.5 74t-73.5 21v19h280v-19q-56 -5 -72.5 -21.5t-16.5 -73.5 v-437q0 -53 16.5 -70.5t72.5 -21.5v-19z" />
+<glyph unicode="&#x398;" horiz-adv-x="722" d="M688 331q0 -154 -91 -249.5t-236 -95.5q-146 0 -236.5 96t-90.5 252q0 152 90.5 247t236.5 95t236.5 -97.5t90.5 -247.5zM574 337q0 85 -24 152.5t-67 103.5q-56 47 -123 47q-85 0 -143 -67q-32 -36 -50.5 -102.5t-18.5 -138.5q0 -182 90 -265q49 -45 124 -45 q78 0 129 48q83 80 83 267zM501 236h-25q-7 31 -20 46.5t-38 15.5h-105q-27 0 -39 -14t-24 -48h-25q10 37 10 87q0 68 -11 118h25q11 -33 23 -45.5t40 -12.5h106q46 0 58 58h25q-11 -44 -11 -80q0 -76 11 -125z" />
+<glyph unicode="&#x399;" horiz-adv-x="333" d="M315 0h-297v19q63 2 80 18.5t17 74.5v439q0 58 -16 73t-81 19v19h297v-19q-63 -3 -80.5 -19t-17.5 -73v-439q0 -56 18 -73.5t80 -19.5v-19z" />
+<glyph unicode="&#x39a;" horiz-adv-x="731" d="M723 0h-303v19l27 1q42 1 42 24q0 18 -32.5 56.5t-104.5 113.5l-100 103l-26 -21v-185q0 -56 16 -71.5t73 -20.5v-19h-282v19q59 3 75 22t16 84v424q0 56 -16 73t-74 21v19h282v-19q-61 -4 -75.5 -20t-14.5 -75v-200l178 164q43 40 60.5 61t17.5 38q0 16 -8.5 23t-32.5 8 l-25 1v19h259v-19q-51 -4 -77.5 -17.5t-78.5 -63.5l-186 -178l234 -256q62 -68 91.5 -88.5t64.5 -20.5v-19z" />
+<glyph unicode="&#x39b;" horiz-adv-x="702" d="M687 0h-255v19q4 0 12 0.5t12 0.5t10.5 0.5t10 1.5t8 2.5t7 4t5 6t3.5 7.5t1 10q0 22 -19 70l-160 411h-2l-167 -431q-9 -23 -9 -42q0 -23 16.5 -32t53.5 -9v-19h-199v19q43 4 63 31.5t63 135.5l196 488h20l236 -563q21 -51 38.5 -69.5t55.5 -22.5v-19z" />
+<glyph unicode="&#x39c;" horiz-adv-x="889" d="M864 0h-280v19q59 4 74.5 22.5t15.5 81.5v449l-255 -572h-14l-252 549v-398q0 -81 17 -105t76 -27v-19h-234v19q44 3 63 13t26.5 35.5t7.5 83.5v398q0 57 -17 73.5t-78 20.5v19h198l231 -502l221 502h199v-19q-54 -1 -70.5 -19t-16.5 -74v-438q0 -53 16.5 -71t71.5 -22 v-19z" />
+<glyph unicode="&#x39d;" horiz-adv-x="722" d="M707 662v-19q-51 -5 -66 -18q-16 -14 -22.5 -38t-6.5 -80v-518h-18l-441 549v-388q0 -76 17 -99.5t76 -31.5v-19h-234v19q62 7 79.5 29.5t17.5 101.5v440q-26 32 -44 42.5t-53 10.5v19h170l386 -483v340q0 76 -19 98q-12 13 -26.5 17.5t-52.5 8.5v19h237z" />
+<glyph unicode="&#x39e;" horiz-adv-x="643" d="M590 493h-25q-8 49 -25 68t-56 19h-325q-39 0 -56.5 -18.5t-24.5 -70.5h-25v171h537v-169zM503 218h-23q0 77 -69 77h-185q-32 0 -45 -19t-18 -58h-23v233h23q0 -41 16 -58.5t49 -17.5h186q35 0 50 17.5t16 58.5h23v-233zM614 0h-585v171h25q0 -43 23 -64.5t62 -21.5h358 q92 0 92 86h25v-171z" />
+<glyph unicode="&#x39f;" horiz-adv-x="722" d="M688 331q0 -154 -91 -249.5t-236 -95.5q-146 0 -236.5 96t-90.5 252q0 152 90.5 247t236.5 95t236.5 -97.5t90.5 -247.5zM574 337q0 85 -24 152.5t-67 103.5q-56 47 -123 47q-85 0 -143 -67q-32 -36 -50.5 -102.5t-18.5 -138.5q0 -182 90 -265q49 -45 124 -45 q78 0 129 48q83 80 83 267z" />
+<glyph unicode="&#x3a0;" horiz-adv-x="722" d="M703 0h-279v19q58 4 73 22.5t15 82.5v464q0 21 -7 28.5t-29 7.5h-231q-20 0 -28 -6.5t-8 -26.5v-478q0 -55 16 -73t71 -21l1 -19h-279v19q59 4 74 21.5t15 81.5v426q0 58 -15.5 74t-73.5 21v19h685v-19q-56 -5 -72.5 -21.5t-16.5 -73.5v-437q0 -53 16.5 -70.5t72.5 -21.5 v-19z" />
+<glyph unicode="&#x3a1;" horiz-adv-x="557" d="M16 662h259q142 0 217 -63q50 -42 50 -119q0 -80 -57 -131q-42 -38 -86 -49.5t-128 -11.5q-29 0 -69 3v-179q0 -57 16.5 -73.5t77.5 -19.5v-19h-280v19q58 4 71 21t13 82v429q0 56 -14.5 72t-69.5 20v19zM202 589v-258q34 -3 61 -3q81 0 125.5 39.5t44.5 107.5 q0 81 -46 115.5t-150 34.5q-21 0 -28 -7.5t-7 -28.5z" />
+<glyph unicode="&#x3a3;" horiz-adv-x="624" d="M600 204l-28 -204h-542v15l267 309l-267 323v15h526v-161h-25q-11 73 -45 98t-105 25h-208l212 -257l-237 -272h310q56 0 81.5 25t37.5 84h23z" />
+<glyph unicode="&#x3a4;" horiz-adv-x="611" d="M593 492h-25q-16 82 -44.5 105t-108.5 23h-59v-509q0 -57 17 -73t79 -19v-19h-292v19q63 4 78.5 21t15.5 83v497h-60q-81 0 -109 -23t-43 -105h-25l7 170h562z" />
+<glyph unicode="&#x3a5;" horiz-adv-x="722" d="M703 658v-19q-17 5 -32 5q-103 0 -178.5 -102t-75.5 -238v-193q0 -57 19 -73t84 -19v-19h-306v19q68 5 84.5 21.5t16.5 82.5v172q-22 175 -73 251.5t-132 77.5q-24 0 -73 -18l-8 16q26 23 63 37.5t71 14.5q192 0 230 -239h2q21 104 92.5 170t151.5 66q39 0 64 -13z" />
+<glyph unicode="&#x3a6;" horiz-adv-x="763" d="M432 580v-20q55 0 105.5 -13t94 -39.5t70 -72t26.5 -105.5q0 -56 -26.5 -101.5t-68 -72t-87.5 -40t-89 -13.5h-25v-17q0 -38 22.5 -51t80.5 -16v-19h-306v19q52 0 76.5 14.5t24.5 51.5v18h-17q-136 0 -207 62t-71 165q0 60 25.5 105.5t69 72t94 39.5t106.5 13v20 q0 36 -19.5 49.5t-81.5 13.5v19h306v-19q-62 0 -82.5 -15t-20.5 -48zM430 523v-383q75 0 132 48.5t57 129.5t-49.5 143t-139.5 62zM332 140v383q-80 0 -134 -63.5t-54 -141.5q0 -74 50.5 -126t137.5 -52z" />
+<glyph unicode="&#x3a7;" horiz-adv-x="722" d="M704 0h-296v19l26 2q50 3 50 29q0 22 -51 98l-95 141l-119 -149q-53 -66 -53 -89q0 -15 16.5 -22t59.5 -10v-19h-232v19q39 4 63.5 23t81.5 91l156 195l-106 155q-70 102 -101 128.5t-82 31.5v19h301v-19l-29 -1q-23 -1 -34.5 -7t-11.5 -22q0 -6 1.5 -12.5t6.5 -15.5 l8 -17l12 -20l15 -22l19 -28l21 -30l44 -64l112 140q40 49 40 67q0 17 -14 24t-54 8v19h237v-19q-48 -3 -76 -21.5t-76 -77.5l-143 -177l192 -274q29 -42 50 -55.5t61 -18.5v-19z" />
+<glyph unicode="&#x3a8;" horiz-adv-x="746" d="M724 690v-19q-26 -5 -36.5 -37.5t-10.5 -66.5q0 -15 2 -45t2 -45q0 -71 -37.5 -119t-93.5 -68t-126 -20v-159q0 -58 21.5 -74t81.5 -18v-19h-306v19q65 3 83 21.5t18 83.5v146q-70 0 -126 20t-93.5 68t-37.5 119q0 15 2 45t2 45q0 34 -10.5 66.5t-36.5 37.5v19 q155 0 155 -181q0 -33 2 -58t10.5 -53.5t22 -47t39 -31t60.5 -12.5h11v255q0 49 -24.5 65t-76.5 16v19h306v-19q-54 0 -78.5 -15t-24.5 -66v-255h11q35 0 60.5 12.5t39 31t22 47t10.5 53.5t2 58q0 181 155 181z" />
+<glyph unicode="&#x3a9;" horiz-adv-x="744" d="M715 0h-286l7 161q62 15 101.5 85t39.5 153q0 109 -54.5 175t-150.5 66t-150.5 -72t-54.5 -169q0 -78 38.5 -149t101.5 -89l9 -161h-287v171h25q1 -45 14.5 -60.5t47.5 -15.5h151l-2 37q-106 30 -159 94t-53 171q0 109 87.5 194t231.5 85t231.5 -81.5t87.5 -197.5 q0 -204 -215 -265l-2 -37h154q59 0 62 74h25v-169z" />
+<glyph unicode="&#x3aa;" horiz-adv-x="333" d="M316 823q0 -20 -15 -34.5t-36 -14.5q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5t35 -15t15 -35zM117 823q0 -20 -15 -34.5t-36 -14.5q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5t35 -15t15 -35zM315 0h-297v19q63 2 80 18.5t17 74.5v439q0 58 -16 73 t-81 19v19h297v-19q-63 -3 -80.5 -19t-17.5 -73v-439q0 -56 18 -73.5t80 -19.5v-19z" />
+<glyph unicode="&#x3ab;" horiz-adv-x="722" d="M703 658v-19q-17 5 -32 5q-103 0 -178.5 -102t-75.5 -238v-193q0 -57 19 -73t84 -19v-19h-306v19q68 5 84.5 21.5t16.5 82.5v172q-22 175 -73 251.5t-132 77.5q-24 0 -73 -18l-8 16q26 23 63 37.5t71 14.5q192 0 230 -239h2q21 104 92.5 170t151.5 66q39 0 64 -13z M515 823q0 -20 -15 -34.5t-36 -14.5q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5t35 -15t15 -35zM316 823q0 -20 -15 -34.5t-36 -14.5q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5t35 -15t15 -35z" />
+<glyph unicode="&#x3ac;" horiz-adv-x="543" d="M514 129h15q0 -59 -21.5 -99t-57.5 -40q-56 0 -80 110q-30 -54 -65 -82t-89 -28q-81 0 -134 65.5t-53 167.5q0 99 53.5 168t142.5 69q60 0 99.5 -42.5t54.5 -103.5l45 136h97l-109 -263q10 -46 29.5 -90.5t39.5 -44.5q24 0 33 77zM331 208q-33 224 -111 224 q-42 0 -71.5 -39.5t-29.5 -119.5q0 -34 4.5 -72t15 -82t33 -72.5t53.5 -28.5q70 0 106 190zM217 507l59 132q11 23 38 23q11 0 20.5 -7.5t9.5 -21.5q0 -13 -27 -45l-66 -81h-34z" />
+<glyph unicode="&#x3ad;" horiz-adv-x="439" d="M393 145l14 -9q-63 -146 -192 -146q-61 0 -102 14.5t-58.5 38t-23.5 42t-6 37.5q0 40 29.5 73t70.5 40q-36 10 -56.5 36t-20.5 58q0 54 52 92.5t142 38.5q61 0 108.5 -25t47.5 -78q0 -20 -14.5 -31t-32.5 -11t-31 12t-13 30q0 11 2 20.5t2 13.5q0 40 -87 40 q-42 0 -67.5 -28.5t-25.5 -68.5q0 -36 22 -60.5t62 -24.5q16 0 32.5 4.5t28.5 4.5q38 0 38 -21q0 -11 -12.5 -18.5t-35.5 -7.5q-8 0 -20.5 3t-23.5 3q-39 0 -73 -22.5t-34 -65.5q0 -41 31.5 -65t73.5 -24q53 0 94 26t79 79zM153 507l59 132q11 23 38 23q11 0 20.5 -7.5 t9.5 -21.5q0 -13 -27 -45l-66 -81h-34z" />
+<glyph unicode="&#x3ae;" horiz-adv-x="512" d="M452 -217h-85q-15 28 -15 86v439q0 97 -73 97q-46 0 -103 -57v-348h-84v313q0 75 -20 75q-25 0 -48 -49l-14 6q52 110 103 110q33 0 44 -15.5t16 -60.5h1q71 81 144 81q56 0 87 -39t31 -102v-451q0 -59 16 -85zM168 507l59 132q11 23 38 23q11 0 20.5 -7.5t9.5 -21.5 q0 -13 -27 -45l-66 -81h-34z" />
+<glyph unicode="&#x3af;" horiz-adv-x="275" d="M252 107l15 -8q-52 -109 -113 -109q-59 0 -59 88v266q0 49 -33 49q-23 0 -42 -4v18q63 19 155 53l4 -4v-377q0 -23 20 -23q16 0 25.5 9.5t27.5 41.5zM80 507l59 132q11 23 38 23q11 0 20.5 -7.5t9.5 -21.5q0 -13 -27 -45l-66 -81h-34z" />
+<glyph unicode="&#x3b0;" horiz-adv-x="524" d="M255 460h27q89 0 150.5 -61.5t61.5 -173.5q0 -98 -62 -166.5t-154 -68.5q-101 0 -140.5 56t-39.5 152v120q0 70 -20 70q-25 0 -48 -49l-14 6q52 110 103 110q63 0 63 -70v-211q0 -34 7.5 -66.5t32 -61t62.5 -28.5q61 0 90.5 54t29.5 137q0 107 -50 173q-42 54 -99 58v20z M201 507l59 132q11 23 38 23q11 0 20.5 -7.5t9.5 -21.5q0 -13 -27 -45l-66 -81h-34zM404 557q0 -20 -15 -35t-35 -15t-34.5 15t-14.5 35q0 19 14.5 34t34.5 15t35 -14.5t15 -34.5zM205 557q0 -20 -15 -35t-35 -15t-34.5 15t-14.5 35q0 19 15 34t34 15q20 0 35 -14.5 t15 -34.5z" />
+<glyph unicode="&#x3b1;" horiz-adv-x="543" d="M514 129h15q0 -59 -21.5 -99t-57.5 -40q-56 0 -80 110q-30 -54 -65 -82t-89 -28q-81 0 -134 65.5t-53 167.5q0 99 53.5 168t142.5 69q60 0 99.5 -42.5t54.5 -103.5l45 136h97l-109 -263q10 -46 29.5 -90.5t39.5 -44.5q24 0 33 77zM331 208q-33 224 -111 224 q-42 0 -71.5 -39.5t-29.5 -119.5q0 -34 4.5 -72t15 -82t33 -72.5t53.5 -28.5q70 0 106 190z" />
+<glyph unicode="&#x3b2;" horiz-adv-x="496" d="M344 399l2 -1q56 -13 88 -61t32 -109q0 -94 -59 -166t-145 -72q-34 0 -57.5 8.5t-49.5 32.5v-167q0 -44 -16 -81h-84q16 34 16 81v509q0 310 196 310q62 0 111 -45t49 -110q0 -38 -15 -69q-22 -42 -68 -60zM155 485v-396q0 -23 32.5 -45t71.5 -22q55 0 88 51t33 129 q0 62 -15.5 105t-33.5 58.5t-35 15.5q-11 0 -23.5 -3.5t-22.5 -3.5q-17 0 -28 7t-11 18q0 22 42 22q4 0 24 -4t28 -4q20 0 30.5 24.5t10.5 55.5q0 29 -4.5 55t-14.5 51.5t-30 40.5t-48 15q-45 0 -69.5 -42t-24.5 -113v-15z" />
+<glyph unicode="&#x3b3;" horiz-adv-x="474" d="M444 450l-186 -450q14 -63 14 -118q0 -100 -61 -100q-24 0 -36.5 19t-12.5 49q0 41 18 98q1 5 33 88q-38 351 -130 351q-18 0 -35.5 -23t-22.5 -65h-15q0 66 22 112t65 46q33 0 57.5 -27.5t39 -76t22.5 -90.5t14.5 -97t9.5 -69l104 353h100z" />
+<glyph unicode="&#x3b4;" horiz-adv-x="500" d="M221 425v1q-68 28 -102.5 64t-34.5 88t51.5 78.5t112.5 26.5q59 0 114 -20t55 -55q0 -16 -8.5 -29.5t-26.5 -13.5q-21 0 -36 12t-24.5 26t-37.5 26t-72 12q-30 0 -60 -15.5t-30 -45.5q0 -26 32.5 -47.5t98 -50t100.5 -49.5q117 -72 117 -202q0 -105 -61 -173t-163 -68 q-95 0 -156 68t-61 158q0 78 51.5 137.5t140.5 71.5zM380 208q0 56 -35 117.5t-90 73.5q-64 0 -100 -47t-36 -111q0 -37 13.5 -85.5t38.5 -86.5q15 -23 40.5 -37t48.5 -14q57 0 88.5 50t31.5 140z" />
+<glyph unicode="&#x3b5;" horiz-adv-x="439" d="M393 145l14 -9q-63 -146 -192 -146q-61 0 -102 14.5t-58.5 38t-23.5 42t-6 37.5q0 40 29.5 73t70.5 40q-36 10 -56.5 36t-20.5 58q0 54 52 92.5t142 38.5q61 0 108.5 -25t47.5 -78q0 -20 -14.5 -31t-32.5 -11t-31 12t-13 30q0 11 2 20.5t2 13.5q0 40 -87 40 q-42 0 -67.5 -28.5t-25.5 -68.5q0 -36 22 -60.5t62 -24.5q16 0 32.5 4.5t28.5 4.5q38 0 38 -21q0 -11 -12.5 -18.5t-35.5 -7.5q-8 0 -20.5 3t-23.5 3q-39 0 -73 -22.5t-34 -65.5q0 -41 31.5 -65t73.5 -24q53 0 94 26t79 79z" />
+<glyph unicode="&#x3b6;" horiz-adv-x="441" d="M153 683l9 -15q-30 -14 -46 -34.5t-16 -37.5q0 -19 11 -30t22.5 -14t33.5 -6q22 37 68.5 73.5t82.5 36.5q39 0 39 -34t-52.5 -67.5t-115.5 -39.5q-42 -47 -74.5 -124t-32.5 -157q0 -154 124 -154q9 0 24.5 1t26.5 1q77 0 113.5 -34.5t36.5 -107.5q0 -64 -47 -111t-96 -47 q-31 0 -51.5 14.5t-20.5 41.5q0 18 11 29.5t31 11.5q10 0 28 -14.5t33 -14.5q32 0 56.5 23t24.5 58q0 32 -25 50t-65 18q-3 0 -41 -4.5t-55 -4.5q-155 0 -155 210q0 90 24.5 159t84.5 156l-1 3q-32 0 -60 20t-28 55q0 63 98 90z" />
+<glyph unicode="&#x3b7;" horiz-adv-x="512" d="M452 -217h-85q-15 28 -15 86v439q0 97 -73 97q-46 0 -103 -57v-348h-84v313q0 75 -20 75q-25 0 -48 -49l-14 6q52 110 103 110q33 0 44 -15.5t16 -60.5h1q71 81 144 81q56 0 87 -39t31 -102v-451q0 -59 16 -85z" />
+<glyph unicode="&#x3b8;" horiz-adv-x="496" d="M468 333q0 -153 -59.5 -248t-165.5 -95q-132 0 -186 138q-30 76 -30 212q0 153 59.5 248t165.5 95q63 0 102 -21.5t68 -70.5q46 -77 46 -258zM117 354h261q0 36 -2 65.5t-6.5 66.5t-14.5 65t-24.5 52.5t-38.5 38t-54 13.5q-121 0 -121 -270v-31zM378 316v6h-261 q1 -63 6.5 -109.5t19 -94.5t42.5 -74t71 -26q61 0 91.5 80t30.5 218z" />
+<glyph unicode="&#x3b9;" horiz-adv-x="275" d="M252 107l15 -8q-52 -109 -113 -109q-59 0 -59 88v266q0 49 -33 49q-23 0 -42 -4v18q63 19 155 53l4 -4v-377q0 -23 20 -23q16 0 25.5 9.5t27.5 41.5z" />
+<glyph unicode="&#x3ba;" horiz-adv-x="500" d="M503 0h-237v15h9q38 0 38 24q0 10 -16 29l-131 159v-227h-84v341q0 36 -9 48.5t-34 12.5q-6 0 -32 -2v16l30 8q60 16 125 36l4 -2v-200q60 67 106 110.5t76 62t47.5 24t35.5 5.5q28 0 43.5 -13.5t15.5 -34.5q0 -26 -15.5 -37.5t-34.5 -11.5q-12 0 -33 5.5t-31 5.5 q-35 0 -67.5 -20.5t-83.5 -74.5l173 -202q27 -32 49.5 -45t55.5 -17v-15z" />
+<glyph unicode="&#x3bb;" horiz-adv-x="497" d="M477 137h15q-1 -65 -23 -106.5t-61 -41.5q-52 0 -80 101l-72 265l-144 -355h-100l215 450l-13 45q-15 53 -38.5 85.5t-47.5 32.5q-23 0 -38.5 -16.5t-21.5 -60.5h-15q0 58 20 102.5t62 44.5q39 0 61 -35.5t45 -115.5l112 -390q24 -83 64 -83q17 0 36 19.5t24 58.5z" />
+<glyph unicode="&#x3bc;" horiz-adv-x="528" d="M501 106l15 -7q-53 -109 -110 -109q-61 0 -61 81h-2q-56 -81 -125 -81q-49 0 -63 28h-2v-149q0 -52 -16 -86h-82q16 37 16 85v582h84v-312q0 -41 26.5 -65.5t59.5 -24.5q47 0 81 31q14 12 18.5 22.5t4.5 34.5v314h84v-337q0 -57 20 -57q15 0 25.5 10t26.5 40z" />
+<glyph unicode="&#x3bd;" horiz-adv-x="455" d="M424 460h19q0 -143 -37 -228q-38 -87 -112 -155t-176 -91h-23v358q0 49 -33 49q-25 0 -42 -4v18q63 19 155 53l4 -4v-366h1q65 11 123.5 77.5t89.5 147.5t31 145z" />
+<glyph unicode="&#x3be;" horiz-adv-x="441" d="M177 683l8 -16q-59 -20 -59 -58q0 -43 39 -46q73 52 138 52q46 0 46 -33q0 -26 -43 -46t-94 -20q-34 0 -51.5 -19.5t-17.5 -46.5q0 -39 35 -63q56 47 128 47q29 0 46.5 -10.5t17.5 -29.5q0 -21 -21.5 -34t-44 -17t-43.5 -4q-39 0 -72 9q-50 -22 -79.5 -61t-29.5 -92 q0 -115 116 -115q10 0 33 1t28 1q150 0 150 -137q0 -68 -46.5 -115.5t-96.5 -47.5q-31 0 -51.5 14.5t-20.5 41.5q0 18 11 29.5t31 11.5q10 0 28 -14.5t33 -14.5q32 0 56.5 22.5t24.5 58.5q0 32 -25 50t-65 18q-4 0 -40 -4.5t-50 -4.5q-161 0 -161 173q0 61 30 115t80 90 q-42 28 -42 81q0 51 35 83q-24 3 -40.5 18.5t-16.5 43.5q0 63 96 89z" />
+<glyph unicode="&#x3bf;" horiz-adv-x="505" d="M473 228q0 -89 -66 -163.5t-155 -74.5q-90 0 -153.5 61.5t-63.5 150.5q0 101 62.5 179.5t161.5 78.5t156.5 -65.5t57.5 -166.5zM384 191q0 49 -13 100t-47.5 94t-84.5 43q-31 0 -54.5 -18.5t-36 -48t-18.5 -59.5t-6 -58q0 -46 14 -94.5t48.5 -88t82.5 -39.5 q37 0 64.5 29.5t39 66.5t11.5 73z" />
+<glyph unicode="&#x3c0;" horiz-adv-x="501" d="M467 137h15q0 -53 -31 -100t-81 -47q-41 0 -66.5 35.5t-25.5 86.5q0 94 16 254h-93q-1 -11 -1 -45t-1.5 -65t-4 -72t-9 -73.5t-16.5 -62t-26.5 -46t-38.5 -16.5q-33 0 -50 18t-17 46q0 16 23 23q20 6 31.5 15.5t26 37.5t24 87.5t13.5 152.5q-48 0 -77 -11t-53 -46h-16 q27 75 67.5 108t116.5 33h286v-84h-119q-10 -70 -10 -148q0 -71 6 -96q12 -49 49 -49q47 0 62 64z" />
+<glyph unicode="&#x3c1;" horiz-adv-x="496" d="M71 -132v284q0 308 188 308q88 0 147.5 -60.5t59.5 -152.5q0 -109 -58.5 -183t-147.5 -74q-33 0 -56 8t-49 32v-161q0 -54 -16 -86h-84q16 34 16 85zM155 273v-185q0 -22 34.5 -44t69.5 -22q54 0 87.5 53.5t33.5 136.5q0 102 -38 161t-95 59q-44 0 -68 -43t-24 -116z" />
+<glyph unicode="&#x3c2;" horiz-adv-x="441" d="M432 352q0 -19 -12 -34.5t-36 -15.5q-13 0 -27.5 11t-27 24t-37 24t-55.5 11q-60 0 -107.5 -41.5t-47.5 -119.5q0 -59 27.5 -92.5t96.5 -38.5h7q7 0 21 1t23 1q77 0 113.5 -34.5t36.5 -107.5q0 -64 -47 -111t-96 -47q-31 0 -51.5 14.5t-20.5 41.5q0 18 11 29.5t31 11.5 q10 0 28 -14.5t33 -14.5q32 0 56.5 23t24.5 58q0 32 -25 50t-65 18q-3 0 -41 -4.5t-55 -4.5q-72 0 -113.5 37t-41.5 139q0 120 79 207t169 87q72 0 110.5 -32.5t38.5 -75.5z" />
+<glyph unicode="&#x3c3;" horiz-adv-x="548" d="M518 366h-176q15 -22 39 -42.5t41.5 -33t31 -38.5t13.5 -64q0 -76 -67 -137t-161 -61q-85 0 -147.5 68t-62.5 157q0 115 60 175t150 60h279v-84zM377 171q0 61 -31 119t-73 76q-25 0 -49 -5.5t-49 -18.5t-40.5 -40.5t-15.5 -67.5q0 -85 44.5 -150.5t97.5 -65.5 q56 0 86 45.5t30 107.5z" />
+<glyph unicode="&#x3c4;" horiz-adv-x="477" d="M442 366h-170q-23 -124 -23 -184q0 -109 53 -109q25 0 43.5 18.5t25.5 51.5h15q0 -62 -30.5 -107.5t-78.5 -45.5q-56 0 -79.5 43.5t-23.5 108.5q0 90 40 224h-82q-40 0 -70 -24.5t-44 -65.5h-15q7 38 24.5 75.5t53.5 68t81 30.5h280v-84z" />
+<glyph unicode="&#x3c5;" horiz-adv-x="524" d="M255 460h27q89 0 150.5 -61.5t61.5 -173.5q0 -98 -62 -166.5t-154 -68.5q-101 0 -140.5 56t-39.5 152v120q0 70 -20 70q-25 0 -48 -49l-14 6q52 110 103 110q63 0 63 -70v-211q0 -34 7.5 -66.5t32 -61t62.5 -28.5q61 0 90.5 54t29.5 137q0 107 -50 173q-42 54 -99 58v20z " />
+<glyph unicode="&#x3c6;" horiz-adv-x="623" d="M269 18v135q0 60 2.5 99t14 87t33.5 76q35 45 95 45q70 0 124.5 -67.5t54.5 -170.5q0 -99 -62.5 -165.5t-177.5 -66.5v-207h-84v207l-24 1q-100 4 -158 71.5t-58 166.5q0 95 58 163t155 68q15 0 27 -3v-15q-71 -5 -110.5 -47.5t-39.5 -121.5q0 -132 53 -205 q36 -50 97 -50zM353 18h30q61 0 90.5 53t29.5 135q0 81 -28.5 153.5t-71.5 72.5q-12 0 -21 -6t-14.5 -20t-8.5 -26.5t-4 -37t-1.5 -39.5t-0.5 -45v-240z" />
+<glyph unicode="&#x3c7;" horiz-adv-x="500" d="M486 450l-210 -368l17 -80q18 -83 35.5 -117.5t46.5 -34.5q43 0 51 80h15q0 -30 -6 -61.5t-24 -60t-46 -28.5q-68 0 -93 151l-21 121l-142 -263h-98l210 367l-19 82q-35 152 -90 152q-13 0 -26 -19t-18 -58h-15q0 73 16.5 110t56.5 37q42 0 65 -61.5t55 -213.5l142 265 h98z" />
+<glyph unicode="&#x3c8;" horiz-adv-x="694" d="M684 457v-15q-85 -11 -85 -213q0 -239 -205 -239v-207h-84v207q-115 0 -160 57.5t-45 181.5q0 201 -85 212v15q28 4 52 4q45 0 74 -29.5t39 -69t10 -86.5q0 -257 115 -257v432h84v-432q115 0 115 253q0 35 5.5 65.5t18 60t38 46.5t61.5 17q38 0 52 -3z" />
+<glyph unicode="&#x3c9;" horiz-adv-x="625" d="M361 445v15q106 0 170 -62t64 -187q0 -109 -48 -165t-111 -56q-88 0 -124 96q-42 -96 -126 -96q-59 0 -109 56q-48 55 -48 163q0 125 65 188t169 63v-15q-64 0 -104 -60t-40 -167q0 -200 81 -200q66 0 85 128q-18 58 -18 105q0 98 45 98q19 0 32 -24t13 -72 q0 -44 -18 -107q6 -58 30 -93t52 -35q27 0 45 15.5t26 46t10.5 59t2.5 69.5q0 115 -37 176t-107 61z" />
+<glyph unicode="&#x3ca;" horiz-adv-x="340" d="M276 107l15 -8q-52 -109 -113 -109q-59 0 -59 88v266q0 49 -33 49q-23 0 -42 -4v18q63 19 155 53l4 -4v-377q0 -23 20 -23q16 0 25.5 9.5t27.5 41.5zM316 572q0 -20 -15 -34.5t-36 -14.5q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5t35 -15t15 -35zM117 572 q0 -20 -15 -34.5t-36 -14.5q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5t35 -15t15 -35z" />
+<glyph unicode="&#x3cb;" horiz-adv-x="524" d="M255 460h27q89 0 150.5 -61.5t61.5 -173.5q0 -98 -62 -166.5t-154 -68.5q-101 0 -140.5 56t-39.5 152v120q0 70 -20 70q-25 0 -48 -49l-14 6q52 110 103 110q63 0 63 -70v-211q0 -34 7.5 -66.5t32 -61t62.5 -28.5q61 0 90.5 54t29.5 137q0 107 -50 173q-42 54 -99 58v20z M404 572q0 -20 -15 -34.5t-36 -14.5q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5t35 -15t15 -35zM205 572q0 -20 -15 -34.5t-36 -14.5q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5t35 -15t15 -35z" />
+<glyph unicode="&#x3cc;" horiz-adv-x="505" d="M473 228q0 -89 -66 -163.5t-155 -74.5q-90 0 -153.5 61.5t-63.5 150.5q0 101 62.5 179.5t161.5 78.5t156.5 -65.5t57.5 -166.5zM384 191q0 49 -13 100t-47.5 94t-84.5 43q-31 0 -54.5 -18.5t-36 -48t-18.5 -59.5t-6 -58q0 -46 14 -94.5t48.5 -88t82.5 -39.5 q37 0 64.5 29.5t39 66.5t11.5 73zM191 507l59 132q11 23 38 23q11 0 20.5 -7.5t9.5 -21.5q0 -13 -27 -45l-66 -81h-34z" />
+<glyph unicode="&#x3cd;" horiz-adv-x="524" d="M255 460h27q89 0 150.5 -61.5t61.5 -173.5q0 -98 -62 -166.5t-154 -68.5q-101 0 -140.5 56t-39.5 152v120q0 70 -20 70q-25 0 -48 -49l-14 6q52 110 103 110q63 0 63 -70v-211q0 -34 7.5 -66.5t32 -61t62.5 -28.5q61 0 90.5 54t29.5 137q0 107 -50 173q-42 54 -99 58v20z M192 507l59 132q11 23 38 23q11 0 20.5 -7.5t9.5 -21.5q0 -13 -27 -45l-66 -81h-34z" />
+<glyph unicode="&#x3ce;" horiz-adv-x="625" d="M361 445v15q106 0 170 -62t64 -187q0 -109 -48 -165t-111 -56q-88 0 -124 96q-42 -96 -126 -96q-59 0 -109 56q-48 55 -48 163q0 125 65 188t169 63v-15q-64 0 -104 -60t-40 -167q0 -200 81 -200q66 0 85 128q-18 58 -18 105q0 98 45 98q19 0 32 -24t13 -72 q0 -44 -18 -107q6 -58 30 -93t52 -35q27 0 45 15.5t26 46t10.5 59t2.5 69.5q0 115 -37 176t-107 61zM247 507l59 132q11 23 38 23q11 0 20.5 -7.5t9.5 -21.5q0 -13 -27 -45l-66 -81h-34z" />
+<glyph unicode="&#x3d0;" horiz-adv-x="450" d="M411 611q0 -44 -32.5 -72.5t-72 -38t-82.5 -9.5q-33 0 -66 3q-82 -128 -85 -248q37 63 81 101t104 38q65 0 102.5 -58t37.5 -127q0 -81 -48.5 -145.5t-127.5 -64.5q-47 0 -82 25t-52.5 65.5t-25.5 82.5t-8 86q0 286 148 402q56 42 100 42q109 0 109 -82zM165 507h35 q48 0 87 19q24 11 55.5 51t31.5 63q0 13 -10.5 23.5t-24.5 10.5q-84 0 -174 -167zM357 272q0 31 -20 55t-50 24q-36 0 -77.5 -47t-68 -104t-26.5 -92q0 -34 17 -59.5t49 -25.5q37 0 80 47.5t69.5 106.5t26.5 95z" />
+<glyph unicode="&#x3d1;" horiz-adv-x="554" d="M544 290v-15q-34 -7 -84 -7q-1 -52 -10.5 -97.5t-30 -88t-59.5 -67.5t-93 -25q-99 0 -139.5 52t-40.5 144v22q0 55 -20 55q-13 0 -22.5 -11.5t-29.5 -50.5l-15 9q21 53 50 81.5t59 28.5q36 0 49 -20t13 -80v-51q0 -23 4.5 -46.5t15 -48.5t32 -40.5t50.5 -15.5 q99 0 99 213q0 30 -1 44q-118 20 -198.5 88t-80.5 165q0 78 45.5 116.5t103.5 38.5q60 0 97 -32t65 -89q54 -109 58 -263q20 -4 83 -9zM369 322l-7 77q-7 75 -20 126.5t-30.5 76.5t-34.5 34.5t-38 9.5q-29 0 -50 -23.5t-21 -63.5q0 -25 8 -52.5t27.5 -63t62.5 -68t103 -53.5 z" />
+<glyph unicode="&#x3d2;" horiz-adv-x="722" d="M395 416h3q7 44 22 86.5t39.5 83t62.5 65.5t84 25q36 0 64 -25.5t28 -60.5q0 -31 -16.5 -53.5t-46.5 -22.5q-24 0 -40.5 16t-16.5 40q0 17 10 31.5t19.5 23.5t9.5 12q0 13 -24 13q-47 0 -83.5 -46t-55.5 -114t-28 -129.5t-9 -109.5v-140q0 -57 19 -73t84 -19v-19h-306v19 q68 5 84.5 21.5t16.5 82.5v172q-22 175 -73 251.5t-132 77.5q-24 0 -73 -18l-8 16q26 23 63 37.5t71 14.5q192 0 232 -258z" />
+<glyph unicode="&#x3d5;" horiz-adv-x="623" d="M353 683v-223q70 0 108 -16q64 -26 98 -83.5t34 -129.5q0 -45 -13 -86t-39.5 -77t-75 -57t-112.5 -21v-207h-84v207h-24q-98 0 -157 71.5t-59 166.5q0 96 59 164t164 68h17v223h84zM352 18h31q60 0 90 52.5t30 133.5q0 95 -39.5 161.5t-111.5 66.5v-414zM270 18v414h-30 q-58 0 -89.5 -42t-31.5 -116q0 -130 54 -206q35 -50 97 -50z" />
+<glyph unicode="&#x3d6;" horiz-adv-x="762" d="M726 366h-86q46 -55 46 -162q0 -103 -47 -158.5t-117 -55.5q-38 0 -70.5 24t-48.5 72q-20 -50 -51.5 -73t-83.5 -23q-60 0 -104 56.5t-44 159.5q0 40 13 84.5t34 75.5h-44q-35 0 -57.5 -23.5t-44.5 -68.5h-15q9 64 48 120t100 56h572v-84zM558 366h-308q-40 -68 -40 -167 q0 -181 76 -181q70 0 90 129q-18 50 -18 84t11 60.5t35 26.5q22 0 33 -27.5t11 -60.5q0 -36 -18 -83q7 -59 31.5 -94t54.5 -35q80 0 80 188q0 42 -10.5 88.5t-27.5 71.5z" />
+<glyph unicode="&#x3d8;" horiz-adv-x="722" d="M310 -94v84q-125 17 -200.5 110t-75.5 234q0 152 90.5 247t236.5 95t236.5 -97.5t90.5 -247.5q0 -140 -76 -232t-200 -109v-96q0 -57 17 -73t79 -19v-19h-292v19q63 4 78.5 21t15.5 83zM574 337q0 85 -24 152.5t-67 103.5q-56 47 -123 47q-85 0 -143 -67 q-32 -36 -50.5 -102.5t-18.5 -138.5q0 -182 90 -265q49 -45 124 -45q78 0 129 48q83 80 83 267z" />
+<glyph unicode="&#x3d9;" horiz-adv-x="500" d="M207 -217v211q-78 14 -128 78t-50 156q0 104 62 168t163 64q93 0 154.5 -63.5t61.5 -165.5q0 -92 -48.5 -157t-130.5 -80v-211h-84zM380 204q0 114 -50 178q-40 50 -95 50q-52 0 -84 -42.5t-32 -116.5q0 -128 53 -205q34 -50 90 -50q55 0 86.5 49.5t31.5 136.5z" />
+<glyph unicode="&#x3da;" horiz-adv-x="667" d="M228 -146l21 25q24 -25 63.5 -39t77.5 -14q67 0 106 28q47 35 47 96q0 84 -152 110q-30 5 -98 12q-46 4 -80 11t-71 23t-60.5 40.5t-38.5 65t-15 94.5q0 101 65.5 188.5t160 134.5t186.5 47q166 0 166 -85q0 -22 -14 -37.5t-44 -15.5q-20 0 -33.5 12.5t-20.5 27.5 t-30.5 27.5t-62.5 12.5q-118 0 -208.5 -77t-90.5 -186q0 -47 18.5 -79.5t47 -48.5t70.5 -26.5t81.5 -14t87.5 -12t82 -20.5q133 -46 133 -173q0 -92 -66 -145.5t-160 -53.5q-103 0 -168 72z" />
+<glyph unicode="&#x3db;" horiz-adv-x="461" d="M421 490h15q0 -118 -44.5 -171t-145.5 -62q-81 -8 -114 -25q-50 -26 -50 -82q0 -34 21 -59t56 -25q9 0 48 8t50 8q77 0 113.5 -34.5t36.5 -107.5q0 -64 -47 -111t-96 -47q-31 0 -51.5 14.5t-20.5 41.5q0 18 11 29.5t31 11.5q10 0 28 -14.5t33 -14.5q32 0 56.5 23t24.5 58 q0 32 -25 50t-65 18q-3 0 -41 -4.5t-55 -4.5q-69 0 -112 35t-43 111q0 149 201 209q154 47 185 145z" />
+<glyph unicode="&#x3dc;" horiz-adv-x="556" d="M546 519h-25q-11 68 -37.5 86.5t-116.5 18.5h-132q-21 0 -27.5 -7.5t-6.5 -31.5v-217h248v-41h-248v-215q0 -57 16.5 -73.5t74.5 -19.5v-19h-281v19q57 4 72.5 21.5t15.5 82.5v428q0 55 -15 71.5t-72 20.5v19h529z" />
+<glyph unicode="&#x3dd;" horiz-adv-x="470" d="M435 390h-275v-260h225v-40h-225v-280h-80v640h355v-60z" />
+<glyph unicode="&#x3de;" horiz-adv-x="703" d="M678 542l-221 -394q-5 -8 -12 -29t-7 -31q0 -49 38 -49q44 0 89 34l12 -15q-73 -72 -137 -72q-49 0 -74.5 26t-25.5 61q0 27 14.5 58t55.5 86l148 201l-532 -191l-13 13l222 395q5 8 12 29t7 31q0 49 -38 49q-44 0 -89 -34l-12 15q73 72 137 72q49 0 74.5 -26t25.5 -61 q0 -27 -14.5 -58t-55.5 -86l-149 -201l533 191z" />
+<glyph unicode="&#x3df;" horiz-adv-x="511" d="M455 373l-209 -373h-100l183 289h-265l209 373h100l-183 -289h265z" />
+<glyph unicode="&#x3e0;" horiz-adv-x="801" d="M40 508l-29 21q76 79 158.5 113t184.5 34q80 0 153.5 -32t132 -90t93 -148t34.5 -199q0 -101 -46.5 -195t-125.5 -156.5t-171 -73.5v35q98 23 169 126.5t71 216.5q0 136 -62 257q-56 -10 -97.5 -56t-62.5 -111t-30.5 -127.5t-9.5 -122.5h-102q0 60 17.5 130t50 138 t88.5 119.5t125 66.5q-47 73 -125 116.5t-159 43.5q-25 0 -46 -4v-289h-44v279q-95 -27 -167 -92z" />
+<glyph unicode="&#x3e1;" horiz-adv-x="528" d="M-6 543l12 30q137 -46 246 -128t157 -165q78 -135 78 -302q0 -95 -25 -194l-33 6q6 46 6 92q0 134 -62 271l-170 -98l-16 28l172 99q-8 17 -28 53q-10 17 -32 51l-172 -99l-16 28l169 97q-116 157 -286 231z" />
+<glyph unicode="&#x3f0;" horiz-adv-x="551" d="M515 450l-138 -168q-18 -47 -18 -112q0 -104 58 -104q7 0 18 11t30 11q16 0 27 -10.5t11 -25.5q0 -32 -21 -47t-54 -15q-50 0 -76.5 43.5t-26.5 97.5t16 110h-2l-194 -241h-103l140 170q18 43 18 127q0 38 -15 62.5t-43 24.5q-6 0 -18.5 -12t-32.5 -12q-14 0 -25 11 t-11 25q0 31 22 47.5t50 16.5q49 0 78 -39.5t29 -100.5q0 -41 -14 -111h2l190 241h103z" />
+<glyph unicode="&#x3f1;" horiz-adv-x="500" d="M426 -215h-16q-4 26 -32 38t-70 17.5t-87.5 15.5t-91 42.5t-72.5 86.5q-28 57 -28 193q0 37 6.5 73.5t23 75t42 67.5t66.5 47.5t92 18.5q97 0 154 -65.5t57 -174.5q0 -94 -58.5 -162t-150.5 -68q-128 0 -171 90l-2 -1q18 -61 61 -95.5t90 -45.5t92 -19.5t74 -29.5t29 -63 q0 -17 -8 -41zM380 217q0 85 -43.5 150t-96.5 65q-56 0 -88.5 -40t-32.5 -119q0 -63 14.5 -119t49 -96t83.5 -40q33 0 56.5 18.5t35.5 50t17 63.5t5 67z" />
+<glyph unicode="&#x3f4;" horiz-adv-x="722" d="M688 331q0 -154 -91 -249.5t-236 -95.5q-146 0 -236.5 96t-90.5 252q0 152 90.5 247t236.5 95t236.5 -97.5t90.5 -247.5zM148 359h425q-6 163 -90 234q-56 47 -123 47q-85 0 -143 -67q-29 -33 -47 -90.5t-22 -123.5zM574 315h-426q3 -169 90 -248q49 -45 124 -45 q78 0 129 48q78 75 83 245z" />
+<glyph unicode="&#x3f5;" horiz-adv-x="439" d="M392 113l15 -8q-59 -115 -183 -115q-89 0 -144 68t-55 159q0 98 59 170.5t153 72.5q31 0 59 -10t39 -10q15 0 17 20h16l14 -135h-16q-10 25 -16 37.5t-20.5 32t-37 28t-53.5 8.5q-51 0 -87.5 -57t-36.5 -119h195v-32h-195q0 -79 35.5 -135.5t95.5 -56.5q85 0 146 82z" />
+<glyph unicode="&#x3f6;" horiz-adv-x="444" d="M47 337l-15 8q59 115 183 115q89 0 144 -68t55 -159q0 -98 -59 -170.5t-153 -72.5q-31 0 -59 10t-39 10q-15 0 -17 -20h-16l-14 135h16q10 -25 16 -37.5t20.5 -32t37 -28t53.5 -8.5q51 0 87.5 57t36.5 119h-195v32h195q0 79 -35.5 135.5t-95.5 56.5q-85 0 -146 -82z" />
+<glyph unicode="&#x401;" horiz-adv-x="629" d="M607 169l-46 -169h-539v19q57 4 72 20.5t15 74.5v436q0 56 -15.5 73t-71.5 20v19h530l4 -143h-24q-11 67 -39.5 86t-115.5 19h-131q-22 0 -28.5 -6.5t-6.5 -29.5v-221h151q63 0 83.5 18t29.5 78h23v-233h-23q-9 63 -29 80t-84 17h-151v-242q0 -30 21 -38.5t80 -8.5h36 q107 0 152 25.5t79 105.5h28zM485 822q0 -20 -15 -34.5t-36 -14.5q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5t35 -15t15 -35zM286 822q0 -20 -15 -34.5t-36 -14.5q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5t35 -15t15 -35z" />
+<glyph unicode="&#x402;" horiz-adv-x="756" d="M327 596v-263q38 49 89 77q47 26 116 26q49 0 83.5 -22.5t52 -61t25 -80t7.5 -90.5q0 -193 -58 -292q-46 -79 -127 -79q-42 0 -73 22t-31 59q0 25 15 45t43 20q21 0 36 -14t15 -36q0 -6 -2.5 -18.5t-2.5 -16.5q0 -24 18 -24q52 0 52 324q0 37 -0.5 55.5t-3 46.5t-9 42 t-17.5 29t-28.5 21t-42.5 6q-36 0 -78.5 -19.5t-78.5 -58.5v-175q0 -60 16 -78.5t69 -21.5v-19h-283v19q60 2 78 19t18 81v469q0 36 -34 36h-15q-69 0 -90.5 -16.5t-36.5 -78.5q-4 -15 -7 -35h-24l7 168h512l5 -168h-24q-1 9 -10 40q-16 55 -47 72.5t-90 17.5h-9 q-19 0 -27 -6t-8 -22z" />
+<glyph unicode="&#x403;" horiz-adv-x="571" d="M544 483h-24q-3 27 -10 50q-26 91 -126 91h-141q-22 0 -28.5 -6.5t-6.5 -29.5v-476q0 -56 16.5 -73t74.5 -20v-19h-280v19q56 4 71.5 20.5t15.5 74.5v436q0 56 -15.5 73t-71.5 20v19h520zM251 757l147 148q23 23 42 23q35 0 35 -32q0 -23 -30 -42l-154 -97h-40z" />
+<glyph unicode="&#x404;" horiz-adv-x="651" d="M602 129l19 -18q-85 -125 -251 -125q-70 0 -132 23t-104 66q-96 99 -96 244q0 144 86 249q89 108 233 108q62 0 114 -15q60 -18 69 -18q32 0 40 33h20l4 -228h-24q-16 81 -44 112q-68 76 -157 76q-98 0 -158 -74t-66 -195h291v-44h-292q0 -101 35 -168q30 -58 81 -91.5 t119 -33.5q62 0 109 22.5t104 76.5z" />
+<glyph unicode="&#x405;" horiz-adv-x="556" d="M488 463h-25q-17 62 -41 94q-65 83 -145 83q-45 0 -73 -29t-28 -71q0 -20 10 -39t21.5 -32.5t40.5 -33.5t47 -31l60 -35q81 -47 118 -93.5t37 -102.5q0 -83 -58 -135t-146 -52q-65 0 -118 23q-26 11 -47 11q-12 0 -20 -9t-8 -24h-22l-29 212h22q67 -177 206 -177 q52 0 85 31t33 81q0 47 -29 79q-49 53 -167 116q-122 65 -122 172q0 80 49 127.5t125 47.5q53 0 105 -22q27 -12 44 -12q26 0 32 34h21z" />
+<glyph unicode="&#x406;" horiz-adv-x="333" d="M315 0h-297v19q63 2 80 18.5t17 74.5v439q0 58 -16 73t-81 19v19h297v-19q-63 -3 -80.5 -19t-17.5 -73v-439q0 -56 18 -73.5t80 -19.5v-19z" />
+<glyph unicode="&#x407;" horiz-adv-x="333" d="M323 822q0 -20 -15 -34.5t-36 -14.5q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5t35 -15t15 -35zM124 822q0 -20 -15 -34.5t-36 -14.5q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5t35 -15t15 -35zM322 0h-297v19q63 2 80 18.5t17 74.5v439q0 58 -16 73 t-81 19v19h297v-19q-63 -3 -80.5 -19t-17.5 -73v-439q0 -56 18 -73.5t80 -19.5v-19z" />
+<glyph unicode="&#x408;" horiz-adv-x="373" d="M354 662v-19q-61 -5 -76.5 -20.5t-15.5 -73.5v-364q0 -199 -167 -199q-46 0 -73.5 19t-27.5 53q0 20 14.5 36t34.5 16q33 0 49 -42q2 -5 5 -14l5 -12q1 -5 4 -9.5t7 -6.5t10 -2q22 0 29.5 15.5t7.5 54.5v456q0 59 -15 73.5t-78 19.5v19h287z" />
+<glyph unicode="&#x409;" horiz-adv-x="988" d="M576 366h109q124 0 196.5 -44t72.5 -140q0 -85 -64.5 -133.5t-174.5 -48.5h-337v19q59 2 77.5 19.5t18.5 74.5v472q0 21 -7.5 30t-27.5 9h-141q-21 0 -28 -9t-7 -30v-324q0 -29 -0.5 -47.5t-3.5 -50t-8.5 -53t-16.5 -47t-26.5 -41t-40 -26t-55.5 -10.5q-49 0 -75.5 16 t-26.5 57q0 27 18 41t38 14q19 0 31.5 -12.5t18 -27t13 -27t17.5 -12.5q16 0 28.5 11t20 32.5t12 44.5t7 55.5t3 56.5t0.5 55v260q0 55 -19.5 73.5t-66.5 19.5v19h534v-19q-57 -5 -73 -21.5t-16 -73.5v-182zM576 326v-243q0 -25 13.5 -35t48.5 -10q96 0 148.5 29.5 t52.5 111.5q0 147 -185 147h-78z" />
+<glyph unicode="&#x40a;" horiz-adv-x="1017" d="M605 366h109q124 0 196.5 -44t72.5 -140q0 -85 -64.5 -133.5t-174.5 -48.5h-337v19q59 2 77.5 19.5t18.5 74.5v213h-293v-213q0 -55 16.5 -73t71.5 -21v-19h-279v19q59 4 74 21.5t15 81.5v426q0 58 -15.5 74t-73.5 21v19h279v-19q-56 -5 -72 -21.5t-16 -73.5v-182h293 v182q0 59 -15 74.5t-73 20.5v19h279v-19q-56 -5 -72.5 -21.5t-16.5 -73.5v-182zM605 326v-243q0 -25 13.5 -35t48.5 -10q96 0 148.5 29.5t52.5 111.5q0 147 -185 147h-78z" />
+<glyph unicode="&#x40b;" horiz-adv-x="803" d="M786 0h-283v19q60 2 78 19t18 81v120q0 63 -30 98t-78 35q-92 0 -164 -78v-175q0 -59 17.5 -78t71.5 -22v-19h-287v19q60 2 78 19t18 81v469q0 36 -34 36h-15q-69 0 -90.5 -16.5t-36.5 -78.5q-4 -13 -7 -37h-24l7 170h510l5 -168h-24q-1 9 -10 40q-16 55 -46 72.5 t-89 17.5h-9q-19 0 -27 -6t-8 -22v-263q29 37 104 77q49 26 102 26q79 0 123.5 -49.5t44.5 -145.5v-122q0 -60 16 -78.5t69 -21.5v-19z" />
+<glyph unicode="&#x40c;" horiz-adv-x="690" d="M686 0h-191q-37 33 -118 171q-33 55 -63.5 91t-45.5 46q-20 13 -56 14v-211q0 -56 16 -71.5t73 -20.5v-19h-282v19q58 3 74.5 23.5t16.5 86.5v420q0 56 -16 73t-74 21v19h282v-19q-61 -4 -75.5 -20t-14.5 -75v-186q53 0 71 7q27 10 47 25.5t34.5 40.5t23 44t20.5 55 q24 70 58 106t96 36q36 0 55.5 -17.5t19.5 -45.5q0 -21 -12.5 -39.5t-36.5 -18.5q-19 0 -32 9t-17.5 19.5t-11 19.5t-14.5 9q-16 0 -31 -19.5t-22.5 -38t-19.5 -53.5q-43 -125 -112 -156v-2q42 -17 71.5 -42.5t61.5 -71.5l37 -55l34 -51q12 -17 26.5 -35t26.5 -28 q49 -40 101 -41v-19zM255 757l147 148q23 23 42 23q35 0 35 -32q0 -23 -30 -42l-154 -97h-40z" />
+<glyph unicode="&#x40e;" horiz-adv-x="711" d="M694 662v-18q-72 -9 -111 -100l-127 -300q-52 -120 -80 -165q-59 -94 -143 -94q-34 0 -57 14.5t-23 39.5q0 18 12.5 30t33.5 12q20 0 49 -17q17 -10 28 -10q39 0 87 80l-240 422q-25 44 -49 63t-59 25v18h268v-18q-71 -3 -71 -38q0 -24 53 -116l144 -254l106 254 q33 80 33 107q0 38 -62 47v18h208zM510 848q0 -42 -44 -66.5t-91 -24.5t-91 24.5t-44 66.5q0 31 19.5 49t42.5 18q24 0 24 -25q0 -18 -22 -24t-22 -17q0 -40 93 -40t93 40q0 11 -22 17t-22 24q0 25 27 25q24 0 41.5 -18t17.5 -49z" />
+<glyph unicode="&#x40f;" horiz-adv-x="715" d="M696 0h-189q-97 0 -126 -101q-7 -23 -10 -50v-2h-24v2q0 1 -4 21.5t-6 28.5q-29 101 -126 101h-192v19q56 5 72.5 21.5t16.5 73.5v437q0 53 -16.5 70.5t-72.5 21.5v19h279v-19q-58 -4 -73 -22.5t-15 -82.5v-470q0 -19 6.5 -24.5t28.5 -5.5h225q22 0 28.5 5.5t6.5 25.5 v480q0 55 -16 73t-71 21v19h278v-19q-59 -4 -74 -21.5t-15 -81.5v-426q0 -57 17 -73t72 -22v-19z" />
+<glyph unicode="&#x410;" horiz-adv-x="713" d="M701 0h-255v19q40 0 55 9q14 7 14 24q0 26 -19 70l-41 94h-262l-46 -114q-9 -23 -9 -42q0 -23 16.5 -32t53.5 -9v-19h-199v19q42 4 61 30.5t65 136.5l206 488h20l246 -563q22 -52 39.5 -70t54.5 -22v-19zM441 256l-116 276l-115 -276h231z" />
+<glyph unicode="&#x411;" horiz-adv-x="611" d="M217 366h74q43 0 78 -3t76 -14.5t68 -30.5t45.5 -54t18.5 -82q0 -83 -65 -132.5t-174 -49.5h-319v19q59 2 77.5 19.5t18.5 74.5v437q0 58 -17 73.5t-79 19.5v19h512l5 -168h-24q-1 9 -10 40q-26 90 -126 90h-124q-21 0 -28 -7.5t-7 -28.5v-222zM217 326v-243 q0 -28 7 -36.5t37 -8.5q96 0 148.5 29.5t52.5 111.5q0 147 -185 147h-60z" />
+<glyph unicode="&#x412;" horiz-adv-x="651" d="M424 359v-1q75 -12 122 -55q49 -44 49 -115q0 -84 -65.5 -136t-173.5 -52h-337v19q59 2 77.5 19.5t18.5 74.5v437q0 58 -17 73.5t-79 19.5v19h280q262 0 262 -157q0 -68 -41 -104q-29 -25 -96 -42zM217 376h92q150 0 150 124t-177 124h-41q-24 0 -24 -32v-216zM217 336 v-253q0 -25 13.5 -35t48.5 -10q68 0 100 7.5t63 35.5q38 33 38 108q0 76 -47 107q-42 28 -80 34t-136 6z" />
+<glyph unicode="&#x413;" horiz-adv-x="571" d="M544 483h-24q-3 27 -10 50q-26 91 -126 91h-141q-22 0 -28.5 -6.5t-6.5 -29.5v-476q0 -56 16.5 -73t74.5 -20v-19h-280v19q56 4 71.5 20.5t15.5 74.5v436q0 56 -15.5 73t-71.5 20v19h520z" />
+<glyph unicode="&#x414;" horiz-adv-x="665" d="M646 -153h-24q-4 30 -10 52q-29 101 -126 101h-312q-97 0 -126 -101q-6 -22 -10 -52h-24v172h20q54 0 85.5 51.5t45.5 166t15 313.5q0 55 -19.5 73.5t-66.5 19.5v19h552v-19q-57 -5 -73 -21.5t-16 -73.5v-433q0 -52 17 -74t72 -22v-172zM455 82v506q0 21 -7.5 28.5 t-27.5 7.5h-159q-15 0 -21 -1.5t-10 -9t-4 -25.5q0 -239 -16 -364t-57 -186h265q21 0 29 10t8 34z" />
+<glyph unicode="&#x415;" horiz-adv-x="629" d="M607 169l-46 -169h-539v19q57 4 72 20.5t15 74.5v436q0 56 -15.5 73t-71.5 20v19h530l4 -143h-24q-11 67 -39.5 86t-115.5 19h-131q-22 0 -28.5 -6.5t-6.5 -29.5v-221h151q63 0 83.5 18t29.5 78h23v-233h-23q-9 63 -29 80t-84 17h-151v-242q0 -30 21 -38.5t80 -8.5h36 q107 0 152 25.5t79 105.5h28z" />
+<glyph unicode="&#x416;" horiz-adv-x="1021" d="M1013 0h-191q-36 33 -118 167q-15 24 -32 54l-24 43q-7 12 -17.5 27t-19.5 19.5t-21.5 8t-30.5 3.5v-211q0 -57 16 -72.5t71 -19.5v-19h-261v19q53 3 65 18.5t12 73.5v211q-22 0 -35 -3t-26.5 -17t-20.5 -25l-26 -47q-20 -36 -37 -63q-82 -134 -118 -167h-191v19 q30 5 53.5 15t38.5 19t34 31t28 36l34 48l37 57q35 51 62 77t66 42l2 2q-35 16 -58.5 52t-48.5 103q-13 35 -20.5 52.5t-22.5 36.5t-31 19q-8 0 -14.5 -9t-11.5 -19.5t-17.5 -19.5t-32.5 -9q-24 0 -36.5 18t-12.5 39q0 28 21.5 47.5t57.5 19.5q59 0 92 -36t59 -106 q17 -44 28.5 -68.5t31.5 -52t48 -39.5t67 -12v187q0 58 -15 74.5t-75 19.5v19h277v-19q-61 -4 -75.5 -20t-14.5 -75v-186q22 0 41 4t32 8.5t26 17.5l19 20q7 7 16.5 26t12.5 28l14 34l13 34q28 72 60 107t91 35q36 0 57.5 -19.5t21.5 -47.5q0 -21 -12.5 -39t-36.5 -18 q-20 0 -32.5 9t-17.5 19.5t-11.5 19.5t-14.5 9q-16 0 -31 -19t-22.5 -36.5t-20.5 -52.5q-25 -67 -48.5 -103t-58.5 -52l3 -2q39 -16 66 -42t62 -77l38 -57l32 -48q10 -14 29 -36t34 -31t38.5 -19t53.5 -15v-19z" />
+<glyph unicode="&#x417;" horiz-adv-x="576" d="M354 349v-1q74 -5 132.5 -48.5t58.5 -109.5q0 -107 -100 -164q-70 -40 -163 -40q-167 0 -254 128l18 17q57 -54 104.5 -77.5t105.5 -23.5q85 0 129.5 39t44.5 113q0 69 -62 110q-33 21 -62 27.5t-97 6.5v40q64 0 89 5t53 22q58 34 58 121q0 54 -40.5 89t-107.5 35 q-79 0 -129 -54t-62 -144h-24l4 236h20q8 -33 38 -33q11 0 71 18q55 15 105 15q117 0 172 -46t55 -123q0 -64 -46 -107.5t-111 -50.5z" />
+<glyph unicode="&#x418;" horiz-adv-x="723" d="M704 0h-279v19q58 4 73 22.5t15 82.5v379l-303 -407q0 -43 18 -59t69 -18l1 -19h-279v19q59 4 74 21.5t15 81.5v426q0 58 -15.5 74t-73.5 21v19h280v-19q-56 -5 -72.5 -21.5t-16.5 -73.5v-384l303 405q0 41 -18 55t-71 19v19h280v-19q-56 -5 -72.5 -21.5t-16.5 -73.5 v-437q0 -53 16.5 -70.5t72.5 -21.5v-19z" />
+<glyph unicode="&#x419;" horiz-adv-x="723" d="M496 848q0 -42 -44 -66.5t-91 -24.5t-91 24.5t-44 66.5q0 31 19.5 49t42.5 18q24 0 24 -25q0 -18 -22 -24t-22 -17q0 -40 93 -40t93 40q0 11 -22 17t-22 24q0 25 27 25q24 0 41.5 -18t17.5 -49zM704 0h-279v19q58 4 73 22.5t15 82.5v379l-303 -407q1 -44 18.5 -59.5 t68.5 -17.5l1 -19h-279v19q59 4 74 21.5t15 81.5v426q0 58 -15.5 74t-73.5 21v19h280v-19q-56 -5 -72.5 -21.5t-16.5 -73.5v-384l302 405q-2 44 -18.5 56.5t-69.5 17.5v19h280v-19q-56 -5 -72.5 -21.5t-16.5 -73.5v-437q0 -53 16.5 -70.5t72.5 -21.5v-19z" />
+<glyph unicode="&#x41a;" horiz-adv-x="690" d="M686 0h-191q-37 33 -118 171q-33 55 -63.5 91t-45.5 46q-20 13 -56 14v-211q0 -56 16 -71.5t73 -20.5v-19h-282v19q58 3 74.5 23.5t16.5 86.5v420q0 56 -16 73t-74 21v19h282v-19q-61 -4 -75.5 -20t-14.5 -75v-186q53 0 71 7q27 10 47 25.5t34.5 40.5t23 44t20.5 55 q24 70 58 106t96 36q36 0 55.5 -17.5t19.5 -45.5q0 -21 -12.5 -39.5t-36.5 -18.5q-19 0 -32 9t-17.5 19.5t-11 19.5t-14.5 9q-16 0 -31 -19.5t-22.5 -38t-19.5 -53.5q-43 -125 -112 -156v-2q42 -17 71.5 -42.5t61.5 -71.5l37 -55l34 -51q12 -17 26.5 -35t26.5 -28 q49 -40 101 -41v-19z" />
+<glyph unicode="&#x41b;" horiz-adv-x="683" d="M664 0h-279v19q58 4 73 22.5t15 83.5v460q0 21 -7.5 30t-27.5 9h-141q-21 0 -28 -9t-7 -30v-324q0 -29 -0.5 -47.5t-3.5 -50t-8.5 -53t-16.5 -47t-26.5 -41t-40 -26t-55.5 -10.5q-49 0 -75.5 16t-26.5 57q0 27 18 41t38 14q19 0 31.5 -12.5t18 -27t13 -27t17.5 -12.5 q16 0 28.5 11t20 32.5t12 44.5t7 55.5t3 56.5t0.5 55v260q0 55 -19.5 73.5t-66.5 19.5v19h534v-19q-57 -5 -73 -21.5t-16 -73.5v-437q0 -53 16.5 -70.5t72.5 -21.5v-19z" />
+<glyph unicode="&#x41c;" horiz-adv-x="893" d="M871 0h-280v19q59 4 74.5 22.5t15.5 81.5v449l-255 -572h-14l-252 549v-398q0 -81 17 -105t76 -27v-19h-234v19q44 3 63 13t26.5 35.5t7.5 83.5v398q0 57 -17 73.5t-78 20.5v19h198l231 -502l221 502h199v-19q-54 -1 -70.5 -19t-16.5 -74v-438q0 -53 16.5 -71t71.5 -22 v-19z" />
+<glyph unicode="&#x41d;" horiz-adv-x="726" d="M704 0h-279v19q58 4 73 22.5t15 82.5v191h-303v-202q0 -55 16.5 -73t71.5 -21v-19h-279v19q59 4 74 21.5t15 81.5v426q0 58 -15.5 74t-73.5 21v19h279v-19q-56 -5 -72 -21.5t-16 -73.5v-189h303v189q0 59 -15 74.5t-73 20.5v19h279v-19q-56 -5 -72.5 -21.5t-16.5 -73.5 v-437q0 -53 16.5 -70.5t72.5 -21.5v-19z" />
+<glyph unicode="&#x41e;" horiz-adv-x="729" d="M690 331q0 -154 -91 -249.5t-236 -95.5q-146 0 -236.5 96t-90.5 252q0 152 90.5 247t236.5 95t236.5 -97.5t90.5 -247.5zM576 337q0 85 -24 152.5t-67 103.5q-56 47 -123 47q-85 0 -143 -67q-32 -36 -50.5 -102.5t-18.5 -138.5q0 -182 90 -265q49 -45 124 -45 q78 0 129 48q83 80 83 267z" />
+<glyph unicode="&#x41f;" horiz-adv-x="724" d="M705 0h-279v19q58 4 73 22.5t15 82.5v460q0 23 -8 31.5t-29 8.5h-229q-22 0 -30 -8.5t-8 -32.5v-470q0 -55 16.5 -73t71.5 -21v-19h-279v19q59 4 74 21.5t15 81.5v426q0 58 -15.5 74t-73.5 21v19h686v-19q-56 -5 -72.5 -21.5t-16.5 -73.5v-437q0 -53 16.5 -70.5 t72.5 -21.5v-19z" />
+<glyph unicode="&#x420;" horiz-adv-x="571" d="M19 662h249q142 0 217 -63q50 -42 50 -119q0 -80 -57 -131q-42 -38 -86 -49.5t-128 -11.5q-18 0 -59 3v-179q0 -57 16.5 -73.5t77.5 -19.5v-19h-280v19q58 4 71 21t13 82v429q0 56 -14.5 72t-69.5 20v19zM205 588v-257q35 -3 51 -3q81 0 125.5 39.5t44.5 107.5 q0 82 -42 115.5t-144 33.5q-21 0 -28 -7.5t-7 -28.5z" />
+<glyph unicode="&#x421;" horiz-adv-x="677" d="M622 131l19 -18q-89 -127 -273 -127q-145 0 -236 89q-96 94 -96 250q0 146 90 247q94 104 243 104q64 0 119 -15q63 -18 69 -18q33 0 42 33h20l9 -227h-23q-16 72 -52 111q-71 76 -161 76q-111 0 -175.5 -81.5t-64.5 -213.5q0 -161 72 -239q67 -72 178 -72q66 0 114 23 t106 78z" />
+<glyph unicode="&#x422;" horiz-adv-x="618" d="M592 492h-24q-17 83 -42.5 105.5t-104.5 22.5h-59v-509q0 -57 17 -73t79 -19v-19h-292v19q63 4 78.5 21t15.5 83v497h-60q-79 0 -105 -22.5t-41 -105.5h-24l7 170h548z" />
+<glyph unicode="&#x423;" horiz-adv-x="711" d="M694 662v-18q-72 -9 -111 -100l-127 -300q-52 -120 -80 -165q-59 -94 -143 -94q-34 0 -57 14.5t-23 39.5q0 18 12.5 30t33.5 12q20 0 49 -17q17 -10 28 -10q39 0 87 80l-240 422q-25 44 -49 63t-59 25v18h268v-18q-71 -3 -71 -38q0 -24 53 -116l144 -254l106 254 q33 80 33 107q0 38 -62 47v18h208z" />
+<glyph unicode="&#x424;" horiz-adv-x="769" d="M435 580v-20q55 0 105.5 -13t94 -39.5t70 -72t26.5 -105.5q0 -56 -26.5 -101.5t-68 -72t-87.5 -40t-89 -13.5h-25v-27q0 -32 20 -43t83 -14v-19h-306v19q101 0 101 56v28h-17q-136 0 -207 62t-71 165q0 60 25.5 105.5t69 72t94 39.5t106.5 13v20q0 36 -19.5 49.5 t-81.5 13.5v19h306v-19q-62 0 -82.5 -15t-20.5 -48zM433 523v-383q75 0 132 48.5t57 129.5t-49.5 143t-139.5 62zM335 140v383q-80 0 -134 -63.5t-54 -141.5q0 -74 50.5 -126t137.5 -52z" />
+<glyph unicode="&#x425;" horiz-adv-x="716" d="M703 0h-296v19l26 2q50 3 50 29q0 22 -51 98l-95 141l-119 -149q-53 -66 -53 -89q0 -15 16.5 -22t59.5 -10v-19h-232v19q39 4 63.5 23t81.5 91l156 195l-106 155q-70 102 -101 128.5t-82 31.5v19h301v-19l-29 -2q-24 -2 -35 -7t-11 -21q0 -6 1.5 -12.5t5.5 -15.5l9 -17 q4 -7 13 -20l14 -22l19 -28l21 -30l44 -64l112 140q40 49 40 67q0 17 -14 24t-54 8v19h237v-19q-48 -3 -76 -21.5t-76 -77.5l-143 -177l192 -274q29 -42 50 -55.5t61 -18.5v-19z" />
+<glyph unicode="&#x426;" horiz-adv-x="715" d="M696 -153h-24q-4 30 -10 52q-29 101 -126 101h-517v19q56 5 72.5 21.5t16.5 73.5v437q0 53 -16.5 70.5t-72.5 21.5v19h279v-19q-58 -4 -73 -22.5t-15 -82.5v-470q0 -19 6.5 -24.5t28.5 -5.5h225q22 0 28.5 5.5t6.5 25.5v480q0 55 -16 73t-71 21v19h278v-19 q-59 -4 -74 -21.5t-15 -81.5v-426q0 -58 15.5 -74t73.5 -21v-172z" />
+<glyph unicode="&#x427;" horiz-adv-x="657" d="M639 0h-279v19q56 5 72 21.5t16 73.5v201q-87 -46 -182 -46q-87 0 -130.5 30.5t-43.5 123.5v124q0 59 -15.5 75t-73.5 21v19h275v-19q-55 -5 -69.5 -21t-14.5 -75v-115q0 -66 25.5 -92.5t90.5 -26.5q18 0 35.5 2.5t35 7.5t27.5 9l24 9l16 6v220q0 46 -12 59t-63 17v19 h266v-19q-57 -5 -73 -22.5t-16 -82.5v-424q0 -57 16 -73.5t73 -21.5v-19z" />
+<glyph unicode="&#x428;" horiz-adv-x="994" d="M965 0h-936v19q56 5 72.5 21.5t16.5 73.5v437q0 53 -16.5 70.5t-72.5 21.5v19h266v-19q-48 0 -61.5 -20t-13.5 -85v-470q0 -19 6.5 -24.5t28.5 -5.5h151q22 0 28.5 5.5t6.5 25.5v482q0 54 -13 70t-62 22v19h265v-19q-58 -4 -73 -22.5t-15 -82.5v-471q0 -18 7 -23.5 t28 -5.5h163q20 0 26.5 5.5t6.5 25.5v480q0 55 -16 73t-71 21l-1 19h279v-19q-59 -4 -74 -21.5t-15 -81.5v-426q0 -58 15.5 -74t73.5 -21v-19z" />
+<glyph unicode="&#x429;" horiz-adv-x="994" d="M965 -153h-24q0 17 -10 52q-29 101 -126 101h-776v19q56 5 72.5 21.5t16.5 73.5v437q0 53 -16.5 70.5t-72.5 21.5v19h266v-19q-48 0 -61.5 -20t-13.5 -85v-470q0 -19 6.5 -24.5t28.5 -5.5h151q22 0 28.5 5.5t6.5 25.5v482q0 54 -13 70t-62 22v19h265v-19 q-58 -4 -73 -22.5t-15 -82.5v-471q0 -18 7 -23.5t28 -5.5h163q20 0 26.5 5.5t6.5 25.5v480q0 55 -16 73t-71 21l-1 19h279v-19q-59 -4 -74 -21.5t-15 -81.5v-426q0 -58 15.5 -74t73.5 -21v-172z" />
+<glyph unicode="&#x42a;" horiz-adv-x="737" d="M342 366h96q265 0 265 -184q0 -85 -65.5 -133.5t-175.5 -48.5h-318v19q59 2 77.5 19.5t18.5 74.5v507h-60q-79 0 -103.5 -22t-39.5 -106h-24l7 170h418v-19q-58 -5 -77 -22t-19 -73v-182zM342 326v-243q0 -26 10 -35.5t39 -9.5q45 0 77 5.5t61 20t44 43.5t15 72 q0 147 -181 147h-65z" />
+<glyph unicode="&#x42b;" horiz-adv-x="884" d="M865 0h-280v19q59 4 74 21.5t15 81.5v426q0 58 -15.5 74t-73.5 21v19h280v-19q-56 -5 -72.5 -21.5t-16.5 -73.5v-434q0 -55 17 -73.5t72 -21.5v-19zM217 366h99q263 0 263 -184q0 -85 -64.5 -133.5t-174.5 -48.5h-321v19q59 2 77.5 19.5t18.5 74.5v437q0 58 -17 73.5 t-79 19.5v19h294v-19q-58 -5 -77 -22t-19 -73v-182zM217 326v-243q0 -27 9.5 -36t42.5 -9q95 0 145 29t50 112q0 147 -179 147h-68z" />
+<glyph unicode="&#x42c;" horiz-adv-x="612" d="M217 366h99q262 0 262 -184q0 -85 -64.5 -133.5t-174.5 -48.5h-320v19q59 2 77.5 19.5t18.5 74.5v437q0 58 -17 73.5t-79 19.5v19h294v-19q-58 -5 -77 -22t-19 -73v-182zM217 326v-243q0 -27 9.5 -36t42.5 -9q95 0 144.5 29t49.5 112q0 147 -178 147h-68z" />
+<glyph unicode="&#x42d;" horiz-adv-x="651" d="M51 676h20q8 -33 40 -33q9 0 69 18q52 15 114 15q144 0 233 -108q86 -105 86 -249q0 -145 -96 -244q-42 -43 -104 -66t-132 -23q-166 0 -251 125l19 18q57 -54 104 -76.5t109 -22.5q68 0 119 33.5t81 91.5q35 67 35 168h-292v44h291q-6 121 -66 195t-158 74 q-89 0 -157 -76q-28 -31 -44 -112h-24z" />
+<glyph unicode="&#x42e;" horiz-adv-x="902" d="M210 359h88q7 142 84.5 229.5t198.5 87.5q125 0 203.5 -97.5t78.5 -247.5q0 -154 -79 -249.5t-203 -95.5q-122 0 -200 90.5t-83 238.5h-88v-202q0 -55 16.5 -73t71.5 -21v-19h-279v19q59 4 74 21.5t15 81.5v426q0 58 -15.5 74t-73.5 21v19h279v-19q-56 -5 -72 -21.5 t-16 -73.5v-189zM755 337q0 188 -69 256q-49 47 -106 47q-73 0 -124 -67q-50 -68 -50 -241q0 -192 68 -265q44 -45 108 -45q67 0 111 48q62 70 62 267z" />
+<glyph unicode="&#x42f;" horiz-adv-x="637" d="M618 0h-280v19q61 3 77.5 19.5t16.5 73.5v198h-37l-230 -310h-162v19q59 4 94 50l185 246q-92 11 -144.5 54.5t-52.5 121.5q0 52 20.5 87t60 52.5t85 24.5t108.5 7h259v-19q-55 -4 -69.5 -20t-14.5 -72v-429q0 -65 13 -82t71 -21v-19zM432 348v225q0 29 -11.5 40 t-40.5 11q-78 0 -113 -15q-73 -32 -73 -121q0 -67 48 -103.5t131 -36.5h59z" />
+<glyph unicode="&#x430;" horiz-adv-x="450" d="M446 66v-28q-38 -48 -90 -48q-57 0 -64 73h-1q-64 -73 -149 -73q-47 0 -76 27.5t-29 76.5q0 70 70 117q43 29 184 81v54q0 44 -23 65.5t-59 21.5q-30 0 -50 -13t-20 -33q0 -9 3 -20t3 -22q0 -15 -13.5 -28t-32.5 -13q-17 0 -30 13t-13 33q0 48 51 80q47 30 115 30 q81 0 118 -45q19 -23 25.5 -45t6.5 -66v-191q0 -66 31 -66q20 0 43 19zM291 130v134q-91 -32 -132 -70q-34 -31 -34 -69t19 -57.5t50 -19.5q37 0 62 16q21 14 28 28.5t7 37.5z" />
+<glyph unicode="&#x431;" horiz-adv-x="507" d="M84 347l2 -1q55 114 176 114q93 0 154.5 -63.5t61.5 -165.5q0 -105 -62.5 -173t-162.5 -68q-104 0 -159 77t-55 186q0 45 6 91.5t23.5 100t45 94.5t75.5 68t110 27h67q35 0 52 11t23 40h20q-7 -93 -73 -118q-22 -8 -71 -9t-59 -2q-74 -9 -121.5 -69.5t-52.5 -139.5z M388 204q0 114 -50 178q-40 50 -95 50q-52 0 -83 -42.5t-31 -116.5q0 -128 53 -205q34 -50 88 -50q55 0 86.5 49.5t31.5 136.5z" />
+<glyph unicode="&#x432;" horiz-adv-x="474" d="M307 237v-1q57 -6 94 -33.5t37 -76.5q0 -31 -16 -59t-43 -44q-41 -23 -104 -23h-251v15q40 1 51 12t11 50v297q0 39 -10 48.5t-52 12.5v15h211q175 0 175 -114q0 -45 -30 -70t-73 -29zM170 391v-113q0 -20 9 -25.5t42 -5.5q49 0 78 22t29 64q0 45 -27 67t-96 22 q-18 0 -26.5 -6t-8.5 -25zM170 193v-125q0 -23 9 -31.5t33 -8.5q63 0 99 21t36 76q0 25 -8 43t-20 27.5t-30.5 15t-34 7t-36.5 1.5q-30 0 -39 -5.5t-9 -20.5z" />
+<glyph unicode="&#x433;" horiz-adv-x="394" d="M387 309h-17q-10 60 -47.5 85.5t-127.5 25.5q-19 0 -25.5 -7t-6.5 -25v-316q0 -31 12 -42.5t50 -14.5v-15h-208v15q41 3 51.5 12.5t10.5 51.5v309q0 31 -10.5 38t-51.5 9v15h365z" />
+<glyph unicode="&#x434;" horiz-adv-x="462" d="M439 450v-15q-40 -3 -51 -14.5t-11 -54.5v-284q0 -45 10 -54.5t51 -12.5v-152h-18q-24 86 -45 111.5t-53 25.5h-186q-31 0 -56 -26.5t-48 -110.5h-18v152q59 0 79 42.5t20 141.5v167q0 38 -15.5 51.5t-55.5 17.5v15h397zM293 81v298q0 28 -7 35.5t-33 7.5h-70 q-20 0 -28.5 -8.5t-8.5 -33.5v-201q0 -95 -30 -151h135q42 0 42 53z" />
+<glyph unicode="&#x435;" horiz-adv-x="466" d="M421 164l16 -7q-60 -167 -209 -167q-88 0 -139 61.5t-51 165.5q0 107 57 175t150 68q90 0 139 -69q28 -40 34 -116h-308q0 -89 37.5 -151t115.5 -62q50 0 85.5 23t72.5 79zM112 303h204q-9 65 -30 94.5t-68 29.5q-41 0 -69.5 -33.5t-36.5 -90.5z" />
+<glyph unicode="&#x436;" horiz-adv-x="721" d="M707 0h-132l-102 164q-25 40 -35.5 48.5t-36.5 12.5v-158q0 -27 9.5 -38.5t38.5 -12.5l20 -1v-15h-218v15l23 2q23 2 33 13.5t10 36.5v158q-22 -2 -33 -11t-36 -49l-102 -165h-132v15q34 3 53 19q35 32 58 81q29 61 53.5 87t62.5 38v2q-30 15 -49 40t-25.5 45.5t-15.5 36 t-22 15.5q-5 0 -24 -7.5t-32 -7.5q-20 0 -32.5 12t-12.5 32q0 22 17 35t42 13q33 0 53.5 -15.5t35.5 -47.5l14 -31q13 -26 19 -36.5t19 -28t26 -27.5q23 -17 63 -17v124q0 35 -11.5 45t-49.5 14v14h207v-14q-36 -4 -49 -16.5t-13 -40.5v-126q38 0 66 17q14 9 27.5 29.5 t31.5 56.5t24 46q30 54 83 54q28 0 44.5 -14t16.5 -34q0 -19 -13 -31.5t-33 -12.5q-12 0 -30 7.5t-24 7.5q-15 0 -26.5 -15t-19.5 -35t-26 -45.5t-42 -41.5v-2q38 -17 62.5 -42t53.5 -82q28 -54 58 -82q17 -16 53 -19v-15z" />
+<glyph unicode="&#x437;" horiz-adv-x="390" d="M228 242v-1q54 -5 91.5 -33.5t37.5 -78.5q0 -63 -62 -106q-49 -33 -125 -33q-55 0 -90 21.5t-66 65.5l14 14q39 -37 65.5 -51t64.5 -14q52 0 79.5 28.5t27.5 69.5q0 55 -36 78t-109 23v28q55 0 88 17q21 11 33 31.5t12 42.5q0 43 -22.5 65.5t-60.5 22.5q-53 0 -81 -34 t-40 -99h-17l7 161h13q5 -23 26 -23q6 0 18.5 5.5t17.5 6.5q39 11 58 11q69 0 106 -18q61 -30 61 -88q0 -42 -33.5 -73t-77.5 -39z" />
+<glyph unicode="&#x438;" horiz-adv-x="525" d="M502 450v-15q-40 -3 -51 -14.5t-11 -54.5v-287q0 -39 11 -49.5t50 -14.5v-15h-207v15q38 3 50 14.5t12 44.5v256l-187 -258q0 -31 12 -42.5t50 -14.5v-15h-208v15q41 3 51.5 12.5t10.5 51.5v287q0 40 -11.5 52.5t-49.5 16.5v15h207v-15q-40 -4 -51 -15t-11 -43v-256 l187 257q0 32 -12 43t-50 14v15h208z" />
+<glyph unicode="&#x439;" horiz-adv-x="525" d="M502 450v-15q-40 -3 -51 -14.5t-11 -54.5v-287q0 -39 11 -49.5t50 -14.5v-15h-207v15q38 3 50 14.5t12 44.5v256l-187 -258q0 -31 12 -42.5t50 -14.5v-15h-208v15q41 3 51.5 12.5t10.5 51.5v287q0 40 -11.5 52.5t-49.5 16.5v15h207v-15q-40 -4 -51 -15t-11 -43v-256 l187 257q0 32 -12 43t-50 14v15h208zM402 637q0 -42 -44 -66.5t-91 -24.5t-91 24.5t-44 66.5q0 31 19.5 49t42.5 18q24 0 24 -25q0 -18 -22 -24t-22 -17q0 -40 93 -40t93 40q0 11 -22 17t-22 24q0 25 27 25q24 0 41.5 -18t17.5 -49z" />
+<glyph unicode="&#x43a;" horiz-adv-x="503" d="M495 0h-132l-109 164q-26 39 -36.5 48t-35.5 13v-158q0 -27 11 -38.5t41 -12.5l23 -1v-15h-234v15l28 2q28 2 37.5 13t9.5 37v310q0 35 -11.5 45t-49.5 14v14h207v-14q-36 -4 -49 -16.5t-13 -40.5v-126q38 0 66 17q10 6 21 21.5t18 28.5l19 38l17 34q34 64 91 64 q28 0 44.5 -14t16.5 -34q0 -19 -13 -31.5t-33 -12.5q-12 0 -30 7.5t-24 7.5q-15 0 -26.5 -15t-19.5 -35t-26 -45.5t-42 -41.5v-2q40 -18 67.5 -43.5t55.5 -80.5q28 -54 58 -82q17 -16 53 -19v-15z" />
+<glyph unicode="&#x43b;" horiz-adv-x="499" d="M476 450v-15q-40 -3 -51 -14.5t-11 -54.5v-287q0 -39 11 -49.5t50 -14.5v-15h-207v15q38 3 50 14.5t12 44.5v305q0 28 -7 35.5t-33 7.5h-70q-20 0 -28.5 -10t-8.5 -35v-198q0 -23 -1 -38.5t-3.5 -40.5t-9.5 -42t-18 -34t-30 -25.5t-43 -8.5q-70 0 -70 50q0 18 12 28 t26 10q21 0 34 -27t21 -27q49 0 49 175v167q0 40 -11.5 52.5t-49.5 16.5v15h387z" />
+<glyph unicode="&#x43c;" horiz-adv-x="617" d="M594 450v-15q-40 -3 -51 -14.5t-11 -54.5v-287q0 -39 11 -49.5t50 -14.5v-15h-213v15q41 3 54.5 14.5t13.5 44.5v274h-1l-152 -348h-9l-167 344h-1v-272q0 -31 13.5 -43.5t52.5 -13.5v-15h-161v15q41 3 51.5 12.5t10.5 51.5v287q0 40 -11.5 52.5t-49.5 16.5v15h134 l157 -326l143 326h136z" />
+<glyph unicode="&#x43d;" horiz-adv-x="525" d="M502 450v-15q-40 -3 -51 -14.5t-11 -54.5v-287q0 -39 11 -49.5t50 -14.5v-15h-207v15q38 3 50 14.5t12 44.5v141h-187v-143q0 -31 12 -42.5t50 -14.5v-15h-208v15q41 3 51.5 12.5t10.5 51.5v287q0 40 -11.5 52.5t-49.5 16.5v15h207v-15q-40 -4 -51 -15t-11 -43v-129h187 v130q0 32 -12 43t-50 14v15h208z" />
+<glyph unicode="&#x43e;" horiz-adv-x="512" d="M476 231q0 -105 -62.5 -173t-162.5 -68q-92 0 -154 67.5t-62 170.5q0 104 62 168t163 64q93 0 154.5 -63.5t61.5 -165.5zM386 204q0 114 -50 178q-40 50 -95 50q-52 0 -84 -42.5t-32 -116.5q0 -128 53 -205q34 -50 90 -50q55 0 86.5 49.5t31.5 136.5z" />
+<glyph unicode="&#x43f;" horiz-adv-x="525" d="M502 450v-15q-39 -2 -50.5 -12.5t-11.5 -54.5v-293q0 -38 10.5 -47t50.5 -13v-15h-204v15q37 3 48 14.5t11 44.5v298q0 50 -45 50h-100q-42 0 -42 -50v-300q0 -30 12.5 -42t49.5 -15v-15h-208v15q40 3 51 13.5t11 49.5v292q0 44 -10.5 53.5t-50.5 11.5v15h478z" />
+<glyph unicode="&#x440;" horiz-adv-x="499" d="M152 458v-77q63 79 144 79q73 0 120 -60t47 -153q0 -110 -57.5 -183.5t-146.5 -73.5q-60 0 -107 43v-159q0 -47 16 -61t72 -15v-15h-242v15q44 4 57 17t13 52v470q0 35 -8 46t-33 11q-16 0 -25 -1v16q70 21 144 51zM152 334v-246q0 -23 34.5 -45.5t69.5 -22.5 q54 0 87.5 52t33.5 135q0 88 -33.5 140.5t-89.5 52.5q-35 0 -68.5 -22t-33.5 -44z" />
+<glyph unicode="&#x441;" horiz-adv-x="456" d="M414 156l14 -9q-43 -84 -82 -115q-51 -42 -115 -42q-83 0 -136.5 62.5t-53.5 159.5q0 127 84 197q62 51 135 51q63 0 108.5 -30.5t45.5 -72.5q0 -17 -14 -29.5t-33 -12.5q-35 0 -48 46l-6 22q-8 28 -20 38.5t-39 10.5q-61 0 -98.5 -48.5t-37.5 -126.5q0 -86 43 -140.5 t112 -54.5q43 0 74 21t67 73z" />
+<glyph unicode="&#x442;" horiz-adv-x="434" d="M426 309h-17q-10 60 -35.5 86.5t-82.5 26.5q-19 0 -25.5 -7t-6.5 -25v-318q0 -31 12 -42.5t50 -14.5v-15h-208v15q41 3 51.5 12.5t10.5 51.5v311q0 20 -7 26t-27 6q-56 0 -81 -26.5t-35 -86.5h-17l5 141h408z" />
+<glyph unicode="&#x443;" horiz-adv-x="491" d="M483 450v-15q-18 -2 -28.5 -12.5t-21.5 -38.5l-164 -409q-43 -107 -81 -150t-94 -43q-32 0 -51 16.5t-19 41.5q0 19 12.5 32.5t30.5 13.5q31 0 54 -13q13 -7 29 -7q28 0 60.5 60.5t32.5 85.5q0 9 -46 106l-136 283q-13 29 -53 35v14h205v-15q-32 -1 -44.5 -7t-12.5 -20 q0 -11 13 -41l120 -256l105 274q4 9 4 26q0 24 -48 24v15h133z" />
+<glyph unicode="&#x444;" horiz-adv-x="678" d="M379 660v-253q12 23 36 38t55 15q77 0 121 -63t44 -170q0 -134 -60 -197q-39 -40 -103 -40q-30 0 -55.5 15t-37.5 38v-169q0 -47 16 -61t72 -15v-15h-238v15q44 4 57 17t13 52v176q-12 -23 -37.5 -38t-55.5 -15q-64 0 -103 40q-60 63 -60 197q0 107 44 170t121 63 q31 0 55 -15t36 -38v132q0 35 -8 46t-33 11q-16 0 -25 -1v16q58 18 140 51zM379 357v-262q0 -24 26 -49.5t62 -25.5q35 0 59 56q23 55 23 157q0 80 -22 138.5t-60 58.5q-35 0 -61.5 -25t-26.5 -48zM299 95v260q0 24 -26.5 49.5t-61.5 25.5q-38 0 -60 -58.5t-22 -138.5 q0 -102 23 -157q24 -56 59 -56q36 0 62 25.5t26 49.5z" />
+<glyph unicode="&#x445;" horiz-adv-x="489" d="M476 0h-201v15q25 2 32.5 6.5t7.5 17.5q0 9 -6 18l-92 143l-79 -122q-19 -30 -19 -45q0 -18 40 -18v-15h-145v15q26 2 40.5 11t34.5 39l112 165l-94 145q-23 35 -39 47.5t-38 12.5h-9v15h207v-15q-43 -1 -43 -22q0 -22 46 -89l18 -26l28 39q35 49 35 76q0 19 -40 22v15 h158v-15q-51 -2 -81 -44l-83 -120l128 -196q39 -60 82 -60v-15z" />
+<glyph unicode="&#x446;" horiz-adv-x="525" d="M502 450v-15q-40 -3 -51 -13.5t-11 -49.5v-292q0 -44 10.5 -53.5t50.5 -11.5v-152h-15q-14 49 -27 78.5t-28.5 41.5t-26 14.5t-30.5 2.5h-351v15q39 2 50.5 12.5t11.5 54.5v293q0 38 -10.5 47t-50.5 13v15h208v-15q-38 -3 -50.5 -14.5t-12.5 -44.5v-298q0 -28 9.5 -39 t30.5 -11h105q42 0 42 50v300q0 30 -13.5 42t-51.5 15v15h211z" />
+<glyph unicode="&#x447;" horiz-adv-x="512" d="M489 450v-15q-40 -3 -51 -13.5t-11 -49.5v-295q0 -37 11 -47.5t50 -14.5v-15h-207v15q37 3 49.5 15t12.5 47v138q-2 -1 -14 -6l-18 -7q-6 -3 -19 -7t-23.5 -6t-25.5 -4t-30 -2q-67 0 -100.5 20.5t-33.5 84.5v84q0 40 -10.5 49.5t-50.5 13.5v15h208v-15q-39 -3 -51 -13.5 t-12 -49.5v-78q0 -46 17 -63.5t66 -17.5q17 0 34 3.5t25.5 6t22.5 8.5l15 6v142q0 29 -13.5 41t-51.5 15v15h211z" />
+<glyph unicode="&#x448;" horiz-adv-x="768" d="M745 450v-15q-40 -3 -51 -14.5t-11 -54.5v-287q0 -41 11 -51.5t50 -12.5v-15h-721v15q41 3 51.5 12.5t10.5 51.5v287q0 40 -11.5 52.5t-49.5 16.5v15h205v-15q-37 -4 -48.5 -15t-11.5 -43v-299q0 -28 11 -39t34 -11h86q24 0 33 10.5t9 38.5v300q0 30 -14.5 43t-45.5 15 v15h204v-15q-31 -2 -45.5 -15t-14.5 -43v-299q0 -28 11 -39t34 -11h86q24 0 33 10.5t9 39.5v300q0 32 -11.5 43t-48.5 14v15h206z" />
+<glyph unicode="&#x449;" horiz-adv-x="768" d="M745 450v-15q-40 -3 -51 -14.5t-11 -54.5v-287q0 -43 10.5 -52.5t50.5 -11.5v-152h-15q-23 85 -46 111t-54 26h-606v15q41 3 51.5 12.5t10.5 51.5v287q0 40 -11.5 52.5t-49.5 16.5v15h205v-15q-38 -4 -49 -15t-11 -43v-299q0 -28 11 -39t34 -11h86q24 0 33 10.5t9 38.5 v300q0 30 -14 42.5t-45 15.5h-1v15h204v-15q-32 -3 -46 -15.5t-14 -42.5v-299q0 -28 11 -39t34 -11h86q24 0 33 10.5t9 39.5v300q0 32 -11.5 43t-48.5 14v15h206z" />
+<glyph unicode="&#x44a;" horiz-adv-x="539" d="M251 252h66q85 0 137.5 -31.5t52.5 -96.5q0 -58 -47 -91t-123 -33h-232v15q41 3 51.5 12.5t10.5 51.5v312q0 31 -44 31q-43 0 -64 -21.5t-34 -79.5h-17l8 129h297v-15q-40 -4 -51 -15t-11 -43v-125zM251 224v-165q0 -19 6 -25t28 -6q64 0 97.5 21t33.5 78q0 56 -32 76.5 t-88 20.5h-45z" />
+<glyph unicode="&#x44b;" horiz-adv-x="670" d="M169 252h66q85 0 137.5 -31.5t52.5 -96.5q0 -58 -47 -91t-123 -33h-232v15q41 3 51.5 12.5t10.5 51.5v287q0 40 -11.5 52.5t-49.5 16.5v15h207v-15q-40 -4 -51 -15t-11 -43v-125zM169 224v-165q0 -19 6 -25t28 -6q64 0 97.5 21t33.5 78q0 56 -32 76.5t-88 20.5h-45z M646 0h-208v15q41 3 51.5 12.5t10.5 51.5v287q0 40 -11.5 52.5t-49.5 16.5v15h207v-15q-40 -4 -51 -15t-11 -43v-305q0 -30 12 -41.5t50 -14.5v-16z" />
+<glyph unicode="&#x44c;" horiz-adv-x="457" d="M169 252h66q85 0 137.5 -31.5t52.5 -96.5q0 -58 -47 -91t-123 -33h-232v15q41 3 51.5 12.5t10.5 51.5v287q0 40 -11.5 52.5t-49.5 16.5v15h207v-15q-40 -4 -51 -15t-11 -43v-125zM169 224v-165q0 -19 6 -25t28 -6q64 0 97.5 21t33.5 78q0 56 -32 76.5t-88 20.5h-45z" />
+<glyph unicode="&#x44d;" horiz-adv-x="444" d="M59 457h15q5 -23 22 -23q8 0 37 12q34 14 70 14q101 0 154 -69t53 -171q0 -101 -57 -165.5t-151 -64.5q-38 0 -69 14t-54.5 43t-35 47t-29.5 53l15 9q34 -53 67.5 -73.5t79.5 -20.5q68 0 108 46t45 116h-178v33h179q-1 79 -36 127t-97 48q-33 0 -57 -10t-38.5 -30 t-22 -36t-15.5 -42h-17z" />
+<glyph unicode="&#x44e;" horiz-adv-x="738" d="M169 248h93q6 96 67 154t158 58q93 0 154.5 -63.5t61.5 -165.5q0 -105 -62.5 -173t-162.5 -68q-89 0 -150.5 63.5t-65.5 161.5h-93v-143q0 -31 12 -42.5t50 -14.5v-15h-208v15q41 3 51.5 12.5t10.5 51.5v287q0 40 -11.5 52.5t-49.5 16.5v15h207v-15q-40 -4 -51 -15 t-11 -43v-129zM613 204q0 114 -50 178q-40 50 -95 50q-52 0 -84 -42.5t-32 -116.5q0 -128 53 -205q34 -50 90 -50q55 0 86.5 49.5t31.5 136.5z" />
+<glyph unicode="&#x44f;" horiz-adv-x="471" d="M448 450v-15q-39 -3 -50.5 -14.5t-11.5 -54.5v-287q0 -39 11 -48.5t50 -13.5v-17h-202v15q37 2 47 12.5t10 48.5v130h-19l-155 -206h-124v15q34 3 70 47l119 147q-62 8 -101.5 41t-39.5 85q0 36 14 60t42.5 35.5t59 15.5t74.5 4h206zM302 234v157q0 19 -6 25t-24 6 q-58 0 -93.5 -19.5t-35.5 -73.5q0 -46 31 -70.5t88 -24.5h40z" />
+<glyph unicode="&#x451;" horiz-adv-x="466" d="M421 164l16 -7q-60 -167 -209 -167q-88 0 -139 61.5t-51 165.5q0 107 57 175t150 68q90 0 139 -69q28 -40 34 -116h-308q0 -89 37.5 -151t115.5 -62q50 0 85.5 23t72.5 79zM112 303h204q-9 65 -30 94.5t-68 29.5q-41 0 -69.5 -33.5t-36.5 -90.5zM385 572q0 -20 -15 -34.5 t-36 -14.5q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5t35 -15t15 -35zM186 572q0 -20 -15 -34.5t-36 -14.5q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5t35 -15t15 -35z" />
+<glyph unicode="&#x452;" horiz-adv-x="512" d="M439 306v-306q0 -107 -43.5 -162.5t-126.5 -55.5q-41 0 -67 15.5t-26 39.5q0 16 12 27.5t29 11.5q23 0 48 -32q23 -29 42 -29q23 0 34 19q14 25 14 121v349q0 102 -74 102q-31 0 -56 -14t-56 -49v-241q0 -52 12 -67t56 -20v-15h-216v15q43 6 53.5 20t10.5 67v429h-79v33 h79v13q0 32 -9 39.5t-42 7.5q-9 0 -12 -1v16l27 8q77 23 115 36l5 -3v-116h213v-33h-213v-155q34 46 69 65t82 19q57 0 88 -40t31 -114z" />
+<glyph unicode="&#x453;" horiz-adv-x="394" d="M387 309h-17q-10 60 -47.5 85.5t-127.5 25.5q-19 0 -25.5 -7t-6.5 -25v-316q0 -31 12 -42.5t50 -14.5v-15h-208v15q41 3 51.5 12.5t10.5 51.5v309q0 31 -10.5 38t-51.5 9v15h365zM108 508l147 148q23 23 42 23q35 0 35 -32q0 -23 -30 -42l-154 -97h-40z" />
+<glyph unicode="&#x454;" horiz-adv-x="444" d="M415 156l15 -9q-18 -35 -29.5 -53t-35 -47t-54.5 -43t-69 -14q-94 0 -151 64.5t-57 165.5q0 102 53 171t154 69q36 0 70 -14q29 -12 37 -12q17 0 22 23h15l12 -143h-16q-8 25 -15.5 42t-22.5 36.5t-39 29.5t-57 10q-62 0 -97 -48t-36 -127h179v-33h-178q5 -70 45 -116 t108 -46q46 0 79.5 20.5t67.5 73.5z" />
+<glyph unicode="&#x455;" horiz-adv-x="389" d="M154 301l104 -63q50 -30 69 -56t19 -67q0 -50 -41.5 -87.5t-98.5 -37.5q-47 0 -73 9q-27 9 -46 9q-17 0 -24 -12h-13v157h16q16 -73 46 -107t81 -34q37 0 60 21t23 53q0 46 -53 75l-54 30q-120 67 -120 145q0 58 37.5 90.5t100.5 32.5q44 0 67 -11q18 -8 28 -8q7 0 16 10 h11l5 -136h-15q-17 68 -42.5 95.5t-70.5 27.5q-34 0 -54.5 -17t-20.5 -51q0 -17 11.5 -36.5t31.5 -31.5z" />
+<glyph unicode="&#x456;" horiz-adv-x="278" d="M193 632q0 -22 -15 -36.5t-37 -14.5q-21 0 -35.5 14.5t-14.5 36.5q0 21 15 36t36 15q22 0 36.5 -15t14.5 -36zM266 0h-237v15q52 3 65.5 18t13.5 71v227q0 35 -7 49t-26 14q-24 0 -42 -5v16l155 55l4 -4v-351q0 -56 12.5 -71t61.5 -19v-15z" />
+<glyph unicode="&#x457;" horiz-adv-x="278" d="M264 0h-237v15q52 3 65.5 18t13.5 71v227q0 35 -7 49t-26 14q-24 0 -42 -5v16l154 55l5 -4v-351q0 -56 12.5 -71t61.5 -19v-15zM299 572q0 -20 -15 -34.5t-36 -14.5q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5t35 -15t15 -35zM100 572q0 -20 -15 -34.5t-36 -14.5 q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5t35 -15t15 -35z" />
+<glyph unicode="&#x458;" horiz-adv-x="278" d="M186 457v-457q0 -107 -43.5 -162.5t-126.5 -55.5q-41 0 -67 15.5t-26 39.5q0 16 12 27.5t29 11.5q23 0 48 -32q23 -28 42 -28q23 0 34 18q14 25 14 121v379q0 60 -32 60q-24 0 -40 -3l-5 -1v16q80 25 156 54zM187 632q0 -22 -15 -36.5t-37 -14.5q-21 0 -35.5 14.5 t-14.5 36.5q0 21 15 36t36 15t36 -15t15 -36z" />
+<glyph unicode="&#x459;" horiz-adv-x="702" d="M414 252h66q85 0 137.5 -31.5t52.5 -96.5q0 -58 -47 -91t-123 -33h-232v15q41 3 51.5 12.5t10.5 51.5v300q0 28 -7 35.5t-33 7.5h-70q-20 0 -28.5 -10t-8.5 -35v-198q0 -23 -1 -38.5t-3.5 -40.5t-9.5 -42t-18 -34t-30 -25.5t-43 -8.5q-70 0 -70 50q0 18 12 28t26 10 q21 0 34 -27t21 -27q49 0 49 175v167q0 40 -11.5 52.5t-49.5 16.5v15h387v-15q-40 -3 -51 -14.5t-11 -54.5v-114zM414 224v-165q0 -19 6 -25t28 -6q64 0 97.5 21t33.5 78q0 56 -32 76.5t-88 20.5h-45z" />
+<glyph unicode="&#x45a;" horiz-adv-x="721" d="M433 245h66q190 0 190 -121q0 -58 -47 -91t-123 -33h-232v15q41 3 51.5 12.5t10.5 51.5v136h-180v-143q0 -31 12 -42.5t50 -14.5v-15h-208v15q41 3 51.5 12.5t10.5 51.5v287q0 40 -11.5 52.5t-49.5 16.5v15h207v-15q-40 -4 -51 -15t-11 -43v-132h180v133q0 32 -12 43 t-50 14v15h208v-15q-38 -3 -50 -13t-12 -45v-132zM433 215v-156q0 -19 6 -25t28 -6q65 0 98 20t33 77q0 55 -30.5 72.5t-89.5 17.5h-45z" />
+<glyph unicode="&#x45b;" horiz-adv-x="512" d="M499 0h-212v15q44 5 56 20t12 67v198q0 106 -74 106q-30 0 -55 -14t-57 -49v-241q0 -52 12 -67t56 -20v-15h-216v15q43 6 53.5 20t10.5 67v429h-79v33h79v8q0 32 -9.5 42t-41.5 10q-9 0 -12 -1v16l27 8q77 23 115 36l5 -3v-116h213v-33h-213v-155q35 45 69 64.5t78 19.5 q123 0 123 -159v-199q0 -52 9.5 -65.5t50.5 -21.5v-15z" />
+<glyph unicode="&#x45c;" horiz-adv-x="503" d="M495 0h-132l-109 164q-26 39 -36.5 48t-35.5 13v-158q0 -27 11 -38.5t41 -12.5l23 -1v-15h-234v15l28 2q28 2 37.5 13t9.5 37v310q0 35 -11.5 45t-49.5 14v14h207v-14q-36 -4 -49 -16.5t-13 -40.5v-126q38 0 66 17q10 6 21 21.5t18 28.5l19 38l17 34q34 64 91 64 q28 0 44.5 -14t16.5 -34q0 -19 -13 -31.5t-33 -12.5q-12 0 -30 7.5t-24 7.5q-15 0 -26.5 -15t-19.5 -35t-26 -45.5t-42 -41.5v-2q40 -18 67.5 -43.5t55.5 -80.5q28 -54 58 -82q17 -16 53 -19v-15zM165 508l147 148q23 23 42 23q35 0 35 -32q0 -23 -30 -42l-154 -97h-40z" />
+<glyph unicode="&#x45e;" horiz-adv-x="491" d="M393 637q0 -42 -44 -66.5t-91 -24.5t-91 24.5t-44 66.5q0 31 19.5 49t42.5 18q24 0 24 -25q0 -18 -22 -24t-22 -17q0 -40 93 -40t93 40q0 11 -22 17t-22 24q0 25 27 25q24 0 41.5 -18t17.5 -49zM483 450v-15q-18 -2 -28.5 -12.5t-21.5 -38.5l-164 -409q-43 -107 -81 -150 t-94 -43q-32 0 -51 16.5t-19 41.5q0 19 12.5 32.5t30.5 13.5q31 0 54 -13q13 -7 29 -7q28 0 59 60.5t31 85.5q0 11 -45 106l-134 283q-13 29 -53 35v14h205v-15q-32 -1 -44.5 -7t-12.5 -20q0 -11 13 -41l117 -256l108 274q4 9 4 26q0 24 -48 24v15h133z" />
+<glyph unicode="&#x45f;" horiz-adv-x="518" d="M495 450v-15q-40 -3 -51 -13.5t-11 -49.5v-292q0 -44 10.5 -53.5t50.5 -11.5v-15h-117q-21 0 -32 -2.5t-27.5 -14t-28.5 -41.5t-22 -79h-17q-10 49 -22 79t-28.5 41.5t-27.5 14t-32 2.5h-117v15q39 2 50.5 12.5t11.5 54.5v293q0 38 -10.5 47t-50.5 13v15h208v-15 q-38 -3 -50.5 -14.5t-12.5 -44.5v-298q0 -28 9.5 -39t30.5 -11h98q42 0 42 50v300q0 30 -13.5 42t-51.5 15v15h211z" />
+<glyph unicode="&#x462;" horiz-adv-x="746" d="M335 366h109q124 0 196.5 -44t72.5 -140q0 -85 -64.5 -133.5t-174.5 -48.5h-337v19q59 2 77.5 19.5t18.5 74.5v392q0 31 -34 31h-15q-67 0 -89 -12.5t-38 -52.5q-3 -8 -7 -37h-24l7 140h200q0 41 -19 53t-77 16v19h294v-19q-56 -5 -76 -16.5t-20 -52.5h200l5 -138h-24 q-3 25 -10 40q-17 36 -44.5 48t-82.5 12h-9q-35 0 -35 -30v-140zM335 326v-243q0 -25 13.5 -35t48.5 -10q96 0 148.5 29.5t52.5 111.5q0 147 -185 147h-78z" />
+<glyph unicode="&#x463;" horiz-adv-x="539" d="M251 252h66q85 0 137.5 -31.5t52.5 -96.5q0 -58 -47 -91t-123 -33h-232v15q40 3 51 13.5t11 50.5v317q-3 26 -34 26q-55 0 -76 -23t-32 -78h-17l8 129h151v114q0 35 -7.5 44t-33.5 9q-16 0 -25 -1v16q70 21 144 51l6 -2v-231h151l8 -129h-17q-11 55 -32.5 78t-77.5 23 q-19 0 -25.5 -7t-6.5 -25v-138zM251 224v-165q0 -19 6 -25t28 -6q64 0 97.5 21t33.5 78q0 56 -32 76.5t-88 20.5h-45z" />
+<glyph unicode="&#x46a;" horiz-adv-x="998" d="M992 0h-290v19q32 2 43 13.5t11 35.5q0 37 -32 89q-89 141 -174 147v-193q0 -57 17.5 -73t75.5 -19v-19h-286v19q60 5 75.5 21.5t15.5 82.5v181q-85 -6 -174 -147q-32 -52 -32 -89q0 -24 11 -35.5t43 -13.5v-19h-290v19q42 3 74 29t49.5 57.5t44 75t51.5 68.5 q73 75 186 99l-213 314h584l-203 -314q52 -2 104.5 -31.5t89.5 -67.5q25 -25 51.5 -68.5t44 -75t49.5 -57.5t74 -29v-19zM701 617h-353l179 -269z" />
+<glyph unicode="&#x46b;" horiz-adv-x="722" d="M708 0h-204v15q22 1 30 9t8 24q0 24 -23 59q-60 93 -116 102v-143q0 -33 10.5 -41t45.5 -10v-15h-196v15q35 2 45.5 10t10.5 41v143q-55 -9 -116 -102q-23 -35 -23 -59q0 -16 8 -24t30 -9v-15h-204v15q38 3 62.5 30t48 70.5t43.5 63.5q57 57 134 57v2l-159 212h412 l-137 -211v-3q77 0 136 -57q18 -17 36 -47l30 -54q13 -23 36 -42t52 -21v-15zM501 422h-233l123 -174z" />
+<glyph unicode="&#x472;" horiz-adv-x="729" d="M690 331q0 -154 -91 -249.5t-236 -95.5q-146 0 -236.5 96t-90.5 252q0 152 90.5 247t236.5 95t236.5 -97.5t90.5 -247.5zM575 358q-3 78 -26.5 139.5t-63.5 95.5q-56 47 -123 47q-85 0 -143 -67q-30 -34 -48.5 -96t-20.5 -123q77 69 145 69q22 0 49.5 -16.5t50 -36 t51.5 -36t53 -16.5q37 0 76 40zM576 317q-59 -68 -138 -68q-38 0 -108 52.5t-104 52.5q-36 0 -76 -41q5 -168 90 -246q49 -45 124 -45q78 0 129 48q39 38 61 104t22 143z" />
+<glyph unicode="&#x473;" horiz-adv-x="512" d="M476 231q0 -105 -62.5 -173t-162.5 -68q-92 0 -154 67.5t-62 170.5q0 104 62 168t163 64q93 0 154.5 -63.5t61.5 -165.5zM384 240q-8 86 -48 142q-43 50 -95 50t-84 -42.5t-32 -116.5q0 -20 1 -30q45 44 90 44q28 0 67 -32.5t61 -32.5q19 0 40 18zM386 204v10 q-42 -44 -92 -44q-30 0 -68 32.5t-58 32.5q-18 0 -40 -19q10 -89 50 -148q34 -50 90 -50q55 0 86.5 49.5t31.5 136.5z" />
+<glyph unicode="&#x474;" horiz-adv-x="766" d="M399 161l133 373q25 71 57.5 106.5t94.5 35.5q36 0 56 -18t20 -45q0 -22 -12 -40t-36 -18q-19 0 -32 9t-17.5 19.5t-11 19.5t-14.5 9q-28 0 -52 -67l-202 -556h-15l-244 544q-32 71 -51 90t-57 20v19h265v-19l-28 -2q-45 -3 -45 -31q0 -20 39 -107z" />
+<glyph unicode="&#x475;" horiz-adv-x="539" d="M280 114l79 219q44 123 116 123q28 0 42.5 -14t14.5 -34q0 -19 -13 -31.5t-33 -12.5q-12 0 -26.5 7.5t-20.5 7.5q-16 0 -26.5 -17t-23.5 -51l-105 -277q-18 -48 -28 -48q-8 0 -29 47l-117 287q-30 73 -46 93t-45 22v15h196v-15q-26 -2 -36 -8t-10 -19q0 -16 9 -38 l99 -256h3z" />
+<glyph unicode="&#x490;" horiz-adv-x="571" d="M544 803l-5 -179h-296q-22 0 -28.5 -6.5t-6.5 -29.5v-476q0 -56 16.5 -73t74.5 -20v-19h-280v19q56 4 71.5 20.5t15.5 74.5v436q0 56 -15.5 73t-71.5 20v19h365q100 0 126 91q7 23 10 50h24z" />
+<glyph unicode="&#x491;" horiz-adv-x="394" d="M387 558l-5 -138h-192q-16 0 -21.5 -7.5t-5.5 -24.5v-316q0 -31 12 -42.5t50 -14.5v-15h-208v15q41 3 51.5 12.5t10.5 51.5v309q0 31 -10.5 38t-51.5 9v15h196q47 0 76 6t45.5 21.5t23 32.5t12.5 48h17z" />
+<glyph unicode="&#x1d00;" horiz-adv-x="510" d="M495 0h-177v18q28 0 38 6q10 5 10 12q0 20 -13 49l-28 65h-175l-32 -80q-6 -14 -6 -29t7.5 -19t33.5 -4v-18h-138v18q30 3 43.5 20t44.5 91l142 339h15l171 -391q15 -34 26.5 -45t37.5 -14v-18zM312 184l-76 179l-73 -179h149z" />
+<glyph unicode="&#x1d07;" horiz-adv-x="504" d="M481 119l-36 -119h-424v18q45 3 56 14.5t11 52.5v296q0 40 -11.5 51.5t-55.5 13.5v18h419v-105h-19q-10 47 -31.5 59.5t-91.5 12.5h-101q-16 0 -21.5 -4.5t-5.5 -21.5v-145h116q51 0 66.5 11.5t22.5 53.5h20v-166h-20q-7 44 -22 56t-67 12h-116v-161q0 -22 10 -27.5 t53 -5.5h41q89 0 124 15.5t62 70.5h21z" />
+<glyph unicode="&#x1d1c;" horiz-adv-x="583" d="M560 464v-18q-47 -4 -57.5 -20t-10.5 -70v-176q0 -54 -8.5 -85t-34.5 -57q-50 -52 -161 -52q-79 0 -134 38q-66 44 -66 148v214q0 32 -12.5 45.5t-54.5 14.5v18h215v-18q-45 -4 -56 -16.5t-11 -50.5v-212q0 -46 6.5 -70t28.5 -44q37 -32 102 -32q83 0 122 42 q19 19 25 43.5t6 70.5v177q0 55 -12.5 71.5t-56.5 20.5v18h170z" />
+<glyph unicode="&#x1d81;" horiz-adv-x="528" d="M491 58v-206q0 -58 -31 -98.5t-77 -40.5q-53 0 -90.5 15.5t-37.5 39.5q0 11 8 19t20 8q7 0 14 -3.5t9.5 -6t10 -11.5t9.5 -11q27 -31 54 -31q56 0 56 91v199l-92 -32l-4 3v64q-48 -67 -128 -67q-83 0 -134 59.5t-51 155.5q0 106 61 180.5t147 74.5q54 0 105 -43v156 q0 31 -9 41t-37 10q-14 0 -22 -1v16q91 24 147 44l5 -2v-567q0 -35 8.5 -46t35.5 -11q6 0 23 1zM340 102v230q0 40 -30.5 70t-71.5 30q-57 0 -91 -51t-34 -136q0 -92 37.5 -147.5t100.5 -55.5q47 0 74 32q15 17 15 28z" />
+<glyph unicode="&#x1d84;" horiz-adv-x="542" d="M505 15v-163q0 -58 -31 -98.5t-77 -40.5q-53 0 -90.5 15.5t-37.5 39.5q0 11 8 19t20 8q7 0 14 -3.5t9.5 -6t10 -11.5t9.5 -11q27 -31 54 -31q56 0 56 91v177h-163v15h19q21 0 21 15q0 9 -11 23l-150 198v-184q0 -26 12.5 -38t42.5 -13l20 -1v-15h-234v15q54 9 64.5 18.5 t10.5 48.5v482q0 36 -9 48.5t-34 12.5q-6 0 -32 -2v16l30 8q60 16 125 36l4 -2v-420l137 122q23 21 23 35q0 10 -10.5 13.5t-39.5 4.5v14h204v-15q-50 0 -88.5 -21.5t-127.5 -104.5l-29 -27l153 -194q54 -69 117 -73z" />
+<glyph unicode="&#x1d85;" horiz-adv-x="294" d="M257 15v-163q0 -52 -29 -95.5t-79 -43.5q-39 0 -83.5 13t-44.5 42q0 12 8 19.5t20 7.5q15 0 28.5 -15.5t30.5 -31.5t38 -16q56 0 56 91v177h-181v15q45 3 61 18.5t16 58.5v469q0 21 -2 32.5t-11.5 21.5t-28.5 10q-25 0 -37 -2v16q94 23 158 44l5 -4v-592q0 -44 15 -57 t60 -15z" />
+<glyph unicode="&#x1d8a;" horiz-adv-x="389" d="M156 301l104 -63q50 -30 69 -56t19 -67q0 -31 -18 -60v-203q0 -58 -31 -98.5t-77 -40.5q-53 0 -90.5 15.5t-37.5 39.5q0 11 8 19t20 8q7 0 14 -3.5t9.5 -6t10 -11.5t9.5 -11q27 -31 54 -31q56 0 56 91v183q-32 -16 -67 -16q-47 0 -73 9q-27 9 -46 9q-17 0 -24 -12h-13 v157h16q16 -73 46 -107t81 -34q37 0 60 21t23 53q0 46 -53 75l-54 30q-120 67 -120 145q0 58 37.5 90.5t100.5 32.5q44 0 67 -11q18 -8 28 -8q7 0 16 10h11l5 -136h-15q-17 68 -42.5 95.5t-70.5 27.5q-34 0 -54.5 -17t-20.5 -51q0 -17 11.5 -36.5t31.5 -31.5z" />
+<glyph unicode="&#x1d8d;" horiz-adv-x="516" d="M479 15v-163q0 -58 -31 -98.5t-77 -40.5q-53 0 -90.5 15.5t-37.5 39.5q0 11 8 19t20 8q7 0 14 -3.5t9.5 -6t10 -11.5t9.5 -11q27 -31 54 -31q56 0 56 91v177h-146v15q25 2 32.5 6.5t7.5 17.5q0 9 -6 18l-91 140l-79 -123q-20 -31 -20 -41q0 -18 40 -18v-15h-145v15 q25 2 38.5 11.5t34.5 39.5l114 165l-94 144q-23 35 -39 47.5t-38 12.5h-9v15h207v-15q-43 -1 -43 -22t46 -89q13 -18 14 -20q20 25 30 44q37 55 37 65q0 19 -40 22v15h158v-15q-51 -2 -81 -44l-83 -120l128 -196q39 -60 82 -60z" />
+<glyph unicode="&#x1d8e;" horiz-adv-x="453" d="M416 136v-284q0 -58 -31 -98.5t-77 -40.5q-53 0 -90.5 15.5t-37.5 39.5q0 11 8 19t20 8q7 0 14 -3.5t9.5 -6t10 -11.5t9.5 -11q27 -31 54 -31q56 0 56 91v177h-334v15l266 405h-135q-47 0 -63.5 -16.5t-23.5 -71.5h-18l4 118h346v-15l-269 -405h133q84 0 106 27 q10 12 14.5 26t12.5 55z" />
+<glyph unicode="&#x1e80;" horiz-adv-x="944" d="M582 719h-40l-154 96q-30 19 -30 43q0 32 36 32q21 0 43 -23zM932 662v-19q-40 -8 -54.5 -19.5t-28.5 -50.5q-114 -306 -204 -584h-15l-160 423l-154 -423h-15q-34 101 -101 285l-91 249q-25 72 -45.5 95.5t-58.5 24.5v19h244v-19q-37 -1 -50.5 -8t-13.5 -23 q0 -17 11 -47l144 -376l104 283l-28 75q-24 65 -41 80t-61 16v19h265v-19q-77 -2 -77 -35q0 -13 17 -58l143 -364l126 339q17 48 17 77q0 40 -70 41v19h197z" />
+<glyph unicode="&#x1e81;" horiz-adv-x="722" d="M694 450v-15q-15 -5 -22 -14.5t-19 -39.5l-138 -346q-20 -49 -28 -49q-5 0 -8.5 6.5t-15.5 36.5l-91 236l-112 -240q-18 -39 -25 -39q-9 0 -26 44l-135 342q-15 39 -25 50t-28 13v15h180v-15q-26 -3 -36 -10t-10 -23q0 -15 6 -30l99 -261l91 199l-20 56q-14 40 -27.5 53 t-41.5 16v15h203v-15q-35 -5 -46.5 -12t-11.5 -23t17 -60l84 -224l90 222q17 42 17 67q0 12 -9.5 18.5t-34.5 11.5v15h123zM484 507h-40l-154 96q-30 19 -30 43q0 32 36 32q21 0 43 -23z" />
+<glyph unicode="&#x1e82;" horiz-adv-x="944" d="M359 719l147 148q23 23 42 23q35 0 35 -32q0 -23 -30 -42l-154 -97h-40zM932 662v-19q-40 -8 -54.5 -19.5t-28.5 -50.5q-114 -306 -204 -584h-15l-160 423l-154 -423h-15q-34 101 -101 285l-91 249q-25 72 -45.5 95.5t-58.5 24.5v19h244v-19q-37 -1 -50.5 -8t-13.5 -23 q0 -17 11 -47l144 -376l104 283l-28 75q-24 65 -41 80t-61 16v19h265v-19q-77 -2 -77 -35q0 -13 17 -58l143 -364l126 339q17 48 17 77q0 40 -70 41v19h197z" />
+<glyph unicode="&#x1e83;" horiz-adv-x="722" d="M260 507l147 148q23 23 42 23q35 0 35 -32q0 -23 -30 -42l-154 -97h-40zM694 450v-15q-15 -5 -22 -14.5t-19 -39.5l-138 -346q-20 -49 -28 -49q-5 0 -8.5 6.5t-15.5 36.5l-91 236l-112 -240q-18 -39 -25 -39q-9 0 -26 44l-135 342q-15 39 -25 50t-28 13v15h180v-15 q-26 -3 -36 -10t-10 -23q0 -15 6 -30l99 -261l91 199l-20 56q-14 40 -27.5 53t-41.5 16v15h203v-15q-35 -5 -46.5 -12t-11.5 -23t17 -60l84 -224l90 222q17 42 17 67q0 12 -9.5 18.5t-34.5 11.5v15h123z" />
+<glyph unicode="&#x1e84;" horiz-adv-x="944" d="M619 784q0 -20 -15 -34.5t-36 -14.5q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5t35 -15t15 -35zM420 784q0 -20 -15 -34.5t-36 -14.5q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5t35 -15t15 -35zM932 662v-19q-40 -8 -54.5 -19.5t-28.5 -50.5 q-114 -306 -204 -584h-15l-160 423l-154 -423h-15q-34 101 -101 285l-91 249q-25 72 -45.5 95.5t-58.5 24.5v19h244v-19q-37 -1 -50.5 -8t-13.5 -23q0 -17 11 -47l144 -376l104 283l-28 75q-24 65 -41 80t-61 16v19h265v-19q-77 -2 -77 -35q0 -13 17 -58l143 -364l126 339 q17 48 17 77q0 40 -70 41v19h197z" />
+<glyph unicode="&#x1e85;" horiz-adv-x="722" d="M521 572q0 -20 -15 -34.5t-36 -14.5q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5t35 -15t15 -35zM322 572q0 -20 -15 -34.5t-36 -14.5q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5t35 -15t15 -35zM694 450v-15q-15 -5 -22 -14.5t-19 -39.5l-138 -346 q-20 -49 -28 -49q-5 0 -8.5 6.5t-15.5 36.5l-91 236l-112 -240q-18 -39 -25 -39q-9 0 -26 44l-135 342q-15 39 -25 50t-28 13v15h180v-15q-26 -3 -36 -10t-10 -23q0 -15 6 -30l99 -261l91 199l-20 56q-14 40 -27.5 53t-41.5 16v15h203v-15q-35 -5 -46.5 -12t-11.5 -23 t17 -60l84 -224l90 222q17 42 17 67q0 12 -9.5 18.5t-34.5 11.5v15h123z" />
+<glyph unicode="&#x1ef2;" horiz-adv-x="722" d="M476 719h-40l-154 96q-30 19 -30 43q0 32 36 32q21 0 43 -23zM703 662v-19q-44 -4 -69.5 -25t-68.5 -87l-148 -228v-192q0 -57 19 -73t84 -19v-19h-306v19q68 5 84.5 21.5t16.5 82.5v171l-131 192q-68 100 -97 127.5t-65 29.5v19h279v-19l-24 -1q-47 -1 -47 -26 q0 -21 18 -47l146 -221l145 222q14 21 14 42q-1 17 -15.5 23.5t-52.5 7.5v19h218z" />
+<glyph unicode="&#x1ef3;" horiz-adv-x="500" d="M475 450v-15q-18 -2 -29 -13t-21 -38l-150 -409q-39 -106 -78.5 -149.5t-96.5 -43.5q-32 0 -51 16.5t-19 41.5q0 19 12.5 32.5t30.5 13.5q29 0 52 -13q13 -7 26 -7q21 0 50 44q14 20 27 57t13 51q0 13 -42 101l-132 282q-13 29 -53 35v14h205v-15q-32 -1 -44.5 -7 t-12.5 -20q0 -11 13 -41l112 -250l97 276q4 9 4 18q0 24 -46 24v15h133zM364 507h-40l-154 96q-30 19 -30 43q0 32 36 32q21 0 43 -23z" />
+<glyph unicode="&#x2000;" horiz-adv-x="511" />
+<glyph unicode="&#x2001;" horiz-adv-x="1023" />
+<glyph unicode="&#x2002;" horiz-adv-x="511" />
+<glyph unicode="&#x2003;" horiz-adv-x="1023" />
+<glyph unicode="&#x2004;" horiz-adv-x="341" />
+<glyph unicode="&#x2005;" horiz-adv-x="255" />
+<glyph unicode="&#x2006;" horiz-adv-x="170" />
+<glyph unicode="&#x2007;" horiz-adv-x="170" />
+<glyph unicode="&#x2008;" horiz-adv-x="127" />
+<glyph unicode="&#x2009;" horiz-adv-x="204" />
+<glyph unicode="&#x200a;" horiz-adv-x="56" />
+<glyph unicode="&#x2010;" horiz-adv-x="333" d="M285 193h-246v66h246v-66z" />
+<glyph unicode="&#x2011;" horiz-adv-x="333" d="M285 194h-246v63h246v-63z" />
+<glyph unicode="&#x2012;" horiz-adv-x="500" d="M500 193h-500v66h500v-66z" />
+<glyph unicode="&#x2013;" horiz-adv-x="500" d="M500 201h-500v49h500v-49z" />
+<glyph unicode="&#x2014;" horiz-adv-x="1000" d="M1000 201h-1000v49h1000v-49z" />
+<glyph unicode="&#x2015;" horiz-adv-x="2000" d="M2000 201h-2000v49h2000v-49z" />
+<glyph unicode="&#x2016;" horiz-adv-x="523" d="M195 -189h-66v879h66v-879zM394 -189h-66v879h66v-879z" />
+<glyph unicode="&#x2017;" horiz-adv-x="500" d="M500 -300h-500v50h500v-50zM500 -191h-500v50h500v-50z" />
+<glyph unicode="&#x2018;" horiz-adv-x="333" d="M227 676l9 -19q-82 -57 -82 -106q0 -14 14 -14q2 0 7 2q12 2 20 2q28 0 43.5 -13.5t15.5 -37.5q0 -25 -16.5 -41t-42.5 -16q-34 0 -57 25.5t-23 63.5q0 45 31 87t81 67z" />
+<glyph unicode="&#x2019;" horiz-adv-x="333" d="M106 433l-9 19q82 56 82 107q0 13 -14 13q-2 0 -7 -2q-12 -2 -20 -2q-28 0 -43.5 13.5t-15.5 37.5q0 25 16.5 41t42.5 16q34 0 57 -25.5t23 -63.5q0 -45 -31 -87t-81 -67z" />
+<glyph unicode="&#x201a;" horiz-adv-x="333" d="M106 -141l-9 19q82 56 82 107q0 13 -14 13q-2 0 -7 -2q-12 -2 -20 -2q-28 0 -43.5 13.5t-15.5 37.5q0 25 16.5 41t42.5 16q34 0 57 -25.5t23 -63.5q0 -45 -31 -87t-81 -67z" />
+<glyph unicode="&#x201b;" horiz-adv-x="333" d="M200 452l-9 -19q-50 25 -81 67t-31 87q0 38 23 63.5t57 25.5q26 0 42.5 -16t16.5 -41q0 -24 -15.5 -37.5t-43.5 -13.5q-8 0 -20 2l-7 2q-14 0 -14 -13q0 -51 82 -107z" />
+<glyph unicode="&#x201c;" horiz-adv-x="444" d="M387 676l9 -19q-82 -57 -82 -106q0 -14 14 -14q2 0 7 2q12 2 19 2q28 0 44 -13.5t16 -37.5q0 -25 -16.5 -41t-42.5 -16q-34 0 -57 25.5t-23 63.5q0 45 30.5 87t81.5 67zM155 676l9 -19q-82 -57 -82 -106q0 -14 14 -14q2 0 7 2q12 2 19 2q28 0 44 -13.5t16 -37.5 q0 -25 -16.5 -41t-42.5 -16q-34 0 -57 25.5t-23 63.5q0 45 30.5 87t81.5 67z" />
+<glyph unicode="&#x201d;" horiz-adv-x="444" d="M289 433l-9 19q82 56 82 107q0 13 -14 13q-2 0 -7 -2q-12 -2 -19 -2q-28 0 -44 13.5t-16 37.5q0 25 16.5 41t42.5 16q34 0 57 -25.5t23 -63.5q0 -45 -31 -87t-81 -67zM57 433l-9 19q82 56 82 107q0 13 -14 13q-2 0 -7 -2q-12 -2 -19 -2q-28 0 -44 13.5t-16 37.5 q0 25 16.5 41t42.5 16q34 0 57 -25.5t23 -63.5q0 -45 -31 -87t-81 -67z" />
+<glyph unicode="&#x201e;" horiz-adv-x="444" d="M304 -141l-9 19q82 56 82 107q0 13 -14 13q-2 0 -7 -2q-12 -2 -19 -2q-28 0 -44 13.5t-16 37.5q0 25 16.5 41t42.5 16q34 0 57 -25.5t23 -63.5q0 -45 -30.5 -87t-81.5 -67zM72 -141l-9 19q82 58 82 107q0 13 -14 13q-2 0 -7 -2q-12 -2 -19 -2q-28 0 -44 13.5t-16 37.5 q0 25 16.5 41t42.5 16q34 0 57 -25.5t23 -63.5q0 -45 -30.5 -87t-81.5 -67z" />
+<glyph unicode="&#x201f;" horiz-adv-x="444" d="M383 452l-9 -19q-50 25 -81 67t-31 87q0 38 23 63.5t57 25.5q26 0 42.5 -16t16.5 -41q0 -24 -16 -37.5t-44 -13.5q-7 0 -19 2l-7 2q-14 0 -14 -13q0 -51 82 -107zM151 452l-9 -19q-50 25 -81 67t-31 87q0 38 23 63.5t57 25.5q26 0 42.5 -16t16.5 -41q0 -24 -16 -37.5 t-44 -13.5q-7 0 -19 2l-7 2q-14 0 -14 -13q0 -51 82 -107z" />
+<glyph unicode="&#x2020;" horiz-adv-x="500" d="M240 -149v123q0 70 -12 149.5t-30 129.5q42 43 42 185q-46 -4 -91 -22q-32 -12 -46 -12q-44 0 -44 43q0 19 11 31.5t28 12.5q16 0 49 -13q53 -21 93 -22q0 41 -4.5 65.5t-19.5 62.5q-12 30 -12 47t14.5 31t32.5 14t32.5 -14t14.5 -31q0 -15 -13 -47q-15 -37 -19 -61.5 t-4 -66.5q40 1 92 22q32 13 50 13q16 0 27 -12.5t11 -31.5t-10.5 -31t-26.5 -12q-21 0 -53 12q-47 18 -90 22q0 -141 41 -185q-41 -106 -41 -279v-123h-22z" />
+<glyph unicode="&#x2021;" horiz-adv-x="500" d="M442 446q0 -18 -10.5 -30t-26.5 -12q-21 0 -53 12q-48 18 -91 22q0 -73 8.5 -112t31.5 -66q-23 -26 -31.5 -63.5t-8.5 -111.5q42 4 90 22q30 12 52 12q17 0 27.5 -12.5t10.5 -31.5q0 -18 -11.5 -30.5t-27.5 -12.5t-49 13q-52 21 -92 22q0 -42 4 -66.5t19 -61.5 q12 -30 12 -47t-14.5 -31t-32.5 -14q-17 0 -31.5 14t-14.5 31t12 47q24 61 24 128q-41 -1 -93 -22q-32 -13 -49 -13t-28 12.5t-11 32.5q0 18 11 30t27 12q20 0 52 -12q48 -18 91 -22q0 138 -40 175q40 52 40 178q-42 -4 -90 -22q-29 -12 -46 -12q-44 0 -44 43q0 19 11 31.5 t28 12.5q16 0 49 -13q51 -21 92 -22q0 42 -4 66.5t-19 61.5q-12 30 -12 47t14.5 31t31.5 14q18 0 32.5 -14t14.5 -31t-12 -47q-24 -61 -24 -128q41 1 93 22q32 13 50 13q16 0 27 -13t11 -32z" />
+<glyph unicode="&#x2022;" horiz-adv-x="523" d="M455 252q0 -79 -57 -136t-136 -57q-80 0 -136 56.5t-56 136.5q0 78 56.5 135t135.5 57q84 0 138.5 -56t54.5 -136z" />
+<glyph unicode="&#x2025;" horiz-adv-x="667" d="M222 43q0 -22 -16.5 -38t-39.5 -16t-39 16t-16 39t16.5 39.5t39.5 16.5q22 0 38.5 -17t16.5 -40zM555 43q0 -22 -16.5 -38t-39.5 -16t-39 16t-16 39t16.5 39.5t39.5 16.5q22 0 38.5 -17t16.5 -40z" />
+<glyph unicode="&#x2026;" horiz-adv-x="1000" d="M222 43q0 -22 -16.5 -38t-39.5 -16t-39 16t-16 39t16.5 39.5t39.5 16.5q22 0 38.5 -17t16.5 -40zM555 43q0 -22 -16.5 -38t-39.5 -16t-39 16t-16 39t16.5 39.5t39.5 16.5q22 0 38.5 -17t16.5 -40zM888 43q0 -22 -16.5 -38t-39.5 -16t-39 16t-16 39t16.5 39.5t39.5 16.5 q22 0 38.5 -17t16.5 -40z" />
+<glyph unicode="&#x202f;" horiz-adv-x="204" />
+<glyph unicode="&#x2030;" horiz-adv-x="1109" d="M686 213q0 -91 -50 -161.5t-114 -70.5q-51 0 -86 40t-35 98q0 80 58.5 145.5t130.5 65.5q46 0 71 -30.5t25 -86.5zM663 215q0 39 -17.5 63t-45.5 24q-29 0 -49 -23q-33 -35 -55.5 -93.5t-22.5 -109.5q0 -29 16 -48.5t40 -19.5q52 0 93 63.5t41 143.5zM621 706l-430 -724 h-47l394 658q-28 -32 -54.5 -44.5t-66.5 -12.5q-35 0 -76 14q4 -23 4 -44q0 -52 -22 -104t-58 -86q-38 -37 -86 -37q-50 0 -84 39.5t-34 97.5q0 85 58 149t135 64q26 0 60 -28q47 -39 96 -39q46 0 72 15t95 82h44zM321 569q0 22 -4.5 30t-20.5 16q-23 11 -44 34 q-31 -15 -44 -26.5t-28 -36.5q-48 -76 -48 -163q0 -31 15.5 -50.5t41.5 -19.5q53 0 92.5 65t39.5 151zM1048 213q0 -91 -49.5 -161.5t-113.5 -70.5q-52 0 -87 40t-35 99q0 80 58.5 145t130.5 65q46 0 71 -30.5t25 -86.5zM1025 215q0 39 -17.5 63t-45.5 24q-35 0 -66 -43 q-24 -32 -42.5 -86.5t-18.5 -94.5q0 -31 15.5 -50.5t40.5 -19.5q52 0 93 63.5t41 143.5z" />
+<glyph unicode="&#x2031;" horiz-adv-x="1471" d="M1048 213q0 -91 -49.5 -161.5t-113.5 -70.5q-52 0 -87 40t-35 99q0 80 58.5 145t130.5 65q46 0 71 -30.5t25 -86.5zM1025 215q0 39 -17.5 63t-45.5 24q-35 0 -66 -43q-24 -32 -42.5 -86.5t-18.5 -94.5q0 -31 15.5 -50.5t40.5 -19.5q52 0 93 63.5t41 143.5zM686 213 q0 -91 -50 -161.5t-114 -70.5q-51 0 -86 40t-35 98q0 80 58.5 145.5t130.5 65.5q46 0 71 -30.5t25 -86.5zM663 215q0 39 -17.5 63t-45.5 24q-29 0 -49 -23q-33 -35 -55.5 -93.5t-22.5 -109.5q0 -29 16 -48.5t40 -19.5q52 0 93 63.5t41 143.5zM621 706l-430 -724h-47l394 658 q-28 -32 -54.5 -44.5t-66.5 -12.5q-35 0 -76 14q4 -23 4 -44q0 -52 -22 -104t-58 -86q-38 -37 -86 -37q-50 0 -84 39.5t-34 97.5q0 85 58 149t135 64q26 0 60 -28q47 -39 96 -39q46 0 72 15t95 82h44zM321 569q0 22 -4.5 30t-20.5 16q-23 11 -44 34q-31 -15 -44 -26.5 t-28 -36.5q-48 -76 -48 -163q0 -31 15.5 -50.5t41.5 -19.5q53 0 92.5 65t39.5 151zM1410 213q0 -91 -49.5 -161.5t-113.5 -70.5q-52 0 -87 40t-35 99q0 80 58.5 145t130.5 65q46 0 71 -30.5t25 -86.5zM1387 215q0 39 -17.5 63t-45.5 24q-35 0 -66 -43q-24 -32 -42.5 -86.5 t-18.5 -94.5q0 -31 15.5 -50.5t40.5 -19.5q52 0 93 63.5t41 143.5z" />
+<glyph unicode="&#x2032;" horiz-adv-x="289" d="M75 411l67 221q4 15 8 23.5t13 15.5t23 7q13 0 20.5 -9.5t7.5 -23.5q0 -11 -14 -39l-106 -204z" />
+<glyph unicode="&#x2033;" horiz-adv-x="426" d="M212 411l66 222q6 22 15.5 33.5t29.5 11.5q28 0 28 -32q0 -11 -14 -39l-107 -205zM75 410l66 222q13 46 45 46q13 0 20.5 -9.5t7.5 -23.5q0 -11 -14 -39l-107 -205z" />
+<glyph unicode="&#x2034;" horiz-adv-x="563" d="M212 411l66 222q6 22 15.5 33.5t29.5 11.5q28 0 28 -32q0 -11 -14 -39l-107 -205zM75 410l66 222q13 46 45 46q13 0 20.5 -9.5t7.5 -23.5q0 -11 -14 -39l-107 -205zM349 411l66 222q6 22 15.5 33.5t29.5 11.5q28 0 28 -32q0 -11 -14 -39l-107 -205z" />
+<glyph unicode="&#x2035;" horiz-adv-x="289" d="M214 411l-19 -9l-106 204q-14 28 -14 39q0 14 7.5 23.5t20.5 9.5q14 0 23 -7t13 -15.5t8 -23.5z" />
+<glyph unicode="&#x2036;" horiz-adv-x="426" d="M351 410l-18 -9l-107 205q-14 28 -14 39q0 14 7.5 23.5t20.5 9.5q32 0 45 -46zM214 411l-18 -9l-107 205q-14 28 -14 39q0 32 28 32q20 0 29.5 -11.5t15.5 -33.5z" />
+<glyph unicode="&#x2037;" horiz-adv-x="563" d="M488 410l-18 -9l-107 205q-14 28 -14 39q0 14 7.5 23.5t20.5 9.5q32 0 45 -46zM351 411l-18 -9l-107 205q-14 28 -14 39q0 32 28 32q20 0 29.5 -11.5t15.5 -33.5zM214 411l-18 -9l-107 205q-14 28 -14 39q0 32 28 32q20 0 29.5 -11.5t15.5 -33.5z" />
+<glyph unicode="&#x2038;" horiz-adv-x="511" d="M454 -138l-22 -18l-177 208l-176 -208l-20 18l191 240h10z" />
+<glyph unicode="&#x2039;" horiz-adv-x="333" d="M63 227l81 73l48 44l56 53q22 19 26 19q11 0 11 -11q0 -6 -50 -72l-84 -106q23 -27 84 -107q50 -65 50 -76t-12 -11q-4 0 -27 21l-54 54l-48 46z" />
+<glyph unicode="&#x203a;" horiz-adv-x="333" d="M270 222l-81 -73l-47 -45l-58 -52q-21 -19 -25 -19q-11 0 -11 11q0 6 50 72l84 106q-23 27 -84 107q-50 65 -50 76t12 11q4 0 26 -22l56 -53l47 -46z" />
+<glyph unicode="&#x203b;" d="M616 253q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45zM407 462q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45zM635 5l-46 -46l-247 247l-248 -247l-46 46l247 248l-247 248l46 46l248 -247l247 247l46 -46l-246 -248zM407 44 q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45zM197 253q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45z" />
+<glyph unicode="&#x203c;" horiz-adv-x="549" d="M175 176l-42 381q-3 30 -3 43q0 76 53 76q25 0 39 -22t14 -59q0 -16 -2 -38l-45 -381h-14zM236 42q0 -22 -15.5 -36.5t-38.5 -14.5q-22 0 -37 14.5t-15 37.5t15.5 38.5t37.5 15.5t37.5 -16t15.5 -39zM391 176l-42 381q-3 30 -3 43q0 76 53 76q25 0 39 -22t14 -59 q0 -16 -2 -38l-45 -381h-14zM452 42q0 -22 -15.5 -36.5t-38.5 -14.5q-22 0 -37 14.5t-15 37.5t15.5 38.5t37.5 15.5t37.5 -16t15.5 -39z" />
+<glyph unicode="&#x203e;" horiz-adv-x="500" d="M500 770h-500v50h500v-50z" />
+<glyph unicode="&#x2040;" horiz-adv-x="798" d="M726 523l-14 -11q-118 131 -311 131q-199 0 -314 -131l-15 9q22 51 61.5 89t86 59t91 30.5t88.5 9.5q103 0 193 -44.5t134 -141.5z" />
+<glyph unicode="&#x2043;" horiz-adv-x="333" d="M285 172h-246v160h246v-160z" />
+<glyph unicode="&#x2044;" horiz-adv-x="167" d="M331 676l-450 -690h-49l453 690h46z" />
+<glyph unicode="&#x2047;" horiz-adv-x="839" d="M244 164h-17q2 72 44 177q51 126 51 187q0 51 -31.5 84.5t-77.5 33.5q-36 0 -65 -19t-29 -43q0 -19 19 -38.5t19 -35.5q0 -19 -11 -31t-30 -12q-21 0 -34.5 18t-13.5 48q0 62 46 102.5t118 40.5q75 0 128.5 -43.5t53.5 -114.5q0 -45 -20 -82.5t-85 -114.5 q-49 -59 -65 -157zM290 45q0 -22 -15 -37.5t-37 -15.5q-25 0 -39.5 15.5t-14.5 37.5q0 23 15.5 38t38.5 15q21 0 36.5 -16t15.5 -37zM639 164h-17q2 72 44 177q51 126 51 187q0 51 -31.5 84.5t-77.5 33.5q-36 0 -65 -19t-29 -43q0 -19 19 -38.5t19 -35.5q0 -19 -11 -31 t-30 -12q-21 0 -34.5 18t-13.5 48q0 62 46 102.5t118 40.5q75 0 128.5 -43.5t53.5 -114.5q0 -45 -20 -82.5t-85 -114.5q-49 -59 -65 -157zM685 45q0 -22 -15 -37.5t-37 -15.5q-25 0 -39.5 15.5t-14.5 37.5q0 23 15.5 38t38.5 15q21 0 36.5 -16t15.5 -37z" />
+<glyph unicode="&#x204e;" horiz-adv-x="500" d="M268 35l9 -6q37 -24 96 -34q34 -5 47 -14.5t13 -28.5q0 -17 -10 -28t-26 -11q-25 0 -60 44q-23 28 -69 58l-8 5v-9q0 -56 20 -110q9 -25 9 -33q0 -15 -12.5 -27t-27.5 -12q-14 0 -25 11t-11 25t12 47q16 43 16 99v9q-40 -25 -52 -36q-12 -12 -41 -45q-22 -25 -43 -25 q-17 0 -27 10t-10 26q0 19 14.5 29t48.5 16q35 7 53.5 14t49.5 26q-43 26 -97 37q-37 8 -52 18t-15 28q0 16 9 26.5t24 10.5q20 0 49 -32q42 -47 89 -73v13q0 41 -15 91q-11 33 -11 52q0 14 10.5 24t25.5 10t26 -10.5t11 -25.5q0 -16 -11 -47q-17 -45 -17 -83v-24 q34 20 58 42q5 5 18 20l22 22q8 8 18.5 15.5t18.5 7.5q17 0 27 -10.5t10 -27.5q0 -20 -11.5 -29.5t-40.5 -13.5q-56 -9 -112 -41z" />
+<glyph unicode="&#x204f;" horiz-adv-x="278" d="M199 403q0 -22 -16.5 -38.5t-39.5 -16.5t-39 16t-16 39t16.5 39.5t38.5 16.5q24 0 40 -16t16 -40zM182 -122l-10 -19q-52 25 -82 66t-30 88q0 40 23 64.5t57 24.5q25 0 42 -16t17 -40q0 -52 -58 -52q-5 0 -15 2t-13 2q-6 0 -10 -4.5t-4 -9.5q0 -52 83 -106z" />
+<glyph unicode="&#x2050;" horiz-adv-x="790" d="M735 461l-66 -17q-16 80 -93 130.5t-184 50.5t-182.5 -50t-88.5 -131l-66 17q25 109 121 169.5t218 60.5q79 0 149 -25.5t122.5 -78.5t69.5 -126zM667 208l66 -17q-25 -109 -121 -170t-219 -61q-122 0 -217.5 61t-120.5 170l67 17q15 -87 88 -135t182 -48t183.5 48 t91.5 135z" />
+<glyph unicode="&#x2051;" horiz-adv-x="501" d="M268 35l9 -6q37 -24 96 -34q34 -5 47 -14.5t13 -28.5q0 -17 -10 -28t-26 -11q-25 0 -60 44q-23 28 -69 58l-8 5v-9q0 -56 20 -110q9 -25 9 -33q0 -15 -12.5 -27t-27.5 -12q-14 0 -25 11t-11 25t12 47q16 43 16 99v9q-40 -25 -52 -36q-12 -12 -41 -45q-22 -25 -43 -25 q-17 0 -27 10t-10 26q0 19 14.5 29t48.5 16q35 7 53.5 14t49.5 26q-43 26 -97 37q-37 8 -52 18t-15 28q0 16 9 26.5t24 10.5q20 0 49 -32q42 -47 89 -73v13q0 41 -15 91q-11 33 -11 52q0 14 10.5 24t25.5 10t26 -10.5t11 -25.5q0 -16 -11 -47q-17 -45 -17 -83v-24 q34 20 58 42q5 5 18 20l22 22q8 8 18.5 15.5t18.5 7.5q17 0 27 -10.5t10 -27.5q0 -20 -11.5 -29.5t-40.5 -13.5q-56 -9 -112 -41zM268 471l9 -6q37 -24 96 -34q34 -5 47 -14.5t13 -28.5q0 -17 -10 -28t-26 -11q-25 0 -60 44q-23 28 -69 58l-8 5v-9q0 -56 20 -110 q9 -25 9 -33q0 -15 -12.5 -27t-27.5 -12q-14 0 -25 11t-11 25t12 47q16 43 16 99v9q-40 -25 -52 -36q-12 -12 -41 -45q-22 -25 -43 -25q-17 0 -27 10t-10 26q0 19 14.5 29t48.5 16q35 7 53.5 14t49.5 26q-43 26 -97 37q-37 8 -52 18t-15 28q0 16 9 26.5t24 10.5q20 0 49 -32 q42 -47 89 -73v13q0 41 -15 91q-11 33 -11 52q0 14 10.5 24t25.5 10t26 -10.5t11 -25.5q0 -16 -11 -47q-17 -45 -17 -83v-24q34 20 58 42q5 5 18 20l22 22q8 8 18.5 15.5t18.5 7.5q17 0 27 -10.5t10 -27.5q0 -20 -11.5 -29.5t-40.5 -13.5q-56 -9 -112 -41z" />
+<glyph unicode="&#x2052;" horiz-adv-x="471" d="M176 619q0 -22 -16.5 -38t-39.5 -16t-39 16t-16 39t16.5 39.5t39.5 16.5q22 0 38.5 -17t16.5 -40zM406 -116q0 -22 -16.5 -38t-39.5 -16t-39 16t-16 39t16.5 39.5t39.5 16.5q22 0 38.5 -17t16.5 -40zM417 706l-294 -906h-69l296 906h67z" />
+<glyph unicode="&#x2057;" horiz-adv-x="710" d="M349 411l66 222q6 22 15.5 33.5t29.5 11.5q28 0 28 -32q0 -11 -14 -39l-107 -205zM212 411l66 222q6 22 15.5 33.5t29.5 11.5q28 0 28 -32q0 -11 -14 -39l-107 -205zM75 410l66 222q13 46 45 46q13 0 20.5 -9.5t7.5 -23.5q0 -11 -14 -39l-107 -205zM496 411l66 222 q6 22 15.5 33.5t29.5 11.5q28 0 28 -32q0 -11 -14 -39l-107 -205z" />
+<glyph unicode="&#x205f;" horiz-adv-x="1000" />
+<glyph unicode="&#x207f;" horiz-adv-x="541" d="M484 270h-190l1 24q36 3 45 12t9 50v183q0 89 -64 89q-22 0 -41.5 -10.5t-49.5 -40.5v-250q0 -7 0.5 -12t3.5 -8.5t4.5 -5.5t7.5 -3l10 -2q4 0 14.5 -0.5t17.5 -1.5v-24h-193v24q36 2 45 9.5t9 43.5v213q0 33 -6 45t-24 12q-16 0 -26 -5v24q56 16 121 40l14 -4v-67h1 q61 71 126 71q51 0 81 -35.5t30 -100.5v-201q0 -12 1.5 -19.5t2.5 -12t7 -7t9.5 -3t15 -1.5t18.5 -2v-24z" />
+<glyph unicode="&#x20a3;" horiz-adv-x="556" d="M384 390v-30h-183v-90h183v-30h-183v-128q0 -57 16.5 -73.5t74.5 -19.5v-19h-281v19q57 4 72.5 21.5t15.5 82.5v117h-82v30h82v90h-82v30h82v161q0 55 -15 71.5t-72 20.5v19h529l5 -143h-25q-11 68 -37.5 86.5t-116.5 18.5h-132q-21 0 -27.5 -7.5t-6.5 -31.5v-195h183z " />
+<glyph unicode="&#x20a4;" horiz-adv-x="500" d="M25 277h113l-10 90h-104v30h101q-2 18 -2 45q0 107 53 170.5t142 63.5q56 0 93 -26.5t37 -66.5q0 -23 -14 -38t-36 -15q-37 0 -39 67q-1 52 -56 52q-45 0 -70 -36t-25 -101q0 -60 7 -115h138v-30h-134q5 -36 5 -90h131v-30h-133q-6 -57 -23 -136q84 -35 149 -35 q68 0 113 49q15 16 23 16q6 0 6 -5q0 -14 -14.5 -42.5t-30.5 -45.5q-52 -55 -122 -55q-33 0 -63.5 13t-81.5 48q-30 -36 -51 -49t-47 -13q-31 0 -49.5 16.5t-18.5 45.5q0 34 25 55t66 21q22 0 46 -5q3 12 3 21q0 24 -9 101h-118v30zM88 94q-50 0 -50 -37q0 -17 11.5 -27 t30.5 -10q28 0 47 25q15 18 15 31q0 7 -17.5 12.5t-36.5 5.5z" />
+<glyph unicode="&#x20a7;" horiz-adv-x="1182" d="M949 301l104 -63q50 -30 69 -56t19 -67q0 -50 -41.5 -87.5t-98.5 -37.5q-47 0 -73 9q-27 9 -46 9q-17 0 -24 -12h-13v157h16q16 -73 46 -107t81 -34q37 0 60 21t23 53q0 46 -53 75l-54 30q-120 67 -120 145q0 58 37.5 90.5t100.5 32.5q44 0 67 -11q18 -8 28 -8q7 0 16 10 h11l5 -136h-15q-17 68 -42.5 95.5t-70.5 27.5q-34 0 -54.5 -17t-20.5 -51q0 -17 11.5 -36.5t31.5 -31.5zM782 77l13 -11q-48 -76 -121 -76q-88 0 -88 127v301h-53q-4 3 -4 7q0 8 17 19q38 22 97 107q2 3 9.5 12.5t10.5 15.5q7 0 7 -13v-116h101v-32h-101v-286q0 -48 12 -69 t40 -21q30 0 60 35zM202 291v-179q0 -57 16.5 -73.5t77.5 -19.5v-19h-280v19q58 4 71 21t13 82v429q0 56 -14.5 72t-69.5 20v19h238q128 0 203 -63q50 -42 50 -119q0 -40 -14 -76t-38 -55q-47 -38 -89.5 -49.5t-116.5 -11.5q-7 0 -47 3zM202 589v-258q34 -3 39 -3 q76 0 116.5 44.5t40.5 102.5q0 80 -40 115t-121 35q-21 0 -28 -7.5t-7 -28.5z" />
+<glyph unicode="&#x20ac;" horiz-adv-x="500" d="M462 500h-15q-12 60 -51.5 98.5t-94.5 38.5t-93 -66t-49 -178h244l-8 -34h-238q-1 -13 -1 -49h227l-8 -34h-218q3 -107 39 -177.5t94 -70.5q48 0 77 20.5t71 85.5l13 -10q-44 -77 -82.5 -106.5t-94.5 -29.5q-84 0 -136 77.5t-60 210.5h-40l8 34h30q0 38 1 49h-39l8 34h34 q16 121 75 196t146 75q41 0 88 -13.5t73 -39.5v-111z" />
+<glyph unicode="&#x20d0;" horiz-adv-x="0" d="M-17 627h-436l132 133l18 -8q-36 -30 -36 -52q0 -19 41 -19h281v-54z" />
+<glyph unicode="&#x20d1;" horiz-adv-x="0" d="M-17 627h-436v54h281q41 0 41 19q0 22 -36 52l18 8z" />
+<glyph unicode="&#x20d2;" horiz-adv-x="0" d="M-192 -156h-50v818h50v-818z" />
+<glyph unicode="&#x20d6;" horiz-adv-x="0" d="M-17 627h-286q-49 0 -49 -15q0 -3 2 -6.5t7.5 -9t10 -10.5t14.5 -14l16 -16l-18 -8l-133 106l132 106l18 -8q-49 -41 -49 -56t49 -15h286v-54z" />
+<glyph unicode="&#x20d7;" horiz-adv-x="0" d="M-17 654l-132 -106l-18 8q49 41 49 56t-49 15h-286v54h286q49 0 49 15q0 3 -2 6.5t-7.5 9t-10 10.5t-14.5 14l-16 16l18 8z" />
+<glyph unicode="&#x20db;" horiz-adv-x="0" d="M35 572q0 -20 -15 -34.5t-36 -14.5q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5t35 -15t15 -35zM-164 572q0 -20 -15 -34.5t-36 -14.5q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5t35 -15t15 -35zM-363 572q0 -20 -15 -34.5t-36 -14.5q-20 0 -34 14.5 t-14 35.5q0 20 14.5 34.5t34.5 14.5t35 -15t15 -35z" />
+<glyph unicode="&#x20dc;" horiz-adv-x="0" d="M-302 572q0 -20 -15 -34.5t-36 -14.5q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5t35 -15t15 -35zM-501 572q0 -20 -15 -34.5t-36 -14.5q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5t35 -15t15 -35zM96 572q0 -20 -15 -34.5t-36 -14.5q-20 0 -34 14.5 t-14 35.5q0 20 14.5 34.5t34.5 14.5t35 -15t15 -35zM-103 572q0 -20 -15 -34.5t-36 -14.5q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5t35 -15t15 -35z" />
+<glyph unicode="&#x20dd;" horiz-adv-x="0" d="M-723 252q0 128 63.5 237t172.5 172.5t237 63.5t237 -63.5t172.5 -172.5t63.5 -237t-63.5 -237t-172.5 -172.5t-237 -63.5t-237 63.5t-172.5 172.5t-63.5 237zM-657 252q0 -169 119 -288t288 -119t288 119t119 288t-119 288t-288 119t-288 -119t-119 -288z" />
+<glyph unicode="&#x20de;" horiz-adv-x="0" d="M230 -180h-960v960h960v-960zM164 -114v828h-828v-828h828z" />
+<glyph unicode="&#x20df;" horiz-adv-x="0" d="M344 251l-591 -592l-593 593l592 591zM252 251l-500 500l-500 -499l501 -501z" />
+<glyph unicode="&#x20e1;" horiz-adv-x="0" d="M25 654l-132 -106l-18 8q49 41 49 56t-49 15h-177q-50 0 -50 -15q0 -3 2 -6.5t7.5 -9t10 -10.5t14.5 -14l16 -16l-18 -8l-133 106l132 106l18 -8q-49 -41 -49 -56t49 -15h178q49 0 49 15q0 3 -2 6.5t-7.5 9t-10 10.5t-14.5 14l-16 16l18 8z" />
+<glyph unicode="&#x20e4;" horiz-adv-x="0" d="M490 -155h-1460l721 1178zM-839 -89h1198l-608 964z" />
+<glyph unicode="&#x20e5;" horiz-adv-x="0" d="M-40 -156h-55l-335 818h55z" />
+<glyph unicode="&#x20e6;" horiz-adv-x="0" d="M-285 -156h-50v818h50v-818zM-102 -156h-50v818h50v-818z" />
+<glyph unicode="&#x20e7;" horiz-adv-x="0" d="M166 -178h-66v837h-750v66h816v-903z" />
+<glyph unicode="&#x20e8;" horiz-adv-x="0" d="M35 -169q0 -20 -15 -34.5t-36 -14.5q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5t35 -15t15 -35zM-164 -169q0 -20 -15 -34.5t-36 -14.5q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5t35 -15t15 -35zM-363 -169q0 -20 -15 -34.5t-36 -14.5q-20 0 -34 14.5 t-14 35.5q0 20 14.5 34.5t34.5 14.5t35 -15t15 -35z" />
+<glyph unicode="&#x20e9;" horiz-adv-x="0" d="M53 538h-54v89h-425v-89h-54v143h533v-143z" />
+<glyph unicode="&#x20ea;" horiz-adv-x="0" d="M118 220h-588q-26 0 -26 -20q0 -14 14 -28q21 -22 52 -66l-20 -19q-54 63 -97.5 97.5t-110.5 63.5v10q67 28 110.5 63t97.5 98l20 -19q-3 -5 -9 -14l-8 -12q-2 -3 -6.5 -9t-8 -10t-8.5 -9l-13 -13q-14 -14 -14 -25q0 -7 9 -14.5t17 -7.5h589v-66z" />
+<glyph unicode="&#x20eb;" horiz-adv-x="0" d="M193 756l-403 -973h-54l403 973h54zM9 756l-402 -973h-55l403 973h54z" />
+<glyph unicode="&#x20ec;" horiz-adv-x="0" d="M-17 -119l-132 -133l-18 8q36 30 36 52q0 19 -41 19h-281v54h436z" />
+<glyph unicode="&#x20ed;" horiz-adv-x="0" d="M-17 -173h-281q-41 0 -41 -19q0 -22 36 -52l-18 -8l-132 133h436v-54z" />
+<glyph unicode="&#x20ee;" horiz-adv-x="0" d="M-17 -173h-286q-49 0 -49 -15q0 -3 2 -6.5t7.5 -9t10 -10.5t14.5 -14l16 -16l-18 -8l-133 106l132 106l18 -8q-49 -41 -49 -56t49 -15h286v-54z" />
+<glyph unicode="&#x20ef;" horiz-adv-x="0" d="M-17 -146l-133 -106l-18 8l16 16q10 9 14.5 14t10 10.5t7.5 9t2 6.5q0 15 -49 15h-286v54h286q49 0 49 15t-49 56l18 8z" />
+<glyph unicode="&#x20f0;" horiz-adv-x="0" d="M-87 727q0 -13 -17 -22q-5 -3 -41 -12.5t-65 -26.5q25 -14 62.5 -24t43.5 -14q15 -7 15 -23q0 -11 -7 -18.5t-20 -7.5q-14 0 -43 31.5t-56 46.5q0 -27 10.5 -66t10.5 -47q0 -9 -8.5 -18t-17.5 -9q-10 0 -18.5 9t-8.5 18q0 8 10 47t10 66q-21 -11 -50 -40t-34 -32 q-9 -6 -18 -6q-12 0 -19 6.5t-7 15.5q0 20 14 27q7 4 47 15t60 23q-20 12 -61 23.5t-49 16.5q-13 8 -13 21q0 11 7 20.5t18 9.5q5 0 15 -5q7 -4 37.5 -34t52.5 -42q0 28 -10 68t-10 48q0 10 8.5 18.5t18.5 8.5q9 0 17.5 -8.5t8.5 -18.5q0 -8 -10.5 -47.5t-10.5 -67.5 q30 16 56.5 44t31.5 31q10 5 15 5q11 0 18 -9.5t7 -20.5z" />
+<glyph unicode="&#x2102;" horiz-adv-x="705" d="M632 159l31 -31q-118 -142 -289 -142q-146 0 -237.5 99.5t-91.5 246.5q0 150 90.5 247t239.5 97q89 0 158 -35t128 -107l-31 -31q-46 47 -75 71t-74 41t-102 17q-95 0 -166 -49v-503q26 -21 76.5 -35.5t88.5 -14.5q82 0 134.5 30t119.5 99zM169 118v440 q-80 -116 -80 -226q0 -98 59 -187q12 -20 21 -27z" />
+<glyph unicode="&#x2105;" horiz-adv-x="837" d="M646 676l-450 -690h-49l453 690h46zM795 170q0 -80 -48 -132t-125 -52q-70 0 -118 52t-48 131t48 128t125 49q72 0 119 -48.5t47 -127.5zM725 150q0 85 -37 136q-33 38 -74 38q-40 0 -64 -32t-24 -89q0 -97 40 -157q26 -38 69 -38t66.5 37.5t23.5 104.5zM334 443l10 -7 q-32 -65 -62 -88q-38 -32 -88 -32q-64 0 -105 48t-41 122q0 98 64 150q50 40 103 40q49 0 84 -23.5t35 -55.5q0 -13 -10.5 -22.5t-25.5 -9.5q-26 0 -36 35l-5 17q-6 21 -15.5 28.5t-29.5 7.5q-47 0 -76 -36.5t-29 -95.5q0 -67 33 -108.5t86 -41.5q33 0 56.5 15.5t51.5 56.5z " />
+<glyph unicode="&#x2107;" horiz-adv-x="598" d="M389 366v-40q-137 0 -191 -35q-55 -36 -55 -109t48.5 -112.5t135.5 -39.5q83 0 121 57l19 33q11 19 16.5 27t16 15t24.5 7q37 0 37 -40q0 -37 -38 -69.5t-91 -50.5q-68 -23 -131 -23q-103 0 -173 40q-100 57 -100 166q0 52 30 87.5t70.5 50.5t90.5 18v1q-69 8 -115 54 q-42 42 -42 98q0 77 61.5 126t180.5 49q50 0 105 -15q60 -18 71 -18q30 0 38 33h20l10 -227h-23q-11 88 -64 138.5t-134 50.5t-122 -41t-41 -107q0 -67 58 -98q47 -26 167 -26z" />
+<glyph unicode="&#x210a;" horiz-adv-x="738" d="M678 424l-269 -498q44 -23 91 -23q59 0 100 30l12 -26q-54 -34 -117 -34q-61 0 -102 22q-77 -114 -203 -114q-47 0 -72.5 21.5t-25.5 49.5q0 48 54 80q44 26 115 26q59 0 91 -13l87 156l-1 1q-54 -58 -102.5 -85.5t-104.5 -27.5q-38 0 -61 29t-23 76q0 48 23 99 q-30 -20 -70 -20q-39 0 -70 17l10 26q31 -13 57 -13q64 0 129 79q57 69 131.5 114t134.5 45q36 0 60 -16.5t28 -48.5h2l28 48h68zM550 364q0 42 -54 42q-95 0 -205 -159q-86 -125 -86 -187q0 -19 12 -30t29 -11q61 0 134.5 64.5t121.5 146t48 134.5zM337 -86l-1 1 q-29 13 -84 13q-57 0 -91.5 -20t-34.5 -52q0 -18 15.5 -29.5t40.5 -11.5q93 0 155 99z" />
+<glyph unicode="&#x210b;" horiz-adv-x="997" d="M714 664l-18 -14q-124 -96 -232 -310q22 9 62 21.5t53 17.5l33 43q100 125 187.5 195t134.5 70q57 0 57 -50q0 -39 -25.5 -76t-72 -68.5t-95 -56t-111.5 -49.5q-174 -251 -174 -334q0 -15 9.5 -25t24.5 -10q55 0 167 129l21 -13q-120 -146 -202 -146q-39 0 -63 24t-24 65 q0 101 104 262l-107 -41q-57 -111 -132 -193t-145 -109q-30 -11 -56 -11q-25 0 -41 16.5t-16 43.5q0 128 283 247q4 7 20 33l22 37l23 33.5t29 38.5l30 38q19 22 40.5 43t46.5 43q-7 -1 -20 -1q-44 0 -124 44q-63 34 -102 34q-47 0 -81.5 -30.5t-34.5 -70.5q0 -42 21.5 -68 t66.5 -26q38 0 66 21.5t55 64.5l18 -9q-54 -107 -141 -107q-59 0 -93 35t-34 91q0 59 50 105t125 46q29 0 58 -10.5t84 -38.5q60 -31 86 -31q41 0 80 19q14 7 43 28l32 24zM958 635q0 22 -24 22q-27 0 -85.5 -63t-128.5 -160q238 105 238 201zM307 241q-105 -48 -163 -96 t-58 -101q0 -25 24 -29q67 0 197 226z" />
+<glyph unicode="&#x210c;" horiz-adv-x="824" d="M626 695l19 -13q-96 -135 -219 -135q-72 0 -133 50q-41 -33 -41 -91q0 -77 57 -139q147 86 224 127q114 -26 177 -100.5t63 -178.5q0 -74 -22 -120t-67 -92q-37 -39 -126.5 -104t-117.5 -103h-13q-60 62 -132 62q-69 0 -114 -56l-20 9q60 136 185 136q70 0 129 -64 q51 32 88.5 71.5t56.5 78.5t27.5 73t8.5 66q0 90 -51.5 156t-133.5 66q-63 0 -143 -54l44 -56q35 -45 35 -82q0 -45 -37.5 -92.5t-139.5 -131.5q-18 14 -61 37.5t-56 27.5q-34 -33 -46 -53l-24 15l104 147l76 -45q56 -33 59 -33q11 10 16 16t9.5 18t4.5 28q0 22 -24.5 55.5 t-54 66t-54 82.5t-24.5 100q0 35 18.5 71.5t56.5 74t61 57t66 52.5q57 -53 131 -53q89 0 138 53z" />
+<glyph unicode="&#x210d;" horiz-adv-x="718" d="M648 0h-166v309h-246v-309h-166v662h166v-309h246v309h166v-662zM604 44v574h-78v-574h78zM192 44v574h-78v-574h78z" />
+<glyph unicode="&#x210e;" horiz-adv-x="577" d="M533 117l12 -11q-78 -116 -147 -116q-53 0 -53 56q0 24 24 110l40 144q9 34 9 62q0 44 -37 44q-24 0 -61 -35.5t-79 -97.5q-34 -50 -55.5 -104t-54.5 -169h-84l158 573q4 16 4 29q0 22 -57 22v15q91 18 156 44l8 -2l-120 -435h1q110 214 219 214q88 0 88 -88 q0 -34 -11 -71l-51 -179q-11 -37 -11 -55q0 -17 13 -17q32 0 89 67z" />
+<glyph unicode="&#x210f;" horiz-adv-x="579" d="M532 117l15 -10q-79 -117 -149 -117q-53 0 -53 56q0 21 24 110l40 144q9 34 9 62q0 44 -37 44q-24 0 -61 -35.5t-79 -97.5q-34 -50 -55.5 -104t-54.5 -169h-84l127 469l-94 -34l9 43l97 35l19 60q4 12 4 29q0 22 -57 22v15q83 17 157 44l8 -2q-11 -33 -26 -88l-13 -46 l144 53l-12 -44l-144 -52l-70 -258h1q110 214 219 214q88 0 88 -88q0 -34 -11 -71l-51 -179q-11 -37 -11 -55q0 -17 13 -17q31 0 88 67z" />
+<glyph unicode="&#x2110;" horiz-adv-x="897" d="M63 95h-2q0 -23 35.5 -51t84.5 -28q102 0 174 53.5t138 201.5q15 35 27 59q-56 12 -90 48t-34 93q0 91 86 145q65 40 183 40q51 0 118 -8q40 27 76 27q12 0 20.5 -5.5t8.5 -14.5q0 -52 -109 -52q-36 -26 -69 -83t-77 -152q74 20 125 99l16 -10q-51 -100 -157 -124 q-79 -170 -133 -227q-117 -121 -285 -121q-77 0 -125 35.5t-48 86.5q0 31 17 51.5t42 20.5q22 0 36.5 -13.5t14.5 -34.5q0 -20 -11.5 -34t-31.5 -14q-23 0 -30 12zM729 601v2q-15 1 -53 1q-100 0 -154 -24q-36 -16 -60.5 -47.5t-24.5 -70.5q0 -34 25 -64t74 -36 q45 87 89.5 143t103.5 96z" />
+<glyph unicode="&#x2111;" horiz-adv-x="762" d="M688 674l23 -7q-8 -28 -17.5 -50t-27.5 -47.5t-48.5 -39.5t-71.5 -14q-59 0 -136 39.5t-134 39.5q-44 0 -80.5 -29t-36.5 -85q0 -48 31 -74.5t71 -26.5q34 0 65 14l8 -22q-39 -20 -77 -20q-76 0 -121 40t-45 105q0 79 61.5 138.5t155.5 59.5q51 0 93.5 -12.5t67.5 -27 t61 -27t74 -12.5q23 0 42.5 12.5t28 23.5t13.5 22zM703 417l-18 -16q-34 30 -65 30q-22 0 -39.5 -15.5t-17.5 -42.5q0 -22 26.5 -58t53.5 -79t27 -84q0 -76 -71 -131t-168 -55q-114 0 -167 40q-45 33 -70 92q-22 50 -56 50q-21 0 -40 -14.5t-30 -36.5l-23 6q9 38 50 81.5 t93 43.5q28 0 50 -9.5t35 -20.5t25.5 -34.5t17.5 -36t14 -40.5q29 -83 109 -83q48 0 78 27.5t30 66.5q0 33 -14.5 66t-32 56t-32 57.5t-14.5 69.5q0 55 41.5 90.5t93.5 35.5q31 0 54 -9t33.5 -18.5t26.5 -28.5z" />
+<glyph unicode="&#x2112;" horiz-adv-x="946" d="M608 643l-12 -19q-55 33 -145 33q-86 0 -154 -42t-68 -115q0 -74 66.5 -116t175.5 -42q25 0 63 5l30 57l30 59q13 23 26 43q42 63 106.5 113t121.5 50q42 0 62.5 -22.5t20.5 -59.5q0 -68 -87 -143.5t-217 -110.5q-47 -102 -119 -185.5t-136 -108.5q69 -23 103 -23 q141 0 265 139l19 -14q-131 -156 -281 -156q-84 0 -164 30q-70 -24 -155 -24q-126 0 -126 61q0 23 29.5 40t78.5 17q21 0 46 -5.5t39 -10.5t46.5 -18t41.5 -16q42 27 99.5 98t104.5 158q-26 -3 -53 -3q-50 0 -96.5 10.5t-88 31.5t-67 60t-25.5 90q0 78 73.5 130.5 t181.5 52.5q99 0 165 -44zM890 588q0 44 -49 44q-55 0 -108.5 -80t-89.5 -183q45 12 104 45q62 34 102.5 80t40.5 94zM266 35v1q-74 43 -125 43q-67 0 -67 -25q0 -33 87 -33q66 0 105 14z" />
+<glyph unicode="&#x2113;" horiz-adv-x="579" d="M77 389l14 26q36 -25 94 -25q85 125 174.5 211t147.5 86q64 0 64 -67q0 -81 -96.5 -161t-225.5 -99q-143 -231 -143 -298q0 -43 36 -43q33 0 76.5 38t122.5 129l21 -17q-85 -99 -133.5 -139.5t-93.5 -40.5q-37 0 -62 22.5t-25 64.5q0 84 77 218q12 22 40 66q-49 2 -88 29 zM268 396l1 -1q117 26 194.5 91.5t77.5 137.5q0 31 -35 31q-37 0 -82 -47q-58 -59 -156 -212z" />
+<glyph unicode="&#x2115;" horiz-adv-x="698" d="M628 0h-134l-378 504h-2v-504h-22h-22v662h135l32 -45l346 -461h1v506h44v-662zM584 44v39l-402 535h-68v-40l401 -534h69z" />
+<glyph unicode="&#x2116;" horiz-adv-x="1012" d="M966 307q0 -68 -38 -114t-101 -46q-64 0 -101.5 46t-37.5 112q0 67 37.5 114t101.5 47q62 0 100.5 -47t38.5 -112zM888 304q0 140 -63 140q-59 0 -59 -139q0 -136 60 -136q62 0 62 135zM962 0h-270v87h270v-87zM556 213v188q0 30 0.5 47.5t3 50t8 53t16.5 47t26.5 41.5 t39.5 25.5t55 10.5q49 0 75.5 -16t26.5 -57q0 -27 -18 -41t-38 -14q-19 0 -31.5 12.5t-18 27t-13 27t-17.5 12.5q-16 0 -28.5 -11t-20 -32.5t-12 -44.5t-7 -55.5t-3 -56.5t-0.5 -55v-383h-18l-324 503v-231q0 -30 -0.5 -47.5t-3 -50t-8 -53t-16.5 -47t-26.5 -41.5 t-39.5 -25.5t-55 -10.5q-49 0 -75.5 16t-26.5 57q0 27 18 41t38 14q19 0 31.5 -12.5t18 -27t13 -27t17.5 -12.5q16 0 28.5 11t20 32.5t12 44.5t7 55.5t3 56.5t0.5 55v269q-40 63 -63 74q-18 8 -61 10v19h180z" />
+<glyph unicode="&#x2117;" horiz-adv-x="760" d="M246 520h143q78 0 119 -34q27 -23 27 -67t-31 -72q-22 -21 -47 -27.5t-70 -6.5q-1 0 -31 2v-97q0 -32 9 -41t42 -10v-15h-161v15q32 2 39 11t7 45v232q0 30 -8 39t-38 11v15zM356 479v-142l26 -2q86 0 86 82q0 46 -19 63.5t-74 17.5q-12 0 -15.5 -4t-3.5 -15zM722 329 q0 -144 -99 -243.5t-242 -99.5q-145 0 -244 100t-99 246q0 145 100.5 244.5t246.5 99.5q140 0 238.5 -101.5t98.5 -245.5zM667 330q0 127 -84.5 215.5t-204.5 88.5q-115 0 -200 -90.5t-85 -212.5q0 -124 85 -213.5t203 -89.5q117 0 201.5 89.5t84.5 212.5z" />
+<glyph unicode="&#x2118;" horiz-adv-x="826" d="M439 462h-15q-3 21 -25.5 32t-50.5 11q-75 0 -140.5 -67t-65.5 -178q0 -90 45 -114q47 72 113 138q69 70 146 115q87 51 205 51q68 0 108 -36t40 -106q0 -64 -33 -134.5t-85 -119.5q-69 -64 -151 -64q-56 0 -85.5 30.5t-29.5 69.5q0 28 16 49t42 21q18 0 31 -11.5 t13 -32.5q0 -19 -17 -36t-17 -25q0 -37 54 -37q46 0 87 53t62.5 123.5t21.5 131.5q0 39 -17.5 67.5t-59.5 28.5q-74 0 -180 -97.5t-182 -213.5q51 -17 79 -44t28 -80q0 -83 -55 -143.5t-131 -60.5q-99 0 -99 104q0 59 29 134q17 44 47 93q-115 48 -115 165q0 100 85 184 t202 84q42 0 71 -22.5t29 -62.5zM306 -11q0 26 -15.5 52t-41.5 35q-4 -4 -22.5 -39.5t-37 -87.5t-18.5 -85q0 -25 7 -37.5t28 -12.5q39 0 69.5 60.5t30.5 114.5z" />
+<glyph unicode="&#x2119;" horiz-adv-x="678" d="M70 662h320q104 0 171 -51t67 -152q0 -102 -66.5 -154t-170.5 -52h-155v-253h-166v662zM491 604v-294q42 14 67.5 57t25.5 90q0 50 -24 91t-69 56zM447 305v304q-18 9 -59 9h-152v-321h145q49 0 66 8zM192 44v574h-78v-574h78z" />
+<glyph unicode="&#x211a;" horiz-adv-x="765" d="M703 -12l6 -44q-63 -9 -83 -9q-44 0 -73.5 18t-58.5 51q-51 -18 -113 -18q-146 0 -241 100t-95 246q0 154 93 249t247 95q149 0 239.5 -97t90.5 -247q0 -102 -46 -183.5t-127 -124.5q45 -45 84 -45q21 0 77 9zM591 548v-429q80 80 80 213t-80 216zM547 79v505 q-59 48 -166 48q-40 0 -90.5 -13t-77.5 -35v-505q19 -13 44 -23q54 66 127 66q64 0 126 -64q20 8 37 21zM169 119v429q-80 -83 -80 -216q0 -128 80 -213zM460 41q-37 37 -79 37q-41 0 -76 -37q42 -11 76 -11q37 0 79 11z" />
+<glyph unicode="&#x211b;" horiz-adv-x="944" d="M852 669l7 -19q-34 -14 -66 -38q83 -53 83 -139q0 -64 -48.5 -111t-131.5 -50v-2q54 -40 54 -84q0 -37 -38 -97t-38 -77q0 -34 32 -34q52 0 145 101l17 -16q-101 -115 -176 -115q-37 0 -65 23.5t-28 58.5q0 33 21 63.5t42 58t21 53.5q0 48 -33 48q-30 0 -47 11 q-82 -169 -178.5 -244t-217.5 -75q-77 0 -125 36t-48 87q0 31 17 51t42 20q22 0 36.5 -13.5t14.5 -34.5q0 -20 -11.5 -34t-31.5 -14q-23 0 -30 12h-2q0 -28 35 -53.5t85 -25.5q93 0 152.5 52t144.5 203q78 139 131.5 214t120.5 124q-76 48 -192 48q-149 0 -250 -75 t-101 -174q0 -41 30 -68.5t73 -27.5q159 0 205 245h20q-7 -107 -68.5 -191t-158.5 -84q-63 0 -102.5 35.5t-39.5 94.5q0 107 111 191t282 84q125 0 221 -59q36 23 84 41zM814 486q0 64 -48 102q-11 -10 -21 -23l-18 -23q-8 -10 -19 -28l-16 -26l-16 -32l-16 -31l-17 -35 q-13 -27 -17 -36q34 0 60 -17q57 6 92.5 50t35.5 99z" />
+<glyph unicode="&#x211c;" horiz-adv-x="874" d="M813 114l16 -20q-24 -24 -70 -60t-80 -56h-14q-52 17 -75.5 78.5t-23.5 130.5q0 136 -52 153l-74 -18q-21 -91 -73 -182.5t-124 -161.5q-100 59 -118 62q-27 -23 -44 -49l-22 14l94 145q102 -61 120 -61t29.5 30.5t15.5 89t5 96.5t1 100q0 259 -108 259q-30 0 -48.5 -20 t-18.5 -47t12 -47t29 -33l33 -27q17 -13 29 -35.5t12 -53.5q0 -50 -49.5 -94t-116.5 -60l-9 22q27 9 51 30.5t24 50.5q0 24 -11.5 43.5t-28.5 34.5l-34 30q-17 15 -28.5 36t-11.5 46q0 72 53.5 113.5t131.5 41.5q107 0 177 -88l133 97q93 0 144.5 -43.5t51.5 -105.5 q0 -57 -31.5 -103t-92.5 -69v-2q34 -21 53 -61.5t24.5 -82t10 -80.5t17 -63.5t37.5 -24.5q12 0 54 45zM444 357l33 7q79 17 113 64t34 103q0 34 -24.5 65t-68.5 31q-29 0 -51 -12t-52 -42q20 -56 20 -108q0 -65 -4 -108z" />
+<glyph unicode="&#x211d;" horiz-adv-x="747" d="M712 0h-207l-195 271h-74v-271h-166v662h320q105 0 171.5 -47.5t66.5 -148.5q0 -67 -34 -114.5t-97 -66.5zM491 604v-283q43 18 68 57t25 86q0 98 -93 140zM447 320v290q-4 0 -22.5 4t-27.5 4h-161v-303h156q10 0 55 5zM626 44l-175 231q-23 -4 -88 -4l165 -227h98z M192 44v574h-78v-574h78z" />
+<glyph unicode="&#x211e;" horiz-adv-x="780" d="M763 0h-173l-26 33l-138 -134l-27 28l140 136l-195 242q-22 -2 -33 -2t-35 2v-133v-43q0 -65 25 -84t93 -21v-24h-325v24q68 2 93 21t25 84v54v355q0 65 -25 84t-93 21v24h286q46 0 91 -8.5t88 -27.5t69.5 -55.5t26.5 -86.5q0 -68 -54.5 -112t-128.5 -60q16 -19 69 -88.5 t85 -105.5l135 132l27 -28l-136 -132q36 -37 64.5 -54.5t71.5 -18.5v-22zM276 567v-232q34 -2 50 -2q46 0 78 5t62.5 19.5t46 45t15.5 77.5q0 86 -38.5 120.5t-125.5 34.5q-42 0 -65 -14t-23 -54z" />
+<glyph unicode="&#x2122;" horiz-adv-x="980" d="M957 662v-20q-32 -2 -44 -14t-12 -41v-254q0 -36 6.5 -43.5t43.5 -11.5v-20h-170v20q34 4 42 9q7 6 7 45v236l-154 -312h-11l-151 310v-223q0 -36 10.5 -48.5t42.5 -16.5v-20h-131v20q32 4 42 16.5t10 48.5v249q-21 48 -69 50v20h121l154 -309l160 309h103zM375 574h-20 q-11 37 -26 52.5t-41 15.5h-50v-308q0 -36 6.5 -44t43.5 -12v-20h-171v20q37 4 43.5 12t6.5 44v308h-49q-27 0 -42.5 -15.5t-25.5 -52.5h-20v88h345v-88z" />
+<glyph unicode="&#x2124;" horiz-adv-x="727" d="M677 618l-425 -574h416v-44h-618v44l419 574h-369v44h577v-44zM617 618h-94l-420 -574h97z" />
+<glyph unicode="&#x2125;" horiz-adv-x="424" d="M219 265v-2q87 -16 129.5 -67t42.5 -129q0 -124 -71.5 -204.5t-188.5 -80.5q-41 0 -68.5 15.5t-27.5 39.5q0 16 12 27.5t29 11.5q23 0 48 -32q21 -26 52 -26q44 0 83.5 67t39.5 160t-31.5 140.5t-108.5 47.5h-55v15l160 170v2h-197v15l199 195v2h-118q-47 0 -63.5 -16.5 t-23.5 -71.5h-19l4 118h331v-15l-195 -195v-2h195v-15z" />
+<glyph unicode="&#x2126;" horiz-adv-x="744" d="M715 0h-286l7 150q62 15 101.5 85.5t39.5 153.5q0 110 -54.5 180.5t-150.5 70.5q-65 0 -113 -38.5t-70 -94t-22 -118.5q0 -78 38.5 -149.5t101.5 -89.5l9 -150h-287v160h19q1 -44 17 -60t51 -16h149l-2 37q-106 30 -158 94.5t-52 171.5q0 114 87.5 201.5t231.5 87.5 q143 0 231 -86t88 -203q0 -206 -213 -266l-2 -37h171q28 0 37.5 17t11.5 57h19v-158z" />
+<glyph unicode="&#x2127;" horiz-adv-x="744" d="M715 504h-19q-2 40 -11.5 57t-37.5 17h-171l2 -37q213 -60 213 -266q0 -117 -88 -203t-231 -86q-144 0 -231.5 87.5t-87.5 201.5q0 107 52 171.5t158 94.5l2 37h-149q-35 0 -51 -16t-17 -60h-19v160h287l-9 -150q-63 -18 -101.5 -89.5t-38.5 -149.5q0 -63 22 -118.5 t70 -94t113 -38.5q96 0 150.5 70.5t54.5 180.5q0 83 -39.5 153.5t-101.5 85.5l-7 150h286v-158z" />
+<glyph unicode="&#x2128;" horiz-adv-x="726" d="M484 268v-2q88 -14 140 -72t52 -150q0 -103 -75.5 -175.5t-199.5 -72.5q-64 0 -109.5 15.5t-84.5 59.5q-13 15 -21 34.5t-10.5 32.5t-10.5 22.5t-22 9.5q-20 0 -40 -14.5t-30 -36.5l-23 7q10 40 44.5 81t87.5 41q30 0 51 -8.5t34.5 -27t20 -32t16.5 -39.5 q19 -54 44 -80.5t77 -26.5q38 0 64.5 16t39 45.5t17.5 61t5 72.5q0 95 -43.5 152.5t-113.5 57.5q-57 0 -89 -18.5t-68 -65.5l-24 14q18 28 32 44.5t41 33.5t61 24v2q-74 13 -115 89l27 18q50 -77 128 -77q61 0 104 48t43 125q0 89 -51.5 130t-124.5 41q-156 0 -220 -179 l-25 7q26 103 95.5 161.5t179.5 58.5t186.5 -57t76.5 -158q0 -73 -43.5 -130.5t-123.5 -81.5z" />
+<glyph unicode="&#x2129;" horiz-adv-x="360" d="M276 0h-124v343q0 73 -43 73q-16 0 -26.5 -13t-13.5 -24t-7 -31h-30q6 50 35.5 82.5t78.5 32.5q130 0 130 -122v-341z" />
+<glyph unicode="&#x212b;" horiz-adv-x="722" d="M141 186l205 487q-37 4 -61.5 32t-24.5 67q0 41 29.5 70t71.5 29q40 0 69 -29.5t29 -70.5q0 -39 -26 -67t-65 -32l245 -561q22 -52 39.5 -70t54.5 -22v-19h-255v19q40 0 55 9q14 7 14 24q0 26 -19 70l-41 94h-262l-46 -114q-9 -23 -9 -42q0 -23 16.5 -32t53.5 -9v-19 h-199v19q42 4 61 30.5t65 136.5zM425 772q0 27 -19.5 46t-47.5 19q-26 0 -45 -19.5t-19 -45.5q0 -28 19 -47t45 -19q28 0 47.5 19t19.5 47zM447 257l-116 275l-115 -275h231z" />
+<glyph unicode="&#x212c;" horiz-adv-x="950" d="M895 660l7 -19q-42 -19 -72 -40q72 -59 72 -138q0 -50 -44.5 -93.5t-108.5 -51.5v-2q45 -19 67.5 -55t22.5 -75q0 -44 -25.5 -89t-70.5 -75q-49 -33 -112 -33q-44 0 -69 24t-25 54q0 50 36 85.5t102 46.5l4 -23q-42 -5 -73.5 -33t-31.5 -61q0 -20 14.5 -34t35.5 -14 q36 0 61 15q36 21 57 63.5t21 90.5q0 69 -46 95q-24 -6 -49 -6q-38 0 -47 19q-157 -326 -414 -326q-77 0 -125 35.5t-48 86.5q0 31 17 51.5t42 20.5q22 0 36.5 -13.5t14.5 -34.5q0 -20 -11.5 -34t-31.5 -14q-23 0 -30 12h-2q0 -28 35 -53.5t85 -25.5q95 0 161.5 53.5 t150.5 201.5q71 125 134.5 203t140.5 127q-81 56 -210 56q-93 0 -177.5 -31.5t-139.5 -92.5t-55 -137q0 -47 30 -76.5t81 -29.5q84 0 144 75t65 196h20q0 -125 -64 -213t-170 -88q-63 0 -105 37t-42 106q0 66 40 122t102.5 90t132.5 53t136 19q144 0 244 -67q34 20 87 40z M841 485q0 53 -40 95q-45 -38 -81.5 -92.5t-80.5 -139.5q7 4 23 4q27 0 55 -14q60 5 92 49t32 98z" />
+<glyph unicode="&#x212d;" horiz-adv-x="717" d="M659 678l16 -16l-24 -33q-9 -12 -28.5 -33.5t-40.5 -32.5t-43 -11q-69 0 -108 46q-39 -39 -39 -73q0 -21 14.5 -45.5t35.5 -47.5l42 -49q21 -25 35.5 -55t14.5 -60q0 -53 -48.5 -94t-109.5 -41q-40 0 -67 15l11 22q22 -11 40 -11q28 0 46 15t18 44q0 35 -18 69t-40 57.5 t-40 58t-18 70.5q0 23 11.5 47.5t36 50.5t42.5 42.5t52 44.5l44 37q57 -54 92 -54t73 37zM624 173l20 -12q-41 -79 -111 -132t-163 -53q-63 0 -117 22.5t-91.5 60t-63.5 87t-38.5 103t-12.5 107.5q0 39 8.5 81.5t28 87t47.5 80t72 58t97 22.5q60 0 95 -37l-16 -19 q-25 16 -64 16q-48 0 -83.5 -39.5t-51.5 -94t-16 -112.5q0 -62 13.5 -118.5t41.5 -106.5t77 -79.5t114 -29.5q115 0 214 108z" />
+<glyph unicode="&#x212e;" horiz-adv-x="843" d="M808 330h-630v-176q0 -18 2 -24t14 -20q37 -44 97 -69.5t133 -25.5q154 0 247 113h71q-68 -76 -140.5 -110.5t-177.5 -34.5q-165 0 -277 100.5t-112 246.5q0 143 110.5 244.5t278.5 101.5q71 0 137.5 -22.5t120.5 -64.5t88 -109t38 -150zM666 387v121q0 12 -3 21t-5 11 l-12 16q-30 39 -93 63t-129 24q-65 0 -129 -27.5t-101 -67.5q-11 -11 -13.5 -18t-2.5 -28v-118q0 -12 4 -16t15 -4h446q13 0 18 4.5t5 18.5z" />
+<glyph unicode="&#x212f;" horiz-adv-x="627" d="M534 196l20 -20q-92 -93 -170 -140t-154 -47q-52 0 -79 29.5t-27 81.5q0 46 18 92q-34 4 -65 23.5t-47 48.5l23 17q29 -57 101 -62q44 91 132.5 156.5t176.5 65.5q32 0 51.5 -14t19.5 -41q0 -56 -85.5 -114.5t-224.5 -79.5q-42 -74 -42 -118q0 -26 15 -40.5t39 -14.5 q119 0 298 177zM245 227l1 -1q105 15 181.5 64.5t76.5 93.5q0 27 -36 27q-47 0 -106 -46.5t-117 -137.5z" />
+<glyph unicode="&#x2130;" horiz-adv-x="750" d="M421 658l-10 -18q-44 17 -110 17q-72 0 -116 -31t-44 -80q0 -53 55 -83.5t136 -30.5q6 65 56 118t116.5 80.5t129.5 27.5q100 0 100 -73q0 -62 -97.5 -118.5t-233.5 -66.5q1 -6 4 -12q75 -3 75 -31t-42 -28q-28 0 -53 14q-88 -23 -141.5 -83t-53.5 -126q0 -49 39 -84 t105 -35q94 0 149 60q35 38 35 85q0 34 -24 54t-63 20q-53 0 -99.5 -39.5t-64.5 -102.5l-21 6q20 82 74.5 130t127.5 48q66 0 100 -31.5t34 -83.5q0 -68 -78 -122t-180 -54q-91 0 -153.5 44.5t-62.5 124.5q0 79 63 140.5t174 84.5v2q-2 2 -4 7l-3 9q-2 4 -4 4 q-107 2 -171.5 41.5t-64.5 106.5q0 57 52.5 97.5t136.5 40.5q75 0 132 -29zM693 588q0 15 -15 24t-37 9q-72 0 -150 -62t-88 -129q118 7 204 57.5t86 100.5z" />
+<glyph unicode="&#x2131;" horiz-adv-x="919" d="M896 662l11 -15q-89 -73 -176 -73q-57 0 -181 30t-168 30q-93 0 -148 -39t-55 -104q0 -56 31.5 -84t75.5 -28q71 0 114.5 43.5t71.5 132.5l20 -1q-39 -205 -209 -205q-59 0 -102 37t-43 98q0 78 64 132q76 64 227 64q56 0 180.5 -28t173.5 -28q47 0 113 38zM657 568 l14 -14q-34 -33 -57 -83t-50 -134q69 14 121 15q18 27 40 42t38 15q23 0 23 -22q0 -15 -20.5 -37.5t-51.5 -37.5q-8 -22 -8 -60q0 -12 3 -26l-59 -20v18q0 33 11 70q-62 -3 -115 -12q-105 -282 -354 -282q-59 0 -104 28.5t-45 82.5q0 32 16.5 50.5t43.5 18.5q20 0 35 -14.5 t15 -34.5q0 -21 -12 -35.5t-32 -14.5q-21 0 -29 13h-2q4 -27 33.5 -45t72.5 -18q76 0 132.5 48t120.5 177q-97 -31 -177 -85l-13 15q58 70 216 124q3 6 8 17.5t6 13.5q30 69 72 120t108 107z" />
+<glyph unicode="&#x2132;" horiz-adv-x="535" d="M462 0h-440l-9 75h362v201h-296v75h296v311h87v-662z" />
+<glyph unicode="&#x2133;" horiz-adv-x="1072" d="M1048 672l8 -13q-142 -225 -230.5 -393t-88.5 -213q0 -35 33 -35q55 0 170 132l19 -16q-120 -146 -203 -146q-37 0 -61.5 22t-24.5 60q0 149 308 563l-1 2q-66 -25 -144.5 -120t-185.5 -284q-81 -143 -113 -181q-46 -54 -100 -54q-25 0 -40.5 19t-15.5 51q0 88 143 307 q126 196 192 270l-1 1q-53 -22 -118.5 -91t-120.5 -156l-51 -83l-48 -76l-40 -64q-24 -38 -39 -58.5t-35 -45.5t-35 -37.5t-33.5 -25t-36.5 -17.5t-37 -5q-34 0 -57 22.5t-23 55.5q0 28 17.5 46.5t41.5 18.5q22 0 37 -16t15 -36q0 -18 -12 -31t-31 -13q-8 0 -15 4h-3 q3 -21 31 -21q50 0 98 51t127 184q145 242 238.5 333t179.5 91q7 0 17 -2l15 -12q-100 -141 -191.5 -297t-130.5 -245q-17 -45 -17 -61q0 -18 13 -18q18 0 36.5 23t49.5 72l60 100l68 117q28 48 72.5 110.5t82.5 103t86.5 72t96.5 37.5q16 0 28 -2z" />
+<glyph unicode="&#x2134;" horiz-adv-x="697" d="M668 223l12 -25q-31 -21 -75 -21q-41 0 -69 18q-119 -206 -269 -206q-51 0 -80 29.5t-29 87.5q0 46 18 91q-29 -24 -82 -24q-33 0 -64 17l10 26q31 -13 57 -13q68 0 123 72t130.5 119t146.5 47q39 0 63 -24.5t24 -62.5q0 -62 -34 -130q25 -17 59 -17q36 0 59 16zM554 355 q-5 51 -55 51q-53 0 -122 -62.5t-115 -139.5t-46 -121q0 -27 14 -45.5t42 -18.5q56 0 118 46t116 146q-16 25 -16 59q0 29 19 55t45 30z" />
+<glyph unicode="&#x2135;" horiz-adv-x="682" d="M493 265l94 -94q47 -47 47 -92q0 -46 -19 -92h-25q0 13 -3 24q-3 9 -10.5 20.5t-14.5 20.5t-18.5 21l-17.5 18l-18 17l-12 11l-304 281q-30 -52 -30 -109q0 -58 50 -114q5 -6 16 -17l16 -18q6 -6 12.5 -16t9.5 -20t3 -21q0 -38 -35 -61.5t-98 -23.5h-76v24q33 1 66.5 13 t33.5 37q0 19 -15.5 36t-34.5 31t-34.5 45t-15.5 73q0 99 106 167l-83 81q-40 38 -40 89q0 45 32 81h24q-4 -8 -4 -17q0 -6 1.5 -11.5t6 -12.5t7.5 -11t11 -13l11 -11q3 -3 13.5 -12.5t13.5 -12.5l299 -283l51 202q-62 50 -62 116q0 35 22 66h24q-2 -6 -2 -10q0 -19 40 -57 l51 -48q52 -50 52 -107q0 -25 -19 -70h-25q0 21 -8 36q-5 9 -41 45z" />
+<glyph unicode="&#x2136;" horiz-adv-x="639" d="M554 120l18 -12q-2 -50 -33 -79t-80 -29h-286q-70 0 -96 -19l-20 13q50 108 161 108h233q22 70 22 188q0 125 -32 171.5t-94 46.5q-20 0 -65 -6.5t-73 -6.5q-67 0 -100 26.5t-33 64.5q0 61 38 91h24q-3 -11 -3 -20q0 -26 17.5 -43t44.5 -17q28 0 78 10t80 10 q95 0 140.5 -49t45.5 -157q0 -94 -55 -309q50 0 68 18z" />
+<glyph unicode="&#x2137;" horiz-adv-x="505" d="M167 677h24q-2 -12 -2 -18q0 -59 98 -59q92 0 92 -101q0 -32 -12.5 -101t-12.5 -105q0 -40 54.5 -109.5t54.5 -104.5q0 -55 -26 -92h-24q0 23 -12 43t-27.5 35t-32.5 46t-24 72h-2q-31 -107 -80 -156q-27 -27 -80 -27q-69 0 -95 -19l-20 13q48 103 129 106q41 1 77.5 42 t62.5 111q10 73 10 141q0 42 -15.5 71t-41.5 29q-65 0 -98.5 29t-33.5 66q0 34 9 52.5t28 35.5z" />
+<glyph unicode="&#x2138;" horiz-adv-x="599" d="M90 677h24q-3 -11 -3 -20q0 -26 17.5 -43t44.5 -17q28 0 98 10t100 10q64 0 94 -23t30 -58q0 -29 -23 -50q-16 -16 -28 -47.5t-12 -63.5q0 -61 16.5 -136t16.5 -119q0 -43 -28.5 -82t-73.5 -57l-22 11q18 48 18 92q-1 33 -8 106t-7 93q0 24 5 48t11 41t18.5 39.5t19 32.5 t21 30.5t16.5 23.5q-26 10 -72 10q-19 0 -80.5 -6.5t-90.5 -6.5q-65 0 -98 20q-42 25 -42 71q0 61 38 91z" />
+<glyph unicode="&#x213c;" horiz-adv-x="673" d="M645 92l-18 -30q-26 -44 -61 -59t-92 -15q-65 0 -101.5 40.5t-36.5 106.5v271h-70v-406h-148v406h-93v44h586v-44h-127v-292q0 -64 14 -82q22 0 39 7.5t23.5 13t22.5 27.5t20 28zM443 37l1 2q-4 25 -4 76v291h-60v-258q0 -96 63 -111zM222 44v362h-60v-362h60z" />
+<glyph unicode="&#x213d;" horiz-adv-x="540" d="M489 459l37 -25l-18 -25q-94 -128 -156 -240q70 -123 70 -232q0 -62 -32 -108.5t-91 -46.5q-46 0 -76 36.5t-30 83.5q0 76 52 167q-26 59 -66.5 113t-95.5 115t-83 99l136 64q2 -2 7 -8t8 -8q94 -97 174 -228q75 126 154 229q6 8 10 14zM342 -164l2 -1q34 39 34 102 q0 105 -75.5 233t-169.5 226q-8 8 -11 12l-52 -28q12 -16 19 -24l70 -84q25 -30 66 -87t63 -100.5t39.5 -99.5t17.5 -107q0 -21 -3 -42zM272 11h-1q-34 -50 -34 -103q0 -28 15.5 -54.5t41.5 -27.5q7 21 7 56q0 29 -8 69.5t-21 59.5z" />
+<glyph unicode="&#x213e;" horiz-adv-x="469" d="M567 618h-331v-618h-166v662h497v-44zM192 44v574h-78v-574h78z" />
+<glyph unicode="&#x213f;" horiz-adv-x="718" d="M648 0h-166v618h-246v-618h-166v662h578v-662zM604 44v574h-78v-574h78zM192 44v574h-78v-574h78z" />
+<glyph unicode="&#x2140;" horiz-adv-x="923" d="M882 -259h-821v58l284 453l-284 453v58h706v-58h-430l279 -453l-284 -453h550v-58zM550 252l-278 453h-141l278 -453l-280 -453h136z" />
+<glyph unicode="&#x2141;" horiz-adv-x="695" d="M68 305v298q30 20 44.5 28t46 21.5t70.5 18.5t91 5q157 0 252.5 -97t95.5 -250q0 -147 -98.5 -245t-247.5 -98q-165 0 -242 111v103h19q66 -138 223 -138q121 0 189 78t68 186q0 110 -70.5 192t-192.5 82q-83 0 -122 -18t-39 -43v-158h86l22 -76h-195z" />
+<glyph unicode="&#x2142;" horiz-adv-x="559" d="M485 0h-87v588h-385l18 74h454v-662z" />
+<glyph unicode="&#x2143;" horiz-adv-x="559" d="M485 0h-454l-18 74h385v588h87v-662z" />
+<glyph unicode="&#x2144;" horiz-adv-x="630" d="M609 0h-95l-199 300l-199 -300h-95l250 374v288h88v-288z" />
+<glyph unicode="&#x2145;" horiz-adv-x="722" d="M70 662h278q149 0 239 -90t90 -240q0 -147 -91 -239.5t-238 -92.5h-278v662zM553 541v-415q38 28 59 93.5t21 122.5q0 125 -80 199zM509 99v472q-31 20 -79.5 33.5t-86.5 13.5h-107v-574h106q41 0 92 15t75 40zM192 44v574h-78v-574h78z" />
+<glyph unicode="&#x2146;" horiz-adv-x="574" d="M519 0h-148v48h-2q-46 -58 -135 -58q-88 0 -138.5 73t-50.5 165q0 94 50.5 163t140.5 69q91 0 135 -59v282h148v-683zM475 44v595h-60v-595h60zM371 155v144q0 46 -38.5 81.5t-84.5 35.5q-38 0 -55 -17v-350q20 -15 60 -15q47 0 82.5 37t35.5 84zM149 70v313 q-60 -42 -60 -155q0 -110 60 -158z" />
+<glyph unicode="&#x2147;" horiz-adv-x="523" d="M478 199h-285v-148q30 -17 77 -17q57 0 93.5 18.5t67.5 65.5l36 -24q-58 -104 -193 -104q-105 0 -167 65.5t-62 171.5q0 104 62.5 168.5t166.5 64.5q81 0 142.5 -54t61.5 -133v-74zM434 243v33q0 32 -17 63t-43 46v-142h60zM330 243v154q-28 19 -59 19q-36 0 -78 -21 v-152h137zM149 71v309q-60 -52 -60 -153q0 -104 60 -156z" />
+<glyph unicode="&#x2148;" horiz-adv-x="258" d="M203 537h-148v146h148v-146zM159 581v58h-60v-58h60zM203 0h-148v450h148v-450zM159 44v362h-60v-362h60z" />
+<glyph unicode="&#x2149;" horiz-adv-x="305" d="M250 537h-143v146h143v-146zM206 581v58h-55v-58h55zM250 450v-491q0 -80 -50 -128t-131 -48q-45 0 -84 16l14 42q35 -13 59 -13q32 0 49 9v613h143zM206 -58v464h-55v-559q26 13 40.5 39t14.5 56z" />
+<glyph unicode="&#x214a;" horiz-adv-x="664" d="M291 552h101q96 0 153 -46t57 -131q0 -90 -55.5 -133.5t-152.5 -43.5h-103v-132h267v-66h-333v486h-114v-180h-66v246h180v140h66v-140zM291 264h100q145 0 145 111t-144 111h-101v-222z" />
+<glyph unicode="&#x214b;" horiz-adv-x="778" d="M43 552l-15 11q22 54 61 83.5t90 29.5q82 0 170 -91q56 49 105.5 70t110.5 21q82 0 126.5 -38t44.5 -112q0 -61 -40.5 -117.5t-116.5 -100.5l-38 -22q35 -85 35 -149q0 -66 -43.5 -108t-108.5 -42q-61 0 -99 33t-38 91q0 55 34.5 93t120.5 75q-56 121 -132 206 q-50 -67 -71 -106.5t-21 -73.5q0 -23 14 -33t51 -14v-21h-216v21q35 0 54.5 13t39.5 46l39 63l43 70q19 30 44 63q-37 47 -72.5 69.5t-79.5 22.5q-29 0 -48.5 -11.5t-43.5 -41.5zM644 489q0 62 -34.5 98t-89.5 36q-64 0 -146 -64q86 -101 152 -239q65 42 91.5 79.5 t26.5 89.5zM497 102q0 40 -8 70.5t-32 74.5q-63 -29 -90 -62t-27 -78q0 -37 22 -62.5t56 -25.5q35 0 57 23t22 60z" />
+<glyph unicode="&#x2153;" horiz-adv-x="750" d="M638 241v-2q43 -11 65 -41.5t22 -68.5q0 -60 -52 -98.5t-135 -38.5q-40 0 -65.5 16t-25.5 40q0 31 37 31q15 0 41 -19q27 -20 51 -20q30 0 49 20t19 51q0 39 -23.5 60.5t-65.5 21.5q-4 0 -28 -3v29q52 18 73.5 37.5t21.5 46.5q0 47 -56 47q-27 0 -46.5 -13t-39.5 -45 l-25 19q27 51 58.5 73t76.5 22q46 0 77 -24t31 -59q0 -52 -60 -82zM594 676l-450 -690h-49l453 690h46zM216 270h-180v24q32 2 42.5 9t10.5 24v254q0 30 -9 30q-12 0 -42 -14v24l107 55l14 -4v-339q0 -20 13 -29.5t44 -9.5v-24z" />
+<glyph unicode="&#x2154;" horiz-adv-x="750" d="M644 241v-2q43 -11 65 -41.5t22 -68.5q0 -60 -52 -98.5t-135 -38.5q-40 0 -65.5 16t-25.5 40q0 31 37 31q15 0 41 -19q27 -20 51 -20q30 0 49 20t19 51q0 39 -23.5 60.5t-65.5 21.5q-4 0 -28 -3v29q52 18 73.5 37.5t21.5 46.5q0 47 -56 47q-27 0 -46.5 -13t-39.5 -45 l-25 19q27 51 58.5 73t76.5 22q46 0 77 -24t31 -59q0 -52 -60 -82zM637 676l-450 -690h-49l453 690h46zM309 355l-39 -85h-251v24l101 108q44 48 66 80t22 59q0 75 -73 75q-28 0 -54 -19.5t-42 -54.5l-25 15q22 64 55 91.5t95 27.5q58 0 92 -30.5t34 -78.5q0 -37 -19 -70.5 t-67 -80.5l-84 -81h113q40 0 58 27z" />
+<glyph unicode="&#x2155;" horiz-adv-x="750" d="M595 676l-450 -690h-49l453 690h46zM715 404l-33 -64q-5 -12 -19 -12h-131l-15 -25q104 -16 138 -48q27 -24 38 -47t11 -63q0 -70 -48 -111.5t-133 -41.5q-44 0 -65 15.5t-21 37.5q0 32 32 32q22 0 50 -20q24 -17 44 -17q33 0 54.5 22t21.5 60q0 45 -46 76 q-43 28 -132 28q-10 0 -10 12q0 5 1 7l84 155h129q19 0 31 16zM217 270h-180v24q32 2 42.5 9t10.5 24v254q0 30 -9 30q-12 0 -42 -14v24l107 55l14 -4v-339q0 -20 13 -29.5t44 -9.5v-24z" />
+<glyph unicode="&#x2156;" horiz-adv-x="750" d="M309 355l-39 -85h-251v24l101 108q78 84 78 138q0 32 -20.5 54t-50.5 22q-54 0 -88 -74l-25 15q22 64 55 91.5t95 27.5q58 0 92 -30.5t34 -78.5q0 -37 -19 -70.5t-67 -80.5l-84 -81h113q40 0 58 27zM637 676l-450 -690h-49l453 690h46zM720 404l-33 -64q-5 -12 -19 -12 h-131l-15 -25q104 -16 138 -48q27 -24 38 -47t11 -63q0 -70 -48 -111.5t-133 -41.5q-44 0 -65 15.5t-21 37.5q0 32 32 32q22 0 50 -20q24 -17 44 -17q33 0 54.5 22t21.5 60q0 45 -46 76q-41 28 -132 28q-10 0 -10 12q0 5 1 7l84 155h129q19 0 31 16z" />
+<glyph unicode="&#x2157;" horiz-adv-x="750" d="M204 511v-2q43 -11 65 -41.5t22 -68.5q0 -60 -52 -98.5t-135 -38.5q-40 0 -65.5 16t-25.5 40q0 31 37 31q15 0 41 -19q27 -20 51 -20q30 0 49 20t19 51q0 39 -23.5 60.5t-65.5 21.5q-4 0 -28 -3v29q52 18 73.5 37.5t21.5 46.5q0 47 -56 47q-27 0 -46.5 -13t-39.5 -45 l-25 19q27 51 58.5 73t76.5 22q46 0 77 -24t31 -59q0 -52 -60 -82zM637 676l-450 -690h-49l453 690h46zM720 404l-33 -64q-5 -12 -19 -12h-131l-15 -25q104 -16 138 -48q27 -24 38 -47t11 -63q0 -70 -48 -111.5t-133 -41.5q-44 0 -65 15.5t-21 37.5q0 32 32 32q22 0 50 -20 q24 -17 44 -17q33 0 54.5 22t21.5 60q0 45 -46 76q-41 28 -132 28q-10 0 -10 12q0 5 1 7l84 155h129q19 0 31 16z" />
+<glyph unicode="&#x2158;" horiz-adv-x="750" d="M637 676l-450 -690h-49l453 690h46zM720 404l-33 -64q-5 -12 -19 -12h-131l-15 -25q104 -16 138 -48q27 -24 38 -47t11 -63q0 -70 -48 -111.5t-133 -41.5q-44 0 -65 15.5t-21 37.5q0 32 32 32q22 0 50 -20q24 -17 44 -17q33 0 54.5 22t21.5 60q0 45 -46 76 q-41 28 -132 28q-10 0 -10 12q0 5 1 7l84 155h129q19 0 31 16zM319 361h-55v-90h-70v90h-180v49l203 266h47v-258h55v-57zM194 418v179l-135 -179h135z" />
+<glyph unicode="&#x2159;" horiz-adv-x="750" d="M595 676l-450 -690h-49l453 690h46zM702 416l3 -24q-180 -27 -195 -145q44 21 75 21q62 0 97 -38t35 -101q0 -62 -42.5 -102.5t-104.5 -40.5q-71 0 -111 50.5t-40 124.5q0 114 83 184t200 71zM637 109q0 45 -20.5 83t-55.5 38q-24 0 -42 -19.5t-18 -47.5q0 -53 19 -92.5 t55 -39.5q28 0 45 22.5t17 55.5zM217 270h-180v24q32 2 42.5 9t10.5 24v254q0 30 -9 30q-12 0 -42 -14v24l107 55l14 -4v-339q0 -20 13 -29.5t44 -9.5v-24z" />
+<glyph unicode="&#x215a;" horiz-adv-x="750" d="M637 676l-450 -690h-49l453 690h46zM707 415l3 -24q-179 -27 -195 -147q40 23 75 23q62 0 97 -38t35 -101q0 -62 -42.5 -102.5t-104.5 -40.5q-71 0 -111 49.5t-40 123.5q0 114 83 185t200 72zM642 108q0 45 -20.5 83t-55.5 38q-24 0 -42 -22t-18 -50q0 -52 19 -89.5 t55 -37.5q28 0 45 22.5t17 55.5zM307 664l-33 -64q-5 -12 -19 -12h-131l-15 -25q104 -16 138 -48q27 -24 38 -47t11 -63q0 -70 -48 -111.5t-133 -41.5q-44 0 -65 15.5t-21 37.5q0 32 32 32q22 0 50 -20q24 -17 44 -17q33 0 54.5 22t21.5 60q0 45 -46 76q-41 28 -132 28 q-10 0 -10 12q0 5 1 7l84 155h129q19 0 31 16z" />
+<glyph unicode="&#x215b;" horiz-adv-x="750" d="M595 676l-450 -690h-49l453 690h46zM722 98q0 -49 -37.5 -77.5t-100.5 -28.5q-60 0 -96 23.5t-36 68.5q0 34 17 60.5t63 55.5q-46 34 -60.5 55t-14.5 52q0 45 37 72t96 27q51 0 83.5 -24.5t32.5 -60.5q0 -35 -18 -56.5t-63 -42.5q55 -33 76 -60.5t21 -63.5zM644 301 q0 23 -19.5 37.5t-45.5 14.5t-41.5 -11.5t-15.5 -32.5q0 -22 14 -36t53 -34q29 16 42 29t13 33zM598 162l-31 19q-45 -31 -45 -74q0 -30 19 -45.5t52 -15.5q27 0 44 12t17 33q0 37 -56 71zM217 270h-180v24q32 2 42.5 9t10.5 24v254q0 30 -9 30q-12 0 -42 -14v24l107 55 l14 -4v-339q0 -20 13 -29.5t44 -9.5v-24z" />
+<glyph unicode="&#x215c;" horiz-adv-x="750" d="M204 511v-2q43 -11 65 -41.5t22 -68.5q0 -60 -52 -98.5t-135 -38.5q-40 0 -65.5 16t-25.5 40q0 31 37 31q15 0 41 -19q27 -20 51 -20q30 0 49 20t19 51q0 39 -23.5 60.5t-65.5 21.5q-4 0 -28 -3v29q52 18 73.5 37.5t21.5 46.5q0 47 -56 47q-27 0 -46.5 -13t-39.5 -45 l-25 19q27 51 58.5 73t76.5 22q46 0 77 -24t31 -59q0 -52 -60 -82zM637 676l-450 -690h-49l453 690h46zM727 98q0 -49 -37.5 -77.5t-100.5 -28.5q-60 0 -96 23.5t-36 68.5q0 34 17 60.5t63 55.5q-46 34 -60.5 55t-14.5 52q0 45 37 72t96 27q51 0 83.5 -24.5t32.5 -60.5 q0 -35 -18 -56.5t-63 -42.5q55 -33 76 -60.5t21 -63.5zM649 301q0 23 -19.5 37.5t-45.5 14.5t-41.5 -11.5t-15.5 -32.5q0 -22 14 -36t53 -34q29 16 42 29t13 33zM603 162l-31 19q-45 -31 -45 -74q0 -30 19 -45.5t52 -15.5q27 0 44 12t17 33q0 37 -56 71z" />
+<glyph unicode="&#x215d;" horiz-adv-x="750" d="M637 676l-450 -690h-49l453 690h46zM727 98q0 -49 -37.5 -77.5t-100.5 -28.5q-60 0 -96 23.5t-36 68.5q0 34 17 60.5t63 55.5q-46 34 -60.5 55t-14.5 52q0 45 37 72t96 27q51 0 83.5 -24.5t32.5 -60.5q0 -35 -18 -56.5t-63 -42.5q55 -33 76 -60.5t21 -63.5zM649 301 q0 23 -19.5 37.5t-45.5 14.5t-41.5 -11.5t-15.5 -32.5q0 -22 14 -36t53 -34q29 16 42 29t13 33zM603 162l-31 19q-45 -31 -45 -74q0 -30 19 -45.5t52 -15.5q27 0 44 12t17 33q0 37 -56 71zM307 664l-33 -64q-5 -12 -19 -12h-131l-15 -25q104 -16 138 -48q27 -24 38 -47 t11 -63q0 -70 -48 -111.5t-133 -41.5q-44 0 -65 15.5t-21 37.5q0 32 32 32q22 0 50 -20q24 -17 44 -17q33 0 54.5 22t21.5 60q0 45 -46 76q-41 28 -132 28q-10 0 -10 12q0 5 1 7l84 155h129q19 0 31 16z" />
+<glyph unicode="&#x215e;" horiz-adv-x="750" d="M600 676l-450 -690h-49l453 690h46zM727 98q0 -49 -37.5 -77.5t-100.5 -28.5q-60 0 -96 23.5t-36 68.5q0 34 17 60.5t63 55.5q-46 34 -60.5 55t-14.5 52q0 45 37 72t96 27q51 0 83.5 -24.5t32.5 -60.5q0 -35 -18 -56.5t-63 -42.5q55 -33 76 -60.5t21 -63.5zM649 301 q0 23 -19.5 37.5t-45.5 14.5t-41.5 -11.5t-15.5 -32.5q0 -22 14 -36t53 -34q29 16 42 29t13 33zM603 162l-31 19q-45 -31 -45 -74q0 -30 19 -45.5t52 -15.5q27 0 44 12t17 33q0 37 -56 71zM321 642l-144 -387h-56l128 340h-126q-29 0 -40.5 -6t-30.5 -31l-24 10l45 92h248 v-18z" />
+<glyph unicode="&#x2190;" horiz-adv-x="926" d="M857 220h-599q-8 0 -17 -7.5t-9 -14.5q0 -11 14 -25q51 -49 82 -96l-20 -19q-124 143 -237 190v10q115 49 238 191l20 -19q-28 -40 -82 -96q-14 -14 -14 -28q0 -20 26 -20h598v-66z" />
+<glyph unicode="&#x2191;" horiz-adv-x="511" d="M451 424l-19 -20q-40 28 -96 82q-14 14 -28 14q-20 0 -20 -26v-630h-66v631q0 8 -7.5 17t-14.5 9q-11 0 -25 -14q-49 -51 -96 -82l-19 20q143 124 190 237h10q49 -115 191 -238z" />
+<glyph unicode="&#x2192;" horiz-adv-x="926" d="M856 258v-10q-115 -49 -238 -191l-20 19q28 40 82 96q14 14 14 28q0 20 -26 20h-598v66h599q8 0 17 7.5t9 14.5q0 11 -14 25q-51 49 -82 96l20 19q124 -143 237 -190z" />
+<glyph unicode="&#x2193;" horiz-adv-x="511" d="M432 101l19 -20q-143 -124 -190 -237h-10q-49 115 -191 238l19 20q40 -28 96 -82q14 -14 28 -14q20 0 20 26v630h66v-631q0 -8 7.5 -17t14.5 -9q11 0 25 14q49 51 96 82z" />
+<glyph unicode="&#x2194;" horiz-adv-x="926" d="M888 258v-10q-115 -49 -238 -191l-20 19q28 40 82 96q14 14 14 28q0 20 -26 20h-475q-8 0 -17 -7.5t-9 -14.5q0 -11 14 -25q51 -49 82 -96l-20 -19q-124 143 -237 190v10q115 49 238 191l20 -19q-28 -40 -82 -96q-14 -14 -14 -28q0 -20 26 -20h475q8 0 17 7.5t9 14.5 q0 11 -14 25q-51 49 -82 96l20 19q124 -143 237 -190z" />
+<glyph unicode="&#x2195;" horiz-adv-x="511" d="M451 492l-19 -20q-37 26 -95 82q-14 14 -28 14q-20 0 -20 -26v-578q0 -8 7.5 -17t14.5 -9q11 0 25 14q51 52 95 82l19 -20q-141 -122 -189 -238h-10q-50 116 -191 239l19 20q40 -28 96 -82q14 -14 28 -14q20 0 20 26v578q0 8 -7.5 17t-14.5 9q-11 0 -25 -14 q-49 -51 -96 -82l-19 20q143 124 190 237h10q50 -116 190 -238z" />
+<glyph unicode="&#x2196;" horiz-adv-x="926" d="M856 -109l-48 -47l-625 659q-7 7 -22 7q-8 0 -12 -4q-8 -8 -8 -28q0 -77 -10 -126l-28 1q4 54 4 84q0 130 -37 218l7 7q93 -37 218 -37q30 0 86 4v-28q-56 -10 -126 -10q-21 0 -29 -10q-6 -6 -6 -13q0 -10 16 -26z" />
+<glyph unicode="&#x2197;" horiz-adv-x="926" d="M849 662l7 -7q-37 -88 -37 -218q0 -30 4 -84l-28 -1q-10 49 -10 126q0 20 -8 28q-4 4 -12 4q-15 0 -22 -7l-625 -659l-48 47l620 651q16 16 16 26q0 7 -6 13q-8 10 -29 10q-70 0 -126 10v28q56 -4 86 -4q125 0 218 37z" />
+<glyph unicode="&#x2198;" horiz-adv-x="926" d="M856 -149l-7 -7q-93 37 -218 37q-30 0 -86 -4v28q56 10 126 10q21 0 29 10q6 6 6 13q0 10 -16 26l-620 651l48 47l625 -659q7 -7 22 -7q8 0 12 4q8 8 8 28q0 77 10 126l28 -1q-4 -54 -4 -84q0 -130 37 -218z" />
+<glyph unicode="&#x2199;" horiz-adv-x="926" d="M856 615l-620 -651q-16 -16 -16 -26q0 -7 6 -13q8 -10 29 -10q70 0 126 -10v-28q-56 4 -86 4q-125 0 -218 -37l-7 7q37 88 37 218q0 30 -4 84l28 1q10 -49 10 -126q0 -20 8 -28q4 -4 12 -4q15 0 22 7l625 659z" />
+<glyph unicode="&#x219a;" horiz-adv-x="926" d="M866 220h-304l-95 -162h-58l95 162h-257q-8 0 -17 -7.5t-9 -14.5q0 -11 14 -25q51 -49 82 -96l-20 -19q-124 143 -237 190v10q113 48 238 192l20 -19q-31 -44 -82 -97q-14 -14 -14 -28q0 -20 26 -20h295l96 164h58l-96 -164h265v-66z" />
+<glyph unicode="&#x219b;" horiz-adv-x="926" d="M866 258v-10q-113 -47 -237 -190l-20 19q31 47 82 96q14 14 14 25q0 7 -9 14.5t-17 7.5h-304l-95 -162h-58l95 162h-257v66h296l96 164h58l-96 -164h264q26 0 26 20q0 14 -14 28q-51 53 -82 97l20 19q125 -144 238 -192z" />
+<glyph unicode="&#x219c;" horiz-adv-x="926" d="M856 238l-38 -51q-69 68 -160 68q-37 0 -116.5 -34t-147.5 -34q-38 0 -75.5 10t-59.5 22t-42.5 24.5t-23.5 13.5q-6 2 -9 2q-12 0 -12 -23q0 -21 4 -63t4 -67l-27 -4q-10 93 -27.5 162.5t-55.5 128.5l6 9q75 -16 114 -16q87 0 197 25l6 -27q-73 -23 -119 -30 q-47 -6 -47 -20q0 -26 51 -53.5t114 -27.5q53 0 131.5 34t125.5 34q61 0 108 -18.5t99 -64.5z" />
+<glyph unicode="&#x219d;" horiz-adv-x="926" d="M850 402l6 -9q-38 -59 -55.5 -128.5t-27.5 -162.5l-27 4q0 25 4 67t4 63q0 23 -12 23q-3 0 -9 -2q-3 -1 -23.5 -13.5t-42.5 -24.5t-59.5 -22t-75.5 -10q-68 0 -147.5 34t-116.5 34q-91 0 -160 -68l-38 51q52 46 99 64.5t108 18.5q47 0 125.5 -34t131.5 -34q63 0 114 27.5 t51 53.5q0 14 -47 20q-46 7 -119 30l6 27q110 -25 197 -25q39 0 114 16z" />
+<glyph unicode="&#x219e;" horiz-adv-x="926" d="M856 220h-392q-8 0 -17 -7.5t-9 -14.5q0 -11 14 -25q51 -49 82 -96l-20 -19q-96 111 -181 162h-76q-8 0 -17 -7.5t-9 -14.5q0 -11 14 -25q51 -49 82 -96l-20 -19q-124 143 -237 190v10q115 49 238 191l20 -19q-28 -40 -82 -96q-14 -14 -14 -28q0 -20 26 -20h74 q87 53 183 163l20 -19q-28 -40 -82 -96q-14 -14 -14 -28q0 -20 26 -20h391v-66z" />
+<glyph unicode="&#x219f;" horiz-adv-x="511" d="M451 217l-19 -20q-40 28 -96 82q-14 14 -28 14q-20 0 -20 -26v-421h-66v422q0 8 -7.5 17t-14.5 9q-11 0 -25 -14q-49 -51 -96 -82l-19 20q111 96 162 181v76q0 8 -7.5 17t-14.5 9q-11 0 -25 -14q-49 -51 -96 -82l-19 20q143 124 190 237h10q49 -115 191 -238l-19 -20 q-40 28 -96 82q-14 14 -28 14q-20 0 -20 -26v-74q53 -87 163 -183z" />
+<glyph unicode="&#x21a0;" horiz-adv-x="926" d="M856 258v-10q-113 -47 -237 -190l-20 19q31 47 82 96q14 14 14 25q0 7 -9 14.5t-17 7.5h-76q-85 -51 -181 -162l-20 19q31 47 82 96q14 14 14 25q0 7 -9 14.5t-17 7.5h-392v66h391q26 0 26 20q0 14 -14 28q-54 56 -82 96l20 19q96 -110 183 -163h74q26 0 26 20 q0 14 -14 28q-54 56 -82 96l20 19q123 -142 238 -191z" />
+<glyph unicode="&#x21a1;" horiz-adv-x="511" d="M432 104l19 -20q-142 -123 -191 -238h-10q-47 113 -190 237l19 20q47 -31 96 -82q14 -14 25 -14q22 0 22 26v76q-51 85 -162 181l19 20q47 -31 96 -82q14 -14 25 -14q22 0 22 26v422h66v-421q0 -26 20 -26q14 0 28 14q56 54 96 82l19 -20q-110 -96 -163 -183v-74 q0 -26 20 -26q14 0 28 14q56 54 96 82z" />
+<glyph unicode="&#x21a2;" horiz-adv-x="926" d="M836 449l20 -19q-13 -18 -42 -50t-40 -46q-29 -38 -29 -81q0 -46 28 -80q69 -77 82 -96l-20 -19q-96 111 -181 162h-397q-8 0 -17 -7.5t-9 -14.5q0 -11 14 -25q51 -49 82 -96l-20 -19q-124 143 -237 190v10q115 49 238 191l20 -19q-28 -40 -82 -96q-14 -14 -14 -28 q0 -20 26 -20h395q87 53 183 163z" />
+<glyph unicode="&#x21a3;" horiz-adv-x="926" d="M856 258v-10q-113 -47 -237 -190l-20 19q31 47 82 96q14 14 14 25q0 7 -9 14.5t-17 7.5h-397q-85 -51 -181 -162l-20 19q13 19 82 96q28 34 28 80q0 43 -29 81q-11 14 -40 46t-42 50l20 19q96 -110 183 -163h395q26 0 26 20q0 14 -14 28q-54 56 -82 96l20 19 q123 -142 238 -191z" />
+<glyph unicode="&#x21a4;" horiz-adv-x="926" d="M857 57h-50v163h-550q-13 0 -19.5 -7t-6.5 -15q0 -11 14 -25q49 -47 82 -97l-20 -19q-125 144 -237 191v10q113 48 238 192l20 -19q-31 -44 -82 -97q-14 -14 -14 -28q0 -20 26 -20h549v164h50v-393z" />
+<glyph unicode="&#x21a5;" horiz-adv-x="511" d="M451 -154h-391v50h162v579q0 8 -7.5 17t-14.5 9q-11 0 -25 -14q-49 -51 -96 -82l-19 20q143 124 190 237h10q49 -115 191 -238l-19 -20q-40 28 -96 82q-14 14 -28 14q-20 0 -20 -26v-578h163v-50z" />
+<glyph unicode="&#x21a6;" horiz-adv-x="926" d="M857 258v-10q-115 -49 -238 -191l-20 19q28 40 82 96q14 14 14 28q0 20 -26 20h-549v-163h-50v393h50v-164h550q12 0 19 7t7 15q0 11 -14 25q-47 45 -82 98l20 19q126 -146 237 -192z" />
+<glyph unicode="&#x21a7;" horiz-adv-x="511" d="M451 612h-163v-579q0 -8 7.5 -17t14.5 -9q11 0 25 14q49 51 96 82l19 -20q-143 -124 -190 -237h-10q-49 115 -191 238l19 20q40 -28 96 -82q14 -14 28 -14q20 0 20 26v578h-162v50h391v-50z" />
+<glyph unicode="&#x21a8;" horiz-adv-x="511" d="M451 -154h-391v50h190q-49 115 -191 238l19 20q40 -28 96 -82q14 -14 28 -14q20 0 20 26v391q0 26 -22 26q-11 0 -25 -14q-49 -51 -96 -82l-19 20q143 124 190 237h10q49 -115 191 -238l-19 -20q-40 28 -96 82q-14 14 -28 14q-20 0 -20 -26v-391q0 -10 7 -18t15 -8 q11 0 25 14q49 51 96 82l19 -20q-143 -124 -190 -237h191v-50z" />
+<glyph unicode="&#x21a9;" horiz-adv-x="926" d="M599 553h98q62 0 110.5 -46t48.5 -121q0 -78 -55 -122t-121 -44h-426q-22 0 -22 -20q0 -14 14 -28q54 -56 82 -96l-20 -19q-123 142 -238 191v10q113 47 237 190l20 -19q-31 -47 -82 -96q-14 -14 -14 -25q0 -7 7 -14.5t17 -7.5h421q48 0 81 26t33 73q0 46 -26 74t-70 28 h-95v66z" />
+<glyph unicode="&#x21aa;" horiz-adv-x="926" d="M856 258v-10q-115 -49 -238 -191l-20 19q28 40 82 96q14 14 14 28q0 8 -6 14t-16 6h-426q-66 0 -121 44t-55 122q0 75 48.5 121t110.5 46h98v-66h-95q-44 0 -70 -28t-26 -74q0 -47 33 -73t81 -26h421q11 0 17.5 7t6.5 15q0 11 -14 25q-51 49 -82 96l20 19 q124 -143 237 -190z" />
+<glyph unicode="&#x21ab;" horiz-adv-x="926" d="M529 286v86q0 83 50 132t118 49q62 0 110.5 -46t48.5 -121q0 -78 -55 -122t-121 -44h-85v-220h-66v220h-275q-22 -3 -22 -20q0 -14 14 -28q54 -56 82 -96l-20 -19q-123 142 -238 191v10q113 47 237 190l20 -19q-31 -47 -82 -96q-14 -14 -14 -25q0 -7 8 -14t16 -8h274z M595 286h81q48 0 81 26t33 73q0 46 -26 74t-70 28q-42 0 -70.5 -30t-28.5 -83v-88z" />
+<glyph unicode="&#x21ac;" horiz-adv-x="926" d="M856 258v-10q-115 -49 -238 -191l-20 19q28 40 82 96q14 14 14 28q0 17 -22 20h-275v-220h-66v220h-85q-66 0 -121 44t-55 122q0 75 48.5 121t110.5 46q68 0 118 -49t50 -132v-86h274q8 1 16 8t8 14q0 11 -14 25q-51 49 -82 96l20 19q124 -143 237 -190zM331 286v88 q0 53 -28.5 83t-70.5 30q-44 0 -70 -28t-26 -74q0 -47 33 -73t81 -26h81z" />
+<glyph unicode="&#x21ad;" horiz-adv-x="1200" d="M1151 258v-10q-113 -47 -237 -190l-20 19q31 47 82 96q14 14 14 25q0 6 -9 14t-15 8h-63q-23 0 -45 -26l-46 -54q-24 -26 -50 -26q-29 0 -54 33.5t-39 73.5t-32.5 73.5t-36.5 33.5t-36 -33.5t-32 -73.5t-39 -73.5t-54 -33.5q-20 0 -40 16.5t-33 36.5t-31.5 36.5 t-37.5 16.5h-63q-6 0 -15 -8t-9 -14q0 -11 14 -25q51 -49 82 -96l-20 -19q-124 143 -237 190v10q115 49 238 191l20 -19q-28 -40 -82 -96q-14 -14 -14 -28q0 -20 26 -20h60q26 0 48.5 -16.5t35 -36.5t28 -36.5t30.5 -16.5q18 0 35 33.5t29.5 73.5t38 73.5t58.5 33.5 t58.5 -33.5t38.5 -73.5t30 -73.5t35 -33.5q15 0 30.5 16.5t28 36.5t34.5 36.5t48 16.5h60q26 0 26 20q0 14 -14 28q-54 56 -82 96l20 19q123 -142 238 -191z" />
+<glyph unicode="&#x21ae;" horiz-adv-x="926" d="M888 258v-10q-116 -50 -238 -190l-20 19q26 37 82 95q14 14 14 28q0 20 -26 20h-223l-69 -162h-54l69 162h-198q-8 0 -17 -7.5t-9 -14.5q0 -11 14 -25q51 -49 82 -96l-20 -19q-124 143 -237 190v10q113 48 238 192l20 -19q-31 -44 -82 -97q-14 -14 -14 -28q0 -20 26 -20 h225l69 164h54l-69 -164h196q8 0 17 7.5t9 14.5q0 11 -14 25q-47 45 -82 98l20 19q126 -146 237 -192z" />
+<glyph unicode="&#x21af;" horiz-adv-x="511" d="M451 320l-234 -337q-4 -4 -4 -15q0 -23 25 -23q6 0 10 1q72 12 113 12h14l3 -26q-195 -22 -291 -86l-8 7q10 47 10 100q0 85 -29 203l28 6q15 -40 31 -123q6 -30 24 -30q11 0 21 14l157 231h-261l330 408l60 -39l-242 -303h243z" />
+<glyph unicode="&#x21b0;" horiz-adv-x="463" d="M424 -156h-66v598h-131q-13 0 -19.5 -7t-6.5 -15q0 -11 14 -25q39 -38 72 -87l-20 -19q-112 129 -237 181v10q127 54 238 182l20 -19q-19 -27 -72 -82q-14 -14 -14 -33q0 -20 26 -20h196v-664z" />
+<glyph unicode="&#x21b1;" horiz-adv-x="463" d="M433 480v-10q-125 -52 -237 -181l-20 19q33 49 72 87q14 14 14 25q0 8 -7 15t-19 7h-131v-598h-66v664h196q26 0 26 20q0 19 -14 33q-53 55 -72 82l20 19q111 -128 238 -182z" />
+<glyph unicode="&#x21b2;" horiz-adv-x="463" d="M419 0h-196q-26 0 -26 -20q0 -19 14 -33q53 -55 72 -82l-20 -19q-111 128 -238 182v10q125 52 237 181l20 -19q-33 -49 -72 -87q-14 -14 -14 -25q0 -8 7 -15t19 -7h131v596h66v-662z" />
+<glyph unicode="&#x21b3;" horiz-adv-x="463" d="M433 38v-10q-127 -54 -238 -182l-20 19q19 27 72 82q14 14 14 33q0 20 -26 20h-196v662h66v-596h131q12 0 19 7t7 15q0 11 -14 25q-39 38 -72 87l20 19q112 -129 237 -181z" />
+<glyph unicode="&#x21b4;" horiz-adv-x="926" d="M837 104l19 -20q-142 -123 -191 -238h-10q-47 113 -190 237l19 20q47 -31 96 -82q14 -14 25 -14q22 0 22 27v562h-557v66h623v-628q0 -26 20 -26q14 0 28 14q56 54 96 82z" />
+<glyph unicode="&#x21b5;" horiz-adv-x="926" d="M856 0h-598q-26 0 -26 -20q0 -14 14 -28q6 -7 27 -27t33 -33.5t22 -28.5l-20 -19q-114 131 -238 184v10q123 51 237 183l20 -19q-18 -28 -82 -89q-14 -14 -14 -25q0 -22 27 -22h532v596h66v-662z" />
+<glyph unicode="&#x21b6;" horiz-adv-x="926" d="M882 192h-66q0 115 -81 195.5t-196 80.5t-196 -80.5t-81 -194.5q0 -31 18 -31q6 0 20 14q50 50 96 82l19 -20q-126 -110 -181 -238h-10q-53 127 -180 237l19 20q47 -31 96 -82q14 -14 22 -14q15 0 15 31q0 141 101.5 241.5t244.5 100.5q140 0 240 -100.5t100 -241.5z" />
+<glyph unicode="&#x21b7;" horiz-adv-x="926" d="M863 257l19 -20q-127 -110 -180 -237h-10q-55 128 -181 238l19 20q46 -32 96 -82q14 -14 20 -14q18 0 18 31q0 114 -81 194.5t-196 80.5t-196 -80.5t-81 -195.5h-66q0 141 100 241.5t240 100.5q143 0 244.5 -100.5t101.5 -241.5q0 -31 15 -31q8 0 22 14q49 51 96 82z" />
+<glyph unicode="&#x21b8;" horiz-adv-x="926" d="M856 666h-794v66h794v-66zM872 -110l-47 -46l-658 658q-9 9 -18 9q-5 0 -15 -5q-7 -7 -7 -29q0 -67 -10 -126l-29 2q4 58 4 88q0 121 -37 214l7 7q91 -37 217 -37q48 0 87 4v-29q-34 -6 -126 -10q-22 0 -29 -10q-6 -4 -6 -13q0 -10 10 -20z" />
+<glyph unicode="&#x21b9;" horiz-adv-x="926" d="M866 380h-567q-26 0 -26 -20q0 -14 14 -28q34 -35 69 -85l-20 -19q-61 67 -111 109.5t-115 70.5v-180h-50v370h50v-180q66 27 117.5 70.5t108.5 109.5l20 -19q-32 -50 -69 -86q-14 -14 -14 -25t9 -16.5t18 -5.5h566v-66zM866 -92h-50v180q-66 -27 -117.5 -70.5 t-108.5 -109.5l-20 19q32 50 69 86q14 14 14 25t-9 16.5t-18 5.5h-566v66h567q26 0 26 20q0 14 -14 28q-34 35 -69 85l20 19q61 -67 111 -109.5t115 -70.5v180h50v-370z" />
+<glyph unicode="&#x21ba;" horiz-adv-x="974" d="M817 686l11 -25q-21 -12 -114 -56q-12 -5 -19 -11q-8 -8 -8 -16t8 -14q46 -34 74 -67q89 -106 89 -243q0 -154 -108.5 -262t-262.5 -108t-262.5 108t-108.5 262q0 120 71.5 218.5t185.5 135.5l22 -61q-93 -31 -153.5 -114t-60.5 -181q0 -125 90 -213t215 -88 q126 0 216 89t90 215q0 68 -32.5 136t-86.5 106q-5 3 -11 3q-9 0 -14.5 -6.5t-5.5 -15.5q0 -4 5 -19q26 -75 35 -121l-26 -9q-55 180 -139 271l4 9h12q117 0 284 77z" />
+<glyph unicode="&#x21bb;" horiz-adv-x="974" d="M579 547l22 61q114 -37 185.5 -135.5t71.5 -218.5q0 -154 -108.5 -262t-262.5 -108t-262.5 108t-108.5 262q0 137 89 243q28 33 74 67q8 6 8 14t-8 16q-7 6 -19 11q-93 44 -114 56l11 25q167 -77 284 -77h12l4 -9q-84 -91 -139 -271l-26 9q9 46 35 121q5 15 5 19 q0 9 -5.5 15.5t-14.5 6.5q-6 0 -11 -3q-54 -38 -86.5 -106t-32.5 -136q0 -126 90 -215t216 -89q125 0 215 88t90 213q0 98 -60.5 181t-153.5 114z" />
+<glyph unicode="&#x21bc;" horiz-adv-x="955" d="M901 220h-847v4l68 54q33 26 65 56l52 48l57 58l56 54l23 -22l-34 -38l-35 -38q-13 -14 -26.5 -30.5t-20 -28t-6.5 -19.5q0 -10 2.5 -16t12.5 -11t28 -5h605v-66z" />
+<glyph unicode="&#x21bd;" horiz-adv-x="955" d="M901 220h-605q-18 0 -28 -5t-12.5 -11t-2.5 -16q0 -8 6.5 -19.5t20 -28t26.5 -30.5l35 -38l34 -38l-23 -22l-56 54l-57 58l-52 48q-32 30 -65 56l-68 54v4h847v-66z" />
+<glyph unicode="&#x21be;" horiz-adv-x="511" d="M441 424l-19 -20l-24 16l-26 18l-21.5 16.5t-24.5 21.5q-14 14 -24 14q-14 0 -14 -26v-620h-66v818h5q52 -108 214 -238z" />
+<glyph unicode="&#x21bf;" horiz-adv-x="511" d="M288 -156h-66v620q0 26 -14 26q-10 0 -24 -14q-11 -11 -24.5 -21.5l-21.5 -16.5l-26 -18l-24 -16l-19 20q162 130 214 238h5v-818z" />
+<glyph unicode="&#x21c0;" horiz-adv-x="955" d="M901 220h-847v66h605q18 0 28 5t12.5 11t2.5 16q0 8 -6.5 19.5t-20 28t-27.5 30.5l-34 38l-34 38l23 22l55 -54l58 -58l52 -48q32 -30 64 -56l69 -54v-4z" />
+<glyph unicode="&#x21c1;" horiz-adv-x="955" d="M901 286v-4l-69 -54q-32 -26 -64 -56l-52 -48l-58 -58l-55 -54l-23 22l34 38l34 38q14 14 27.5 30.5t20 28t6.5 19.5q0 10 -2.5 16t-12.5 11t-28 5h-605v66h847z" />
+<glyph unicode="&#x21c2;" horiz-adv-x="511" d="M422 102l19 -20q-162 -130 -214 -238h-5v818h66v-620q0 -26 14 -26q10 0 24 14q11 11 24.5 21.5l21.5 16.5l26 18z" />
+<glyph unicode="&#x21c3;" horiz-adv-x="511" d="M288 -156h-5q-50 105 -214 236l19 20l24 -16l26 -18l21.5 -16.5t24.5 -21.5q14 -14 24 -14q14 0 14 26v622h66v-818z" />
+<glyph unicode="&#x21c4;" horiz-adv-x="926" d="M856 418v-10q-119 -51 -236 -180l-20 19q24 31 76 85q14 14 14 28q0 20 -26 20h-584v66h583q9 0 18 5.5t9 16.5t-14 25q-52 51 -76 86l20 19q111 -128 236 -180zM847 60h-583q-9 0 -18 -5.5t-9 -16.5t14 -25q52 -51 76 -86l-20 -19q-111 128 -236 180v10q119 51 236 180 l20 -19q-24 -31 -76 -85q-14 -14 -14 -28q0 -20 26 -20h584v-66z" />
+<glyph unicode="&#x21c5;" horiz-adv-x="773" d="M723 102l19 -20q-142 -123 -191 -238h-10q-47 113 -190 237l19 20q42 -28 96 -82q14 -14 25 -14q8 0 15 7t7 19v621h66v-620q0 -26 20 -26q14 0 28 14q56 54 96 82zM422 424l-19 -20q-40 28 -96 82q-14 14 -28 14q-20 0 -20 -26v-620h-66v621q0 26 -22 26q-11 0 -25 -14 q-49 -51 -96 -82l-19 20q143 124 190 237h10q49 -115 191 -238z" />
+<glyph unicode="&#x21c6;" horiz-adv-x="926" d="M847 380h-584q-26 0 -26 -20q0 -14 14 -28q52 -54 76 -85l-20 -19q-117 129 -236 180v10q125 52 236 180l20 -19q-24 -35 -76 -86q-14 -14 -14 -25t9 -16.5t18 -5.5h583v-66zM856 98v-10q-125 -52 -236 -180l-20 19q24 35 76 86q14 14 14 25t-9 16.5t-18 5.5h-583v66h584 q26 0 26 20q0 14 -14 28q-52 54 -76 85l20 19q117 -129 236 -180z" />
+<glyph unicode="&#x21c7;" horiz-adv-x="926" d="M856 60h-594q-12 0 -18.5 -6.5t-6.5 -15.5q0 -11 14 -25q52 -51 76 -86l-20 -19q-110 127 -237 180v10q115 49 214 155q-98 106 -214 155v10q128 55 238 181l20 -19q-16 -23 -77 -86q-14 -14 -14 -28q0 -20 26 -20h593v-66h-594q-8 0 -16.5 -7.5t-8.5 -14.5q0 -12 13 -25 q46 -44 75 -80q-13 -15 -74 -79q-14 -14 -14 -28q0 -20 26 -20h593v-66z" />
+<glyph unicode="&#x21c8;" horiz-adv-x="773" d="M732 424l-19 -20q-23 16 -86 77q-14 14 -28 14q-20 0 -20 -26v-625h-66v626q0 8 -7.5 16.5t-14.5 8.5q-12 0 -25 -13q-44 -46 -80 -75q-15 13 -79 74q-14 14 -28 14q-20 0 -20 -26v-625h-66v626q0 12 -6.5 18.5t-15.5 6.5q-11 0 -25 -14q-51 -52 -86 -76l-19 20 q127 110 180 237h10q49 -115 155 -214q106 98 155 214h10q55 -128 181 -238z" />
+<glyph unicode="&#x21c9;" horiz-adv-x="926" d="M856 98v-10q-127 -53 -237 -180l-20 19q24 35 76 86q14 14 14 25q0 9 -6.5 15.5t-18.5 6.5h-594v66h593q26 0 26 20q0 14 -14 28q-61 64 -74 79q29 36 75 80q13 13 13 25q0 7 -8.5 14.5t-16.5 7.5h-594v66h593q26 0 26 20q0 14 -14 28q-61 63 -77 86l20 19 q110 -126 238 -181v-10q-116 -49 -214 -155q99 -106 214 -155z" />
+<glyph unicode="&#x21ca;" horiz-adv-x="773" d="M713 102l19 -20q-126 -110 -181 -238h-10q-49 116 -155 214q-106 -99 -155 -214h-10q-53 127 -180 237l19 20q35 -24 86 -76q14 -14 25 -14q9 0 15.5 6.5t6.5 18.5v626h66v-625q0 -26 20 -26q14 0 28 14q64 61 79 74q36 -29 80 -75q13 -13 25 -13q7 0 14.5 8.5t7.5 16.5 v626h66v-625q0 -26 20 -26q14 0 28 14q63 61 86 77z" />
+<glyph unicode="&#x21cb;" horiz-adv-x="926" d="M856 320h-786v5q108 52 238 214l20 -19l-16 -24l-18 -26l-16.5 -21.5t-21.5 -24.5q-14 -14 -14 -24q0 -14 26 -14h588v-66zM856 186v-5q-108 -52 -238 -214l-20 19l16 24l18 26l16.5 21.5t21.5 24.5q14 14 14 24q0 14 -26 14h-588v66h786z" />
+<glyph unicode="&#x21cc;" horiz-adv-x="926" d="M856 320h-786v66h588q26 0 26 14q0 10 -14 24q-11 11 -21.5 24.5l-16.5 21.5l-18 26l-16 24l20 19q130 -162 238 -214v-5zM856 120h-588q-26 0 -26 -14q0 -10 14 -24q11 -11 21.5 -24.5l16.5 -21.5l18 -26l16 -24l-20 -19q-130 162 -238 214v5h786v-66z" />
+<glyph unicode="&#x21cd;" horiz-adv-x="926" d="M866 120h-241l-74 -164h-55l74 164h-194q-12 0 -19 -7.5t-7 -14.5q0 -19 23 -42q32 -32 74 -81l-21 -20q-41 41 -93 85t-83 68l-102 75l-88 65v10l90 67l96 73q37 27 88 69.5t92 83.5l21 -20q-32 -37 -75 -82q-1 -2 -4.5 -5.5t-5 -4.5t-4 -4t-3 -4.5t-2 -4.5t-2 -5.5 t-1 -5.5t-0.5 -7q0 -7 7 -14.5t19 -7.5h315l76 165h55l-76 -165h120v-66h-150l-61 -134h211v-66zM661 320h-429q-59 -34 -59 -67q0 -27 58 -67h369z" />
+<glyph unicode="&#x21ce;" horiz-adv-x="926" d="M906 258v-10q-51 -34 -144 -108t-170 -150l-28 21l19 19l24 26q9 10 17.5 24t8.5 24q0 6 -1.5 9t-8 5t-20.5 2h-136l-23 -130h-51l23 130h-90q-21 0 -28 -3.5t-7 -14.5t7.5 -21.5t29.5 -32.5t33 -35l-23 -23q-83 78 -180.5 155.5t-137.5 102.5v10q165 118 318 259l23 -23 q-7 -8 -28 -29t-32.5 -36t-11.5 -24q0 -19 34 -19h139l24 131h51l-24 -131h90q14 0 21 6.5t7 14.5q0 15 -10.5 29.5t-30.5 32t-26 24.5l28 24q84 -77 179 -154.5t135 -104.5zM478 186h256q59 34 59 67q0 27 -58 67h-233zM451 320h-260q-58 -33 -59 -67q0 -27 58 -67h237z " />
+<glyph unicode="&#x21cf;" horiz-adv-x="926" d="M866 258v-10l-88 -65l-102 -75q-31 -24 -83 -68t-93 -85l-21 20q42 49 74 81q23 23 23 42q0 7 -7 14.5t-19 7.5h-317l-74 -165h-55l74 165h-118v66h148l61 134h-209v66h239l76 165h55l-76 -165h196q12 0 19 7.5t7 14.5q0 9 -3.5 17t-5.5 10t-13 14q-43 45 -75 82l21 20 q41 -41 92 -83.5t88 -69.5l96 -73zM263 186h432q58 40 58 67q0 33 -59 67h-370z" />
+<glyph unicode="&#x21d0;" horiz-adv-x="926" d="M866 120h-490q-12 0 -19 -7.5t-7 -14.5q0 -19 23 -42q32 -32 74 -81l-21 -20q-41 41 -93 85t-83 68l-102 75l-88 65v10l90 67l96 73q37 27 88 69.5t92 83.5l21 -20q-32 -37 -75 -82q-1 -2 -4.5 -5.5t-5 -4.5t-4 -4t-3 -4.5t-2 -4.5t-2 -5.5t-1 -5.5t-0.5 -7q0 -7 7 -14.5 t19 -7.5h490v-66h-634q-59 -34 -59 -67q0 -27 58 -67h635v-66z" />
+<glyph unicode="&#x21d1;" d="M641 296l-20 -21q-49 42 -82 75q-14 14 -21 18t-20 4q-7 0 -14.5 -7t-7.5 -19v-502h-66v646q-34 59 -67 59q-27 0 -67 -58v-647h-66v502q0 12 -7.5 19t-14.5 7q-19 0 -42 -23q-32 -32 -81 -74l-20 21q41 41 85 93t68 83l75 102l65 88h10l67 -90l73 -96q27 -37 69.5 -88 t83.5 -92z" />
+<glyph unicode="&#x21d2;" horiz-adv-x="926" d="M866 258v-10l-88 -65l-102 -75q-31 -24 -83 -68t-93 -85l-21 20q42 49 74 81q23 23 23 42q0 7 -7 14.5t-19 7.5h-490v66h635q58 40 58 67q0 33 -59 67h-634v66h490q12 0 19 7.5t7 14.5q0 9 -3.5 17t-5.5 10t-13 14q-43 45 -75 82l21 20q41 -41 92 -83.5t88 -69.5l96 -73z " />
+<glyph unicode="&#x21d3;" d="M621 231l20 -21q-41 -41 -83.5 -92t-69.5 -88l-73 -96l-67 -90h-10l-65 88l-75 102q-24 31 -68 83t-85 93l20 21q49 -42 81 -74q23 -23 42 -23q7 0 14.5 7t7.5 19v502h66v-647q40 -58 67 -58q33 0 67 59v646h66v-502q0 -12 7.5 -19t14.5 -7q13 0 20 4t21 18q33 33 82 75z " />
+<glyph unicode="&#x21d4;" horiz-adv-x="926" d="M906 258v-10q-51 -34 -144 -108t-170 -150l-28 21l19 19l24 26q9 10 17.5 24t8.5 24q0 6 -1.5 9t-8 5t-20.5 2h-277q-21 0 -28 -3.5t-7 -14.5t7.5 -21.5t29.5 -32.5t33 -35l-23 -23q-83 78 -180.5 155.5t-137.5 102.5v10q165 118 318 259l23 -23q-7 -8 -28 -29t-32.5 -36 t-11.5 -24q0 -19 34 -19h280q14 0 21 6.5t7 14.5q0 15 -10.5 29.5t-30.5 32t-26 24.5l28 24q84 -77 179 -154.5t135 -104.5zM190 186h544q59 34 59 67q0 27 -58 67h-544q-58 -33 -59 -67q0 -27 58 -67z" />
+<glyph unicode="&#x21d5;" d="M621 163l20 -21q-41 -41 -83.5 -92t-69.5 -88l-73 -96l-67 -90h-10l-65 88l-75 102q-24 31 -68 83t-85 93l20 21q49 -42 81 -74q23 -23 42 -23q7 0 14.5 7t7.5 19v322q0 12 -7.5 19t-14.5 7q-19 0 -42 -23q-32 -32 -81 -74l-20 21q41 41 85 93t68 83l75 102l65 88h10 l67 -90l73 -96q27 -37 69.5 -88t83.5 -92l-20 -21q-49 42 -82 75q-14 14 -21 18t-20 4q-7 0 -14.5 -7t-7.5 -19v-322q0 -12 7.5 -19t14.5 -7q13 0 20 4t21 18q33 33 82 75zM410 -52v610q-34 59 -67 59q-27 0 -67 -58v-612q40 -58 67 -58q33 0 67 59z" />
+<glyph unicode="&#x21d6;" horiz-adv-x="926" d="M874 32l-46 -47l-600 599q-24 7 -48 7q-28 0 -41 -13q-13 -12 -13 -39q0 -17 6 -49l601 -600l-47 -46l-498 497q-8 8 -19 8q-28 0 -28 -51q0 -47 -5 -109h-29q0 58 -6 126t-11 106.5t-18.5 124.5t-16.5 109l7 7l110 -16q77 -12 121 -18t110.5 -12t124.5 -6v-29 q-62 -5 -110 -5q-21 0 -29 -2t-16 -11q-5 -5 -5 -15q0 -11 8 -19z" />
+<glyph unicode="&#x21d7;" horiz-adv-x="926" d="M867 662l7 -7q-3 -23 -16.5 -109t-18.5 -124.5t-11 -106.5t-6 -126h-29q-5 62 -5 109q0 51 -28 51q-11 0 -19 -8l-498 -497l-47 46l601 600q6 32 6 49q0 27 -13 39q-13 13 -41 13q-24 0 -48 -7l-600 -599l-46 47l498 497q8 8 8 19q0 10 -5 15q-8 9 -16 11t-29 2 q-48 0 -110 5v29q58 0 124.5 6t110.5 12t121 18z" />
+<glyph unicode="&#x21d8;" horiz-adv-x="926" d="M874 -149l-7 -7l-110 16q-77 12 -121 18t-110.5 12t-124.5 6v29q62 5 110 5q21 0 29 2t16 11q5 5 5 15q0 11 -8 19l-498 497l46 47l600 -599q24 -7 48 -7q28 0 41 13q13 12 13 39q0 17 -6 49l-601 600l47 46l498 -497q8 -8 19 -8q28 0 28 51q0 47 5 109h29q0 -58 6 -126 t11 -106.5t18.5 -124.5t16.5 -109z" />
+<glyph unicode="&#x21d9;" horiz-adv-x="926" d="M874 474l-498 -497q-8 -8 -8 -19q0 -10 5 -15q8 -9 16 -11t29 -2q48 0 110 -5v-29q-58 0 -124.5 -6t-110.5 -12t-121 -18l-110 -16l-7 7q3 23 16.5 109t18.5 124.5t11 106.5t6 126h29q5 -62 5 -109q0 -51 28 -51q11 0 19 8l498 497l47 -46l-601 -600q-6 -32 -6 -49 q0 -27 13 -39q13 -13 41 -13q24 0 48 7l600 599z" />
+<glyph unicode="&#x21da;" horiz-adv-x="926" d="M852 20h-519v-1q52 -64 99 -142l-23 -16q-159 240 -363 387v10q199 137 364 386l23 -15q-41 -67 -99 -140v-3h518v-66h-565q-30 -35 -81 -86q-14 -14 -14 -28q0 -20 26 -20h634v-66h-636q-25 -7 -25 -22q0 -12 14 -25q43 -37 81 -87h566v-66z" />
+<glyph unicode="&#x21db;" horiz-adv-x="926" d="M880 258v-10q-199 -137 -364 -386l-23 15q41 67 99 140v3h-518v66h565q30 35 81 86q14 14 14 28q0 20 -26 20h-634v66h636q25 7 25 22q0 12 -14 25q-43 37 -81 87h-566v66h519v1q-52 64 -99 142l23 16q159 -240 363 -387z" />
+<glyph unicode="&#x21dc;" horiz-adv-x="926" d="M866 220h-114l-89 -106l-119 172l-124 -172l-92 106h-83q-6 0 -15 -8t-9 -14q0 -11 14 -25q51 -49 82 -96l-20 -19q-124 143 -237 190v10q115 49 238 191l20 -19q-28 -40 -82 -96q-14 -14 -14 -28q0 -20 26 -20h112l60 -66l124 174l119 -174l60 66h143v-66z" />
+<glyph unicode="&#x21dd;" horiz-adv-x="926" d="M866 258v-10q-113 -47 -237 -190l-20 19q31 47 82 96q14 14 14 25q0 6 -9 14t-15 8h-83l-92 -106l-124 172l-119 -172l-89 106h-114v66h143l60 -66l119 174l124 -174l60 66h112q26 0 26 20q0 14 -14 28q-54 56 -82 96l20 19q123 -142 238 -191z" />
+<glyph unicode="&#x21de;" horiz-adv-x="511" d="M451 76h-163v-232h-66v232h-162v50h162v79h-162v50h162v220q0 8 -7.5 17t-14.5 9q-11 0 -25 -14q-49 -51 -96 -82l-19 20q143 124 190 237h10q49 -115 191 -238l-19 -20q-40 28 -96 82q-14 14 -28 14q-20 0 -20 -26v-219h163v-50h-163v-79h163v-50z" />
+<glyph unicode="&#x21df;" horiz-adv-x="511" d="M432 102l19 -20q-142 -123 -191 -238h-10q-47 113 -190 237l19 20q47 -31 96 -82q14 -14 25 -14q7 0 14.5 9t7.5 17v220h-162v50h162v79h-162v50h162v232h66v-232h163v-50h-163v-79h163v-50h-163v-219q0 -26 20 -26q14 0 28 14q56 54 96 82z" />
+<glyph unicode="&#x21e0;" horiz-adv-x="926" d="M866 220h-107v66h107v-66zM698 220h-107v66h107v-66zM530 220h-107v66h107v-66zM362 220h-115q-8 0 -17 -7.5t-9 -14.5q0 -11 14 -25q51 -49 82 -96l-20 -19q-124 143 -237 190v10q115 49 238 191l20 -19q-28 -40 -82 -96q-14 -14 -14 -28q0 -20 26 -20h114v-66z" />
+<glyph unicode="&#x21e1;" horiz-adv-x="511" d="M451 424l-19 -20q-40 28 -96 82q-14 14 -28 14q-20 0 -20 -26v-111h-66v112q0 8 -7.5 17t-14.5 9q-11 0 -25 -14q-49 -51 -96 -82l-19 20q143 124 190 237h10q49 -115 191 -238zM288 190h-66v107h66v-107zM288 17h-66v107h66v-107zM288 -156h-66v107h66v-107z" />
+<glyph unicode="&#x21e2;" horiz-adv-x="926" d="M866 258v-10q-113 -47 -237 -190l-20 19q31 47 82 96q14 14 14 25q0 8 -6.5 15t-19.5 7h-115v66h114q26 0 26 20q0 14 -14 28q-54 56 -82 96l20 19q123 -142 238 -191zM503 220h-107v66h107v-66zM335 220h-107v66h107v-66zM167 220h-107v66h107v-66z" />
+<glyph unicode="&#x21e3;" horiz-adv-x="511" d="M288 555h-66v107h66v-107zM288 382h-66v107h66v-107zM288 209h-66v107h66v-107zM432 102l19 -20q-142 -123 -191 -238h-10q-47 113 -190 237l19 20q47 -31 96 -82q14 -14 25 -14q8 0 15 7t7 19v112h66v-111q0 -26 20 -26q14 0 28 14q56 54 96 82z" />
+<glyph unicode="&#x21e4;" horiz-adv-x="926" d="M866 220h-569q-8 0 -17 -7.5t-9 -14.5q0 -11 14 -25q51 -49 82 -96l-20 -19q-124 143 -237 190v-190h-50v392h50v-192q113 48 238 192l20 -19q-31 -44 -82 -97q-14 -14 -14 -28q0 -20 26 -20h568v-66z" />
+<glyph unicode="&#x21e5;" horiz-adv-x="926" d="M866 58h-50v190q-113 -47 -237 -190l-20 19q31 47 82 96q14 14 14 25q0 7 -9 14.5t-17 7.5h-569v66h568q26 0 26 20q0 14 -14 28q-51 53 -82 97l20 19q125 -144 238 -192v192h50v-392z" />
+<glyph unicode="&#x21e6;" horiz-adv-x="926" d="M866 120h-420v-155l-20 -10q-41 41 -93 85t-83 68l-102 75l-88 65v10l90 67l96 73q37 27 88 69.5t92 83.5l20 -10v-155h420v-266zM816 170v166h-420v116l-165 -126q-58 -44 -58 -73q0 -18 14.5 -33.5t43.5 -38.5l165 -128v117h420z" />
+<glyph unicode="&#x21e7;" d="M641 296l-10 -20h-155v-432h-266v432h-155l-10 20q41 41 85 93t68 83l75 102l65 88h10l67 -90l73 -96q27 -37 69.5 -88t83.5 -92zM542 326l-126 165q-44 58 -73 58q-18 0 -33.5 -14.5t-38.5 -43.5l-128 -165h117v-432h166v432h116z" />
+<glyph unicode="&#x21e8;" horiz-adv-x="926" d="M866 258v-10l-88 -65l-102 -75q-31 -24 -83 -68t-93 -85l-20 10v155h-420v266h420v155l20 10q41 -41 92 -83.5t88 -69.5l96 -73zM530 53l165 128q19 15 29.5 24t19.5 22.5t9 25.5q0 29 -58 73l-165 126v-116h-420v-166h420v-117z" />
+<glyph unicode="&#x21e9;" d="M631 230l10 -20q-41 -41 -83.5 -92t-69.5 -88l-73 -96l-67 -90h-10l-65 88l-75 102q-24 31 -68 83t-85 93l10 20h155v432h266v-432h155zM542 180h-116v432h-166v-432h-117l128 -165q15 -19 24 -29.5t22.5 -19.5t25.5 -9q29 0 73 58z" />
+<glyph unicode="&#x21ea;" d="M641 324l-10 -20h-155v-262h-266v262h-155l-10 20q41 41 85 93t68 83l75 102l65 88h10l67 -90l73 -96q27 -37 69.5 -88t83.5 -92zM542 354l-126 165q-44 58 -73 58q-18 0 -33.5 -14.5t-38.5 -43.5l-128 -165h117v-262h166v262h116zM476 -184h-266v161h266v-161zM426 -134 v61h-166v-61h166z" />
+<glyph unicode="&#x21f4;" horiz-adv-x="926" d="M856 258v-10q-115 -49 -238 -191l-20 19q28 40 82 96q14 14 14 28q0 20 -26 20h-127q-11 -52 -53 -86t-97 -34t-97 34t-54 86h-170v66h170q11 53 53.5 87.5t97.5 34.5q56 0 98 -34.5t53 -87.5h127q8 0 17 7.5t9 14.5q0 11 -14 25q-51 49 -82 96l20 19q124 -143 237 -190z M292 286h198q-11 31 -38 51.5t-61 20.5t-61.5 -20.5t-37.5 -51.5zM489 220h-197q11 -31 38 -50.5t61 -19.5q33 0 60 19.5t38 50.5z" />
+<glyph unicode="&#x21f5;" horiz-adv-x="773" d="M742 424l-19 -20q-40 28 -96 82q-14 14 -28 14q-20 0 -20 -26v-620h-66v621q0 12 -7 19t-15 7q-11 0 -25 -14q-49 -51 -96 -82l-19 20q143 124 190 237h10q49 -115 191 -238zM403 102l19 -20q-142 -123 -191 -238h-10q-47 113 -190 237l19 20q42 -28 96 -82 q14 -14 25 -14q22 0 22 26v621h66v-620q0 -26 20 -26q14 0 28 14q56 54 96 82z" />
+<glyph unicode="&#x21f6;" horiz-adv-x="926" d="M866 -42v-10q-127 -53 -237 -180l-20 19q24 35 76 86q14 14 14 25q0 9 -6.5 15.5t-18.5 6.5h-614v66h613q26 0 26 20q0 10 -14 24q-1 1 -77 73l78 72q13 13 13 23q0 8 -8 15t-17 7h-614v66h613q11 0 18.5 6t7.5 14q0 10 -14 24q-1 1 -77 73l78 72q13 13 13 23 q0 7 -8.5 14.5t-16.5 7.5h-614v66h613q26 0 26 20q0 14 -14 28q-61 63 -77 86l20 19q110 -126 238 -181v-10q-109 -46 -213 -145q106 -99 213 -145v-10q-109 -46 -213 -145q106 -99 213 -145z" />
+<glyph unicode="&#x21f7;" horiz-adv-x="926" d="M866 220h-307v-162h-50v162h-262q-8 0 -17 -7.5t-9 -14.5q0 -11 14 -25q51 -49 82 -96l-20 -19q-124 143 -237 190v10q113 48 238 192l20 -19q-31 -44 -82 -97q-14 -14 -14 -28q0 -20 26 -20h261v164h50v-164h307v-66z" />
+<glyph unicode="&#x21f8;" horiz-adv-x="926" d="M861 258v-10q-113 -47 -237 -190l-20 19q31 47 82 96q14 14 14 25q0 7 -9 14.5t-17 7.5h-257v-162h-50v162h-312v66h312v164h50v-164h256q26 0 26 20q0 14 -14 28q-51 53 -82 97l20 19q125 -144 238 -192z" />
+<glyph unicode="&#x21f9;" horiz-adv-x="926" d="M878 258v-10q-116 -50 -238 -190l-20 19q26 37 82 95q14 14 14 28q0 20 -26 20h-203v-162h-50v162h-202q-8 0 -17 -7.5t-9 -14.5q0 -11 14 -25q51 -49 82 -96l-20 -19q-124 143 -237 190v10q113 48 238 192l20 -19q-31 -44 -82 -97q-14 -14 -14 -28q0 -20 26 -20h201v164 h50v-164h204q8 0 17 7.5t9 14.5q0 11 -14 25q-47 45 -82 98l20 19q126 -146 237 -192z" />
+<glyph unicode="&#x21fa;" horiz-adv-x="926" d="M866 220h-225v-162h-50v162h-79v-162h-50v162h-215q-8 0 -17 -7.5t-9 -14.5q0 -11 14 -25q51 -49 82 -96l-20 -19q-124 143 -237 190v10q113 48 238 192l20 -19q-31 -44 -82 -97q-14 -14 -14 -28q0 -20 26 -20h214v164h50v-164h79v164h50v-164h225v-66z" />
+<glyph unicode="&#x21fb;" horiz-adv-x="926" d="M866 258v-10q-113 -47 -237 -190l-20 19q31 47 82 96q14 14 14 25q0 7 -9 14.5t-17 7.5h-215v-162h-50v162h-79v-162h-50v162h-225v66h225v164h50v-164h79v164h50v-164h214q26 0 26 20q0 14 -14 28q-51 53 -82 97l20 19q125 -144 238 -192z" />
+<glyph unicode="&#x21fc;" horiz-adv-x="926" d="M888 258v-10q-116 -50 -238 -190l-20 19q26 37 82 95q14 14 14 28q0 20 -26 20h-147v-162h-50v162h-79v-162h-50v162h-149q-8 0 -17 -7.5t-9 -14.5q0 -11 14 -25q51 -49 82 -96l-20 -19q-124 143 -237 190v10q113 48 238 192l20 -19q-31 -44 -82 -97q-14 -14 -14 -28 q0 -20 26 -20h148v164h50v-164h79v164h50v-164h148q8 0 17 7.5t9 14.5q0 11 -14 25q-47 45 -82 98l20 19q126 -146 237 -192z" />
+<glyph unicode="&#x21fd;" horiz-adv-x="926" d="M866 220h-538v-158l-10 -5q-51 58 -119.5 110t-138.5 81v10q146 63 258 191l10 -5v-158h538v-66zM278 166v173q-30 -39 -121 -85q28 -14 67 -41t54 -47z" />
+<glyph unicode="&#x21fe;" horiz-adv-x="926" d="M866 258v-10q-146 -63 -258 -191l-10 5v158h-538v66h538v158l10 5q51 -58 119.5 -110t138.5 -81zM648 340v-173q30 39 121 85q-28 14 -67 41t-54 47z" />
+<glyph unicode="&#x21ff;" horiz-adv-x="926" d="M906 258v-10q-146 -63 -258 -191l-10 5v158h-350v-158l-10 -5q-51 58 -119.5 110t-138.5 81v10q146 63 258 191l10 -5v-158h350v158l10 5q51 -58 119.5 -110t138.5 -81zM688 340v-173q30 39 121 85q-28 14 -67 41t-54 47zM238 166v173q-30 -39 -121 -85q28 -14 67 -41 t54 -47z" />
+<glyph unicode="&#x2200;" horiz-adv-x="560" d="M558 662l-245 -662h-66l-245 662h71l74 -199h266l74 199h71zM391 403h-222l111 -300z" />
+<glyph unicode="&#x2201;" horiz-adv-x="463" d="M404 220v-98q0 -44 -18.5 -73.5t-49 -42t-55.5 -17t-52 -4.5t-52 5t-54 18.5t-46.5 44.5t-17.5 77v483q0 46 18.5 77.5t49 45.5t55.5 19t51 5q20 0 39 -2.5t44 -12t43.5 -24.5t31.5 -43.5t13 -66.5v-87h-66v91q0 26 -12.5 43.5t-32.5 24.5t-33.5 9t-28.5 2 q-13 0 -27.5 -2.5t-34 -9.5t-32 -24t-12.5 -42v-487q0 -24 13 -41t33 -24t35 -10t28 -3t28 3t33.5 10.5t30.5 24.5t12 41v90h66z" />
+<glyph unicode="&#x2202;" horiz-adv-x="471" d="M195 625l-10 20q38 23 98 23q188 0 188 -260q0 -49 -8 -101t-29 -110t-53 -103.5t-85 -75t-120 -29.5q-69 0 -102.5 46t-33.5 116q0 109 75.5 196.5t181.5 87.5q69 0 96 -48q7 39 7 70q0 77 -30.5 129t-100.5 52q-33 0 -74 -13zM367 319q0 44 -18.5 65t-42.5 21 q-73 0 -129 -90.5t-56 -197.5q0 -98 67 -98q54 0 97.5 59t66.5 143q15 55 15 98z" />
+<glyph unicode="&#x2203;" horiz-adv-x="560" d="M487 0h-414v66h348v232h-336v66h336v232h-348v66h414v-662z" />
+<glyph unicode="&#x2204;" horiz-adv-x="560" d="M487 0h-316l-42 -122h-58l42 122h-40v66h63l79 232h-130v66h153l80 232h-245v66h267l39 113h58l-39 -113h89v-662zM421 364v232h-45l-80 -232h125zM421 66v232h-148l-79 -232h227z" />
+<glyph unicode="&#x2205;" horiz-adv-x="762" d="M705 583l-88 -101q95 -98 95 -230q0 -136 -97.5 -233.5t-233.5 -97.5q-107 0 -197 66l-58 -66h-69l87 100q-94 96 -94 231q0 136 97.5 233.5t233.5 97.5q103 0 197 -66l58 66h69zM575 434l-348 -398q69 -49 154 -49q110 0 187.5 78t77.5 188q0 102 -71 181zM188 71 l346 395q-23 22 -67.5 36.5t-85.5 14.5q-110 0 -187.5 -77t-77.5 -187q0 -108 72 -182z" />
+<glyph unicode="&#x2206;" horiz-adv-x="731" d="M665 0h-602l287 674h20zM543 41l-208 494l-209 -494h417z" />
+<glyph unicode="&#x2207;" horiz-adv-x="731" d="M667 662l-288 -674h-20l-296 674h604zM604 621h-418l208 -494z" />
+<glyph unicode="&#x2208;" d="M625 -27h-291q-118 0 -196 82.5t-78 196.5t77 196.5t194 82.5h294v-66h-290q-75 0 -134 -53.5t-72 -126.5h496v-66h-497q13 -73 72 -126.5t134 -53.5h291v-66z" />
+<glyph unicode="&#x2209;" d="M625 -27h-291q-47 0 -92 16l-73 -146h-62l85 170q-61 37 -96.5 101t-35.5 138q0 114 77 196.5t194 82.5h119l65 131h62l-65 -131h113v-66h-146l-90 -180h236v-66h-268l-85 -170q33 -10 62 -10h291v-66zM417 465h-82q-75 0 -134 -53.5t-72 -126.5h198zM295 219h-167 q16 -91 95 -144z" />
+<glyph unicode="&#x220a;" horiz-adv-x="486" d="M422 45h-149q-92 0 -150.5 59.5t-58.5 147.5t59 147.5t152 59.5h147v-66h-147q-125 0 -144 -108h291v-66h-291q21 -108 145 -108h146v-66z" />
+<glyph unicode="&#x220b;" d="M60 531h294q117 0 194 -82.5t77 -196.5t-78 -196.5t-196 -82.5h-291v66h291q75 0 134 53.5t72 126.5h-497v66h496q-13 73 -72 126.5t-134 53.5h-290v66z" />
+<glyph unicode="&#x220c;" d="M577 662l-84 -169q61 -38 96.5 -102.5t35.5 -138.5q0 -114 -78 -196.5t-196 -82.5h-117l-65 -130h-62l65 130h-112v66h145l90 180h-235v66h267l85 170q-33 10 -62 10h-290v66h294q47 0 89 -15l72 146h62zM389 285h167q-16 91 -95 144zM557 219h-200l-90 -180h84 q75 0 134 53.5t72 126.5z" />
+<glyph unicode="&#x220d;" horiz-adv-x="486" d="M64 459h147q93 0 152 -59.5t59 -147.5t-58.5 -147.5t-150.5 -59.5h-149v66h146q124 0 145 108h-291v66h291q-19 108 -144 108h-147v66z" />
+<glyph unicode="&#x220e;" horiz-adv-x="545" d="M485 0h-425v640h425v-640z" />
+<glyph unicode="&#x220f;" horiz-adv-x="1000" d="M948 -259h-368v28h32q49 0 68.5 35t19.5 99v794h-399v-794q0 -71 19.5 -102.5t68.5 -31.5h31v-28h-368v28h19q99 0 99 109v733q0 70 -25.5 97t-75.5 27h-17v28h896v-28q-66 0 -91.5 -27.5t-25.5 -92.5v-719q0 -127 99 -127h18v-28z" />
+<glyph unicode="&#x2210;" horiz-adv-x="1000" d="M948 -259h-896v28h17q50 0 75.5 27t25.5 97v733q0 109 -99 109h-19v28h368v-28h-31q-49 0 -68.5 -31.5t-19.5 -102.5v-794h399v794q0 64 -19.5 99t-68.5 35h-32v28h368v-28h-18q-99 0 -99 -127v-719q0 -65 25.5 -92.5t91.5 -27.5v-28z" />
+<glyph unicode="&#x2211;" horiz-adv-x="914" d="M856 40l-53 -299h-745l392 510l-367 512h747v-251h-30q-16 105 -55.5 145t-136.5 40h-320l290 -391l-336 -434h414q78 0 115 42t55 126h30z" />
+<glyph unicode="&#x2212;" d="M621 220h-557v66h557v-66z" />
+<glyph unicode="&#x2213;" d="M637 436h-589v66h589v-66zM637 107h-262v-194h-66v194h-261v66h261v209h66v-209h262v-66z" />
+<glyph unicode="&#x2214;" d="M636 220h-261v-261h-66v261h-261v66h261v261h66v-261h261v-66zM405 678q0 -26 -17.5 -45t-45.5 -19q-29 0 -46.5 17.5t-17.5 46.5q0 27 19.5 45t44.5 18t44 -18t19 -45z" />
+<glyph unicode="&#x2215;" horiz-adv-x="523" d="M478 710l-360 -932h-72l360 932h72z" />
+<glyph unicode="&#x2216;" horiz-adv-x="428" d="M403 93h-62l-316 318h62z" />
+<glyph unicode="&#x2217;" horiz-adv-x="523" d="M457 337q0 -18 -22 -31q-7 -4 -60 -18t-95 -38q36 -21 90.5 -36t63.5 -20q21 -12 21 -32q0 -16 -10.5 -27.5t-28.5 -11.5q-17 0 -36 19l-47 48q-28 29 -60 47q0 -39 14.5 -95t14.5 -67q0 -16 -12 -29t-26 -13t-26 13t-12 29q0 11 14.5 67t14.5 95q-30 -17 -71.5 -59 t-49.5 -46q-14 -8 -27 -8q-17 0 -27 9.5t-10 22.5q0 26 21 39q10 5 67 21.5t86 33.5q-29 17 -87 33.5t-70 23.5q-20 12 -20 30q0 16 10.5 29t25.5 13q10 0 22 -6q10 -6 54 -48.5t76 -59.5q0 39 -14.5 97t-14.5 69q0 16 12 28t26 12t26 -12.5t12 -27.5q0 -11 -14.5 -68.5 t-14.5 -96.5q42 22 80.5 62.5t45.5 44.5q12 6 22 6q15 0 25.5 -13t10.5 -29z" />
+<glyph unicode="&#x2218;" horiz-adv-x="350" d="M310 252q0 -56 -39.5 -95.5t-95.5 -39.5q-57 0 -96 39.5t-39 97.5q0 56 39.5 94.5t97.5 38.5q55 0 94 -39.5t39 -95.5zM244 252q0 29 -20 49t-47 20q-31 0 -51 -19.5t-20 -47.5q0 -31 19.5 -51t49.5 -20q29 0 49 20t20 49z" />
+<glyph unicode="&#x2219;" horiz-adv-x="350" d="M310 252q0 -56 -39.5 -95.5t-95.5 -39.5q-57 0 -96 39.5t-39 97.5q0 56 39.5 94.5t97.5 38.5q55 0 94 -39.5t39 -95.5z" />
+<glyph unicode="&#x221a;" horiz-adv-x="928" d="M963 973l-478 -1232h-32l-202 530q-22 59 -62 59q-31 0 -65 -31l-12 20l156 124h19l204 -536h4l414 1066h54z" />
+<glyph unicode="&#x221b;" horiz-adv-x="928" d="M963 973l-478 -1232h-32l-202 530q-22 59 -62 59q-31 0 -65 -31l-12 20l156 124h19l204 -536h4l414 1066h54zM298 762l-12 2q25 82 100 82q36 0 58 -19t22 -50q0 -19 -12.5 -39.5t-32.5 -33.5q37 -14 54.5 -34t17.5 -56q0 -56 -45 -87.5t-107 -31.5q-26 0 -41.5 10.5 t-15.5 24.5q0 8 6 13.5t15 5.5q11 0 31 -14q22 -16 44 -16q29 0 47.5 20t18.5 52q0 57 -53 74q-14 5 -52 5v11q40 14 62.5 32t22.5 51q0 52 -55 52q-23 0 -39.5 -12.5t-33.5 -41.5z" />
+<glyph unicode="&#x221c;" horiz-adv-x="928" d="M963 973l-478 -1232h-32l-202 530q-22 59 -62 59q-31 0 -65 -31l-12 20l156 124h19l204 -536h4l414 1066h54zM503 583h-52v-84h-48v84h-142v41l160 219h30v-219h52v-41zM403 624v165l-120 -165h120z" />
+<glyph unicode="&#x221d;" d="M643 84v-84q-69 0 -118 35t-99 110q-72 -145 -209 -145q-71 0 -123.5 51.5t-52.5 148.5q0 52 14.5 94t36 66.5t48.5 41t49.5 22.5t42.5 6q60 0 105.5 -28.5t112.5 -118.5q41 74 82.5 110.5t110.5 36.5v-84q-61 0 -105 -29.5t-68 -71.5v-3q50 -83 89.5 -120.5t83.5 -37.5z M404 181v3q-57 94 -105.5 140.5t-97.5 46.5q-42 0 -71 -35.5t-29 -83.5q0 -68 38 -118t101 -50q31 0 58 9t48 26.5t32.5 30t25.5 31.5z" />
+<glyph unicode="&#x221e;" horiz-adv-x="926" d="M854 222q0 -81 -55 -151.5t-143 -70.5q-58 0 -104.5 35.5t-96.5 109.5q-72 -145 -209 -145q-71 0 -123.5 51.5t-52.5 148.5q0 52 14.5 94t36 66.5t48.5 41t49.5 22.5t42.5 6q60 0 105.5 -28.5t112.5 -118.5q41 74 82.5 110.5t110.5 36.5q73 0 127.5 -56.5t54.5 -151.5z M499 245v-3q58 -95 102 -139t93 -44q42 0 71 35.5t29 83.5q0 71 -37.5 119.5t-101.5 48.5q-31 0 -56.5 -8.5t-45.5 -27.5t-29 -30t-25 -35zM433 181v3q-57 94 -105.5 140.5t-97.5 46.5q-42 0 -71 -35.5t-29 -83.5q0 -68 38 -118t101 -50q31 0 58 9t48 26.5t32.5 30 t25.5 31.5z" />
+<glyph unicode="&#x221f;" d="M634 0h-584v584h66v-518h518v-66z" />
+<glyph unicode="&#x2220;" d="M643 0h-620l546 547l50 -42l-437 -439h461v-66z" />
+<glyph unicode="&#x2221;" d="M642 0h-97q0 -43 -5 -72l-65 10q4 27 4 62h-457l323 323q-23 23 -48 42l40 53q28 -21 55 -48l176 177l51 -42l-184 -185q88 -113 106 -254h101v-66zM181 66h293q-16 114 -86 207z" />
+<glyph unicode="&#x2222;" d="M653 80l-25 -62l-88 37q-11 -31 -32 -66l-57 34q13 21 28 57l-423 173l421 177q-11 26 -27 55l57 34q19 -34 31 -64l90 37l25 -60l-93 -40q19 -67 19 -139q0 -69 -18 -135zM228 253l270 -110q15 54 15 110q0 57 -15 114z" />
+<glyph unicode="&#x2223;" horiz-adv-x="266" d="M166 -189h-66v879h66v-879z" />
+<glyph unicode="&#x2224;" horiz-adv-x="404" d="M381 304l-146 -75v-418h-66v384l-122 -62l-24 53l146 74v430h66v-396l122 62z" />
+<glyph unicode="&#x2225;" horiz-adv-x="523" d="M195 -189h-66v879h66v-879zM394 -189h-66v879h66v-879z" />
+<glyph unicode="&#x2226;" horiz-adv-x="609" d="M586 362l-149 -76v-475h-66v441l-133 -67v-374h-66v340l-125 -64l-24 53l149 76v474h66v-440l133 67v373h66v-339l125 63z" />
+<glyph unicode="&#x2227;" horiz-adv-x="620" d="M589 -29h-65l-215 432l-215 -432h-63l273 565h10z" />
+<glyph unicode="&#x2228;" horiz-adv-x="620" d="M589 536l-273 -565h-10l-275 565h65l215 -432l215 432h63z" />
+<glyph unicode="&#x2229;" horiz-adv-x="620" d="M572 -31h-66v296q0 85 -58 145t-138 60q-82 0 -139 -60t-57 -146v-295h-66v299q0 118 74.5 193t187.5 75q112 0 187 -76t75 -195v-296z" />
+<glyph unicode="&#x222a;" horiz-adv-x="620" d="M572 536v-296q0 -119 -75 -195t-187 -76q-113 0 -187.5 75t-74.5 193v299h66v-295q0 -86 57 -146t139 -60q80 0 138 60t58 145v296h66z" />
+<glyph unicode="&#x222b;" horiz-adv-x="459" d="M204 -124l182 730q54 218 188 218q29 0 47 -13t18 -32q0 -25 -15.5 -42t-36.5 -17q-31 0 -31 24q0 15 9 27t9 14q0 8 -11 8q-35 0 -57 -43.5t-44 -133.5l-183 -734q-9 -35 -22 -66.5t-34 -64t-53.5 -52t-72.5 -19.5q-29 0 -47 13t-18 32q0 25 15.5 42t36.5 17 q12 0 21.5 -7t9.5 -19q0 -17 -9 -26.5t-9 -12.5q0 -8 11 -8q33 0 54 40.5t42 124.5z" />
+<glyph unicode="&#x222c;" horiz-adv-x="701" d="M446 -124l182 730q9 35 23.5 68.5t37.5 69.5t59 58t78 22q55 0 55 -45q0 -25 -15.5 -42t-36.5 -17q-31 0 -31 24q0 15 9 27t9 14q0 8 -11 8q-35 0 -57 -43.5t-44 -133.5l-183 -734q-12 -47 -33.5 -89.5t-64 -77.5t-94.5 -35q-55 0 -55 45q0 25 15.5 42t36.5 17 q12 0 21.5 -7t9.5 -19q0 -17 -9 -26.5t-9 -12.5q0 -8 11 -8q33 0 54 40.5t42 124.5zM204 -124l182 730q9 35 23.5 68.5t37.5 69.5t59 58t78 22q55 0 55 -45q0 -25 -15.5 -42t-36.5 -17q-31 0 -31 24q0 15 9 27t9 14q0 8 -11 8q-35 0 -57 -43.5t-44 -133.5l-183 -734 q-12 -47 -33.5 -89.5t-64 -77.5t-94.5 -35q-55 0 -55 45q0 25 15.5 42t36.5 17q12 0 21.5 -7t9.5 -19q0 -17 -9 -26.5t-9 -12.5q0 -8 11 -8q33 0 54 40.5t42 124.5z" />
+<glyph unicode="&#x222d;" horiz-adv-x="943" d="M688 -124l182 730q9 35 23.5 68.5t37.5 69.5t59 58t78 22q55 0 55 -45q0 -25 -15.5 -42t-36.5 -17q-31 0 -31 24q0 15 9 27t9 14q0 8 -11 8q-35 0 -57 -43.5t-44 -133.5l-183 -734q-12 -47 -33.5 -89.5t-64 -77.5t-94.5 -35q-55 0 -55 45q0 25 15.5 42t36.5 17 q12 0 21.5 -7t9.5 -19q0 -17 -9 -26.5t-9 -12.5q0 -8 11 -8q33 0 54 40.5t42 124.5zM445 -124l182 730q9 35 23.5 68.5t37.5 69.5t59 58t78 22q55 0 55 -45q0 -25 -15.5 -42t-36.5 -17q-31 0 -31 24q0 15 9 27t9 14q0 8 -11 8q-35 0 -57 -43.5t-44 -133.5l-183 -734 q-12 -47 -33.5 -89.5t-64 -77.5t-94.5 -35q-55 0 -55 45q0 25 15.5 42t36.5 17q12 0 21.5 -7t9.5 -19q0 -17 -9 -26.5t-9 -12.5q0 -8 11 -8q33 0 54 40.5t42 124.5zM204 -124l182 730q9 35 23.5 68.5t37.5 69.5t59 58t78 22q55 0 55 -45q0 -25 -15.5 -42t-36.5 -17 q-31 0 -31 24q0 15 9 27t9 14q0 8 -11 8q-35 0 -57 -43.5t-44 -133.5l-183 -734q-12 -47 -33.5 -89.5t-64 -77.5t-94.5 -35q-55 0 -55 45q0 25 15.5 42t36.5 17q12 0 21.5 -7t9.5 -19q0 -17 -9 -26.5t-9 -12.5q0 -8 11 -8q33 0 54 40.5t42 124.5z" />
+<glyph unicode="&#x222e;" horiz-adv-x="499" d="M353 476l33 130q54 218 188 218q29 0 47 -13t18 -32q0 -25 -15.5 -42t-36.5 -17q-31 0 -31 24q0 15 9 27t9 14q0 8 -11 8q-35 0 -57 -43.5t-44 -133.5l-39 -158q61 -26 98.5 -82t37.5 -125q0 -93 -66 -159t-159 -66q-13 0 -19 1l-36 -145q-9 -35 -22 -66.5t-34 -64 t-53.5 -52t-72.5 -19.5q-29 0 -47 13t-18 32q0 25 15.5 42t36.5 17q12 0 21.5 -7t9.5 -19q0 -17 -9 -26.5t-9 -12.5q0 -8 11 -8q33 0 54 40.5t42 124.5l42 168q-62 27 -99.5 82.5t-37.5 124.5q0 93 66 159t159 66h19zM324 64h10q77 0 132 55t55 132q0 55 -29.5 101t-78.5 69 zM344 438h-10q-77 0 -132 -55t-55 -132q0 -55 29.5 -101t78.5 -69z" />
+<glyph unicode="&#x222f;" horiz-adv-x="741" d="M592 462l36 144q9 35 23.5 68.5t37.5 69.5t59 58t78 22q55 0 55 -45q0 -25 -15.5 -42t-36.5 -17q-31 0 -31 24q0 15 9 27t9 14q0 8 -11 8q-35 0 -57 -43.5t-44 -133.5l-44 -177q70 -31 109 -80t39 -107q0 -78 -68 -137.5t-181 -78.5l-38 -154q-12 -47 -33.5 -89.5 t-64 -77.5t-94.5 -35q-55 0 -55 45q0 25 15.5 42t36.5 17q12 0 21.5 -7t9.5 -19q0 -17 -9 -26.5t-9 -12.5q0 -8 11 -8q33 0 54 40.5t42 124.5l37 152q-7 -1 -23 -1q-76 0 -141 17l-40 -162q-12 -47 -33.5 -89.5t-64 -77.5t-94.5 -35q-55 0 -55 45q0 25 15.5 42t36.5 17 q12 0 21.5 -7t9.5 -19q0 -17 -9 -26.5t-9 -12.5q0 -8 11 -8q33 0 54 40.5t42 124.5l48 193q-67 31 -104.5 79t-37.5 104q0 76 65.5 135t175.5 80l35 139q9 35 23.5 68.5t37.5 69.5t59 58t78 22q55 0 55 -45q0 -25 -15.5 -42t-36.5 -17q-31 0 -31 24q0 15 9 27t9 14 q0 8 -11 8q-35 0 -57 -43.5t-44 -133.5l-35 -139h33q72 0 132 -15zM650 399l-80 -321q89 21 144.5 68.5t55.5 105.5q0 43 -32.5 81.5t-87.5 65.5zM493 67l89 356q-57 16 -126 16q-26 0 -39 -1l-88 -357q61 -16 127 -16q13 0 37 2zM261 107l80 319q-87 -20 -140 -67.5 t-53 -106.5q0 -43 30 -81t83 -64z" />
+<glyph unicode="&#x2230;" horiz-adv-x="982" d="M830 450l39 156q9 35 23.5 68.5t37.5 69.5t59 58t78 22q55 0 55 -45q0 -25 -15.5 -42t-36.5 -17q-31 0 -31 24q0 15 9 27t9 14q0 8 -11 8q-35 0 -57 -43.5t-44 -133.5l-47 -188q150 -59 150 -176q0 -75 -63.5 -127t-181.5 -77l-41 -166q-12 -47 -33.5 -89.5t-64 -77.5 t-94.5 -35q-55 0 -55 45q0 25 15.5 42t36.5 17q12 0 21.5 -7t9.5 -19q0 -17 -9 -26.5t-9 -12.5q0 -8 11 -8q33 0 54 40.5t42 124.5l39 160q-68 -9 -148 -9h-22l-36 -145q-12 -47 -33.5 -89.5t-64 -77.5t-94.5 -35q-55 0 -55 45q0 25 15.5 42t36.5 17q12 0 21.5 -7t9.5 -19 q0 -17 -9 -26.5t-9 -12.5q0 -8 11 -8q33 0 54 40.5t42 124.5l38 154q-95 6 -162 23l-42 -171q-12 -47 -33.5 -89.5t-64 -77.5t-94.5 -35q-55 0 -55 45q0 25 15.5 42t36.5 17q12 0 21.5 -7t9.5 -19q0 -17 -9 -26.5t-9 -12.5q0 -8 11 -8q33 0 54 40.5t42 124.5l49 198 q-146 56 -146 178q0 70 63 122.5t178 79.5l38 152q9 35 23.5 68.5t37.5 69.5t59 58t78 22q55 0 55 -45q0 -25 -15.5 -42t-36.5 -17q-31 0 -31 24q0 15 9 27t9 14q0 8 -11 8q-35 0 -57 -43.5t-44 -133.5l-37 -148q69 9 153 9h17l32 129q9 35 23.5 68.5t37.5 69.5t59 58t78 22 q55 0 55 -45q0 -25 -15.5 -42t-36.5 -17q-31 0 -31 24q0 15 9 27t9 14q0 8 -11 8q-34 0 -56 -43t-45 -134l-36 -142q91 -6 163 -24zM888 389l-75 -301q197 46 197 164q0 87 -122 137zM736 75l84 337q-71 18 -162 24l-93 -371h7q93 0 164 10zM585 439h-13q-82 0 -157 -11 l-84 -337q73 -19 162 -23zM263 114l74 298q-90 -25 -141 -66.5t-51 -93.5q0 -87 118 -138z" />
+<glyph unicode="&#x2231;" horiz-adv-x="499" d="M326 366l60 240q9 35 23.5 68.5t37.5 69.5t59 58t78 22q55 0 55 -45q0 -25 -15.5 -42t-36.5 -17q-31 0 -31 24q0 15 9 27t9 14q0 8 -11 8q-35 0 -57 -43.5t-44 -133.5l-66 -267q76 -32 113 -107q4 -8 11 -8t14 13q14 37 30 61l12 -6q-42 -92 -42 -157l-5 -3 q-45 43 -145 76l3 12q27 -5 65 -19q6 -2 9 -2q14 0 14 12q0 3 -1 5l-5 10q-25 49 -83 76l-107 -430q-12 -47 -33.5 -89.5t-64 -77.5t-94.5 -35q-55 0 -55 45q0 25 15.5 42t36.5 17q12 0 21.5 -7t9.5 -19q0 -17 -9 -26.5t-9 -12.5q0 -8 11 -8q33 0 54 40.5t42 124.5l113 453 h-9q-77 0 -132 -55t-55 -132h-38q0 93 66 159t159 66q12 0 18 -1z" />
+<glyph unicode="&#x2232;" horiz-adv-x="499" d="M353 476l33 130q9 35 23.5 68.5t37.5 69.5t59 58t78 22q55 0 55 -45q0 -25 -15.5 -42t-36.5 -17q-31 0 -31 24q0 15 9 27t9 14q0 8 -11 8q-35 0 -57 -43.5t-44 -133.5l-39 -157q76 -33 113 -106q4 -9 12 -9q7 0 14 13q13 34 31 61l11 -6q-44 -84 -44 -160q0 -93 -66 -159 t-159 -66q-13 0 -20 1l-36 -146q-12 -47 -33.5 -89.5t-64 -77.5t-94.5 -35q-55 0 -55 45q0 25 15.5 42t36.5 17q12 0 21.5 -7t9.5 -19q0 -17 -9 -26.5t-9 -12.5q0 -8 11 -8q33 0 54 40.5t42 124.5l42 169q-61 27 -98.5 83t-37.5 124q0 93 66 159t159 66q12 0 18 -1zM325 65 h10q77 0 132 55t55 132q0 10 -2 26q-40 28 -110 50l4 12q33 -6 65 -18q6 -2 9 -2q15 0 15 11q-1 1 -1 3.5t-1 3.5q-29 56 -88 84zM344 439h-9q-77 0 -132 -55t-55 -132q0 -55 29.5 -100.5t77.5 -68.5z" />
+<glyph unicode="&#x2233;" horiz-adv-x="499" d="M354 477l32 129q9 35 23.5 68.5t37.5 69.5t59 58t78 22q55 0 55 -45q0 -25 -15.5 -42t-36.5 -17q-31 0 -31 24q0 15 9 27t9 14q0 8 -11 8q-35 0 -57 -43.5t-44 -133.5l-39 -157q41 -18 69 -46q45 -37 140 -63l-3 -13q-14 1 -42 8.5t-35 7.5q-11 0 -11 -8l1 -5 q18 -44 18 -88q0 -93 -66 -159t-159 -66q-13 0 -20 1l-36 -146q-12 -47 -33.5 -89.5t-64 -77.5t-94.5 -35q-55 0 -55 45q0 25 15.5 42t36.5 17q12 0 21.5 -7t9.5 -19q0 -17 -9 -26.5t-9 -12.5q0 -8 11 -8q33 0 54 40.5t42 124.5l42 169q-61 27 -98.5 83t-37.5 124 q0 93 66 159t159 66h19zM325 65h10q77 0 132 55t55 132q0 37 -14 71q-2 5 -10 5q-10 0 -16 -14q-22 -46 -31 -62l-12 6q31 76 36 118q-27 30 -62 46zM344 439h-9q-77 0 -132 -55t-55 -132q0 -55 29.5 -100.5t77.5 -68.5z" />
+<glyph unicode="&#x2234;" horiz-adv-x="620" d="M374 458q0 -26 -17.5 -45t-45.5 -19q-29 0 -46.5 17.5t-17.5 46.5q0 27 19.5 45t44.5 18t44 -18t19 -45zM582 48q0 -26 -17.5 -45t-45.5 -19q-29 0 -46.5 17.5t-17.5 46.5q0 27 19.5 45t44.5 18t44 -18t19 -45zM165 48q0 -26 -17.5 -45t-45.5 -19q-29 0 -46.5 17.5 t-17.5 46.5q0 27 19.5 45t44.5 18t44 -18t19 -45z" />
+<glyph unicode="&#x2235;" horiz-adv-x="620" d="M582 457q0 -27 -19.5 -45t-44.5 -18t-44 18t-19 45q0 26 17.5 45t45.5 19q29 0 46.5 -17.5t17.5 -46.5zM165 457q0 -27 -19.5 -45t-44.5 -18t-44 18t-19 45q0 26 17.5 45t45.5 19q29 0 46.5 -17.5t17.5 -46.5zM373 47q0 -27 -19.5 -45t-44.5 -18t-44 18t-19 45 q0 26 17.5 45t45.5 19q29 0 46.5 -17.5t17.5 -46.5z" />
+<glyph unicode="&#x2236;" horiz-adv-x="511" d="M319 458q0 -26 -17.5 -45t-45.5 -19q-29 0 -46.5 17.5t-17.5 46.5q0 27 19.5 45t44.5 18t44 -18t19 -45zM319 51q0 -26 -19 -45t-45 -19q-25 0 -44 19.5t-19 44.5q0 29 18.5 46t44.5 17q27 0 45.5 -16.5t18.5 -46.5z" />
+<glyph unicode="&#x2237;" d="M209 458q0 -26 -17.5 -45t-45.5 -19q-29 0 -46.5 17.5t-17.5 46.5q0 27 19.5 45t44.5 18t44 -18t19 -45zM209 51q0 -26 -19 -45t-45 -19q-25 0 -44 19.5t-19 44.5q0 29 18.5 46t44.5 17q27 0 45.5 -16.5t18.5 -46.5zM602 458q0 -26 -17.5 -45t-45.5 -19q-29 0 -46.5 17.5 t-17.5 46.5q0 27 19.5 45t44.5 18t44 -18t19 -45zM602 51q0 -26 -19 -45t-45 -19q-25 0 -44 19.5t-19 44.5q0 29 18.5 46t44.5 17q27 0 45.5 -16.5t18.5 -46.5z" />
+<glyph unicode="&#x2238;" d="M405 448q0 -26 -17.5 -45t-45.5 -19q-29 0 -46.5 17.5t-17.5 46.5q0 27 19.5 45t44.5 18t44 -18t19 -45zM637 220h-589v66h589v-66z" />
+<glyph unicode="&#x2239;" d="M637 448q0 -26 -17.5 -45t-45.5 -19q-29 0 -46.5 17.5t-17.5 46.5q0 27 19.5 45t44.5 18t44 -18t19 -45zM637 59q0 -26 -19 -45t-45 -19q-25 0 -44 19.5t-19 44.5q0 29 18.5 46t44.5 17q27 0 45.5 -16.5t18.5 -46.5zM448 220h-400v66h400v-66z" />
+<glyph unicode="&#x223a;" d="M637 448q0 -26 -17.5 -45t-45.5 -19q-29 0 -46.5 17.5t-17.5 46.5q0 27 19.5 45t44.5 18t44 -18t19 -45zM637 59q0 -26 -17.5 -45t-45.5 -19q-29 0 -46.5 17.5t-17.5 46.5q0 27 19.5 45t44.5 18t44 -18t19 -45zM637 220h-589v66h589v-66zM175 448q0 -26 -17.5 -45 t-45.5 -19q-29 0 -46.5 17.5t-17.5 46.5q0 27 19.5 45t44.5 18t44 -18t19 -45zM175 59q0 -26 -17.5 -45t-45.5 -19q-29 0 -46.5 17.5t-17.5 46.5q0 27 19.5 45t44.5 18t44 -18t19 -45z" />
+<glyph unicode="&#x223b;" d="M415 458q0 -26 -17.5 -45t-45.5 -19q-29 0 -46.5 17.5t-17.5 46.5q0 27 19.5 45t44.5 18t44 -18t19 -45zM415 51q0 -26 -19 -45t-45 -19q-25 0 -44 19.5t-19 44.5q0 29 18.5 46t44.5 17q27 0 45.5 -16.5t18.5 -46.5zM617 362h20q-5 -75 -48 -144.5t-110 -69.5 q-32 0 -74.5 23t-77 51t-72 51t-61.5 23q-48 0 -80 -43.5t-46 -104.5h-20q4 82 49 148t114 66q41 0 97 -37l108 -74q51 -37 81 -37q85 0 120 148z" />
+<glyph unicode="&#x223c;" d="M604 362h33q-5 -74 -48 -139t-110 -65q-41 0 -95 32l-102 64q-49 32 -78 32q-49 0 -79 -39t-44 -99h-33q4 81 48.5 142.5t114.5 61.5q41 0 95 -32l102 -64q49 -32 79 -32q88 0 117 138z" />
+<glyph unicode="&#x223d;" d="M637 148h-33q-29 138 -117 138q-30 0 -79 -32l-102 -64q-54 -32 -95 -32q-70 0 -114.5 61.5t-48.5 142.5h33q14 -60 44 -99t79 -39q29 0 78 32l102 64q54 32 95 32q67 0 110 -65t48 -139z" />
+<glyph unicode="&#x223e;" d="M502 347v66q20 0 40.5 -7t43 -23.5t37 -51t14.5 -83.5q0 -73 -40 -115.5t-92 -42.5q-43 0 -81 31q-29 24 -82 100t-73 94q-34 32 -81 32q-50 0 -80 -26.5t-30 -76.5q0 -44 31 -66t80 -22v-66q-66 0 -103.5 49.5t-37.5 110.5q0 72 42 117.5t95 45.5q56 0 98 -48 q15 -17 58.5 -80.5t69.5 -90.5q36 -38 86 -38t80 26.5t30 76.5q0 43 -28.5 65.5t-76.5 22.5z" />
+<glyph unicode="&#x223f;" d="M576 252h61q0 -85 -45.5 -149t-117.5 -64t-111 54.5t-55 159.5q-10 70 -31.5 109t-64.5 39q-48 0 -75 -42.5t-27 -106.5h-61q0 86 45.5 150.5t117.5 64.5q138 0 167 -214q20 -148 95 -148q47 0 74 42.5t28 104.5z" />
+<glyph unicode="&#x2240;" horiz-adv-x="286" d="M249 -9v-33q-74 5 -139 48t-65 110q0 41 32 94l64 103q32 49 32 78q0 49 -39 79t-99 44v33q81 -4 142.5 -48.5t61.5 -114.5q0 -41 -32 -94l-64 -103q-32 -49 -32 -79q0 -88 138 -117z" />
+<glyph unicode="&#x2241;" d="M604 362h33q-3 -45 -21 -90t-54.5 -79.5t-82.5 -34.5q-52 0 -132 54l-72 -124h-60l89 153q-69 45 -100 45q-50 0 -80 -40.5t-43 -97.5h-33q4 77 47.5 140.5t115.5 63.5q51 0 127 -52l72 124h60l-88 -152q71 -48 105 -48q88 0 117 138z" />
+<glyph unicode="&#x2242;" d="M604 269h33q-5 -74 -48 -139t-110 -65q-41 0 -95 32l-102 64q-49 32 -78 32q-49 0 -79 -39t-44 -99h-33q4 81 48.5 142.5t114.5 61.5q41 0 95 -32l102 -64q49 -32 79 -32q88 0 117 138zM637 379h-589v66h589v-66z" />
+<glyph unicode="&#x2243;" d="M604 445h33q-5 -74 -48 -139t-110 -65q-41 0 -95 32l-102 64q-49 32 -78 32q-49 0 -79 -39t-44 -99h-33q4 81 48.5 142.5t114.5 61.5q41 0 95 -32l102 -64q49 -32 79 -32q88 0 117 138zM637 55h-589v66h589v-66z" />
+<glyph unicode="&#x2244;" d="M637 55h-356l-39 -90h-54l39 90h-179v66h208l78 179l-26 18l-26 20l-24 15q-15 10 -24 14.5t-20 8t-20 3.5q-48 0 -80 -43.5t-46 -104.5h-20q4 82 49 148t114 66q51 0 153 -76l65 150h54l-78 -180q59 -42 92 -42q85 0 120 148h20q-5 -75 -48 -144.5t-110 -69.5 q-43 0 -104 40l-65 -150h327v-66z" />
+<glyph unicode="&#x2245;" d="M637 173h-589v66h589v-66zM637 -27h-589v66h589v-66zM617 532h20q-5 -75 -48 -144.5t-110 -69.5q-32 0 -74.5 23t-77 51t-72 51t-61.5 23q-48 0 -80 -43.5t-46 -104.5h-20q4 82 49 148t114 66q41 0 97 -37l108 -74q51 -37 81 -37q85 0 120 148z" />
+<glyph unicode="&#x2246;" d="M616 604h20q-5 -75 -48 -144.5t-110 -69.5q-32 0 -74.5 23t-77 51t-72 51t-61.5 23q-48 0 -80 -43.5t-46 -104.5h-20q4 82 49 148t114 66q41 0 97 -37l107 -74q52 -37 82 -37q85 0 120 148zM637 -21h-352l-53 -86h-60l53 86h-177v66h218l84 134h-302v66h343l54 86h60 l-54 -86h186v-66h-227l-84 -134h311v-66z" />
+<glyph unicode="&#x2247;" d="M637 -27h-362l-72 -175h-53l72 175h-174v66h201l55 134h-256v66h283l50 122q-20 12 -60.5 39.5t-67.5 41.5t-49 14q-49 0 -79 -39t-44 -99h-33q4 81 48.5 142.5t114.5 61.5q23 0 51 -11t47 -22t52.5 -34t45.5 -30l92 222h53l-101 -245q21 -8 36 -8q88 0 117 138h33 q-5 -74 -48 -139t-110 -65q-26 0 -54 11l-41 -100h253v-66h-280l-55 -134h335v-66z" />
+<glyph unicode="&#x2248;" d="M604 239h33q-5 -74 -48 -139t-110 -65q-41 0 -95 32l-102 64q-49 32 -78 32q-49 0 -79 -39t-44 -99h-33q4 81 48.5 142.5t114.5 61.5q41 0 95 -32l102 -64q49 -32 79 -32q88 0 117 138zM604 475h33q-5 -74 -48 -139t-110 -65q-41 0 -95 32l-102 64q-49 32 -78 32 q-49 0 -79 -39t-44 -99h-33q4 81 48.5 142.5t114.5 61.5q41 0 95 -32l102 -64q49 -32 79 -32q88 0 117 138z" />
+<glyph unicode="&#x2249;" d="M617 239h20q-5 -75 -48 -144.5t-110 -69.5q-25 0 -58.5 15.5t-53.5 29.5l-59 43l-70 -162h-54l83 191q-47 31 -73 31q-48 0 -80 -43.5t-46 -104.5h-20q4 82 49 148t114 66q36 0 85 -29l49 112q-9 6 -33 24t-34.5 25t-28.5 18t-31 15.5t-24 4.5q-48 0 -80 -43.5 t-46 -104.5h-20q4 82 49 148t114 66q24 0 56 -14.5t51 -28.5l57 -41l70 158h54l-82 -188q49 -34 80 -34q85 0 120 148h20q-5 -75 -48 -144.5t-110 -69.5q-40 0 -92 32l-48 -111l35 -25l35 -25q12 -9 30 -20t32 -16t26 -5q85 0 120 148z" />
+<glyph unicode="&#x224a;" d="M604 316h33q-5 -74 -48 -139t-110 -65q-41 0 -95 32l-102 64q-49 32 -78 32q-49 0 -79 -39t-44 -99h-33q4 81 48.5 142.5t114.5 61.5q41 0 95 -32l102 -64q49 -32 79 -32q88 0 117 138zM604 552h33q-5 -74 -48 -139t-110 -65q-41 0 -95 32l-102 64q-49 32 -78 32 q-49 0 -79 -39t-44 -99h-33q4 81 48.5 142.5t114.5 61.5q41 0 95 -32l102 -64q49 -32 79 -32q88 0 117 138zM637 -45h-589v66h589v-66z" />
+<glyph unicode="&#x224b;" d="M617 532h20q-5 -70 -47 -122t-111 -52q-41 0 -97 27l-108 54q-51 27 -80 27q-102 0 -126 -108h-20q4 77 47.5 125.5t115.5 48.5q51 0 151.5 -54t134.5 -54q50 0 78.5 26.5t41.5 81.5zM618 340h20q-5 -70 -47 -122t-111 -52q-41 0 -97 27l-107 54q-52 27 -81 27 q-102 0 -126 -108h-20q4 77 47.5 125.5t115.5 48.5q51 0 151.5 -54t134.5 -54q50 0 78.5 26.5t41.5 81.5zM617 148h20q-5 -70 -47 -122t-111 -52q-41 0 -97 27l-108 54q-51 27 -80 27q-102 0 -126 -108h-20q4 77 47.5 125.5t115.5 48.5q51 0 151.5 -54t134.5 -54 q50 0 78.5 26.5t41.5 81.5z" />
+<glyph unicode="&#x224c;" d="M637 173h-589v66h589v-66zM637 -27h-589v66h589v-66zM637 318h-20q-35 148 -120 148q-30 0 -81 -37l-108 -74q-56 -37 -97 -37q-69 0 -114 66t-49 148h20q14 -61 46 -104.5t80 -43.5q24 0 61.5 23t72 51t77 51t74.5 23q67 0 110 -69.5t48 -144.5z" />
+<glyph unicode="&#x224d;" d="M637 498v-35q-32 -72 -120 -114.5t-175 -42.5q-90 0 -175.5 42t-118.5 115v35q92 -126 294 -126q90 0 170 31t125 95zM637 43v-35q-92 126 -295 126q-90 0 -169.5 -31t-124.5 -95v35q32 72 119.5 114.5t174.5 42.5q90 0 176 -42t119 -115z" />
+<glyph unicode="&#x224e;" d="M637 320h-210q-1 33 -24.5 59t-58.5 26q-38 0 -62 -26t-24 -59h-210v66h156q17 35 53.5 60t84.5 25q49 0 87.5 -26t51.5 -59h156v-66zM637 120h-156q-17 -35 -53.5 -60t-84.5 -25q-49 0 -87.5 26t-51.5 59h-156v66h210q1 -32 26 -58.5t60 -26.5q37 0 60 26t23 59h210v-66 z" />
+<glyph unicode="&#x224f;" d="M637 320h-209q-1 33 -24.5 59t-58.5 26q-39 0 -63 -26t-24 -59h-210v66h156q17 34 54 59.5t85 25.5q49 0 87.5 -26t51.5 -59h155v-66zM637 120h-589v66h589v-66z" />
+<glyph unicode="&#x2250;" d="M637 320h-589v66h589v-66zM637 120h-589v66h589v-66zM405 548q0 -26 -17.5 -45t-45.5 -19q-29 0 -46.5 17.5t-17.5 46.5q0 27 19.5 45t44.5 18t44 -18t19 -45z" />
+<glyph unicode="&#x2251;" d="M405 548q0 -26 -17.5 -45t-45.5 -19q-29 0 -46.5 17.5t-17.5 46.5q0 27 19.5 45t44.5 18t44 -18t19 -45zM637 320h-589v66h589v-66zM637 120h-589v66h589v-66zM405 -42q0 -26 -19 -45t-45 -19q-25 0 -44 19.5t-19 44.5q0 29 18.5 46t44.5 17q27 0 45.5 -16.5t18.5 -46.5z " />
+<glyph unicode="&#x2252;" d="M637 320h-589v66h589v-66zM637 120h-589v66h589v-66zM175 548q0 -26 -17.5 -45t-45.5 -19q-29 0 -46.5 17.5t-17.5 46.5q0 27 19.5 45t44.5 18t44 -18t19 -45zM637 -41q0 -26 -17.5 -45t-45.5 -19q-29 0 -46.5 17.5t-17.5 46.5q0 27 19.5 45t44.5 18t44 -18t19 -45z" />
+<glyph unicode="&#x2253;" d="M637 320h-589v66h589v-66zM637 120h-589v66h589v-66zM637 548q0 -26 -17.5 -45t-45.5 -19q-29 0 -46.5 17.5t-17.5 46.5q0 27 19.5 45t44.5 18t44 -18t19 -45zM175 -42q0 -26 -17.5 -45t-45.5 -19q-29 0 -46.5 17.5t-17.5 46.5q0 27 19.5 45t44.5 18t44 -18t19 -45z" />
+<glyph unicode="&#x2254;" horiz-adv-x="824" d="M776 320h-509v66h509v-66zM776 120h-509v66h509v-66zM175 354q0 -26 -17.5 -45t-45.5 -19q-29 0 -46.5 17.5t-17.5 46.5q0 27 19.5 45t44.5 18t44 -18t19 -45zM175 153q0 -26 -19 -45t-45 -19q-25 0 -44 19.5t-19 44.5q0 29 18.5 46t44.5 17q27 0 45.5 -16.5t18.5 -46.5z " />
+<glyph unicode="&#x2255;" horiz-adv-x="824" d="M776 354q0 -26 -17.5 -45t-45.5 -19q-29 0 -46.5 17.5t-17.5 46.5q0 27 19.5 45t44.5 18t44 -18t19 -45zM776 153q0 -26 -19 -45t-45 -19q-25 0 -44 19.5t-19 44.5q0 29 18.5 46t44.5 17q27 0 45.5 -16.5t18.5 -46.5zM557 320h-509v66h509v-66zM557 120h-509v66h509v-66z " />
+<glyph unicode="&#x2256;" d="M637 90h-589v66h223q-48 35 -48 96q0 62 51 98h-226v66h589v-66h-227q51 -36 51 -98t-49 -96h225v-66zM411 251q0 29 -20 49.5t-48 20.5q-29 0 -49.5 -20t-20.5 -49q0 -28 20.5 -48.5t48.5 -20.5t48.5 20t20.5 48z" />
+<glyph unicode="&#x2257;" d="M637 320h-589v66h589v-66zM637 120h-589v66h589v-66zM461 633q0 -49 -34.5 -84t-84.5 -35t-84.5 35t-34.5 84t34.5 84t84.5 35t84.5 -35t34.5 -84zM411 632q0 29 -20 49.5t-48 20.5q-29 0 -49.5 -20t-20.5 -49t20.5 -49t48.5 -20t48.5 20t20.5 48z" />
+<glyph unicode="&#x2258;" d="M637 320h-589v66h589v-66zM637 120h-589v66h589v-66zM597 553l-17 -11q-48 60 -104.5 90.5t-133.5 30.5q-58 0 -103 -17t-70.5 -39.5t-63.5 -64.5l-17 11q95 176 255 176q87 0 147 -46.5t107 -129.5z" />
+<glyph unicode="&#x2259;" d="M637 320h-589v66h589v-66zM637 120h-589v66h589v-66zM562 484h-72l-150 249l-143 -249h-72l218 369z" />
+<glyph unicode="&#x225a;" d="M637 320h-589v66h589v-66zM637 120h-589v66h589v-66zM555 853l-218 -369l-219 369h72l150 -249l143 249h72z" />
+<glyph unicode="&#x225b;" d="M637 320h-589v66h589v-66zM637 120h-589v66h589v-66zM500 634l-69 -59q-13 -10 -13 -26q0 -4 2 -12q2 -4 2 -6l14 -75l-71 44q-14 7 -22 7q-13 0 -25 -7l-71 -42l21 68q0 2 1 5.5t1.5 6.5t0.5 6q0 16 -14 28l-73 62l82 6q31 3 42 31l33 85l35 -86q10 -27 39 -29z" />
+<glyph unicode="&#x225c;" d="M637 320h-589v66h589v-66zM637 120h-589v66h589v-66zM564 484h-438l219 369zM452 545l-110 188l-110 -188h220z" />
+<glyph unicode="&#x225d;" d="M637 320h-589v66h589v-66zM637 120h-589v66h589v-66zM485 697h45q0 45 18 78q27 48 75 48q23 0 39 -13t16 -28q0 -9 -6.5 -16t-15.5 -7q-12 0 -25 19q-13 21 -26 21q-30 0 -30 -48v-54h66v-23h-66v-156q0 -32 8 -40.5t42 -9.5v-13h-141v13q30 1 38 10t8 40v156h-45v23z M474 541l13 -2q-31 -90 -113 -90q-47 0 -74.5 33t-27.5 89q0 58 30.5 95t80.5 37q49 0 75 -38q15 -23 20 -68h-167q2 -50 25 -81q21 -30 59 -30q27 0 42.5 11.5t36.5 43.5zM312 620h110q-5 35 -16 48t-36 13q-51 0 -58 -61zM258 478l-78 -29l-3 1v34q-25 -35 -69 -35 q-46 0 -73.5 32t-27.5 84q0 57 33 97.5t79 40.5q37 0 58 -24v76q0 18 -4.5 23.5t-20.5 5.5q-7 0 -11 -1v14q44 12 77 26l4 -1v-307q0 -18 4.5 -23.5t19.5 -5.5h12v-8zM177 518v116q0 21 -16 34t-39 13q-31 0 -48.5 -24.5t-17.5 -69.5q0 -49 19.5 -75t53.5 -26q27 0 40 16 q8 10 8 16z" />
+<glyph unicode="&#x225e;" d="M637 320h-589v66h589v-66zM637 120h-589v66h589v-66zM550 455h-118v12q22 1 28 8.5t6 31.5v107q0 29 -7.5 45t-33.5 16q-29 0 -58 -39v-128q0 -24 7.5 -32t31.5 -9v-12h-122v12q24 2 30.5 8t6.5 30v109q0 61 -34 61q-18 0 -37.5 -11.5t-27.5 -26.5v-141q0 -17 8 -22.5 t27 -6.5v-12h-118v12q23 1 30.5 9t7.5 30v124q0 31 -11 35q-3 1 -7 1q-9 0 -18 -3v15q50 16 74 25l4 -3v-40h1q41 43 83 43q46 0 60 -46q41 46 86 46q62 0 62 -97v-108q0 -11 2 -17t9.5 -9t10.5 -3.5t17 -1.5v-12z" />
+<glyph unicode="&#x225f;" d="M637 320h-589v66h589v-66zM637 120h-589v66h589v-66zM353 567h-31q0 55 23 109q30 70 30 96q0 52 -47 52q-18 0 -32.5 -12t-14.5 -21q0 -5 9.5 -13.5t9.5 -20.5q0 -15 -9 -24t-25 -9q-18 0 -28.5 13t-10.5 33q0 39 31.5 66t77.5 27q49 0 84.5 -26t35.5 -70q0 -27 -13 -49 t-53 -64q-24 -26 -37 -87zM383 497q0 -18 -12 -30.5t-30 -12.5q-20 0 -31.5 12t-11.5 31q0 18 12.5 30t30.5 12q16 0 29 -12.5t13 -29.5z" />
+<glyph unicode="&#x2260;" d="M637 120h-326l-120 -276h-54l120 276h-209v66h238l59 134h-297v66h326l120 276h54l-121 -276h210v-66h-238l-59 -134h297v-66z" />
+<glyph unicode="&#x2261;" d="M637 412h-589v66h589v-66zM637 220h-589v66h589v-66zM637 28h-589v66h589v-66z" />
+<glyph unicode="&#x2262;" d="M637 28h-366l-80 -184h-54l80 184h-169v66h198l55 126h-253v66h282l55 126h-337v66h366l80 184h54l-81 -184h170v-66h-198l-55 -126h253v-66h-282l-55 -126h337v-66z" />
+<glyph unicode="&#x2263;" d="M637 478h-589v66h589v-66zM637 306h-589v66h589v-66zM637 134h-589v66h589v-66zM637 -38h-589v66h589v-66z" />
+<glyph unicode="&#x2264;" d="M629 51l-565 273v10l565 275v-65l-432 -215l432 -215v-63zM629 -103h-565v66h565v-66z" />
+<glyph unicode="&#x2265;" d="M629 324l-565 -273v63l432 215l-432 215v65l565 -275v-10zM629 -103h-565v66h565v-66z" />
+<glyph unicode="&#x2266;" d="M622 160l-565 273v10l565 275v-65l-432 -215l432 -215v-63zM622 -12h-565v66h565v-66zM622 -211h-565v66h565v-66z" />
+<glyph unicode="&#x2267;" d="M622 433l-565 -273v63l432 215l-432 215v65l565 -275v-10zM622 -12h-565v66h565v-66zM622 -211h-565v66h565v-66z" />
+<glyph unicode="&#x2268;" d="M621 188l-565 273v10l565 275v-65l-432 -215l432 -215v-63zM621 -184h-345l-47 -76h-60l47 76h-160v66h201l84 134h-285v66h326l48 76h60l-48 -76h179v-66h-220l-84 -134h304v-66z" />
+<glyph unicode="&#x2269;" d="M621 461l-565 -273v63l432 215l-432 215v65l565 -275v-10zM621 -184h-332l-47 -76h-60l47 76h-173v66h214l84 134h-298v66h339l48 76h60l-48 -76h166v-66h-207l-84 -134h291v-66z" />
+<glyph unicode="&#x226a;" horiz-adv-x="933" d="M908 -26l-565 274v10l565 274v-65l-432 -214l432 -216v-63zM590 -26l-565 274v10l565 274v-65l-432 -214l432 -216v-63z" />
+<glyph unicode="&#x226b;" horiz-adv-x="933" d="M908 249l-565 -275v63l432 216l-432 214v65l565 -273v-10zM590 249l-565 -275v63l432 216l-432 214v65l565 -273v-10z" />
+<glyph unicode="&#x226c;" horiz-adv-x="466" d="M381 -207v-17q-83 56 -148 137q-65 -81 -148 -137v19q81 95 120 154q-110 155 -110 304t110 304q-41 64 -120 156v17q83 -56 148 -137q65 81 148 137v-19q-79 -89 -121 -154q111 -158 111 -304q0 -150 -111 -304q38 -60 121 -156zM305 253q0 130 -72 259 q-72 -132 -72 -259q0 -129 71 -259q73 129 73 259z" />
+<glyph unicode="&#x226d;" d="M637 43v-35q-92 126 -295 126q-16 0 -24 -1l-87 -199h-54l84 193q-146 -24 -213 -119v35q28 61 96.5 101.5t146.5 51.5l48 110q-89 1 -173.5 42.5t-117.5 114.5v35q92 -126 294 -126q17 0 26 1l87 199h54l-84 -193q145 24 212 119v-35q-28 -61 -96 -101t-146 -52 l-48 -110q90 -2 173.5 -43.5t116.5 -113.5z" />
+<glyph unicode="&#x226e;" d="M621 -26l-304 146l-120 -276h-54l130 298l-217 105v10l339 165l105 240h54l-90 -207l157 77v-65l-194 -97l-85 -194l279 -139v-63zM357 336l-168 -84l108 -54z" />
+<glyph unicode="&#x226f;" d="M621 247l-337 -163l-105 -240h-54l90 207l-159 -77v63l196 98l84 193l-280 139v65l304 -148l122 278h54l-131 -300l216 -105v-10zM488 252l-108 54l-59 -137z" />
+<glyph unicode="&#x2270;" d="M621 -103h-386l-47 -126h-54l47 126h-125v66h149l90 243l-239 116v10l350 170l85 228h54l-73 -196l149 73v-65l-180 -90l-79 -212l259 -128v-63l-280 135l-82 -221h362v-66zM375 419l-186 -92l128 -64z" />
+<glyph unicode="&#x2271;" d="M622 -103h-401l-47 -126h-54l47 126h-111v66h135l68 184l-203 -98v63l234 116l62 167l-296 147v65l317 -154l104 277h54l-112 -300l202 -98v-10l-296 -143l-80 -216h377v-66zM488 327l-90 45l-42 -111z" />
+<glyph unicode="&#x2272;" d="M604 50h33q-5 -74 -48 -139t-110 -65q-41 0 -95 32l-102 64q-49 32 -78 32q-49 0 -79 -39t-44 -99h-33q4 81 48.5 142.5t114.5 61.5q41 0 95 -32l102 -64q49 -32 79 -32q88 0 117 138zM621 106l-565 273v10l565 275v-65l-432 -215l432 -215v-63z" />
+<glyph unicode="&#x2273;" d="M604 50h33q-5 -74 -48 -139t-110 -65q-41 0 -95 32l-102 64q-49 32 -78 32q-49 0 -79 -39t-44 -99h-33q4 81 48.5 142.5t114.5 61.5q41 0 95 -32l102 -64q49 -32 79 -32q88 0 117 138zM629 379l-565 -273v63l432 215l-432 215v65l565 -275v-10z" />
+<glyph unicode="&#x2274;" d="M604 50h33q-5 -74 -48 -139t-110 -65q-31 0 -64.5 15t-81.5 48t-60 40l-49 -177h-54l55 199q-11 3 -21 3q-49 0 -79 -39t-44 -99h-33q4 81 48.5 142.5t114.5 61.5q14 0 32 -5l62 223l-249 121v10l331 161l50 181h54l-42 -151l172 84v-65l-194 -97l-58 -208l252 -125v-63 l-268 129l-61 -219q25 -13 66.5 -41.5t73.5 -45.5t55 -17q88 0 117 138zM365 471l-176 -87l133 -67z" />
+<glyph unicode="&#x2275;" d="M604 50h33q-5 -74 -48 -139t-110 -65q-35 0 -76 21.5t-87 53t-69 42.5l-55 -192h-54l58 203q-45 -3 -73.5 -41.5t-41.5 -96.5h-33q4 81 48.5 142.5t114.5 61.5h4l47 162l-198 -96v63l220 110l53 184l-273 136v65l291 -142l60 208h54l-67 -231l227 -110v-10l-304 -147 l-59 -204q31 -13 109.5 -64.5t111.5 -51.5q88 0 117 138zM496 384l-111 55l-37 -129z" />
+<glyph unicode="&#x2276;" d="M621 208l-565 244v10l565 243v-65l-432 -183l432 -186v-63zM621 39l-565 -243v63l432 185l-432 184v65l565 -244v-10z" />
+<glyph unicode="&#x2277;" d="M621 452l-565 -244v63l432 186l-432 183v65l565 -243v-10zM621 -204l-565 243v10l565 244v-65l-432 -184l432 -185v-63z" />
+<glyph unicode="&#x2278;" d="M637 38l-339 -141l-29 -147h-51l25 124l-195 -81v67l208 85l37 181l-245 100v66l257 -107l29 149l-286 118v10l340 141l30 147h51l-25 -124l193 81v-67l-207 -84l-37 -183l244 -99v-66l-256 106l-29 -149l285 -117v-10zM375 534l-189 -77l160 -65zM496 43l-155 63 l-29 -139z" />
+<glyph unicode="&#x2279;" d="M637 -207l-331 138l-36 -181h-51l40 200l-211 88v10l252 104l34 175l-286 -119v66l299 121l23 114l-322 131v67l334 -139l37 182h51l-41 -202l208 -86v-10l-247 -102l-35 -176l282 118v-66l-296 -120l-23 -116l319 -130v-67zM499 457l-81 33l-14 -72zM286 83l-100 -40 l85 -35z" />
+<glyph unicode="&#x227a;" d="M621 51v-77q-84 112 -235 172.5t-322 73.5v66q171 13 322 73.5t235 172.5v-77q-35 -60 -133.5 -116.5t-200.5 -85.5q102 -29 200.5 -85.5t133.5 -116.5z" />
+<glyph unicode="&#x227b;" d="M621 286v-66q-171 -13 -322 -73.5t-235 -172.5v77q35 60 133.5 116.5t200.5 85.5q-102 29 -200.5 85.5t-133.5 116.5v77q84 -112 235 -172.5t322 -73.5z" />
+<glyph unicode="&#x227c;" d="M621 147v-77q-84 112 -235 172.5t-322 73.5v66q171 13 322 73.5t235 172.5v-77q-35 -60 -133.5 -116.5t-200.5 -85.5q102 -29 200.5 -85.5t133.5 -116.5zM621 -42v-78q-49 61 -122.5 108.5t-153 73.5t-148.5 40t-133 18v66q147 -6 304 -62.5t253 -165.5z" />
+<glyph unicode="&#x227d;" d="M621 383v-66q-171 -13 -322 -73.5t-235 -172.5v77q35 60 133.5 116.5t200.5 85.5q-102 29 -200.5 85.5t-133.5 116.5v77q84 -112 235 -172.5t322 -73.5zM621 187v-66q-64 -4 -133 -18t-148.5 -40t-153 -73.5t-122.5 -108.5v78q96 109 253 165.5t304 62.5z" />
+<glyph unicode="&#x227e;" d="M620 183v-77q-84 112 -235 172.5t-322 73.5v66q171 13 322 73.5t235 172.5v-77q-35 -60 -133.5 -116.5t-200.5 -85.5q102 -29 200.5 -85.5t133.5 -116.5zM604 50h33q-5 -74 -48 -139t-110 -65q-41 0 -95 32l-102 64q-49 32 -78 32q-49 0 -79 -39t-44 -99h-33 q4 81 48.5 142.5t114.5 61.5q41 0 95 -32l102 -64q49 -32 79 -32q88 0 117 138z" />
+<glyph unicode="&#x227f;" d="M622 418v-66q-171 -13 -322 -73.5t-235 -172.5v77q35 60 133.5 116.5t200.5 85.5q-102 29 -200.5 85.5t-133.5 116.5v77q84 -112 235 -172.5t322 -73.5zM604 50h33q-5 -74 -48 -139t-110 -65q-41 0 -95 32l-102 64q-49 32 -78 32q-49 0 -79 -39t-44 -99h-33 q4 81 48.5 142.5t114.5 61.5q41 0 95 -32l102 -64q49 -32 79 -32q88 0 117 138z" />
+<glyph unicode="&#x2280;" d="M621 51v-77q-83 111 -247 177l-124 -307h-54l131 324q-120 40 -263 52v66q197 16 345 84l119 292h54l-104 -256q90 54 143 126v-77q-44 -75 -181 -142l-41 -101q172 -76 222 -161zM353 231l21 52q-41 -16 -87 -30q15 -4 66 -22z" />
+<glyph unicode="&#x2281;" d="M621 286v-66q-194 -15 -344 -84l-119 -292h-54l104 256q-90 -54 -144 -126v77q43 74 182 142l40 100q-175 78 -222 162v77q83 -112 247 -178l125 308h54l-132 -325q128 -42 263 -51zM333 274l-21 -51q44 17 86 30q-34 10 -65 21z" />
+<glyph unicode="&#x2282;" d="M621 -25h-290q-116 0 -191.5 82.5t-75.5 196.5t76.5 195.5t193.5 81.5h287v-66h-287q-84 0 -144 -64.5t-60 -146.5t60.5 -147.5t144.5 -65.5h286v-66z" />
+<glyph unicode="&#x2283;" d="M64 531h287q117 0 193.5 -81.5t76.5 -195.5t-75.5 -196.5t-191.5 -82.5h-290v66h286q84 0 144.5 65.5t60.5 147.5t-60 146.5t-144 64.5h-287v66z" />
+<glyph unicode="&#x2284;" d="M623 -25h-291q-35 0 -73 10l-61 -141h-54l69 158q-68 34 -108 102.5t-40 149.5q0 114 76.5 195.5t193.5 81.5h109l57 131h54l-57 -131h125v-66h-154l-182 -417q21 -7 49 -7h287v-66zM415 465h-80q-84 0 -144 -64.5t-60 -146.5q0 -56 30 -107t80 -80z" />
+<glyph unicode="&#x2285;" d="M541 662l-69 -158q70 -34 110.5 -102t40.5 -148q0 -114 -75.5 -196.5t-191.5 -82.5h-115l-57 -131h-54l57 131h-122v66h151l182 418q-21 6 -45 6h-288v66h288q35 0 72 -10l62 141h54zM270 41h82q84 0 144.5 65.5t60.5 147.5q0 57 -31 108t-82 79z" />
+<glyph unicode="&#x2286;" d="M621 51h-290q-116 0 -191.5 82.5t-75.5 196.5t76.5 195.5t193.5 81.5h287v-66h-287q-84 0 -144 -64.5t-60 -146.5t60.5 -147.5t144.5 -65.5h286v-66zM621 -103h-548v66h548v-66z" />
+<glyph unicode="&#x2287;" d="M64 607h287q117 0 193.5 -81.5t76.5 -195.5t-75.5 -196.5t-191.5 -82.5h-290v66h286q84 0 144.5 65.5t60.5 147.5t-60 146.5t-144 64.5h-287v66zM612 -103h-548v66h548v-66z" />
+<glyph unicode="&#x2288;" d="M621 -103h-378l-47 -126h-54l47 126h-116v66h140l38 100q-85 26 -136 100t-51 167q0 114 76.5 195.5t193.5 81.5h119l46 123h54l-46 -123h114v-66h-138l-158 -424h296v-66h-290q-20 0 -30 1l-34 -89h354v-66zM429 541h-95q-84 0 -144 -64.5t-60 -146.5q0 -66 41 -123.5 t104 -79.5z" />
+<glyph unicode="&#x2289;" d="M547 730l-59 -160q62 -36 97.5 -100.5t35.5 -139.5q0 -114 -75.5 -196.5t-191.5 -82.5h-60l-33 -88h351v-66h-375l-47 -126h-54l47 126h-119v66h143l33 88h-176v66h201l153 411q-34 13 -67 13h-287v66h287q43 0 90 -15l52 138h54zM319 117h31q84 0 144.5 65.5t60.5 147.5 q0 50 -25 97t-67 77z" />
+<glyph unicode="&#x228a;" d="M621 71h-290q-116 0 -191.5 82.5t-75.5 196.5t76.5 195.5t193.5 81.5h287v-66h-287q-84 0 -144 -64.5t-60 -146.5t60.5 -147.5t144.5 -65.5h286v-66zM621 -120h-283l-60 -96h-59l60 96h-207v66h249l61 96h59l-61 -96h241v-66z" />
+<glyph unicode="&#x228b;" d="M64 627h287q117 0 193.5 -81.5t76.5 -195.5t-75.5 -196.5t-191.5 -82.5h-290v66h286q84 0 144.5 65.5t60.5 147.5t-60 146.5t-144 64.5h-287v66zM611 -120h-269l-60 -96h-59l60 96h-219v66h261l61 96h59l-61 -96h227v-66z" />
+<glyph unicode="&#x228c;" horiz-adv-x="620" d="M572 536v-296q0 -119 -75 -195t-187 -76q-113 0 -187.5 75t-74.5 193v299h66v-295q0 -86 57 -146t139 -60q80 0 138 60t58 145v296h66zM448 257h-104q-26 0 -26 -20q0 -14 14 -28q16 -17 49 -66l-20 -19q-10 11 -29 34l-28 33q-8 9 -25 26t-30 26t-33 20.5t-43 21.5v10 q28 12 48.5 23.5t41.5 30.5l29 27q9 8 34.5 39t33.5 40l20 -19q-34 -50 -49 -66q-14 -14 -14 -25q0 -7 9 -14.5t17 -7.5h105v-66z" />
+<glyph unicode="&#x228d;" horiz-adv-x="620" d="M572 536v-296q0 -119 -75 -195t-187 -76q-113 0 -187.5 75t-74.5 193v299h66v-295q0 -86 57 -146t139 -60q80 0 138 60t58 145v296h66zM374 290q0 -26 -17.5 -45t-45.5 -19q-29 0 -46.5 17.5t-17.5 46.5q0 27 19.5 45t44.5 18t44 -18t19 -45z" />
+<glyph unicode="&#x228e;" horiz-adv-x="620" d="M572 536v-296q0 -119 -75 -195t-187 -76q-113 0 -187.5 75t-74.5 193v299h66v-295q0 -86 57 -146t139 -60q80 0 138 60t58 145v296h66zM460 257h-117v-117h-66v117h-117v66h117v117h66v-117h117v-66z" />
+<glyph unicode="&#x228f;" d="M621 -25h-557v556h557v-66h-491v-424h491v-66z" />
+<glyph unicode="&#x2290;" d="M621 -25h-557v66h491v424h-491v66h557v-556z" />
+<glyph unicode="&#x2291;" d="M621 51h-557v556h557v-66h-491v-424h491v-66zM621 -103h-557v66h557v-66z" />
+<glyph unicode="&#x2292;" d="M621 51h-557v66h491v424h-491v66h557v-556zM621 -103h-557v66h557v-66z" />
+<glyph unicode="&#x2293;" horiz-adv-x="620" d="M572 -31h-66v501h-392v-501h-66v567h524v-567z" />
+<glyph unicode="&#x2294;" horiz-adv-x="620" d="M572 -31h-524v567h66v-501h392v501h66v-567z" />
+<glyph unicode="&#x2295;" horiz-adv-x="842" d="M792 252q0 -154 -108.5 -262.5t-262.5 -108.5t-262.5 108.5t-108.5 262.5t108.5 262.5t262.5 108.5t262.5 -108.5t108.5 -262.5zM454 285h270q-11 107 -87.5 183t-182.5 87v-270zM388 285v270q-106 -11 -182.5 -87t-87.5 -183h270zM724 219h-270v-270q106 11 182.5 87 t87.5 183zM388 -51v270h-270q11 -107 87.5 -183t182.5 -87z" />
+<glyph unicode="&#x2296;" horiz-adv-x="842" d="M792 252q0 -154 -108.5 -262.5t-262.5 -108.5t-262.5 108.5t-108.5 262.5t108.5 262.5t262.5 108.5t262.5 -108.5t108.5 -262.5zM118 285h606q-12 115 -99 193.5t-204 78.5t-204 -78.5t-99 -193.5zM724 219h-606q12 -115 99 -193.5t204 -78.5t204 78.5t99 193.5z" />
+<glyph unicode="&#x2297;" horiz-adv-x="842" d="M792 252q0 -154 -108.5 -262.5t-262.5 -108.5t-262.5 108.5t-108.5 262.5t108.5 262.5t262.5 108.5t262.5 -108.5t108.5 -262.5zM421 299l191 191q-83 67 -191 67t-191 -67zM468 252l191 -191q67 83 67 191t-67 191zM374 252l-191 191q-67 -83 -67 -191t67 -191zM612 14 l-191 191l-191 -191q83 -67 191 -67t191 67z" />
+<glyph unicode="&#x2298;" horiz-adv-x="842" d="M792 252q0 -154 -108.5 -262.5t-262.5 -108.5t-262.5 108.5t-108.5 262.5t108.5 262.5t262.5 108.5t262.5 -108.5t108.5 -262.5zM183 61l429 429q-83 67 -191 67q-126 0 -215.5 -89.5t-89.5 -215.5q0 -108 67 -191zM659 443l-429 -429q83 -67 191 -67q126 0 215.5 89.5 t89.5 215.5q0 108 -67 191z" />
+<glyph unicode="&#x2299;" horiz-adv-x="762" d="M712 252q0 -137 -97 -234t-234 -97t-234 97t-97 234t97 234t234 97t234 -97t97 -234zM646 252q0 110 -78 187.5t-187 77.5t-187 -77.5t-78 -187.5t78 -187.5t187 -77.5t187 77.5t78 187.5zM444 253q0 -26 -17.5 -45t-45.5 -19q-29 0 -46.5 17.5t-17.5 46.5q0 27 19.5 45 t44.5 18t44 -18t19 -45z" />
+<glyph unicode="&#x229a;" horiz-adv-x="842" d="M792 252q0 -154 -108.5 -262.5t-262.5 -108.5t-262.5 108.5t-108.5 262.5t108.5 262.5t262.5 108.5t262.5 -108.5t108.5 -262.5zM726 252q0 126 -89.5 215.5t-215.5 89.5t-215.5 -89.5t-89.5 -215.5t89.5 -215.5t215.5 -89.5t215.5 89.5t89.5 215.5zM554 252 q0 -56 -39.5 -95.5t-95.5 -39.5q-57 0 -96 39.5t-39 97.5q0 56 39.5 94.5t97.5 38.5q55 0 94 -39.5t39 -95.5zM488 252q0 29 -20 49t-47 20q-31 0 -51 -19.5t-20 -47.5q0 -31 19.5 -51t49.5 -20q29 0 49 20t20 49z" />
+<glyph unicode="&#x229b;" horiz-adv-x="842" d="M792 252q0 -154 -108.5 -262.5t-262.5 -108.5t-262.5 108.5t-108.5 262.5t108.5 262.5t262.5 108.5t262.5 -108.5t108.5 -262.5zM726 252q0 126 -89.5 215.5t-215.5 89.5t-215.5 -89.5t-89.5 -215.5t89.5 -215.5t215.5 -89.5t215.5 89.5t89.5 215.5zM612 165 q0 -43 -43 -43q-19 0 -35 18l-42 48q-26 30 -61 50q0 -43 16 -94.5t16 -63.5q0 -17 -13.5 -31t-28.5 -14q-16 0 -29 14t-13 31q0 12 16 63.5t16 94.5q-32 -19 -69.5 -60.5t-45.5 -46.5q-18 -9 -30 -9q-19 0 -30 10.5t-11 24.5q0 30 24 43q11 7 64.5 20.5t85.5 31.5 q-31 18 -85 30.5t-67 20.5q-22 13 -22 33q0 46 40 46q13 0 24 -7q12 -7 49.5 -47.5t72.5 -59.5q0 43 -16 96t-16 65q0 17 13 29t29 12t29 -12t13 -29q0 -12 -16 -64t-16 -95q34 18 56.5 40.5t36 40.5t24.5 24q11 7 24 7q40 0 40 -46q0 -21 -25 -35q-8 -4 -55 -13.5 t-93 -35.5q39 -23 89 -34.5t60 -17.5q24 -14 24 -35z" />
+<glyph unicode="&#x229c;" horiz-adv-x="842" d="M792 252q0 -154 -108.5 -262.5t-262.5 -108.5t-262.5 108.5t-108.5 262.5t108.5 262.5t262.5 108.5t262.5 -108.5t108.5 -262.5zM726 252q0 126 -89.5 215.5t-215.5 89.5t-215.5 -89.5t-89.5 -215.5t89.5 -215.5t215.5 -89.5t215.5 89.5t89.5 215.5zM634 297h-426v66h426 v-66zM634 143h-426v66h426v-66z" />
+<glyph unicode="&#x229d;" horiz-adv-x="842" d="M792 252q0 -154 -108.5 -262.5t-262.5 -108.5t-262.5 108.5t-108.5 262.5t108.5 262.5t262.5 108.5t262.5 -108.5t108.5 -262.5zM726 252q0 126 -89.5 215.5t-215.5 89.5t-215.5 -89.5t-89.5 -215.5t89.5 -215.5t215.5 -89.5t215.5 89.5t89.5 215.5zM634 219h-426v66h426 v-66z" />
+<glyph unicode="&#x229e;" horiz-adv-x="910" d="M865 -158h-820v820h820v-820zM799 278v318h-318v-318h318zM429 278v318h-318v-318h318zM799 -92v318h-318v-318h318zM429 -92v318h-318v-318h318z" />
+<glyph unicode="&#x229f;" horiz-adv-x="910" d="M865 -158h-820v820h820v-820zM799 278v318h-688v-318h688zM799 -92v318h-688v-318h688z" />
+<glyph unicode="&#x22a0;" horiz-adv-x="910" d="M865 -158h-820v820h820v-820zM762 596h-614l307 -307zM799 -56v615l-307 -308zM761 -92l-306 306l-306 -306h612zM418 251l-307 308v-615z" />
+<glyph unicode="&#x22a1;" horiz-adv-x="910" d="M518 252q0 -27 -18 -45.5t-45 -18.5q-29 0 -46.5 18t-17.5 46q0 26 19 44.5t45 18.5t44.5 -18.5t18.5 -44.5zM865 -157h-820v819h820v-819zM799 -91v687h-688v-687h688z" />
+<glyph unicode="&#x22a2;" d="M621 298h-491v-298h-66v662h66v-298h491v-66z" />
+<glyph unicode="&#x22a3;" d="M621 0h-66v298h-491v66h491v298h66v-662z" />
+<glyph unicode="&#x22a4;" d="M637 596h-262v-596h-66v596h-261v66h589v-66z" />
+<glyph unicode="&#x22a5;" d="M637 0h-589v66h262v596h66v-596h261v-66z" />
+<glyph unicode="&#x22a6;" horiz-adv-x="497" d="M433 298h-303v-298h-66v662h66v-298h303v-66z" />
+<glyph unicode="&#x22a7;" horiz-adv-x="498" d="M434 198h-304v-198h-66v662h66v-198h304v-66h-304v-134h304v-66z" />
+<glyph unicode="&#x22a8;" d="M621 198h-491v-198h-66v662h66v-198h491v-66h-491v-134h491v-66z" />
+<glyph unicode="&#x22a9;" horiz-adv-x="860" d="M814 298h-491v-298h-66v662h66v-298h491v-66zM123 0h-66v662h66v-662z" />
+<glyph unicode="&#x22aa;" horiz-adv-x="860" d="M815 298h-303v-298h-66v662h66v-298h303v-66zM312 0h-66v662h66v-662zM111 0h-66v662h66v-662z" />
+<glyph unicode="&#x22ab;" horiz-adv-x="860" d="M814 198h-491v-198h-66v662h66v-198h491v-66h-491v-134h491v-66zM123 0h-66v662h66v-662z" />
+<glyph unicode="&#x22ac;" horiz-adv-x="786" d="M723 662l-291 -298h290v-66h-354l-137 -141v-157h-66v89l-87 -89h-69l156 160v502h66v-298h132l291 298h69zM299 298h-68v-70z" />
+<glyph unicode="&#x22ad;" horiz-adv-x="786" d="M723 662l-193 -198h192v-66h-256l-131 -134h387v-66h-451l-40 -41v-157h-66v89l-87 -89h-69l156 160v502h66v-198h230l193 198h69zM397 398h-166v-134h35z" />
+<glyph unicode="&#x22ae;" horiz-adv-x="968" d="M922 298h-460l-31 -25v-273h-66v220l-134 -106v-114h-66v62l-78 -62h-78l156 123v539h66v-486l134 106v380h66v-298h37l376 298h78l-376 -298h376v-66z" />
+<glyph unicode="&#x22af;" horiz-adv-x="968" d="M922 198h-491v-198h-66v219l-134 -106v-113h-66v60l-76 -60h-80l156 124v538h66v-486l134 106v380h66v-198h162l249 198h80l-250 -198h250v-66h-333l-158 -126v-8h491v-66zM510 398h-79v-63z" />
+<glyph unicode="&#x22b0;" d="M317 254v-2q304 -29 304 -189q0 -47 -28 -77.5t-73 -30.5q-40 0 -68.5 25t-29.5 62h48q11 -38 48 -38q20 0 33.5 13t13.5 40q0 24 -13 44t-38.5 34.5t-50 24.5t-60.5 18t-55.5 11.5t-48.5 7.5q-46 7 -235 23v66q189 16 235 23q29 4 48.5 7.5t55.5 11.5t60.5 18t50 24.5 t38.5 34.5t13 44q0 27 -13.5 40t-33.5 13q-37 0 -48 -38h-48q1 37 29.5 62t68.5 25q45 0 73 -30.5t28 -77.5q0 -160 -304 -189z" />
+<glyph unicode="&#x22b1;" d="M621 286v-66q-189 -16 -235 -23q-29 -4 -48.5 -7.5t-55.5 -11.5t-60.5 -18t-50 -24.5t-38.5 -34.5t-13 -44q0 -27 13.5 -40t33.5 -13q37 0 48 38h48q-1 -37 -29.5 -62t-68.5 -25q-45 0 -73 30.5t-28 77.5q0 160 304 189v2q-304 29 -304 189q0 47 28 77.5t73 30.5 q40 0 68.5 -25t29.5 -62h-48q-11 38 -48 38q-20 0 -33.5 -13t-13.5 -40q0 -24 13 -44t38.5 -34.5t50 -24.5t60.5 -18t55.5 -11.5t48.5 -7.5q46 -7 235 -23z" />
+<glyph unicode="&#x22b2;" d="M631 -25l-607 278l607 278v-556zM565 80v346l-384 -173z" />
+<glyph unicode="&#x22b3;" d="M661 253l-607 -278v556zM504 253l-384 173v-346z" />
+<glyph unicode="&#x22b4;" d="M631 51l-607 278l607 278v-556zM565 156v346l-384 -173zM631 -103h-597v66h597v-66z" />
+<glyph unicode="&#x22b5;" d="M661 329l-607 -278v556zM504 329l-384 173v-346zM651 -103h-597v66h597v-66z" />
+<glyph unicode="&#x22b6;" horiz-adv-x="1145" d="M346 286h453q11 51 52 84t94 33q62 0 106 -44t44 -106t-44 -106t-106 -44q-53 0 -94 33t-52 84h-453q-11 -51 -52 -84t-94 -33q-62 0 -106 44t-44 106t44 106t106 44q53 0 94 -33t52 -84zM300 253q0 41 -29.5 70.5t-70.5 29.5t-70.5 -29.5t-29.5 -70.5t29.5 -70.5 t70.5 -29.5t70.5 29.5t29.5 70.5z" />
+<glyph unicode="&#x22b7;" horiz-adv-x="1145" d="M346 286h453q11 51 52 84t94 33q62 0 106 -44t44 -106t-44 -106t-106 -44q-53 0 -94 33t-52 84h-453q-11 -51 -52 -84t-94 -33q-62 0 -106 44t-44 106t44 106t106 44q53 0 94 -33t52 -84zM1045 253q0 41 -29.5 70.5t-70.5 29.5t-70.5 -29.5t-29.5 -70.5t29.5 -70.5 t70.5 -29.5t70.5 29.5t29.5 70.5z" />
+<glyph unicode="&#x22b8;" horiz-adv-x="849" d="M50 286h453q11 51 52 84t94 33q62 0 106 -44t44 -106t-44 -106t-106 -44q-53 0 -94 33t-52 84h-453v66zM749 253q0 41 -29.5 70.5t-70.5 29.5t-70.5 -29.5t-29.5 -70.5t29.5 -70.5t70.5 -29.5t70.5 29.5t29.5 70.5z" />
+<glyph unicode="&#x22b9;" d="M375 326h-66v221h66v-221zM636 220h-221v66h221v-66zM269 220h-221v66h221v-66zM375 -41h-66v221h66v-221z" />
+<glyph unicode="&#x22ba;" horiz-adv-x="480" d="M406 384h-123v-596h-86v596h-123v66h332v-66z" />
+<glyph unicode="&#x22bb;" horiz-adv-x="620" d="M590 536l-273 -565h-10l-275 565h65l215 -432l215 432h63zM572 -139h-524v66h524v-66z" />
+<glyph unicode="&#x22bc;" horiz-adv-x="620" d="M572 580h-524v66h524v-66zM590 -29h-63l-215 432l-215 -432h-65l275 565h10z" />
+<glyph unicode="&#x22bd;" horiz-adv-x="620" d="M590 536l-273 -565h-10l-275 565h65l215 -432l215 432h63zM572 580h-524v66h524v-66z" />
+<glyph unicode="&#x22be;" d="M634 0h-584v584h66v-173q133 -21 228.5 -116.5t116.5 -228.5h173v-66zM116 66h277q-20 105 -96.5 181.5t-180.5 96.5v-278z" />
+<glyph unicode="&#x22bf;" horiz-adv-x="911" d="M865 -158h-820l820 820v-820zM799 -92v595l-596 -595h596z" />
+<glyph unicode="&#x22c0;" horiz-adv-x="924" d="M870 -259h-76l-331 877h-2l-331 -877h-76l380 1022h56z" />
+<glyph unicode="&#x22c1;" horiz-adv-x="924" d="M870 763l-380 -1022h-56l-380 1022h76l331 -877h2l331 877h76z" />
+<glyph unicode="&#x22c2;" horiz-adv-x="924" d="M830 -254h-73v715q0 97 -87 170.5t-208 73.5t-208 -73.5t-87 -170.5v-715h-73v702q0 144 110.5 237t263.5 93q89 0 171 -40t136.5 -117.5t54.5 -172.5v-702z" />
+<glyph unicode="&#x22c3;" horiz-adv-x="924" d="M830 768v-702q0 -95 -54.5 -172.5t-136.5 -117.5t-171 -40q-153 0 -263.5 93t-110.5 237v702h73v-715q0 -97 87 -170.5t208 -73.5t208 73.5t87 170.5v715h73z" />
+<glyph unicode="&#x22c4;" horiz-adv-x="523" d="M497 252l-236 -236l-235 236l235 236zM404 252l-143 143l-142 -143l142 -143z" />
+<glyph unicode="&#x22c5;" horiz-adv-x="286" d="M203 253q0 -24 -17.5 -42t-41.5 -18t-42.5 18.5t-18.5 41.5t18.5 41.5t42.5 18.5t41.5 -18t17.5 -42z" />
+<glyph unicode="&#x22c6;" horiz-adv-x="700" d="M665 365l-226 -137l107 -241l-196 179l-196 -179l107 241l-226 137l262 -30l53 262l53 -262z" />
+<glyph unicode="&#x22c7;" d="M406 462q0 -26 -17.5 -45t-45.5 -19q-29 0 -46.5 17.5t-17.5 46.5q0 27 19.5 45t44.5 18t44 -18t19 -45zM634 8l-46 -46l-245 244l-246 -244l-46 46l211 211h-211v66h213l-213 214l46 46l246 -245l245 245l46 -46l-212 -214h212v-66h-210zM406 45q0 -26 -19 -45t-45 -19 q-25 0 -44 19.5t-19 44.5q0 29 18.5 46t44.5 17q27 0 45.5 -16.5t18.5 -46.5z" />
+<glyph unicode="&#x22c8;" horiz-adv-x="810" d="M756 -80l-351 285l-351 -285v662l351 -285l351 285v-662zM690 58v386l-239 -193zM359 251l-239 193v-386z" />
+<glyph unicode="&#x22c9;" horiz-adv-x="810" d="M716 -80l-312 287l-311 -287v662l311 -286l312 286v-88l-263 -243l263 -244v-87zM356 251l-197 182v-363z" />
+<glyph unicode="&#x22ca;" horiz-adv-x="810" d="M716 -80l-311 287l-312 -287v87l263 244l-263 243v88l312 -286l311 286v-662zM650 70v363l-197 -182z" />
+<glyph unicode="&#x22cb;" horiz-adv-x="810" d="M736 -34l-46 -46l-285 285l-285 -285l-46 46l285 285l-285 285l46 46z" />
+<glyph unicode="&#x22cc;" horiz-adv-x="810" d="M736 -34l-46 -46l-285 285l-285 -285l-46 46l616 616l46 -46l-285 -285z" />
+<glyph unicode="&#x22cd;" d="M637 231h-33q-29 138 -117 138q-30 0 -79 -32l-102 -64q-54 -32 -95 -32q-70 0 -114.5 61.5t-48.5 142.5h33q14 -60 44 -99t79 -39q29 0 78 32l102 64q54 32 95 32q67 0 110 -65t48 -139zM637 55h-589v66h589v-66z" />
+<glyph unicode="&#x22ce;" horiz-adv-x="580" d="M472 532h77q-103 -102 -158 -247.5t-68 -309.5h-66q-13 164 -68 309.5t-158 247.5h77q130 -153 182 -334q52 181 182 334z" />
+<glyph unicode="&#x22cf;" horiz-adv-x="580" d="M549 -25h-77q-130 153 -182 334q-52 -181 -182 -334h-77q103 102 158 247.5t68 309.5h66q13 -164 68 -309.5t158 -247.5z" />
+<glyph unicode="&#x22d0;" d="M621 -25h-290q-116 0 -191.5 82.5t-75.5 196.5t76.5 195.5t193.5 81.5h287v-66h-287q-84 0 -144 -64.5t-60 -146.5t60.5 -147.5t144.5 -65.5h286v-66zM621 118h-285q-56 0 -93 40t-37 96t38 95t92 39h285v-66h-284q-26 0 -45.5 -21t-19.5 -47q0 -27 20 -48.5t46 -21.5 h283v-66z" />
+<glyph unicode="&#x22d1;" d="M64 531h287q117 0 193.5 -81.5t76.5 -195.5t-75.5 -196.5t-191.5 -82.5h-290v66h286q84 0 144.5 65.5t60.5 147.5t-60 146.5t-144 64.5h-287v66zM64 388h285q54 0 92 -39t38 -95t-37 -96t-93 -40h-285v66h283q27 0 46.5 21.5t19.5 48.5q0 26 -19.5 47t-45.5 21h-284v66z " />
+<glyph unicode="&#x22d2;" horiz-adv-x="620" d="M433 536v-299q0 -58 -34 -94t-89 -36q-54 0 -88.5 36.5t-34.5 93.5v299h66v-298q0 -28 15 -46.5t42 -18.5t42 18.5t15 47.5v297h66zM572 536v-299q0 -118 -74.5 -193t-187.5 -75q-112 0 -187 76t-75 195v296h66v-296q0 -85 58 -145t138 -60q82 0 139 60t57 146v295h66z " />
+<glyph unicode="&#x22d3;" horiz-adv-x="620" d="M572 -31h-66v295q0 86 -57 146t-139 60q-80 0 -138 -60t-58 -145v-296h-66v296q0 119 75 195t187 76q113 0 187.5 -75t74.5 -193v-299zM433 -31h-66v297q0 29 -15 47.5t-42 18.5t-42 -18.5t-15 -46.5v-298h-66v299q0 57 34.5 93.5t88.5 36.5q55 0 89 -36t34 -94v-299z " />
+<glyph unicode="&#x22d4;" horiz-adv-x="620" d="M572 -31h-66v296q0 76 -47 133t-116 70v-499h-66v499q-70 -12 -116.5 -70t-46.5 -134v-295h-66v299q0 109 64 182t165 84v97h66v-97q100 -12 164.5 -86t64.5 -183v-296z" />
+<glyph unicode="&#x22d5;" d="M637 120h-161v-309h-66v309h-134v-309h-66v309h-162v66h162v134h-162v66h162v304h66v-304h134v304h66v-304h161v-66h-161v-134h161v-66zM410 186v134h-134v-134h134z" />
+<glyph unicode="&#x22d6;" d="M621 -24l-565 273v10l565 275v-65l-432 -215l432 -215v-63zM539 253q0 -28 -18.5 -48t-48.5 -20t-49 18.5t-19 49.5q0 29 20.5 48t47.5 19t47 -19t20 -48z" />
+<glyph unicode="&#x22d7;" d="M621 249l-565 -273v63l432 215l-432 215v65l565 -275v-10zM273 253q0 -31 -19 -49.5t-49 -18.5t-48.5 20t-18.5 48q0 29 20 48t47 19t47.5 -19t20.5 -48z" />
+<glyph unicode="&#x22d8;" horiz-adv-x="1274" d="M610 -24l-565 273v10l565 275v-65l-432 -215l432 -215v-63zM920 -24l-565 273v10l565 275v-65l-432 -215l432 -215v-63zM1229 -24l-565 273v10l565 275v-65l-432 -215l432 -215v-63z" />
+<glyph unicode="&#x22d9;" horiz-adv-x="1274" d="M610 249l-565 -273v63l432 215l-432 215v65l565 -275v-10zM919 249l-565 -273v63l432 215l-432 215v65l565 -275v-10zM1229 249l-565 -273v63l432 215l-432 215v65l565 -275v-10z" />
+<glyph unicode="&#x22da;" d="M621 393l-565 214v10l565 213v-65l-406 -153l406 -156v-63zM621 220h-565v66h565v-66zM621 -111l-565 -213v63l406 155l-406 154v65l565 -214v-10z" />
+<glyph unicode="&#x22db;" d="M621 607l-565 -214v63l406 156l-406 153v65l565 -213v-10zM621 220h-565v66h565v-66zM621 -324l-565 213v10l565 214v-65l-406 -154l406 -155v-63z" />
+<glyph unicode="&#x22dc;" d="M621 541h-557v66h557v-66zM621 -103l-557 274v10l557 273v-67l-421 -211l421 -212v-67z" />
+<glyph unicode="&#x22dd;" d="M621 541h-557v66h557v-66zM621 170l-557 -273v67l421 211l-421 212v67l557 -274v-10z" />
+<glyph unicode="&#x22de;" d="M621 -44v-77q-84 112 -235 172.5t-322 73.5v66q171 13 322 73.5t235 172.5v-77q-35 -60 -133.5 -116.5t-200.5 -85.5q102 -29 200.5 -85.5t133.5 -116.5zM621 627v-78q-96 -109 -253 -165.5t-304 -62.5v66q64 4 133 18t148.5 40t153 73.5t122.5 108.5z" />
+<glyph unicode="&#x22df;" d="M621 191v-66q-171 -13 -322 -73.5t-235 -172.5v77q35 60 133.5 116.5t200.5 85.5q-102 29 -200.5 85.5t-133.5 116.5v77q84 -112 235 -172.5t322 -73.5zM621 387v-66q-147 6 -304 62.5t-253 165.5v78q49 -61 122.5 -108.5t153 -73.5t148.5 -40t133 -18z" />
+<glyph unicode="&#x22e0;" d="M621 -43v-77q-87 118 -271 183l-95 -292h-53l100 308q-112 31 -238 41v66q139 -10 258 -44l37 113q-132 50 -295 62v66q208 15 367 93l82 254h53l-71 -217q79 52 126 115v-67q-61 -78 -153 -132l-44 -136q119 -58 197 -155v-67q-76 102 -216 165l-35 -109 q168 -59 251 -170zM378 313l27 85q-73 -32 -158 -48q74 -15 131 -37z" />
+<glyph unicode="&#x22e1;" d="M621 186v-66q-228 -18 -383 -98l-73 -251h-53l62 214q-67 -46 -110 -105v77q50 68 137 119l42 142q-114 -59 -179 -147v67q80 101 201 157l29 97q-142 57 -230 169v67q83 -113 247 -177l82 279h53l-87 -297q122 -40 262 -50v-66q-175 -13 -317 -71l-41 -138 q142 62 358 78zM341 374l-16 -54q55 18 113 30q-50 9 -97 24z" />
+<glyph unicode="&#x22e2;" d="M622 -103h-382l-47 -126h-54l47 126h-121v66h145l33 88h-178v556h385l46 123h54l-46 -123h118v-66h-142l-158 -424h300v-66h-325l-33 -88h358v-66zM425 541h-294v-424h137z" />
+<glyph unicode="&#x22e3;" d="M622 -103h-375l-47 -126h-54l47 126h-128v66h152l33 88h-185v66h210l157 424h-367v66h392l46 123h54l-46 -123h111v-556h-318l-33 -88h351v-66zM556 117v424h-69l-158 -424h227z" />
+<glyph unicode="&#x22e4;" d="M621 71h-557v556h557v-66h-491v-424h491v-66zM621 -120h-282l-60 -96h-59l60 96h-216v66h258l61 96h59l-61 -96h240v-66z" />
+<glyph unicode="&#x22e5;" d="M621 71h-557v66h491v424h-491v66h557v-556zM621 -120h-279l-60 -96h-59l60 96h-219v66h261l61 96h59l-61 -96h237v-66z" />
+<glyph unicode="&#x22e6;" d="M621 111l-565 273v10l565 275v-65l-432 -215l432 -215v-63zM604 20h33q-5 -74 -48 -139t-110 -65q-50 0 -137 58l-72 -153h-55l85 181q-66 42 -96 42q-49 0 -79 -39t-44 -99h-33q4 81 48.5 142.5t114.5 61.5q48 0 118 -45l67 140h55l-80 -168q82 -55 116 -55 q88 0 117 138z" />
+<glyph unicode="&#x22e7;" d="M621 384l-565 -273v63l432 215l-432 215v65l565 -275v-10zM604 20h33q-5 -74 -48 -139t-110 -65q-51 0 -134 55l-70 -150h-55l84 179q-68 44 -100 44q-49 0 -79 -39t-44 -99h-33q4 81 48.5 142.5t114.5 61.5q48 0 122 -48l68 143h55l-81 -171q79 -52 112 -52 q88 0 117 138z" />
+<glyph unicode="&#x22e8;" d="M621 189v-77q-84 112 -235 172.5t-322 73.5v66q171 13 322 73.5t235 172.5v-77q-35 -60 -133.5 -116.5t-200.5 -85.5q102 -29 200.5 -85.5t133.5 -116.5zM604 20h33q-5 -74 -48 -139t-110 -65q-51 0 -138 58l-72 -153h-55l85 182q-62 41 -95 41q-49 0 -79 -39t-44 -99 h-33q4 81 48.5 142.5t114.5 61.5q48 0 118 -45l66 140h55l-79 -168q82 -55 116 -55q88 0 117 138z" />
+<glyph unicode="&#x22e9;" d="M621 424v-66q-171 -13 -322 -73.5t-235 -172.5v77q35 60 133.5 116.5t200.5 85.5q-102 29 -200.5 85.5t-133.5 116.5v77q84 -112 235 -172.5t322 -73.5zM604 20h33q-5 -74 -48 -139t-110 -65q-50 0 -135 56l-71 -151h-55l84 180q-64 43 -98 43q-49 0 -79 -39t-44 -99h-33 q4 81 48.5 142.5t114.5 61.5q49 0 121 -47l67 142h55l-80 -170q80 -53 113 -53q88 0 117 138z" />
+<glyph unicode="&#x22ea;" horiz-adv-x="635" d="M581 -25l-279 139l-111 -270h-54l120 292l-233 117l354 177l96 232h54l-82 -198l135 67v-556zM515 80v346l-106 -53l-82 -200zM341 339l-172 -85v-2l113 -56z" />
+<glyph unicode="&#x22eb;" horiz-adv-x="635" d="M611 253l-358 -179l-95 -230h-54l81 196l-131 -65v556l276 -138l111 269h54l-120 -291zM466 252v2l-116 57l-60 -147zM305 333l-185 93v-346l102 51z" />
+<glyph unicode="&#x22ec;" horiz-adv-x="635" d="M581 -103h-355l-43 -126h-53l43 126h-149v66h171l82 239l-253 127l358 179l76 222h53l-66 -191l136 68v-556l-259 129l-74 -217h333v-66zM515 156v346l-99 -50l-73 -211zM352 421l-183 -91v-2l129 -65z" />
+<glyph unicode="&#x22ed;" horiz-adv-x="635" d="M611 -103h-385l-36 -126h-53l36 126h-119v66h138l53 183l-191 -95v556l283 -142l77 265h53l-83 -288l227 -113l-304 -152l-62 -214h366v-66zM466 328v2l-100 50l-35 -119zM319 403l-199 99v-346l149 74z" />
+<glyph unicode="&#x22ee;" horiz-adv-x="511" d="M319 543q0 -26 -17.5 -45t-45.5 -19q-29 0 -46.5 17.5t-17.5 46.5q0 27 19.5 45t44.5 18t44 -18t19 -45zM319 252q0 -26 -17.5 -45t-45.5 -19q-29 0 -46.5 17.5t-17.5 46.5q0 27 19.5 45t44.5 18t44 -18t19 -45zM319 -40q0 -26 -17.5 -45t-45.5 -19q-29 0 -46.5 17.5 t-17.5 46.5q0 27 19.5 45t44.5 18t44 -18t19 -45z" />
+<glyph unicode="&#x22ef;" horiz-adv-x="926" d="M818 253q0 -26 -17.5 -45t-45.5 -19q-29 0 -46.5 17.5t-17.5 46.5q0 27 19.5 45t44.5 18t44 -18t19 -45zM526 253q0 -26 -17.5 -45t-45.5 -19q-29 0 -46.5 17.5t-17.5 46.5q0 27 19.5 45t44.5 18t44 -18t19 -45zM235 253q0 -26 -17.5 -45t-45.5 -19q-29 0 -46.5 17.5 t-17.5 46.5q0 27 19.5 45t44.5 18t44 -18t19 -45z" />
+<glyph unicode="&#x22f0;" horiz-adv-x="926" d="M732 457q0 -26 -17.5 -45t-45.5 -19q-29 0 -46.5 17.5t-17.5 46.5q0 27 19.5 45t44.5 18t44 -18t19 -45zM528 252q0 -26 -17.5 -45t-45.5 -19q-29 0 -46.5 17.5t-17.5 46.5q0 27 19.5 45t44.5 18t44 -18t19 -45zM321 46q0 -26 -17.5 -45t-45.5 -19q-29 0 -46.5 17.5 t-17.5 46.5q0 27 19.5 45t44.5 18t44 -18t19 -45z" />
+<glyph unicode="&#x22f1;" horiz-adv-x="926" d="M321 457q0 -26 -17.5 -45t-45.5 -19q-29 0 -46.5 17.5t-17.5 46.5q0 27 19.5 45t44.5 18t44 -18t19 -45zM732 46q0 -26 -17.5 -45t-45.5 -19q-29 0 -46.5 17.5t-17.5 46.5q0 27 19.5 45t44.5 18t44 -18t19 -45zM525 252q0 -26 -17.5 -45t-45.5 -19q-29 0 -46.5 17.5 t-17.5 46.5q0 27 19.5 45t44.5 18t44 -18t19 -45z" />
+<glyph unicode="&#x22f2;" horiz-adv-x="823" d="M763 -27h-291q-108 0 -184 71.5t-88 174.5h-145v66h145q12 103 86.5 174.5t182.5 71.5h294v-66h-290q-75 0 -134 -53.5t-72 -126.5h496v-66h-497q13 -73 72 -126.5t134 -53.5h291v-66z" />
+<glyph unicode="&#x22f3;" d="M625 -27h-291q-118 0 -196 82.5t-78 196.5t77 196.5t194 82.5h294v-66h-290q-75 0 -134 -53.5t-72 -126.5h430v113h66v-292h-66v113h-431q13 -73 72 -126.5t134 -53.5h291v-66z" />
+<glyph unicode="&#x22f4;" horiz-adv-x="486" d="M420 45h-149q-92 0 -150.5 59.5t-58.5 147.5t59 147.5t152 59.5h147v-66h-147q-125 0 -144 -108h225v72h66v-210h-66v72h-225q21 -108 145 -108h146v-66z" />
+<glyph unicode="&#x22f5;" d="M625 -27h-291q-118 0 -196 82.5t-78 196.5t77 196.5t194 82.5h294v-66h-290q-75 0 -134 -53.5t-72 -126.5h496v-66h-497q13 -73 72 -126.5t134 -53.5h291v-66zM426 653q0 -26 -17.5 -45t-45.5 -19q-29 0 -46.5 17.5t-17.5 46.5q0 27 19.5 45t44.5 18t44 -18t19 -45z" />
+<glyph unicode="&#x22f6;" d="M625 -27h-291q-118 0 -196 82.5t-78 196.5t77 196.5t194 82.5h294v-66h-290q-75 0 -134 -53.5t-72 -126.5h496v-66h-497q13 -73 72 -126.5t134 -53.5h291v-66zM625 619h-555v66h555v-66z" />
+<glyph unicode="&#x22f7;" horiz-adv-x="486" d="M420 45h-149q-92 0 -150.5 59.5t-58.5 147.5t59 147.5t152 59.5h147v-66h-147q-125 0 -144 -108h291v-66h-291q21 -108 145 -108h146v-66zM420 547h-340v66h340v-66z" />
+<glyph unicode="&#x22f8;" d="M625 -26h-294q-117 0 -194 82.5t-77 196.5t78 196.5t196 82.5h291v-66h-291q-75 0 -134 -53.5t-72 -126.5h497v-66h-496q13 -73 72 -126.5t134 -53.5h290v-66zM625 -180h-555v66h555v-66z" />
+<glyph unicode="&#x22f9;" d="M625 -27h-297q-116 0 -191.5 83t-75.5 197t76.5 196t193.5 82h294v-66h-294q-57 0 -105.5 -33t-75.5 -84h475v-66h-496q-2 -10 -2 -29q0 -11 2 -31h496v-66h-474q27 -52 75.5 -84.5t105.5 -32.5h293v-66z" />
+<glyph unicode="&#x22fa;" horiz-adv-x="823" d="M763 219h-145q-12 -103 -88 -174.5t-184 -71.5h-291v66h291q75 0 134 53.5t72 126.5h-497v66h496q-13 73 -72 126.5t-134 53.5h-290v66h294q108 0 182.5 -71.5t86.5 -174.5h145v-66z" />
+<glyph unicode="&#x22fb;" d="M59 531h294q117 0 194 -82.5t77 -196.5t-78 -196.5t-196 -82.5h-291v66h291q75 0 134 53.5t72 126.5h-431v-113h-66v292h66v-113h430q-13 73 -72 126.5t-134 53.5h-290v66z" />
+<glyph unicode="&#x22fc;" horiz-adv-x="486" d="M62 459h147q93 0 152 -59.5t59 -147.5t-58.5 -147.5t-150.5 -59.5h-149v66h146q124 0 145 108h-225v-72h-66v210h66v-72h225q-19 108 -144 108h-147v66z" />
+<glyph unicode="&#x22fd;" d="M61 531h294q117 0 194 -82.5t77 -196.5t-78 -196.5t-196 -82.5h-291v66h291q75 0 134 53.5t72 126.5h-497v66h496q-13 73 -72 126.5t-134 53.5h-290v66zM616 619h-555v66h555v-66z" />
+<glyph unicode="&#x22fe;" horiz-adv-x="486" d="M407 547h-340v66h340v-66zM67 459h147q93 0 152 -59.5t59 -147.5t-58.5 -147.5t-150.5 -59.5h-149v66h146q124 0 145 108h-291v66h291q-20 108 -144 108h-147v66z" />
+<glyph unicode="&#x22ff;" horiz-adv-x="560" d="M487 0h-414v662h414v-50h-348v-256h336v-50h-336v-256h348v-50z" />
+<glyph unicode="&#x2300;" horiz-adv-x="606" d="M581 487l-91 -90q50 -64 50 -145q0 -98 -68.5 -168t-166.5 -70q-85 0 -149 52l-53 -52h-78l92 91q-50 66 -50 147q0 98 70 166.5t168 68.5q83 0 146 -51l52 51h78zM165 152l239 237q-44 32 -99 32q-71 0 -121.5 -49.5t-50.5 -119.5q0 -56 32 -100zM442 350l-239 -237 q47 -33 102 -33q70 0 119.5 50.5t49.5 121.5q0 54 -32 98z" />
+<glyph unicode="&#x2302;" horiz-adv-x="926" d="M871 0h-816v408l408 366l408 -366v-408zM805 66v316l-342 300l-342 -300v-316h684z" />
+<glyph unicode="&#x2305;" horiz-adv-x="620" d="M572 511h-524v66h524v-66zM572 0h-72l-189 374h-2l-189 -374h-72l230 457h65z" />
+<glyph unicode="&#x2306;" horiz-adv-x="620" d="M572 511h-524v66h524v-66zM572 0h-72l-189 374h-2l-189 -374h-72l230 457h65zM572 662h-524v66h524v-66z" />
+<glyph unicode="&#x2308;" horiz-adv-x="469" d="M447 680h-109q-47 0 -65.5 -22.5t-18.5 -72.5v-798h-66v926h259v-33z" />
+<glyph unicode="&#x2309;" horiz-adv-x="469" d="M286 -213h-66v798q0 50 -18.5 72.5t-65.5 22.5h-109v33h259v-926z" />
+<glyph unicode="&#x230a;" horiz-adv-x="469" d="M447 -213h-259v926h66v-798q0 -50 18.5 -72.5t65.5 -22.5h109v-33z" />
+<glyph unicode="&#x230b;" horiz-adv-x="469" d="M286 -213h-259v33h109q47 0 65.5 22.5t18.5 72.5v798h66v-926z" />
+<glyph unicode="&#x230c;" horiz-adv-x="463" d="M118 100v66h294v-66h-294v-315h-66v315h66z" />
+<glyph unicode="&#x230d;" horiz-adv-x="463" d="M346 100h66v-315h-66v315h-294v66h294v-66z" />
+<glyph unicode="&#x230e;" horiz-adv-x="463" d="M118 561h-66v315h66v-315zM412 495h-294v66h294v-66z" />
+<glyph unicode="&#x230f;" horiz-adv-x="463" d="M412 561h-66v315h66v-315zM346 495h-294v66h294v-66z" />
+<glyph unicode="&#x2310;" horiz-adv-x="600" d="M552 327h-438v-212h-66v278h504v-66z" />
+<glyph unicode="&#x2311;" horiz-adv-x="523" d="M449 65q-77 37 -187 37q-112 0 -187 -37q37 75 37 187q0 110 -37 187q78 -38 187 -38q108 0 187 38q-38 -79 -38 -187q0 -109 38 -187zM394 120q-23 44 -23 132t23 132q-44 -23 -132 -23t-132 23q22 -44 22 -132t-22 -132q44 22 132 22t132 -22z" />
+<glyph unicode="&#x2312;" horiz-adv-x="762" d="M712 0h-66q0 110 -78 187.5t-187 77.5t-187 -77.5t-78 -187.5h-66q0 137 97 234t234 97t234 -97t97 -234z" />
+<glyph unicode="&#x2313;" horiz-adv-x="762" d="M712 0h-662q0 137 97 234t234 97t234 -97t97 -234zM124 66h513q-22 86 -93.5 142.5t-162.5 56.5t-163 -56.5t-94 -142.5z" />
+<glyph unicode="&#x2315;" horiz-adv-x="847" d="M26 -142l183 183q-75 91 -75 210q0 137 97 234t234 97t234 -97t97 -234t-97 -234t-234 -97q-119 0 -211 76l2 -2l-183 -183zM731 252q0 110 -77.5 187.5t-187.5 77.5t-187.5 -77.5t-77.5 -187.5t77.5 -187.5t187.5 -77.5t187.5 77.5t77.5 187.5z" />
+<glyph unicode="&#x2316;" horiz-adv-x="1100" d="M1047 218h-168q-12 -116 -96 -200t-199 -96v-168h-66v168q-116 12 -200.5 96.5t-96.5 199.5h-168v66h167q12 116 97 200.5t201 95.5v168h66v-168q116 -11 200 -95.5t95 -200.5h168v-66zM584 284h229q-11 88 -76 153t-153 77v-230zM518 284v230q-89 -12 -154.5 -77 t-76.5 -153h231zM812 218h-228v-230q87 11 151.5 76.5t76.5 153.5zM518 -12v230h-231q12 -88 77.5 -153.5t153.5 -76.5z" />
+<glyph unicode="&#x2317;" horiz-adv-x="1100" d="M1047 7h-252v-252h-66v252h-358v-252h-66v252h-252v66h252v358h-252v66h252v252h66v-252h358v252h66v-252h252v-66h-252v-358h252v-66zM729 73v358h-358v-358h358z" />
+<glyph unicode="&#x2318;" horiz-adv-x="926" d="M597 184h108q71 0 118.5 -49t47.5 -121q0 -73 -48.5 -121.5t-121.5 -48.5q-72 0 -121 47.5t-49 118.5v108h-136v-108q0 -71 -49 -118.5t-121 -47.5q-73 0 -121.5 48.5t-48.5 121.5q0 72 47.5 121t118.5 49h108v138h-108q-71 0 -118.5 49t-47.5 121q0 73 48.5 121.5 t121.5 48.5t121.5 -48.5t48.5 -121.5v-104h136v109q0 71 49 118t121 47q73 0 121.5 -48.5t48.5 -121.5q0 -72 -47.5 -121t-118.5 -49h-108v-138zM597 388h108q43 0 71.5 30t28.5 74q0 45 -29.5 74.5t-74.5 29.5q-44 0 -74 -29t-30 -75v-104zM329 388v104q0 45 -29.5 74.5 t-74.5 29.5t-74.5 -29.5t-29.5 -74.5q0 -44 28.5 -74t71.5 -30h108zM531 184v138h-136v-138h136zM597 118v-108q0 -43 30 -71.5t74 -28.5q45 0 74.5 29.5t29.5 74.5q0 44 -28.5 74t-71.5 30h-108zM329 10v108h-108q-43 0 -71.5 -30t-28.5 -74q0 -45 29.5 -74.5t74.5 -29.5 q44 0 74 28.5t30 71.5z" />
+<glyph unicode="&#x2319;" horiz-adv-x="600" d="M552 115h-504v278h66v-212h438v-66z" />
+<glyph unicode="&#x231a;" d="M471 671v-122q68 -36 109.5 -102.5t41.5 -145.5q0 -80 -41.5 -146.5t-109.5 -101.5v-122h-256v122q-68 35 -109.5 101.5t-41.5 146.5t41 146t110 102v122h256zM421 569v52h-156v-52h156zM555 274h-50v50h50q-9 86 -77 141l-110 -191h-141v50h115l96 167q-31 16 -70 21 v-50h-50v50q-74 -8 -127 -61t-61 -127h50v-50h-50q9 -73 61.5 -125.5t126.5 -61.5v50h50v-50q73 9 125.5 61.5t61.5 125.5zM421 -19v52h-156v-52h156z" />
+<glyph unicode="&#x231c;" horiz-adv-x="463" d="M411 596h-294v-315h-66v381h360v-66z" />
+<glyph unicode="&#x231d;" horiz-adv-x="463" d="M411 281h-66v315h-294v66h360v-381z" />
+<glyph unicode="&#x231e;" horiz-adv-x="463" d="M411 -217h-360v381h66v-315h294v-66z" />
+<glyph unicode="&#x231f;" horiz-adv-x="463" d="M412 -217h-360v66h294v315h66v-381z" />
+<glyph unicode="&#x2322;" horiz-adv-x="1019" d="M965 162l-10 -15q-173 128 -445 128q-144 0 -250 -31t-195 -97l-11 16q203 197 456 197q98 0 222.5 -51.5t232.5 -146.5z" />
+<glyph unicode="&#x2323;" horiz-adv-x="1019" d="M955 360l10 -15q-108 -95 -232.5 -146.5t-222.5 -51.5q-253 0 -456 197l11 16q89 -66 195 -97t250 -31q272 0 445 128z" />
+<glyph unicode="&#x2329;" horiz-adv-x="400" d="M335 713l-192 -462l191 -464h-52l-205 454v20l206 452h52z" />
+<glyph unicode="&#x232a;" horiz-adv-x="400" d="M323 240l-206 -453h-52l192 463l-191 463h52l205 -453v-20z" />
+<glyph unicode="&#x232c;" horiz-adv-x="926" d="M744 376l-33 -57l-314 181l33 58zM744 132l-314 -182l-33 58l314 181zM284 72h-66v363h66v-363zM843 34l-380 -220l-380 220v438l380 220l380 -220v-438zM777 72v362l-314 182l-314 -182v-362l314 -182z" />
+<glyph unicode="&#x232d;" horiz-adv-x="986" d="M931 559l-374 -647l-57 33l51 89q-30 -8 -58 -8q-77 0 -138 48t-81 121l-162 -283l-57 33l374 647l57 -33l-53 -90q23 8 60 8q77 0 137 -47t80 -122l164 284zM653 253q0 64 -47.5 111t-112.5 47q-64 0 -111.5 -47t-47.5 -111q0 -65 47.5 -112.5t111.5 -47.5 q65 0 112.5 47.5t47.5 112.5z" />
+<glyph unicode="&#x232e;" horiz-adv-x="624" d="M87 10l81 80q-44 60 -44 135q0 93 66 159t159 66t159 -66.5t66 -160.5t-65 -158.5t-160 -64.5q-78 0 -138 47l-80 -81q-7 -7 -7 -18q0 -19 31 -19q41 0 106 -15l-1 -28q-60 5 -106 5q-96 0 -165 -31l-7 7q31 74 31 168q0 44 -5 104l28 1q15 -84 15 -104q0 -35 21 -35 q6 0 15 9zM337 259h167q-12 53 -56 89t-99 36q-65 0 -112 -47t-47 -112q0 -49 26 -87zM504 193h-147l-98 -98q42 -29 90 -29q56 0 100 36.5t55 90.5z" />
+<glyph unicode="&#x2332;" horiz-adv-x="889" d="M809 242l-729 -298v618l729 -298v-22zM562 286l-416 172v-172h416zM562 220h-416v-172z" />
+<glyph unicode="&#x2336;" horiz-adv-x="926" d="M841 -156h-756v50h344v807h-344v50h756l-1 -50h-345v-807h346v-50z" />
+<glyph unicode="&#x233d;" horiz-adv-x="910" d="M488 683v-61q142 -13 240 -119t98 -251t-98 -251t-240 -119v-61h-66v61q-142 13 -240 119t-98 251t98 251t240 119v61h66zM488 555v-606q115 12 193.5 99t78.5 204t-78.5 204t-193.5 99zM422 -51v606q-115 -12 -193.5 -99t-78.5 -204t78.5 -204t193.5 -99z" />
+<glyph unicode="&#x233f;" horiz-adv-x="683" d="M623 233h-263l-149 -409h-57l148 409h-242v66h266l147 404h59l-148 -404h239v-66z" />
+<glyph unicode="&#x2340;" horiz-adv-x="683" d="M623 233h-242l148 -409h-57l-149 409h-263v66h239l-148 404h59l147 -404h266v-66z" />
+<glyph unicode="&#x2353;" horiz-adv-x="794" d="M739 -176h-684v927h684v-927zM673 146v539h-552v-539l276 478zM673 -110v117l-276 478l-276 -478v-117h552z" />
+<glyph unicode="&#x2370;" horiz-adv-x="794" d="M400 117h-17q2 72 44 177q51 126 51 187q0 51 -31.5 84.5t-77.5 33.5q-36 0 -65 -19t-29 -43q0 -19 19 -38.5t19 -35.5q0 -19 -11 -31t-30 -12q-21 0 -34.5 18t-13.5 48q0 62 46 102.5t118 40.5q75 0 128.5 -43.5t53.5 -114.5q0 -45 -20 -82.5t-85 -114.5 q-49 -59 -65 -157zM446 -2q0 -22 -15 -37.5t-37 -15.5q-25 0 -39.5 15.5t-14.5 37.5q0 23 15.5 38t38.5 15q21 0 36.5 -16t15.5 -37zM739 -176h-684v927h684v-927zM673 -110v795h-552v-795h552z" />
+<glyph unicode="&#x237c;" horiz-adv-x="871" d="M820 0h-504l-113 -100q-8 -6 -8 -15q0 -11 6.5 -18t17.5 -7q22 0 46 0.5t36 0.5q18 0 41 -3l14 -2v-32q-74 0 -112 -1.5t-90.5 -11.5t-96.5 -31l-7 8q16 45 22 98q4 35 4 79q0 60 -8 126l28 2q10 -37 16 -125q2 -33 20 -33q11 0 23 11l81 71v163l-158 96l158 130v178h66 v-124l150 124l47 -46l-197 -161v-160l153 -94l-65 -57h430v-66zM236 257v66l-46 -37zM346 114l-44 26v-65z" />
+<glyph unicode="&#x2393;" horiz-adv-x="913" d="M841 120h-213v66h213v-66zM841 320h-756v66h756v-66zM569 120h-213v66h213v-66zM298 120h-213v66h213v-66z" />
+<glyph unicode="&#x2394;" horiz-adv-x="926" d="M902 253l-220 -380h-438l-220 380l220 380h438zM826 253l-182 314h-362l-182 -314l182 -314h362z" />
+<glyph unicode="&#x23af;" horiz-adv-x="315" d="M315 220h-315v66h315v-66z" />
+<glyph unicode="&#x23b4;" horiz-adv-x="926" d="M871 574h-66v126h-684v-126h-66v192h816v-192z" />
+<glyph unicode="&#x23b5;" horiz-adv-x="926" d="M871 -83h-816v192h66v-126h684v126h66v-192z" />
+<glyph unicode="&#x23b6;" horiz-adv-x="926" d="M871 303h-816v192h66v-126h684v126h66v-192zM871 11h-66v126h-684v-126h-66v192h816v-192z" />
+<glyph unicode="&#x23ce;" horiz-adv-x="926" d="M856 731v-486q0 -128 -87 -222t-232 -94h-101v-144l-20 -10q-52 52 -111 98t-139 102l-116 82v10q38 29 115.5 82.5t138 100.5t112.5 99l20 -10v-144h27q80 0 103.5 29.5t23.5 103.5v403h266zM806 265v416h-166v-348q0 -26 -0.5 -39.5t-4 -37t-10.5 -36.5t-20.5 -29.5 t-33 -25t-49.5 -14.5t-69 -6h-67v105l-165 -115q-58 -40 -58 -73q0 -18 14.5 -33.5t43.5 -38.5l165 -128v117h145q122 0 198.5 76.5t76.5 209.5z" />
+<glyph unicode="&#x23d0;" horiz-adv-x="511" d="M288 101h-66v304h66v-304z" />
+<glyph unicode="&#x23dc;" horiz-adv-x="556" d="M566 -152h-28q-53 73 -120.5 112.5t-139.5 39.5q-151 0 -260 -152h-28q42 101 122.5 154t165.5 53q71 0 155.5 -54t132.5 -153z" />
+<glyph unicode="&#x23dd;" horiz-adv-x="556" d="M538 771h28q-48 -99 -132.5 -153t-155.5 -54q-85 0 -165.5 53t-122.5 154h28q109 -152 260 -152q72 0 139.5 39.5t120.5 112.5z" />
+<glyph unicode="&#x23de;" horiz-adv-x="556" d="M566 -88h-25q-19 91 -77 91q-8 0 -27.5 -1.5t-29.5 -1.5h-36q-34 0 -56.5 15t-35.5 56h-2q-23 -71 -92 -71h-37q-9 0 -29.5 1.5t-27.5 1.5q-34 0 -50.5 -24t-25.5 -67h-25q22 143 142 143h69q61 0 67 62h19q7 -62 68 -62h69q119 0 142 -143z" />
+<glyph unicode="&#x23df;" horiz-adv-x="556" d="M541 769h25q-23 -143 -142 -143h-69q-61 0 -68 -62h-19q-6 62 -67 62h-69q-120 0 -142 143h25q9 -43 25.5 -67t50.5 -24q7 0 27.5 1.5t29.5 1.5h37q69 0 92 -71h2q13 41 35.5 56t56.5 15h36q10 0 29.5 -1.5t27.5 -1.5q58 0 77 91z" />
+<glyph unicode="&#x23e0;" horiz-adv-x="926" d="M929 -212l-240 212h-452l-240 -211v52l217 225h498l217 -226v-52z" />
+<glyph unicode="&#x23e1;" horiz-adv-x="926" d="M929 789l-217 -225h-498l-217 226v52l240 -212h452l240 211v-52z" />
+<glyph unicode="&#x23e2;" horiz-adv-x="1144" d="M1090 -53h-1036l70 611h652zM986 13l-246 479h-557l-56 -479h859z" />
+<glyph unicode="&#x23e3;" horiz-adv-x="910" d="M828 36l-373 -214l-373 214v430l373 214l373 -214v-430zM762 73v353l-307 178l-307 -178v-353l308 -175zM679 253q0 -92 -65.5 -157.5t-158.5 -65.5t-158.5 65.5t-65.5 157.5q0 93 65.5 160t158.5 67t158.5 -67t65.5 -160zM627 253q0 71 -52.5 123t-119.5 52 q-72 0 -122 -51.5t-50 -123.5t49.5 -121.5t122.5 -49.5q67 0 119.5 51t52.5 120z" />
+<glyph unicode="&#x23e4;" horiz-adv-x="1094" d="M1047 220h-1000v66h1000v-66z" />
+<glyph unicode="&#x23e5;" horiz-adv-x="1018" d="M995 527l-312 -547h-660l313 547h659zM883 461h-511l-235 -415h509z" />
+<glyph unicode="&#x23e6;" horiz-adv-x="926" d="M464 286h407q-5 -68 -72.5 -141t-137.5 -73q-28 0 -54 11t-54.5 37t-45.5 44t-49 56h-403q4 76 69 145t137 69q28 0 54 -11t54.5 -37t45.5 -44t49 -56zM815 220h-293q79 -82 150 -82q34 0 74 23.5t69 58.5zM109 286h291q-79 81 -149 82q-35 0 -74.5 -23.5t-67.5 -58.5z " />
+<glyph unicode="&#x23e7;" horiz-adv-x="798" d="M733 383l-243 -107q2 -12 2 -17q0 -31 -20 -54l141 -277l-40 -19l-136 271q-11 -5 -28 -5q-20 0 -35 7l-141 -279l-39 19l146 290q-14 20 -14 47q0 39 33 65l-56 274l42 8l54 -266h9q39 0 62 -26l247 108zM306 377l-27 -98l-71 81l30 1l-38 203l42 9l38 -203z" />
+<glyph unicode="&#x2423;" horiz-adv-x="500" d="M460 -120h-420v136h30v-76h360v76h30v-136z" />
+<glyph unicode="&#x2460;" horiz-adv-x="684" d="M435 141h-175v20q34 1 46.5 9.5t12.5 27.5v240q0 20 -16 20q-15 0 -29 -5l-18 -7v20l113 51l6 -2v-327q0 -15 12.5 -21t47.5 -6v-20zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5z M642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x2461;" horiz-adv-x="684" d="M490 227l-41 -86h-247v19l112 95q83 71 83 138q0 33 -23.5 51.5t-63.5 18.5q-33 0 -51 -17t-39 -60l-19 7q28 124 135 124q53 0 85 -29.5t32 -73.5q0 -72 -80 -141l-92 -78h129q20 0 32.5 8t27.5 31zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244 q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x2462;" horiz-adv-x="684" d="M240 411l-20 6q37 100 129 100q45 0 72 -22.5t27 -58.5q0 -44 -48 -74q70 -26 70 -96q0 -65 -53 -98.5t-124 -33.5q-72 0 -72 38q0 12 8 19.5t20 7.5t39 -16t53 -16q34 0 58 21.5t24 53.5q0 54 -65 68q-20 4 -66 4v21q36 10 55 18q49 24 49 69q0 49 -66 49 q-30 0 -50.5 -14.5t-39.5 -45.5zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x2463;" horiz-adv-x="684" d="M464 228h-63v-87h-56v87h-178v45l201 244h33v-241h63v-48zM345 276v171l-142 -171h142zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89 t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x2464;" horiz-adv-x="684" d="M464 522l-25 -50q-6 -12 -21 -12h-120l-20 -33q89 -16 132.5 -46t43.5 -100t-48 -108.5t-122 -38.5q-37 0 -59 10t-22 28q0 30 30 30q19 0 47 -18q23 -16 44 -16q33 0 58.5 26.5t25.5 59.5q0 56 -52 84.5t-123 28.5q-11 0 -11 10q0 3 3 9l70 131h122q17 0 29 15zM684 330 q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x2465;" horiz-adv-x="684" d="M452 517v-25q-154 -24 -182 -132q38 23 77 23q56 0 87.5 -32t31.5 -88t-38 -92.5t-94 -36.5q-66 0 -107 42.5t-41 107.5q0 93 73 161q41 36 82.5 51t110.5 21zM406 245q0 101 -81 101q-74 0 -74 -59t23 -91.5t67 -32.5q65 0 65 82zM684 330q0 -145 -99 -244.5t-242 -99.5 q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x2466;" horiz-adv-x="684" d="M472 500l-136 -366h-46l124 327h-129q-27 0 -40.5 -8.5t-33.5 -36.5l-18 9l44 92h235v-17zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89 t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x2467;" horiz-adv-x="684" d="M474 232q0 -44 -37 -71t-95 -27q-56 0 -90.5 22.5t-34.5 62.5q0 60 77 107q-43 32 -56.5 51.5t-13.5 48.5q0 41 34.5 66t89.5 25q47 0 77 -23t30 -56q0 -32 -16.5 -51.5t-58.5 -39.5q53 -32 73.5 -57t20.5 -58zM409 432q0 26 -18 41t-49 15t-50 -12.5t-19 -34.5t18 -39 t60 -39q32 17 45 32t13 37zM357 288l-36 21q-50 -34 -50 -79q0 -67 79 -67q30 0 49 12.5t19 35.5q0 42 -61 77zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5 t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x2468;" horiz-adv-x="684" d="M229 134v25q147 22 184 133q-35 -28 -90 -28q-52 0 -83 32.5t-31 85.5q0 58 37.5 96.5t94.5 38.5q66 0 103.5 -47t37.5 -114q0 -99 -77 -159q-38 -30 -75 -42.5t-101 -20.5zM417 333v34q0 65 -20 93t-61 28q-33 0 -50 -25t-17 -63q0 -46 20.5 -72.5t55.5 -26.5q26 0 49 8 t23 24zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24b6;" horiz-adv-x="684" d="M544 141h-147v23q38 2 38 14q0 16 -9 33l-23 45h-148l-26 -55q-5 -12 -5 -20q0 -17 38 -17v-23h-116v23q25 3 36 17t36 71l120 272h9l144 -313q12 -26 22 -35t31 -12v-23zM389 293l-60 137h-1l-59 -137h120zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100 t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24b7;" horiz-adv-x="684" d="M170 517h170q78 0 118.5 -25.5t40.5 -72.5q0 -62 -57 -80q82 -26 82 -94q0 -47 -41.5 -75.5t-107.5 -28.5h-205v23q35 1 43 9t8 37v239q0 29 -7.5 36t-43.5 9v23zM291 354h54q45 0 64.5 15t19.5 47q0 67 -100 67h-25q-13 0 -13 -10v-119zM291 317v-124q0 -18 37 -18 q56 0 86 14t30 57q0 25 -10.5 40t-32.5 21.5t-39.5 8t-48.5 1.5h-22zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215 q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24b8;" horiz-adv-x="684" d="M527 226l17 -14q-64 -78 -182 -78q-93 0 -154.5 51.5t-61.5 140.5t63.5 143.5t152.5 54.5q42 0 89 -11q22 -6 33 -6q22 0 28 17h14l5 -137h-22q-11 47 -46.5 74.5t-85.5 27.5q-71 0 -112.5 -42.5t-41.5 -111.5q0 -78 42 -121t119 -43q42 0 73.5 12.5t69.5 42.5zM684 330 q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24b9;" horiz-adv-x="684" d="M138 517h168q239 0 239 -184q0 -90 -61 -141t-171 -51h-175v23q34 2 42.5 8.5t8.5 34.5v246q0 27 -8 33t-43 8v23zM259 468v-275q0 -18 34 -18q82 0 127.5 35t46.5 120q0 84 -49 118.5t-137 34.5q-16 0 -19 -2.5t-3 -12.5zM684 330q0 -145 -99 -244.5t-242 -99.5 q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24ba;" horiz-adv-x="684" d="M520 247l-31 -106h-327v23q34 1 42.5 8t8.5 35v246q0 26 -8.5 32.5t-42.5 8.5v23h323l4 -94h-22q-7 37 -23 48.5t-66 11.5h-76q-9 0 -12 -0.5t-5 -3t-2 -8.5v-117h83q38 0 48.5 8.5t15.5 40.5h22v-135h-22q-4 33 -14.5 41t-49.5 8h-83v-124q0 -18 32 -18h51q62 0 88 14 t46 58h20zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24bb;" horiz-adv-x="684" d="M509 423h-22q-8 38 -23.5 49t-68.5 11h-91q-14 0 -17.5 -2t-3.5 -10v-117h93q40 0 50.5 8t15.5 41h22v-135h-22q-4 34 -14.5 41.5t-51.5 7.5h-93v-115q0 -23 12.5 -29.5t53.5 -8.5v-23h-187v23q36 1 43.5 8.5t7.5 39.5v237q0 28 -7.5 35.5t-43.5 9.5v23h343zM684 330 q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24bc;" horiz-adv-x="684" d="M563 347v-23q-26 -2 -33.5 -8t-7.5 -28v-114q-51 -40 -161 -40q-95 0 -155 52.5t-60 140.5q0 87 63.5 142t153.5 55q23 0 73 -12q18 -5 29 -5q19 0 26 17h18l5 -128h-22q-11 38 -41 65q-31 28 -77 28q-63 0 -107 -40t-44 -115q0 -78 42.5 -120.5t118.5 -42.5q32 0 51 8 t19 19v83q0 27 -8.5 34t-42.5 9v23h160zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214 z" />
+<glyph unicode="&#x24bd;" horiz-adv-x="684" d="M538 141h-162v23q30 2 38 11.5t8 39.5v102h-154v-107q0 -26 8.5 -35t36.5 -11v-23h-160v23q30 2 37.5 10.5t7.5 39.5v234q0 28 -7.5 35.5t-37.5 10.5v23h161v-23q-29 -3 -37.5 -11t-8.5 -35v-94h154v94q0 28 -8 35.5t-38 10.5v23h162v-23q-30 -3 -38 -11t-8 -35v-239 q0 -26 8.5 -34t37.5 -11v-23zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24be;" horiz-adv-x="684" d="M436 141h-181v23q36 1 45.5 9t9.5 36v240q0 28 -8.5 35.5t-46.5 9.5v23h181v-23q-37 -2 -46.5 -10t-9.5 -35v-240q0 -27 10 -35.5t46 -9.5v-23zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5 t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24bf;" horiz-adv-x="684" d="M446 517v-23q-39 -3 -47.5 -10.5t-8.5 -35.5v-198q0 -116 -112 -116q-30 0 -48 12t-18 35q0 16 9 25t24 9q27 0 33 -31q3 -16 16 -16q26 0 26 32v250q0 28 -9 35t-46 9v23h181zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246 t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24c0;" horiz-adv-x="684" d="M557 141h-181v23q38 4 38 14q0 6 -29 35l-102 104l-14 -12v-96q0 -28 10.5 -36t45.5 -9v-23h-181v23q38 1 46.5 10t8.5 42v237q0 25 -9.5 32t-45.5 9v23h181v-23q-36 -2 -46 -9.5t-10 -34.5v-105l98 88q45 40 45 49q0 10 -22 11l-16 1v23h151v-23q-30 -2 -45.5 -9.5 t-44.5 -33.5l-105 -92l137 -138q37 -37 52.5 -47t37.5 -10v-23zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5 t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24c1;" horiz-adv-x="684" d="M497 249l-26 -108h-292v23q34 1 44.5 8.5t10.5 34.5v251q0 23 -11.5 28.5t-43.5 7.5v23h181v-23q-24 -2 -33 -4t-16 -10t-7 -25v-253q0 -15 9 -20.5t34 -5.5h33q57 0 78 30q12 18 22 43h17zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244 q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24c2;" horiz-adv-x="684" d="M569 141h-164v20v3q30 2 38.5 11.5t8.5 39.5v233h-2l-130 -307h-12l-108 283h-1v-193q0 -41 8.5 -53t38.5 -14v-23h-125v23q32 3 39 13.5t7 53.5v217q0 29 -7 36.5t-38 9.5v23h104l106 -277l116 277h120v-23q-28 -1 -37 -9.5t-9 -35.5v-240q0 -25 9.5 -34t37.5 -11v-23z M684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24c3;" horiz-adv-x="684" d="M526 517v-23q-25 -3 -33 -9q-14 -12 -14 -59v-292h-15l-219 297v-206q0 -35 8 -46t37 -16v-23h-120v23q30 4 36.5 14.5t6.5 51.5v238q-2 3 -5 7t-4.5 5.5t-3.5 4.5t-4 4t-4.5 2.5t-5.5 2t-7 1t-9 0.5v23h85l192 -263v177q0 38 -9 50q-8 10 -39 13v23h127zM684 330 q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24c4;" horiz-adv-x="684" d="M548 333q0 -86 -57 -139t-146 -53q-90 0 -146.5 53.5t-56.5 139.5q0 85 56.5 137.5t146.5 52.5q89 0 146 -54t57 -137zM471 336q0 70 -32.5 113t-94.5 43q-63 0 -94 -44.5t-31 -114.5q0 -71 31.5 -115.5t95.5 -44.5q65 0 95 44.5t30 118.5zM684 330q0 -145 -99 -244.5 t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24c5;" horiz-adv-x="684" d="M172 517h165q150 0 150 -106q0 -61 -43 -87.5t-110 -26.5q-24 0 -37 2v-93q0 -26 11 -33.5t45 -8.5v-23h-181v23q19 1 27 2t16 5.5t10 13t2 23.5v248q0 13 -2.5 20.5t-11 11t-15.5 4.5t-26 2v23zM297 469v-133q11 -2 32 -2q82 0 82 74q0 42 -20.5 58.5t-75.5 16.5 q-18 0 -18 -14zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24c6;" horiz-adv-x="684" d="M497 78h-29q-74 0 -115.5 16t-70.5 63q-62 15 -101 60.5t-39 114.5q0 89 57.5 140.5t144.5 51.5q88 0 146 -52.5t58 -139.5q0 -76 -46 -124t-119 -56q34 -47 114 -51v-23zM471 334q0 72 -32.5 115t-94.5 43t-93.5 -45t-31.5 -114q0 -70 31.5 -111t95.5 -41q125 0 125 153 zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24c7;" horiz-adv-x="684" d="M549 141h-93l-126 166h-33v-98q0 -27 8.5 -35t40.5 -10v-23h-174v23q19 1 26 2t15.5 5t11 12.5t2.5 24.5v248q0 17 -7 25.5t-15.5 10t-32.5 2.5v23h165q150 0 150 -106q0 -79 -89 -96l99 -127q15 -20 52 -24v-23zM297 469v-124q8 -1 24 -1q47 0 68.5 13.5t21.5 52.5 q0 35 -17.5 54t-71.5 19q-15 0 -20 -2t-5 -12zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88 t86 214z" />
+<glyph unicode="&#x24c8;" horiz-adv-x="684" d="M475 395h-23q-8 35 -26 54q-37 39 -86 39q-57 0 -57 -45q0 -21 24.5 -39t81.5 -46q101 -50 101 -115q0 -49 -37.5 -79t-94.5 -30q-35 0 -70 14q-14 5 -29 5t-15 -19h-21l-21 130h23q21 -50 49.5 -73.5t73.5 -23.5q31 0 49.5 16t18.5 43q0 40 -117 96q-37 18 -58 45 t-21 55q0 47 31 74.5t80 27.5q29 0 60 -12q17 -6 29 -6q16 0 20 18h18zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215 q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24c9;" horiz-adv-x="684" d="M520 411h-22q-9 45 -27 58.5t-66 13.5h-25v-274q0 -28 10.5 -36t45.5 -9v-23h-181v23q37 1 46 9.5t9 40.5v269h-29q-48 0 -65 -13.5t-25 -58.5h-21l4 106h341zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100 q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24ca;" horiz-adv-x="684" d="M526 517v-23q-31 -4 -39 -16t-8 -48v-138q0 -158 -136 -158q-67 0 -103 38.5t-36 112.5v166q0 25 -8 32.5t-38 10.5v23h162v-23q-30 -4 -38 -11.5t-8 -33.5v-171q0 -57 14 -82t67 -25q52 0 72 29.5t20 84.5v144q0 39 -8.5 51t-38.5 14v23h126zM684 330q0 -145 -99 -244.5 t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24cb;" horiz-adv-x="684" d="M544 517v-23q-19 -1 -31 -10t-23 -35l-130 -308h-8l-143 297q-18 36 -29 45.5t-34 10.5v23h156v-23l-18 -1q-25 -1 -25 -11t22 -54l90 -183l83 197q11 25 11 36q0 13 -41 16v23h120zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246 t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24cc;" horiz-adv-x="684" d="M569 517v-23q-21 -5 -28 -10.5t-13 -23.5l-100 -319h-6l-78 229h-1l-73 -229h-6l-94 292q-11 37 -20.5 48.5t-28.5 12.5v23h118v-23q-30 -1 -30 -11q0 -2 6 -22l66 -203l50 150l-13 38q-11 32 -19 39.5t-30 8.5v23h129v-23q-14 -1 -20.5 -1.5t-11 -4t-4.5 -9.5 q0 -5 7 -26l68 -196h1l57 182q9 27 9 36q0 18 -34 19v23h99zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5 t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24cd;" horiz-adv-x="684" d="M520 141h-150v23l14 1q24 2 24 10q0 10 -25 50l-48 75l-59 -80q-26 -36 -26 -44t38 -12v-23h-118v23q21 2 33 12t40 48l75 102l-51 81q-34 54 -49.5 68.5t-41.5 18.5v23h153v-23h-15q-23 0 -23 -11q0 -9 29 -54l35 -54l55 75q19 27 19 32q0 11 -33 12v23h120v-23 q-25 -2 -39.5 -12t-37.5 -41l-68 -92l93 -147q13 -20 24 -27.5t32 -10.5v-23zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215 q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24ce;" horiz-adv-x="684" d="M520 517v-23q-24 -2 -37 -13.5t-34 -45.5l-69 -115v-114q0 -27 11.5 -34t44.5 -8v-23h-181v23q36 2 45.5 9t9.5 38v107l-57 92q-33 53 -48 68t-35 16v23h145v-23l-13 -1q-24 -1 -24 -8q0 -6 9 -22l75 -119l72 120q7 11 7 19q-1 10 -33 11v23h112zM684 330 q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24cf;" horiz-adv-x="684" d="M520 251l-16 -110h-334v19l247 323h-111q-53 0 -72.5 -13t-30.5 -60h-20l14 107h311v-19l-247 -323h135q48 0 69 15t35 61h20zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330 q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24d0;" horiz-adv-x="684" d="M479 234v-21q-25 -27 -60 -27q-37 0 -44 39q-44 -39 -94 -39q-31 0 -50 16t-19 45q0 43 45 69q26 15 117 43v24q0 42 -49 42q-19 0 -32 -5.5t-13 -13.5q0 -4 2.5 -11t2.5 -12q0 -12 -8.5 -20.5t-23.5 -8.5q-13 0 -21 8.5t-8 22.5q0 33 33.5 49.5t75.5 16.5q49 0 73 -20.5 t24 -69.5v-108q0 -29 20 -29q13 0 29 10zM374 265v69q-56 -16 -81 -33q-22 -15 -22 -37q0 -35 44 -35q21 0 40 10t19 26zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330 q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24d1;" horiz-adv-x="684" d="M293 523v-170q26 45 86 45q53 0 85 -35.5t32 -90.5q0 -63 -43 -100.5t-109 -37.5q-31 0 -69 10t-38 32v280q0 16 -5.5 20t-25.5 4q-9 0 -12 -1v20q53 12 95 25zM293 315v-130q0 -10 17 -16.5t42 -6.5q37 0 61.5 25t24.5 61q0 44 -20.5 73.5t-61.5 29.5q-24 0 -43.5 -11 t-19.5 -25zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24d2;" horiz-adv-x="684" d="M459 286l16 -8q-24 -46 -55.5 -69t-79.5 -23q-56 0 -91.5 35t-35.5 90q0 61 43.5 100.5t102.5 39.5q41 0 71 -18.5t30 -43.5q0 -12 -8.5 -20t-21.5 -8q-26 0 -39 40q-6 22 -36 22q-38 0 -60 -24t-22 -63q0 -44 25 -71.5t69 -27.5q28 0 48.5 11t43.5 38zM684 330 q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24d3;" horiz-adv-x="684" d="M497 162l-96 -28l-4 3v33q-32 -36 -85 -36q-54 0 -86 33.5t-32 89.5q0 60 39 100.5t96 40.5q42 0 67 -24h1v84q0 13 -5.5 17.5t-22.5 4.5q-11 0 -17 -1v20q55 12 96 25l5 -2v-315q0 -15 5.5 -20.5t21.5 -5.5q8 0 17 1v-20zM397 205v117q0 19 -20 33.5t-46 14.5 q-36 0 -57.5 -26t-21.5 -69q0 -48 22 -74t63 -26q24 0 42 7.5t18 22.5zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215 q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24d4;" horiz-adv-x="684" d="M465 286l16 -8q-24 -46 -55.5 -69t-79.5 -23q-59 0 -96 35t-37 93q0 59 40.5 98t103.5 39q52 0 82 -29.5t32 -82.5h-198q0 -45 27 -73.5t73 -28.5q51 0 92 49zM275 370h125q-7 48 -61 48q-52 0 -64 -48zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100 t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24d5;" horiz-adv-x="684" d="M238 394h51q2 58 29.5 94t85.5 36q30 0 51 -11.5t21 -29.5q0 -30 -30 -30q-13 0 -32 23q-1 2 -4 5t-4.5 5t-4.5 4.5t-6 4t-6.5 2.5t-7.5 1q-36 0 -36 -44v-60h80v-31h-80v-159q0 -27 11 -34t50 -9v-20h-169v20q34 1 43 9t9 34v159h-51v31zM684 330q0 -145 -99 -244.5 t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24d6;" horiz-adv-x="684" d="M493 473h-51q8 -19 8 -42q0 -42 -31.5 -68t-73.5 -26q-6 0 -20 1.5t-17 1.5q-13 0 -22 -7t-9 -15q0 -11 42 -13l85 -4q39 -1 61.5 -18.5t22.5 -46.5q0 -35 -32 -59.5t-69.5 -33.5t-73.5 -9q-117 0 -117 61q0 36 52 69q-22 10 -22 34q0 29 49 52q-51 21 -51 77 q0 41 32.5 69t79.5 28q37 0 67 -14q13 -6 38 -6h52v-31zM397 409q0 33 -17.5 59.5t-50.5 26.5q-22 0 -35.5 -12.5t-13.5 -34.5q0 -37 19.5 -60t49.5 -23q22 0 35 12t13 32zM462 227q0 12 -16.5 16.5t-60.5 4.5q-76 0 -108 8q-31 -24 -31 -42q0 -16 25.5 -25t69.5 -9 q56 0 88.5 12.5t32.5 34.5zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24d7;" horiz-adv-x="684" d="M501 141h-140v20q29 3 37 10.5t8 31.5v104q0 50 -47 50q-39 0 -72 -32v-122q0 -25 7.5 -32t36.5 -10v-20h-142v20q29 4 35.5 10.5t6.5 31.5v256q0 13 -6 17.5t-24 4.5q-2 0 -6 -1t-5 -1v21q61 12 92 24l5 -3v-168q42 46 95 46q80 0 80 -91v-105q0 -24 6.5 -30.5 t32.5 -11.5v-20zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24d8;" horiz-adv-x="684" d="M378 542q0 -15 -10.5 -25.5t-25.5 -10.5t-25.5 10.5t-10.5 25.5t10.5 25.5t25.5 10.5t25.5 -10.5t10.5 -25.5zM423 186h-156v20q34 2 42.5 8.5t8.5 34.5v124q0 16 -4.5 22t-15.5 6q-17 0 -29 -2v21l100 30l5 -3v-197q0 -27 8 -35t41 -9v-20zM684 330q0 -145 -99 -244.5 t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24d9;" horiz-adv-x="684" d="M406 559q0 -15 -10.5 -25.5t-25.5 -10.5q-16 0 -26 10.5t-10 25.5q0 16 10.5 26t26.5 10q15 0 25 -10t10 -26zM402 464v-255q0 -130 -112 -130q-28 0 -45.5 10.5t-17.5 27.5q0 12 7.5 20t20.5 8q14 0 32 -17t28 -17q15 0 22 9.5t8 21.5t1 41v207q0 28 -21 28q-7 0 -30 -3 v22q30 7 103 31zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24da;" horiz-adv-x="684" d="M507 141h-142v20h13q10 0 10 5q0 2 -4 7l-96 104v-88q0 -16 9 -21.5t34 -6.5v-20h-148v20q32 1 40.5 8t8.5 25v261q0 16 -5.5 21t-21.5 5q-14 0 -22 -1v20q57 8 100 24l5 -3v-226l87 62q13 10 13 13q0 5 -30 5v20h134v-20q-33 0 -60.5 -11.5t-79.5 -52.5l-15 -12l95 -101 q33 -34 75 -37v-20zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24db;" horiz-adv-x="684" d="M422 141h-154v20q29 2 39.5 10t10.5 26v256q0 16 -5.5 22t-19.5 6q-13 0 -23 -1v20q49 9 99 24l5 -4v-326q0 -18 9 -25t39 -8v-20zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5z M642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24dc;" horiz-adv-x="684" d="M598 186h-144v20q27 3 34 9t7 25v113q0 29 -11.5 42t-37.5 13q-47 0 -72 -31v-134q0 -22 10 -29.5t39 -7.5v-20h-150v20q30 2 37.5 7t7.5 25v115q0 55 -43 55q-52 0 -79 -29v-149q0 -13 9 -18t35 -6v-20h-146v20q27 0 36.5 7t9.5 26v134q0 17 -4.5 23.5t-17.5 6.5t-22 -1 v20q57 14 91 29l7 -2v-41q50 43 102 43q50 0 71 -46q52 46 107 46q41 0 59 -26t18 -79v-112q0 -26 28 -27l19 -1v-20zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330 q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24dd;" horiz-adv-x="684" d="M501 186h-138v20q24 1 32.5 10.5t8.5 33.5v109q0 49 -47 49q-29 0 -68 -30v-147q0 -12 9 -18t35 -7v-20h-142v20q25 1 33.5 9t8.5 28v131q0 17 -4.5 23t-17.5 6q-6 0 -13 -0.5t-8 -0.5v20q45 11 91 29l7 -2v-42q47 44 94 44q78 0 78 -91v-122q0 -18 8 -24t33 -8v-20z M684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24de;" horiz-adv-x="684" d="M489 321q0 -60 -40 -97.5t-106 -37.5q-61 0 -102 37.5t-41 95.5q0 60 40.5 96t107.5 36q61 0 101 -36t40 -94zM429 307q0 48 -23 82t-70 34q-34 0 -55 -21t-21 -58q0 -51 24 -90.5t70 -39.5q35 0 55 24.5t20 68.5zM684 330q0 -145 -99 -244.5t-242 -99.5 q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24df;" horiz-adv-x="684" d="M294 523v-42q40 43 96 43q48 0 79 -34.5t31 -88.5q0 -63 -39.5 -104.5t-98.5 -41.5q-39 0 -68 23v-80q0 -23 11 -29.5t48 -7.5v-20h-162v20q30 2 38.5 8t8.5 24v258q0 16 -5 21t-21 5q-7 0 -17 -2v21q49 12 93 28zM294 447v-129q19 -32 69 -32q36 0 57.5 25t21.5 67 q0 46 -22 73t-58 27q-46 0 -68 -31zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z " />
+<glyph unicode="&#x24e0;" horiz-adv-x="684" d="M498 141h-156v20q36 1 47.5 8t11.5 27v99q-46 -41 -101 -41q-47 0 -78 34.5t-31 89.5q0 63 42 104.5t105 41.5q36 0 75 -20l37 19h7v-336q0 -14 7.5 -19t33.5 -7v-20zM401 342v105q0 48 -61 48q-42 0 -66.5 -25.5t-24.5 -71.5q0 -43 21.5 -70t64.5 -27q25 0 45.5 10 t20.5 31zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24e1;" horiz-adv-x="684" d="M340 399h1q25 30 41 41t36 11q39 0 39 -36q0 -14 -8 -22.5t-21 -8.5q-11 0 -22.5 10.5t-20.5 10.5q-14 0 -29.5 -14t-15.5 -26v-125q0 -19 11.5 -26t44.5 -8v-20h-160v20q32 5 40 10t8 21v137q0 27 -21 27q-15 0 -25 -1v20q17 5 98 31l4 -2v-50zM684 330 q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24e2;" horiz-adv-x="684" d="M422 360h-20q-4 35 -19.5 50.5t-44.5 15.5q-47 0 -47 -30q0 -17 27 -31l32 -15q23 -12 35 -19q33 -18 45 -32.5t12 -39.5q0 -29 -27 -51t-64 -22q-32 0 -47 4q-15 5 -30 5q-11 0 -15 -6h-9v96h20q6 -75 73 -75q23 0 37 9.5t14 23.5q0 11 -13.5 21.5t-53.5 29.5 q-80 39 -80 84q0 34 25 53.5t67 19.5q15 0 31.5 -5t23.5 -5t11 5h14zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215 q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24e3;" horiz-adv-x="684" d="M427 201l14 -13q-43 -55 -91 -55q-65 0 -65 83v186h-34q-9 0 -9 12q0 10 13 18q32 20 66 72q11 20 22 20q6 0 6 -16l-8 -74h76v-32h-76v-171q0 -52 36 -52q27 0 50 22zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100 q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24e4;" horiz-adv-x="684" d="M500 232v-19q-43 -9 -89 -27l-5 3v46q-46 -49 -95 -49q-38 0 -59 21t-21 56v138q0 16 -8.5 21.5t-32.5 7.5v20h97v-182q0 -16 13.5 -27.5t32.5 -11.5q24 0 47 12t23 32v129q0 16 -9.5 21t-39.5 7v20h105v-192q0 -14 5.5 -20t19.5 -6h16zM684 330q0 -145 -99 -244.5 t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24e5;" horiz-adv-x="684" d="M496 450v-20q-17 -2 -24 -8t-19 -31l-83 -173q-15 -32 -19 -32q-3 0 -16 25l-81 161q-19 37 -29 46.5t-30 11.5v20h130v-20q-30 -3 -30 -9q0 -5 6 -17l64 -136h1l61 134q4 10 4 16q0 9 -30 12v20h95zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244 q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24e6;" horiz-adv-x="684" d="M567 450v-20q-20 -2 -30 -24l-88 -188q-15 -32 -20 -32q-4 0 -17 27l-59 125l-72 -127q-14 -25 -19 -25q-4 0 -17 27l-88 188q-9 18 -15 23t-19 6v20h119v-20q-29 -3 -29 -11q0 -5 4 -13l63 -141l57 105l-12 27q-8 19 -17 25.5t-28 7.5v20h135v-20q-38 -3 -38 -12 q0 -5 4 -13l62 -137h2l57 127q1 3 2.5 6.5t2.5 5.5t1.5 4.5t0.5 4.5q0 13 -30 14v20h88zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89 t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24e7;" horiz-adv-x="684" d="M502 186h-139v20q29 1 29 6q0 3 -4 8l-60 78l-55 -72q-8 -9 -8 -14t24 -6v-20h-100v20q20 2 28 6t21 20l72 91l-58 76q-23 31 -51 31h-8v20h142v-20q-28 -1 -28 -7q0 -4 17 -26l22 -29l18 23q6 8 13 16t9.5 11.5t2.5 5.5q0 5 -27 6v20h109v-20q-39 -2 -55 -22l-52 -65 l82 -106q23 -31 48 -31h8v-20zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24e8;" horiz-adv-x="684" d="M500 524v-20q-24 -4 -33 -25l-101 -230q-28 -63 -55 -89t-64 -26q-23 0 -35.5 11t-12.5 29q0 13 10 22.5t23 9.5q12 0 25 -5.5t21 -5.5q14 0 36 24q9 11 17.5 29.5t8.5 24.5t-25 51l-91 164q-6 11 -36 16v20h140v-20q-38 -3 -38 -10q0 -6 8 -19l75 -138l60 143l6 16 q0 8 -30 8v20h91zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24e9;" horiz-adv-x="684" d="M478 275l-13 -89h-253v18l173 216h-77q-31 0 -43 -9.5t-15 -39.5h-21l3 79h234v-19l-173 -215h74q57 0 70 13q11 11 20 46h21zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330 q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24ea;" horiz-adv-x="684" d="M489 321q0 -80 -36 -133.5t-108 -53.5q-75 0 -109.5 55t-34.5 136q0 82 37 137t109 55q63 0 102.5 -54.5t39.5 -141.5zM426 318q0 172 -83 172q-38 0 -58.5 -44.5t-20.5 -124.5q0 -160 81 -160t81 157zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100 t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x2500;" horiz-adv-x="708" d="M719 267h-730v73h730v-73z" />
+<glyph unicode="&#x2502;" horiz-adv-x="708" d="M390 -303h-73v1213h73v-1213z" />
+<glyph unicode="&#x2506;" horiz-adv-x="708" d="M390 544h-73v366h73v-366zM390 121h-73v366h73v-366zM390 -303h-73v367h73v-367z" />
+<glyph unicode="&#x2508;" horiz-adv-x="708" d="M719 267h-145v73h145v-73zM524 267h-145v73h145v-73zM329 267h-145v73h145v-73zM134 267h-145v73h145v-73z" />
+<glyph unicode="&#x250a;" horiz-adv-x="708" d="M390 650h-73v260h73v-260zM390 333h-73v260h73v-260zM390 15h-73v260h73v-260zM390 -303h-73v260h73v-260z" />
+<glyph unicode="&#x250c;" horiz-adv-x="708" d="M720 267h-330v-570h-73v643h403v-73z" />
+<glyph unicode="&#x2510;" horiz-adv-x="708" d="M390 -303h-73v570h-328v73h401v-643z" />
+<glyph unicode="&#x2514;" horiz-adv-x="708" d="M720 267h-403v643h73v-570h330v-73z" />
+<glyph unicode="&#x2518;" horiz-adv-x="708" d="M390 267h-401v73h328v570h73v-643z" />
+<glyph unicode="&#x251c;" horiz-adv-x="708" d="M719 267h-329v-570h-73v1213h73v-570h329v-73z" />
+<glyph unicode="&#x2524;" horiz-adv-x="708" d="M390 -303h-73v570h-328v73h328v570h73v-1213z" />
+<glyph unicode="&#x252c;" horiz-adv-x="708" d="M719 267h-329v-570h-73v570h-328v73h730v-73z" />
+<glyph unicode="&#x2534;" horiz-adv-x="708" d="M719 267h-730v73h328v570h73v-570h329v-73z" />
+<glyph unicode="&#x253c;" horiz-adv-x="708" d="M719 267h-329v-570h-73v570h-328v73h328v570h73v-570h329v-73z" />
+<glyph unicode="&#x2550;" horiz-adv-x="708" d="M719 174h-730v73h730v-73zM719 360h-730v73h730v-73z" />
+<glyph unicode="&#x2551;" horiz-adv-x="708" d="M298 -303h-73v1213h73v-1213zM483 -303h-73v1213h73v-1213z" />
+<glyph unicode="&#x2552;" horiz-adv-x="708" d="M720 174h-330v-477h-73v736h403v-73h-330v-113h330v-73z" />
+<glyph unicode="&#x2553;" horiz-adv-x="708" d="M720 267h-237v-570h-73v562h-112v-562h-73v643h495v-73z" />
+<glyph unicode="&#x2554;" horiz-adv-x="708" d="M719 360h-421v-663h-73v736h494v-73zM719 174h-236v-477h-73v550h309v-73z" />
+<glyph unicode="&#x2555;" horiz-adv-x="708" d="M390 -303h-73v477h-328v73h328v113h-328v73h401v-736z" />
+<glyph unicode="&#x2556;" horiz-adv-x="708" d="M483 -303h-73v570h-112v-570h-73v570h-236v73h494v-643z" />
+<glyph unicode="&#x2557;" horiz-adv-x="708" d="M483 -303h-73v663h-421v73h494v-736zM298 -303h-73v477h-236v73h309v-550z" />
+<glyph unicode="&#x2558;" horiz-adv-x="708" d="M720 174h-403v736h73v-477h330v-73h-330v-113h330v-73z" />
+<glyph unicode="&#x2559;" horiz-adv-x="708" d="M720 267h-495v643h73v-570h112v570h73v-570h237v-73z" />
+<glyph unicode="&#x255a;" horiz-adv-x="708" d="M719 360h-309v550h73v-477h236v-73zM719 174h-494v736h73v-663h421v-73z" />
+<glyph unicode="&#x255b;" horiz-adv-x="708" d="M390 174h-401v73h328v113h-328v73h328v477h73v-736z" />
+<glyph unicode="&#x255c;" horiz-adv-x="708" d="M483 267h-494v73h236v570h73v-570h112v570h73v-643z" />
+<glyph unicode="&#x255d;" horiz-adv-x="708" d="M298 360h-309v73h236v477h73v-550zM483 174h-494v73h421v663h73v-736z" />
+<glyph unicode="&#x255e;" horiz-adv-x="708" d="M720 174h-330v-477h-73v1213h73v-477h330v-73h-330v-113h330v-73z" />
+<glyph unicode="&#x255f;" horiz-adv-x="708" d="M298 -303h-73v1213h73v-1213zM720 267h-237v-570h-73v1213h73v-570h237v-73z" />
+<glyph unicode="&#x2560;" horiz-adv-x="708" d="M298 -303h-73v1213h73v-1213zM720 360h-310v550h73v-477h237v-73zM720 174h-237v-477h-73v550h310v-73z" />
+<glyph unicode="&#x2561;" horiz-adv-x="708" d="M390 -303h-73v477h-328v73h328v113h-328v73h328v477h73v-1213z" />
+<glyph unicode="&#x2562;" horiz-adv-x="708" d="M483 -303h-73v1213h73v-1213zM298 -303h-73v570h-236v73h236v570h73v-1213z" />
+<glyph unicode="&#x2563;" horiz-adv-x="708" d="M483 -303h-73v1213h73v-1213zM298 360h-309v73h236v477h73v-550zM298 -303h-73v477h-236v73h309v-550z" />
+<glyph unicode="&#x2564;" horiz-adv-x="708" d="M719 360h-730v73h730v-73zM719 174h-329v-477h-73v477h-328v73h730v-73z" />
+<glyph unicode="&#x2565;" horiz-adv-x="708" d="M719 267h-236v-570h-73v570h-112v-570h-73v570h-236v73h730v-73z" />
+<glyph unicode="&#x2566;" horiz-adv-x="708" d="M719 360h-730v73h730v-73zM719 174h-236v-477h-73v550h309v-73zM298 -303h-73v477h-236v73h309v-550z" />
+<glyph unicode="&#x2567;" horiz-adv-x="708" d="M719 174h-730v73h730v-73zM719 360h-730v73h328v477h73v-477h329v-73z" />
+<glyph unicode="&#x2568;" horiz-adv-x="708" d="M719 267h-730v73h236v570h73v-570h112v570h73v-570h236v-73z" />
+<glyph unicode="&#x2569;" horiz-adv-x="708" d="M719 174h-730v73h730v-73zM719 360h-309v550h73v-477h236v-73zM298 360h-309v73h236v477h73v-550z" />
+<glyph unicode="&#x256a;" horiz-adv-x="708" d="M719 174h-329v-477h-73v477h-328v73h328v113h-328v73h328v477h73v-477h329v-73h-329v-113h329v-73z" />
+<glyph unicode="&#x256b;" horiz-adv-x="708" d="M719 267h-236v-570h-73v570h-112v-570h-73v570h-236v73h236v570h73v-570h112v570h73v-570h236v-73z" />
+<glyph unicode="&#x256c;" horiz-adv-x="708" d="M719 360h-309v550h73v-477h236v-73zM298 360h-309v73h236v477h73v-550zM719 174h-236v-477h-73v550h309v-73zM298 -303h-73v477h-236v73h309v-550z" />
+<glyph unicode="&#x2571;" horiz-adv-x="708" d="M723 878l-680 -1181l-58 32l680 1181z" />
+<glyph unicode="&#x2572;" horiz-adv-x="708" d="M723 -271l-58 -32l-680 1181l58 32z" />
+<glyph unicode="&#x2580;" horiz-adv-x="1213" d="M1213 304h-1213v606h1213v-606z" />
+<glyph unicode="&#x2584;" horiz-adv-x="1213" d="M1213 -303h-1213v606h1213v-606z" />
+<glyph unicode="&#x2588;" horiz-adv-x="1213" d="M1213 -303h-1213v1213h1213v-1213z" />
+<glyph unicode="&#x258c;" horiz-adv-x="1212" d="M606 -303h-606v1213h606v-1213z" />
+<glyph unicode="&#x2590;" horiz-adv-x="1212" d="M1212 -303h-606v1213h606v-1213z" />
+<glyph unicode="&#x2591;" horiz-adv-x="1200" d="M1160 840q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM1200 763q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM1080 840q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM1120 763q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14 zM1160 686q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM1000 840q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM1200 609q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM1040 763q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14z M1080 686q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM920 840q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM1120 609q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM960 763q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14z M1160 532q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM1000 686q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM840 840q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM1200 455q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14z M1040 609q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM880 763q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM1080 532q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM920 686q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14z M760 840q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM1120 455q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM960 609q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM800 763q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14z M1160 378q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM1000 532q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM840 686q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM680 840q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14z M1200 301q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM1040 455q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM880 609q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM720 763q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14z M1080 378q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM920 532q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM760 686q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM600 840q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14z M1120 301q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM960 455q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM800 609q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM640 763q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14z M1160 224q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM1000 378q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM840 532q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM680 686q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14z M520 840q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM1200 147q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM1040 301q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM880 455q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14z M720 609q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM560 763q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM1080 224q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM920 378q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14z M760 532q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM600 686q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM440 840q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM1120 147q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14z M960 301q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM800 455q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM640 609q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM480 763q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14z M1160 70q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM1000 224q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM840 378q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM680 532q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14z M520 686q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM360 840q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM1200 -7q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM1040 147q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14z M880 301q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM720 455q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM560 609q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM400 763q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14z M1080 70q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM920 224q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM760 378q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM600 532q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14z M440 686q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM280 840q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM1120 -7q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM960 147q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14z M800 301q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM640 455q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM480 609q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM320 763q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14z M1160 -84q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM1000 70q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM840 224q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM680 378q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14z M520 532q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM360 686q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM200 840q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM1200 -161q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14z M1040 -7q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM880 147q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM720 301q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM560 455q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14z M400 609q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM240 763q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM1080 -84q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM920 70q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14z M760 224q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM600 378q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM440 532q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM280 686q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14z M120 840q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM1120 -161q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM960 -7q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM800 147q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14z M640 301q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM480 455q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM320 609q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM160 763q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14z M1160 -238q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM1000 -84q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM840 70q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM680 224q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14z M520 378q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM360 532q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM200 686q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM40 840q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14z M1040 -161q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM880 -7q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM720 147q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM560 301q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14z M400 455q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM240 609q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM80 763q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM1080 -238q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14z M920 -84q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM760 70q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM600 224q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM440 378q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14z M280 532q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM120 686q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM960 -161q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM800 -7q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14z M640 147q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM480 301q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM320 455q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM160 609q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14z M1000 -238q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM840 -84q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM680 70q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM520 224q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14z M360 378q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM200 532q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM40 686q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM880 -161q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14z M720 -7q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM560 147q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM400 301q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM240 455q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM80 609 q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM920 -238q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM760 -84q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM600 70q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM440 224 q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM280 378q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM120 532q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM800 -161q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM640 -7 q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM480 147q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM320 301q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM160 455q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM840 -238 q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM680 -84q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM520 70q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM360 224q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM200 378 q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM40 532q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM720 -161q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM560 -7q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM400 147 q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM240 301q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM80 455q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM760 -238q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM600 -84 q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM440 70q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM280 224q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM120 378q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM640 -161 q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM480 -7q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM320 147q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM160 301q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM680 -238 q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM520 -84q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM360 70q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM200 224q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM40 378 q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM560 -161q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM400 -7q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM240 147q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM80 301 q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM600 -238q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM440 -84q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM280 70q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM120 224 q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM480 -161q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM320 -7q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM160 147q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM520 -238 q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM360 -84q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM200 70q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM40 224q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM400 -161 q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM240 -7q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM80 147q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM440 -238q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM280 -84 q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM120 70q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM320 -161q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM160 -7q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM360 -238 q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM200 -84q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM40 70q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM240 -161q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM80 -7 q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM280 -238q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM120 -84q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM160 -161q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM200 -238 q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM40 -84q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM80 -161q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM120 -238q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14zM40 -238 q0 -8 -6 -14t-14 -6t-14 6t-6 14t6 14t14 6t14 -6t6 -14z" />
+<glyph unicode="&#x2592;" horiz-adv-x="1200" d="M1200 -273h-1200v1147h1200v-1147zM1140 822q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM1200 706q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM1020 822q0 13 -8.5 21.5 t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM1080 706q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM1140 590q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5 t8.5 21.5zM900 822q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM1200 474q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM960 706q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5 t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM1020 590q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM780 822q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM1080 474q0 13 -8.5 21.5 t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM840 706q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM1140 358q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5 t8.5 21.5zM900 590q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM660 822q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM1200 242q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5 t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM960 474q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM720 706q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM1020 358q0 13 -8.5 21.5 t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM780 590q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM540 822q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5 t8.5 21.5zM1080 242q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM840 474q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM600 706q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5 t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM1140 126q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM900 358q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM660 590q0 13 -8.5 21.5 t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM420 822q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM1200 10q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5 t8.5 21.5zM960 242q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM720 474q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM480 706q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5 t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM1020 126q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM780 358q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM540 590q0 13 -8.5 21.5 t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM300 822q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM1080 10q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5 t8.5 21.5zM840 242q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM600 474q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM360 706q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5 t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM1140 -106q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM900 126q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM660 358q0 13 -8.5 21.5 t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM420 590q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM180 822q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5 t8.5 21.5zM1200 -222q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM960 10q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM720 242q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5 t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM480 474q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM240 706q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM1020 -106q0 13 -8.5 21.5 t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM780 126q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM540 358q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5 t8.5 21.5zM300 590q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM60 822q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM1080 -222q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5 t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM840 10q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM600 242q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM360 474q0 13 -8.5 21.5 t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM120 706q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM900 -106q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5 t8.5 21.5zM660 126q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM420 358q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM180 590q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5 t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM960 -222q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM720 10q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM480 242q0 13 -8.5 21.5 t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM240 474q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM780 -106q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5 t8.5 21.5zM540 126q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM300 358q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM60 590q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5 t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM840 -222q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM600 10q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM360 242q0 13 -8.5 21.5 t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM120 474q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM660 -106q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5 t8.5 21.5zM420 126q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM180 358q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM720 -222q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5 t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM480 10q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM240 242q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM540 -106q0 13 -8.5 21.5 t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM300 126q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM60 358q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5 t8.5 21.5zM600 -222q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM360 10q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM120 242q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5 t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM420 -106q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM180 126q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM480 -222q0 13 -8.5 21.5 t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM240 10q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM300 -106q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5 t8.5 21.5zM60 126q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM360 -222q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM120 10q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5 t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM180 -106q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM240 -222q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM60 -106q0 13 -8.5 21.5 t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5zM120 -222q0 13 -8.5 21.5t-21.5 8.5t-21.5 -8.5t-8.5 -21.5t8.5 -21.5t21.5 -8.5t21.5 8.5t8.5 21.5z" />
+<glyph unicode="&#x2593;" horiz-adv-x="1200" d="M1200 -273h-1200v1147h1200v-1147zM1160 840q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM1200 763q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM1080 840q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM1120 763q0 8 -6 14t-14 6t-14 -6 t-6 -14t6 -14t14 -6t14 6t6 14zM1160 686q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM1000 840q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM1200 609q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM1040 763q0 8 -6 14t-14 6t-14 -6 t-6 -14t6 -14t14 -6t14 6t6 14zM1080 686q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM920 840q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM1120 609q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM960 763q0 8 -6 14t-14 6t-14 -6t-6 -14 t6 -14t14 -6t14 6t6 14zM1160 532q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM1000 686q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM840 840q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM1200 455q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14 t14 -6t14 6t6 14zM1040 609q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM880 763q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM1080 532q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM920 686q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6 t14 6t6 14zM760 840q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM1120 455q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM960 609q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM800 763q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6 t6 14zM1160 378q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM1000 532q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM840 686q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM680 840q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14z M1200 301q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM1040 455q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM880 609q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM720 763q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14z M1080 378q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM920 532q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM760 686q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM600 840q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM1120 301 q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM960 455q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM800 609q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM640 763q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM1160 224 q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM1000 378q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM840 532q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM680 686q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM520 840 q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM1200 147q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM1040 301q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM880 455q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM720 609 q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM560 763q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM1080 224q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM920 378q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM760 532 q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM600 686q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM440 840q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM1120 147q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM960 301 q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM800 455q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM640 609q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM480 763q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM1160 70q0 8 -6 14 t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM1000 224q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM840 378q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM680 532q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM520 686q0 8 -6 14t-14 6 t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM360 840q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM1200 -7q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM1040 147q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM880 301q0 8 -6 14t-14 6t-14 -6 t-6 -14t6 -14t14 -6t14 6t6 14zM720 455q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM560 609q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM400 763q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM1080 70q0 8 -6 14t-14 6t-14 -6t-6 -14 t6 -14t14 -6t14 6t6 14zM920 224q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM760 378q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM600 532q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM440 686q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14 t14 -6t14 6t6 14zM280 840q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM1120 -7q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM960 147q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM800 301q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6 t14 6t6 14zM640 455q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM480 609q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM320 763q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM1160 -84q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6 t6 14zM1000 70q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM840 224q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM680 378q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM520 532q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14z M360 686q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM200 840q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM1200 -161q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM1040 -7q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM880 147 q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM720 301q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM560 455q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM400 609q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM240 763q0 8 -6 14 t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM1080 -84q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM920 70q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM760 224q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM600 378q0 8 -6 14t-14 6 t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM440 532q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM280 686q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM120 840q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM1120 -161q0 8 -6 14t-14 6t-14 -6 t-6 -14t6 -14t14 -6t14 6t6 14zM960 -7q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM800 147q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM640 301q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM480 455q0 8 -6 14t-14 6t-14 -6t-6 -14 t6 -14t14 -6t14 6t6 14zM320 609q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM160 763q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM1160 -238q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM1000 -84q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14 t14 -6t14 6t6 14zM840 70q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM680 224q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM520 378q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM360 532q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6 t6 14zM200 686q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM40 840q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM1040 -161q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM880 -7q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14z M720 147q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM560 301q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM400 455q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM240 609q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM80 763 q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM1080 -238q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM920 -84q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM760 70q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM600 224 q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM440 378q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM280 532q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM120 686q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM960 -161 q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM800 -7q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM640 147q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM480 301q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM320 455q0 8 -6 14 t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM160 609q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM1000 -238q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM840 -84q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM680 70q0 8 -6 14t-14 6 t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM520 224q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM360 378q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM200 532q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM40 686q0 8 -6 14t-14 6t-14 -6 t-6 -14t6 -14t14 -6t14 6t6 14zM880 -161q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM720 -7q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM560 147q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM400 301q0 8 -6 14t-14 6t-14 -6t-6 -14 t6 -14t14 -6t14 6t6 14zM240 455q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM80 609q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM920 -238q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM760 -84q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14 t14 -6t14 6t6 14zM600 70q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM440 224q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM280 378q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM120 532q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6 t6 14zM800 -161q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM640 -7q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM480 147q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM320 301q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14z M160 455q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM840 -238q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM680 -84q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM520 70q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM360 224 q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM200 378q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM40 532q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM720 -161q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM560 -7q0 8 -6 14 t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM400 147q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM240 301q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM80 455q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM760 -238q0 8 -6 14t-14 6 t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM600 -84q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM440 70q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM280 224q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM120 378q0 8 -6 14t-14 6t-14 -6 t-6 -14t6 -14t14 -6t14 6t6 14zM640 -161q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM480 -7q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM320 147q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM160 301q0 8 -6 14t-14 6t-14 -6t-6 -14 t6 -14t14 -6t14 6t6 14zM680 -238q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM520 -84q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM360 70q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM200 224q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14 t14 -6t14 6t6 14zM40 378q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM560 -161q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM400 -7q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM240 147q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6 t6 14zM80 301q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM600 -238q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM440 -84q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM280 70q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14z M120 224q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM480 -161q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM320 -7q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM160 147q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM520 -238 q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM360 -84q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM200 70q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM40 224q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM400 -161q0 8 -6 14 t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM240 -7q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM80 147q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM440 -238q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM280 -84q0 8 -6 14t-14 6 t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM120 70q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM320 -161q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM160 -7q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM360 -238q0 8 -6 14t-14 6t-14 -6 t-6 -14t6 -14t14 -6t14 6t6 14zM200 -84q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM40 70q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM240 -161q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM80 -7q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14 t14 -6t14 6t6 14zM280 -238q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM120 -84q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM160 -161q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM200 -238q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6 t14 6t6 14zM40 -84q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM80 -161q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM120 -238q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14zM40 -238q0 8 -6 14t-14 6t-14 -6t-6 -14t6 -14t14 -6t14 6t6 14 z" />
+<glyph unicode="&#x25a0;" horiz-adv-x="910" d="M865 -158h-820v820h820v-820z" />
+<glyph unicode="&#x25a1;" horiz-adv-x="910" d="M865 -158h-820v820h820v-820zM799 -92v688h-688v-688h688z" />
+<glyph unicode="&#x25a2;" horiz-adv-x="910" d="M865 422v-340q0 -99 -70.5 -169.5t-169.5 -70.5h-340q-99 0 -169.5 70.5t-70.5 169.5v340q0 99 70.5 169.5t169.5 70.5h340q99 0 169.5 -70.5t70.5 -169.5zM799 82v340q0 74 -50.5 124t-123.5 50h-340q-73 0 -123.5 -50t-50.5 -124v-340q0 -74 50.5 -124t123.5 -50h340 q73 0 123.5 50t50.5 124z" />
+<glyph unicode="&#x25a3;" horiz-adv-x="910" d="M865 -158h-820v820h820v-820zM664 40h-420v420h420v-420zM798 -92v688h-687v-688h687z" />
+<glyph unicode="&#x25a4;" horiz-adv-x="910" d="M865 -158h-820v820h820v-820zM798 462v134h-687v-134h687zM798 277v133h-687v-133h687zM798 92v133h-687v-133h687zM798 -92v132h-687v-132h687z" />
+<glyph unicode="&#x25a5;" horiz-adv-x="910" d="M865 -158h-820v820h820v-820zM799 -91v687h-134v-687h134zM613 -91v687h-133v-687h133zM428 -91v687h-133v-687h133zM243 -91v687h-132v-687h132z" />
+<glyph unicode="&#x25a6;" horiz-adv-x="910" d="M865 -158h-820v820h820v-820zM798 462v134h-133v-134h133zM613 462v134h-133v-134h133zM798 277v133h-133v-133h133zM428 462v134h-133v-134h133zM613 277v133h-133v-133h133zM798 92v133h-133v-133h133zM243 462v134h-132v-134h132zM798 -91v131h-133v-131h133zM428 277 v133h-133v-133h133zM613 92v133h-133v-133h133zM613 -91v131h-133v-131h133zM243 277v133h-132v-133h132zM428 92v133h-133v-133h133zM428 -91v131h-133v-131h133zM243 92v133h-132v-133h132zM243 -91v131h-132v-131h132z" />
+<glyph unicode="&#x25a7;" horiz-adv-x="910" d="M865 -158h-820v820h820v-820zM799 465v130h-130zM799 291v100l-204 204h-100zM799 117v100l-378 378h-100zM799 -56v99l-552 552h-100zM761 -92l-650 650v-100l549 -550h101zM587 -92l-476 476v-102l373 -374h103zM411 -92l-300 300v-102l198 -198h102zM235 -92l-124 125 v-125h124z" />
+<glyph unicode="&#x25a8;" horiz-adv-x="910" d="M865 -158h-820v820h820v-820zM799 -92v125l-124 -125h124zM799 458v100l-650 -650h101zM799 282v102l-476 -476h103zM799 106v102l-300 -300h102zM763 595h-100l-552 -552v-99zM241 595h-130v-130zM415 595h-100l-204 -204v-100zM589 595h-100l-378 -378v-100z" />
+<glyph unicode="&#x25a9;" horiz-adv-x="910" d="M865 -158h-820v820h820v-820zM763 595h-94l46 -47zM799 465v93l-47 -47zM678 511l-49 50l-50 -50l49 -50zM765 424l-50 50l-50 -50l51 -50zM589 595h-94l47 -47zM799 291v93l-47 -47zM505 511l-50 50l-50 -50l50 -50zM591 424l-49 50l-50 -50l49 -50zM679 337l-51 50 l-50 -50l51 -50zM766 249l-51 51l-50 -50l51 -51zM415 595h-94l47 -47zM799 117v91l-46 -46zM331 511l-50 50l-50 -50l50 -50zM418 424l-50 50l-50 -50l50 -50zM504 337l-49 50l-50 -50l49 -50zM592 250l-51 50l-50 -50l51 -50zM679 162l-51 51l-50 -50l51 -51zM767 74 l-51 51l-50 -50l51 -51zM241 595h-94l47 -47zM799 -56v89l-45 -45zM761 -92l-43 43l-43 -43h86zM157 511l-46 47v-93zM418 251l-50 49l-50 -50l50 -49zM505 163l-50 51l-50 -50l50 -51zM593 76l-51 51l-50 -50l51 -52zM681 -12l-51 51l-51 -50l51 -51zM244 424l-50 50 l-50 -50l50 -50zM331 337l-50 50l-50 -50l50 -50zM587 -92l-44 44l-44 -44h88zM157 337l-46 47v-93zM331 164l-50 49l-51 -51l50 -49zM418 76l-50 51l-51 -51l50 -51zM244 250l-50 50l-51 -51l50 -50zM506 -11l-51 51l-52 -51l52 -52zM411 -92l-44 44l-44 -44h88zM156 162 l-45 46v-91zM330 -11l-50 50l-51 -51l50 -50zM243 76l-50 49l-51 -51l50 -49zM235 -92l-43 44l-43 -44h86zM155 -11l-44 44v-89z" />
+<glyph unicode="&#x25aa;" horiz-adv-x="484" d="M452 40h-420v420h420v-420z" />
+<glyph unicode="&#x25ab;" horiz-adv-x="484" d="M452 40h-420v420h420v-420zM386 106v288h-288v-288h288z" />
+<glyph unicode="&#x25ac;" horiz-adv-x="1020" d="M982 -11h-944v480h944v-480z" />
+<glyph unicode="&#x25ad;" horiz-adv-x="1020" d="M982 -11h-944v480h944v-480zM916 55v348h-812v-348h812z" />
+<glyph unicode="&#x25ae;" horiz-adv-x="560" d="M520 -220h-480v944h480v-944z" />
+<glyph unicode="&#x25af;" horiz-adv-x="560" d="M520 -220h-480v944h480v-944zM454 -154v812h-348v-812h348z" />
+<glyph unicode="&#x25b0;" horiz-adv-x="1140" d="M1112 514l-140 -525h-944l140 525h944z" />
+<glyph unicode="&#x25b1;" horiz-adv-x="1140" d="M1111 514l-139 -525h-943l139 525h943zM1028 448h-813l-103 -393h812z" />
+<glyph unicode="&#x25b2;" horiz-adv-x="1145" d="M1110 -127h-1075l538 938z" />
+<glyph unicode="&#x25b3;" horiz-adv-x="1145" d="M1110 -127h-1075l538 938zM995 -61l-422 739l-424 -739h846z" />
+<glyph unicode="&#x25b4;" horiz-adv-x="660" d="M632 28h-605l303 525z" />
+<glyph unicode="&#x25b5;" horiz-adv-x="660" d="M632 28h-605l303 525zM522 94l-192 326l-191 -326h383z" />
+<glyph unicode="&#x25b6;" horiz-adv-x="1043" d="M1008 253l-938 -538v1075z" />
+<glyph unicode="&#x25b7;" horiz-adv-x="1043" d="M1008 253l-938 -537v1075zM875 253l-739 424v-846z" />
+<glyph unicode="&#x25b8;" horiz-adv-x="660" d="M605 253l-525 -302v605z" />
+<glyph unicode="&#x25b9;" horiz-adv-x="660" d="M605 253l-525 -303v605zM472 252l-326 191v-383z" />
+<glyph unicode="&#x25ba;" horiz-adv-x="930" d="M885 252l-820 -302v605z" />
+<glyph unicode="&#x25bb;" horiz-adv-x="930" d="M885 252l-820 -302v605zM697 252l-566 206v-412z" />
+<glyph unicode="&#x25bc;" horiz-adv-x="1145" d="M1110 811l-537 -938l-538 938h1075z" />
+<glyph unicode="&#x25bd;" horiz-adv-x="1145" d="M1110 811l-537 -938l-538 938h1075zM995 745h-846l424 -739z" />
+<glyph unicode="&#x25be;" horiz-adv-x="660" d="M632 477l-303 -525l-302 525h605z" />
+<glyph unicode="&#x25bf;" horiz-adv-x="660" d="M632 477l-303 -525l-302 525h605zM520 411h-383l192 -326z" />
+<glyph unicode="&#x25c0;" horiz-adv-x="1043" d="M973 -285l-938 538l938 537v-1075z" />
+<glyph unicode="&#x25c1;" horiz-adv-x="1043" d="M1008 -284l-938 537l938 538v-1075zM942 -169v846l-739 -424z" />
+<glyph unicode="&#x25c2;" horiz-adv-x="660" d="M580 -50l-525 303l525 302v-605z" />
+<glyph unicode="&#x25c3;" horiz-adv-x="660" d="M580 -51l-525 303l525 302v-605zM514 61v383l-326 -192z" />
+<glyph unicode="&#x25c4;" horiz-adv-x="930" d="M865 -50l-820 302l820 303v-605z" />
+<glyph unicode="&#x25c5;" horiz-adv-x="930" d="M865 -50l-820 302l820 303v-605zM799 47v412l-566 -206z" />
+<glyph unicode="&#x25c6;" horiz-adv-x="1064" d="M1025 251l-492 -493l-494 494l493 492z" />
+<glyph unicode="&#x25c7;" horiz-adv-x="1064" d="M1025 251l-492 -493l-494 494l493 492zM932 251l-400 400l-400 -400l400 -400z" />
+<glyph unicode="&#x25c8;" horiz-adv-x="1064" d="M1025 251l-492 -493l-494 494l493 492zM769 251l-237 -237l-237 237l237 237zM932 251l-400 400l-400 -400l400 -400z" />
+<glyph unicode="&#x25c9;" horiz-adv-x="842" d="M656 252q0 -99 -69 -168.5t-166 -69.5q-99 0 -168.5 69.5t-69.5 168.5q0 97 69.5 166t168.5 69q97 0 166 -69t69 -166zM792 252q0 -154 -108.5 -262.5t-262.5 -108.5t-262.5 108.5t-108.5 262.5t108.5 262.5t262.5 108.5t262.5 -108.5t108.5 -262.5zM726 252 q0 126 -89.5 215.5t-215.5 89.5t-215.5 -89.5t-89.5 -215.5t89.5 -215.5t215.5 -89.5t215.5 89.5t89.5 215.5z" />
+<glyph unicode="&#x25ca;" horiz-adv-x="790" d="M745 253l-351 -542l-349 542l350 542zM667 253l-272 421l-271 -421l270 -421z" />
+<glyph unicode="&#x25cb;" horiz-adv-x="842" d="M792 252q0 -154 -108.5 -262.5t-262.5 -108.5t-262.5 108.5t-108.5 262.5t108.5 262.5t262.5 108.5t262.5 -108.5t108.5 -262.5zM726 252q0 126 -89.5 215.5t-215.5 89.5t-215.5 -89.5t-89.5 -215.5t89.5 -215.5t215.5 -89.5t215.5 89.5t89.5 215.5z" />
+<glyph unicode="&#x25cc;" horiz-adv-x="910" d="M757 554l-48 -48q-23 24 -47 41l38 55q27 -18 57 -48zM842 433l-60 -29q-13 27 -31 54l54 39q24 -35 37 -64zM629 624l-22 -45q-17 9 -58 22l17 64q13 -4 33.5 -20.5t29.5 -20.5zM881 290l-67 -6q-2 25 -11 61l65 18q10 -34 13 -73zM493 678l-6 -65q-11 1 -32 1 q-10 0 -32 -2l-6 66q13 2 38 2t38 -2zM814 220l67 -6q-3 -39 -13 -73l-65 18q8 35 11 61zM344 665l17 -64q-41 -13 -58 -22l-29 60q27 13 70 26zM782 101l61 -29q-12 -28 -38 -65l-54 40q17 25 31 54zM210 603l38 -55q-34 -26 -47 -41l-48 48q32 30 57 48zM709 -2l48 -48 q-32 -30 -57 -48l-38 55q31 23 47 41zM105 497l54 -38l-32 -55l-59 29q13 29 37 64zM607 -75l29 -60q-27 -13 -70 -26l-17 65q41 13 58 21zM42 363l64 -18q-10 -55 -11 -61l-66 6q3 39 13 73zM487 -108l6 -66q-24 -2 -38 -2t-38 2l6 65q11 -1 32 -1q10 0 32 2zM106 159 l-64 -18q-10 34 -13 73l66 6q1 -7 11 -61zM361 -96l-17 -65q-43 13 -70 26l29 60q17 -8 58 -21zM159 46l-54 -39q-24 35 -37 64l59 29q17 -32 32 -54zM248 -43l-38 -55q-30 21 -57 47l48 49q13 -15 47 -41z" />
+<glyph unicode="&#x25cd;" horiz-adv-x="910" d="M884 252q0 -177 -126 -302.5t-303 -125.5t-302.5 125.5t-125.5 302.5t125.5 302.5t302.5 125.5t303 -125.5t126 -302.5zM741 474v-444q77 98 77 222q0 123 -77 222zM689 -24v552q-37 31 -78 50v-652q41 19 78 50zM559 -94v692q-42 13 -78 16v-724q36 3 78 16zM429 -110 v724q-36 -3 -78 -16v-692q42 -13 78 -16zM299 -74v652q-40 -18 -78 -51v-550q38 -33 78 -51zM169 30v443q-76 -97 -76 -221t76 -222z" />
+<glyph unicode="&#x25ce;" horiz-adv-x="842" d="M656 252q0 -99 -69 -168.5t-166 -69.5q-99 0 -168.5 69.5t-69.5 168.5q0 97 69.5 166t168.5 69q97 0 166 -69t69 -166zM590 252q0 70 -49.5 119.5t-119.5 49.5q-72 0 -122 -50t-50 -119q0 -72 50 -122t122 -50q69 0 119 50t50 122zM792 252q0 -154 -108.5 -262.5 t-262.5 -108.5t-262.5 108.5t-108.5 262.5t108.5 262.5t262.5 108.5t262.5 -108.5t108.5 -262.5zM726 252q0 126 -89.5 215.5t-215.5 89.5t-215.5 -89.5t-89.5 -215.5t89.5 -215.5t215.5 -89.5t215.5 89.5t89.5 215.5z" />
+<glyph unicode="&#x25cf;" horiz-adv-x="842" d="M792 252q0 -154 -108.5 -262.5t-262.5 -108.5t-262.5 108.5t-108.5 262.5t108.5 262.5t262.5 108.5t262.5 -108.5t108.5 -262.5z" />
+<glyph unicode="&#x25d0;" horiz-adv-x="842" d="M792 252q0 -154 -108.5 -262.5t-262.5 -108.5t-262.5 108.5t-108.5 262.5t108.5 262.5t262.5 108.5t262.5 -108.5t108.5 -262.5zM421 557v-610q126 0 215.5 89.5t89.5 215.5t-89.5 215.5t-215.5 89.5z" />
+<glyph unicode="&#x25d1;" horiz-adv-x="842" d="M792 252q0 -154 -108.5 -262.5t-262.5 -108.5t-262.5 108.5t-108.5 262.5t108.5 262.5t262.5 108.5t262.5 -108.5t108.5 -262.5zM421 -53v610q-126 0 -215.5 -89.5t-89.5 -215.5t89.5 -215.5t215.5 -89.5z" />
+<glyph unicode="&#x25d2;" horiz-adv-x="842" d="M792 252q0 -154 -108.5 -262.5t-262.5 -108.5t-262.5 108.5t-108.5 262.5t108.5 262.5t262.5 108.5t262.5 -108.5t108.5 -262.5zM116 252h610q0 126 -89.5 215.5t-215.5 89.5t-215.5 -89.5t-89.5 -215.5z" />
+<glyph unicode="&#x25d3;" horiz-adv-x="842" d="M792 252q0 -154 -108.5 -262.5t-262.5 -108.5t-262.5 108.5t-108.5 262.5t108.5 262.5t262.5 108.5t262.5 -108.5t108.5 -262.5zM726 252h-610q0 -126 89.5 -215.5t215.5 -89.5t215.5 89.5t89.5 215.5z" />
+<glyph unicode="&#x25d4;" horiz-adv-x="842" d="M792 252q0 -154 -108.5 -262.5t-262.5 -108.5t-262.5 108.5t-108.5 262.5t108.5 262.5t262.5 108.5t262.5 -108.5t108.5 -262.5zM726 252h-305v305q-126 0 -215.5 -89.5t-89.5 -215.5t89.5 -215.5t215.5 -89.5t215.5 89.5t89.5 215.5z" />
+<glyph unicode="&#x25d5;" horiz-adv-x="842" d="M792 252q0 -154 -108.5 -262.5t-262.5 -108.5t-262.5 108.5t-108.5 262.5t108.5 262.5t262.5 108.5t262.5 -108.5t108.5 -262.5zM421 252v305q-126 0 -215.5 -89.5t-89.5 -215.5h305z" />
+<glyph unicode="&#x25d6;" horiz-adv-x="580" d="M494 680v-856q-177 0 -302.5 125.5t-125.5 302.5t125.5 302.5t302.5 125.5z" />
+<glyph unicode="&#x25d7;" horiz-adv-x="580" d="M86 -176v856q177 0 302.5 -125.5t125.5 -302.5t-125.5 -302.5t-302.5 -125.5z" />
+<glyph unicode="&#x25d8;" horiz-adv-x="910" d="M865 -158h-820v820h820v-820zM650 253q0 80 -54.5 136t-138.5 56q-79 0 -135.5 -57t-56.5 -135q0 -80 56 -136.5t136 -56.5q79 0 136 57t57 136z" />
+<glyph unicode="&#x25d9;" horiz-adv-x="910" d="M865 -158h-820v820h820v-820zM733 252q0 -116 -81.5 -197t-196.5 -81t-196.5 81t-81.5 197t81.5 197t196.5 81t196.5 -81t81.5 -197zM799 252q0 142 -101 243t-243 101t-243 -101t-101 -243t101 -243t243 -101t243 101t101 243z" />
+<glyph unicode="&#x25da;" horiz-adv-x="910" d="M865 252h-66q0 142 -101 243t-243 101t-243 -101t-101 -243h-66v410h820v-410zM733 252h-556q0 116 81.5 197t196.5 81t196.5 -81t81.5 -197z" />
+<glyph unicode="&#x25db;" horiz-adv-x="910" d="M177 252h556q0 -116 -81.5 -197t-196.5 -81t-196.5 81t-81.5 197zM865 -158h-820v410h66q0 -142 101 -243t243 -101t243 101t101 243h66v-410z" />
+<glyph unicode="&#x25dc;" horiz-adv-x="910" d="M455 680v-66q-149 0 -255.5 -106.5t-106.5 -255.5h-66q0 177 125.5 302.5t302.5 125.5z" />
+<glyph unicode="&#x25dd;" horiz-adv-x="910" d="M884 252h-66q0 149 -107 255.5t-256 106.5v66q177 0 303 -125.5t126 -302.5z" />
+<glyph unicode="&#x25de;" horiz-adv-x="910" d="M818 252h66q0 -177 -126 -302.5t-303 -125.5v66q149 0 256 106.5t107 255.5z" />
+<glyph unicode="&#x25df;" horiz-adv-x="910" d="M455 -110v-66q-177 0 -303 125.5t-126 302.5h66q0 -149 107 -255.5t256 -106.5z" />
+<glyph unicode="&#x25e0;" horiz-adv-x="910" d="M884 251h-66q0 149 -107 256t-256 107t-255.5 -107t-106.5 -256h-66q0 177 125.5 303t302.5 126t303 -126t126 -303z" />
+<glyph unicode="&#x25e1;" horiz-adv-x="910" d="M818 252h66q0 -177 -125.5 -302.5t-302.5 -125.5t-303 125.5t-126 302.5h66q0 -149 107 -255.5t256 -106.5t255.5 106.5t106.5 255.5z" />
+<glyph unicode="&#x25e2;" horiz-adv-x="911" d="M865 -158h-820l820 820v-820z" />
+<glyph unicode="&#x25e3;" horiz-adv-x="911" d="M865 -158h-820v820z" />
+<glyph unicode="&#x25e4;" horiz-adv-x="911" d="M865 662l-820 -820v820h820z" />
+<glyph unicode="&#x25e5;" horiz-adv-x="911" d="M865 -158l-820 820h820v-820z" />
+<glyph unicode="&#x25e6;" horiz-adv-x="523" d="M455 252q0 -79 -57 -136t-136 -57q-80 0 -136 56.5t-56 136.5q0 78 56.5 135t135.5 57q84 0 138.5 -56t54.5 -136zM389 251q0 54 -36.5 90.5t-90.5 36.5t-90 -36.5t-36 -90.5t36 -90t90 -36t90.5 36t36.5 90z" />
+<glyph unicode="&#x25e7;" horiz-adv-x="910" d="M865 -157h-820v819h820v-819zM799 -91v687h-345v-687h345z" />
+<glyph unicode="&#x25e8;" horiz-adv-x="910" d="M865 -157h-820v819h820v-819zM456 -91v687h-345v-687h345z" />
+<glyph unicode="&#x25e9;" horiz-adv-x="910" d="M865 -157h-820v819h820v-819zM799 -91v687l-688 -687h688z" />
+<glyph unicode="&#x25ea;" horiz-adv-x="910" d="M865 -157h-820v819h820v-819zM799 596h-688v-687z" />
+<glyph unicode="&#x25eb;" horiz-adv-x="910" d="M865 -157h-820v819h820v-819zM799 -91v687h-318v-687h318zM429 -91v687h-318v-687h318z" />
+<glyph unicode="&#x25ec;" horiz-adv-x="1145" d="M1110 -127h-1075l538 938zM673 239q0 -41 -29.5 -70.5t-70.5 -29.5t-70.5 29.5t-29.5 70.5t29.5 70.5t70.5 29.5t70.5 -29.5t29.5 -70.5zM995 -61l-422 739l-424 -739h846z" />
+<glyph unicode="&#x25ed;" horiz-adv-x="1145" d="M1110 -127h-1075l537 938zM996 -61l-424 739v-739h424z" />
+<glyph unicode="&#x25ee;" horiz-adv-x="1145" d="M1110 -127h-1075l538 938zM573 -61v739l-424 -739h424z" />
+<glyph unicode="&#x25ef;" horiz-adv-x="1207" d="M1137 252q0 -145 -71.5 -268t-194 -194.5t-267.5 -71.5q-220 0 -377 157t-157 377q0 145 71.5 267.5t194.5 194t268 71.5q220 0 376.5 -156.5t156.5 -376.5zM1071 252q0 126 -63 233.5t-170.5 170.5t-233.5 63t-234 -63t-171 -170.5t-63 -233.5q0 -94 37.5 -180.5 t100.5 -149.5t149.5 -100.5t180.5 -37.5q126 0 233.5 63t170.5 171t63 234z" />
+<glyph unicode="&#x25f0;" horiz-adv-x="910" d="M865 -158h-820v820h820v-820zM799 -92v688h-318v-371h-370v-317h688zM429 277v319h-318v-319h318z" />
+<glyph unicode="&#x25f1;" horiz-adv-x="910" d="M865 -158h-820v820h820v-820zM798 -92v688h-687v-318h370v-370h317zM429 -92v318h-318v-318h318z" />
+<glyph unicode="&#x25f2;" horiz-adv-x="910" d="M865 -158h-820v820h820v-820zM799 278v318h-687v-688h317v370h370zM799 -92v318h-318v-318h318z" />
+<glyph unicode="&#x25f3;" horiz-adv-x="910" d="M865 -158h-820v820h820v-820zM799 277v319h-318v-319h318zM799 -92v317h-370v371h-318v-688h688z" />
+<glyph unicode="&#x25f4;" horiz-adv-x="842" d="M792 252q0 -154 -108.5 -262.5t-262.5 -108.5t-262.5 108.5t-108.5 262.5t108.5 262.5t262.5 108.5t262.5 -108.5t108.5 -262.5zM395 278v278q-111 -10 -189.5 -88.5t-88.5 -189.5h278zM447 226h-330q10 -118 97.5 -198.5t206.5 -80.5q126 0 215.5 89.5t89.5 215.5 q0 119 -80.5 206.5t-198.5 97.5v-330z" />
+<glyph unicode="&#x25f5;" horiz-adv-x="842" d="M792 252q0 -154 -108.5 -262.5t-262.5 -108.5t-262.5 108.5t-108.5 262.5t108.5 262.5t262.5 108.5t262.5 -108.5t108.5 -262.5zM447 278v-330q118 10 198.5 97.5t80.5 206.5q0 126 -89.5 215.5t-215.5 89.5q-119 0 -206.5 -80.5t-97.5 -198.5h330zM395 -52v278h-278 q10 -111 88.5 -189.5t189.5 -88.5z" />
+<glyph unicode="&#x25f6;" horiz-adv-x="842" d="M792 252q0 -154 -108.5 -262.5t-262.5 -108.5t-262.5 108.5t-108.5 262.5t108.5 262.5t262.5 108.5t262.5 -108.5t108.5 -262.5zM395 278h330q-10 118 -97.5 198.5t-206.5 80.5q-126 0 -215.5 -89.5t-89.5 -215.5q0 -119 80.5 -206.5t198.5 -97.5v330zM725 226h-278v-278 q111 10 189.5 88.5t88.5 189.5z" />
+<glyph unicode="&#x25f7;" horiz-adv-x="842" d="M792 252q0 -154 -108.5 -262.5t-262.5 -108.5t-262.5 108.5t-108.5 262.5t108.5 262.5t262.5 108.5t262.5 -108.5t108.5 -262.5zM447 278h278q-10 111 -88.5 189.5t-189.5 88.5v-278zM725 226h-330v330q-118 -10 -198.5 -97.5t-80.5 -206.5q0 -126 89.5 -215.5 t215.5 -89.5q119 0 206.5 80.5t97.5 198.5z" />
+<glyph unicode="&#x25f8;" horiz-adv-x="911" d="M865 662l-820 -820v820h820zM707 596h-596v-595z" />
+<glyph unicode="&#x25f9;" horiz-adv-x="911" d="M865 -158l-820 820h820v-820zM799 0v596h-595z" />
+<glyph unicode="&#x25fa;" horiz-adv-x="911" d="M865 -158h-820v820zM706 -92l-595 596v-596h595z" />
+<glyph unicode="&#x25fb;" horiz-adv-x="746" d="M701 -76h-656v656h656v-656zM635 -10v524h-524v-524h524z" />
+<glyph unicode="&#x25fc;" horiz-adv-x="746" d="M701 -76h-656v656h656v-656z" />
+<glyph unicode="&#x25fd;" horiz-adv-x="601" d="M563 -12h-525v525h525v-525zM497 54v393h-393v-393h393z" />
+<glyph unicode="&#x25fe;" horiz-adv-x="601" d="M563 -11h-525v525h525v-525z" />
+<glyph unicode="&#x25ff;" horiz-adv-x="911" d="M865 -158h-820l820 820v-820zM799 -92v595l-596 -595h596z" />
+<glyph unicode="&#x2605;" horiz-adv-x="870" d="M810 382l-228 -176l82 -272l-229 162l-229 -162l82 272l-228 176h282l93 273l93 -273h282z" />
+<glyph unicode="&#x2606;" horiz-adv-x="870" d="M810 382l-228 -176l82 -272l-229 162l-229 -162l82 272l-228 176h282l93 273l93 -273h282zM658 330h-167l-56 164l-56 -164h-167l136 -105l-49 -161l136 96l136 -96l-49 161z" />
+<glyph unicode="&#x2609;" horiz-adv-x="762" d="M712 252q0 -137 -97 -234t-234 -97t-234 97t-97 234t97 234t234 97t234 -97t97 -234zM646 252q0 110 -78 187.5t-187 77.5t-187 -77.5t-78 -187.5t78 -187.5t187 -77.5t187 77.5t78 187.5zM463 253q0 -34 -23 -58.5t-59 -24.5q-37 0 -60 22.5t-23 60.5q0 35 25 58.5 t58 23.5t57.5 -23.5t24.5 -58.5z" />
+<glyph unicode="&#x260c;" horiz-adv-x="581" d="M553 609l-131 -306q48 -33 76.5 -84.5t28.5 -111.5q0 -99 -69 -168.5t-166 -69.5q-99 0 -168.5 69.5t-69.5 168.5q0 97 69.5 166t168.5 69q42 0 75 -13l131 305zM461 107q0 70 -49.5 119.5t-119.5 49.5q-72 0 -122 -50t-50 -119q0 -72 50 -122t122 -50q69 0 119 50 t50 122z" />
+<glyph unicode="&#x260e;" horiz-adv-x="1000" d="M300 436l-208 -101q-1 1 -8 7l-10 8l-10 8q-7 6 -10 10l-8 9q-5 6 -7.5 11t-4.5 11t-2 11q0 44 15.5 86t46.5 66q65 51 187.5 82.5t218.5 31.5q99 0 227.5 -34.5t188.5 -89.5q51 -47 51 -157q0 -14 -59 -60l-208 101q0 5 0.5 17t0.5 19q0 81 -51 81h-300q-51 0 -51 -81 q0 -7 0.5 -19t0.5 -17zM650 362q0 -62 -44 -105t-106 -43q-61 0 -105 45t-44 107q0 59 44 103t103 44q62 0 107 -44t45 -107zM805 0h-610v216l75 122h36q10 -76 68.5 -122.5t136.5 -46.5q65 0 122.5 52t62.5 117h34l75 -122v-216z" />
+<glyph unicode="&#x2612;" horiz-adv-x="910" d="M865 -158h-820v820h820v-820zM719 24l-36 -36l-228 227l-228 -227l-36 36l227 228l-227 228l36 36l228 -227l228 227l36 -36l-227 -228zM799 -92v688h-688v-688h688z" />
+<glyph unicode="&#x2621;" horiz-adv-x="619" d="M549 -35h-277q-69 0 -112 34t-43 99q0 77 71 137l225 188q35 29 35 77q0 37 -26.5 56t-68.5 19h-283v55h277q69 0 112 -34.5t43 -98.5q0 -70 -63 -124l-202 -173q-66 -58 -66 -104q0 -36 26.5 -56t68.5 -20h283v-55z" />
+<glyph unicode="&#x2639;" horiz-adv-x="1150" d="M755 443q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5t35.5 -14.5t14.5 -35.5zM495 443q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5t35.5 -14.5t14.5 -35.5zM804 152l-19 -13q-52 57 -98 77t-111 20 q-66 0 -111 -20t-97 -77l-19 13q40 72 92.5 111t134.5 39q83 0 135.5 -39t92.5 -111zM980 323q0 -168 -118.5 -286.5t-286.5 -118.5t-286.5 118.5t-118.5 286.5t118.5 286.5t286.5 118.5t286.5 -118.5t118.5 -286.5zM928 323q0 145 -104 249t-249 104t-249 -104t-104 -249 t104 -249t249 -104t249 104t104 249z" />
+<glyph unicode="&#x263a;" horiz-adv-x="1150" d="M755 443q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5t35.5 -14.5t14.5 -35.5zM495 443q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5t35.5 -14.5t14.5 -35.5zM784 249l19 -13q-40 -72 -92.5 -111t-135.5 -39 t-135 39t-92 111l19 13q52 -57 97 -77t111 -20q65 0 111 20t98 77zM980 323q0 -168 -118.5 -286.5t-286.5 -118.5t-286.5 118.5t-118.5 286.5t118.5 286.5t286.5 118.5t286.5 -118.5t118.5 -286.5zM928 323q0 145 -104 249t-249 104t-249 -104t-104 -249t104 -249t249 -104 t249 104t104 249z" />
+<glyph unicode="&#x263b;" horiz-adv-x="1150" d="M980 323q0 -168 -118.5 -286.5t-286.5 -118.5t-286.5 118.5t-118.5 286.5t118.5 286.5t286.5 118.5t286.5 -118.5t118.5 -286.5zM755 443q0 21 -14.5 35.5t-35.5 14.5t-35.5 -14.5t-14.5 -35.5t14.5 -35.5t35.5 -14.5t35.5 14.5t14.5 35.5zM495 443q0 21 -14.5 35.5 t-35.5 14.5t-35.5 -14.5t-14.5 -35.5t14.5 -35.5t35.5 -14.5t35.5 14.5t14.5 35.5zM803 236l-19 13q-52 -57 -98 -77t-111 -20q-66 0 -111 20t-97 77l-19 -13q40 -72 92 -111t135 -39t135.5 39t92.5 111z" />
+<glyph unicode="&#x263c;" horiz-adv-x="837" d="M791 218h-140q-9 -63 -45 -109l99 -99l-46 -46l-99 98q-48 -37 -108 -46v-138h-66v138q-61 9 -110 45l-98 -97l-46 46l97 98q-37 48 -46 109h-137v66h137q7 59 46 111l-97 97l46 46l98 -97q48 36 109 45v138h66v-138q61 -9 109 -46l99 98l46 -46l-98 -99q37 -49 44 -108 h140v-66zM587 252h1q0 70 -50 119.5t-119 49.5q-72 0 -122.5 -50t-50.5 -119q0 -72 50.5 -122t121.5 -50q70 0 119.5 50t49.5 122z" />
+<glyph unicode="&#x263d;" horiz-adv-x="641" d="M601 320q0 -167 -118.5 -284.5t-285.5 -117.5q-72 0 -157 37q154 1 260.5 106.5t106.5 258.5q0 154 -107 262.5t-260 108.5q74 37 157 37q167 0 285.5 -120t118.5 -288zM198 -43v-2q154 0 260 105.5t106 259.5q0 148 -102 255.5t-249 115.5v-3q104 -49 167.5 -148.5 t63.5 -219.5q0 -124 -66.5 -220t-179.5 -143z" />
+<glyph unicode="&#x263e;" horiz-adv-x="641" d="M601 -45q-74 -37 -157 -37q-167 0 -285.5 120t-118.5 288q0 167 118.5 284.5t285.5 117.5q72 0 157 -37q-154 -1 -260.5 -106.5t-106.5 -258.5q0 -154 107 -262.5t260 -108.5zM443 689v2q-154 0 -260 -105.5t-106 -259.5q0 -148 102 -255.5t249 -115.5v3 q-104 49 -167.5 148.5t-63.5 219.5q0 124 66.5 220t179.5 143z" />
+<glyph unicode="&#x263f;" horiz-adv-x="603" d="M466 702h68q-20 -105 -112 -160q53 -31 84.5 -85t31.5 -117q0 -90 -58 -157t-144 -79v-104h136v-66h-136v-132h-66v132h-139v66h139v104q-88 12 -146.5 79t-58.5 157q0 63 31.5 117t84.5 85q-92 55 -112 160h68q15 -56 61 -91.5t105 -35.5q57 0 102.5 35.5t60.5 91.5z M472 340q0 70 -49.5 119.5t-119.5 49.5q-72 0 -122 -50t-50 -119q0 -72 50 -122t122 -50q69 0 119 50t50 122z" />
+<glyph unicode="&#x2640;" horiz-adv-x="603" d="M270 63v104q-88 12 -146.5 79t-58.5 157q0 97 69.5 166t168.5 69q97 0 166 -69t69 -166q0 -90 -58 -156.5t-144 -79.5v-104h136v-66h-136v-132h-66v132h-139v66h139zM472 403q0 70 -49.5 119.5t-119.5 49.5q-72 0 -122 -50t-50 -119q0 -72 50 -122t122 -50q69 0 119 50 t50 122z" />
+<glyph unicode="&#x2641;" horiz-adv-x="603" d="M336 440v-104q86 -13 144 -79.5t58 -156.5q0 -97 -69 -166t-166 -69q-99 0 -168.5 69t-69.5 166q0 90 58.5 157t146.5 79v104h-139v66h139v132h66v-132h136v-66h-136zM472 100q0 72 -50 122t-119 50q-72 0 -122 -50t-50 -122q0 -69 50 -119t122 -50q70 0 119.5 49.5 t49.5 119.5z" />
+<glyph unicode="&#x2642;" horiz-adv-x="660" d="M620 399l-13 -32q-62 69 -99 137l-86 -201q48 -33 76.5 -84.5t28.5 -111.5q0 -99 -69 -168.5t-166 -69.5q-99 0 -168.5 69.5t-69.5 168.5q0 97 69.5 166t168.5 69q42 0 75 -13l86 200q-78 -23 -168 -26l13 33q165 45 219 98l22 -9q0 -96 81 -226zM461 107 q0 70 -49.5 119.5t-119.5 49.5q-72 0 -122 -50t-50 -119q0 -72 50 -122t122 -50q69 0 119 50t50 122z" />
+<glyph unicode="&#x2643;" horiz-adv-x="970" d="M904 0h-172v-176h-56v176h-601v51q6 1 18 1.5t16 0.5q86 6 156 55q89 62 149 163t60 204q0 85 -49.5 142t-133.5 57q-67 0 -118 -40.5t-51 -105.5q0 -66 73 -126q-11 -22 -27 -46q-102 60 -102 170q0 88 67 147t156 59q106 0 175 -71t69 -177q0 -123 -73.5 -239 t-186.5 -191h403v662h56v-662h172v-54z" />
+<glyph unicode="&#x2644;" horiz-adv-x="970" d="M809 -24h57q-9 -49 -51 -82.5t-92 -33.5q-67 0 -111 38.5t-44 104.5q0 51 41 175t41 162q0 57 -43.5 93.5t-101.5 36.5q-60 0 -128 -34.5t-103 -82.5v-353h-56v642h-155v55h155v96h56v-96h268v-55h-268v-211q121 94 229 94q82 0 141.5 -51.5t59.5 -132.5 q0 -26 -11.5 -72.5t-33 -116t-23.5 -77.5q-14 -51 -14 -69q0 -37 29 -64t66 -27q63 0 92 61z" />
+<glyph unicode="&#x2646;" horiz-adv-x="840" d="M780 644h-60v-170q0 -116 -78.5 -202t-193.5 -97v-119h108v-56h-108v-110h-56v110h-108v56h108v119q-115 11 -193.5 97t-78.5 202v170h-60l88 116l88 -116h-60v-170q0 -93 62 -162t154 -80v412h-60l88 116l88 -116h-60v-412q92 11 154 80t62 162v170h-60l88 116z" />
+<glyph unicode="&#x2647;" horiz-adv-x="632" d="M76 730h285q91 0 153 -57.5t62 -148.5t-62 -148t-153 -57h-229v-373h389v-56h-445v840zM132 375h232q63 0 109.5 42.5t46.5 106.5t-46.5 107t-109.5 43h-232v-299z" />
+<glyph unicode="&#x2648;" horiz-adv-x="964" d="M510 -110h-56q-1 41 -3.5 90.5t-10 132.5t-18.5 158t-32 157t-47 141t-65.5 97.5t-86.5 38.5q-41 0 -75.5 -32t-34.5 -97q0 -72 73 -126q-11 -22 -27 -46q-48 28 -75 74.5t-27 102.5q0 82 49.5 130.5t117.5 48.5q59 0 107 -36t78 -90t52.5 -129.5t34 -141t18.5 -137.5 q10 94 27 175t49 168.5t87 139t127 51.5q68 0 117.5 -48.5t49.5 -130.5q0 -56 -27 -102.5t-75 -74.5q-16 24 -27 46q73 54 73 126q0 65 -34.5 97t-75.5 32q-47 0 -86.5 -38.5t-65.5 -97.5t-47 -141t-32 -157t-18.5 -158t-10 -132.5t-3.5 -90.5z" />
+<glyph unicode="&#x2649;" horiz-adv-x="781" d="M738 643v-61q-13 0 -24 -8q-26 -18 -48 -59t-36.5 -80t-46.5 -78t-77 -55q54 -32 86 -86t32 -117q0 -98 -68.5 -168t-166.5 -70q-99 0 -168.5 69.5t-69.5 168.5q0 63 32 117.5t87 85.5q-44 16 -75 54t-45 76t-34.5 79.5t-45.5 60.5q-13 10 -27 10v61q49 0 80 -31.5 t49.5 -77t39.5 -90.5t65 -77t111 -32t111.5 32t66.5 77t41 90.5t50.5 77t80.5 31.5zM558 99q0 69 -50 119t-119 50q-70 0 -121 -49.5t-51 -119.5q0 -71 50.5 -121.5t121.5 -50.5q70 0 119.5 51t49.5 121z" />
+<glyph unicode="&#x2660;" d="M314 68h-12q-45 -64 -132 -64q-48 0 -92 49t-44 117q0 61 31 117.5t71 96.5l104 104q63 64 104 121q39 -58 100 -121l102 -104q42 -40 73.5 -96t31.5 -115q0 -82 -47.5 -125.5t-99.5 -43.5q-17 0 -29 1.5t-28 7.5t-31.5 19.5t-30.5 35.5h-10q0 -34 7 -65.5t25.5 -58 t46.5 -28.5v-15h-222v15q28 2 47.5 28t27 58t7.5 66z" />
+<glyph unicode="&#x2661;" d="M651 415q0 -50 -18 -101.5t-53 -105.5t-69 -98l-86 -108q-52 -64 -83 -107q-35 51 -100 133l-104 135q-39 52 -71.5 122t-32.5 129q0 86 47.5 137.5t109.5 51.5q45 0 86.5 -32t63.5 -111q30 81 68 112t86 31q70 0 113 -49.5t43 -138.5zM379 395h-73q-28 81 -53 111.5 t-70 30.5q-35 0 -59 -32.5t-24 -85.5q0 -71 55 -159t187 -257q128 141 185.5 239t57.5 177q0 56 -22.5 87t-61.5 31q-45 0 -70.5 -30.5t-51.5 -111.5z" />
+<glyph unicode="&#x2662;" d="M643 252q-163 -164 -300 -357q-121 158 -302 357q165 162 302 357q143 -191 300 -357zM533 251q0 25 -17 47q-41 37 -139 165q-15 20 -35 20q-18 0 -35 -22q-71 -94 -137 -165q-16 -16 -16 -44q0 -30 16 -46q69 -77 134 -164q15 -21 39 -21t39 21q66 87 135 160 q16 17 16 49z" />
+<glyph unicode="&#x2663;" d="M472 340l6 -6q10 6 24 6q62 0 105.5 -50.5t43.5 -116.5q0 -79 -43 -124t-102 -45q-39 0 -72.5 18.5t-47.5 45.5h-11q0 -34 7 -65.5t25.5 -58t46.5 -28.5v-15h-222v15q28 2 47.5 28.5t27 58.5t7.5 65h-11q-16 -28 -49 -46t-72 -18q-63 0 -105.5 46.5t-42.5 122.5 q0 75 43.5 121t108.5 46q4 0 12 -2t12 -2l6 7q-29 42 -29 99q0 63 48 112t112 49q63 0 108.5 -47.5t45.5 -110.5q0 -59 -29 -105z" />
+<glyph unicode="&#x2664;" d="M314 68h-10q-43 -63 -120 -63q-61 0 -105.5 45t-44.5 120q0 61 31 117.5t71 96.5l104 104q63 64 104 121q41 -56 104 -121l102 -104q40 -40 70.5 -97t30.5 -118q0 -77 -43.5 -121t-103.5 -44q-78 0 -119 64h-10q0 -34 7 -65.5t25.5 -58t46.5 -28.5v-15h-222v15 q28 2 47.5 28t27 58t7.5 66zM298 167h92q16 -46 47 -71.5t63 -25.5q36 0 60.5 28t24.5 80q0 65 -59.5 140.5t-181.5 185.5q-125 -112 -184.5 -185.5t-59.5 -140.5q0 -53 26 -80.5t63 -27.5q38 0 68.5 24.5t40.5 72.5z" />
+<glyph unicode="&#x2665;" d="M651 413q0 -61 -32 -132t-69 -119l-106 -136q-69 -86 -102 -131q-35 51 -100 133l-104 134q-39 52 -71.5 121.5t-32.5 128.5q0 86 47.5 138.5t109.5 52.5q45 0 86.5 -32t63.5 -111q30 81 68 112t86 31q69 0 112.5 -50.5t43.5 -139.5z" />
+<glyph unicode="&#x2666;" d="M643 252q-163 -164 -300 -357q-121 158 -302 357q165 162 302 357q143 -191 300 -357z" />
+<glyph unicode="&#x2667;" d="M472 340l6 -6q10 6 24 6q62 0 105.5 -50.5t43.5 -116.5q0 -79 -43 -124t-102 -45q-39 0 -72.5 18.5t-47.5 45.5h-11q0 -34 7 -65.5t25.5 -58t46.5 -28.5v-15h-222v15q28 2 47.5 28.5t27 58.5t7.5 65h-11q-16 -28 -49 -46t-72 -18q-63 0 -105.5 46.5t-42.5 122.5 q0 75 43.5 121t108.5 46q4 0 12 -2t12 -2l6 7q-29 42 -29 99q0 63 48 112t112 49q63 0 108.5 -47.5t45.5 -110.5q0 -59 -29 -105zM297 167h92q16 -47 43.5 -72t58.5 -25q39 0 66.5 25.5t27.5 73.5q0 45 -30.5 75t-77.5 30q-23 0 -58 -15l-35 74q24 23 37.5 50.5t13.5 47.5 q0 46 -23.5 76t-65.5 30q-43 0 -68 -31.5t-25 -74.5q0 -22 12.5 -49.5t37.5 -48.5l-35 -74q-36 15 -65 15q-48 0 -75.5 -29.5t-27.5 -75.5q0 -48 28 -73.5t67 -25.5q33 0 62.5 24.5t39.5 72.5z" />
+<glyph unicode="&#x2669;" horiz-adv-x="390" d="M345 714v-675q0 -64 -63.5 -114t-134.5 -50q-43 0 -72.5 24.5t-29.5 62.5q0 60 65.5 111.5t126.5 51.5q45 0 68 -8v597h40z" />
+<glyph unicode="&#x266a;" horiz-adv-x="560" d="M301 714h24q7 -39 38 -87.5t68 -96.5t48 -71q31 -49 31 -105q0 -35 -11 -80t-23 -64l-15 9q24 56 24 125q0 57 -43.5 108.5t-100.5 67.5v-473q0 -65 -52 -118.5t-139 -53.5q-43 0 -71.5 25t-28.5 58q0 64 65 115.5t135 51.5q31 0 51 -12v601z" />
+<glyph unicode="&#x266b;" horiz-adv-x="840" d="M721 842v-682q0 -71 -54.5 -125t-135.5 -54q-42 0 -71 25t-29 56q0 69 67.5 119t124.5 50q41 0 58 -14v531l-349 -105v-604q0 -61 -57.5 -112.5t-132.5 -51.5q-38 0 -70 22t-32 61q0 65 65 116t130 51q26 0 57 -10v599z" />
+<glyph unicode="&#x266d;" horiz-adv-x="426" d="M97 768v-318q24 31 56 44.5t57 13.5q63 0 99.5 -37t36.5 -104q0 -49 -9 -89t-35.5 -89.5t-83.5 -100t-143 -98.5h-18v755zM97 370v-307q61 41 101 98t54 106t14 96q0 43 -18 75.5t-54 32.5q-38 0 -67.5 -35t-29.5 -66z" />
+<glyph unicode="&#x266e;" horiz-adv-x="426" d="M350 -158l-40 -23v260l-235 -89v755l40 23v-260l235 89v-755zM310 164v332l-195 -74v-330z" />
+<glyph unicode="&#x266f;" horiz-adv-x="426" d="M386 95l-55 -17v-150l-40 -23v161l-155 -49v-175l-40 -23v186l-55 -17v85l55 17v335l-55 -17v85l55 17v149l40 23v-160l155 49v174l40 23v-185l55 17v-85l-55 -17v-335l55 17v-85zM291 151v335l-155 -49v-335z" />
+<glyph unicode="&#x267e;" horiz-adv-x="1186" d="M903 249q0 -73 -40 -128.5t-111 -55.5q-35 0 -65 18.5t-46.5 39t-39.5 56.5q-20 -30 -31 -45t-30.5 -34t-42.5 -27t-52 -8q-78 0 -119.5 55t-41.5 135q0 73 40 128.5t111 55.5q51 0 84 -29.5t67 -84.5q20 30 31 45t30.5 34t42.5 27t52 8q78 0 119.5 -55t41.5 -135z M870 260q0 49 -29.5 87t-76.5 38q-22 0 -42 -11t-33.5 -25t-27 -38.5t-19.5 -39.5l-17 -40q41 -88 129 -88q51 0 83.5 33t32.5 84zM562 278q-41 88 -129 88q-51 0 -83.5 -33t-32.5 -84q0 -49 29.5 -87t76.5 -38q22 0 42 11t33.5 25t27 38.5t20.5 39.5zM1116 252 q0 -106 -41.5 -203t-111.5 -167t-167 -111.5t-203 -41.5t-203 41.5t-167 111.5t-111.5 167t-41.5 203t41.5 203t111.5 167t167 111.5t203 41.5t203 -41.5t167 -111.5t111.5 -167t41.5 -203zM1050 252q0 188 -134.5 322.5t-322.5 134.5t-322.5 -134.5t-134.5 -322.5 t134.5 -322.5t322.5 -134.5t322.5 134.5t134.5 322.5z" />
+<glyph unicode="&#x2680;" horiz-adv-x="1032" d="M571 323q0 -23 -16 -39t-39 -16t-39 16t-16 39t16 39t39 16t39 -16t16 -39zM862 -23h-692v692h692v-692zM819 20v606h-606v-606h606z" />
+<glyph unicode="&#x2681;" horiz-adv-x="1032" d="M403 491q0 -23 -16 -39t-39 -16t-39 16t-16 39t16 39t39 16t39 -16t16 -39zM739 155q0 -23 -16 -39t-39 -16t-39 16t-16 39t16 39t39 16t39 -16t16 -39zM862 -23h-692v692h692v-692zM819 20v606h-606v-606h606z" />
+<glyph unicode="&#x2682;" horiz-adv-x="1032" d="M571 323q0 -23 -16 -39t-39 -16t-39 16t-16 39t16 39t39 16t39 -16t16 -39zM862 -23h-692v692h692v-692zM819 20v606h-606v-606h606zM403 491q0 -23 -16 -39t-39 -16t-39 16t-16 39t16 39t39 16t39 -16t16 -39zM739 155q0 -23 -16 -39t-39 -16t-39 16t-16 39t16 39t39 16 t39 -16t16 -39z" />
+<glyph unicode="&#x2683;" horiz-adv-x="1032" d="M403 491q0 -23 -16 -39t-39 -16t-39 16t-16 39t16 39t39 16t39 -16t16 -39zM739 155q0 -23 -16 -39t-39 -16t-39 16t-16 39t16 39t39 16t39 -16t16 -39zM862 -23h-692v692h692v-692zM819 20v606h-606v-606h606zM739 491q0 -23 -16 -39t-39 -16t-39 16t-16 39t16 39t39 16 t39 -16t16 -39zM403 155q0 -23 -16 -39t-39 -16t-39 16t-16 39t16 39t39 16t39 -16t16 -39z" />
+<glyph unicode="&#x2684;" horiz-adv-x="1032" d="M403 491q0 -23 -16 -39t-39 -16t-39 16t-16 39t16 39t39 16t39 -16t16 -39zM739 155q0 -23 -16 -39t-39 -16t-39 16t-16 39t16 39t39 16t39 -16t16 -39zM571 323q0 -23 -16 -39t-39 -16t-39 16t-16 39t16 39t39 16t39 -16t16 -39zM862 -23h-692v692h692v-692zM819 20v606 h-606v-606h606zM739 491q0 -23 -16 -39t-39 -16t-39 16t-16 39t16 39t39 16t39 -16t16 -39zM403 155q0 -23 -16 -39t-39 -16t-39 16t-16 39t16 39t39 16t39 -16t16 -39z" />
+<glyph unicode="&#x2685;" horiz-adv-x="1032" d="M739 491q0 -23 -16 -39t-39 -16t-39 16t-16 39t16 39t39 16t39 -16t16 -39zM403 155q0 -23 -16 -39t-39 -16t-39 16t-16 39t16 39t39 16t39 -16t16 -39zM403 491q0 -23 -16 -39t-39 -16t-39 16t-16 39t16 39t39 16t39 -16t16 -39zM739 155q0 -23 -16 -39t-39 -16t-39 16 t-16 39t16 39t39 16t39 -16t16 -39zM862 -23h-692v692h692v-692zM819 20v606h-606v-606h606zM739 323q0 -23 -16 -39t-39 -16t-39 16t-16 39t16 39t39 16t39 -16t16 -39zM403 323q0 -23 -16 -39t-39 -16t-39 16t-16 39t16 39t39 16t39 -16t16 -39z" />
+<glyph unicode="&#x2686;" horiz-adv-x="1032" d="M731 323q0 -23 -16 -39t-39 -16t-39 16t-16 39t16 39t39 16t39 -16t16 -39zM881 323q0 -152 -106.5 -258.5t-257.5 -106.5t-258 107t-107 258t106.5 257.5t258.5 106.5q151 0 257.5 -106.5t106.5 -257.5zM829 323q0 131 -90.5 221.5t-221.5 90.5t-222 -91t-91 -221 q0 -131 91 -222t222 -91q130 0 221 91t91 222z" />
+<glyph unicode="&#x2687;" horiz-adv-x="1032" d="M731 323q0 -23 -16 -39t-39 -16t-39 16t-16 39t16 39t39 16t39 -16t16 -39zM881 323q0 -152 -106.5 -258.5t-257.5 -106.5t-258 107t-107 258t106.5 257.5t258.5 106.5q151 0 257.5 -106.5t106.5 -257.5zM829 323q0 131 -90.5 221.5t-221.5 90.5t-222 -91t-91 -221 q0 -131 91 -222t222 -91q130 0 221 91t91 222zM412 323q0 -23 -16 -39t-39 -16t-39 16t-16 39t16 39t39 16t39 -16t16 -39z" />
+<glyph unicode="&#x2688;" horiz-adv-x="1032" d="M881 323q0 -152 -106.5 -258.5t-257.5 -106.5t-258 107t-107 258t106.5 257.5t258.5 106.5q151 0 257.5 -106.5t106.5 -257.5zM731 323q0 23 -16 39t-39 16t-39 -16t-16 -39t16 -39t39 -16t39 16t16 39z" />
+<glyph unicode="&#x2689;" horiz-adv-x="1032" d="M881 323q0 -152 -106.5 -258.5t-257.5 -106.5t-258 107t-107 258t106.5 257.5t258.5 106.5q151 0 257.5 -106.5t106.5 -257.5zM731 323q0 23 -16 39t-39 16t-39 -16t-16 -39t16 -39t39 -16t39 16t16 39zM412 323q0 23 -16 39t-39 16t-39 -16t-16 -39t16 -39t39 -16t39 16 t16 39z" />
+<glyph unicode="&#x26a0;" horiz-adv-x="1510" d="M1485 -155h-1460l721 1178zM156 -89h1198l-608 964zM738 176l-42 381q-3 30 -3 43q0 76 53 76q25 0 39 -22t14 -59q0 -16 -2 -38l-45 -381h-14zM799 42q0 -22 -15.5 -36.5t-38.5 -14.5t-37.5 14.5t-14.5 37.5t15.5 38.5t37.5 15.5t37.5 -16t15.5 -39z" />
+<glyph unicode="&#x26a5;" horiz-adv-x="660" d="M620 549l-13 -32q-62 69 -99 137l-86 -201q48 -33 76.5 -84.5t28.5 -111.5q0 -90 -58 -156.5t-144 -79.5v-104h136v-66h-136v-132h-66v132h-139v66h139v104q-88 12 -146.5 79t-58.5 157q0 97 69.5 166t168.5 69q42 0 75 -13l86 200q-78 -23 -168 -26l13 33q165 45 219 98 l22 -9q0 -96 81 -226zM461 257q0 70 -49.5 119.5t-119.5 49.5q-72 0 -122 -50t-50 -119q0 -72 50 -122t122 -50q69 0 119 50t50 122z" />
+<glyph unicode="&#x26aa;" horiz-adv-x="762" d="M712 252q0 -137 -97 -234t-234 -97t-234 97t-97 234t97 234t234 97t234 -97t97 -234zM646 252q0 110 -78 187.5t-187 77.5t-187 -77.5t-78 -187.5t78 -187.5t187 -77.5t187 77.5t78 187.5z" />
+<glyph unicode="&#x26ab;" horiz-adv-x="762" d="M712 252q0 -137 -97 -234t-234 -97t-234 97t-97 234t97 234t234 97t234 -97t97 -234z" />
+<glyph unicode="&#x26ac;" horiz-adv-x="565" d="M519 252q0 -99 -69 -168.5t-166 -69.5q-99 0 -168.5 69.5t-69.5 168.5q0 97 69.5 166t168.5 69q97 0 166 -69t69 -166zM453 252q0 70 -49.5 119.5t-119.5 49.5q-72 0 -122 -50t-50 -119q0 -72 50 -122t122 -50q69 0 119 50t50 122z" />
+<glyph unicode="&#x26b2;" horiz-adv-x="603" d="M270 -135v302q-88 12 -146.5 79.5t-58.5 156.5q0 98 70 166.5t168 68.5q97 0 166 -69t69 -166q0 -88 -57.5 -155.5t-144.5 -80.5v-302h-66zM472 403q0 69 -50 119t-119 50q-71 0 -121.5 -49.5t-50.5 -119.5q0 -71 50.5 -121.5t121.5 -50.5q70 0 119.5 50.5t49.5 121.5z " />
+<glyph unicode="&#x2702;" horiz-adv-x="961" d="M905 495l-365 -145l364 -142q-30 -41 -94 -41q-49 0 -132 33l-264 102l-50 -19q-40 -15 -65 -21q-17 -4 -42 -4q-15 0 -30 -16q0 -13 6 -31.5t6 -32.5q0 -46 -26 -71t-73 -25t-76 24t-29 68q0 52 33 80.5t86 28.5h97q35 0 61.5 19t33.5 53q-32 58 -98 58h-106 q-47 0 -77 27.5t-30 75.5q0 46 28 71t77 25q45 0 72 -25t27 -68q0 -15 -6 -37t-6 -27q3 -2 9 -7t10.5 -7.5t8.5 -2.5q30 0 44 -4q43 -11 115 -38l265 102q6 2 31 12t35 13.5t29.5 7.5t37.5 4q47 0 93 -40zM209 516q0 32 -20.5 49t-54.5 17q-33 0 -51 -18.5t-18 -50.5 q0 -30 22.5 -47.5t58.5 -17.5q63 0 63 68zM209 182q0 66 -63 66q-36 0 -58.5 -20.5t-22.5 -55.5q0 -29 21 -44.5t54 -15.5q69 0 69 70z" />
+<glyph unicode="&#x2709;" horiz-adv-x="690" d="M638 138h-604v417h604v-417zM620 178v336l-202 -153q2 -8 2 -12q0 -9 -1 -12zM614 537h-556l200 -159q23 52 79 52q54 0 77 -52zM614 156l-200 164q-21 -57 -77 -57q-27 0 -48.5 16.5t-31.5 40.5l-199 -164h556zM52 178l202 159q-1 5 -1 12t1 12l-202 153v-336z" />
+<glyph unicode="&#x2713;" horiz-adv-x="755" d="M704 690l-24 -27q-22 -25 -104 -132.5t-113 -153.5q-49 -71 -234 -366q-15 -23 -40 -23h-64q-18 0 -54.5 99t-36.5 138q0 17 15 26l60 33q12 6 25 6q11 0 22 -23.5t23 -54t23 -41.5l240 359q83 123 125 145q51 27 132 32z" />
+<glyph unicode="&#x2720;" horiz-adv-x="767" d="M714 430v-355q-144 154 -279 154h-28v-39q0 -78 36 -139.5t118 -137.5h-355q76 70 115 135.5t39 141.5v39h-29q-72 0 -128.5 -32t-149.5 -122v355q142 -154 278 -154h29v39q0 138 -154 277h355q-154 -142 -154 -275v-41h29q69 0 127 32t151 122z" />
+<glyph unicode="&#x272a;" horiz-adv-x="789" d="M733 252q0 -151 -98.5 -254.5t-249.5 -103.5q-146 0 -248 104.5t-102 253.5q0 150 102.5 255.5t249.5 105.5q149 0 247.5 -105t98.5 -256zM690 361h-232l-73 223l-74 -223h-237l189 -145l-79 -235l201 145l187 -142l-69 232z" />
+<glyph unicode="&#x2736;" horiz-adv-x="695" d="M447 252l195 -178q-43 8 -137.5 41.5t-107.5 37.5q-42 -206 -57 -261q-30 108 -57 261q-215 -75 -237 -78q-4 -1 -8 -1l194 178l-64 56l-76 70q-32 29 -57 57l247 -86q29 159 58 267q19 -76 57 -267l244 86q-8 -16 -33.5 -40.5t-79.5 -71.5z" />
+<glyph unicode="&#x273d;" horiz-adv-x="682" d="M341 295v-19q8 4 15.5 9.5t16 13t14 13t14.5 16.5t13 15.5t14 18t13 16.5q5 6 16.5 21t16.5 21t15.5 17t18 15t18.5 8t23 4q77 0 77 -68t-64 -86q-22 -6 -69.5 -14t-83 -17.5t-55.5 -26.5q21 -14 49.5 -22t70 -15t61.5 -12q45 -11 67.5 -31t22.5 -67q0 -67 -77 -67 q-21 0 -38 10t-25.5 20.5t-22.5 31.5t-21 29l-15 19q-10 14 -15 20l-15 16q-10 12 -17 18.5t-17.5 14.5t-20.5 14v-18q0 -47 32.5 -127t32.5 -102q0 -39 -22.5 -65.5t-53.5 -26.5t-52.5 25.5t-21.5 62.5q0 26 31.5 106.5t31.5 126.5v18q-40 -26 -92 -92q-8 -10 -22 -32 t-23.5 -34.5t-28 -23.5t-42.5 -11q-76 0 -76 68q0 49 26.5 69.5t72.5 27.5l24 4q18 3 25 4t22.5 4t24 5.5t21.5 6t21.5 7t18.5 8.5t18 10q-23 17 -57 27t-82.5 18.5t-69.5 13.5q-63 17 -63 85q0 69 77 69q20 0 37.5 -9.5t24.5 -17.5t22 -31.5t19 -28.5q57 -80 102 -102v19 q0 39 -31.5 117t-31.5 108q0 40 21.5 66t52.5 26t53.5 -26t22.5 -63q0 -32 -32.5 -110.5t-32.5 -117.5z" />
+<glyph unicode="&#x2772;" horiz-adv-x="488" d="M466 719l-212 -240v-452l211 -240h-52l-225 217v498l226 217h52z" />
+<glyph unicode="&#x2773;" horiz-adv-x="488" d="M300 4l-226 -217h-52l212 240v452l-211 240h52l225 -217v-498z" />
+<glyph unicode="&#x2780;" horiz-adv-x="788" d="M421 112h-60v359h-98v42h23q86 0 97 69h38v-470zM733 345q0 -151 -98.5 -255t-246.5 -104q-149 0 -251 104.5t-102 254.5t103 255t251 105q147 0 245.5 -104.5t98.5 -255.5zM698 350q0 131 -90.5 225.5t-218.5 94.5q-143 0 -231 -97.5t-88 -225.5q0 -136 93.5 -231 t223.5 -95q131 0 221 96.5t90 232.5z" />
+<glyph unicode="&#x2781;" horiz-adv-x="788" d="M294 422l-61 8q0 68 28 108q38 53 117 53q71 0 112.5 -39.5t41.5 -110.5q0 -37 -14 -69t-29 -48t-43 -41q-7 -6 -66 -47t-77 -74h223v-52h-281q-4 7 -4 19q0 21 6.5 40.5t13.5 32t24 28.5t25.5 22.5t31.5 21.5l29 20l36 26q11 9 28.5 27.5t25 40.5t7.5 49 q0 47 -22.5 74.5t-66.5 27.5q-85 0 -85 -117zM733 345q0 -151 -98.5 -255t-246.5 -104q-149 0 -251 104.5t-102 254.5t103 255t251 105q147 0 245.5 -104.5t98.5 -255.5zM698 350q0 131 -90.5 225.5t-218.5 94.5q-143 0 -231 -97.5t-88 -225.5q0 -136 93.5 -231t223.5 -95 q131 0 221 96.5t90 232.5z" />
+<glyph unicode="&#x2782;" horiz-adv-x="788" d="M302 455l-51 7q4 62 37 95.5t93 33.5q64 0 102 -34t38 -95q0 -77 -69 -104q83 -24 83 -117q0 -63 -40.5 -99t-107.5 -36q-142 0 -142 138l54 13q0 -50 20.5 -74.5t65.5 -24.5q41 0 63.5 23t22.5 66q0 88 -105 88q-19 0 -24 -1v44q5 -1 14 -1q105 0 105 84q0 78 -83 78 q-74 0 -76 -84zM733 345q0 -151 -98.5 -255t-246.5 -104q-149 0 -251 104.5t-102 254.5t103 255t251 105q147 0 245.5 -104.5t98.5 -255.5zM698 350q0 131 -90.5 225.5t-218.5 94.5q-143 0 -231 -97.5t-88 -225.5q0 -136 93.5 -231t223.5 -95q131 0 221 96.5t90 232.5z" />
+<glyph unicode="&#x2783;" horiz-adv-x="788" d="M523 229h-72v-117h-54v117h-201v61l202 294h53v-301h72v-54zM397 283v218l-148 -218h148zM733 345q0 -151 -98.5 -255t-246.5 -104q-149 0 -251 104.5t-102 254.5t103 255t251 105q147 0 245.5 -104.5t98.5 -255.5zM698 350q0 131 -90.5 225.5t-218.5 94.5 q-143 0 -231 -97.5t-88 -225.5q0 -136 93.5 -231t223.5 -95q131 0 221 96.5t90 232.5z" />
+<glyph unicode="&#x2784;" horiz-adv-x="788" d="M311 539v-135q25 41 95 41q66 0 101.5 -44t35.5 -115q0 -82 -39 -131t-116 -49q-60 0 -98.5 32.5t-38.5 87.5l53 12q0 -80 82 -80q97 0 97 133q0 50 -24.5 78t-63.5 28q-73 0 -89 -81h-43v275h239v-52h-191zM733 345q0 -151 -98.5 -255t-246.5 -104q-149 0 -251 104.5 t-102 254.5t103 255t251 105q147 0 245.5 -104.5t98.5 -255.5zM698 350q0 131 -90.5 225.5t-218.5 94.5q-143 0 -231 -97.5t-88 -225.5q0 -136 93.5 -231t223.5 -95q131 0 221 96.5t90 232.5z" />
+<glyph unicode="&#x2785;" horiz-adv-x="788" d="M282 378v-28q12 30 41 48.5t68 18.5q63 0 95.5 -40.5t32.5 -108.5q0 -74 -35.5 -118t-104.5 -44q-85 0 -119 65t-34 176q0 243 164 243q100 0 117 -106l-51 -12q-7 35 -21 52.5t-48 17.5q-105 0 -105 -164zM465 259q0 110 -86 110q-44 0 -67.5 -28.5t-23.5 -75.5 q0 -51 24 -81t72 -30q81 0 81 105zM733 345q0 -151 -98.5 -255t-246.5 -104q-149 0 -251 104.5t-102 254.5t103 255t251 105q147 0 245.5 -104.5t98.5 -255.5zM698 350q0 131 -90.5 225.5t-218.5 94.5q-143 0 -231 -97.5t-88 -225.5q0 -136 93.5 -231t223.5 -95 q131 0 221 96.5t90 232.5z" />
+<glyph unicode="&#x2786;" horiz-adv-x="788" d="M534 582v-55q-150 -216 -185 -415h-65q26 132 70.5 223.5t125.5 192.5h-250v54h304zM733 345q0 -151 -98.5 -255t-246.5 -104q-149 0 -251 104.5t-102 254.5t103 255t251 105q147 0 245.5 -104.5t98.5 -255.5zM698 350q0 131 -90.5 225.5t-218.5 94.5q-143 0 -231 -97.5 t-88 -225.5q0 -136 93.5 -231t223.5 -95q131 0 221 96.5t90 232.5z" />
+<glyph unicode="&#x2787;" horiz-adv-x="788" d="M528 244q0 -66 -39.5 -102t-107.5 -36q-64 0 -102.5 38t-38.5 103q0 85 87 112q-69 33 -69 106q0 59 35.5 92t97.5 33q59 0 94 -33.5t35 -91.5q0 -80 -71 -105q79 -28 79 -116zM466 468q0 74 -77 74t-77 -77q0 -83 75 -83q79 0 79 86zM474 247q0 85 -93 85 q-42 0 -64.5 -24.5t-22.5 -66.5t24.5 -64.5t66.5 -22.5q40 0 64.5 25t24.5 68zM733 345q0 -151 -98.5 -255t-246.5 -104q-149 0 -251 104.5t-102 254.5t103 255t251 105q147 0 245.5 -104.5t98.5 -255.5zM698 350q0 131 -90.5 225.5t-218.5 94.5q-143 0 -231 -97.5 t-88 -225.5q0 -136 93.5 -231t223.5 -95q131 0 221 96.5t90 232.5z" />
+<glyph unicode="&#x2788;" horiz-adv-x="788" d="M477 320v25q-12 -30 -41 -48t-68 -18q-62 0 -95 41t-33 108q0 74 36 118t102 44q77 0 115 -55q40 -58 40 -184q0 -245 -163 -245q-97 0 -116 97l51 12q7 -30 21.5 -45.5t44.5 -15.5q106 0 106 166zM471 433q0 50 -24.5 79.5t-70.5 29.5q-82 0 -82 -107q0 -108 85 -108 q46 0 69 28.5t23 77.5zM733 345q0 -151 -98.5 -255t-246.5 -104q-149 0 -251 104.5t-102 254.5t103 255t251 105q147 0 245.5 -104.5t98.5 -255.5zM698 350q0 131 -90.5 225.5t-218.5 94.5q-143 0 -231 -97.5t-88 -225.5q0 -136 93.5 -231t223.5 -95q131 0 221 96.5 t90 232.5z" />
+<glyph unicode="&#x2789;" horiz-adv-x="788" d="M597 345q0 -242 -120 -242t-120 242q0 122 28.5 182.5t91.5 60.5q66 0 93 -59.5t27 -183.5zM537 345q0 108 -11 152.5t-49 44.5t-49 -44.5t-11 -152.5q0 -98 11 -147t49 -49t49 49t11 147zM290 112h-60v359h-82v42h7q85 0 97 69h38v-470zM733 345q0 -151 -98.5 -255 t-246.5 -104q-149 0 -251 104.5t-102 254.5t103 255t251 105q147 0 245.5 -104.5t98.5 -255.5zM698 350q0 131 -90.5 225.5t-218.5 94.5q-143 0 -231 -97.5t-88 -225.5q0 -136 93.5 -231t223.5 -95q131 0 221 96.5t90 232.5z" />
+<glyph unicode="&#x278a;" horiz-adv-x="788" d="M733 345q0 -151 -98.5 -255t-246.5 -104q-149 0 -251 104.5t-102 254.5t103 255t251 105q147 0 245.5 -104.5t98.5 -255.5zM433 112v482h-65q-4 -73 -87 -73h-30v-54h94v-355h88z" />
+<glyph unicode="&#x278b;" horiz-adv-x="788" d="M733 345q0 -151 -98.5 -255t-246.5 -104q-149 0 -251 104.5t-102 254.5t103 255t251 105q147 0 245.5 -104.5t98.5 -255.5zM535 174h-215q8 16 23.5 29.5t43 31t36.5 24.5q55 40 88 84t33 104q0 72 -45 112.5t-120 40.5q-76 0 -117 -43.5t-41 -130.5l85 -11q0 58 15 89.5 t57 31.5q74 0 74 -95q0 -70 -66 -118q-9 -6 -35 -25l-33 -24q-7 -5 -25.5 -20.5t-24.5 -22.5l-16 -21q-12 -14 -15 -25t-6.5 -26t-3.5 -32v-17h308v64z" />
+<glyph unicode="&#x278c;" horiz-adv-x="788" d="M733 345q0 -151 -98.5 -255t-246.5 -104q-149 0 -251 104.5t-102 254.5t103 255t251 105q147 0 245.5 -104.5t98.5 -255.5zM312 274l-79 -17q0 -155 152 -155q73 0 116 39.5t43 111.5q0 76 -71 113q59 30 59 102q0 65 -40 100.5t-107 35.5q-69 0 -108 -37t-39 -103 l80 -11q0 45 15 66t52 21q59 0 59 -73q0 -76 -77 -76q-27 0 -40 2v-62q30 2 45 2q84 0 84 -80q0 -81 -75 -81q-39 0 -54 25.5t-15 76.5z" />
+<glyph unicode="&#x278d;" horiz-adv-x="788" d="M385 295h-115l115 179v-179zM733 345q0 -151 -98.5 -255t-246.5 -104q-149 0 -251 104.5t-102 254.5t103 255t251 105q147 0 245.5 -104.5t98.5 -255.5zM538 231v64h-73v304h-74l-209 -303v-65h203v-119h80v119h73z" />
+<glyph unicode="&#x278e;" horiz-adv-x="788" d="M733 345q0 -151 -98.5 -255t-246.5 -104q-149 0 -251 104.5t-102 254.5t103 255t251 105q147 0 245.5 -104.5t98.5 -255.5zM319 254l-78 -19q0 -62 40 -97.5t106 -35.5q82 0 125.5 51t43.5 136q0 77 -40 121t-116 44q-38 0 -72 -18v94h186v64h-266v-280h71q16 76 74 76 q75 0 75 -98q0 -58 -17.5 -92t-66.5 -34q-65 0 -65 88z" />
+<glyph unicode="&#x278f;" horiz-adv-x="788" d="M452 264q0 -98 -67 -98q-42 0 -61.5 30t-19.5 77q0 42 19 68.5t58 26.5q71 0 71 -104zM733 345q0 -151 -98.5 -255t-246.5 -104q-149 0 -251 104.5t-102 254.5t103 255t251 105q147 0 245.5 -104.5t98.5 -255.5zM449 470l73 18q-21 117 -135 117q-63 0 -104.5 -39.5 t-57 -93.5t-15.5 -120q0 -250 171 -250q72 0 111.5 47.5t39.5 123.5q0 73 -36 116t-105 43q-51 0 -93 -38q0 147 92 147q21 0 33.5 -12t16.5 -23.5t9 -35.5z" />
+<glyph unicode="&#x2790;" horiz-adv-x="788" d="M733 345q0 -151 -98.5 -255t-246.5 -104q-149 0 -251 104.5t-102 254.5t103 255t251 105q147 0 245.5 -104.5t98.5 -255.5zM545 531v63h-327v-64h242q-154 -203 -190 -418h92q20 117 64 210.5t119 208.5z" />
+<glyph unicode="&#x2791;" horiz-adv-x="788" d="M455 473q0 -76 -68 -76q-32 0 -49 20t-17 54q0 74 70 74q31 0 47.5 -19t16.5 -53zM462 253q0 -87 -75 -87q-38 0 -59 22.5t-21 61.5t21 61t59 22q36 0 55.5 -21t19.5 -59zM733 345q0 -151 -98.5 -255t-246.5 -104q-149 0 -251 104.5t-102 254.5t103 255t251 105 q147 0 245.5 -104.5t98.5 -255.5zM542 250q0 44 -19.5 69.5t-54.5 46.5q63 29 63 105q0 62 -37.5 95.5t-102.5 33.5q-66 0 -106 -34t-40 -98q0 -68 63 -102q-81 -28 -81 -116q0 -71 43.5 -109.5t116.5 -38.5q65 0 105 37q50 48 50 111z" />
+<glyph unicode="&#x2792;" horiz-adv-x="788" d="M453 434q0 -42 -19 -68.5t-58 -26.5q-71 0 -71 104q0 98 67 98q42 0 61.5 -30t19.5 -77zM733 345q0 -151 -98.5 -255t-246.5 -104q-149 0 -251 104.5t-102 254.5t103 255t251 105q147 0 245.5 -104.5t98.5 -255.5zM308 237l-73 -18q21 -117 135 -117q63 0 104.5 39.5 t57 93.5t15.5 120q0 250 -171 250q-72 0 -111.5 -47.5t-39.5 -123.5q0 -73 36 -116t105 -43q51 0 93 38q0 -147 -92 -147q-21 0 -33.5 12t-16.5 23.5t-9 35.5z" />
+<glyph unicode="&#x2793;" horiz-adv-x="788" d="M538 350q0 -187 -58 -187q-20 0 -33.5 21.5t-19.5 55.5t-8 61.5t-2 55.5q0 25 2 52t8 60.5t18.5 54.5t31.5 21q61 0 61 -195zM733 345q0 -151 -98.5 -255t-246.5 -104q-149 0 -251 104.5t-102 254.5t103 255t251 105q147 0 245.5 -104.5t98.5 -255.5zM618 353 q0 44 -2 75.5t-10.5 66.5t-23 56t-40.5 35t-62 14q-38 0 -65 -14t-42 -35.5t-23.5 -57.5t-10.5 -68.5t-2 -80.5q0 -43 2.5 -75t11.5 -65t23.5 -53.5t40.5 -34t62 -13.5q45 0 74.5 19.5t43.5 57.5t18.5 77t4.5 96zM298 112v482h-63q-4 -73 -84 -73h-15v-54h76v-355h86z" />
+<glyph unicode="&#x279b;" horiz-adv-x="918" d="M288 433l213 -86q47 -19 96 -31.5t264 -63.5q-216 -51 -264.5 -64.5t-96.5 -32.5l-212 -85l100 171h-26q-12 0 -327 -12v45q312 -12 327 -12h27z" />
+<glyph unicode="&#x27c0;" d="M634 0h-584v584h66v-471l471 471l47 -47l-471 -471h471v-66z" />
+<glyph unicode="&#x27c1;" horiz-adv-x="1145" d="M1110 -127h-1075l538 938zM843 28h-540l270 469zM729 94l-156 275l-154 -275h310zM995 -61l-422 739l-424 -739h846z" />
+<glyph unicode="&#x27c2;" horiz-adv-x="693" d="M641 0h-589v66h262v596h66v-596h261v-66z" />
+<glyph unicode="&#x27c3;" d="M625 251q0 -65 -44.5 -110t-109.5 -45t-110 45t-45 110t45 110t110 45q64 0 109 -45t45 -110zM570 251q0 41 -29.5 70.5t-69.5 29.5q-41 0 -70.5 -29.5t-29.5 -70.5t29.5 -70.5t70.5 -29.5q40 0 69.5 29.5t29.5 70.5zM625 -27h-298q-116 0 -191.5 82.5t-75.5 196.5 t76.5 195.5t193.5 81.5h295v-66h-295q-84 0 -144 -64.5t-60 -146.5t60.5 -147.5t144.5 -65.5h294v-66z" />
+<glyph unicode="&#x27c4;" d="M61 529h298q116 0 191.5 -82.5t75.5 -196.5t-76.5 -195.5t-193.5 -81.5h-295v66h295q84 0 144 64.5t60 146.5t-60.5 147.5t-144.5 65.5h-294v66zM370 251q0 -65 -45 -110t-110 -45q-64 0 -109 45t-45 110t44.5 110t109.5 45t110 -45t45 -110zM315 251q0 41 -29.5 70.5 t-70.5 29.5q-40 0 -69.5 -29.5t-29.5 -70.5t29.5 -70.5t69.5 -29.5q41 0 70.5 29.5t29.5 70.5z" />
+<glyph unicode="&#x27c5;" horiz-adv-x="455" d="M363 -98l37 -53q-41 -47 -105 -47q-70 0 -107 57t-37 134q0 64 17.5 139t38 134t38 135t17.5 141q0 46 -22 70t-51 24t-48.5 -19t-19.5 -47v-133h-66v135q0 56 40 93t96 37q58 0 97.5 -44.5t39.5 -114.5q0 -68 -17.5 -147t-38 -139t-38 -133t-17.5 -131q0 -56 20.5 -90.5 t57.5 -34.5q39 0 68 34z" />
+<glyph unicode="&#x27c6;" horiz-adv-x="455" d="M400 437h-66v133q0 28 -19 47t-49 19q-29 0 -51 -24t-22 -70q0 -65 17.5 -141t38 -135t38 -134t17.5 -139q0 -77 -37 -134t-107 -57q-64 0 -105 47l37 53q29 -34 68 -34q37 0 57.5 34.5t20.5 90.5q0 58 -17.5 131t-38 133t-38 139t-17.5 147q0 70 39.5 114.5t97.5 44.5 q56 0 96 -37t40 -93v-135z" />
+<glyph unicode="&#x27c7;" horiz-adv-x="620" d="M374 363q0 -29 -17.5 -46.5t-46.5 -17.5q-28 0 -45.5 19t-17.5 45q0 27 19 45t44 18t44.5 -18t19.5 -45zM589 536l-274 -565h-10l-274 565h65l214 -432l214 432h65z" />
+<glyph unicode="&#x27c8;" horiz-adv-x="966" d="M906 -25h-290q-116 0 -191.5 83t-75.5 197t76.5 196t193.5 82h287v-66h-287q-84 0 -144.5 -65t-60.5 -147t61 -148t145 -66h286v-66zM312 -25h-68l-184 558h67z" />
+<glyph unicode="&#x27c9;" horiz-adv-x="966" d="M906 533l-184 -558h-68l185 558h67zM60 533h287q117 0 193.5 -82t76.5 -196t-75.5 -197t-191.5 -83h-290v66h286q84 0 145 66t61 148t-60.5 147t-144.5 65h-287v66z" />
+<glyph unicode="&#x27cc;" horiz-adv-x="325" d="M325 752h-236q88 -111 118 -201t30 -237q0 -243 -77 -374q-27 -47 -116 -153l-24 20q59 76 88 151q45 119 45 348q0 160 -25.5 264.5t-107.5 216.5v19h305v-54z" />
+<glyph unicode="&#x27d0;" horiz-adv-x="1064" d="M1025 251l-492 -493l-494 494l493 492zM609 251q0 -30 -23.5 -52.5t-54.5 -22.5q-32 0 -54 22t-22 55q0 32 22.5 54.5t54.5 22.5q31 0 54 -23.5t23 -55.5zM932 251l-400 400l-400 -400l400 -400z" />
+<glyph unicode="&#x27d1;" horiz-adv-x="620" d="M589 -29h-65l-214 432l-214 -432h-65l274 565h10zM374 144q0 -27 -19.5 -45t-44.5 -18t-44 18t-19 45q0 26 17.5 45t45.5 19q29 0 46.5 -17.5t17.5 -46.5z" />
+<glyph unicode="&#x27d2;" horiz-adv-x="620" d="M572 536v-299q0 -118 -74.5 -193t-187.5 -75q-112 0 -187 76t-75 195v296h66v-296q0 -76 47 -133t116 -69v498h66v-499q70 13 116.5 70.5t46.5 133.5v295h66z" />
+<glyph unicode="&#x27d3;" d="M634 0h-584v66h518v518h66v-584zM406 292q0 -29 -17.5 -46.5t-46.5 -17.5q-28 0 -45.5 19t-17.5 45q0 27 19 45t44 18t44.5 -18t19.5 -45z" />
+<glyph unicode="&#x27d4;" d="M405 292q0 -27 -19 -45t-44 -18t-44.5 18t-19.5 45q0 29 17.5 46.5t46.5 17.5q28 0 45.5 -19t17.5 -45zM634 518h-518v-518h-66v584h584v-66z" />
+<glyph unicode="&#x27d5;" horiz-adv-x="1019" d="M965 -80l-351 285l-351 -285h-223v66h223v530h-223v66h223l351 -285l351 285v-662zM899 58v386l-239 -193zM568 251l-239 193v-386z" />
+<glyph unicode="&#x27d6;" horiz-adv-x="1019" d="M979 -80h-223l-351 285l-351 -285v662l351 -285l351 285h223v-66h-223v-530h223v-66zM690 58v386l-239 -193zM359 251l-239 193v-386z" />
+<glyph unicode="&#x27d7;" horiz-adv-x="1228" d="M1188 -80h-223l-351 285l-351 -285h-223v66h223v530h-223v66h223l351 -285l351 285h223v-66h-223v-530h223v-66zM899 58v386l-239 -193zM568 251l-239 193v-386z" />
+<glyph unicode="&#x27d8;" horiz-adv-x="866" d="M816 -213h-766v66h350v865h66v-865h350v-66z" />
+<glyph unicode="&#x27d9;" horiz-adv-x="866" d="M816 652h-350v-865h-66v865h-350v66h766v-66z" />
+<glyph unicode="&#x27da;" horiz-adv-x="1376" d="M1312 198h-491v-198h-66v662h66v-198h491v-66h-491v-134h491v-66zM621 0h-66v198h-491v66h491v134h-491v66h491v198h66v-662z" />
+<glyph unicode="&#x27db;" horiz-adv-x="1376" d="M621 0h-66v298h-491v66h491v298h66v-662zM1312 298h-491v-298h-66v662h66v-298h491v-66z" />
+<glyph unicode="&#x27dc;" horiz-adv-x="849" d="M799 220h-453q-11 -51 -52 -84t-94 -33q-62 0 -106 44t-44 106t44 106t106 44q53 0 94 -33t52 -84h453v-66zM300 253q0 41 -29.5 70.5t-70.5 29.5t-70.5 -29.5t-29.5 -70.5t29.5 -70.5t70.5 -29.5t70.5 29.5t29.5 70.5z" />
+<glyph unicode="&#x27dd;" horiz-adv-x="1574" d="M1519 220h-1414v-163h-50v393h50v-164h1414v-66z" />
+<glyph unicode="&#x27de;" horiz-adv-x="1574" d="M1519 57h-50v163h-1414v66h1414v164h50v-393z" />
+<glyph unicode="&#x27df;" horiz-adv-x="502" d="M218 -121v518q-51 11 -84 52t-33 94q0 62 44 106t106 44t106 -44t44 -106q0 -53 -33 -94t-84 -52v-518h116v-66h-298v66h116zM351 543q0 41 -29.5 70.5t-70.5 29.5t-70.5 -29.5t-29.5 -70.5t29.5 -70.5t70.5 -29.5t70.5 29.5t29.5 70.5z" />
+<glyph unicode="&#x27e0;" horiz-adv-x="790" d="M745 253l-351 -542l-349 542l350 542zM646 286l-251 388l-250 -388h501zM646 220h-501l249 -388z" />
+<glyph unicode="&#x27e1;" horiz-adv-x="764" d="M719 251q-102 -43 -198 -139.5t-139 -198.5q-43 102 -139 198.5t-198 139.5q102 43 198 139.5t139 198.5q43 -102 139 -198.5t198 -139.5zM589 251q-53 31 -114.5 93t-92.5 115q-31 -53 -92.5 -114.5t-114.5 -92.5q53 -32 114.5 -94t92.5 -115q31 53 92.5 115.5 t114.5 92.5z" />
+<glyph unicode="&#x27e2;" horiz-adv-x="803" d="M45 285h102q87 52 162.5 135.5t111.5 168.5q43 -102 139 -198.5t198 -139.5q-102 -43 -198 -139.5t-139 -198.5q-36 85 -111 169t-161 137h-104v66zM628 251q-53 31 -114.5 93t-92.5 115q-31 -53 -92.5 -114.5t-114.5 -92.5q53 -32 114.5 -94t92.5 -115q31 53 92.5 115.5 t114.5 92.5z" />
+<glyph unicode="&#x27e3;" horiz-adv-x="803" d="M758 219h-104q-86 -53 -161 -137t-111 -169q-43 102 -139 198.5t-198 139.5q102 43 198 139.5t139 198.5q36 -85 111.5 -168.5t162.5 -135.5h102v-66zM589 252q-53 31 -114.5 92.5t-92.5 114.5q-31 -53 -92.5 -115t-114.5 -93q53 -30 114.5 -92.5t92.5 -115.5 q31 53 92.5 115t114.5 94z" />
+<glyph unicode="&#x27e4;" horiz-adv-x="1182" d="M1137 -158h-820v378h-272v66h272v376h820v-820zM1071 -92v688h-688v-688h688z" />
+<glyph unicode="&#x27e5;" horiz-adv-x="1182" d="M1137 220h-272v-378h-820v820h820v-376h272v-66zM799 -92v688h-688v-688h688z" />
+<glyph unicode="&#x27e6;" horiz-adv-x="504" d="M482 -213h-294v930h294v-20h-67v-890h67v-20zM365 -193v890q-57 -2 -84 -22t-27 -75v-709q0 -45 28.5 -63t82.5 -21z" />
+<glyph unicode="&#x27e7;" horiz-adv-x="504" d="M316 -213h-294v20h67v890h-67v20h294v-930zM250 -96v709q0 45 -28.5 63t-82.5 21v-890q57 2 84 22t27 75z" />
+<glyph unicode="&#x27e8;" horiz-adv-x="400" d="M335 713l-192 -462l191 -464h-52l-205 454v20l206 452h52z" />
+<glyph unicode="&#x27e9;" horiz-adv-x="400" d="M323 240l-206 -453h-52l192 463l-191 463h52l205 -453v-20z" />
+<glyph unicode="&#x27ea;" horiz-adv-x="610" d="M545 719l-192 -466l191 -466h-52l-209 466l210 466h52zM335 719l-192 -466l191 -466h-52l-209 466l210 466h52z" />
+<glyph unicode="&#x27eb;" horiz-adv-x="610" d="M537 253l-210 -466h-52l192 466l-191 466h52zM327 253l-210 -466h-52l192 466l-191 466h52z" />
+<glyph unicode="&#x27ec;" horiz-adv-x="488" d="M466 719l-66 -71v-790l65 -71h-52l-235 217v498l236 217h52zM350 -88v682l-106 -115v-452z" />
+<glyph unicode="&#x27ed;" horiz-adv-x="488" d="M310 4l-236 -217h-52l66 71v790l-65 71h52l235 -217v-498zM244 27v452l-106 115v-682z" />
+<glyph unicode="&#x27ee;" horiz-adv-x="233" d="M211 -166l-16 -11q-40 31 -67 71.5t-41 76.5t-21.5 90.5t-8.5 89t-1 96.5q0 63 1 97.5t8 89.5t21 91.5t41.5 78t67.5 72.5l16 -11q-47 -60 -64 -119.5t-17 -142.5v-307q0 -83 17 -142.5t64 -119.5z" />
+<glyph unicode="&#x27ef;" horiz-adv-x="233" d="M22 665l16 11q40 -31 67.5 -72.5t41.5 -78t21 -91.5t8 -89.5t1 -97.5q0 -62 -1 -96.5t-8.5 -89t-21.5 -90.5t-41 -76.5t-67 -71.5l-16 11q47 60 64 119.5t17 142.5v307q0 83 -17 142.5t-64 119.5z" />
+<glyph unicode="&#x27f0;" horiz-adv-x="1033" d="M965 298l-13 -24q-55 20 -147 81v-511h-66v557q-22 16 -42 33l-37 33l-25 22v-645h-66v697q-34 23 -52 23q-22 0 -52 -23v-697h-66v642q-1 -1 -38.5 -33t-65.5 -52v-557h-66v512q-97 -63 -145 -81l-15 24q200 102 443 363h13q112 -125 217 -214.5t223 -149.5z" />
+<glyph unicode="&#x27f1;" horiz-adv-x="1033" d="M950 231l15 -24q-200 -102 -443 -363h-13q-112 125 -217 214.5t-223 149.5l13 24q55 -20 147 -81v511h66v-557q22 -16 42 -33l37 -33l25 -22v645h66v-697q34 -23 52 -23q22 0 52 23v697h66v-642q1 1 38.5 33t65.5 52v557h66v-512q97 63 145 81z" />
+<glyph unicode="&#x27f2;" horiz-adv-x="974" d="M54 546l24 13q19 -27 65 -108q13 -25 26 -25q11 0 17 9q47 88 137 139.5t189 51.5q153 0 261.5 -108.5t108.5 -263.5q0 -153 -108 -261.5t-263 -108.5q-112 0 -205 62t-136 165l59 26q36 -83 115 -135.5t168 -52.5q127 0 215.5 90t88.5 215q0 127 -89.5 216.5 t-215.5 89.5q-78 0 -147 -38t-110 -103q-2 -4 -2 -10q0 -8 6.5 -13.5t14.5 -5.5q7 0 21 6q53 27 118 46l12 -25q-178 -72 -258 -162l-10 4q-7 119 -102 287z" />
+<glyph unicode="&#x27f3;" horiz-adv-x="974" d="M896 559l24 -13q-95 -168 -102 -287l-10 -4q-80 90 -258 162l12 25q65 -19 118 -46q14 -6 21 -6q8 0 14.5 5.5t6.5 13.5q0 6 -2 10q-41 65 -110 103t-147 38q-126 0 -215.5 -89.5t-89.5 -216.5q0 -125 88.5 -215t215.5 -90q89 0 168 52.5t115 135.5l59 -26 q-43 -103 -136 -165t-205 -62q-155 0 -263 108.5t-108 261.5q0 155 108.5 263.5t261.5 108.5q99 0 189 -51.5t137 -139.5q6 -9 17 -9q13 0 26 25q46 81 65 108z" />
+<glyph unicode="&#x27f4;" horiz-adv-x="1200" d="M1147 258v-10q-115 -49 -238 -191l-20 19q28 40 82 96q14 14 14 28q0 20 -26 20h-119q-11 -120 -98 -200.5t-212 -80.5q-132 0 -219 76t-98 205h-161v66h161q12 119 100 201t217 82q124 0 211.5 -79.5t98.5 -203.5h120q8 0 17 7.5t9 14.5q0 11 -14 25q-49 47 -82 97 l20 19q125 -144 237 -191zM552 286h223q-11 87 -71.5 148.5t-151.5 68.5v-217zM502 286v217q-88 -9 -150 -69t-73 -148h223zM775 220h-223v-215q89 7 150.5 68t72.5 147zM502 5v215h-223q11 -87 72 -147t151 -68z" />
+<glyph unicode="&#x27f5;" horiz-adv-x="1574" d="M1519 220h-1277q-8 0 -17 -7.5t-9 -14.5q0 -11 14 -25q51 -49 82 -96l-20 -19q-124 143 -237 190v10q113 48 237 191l20 -19q-29 -42 -81 -96q-14 -14 -14 -28q0 -20 26 -20h1276v-66z" />
+<glyph unicode="&#x27f6;" horiz-adv-x="1574" d="M1519 258v-10q-115 -49 -238 -191l-20 19q28 40 82 96q14 14 14 28q0 20 -26 20h-1276v66h1277q8 0 17 7.5t9 14.5q0 11 -14 25q-49 47 -82 97l20 19q125 -144 237 -191z" />
+<glyph unicode="&#x27f7;" horiz-adv-x="1574" d="M1519 258v-10q-115 -49 -238 -191l-20 19q28 40 82 96q14 14 14 28q0 20 -26 20h-1089q-8 0 -17 -7.5t-9 -14.5q0 -11 14 -25q49 -47 82 -97l-20 -19q-125 144 -237 191v10q113 48 237 191l20 -19q-31 -44 -81 -96q-14 -14 -14 -28q0 -20 26 -20h1089q8 0 17 7.5t9 14.5 q0 11 -14 25q-48 46 -81 96l20 19q124 -143 236 -190z" />
+<glyph unicode="&#x27f8;" horiz-adv-x="1574" d="M1519 120h-1148q-12 0 -19 -7.5t-7 -14.5q0 -19 23 -42q32 -32 74 -81l-21 -20q-41 41 -93 85t-84 68l-100 75l-89 65v10l89 67l98 73q36 27 87 69.5t92 83.5l21 -20q-32 -37 -75 -82q-1 -2 -4.5 -5.5t-5 -4.5t-4 -4t-3 -4.5t-2 -4.5t-2 -5.5t-1 -5.5t-0.5 -7 q0 -7 7 -14.5t19 -7.5h1148v-66h-1292q-59 -34 -59 -67q0 -27 58 -67h1293v-66z" />
+<glyph unicode="&#x27f9;" horiz-adv-x="1574" d="M1519 258v-10l-89 -67l-98 -73q-36 -27 -87 -69.5t-92 -83.5l-21 20q32 37 75 82q1 2 4.5 5.5t5 4.5t4 4t3 4.5t2 4.5t2 5.5t1 5.5t0.5 7q0 7 -7 14.5t-19 7.5h-1148v66h1292q59 34 59 67q0 27 -58 67h-1293v66h1148q12 0 19 7.5t7 14.5q0 19 -23 42q-32 32 -74 81l21 20 q41 -41 93 -85t84 -68l100 -75z" />
+<glyph unicode="&#x27fa;" horiz-adv-x="1574" d="M1519 258v-10q-51 -34 -144 -108t-170 -150l-28 21l19 19l24 26q9 10 17.5 24t8.5 24q0 6 -1.5 9t-8 5t-20.5 2h-855q-21 0 -28 -3.5t-7 -14.5t7.5 -21.5t29.5 -32.5t33 -35l-23 -23q-83 78 -180.5 155.5t-137.5 102.5v10q165 118 318 259l23 -23q-7 -8 -28 -29 t-32.5 -36t-11.5 -24q0 -19 34 -19h858q14 0 21 6.5t7 14.5q0 15 -10.5 29.5t-30.5 32t-26 24.5l28 24q84 -77 179 -154.5t135 -104.5zM225 186h1122q59 34 59 67q0 27 -58 67h-1122q-58 -33 -59 -67q0 -27 58 -67z" />
+<glyph unicode="&#x27fb;" horiz-adv-x="1574" d="M1519 57h-50v163h-1226q-26 0 -26 -20q0 -14 14 -28q54 -56 82 -96l-20 -19q-123 142 -238 191v10q111 46 237 192l20 -19q-35 -53 -82 -98q-14 -14 -14 -25q0 -8 7 -15t19 -7h1227v164h50v-393z" />
+<glyph unicode="&#x27fc;" horiz-adv-x="1574" d="M1519 258v-10q-115 -49 -238 -191l-20 19q28 40 82 96q14 14 14 28q0 20 -26 20h-1226v-163h-50v393h50v-164h1227q12 0 19 7t7 15q0 11 -14 25q-47 45 -82 98l20 19q126 -146 237 -192z" />
+<glyph unicode="&#x27fd;" horiz-adv-x="1574" d="M1519 -45h-50v165h-1098q-12 0 -19 -7.5t-7 -14.5q0 -19 23 -42q32 -32 74 -81l-21 -20q-41 41 -93 85t-84 68l-100 75l-89 65v10l89 67l98 73q36 27 87 69.5t92 83.5l21 -20q-32 -37 -75 -82q-1 -2 -4.5 -5.5t-5 -4.5t-4 -4t-3 -4.5t-2 -4.5t-2 -5.5t-1 -5.5t-0.5 -7 q0 -7 7 -14.5t19 -7.5h1098v165h50v-596zM1469 186v134h-1242q-59 -34 -59 -67q0 -27 58 -67h1243z" />
+<glyph unicode="&#x27fe;" horiz-adv-x="1574" d="M1519 258v-10l-89 -65l-100 -75q-32 -24 -84 -68t-93 -85l-21 20q42 49 74 81q23 23 23 42q0 7 -7 14.5t-19 7.5h-1098v-165h-50v596h50v-165h1098q12 0 19 7.5t7 14.5q0 9 -3.5 17t-5.5 10t-13 14q-43 45 -75 82l21 20q41 -41 92 -83.5t87 -69.5l98 -73zM105 186h1243 q58 40 58 67q0 33 -59 67h-1242v-134z" />
+<glyph unicode="&#x27ff;" horiz-adv-x="1574" d="M1519 258v-10q-113 -47 -237 -190l-20 19q31 47 82 96q14 14 14 25q0 6 -9 14t-15 8h-57l-92 -106l-124 172l-119 -172l-124 172l-119 -172l-124 172l-119 -172l-124 172l-119 -172l-89 106h-69v66h98l60 -66l119 174l124 -174l119 174l124 -174l119 174l124 -174 l119 174l124 -174l60 66h86q26 0 26 20q0 14 -14 28q-54 56 -82 96l20 19q123 -142 238 -191z" />
+<glyph unicode="&#x2900;" horiz-adv-x="926" d="M871 258v-10q-112 -47 -237 -191l-20 19q33 50 82 97q14 14 14 25q0 7 -9 14.5t-17 7.5h-15q-83 -50 -181 -163l-20 19q33 50 82 97q14 14 14 25q0 6 -8 13t-16 9h-168v-163h-50v163h-266v66h266v164h50v-164h169q10 0 16 6t6 14q0 14 -14 28q-51 53 -82 97l20 19 q100 -115 183 -164h13q26 0 26 20q0 14 -14 28q-51 53 -82 97l20 19q125 -144 238 -192z" />
+<glyph unicode="&#x2901;" horiz-adv-x="926" d="M871 258v-10q-112 -47 -237 -191l-20 19q33 50 82 97q14 14 14 25q0 7 -9 14.5t-17 7.5h-15q-83 -50 -181 -163l-20 19q33 50 82 97q14 14 14 25q0 6 -8 13t-16 9h-135v-163h-50v163h-79v-163h-50v163h-171v66h171v164h50v-164h79v164h50v-164h136q10 0 16 6t6 14 q0 14 -14 28q-51 53 -82 97l20 19q100 -115 183 -164h13q26 0 26 20q0 14 -14 28q-51 53 -82 97l20 19q125 -144 238 -192z" />
+<glyph unicode="&#x2902;" horiz-adv-x="926" d="M871 120h-257v-145h-50v145h-193q-12 0 -19 -7.5t-7 -14.5q0 -19 23 -42q32 -32 74 -81l-21 -20q-41 41 -93 85t-84 68l-100 75l-89 65v10l89 67l98 73q36 27 87 69.5t92 83.5l21 -20q-32 -37 -75 -82q-1 -2 -4.5 -5.5t-5 -4.5t-4 -4t-3 -4.5t-2 -4.5t-2 -5.5t-1 -5.5 t-0.5 -7q0 -7 7 -14.5t19 -7.5h193v144h50v-144h257v-66h-257v-134h257v-66zM564 186v134h-337q-59 -34 -59 -67q0 -27 58 -67h338z" />
+<glyph unicode="&#x2903;" horiz-adv-x="926" d="M871 258v-10l-89 -65l-100 -75q-32 -24 -84 -68t-93 -85l-21 20q42 49 74 81q23 23 23 42q0 7 -7 14.5t-19 7.5h-193v-145h-50v145h-257v66h257v134h-257v66h257v144h50v-144h193q12 0 19 7.5t7 14.5q0 9 -3.5 17t-5.5 10t-13 14q-43 45 -75 82l21 20q41 -41 92 -83.5 t87 -69.5l98 -73zM362 186h338q58 40 58 67q0 33 -59 67h-337v-134z" />
+<glyph unicode="&#x2904;" horiz-adv-x="926" d="M906 258v-10q-51 -34 -144 -108t-170 -150l-28 21l19 19l24 26q9 10 17.5 24t8.5 24q0 6 -1.5 9t-8 5t-20.5 2h-115v-165h-50v165h-112q-21 0 -28 -3.5t-7 -14.5t7.5 -21.5t29.5 -32.5t33 -35l-23 -23q-83 78 -180.5 155.5t-137.5 102.5v10q165 118 318 259l23 -23 q-7 -8 -28 -29t-32.5 -36t-11.5 -24q0 -19 34 -19h115v165h50v-165h115q14 0 21 6.5t7 14.5q0 15 -10.5 29.5t-30.5 32t-26 24.5l28 24q84 -77 179 -154.5t135 -104.5zM488 186h246q59 34 59 67q0 27 -58 67h-247v-134zM438 186v134h-247q-58 -33 -59 -67q0 -27 58 -67h248z " />
+<glyph unicode="&#x2905;" horiz-adv-x="926" d="M871 258v-10q-112 -47 -237 -191l-20 19q33 50 82 97q14 14 14 25q0 7 -9 14.5t-17 7.5h-15q-83 -50 -181 -163l-20 19q33 50 82 97q14 14 14 25q0 6 -8 13t-16 9h-435v-163h-50v393h50v-164h436q10 0 16 6t6 14q0 14 -14 28q-51 53 -82 97l20 19q100 -115 183 -164h13 q26 0 26 20q0 14 -14 28q-51 53 -82 97l20 19q125 -144 238 -192z" />
+<glyph unicode="&#x2906;" horiz-adv-x="926" d="M871 -25h-50v145h-450q-12 0 -19 -7.5t-7 -14.5q0 -19 23 -42q32 -32 74 -81l-21 -20q-41 41 -93 85t-84 68l-100 75l-89 65v10l89 67l98 73q36 27 87 69.5t92 83.5l21 -20q-32 -37 -75 -82q-1 -2 -4.5 -5.5t-5 -4.5t-4 -4t-3 -4.5t-2 -4.5t-2 -5.5t-1 -5.5t-0.5 -7 q0 -7 7 -14.5t19 -7.5h450v144h50v-555zM821 186v134h-594q-59 -34 -59 -67q0 -27 58 -67h595z" />
+<glyph unicode="&#x2907;" horiz-adv-x="926" d="M871 258v-10l-89 -65l-100 -75q-32 -24 -84 -68t-93 -85l-21 20q42 49 74 81q23 23 23 42q0 7 -7 14.5t-19 7.5h-450v-145h-50v555h50v-144h450q12 0 19 7.5t7 14.5q0 9 -3.5 17t-5.5 10t-13 14q-43 45 -75 82l21 20q41 -41 92 -83.5t87 -69.5l98 -73zM105 186h595 q58 40 58 67q0 33 -59 67h-594v-134z" />
+<glyph unicode="&#x2908;" horiz-adv-x="511" d="M452 320h-163v-289q0 -8 7.5 -17t14.5 -9q11 0 25 14q49 51 96 82l19 -20q-143 -124 -190 -237h-10q-48 113 -192 238l19 20q44 -31 97 -82q14 -14 28 -14q20 0 20 26v288h-163v50h163v292h66v-292h163v-50z" />
+<glyph unicode="&#x2909;" horiz-adv-x="511" d="M452 424l-19 -20q-44 31 -97 82q-14 14 -28 14q-20 0 -20 -26v-288h163v-50h-163v-292h-66v292h-163v50h163v289q0 8 -7.5 17t-14.5 9q-11 0 -25 -14q-49 -51 -96 -82l-19 20q143 124 190 237h10q48 -113 192 -238z" />
+<glyph unicode="&#x290a;" horiz-adv-x="926" d="M854 298l-15 -23q-67 41 -140 99h-3v-530h-66v577q-35 30 -86 81q-14 14 -28 14q-20 0 -20 -26v-646h-66v645q0 14 -6.5 21t-15.5 7q-12 0 -25 -14q-37 -43 -87 -81v-578h-66v531h-1q-64 -52 -142 -99l-16 23q240 159 387 363h10q137 -199 386 -364z" />
+<glyph unicode="&#x290b;" horiz-adv-x="926" d="M839 230l16 -23q-240 -159 -387 -363h-10q-137 199 -386 364l15 23q67 -41 140 -99h3v530h66v-577q35 -30 86 -81q14 -14 28 -14q20 0 20 26v646h66v-645q0 -14 6.5 -21t15.5 -7q12 0 25 14q37 43 87 81v578h66v-531h1q64 52 142 99z" />
+<glyph unicode="&#x290c;" horiz-adv-x="926" d="M871 220h-262v66h262v-66zM505 220h-263q-8 0 -17 -7.5t-9 -14.5q0 -11 14 -25q49 -47 82 -97l-20 -19q-125 144 -237 191v10q115 49 238 191l20 -19q-28 -40 -82 -96q-14 -14 -14 -28q0 -20 26 -20h262v-66z" />
+<glyph unicode="&#x290d;" horiz-adv-x="926" d="M871 258v-10q-115 -49 -238 -191l-20 19q28 40 82 96q14 14 14 28q0 20 -26 20h-262v66h263q8 0 17 7.5t9 14.5q0 11 -14 25q-49 47 -82 97l20 19q125 -144 237 -191zM317 220h-262v66h262v-66z" />
+<glyph unicode="&#x290e;" horiz-adv-x="926" d="M871 220h-154v66h154v-66zM633 220h-154v66h154v-66zM395 220h-153q-8 0 -17 -7.5t-9 -14.5q0 -11 14 -25q49 -47 82 -97l-20 -19q-125 144 -237 191v10q115 49 238 191l20 -19q-28 -40 -82 -96q-14 -14 -14 -28q0 -20 26 -20h152v-66z" />
+<glyph unicode="&#x290f;" horiz-adv-x="926" d="M871 258v-10q-115 -49 -238 -191l-20 19q28 40 82 96q14 14 14 28q0 20 -26 20h-152v66h153q8 0 17 7.5t9 14.5q0 11 -14 25q-49 47 -82 97l20 19q125 -144 237 -191zM447 220h-154v66h154v-66zM209 220h-154v66h154v-66z" />
+<glyph unicode="&#x2910;" horiz-adv-x="1412" d="M1357 258v-10q-112 -47 -237 -191l-20 19q33 50 82 97q14 14 14 25q0 7 -9 14.5t-17 7.5h-15q-83 -50 -181 -163l-20 19q33 50 83 98q13 13 13 24q0 6 -8.5 14t-15.5 8v66q23 0 23 20q0 14 -14 28q-54 56 -82 96l20 19q98 -113 183 -163h14q25 0 25 20q0 14 -14 28 q-54 56 -82 96l20 19q123 -142 238 -191zM942 220h-144v66h144v-66zM714 220h-144v66h144v-66zM486 220h-144v66h144v-66zM258 286v-66q-85 -51 -182 -163l-20 19q15 23 82 97q28 34 28 80q0 43 -29 81q-11 14 -40 46t-42 50l20 19q96 -110 183 -163z" />
+<glyph unicode="&#x2911;" horiz-adv-x="926" d="M873 258v-10q-112 -47 -237 -191l-20 19q33 50 82 97q14 14 14 25q0 19 -15 19t-23 10t-8 26t8 26t23 10q14 0 14 17q0 14 -14 28q-50 52 -81 96l20 19q124 -143 237 -191zM616 254q0 -16 -10.5 -26.5t-25.5 -10.5t-26 10.5t-11 26.5q0 15 11 25.5t26 10.5t25.5 -10.5 t10.5 -25.5zM495 254q0 -16 -11 -26.5t-26 -10.5q-14 0 -25 10.5t-11 26.5q0 15 11 25.5t25 10.5q15 0 26 -10.5t11 -25.5zM372 253q0 -15 -10.5 -25.5t-25.5 -10.5t-25.5 10.5t-10.5 25.5t10.5 25.5t25.5 10.5t25.5 -10.5t10.5 -25.5zM250 254q0 -16 -11 -26.5t-25 -10.5 q-15 0 -26 10.5t-11 26.5q0 15 11 25.5t26 10.5q14 0 25 -10.5t11 -25.5zM128 254q0 -16 -11 -26.5t-26 -10.5t-25.5 10.5t-10.5 26.5q0 15 10.5 25.5t25.5 10.5t26 -10.5t11 -25.5z" />
+<glyph unicode="&#x2912;" horiz-adv-x="511" d="M452 424l-19 -20q-40 28 -96 82q-14 14 -28 14q-20 0 -20 -26v-630h-66v630q0 12 -6.5 19t-15.5 7q-11 0 -25 -14q-46 -48 -96 -81l-19 20q115 100 165 187h-167v50h391v-50h-164q52 -90 166 -188z" />
+<glyph unicode="&#x2913;" horiz-adv-x="511" d="M452 -156h-391v50h164q-52 90 -166 188l19 20q40 -28 96 -82q14 -14 28 -14q20 0 20 26v630h66v-630q0 -12 7 -19t15 -7q11 0 25 14q46 48 96 81l19 -20q-115 -100 -165 -187h167v-50z" />
+<glyph unicode="&#x2914;" horiz-adv-x="926" d="M871 258v-10q-112 -47 -237 -191l-20 19q33 50 82 97q14 14 14 25q0 7 -9 14.5t-17 7.5h-231v-163h-50v163h-146q-83 -50 -181 -163l-20 19q15 23 82 97q28 34 28 80q0 43 -29 81q-12 15 -41 47t-41 50l20 19q98 -112 183 -164h145v164h50v-164h230q26 0 26 20 q0 14 -14 28q-51 53 -82 97l20 19q125 -144 238 -192z" />
+<glyph unicode="&#x2915;" horiz-adv-x="926" d="M871 258v-10q-112 -47 -237 -191l-20 19q33 50 82 97q14 14 14 25q0 7 -9 14.5t-17 7.5h-153v-163h-50v163h-79v-163h-50v163h-95q-83 -50 -181 -163l-20 19q15 23 82 97q28 34 28 80q0 43 -29 81q-12 15 -41 47t-41 50l20 19q98 -112 183 -164h94v164h50v-164h79v164h50 v-164h152q26 0 26 20q0 14 -14 28q-51 53 -82 97l20 19q125 -144 238 -192z" />
+<glyph unicode="&#x2916;" horiz-adv-x="926" d="M871 258v-10q-112 -47 -237 -191l-20 19q33 50 82 97q14 14 14 25q0 7 -9 14.5t-17 7.5h-16q-83 -50 -181 -163l-20 19q33 50 82 97q14 14 14 25q0 7 -7 14.5t-17 7.5h-282q-83 -50 -181 -163l-20 19q15 23 82 97q28 34 28 80q0 43 -29 81q-11 14 -40 46t-42 50l20 19 q96 -110 183 -163h281q10 0 16.5 6.5t6.5 13.5q0 14 -14 28q-54 56 -82 96l20 19q98 -113 183 -163h14q26 0 26 20q0 14 -14 28q-54 56 -82 96l20 19q123 -142 238 -191z" />
+<glyph unicode="&#x2917;" horiz-adv-x="926" d="M871 258v-10q-112 -47 -237 -191l-20 19q33 50 82 97q14 14 14 25q0 7 -9 14.5t-17 7.5h-16q-83 -50 -181 -163l-20 19q33 50 82 97q14 14 14 25q0 7 -7 14.5t-17 7.5h-145v-163h-50v163h-87q-83 -50 -181 -163l-20 19q15 23 82 97q28 34 28 80q0 43 -29 81 q-12 15 -41 47t-41 50l20 19q98 -112 183 -164h86v164h50v-164h145q10 0 16.5 6.5t6.5 13.5q0 14 -14 28q-51 53 -82 97l20 19q100 -115 183 -164h14q26 0 26 20q0 14 -14 28q-51 53 -82 97l20 19q125 -144 238 -192z" />
+<glyph unicode="&#x2918;" horiz-adv-x="926" d="M876 258v-10q-45 -19 -89 -53.5t-69.5 -61t-68.5 -76.5l-20 19q37 55 80 97q14 14 14 25q0 7 -8.5 14.5t-16.5 7.5q-36 -20 -69.5 -49t-52.5 -51l-54 -63l-20 19q37 55 80 97q14 14 14 25q0 7 -7 14.5t-17 7.5h-121v-163h-50v163h-59v-163h-50v163h-51q-33 -20 -65.5 -49 t-51.5 -51l-53 -63l-20 19q31 45 75 94q29 35 29 83q0 42 -30 81l-25 32l-28 34q-12 16 -22 31l20 19l54 -64q19 -20 52 -50t66 -50h50v164h50v-164h59v164h50v-164h121q10 0 16.5 6.5t6.5 13.5q0 14 -14 28q-41 42 -79 97l20 19l54 -64q18 -20 52.5 -50t69.5 -50 q24 0 24 20q0 14 -14 28q-44 46 -80 97l20 19q43 -50 69 -77t70 -61.5t89 -53.5z" />
+<glyph unicode="&#x2919;" horiz-adv-x="926" d="M871 76l-20 -19q-96 110 -183 163h-613v66h614q83 50 181 163l20 -19q-15 -23 -82 -97q-28 -34 -28 -80q0 -43 29 -81q11 -14 40 -46t42 -50z" />
+<glyph unicode="&#x291a;" horiz-adv-x="926" d="M871 220h-614q-83 -50 -181 -163l-20 19q15 23 82 97q28 34 28 80q0 43 -29 81q-11 14 -40 46t-42 50l20 19q96 -110 183 -163h613v-66z" />
+<glyph unicode="&#x291b;" horiz-adv-x="926" d="M871 76l-20 -19q-96 110 -183 163h-19q-21 -3 -21 -20q0 -14 14 -28q54 -56 82 -96l-20 -19q-95 109 -184 163h-465v66h466q84 49 182 163l20 -19q-33 -50 -82 -97q-14 -14 -14 -25q0 -7 7.5 -14t15.5 -8h19q83 50 181 163l20 -19q-15 -23 -82 -97q-28 -34 -28 -80 q0 -43 29 -81q11 -14 40 -46t42 -50z" />
+<glyph unicode="&#x291c;" horiz-adv-x="926" d="M871 220h-466q-84 -49 -182 -163l-20 19q33 50 82 97q14 14 14 25q0 7 -7.5 14t-15.5 8h-19q-83 -50 -181 -163l-20 19q15 23 82 97q28 34 28 80q0 43 -29 81q-11 14 -40 46t-42 50l20 19q96 -110 183 -163h19q21 3 21 20q0 14 -14 28q-54 56 -82 96l20 19 q95 -109 184 -163h465v-66z" />
+<glyph unicode="&#x291d;" horiz-adv-x="926" d="M871 220h-418q-8 0 -17 -7.5t-9 -14.5q0 -11 14 -25q49 -47 82 -97l-20 -19q-126 146 -237 192v10q116 50 238 190l20 -19q-28 -40 -82 -96q-14 -14 -14 -28q0 -20 26 -20h417v-66zM261 259v-10q-53 -39 -98 -98h-10q-47 59 -98 98v10q59 45 98 98h10q17 -23 46 -52 t52 -46z" />
+<glyph unicode="&#x291e;" horiz-adv-x="926" d="M871 259v-10q-59 -45 -98 -98h-10q-17 23 -46 52t-52 46v10q53 39 98 98h10q47 -59 98 -98zM660 259v-10q-113 -48 -238 -192l-20 19q28 40 82 96q14 14 14 28q0 20 -26 20h-417v66h418q8 0 17 7.5t9 14.5q0 11 -14 25q-49 47 -82 97l20 19q124 -143 237 -190z" />
+<glyph unicode="&#x291f;" horiz-adv-x="926" d="M871 57h-50v163h-368q-8 0 -17 -7.5t-9 -14.5q0 -11 14 -25q49 -47 82 -97l-20 -19q-126 146 -237 192v10q115 49 238 191l20 -19q-31 -44 -82 -97q-14 -14 -14 -28q0 -20 26 -20h367v164h50v-393zM261 259v-10q-53 -39 -98 -98h-10q-47 59 -98 98v10q59 45 98 98h10 q17 -23 46 -52t52 -46z" />
+<glyph unicode="&#x2920;" horiz-adv-x="926" d="M871 259v-10q-59 -45 -98 -98h-10q-17 23 -46 52t-52 46v10q53 39 98 98h10q47 -59 98 -98zM660 259v-10q-113 -48 -238 -192l-20 19q28 40 82 96q14 14 14 28q0 20 -26 20h-367v-163h-50v393h50v-164h368q8 0 17 7.5t9 14.5q0 11 -14 25q-47 45 -82 98l20 19 q125 -144 237 -191z" />
+<glyph unicode="&#x2921;" horiz-adv-x="926" d="M871 -149l-7 -7q-91 37 -216 37q-29 0 -87 -4l-1 28q47 8 126 10q35 0 35 23q0 9 -10 19l-544 546q-7 7 -21 7q-20 0 -20 -32q0 -77 -10 -126l-28 1q4 60 4 91q0 122 -37 211l7 7q91 -37 216 -37q29 0 87 4l1 -28q-47 -8 -126 -10q-35 0 -35 -23q0 -9 10 -19l544 -546 q7 -7 21 -7q20 0 20 32q0 77 10 126l28 -1q-4 -60 -4 -91q0 -122 37 -211z" />
+<glyph unicode="&#x2922;" horiz-adv-x="926" d="M866 660l7 -7q-37 -91 -37 -216q0 -29 4 -87l-28 -1q-8 47 -10 126q0 35 -23 35q-9 0 -19 -10l-546 -544q-7 -7 -7 -21q0 -20 32 -20q77 0 126 -10l-1 -28q-60 4 -91 4q-122 0 -211 -37l-7 7q37 91 37 216q0 29 -4 87l28 1q8 -47 10 -126q0 -35 23 -35q9 0 19 10l546 544 q7 7 7 21q0 20 -32 20q-77 0 -126 10l1 28q60 -4 91 -4q122 0 211 37z" />
+<glyph unicode="&#x2923;" horiz-adv-x="926" d="M231 555l572 -471q68 -56 68 -120q0 -54 -36.5 -87t-86.5 -33q-53 0 -84 31l-60 49l45 52l61 -51q15 -15 43 -15q20 0 36 14t16 40q0 18 -7.5 31t-29.5 32l-586 482q-6 5 -12 5q-23 0 -23 -47q0 -5 1 -23.5t1 -25.5q0 -38 -3 -60l-29 -2q-3 62 -6.5 103.5t-17.5 97.5 t-38 98l6 7q82 -21 144 -21q74 0 164 17l4 -29q-74 -19 -127 -27q-26 -3 -26 -25q0 -12 11 -22z" />
+<glyph unicode="&#x2924;" horiz-adv-x="926" d="M865 662l6 -7q-34 -61 -46 -132t-16 -167l-29 2q-3 22 -3 60q0 7 1 25.5t1 23.5q0 47 -23 47q-6 0 -12 -5l-586 -482q-22 -19 -29.5 -32t-7.5 -31q0 -26 16 -40t36 -14q28 0 43 15l61 51l45 -52l-60 -49q-31 -31 -84 -31q-50 0 -86.5 33t-36.5 87q0 64 68 120l572 471 q11 10 11 22q0 22 -26 25q-53 8 -127 27l4 29q90 -17 164 -17q62 0 144 21z" />
+<glyph unicode="&#x2925;" horiz-adv-x="926" d="M871 -149l-6 -7q-82 21 -144 21q-74 0 -164 -17l-4 29q74 19 127 27q26 3 26 25q0 12 -11 22l-572 471q-68 56 -68 120q0 54 36.5 87t86.5 33q53 0 84 -31l60 -49l-45 -52l-61 51q-15 15 -43 15q-20 0 -36 -14t-16 -40q0 -18 7.5 -31t29.5 -32l586 -482q6 -5 12 -5 q23 0 23 47q0 5 -1 23.5t-1 25.5q0 38 3 60l29 2q3 -62 6.5 -103.5t17.5 -97.5t38 -98z" />
+<glyph unicode="&#x2926;" horiz-adv-x="926" d="M604 582l60 49q31 31 84 31q50 0 86.5 -33t36.5 -87q0 -64 -68 -120l-572 -471q-11 -10 -11 -22q0 -22 26 -25q53 -8 127 -27l-4 -29q-90 17 -164 17q-62 0 -144 -21l-6 7q34 61 46 132t16 167l29 -2q3 -22 3 -60q0 -7 -1 -25.5t-1 -23.5q0 -47 23 -47q6 0 12 5l586 482 q22 19 29.5 32t7.5 31q0 26 -16 40t-36 14q-28 0 -43 -15l-61 -51z" />
+<glyph unicode="&#x2927;" horiz-adv-x="926" d="M866 662l7 -7q-37 -91 -37 -216q0 -29 4 -87l-28 -1q-10 57 -10 126q0 35 -23 35q-9 0 -19 -10l-250 -250l361 -361l-47 -47l-361 361l-361 -361l-47 47l361 361l-249 251q-7 7 -21 7q-20 0 -20 -32q0 -77 -10 -126l-28 1q4 60 4 91q0 122 -37 211l7 7q91 -37 216 -37 q29 0 87 4l1 -28q-47 -8 -126 -10q-35 0 -35 -23q0 -9 10 -19l248 -250l251 251q7 7 7 21q0 20 -32 20q-77 0 -126 10l1 28q60 -4 91 -4q122 0 211 37z" />
+<glyph unicode="&#x2928;" horiz-adv-x="926" d="M871 -149l-7 -7q-91 37 -216 37q-29 0 -87 -4l-1 28q57 10 126 10q35 0 35 23q0 9 -10 19l-250 250l-361 -361l-47 47l361 361l-361 361l47 47l361 -361l251 249q7 7 7 21q0 20 -32 20q-77 0 -126 10l1 28q60 -4 91 -4q122 0 211 37l7 -7q-37 -91 -37 -216q0 -29 4 -87 l-28 -1q-8 47 -10 126q0 35 -23 35q-9 0 -19 -10l-250 -248l251 -251q7 -7 21 -7q20 0 20 32q0 77 10 126l28 -1q-4 -60 -4 -91q0 -122 37 -211z" />
+<glyph unicode="&#x2929;" horiz-adv-x="926" d="M871 -149l-7 -7q-91 37 -216 37q-29 0 -87 -4l-1 28q47 8 126 10q35 0 35 23q0 9 -10 19l-248 250l-251 -251q-7 -7 -7 -21q0 -20 32 -20q77 0 126 -10l-1 -28q-60 4 -91 4q-122 0 -211 -37l-7 7q37 91 37 216q0 29 -4 87l28 1q10 -57 10 -126q0 -35 23 -35q9 0 19 10 l250 250l-361 361l47 47l361 -361l361 361l47 -47l-361 -361l249 -251q7 -7 21 -7q20 0 20 32q0 77 10 126l28 -1q-4 -60 -4 -91q0 -122 37 -211z" />
+<glyph unicode="&#x292a;" horiz-adv-x="926" d="M873 -109l-47 -47l-361 361l-251 -249q-7 -7 -7 -21q0 -20 32 -20q77 0 126 -10l-1 -28q-60 4 -91 4q-122 0 -211 -37l-7 7q37 91 37 216q0 29 -4 87l28 1q8 -47 10 -126q0 -35 23 -35q9 0 19 10l250 248l-251 251q-7 7 -21 7q-20 0 -20 -32q0 -77 -10 -126l-28 1 q4 60 4 91q0 122 -37 211l7 7q91 -37 216 -37q29 0 87 4l1 -28q-57 -10 -126 -10q-35 0 -35 -23q0 -9 10 -19l250 -250l361 361l47 -47l-361 -361z" />
+<glyph unicode="&#x292b;" horiz-adv-x="926" d="M402 361l-47 -47l-300 301l47 47zM871 615l-769 -771l-47 47l769 771zM871 -109l-47 -47l-300 301l47 47z" />
+<glyph unicode="&#x292c;" horiz-adv-x="926" d="M871 615l-300 -301l-47 47l300 301zM871 -109l-47 -47l-769 771l47 47zM402 145l-300 -301l-47 47l300 301z" />
+<glyph unicode="&#x292d;" horiz-adv-x="926" d="M864 662l7 -7q-37 -91 -37 -216q0 -29 4 -87l-28 -1q-8 47 -10 126q0 35 -23 35q-9 0 -19 -10l-187 -188l-47 47l188 189q7 7 7 21q0 20 -32 20q-77 0 -126 10l1 28q60 -4 91 -4q122 0 211 37zM871 -149l-7 -7q-91 37 -216 37q-29 0 -87 -4l-1 28q47 8 126 10q35 0 35 23 q0 9 -10 19l-656 658l47 47l657 -659q7 -7 21 -7q20 0 20 32q0 77 10 126l28 -1q-4 -60 -4 -91q0 -122 37 -211zM402 145l-300 -301l-47 47l300 301z" />
+<glyph unicode="&#x292e;" horiz-adv-x="926" d="M402 361l-47 -47l-300 301l47 47zM864 662l7 -7q-37 -89 -37 -211q0 -31 4 -91l-28 -1q-10 49 -10 126q0 32 -20 32q-14 0 -21 -7l-657 -659l-47 47l656 658q10 10 10 19q0 23 -35 23q-79 2 -126 10l1 28q58 -4 87 -4q125 0 216 37zM871 -149l-7 -7q-89 37 -211 37 q-31 0 -91 -4l-1 28q49 10 126 10q32 0 32 20q0 14 -7 21l-188 189l47 47l187 -188q10 -10 19 -10q23 0 23 35q2 79 10 126l28 -1q-4 -58 -4 -87q0 -125 37 -216z" />
+<glyph unicode="&#x292f;" horiz-adv-x="926" d="M864 662l7 -7q-37 -91 -37 -216q0 -29 4 -87l-28 -1q-8 47 -10 126q0 35 -23 35q-9 0 -19 -10l-187 -188l-47 47l188 189q7 7 7 21q0 20 -32 20q-77 0 -126 10l1 28q60 -4 91 -4q122 0 211 37zM871 -109l-47 -47l-769 771l47 47zM402 145l-300 -301l-47 47l300 301z" />
+<glyph unicode="&#x2930;" horiz-adv-x="926" d="M873 -147l-7 -7q-91 37 -216 37q-29 0 -87 -4l-1 28q47 8 126 10q35 0 35 23q0 9 -10 19l-188 187l47 47l189 -188q7 -7 21 -7q20 0 20 32q0 77 10 126l28 -1q-4 -60 -4 -91q0 -122 37 -211zM873 615l-771 -769l-47 47l771 769zM403 362l-47 -47l-301 300l47 47z" />
+<glyph unicode="&#x2931;" horiz-adv-x="926" d="M402 361l-47 -47l-187 188q-10 10 -19 10q-23 0 -23 -35q-2 -79 -10 -126l-28 1q4 58 4 87q0 125 -37 216l7 7q89 -37 211 -37q31 0 91 4l1 -28q-49 -10 -126 -10q-32 0 -32 -20q0 -14 7 -21zM863 662l7 -7q-37 -91 -37 -216q0 -29 4 -87l-28 -1q-10 57 -10 126 q0 35 -23 35q-9 0 -19 -10l-656 -658l-47 47l657 659q7 7 7 21q0 20 -32 20q-77 0 -126 10l1 28q60 -4 91 -4q122 0 211 37zM870 -109l-47 -47l-300 301l47 47z" />
+<glyph unicode="&#x2932;" horiz-adv-x="926" d="M863 662l7 -7q-37 -91 -37 -216q0 -29 4 -87l-28 -1q-8 47 -10 126q0 35 -23 35q-9 0 -19 -10l-187 -188l-47 47l188 189q7 7 7 21q0 20 -32 20q-77 0 -126 10l1 28q60 -4 91 -4q122 0 211 37zM871 -109l-47 -47l-656 658q-10 10 -19 10q-23 0 -23 -35q0 -69 -10 -126 l-28 1q4 58 4 87q0 125 -37 216l7 7q89 -37 211 -37q31 0 91 4l1 -28q-49 -10 -126 -10q-32 0 -32 -20q0 -14 7 -21zM402 145l-300 -301l-47 47l300 301z" />
+<glyph unicode="&#x2933;" horiz-adv-x="926" d="M871 258v-10q-115 -49 -238 -191l-20 19q28 40 82 96q14 14 14 28q0 20 -26 20h-107q-35 0 -66.5 16t-55.5 38l-48 46q-24 22 -52 38t-58 16q-103 0 -190 -152l-51 34q44 81 106 132.5t135 51.5q39 0 75.5 -16t62.5 -38l50 -46q24 -22 47.5 -38t44.5 -16h108q8 0 17 7.5 t9 14.5q0 11 -14 25q-49 47 -82 97l20 19q125 -144 237 -191z" />
+<glyph unicode="&#x2934;" horiz-adv-x="926" d="M797 324l-19 -20q-37 25 -96 83q-14 14 -28 14q-20 0 -20 -26v-52q0 -134 -90 -228.5t-222 -94.5h-181v66h181q105 0 175.5 74.5t70.5 182.5v52q0 8 -7.5 17t-14.5 9q-11 0 -25 -14q-47 -49 -97 -82l-19 20q144 125 191 237h10q49 -115 191 -238z" />
+<glyph unicode="&#x2935;" horiz-adv-x="926" d="M778 258l19 -20q-142 -123 -191 -238h-10q-47 112 -191 237l19 20q50 -33 97 -82q14 -14 25 -14q7 0 14.5 9t7.5 17v52q0 108 -70.5 182.5t-175.5 74.5h-181v66h181q132 0 222 -94.5t90 -228.5v-52q0 -26 20 -26q14 0 28 14q59 58 96 83z" />
+<glyph unicode="&#x2936;" horiz-adv-x="784" d="M649 493v-181q0 -132 -94.5 -222t-228.5 -90h-52q-26 0 -26 -20q0 -14 14 -28q58 -59 83 -96l-20 -19q-123 142 -238 191v10q112 47 237 191l20 -19q-33 -50 -82 -97q-14 -14 -14 -25q0 -7 9 -14.5t17 -7.5h52q108 0 182.5 70.5t74.5 175.5v181h66z" />
+<glyph unicode="&#x2937;" horiz-adv-x="784" d="M697 38v-10q-115 -49 -238 -191l-20 19q25 37 83 96q14 14 14 28q0 20 -26 20h-52q-134 0 -228.5 90t-94.5 222v181h66v-181q0 -105 74.5 -175.5t182.5 -70.5h52q8 0 17 7.5t9 14.5q0 11 -14 25q-49 47 -82 97l20 19q125 -144 237 -191z" />
+<glyph unicode="&#x2938;" horiz-adv-x="511" d="M132 595l22 62q110 -34 185.5 -146t75.5 -234q0 -99 -43.5 -188.5t-123.5 -143.5q-10 -7 -10 -15q0 -13 20 -18q73 -17 120 -39l-7 -26q-108 35 -212 35q-41 0 -84 -6l-5 10q79 111 108 277l26 -5q-3 -63 -19 -125q-2 -14 -2 -16q0 -14 18 -14q35 0 92 76q26 35 41 91.5 t15 108.5q0 102 -63 195.5t-154 120.5z" />
+<glyph unicode="&#x2939;" horiz-adv-x="511" d="M441 -114l-5 -10q-44 6 -84 6q-104 0 -212 -35l-7 26q47 22 120 39q20 5 20 18q0 8 -10 15q-80 54 -123.5 143.5t-43.5 188.5q0 122 75.5 234t185.5 146l22 -62q-91 -27 -154 -120.5t-63 -195.5q0 -52 15 -108.5t41 -91.5q57 -76 92 -76q18 0 18 14q0 2 -2 16 q-16 62 -19 125l26 5q29 -166 108 -277z" />
+<glyph unicode="&#x293a;" horiz-adv-x="926" d="M866 162l-62 -22q-27 91 -117.5 154t-191.5 63q-51 0 -105 -14.5t-89 -41.5q-76 -57 -76 -92q0 -18 14 -18q2 0 16 2q62 16 125 19l5 -26q-166 -29 -277 -108l-10 5q6 43 6 84q0 104 -35 212l26 7q22 -47 39 -120q5 -20 18 -20q8 0 15 10q54 79 143.5 123t182.5 44 q121 0 230 -75t143 -186z" />
+<glyph unicode="&#x293b;" horiz-adv-x="926" d="M857 122l-26 -7q-22 47 -39 120q-5 20 -18 20q-8 0 -15 -10q-54 -79 -143.5 -123t-182.5 -44q-121 0 -230 75t-143 186l62 22q27 -91 117.5 -154t191.5 -63q51 0 105 14.5t89 41.5q76 57 76 92q0 18 -14 18q-2 0 -16 -2q-62 -16 -125 -19l-5 26q166 29 277 108l10 -5 q-6 -44 -6 -84q0 -104 35 -212z" />
+<glyph unicode="&#x293c;" horiz-adv-x="926" d="M830 386l26 -7q-35 -108 -35 -212q0 -41 6 -84l-10 -5q-111 79 -277 108l5 26q63 -3 125 -19q14 -2 16 -2q14 0 14 18q0 35 -76 92q-35 27 -89 41.5t-105 14.5q-101 0 -191.5 -63t-117.5 -154l-62 22q34 111 143 186t230 75q93 0 182.5 -44t143.5 -123q7 -10 15 -10 q13 0 18 20q17 73 39 120zM536 64h-256v50h256v-50z" />
+<glyph unicode="&#x293d;" horiz-adv-x="926" d="M866 162l-62 -22q-27 91 -117.5 154t-191.5 63q-51 0 -105 -14.5t-89 -41.5q-76 -57 -76 -92q0 -18 14 -18q2 0 16 2q62 16 125 19l5 -26q-166 -29 -277 -108l-10 5q6 43 6 84q0 104 -35 212l26 7q22 -47 39 -120q5 -20 18 -20q8 0 15 10q54 79 143.5 123t182.5 44 q121 0 230 -75t143 -186zM646 64h-104v-93h-50v93h-104v50h104v93h50v-93h104v-50z" />
+<glyph unicode="&#x293e;" horiz-adv-x="926" d="M652 508l36 55q77 -50 122.5 -132t45.5 -177q0 -153 -108.5 -261.5t-261.5 -108.5q-99 0 -183.5 49t-134.5 132q-10 12 -19 12q-12 0 -17 -25q-11 -61 -37 -121l-26 8q32 109 32 202q0 43 -8 94l7 5q118 -79 283 -102l-6 -28q-69 5 -126 18q-9 3 -15 3q-16 0 -16 -16 q0 -8 8 -22q40 -66 108.5 -104.5t149.5 -38.5q126 0 215 89t89 215q0 78 -37.5 145.5t-100.5 108.5z" />
+<glyph unicode="&#x293f;" horiz-adv-x="926" d="M856 -61l-26 -8q-26 60 -37 121q-5 25 -17 25q-9 0 -19 -12q-50 -83 -134.5 -132t-183.5 -49q-153 0 -261.5 108.5t-108.5 261.5q0 95 45.5 177t122.5 132l36 -55q-63 -41 -100.5 -108.5t-37.5 -145.5q0 -126 89 -215t215 -89q81 0 149.5 38.5t108.5 104.5q8 14 8 22 q0 16 -16 16q-6 0 -15 -3q-57 -13 -126 -18l-6 28q165 23 283 102l7 -5q-8 -51 -8 -94q0 -93 32 -202z" />
+<glyph unicode="&#x2940;" horiz-adv-x="926" d="M572 788l20 -19q-28 -40 -82 -96q-14 -14 -14 -28q0 -19 21 -23q136 -27 226.5 -128.5t90.5 -238.5q0 -154 -108.5 -262.5t-262.5 -108.5t-262.5 108.5t-108.5 262.5q0 127 76.5 226t196.5 132q46 23 86.5 55t63.5 56t57 64zM591 416l-20 -19q-93 106 -174 157 q-104 -23 -172 -106.5t-68 -192.5q0 -127 89.5 -216.5t216.5 -89.5t216.5 89.5t89.5 216.5q0 112 -71.5 196.5t-179.5 104.5h-2q-20 0 -20 -19q0 -11 14 -25q48 -46 81 -96z" />
+<glyph unicode="&#x2941;" horiz-adv-x="926" d="M334 769l20 19q34 -40 57 -64t63.5 -56t86.5 -55q120 -33 196.5 -132t76.5 -226q0 -154 -108.5 -262.5t-262.5 -108.5t-262.5 108.5t-108.5 262.5q0 137 90.5 238.5t226.5 128.5q21 4 21 23q0 14 -14 28q-54 56 -82 96zM410 556h-2q-108 -20 -179.5 -104.5t-71.5 -196.5 q0 -127 89.5 -216.5t216.5 -89.5t216.5 89.5t89.5 216.5q0 109 -68 192.5t-172 106.5q-81 -51 -174 -157l-20 19q33 50 81 96q14 14 14 25q0 19 -20 19z" />
+<glyph unicode="&#x2942;" horiz-adv-x="926" d="M871 418v-10q-119 -51 -236 -180l-20 19q24 31 76 85q14 14 14 28q0 20 -26 20h-614v66h613q9 0 18 5.5t9 16.5t-14 25q-52 51 -76 86l20 19q111 -128 236 -180zM448 60h-200q-9 0 -18 -5.5t-9 -16.5t14 -25q52 -51 76 -86l-20 -19q-111 128 -236 180v10q119 51 236 180 l20 -19q-24 -31 -76 -85q-14 -14 -14 -28q0 -20 26 -20h201v-66z" />
+<glyph unicode="&#x2943;" horiz-adv-x="926" d="M861 380h-614q-26 0 -26 -20q0 -14 14 -28q52 -54 76 -85l-20 -19q-117 129 -236 180v10q125 52 236 180l20 -19q-24 -35 -76 -86q-14 -14 -14 -25t9 -16.5t18 -5.5h613v-66zM871 98v-10q-125 -52 -236 -180l-20 19q24 35 76 86q14 14 14 25t-9 16.5t-18 5.5h-200v66h201 q26 0 26 20q0 14 -14 28q-52 54 -76 85l20 19q117 -129 236 -180z" />
+<glyph unicode="&#x2944;" horiz-adv-x="926" d="M871 418v-10q-125 -52 -236 -180l-20 19q24 35 76 86q14 14 14 25t-9 16.5t-18 5.5h-200v66h201q26 0 26 20q0 14 -14 28q-52 54 -76 85l20 19q117 -129 236 -180zM861 60h-614q-26 0 -26 -20q0 -14 14 -28q52 -54 76 -85l-20 -19q-117 129 -236 180v10q125 52 236 180 l20 -19q-24 -35 -76 -86q-14 -14 -14 -25t9 -16.5t18 -5.5h613v-66z" />
+<glyph unicode="&#x2945;" horiz-adv-x="926" d="M871 258v-10q-115 -49 -238 -191l-20 19q28 40 82 96q14 14 14 28q0 20 -26 20h-628v66h629q8 0 17 7.5t9 14.5q0 11 -14 25q-49 47 -82 97l20 19q125 -144 237 -191zM388 24h-104v-93h-50v93h-104v50h104v93h50v-93h104v-50z" />
+<glyph unicode="&#x2946;" horiz-adv-x="926" d="M871 220h-629q-8 0 -17 -7.5t-9 -14.5q0 -11 14 -25q49 -47 82 -97l-20 -19q-125 144 -237 191v10q115 49 238 191l20 -19q-28 -40 -82 -96q-14 -14 -14 -28q0 -20 26 -20h628v-66zM796 24h-104v-93h-50v93h-104v50h104v93h50v-93h104v-50z" />
+<glyph unicode="&#x2947;" horiz-adv-x="926" d="M871 258v-10q-115 -49 -238 -191l-20 19q28 40 82 96q14 14 14 28q0 20 -26 20h-265l108 -108l-35 -35l-142 142l-142 -142l-35 35l108 108h-225v66h227l-110 110l35 35l142 -142l142 142l35 -35l-110 -110h268q8 0 17 7.5t9 14.5q0 11 -14 25q-49 47 -82 97l20 19 q125 -144 237 -191z" />
+<glyph unicode="&#x2948;" horiz-adv-x="926" d="M888 258v-10q-115 -49 -238 -191l-20 19q28 40 82 96q14 14 14 28q0 20 -26 20h-87q-11 -52 -53 -86t-97 -34t-97 34t-54 86h-87q-8 0 -17 -7.5t-9 -14.5q0 -11 14 -25q51 -49 82 -96l-20 -19q-124 143 -237 190v10q115 49 238 191l20 -19q-28 -40 -82 -96 q-14 -14 -14 -28q0 -20 26 -20h86q11 53 53.5 87.5t97.5 34.5q56 0 98 -34.5t53 -87.5h87q8 0 17 7.5t9 14.5q0 11 -14 25q-51 49 -82 96l20 19q124 -143 237 -190zM364 286h198q-11 31 -38 51.5t-61 20.5t-61.5 -20.5t-37.5 -51.5zM561 220h-197q11 -31 38 -50.5t61 -19.5 q33 0 60 19.5t38 50.5z" />
+<glyph unicode="&#x2949;" horiz-adv-x="511" d="M451 277l-19 -20q-17 12 -32 24.5l-35 30.5l-29 27q-16 14 -28 14q-9 0 -14.5 -6.5t-5.5 -15.5v-190q51 -13 82 -52.5t31 -92.5q0 -62 -44 -106t-106 -44t-106 44t-44 106q0 52 33 94t84 52h2l2 1v187q0 6 -8 15t-14 9q-11 0 -25 -14q-67 -63 -96 -82l-19 20 q112 97 162 181v16q0 8 -7.5 17t-14.5 9q-11 0 -25 -14q-67 -63 -96 -82l-19 20q141 121 190 237h10q50 -115 191 -238l-19 -20q-17 12 -32 24.5t-35 31.5l-29 26q-16 14 -28 14q-20 0 -20 -40q54 -88 163 -183zM351 -4q0 41 -29.5 70.5t-70.5 29.5t-70.5 -29.5t-29.5 -70.5 t29.5 -70.5t70.5 -29.5t70.5 29.5t29.5 70.5z" />
+<glyph unicode="&#x294a;" horiz-adv-x="926" d="M888 286v-5q-108 -52 -238 -214l-20 19l16 24l18 26l16.5 21.5t21.5 24.5q14 14 14 24q0 14 -26 14h-652v5q108 52 238 214l20 -19l-16 -24l-18 -26l-16.5 -21.5t-21.5 -24.5q-14 -14 -14 -24q0 -14 26 -14h652z" />
+<glyph unicode="&#x294b;" horiz-adv-x="926" d="M888 220h-652q-26 0 -26 -14q0 -10 14 -24q11 -11 21.5 -24.5l16.5 -21.5l18 -26l16 -24l-20 -19q-130 162 -238 214v5h652q26 0 26 14q0 10 -14 24q-11 11 -21.5 24.5l-16.5 21.5l-18 26l-16 24l20 19q130 -162 238 -214v-5z" />
+<glyph unicode="&#x294c;" horiz-adv-x="511" d="M441 424l-19 -20l-24 16l-26 18l-21.5 16.5t-24.5 21.5q-14 14 -24 14q-14 0 -14 -26v-620h-5q-52 108 -214 238l19 20l24 -16l26 -18l21.5 -16.5t24.5 -21.5q14 -14 24 -14q14 0 14 26v620h5q52 -108 214 -238z" />
+<glyph unicode="&#x294d;" horiz-adv-x="511" d="M422 102l19 -20q-162 -130 -214 -238h-5v620q0 26 -14 26q-10 0 -24 -14q-11 -11 -24.5 -21.5l-21.5 -16.5l-26 -18l-24 -16l-19 20q162 130 214 238h5v-620q0 -26 14 -26q10 0 24 14q11 11 24.5 21.5l21.5 16.5l26 18z" />
+<glyph unicode="&#x294e;" horiz-adv-x="926" d="M888 220h-850v5q108 52 238 214l20 -19l-16 -24l-18 -26l-16.5 -21.5t-21.5 -24.5q-14 -14 -14 -24q0 -14 26 -14h454q26 0 26 14q0 10 -14 24q-11 11 -21.5 24.5l-16.5 21.5l-18 26l-16 24l20 19q130 -162 238 -214v-5z" />
+<glyph unicode="&#x294f;" horiz-adv-x="511" d="M422 102l19 -20q-162 -130 -214 -238h-5v818h5q52 -108 214 -238l-19 -20l-24 16l-26 18l-21.5 16.5t-24.5 21.5q-14 14 -24 14q-14 0 -14 -26v-422q0 -26 14 -26q10 0 24 14q11 11 24.5 21.5l21.5 16.5l26 18z" />
+<glyph unicode="&#x2950;" horiz-adv-x="926" d="M888 286v-5q-108 -52 -238 -214l-20 19l16 24l18 26l16.5 21.5t21.5 24.5q14 14 14 24q0 14 -26 14h-454q-26 0 -26 -14q0 -10 14 -24q11 -11 21.5 -24.5l16.5 -21.5l18 -26l16 -24l-20 -19q-130 162 -238 214v5h850z" />
+<glyph unicode="&#x2951;" horiz-adv-x="511" d="M288 -156h-5q-52 108 -214 238l19 20l24 -16l26 -18l21.5 -16.5t24.5 -21.5q14 -14 24 -14q14 0 14 26v428q0 20 -14 20q-10 0 -24 -14q-11 -11 -24.5 -21.5l-21.5 -16.5l-26 -18l-24 -16l-19 20q162 130 214 238h5v-818z" />
+<glyph unicode="&#x2952;" horiz-adv-x="926" d="M871 220h-766v-162h-50v390h50v-223q108 52 238 214l20 -19l-17 -24l-17 -26l-16.5 -21.5t-21.5 -24.5q-14 -14 -14 -24q0 -14 26 -14h568v-66z" />
+<glyph unicode="&#x2953;" horiz-adv-x="926" d="M871 58h-50v162h-766v66h568q26 0 26 14q0 10 -14 24q-11 11 -21.5 24.5l-16.5 21.5l-17 26l-17 24l20 19q130 -162 238 -214v223h50v-390z" />
+<glyph unicode="&#x2954;" horiz-adv-x="511" d="M451 612h-224q52 -108 214 -238l-19 -20l-24 16l-26 18l-21.5 16.5t-24.5 21.5q-14 14 -24 14q-14 0 -14 -26v-570h-66v768h-162v50h391v-50z" />
+<glyph unicode="&#x2955;" horiz-adv-x="511" d="M451 -156h-391v50h163v768h66v-570q0 -26 14 -26q10 0 24 14q11 11 24.5 21.5t22.5 16.5l25 18l24 16l19 -20q-162 -130 -214 -238h223v-50z" />
+<glyph unicode="&#x2956;" horiz-adv-x="926" d="M871 220h-568q-26 0 -26 -14q0 -10 14 -24q11 -11 21.5 -24.5l16.5 -21.5l17 -26l17 -24l-20 -19q-130 162 -238 214v-223h-50v390h50v-162h766v-66z" />
+<glyph unicode="&#x2957;" horiz-adv-x="926" d="M871 58h-50v223q-108 -52 -238 -214l-20 19l17 24l17 26l16.5 21.5t21.5 24.5q14 14 14 24q0 14 -26 14h-568v66h766v162h50v-390z" />
+<glyph unicode="&#x2958;" horiz-adv-x="511" d="M451 612h-163v-768h-66v570q0 26 -14 26q-10 0 -24 -14q-11 -11 -24.5 -21.5l-21.5 -16.5l-26 -18l-24 -16l-19 20q162 130 214 238h-223v50h391v-50z" />
+<glyph unicode="&#x2959;" horiz-adv-x="511" d="M451 -156h-391v50h223q-52 108 -214 238l19 20l24 -16l26 -18l21.5 -16.5t24.5 -21.5q14 -14 24 -14q14 0 14 26v570h66v-768h163v-50z" />
+<glyph unicode="&#x295a;" horiz-adv-x="926" d="M871 58h-50v162h-766v5q108 52 238 214l20 -19l-17 -24l-17 -26l-16.5 -21.5t-21.5 -24.5q-14 -14 -14 -24q0 -14 26 -14h568v162h50v-390z" />
+<glyph unicode="&#x295b;" horiz-adv-x="926" d="M871 220h-766v-162h-50v390h50v-162h568q26 0 26 14q0 10 -14 24q-11 11 -21.5 24.5l-16.5 21.5l-17 26l-17 24l20 19q130 -162 238 -214v-5z" />
+<glyph unicode="&#x295c;" horiz-adv-x="511" d="M451 -156h-391v50h162v768h5q52 -108 214 -238l-19 -20l-24 16l-26 18l-21.5 16.5t-24.5 21.5q-14 14 -24 14q-14 0 -14 -26v-570h163v-50z" />
+<glyph unicode="&#x295d;" horiz-adv-x="511" d="M451 612h-163v-570q0 -26 14 -26q10 0 24 14q11 11 24.5 21.5l21.5 16.5l26 18l24 16l19 -20q-162 -130 -214 -238h-5v768h-162v50h391v-50z" />
+<glyph unicode="&#x295e;" horiz-adv-x="926" d="M871 58h-50v162h-568q-26 0 -26 -14q0 -10 14 -24q11 -11 21.5 -24.5l16.5 -21.5l17 -26l17 -24l-20 -19q-130 162 -238 214v5h766v162h50v-390z" />
+<glyph unicode="&#x295f;" horiz-adv-x="926" d="M871 286v-5q-108 -52 -238 -214l-20 19l17 24l17 26l16.5 21.5t21.5 24.5q14 14 14 24q0 14 -26 14h-568v-162h-50v390h50v-162h766z" />
+<glyph unicode="&#x2960;" horiz-adv-x="511" d="M450 -156h-391v50h163v570q0 26 -14 26q-10 0 -24 -14q-11 -11 -24.5 -21.5l-21.5 -16.5l-26 -18l-24 -16l-19 20q162 130 214 238h5v-768h162v-50z" />
+<glyph unicode="&#x2961;" horiz-adv-x="511" d="M450 612h-162v-768h-5q-52 108 -214 238l19 20l24 -16l26 -18l21.5 -16.5t24.5 -21.5q14 -14 24 -14q14 0 14 26v570h-163v50h391v-50z" />
+<glyph unicode="&#x2962;" horiz-adv-x="926" d="M871 320h-816v5q108 52 238 214l20 -19l-17 -24l-17 -26l-16.5 -21.5t-21.5 -24.5q-14 -14 -14 -24q0 -14 26 -14h618v-66zM871 120h-618q-26 0 -26 -14q0 -10 14 -24q11 -11 21.5 -24.5l16.5 -21.5l17 -26l17 -24l-20 -19q-130 162 -238 214v5h816v-66z" />
+<glyph unicode="&#x2963;" d="M276 -156h-66v620q0 26 -14 26q-10 0 -24 -14q-11 -11 -24.5 -21.5l-21.5 -16.5l-26 -18l-24 -16l-19 20q162 130 214 238h5v-818zM629 424l-19 -20l-24 16l-26 18l-21.5 16.5t-24.5 21.5q-14 14 -24 14q-14 0 -14 -26v-620h-66v818h5q52 -108 214 -238z" />
+<glyph unicode="&#x2964;" horiz-adv-x="926" d="M871 320h-816v66h618q26 0 26 14q0 10 -14 24q-11 11 -21.5 24.5l-16.5 21.5l-17 26l-17 24l20 19q130 -162 238 -214v-5zM871 186v-5q-108 -52 -238 -214l-20 19l17 24l17 26l16.5 21.5t21.5 24.5q14 14 14 24q0 14 -26 14h-618v66h816z" />
+<glyph unicode="&#x2965;" d="M610 102l19 -20q-162 -130 -214 -238h-5v818h66v-620q0 -26 14 -26q10 0 24 14q11 11 24.5 21.5l21.5 16.5l26 18zM276 -156h-5q-52 108 -214 238l19 20l24 -16l26 -18l21.5 -16.5t24.5 -21.5q14 -14 24 -14q14 0 14 26v620h66v-818z" />
+<glyph unicode="&#x2966;" horiz-adv-x="926" d="M861 320h-806v5q108 52 238 214l20 -19l-17 -24l-17 -26l-16.5 -21.5t-21.5 -24.5q-14 -14 -14 -24q0 -14 26 -14h608v-66zM871 120h-806v66h608q26 0 26 14q0 8 -13 24q-19 22 -39 51l21 17q103 -115 203 -167v-5z" />
+<glyph unicode="&#x2967;" horiz-adv-x="926" d="M861 320h-608q-26 0 -26 -14q0 -8 13 -24q19 -22 39 -51l-21 -17q-103 115 -203 167v5h806v-66zM871 186v-5q-108 -52 -238 -214l-20 19l17 24l17 26l16.5 21.5t21.5 24.5q14 14 14 24q0 14 -26 14h-608v66h806z" />
+<glyph unicode="&#x2968;" horiz-adv-x="926" d="M871 320h-806v66h608q26 0 26 14q0 10 -14 24q-36 37 -77 96l20 19q127 -158 243 -214v-5zM861 120h-806v5q100 52 203 167l21 -17q-20 -29 -39 -51q-13 -16 -13 -24q0 -14 26 -14h608v-66z" />
+<glyph unicode="&#x2969;" horiz-adv-x="926" d="M871 386v-5q-100 -52 -203 -167l-21 17q20 29 39 51q13 16 13 24q0 14 -26 14h-608v66h806zM861 120h-608q-26 0 -26 -14q0 -10 14 -24q11 -11 21.5 -24.5l16.5 -21.5l17 -26l17 -24l-20 -19q-130 162 -238 214v5h806v-66z" />
+<glyph unicode="&#x296a;" horiz-adv-x="926" d="M871 320h-816v5q108 52 238 214l20 -19l-17 -24l-17 -26l-16.5 -21.5t-21.5 -24.5q-14 -14 -14 -24q0 -14 26 -14h618v-66zM871 120h-806v66h806v-66z" />
+<glyph unicode="&#x296b;" horiz-adv-x="926" d="M871 320h-806v66h806v-66zM871 120h-618q-26 0 -26 -14q0 -10 14 -24q11 -11 21.5 -24.5l16.5 -21.5l17 -26l17 -24l-20 -19q-130 162 -238 214v5h816v-66z" />
+<glyph unicode="&#x296c;" horiz-adv-x="926" d="M871 320h-816v66h618q26 0 26 14q0 10 -14 24q-11 11 -21.5 24.5l-16.5 21.5l-17 26l-17 24l20 19q130 -162 238 -214v-5zM861 120h-806v66h806v-66z" />
+<glyph unicode="&#x296d;" horiz-adv-x="926" d="M861 320h-806v66h806v-66zM871 186v-5q-108 -52 -238 -214l-20 19l17 24l17 26l16.5 21.5t21.5 24.5q14 14 14 24q0 14 -26 14h-618v66h816z" />
+<glyph unicode="&#x296e;" d="M610 102l19 -20q-162 -130 -214 -238h-5v808h66v-610q0 -26 14 -26q10 0 24 14q11 11 24.5 21.5l21.5 16.5l26 18zM276 -146h-66v610q0 26 -14 26q-10 0 -24 -14q-11 -11 -24.5 -21.5l-21.5 -16.5l-26 -18l-24 -16l-19 20q162 130 214 238h5v-808z" />
+<glyph unicode="&#x296f;" d="M629 424l-19 -20l-24 16l-26 18l-21.5 16.5t-24.5 21.5q-14 14 -24 14q-14 0 -14 -26v-610h-66v808h5q52 -108 214 -238zM276 -156h-5q-52 108 -214 238l19 20l24 -16l26 -18l21.5 -16.5t24.5 -21.5q14 -14 24 -14q14 0 14 26v610h66v-808z" />
+<glyph unicode="&#x2970;" horiz-adv-x="926" d="M55 386h684q55 0 93.5 -39t38.5 -94t-38.5 -94t-93.5 -39h-684v66h684q27 0 46.5 19.5t19.5 47.5q0 27 -19.5 47t-46.5 20h-684v66z" />
+<glyph unicode="&#x2971;" horiz-adv-x="926" d="M519 515h-369v50h369v-50zM519 370h-369v50h369v-50zM871 258v-10q-115 -49 -238 -191l-20 19q28 40 82 96q14 14 14 28q0 20 -26 20h-628v66h629q8 0 17 7.5t9 14.5q0 11 -14 25q-49 47 -82 97l20 19q125 -144 237 -191z" />
+<glyph unicode="&#x2972;" horiz-adv-x="926" d="M520 508h19q-3 -48 -36.5 -93t-77.5 -45q-32 0 -100 44t-89 44q-31 0 -54.5 -25t-31.5 -63h-20q2 53 37 95.5t80 42.5q33 0 101 -44t88 -44q32 0 54 24.5t30 63.5zM871 258v-10q-115 -49 -238 -191l-20 19q28 40 82 96q14 14 14 28q0 20 -26 20h-628v66h629q8 0 17 7.5 t9 14.5q0 11 -14 25q-49 47 -82 97l20 19q125 -144 237 -191z" />
+<glyph unicode="&#x2973;" horiz-adv-x="926" d="M871 220h-629q-8 0 -17 -7.5t-9 -14.5q0 -11 14 -25q49 -47 82 -97l-20 -19q-125 144 -237 191v10q115 49 238 191l20 -19q-28 -40 -82 -96q-14 -14 -14 -28q0 -20 26 -20h628v-66zM776 136h20q-2 -53 -37 -95.5t-80 -42.5q-33 0 -101 44t-88 44q-32 0 -54 -24.5 t-30 -63.5h-19q3 48 36.5 93t77.5 45q32 0 100 -44t89 -44q31 0 54.5 25t31.5 63z" />
+<glyph unicode="&#x2974;" horiz-adv-x="926" d="M871 258v-10q-112 -47 -237 -191l-20 19q33 50 82 97q14 14 14 25q0 7 -9 14.5t-17 7.5h-629v66h628q26 0 26 20q0 14 -14 28q-54 56 -82 96l20 19q123 -142 238 -191zM519 136h20q-2 -53 -37 -95.5t-80 -42.5q-32 0 -100 44t-89 44q-32 0 -54 -24.5t-30 -63.5h-19 q3 48 36.5 93t77.5 45q32 0 100 -44t89 -44q31 0 54.5 25t31.5 63z" />
+<glyph unicode="&#x2975;" horiz-adv-x="926" d="M871 258v-10q-112 -47 -237 -191l-20 19q33 50 82 97q14 14 14 25q0 7 -9 14.5t-17 7.5h-629v66h628q26 0 26 20q0 14 -14 28q-54 56 -82 96l20 19q123 -142 238 -191zM519 136h20q-2 -53 -37 -95.5t-80 -42.5q-32 0 -100 44t-89 44q-32 0 -54 -24.5t-30 -63.5h-19 q3 48 36.5 93t77.5 45q32 0 100 -44t89 -44q31 0 54.5 25t31.5 63zM519 -3h20q-2 -53 -37 -95.5t-80 -42.5q-32 0 -100 44t-89 44q-32 0 -54 -24.5t-30 -63.5h-19q3 48 36.5 93t77.5 45q32 0 100 -44t89 -44q31 0 54.5 25t31.5 63z" />
+<glyph unicode="&#x2976;" d="M621 50l-557 274v10l557 273v-67l-421 -211l421 -212v-67zM621 -120h-368q-26 0 -26 -20q0 -14 14 -28q54 -56 82 -96l-20 -19q-123 142 -238 191v10q112 47 237 191l20 -19q-33 -50 -82 -97q-14 -14 -14 -25q0 -7 9 -14.5t17 -7.5h369v-66z" />
+<glyph unicode="&#x2977;" horiz-adv-x="926" d="M871 -26l-500 246h-139q-26 0 -26 -22q0 -11 14 -25q49 -47 82 -97l-20 -19q-125 144 -237 191v10q115 49 238 191l20 -19q-28 -40 -82 -96q-14 -14 -14 -28q0 -20 26 -20h138l500 246v-65l-355 -181h315v-66h-316l356 -181v-65z" />
+<glyph unicode="&#x2978;" d="M621 324l-557 -273v67l421 211l-421 212v67l557 -274v-10zM620 -81v-10q-115 -49 -238 -191l-20 19q28 40 82 96q14 14 14 28q0 20 -26 20h-368v66h369q8 0 17 7.5t9 14.5q0 11 -14 25q-49 47 -82 97l20 19q125 -144 237 -191z" />
+<glyph unicode="&#x2979;" d="M621 161h-290q-121 0 -194 62.5t-73 171.5t74 170.5t196 61.5h287v-66h-287q-89 0 -146.5 -44t-57.5 -122t58 -123t147 -45h286v-66zM620 -61v-10q-115 -49 -238 -191l-20 19q28 40 82 96q14 14 14 28q0 20 -26 20h-368v66h369q8 0 17 7.5t9 14.5q0 11 -14 25 q-49 47 -82 97l20 19q125 -144 237 -191z" />
+<glyph unicode="&#x297a;" horiz-adv-x="926" d="M871 -26h-290q-107 0 -180.5 71t-84.5 175h-84q-26 0 -26 -22q0 -11 14 -25q39 -38 72 -87l-20 -19q-57 66 -109 110t-118 71v10q113 48 228 181l20 -19q-29 -41 -72 -86q-14 -14 -14 -28q0 -20 26 -20h83q12 103 86 174.5t182 71.5h287v-66h-287q-75 0 -132.5 -53.5 t-69.5 -126.5h449v-66h-449q12 -73 70 -126.5t133 -53.5h286v-66z" />
+<glyph unicode="&#x297b;" d="M63 627h287q122 0 196 -61.5t74 -170.5t-73 -171.5t-194 -62.5h-290v66h286q89 0 147 45t58 123t-57.5 122t-146.5 44h-287v66zM620 -99h-368q-26 0 -26 -20q0 -14 14 -28q54 -56 82 -96l-20 -19q-123 142 -238 191v10q112 47 237 191l20 -19q-33 -50 -82 -97 q-14 -14 -14 -25q0 -7 9 -14.5t17 -7.5h369v-66z" />
+<glyph unicode="&#x297c;" horiz-adv-x="926" d="M791 220h-510q-33 0 -56.5 -19.5t-23.5 -58.5q0 -38 24 -59.5t56 -21.5v-66q-54 0 -100 39.5t-46 107.5q0 69 52 111q-52 42 -52 111q0 68 46 107.5t100 39.5v-66q-32 0 -56 -21.5t-24 -59.5t24.5 -58t55.5 -20h510v-66z" />
+<glyph unicode="&#x297d;" horiz-adv-x="926" d="M645 445v66q54 0 100 -39.5t46 -107.5q0 -69 -52 -111q52 -42 52 -111q0 -68 -46 -107.5t-100 -39.5v66q32 0 56 21.5t24 59.5t-24.5 58t-55.5 20h-510v66h510q33 0 56.5 19.5t23.5 58.5q0 38 -24 59.5t-56 21.5z" />
+<glyph unicode="&#x297e;" d="M600 435h-66q0 32 -21.5 56t-59.5 24t-58 -24.5t-20 -55.5v-510h-66v510q0 33 -19.5 56.5t-58.5 23.5q-38 0 -59.5 -24t-21.5 -56h-66q0 54 39.5 100t107.5 46q69 0 111 -52q42 52 111 52q68 0 107.5 -46t39.5 -100z" />
+<glyph unicode="&#x297f;" d="M534 71h66q0 -54 -39.5 -100t-107.5 -46q-69 0 -111 52q-42 -52 -111 -52q-68 0 -107.5 46t-39.5 100h66q0 -32 21.5 -56t59.5 -24t58 24.5t20 55.5v510h66v-510q0 -33 19.5 -56.5t58.5 -23.5q38 0 59.5 24t21.5 56z" />
+<glyph unicode="&#x2980;" horiz-adv-x="594" d="M509 -189h-66v884h66v-884zM330 -189h-66v884h66v-884zM151 -189h-66v884h66v-884z" />
+<glyph unicode="&#x2981;" horiz-adv-x="565" d="M519 252q0 -99 -69 -168.5t-166 -69.5q-99 0 -168.5 69.5t-69.5 168.5q0 97 69.5 166t168.5 69q97 0 166 -69t69 -166z" />
+<glyph unicode="&#x2982;" horiz-adv-x="503" d="M393 425q0 -59 -41.5 -100t-100.5 -41t-100 41t-41 100t41 100t100 41t100.5 -41t41.5 -100zM333 424q0 34 -24 57.5t-58 23.5t-57.5 -23.5t-23.5 -57.5t23.5 -57t57.5 -23t58 23t24 57zM393 82q0 -59 -41.5 -100t-100.5 -41t-100 41.5t-41 99.5q0 59 41 100.5t100 41.5 t100.5 -41.5t41.5 -100.5zM333 82q0 34 -24 58t-58 24q-33 0 -57 -24t-24 -58q0 -33 24 -57t57 -24q34 0 58 24t24 57z" />
+<glyph unicode="&#x2983;" horiz-adv-x="596" d="M477 -213h-133q-161 0 -161 173v162q0 106 -75 128v6q75 22 75 128v162q0 173 161 173h133v-20h-67v-892h67v-20zM360 -193v892h-16q-23 0 -40 -8t-27 -24.5t-16 -32t-8.5 -41t-3 -40.5t-0.5 -41v-91q0 -122 -95 -167v-2q95 -45 95 -167v-91q0 -25 0.5 -39.5t3 -40.5 t8.5 -41.5t16 -32.5t27 -25t40 -8h16z" />
+<glyph unicode="&#x2984;" horiz-adv-x="596" d="M488 256v-6q-75 -22 -75 -128v-162q0 -173 -161 -173h-133v20h67v892h-67v20h133q161 0 161 -173v-162q0 -106 75 -128zM442 252v2q-95 45 -95 167v91q0 25 -0.5 39.5t-3 40.5t-8.5 41.5t-16 32.5t-27 25t-40 8h-16v-892h16q23 0 40 8t27 24.5t16 32t8.5 41t3 40.5 t0.5 41v91q0 122 95 167z" />
+<glyph unicode="&#x2985;" horiz-adv-x="463" d="M393 -191v-22q-323 141 -323 466t323 466v-20q-4 -2 -52 -33q-94 -87 -94 -413q0 -329 93 -412q40 -26 53 -32zM283 -119q-86 111 -86 372q0 259 86 371q-163 -133 -163 -371q0 -241 163 -372z" />
+<glyph unicode="&#x2986;" horiz-adv-x="463" d="M70 697v22q323 -141 323 -466t-323 -466v20q4 2 52 33q94 87 94 413q0 329 -93 412q-40 26 -53 32zM343 253q0 241 -163 372q86 -111 86 -372q0 -259 -86 -371q163 133 163 371z" />
+<glyph unicode="&#x2987;" horiz-adv-x="511" d="M367 719v-933q-116 76 -184 199.5t-68 267.5t68 267t184 199zM317 -109v724q-72 -71 -112 -164.5t-40 -197.5q0 -213 152 -362z" />
+<glyph unicode="&#x2988;" horiz-adv-x="511" d="M144 -214v933q116 -76 184 -199.5t68 -267.5t-68 -267t-184 -199zM194 614v-724q72 71 112 164.5t40 197.5q0 213 -152 362z" />
+<glyph unicode="&#x2989;" horiz-adv-x="511" d="M352 -213l-252 466l252 466v-932zM302 -17v540l-145 -270z" />
+<glyph unicode="&#x298a;" horiz-adv-x="511" d="M411 253l-252 -466v932zM354 253l-145 270v-540z" />
+<glyph unicode="&#x298b;" horiz-adv-x="469" d="M447 -83h-259v802h259v-50h-193v-702h193v-50zM447 -213h-259v50h259v-50z" />
+<glyph unicode="&#x298c;" horiz-adv-x="469" d="M281 -83h-259v50h193v702h-193v50h259v-802zM281 -213h-259v50h259v-50z" />
+<glyph unicode="&#x298d;" horiz-adv-x="469" d="M447 -213h-259v932h259v-50h-158l134 -133l-36 -36l-133 133v-796h193v-50z" />
+<glyph unicode="&#x298e;" horiz-adv-x="469" d="M281 -213h-259v50h158l-134 133l36 36l133 -133v796h-193v50h259v-932z" />
+<glyph unicode="&#x298f;" horiz-adv-x="469" d="M447 -213h-259v932h259v-50h-193v-796l133 133l36 -36l-134 -133h158v-50z" />
+<glyph unicode="&#x2990;" horiz-adv-x="469" d="M281 -213h-259v50h193v796l-133 -133l-36 36l134 133h-158v50h259v-932z" />
+<glyph unicode="&#x2991;" horiz-adv-x="400" d="M357 253q0 -26 -17.5 -45t-45.5 -19q-29 0 -46.5 17.5t-17.5 46.5q0 27 19.5 45t44.5 18t44 -18t19 -45zM335 719l-192 -466l191 -466h-52l-209 466l210 466h52z" />
+<glyph unicode="&#x2992;" horiz-adv-x="400" d="M357 253l-210 -466h-52l192 466l-191 466h52zM200 253q0 -27 -19.5 -45t-44.5 -18t-44 18t-19 45q0 26 17.5 45t45.5 19q29 0 46.5 -17.5t17.5 -46.5z" />
+<glyph unicode="&#x2993;" d="M591 -25l-197 97q55 -118 157 -173l-26 -42q-153 91 -204 250l-287 142v10l289 141q29 86 84.5 149t117.5 100l26 -45q-99 -52 -156 -168l196 96v-67l-227 -114q-14 -54 -14 -98q0 -47 13 -96l228 -115v-67zM305 321l-135 -67l134 -68q-4 42 -4 67q0 33 5 68z" />
+<glyph unicode="&#x2994;" d="M651 247l-289 -142q-29 -86 -84.5 -148.5t-117.5 -99.5l-26 45q98 53 155 168l-195 -96v67l227 114q14 54 14 98q0 47 -13 96l-228 115v67l197 -97q-55 118 -157 173l26 42q153 -92 203 -251l288 -141v-10zM515 252l-135 68q5 -35 5 -67t-5 -69z" />
+<glyph unicode="&#x2995;" d="M643 248l-253 -124q52 -157 178 -225l-26 -42q-149 90 -201 243l-92 -45q57 -106 149 -156l-26 -42q-113 66 -171 174l-115 -56v67l89 45q-28 73 -28 166q0 90 30 166l-91 46v67l116 -58q60 109 170 175l26 -45q-91 -49 -148 -153l92 -45q29 84 84 145t116 98l26 -45 q-125 -66 -178 -222l253 -124v-10zM507 253l-134 67q-6 -36 -6 -67q0 -33 6 -67zM326 344l-101 51q-28 -74 -28 -142q0 -71 27 -142l101 51q-8 45 -8 91q0 49 9 91z" />
+<glyph unicode="&#x2996;" d="M599 -25l-116 57q-60 -109 -170 -175l-26 45q93 50 148 153l-92 45q-29 -84 -84 -145t-116 -98l-26 45q126 68 178 222l-253 125v10l253 124q-55 157 -178 224l26 42q148 -88 200 -242l92 45q-56 105 -148 155l26 42q112 -67 170 -174l116 57v-67l-90 -45q29 -77 29 -167 t-30 -166l91 -45v-67zM359 163l101 -51q28 72 28 141q0 68 -28 142l-101 -50q9 -43 9 -92q0 -48 -9 -90zM178 254l133 -67q7 32 7 66t-7 68z" />
+<glyph unicode="&#x2997;" horiz-adv-x="488" d="M466 719l-124 -141v-651l123 -140h-27l-250 217v498l250 217h28z" />
+<glyph unicode="&#x2998;" horiz-adv-x="488" d="M300 4l-250 -217h-28l124 141v651l-123 140h28l249 -217v-498z" />
+<glyph unicode="&#x2999;" horiz-adv-x="211" d="M161 604q0 -22 -16.5 -38t-39.5 -16t-39 16t-16 39t16.5 39.5t39.5 16.5q22 0 38.5 -17t16.5 -40zM161 134q0 -22 -16.5 -38t-39.5 -16t-39 16t-16 39t16.5 39.5t39.5 16.5q22 0 38.5 -17t16.5 -40zM161 -101q0 -22 -16.5 -38t-39.5 -16t-39 16t-16 39t16.5 39.5 t39.5 16.5q22 0 38.5 -17t16.5 -40zM161 369q0 -23 -16 -38.5t-40 -15.5q-23 0 -39 16t-16 39t16.5 39.5t39.5 16.5q24 0 39.5 -16.5t15.5 -40.5z" />
+<glyph unicode="&#x299a;" horiz-adv-x="511" d="M334 543l-83 -83l82 -83l-83 -83l82 -83l-83 -83l82 -83l-83 -82l82 -84l-35 -35l-118 118l83 84l-82 82l83 84l-82 82l83 84l-82 82l83 84l-82 82l36 36z" />
+<glyph unicode="&#x299b;" d="M662 0h-457q0 -35 4 -62l-65 -10q-5 29 -5 72h-97v66h101q18 141 106 254l-181 182l48 45l176 -177q27 27 55 48l40 -53q-25 -19 -48 -42zM503 66l-207 207q-70 -93 -86 -207h293z" />
+<glyph unicode="&#x299c;" d="M634 0h-584v584h66v-279h239v-239h279v-66zM305 66v189h-189v-189h189z" />
+<glyph unicode="&#x299d;" d="M285 172q0 -26 -17.5 -45t-45.5 -19q-29 0 -46.5 17.5t-17.5 46.5q0 27 19.5 45t44.5 18t44 -18t19 -45zM634 0h-584v584h66v-205q130 0 221.5 -91.5t91.5 -221.5h205v-66zM116 66h263q0 109 -77 186t-186 77v-263z" />
+<glyph unicode="&#x299e;" d="M562 283l48 -25q35 -18 50 -36.5t15 -45.5q0 -33 -25.5 -57.5t-63.5 -24.5q-29 0 -50.5 9t-24.5 9q-9 0 -17 -14h-17v94h19q12 -42 29 -59.5t51 -17.5q24 0 37.5 12.5t13.5 29.5q0 32 -34 51l-35 20q-40 23 -57 40.5t-17 40.5q0 35 26 58t65 23q19 0 37 -9.5t28 -9.5 q5 0 11 6h12v-89h-19q-4 42 -21 61.5t-49 19.5q-22 0 -35 -11.5t-13 -32.5q0 -23 36 -42zM631 0h-620l546 547l48 -45l-435 -436h461v-66z" />
+<glyph unicode="&#x299f;" d="M643 0h-619l529 396l38 -53l-368 -277h420v-66z" />
+<glyph unicode="&#x29a0;" d="M654 253l-421 -177q11 -26 27 -55l-57 -34q-19 34 -31 64l-90 -37l-25 60l93 40q-19 67 -19 139q0 69 18 135l-92 38l25 62l88 -37q11 31 32 66l57 -34q-13 -21 -28 -57zM482 253l-270 110q-15 -54 -15 -110q0 -57 15 -114z" />
+<glyph unicode="&#x29a1;" d="M607 464l-34 -57q-21 13 -57 28l-172 -423l-178 421q-26 -11 -55 -27l-34 57q34 19 64 31l-37 90l60 25l40 -93q67 19 139 19q69 0 135 -18l38 92l62 -25l-37 -88q31 -11 66 -32zM342 184l111 270q-54 15 -112 15q-55 0 -112 -15z" />
+<glyph unicode="&#x29a2;" d="M662 547l-546 -547l-48 45l435 436h-461v66h620z" />
+<glyph unicode="&#x29a3;" d="M662 0h-620v66h461l-435 436l48 45z" />
+<glyph unicode="&#x29a4;" d="M643 0h-620l546 547l48 -45l-435 -436h461v-66zM643 -200h-620v66h620v-66z" />
+<glyph unicode="&#x29a5;" d="M662 0h-620v66h461l-435 436l48 45zM662 -200h-620v66h620v-66z" />
+<glyph unicode="&#x29a6;" horiz-adv-x="900" d="M860 0h-588l-232 521l59 26l215 -481h546v-66z" />
+<glyph unicode="&#x29a7;" horiz-adv-x="900" d="M860 481h-546l-215 -481l-59 26l232 521h588v-66z" />
+<glyph unicode="&#x29a8;" d="M649 0h-97q0 -43 -5 -72l-65 10q4 27 4 62h-457l323 323q-22 23 -48 42l40 53q28 -21 55 -48l90 91q10 12 10 19q0 24 -36 24q-49 1 -98 10l1 27q44 -3 81 -3q106 0 195 36l7 -7q-37 -89 -37 -190q0 -22 4 -84l-28 -1q-10 42 -10 98q0 32 -21 32q-13 0 -22 -9l-93 -93 q88 -113 106 -254h101v-66zM188 66h293q-16 114 -86 207z" />
+<glyph unicode="&#x29a9;" d="M656 0h-457q0 -35 4 -62l-65 -10q-5 29 -5 72h-97v66h101q18 141 106 254l-93 93q-9 9 -22 9q-21 0 -21 -32q0 -56 -10 -98l-28 1q4 62 4 84q0 101 -37 190l7 7q89 -36 195 -36q38 0 81 3l1 -27q-49 -9 -98 -10q-36 0 -36 -24q0 -7 10 -19l90 -91q27 27 55 48l40 -53 q-25 -19 -48 -42zM497 66l-207 207q-70 -93 -86 -207h293z" />
+<glyph unicode="&#x29aa;" d="M649 -61l-7 -7q-89 36 -195 36q-37 0 -81 -3l-1 27q49 9 98 10q36 0 36 24q0 7 -10 19l-90 91q-27 -27 -55 -48l-40 53q26 19 48 42l-323 323h457q0 35 -4 62l65 10q5 -29 5 -72h97v-66h-101q-18 -141 -106 -254l93 -93q9 -9 22 -9q21 0 21 32q0 56 10 98l28 -1 q-4 -62 -4 -84q0 -101 37 -190zM481 440h-293l207 -207q70 93 86 207z" />
+<glyph unicode="&#x29ab;" d="M656 506l-323 -323q23 -23 48 -42l-40 -53q-28 21 -55 48l-90 -91q-10 -12 -10 -19q0 -24 36 -24q49 -1 98 -10l-1 -27q-43 3 -81 3q-106 0 -195 -36l-7 7q37 89 37 190q0 22 -4 84l28 1q10 -42 10 -98q0 -32 21 -32q13 0 22 9l93 93q-88 113 -106 254h-101v66h97 q0 43 5 72l65 -10q-4 -27 -4 -62h457zM497 440h-293q16 -114 86 -207z" />
+<glyph unicode="&#x29ac;" horiz-adv-x="706" d="M673 562l7 -7q-36 -89 -36 -195q0 -38 3 -81l-27 -1q-9 49 -10 98q0 36 -24 36q-7 0 -19 -10l-91 -90q27 -27 48 -55l-53 -40q-19 25 -42 48l-323 -323v457q-35 0 -62 -4l-10 65q29 5 72 5v97h66v-101q141 -18 254 -106l93 93q9 9 9 22q0 21 -32 21q-56 0 -98 10l1 28 q62 -4 84 -4q101 0 190 37zM172 101l207 207q-93 70 -207 86v-293z" />
+<glyph unicode="&#x29ad;" horiz-adv-x="706" d="M672 460l-10 -65q-27 4 -62 4v-457l-323 323q-23 -23 -42 -48l-53 40q21 28 48 55l-91 90q-12 10 -19 10q-24 0 -24 -36q-1 -49 -10 -98l-27 1q3 43 3 81q0 106 -36 195l7 7q89 -37 190 -37q22 0 84 4l1 -28q-42 -10 -98 -10q-32 0 -32 -21q0 -13 9 -22l93 -93 q113 88 254 106v101h66v-97q43 0 72 -5zM534 101v293q-114 -16 -207 -86z" />
+<glyph unicode="&#x29ae;" horiz-adv-x="706" d="M680 -51l-7 -7q-89 37 -190 37q-22 0 -84 -4l-1 28q42 10 98 10q32 0 32 21q0 13 -9 22l-93 93q-113 -88 -254 -106v-101h-66v97q-43 0 -72 5l10 65q27 -4 62 -4v457l323 -323q23 23 42 48l53 -40q-21 -28 -48 -55l91 -90q12 -10 19 -10q24 0 24 36q1 49 10 98l27 -1 q-3 -43 -3 -81q0 -106 36 -195zM379 196l-207 207v-293q114 16 207 86z" />
+<glyph unicode="&#x29af;" horiz-adv-x="708" d="M662 109l10 -65q-29 -5 -72 -5v-97h-66v101q-141 18 -254 106l-93 -93q-9 -9 -9 -22q0 -21 32 -21q56 0 98 -10l-1 -28q-62 4 -84 4q-101 0 -190 -37l-7 7q36 89 36 195q0 38 -3 81l27 1q9 -49 10 -98q0 -36 24 -36q7 0 19 10l91 90q-27 27 -48 55l53 40q19 -25 42 -48 l323 323v-457q35 0 62 4zM534 110v293l-207 -207q93 -70 207 -86z" />
+<glyph unicode="&#x29b0;" horiz-adv-x="762" d="M126 583l58 -66q94 66 197 66q136 0 233.5 -97.5t97.5 -233.5q0 -135 -94 -231l87 -100h-69l-58 66q-90 -66 -197 -66q-136 0 -233.5 97.5t-97.5 233.5q0 132 95 230l-88 101h69zM228 466l346 -395q72 74 72 182q0 110 -77.5 187t-187.5 77q-41 0 -85.5 -14.5 t-67.5 -36.5zM535 36l-348 398q-71 -79 -71 -181q0 -110 77.5 -188t187.5 -78q85 0 154 49z" />
+<glyph unicode="&#x29b1;" horiz-adv-x="762" d="M705 583l-88 -101q95 -98 95 -230q0 -136 -97.5 -233.5t-233.5 -97.5q-107 0 -197 66l-58 -66h-69l87 100q-94 96 -94 231q0 136 97.5 233.5t233.5 97.5q103 0 197 -66l58 66h69zM575 434l-348 -398q69 -49 154 -49q110 0 187.5 78t77.5 188q0 102 -71 181zM188 71 l346 395q-23 22 -67.5 36.5t-85.5 14.5q-110 0 -187.5 -77t-77.5 -187q0 -108 72 -182zM681 667h-600v50h600v-50z" />
+<glyph unicode="&#x29b2;" horiz-adv-x="762" d="M705 583l-88 -101q95 -98 95 -230q0 -136 -97.5 -233.5t-233.5 -97.5q-107 0 -197 66l-58 -66h-69l87 100q-94 96 -94 231q0 136 97.5 233.5t233.5 97.5q103 0 197 -66l58 66h69zM575 434l-348 -398q69 -49 154 -49q110 0 187.5 78t77.5 188q0 102 -71 181zM188 71 l346 395q-23 22 -67.5 36.5t-85.5 14.5q-110 0 -187.5 -77t-77.5 -187q0 -108 72 -182zM495 705q0 -48 -33 -81.5t-81 -33.5t-81.5 33.5t-33.5 81.5t33.5 81t81.5 33t81 -33t33 -81zM445 705q0 25 -19.5 44.5t-44.5 19.5t-45 -19.5t-20 -44.5t20 -45t45 -20t44.5 20t19.5 45 z" />
+<glyph unicode="&#x29b3;" horiz-adv-x="762" d="M705 583l-88 -101q95 -98 95 -230q0 -136 -97.5 -233.5t-233.5 -97.5q-107 0 -197 66l-58 -66h-69l87 100q-94 96 -94 231q0 136 97.5 233.5t233.5 97.5q103 0 197 -66l58 66h69zM575 434l-348 -398q69 -49 154 -49q110 0 187.5 78t77.5 188q0 102 -71 181zM188 71 l346 395q-23 22 -67.5 36.5t-85.5 14.5q-110 0 -187.5 -77t-77.5 -187q0 -108 72 -182zM635 716v-8q-52 -23 -81.5 -46t-70.5 -71l-16 14q19 32 33 45q12 10 12 22q0 5 -4.5 10t-12.5 5h-352v50h349q10 0 15 5.5t5 11.5t-11 19q-16 18 -33 45l15 14q42 -48 71 -71t81 -45z " />
+<glyph unicode="&#x29b4;" horiz-adv-x="762" d="M705 583l-88 -101q95 -98 95 -230q0 -136 -97.5 -233.5t-233.5 -97.5q-107 0 -197 66l-58 -66h-69l87 100q-94 96 -94 231q0 136 97.5 233.5t233.5 97.5q103 0 197 -66l58 66h69zM575 434l-348 -398q69 -49 154 -49q110 0 187.5 78t77.5 188q0 102 -71 181zM188 71 l346 395q-23 22 -67.5 36.5t-85.5 14.5q-110 0 -187.5 -77t-77.5 -187q0 -108 72 -182zM598 687h-349q-10 0 -15 -5.5t-5 -11.5t11 -19q16 -18 33 -45l-15 -14q-42 48 -71 71t-81 45v8q53 23 82 46t70 70l16 -14q-17 -29 -33 -44q-12 -10 -12 -22q0 -5 4.5 -10t12.5 -5h352 v-50z" />
+<glyph unicode="&#x29b5;" horiz-adv-x="910" d="M886 219h-61q-13 -142 -119 -240t-251 -98t-251 98t-119 240h-61v66h61q13 142 119 240t251 98t251 -98t119 -240h61v-66zM152 285h606q-12 115 -99 193.5t-204 78.5t-204 -78.5t-99 -193.5zM758 219h-606q12 -115 99 -193.5t204 -78.5t204 78.5t99 193.5z" />
+<glyph unicode="&#x29b6;" horiz-adv-x="842" d="M792 252q0 -154 -108.5 -262.5t-262.5 -108.5t-262.5 108.5t-108.5 262.5t108.5 262.5t262.5 108.5t262.5 -108.5t108.5 -262.5zM454 555v-606q116 12 194 99t78 204t-78 204t-194 99zM388 -51v606q-116 -12 -194 -99t-78 -204t78 -204t194 -99z" />
+<glyph unicode="&#x29b7;" horiz-adv-x="842" d="M792 252q0 -154 -108.5 -262.5t-262.5 -108.5t-262.5 108.5t-108.5 262.5t108.5 262.5t262.5 108.5t262.5 -108.5t108.5 -262.5zM726 252q0 126 -89.5 215.5t-215.5 89.5t-215.5 -89.5t-89.5 -215.5t89.5 -215.5t215.5 -89.5t215.5 89.5t89.5 215.5zM560 39h-66v426h66 v-426zM346 39h-66v426h66v-426z" />
+<glyph unicode="&#x29b8;" horiz-adv-x="842" d="M792 252q0 -154 -108.5 -262.5t-262.5 -108.5t-262.5 108.5t-108.5 262.5t108.5 262.5t262.5 108.5t262.5 -108.5t108.5 -262.5zM230 490l429 -429q67 83 67 191q0 126 -89.5 215.5t-215.5 89.5q-108 0 -191 -67zM612 14l-429 429q-67 -83 -67 -191q0 -126 89.5 -215.5 t215.5 -89.5q108 0 191 67z" />
+<glyph unicode="&#x29b9;" horiz-adv-x="842" d="M792 252q0 -154 -108.5 -262.5t-262.5 -108.5t-262.5 108.5t-108.5 262.5t108.5 262.5t262.5 108.5t262.5 -108.5t108.5 -262.5zM726 252q0 126 -89.5 215.5t-215.5 89.5t-215.5 -89.5t-89.5 -215.5t89.5 -215.5t215.5 -89.5t215.5 89.5t89.5 215.5zM630 77h-418v66h176 v367h66v-367h176v-66z" />
+<glyph unicode="&#x29ba;" horiz-adv-x="842" d="M792 252q0 -154 -108.5 -262.5t-262.5 -108.5t-262.5 108.5t-108.5 262.5t108.5 262.5t262.5 108.5t262.5 -108.5t108.5 -262.5zM454 285h270q-11 107 -87.5 183t-182.5 87v-270zM388 285v270q-106 -11 -182.5 -87t-87.5 -183h270zM724 219h-606q13 -118 101 -195 t208 -77q113 0 199 79.5t98 192.5z" />
+<glyph unicode="&#x29bb;" horiz-adv-x="842" d="M781 564l-75 -75q86 -102 86 -237q0 -134 -86 -238l74 -74l-47 -47l-74 74q-104 -86 -238 -86q-135 0 -238 87l-75 -75l-47 47l75 75q-86 102 -86 237q0 134 86 238l-74 74l47 47l74 -74q104 86 238 86q135 0 238 -87l75 75zM421 299l191 191q-83 67 -191 67t-191 -67z M468 252l191 -191q67 83 67 191q0 106 -67 191zM374 252l-191 191q-67 -83 -67 -191q0 -106 67 -191zM612 14l-191 191l-191 -191q83 -67 191 -67t191 67z" />
+<glyph unicode="&#x29bc;" horiz-adv-x="842" d="M792 252q0 -154 -108.5 -262.5t-262.5 -108.5t-262.5 108.5t-108.5 262.5t108.5 262.5t262.5 108.5t262.5 -108.5t108.5 -262.5zM726 252q0 126 -89.5 215.5t-215.5 89.5t-215.5 -89.5t-89.5 -215.5t89.5 -215.5t215.5 -89.5t215.5 89.5t89.5 215.5zM631 141 q0 -24 -17 -41t-42 -17q-23 0 -40 17.5t-17 40.5t18 40.5t41 17.5q22 0 39.5 -17.5t17.5 -40.5zM624 408l-360 -360l-47 47l360 360zM327 364q0 -24 -17 -40.5t-41 -16.5q-23 0 -40.5 17t-17.5 40t17.5 41t40.5 18t40.5 -18t17.5 -41z" />
+<glyph unicode="&#x29bd;" horiz-adv-x="842" d="M454 694v-72q143 -13 240.5 -119.5t97.5 -250.5t-97.5 -250.5t-240.5 -119.5v-61h-66v61q-143 13 -240.5 119.5t-97.5 250.5t97.5 250.5t240.5 119.5v73q0 7 -7.5 16.5t-14.5 9.5q-11 0 -25 -14q-58 -56 -97 -82l-19 20q143 122 191 237h10q50 -115 191 -238l-19 -20 q-16 11 -31 24l-36 32l-29 26q-16 14 -28 14q-20 0 -20 -26zM454 555v-606q116 12 194 99t78 204t-78 204t-194 99zM388 -51v606q-116 -12 -194 -99t-78 -204t78 -204t194 -99z" />
+<glyph unicode="&#x29be;" horiz-adv-x="842" d="M614 252q0 -79 -57 -136t-136 -57q-80 0 -136 56.5t-56 136.5q0 78 56.5 135t135.5 57q84 0 138.5 -56t54.5 -136zM548 251q0 54 -36.5 90.5t-90.5 36.5t-90 -36.5t-36 -90.5t36 -90t90 -36t90.5 36t36.5 90zM792 252q0 -154 -108.5 -262.5t-262.5 -108.5t-262.5 108.5 t-108.5 262.5t108.5 262.5t262.5 108.5t262.5 -108.5t108.5 -262.5zM726 252q0 126 -89.5 215.5t-215.5 89.5t-215.5 -89.5t-89.5 -215.5t89.5 -215.5t215.5 -89.5t215.5 89.5t89.5 215.5z" />
+<glyph unicode="&#x29bf;" horiz-adv-x="842" d="M792 252q0 -154 -108.5 -262.5t-262.5 -108.5t-262.5 108.5t-108.5 262.5t108.5 262.5t262.5 108.5t262.5 -108.5t108.5 -262.5zM726 252q0 126 -89.5 215.5t-215.5 89.5t-215.5 -89.5t-89.5 -215.5t89.5 -215.5t215.5 -89.5t215.5 89.5t89.5 215.5zM554 252 q0 -56 -39.5 -95.5t-95.5 -39.5q-57 0 -96 39.5t-39 97.5q0 56 39.5 94.5t97.5 38.5q55 0 94 -39.5t39 -95.5z" />
+<glyph unicode="&#x29c0;" horiz-adv-x="842" d="M792 252q0 -154 -108.5 -262.5t-262.5 -108.5t-262.5 108.5t-108.5 262.5t108.5 262.5t262.5 108.5t262.5 -108.5t108.5 -262.5zM726 252q0 126 -89.5 215.5t-215.5 89.5t-215.5 -89.5t-89.5 -215.5t89.5 -215.5t215.5 -89.5t215.5 89.5t89.5 215.5zM568 29l-392 212v21 l392 213v-77l-269 -146l269 -146v-77z" />
+<glyph unicode="&#x29c1;" horiz-adv-x="842" d="M792 252q0 -154 -108.5 -262.5t-262.5 -108.5t-262.5 108.5t-108.5 262.5t108.5 262.5t262.5 108.5t262.5 -108.5t108.5 -262.5zM726 252q0 126 -89.5 215.5t-215.5 89.5t-215.5 -89.5t-89.5 -215.5t89.5 -215.5t215.5 -89.5t215.5 89.5t89.5 215.5zM666 241l-392 -212 v77l269 146l-269 146v77l392 -213v-21z" />
+<glyph unicode="&#x29c2;" horiz-adv-x="1091" d="M792 252q0 -154 -108.5 -262.5t-262.5 -108.5t-262.5 108.5t-108.5 262.5t108.5 262.5t262.5 108.5t262.5 -108.5t108.5 -262.5zM726 252q0 126 -89.5 215.5t-215.5 89.5t-215.5 -89.5t-89.5 -215.5t89.5 -215.5t215.5 -89.5t215.5 89.5t89.5 215.5zM1056 252 q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1006 252q0 32 -23 55t-55 23t-55 -23t-23 -55t23 -55t55 -23t55 23t23 55z" />
+<glyph unicode="&#x29c3;" horiz-adv-x="1091" d="M1056 155h-277q-32 -120 -131.5 -197t-226.5 -77q-154 0 -262.5 108.5t-108.5 262.5t108.5 262.5t262.5 108.5q127 0 226 -77t132 -196h277v-50h-267q3 -24 3 -48t-3 -47h267v-50zM726 252q0 126 -89.5 215.5t-215.5 89.5t-215.5 -89.5t-89.5 -215.5t89.5 -215.5 t215.5 -89.5t215.5 89.5t89.5 215.5z" />
+<glyph unicode="&#x29c4;" horiz-adv-x="910" d="M865 -158h-820v820h820v-820zM799 -92v651l-650 -651h650zM762 596h-651v-652z" />
+<glyph unicode="&#x29c5;" horiz-adv-x="910" d="M865 -158h-820v820h820v-820zM799 -56v652h-651zM761 -92l-650 651v-651h650z" />
+<glyph unicode="&#x29c6;" horiz-adv-x="910" d="M865 -158h-820v820h820v-820zM688 142q0 -21 -13 -35.5t-40 -14.5q-19 0 -36 15t-30.5 35.5t-41.5 48t-63 47.5q0 -57 22 -120t22 -76q0 -22 -16 -38.5t-37 -16.5q-22 0 -37.5 16t-15.5 39q0 13 22 76t22 120q-37 -25 -84 -76t-60 -58q-22 -12 -36 -12q-23 0 -37.5 13.5 t-14.5 29.5q0 15 8 31.5t23 22.5q4 2 74 18.5t116 43.5q-46 26 -114.5 41.5t-77.5 19.5q-29 14 -29 45q0 21 13.5 37t37.5 16q11 0 28 -9q15 -9 62.5 -59.5t90.5 -75.5q0 57 -22 122.5t-22 78.5q0 22 15.5 36t37.5 14t37.5 -14t15.5 -36q0 -13 -22 -78t-22 -122q45 23 73 51 t44 51.5t29 31.5q18 9 29 9q23 0 36 -14.5t13 -38.5q0 -33 -30 -46q-3 -2 -64.5 -14.5t-122.5 -45.5q55 -31 119 -45t69 -17q29 -14 29 -47zM799 -92v688h-688v-688h688z" />
+<glyph unicode="&#x29c7;" horiz-adv-x="910" d="M647 253q0 -79 -57 -136t-136 -57q-80 0 -136 56.5t-56 136.5q0 78 56.5 135t135.5 57q84 0 138.5 -56t54.5 -136zM595 252q0 58 -41.5 99.5t-99.5 41.5q-59 0 -99.5 -41t-40.5 -100t40.5 -99.5t99.5 -40.5t100 40.5t41 99.5zM865 -158h-820v820h820v-820zM799 -92v688 h-688v-688h688z" />
+<glyph unicode="&#x29c8;" horiz-adv-x="910" d="M865 -158h-820v820h820v-820zM640 66h-370v390h370v-390zM588 118v286h-266v-286h266zM799 -92v688h-688v-688h688z" />
+<glyph unicode="&#x29c9;" horiz-adv-x="1046" d="M982 -207h-612v308h-306v611h612v-308h306v-611zM610 404v242h-480v-479h240v237h240zM610 167v171h-174v-171h174zM916 -141v479h-240v-237h-240v-242h480z" />
+<glyph unicode="&#x29ca;" horiz-adv-x="1145" d="M1110 -127h-1075l538 938zM636 940q0 -26 -17.5 -45t-45.5 -19q-29 0 -46.5 17.5t-17.5 46.5q0 27 19.5 45t44.5 18t44 -18t19 -45zM995 -61l-422 739l-424 -739h846z" />
+<glyph unicode="&#x29cb;" horiz-adv-x="1145" d="M1110 -127h-1075l538 938zM995 -61l-422 739l-424 -739h846zM1110 -259h-1075v66h1075v-66z" />
+<glyph unicode="&#x29cc;" horiz-adv-x="1145" d="M1110 -127h-1075l538 938zM559 239l53 -27q39 -20 56.5 -40t17.5 -50q0 -37 -28.5 -63.5t-71.5 -26.5q-33 0 -57 10t-28 10q-3 0 -5 -1t-4 -2.5t-3 -2.5l-3 -5q-2 -3 -3 -4h-19v101h21q12 -46 31.5 -64.5t57.5 -18.5q27 0 43 14t16 33q0 36 -40 55l-43 20q-79 37 -79 91 q0 38 29 62.5t72 24.5q21 0 42 -10t31 -10q7 0 14 7h12v-98h-21q-4 47 -23.5 68t-55.5 21q-52 0 -52 -49q0 -25 40 -45zM995 -61l-422 739l-424 -739h846z" />
+<glyph unicode="&#x29cd;" horiz-adv-x="1165" d="M1150 -127h-1135v66h68l500 872l499 -872h68v-66zM1005 -61l-422 739l-424 -739h846z" />
+<glyph unicode="&#x29ce;" horiz-adv-x="780" d="M627 420l-557 -278v556zM482 419v2l-346 172v-346zM710 -193l-557 278l557 278v-556zM644 -88v346l-346 -172v-2z" />
+<glyph unicode="&#x29cf;" horiz-adv-x="857" d="M777 -25h-66v556h66v-556zM605 -25l-557 278l557 278v-556zM539 80v346l-346 -172v-2z" />
+<glyph unicode="&#x29d0;" horiz-adv-x="857" d="M809 253l-557 -278v556zM664 252v2l-346 172v-346zM146 -25h-66v556h66v-556z" />
+<glyph unicode="&#x29d1;" horiz-adv-x="810" d="M716 -80l-312 287l-311 -287v662l311 -286l312 286v-662zM650 70v363l-197 -182z" />
+<glyph unicode="&#x29d2;" horiz-adv-x="810" d="M716 -80l-312 287l-311 -287v662l311 -286l312 286v-662zM356 251l-197 182v-363z" />
+<glyph unicode="&#x29d3;" horiz-adv-x="810" d="M716 -80l-312 287l-311 -287v662l311 -286l312 286v-662z" />
+<glyph unicode="&#x29d4;" horiz-adv-x="810" d="M717 -80l-312 287l-311 -287v662l311 -286l312 286v-88l-263 -243l263 -244v-87z" />
+<glyph unicode="&#x29d5;" horiz-adv-x="810" d="M716 -80l-311 287l-312 -287v87l263 244l-263 243v88l312 -286l311 286v-662z" />
+<glyph unicode="&#x29d6;" horiz-adv-x="810" d="M736 -100h-662l285 351l-285 351h662l-285 -351zM598 536h-386l193 -239zM598 -34l-193 239l-193 -239h386z" />
+<glyph unicode="&#x29d7;" horiz-adv-x="810" d="M736 -100h-662l285 351l-285 351h662l-285 -351z" />
+<glyph unicode="&#x29d8;" horiz-adv-x="511" d="M334 501l-83 -83l82 -83l-83 -83l82 -83l-83 -83l82 -83l-117 -119l-37 36l83 84l-82 82l83 84l-82 82l83 84l-82 82l83 84l-82 82l36 36z" />
+<glyph unicode="&#x29d9;" horiz-adv-x="511" d="M333 -80l-37 -36l-117 119l82 83l-83 83l82 83l-83 83l82 83l-83 83l117 119l36 -36l-82 -82l83 -84l-82 -82l83 -84l-82 -82l83 -84l-82 -82z" />
+<glyph unicode="&#x29da;" horiz-adv-x="688" d="M334 501l-83 -83l82 -83l-83 -83l82 -83l-83 -83l82 -83l-117 -119l-37 36l83 84l-82 82l83 84l-82 82l83 84l-82 82l83 84l-82 82l36 36zM511 501l-83 -83l82 -83l-83 -83l82 -83l-83 -83l82 -83l-117 -119l-37 36l83 84l-82 82l83 84l-82 82l83 84l-82 82l83 84l-82 82 l36 36z" />
+<glyph unicode="&#x29db;" horiz-adv-x="688" d="M334 -80l-37 -36l-117 119l82 83l-83 83l82 83l-83 83l82 83l-83 83l117 119l36 -36l-82 -82l83 -84l-82 -82l83 -84l-82 -82l83 -84l-82 -82zM511 -80l-37 -36l-117 119l82 83l-83 83l82 83l-83 83l82 83l-83 83l117 119l36 -36l-82 -82l83 -84l-82 -82l83 -84l-82 -82 l83 -84l-82 -82z" />
+<glyph unicode="&#x29dc;" horiz-adv-x="926" d="M824 226h30q0 -108 -52.5 -167t-123.5 -59q-67 0 -113 41t-84 117q-55 -88 -105.5 -123t-117.5 -35q-88 0 -138 65.5t-50 146.5q0 96 55.5 157t126.5 61q66 0 110 -42.5t111 -156.5q85 -147 194 -147q68 0 112.5 37.5t44.5 103.5v1zM424 241q-2 2 -18 23t-26 30t-29 24 t-42.5 21.5t-51.5 6.5q-67 0 -112 -37.5t-45 -103.5q0 -54 33.5 -87.5t90.5 -33.5q62 0 99 28t101 129z" />
+<glyph unicode="&#x29dd;" horiz-adv-x="926" d="M854 210q0 -98 -53 -154t-123 -56q-67 0 -113 41t-84 117q-55 -88 -105.5 -123t-117.5 -35q-88 0 -138 65.5t-50 146.5q0 96 55.5 157t126.5 61q15 0 23 -1q1 114 54.5 169t132.5 55t132.5 -55t54.5 -169q8 1 24 1q26 0 53.5 -9t58 -31t50 -68.5t19.5 -111.5zM619 426v2 q0 66 -44.5 103.5t-112.5 37.5t-112.5 -37.5t-44.5 -103.5v-6q30 -10 56.5 -34.5t41.5 -48t38 -65.5q56 78 97 111t81 41zM501 192v-3q16 -21 26 -33t32 -32t49.5 -30t58.5 -10q68 0 112.5 37.5t44.5 103.5q0 53 -33.5 87t-90.5 34q-41 0 -69 -13.5t-54.5 -42.5t-75.5 -98z M424 241q-2 2 -18 23t-26 30t-29 24t-42.5 21.5t-51.5 6.5q-67 0 -112 -37.5t-45 -103.5q0 -54 33.5 -87.5t90.5 -33.5q62 0 99 28t101 129z" />
+<glyph unicode="&#x29de;" horiz-adv-x="926" d="M487 695v-353q49 56 90 72t96 16q26 0 53.5 -9t58 -31t50 -68.5t19.5 -111.5q0 -98 -53 -154t-123 -56q-120 0 -191 131v-320h-50v274q-73 -85 -179 -85q-88 0 -138 65.5t-50 146.5q0 96 55.5 157t126.5 61q63 0 105.5 -35.5t79.5 -99.5v400h50zM493 192v-3 q79 -105 174 -105q68 0 112.5 37.5t44.5 103.5q0 53 -33.5 87t-90.5 34q-60 0 -99 -29t-108 -125zM432 241q-1 1 -13 16l-17 21l-20 18q-13 13 -24 20l-28 14q-16 9 -34.5 12.5t-38.5 3.5q-67 0 -112 -37.5t-45 -103.5q0 -54 33.5 -87.5t90.5 -33.5q64 0 104.5 29t103.5 128 z" />
+<glyph unicode="&#x29df;" horiz-adv-x="1145" d="M346 286h453q11 51 52 84t94 33q62 0 106 -44t44 -106t-44 -106t-106 -44q-53 0 -94 33t-52 84h-453q-11 -51 -52 -84t-94 -33q-62 0 -106 44t-44 106t44 106t106 44q53 0 94 -33t52 -84zM1045 253q0 41 -29.5 70.5t-70.5 29.5t-70.5 -29.5t-29.5 -70.5t29.5 -70.5 t70.5 -29.5t70.5 29.5t29.5 70.5zM300 253q0 41 -29.5 70.5t-70.5 29.5t-70.5 -29.5t-29.5 -70.5t29.5 -70.5t70.5 -29.5t70.5 29.5t29.5 70.5z" />
+<glyph unicode="&#x29e0;" horiz-adv-x="910" d="M865 -157h-712l-108 64v755h712l108 -64v-755zM799 -91v623h-622v-623h622z" />
+<glyph unicode="&#x29e1;" horiz-adv-x="667" d="M613 192h-589l589 320v-320zM546 258v144l-265 -144h265zM613 -8h-589v66h589v-66z" />
+<glyph unicode="&#x29e2;" horiz-adv-x="790" d="M726 0h-662v414h50v-348h256v348h50v-348h256v348h50v-414z" />
+<glyph unicode="&#x29e3;" d="M637 120h-215l-109 -276h-55l109 276h-156l-109 -276h-55l109 276h-108v66h134l53 134h-187v66h213l110 276h55l-110 -276h156l110 276h55l-110 -276h110v-66h-136l-53 -134h189v-66zM446 320h-156l-53 -134h156z" />
+<glyph unicode="&#x29e4;" d="M637 120h-215l-109 -276h-55l109 276h-156l-109 -276h-55l109 276h-108v66h134l53 134h-187v66h213l110 276h55l-110 -276h156l110 276h55l-110 -276h110v-66h-136l-53 -134h189v-66zM446 320h-156l-53 -134h156zM618 842h19q-3 -48 -36.5 -93t-77.5 -45q-32 0 -100 44 t-89 44q-31 0 -54.5 -25t-31.5 -63h-20q2 53 37 95.5t80 42.5q33 0 101 -44t88 -44q32 0 54 24.5t30 63.5z" />
+<glyph unicode="&#x29e5;" d="M637 28h-251l-73 -184h-55l73 184h-155l-73 -184h-55l73 184h-73v66h99l50 126h-149v66h175l50 126h-225v66h251l73 184h55l-73 -184h155l73 184h55l-73 -184h73v-66h-99l-50 -126h149v-66h-175l-50 -126h225v-66zM483 412h-155l-50 -126h155zM407 220h-155l-50 -126h155 z" />
+<glyph unicode="&#x29e6;" horiz-adv-x="798" d="M738 -78h-66v198h-546v-198h-66v662h66v-199h546v199h66v-662zM672 186v133h-546v-133h546z" />
+<glyph unicode="&#x29e7;" horiz-adv-x="628" d="M580 62h-233v-251h-66v251h-233v66h233v250h-233v66h233v251h66v-251h233v-66h-233v-250h233v-66z" />
+<glyph unicode="&#x29e8;" horiz-adv-x="1145" d="M1110 811l-538 -938l-537 938h1075zM996 745h-424v-739z" />
+<glyph unicode="&#x29e9;" horiz-adv-x="1145" d="M1110 811l-537 -938l-538 938h1075zM573 745h-424l424 -739v739z" />
+<glyph unicode="&#x29ea;" horiz-adv-x="762" d="M730 394l-316 -316v-137q0 -8 7.5 -17t14.5 -9q11 0 25 14q29 29 86 67l19 -20l-74 -66q-24 -23 -55.5 -64.5t-50.5 -86.5h-10q-19 45 -50.5 86.5t-56.5 65.5t-74 66l19 20q60 -42 86 -67q14 -14 28 -14q20 0 20 26v136l-316 316l349 350z" />
+<glyph unicode="&#x29eb;" horiz-adv-x="790" d="M745 253l-351 -542l-349 542l350 542z" />
+<glyph unicode="&#x29ec;" horiz-adv-x="762" d="M348 -58v141q-126 12 -212 106t-86 223q0 137 97 234t234 97t234 -97t97 -234q0 -128 -86 -222.5t-212 -106.5v-142q0 -8 7.5 -17t14.5 -9q11 0 25 14q29 29 86 67l19 -20l-74 -66q-24 -23 -55.5 -64.5t-50.5 -86.5h-10q-19 45 -50.5 86.5t-56.5 65.5t-74 66l19 20 q60 -42 86 -67q14 -14 28 -14q20 0 20 26zM646 412q0 110 -78 187.5t-187 77.5t-187 -77.5t-78 -187.5t78 -187.5t187 -77.5t187 77.5t78 187.5z" />
+<glyph unicode="&#x29ed;" horiz-adv-x="762" d="M348 -58v141q-126 12 -212 106t-86 223q0 137 97 234t234 97t234 -97t97 -234q0 -128 -86 -222.5t-212 -106.5v-142q0 -8 7.5 -17t14.5 -9q11 0 25 14q29 29 86 67l19 -20l-74 -66q-24 -23 -55.5 -64.5t-50.5 -86.5h-10q-19 45 -50.5 86.5t-56.5 65.5t-74 66l19 20 q60 -42 86 -67q14 -14 28 -14q20 0 20 26z" />
+<glyph unicode="&#x29ee;" horiz-adv-x="762" d="M665 -32h-251v-145h174v-66h-398v66h158v145h-251v568h251v145h-158v66h398v-66h-174v-145h251v-568zM599 34v436h-436v-436h436z" />
+<glyph unicode="&#x29ef;" horiz-adv-x="762" d="M665 -32h-251v-145h174v-66h-398v66h158v145h-251v568h251v145h-158v66h398v-66h-174v-145h251v-568z" />
+<glyph unicode="&#x29f0;" horiz-adv-x="762" d="M730 252l-316 -316v-113h174v-66h-398v66h158v113l-316 316l316 316v113h-158v66h398v-66h-174v-113zM637 252l-256 256l-256 -256l256 -256z" />
+<glyph unicode="&#x29f1;" horiz-adv-x="762" d="M730 252l-316 -316v-113h174v-66h-398v66h158v113l-316 316l316 316v113h-158v66h398v-66h-174v-113z" />
+<glyph unicode="&#x29f2;" horiz-adv-x="762" d="M406 681v-114q122 -10 206.5 -101t84.5 -214t-84 -214t-207 -101v-114h174v-66h-398v66h158v116q-118 15 -196.5 104.5t-78.5 208.5q0 118 78.5 207.5t196.5 105.5v116h-158v66h398v-66h-174zM631 252q0 103 -73.5 176.5t-176.5 73.5t-176.5 -73.5t-73.5 -176.5 t73.5 -176.5t176.5 -73.5t176.5 73.5t73.5 176.5z" />
+<glyph unicode="&#x29f3;" horiz-adv-x="762" d="M406 681v-114q122 -10 206.5 -101t84.5 -214t-84 -214t-207 -101v-114h174v-66h-398v66h158v116q-118 15 -196.5 104.5t-78.5 208.5q0 118 78.5 207.5t196.5 105.5v116h-158v66h398v-66h-174z" />
+<glyph unicode="&#x29f4;" horiz-adv-x="926" d="M182 458q0 -26 -17.5 -45t-45.5 -19q-29 0 -46.5 17.5t-17.5 46.5q0 27 19.5 45t44.5 18t44 -18t19 -45zM182 51q0 -26 -19 -45t-45 -19q-25 0 -44 19.5t-19 44.5q0 29 18.5 46t44.5 17q27 0 45.5 -16.5t18.5 -46.5zM871 258v-10q-115 -49 -238 -191l-20 19q28 40 82 96 q14 14 14 28q0 20 -26 20h-501v66h502q8 0 17 7.5t9 14.5q0 11 -14 25q-51 49 -82 96l20 19q124 -143 237 -190z" />
+<glyph unicode="&#x29f5;" horiz-adv-x="523" d="M478 -222h-72l-360 932h72z" />
+<glyph unicode="&#x29f6;" horiz-adv-x="520" d="M388 715h-256v50h256v-50zM426 662l-269 -742h-63l269 742h63z" />
+<glyph unicode="&#x29f7;" horiz-adv-x="520" d="M426 -80h-63l-126 346h-136v50h118l-125 346h63l125 -346h136v-50h-118z" />
+<glyph unicode="&#x29f8;" horiz-adv-x="602" d="M517 695l-370 -1020h-62l370 1020h62z" />
+<glyph unicode="&#x29f9;" horiz-adv-x="602" d="M517 -325h-62l-370 1020h62z" />
+<glyph unicode="&#x29fa;" d="M621 220h-180v-245h-66v245h-65v-245h-66v245h-180v66h180v246h66v-246h65v246h66v-246h180v-66z" />
+<glyph unicode="&#x29fb;" d="M621 220h-113v-245h-66v245h-66v-245h-66v245h-66v-245h-66v245h-114v66h114v246h66v-246h66v246h66v-246h66v246h66v-246h113v-66z" />
+<glyph unicode="&#x29fc;" horiz-adv-x="459" d="M394 -136v-77q-45 146 -128 262t-189 168v66q106 52 189 168t128 262v-77q-43 -253 -249 -384v-4q206 -131 249 -384z" />
+<glyph unicode="&#x29fd;" horiz-adv-x="459" d="M382 283v-66q-106 -52 -189 -168t-128 -262v77q43 253 249 384v4q-206 131 -249 384v77q45 -146 128 -262t189 -168z" />
+<glyph unicode="&#x29fe;" horiz-adv-x="762" d="M669 190l-258 32l33 -258h-126l32 258l-257 -32v126l257 -32l-32 256h126l-32 -256l257 32v-126z" />
+<glyph unicode="&#x29ff;" horiz-adv-x="762" d="M669 316v-126q-162 32 -288 32q-120 1 -288 -32v126q162 -32 288 -32t288 32z" />
+<glyph unicode="&#x2a00;" horiz-adv-x="1126" d="M646 250q0 -34 -24 -58.5t-59 -24.5t-59 24.5t-24 58.5t24 58.5t59 24.5t59 -24.5t24 -58.5zM1073 252q0 -212 -149 -361.5t-361 -149.5q-138 0 -255.5 68t-186 186t-68.5 257q0 212 149 361.5t361 149.5t361 -149.5t149 -361.5zM993 252q0 178 -126 304.5t-304 126.5 t-304 -126.5t-126 -304.5t126 -304.5t304 -126.5t304 126.5t126 304.5z" />
+<glyph unicode="&#x2a01;" horiz-adv-x="1126" d="M1073 252q0 -212 -149 -361.5t-361 -149.5q-138 0 -255.5 68t-186 186t-68.5 257q0 212 149 361.5t361 149.5t361 -149.5t149 -361.5zM596 285h395q-12 158 -124.5 271t-270.5 126v-397zM530 285v397q-158 -13 -271 -126t-125 -271h396zM991 219h-395v-396 q157 12 270 125t125 271zM530 -177v396h-396q12 -158 125 -271t271 -125z" />
+<glyph unicode="&#x2a02;" horiz-adv-x="1126" d="M1073 252q0 -212 -149 -361.5t-361 -149.5q-138 0 -255.5 68t-186 186t-68.5 257q0 212 149 361.5t361 149.5t361 -149.5t149 -361.5zM563 299l280 280q-122 104 -280 104q-160 0 -280 -104zM610 252l279 -279q104 120 104 279q0 158 -104 280zM516 252l-280 280 q-103 -122 -103 -280t103 -279zM843 -75l-280 280l-280 -280q120 -104 280 -104q158 0 280 104z" />
+<glyph unicode="&#x2a03;" horiz-adv-x="924" d="M545 267q0 -35 -24.5 -59t-58.5 -24t-58.5 24t-24.5 59t24.5 59t58.5 24t58.5 -24t24.5 -59zM830 768v-702q0 -144 -110.5 -237t-263.5 -93q-89 0 -171 40t-136.5 117.5t-54.5 172.5v702h80v-714q0 -95 82 -166.5t200 -71.5t206 72t88 166v714h80z" />
+<glyph unicode="&#x2a04;" horiz-adv-x="924" d="M830 768v-702q0 -144 -110.5 -237t-263.5 -93q-89 0 -171 40t-136.5 117.5t-54.5 172.5v702h80v-714q0 -95 82 -166.5t200 -71.5t206 72t88 166v714h80zM671 146h-175v-174h-66v174h-175v66h175v176h66v-176h175v-66z" />
+<glyph unicode="&#x2a05;" horiz-adv-x="924" d="M830 -259h-80v942h-576v-942h-80v1022h736v-1022z" />
+<glyph unicode="&#x2a06;" horiz-adv-x="924" d="M830 -259h-736v1022h80v-942h576v942h80v-1022z" />
+<glyph unicode="&#x2a07;" horiz-adv-x="1180" d="M1097 -259h-76l-331 877h-2l-58 -153l269 -724h-76l-233 618l-233 -618h-76l269 724l-58 153h-2l-331 -877h-76l380 1022h56l71 -191l71 191h56z" />
+<glyph unicode="&#x2a08;" horiz-adv-x="1180" d="M1097 763l-380 -1022h-56l-71 191l-71 -191h-56l-380 1022h76l331 -877h2l58 153l-269 724h76l233 -618l233 618h76l-269 -724l58 -153h2l331 877h76z" />
+<glyph unicode="&#x2a09;" horiz-adv-x="1021" d="M971 -205l-60 -54l-401 451l-400 -451l-60 54l406 457l-406 457l60 54l400 -450l401 450l60 -54l-407 -457z" />
+<glyph unicode="&#x2a0a;" horiz-adv-x="914" d="M856 40l-53 -299h-745l272 354q-46 35 -72 86.5t-26 109.5q0 99 68 169l-217 303h747v-251h-30q-17 107 -52 146t-130 39h-330l126 -169q32 8 63 8q101 0 173 -72t72 -173t-72 -173t-173 -72q-43 0 -89 16l-146 -190h414q78 0 115 42t55 126h30zM578 306l-157 -202 q29 -8 56 -8q81 0 138 57t57 138t-57 138t-138 57q-11 0 -31 -2zM450 251l-120 168q-48 -56 -48 -128q0 -97 78 -156z" />
+<glyph unicode="&#x2a0b;" horiz-adv-x="690" d="M395 563l11 43q9 35 23.5 68.5t37.5 69.5t59 58t78 22q55 0 55 -45q0 -25 -15.5 -42t-36.5 -17q-31 0 -31 24q0 15 9 27t9 14q0 8 -11 8q-35 0 -57 -43.5t-44 -133.5l-13 -53h125v-163h-20q0 3 -6 30q-13 47 -41.5 63.5t-70.5 19.5l-51 -205l28 -30l-47 -47l-50 -200h157 q59 0 89 23t46 81h23l-41 -194h-297l-14 -59q-8 -33 -23 -66t-38 -65t-57 -51.5t-74 -19.5q-55 0 -55 45q0 25 15.5 42t36.5 17q12 0 21.5 -7t9.5 -19q0 -17 -9 -26.5t-9 -12.5q0 -8 11 -8q33 0 54 40.5t42 124.5l16 65h-207l276 278l13 51l-270 293h343zM383 513h-172 l136 -144zM288 134l-103 -103h77z" />
+<glyph unicode="&#x2a0c;" horiz-adv-x="1184" d="M688 -124l182 730q9 35 23.5 68.5t37.5 69.5t59 58t78 22q55 0 55 -45q0 -25 -15.5 -42t-36.5 -17q-31 0 -31 24q0 15 9 27t9 14q0 8 -11 8q-35 0 -57 -43.5t-44 -133.5l-183 -734q-12 -47 -33.5 -89.5t-64 -77.5t-94.5 -35q-55 0 -55 45q0 25 15.5 42t36.5 17 q12 0 21.5 -7t9.5 -19q0 -17 -9 -26.5t-9 -12.5q0 -8 11 -8q33 0 54 40.5t42 124.5zM445 -124l182 730q9 35 23.5 68.5t37.5 69.5t59 58t78 22q55 0 55 -45q0 -25 -15.5 -42t-36.5 -17q-31 0 -31 24q0 15 9 27t9 14q0 8 -11 8q-35 0 -57 -43.5t-44 -133.5l-183 -734 q-12 -47 -33.5 -89.5t-64 -77.5t-94.5 -35q-55 0 -55 45q0 25 15.5 42t36.5 17q12 0 21.5 -7t9.5 -19q0 -17 -9 -26.5t-9 -12.5q0 -8 11 -8q33 0 54 40.5t42 124.5zM204 -124l182 730q9 35 23.5 68.5t37.5 69.5t59 58t78 22q55 0 55 -45q0 -25 -15.5 -42t-36.5 -17 q-31 0 -31 24q0 15 9 27t9 14q0 8 -11 8q-35 0 -57 -43.5t-44 -133.5l-183 -734q-12 -47 -33.5 -89.5t-64 -77.5t-94.5 -35q-55 0 -55 45q0 25 15.5 42t36.5 17q12 0 21.5 -7t9.5 -19q0 -17 -9 -26.5t-9 -12.5q0 -8 11 -8q33 0 54 40.5t42 124.5zM929 -124l182 730 q9 35 23.5 68.5t37.5 69.5t59 58t78 22q55 0 55 -45q0 -25 -15.5 -42t-36.5 -17q-31 0 -31 24q0 15 9 27t9 14q0 8 -11 8q-35 0 -57 -43.5t-44 -133.5l-183 -734q-12 -47 -33.5 -89.5t-64 -77.5t-94.5 -35q-55 0 -55 45q0 25 15.5 42t36.5 17q12 0 21.5 -7t9.5 -19 q0 -17 -9 -26.5t-9 -12.5q0 -8 11 -8q33 0 54 40.5t42 124.5z" />
+<glyph unicode="&#x2a0d;" horiz-adv-x="499" d="M306 285l80 321q9 35 23.5 68.5t37.5 69.5t59 58t78 22q55 0 55 -45q0 -25 -15.5 -42t-36.5 -17q-31 0 -31 24q0 15 9 27t9 14q0 8 -11 8q-35 0 -57 -43.5t-44 -133.5l-83 -331h182v-66h-198l-84 -337q-12 -47 -33.5 -89.5t-64 -77.5t-94.5 -35q-55 0 -55 45 q0 25 15.5 42t36.5 17q12 0 21.5 -7t9.5 -19q0 -17 -9 -26.5t-9 -12.5q0 -8 11 -8q33 0 54 40.5t42 124.5l85 343h-178v66h195z" />
+<glyph unicode="&#x2a0e;" horiz-adv-x="499" d="M331 385l55 221q9 35 23.5 68.5t37.5 69.5t59 58t78 22q55 0 55 -45q0 -25 -15.5 -42t-36.5 -17q-31 0 -31 24q0 15 9 27t9 14q0 8 -11 8q-35 0 -57 -43.5t-44 -133.5l-58 -231h157v-66h-173l-34 -134h207v-66h-223l-59 -237q-12 -47 -33.5 -89.5t-64 -77.5t-94.5 -35 q-55 0 -55 45q0 25 15.5 42t36.5 17q12 0 21.5 -7t9.5 -19q0 -17 -9 -26.5t-9 -12.5q0 -8 11 -8q33 0 54 40.5t42 124.5l60 243h-153v66h170l33 134h-203v66h220z" />
+<glyph unicode="&#x2a0f;" horiz-adv-x="499" d="M302 271l84 335q9 35 23.5 68.5t37.5 69.5t59 58t78 22q55 0 55 -45q0 -25 -15.5 -42t-36.5 -17q-31 0 -31 24q0 15 9 27t9 14q0 8 -11 8q-35 0 -57 -43.5t-44 -133.5l-74 -296l172 97l31 -59l-225 -127l-87 -349q-12 -47 -33.5 -89.5t-64 -77.5t-94.5 -35q-55 0 -55 45 q0 25 15.5 42t36.5 17q12 0 21.5 -7t9.5 -19q0 -17 -9 -26.5t-9 -12.5q0 -8 11 -8q33 0 54 40.5t42 124.5l76 307l-170 -97l-31 58z" />
+<glyph unicode="&#x2a10;" horiz-adv-x="499" d="M354 476l32 130q9 35 23.5 68.5t37.5 69.5t59 58t78 22q55 0 55 -45q0 -25 -15.5 -42t-36.5 -17q-31 0 -31 24q0 15 9 27t9 14q0 8 -11 8q-35 0 -57 -43.5t-44 -133.5l-39 -157q73 -33 110 -105l-33 -19q-30 59 -87 86l-88 -356h8q39 0 74 15l17 -34q-44 -19 -91 -19 q-12 0 -18 1l-36 -146q-12 -47 -33.5 -89.5t-64 -77.5t-94.5 -35q-55 0 -55 45q0 25 15.5 42t36.5 17q12 0 21.5 -7t9.5 -19q0 -17 -9 -26.5t-9 -12.5q0 -8 11 -8q33 0 54 40.5t42 124.5l42 169q-62 26 -100 82t-38 125q0 93 66 159t159 66q14 0 21 -1zM344 439h-11 q-77 0 -132 -55t-55 -132q0 -56 30 -102t79 -68z" />
+<glyph unicode="&#x2a11;" horiz-adv-x="499" d="M281 187l105 419q9 35 23.5 68.5t37.5 69.5t59 58t78 22q55 0 55 -45q0 -25 -15.5 -42t-36.5 -17q-31 0 -31 24q0 15 9 27t9 14q0 8 -11 8q-35 0 -57 -43.5t-44 -133.5l-108 -433q48 6 84.5 32t53.5 59l5 10l1 5q0 12 -14 12q-3 0 -9 -2q-38 -14 -65 -19l-3 12 q100 33 145 76l5 -3q0 -65 42 -157l-12 -6q-16 24 -30 61q-7 13 -14 13t-11 -8q-23 -46 -72.5 -83t-115.5 -41l-65 -262q-12 -47 -33.5 -89.5t-64 -77.5t-94.5 -35q-55 0 -55 45q0 25 15.5 42t36.5 17q12 0 21.5 -7t9.5 -19q0 -17 -9 -26.5t-9 -12.5q0 -8 11 -8 q33 0 54 40.5t42 124.5l68 275q-73 19 -119.5 79.5t-46.5 137.5h38q0 -64 38.5 -114t98.5 -67z" />
+<glyph unicode="&#x2a12;" horiz-adv-x="519" d="M344 439l42 167q9 35 23.5 68.5t37.5 69.5t59 58t78 22q55 0 55 -45q0 -25 -15.5 -42t-36.5 -17q-31 0 -31 24q0 15 9 27t9 14q0 8 -11 8q-35 0 -57 -43.5t-44 -133.5l-35 -139h132v-450h-245l-35 -145q-12 -47 -33.5 -89.5t-64 -77.5t-94.5 -35q-55 0 -55 45 q0 25 15.5 42t36.5 17q12 0 21.5 -7t9.5 -19q0 -17 -9 -26.5t-9 -12.5q0 -8 11 -8q33 0 54 40.5t42 124.5l46 189h271v374h-177zM412 253q0 -31 -22 -54.5t-56 -23.5q-35 0 -56.5 21t-21.5 57q0 34 24 56t54 22q31 0 54.5 -22.5t23.5 -55.5z" />
+<glyph unicode="&#x2a13;" horiz-adv-x="499" d="M344 439l42 167q9 35 23.5 68.5t37.5 69.5t59 58t78 22q55 0 55 -45q0 -25 -15.5 -42t-36.5 -17q-31 0 -31 24q0 15 9 27t9 14q0 8 -11 8q-34 0 -56 -43t-45 -134l-40 -157q61 -27 98.5 -82.5t37.5 -124.5q0 -93 -66 -159t-159 -66q-12 0 -18 1l-36 -146 q-12 -47 -33.5 -89.5t-64 -77.5t-94.5 -35q-55 0 -55 45q0 25 15.5 42t36.5 17q12 0 21.5 -7t9.5 -19q0 -17 -9 -26.5t-9 -12.5q0 -8 11 -8q33 0 54 40.5t42 124.5l51 207q39 -18 79 -18q77 0 132 55t55 132q0 75 -51.5 129t-125.5 58zM412 253q0 -31 -22 -54.5t-56 -23.5 q-35 0 -56.5 21t-21.5 57q0 34 24 56t54 22q31 0 54.5 -22.5t23.5 -55.5z" />
+<glyph unicode="&#x2a14;" horiz-adv-x="628" d="M542 253q0 -31 -22 -54.5t-56 -23.5q-35 0 -56.5 21t-21.5 57q0 34 24 56t54 22q31 0 54.5 -22.5t23.5 -55.5zM462 616l-35 -142q17 3 36 3q93 0 159 -66t66 -159t-66 -159t-159 -66q-76 0 -136 46l-48 -191q-12 -47 -33.5 -89.5t-64 -77.5t-94.5 -35q-55 0 -55 45 q0 25 15.5 42t36.5 17q12 0 21.5 -7t9.5 -19q0 -17 -9 -26.5t-9 -12.5q0 -8 11 -8q33 0 54 40.5t42 124.5l81 324q17 -59 66.5 -97t112.5 -38q77 0 131.5 55t54.5 132t-54.5 132t-131.5 55q-79 0 -133 -56l55 223q9 35 23.5 68.5t37.5 69.5t59 58t78 22q55 0 55 -45 q0 -25 -15.5 -42t-36.5 -17q-31 0 -31 24q0 15 9 27t9 14q0 8 -11 8q-35 0 -57 -43.5t-44 -133.5z" />
+<glyph unicode="&#x2a15;" horiz-adv-x="499" d="M412 253q0 -31 -22 -54.5t-56 -23.5q-35 0 -56.5 21t-21.5 57q0 34 24 56t54 22q31 0 54.5 -22.5t23.5 -55.5zM353 477l33 129q9 35 23.5 68.5t37.5 69.5t59 58t78 22q55 0 55 -45q0 -25 -15.5 -42t-36.5 -17q-31 0 -31 24q0 15 9 27t9 14q0 8 -11 8q-35 0 -57 -43.5 t-44 -133.5l-39 -157q60 -27 97.5 -83t37.5 -124q0 -93 -66 -159t-159 -66q-12 0 -18 1l-36 -146q-12 -47 -33.5 -89.5t-64 -77.5t-94.5 -35q-55 0 -55 45q0 25 15.5 42t36.5 17q12 0 21.5 -7t9.5 -19q0 -17 -9 -26.5t-9 -12.5q0 -8 11 -8q33 0 54 40.5t42 124.5l41 169 q-61 26 -99 82t-38 125q0 93 66 159t159 66h20zM521 252q0 77 -55 132t-132 55t-132 -55t-55 -132t55 -132t132 -55t132 55t55 132z" />
+<glyph unicode="&#x2a16;" horiz-adv-x="529" d="M354 477l32 129q9 35 23.5 68.5t37.5 69.5t59 58t78 22q55 0 55 -45q0 -25 -15.5 -42t-36.5 -17q-31 0 -31 24q0 15 9 27t9 14q0 8 -11 8q-35 0 -57 -43.5t-44 -133.5l-35 -139h132v-450h-244l-36 -145q-12 -47 -33.5 -89.5t-64 -77.5t-94.5 -35q-55 0 -55 45 q0 25 15.5 42t36.5 17q12 0 21.5 -7t9.5 -19q0 -17 -9 -26.5t-9 -12.5q0 -8 11 -8q33 0 54 40.5t42 124.5l37 151h-132v450h245zM521 65v374h-103l-94 -374h197zM344 439h-197v-374h104z" />
+<glyph unicode="&#x2a17;" horiz-adv-x="738" d="M491 304h197q49 0 89.5 -33t40.5 -91q0 -55 -36 -89.5t-81 -34.5h-73v66h70q21 0 37.5 15t16.5 45q0 56 -67 56h-211l-88 -356q-12 -47 -33.5 -89.5t-64 -77.5t-94.5 -35q-55 0 -55 45q0 25 15.5 42t36.5 17q12 0 21.5 -7t9.5 -19q0 -17 -9 -26.5t-9 -12.5q0 -8 11 -8 q33 0 54 40.5t42 124.5l90 362h-184q-10 0 -17 -7.5t-7 -14.5q0 -11 14 -25q51 -49 82 -96l-20 -19q-122 141 -237 189v10q113 48 238 192l20 -19q-28 -40 -82 -96q-14 -14 -14 -28q0 -20 22 -20h202l75 302q9 35 23.5 68.5t37.5 69.5t59 58t78 22q55 0 55 -45 q0 -25 -15.5 -42t-36.5 -17q-31 0 -31 24q0 15 9 27t9 14q0 8 -11 8q-35 0 -57 -43.5t-44 -133.5z" />
+<glyph unicode="&#x2a18;" horiz-adv-x="539" d="M314 319l72 287q9 35 23.5 68.5t37.5 69.5t59 58t78 22q55 0 55 -45q0 -25 -15.5 -42t-36.5 -17q-31 0 -31 24q0 15 9 27t9 14q0 8 -11 8q-35 0 -57 -43.5t-44 -133.5l-64 -254l126 125l46 -46l-189 -189l189 -189l-46 -46l-169 169l-76 -304q-12 -47 -33.5 -89.5 t-64 -77.5t-94.5 -35q-55 0 -55 45q0 25 15.5 42t36.5 17q12 0 21.5 -7t9.5 -19q0 -17 -9 -26.5t-9 -12.5q0 -8 11 -8q33 0 54 40.5t42 124.5l66 265l-124 -124l-46 46l189 189l-189 189l46 46z" />
+<glyph unicode="&#x2a19;" horiz-adv-x="559" d="M363 515l23 91q9 35 23.5 68.5t37.5 69.5t59 58t78 22q55 0 55 -45q0 -25 -15.5 -42t-36.5 -17q-31 0 -31 24q0 15 9 27t9 14q0 8 -11 8q-34 0 -56 -43t-45 -134l-30 -117q75 -28 119.5 -94.5t44.5 -156.5v-259h-66v255q0 62 -31.5 112.5t-82.5 75.5l-137 -550 q-12 -47 -33.5 -89.5t-64 -77.5t-94.5 -35q-55 0 -55 45q0 25 15.5 42t36.5 17q12 0 21.5 -7t9.5 -19q0 -17 -9 -26.5t-9 -12.5q0 -8 11 -8q33 0 54 40.5t42 124.5l143 574h-13q-80 0 -138 -60t-58 -145v-256h-66v256q0 119 75 195t187 76q19 0 29 -1z" />
+<glyph unicode="&#x2a1a;" horiz-adv-x="559" d="M253 73l133 533q9 35 23.5 68.5t37.5 69.5t59 58t78 22q55 0 55 -45q0 -25 -15.5 -42t-36.5 -17q-31 0 -31 24q0 15 9 27t9 14q0 8 -11 8q-35 0 -57 -43.5t-44 -133.5l-140 -561h12q80 0 138 60t58 145v256h66v-256q0 -119 -75 -195t-187 -76q-10 0 -28 2l-27 -109 q-12 -47 -33.5 -89.5t-64 -77.5t-94.5 -35q-55 0 -55 45q0 25 15.5 42t36.5 17q12 0 21.5 -7t9.5 -19q0 -17 -9 -26.5t-9 -12.5q0 -8 11 -8q33 0 54 40.5t42 124.5l32 130q-75 28 -119.5 94.5t-44.5 156.5v259h66v-255q0 -61 31.5 -112t83.5 -76z" />
+<glyph unicode="&#x2a1b;" horiz-adv-x="459" d="M639 881h-450v66h450v-66zM204 -124l182 730q9 35 23.5 68.5t37.5 69.5t59 58t78 22q55 0 55 -45q0 -25 -15.5 -42t-36.5 -17q-31 0 -31 24q0 15 9 27t9 14q0 8 -11 8q-35 0 -57 -43.5t-44 -133.5l-183 -734q-12 -47 -33.5 -89.5t-64 -77.5t-94.5 -35q-55 0 -55 45 q0 25 15.5 42t36.5 17q12 0 21.5 -7t9.5 -19q0 -17 -9 -26.5t-9 -12.5q0 -8 11 -8q33 0 54 40.5t42 124.5z" />
+<glyph unicode="&#x2a1c;" horiz-adv-x="459" d="M209 -112l183 734q12 47 33.5 89.5t64 77.5t94.5 35q55 0 55 -45q0 -25 -15.5 -42t-36.5 -17q-12 0 -21.5 7t-9.5 19q0 17 9 26.5t9 12.5q0 8 -11 8q-33 0 -54 -40.5t-42 -124.5l-182 -730q-9 -35 -23.5 -68.5t-37.5 -69.5t-59 -58t-78 -22q-55 0 -55 45q0 25 15.5 42 t36.5 17q31 0 31 -24q0 -15 -9 -27t-9 -14q0 -8 11 -8q35 0 57 43.5t44 133.5zM482 -443h-450v66h450v-66z" />
+<glyph unicode="&#x2a1d;" horiz-adv-x="1270" d="M1177 -252l-541 460l-543 -460v1022l542 -459l542 459v-1022zM1097 -81v679l-407 -331zM577 253l-404 345v-679z" />
+<glyph unicode="&#x2a1e;" horiz-adv-x="1018" d="M924 -258l-879 511l879 511v-1022zM844 -119v744l-641 -372z" />
+<glyph unicode="&#x2a1f;" horiz-adv-x="503" d="M393 425q0 -58 -41.5 -99.5t-100.5 -41.5t-100 41t-41 100t41 100t100 41t100.5 -41t41.5 -100zM333 424q0 33 -24.5 57t-57.5 24t-57 -24t-24 -57t24 -56.5t57 -23.5t57.5 23.5t24.5 56.5zM178 -291l-33 53q55 27 112 74.5t57 87.5q0 23 -38 23q-4 0 -12 -3t-13 -3 q-59 0 -100 41.5t-41 99.5q0 59 41.5 100.5t99.5 41.5q76 0 117.5 -57t41.5 -136q0 -116 -58.5 -188.5t-173.5 -133.5zM333 82q0 33 -24.5 57.5t-57.5 24.5t-57 -24.5t-24 -57.5t24 -57t57 -24t57.5 24t24.5 57z" />
+<glyph unicode="&#x2a20;" horiz-adv-x="1177" d="M1079 253l-654 -380v76l525 304l-525 304v76zM752 253l-654 -380v76l525 304l-525 304v76z" />
+<glyph unicode="&#x2a21;" horiz-adv-x="547" d="M472 512l-57 -57l-120 143v-898h-80v1105z" />
+<glyph unicode="&#x2a22;" d="M636 220h-261v-261h-66v261h-261v66h261v261h66v-261h261v-66zM464 700q0 -50 -35 -84.5t-85 -34.5t-84.5 34.5t-34.5 84.5t34.5 84.5t84.5 34.5t85 -34.5t35 -84.5zM413 701q0 28 -20.5 48t-48.5 20t-48.5 -20.5t-20.5 -48.5q0 -29 20.5 -49t49.5 -20q28 0 48 20.5 t20 49.5z" />
+<glyph unicode="&#x2a23;" d="M498 540h-34l-122 103l-121 -103h-34l124 167h62zM636 220h-261v-261h-66v261h-261v66h261v261h66v-261h261v-66z" />
+<glyph unicode="&#x2a24;" d="M636 220h-261v-261h-66v261h-261v66h261v261h66v-261h261v-66zM528 704h19q-3 -48 -36.5 -93t-77.5 -45q-32 0 -100 44t-89 44q-31 0 -54.5 -25t-31.5 -63h-20q2 53 37 95.5t80 42.5q33 0 101 -44t88 -44q32 0 54 24.5t30 63.5z" />
+<glyph unicode="&#x2a25;" d="M636 220h-261v-261h-66v261h-261v66h261v261h66v-261h261v-66zM404 -172q0 -27 -19.5 -45t-44.5 -18t-44 18t-19 45q0 26 17.5 45t45.5 19q29 0 46.5 -17.5t17.5 -46.5z" />
+<glyph unicode="&#x2a26;" d="M636 220h-261v-261h-66v261h-261v66h261v261h66v-261h261v-66zM526 -60h20q-2 -53 -37 -95.5t-80 -42.5q-33 0 -101 44t-88 44q-32 0 -54 -24.5t-30 -63.5h-19q3 48 36.5 93t77.5 45q32 0 100 -44t89 -44q31 0 54.5 25t31.5 63z" />
+<glyph unicode="&#x2a27;" d="M629 220h-261v-261h-66v261h-261v66h261v261h66v-261h261v-66zM673 -128l-33 -82h-239v7l112 107q46 44 61 70t15 64q0 33 -20.5 54.5t-54.5 21.5q-32 0 -53.5 -18.5t-40.5 -61.5l-18 5q10 54 42.5 86.5t84.5 32.5q51 0 81.5 -29t30.5 -75q0 -65 -77 -131l-102 -89h133 q19 0 32.5 10.5t28.5 37.5z" />
+<glyph unicode="&#x2a28;" d="M636 220h-261v-1l126 -184h-126v-76h-66v76h-125l125 183v2h-261v66h261v261h66v-261h261v-66z" />
+<glyph unicode="&#x2a29;" d="M299 323l-10 19q44 29 63.5 51t19.5 46q0 13 -14 13q-4 0 -13.5 -2t-15.5 -2q-58 0 -58 51q0 26 16.5 41.5t43.5 15.5q34 0 57 -24.5t23 -62.5q0 -44 -30 -82.5t-82 -63.5zM637 220h-589v66h589v-66z" />
+<glyph unicode="&#x2a2a;" d="M637 220h-589v66h589v-66zM407 58q0 -27 -19.5 -45t-44.5 -18t-44 18t-19 45q0 26 17.5 45t45.5 19q29 0 46.5 -17.5t17.5 -46.5z" />
+<glyph unicode="&#x2a2b;" d="M607 59q0 -26 -17.5 -45t-45.5 -19q-29 0 -46.5 17.5t-17.5 46.5q0 27 19.5 45t44.5 18t44 -18t19 -45zM637 220h-589v66h589v-66zM205 448q0 -26 -17.5 -45t-45.5 -19q-29 0 -46.5 17.5t-17.5 46.5q0 27 19.5 45t44.5 18t44 -18t19 -45z" />
+<glyph unicode="&#x2a2c;" d="M607 448q0 -26 -17.5 -45t-45.5 -19q-29 0 -46.5 17.5t-17.5 46.5q0 27 19.5 45t44.5 18t44 -18t19 -45zM637 220h-589v66h589v-66zM205 59q0 -26 -17.5 -45t-45.5 -19q-29 0 -46.5 17.5t-17.5 46.5q0 27 19.5 45t44.5 18t44 -18t19 -45z" />
+<glyph unicode="&#x2a2d;" horiz-adv-x="724" d="M674 219h-220v-219h-66v219h-220v66h220v220h66v-220h220v-66zM421 -53v-66q-154 0 -262.5 108.5t-108.5 262.5t108.5 262.5t262.5 108.5v-66q-126 0 -215.5 -89.5t-89.5 -215.5t89.5 -215.5t215.5 -89.5z" />
+<glyph unicode="&#x2a2e;" horiz-adv-x="724" d="M303 557v66q154 0 262.5 -108.5t108.5 -262.5t-108.5 -262.5t-262.5 -108.5v66q126 0 215.5 89.5t89.5 215.5t-89.5 215.5t-215.5 89.5zM556 219h-220v-219h-66v219h-220v66h220v220h66v-220h220v-66z" />
+<glyph unicode="&#x2a2f;" horiz-adv-x="490" d="M439 120l-61 -61l-133 133l-134 -133l-61 61l134 133l-134 133l61 61l133 -133l134 133l61 -61l-134 -133z" />
+<glyph unicode="&#x2a30;" horiz-adv-x="640" d="M597 22l-46 -47l-231 230l-231 -230l-46 46l230 231l-230 231l47 46l230 -230l231 230l46 -45l-230 -232zM386 622q0 -27 -19.5 -45t-44.5 -18t-44 18t-19 45q0 26 17.5 45t45.5 19q29 0 46.5 -17.5t17.5 -46.5z" />
+<glyph unicode="&#x2a31;" horiz-adv-x="640" d="M597 22l-46 -47l-231 230l-231 -230l-46 46l230 231l-230 231l47 46l230 -230l231 230l46 -45l-230 -232zM551 -130h-462v66h462v-66z" />
+<glyph unicode="&#x2a32;" horiz-adv-x="640" d="M597 -45h-554v66l230 231l-230 231l47 46l230 -230l231 230l46 -45l-230 -232l230 -231v-66zM505 21l-185 184l-185 -184h370z" />
+<glyph unicode="&#x2a33;" d="M627 122l-47 -46l-131 130l-60 -60l130 -131l-46 -47l-131 131l-131 -131l-46 47l130 131l-60 60l-131 -130l-47 46l131 131l-131 131l47 46l131 -130l60 60l-130 131l46 47l131 -131l131 131l46 -47l-130 -131l60 -60l131 130l47 -46l-131 -131zM403 253l-61 61l-61 -61 l61 -61z" />
+<glyph unicode="&#x2a34;" horiz-adv-x="674" d="M624 96l-47 -47l-156 156l-156 -156l-47 47l156 156l-156 156l47 47l156 -156l156 156l47 -47l-156 -156zM421 -53v-66q-154 0 -262.5 108.5t-108.5 262.5t108.5 262.5t262.5 108.5v-66q-126 0 -215.5 -89.5t-89.5 -215.5t89.5 -215.5t215.5 -89.5z" />
+<glyph unicode="&#x2a35;" horiz-adv-x="674" d="M253 557v66q154 0 262.5 -108.5t108.5 -262.5t-108.5 -262.5t-262.5 -108.5v66q126 0 215.5 89.5t89.5 215.5t-89.5 215.5t-215.5 89.5zM456 96l-47 -47l-156 156l-156 -156l-47 47l156 156l-156 156l47 47l156 -156l156 156l47 -47l-156 -156z" />
+<glyph unicode="&#x2a36;" horiz-adv-x="842" d="M792 252q0 -154 -108.5 -262.5t-262.5 -108.5t-262.5 108.5t-108.5 262.5t108.5 262.5t262.5 108.5t262.5 -108.5t108.5 -262.5zM726 252q0 126 -89.5 215.5t-215.5 89.5t-215.5 -89.5t-89.5 -215.5t89.5 -215.5t215.5 -89.5t215.5 89.5t89.5 215.5zM592 643h-34 l-137 103l-136 -103h-34l139 167h62zM624 96l-47 -47l-156 156l-156 -156l-47 47l156 156l-156 156l47 47l156 -156l156 156l47 -47l-156 -156z" />
+<glyph unicode="&#x2a37;" horiz-adv-x="1100" d="M746 103l-47 -47l-149 149l-149 -149l-47 47l149 149l-149 149l47 47l149 -149l149 149l47 -47l-149 -149zM900 252q0 -146 -102 -248t-248 -102t-248 102t-102 248t102 248t248 102t248 -102t102 -248zM848 252q0 124 -87 211t-211 87t-211 -87t-87 -211t87 -211 t211 -87t211 87t87 211zM1050 252q0 -136 -67 -251t-182 -182t-251 -67t-251 67t-182 182t-67 251t67 251t182 182t251 67t251 -67t182 -182t67 -251zM984 252q0 180 -127 307t-307 127t-307 -127t-127 -307t127 -307t307 -127t307 127t127 307z" />
+<glyph unicode="&#x2a38;" horiz-adv-x="842" d="M634 219h-426v66h426v-66zM792 252q0 -154 -108.5 -262.5t-262.5 -108.5t-262.5 108.5t-108.5 262.5t108.5 262.5t262.5 108.5t262.5 -108.5t108.5 -262.5zM726 252q0 126 -89.5 215.5t-215.5 89.5t-215.5 -89.5t-89.5 -215.5t89.5 -215.5t215.5 -89.5t215.5 89.5 t89.5 215.5zM478 410q0 -25 -17 -41t-40 -16t-40 16t-17 41q0 24 15.5 40.5t41.5 16.5t41.5 -15.5t15.5 -41.5zM478 94q0 -25 -17 -41t-40 -16t-40 16t-17 41q0 24 15.5 40.5t41.5 16.5t41.5 -15.5t15.5 -41.5z" />
+<glyph unicode="&#x2a39;" horiz-adv-x="1145" d="M1110 -127h-1075l538 938zM751 154h-145v-145h-66v145h-145v66h145v145h66v-145h145v-66zM995 -61l-422 739l-424 -739h846z" />
+<glyph unicode="&#x2a3a;" horiz-adv-x="1145" d="M1110 -127h-1075l538 938zM751 154h-356v66h356v-66zM995 -61l-422 739l-424 -739h846z" />
+<glyph unicode="&#x2a3b;" horiz-adv-x="1145" d="M1110 -127h-1075l538 938zM722 84l-46 -46l-103 102l-103 -102l-46 46l102 103l-102 103l46 46l103 -102l103 102l46 -46l-102 -103zM995 -61l-422 739l-424 -739h846z" />
+<glyph unicode="&#x2a3c;" horiz-adv-x="600" d="M552 115h-504v66h438v212h66v-278z" />
+<glyph unicode="&#x2a3d;" horiz-adv-x="600" d="M552 115h-504v278h66v-212h438v-66z" />
+<glyph unicode="&#x2a3e;" horiz-adv-x="300" d="M230 401q0 -36 -24 -59.5t-61 -23.5t-61 24t-24 59q0 37 24 62t61 25t61 -25t24 -62zM186 402q0 18 -12 29.5t-29 12.5q-17 -1 -29 -13t-12 -30q0 -17 12 -28t30 -11q16 0 28 12t12 28zM105 -170l-21 39q46 22 68 47.5t22 45.5q0 13 -11 13q-5 0 -11 -1.5t-14 -1.5 q-33 0 -55.5 24t-22.5 59q0 37 23 62t59 25q49 0 68.5 -32.5t19.5 -71.5q0 -76 -24.5 -122t-100.5 -86zM184 55q0 18 -11 30t-28 12t-29 -12t-12 -30q0 -17 11.5 -28t29.5 -11q17 0 28 10.5t11 28.5z" />
+<glyph unicode="&#x2a3f;" horiz-adv-x="694" d="M664 0h-633v19q53 3 65.5 22t12.5 79v433q0 54 -14.5 69.5t-64.5 20.5v19h245v-19q-50 -4 -63 -20t-13 -70v-503h297v503q0 55 -14 70t-64 20v19h246v-19q-50 -4 -64 -20.5t-14 -69.5v-444q0 -51 14 -68.5t64 -21.5v-19z" />
+<glyph unicode="&#x2a40;" horiz-adv-x="620" d="M572 -31h-66v295q0 86 -57 146t-139 60q-80 0 -138 -60t-58 -145v-296h-66v296q0 119 75 195t187 76q113 0 187.5 -75t74.5 -193v-299zM373 215q0 -27 -19.5 -45t-44.5 -18t-44 18t-19 45q0 26 17.5 45t45.5 19q29 0 46.5 -17.5t17.5 -46.5z" />
+<glyph unicode="&#x2a41;" horiz-adv-x="620" d="M572 536v-296q0 -119 -75 -195t-187 -76q-113 0 -187.5 75t-74.5 193v299h66v-295q0 -86 57 -146t139 -60q80 0 138 60t58 145v296h66zM460 257h-300v66h300v-66z" />
+<glyph unicode="&#x2a42;" horiz-adv-x="620" d="M572 536v-296q0 -119 -75 -195t-187 -76q-113 0 -187.5 75t-74.5 193v299h66v-295q0 -86 57 -146t139 -60q80 0 138 60t58 145v296h66zM520 602h-420v66h420v-66z" />
+<glyph unicode="&#x2a43;" horiz-adv-x="620" d="M520 602h-420v66h420v-66zM572 -31h-66v295q0 86 -57 146t-139 60q-80 0 -138 -60t-58 -145v-296h-66v296q0 119 75 195t187 76q113 0 187.5 -75t74.5 -193v-299z" />
+<glyph unicode="&#x2a44;" horiz-adv-x="620" d="M572 -31h-66v295q0 86 -57 146t-139 60q-80 0 -138 -60t-58 -145v-296h-66v296q0 119 75 195t187 76q113 0 187.5 -75t74.5 -193v-299zM459 -31h-68l-81 164l-81 -164h-68l144 297h10z" />
+<glyph unicode="&#x2a45;" horiz-adv-x="620" d="M572 536v-296q0 -119 -75 -195t-187 -76q-113 0 -187.5 75t-74.5 193v299h66v-295q0 -86 57 -146t139 -60q80 0 138 60t58 145v296h66zM459 536l-144 -297h-10l-144 297h68l81 -164l81 164h68z" />
+<glyph unicode="&#x2a46;" horiz-adv-x="620" d="M572 -406h-66v296q0 85 -58 145t-138 60q-82 0 -139 -60t-57 -146v-295h-66v299q0 118 74.5 193t187.5 75q112 0 187 -76t75 -195v-296zM572 914v-299q0 -118 -74.5 -193t-187.5 -75q-112 0 -187 76t-75 195v296h66v-296q0 -85 58 -145t138 -60q82 0 139 60t57 146v295 h66z" />
+<glyph unicode="&#x2a47;" horiz-adv-x="620" d="M572 161v-296q0 -119 -75 -195t-187 -76q-113 0 -187.5 75t-74.5 193v299h66v-295q0 -86 57 -146t139 -60q80 0 138 60t58 145v296h66zM572 347h-66v295q0 86 -57 146t-139 60q-80 0 -138 -60t-58 -145v-296h-66v296q0 119 75 195t187 76q113 0 187.5 -75t74.5 -193v-299 z" />
+<glyph unicode="&#x2a48;" horiz-adv-x="620" d="M572 914v-299q0 -118 -74.5 -193t-187.5 -75q-112 0 -187 76t-75 195v296h66v-296q0 -85 58 -145t138 -60q82 0 139 60t57 146v295h66zM572 -406h-66v296q0 85 -58 145t-138 60q-82 0 -139 -60t-57 -146v-295h-66v299q0 118 74.5 193t187.5 75q112 0 187 -76t75 -195 v-296zM520 221h-420v66h420v-66z" />
+<glyph unicode="&#x2a49;" horiz-adv-x="620" d="M572 347h-66v295q0 86 -57 146t-139 60q-80 0 -138 -60t-58 -145v-296h-66v296q0 119 75 195t187 76q113 0 187.5 -75t74.5 -193v-299zM572 161v-296q0 -119 -75 -195t-187 -76q-113 0 -187.5 75t-74.5 193v299h66v-295q0 -86 57 -146t139 -60q80 0 138 60t58 145v296h66 zM520 221h-420v66h420v-66z" />
+<glyph unicode="&#x2a4a;" horiz-adv-x="1078" d="M1030 528v-296q0 -119 -75 -195t-187 -76q-75 0 -136 35t-94 97q-33 -62 -93 -97t-135 -35q-113 0 -187.5 75t-74.5 193v299h66v-295q0 -86 57 -146t139 -60q80 0 138 58t58 144v299h66v-299q0 -87 57.5 -144.5t138.5 -57.5q80 0 138 60t58 145v296h66z" />
+<glyph unicode="&#x2a4b;" horiz-adv-x="1078" d="M1030 -40h-66v296q0 85 -58 145t-138 60q-81 0 -138.5 -57.5t-57.5 -144.5v-299h-66v299q0 86 -58 144t-138 58q-82 0 -139 -60t-57 -146v-295h-66v299q0 118 74.5 193t187.5 75q75 0 135 -35t93 -97q33 62 94 97t136 35q112 0 187 -76t75 -195v-296z" />
+<glyph unicode="&#x2a4c;" horiz-adv-x="620" d="M610 536h-38v-296q0 -119 -75 -195t-187 -76q-113 0 -187.5 75t-74.5 193v299h-38v66h600v-66zM506 240v296h-392v-295q0 -86 57 -146t139 -60q80 0 138 60t58 145z" />
+<glyph unicode="&#x2a4d;" horiz-adv-x="620" d="M610 -97h-600v66h38v296q0 119 75 195t187 76q113 0 187.5 -75t74.5 -193v-299h38v-66zM506 -31v295q0 86 -57 146t-139 60q-80 0 -138 -60t-58 -145v-296h392z" />
+<glyph unicode="&#x2a4e;" horiz-adv-x="620" d="M572 -31h-66v501h-392v-501h-66v567h524v-567zM433 -31h-66v363h-114v-363h-66v429h246v-429z" />
+<glyph unicode="&#x2a4f;" horiz-adv-x="620" d="M572 -31h-524v567h66v-501h392v501h66v-567zM433 107h-246v429h66v-363h114v363h66v-429z" />
+<glyph unicode="&#x2a50;" horiz-adv-x="620" d="M610 536h-38v-296q0 -119 -75 -195t-187 -76q-113 0 -187.5 75t-74.5 193v299h-38v66h600v-66zM506 240v296h-392v-295q0 -86 57 -146t139 -60q80 0 138 60t58 145zM468 211l-26 -25l-72 72l-34 -33l72 -73l-25 -26l-73 73l-73 -73l-25 26l72 73l-33 33l-73 -72l-26 25 l73 73l-73 73l26 25l73 -72l33 34l-72 72l25 26l73 -72l73 72l25 -26l-72 -72l34 -34l72 72l26 -25l-72 -73zM344 284l-34 34l-34 -34l34 -34z" />
+<glyph unicode="&#x2a51;" horiz-adv-x="620" d="M374 646q0 -27 -19.5 -45t-44.5 -18t-44 18t-19 45q0 26 17.5 45t45.5 19q29 0 46.5 -17.5t17.5 -46.5zM589 -29h-65l-214 432l-214 -432h-65l274 565h10z" />
+<glyph unicode="&#x2a52;" horiz-adv-x="620" d="M374 646q0 -27 -19.5 -45t-44.5 -18t-44 18t-19 45q0 26 17.5 45t45.5 19q29 0 46.5 -17.5t17.5 -46.5zM589 536l-274 -565h-10l-274 565h65l214 -432l214 432h65z" />
+<glyph unicode="&#x2a53;" horiz-adv-x="620" d="M589 -29h-65l-214 432l-214 -432h-65l274 565h10zM459 -29h-68l-81 164l-81 -164h-68l144 297h10z" />
+<glyph unicode="&#x2a54;" horiz-adv-x="620" d="M459 536l-144 -297h-10l-144 297h68l81 -164l81 164h68zM589 536l-274 -565h-10l-274 565h65l214 -432l214 432h65z" />
+<glyph unicode="&#x2a55;" horiz-adv-x="780" d="M748 -29h-65l-214 432l-45 -91l166 -341h-65l-135 272l-135 -272h-65l165 341l-44 91l-214 -432h-65l274 565h10l74 -153l74 153h10z" />
+<glyph unicode="&#x2a56;" horiz-adv-x="780" d="M748 536l-274 -565h-10l-74 152l-74 -152h-10l-274 565h65l214 -432l44 90l-165 342h65l135 -272l135 272h65l-166 -342l45 -90l214 432h65z" />
+<glyph unicode="&#x2a57;" horiz-adv-x="706" d="M683 536l-567 -565h-10v565h66v-419l421 419h90z" />
+<glyph unicode="&#x2a58;" horiz-adv-x="706" d="M600 -29h-66v419l-421 -419h-90l567 565h10v-565z" />
+<glyph unicode="&#x2a59;" horiz-adv-x="620" d="M589 -77h-65l-130 261l-79 -164h-10l-80 164l-129 -261h-65l160 331l-160 331h65l129 -261l80 164h10l79 -164l130 261h65l-161 -331zM360 254l-50 101l-50 -101l50 -101z" />
+<glyph unicode="&#x2a5a;" horiz-adv-x="620" d="M589 -29h-65l-181 365v-365h-66v365l-181 -365h-65l274 565h10z" />
+<glyph unicode="&#x2a5b;" horiz-adv-x="620" d="M589 536l-274 -565h-10l-274 565h65l181 -365v365h66v-365l181 365h65z" />
+<glyph unicode="&#x2a5c;" horiz-adv-x="620" d="M589 -29h-65l-101 204h-226l-101 -204h-65l99 204h-99v66h131l143 295h10l143 -295h131v-66h-99zM390 241l-80 162l-80 -162h160z" />
+<glyph unicode="&#x2a5d;" horiz-adv-x="620" d="M589 266h-131l-143 -295h-10l-143 295h-131v66h99l-99 204h65l101 -204h226l101 204h65l-99 -204h99v-66zM390 266h-160l80 -162z" />
+<glyph unicode="&#x2a5e;" horiz-adv-x="620" d="M571 580h-524v66h524v-66zM589 -29h-63l-215 432l-215 -432h-65l275 565h10zM571 730h-524v66h524v-66z" />
+<glyph unicode="&#x2a5f;" horiz-adv-x="620" d="M590 -29h-65l-215 432l-215 -432h-65l275 565h10zM573 -139h-526v66h526v-66z" />
+<glyph unicode="&#x2a60;" horiz-adv-x="620" d="M590 -29h-65l-215 432l-215 -432h-65l275 565h10zM575 -139h-530v66h530v-66zM575 -289h-530v66h530v-66z" />
+<glyph unicode="&#x2a61;" horiz-adv-x="620" d="M528 479l-218 -369l-219 369h72l150 -249l143 249h72zM575 0h-530v66h530v-66z" />
+<glyph unicode="&#x2a62;" horiz-adv-x="620" d="M575 740h-530v66h530v-66zM575 590h-530v66h530v-66zM590 536l-275 -565h-10l-275 565h65l215 -432l215 432h65z" />
+<glyph unicode="&#x2a63;" horiz-adv-x="620" d="M590 536l-275 -565h-10l-275 565h65l215 -432l215 432h65zM575 -139h-530v66h530v-66zM575 -289h-530v66h530v-66z" />
+<glyph unicode="&#x2a64;" horiz-adv-x="1043" d="M1008 -284l-938 537l938 538v-1075zM942 286v391l-681 -391h681zM942 -169v389h-681z" />
+<glyph unicode="&#x2a65;" horiz-adv-x="1043" d="M1008 253l-938 -537v1075zM817 286l-681 391v-391h681zM817 220h-681v-389z" />
+<glyph unicode="&#x2a66;" d="M637 320h-589v66h589v-66zM637 120h-589v66h589v-66zM406 -42q0 -27 -19.5 -45t-44.5 -18t-44 18t-19 45q0 26 17.5 45t45.5 19q29 0 46.5 -17.5t17.5 -46.5z" />
+<glyph unicode="&#x2a67;" d="M405 640q0 -26 -17.5 -45t-45.5 -19q-29 0 -46.5 17.5t-17.5 46.5q0 27 19.5 45t44.5 18t44 -18t19 -45zM637 412h-589v66h589v-66zM637 220h-589v66h589v-66zM637 28h-589v66h589v-66z" />
+<glyph unicode="&#x2a68;" d="M637 28h-179v-217h-66v217h-99v-217h-66v217h-179v66h179v126h-179v66h179v126h-179v66h179v217h66v-217h99v217h66v-217h179v-66h-179v-126h179v-66h-179v-126h179v-66zM392 286v126h-99v-126h99zM392 94v126h-99v-126h99z" />
+<glyph unicode="&#x2a69;" d="M637 28h-100v-184h-66v184h-95v-184h-66v184h-96v-184h-66v184h-100v66h100v126h-100v66h100v126h-100v66h100v184h66v-184h96v184h66v-184h95v184h66v-184h100v-66h-100v-126h100v-66h-100v-126h100v-66zM471 286v126h-95v-126h95zM310 286v126h-96v-126h96zM471 94v126 h-95v-126h95zM310 94v126h-96v-126h96z" />
+<glyph unicode="&#x2a6a;" d="M604 362h33q-5 -74 -48 -139t-110 -65q-41 0 -95 32l-102 64q-49 32 -78 32q-49 0 -79 -39t-44 -99h-33q4 81 48.5 142.5t114.5 61.5q41 0 95 -32l102 -64q49 -32 79 -32q88 0 117 138zM415 458q0 -26 -17.5 -45t-45.5 -19q-29 0 -46.5 17.5t-17.5 46.5q0 27 19.5 45 t44.5 18t44 -18t19 -45z" />
+<glyph unicode="&#x2a6b;" d="M604 362h33q-5 -74 -48 -139t-110 -65q-41 0 -95 32l-102 64q-49 32 -78 32q-49 0 -79 -39t-44 -99h-33q4 81 48.5 142.5t114.5 61.5q41 0 95 -32l102 -64q49 -32 79 -32q88 0 117 138zM555 458q0 -26 -17.5 -45t-45.5 -19q-29 0 -46.5 17.5t-17.5 46.5q0 27 19.5 45 t44.5 18t44 -18t19 -45zM285 51q0 -26 -19 -45t-45 -19q-25 0 -44 19.5t-19 44.5q0 29 18.5 46t44.5 17q27 0 45.5 -16.5t18.5 -46.5z" />
+<glyph unicode="&#x2a6c;" d="M604 543h33q-5 -74 -48 -139t-110 -65q-41 0 -95 32l-102 64q-49 32 -78 32q-49 0 -79 -39t-44 -99h-33q4 81 48.5 142.5t114.5 61.5q41 0 95 -32l102 -64q49 -32 79 -32q88 0 117 138zM604 176h33q-5 -74 -48 -139t-110 -65q-41 0 -95 32l-102 64q-49 32 -78 32 q-49 0 -79 -39t-44 -99h-33q4 81 48.5 142.5t114.5 61.5q41 0 95 -32l102 -64q49 -32 79 -32q88 0 117 138zM637 220h-589v66h589v-66z" />
+<glyph unicode="&#x2a6d;" d="M617 532h20q-5 -75 -48 -144.5t-110 -69.5q-32 0 -74.5 23t-77 51t-72 51t-61.5 23q-48 0 -80 -43.5t-46 -104.5h-20q4 82 49 148t114 66q41 0 97 -37l108 -74q51 -37 81 -37q85 0 120 148zM637 173h-589v66h589v-66zM637 -27h-589v66h589v-66zM410 640q0 -26 -17.5 -45 t-45.5 -19q-29 0 -46.5 17.5t-17.5 46.5q0 27 19.5 45t44.5 18t44 -18t19 -45z" />
+<glyph unicode="&#x2a6e;" d="M637 320h-589v66h589v-66zM637 120h-589v66h589v-66zM361 642l9 -6q37 -24 96 -34q34 -5 47 -14.5t13 -28.5q0 -17 -10 -28t-26 -11q-25 0 -60 44q-23 28 -69 58l-8 5v-9q0 -56 20 -110q9 -25 9 -33q0 -15 -12.5 -27t-27.5 -12q-14 0 -25 11t-11 25t12 47q16 43 16 99v9 q-40 -25 -52 -36q-12 -12 -41 -45q-22 -25 -43 -25q-17 0 -27 10t-10 26q0 19 14.5 29t48.5 16q35 7 53.5 14t49.5 26q-43 26 -97 37q-37 8 -52 18t-15 28q0 16 9 26.5t24 10.5q20 0 49 -32q42 -47 89 -73v13q0 42 -15 91q-11 33 -11 52q0 14 10.5 24t25.5 10t26 -10.5 t11 -25.5q0 -16 -11 -47q-17 -45 -17 -83v-24q34 20 58 42l19 19l21 23q8 8 18.5 15.5t18.5 7.5q17 0 27 -10.5t10 -27.5q0 -20 -11.5 -29.5t-40.5 -13.5q-56 -9 -112 -41z" />
+<glyph unicode="&#x2a6f;" d="M604 239h33q-5 -74 -48 -139t-110 -65q-41 0 -95 32l-102 64q-49 32 -78 32q-49 0 -79 -39t-44 -99h-33q4 81 48.5 142.5t114.5 61.5q41 0 95 -32l102 -64q49 -32 79 -32q88 0 117 138zM604 475h33q-5 -74 -48 -139t-110 -65q-41 0 -95 32l-102 64q-49 32 -78 32 q-49 0 -79 -39t-44 -99h-33q4 81 48.5 142.5t114.5 61.5q41 0 95 -32l102 -64q49 -32 79 -32q88 0 117 138zM498 540h-34l-122 103l-121 -103h-34l124 167h62z" />
+<glyph unicode="&#x2a70;" d="M604 414h33q-5 -74 -48 -139t-110 -65q-41 0 -95 32l-102 64q-49 32 -78 32q-49 0 -79 -39t-44 -99h-33q4 81 48.5 142.5t114.5 61.5q41 0 95 -32l102 -64q49 -32 79 -32q88 0 117 138zM604 650h33q-5 -74 -48 -139t-110 -65q-41 0 -95 32l-102 64q-49 32 -78 32 q-49 0 -79 -39t-44 -99h-33q4 81 48.5 142.5t114.5 61.5q41 0 95 -32l102 -64q49 -32 79 -32q88 0 117 138zM637 54h-589v66h589v-66zM637 -146h-589v66h589v-66z" />
+<glyph unicode="&#x2a71;" d="M637 582h-589v66h589v-66zM637 382h-589v66h589v-66zM637 53h-262v-194h-66v194h-261v66h261v209h66v-209h262v-66z" />
+<glyph unicode="&#x2a72;" d="M637 59h-589v66h589v-66zM637 -141h-589v66h589v-66zM637 388h-261v-209h-66v209h-262v66h262v194h66v-194h261v-66z" />
+<glyph unicode="&#x2a73;" d="M604 187h33q-5 -74 -48 -139t-110 -65q-41 0 -95 32l-102 64q-49 32 -78 32q-49 0 -79 -39t-44 -99h-33q4 81 48.5 142.5t114.5 61.5q41 0 95 -32l102 -64q49 -32 79 -32q88 0 117 138zM637 466h-589v66h589v-66zM637 266h-589v66h589v-66z" />
+<glyph unicode="&#x2a74;" horiz-adv-x="1015" d="M967 320h-509v66h509v-66zM967 120h-509v66h509v-66zM376 354q0 -26 -17.5 -45t-45.5 -19q-29 0 -46.5 17.5t-17.5 46.5q0 27 19.5 45t44.5 18t44 -18t19 -45zM175 354q0 -26 -17.5 -45t-45.5 -19q-29 0 -46.5 17.5t-17.5 46.5q0 27 19.5 45t44.5 18t44 -18t19 -45z M376 153q0 -26 -19 -45t-45 -19q-25 0 -44 19.5t-19 44.5q0 29 18.5 46t44.5 17q27 0 45.5 -16.5t18.5 -46.5zM175 153q0 -26 -19 -45t-45 -19q-25 0 -44 19.5t-19 44.5q0 29 18.5 46t44.5 17q27 0 45.5 -16.5t18.5 -46.5z" />
+<glyph unicode="&#x2a75;" horiz-adv-x="997" d="M949 320h-400v66h400v-66zM949 120h-400v66h400v-66zM448 320h-400v66h400v-66zM448 120h-400v66h400v-66z" />
+<glyph unicode="&#x2a76;" horiz-adv-x="1436" d="M1388 320h-380v66h380v-66zM1388 120h-380v66h380v-66zM908 320h-380v66h380v-66zM908 120h-380v66h380v-66zM428 320h-380v66h380v-66zM428 120h-380v66h380v-66z" />
+<glyph unicode="&#x2a77;" d="M637 320h-589v66h589v-66zM637 120h-589v66h589v-66zM507 548q0 -26 -19 -45t-45 -19q-25 0 -44 19.5t-19 44.5q0 29 18.5 46t44.5 17q27 0 45.5 -16.5t18.5 -46.5zM305 548q0 -26 -19 -45t-45 -19q-25 0 -44 19.5t-19 44.5q0 29 18.5 46t44.5 17q27 0 45.5 -16.5 t18.5 -46.5zM507 -42q0 -26 -19 -45t-45 -19q-25 0 -44 19.5t-19 44.5q0 29 18.5 46t44.5 17q27 0 45.5 -16.5t18.5 -46.5zM305 -42q0 -26 -19 -45t-45 -19q-25 0 -44 19.5t-19 44.5q0 29 18.5 46t44.5 17q27 0 45.5 -16.5t18.5 -46.5z" />
+<glyph unicode="&#x2a78;" d="M637 412h-589v66h589v-66zM637 220h-589v66h589v-66zM637 28h-589v66h589v-66zM647 640q0 -26 -17.5 -45t-45.5 -19q-29 0 -46.5 17.5t-17.5 46.5q0 27 19.5 45t44.5 18t44 -18t19 -45zM486 640q0 -26 -17.5 -45t-45.5 -19q-29 0 -46.5 17.5t-17.5 46.5q0 27 19.5 45 t44.5 18t44 -18t19 -45zM326 640q0 -26 -17.5 -45t-45.5 -19q-29 0 -46.5 17.5t-17.5 46.5q0 27 19.5 45t44.5 18t44 -18t19 -45zM165 640q0 -26 -17.5 -45t-45.5 -19q-29 0 -46.5 17.5t-17.5 46.5q0 27 19.5 45t44.5 18t44 -18t19 -45z" />
+<glyph unicode="&#x2a79;" d="M609 253q0 -39 -28 -67t-67 -28t-67 28t-28 67t28 67t67 28t67 -28t28 -67zM559 253q0 19 -13 32t-32 13t-32 -13t-13 -32t13 -32t32 -13t32 13t13 32zM609 -26l-565 274v10l565 274v-65l-432 -214l432 -214v-65z" />
+<glyph unicode="&#x2a7a;" d="M641 248l-565 -274v65l432 214l-432 214v65l565 -274v-10zM266 253q0 -39 -28 -67t-67 -28t-67 28t-28 67t28 67t67 28t67 -28t28 -67zM216 253q0 19 -13 32t-32 13t-32 -13t-13 -32t13 -32t32 -13t32 13t13 32z" />
+<glyph unicode="&#x2a7b;" d="M241 510h-31q0 55 23 109q30 70 30 96q0 52 -47 52q-18 0 -32.5 -12t-14.5 -21q0 -5 9.5 -13.5t9.5 -20.5q0 -14 -9 -23.5t-25 -9.5q-18 0 -28.5 13t-10.5 33q0 39 31.5 66t77.5 27q49 0 84.5 -26t35.5 -70q0 -27 -13 -49t-53 -64q-24 -26 -37 -87zM271 440 q0 -18 -12 -30.5t-30 -12.5q-20 0 -31.5 12t-11.5 31q0 18 12.5 30t30.5 12q16 0 29 -12.5t13 -29.5zM609 -26l-565 274v10l565 274v-65l-432 -214l432 -214v-65z" />
+<glyph unicode="&#x2a7c;" d="M460 510h-31q0 55 23 109q30 70 30 96q0 52 -47 52q-18 0 -32.5 -12t-14.5 -21q0 -5 9.5 -13.5t9.5 -20.5q0 -14 -9.5 -23.5t-24.5 -9.5q-18 0 -28.5 13t-10.5 33q0 39 31.5 66t77.5 27q49 0 84.5 -26t35.5 -70q0 -27 -13 -49t-53 -64q-24 -26 -37 -87zM490 440 q0 -18 -12 -30.5t-30 -12.5q-20 0 -31.5 12t-11.5 31q0 18 12.5 30t30.5 12q16 0 29 -12.5t13 -29.5zM641 248l-565 -274v65l432 214l-432 214v65l565 -274v-10z" />
+<glyph unicode="&#x2a7d;" d="M621 67l-565 275v10l565 273v-63l-432 -215l432 -215v-65zM621 -137l-565 275v66l565 -275v-66z" />
+<glyph unicode="&#x2a7e;" d="M621 342l-565 -275v65l432 215l-432 215v63l565 -273v-10zM621 138l-565 -275v66l565 275v-66z" />
+<glyph unicode="&#x2a7f;" d="M549 347q0 -26 -17.5 -45t-45.5 -19q-29 0 -46.5 17.5t-17.5 46.5q0 27 19.5 45t44.5 18t44 -18t19 -45zM625 67l-565 275v10l565 273v-65l-432 -213l432 -215v-65zM625 -137l-565 275v66l565 -275v-66z" />
+<glyph unicode="&#x2a80;" d="M625 342l-565 -275v65l432 215l-432 213v65l565 -273v-10zM263 348q0 -26 -17.5 -45t-45.5 -19q-29 0 -46.5 17.5t-17.5 46.5q0 27 19.5 45t44.5 18t44 -18t19 -45zM625 138l-565 -275v66l565 275v-66z" />
+<glyph unicode="&#x2a81;" d="M287 552q0 -26 -17.5 -45t-45.5 -19q-29 0 -46.5 17.5t-17.5 46.5q0 27 19.5 45t44.5 18t44 -18t19 -45zM625 67l-565 275v10l565 273v-65l-432 -213l432 -215v-65zM625 -137l-565 275v66l565 -275v-66z" />
+<glyph unicode="&#x2a82;" d="M525 552q0 -29 -17.5 -46.5t-46.5 -17.5q-28 0 -45.5 19t-17.5 45q0 27 19 45t44 18t44.5 -18t19.5 -45zM625 342l-565 -275v65l432 215l-432 213v65l565 -273v-10zM625 138l-565 -275v66l565 275v-66z" />
+<glyph unicode="&#x2a83;" d="M623 714q0 -26 -17.5 -45t-45.5 -19q-29 0 -46.5 17.5t-17.5 46.5q0 27 19.5 45t44.5 18t44 -18t19 -45zM625 67l-565 275v10l565 273v-65l-432 -213l432 -215v-65zM625 -137l-565 275v66l565 -275v-66z" />
+<glyph unicode="&#x2a84;" d="M189 714q0 -29 -17.5 -46.5t-46.5 -17.5q-28 0 -45.5 19t-17.5 45q0 27 19 45t44 18t44.5 -18t19.5 -45zM625 342l-565 -275v65l432 215l-432 213v65l565 -273v-10zM625 138l-565 -275v66l565 275v-66z" />
+<glyph unicode="&#x2a85;" d="M604 -61h33q-5 -74 -48 -139t-110 -65q-41 0 -95 32l-102 64q-49 32 -78 32q-49 0 -79 -39t-44 -99h-33q4 81 48.5 142.5t114.5 61.5q41 0 95 -32l102 -64q49 -32 79 -32q88 0 117 138zM604 175h33q-5 -74 -48 -139t-110 -65q-41 0 -95 32l-102 64q-49 32 -78 32 q-49 0 -79 -39t-44 -99h-33q4 81 48.5 142.5t114.5 61.5q41 0 95 -32l102 -64q49 -32 79 -32q88 0 117 138zM622 249l-565 244v10l565 243v-65l-432 -183l432 -186v-63z" />
+<glyph unicode="&#x2a86;" d="M604 -61h33q-5 -74 -48 -139t-110 -65q-41 0 -95 32l-102 64q-49 32 -78 32q-49 0 -79 -39t-44 -99h-33q4 81 48.5 142.5t114.5 61.5q41 0 95 -32l102 -64q49 -32 79 -32q88 0 117 138zM604 175h33q-5 -74 -48 -139t-110 -65q-41 0 -95 32l-102 64q-49 32 -78 32 q-49 0 -79 -39t-44 -99h-33q4 81 48.5 142.5t114.5 61.5q41 0 95 -32l102 -64q49 -32 79 -32q88 0 117 138zM629 493l-565 -244v63l432 186l-432 183v65l565 -243v-10z" />
+<glyph unicode="&#x2a87;" d="M625 70l-565 273v10l565 275v-65l-432 -215l432 -213v-65zM625 -120h-279l-60 -96h-59l60 96h-227v66h269l61 96h59l-61 -96h237v-66z" />
+<glyph unicode="&#x2a88;" horiz-adv-x="687" d="M621 343l-565 -273v63l432 215l-432 215v65l565 -275v-10zM621 -120h-279l-60 -96h-59l60 96h-227v66h269l61 96h59l-61 -96h237v-66z" />
+<glyph unicode="&#x2a89;" d="M621 249l-565 244v10l565 243v-65l-432 -183l432 -186v-63zM604 -61h33q-5 -74 -48 -139t-110 -65q-26 0 -58.5 13.5t-54 27t-57.5 39.5l-62 -124h-61l77 153q-33 19 -59 19q-49 0 -79 -39t-44 -99h-33q4 81 48.5 142.5t114.5 61.5q36 0 83 -25l59 116q-11 7 -32 22 l-33 22q-12 8 -28.5 17t-30 13.5t-25.5 4.5q-49 0 -79 -39t-44 -99h-33q4 81 48.5 142.5t114.5 61.5q12 0 24 -2.5t26 -8t24 -10t26.5 -14.5l24.5 -15l26 -17q18 -12 23 -16l64 127h61l-79 -155q34 -17 56 -17q88 0 117 138h33q-5 -74 -48 -139t-110 -65q-35 0 -79 23 l-59 -117l31 -21l32 -22l28.5 -16t29.5 -13t25 -4q88 0 117 138z" />
+<glyph unicode="&#x2a8a;" d="M621 492l-565 -243v65l432 183l-432 186v63l565 -244v-10zM604 -61h33q-5 -74 -48 -139t-110 -65q-26 0 -58.5 13.5t-54 27t-57.5 39.5l-62 -124h-61l77 153q-33 19 -59 19q-49 0 -79 -39t-44 -99h-33q4 81 48.5 142.5t114.5 61.5q36 0 83 -25l59 116q-11 7 -32 22 l-33 22q-12 8 -28.5 17t-30 13.5t-25.5 4.5q-49 0 -79 -39t-44 -99h-33q4 81 48.5 142.5t114.5 61.5q12 0 24 -2.5t26 -8t24 -10t26.5 -14.5l24.5 -15l26 -17q18 -12 23 -16l64 127h61l-79 -155q34 -17 56 -17q88 0 117 138h33q-5 -74 -48 -139t-110 -65q-35 0 -79 23 l-59 -117l31 -21l32 -22l28.5 -16t29.5 -13t25 -4q88 0 117 138z" />
+<glyph unicode="&#x2a8b;" d="M621 493l-565 213v10l565 214v-65l-407 -154l407 -155v-63zM621 320h-565v66h565v-66zM621 120h-565v66h565v-66zM621 -212l-565 -212v63l407 154l-407 155v65l565 -215v-10z" />
+<glyph unicode="&#x2a8c;" d="M621 706l-565 -213v63l407 155l-407 154v65l565 -214v-10zM621 320h-565v66h565v-66zM621 120h-565v66h565v-66zM621 -424l-565 212v10l565 215v-65l-407 -155l407 -154v-63z" />
+<glyph unicode="&#x2a8d;" d="M604 175h33q-5 -74 -48 -139t-110 -65q-41 0 -95 32l-102 64q-49 32 -78 32q-49 0 -79 -39t-44 -99h-33q4 81 48.5 142.5t114.5 61.5q41 0 95 -32l102 -64q49 -32 79 -32q88 0 117 138zM625 249l-565 244v10l565 243v-65l-432 -183l432 -184v-65zM625 -176h-565v66h565 v-66z" />
+<glyph unicode="&#x2a8e;" d="M604 175h33q-5 -74 -48 -139t-110 -65q-41 0 -95 32l-102 64q-49 32 -78 32q-49 0 -79 -39t-44 -99h-33q4 81 48.5 142.5t114.5 61.5q41 0 95 -32l102 -64q49 -32 79 -32q88 0 117 138zM625 492l-565 -243v65l423 183l-423 184v65l565 -244v-10zM625 -176h-565v66h565 v-66z" />
+<glyph unicode="&#x2a8f;" d="M616 360h33q-5 -74 -48 -139t-110 -65q-41 0 -95 32l-102 64q-49 32 -78 32q-49 0 -79 -39t-44 -99h-33q4 81 48.5 142.5t114.5 61.5q41 0 95 -32l102 -64q49 -32 79 -32q88 0 117 138zM625 404l-565 227v10l565 226v-65l-407 -166l407 -167v-65zM625 -133l-565 -228v65 l407 168l-407 165v65l565 -225v-10z" />
+<glyph unicode="&#x2a90;" d="M616 360h33q-5 -74 -48 -139t-110 -65q-41 0 -95 32l-102 64q-49 32 -78 32q-49 0 -79 -39t-44 -99h-33q4 81 48.5 142.5t114.5 61.5q41 0 95 -32l102 -64q49 -32 79 -32q88 0 117 138zM625 632l-565 -228v65l407 168l-407 165v65l565 -225v-10zM625 -361l-565 227v10 l565 226v-65l-407 -166l407 -167v-65z" />
+<glyph unicode="&#x2a91;" d="M620 381l-565 226v10l565 227v-65l-407 -167l407 -166v-65zM630 240l-565 -225v65l407 165l-407 168v65l565 -228v-10zM625 -138h-565v66h565v-66zM625 -338h-565v66h565v-66z" />
+<glyph unicode="&#x2a92;" d="M630 606l-565 -225v65l407 165l-407 168v65l565 -228v-10zM620 15l-565 226v10l565 227v-65l-407 -167l407 -166v-65zM625 -138h-565v66h565v-66zM625 -338h-565v66h565v-66z" />
+<glyph unicode="&#x2a93;" d="M625 403l-565 226v10l565 227v-65l-407 -167l407 -166v-65zM625 206l-565 225v65l565 -225v-65zM625 62l-565 -226v65l407 166l-407 167v65l565 -227v-10zM625 -136l-565 -225v65l565 225v-65z" />
+<glyph unicode="&#x2a94;" d="M625 629l-565 -226v65l407 166l-407 167v65l565 -227v-10zM625 431l-565 -225v65l565 225v-65zM625 -164l-565 226v10l565 227v-65l-407 -167l407 -166v-65zM625 -361l-565 225v65l565 -225v-65z" />
+<glyph unicode="&#x2a95;" d="M621 -122l-565 273v10l565 275v-65l-432 -215l432 -215v-63zM621 574l-565 -275v66l565 275v-66z" />
+<glyph unicode="&#x2a96;" d="M621 151l-565 -273v63l432 215l-432 215v65l565 -275v-10zM621 299l-565 275v66l565 -275v-66z" />
+<glyph unicode="&#x2a97;" d="M621 574l-565 -275v66l565 275v-66zM545 155q0 -27 -19.5 -45t-44.5 -18t-44 18t-19 45q0 26 17.5 45t45.5 19q29 0 46.5 -17.5t17.5 -46.5zM621 -122l-565 274v10l565 274v-65l-432 -214l432 -214v-65z" />
+<glyph unicode="&#x2a98;" d="M621 299l-565 275v66l565 -275v-66zM621 152l-565 -274v65l432 214l-432 214v65l565 -274v-10zM259 159q0 -26 -17.5 -45t-45.5 -19q-29 0 -46.5 17.5t-17.5 46.5q0 27 19.5 45t44.5 18t44 -18t19 -45z" />
+<glyph unicode="&#x2a99;" d="M625 652h-565v66h565v-66zM625 452h-565v66h565v-66zM625 -211l-565 273v10l565 275v-65l-432 -215l432 -213v-65z" />
+<glyph unicode="&#x2a9a;" d="M625 652h-565v66h565v-66zM625 452h-565v66h565v-66zM625 63l-565 -274v65l432 214l-432 214v65l565 -274v-10z" />
+<glyph unicode="&#x2a9b;" d="M625 660l-565 -275v66l565 275v-66zM625 466l-565 -275v66l565 275v-66zM625 -220l-565 274v10l565 274v-65l-432 -214l432 -214v-65z" />
+<glyph unicode="&#x2a9c;" d="M625 385l-565 275v66l565 -275v-66zM625 191l-565 275v66l565 -275v-66zM625 54l-565 -274v65l432 214l-432 214v65l565 -274v-10z" />
+<glyph unicode="&#x2a9d;" d="M609 664h33q-5 -74 -48 -139t-110 -65q-41 0 -94 32l-103 64q-49 32 -78 32q-49 0 -79 -39t-44 -99h-33q4 81 48.5 142.5t114.5 61.5q41 0 94 -32l103 -64q49 -32 79 -32q88 0 117 138zM620 -164l-565 274v10l565 274v-65l-432 -214l432 -214v-65z" />
+<glyph unicode="&#x2a9e;" d="M599 664h33q-5 -74 -48 -139t-110 -65q-41 0 -94 32l-103 64q-49 32 -78 32q-49 0 -79 -39t-44 -99h-33q4 81 48.5 142.5t114.5 61.5q41 0 94 -32l103 -64q49 -32 79 -32q88 0 117 138zM630 110l-565 -274v65l432 214l-432 214v65l565 -274v-10z" />
+<glyph unicode="&#x2a9f;" d="M604 774h33q-5 -74 -48 -139t-110 -65q-41 0 -95 32l-102 64q-49 32 -78 32q-49 0 -79 -39t-44 -99h-33q4 81 48.5 142.5t114.5 61.5q41 0 95 -32l102 -64q49 -32 79 -32q88 0 117 138zM625 66l-565 215v10l565 212v-65l-400 -152l400 -155v-65zM625 -66h-565v66h565v-66 zM625 -267h-565v66h565v-66z" />
+<glyph unicode="&#x2aa0;" d="M604 774h33q-5 -74 -48 -139t-110 -65q-41 0 -95 32l-102 64q-49 32 -78 32q-49 0 -79 -39t-44 -99h-33q4 81 48.5 142.5t114.5 61.5q41 0 95 -32l102 -64q49 -32 79 -32q88 0 117 138zM625 278l-565 -212v65l400 152l-400 155v65l565 -215v-10zM625 -66h-565v66h565v-66 zM625 -267h-565v66h565v-66z" />
+<glyph unicode="&#x2aa1;" d="M609 105l-297 143v10l297 145v-68l-164 -82l164 -80v-68zM609 -26l-565 274v10l565 274v-65l-432 -214l432 -214v-65z" />
+<glyph unicode="&#x2aa2;" d="M641 248l-565 -274v65l432 214l-432 214v65l565 -274v-10zM373 248l-297 -145v68l164 82l-164 80v68l297 -143v-10z" />
+<glyph unicode="&#x2aa3;" horiz-adv-x="933" d="M908 51l-565 273v10l565 275v-65l-432 -215l432 -215v-63zM590 51l-565 273v10l565 275v-65l-432 -215l432 -215v-63zM908 -103h-883v66h883v-66z" />
+<glyph unicode="&#x2aa4;" horiz-adv-x="782" d="M722 -26l-331 160l-331 -160v65l261 129l-164 80v10l164 79l-261 130v65l331 -161l331 161v-65l-261 -130l164 -79v-10l-164 -80l261 -129v-65zM492 253l-101 50l-101 -50l101 -50z" />
+<glyph unicode="&#x2aa5;" horiz-adv-x="855" d="M795 -26l-355 274v10l355 274v-70l-261 -209l261 -209v-70zM415 248l-355 -274v70l261 209l-261 209v70l355 -274v-10z" />
+<glyph unicode="&#x2aa6;" d="M35 258l521 274q69 -130 69 -279t-69 -279l-521 274v10zM161 253l362 -192q36 95 36 193q0 95 -36 193z" />
+<glyph unicode="&#x2aa7;" d="M650 248l-521 -274q-69 130 -69 279t69 279l521 -274v-10zM524 253l-362 192q-36 -95 -36 -193q0 -95 36 -193z" />
+<glyph unicode="&#x2aa8;" d="M50 351l521 274q69 -130 69 -279t-69 -279l-521 274v10zM176 346l362 -192q36 95 36 193q0 95 -36 193zM615 -137l-565 275v66l565 -275v-66z" />
+<glyph unicode="&#x2aa9;" d="M635 342l-521 -274q-69 130 -69 279t69 279l521 -274v-10zM509 347l-362 192q-36 -95 -36 -193q0 -95 36 -193zM635 138l-565 -275v66l565 275v-66z" />
+<glyph unicode="&#x2aaa;" d="M609 -31l-564 274v20l564 274v-65l-375 -186h375v-66h-375l375 -186v-65z" />
+<glyph unicode="&#x2aab;" d="M640 243l-564 -274v65l375 186h-375v66h375l-375 186v65l564 -274v-20z" />
+<glyph unicode="&#x2aac;" d="M624 45l-564 274v20l564 274v-65l-375 -186h375v-66h-375l375 -186v-65zM625 -103h-565v66h565v-66z" />
+<glyph unicode="&#x2aad;" d="M625 319l-564 -274v65l375 186h-375v66h375l-375 186v65l564 -274v-20zM625 -103h-565v66h565v-66z" />
+<glyph unicode="&#x2aae;" d="M637 412h-209q-1 33 -24.5 59t-58.5 26q-39 0 -63 -26t-24 -59h-210v66h156q17 34 54 59.5t85 25.5q49 0 87.5 -26t51.5 -59h155v-66zM637 220h-589v66h589v-66zM637 28h-589v66h589v-66z" />
+<glyph unicode="&#x2aaf;" d="M621 128v-77q-84 112 -235 172.5t-322 73.5v66q171 13 322 73.5t235 172.5v-77q-35 -60 -133.5 -116.5t-200.5 -85.5q102 -29 200.5 -85.5t133.5 -116.5zM621 -103h-557v66h557v-66z" />
+<glyph unicode="&#x2ab0;" d="M621 363v-66q-171 -13 -322 -73.5t-235 -172.5v77q35 60 133.5 116.5t200.5 85.5q-102 29 -200.5 85.5t-133.5 116.5v77q84 -112 235 -172.5t322 -73.5zM621 -103h-557v66h557v-66z" />
+<glyph unicode="&#x2ab1;" d="M625 147v-77q-57 76 -155.5 131t-199 80.5t-210.5 34.5v66q110 9 210.5 34.5t199 80.5t155.5 131v-77q-35 -60 -136.5 -116t-205.5 -86q104 -30 205.5 -86t136.5 -116zM625 -120h-283l-60 -96h-59l60 96h-223v66h265l61 96h59l-61 -96h241v-66z" />
+<glyph unicode="&#x2ab2;" d="M625 382v-66q-110 -9 -210.5 -34.5t-199 -80.5t-155.5 -131v77q35 60 136.5 116t205.5 86q-104 30 -205.5 86t-136.5 116v77q57 -76 155.5 -131t199 -80.5t210.5 -34.5zM625 -120h-281l-60 -96h-59l60 96h-225v66h267l61 96h59l-61 -96h239v-66z" />
+<glyph unicode="&#x2ab3;" d="M625 236v-77q-57 76 -155.5 131t-199 80.5t-210.5 34.5v66q110 9 210.5 34.5t199 80.5t155.5 131v-77q-35 -60 -136.5 -116t-205.5 -86q104 -30 205.5 -86t136.5 -116zM625 -12h-565v66h565v-66zM625 -211h-565v66h565v-66z" />
+<glyph unicode="&#x2ab4;" d="M625 471v-66q-110 -9 -210.5 -34.5t-199 -80.5t-155.5 -131v77q35 60 136.5 116t205.5 86q-104 30 -205.5 86t-136.5 116v77q57 -76 155.5 -131t199 -80.5t210.5 -34.5zM625 -12h-565v66h565v-66zM625 -211h-565v66h565v-66z" />
+<glyph unicode="&#x2ab5;" d="M622 266v-77q-84 112 -235 172.5t-322 73.5v66q171 13 322 73.5t235 172.5v-77q-35 -60 -133.5 -116.5t-200.5 -85.5q102 -29 200.5 -85.5t133.5 -116.5zM622 -184h-337l-47 -76h-60l47 76h-160v66h201l84 134h-285v66h326l48 76h60l-48 -76h171v-66h-212l-84 -134h296 v-66z" />
+<glyph unicode="&#x2ab6;" d="M622 501v-66q-171 -13 -322 -73.5t-235 -172.5v77q35 60 133.5 116.5t200.5 85.5q-102 29 -200.5 85.5t-133.5 116.5v77q84 -112 235 -172.5t322 -73.5zM622 -184h-332l-47 -76h-60l47 76h-165v66h206l84 134h-290v66h331l48 76h60l-48 -76h166v-66h-207l-84 -134h291 v-66z" />
+<glyph unicode="&#x2ab7;" d="M604 -61h33q-5 -74 -48 -139t-110 -65q-41 0 -95 32l-102 64q-49 32 -78 32q-49 0 -79 -39t-44 -99h-33q4 81 48.5 142.5t114.5 61.5q41 0 95 -32l102 -64q49 -32 79 -32q88 0 117 138zM604 175h33q-5 -74 -48 -139t-110 -65q-41 0 -95 32l-102 64q-49 32 -78 32 q-49 0 -79 -39t-44 -99h-33q4 81 48.5 142.5t114.5 61.5q41 0 95 -32l102 -64q49 -32 79 -32q88 0 117 138zM621 326v-77q-43 58 -107 99t-143 64t-149 34.5t-158 18.5v66q88 7 158 18.5t149 34.5t143 64t107 99v-77q-36 -62 -136 -111t-198 -61q98 -12 198 -61t136 -111z " />
+<glyph unicode="&#x2ab8;" d="M604 -61h33q-5 -74 -48 -139t-110 -65q-41 0 -95 32l-102 64q-49 32 -78 32q-49 0 -79 -39t-44 -99h-33q4 81 48.5 142.5t114.5 61.5q41 0 95 -32l102 -64q49 -32 79 -32q88 0 117 138zM604 175h33q-5 -74 -48 -139t-110 -65q-41 0 -95 32l-102 64q-49 32 -78 32 q-49 0 -79 -39t-44 -99h-33q4 81 48.5 142.5t114.5 61.5q41 0 95 -32l102 -64q49 -32 79 -32q88 0 117 138zM621 531v-66q-88 -7 -158 -18.5t-149 -34.5t-143 -64t-107 -99v77q36 62 136 111t198 61q-98 12 -198 61t-136 111v77q43 -58 107 -99t143 -64t149 -34.5t158 -18.5 z" />
+<glyph unicode="&#x2ab9;" d="M622 326v-77q-43 58 -107 99t-143 64t-149 34.5t-158 18.5v66q88 7 158 18.5t149 34.5t143 64t107 99v-77q-36 -62 -136 -111t-198 -61q98 -12 198 -61t136 -111zM604 -61h33q-5 -74 -48 -139t-110 -65q-26 0 -58.5 13.5t-54 27t-57.5 39.5l-62 -124h-61l77 153 q-33 19 -59 19q-49 0 -79 -39t-44 -99h-33q4 81 48.5 142.5t114.5 61.5q36 0 83 -25l59 116q-11 7 -32 22l-33 22q-12 8 -28.5 17t-30 13.5t-25.5 4.5q-49 0 -79 -39t-44 -99h-33q4 81 48.5 142.5t114.5 61.5q12 0 24 -2.5t26 -8t24 -10t26.5 -14.5l24.5 -15l26 -17 q18 -12 23 -16l64 127h61l-79 -155q34 -17 56 -17q88 0 117 138h33q-5 -74 -48 -139t-110 -65q-35 0 -79 23l-59 -117l31 -21l32 -22l28.5 -16t29.5 -13t25 -4q88 0 117 138z" />
+<glyph unicode="&#x2aba;" d="M622 531v-66q-88 -7 -158 -18.5t-149 -34.5t-143 -64t-107 -99v77q36 62 136 111t198 61q-98 12 -198 61t-136 111v77q43 -58 107 -99t143 -64t149 -34.5t158 -18.5zM604 -61h33q-5 -74 -48 -139t-110 -65q-26 0 -58.5 13.5t-54 27t-57.5 39.5l-62 -124h-61l77 153 q-33 19 -59 19q-49 0 -79 -39t-44 -99h-33q4 81 48.5 142.5t114.5 61.5q36 0 83 -25l59 116q-11 7 -32 22l-33 22q-12 8 -28.5 17t-30 13.5t-25.5 4.5q-49 0 -79 -39t-44 -99h-33q4 81 48.5 142.5t114.5 61.5q12 0 24 -2.5t26 -8t24 -10t26.5 -14.5l24.5 -15l26 -17 q18 -12 23 -16l64 127h61l-79 -155q34 -17 56 -17q88 0 117 138h33q-5 -74 -48 -139t-110 -65q-35 0 -79 23l-59 -117l31 -21l32 -22l28.5 -16t29.5 -13t25 -4q88 0 117 138z" />
+<glyph unicode="&#x2abb;" horiz-adv-x="933" d="M908 51v-77q-57 76 -149 131t-184.5 80.5t-191.5 34.5v66q99 9 191.5 34.5t184.5 80.5t149 131v-77q-35 -60 -127 -116.5t-185 -85.5q93 -29 185 -85.5t127 -116.5zM550 51v-77q-57 76 -149 131t-184.5 80.5t-191.5 34.5v66q99 9 191.5 34.5t184.5 80.5t149 131v-77 q-35 -60 -127 -116.5t-185 -85.5q93 -29 185 -85.5t127 -116.5z" />
+<glyph unicode="&#x2abc;" horiz-adv-x="933" d="M908 286v-66q-99 -9 -191.5 -34.5t-184.5 -80.5t-149 -131v77q35 60 127 116.5t185 85.5q-93 29 -185 85.5t-127 116.5v77q57 -76 149 -131t184.5 -80.5t191.5 -34.5zM550 286v-66q-99 -9 -191.5 -34.5t-184.5 -80.5t-149 -131v77q35 60 127 116.5t185 85.5 q-93 29 -185 85.5t-127 116.5v77q57 -76 149 -131t184.5 -80.5t191.5 -34.5z" />
+<glyph unicode="&#x2abd;" d="M449 252q0 -25 -18 -44t-45 -19q-26 0 -45 17.5t-19 45.5q0 29 17.5 46.5t46.5 17.5q27 0 45 -19.5t18 -44.5zM625 -26h-294q-117 0 -194 82.5t-77 196.5t78 196.5t196 82.5h291v-66h-291q-84 0 -146 -65.5t-62 -147.5t62.5 -147.5t146.5 -65.5h290v-66z" />
+<glyph unicode="&#x2abe;" d="M60 532h294q117 0 194 -82.5t77 -196.5t-78 -196.5t-196 -82.5h-291v66h291q84 0 146 65.5t62 147.5t-62.5 147.5t-146.5 65.5h-290v66zM363 254q0 -29 -17.5 -46.5t-46.5 -17.5q-27 0 -45 19.5t-18 44.5t18 44t45 19q26 0 45 -17.5t19 -45.5z" />
+<glyph unicode="&#x2abf;" d="M625 207h-373q-84 0 -138 58.5t-54 141.5q0 82 55 141t141 59h369v-66h-372q-52 0 -89.5 -41t-37.5 -93q0 -51 37.5 -92.5t89.5 -41.5h372v-66zM495 7h-109v-110h-50v110h-109v50h109v110h50v-110h109v-50z" />
+<glyph unicode="&#x2ac0;" d="M60 607h373q84 0 138 -58.5t54 -141.5q0 -82 -55 -141t-141 -59h-369v66h372q52 0 89.5 41t37.5 93q0 51 -37.5 92.5t-89.5 41.5h-372v66zM458 7h-109v-110h-50v110h-109v50h109v110h50v-110h109v-50z" />
+<glyph unicode="&#x2ac1;" d="M625 207h-373q-84 0 -138 58.5t-54 141.5q0 82 55 141t141 59h369v-66h-372q-52 0 -89.5 -41t-37.5 -93q0 -51 37.5 -92.5t89.5 -41.5h372v-66zM495 -68l-35 -35l-99 99l-98 -99l-36 36l99 98l-99 99l35 35l99 -99l98 99l36 -36l-99 -98z" />
+<glyph unicode="&#x2ac2;" d="M60 607h369q86 0 141 -59t55 -141q0 -83 -54 -141.5t-138 -58.5h-373v66h372q52 0 89.5 41.5t37.5 92.5q0 52 -37.5 93t-89.5 41h-372v66zM458 -67l-36 -36l-98 99l-99 -99l-35 35l99 99l-99 98l36 36l98 -99l99 99l35 -35l-99 -99z" />
+<glyph unicode="&#x2ac3;" d="M406 646q0 -26 -17.5 -45t-45.5 -19q-29 0 -46.5 17.5t-17.5 46.5q0 27 19.5 45t44.5 18t44 -18t19 -45zM625 96h-373q-84 0 -138 58.5t-54 141.5q0 82 55 141t141 59h369v-66h-372q-52 0 -89.5 -41t-37.5 -93q0 -51 37.5 -92.5t89.5 -41.5h372v-66zM625 -103h-555v66 h555v-66z" />
+<glyph unicode="&#x2ac4;" d="M406 646q0 -29 -17.5 -46.5t-46.5 -17.5q-28 0 -45.5 19t-17.5 45q0 27 19 45t44 18t44.5 -18t19.5 -45zM60 496h369q86 0 141 -59t55 -141q0 -83 -54 -141.5t-138 -58.5h-373v66h372q52 0 89.5 41.5t37.5 92.5q0 52 -37.5 93t-89.5 41h-372v66zM615 -103h-555v66h555 v-66z" />
+<glyph unicode="&#x2ac5;" d="M622 161h-291q-116 0 -191.5 82.5t-75.5 196.5t76.5 195.5t193.5 81.5h288v-66h-288q-84 0 -144 -64.5t-60 -146.5t60.5 -147.5t144.5 -65.5h287v-66zM622 -12h-548v66h548v-66zM622 -211h-548v66h548v-66z" />
+<glyph unicode="&#x2ac6;" d="M65 717h288q117 0 193.5 -81.5t76.5 -195.5t-75.5 -196.5t-191.5 -82.5h-291v66h287q84 0 144.5 65.5t60.5 147.5t-60 146.5t-144 64.5h-288v66zM623 -12h-558v66h558v-66zM623 -211h-558v66h558v-66z" />
+<glyph unicode="&#x2ac7;" d="M625 107h-294q-117 0 -194 82.5t-77 196.5t78 196.5t196 82.5h291v-66h-291q-84 0 -146 -65.5t-62 -147.5t62.5 -147.5t146.5 -65.5h290v-66zM593 50h32q-3 -46 -20.5 -91t-52.5 -79t-79 -34q-39 0 -90 32l-98 64q-47 32 -75 32q-47 0 -76 -39t-42 -99h-32 q4 81 46.5 142.5t109.5 61.5q39 0 90 -32l99 -64q47 -32 76 -32q85 0 112 138z" />
+<glyph unicode="&#x2ac8;" d="M60 665h294q117 0 194 -82.5t77 -196.5t-78 -196.5t-196 -82.5h-291v66h291q84 0 146 65.5t62 147.5t-62.5 147.5t-146.5 65.5h-290v66zM593 50h32q-3 -46 -20.5 -91t-52.5 -79t-79 -34q-39 0 -90 32l-98 64q-47 32 -75 32q-47 0 -76 -39t-42 -99h-32q4 81 46.5 142.5 t109.5 61.5q39 0 90 -32l99 -64q47 -32 76 -32q85 0 112 138z" />
+<glyph unicode="&#x2ac9;" d="M625 249h-326q-105 0 -171.5 72.5t-66.5 175.5t68.5 176t174.5 73h321v-66h-326q-71 0 -121.5 -56t-50.5 -126q0 -69 50.5 -126t121.5 -57h326v-66zM593 176h32q-3 -46 -20.5 -91t-52.5 -79t-79 -34q-39 0 -90 32l-98 64q-47 32 -75 32q-47 0 -76 -39t-42 -99h-32 q4 81 46.5 142.5t109.5 61.5q39 0 90 -32l99 -64q47 -32 76 -32q85 0 112 138zM593 -60h32q-3 -46 -20.5 -91t-52.5 -79t-79 -34q-39 0 -90 32l-98 64q-47 32 -75 32q-47 0 -76 -39t-42 -99h-32q4 81 46.5 142.5t109.5 61.5q39 0 90 -32l99 -64q47 -32 76 -32q85 0 112 138z " />
+<glyph unicode="&#x2aca;" d="M60 746h321q106 0 174.5 -73t68.5 -176t-66.5 -175.5t-171.5 -72.5h-326v66h326q71 0 121.5 57t50.5 126q0 70 -50.5 126t-121.5 56h-326v66zM593 176h32q-3 -46 -20.5 -91t-52.5 -79t-79 -34q-39 0 -90 32l-98 64q-47 32 -75 32q-47 0 -76 -39t-42 -99h-32 q4 81 46.5 142.5t109.5 61.5q39 0 90 -32l99 -64q47 -32 76 -32q85 0 112 138zM593 -60h32q-3 -46 -20.5 -91t-52.5 -79t-79 -34q-39 0 -90 32l-98 64q-47 32 -75 32q-47 0 -76 -39t-42 -99h-32q4 81 46.5 142.5t109.5 61.5q39 0 90 -32l99 -64q47 -32 76 -32q85 0 112 138z " />
+<glyph unicode="&#x2acb;" d="M619 161h-291q-116 0 -191.5 82.5t-75.5 196.5t76.5 195.5t193.5 81.5h288v-66h-288q-84 0 -144 -64.5t-60 -146.5t60.5 -147.5t144.5 -65.5h287v-66zM619 -211h-313l-60 -108h-62l60 108h-173v66h210l74 133h-284v66h320l48 85h62l-48 -85h166v-66h-202l-74 -133h276 v-66z" />
+<glyph unicode="&#x2acc;" d="M66 717h291q116 0 191.5 -82.5t75.5 -196.5t-76.5 -195.5t-193.5 -81.5h-288v66h288q84 0 144 64.5t60 146.5t-60.5 147.5t-144.5 65.5h-287v66zM614 -211h-312l-60 -108h-62l60 108h-174v66h211l74 133h-285v66h321l48 85h62l-48 -85h165v-66h-201l-74 -133h275v-66z " />
+<glyph unicode="&#x2acd;" horiz-adv-x="1352" d="M1288 492h-1158v-479h546v-66h-612v611h1224v-66z" />
+<glyph unicode="&#x2ace;" horiz-adv-x="1352" d="M1288 -53h-612v66h546v479h-1158v66h1224v-611z" />
+<glyph unicode="&#x2acf;" d="M615 -26h-294q-117 0 -194 82.5t-77 196.5t78 196.5t196 82.5h291v-558zM549 40v426h-225q-84 0 -146 -65.5t-62 -147.5t62.5 -147.5t146.5 -65.5h224z" />
+<glyph unicode="&#x2ad0;" d="M70 532h294q117 0 194 -82.5t77 -196.5t-78 -196.5t-196 -82.5h-291v558zM136 40h225q84 0 146 65.5t62 147.5t-62.5 147.5t-146.5 65.5h-224v-426z" />
+<glyph unicode="&#x2ad1;" d="M625 51h-294q-117 0 -194 82.5t-77 196.5t78 196.5t196 82.5h291v-558zM559 117v426h-225q-84 0 -146 -65.5t-62 -147.5t62.5 -147.5t146.5 -65.5h224zM626 -103h-556v66h556v-66z" />
+<glyph unicode="&#x2ad2;" d="M60 609h294q117 0 194 -82.5t77 -196.5t-78 -196.5t-196 -82.5h-291v558zM126 117h225q84 0 146 65.5t62 147.5t-62.5 147.5t-146.5 65.5h-224v-426zM615 -103h-555v66h555v-66z" />
+<glyph unicode="&#x2ad3;" d="M615 315h-363q-84 0 -138 58.5t-54 141.5q0 82 55 141t141 59h359v-66h-362q-52 0 -89.5 -41t-37.5 -93q0 -51 37.5 -92.5t89.5 -41.5h362v-66zM70 191h363q84 0 138 -58.5t54 -141.5q0 -82 -55 -141t-141 -59h-359v66h362q52 0 89.5 41t37.5 93q0 51 -37.5 92.5 t-89.5 41.5h-362v66z" />
+<glyph unicode="&#x2ad4;" d="M70 715h363q84 0 138 -58.5t54 -141.5q0 -82 -55 -141t-141 -59h-359v66h362q52 0 89.5 41t37.5 93q0 51 -37.5 92.5t-89.5 41.5h-362v66zM615 -209h-363q-84 0 -138 58.5t-54 141.5q0 82 55 141t141 59h359v-66h-362q-52 0 -89.5 -41t-37.5 -93q0 -51 37.5 -92.5 t89.5 -41.5h362v-66z" />
+<glyph unicode="&#x2ad5;" d="M625 315h-373q-84 0 -138 58.5t-54 141.5q0 82 55 141t141 59h369v-66h-372q-52 0 -89.5 -41t-37.5 -93q0 -51 37.5 -92.5t89.5 -41.5h372v-66zM625 -209h-373q-84 0 -138 58.5t-54 141.5q0 82 55 141t141 59h369v-66h-372q-52 0 -89.5 -41t-37.5 -93q0 -51 37.5 -92.5 t89.5 -41.5h372v-66z" />
+<glyph unicode="&#x2ad6;" d="M60 715h373q84 0 138 -58.5t54 -141.5q0 -82 -55 -141t-141 -59h-369v66h372q52 0 89.5 41t37.5 93q0 51 -37.5 92.5t-89.5 41.5h-372v66zM60 191h373q84 0 138 -58.5t54 -141.5q0 -82 -55 -141t-141 -59h-369v66h372q52 0 89.5 41t37.5 93q0 51 -37.5 92.5t-89.5 41.5 h-372v66z" />
+<glyph unicode="&#x2ad7;" horiz-adv-x="1250" d="M1190 -26h-274q-117 0 -194 82.5t-77 196.5t78 196.5t196 82.5h271v-66h-271q-84 0 -146 -65.5t-62 -147.5t62.5 -147.5t146.5 -65.5h270v-66zM60 532h271q118 0 196 -82.5t78 -196.5t-77 -196.5t-194 -82.5h-274v66h270q84 0 146.5 65.5t62.5 147.5t-62 147.5t-146 65.5 h-271v66z" />
+<glyph unicode="&#x2ad8;" horiz-adv-x="1250" d="M1190 -26h-274q-110 0 -185.5 74t-84.5 180h-43q-9 -106 -84 -180t-185 -74h-274v66h270q77 0 137 56.5t70 131.5h-169v50h169q-10 75 -69.5 131.5t-136.5 56.5h-271v66h271q110 0 186.5 -74t85.5 -180h43q9 106 85.5 180t187.5 74h271v-66h-271q-77 0 -137 -56.5 t-70 -131.5h170v-50h-170q10 -75 70.5 -131.5t137.5 -56.5h270v-66z" />
+<glyph unicode="&#x2ad9;" horiz-adv-x="620" d="M572 -31h-66v296q0 75 -47 132t-116 70v-498h-66v498q-70 -12 -116.5 -69.5t-46.5 -133.5v-295h-66v299q0 118 74.5 193t187.5 75q112 0 187 -76t75 -195v-296z" />
+<glyph unicode="&#x2ada;" horiz-adv-x="620" d="M572 -31h-66v296q0 76 -47 133t-116 70v-596h-66v596q-70 -12 -116.5 -70t-46.5 -134v-295h-66v299q0 109 64 182t165 84v97h-124v66h314v-66h-124v-97q100 -12 164.5 -86t64.5 -183v-296z" />
+<glyph unicode="&#x2adb;" horiz-adv-x="620" d="M572 0h-66v296q0 76 -47 133t-116 70v-596h-66v596q-70 -12 -116.5 -70t-46.5 -134v-295h-66v299q0 109 64 182t165 84v130h66v-130q100 -12 164.5 -86t64.5 -183v-296z" />
+<glyph unicode="&#x2adc;" horiz-adv-x="620" d="M572 327v-70q0 -114 -71.5 -190.5t-190.5 -76.5q-100 0 -168 57l-56 -57h-75l94 96q-57 72 -57 175v66h66v-66q0 -69 39 -126l124 127v295h66v-227l154 158h75l-229 -235v-196q70 12 116.5 69.5t46.5 134.5v66h66zM277 57v129l-87 -89q39 -32 87 -40z" />
+<glyph unicode="&#x2add;" horiz-adv-x="620" d="M572 327v-70q0 -114 -71.5 -190.5t-190.5 -76.5q-118 0 -190 78.5t-72 192.5v66h66v-66q0 -78 47 -135t116 -69v500h66v-500q70 12 116.5 69.5t46.5 134.5v66h66z" />
+<glyph unicode="&#x2ade;" horiz-adv-x="497" d="M433 0h-66v298h-303v66h303v298h66v-662z" />
+<glyph unicode="&#x2adf;" d="M637 305h-262v-305h-66v305h-261v66h589v-66z" />
+<glyph unicode="&#x2ae0;" d="M637 0h-589v66h262v305h66v-305h261v-66z" />
+<glyph unicode="&#x2ae1;" d="M637 0h-589v66h262v596h66v-596h261v-66zM513 309l50 -26q36 -18 52 -37t16 -47q0 -34 -26.5 -58.5t-66.5 -24.5q-30 0 -52 9.5t-26 9.5t-6.5 -1.5t-3.5 -3.5l-3 -4q-2 -3 -3 -5h-19v94h21q11 -43 28.5 -59.5t52.5 -16.5q26 0 40.5 12t14.5 30q0 32 -38 51l-39 19 q-73 35 -73 84q0 36 27 59t67 23q20 0 39 -9.5t28 -9.5q7 0 13 6h12v-90h-21q-4 43 -21.5 62.5t-50.5 19.5q-49 0 -49 -45q0 -23 37 -42z" />
+<glyph unicode="&#x2ae2;" d="M625 106h-499v-106h-66v662h66v-106h499v-66h-499v-126h499v-66h-499v-126h499v-66z" />
+<glyph unicode="&#x2ae3;" horiz-adv-x="860" d="M603 0h-66v298h-491v66h491v298h66v-662zM803 0h-66v662h66v-662z" />
+<glyph unicode="&#x2ae4;" d="M625 0h-66v198h-499v66h499v134h-499v66h499v198h66v-662z" />
+<glyph unicode="&#x2ae5;" horiz-adv-x="860" d="M803 0h-66v662h66v-662zM603 0h-66v198h-491v66h491v134h-491v66h491v198h66v-662z" />
+<glyph unicode="&#x2ae6;" d="M626 298h-303v-298h-66v298h-134v-298h-66v662h66v-298h134v298h66v-298h303v-66z" />
+<glyph unicode="&#x2ae7;" d="M637 305h-262v-305h-66v305h-261v66h589v-66zM637 505h-589v66h589v-66z" />
+<glyph unicode="&#x2ae8;" d="M637 200h-589v66h262v305h66v-305h261v-66zM637 0h-589v66h589v-66z" />
+<glyph unicode="&#x2ae9;" d="M637 120h-262v-305h-66v305h-261v66h589v-66zM637 320h-589v66h261v305h66v-305h262v-66z" />
+<glyph unicode="&#x2aea;" d="M637 596h-162v-596h-66v596h-134v-596h-66v596h-161v66h589v-66z" />
+<glyph unicode="&#x2aeb;" d="M637 0h-589v66h162v596h66v-596h134v596h66v-596h161v-66z" />
+<glyph unicode="&#x2aec;" horiz-adv-x="600" d="M552 18h-66v205h-438v66h438v134h-438v66h504v-471z" />
+<glyph unicode="&#x2aed;" horiz-adv-x="600" d="M552 223h-438v-205h-66v471h504v-66h-438v-134h438v-66z" />
+<glyph unicode="&#x2aee;" horiz-adv-x="404" d="M381 186l-24 -53l-122 62v-384h-66v418l-146 75l24 52l122 -62v396h66v-430z" />
+<glyph unicode="&#x2aef;" horiz-adv-x="502" d="M218 -154v518q-51 11 -84 52t-33 94q0 62 44 106t106 44t106 -44t44 -106q0 -53 -33 -94t-84 -52v-518h-66zM351 510q0 41 -29.5 70.5t-70.5 29.5t-70.5 -29.5t-29.5 -70.5t29.5 -70.5t70.5 -29.5t70.5 29.5t29.5 70.5z" />
+<glyph unicode="&#x2af0;" horiz-adv-x="502" d="M284 660v-518q51 -11 84 -52t33 -94q0 -62 -44 -106t-106 -44t-106 44t-44 106q0 53 33 94t84 52v518h66zM351 -4q0 41 -29.5 70.5t-70.5 29.5t-70.5 -29.5t-29.5 -70.5t29.5 -70.5t70.5 -29.5t70.5 29.5t29.5 70.5z" />
+<glyph unicode="&#x2af1;" horiz-adv-x="502" d="M284 627v-518q51 -11 84 -52t33 -94q0 -62 -44 -106t-106 -44t-106 44t-44 106q0 53 33 94t84 52v518h-116v66h298v-66h-116zM351 -37q0 41 -29.5 70.5t-70.5 29.5t-70.5 -29.5t-29.5 -70.5t29.5 -70.5t70.5 -29.5t70.5 29.5t29.5 70.5z" />
+<glyph unicode="&#x2af2;" horiz-adv-x="523" d="M513 228h-119v-417h-66v417h-133v-417h-66v417h-119v50h119v417h66v-417h133v417h66v-417h119v-50z" />
+<glyph unicode="&#x2af3;" d="M604 360h33q-5 -74 -48 -139t-110 -65h-4v-345h-66v363q-27 13 -77 46l-56 37v-446h-66v473h-6q-49 0 -79 -39t-44 -99h-33q4 80 48 141.5t114 62.5v345h66v-361q20 -9 42 -23l50 -33l41 -26v443h66v-472q4 -1 12 -1q88 0 117 138z" />
+<glyph unicode="&#x2af4;" d="M555 -189h-66v884h66v-884zM376 -189h-66v884h66v-884zM197 -189h-66v884h66v-884z" />
+<glyph unicode="&#x2af5;" d="M674 228h-119v-417h-66v417h-113v-417h-66v417h-113v-417h-66v417h-119v50h119v417h66v-417h113v417h66v-417h113v417h66v-417h119v-50z" />
+<glyph unicode="&#x2af6;" d="M406 545q0 -26 -17.5 -45t-45.5 -19q-29 0 -46.5 17.5t-17.5 46.5q0 27 19.5 45t44.5 18t44 -18t19 -45zM406 254q0 -26 -17.5 -45t-45.5 -19q-29 0 -46.5 17.5t-17.5 46.5q0 27 19.5 45t44.5 18t44 -18t19 -45zM406 -38q0 -26 -17.5 -45t-45.5 -19q-29 0 -46.5 17.5 t-17.5 46.5q0 27 19.5 45t44.5 18t44 -18t19 -45z" />
+<glyph unicode="&#x2af7;" horiz-adv-x="1170" d="M1080 103l-367 145v10l367 145v-65l-208 -85l208 -85v-65zM1080 -26l-694 274v10l694 274v-65l-526 -214l526 -214v-65zM1080 -155l-1022 403v10l1022 403v-65l-843 -344l843 -342v-65z" />
+<glyph unicode="&#x2af8;" horiz-adv-x="1170" d="M1112 248l-1022 -403v65l843 344l-843 342v65l1022 -403v-10zM784 248l-694 -274v65l526 214l-526 214v65l694 -274v-10zM457 248l-367 -145v65l208 85l-208 85v65l367 -145v-10z" />
+<glyph unicode="&#x2af9;" d="M625 168l-565 274v10l565 274v-65l-432 -214l432 -214v-65zM625 -26l-565 275v66l565 -275v-66zM625 -220l-565 275v66l565 -275v-66z" />
+<glyph unicode="&#x2afa;" d="M625 442l-565 -274v65l432 214l-432 214v65l565 -274v-10zM625 249l-565 -275v66l565 275v-66zM625 55l-565 -275v66l565 275v-66z" />
+<glyph unicode="&#x2afb;" horiz-adv-x="894" d="M478 710l-360 -932h-72l360 932h72zM663 710l-360 -932h-72l360 932h72zM848 710l-360 -932h-72l360 932h72z" />
+<glyph unicode="&#x2afd;" horiz-adv-x="709" d="M478 710l-360 -932h-72l360 932h72zM663 710l-360 -932h-72l360 932h72z" />
+<glyph unicode="&#x2afe;" horiz-adv-x="410" d="M310 -189h-210v879h210v-879zM270 -149v799h-130v-799h130z" />
+<glyph unicode="&#x2b12;" horiz-adv-x="910" d="M865 -157h-820v819h820v-819zM799 -91v345h-688v-345h688z" />
+<glyph unicode="&#x2b13;" horiz-adv-x="910" d="M865 -157h-820v819h820v-819zM799 252v344h-688v-344h688z" />
+<glyph unicode="&#x2b14;" horiz-adv-x="910" d="M865 -157h-820v819h820v-819zM799 -91l-688 687v-687h688z" />
+<glyph unicode="&#x2b15;" horiz-adv-x="910" d="M865 -157h-820v819h820v-819zM799 -91v687h-688z" />
+<glyph unicode="&#x2b16;" horiz-adv-x="1064" d="M1025 251l-492 -493l-494 494l493 492zM932 251l-400 400v-800z" />
+<glyph unicode="&#x2b17;" horiz-adv-x="1064" d="M1025 251l-492 -493l-494 494l493 492zM532 -149v800l-400 -399z" />
+<glyph unicode="&#x2b18;" horiz-adv-x="1064" d="M1025 251l-492 -493l-494 494l493 492zM932 252h-800l401 -401z" />
+<glyph unicode="&#x2b19;" horiz-adv-x="1064" d="M1025 251l-492 -493l-494 494l493 492zM932 251l-400 400l-400 -399z" />
+<glyph unicode="&#x2b1a;" horiz-adv-x="910" d="M865 562h-49v51h-51v49h100v-100zM721 613h-100v49h100v-49zM865 418h-49v100h49v-100zM577 613h-100v49h100v-49zM865 274h-49v100h49v-100zM433 613h-100v49h100v-49zM865 130h-49v100h49v-100zM289 613h-100v49h100v-49zM865 -14h-49v100h49v-100zM865 -157h-100v49 h51v51h49v-100zM145 613h-51v-51h-49v100h100v-49zM721 -157h-100v49h100v-49zM94 418h-49v100h49v-100zM577 -157h-100v49h100v-49zM94 274h-49v100h49v-100zM433 -157h-100v49h100v-49zM94 130h-49v100h49v-100zM289 -157h-100v49h100v-49zM94 -14h-49v100h49v-100z M145 -157h-100v100h49v-51h51v-49z" />
+<glyph unicode="&#x2b1b;" horiz-adv-x="1040" d="M1000 -180h-960v960h960v-960z" />
+<glyph unicode="&#x2b1c;" horiz-adv-x="1040" d="M1000 -180h-960v960h960v-960zM934 -114v828h-828v-828h828z" />
+<glyph unicode="&#x2b1d;" horiz-adv-x="240" d="M190 172h-140v160h140v-160z" />
+<glyph unicode="&#x2b1e;" horiz-adv-x="240" d="M190 172h-140v160h140v-160zM160 202v100h-80v-100h80z" />
+<glyph unicode="&#x2b1f;" horiz-adv-x="910" d="M874 387l-160 -492h-518l-160 492l419 303z" />
+<glyph unicode="&#x2b20;" horiz-adv-x="910" d="M874 387l-160 -492h-518l-160 492l419 303zM794 363l-339 246l-339 -246l128 -402h422z" />
+<glyph unicode="&#x2b21;" horiz-adv-x="910" d="M828 36l-373 -214l-373 214v430l373 214l373 -214v-430zM762 73v353l-307 178l-307 -178v-353l308 -175z" />
+<glyph unicode="&#x2b22;" horiz-adv-x="910" d="M828 36l-373 -214l-373 214v430l373 214l373 -214v-430z" />
+<glyph unicode="&#x2b23;" horiz-adv-x="926" d="M902 253l-220 -380h-438l-220 380l220 380h438z" />
+<glyph unicode="&#x2b24;" horiz-adv-x="1207" d="M1137 252q0 -145 -71.5 -268t-194 -194.5t-267.5 -71.5q-220 0 -377 157t-157 377q0 145 71.5 267.5t194.5 194t268 71.5q220 0 376.5 -156.5t156.5 -376.5z" />
+<glyph unicode="&#x2b25;" horiz-adv-x="779" d="M734 251l-344 -347l-345 347l345 330z" />
+<glyph unicode="&#x2b26;" horiz-adv-x="779" d="M734 251l-344 -347l-345 347l345 330zM640 250l-250 240l-251 -240l251 -252z" />
+<glyph unicode="&#x2b27;" horiz-adv-x="544" d="M504 252l-231 -357l-233 357l232 357z" />
+<glyph unicode="&#x2b28;" horiz-adv-x="544" d="M504 252l-231 -357l-233 357l232 357zM425 252l-153 236l-153 -236l154 -236z" />
+<glyph unicode="&#x2b29;" horiz-adv-x="523" d="M497 252l-236 -236l-235 236l235 236z" />
+<glyph unicode="&#x2b2a;" horiz-adv-x="357" d="M331 252l-153 -236l-152 236l152 236z" />
+<glyph unicode="&#x2b2b;" horiz-adv-x="357" d="M331 252l-153 -236l-152 236l152 236zM258 252l-80 123l-79 -123l79 -123z" />
+<glyph unicode="&#x2b2c;" horiz-adv-x="842" d="M792 252q0 -66 -36 -116.5t-93.5 -78t-119 -40.5t-122.5 -13t-122.5 13t-119 40.5t-93.5 78t-36 116.5t36 116.5t93.5 78t119 40.5t122.5 13t122.5 -13t119 -40.5t93.5 -78t36 -116.5z" />
+<glyph unicode="&#x2b2d;" horiz-adv-x="842" d="M792 252q0 -66 -36 -116.5t-93.5 -78t-119 -40.5t-122.5 -13t-122.5 13t-119 40.5t-93.5 78t-36 116.5t36 116.5t93.5 78t119 40.5t122.5 13t122.5 -13t119 -40.5t93.5 -78t36 -116.5zM726 252q0 50 -31.5 88t-81 57t-98 28t-94.5 9t-94.5 -9t-98 -28t-81 -57t-31.5 -88 t31.5 -88t81 -57t98 -28t94.5 -9t94.5 9t98 28t81 57t31.5 88z" />
+<glyph unicode="&#x2b2e;" horiz-adv-x="596" d="M546 252q0 -61 -13 -122.5t-40.5 -119t-78 -93.5t-116.5 -36t-116.5 36t-78 93.5t-40.5 119t-13 122.5t13 122.5t40.5 119t78 93.5t116.5 36t116.5 -36t78 -93.5t40.5 -119t13 -122.5z" />
+<glyph unicode="&#x2b2f;" horiz-adv-x="596" d="M546 252q0 -61 -13 -122.5t-40.5 -119t-78 -93.5t-116.5 -36t-116.5 36t-78 93.5t-40.5 119t-13 122.5t13 122.5t40.5 119t78 93.5t116.5 36t116.5 -36t78 -93.5t40.5 -119t13 -122.5zM480 252q0 125 -49 215t-133 90q-85 0 -133.5 -89.5t-48.5 -215.5t48.5 -215.5 t133.5 -89.5q84 0 133 90t49 215z" />
+<glyph unicode="&#x2b30;" horiz-adv-x="926" d="M856 220h-170q-12 -52 -54 -86t-97 -34t-97 34t-53 86h-127q-26 0 -26 -20q0 -14 14 -28q54 -56 82 -96l-20 -19q-123 142 -238 191v10q113 47 237 190l20 -19q-31 -47 -82 -96q-14 -14 -14 -25q0 -7 9 -14.5t17 -7.5h127q11 53 53 87.5t98 34.5q55 0 97.5 -34.5 t53.5 -87.5h170v-66zM436 286h198q-10 31 -37.5 51.5t-61.5 20.5t-61 -20.5t-38 -51.5zM634 220h-197q11 -31 38 -50.5t60 -19.5q34 0 61 19.5t38 50.5z" />
+<glyph unicode="&#x2b31;" horiz-adv-x="926" d="M866 -80h-614q-12 0 -18.5 -6.5t-6.5 -15.5q0 -11 14 -25q52 -51 76 -86l-20 -19q-110 127 -237 180v10q107 46 213 145q-104 99 -213 145v10q107 46 213 145q-104 99 -213 145v10q128 55 238 181l20 -19q-16 -23 -77 -86q-14 -14 -14 -28q0 -20 26 -20h613v-66h-614 q-8 0 -16.5 -7.5t-8.5 -14.5q0 -10 13 -23l78 -72q-76 -72 -77 -73q-14 -14 -14 -24q0 -8 7.5 -14t18.5 -6h613v-66h-614q-9 0 -17 -7t-8 -15q0 -10 13 -23l78 -72q-76 -72 -77 -73q-14 -14 -14 -24q0 -20 26 -20h613v-66z" />
+<glyph unicode="&#x2b32;" horiz-adv-x="1200" d="M1147 220h-161q-11 -129 -98 -205t-219 -76q-125 0 -212 80.5t-98 200.5h-119q-26 0 -26 -20q0 -14 14 -28q54 -56 82 -96l-20 -19q-123 142 -238 191v10q112 47 237 191l20 -19q-33 -50 -82 -97q-14 -14 -14 -25q0 -7 9 -14.5t17 -7.5h120q11 124 98.5 203.5t211.5 79.5 q129 0 217 -82t100 -201h161v-66zM697 286h223q-11 88 -73 148t-150 69v-217zM647 286v217q-91 -7 -151.5 -68.5t-71.5 -148.5h223zM920 220h-223v-215q90 8 151 68t72 147zM647 5v215h-223q11 -86 72.5 -147t150.5 -68z" />
+<glyph unicode="&#x2b33;" horiz-adv-x="1574" d="M1519 220h-69l-89 -106l-119 172l-124 -172l-119 172l-124 -172l-119 172l-124 -172l-119 172l-124 -172l-92 106h-57q-6 0 -15 -8t-9 -14q0 -11 14 -25q51 -49 82 -96l-20 -19q-124 143 -237 190v10q115 49 238 191l20 -19q-28 -40 -82 -96q-14 -14 -14 -28 q0 -20 26 -20h86l60 -66l124 174l119 -174l124 174l119 -174l124 174l119 -174l124 174l119 -174l60 66h98v-66z" />
+<glyph unicode="&#x2b34;" horiz-adv-x="926" d="M871 220h-266v-163h-50v163h-168q-8 -2 -16 -9t-8 -13q0 -11 14 -25q49 -47 82 -97l-20 -19q-98 113 -181 163h-15q-8 0 -17 -7.5t-9 -14.5q0 -11 14 -25q49 -47 82 -97l-20 -19q-125 144 -237 191v10q113 48 238 192l20 -19q-31 -44 -82 -97q-14 -14 -14 -28 q0 -20 26 -20h13q83 49 183 164l20 -19q-31 -44 -82 -97q-14 -14 -14 -28q0 -8 6 -14t16 -6h169v164h50v-164h266v-66z" />
+<glyph unicode="&#x2b35;" horiz-adv-x="926" d="M871 220h-171v-163h-50v163h-79v-163h-50v163h-135q-8 -2 -16 -9t-8 -13q0 -11 14 -25q49 -47 82 -97l-20 -19q-98 113 -181 163h-15q-8 0 -17 -7.5t-9 -14.5q0 -11 14 -25q49 -47 82 -97l-20 -19q-125 144 -237 191v10q113 48 238 192l20 -19q-31 -44 -82 -97 q-14 -14 -14 -28q0 -20 26 -20h13q83 49 183 164l20 -19q-31 -44 -82 -97q-14 -14 -14 -28q0 -8 6 -14t16 -6h136v164h50v-164h79v164h50v-164h171v-66z" />
+<glyph unicode="&#x2b36;" horiz-adv-x="926" d="M871 57h-50v163h-435q-8 -2 -16 -9t-8 -13q0 -11 14 -25q49 -47 82 -97l-20 -19q-98 113 -181 163h-15q-8 0 -17 -7.5t-9 -14.5q0 -11 14 -25q49 -47 82 -97l-20 -19q-125 144 -237 191v10q113 48 238 192l20 -19q-31 -44 -82 -97q-14 -14 -14 -28q0 -20 26 -20h13 q83 49 183 164l20 -19q-31 -44 -82 -97q-14 -14 -14 -28q0 -8 6 -14t16 -6h436v164h50v-393z" />
+<glyph unicode="&#x2b37;" horiz-adv-x="1412" d="M1337 449l20 -19q-13 -18 -42 -50t-40 -46q-29 -38 -29 -81q0 -46 28 -80q67 -74 82 -97l-20 -19q-97 112 -182 163v66q87 53 183 163zM1070 220h-144v66h144v-66zM842 220h-144v66h144v-66zM614 220h-144v66h144v-66zM439 449l20 -19q-28 -40 -82 -96q-14 -14 -14 -28 q0 -20 23 -20v-66q-7 0 -15.5 -8t-8.5 -14q0 -11 13 -24q50 -48 83 -98l-20 -19q-98 113 -181 163h-15q-8 0 -17 -7.5t-9 -14.5q0 -11 14 -25q49 -47 82 -97l-20 -19q-125 144 -237 191v10q115 49 238 191l20 -19q-28 -40 -82 -96q-14 -14 -14 -28q0 -20 25 -20h14 q85 50 183 163z" />
+<glyph unicode="&#x2b38;" horiz-adv-x="926" d="M873 254q0 -16 -10.5 -26.5t-25.5 -10.5t-26 10.5t-11 26.5q0 15 11 25.5t26 10.5t25.5 -10.5t10.5 -25.5zM751 254q0 -16 -11 -26.5t-26 -10.5q-14 0 -25 10.5t-11 26.5q0 15 11 25.5t25 10.5q15 0 26 -10.5t11 -25.5zM628 253q0 -15 -10.5 -25.5t-25.5 -10.5 t-25.5 10.5t-10.5 25.5t10.5 25.5t25.5 10.5t25.5 -10.5t10.5 -25.5zM506 254q0 -16 -11 -26.5t-25 -10.5q-15 0 -26 10.5t-11 26.5q0 15 11 25.5t26 10.5q14 0 25 -10.5t11 -25.5zM385 254q0 -16 -11 -26.5t-26 -10.5t-25.5 10.5t-10.5 26.5q0 15 10.5 25.5t25.5 10.5 t26 -10.5t11 -25.5zM312 76l-20 -19q-125 144 -237 191v10q113 48 237 191l20 -19q-31 -44 -81 -96q-14 -14 -14 -28q0 -17 14 -17q15 0 23 -10t8 -26t-8 -26t-23 -10t-15 -19q0 -11 14 -25q49 -47 82 -97z" />
+<glyph unicode="&#x2b39;" horiz-adv-x="926" d="M851 450l20 -19q-12 -18 -41 -50t-41 -47q-29 -38 -29 -81q0 -46 28 -80q67 -74 82 -97l-20 -19q-98 113 -181 163h-146v-163h-50v163h-231q-8 0 -17 -7.5t-9 -14.5q0 -11 14 -25q49 -47 82 -97l-20 -19q-125 144 -237 191v10q113 48 238 192l20 -19q-31 -44 -82 -97 q-14 -14 -14 -28q0 -20 26 -20h230v164h50v-164h145q85 52 183 164z" />
+<glyph unicode="&#x2b3a;" horiz-adv-x="926" d="M851 450l20 -19q-12 -18 -41 -50t-41 -47q-29 -38 -29 -81q0 -46 28 -80q67 -74 82 -97l-20 -19q-98 113 -181 163h-95v-163h-50v163h-79v-163h-50v163h-153q-8 0 -17 -7.5t-9 -14.5q0 -11 14 -25q49 -47 82 -97l-20 -19q-125 144 -237 191v10q113 48 238 192l20 -19 q-31 -44 -82 -97q-14 -14 -14 -28q0 -20 26 -20h152v164h50v-164h79v164h50v-164h94q85 52 183 164z" />
+<glyph unicode="&#x2b3b;" horiz-adv-x="926" d="M851 449l20 -19q-13 -18 -42 -50t-40 -46q-29 -38 -29 -81q0 -46 28 -80q67 -74 82 -97l-20 -19q-98 113 -181 163h-282q-10 0 -17 -7.5t-7 -14.5q0 -11 14 -25q49 -47 82 -97l-20 -19q-98 113 -181 163h-16q-8 0 -17 -7.5t-9 -14.5q0 -11 14 -25q49 -47 82 -97l-20 -19 q-125 144 -237 191v10q115 49 238 191l20 -19q-28 -40 -82 -96q-14 -14 -14 -28q0 -20 26 -20h14q85 50 183 163l20 -19q-28 -40 -82 -96q-14 -14 -14 -28q0 -7 6.5 -13.5t16.5 -6.5h281q87 53 183 163z" />
+<glyph unicode="&#x2b3c;" horiz-adv-x="926" d="M851 450l20 -19q-12 -18 -41 -50t-41 -47q-29 -38 -29 -81q0 -46 28 -80q67 -74 82 -97l-20 -19q-98 113 -181 163h-87v-163h-50v163h-145q-10 0 -17 -7.5t-7 -14.5q0 -11 14 -25q49 -47 82 -97l-20 -19q-98 113 -181 163h-16q-8 0 -17 -7.5t-9 -14.5q0 -11 14 -25 q49 -47 82 -97l-20 -19q-125 144 -237 191v10q113 48 238 192l20 -19q-31 -44 -82 -97q-14 -14 -14 -28q0 -20 26 -20h14q83 49 183 164l20 -19q-31 -44 -82 -97q-14 -14 -14 -28q0 -7 6.5 -13.5t16.5 -6.5h145v164h50v-164h86q85 52 183 164z" />
+<glyph unicode="&#x2b3d;" horiz-adv-x="926" d="M856 450l20 -19q-10 -15 -22 -31l-28 -34l-25 -32q-30 -39 -30 -81q0 -48 29 -83q44 -49 75 -94l-20 -19l-53 63q-19 22 -51.5 51t-65.5 49h-51v-163h-50v163h-59v-163h-50v163h-121q-10 0 -17 -7.5t-7 -14.5q0 -11 14 -25q43 -42 80 -97l-20 -19l-54 63q-19 22 -52.5 51 t-69.5 49q-8 0 -16.5 -7.5t-8.5 -14.5q0 -11 14 -25q43 -42 80 -97l-20 -19q-43 50 -68.5 76.5t-69.5 61t-89 53.5v10q45 19 89 53.5t70 61.5t69 77l20 -19q-36 -51 -80 -97q-14 -14 -14 -28q0 -20 24 -20q35 20 69.5 50t52.5 50l54 64l20 -19q-38 -55 -79 -97 q-14 -14 -14 -28q0 -7 6.5 -13.5t16.5 -6.5h121v164h50v-164h59v164h50v-164h50q33 20 66 50t52 50z" />
+<glyph unicode="&#x2b3e;" horiz-adv-x="926" d="M871 220h-225l108 -108l-35 -35l-142 142l-142 -142l-35 35l108 108h-265q-26 0 -26 -20q0 -14 14 -28q54 -56 82 -96l-20 -19q-123 142 -238 191v10q112 47 237 191l20 -19q-33 -50 -82 -97q-14 -14 -14 -25q0 -7 9 -14.5t17 -7.5h268l-110 110l35 35l142 -142l142 142 l35 -35l-110 -110h227v-66z" />
+<glyph unicode="&#x2b3f;" horiz-adv-x="926" d="M871 256l-51 -34q-87 152 -190 152q-30 0 -58 -16t-52 -38l-48 -46q-24 -22 -55.5 -38t-66.5 -16h-107q-26 0 -26 -20q0 -14 14 -28q54 -56 82 -96l-20 -19q-123 142 -238 191v10q112 47 237 191l20 -19q-33 -50 -82 -97q-14 -14 -14 -25q0 -7 9 -14.5t17 -7.5h108 q21 0 44.5 16t47.5 38l50 46q26 22 62.5 38t75.5 16q73 0 135 -51.5t106 -132.5z" />
+<glyph unicode="&#x2b40;" horiz-adv-x="926" d="M776 515h-369v50h369v-50zM776 370h-369v50h369v-50zM871 220h-628q-26 0 -26 -20q0 -14 14 -28q54 -56 82 -96l-20 -19q-123 142 -238 191v10q112 47 237 191l20 -19q-33 -50 -82 -97q-14 -14 -14 -25q0 -7 9 -14.5t17 -7.5h629v-66z" />
+<glyph unicode="&#x2b41;" horiz-adv-x="926" d="M796 370h-20q-8 38 -31.5 63t-54.5 25q-21 0 -89 -44t-100 -44q-44 0 -77.5 45t-36.5 93h19q8 -39 30 -63.5t54 -24.5q20 0 88 44t101 44q45 0 80 -42.5t37 -95.5zM871 220h-628q-26 0 -26 -20q0 -14 14 -28q54 -56 82 -96l-20 -19q-123 142 -238 191v10q112 47 237 191 l20 -19q-33 -50 -82 -97q-14 -14 -14 -25q0 -7 9 -14.5t17 -7.5h629v-66z" />
+<glyph unicode="&#x2b42;" horiz-adv-x="926" d="M871 220h-629q-8 0 -17 -7.5t-9 -14.5q0 -11 14 -25q49 -47 82 -97l-20 -19q-125 144 -237 191v10q115 49 238 191l20 -19q-28 -40 -82 -96q-14 -14 -14 -28q0 -20 26 -20h628v-66zM796 -2h-19q-8 39 -30 63.5t-54 24.5q-21 0 -89 -44t-100 -44q-45 0 -80 42.5t-37 95.5 h20q8 -38 31.5 -63t54.5 -25q21 0 89 44t100 44q44 0 77.5 -45t36.5 -93zM796 -141h-19q-8 39 -30 63.5t-54 24.5q-21 0 -89 -44t-100 -44q-45 0 -80 42.5t-37 95.5h20q8 -38 31.5 -63t54.5 -25q21 0 89 44t100 44q44 0 77.5 -45t36.5 -93z" />
+<glyph unicode="&#x2b43;" horiz-adv-x="926" d="M871 258v-10q-112 -47 -237 -191l-20 19q33 50 82 97q14 14 14 25q0 22 -26 22h-139l-500 -246v65l356 181h-316v66h315l-355 181v65l500 -246h138q26 0 26 20q0 14 -14 28q-54 56 -82 96l20 19q123 -142 238 -191z" />
+<glyph unicode="&#x2b44;" horiz-adv-x="926" d="M871 258v-10q-66 -27 -118 -71t-109 -110l-20 19q33 49 72 87q14 14 14 25q0 22 -26 22h-84q-11 -104 -84.5 -175t-180.5 -71h-290v66h286q75 0 133 53.5t70 126.5h-449v66h449q-12 73 -69.5 126.5t-132.5 53.5h-287v66h287q108 0 182 -71.5t86 -174.5h83q26 0 26 20 q0 14 -14 28q-43 45 -72 86l20 19q115 -133 228 -181z" />
+<glyph unicode="&#x2b45;" horiz-adv-x="928" d="M873 -35h-512q63 -97 81 -145l-24 -15q-102 200 -363 443v13q125 112 214.5 217t149.5 223l24 -13q-20 -55 -81 -147h511v-66h-557q-16 -22 -33 -42l-33 -37l-22 -25h645v-66h-697q-23 -34 -23 -52q0 -22 23 -52h697v-66h-642q1 -1 33 -38.5t52 -65.5h557v-66z" />
+<glyph unicode="&#x2b46;" horiz-adv-x="928" d="M873 261v-13q-261 -243 -363 -443l-24 15q18 48 81 145h-512v66h557q20 28 52 65.5t33 38.5h-642v66h697q23 30 23 52q0 18 -23 52h-697v66h645l-22 25l-33 37q-17 20 -33 42h-557v66h511q-61 92 -81 147l24 13q60 -118 149.5 -223t214.5 -217z" />
+<glyph unicode="&#x2b47;" horiz-adv-x="926" d="M539 370h-20q-8 38 -31.5 63t-54.5 25q-21 0 -89 -44t-100 -44q-44 0 -77.5 45t-36.5 93h19q8 -39 30 -63.5t54 -24.5q21 0 89 44t100 44q45 0 80 -42.5t37 -95.5zM871 258v-10q-115 -49 -238 -191l-20 19q28 40 82 96q14 14 14 28q0 20 -26 20h-628v66h629q8 0 17 7.5 t9 14.5q0 11 -14 25q-49 47 -82 97l20 19q125 -144 237 -191z" />
+<glyph unicode="&#x2b48;" horiz-adv-x="926" d="M871 258v-10q-112 -47 -237 -191l-20 19q33 50 82 97q14 14 14 25q0 7 -9 14.5t-17 7.5h-629v66h628q26 0 26 20q0 14 -14 28q-54 56 -82 96l20 19q123 -142 238 -191zM539 -2h-19q-8 39 -30 63.5t-54 24.5q-20 0 -88 -44t-101 -44q-45 0 -80 42.5t-37 95.5h20 q8 -38 31.5 -63t54.5 -25q21 0 89 44t100 44q44 0 77.5 -45t36.5 -93zM539 -141h-19q-8 39 -30 63.5t-54 24.5q-20 0 -88 -44t-101 -44q-45 0 -80 42.5t-37 95.5h20q8 -38 31.5 -63t54.5 -25q21 0 89 44t100 44q44 0 77.5 -45t36.5 -93z" />
+<glyph unicode="&#x2b49;" horiz-adv-x="926" d="M777 508h19q-3 -48 -36.5 -93t-77.5 -45q-32 0 -100 44t-89 44q-31 0 -54.5 -25t-31.5 -63h-20q2 53 37 95.5t80 42.5q32 0 100 -44t89 -44q32 0 54 24.5t30 63.5zM871 220h-628q-26 0 -26 -20q0 -14 14 -28q54 -56 82 -96l-20 -19q-123 142 -238 191v10q112 47 237 191 l20 -19q-33 -50 -82 -97q-14 -14 -14 -25q0 -7 9 -14.5t17 -7.5h629v-66z" />
+<glyph unicode="&#x2b4a;" horiz-adv-x="926" d="M871 220h-629q-8 0 -17 -7.5t-9 -14.5q0 -11 14 -25q49 -47 82 -97l-20 -19q-125 144 -237 191v10q115 49 238 191l20 -19q-28 -40 -82 -96q-14 -14 -14 -28q0 -20 26 -20h628v-66zM776 136h20q-2 -53 -37 -95.5t-80 -42.5q-33 0 -101 44t-88 44q-32 0 -54 -24.5 t-30 -63.5h-19q3 48 36.5 93t77.5 45q32 0 100 -44t89 -44q31 0 54.5 25t31.5 63zM776 -3h20q-2 -53 -37 -95.5t-80 -42.5q-33 0 -101 44t-88 44q-32 0 -54 -24.5t-30 -63.5h-19q3 48 36.5 93t77.5 45q32 0 100 -44t89 -44q31 0 54.5 25t31.5 63z" />
+<glyph unicode="&#x2b4b;" horiz-adv-x="926" d="M871 220h-629q-8 0 -17 -7.5t-9 -14.5q0 -11 14 -25q49 -47 82 -97l-20 -19q-125 144 -237 191v10q115 49 238 191l20 -19q-28 -40 -82 -96q-14 -14 -14 -28q0 -20 26 -20h628v-66zM796 -2h-19q-8 39 -30 63.5t-54 24.5q-21 0 -89 -44t-100 -44q-45 0 -80 42.5t-37 95.5 h20q8 -38 31.5 -63t54.5 -25q21 0 89 44t100 44q44 0 77.5 -45t36.5 -93z" />
+<glyph unicode="&#x2b4c;" horiz-adv-x="926" d="M871 258v-10q-112 -47 -237 -191l-20 19q33 50 82 97q14 14 14 25q0 7 -9 14.5t-17 7.5h-629v66h628q26 0 26 20q0 14 -14 28q-54 56 -82 96l20 19q123 -142 238 -191zM539 -2h-19q-8 39 -30 63.5t-54 24.5q-20 0 -88 -44t-101 -44q-45 0 -80 42.5t-37 95.5h20 q8 -38 31.5 -63t54.5 -25q21 0 89 44t100 44q44 0 77.5 -45t36.5 -93z" />
+<glyph unicode="&#x2b50;" horiz-adv-x="794" d="M734 373l-205 -158l74 -245l-206 146l-206 -146l74 245l-205 158h253l84 246l84 -246h253zM658 347h-196l-65 192l-65 -192h-196l159 -122l-57 -190l159 113l159 -113l-57 190z" />
+<glyph unicode="&#x2b51;" horiz-adv-x="794" d="M734 373l-205 -158l74 -245l-206 146l-206 -146l74 245l-205 158h253l84 246l84 -246h253z" />
+<glyph unicode="&#x2b52;" horiz-adv-x="700" d="M665 365l-226 -137l107 -241l-196 179l-196 -179l107 241l-226 137l262 -30l53 262l53 -262zM550 326l-168 -20l-32 160l-32 -160l-168 20l144 -88l-66 -148l122 111l122 -111l-66 148z" />
+<glyph unicode="&#x2b53;" horiz-adv-x="865" d="M840 293l-303 -419l-492 160v518l492 160z" />
+<glyph unicode="&#x2b54;" horiz-adv-x="865" d="M840 293l-303 -420l-492 160v518l492 161zM759 293l-246 339l-402 -128v-422l402 -129z" />
+<glyph unicode="&#x3012;" d="M672 596h-662v66h662v-66zM672 396h-298v-396h-66v396h-298v66h662v-66z" />
+<glyph unicode="&#x3030;" horiz-adv-x="1412" d="M1367 417v-65q-22 0 -39 -8t-30.5 -27t-21 -33t-20.5 -43q-14 -32 -20 -44.5t-21.5 -37.5t-29.5 -36t-37 -20.5t-50 -9.5q-33 0 -59 11.5t-45.5 37.5t-29.5 45t-26 55l-20 42q-6 14 -19 33t-28 26.5t-34 7.5t-33.5 -8t-27.5 -26.5t-20 -32.5t-20 -43q-11 -26 -16.5 -37 t-17.5 -32.5t-22.5 -32t-26 -23.5t-34.5 -18t-42 -5q-34 0 -60 11.5t-45 37t-29.5 45t-25.5 54.5q-12 28 -19.5 42t-20 33t-27.5 27t-34 8q-25 0 -45 -17.5t-30 -36t-26 -55.5q-12 -28 -19.5 -43.5t-23 -39t-31 -35.5t-40.5 -21.5t-55 -9.5l-1 66q42 0 65 27.5t47 82.5 q16 36 25.5 55t29 44.5t45 37t59.5 11.5t60 -11.5t45 -37t29 -44.5t26 -55q12 -28 19.5 -42t20 -33t27.5 -27t34 -8t34 8t27.5 26t20 33t19.5 42q12 28 19.5 44t22.5 39t29.5 35t37.5 21.5t50 9.5t50 -9.5t37.5 -21.5t29.5 -35t22.5 -39t19.5 -44q10 -24 15 -34t15.5 -28 t19 -26t22 -14.5t28.5 -6.5q24 0 44.5 17.5t31 37t26.5 55.5t26 55t30 44.5t48 37t65 11.5z" />
+<glyph unicode="&#x306e;" horiz-adv-x="901" d="M840 308q0 -61 -19.5 -121t-55.5 -112t-96.5 -84t-134.5 -32q-21 0 -31 1q121 22 186.5 109t65.5 199q0 88 -37.5 168.5t-109.5 133t-160 52.5q-135 0 -231 -93.5t-96 -207.5q0 -67 39.5 -123t120.5 -91q119 126 125 364q0 4 -10 9.5t-10 10.5q53 18 100 39q9 -4 9 -16 q0 -8 -7 -19q-23 -96 -35.5 -143.5t-36 -117t-54.5 -125t-74 -113.5q-13 -5 -22 -5q-42 0 -74 22l8 6l16 13q8 6 17 16t13 18q-3 -1 -12 -6l-16 -9q-7 -4 -10 -4q-20 9 -45.5 28t-55.5 49.5t-50 75t-20 93.5q0 86 40 158t104.5 116.5t141 69t152.5 24.5q174 0 267 -108 q98 -113 98 -245z" />
+<glyph unicode="&#xa727;" horiz-adv-x="481" d="M427 303v-318q0 -94 -48.5 -156t-140.5 -62q-34 0 -63.5 13.5t-29.5 42.5q0 16 12 27t28 11q22 0 47 -30t42 -30q69 0 69 139v360q0 106 -77 106q-54 0 -109 -63v-241q0 -49 11.5 -66t56.5 -21v-15h-216v15q44 6 54 21.5t10 65.5v471q0 32 -9.5 41.5t-41.5 9.5 q-8 0 -12 -1v16q89 26 142 44l5 -3v-304q60 84 146 84q124 0 124 -157z" />
+<glyph unicode="&#xfffd;" horiz-adv-x="872" d="M817 223l-383 -440l-379 438l384 441zM414 58h38q9 72 52 120q69 56 89.5 87t20.5 70q0 58 -56.5 100.5t-121.5 42.5q-76 0 -125 -45.5t-49 -102.5q0 -22 18 -36.5t37 -14.5t36 11.5t17 25.5q0 13 -16 25t-16 27q0 24 26 46.5t62 22.5q86 0 86 -95q0 -26 -8.5 -49 t-26.5 -53t-24 -43q-37 -80 -39 -139zM483 -49q0 24 -15.5 38.5t-36.5 14.5q-20 0 -35 -14.5t-15 -39.5q0 -17 15.5 -32.5t34.5 -15.5q20 0 36 16t16 33z" />
+<glyph unicode="&#x1d400;" horiz-adv-x="722" d="M689 0h-322v25l32 3q25 2 35.5 9.5t10.5 23.5q0 29 -46 136h-225l-13 -34q-31 -80 -31 -97q0 -19 18.5 -28.5t62.5 -12.5v-25h-202v25q35 6 53 28t46 92l221 545h28l222 -522q38 -90 58.5 -116.5t51.5 -26.5v-25zM384 236l-101 243l-94 -243h195z" />
+<glyph unicode="&#x1d401;" horiz-adv-x="667" d="M426 365v-1q85 -11 139 -58.5t54 -117.5q0 -83 -72 -135.5t-202 -52.5h-329v25q55 6 71.5 21t16.5 57v467q0 44 -18.5 60.5t-69.5 20.5v25h317q121 0 186.5 -41.5t65.5 -118.5q0 -59 -37 -96.5t-122 -54.5zM264 592v-219q91 0 123.5 30t32.5 106q0 137 -99 137 q-30 0 -43.5 -12.5t-13.5 -41.5zM264 343v-245q0 -36 15 -51t48 -15q58 0 89 40t31 116q0 155 -157 155h-26z" />
+<glyph unicode="&#x1d402;" horiz-adv-x="722" d="M657 152l30 -25q-67 -83 -132.5 -114.5t-155.5 -31.5q-159 0 -254.5 96.5t-95.5 245.5q0 160 97.5 264t249.5 104q71 0 156 -35q32 -14 46 -14t23.5 9.5t20.5 36.5h27v-235h-25q-22 62 -67 115q-75 90 -167 90q-81 0 -132.5 -83.5t-51.5 -229.5q0 -155 54 -240 q22 -34 62.5 -55t84.5 -21q64 0 126 34q41 23 104 89z" />
+<glyph unicode="&#x1d403;" horiz-adv-x="722" d="M14 676h312q171 0 267.5 -88t96.5 -243q0 -77 -30.5 -147t-84.5 -117q-93 -81 -252 -81h-309v25q43 1 63 19t20 54v486q0 34 -17.5 48t-65.5 19v25zM259 598v-498q0 -35 12.5 -50t45.5 -15q98 0 149 72q23 33 36.5 94.5t13.5 128.5q0 139 -41 211q-58 101 -163 101 q-53 0 -53 -44z" />
+<glyph unicode="&#x1d404;" horiz-adv-x="667" d="M641 208l-40 -208h-585v25q54 6 71 21t17 55v479q0 38 -18 53t-70 18v25h577v-201h-25q-17 100 -65.5 133.5t-171.5 33.5q-38 0 -51.5 -12t-13.5 -42v-225q81 1 117 32.5t45 116.5h26v-338h-26q-7 88 -43 121.5t-119 33.5v-242q0 -32 17.5 -44t65.5 -12q117 0 182 54 q25 20 42 46t40 77h28z" />
+<glyph unicode="&#x1d405;" horiz-adv-x="611" d="M583 474h-24q-10 57 -22 81.5t-38 47.5q-45 39 -163 39q-38 0 -54 -11.5t-16 -39.5v-228q75 0 109 32.5t44 116.5h25v-338h-25q-7 87 -41 120t-112 35v-228q0 -43 21 -58t89 -18v-25h-360v25q55 6 71.5 21t16.5 57v472q0 43 -18 58t-70 18v25h567v-202z" />
+<glyph unicode="&#x1d406;" horiz-adv-x="778" d="M755 287v-25q-53 -6 -69.5 -27.5t-16.5 -72.5v-118q-49 -29 -124 -46t-153 -17q-154 0 -254.5 96t-100.5 254q0 151 99.5 255.5t248.5 104.5q70 0 155 -35q32 -14 46 -14t23.5 9.5t20.5 36.5h27v-235h-25q-29 63 -47.5 92.5t-48.5 56.5q-63 56 -138 56q-88 0 -136 -83 t-48 -237q0 -157 48 -237q27 -45 63 -66t92 -21q96 0 96 85v89q0 40 -19.5 55t-82.5 19v25h344z" />
+<glyph unicode="&#x1d407;" horiz-adv-x="778" d="M759 0h-339v25q54 6 71.5 20.5t17.5 52.5v228h-241v-228q0 -40 17 -53.5t72 -19.5v-25h-336v25q53 7 69 20.5t16 52.5v479q0 41 -17 55t-68 19v25h336v-25q-53 -4 -71 -18.5t-18 -55.5v-204h241v204q0 41 -18 55.5t-71 18.5v25h339v-25q-51 -4 -69.5 -19t-18.5 -55v-479 q0 -39 16.5 -52.5t71.5 -20.5v-25z" />
+<glyph unicode="&#x1d408;" horiz-adv-x="389" d="M370 0h-350v25q57 5 75 20t18 61v470q0 41 -19 56t-74 19v25h350v-25q-56 -2 -75.5 -17.5t-19.5 -57.5v-470q0 -48 18.5 -62.5t76.5 -18.5v-25z" />
+<glyph unicode="&#x1d409;" horiz-adv-x="500" d="M478 676v-25q-55 -4 -71.5 -22t-16.5 -73v-430q0 -222 -212 -222q-74 0 -108 23q-29 20 -48 50t-19 60q0 28 21.5 51t49.5 23t50 -23t22 -53q0 -15 -13.5 -34t-13.5 -32q0 -32 45 -32q34 0 49 21.5t15 68.5v550q0 43 -20 57.5t-81 16.5v25h351z" />
+<glyph unicode="&#x1d40a;" horiz-adv-x="778" d="M769 0h-334v25q47 1 62 6t15 15q0 13 -25 45l-181 225l-27 -25v-196q0 -37 16.5 -50t70.5 -20v-25h-336v25q55 5 71 19t16 57v472q0 46 -17 60.5t-70 17.5v25h337v-25q-54 -4 -71 -20.5t-17 -63.5v-223l212 215q24 24 32 35t8 23q0 15 -10.5 22t-37.5 9l-35 3v25h289v-25 q-78 -9 -133 -46.5t-189 -180.5l305 -378q16 -20 49 -21v-25z" />
+<glyph unicode="&#x1d40b;" horiz-adv-x="667" d="M638 227l-42 -227h-577v25q55 7 70.5 20t15.5 53v478q0 42 -17.5 57t-68.5 18v25h348v-24q-65 -3 -82.5 -20t-17.5 -79v-464q0 -33 18.5 -45.5t66.5 -12.5q109 0 170 55q42 39 87 141h29z" />
+<glyph unicode="&#x1d40c;" horiz-adv-x="944" d="M921 0h-332v25q55 5 72 22t17 62v496l-252 -605h-27l-252 594v-465q0 -58 20 -79t81 -25v-25h-234v25q59 6 75 20.5t16 62.5v469q0 41 -17 55.5t-72 18.5v25h253l199 -472l201 472h252v-25q-55 -4 -71.5 -22.5t-16.5 -74.5v-428q0 -57 15 -76.5t73 -24.5v-25z" />
+<glyph unicode="&#x1d40d;" horiz-adv-x="722" d="M701 676v-25q-50 -8 -64 -22.5t-14 -60.5v-586h-28l-447 545v-396q0 -58 18 -78.5t76 -27.5v-25h-226v25q55 7 71.5 22.5t16.5 61.5v470q-52 72 -85 72v25h211l349 -430v299q0 60 -18 80.5t-74 25.5v25h214z" />
+<glyph unicode="&#x1d40e;" horiz-adv-x="778" d="M743 335q0 -156 -99.5 -255t-255.5 -99q-155 0 -254 99t-99 254q0 159 101 258t258 99q151 0 250 -100.5t99 -255.5zM566 328q0 160 -46.5 245t-134.5 85q-83 0 -128 -85.5t-45 -242.5t46 -236.5t132 -79.5t131 80t45 234z" />
+<glyph unicode="&#x1d40f;" horiz-adv-x="611" d="M16 676h315q128 0 198.5 -45.5t70.5 -135.5q0 -60 -33.5 -104.5t-95.5 -67.5q-32 -12 -70.5 -15.5t-138.5 -4.5v-192q0 -51 14 -65t73 -21v-25h-333v25q33 3 45 9q23 9 31 30t8 62v427q0 58 -15.5 75.5t-68.5 22.5v25zM262 606v-268q94 1 130 32t36 114q0 84 -27 120.5 t-89 36.5q-50 0 -50 -35z" />
+<glyph unicode="&#x1d410;" horiz-adv-x="778" d="M730 -117l6 -24q-91 -35 -179 -35q-140 0 -228 88q-29 29 -56 86q-113 34 -175.5 123.5t-62.5 208.5q0 161 99.5 261t254.5 100q156 0 255 -100t99 -264q0 -126 -66 -211t-187 -122q23 -47 47 -71q52 -52 123 -52q30 0 70 12zM566 335q0 158 -46 240.5t-132 82.5 q-84 0 -130 -83.5t-46 -239.5t45 -238.5t132 -82.5q86 0 131.5 83t45.5 238z" />
+<glyph unicode="&#x1d411;" horiz-adv-x="722" d="M716 0h-205l-207 313h-28v-196q0 -54 14.5 -69t73.5 -23v-25h-338v25q59 7 73.5 22t14.5 73v431q0 59 -16.5 77.5t-71.5 22.5v25h308q296 0 296 -172q0 -76 -45 -118q-42 -38 -112 -57l199 -282q15 -22 44 -22v-25zM276 597v-252q103 1 143 31t40 118q0 79 -30 113.5 t-100 34.5q-29 0 -41 -10t-12 -35z" />
+<glyph unicode="&#x1d412;" horiz-adv-x="556" d="M484 474h-28q-26 85 -70 130q-54 56 -123 56q-51 0 -80.5 -27.5t-29.5 -71.5q0 -36 21 -59t82 -55q18 -10 68.5 -35.5t79.5 -41.5q49 -27 79 -73.5t30 -102.5q0 -95 -68.5 -154t-179.5 -59q-61 0 -130 24q-31 10 -41 10q-12 0 -19 -7.5t-11 -26.5h-29v248h29 q23 -96 60 -143q57 -72 144 -72q58 0 92 30.5t34 82.5q0 48 -57 88q-25 18 -122 65q-89 43 -130 90t-41 120q0 95 58.5 148t160.5 53q55 0 117 -23q27 -9 42 -9q14 0 20.5 6.5t11.5 26.5h30v-218z" />
+<glyph unicode="&#x1d413;" horiz-adv-x="667" d="M636 475h-29q-13 89 -56.5 127.5t-135.5 41.5v-527q0 -57 16.5 -72t81.5 -20v-25h-357v25q64 5 80.5 20.5t16.5 71.5v527q-93 -3 -136.5 -41.5t-56.5 -127.5h-29l3 201h600z" />
+<glyph unicode="&#x1d414;" horiz-adv-x="722" d="M701 676v-25q-48 -7 -63 -24t-15 -61v-314q0 -156 -76 -216q-68 -55 -184 -55t-185 54q-43 34 -61.5 79t-18.5 117v324q0 59 -14 75t-68 21v25h336v-25q-60 -5 -77.5 -23t-17.5 -78v-318q0 -202 146 -202q176 0 176 222v300q0 54 -20.5 74t-76.5 25v25h219z" />
+<glyph unicode="&#x1d415;" horiz-adv-x="722" d="M701 676v-25q-39 -5 -55.5 -20t-34.5 -62l-228 -587h-27l-256 599q-18 42 -32 53.5t-52 16.5v25h336v-25l-33 -2q-53 -3 -53 -36q0 -17 23 -72l138 -334l127 329q20 52 20 71q0 24 -16 32t-70 12v25h213z" />
+<glyph unicode="&#x1d416;" horiz-adv-x="1000" d="M981 676v-25q-50 -5 -69 -64l-200 -602h-27l-171 477l-186 -477h-28l-212 602q-13 37 -25 48t-44 16v25h294v-25q-39 -3 -51.5 -11.5t-12.5 -30.5q0 -13 7 -33l120 -364l118 308l-35 96q-12 32 -72 35v25h312v-25l-13 -1q-33 -2 -46 -10t-13 -26q0 -13 14 -56l108 -336 l112 343q7 20 7 42q0 23 -14.5 32.5t-54.5 11.5v25h182z" />
+<glyph unicode="&#x1d417;" horiz-adv-x="722" d="M699 0h-340v25l28 2q52 3 52 28q0 21 -21 54l-101 162l-38 -51q-56 -76 -75 -106.5t-19 -46.5q0 -19 17.5 -28t63.5 -14v-25h-250v25q37 4 59 16t45 40l175 221l-198 291q-23 34 -38 45t-42 13v25h346v-25l-31 -2q-27 -1 -37.5 -8t-10.5 -23q0 -14 15 -37l97 -150l56 77 q36 49 47 69.5t11 36.5q0 18 -11 25t-40 10l-21 2v25h250v-25q-57 -5 -90.5 -30.5t-97.5 -115.5l-80 -111l182 -283q35 -54 53 -69.5t44 -16.5v-25z" />
+<glyph unicode="&#x1d418;" horiz-adv-x="722" d="M699 676v-25q-49 -7 -68 -39l-191 -311v-178q0 -58 16.5 -75.5t75.5 -22.5v-25h-347v25q60 5 76.5 25t16.5 78v136l-180 328q-31 56 -83 59v25h335v-25l-27 -2q-32 -2 -43 -7.5t-11 -21.5q0 -13 24 -59l120 -232l109 178q41 68 41 102q0 22 -16.5 30t-67.5 12v25h220z " />
+<glyph unicode="&#x1d419;" horiz-adv-x="667" d="M634 242l-27 -242h-579v16l382 623l-83 -1q-117 -2 -162 -32.5t-78 -136.5h-28l22 207h523v-16l-379 -625h83q145 0 202 40q27 19 45 45t26.5 47t26.5 75h26z" />
+<glyph unicode="&#x1d41a;" horiz-adv-x="500" d="M473 64l15 -21q-53 -57 -112 -57q-37 0 -55.5 15.5t-26.5 53.5q-76 -69 -159 -69q-50 0 -80 26.5t-30 79.5q0 67 67 112q50 33 201 76v68q0 49 -18.5 71t-62.5 22q-28 0 -46.5 -10t-18.5 -27q0 -11 11 -23q19 -23 19 -42q0 -26 -19 -43t-49 -17q-31 0 -48 18t-17 50 q0 59 52.5 92.5t138.5 33.5q92 0 144 -35t52 -99v-261q0 -28 21 -28q7 0 11 4zM293 97v148q-122 -34 -122 -121q0 -32 14.5 -49.5t37.5 -17.5q42 0 70 40z" />
+<glyph unicode="&#x1d41b;" horiz-adv-x="556" d="M211 676v-259q53 56 122 56q83 0 135.5 -65t52.5 -169q0 -113 -63 -183t-163 -70q-70 0 -132 57l-79 -56h-12v607q0 30 -10 40.5t-45 17.5v24h194zM211 360v-263q0 -36 19 -57.5t50 -21.5q94 0 94 203q0 198 -93 198q-25 0 -41 -13.5t-29 -45.5z" />
+<glyph unicode="&#x1d41c;" horiz-adv-x="444" d="M412 109l18 -18q-41 -56 -86 -80.5t-105 -24.5q-95 0 -154.5 65t-59.5 171q0 110 68 180.5t169 70.5q66 0 110 -31t44 -79q0 -29 -18.5 -46.5t-49.5 -17.5q-26 0 -41 19t-15 54q0 18 -0.5 26t-2.5 18.5t-6 15t-12.5 7.5t-20.5 3q-38 0 -61 -44.5t-23 -124.5 q0 -102 37 -161t102 -59q58 0 107 56z" />
+<glyph unicode="&#x1d41d;" horiz-adv-x="556" d="M534 20l-62 -8q-82 -11 -133 -25v65q-35 -37 -64 -51.5t-69 -14.5q-79 0 -130 66t-51 169q0 109 54.5 180.5t137.5 71.5q34 0 60.5 -13.5t58.5 -48.5v183q0 35 -13 44.5t-63 13.5v24h215v-575q0 -32 12.5 -44t46.5 -14v-23zM336 112v243q-11 29 -32 45.5t-46 16.5 q-85 0 -85 -188q0 -187 78 -187q36 0 66 37q19 25 19 33z" />
+<glyph unicode="&#x1d41e;" horiz-adv-x="444" d="M403 126l24 -14q-44 -70 -88.5 -98t-109.5 -28q-90 0 -147 67.5t-57 170.5q0 112 57.5 180.5t151.5 68.5q83 0 128 -50q53 -58 59 -178h-252q3 -42 8 -70.5t17 -57.5t35.5 -44t58.5 -15q32 0 58 15.5t57 52.5zM298 282v21q0 73 -9 92q-12 25 -23.5 36t-31.5 11 q-36 0 -53 -36.5t-17 -123.5h134z" />
+<glyph unicode="&#x1d41f;" horiz-adv-x="333" d="M14 461h57q0 131 40 179q42 51 135 51q64 0 103.5 -28t39.5 -72q0 -28 -17 -46t-45 -18q-25 0 -42.5 17t-17.5 40q0 20 11 36.5t11 20.5q0 19 -29 19q-27 0 -38.5 -17.5t-11.5 -61.5v-120h86v-44h-86v-310q0 -50 15 -66t67 -17v-24h-278v24q34 4 45.5 16.5t11.5 46.5v330 h-57v44z" />
+<glyph unicode="&#x1d420;" horiz-adv-x="500" d="M254 68h52q81 0 129 -32.5t48 -87.5q0 -71 -68.5 -112.5t-192.5 -41.5q-194 0 -194 92q0 61 96 75q-47 17 -64.5 35t-17.5 47q0 44 29 71.5t90 45.5q-55 16 -89.5 56t-34.5 95q0 73 56.5 117t146.5 44q52 0 112 -22h129v-53h-80q40 -36 40 -98q0 -93 -92 -131 q-24 -10 -41 -12t-86 -2q-30 0 -49.5 -13.5t-19.5 -35.5q0 -21 21 -29t80 -8zM306 312q0 70 -15.5 100t-51.5 30t-50.5 -29t-14.5 -102q0 -70 15 -99.5t51 -29.5t51 29.5t15 100.5zM315 -52h-164q-21 -17 -28 -28t-7 -27q0 -67 134 -67q72 0 113 18.5t41 47.5q0 56 -89 56z " />
+<glyph unicode="&#x1d421;" horiz-adv-x="556" d="M534 0h-234v24q25 3 35.5 16.5t10.5 44.5v224q0 54 -11 75.5t-40 21.5q-36 0 -70 -34q-17 -17 -17 -24v-263q0 -31 10 -44t38 -17v-24h-240v24q36 7 44.5 16t8.5 49v502q0 35 -9 44.5t-45 16.5v24h193v-280q65 77 147 77q60 0 95 -38t35 -98v-250q0 -34 11.5 -48.5 t37.5 -14.5v-24z" />
+<glyph unicode="&#x1d422;" horiz-adv-x="278" d="M215 613q0 -33 -22.5 -55t-55.5 -22t-55 22t-22 55t22.5 55.5t56.5 22.5q31 0 53.5 -23t22.5 -55zM256 0h-240v24q35 8 44 19t9 45v285q0 33 -10.5 45t-43.5 19v24h193v-376q0 -32 10.5 -44.5t37.5 -16.5v-24z" />
+<glyph unicode="&#x1d423;" horiz-adv-x="333" d="M263 613q0 -33 -22.5 -55t-56.5 -22q-33 0 -54.5 22t-21.5 55t22.5 55.5t55.5 22.5q31 0 54 -23t23 -55zM260 461v-459q0 -84 -27 -129q-43 -76 -150 -76q-62 0 -101 28t-39 72q0 27 17 44t45 17q25 0 42 -15.5t17 -38.5q0 -16 -14 -37q-9 -15 -9 -22q0 -17 32 -17 q25 0 36.5 18t11.5 58v474q0 32 -12.5 44t-50.5 15v24h202z" />
+<glyph unicode="&#x1d424;" horiz-adv-x="556" d="M543 0h-234v24q42 2 42 19q0 12 -24 45l-95 134l-23 -24v-114q0 -35 8.5 -45t43.5 -15v-24h-239v24q48 4 48 60v510q0 54 -48 58v24h187v-431l128 128q21 21 21 38q0 18 -35 23l-24 4v23h214v-23q-47 -6 -80.5 -29t-108.5 -102l194 -268q11 -15 25 -15v-24z" />
+<glyph unicode="&#x1d425;" horiz-adv-x="278" d="M256 0h-240v24q51 4 51 63v500q0 61 -52 65v24h191v-589q0 -33 12 -47.5t38 -15.5v-24z" />
+<glyph unicode="&#x1d426;" horiz-adv-x="833" d="M814 0h-237v24q28 2 38 14.5t10 44.5v228q0 95 -53 95q-29 0 -58 -25q-9 -7 -18 -18t-9 -15v-265q0 -29 10 -42.5t36 -16.5v-24h-232v24q27 2 37 15t10 44v240q0 45 -12.5 64t-41.5 19q-19 0 -51.5 -22.5t-32.5 -39.5v-261q0 -29 9.5 -42t35.5 -17v-24h-239v24 q33 6 44 18.5t11 43.5v287q0 35 -11 47t-45 17v24h192v-75h3q29 46 62.5 66.5t81.5 20.5q47 0 76 -20t52 -67q39 48 71.5 67.5t75.5 19.5q62 0 98.5 -38t36.5 -104v-248q0 -32 10.5 -45t39.5 -14v-24z" />
+<glyph unicode="&#x1d427;" horiz-adv-x="556" d="M539 0h-234v24q25 3 35.5 16.5t10.5 43.5v237q0 85 -51 85q-36 0 -70 -34q-17 -17 -17 -24v-264q0 -29 10.5 -42.5t37.5 -17.5v-24h-240v24q33 7 43 19t10 44v289q0 32 -10 44t-43 17v24h191v-75h1q49 87 142 87q62 0 98.5 -38.5t36.5 -103.5v-247q0 -34 10 -46t39 -14 v-24z" />
+<glyph unicode="&#x1d428;" horiz-adv-x="500" d="M476 229q0 -105 -64.5 -174t-161.5 -69q-95 0 -160 68.5t-65 173.5q0 109 64.5 177t164.5 68q95 0 158.5 -69t63.5 -175zM329 218q0 128 -17 176t-61 48q-46 0 -62.5 -47.5t-16.5 -176.5q0 -109 18 -155t61 -46t60.5 44.5t17.5 156.5z" />
+<glyph unicode="&#x1d429;" horiz-adv-x="556" d="M212 461v-69q25 44 55.5 62.5t75.5 18.5q85 0 133 -57.5t48 -166.5q0 -118 -51.5 -190t-140.5 -72q-34 0 -58 12.5t-60 47.5v-126q0 -52 16.5 -76t60.5 -26v-24h-272v24q35 6 45.5 18.5t10.5 44.5v490q0 33 -11 46.5t-44 18.5v24h192zM214 346v-239q12 -29 32.5 -47 t44.5 -18q85 0 85 192q0 182 -76 182q-37 0 -68 -37q-18 -21 -18 -33z" />
+<glyph unicode="&#x1d42a;" horiz-adv-x="556" d="M536 -205h-267v24q48 7 60.5 23.5t12.5 67.5v132q-44 -56 -123 -56t-132 63.5t-53 169.5q0 108 61.5 181t160.5 73q38 0 66 -12t66 -44l77 55h16v-595q0 -30 10 -40.5t45 -17.5v-24zM342 98v256q0 41 -18.5 64t-48.5 23q-44 0 -69.5 -51t-25.5 -154q0 -98 25 -147t68 -49 q28 0 48.5 15.5t20.5 42.5z" />
+<glyph unicode="&#x1d42b;" horiz-adv-x="444" d="M218 461v-82q35 51 66 72.5t69 21.5q35 0 58 -22.5t23 -56.5q0 -30 -17.5 -49t-45.5 -19q-37 0 -60 38q-14 23 -28 23q-26 0 -43.5 -30t-17.5 -74v-177q0 -48 13.5 -63.5t58.5 -18.5v-24h-265v24q33 6 43.5 17.5t10.5 42.5v289q0 35 -11 47t-44 17v24h190z" />
+<glyph unicode="&#x1d42c;" horiz-adv-x="389" d="M340 326h-25q-19 56 -47 82q-34 32 -75 32q-28 0 -47 -16.5t-19 -41.5q0 -26 22.5 -46.5t73.5 -41.5q75 -31 106.5 -67t31.5 -89q0 -67 -43 -109.5t-111 -42.5q-52 0 -108 23q-15 6 -23 6q-11 0 -26 -28h-25v165h28q32 -132 137 -132q34 0 54.5 18t20.5 47q0 24 -22 44.5 t-74 42.5q-75 32 -108.5 68.5t-33.5 86.5q0 63 44.5 104.5t112.5 41.5q34 0 78 -15q22 -7 31 -7q17 0 25 20h22v-145z" />
+<glyph unicode="&#x1d42d;" horiz-adv-x="333" d="M307 112l25 -11q-31 -62 -64.5 -87.5t-83.5 -25.5q-52 0 -82 28.5t-30 78.5v322h-53v27q49 33 82 71.5t85 114.5h25v-169h95v-44h-95v-298q0 -60 39 -60q29 0 57 53z" />
+<glyph unicode="&#x1d42e;" horiz-adv-x="556" d="M538 20l-63 -7q-83 -9 -132 -26v65q-39 -37 -71.5 -51.5t-73.5 -14.5q-63 0 -98 38t-35 107v241q0 35 -9 47t-40 18v24h188v-334q0 -76 56 -76q39 0 82 47v276q0 34 -12 47t-49 16v24h200v-356q0 -33 12 -47t45 -15v-23z" />
+<glyph unicode="&#x1d42f;" horiz-adv-x="500" d="M485 461v-24q-24 -2 -34 -11.5t-24 -43.5l-160 -396h-26l-120 296q-47 116 -66 141q-8 10 -34 14v24h250v-24l-18 -2q-35 -4 -35 -24q0 -9 9 -31l79 -203l72 182q11 26 11 45q0 18 -11.5 24.5t-43.5 8.5v24h151z" />
+<glyph unicode="&#x1d430;" horiz-adv-x="722" d="M707 461v-24q-19 -4 -29.5 -14.5t-20.5 -35.5l-155 -401h-23l-102 310l-125 -310h-24l-148 374q-19 47 -28.5 60t-28.5 17v24h222v-24q-38 -5 -38 -28q0 -12 39 -115l45 -118l68 171q-4 12 -6 19q-14 49 -22 58.5t-37 12.5v24h234v-24q-28 -2 -38 -7t-10 -17 q0 -14 27 -106q23 -79 34 -127l35 94q44 118 44 128q0 17 -10 24.5t-38 10.5v24h135z" />
+<glyph unicode="&#x1d431;" horiz-adv-x="500" d="M484 0h-241v24q45 3 45 20q0 16 -33 64q-23 32 -42 63q-2 -3 -7.5 -9.5t-8.5 -10.5q-64 -77 -64 -103q0 -21 50 -24v-24h-169v24q28 2 49.5 19.5t63.5 73.5l43 56q5 6 7.5 9.5t3.5 4.5t3.5 4.5t7.5 9.5l-128 197q-15 23 -24 29.5t-28 9.5v24h250v-24q-47 -1 -47 -19 q0 -22 58 -98q10 -12 13 -17l36 46q38 49 38 64q0 11 -7 15.5t-24 6.5l-20 2v24h168v-24q-44 -7 -70 -39l-101 -126l148 -228q8 -13 30 -20v-24z" />
+<glyph unicode="&#x1d432;" horiz-adv-x="500" d="M482 461v-24q-24 -3 -36 -13.5t-24 -41.5l-148 -398q-45 -121 -77 -156q-31 -33 -84 -33q-43 0 -70 22t-27 57q0 29 17 48t45 19q25 0 42.5 -15t17.5 -37q0 -4 -2 -14l-1 -6q0 -7 5 -12t12 -5q38 0 66 82l18 53l-119 290q-49 121 -67 146q-8 10 -34 14v24h249v-24l-16 -1 q-36 -3 -36 -25q0 -7 20 -58l72 -186l68 188q11 32 11 49q0 18 -11 25t-43 8v24h152z" />
+<glyph unicode="&#x1d433;" horiz-adv-x="444" d="M420 160l-16 -160h-383v25l234 404q-106 0 -139 -19t-52 -91h-26l7 142h371v-26l-231 -403h29q61 0 91.5 12.5t55.5 46.5q20 30 31 69h28z" />
+<glyph unicode="&#x1d434;" horiz-adv-x="717" d="M685 0h-285v16h16q40 0 56 14.5t16 46.5q0 7 -2 21l-13 113h-198l-84 -140q-10 -11 -10 -26q2 -29 43 -29h29v-16h-218v16q67 8 108 74l356 577h18l78 -581q10 -70 74 -70h16v-16zM466 248l-25 227h-6l-139 -227h170z" />
+<glyph unicode="&#x1d435;" horiz-adv-x="696" d="M198 653h252q236 0 236 -145q0 -102 -91 -147q-28 -14 -74 -26l3 -4q52 -9 89.5 -44t37.5 -94q0 -82 -72 -137.5t-217 -55.5h-324l4 16h20q52 0 74 16.5t29 46.5l123 495q2 10 2 21q0 42 -78 42h-19zM406 611l-59 -252q30 -6 53 -6q82 0 125 44t43 119q0 52 -35 75 t-84 23q-23 0 -43 -3zM338 314l-68 -267q32 -9 71 -9q80 0 135 41t55 131q0 52 -40 80t-102 28q-36 0 -51 -4z" />
+<glyph unicode="&#x1d436;" horiz-adv-x="671" d="M711 659l-53 -223h-16q1 8 1 42q0 59 -35 101.5t-117 42.5q-72 0 -134 -34t-101.5 -88t-61.5 -119.5t-22 -130.5q0 -91 49.5 -152.5t145.5 -61.5q126 0 216 98q9 10 17 20l20 -13q-35 -53 -89 -92q-87 -61 -193 -61q-138 0 -213 80t-75 198q0 112 60 203t161.5 140.5 t221.5 49.5q27 0 79.5 -13.5t78.5 -13.5t42 27h18z" />
+<glyph unicode="&#x1d437;" horiz-adv-x="790" d="M194 653h282q140 0 214.5 -72.5t74.5 -202.5q0 -162 -115.5 -270t-305.5 -108h-306l4 16h18q90 0 105 62l122 497q4 16 4 24q0 37 -77 37h-25zM405 612l-122 -504q-5 -19 -5 -27q0 -43 95 -43q69 0 123 30.5t85 79.5t47 104t16 111q0 48 -8 89t-26.5 79.5t-56 61 t-89.5 22.5q-35 0 -59 -3z" />
+<glyph unicode="&#x1d438;" horiz-adv-x="714" d="M734 653l-42 -158h-16q2 26 2 35q-4 87 -109 87h-160l-60 -248h80q51 0 81 19t45 76h16l-58 -242h-17q0 2 3 26t3 34q0 51 -72 51h-90l-66 -258q-2 -8 -2 -10q0 -27 63 -27h67q115 0 169 36t88 124h16l-66 -198h-571l4 16h19q89 0 104 62l120 488q5 22 5 36q0 19 -16 27 t-59 8h-19l4 16h534z" />
+<glyph unicode="&#x1d439;" horiz-adv-x="618" d="M723 653l-40 -160h-16q1 8 1 36q-3 87 -110 87h-147l-62 -248h83q36 0 57.5 5.5t41.5 27t30 62.5h16l-60 -242h-16q5 23 5 61q0 50 -70 50h-97l-62 -254q0 -1 -2 -9t-2 -12q0 -41 79 -41h32l-4 -16h-342l4 16h18q52 0 75 16t31 46l124 497q4 16 4 24q0 39 -76 39h-19 l4 15h520z" />
+<glyph unicode="&#x1d43a;" horiz-adv-x="734" d="M734 329v-16q-59 0 -81.5 -15.5t-31.5 -46.5l-62 -216q-37 -22 -80 -33t-68.5 -12.5t-68.5 -1.5q-127 0 -209.5 63.5t-82.5 190.5q0 106 55 203t156.5 160t223.5 63q53 0 103 -16q6 -2 28 -11.5t35 -9.5q15 0 28 12t15 25h16l-45 -223h-16q2 20 2 32q0 62 -40.5 108 t-119.5 46q-66 0 -120.5 -27.5t-90.5 -71.5t-60.5 -100.5t-35.5 -114t-11 -113.5q0 -34 8 -63t27 -56.5t56.5 -43.5t89.5 -16q57 0 97 25l57 201q3 12 3 25q0 18 -16 27.5t-59 9.5h-19l4 16h313z" />
+<glyph unicode="&#x1d43b;" horiz-adv-x="873" d="M923 653l-4 -16h-18q-52 0 -75 -16.5t-31 -46.5l-123 -496q-4 -18 -4 -28q0 -34 78 -34h19l-4 -16h-329l4 16h18q51 0 74.5 16t30.5 46l61 242h-280l-61 -242q-4 -12 -4 -24q0 -38 77 -38h20l-4 -16h-330l4 16h18q91 0 106 62l123 496q4 12 4 24q0 39 -78 39h-20l4 16 h330l-4 -16h-18q-54 0 -76 -16t-29 -47l-52 -217h278l53 217q4 20 4 24q0 39 -76 39h-20l4 16h330z" />
+<glyph unicode="&#x1d43c;" horiz-adv-x="480" d="M530 653l-4 -16h-19q-53 0 -75.5 -16t-30.5 -46l-123 -497q-3 -12 -3 -29q0 -33 78 -33h17l-4 -16h-328l4 16h19q52 0 75 16.5t30 45.5l123 497q4 16 4 24q0 38 -77 38h-18l4 16h328z" />
+<glyph unicode="&#x1d43d;" horiz-adv-x="540" d="M620 653l-4 -16h-18q-92 0 -108 -63l-103 -413q-25 -100 -92 -145q-44 -28 -109 -28q-53 0 -89.5 26.5t-36.5 70.5q0 30 17.5 50.5t52.5 20.5q25 0 44.5 -14.5t19.5 -36.5q0 -17 -13.5 -31.5t-13.5 -27.5q0 -21 24 -21q49 0 74 96q117 455 117 477q0 39 -75 39h-20l4 16 h329z" />
+<glyph unicode="&#x1d43e;" horiz-adv-x="762" d="M802 653l-4 -16q-35 0 -59 -12t-61 -41l-271 -211l187 -278q26 -38 54.5 -58.5t72.5 -20.5l-4 -16h-287l4 16h11q24 0 35.5 6.5t11.5 26.5q0 6 -1.5 11t-3.5 7.5t-5 8.5l-6 8l-156 237h-4l-62 -243q-3 -12 -3 -22q0 -40 78 -40h17l-4 -16h-304l4 16h18q68 0 84 62 l117 472q10 39 10 49q0 38 -76 38h-18l4 16h312l-4 -16h-11q-51 0 -70 -15.5t-27 -46.5l-53 -209h5l282 221q18 14 18 29q-1 11 -11 16t-40 5l4 16h216z" />
+<glyph unicode="&#x1d43f;" horiz-adv-x="708" d="M668 190l-61 -190h-569l4 16h17q92 0 107 62l118 477q7 28 7 45q0 37 -76 37h-18l4 16h327l-4 -16h-18q-52 0 -74.5 -16t-30.5 -47l-122 -481q-5 -19 -5 -31q0 -24 40 -24h122q79 0 122.5 23.5t76.5 91.5q9 14 17 37h16z" />
+<glyph unicode="&#x1d440;" horiz-adv-x="1005" d="M1055 653l-4 -16h-17q-55 0 -76 -15t-29 -46l-127 -498q-2 -7 -2 -28q0 -34 77 -34h19l-4 -16h-330l4 16h17q54 0 76 16.5t29 45.5l112 439h-6l-345 -517h-25l-94 517h-3l-109 -428q-5 -22 -5 -40q0 -33 76 -33h20l-4 -16h-267l4 16h19q54 0 76.5 19t31.5 54l119 475 q5 21 5 38q0 35 -77 35h-19l4 16h213l89 -493h4l333 493h215z" />
+<glyph unicode="&#x1d441;" horiz-adv-x="851" d="M901 653l-4 -16h-18q-53 0 -76.5 -16t-30.5 -47l-144 -574h-24l-274 526h-6l-108 -448q-3 -12 -3 -27q0 -35 76 -35h19l-4 -16h-266l4 16h18q91 0 106 62l126 509q-22 50 -92 50h-19l4 16h200l236 -465h5l97 386q4 18 4 26q0 37 -76 37h-20l4 16h266z" />
+<glyph unicode="&#x1d442;" horiz-adv-x="732" d="M712 420q0 -75 -29 -151t-80 -138.5t-130 -102t-170 -39.5q-112 0 -182.5 65t-70.5 168q0 77 29.5 155.5t81 144t131 106.5t171.5 41q118 0 183.5 -73.5t65.5 -175.5zM596 443q0 86 -34.5 137.5t-106.5 51.5q-66 0 -118 -34t-82.5 -84.5t-50 -115.5t-26.5 -119t-7 -102 q0 -70 39.5 -110t100.5 -40t111 30t81.5 75.5t53 103t30.5 110t9 97.5z" />
+<glyph unicode="&#x1d443;" horiz-adv-x="594" d="M201 653h271q117 0 174.5 -48t57.5 -112q0 -82 -71.5 -140.5t-213.5 -58.5q-44 0 -74 5q-4 0 -12 2l-56 -223q-3 -12 -3 -23q0 -39 77 -39h32l-4 -16h-341l4 16h17q53 0 75.5 16t30.5 46l125 497q4 16 4 25q0 37 -78 37h-19zM411 613l-68 -274q32 -8 60 -8q78 0 130 48 t52 124q0 50 -29.5 81.5t-95.5 31.5q-24 0 -49 -3z" />
+<glyph unicode="&#x1d444;" horiz-adv-x="781" d="M83 -115l164 107q-88 13 -142.5 73.5t-54.5 156.5q0 76 34 155.5t91 143.5t141 105t176 41q110 0 174.5 -65.5t64.5 -181.5q0 -102 -56 -201t-157.5 -164t-219.5 -65l-64 -43l4 -5q21 4 43 4q30 0 114.5 -17t130.5 -17q74 0 136 66l13 -11q-48 -59 -105.5 -89t-141.5 -30 q-68 0 -142 16l-47 11q-34 8 -53.5 12t-33.5 4q-21 0 -58 -18zM612 467q0 163 -130 163q-63 0 -117 -34t-89 -86t-60 -115t-35.5 -119t-10.5 -100q0 -72 35 -110.5t96 -38.5q77 0 139.5 46t98 116t54.5 142.5t19 135.5z" />
+<glyph unicode="&#x1d445;" horiz-adv-x="740" d="M725 16l-2 -16h-169l-150 315q-20 -2 -29 -2q-10 0 -38 4l-62 -239q-3 -12 -3 -23q0 -39 76 -39h19l-4 -16h-325l4 16h16q52 0 74.5 16t30.5 46l124 497q5 20 5 25q0 37 -77 37h-20l4 16h271q113 0 164.5 -41t51.5 -110q0 -62 -48.5 -108.5t-129.5 -62.5l115 -229 q18 -37 41 -60t61 -26zM410 613l-64 -260q17 -4 32 -4q96 0 143.5 38t47.5 104q0 73 -34 99t-91 26q-18 0 -34 -3z" />
+<glyph unicode="&#x1d446;" horiz-adv-x="650" d="M680 668l-53 -221h-16q1 8 1 24q0 68 -40.5 114t-119.5 46q-41 0 -81 -24.5t-40 -72.5q0 -14 3 -27.5t11 -26.5l14 -22q6 -9 20 -22l21 -20q6 -6 24 -21l24 -20q55 -46 86.5 -90.5t31.5 -103.5q0 -79 -65.5 -135t-178.5 -56q-49 0 -107 19t-94 19q-32 0 -55 -38h-16 l60 236h16q0 -5 0.5 -15.5t0.5 -15.5q3 -70 42 -118.5t129 -48.5q156 0 156 136q0 50 -46 96q-16 16 -56.5 51t-57.5 51q-73 73 -73 131q0 69 56.5 122t166.5 53q46 0 106 -18.5t77 -18.5q14 0 24 12t13 25h16z" />
+<glyph unicode="&#x1d447;" horiz-adv-x="550" d="M670 653l-46 -179h-16q5 42 5 71q0 31 -17.5 47.5t-36 20t-45.5 3.5h-98l-133 -538q-5 -22 -5 -25q0 -37 76 -37h21l-4 -16h-329l4 16h18q54 0 76.5 16t29.5 46l133 538h-91q-62 0 -109.5 -40.5t-61.5 -101.5h-16l46 179h599z" />
+<glyph unicode="&#x1d448;" horiz-adv-x="705" d="M775 653l-4 -16h-16q-52 0 -75.5 -16.5t-31.5 -46.5l-87 -356q-9 -36 -20 -65t-32.5 -61.5t-49 -54t-71.5 -36t-99 -14.5q-111 0 -166.5 55t-55.5 132q0 6 6 46.5t8 48.5l76 330q1 2 1 7q0 31 -75 31h-18l4 16h328l-4 -16h-17q-54 0 -76 -16t-30 -47l-90 -360 q-7 -26 -7 -68q0 -45 38 -78.5t106 -33.5q149 0 195 189l86 351q4 14 4 26q-1 19 -17.5 28t-57.5 9h-19l4 16h263z" />
+<glyph unicode="&#x1d449;" horiz-adv-x="575" d="M760 653l-4 -16q-77 -5 -132 -77l-441 -576h-24v571q0 82 -99 82l4 16h294l-4 -16h-19q-44 0 -57 -19t-13 -51v-391l4 -1l280 366q38 48 38 74q0 22 -52 22h-20l4 16h241z" />
+<glyph unicode="&#x1d44a;" horiz-adv-x="916" d="M1101 653l-4 -16q-78 -4 -134 -77l-438 -576h-29v442h-11l-297 -442h-29v569q0 41 -23.5 62.5t-65.5 21.5h-10l4 16h288l-4 -16h-7q-19 0 -29 -1.5t-23 -7.5t-18.5 -21.5t-5.5 -40.5v-377h5l226 332v61q0 55 -82 55h-8l4 16h285l-4 -16h-18q-71 0 -71 -72v-395h6l278 370 q40 52 40 72q0 25 -54 25h-17l4 16h242z" />
+<glyph unicode="&#x1d44b;" horiz-adv-x="790" d="M810 653l-4 -16h-4q-33 0 -58.5 -11t-39.5 -23.5t-37 -39.5l-187 -213l96 -266q11 -32 28 -50t51 -18h14l-4 -16h-281l4 16h11q34 0 50.5 8t16.5 33q0 13 -4 26l-69 194l-181 -201q-12 -13 -12 -28q0 -32 56 -32h22l-4 -16h-249l4 16q78 10 140 77l208 230l-85 231 q-6 18 -10.5 27t-16 25t-30.5 23.5t-45 7.5h-9l4 16h283l-4 -16h-19q-26 0 -39 -7t-13 -28q0 -12 6 -28l60 -179l164 184q15 18 15 34q-2 24 -45 24h-9l4 16h222z" />
+<glyph unicode="&#x1d44c;" horiz-adv-x="535" d="M695 653l-4 -16q-72 -5 -124 -69l-209 -256l-59 -234q-3 -14 -3 -26q0 -36 76 -36h20l-4 -16h-328l4 16h17q53 0 75.5 16t29.5 46l61 246l-89 237q-14 37 -41.5 56.5t-81.5 19.5l4 16h299l-4 -16h-19q-35 0 -46.5 -9.5t-11.5 -30.5q0 -3 7 -27l75 -207h4l174 212 q16 20 16 34q0 28 -79 28l4 16h237z" />
+<glyph unicode="&#x1d44d;" horiz-adv-x="772" d="M802 653l-566 -615h218q42 0 70 4t59.5 17t53 43t34.5 76h16l-46 -178h-581l573 616h-202q-44 0 -71.5 -3t-60.5 -14t-55 -37t-36 -67h-17l48 158h563z" />
+<glyph unicode="&#x1d44e;" horiz-adv-x="502" d="M472 428l-91 -345q-1 -2 -1 -11q0 -17 14 -17q24 0 64 54l12 -12q-28 -42 -64 -74.5t-69 -32.5q-42 0 -42 55q0 15 11 50h-4q-82 -105 -173 -105q-45 0 -67 33.5t-22 85.5q0 67 38 144t104 132.5t134 55.5q30 0 47 -14t19 -32h1l9 33h80zM367 341q0 71 -50 71 q-47 0 -90 -50t-72 -121q-28 -70 -28 -124q0 -66 58 -66q49 0 97 57.5t70 132.5q15 49 15 100z" />
+<glyph unicode="&#x1d44f;" horiz-adv-x="470" d="M214 382l4 -4q65 63 121 63q51 0 81 -43.5t30 -107.5q0 -46 -20 -98t-53.5 -97.5t-85 -75.5t-107.5 -30q-67 0 -139 48l144 563q2 8 2 11q-1 9 -10 15t-19 6q-19 0 -30 -4l-3 16l158 24zM179 252l-55 -215q0 -5 19 -12t36 -7q57 0 102 49t65.5 110.5t20.5 116.5 q0 48 -21 70t-50 22q-47 0 -76 -42.5t-41 -91.5z" />
+<glyph unicode="&#x1d450;" horiz-adv-x="415" d="M363 111l12 -13q-93 -109 -198 -109q-68 0 -102.5 45.5t-34.5 109.5q0 108 79.5 202.5t183.5 94.5q40 0 68.5 -20.5t28.5 -55.5q0 -31 -13.5 -50.5t-40.5 -19.5q-18 0 -28 12t-10 26q0 12 14.5 29.5t14.5 28.5q0 21 -34 21q-55 0 -97.5 -49.5t-60.5 -107t-18 -102.5 q0 -60 27 -84.5t67 -24.5q73 0 142 67z" />
+<glyph unicode="&#x1d451;" horiz-adv-x="532" d="M527 668l-149 -598q-2 -6 -2 -12q0 -9 15 -9q25 0 62 56l11 -12q-28 -41 -63 -73t-67 -32q-40 0 -40 41q0 27 10 64h-5q-84 -105 -171 -105q-49 0 -68.5 38t-19.5 89q0 56 31 130t93 135t133 61q40 0 60 -15t21 -35h2l53 209q2 8 2 12q0 20 -33 20q-6 0 -27 -3l-4 15z M363 340q0 36 -13 53.5t-43 17.5q-46 0 -89.5 -54.5t-67 -123t-23.5 -118.5q0 -34 16 -50t40 -16q50 0 95.5 56t68.5 130q16 51 16 105z" />
+<glyph unicode="&#x1d452;" horiz-adv-x="445" d="M363 112l14 -13q-90 -110 -200 -110q-68 0 -102.5 47t-34.5 109q0 32 6 60q20 89 95.5 162.5t166.5 73.5q40 0 71 -17t31 -59q0 -45 -27.5 -80.5t-71.5 -56t-91.5 -32t-95.5 -13.5v-28q0 -47 33 -77t80 -30q76 0 126 64zM124 211h9q79 0 138.5 46t59.5 111q0 19 -12.5 31 t-31.5 12q-50 0 -93 -61t-70 -139z" />
+<glyph unicode="&#x1d453;" horiz-adv-x="555" d="M248 437h37q28 0 42.5 19.5t29 59.5t29.5 62q59 90 150 90q37 0 58 -16t21 -43q0 -20 -12 -30t-29 -10q-35 0 -35 25q0 8 4.5 21t4.5 16q0 8 -15 8q-36 0 -65 -35.5t-45 -96.5l-19 -70h80l-12 -38h-76l-79 -306q-20 -78 -30 -102q-71 -178 -175 -178q-35 0 -53.5 15 t-18.5 39q0 20 11.5 34.5t31.5 14.5q19 0 28 -10t9 -23q0 -10 -8 -18.5t-8 -13.5q0 -9 15 -9q13 0 25.5 8.5t22.5 25t18 32.5t15.5 41t11.5 40t9.5 38.5t7.5 29.5l87 342h-77z" />
+<glyph unicode="&#x1d454;" horiz-adv-x="492" d="M492 413l-13 -45h-81q17 -20 17 -50q0 -57 -38 -98.5t-103 -49.5q-42 -6 -65 -22t-23 -36t36.5 -32t80 -18.5t80 -31t36.5 -66.5q0 -60 -55.5 -105.5t-159.5 -45.5q-94 0 -139 33t-45 82q0 70 117 108q-24 16 -24 47q0 30 25.5 58.5t59.5 28.5v4q-47 11 -70.5 41 t-23.5 68q0 62 49 110t125 48q60 0 88 -28h126zM336 349q0 31 -11.5 46.5t-42.5 15.5q-39 0 -68.5 -43.5t-29.5 -95.5q0 -81 56 -81q33 0 56 29t31.5 63t8.5 66zM349 -69q0 27 -22.5 44.5t-50 24t-65.5 13.5t-54 13q-1 -1 -11 -6.5t-15 -9.5q-48 -35 -48 -72q0 -39 36 -68 t103 -29q63 0 95 26.5t32 63.5z" />
+<glyph unicode="&#x1d456;" horiz-adv-x="311" d="M257 566q0 -19 -14 -32.5t-34 -13.5q-21 0 -34.5 13t-13.5 33t13.5 35t34.5 15q19 0 33.5 -15.5t14.5 -34.5zM227 441l-92 -364q-1 -6 -1 -14q0 -10 13 -10q6 0 10.5 1.5t7.5 3t9 6.5t9 9t12.5 14t15.5 17l13 -10q-82 -105 -134 -105q-40 0 -40 46q0 31 79 338q2 4 2 12 q0 13 -7 17.5t-24 4.5q-14 0 -28 -4l-3 16z" />
+<glyph unicode="&#x1d457;" horiz-adv-x="389" d="M372 566q0 -19 -14 -32.5t-34 -13.5q-21 0 -34.5 13t-13.5 33t13.5 35t34.5 15q19 0 33.5 -15.5t14.5 -34.5zM351 441l-108 -425q-9 -36 -23.5 -69t-36.5 -64.5t-55 -50.5t-71 -19q-37 0 -55 18.5t-18 42.5q0 20 11.5 36t35.5 16q15 0 25 -10.5t10 -27.5q0 -7 -8 -16.5 t-8 -17.5q0 -3 3 -6.5t7 -3.5q60 0 103 172l92 363q0 22 -32 22q-15 0 -27 -5l-3 17z" />
+<glyph unicode="&#x1d458;" horiz-adv-x="542" d="M527 428l-4 -12q-47 -5 -74 -18t-59 -40l-106 -92l64 -152q13 -31 24 -45t29 -14q9 0 17 4.5t16 13t14 15.5l14 21l13 19l15 -11q0 -1 -8 -17l-16 -26q-6 -11 -18.5 -28.5t-24 -28.5t-28 -19.5t-32.5 -8.5t-29.5 7.5t-23.5 23t-14 24.5l-11 24l-63 147l-56 -49l-45 -166 h-76l148 589q3 9 3 20q0 22 -32 22q-19 0 -27 -2l-3 14l158 25l-113 -456l167 149q21 19 21 36q0 8 -8.5 13.5t-17.5 5.5h-12l4 12h194z" />
+<glyph unicode="&#x1d459;" horiz-adv-x="318" d="M278 668l-148 -591q-1 -4 -1 -11q0 -13 12 -13q15 0 33.5 19t28.5 36l16 -12q-3 -4 -20.5 -25.5t-26 -30.5t-24.5 -23.5t-31.5 -20.5t-32.5 -6q-39 0 -39 51q0 16 6 36l128 510q3 13 3 24q0 22 -31 22q-3 0 -27 -3l-3 15z" />
+<glyph unicode="&#x1d45a;" horiz-adv-x="710" d="M667 107l13 -11q-26 -44 -62 -74t-69 -30q-39 0 -39 49q0 13 6 37l56 221q6 21 6 40q0 38 -24 38q-37 0 -101.5 -94t-77.5 -148l-34 -135h-79l77 299q5 23 5 40q0 38 -23 38q-36 0 -100 -94t-78 -148l-35 -135h-78l95 374q0 31 -33 31q-11 0 -27 -2l-2 14l157 24 l-44 -169h6q111 169 192 169q27 0 41 -23t14 -58q0 -22 -9 -52l-10 -36h5q23 41 58.5 82t71.5 65q32 22 61 22q54 0 54 -71q0 -33 -7 -61l-61 -231q-2 -6 -2 -12q0 -12 15 -12q14 0 31.5 13.5t30.5 39.5z" />
+<glyph unicode="&#x1d45b;" horiz-adv-x="497" d="M467 96l-5 -6q-1 -1 -8.5 -10.5l-10.5 -13.5l-11 -12q-8 -9 -12 -14l-13 -12l-13.5 -11.5t-14 -10t-15 -8t-14.5 -4.5t-16 -2q-41 0 -41 46q0 14 7 40l57 221q7 28 7 42q0 38 -24 38q-44 0 -132 -133q-58 -87 -68 -122l-33 -124h-77l95 374q0 10 -1.5 16.5t-8.5 11 t-20 4.5q-7 0 -28 -3l-2 15l159 23l-51 -189h3q7 0 56 73q93 116 160 116q56 0 56 -62q0 -26 -11 -70l-59 -231q-1 -2 -1 -10q2 -14 15 -14q7 0 14 3.5t14 10.5l12 12q5 5 13 15t9 12z" />
+<glyph unicode="&#x1d45c;" horiz-adv-x="458" d="M438 287q0 -110 -76.5 -204t-186.5 -94q-69 0 -102 49t-33 114t31 131t90.5 112t129.5 46q64 0 105.5 -38.5t41.5 -115.5zM357 318q0 36 -15.5 64.5t-51.5 28.5q-61 0 -115 -91.5t-54 -193.5q0 -107 59 -107q49 0 92 60t64 128t21 111z" />
+<glyph unicode="&#x1d45d;" horiz-adv-x="489" d="M253 370l14 13q61 58 113 58q94 0 94 -155q0 -65 -32.5 -133.5t-92.5 -116.5t-129 -48q-37 0 -61 19l-24 -100q-5 -22 -5 -35q0 -43 61 -43h16l-3 -12h-234l3 12q22 1 36.5 6t23 18t12 22.5t9.5 32.5l117 464q0 12 -1.5 17.5t-8.5 10.5t-21 5q-12 0 -28 -4l-2 16l158 24 l-18 -69zM214 238l-46 -200q18 -21 46 -21q48 0 90 48.5t64 113.5t22 123q0 43 -15.5 63t-35.5 20q-40 0 -75 -41.5t-50 -105.5z" />
+<glyph unicode="&#x1d45e;" horiz-adv-x="458" d="M463 428l-131 -522q-3 -10 -3 -29q0 -22 13 -35t36 -13h14l-3 -12h-250l3 12h19q46 0 65 21t28 57l44 184h-6q-74 -103 -163 -103q-45 0 -67 33.5t-22 81.5q0 89 49.5 173.5t119.5 130.5q50 34 91 34q34 0 52 -15t20 -37h3l7 39h81zM358 338q0 74 -49 74q-27 0 -61 -27 q-48 -39 -85.5 -123t-37.5 -150q0 -63 52 -63q34 0 58 17q50 35 86.5 112.5t36.5 159.5z" />
+<glyph unicode="&#x1d45f;" horiz-adv-x="408" d="M175 267l5 -1q10 20 32 56q75 119 137 119q21 0 32.5 -13.5t11.5 -34.5q0 -31 -18 -56.5t-47 -25.5q-13 0 -21 6t-10.5 13t-6 13t-9.5 6q-27 0 -65.5 -69t-59.5 -124t-28 -80l-21 -76h-77l92 364q4 15 4 23q0 19 -33 19q-9 0 -27 -3l-2 15l157 23z" />
+<glyph unicode="&#x1d460;" horiz-adv-x="440" d="M390 441l-24 -146h-15q0 50 -25.5 85t-66.5 35q-21 0 -36 -14.5t-15 -43.5q0 -22 33.5 -63t67 -89.5t33.5 -89.5q0 -50 -36.5 -87.5t-98.5 -37.5q-20 0 -63.5 10t-46.5 10q-15 0 -30 -21h-17l25 156h16q0 -50 29.5 -90t74.5 -40q40 0 56.5 26.5t16.5 62.5 q0 27 -20.5 56.5t-44.5 52t-44.5 55.5t-20.5 66q0 55 33.5 81t80.5 26q23 0 51 -10t41 -10q14 0 30 20h16z" />
+<glyph unicode="&#x1d461;" horiz-adv-x="313" d="M283 438l-10 -38h-70l-78 -320q-2 -6 -2 -11q0 -12 16 -12q23 2 60 52l13 -11q-2 -2 -11.5 -15.5l-14.5 -20.5l-18 -19q-11 -13 -20 -20l-20 -15q-12 -9 -24.5 -13t-24.5 -4q-39 0 -39 52q0 19 5 37l81 320h-77l5 29q123 23 177 138h13l-31 -129h70z" />
+<glyph unicode="&#x1d462;" horiz-adv-x="474" d="M444 428l-89 -348q-1 -4 -1 -9q0 -14 14 -14q4 0 8.5 1.5t9.5 4.5l8 5q3 3 8 8.5t8 8.5l8 9q5 7 7 9l5 6l13 -11q-19 -27 -32.5 -44.5t-43.5 -40t-56 -22.5q-40 0 -40 52q0 21 4 37l26 95h-1q-2 -1 -28 -34l-58 -71q-33 -38 -51 -51q-38 -28 -72 -28q-61 0 -61 74 q0 29 8 59l59 231q6 23 6 25q0 23 -33 23q-16 0 -26 -3l-3 15l157 26l-84 -326q-3 -13 -3 -24q0 -34 26 -34q41 0 100 77q77 102 109 219l21 75h77z" />
+<glyph unicode="&#x1d463;" horiz-adv-x="506" d="M247 454l-89 -326q-4 -13 -4 -32q0 -30 15.5 -48t44.5 -18q73 0 127 60.5t83 142.5q15 45 15 74q0 25 -9.5 42t-21 24t-21 18t-9.5 25q0 42 54 42q47 0 47 -83q0 -146 -97 -280q-33 -46 -86 -75t-108 -29q-116 0 -116 93q0 32 9 62l58 210q5 20 5 25q0 20 -57 20v15 q14 4 48.5 11t60 14t47.5 17z" />
+<glyph unicode="&#x1d464;" horiz-adv-x="775" d="M531 450l-80 -289q-12 -46 -12 -70q0 -61 59 -61q123 0 195 203q15 45 15 74q0 25 -9.5 42t-20.5 24t-20.5 18t-10.5 25q-1 24 15 33t39 9q47 0 47 -83q0 -44 -12 -95.5t-36 -102.5t-56.5 -92.5t-77.5 -67.5t-94 -26q-111 0 -111 100q0 41 23 125q-17 -39 -38.5 -74 t-51 -71t-67 -58t-77.5 -22q-78 0 -78 87q0 21 19 95l47 177q5 15 5 29q0 22 -54 22v15q84 14 155 44l4 -3l-81 -307q-11 -48 -11 -73q0 -47 28 -47q56 1 153 151q37 56 60.5 116t49.5 153h84z" />
+<glyph unicode="&#x1d465;" horiz-adv-x="550" d="M305 288l45 69q55 84 111 84q49 0 49 -33q0 -16 -10.5 -29t-28.5 -13q-12 0 -24 4.5t-20 4.5q-14 0 -24.5 -5.5t-16 -12t-14.5 -20.5l-55 -85q9 -20 26.5 -75t34.5 -88.5t37 -33.5q33 0 61 57l14 -10q-2 -2 -15 -23t-25.5 -38.5t-33.5 -33.5t-41 -16q-45 0 -73 77 l-40 113l-63 -98q-20 -31 -32.5 -47t-35.5 -30.5t-49 -14.5q-25 0 -38.5 14t-13.5 33q0 14 10.5 25.5t27.5 11.5q13 0 24 -10t23 -10q31 0 70 59l65 101l-33 92q-32 89 -98 89q-23 0 -38 -6l-3 18l132 33q49 -27 75 -98z" />
+<glyph unicode="&#x1d466;" horiz-adv-x="496" d="M270 307l28 -235q71 97 118 184q28 52 28 75q0 8 -13 17.5t-26 22.5t-13 29q0 17 13 28.5t34 11.5q25 0 41 -16.5t16 -45.5q0 -51 -77 -179.5t-127 -191.5l-30 -39l-32 -40l-28 -34q-17 -21 -29.5 -32t-28 -23t-30 -17t-28.5 -5q-26 0 -41 17.5t-15 37.5t13.5 30.5 t26.5 10.5q25 0 38.5 -15.5t18.5 -15.5q12 0 45.5 35t54.5 67l-38 314q-3 30 -7.5 49t-20.5 37.5t-42 18.5l-36 -4l-2 16l150 25q17 -24 24.5 -50.5t14.5 -82.5z" />
+<glyph unicode="&#x1d467;" horiz-adv-x="499" d="M467 450v-16l-322 -360l3 -1q28 21 67 21q31 0 54 -13.5t33.5 -29.5t24 -29.5t28.5 -13.5q27 0 27 24q0 5 -6 15.5t-6 22.5q0 14 12 26t26 12q18 0 29 -12t11 -30q0 -37 -33.5 -58.5t-72.5 -21.5q-9 0 -68 14q-50 14 -99 14q-67 0 -122 -24l-11 10l328 370h-131 q-46 0 -67 -11t-37 -50l-18 4l36 137h314z" />
+<glyph unicode="&#x1d468;" horiz-adv-x="759" d="M724 23l-2 -23h-319l4 23h31q51 0 51 45q0 22 -2 34l-15 108h-159l-80 -139q-6 -12 -6 -22q0 -26 22 -26h56l-6 -23h-260l4 23q37 4 60.5 19t47.5 56l346 587h49l94 -624q6 -38 47 -38h37zM466 256l-23 178l-103 -178h126z" />
+<glyph unicode="&#x1d469;" horiz-adv-x="726" d="M197 669h265q41 0 74.5 -3t68 -13t57.5 -26t38 -44t15 -66q0 -100 -100 -147q-27 -13 -64 -24q49 -9 89.5 -45.5t40.5 -87.5q0 -99 -73.5 -156t-225.5 -57h-340l4 23h40q42 0 58.5 14.5t24.5 47.5l116 502q2 8 2 22q-2 20 -13 28.5t-43 8.5h-37zM440 624l-58 -251 q12 -2 32 -2q24 0 40 4q54 12 81.5 52t27.5 98q0 22 -4.5 42t-22.5 38.5t-47 18.5h-49zM373 324l-64 -274q24 -5 52 -5q68 0 116.5 49t48.5 127q0 103 -122 103h-31z" />
+<glyph unicode="&#x1d46a;" horiz-adv-x="701" d="M745 685l-54 -234h-23q2 20 2 30q0 66 -40 111.5t-121 45.5q-87 0 -156.5 -58t-104.5 -142.5t-35 -174.5q0 -93 43.5 -155.5t129.5 -62.5q168 0 245 114l22 -15q-31 -50 -93 -96q-82 -60 -202 -60q-150 0 -226.5 78t-76.5 210q0 79 33 156.5t95 135.5q125 117 311 117 q33 0 93 -14t79 -14q40 0 57 28h22z" />
+<glyph unicode="&#x1d46b;" horiz-adv-x="818" d="M197 669h289q151 0 227.5 -78.5t76.5 -196.5q0 -76 -29.5 -150t-86.5 -129q-117 -115 -309 -115h-323l4 23h37q42 0 60 14t25 46l116 504q3 12 3 23q0 36 -57 36h-37zM440 624l-117 -508q-7 -28 -7 -32q1 -17 14.5 -26.5t27.5 -11t36 -1.5q65 0 113.5 32.5t75 86 t39.5 111t13 117.5q0 38 -6 75t-20.5 74t-43.5 60t-70 23h-55z" />
+<glyph unicode="&#x1d46c;" horiz-adv-x="732" d="M754 669l-40 -168h-23q3 17 3 38q0 34 -22.5 54t-46.5 25.5t-52 5.5h-135l-55 -239h55q34 0 57 5t46.5 27.5t33.5 62.5h22l-54 -251h-23q6 24 6 65q0 46 -85 46h-69l-58 -258q-2 -12 -2 -17q0 -20 42 -20h65q111 0 171 36.5t91 124.5h22l-61 -206h-600l4 23h36 q42 0 60 14.5t25 46.5l115 504q2 12 2 16q0 42 -59 42h-37l4 23h562z" />
+<glyph unicode="&#x1d46d;" horiz-adv-x="635" d="M750 669l-42 -168h-23q3 17 3 41q0 82 -123 82h-124l-56 -248h59q25 0 43.5 3t39 12t34.5 29.5t21 51.5h24l-57 -253h-23q7 37 7 66q0 46 -84 46h-75l-58 -249q-4 -12 -4 -24q0 -35 60 -35h52l-3 -23h-377l4 23h36q43 0 60.5 14.5t24.5 46.5l116 504q3 12 3 23 q0 35 -60 35h-37l4 23h555z" />
+<glyph unicode="&#x1d46e;" horiz-adv-x="768" d="M768 342l-5 -23h-24q-43 0 -61.5 -14t-27.5 -47l-59 -218q-108 -52 -234 -52q-147 0 -224.5 83.5t-77.5 206.5q0 77 31 151.5t90 131.5q127 124 334 124q46 0 90.5 -16.5t71.5 -16.5q13 0 33 8.5t24 24.5h23l-53 -224h-23q6 21 6 40q0 58 -47 98.5t-119 40.5 q-90 0 -161 -61.5t-106.5 -151.5t-35.5 -185q0 -35 7 -68.5t23 -66.5t48.5 -53.5t77.5 -20.5q47 0 78 20l57 208q4 12 4 24q-1 18 -12 26t-43 8h-35l5 23h345z" />
+<glyph unicode="&#x1d46f;" horiz-adv-x="891" d="M946 669l-5 -23h-37q-43 0 -60 -14t-24 -47l-114 -503q-6 -21 -6 -22v-3q1 -19 12.5 -26.5t45.5 -7.5h41l-5 -23h-349l4 23h23q43 0 61.5 14.5t25.5 46.5l57 251h-242l-59 -253q0 -3 -2 -10.5t-2 -12.5q2 -21 14 -28.5t46 -7.5h25l-5 -23h-349l4 23h36q43 0 61 14.5 t25 46.5l115 503q3 12 3 21q0 38 -57 38h-40l6 23h348l-3 -23h-25q-44 0 -61 -14t-24 -46l-46 -203h242l47 204q3 12 3 23q0 36 -60 36h-37l3 23h364z" />
+<glyph unicode="&#x1d470;" horiz-adv-x="502" d="M557 669l-4 -23h-38q-43 0 -60.5 -14.5t-24.5 -46.5l-116 -503q-1 -5 -1 -25q1 -18 13 -26t45 -8h37l-4 -23h-362l4 23h38q43 0 59 14t24 47l115 502q3 12 3 21q0 39 -57 39h-37l4 23h362z" />
+<glyph unicode="&#x1d471;" horiz-adv-x="558" d="M646 669l-3 -23h-37q-42 0 -61 -14.5t-26 -46.5l-96 -420q-22 -101 -95 -148q-43 -29 -118 -29q-59 0 -101.5 30t-42.5 71q0 31 20.5 54.5t64.5 23.5q31 0 56 -17.5t25 -40.5q0 -17 -13.5 -31.5t-13.5 -27.5q0 -18 19 -18q22 0 43 93l105 463q3 12 3 22q0 36 -56 36h-38 l3 23h362z" />
+<glyph unicode="&#x1d472;" horiz-adv-x="795" d="M839 669l-4 -23q-38 0 -65.5 -14.5t-69.5 -48.5l-248 -201l191 -284q33 -49 60 -62t75 -13l-4 -23h-328l4 23h29q29 0 29 22q0 18 -16 40l-138 208l-48 -211q-1 -5 -1 -21q1 -21 13 -29.5t45 -8.5h38l-5 -23h-354l5 23h30q44 0 59 14t23 47l115 503q4 16 4 23 q0 36 -58 36h-37l4 23h347l-6 -23h-27q-40 0 -56.5 -15.5t-24.5 -48.5l-40 -178h2l243 198q15 13 15 23q0 9 -8.5 15t-22.5 6h-24l4 23h250z" />
+<glyph unicode="&#x1d473;" horiz-adv-x="744" d="M700 199l-59 -199h-599l4 23h35q45 0 62 14t25 47l116 496q2 10 2 15q0 21 -15 36t-45 15h-36l4 23h360l-4 -23h-37q-38 0 -55.5 -16.5t-26.5 -53.5l-115 -492q-3 -15 -3 -16q1 -14 6 -18.5t15 -4.5h120q45 0 77.5 5.5t63.5 21.5t51 47.5t31 80.5z" />
+<glyph unicode="&#x1d474;" horiz-adv-x="1016" d="M1071 669l-3 -23h-34q-46 0 -63.5 -15.5t-25.5 -49.5l-115 -499q-3 -10 -3 -20q0 -39 59 -39h39l-4 -23h-362l4 23h35q44 0 60.5 14.5t24.5 46.5l82 354h-1l-283 -438h-56l-90 441l-80 -348q-3 -15 -3 -40q2 -17 12.5 -23.5t42.5 -6.5h38l-3 -23h-300l4 23h36 q43 0 61.5 17.5t26.5 54.5l111 486q4 12 4 33q0 17 -13.5 24.5t-44.5 7.5h-39l4 23h246l91 -468l297 468h245z" />
+<glyph unicode="&#x1d475;" horiz-adv-x="869" d="M924 669l-3 -23h-38q-43 0 -61.5 -15t-25.5 -49l-131 -582h-57l-263 491l-92 -409q-2 -12 -2 -18v-8q1 -18 12.5 -25.5t44.5 -7.5h39l-4 -23h-301l4 23h36q43 0 60.5 14.5t24.5 46.5l117 510q-21 52 -71 52h-38l3 23h232l222 -435l80 350q2 7 2 20q0 42 -57 42h-37l4 23 h300z" />
+<glyph unicode="&#x1d476;" horiz-adv-x="777" d="M755 432q0 -117 -58 -220.5t-157.5 -165.5t-213.5 -62q-128 0 -199.5 75t-71.5 188q0 107 51 206t151.5 165.5t225.5 66.5q127 0 199.5 -74.5t72.5 -178.5zM601 467q0 73 -32 122t-97 49t-118 -46.5t-83 -116t-45.5 -140t-15.5 -128.5q0 -75 31.5 -125.5t94.5 -50.5 q60 0 112 45.5t84 114t50.5 142t18.5 134.5z" />
+<glyph unicode="&#x1d477;" horiz-adv-x="612" d="M198 669h284q128 0 189.5 -38t61.5 -125q0 -83 -74 -144.5t-223 -61.5q-46 0 -67 3l-51 -221q-4 -20 -4 -24q2 -21 13.5 -28t46.5 -7h52l-4 -23h-380l4 23h40q43 0 60.5 14.5t24.5 46.5l115 504q3 12 3 21q-1 19 -14 28t-46 9h-37zM441 623l-61 -273q22 -5 40 -5 q69 0 113 49t44 127q0 44 -26 73.5t-80 29.5q-21 0 -30 -1z" />
+<glyph unicode="&#x1d478;" horiz-adv-x="810" d="M97 -112l159 101q-88 14 -144.5 82t-56.5 160q0 82 30 163t84 146t136 105t178 40q119 0 195 -70.5t77 -183.5q2 -175 -117 -305t-303 -144l-52 -30q8 1 23 1q35 0 119.5 -17t126.5 -17q86 0 145 68l17 -13q-100 -128 -258 -128q-67 0 -146 17q-118 26 -129 26 q-28 0 -72 -21zM601 479q0 78 -41 118.5t-88 40.5q-53 0 -98 -31.5t-74.5 -81t-50.5 -110.5t-30 -119.5t-9 -109.5q0 -56 30.5 -106t84.5 -50q65 0 119.5 45.5t87.5 115t51 145.5t18 143z" />
+<glyph unicode="&#x1d479;" horiz-adv-x="801" d="M784 23l-4 -23h-223l-154 317q-2 0 -5 0.5t-11 1t-19 0.5l-55 -237q-2 -10 -2 -22q2 -21 12.5 -29t43.5 -8h39l-4 -23h-360l4 23h36q45 0 60.5 14t23.5 47l114 500q4 20 4 27q0 35 -59 35h-37l4 23h284q122 0 178.5 -43.5t56.5 -111.5q0 -61 -46 -108.5t-126 -67.5 l115 -231q20 -41 48.5 -62.5t81.5 -21.5zM379 364h40q72 0 105.5 39.5t33.5 102.5q0 97 -72 114q-21 4 -34 4h-16z" />
+<glyph unicode="&#x1d47a;" horiz-adv-x="671" d="M704 682l-50 -219h-23q0 33 -1 50q-2 51 -50.5 88t-118.5 37q-35 0 -67.5 -21t-32.5 -63q0 -35 18 -66.5t38 -49.5t57 -46q126 -96 126 -210q0 -74 -70.5 -133t-186.5 -59q-79 0 -157 32q-27 9 -41 9q-15 0 -35 -9.5t-33 -29.5h-22l59 245h24v-35q0 -68 48 -115.5 t132 -47.5q67 0 101 33.5t34 85.5q0 70 -43 113q-16 16 -56 48t-66 56t-49 62.5t-23 78.5q0 73 60 121t177 48q52 0 111 -20t68 -20q15 0 30.5 10.5t19.5 26.5h22z" />
+<glyph unicode="&#x1d47b;" horiz-adv-x="568" d="M700 669l-44 -187h-24q7 21 7 54q0 88 -111 88h-78l-123 -541q-4 -24 -4 -25q1 -19 12.5 -27t44.5 -8h42l-3 -23h-368l4 23h40q43 0 60.5 14.5t24.5 46.5l124 540h-75q-74 0 -119 -37.5t-60 -104.5h-22l43 187h629z" />
+<glyph unicode="&#x1d47c;" horiz-adv-x="733" d="M810 669l-4 -23h-38q-44 0 -61.5 -13.5t-24.5 -46.5l-80 -359q-12 -51 -31 -92q-67 -145 -249 -145q-119 0 -179.5 57.5t-60.5 136.5q0 28 15 95l70 307q2 8 2 15q0 45 -60 45h-37l4 23h363l-4 -23h-39q-45 0 -60 -13t-23 -47l-83 -363q-7 -30 -7 -67q0 -45 34 -77.5 t93 -32.5q128 0 170 187l79 355q2 5 2 24q-1 19 -13 26.5t-44 7.5h-37l4 23h299z" />
+<glyph unicode="&#x1d47d;" horiz-adv-x="593" d="M797 669l-4 -23q-46 0 -75.5 -21t-56.5 -57l-431 -583h-52l-20 573q0 14 -1 20q-2 33 -14.5 50.5t-51.5 17.5h-25l3 23h326l-4 -23h-36q-49 0 -49 -69v-8l8 -350l242 336q33 46 33 71q0 11 -7 15.5t-27 4.5h-37l3 23h276z" />
+<glyph unicode="&#x1d47e;" horiz-adv-x="925" d="M1129 669l-3 -23q-33 0 -62 -15.5t-42.5 -30.5t-32.5 -41l-425 -576h-53l-21 407l-260 -407h-53l-21 575q-2 51 -15 69.5t-55 18.5h-20l3 23h314l-4 -23h-22q-29 0 -42.5 -17t-12.5 -61l8 -331l182 278l-3 65q-4 66 -59 66h-24l4 23h318l-4 -23h-37q-52 0 -50 -78l5 -354 l242 331q34 47 34 79q0 13 -7 17.5t-28 4.5h-37l3 23h280z" />
+<glyph unicode="&#x1d47f;" horiz-adv-x="808" d="M830 669l-3 -23h-24q-15 0 -28.5 -3.5t-21.5 -6t-19.5 -13t-15 -14t-16.5 -19t-15 -18.5l-177 -212l98 -270q13 -35 26 -51t36 -16h36l-4 -23h-316l3 23h28q49 0 49 36q0 15 -5 27l-63 171l-154 -179q-8 -9 -8 -22q0 -14 10.5 -23.5t28.5 -9.5h42l-4 -23h-285l4 23 q84 10 142 77l198 229l-89 237q-29 80 -84 80h-27l4 23h318l-4 -23h-39q-34 0 -34 -27q0 -8 8 -32l53 -155l137 162q10 12 10 27q0 25 -28 25h-31l4 23h260z" />
+<glyph unicode="&#x1d480;" horiz-adv-x="549" d="M725 669l-3 -23q-40 0 -67.5 -19t-57.5 -57l-197 -252l-56 -236l-2 -10q-1 -10 -1 -17q0 -32 58 -32h39l-4 -23h-362l4 23h37q43 0 59.5 14.5t24.5 46.5l56 243l-92 238q-17 43 -41.5 62t-80.5 19l3 23h331l-4 -23h-35q-43 0 -43 -28q0 -15 15 -54l63 -172l150 191 q11 14 11 37q0 26 -51 26h-28l4 23h270z" />
+<glyph unicode="&#x1d481;" horiz-adv-x="797" d="M830 669l-548 -623h194q32 0 55.5 2t52 10.5t49 23t38.5 41t28 64.5h23l-44 -187h-612l555 624h-177q-42 0 -68 -3t-60.5 -13.5t-60.5 -36.5t-43 -68h-23l46 166h595z" />
+<glyph unicode="&#x1d482;" horiz-adv-x="581" d="M529 105l19 -12q-29 -51 -65 -77t-90 -26q-29 0 -48.5 17t-20.5 53h-6q-67 -70 -146 -70q-57 0 -92.5 30.5t-35.5 91.5q0 53 21 113.5t57 113.5t90 88t113 35q38 0 60 -19t24 -44h2l11 51h115l-74 -317q-6 -21 -6 -45q0 -31 16 -31q9 0 19 7.5t16.5 15t20.5 25.5z M382 325q0 98 -54 98q-35 0 -74.5 -44t-66.5 -114.5t-27 -139.5q0 -65 45 -65q53 0 115 91t62 174z" />
+<glyph unicode="&#x1d483;" horiz-adv-x="509" d="M263 429l7 -1q47 31 93 31q124 0 124 -163q0 -49 -19 -101.5t-52.5 -98t-86.5 -75t-115 -29.5q-88 0 -164 55l127 563q2 10 2 14q0 17 -14 17q-15 0 -43 -7l-4 23l198 28zM219 253l-47 -203q2 -11 14 -17t23 -6q46 0 85 47.5t58 109.5t19 115q0 49 -14.5 72.5t-34.5 23.5 q-21 0 -39 -15t-30.5 -39t-20.5 -45.5t-13 -42.5z" />
+<glyph unicode="&#x1d484;" horiz-adv-x="477" d="M412 114l18 -8q-92 -116 -224 -116q-86 0 -124 47.5t-38 114.5q0 50 20.5 104t57 100.5t93.5 76t123 29.5q53 0 87.5 -24t34.5 -58q0 -30 -20 -52t-58 -22q-29 0 -40.5 14t-11.5 29q0 20 11.5 32t11.5 21q0 20 -15 20q-49 0 -92 -49.5t-64.5 -110t-21.5 -107.5 q0 -64 28.5 -92t72.5 -28q78 0 151 79z" />
+<glyph unicode="&#x1d485;" horiz-adv-x="595" d="M589 685l-130 -565q-8 -35 -8 -41q0 -24 24 -24q18 0 53 47l19 -11q-16 -40 -59.5 -72.5t-99.5 -32.5q-30 0 -48 21.5t-18 47.5h-5q-67 -69 -141 -69q-65 0 -98.5 34t-33.5 92q0 56 18 115.5t51.5 112t88 86t120.5 33.5q53 0 85 -21l37 152q4 14 4 26q0 22 -17 22 q-12 0 -42 -7l-4 23zM385 346q0 34 -18 53.5t-42 19.5q-59 0 -112.5 -95t-53.5 -202q0 -34 14.5 -50.5t33.5 -16.5q40 0 88.5 56t68.5 127q21 69 21 108z" />
+<glyph unicode="&#x1d486;" horiz-adv-x="498" d="M412 114l19 -7q-46 -57 -97.5 -87t-131.5 -30q-84 0 -121 47.5t-37 110.5q0 34 6 59q30 122 113.5 188.5t172.5 66.5q123 0 123 -84q0 -56 -51.5 -101.5t-116.5 -68t-127 -27.5q-4 -10 -4 -23q0 -59 28.5 -91t73.5 -32q41 0 72.5 17t77.5 62zM358 386q0 20 -7.5 28 t-26.5 8q-48 0 -97 -69t-56 -132q63 9 125 61.5t62 103.5z" />
+<glyph unicode="&#x1d487;" horiz-adv-x="572" d="M249 450h52q17 0 26.5 13t22 48.5t21.5 54.5q23 49 65.5 84t101.5 35q46 0 70 -23t24 -54q0 -28 -15.5 -50t-44.5 -22q-57 0 -57 49q0 20 10 30.5t10 19.5q0 7 -10 7q-22 0 -40.5 -36t-29.5 -91l-13 -65h80l-12 -47h-79l-88 -387q-11 -50 -38 -104q-25 -48 -67 -83 t-100 -35q-46 0 -70 23t-24 54q0 29 15.5 51t44.5 22q30 0 43.5 -15.5t13.5 -37.5q0 -21 -10 -30t-10 -17q0 -7 10 -7q13 0 25 16t22 47t16 55t13.5 62t9.5 45l78 341h-79z" />
+<glyph unicode="&#x1d488;" horiz-adv-x="527" d="M527 435l-14 -60h-77q13 -19 13 -48q0 -60 -40.5 -108t-113.5 -56q-74 -7 -74 -49q0 -17 36 -30t79.5 -22t79.5 -35.5t36 -67.5q0 -60 -59 -111t-170 -51q-100 0 -150.5 35.5t-50.5 82.5q0 39 33 69t86 49q-22 18 -22 51q0 29 22.5 54.5t56.5 32.5q-47 15 -70 47.5 t-23 67.5q0 69 53.5 122.5t138.5 53.5q31 0 58.5 -10t39.5 -21zM334 361q0 61 -32 61q-30 0 -54.5 -46.5t-24.5 -100.5q0 -80 35 -80t55.5 55.5t20.5 110.5zM346 -81q0 34 -23 51.5t-67 26.5q-42 7 -77 17l-17 -13q-14 -11 -26 -33t-12 -43q0 -40 29.5 -66t87.5 -26 q52 0 78.5 24.5t26.5 61.5z" />
+<glyph unicode="&#x1d489;" horiz-adv-x="576" d="M523 105l20 -11q-61 -104 -153 -104q-23 0 -46 12.5t-23 33.5q0 15 7 46l54 223q3 15 3 42q0 37 -29 37q-40 0 -93 -92.5t-73 -182.5l-25 -109h-115l138 599q2 8 2 15q0 9 -2 12t-9 3t-44 -10l-5 28l188 38l-81 -354l2 -1q27 50 78.5 89.5t101.5 39.5q89 0 89 -83 q0 -28 -7 -56l-50 -213q-2 -8 -2 -21q0 -28 20 -28q18 0 54 47z" />
+<glyph unicode="&#x1d48a;" horiz-adv-x="357" d="M300 558q0 -24 -19 -43t-47 -19q-27 0 -46.5 19.5t-19.5 42.5q0 22 19.5 42t46.5 20q28 0 47 -19.5t19 -42.5zM255 104l19 -12q-57 -101 -152 -101q-67 0 -67 56q0 16 4 31l66 285q5 22 5 27q0 18 -20 18q-21 0 -37 -3l-4 23l197 34l-78 -331q-8 -30 -8 -48 q0 -10 6 -17.5t15 -7.5q5 0 10 2t8.5 4.5t9 8t8.5 9t9 11.5t9 11z" />
+<glyph unicode="&#x1d48b;" horiz-adv-x="431" d="M414 558q0 -24 -19 -43t-47 -19q-27 0 -46.5 19.5t-19.5 42.5q0 22 19.5 42t46.5 20q28 0 47 -19.5t19 -42.5zM384 462l-102 -447q-10 -43 -36 -96q-26 -50 -69 -88t-101 -38q-46 0 -70 23t-24 54q0 29 15.5 51t44.5 22q26 0 41.5 -16t15.5 -37q0 -20 -10.5 -30 t-10.5 -15q0 -9 10 -9q37 0 73 160l84 368q3 14 3 25q0 18 -20 18q-21 0 -37 -3l-4 23z" />
+<glyph unicode="&#x1d48c;" horiz-adv-x="580" d="M563 450l-6 -19q-34 -4 -58.5 -14t-38 -20t-35.5 -32l-95 -94l64 -150q25 -57 40 -57q32 0 51 67h25q0 -15 -11.5 -46t-41.5 -63.5t-67 -32.5q-18 0 -30.5 4t-23 15.5t-14.5 16.5t-13.5 24t-10.5 22l-64 124l-24 -22l-39 -173h-116l138 602q2 6 2 16q0 13 -11 13 q-4 0 -44 -9l-5 27l193 37l-97 -423l124 111q7 6 15.5 19.5t8.5 23.5q0 12 -17 12h-30l7 21h224z" />
+<glyph unicode="&#x1d48d;" horiz-adv-x="346" d="M310 685l-132 -574q-4 -15 -4 -31q2 -14 18 -14q24 0 52 37l19 -15q-22 -35 -64.5 -66t-88.5 -31q-25 0 -42.5 12t-17.5 34t6 47l118 515q2 12 2 16q0 15 -11 15q-10 0 -44 -10l-5 28z" />
+<glyph unicode="&#x1d48e;" horiz-adv-x="760" d="M708 106l19 -15q-58 -100 -157 -100q-22 0 -41 13t-20 35q0 17 11 66l46 202q9 42 9 60q0 22 -16 22q-25 0 -81 -98t-67 -151l-29 -140h-119l73 307q8 36 8 60q-2 21 -18 21q-25 0 -78 -96.5t-66 -151.5l-32 -140h-117l89 388q0 26 -12 26q-9 0 -45 -9l-5 28l197 34 l-27 -111h2q77 106 153 106q37 0 56.5 -26t20.5 -59q0 -9 -2 -19q28 33 45 50.5t48.5 35.5t62.5 18q37 0 56 -21.5t19 -55.5q0 -33 -8 -68l-41 -186q-8 -37 -8 -46q0 -24 23 -24q21 0 51 45z" />
+<glyph unicode="&#x1d48f;" horiz-adv-x="559" d="M506 105l20 -11q-61 -104 -153 -104q-68 0 -68 58q0 10 6 34l54 223q3 15 3 47q0 35 -29 35q-40 0 -93 -94t-73 -184l-25 -109h-115l88 384q2 8 2 15q0 9 -2 12t-9 3q-14 0 -47 -9l-5 28l195 34l-27 -111h4q25 47 71.5 76.5t98.5 29.5q89 0 89 -81q0 -33 -7 -61l-50 -213 q-3 -18 -3 -22q0 -27 21 -27q18 0 54 47z" />
+<glyph unicode="&#x1d490;" horiz-adv-x="561" d="M539 297q0 -136 -90.5 -221.5t-217.5 -85.5q-88 0 -137.5 48.5t-49.5 131.5q0 126 87.5 209t207.5 83q91 0 145.5 -43t54.5 -122zM423 300q0 64 -25 93t-64 29q-64 0 -119 -88t-55 -176q0 -71 21 -99.5t67 -28.5q68 0 121.5 86t53.5 184z" />
+<glyph unicode="&#x1d491;" horiz-adv-x="571" d="M294 429h5q36 33 91 33q68 0 116 -41t48 -130q0 -121 -85.5 -212t-187.5 -91q-59 0 -88 19l-25 -105q-4 -16 -4 -32q0 -54 41 -54h36l-7 -21h-267l7 21q38 5 52.5 26t24.5 63l103 440q5 25 5 39q0 32 -23 32q-10 0 -25 -4l-6 17l198 40zM244 241l-33 -154q1 -31 20 -45 t47 -14q55 0 108.5 85.5t53.5 175.5q0 67 -19.5 95t-57.5 28t-71 -50.5t-48 -120.5z" />
+<glyph unicode="&#x1d492;" horiz-adv-x="526" d="M532 450l-129 -562q-5 -18 -5 -27q1 -45 32 -45h34l-6 -21h-288l6 21h36q35 0 50.5 19t23.5 53l38 168h-1q-27 -37 -72 -51.5t-81 -14.5q-58 0 -92 40t-34 96q0 78 32.5 154t98 129t147.5 53q65 0 85 -50h4l10 38h111zM388 346q0 37 -18.5 57t-42.5 20q-66 0 -117.5 -97 t-51.5 -209q0 -70 53 -70q55 0 116 94.5t61 204.5z" />
+<glyph unicode="&#x1d493;" horiz-adv-x="441" d="M257 467l-20 -91q57 86 125 86q29 0 45.5 -16.5t16.5 -38.5q0 -31 -21 -58.5t-60 -27.5q-18 0 -26.5 9.5t-12.5 19t-10 9.5q-27 0 -70.5 -112.5t-56.5 -166.5l-20 -80h-114l88 380q0 2 1.5 10t1.5 11q0 15 -16 15q-11 0 -41 -11l-3 28z" />
+<glyph unicode="&#x1d494;" horiz-adv-x="474" d="M419 462l-22 -160h-22q-1 52 -29 87.5t-59 35.5q-46 0 -46 -55q0 -8 3 -17t11.5 -21t14.5 -18l20 -24l19 -22q4 -4 15 -17.5t14.5 -17.5t12.5 -15.5t11.5 -17.5t8.5 -17t7 -19l4 -20q2 -12 2 -25q0 -53 -42 -91t-113 -38q-34 0 -67.5 10.5t-42.5 10.5q-17 0 -39 -22h-25 l22 165h24q1 -51 35 -89.5t71 -38.5q32 0 47.5 23t15.5 57q0 11 -2.5 21t-9 20t-10.5 15.5t-13.5 16t-11.5 12.5q-3 4 -15 17.5t-16 19.5l-15 18l-15 20l-12 18q-7 12 -10 21t-5.5 19.5t-2.5 20.5q0 56 39.5 86.5t90.5 30.5q33 0 61 -11t32 -11q29 0 39 22h25z" />
+<glyph unicode="&#x1d495;" horiz-adv-x="351" d="M318 460l-12 -47h-67l-69 -302q-3 -15 -3 -19q0 -32 20 -32q23 0 54 44l20 -10q-24 -45 -64.5 -74.5t-86.5 -29.5q-66 0 -66 61q0 18 4 33l76 329h-74l8 47q43 0 70.5 7t45.5 27.5t26.5 38t24.5 59.5h54l-29 -132h68z" />
+<glyph unicode="&#x1d496;" horiz-adv-x="535" d="M482 104l20 -10q-59 -104 -155 -104q-23 0 -44.5 12.5t-22.5 34.5q0 38 17 82h-3q-80 -129 -182 -129q-79 0 -79 82q0 27 7 57l54 238q3 17 3 25q0 21 -13 21q-9 0 -44 -7l-3 24l194 33l-79 -344q-6 -18 -6 -32q0 -22 21 -22q36 0 104 104.5t86 190.5l19 90h113l-78 -338 q-2 -10 -2 -19q0 -35 19 -35q20 0 54 46z" />
+<glyph unicode="&#x1d497;" horiz-adv-x="554" d="M60 412v24q79 3 229 37q-7 -22 -18 -63.5t-16 -57.5q-1 -2 -21.5 -69t-30.5 -108t-10 -66q0 -42 50 -42q46 0 115 77.5t83 129.5q5 18 5 34q0 25 -23.5 50.5t-23.5 54.5q0 24 19.5 42t43.5 18q31 0 54 -23t23 -54q0 -38 -38 -109q-40 -75 -99 -145t-124 -113 q-64 -43 -130 -43q-41 0 -68.5 20t-27.5 59t9.5 83.5t30.5 115.5l25 82q7 30 7 39q0 27 -64 27z" />
+<glyph unicode="&#x1d498;" horiz-adv-x="814" d="M565 461l-76 -278q-20 -71 -20 -87q0 -29 34 -29q37 0 81.5 43t77.5 91q44 61 44 105q0 29 -23.5 53t-23.5 54q0 24 19.5 42t43.5 18q32 0 54.5 -22.5t22.5 -54.5q0 -40 -38 -109q-40 -74 -100.5 -145.5t-123.5 -113.5t-129 -42q-42 0 -58 20t-16 63q0 19 24 91 q-98 -174 -214 -174q-41 0 -66.5 20.5t-25.5 60.5q0 49 17 110l37 133q18 63 18 76q0 26 -49 26h-15v24q112 7 230 37l-91 -312q-14 -51 -14 -68q0 -29 24 -29q30 0 64 38t54.5 75t35.5 73q26 61 64 211h138z" />
+<glyph unicode="&#x1d499;" horiz-adv-x="587" d="M327 334l22 34q61 94 122 94q33 0 52.5 -15.5t19.5 -34.5q0 -66 -62 -66q-17 0 -26 17t-14 17q-10 0 -16.5 -7.5t-21.5 -32.5l-47 -79l49 -138q1 -4 4 -13t5 -14.5t5.5 -12.5t8 -10.5t10.5 -3.5q16 0 28.5 12.5t26.5 55.5h24q-38 -145 -119 -145q-21 0 -37 7t-26.5 20.5 t-16 24.5t-12.5 29l-29 75l-36 -62q-56 -94 -130 -94q-36 0 -57 17.5t-21 42.5t15.5 41.5t44.5 16.5q20 0 28.5 -11t11 -22.5t9.5 -11.5q8 0 17 11.5t32 47.5l61 97l-33 91q-17 47 -35 69t-45 22q-14 0 -52 -15l-8 24l153 50q65 -38 89 -109z" />
+<glyph unicode="&#x1d49a;" horiz-adv-x="519" d="M330 128h1q30 44 61 102q46 85 46 107q0 10 -7 15.5t-16 9t-16 15t-7 31.5q0 16 18.5 35t41.5 19q70 0 70 -75q0 -51 -72.5 -186t-123.5 -211l-52 -76q-16 -23 -46.5 -57.5t-57.5 -48t-57 -13.5q-38 0 -57 18t-20 40q-1 25 12 45.5t48 20.5q18 0 28.5 -12.5t15 -24.5 t10.5 -12q10 0 41 41.5t45 76.5l-53 317q-4 26 -6.5 37.5t-8.5 31.5t-14.5 28.5t-20.5 8.5q-8 0 -51 -8l-4 24l170 33q18 -15 34 -58.5t22 -83.5z" />
+<glyph unicode="&#x1d49b;" horiz-adv-x="531" d="M499 451l-318 -336l1 -1q17 4 39 4q33 0 62.5 -27t49.5 -53.5t32 -26.5q18 0 18 19q0 7 -10 22.5t-10 29.5q0 24 16.5 41.5t40.5 17.5q25 0 43 -18t18 -43q0 -52 -39 -75.5t-96 -23.5q-34 0 -100 12t-100 12q-46 0 -93 -19l-18 25l321 340h-165q-35 0 -49 -9.5t-25 -41.5 l-24 3l46 158h360v-10z" />
+<glyph unicode="&#x1d49c;" horiz-adv-x="855" d="M837 672l9 -14q-103 -202 -265 -589q60 12 103 34l9 -16q-42 -31 -124 -45l-17 -42h-97l18 39q-90 6 -162 40q-92 -94 -173 -94q-48 0 -77.5 26t-29.5 66q0 32 18 52t44 20q21 0 35.5 -14t14.5 -34q0 -18 -11.5 -33t-31.5 -15q-22 0 -29 12h-2q0 -17 18 -33.5t47 -16.5 q41 0 74 17.5t76 59.5q-122 69 -122 207q0 83 57 132t130 49q102 0 161 -82q43 62 75.5 104.5t73 85.5t79 64.5t75.5 21.5q16 0 24 -2zM772 638h-1q-56 -20 -112.5 -86t-132.5 -181q31 -61 33 -144q129 283 213 411zM536 199q0 84 -29 145q-112 -172 -172 -239 q67 -32 151 -38l49 109q1 8 1 23zM492 372q-50 75 -143 75q-57 0 -101.5 -42t-44.5 -104q0 -118 107 -182q63 69 182 253z" />
+<glyph unicode="&#x1d49e;" horiz-adv-x="797" d="M449 645l-12 -19q-55 31 -136 31q-53 0 -102.5 -16.5t-85 -53.5t-35.5 -86q0 -62 43 -97.5t108 -42.5q81 125 216.5 216.5t239.5 91.5q46 0 71 -19.5t25 -55.5q0 -60 -66.5 -123t-177 -105t-225.5 -42q-69 -100 -69 -199q0 -49 31 -79.5t86 -30.5q80 0 141 50t61 108 q0 37 -20.5 55.5t-50.5 18.5q-54 0 -102.5 -53t-55.5 -131l-22 2q0 91 58.5 158t138.5 67q55 0 86.5 -26.5t31.5 -76.5q0 -41 -27 -80t-69 -68q-78 -54 -174 -54q-85 0 -141 46.5t-56 126.5q0 81 48 171q-71 12 -120.5 55t-49.5 115q0 75 71.5 131.5t184.5 56.5 q91 0 156 -42zM331 355l1 -1q123 0 244 62q73 37 118.5 85t45.5 91q0 40 -50 40q-72 0 -173.5 -79t-185.5 -198z" />
+<glyph unicode="&#x1d49f;" horiz-adv-x="885" d="M810 587l8 -20q-27 -12 -37.5 -20t-33.5 -33q57 -89 57 -190q0 -140 -98.5 -239.5t-223.5 -99.5q-70 0 -156 33q-75 -27 -161 -27q-61 0 -95 17t-34 46q0 25 30 40t77 15q71 0 170 -52q82 50 203 246q83 135 179 216q-44 61 -121 98.5t-159 37.5q-144 0 -224.5 -64 t-80.5 -169q0 -60 46 -102.5t118 -42.5q96 0 155.5 64.5t60.5 196.5h19q2 -15 2 -43q0 -63 -23 -113t-59.5 -78t-76 -42.5t-76.5 -14.5q-89 0 -148 50.5t-59 132.5q0 110 97.5 183.5t241.5 73.5q96 0 179.5 -39t137.5 -105q39 28 85 44zM756 336q0 76 -37 144 q-41 -55 -103 -178q-75 -151 -196 -234q-33 -22 -53 -32q58 -20 111 -20q114 0 196 87.5t82 232.5zM276 39q-75 40 -132 40q-67 0 -67 -25q0 -33 87 -33q66 0 112 18z" />
+<glyph unicode="&#x1d4a2;" horiz-adv-x="773" d="M417 653l-9 -18q-49 22 -111 22q-76 0 -124.5 -34t-48.5 -82q0 -44 37 -74t102 -39q69 109 177 175t197 66q44 0 73.5 -20.5t29.5 -55.5q0 -50 -57.5 -97.5t-150 -76.5t-189.5 -29q-41 -60 -41 -128q0 -29 17 -48t49 -19q54 0 117.5 35.5t151.5 115.5l15 -16 q-34 -34 -66 -121q-82 -224 -330 -224q-72 0 -120.5 33.5t-48.5 76.5q0 30 16.5 49.5t42.5 19.5q20 0 35.5 -14t15.5 -33q0 -21 -12 -36t-32 -15q-21 0 -29 13h-2q5 -24 41.5 -43.5t82.5 -19.5q87 0 145.5 48t108.5 144l-1 1q-66 -44 -138 -44q-60 0 -98.5 34.5t-38.5 92.5 q0 55 26 106q-78 13 -122.5 49.5t-44.5 93.5q0 61 59 103.5t148 42.5q70 0 127 -34zM699 590q0 20 -16 31t-41 11q-65 0 -149 -63.5t-132 -148.5q83 0 162.5 26t127.5 65.5t48 78.5z" />
+<glyph unicode="&#x1d4a5;" horiz-adv-x="802" d="M552 193l15 -16q-71 -63 -151 -92q-53 -102 -145 -182t-184 -80q-36 0 -57 18t-21 47q0 75 125 134q35 16 190 64q20 39 53.5 125t49.5 120q-55 11 -88 44.5t-33 88.5q0 49 25.5 88.5t66.5 62t86.5 34t90.5 11.5t127 -6q36 20 66 20q9 0 16.5 -5.5t7.5 -14.5 q0 -48 -104 -48q-66 -47 -152 -240q77 18 131 101l16 -11q-53 -103 -162 -124l-87 -208q68 26 118 69zM639 605v1q-26 2 -43 2q-82 0 -130 -17q-49 -18 -84 -54t-35 -83q0 -38 28.5 -64t67.5 -27q81 159 196 242zM302 43q-17 -6 -55.5 -17.5t-63 -20t-44.5 -18.5 q-88 -43 -88 -97q0 -15 10 -26t26 -11q61 0 112.5 49t102.5 141z" />
+<glyph unicode="&#x1d4a6;" horiz-adv-x="1009" d="M771 669l13 -16q-26 -20 -49.5 -44t-40 -43.5t-37 -51t-30.5 -48.5l-31 -54l-29 -52q27 0 42 -14q32 7 60 33.5t72 91.5q76 111 125.5 163.5t86.5 52.5q22 0 36.5 -10.5t14.5 -30.5t-11 -32.5t-31 -12.5q-16 0 -30 11.5t-15 33.5h-1q-8 -7 -18.5 -26t-24.5 -49.5 t-24 -48.5q-49 -89 -97.5 -133.5t-113.5 -65.5v-2q48 -48 48 -89q0 -37 -38 -100t-38 -80q0 -34 32 -34q57 0 169 129l19 -15q-117 -144 -202 -144q-37 0 -65 23.5t-28 58.5q0 41 42.5 108t42.5 97q0 31 -40 31q-26 0 -34 15q-46 -101 -93 -169.5t-93 -103.5t-87.5 -49 t-89.5 -14q-63 0 -103 32t-40 74q0 30 17 52t46 22q20 0 33.5 -14t13.5 -36q0 -20 -12 -34.5t-32 -14.5q-21 0 -29 13h-2q3 -25 33 -44t73 -19q60 0 105 44t105 150l44 80q31 57 43.5 78t38.5 59t53 66t63 57l-1 3q-15 -5 -36 -5q-44 0 -124 44q-63 34 -102 34 q-48 0 -83 -30.5t-35 -70.5t27 -67t73 -27q77 0 131 86l18 -9q-54 -107 -151 -107q-60 0 -99.5 35.5t-39.5 90.5q0 59 51 105t126 46q29 0 58 -10.5t84 -38.5q60 -31 86 -31q34 0 76.5 19t78.5 52z" />
+<glyph unicode="&#x1d4a9;" horiz-adv-x="970" d="M569 131h1q35 54 122 263q82 196 138 256q34 37 74 37q23 0 37.5 -12.5t14.5 -33.5t-12.5 -33.5t-30.5 -12.5q-16 0 -31.5 11.5t-15.5 33.5h-3q-48 -25 -151 -277q-36 -89 -61.5 -145.5t-68.5 -125.5t-86 -105h-20q26 104 32 310q5 188 27 265l-1 1q-60 -81 -143 -248 q-91 -182 -150 -256t-123 -74q-34 0 -57 22.5t-23 54.5q0 29 17 47.5t42 18.5q22 0 37 -15.5t15 -35.5q0 -18 -11.5 -31.5t-30.5 -13.5q-9 0 -16 4h-3q1 -10 10.5 -16t20.5 -6q53 0 108.5 74t129.5 224q157 318 252 357l13 -11q-14 -48 -26 -267q-8 -165 -27 -260z" />
+<glyph unicode="&#x1d4aa;" horiz-adv-x="692" d="M663 549l-20 -2q-31 98 -126 98q-81 0 -170.5 -85.5t-147 -202.5t-57.5 -207q0 -58 29 -96.5t85 -38.5q113 0 213 103q42 44 79.5 118t37.5 160q0 52 -27.5 81t-64.5 29q-51 0 -89.5 -43t-38.5 -116q0 -53 27 -105l-22 -10q-35 57 -35 130q0 77 48.5 128.5t112.5 51.5 q55 0 97.5 -36.5t42.5 -109.5q0 -72 -30.5 -145.5t-80.5 -132.5t-121 -96t-147 -37q-83 0 -129.5 58.5t-46.5 144.5q0 126 59.5 240t161.5 183t218 69q64 0 103 -38t39 -93z" />
+<glyph unicode="&#x1d4ab;" horiz-adv-x="910" d="M856 669l7 -19q-34 -14 -66 -38q89 -67 89 -165q0 -68 -43.5 -121.5t-105.5 -53.5q-35 0 -53.5 19t-18.5 47q0 22 16 43.5t42 35.5l10 -18q-36 -21 -36 -54q0 -13 9 -21t25 -8q41 0 67.5 43t26.5 106q0 75 -55 123q-24 -23 -45.5 -57t-35.5 -62l-39 -81l-40 -86 q-84 -169 -181 -243t-218 -74q-77 0 -125 36t-48 87q0 31 17 51t42 20q22 0 36.5 -13.5t14.5 -34.5q0 -20 -11.5 -34t-31.5 -14q-23 0 -30 12h-2q0 -28 35 -53.5t85 -25.5q94 0 156 52.5t146 202.5l64 113q21 36 54 86t63.5 81.5t65.5 57.5q-76 48 -192 48q-149 0 -250 -75 t-101 -174q0 -41 30 -68.5t73 -27.5q158 0 205 249h20q-8 -113 -67 -196t-160 -83q-63 0 -102.5 35.5t-39.5 94.5q0 107 111 191t282 84q125 0 221 -59q36 23 84 41z" />
+<glyph unicode="&#x1d4ac;" horiz-adv-x="692" d="M663 549l-20 -2q-31 98 -126 98q-81 0 -170.5 -85.5t-147 -202.5t-57.5 -207q0 -58 29 -96.5t85 -38.5q71 0 134 38q-27 43 -60 43q-38 0 -76 -29l-13 17q62 58 108 58q53 0 86 -56q28 25 34 32q42 44 79.5 118t37.5 160q0 52 -27.5 81t-64.5 29q-51 0 -89.5 -43 t-38.5 -116q0 -53 27 -105l-22 -10q-35 57 -35 130q0 77 48.5 128.5t112.5 51.5q55 0 97.5 -36.5t42.5 -109.5q0 -95 -50.5 -190t-132.5 -154q26 -42 62 -42q53 0 102 48l15 -14q-68 -82 -133 -82q-33 0 -53 16t-39 45q-73 -38 -150 -38q-83 0 -129.5 58.5t-46.5 144.5 q0 126 59.5 240t161.5 183t218 69q63 0 102.5 -38t39.5 -93z" />
+<glyph unicode="&#x1d4ae;" horiz-adv-x="743" d="M397 143l-20 -4q-21 71 -54 94t-82 23q-40 0 -76 -33.5t-36 -85.5t41.5 -87t101.5 -35q76 0 134.5 47t58.5 129q0 29 -16 56.5t-39 50.5l-47 48q-23 24 -39 57t-16 69q0 67 42 116.5t97.5 70.5t113.5 21q56 0 98 -29t42 -87q0 -53 -44.5 -91t-97.5 -38v21q48 5 78.5 33 t30.5 74q0 42 -31.5 61.5t-76.5 19.5q-63 0 -119 -44.5t-56 -108.5q0 -30 16.5 -58.5t40.5 -52.5l48 -49q24 -25 40.5 -58t16.5 -69q0 -99 -82 -159t-201 -60q-81 0 -139 39t-58 118q0 71 50.5 114t116.5 43q61 0 107.5 -39.5t55.5 -116.5z" />
+<glyph unicode="&#x1d4af;" horiz-adv-x="912" d="M896 675l11 -18q-89 -73 -176 -73q-57 0 -181 28.5t-168 28.5q-92 0 -152.5 -47.5t-60.5 -113.5q0 -57 34 -89t83 -32q71 0 116.5 46.5t73.5 135.5h20q-20 -101 -76 -156.5t-141 -55.5q-64 0 -107.5 39.5t-43.5 104.5q0 96 87.5 155t223.5 59q56 0 175.5 -26.5 t168.5 -26.5q51 0 113 41zM658 553l13 -14q-38 -37 -63.5 -92t-50.5 -143q-23 -81 -69.5 -149.5t-109.5 -109.5q-90 -60 -187 -60q-61 0 -104.5 30.5t-43.5 75.5q0 35 17 54.5t44 19.5q20 0 34.5 -14.5t14.5 -34.5t-12.5 -34.5t-32.5 -14.5q-21 0 -28 12h-2q3 -27 31.5 -45 t74.5 -18q83 0 142.5 57t127.5 204q48 103 93 161.5t111 114.5z" />
+<glyph unicode="&#x1d4b0;" horiz-adv-x="842" d="M805 658l-296 -550q-17 -32 -17 -55q0 -35 33 -35q56 0 168 129l21 -13q-120 -146 -203 -146q-37 0 -61.5 21.5t-24.5 56.5q0 33 17 71l-3 1q-53 -72 -107.5 -112.5t-97.5 -40.5q-36 0 -58.5 24t-22.5 64q0 57 70 167l145 227q36 56 36 101q0 36 -38 60t-83 24 q-84 0 -145 -49.5t-61 -128.5q0 -37 19.5 -60.5t53.5 -23.5q98 0 139 119h20q-12 -56 -55 -102.5t-103 -46.5q-51 0 -83 31.5t-32 82.5q0 90 78.5 151.5t177.5 61.5q73 0 126 -38.5t53 -107.5q0 -66 -38 -124l-186 -287q-39 -61 -39 -87q0 -28 29 -28q39 0 93.5 47.5 t106 117.5t90 130t62.5 105l130 243h86z" />
+<glyph unicode="&#x1d4b1;" horiz-adv-x="932" d="M214 21l2 -2q54 11 102.5 41t98 83t91 109.5t99.5 144.5q52 80 82 122t66 86.5t63.5 63t53.5 18.5q21 0 35.5 -13t14.5 -34q0 -18 -12.5 -30.5t-30.5 -12.5q-20 0 -32 13t-12 36h-1q-52 -30 -200 -261q-146 -228 -249 -308q-117 -92 -204 -92q-14 0 -47 6q41 38 68.5 89 t78.5 182q35 88 79 152t114 131l-3 3q-15 -5 -36 -5q-52 0 -131 41.5t-110 41.5q-48 0 -83 -30.5t-35 -70.5t27.5 -67t72.5 -27q77 0 131 86l16 -9q-54 -107 -149 -107q-60 0 -99.5 35.5t-39.5 90.5q0 57 55.5 104t127.5 47q28 0 52.5 -9.5t83.5 -39.5q60 -31 86 -31 q65 0 124 49l27 22l15 -15q-72 -77 -108.5 -141.5t-76.5 -165.5q-88 -219 -207 -326z" />
+<glyph unicode="&#x1d4b2;" horiz-adv-x="1078" d="M455 24l2 -2q68 27 130 99.5t137 201.5q126 219 183.5 291.5t112.5 72.5q21 0 35.5 -12.5t14.5 -34.5q0 -18 -12.5 -30.5t-30.5 -12.5q-43 0 -43 50h-1q-27 -8 -80 -87.5t-166 -273.5q-175 -301 -319 -301q-33 0 -46 4q85 80 141 233q44 122 99.5 214t137.5 179l-1 1 q-97 -17 -262 -312q-177 -319 -326 -319q-19 0 -47 6q31 26 59 72t44.5 85t43.5 111q56 150 192 287l-2 2q-15 -5 -36 -5q-49 0 -125 41.5t-106 41.5q-47 0 -77.5 -30t-30.5 -71t24 -67.5t66 -26.5q38 0 66 21.5t55 64.5l16 -9q-54 -107 -139 -107q-56 0 -92.5 35.5 t-36.5 90.5q0 59 46.5 105t116.5 46q49 0 146 -49q7 -4 19 -10t17 -9t13 -6t14.5 -4.5t12.5 -1.5q65 0 124 49l27 22l15 -16q-117 -115 -196 -321q-79 -205 -196 -310l2 -3q50 18 104 74t88 108.5t75 125.5q183 324 309 324q18 0 51 -11q-21 -15 -39 -36t-38 -60l-30 -57 q-9 -19 -34.5 -78.5t-31.5 -74.5q-91 -206 -195 -310z" />
+<glyph unicode="&#x1d4b3;" horiz-adv-x="891" d="M571 489h2q112 198 226 198q33 0 53.5 -15.5t20.5 -47.5q0 -26 -16 -41t-38 -15q-21 0 -35.5 12t-14.5 34q0 23 17 40q-53 0 -119.5 -88.5t-134.5 -242.5q-67 -151 -67 -228q0 -65 50 -65q27 0 63 29t93 95l20 -15q-62 -80 -105.5 -116.5t-99.5 -36.5q-48 0 -74.5 25.5 t-26.5 74.5q0 32 9 55h-2q-54 -77 -111.5 -116.5t-130.5 -39.5q-53 0 -83.5 32.5t-30.5 73.5q0 30 16 51t42 21q20 0 35.5 -14t15.5 -33q0 -21 -13.5 -37t-33.5 -16q-15 0 -25 6q24 -54 94 -54q55 0 118 65.5t122 168.5q88 155 88 257q0 148 -124 148q-68 0 -114.5 -44 t-46.5 -113q0 -42 22.5 -68.5t64.5 -26.5q88 0 126 106l19 -5q-17 -61 -56.5 -96t-91.5 -35q-57 0 -91 34t-34 92q0 80 59.5 134.5t145.5 54.5q89 0 143 -56.5t54 -141.5z" />
+<glyph unicode="&#x1d4b4;" horiz-adv-x="926" d="M825 658h91q-242 -324 -370 -581q75 28 137 80l15 -15q-31 -28 -63 -49t-49.5 -30t-54.5 -25q-53 -102 -144 -183t-183 -81q-36 0 -58.5 18t-22.5 47t16.5 54.5t38.5 42t61 34t65 26.5l72 22l62 18q73 144 103 196l-3 4q-51 -71 -108 -112.5t-100 -41.5q-39 0 -62 24.5 t-23 68.5q0 36 23.5 79t83.5 121q71 91 92.5 129t21.5 65q0 33 -39.5 58t-86.5 25q-91 0 -149.5 -45t-58.5 -122q0 -32 22.5 -53.5t56.5 -21.5q103 0 149 125h20q-21 -78 -68.5 -116.5t-106.5 -38.5q-48 0 -81 30.5t-33 76.5q0 87 77.5 143.5t178.5 56.5q75 0 127 -41.5 t52 -104.5q0 -45 -29 -95.5t-111 -153.5q-86 -108 -86 -151q0 -12 7.5 -20.5t21.5 -8.5q51 0 126 71t187 224zM419 -2q-50 -16 -70 -23t-58 -21.5t-54 -24t-36.5 -24.5t-28 -30.5t-7.5 -33.5q0 -15 11.5 -26t27.5 -11q60 0 112 50t103 144z" />
+<glyph unicode="&#x1d4b5;" horiz-adv-x="932" d="M407 519l18 -8q-25 -48 -56.5 -73t-81.5 -25q-51 0 -89.5 32t-38.5 83q0 59 52 109t145 50q50 0 108.5 -13t93.5 -26t92 -36q72 46 150 46q57 0 84.5 -17t27.5 -43q0 -24 -33 -41t-83 -17q-55 0 -133 26q-56 -64 -116 -236q5 -1 11 -1q60 2 93 27l14 -17 q-55 -59 -118 -59q-14 0 -18 1q-54 -143 -158 -221q106 -36 157 -36q79 0 132 36.5t72 102.5l20 -1q-14 -85 -71.5 -131t-150.5 -46q-36 0 -75.5 10.5t-121.5 38.5q-75 -43 -162 -43q-112 0 -112 60q0 24 33 41t83 17q45 0 142 -31q59 56 120 215q-4 1 -12 1q-53 0 -95 -32 l-17 16q60 65 126 65q11 0 17 -1q68 165 157 241q-57 22 -87.5 32t-85.5 21.5t-105 11.5q-64 0 -99.5 -39.5t-35.5 -80.5q0 -40 25.5 -62.5t61.5 -22.5q42 0 68.5 17.5t51.5 58.5zM871 598q0 30 -71 30q-62 0 -106 -33q68 -25 112 -25q27 0 46 8.5t19 19.5zM283 51 q-76 28 -118 28q-27 0 -46 -8.5t-19 -19.5q0 -30 71 -30q65 0 112 30z" />
+<glyph unicode="&#x1d4b6;" horiz-adv-x="819" d="M737 194l21 -17q-141 -185 -247 -185q-37 0 -56.5 24t-19.5 61q0 19 4 32l-1 1q-110 -121 -197 -121q-44 0 -68 29.5t-24 79.5q0 45 22 95q-35 -20 -71 -20q-39 0 -70 17l10 26q31 -13 57 -13q62 0 129 79v-1q56 70 130.5 115t141.5 45q91 0 118 -71l-21 -10 q-28 51 -84 51q-73 0 -143 -70q-65 -66 -113 -150t-48 -127q0 -45 39 -45q49 0 98.5 40t104.5 105q9 52 38.5 102.5t71.5 50.5q27 0 27 -28q0 -44 -110 -146q-11 -39 -11 -63q0 -58 55 -58q31 0 87.5 40.5t129.5 131.5z" />
+<glyph unicode="&#x1d4b7;" horiz-adv-x="580" d="M127 493l20 22q32 -38 85 -47q66 92 136 155.5t130 63.5q29 0 45 -15.5t16 -39.5q0 -75 -77.5 -137.5t-190.5 -62.5q-63 -94 -124.5 -206t-61.5 -164q0 -44 36 -44q58 0 121.5 54.5t124.5 153.5q-10 29 -10 56q0 57 28 97t58 40q9 0 16.5 -8.5t7.5 -20.5q0 -67 -55 -158 q19 -32 63 -32q18 0 30 5l7 -26q-16 -9 -38 -9q-51 0 -84 32h-1q-66 -104 -136 -159t-133 -55q-41 0 -67 25.5t-26 67.5q0 64 49.5 168t116.5 192q-55 14 -86 52zM529 624q0 31 -35 31q-31 0 -73.5 -47t-109.5 -146q87 0 152.5 52.5t65.5 109.5z" />
+<glyph unicode="&#x1d4b8;" horiz-adv-x="662" d="M567 225l22 -17q-89 -110 -173.5 -164.5t-154.5 -54.5q-47 0 -75 31.5t-28 85.5q0 46 18 91q-30 -24 -76 -24q-39 0 -70 17l10 26q31 -13 57 -13q61 0 120 69q52 73 128 121t142 48q88 0 88 -79q0 -26 -18 -45.5t-43 -19.5q-40 0 -40 33q0 15 9.5 24t21.5 11.5t21.5 8.5 t9.5 16q0 21 -34 21q-55 0 -124.5 -65t-115.5 -145.5t-46 -126.5q0 -26 15 -40.5t39 -14.5q52 0 131.5 50.5t165.5 155.5z" />
+<glyph unicode="&#x1d4b9;" horiz-adv-x="845" d="M827 687l-321 -590q-14 -25 -14 -48q0 -27 28 -27q71 0 212 172l23 -17q-75 -95 -132.5 -140t-109.5 -45q-37 0 -55 20t-18 51q0 23 9 47h-2q-59 -61 -107.5 -91t-101.5 -30q-43 0 -67 28t-24 77q0 46 24 99q-31 -20 -71 -20q-39 0 -70 17l10 26q31 -13 57 -13 q62 0 129 79v-1q56 70 130 115t140 45q36 0 57 -19.5t21 -58.5h2l172 324h79zM544 365q0 41 -48 41q-41 0 -97.5 -42t-106.5 -115q-87 -125 -87 -189q0 -41 41 -41q64 -1 143 73q64 60 109.5 139t45.5 134z" />
+<glyph unicode="&#x1d4bb;" d="M27 -209l194 374q-13 25 -13 58q0 87 117 147l41 80l38 66q22 41 36.5 61t35.5 45t39 36.5t39.5 20t44.5 8.5q35 0 54.5 -21.5t19.5 -48.5q0 -145 -271 -252l-115 -221q33 -18 81 -18q69 0 129 54l17 -23q-73 -61 -153 -61q-51 0 -89 19l-166 -324h-79zM643 606 q0 49 -42 49q-18 0 -36.5 -12.5t-35 -36.5t-26 -40t-22.5 -41l-62 -120q87 33 155.5 87t68.5 114z" />
+<glyph unicode="&#x1d4bd;" horiz-adv-x="753" d="M669 195l21 -17q-160 -189 -264 -189q-32 0 -51 18.5t-19 53.5q0 60 46 128l106 157q17 26 17 39q0 26 -25 26q-68 0 -171.5 -101t-185.5 -257l-28 -53h-77l237 440q-80 14 -126 69l20 21q46 -54 122 -61q69 123 115.5 170.5t103.5 47.5q31 0 47 -20t16 -45 q0 -42 -26 -78.5t-63.5 -58.5t-75.5 -34.5t-66 -12.5l-78 -153l3 -2q134 158 237 158q33 0 53 -16.5t20 -45.5q0 -48 -42 -115l-103 -164q-24 -39 -24 -60t23 -21q88 0 238 176zM359 472l1 -2q54 0 118.5 44.5t64.5 105.5q0 15 -9.5 25t-26.5 10q-30 0 -63 -40t-85 -143z " />
+<glyph unicode="&#x1d4be;" horiz-adv-x="496" d="M484 608q0 -20 -15 -35t-36 -15q-19 0 -32.5 13t-13.5 30q0 20 16.5 36t38.5 16q15 0 28.5 -14t13.5 -31zM417 188l21 -17q-78 -95 -131.5 -138.5t-98.5 -43.5q-36 0 -58 21.5t-22 60.5q0 63 57 165l60 109q-37 -30 -89 -30q-42 0 -73 17l10 26q31 -13 60 -13 q69 0 136 79h73l-160 -295q-22 -40 -22 -78q0 -14 9 -23t24 -9q35 0 80 39t124 130z" />
+<glyph unicode="&#x1d4bf;" horiz-adv-x="730" d="M718 608q0 -20 -15 -35t-36 -15q-19 0 -32.5 13t-13.5 30q0 20 16.5 36t38.5 16q15 0 28.5 -14t13.5 -31zM596 424l-264 -499q42 -22 85 -22q59 0 100 30l12 -26q-54 -34 -117 -34q-52 0 -100 22q-43 -63 -92.5 -88.5t-112.5 -25.5q-47 0 -72.5 21.5t-25.5 49.5 q0 48 54 80q42 26 115 26q58 0 91 -13l209 394q-44 -43 -114 -43q-42 0 -68 16l10 26q26 -12 60 -12q44 0 81 27t76 71h73zM254 -86l-1 1q-29 13 -84 13q-57 0 -91.5 -20t-34.5 -52q0 -18 15.5 -29.5t40.5 -11.5q93 0 155 99z" />
+<glyph unicode="&#x1d4c0;" horiz-adv-x="726" d="M643 187l23 -17q-75 -93 -133 -137t-109 -44q-35 0 -59.5 16t-24.5 47t21.5 67t21.5 53q0 18 -15 32.5t-46 14.5l11 30q76 4 142.5 45t66.5 83q0 34 -33 34q-65 0 -176 -103t-189 -255l-27 -53h-77l237 440q-80 14 -126 69l20 21q46 -54 122 -61q69 123 115.5 170.5 t103.5 47.5q31 0 47 -20t16 -45q0 -43 -26 -79.5t-63.5 -58t-75.5 -34t-66 -12.5l-88 -168l2 -1q149 172 268 172q30 0 49 -18t19 -43q0 -48 -65 -92.5t-147 -54.5l-1 -3q54 -32 54 -82q0 -28 -16.5 -59t-16.5 -43q0 -27 31 -27q33 0 86.5 40.5t123.5 127.5zM361 472l1 -2 q54 0 118.5 44.5t64.5 105.5q0 15 -9.5 25t-26.5 10q-30 0 -63 -40t-85 -143z" />
+<glyph unicode="&#x1d4c1;" horiz-adv-x="579" d="M77 389l14 26q36 -25 94 -25q85 125 174.5 211t147.5 86q64 0 64 -67q0 -81 -96.5 -161t-225.5 -99q-143 -231 -143 -298q0 -43 36 -43q33 0 76.5 38t122.5 129l21 -17q-85 -99 -133.5 -139.5t-93.5 -40.5q-37 0 -62 22.5t-25 64.5q0 84 77 218q12 22 40 66q-49 2 -88 29 zM268 396l1 -1q117 26 194.5 91.5t77.5 137.5q0 31 -35 31q-37 0 -82 -47q-58 -59 -156 -212z" />
+<glyph unicode="&#x1d4c2;" horiz-adv-x="1038" d="M957 195l21 -16q-153 -190 -265 -190q-30 0 -49.5 19t-19.5 53q0 63 45 128l104 152q19 29 19 44q0 26 -27 26q-74 0 -185 -117t-199 -294h-75l190 337q20 36 20 47q0 27 -28 27q-74 0 -185.5 -118t-196.5 -293h-77l184 342q-52 -46 -125 -46q-32 0 -58 16l10 26 q26 -12 50 -12q80 0 167 98h68l-70 -139l3 -2q134 158 238 158q31 0 51.5 -16.5t20.5 -45.5q0 -35 -17 -74l2 -1q116 137 219 137q34 0 53 -16.5t19 -45.5q0 -49 -49 -127l-96 -152q-23 -38 -23 -59q0 -22 23 -22q87 0 238 176z" />
+<glyph unicode="&#x1d4c3;" horiz-adv-x="761" d="M680 195l21 -17q-155 -189 -264 -189q-31 0 -50.5 18.5t-19.5 53.5q0 60 46 128l106 157q17 26 17 39q0 10 -7.5 18t-20.5 8q-67 0 -169.5 -101t-184.5 -257l-28 -53h-77l183 342q-52 -46 -125 -46q-32 0 -58 16l10 26q25 -12 50 -12q80 0 167 98h72l-73 -139l3 -2 q134 158 237 158q33 0 53 -16.5t20 -45.5q0 -48 -42 -115l-103 -164q-24 -39 -24 -60t23 -21q88 0 238 176z" />
+<glyph unicode="&#x1d4c5;" horiz-adv-x="773" d="M362 285l3 -2q134 158 237 158q38 0 65 -24t27 -75q0 -71 -52 -160t-122 -136q70 -28 105 -75l-22 -20q-40 35 -64.5 49t-59.5 17q-49 -28 -93 -28q-36 0 -54 9t-18 23q0 18 25.5 33t64.5 15q36 0 57 -4q46 26 108 132.5t62 173.5q0 40 -36 40q-67 0 -168.5 -100.5 t-185.5 -257.5l-141 -262h-77l296 551q-45 -46 -125 -46q-32 0 -58 16l10 26q26 -12 50 -12q81 0 167 97l72 1z" />
+<glyph unicode="&#x1d4c6;" horiz-adv-x="780" d="M725 202l18 -18q-67 -70 -219 -209q-48 -43 -89.5 -87t-60.5 -66t-25 -31h-78l169 310l-2 1q-54 -58 -102.5 -85.5t-104.5 -27.5q-38 0 -61 29t-23 76q0 48 23 99q-30 -20 -70 -20q-39 0 -70 17l10 26q31 -13 57 -13q64 0 129 79q57 69 131.5 114t134.5 45q36 0 60 -16.5 t28 -48.5h2l28 48h68l-281 -525l3 -2q31 34 166 157.5t159 147.5zM550 364q0 42 -54 42q-95 0 -205 -159q-86 -125 -86 -187q0 -19 12 -30t29 -11q61 0 134.5 64.5t121.5 146t48 134.5z" />
+<glyph unicode="&#x1d4c7;" horiz-adv-x="580" d="M569 311l3 -27q-14 -7 -32 -7q-66 0 -87 48l-260 -192l-71 -133h-73l183 346q-53 -50 -126 -50q-32 0 -58 16l10 26q26 -12 50 -12q80 0 167 98h72l-120 -228l2 -1l214 160q0 41 21.5 65t55.5 24q19 0 30.5 -9t11.5 -18l-84 -74q16 -36 62 -36q13 0 29 4z" />
+<glyph unicode="&#x1d4c8;" horiz-adv-x="515" d="M129 243l-9 27q111 38 200 149q-5 15 -5 27q0 37 18.5 61t34.5 24q11 0 19.5 -8t8.5 -24q0 -48 -42 -90q58 -95 58 -181q0 -101 -77 -172q-70 -67 -173 -67q-41 0 -70.5 19.5t-29.5 55.5q0 31 18.5 53t41.5 22q18 0 30 -9.5t12 -27.5q0 -17 -9 -26t-20 -10.5t-20 -6 t-9 -13.5q0 -11 17 -19t37 -8q74 0 130 73t56 186q0 44 -16 106h-2q-48 -56 -92.5 -85.5t-106.5 -55.5z" />
+<glyph unicode="&#x1d4c9;" horiz-adv-x="551" d="M532 526l-13 -30h-146l-209 -387q-14 -27 -14 -58q0 -14 9 -23t24 -9q36 0 79.5 38.5t127.5 134.5l21 -17q-79 -98 -133 -142t-104 -44q-33 0 -54.5 21t-21.5 60q0 59 57 164l50 92q-55 -50 -117 -50q-32 0 -58 16l10 26q26 -12 58 -12q72 0 158 117l39 73h-102l13 30 h103l71 132h79l-72 -132h145z" />
+<glyph unicode="&#x1d4ca;" horiz-adv-x="753" d="M670 190l23 -17q-75 -93 -131.5 -137t-109.5 -44q-36 0 -53 19.5t-17 51.5q0 27 8 59l-3 1q-117 -134 -211 -134q-34 0 -55.5 22.5t-21.5 65.5q0 53 46 139l68 126q-57 -46 -125 -46q-32 0 -58 16l10 26q26 -12 50 -12q80 0 167 98h75l-159 -295q-22 -39 -22 -78 q0 -13 9 -22.5t24 -9.5q71 0 170.5 114t184.5 291h78l-160 -297q-23 -42 -23 -74q0 -31 29 -31q34 0 82.5 39.5t124.5 128.5z" />
+<glyph unicode="&#x1d4cb;" horiz-adv-x="618" d="M575 210l7 -27q-21 -9 -47 -9q-43 0 -75 29q-67 -108 -131 -161t-136 -53q-37 0 -64 25t-27 72q0 60 57 162l51 92q-53 -44 -122 -44q-32 0 -58 16l10 26q26 -12 50 -12q80 0 167 98h75l-158 -295q-20 -36 -20 -70q0 -17 13.5 -28.5t34.5 -11.5q51 0 115 52t119 157 q-16 36 -16 72q0 56 22.5 98.5t54.5 42.5q29 0 29 -50q0 -36 -14.5 -84t-32.5 -74q25 -29 62 -29q17 0 34 6z" />
+<glyph unicode="&#x1d4cc;" horiz-adv-x="888" d="M845 210l7 -27q-21 -9 -47 -9q-43 0 -75 29q-67 -108 -131 -161t-136 -53q-37 0 -64 25t-27 72q0 11 1 18h-2q-89 -115 -178 -115q-37 0 -64 25t-27 72q0 60 57 162l51 92q-55 -44 -122 -44q-32 0 -58 16l10 26q26 -12 50 -12q80 0 167 98h75l-158 -295q-20 -36 -20 -70 q0 -17 13.5 -28.5t34.5 -11.5q99 0 227 229l98 176h75l-158 -295q-20 -36 -20 -70q0 -17 13.5 -28.5t34.5 -11.5q51 0 115 52t119 157q-16 36 -16 72q0 56 22.5 98.5t54.5 42.5q29 0 29 -50q0 -36 -14.5 -84t-32.5 -74q25 -29 62 -29q16 0 34 6z" />
+<glyph unicode="&#x1d4cd;" horiz-adv-x="752" d="M653 203l22 -17q-152 -194 -272 -194q-38 0 -64 20.5t-26 64.5h-2q-87 -88 -160 -88q-39 0 -62.5 19.5t-23.5 55.5q0 28 18.5 50t41.5 22q42 0 42 -36q0 -16 -9 -25.5t-20 -12t-20 -8t-9 -14.5q0 -21 36 -21q43 0 89.5 44.5t80 103.5t55.5 114t22 79q0 48 -37 48 q-41 0 -102.5 -41t-139.5 -134l-22 17q157 188 271 188q39 0 63.5 -22.5t24.5 -61.5h2q68 87 136 87q82 0 82 -76q0 -26 -18.5 -47t-42.5 -21q-40 0 -40 33q0 16 9 25t19.5 11t19.5 7.5t9 15.5q0 22 -34 22q-37 0 -91 -68t-92 -150.5t-38 -126.5q0 -20 12 -32t30 -12 q89 0 240 181z" />
+<glyph unicode="&#x1d4ce;" horiz-adv-x="658" d="M617 424l-171 -328q-53 -103 -97 -170q44 -23 90 -23q59 0 100 30l12 -26q-54 -34 -117 -34q-54 0 -102 22q-77 -114 -203 -114q-47 0 -72.5 21.5t-25.5 49.5q0 48 54 80q42 26 115 26q58 0 91 -13l99 177l-3 1q-117 -134 -211 -134q-34 0 -55.5 22.5t-21.5 65.5 q0 53 46 139l68 126q-55 -46 -125 -46q-32 0 -58 16l10 26q26 -12 50 -12q80 0 167 98h75l-159 -295q-22 -39 -22 -78q0 -32 33 -32q71 0 170.5 114t184.5 291h78zM276 -86l-1 1q-29 13 -84 13q-57 0 -91.5 -20t-34.5 -52q0 -18 15.5 -29.5t40.5 -11.5q93 0 155 99z" />
+<glyph unicode="&#x1d4cf;" horiz-adv-x="691" d="M594 178l23 -16q-73 -102 -132 -137.5t-118 -35.5q-60 0 -60 46q0 16 10 35.5t10 30.5t-9 19t-20 8q-65 0 -127 -71q-55 -63 -97 -63q-22 0 -22 20q0 49 127 108l231 188l-1 2q-18 -7 -43 -7q-55 0 -99 34q-24 -25 -58 -40t-65 -15q-35 0 -61 16l12 26q25 -12 48 -12 q58 0 102 44q-26 31 -26 63q0 23 13.5 40t33.5 17q19 0 29.5 -14.5t10.5 -35.5q0 -23 -18 -61q25 -32 77 -32q42 0 76 17q34 46 66.5 67.5t54.5 21.5q31 0 31 -23q0 -50 -120 -89l-223 -186l1 -1q31 16 72 16q36 0 55 -16.5t19 -39.5q0 -15 -8.5 -32.5t-8.5 -27.5 q0 -6 5.5 -10t11.5 -4q89 0 197 150z" />
+<glyph unicode="&#x1d4d0;" horiz-adv-x="984" d="M945 691l10 -17q-92 -178 -259 -569q41 12 80 33l21 -43q-41 -32 -127 -50l-18 -45h-147l18 41q-66 0 -135 29q-88 -91 -187 -91q-68 0 -109.5 37t-41.5 94q0 38 24.5 64.5t59.5 26.5q31 0 50.5 -21.5t19.5 -48.5q0 -23 -17 -41.5t-46 -23.5v-1q15 -31 61 -31 q62 0 131 64q-59 37 -95 90t-36 118q0 87 68.5 144.5t152.5 57.5q91 0 161 -68q74 113 131 165q103 94 183 94q18 0 47 -8zM809 610l-2 2q-48 -31 -88 -78t-100 -139q23 -40 30 -79h2q78 165 158 294zM596 222q0 58 -18 107q-6 -9 -22 -37l-26 -41l-25 -37q-16 -24 -34 -47 l-39 -48q57 -23 117 -23q24 48 45 97q2 9 2 29zM547 384q-51 64 -126 64q-50 0 -89 -38t-39 -97q0 -105 88 -166q68 78 166 237z" />
+<glyph unicode="&#x1d4d1;" horiz-adv-x="1060" d="M966 690l17 -45q-37 -15 -74 -39q76 -60 76 -131q0 -50 -36.5 -92t-102.5 -56v-2q46 -22 70 -58t24 -73q0 -45 -26.5 -92t-76.5 -80q-51 -35 -129 -35q-56 0 -83 30t-27 65q0 44 37.5 85t118.5 51l8 -50q-43 -4 -70 -27.5t-27 -56.5q0 -21 13 -31.5t32 -10.5 q44 0 72.5 48.5t28.5 107.5q0 72 -39 102q-22 -6 -54 -6q-5 0 -35 6q-168 -321 -443 -321q-86 0 -135.5 36t-49.5 93q0 38 23 65.5t58 27.5q31 0 49.5 -20t18.5 -47q0 -24 -15 -43.5t-43 -24.5v-1q25 -31 77 -31q83 0 150.5 52t150.5 196q74 130 129 199.5t136 120.5 q-69 42 -177 42q-92 0 -171.5 -25.5t-133.5 -81t-54 -130.5q0 -43 29 -70.5t71 -27.5q63 0 115.5 56.5t56.5 162.5h50q0 -107 -62.5 -190.5t-165.5 -83.5q-87 0 -133 42q-52 47 -52 118q0 74 49.5 134.5t128.5 98.5q108 52 263 52q154 0 252 -58q45 27 111 49zM871 480 q0 48 -26 77q-59 -58 -130 -189q49 -3 71 -14q38 7 61.5 44t23.5 82z" />
+<glyph unicode="&#x1d4d2;" horiz-adv-x="912" d="M487 668l-22 -45q-35 21 -111 21q-79 0 -141 -35t-62 -105q0 -53 35.5 -84.5t80.5 -35.5q82 120 225.5 211.5t255.5 91.5q129 0 129 -79q0 -61 -69 -128t-185.5 -113.5t-237.5 -47.5q-60 -91 -60 -179q0 -46 30.5 -76t76.5 -30q73 0 123 42t50 98q0 34 -18.5 52t-39.5 18 q-49 0 -81 -34.5t-44 -101.5l-50 8q10 83 64.5 133t137.5 50q67 0 106 -28.5t39 -81.5q0 -42 -28.5 -84.5t-74.5 -74.5q-74 -51 -198 -51q-98 0 -162.5 48.5t-64.5 132.5q0 86 44 167q-75 17 -125 61.5t-50 113.5q0 79 79.5 138t207.5 59q83 0 140 -31zM414 375l1 -1 q64 1 150 31.5t153.5 83.5t67.5 106q0 37 -46 37q-66 0 -162.5 -75t-163.5 -182z" />
+<glyph unicode="&#x1d4d3;" horiz-adv-x="991" d="M889 613l17 -47q-36 -15 -69 -48q61 -96 61 -194q0 -144 -108 -244.5t-247 -100.5q-89 0 -169 28q-74 -24 -158 -24q-72 0 -107 15q-49 20 -49 63q0 42 51 65q36 16 91 16q36 0 73 -10t56 -19l57 -28q32 24 69.5 73t99.5 148l53 82q20 28 54 66t75 71q-44 58 -115.5 88.5 t-150.5 30.5q-125 0 -204 -60q-85 -65 -85 -160q0 -60 35.5 -98t98.5 -38q78 0 133 58.5t56 187.5h50q1 -20 1 -36q0 -66 -23.5 -119t-60 -84.5t-77 -48t-78.5 -16.5q-105 0 -165.5 52.5t-60.5 149.5q0 123 122 201q104 66 252 66q101 0 187 -35.5t143 -97.5q48 32 92 47z M461 49v-2q37 -13 78 -13q109 0 185 79.5t76 222.5q0 54 -18 108h-1q-22 -33 -79 -144q-90 -176 -241 -251zM310 51v1q-53 35 -115 35q-14 0 -29 -5.5t-15 -16.5q0 -27 64 -27q52 0 95 13z" />
+<glyph unicode="&#x1d4d4;" horiz-adv-x="826" d="M414 683l-14 -48q-30 9 -77 9q-62 0 -99.5 -26t-37.5 -69q0 -85 148 -96q15 93 119 163.5t208 70.5q130 0 130 -80q0 -64 -99 -129t-241 -80v-3q80 -10 80 -37q0 -18 -18.5 -29.5t-53.5 -11.5t-63 14q-72 -25 -114.5 -78.5t-42.5 -117.5q0 -45 31 -73t83 -28 q69 0 118.5 37.5t49.5 98.5q0 30 -18.5 47t-40.5 17q-94 0 -129 -128l-49 10q36 173 206 173q145 0 145 -116q0 -60 -53 -111q-42 -40 -106.5 -61.5t-127.5 -21.5q-103 0 -173 46.5t-70 130.5q0 77 62.5 136.5t176.5 87.5v2q-6 10 -7 16q-111 6 -176.5 47t-65.5 107 q0 61 60 104t156 43q65 0 103 -16zM456 455l2 -2q101 14 171.5 58t70.5 90q0 31 -45 31q-56 0 -118 -55.5t-81 -121.5z" />
+<glyph unicode="&#x1d4d5;" horiz-adv-x="1042" d="M999 699l26 -42q-44 -38 -102.5 -62.5t-115.5 -24.5q-82 0 -196.5 37t-160.5 37q-86 0 -141.5 -43.5t-55.5 -108.5q0 -51 28.5 -76t63.5 -25q43 0 80.5 34t55.5 110l45 -9q-7 -85 -62 -137.5t-130 -52.5q-46 0 -89 22q-37 20 -60 56t-23 81q0 101 118 163q77 41 229 41 q56 0 175 -19t171 -19q29 0 71 10.5t73 27.5zM718 558l35 -36q-5 -5 -9 -10.5t-8 -13.5l-8 -12q-3 -5 -7 -14l-7 -16l-7 -18t-7.5 -19l-9.5 -23l-9 -26q68 13 134 13q40 56 79 56q22 0 35 -13t13 -31q0 -31 -26.5 -53t-73.5 -28q0 -49 8 -73l-70 -26q-4 15 -4 34q0 20 6 50 q-68 0 -133 -14q-42 -105 -110.5 -176t-142 -100.5t-153.5 -29.5q-85 0 -131.5 35.5t-46.5 93.5q0 38 24.5 65.5t59.5 27.5q31 0 49.5 -20t18.5 -47q0 -24 -15 -43.5t-43 -24.5v-1q23 -31 80 -31q73 0 128 48.5t102 137.5l4 8q-91 -43 -140 -85l-35 36q92 87 227 144 q58 102 100 150.5t93 84.5z" />
+<glyph unicode="&#x1d4d6;" horiz-adv-x="834" d="M422 682l-14 -48q-35 10 -84 10q-70 0 -110.5 -25.5t-40.5 -70.5q0 -67 111 -91q71 104 178.5 167t202.5 63q134 0 134 -85q0 -42 -40.5 -82.5t-109.5 -71.5q-120 -54 -259 -57q-30 -54 -30 -112q0 -62 46 -62q65 0 111 28t151 123l39 -32q-14 -13 -26 -34t-19 -38 t-21 -55q-41 -114 -135 -172t-234 -58q-86 0 -137 36t-51 93q0 38 24 65.5t59 27.5q31 0 50 -20t19 -47q0 -24 -15 -43.5t-43 -24.5v-1q23 -31 86 -31q145 0 229 145l-2 2q-44 -19 -102 -19q-71 0 -117 36t-46 98q0 54 27 105q-80 18 -125.5 55t-45.5 92q0 65 67 108t168 43 q59 0 105 -17zM424 447v-1q116 7 200 49.5t84 97.5q0 39 -43 39q-55 0 -123 -53.5t-118 -131.5z" />
+<glyph unicode="&#x1d4d7;" horiz-adv-x="1171" d="M816 658l-24 -19q-67 -53 -119.5 -115.5t-101.5 -158.5q62 15 89 27q110 145 223 226t194 81q77 0 77 -63q0 -78 -95.5 -141.5t-247.5 -106.5q-74 -104 -120.5 -191.5t-46.5 -127.5q0 -28 29 -28q46 0 146 124l42 -26q-52 -80 -111 -121q-53 -36 -104 -36 q-63 0 -92.5 31.5t-29.5 82.5q0 96 83 222q-13 -5 -41 -13.5t-32 -9.5q-68 -125 -167.5 -220.5t-197.5 -95.5q-104 0 -104 77q0 61 61 119q42 40 100 67t160 63q4 7 20 33t22 35l22 32q15 23 27 37l31 36q19 22 41 43.5t49 45.5v2q-39 0 -71.5 11.5t-51 26t-43 26 t-48.5 11.5q-39 0 -66.5 -30.5t-27.5 -68.5q0 -36 17.5 -54t42.5 -18q33 0 57 23l29 -35q-40 -43 -106 -43q-61 0 -96 36.5t-35 90.5q0 60 50 107t139 47q56 0 134 -25t116 -25q44 0 79 13q30 11 69 37zM875 473v-2q63 16 126.5 61t63.5 95q0 17 -18 17q-27 0 -78 -49 t-94 -122zM344 225l-1 2q-75 -24 -131 -75t-56 -98q0 -20 20 -20q29 0 78.5 58t89.5 133z" />
+<glyph unicode="&#x1d4d8;" horiz-adv-x="997" d="M141 66v-1q10 -13 38 -22t49 -9q94 0 164.5 48.5t131.5 182.5q2 5 8 18t10 20q-49 17 -79 56q-37 45 -37 108q0 79 60 137q87 83 237 83q63 0 121 -9q45 21 81 21q23 0 37.5 -10t14.5 -25q0 -31 -25 -47t-68 -16q-16 0 -32 3q-17 -12 -32 -30t-29.5 -46t-24 -48 t-26.5 -60l-24 -57l1 -2q69 33 120 115l43 -26q-67 -128 -195 -154q-64 -134 -122 -187q-142 -130 -328 -130q-86 0 -137 36t-51 93q0 38 24.5 65.5t59.5 27.5q31 0 49.5 -20t18.5 -47q0 -24 -15 -43.5t-43 -24.5zM769 604v3q-130 0 -191 -47t-61 -119q0 -57 54 -83 q29 57 51.5 94t62 81t84.5 71z" />
+<glyph unicode="&#x1d4d9;" horiz-adv-x="906" d="M625 228l35 -36q-58 -64 -171 -104q-61 -128 -161 -220t-204 -92q-49 0 -77 24t-28 67q0 88 105 160t240 100q31 86 82 193q-53 13 -83 52q-30 38 -30 93q0 119 124 183q77 39 175 39q29 0 50 -1.5t41.5 -4t30.5 -3.5q31 21 78 21q25 0 39.5 -10t14.5 -25q0 -31 -25 -47 t-67 -16q-16 0 -33 3q-58 -45 -141 -222l2 -1q62 27 117 113l43 -25q-29 -58 -84 -104.5t-112 -51.5q-9 -20 -26.5 -64t-31.5 -73l3 -1q56 22 94 53zM678 605v2q-116 0 -168 -24q-38 -17 -62 -50t-24 -74q0 -70 50 -85q71 131 204 231zM333 50l-1 1q-74 -21 -148 -79.5 t-74 -111.5q0 -13 8 -21t21 -8q47 0 101 66t93 153z" />
+<glyph unicode="&#x1d4da;" horiz-adv-x="1154" d="M842 699l30 -41q-43 -30 -76.5 -62.5t-62 -74t-42.5 -65.5l-41 -76q21 0 40 -12q46 21 115 118q149 213 250 213q36 0 55.5 -20.5t19.5 -47.5q0 -28 -19 -47.5t-47 -19.5q-27 0 -44 14.5t-21 38.5h-2q-33 -103 -100.5 -179.5t-155.5 -100.5v-3q49 -28 49 -84 q0 -32 -18 -66q-9 -17 -27 -43.5t-28 -44t-10 -28.5q0 -27 26 -27q48 0 155 134l39 -33q-113 -160 -222 -160q-56 0 -87.5 26.5t-31.5 67.5q0 44 49 118q37 55 37 90q0 8 -7.5 17.5t-19.5 9.5h-21q-72 -177 -177 -254.5t-224 -77.5q-83 0 -130.5 36t-47.5 93q0 38 24.5 65.5 t59.5 27.5q31 0 49.5 -20t18.5 -47q0 -24 -15 -43.5t-43 -24.5v-1q23 -31 70 -31q62 0 119 52t99 134q35 70 51.5 100.5t47 78.5t65 84t80.5 73h-9q-51 0 -98.5 22t-84 44t-60.5 22q-44 0 -77 -28t-33 -80q0 -40 21.5 -69.5t57.5 -29.5q26 0 41.5 9t39.5 39l38 -30 q-53 -73 -134 -73q-72 0 -113.5 42t-41.5 110q0 63 58.5 114t146.5 51q119 0 180 -36q47 -27 79 -27q90 0 160 63z" />
+<glyph unicode="&#x1d4db;" horiz-adv-x="1036" d="M678 648l-22 -44q-72 40 -166 40q-80 0 -140.5 -37.5t-60.5 -103.5t64.5 -103.5t166.5 -37.5q25 0 44 2q45 91 83 148q45 65 117.5 116t140.5 51q56 0 83 -23.5t27 -63.5q0 -70 -94.5 -151.5t-225.5 -117.5q-95 -192 -254 -272v-2q44 -13 78 -13q151 0 278 141l36 -35 q-139 -163 -311 -163q-85 0 -168 29q-82 -25 -162 -25q-75 0 -108 17q-44 22 -44 61q0 38 44 62q39 21 100 21q35 0 71 -9.5t56 -18.5l57 -29q71 47 168 220h-28q-56 0 -108 10.5t-99 33t-75 63t-28 93.5q0 81 83 136.5t204 55.5q112 0 193 -51zM722 389l2 -1 q78 27 139 81.5t61 120.5q0 16 -10 25t-23 9q-43 0 -88 -69.5t-81 -165.5zM290 53v1q-53 35 -115 35q-14 0 -29 -5.5t-15 -16.5q0 -29 64 -29q45 0 95 15z" />
+<glyph unicode="&#x1d4dc;" horiz-adv-x="1300" d="M1234 691l11 -17q-142 -219 -228.5 -388t-86.5 -218q0 -27 26 -27q47 0 167 133l37 -34q-66 -79 -120 -118.5t-112 -39.5q-119 0 -119 95q0 161 284 539l-2 1q-68 -47 -133.5 -132.5t-155.5 -246.5l-46 -81q-14 -24 -36.5 -56t-41.5 -51q-56 -54 -124 -54q-33 0 -57 21.5 t-24 54.5q0 51 35 121q88 178 259 414l-1 1q-70 -49 -125.5 -118t-127.5 -188q-7 -11 -25 -42l-24 -40l-22 -36l-23 -36q-7 -11 -20 -29.5l-21 -29.5l-20 -24q-10 -13 -20 -23q-61 -63 -137 -63q-63 0 -102 31.5t-39 86.5q0 38 24.5 64.5t59.5 26.5q31 0 50.5 -21.5 t19.5 -48.5q0 -25 -16 -44.5t-47 -19.5v-1q14 -19 61 -19t86 45t124 184q136 224 231 317q119 119 235 119q20 0 37 -8l10 -17q-99 -137 -191.5 -294t-130.5 -243q-19 -42 -19 -60q0 -14 11 -14q42 0 145 194q116 217 231 334q106 108 201 108q38 0 52 -8z" />
+<glyph unicode="&#x1d4dd;" horiz-adv-x="1095" d="M695 175h4q48 63 85 165q9 25 26 80l30 92q12 36 33 78t44 66q40 43 89 43q34 0 53 -20.5t19 -47.5q0 -28 -19.5 -47.5t-46.5 -19.5q-43 0 -64 39h-4q-19 -16 -36.5 -64.5t-42.5 -128.5t-48 -135q-37 -85 -92.5 -163t-116.5 -125h-51q4 23 7 47.5t4 57.5l3 57q1 23 2 72 t2 76q4 119 28 215h-2q-45 -71 -100 -183q-108 -219 -171 -284q-63 -66 -138 -66q-57 0 -94.5 32.5t-37.5 86.5q0 34 25 62t61 28q33 0 52 -21t19 -50q0 -21 -18 -41.5t-48 -20.5v-1q10 -20 48 -20q55 0 109.5 72.5t136.5 235.5q57 115 95.5 179t77.5 105q34 36 101 68 l25 -22q-7 -19 -12 -55t-7 -65l-6 -89q-4 -61 -6 -88q-11 -156 -18 -200z" />
+<glyph unicode="&#x1d4de;" horiz-adv-x="809" d="M749 562l-38 -9q-13 40 -56 65.5t-89 25.5q-88 0 -173.5 -69.5t-139.5 -182t-54 -229.5q0 -53 28 -91t78 -38q54 0 106 25q82 40 134.5 127.5t52.5 185.5q0 52 -23.5 89.5t-52.5 37.5q-43 0 -71.5 -41.5t-28.5 -97.5q0 -52 26 -95l-44 -22q-37 60 -37 126q0 83 51.5 139 t130.5 56q62 0 105.5 -44.5t43.5 -127.5q0 -68 -32 -141t-86 -133.5t-133 -99.5t-164 -39q-98 0 -154.5 60t-56.5 151q0 101 39.5 195t105 162.5t156 110t187.5 41.5q79 0 131.5 -40t57.5 -97z" />
+<glyph unicode="&#x1d4df;" horiz-adv-x="1025" d="M914 698l19 -47q-27 -12 -55 -29q116 -76 116 -183q0 -71 -46 -118t-124 -47q-36 0 -65 22.5t-29 58.5q0 42 29 71l41 -28q-15 -18 -15 -37q0 -15 10.5 -23.5t22.5 -8.5q27 0 44.5 28t17.5 72q0 83 -67 140q-33 -35 -57.5 -79t-50 -104.5t-41.5 -90.5q-90 -170 -193 -243 t-231 -73q-85 0 -135 36.5t-50 93.5q0 38 23 65t58 27q31 0 49.5 -20t18.5 -47q0 -24 -15 -43.5t-43 -24.5v-1q25 -31 84 -31q85 0 141 50t138 198q68 124 122 200t119 128q-72 34 -151 34q-147 0 -246.5 -65t-99.5 -160q0 -43 27 -70.5t65 -27.5q61 0 102 50.5t47 157.5h50 q0 -66 -19 -123t-68.5 -98.5t-122.5 -41.5q-74 0 -123 41.5t-49 115.5q0 65 46.5 126t128.5 100q105 50 255 50q122 0 224 -45q49 28 98 44z" />
+<glyph unicode="&#x1d4e0;" horiz-adv-x="809" d="M749 562l-38 -9q-13 40 -56 65.5t-89 25.5q-88 0 -173.5 -69.5t-139.5 -182t-54 -229.5q0 -53 28 -91t78 -38q54 0 115 29q-16 29 -39 29q-14 0 -25 -5t-35 -24l-30 40q71 73 121 73q56 0 93 -45q93 104 93 241q0 56 -22.5 91.5t-63.5 35.5q-43 0 -66.5 -38t-23.5 -91 q0 -55 27 -95l-44 -22q-38 58 -38 124q0 77 50.5 132t131.5 55q62 0 105.5 -44.5t43.5 -127.5q0 -80 -43 -165t-115 -148q34 -48 51 -48q16 0 32 9t50 41l33 -34q-39 -51 -71.5 -75t-70.5 -24q-41 0 -67 15t-50 54q-83 -38 -164 -38q-98 0 -154.5 60t-56.5 151 q0 101 39.5 195t105 162.5t156 110t187.5 41.5q79 0 131.5 -40t57.5 -97z" />
+<glyph unicode="&#x1d4e1;" horiz-adv-x="1048" d="M934 175l39 -33q-58 -81 -110.5 -120.5t-113.5 -39.5q-57 0 -90 27t-33 67q0 37 42.5 101t42.5 90q0 24 -14 27q-22 0 -30 5q-87 -169 -192.5 -244.5t-234.5 -75.5q-85 0 -135 36.5t-50 93.5q0 38 23 65t58 27q31 0 49.5 -20t18.5 -47q0 -24 -15 -43.5t-43 -24.5v-1 q25 -31 87 -31q85 0 139 49.5t137 198.5q70 128 122.5 202t118.5 126q-72 34 -151 34q-147 0 -246.5 -65t-99.5 -160q0 -43 27.5 -70.5t64.5 -27.5q75 0 113 66q31 52 35 133h50q0 -104 -52 -179t-159 -75q-71 0 -120.5 42.5t-49.5 114.5q0 65 46.5 125.5t128.5 99.5 q107 51 255 51q122 0 224 -45q44 25 98 44l19 -47q-30 -13 -55 -29q93 -61 93 -146q0 -67 -52 -111t-126 -50v-2q34 -34 34 -86q0 -27 -39 -83.5t-39 -75.5q0 -27 26 -27q52 0 159 134zM857 481q0 53 -43 88q-21 -21 -40 -50t-27 -44.5t-27 -58.5l-22 -49q33 0 62 -18 q38 7 67.5 47.5t29.5 84.5z" />
+<glyph unicode="&#x1d4e2;" horiz-adv-x="816" d="M437 136l-49 -10q-12 73 -40 99t-67 26t-62.5 -31t-23.5 -71q0 -41 36 -78t90 -37q68 0 115.5 41t47.5 122q0 31 -16.5 59.5t-39.5 51.5l-47 48q-23 25 -39.5 57.5t-16.5 68.5q0 70 46.5 121t108.5 73.5t126 22.5q68 0 121.5 -30.5t53.5 -91.5q0 -62 -64 -106.5 t-137 -44.5v50q49 4 79.5 27.5t30.5 67.5q0 35 -25.5 54t-59.5 19q-55 0 -103.5 -39.5t-48.5 -102.5q0 -34 17 -64.5t41 -54.5l49 -48q24 -24 41 -56t17 -69q0 -103 -87 -167t-216 -64q-99 0 -166.5 42.5t-67.5 125.5q0 74 58 116.5t136 42.5q144 0 162 -170z" />
+<glyph unicode="&#x1d4e3;" horiz-adv-x="1030" d="M999 699l26 -42q-44 -38 -102.5 -62.5t-115.5 -24.5q-82 0 -196.5 37t-160.5 37q-85 0 -141 -46t-56 -111q0 -53 29 -80t72 -27q58 0 95 40t65 129l48 -12q-19 -99 -77 -155.5t-133 -56.5q-67 0 -108 22q-82 44 -82 133q0 54 32 101.5t86 76.5q77 41 229 41q56 0 175 -19 t171 -19q29 0 71 10.5t73 27.5zM718 558l35 -36q-28 -29 -46.5 -70.5t-36 -101t-28.5 -85.5q-38 -98 -108 -168q-60 -60 -136.5 -89t-153.5 -29q-85 0 -132 35.5t-47 93.5q0 38 24.5 65.5t59.5 27.5q31 0 49.5 -20t18.5 -47q0 -24 -15 -43.5t-43 -24.5v-1q23 -31 80 -31 q72 0 130 50t121 176q47 94 82 146.5t61 78t85 73.5z" />
+<glyph unicode="&#x1d4e4;" horiz-adv-x="964" d="M904 669l-304 -563q-9 -18 -9 -36q0 -29 23 -29q46 0 149 130l41 -33q-53 -78 -112 -120q-50 -36 -104 -36q-100 0 -118 86h-1q-40 -50 -82.5 -69.5t-97.5 -19.5q-49 0 -81 26t-32 70q0 49 79 171l149 230q30 45 30 89q0 36 -24 57.5t-73 21.5q-74 0 -130 -47.5 t-56 -116.5q0 -31 16 -50.5t40 -19.5q41 0 66 25.5t45 78.5l48 -15q-18 -59 -59.5 -101.5t-106.5 -42.5q-50 0 -84 21q-56 35 -56 104q0 94 87 156.5t199 62.5q85 0 147 -40t62 -112q0 -40 -54 -128l-180 -291q-24 -36 -24 -67q0 -27 27 -27q40 0 98 66q77 87 200 307 l147 262h135z" />
+<glyph unicode="&#x1d4e5;" horiz-adv-x="1040" d="M332 62l3 -4q62 38 111 78t91.5 91.5t65 83t64.5 96.5l68 103q22 33 56 78t55.5 63.5t49 33t54.5 14.5q39 0 56.5 -21t17.5 -47q0 -28 -18.5 -47.5t-45.5 -19.5q-25 0 -43 14.5t-23 38.5h-2q-62 -53 -168 -224q-136 -220 -262 -314q-131 -100 -228 -100q-15 0 -66 9 q41 39 70.5 93t50.5 109.5t46 114t71 124.5t111 123v4q-76 0 -119 17q-29 11 -69.5 41t-68.5 30q-44 0 -76.5 -28.5t-32.5 -80.5q0 -38 21 -62.5t51 -24.5q27 0 47 10.5t43 39.5l38 -32q-32 -36 -61.5 -54.5t-72.5 -18.5q-65 0 -111 39.5t-46 108.5q0 73 62 115.5t142 42.5 q31 0 51 -1.5t50 -10t59 -24.5q47 -27 79 -27q92 0 160 63l36 -35q-74 -78 -113.5 -144t-79.5 -165q-75 -184 -174 -293z" />
+<glyph unicode="&#x1d4e6;" horiz-adv-x="1320" d="M634 62l3 -4q46 25 89.5 63.5t86.5 93t69 91.5l67 101l68 103q22 33 56 78t55.5 63.5t49 33t54.5 14.5q39 0 56.5 -21t17.5 -47q0 -28 -18 -47.5t-45 -19.5q-26 0 -44 14.5t-23 38.5h-2q-62 -53 -168 -224q-42 -68 -80.5 -123t-87 -111t-95 -94t-100.5 -62t-107 -24 q-28 0 -58 9q43 38 76 96.5t84 188.5q11 29 44 103h-2l-42 -66l-48 -71q-36 -52 -59 -78.5t-63 -67t-73 -61t-76 -37t-85 -16.5q-27 0 -60 9q36 29 61.5 78t46 106.5t45.5 119t73.5 132t116.5 130.5v2q-76 0 -119 17q-29 11 -69.5 41t-68.5 30q-44 0 -76.5 -28.5 t-32.5 -80.5q0 -38 21 -62.5t51 -24.5q27 0 47 10.5t43 39.5l38 -32q-32 -36 -61.5 -54.5t-72.5 -18.5q-71 0 -114 40.5t-43 107.5q0 62 58.5 110t145.5 48q31 0 51 -1.5t50 -10t59 -24.5q47 -27 79 -27q92 0 160 63l36 -35q-59 -57 -100.5 -119.5t-66.5 -119.5l-50 -114 q-24 -57 -63.5 -123t-93.5 -126l2 -4q43 18 87.5 59t84.5 93t81 111l82 117q42 58 84 108t90.5 88t97.5 53q25 0 49 -8q-47 -50 -83.5 -116t-61.5 -130l-51 -128q-26 -64 -64.5 -128.5t-88.5 -114.5z" />
+<glyph unicode="&#x1d4e7;" horiz-adv-x="1033" d="M664 567h2q40 58 88 95t115 37q56 0 98.5 -32.5t42.5 -86.5q0 -34 -24 -61t-60 -27q-34 0 -53.5 20t-19.5 49q0 21 18 41.5t48 20.5v1q-10 20 -48 20q-60 0 -103 -46t-84 -147t-70.5 -197.5t-29.5 -141.5q0 -34 14.5 -52.5t35.5 -18.5q30 0 69.5 29t100.5 99l38 -30 q-134 -157 -239 -157q-63 0 -97.5 25.5t-60.5 79.5h-2q-82 -108 -228 -108q-57 0 -104 32.5t-47 86.5q0 34 25 62t61 28q33 0 52 -21t19 -50q0 -21 -18 -41.5t-48 -20.5v-1q4 -8 21.5 -14t36.5 -6q79 0 133.5 47t105.5 147q42 82 67 159.5t25 115.5q0 71 -22.5 106t-76.5 35 q-73 0 -132 -57t-59 -126q0 -37 19 -60t52 -23q35 0 55.5 18.5t42.5 60.5l44 -18q-30 -58 -64.5 -87t-92.5 -29q-64 0 -105.5 37.5t-41.5 106.5q0 50 34.5 98t83.5 82q76 52 169 52q82 0 137.5 -35t76.5 -97z" />
+<glyph unicode="&#x1d4e8;" horiz-adv-x="989" d="M825 669h138q-131 -175 -212.5 -297.5t-147.5 -250.5l2 -1q50 24 100 64l35 -36q-64 -66 -178 -116q-52 -106 -147 -181t-206 -75q-44 0 -75 21.5t-31 61.5q0 85 105 137q22 11 52.5 20.5t52 14.5t63.5 14l61 13q11 24 56 101l-3 1q-71 -62 -145 -62q-53 0 -83 25t-30 71 q0 34 22 70t92 126q68 87 83 115.5t15 59.5q0 35 -28.5 57t-78.5 22q-74 0 -130 -47.5t-56 -116.5q0 -31 16 -50.5t40 -19.5q78 0 116 102l43 -12q-16 -59 -57 -102t-106 -43q-53 0 -84 19q-59 35 -59 106q0 94 87 156.5t199 62.5q87 0 153 -40t66 -112q0 -10 -1 -19t-5 -20 t-7.5 -19t-12.5 -22l-15 -23q-6 -10 -19.5 -29.5l-22.5 -32.5l-30 -38l-32 -44q-42 -57 -54.5 -80.5t-12.5 -41.5q0 -21 23 -21q66 0 265 266zM396 -23l-1 1q-29 -6 -58.5 -14.5t-64 -23.5t-56.5 -36.5t-22 -46.5q0 -10 7 -18t22 -8q37 0 83.5 35t89.5 111z" />
+<glyph unicode="&#x1d4e9;" horiz-adv-x="996" d="M440 531l45 -22q-58 -117 -177 -117q-68 0 -111.5 36t-43.5 97q0 66 65.5 120t174.5 54q168 0 278 -72q85 61 164 61q70 0 105.5 -23.5t35.5 -53.5q0 -34 -32.5 -60.5t-110.5 -26.5q-39 0 -131 28q-53 -68 -106 -216q48 2 92 43l32 -33q-73 -90 -157 -90q-5 -11 -15 -31 q-50 -92 -127 -154q64 -24 126 -24q64 0 127.5 31t89.5 101h50q-43 -200 -264 -200q-100 0 -157 18q-31 11 -52 22q-80 -37 -160 -37q-71 0 -101 23t-30 56q0 39 42 62q38 21 100 21q50 0 147 -40q20 26 32 47q14 26 56 128h-2q-48 0 -103 -44l-30 40q74 84 171 84 q67 145 151 217q-115 55 -225 55q-62 0 -103.5 -29.5t-41.5 -78.5q0 -37 21.5 -56.5t55.5 -19.5q70 0 119 84zM742 600v-2q57 -19 90 -19q53 0 53 29q0 25 -49 25q-57 0 -94 -33zM278 56q-57 33 -97 33t-40 -28q0 -24 57 -24q42 0 80 19z" />
+<glyph unicode="&#x1d4ea;" horiz-adv-x="942" d="M830 210l35 -29q-148 -192 -274 -192q-65 0 -87 56q-47 -35 -82 -47t-81 -12q-61 0 -101.5 30t-40.5 94q0 55 24 111q-46 -18 -92 -18q-53 0 -96 22l12 43q36 -15 82 -15q104 0 172 81v-1q58 59 133.5 94t147.5 35q112 0 142 -75l-41 -19q-19 27 -37.5 35.5t-50.5 8.5 q-66 0 -133.5 -59t-107.5 -134.5t-40 -131.5q0 -25 12.5 -38t32.5 -13q31 0 69.5 19.5t63.5 52.5q-1 9 -1 29q0 69 40 129.5t98 60.5q50 0 50 -49q0 -45 -35 -100t-86 -91q6 -27 15.5 -37.5t33.5 -10.5q81 0 223 171z" />
+<glyph unicode="&#x1d4eb;" horiz-adv-x="646" d="M92 541l31 36q31 -26 71.5 -48t65.5 -23q31 39 65 74q116 119 198 119q43 0 72 -20t29 -51q0 -44 -33 -85.5t-88 -68.5q-73 -35 -156 -35q-58 -79 -119 -196.5t-61 -173.5q0 -14 10 -23.5t23 -9.5q60 0 117 51t95 119q-17 30 -17 81q0 61 32.5 104t70.5 43q45 0 45 -49 q0 -33 -16.5 -79t-33.5 -75q19 -14 48 -14q18 0 39 7l11 -44q-30 -13 -66 -13q-37 0 -60 13q-67 -98 -135 -146t-152 -48q-53 0 -85.5 31t-32.5 89q0 59 46 157t117 195q-65 19 -131 83zM378 503l1 -2q62 1 108.5 40t46.5 87q0 21 -18 21q-23 0 -53 -30t-85 -116z" />
+<glyph unicode="&#x1d4ec;" horiz-adv-x="764" d="M35 225l12 43q36 -15 82 -15q100 0 161 68q59 64 129.5 102.5t138.5 38.5q53 0 89 -21.5t36 -61.5q0 -35 -20 -61t-53 -26q-28 0 -42.5 14t-14.5 36t19.5 37t19.5 22q0 11 -17 11q-60 0 -122.5 -57.5t-100.5 -132t-38 -130.5q0 -28 12 -42t30 -14q118 0 275 192l34 -30 q-87 -112 -162 -162t-156 -50q-67 0 -107.5 33t-40.5 90q0 55 25 113q-44 -19 -93 -19q-53 0 -96 22z" />
+<glyph unicode="&#x1d4ed;" horiz-adv-x="949" d="M912 699l-323 -598q-11 -19 -11 -39q0 -9 5 -16t11 -7q71 0 211 170l35 -29q-71 -97 -133.5 -144t-139.5 -47q-91 0 -93 75h-2q-73 -78 -179 -78q-56 0 -90.5 30.5t-34.5 81.5t35 118q-41 -13 -79 -13q-53 0 -96 22l12 43q36 -15 82 -15q86 0 154 63q93 91 181 127 q48 19 103 19q60 0 81 -39h2l145 276h124zM588 376q0 36 -30 36q-36 0 -86 -37t-101 -109q-88 -125 -88 -193q0 -16 8.5 -26.5t21.5 -10.5q55 0 123 63q61 58 106.5 139t45.5 138z" />
+<glyph unicode="&#x1d4ee;" horiz-adv-x="726" d="M35 284l29 35q47 -55 133 -69q52 89 145.5 150.5t182.5 61.5q54 0 88.5 -23t34.5 -61q0 -42 -35 -78q-44 -47 -129.5 -75.5t-178.5 -30.5q-12 -11 -22 -41.5t-10 -58.5t14.5 -43t39.5 -15q52 0 131.5 54t135.5 122l32 -32q-88 -109 -189 -160q-68 -34 -135 -34 q-68 0 -106 33.5t-38 90.5q0 50 17 94q-91 20 -140 80zM330 244l1 -1q101 11 160 54.5t59 92.5q0 13 -8.5 20t-17.5 7q-81 0 -194 -173z" />
+<glyph unicode="&#x1d4ef;" horiz-adv-x="768" d="M25 -205l192 367q-16 27 -16 59q0 43 35.5 84t95.5 68q90 176 157 251t153 75q51 0 79 -20t28 -53q0 -46 -31 -90t-80.5 -78t-95.5 -57.5t-93 -41.5l-117 -210q25 -12 61 -12q76 0 137 54l27 -36q-81 -68 -177 -68q-44 0 -75 9l-156 -301h-124zM483 432l2 -2 q70 34 122 85t52 104q0 17 -6 23.5t-20 6.5q-47 0 -150 -217z" />
+<glyph unicode="&#x1d4f0;" horiz-adv-x="819" d="M771 450l-278 -519q25 -12 73 -12q56 0 110 35l20 -41q-60 -44 -141 -44q-49 0 -89 14q-90 -107 -238 -107q-60 0 -94 23t-34 54q0 32 29.5 58t70.5 42q39 15 121 15q25 0 75 -8l40 72h-3q-63 -43 -143 -43q-50 0 -83.5 30.5t-33.5 79.5q0 55 32 117q-42 -14 -82 -14 q-52 0 -96 24l12 43q38 -17 82 -17q81 0 150 58q60 65 142.5 108.5t143.5 43.5q59 0 88 -30h2l10 18h114zM591 376q0 37 -33 37q-75 0 -187 -162q-83 -120 -83 -177q0 -16 9.5 -25.5t20.5 -9.5q43 0 93.5 41.5t89 97t64.5 112t26 86.5zM369 -91q-30 9 -63 9q-43 -1 -74 -16 t-32 -46q0 -30 40 -30q74 0 129 83z" />
+<glyph unicode="&#x1d4f1;" horiz-adv-x="838" d="M722 214l36 -28q-144 -200 -283 -200q-41 0 -65.5 25.5t-24.5 57.5q0 64 46 129l108 151q17 24 17 43q0 16 -20 16q-60 0 -150.5 -96t-176.5 -255l-31 -57h-123l249 458q-94 19 -143 80l31 33q28 -26 69 -43t70 -21q58 108 106.5 150t117.5 42q50 0 76.5 -22.5 t26.5 -54.5q0 -41 -24.5 -74.5t-63.5 -53.5t-78.5 -31t-77.5 -14l-43 -79l3 -1q42 43 91 66t90 23q45 0 73 -18.5t28 -52.5q0 -39 -49 -117l-105 -171q-17 -25 -17 -43q0 -20 17 -20q67 0 220 178zM442 509l1 -1q125 31 125 117q0 12 -6 18t-12 6q-22 0 -41.5 -24 t-66.5 -116z" />
+<glyph unicode="&#x1d4f2;" horiz-adv-x="558" d="M534 633q0 -26 -18.5 -44t-45.5 -18t-45 19t-18 47q0 24 19 42.5t43 18.5q27 0 46 -19t19 -46zM450 205l36 -28q-80 -106 -132 -148.5t-117 -42.5q-47 0 -75 24.5t-28 67.5q0 8 1 17t2 16t4 17t5 16t7 17l7 17q3 5 10 18l10 19q2 5 10.5 20.5t11.5 21.5l49 91 q-53 -29 -115 -29q-53 0 -96 22l12 43q36 -15 82 -15q104 0 172 81h118l-164 -316q-19 -36 -19 -69q0 -12 6 -20.5t15 -8.5q48 0 188 169z" />
+<glyph unicode="&#x1d4f3;" horiz-adv-x="840" d="M823 633q0 -26 -18.5 -44t-45.5 -18t-45 19t-18 47q0 24 19 42.5t43 18.5q27 0 46 -19t19 -46zM710 450l-276 -518q25 -12 73 -12q56 0 110 35l20 -41q-60 -44 -141 -44q-49 0 -89 14q-90 -107 -238 -107q-60 0 -94 22.5t-34 54.5t29.5 58t70.5 42q39 15 121 15 q25 0 75 -8l207 387q-53 -29 -126 -29q-53 0 -96 22l12 43q36 -15 82 -15q64 0 111 26t71 55h112zM310 -90q-30 9 -63 9q-43 -1 -74 -16t-32 -46q0 -30 40 -30q74 0 129 83z" />
+<glyph unicode="&#x1d4f4;" horiz-adv-x="810" d="M694 209l36 -28q-82 -105 -139 -150t-122 -45q-44 0 -72.5 19t-28.5 53q0 28 18.5 62.5t18.5 58.5q0 36 -47 39l18 45q80 8 132 46t52 79q0 20 -23 20q-59 0 -150.5 -96t-177.5 -255l-31 -57h-123l249 458q-82 17 -133 80l31 33q56 -52 129 -64q58 108 106.5 150 t117.5 42q46 0 74.5 -20.5t28.5 -51.5q0 -53 -43 -94.5t-96 -60.5t-105 -23l-43 -79l3 -1q89 89 191 89q41 0 68 -20t27 -47q0 -48 -62.5 -94t-147.5 -60v-3q55 -37 55 -81q0 -21 -16.5 -49.5t-16.5 -45.5q0 -7 5.5 -14.5t13.5 -7.5q65 0 203 173zM442 509l1 -1 q125 31 125 117q0 12 -6 18t-12 6q-22 0 -41.5 -24t-66.5 -116z" />
+<glyph unicode="&#x1d4f5;" horiz-adv-x="650" d="M43 429l26 38q28 -19 69 -35t59 -18q195 285 325 285q47 0 78.5 -21.5t31.5 -63.5q0 -56 -34.5 -107t-93.5 -87q-90 -56 -208 -65l-58 -100q-21 -36 -46 -94.5t-25 -91.5t25 -33q29 0 79.5 38t114.5 124l36 -27q-70 -99 -128.5 -142t-121.5 -43q-52 0 -82 31t-30 90 q0 97 103 255q-26 6 -64 27.5t-56 39.5zM333 421l1 -1q83 19 145.5 72t62.5 129q0 28 -25 28q-62 0 -184 -228z" />
+<glyph unicode="&#x1d4f6;" horiz-adv-x="1137" d="M1021 214l36 -28q-73 -101 -140 -150.5t-143 -49.5q-41 0 -65.5 25.5t-24.5 57.5q0 64 46 129l108 152q17 23 17 43t-23 20q-59 0 -148 -97.5t-176 -258.5l-31 -57h-123l203 357q12 21 12 37q0 19 -20 19q-60 0 -150.5 -98t-176.5 -258l-31 -57h-123l187 348 q-52 -29 -114 -29q-53 0 -96 22l12 43q36 -15 82 -15q104 0 172 81h114l-41 -79l3 -1q43 43 92 67.5t89 24.5q45 0 73 -19.5t28 -54.5q0 -8 -3 -18h3q43 43 92.5 67.5t89.5 24.5q46 0 75 -19.5t29 -54.5q0 -39 -49 -117l-105 -172q-17 -25 -17 -43q0 -20 16 -20 q68 0 221 178z" />
+<glyph unicode="&#x1d4f7;" horiz-adv-x="851" d="M735 214l36 -28q-73 -101 -140 -150.5t-143 -49.5q-41 0 -65.5 25.5t-24.5 57.5q0 64 46 129l108 156q17 24 17 43q0 16 -20 16q-60 0 -150.5 -98t-176.5 -258l-31 -57h-123l187 348q-52 -29 -114 -29q-53 0 -96 22l12 43q36 -15 81 -15q105 0 173 81h114l-41 -79l3 -1 q43 43 92 67.5t89 24.5q45 0 73 -19.5t28 -54.5q0 -38 -49 -117l-105 -172q-17 -25 -17 -43q0 -20 18 -20q66 0 219 178z" />
+<glyph unicode="&#x1d4f8;" horiz-adv-x="848" d="M757 232l23 -39q-46 -31 -99 -31q-36 0 -63 9q-62 -99 -143 -148q-61 -37 -131 -37q-65 0 -104 31.5t-39 92.5q0 54 24 113q-43 -20 -96 -20q-51 0 -94 22l12 43q36 -15 80 -15q97 0 163 71q64 69 137 104q71 34 148 34q51 0 79 -28.5t28 -79.5q0 -67 -35 -131 q12 -11 38 -11q17 0 25 0.5t20.5 5t26.5 14.5zM626 371q0 41 -47 41q-53 0 -116.5 -59.5t-105 -136t-41.5 -127.5q0 -53 46 -53q58 0 113 48t96 114q-30 27 -30 75q0 37 25 64.5t60 33.5z" />
+<glyph unicode="&#x1d4f9;" horiz-adv-x="885" d="M453 371l3 -1q43 43 92 67.5t89 24.5q133 0 133 -123q0 -70 -47 -150.5t-97 -116.5q67 -42 111 -110l-37 -27q-61 69 -123 101q-76 -50 -147 -50q-44 0 -65.5 14t-21.5 36q0 31 36.5 59.5t87.5 29.5q37 0 65 -9q45 32 79 92q44 79 44 151q0 54 -47 54q-58 0 -143 -96 t-174 -260l-143 -262h-123l299 552q-53 -28 -114 -28q-53 0 -96 22l12 43q36 -15 82 -15q104 0 172 81h114z" />
+<glyph unicode="&#x1d4fa;" horiz-adv-x="913" d="M802 224l31 -31q-55 -59 -220 -213q-64 -60 -116 -115t-63 -70h-123l127 237h-2q-67 -46 -143 -46q-50 0 -83.5 30.5t-33.5 79.5q0 58 32 120q-39 -13 -77 -13q-54 0 -96 23l12 43q35 -16 82 -16q80 0 148 57q61 65 141.5 108.5t141.5 43.5q60 0 88 -30h2l10 18h121 l-251 -468l1 -1zM594 377q0 36 -30 36q-36 0 -86 -37t-101 -109q-86 -124 -86 -194q0 -16 8 -26.5t21 -10.5q29 0 56 13.5t66 49.5q61 57 106.5 139t45.5 139z" />
+<glyph unicode="&#x1d4fb;" horiz-adv-x="677" d="M636 333l12 -43q-27 -14 -67 -14q-63 0 -88 28l-248 -193l-59 -111h-123l187 348q-52 -29 -114 -29q-53 0 -96 22l12 43q36 -15 82 -15q104 0 172 81h120l-113 -211l1 -1l150 112q-2 14 -2 19q0 42 31.5 67.5t72.5 25.5q50 0 73 -27l-101 -90q17 -19 58 -19q26 0 40 7z " />
+<glyph unicode="&#x1d4fc;" horiz-adv-x="562" d="M139 240l-19 41q38 15 59.5 25.5t57.5 37.5t67 64q-4 5 -8.5 25t-4.5 27q0 52 28.5 74.5t56.5 22.5q24 0 37 -15.5t13 -36.5q0 -25 -12.5 -56t-36.5 -52l19 -25q14 -19 20.5 -30t15.5 -29.5t13 -40t4 -46.5q0 -59 -35.5 -115t-89.5 -90q-57 -35 -140 -35 q-52 0 -92.5 24.5t-40.5 72.5q0 35 20.5 59t46.5 24q21 0 40 -11.5t19 -34.5q0 -19 -8.5 -27.5t-17.5 -14t-9 -16.5q0 -26 35 -26q63 0 110 66t47 176q0 19 -9 71q-71 -71 -186 -109z" />
+<glyph unicode="&#x1d4fd;" horiz-adv-x="618" d="M612 538l-22 -50h-145l-185 -354q-20 -40 -20 -69t21 -29q26 0 70 41t124 137l36 -28q-86 -112 -137.5 -156t-116.5 -44q-47 0 -72 24.5t-25 67.5q0 39 14 75.5t48 101.5l32 61h-2q-59 -55 -181 -66l-4 46q78 6 148.5 50.5t109.5 102.5l21 39h-101l22 50h102l70 131h120 l-69 -131h142z" />
+<glyph unicode="&#x1d4fe;" horiz-adv-x="842" d="M726 208l36 -28l-56 -71q-15 -19 -44 -50t-47.5 -41.5t-46.5 -19.5t-61 -9q-41 0 -66.5 24.5t-25.5 60.5v8h-1q-43 -47 -83 -71.5t-101 -24.5q-44 0 -72 25.5t-28 70.5q0 59 46 144l66 122q-53 -29 -115 -29q-53 0 -96 22l12 43q36 -15 82 -15q104 0 172 81h120 l-163 -309q-24 -45 -24 -78q0 -27 23 -27q66 0 151.5 111.5t174.5 302.5h120l-166 -319q-18 -34 -18 -62q0 -30 23 -30q48 0 188 169z" />
+<glyph unicode="&#x1d4ff;" horiz-adv-x="732" d="M659 224l11 -44q-27 -13 -60 -13q-45 0 -70 13q-67 -98 -135 -146t-150 -48q-52 0 -82.5 27t-30.5 78q0 57 59 166l49 90q-53 -28 -114 -28q-53 0 -96 22l12 43q36 -15 82 -15q104 0 172 81h118l-161 -308q-21 -38 -21 -73q0 -13 10 -23t23 -10q60 0 117 51t95 119 q-23 42 -23 92q0 69 31.5 114.5t75.5 45.5q47 0 47 -72q0 -35 -15 -80t-35 -74q19 -15 52 -15q18 0 39 7z" />
+<glyph unicode="&#x1d500;" horiz-adv-x="1012" d="M939 224l11 -44q-27 -13 -60 -13q-45 0 -70 13q-67 -98 -135 -146t-150 -48q-47 0 -77.5 24t-35.5 68h-1q-50 -49 -87.5 -70.5t-95.5 -21.5q-44 0 -71.5 25.5t-27.5 70.5q0 59 46 144l66 122q-53 -29 -115 -29q-53 0 -96 22l12 43q36 -15 82 -15q104 0 172 81h120 l-164 -309q-23 -43 -23 -75q0 -12 6.5 -21t15.5 -9q66 0 149.5 111t173.5 303h120l-162 -308q-20 -37 -20 -73q0 -13 10 -23t23 -10q60 0 117 51t95 119q-23 42 -23 92q0 68 31.5 114t75.5 46q47 0 47 -72q0 -35 -15 -80t-35 -74q19 -15 52 -15q18 0 39 7z" />
+<glyph unicode="&#x1d501;" horiz-adv-x="820" d="M140 234l-38 29q88 110 153.5 153t134.5 43q63 0 99 -55q58 58 139 58q51 0 81.5 -23t30.5 -65q0 -36 -21 -60.5t-55 -24.5q-21 0 -36 12t-15 36q0 15 5.5 24t12.5 12.5t12.5 9t5.5 12.5q0 17 -24 17q-40 0 -79.5 -44.5t-65 -104t-41.5 -113.5t-16 -78q0 -33 30 -33 q41 0 103 42.5t136 134.5l35 -30q-103 -131 -196 -175q-48 -22 -99 -22q-85 0 -109 55q-73 -58 -146 -58q-54 0 -84 27.5t-30 69.5q0 33 20.5 57t53.5 24q21 0 37 -12t16 -36q0 -19 -9 -28.5t-18 -15.5t-9 -17q0 -8 8 -13.5t17 -5.5q51 0 104 70.5t83 147t30 111.5 q0 44 -31 44q-41 0 -90 -35.5t-135 -139.5z" />
+<glyph unicode="&#x1d502;" horiz-adv-x="784" d="M711 450l-272 -519q25 -12 73 -12q58 0 110 34l20 -40q-60 -44 -141 -44q-49 0 -89 14q-90 -107 -238 -107q-60 0 -94 23t-34 54q0 32 29.5 58t70.5 42q39 15 121 15q25 0 75 -8l45 85h-2q-34 -30 -66.5 -44.5t-80.5 -14.5q-44 0 -72 25.5t-28 70.5q0 57 47 144l66 122 q-53 -29 -115 -29q-53 0 -96 22l12 43q36 -15 82 -15q104 0 172 81h120l-164 -309q-24 -45 -24 -75q0 -12 7 -21t16 -9q66 0 154 112.5t176 301.5h120zM315 -91q-30 9 -63 9q-43 -1 -74 -16t-32 -46q0 -30 40 -30q74 0 129 83z" />
+<glyph unicode="&#x1d503;" horiz-adv-x="782" d="M665 224l37 -26q-58 -82 -93 -118q-47 -49 -91.5 -70t-98.5 -21q-76 0 -76 55q0 17 12.5 36.5t12.5 31.5q0 13 -20 13q-22 0 -45.5 -14t-71.5 -52q-57 -73 -127 -73q-22 0 -32.5 10.5t-10.5 25.5q0 35 41.5 67t108.5 44l230 189v1q-27 -7 -57 -7q-55 0 -89 16 q-76 -91 -200 -108l-12 39q35 8 54.5 14.5t50.5 24.5t53 45q-45 29 -45 72q0 33 20.5 53.5t53.5 20.5q30 0 47.5 -18t17.5 -42q0 -29 -10 -52q30 -15 76 -15q55 0 95 20q50 77 118 77q20 0 33.5 -9.5t13.5 -26.5q0 -24 -23 -45q-33 -30 -105 -47l-196 -162l1 -1q21 3 38 3 q47 0 75 -18t28 -43q0 -15 -10.5 -34.5t-10.5 -26.5q0 -12 13 -12q30 0 85.5 50t108.5 133z" />
+<glyph unicode="&#x1d504;" horiz-adv-x="785" d="M742 65l-148 -87h-14q-31 18 -48 54t-20 71l-235 -125q-30 37 -86.5 74.5t-99.5 51.5v14q245 95 245 328q0 118 -30 174q-24 44 -83 44q-32 0 -54.5 -17.5t-22.5 -50.5q0 -25 18 -51.5t39.5 -45.5t39.5 -48.5t18 -61.5q0 -52 -52.5 -95.5t-113.5 -57.5l-9 22 q26 8 50.5 32.5t24.5 53.5q0 27 -18 51.5t-39 41t-39 44t-18 58.5q0 72 53.5 114t131.5 42q106 0 167.5 -64.5t61.5 -147.5q0 -77 -28.5 -135.5t-72.5 -97t-125 -90.5v-1q19 -9 39 -22.5t29.5 -21t32.5 -27.5t27 -23l149 71v293q0 129 -8 180l227 84l7 -28q-31 -9 -52 -22.5 t-32.5 -27.5t-17 -38t-6.5 -43.5t-1 -54.5v-355q0 -30 12 -45.5t30 -15.5q15 0 31 9l27 14z" />
+<glyph unicode="&#x1d505;" horiz-adv-x="822" d="M644 408v-2q62 -25 96 -77t34 -112q0 -101 -95 -171t-227 -70q-63 0 -102.5 11t-74.5 38l-25 20q-15 13 -22.5 18.5t-21 10.5t-28.5 5q-81 0 -110 -49l-20 14q32 51 78.5 90.5t100.5 39.5h10q103 55 103 257q0 107 -32 170t-82 63q-30 0 -48 -19.5t-18 -47.5 q0 -26 12 -44.5t28 -30.5l34 -26q17 -14 29 -38t12 -57q0 -50 -49.5 -94t-116.5 -60l-9 22q27 9 51 30.5t24 50.5q0 30 -11.5 47t-35.5 36q-23 19 -34.5 30.5t-22 32t-10.5 44.5q0 72 53.5 113.5t131.5 41.5q57 0 103.5 -25.5t74.5 -65.5h2l127 100q93 0 144.5 -43.5 t51.5 -105.5q0 -108 -105 -147zM632 531q0 34 -24.5 65t-68.5 31q-27 0 -43.5 -10.5t-49.5 -43.5q19 -54 19 -108q0 -43 -10 -86q51 2 87.5 16t55 37t26.5 47t8 52zM282 163v-3q21 -6 41 -16.5t31.5 -19t29.5 -23.5l25 -21q72 -55 115 -55q64 0 97 48.5t33 125.5 q0 64 -50.5 106.5t-117.5 42.5q-20 0 -40 -6q-22 -61 -57 -97.5t-107 -81.5z" />
+<glyph unicode="&#x1d507;" horiz-adv-x="868" d="M227 361v-24q-26 -4 -35 -4q-64 0 -103 37.5t-39 98.5q0 98 88.5 162t217.5 64q116 0 221 -51.5t172.5 -148t67.5 -214.5q0 -129 -87 -213q-95 -92 -264 -92q-59 0 -107.5 25t-88.5 50t-78 25q-64 0 -109 -46l-18 13q83 133 181 133q36 0 71 -14t63 -34l56 -40 q27 -20 58.5 -34t62.5 -14q97 0 156.5 62.5t59.5 162.5q0 109 -102.5 198.5t-234.5 108.5q-35 -35 -35 -60q0 -21 18.5 -43t41 -39t41 -45t18.5 -60q0 -52 -47 -93t-108 -41q-37 0 -68 16l10 21q20 -10 41 -10q28 0 46 17t18 45t-35 63l-11 11l-12 12q-4 3 -11 11t-10.5 15 t-7.5 16.5t-6 21t-2 25.5q0 24 24.5 61.5t55.5 61.5v2q-32 7 -78 7q-79 0 -142.5 -40t-63.5 -112q0 -33 22 -54.5t63 -21.5q20 0 29 2z" />
+<glyph unicode="&#x1d508;" horiz-adv-x="729" d="M662 678l16 -16q-2 -3 -18 -24t-25 -31t-25.5 -25.5t-33 -22.5t-34.5 -7q-69 0 -108 46q-39 -37 -39 -71q0 -55 77 -128q62 87 121 87q35 0 68 -24v-123h-22q-33 72 -80 72q-32 0 -65 -34v-2q43 -47 43 -107q0 -52 -49 -93.5t-109 -41.5q-40 0 -67 15l11 22 q19 -11 40 -11q28 0 46 14.5t18 44.5q0 33 -18 69t-40 61.5t-40 59.5t-18 65q0 41 39.5 87.5t146.5 134.5q57 -54 92 -54t73 37zM627 173l20 -12q-41 -79 -111 -132t-163 -53q-63 0 -117 22.5t-91.5 60t-63.5 87t-38.5 103t-12.5 107.5q0 60 14 116t42.5 105t79.5 78.5 t117 29.5q60 0 95 -37l-16 -19q-27 17 -64 17q-48 0 -83.5 -40t-51.5 -94.5t-16 -112.5q0 -62 13.5 -118.5t41.5 -106.5t77 -79.5t114 -29.5q115 0 214 108z" />
+<glyph unicode="&#x1d509;" horiz-adv-x="767" d="M695 675l21 -6q-52 -195 -172 -195q-12 0 -26 3q-55 -59 -55 -135q0 -7 2.5 -14.5t4.5 -12t8 -11.5l8 -10q2 -3 9.5 -11t8.5 -9q62 87 121 87q38 0 68 -25v-122h-22q-33 72 -80 72q-23 0 -65 -40q29 -28 42.5 -42.5t34.5 -43.5t30.5 -61.5t9.5 -71.5q0 -94 -84 -162.5 t-194 -68.5t-188 50.5t-78 139.5q0 47 38 105t38 88q0 16 -10.5 25.5t-27.5 9.5q-18 0 -36.5 -16.5t-27.5 -42.5l-23 6q12 43 41.5 75.5t83.5 32.5q51 0 80 -30t29 -69q0 -37 -34.5 -97t-34.5 -103q0 -60 45 -98t103 -38q70 0 116.5 40t46.5 114q0 43 -16.5 80.5t-39.5 63.5 l-46 50q-23 24 -39.5 51t-16.5 56q0 92 116 198v3q-45 18 -82 41q-33 21 -52 31.5t-51.5 21.5t-62.5 11q-41 0 -75.5 -31.5t-34.5 -82.5q0 -59 35.5 -86.5t85.5 -27.5q15 0 45 4v-24q-28 -6 -58 -6q-77 0 -126.5 45t-49.5 111q0 79 62 138.5t158 59.5q43 0 85.5 -13.5 t67 -27.5t60.5 -38q62 -42 110 -42q20 0 47.5 26.5t46.5 74.5z" />
+<glyph unicode="&#x1d50a;" horiz-adv-x="806" d="M613 428v-3q62 -12 102 -53.5t40 -99.5q0 -115 -97 -205q-99 -91 -259 -91q-156 0 -252.5 107t-96.5 260q0 95 25 169.5t85 123.5t149 49q49 0 81 -30l-14 -22q-19 15 -60 15q-141 0 -141 -296q0 -65 13 -122t40.5 -107t78 -79.5t118.5 -29.5q103 0 158 65t55 172 q0 140 -80 140q-31 0 -73 -27v-2q62 -65 62 -124q0 -53 -47 -93.5t-108 -40.5q-40 0 -69 15l11 22q22 -11 40 -11q28 0 45.5 17t17.5 46q0 46 -60 120q-38 46 -54.5 80t-16.5 73q0 34 17.5 68t49 64.5t57.5 51.5t62 45l15 -18l-19 -19l-22 -20l-18.5 -21t-18.5 -24l-14 -23 q-8 -13 -11 -25.5t-3 -24.5q0 -29 18.5 -68.5t40.5 -61.5q40 15 78.5 44.5t38.5 58.5q0 7 -16.5 33.5t-16.5 50.5q0 55 115 118l13 -17q-31 -24 -31 -60q0 -18 27 -46.5t27 -50.5q0 -54 -82 -93z" />
+<glyph unicode="&#x1d50d;" horiz-adv-x="772" d="M688 660l23 -7q-41 -153 -174 -153q-39 0 -75 15t-59.5 32.5t-58.5 32.5t-73 15q-44 0 -80.5 -28.5t-36.5 -84.5q0 -45 31 -71t75 -26q30 0 61 14l8 -23q-37 -19 -77 -19q-72 0 -119 40.5t-47 110.5q0 84 60 135.5t157 51.5q51 0 93 -15t66 -32.5t59.5 -32.5t73.5 -15 q63 0 93 60zM721 362l-23 -10q-30 59 -98 59q-22 0 -43 -18.5t-21 -48.5q0 -35 31 -89t62.5 -115t31.5 -112q0 -94 -84 -163t-194 -69q-129 0 -196 53q-53 41 -53 119q0 12 8.5 45t8.5 47q0 29 -27 29q-30 0 -51 -44l-23 6q14 47 48.5 80t78.5 33q53 0 75 -26t22 -65 q0 -21 -10 -58t-10 -55q0 -50 32 -88t107 -38q65 0 105.5 43.5t40.5 109.5q0 36 -17.5 77.5t-38.5 73t-38.5 76t-17.5 87.5q0 63 48 109.5t102 46.5q105 0 144 -95z" />
+<glyph unicode="&#x1d50e;" horiz-adv-x="846" d="M785 113l16 -20q-25 -24 -78.5 -61.5t-87.5 -53.5h-14q-61 37 -89 108q-7 20 -16 62t-16 71t-26.5 53t-48.5 24q-13 0 -45 -13v-1q34 -39 34 -80q0 -45 -37.5 -92.5t-139.5 -131.5q-18 14 -62.5 38t-57.5 28q-34 -33 -46 -53l-21 14l104 147l76 -45q56 -33 59 -33 q11 10 16 16t9.5 18t4.5 28q0 21 -24.5 54.5t-54 65t-54 81.5t-24.5 102q0 121 90 188.5t216 67.5q103 0 181 -57.5t99 -140.5l-22 -7q-34 78 -104 119.5t-152 41.5q-79 0 -141 -40t-63 -119q0 -46 22 -77h2q4 66 50.5 116t112.5 50q81 0 131 -47q15 -14 32.5 -49t36 -61 t42.5 -30v-14l-167 -49v-3q76 -43 109 -152q14 -45 37 -76t40 -31q8 0 34 16t37 28zM604 382v2q-64 18 -97 82q-36 71 -79 71q-49 0 -80.5 -48t-31.5 -105q0 -27 13 -40l30 -36z" />
+<glyph unicode="&#x1d50f;" horiz-adv-x="669" d="M605 141l21 -8q-19 -63 -59 -110t-101 -47q-48 0 -100 24l-100 50q-47 24 -84 24q-86 0 -112 -78l-23 7q12 60 58.5 114.5t114.5 56.5q29 31 29 71q0 25 -14.5 49t-35.5 45t-41.5 44t-35 54.5t-14.5 67.5q0 81 79.5 135.5t173.5 54.5q89 0 167 -47t78 -123 q0 -44 -19.5 -81t-39 -66t-19.5 -55q0 -69 86 -95l-9 -22q-63 5 -119.5 43t-56.5 86q0 59 35 115.5t35 105.5q0 52 -37.5 76.5t-90.5 24.5q-63 0 -109 -26t-46 -85q0 -32 20 -65.5t44 -57t44 -53.5t20 -57t-16.5 -56.5t-31 -45t-37.5 -37.5q57 -9 136 -53.5t113 -44.5 q65 0 97 65z" />
+<glyph unicode="&#x1d510;" horiz-adv-x="1083" d="M1012 105l19 -16q-20 -27 -59.5 -61.5t-71.5 -49.5h-14q-98 34 -98 202q0 94 50 183.5t118 130.5v2q-41 7 -64 25t-29 39t-10.5 41t-18 33.5t-41.5 13.5q-32 0 -57.5 -29.5t-25.5 -69.5q9 -48 9 -116q0 -76 -10 -130t-45 -120q-58 -107 -147 -205q-7 4 -43 29t-53 33 q-22 -18 -45 -49l-22 14l94 145q6 -4 28.5 -20.5t41.5 -29t24 -12.5q52 0 52 323q0 161 -14 198q-14 39 -61 39q-31 0 -55 -28t-24 -58v-123q0 -78 -9.5 -132t-45.5 -122q-59 -112 -147 -207q-8 4 -36 21t-49 28.5t-27 12.5q-18 -9 -44 -49l-22 14l94 145q103 -62 110 -62 q18 0 29.5 30.5t15.5 89.5t5 97t1 100v39q0 15 -2 45t-5.5 50.5t-11 46t-17.5 41t-26.5 26.5t-36.5 11q-30 0 -48.5 -20t-18.5 -47t12 -47t29 -33l33 -27q17 -13 29 -35.5t12 -53.5q0 -50 -49.5 -94t-116.5 -60l-9 22q27 9 51 30.5t24 50.5q0 30 -18 55t-39 39.5t-39 39.5 t-18 56q0 72 53.5 113.5t131.5 41.5q55 0 104 -24.5t76 -66.5h2q17 36 54 61.5t78 25.5q98 0 142 -87h2q20 38 54.5 62.5t75.5 24.5q95 0 127 -67q6 -13 13.5 -36.5t12.5 -37t18 -25.5t33 -14v-14q-75 -34 -98.5 -105.5t-23.5 -183.5q0 -153 36 -153q26 1 71 50z" />
+<glyph unicode="&#x1d511;" horiz-adv-x="827" d="M775 511v-14q-75 -34 -99.5 -106t-24.5 -183q0 -153 31 -153q25 0 71 50l19 -16q-20 -27 -59.5 -61.5t-71.5 -49.5h-14q-52 18 -72.5 69.5t-20.5 132.5q0 93 49.5 183t113.5 131v2q-69 11 -90 58q-5 11 -10 32.5t-9 33t-19.5 21t-41.5 9.5q-32 0 -60 -30t-28 -71 q10 -88 10 -149q0 -109 -55 -215q-59 -112 -147 -207q-99 59 -121 62q-27 -23 -44 -49l-22 14l94 145q103 -62 119 -62q18 0 29.5 30.5t15.5 89.5t5 97t1 100q0 259 -108 259q-30 0 -48.5 -20t-18.5 -47t12 -47t29 -33l33 -27q17 -13 29 -35.5t12 -53.5q0 -50 -49.5 -94 t-116.5 -60l-9 22q27 9 51 30.5t24 50.5q0 24 -11.5 43.5t-28.5 34.5l-34 30q-17 15 -28.5 36t-11.5 46q0 72 53.5 113.5t131.5 41.5q56 0 108 -24.5t78 -66.5h2q20 44 60 66.5t87 22.5q33 0 68 -14q27 -11 41.5 -31.5t19.5 -42t10.5 -42t21 -35t44.5 -17.5z" />
+<glyph unicode="&#x1d512;" horiz-adv-x="837" d="M55 14l-18 13q18 44 54.5 84t78.5 56q27 41 27 85q0 29 -18.5 58t-40 50t-40 55t-18.5 72q0 58 39 114t93 94q24 -25 74 -25q26 0 65 10.5t62 10.5q136 0 235 -84q65 -55 101.5 -135.5t36.5 -177.5q0 -61 -22.5 -122.5t-64.5 -101.5q-97 -94 -264 -94q-46 0 -87.5 15.5 t-66.5 34.5t-57 34.5t-63 15.5q-58 0 -106 -62zM742 277q0 135 -86 224.5t-216 89.5q-17 0 -62 -7t-60 -7q-79 0 -108 70q-41 -26 -41 -108q0 -29 12.5 -54.5t30.5 -44.5l36 -40q19 -20 31.5 -46t12.5 -55q0 -58 -76 -123q44 0 87.5 -21t74 -47t71 -47t77.5 -21q96 0 156 68 t60 169z" />
+<glyph unicode="&#x1d513;" horiz-adv-x="823" d="M769 521v-16q-67 -12 -67 -95q0 -33 18 -71.5t35.5 -82t17.5 -91.5q0 -69 -75 -129t-148 -60q-64 0 -114 22v-202h-117v235q-24 21 -56 21q-72 0 -114 -75l-20 9q8 30 20 56.5t32 53.5t50 42.5t67 15.5q14 0 21 -1v250q0 138 -30 197q-33 64 -83 64q-30 -1 -48.5 -20.5 t-18.5 -45.5q0 -27 12 -47.5t29 -34.5l33 -27q17 -14 29 -36.5t12 -53.5q0 -51 -50 -99t-116 -64l-9 22q25 8 50 34.5t25 55.5t-18 53.5t-39 40.5t-39 42t-18 57q0 71 53.5 112.5t132.5 41.5q63 0 112 -24.5t74 -65.5h2q21 46 55 67t88 21q46 0 75 -16t42 -39.5t22.5 -47.5 t27 -44t45.5 -25zM695 503v2q-42 4 -67.5 20t-35.5 36.5t-17 41t-20 34t-37 13.5q-32 0 -51.5 -23.5t-25 -51t-5.5 -61.5v-379q19 -14 43 -44.5t45.5 -48.5t49.5 -18q34 0 63.5 23t29.5 73q0 34 -41 114t-41 130q0 40 28.5 78t81.5 61z" />
+<glyph unicode="&#x1d514;" horiz-adv-x="865" d="M798 36l16 -13q-46 -87 -122 -87q-33 0 -57 19.5t-36 49.5q-74 -29 -164 -29q-46 0 -87.5 15.5t-66.5 34.5t-57 34.5t-63 15.5q-58 0 -106 -62l-18 13q18 44 54.5 84t78.5 56q27 41 27 85q0 29 -18.5 58t-40 50t-40 55t-18.5 72q0 58 39 114t93 94q24 -25 74 -25 q26 0 65 10.5t62 10.5q136 0 235 -84q65 -55 101.5 -135.5t36.5 -177.5q0 -61 -23 -122.5t-65 -103.5q16 -66 41 -66q35 0 59 34zM491 124l-16 16q34 63 101 63q40 0 68.5 -26.5t33.5 -72.5q64 67 64 173q0 135 -86 224.5t-216 89.5q-17 0 -62 -7t-60 -7q-79 0 -108 70 q-41 -26 -41 -108q0 -29 12.5 -54.5t30.5 -44.5l36 -40q19 -20 31.5 -46t12.5 -55q0 -58 -76 -123q44 0 87.5 -21t74 -47t71 -47t77.5 -21q30 0 59 8v1l-7 27q-6 19 -9.5 27t-9.5 19.5t-14 16t-19 4.5q-16 0 -35 -19z" />
+<glyph unicode="&#x1d516;" horiz-adv-x="856" d="M440 459l-11 -17q-33 14 -61 14q-41 0 -64 -29t-23 -70q0 -31 22 -54t54 -23q14 0 24.5 2.5t21.5 10.5t16.5 12.5t18.5 17.5l18 18q86 83 171 83q70 0 122 -47t52 -131q0 -115 -101 -192.5t-238 -77.5q-182 0 -294.5 112.5t-112.5 278.5q0 79 42 154t119.5 124.5 t167.5 49.5q60 0 106.5 -17t84.5 -34t76 -17q49 0 110 58l18 -13q-29 -55 -73.5 -98.5t-100.5 -43.5q-61 0 -144 32.5t-126 32.5q-107 0 -174.5 -62.5t-67.5 -163.5q0 -140 98.5 -204t267.5 -64q34 0 54.5 0.5t56.5 3.5t59 8t51 16t44 26t27.5 39t11.5 54q0 48 -32 79 t-81 31q-27 0 -52.5 -18.5t-47.5 -44.5t-47 -52t-62.5 -44.5t-83.5 -18.5q-61 0 -103.5 50t-42.5 108q0 60 43.5 104t100.5 44t85 -27z" />
+<glyph unicode="&#x1d517;" horiz-adv-x="766" d="M684 667l21 -6q-8 -29 -18.5 -54t-30.5 -56t-51.5 -49t-71.5 -18q-36 0 -92 29q-22 -17 -22 -56q0 -16 16.5 -34.5t35.5 -33t35.5 -36.5t16.5 -44q0 -56 -40.5 -86.5t-104.5 -30.5q-37 0 -68 16l10 21q17 -10 36 -10q24 0 40.5 17.5t16.5 44.5q0 22 -31 69t-31 77 q0 39 60 100l-1 3q-32 22 -50 32.5t-51.5 21.5t-67.5 11q-45 0 -83.5 -33.5t-38.5 -85.5q0 -57 32.5 -90t79.5 -35v-24q-77 0 -130.5 47.5t-53.5 112.5q0 85 62 146.5t158 61.5q107 0 216 -73q56 -38 107 -38q23 0 49 18t45 65zM705 126l17 -16q-28 -43 -54 -69.5 t-69.5 -45.5t-99.5 -19q-59 0 -110 21t-94 42t-80 21q-28 0 -62.5 -15.5t-56.5 -52.5l-18 13q26 70 74 112.5t107 42.5q55 0 111 -24l110 -48q53 -24 100 -24q42 0 69.5 14t55.5 48z" />
+<glyph unicode="&#x1d518;" horiz-adv-x="787" d="M744 65l-148 -87h-14q-32 19 -48.5 55t-19.5 72l-262 -127q-32 36 -94 75t-108 51v14q29 13 47.5 24.5t41.5 35t35 61t12 88.5v224q0 29 -11.5 44.5t-29.5 15.5q-30 0 -73 -30l-14 25l164 90h15q36 -17 55 -62t19 -79v-147q0 -77 -28 -124t-107 -112q27 -10 79 -47.5 t83 -64.5l176 80v290q0 129 -8 180l227 86l7 -28q-31 -9 -52 -22.5t-32.5 -28t-17 -39t-6.5 -44t-1 -54.5v-356q0 -30 12 -45.5t30 -15.5q15 0 31 9l27 14z" />
+<glyph unicode="&#x1d519;" horiz-adv-x="831" d="M777 521v-16q-67 -12 -67 -94q0 -40 35.5 -113t35.5 -133q0 -38 -32.5 -80.5t-79.5 -71.5q-59 -37 -172 -37t-186 55q-62 46 -95 46q-37 0 -71.5 -20t-56.5 -61l-18 7q18 72 70 123t108 53q79 45 79 252q0 107 -32 170t-81 63q-31 0 -49 -19.5t-18 -48.5q0 -33 18 -56.5 t39.5 -36t39.5 -39t18 -63.5q0 -51 -50 -99t-116 -64l-9 22q27 9 51 30t24 51q0 25 -11.5 46t-28.5 36l-34 31q-17 15 -28.5 37t-11.5 49q0 72 53.5 113.5t131.5 41.5q114 0 178 -91h2q21 39 58 64t86 25q48 0 78 -15.5t44 -38.5t24.5 -47t28 -44.5t45.5 -26.5zM703 503v2 q-42 4 -68 20t-36.5 36.5t-18 41t-21 34t-38.5 13.5q-29 0 -53 -23.5t-37 -63.5q21 -52 21 -98q0 -38 -5 -69t-20 -70t-47.5 -77t-81.5 -74v-2q30 -2 60 -18.5t54 -38.5l49 -42q24 -21 52.5 -35.5t56.5 -14.5q44 0 74.5 22.5t30.5 73.5q0 32 -41 113t-41 132q0 39 28.5 76.5 t81.5 61.5z" />
+<glyph unicode="&#x1d51a;" horiz-adv-x="1075" d="M1024 521v-17q-36 -4 -53 -30t-17 -63q0 -36 18 -74t35.5 -80.5t17.5 -91.5q0 -32 -26.5 -73.5t-68.5 -71.5q-62 -44 -133 -44q-111 0 -174 54q-61 -54 -161 -54q-41 0 -78.5 15.5t-60.5 34.5t-51.5 34.5t-54.5 15.5q-43 0 -81 -27t-48 -58l-21 6q19 76 68 128.5 t107 53.5q16 9 27.5 20.5t26 37t22.5 72.5t8 113q0 40 -5.5 79t-17.5 77.5t-35 62t-54 23.5q-29 0 -48 -20t-19 -48q0 -25 11.5 -45.5t28.5 -35.5l33 -30q17 -15 28.5 -36.5t11.5 -48.5q0 -54 -50.5 -96.5t-112.5 -56.5l-10 22q26 7 50.5 29.5t24.5 51.5q0 28 -18 52t-39 39 t-39 42t-18 61q0 70 54.5 110.5t136.5 40.5q107 0 171 -89h2q61 87 153 87q60 0 110 -36q70 36 118 36q56 0 89.5 -15.5t46.5 -39t21.5 -47.5t25.5 -44t48 -26zM947 502v2q-40 5 -65 22t-36 37.5t-20 40.5t-24 33t-41 13q-53 0 -92 -50.5t-39 -100.5q0 -39 27 -77l55 -80 q27 -42 27 -89q0 -31 -12 -71t-30 -68q19 -44 58.5 -66.5t78.5 -22.5t62 26t23 54q0 42 -41 127t-41 135q0 38 31 76t79 59zM291 175l1 -1q31 -6 60.5 -23.5t51.5 -38.5l40 -41q20 -20 40 -33t39 -13q53 0 82.5 48.5t29.5 112.5q0 51 -37 100q-57 74 -57 148q0 81 75 168 q-16 26 -32.5 37t-44.5 11q-34 0 -65.5 -26.5t-43.5 -57.5q21 -52 21 -101q0 -88 -32 -155t-128 -135z" />
+<glyph unicode="&#x1d51b;" horiz-adv-x="763" d="M735 668l-94 -146q-18 12 -70 41.5t-55 29.5q-20 -1 -43.5 -61t-23.5 -113v-41q108 0 153 55l17 -9q-26 -68 -60.5 -95.5t-109.5 -27.5v-71q0 -48 39 -98t85 -50q21 0 57 18.5t54 36.5l20 -26l-173 -133h-14q-59 23 -97 53t-68 85q-43 -67 -126 -147q-92 55 -114 58 q-28 -19 -44 -45l-22 14l94 146q18 -11 70.5 -41t55.5 -30q21 0 43.5 61.5t22.5 138.5v30h-46q-63 0 -106 -71l-20 5q18 73 58 108t114 35v41q0 56 -30 111.5t-74 55.5q-27 0 -65 -22t-61 -45l-22 24l86 69l102 83h14q48 -14 87.5 -57.5t59.5 -89.5q62 91 126 147 q100 -57 114 -62q29 24 44 49z" />
+<glyph unicode="&#x1d51c;" horiz-adv-x="766" d="M426 604h2q14 36 45 62.5t71 26.5q47 0 81.5 -25.5t53 -70t27 -97.5t8.5 -116q0 -130 -35.5 -236.5t-93 -184.5t-151.5 -167h-13q-31 33 -58.5 47.5t-66.5 14.5q-77 0 -121 -57l-20 10q60 136 192 136q33 0 67.5 -18.5t58.5 -46.5q116 130 116 493q0 45 -0.5 70.5t-2 63 t-5.5 58.5t-10 42.5t-16.5 31t-24.5 9.5q-34 0 -59.5 -33t-25.5 -67q8 -64 8 -87q0 -58 -12.5 -102t-42 -81t-64 -65t-93.5 -66v-2q85 -36 118 -67l88 35l12 -23l-185 -104q-29 33 -83 59t-105 38v14q58 25 98 50.5t75 62.5t52 88.5t17 119.5q0 127 -30 179q-37 65 -86 65 q-30 0 -48 -20t-18 -48q0 -25 17.5 -52.5t38.5 -48t38.5 -52.5t17.5 -65q0 -52 -53 -98t-114 -59l-8 22q24 8 49.5 35.5t25.5 55.5q0 27 -17.5 53t-38 44.5t-38 47.5t-17.5 60q0 73 54 114.5t136 41.5q52 0 107.5 -23.5t81.5 -67.5z" />
+<glyph unicode="&#x1d51e;" horiz-adv-x="530" d="M479 59l-99 -77h-14q-40 21 -58 78q-73 -45 -152 -78h-14q-47 39 -69 88t-22 121q0 49 18 93t51 71q23 19 77 55t77 58h14q1 -1 25.5 -17t33.5 -20.5t30 -16.5t39.5 -19t38.5 -13v-14q-20 -2 -33 -15.5t-13 -34.5v-220q0 -40 22 -40q14 0 36 19zM307 97v239l-87 53 q-41 -37 -54 -82t-13 -108q0 -57 19.5 -100t51.5 -43q14 0 43.5 14.5t39.5 26.5z" />
+<glyph unicode="&#x1d51f;" horiz-adv-x="513" d="M462 352v-170q0 -28 -25 -59t-52.5 -51.5t-70.5 -49.5t-57 -40h-14q-11 4 -55 23t-74.5 30t-61.5 18v15q4 2 14 5.5t12 4.5t8 4.5t7 6.5t3.5 9t3 13.5t0.5 18.5v388q0 90 -54 151l14 13q51 -36 87 -92q58 105 167 105q17 0 39 -3v-17q-74 0 -112.5 -57.5t-38.5 -130.5 v-86l143 67h14q47 -19 75 -50t28 -66zM360 159v131q0 57 -36 95q-21 21 -31 21q-12 0 -91 -38v-254l113 -53q29 22 37 40.5t8 57.5z" />
+<glyph unicode="&#x1d520;" horiz-adv-x="385" d="M344 384l-84 -56l-61 76q-14 -8 -20 -16q-20 -26 -20 -116v-60q0 -108 26 -142q18 -25 54 -25q42 0 90 26l9 -23l-171 -66h-14q-96 62 -96 214q0 95 24 142t110 100q32 21 74 30h14z" />
+<glyph unicode="&#x1d521;" horiz-adv-x="506" d="M455 346v-155q0 -15 -3 -28t-11 -27l-13 -22q-5 -8 -20 -21.5t-19.5 -18t-23 -20t-21.5 -17.5q-21 -17 -60 -55h-15q-23 13 -74 31.5t-79 18.5h-71v14q20 2 33.5 15.5t13.5 33.5v286q64 18 131 58v3q-29 14 -43.5 22t-41 24.5t-40.5 30.5t-25.5 34t-11.5 41q0 54 51 77.5 t126 23.5v-17q-30 -4 -55 -17.5t-25 -37.5q0 -19 13 -33.5t29 -22.5t49.5 -23.5t55.5 -27.5q79 -44 114.5 -81t35.5 -89zM353 158v155q0 33 -12 55t-24.5 31.5t-42.5 26.5q-23 -8 -58 -28q-14 -8 -18 -16t-4 -34v-226l130 -55q18 18 23.5 38t5.5 53z" />
+<glyph unicode="&#x1d522;" horiz-adv-x="420" d="M379 255l-230 -86q0 -48 37 -86t75 -38q7 0 44.5 14t53.5 22l10 -21l-167 -78h-14q-19 0 -42.5 15.5t-35.5 30.5q-63 73 -63 191q0 88 41.5 141.5t122.5 86.5q28 11 76 21h14zM149 201l112 43q17 7 17 32q0 12 -22.5 67t-34.5 75q-17 -3 -30 -14q-42 -28 -42 -141v-62z " />
+<glyph unicode="&#x1d523;" horiz-adv-x="327" d="M316 389h-113l-29 -598h-59l-29 598h-59v14q12 4 18 7t16.5 10t15.5 19.5t5 29.5q0 14 -3.5 47.5t-3.5 51.5q0 44 21 85t67 41q12 0 35.5 -18t43.5 -18q35 0 55 26l14 -8q-2 -5 -8.5 -23t-12.5 -30t-15 -26.5t-22.5 -22t-29.5 -7.5q-18 0 -44.5 10.5t-36.5 10.5 q-33 0 -33 -39q0 -105 164 -105h43v-55z" />
+<glyph unicode="&#x1d524;" horiz-adv-x="499" d="M414 318v-206q0 -50 23 -94q24 -44 24 -72q0 -72 -61.5 -113.5t-136.5 -41.5q-43 0 -72 9.5t-37.5 17.5t-21.5 25q-9 13 -16 19t-22 11.5t-37 5.5v20q62 25 104 25q52 0 72 -62q5 -17 16.5 -29.5t21.5 -12.5q44 0 67.5 18.5t23.5 68.5q0 28 -22.5 70t-26.5 84h-1 q-71 -44 -157 -79h-14q-90 75 -90 209q0 49 18 93t51 71q23 19 79.5 55.5t79.5 57.5h14l33 -22q26 -17 39.5 -25t39 -20t50.5 -19v-14q-19 -1 -30 -15t-11 -35zM312 97v239l-92 53q-67 -68 -67 -190q0 -58 18.5 -100.5t49.5 -42.5q15 0 48.5 14.5t42.5 26.5z" />
+<glyph unicode="&#x1d525;" horiz-adv-x="528" d="M476 355v-272q0 -77 -49 -157t-124 -135l-14 15q44 51 64.5 96t20.5 124v258q0 68 -36 101q-23 21 -32 21q-11 0 -90 -38v-252l57 -30q3 0 21 21.5t26 33.5l20 -16l-102 -143h-14q-84 57 -176 71v15q36 5 51 16.5t15 43.5v390q0 91 -54 151l14 13q51 -36 87 -92 q60 105 167 105q26 0 39 -3v-17q-73 0 -112 -57.5t-39 -130.5v-86l143 67h14q45 -15 74 -48t29 -65z" />
+<glyph unicode="&#x1d526;" horiz-adv-x="384" d="M230 651q0 -15 -19.5 -50.5t-34.5 -35.5q-17 0 -36 35t-19 51q0 18 15.5 30.5t39.5 12.5t39 -13t15 -30zM338 104l-108 -122h-14q-90 44 -90 142v223q0 32 -18 32q-14 0 -51 -30l-15 22l129 97h14q51 -44 108 -67v-14q-65 -7 -65 -45v-172q0 -50 10 -67t32 -17 q18 0 32 18l16 17z" />
+<glyph unicode="&#x1d527;" horiz-adv-x="345" d="M248 652q0 -15 -19.5 -50.5t-34.5 -35.5q-17 0 -36 35t-19 51q0 18 15.5 30.5t39.5 12.5t39 -13t15 -30zM311 401v-14q-65 -7 -65 -45v-383q0 -78 42 -142l-15 -14q-50 46 -67 75q-18 -32 -55.5 -59.5t-77.5 -27.5q-19 0 -29 3v17q41 0 70.5 40t29.5 116v378q0 32 -18 32 q-11 0 -51 -33l-15 22l129 102h14q51 -44 108 -67z" />
+<glyph unicode="&#x1d528;" horiz-adv-x="420" d="M368 390h-147v-267l67 -30q3 0 23 26.5t28 39.5l20 -17l-106 -160h-14q-94 64 -186 78v15q36 5 51 16.5t15 43.5v255h-71v14q71 13 71 62v52q0 91 -54 151l14 13q51 -36 87 -92q60 105 163 105q26 0 39 -3v-17q-73 0 -110 -57t-37 -131v-42h37v62q0 54 33 80.5t77 26.5 v-109h-14q-7 27 -28 27q-16 0 -27.5 -18.5t-11.5 -48.5v-20h81v-55z" />
+<glyph unicode="&#x1d529;" horiz-adv-x="398" d="M350 124l-114 -142h-14q-84 57 -176 71v15q36 5 51 16.5t15 43.5v390q0 91 -54 151l14 13q51 -36 87 -92q60 105 171 105v-20q-116 -39 -116 -188v-371l62 -32q4 0 25.5 22.5t28.5 33.5z" />
+<glyph unicode="&#x1d52a;" horiz-adv-x="910" d="M856 84l-101 -102h-16q-70 34 -70 142v229l-62 47l-97 -45v-216q0 -57 46 -57v-14q-36 0 -63 -28.5t-27 -64.5h-14q0 36 -27.5 64.5t-62.5 28.5v14q23 0 34.5 16t11.5 41v157q0 60 -25 85q-19 17 -34 17q-18 0 -100 -43v-216q0 -57 46 -57v-14q-36 0 -63 -28.5t-27 -64.5 h-14q0 36 -27 64.5t-63 28.5v14q23 0 34.5 16t11.5 41v205q0 30 -24 30q-17 0 -49 -30l-15 21l110 103h15q53 -22 62 -79l158 79h14q65 -22 84 -81l171 81h14q72 -57 128 -62v-15q-44 -7 -44 -34v-197q0 -51 4.5 -67.5t17.5 -16.5q19 0 32 13l12 13z" />
+<glyph unicode="&#x1d52b;" horiz-adv-x="636" d="M582 85l-101 -103h-16q-70 34 -70 142v231l-50 44l-95 -42v-218q0 -57 46 -57v-14q-36 0 -63 -28.5t-27 -64.5h-14q0 35 -28 64t-62 29v14q23 0 34.5 16t11.5 41v205q0 30 -24 30q-9 0 -17 -4.5t-32 -25.5l-15 21l110 103h15q52 -21 62 -78l166 78h14q25 -22 57.5 -41 t56.5 -21v-15q-44 -8 -44 -42v-189q0 -52 4.5 -68t17.5 -16q19 0 32 13l12 13z" />
+<glyph unicode="&#x1d52c;" horiz-adv-x="503" d="M452 310v-121q0 -69 -114 -153q-26 -19 -61 -54h-14q-34 24 -94 42t-119 18v14q48 17 48 64v255q123 35 204 93h14q24 -10 52.5 -26.5t37.5 -24.5q19 -21 32.5 -52.5t13.5 -54.5zM200 117l118 -51q15 13 22.5 33t8.5 37.5t1 56.5q0 45 -1.5 71t-12.5 59t-31 52 q-22 19 -53 19q-23 0 -52 -29v-248z" />
+<glyph unicode="&#x1d52d;" horiz-adv-x="555" d="M504 350v-171q0 -25 -24 -56t-48 -50.5t-68 -50.5l-55 -40h-15q-17 13 -49 21v-212h-102v232q-18 0 -28.5 -1.5t-28 -11t-31.5 -27.5l-17 11q39 102 105 119v240q0 29 -31.5 69t-31.5 68q0 52 58 96l17 -15q-15 -19 -15 -43q0 -16 14.5 -29t33 -22t36 -28.5t21.5 -47.5 l146 67h14q44 -19 71.5 -50.5t27.5 -67.5zM402 159v131q0 57 -36 95q-22 22 -29 22q-11 0 -92 -39v-256q64 -15 113 -51q28 22 36 40.5t8 57.5z" />
+<glyph unicode="&#x1d52e;" horiz-adv-x="507" d="M459 395h-17q-33 0 -33 -44v-560h-102v266q-97 -55 -150 -75h-15q-47 39 -69 89.5t-22 126.5q0 44 19 88t50 69q25 20 78 56t76 57h14q37 -21 55 -30t49 -18t67 -10v-15zM307 97v245l-87 47q-30 -27 -48.5 -81t-18.5 -103q0 -61 19 -105t52 -44q13 0 45 16t38 25z" />
+<glyph unicode="&#x1d52f;" horiz-adv-x="463" d="M426 387l-73 -74l-66 68l-45 -44v-185q0 -34 10 -41t34.5 -17t30.5 -10q4 0 79 59l15 -17l-142 -144h-14q-76 52 -167 52v14q20 4 36 19t16 33v230q0 22 -11 41.5t-26 19.5q-21 0 -50 -25l-15 21l109 81h14q56 -24 77 -94l95 94h14z" />
+<glyph unicode="&#x1d530;" horiz-adv-x="518" d="M170 519l-19 11q19 45 56 69t79 24q56 0 97.5 -37t41.5 -97q0 -53 -42.5 -97.5t-107.5 -44.5q-57 0 -108 45q-25 -25 -25 -64q0 -35 20.5 -65t49.5 -30q12 0 22.5 4t19.5 13l13 16q5 6 13.5 21t11.5 19q17 27 48 27q37 0 69.5 -26t44.5 -51q15 -28 15 -61 q0 -83 -163 -217h-15q-64 46 -121 46q-58 0 -104 -48l-17 12q66 122 166 122q71 0 129 -52q32 33 32 109q0 37 -19.5 58.5t-48.5 21.5q-14 0 -37 -22.5t-40 -48.5q-19 -29 -51 -29q-51 0 -86.5 37.5t-35.5 93.5q0 80 62 122q24 17 56.5 37.5t45.5 30.5h14q18 -35 57 -35 q27 0 47 22.5t20 55.5q0 38 -25.5 58.5t-60.5 20.5q-66 0 -104 -71z" />
+<glyph unicode="&#x1d531;" horiz-adv-x="374" d="M337 89l-117 -107h-14q-111 58 -161 58v14q36 4 52 19t16 52v275h-75v15q118 39 118 241h59v-200h92v-56h-92v-294l60 -33l44 35z" />
+<glyph unicode="&#x1d532;" horiz-adv-x="647" d="M593 79l-119 -97h-15q-51 20 -62 81l-169 -81h-16q-17 20 -50.5 40t-58.5 22v14q44 8 44 42v245q0 31 -25 31q-9 0 -48 -31l-14 20l109 103h15q34 -14 49.5 -38.5t15.5 -83.5v-252l51 -49l94 44v225q0 58 -46 58v14q36 0 63 28.5t27 63.5h14q0 -35 27.5 -63.5t62.5 -28.5 v-14q-23 0 -34.5 -16t-11.5 -42v-200q0 -41 30 -41q16 0 32 12l20 14z" />
+<glyph unicode="&#x1d533;" horiz-adv-x="515" d="M464 310v-121q0 -69 -114 -153q-8 -6 -28 -24l-33 -30h-14q-34 24 -94 42t-119 18v14q48 17 48 64v233q0 30 -31.5 69.5t-31.5 67.5q0 52 58 96l17 -15q-15 -19 -15 -43q0 -16 13.5 -28.5t30.5 -20.5t34.5 -25.5t23.5 -40.5q64 24 105 55h14q24 -10 52.5 -26.5 t37.5 -24.5q19 -21 32.5 -52.5t13.5 -54.5zM212 117l118 -51q22 18 27 44t5 83q0 45 -1.5 71t-12.5 59t-31 52q-22 19 -53 19q-23 0 -52 -29v-248z" />
+<glyph unicode="&#x1d534;" horiz-adv-x="759" d="M708 310v-121q0 -69 -114 -153q-31 -22 -61 -54h-14q-34 24 -93.5 42t-118.5 18v14q48 17 48 64v176q0 60 -25 85q-19 17 -34 17q-8 0 -90 -43v-216q0 -57 46 -57v-14q-36 0 -63 -28.5t-27 -64.5h-14q0 36 -27 64.5t-63 28.5v14q23 0 34.5 16t11.5 41v214 q0 30 -31.5 69.5t-31.5 67.5q0 52 58 96l17 -15q-15 -19 -15 -43q0 -16 14 -29.5t32 -23.5t35 -32t22 -53h2l145 78h14q55 -19 79 -61q91 40 124 61h14q42 -17 80 -51q19 -21 32.5 -52.5t13.5 -54.5zM457 116l117 -50q15 13 22.5 33t8.5 37.5t1 56.5q0 46 -1.5 71t-12 58.5 t-30.5 52.5q-22 19 -48 19q-28 0 -57 -29v-249z" />
+<glyph unicode="&#x1d535;" horiz-adv-x="456" d="M406 401l-71 -60l-43 52l-41 -35v-100h70v-55h-70v-92q56 -45 69 -45q15 0 34 19l16 16l19 -18l-112 -101h-15l-113 77q-39 -42 -39 -78q0 -61 78 -88l-30 -82h-14q-18 9 -30.5 17.5t-29 23.5t-25 37t-8.5 49q0 42 20.5 76t77.5 79v110h-70v55h70v41q0 92 -42 92 q-16 0 -47 -20l-15 21l111 76h14q50 -23 72 -82l88 82h14z" />
+<glyph unicode="&#x1d536;" horiz-adv-x="516" d="M464 355v-272q0 -77 -49 -157t-124 -135l-14 15q44 51 64.5 96t20.5 124v258q0 26 -8 57t-24 45q-24 22 -29 22q-15 0 -88 -40v-252l55 -33q8 8 40 58l20 -16l-91 -143h-16q-86 58 -170 71v15q60 2 60 60v221q0 31 -31.5 72t-31.5 69q0 52 58 96l17 -15q-15 -19 -15 -43 q0 -17 14.5 -30t33 -21.5t36 -28t21.5 -47.5l134 67h23q39 -16 66.5 -49t27.5 -64z" />
+<glyph unicode="&#x1d537;" horiz-adv-x="457" d="M198 209l198 -110q11 -33 11 -68q0 -143 -220 -240h-21q-99 48 -123 160v18q136 98 196 178l-95 53v15q48 17 76.5 47.5t28.5 67.5q0 22 -14 37.5t-43 15.5q-7 0 -38 -14t-48 -24l-10 23q86 35 156 100h14q41 -12 61.5 -38t20.5 -59q0 -38 -34 -74t-116 -88zM294 106 l-29 26q-68 -98 -122 -145q8 -44 35 -82t58 -45q24 10 47.5 53t23.5 121q0 31 -13 72z" />
+<glyph unicode="&#x1d538;" horiz-adv-x="741" d="M691 0h-173l-77 209h-268l-78 -209h-45l241 662h168zM630 44l-202 574h-83l202 -574h83zM425 253l-115 332h-2l-119 -332h236z" />
+<glyph unicode="&#x1d539;" horiz-adv-x="676" d="M70 662h282q48 0 90 -8t81 -27t62 -55.5t23 -87.5q0 -45 -20 -81.5t-58 -55.5q46 -19 71 -61.5t25 -94.5q0 -191 -238 -191h-318v662zM491 597v-227q39 17 56 43t17 69q0 78 -73 115zM447 369v237q-31 12 -59 12h-152v-252h145q33 0 66 3zM491 318v-266q91 33 91 137 q0 46 -24 82.5t-67 46.5zM447 52v267q-33 3 -66 3h-145v-278h153q28 0 58 8zM192 44v574h-78v-574h78z" />
+<glyph unicode="&#x1d53b;" horiz-adv-x="722" d="M70 662h278q149 0 239 -90t90 -240q0 -147 -91 -239.5t-238 -92.5h-278v662zM553 541v-415q38 28 59 93.5t21 122.5q0 125 -80 199zM509 99v472q-31 20 -79.5 33.5t-86.5 13.5h-107v-574h106q41 0 92 15t75 40zM192 44v574h-78v-574h78z" />
+<glyph unicode="&#x1d53c;" horiz-adv-x="622" d="M567 0h-497v662h497v-44h-331v-255h299v-44h-299v-275h331v-44zM192 44v574h-78v-574h78z" />
+<glyph unicode="&#x1d53d;" horiz-adv-x="469" d="M567 618h-331v-270h265v-44h-265v-304h-166v662h497v-44zM192 44v574h-78v-574h78z" />
+<glyph unicode="&#x1d53e;" horiz-adv-x="706" d="M664 534l-32 -32q-54 65 -114 97.5t-139 32.5q-43 0 -91 -14t-75 -39v-488q56 -60 167 -60q75 0 109 25v229h-131v44h297v-239q-141 -103 -281 -103q-146 0 -237.5 99.5t-91.5 246.5q0 150 90.5 246.5t239.5 96.5q157 0 259 -108zM611 118v167h-78v-219q16 7 42.5 26.5 t35.5 25.5zM169 119v432q-38 -43 -59 -101.5t-21 -116.5q0 -116 80 -214z" />
+<glyph unicode="&#x1d540;" horiz-adv-x="322" d="M244 0h-166v662h166v-662zM200 44v574h-78v-574h78z" />
+<glyph unicode="&#x1d541;" horiz-adv-x="560" d="M495 662v-502q0 -50 -20.5 -85.5t-56.5 -54t-76 -26.5t-87 -8q-200 0 -215 178h44q13 -77 57.5 -105.5t126.5 -28.5q41 0 61 4v628h166zM451 151v467h-78v-582q78 33 78 115z" />
+<glyph unicode="&#x1d542;" horiz-adv-x="735" d="M729 0h-204l-230 331l-59 -51v-280h-166v662h166v-325l392 337l25 -36l-235 -201zM645 44l-259 363l-57 -49l220 -314h96zM192 44v574h-78v-574h78z" />
+<glyph unicode="&#x1d543;" horiz-adv-x="591" d="M571 0h-501v662h166v-618h335v-44zM192 44v574h-78v-574h78z" />
+<glyph unicode="&#x1d544;" horiz-adv-x="855" d="M785 0h-166v472h-2l-168 -472h-170l-163 469h-2v-469h-22h-22v662h155l202 -585h3l209 585h146v-662zM741 44v574h-78v-574h78zM393 44l-201 574h-80l19 -61l179 -513h83z" />
+<glyph unicode="&#x1d546;" horiz-adv-x="760" d="M715 332q0 -148 -93.5 -247t-240.5 -99q-146 0 -241 100t-95 246q0 154 93 249t247 95q149 0 239.5 -97t90.5 -247zM591 548v-429q80 80 80 213t-80 216zM547 79v505q-59 48 -166 48q-40 0 -90.5 -13t-77.5 -35v-505q30 -21 79.5 -35t88.5 -14q40 0 88 13.5t78 35.5z M169 119v429q-80 -83 -80 -216q0 -128 80 -213z" />
+<glyph unicode="&#x1d54a;" horiz-adv-x="636" d="M597 536l-30 -35q-56 67 -112 99t-136 32q-37 0 -71.5 -24t-34.5 -60t28 -65t70 -47.5t91 -42.5t91 -48t70 -65.5t28 -93.5q0 -66 -43 -113.5t-102 -67t-123 -19.5q-92 0 -158.5 35t-129.5 109l35 28q59 -67 113.5 -97.5t135.5 -30.5q47 0 85.5 27t38.5 72q0 36 -38 64.5 t-92.5 51.5t-109.5 50t-93 73t-38 107q0 100 69.5 150.5t173.5 50.5q90 0 153 -33.5t129 -106.5zM464 63l2 -1q36 20 58.5 52.5t22.5 71.5q0 49 -39 87t-94 63l-112 51q-55 25 -94 62t-39 85q0 36 20 74l-1 2q-32 -16 -52 -51t-20 -72q0 -49 27.5 -86.5t68.5 -59t90 -43.5 l89 -42q41 -18 68.5 -48t27.5 -69q0 -48 -23 -76z" />
+<glyph unicode="&#x1d54b;" horiz-adv-x="527" d="M622 618h-218v-618h-166v618h-218v44h602v-44zM360 44v574h-78v-574h78z" />
+<glyph unicode="&#x1d54c;" horiz-adv-x="698" d="M633 662v-461q0 -56 -25 -99t-67 -67.5t-91 -36.5t-102 -12q-70 0 -131.5 20t-106.5 69.5t-45 120.5v466h166v-612q43 -20 116 -20q42 0 82 8.5t77.5 27t60 52.5t22.5 79v465h44zM187 67v551h-78v-422q0 -31 11 -55t24 -37t43 -37z" />
+<glyph unicode="&#x1d54d;" horiz-adv-x="568" d="M653 662l-236 -662h-169l-236 662h173l211 -584h2l209 584h46zM361 44l-205 574h-83l206 -574h82z" />
+<glyph unicode="&#x1d54e;" horiz-adv-x="920" d="M949 662l-178 -662h-142l-147 528h-2l-142 -528h-144l-182 662h170l146 -523h2l141 523h144l145 -523h3l140 523h46zM741 44l-158 574h-81l159 -574h80zM310 44l-161 574h-80l159 -574h82z" />
+<glyph unicode="&#x1d54f;" horiz-adv-x="768" d="M733 0h-203l-194 260l-243 -260h-58l275 294l-275 368h203l185 -247l231 247h58l-263 -282zM649 44l-430 574h-97l430 -574h97z" />
+<glyph unicode="&#x1d550;" horiz-adv-x="563" d="M685 662l-245 -422v-240h-166v243l-262 419h193l222 -352h2l206 352h50zM396 44v234l-214 340h-91l227 -362v-212h78z" />
+<glyph unicode="&#x1d552;" horiz-adv-x="561" d="M506 0h-148v50q-54 -60 -147 -60q-65 0 -115.5 33t-50.5 94q0 47 23 77.5t58 42.5t75.5 20t75.5 12t58 16.5t23 34.5q0 30 -27 63t-56 33q-110 0 -166 -123l-42 11q35 85 91.5 120.5t150.5 35.5q197 0 197 -163v-297zM462 44v239q0 63 -24.5 97.5t-84.5 34.5v-2 q22 -14 33.5 -39.5t13.5 -45t2 -53.5v-231h60zM358 153v98q-21 -14 -48 -20.5t-60.5 -10.5t-51.5 -8v-178q4 0 10.5 -0.5t9.5 -0.5q54 0 97 34t43 86zM154 42v157q-30 -4 -47.5 -27t-17.5 -54q0 -27 19 -48.5t46 -27.5z" />
+<glyph unicode="&#x1d553;" horiz-adv-x="565" d="M198 401h2q46 59 133 59q90 0 140.5 -69t50.5 -163q0 -92 -50.5 -165t-138.5 -73q-92 0 -134 53h-3v-43h-148v683h148v-282zM420 383v-313q60 48 60 158q0 113 -60 155zM376 49v350q-17 17 -55 17q-46 0 -84.5 -35.5t-38.5 -81.5v-144q0 -47 35.5 -84t82.5 -37 q40 0 60 15zM154 44v595h-60v-595h60z" />
+<glyph unicode="&#x1d554;" horiz-adv-x="520" d="M435 158l40 -16q-58 -152 -201 -152q-105 0 -167 65.5t-62 171.5q0 104 62.5 168.5t166.5 64.5q57 0 108 -26.5t73 -75.5q6 -14 16 -44l-38 -18q-36 68 -66.5 94t-96.5 26q-42 0 -77 -22v-338q29 -22 68 -22q68 0 106.5 29t67.5 95zM149 75v300q-60 -45 -60 -148 q0 -106 60 -152z" />
+<glyph unicode="&#x1d555;" horiz-adv-x="574" d="M519 0h-148v48h-2q-46 -58 -135 -58q-88 0 -138.5 73t-50.5 165q0 94 50.5 163t140.5 69q91 0 135 -59v282h148v-683zM475 44v595h-60v-595h60zM371 155v144q0 46 -38.5 81.5t-84.5 35.5q-38 0 -55 -17v-350q20 -15 60 -15q47 0 82.5 37t35.5 84zM149 70v313 q-60 -42 -60 -155q0 -110 60 -158z" />
+<glyph unicode="&#x1d556;" horiz-adv-x="523" d="M478 199h-285v-148q30 -17 77 -17q57 0 93.5 18.5t67.5 65.5l36 -24q-58 -104 -193 -104q-105 0 -167 65.5t-62 171.5q0 104 62.5 168.5t166.5 64.5q81 0 142.5 -54t61.5 -133v-74zM434 243v33q0 32 -17 63t-43 46v-142h60zM330 243v154q-28 19 -59 19q-36 0 -78 -21 v-152h137zM149 71v309q-60 -52 -60 -153q0 -104 60 -156z" />
+<glyph unicode="&#x1d557;" horiz-adv-x="368" d="M431 636l-31 -31q-37 34 -100 34q-21 0 -44 -5v-184h85v-44h-85v-406h-148v406h-83v44h83v42q0 93 46.5 142t139.5 49q83 0 137 -47zM212 44v580q-60 -19 -60 -103v-477h60z" />
+<glyph unicode="&#x1d558;" horiz-adv-x="574" d="M519 450v-492q0 -51 -22.5 -87.5t-61 -54.5t-80 -26t-90.5 -8q-65 0 -125 24t-83 75l43 21q18 -39 74 -58t109 -19q38 0 88 12v211q-42 -58 -135 -58q-90 0 -140.5 69t-50.5 163q0 92 55 165t144 73q76 0 127 -55v45h148zM475 -43v449h-60v-556q36 26 48 45t12 62z M371 147v152q0 45 -36.5 81t-81.5 36q-41 0 -60 -9v-359q8 -14 62 -14q45 0 80.5 34t35.5 79zM149 66v313q-60 -48 -60 -157q0 -110 60 -156z" />
+<glyph unicode="&#x1d559;" horiz-adv-x="544" d="M489 0h-148v416q-4 1 -11 1q-59 0 -93 -52t-34 -114v-251h-148v683h148v-292h2q43 69 129 69q72 0 113.5 -44t41.5 -117v-299zM445 44v249q0 90 -60 116v-365h60zM159 44v595h-60v-595h60z" />
+<glyph unicode="&#x1d55a;" horiz-adv-x="258" d="M203 537h-148v146h148v-146zM159 581v58h-60v-58h60zM203 0h-148v450h148v-450zM159 44v362h-60v-362h60z" />
+<glyph unicode="&#x1d55b;" horiz-adv-x="305" d="M250 537h-143v146h143v-146zM206 581v58h-55v-58h55zM250 450v-491q0 -80 -50 -128t-131 -48q-45 0 -84 16l14 42q35 -13 59 -13q32 0 49 9v613h143zM206 -58v464h-55v-559q26 13 40.5 39t14.5 56z" />
+<glyph unicode="&#x1d55c;" horiz-adv-x="551" d="M539 0h-174l-134 213l-33 -26v-187h-148v683h148v-442l277 218l26 -35l-156 -122zM459 44l-148 231l-45 -35l124 -196h69zM154 44v595h-60v-595h60z" />
+<glyph unicode="&#x1d55d;" horiz-adv-x="258" d="M203 0h-148v629l104 54h44v-683zM159 44v591l-60 -31v-560h60z" />
+<glyph unicode="&#x1d55e;" horiz-adv-x="830" d="M775 0h-148v416q-4 1 -11 1q-59 0 -93 -52t-34 -114v-251h-148v416q-4 1 -11 1q-59 0 -93 -52t-34 -114v-251h-148v450h148v-59h2q43 69 129 69q50 0 88 -23.5t55 -68.5q30 48 61 70t82 22q73 0 114 -44t41 -117v-299zM731 44v249q0 92 -60 116v-365h60zM445 44v249 q0 92 -60 116v-365h60zM159 44v362h-60v-362h60z" />
+<glyph unicode="&#x1d55f;" horiz-adv-x="544" d="M489 0h-148v416q-4 1 -11 1q-59 0 -93 -52t-34 -114v-251h-148v450h148v-59h2q43 69 129 69q72 0 113.5 -44t41.5 -117v-299zM445 44v249q0 90 -60 116v-365h60zM159 44v362h-60v-362h60z" />
+<glyph unicode="&#x1d560;" horiz-adv-x="553" d="M508 221q0 -106 -63 -169.5t-169 -63.5q-107 0 -169 64.5t-62 172.5q0 106 62.5 169.5t168.5 63.5q107 0 169.5 -64.5t62.5 -172.5zM404 370v-294q60 50 60 145q0 97 -60 149zM360 49v348q-27 17 -84 17q-56 0 -83 -17v-348q27 -17 83 -17q57 0 84 17zM149 76v294 q-60 -49 -60 -145q0 -97 60 -149z" />
+<glyph unicode="&#x1d561;" horiz-adv-x="574" d="M203 400h3q47 60 134 60q88 0 138.5 -73t50.5 -165q0 -94 -50.5 -163t-140.5 -69q-87 0 -130 55h-5v-263h-148v668h148v-50zM425 380v-313q60 42 60 155q0 110 -60 158zM381 52v349q-20 15 -60 15q-47 0 -82.5 -37t-35.5 -84v-144q0 -46 38.5 -81.5t84.5 -35.5 q40 0 55 18zM159 -174v580h-60v-580h60z" />
+<glyph unicode="&#x1d562;" horiz-adv-x="574" d="M519 -218h-148v263h-5q-43 -55 -130 -55q-90 0 -140.5 69t-50.5 163q0 92 50.5 165t138.5 73q87 0 134 -60h3v50h148v-668zM475 -174v580h-60v-580h60zM371 151v144q0 47 -35.5 84t-82.5 37q-40 0 -60 -15v-349q15 -18 55 -18q46 0 84.5 35.5t38.5 81.5zM149 67v313 q-60 -48 -60 -158q0 -113 60 -155z" />
+<glyph unicode="&#x1d563;" horiz-adv-x="301" d="M407 462v-44q-67 -2 -100 -23q-45 -28 -74.5 -86t-29.5 -113v-196h-148v450h148v-100h2q62 114 202 112zM159 44v362h-60v-362h60z" />
+<glyph unicode="&#x1d564;" horiz-adv-x="519" d="M483 365l-29 -37q-54 49 -90.5 68.5t-96.5 19.5q-26 0 -43 -12.5t-17 -37.5q0 -24 27.5 -42t66.5 -32.5t78 -32.5t66.5 -49.5t27.5 -74.5q0 -49 -36.5 -83.5t-83 -48t-93.5 -13.5q-73 0 -119.5 20.5t-104.5 74.5l26 38q56 -48 96.5 -68.5t101.5 -20.5q30 0 55 14t25 42 q0 19 -27.5 35t-66 30.5t-77.5 33.5t-66.5 52.5t-27.5 78.5q0 72 56 106t133 34q70 0 116.5 -21.5t102.5 -73.5zM372 53l1 -1q26 11 41 35t15 53q0 17 -11 33t-24 26t-36 22t-34 17l-33 12q-4 1 -19 7l-21 8l-19 8q-14 6 -19 9l-15 11q-11 7 -16 14l-10 16q-5 9 -7 19.5 t-2 22.5t17 43l-1 1q-26 -9 -43 -33t-17 -52q0 -38 27.5 -65t66.5 -42l77 -29q39 -15 66.5 -38.5t27.5 -56.5q0 -21 -12 -40z" />
+<glyph unicode="&#x1d565;" horiz-adv-x="329" d="M297 406h-69v-367l65 25v-40q-59 -34 -114 -34q-34 0 -66.5 23t-32.5 55v338h-60v44h60v127l104 56h44v-183h69v-44zM184 34v550l-60 -31v-466q0 -20 12.5 -36.5t31.5 -16.5h16z" />
+<glyph unicode="&#x1d566;" horiz-adv-x="544" d="M489 0h-148v59h-2q-43 -69 -129 -69q-72 0 -113.5 44t-41.5 117v299h148v-416q4 -1 11 -1q59 0 93 52t34 114v251h148v-450zM445 44v362h-60v-362h60zM159 41v365h-60v-249q0 -90 60 -116z" />
+<glyph unicode="&#x1d567;" horiz-adv-x="443" d="M479 450l-161 -450h-135l-163 450h158l125 -354h3l126 354h47zM277 44l-130 362h-64l130 -362h64z" />
+<glyph unicode="&#x1d568;" horiz-adv-x="676" d="M695 450l-128 -450h-141l-73 306h-3l-81 -306h-143l-106 450h154l76 -339h3l91 339h129l76 -340h4l98 340h44zM521 44l-84 362h-61l84 -362h61zM222 44l-84 362h-62l85 -362h61z" />
+<glyph unicode="&#x1d569;" horiz-adv-x="560" d="M530 0h-182l-111 157l-147 -157h-60l181 194l-181 256h182l103 -146l136 146h59l-170 -182zM445 44l-254 362h-75l254 -362h75z" />
+<glyph unicode="&#x1d56a;" horiz-adv-x="468" d="M510 450l-198 -543q-47 -125 -136 -125q-18 0 -31.5 1.5t-28 6.5t-21 8t-25 13t-26.5 14l23 37l23 -12q13 -8 19.5 -11t17 -6.5t22 -5t27.5 -1.5q18 0 34 8.5t26 18.5t20 30.5t14.5 32t12.5 36.5l10 30l-273 468h169l168 -291l105 291h48zM338 106l-174 300h-68l216 -371 z" />
+<glyph unicode="&#x1d56b;" horiz-adv-x="519" d="M476 0h-433v44l251 362h-212v44h394v-44l-252 -362h252v-44zM420 406h-73l-247 -362h70z" />
+<glyph unicode="&#x1d56c;" horiz-adv-x="856" d="M805 80l-156 -94h-27q-62 37 -78 115l-262 -126q-35 46 -94 86.5t-99 46.5v25q51 21 89.5 46t72.5 62.5t52 90t18 117.5q0 125 -25 178q-19 39 -53 39q-51 0 -51 -51q0 -41 37 -101t37 -109q0 -63 -51.5 -108.5t-138.5 -58.5l-8 24q22 8 39 29.5t17 51.5q0 52 -37 106.5 t-37 99.5q0 67 57.5 108.5t142.5 41.5q55 0 109 -18.5t89 -57.5q45 -51 45 -133q0 -39 -15.5 -76t-35 -63t-55 -55.5t-58.5 -45.5t-61 -40q34 -18 77 -57t66 -69l129 61v266q0 166 -7 196l264 94l8 -25q-36 -11 -58 -27t-31.5 -43t-11.5 -50t-2 -67v-367q0 -43 23 -43 q27 0 67 24z" />
+<glyph unicode="&#x1d56d;" horiz-adv-x="849" d="M664 411v-2q62 -29 96 -79.5t34 -106.5q0 -108 -97.5 -175t-236.5 -67q-49 0 -86.5 9.5t-59.5 22.5t-41 26.5t-42.5 23t-52.5 9.5q-77 0 -107 -42l-21 14q27 69 77.5 116t116.5 47q12 7 18.5 11.5t20 22t21.5 40.5t14.5 65.5t6.5 97.5q0 78 -18 150t-58 72 q-20 0 -34 -15.5t-14 -44.5q0 -43 37 -100.5t37 -99.5q0 -65 -47.5 -108.5t-142.5 -58.5l-8 24q56 25 56 93q0 34 -11.5 60t-25.5 40.5t-25.5 38.5t-11.5 55q0 71 56.5 110t143.5 39q118 0 182 -73l100 75q109 0 168.5 -44.5t59.5 -111.5q0 -94 -105 -134zM604 533 q0 41 -22.5 69.5t-53.5 28.5q-29 0 -63 -36q9 -25 17 -66t8 -61q0 -37 -8 -87q61 10 91.5 55t30.5 97zM298 196v-1q40 -14 75.5 -44.5t55.5 -58.5t44 -50t46 -22q37 0 59 21q44 41 44 128q0 70 -34.5 122.5t-99.5 52.5q-6 0 -18 -2q-24 -48 -62 -79t-110 -67z" />
+<glyph unicode="&#x1d56e;" horiz-adv-x="773" d="M710 701l21 -14q-68 -139 -155 -139q-33 0 -66.5 9.5t-51.5 23.5q-12 -20 -12 -52q0 -26 16 -47t38 -36l44 -30q23 -16 39 -38t16 -50q0 -55 -51 -96.5t-118 -41.5q-40 0 -77 22l12 23q14 -10 33 -10q23 0 34.5 17.5t11.5 40.5t-9.5 40.5t-23.5 30.5l-28 26 q-14 13 -23.5 35.5t-9.5 53.5q0 44 55.5 109.5t121.5 120.5q46 -37 83 -37q61 0 100 39zM678 222l22 -12q-16 -43 -40 -81.5t-58.5 -73t-82 -54.5t-102.5 -20q-165 0 -264 109t-99 275q0 68 34 146t94 127q28 23 69.5 38.5t82.5 15.5q53 0 83 -22l-12 -23q-22 8 -38 8 q-43 0 -75 -41t-46.5 -96.5t-14.5 -113.5q0 -120 58 -199t166 -79q139 0 223 96z" />
+<glyph unicode="&#x1d56f;" horiz-adv-x="891" d="M251 318v-26q-33 -10 -61 -10q-59 0 -97.5 42.5t-38.5 104.5q0 106 90.5 189t232.5 83q81 0 162.5 -30t147.5 -82.5t107.5 -131t41.5 -166.5q0 -132 -83 -214q-98 -96 -271 -96q-49 0 -86 9.5t-59 22.5t-41 26.5t-42.5 23t-52.5 9.5q-76 0 -108 -45l-22 13 q28 72 79.5 119.5t120.5 47.5q19 0 38 -4.5t31.5 -9.5t30.5 -16.5t26 -17.5l27 -21l23 -19q98 -77 160 -77q57 0 95.5 45.5t38.5 127.5q0 109 -90 203t-209 109q-18 -15 -18 -31q0 -20 20.5 -38.5t45 -32.5t45 -38t20.5 -54q0 -46 -45.5 -77.5t-114.5 -31.5q-47 0 -87 22 l12 23q15 -10 34 -10q21 0 33.5 13.5t12.5 32.5q0 18 -28.5 59t-28.5 71q0 51 56 101q-105 0 -157 -30q-70 -41 -70 -112q0 -25 17.5 -51t49.5 -26q8 0 12 1z" />
+<glyph unicode="&#x1d570;" horiz-adv-x="788" d="M710 701l21 -14q-68 -139 -155 -139q-78 0 -118 31q-12 -20 -12 -50q0 -24 16 -46.5t30.5 -34t42.5 -29.5q37 49 59 68.5t50 19.5q46 0 71 -43v-122h-26q-14 34 -35.5 52t-42.5 18q-28 0 -50 -14q38 -33 38 -70q0 -55 -51 -96.5t-118 -41.5q-40 0 -77 22l12 23 q19 -10 33 -10q21 0 33.5 18t12.5 40q0 23 -9.5 40.5t-23.5 30.5l-28 26q-14 13 -23.5 35.5t-9.5 53.5q0 44 55 109t122 120q45 -36 83 -36q61 0 100 39zM678 222l22 -12q-16 -43 -40 -81.5t-58.5 -73t-82 -54.5t-102.5 -20q-165 0 -264 109t-99 275q0 68 34 146t94 127 q28 23 69.5 38.5t82.5 15.5q53 0 83 -22l-12 -23q-22 8 -38 8q-43 0 -75 -41t-46.5 -96.5t-14.5 -113.5q0 -120 58 -199t166 -79q139 0 223 96z" />
+<glyph unicode="&#x1d571;" horiz-adv-x="803" d="M723 676l25 -7q-49 -196 -189 -196h-10q-39 -48 -39 -121q0 -15 6.5 -35t16.5 -28q23 44 56 76t60 32q17 0 29 -5.5t18.5 -12t16.5 -19.5v-128h-26q-27 69 -74 69q-26 0 -55 -41q120 -78 120 -201q0 -103 -80.5 -183.5t-208.5 -80.5q-115 0 -192 50.5t-77 141.5 q0 35 23.5 91t23.5 69q0 38 -39 38q-30 0 -51 -21l-23 11q20 42 61.5 76t93.5 34q61 0 91.5 -30.5t30.5 -72.5q0 -32 -28.5 -90.5t-28.5 -107.5q0 -66 37 -111t81 -45q54 0 88 44.5t34 129.5q0 42 -14 78.5t-26.5 53.5t-38.5 46q-60 66 -60 120q0 20 6 39t24 41l27 32 q8 10 38 37.5t35 32.5q-35 12 -74.5 34.5t-72.5 36t-74 13.5q-31 0 -63 -26t-32 -65q0 -66 76 -85l-5 -26q-7 -1 -22 -1q-76 0 -121.5 39.5t-45.5 102.5q0 86 65 141t171 55q56 0 112 -23.5t102.5 -46.5t80.5 -23q82 0 121 68z" />
+<glyph unicode="&#x1d572;" horiz-adv-x="833" d="M635 443l1 -2q67 -7 106 -51t39 -108q0 -108 -102 -206q-98 -95 -272 -95q-161 0 -257 100t-96 252q0 71 16 133.5t48 114t86 81.5t124 30q29 0 63 -12l-6 -26q-18 2 -22 2q-44 0 -75 -46.5t-44 -114t-13 -147.5q0 -334 189 -334q85 0 139.5 72.5t54.5 174.5 q0 63 -16.5 106t-47.5 43q-26 0 -48 -24q27 -31 44 -69.5t17 -67.5q0 -57 -41.5 -97.5t-114.5 -40.5q-41 0 -80 22l12 23q20 -10 34 -10q35 0 35 58q0 37 -24 79t-47.5 88t-23.5 92q0 113 195 237l17 -19q-43 -45 -62 -79t-19 -75q0 -66 34 -110q88 45 88 83q0 14 -6 39.5 t-6 41.5q0 34 33 63t110 57l17 -19q-22 -22 -22 -54q0 -22 12.5 -50.5t12.5 -43.5q0 -56 -82 -91z" />
+<glyph unicode="&#x1d573;" horiz-adv-x="843" d="M619 701l21 -15q-15 -70 -79 -124.5t-135 -54.5q-79 0 -129 71q-19 -23 -19 -56q0 -52 72 -144q86 51 173 118q128 -30 200 -100t72 -170q0 -33 -10 -67t-23 -61t-40 -60t-46 -53.5t-56 -52.5l-56 -48l-60.5 -46.5t-54.5 -42.5h-26q-55 46 -97 46q-79 0 -129 -46l-21 17 q92 160 202 160q44 0 78 -24.5t44 -54.5q123 91 123 291q0 87 -39.5 149t-105.5 62q-35 0 -104 -48q46 -40 60.5 -65.5t14.5 -51.5q0 -16 -11 -34.5t-24 -33t-48 -50.5l-127 -137q-87 52 -125 70q-36 -35 -50 -53l-22 14l124 196q2 -2 18 -12l32 -22l35 -24 q18 -12 31.5 -19.5t17.5 -7.5q12 0 12 45q0 25 -29 58.5t-63.5 63.5t-63 71.5t-28.5 79.5q0 27 17 56t50 59.5t61 52.5l70 53l58 43q37 -36 59 -48.5t46 -12.5q71 0 130 63z" />
+<glyph unicode="&#x1d574;" horiz-adv-x="790" d="M710 694l25 -8l-11 -44q-5 -16 -19.5 -45.5t-31.5 -47t-47 -31.5t-68 -14q-62 0 -129 31t-117 31q-48 0 -78.5 -25.5t-30.5 -67.5q0 -35 24 -59t61 -24q27 0 50 10l12 -22q-34 -27 -91 -27q-69 0 -121.5 43t-52.5 110q0 81 61 139t161 58q54 0 97 -11t66 -24t55.5 -24 t66.5 -11q38 0 71 15t47 48zM721 388l-23 -12q-19 35 -51 35q-22 0 -36 -14t-14 -41q0 -32 23 -63l46 -65q23 -34 23 -74q0 -82 -70 -130.5t-176 -48.5q-59 0 -101.5 14t-65 33.5t-39 39t-35.5 33.5t-43 14q-37 0 -85 -42l-20 14q8 24 20 47.5t32 52t50.5 46t65.5 17.5 q31 0 55 -9.5t38 -20.5t27 -34.5t18 -36.5l13 -41q30 -94 78 -94q33 0 53.5 27.5t20.5 64.5q0 53 -43.5 119.5t-43.5 115.5q0 58 49.5 94t111.5 36q43 0 76.5 -20t45.5 -57z" />
+<glyph unicode="&#x1d575;" horiz-adv-x="803" d="M725 680l23 -12l-14 -34q-5 -11 -18 -34.5t-26.5 -36.5t-33.5 -28.5t-46.5 -22.5t-58.5 -7q-63 0 -130 30.5t-110 30.5q-42 0 -73.5 -24.5t-31.5 -64.5q0 -36 23 -60.5t64 -24.5q22 0 41 8l12 -23q-29 -24 -87 -24q-72 0 -121.5 42.5t-49.5 110.5q0 81 61 138t161 57 q81 0 172.5 -30.5t125.5 -30.5q75 0 117 40zM715 391l-23 -12q-21 37 -55 37q-22 0 -40 -19.5t-18 -50.5q0 -34 17 -67.5t37 -59.5t37 -73t17 -104q0 -98 -84.5 -172.5t-199.5 -74.5q-113 0 -172 31q-88 45 -88 136q0 13 7.5 43t7.5 42q0 10 -9 20.5t-23 10.5q-28 0 -47 -31 l-25 8q15 50 57 88t96 38q55 0 85 -32.5t30 -72.5q0 -20 -10.5 -59t-10.5 -53q0 -58 23.5 -97t80.5 -39q50 0 84 48t34 115q0 45 -16 88t-35 72.5t-35 72.5t-16 87q0 66 51 112.5t118 46.5q100 0 125 -79z" />
+<glyph unicode="&#x1d576;" horiz-adv-x="864" d="M794 121l20 -20q-20 -28 -66.5 -64.5t-91.5 -50.5h-24q-54 28 -77 71.5t-30 122.5q-5 58 -19.5 90t-33.5 34l-44 -14q21 -30 21 -60q0 -16 -11 -34.5t-24 -33t-48 -50.5l-127 -137q-87 52 -125 70q-22 -19 -50 -53l-22 14l124 196q2 -2 18 -12l32 -22l35 -24 q18 -12 31.5 -19.5t17.5 -7.5q12 0 12 45q0 22 -19 45.5t-46 47.5t-54 51.5t-46 66.5t-19 83q0 63 51.5 121t127.5 91t151 33q221 0 313 -155l-21 -14q-62 73 -123 95t-145 22q-81 0 -142.5 -48t-61.5 -125q23 57 75 85.5t107 28.5q98 0 143 -39q19 -16 34 -42.5t22.5 -46.5 t24.5 -36t43 -18l3 -20l-134 -46q38 -26 58.5 -56.5t26.5 -80.5q15 -131 44 -131q27 0 69 47zM615 389v2q-39 2 -65 13.5t-37 28t-19.5 35t-13.5 34t-18.5 26t-34.5 10.5q-41 0 -79.5 -33t-38.5 -80q18 -26 53 -63t40 -43z" />
+<glyph unicode="&#x1d577;" horiz-adv-x="699" d="M621 171l24 -8q-15 -75 -59.5 -131.5t-117.5 -56.5q-86 0 -160 48q-30 19 -68.5 34.5t-59.5 15.5q-80 0 -104 -77l-25 6q5 28 15 55t28 59t50.5 56.5t74.5 35.5q19 23 19 67q0 29 -14.5 53.5t-35.5 43.5l-42 40q-21 20 -35.5 49.5t-14.5 65.5q0 52 43.5 93t105.5 61 t125 20q60 0 116 -14.5t98.5 -51t42.5 -88.5q0 -45 -27.5 -96.5t-27.5 -91.5q0 -41 20.5 -68t49.5 -37l-4 -25q-88 0 -148 43t-60 97q0 51 27.5 106.5t27.5 95.5q0 44 -31.5 70.5t-74.5 26.5q-45 0 -81.5 -28t-36.5 -78q0 -9 3 -19t6 -17t12 -18l12 -16q4 -5 16 -19t15 -17 q55 -65 55 -113q0 -34 -33.5 -72.5t-75.5 -67.5q50 -4 95 -29l84 -49q37 -23 71 -23q67 0 100 69z" />
+<glyph unicode="&#x1d578;" horiz-adv-x="1133" d="M1061 120l20 -17q-20 -29 -60.5 -65.5t-76.5 -51.5h-24q-55 20 -84 72t-29 125q0 83 41 149.5t124 146.5v2q-43 0 -71 17.5t-41 42.5t-23 50t-24.5 42.5t-37.5 17.5q-36 0 -64 -38q24 -48 33 -90.5t9 -108.5q0 -84 -74 -218q-69 -125 -151 -221l-56 33q-36 22 -51 30 q-29 -29 -51 -55l-22 14l113 198q8 -5 33 -23l46 -33q21 -14 27 -14q15 0 22.5 97t7.5 217q0 72 -26 142t-67 70q-35 0 -64 -40q24 -48 33 -90.5t9 -108.5q0 -24 -5.5 -48.5t-17.5 -51.5l-19 -43q-7 -15 -23.5 -43.5t-18.5 -31.5q-66 -120 -151 -219q-25 14 -68 36l-49 25 q-33 -33 -50 -53l-22 14l112 196q118 -72 126 -72q21 0 21 316q0 82 -18.5 155.5t-58.5 73.5q-48 0 -48 -54q0 -44 37 -102.5t37 -97.5q0 -65 -47.5 -108.5t-142.5 -58.5l-8 24q21 8 38.5 31.5t17.5 53.5q0 35 -18 64l-38 58q-18 31 -18 70q0 85 89 130q47 23 111 23 q104 0 159 -57q78 59 138 59q54 0 86 -12.5t53 -42.5q63 55 148 55q50 0 90 -23q26 -15 41 -43t20.5 -51.5t24 -42t52.5 -19.5v-20q-55 -29 -76.5 -92.5t-21.5 -183.5q0 -151 28 -151q14 0 29 9t20.5 14.5t19.5 21.5z" />
+<glyph unicode="&#x1d579;" horiz-adv-x="862" d="M790 118l20 -17q-20 -28 -60.5 -64t-76.5 -51h-24q-52 13 -82.5 67.5t-30.5 127.5q0 83 41 149.5t124 146.5v2q-43 0 -71 17.5t-41 42.5t-23 50t-24.5 42.5t-37.5 17.5q-34 0 -64 -41q24 -48 33 -89.5t9 -106.5q0 -24 -5.5 -48.5t-17.5 -51.5l-19 -43q-7 -15 -23.5 -43.5 t-18.5 -31.5q-66 -120 -151 -219q-25 14 -68 36l-49 25q-33 -33 -50 -53l-22 14l112 196q118 -72 126 -72q21 0 21 316q0 36 -3.5 72t-11 73t-23 60.5t-36.5 23.5q-20 0 -35.5 -14.5t-15.5 -39.5q0 -44 37 -102.5t37 -97.5q0 -65 -47.5 -108.5t-142.5 -58.5l-8 24 q22 8 39 29.5t17 51.5q0 36 -18 66l-38 60q-18 30 -18 70q0 56 42 98q55 55 158 55q104 0 159 -57q68 59 154 59q50 0 90 -23q26 -15 41 -43t20.5 -52.5t24 -43t52.5 -19.5v-20q-55 -29 -76.5 -92.5t-21.5 -183.5q0 -151 28 -151q14 0 29 9t20.5 14.5t19.5 21.5z" />
+<glyph unicode="&#x1d57a;" horiz-adv-x="909" d="M54 274l18 19q25 -26 53 -26q21 0 35 15.5t14 42.5q0 15 -7 28.5t-13 20.5t-20 20q-17 15 -26.5 26.5t-18.5 33.5t-9 49q0 29 22 63t60.5 64.5t100.5 50.5t132 20q81 0 162.5 -30t147.5 -82.5t107.5 -131t41.5 -166.5q0 -132 -83 -214q-98 -96 -271 -96q-59 0 -103 13 t-64 29t-49.5 29t-64.5 13q-65 0 -105 -56l-22 14q30 75 79.5 126t117.5 51q37 0 71.5 -13.5t53.5 -27t51 -40.5q92 -77 160 -77q57 0 95.5 45.5t38.5 127.5q0 50 -19 110t-51.5 114.5t-83.5 90.5t-108 36q-15 0 -50 -10t-57 -10q-60 0 -93 16.5t-67 60.5q-18 0 -36.5 -18.5 t-18.5 -45.5q0 -26 24.5 -49t53.5 -39t53.5 -45.5t24.5 -65.5q0 -57 -52 -93t-119 -36q-63 0 -106 43z" />
+<glyph unicode="&#x1d57b;" horiz-adv-x="850" d="M791 519v-20q-67 -35 -67 -79q0 -25 35.5 -88t35.5 -108q0 -116 -83 -179.5t-221 -63.5h-13v-186h-162v234q-4 2 -13 8l-13 9q-4 2 -13 6l-14 8q-5 2 -13.5 5t-15.5 4.5t-16 2.5t-19 1q-77 0 -107 -42l-21 14q27 69 77.5 116t116.5 47q27 0 51 -6v235q0 45 -5.5 92.5 t-23.5 92t-46 44.5q-49 0 -49 -54q0 -43 37 -101t37 -99q0 -65 -47.5 -108.5t-142.5 -58.5l-8 24q22 8 39 29.5t17 51.5q0 47 -37 98.5t-37 97.5q0 73 56.5 113t143.5 40q105 0 159 -55q69 57 143 57q50 0 83 -13.5t46 -33.5t23.5 -43.5t16.5 -43.5t23.5 -34t46.5 -14z M701 484v2q-42 0 -70.5 17t-41.5 41t-23 48.5t-24.5 41.5t-37.5 17q-36 0 -64 -38q38 -66 38 -161v-370q36 -62 82 -62q41 0 60 32.5t19 78.5q0 33 -30 103t-30 107q0 98 122 143z" />
+<glyph unicode="&#x1d57c;" horiz-adv-x="930" d="M882 45l20 -16q-45 -88 -131 -88q-40 0 -63.5 17t-43.5 51q-74 -28 -164 -28q-59 0 -103 13t-64 29t-49.5 29t-64.5 13q-65 0 -105 -56l-22 13q30 75 79.5 126.5t117.5 51.5q16 0 30.5 -2t29 -7.5t23 -9t23.5 -14.5t19.5 -14t21 -17.5t19.5 -16.5q92 -77 160 -77 q15 0 32 3q-6 14 -13 35l-13 36q-5 13 -12 26.5t-15 20t-18 6.5q-20 0 -37 -23l-20 16q53 81 114 81q51 0 78 -30.5t47 -83.5q21 39 21 86q0 50 -22 110.5t-58.5 114t-90.5 90t-111 36.5q-15 0 -50 -10t-57 -10q-60 0 -93 16.5t-67 60.5q-18 0 -36.5 -18.5t-18.5 -45.5 q0 -26 24.5 -49t53.5 -39t53.5 -45.5t24.5 -65.5q0 -63 -50.5 -96t-120.5 -33q-63 0 -106 43l18 19q25 -26 53 -26q23 0 36 15.5t13 41.5q0 15 -7 29t-13 21t-20 20q-17 15 -26.5 26.5t-18.5 33.5t-9 49q0 29 22 63t60.5 64.5t100.5 50.5t132 20q81 0 162.5 -30t147.5 -82.5 t107.5 -131t41.5 -166.5q0 -128 -80 -211q12 -33 24.5 -49t32.5 -16q25 0 51 30z" />
+<glyph unicode="&#x1d57d;" horiz-adv-x="884" d="M821 117l20 -17q-20 -29 -65.5 -64.5t-90.5 -49.5h-24q-60 27 -79 66t-26 123q-13 153 -44 153l-52 -13q-50 -113 -88 -172.5t-125 -167.5q-25 14 -68 36l-49 25q-1 -1 -9 -8l-19 -18q-11 -10 -23 -25l-21 12l112 196q118 -72 126 -72q21 0 21 316q0 82 -18.5 155.5 t-58.5 73.5q-20 0 -34 -13.5t-14 -40.5q0 -42 37 -99t37 -101q0 -65 -47.5 -108.5t-142.5 -58.5l-8 24q22 8 39 29.5t17 51.5q0 34 -11.5 60.5t-25.5 41t-25.5 39t-11.5 55.5q0 61 51 107q52 46 149 46q118 0 181 -73l102 75q110 0 172.5 -44.5t62.5 -111.5 q0 -52 -31.5 -104t-101.5 -77v-2q64 -42 77 -162q15 -126 42 -126q29 0 67 43zM596 510q0 51 -20 86t-56 35q-30 0 -67 -39q29 -60 29 -136q0 -71 -8 -100q59 8 90.5 51.5t31.5 102.5z" />
+<glyph unicode="&#x1d57e;" horiz-adv-x="852" d="M458 482l-14 -22q-26 17 -54 17q-33 0 -56 -15.5t-23 -51.5q0 -29 17.5 -48.5t51.5 -19.5q25 0 53 19t51 41.5t64.5 41.5t89.5 19q70 0 117 -43t47 -128q0 -121 -101.5 -216t-250.5 -95q-192 0 -294 110t-102 281q0 79 41 153.5t119 124t172 49.5q64 0 139 -22t102 -22 q80 0 118 46l22 -14q-23 -77 -62.5 -122t-107.5 -45q-57 0 -145 33t-133 33q-99 0 -165.5 -58t-66.5 -154q0 -58 22.5 -100.5t56 -66.5t84 -38t96.5 -18.5t102 -4.5q45 0 92.5 7t100 24t85.5 52.5t33 84.5q0 39 -18.5 56.5t-61.5 17.5q-27 0 -51.5 -19t-47 -46.5t-48.5 -55 t-66.5 -46.5t-89.5 -19q-86 0 -135.5 48.5t-49.5 117.5q0 61 47.5 108.5t119.5 47.5q57 0 100 -42z" />
+<glyph unicode="&#x1d57f;" horiz-adv-x="793" d="M707 680l26 -7q-50 -202 -190 -202q-20 0 -50.5 9.5t-49.5 20.5q-10 -16 -10 -31q0 -20 18 -36t39.5 -25t39.5 -29t18 -47q0 -52 -40 -78.5t-112 -26.5q-44 0 -84 22l12 23q15 -10 34 -10q20 0 29.5 12.5t9.5 28.5q0 18 -22 56t-22 61q0 39 53 98q-68 46 -132 46 q-32 0 -64 -27.5t-32 -74.5t26.5 -75.5t69.5 -30.5l-3 -26q-97 0 -157 45t-60 118q0 89 66 148t171 59q57 0 112 -22.5t100.5 -45t79.5 -22.5q19 0 30 1.5t30 7t35 21t29 39.5zM715 171l25 -8q-14 -78 -64.5 -133t-132.5 -55q-65 0 -159.5 45.5t-148.5 45.5q-87 0 -130 -70 l-23 13q15 83 75 137.5t137 54.5q54 0 103 -15.5t78 -34t61.5 -34t59.5 -15.5q10 0 23.5 2.5t32 9t36 21.5t27.5 36z" />
+<glyph unicode="&#x1d580;" horiz-adv-x="860" d="M809 80l-156 -94h-27q-62 37 -78 115l-282 -126q-34 40 -102 84.5t-110 58.5v15l36 17q11 6 34 23.5t33.5 36t20 51.5t9.5 75v216q0 55 -35 55q-27 0 -78 -29l-13 22l167 101h25q96 -33 96 -145v-125q0 -70 -31 -116.5t-107 -103.5q94 -29 185 -131l148 65v266 q0 166 -7 196l264 94l8 -25q-36 -12 -58 -28t-31.5 -42.5t-11.5 -49.5t-2 -67v-367q0 -43 23 -43q27 0 67 24z" />
+<glyph unicode="&#x1d581;" horiz-adv-x="855" d="M800 524v-20q-37 -20 -52 -38.5t-15 -41.5q0 -24 30.5 -87t30.5 -113q0 -114 -96 -178.5t-238 -64.5q-60 0 -104 14.5t-64 31.5t-49.5 31.5t-64.5 14.5q-24 0 -38 -1.5t-35 -11.5t-34 -29l-21 14q27 69 77.5 116t116.5 47q12 7 18.5 11.5t20 22t21.5 40.5t14.5 65.5 t6.5 97.5q0 33 -3.5 68t-11.5 71t-23.5 59t-37.5 23q-20 0 -34 -15t-14 -44q0 -41 37 -98t37 -102q0 -65 -47.5 -108.5t-142.5 -58.5l-8 24q21 8 38.5 30.5t17.5 52.5q0 32 -11.5 58t-25.5 40.5t-25.5 39.5t-11.5 56q0 73 57 115.5t143 42.5q105 0 159 -55q69 57 143 57 q50 0 83 -12.5t46 -31t23 -41t16 -42t24 -34t47 -16.5zM711 484v2q-42 0 -70 17t-41.5 41t-23.5 48.5t-25 41.5t-38 17q-36 0 -64 -38q41 -69 41 -144q0 -166 -192 -271v-2q40 -14 75 -44.5t55 -59t44 -50.5t46 -22q50 0 85 33t35 78q0 46 -25 108.5t-25 104.5q0 94 123 140 z" />
+<glyph unicode="&#x1d582;" horiz-adv-x="1121" d="M1065 524l1 -20q-67 -36 -67 -80q0 -24 30.5 -87.5t30.5 -113.5q0 -66 -28.5 -111.5t-82.5 -83.5q-64 -47 -145 -47q-113 0 -168 34q-51 -34 -175 -34q-60 0 -104 14.5t-64.5 31.5t-50 31.5t-64.5 14.5q-65 0 -107 -42l-21 14q27 69 77.5 116t116.5 47q12 7 18.5 11.5 t20 22t21.5 40.5t14.5 65.5t6.5 97.5q0 33 -3.5 68t-11.5 71t-23.5 59t-37.5 23q-18 0 -33 -14.5t-15 -39.5q0 -43 37 -99t37 -101q0 -65 -47.5 -108.5t-142.5 -58.5l-8 24q22 8 39 29.5t17 51.5q0 34 -11.5 60.5t-25.5 41t-25.5 39t-11.5 55.5q0 71 57 112t143 41 q105 0 159 -55q67 57 151 57q38 0 80 -13t62 -29q49 42 115 42q51 0 84.5 -12.5t46.5 -31t23 -41t15.5 -42t23 -33.5t46.5 -17zM977 484v2q-42 0 -70.5 17t-41.5 41t-23 48.5t-25 41.5t-38 17q-42 0 -70.5 -50t-28.5 -100q0 -23 7 -44t15 -33l21 -31q25 -33 43.5 -76.5 t18.5 -80.5q0 -43 -11 -69t-36 -57q19 -43 47.5 -66.5t54.5 -23.5q27 0 45.5 29t18.5 75q0 41 -25 102t-25 116q0 95 123 142zM298 198v-2q40 -14 78.5 -44t62.5 -57.5t51 -49t49 -21.5q38 0 64 54t26 114q0 57 -30 96q-50 66 -50 131q0 74 87 180q-14 25 -42.5 38.5 t-59.5 13.5q-55 0 -85 -38q41 -69 41 -144q0 -166 -192 -271z" />
+<glyph unicode="&#x1d583;" horiz-adv-x="819" d="M775 680l-121 -198q-20 16 -71 48.5t-61 32.5q-6 0 -11.5 -17t-9.5 -53t-4 -81q74 0 101.5 4t46.5 24l23 -13q-24 -64 -62.5 -99t-108.5 -39v-43q0 -64 37.5 -104.5t84.5 -40.5q59 0 106 40l16 -21l-187 -134h-25q-101 37 -159 121q-34 -43 -123 -132l-63 35 q-47 27 -62 34q-2 -2 -9 -8.5t-17 -17.5l-24 -27l-22 14l124 196l41 -27l62 -41q27 -17 32 -17q11 0 18.5 49t7.5 122h-19q-39 0 -57 -1t-39 -9t-31 -24l-23 13q27 68 64 103t105 41v27q0 50 -22.5 94.5t-54.5 44.5q-27 0 -63 -13t-63 -35l-16 20l180 144h25 q75 -23 141 -121q31 48 124 130q105 -56 117 -60q13 10 50 53z" />
+<glyph unicode="&#x1d584;" horiz-adv-x="837" d="M434 641h2q21 23 57.5 41.5t79.5 18.5q53 0 94 -25.5t65.5 -69.5t37 -98t12.5 -116q0 -94 -23.5 -177.5t-72 -158.5t-97 -131t-123.5 -130h-25q-39 27 -57.5 36.5t-39.5 9.5q-80 0 -130 -46l-21 14q76 163 203 163q39 0 67.5 -24t38.5 -55q36 54 69.5 191t33.5 328 q0 106 -18.5 171.5t-56.5 65.5q-45 0 -70 -44q26 -66 26 -138q0 -25 -2.5 -46t-9.5 -40l-14 -33q-5 -13 -20 -29l-24 -25q-8 -9 -30 -26l-34 -24l-40 -26l-43 -28v-1q29 -7 70.5 -32t63.5 -46l83 35l12 -23l-209 -137q-36 42 -94.5 73t-105.5 36v25q113 51 172.5 125 t59.5 204q0 124 -25 178q-19 39 -54 39q-21 0 -35.5 -13t-14.5 -42q0 -44 37 -103.5t37 -95.5q0 -63 -51.5 -108.5t-138.5 -58.5l-8 24q22 8 39 29.5t17 51.5q0 34 -11.5 60t-25.5 40.5t-25.5 39t-11.5 55.5q0 73 57 113.5t143 40.5q118 0 184 -58z" />
+<glyph unicode="&#x1d585;" horiz-adv-x="755" d="M516 280v-2q89 -19 138 -77t49 -146q0 -104 -79 -177t-208 -73q-54 0 -93.5 14t-59.5 33.5t-36 39t-34.5 33.5t-43.5 14q-36 0 -84 -42l-21 14q4 17 17 41.5t34 53.5t54.5 48.5t70.5 19.5q109 0 130 -119q8 -49 31 -83t58 -34q92 0 92 203q0 88 -42.5 144t-98.5 56 q-50 0 -83 -14t-70 -60l-21 14q23 37 48 60.5t66 37.5v2q-67 26 -97 87l22 15q51 -65 138 -65q52 0 86.5 42.5t34.5 119.5t-36 119t-96 42q-125 0 -212 -139l-24 10q31 80 102.5 134.5t179.5 54.5q118 0 186 -60q65 -59 65 -157q0 -67 -42.5 -121.5t-120.5 -82.5z" />
+<glyph unicode="&#x1d586;" horiz-adv-x="600" d="M545 71l-126 -91h-24q-45 24 -64 61l-140 -65h-24q-50 30 -81 83t-31 111q0 53 22.5 100.5t65.5 77.5l81 55q55 36 104 72h24q45 -39 77.5 -60t77.5 -35v-25q-18 0 -30.5 -13t-12.5 -32v-188q0 -45 30 -45q15 0 37 16zM325 79v236l-75 60q-56 -62 -56 -175 q0 -50 25.5 -97.5t51.5 -47.5q7 0 14.5 2.5t12 5t14.5 8.5t13 8z" />
+<glyph unicode="&#x1d587;" horiz-adv-x="559" d="M504 335v-116q0 -25 -8 -46t-27.5 -39.5t-32.5 -28t-41 -28.5q-82 -55 -120 -101h-24q-103 59 -206 76v25q34 4 42.5 15t8.5 56v366q0 51 -12.5 95.5t-31.5 67.5l20 18q50 -40 79 -74q24 32 67 52.5t97 20.5q22 0 62 -6v-25q-71 0 -106.5 -34.5t-35.5 -97.5v-113l147 57 h24q98 -17 98 -140zM365 170v134q0 40 -12 60.5t-41 39.5l-77 -26v-235l106 -54q14 15 19 31t5 50z" />
+<glyph unicode="&#x1d588;" horiz-adv-x="464" d="M412 47l-196 -71h-24q-62 34 -99.5 95.5t-37.5 125.5q0 92 37 143t133 97l80 38h24l77 -90l-104 -86l-82 90q-11 -8 -15 -20q-11 -28 -11 -122q0 -76 37.5 -135t100.5 -59q24 0 72 19z" />
+<glyph unicode="&#x1d589;" horiz-adv-x="557" d="M502 336v-149q0 -25 -25.5 -49.5t-71 -55t-65.5 -48.5q-40 -37 -59 -59h-24q-98 60 -157 60h-52v24q46 0 46 51v270v-4q63 17 126 58v2l-42 16q-13 5 -38.5 18.5t-38.5 25.5t-23.5 31.5t-10.5 42.5q0 61 62.5 92.5t148.5 31.5v-25q-72 -11 -72 -51q0 -24 23.5 -41 t65.5 -33.5t56 -25.5q80 -48 115.5 -87t35.5 -95zM363 159v155q0 19 -5 34t-16 26t-19.5 17.5t-23 15t-18.5 11.5l-16 -8q-16 -8 -25 -14q-7 -2 -7 -45v-203l113 -53q17 27 17 64z" />
+<glyph unicode="&#x1d58a;" horiz-adv-x="476" d="M427 62l-190 -86h-23q-43 9 -75.5 34.5t-49.5 58t-25.5 64.5t-8.5 60q0 185 161 250q57 22 116 32h24l70 -215l-232 -90q0 -42 39 -77t73 -35q65 0 109 28zM194 201l57 23q31 16 31 36q0 9 -22 74.5t-28 77.5q-17 -9 -26 -39.5t-10.5 -56.5t-1.5 -69v-46z" />
+<glyph unicode="&#x1d58b;" horiz-adv-x="370" d="M327 700l25 -9q-2 -25 -12.5 -55.5t-35.5 -58.5t-58 -28q-23 0 -43 10.5t-35 10.5q-13 0 -24 -10.5t-11 -32.5q0 -79 136 -79h61v-65h-96l-25 -597h-101l-24 597h-51v25q50 0 50 57q0 15 -4.5 49.5t-4.5 51.5q0 45 24 87t77 42q23 0 54.5 -16t45.5 -16q32 0 52 37z" />
+<glyph unicode="&#x1d58c;" horiz-adv-x="566" d="M506 380v-25q-18 0 -30.5 -13t-12.5 -33v-184q0 -45 20 -98t20 -85q1 -74 -62 -117.5t-140 -43.5q-48 0 -76.5 7.5t-40 18.5t-19.5 23t-26 23t-50 15v24q56 30 110 30q32 0 52.5 -16t26.5 -35.5t13 -35.5t17 -16q27 0 41.5 17.5t14.5 63.5q0 38 -18 80.5t-22 57.5 l-134 -62h-25q-49 30 -79.5 83.5t-30.5 110.5q0 53 22.5 101t64.5 77q24 17 58 39l61 41l66 47h24q84 -73 155 -95zM324 79v236l-75 60q-55 -61 -55 -175q0 -50 25 -97.5t51 -47.5q9 0 17 3t20.5 11t16.5 10z" />
+<glyph unicode="&#x1d58d;" horiz-adv-x="576" d="M516 335v-284q0 -79 -63 -155.5t-125 -114.5l-18 19q29 36 48 87t19 90v327q0 40 -12 60.5t-41 39.5l-77 -26v-242l53 -30l34 37l22 -14q-72 -103 -95 -153h-24q-83 58 -192 76v25q37 4 50 16t13 55v366q0 51 -12.5 95.5t-31.5 67.5l20 18q50 -40 79 -74q24 32 67 52.5 t97 20.5q22 0 62 -6v-25q-71 0 -106.5 -34.5t-35.5 -97.5v-113l147 57h24q98 -17 98 -140z" />
+<glyph unicode="&#x1d58e;" horiz-adv-x="429" d="M269 649q0 -16 -25 -54.5t-45 -38.5q-21 0 -46 38t-25 55q0 20 20 34t51 14t50.5 -14t19.5 -34zM379 101l-141 -125h-24q-49 25 -66 55t-17 91v191q0 55 -33 55q-15 0 -48 -22l-15 22l147 107h24q91 -58 120 -61v-25q-56 -7 -56 -43v-178q0 -85 24 -85q16 0 66 40z" />
+<glyph unicode="&#x1d58f;" horiz-adv-x="389" d="M280 649q0 -16 -25 -54.5t-45 -38.5q-21 0 -46 38t-25 55q0 20 20 34t51 14t50.5 -14t19.5 -34zM337 414v-25q-56 -7 -56 -43v-394q0 -44 12.5 -87t31.5 -67l-20 -17q-46 31 -79 74q-22 -27 -58.5 -50.5t-68.5 -23.5q-31 0 -59 6v27q39 0 70.5 35t31.5 113v351 q0 49 -28 49q-18 0 -57 -26l-15 21l151 118h24q91 -58 120 -61z" />
+<glyph unicode="&#x1d590;" horiz-adv-x="456" d="M402 688v-25q-72 0 -112 -35t-40 -97v-89h33v62q0 56 30.5 81.5t79.5 25.5v-109h-26q-3 27 -20 27q-27 0 -27 -67v-20h73v-65h-143v-240l72 -36l49 56l22 -15q-106 -140 -119 -166h-24q-80 56 -202 76v25q37 4 50 16t13 55v229h-63v25q63 0 63 50v62q0 51 -12.5 95.5 t-31.5 67.5l20 18q50 -40 79 -74q24 32 67 52.5t97 20.5q32 0 72 -6z" />
+<glyph unicode="&#x1d591;" horiz-adv-x="433" d="M357 158l22 -15q-78 -101 -108 -167h-24q-80 56 -202 76v25q37 4 50 16t13 55v366q0 51 -12.5 95.5t-31.5 67.5l20 18q50 -40 79 -74q24 32 67 52.5t97 20.5q22 0 46 -6v-25q-57 0 -91.5 -35.5t-34.5 -96.5v-394l62 -31z" />
+<glyph unicode="&#x1d592;" horiz-adv-x="984" d="M932 90l-128 -114h-24q-49 24 -66 53.5t-17 88.5v215l-56 53l-84 -43v-184q0 -42 8 -55.5t39 -16.5v-25q-92 -8 -104 -86h-24q-11 77 -111 86v25q30 3 41.5 16t11.5 44v176q0 42 -53 65l-87 -44v-185q0 -42 8 -55.5t39 -16.5v-25q-92 -8 -104 -86h-24q-11 77 -111 86v25 q32 4 42.5 18.5t10.5 53.5v154q0 33 -11.5 51t-30.5 18q-24 0 -45 -15l-12 21l127 87h24q33 -16 56 -41t25 -52l173 93h24q33 -16 56.5 -41t25.5 -52l183 93h24q22 -26 52.5 -46.5t59.5 -21.5v-25q-34 -5 -34 -57v-174q0 -68 28 -68q10 0 18.5 5t30.5 24z" />
+<glyph unicode="&#x1d593;" horiz-adv-x="696" d="M644 90l-129 -114h-24q-49 24 -66 53.5t-17 88.5v215l-54 52l-76 -41v-185q0 -42 8 -55.5t39 -16.5v-25q-92 -8 -104 -86h-24q-11 77 -111 86v25q32 4 42.5 18.5t10.5 53.5v154q0 33 -11.5 51t-30.5 18q-24 0 -45 -15l-12 21l127 87h24q33 -16 56 -41t25 -52l173 93h24 q22 -26 52.5 -46.5t59.5 -21.5v-25q-34 -5 -34 -57v-174q0 -68 27 -68q10 0 18.5 5t32.5 24z" />
+<glyph unicode="&#x1d594;" horiz-adv-x="554" d="M499 295v-101q0 -26 -24.5 -51t-71 -58t-64.5 -50q-34 -32 -58 -59h-24q-110 64 -162 64h-50v25q46 0 46 50v254q19 5 46 17l86 39l112 50h24q77 -46 108.5 -84.5t31.5 -95.5zM360 150v134q0 12 -5 24t-13.5 22.5t-17.5 20t-20.5 18t-19.5 13.5l-16 10q-8 6 -9 6l-22 -10 q-7 -2 -7 -51v-186l111 -65q19 32 19 64z" />
+<glyph unicode="&#x1d595;" horiz-adv-x="640" d="M585 335v-120q0 -50 -23.5 -83.5t-68.5 -62.5q-5 -3 -23 -15l-24 -16l-21 -15q-14 -10 -21 -16t-16 -14.5t-16 -16.5h-24q-13 15 -32 19v-214h-139v246q-66 -2 -118 -51l-23 13q53 120 141 162v205q0 24 -15.5 42t-31.5 40t-16 55q0 26 22 54t52 46l21 -15 q-15 -24 -15 -35q0 -18 19 -31t41.5 -20.5t42 -26t19.5 -47.5l137 57h24q53 -19 80.5 -60t27.5 -80zM446 157v137q0 63 -74 104l-56 -21v-220q63 -20 116 -81q10 11 12 26t2 55z" />
+<glyph unicode="&#x1d596;" horiz-adv-x="574" d="M522 366h-20q-38 0 -38 -45v-540h-139v258l-134 -63h-24q-50 30 -81 83t-31 111q0 53 22.5 100.5t65.5 77.5l81 55q55 36 104 72h24q91 -78 170 -85v-24zM325 79v246l-75 50q-56 -62 -56 -175q0 -50 25.5 -97.5t51.5 -47.5q8 0 54 24z" />
+<glyph unicode="&#x1d597;" horiz-adv-x="525" d="M493 370l-110 -84l-85 106l-25 -13v-242l71 -36l70 70l19 -18q-42 -44 -84.5 -98t-55.5 -79h-24q-79 56 -173 56h-25v24q35 3 49 14.5t14 48.5v194q0 69 -43 69q-15 0 -39 -15l-12 21l122 87h24q41 -19 68 -63l134 63h24z" />
+<glyph unicode="&#x1d598;" horiz-adv-x="557" d="M180 536l-24 11q21 47 63 71.5t90 24.5q65 0 112.5 -40.5t47.5 -106.5q0 -57 -43.5 -99.5t-108.5 -42.5q-70 0 -110 63q-15 -30 -15 -79q0 -36 19 -58t46 -22q17 0 29 3.5t16 7.5l18 15q51 51 81 51q39 0 68 -31q36 -36 36 -107q0 -32 -31 -71t-90 -90.5t-66 -59.5h-25 q-42 39 -111 39q-54 0 -110 -46l-20 16q83 133 182 133q71 0 116 -61q16 42 16 81q0 84 -42 84q-4 0 -8.5 -1t-8.5 -2.5t-9 -4.5l-9 -6q-3 -2 -9 -7.5t-9 -7.5t-10 -8.5t-9 -8.5q-35 -31 -73 -31q-56 0 -91 38t-35 96q0 34 24 64.5t71 71.5l84 75h25q13 -23 47 -23 q16 0 32.5 16.5t16.5 44.5q0 36 -19.5 55t-52.5 19q-27 0 -56 -18t-45 -48z" />
+<glyph unicode="&#x1d599;" horiz-adv-x="438" d="M356 167l22 -14q-54 -72 -107 -176h-24q-80 56 -202 76v25q37 4 50 16t13 55v247h-63v25q101 9 101 235h101v-195h113v-65h-113v-258l61 -31z" />
+<glyph unicode="&#x1d59a;" horiz-adv-x="681" d="M629 90l-129 -114h-24q-39 19 -57 40.5t-23 56.5l-170 -97h-24q-22 27 -58.5 52.5t-65.5 26.5v25q26 4 36 15t10 42v172q0 42 -9 57.5t-28 15.5t-40 -15l-12 21l117 87h24q87 -42 87 -136v-219l51 -50l79 43v185q0 40 -7.5 51t-39.5 15v25q92 8 104 86h24q11 -77 111 -86 v-25q-33 -5 -43 -16.5t-10 -49.5v-155q0 -60 27 -60q10 0 18.5 5t32.5 24z" />
+<glyph unicode="&#x1d59b;" horiz-adv-x="573" d="M526 295v-101q0 -26 -24.5 -51t-71 -58t-64.5 -50q-34 -32 -58 -59h-24q-110 64 -162 64h-50v25q46 0 46 52v243q0 18 -10 33t-21.5 25t-21.5 29.5t-10 45.5t22 54t52 46l21 -15q-15 -24 -15 -35q0 -18 17.5 -30.5t38.5 -19.5t41 -23.5t24 -40.5q24 11 106 46h24 q77 -46 108.5 -84.5t31.5 -95.5zM387 150v134q0 12 -5 24t-13.5 22.5t-17.5 20t-20.5 18l-18.5 13.5l-16 10q-9 6 -10 6l-22 -10q-7 -2 -7 -51v-186l111 -65q19 27 19 64z" />
+<glyph unicode="&#x1d59c;" horiz-adv-x="850" d="M795 295v-107q0 -25 -23 -49t-67 -55.5t-63 -48.5q-34 -32 -58 -59h-24l-28 16l-29 16l-25 14q-17 8 -28 11.5t-24.5 6.5t-26.5 3h-48v25q20 0 28 11t8 39v220l-56 51l-74 -28v-218q0 -31 9 -42.5t38 -13.5v-25q-92 -8 -104 -86h-24q-11 77 -111 86v25q30 3 41.5 16 t11.5 44v209q0 19 -10 35t-21.5 26t-21.5 30t-10 46t22 54t52 46l21 -15q-15 -24 -15 -35q0 -18 19 -30t42 -19.5t42 -30.5t19 -61l157 73h24q63 -25 89 -72l149 72h24q52 -39 73.5 -79.5t21.5 -100.5zM656 160v124q0 68 -61 105l-62 -24q-7 -3 -7 -52v-162l113 -64 q17 29 17 73z" />
+<glyph unicode="&#x1d59d;" horiz-adv-x="521" d="M489 385l-114 -77l-67 84l-25 -13v-114h74v-65h-74v-64l70 -41l43 44l18 -18l-117 -145h-25l-128 78q-17 -32 -17 -48q0 -37 20.5 -52.5t78.5 -34.5l-36 -128h-25q-99 43 -99 157q0 83 78 152v100h-70v65h70v48q0 69 -43 69q-15 0 -39 -15l-12 21l122 87h24 q41 -19 68 -63l133 63h24z" />
+<glyph unicode="&#x1d59e;" horiz-adv-x="596" d="M536 283v-147q0 -72 -20.5 -135t-53.5 -106.5t-61 -70t-56 -43.5l-18 19q70 88 70 255v196q0 74 -14.5 104.5t-46.5 52.5l-79 -31v-240l54 -31l38 48l22 -15q-53 -67 -100 -163h-24q-83 58 -192 76v25q37 4 50 16t13 55v208q0 19 -10 35t-21.5 26t-21.5 30t-10 46t22 54 t52 46l21 -15q-15 -24 -15 -35q0 -18 17.5 -29.5t39 -18.5t41 -26.5t23.5 -50.5l135 57h24q121 -45 121 -192z" />
+<glyph unicode="&#x1d59f;" horiz-adv-x="484" d="M205 221l211 -119q21 -30 21 -91q0 -60 -60 -109q-56 -44 -207 -121h-24q-38 23 -68 69.5t-42 86.5v25q143 88 210 191l-95 54v21q94 49 94 114q0 50 -38 50q-53 0 -94 -27l-11 26l66 33q63 31 94 51h25q97 -16 97 -102q0 -21 -12.5 -41.5t-29.5 -35t-44.5 -30 t-46.5 -24.5t-46 -20v-1zM277 132h-3q-38 -73 -109 -144q14 -52 31.5 -84t48.5 -48q26 24 39.5 58.5t13.5 107.5q0 16 -7 57t-14 53z" />
+<glyph unicode="&#x1d5a0;" horiz-adv-x="666" d="M635 0h-96l-82 200h-249l-81 -200h-96l289 674h26zM427 274l-94 229l-94 -229h188z" />
+<glyph unicode="&#x1d5a1;" horiz-adv-x="604" d="M74 662h205q232 0 232 -163q0 -91 -92 -133q128 -41 128 -173q0 -52 -29 -97t-77 -70q-52 -26 -127 -26h-240v662zM161 394h90q88 0 129.5 25.5t41.5 79.5q0 46 -31.5 67.5t-99.5 21.5h-130v-194zM161 74h126q87 0 129 35.5t42 92.5q0 36 -19.5 63.5t-53.5 38.5 q-41 13 -145 13h-79v-243z" />
+<glyph unicode="&#x1d5a2;" horiz-adv-x="671" d="M586 170l51 -51q-103 -133 -273 -133q-157 0 -247 96.5t-90 250.5q0 148 93.5 245.5t242.5 97.5q75 0 144 -29.5t110 -92.5v-101h-19q-33 80 -96.5 113.5t-137.5 33.5q-111 0 -179.5 -75.5t-68.5 -189.5q0 -124 67 -198.5t184 -74.5q123 0 219 108z" />
+<glyph unicode="&#x1d5a3;" horiz-adv-x="692" d="M74 662h166q416 0 416 -335q0 -65 -23 -123t-67.5 -104t-115.5 -73t-161 -27h-215v662zM161 74h49q94 0 145 7.5t99 32.5q113 59 113 214q0 71 -22.5 120t-73.5 84q-47 32 -104 44t-146 12h-60v-514z" />
+<glyph unicode="&#x1d5a4;" horiz-adv-x="583" d="M540 74l-17 -74h-449v662h439v-74h-352v-202h305v-75h-305v-237h379z" />
+<glyph unicode="&#x1d5a5;" horiz-adv-x="535" d="M523 588h-362v-202h296v-75h-296v-311h-87v662h440z" />
+<glyph unicode="&#x1d5a6;" horiz-adv-x="695" d="M627 357v-298q-30 -20 -44.5 -28t-46 -21.5t-70.5 -18.5t-91 -5q-157 0 -252.5 97t-95.5 250q0 147 98.5 245t247.5 98q165 0 242 -111v-103h-19q-66 138 -223 138q-121 0 -189 -78t-68 -186q0 -110 70.5 -192t192.5 -82q83 0 122 18t39 43v158h-86l-22 76h195z" />
+<glyph unicode="&#x1d5a7;" horiz-adv-x="658" d="M584 0h-87v301h-336v-301h-87v662h87v-287h336v287h87v-662z" />
+<glyph unicode="&#x1d5a8;" horiz-adv-x="401" d="M356 74l-9 -74h-288l-14 74h111v514h-111l14 74h288l9 -74h-111v-514h111z" />
+<glyph unicode="&#x1d5a9;" horiz-adv-x="398" d="M305 662v-450q0 -106 -35.5 -166t-126.5 -60q-76 0 -131 56l19 76h17q20 -23 47 -39.5t51 -16.5q25 0 41 12.5t22 37.5t7.5 44t1.5 50v456h87z" />
+<glyph unicode="&#x1d5aa;" horiz-adv-x="634" d="M630 0h-119l-316 302l-34 -33v-269h-87v662h87v-287l308 287h95v-17l-307 -288z" />
+<glyph unicode="&#x1d5ab;" horiz-adv-x="559" d="M546 74l-18 -74h-454v662h87v-588h385z" />
+<glyph unicode="&#x1d5ac;" horiz-adv-x="843" d="M768 0h-85v543l-251 -543h-21l-251 541v-541h-85v662h123l225 -482l222 482h123v-662z" />
+<glyph unicode="&#x1d5ad;" horiz-adv-x="675" d="M601 -14l-69 14l-371 564v-564h-87v662h121l319 -484v484h87v-676z" />
+<glyph unicode="&#x1d5ae;" horiz-adv-x="714" d="M684 331q0 -152 -92.5 -248.5t-234.5 -96.5t-234.5 96.5t-92.5 248.5q0 153 92.5 249t234.5 96t234.5 -96t92.5 -249zM595 331q0 124 -64 196.5t-174 72.5t-174 -72.5t-64 -196.5t64 -196.5t174 -72.5t174 72.5t64 196.5z" />
+<glyph unicode="&#x1d5af;" horiz-adv-x="525" d="M74 662h184q254 0 254 -184q0 -87 -61.5 -140t-169.5 -53h-120v-285h-87v662zM161 359h88q93 0 134 30t41 90q0 55 -42.5 82t-137.5 27h-83v-229z" />
+<glyph unicode="&#x1d5b0;" horiz-adv-x="716" d="M691 -157v-18q-45 0 -67.5 0.5t-62 3.5t-63 9t-56 18t-55.5 29.5t-48 44.5t-45 62q-117 21 -190.5 113t-73.5 226q0 153 92.5 249t234.5 96t234.5 -96t92.5 -249q0 -137 -78.5 -230t-201.5 -111q19 -31 43 -50t54 -27.5t52.5 -11t58.5 -2.5zM595 331q0 124 -64 196.5 t-174 72.5t-174 -72.5t-64 -196.5t64 -196.5t174 -72.5t174 72.5t64 196.5z" />
+<glyph unicode="&#x1d5b1;" horiz-adv-x="589" d="M581 0h-103l-247 299h-70v-299h-87v662h185q125 0 189.5 -45.5t64.5 -131.5q0 -71 -48 -120.5t-130 -61.5zM161 373h89q93 0 133.5 27t40.5 86q0 54 -41.5 78t-138.5 24h-83v-215z" />
+<glyph unicode="&#x1d5b2;" horiz-adv-x="541" d="M449 477h-19q-24 60 -72 91.5t-106 31.5q-46 0 -76 -28t-30 -67q0 -70 141 -127q107 -42 150.5 -89.5t43.5 -120.5q0 -74 -57 -127q-61 -55 -166 -55q-146 0 -213 84l-13 135h18q33 -73 90 -108t114 -35q63 0 100.5 26.5t37.5 69.5q0 45 -30 75t-98 58q-109 44 -156 91.5 t-47 118.5q0 79 55 127t141 48q124 0 192 -80v-119z" />
+<glyph unicode="&#x1d5b3;" horiz-adv-x="608" d="M593 588h-245v-588h-88v588h-245l10 74h558z" />
+<glyph unicode="&#x1d5b4;" horiz-adv-x="661" d="M592 662v-419q0 -126 -66.5 -191.5t-195.5 -65.5q-261 0 -261 257v419h87v-406q0 -78 19 -115q41 -79 155 -79q55 0 96.5 21t61.5 58q17 31 17 128v393h87z" />
+<glyph unicode="&#x1d5b5;" horiz-adv-x="654" d="M623 662l-283 -673h-26l-283 673h96l201 -498l199 498h96z" />
+<glyph unicode="&#x1d5b6;" horiz-adv-x="921" d="M892 662l-228 -673h-28l-178 446l-173 -446h-28l-228 673h95l153 -476v2l182 474l184 -476v2l154 474h95z" />
+<glyph unicode="&#x1d5b7;" horiz-adv-x="700" d="M669 0h-105l-215 283l-213 -283h-105l265 349l-240 313h106l187 -248l185 248h107l-239 -313z" />
+<glyph unicode="&#x1d5b8;" horiz-adv-x="630" d="M609 662l-250 -374v-288h-88v288l-250 374h95l199 -300l199 300h95z" />
+<glyph unicode="&#x1d5b9;" horiz-adv-x="637" d="M603 74l-8 -74h-567v25l426 563h-392l8 74h528v-21l-428 -567h433z" />
+<glyph unicode="&#x1d5ba;" horiz-adv-x="448" d="M391 0h-85l-5 44q-60 -54 -149 -54q-54 0 -85.5 28t-31.5 83q0 72 63.5 119t203.5 74v33q0 29 -23.5 47t-61.5 18q-76 0 -108 -90h-15l-49 31q13 68 61 99t113 31q74 0 118 -36.5t44 -100.5v-250q0 -29 10 -76zM302 132v90q-86 -14 -138 -43q-50 -26 -50 -67 q0 -51 58 -51q67 0 130 71z" />
+<glyph unicode="&#x1d5bb;" horiz-adv-x="496" d="M142 679v-265q55 49 128 49q87 0 141.5 -61t54.5 -158q0 -110 -67 -182t-171 -72t-165 57v613l70 24zM142 302v-208q39 -33 91 -33q61 0 107.5 46t46.5 123q0 73 -35 117.5t-97 44.5q-36 0 -67 -23.5t-46 -66.5z" />
+<glyph unicode="&#x1d5bc;" horiz-adv-x="456" d="M367 166l65 -34q-32 -73 -85 -108q-49 -34 -115 -34q-74 0 -125 40q-84 65 -84 186q0 109 62.5 178t156.5 69q55 0 100 -23t69 -69l-44 -54h-16q-32 75 -113 75q-57 0 -96.5 -45t-39.5 -125q0 -74 39 -117.5t97 -43.5q81 0 129 105z" />
+<glyph unicode="&#x1d5bd;" horiz-adv-x="494" d="M437 13l-72 -24l-9 5l-2 50q-56 -54 -137 -54q-52 0 -91 23q-43 26 -70.5 79t-27.5 117q0 106 63.5 180t153.5 74q56 0 107 -37v234l70 24l9 -5v-551q0 -66 6 -115zM352 158v171q-43 63 -103 63q-55 0 -98.5 -48t-43.5 -122q0 -43 15 -80.5t41 -56.5q32 -24 74 -24 q35 0 67 26.5t48 70.5z" />
+<glyph unicode="&#x1d5be;" horiz-adv-x="444" d="M362 167l66 -35q-38 -76 -82 -109t-116 -33q-91 0 -149 62.5t-58 173.5q0 116 72 183q57 54 143 54q79 0 126 -51.5t47 -134.5v-55h-309q0 -76 39 -118.5t97 -42.5q79 0 124 106zM115 293h215q-3 99 -100 99q-40 0 -73 -25t-42 -74z" />
+<glyph unicode="&#x1d5bf;" horiz-adv-x="336" d="M369 633l-24 -59l-16 -1q-21 15 -31 21.5t-23 12t-26 5.5q-31 0 -50 -25t-19 -78v-56h114v-71h-114v-382h-79v382h-81v71h81v41q0 99 47 149q40 40 94 40q68 0 127 -50z" />
+<glyph unicode="&#x1d5c0;" horiz-adv-x="496" d="M467 369h-78q16 -31 16 -70q0 -71 -47.5 -116t-119.5 -45q-30 0 -61 8q-41 -24 -41 -44q0 -36 48 -38q17 0 52.5 -2t52.5 -2q169 -7 169 -119q0 -80 -78 -118.5t-187 -38.5q-77 0 -124.5 29t-47.5 84q0 74 70 113q-37 25 -37 63q0 46 44 86q5 5 17 19q-52 47 -52 118 q0 69 51 118t128 49q37 0 75 -14q36 -13 82 -13h68v-67zM326 297q0 46 -23.5 70.5t-66.5 24.5q-40 0 -67 -27t-27 -63q0 -42 26 -67t71 -25q39 0 63 25t24 62zM201 -15h-20q-81 -24 -81 -71q0 -58 101 -58q84 0 123 15q24 10 39 26.5t15 35.5q0 32 -33 40q-45 12 -144 12z " />
+<glyph unicode="&#x1d5c1;" horiz-adv-x="487" d="M424 0h-79v304q0 88 -82 88q-29 0 -68 -25t-53 -65v-302h-79v660l70 24l9 -5v-274q35 35 68.5 46.5t79.5 11.5q60 0 97 -37.5t37 -104.5v-321z" />
+<glyph unicode="&#x1d5c2;" horiz-adv-x="220" d="M156 586h-92v93h92v-93zM152 0h-83v440l74 24l9 -5v-459z" />
+<glyph unicode="&#x1d5c3;" horiz-adv-x="254" d="M185 586h-93v93h93v-93zM180 459v-485q0 -106 -47 -153q-37 -37 -98 -37q-51 0 -109 36l27 64h16q44 -28 65 -28q64 0 64 102v481l73 25z" />
+<glyph unicode="&#x1d5c4;" horiz-adv-x="453" d="M452 0h-103l-207 207v-207h-79v660l70 24l9 -5v-376l198 150h104v-14l-246 -184z" />
+<glyph unicode="&#x1d5c5;" horiz-adv-x="205" d="M144 0h-83v660l74 24l9 -5v-679z" />
+<glyph unicode="&#x1d5c6;" horiz-adv-x="756" d="M691 0h-77v293q0 99 -79 99q-27 0 -65.5 -25.5t-52.5 -64.5v-302h-78v290q0 102 -77 102q-27 0 -67 -25t-53 -65v-302h-77v440l65 24l9 -5v-57q49 61 139 61q89 0 131 -65q59 65 142 65q59 0 99.5 -38.5t40.5 -109.5v-315z" />
+<glyph unicode="&#x1d5c7;" horiz-adv-x="487" d="M424 0h-79v304q0 88 -82 88q-29 0 -68 -25t-53 -65v-302h-79v440l65 24l9 -5l2 -57q37 36 71.5 48.5t79.5 12.5q29 0 59 -13.5t48 -31.5q27 -36 27 -97v-321z" />
+<glyph unicode="&#x1d5c8;" horiz-adv-x="499" d="M471 229q0 -39 -14 -79.5t-40 -77t-70 -59.5t-99 -23q-97 0 -158.5 68.5t-61.5 170.5q0 97 60 165.5t157 68.5q101 0 163.5 -63t62.5 -171zM392 228q0 76 -40.5 120t-105.5 44q-63 0 -101 -48t-38 -116q0 -72 40 -119.5t102 -47.5q67 0 105 53.5t38 113.5z" />
+<glyph unicode="&#x1d5c9;" horiz-adv-x="498" d="M142 459l2 -50q56 54 137 54q54 0 91 -23q43 -27 70.5 -79.5t27.5 -116.5q0 -106 -63.5 -180t-153.5 -74q-57 0 -107 36v-218l-70 -24l-9 5v651l67 24zM146 295v-172q39 -62 103 -62q65 0 103.5 48t38.5 121q0 69 -35 115.5t-95 46.5q-35 0 -67 -26.5t-48 -70.5z" />
+<glyph unicode="&#x1d5ca;" horiz-adv-x="498" d="M435 -211l-9 -5l-70 24v234q-53 -52 -135 -52q-52 0 -91 23q-44 27 -73 79.5t-29 116.5q0 106 63.5 180t153.5 74q66 0 114 -35l65 36l11 -6v-669zM356 158v171q-20 30 -49 46.5t-58 16.5q-55 0 -98.5 -48t-43.5 -122q0 -69 35 -115t95 -46q35 0 69 27t50 70z" />
+<glyph unicode="&#x1d5cb;" horiz-adv-x="336" d="M328 377h-20q-10 15 -39 15q-43 0 -76.5 -42t-50.5 -116v-234h-79v440l70 24l9 -5l2 -64q48 68 127 68q37 0 57 -16v-70z" />
+<glyph unicode="&#x1d5cc;" horiz-adv-x="389" d="M330 321h-15q-28 44 -56 58t-67 14q-32 0 -48 -16t-16 -35q0 -25 21 -42.5t63 -34.5q83 -35 110.5 -64t27.5 -83q0 -66 -61 -104q-38 -24 -100 -24q-45 0 -75.5 13t-63.5 42v103h15q39 -87 130 -87q32 0 54 14.5t22 42.5q0 20 -18.5 34.5t-67.5 36.5q-76 34 -106 67 t-30 82q0 52 40 88.5t105 36.5q86 0 136 -53v-89z" />
+<glyph unicode="&#x1d5cd;" horiz-adv-x="291" d="M287 87l-11 -75q-29 -22 -88 -22q-51 0 -79 30.5t-28 83.5v278h-80v17l45 54h35v64l61 63h18v-127h104v-71h-104v-245q0 -44 13 -60t38 -16q37 0 64 26h12z" />
+<glyph unicode="&#x1d5ce;" horiz-adv-x="491" d="M430 13l-71 -24l-9 5l-2 65q-29 -32 -70.5 -50.5t-80.5 -18.5q-60 0 -107 45q-27 35 -27 96v322h79v-304q0 -88 82 -88q28 0 67 29.5t54 70.5v292h79v-325q0 -66 6 -115z" />
+<glyph unicode="&#x1d5cf;" horiz-adv-x="474" d="M443 453l-195 -467h-22l-195 467h85l122 -299l120 299h85z" />
+<glyph unicode="&#x1d5d0;" horiz-adv-x="702" d="M675 453l-196 -467h-22l-98 244l-122 -244h-21l-188 467h84l122 -304l85 176l-15 41l-20 47l-15 40h84l121 -294l116 294h85z" />
+<glyph unicode="&#x1d5d1;" horiz-adv-x="482" d="M452 0h-94l-122 175l-112 -175h-94l161 239l-149 214h94l105 -151l97 151h94l-146 -217z" />
+<glyph unicode="&#x1d5d2;" horiz-adv-x="484" d="M453 453l-178 -497q-31 -89 -69.5 -130.5t-102.5 -41.5q-48 0 -75 24v72h17q32 -24 60 -24q61 0 106 138q1 5 5 16.5t6 16.5l-188 426h86l139 -323l109 323h85z" />
+<glyph unicode="&#x1d5d3;" horiz-adv-x="447" d="M417 71l-10 -71h-382v20l251 362h-227l12 71h344v-20l-252 -362h264z" />
+<glyph unicode="&#x1d5d4;" horiz-adv-x="690" d="M665 0h-130l-66 162h-248l-66 -162h-130l306 690h28zM428 264l-83 204l-83 -204h166z" />
+<glyph unicode="&#x1d5d5;" horiz-adv-x="636" d="M463 373l1 -4q75 -36 102.5 -79.5t27.5 -101.5q0 -81 -73 -134.5t-181 -53.5h-260v676h237q118 0 180 -43t62 -125q0 -41 -25 -77.5t-71 -57.5zM208 413h72q141 0 141 89q0 37 -23 54.5t-77 17.5h-113v-161zM208 102h103q80 0 110.5 29t30.5 80q0 52 -49.5 76t-119.5 24 h-75v-209z" />
+<glyph unicode="&#x1d5d6;" horiz-adv-x="723" d="M619 193l69 -68q-115 -144 -285 -144q-164 0 -259 100.5t-95 258.5q0 152 97.5 251.5t255.5 99.5q80 0 140.5 -20t106.5 -74v-149h-11q-72 141 -218 141q-101 0 -167 -66.5t-66 -180.5q0 -105 56.5 -182t161.5 -77q63 0 111.5 25.5t102.5 84.5z" />
+<glyph unicode="&#x1d5d7;" horiz-adv-x="709" d="M80 676h179q221 0 318 -89t97 -252q0 -48 -12 -94t-40 -90t-69 -77.5t-104 -53.5t-140 -20h-229v676zM210 102h67q259 0 259 234q0 122 -66 180t-182 58h-78v-472z" />
+<glyph unicode="&#x1d5d8;" horiz-adv-x="635" d="M597 102l-27 -102h-490v676h480v-102h-350v-167h241v-103h-241v-202h387z" />
+<glyph unicode="&#x1d5d9;" horiz-adv-x="582" d="M570 574h-360v-169h213v-102h-213v-303h-130v676h477z" />
+<glyph unicode="&#x1d5da;" horiz-adv-x="746" d="M671 357v-279q-32 -24 -48.5 -35t-52 -29t-78.5 -25.5t-98 -7.5q-168 0 -262.5 100t-94.5 259q0 151 98 251t256 100q79 0 138.5 -20.5t107.5 -73.5v-149h-11q-73 141 -223 141q-97 0 -162.5 -66.5t-65.5 -180.5q0 -66 22.5 -123t75 -96.5t125.5 -39.5q76 0 155 43v129 h-107l-31 102h256z" />
+<glyph unicode="&#x1d5db;" horiz-adv-x="715" d="M635 0h-130v297h-295v-297h-130v676h130v-277h295v277h130v-676z" />
+<glyph unicode="&#x1d5dc;" horiz-adv-x="440" d="M375 102l-9 -102h-287l-14 102h90v472h-90l14 102h287l9 -102h-90v-472h90z" />
+<glyph unicode="&#x1d5dd;" horiz-adv-x="481" d="M406 676v-545q0 -150 -102 -203q-45 -24 -110 -24q-95 0 -179 98l49 98h18q33 -49 59 -71.5t63 -22.5q44 0 58 30.5t14 81.5v558h130z" />
+<glyph unicode="&#x1d5de;" horiz-adv-x="712" d="M707 0h-170l-296 306l-33 -29v-277h-128v676h128v-263l295 263h145v-14l-318 -278z" />
+<glyph unicode="&#x1d5df;" horiz-adv-x="603" d="M587 102l-19 -102h-488v676h130v-574h377z" />
+<glyph unicode="&#x1d5e0;" horiz-adv-x="913" d="M833 0h-128v467l-235 -467h-27l-235 467v-467h-128v676h161l214 -440h3l214 440h161v-676z" />
+<glyph unicode="&#x1d5e1;" horiz-adv-x="724" d="M644 -18l-105 20l-331 500v-502h-128v676h157l279 -424v424h128v-694z" />
+<glyph unicode="&#x1d5e2;" horiz-adv-x="778" d="M743 337q0 -157 -99 -256t-254 -99q-154 0 -254.5 99t-100.5 256t100 256t254 99t254 -99t100 -256zM605 337q0 115 -57 184t-159 69t-159 -69t-57 -184q0 -116 57 -184.5t160 -68.5q102 0 158.5 68.5t56.5 184.5z" />
+<glyph unicode="&#x1d5e3;" horiz-adv-x="581" d="M80 676h209q139 0 209.5 -50.5t70.5 -144.5q0 -91 -69.5 -147t-186.5 -56h-103v-278h-130v676zM210 380h71q83 0 119.5 25t36.5 77q0 92 -162 92h-65v-194z" />
+<glyph unicode="&#x1d5e4;" horiz-adv-x="779" d="M754 -160v-16q-50 0 -75.5 0.5t-70 3.5t-70.5 9t-63 17.5t-62 28.5t-52.5 43.5t-49.5 60.5q-125 27 -200.5 119t-75.5 228q0 158 100 257.5t254 99.5q155 0 254.5 -99t99.5 -258q0 -135 -75 -226.5t-199 -119.5q24 -27 59.5 -41.5t62 -17t70.5 -3.5zM605 336 q0 115 -57 184t-159 69t-159 -69t-57 -184q0 -116 57 -184.5t160 -68.5q102 0 158.5 68.5t56.5 184.5z" />
+<glyph unicode="&#x1d5e5;" horiz-adv-x="670" d="M657 0h-159l-247 291h-41v-291h-130v676h216q136 0 205 -48.5t69 -139.5q0 -69 -44.5 -119t-122.5 -69zM210 393h71q85 0 121 23t36 73q0 45 -37.5 65t-125.5 20h-65v-181z" />
+<glyph unicode="&#x1d5e6;" horiz-adv-x="554" d="M483 466h-14q-23 57 -77 90t-109 33q-43 0 -74 -20.5t-31 -61.5q0 -38 33 -62t91 -46q120 -46 164.5 -92t44.5 -124q0 -39 -19.5 -82t-47.5 -68q-59 -52 -178 -52q-132 0 -215 81l-16 162h14q33 -69 98.5 -105t120.5 -36q63 0 89.5 28t26.5 63q0 39 -24.5 59.5 t-94.5 47.5q-117 45 -164.5 95.5t-47.5 127.5q0 83 63 135t157 52q69 0 125.5 -20t84.5 -51v-154z" />
+<glyph unicode="&#x1d5e7;" horiz-adv-x="641" d="M627 574h-240v-574h-130v574h-243l14 102h589z" />
+<glyph unicode="&#x1d5e8;" horiz-adv-x="699" d="M624 676v-430q0 -265 -274 -265q-275 0 -275 265v430h128v-419q0 -79 14 -104q37 -70 133 -70q91 0 132 70q14 23 14 116v407h128z" />
+<glyph unicode="&#x1d5e9;" horiz-adv-x="690" d="M665 676l-306 -694h-28l-306 694h130l190 -465l190 465h130z" />
+<glyph unicode="&#x1d5ea;" horiz-adv-x="997" d="M967 676l-255 -691l-28 1l-184 408h-3l-184 -409h-28l-255 691h131l146 -439l195 439l188 -439l146 439h131z" />
+<glyph unicode="&#x1d5eb;" horiz-adv-x="740" d="M700 0h-154l-179 239l-173 -239h-154l249 343l-248 333h154l170 -228l166 228h154l-242 -333z" />
+<glyph unicode="&#x1d5ec;" horiz-adv-x="694" d="M674 676l-262 -394v-282h-130v282l-262 394h145l182 -283l182 283h145z" />
+<glyph unicode="&#x1d5ed;" horiz-adv-x="653" d="M623 102l-15 -102h-583v16l372 558h-334l13 102h525v-16l-374 -558h396z" />
+<glyph unicode="&#x1d5ee;" horiz-adv-x="489" d="M428 0h-125l-6 44q-32 -33 -66.5 -45.5t-84.5 -12.5t-86.5 36t-36.5 100q0 45 13.5 71.5t40.5 50.5q63 55 222 64v16q0 54 -74 54q-44 0 -69.5 -16t-38.5 -54h-12l-76 44q21 61 76 91t132 30q78 0 130 -35.5t52 -98.5v-263q0 -29 9 -76zM299 152v61q-151 0 -151 -82 q0 -27 17.5 -38.5t39.5 -11.5q29 0 54 19.5t40 51.5z" />
+<glyph unicode="&#x1d5ef;" horiz-adv-x="512" d="M177 426v-1q49 48 125 48q49 0 88 -23q46 -27 71.5 -81t25.5 -124q0 -140 -74 -211q-50 -47 -140 -47q-30 0 -62 12.5t-48 30.5h-3l-92 -43h-13v689h120v-250h2zM175 301v-158q41 -61 94 -61q44 0 68.5 41.5t24.5 107.5t-26.5 106.5t-64.5 40.5q-65 0 -96 -77z" />
+<glyph unicode="&#x1d5f0;" horiz-adv-x="462" d="M373 145l69 -67q-46 -55 -86 -73.5t-111 -18.5q-95 0 -157.5 66.5t-62.5 168.5q0 111 67 181.5t164 70.5q64 0 114 -27.5t63 -77.5l-77 -57h-17q-18 67 -85 67q-43 0 -73.5 -41t-30.5 -111q0 -57 31.5 -97.5t83.5 -40.5q70 0 108 57z" />
+<glyph unicode="&#x1d5f1;" horiz-adv-x="518" d="M463 8l-115 -22l-7 3v45h-2q-46 -48 -122 -48q-89 0 -140.5 65t-51.5 176t56.5 178.5t150.5 67.5q55 0 105 -39v242h120v-550q0 -64 6 -118zM337 169v140q-22 38 -41.5 53.5t-50.5 15.5q-45 0 -70 -43.5t-25 -104.5q0 -62 25.5 -105.5t68.5 -43.5q35 0 55.5 22t37.5 66z " />
+<glyph unicode="&#x1d5f2;" horiz-adv-x="452" d="M363 143l70 -66q-47 -54 -84.5 -72t-102.5 -18q-99 0 -160 64t-61 171q0 123 68 194q54 57 147 57q86 0 134 -66.5t48 -173.5v-28h-272q0 -59 31.5 -88t78.5 -29q67 0 103 55zM159 300h143q0 78 -69 78q-26 0 -49.5 -22.5t-24.5 -55.5z" />
+<glyph unicode="&#x1d5f3;" horiz-adv-x="340" d="M374 638l-22 -90l-17 -1q-29 49 -84 49q-59 0 -59 -84v-51h90v-95h-90v-366h-120v366h-58v95h58v42q0 91 48 139.5t121 48.5q49 0 75.5 -11t57.5 -42z" />
+<glyph unicode="&#x1d5f4;" horiz-adv-x="504" d="M219 76h84q187 0 187 -128q0 -45 -28.5 -78t-75.5 -51q-64 -25 -184 -25q-77 0 -125.5 29.5t-48.5 85.5q0 25 16 47.5t45 37.5q-42 19 -42 67q0 29 16.5 52.5t61.5 51.5v2q-42 27 -61.5 57t-19.5 76q0 74 59 123t150 49q42 0 80 -14q22 -8 82 -8h72v-95h-56 q16 -10 16 -56q0 -76 -60.5 -117.5t-141.5 -41.5h-25q-48 -5 -48 -33q0 -31 47 -31zM332 303q0 33 -21.5 53.5t-65.5 20.5q-41 0 -64 -21.5t-23 -50.5q0 -35 24 -53t63 -18q41 0 64 19t23 50zM314 -19h-105q-30 -3 -43 -16t-13 -28q0 -48 89 -48q59 0 88 12q35 13 35 46 q0 14 -12.5 24t-38.5 10z" />
+<glyph unicode="&#x1d5f5;" horiz-adv-x="510" d="M455 0h-120v309q0 69 -66 69q-23 0 -50.5 -21t-43.5 -64v-293h-120v676h120v-261h2q58 58 129 58q149 0 149 -151v-322z" />
+<glyph unicode="&#x1d5f6;" horiz-adv-x="245" d="M195 543h-145v145h145v-145zM184 0h-125v461h125v-461z" />
+<glyph unicode="&#x1d5f7;" horiz-adv-x="324" d="M269 543h-145v145h145v-145zM258 461v-478q0 -113 -81 -162q-41 -24 -98 -24q-76 0 -136 67l43 85h18q30 -50 60 -50q69 0 69 95v467h125z" />
+<glyph unicode="&#x1d5f8;" horiz-adv-x="519" d="M506 0h-142l-169 205l-20 -16v-189h-120v676h120v-365l176 150h134v-18l-209 -171z" />
+<glyph unicode="&#x1d5f9;" horiz-adv-x="235" d="M180 0h-125v625l108 51h17v-676z" />
+<glyph unicode="&#x1d5fa;" horiz-adv-x="776" d="M721 0h-118v309q0 69 -66 69q-25 0 -49.5 -20.5t-40.5 -64.5v-293h-118v309q0 69 -66 69q-22 0 -48 -21t-42 -64v-293h-118v461h114v-50h2q62 62 129 62q94 0 128 -62h1q62 62 145 62q147 0 147 -151v-322z" />
+<glyph unicode="&#x1d5fb;" horiz-adv-x="510" d="M455 0h-120v309q0 69 -66 69q-23 0 -50.5 -21t-43.5 -64v-293h-120v461h116v-50h2q62 62 133 62q149 0 149 -151v-322z" />
+<glyph unicode="&#x1d5fc;" horiz-adv-x="501" d="M476 229q0 -105 -64.5 -174t-161.5 -69q-95 0 -160 68.5t-65 173.5q0 109 64.5 177t164.5 68q95 0 158.5 -69t63.5 -175zM351 232q0 69 -26.5 107.5t-77.5 38.5q-48 0 -72.5 -41.5t-24.5 -104.5q0 -66 26 -108.5t74 -42.5q28 0 48.5 14.5t31.5 38t16 48.5t5 50z" />
+<glyph unicode="&#x1d5fd;" horiz-adv-x="512" d="M171 415h2q52 58 133 58q48 0 88 -24q93 -55 93 -201q0 -139 -74 -210q-55 -52 -140 -52q-52 0 -98 41v-195l-103 -37h-17v666h116v-46zM175 290v-140q22 -38 41.5 -53.5t50.5 -15.5q45 0 70 44t25 105q0 148 -89 148q-36 0 -58.5 -23t-39.5 -65z" />
+<glyph unicode="&#x1d5fe;" horiz-adv-x="512" d="M457 -168l-103 -37h-17v231h-2v1q-42 -41 -117 -41q-87 0 -140 65.5t-53 162.5q0 126 75 199q62 60 144 60q64 0 105 -39h3l88 39h17v-641zM337 158v158q-43 62 -92 62q-41 0 -68 -40t-27 -110q0 -69 24.5 -108t68.5 -39q61 0 94 77z" />
+<glyph unicode="&#x1d5ff;" horiz-adv-x="411" d="M406 356h-16q-22 22 -59 22q-48 0 -93.5 -54t-62.5 -135v-189h-120v461h120v-88h2q32 52 73.5 76t79.5 24q49 0 76 -19v-98z" />
+<glyph unicode="&#x1d600;" horiz-adv-x="385" d="M340 306h-15q-44 72 -125 72q-22 0 -35.5 -12t-13.5 -24q0 -21 17.5 -35t52.5 -29q86 -36 111 -65t25 -88q0 -34 -18.5 -64.5t-50.5 -48.5q-44 -25 -110 -25q-50 0 -81.5 14t-71.5 49v120h15q19 -43 60.5 -65.5t80.5 -22.5q22 0 39 12.5t17 31.5q0 16 -13 28t-53 29 q-83 36 -109 68t-26 89t43.5 95t116.5 38q49 0 81.5 -15t62.5 -46v-106z" />
+<glyph unicode="&#x1d601;" horiz-adv-x="386" d="M371 115l-11 -94q-37 -33 -116 -33q-57 0 -97.5 35.5t-40.5 102.5v240h-99v17l63 78h36v61l100 108h20v-169h107v-95h-107v-217q0 -36 17 -51t41 -15q41 0 69 32h18z" />
+<glyph unicode="&#x1d602;" horiz-adv-x="518" d="M463 10l-124 -25v70h-2q-62 -69 -143 -69q-139 0 -139 152v323h120v-310q0 -70 66 -70q22 0 50 24.5t44 67.5v288h120v-351q0 -64 8 -100z" />
+<glyph unicode="&#x1d603;" horiz-adv-x="462" d="M447 461l-203 -475h-26l-203 475h131l84 -252h2l84 252h131z" />
+<glyph unicode="&#x1d604;" horiz-adv-x="701" d="M684 461l-195 -475h-26l-109 252l-116 -252h-26l-195 475h131l81 -256h2l62 173l-35 83h131l86 -244h2l76 244h131z" />
+<glyph unicode="&#x1d605;" horiz-adv-x="506" d="M486 0h-138l-100 143l-90 -143h-138l159 243l-148 218h137l83 -121l79 121h138l-147 -223z" />
+<glyph unicode="&#x1d606;" horiz-adv-x="472" d="M455 461l-180 -496q-33 -91 -74.5 -130.5t-109.5 -39.5q-45 0 -73 22v98h16q27 -25 59 -25q33 0 55.5 24t38.5 79l-169 468h131l93 -275h2l80 275h131z" />
+<glyph unicode="&#x1d607;" horiz-adv-x="441" d="M417 95l-9 -95h-387v25l233 341h-207l8 95h361v-26l-233 -340h234z" />
+<glyph unicode="&#x1d608;" horiz-adv-x="666" d="M635 0h-96l-33 200h-249l-130 -200h-96l457 674h26zM495 274l-37 229l-151 -229h188z" />
+<glyph unicode="&#x1d609;" horiz-adv-x="604" d="M239 662h205q197 0 197 -117q0 -57 -33.5 -104.5t-97.5 -74.5q91 -33 91 -122q0 -102 -84 -173t-203 -71h-240zM259 394h90q200 0 200 131q0 63 -112 63h-130zM179 74h126q96 0 151.5 45t55.5 111q0 52 -42.5 69.5t-150.5 17.5h-79z" />
+<glyph unicode="&#x1d60a;" horiz-adv-x="671" d="M755 554l-26 -101h-19q-8 55 -41 89.5t-71.5 46t-84.5 11.5q-133 0 -229.5 -106t-96.5 -247q0 -87 50.5 -136t144.5 -49q123 0 246 108l38 -51q-136 -133 -306 -133q-128 0 -196 65.5t-68 176.5q0 119 59.5 222.5t160 164.5t215.5 61q75 0 136.5 -29.5t87.5 -92.5z" />
+<glyph unicode="&#x1d60b;" horiz-adv-x="692" d="M239 662h166q346 0 346 -233q0 -77 -31 -152.5t-87.5 -137.5t-146 -100.5t-197.5 -38.5h-215zM179 74h49q94 0 147 7.5t107 32.5q80 37 128.5 117.5t48.5 177.5q0 179 -292 179h-60z" />
+<glyph unicode="&#x1d60c;" horiz-adv-x="583" d="M678 662l-19 -74h-352l-50 -202h305l-19 -75h-305l-59 -237h379l-35 -74h-449l165 662h439z" />
+<glyph unicode="&#x1d60d;" horiz-adv-x="535" d="M679 662l-10 -74h-362l-50 -202h296l-19 -75h-296l-77 -311h-87l165 662h440z" />
+<glyph unicode="&#x1d60e;" horiz-adv-x="695" d="M755 565l-25 -103h-19q-32 138 -189 138q-94 0 -171.5 -50.5t-119 -127.5t-41.5 -160q0 -87 52 -143.5t152 -56.5q83 0 126.5 18t49.5 43l40 158h-89v76h195l-75 -298q-45 -26 -69 -37t-78.5 -23.5t-122.5 -12.5q-129 0 -201.5 67.5t-72.5 180.5q0 87 36.5 168.5 t97 141.5t142.5 96t168 36q165 0 214 -111z" />
+<glyph unicode="&#x1d60f;" horiz-adv-x="658" d="M749 662l-165 -662h-87l75 301h-336l-75 -301h-87l165 662h87l-72 -287h336l72 287h87z" />
+<glyph unicode="&#x1d610;" horiz-adv-x="401" d="M512 662l-10 -74h-111l-128 -514h111l-27 -74h-288l4 74h111l128 514h-111l33 74h288z" />
+<glyph unicode="&#x1d611;" horiz-adv-x="398" d="M470 662l-113 -450q-27 -107 -77 -166.5t-141 -59.5q-76 0 -117 56l38 76h17q14 -23 37.5 -39.5t46.5 -16.5q25 0 44 12.5t31.5 38t18.5 43.5t14 50l114 456h87z" />
+<glyph unicode="&#x1d612;" horiz-adv-x="634" d="M729 662l-5 -17l-378 -288l284 -357h-119l-241 302l-42 -33l-67 -269h-87l165 662h87l-72 -287l380 287h95z" />
+<glyph unicode="&#x1d613;" horiz-adv-x="559" d="M564 74l-36 -74h-454l165 662h87l-147 -588h385z" />
+<glyph unicode="&#x1d614;" horiz-adv-x="843" d="M933 662l-165 -662h-85l135 543l-386 -543h-21l-117 541l-134 -541h-85l165 662h123l104 -482l343 482h123z" />
+<glyph unicode="&#x1d615;" horiz-adv-x="675" d="M766 662l-169 -676l-65 14l-231 564l-140 -564h-87l165 662h121l198 -484l121 484h87z" />
+<glyph unicode="&#x1d616;" horiz-adv-x="714" d="M779 430q0 -123 -63.5 -227t-161 -160.5t-201.5 -56.5q-116 0 -185 66.5t-69 179.5q0 124 63.5 228t160.5 160t202 56q116 0 185 -66.5t69 -179.5zM689 421q0 85 -47.5 132t-135.5 47q-110 0 -192 -72.5t-113 -196.5q-12 -49 -12 -90q0 -85 47.5 -132t135.5 -47 q110 0 192 72.5t113 196.5q12 49 12 90z" />
+<glyph unicode="&#x1d617;" horiz-adv-x="525" d="M239 662h184q215 0 215 -133q0 -102 -81 -173t-205 -71h-120l-71 -285h-87zM250 359h88q105 0 157 40.5t52 108.5q0 80 -157 80h-83z" />
+<glyph unicode="&#x1d618;" horiz-adv-x="716" d="M651 -157l-4 -18q-39 0 -59 0.5t-54.5 2t-54 6t-47.5 12t-45.5 20t-37 30t-33.5 41.5t-24 55q-90 17 -141.5 81t-51.5 160q0 124 63.5 227.5t160.5 159.5t202 56q116 0 185 -66.5t69 -179.5q0 -85 -32.5 -163.5t-85.5 -135t-121 -94t-139 -47.5q11 -31 30.5 -50 t47.5 -27.5t50 -11t57 -2.5zM689 421q0 85 -47.5 132t-135.5 47q-110 0 -192 -72.5t-113 -196.5q-12 -49 -12 -90q0 -85 47.5 -132t135.5 -47q110 0 192 72.5t113 196.5q12 49 12 90z" />
+<glyph unicode="&#x1d619;" horiz-adv-x="589" d="M239 662h185q215 0 215 -130q0 -88 -65 -151t-164 -78l171 -303h-103l-173 299h-70l-74 -299h-87zM253 373h89q207 0 207 141q0 39 -38 56.5t-121 17.5h-83z" />
+<glyph unicode="&#x1d61a;" horiz-adv-x="541" d="M597 596l-30 -119h-19q-9 60 -49 91.5t-98 31.5q-51 0 -91.5 -35t-40.5 -77q0 -59 112 -110q79 -35 113.5 -72t34.5 -87q0 -104 -82.5 -168.5t-192.5 -64.5q-145 0 -192 84l21 135h18q14 -73 62.5 -108t105.5 -35q74 0 120 35.5t46 88.5q0 33 -23.5 57.5t-75.5 47.5 q-82 37 -119.5 75.5t-37.5 89.5q0 94 74.5 157t171.5 63q124 0 172 -80z" />
+<glyph unicode="&#x1d61b;" horiz-adv-x="608" d="M748 662l-9 -74h-245l-147 -588h-87l146 588h-245l29 74h558z" />
+<glyph unicode="&#x1d61c;" horiz-adv-x="661" d="M757 662l-105 -419q-32 -126 -114.5 -191.5t-211.5 -65.5q-209 0 -209 168q0 40 12 89l105 419h87l-102 -406q-14 -55 -14 -83q0 -52 37 -81.5t103 -29.5q55 0 102 21.5t76 57.5q25 31 49 128l98 393h87z" />
+<glyph unicode="&#x1d61d;" horiz-adv-x="654" d="M788 662l-451 -673h-26l-115 673h95l77 -498l324 498h96z" />
+<glyph unicode="&#x1d61e;" horiz-adv-x="921" d="M1057 662l-396 -673h-28l-67 446l-284 -446h-28l-60 673h95l34 -476v2l301 474l65 -476v2l273 474h95z" />
+<glyph unicode="&#x1d61f;" horiz-adv-x="700" d="M806 662l-317 -313l180 -349h-105l-145 283l-283 -283h-105l352 349l-162 313h106l125 -248l247 248h107z" />
+<glyph unicode="&#x1d620;" horiz-adv-x="630" d="M774 662l-344 -374l-72 -288h-87l71 288l-156 374h95l124 -300l274 300h95z" />
+<glyph unicode="&#x1d621;" horiz-adv-x="637" d="M763 662l-6 -21l-569 -567h433l-26 -74h-567l6 25l566 563h-392l27 74h528z" />
+<glyph unicode="&#x1d622;" horiz-adv-x="448" d="M169 302l-41 31q30 68 85.5 99t120.5 31q63 0 98 -26.5t35 -74.5q0 -14 -5 -36l-63 -250q-8 -29 -8 -76h-85l5 44q-72 -54 -162 -54q-44 0 -69 19.5t-25 56.5q0 168 320 228l8 33q2 10 2 15q0 23 -19.5 36.5t-51.5 13.5q-76 0 -130 -90h-15zM334 132l23 90 q-218 -35 -218 -126q0 -35 48 -35q68 0 147 71z" />
+<glyph unicode="&#x1d623;" horiz-adv-x="496" d="M311 679l-66 -265q67 49 140 49q70 0 110 -40.5t40 -109.5q0 -131 -95 -227t-215 -96q-103 0 -151 57l153 613l76 24zM217 302l-52 -208q31 -33 83 -33q72 0 138 63t66 164q0 48 -25.5 76t-74.5 28q-36 0 -72.5 -23.5t-62.5 -66.5z" />
+<glyph unicode="&#x1d624;" horiz-adv-x="456" d="M503 371l-57 -54h-16q-14 75 -95 75q-64 0 -124.5 -61t-60.5 -162q0 -51 28.5 -79.5t74.5 -28.5q81 0 155 105l56 -34q-96 -142 -235 -142q-74 0 -118 42t-44 118q0 130 92 221.5t198 91.5q55 0 94.5 -23t51.5 -69z" />
+<glyph unicode="&#x1d625;" horiz-adv-x="494" d="M600 679l-138 -551q-16 -66 -22 -115l-78 -24l-8 5l10 50q-69 -54 -150 -54q-65 0 -103.5 40.5t-38.5 113.5q0 125 92 222t196 97q55 0 98 -37l58 234l76 24zM391 158l43 171q-27 63 -88 63q-65 0 -128 -65.5t-63 -158.5q0 -53 26.5 -80t70.5 -27q35 0 73 26.5t66 70.5z " />
+<glyph unicode="&#x1d626;" horiz-adv-x="444" d="M403 167l57 -35q-56 -76 -108.5 -109t-124.5 -33q-73 0 -115.5 41.5t-42.5 116.5q0 96 45.5 170t109.5 109.5t129 35.5q64 0 99 -34.5t35 -94.5q0 -29 -7 -57l-14 -55h-309q-7 -28 -7 -54q0 -51 28.5 -79t74.5 -28q79 0 150 106zM188 293h215q4 16 4 33q0 66 -80 66 q-40 0 -79 -25t-60 -74z" />
+<glyph unicode="&#x1d627;" horiz-adv-x="336" d="M526 633l-38 -59l-17 -1q-24 22 -37.5 30.5t-32.5 8.5q-31 0 -56.5 -25t-38.5 -78l-14 -56h114l-17 -71h-114l-95 -382h-79l95 382h-81l17 71h81l11 41q28 101 84 149q50 40 104 40q68 0 114 -50z" />
+<glyph unicode="&#x1d628;" horiz-adv-x="496" d="M575 436l-16 -67h-78q4 -20 4 -30q0 -83 -66 -142t-147 -59q-31 0 -59 8q-54 -28 -54 -55q0 -26 40 -27q144 -5 187 -19q61 -20 61 -76q0 -49 -29.5 -86.5t-76.5 -58t-98.5 -30.5t-103.5 -10q-67 0 -106.5 22t-39.5 66q0 41 27 78.5t73 59.5q-23 18 -23 45q0 28 19.5 54 t69.5 69q-28 33 -28 78q0 80 68.5 143.5t157.5 63.5q29 0 74 -13.5t76 -13.5h68zM404 329q0 63 -71 63q-49 0 -85 -36.5t-36 -80.5q0 -30 21 -48t58 -18q49 0 81 36.5t32 83.5zM197 -15h-20q-46 -13 -73.5 -35t-27.5 -48q0 -47 89 -47q81 0 139.5 22.5t58.5 70.5 q0 37 -166 37z" />
+<glyph unicode="&#x1d629;" horiz-adv-x="487" d="M311 679l-69 -274q44 35 80.5 46.5t82.5 11.5q49 0 77 -25t28 -72q0 -21 -6 -45l-80 -321h-79l75 304q5 22 5 34q0 54 -65 54q-29 0 -73.5 -25t-69.5 -65l-75 -302h-79l164 660l76 24z" />
+<glyph unicode="&#x1d62a;" horiz-adv-x="220" d="M325 679l-23 -93h-92l23 93h92zM266 459l-114 -459h-83l109 440l80 24z" />
+<glyph unicode="&#x1d62b;" horiz-adv-x="254" d="M354 679l-23 -93h-93l23 93h93zM294 459l-121 -485q-24 -93 -74 -141.5t-117 -48.5q-50 0 -100 36l43 64h16q36 -28 58 -28q63 0 88 102l120 481l79 25z" />
+<glyph unicode="&#x1d62c;" horiz-adv-x="453" d="M556 453l-3 -14l-292 -184l191 -255h-103l-156 207l-51 -207h-79l164 660l76 24l8 -5l-94 -376l235 150h104z" />
+<glyph unicode="&#x1d62d;" horiz-adv-x="205" d="M313 679l-169 -679h-83l164 660l80 24z" />
+<glyph unicode="&#x1d62e;" horiz-adv-x="756" d="M253 459l-14 -57q64 61 154 61q88 0 115 -65q74 65 158 65q49 0 79 -26t30 -76q0 -21 -6 -46l-78 -315h-77l73 293q6 24 6 42q0 57 -61 57q-27 0 -72 -25.5t-68 -64.5l-75 -302h-77l71 290q7 32 7 45q0 57 -59 57q-27 0 -72.5 -25t-69.5 -65l-75 -302h-77l109 440l71 24z " />
+<glyph unicode="&#x1d62f;" horiz-adv-x="487" d="M251 459l-12 -57q45 36 83 48.5t83 12.5q47 0 76 -25.5t29 -65.5q0 -24 -6 -51l-80 -321h-79l75 304q5 22 5 35q0 53 -65 53q-29 0 -73.5 -25t-69.5 -65l-75 -302h-79l109 440l71 24z" />
+<glyph unicode="&#x1d630;" horiz-adv-x="499" d="M536 300q0 -49 -20.5 -103t-56.5 -100.5t-92.5 -76.5t-121.5 -30q-79 0 -124 47t-45 123q0 115 84.5 209t199.5 94q82 0 129 -43t47 -120zM455 282q0 52 -29.5 81t-82.5 29q-75 0 -130.5 -67t-55.5 -148q0 -53 28.5 -84.5t78.5 -31.5q48 0 87 26t60.5 63t32.5 72t11 60z " />
+<glyph unicode="&#x1d631;" horiz-adv-x="498" d="M256 459l-11 -50q69 54 151 54q65 0 103.5 -41.5t38.5 -114.5q0 -123 -92.5 -220t-195.5 -97q-56 0 -98 36l-54 -218l-76 -24l-8 5l162 651l73 24zM219 295l-43 -172q23 -62 88 -62q76 0 133.5 67.5t57.5 155.5q0 48 -25 78t-72 30q-35 0 -73 -26.5t-66 -70.5z" />
+<glyph unicode="&#x1d632;" horiz-adv-x="498" d="M549 458l-167 -669l-10 -5l-64 24l58 234q-67 -52 -148 -52q-66 0 -106 41.5t-40 115.5q0 123 92.5 219.5t195.5 96.5q66 0 105 -35l74 36zM395 158l43 171q-12 30 -37.5 46.5t-54.5 16.5q-65 0 -128 -65.5t-63 -158.5q0 -48 25 -77.5t72 -29.5q35 0 75.5 27t67.5 70z " />
+<glyph unicode="&#x1d633;" horiz-adv-x="336" d="M439 447l-18 -70h-20q-3 7 -15 11t-20 4q-43 0 -87 -42t-79 -116l-58 -234h-79l109 440l76 24l8 -5l-14 -64q64 68 144 68q37 0 53 -16z" />
+<glyph unicode="&#x1d634;" horiz-adv-x="389" d="M432 410l-22 -89h-15q-17 44 -42 58t-64 14t-58.5 -21.5t-19.5 -41.5t17 -34.5t50 -30.5q60 -29 83.5 -51.5t23.5 -55.5q0 -68 -56 -118t-143 -50q-45 0 -72 13t-53 42l25 103h15q18 -87 109 -87q34 0 63 17.5t29 49.5q0 15 -16 28.5t-54 32.5q-55 27 -79.5 53.5 t-24.5 60.5q0 62 52 111t129 49q87 0 123 -53z" />
+<glyph unicode="&#x1d635;" horiz-adv-x="291" d="M376 453l-17 -71h-104l-61 -245q-6 -24 -6 -39q0 -37 38 -37q36 0 70 26h12l-30 -75q-34 -22 -93 -22q-41 0 -62.5 20.5t-21.5 56.5q0 15 5 37l70 278h-80l4 17l58 54h35l16 64l77 63h18l-32 -127h104z" />
+<glyph unicode="&#x1d636;" horiz-adv-x="491" d="M536 453l-81 -325q-16 -66 -22 -115l-77 -24l-8 5l14 65q-37 -32 -83 -50.5t-85 -18.5q-47 0 -76 25.5t-29 65.5q0 25 6 50l80 322h79l-75 -304q-5 -19 -5 -35q0 -53 65 -53q28 0 74.5 29.5t71.5 70.5l72 292h79z" />
+<glyph unicode="&#x1d637;" horiz-adv-x="474" d="M555 453l-311 -467h-22l-79 467h85l48 -299l194 299h85z" />
+<glyph unicode="&#x1d638;" horiz-adv-x="702" d="M787 453l-312 -467h-22l-37 244l-183 -244h-21l-72 467h84l47 -304l129 176q-3 25 -10.5 73.5t-8.5 54.5h84l48 -294l189 294h85z" />
+<glyph unicode="&#x1d639;" horiz-adv-x="482" d="M544 453l-200 -217l108 -236h-94l-79 175l-155 -175h-94l220 239l-96 214h94l68 -151l134 151h94z" />
+<glyph unicode="&#x1d63a;" horiz-adv-x="484" d="M565 453l-301 -497q-54 -89 -102.5 -130.5t-112.5 -41.5q-48 0 -68 24l18 72h16q26 -24 54 -24q32 0 69 38.5t71 99.5q2 4 9 15.5t10 17.5q-14 81 -45 237t-37 189h86l59 -323l189 323h85z" />
+<glyph unicode="&#x1d63b;" horiz-adv-x="447" d="M517 453l-5 -20l-342 -362h264l-27 -71h-382l4 20l342 362h-227l29 71h344z" />
+<glyph unicode="&#x1d63c;" horiz-adv-x="690" d="M665 0h-130l-26 162h-248l-106 -162h-130l478 690h28zM493 264l-32 204l-134 -204h166z" />
+<glyph unicode="&#x1d63d;" horiz-adv-x="636" d="M248 676h237q206 0 206 -125q0 -53 -35 -102t-101 -76l1 -4q92 -49 92 -128q0 -100 -90 -170.5t-218 -70.5h-260zM310 413h72q88 0 128 32.5t40 79.5q0 49 -86 49h-113zM233 102h103q86 0 128.5 37t42.5 93q0 41 -42 60t-105 19h-75z" />
+<glyph unicode="&#x1d63e;" horiz-adv-x="723" d="M797 597l-37 -149h-11q-36 141 -183 141q-117 0 -211 -91.5t-94 -238.5q0 -78 41 -127t123 -49q63 0 118 25.5t124 84.5l52 -68q-152 -144 -321 -144q-135 0 -207 69t-72 185q0 121 62 226.5t167 167.5t226 62q80 0 135.5 -20t87.5 -74z" />
+<glyph unicode="&#x1d63f;" horiz-adv-x="709" d="M248 676h179q345 0 345 -232q0 -51 -15 -108t-50.5 -117.5t-86.5 -108.5t-132 -79t-179 -31h-229zM235 102h67q258 0 317 234q11 47 11 81q0 157 -199 157h-78z" />
+<glyph unicode="&#x1d640;" horiz-adv-x="635" d="M728 676l-25 -102h-350l-42 -167h241l-26 -103h-241l-50 -202h387l-52 -102h-490l168 676h480z" />
+<glyph unicode="&#x1d641;" horiz-adv-x="582" d="M725 676l-12 -102h-360l-43 -169h213l-25 -102h-213l-75 -303h-130l168 676h477z" />
+<glyph unicode="&#x1d642;" horiz-adv-x="746" d="M785 597l-37 -149h-11q-37 141 -188 141q-72 0 -139 -38t-113.5 -115t-46.5 -175q0 -78 41 -128t127 -50q77 0 166 43l32 129h-112v102h256l-70 -279q-46 -31 -75.5 -47t-92 -33t-133.5 -17q-137 0 -209.5 68t-72.5 184q0 120 61 225.5t166.5 169t228.5 63.5 q79 0 133.5 -20.5t88.5 -73.5z" />
+<glyph unicode="&#x1d643;" horiz-adv-x="715" d="M803 676l-168 -676h-130l74 297h-295l-74 -297h-130l168 676h130l-69 -277h295l69 277h130z" />
+<glyph unicode="&#x1d644;" horiz-adv-x="440" d="M534 676l-16 -102h-90l-118 -472h90l-34 -102h-287l11 102h90l118 472h-90l39 102h287z" />
+<glyph unicode="&#x1d645;" horiz-adv-x="481" d="M574 676l-136 -545q-26 -104 -96.5 -165.5t-171.5 -61.5q-96 0 -155 98l73 98h18q21 -49 41.5 -71.5t57.5 -22.5q44 0 65.5 30.5t34.5 81.5l139 558h130z" />
+<glyph unicode="&#x1d646;" horiz-adv-x="712" d="M816 676l-3 -14l-388 -278l282 -384h-170l-220 306l-40 -29l-69 -277h-128l168 676h128l-66 -263l361 263h145z" />
+<glyph unicode="&#x1d647;" horiz-adv-x="603" d="M612 102l-44 -102h-488l168 676h130l-143 -574h377z" />
+<glyph unicode="&#x1d648;" horiz-adv-x="913" d="M1001 676l-168 -676h-128l116 467l-351 -467h-27l-119 467l-116 -467h-128l168 676h161l104 -440h3l324 440h161z" />
+<glyph unicode="&#x1d649;" horiz-adv-x="724" d="M812 676l-173 -694l-100 20l-206 500l-125 -502h-128l168 676h157l173 -424l106 424h128z" />
+<glyph unicode="&#x1d64a;" horiz-adv-x="778" d="M840 434q0 -42 -13 -97q-40 -157 -163.5 -256t-278.5 -99q-128 0 -203.5 70t-75.5 187q0 126 66.5 231.5t170.5 163.5t218 58q128 0 203.5 -70.5t75.5 -187.5zM701 425q0 77 -42 121t-123 44q-120 0 -205.5 -98.5t-85.5 -244.5q0 -77 42 -120t123 -43q103 0 176.5 68.5 t102.5 184.5q12 48 12 88z" />
+<glyph unicode="&#x1d64b;" horiz-adv-x="581" d="M248 676h209q238 0 238 -144q0 -110 -90.5 -182t-222.5 -72h-103l-69 -278h-130zM304 380h71q89 0 137 32t48 92q0 70 -142 70h-65z" />
+<glyph unicode="&#x1d64c;" horiz-adv-x="779" d="M714 -160l-4 -16q-50 0 -75.5 0.5t-69.5 3.5t-68.5 9t-58 17.5t-54.5 28.5t-42 43.5t-35 60.5q-95 21 -148.5 86.5t-53.5 162.5q0 127 67 233.5t171.5 164t217.5 57.5q128 0 203 -69.5t75 -187.5q0 -167 -110 -290.5t-263 -155.5q17 -27 48.5 -41.5t57.5 -17t70 -3.5z M700 425q0 77 -42 120.5t-123 43.5q-119 0 -205 -98.5t-86 -243.5q0 -77 42.5 -120.5t123.5 -43.5q102 0 175.5 68.5t102.5 184.5q12 48 12 89z" />
+<glyph unicode="&#x1d64d;" horiz-adv-x="670" d="M248 676h216q116 0 175 -36t59 -104q0 -84 -62.5 -149.5t-158.5 -86.5l180 -300h-159l-175 291h-41l-72 -291h-130zM307 393h71q184 0 184 119q0 32 -34 47t-110 15h-65z" />
+<glyph unicode="&#x1d64e;" horiz-adv-x="554" d="M637 620l-38 -154h-14q-9 57 -55 90t-101 33q-47 0 -87 -25.5t-40 -73.5q0 -30 26 -50.5t73 -40.5q89 -38 126 -74t37 -87q0 -50 -31.5 -109.5t-80.5 -95.5q-72 -52 -191 -52q-133 0 -195 81l24 162h14q16 -69 72.5 -105t111.5 -36q42 0 72.5 13.5t44.5 34t19.5 37 t5.5 30.5q0 27 -21 44t-74 39q-87 37 -125.5 76.5t-38.5 93.5q0 102 82 171t192 69q69 0 120 -20t72 -51z" />
+<glyph unicode="&#x1d64f;" horiz-adv-x="641" d="M785 676l-15 -102h-240l-143 -574h-130l143 574h-243l39 102h589z" />
+<glyph unicode="&#x1d650;" horiz-adv-x="699" d="M792 676l-107 -430q-65 -265 -340 -265q-222 0 -222 171q0 43 13 94l107 430h128l-104 -419q-15 -60 -15 -82q0 -44 31 -68t87 -24q91 0 150 70q20 24 43 116l101 407h128z" />
+<glyph unicode="&#x1d651;" horiz-adv-x="690" d="M833 676l-479 -694h-28l-133 694h130l74 -465l306 465h130z" />
+<glyph unicode="&#x1d652;" horiz-adv-x="997" d="M1135 676l-427 -691l-28 1l-82 408h-3l-286 -409h-28l-83 691h130l38 -439l304 439l79 -439l255 439h131z" />
+<glyph unicode="&#x1d653;" horiz-adv-x="740" d="M853 676l-325 -333l172 -343h-154l-120 239l-232 -239h-154l334 343l-165 333h154l113 -228l223 228h154z" />
+<glyph unicode="&#x1d654;" horiz-adv-x="694" d="M842 676l-360 -394l-70 -282h-130l70 282l-164 394h145l111 -283l253 283h145z" />
+<glyph unicode="&#x1d655;" horiz-adv-x="653" d="M769 676l-4 -16l-513 -558h396l-40 -102h-583l3 16l512 558h-334l38 102h525z" />
+<glyph unicode="&#x1d656;" horiz-adv-x="489" d="M181 308l-65 44q36 61 98.5 91t139.5 30q67 0 110 -27.5t43 -76.5q0 -15 -4 -30l-66 -263q-7 -29 -9 -76h-125l4 44q-40 -33 -77.5 -45.5t-87.5 -12.5q-41 0 -67.5 25t-26.5 70q0 41 18.5 81.5t47.5 66.5q74 68 261 79l4 16q2 10 2 15q0 39 -62 39q-85 0 -126 -70h-12z M336 152l16 61q-28 0 -54.5 -4t-55.5 -13t-46.5 -29.5t-17.5 -49.5q0 -36 47 -36q60 0 111 71z" />
+<glyph unicode="&#x1d657;" horiz-adv-x="512" d="M283 426l-1 -1q62 48 137 48q65 0 102 -40t37 -111q0 -77 -39.5 -160t-97.5 -128q-61 -47 -152 -47q-30 0 -59 12.5t-40 30.5h-3l-103 -43h-13l172 689h120l-62 -250h2zM250 301l-40 -158q25 -61 79 -61q52 0 95 63.5t43 144.5q0 41 -17 64.5t-45 23.5q-65 0 -115 -77z " />
+<glyph unicode="&#x1d658;" horiz-adv-x="462" d="M524 368l-91 -57h-17q-1 67 -68 67q-47 0 -97 -54.5t-50 -139.5q0 -42 22 -69t63 -27q71 0 123 57l52 -67q-59 -55 -104 -73.5t-116 -18.5q-78 0 -124 46t-46 122q0 90 47.5 165t116 114.5t138.5 39.5q64 0 107.5 -27.5t43.5 -77.5z" />
+<glyph unicode="&#x1d659;" horiz-adv-x="518" d="M625 676l-137 -550q-17 -68 -24 -118l-120 -22l-6 3l11 45h-2q-58 -48 -134 -48q-69 0 -106.5 40t-37.5 113q0 142 84.5 238t195.5 96q56 0 96 -39l60 242h120zM379 169l35 140q-14 38 -29 53.5t-46 15.5q-56 0 -98 -67t-42 -140q0 -41 16.5 -65.5t48.5 -24.5 q35 0 60.5 22t54.5 66z" />
+<glyph unicode="&#x1d65a;" horiz-adv-x="452" d="M398 143l54 -66q-61 -54 -103.5 -72t-106.5 -18q-81 0 -126 44t-45 120q0 51 20.5 109.5t49.5 98.5q82 114 216 114q67 0 101 -40.5t34 -110.5q0 -41 -12 -89l-7 -28h-272q-5 -15 -5 -39q-1 -39 23 -58.5t62 -19.5q67 0 117 55zM233 300h143q4 16 4 30q0 48 -53 48 q-26 0 -55 -22.5t-39 -55.5z" />
+<glyph unicode="&#x1d65b;" horiz-adv-x="340" d="M533 639l-45 -90l-17 -1q-17 49 -72 49q-59 0 -80 -84l-13 -51h90l-23 -95h-90l-91 -367h-120l91 367h-58l23 95h58l11 42q24 92 83.5 140t132.5 48q49 0 73 -11t47 -42z" />
+<glyph unicode="&#x1d65c;" horiz-adv-x="504" d="M599 450l-24 -95h-56q7 -4 7 -23q0 -62 -42 -107.5t-96.5 -65t-108.5 -19.5h-25q-57 -6 -57 -41q0 -23 40 -23h84q160 0 160 -94q0 -52 -27.5 -89.5t-76 -58.5t-105 -30.5t-122.5 -9.5q-68 0 -108 23t-40 67q0 32 21.5 61.5t63.5 48.5q-28 15 -28 46q0 35 23.5 63.5 t83.5 61.5v2q-53 41 -53 92q0 87 77 150t180 63q42 0 77 -14q15 -6 25 -7t55 -1h72zM410 325q0 52 -71 52q-50 0 -79 -29.5t-29 -62.5q0 -51 72 -51q48 0 77.5 25.5t29.5 65.5zM309 -19h-105q-38 -4 -53 -21t-15 -33q0 -38 78 -38q138 0 138 66q0 26 -43 26z" />
+<glyph unicode="&#x1d65d;" horiz-adv-x="510" d="M278 415h2q73 58 143 58q119 0 119 -98q0 -25 -7 -53l-80 -322h-120l77 309q3 13 3 25q0 44 -52 44q-23 0 -56 -21t-59 -64l-73 -293h-120l168 676h120z" />
+<glyph unicode="&#x1d65e;" horiz-adv-x="245" d="M366 688l-36 -145h-145l36 145h145zM298 462l-114 -462h-125l114 462h125z" />
+<glyph unicode="&#x1d65f;" horiz-adv-x="324" d="M440 688l-36 -145h-145l36 145h145zM372 462l-119 -478q-22 -90 -84.5 -138t-140.5 -48q-75 0 -118 67l64 85h18q16 -50 46 -50q70 0 93 95l116 467h125z" />
+<glyph unicode="&#x1d660;" horiz-adv-x="519" d="M599 462l-4 -18l-252 -171l163 -273h-142l-118 205l-24 -16l-47 -189h-120l168 676h120l-91 -364l213 150h134z" />
+<glyph unicode="&#x1d661;" horiz-adv-x="235" d="M348 676l-168 -676h-125l155 625l121 51h17z" />
+<glyph unicode="&#x1d662;" horiz-adv-x="776" d="M530 412h1q78 61 160 61q118 0 118 -95q0 -23 -8 -55l-80 -323h-118l77 310q3 14 3 25q0 44 -52 44q-25 0 -55 -20.5t-56 -64.5l-73 -294h-118l77 310q3 14 3 25q0 44 -52 44q-23 0 -54 -21t-57 -64l-73 -294h-118l114 462h114l-12 -50h2q78 61 144 61q94 0 113 -61z" />
+<glyph unicode="&#x1d663;" horiz-adv-x="510" d="M273 412h2q78 61 148 61q119 0 119 -97q0 -25 -7 -53l-80 -323h-120l77 310q3 14 3 25q0 44 -52 44q-23 0 -56 -21t-59 -64l-73 -294h-120l114 462h116z" />
+<glyph unicode="&#x1d664;" horiz-adv-x="501" d="M542 298q0 -127 -92 -219.5t-204 -92.5q-78 0 -126 48t-48 127q0 131 93 221.5t206 90.5q78 0 124.5 -48t46.5 -127zM417 295q0 83 -76 83q-59 0 -100.5 -65.5t-41.5 -142.5q0 -89 71 -89q40 0 71 27t46 65.5t22.5 70t7.5 51.5z" />
+<glyph unicode="&#x1d665;" horiz-adv-x="512" d="M274 416h2q68 57 147 57q63 0 99.5 -39t36.5 -105q0 -140 -88 -241.5t-202 -101.5q-52 0 -88 41l-48 -195l-113 -37h-17l166 667h116zM247 291l-35 -141q13 -38 28.5 -53.5t46.5 -15.5q60 0 101.5 74.5t41.5 149.5q0 74 -63 74t-120 -88z" />
+<glyph unicode="&#x1d666;" horiz-adv-x="512" d="M574 473l-159 -641l-113 -37h-17l58 231l-2 1q-52 -41 -127 -41q-69 0 -107 43t-38 113q0 130 89.5 230.5t202.5 100.5q64 0 96 -39l100 39h17zM376 158l39 158q-27 62 -76 62q-48 0 -95 -61t-47 -153q0 -39 17 -61t49 -22q61 0 113 77z" />
+<glyph unicode="&#x1d667;" horiz-adv-x="411" d="M519 455l-25 -98h-16q-15 22 -53 22q-48 0 -107 -54t-96 -136l-47 -189h-120l114 462h120l-22 -88h2q45 52 92.5 75.5t85.5 23.5q49 0 72 -18z" />
+<glyph unicode="&#x1d668;" horiz-adv-x="385" d="M442 412l-26 -106h-15q-26 72 -107 72q-29 0 -44 -16t-15 -30q0 -17 14 -29t41 -25q60 -28 82.5 -50.5t22.5 -54.5q0 -77 -62 -131.5t-159 -54.5q-50 0 -78 14t-59 49l30 120h15q8 -43 44 -65.5t75 -22.5q25 0 46.5 15.5t21.5 38.5q0 12 -11 22t-42 25q-57 28 -80 53 t-23 58q0 72 55.5 125.5t144.5 53.5q49 0 78 -15t51 -46z" />
+<glyph unicode="&#x1d669;" horiz-adv-x="386" d="M447 462l-23 -95h-107l-54 -218q-4 -13 -4 -25q0 -41 45 -41q40 0 77 32h18l-34 -94q-45 -33 -124 -33q-47 0 -78 24.5t-31 72.5q0 22 5 41l60 241h-99l4 17l82 78h36l16 61l127 108h20l-43 -169h107z" />
+<glyph unicode="&#x1d66a;" horiz-adv-x="518" d="M569 462l-87 -352q-16 -67 -17 -100l-130 -25l17 70h-2q-79 -69 -160 -69q-109 0 -109 94q0 24 8 58l80 324h120l-77 -311q-3 -13 -3 -25q0 -45 52 -45q22 0 56 24.5t61 67.5l71 289h120z" />
+<glyph unicode="&#x1d66b;" horiz-adv-x="462" d="M561 462l-321 -476h-26l-85 476h130l23 -253h2l146 253h131z" />
+<glyph unicode="&#x1d66c;" horiz-adv-x="701" d="M798 462l-313 -476h-26l-46 253l-179 -253h-26l-77 476h130l19 -257h2l105 174l-15 83h131l26 -245h2l136 245h131z" />
+<glyph unicode="&#x1d66d;" horiz-adv-x="506" d="M582 462l-202 -223l106 -239h-138l-65 143l-125 -143h-138l219 244l-94 218h137l53 -121l109 121h138z" />
+<glyph unicode="&#x1d66e;" horiz-adv-x="472" d="M569 462l-303 -496q-55 -90 -107 -130t-120 -40q-44 0 -66 22l24 98h15q21 -25 53 -25q63 0 120 103l-53 468h131l25 -275h2l148 275h131z" />
+<glyph unicode="&#x1d66f;" horiz-adv-x="441" d="M530 462l-6 -26l-318 -341h234l-32 -95h-387l6 25l318 342h-207l31 95h361z" />
+<glyph unicode="&#x1d670;" horiz-adv-x="525" d="M496 40v-16q0 -10 -7 -17t-17 -7h-127q-10 0 -17 7t-7 17v16q0 10 7 17t17 7h31l-26 117h-178l-26 -117h32q10 0 17 -7t7 -17v-16q0 -10 -7 -17t-17 -7h-128q-10 0 -17 7t-7 17v16q0 10 7 17t17 7h36l130 585q2 10 10.5 17t19.5 7h30q11 0 19.5 -7t10.5 -17l130 -585h36 q10 0 17 -7t7 -17zM186 245h150q-74 336 -74 344h-1q0 -3 -75 -344z" />
+<glyph unicode="&#x1d671;" horiz-adv-x="525" d="M53 662h240q69 0 118 -49t49 -119q0 -50 -30 -90.5t-79 -57.5q56 -13 92.5 -59t36.5 -105q0 -76 -48.5 -129t-117.5 -53h-261q-10 0 -17 7t-7 17v16q0 10 7 17t17 7h43v534h-43q-10 0 -17 7t-7 17v16q0 10 7 17t17 7zM155 376h117q54 0 92 34.5t38 83.5q0 43 -32 73.5 t-77 30.5h-138v-222zM155 64h138q53 0 91 34.5t38 83.5q0 53 -35 91.5t-84 38.5h-148v-248z" />
+<glyph unicode="&#x1d672;" horiz-adv-x="525" d="M448 232h10q10 0 17 -7t7 -17q0 -89 -58 -154t-144 -65q-103 0 -171.5 101.5t-68.5 239.5t68.5 240t171.5 102q80 0 137 -65l15 48q5 17 23 17h3q10 0 17 -7t7 -17v-206q0 -10 -7 -17t-17 -7h-10q-10 0 -16.5 6.5t-7.5 15.5q-6 72 -42.5 120t-88.5 48q-78 0 -136.5 -80 t-58.5 -198q0 -117 59 -197t137 -80q55 0 92.5 45t37.5 110q0 10 7 17t17 7z" />
+<glyph unicode="&#x1d673;" horiz-adv-x="525" d="M49 662h222q88 0 150 -99t62 -238q0 -135 -62 -230t-150 -95h-222q-10 0 -17 7t-7 17v16q0 10 7 17t17 7h38v534h-38q-10 0 -17 7t-7 17v16q0 10 7 17t17 7zM146 64h110q70 0 119.5 76.5t49.5 184.5q0 113 -49.5 193t-119.5 80h-110v-534z" />
+<glyph unicode="&#x1d674;" horiz-adv-x="525" d="M500 150v-126q0 -10 -7 -17t-17 -7h-421q-10 0 -17 7t-7 17v16q0 10 7 17t17 7h46v534h-46q-10 0 -17 7t-7 17v16q0 10 7 17t17 7h400q10 0 17 -7t7 -17v-111q0 -10 -7 -17t-17 -7h-10q-10 0 -17 7t-7 17v71h-261v-223h141v32q0 10 7 17t17 7h10q10 0 17.5 -7t7.5 -17 v-129q0 -10 -7.5 -17t-17.5 -7h-10q-10 0 -17 7t-7 17v32h-141v-246h282v86q0 10 7 17t17 7h10q10 0 17 -7t7 -17z" />
+<glyph unicode="&#x1d675;" horiz-adv-x="525" d="M488 638v-111q0 -10 -7 -17t-17 -7h-10q-10 0 -17 7t-7 17v71h-264v-235h145v32q0 10 7 17t17 7h11q10 0 17 -7t7 -17v-129q0 -10 -7 -17t-17 -7h-11q-10 0 -17 7t-7 17v32h-145v-234h68q10 0 17 -7t7 -17v-16q0 -10 -7 -17t-17 -7h-176q-10 0 -17 7t-7 17v16q0 10 7 17 t17 7h49v534h-49q-10 0 -17 7t-7 17v16q0 10 7 17t17 7h406q10 0 17 -7t7 -17z" />
+<glyph unicode="&#x1d676;" horiz-adv-x="525" d="M495 282v-16q0 -10 -7 -17t-17 -7h-23v-218q0 -10 -7 -17t-17 -7h-10q-10 0 -17 7t-7 17v34q-50 -69 -130 -69q-96 0 -159.5 102t-63.5 239q0 138 63.5 240t159.5 102q74 0 124 -60l14 43q5 17 23 17h3q10 0 17 -7t7 -17v-206q0 -10 -7 -17t-17 -7h-10q-10 0 -16.5 6.5 t-7.5 15.5q-6 73 -38 120.5t-80 47.5q-69 0 -123 -80t-54 -198t53 -197.5t121 -79.5q53 0 83 52t36 137h-58q-10 0 -17 7t-7 17v16q0 10 7 17t17 7h141q10 0 17 -7t7 -17z" />
+<glyph unicode="&#x1d677;" horiz-adv-x="525" d="M496 40v-16q0 -10 -7 -17t-17 -7h-140q-10 0 -17 7t-7 17v16q0 10 7 17t17 7h41v248h-223v-248h41q10 0 17 -7t7 -17v-16q0 -10 -7 -17t-17 -7h-141q-10 0 -17 7t-7 17v16q0 10 7 17t17 7h41v534h-41q-10 0 -17 7t-7 17v16q0 10 7 17t17 7h141q10 0 17 -7t7 -17v-16 q0 -10 -7 -17t-17 -7h-41v-222h223v222h-41q-10 0 -17 7t-7 17v16q0 10 7 17t17 7h140q10 0 17 -7t7 -17v-16q0 -10 -7 -17t-17 -7h-41v-534h41q10 0 17 -7t7 -17z" />
+<glyph unicode="&#x1d678;" horiz-adv-x="525" d="M438 40v-16q0 -10 -7 -17t-17 -7h-306q-10 0 -17 7t-7 17v16q0 10 7 17t17 7h123l1 534h-124q-10 0 -17 7t-7 17v16q0 10 7 17t17 7h306q10 0 17 -7t7 -17v-16q0 -10 -7 -17t-17 -7h-123l-1 -534h124q10 0 17 -7t7 -17z" />
+<glyph unicode="&#x1d679;" horiz-adv-x="525" d="M476 638v-16q0 -10 -7 -17t-17 -7h-46v-459q0 -63 -47.5 -106.5t-112.5 -43.5q-62 0 -111.5 31.5t-49.5 89.5q0 18 11.5 27.5t26.5 9.5q14 0 25.5 -10t11.5 -27q0 -13 -8 -23q24 -34 94 -34q43 0 72.5 26t29.5 60v459h-99q-10 0 -17 7t-7 17v16q0 10 7 17t17 7h203 q10 0 17 -7t7 -17z" />
+<glyph unicode="&#x1d67a;" horiz-adv-x="525" d="M494 40v-16q0 -10 -7 -17t-17 -7h-101q-10 0 -17 7t-7 17v16q0 10 7 17t17 7h15l-145 283l-98 -135v-148h38q10 0 17 -7t7 -17v-16q0 -10 -7 -17t-17 -7h-125q-10 0 -17 7t-7 17v16q0 10 7 17t17 7h38v534h-38q-10 0 -17 7t-7 17v16q0 10 7 17t17 7h125q10 0 17 -7t7 -17 v-16q0 -10 -7 -17t-17 -7h-38v-304l222 304h-16q-11 0 -17.5 7t-6.5 17v16q0 10 7 17t17 7h112q10 0 17.5 -7t7.5 -17v-16q0 -10 -7 -17t-18 -7h-37l-151 -207l167 -327h32q10 0 17 -7t7 -17z" />
+<glyph unicode="&#x1d67b;" horiz-adv-x="525" d="M487 150v-126q0 -10 -7 -17t-17 -7h-402q-10 0 -17 7t-7 17v16q0 10 7 17t17 7h53v534h-53q-11 0 -17.5 7t-6.5 17v16q0 10 7 17t17 7h183q10 0 17 -7t7 -17v-16q0 -10 -7 -17t-17 -7h-72v-534h257v86q0 10 7 17t17 7h10q10 0 17 -7t7 -17z" />
+<glyph unicode="&#x1d67c;" horiz-adv-x="525" d="M501 40v-16q0 -10 -7 -17t-17 -7h-106q-10 0 -17 7t-7 17v16q0 10 7 17t17 7h29v526h-1q0 -14 -106 -346q-7 -24 -32 -24t-32 24q-105 329 -105 346h-1v-526h28q10 0 17 -7t7 -17v-16q0 -10 -7 -17t-17 -7h-105q-10 0 -17.5 7t-7.5 17v16q0 10 7.5 17t17.5 7h28v534h-28 q-11 0 -18 7t-7 17v16q0 10 7.5 17t17.5 7h75q26 0 33 -24q107 -335 107 -346h1q0 14 106 346q7 24 33 24h76q10 0 17 -7t7 -17v-16q0 -10 -7 -17t-17 -7h-29v-534h29q10 0 17 -7t7 -17z" />
+<glyph unicode="&#x1d67d;" horiz-adv-x="525" d="M491 638v-16q0 -10 -7 -17t-17 -7h-41v-574q0 -10 -7 -17t-17 -7h-23q-25 0 -34 24l-200 570v-530h41q10 0 17 -7t7 -17v-16q0 -10 -7 -17t-17 -7h-131q-10 0 -17 7t-7 17v16q0 10 7 17t17 7h41v534h-41q-10 0 -17 7t-7 17v16q0 10 7 17t17 7h88q25 0 34 -24l201 -570 v530h-41q-11 0 -17.5 7t-6.5 17v16q0 10 7 17t17 7h130q10 0 17 -7t7 -17z" />
+<glyph unicode="&#x1d67e;" horiz-adv-x="525" d="M466 330q0 -84 -2 -133.5t-10.5 -92t-20 -62t-37 -33.5t-55 -17t-80.5 -3t-80.5 3t-55 17t-37 33.5t-20 62t-10.5 92t-2 133.5q0 85 2 134t10.5 92t20 62.5t37 33.5t55 17t80.5 3t80.5 -3t55 -17t37 -33.5t20 -62.5t10.5 -92t2 -134zM408 344q0 56 -1.5 90.5t-4 66.5 t-10 48.5t-17 30t-27 18.5t-37 7.5t-50.5 2.5t-50 -2.5t-36.5 -7.5t-27 -18.5t-17 -30t-10 -48.5t-4 -66.5t-1.5 -90.5q0 -62 1.5 -100t4 -73t10 -53t17 -33t27 -21t36.5 -8.5t50 -2.5q36 0 57.5 2.5t40 15t26.5 28.5t14 52.5t7.5 78.5t1.5 114z" />
+<glyph unicode="&#x1d67f;" horiz-adv-x="525" d="M55 662h239q77 0 131 -57.5t54 -139.5t-54 -140.5t-131 -58.5h-134v-202h46q10 0 17 -7t7 -17v-16q0 -10 -7 -17t-17 -7h-151q-10 0 -17 7t-7 17v16q0 10 7 17t17 7h46v534h-46q-10 0 -17 7t-7 17v16q0 10 7 17t17 7zM160 330h119q59 0 100.5 39.5t41.5 95.5q0 55 -42 94 t-100 39h-119v-268z" />
+<glyph unicode="&#x1d680;" horiz-adv-x="525" d="M390 -127l-63 118q-38 -2 -66 -2q-51 0 -80.5 3t-55 17t-37 33.5t-20 62t-10.5 92t-2 133.5q0 85 2 134t10.5 92t20 62.5t37 33.5t55 17t80.5 3t80.5 -3t55 -17t37 -33.5t20 -62.5t10.5 -92t2 -134q0 -169 -14 -235.5t-61 -88.5l63 -121l1 -7q0 -7 -4.5 -12t-11.5 -5h-29 q-13 0 -20 12zM301 179l57 -110q31 19 40.5 73t9.5 188q0 69 -1.5 109t-7.5 74.5t-14 50.5t-26.5 27.5t-40 14t-57.5 2.5t-57 -2.5t-39.5 -14t-26.5 -27.5t-14 -50.5t-7.5 -74.5t-1.5 -109q0 -59 1.5 -95t4 -69.5t10 -51t17 -31.5t27 -19.5t36.5 -8t50 -2.5l33 1l-57 107 l-2 7q0 7 5 12t12 5h39q6 0 10 -6z" />
+<glyph unicode="&#x1d681;" horiz-adv-x="525" d="M486 125h10q10 0 17 -7t7 -17q0 -112 -82 -112q-30 0 -49.5 11t-28 33t-11 42.5t-2.5 50.5v82q0 37 -31 63.5t-75 26.5h-91v-234h41q10 0 17 -7t7 -17v-16q0 -10 -7 -17t-17 -7h-141q-10 0 -17 7t-7 17v16q0 10 7 17t17 7h41v534h-41q-10 0 -17 7t-7 17v16q0 10 7 17 t17 7h191q79 0 135 -53t56 -128q0 -48 -23.5 -88t-63.5 -65q60 -47 60 -120v-82q0 -34 4.5 -50.5t10 -19.5t18.5 -3q24 0 24 48q0 10 7 17t17 7zM150 363h84q58 0 99 34.5t41 83.5q0 48 -41 82.5t-99 34.5h-84v-235z" />
+<glyph unicode="&#x1d682;" horiz-adv-x="525" d="M203 389l128 -33q62 -16 100.5 -66.5t38.5 -114.5q0 -77 -53.5 -131.5t-129.5 -54.5q-110 0 -175 59l-9 -40q-5 -19 -24 -19h-3q-10 0 -17 7t-7 17v182q0 10 7 17t17 7h10q10 0 17 -7t7 -17q0 -68 47 -105t130 -37q50 0 86 36.5t36 88.5q0 44 -26 78t-67 44l-128 32 q-59 14 -97.5 60.5t-38.5 106.5q0 72 54 122.5t129 50.5q93 0 149 -59l9 40q5 19 24 19h3q10 0 17 -7t7 -17v-182q0 -10 -7 -17t-17 -7h-10q-22 0 -24 22q-8 69 -46.5 106.5t-104.5 37.5q-51 0 -86 -33t-35 -79q0 -37 25 -67t64 -40z" />
+<glyph unicode="&#x1d683;" horiz-adv-x="525" d="M496 638v-111q0 -10 -7 -17t-17 -7h-10q-10 0 -17 7t-7 17v71h-148v-534h68q10 0 17 -7t7 -17v-16q0 -10 -7 -17t-17 -7h-194q-10 0 -17 7t-7 17v16q0 10 7 17t17 7h68v534h-148v-71q0 -10 -7 -17t-17 -7h-10q-10 0 -17 7t-7 17v111q0 10 7 17t17 7h422q10 0 17 -7t7 -17 z" />
+<glyph unicode="&#x1d684;" horiz-adv-x="525" d="M514 638v-16q0 -10 -7 -17t-17 -7h-47v-378q0 -93 -52 -162t-130 -69t-130 69t-52 162v378h-46q-10 0 -17 7t-7 17v16q0 10 7 17t17 7h151q10 0 17 -7t7 -17v-16q0 -10 -7 -17t-17 -7h-46v-378q0 -71 37 -119t86 -48t86.5 48t37.5 119v378h-47q-10 0 -17 7t-7 17v16 q0 10 7 17t17 7h152q10 0 17 -7t7 -17z" />
+<glyph unicode="&#x1d685;" horiz-adv-x="525" d="M506 638v-16q0 -10 -7 -17t-17 -7h-34l-141 -582q-2 -10 -11 -17t-20 -7h-30q-11 0 -19.5 7t-10.5 17l-141 582h-34q-11 0 -17.5 7t-6.5 17v16q0 10 7 17t17 7h124q10 0 17 -7t7 -17v-16q0 -10 -7 -17t-17 -7h-31q127 -521 127 -526h1q0 9 126 526h-31q-10 0 -17 7t-7 17 v16q0 10 7 17t17 7h125q10 0 17 -7t7 -17z" />
+<glyph unicode="&#x1d686;" horiz-adv-x="525" d="M512 638v-16q0 -10 -7 -17t-17 -7h-14l-76 -582q-1 -10 -9 -17t-19 -7h-13q-11 0 -19.5 7t-10.5 17q-65 304 -65 310h-1q0 -14 -66 -310q-5 -24 -30 -24h-13q-11 0 -19 7t-9 17l-75 582h-14q-11 0 -17.5 7t-6.5 17v16q0 10 7 17t17 7h103q10 0 17 -7t7 -17v-16 q0 -10 -7 -17t-17 -7h-41q66 -495 66 -526h1q0 24 60 302q5 24 30 24h15q11 0 19.5 -7t10.5 -17q60 -291 60 -302h1q0 19 65 526h-41q-10 0 -17 7t-7 17v16q0 10 7 17t17 7h104q10 0 17 -7t7 -17z" />
+<glyph unicode="&#x1d687;" horiz-adv-x="525" d="M497 40v-16q0 -10 -7 -17t-17 -7h-125q-10 0 -17 7t-7 17v16q0 10 7 17t17 7h19l-111 226l-103 -226h20q10 0 17 -7t7 -17v-16q0 -10 -7 -17t-17 -7h-125q-10 0 -17 7t-7 17v16q0 10 7 17t17 7h42l137 288l-125 246h-43q-10 0 -17 7t-7 17v16q0 10 7 17t17 7h125 q10 0 17 -7t7 -17v-16q0 -10 -7 -17t-17 -7h-18l90 -177l83 177h-20q-10 0 -17 7t-7 17v16q0 10 7 17t17 7h125q10 0 17 -7t7 -17v-16q0 -10 -7 -17t-17 -7h-41l-118 -246l146 -288h42q10 0 17 -7t7 -17z" />
+<glyph unicode="&#x1d688;" horiz-adv-x="525" d="M507 638v-16q0 -10 -7 -17t-17 -7h-41l-152 -334v-200h41q10 0 17 -7t7 -17v-16q0 -10 -7 -17t-17 -7h-140q-10 0 -17 7t-7 17v16q0 10 7 17t17 7h41v200l-152 334h-40q-11 0 -18 7t-7 17v16q0 10 7.5 17t17.5 7h124q10 0 17.5 -7t7.5 -17v-16q0 -10 -7 -17t-18 -7h-20 q117 -258 117 -260h1q0 4 116 260h-20q-10 0 -17 7t-7 17v16q0 10 7 17t17 7h125q10 0 17 -7t7 -17z" />
+<glyph unicode="&#x1d689;" horiz-adv-x="525" d="M479 153v-129q0 -10 -7 -17t-17 -7h-384q-10 0 -17 7t-7 17v19q0 8 4 12l345 543h-278v-71q0 -10 -7.5 -17t-17.5 -7h-10q-10 0 -17 7t-7 17v111q0 10 7 17t17 7h368q10 0 17 -7t7 -17v-19q0 -7 -3 -12l-345 -543h294v89q0 10 7 17t17 7h10q10 0 17 -7t7 -17z" />
+<glyph unicode="&#x1d68a;" horiz-adv-x="525" d="M516 127v-34q0 -40 -28.5 -68t-68.5 -28q-46 0 -63 49q-61 -52 -162 -52q-58 0 -97 43.5t-39 102.5q0 77 79 117.5t212 44.5v15q0 29 -33 53.5t-84 24.5q-52 0 -72 -3h-1q-1 -17 -12.5 -26.5t-24.5 -9.5q-15 0 -26.5 9.5t-11.5 27.5q0 66 126 66h22q70 0 122.5 -40.5 t52.5 -101.5v-233q0 -10 7 -17t18 -7q10 0 18 9t8 24v34q0 10 7 17t17 7h10q10 0 17 -7t7 -17zM349 138v110q-117 -4 -174.5 -33.5t-57.5 -74.5q0 -34 29 -58t72 -24q57 0 94 22.5t37 57.5z" />
+<glyph unicode="&#x1d68b;" horiz-adv-x="525" d="M160 585v-183q59 54 146 54q75 0 125 -69t50 -162t-55 -162t-135 -69q-79 0 -131 62v-32q0 -10 -7 -17t-17 -7h-10q-10 0 -17.5 7t-7.5 17v520h-60q-10 0 -17 7.5t-7 17.5v16q0 10 7 17t17 7h95q10 0 17 -7t7 -17zM160 310v-141q9 -48 42 -79.5t75 -31.5q59 0 102.5 48.5 t43.5 118.5q0 71 -40.5 119t-95.5 48q-47 0 -82 -23t-45 -59z" />
+<glyph unicode="&#x1d68c;" horiz-adv-x="525" d="M464 131l-1 -7q-16 -59 -62 -94.5t-111 -35.5q-89 0 -150.5 68t-61.5 163q0 96 61.5 165t150.5 69h26q137 0 137 -65q0 -17 -11.5 -27t-25.5 -10t-25 9t-12 25l-7 1q-23 3 -82 3q-63 0 -108.5 -49.5t-45.5 -120.5q0 -69 51 -118t123 -49q73 0 97 79q4 18 23 18h10 q10 0 17 -7t7 -17z" />
+<glyph unicode="&#x1d68d;" horiz-adv-x="525" d="M505 40v-16q0 -10 -7 -17t-17 -7h-94q-10 0 -17 7t-7 17v36q-58 -66 -143 -66q-77 0 -128 69t-51 162q0 94 54 162.5t133 68.5q80 0 135 -52v140h-61q-10 0 -17 7.5t-7 17.5v16q0 10 7 17t17 7h95q10 0 17 -7t7 -17v-521h60q10 0 17 -7t7 -17zM363 170v141 q-10 35 -42.5 58t-75.5 23q-59 0 -102.5 -48.5t-43.5 -118.5q0 -71 40.5 -119t95.5 -48q46 0 81.5 31.5t46.5 80.5z" />
+<glyph unicode="&#x1d68e;" horiz-adv-x="525" d="M462 131l-1 -7q-17 -59 -67 -94.5t-111 -35.5q-93 0 -158 68.5t-65 164.5q0 95 60.5 163.5t147.5 68.5q91 0 142.5 -52.5t51.5 -144.5q0 -10 -7 -17t-17 -7h-319l-1 -11q0 -69 54.5 -119t132.5 -50q34 0 61.5 22t38.5 57q5 18 23 18h10q10 0 17 -7t7 -17zM132 296h269 q-17 99 -133 99q-44 0 -81 -27t-55 -72z" />
+<glyph unicode="&#x1d68f;" horiz-adv-x="525" d="M189 450v47q0 53 51.5 85.5t117.5 32.5q79 0 79 -52q0 -17 -11 -26.5t-25 -9.5q-25 0 -33 23h-33q-40 0 -64 -17t-24 -36v-47h144q10 0 17 -7t7 -17v-16q0 -10 -7 -17t-17 -7h-144v-322h117q10 0 17 -7t7 -17v-16q0 -10 -7 -17t-17 -7h-292q-10 0 -17 7t-7 17v16 q0 10 7 17t17 7h117v322h-123q-10 0 -17 7t-7 17v16q0 10 7 17t17 7h123z" />
+<glyph unicode="&#x1d690;" horiz-adv-x="525" d="M196 65h65q232 0 232 -145q0 -66 -70 -107t-162 -41t-162 41t-70 107q0 41 21 75.5t56 54.5q-23 31 -23 70q0 38 22 72q-33 42 -33 99q0 68 47 116.5t113 48.5q54 0 96 -33q49 38 113 38q67 0 67 -47q0 -15 -10.5 -24.5t-22.5 -9.5q-18 0 -29 17h-5q-40 0 -76 -15 q27 -41 27 -91q0 -68 -46.5 -116t-113.5 -48q-51 0 -91 29q-8 -15 -8 -34q0 -39 31 -53l18 1q7 0 14 -5zM333 291q0 45 -29.5 76.5t-71.5 31.5t-71.5 -31.5t-29.5 -76.5t29.5 -76t71.5 -31t71.5 31t29.5 76zM261 13h-79q-42 0 -70.5 -27.5t-28.5 -65.5q0 -33 49.5 -62 t128.5 -29t128.5 29t49.5 62q0 46 -39.5 69.5t-138.5 23.5z" />
+<glyph unicode="&#x1d691;" horiz-adv-x="525" d="M505 40v-16q0 -10 -7 -17t-17 -7h-179q-10 0 -17 7t-7 17v16q0 10 7 17t17 7h61v261q0 35 -20 51t-70 16q-47 0 -80 -31t-33 -75v-222h60q10 0 17 -7t7 -17v-16q0 -10 -7 -17t-17 -7h-179q-10 0 -17 7t-7 17v16q0 10 7 17t17 7h60v480h-60q-10 0 -17 7.5t-7 17.5v16 q0 10 7 17t17 7h95q10 0 17 -7t7 -17v-182q53 53 130 53q131 0 131 -131v-261h60q10 0 17 -7t7 -17z" />
+<glyph unicode="&#x1d692;" horiz-adv-x="525" d="M304 569q0 -17 -12 -29.5t-29 -12.5q-18 0 -30 12.5t-12 29.5t12 29t30 12q17 0 29 -12t12 -29zM448 40v-16q0 -10 -7 -17t-17 -7h-316q-10 0 -17 7t-7 17v16q0 10 7 17t17 7h137v322h-129q-10 0 -17 7t-7 17v16q0 10 7 17t17 7h163q10 0 17 -7t7 -17v-362h121 q10 0 17 -7t7 -17z" />
+<glyph unicode="&#x1d693;" horiz-adv-x="525" d="M362 569q0 -17 -12 -29.5t-29 -12.5q-18 0 -30 12.5t-12 29.5t12 29t30 12q17 0 29 -12t12 -29zM361 426v-476q0 -72 -51 -124.5t-123 -52.5h-19q-121 0 -121 70q0 17 11.5 27t25.5 10t25.5 -10t11.5 -27v-2h4q21 -4 77 -4q41 0 71 33t30 80v436h-145q-10 0 -17 7t-7 17 v16q0 10 7 17t17 7h179q10 0 17 -7t7 -17z" />
+<glyph unicode="&#x1d694;" horiz-adv-x="525" d="M505 40v-16q0 -10 -7 -17t-17 -7h-142q-10 0 -17 7t-7 17v16q0 10 7 17t17 7h30l-129 179l-78 -70v-109h65q10 0 17 -7t7 -17v-16q0 -10 -7 -17t-17 -7h-178q-10 0 -17.5 7t-7.5 17v16q0 10 7.5 17t17.5 7h65v480h-65q-11 0 -18 7t-7 18v16q0 10 7.5 17t17.5 7h89 q10 0 17 -7t7 -17v-347l164 148h-44q-10 0 -17 7t-7 17v16q0 10 7 17t17 7h178q10 0 17 -7t7 -17v-16q0 -10 -7 -17t-17 -7h-62l-122 -110l153 -212h52q10 0 17 -7t7 -17z" />
+<glyph unicode="&#x1d695;" horiz-adv-x="525" d="M459 40v-16q0 -10 -7 -17t-17 -7h-348q-10 0 -17 7t-7 17v16q0 10 7 17t17 7h145v480h-145q-10 0 -17 7.5t-7 17.5v16q0 10 7 17t17 7h179q10 0 17 -7t7 -17v-521h145q10 0 17 -7t7 -17z" />
+<glyph unicode="&#x1d696;" horiz-adv-x="525" d="M520 40v-16q0 -10 -7 -17t-17 -7h-112q-10 0 -17 7t-7 17v16q0 10 7 17t17 7h32v261q0 38 -12.5 52.5t-41.5 14.5q-32 0 -54.5 -30.5t-22.5 -75.5v-222h33q10 0 17 -7t7 -17v-16q0 -10 -7 -17t-17 -7h-113q-10 0 -17 7t-7 17v16q0 10 7 17t17 7h32v261q0 38 -12.5 52.5 t-41.5 14.5q-32 0 -54.5 -30.5t-22.5 -75.5v-222h33q10 0 17 -7t7 -17v-16q0 -10 -7 -17t-17 -7h-113q-10 0 -17 7t-7 17v16q0 10 7 17t17 7h32v322h-32q-10 0 -17 7t-7 17v16q0 10 7 17t17 7h56q10 0 17 -7t7 -17v-9q37 39 90 39q58 0 77 -53q41 53 102 53q89 0 89 -131 v-261h32q10 0 17 -7t7 -17z" />
+<glyph unicode="&#x1d697;" horiz-adv-x="525" d="M505 40v-16q0 -10 -7 -17t-17 -7h-179q-10 0 -17 7t-7 17v16q0 10 7 17t17 7h61v261q0 35 -20 51t-70 16q-47 0 -80 -31t-33 -75v-222h60q10 0 17 -7t7 -17v-16q0 -10 -7 -17t-17 -7h-179q-10 0 -17 7t-7 17v16q0 10 7 17t17 7h60v322h-60q-10 0 -17 7t-7 17v16 q0 10 7 17t17 7h95q10 0 17 -7t7 -17v-23q53 53 130 53q131 0 131 -131v-261h60q10 0 17 -7t7 -17z" />
+<glyph unicode="&#x1d698;" horiz-adv-x="525" d="M460 225q0 -96 -58 -163.5t-141 -67.5t-141 67.5t-58 163.5q0 97 58.5 165.5t140.5 68.5t140.5 -68.5t58.5 -165.5zM402 234q0 67 -41.5 114t-99.5 47t-99.5 -47t-41.5 -114q0 -73 41.5 -124.5t99.5 -51.5t99.5 51.5t41.5 124.5z" />
+<glyph unicode="&#x1d699;" horiz-adv-x="525" d="M160 426v-24q59 54 146 54q75 0 125 -69t50 -162t-55 -162t-135 -69q-79 0 -131 62v-213h60q10 0 17 -7t7 -17v-16q0 -10 -7 -17t-17 -7h-179q-10 0 -17 7t-7 17v16q0 10 7 17t17 7h60v543h-60q-10 0 -17 7t-7 17v16q0 10 7 17t17 7h95q10 0 17 -7t7 -17zM160 310v-141 q9 -48 42 -79.5t75 -31.5q59 0 102.5 48.5t43.5 118.5q0 71 -40.5 119t-95.5 48q-47 0 -82 -23t-45 -59z" />
+<glyph unicode="&#x1d69a;" horiz-adv-x="525" d="M530 -181v-16q0 -10 -7 -17t-17 -7h-188q-10 0 -17 7t-7 17v16q0 10 7 17t17 7h65v226q-60 -75 -149 -75q-80 0 -134.5 69t-54.5 162q0 94 57.5 162.5t140.5 68.5t140 -62v38q0 10 7 17t17 7h10q10 0 17 -7t7 -17v-589h65q10 0 17 -7t7 -17zM383 189v95q-8 46 -43 77 t-82 31q-64 0 -109.5 -48.5t-45.5 -118.5t43 -118.5t101 -48.5q50 0 87.5 37t48.5 94z" />
+<glyph unicode="&#x1d69b;" horiz-adv-x="525" d="M392 456h8q85 0 85 -54q0 -16 -11 -25.5t-24 -9.5q-26 0 -34 24l-24 1q-73 0 -124.5 -45t-51.5 -109v-174h127q10 0 17 -7t7 -17v-16q0 -10 -7 -17t-17 -7h-282q-10 0 -17 7t-7 17v16q0 10 7 17t17 7h97v322h-97q-10 0 -17 7t-7 17v16q0 10 7 17t17 7h131q10 0 17 -7 t7 -17v-52q68 82 176 82z" />
+<glyph unicode="&#x1d69c;" horiz-adv-x="525" d="M220 274l92 -16q58 -10 101.5 -42.5t43.5 -87.5q0 -66 -53 -100t-139 -34q-81 0 -133 50l-10 -33q-3 -17 -23 -17h-3q-10 0 -17 7t-7 17v144q0 10 7 17t17 7h10q19 0 24 -19q26 -109 135 -109q69 0 101.5 21t32.5 55q0 27 -26 46t-71 27l-90 16q-34 6 -62.5 17t-53 37 t-24.5 62q0 60 53.5 90t139.5 30q64 0 108 -29l5 13q5 16 23 16h3q10 0 17 -7t7 -17v-115q0 -10 -7 -17t-17 -7h-10q-10 0 -17.5 7t-7.5 17q0 75 -107 75q-69 0 -100.5 -18t-31.5 -44q0 -43 90 -59z" />
+<glyph unicode="&#x1d69d;" horiz-adv-x="525" d="M448 173v-42q0 -61 -50 -99t-114 -38q-59 0 -92.5 37t-33.5 100v255h-109q-10 0 -17 7t-7 17v16q0 10 7 17t17 7h109v105q0 11 7 18t17 7h10q10 0 17 -7.5t7 -17.5v-105h185q10 0 17 -7t7 -17v-16q0 -10 -7 -17t-17 -7h-185v-255q0 -73 87 -73q36 0 61.5 21.5t25.5 51.5 v42q0 10 7 17t17 7h10q10 0 17 -7t7 -17z" />
+<glyph unicode="&#x1d69e;" horiz-adv-x="525" d="M505 40v-16q0 -10 -7 -17t-17 -7h-94q-10 0 -17 7t-7 17v26q-54 -56 -131 -56q-131 0 -131 137v255h-60q-10 0 -17 7t-7 17v16q0 10 7 17t17 7h95q10 0 17 -7t7 -17v-295q0 -39 19.5 -56t68.5 -17q47 0 81 34t34 83v211h-61q-10 0 -17 7t-7 17v16q0 10 7 17t17 7h95 q10 0 17 -7t7 -17v-362h60q10 0 17 -7t7 -17z" />
+<glyph unicode="&#x1d69f;" horiz-adv-x="525" d="M500 426v-16q0 -10 -7 -17t-17 -7h-48l-122 -366q-9 -24 -33 -24h-24q-24 0 -33 24l-122 366h-48q-10 0 -17 7t-7 17v16q0 10 7 17t17 7h141q10 0 17 -7t7 -17v-16q0 -10 -7 -17t-17 -7h-42l116 -349l116 349h-41q-10 0 -17.5 7t-7.5 17v16q0 10 7.5 17t17.5 7h140 q10 0 17 -7t7 -17z" />
+<glyph unicode="&#x1d6a0;" horiz-adv-x="525" d="M508 426v-16q0 -10 -7 -17t-17 -7h-28l-64 -366q-1 -10 -9.5 -17t-19.5 -7h-19q-25 0 -32 24q-43 149 -43 178h-1q0 -29 -43 -178q-7 -24 -32 -24h-34q-11 0 -19 7t-9 17l-64 366h-28q-10 0 -17 7t-7 17v16q0 10 7 17t17 7h143q10 0 17 -7t7 -17v-16q0 -10 -7 -17t-17 -7 h-66l57 -326l53 186q7 24 32 24h21q25 0 32 -24q44 -150 44 -174h1q0 20 51 314h-67q-10 0 -17 7t-7 17v16q0 10 7 17t17 7h144q10 0 17 -7t7 -17z" />
+<glyph unicode="&#x1d6a1;" horiz-adv-x="525" d="M498 40v-16q0 -10 -7 -17t-17 -7h-141q-10 0 -17 7t-7 17v16q0 10 7 17t17 7h22l-97 135l-93 -135h23q10 0 17 -7t7 -17v-16q0 -10 -7 -17t-17 -7h-141q-10 0 -17 7t-7 17v16q0 10 7 17t17 7h62l126 168l-120 154h-62q-10 0 -17 7t-7 17v16q0 10 7 17t17 7h141 q10 0 17 -7t7 -17v-16q0 -10 -7 -17t-17 -7h-20l84 -113l83 113h-22q-10 0 -17 7t-7 17v16q0 10 7 17t17 7h141q10 0 17 -7t7 -17v-16q0 -10 -7 -17t-17 -7h-62l-116 -154l130 -168h62q10 0 17 -7t7 -17z" />
+<glyph unicode="&#x1d6a2;" horiz-adv-x="525" d="M501 426v-16q0 -10 -7 -17t-17 -7h-48l-156 -464q-21 -65 -58 -107t-90 -42q-34 0 -58 21.5t-24 53.5q0 17 10.5 26.5t25.5 9.5t25.5 -9.5t10.5 -26.5l-1 -10l11 -1q34 0 59.5 24t37.5 61l26 78l-149 386h-50q-10 0 -17.5 7t-7.5 17v16q0 10 7.5 17t17.5 7h140 q10 0 17 -7t7 -17v-16q0 -10 -7 -17t-17 -7h-39l122 -315l106 315h-42q-10 0 -17 7t-7 17v16q0 10 7 17t17 7h141q10 0 17 -7t7 -17z" />
+<glyph unicode="&#x1d6a3;" horiz-adv-x="525" d="M473 119v-95q0 -10 -7 -17t-17 -7h-393q-10 0 -17 7t-7 17v19q0 11 8 17l332 326h-265v-43q0 -11 -7 -18t-17 -7h-10q-10 0 -17 7.5t-7 17.5v83q0 10 7 17t17 7h373q10 0 17 -7t7 -17v-19q0 -10 -7 -17l-333 -326h285v55q0 10 7 17t17 7h10q10 0 17 -7t7 -17z" />
+<glyph unicode="&#x1d6a4;" horiz-adv-x="278" d="M221 115l14 -12q-41 -63 -71 -88.5t-67 -25.5q-50 0 -50 57q0 20 24 110l48 175q9 34 9 45q0 15 -11 19t-52 5v16q44 3 159 25l5 -3l-96 -342q-9 -34 -9 -45q0 -15 16 -15q12 0 30 17.5t51 61.5z" />
+<glyph unicode="&#x1d6a5;" horiz-adv-x="278" d="M246 438l-104 -410q-31 -121 -76.5 -178t-110.5 -57q-35 0 -57 17t-22 44q0 18 12 31t29 13q39 0 39 -37q0 -12 -6 -19.5t-6 -14.5q0 -12 18 -12q30 0 50.5 39t46.5 143l72 292q16 65 16 80q0 17 -10.5 24t-37.5 7h-26v16q45 3 169 25z" />
+<glyph unicode="&#x1d6a8;" horiz-adv-x="735" d="M689 0h-322v25l32 3q25 2 35.5 9.5t10.5 23.5q0 29 -46 136h-225l-13 -34q-31 -80 -31 -97q0 -19 18.5 -28.5t62.5 -12.5v-25h-202v25q35 6 53 28t46 92l221 545h28l222 -522q38 -90 58.5 -116.5t51.5 -26.5v-25zM384 236l-101 243l-94 -243h195z" />
+<glyph unicode="&#x1d6a9;" horiz-adv-x="667" d="M426 365v-1q85 -11 139 -58.5t54 -117.5q0 -83 -72 -135.5t-202 -52.5h-329v25q55 6 71.5 21t16.5 57v467q0 44 -18.5 60.5t-69.5 20.5v25h317q121 0 186.5 -41.5t65.5 -118.5q0 -59 -37 -96.5t-122 -54.5zM264 592v-219q91 0 123.5 30t32.5 106q0 137 -99 137 q-30 0 -43.5 -12.5t-13.5 -41.5zM264 343v-245q0 -36 15 -51t48 -15q58 0 89 40t31 116q0 155 -157 155h-26z" />
+<glyph unicode="&#x1d6aa;" horiz-adv-x="620" d="M593 474h-24q-9 54 -24 85q-10 21 -36 44q-45 39 -173 39q-40 0 -56 -14q-14 -12 -14 -37v-490q0 -47 24 -60q22 -13 86 -16v-25h-360v25q57 6 74 23q14 16 14 55v472q0 45 -21 60q-20 13 -67 16v25h577v-202z" />
+<glyph unicode="&#x1d6ab;" horiz-adv-x="691" d="M656 0h-640l296 690h28zM431 120l-165 359l-155 -359h320z" />
+<glyph unicode="&#x1d6ac;" horiz-adv-x="679" d="M641 208l-40 -208h-585v25q54 6 71 21t17 55v479q0 38 -18 53t-70 18v25h577v-201h-25q-17 100 -65.5 133.5t-171.5 33.5q-38 0 -51.5 -12t-13.5 -42v-225q81 1 117 32.5t45 116.5h26v-338h-26q-7 88 -43 121.5t-119 33.5v-242q0 -32 17.5 -44t65.5 -12q117 0 182 54 q25 20 42 46t40 77h28z" />
+<glyph unicode="&#x1d6ad;" horiz-adv-x="693" d="M634 242l-27 -242h-579v16l382 625l-83 -3q-62 -2 -96.5 -8.5t-63.5 -25t-46 -49.5t-34 -86h-28l22 207h523v-16l-379 -625h83q145 0 202 40q27 19 45 45t26.5 47t26.5 75h26z" />
+<glyph unicode="&#x1d6ae;" horiz-adv-x="810" d="M759 0h-339v25q54 6 71.5 20.5t17.5 52.5v228h-241v-228q0 -40 17 -53.5t72 -19.5v-25h-336v25q53 7 69 20.5t16 52.5v479q0 41 -17 55t-68 19v25h336v-25q-53 -4 -71 -18.5t-18 -55.5v-204h241v204q0 41 -18 55.5t-71 18.5v25h339v-25q-51 -4 -69.5 -19t-18.5 -55v-479 q0 -39 16.5 -52.5t71.5 -20.5v-25z" />
+<glyph unicode="&#x1d6af;" horiz-adv-x="778" d="M515 223h-26q-9 56 -43 56h-109q-23 0 -32 -10q-8 -9 -19 -46h-26q15 51 15 118q0 53 -15 115h26q12 -36 23 -47q10 -10 29 -10h109q18 0 27 14q7 11 13 43h26q-12 -54 -12 -110t14 -123zM743 336q0 -166 -113 -267q-98 -87 -242 -87q-165 0 -266 112q-87 98 -87 241 q0 169 115 270q99 87 244 87q162 0 262 -113q87 -99 87 -243zM566 329q0 169 -53 255q-47 75 -128 75q-89 0 -134 -97q-39 -84 -39 -231q0 -316 178 -316q176 0 176 314z" />
+<glyph unicode="&#x1d6b0;" horiz-adv-x="421" d="M370 0h-350v25q57 5 75 20t18 61v470q0 41 -19 56t-74 19v25h350v-25q-56 -2 -75.5 -17.5t-19.5 -57.5v-470q0 -48 18.5 -62.5t76.5 -18.5v-25z" />
+<glyph unicode="&#x1d6b1;" horiz-adv-x="820" d="M769 0h-334v25q47 1 62 6t15 15q0 13 -25 45l-181 225l-27 -25v-196q0 -37 16.5 -50t70.5 -20v-25h-336v25q55 5 71 19t16 57v472q0 46 -17 60.5t-70 17.5v25h337v-25q-54 -4 -71 -20.5t-17 -63.5v-223l212 215q24 24 32 35t8 23q0 15 -10.5 22t-37.5 9l-35 3v25h289v-25 q-78 -9 -133 -46.5t-189 -180.5l305 -378q16 -20 49 -21v-25z" />
+<glyph unicode="&#x1d6b2;" horiz-adv-x="707" d="M674 0h-322v25l32 3q44 5 44 33q0 22 -44 136l-108 280h-2l-114 -314q-28 -78 -28 -97q0 -21 20 -30q20 -8 59 -11v-25h-202v25q36 6 56 32q17 23 43 88l213 545h28l215 -522q40 -97 61 -121q19 -22 49 -22v-25z" />
+<glyph unicode="&#x1d6b3;" horiz-adv-x="972" d="M921 0h-332v25q55 5 72 22t17 62v496l-252 -605h-27l-252 594v-465q0 -58 20 -79t81 -25v-25h-234v25q59 6 75 20.5t16 62.5v469q0 41 -17 55.5t-72 18.5v25h253l199 -472l201 472h252v-25q-55 -4 -71.5 -22.5t-16.5 -74.5v-428q0 -57 15 -76.5t73 -24.5v-25z" />
+<glyph unicode="&#x1d6b4;" horiz-adv-x="722" d="M701 676v-25q-50 -8 -64 -22.5t-14 -60.5v-586h-28l-447 545v-396q0 -58 18 -78.5t76 -27.5v-25h-226v25q55 7 71.5 22.5t16.5 61.5v470q-52 72 -85 72v25h211l349 -430v299q0 60 -18 80.5t-74 25.5v25h214z" />
+<glyph unicode="&#x1d6b5;" horiz-adv-x="623" d="M568 481h-25q-9 46 -25 61q-16 14 -49 14h-307q-67 0 -82 -75h-25v195h513v-195zM494 240h-25q-7 37 -24 49q-13 8 -40 8h-182q-37 0 -50 -12q-11 -10 -19 -45h-25v223h25q7 -40 24 -49q12 -7 46 -7h181q35 0 45 10q11 10 19 46h25v-223zM595 0h-567v232h25q9 -53 24 -68 q17 -17 58 -17h349q51 0 67 23q12 17 19 62h25v-232z" />
+<glyph unicode="&#x1d6b6;" horiz-adv-x="778" d="M743 335q0 -156 -99.5 -255t-255.5 -99q-155 0 -254 99t-99 254q0 159 101 258t258 99q151 0 250 -100.5t99 -255.5zM566 328q0 160 -46.5 245t-134.5 85q-83 0 -128 -85.5t-45 -242.5t46 -236.5t132 -79.5t131 80t45 234z" />
+<glyph unicode="&#x1d6b7;" horiz-adv-x="780" d="M759 0h-339v25q57 6 74 23q15 15 15 50v531h-241v-531q0 -42 20 -56q15 -11 69 -17v-25h-336v25q57 8 71 22t14 51v479q0 43 -20 57q-17 13 -65 17v25h738v-25q-54 -5 -72 -21q-16 -15 -16 -53v-479q0 -42 19 -55q16 -12 69 -18v-25z" />
+<glyph unicode="&#x1d6b8;" horiz-adv-x="611" d="M16 676h315q128 0 198.5 -45.5t70.5 -135.5q0 -60 -33.5 -104.5t-95.5 -67.5q-32 -12 -70.5 -15.5t-138.5 -4.5v-192q0 -51 14 -65t73 -21v-25h-333v25q33 3 45 9q23 9 31 30t8 62v427q0 58 -15.5 75.5t-68.5 22.5v25zM262 606v-268q94 1 130 32t36 114q0 84 -27 120.5 t-89 36.5q-50 0 -50 -35z" />
+<glyph unicode="&#x1d6b9;" horiz-adv-x="778" d="M743 336q0 -156 -99.5 -255t-255.5 -99q-155 0 -254 99t-99 254q0 159 101 258t258 99q151 0 250 -100.5t99 -255.5zM214 394h349q-9 129 -54.5 197t-123.5 68q-74 0 -118.5 -68.5t-52.5 -196.5zM565 304h-353q4 -144 50 -216.5t128 -72.5q167 0 175 289z" />
+<glyph unicode="&#x1d6ba;" horiz-adv-x="665" d="M627 261l-32 -261h-581v16l278 301l-278 343v16h580v-197h-26q-22 99 -67 130q-30 21 -91 21h-182l187 -240l-225 -243h256q65 0 96 20q40 26 59 94h26z" />
+<glyph unicode="&#x1d6bb;" horiz-adv-x="667" d="M636 475h-29q-13 89 -56.5 127.5t-135.5 41.5v-527q0 -57 16.5 -72t81.5 -20v-25h-357v25q64 5 80.5 20.5t16.5 71.5v527q-93 -3 -136.5 -41.5t-56.5 -127.5h-29l3 201h600z" />
+<glyph unicode="&#x1d6bc;" horiz-adv-x="722" d="M699 670v-25q-18 5 -31 5q-30 0 -56 -8.5t-53.5 -32t-49 -61.5t-40 -101t-29.5 -146v-178q0 -58 16.5 -75.5t75.5 -22.5v-25h-347v25q60 5 76.5 25t16.5 78v136q0 164 -55 263t-147 99q-29 0 -59 -10l-14 24q22 20 57.5 36t66.5 16q59 0 103.5 -13.5t81.5 -46t59 -92 t29 -146.5h5q10 52 29 103q34 95 89 140t122 45q35 0 54 -12z" />
+<glyph unicode="&#x1d6bd;" horiz-adv-x="836" d="M498 586v-22q136 -5 225 -62q95 -61 95 -164q0 -121 -131 -187q-90 -45 -189 -45v-15q0 -31 23 -46q21 -14 72 -20v-25h-353v25q62 5 81 22q15 13 15 44v15q-138 0 -227 60q-91 61 -91 172q0 118 120 179q82 42 198 47v24q0 36 -14 48q-18 15 -71 15v25h332v-25 q-57 0 -75 -23q-10 -13 -10 -42zM496 530v-390q63 0 105 47q45 49 45 138q0 112 -49 164q-38 41 -101 41zM338 140v390q-68 0 -108 -53t-40 -152q0 -105 50 -151q37 -34 98 -34z" />
+<glyph unicode="&#x1d6be;" horiz-adv-x="747" d="M699 0h-340v25l28 2q52 3 52 28q0 21 -21 54l-101 162l-38 -51q-56 -76 -75 -106.5t-19 -46.5q0 -19 17.5 -28t63.5 -14v-25h-250v25q37 4 59 16t45 40l175 221l-198 291q-23 34 -38 45t-42 13v25h346v-25l-31 -2q-27 -1 -37.5 -8t-10.5 -23q0 -14 15 -37l97 -150l56 77 q36 49 47 69.5t11 36.5q0 18 -11 25t-40 10l-21 2v25h250v-25q-57 -5 -90.5 -30.5t-97.5 -115.5l-80 -111l182 -283q35 -54 53 -69.5t44 -16.5v-25z" />
+<glyph unicode="&#x1d6bf;" horiz-adv-x="800" d="M785 692v-25q-25 0 -41 -37q-12 -27 -12 -48v-5l4 -90v-13q0 -111 -91 -168q-66 -42 -169 -42v-141q0 -61 20 -78q19 -16 72 -20v-25h-347v25q63 3 81 31q12 20 12 72v136q-122 0 -190 56q-70 57 -70 156v11l4 90v6q0 31 -14 56q-15 28 -41 28v25h33q87 0 142 -91 q36 -59 36 -142q0 -70 29 -117q26 -44 71 -44v290q0 36 -13 48q-18 15 -72 15v25h332v-25q-56 0 -74 -23q-11 -14 -11 -42v-288q50 0 78 56q22 44 22 105q0 84 35 142q55 91 141 91h33z" />
+<glyph unicode="&#x1d6c0;" horiz-adv-x="778" d="M262 94l-2 29q-97 17 -161 91t-64 172q0 124 99 215t245 91q145 0 244.5 -91.5t99.5 -217.5q0 -94 -65 -164.5t-160 -95.5l-2 -29h138q33 0 44.5 17t11.5 60h25v-171h-302l7 155q64 15 100 81t36 153q0 66 -19 126t-60.5 102t-97.5 42q-55 0 -96.5 -42t-61 -101.5 t-19.5 -124.5q0 -88 36 -154.5t100 -81.5l7 -155h-302v171h25q0 -44 10 -60.5t41 -16.5h143z" />
+<glyph unicode="&#x1d6c1;" horiz-adv-x="691" d="M656 676l-296 -690h-28l-316 690h640zM561 556h-320l165 -359z" />
+<glyph unicode="&#x1d6c2;" horiz-adv-x="644" d="M618 461l-129 -270q0 -8 9 -35q18 -55 32 -70q7 -8 20 -8q38 0 42 76h25q0 -70 -28 -118q-29 -48 -77 -48q-69 0 -105 77q-61 -79 -166 -79q-100 0 -162 76q-54 66 -54 164q0 117 73 187q63 60 157 60q127 0 179 -121h1l29 109h154zM361 198q-3 76 -31 157q-30 87 -72 87 q-53 0 -71 -55q-15 -45 -15 -154q0 -127 21 -175q18 -41 59 -41q40 0 74 70q26 53 35 111z" />
+<glyph unicode="&#x1d6c3;" horiz-adv-x="556" d="M396 411l-1 -2q129 -39 129 -183q0 -110 -73 -180q-63 -60 -153 -60q-51 0 -93 26v-66q0 -100 -20 -151h-140q21 43 21 151v386q0 114 21 185q20 66 69 118q54 57 151 57q76 0 126 -44q48 -42 48 -110q0 -84 -85 -127zM205 495v-423q27 -55 85 -55q53 0 71 51 q15 44 15 149q0 84 -30 138q-20 37 -37 37l-43 -9q-40 0 -40 26q0 27 48 27l45 -9q10 0 18 32q5 20 5 50q0 62 -14 101q-18 51 -51 51q-44 0 -59 -44q-13 -35 -13 -122z" />
+<glyph unicode="&#x1d6c4;" horiz-adv-x="518" d="M501 461l-202 -400q1 -5 3.5 -19t3.5 -24q10 -64 10 -102q0 -52 -23 -87q-23 -34 -61 -34q-46 0 -61 34q-10 21 -10 73q0 75 61 216q-11 110 -34 169q-39 96 -92 96q-48 0 -59 -75h-25q0 68 24 115q26 50 74 50q73 0 114 -152l29 -111l79 251h169z" />
+<glyph unicode="&#x1d6c5;" horiz-adv-x="502" d="M395 567l-146 81q-32 0 -55 -10q-31 -13 -31 -39q0 -32 50 -62q15 -9 62 -34q109 -57 156 -116q46 -60 46 -172q0 -94 -68 -164q-64 -65 -156 -65q-109 0 -176 82q-51 63 -51 139q0 93 60 154q56 58 136 58v2q-82 34 -115 78q-22 31 -22 61q0 63 79 103q57 29 115 29 q69 0 114 -18q50 -20 50 -57q0 -17 -13 -33q-13 -17 -35 -17zM329 215q0 172 -77 172q-46 0 -65 -51q-14 -42 -14 -132q0 -105 19 -147q19 -40 61 -40q52 0 67 61q9 38 9 137z" />
+<glyph unicode="&#x1d6c6;" horiz-adv-x="444" d="M412 109l17 -18q-69 -105 -203 -105q-198 0 -198 132q0 77 88 123v1q-35 13 -54 41q-16 23 -16 47q0 62 57 103q55 40 146 40q71 0 117 -28q47 -29 47 -78q0 -25 -17 -42q-16 -16 -44 -16q-57 0 -57 54l8 42q0 37 -65 37q-38 0 -60 -33q-19 -28 -19 -67t23 -64 q20 -21 51 -21l54 11q39 0 39 -25q0 -30 -44 -30q-14 0 -44 9q-35 0 -61 -26q-25 -25 -25 -61q0 -95 109 -95q49 0 93 21q40 19 58 48z" />
+<glyph unicode="&#x1d6c7;" horiz-adv-x="459" d="M243 692l9 -24q-63 -27 -63 -68q0 -40 32 -51q88 85 144 85q57 0 57 -43q0 -42 -68 -69q-54 -22 -124 -22q-55 -45 -97 -122q-42 -78 -42 -148q0 -69 57 -96q39 -19 124 -19q165 0 165 -138q0 -92 -62 -143q-48 -39 -113 -39q-44 0 -71 21q-21 16 -21 40q0 28 19 46 q18 16 42 16l107 -46q23 0 41 22q17 20 17 46q0 53 -54 53h-8l-117 -9q-109 1 -154 51q-40 46 -40 140q0 104 64 213q45 77 99 124q-36 4 -56 28q-18 21 -18 50q0 74 131 102z" />
+<glyph unicode="&#x1d6c8;" horiz-adv-x="580" d="M545 -205h-138q-14 29 -19 67q-3 24 -3 85v372q0 87 -50 87q-37 0 -71 -34q-17 -17 -17 -24v-348h-139v346q0 56 -24 56t-49 -48l-23 11q18 47 56 78q38 30 80 30q98 0 98 -87h1q51 87 143 87q67 0 103 -44q31 -38 31 -101v-380q0 -106 21 -153z" />
+<glyph unicode="&#x1d6c9;" horiz-adv-x="501" d="M476 340q0 -148 -64 -254q-61 -100 -154 -100q-120 0 -184 127q-49 97 -49 228q0 151 64 252q63 99 161 99q112 0 176 -126q50 -96 50 -226zM172 364h157q0 135 -19 212q-21 85 -60 85q-78 0 -78 -297zM329 320h-157q0 -303 78 -303q79 0 79 303z" />
+<glyph unicode="&#x1d6ca;" horiz-adv-x="326" d="M281 101l23 -12q-18 -45 -58 -75q-38 -28 -85 -28q-49 0 -73 32q-19 25 -19 59v299q0 33 -14 47q-11 11 -40 14v24h193v-349q0 -56 24 -56t49 45z" />
+<glyph unicode="&#x1d6cb;" horiz-adv-x="581" d="M214 461v-201q123 143 196 189q39 24 78 24q33 0 52 -22q19 -20 19 -55q0 -25 -19 -45q-20 -21 -47 -21l-83 42q-43 0 -103 -70l179 -232q24 -32 36 -39t26 -7v-24h-248v24q34 1 34 23q0 10 -21 37l-98 129h-1v-213h-139v379q0 33 -14 44q-11 9 -40 14v24h193z" />
+<glyph unicode="&#x1d6cc;" horiz-adv-x="546" d="M502 147h25q0 -75 -25 -119q-25 -46 -75 -46q-62 0 -92 128l-46 198l-101 -308h-169l226 454l-12 38q-22 68 -48 93q-19 17 -46 17q-47 0 -59 -75h-25q0 73 24 116q25 49 76 49q62 0 104 -146l107 -374q28 -100 77 -100q47 0 59 75z" />
+<glyph unicode="&#x1d6cd;" horiz-adv-x="610" d="M567 88l21 -12q-43 -107 -144 -107q-81 0 -90 86h-1q-45 -69 -100 -69q-39 0 -53 23h-1v-77q0 -86 -20 -137h-134q21 43 21 138v528h139v-318q0 -46 25 -72q20 -20 44 -20q38 0 79 51v359h139v-350q0 -43 5 -58q5 -14 18 -14q22 0 52 49z" />
+<glyph unicode="&#x1d6ce;" horiz-adv-x="518" d="M465 473h30q0 -238 -148 -370q-102 -91 -252 -117h-26v386q0 36 -12 48q-11 11 -42 17v24h193v-323h5q225 40 252 335z" />
+<glyph unicode="&#x1d6cf;" horiz-adv-x="465" d="M240 692l10 -24q-28 -12 -46 -31t-18 -37q0 -26 21 -36q74 71 140 71q63 0 63 -40q0 -39 -61 -61q-48 -18 -109 -18q-26 0 -42 -22q-11 -17 -11 -40q0 -38 35 -53q91 41 133 41q43 0 60 -7q24 -9 24 -36q0 -33 -55 -49q-38 -11 -70 -11q-39 0 -89 11q-61 -20 -90 -58 q-24 -32 -24 -67q0 -58 52 -87q40 -23 106 -23q165 0 165 -138q0 -92 -62 -143q-48 -39 -113 -39q-44 0 -71 21q-21 16 -21 40q0 28 20 46q18 16 41 16l107 -46q23 0 41 22q17 20 17 46q0 53 -54 53h-8l-117 -9q-6 -1 -17 -1q-83 0 -134 61q-40 46 -40 117q0 69 54 134 q45 54 108 83q-22 11 -36 29q-16 20 -16 45q0 45 38 77v2q-30 5 -48 24q-15 17 -15 35q0 36 36 63q34 27 96 39z" />
+<glyph unicode="&#x1d6d0;" horiz-adv-x="500" d="M476 229q0 -105 -64.5 -174t-161.5 -69q-95 0 -160 68.5t-65 173.5q0 109 64.5 177t164.5 68q95 0 158.5 -69t63.5 -175zM329 218q0 128 -17 176t-61 48q-46 0 -62.5 -47.5t-16.5 -176.5q0 -109 18 -155t61 -46t60.5 44.5t17.5 156.5z" />
+<glyph unicode="&#x1d6d1;" horiz-adv-x="631" d="M584 127h25q0 -59 -42 -101q-39 -40 -100 -40q-74 0 -106 53q-22 35 -22 92q0 47 21 127q3 12 18 62q2 7 5.5 21.5t5.5 19.5h-134l2 -99v-27q0 -125 -32 -189t-91 -64q-79 0 -79 66q0 21 12 39q12 17 31 20q38 8 71 118q24 83 24 136q-120 0 -148 -52h-25q29 87 69 118 q43 34 122 34h385v-100h-117q-11 -46 -11 -142q0 -163 56 -163q45 0 60 71z" />
+<glyph unicode="&#x1d6d2;" horiz-adv-x="547" d="M66 -55v168q0 115 21 185q20 67 69 119q25 26 69 43q36 13 73 13q105 0 162 -67q55 -64 55 -178q0 -112 -74 -183q-60 -59 -146 -59h1q-49 0 -91 26v-66q0 -100 -20 -151h-140q21 43 21 150zM205 271v-199q27 -55 81 -55q49 0 67 52q15 45 15 151q0 129 -28 181 q-23 41 -65 41t-57 -45q-13 -38 -13 -126z" />
+<glyph unicode="&#x1d6d3;" horiz-adv-x="464" d="M334 -5l-117 -9q-7 -1 -21 -1q-85 0 -130 47q-43 43 -43 140q0 60 37 128q38 72 102 120q71 53 151 53q56 0 95 -28q36 -27 36 -70q0 -32 -22 -53q-18 -18 -43 -18l-136 68q-75 0 -115 -40q-37 -37 -37 -104q0 -76 67 -98q39 -13 114 -13q165 0 165 -138q0 -92 -62 -143 q-48 -39 -113 -39q-44 0 -71 21q-21 16 -21 40q0 28 19 46q18 16 42 16l107 -46q23 0 41 22q17 20 17 46q0 53 -54 53h-8z" />
+<glyph unicode="&#x1d6d4;" horiz-adv-x="568" d="M529 361h-200q12 -23 38.5 -43.5t49.5 -33.5t40.5 -38.5t17.5 -60.5q0 -85 -69 -142t-156 -57q-102 0 -163.5 71.5t-61.5 174.5q0 107 78 168t187 61h239v-100zM329 169q0 59 -14.5 103t-49.5 89q-33 0 -55.5 -24.5t-30 -54.5t-7.5 -63q0 -120 21 -163q19 -39 59 -39 q77 0 77 152z" />
+<glyph unicode="&#x1d6d5;" horiz-adv-x="492" d="M457 361h-139q-4 -10 -10 -65q-6 -52 -6 -99q0 -141 51 -141q45 0 60 71h25q0 -59 -42 -101q-39 -40 -100 -40q-73 0 -106 53q-22 35 -22 92q0 47 21 127q3 12 18 62q9 34 11 41h-58q-38 0 -73 -27q-34 -26 -44 -65h-25q10 71 56 129q50 63 116 63h267v-100z" />
+<glyph unicode="&#x1d6d6;" horiz-adv-x="576" d="M281 449v24q135 0 206 -71q64 -64 64 -173q0 -114 -71 -183q-62 -60 -155 -60q-217 0 -217 187v182q0 47 -24 47t-49 -48l-23 11q18 47 56 78q38 30 80 30t69 -21q30 -24 30 -71v-156q0 -113 15 -157q17 -51 63 -51q53 0 69 69q10 41 10 140q0 94 -32 156q-33 63 -91 67z " />
+<glyph unicode="&#x1d6d7;" horiz-adv-x="653" d="M257 17v135q0 48 9 99t28.5 103t58 85.5t90.5 33.5q78 0 134 -72q52 -67 52 -171q0 -106 -64 -175t-169 -69v-191h-139v191q-106 0 -169.5 69t-63.5 175q0 113 63.5 178t175.5 65h45v-25q-137 0 -137 -205q0 -136 20 -183q11 -25 25.5 -34t40.5 -9zM396 17h8q45 0 64 54 q14 43 14 172q0 199 -53 199q-33 0 -33 -168v-257z" />
+<glyph unicode="&#x1d6d8;" horiz-adv-x="612" d="M586 461l-251 -397l18 -64q33 -115 86 -115q55 0 67 76h25q0 -81 -27 -125q-25 -41 -71 -41q-43 0 -74 70q-11 25 -34 106l-15 53l-134 -213h-155l237 375l-22 85q-18 70 -43 95q-17 17 -45 17q-52 0 -67 -75h-25q0 71 24 116q26 49 76 49q42 0 69 -48q19 -33 35 -97 l25 -97l146 230h155z" />
+<glyph unicode="&#x1d6d9;" horiz-adv-x="763" d="M751 473v-25q-37 -5 -58 -30.5t-21 -68.5q0 -11 1 -16l11 -126q1 -6 1 -17q0 -87 -72 -151q-59 -53 -140 -53h-22v-191h-139v191h-22q-94 0 -156 69q-55 61 -55 152l12 126q0 98 -79 115v25h49q101 0 139 -72q26 -49 26 -150q0 -139 19 -190q17 -44 50 -44h17v444h139 v-444h17q40 0 55 59q14 56 14 175q0 118 33 166q38 56 132 56h49z" />
+<glyph unicode="&#x1d6da;" horiz-adv-x="734" d="M419 473h29q142 0 209 -82q51 -63 51 -164q0 -120 -78 -189q-58 -52 -133 -52q-90 0 -132 60q-51 -60 -130 -60q-87 0 -148 69q-61 68 -61 175t68 175t183 68h34v-25q-94 0 -123 -77q-15 -40 -15 -147q0 -96 11 -137q18 -70 64 -70q27 0 51 28q23 28 26 67 q-32 73 -32 132q0 53 20 84q19 30 55 30q39 0 57 -43q12 -29 12 -68q0 -63 -32 -136q4 -46 31 -73q21 -21 46 -21q79 0 79 207q0 117 -25 164q-32 60 -117 60v25z" />
+<glyph unicode="&#x1d6db;" horiz-adv-x="515" d="M88 606l-19 20q58 81 175 81q114 0 179 -100q68 -104 68 -301q0 -141 -58 -224q-67 -96 -178 -96q-103 0 -166.5 70t-63.5 171q0 100 56 166q69 80 174 80q56 0 95 -22l3 3q-8 90 -48.5 137.5t-101.5 47.5q-77 0 -115 -33zM340 218q0 124 -21 174t-67 50t-62.5 -47.5 t-16.5 -176.5q0 -109 18 -155t61 -46q45 0 66.5 46t21.5 155z" />
+<glyph unicode="&#x1d6dc;" horiz-adv-x="444" d="M412 109l18 -18q-78 -105 -191 -105q-102 0 -162 73q-52 64 -52 163q0 118 72 190q61 61 151 61l99 -20q20 0 22 20h23l17 -147h-23q-33 117 -115 117q-54 0 -83 -62q-21 -47 -21 -111h157v-44h-157q0 -82 49 -132q39 -41 89 -41q57 0 107 56z" />
+<glyph unicode="&#x1d6dd;" horiz-adv-x="647" d="M620 295l-1 -27q-11 0 -69 2q-5 -77 -13 -110q-43 -174 -212 -174q-217 0 -217 186v28q0 48 -24 48q-21 0 -49 -49l-23 12q16 44 53 75q38 32 83 32q43 0 70 -26q29 -26 29 -75v-27q0 -105 15 -138q16 -35 63 -35q53 0 68 72q11 55 11 191v5q-287 50 -287 247 q0 92 72 133q48 27 114 27q113 0 183 -99q65 -92 65 -238v-56q37 -4 69 -4zM403 338q-4 193 -37 271q-18 41 -51 41q-65 0 -65 -96q0 -69 40 -125q40 -57 113 -91z" />
+<glyph unicode="&#x1d6de;" horiz-adv-x="563" d="M546 461l-168 -211q-10 -49 -10 -100q0 -66 51 -66l58 23q20 0 35 -15q16 -15 16 -39q0 -38 -28 -57q-22 -15 -57 -15q-55 0 -87 41q-30 38 -30 99q0 29 7 72l-153 -193h-168l169 214q9 52 9 90q0 66 -50 66l-58 -23q-21 0 -36 15q-16 15 -16 39q0 37 29 57q23 15 56 15 q56 0 88 -41q29 -36 29 -99q0 -18 -6 -63l151 191h169z" />
+<glyph unicode="&#x1d6df;" horiz-adv-x="653" d="M396 473h11q101 0 166 -78q56 -68 56 -166q0 -112 -73 -183q-63 -60 -154 -60h-6v-191h-139v191h-8q-102 0 -168 77q-57 67 -57 165q0 117 74 186q64 59 155 59h4v203h139v-203zM396 17h8q48 0 64 50q14 45 14 150q0 132 -19 183q-17 42 -57 42h-10v-425zM257 17v425h-7 q-49 0 -65 -55q-14 -45 -14 -169q0 -118 20 -161q18 -40 59 -40h7z" />
+<glyph unicode="&#x1d6e0;" horiz-adv-x="511" d="M379 -177l-43 1q-86 1 -166 50q-145 87 -145 323q0 137 79 213q64 63 160 63q102 0 166 -77q56 -68 56 -167q0 -113 -73 -183q-63 -60 -153 -60q-96 0 -152 60l-2 -1q23 -54 78 -84q48 -26 101 -25l80 3h6q87 0 87 -79q0 -29 -24 -65h-25q0 28 -30 28zM339 218 q0 135 -20 183q-16 41 -58 41q-49 0 -65 -55q-14 -45 -14 -169q0 -116 21 -161q18 -40 58 -40q47 0 63 51q15 45 15 150z" />
+<glyph unicode="&#x1d6e1;" horiz-adv-x="864" d="M851 361h-79q42 -55 42 -136q0 -121 -73 -187q-56 -52 -138 -52q-89 0 -131 60q-51 -60 -131 -60q-93 0 -152 67q-56 65 -56 172q0 77 49 136h-24q-88 0 -124 -62h-25q55 162 216 162h626v-100zM642 361h-337q-25 -41 -25 -147q0 -197 74 -197q30 0 53 29q21 26 25 65 q-31 76 -31 113q0 40 20 65q19 24 56 24q36 0 54 -30q14 -23 14 -57t-33 -115q4 -45 30 -72q21 -22 46 -22q79 0 79 198q0 106 -25 146z" />
+<glyph unicode="&#x1d6e2;" horiz-adv-x="717" d="M685 0h-285v16h16q40 0 56 14.5t16 46.5q0 7 -2 21l-13 113h-198l-84 -140q-10 -11 -10 -26q2 -29 43 -29h29v-16h-218v16q67 8 108 74l356 577h18l78 -581q10 -70 74 -70h16v-16zM466 248l-25 227h-6l-139 -227h170z" />
+<glyph unicode="&#x1d6e3;" horiz-adv-x="696" d="M198 653h252q236 0 236 -145q0 -102 -91 -147q-28 -14 -74 -26l3 -4q52 -9 89.5 -44t37.5 -94q0 -82 -72 -137.5t-217 -55.5h-324l4 16h20q52 0 74 16.5t29 46.5l123 495q2 10 2 21q0 42 -78 42h-19zM406 611l-59 -252q30 -6 53 -6q82 0 125 44t43 119q0 52 -35 75 t-84 23q-23 0 -43 -3zM338 314l-68 -267q32 -9 71 -9q80 0 135 41t55 131q0 52 -40 80t-102 28q-36 0 -51 -4z" />
+<glyph unicode="&#x1d6e4;" horiz-adv-x="616" d="M721 653l-39 -175h-17q5 45 5 50q-1 88 -114 88h-146l-133 -538q-4 -18 -4 -24q0 -38 79 -38h32l-4 -16h-342l4 16h18q53 0 75.5 16t29.5 46l123 497q4 16 4 24q0 39 -76 39h-19l4 15h520z" />
+<glyph unicode="&#x1d6e5;" horiz-adv-x="596" d="M556 0h-526l412 667h19zM429 82l-45 393h-6l-241 -393h292z" />
+<glyph unicode="&#x1d6e6;" horiz-adv-x="714" d="M734 653l-42 -158h-16q2 26 2 35q-4 87 -109 87h-160l-60 -248h80q51 0 81 19t45 76h16l-58 -242h-17q0 2 3 26t3 34q0 51 -72 51h-90l-66 -258q-2 -8 -2 -10q0 -27 63 -27h67q115 0 169 36t88 124h16l-66 -198h-571l4 16h19q89 0 104 62l120 488q5 22 5 36q0 19 -16 27 t-59 8h-19l4 16h534z" />
+<glyph unicode="&#x1d6e7;" horiz-adv-x="772" d="M802 653l-566 -615h218q42 0 70 4t59.5 17t53 43t34.5 76h16l-46 -178h-581l573 616h-202q-44 0 -71.5 -3t-60.5 -14t-55 -37t-36 -67h-17l48 158h563z" />
+<glyph unicode="&#x1d6e8;" horiz-adv-x="873" d="M923 653l-4 -16h-18q-52 0 -75 -16.5t-31 -46.5l-123 -496q-4 -18 -4 -28q0 -34 78 -34h19l-4 -16h-329l4 16h18q51 0 74.5 16t30.5 46l61 242h-280l-61 -242q-4 -12 -4 -24q0 -38 77 -38h20l-4 -16h-330l4 16h18q91 0 106 62l123 496q4 12 4 24q0 39 -78 39h-20l4 16 h330l-4 -16h-18q-54 0 -76 -16t-29 -47l-52 -217h278l53 217q4 20 4 24q0 39 -76 39h-20l4 16h330z" />
+<glyph unicode="&#x1d6e9;" horiz-adv-x="737" d="M520 425h16q-30 -77 -30 -163v-27h-16q-1 31 -13 44t-38 13h-117q-28 0 -43 -12t-31 -45h-16q30 75 30 176v14h16q6 -34 17 -45.5t39 -11.5h118q48 0 68 57zM712 395q0 -96 -50.5 -188.5t-147 -155t-212.5 -62.5q-112 0 -182 65t-70 168q0 61 18 124t54 121t84.5 103 t115 72t140.5 27q66 0 115.5 -23t78 -62.5t42.5 -87t14 -101.5zM596 444q0 85 -34.5 136.5t-107.5 51.5q-66 0 -118.5 -34.5t-82.5 -85t-49.5 -115.5t-26 -119t-6.5 -102q0 -72 39 -110.5t100 -38.5q75 0 133 43t89.5 109.5t47.5 134.5t16 130z" />
+<glyph unicode="&#x1d6ea;" horiz-adv-x="480" d="M530 653l-4 -16h-19q-53 0 -75.5 -16t-30.5 -46l-123 -497q-3 -12 -3 -29q0 -33 78 -33h17l-4 -16h-328l4 16h19q52 0 75 16.5t30 45.5l123 497q4 16 4 24q0 38 -77 38h-18l4 16h328z" />
+<glyph unicode="&#x1d6eb;" horiz-adv-x="762" d="M802 653l-4 -16q-35 0 -59 -12t-61 -41l-271 -211l187 -278q26 -38 54.5 -58.5t72.5 -20.5l-4 -16h-287l4 16h11q24 0 35.5 6.5t11.5 26.5q0 6 -1.5 11t-3.5 7.5t-5 8.5l-6 8l-156 237h-4l-62 -243q-3 -12 -3 -22q0 -40 78 -40h17l-4 -16h-304l4 16h18q68 0 84 62 l117 472q10 39 10 49q0 38 -76 38h-18l4 16h312l-4 -16h-11q-51 0 -70 -15.5t-27 -46.5l-53 -209h5l282 221q18 14 18 29q-1 11 -11 16t-40 5l4 16h216z" />
+<glyph unicode="&#x1d6ec;" horiz-adv-x="718" d="M686 0h-287l2 16h15q70 0 70 61q0 14 -1 21l-44 378h-5l-245 -405q-10 -15 -10 -26q0 -29 43 -29h29v-16h-218v16q67 8 108 74l357 577h17l78 -569q6 -46 24 -64t50 -18h17v-16z" />
+<glyph unicode="&#x1d6ed;" horiz-adv-x="1005" d="M1055 653l-4 -16h-17q-55 0 -76 -15t-29 -46l-127 -498q-2 -7 -2 -28q0 -34 77 -34h19l-4 -16h-330l4 16h17q54 0 76 16.5t29 45.5l112 439h-6l-345 -517h-25l-94 517h-3l-109 -428q-5 -22 -5 -40q0 -33 76 -33h20l-4 -16h-267l4 16h19q54 0 76.5 19t31.5 54l119 475 q5 21 5 38q0 35 -77 35h-19l4 16h213l89 -493h4l333 493h215z" />
+<glyph unicode="&#x1d6ee;" horiz-adv-x="851" d="M901 653l-4 -16h-18q-53 0 -76.5 -16t-30.5 -47l-144 -574h-24l-274 526h-6l-108 -448q-3 -12 -3 -27q0 -35 76 -35h19l-4 -16h-266l4 16h18q91 0 106 62l126 509q-22 50 -92 50h-19l4 16h200l236 -465h5l97 386q4 18 4 26q0 37 -76 37h-20l4 16h266z" />
+<glyph unicode="&#x1d6ef;" horiz-adv-x="706" d="M741 653l-35 -152h-16q3 13 3 33q0 16 -4.5 25t-16 12.5t-20.5 4.5t-29 1h-299q-40 0 -62.5 -17.5t-33.5 -58.5h-16l37 152h492zM609 450l-52 -209h-15l2 26q0 18 -11 29.5t-28 11.5h-185q-27 0 -48.5 -20t-30.5 -47h-16l52 209h16q-3 -15 -3 -25q0 -24 16 -32.5t47 -8.5 h145q50 0 67 14t28 52h16zM629 158l-40 -158h-537l40 158h13v-14v-21q0 -24 16.5 -32.5t48.5 -8.5h339q34 0 48.5 3t29 19.5t26.5 53.5h16z" />
+<glyph unicode="&#x1d6f0;" horiz-adv-x="732" d="M712 420q0 -75 -29 -151t-80 -138.5t-130 -102t-170 -39.5q-112 0 -182.5 65t-70.5 168q0 77 29.5 155.5t81 144t131 106.5t171.5 41q118 0 183.5 -73.5t65.5 -175.5zM596 443q0 86 -34.5 137.5t-106.5 51.5q-66 0 -118 -34t-82.5 -84.5t-50 -115.5t-26.5 -119t-7 -102 q0 -70 39.5 -110t100.5 -40t111 30t81.5 75.5t53 103t30.5 110t9 97.5z" />
+<glyph unicode="&#x1d6f1;" horiz-adv-x="873" d="M923 653l-4 -16h-19q-53 0 -75 -15.5t-30 -45.5l-123 -498q-3 -10 -3 -27q0 -18 16.5 -26.5t60.5 -8.5h20l-4 -16h-331l4 16h18q54 0 75.5 13.5t30.5 48.5l132 538h-278l-133 -538q-3 -15 -3 -26q0 -22 17.5 -29t57.5 -7h19l-4 -16h-329l4 16h18q91 0 106 62l122 498 q3 12 3 24q0 19 -17 28t-59 9h-20l4 16h724z" />
+<glyph unicode="&#x1d6f2;" horiz-adv-x="594" d="M201 653h271q117 0 174.5 -48t57.5 -112q0 -82 -71.5 -140.5t-213.5 -58.5q-44 0 -74 5q-4 0 -12 2l-56 -223q-3 -12 -3 -23q0 -39 77 -39h32l-4 -16h-341l4 16h17q53 0 75.5 16t30.5 46l125 497q4 16 4 25q0 37 -78 37h-19zM411 613l-68 -274q32 -8 60 -8q78 0 130 48 t52 124q0 50 -29.5 81.5t-95.5 31.5q-24 0 -49 -3z" />
+<glyph unicode="&#x1d6f3;" horiz-adv-x="737" d="M712 395q0 -96 -50.5 -188.5t-147 -155t-212.5 -62.5q-112 0 -182 65t-70 168q0 61 18 124t54 121t84.5 103t115 72t140.5 27q66 0 115.5 -23t78 -62.5t42.5 -87t14 -101.5zM195 368h395q6 40 6 76q0 85 -34.5 136.5t-107.5 51.5q-54 0 -98.5 -22t-75 -61.5t-51 -83.5 t-34.5 -97zM575 292h-395q-9 -57 -9 -116q0 -72 39 -110.5t100 -38.5q103 0 169.5 76t95.5 189z" />
+<glyph unicode="&#x1d6f4;" horiz-adv-x="735" d="M760 653l-40 -159h-16q3 7 3 29q0 26 -8 44.5t-18.5 27.5t-30 14t-34 6t-38.5 1h-205l161 -255l-317 -279h315q57 0 94.5 26t64.5 83h16l-83 -191h-566l378 327l-210 326h534z" />
+<glyph unicode="&#x1d6f5;" horiz-adv-x="550" d="M670 653l-46 -179h-16q5 42 5 71q0 31 -17.5 47.5t-36 20t-45.5 3.5h-98l-133 -538q-5 -22 -5 -25q0 -37 76 -37h21l-4 -16h-329l4 16h18q54 0 76.5 16t29.5 46l133 538h-91q-62 0 -109.5 -40.5t-61.5 -101.5h-16l46 179h599z" />
+<glyph unicode="&#x1d6f6;" horiz-adv-x="567" d="M687 661v-16q-58 0 -126 -81l-212 -251l-57 -235q-4 -14 -4 -26q0 -36 77 -36h21l-4 -16h-328l4 16h17q53 0 75 16t29 46l61 247l-78 208q-23 61 -51 87.5t-83 26.5l4 16q53 5 85 5q31 0 55 -7.5t37.5 -16t25.5 -28t16.5 -31t13.5 -36.5l64 -185h5l176 207q27 33 42 48 t41 29.5t54 14.5q26 0 40 -2z" />
+<glyph unicode="&#x1d6f7;" horiz-adv-x="772" d="M508 578l-9 -31q102 0 175 -44t73 -132q0 -56 -24 -103t-61 -78t-83.5 -53t-91 -32t-83.5 -10h-19l-7 -31q-2 -10 -2 -15q0 -33 73 -33h26l-4 -16h-330l3 16q66 0 91 15t38 64h-13q-113 0 -174 46.5t-61 111.5q0 76 33 134.5t87 92t115.5 50.5t125.5 17q10 29 10 51 q0 39 -75 39h-19l4 16h321l-4 -16h-16q-82 0 -99 -59zM490 510l-95 -377q92 0 162.5 64t70.5 177q0 58 -34.5 97t-103.5 39zM283 133l93 377q-63 0 -118 -41t-84.5 -100t-29.5 -115q0 -52 35 -86.5t104 -34.5z" />
+<glyph unicode="&#x1d6f8;" horiz-adv-x="790" d="M810 653l-4 -16h-4q-33 0 -58.5 -11t-39.5 -23.5t-37 -39.5l-187 -213l96 -266q11 -32 28 -50t51 -18h14l-4 -16h-281l4 16h11q34 0 50.5 8t16.5 33q0 13 -4 26l-69 194l-181 -201q-12 -13 -12 -28q0 -32 56 -32h22l-4 -16h-249l4 16q78 10 140 77l208 230l-85 231 q-6 18 -10.5 27t-16 25t-30.5 23.5t-45 7.5h-9l4 16h283l-4 -16h-19q-26 0 -39 -7t-13 -28q0 -12 6 -28l60 -179l164 184q15 18 15 34q-2 24 -45 24h-9l4 16h222z" />
+<glyph unicode="&#x1d6f9;" horiz-adv-x="670" d="M743 667l-4 -16q-38 -8 -55 -51q-5 -13 -11 -41q-18 -86 -37 -124q-43 -89 -113 -127t-175 -38l-43 -181q-8 -37 -8 -43q0 -31 77 -31q16 0 21 1l-4 -16h-328l4 16q66 0 84 8q30 14 42 65l42 181q-50 0 -93.5 12t-76.5 46t-33 85q0 31 17 92t17 92q0 50 -38 54l4 16h18 q49 0 80.5 -33t31.5 -82q0 -31 -20.5 -88t-20.5 -88q0 -69 124 -69l54 218q17 71 17 77q0 8 -3.5 14t-11 9.5t-14.5 6t-18 3.5t-17.5 1.5t-16.5 0.5h-13l4 16h321l-4 -16q-29 0 -48.5 -2.5t-40.5 -15.5t-27 -38l-68 -274q78 0 116.5 37.5t64.5 118.5q3 10 9.5 34t12 41.5 t13.5 32.5q47 96 150 96h18z" />
+<glyph unicode="&#x1d6fa;" horiz-adv-x="800" d="M280 94l5 37q-147 48 -147 203q0 69 41 139q36 59 91 104q107 89 273 89q126 0 186 -73q48 -59 48 -157q0 -115 -84 -202q-76 -79 -198 -103l-7 -37h128q56 6 79 19q31 19 49 66l18 -5l-56 -174h-280l40 166q94 21 155 115q51 79 51 171q0 181 -140 181q-108 0 -192 -87 q-97 -101 -97 -216q0 -65 23 -109q23 -43 61 -55l-24 -166h-271l42 179l17 -5q-4 -17 -4 -36q0 -44 62 -44h131z" />
+<glyph unicode="&#x1d6fb;" horiz-adv-x="627" d="M600 653l-400 -668h-26l-132 668h558zM499 559h-342l87 -432z" />
+<glyph unicode="&#x1d6fc;" horiz-adv-x="524" d="M529 428l-139 -241v-37q0 -40 8.5 -69.5t25.5 -29.5q20 0 46 74l15 -7q-14 -58 -38.5 -93t-56.5 -35q-26 0 -45 26t-21 61h-2q-59 -87 -153 -87q-61 0 -95 47t-34 114q0 37 7 66q22 92 84.5 158t140.5 66q55 0 84.5 -39.5t29.5 -96.5l64 123h79zM322 273q0 31 -1.5 51 t-7.5 42.5t-19 33.5t-34 11q-46 0 -91 -86.5t-45 -199.5q0 -52 10 -78.5t44 -26.5q29 0 60 36t49 73t30 73q5 25 5 71z" />
+<glyph unicode="&#x1d6fd;" horiz-adv-x="493" d="M47 -105l116 479q25 103 49 145t84 94q64 55 123 55q42 0 70.5 -32t28.5 -82q0 -57 -27.5 -108t-72.5 -71v-1q56 -15 56 -102q0 -48 -18.5 -101.5t-44.5 -86.5q-75 -96 -192 -96q-38 0 -64 21l-28 -122q-8 -37 -23 -70h-79q8 17 22 78zM266 459l-102 -419q22 -23 49 -23 q54 0 96.5 50.5t61 112.5t18.5 115q0 63 -21 63q-10 0 -21.5 -4t-20.5 -4q-13 0 -22.5 6.5t-9.5 15.5q0 10 11.5 18.5t35.5 8.5q3 0 19.5 -2.5t24.5 -2.5q29 0 44.5 46t15.5 78q0 40 -15.5 70t-45.5 30q-22 0 -39.5 -9t-28.5 -22t-21 -36t-15.5 -42t-13.5 -50z" />
+<glyph unicode="&#x1d6fe;" horiz-adv-x="428" d="M458 428l-266 -371q-8 -87 -16 -128q-24 -116 -83 -116q-17 0 -26.5 12.5t-9.5 31.5q0 36 14.5 67.5t41.5 70t39 62.5q13 92 13 182q0 138 -58 138q-29 0 -56 -74h-16q39 138 102 138q66 0 66 -128q0 -37 -6.5 -104t-7.5 -75l179 294h90z" />
+<glyph unicode="&#x1d6ff;" horiz-adv-x="463" d="M451 608q0 -18 -12 -32t-34 -14t-32 10t-11 22.5t-15.5 22.5t-45.5 10t-60.5 -20t-29.5 -47q0 -26 23 -53t56 -51l66 -52q33 -26 56 -62t23 -75q0 -66 -18 -112q-29 -70 -89.5 -118t-141.5 -48q-70 0 -108 41t-38 104q0 93 69 174t170 91q-12 12 -35 31.5t-35.5 31.5 t-23 30.5t-10.5 37.5q0 45 29 78t65.5 46.5t72.5 13.5q43 0 76 -15t33 -45zM351 269q0 39 -13.5 69.5t-40.5 30.5q-61 0 -120 -88.5t-59 -160.5q0 -43 19.5 -72.5t50.5 -29.5q63 0 113 86t50 165z" />
+<glyph unicode="&#x1d700;" horiz-adv-x="484" d="M444 372l-14 -8q-18 26 -46 36.5t-74 10.5q-51 0 -95 -32t-44 -81q0 -24 22 -37.5t56 -13.5q10 0 29.5 4.5t32.5 4.5q38 0 38 -20q0 -31 -43 -31q-3 0 -26 3t-35 3q-45 0 -89 -27.5t-44 -75.5q0 -42 36 -60t89 -18q42 0 84.5 19.5t66.5 53.5l13 -10q-35 -50 -84 -77 t-126 -27q-86 0 -126 29t-40 73q0 53 32 88.5t84 48.5q-58 20 -58 66q0 63 61 105t164 42q46 0 86 -21t50 -48z" />
+<glyph unicode="&#x1d701;" horiz-adv-x="435" d="M290 668l4 -16q-36 -13 -55 -33.5t-19 -40.5q0 -35 49 -45q31 36 87 71t92 35q32 0 32 -24q0 -34 -63.5 -70.5t-132.5 -42.5q-72 -50 -129 -143.5t-57 -185.5q0 -91 92 -91h6q6 0 17.5 0.5t23.5 0.5q63 0 93.5 -23t30.5 -76q0 -62 -59 -114.5t-122 -52.5q-24 0 -38.5 17 t-14.5 37q0 18 12.5 30t35.5 12q11 0 27.5 -15t25.5 -15q36 0 66.5 19.5t30.5 48.5q0 49 -82 49q-5 0 -36 -4.5t-40 -4.5q-55 0 -91 39t-36 103q0 110 54.5 200t145.5 171v1q-27 0 -50 16t-23 43q0 32 32 61t91 43z" />
+<glyph unicode="&#x1d702;" horiz-adv-x="460" d="M173 251h2l57 73q45 58 83.5 87.5t79.5 29.5q60 0 60 -54q0 -13 -15 -78l-75 -313q-23 -97 -23 -144q0 -25 5 -35h-76q-11 13 -11 46q0 30 16.5 101t82.5 335q8 27 8 48q0 13 -7.5 21t-20.5 8q-31 0 -104.5 -98t-95.5 -173l-31 -105h-78l77 304q13 54 13 59q0 13 -13 13 q-22 0 -60 -50l-13 10q30 42 46 58q19 19 43.5 33t40.5 14q41 0 41 -41q0 -19 -5.5 -45.5t-15 -61t-11.5 -42.5z" />
+<glyph unicode="&#x1d703;" horiz-adv-x="484" d="M474 472q0 -98 -41 -210.5t-112 -192.5t-144 -80q-71 0 -104 44t-33 135q0 68 21.5 152t59.5 162.5t98 132t127 53.5q57 0 92.5 -50t35.5 -146zM159 344h206q25 117 25 166q0 129 -51 129q-50 0 -104 -97t-76 -198zM356 308h-207q-25 -78 -25 -165q0 -125 58 -125 q45 0 87.5 69.5t70.5 160.5l10 34z" />
+<glyph unicode="&#x1d704;" horiz-adv-x="267" d="M227 441l-92 -364q-1 -6 -1 -14q0 -11 13 -11q6 0 10.5 1.5t8 3t8.5 7t9 9.5t12.5 14t15.5 17l13 -10q-82 -105 -134 -105q-40 0 -40 46q0 27 79 334q2 4 2 12q0 13 -7 17.5t-24 4.5q-14 0 -28 -4l-3 16z" />
+<glyph unicode="&#x1d705;" horiz-adv-x="534" d="M193 251l183 136q44 33 70 43.5t56 10.5q47 0 47 -41q0 -16 -10.5 -27t-31.5 -11q-15 0 -29 13.5t-31 13.5q-26 0 -52 -21l-143 -113l112 -187q17 -29 35 -38t66 -14l-1 -16h-235l1 16q58 0 58 17q0 16 -13 33l-90 153l-57 -219h-78l94 371v9q0 20 -32 20q-12 0 -28 -3 l-2 15l161 27z" />
+<glyph unicode="&#x1d706;" horiz-adv-x="541" d="M495 124h16q-38 -140 -104 -140q-22 0 -38 27t-16 68q0 27 3 57l6 76q4 46 7 85l-218 -297h-101l319 431q2 16 2 31q0 35 -1 46q-7 96 -56 96q-25 0 -53 -74h-16q37 138 104 138q55 0 55 -136v-383q0 -101 38 -101q25 0 53 76z" />
+<glyph unicode="&#x1d707;" horiz-adv-x="579" d="M549 428l-86 -338q-8 -32 -8 -39q0 -14 17 -14q30 0 57 48l15 -6q-12 -34 -54.5 -70t-76.5 -36q-41 0 -41 41q0 37 33 171q-71 -107 -114.5 -149t-79.5 -42q-13 0 -25 7.5t-16 17.5q-39 -155 -51 -179q-6 -13 -15 -23h-74q26 37 45 114l125 497h79l-71 -298 q-4 -18 -4 -27q0 -45 54 -45q37 0 109 115t88 184l16 71h78z" />
+<glyph unicode="&#x1d708;" horiz-adv-x="452" d="M444 446l18 -5q-14 -134 -83.5 -252.5t-185.5 -197.5h-21l-62 369q-7 42 -44 42h-16v16q57 2 128 23l60 -350q136 103 206 355z" />
+<glyph unicode="&#x1d709;" horiz-adv-x="433" d="M293 668l4 -16q-32 -9 -50.5 -25.5t-22 -26.5t-3.5 -18q0 -12 8 -21.5t24 -9.5q88 67 144 67q46 0 46 -34q0 -31 -49.5 -51t-106.5 -20q-37 0 -61.5 -25t-24.5 -53t31 -52q70 46 140 46q24 0 39.5 -8t15.5 -21q0 -24 -25 -39t-50 -19t-48 -4q-37 0 -68 9 q-66 -25 -110 -75.5t-44 -110.5q0 -44 24 -61t85 -17q12 0 28 0.5t21 0.5q63 0 93.5 -23.5t30.5 -76.5q0 -62 -59.5 -114.5t-121.5 -52.5q-24 0 -38.5 17t-14.5 37q0 18 12.5 30t35.5 12q11 0 27.5 -15t25.5 -15q36 0 66.5 19.5t30.5 48.5q0 49 -82 49q-10 0 -37.5 -4.5 t-36.5 -4.5q-147 2 -147 118q0 82 47 148t123 108q-30 26 -29 69q3 51 57 89q-21 5 -35.5 20t-14.5 31q0 34 30 59t90 35z" />
+<glyph unicode="&#x1d70a;" horiz-adv-x="458" d="M438 287q0 -110 -76.5 -204t-186.5 -94q-69 0 -102 49t-33 114t31 131t90.5 112t129.5 46q64 0 105.5 -38.5t41.5 -115.5zM357 318q0 36 -15.5 64.5t-51.5 28.5q-61 0 -115 -91.5t-54 -193.5q0 -107 59 -107q49 0 92 60t64 128t21 111z" />
+<glyph unicode="&#x1d70b;" horiz-adv-x="558" d="M568 428l-23 -73h-112q-3 -8 -16 -45l-23 -66q-10 -29 -19 -66.5t-9 -60.5q0 -18 11 -33t27 -15q44 0 73 66h16q-17 -59 -56 -100.5t-88 -41.5q-28 0 -42.5 21.5t-14.5 53.5q0 34 9 62q9 27 36.5 102.5t41.5 122.5h-94q-12 -32 -33 -97l-34 -106q-14 -41 -39.5 -86.5 t-54.5 -67.5q-13 -11 -38 -11q-20 0 -35.5 13t-15.5 31q0 40 31 48q49 14 74 70l89 206q-36 0 -53.5 -2t-41 -14t-44.5 -37h-16q69 126 212 126h282z" />
+<glyph unicode="&#x1d70c;" horiz-adv-x="502" d="M30 -183l84 336q50 202 166 259q58 29 98 29q94 0 94 -155q0 -65 -32.5 -133.5t-92.5 -116.5t-129 -48q-37 0 -61 18l-44 -189h-83zM212 238l-46 -200q18 -21 46 -21q48 0 90 48.5t64 113.5t22 123q0 43 -15.5 63t-35.5 20q-41 0 -75 -39t-50 -108z" />
+<glyph unicode="&#x1d70d;" horiz-adv-x="439" d="M464 438q0 -43 -48 -43q-20 0 -32 18.5t-31 18.5q-55 0 -114.5 -31t-102.5 -89t-43 -125q0 -50 17.5 -76.5t73.5 -26.5q13 0 28 0.5t18 0.5q126 0 126 -92q0 -74 -55.5 -125t-125.5 -51q-24 0 -38.5 18t-14.5 38q0 18 12.5 30t35.5 12q11 0 27.5 -16t25.5 -16q35 0 66 21 t31 50q0 49 -82 48q-10 0 -39 -4.5t-47 -4.5q-47 0 -82 40t-35 109q0 80 52.5 162t132.5 134t156 52q32 0 60 -13t28 -39z" />
+<glyph unicode="&#x1d70e;" horiz-adv-x="537" d="M547 428l-20 -73h-173q9 -25 30.5 -46t37.5 -43t16 -54q0 -86 -75 -154.5t-181 -68.5q-71 0 -106.5 48.5t-35.5 111.5q0 122 78.5 200.5t181.5 78.5h247zM286 355h-2q-57 -5 -110 -70.5t-53 -163.5q0 -20 4.5 -41t20 -41t40.5 -20q69 0 120.5 70t51.5 137 q0 44 -21.5 77.5t-50.5 51.5z" />
+<glyph unicode="&#x1d70f;" horiz-adv-x="442" d="M472 428l-22 -73h-155q-27 -66 -60 -189q-7 -25 -7 -46q0 -26 8 -37.5t28 -11.5q19 0 41.5 20t35.5 47h16q-18 -60 -59.5 -101.5t-89.5 -41.5q-64 0 -64 67q0 12 2.5 26t5.5 23l8 25q6 15 7 19l66 200h-51q-39 0 -75 -24.5t-61 -63.5h-16q25 58 83 109.5t124 51.5h235z " />
+<glyph unicode="&#x1d710;" horiz-adv-x="460" d="M293 425l2 14q150 -24 150 -168q0 -101 -73.5 -191.5t-176.5 -90.5q-62 0 -100 29t-38 75q0 27 19 94l41 141q9 29 9 39q0 14 -15 14q-13 0 -25.5 -9.5t-42.5 -46.5l-13 9q35 51 72 78t68 27q24 0 35 -7.5t11 -28.5q0 -19 -68 -240q-13 -41 -13 -74q0 -71 63 -71 q55 0 100 48.5t66 109t21 113.5q0 120 -92 136z" />
+<glyph unicode="&#x1d711;" horiz-adv-x="666" d="M247 19l34 130q75 289 245 289q47 0 76 -38.5t29 -116.5q0 -72 -36.5 -138.5t-109.5 -111t-165 -44.5l-40 -172h-83l43 172q-83 0 -136.5 44.5t-53.5 121.5q0 112 81 199t198 87h25l-5 -16q-86 -9 -150.5 -88.5t-64.5 -177.5q0 -59 33 -99.5t80 -40.5zM380 238l-53 -219 q73 0 146.5 87t73.5 183q0 55 -12 74t-32 19q-36 0 -72 -41.5t-51 -102.5z" />
+<glyph unicode="&#x1d712;" horiz-adv-x="595" d="M645 428l-290 -343q0 -131 9 -177t32 -46q29 0 54 67h16q-34 -131 -102 -131q-55 0 -55 112q0 34 7 125l-185 -218h-101l296 349v78q0 70 -12 101.5t-40 31.5q-33 0 -57 -66h-16q16 59 39 94.5t63 35.5q56 0 56 -138q0 -21 -1 -31l-4 -72l191 228h100z" />
+<glyph unicode="&#x1d713;" horiz-adv-x="661" d="M711 439v-16q-23 -3 -42 -13t-33 -29t-23.5 -35.5t-18.5 -44.5t-13 -45l-11 -46q-22 -96 -98.5 -158.5t-169.5 -62.5l-42 -172h-81l43 172h-10q-66 0 -109.5 39.5t-43.5 125.5q0 27 16 87.5t16 95.5q0 80 -61 86l5 16q19 2 55 2q41 0 64.5 -32.5t23.5 -78.5 q0 -28 -15.5 -92t-15.5 -93q0 -55 22 -88t61 -38l100 409h81l-100 -409q58 11 105 60t65 127l11 46l11 40q8 30 15 42l18 32q12 22 25 31.5t31 21t41.5 16t51.5 4.5h26z" />
+<glyph unicode="&#x1d714;" horiz-adv-x="681" d="M465 425l6 16q190 0 190 -161q0 -120 -80 -205.5t-165 -85.5q-44 0 -72.5 25t-31.5 64q-73 -89 -154 -89q-48 0 -80.5 27t-45 61.5t-12.5 72.5q0 123 83.5 207t214.5 84h16l3 -16q-93 0 -164 -93.5t-71 -219.5q0 -37 18 -65t50 -28q41 0 78.5 34t48.5 71q-3 22 -3 51 q0 41 8.5 81t32 72.5t56.5 32.5q14 0 23.5 -14t9.5 -33q0 -82 -78 -195q0 -43 16.5 -71.5t53.5 -28.5q41 0 81 51t62 114t22 108q0 69 -27.5 97.5t-88.5 35.5z" />
+<glyph unicode="&#x1d715;" horiz-adv-x="471" d="M195 625l-10 20q38 23 98 23q188 0 188 -260q0 -49 -8 -101t-29 -110t-53 -103.5t-85 -75t-120 -29.5q-69 0 -102.5 46t-33.5 116q0 109 75.5 196.5t181.5 87.5q69 0 96 -48q7 39 7 70q0 77 -30.5 129t-100.5 52q-33 0 -74 -13zM367 319q0 44 -18.5 65t-42.5 21 q-73 0 -129 -90.5t-56 -197.5q0 -98 67 -98q54 0 97.5 59t66.5 143q15 55 15 98z" />
+<glyph unicode="&#x1d716;" horiz-adv-x="430" d="M430 441l-19 -132h-15q-16 105 -93 105q-56 0 -98.5 -51.5t-62.5 -115.5h181l-5 -36h-185q-7 -20 -7 -66q0 -47 25 -74t67 -27q74 0 144 68l12 -14q-46 -52 -91.5 -80.5t-102.5 -28.5q-67 0 -103.5 43t-36.5 109q0 72 34 140.5t97.5 114t137.5 45.5q27 0 49.5 -10 t33.5 -10q14 0 23 20h15z" />
+<glyph unicode="&#x1d717;" horiz-adv-x="554" d="M33 205l-13 9q72 106 131 106q44 0 44 -45q0 -30 -18.5 -89.5t-18.5 -96.5q0 -78 57 -78q107 0 168 212q-88 38 -148 109.5t-60 159.5q0 81 48.5 133.5t128.5 52.5q78 0 116.5 -57.5t38.5 -139.5q0 -129 -47 -257q40 -13 45 -14l-5 -19q-20 1 -49 8q-87 -209 -239 -209 q-134 0 -134 104q0 12 1.5 23.5t5 25.5t5.5 21l8 25l8 23q8 24 8 39q0 14 -12 14q-21 0 -69 -60zM423 484q0 161 -79 161q-31 0 -51.5 -27t-27 -58t-6.5 -62q0 -75 35.5 -139.5t98.5 -102.5q30 123 30 228z" />
+<glyph unicode="&#x1d718;" horiz-adv-x="561" d="M587 428l-156 -145q-22 -36 -42 -86q-21 -54 -21 -84q0 -41 49 -41q51 0 51 -38q0 -20 -17 -34q-16 -13 -42 -13q-37 0 -61 26q-22 23 -22 61q0 60 48 154l-1 1l-252 -229h-109l148 136q16 26 35 90q20 66 20 100q0 28 -26 28q-27 0 -38 6q-17 11 -17 36q0 22 21 35 q14 10 32 10q68 0 68 -77q0 -72 -45 -181l1 -1l268 246h108z" />
+<glyph unicode="&#x1d719;" horiz-adv-x="645" d="M480 668l-55 -228q86 0 140.5 -36.5t54.5 -118.5q0 -118 -80 -204q-85 -92 -226 -92l-48 -172h-81l46 172q-85 0 -138 44t-53 127q0 110 84 196q83 84 205 84h16q32 127 53 228h82zM418 411l-97 -392q86 0 150 86t64 175q0 63 -28 97.5t-89 33.5zM240 19l99 392 q-93 0 -154 -79t-61 -174q0 -51 33 -95t83 -44z" />
+<glyph unicode="&#x1d71a;" horiz-adv-x="509" d="M221 -187l-14 7q4 7 4 16q0 13 -15 24.5t-34.5 20t-44.5 24t-40 32.5q-37 43 -37 122q0 108 82 233q41 62 99.5 105.5t126.5 43.5t104.5 -42t36.5 -112q0 -115 -73.5 -206t-194.5 -91q-53 0 -86 30.5t-33 75.5h-2q-6 -22 -6 -44q0 -34 14.5 -57.5t35 -36.5t41 -24t35 -28 t14.5 -41q0 -23 -13 -52zM409 324q0 34 -15.5 61t-48.5 27q-64 0 -126.5 -91.5t-62.5 -193.5q0 -39 17.5 -73.5t52.5 -34.5q44 0 81 36t58 87t32.5 100t11.5 82z" />
+<glyph unicode="&#x1d71b;" horiz-adv-x="856" d="M866 428l-22 -73h-80q18 -35 18 -83q0 -61 -23.5 -115.5t-60 -90t-79.5 -56.5t-82 -21q-44 0 -72.5 24t-31.5 62q-71 -86 -154 -86q-70 0 -104 48.5t-34 109.5q0 123 90 208h-50q-76 0 -135 -87h-16q22 63 80 111.5t127 48.5h629zM690 355h-371q-96 -93 -96 -246 q0 -37 18 -63.5t50 -26.5q41 0 79 32.5t48 69.5q-4 30 -4 51q0 149 69 149q18 0 29 -14.5t11 -41.5q0 -68 -56 -149q0 -97 70 -97q41 0 81 49t62 110t22 106q0 42 -12 71z" />
+<glyph unicode="&#x1d71c;" horiz-adv-x="759" d="M724 23l-2 -23h-319l4 23h31q51 0 51 45q0 22 -2 34l-15 108h-159l-80 -139q-6 -12 -6 -22q0 -26 22 -26h56l-6 -23h-260l4 23q37 4 60.5 19t47.5 56l346 587h49l94 -624q6 -38 47 -38h37zM466 256l-23 178l-103 -178h126z" />
+<glyph unicode="&#x1d71d;" horiz-adv-x="726" d="M197 669h265q41 0 74.5 -3t68 -13t57.5 -26t38 -44t15 -66q0 -100 -100 -147q-27 -13 -64 -24q49 -9 89.5 -45.5t40.5 -87.5q0 -99 -73.5 -156t-225.5 -57h-340l4 23h40q42 0 58.5 14.5t24.5 47.5l116 502q2 8 2 22q-2 20 -13 28.5t-43 8.5h-37zM440 624l-58 -251 q12 -2 32 -2q24 0 40 4q54 12 81.5 52t27.5 98q0 22 -4.5 42t-22.5 38.5t-47 18.5h-49zM373 324l-64 -274q24 -5 52 -5q68 0 116.5 49t48.5 127q0 103 -122 103h-31z" />
+<glyph unicode="&#x1d71e;" horiz-adv-x="634" d="M749 669l-43 -184h-23q5 24 5 50q0 46 -27.5 67.5t-66.5 21.5h-155l-125 -542q-3 -15 -3 -25q0 -19 13.5 -26.5t45.5 -7.5h52l-5 -23h-375l4 23h36q43 0 60.5 14.5t24.5 46.5l115 503q3 15 3 37q-1 14 -12.5 18t-43.5 4h-38l3 23h555z" />
+<glyph unicode="&#x1d71f;" horiz-adv-x="632" d="M589 0h-557l405 685h48zM427 102l-44 332l-192 -332h236z" />
+<glyph unicode="&#x1d720;" horiz-adv-x="732" d="M754 669l-40 -168h-23q3 17 3 38q0 34 -22.5 54t-46.5 25.5t-52 5.5h-135l-55 -239h55q34 0 57 5t46.5 27.5t33.5 62.5h22l-54 -251h-23q6 24 6 65q0 46 -85 46h-69l-58 -258q-2 -12 -2 -17q0 -20 42 -20h65q111 0 171 36.5t91 124.5h22l-61 -206h-600l4 23h36 q42 0 60 14.5t25 46.5l115 504q2 12 2 16q0 42 -59 42h-37l4 23h562z" />
+<glyph unicode="&#x1d721;" horiz-adv-x="797" d="M830 669l-548 -623h194q32 0 55.5 2t52 10.5t49 23t38.5 41t28 64.5h23l-44 -187h-612l555 624h-177q-42 0 -68 -3t-60.5 -13.5t-60.5 -36.5t-43 -68h-23l46 166h595z" />
+<glyph unicode="&#x1d722;" horiz-adv-x="891" d="M946 669l-5 -23h-37q-43 0 -60 -14t-24 -47l-114 -503q-6 -21 -6 -22v-3q1 -19 12.5 -26.5t45.5 -7.5h41l-5 -23h-349l4 23h23q43 0 61.5 14.5t25.5 46.5l57 251h-242l-59 -253q0 -3 -2 -10.5t-2 -12.5q2 -21 14 -28.5t46 -7.5h25l-5 -23h-349l4 23h36q43 0 61 14.5 t25 46.5l115 503q3 12 3 21q0 38 -57 38h-40l6 23h348l-3 -23h-25q-44 0 -61 -14t-24 -46l-46 -203h242l47 204q3 12 3 23q0 36 -60 36h-37l3 23h364z" />
+<glyph unicode="&#x1d723;" horiz-adv-x="783" d="M533 440h23q-43 -93 -43 -199h-23v15q0 41 -30 41h-115q-23 0 -34 -9.5t-30 -46.5h-23q45 87 45 199h22q0 -33 9 -45t30 -12h116q17 0 28 11.5t25 45.5zM755 430q0 -84 -34.5 -165.5t-92 -143t-137 -99.5t-165.5 -38q-128 0 -199.5 74.5t-71.5 186.5q0 74 30.5 151.5 t84.5 142t136.5 105.5t176.5 41q127 0 199.5 -75.5t72.5 -179.5zM601 465q0 73 -32 123t-97 50q-53 0 -98 -31.5t-74 -79.5t-50 -107.5t-30.5 -114t-9.5 -100.5q0 -75 31.5 -124.5t94.5 -49.5q60 0 112 45.5t84 113t50.5 141t18.5 134.5z" />
+<glyph unicode="&#x1d724;" horiz-adv-x="502" d="M557 669l-4 -23h-38q-43 0 -60.5 -14.5t-24.5 -46.5l-116 -503q-1 -5 -1 -25q1 -18 13 -26t45 -8h37l-4 -23h-362l4 23h38q43 0 59 14t24 47l115 502q3 12 3 21q0 39 -57 39h-37l4 23h362z" />
+<glyph unicode="&#x1d725;" horiz-adv-x="795" d="M839 669l-4 -23q-38 0 -65.5 -14.5t-69.5 -48.5l-248 -201l191 -284q33 -49 60 -62t75 -13l-4 -23h-328l4 23h29q29 0 29 22q0 18 -16 40l-138 208l-48 -211q-1 -5 -1 -21q1 -21 13 -29.5t45 -8.5h38l-5 -23h-354l5 23h30q44 0 59 14t23 47l115 503q4 16 4 23 q0 36 -58 36h-37l4 23h347l-6 -23h-27q-40 0 -56.5 -15.5t-24.5 -48.5l-40 -178h2l243 198q15 13 15 23q0 9 -8.5 15t-22.5 6h-24l4 23h250z" />
+<glyph unicode="&#x1d726;" horiz-adv-x="759" d="M724 23l-2 -23h-319l4 23h31q51 0 51 45q0 22 -2 34l-44 332l-210 -363q-6 -12 -6 -22q0 -26 22 -26h56l-6 -23h-260l4 23q37 4 60.5 19t47.5 56l346 587h49l94 -624q6 -38 47 -38h37z" />
+<glyph unicode="&#x1d727;" horiz-adv-x="1016" d="M1071 669l-3 -23h-34q-46 0 -63.5 -15.5t-25.5 -49.5l-115 -499q-3 -10 -3 -20q0 -39 59 -39h39l-4 -23h-362l4 23h35q44 0 60.5 14.5t24.5 46.5l82 354h-1l-283 -438h-56l-90 441l-80 -348q-3 -15 -3 -40q2 -17 12.5 -23.5t42.5 -6.5h38l-3 -23h-300l4 23h36 q43 0 61.5 17.5t26.5 54.5l111 486q4 12 4 33q0 17 -13.5 24.5t-44.5 7.5h-39l4 23h246l91 -468l297 468h245z" />
+<glyph unicode="&#x1d728;" horiz-adv-x="869" d="M924 669l-3 -23h-38q-43 0 -61.5 -15t-25.5 -49l-131 -582h-57l-263 491l-92 -409q-2 -12 -2 -18v-8q1 -18 12.5 -25.5t44.5 -7.5h39l-4 -23h-301l4 23h36q43 0 60.5 14.5t24.5 46.5l117 510q-21 52 -71 52h-38l3 23h232l222 -435l80 350q2 7 2 20q0 42 -57 42h-37l4 23 h300z" />
+<glyph unicode="&#x1d729;" horiz-adv-x="718" d="M757 669l-38 -182h-23q4 15 4 30q0 46 -53 46h-337q-33 0 -59 -20t-34 -56h-23l38 182h525zM635 459l-51 -239h-23q4 16 4 31q-1 36 -45 36h-204q-40 0 -52.5 -13.5t-21.5 -53.5h-23l51 239h23q-5 -22 -5 -32q0 -20 11 -27t38 -7h203q31 0 47 14t25 52h23zM663 187 l-39 -187h-567l39 187h23q-4 -16 -4 -25q0 -50 71 -50h349q52 0 73.5 15.5t31.5 59.5h23z" />
+<glyph unicode="&#x1d72a;" horiz-adv-x="777" d="M755 432q0 -117 -58 -220.5t-157.5 -165.5t-213.5 -62q-128 0 -199.5 75t-71.5 188q0 107 51 206t151.5 165.5t225.5 66.5q127 0 199.5 -74.5t72.5 -178.5zM601 467q0 73 -32 122t-97 49t-118 -46.5t-83 -116t-45.5 -140t-15.5 -128.5q0 -75 31.5 -125.5t94.5 -50.5 q60 0 112 45.5t84 114t50.5 142t18.5 134.5z" />
+<glyph unicode="&#x1d72b;" horiz-adv-x="887" d="M942 669l-5 -23h-37q-43 0 -60 -13.5t-24 -46.5l-115 -504q-4 -20 -4 -26q0 -18 12.5 -25.5t45.5 -7.5h40l-5 -23h-349l5 23h22q45 0 61.5 11.5t24.5 49.5l123 540h-242l-124 -542q-3 -15 -3 -26q0 -15 8 -22.5t19 -9t32 -1.5h25l-5 -23h-348l5 23h35q42 0 59.5 14 t25.5 47l115 504q1 6 2 20t1 16q0 8 -15 15t-42 7h-40l5 23h752z" />
+<glyph unicode="&#x1d72c;" horiz-adv-x="612" d="M198 669h284q128 0 189.5 -38t61.5 -125q0 -83 -74 -144.5t-223 -61.5q-46 0 -67 3l-51 -221q-4 -20 -4 -24q2 -21 13.5 -28t46.5 -7h52l-4 -23h-380l4 23h40q43 0 60.5 14.5t24.5 46.5l115 504q3 12 3 21q-1 19 -14 28t-46 9h-37zM441 623l-61 -273q22 -5 40 -5 q69 0 113 49t44 127q0 44 -26 73.5t-80 29.5q-21 0 -30 -1z" />
+<glyph unicode="&#x1d72d;" horiz-adv-x="783" d="M755 430q0 -84 -34.5 -165.5t-92 -143t-137 -99.5t-165.5 -38q-128 0 -199.5 74.5t-71.5 186.5q0 74 30.5 151.5t84.5 142t136.5 105.5t176.5 41q127 0 199.5 -75.5t72.5 -179.5zM237 383h356q8 46 8 82q0 73 -32 123t-97 50q-58 0 -106.5 -38.5t-78.5 -93t-50 -123.5z M574 297h-356q-8 -45 -8 -92q0 -75 31.5 -124.5t94.5 -49.5q81 0 142.5 77t95.5 189z" />
+<glyph unicode="&#x1d72e;" horiz-adv-x="759" d="M787 669l-39 -168h-23q3 17 3 50q0 24 -9 39.5t-26 22t-33.5 9t-39.5 2.5h-212l159 -250l-286 -266h270q63 0 97.5 19t63.5 73h25l-76 -200h-597l372 338l-217 331h568z" />
+<glyph unicode="&#x1d72f;" horiz-adv-x="568" d="M700 669l-44 -187h-24q7 21 7 54q0 88 -111 88h-78l-123 -541q-4 -24 -4 -25q1 -19 12.5 -27t44.5 -8h42l-3 -23h-368l4 23h40q43 0 60.5 14.5t24.5 46.5l124 540h-75q-74 0 -119 -37.5t-60 -104.5h-22l43 187h629z" />
+<glyph unicode="&#x1d730;" horiz-adv-x="589" d="M721 681l-9 -23q-20 0 -42 -15t-36.5 -31t-40.5 -48l-200 -245l-54 -233q-4 -18 -4 -29q0 -19 12 -26.5t45 -7.5h40l-6 -23h-361l8 23h34q42 0 58 14t24 47l57 244l-80 205q-13 34 -22.5 52.5t-25 37.5t-36.5 27t-51 8l6 23q49 4 103 4q35 0 62 -9.5t42 -20.5t30 -36 t20 -38l17 -45l51 -141l151 181q47 57 88 81t120 24z" />
+<glyph unicode="&#x1d731;" horiz-adv-x="827" d="M546 587l-5 -24q49 0 93 -10t82 -29.5t60.5 -54t22.5 -79.5q0 -58 -26.5 -107t-67 -81t-90.5 -55t-96 -33t-84 -10h-1l-7 -32q-1 -6 -1 -19q0 -30 52 -30h47l-5 -23h-365l6 23q61 0 85.5 8.5t30.5 35.5l8 37q-109 0 -183 48.5t-74 140.5q0 67 35 121t90 85.5t116.5 47.5 t121.5 16l10 44q1 2 1 7q0 14 -16 23t-42 9h-41l5 23h364l-5 -23h-41q-39 0 -56 -14.5t-24 -44.5zM529 517l-85 -366q63 0 127.5 71.5t64.5 157.5q0 56 -29.5 96.5t-77.5 40.5zM298 151l85 366q-66 0 -131.5 -78t-65.5 -154q0 -59 31 -96.5t81 -37.5z" />
+<glyph unicode="&#x1d732;" horiz-adv-x="808" d="M830 669l-3 -23h-24q-15 0 -28.5 -3.5t-21.5 -6t-19.5 -13t-15 -14t-16.5 -19t-15 -18.5l-177 -212l98 -270q13 -35 26 -51t36 -16h36l-4 -23h-316l3 23h28q49 0 49 36q0 15 -5 27l-63 171l-154 -179q-8 -9 -8 -22q0 -14 10.5 -23.5t28.5 -9.5h42l-4 -23h-285l4 23 q84 10 142 77l198 229l-89 237q-29 80 -84 80h-27l4 23h318l-4 -23h-39q-34 0 -34 -27q0 -8 8 -32l53 -155l137 162q10 12 10 27q0 25 -28 25h-31l4 23h260z" />
+<glyph unicode="&#x1d733;" horiz-adv-x="694" d="M781 684l-5 -23q-9 0 -16.5 -2.5t-13.5 -9t-11 -12.5t-10 -16.5t-7.5 -17t-6 -19.5t-5 -18t-4.5 -18t-3 -14q-27 -118 -55 -158q-77 -112 -255 -112l-39 -171q-6 -24 -6 -36q0 -34 80 -34h17l-5 -23h-362l5 23h23q48 0 69.5 14t31.5 58l39 169q-48 0 -94 14t-81 49 t-35 84q0 33 18.5 94t18.5 94q0 21 -10 41.5t-29 21.5l5 23h33q62 0 94 -39t32 -102q0 -46 -17 -102q-13 -43 -13 -63q0 -64 89 -68l62 271q3 10 3 21q0 44 -72 44q-18 0 -25 -1l6 23h362l-6 -23h-29q-5 0 -23 -1.5t-24 -5.5t-17.5 -10.5t-17 -18.5t-9.5 -28l-63 -271 q87 0 124 85q12 26 23 77.5t18 71.5q25 69 68.5 104t114.5 35h33z" />
+<glyph unicode="&#x1d734;" horiz-adv-x="826" d="M300 92l6 31q-74 13 -116 62.5t-42 122.5q0 61 27 126t76 121.5t127.5 93t170.5 36.5q130 0 198 -69t68 -178q0 -115 -79 -201t-196 -114l-9 -31h153q42 0 63 75h23l-38 -167h-305l42 153q79 17 134 113t55 197q0 70 -30.5 122t-89.5 52q-62 0 -116.5 -55t-84.5 -134.5 t-30 -155.5q0 -118 83 -139l-28 -153h-305l38 167h23q-5 -25 -5 -38q0 -20 9 -28.5t32 -8.5h146z" />
+<glyph unicode="&#x1d735;" horiz-adv-x="632" d="M600 669l-405 -685h-48l-104 685h557zM441 567h-236l44 -332z" />
+<glyph unicode="&#x1d736;" horiz-adv-x="624" d="M630 450l-163 -259q-1 -6 -1 -12q0 -17 1 -23q9 -98 41 -98q35 0 58 76l24 -7q-34 -139 -121 -139q-33 0 -58 24.5t-31 54.5q-72 -77 -181 -77q-72 0 -113.5 43.5t-41.5 124.5q0 117 79.5 210t196.5 93q54 0 88 -28.5t48 -69.5l49 87h125zM369 281q0 60 -14.5 100.5 t-47.5 40.5q-43 0 -95 -83.5t-52 -195.5q0 -48 14.5 -82t42.5 -34q36 0 79 57.5t67 120.5q6 35 6 76z" />
+<glyph unicode="&#x1d737;" horiz-adv-x="555" d="M54 -114l114 487q24 104 63 166.5t102 107.5q53 38 129 38q51 0 86 -33.5t35 -84.5q0 -57 -31.5 -105t-81.5 -68v-2q38 -6 63 -36.5t25 -89.5q0 -65 -28.5 -127t-90 -106.5t-143.5 -44.5q-67 0 -97 18l-28 -124q-12 -54 -26 -87h-117q10 24 26 91zM304 480l-87 -393 q0 -30 19.5 -44.5t47.5 -14.5q64 0 110 74.5t46 152.5q0 117 -52 117q-9 0 -23.5 -3t-21.5 -3q-33 0 -33 25q0 14 14 25t42 11q7 0 30.5 -5.5t27.5 -5.5q26 0 41 43.5t15 88.5q0 40 -18 62.5t-44 22.5q-47 0 -72 -37t-42 -116z" />
+<glyph unicode="&#x1d738;" horiz-adv-x="490" d="M503 450l-264 -401q0 -35 -5 -73t-16 -80.5t-35 -70t-57 -27.5q-29 0 -43 19.5t-14 41.5q0 20 10 45.5t20.5 43.5t31.5 50t29 46q13 95 13 208q0 47 -10.5 94t-34.5 47q-38 0 -61 -81h-23q40 150 121 150q49 0 66.5 -36.5t17.5 -97.5q0 -48 -7 -125l135 247h126z" />
+<glyph unicode="&#x1d739;" horiz-adv-x="538" d="M44 169v1q0 89 67 166.5t170 94.5q-45 23 -74.5 55.5t-29.5 68.5q0 64 57 97t135 33q48 0 95 -17t47 -46q0 -62 -59 -62q-23 0 -40.5 12.5t-26.5 28t-25.5 28t-39.5 12.5q-68 0 -68 -56q0 -24 29.5 -46.5t71.5 -43.5t84 -46t71.5 -66t29.5 -93q0 -125 -91.5 -211.5 t-216.5 -86.5q-87 0 -136.5 47t-49.5 130zM422 259q0 55 -39 94.5t-68 39.5q-69 -17 -112 -84t-43 -154q0 -69 20.5 -96t67.5 -27q67 0 120.5 77.5t53.5 149.5z" />
+<glyph unicode="&#x1d73a;" horiz-adv-x="495" d="M451 389l-18 -7q-11 13 -19 20t-30 13.5t-54 6.5q-52 0 -89.5 -31.5t-37.5 -76.5q0 -24 16.5 -37.5t43.5 -13.5q5 0 31 4.5t43 4.5q47 0 47 -22q0 -37 -65 -37q-5 0 -27.5 3t-31.5 3q-38 0 -77 -30.5t-39 -78.5q0 -37 28.5 -56t72.5 -19q43 0 76.5 17.5t74.5 61.5l18 -8 q-92 -116 -224 -116q-72 0 -117 31.5t-45 76.5q0 48 29.5 86.5t78.5 55.5v3q-22 7 -35.5 27t-13.5 40q0 62 61 107t166 45q48 0 87.5 -22t49.5 -51z" />
+<glyph unicode="&#x1d73b;" horiz-adv-x="472" d="M330 685l7 -21q-39 -15 -59.5 -36.5t-20.5 -39.5q0 -33 31 -41q118 104 186 104q48 0 48 -30q0 -39 -65.5 -84t-133.5 -45q-73 -49 -123 -133t-50 -180q0 -42 26.5 -64t73.5 -22q73 0 114.5 -23.5t41.5 -69.5q0 -72 -74 -138q-74 -65 -121 -65q-37 0 -57 18.5t-20 44.5 q0 54 61 54q25 0 36.5 -21t25.5 -21q30 0 51.5 22t21.5 58q0 25 -14.5 35.5t-47.5 10.5q-5 0 -34 -3.5t-39 -3.5q-64 0 -107.5 41.5t-43.5 105.5q0 97 50.5 186.5t155.5 185.5q-29 4 -51.5 20t-22.5 39q0 39 38 70.5t116 45.5z" />
+<glyph unicode="&#x1d73c;" horiz-adv-x="517" d="M248 356l6 1q25 47 70.5 76t97.5 29q49 0 69 -19.5t20 -55.5q0 -26 -8 -64l-76 -325q-8 -35 -15 -94.5t-7 -87.5q0 -7 6 -21h-113q-13 25 -13 52q0 51 100 467q3 15 3 38q0 35 -29 35q-40 0 -92 -93.5t-74 -183.5l-26 -110h-115l74 318q6 26 6 52q0 22 -18 22 q-24 0 -61 -45l-20 12q28 43 71.5 73t89.5 30q60 0 60 -47q0 -19 -6 -59z" />
+<glyph unicode="&#x1d73d;" horiz-adv-x="566" d="M555 476q0 -127 -50.5 -241t-129.5 -180t-163 -66q-80 0 -124 61t-44 165q0 116 47 225.5t124 177t159 67.5q83 0 132 -54.5t49 -154.5zM184 359h243q13 67 13 128q0 87 -14.5 122.5t-51.5 35.5q-57 0 -110 -84.5t-80 -201.5zM417 315h-245q-15 -71 -15 -132 q0 -154 70 -154q57 0 107 83t83 203z" />
+<glyph unicode="&#x1d73e;" horiz-adv-x="318" d="M255 104l19 -12q-57 -101 -152 -101q-67 0 -67 56q0 16 4 31l64 276q6 26 6 36q0 18 -20 18q-21 0 -37 -3l-4 23l197 34l-77 -331q-8 -40 -8 -48q0 -10 6 -17.5t15 -7.5q5 0 10 2t8.5 4.5t9 8t8.5 9t9 11.5t9 11z" />
+<glyph unicode="&#x1d73f;" horiz-adv-x="560" d="M240 294l129 101q84 67 140 67q68 0 68 -50q0 -62 -59 -62q-18 0 -28.5 7t-13.5 16t-10.5 16t-19.5 7q-14 0 -49 -29l-114 -93l112 -199q18 -32 40 -42t63 -10l-5 -23h-269l5 23h29q28 0 28 15q0 14 -13 36l-60 107l-42 -181h-116l82 363q4 16 4 28q0 17 -26 17 q-15 0 -32 -3l-3 23l196 34z" />
+<glyph unicode="&#x1d740;" horiz-adv-x="570" d="M514 130h23q-13 -62 -45 -104t-83 -42q-69 0 -69 117q0 22 2.5 46t8 64t8.5 64l-192 -275h-112l302 435v50q0 130 -55 130q-37 0 -60 -77h-23q40 147 125 147q19 0 30.5 -11t16.5 -34.5t6.5 -45t1.5 -55.5v-387q0 -53 16.5 -75.5t38.5 -22.5q16 0 32.5 20t27.5 56z" />
+<glyph unicode="&#x1d741;" horiz-adv-x="636" d="M583 83l20 -12q-58 -103 -161 -103q-29 0 -43 18t-14 43q0 28 16 78l-3 1q-23 -44 -62 -77t-73 -33q-38 0 -55 27h-2l-15 -59l-13 -52q-4 -16 -10.5 -38.5t-10.5 -34.5t-9.5 -24.5t-11.5 -21.5h-103q24 40 48 138l122 517h113l-74 -317q-3 -12 -3 -23q1 -21 9.5 -29 t30.5 -8q49 0 103.5 91.5t82.5 203.5l21 82h111l-79 -339q-7 -28 -7 -44q0 -31 19 -31q22 0 53 47z" />
+<glyph unicode="&#x1d742;" horiz-adv-x="523" d="M510 455l24 -7q-30 -122 -102.5 -228t-188.5 -230h-52l-58 378q-5 34 -76 34l-2 23q99 4 182 34l45 -315h1q67 65 117.5 130.5t69.5 100.5t40 80z" />
+<glyph unicode="&#x1d743;" horiz-adv-x="476" d="M332 685l6 -23q-79 -32 -79 -73q0 -7 2.5 -13.5t5 -9.5t5.5 -5.5t3 -3.5q31 29 78 51.5t80 22.5q54 0 54 -29q0 -41 -53.5 -66t-121.5 -25q-32 0 -49 -23t-17 -55q0 -21 14 -43q68 39 134 39q74 0 74 -31q0 -22 -15.5 -37t-41 -21t-45 -8.5t-38.5 -2.5q-32 0 -64 8 q-56 -24 -95 -68.5t-39 -103.5q0 -39 23 -55t77 -16q97 0 142 -21.5t45 -72.5q0 -70 -67 -134q-73 -69 -128 -69q-37 0 -57 19t-20 46q0 23 15 37.5t44 14.5q20 0 30 -11t16.5 -21.5t18.5 -10.5q31 0 51.5 24.5t20.5 57.5q0 45 -61 45q-10 0 -34.5 -3.5t-35.5 -3.5 q-84 0 -133 29.5t-49 91.5q0 138 174 249q-28 27 -28 75q0 22 18 48t41 37v3q-23 3 -38 18.5t-15 37.5q0 75 152 105z" />
+<glyph unicode="&#x1d744;" horiz-adv-x="561" d="M539 297q0 -136 -90.5 -221.5t-217.5 -85.5q-88 0 -137.5 48.5t-49.5 131.5q0 126 87.5 209t207.5 83q91 0 145.5 -43t54.5 -122zM423 300q0 64 -25 93t-64 29q-64 0 -119 -88t-55 -176q0 -71 21 -99.5t67 -28.5q68 0 121.5 86t53.5 184z" />
+<glyph unicode="&#x1d745;" horiz-adv-x="579" d="M590 450l-21 -91h-113q-17 -46 -35 -119.5t-18 -115.5q0 -22 9 -41.5t25 -19.5q37 0 65 71l24 -6q-12 -53 -55.5 -94t-101.5 -41q-73 0 -73 83q0 24 7 61q9 44 33 123l29 99h-61q-10 -28 -24 -83.5t-26.5 -100t-31 -90.5t-47 -72t-65.5 -26q-71 0 -71 51q0 36 42 51 q39 14 58 68l71 202q-76 0 -118 -54h-23q43 76 92.5 110.5t130.5 34.5h298z" />
+<glyph unicode="&#x1d746;" horiz-adv-x="595" d="M58 -110l62 267q24 101 67.5 169t94.5 101q53 35 115 35q67 0 116 -45t49 -135q0 -119 -85.5 -206.5t-188.5 -87.5q-54 0 -87 19l-25 -110q-15 -69 -28 -102h-115q8 20 25 95zM252 240l-33 -152q1 -30 20.5 -45t47.5 -15q55 0 108 82t53 171q0 131 -76 131q-39 0 -72 -50 t-48 -122z" />
+<glyph unicode="&#x1d747;" horiz-adv-x="480" d="M508 388q0 -19 -16 -36t-40 -17q-29 0 -51.5 23.5t-45.5 23.5q-79 0 -146.5 -65t-67.5 -152q0 -39 23 -55t77 -16q97 0 142 -21.5t45 -72.5q0 -35 -19 -75t-48 -68q-64 -60 -128 -60q-37 0 -57 19t-20 46q0 23 15 37.5t44 14.5q20 0 30 -11t16.5 -21.5t18.5 -10.5 q31 0 51.5 24.5t20.5 57.5q0 45 -61 45q-10 0 -34.5 -3.5t-35.5 -3.5q-84 0 -133 29.5t-49 91.5q0 75 49 151.5t125 127.5q107 71 192 71q46 0 74.5 -19.5t28.5 -54.5z" />
+<glyph unicode="&#x1d748;" horiz-adv-x="592" d="M603 450l-21 -91h-176q8 -17 26 -32t34 -25.5t28.5 -33.5t12.5 -56q0 -91 -81.5 -156.5t-193.5 -65.5q-89 0 -138.5 47.5t-49.5 129.5q0 53 21 103.5t59.5 90.5t98.5 64.5t132 24.5h248zM391 208v1q0 56 -15 89.5t-44 60.5q-67 0 -119.5 -55t-52.5 -149q0 -70 21 -97.5 t67 -27.5q59 0 101 56t42 122z" />
+<glyph unicode="&#x1d749;" horiz-adv-x="469" d="M502 450l-21 -91h-149l-53 -189q-8 -29 -8 -56q0 -51 32 -51q37 0 67 71l22 -6q-11 -51 -55 -93t-94 -42q-38 0 -63.5 17t-25.5 53q0 52 15 100l59 196h-32q-36 0 -77 -23.5t-63 -65.5h-23q23 63 82.5 121.5t131.5 58.5h255z" />
+<glyph unicode="&#x1d74a;" horiz-adv-x="552" d="M303 423l5 39q102 0 164.5 -43t62.5 -131q0 -124 -90.5 -211t-200.5 -87q-74 0 -121 27.5t-47 81.5q0 20 12 71l29 125q12 53 12 66q0 27 -17 27q-24 0 -59 -45l-20 12q27 43 69 73t91 30q29 0 44 -13.5t15 -34.5q0 -23 -10 -67l-40 -172q-9 -40 -9 -64q0 -77 67 -77 q68 0 122 82t54 178q0 133 -133 133z" />
+<glyph unicode="&#x1d74b;" horiz-adv-x="706" d="M259 30l27 122q22 101 52 155t92 105q15 13 47 27.5t52 14.5q58 0 98 -44.5t40 -118.5q0 -115 -82 -204t-220 -97l-44 -195h-117l45 195q-92 7 -143 58.5t-51 129.5q0 120 88 202t209 82h41l-10 -39q-82 0 -147 -80.5t-65 -172.5q0 -54 24 -93.5t64 -46.5zM424 241 l-49 -211q63 6 119.5 85t56.5 182q0 62 -10 84.5t-29 22.5q-50 0 -88 -163z" />
+<glyph unicode="&#x1d74c;" horiz-adv-x="621" d="M676 450l-293 -361l13 -121q11 -102 44 -102q47 0 67 79h23q-17 -75 -44 -112t-73 -37q-23 0 -38 12.5t-22 38.5t-10 49.5t-4 60.5l-3 89l-182 -230h-121l302 364l-6 83q-5 72 -19.5 101t-40.5 29q-18 0 -38 -20.5t-29 -55.5h-23q8 59 36 102t85 43q39 0 56.5 -38 t20.5 -118l3 -86l177 230h119z" />
+<glyph unicode="&#x1d74d;" horiz-adv-x="701" d="M756 462l-5 -38q-53 -5 -80.5 -42t-42.5 -100q-12 -49 -23.5 -85t-33.5 -77.5t-50 -68t-72.5 -44t-99.5 -17.5l-44 -195h-116l44 195q-79 6 -123.5 49t-44.5 121q0 29 20.5 93t19.5 100q-2 61 -72 71l7 38h49q64 0 94 -32t30 -82q0 -34 -16 -99.5t-16 -98.5 q0 -50 16.5 -82.5t44.5 -37.5l98 420h116l-98 -420q28 0 53.5 24.5t45 65t33.5 81t24 83.5q10 40 21 67.5t32.5 55t56.5 41.5t83 14h49z" />
+<glyph unicode="&#x1d74e;" horiz-adv-x="687" d="M441 462h39q85 0 135 -49.5t50 -127.5q0 -115 -76 -205t-168 -90q-74 0 -104 65q-55 -65 -144 -65q-75 0 -113 50.5t-38 125.5q0 68 36 135.5t94 107.5q76 53 173 53h32l-10 -39q-56 0 -112 -47q-46 -39 -71.5 -107t-25.5 -142q0 -38 17 -67.5t43 -29.5q25 0 50.5 24 t38.5 66q-10 47 -10 84q0 62 27.5 115t79.5 53t52 -71q0 -68 -74 -179q-2 -10 -2 -18q0 -35 20 -54.5t46 -19.5q33 0 62.5 44.5t45 101t15.5 101.5q0 146 -116 146z" />
+<glyph unicode="&#x1d74f;" horiz-adv-x="559" d="M234 627l2 23q43 36 119 36q204 0 204 -256q0 -53 -12 -111.5t-39 -117.5t-64 -105.5t-92.5 -76t-120.5 -29.5q-89 0 -138 46.5t-49 129.5q0 119 89 206t209 87q41 0 80.5 -19t52.5 -51h4v8q2 18 2 27q0 48 -5.5 83.5t-21 69t-47.5 51t-80 17.5q-30 0 -93 -18zM423 293 q0 64 -25.5 95t-63.5 31q-64 0 -119 -88.5t-55 -176.5q0 -70 20.5 -97t67.5 -27q68 0 121.5 82.5t53.5 180.5z" />
+<glyph unicode="&#x1d750;" horiz-adv-x="481" d="M481 461l-26 -140h-23q0 24 -2.5 39.5t-10.5 31.5t-27 24t-49 8q-51 0 -98 -50.5t-65 -110.5h188l-10 -44h-188q-10 -30 -10 -66q0 -58 27 -88t74 -30q80 0 152 79l18 -6q-17 -22 -30.5 -36.5t-41 -36.5t-66 -33.5t-85.5 -11.5q-82 0 -123 45.5t-41 112.5q0 116 85 214.5 t198 98.5q41 0 67 -9.5t31 -9.5q26 0 33 19h23z" />
+<glyph unicode="&#x1d751;" horiz-adv-x="607" d="M584 241l-5 -31q-45 2 -67 6q-18 -47 -36.5 -81.5t-46.5 -71t-66.5 -56.5t-84.5 -20q-160 0 -160 128q0 21 8 62t8 45v4q0 23 -17 23q-24 0 -64 -49l-20 18q26 39 68.5 69t83.5 30q33 0 49.5 -24t16.5 -58q0 -11 -4 -31q-19 -84 -19 -120q0 -68 50 -68q68 0 128 228 q-204 98 -204 252q0 88 53.5 145t140.5 57q48 0 94 -26q80 -47 80 -190q0 -100 -44 -228q33 -11 58 -13zM454 541q0 119 -60 119q-42 0 -61 -48t-19 -98q0 -117 105 -215q35 146 35 242z" />
+<glyph unicode="&#x1d752;" horiz-adv-x="607" d="M630 450l-154 -146q-18 -36 -33 -93q-13 -48 -13 -78q0 -36 36 -36q31 0 46 -18q11 -12 11 -33q0 -26 -17 -43q-18 -18 -52 -18q-44 0 -65 36q-16 26 -16 69q0 80 39 154l-260 -244h-164l157 147q18 35 33 92q13 48 13 76q0 36 -36 36q-30 0 -45 18q-12 13 -12 33 q0 25 17 42q20 18 52 18q44 0 65 -35q16 -26 16 -69q0 -77 -38 -151l256 243h164z" />
+<glyph unicode="&#x1d753;" horiz-adv-x="683" d="M512 685l-51 -223q84 0 139 -43.5t55 -125.5q0 -66 -29 -127q-37 -80 -109.5 -125.5t-163.5 -50.5l-44 -195h-117l45 195q-86 6 -139.5 55.5t-53.5 132.5q0 64 32 126q40 76 111 117t158 41l50 223h117zM453 423l-90 -393q59 12 108 74.5t63 127.5q5 21 5 53 q0 48 -21.5 89.5t-64.5 48.5zM247 30l90 393q-73 -11 -125 -90.5t-52 -157.5q0 -52 21 -93.5t66 -51.5z" />
+<glyph unicode="&#x1d754;" horiz-adv-x="585" d="M252 -205h-19q3 7 3 15q0 19 -30 39.5t-66 38.5t-66 55.5t-30 86.5q0 100 38.5 198t115 166t172.5 68q89 0 141 -43t52 -125q0 -121 -87.5 -212.5t-209.5 -91.5q-88 0 -131 61l-5 -1q0 -37 23.5 -64.5t51.5 -41.5t51.5 -34t23.5 -44q0 -45 -28 -71zM448 297 q0 64 -25.5 94.5t-63.5 30.5q-42 0 -83.5 -44t-66 -107t-24.5 -119q0 -70 20.5 -96t67.5 -26q68 0 121.5 84.5t53.5 182.5z" />
+<glyph unicode="&#x1d755;" horiz-adv-x="868" d="M879 450l-21 -91h-73q15 -33 15 -75q0 -115 -76 -204.5t-168 -89.5q-74 0 -104 65q-55 -65 -144 -65q-75 0 -113 50.5t-38 125.5q0 107 78 193h-36q-92 0 -143 -91h-23q52 182 248 182h598zM668 359h-312q-40 -41 -61.5 -103t-21.5 -129q0 -38 17 -67.5t43 -29.5 q25 0 49.5 22.5t37.5 64.5q-6 34 -6 58q0 17 4 40.5t13.5 52t29.5 48t48 19.5q44 0 44 -68q0 -40 -13.5 -70.5t-42.5 -74.5q-2 -10 -2 -18q0 -35 20 -54.5t46 -19.5q33 0 62.5 44t45 100.5t15.5 101.5q0 51 -16 83z" />
+<glyph unicode="&#x1d756;" horiz-adv-x="690" d="M665 0h-130l-66 162h-248l-66 -162h-130l306 690h28zM428 264l-83 204l-83 -204h166z" />
+<glyph unicode="&#x1d757;" horiz-adv-x="636" d="M463 373l1 -4q75 -36 102.5 -79.5t27.5 -101.5q0 -81 -73 -134.5t-181 -53.5h-260v676h237q118 0 180 -43t62 -125q0 -41 -25 -77.5t-71 -57.5zM208 413h72q141 0 141 89q0 37 -23 54.5t-77 17.5h-113v-161zM208 102h103q80 0 110.5 29t30.5 80q0 52 -49.5 76t-119.5 24 h-75v-209z" />
+<glyph unicode="&#x1d758;" horiz-adv-x="591" d="M569 574h-359v-574h-130v676h477z" />
+<glyph unicode="&#x1d759;" horiz-adv-x="720" d="M680 0h-640l306 690h28zM508 102l-148 366l-148 -366h296z" />
+<glyph unicode="&#x1d75a;" horiz-adv-x="635" d="M597 102l-27 -102h-490v676h480v-102h-350v-167h241v-103h-241v-202h387z" />
+<glyph unicode="&#x1d75b;" horiz-adv-x="653" d="M623 102l-15 -102h-583v16l372 558h-334l13 102h525v-16l-374 -558h396z" />
+<glyph unicode="&#x1d75c;" horiz-adv-x="715" d="M635 0h-130v297h-295v-297h-130v676h130v-277h295v277h130v-676z" />
+<glyph unicode="&#x1d75d;" horiz-adv-x="778" d="M743 336q0 -157 -99 -256t-254 -99q-154 0 -254.5 99t-100.5 256t100 256t254 99t254 -99t100 -256zM605 336q0 115 -57 184t-159 69t-159 -69t-57 -184q0 -116 57 -184.5t160 -68.5q102 0 158.5 68.5t56.5 184.5zM531 296h-282l12 102h256z" />
+<glyph unicode="&#x1d75e;" horiz-adv-x="440" d="M375 102l-9 -102h-287l-14 102h90v472h-90l14 102h287l9 -102h-90v-472h90z" />
+<glyph unicode="&#x1d75f;" horiz-adv-x="712" d="M707 0h-170l-296 306l-33 -29v-277h-128v676h128v-263l295 263h145v-14l-318 -278z" />
+<glyph unicode="&#x1d760;" horiz-adv-x="706" d="M666 0h-130l-183 468l-183 -468h-130l299 690h28z" />
+<glyph unicode="&#x1d761;" horiz-adv-x="913" d="M833 0h-128v467l-235 -467h-27l-235 467v-467h-128v676h161l214 -440h3l214 440h161v-676z" />
+<glyph unicode="&#x1d762;" horiz-adv-x="724" d="M644 -18l-105 20l-331 500v-502h-128v676h157l279 -424v424h128v-694z" />
+<glyph unicode="&#x1d763;" horiz-adv-x="640" d="M582 584h-524l13 92h498zM503 299h-366v102h366v-102zM605 102l-12 -102h-546l-12 102h570z" />
+<glyph unicode="&#x1d764;" horiz-adv-x="778" d="M743 337q0 -157 -99 -256t-254 -99q-154 0 -254.5 99t-100.5 256t100 256t254 99t254 -99t100 -256zM605 337q0 115 -57 184t-159 69t-159 -69t-57 -184q0 -116 57 -184.5t160 -68.5q102 0 158.5 68.5t56.5 184.5z" />
+<glyph unicode="&#x1d765;" horiz-adv-x="715" d="M635 0h-130v574h-295v-574h-130v676h555v-676z" />
+<glyph unicode="&#x1d766;" horiz-adv-x="581" d="M80 676h209q139 0 209.5 -50.5t70.5 -144.5q0 -91 -69.5 -147t-186.5 -56h-103v-278h-130v676zM210 380h71q83 0 119.5 25t36.5 77q0 92 -162 92h-65v-194z" />
+<glyph unicode="&#x1d767;" horiz-adv-x="778" d="M743 336q0 -157 -99 -256t-254 -99q-154 0 -254.5 99t-100.5 256t100 256t254 99t254 -99t100 -256zM177 398h423q-14 89 -68.5 140t-142.5 51t-142.5 -51t-69.5 -140zM603 296h-428q9 -99 65 -156t150 -57q93 0 148 57t65 156z" />
+<glyph unicode="&#x1d768;" horiz-adv-x="674" d="M632 102l-15 -102h-586v16l281 330l-284 314v16h562v-102h-330l205 -226l-210 -246h377z" />
+<glyph unicode="&#x1d769;" horiz-adv-x="641" d="M627 574h-240v-574h-130v574h-243l14 102h589z" />
+<glyph unicode="&#x1d76a;" horiz-adv-x="748" d="M728 675l-33 -98q-36 12 -52 12q-17 0 -31.5 -3.5t-38.5 -20.5t-44.5 -47.5t-45 -91t-44.5 -144.5v-282h-130v282q-20 84 -44.5 144.5t-45 91t-44.5 47.5t-38.5 20.5t-31.5 3.5q-12 0 -53 -11l-32 97q49 16 88 16q20 0 44 -5t58.5 -22.5t64 -44t57 -75t41.5 -111.5 q19 76 56 131t78.5 80.5t74 36t58.5 10.5q39 0 88 -16z" />
+<glyph unicode="&#x1d76b;" horiz-adv-x="800" d="M465 676v-102q80 -3 148.5 -28.5t115 -79.5t46.5 -127t-46.5 -128.5t-115 -82t-148.5 -29.5v-99h-130v99q-126 4 -218 67.5t-92 172.5q0 73 46 127t114.5 79.5t149.5 28.5v102h130zM464 472v-271q90 6 131.5 45t41.5 93q0 53 -41.5 90.5t-131.5 42.5zM336 201v271 q-90 -5 -131.5 -42.5t-41.5 -90.5q0 -54 41.5 -93t131.5 -45z" />
+<glyph unicode="&#x1d76c;" horiz-adv-x="740" d="M700 0h-154l-179 239l-173 -239h-154l249 343l-248 333h154l170 -228l166 228h154l-242 -333z" />
+<glyph unicode="&#x1d76d;" horiz-adv-x="806" d="M791 691l-31 -102q-18 -3 -29 -15.5t-15 -34t-5 -35t-1 -36.5q0 -93 -72.5 -148t-169.5 -61v-259h-130v259q-97 6 -169.5 62.5t-72.5 150.5q0 22 -1 35.5t-5 34t-15 32.5t-29 15l-31 102h39q77 0 124.5 -49.5t47.5 -162.5q0 -48 30 -79.5t82 -37.5v314h130v-314 q52 6 82 37.5t30 79.5q0 112 48 162t124 50h39z" />
+<glyph unicode="&#x1d76e;" horiz-adv-x="752" d="M720 102l-15 -102h-295l11 207q70 17 116.5 64t46.5 126q0 87 -58.5 139.5t-149.5 52.5q-90 0 -149 -58t-59 -134q0 -148 163 -191l11 -206h-295l-15 102h202l-4 29q-72 19 -131 87.5t-59 166.5q0 76 36.5 144.5t115 115t184.5 46.5q153 0 244.5 -91.5t91.5 -214.5 q0 -98 -59 -166.5t-131 -87.5l-4 -29h202z" />
+<glyph unicode="&#x1d76f;" horiz-adv-x="735" d="M685 664l-306 -694h-28l-306 694h640zM512 560h-294l147 -361z" />
+<glyph unicode="&#x1d770;" horiz-adv-x="662" d="M629 461l-116 -245q11 -35 20 -55q33 -80 92 -80v-16l-35 -79q-59 0 -87 13q-43 20 -65 78h-2q-30 -43 -64 -64q-43 -27 -115 -27q-94 0 -155.5 69t-61.5 172q0 95 64.5 170.5t170.5 75.5q116 0 181 -98l44 86h129zM383 209q-8 78 -39.5 123.5t-74.5 45.5 q-48 0 -76 -42.5t-28 -103.5q0 -65 28 -108t77 -43q42 0 70 38t43 90z" />
+<glyph unicode="&#x1d771;" horiz-adv-x="512" d="M372 416l2 -1q50 -12 81.5 -61t31.5 -106q0 -62 -19.5 -118t-55.5 -92q-53 -52 -140 -52q-55 0 -97 38v-135q0 -61 -17 -94h-119q16 37 16 88v527q0 57 10 103.5t33 88.5t67.5 66t107.5 24q67 0 118 -42.5t51 -111.5q0 -85 -70 -122zM175 442v-292q22 -38 41.5 -53.5 t50.5 -15.5q34 0 64.5 42t30.5 108q0 44 -9.5 71t-32 39t-44.5 15t-62 3v16l42 79q71 0 71 76q0 27 -14.5 47t-46.5 20q-91 0 -91 -155z" />
+<glyph unicode="&#x1d772;" horiz-adv-x="502" d="M477 461l-174 -411v-245l-13 -10l-107 24q8 124 8 227q0 104 -33 198q-17 49 -56 91.5t-92 42.5v16l50 79q75 0 135.5 -87.5t66.5 -177.5h2l83 253h130z" />
+<glyph unicode="&#x1d773;" horiz-adv-x="502" d="M380 539h-17q-60 58 -107 58q-21 0 -38 -12t-17 -34q0 -35 91 -80q90 -43 137.5 -102t47.5 -156q0 -87 -59 -157t-167 -70t-167 69.5t-59 157.5q0 75 35 131t102 84q-81 45 -81 123q0 69 51.5 105t127.5 36q57 0 99.5 -15.5t74.5 -58.5zM352 208q0 58 -20 92.5t-64 53.5 q-55 -3 -86.5 -43t-31.5 -103q0 -51 28.5 -89t71.5 -38q49 0 75.5 37.5t26.5 89.5z" />
+<glyph unicode="&#x1d774;" horiz-adv-x="451" d="M389 140l45 -61q-42 -60 -89 -76.5t-123 -16.5q-109 0 -162 53q-35 36 -35 91q0 34 19.5 64.5t60.5 44.5v3q-60 33 -60 90q0 66 58 103.5t139 37.5q69 0 112 -19.5t66 -70.5l-53 -61h-16q-22 34 -42.5 45t-60.5 11q-37 0 -60 -11.5t-23 -32.5q0 -41 72 -41h57l40 -82 l-11 -13h-96q-37 0 -57 -16.5t-20 -38.5q0 -25 24.5 -43.5t64.5 -18.5q98 0 134 59h16z" />
+<glyph unicode="&#x1d775;" horiz-adv-x="500" d="M281 81h56q58 0 104.5 -31t46.5 -96q0 -72 -46 -115.5t-122 -43.5q-53 0 -76 21v98h16q26 -24 61 -24q72 0 72 50q0 46 -79 46h-90q-81 0 -126 38q-70 61 -70 190q0 81 32 156t91 131v3q-64 41 -64 107q0 50 24 81h16l76 -17q-14 -30 -14 -54q0 -38 33 -53q53 31 82 43 t80 23h17l17 -95q-101 -11 -182 -92q-37 -37 -60 -95t-23 -124q0 -57 24 -96q33 -51 104 -51z" />
+<glyph unicode="&#x1d776;" horiz-adv-x="510" d="M474 -205h-127q-12 24 -12 95v419q0 69 -65 69q-24 0 -51.5 -21t-43.5 -64v-293h-120v349q0 51 -20 89l101 35h9q18 -20 26 -62h2q60 62 133 62q74 0 111.5 -39t37.5 -113v-437q0 -54 19 -89z" />
+<glyph unicode="&#x1d777;" horiz-adv-x="500" d="M477 341q0 -88 -25.5 -167t-78.5 -133.5t-123 -54.5t-123 54.5t-78.5 133.5t-25.5 167q0 87 25.5 165.5t78.5 132t123 53.5t123 -53.5t78.5 -132t25.5 -165.5zM148 388h204q0 82 -29 144.5t-73 62.5q-48 0 -75 -61t-27 -146zM352 293h-204q0 -89 29 -150.5t73 -61.5 q45 0 73.5 62t28.5 150z" />
+<glyph unicode="&#x1d778;" horiz-adv-x="319" d="M296 108l-14 -100q-39 -22 -90 -22q-68 0 -101 32q-38 36 -38 98v345h120v-298q0 -82 53 -82q28 0 54 27h16z" />
+<glyph unicode="&#x1d779;" horiz-adv-x="527" d="M512 0h-155l-163 187l-19 -20v-167h-120v461h120v-163h2q140 160 286 175l38 -79v-16q-55 -5 -97.5 -22.5t-64 -34.5t-62.5 -55z" />
+<glyph unicode="&#x1d77a;" horiz-adv-x="554" d="M520 65l-46 -79q-59 0 -101.5 36t-69.5 139l-36 137l-118 -298h-131l206 459q-21 83 -59.5 110.5t-97.5 27.5v16l50 79q68 0 118.5 -48t85.5 -166l76 -256q23 -79 49 -110t74 -31v-16z" />
+<glyph unicode="&#x1d77b;" horiz-adv-x="550" d="M517 65l-35 -79q-113 0 -136 70h-2q-16 -34 -43.5 -52t-56.5 -18q-49 0 -71 24h-2v-121q0 -61 -17 -94h-115q16 41 16 88v578h120v-312q0 -68 66 -68q29 0 54.5 21t39.5 62v297h120v-306q0 -36 12 -55t50 -19v-16z" />
+<glyph unicode="&#x1d77c;" horiz-adv-x="492" d="M339 453l116 20q17 -31 17 -109q0 -87 -54 -175t-146 -145.5t-191 -57.5h-26v475h120v-331h2q74 24 122 91t48 146q0 48 -13 76z" />
+<glyph unicode="&#x1d77d;" horiz-adv-x="501" d="M277 81h61q58 0 104.5 -31t46.5 -96q0 -72 -46 -115.5t-122 -43.5q-53 0 -76 21v98h16q26 -24 61 -24q72 0 72 50q0 46 -79 46h-89q-83 0 -140.5 50.5t-57.5 131.5q0 63 35 117t102 89v3q-59 27 -59 88q0 51 44 89q-25 17 -35.5 32.5t-10.5 43.5q0 32 23 62h16l77 -17 q-14 -18 -14 -35q0 -23 28 -38q84 32 143 32l11 -3l8 -92q-71 0 -120.5 -21.5t-49.5 -58.5q0 -30 36 -41q61 21 158 21l8 -5l-8 -90q-109 0 -188 -45.5t-79 -117.5q0 -100 124 -100z" />
+<glyph unicode="&#x1d77e;" horiz-adv-x="501" d="M476 229q0 -105 -64.5 -174t-161.5 -69q-95 0 -160 68.5t-65 173.5q0 109 64.5 177t164.5 68q95 0 158.5 -69t63.5 -175zM351 232q0 69 -26.5 107.5t-77.5 38.5q-48 0 -72.5 -41.5t-24.5 -104.5q0 -66 26 -108.5t74 -42.5q28 0 48.5 14.5t31.5 38t16 48.5t5 50z" />
+<glyph unicode="&#x1d77f;" horiz-adv-x="594" d="M572 366h-99q-12 -90 -12 -175q0 -55 19 -78.5t77 -31.5v-17l-40 -78q-28 0 -49 3t-47.5 12.5t-43.5 26.5t-29 48t-12 74q0 76 17 216h-76q0 -47 -0.5 -75t-2.5 -65.5t-6 -60t-11 -50.5t-17 -44t-25 -33.5t-34 -27t-44.5 -16t-57.5 -8.5l-13 95q26 7 36.5 10.5t24 15.5 t17 25t8 46t5 70.5t0.5 105.5q-15 0 -33.5 -19t-28.5 -55l-85 38q46 143 189 143h373v-95z" />
+<glyph unicode="&#x1d780;" horiz-adv-x="511" d="M54 -117v242q0 95 8.5 147.5t37.5 104.5q55 96 182 96q90 0 147 -63t57 -163q0 -138 -75 -210q-52 -51 -139 -51q-52 0 -98 41v-138q0 -61 -17 -94h-119q16 37 16 88zM361 230q0 148 -89 148q-69 0 -90 -92q-8 -33 -8 -136q22 -38 41.5 -53.5t50.5 -15.5q45 0 70 44 t25 105z" />
+<glyph unicode="&#x1d781;" horiz-adv-x="498" d="M279 81h56q58 0 104.5 -31t46.5 -96q0 -72 -46 -115.5t-122 -43.5q-53 0 -76 21v98h16q26 -24 61 -24q72 0 72 50q0 46 -79 46h-80q-87 0 -146.5 60t-59.5 152q0 119 76.5 197t194.5 78q62 0 115 -26.5t67 -78.5l-72 -57h-17q-18 67 -95 67q-67 0 -105.5 -45t-38.5 -107 q0 -60 21 -94q33 -51 107 -51z" />
+<glyph unicode="&#x1d782;" horiz-adv-x="520" d="M552 366h-165v-2q42 -33 65 -77t23 -88q0 -31 -14 -66.5t-40 -69t-70.5 -55.5t-98.5 -22q-96 0 -161.5 67.5t-65.5 171.5q0 62 22.5 110t58 74t72.5 39t73 13h301v-95zM350 210q0 102 -103 156q-45 0 -71 -38t-26 -99q0 -65 26.5 -106.5t75.5 -41.5q48 0 73 41t25 88z " />
+<glyph unicode="&#x1d783;" horiz-adv-x="479" d="M472 366h-153q-12 -90 -12 -175q0 -52 23.5 -77t83.5 -33v-17l-40 -78q-28 0 -50 3t-50 12.5t-46.5 26.5t-32 48t-13.5 74q0 76 21 216q-49 0 -74.5 -27.5t-37.5 -73.5l-85 38q26 81 64 119.5t105 38.5h297v-95z" />
+<glyph unicode="&#x1d784;" horiz-adv-x="514" d="M247 378v95q105 0 173.5 -61.5t68.5 -182.5q0 -105 -65 -174t-161 -69q-101 0 -154.5 50.5t-53.5 140.5v147q0 91 -20 113l102 36h16q22 -41 22 -73v-193q0 -52 21.5 -89t68.5 -37q48 0 73.5 46t25.5 96q0 155 -117 155z" />
+<glyph unicode="&#x1d785;" horiz-adv-x="634" d="M258 81v102q0 39 0.5 61.5t4 57.5t9.5 55.5t18 45.5t29.5 38t44.5 22.5t61 9.5q68 0 126 -67.5t58 -181.5q0 -99 -57.5 -168.5t-174.5 -69.5v-191h-120v191q-117 0 -174.5 69t-57.5 169q0 74 36 145t94 92l69 -58v-12q-74 -39 -74 -158q0 -152 108 -152zM376 212v-131 q108 0 108 150q0 80 -12 113.5t-47 33.5q-32 0 -40.5 -40.5t-8.5 -125.5z" />
+<glyph unicode="&#x1d786;" horiz-adv-x="573" d="M553 461l-215 -340q5 -89 44 -156t117 -75v-16l-48 -79q-39 0 -73 19.5t-57 52.5t-38.5 67t-24.5 70l-1 4l-110 -203h-138l210 333q-2 44 -11.5 82t-28 74.5t-53 58.5t-80.5 25v16l50 79q78 0 129 -60t75 -156l1 -4l114 208h138z" />
+<glyph unicode="&#x1d787;" horiz-adv-x="680" d="M699 473l-22 -95q-49 -17 -49 -152q0 -104 -48 -165t-158 -75v-191h-120v191q-206 24 -206 240q0 135 -49 152l-22 95q89 0 142.5 -55.5t53.5 -142.5q0 -109 14.5 -145.5t66.5 -48.5v380h120v-380q50 13 65.5 50t15.5 144q0 86 53.5 142t142.5 56z" />
+<glyph unicode="&#x1d788;" horiz-adv-x="740" d="M455 410l81 51q69 -19 111 -89.5t42 -151.5q0 -131 -70 -193q-47 -41 -117 -41q-44 0 -81 22t-55 61h-2q-16 -39 -53.5 -61t-81.5 -22q-76 0 -120 43q-67 62 -67 191q0 80 41.5 151t109.5 90l83 -51v-16q-56 -22 -82.5 -71.5t-26.5 -108.5q0 -133 62 -133q75 0 75 145v92 l107 29l13 -10v-111q0 -75 22 -110t56 -35q62 0 62 133q0 60 -26 109t-83 71v16z" />
+<glyph unicode="&#x1d789;" horiz-adv-x="501" d="M103 608l30 83q77 -4 136.5 -28.5t98 -62.5t63.5 -90.5t35 -109.5t10 -123q0 -154 -72 -227q-64 -64 -154 -64q-96 0 -160.5 68.5t-64.5 173.5q0 106 63 175.5t160 69.5q49 0 90 -33l3 2q-55 152 -222 154zM351 232q0 69 -26.5 107.5t-77.5 38.5q-48 0 -72.5 -41.5 t-24.5 -104.5q0 -66 26 -108.5t74 -42.5q28 0 48.5 14.5t31.5 38t16 48.5t5 50z" />
+<glyph unicode="&#x1d78a;" horiz-adv-x="462" d="M373 145l67 -65q-46 -56 -85.5 -75t-109.5 -19q-95 0 -157.5 66.5t-62.5 168.5q0 111 67 181.5t164 70.5q88 0 130 -30v-124h-16q-16 27 -38.5 41t-37.5 16t-37 2q-35 0 -66 -22.5t-39 -65.5h149v-95h-150q5 -48 36.5 -77.5t77.5 -29.5q70 0 108 57z" />
+<glyph unicode="&#x1d78b;" horiz-adv-x="536" d="M522 380v-95q-18 0 -43 5v-31q0 -130 -60 -201.5t-158 -71.5q-100 0 -153 50.5t-53 140.5v65q0 81 -20 103l102 36h16q22 -41 22 -73v-101q0 -53 20.5 -89.5t67.5 -36.5q91 0 91 172q0 44 -1 68q-222 72 -222 237q0 67 40 100.5t93 33.5q82 0 137.5 -76t70.5 -227 q24 -6 50 -9zM351 431q-3 78 -27 121.5t-61 43.5t-37 -48q0 -30 35.5 -67t89.5 -50z" />
+<glyph unicode="&#x1d78c;" horiz-adv-x="570" d="M554 85v-88q-39 -11 -71 -11q-61 0 -100.5 50t-46.5 152l-225 -202l-97 91l121 108v12q0 101 -19 141q-20 39 -68 39q-9 0 -21 -3v88q39 11 61 11q121 0 127 -215l240 215l97 -91l-136 -122q0 -78 29 -128t88 -50q9 0 21 3z" />
+<glyph unicode="&#x1d78d;" horiz-adv-x="634" d="M377 692v-219q51 0 91 -13t66 -35.5t43 -54.5t24.5 -66.5t7.5 -74.5q0 -106 -57 -174.5t-175 -68.5v-191h-120v191q-118 0 -175 68.5t-57 174.5q0 108 55 176t177 68v219h120zM376 378v-297q108 0 108 150q0 75 -30 111t-78 36zM258 81v297q-48 0 -78 -36t-30 -111 q0 -150 108 -150z" />
+<glyph unicode="&#x1d78e;" horiz-adv-x="494" d="M299 -205h-17q-5 14 -26.5 24t-60 30.5t-73.5 53.5q-97 93 -97 279q0 154 72 227q64 64 155 64q95 0 156 -69t61 -175t-62 -174.5t-159 -68.5q-49 0 -90 33l-3 -2q11 -29 38 -48.5t57.5 -30.5t59.5 -23t48 -36t19 -60zM344 232q0 146 -99 146q-47 0 -71 -46t-24 -110 q0 -65 24.5 -103t73.5 -38q52 0 74 46t22 105z" />
+<glyph unicode="&#x1d78f;" horiz-adv-x="848" d="M839 366h-92q39 -69 39 -146q0 -136 -70 -193q-50 -41 -117 -41q-95 0 -136 83h-2q-39 -83 -135 -83q-76 0 -120 43q-67 62 -67 184q0 86 45 152q-41 -4 -61 -30t-32 -70l-85 38q26 81 64 119.5t105 38.5h664v-95zM521 307v-81q0 -75 22 -110t56 -35q62 0 62 133 q0 98 -62 152h-273q-62 -54 -62 -152q0 -57 16 -95t46 -38q75 0 75 145v62l107 29z" />
+<glyph unicode="&#x1d790;" horiz-adv-x="690" d="M665 0h-130l-26 162h-248l-106 -162h-130l478 690h28zM493 264l-32 204l-134 -204h166z" />
+<glyph unicode="&#x1d791;" horiz-adv-x="706" d="M228 676h237q206 0 206 -125q0 -53 -35 -102t-101 -76l1 -4q92 -49 92 -128q0 -100 -90 -170.5t-218 -70.5h-260zM290 413h72q88 0 128 32.5t40 79.5q0 49 -86 49h-113zM213 102h103q86 0 128.5 37t42.5 93q0 41 -42 60t-105 19h-75z" />
+<glyph unicode="&#x1d792;" horiz-adv-x="602" d="M705 676l-13 -102h-359l-143 -574h-130l168 676h477z" />
+<glyph unicode="&#x1d793;" horiz-adv-x="720" d="M680 0h-640l478 690h28zM533 102l-57 366l-239 -366h296z" />
+<glyph unicode="&#x1d794;" horiz-adv-x="683" d="M708 676l-25 -102h-350l-42 -167h241l-26 -103h-241l-50 -202h387l-52 -102h-490l168 676h480z" />
+<glyph unicode="&#x1d795;" horiz-adv-x="707" d="M769 676l-4 -16l-513 -558h396l-40 -102h-583l3 16l512 558h-334l38 102h525z" />
+<glyph unicode="&#x1d796;" horiz-adv-x="748" d="M783 676l-168 -676h-130l74 297h-295l-74 -297h-130l168 676h130l-69 -277h295l69 277h130z" />
+<glyph unicode="&#x1d797;" horiz-adv-x="847" d="M600 398l-12 -102h-282l38 102h256zM822 434q0 -95 -38.5 -180.5t-102 -144.5t-145.5 -93.5t-167 -34.5q-128 0 -203.5 70t-75.5 188q0 95 39.5 180t103 144t145.5 93.5t167 34.5q127 0 202 -70t75 -187zM684 425q0 77 -42 120.5t-123 43.5q-119 0 -205 -98.5t-86 -243.5 q0 -77 42.5 -120.5t123.5 -43.5q122 0 206 102t84 240z" />
+<glyph unicode="&#x1d798;" horiz-adv-x="435" d="M505 676l-16 -102h-90l-118 -472h90l-34 -102h-287l11 102h90l118 472h-90l39 102h287z" />
+<glyph unicode="&#x1d799;" horiz-adv-x="712" d="M796 676l-3 -14l-388 -278l282 -384h-170l-220 306l-40 -29l-69 -277h-128l168 676h128l-66 -263l361 263h145z" />
+<glyph unicode="&#x1d79a;" horiz-adv-x="686" d="M646 0h-130l-67 468l-299 -468h-130l471 690h28z" />
+<glyph unicode="&#x1d79b;" horiz-adv-x="933" d="M981 676l-168 -676h-128l116 467l-351 -467h-27l-119 467l-116 -467h-128l168 676h161l104 -440h3l324 440h161z" />
+<glyph unicode="&#x1d79c;" horiz-adv-x="744" d="M792 676l-173 -694l-100 20l-206 500l-125 -502h-128l168 676h157l173 -424l106 424h128z" />
+<glyph unicode="&#x1d79d;" horiz-adv-x="690" d="M737 676l-10 -112h-524l36 112h498zM602 411l-25 -122h-366l25 122h366zM630 122l-37 -122h-546l13 122h570z" />
+<glyph unicode="&#x1d79e;" horiz-adv-x="849" d="M824 434q0 -42 -13 -97q-40 -157 -163.5 -256t-278.5 -99q-128 0 -203.5 70t-75.5 187q0 126 66.5 231.5t170.5 163.5t218 58q128 0 203.5 -70.5t75.5 -187.5zM685 425q0 77 -42 121t-123 44q-120 0 -205.5 -98.5t-85.5 -244.5q0 -77 42 -120t123 -43q103 0 176.5 68.5 t102.5 184.5q12 48 12 88z" />
+<glyph unicode="&#x1d79f;" horiz-adv-x="745" d="M783 676l-168 -676h-130l143 574h-295l-143 -574h-130l168 676h555z" />
+<glyph unicode="&#x1d7a0;" horiz-adv-x="581" d="M228 676h209q238 0 238 -144q0 -110 -90.5 -182t-222.5 -72h-103l-69 -278h-130zM284 380h71q89 0 137 32t48 92q0 70 -142 70h-65z" />
+<glyph unicode="&#x1d7a1;" horiz-adv-x="847" d="M822 434q0 -95 -38.5 -180.5t-102 -144.5t-145.5 -93.5t-167 -34.5q-128 0 -203.5 70t-75.5 188q0 95 39.5 180t103 144t145.5 93.5t167 34.5q127 0 202 -70t75 -187zM257 398h426q1 10 1 27q0 77 -42 120.5t-123 43.5q-84 0 -155 -52t-107 -139zM662 296h-431 q-3 -24 -3 -49q0 -77 42.5 -120.5t123.5 -43.5q91 0 163 59.5t105 153.5z" />
+<glyph unicode="&#x1d7a2;" horiz-adv-x="696" d="M748 676l-25 -102h-330l148 -226l-271 -246h377l-40 -102h-586l3 16l364 330l-206 314l4 16h562z" />
+<glyph unicode="&#x1d7a3;" horiz-adv-x="641" d="M715 676l-15 -102h-240l-143 -574h-130l143 574h-243l39 102h589z" />
+<glyph unicode="&#x1d7a4;" horiz-adv-x="671" d="M799 675l-58 -98q-33 12 -49 12q-17 0 -32 -3.5t-43.5 -20.5t-56.5 -47.5t-67.5 -91t-80.5 -144.5l-70 -282h-130l70 282q0 157 -28 227q-31 80 -100 80q-13 0 -55 -11l-8 97q54 16 92 16q18 0 40 -4.5t50.5 -20t51.5 -39t40 -66t19 -96.5q0 -20 -1 -32q39 76 89.5 131 t98 80.5t83 36t61.5 10.5q39 0 84 -16z" />
+<glyph unicode="&#x1d7a5;" horiz-adv-x="835" d="M603 676l-25 -102q108 -3 182.5 -52t74.5 -134q0 -66 -35.5 -122t-91.5 -90.5t-120.5 -54.5t-128.5 -22l-24 -99h-130l24 99q-109 3 -183 52.5t-74 136.5q0 67 35 122t90.5 89.5t120.5 53.5t130 21l25 102h130zM551 472l-67 -271q103 6 157 57t54 110q0 42 -34.5 71 t-109.5 33zM356 201l67 271q-107 -6 -158.5 -55t-51.5 -110q0 -43 34 -72t109 -34z" />
+<glyph unicode="&#x1d7a6;" horiz-adv-x="740" d="M833 676l-325 -333l172 -343h-154l-120 239l-232 -239h-154l334 343l-165 333h154l113 -228l223 228h154z" />
+<glyph unicode="&#x1d7a7;" horiz-adv-x="791" d="M901 691l-57 -102q-53 -9 -80 -121q-23 -93 -109 -148t-185 -61l-64 -259h-130l64 259q-81 5 -138 49t-57 117q0 16 9 55t9 60q0 42 -33 49l-5 102h39q131 0 131 -127q0 -14 -8 -54t-8 -62q0 -36 22.5 -58.5t64.5 -27.5l78 314h130l-78 -314q53 6 91 37.5t50 79.5 q28 112 88.5 162t136.5 50h39z" />
+<glyph unicode="&#x1d7a8;" horiz-adv-x="816" d="M259 102l3 29q-54 15 -94.5 65.5t-40.5 124.5q0 61 30.5 125.5t84 119.5t134.5 90t172 35q129 0 198.5 -67t69.5 -167q0 -65 -26.5 -124t-67 -99t-84.5 -66.5t-84 -36.5l-11 -29h202l-40 -102h-295l62 207q85 20 151 81.5t66 160.5q0 65 -45.5 102.5t-121.5 37.5 q-107 0 -185 -77.5t-78 -165.5q0 -105 123 -140l-40 -206h-295l10 102h202z" />
+<glyph unicode="&#x1d7a9;" horiz-adv-x="780" d="M760 664l-453 -694h-28l-159 694h640zM565 560h-294l70 -361z" />
+<glyph unicode="&#x1d7aa;" horiz-adv-x="678" d="M703 462l-177 -246q0 -2 1.5 -19.5t3 -25t4.5 -24.5t8.5 -26t13.5 -19.5t20 -15.5t28 -5l-4 -16l-55 -79q-22 0 -33.5 0.5t-31 5.5t-30.5 14t-21 27t-13 44h-2q-27 -27 -47.5 -43.5t-62 -32t-92.5 -15.5q-77 0 -121.5 47t-44.5 124q0 50 22.5 105t60.5 102t97 78t125 31 q117 0 157 -97l65 86h129zM399 261q0 56 -20.5 87t-55.5 31q-59 0 -104 -64.5t-45 -139.5q0 -43 19.5 -68.5t56.5 -25.5q75 0 145 128q4 25 4 52z" />
+<glyph unicode="&#x1d7ab;" horiz-adv-x="552" d="M25 -117l132 527q71 282 288 282q57 0 96.5 -32t39.5 -86q0 -53 -30.5 -95t-75.5 -63l2 -1q37 -9 57 -42t20 -77q0 -24 -6 -48q-29 -113 -105.5 -187.5t-174.5 -74.5q-54 0 -88 38l-33 -135q-15 -61 -41 -94h-118q24 37 37 88zM307 375l62 79q41 0 66.5 26.5t25.5 70.5 q0 46 -47 46q-91 0 -129 -155l-73 -292q13 -38 28.5 -53.5t46.5 -15.5q40 0 90.5 60.5t50.5 146.5q0 46 -30 58.5t-95 12.5z" />
+<glyph unicode="&#x1d7ac;" horiz-adv-x="525" d="M571 462l-276 -411l-61 -245l-16 -10l-101 24q38 119 65 227q19 78 19 145q0 15 -0.5 29.5t-7 46t-17.5 53.5t-35 40t-57 18l4 16l69 78q64 0 102.5 -65t38.5 -147q0 -24 -5 -52h2l146 253h130z" />
+<glyph unicode="&#x1d7ad;" horiz-adv-x="507" d="M547 618l-74 -79h-17q-14 18 -23.5 27.5t-29 20t-40.5 10.5q-22 0 -44.5 -14t-22.5 -39q0 -33 72 -73q64 -35 97.5 -78t33.5 -107q0 -33 -10.5 -72t-34.5 -79.5t-57 -73.5t-83 -54t-108 -21q-89 0 -132.5 48.5t-43.5 119.5q0 91 54.5 166t142.5 108q-54 36 -54 90 q0 57 35 98t83 58.5t100 17.5q57 0 96 -15.5t60 -58.5zM371 266q0 61 -56 88q-62 -3 -111 -56.5t-49 -126.5q0 -39 19.5 -64.5t54.5 -25.5q64 0 103 60t39 125z" />
+<glyph unicode="&#x1d7ae;" horiz-adv-x="504" d="M508 383l-69 -61h-16q-14 35 -32 45.5t-57 10.5q-35 0 -65 -12.5t-30 -42.5t63 -30h68l-24 -95h-78q-43 0 -68 -21q-24 -19 -24 -46q0 -26 23.5 -38t51.5 -12q111 0 159 73l36 -75q-53 -55 -103.5 -74t-131.5 -19q-30 0 -56.5 5t-52.5 16t-41.5 33.5t-15.5 54.5 q0 50 31.5 89.5t80.5 54.5v3q-40 25 -40 69q0 57 57 104q70 58 178 58q64 0 104.5 -18t51.5 -72z" />
+<glyph unicode="&#x1d7af;" horiz-adv-x="480" d="M539 634l-7 -95q-103 -11 -205 -92q-56 -45 -100.5 -122t-44.5 -150q0 -94 99 -94h56q49 0 86 -23t37 -71q0 -82 -65 -137t-147 -55q-53 0 -70 21l24 98h16q21 -24 55 -24q86 0 86 60q0 36 -69 36h-90q-151 0 -151 144q0 95 57 198t149 173l1 3q-41 32 -41 77 q0 22 12 54.5t36 56.5h16l72 -17q-30 -41 -30 -70q0 -26 22 -37q61 31 93 43t86 23h17z" />
+<glyph unicode="&#x1d7b0;" horiz-adv-x="532" d="M255 411h3q76 62 148 62q119 0 119 -99q0 -26 -7 -53l-109 -437q-8 -32 -8 -56q0 -20 4 -33h-127q-2 6 -2 19q0 20 14 76l105 419q3 13 3 25q0 44 -51 44q-24 0 -57 -21t-59 -64l-73 -293h-120l87 349q6 23 6 52q0 21 -4 37l109 35h9q11 -18 11 -51q0 -5 -1 -11z" />
+<glyph unicode="&#x1d7b1;" horiz-adv-x="560" d="M553 471q0 -71 -25.5 -155t-68.5 -158t-107 -123t-132 -49q-77 0 -116 62.5t-39 159.5q0 99 41.5 209.5t120.5 192.5t169 82q78 0 117.5 -62t39.5 -159zM218 388h204q12 48 12 93q0 51 -16 83.5t-46 32.5q-48 0 -90.5 -62t-63.5 -147zM399 293h-204q-14 -58 -14 -101 q0 -51 16.5 -81t46.5 -30q45 0 89 62t66 150z" />
+<glyph unicode="&#x1d7b2;" horiz-adv-x="325" d="M302 108l-39 -100q-44 -22 -95 -22q-112 0 -112 93q0 15 5 37l86 346h120l-74 -299q-6 -25 -6 -41q0 -41 39 -41q29 0 60 27h16z" />
+<glyph unicode="&#x1d7b3;" horiz-adv-x="537" d="M582 395l-4 -16q-56 -5 -103.5 -22.5t-72.5 -34.5t-76 -55l169 -267h-155l-117 187l-24 -20l-41 -167h-120l114 462h120l-40 -163h2q182 159 329 174z" />
+<glyph unicode="&#x1d7b4;" horiz-adv-x="574" d="M540 81l-4 -16l-66 -79q-59 0 -94 36t-35 139v137l-192 -298h-131l320 459q0 83 -32 110.5t-91 27.5l4 16l70 79q68 0 106.5 -48t44.5 -166l12 -256q4 -79 22 -110t66 -31z" />
+<glyph unicode="&#x1d7b5;" horiz-adv-x="594" d="M569 462l-76 -307q-5 -22 -5 -35q0 -39 49 -39l-4 -16l-55 -79q-112 0 -119 70h-2q-24 -34 -56 -52t-61 -18q-26 0 -40.5 4.5t-24.5 19.5h-2l-30 -121q-15 -61 -41 -94h-114q25 42 37 88l144 579h120l-77 -313q-3 -13 -3 -24q0 -44 52 -44q29 0 59.5 21t54.5 62l74 298 h120z" />
+<glyph unicode="&#x1d7b6;" horiz-adv-x="525" d="M441 454l121 19q3 -11 3 -24q0 -73 -42.5 -155t-109.5 -150t-160 -113t-186 -45h-26l118 476h120l-82 -332h2q94 28 165.5 113.5t71.5 179.5q0 7 -2 21z" />
+<glyph unicode="&#x1d7b7;" horiz-adv-x="481" d="M525 631l-15 -92q-75 0 -133 -24.5t-58 -65.5q0 -22 27 -31q65 21 163 21l7 -5l-31 -90q-78 0 -148.5 -23.5t-116.5 -68.5t-46 -101q0 -70 103 -70h61q49 0 86 -23t37 -71q0 -82 -65 -137t-147 -55q-53 0 -70 21l24 98h16q21 -24 55 -24q86 0 86 60q0 36 -69 36h-89 q-71 0 -115 37t-44 100q0 73 53.5 142t141.5 109v3q-41 22 -41 61q0 30 19 61.5t52 54.5q-30 25 -30 52q0 45 41 86h16l73 -17q-24 -24 -24 -42t20 -31q91 32 151 32z" />
+<glyph unicode="&#x1d7b8;" horiz-adv-x="543" d="M515 298q0 -127 -92 -219.5t-204 -92.5q-78 0 -126 48t-48 127q0 131 93 221.5t206 90.5q78 0 124.5 -48t46.5 -127zM390 295q0 83 -76 83q-59 0 -100.5 -65.5t-41.5 -142.5q0 -89 71 -89q40 0 71 27t46 65.5t22.5 70t7.5 51.5z" />
+<glyph unicode="&#x1d7b9;" horiz-adv-x="632" d="M656 462l-23 -95h-99q-64 -164 -64 -225q0 -27 17.5 -41t59.5 -20l-5 -17l-59 -78q-30 0 -52 3.5t-46 14t-37 33t-13 56.5q0 30 27.5 120t51.5 154h-76l-22 -85q-8 -30 -21.5 -72t-24.5 -65t-28 -52t-35 -44.5t-42.5 -31t-54 -22.5t-65.5 -9l11 95q28 7 39 10.5 t27.5 15.5t23.5 25.5t19.5 46t22.5 70.5l27 106q-15 0 -39 -19.5t-42 -54.5l-75 38q81 143 224 143h373z" />
+<glyph unicode="&#x1d7ba;" horiz-adv-x="560" d="M4 -117l61 242q24 96 45 148.5t63 103.5q78 96 206 96q73 0 115 -43t42 -115q0 -32 -9 -68q-29 -118 -105 -189.5t-174 -71.5q-52 0 -88 41l-34 -138q-15 -61 -41 -94h-118q24 37 37 88zM409 304q0 74 -63 74q-69 0 -113 -92q-16 -32 -42 -136q13 -38 28.5 -53.5 t46.5 -15.5q60 0 101.5 74t41.5 149z" />
+<glyph unicode="&#x1d7bb;" horiz-adv-x="517" d="M554 368l-86 -57h-17q-1 67 -78 67q-85 0 -137.5 -66t-52.5 -145q0 -45 28.5 -65.5t71.5 -20.5h56q49 0 86 -23t37 -71q0 -82 -65 -137t-147 -55q-53 0 -70 21l24 98h16q21 -24 55 -24q86 0 86 60q0 36 -69 36h-80q-72 0 -116 42.5t-44 112.5q0 89 52 167t131.5 121.5 t162.5 43.5q62 0 108.5 -26.5t47.5 -78.5z" />
+<glyph unicode="&#x1d7bc;" horiz-adv-x="614" d="M639 462l-23 -95h-165l-1 -2q52 -52 52 -123q0 -24 -5 -42q-12 -44 -46 -91t-96.5 -85t-133.5 -38q-79 0 -127.5 47.5t-48.5 125.5q0 73 31 133.5t78 96t95.5 54.5t88.5 19h301zM380 251q0 75 -69 116q-55 0 -97 -58.5t-42 -139.5q0 -41 18.5 -64.5t54.5 -23.5 q33 0 60.5 20t43 48.5t23.5 55.5t8 46z" />
+<glyph unicode="&#x1d7bd;" horiz-adv-x="523" d="M547 462l-23 -95h-153q-36 -96 -56 -175q-6 -24 -6 -42q0 -31 20 -46.5t66 -22.5l-5 -17l-59 -78q-31 0 -54 4t-49 14.5t-40.5 34t-14.5 58.5q0 25 7 53q17 73 75 217q-85 0 -137 -101l-76 38q46 81 93.5 119.5t114.5 38.5h297z" />
+<glyph unicode="&#x1d7be;" horiz-adv-x="550" d="M311 378l23 95q86 0 139 -42t53 -125q0 -131 -91.5 -225.5t-205.5 -94.5q-83 0 -125.5 34.5t-42.5 97.5q0 25 8 59l36 147q14 58 14 84q0 20 -6 29l111 36h16q8 -20 8 -45q0 -15 -4 -28l-48 -193q-7 -30 -7 -51q0 -75 66 -75q62 0 103 70.5t41 140.5q0 86 -88 86z" />
+<glyph unicode="&#x1d7bf;" horiz-adv-x="683" d="M262 81l25 102q11 45 19 72t22 66t30.5 62t40 46t55.5 33.5t72 10.5q53 0 93 -44.5t40 -122.5q0 -53 -18.5 -107.5t-54 -103t-95.5 -79t-134 -30.5l-48 -191h-120l48 191q-94 0 -138 45.5t-44 119.5q0 83 57 182t141 128l55 -58l-3 -12q-49 -23 -76 -69t-37 -89 q-10 -39 -10 -69q0 -83 80 -83zM412 212l-32 -131q108 0 145 150q17 66 17 100q0 47 -39 47q-22 0 -40 -25t-28 -56t-23 -85z" />
+<glyph unicode="&#x1d7c0;" horiz-adv-x="575" d="M626 462l-299 -341q-8 -40 -8 -76q0 -144 111 -155l-4 -16l-68 -79q-52 0 -85.5 35.5t-44.5 79.5t-11 94v4l-160 -203h-137l292 334q9 42 9 86q0 146 -122 154l4 16l69 78q78 0 114.5 -60t36.5 -155v-4l165 208h138z" />
+<glyph unicode="&#x1d7c1;" horiz-adv-x="703" d="M751 473l-45 -94q-54 -17 -87 -152q-26 -105 -89 -166t-177 -75l-48 -191h-120l48 191q-158 20 -158 155q0 31 13.5 99t13.5 83q0 46 -25 56v94q73 0 113.5 -38.5t40.5 -102.5q0 -30 -15 -100.5t-15 -83.5q0 -30 13 -45t43 -22l94 381h120l-94 -381q53 13 78 50.5 t51 144.5q21 86 89 141.5t156 55.5z" />
+<glyph unicode="&#x1d7c2;" horiz-adv-x="756" d="M537 410l93 51q50 -15 76 -61.5t26 -107.5q0 -36 -9 -72q-29 -115 -96.5 -174.5t-148.5 -59.5q-44 0 -76 22t-39 61h-2q-26 -39 -69 -61t-87 -22q-66 0 -103.5 37t-37.5 108q0 61 26.5 129.5t79 125.5t117.5 75l71 -51l-4 -16q-57 -20 -96 -67.5t-54 -95t-15 -92.5 q0 -58 40 -58q74 0 111 145l23 92l114 29l11 -10l-28 -111q-11 -46 -11 -73q0 -72 53 -72q39 0 71 61.5t32 131.5q0 90 -72 120z" />
+<glyph unicode="&#x1d7c3;" horiz-adv-x="548" d="M227 608l51 83q261 -15 261 -260q0 -74 -20.5 -150t-58 -143t-101 -109.5t-140.5 -42.5q-79 0 -126.5 47.5t-47.5 126.5q0 126 91 219.5t202 93.5q49 0 82 -33l4 2q-17 152 -184 154zM390 295q0 83 -76 83q-59 0 -100.5 -65.5t-41.5 -142.5q0 -89 71 -89q40 0 71 27 t46 65.5t22.5 70t7.5 51.5z" />
+<glyph unicode="&#x1d7c4;" horiz-adv-x="468" d="M470 443l-31 -124h-16q-9 27 -28.5 41t-33.5 16t-36 2q-35 0 -71.5 -22.5t-55.5 -65.5h149l-24 -95h-150q-2 -14 -2 -19q0 -40 24 -64t65 -24q71 0 123 57l50 -65q-60 -56 -104 -75t-114 -19q-78 0 -124 46t-46 122q0 90 47.5 165t116 114.5t138.5 39.5q88 0 123 -30z " />
+<glyph unicode="&#x1d7c5;" horiz-adv-x="579" d="M579 380l-23 -95q-19 0 -42 5l-8 -31q-34 -130 -111 -201.5t-175 -71.5q-82 0 -124 34t-42 97q0 25 8 60q28 117 28 139q0 18 -6 29l110 36h16q8 -18 8 -45q0 -14 -29 -129q-7 -31 -7 -53q0 -73 64 -73q90 0 134 172q11 44 16 68q-170 60 -170 185q0 87 53 136.5 t120 49.5t103.5 -50t36.5 -150q0 -52 -8 -103q21 -6 48 -9zM430 507q0 90 -56 90q-18 0 -34.5 -17.5t-16.5 -44.5q0 -31 26 -62t72 -42q9 43 9 76z" />
+<glyph unicode="&#x1d7c6;" horiz-adv-x="646" d="M665 462l-184 -166q2 -112 18 -150t76 -61l-4 -16l-56 -79q-38 4 -64 26t-38 58t-17 66.5t-7 71.5l-234 -212h-165l182 166q-2 113 -17.5 151t-75.5 62l4 16l56 78q38 -5 63.5 -27t38 -59t17 -67.5t6.5 -71.5l235 214h166z" />
+<glyph unicode="&#x1d7c7;" horiz-adv-x="678" d="M526 692l-55 -219q96 0 139.5 -43.5t43.5 -117.5q0 -81 -34 -154t-105 -122.5t-165 -49.5l-48 -191h-120l48 191q-93 0 -137.5 44.5t-44.5 118.5q0 60 19.5 116.5t55.5 103.5t95.5 75.5t132.5 28.5l55 219h120zM447 378l-74 -297q108 0 145 150q8 31 8 61q0 86 -79 86z M255 81l74 297q-48 0 -87.5 -36t-57.5 -111q-10 -39 -10 -69q0 -81 81 -81z" />
+<glyph unicode="&#x1d7c8;" horiz-adv-x="544" d="M232 -205h-17q-1 12 -13.5 21t-30 16t-43 25.5t-46.5 45.5q-44 57 -44 152q0 99 36 193t110.5 159.5t169.5 65.5q77 0 121.5 -47t44.5 -125q0 -129 -89.5 -222t-201.5 -93q-49 0 -82 33l-3 -2q3 -27 22.5 -46t44.5 -29l50 -22q25 -10 42 -28t17 -45q0 -15 -4 -28z M396 299q0 79 -72 79q-59 0 -100.5 -72t-41.5 -145q0 -80 71 -80q40 0 70.5 28t45 68t21 71.5t6.5 50.5z" />
+<glyph unicode="&#x1d7c9;" horiz-adv-x="889" d="M912 462l-23 -95h-92q11 -36 11 -75q0 -58 -25 -122t-59 -103q-71 -81 -170 -81q-94 0 -115 83h-2q-59 -83 -156 -83q-66 0 -103.5 37t-37.5 108q0 56 23.5 121t70.5 114q-42 -4 -68.5 -30t-49.5 -70l-76 38q46 81 93.5 119.5t114.5 38.5h664zM556 308l-20 -81 q-11 -47 -11 -74q0 -72 53 -72q39 0 71.5 61.5t32.5 131.5q0 57 -33 93h-273q-55 -39 -82.5 -102t-27.5 -121q0 -63 39 -63q34 0 63.5 35t47.5 111l15 62l115 29z" />
+<glyph unicode="&#x1d7ce;" horiz-adv-x="500" d="M476 337q0 -157 -63 -253.5t-162 -96.5t-163 96t-64 251q0 51 7 99.5t24.5 95.5t43 81.5t65.5 56t89 21.5q75 0 127.5 -54.5t74 -131t21.5 -165.5zM318 224v225q0 111 -16 161t-53 50t-52 -48.5t-15 -162.5v-225q0 -112 16 -160.5t53 -48.5t52 48t15 161z" />
+<glyph unicode="&#x1d7cf;" horiz-adv-x="500" d="M441 0h-373v24q74 1 96 20.5t22 84.5v378q0 70 -36 70q-24 0 -65 -16l-20 -8v26l251 109h18v-570q0 -57 19.5 -75t87.5 -19v-24z" />
+<glyph unicode="&#x1d7d0;" horiz-adv-x="500" d="M478 211l-46 -211h-415v23q109 116 151.5 166.5t80.5 109.5q51 78 51 148q0 54 -31 90.5t-88 36.5q-77 0 -122 -90h-28q68 204 223 204q82 0 132 -49.5t50 -133.5q0 -110 -114 -218l-162 -154h140q81 0 107.5 13t45.5 65h25z" />
+<glyph unicode="&#x1d7d1;" horiz-adv-x="500" d="M58 524l-21 12q79 152 229 152q74 0 119 -40.5t45 -96.5q0 -38 -20.5 -73t-63.5 -54q57 -20 89.5 -68.5t32.5 -109.5q0 -110 -85.5 -185t-214.5 -75q-69 0 -110.5 24.5t-41.5 65.5q0 26 18.5 43t46.5 17q45 0 96 -57q39 -43 79 -43q45 0 71.5 34t26.5 88q0 75 -49 121 q-26 24 -56 39t-97 38v17q70 22 100.5 54t30.5 77q0 103 -99 103q-40 0 -69 -18.5t-57 -64.5z" />
+<glyph unicode="&#x1d7d2;" horiz-adv-x="500" d="M476 144h-64v-144h-145v144h-248v113l313 431h80v-433h64v-111zM268 255v294l-208 -294h208z" />
+<glyph unicode="&#x1d7d3;" horiz-adv-x="500" d="M470 676l-45 -127h-276l-22 -81q104 -6 151 -20q82 -23 127.5 -79.5t45.5 -134.5q0 -109 -78.5 -175.5t-203.5 -66.5q-65 0 -106 26t-41 62q0 26 17.5 43.5t43.5 17.5q46 0 100 -46q49 -42 90 -42q42 0 71 29.5t29 74.5q0 51 -36.5 90.5t-105.5 61.5q-49 15 -180 22 l97 345h322z" />
+<glyph unicode="&#x1d7d4;" horiz-adv-x="500" d="M470 688v-26q-109 -22 -173 -85t-93 -173q39 17 84 17q85 0 136 -54t51 -145q0 -105 -59 -170t-156 -65q-106 0 -169 77.5t-63 209.5q0 175 139 297q61 53 118.5 73.5t184.5 43.5zM323 165q0 117 -20 164t-69 47q-25 0 -37 -10q-13 -11 -13 -121q0 -150 27 -202 q15 -29 51 -29q35 0 48 31t13 120z" />
+<glyph unicode="&#x1d7d5;" horiz-adv-x="500" d="M477 676l-235 -676h-95l200 539h-199q-47 0 -68.5 -18t-36.5 -67h-26l45 222h415z" />
+<glyph unicode="&#x1d7d6;" horiz-adv-x="500" d="M472 187q0 -91 -62 -145.5t-170 -54.5q-96 0 -154 45.5t-58 124.5q0 132 149 168q-74 44 -106 87.5t-32 100.5q0 80 60.5 127.5t163.5 47.5q91 0 143 -41.5t52 -103.5q0 -98 -136 -140q84 -57 117 -105t33 -111zM339 537q0 53 -23.5 87.5t-64.5 34.5q-35 0 -59 -24 t-24 -59q0 -87 130 -154q25 33 33 56t8 59zM333 127q0 55 -25.5 89.5t-107.5 89.5q-51 -75 -51 -145q0 -68 24 -105t69 -37q42 0 66.5 28t24.5 80z" />
+<glyph unicode="&#x1d7d7;" horiz-adv-x="500" d="M31 -13v26q107 22 171.5 85t96.5 175q-37 -19 -88 -19q-83 0 -134 55.5t-51 149.5q0 97 61 163t154 66q105 0 168.5 -80t63.5 -214q0 -183 -145 -297q-67 -53 -126.5 -75t-170.5 -35zM317 461q0 117 -25 167q-17 33 -54 33q-34 0 -47 -30.5t-13 -117.5q0 -116 19.5 -165 t65.5 -49q28 0 41 9q4 2 5 20q8 31 8 86v47z" />
+<glyph unicode="&#x1d7d8;" horiz-adv-x="540" d="M512 331q0 -50 -7 -96t-24.5 -92.5t-44 -80.5t-69.5 -55t-97 -21t-97 21t-69.5 55t-44 80.5t-24.5 92.5t-7 96t7 96t24.5 92.5t44 80.5t69.5 55t97 21t97 -21t69.5 -55t44 -80.5t24.5 -92.5t7 -96zM408 561v-460q30 26 45 99t15 131q0 59 -14.5 131.5t-45.5 98.5zM364 67 v528q-31 37 -94 37q-25 0 -52.5 -10t-41.5 -27v-528q39 -37 94 -37t94 37zM132 101v460q-30 -26 -45 -99t-15 -131t15 -131t45 -99z" />
+<glyph unicode="&#x1d7d9;" horiz-adv-x="540" d="M355 0h-148v573l-103 -46l-13 42l264 124v-693zM311 44v584l-60 -29v-555h60z" />
+<glyph unicode="&#x1d7da;" horiz-adv-x="547" d="M514 148l-51 -148h-415v29v21l271 262v307q-14 13 -60 13q-144 0 -166 -154h-42q0 87 59.5 142.5t147.5 55.5q85 0 147 -51.5t62 -135.5q0 -61 -26 -104t-81 -95l-150 -142h304zM363 602v-243q60 51 60 131q0 70 -60 112zM452 104h-288l-65 -60h329z" />
+<glyph unicode="&#x1d7db;" horiz-adv-x="540" d="M356 353v-2q57 -22 89.5 -66t32.5 -104q0 -96 -62 -145.5t-161 -49.5q-170 0 -206 139l43 10q10 -29 25 -49q41 -56 136 -56q45 0 77 18v283h-107v44h97v244q-18 13 -50 13q-129 0 -155 -124h-43q7 77 63 122.5t134 45.5t134 -42t56 -117q0 -104 -103 -164zM364 608v-197 q51 37 51 100q0 62 -51 97zM374 295v-236q60 38 60 120q0 85 -60 116z" />
+<glyph unicode="&#x1d7dc;" horiz-adv-x="540" d="M524 160h-87v-160h-148v160h-269v41l362 475h55v-472h87v-22v-22zM393 44v576l-60 -82v-494h60zM289 204v278l-216 -278h216z" />
+<glyph unicode="&#x1d7dd;" horiz-adv-x="540" d="M489 662l-47 -148h-268l-29 -72q63 0 115.5 -10.5t99.5 -35.5t74 -72t27 -113q0 -101 -61 -163t-162 -62q-74 0 -130 31t-73 97l40 18q39 -102 164 -102q45 0 74 19v316q-66 32 -190 32h-43l109 265h300zM427 618h-210l-25 -60h215zM357 339v-272q29 20 44.5 60.5 t15.5 81.5q0 100 -60 130z" />
+<glyph unicode="&#x1d7de;" horiz-adv-x="540" d="M176 392h2q44 44 123 44q95 0 153 -62t58 -157q0 -103 -68 -167t-172 -64q-54 0 -103 26q-73 39 -107 119t-34 173q0 149 101 255q69 72 146 94.5t195 22.5v-45q-59 0 -95 -2.5t-84.5 -18t-83.5 -44.5q-31 -27 -31 -37v-137zM408 354v-277q60 47 60 142q0 90 -60 135z M364 68v301q-27 23 -74 23q-31 0 -62.5 -14.5t-51.5 -38.5v-271q14 -18 41 -28t53 -10q66 0 94 38zM132 103v393q-30 -32 -45 -88t-15 -110q0 -126 60 -195z" />
+<glyph unicode="&#x1d7df;" horiz-adv-x="540" d="M511 662l-27 -70l-257 -592h-18h-30l222 514h-319h-58l55 148h39h393zM447 618h-338l-20 -60h333z" />
+<glyph unicode="&#x1d7e0;" horiz-adv-x="540" d="M390 353v-2q57 -23 89.5 -66.5t32.5 -103.5q0 -69 -35.5 -114.5t-88 -63t-120.5 -17.5q-105 0 -172.5 47t-67.5 148q0 60 32.5 103.5t89.5 66.5v2q-103 60 -103 164q0 44 20 76t53.5 49.5t71 25.5t78.5 8t78.5 -8t71 -25.5t53.5 -49.5t20 -76q0 -104 -103 -164zM398 608 v-197q51 39 51 100q0 63 -51 97zM354 398v218q-29 16 -84 16q-49 0 -84 -16v-218q22 -23 82 -23q76 0 86 23zM142 411v197q-51 -34 -51 -97q0 -61 51 -100zM408 295v-236q60 38 60 120q0 85 -60 116zM364 50v254q-26 27 -96 27q-61 0 -92 -27v-254q29 -20 92 -20q65 0 96 20 zM132 59v236q-60 -31 -60 -116q0 -82 60 -120z" />
+<glyph unicode="&#x1d7e1;" horiz-adv-x="540" d="M364 270h-2q-44 -44 -123 -44q-95 0 -153 62t-58 157q0 103 68 167t172 64q61 0 113 -32q68 -41 99.5 -118.5t31.5 -167.5q0 -76 -29 -146.5t-83 -119.5q-55 -51 -144.5 -77.5t-175.5 -26.5v41q139 0 213 41q25 13 71 49v151zM408 559v-393q30 32 45 88t15 110 q0 126 -60 195zM364 321v275q-29 36 -94 36q-66 0 -94 -33v-304q18 -25 74 -25q47 0 114 51zM132 308v277q-60 -46 -60 -142q0 -90 60 -135z" />
+<glyph unicode="&#x1d7e2;" horiz-adv-x="500" d="M477 330q0 -92 -21.5 -166.5t-74.5 -126t-131 -51.5q-62 0 -107.5 31t-70.5 83.5t-37 111t-12 124.5q0 93 23 167.5t77 123.5t131 49q98 0 160.5 -96.5t62.5 -249.5zM398 330q0 122 -40.5 198.5t-105.5 76.5q-74 0 -112 -77.5t-38 -193.5q0 -52 7.5 -98.5t24 -88 t46.5 -66t70 -24.5q51 0 85.5 41t48.5 100.5t14 131.5z" />
+<glyph unicode="&#x1d7e3;" horiz-adv-x="500" d="M302 0h-79v570q-22 -10 -65 -32l-50 -26v73l180 92l14 -5v-672z" />
+<glyph unicode="&#x1d7e4;" horiz-adv-x="500" d="M469 71l-29 -71h-405v21l175 214v-1l56 68l55 68q16 20 31 49.5t15 55.5q0 62 -33.5 96t-91.5 34q-46 0 -84.5 -38t-48.5 -108l-72 17q16 89 75 144.5t137 55.5q87 0 142 -54t55 -131q0 -56 -21 -96.5t-88 -124.5l-160 -199h292z" />
+<glyph unicode="&#x1d7e5;" horiz-adv-x="500" d="M113 492l-71 17q22 78 73 122.5t128 44.5q71 0 119 -45t48 -112q0 -89 -86 -149q56 -20 86.5 -66.5t30.5 -93.5q0 -97 -63 -160q-64 -64 -173 -64q-110 0 -174 70l47 56q51 -55 122 -55q74 0 116 36q46 39 46 98q0 52 -37.5 87t-102.5 44h-64v21l48 51q45 0 85 34.5 t40 83.5q0 42 -26.5 67.5t-64.5 25.5q-40 0 -74.5 -28.5t-52.5 -84.5z" />
+<glyph unicode="&#x1d7e6;" horiz-adv-x="500" d="M489 236l-33 -71h-83v-165h-79v165h-283v68l312 443h50v-440h116zM294 236v274l-194 -274h194z" />
+<glyph unicode="&#x1d7e7;" horiz-adv-x="500" d="M458 676l-32 -71h-177l-64 -127q114 -16 187.5 -80.5t73.5 -171.5q0 -99 -67.5 -169.5t-168.5 -70.5q-110 0 -174 70l47 56q51 -55 122 -55q74 0 118 50.5t44 118.5q0 74 -66 126q-67 55 -207 55l-14 17l116 252h262z" />
+<glyph unicode="&#x1d7e8;" horiz-adv-x="500" d="M448 668l-18 -53q-114 -8 -193.5 -65.5t-114.5 -161.5q59 43 137 43q86 0 148.5 -58t62.5 -153q0 -97 -60.5 -165.5t-152.5 -68.5q-77 0 -129.5 40.5t-74 101t-21.5 136.5q0 85 30 166.5t81 131.5q67 66 128 88.5t176 33.5zM390 207q0 72 -41 112.5t-98 40.5 q-52 0 -91 -30.5t-48 -89.5q0 -81 40 -132t108 -51q55 0 92.5 42.5t37.5 107.5z" />
+<glyph unicode="&#x1d7e9;" horiz-adv-x="500" d="M451 642l-221 -650h-82l206 599h-316l31 71h382v-20z" />
+<glyph unicode="&#x1d7ea;" horiz-adv-x="500" d="M447 161q0 -73 -53 -124t-146 -51q-85 0 -142 48.5t-57 119.5q0 54 28.5 98.5t99.5 92.5q-117 69 -117 169q0 72 55.5 117t140.5 45q73 0 122 -47.5t49 -108.5q0 -56 -26 -93t-90 -74q136 -83 136 -192zM355 515q0 40 -31 65t-80 25q-46 0 -75.5 -26.5t-29.5 -60.5 q0 -43 24.5 -69.5t85.5 -54.5q106 58 106 121zM276 286l-35 19q-52 -18 -82.5 -58.5t-30.5 -83.5q0 -45 32 -75.5t92 -30.5q46 0 81 27.5t35 73.5q0 42 -21 71.5t-71 56.5z" />
+<glyph unicode="&#x1d7eb;" horiz-adv-x="500" d="M55 -2l13 49q114 8 193.5 65.5t114.5 162.5q-58 -44 -137 -44q-86 0 -148.5 58t-62.5 153q0 97 60.5 165.5t153.5 68.5q59 0 103 -22.5t70 -62.5t38.5 -88.5t12.5 -104.5q0 -84 -30.5 -166t-80.5 -131q-67 -65 -126.5 -88t-171.5 -34zM386 422q-1 81 -40.5 132t-106.5 51 q-55 0 -93 -42t-38 -107q0 -72 41 -112.5t98 -40.5q52 0 91 30.5t48 88.5z" />
+<glyph unicode="&#x1d7ec;" horiz-adv-x="500" d="M476 337q0 -155 -64 -252.5t-162 -97.5t-162 97.5t-64 252.5t64 253t162 98t162 -98t64 -253zM351 341q0 252 -101 252t-101 -252q0 -259 101 -259t101 259z" />
+<glyph unicode="&#x1d7ed;" horiz-adv-x="500" d="M334 0h-120v542l-132 -50v90l233 106h19v-688z" />
+<glyph unicode="&#x1d7ee;" horiz-adv-x="500" d="M474 95l-33 -95h-421v23l242 300q69 85 69 167q0 41 -25.5 72t-68.5 31q-37 0 -67 -27t-43 -84h-95q18 95 76 150.5t147 55.5q90 0 143 -55t53 -135q0 -61 -21.5 -106.5t-82.5 -118.5l-147 -178h274z" />
+<glyph unicode="&#x1d7ef;" horiz-adv-x="500" d="M380 375v-2q42 -20 70.5 -61.5t28.5 -92.5q0 -76 -39.5 -130.5t-105.5 -81.5q-51 -20 -126 -20q-121 0 -190 73l58 77q49 -55 139 -55q74 0 110 32q34 31 34 84q0 51 -48 84q-49 33 -146 33v16l59 79q47 0 80 29t33 66q0 43 -25.5 65.5t-67.5 22.5q-35 0 -64 -22.5 t-42 -71.5l-90 31q27 73 82 115.5t132 42.5q79 0 134.5 -47t55.5 -122q0 -40 -19 -81t-53 -63z" />
+<glyph unicode="&#x1d7f0;" horiz-adv-x="500" d="M484 240l-22 -95h-50v-145h-120v145h-273v112l313 431h80v-448h72zM292 240v234l-170 -234h170z" />
+<glyph unicode="&#x1d7f1;" horiz-adv-x="500" d="M483 676l-38 -105h-225l-36 -116q108 -6 169 -40q108 -61 108 -183q0 -73 -36 -131t-95 -88q-52 -26 -126 -26q-122 0 -191 73l58 77q56 -55 136 -55q56 0 92.5 35t36.5 86q0 39 -15.5 63t-53.5 43q-50 26 -191 26l-15 11l93 330h329z" />
+<glyph unicode="&#x1d7f2;" horiz-adv-x="500" d="M159 389l2 -1q47 36 118 36q78 0 137 -55t59 -157q0 -100 -64 -164q-61 -61 -154 -61q-110 0 -170.5 82t-60.5 199q0 169 116 282q69 66 137.5 93.5t182.5 44.5l7 -9l-44 -86q-80 -6 -162.5 -64.5t-103.5 -139.5zM355 201q0 57 -23.5 92.5t-70.5 35.5q-34 0 -65 -21.5 t-50 -64.5q0 -70 29.5 -115.5t83.5 -45.5q49 0 72.5 35t23.5 84z" />
+<glyph unicode="&#x1d7f3;" horiz-adv-x="500" d="M471 676l-235 -676h-116l210 561h-295l23 115h413z" />
+<glyph unicode="&#x1d7f4;" horiz-adv-x="500" d="M472 166q0 -76 -58.5 -127.5t-162.5 -51.5q-94 0 -147 34q-76 47 -76 144q0 118 122 185q-107 65 -107 160q0 77 60.5 127.5t153.5 50.5q85 0 143.5 -46.5t58.5 -117.5q0 -55 -27 -92t-90 -68q74 -50 102 -94.5t28 -103.5zM344 522q0 32 -27 51.5t-70 19.5t-66 -20 t-23 -50q0 -55 99 -99q87 39 87 98zM352 168q0 36 -25.5 63t-89.5 64q-89 -49 -89 -122q0 -31 26 -61t76 -30q41 0 71.5 24.5t30.5 61.5z" />
+<glyph unicode="&#x1d7f5;" horiz-adv-x="500" d="M342 286l-2 1q-47 -36 -118 -36q-78 0 -137 55t-59 157q0 100 64 164q61 61 154 61q110 0 170.5 -82t60.5 -199q0 -169 -116 -282q-70 -67 -140.5 -96t-182.5 -42l-7 9l44 86q81 7 164.5 65t104.5 139zM355 432q0 70 -29.5 115.5t-83.5 45.5q-49 0 -72.5 -35t-23.5 -84 q0 -57 23.5 -92.5t70.5 -35.5q34 0 65 21.5t50 64.5z" />
+<glyph unicode="&#x1d7f6;" horiz-adv-x="525" d="M467 335q0 -143 -60.5 -244.5t-145.5 -101.5t-145.5 101.5t-60.5 244.5t60.5 244.5t145.5 101.5t145.5 -101.5t60.5 -244.5zM409 348q0 112 -43.5 190.5t-104.5 78.5t-104 -78.5t-43 -190.5q0 -122 43 -208.5t104 -86.5t104.5 86.5t43.5 208.5z" />
+<glyph unicode="&#x1d7f7;" horiz-adv-x="525" d="M435 40v-16q0 -10 -7 -17t-17 -7h-271q-10 0 -17 7t-7 17v16q0 10 7 17t17 7h106v473q-47 -54 -112 -54q-10 0 -17 7t-7 17v16q0 10 7 17t17 7q39 0 70.5 32.5t50.5 85.5q5 16 23 16h2q10 0 17 -7t7 -17v-593h107q10 0 17 -7t7 -17z" />
+<glyph unicode="&#x1d7f8;" horiz-adv-x="525" d="M470 87v-63q0 -10 -7 -17t-17 -7h-370q-10 0 -17 7t-7 17v16q0 12 8 18l190 171q44 39 63.5 58.5t47.5 53t39.5 64.5t11.5 65q0 64 -49.5 105.5t-130.5 41.5q-43 0 -76.5 -29.5t-42.5 -74.5q14 -12 14 -29t-12 -27t-26 -10t-25.5 10t-11.5 27q0 81 57 139t138 58 q98 0 160.5 -60t62.5 -151q0 -35 -11.5 -69t-26 -59t-42 -56t-44.5 -48l-50 -45l-143 -129h259v23q0 10 7 17t17 7h10q10 0 17 -7t7 -17z" />
+<glyph unicode="&#x1d7f9;" horiz-adv-x="525" d="M196 394l73 5q52 4 87.5 41.5t35.5 89.5q0 33 -35 60t-88 27q-104 0 -132 -52q10 -10 10 -25q0 -18 -11.5 -28t-26.5 -10q-14 0 -25.5 10t-11.5 28q0 69 60.5 105t136.5 36q73 0 127 -43t54 -108q0 -53 -26 -98t-69 -71q56 -22 90 -67.5t34 -102.5q0 -84 -62 -143 t-148 -59q-89 0 -157.5 47t-68.5 128q0 17 11.5 27t25.5 10t26 -10t12 -27t-12 -27q13 -38 57.5 -61t105.5 -23q64 0 108 41t44 97q0 57 -44 97.5t-108 40.5h-71q-10 0 -17 7.5t-7 17.5v16q0 9 6.5 16t15.5 8z" />
+<glyph unicode="&#x1d7fa;" horiz-adv-x="525" d="M493 228v-16q0 -10 -7 -17t-17 -7h-96v-124h77q10 0 17 -7t7 -17v-16q0 -10 -7 -17t-17 -7h-203q-10 0 -17 7t-7 17v16q0 10 7 17t17 7h77v124h-271q-10 0 -17 7t-7 17v34q0 7 4 12l238 412q7 12 21 12h57q10 0 17 -7t7 -17v-406h96q10 0 17 -7t7 -17zM324 252v394 l-228 -394h228z" />
+<glyph unicode="&#x1d7fb;" horiz-adv-x="525" d="M151 606v-219q55 38 130 38q80 0 134.5 -64.5t54.5 -153.5q0 -91 -64.5 -154.5t-156.5 -63.5q-78 0 -137.5 47t-59.5 122q0 17 11.5 27t25.5 10t26 -10t12 -27q0 -16 -12 -28q12 -34 49 -55.5t85 -21.5q68 0 115.5 45.5t47.5 108.5q0 65 -39 109.5t-92 44.5 q-91 0 -131 -59q-8 -11 -20 -11h-16q-10 0 -17 7t-7 17q0 7 3 12v319q0 10 7 17t17 7h294q10 0 17 -7t7 -17v-16q0 -10 -7 -17t-17 -7h-260z" />
+<glyph unicode="&#x1d7fc;" horiz-adv-x="525" d="M464 213q0 -92 -59 -158t-144 -66q-100 0 -151.5 94t-51.5 252q0 141 75 243.5t186 102.5q56 0 95 -25.5t39 -78.5q0 -18 -11.5 -28t-25.5 -10t-25.5 10t-11.5 28q0 13 7 22q-16 18 -67 18q-76 0 -135.5 -73t-66.5 -183q62 77 164 77q78 0 130.5 -67t52.5 -158zM124 240 l2 -24q15 -82 50.5 -122.5t84.5 -40.5q59 0 102 46.5t43 113.5q0 68 -41.5 114.5t-97.5 46.5q-59 0 -101 -39.5t-42 -94.5z" />
+<glyph unicode="&#x1d7fd;" horiz-adv-x="525" d="M479 646v-16q0 -11 -7 -17q-116 -120 -178 -274.5t-62 -320.5q0 -13 -9 -21t-20 -8t-20 8t-9 21q0 163 57 314.5t164 273.5h-294v-23q0 -11 -7 -18t-17 -7h-10q-10 0 -17 7.5t-7 17.5v79q0 10 7 17t17 7h10q18 0 23 -16h355q10 0 17 -7t7 -17z" />
+<glyph unicode="&#x1d7fe;" horiz-adv-x="525" d="M479 191q0 -83 -63.5 -142.5t-154.5 -59.5q-90 0 -154 59.5t-64 142.5q0 58 40 104.5t103 66.5q-57 18 -92.5 56.5t-35.5 86.5q0 73 59.5 124.5t143.5 51.5t143.5 -51.5t59.5 -124.5q0 -48 -35.5 -86.5t-92.5 -56.5q64 -20 103.5 -66.5t39.5 -104.5zM406 505 q0 46 -42.5 79t-102.5 33t-102 -32.5t-42 -79.5q0 -46 42 -78.5t102 -32.5t102.5 32.5t42.5 78.5zM421 191q0 58 -47 98.5t-113 40.5t-113 -40.5t-47 -98.5q0 -57 47 -97.5t113 -40.5t113 40.5t47 97.5z" />
+<glyph unicode="&#x1d7ff;" horiz-adv-x="525" d="M464 335q0 -140 -70.5 -243t-175.5 -103q-62 0 -105.5 23.5t-43.5 80.5q0 18 11.5 28t25.5 10q15 0 26.5 -10t11.5 -28q0 -12 -8 -22q18 -18 82 -18q70 0 125 72.5t62 183.5q-62 -77 -164 -77q-78 0 -130.5 67t-52.5 158q0 92 61 158t148 66q97 0 147 -94t50 -252z M399 430l-2 24q-15 81 -49 122t-81 41q-62 0 -106 -47t-44 -113q0 -68 41 -114.5t97 -46.5q60 0 102 39.5t42 94.5z" />
+</font>
+</defs></svg> 
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/stixgeneral-bundle/stixgeneral-webfont.ttf b/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/stixgeneral-bundle/stixgeneral-webfont.ttf
new file mode 100644
index 0000000..1559670
Binary files /dev/null and b/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/stixgeneral-bundle/stixgeneral-webfont.ttf differ
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/stixgeneral-bundle/stixgeneral-webfont.woff b/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/stixgeneral-bundle/stixgeneral-webfont.woff
new file mode 100644
index 0000000..c18a5b1
Binary files /dev/null and b/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/stixgeneral-bundle/stixgeneral-webfont.woff differ
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/stixgeneral-bundle/stixgeneralbol-webfont.eot b/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/stixgeneral-bundle/stixgeneralbol-webfont.eot
new file mode 100644
index 0000000..c2523d8
Binary files /dev/null and b/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/stixgeneral-bundle/stixgeneralbol-webfont.eot differ
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/stixgeneral-bundle/stixgeneralbol-webfont.svg b/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/stixgeneral-bundle/stixgeneralbol-webfont.svg
new file mode 100644
index 0000000..c724882
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/stixgeneral-bundle/stixgeneralbol-webfont.svg
@@ -0,0 +1,1738 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>
+This is a custom SVG webfont generated by Font Squirrel.
+Designer    : MicroPress Inc., with final additions and corrections provided by Coen Hoffman, Elsevier (retired)
+Foundry URL : http://www.stixfonts.org
+</metadata>
+<defs>
+<font id="webfontwFpnxWyx" horiz-adv-x="750" >
+<font-face units-per-em="1000" ascent="750" descent="-250" />
+<missing-glyph horiz-adv-x="250" />
+<glyph unicode="IJ" horiz-adv-x="838" d="M370 0h-350v25q57 5 75 20t18 61v470q0 41 -19 56t-74 19v25h350v-25q-56 -2 -75.5 -17.5t-19.5 -57.5v-470q0 -48 18.5 -62.5t76.5 -18.5v-25zM917 676v-25q-55 -4 -71.5 -22t-16.5 -73v-430q0 -222 -212 -222q-74 0 -108 23q-29 20 -48 50t-19 60q0 28 22 51t49 23 q28 0 50 -23t22 -53q0 -15 -13.5 -34t-13.5 -32q0 -32 45 -32q34 0 49 21.5t15 68.5v550q0 43 -20 57.5t-81 16.5v25h351z" />
+<glyph unicode="ij" horiz-adv-x="552" d="M528 461v-459q0 -84 -27 -129q-43 -76 -150 -76q-62 0 -101 28t-39 72q0 27 17 44t45 17q25 0 42 -15.5t17 -38.5q0 -16 -14 -37q-9 -15 -9 -22q0 -17 32 -17q25 0 36.5 18t11.5 58v474q0 32 -12.5 44t-50.5 15v24h202zM531 613q0 -33 -22.5 -55t-56.5 -22 q-33 0 -54.5 22t-21.5 55t22.5 55.5t55.5 22.5q31 0 54 -23t23 -55zM256 0h-240v24q35 8 44 19t9 45v285q0 33 -10.5 45t-43.5 19v24h193v-376q0 -32 10.5 -44.5t37.5 -16.5v-24zM215 613q0 -33 -22.5 -55t-55.5 -22t-55 22t-22 55t22.5 55.5t56.5 22.5q31 0 53.5 -23 t22.5 -55z" />
+<glyph unicode="&#xfb00;" horiz-adv-x="610" d="M15 461h56q0 77 15 118.5t55 73.5q47 38 130 38q71 0 142 -28q40 28 110 28q64 0 103.5 -28t39.5 -72q0 -28 -17 -46t-45 -18q-25 0 -42.5 17t-17.5 40q0 20 11 36.5t11 20.5q0 19 -29 19q-27 0 -38.5 -17.5t-11.5 -61.5v-120h86v-44h-86v-328q0 -34 11 -46t48 -19v-24 h-244v24q32 4 39 15t7 48v330h-138v-333q0 -30 9.5 -43t36.5 -17v-24h-241v24q34 4 45 18t11 48v327h-56v44zM348 461v98q-9 3 -16.5 14t-7.5 23q0 14 8 23.5t8 18.5t-11.5 15.5t-29.5 6.5q-89 0 -89 -143v-56h138z" />
+<glyph unicode="&#xfb01;" horiz-adv-x="556" d="M536 0h-234v24q27 3 36.5 15.5t9.5 44.5v297q0 20 -8 28t-29 8h-101v-333q0 -31 9.5 -43.5t36.5 -16.5v-24h-242v24q35 4 46 17.5t11 47.5v328h-56v44h56q5 79 20 120t57 72q51 38 146 38q83 0 130.5 -24.5t47.5 -67.5q0 -27 -18.5 -44.5t-46.5 -17.5t-46 15.5t-18 39.5 q0 16 7 35l2 7q0 11 -16 19t-38 8q-46 0 -67 -33.5t-21 -126.5v-40h104q96 0 173 13v-388q0 -33 11 -46.5t38 -15.5v-24z" />
+<glyph unicode="&#xfb02;" horiz-adv-x="556" d="M535 0h-233v24l8 1q38 4 38 58v334h-138v-333q0 -30 9.5 -43t36.5 -17v-24h-241v24q34 4 45 18t11 48v327h-56v44h56q0 77 15 118.5t55 73.5q47 38 130 38q73 0 151 -31l46 30h19v-607q0 -55 36 -58l12 -1v-24zM348 461v98q-9 3 -16.5 14t-7.5 23q0 14 8 23.5t8 18.5 q0 20 -41 20q-89 0 -89 -141v-56h138z" />
+<glyph unicode="&#xfb03;" horiz-adv-x="833" d="M813 0h-234v24q27 3 36.5 15.5t9.5 44.5v297q0 20 -8 28t-29 8h-101v-333q0 -31 9.5 -43.5t36.5 -16.5v-24h-231v24q30 4 38 16.5t8 48.5v328h-138v-333q0 -30 9.5 -43t36.5 -17v-24h-241v24q34 4 45 18t11 48v327h-56v44h56q0 77 15 118.5t55 73.5q47 38 130 38 q101 0 161 -33q50 33 139 33q83 0 130.5 -24.5t47.5 -67.5q0 -27 -18.5 -44.5t-46.5 -17.5t-46 15.5t-18 39.5q0 16 7 35l2 7q0 11 -15.5 19t-38.5 8q-46 0 -67 -33.5t-21 -126.5v-40h104q96 0 173 13v-388q0 -33 11 -46.5t38 -15.5v-24zM348 461v98q-9 3 -16.5 14t-7.5 23 q0 14 8 23.5t8 18.5t-11.5 16t-29.5 7q-89 0 -89 -144v-56h138z" />
+<glyph unicode="&#xfb04;" horiz-adv-x="833" d="M812 0h-233v24l8 1q38 4 38 58v334h-138v-333q0 -30 9.5 -43t36.5 -17v-24h-231v24q28 6 37 19.5t9 46.5v327h-138v-333q0 -30 9.5 -43t36.5 -17v-24h-241v24q34 4 45 18t11 48v327h-56v44h56q0 77 15 118.5t55 73.5q47 38 130 38q89 0 147 -36q50 36 130 36 q74 0 151 -31l46 30h19v-607q0 -55 36 -58l12 -1v-24zM625 461v98q-9 3 -16.5 14t-7.5 23q0 14 8 23.5t8 18.5t-11.5 15.5t-29.5 6.5q-89 0 -89 -143v-56h138zM348 461v98q-9 3 -16.5 14t-7.5 23q0 14 8 23.5t8 18.5t-11.5 15.5t-29.5 6.5q-89 0 -89 -143v-56h138z" />
+<glyph unicode="fj" horiz-adv-x="556" d="M487 474v-472q0 -84 -27 -129q-43 -76 -150 -76q-62 0 -101 28t-39 72q0 27 17 44t45 17q25 0 42 -15.5t17 -38.5q0 -16 -14 -37q-9 -15 -9 -22q0 -17 32 -17q25 0 36.5 18t11.5 58v477q0 20 -8 28t-29 8h-101v-333q0 -31 9.5 -43.5t36.5 -16.5v-24h-242v24q35 4 46 17.5 t11 47.5v328h-56v44h56q5 79 20 120t57 72q51 38 146 38q83 0 130.5 -24.5t47.5 -67.5q0 -27 -18.5 -44.5t-46.5 -17.5t-46 15.5t-18 39.5q0 16 7 35l2 7q0 11 -16 19t-38 8q-46 0 -67 -33.5t-21 -126.5v-40h104q96 0 173 13z" />
+<glyph unicode=" "  horiz-adv-x="250" />
+<glyph unicode="&#x09;" horiz-adv-x="250" />
+<glyph unicode="&#xa0;" horiz-adv-x="250" />
+<glyph unicode="!" horiz-adv-x="333" d="M181 234h-31q-10 93 -19.5 144t-31.5 122q-18 58 -18 91q0 47 22 73.5t62 26.5q38 0 61.5 -27t23.5 -75q0 -32 -18 -89q-22 -72 -31.5 -123t-19.5 -143zM251 71q0 -35 -25 -59.5t-60 -24.5q-36 0 -60 23.5t-24 59.5q0 37 24.5 61.5t60.5 24.5q37 0 60.5 -24t23.5 -61z " />
+<glyph unicode="&#x22;" horiz-adv-x="555" d="M429 404h-43q-43 178 -43 214q0 73 64 73q31 0 48 -19.5t17 -49.5q0 -31 -43 -218zM169 404h-43q-43 171 -43 214q0 33 16 53t48 20t48.5 -19t16.5 -50q0 -32 -43 -218z" />
+<glyph unicode="#" horiz-adv-x="500" d="M495 417h-97l-18 -134h86v-73h-97l-29 -210h-78l29 210h-113l-29 -210h-78l29 210h-95v73h106l18 134h-95v73h105l30 210h77l-29 -210h113l30 210h77l-29 -210h87v-73zM320 417h-113l-18 -134h113z" />
+<glyph unicode="$" horiz-adv-x="500" d="M269 641v-214q11 -7 40 -24l39 -23q11 -6 33.5 -21.5t31.5 -24.5l23 -26q15 -17 20.5 -32.5t10.5 -36t5 -43.5q0 -87 -51 -135q-45 -41 -152 -61v-99h-56v99q-46 2 -75.5 9.5t-91.5 33.5v158l21 -2q21 -81 55.5 -119.5t90.5 -49.5v250q-100 52 -142 101t-42 115 q0 103 88 151q33 18 96 25v78h56v-76q94 -13 159 -52v-141h-21q-19 77 -51.5 114t-86.5 46zM213 454v190q-89 -23 -89 -93q0 -39 20.5 -59.5t68.5 -37.5zM269 249v-219q46 9 69.5 38t23.5 66q0 40 -16.5 60.5t-76.5 54.5z" />
+<glyph unicode="%" horiz-adv-x="749" d="M688 214q0 -53 -19.5 -104t-53.5 -86q-39 -42 -99 -42q-57 0 -92.5 38.5t-35.5 99.5q0 85 58.5 149t136.5 64q49 0 77 -31.5t28 -87.5zM663 220q0 35 -17 57.5t-42 22.5q-31 0 -62 -46q-24 -36 -40 -87t-16 -91q0 -66 50 -66q44 0 79 51q48 74 48 159zM626 706l-438 -735 h-48l388 655q-56 -42 -113 -42q-27 0 -60 13q3 -29 3 -42q0 -53 -19.5 -105.5t-50.5 -83.5q-44 -44 -101 -44q-56 0 -91 39t-35 100q0 85 59 149t138 64q35 0 71 -29q38 -30 83 -30q49 0 88.5 21.5t77.5 69.5h48zM332 560q0 25 -6 35.5t-26 18.5q-11 5 -21 11q-14 9 -20 9 q-32 0 -67 -74.5t-35 -141.5q0 -66 50 -66q48 0 86.5 64t38.5 144z" />
+<glyph unicode="&#x26;" horiz-adv-x="833" d="M789 113l-15 -25q-33 -55 -57 -73q-41 -31 -93 -31q-40 0 -72.5 19t-76.5 69q-115 -87 -222 -87q-86 0 -138.5 48t-52.5 134q0 69 45.5 123t150.5 98q-32 50 -42 79.5t-10 64.5q0 76 53 117.5t149 41.5q72 0 116 -33.5t44 -87.5q0 -48 -36 -83t-116 -64l151 -214 q45 54 60.5 84t15.5 61q0 22 -10.5 29t-53.5 12v24h204v-24q-33 -3 -47 -10.5t-26 -29.5q-34 -62 -55 -93t-65 -86q42 -54 66 -72.5t53 -18.5q35 0 60 40zM467 533q0 50 -27.5 87.5t-64.5 37.5q-24 0 -38 -15t-14 -41q0 -64 74 -150q38 13 54 31.5t16 49.5zM452 100 q-5 8 -30 42l-44 60l-48 71q-30 44 -55 85q-41 -24 -57.5 -45t-16.5 -49q0 -87 72 -161q39 -42 89 -42q36 0 90 39z" />
+<glyph unicode="'" horiz-adv-x="278" d="M161 404h-43q-43 205 -43 213q0 34 16.5 54t47.5 20t48 -18.5t17 -51.5q0 -30 -43 -217z" />
+<glyph unicode="(" horiz-adv-x="333" d="M306 -140v-28q-74 44 -113 79.5t-78 91.5q-69 99 -69 256q0 198 131 340q29 31 56 50.5t73 44.5v-27q-97 -80 -122 -156.5t-25 -252.5q0 -162 28 -241t119 -157z" />
+<glyph unicode=")" horiz-adv-x="333" d="M27 666v28q75 -45 115.5 -83t75.5 -95q69 -115 69 -249q0 -198 -131 -340q-29 -31 -56 -50.5t-73 -44.5v27q35 27 59 50.5t41 52.5t26 54t14 67.5t6 80.5t1 104q0 173 -25.5 247t-121.5 151z" />
+<glyph unicode="*" horiz-adv-x="500" d="M260 497l7 -3q30 24 42 35.5t30 38.5q14 22 26.5 30t29.5 8q21 0 37 -14.5t16 -33.5q0 -23 -25.5 -38t-56.5 -15q-33 0 -48.5 -4.5t-40.5 -21.5v-8q51 -24 97 -28q40 -3 56.5 -14.5t16.5 -36.5q0 -22 -13 -36t-36 -14q-19 0 -32.5 11.5t-42.5 50.5q-15 21 -25.5 30 t-31.5 20l-6 -4q1 -32 6 -49t21 -49q15 -29 15 -45q0 -22 -14.5 -37t-36.5 -15q-21 0 -35 14.5t-14 37.5q0 17 16 46q14 24 18 42t5 55l-6 4q-29 -22 -41.5 -34.5t-32.5 -40.5q-15 -22 -26.5 -29.5t-28.5 -7.5q-21 0 -35.5 13.5t-14.5 34.5q0 47 84 53q32 2 47 7.5t39 21.5 v7q-47 21 -102 26q-68 5 -68 53q0 22 13 35t34 13t34 -9t28 -34q17 -29 29.5 -41t41.5 -28l5 3q-1 33 -4.5 48t-18.5 43q-18 32 -18 53q0 22 14.5 36t37.5 14q21 0 34.5 -15t13.5 -40q0 -15 -18 -47q-22 -37 -22 -77v-15z" />
+<glyph unicode="+" d="M685 209h-266v-266h-88v266h-266v88h266v266h88v-266h266v-88z" />
+<glyph unicode="," horiz-adv-x="250" d="M57 -180l-11 22q109 76 109 133q0 21 -19 21q-3 0 -11 -1t-13 -1q-32 0 -52.5 21t-20.5 55q0 39 23 62t61 23q47 0 73.5 -31t26.5 -85q0 -132 -166 -219z" />
+<glyph unicode="-" horiz-adv-x="333" d="M287 171h-243v116h243v-116z" />
+<glyph unicode="." horiz-adv-x="250" d="M210 71q0 -35 -25 -59.5t-60 -24.5q-36 0 -60 24t-24 60q0 35 25 60t60 25q34 0 59 -25t25 -60z" />
+<glyph unicode="/" horiz-adv-x="278" d="M302 691l-236 -710h-90l236 710h90z" />
+<glyph unicode="0" horiz-adv-x="500" d="M476 337q0 -157 -63 -253.5t-162 -96.5t-163 96t-64 251q0 51 7 99.5t24.5 95.5t43 81.5t65.5 56t89 21.5q75 0 127.5 -54.5t74 -131t21.5 -165.5zM318 224v225q0 111 -16 161t-53 50t-52 -48.5t-15 -162.5v-225q0 -112 16 -160.5t53 -48.5t52 48t15 161z" />
+<glyph unicode="1" horiz-adv-x="500" d="M441 0h-373v24q74 1 96 20.5t22 84.5v378q0 70 -36 70q-24 0 -65 -16l-20 -8v26l251 109h18v-570q0 -57 19.5 -75t87.5 -19v-24z" />
+<glyph unicode="2" horiz-adv-x="500" d="M478 211l-46 -211h-415v23q109 116 151.5 166.5t80.5 109.5q51 78 51 148q0 54 -31 90.5t-88 36.5q-77 0 -122 -90h-28q68 204 223 204q82 0 132 -49.5t50 -133.5q0 -110 -114 -218l-162 -154h140q81 0 107.5 13t45.5 65h25z" />
+<glyph unicode="3" horiz-adv-x="500" d="M58 524l-21 12q79 152 229 152q74 0 119 -40.5t45 -96.5q0 -38 -20.5 -73t-63.5 -54q57 -20 89.5 -68.5t32.5 -109.5q0 -110 -85.5 -185t-214.5 -75q-69 0 -110.5 24.5t-41.5 65.5q0 26 18.5 43t46.5 17q45 0 96 -57q39 -43 79 -43q45 0 71.5 34t26.5 88q0 75 -49 121 q-26 24 -56 39t-97 38v17q70 22 100.5 54t30.5 77q0 103 -99 103q-40 0 -69 -18.5t-57 -64.5z" />
+<glyph unicode="4" horiz-adv-x="500" d="M476 144h-64v-144h-145v144h-248v113l313 431h80v-433h64v-111zM268 255v294l-208 -294h208z" />
+<glyph unicode="5" horiz-adv-x="500" d="M470 676l-45 -127h-276l-22 -81q104 -6 151 -20q82 -23 127.5 -79.5t45.5 -134.5q0 -109 -78.5 -175.5t-203.5 -66.5q-65 0 -106 26t-41 62q0 26 17.5 43.5t43.5 17.5q46 0 100 -46q49 -42 90 -42q42 0 71 29.5t29 74.5q0 51 -36.5 90.5t-105.5 61.5q-49 15 -180 22 l97 345h322z" />
+<glyph unicode="6" horiz-adv-x="500" d="M470 688v-26q-109 -22 -173 -85t-93 -173q39 17 84 17q85 0 136 -54t51 -145q0 -105 -59 -170t-156 -65q-106 0 -169 77.5t-63 209.5q0 175 139 297q61 53 118.5 73.5t184.5 43.5zM323 165q0 117 -20 164t-69 47q-25 0 -37 -10q-13 -11 -13 -121q0 -150 27 -202 q15 -29 51 -29q35 0 48 31t13 120z" />
+<glyph unicode="7" horiz-adv-x="500" d="M477 676l-235 -676h-95l200 539h-199q-47 0 -68.5 -18t-36.5 -67h-26l45 222h415z" />
+<glyph unicode="8" horiz-adv-x="500" d="M472 187q0 -91 -62 -145.5t-170 -54.5q-96 0 -154 45.5t-58 124.5q0 132 149 168q-74 44 -106 87.5t-32 100.5q0 80 60.5 127.5t163.5 47.5q91 0 143 -41.5t52 -103.5q0 -98 -136 -140q84 -57 117 -105t33 -111zM339 537q0 53 -23.5 87.5t-64.5 34.5q-35 0 -59 -24 t-24 -59q0 -87 130 -154q25 33 33 56t8 59zM333 127q0 55 -25.5 89.5t-107.5 89.5q-51 -75 -51 -145q0 -68 24 -105t69 -37q42 0 66.5 28t24.5 80z" />
+<glyph unicode="9" horiz-adv-x="500" d="M31 -13v26q107 22 171.5 85t96.5 175q-37 -19 -88 -19q-83 0 -134 55.5t-51 149.5q0 97 61 163t154 66q105 0 168.5 -80t63.5 -214q0 -183 -145 -297q-67 -53 -126.5 -75t-170.5 -35zM317 461q0 117 -25 167q-17 33 -54 33q-34 0 -47 -30.5t-13 -117.5q0 -116 19.5 -165 t65.5 -49q28 0 41 9q4 2 5 20q8 31 8 86v47z" />
+<glyph unicode=":" horiz-adv-x="333" d="M251 387q0 -35 -25 -59.5t-60 -24.5t-59.5 24.5t-24.5 60.5q0 35 24.5 59.5t60.5 24.5q35 0 59.5 -25t24.5 -60zM251 71q0 -35 -25 -59.5t-60 -24.5q-36 0 -60 24t-24 60q0 35 25 60t60 25q34 0 59 -25t25 -60z" />
+<glyph unicode=";" horiz-adv-x="333" d="M251 387q0 -35 -25 -59.5t-60 -24.5t-59.5 24.5t-24.5 60.5q0 35 24.5 59.5t60.5 24.5q35 0 59.5 -25t24.5 -60zM100 -180l-11 22q109 76 109 133q0 21 -19 21q-3 0 -11 -1t-13 -1q-32 0 -52.5 21t-20.5 55q0 39 23 62t61 23q47 0 73.5 -31t26.5 -85q0 -132 -166 -219z " />
+<glyph unicode="&#x3c;" d="M670 -24l-590 258v40l590 260v-88l-436 -192l436 -190v-88z" />
+<glyph unicode="=" d="M682 311h-614v88h614v-88zM682 107h-614v88h614v-88z" />
+<glyph unicode="&#x3e;" d="M670 234l-590 -258v88l436 190l-436 192v88l590 -260v-40z" />
+<glyph unicode="?" horiz-adv-x="500" d="M253 232h-30q-3 25 -3 45q1 46 38.5 123.5t37.5 122.5q0 62 -22 96t-62 34q-28 0 -44.5 -11t-16.5 -29q0 -13 15 -29q22 -25 22 -51q0 -28 -20.5 -47.5t-44.5 -19.5q-29 0 -47.5 22.5t-18.5 55.5q0 63 51 104t133 41q93 0 148.5 -46.5t55.5 -119.5q0 -52 -26 -87.5 t-95 -78.5q-47 -29 -59 -49.5t-12 -75.5zM323 71q0 -35 -24.5 -59.5t-59.5 -24.5q-36 0 -60.5 24.5t-24.5 59.5t25 60t61 25q34 0 58.5 -25t24.5 -60z" />
+<glyph unicode="@" horiz-adv-x="930" d="M698 76l13 -35q-73 -35 -120.5 -47.5t-103.5 -12.5q-160 0 -269.5 100t-109.5 249q0 150 111.5 255.5t269.5 105.5q144 0 238.5 -86.5t94.5 -214.5q0 -104 -58 -175t-136 -71q-37 0 -60.5 20t-28.5 54q-56 -74 -126 -74q-43 0 -68.5 32.5t-25.5 81.5q0 98 55 179.5 t148 81.5q27 0 42 -10.5t31 -42.5l11 40h71l-66 -260q-2 -10 -2 -18q0 -48 35 -48q50 0 90.5 63t40.5 142q0 109 -85.5 188t-202.5 79q-125 0 -206 -92.5t-81 -234.5q0 -131 82 -214.5t213 -83.5q96 0 203 49zM577 411q0 60 -45 60q-56 0 -96 -63.5t-40 -129.5 q0 -40 16 -63.5t43 -23.5q48 0 83 68q39 78 39 152z" />
+<glyph unicode="A" horiz-adv-x="722" d="M689 0h-322v25l32 3q25 2 35.5 9.5t10.5 23.5q0 29 -46 136h-225l-13 -34q-31 -80 -31 -97q0 -19 18.5 -28.5t62.5 -12.5v-25h-202v25q35 6 53 28t46 92l221 545h28l222 -522q38 -90 58.5 -116.5t51.5 -26.5v-25zM384 236l-101 243l-94 -243h195z" />
+<glyph unicode="B" horiz-adv-x="667" d="M426 365v-1q85 -11 139 -58.5t54 -117.5q0 -83 -72 -135.5t-202 -52.5h-329v25q55 6 71.5 21t16.5 57v467q0 44 -18.5 60.5t-69.5 20.5v25h317q121 0 186.5 -41.5t65.5 -118.5q0 -59 -37 -96.5t-122 -54.5zM264 592v-219q91 0 123.5 30t32.5 106q0 137 -99 137 q-30 0 -43.5 -12.5t-13.5 -41.5zM264 343v-245q0 -36 15 -51t48 -15q58 0 89 40t31 116q0 155 -157 155h-26z" />
+<glyph unicode="C" horiz-adv-x="722" d="M657 152l30 -25q-67 -83 -132.5 -114.5t-155.5 -31.5q-159 0 -254.5 96.5t-95.5 245.5q0 160 97.5 264t249.5 104q71 0 156 -35q32 -14 46 -14t23.5 9.5t20.5 36.5h27v-235h-25q-22 62 -67 115q-75 90 -167 90q-81 0 -132.5 -83.5t-51.5 -229.5q0 -155 54 -240 q22 -34 62.5 -55t84.5 -21q64 0 126 34q41 23 104 89z" />
+<glyph unicode="D" horiz-adv-x="722" d="M14 676h312q171 0 267.5 -88t96.5 -243q0 -77 -30.5 -147t-84.5 -117q-93 -81 -252 -81h-309v25q43 1 63 19t20 54v486q0 34 -17.5 48t-65.5 19v25zM259 598v-498q0 -35 12.5 -50t45.5 -15q98 0 149 72q23 33 36.5 94.5t13.5 128.5q0 139 -41 211q-58 101 -163 101 q-53 0 -53 -44z" />
+<glyph unicode="E" horiz-adv-x="667" d="M641 208l-40 -208h-585v25q54 6 71 21t17 55v479q0 38 -18 53t-70 18v25h577v-201h-25q-17 100 -65.5 133.5t-171.5 33.5q-38 0 -51.5 -12t-13.5 -42v-225q81 1 117 32.5t45 116.5h26v-338h-26q-7 88 -43 121.5t-119 33.5v-242q0 -32 17.5 -44t65.5 -12q117 0 182 54 q25 20 42 46t40 77h28z" />
+<glyph unicode="F" horiz-adv-x="611" d="M583 474h-24q-10 57 -22 81.5t-38 47.5q-45 39 -163 39q-38 0 -54 -11.5t-16 -39.5v-228q75 0 109 32.5t44 116.5h25v-338h-25q-7 87 -41 120t-112 35v-228q0 -43 21 -58t89 -18v-25h-360v25q55 6 71.5 21t16.5 57v472q0 43 -18 58t-70 18v25h567v-202z" />
+<glyph unicode="G" horiz-adv-x="778" d="M755 287v-25q-53 -6 -69.5 -27.5t-16.5 -72.5v-118q-49 -29 -124 -46t-153 -17q-154 0 -254.5 96t-100.5 254q0 151 99.5 255.5t248.5 104.5q70 0 155 -35q32 -14 46 -14t23.5 9.5t20.5 36.5h27v-235h-25q-29 63 -47.5 92.5t-48.5 56.5q-63 56 -138 56q-88 0 -136 -83 t-48 -237q0 -157 48 -237q27 -45 63 -66t92 -21q96 0 96 85v89q0 40 -19.5 55t-82.5 19v25h344z" />
+<glyph unicode="H" horiz-adv-x="778" d="M759 0h-339v25q54 6 71.5 20.5t17.5 52.5v228h-241v-228q0 -40 17 -53.5t72 -19.5v-25h-336v25q53 7 69 20.5t16 52.5v479q0 41 -17 55t-68 19v25h336v-25q-53 -4 -71 -18.5t-18 -55.5v-204h241v204q0 41 -18 55.5t-71 18.5v25h339v-25q-51 -4 -69.5 -19t-18.5 -55v-479 q0 -39 16.5 -52.5t71.5 -20.5v-25z" />
+<glyph unicode="I" horiz-adv-x="389" d="M370 0h-350v25q57 5 75 20t18 61v470q0 41 -19 56t-74 19v25h350v-25q-56 -2 -75.5 -17.5t-19.5 -57.5v-470q0 -48 18.5 -62.5t76.5 -18.5v-25z" />
+<glyph unicode="J" horiz-adv-x="500" d="M478 676v-25q-55 -4 -71.5 -22t-16.5 -73v-430q0 -222 -212 -222q-74 0 -108 23q-29 20 -48 50t-19 60q0 28 21.5 51t49.5 23t50 -23t22 -53q0 -15 -13.5 -34t-13.5 -32q0 -32 45 -32q34 0 49 21.5t15 68.5v550q0 43 -20 57.5t-81 16.5v25h351z" />
+<glyph unicode="K" horiz-adv-x="778" d="M769 0h-334v25q47 1 62 6t15 15q0 13 -25 45l-181 225l-27 -25v-196q0 -37 16.5 -50t70.5 -20v-25h-336v25q55 5 71 19t16 57v472q0 46 -17 60.5t-70 17.5v25h337v-25q-54 -4 -71 -20.5t-17 -63.5v-223l212 215q24 24 32 35t8 23q0 15 -10.5 22t-37.5 9l-35 3v25h289v-25 q-78 -9 -133 -46.5t-189 -180.5l305 -378q16 -20 49 -21v-25z" />
+<glyph unicode="L" horiz-adv-x="667" d="M638 227l-42 -227h-577v25q55 7 70.5 20t15.5 53v478q0 42 -17.5 57t-68.5 18v25l348 1v-25q-65 -3 -82.5 -20t-17.5 -79v-464q0 -33 18.5 -45.5t66.5 -12.5q109 0 170 55q42 39 87 141h29z" />
+<glyph unicode="M" horiz-adv-x="944" d="M921 0h-332v25q55 5 72 22t17 62v496l-252 -605h-27l-252 594v-465q0 -58 20 -79t81 -25v-25h-234v25q59 6 75 20.5t16 62.5v469q0 41 -17 55.5t-72 18.5v25h253l199 -472l201 472h252v-25q-55 -4 -71.5 -22.5t-16.5 -74.5v-428q0 -57 15 -76.5t73 -24.5v-25z" />
+<glyph unicode="N" horiz-adv-x="722" d="M701 676v-25q-50 -8 -64 -22.5t-14 -60.5v-586h-28l-447 545v-396q0 -58 18 -78.5t76 -27.5v-25h-226v25q55 7 71.5 22.5t16.5 61.5v470q-52 72 -85 72v25h211l349 -430v299q0 60 -18 80.5t-74 25.5v25h214z" />
+<glyph unicode="O" horiz-adv-x="778" d="M743 335q0 -156 -99.5 -255t-255.5 -99q-155 0 -254 99t-99 254q0 159 101 258t258 99q151 0 250 -100.5t99 -255.5zM566 328q0 160 -46.5 245t-134.5 85q-83 0 -128 -85.5t-45 -242.5t46 -236.5t132 -79.5t131 80t45 234z" />
+<glyph unicode="P" horiz-adv-x="611" d="M16 676h315q128 0 198.5 -45.5t70.5 -135.5q0 -60 -33.5 -104.5t-95.5 -67.5q-32 -12 -70.5 -15.5t-138.5 -4.5v-192q0 -51 14 -65t73 -21v-25h-333v25q33 3 45 9q23 9 31 30t8 62v427q0 58 -15.5 75.5t-68.5 22.5v25zM262 606v-268q94 1 130 32t36 114q0 84 -27 120.5 t-89 36.5q-50 0 -50 -35z" />
+<glyph unicode="Q" horiz-adv-x="778" d="M730 -117l6 -24q-91 -35 -179 -35q-140 0 -228 88q-29 29 -56 86q-113 34 -175.5 123.5t-62.5 208.5q0 161 99.5 261t254.5 100q156 0 255 -100t99 -264q0 -126 -66 -211t-187 -122q23 -47 47 -71q52 -52 123 -52q30 0 70 12zM566 335q0 158 -46 240.5t-132 82.5 q-84 0 -130 -83.5t-46 -239.5t45 -238.5t132 -82.5q86 0 131.5 83t45.5 238z" />
+<glyph unicode="R" horiz-adv-x="722" d="M716 0h-205l-207 313h-28v-196q0 -54 14.5 -69t73.5 -23v-25h-338v25q59 7 73.5 22t14.5 73v431q0 59 -16.5 77.5t-71.5 22.5v25h308q296 0 296 -172q0 -76 -45 -118q-42 -38 -112 -57l199 -282q15 -22 44 -22v-25zM276 597v-252q103 1 143 31t40 118q0 79 -30 113.5 t-100 34.5q-29 0 -41 -10t-12 -35z" />
+<glyph unicode="S" horiz-adv-x="556" d="M484 474h-28q-26 85 -70 130q-54 56 -123 56q-51 0 -80.5 -27.5t-29.5 -71.5q0 -36 21 -59t82 -55q18 -10 68.5 -35.5t79.5 -41.5q49 -27 79 -73.5t30 -102.5q0 -95 -68.5 -154t-179.5 -59q-61 0 -130 24q-31 10 -41 10q-12 0 -19 -7.5t-11 -26.5h-29v248h29 q23 -96 60 -143q57 -72 144 -72q58 0 92 30.5t34 82.5q0 48 -57 88q-25 18 -122 65q-89 43 -130 90t-41 120q0 95 58.5 148t160.5 53q55 0 117 -23q30 -10 42 -10q14 0 20.5 7t11.5 27h30v-218z" />
+<glyph unicode="T" horiz-adv-x="667" d="M636 475h-29q-13 89 -56.5 127.5t-135.5 41.5v-527q0 -57 16.5 -72t81.5 -20v-25h-357v25q64 5 80.5 20.5t16.5 71.5v527q-93 -3 -136.5 -41.5t-56.5 -127.5h-29l3 201h600z" />
+<glyph unicode="U" horiz-adv-x="722" d="M701 676v-25q-48 -7 -63 -24t-15 -61v-314q0 -156 -76 -216q-68 -55 -184 -55t-185 54q-43 34 -61.5 79t-18.5 117v324q0 59 -14 75t-68 21v25h336v-25q-60 -5 -77.5 -23t-17.5 -78v-318q0 -202 146 -202q176 0 176 222v300q0 54 -20.5 74t-76.5 25v25h219z" />
+<glyph unicode="V" horiz-adv-x="722" d="M701 676v-25q-39 -5 -55.5 -20t-34.5 -62l-228 -587h-27l-256 599q-18 42 -32 53.5t-52 16.5v25h336v-25l-33 -2q-53 -3 -53 -36q0 -17 23 -72l138 -334l127 329q20 52 20 71q0 24 -16 32t-70 12v25h213z" />
+<glyph unicode="W" horiz-adv-x="1000" d="M981 676v-25q-50 -5 -69 -64l-200 -602h-27l-171 477l-186 -477h-28l-212 602q-13 37 -25 48t-44 16v25h294v-25q-39 -3 -51.5 -11.5t-12.5 -30.5q0 -13 7 -33l120 -364l118 308l-35 96q-12 32 -72 35v25h312v-25l-13 -1q-33 -2 -46 -10t-13 -26q0 -13 14 -56l108 -336 l112 343q7 20 7 42q0 23 -14.5 32.5t-54.5 11.5v25h182z" />
+<glyph unicode="X" horiz-adv-x="722" d="M699 0h-340v25l28 2q52 3 52 28q0 21 -21 54l-101 162l-38 -51q-56 -76 -75 -106.5t-19 -46.5q0 -19 17.5 -28t63.5 -14v-25h-250v25q37 4 59 16t45 40l175 221l-198 291q-23 34 -38 45t-42 13v25h346v-25l-31 -2q-27 -1 -37.5 -8t-10.5 -23q0 -14 15 -37l97 -150l56 77 q36 49 47 69.5t11 36.5q0 18 -11 25t-40 10l-21 2v25h250v-25q-57 -5 -90.5 -30.5t-97.5 -115.5l-80 -111l182 -283q35 -54 53 -69.5t44 -16.5v-25z" />
+<glyph unicode="Y" horiz-adv-x="722" d="M699 676v-25q-49 -7 -68 -39l-191 -311v-178q0 -58 16.5 -75.5t75.5 -22.5v-25h-347v25q60 5 76.5 25t16.5 78v136l-180 328q-31 56 -83 59v25h335v-25l-27 -2q-32 -2 -43 -7.5t-11 -21.5q0 -13 24 -59l120 -232l109 178q41 68 41 102q0 22 -16.5 30t-67.5 12v25h220z " />
+<glyph unicode="Z" horiz-adv-x="667" d="M634 242l-27 -242h-579v16l382 625l-83 -3q-62 -2 -96.5 -8.5t-63.5 -25t-46 -49.5t-34 -86h-28l22 207h523v-16l-379 -625h83q145 0 202 40q27 19 45 45t26.5 47t26.5 75h26z" />
+<glyph unicode="[" horiz-adv-x="333" d="M301 -149h-234v827h234v-33h-63q-42 0 -54.5 -13t-12.5 -57v-638q0 -32 9.5 -42.5t40.5 -10.5h80v-33z" />
+<glyph unicode="\" horiz-adv-x="278" d="M303 -19h-92l-236 710h93z" />
+<glyph unicode="]" horiz-adv-x="333" d="M266 -149h-234v33h80q31 0 40.5 10t9.5 43v638q0 44 -12.5 57t-54.5 13h-63v33h234v-827z" />
+<glyph unicode="^" horiz-adv-x="581" d="M509 311h-89l-129 272l-129 -272h-89l178 365h80z" />
+<glyph unicode="_" horiz-adv-x="500" d="M500 -125h-500v50h500v-50z" />
+<glyph unicode="`" horiz-adv-x="333" d="M246 528h-56l-142 88q-40 25 -40 52q0 19 13.5 32t33.5 13q29 0 54 -28z" />
+<glyph unicode="a" horiz-adv-x="500" d="M473 64l15 -21q-53 -57 -112 -57q-37 0 -55.5 15.5t-26.5 53.5q-76 -69 -159 -69q-50 0 -80 26.5t-30 79.5q0 67 67 112q50 33 201 76v68q0 49 -18.5 71t-62.5 22q-28 0 -46.5 -10t-18.5 -27q0 -11 11 -23q19 -23 19 -42q0 -26 -19 -43t-49 -17q-31 0 -48 18t-17 50 q0 59 52.5 92.5t138.5 33.5q92 0 144 -35t52 -99v-261q0 -28 21 -28q7 0 11 4zM293 97v148q-122 -34 -122 -121q0 -32 14.5 -49.5t37.5 -17.5q42 0 70 40z" />
+<glyph unicode="b" horiz-adv-x="556" d="M211 676v-259q53 56 122 56q83 0 135.5 -65t52.5 -169q0 -113 -63 -183t-163 -70q-70 0 -132 57l-79 -56h-12v607q0 30 -10 40.5t-45 17.5v24h194zM211 360v-263q0 -36 19 -57.5t50 -21.5q94 0 94 203q0 198 -93 198q-25 0 -41 -13.5t-29 -45.5z" />
+<glyph unicode="c" horiz-adv-x="444" d="M412 109l18 -18q-41 -56 -86 -80.5t-105 -24.5q-95 0 -154.5 65t-59.5 171q0 110 68 180.5t169 70.5q66 0 110 -31t44 -79q0 -29 -18.5 -46.5t-49.5 -17.5q-26 0 -41 19t-15 54q0 18 -0.5 26t-2.5 18.5t-6 15t-12.5 7.5t-20.5 3q-38 0 -61 -44.5t-23 -124.5 q0 -102 37 -161t102 -59q58 0 107 56z" />
+<glyph unicode="d" horiz-adv-x="556" d="M534 20l-62 -8q-82 -11 -133 -25v65q-35 -37 -64 -51.5t-69 -14.5q-79 0 -130 66t-51 169q0 109 54.5 180.5t137.5 71.5q34 0 60.5 -13.5t58.5 -48.5v183q0 35 -13 44.5t-63 13.5v24h215v-575q0 -32 12.5 -44t46.5 -14v-23zM336 112v243q-11 29 -32 45.5t-46 16.5 q-85 0 -85 -188q0 -187 78 -187q36 0 66 37q19 25 19 33z" />
+<glyph unicode="e" horiz-adv-x="444" d="M403 126l24 -14q-44 -70 -88.5 -98t-109.5 -28q-90 0 -147 67.5t-57 170.5q0 112 57.5 180.5t151.5 68.5q83 0 128 -50q53 -58 59 -178h-252q3 -42 8 -70.5t17 -57.5t35.5 -44t58.5 -15q32 0 58 15.5t57 52.5zM298 282v21q0 73 -9 92q-12 25 -23.5 36t-31.5 11 q-36 0 -53 -36.5t-17 -123.5h134z" />
+<glyph unicode="f" horiz-adv-x="333" d="M14 461h57q0 131 40 179q42 51 135 51q64 0 103.5 -28t39.5 -72q0 -28 -17 -46t-45 -18q-25 0 -42.5 17t-17.5 40q0 20 11 36.5t11 20.5q0 19 -29 19q-27 0 -38.5 -17.5t-11.5 -61.5v-120h86v-44h-86v-310q0 -50 15 -66t67 -17v-24h-278v24q34 4 45.5 16.5t11.5 46.5v330 h-57v44z" />
+<glyph unicode="g" horiz-adv-x="500" d="M254 68h52q81 0 129 -32.5t48 -87.5q0 -71 -68.5 -112.5t-192.5 -41.5q-194 0 -194 92q0 61 96 75q-47 17 -64.5 35t-17.5 47q0 44 29 71.5t90 45.5q-55 15 -89.5 56t-34.5 96q0 73 56.5 117t146.5 44q52 0 112 -22h129v-53h-80q40 -36 40 -98q0 -94 -92 -132 q-24 -10 -41 -12t-86 -2q-30 0 -49.5 -13.5t-19.5 -35.5q0 -21 21 -29t80 -8zM306 312q0 70 -15.5 100t-51.5 30t-50.5 -29t-14.5 -102q0 -70 15 -99.5t51 -29.5t51 29.5t15 100.5zM315 -52h-164q-21 -17 -28 -28t-7 -27q0 -67 134 -67q72 0 113 18.5t41 47.5q0 56 -89 56z " />
+<glyph unicode="h" horiz-adv-x="556" d="M534 0h-234v24q25 3 35.5 16.5t10.5 44.5v224q0 54 -11 75.5t-40 21.5q-36 0 -70 -34q-17 -17 -17 -24v-263q0 -31 10 -44t38 -17v-24h-240v24q36 7 44.5 16t8.5 49v502q0 35 -9 44.5t-45 16.5v24h193v-280q65 77 147 77q60 0 95 -38t35 -98v-250q0 -34 11.5 -48.5 t37.5 -14.5v-24z" />
+<glyph unicode="i" horiz-adv-x="278" d="M256 0h-240v24q35 8 44 19t9 45v285q0 33 -10.5 45t-43.5 19v24h193v-376q0 -32 10.5 -44.5t37.5 -16.5v-24zM215 613q0 -33 -22.5 -55t-55.5 -22t-55 22t-22 55t22.5 55.5t56.5 22.5q31 0 53.5 -23t22.5 -55z" />
+<glyph unicode="j" horiz-adv-x="333" d="M260 461v-459q0 -84 -27 -129q-43 -76 -150 -76q-62 0 -101 28t-39 72q0 27 17 44t45 17q25 0 42 -15.5t17 -38.5q0 -16 -14 -37q-9 -15 -9 -22q0 -17 32 -17q25 0 36.5 18t11.5 58v474q0 32 -12.5 44t-50.5 15v24h202zM263 613q0 -33 -22.5 -55t-56.5 -22 q-33 0 -54.5 22t-21.5 55t22.5 55.5t55.5 22.5q31 0 54 -23t23 -55z" />
+<glyph unicode="k" horiz-adv-x="556" d="M543 0h-234v24q42 2 42 19q0 12 -24 45l-95 134l-23 -24v-114q0 -35 8.5 -45t43.5 -15v-24h-239v24q48 4 48 60v510q0 54 -48 58v24h187v-431l128 128q21 21 21 38q0 18 -35 23l-24 4v23h214v-23q-47 -6 -80.5 -29t-108.5 -102l194 -268q11 -15 25 -15v-24z" />
+<glyph unicode="l" horiz-adv-x="278" d="M256 0h-240v24q51 4 51 63v500q0 61 -52 65v24h191v-589q0 -33 12 -47.5t38 -15.5v-24z" />
+<glyph unicode="m" horiz-adv-x="833" d="M814 0h-237v24q28 2 38 14.5t10 44.5v228q0 95 -53 95q-29 0 -58 -25q-9 -7 -18 -18t-9 -15v-265q0 -29 10 -42.5t36 -16.5v-24h-232v24q27 2 37 15t10 44v240q0 45 -12.5 64t-41.5 19q-19 0 -51.5 -22.5t-32.5 -39.5v-261q0 -29 9.5 -42t35.5 -17v-24h-239v24 q33 6 44 18.5t11 43.5v287q0 35 -11 47t-45 17v24h192v-75h3q29 46 62.5 66.5t81.5 20.5q47 0 76 -20t52 -67q39 48 71.5 67.5t75.5 19.5q62 0 98.5 -38t36.5 -104v-248q0 -32 10.5 -45t39.5 -14v-24z" />
+<glyph unicode="n" horiz-adv-x="556" d="M539 0h-234v24q25 3 35.5 16.5t10.5 43.5v237q0 85 -51 85q-36 0 -70 -34q-17 -17 -17 -24v-264q0 -29 10.5 -42.5t37.5 -17.5v-24h-240v24q33 7 43 19t10 44v289q0 32 -10 44t-43 17v24h191v-75h1q49 87 142 87q62 0 98.5 -38.5t36.5 -103.5v-247q0 -34 10 -46t39 -14 v-24z" />
+<glyph unicode="o" horiz-adv-x="500" d="M476 229q0 -105 -64.5 -174t-161.5 -69q-95 0 -160 68.5t-65 173.5q0 109 64.5 177t164.5 68q95 0 158.5 -69t63.5 -175zM329 218q0 128 -17 176t-61 48q-46 0 -62.5 -47.5t-16.5 -176.5q0 -109 18 -155t61 -46t60.5 44.5t17.5 156.5z" />
+<glyph unicode="p" horiz-adv-x="556" d="M212 461v-69q25 44 55.5 62.5t75.5 18.5q85 0 133 -57.5t48 -166.5q0 -118 -51.5 -190t-140.5 -72q-34 0 -58 12.5t-60 47.5v-126q0 -52 16.5 -76t60.5 -26v-24h-272v24q35 6 45.5 18.5t10.5 44.5v490q0 33 -11 46.5t-44 18.5v24h192zM214 346v-239q12 -29 32.5 -47 t44.5 -18q85 0 85 192q0 182 -76 182q-37 0 -68 -37q-18 -21 -18 -33z" />
+<glyph unicode="q" horiz-adv-x="556" d="M536 -205h-267v24q48 7 60.5 23.5t12.5 67.5v132q-44 -56 -123 -56t-132 63.5t-53 169.5q0 108 61.5 181t160.5 73q38 0 66 -12t66 -44l77 55h16v-595q0 -30 10 -40.5t45 -17.5v-24zM342 98v256q0 41 -18.5 64t-48.5 23q-44 0 -69.5 -51t-25.5 -154q0 -98 25 -147t68 -49 q28 0 48.5 15.5t20.5 42.5z" />
+<glyph unicode="r" horiz-adv-x="444" d="M218 461v-82q35 51 66 72.5t69 21.5q35 0 58 -22.5t23 -56.5q0 -30 -17.5 -49t-45.5 -19q-37 0 -60 38q-14 23 -28 23q-26 0 -43.5 -30t-17.5 -74v-177q0 -48 13.5 -63.5t58.5 -18.5v-24h-265v24q33 6 43.5 17.5t10.5 42.5v289q0 35 -11 47t-44 17v24h190z" />
+<glyph unicode="s" horiz-adv-x="389" d="M340 326h-25q-19 56 -47 82q-34 32 -75 32q-28 0 -47 -16.5t-19 -41.5q0 -26 22.5 -46.5t73.5 -41.5q75 -31 106.5 -67t31.5 -89q0 -67 -43 -109.5t-111 -42.5q-52 0 -108 23q-15 6 -23 6q-11 0 -26 -28h-25v165h28q32 -132 137 -132q34 0 54.5 18t20.5 47q0 24 -22 44.5 t-74 42.5q-75 32 -108.5 68.5t-33.5 86.5q0 63 44.5 104.5t112.5 41.5q34 0 78 -15q22 -7 31 -7q17 0 25 20h22v-145z" />
+<glyph unicode="t" horiz-adv-x="333" d="M307 112l25 -11q-31 -62 -64.5 -87.5t-83.5 -25.5q-52 0 -82 28.5t-30 78.5v322h-53v27q49 33 82 71.5t85 114.5h25v-169h95v-44h-95v-298q0 -60 39 -60q29 0 57 53z" />
+<glyph unicode="u" horiz-adv-x="556" d="M538 20l-63 -7q-83 -9 -132 -26v65q-39 -37 -71.5 -51.5t-73.5 -14.5q-63 0 -98 38t-35 107v241q0 35 -9 47t-40 18v24h188v-334q0 -76 56 -76q39 0 82 47v276q0 34 -12 47t-49 16v24h200v-356q0 -33 12 -47t45 -15v-23z" />
+<glyph unicode="v" horiz-adv-x="500" d="M485 461v-24q-24 -2 -34 -11.5t-24 -43.5l-160 -396h-26l-120 296q-47 116 -66 141q-8 10 -34 14v24h250v-24l-18 -2q-35 -4 -35 -24q0 -9 9 -31l79 -203l72 182q11 26 11 45q0 18 -11.5 24.5t-43.5 8.5v24h151z" />
+<glyph unicode="w" horiz-adv-x="722" d="M707 461v-24q-19 -4 -29.5 -14.5t-20.5 -35.5l-155 -401h-23l-102 310l-125 -310h-24l-148 374q-19 47 -28.5 60t-28.5 17v24h222v-24q-38 -5 -38 -28q0 -12 39 -115l45 -118l68 171q-4 12 -6 19q-14 49 -22 58.5t-37 12.5v24h234v-24q-28 -2 -38 -7t-10 -17 q0 -14 27 -106q23 -79 34 -127l35 94q44 118 44 128q0 17 -10 24.5t-38 10.5v24h135z" />
+<glyph unicode="x" horiz-adv-x="500" d="M484 0h-241v24q45 3 45 20q0 16 -33 64q-23 32 -42 63q-2 -3 -7.5 -9.5t-8.5 -10.5q-64 -77 -64 -103q0 -21 50 -24v-24h-169v24q28 2 49.5 19.5t63.5 73.5l43 56q5 6 7.5 9.5t3.5 4.5t3.5 4.5t7.5 9.5l-128 197q-15 23 -24 29.5t-28 9.5v24h250v-24q-47 -1 -47 -19 q0 -22 58 -98q10 -12 13 -17l36 46q38 49 38 64q0 11 -7 15.5t-24 6.5l-20 2v24h168v-24q-44 -7 -70 -39l-101 -126l148 -228q8 -13 30 -20v-24z" />
+<glyph unicode="y" horiz-adv-x="500" d="M482 461v-24q-24 -3 -36 -13.5t-24 -41.5l-148 -398q-45 -121 -77 -156q-31 -33 -84 -33q-43 0 -70 22t-27 57q0 29 17 48t45 19q25 0 42.5 -15t17.5 -37q0 -4 -2 -14l-1 -6q0 -7 5 -12t12 -5q38 0 66 82l18 53l-119 290q-49 121 -67 146q-8 10 -34 14v24h249v-24l-16 -1 q-36 -3 -36 -25q0 -7 20 -58l72 -186l68 188q11 32 11 49q0 18 -11 25t-43 8v24h152z" />
+<glyph unicode="z" horiz-adv-x="444" d="M420 160l-16 -160h-383v25l234 404q-106 0 -139 -19t-52 -91h-26l7 142h371v-26l-231 -403h29q61 0 91.5 12.5t55.5 46.5q20 30 31 69h28z" />
+<glyph unicode="{" horiz-adv-x="394" d="M340 -163v-12q-74 1 -112 9.5t-61 28.5q-38 32 -38 103v179q0 53 -21.5 76.5t-85.5 39.5q64 16 85.5 39.5t21.5 76.5v179q0 82 50 113q42 28 161 29v-12q-60 -13 -83 -40t-23 -84v-171q0 -63 -23.5 -89t-94.5 -41q71 -15 94.5 -41t23.5 -89v-171q0 -57 23.5 -84t82.5 -39 z" />
+<glyph unicode="|" horiz-adv-x="220" d="M154 -19h-88v710h88v-710z" />
+<glyph unicode="}" horiz-adv-x="394" d="M265 557v-179q0 -53 21.5 -76.5t85.5 -39.5q-64 -16 -85.5 -39.5t-21.5 -76.5v-179q0 -82 -50 -113q-42 -28 -161 -29v12q60 13 83 40t23 84v171q0 62 24 88.5t94 41.5q-71 15 -94.5 41t-23.5 89v171q0 57 -23.5 84t-82.5 39v12q119 -1 161 -29q50 -31 50 -112z" />
+<glyph unicode="~" horiz-adv-x="520" d="M455 333l36 -70q-34 -47 -62 -66.5t-63 -19.5q-41 0 -103 33q-63 35 -113 35q-52 0 -85 -72l-36 70q26 45 54.5 65.5t68.5 20.5q41 0 134 -42q60 -26 81 -26q45 0 88 72z" />
+<glyph unicode="&#xa1;" horiz-adv-x="333" d="M251 417q0 -35 -24.5 -60t-59.5 -25t-60 25t-25 61q0 35 25 59t61 24q35 0 59 -24.5t24 -59.5zM153 254h29q10 -91 20 -143t32 -125q18 -58 18 -89q0 -47 -22.5 -73.5t-62.5 -26.5t-62 26.5t-22 74.5q0 30 18 88q37 121 52 268z" />
+<glyph unicode="&#xa2;" horiz-adv-x="500" d="M440 109l18 -18q-46 -58 -89 -81.5t-102 -23.5q-23 0 -50 7l-47 -133h-40l51 145q-39 19 -64 44q-64 66 -64 174q0 107 66 178.5t166 71.5q28 0 60 -8l44 123h40l-48 -136q63 -36 63 -88q0 -29 -18 -46.5t-48 -17.5q-25 0 -44 20l-82 -230q37 -37 83 -37q59 0 105 56z M321 397v3q0 18 -12 30t-31 12q-39 0 -61.5 -45.5t-22.5 -122.5q0 -80 31 -146z" />
+<glyph unicode="&#xa3;" horiz-adv-x="500" d="M454 183h23q-9 -107 -38 -149q-34 -50 -93 -50q-31 0 -57 13.5t-68 51.5q-48 -62 -112 -62q-42 0 -65 22t-23 63q0 92 106 92q23 0 51 -7q-2 43 -41 151h-98v65h80q-14 79 -14 118q0 47 21.5 90t57.5 69q49 34 124 34q70 0 110.5 -30.5t40.5 -82.5q0 -34 -18 -53t-50 -19 q-28 0 -45 18t-17 47q0 8 1 22.5t1 24.5q1 21 -11 32t-33 11q-25 0 -40.5 -17t-15.5 -45q0 -47 39 -219h114v-65h-109q2 -38 2 -54q0 -61 -20 -120q61 -22 96 -22q47 0 68.5 15t32.5 56zM181 86q-36 32 -72 32q-26 0 -41 -14t-15 -38q0 -22 15 -35.5t41 -13.5q28 0 45 16 t27 53z" />
+<glyph unicode="&#xa4;" horiz-adv-x="500" d="M526 48l-58 -58l-96 98q-60 -37 -122 -37t-122 37l-96 -98l-58 58l98 98q-37 56 -37 120q0 65 37 122l-98 98l58 56l96 -96q56 35 122 35t122 -35l96 96l58 -56l-98 -98q37 -59 37 -122q0 -69 -37 -120zM377 267q0 55 -37.5 93.5t-91.5 38.5q-52 0 -88.5 -39t-36.5 -93 q0 -56 36.5 -95t89.5 -39q54 0 91 39t37 95z" />
+<glyph unicode="&#xa5;" horiz-adv-x="500" d="M547 676v-26q-46 -4 -64 -37l-144 -271h111v-50h-131l-4 -11v-67h135v-50h-135v-49q0 -51 18.5 -68t80.5 -22v-25h-331v25q64 5 83 22t19 68v49h-135v50h135v57l-11 21h-124v50h99l-130 255q-24 49 -83 53v26h301v-26q-45 -2 -61 -7.5t-16 -21.5q0 -18 76 -167l57 -112 l119 230q8 15 8 35q0 24 -15 32.5t-63 10.5v26h205z" />
+<glyph unicode="&#xa6;" horiz-adv-x="220" d="M154 414h-88v277h88v-277zM154 -19h-88v277h88v-277z" />
+<glyph unicode="&#xa7;" horiz-adv-x="500" d="M186 415h13q-62 54 -81 82t-19 64q0 57 42 93.5t107 36.5q59 0 102 -30t43 -70q0 -25 -19.5 -44t-45.5 -19q-22 0 -41 18.5t-19 38.5q0 22 27 43q15 12 15 19q0 8 -16.5 14.5t-37.5 6.5q-37 0 -60 -19t-23 -50q0 -51 104 -119q100 -65 146 -143q20 -34 20 -82 q0 -56 -39 -86q-31 -24 -102 -25q55 -39 78.5 -72.5t23.5 -74.5q0 -56 -46 -92.5t-118 -36.5q-62 0 -106 29.5t-44 70.5q0 28 18 46.5t45 18.5q26 0 45.5 -16.5t19.5 -39.5t-31 -42q-15 -10 -15 -15q0 -11 20.5 -20t47.5 -9q79 0 79 71q0 23 -8 38t-29 32l-57 46 q-107 86 -137.5 125.5t-30.5 89.5q0 122 129 122zM367 225q0 37 -43 77q-96 90 -139 90q-23 0 -38 -15.5t-15 -40.5q0 -28 13 -46.5t60 -59.5q43 -38 64.5 -50.5t44.5 -12.5t38 16.5t15 41.5z" />
+<glyph unicode="&#xa8;" horiz-adv-x="333" d="M337 600q0 -26 -19 -44.5t-47 -18.5q-26 0 -44.5 19t-18.5 46q0 26 19 45t45 19t45.5 -19.5t19.5 -46.5zM127 600q0 -26 -18.5 -44.5t-46.5 -18.5q-26 0 -45 19t-19 46q0 26 19.5 45t45.5 19t45 -19.5t19 -46.5z" />
+<glyph unicode="&#xa9;" horiz-adv-x="747" d="M544 256l-16 -74q-2 -15 -31 -23l-12 -3q-58 -14 -95 -14q-98 0 -156 53t-58 144q0 94 61.5 149.5t164.5 55.5q50 0 103 -19q22 -8 22 -21v-72h-19q-24 89 -107 89q-59 0 -91 -46t-32 -131q0 -86 32 -132.5t91 -46.5q42 0 71 21t53 70h19zM721 335q0 -150 -100 -252 t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251.5t252.5 101.5q143 0 242 -103.5t99 -252.5zM650 338q0 126 -81.5 213.5t-198.5 87.5q-112 0 -192.5 -89.5t-80.5 -214.5q0 -126 80.5 -214t196.5 -88q115 0 195.5 88.5t80.5 216.5z" />
+<glyph unicode="&#xaa;" horiz-adv-x="300" d="M291 443l10 -12q-33 -34 -73 -34q-24 0 -36 9t-17 32q-49 -41 -102 -41q-33 0 -53.5 18.5t-20.5 47.5q0 38 36.5 61t137.5 49v40q0 28 -11.5 40t-38.5 12q-17 0 -29 -6.5t-12 -15.5q0 -5 9 -14q11 -11 11 -21q0 -16 -13.5 -25.5t-34.5 -9.5q-42 0 -42 40q0 34 35 54.5 t94 20.5t93 -22t34 -60v-156q0 -15 11 -15l6 2zM172 465v87q-75 -22 -75 -73q0 -17 9 -28.5t23 -11.5q23 0 43 26z" />
+<glyph unicode="&#xab;" horiz-adv-x="500" d="M422 393l6 5q21 17 31 17q12 0 12 -11q0 -34 -93 -147q-16 -20 -23 -30q12 -18 40 -54q78 -101 78 -122q0 -15 -11 -15q-4 0 -29 16l-214 173v4zM226 393l6 5q21 17 31 17q12 0 12 -11q0 -33 -92 -147l-24 -30l40 -54q78 -92 78 -122q0 -15 -11 -15q-4 0 -29 16l-214 173 v4z" />
+<glyph unicode="&#xac;" d="M685 108h-88v203h-532v88h620v-291z" />
+<glyph unicode="&#xad;" horiz-adv-x="333" d="M287 171h-243v116h243v-116z" />
+<glyph unicode="&#xae;" horiz-adv-x="747" d="M563 153h-81q-12 0 -26 18t-37 63q-20 40 -49 86h-37v-105q0 -30 6 -36t40 -8v-18h-172v18q34 2 40 8t6 36v255q0 31 -6 37t-40 7v18h193q53 0 84 -26t31 -70q0 -73 -80 -105l58 -82q40 -56 70 -85v-11zM333 342h35q62 0 62 89q0 79 -61 79h-36v-168zM721 335 q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251.5t252.5 101.5q143 0 242 -103.5t99 -252.5zM650 338q0 126 -81.5 213.5t-198.5 87.5q-112 0 -192.5 -89.5t-80.5 -214.5q0 -126 80.5 -214t196.5 -88q115 0 195.5 88.5t80.5 216.5z" />
+<glyph unicode="&#xaf;" horiz-adv-x="333" d="M331 565h-330v72h330v-72z" />
+<glyph unicode="&#xb0;" horiz-adv-x="400" d="M343 545q0 -59 -42 -101t-101 -42t-101 42t-42 101t42 101t101 42t101 -42t42 -101zM288 545q0 37 -25.5 62.5t-62.5 25.5t-62.5 -25.5t-25.5 -62.5t25.5 -62.5t62.5 -25.5t62.5 25.5t25.5 62.5z" />
+<glyph unicode="&#xb1;" horiz-adv-x="770" d="M685 209h-266v-221h-88v221h-266v88h266v221h88v-221h266v-88zM685 -151h-620v88h620v-88z" />
+<glyph unicode="&#xb2;" horiz-adv-x="300" d="M300 402l-30 -127h-270v14q112 111 148 161t36 94q0 32 -22 54t-53 22q-47 0 -76 -54h-24q49 122 144 122q52 0 85.5 -31t33.5 -80q0 -33 -17 -63t-57 -67l-99 -92h92q50 0 64.5 7.5t28.5 39.5h16z" />
+<glyph unicode="&#xb3;" horiz-adv-x="300" d="M36 590l-20 7q52 91 149 91q50 0 78 -21.5t28 -59.5q0 -27 -11.5 -43t-42.5 -33q80 -33 80 -107q0 -65 -56 -110.5t-138 -45.5q-46 0 -73 14.5t-27 39.5q0 28 40 41q23 -2 35 -8t32 -25q27 -26 49 -26q28 0 45.5 18t17.5 47q0 44 -29 71t-101 50v10q46 14 65 31.5 t19 47.5q0 28 -17.5 44.5t-47.5 16.5q-23 0 -39.5 -11t-35.5 -39z" />
+<glyph unicode="&#xb4;" horiz-adv-x="333" d="M86 528l137 157q25 28 53 28q22 0 35 -12t13 -32q0 -17 -8 -27.5t-32 -25.5l-142 -88h-56z" />
+<glyph unicode="&#xb5;" horiz-adv-x="556" d="M536 60v-24q-33 -30 -53.5 -39.5t-52.5 -9.5q-69 0 -101 52q-24 -29 -46 -40.5t-53 -11.5q-56 0 -102 35q4 -30 19 -81q14 -43 14 -70q0 -77 -63 -77q-31 0 -48 20t-17 57q0 16 10 57q23 95 23 160v373h139v-312q0 -33 16 -53.5t41 -20.5q32 0 74 27v359h139v-360 q0 -20 11.5 -33.5t28.5 -13.5q10 0 21 6z" />
+<glyph unicode="&#xb6;" horiz-adv-x="639" d="M579 651l-26 -2q-37 -3 -46.5 -10.5t-9.5 -39.5v-704q0 -31 9 -41t45 -13l23 -2v-25h-171v837h-50v-837h-175v25q56 5 68.5 13t12.5 39v374q-69 3 -110 28q-89 55 -89 188q0 101 53 148t166 47h300v-25zM259 290v361q-36 -9 -54.5 -21t-31.5 -35q-23 -38 -23 -112 q0 -154 109 -193z" />
+<glyph unicode="&#xb7;" horiz-adv-x="250" d="M210 332q0 -35 -24.5 -59.5t-60.5 -24.5t-60 24t-24 60q0 35 25 60t60 25q34 0 59 -25t25 -60z" />
+<glyph unicode="&#xb8;" horiz-adv-x="333" d="M201 0l-28 -64q15 5 32 5q42 0 65.5 -18.5t23.5 -51.5q0 -41 -35 -65t-94 -24q-46 0 -97 18l16 37l6 -2q36 -12 53 -12q58 0 58 41q0 36 -46 36q-13 0 -28 -4l-11 8l43 96h42z" />
+<glyph unicode="&#xb9;" horiz-adv-x="300" d="M273 275h-243v20q48 0 62.5 11.5t14.5 48.5v221q0 41 -23 41q-17 0 -43 -10l-13 -5v21l164 65h11v-337q0 -35 13 -45t57 -11v-20z" />
+<glyph unicode="&#xba;" horiz-adv-x="330" d="M312 542q0 -63 -41.5 -104t-104.5 -41q-65 0 -106.5 41t-41.5 105q0 63 42 104t107 41q62 0 103.5 -42t41.5 -104zM214 534q0 77 -10.5 105t-39.5 28q-28 0 -38.5 -28t-10.5 -102q0 -67 11 -93.5t39 -26.5q27 0 38 26.5t11 90.5z" />
+<glyph unicode="&#xbb;" horiz-adv-x="500" d="M477 222l-203 -164q-4 -4 -7 -5q-18 -17 -30 -17t-12 11q0 34 92 147l24 30q-22 32 -40 53q-78 93 -78 123q0 15 11 15q10 0 29 -16l214 -173v-4zM281 222l-203 -164l-6 -5q-19 -17 -31 -17t-12 11q0 34 93 147q16 20 23 30q-22 32 -40 53q-78 93 -78 123q0 15 11 15 q10 0 29 -16l214 -173v-4z" />
+<glyph unicode="&#xbc;" d="M273 275h-243v20q48 0 62.5 11.5t14.5 48.5v221q0 41 -23 41q-17 0 -43 -10l-13 -5v21l164 65h11v-337q0 -35 13 -45t57 -11v-20zM743 87h-41v-87h-94v87h-161v67q66 97 164 213l39 46h52v-260h41v-66zM609 153v175l-137 -175h137zM671 688l-439 -700h-58l441 700h56z " />
+<glyph unicode="&#xbd;" d="M775 127l-30 -127h-270v14l45 46q29 28 45 45.5t38.5 46.5t33 58t10.5 59q0 31 -17 54t-47 23q-46 0 -75 -55h-24q48 122 144 122q51 0 90 -30.5t39 -80.5q0 -12 -3 -24t-10 -24l-14 -20q-5 -9 -17.5 -22.5t-17.5 -18.5t-20 -19t-17 -16l-78 -73v-5h103q33 0 48 8.5 t28 38.5h16zM629 688l-439 -700h-58l441 700h56zM238 275h-243v20q31 0 44.5 2.5t23 16t9.5 41.5v221q0 41 -23 41q-20 0 -56 -15v21l164 65h11v-337q0 -37 14.5 -46t55.5 -10v-20z" />
+<glyph unicode="&#xbe;" d="M733 87h-41v-87h-94v87h-161v67q66 97 164 213l39 46h52v-260h41v-66zM599 153v175l-137 -175h137zM669 688l-439 -700h-58l441 700h56zM241 533v-4q76 -30 76 -105q0 -65 -56.5 -110.5t-137.5 -45.5q-46 0 -73 14.5t-27 39.5q0 28 40 41q21 -2 32.5 -8t34.5 -25 q30 -26 49 -26q28 0 45.5 18t17.5 47q0 44 -29 71t-101 50v10q46 14 65 31.5t19 47.5q0 28 -17.5 44.5t-47.5 16.5q-23 0 -39.5 -11t-35.5 -39l-20 7q52 91 149 91q50 0 78 -21.5t28 -59.5q0 -26 -11 -42.5t-39 -31.5z" />
+<glyph unicode="&#xbf;" horiz-adv-x="500" d="M346 417q0 -35 -25 -60t-61 -25q-34 0 -58.5 25t-24.5 60t24.5 59.5t59.5 24.5q36 0 60.5 -24.5t24.5 -59.5zM247 256h30q3 -25 3 -45q-1 -46 -38.5 -123.5t-37.5 -122.5q0 -58 22.5 -94t61.5 -36q28 0 44.5 11t16.5 29q0 13 -15 29q-22 25 -22 51q0 28 20.5 47.5 t44.5 19.5q29 0 47.5 -22.5t18.5 -55.5q0 -63 -51 -104t-133 -41q-93 0 -148.5 46.5t-55.5 119.5q0 52 26 87.5t95 78.5q47 29 59 49.5t12 75.5z" />
+<glyph unicode="&#xc0;" horiz-adv-x="722" d="M457 778h-56l-142 88q-40 25 -40 52q0 19 13.5 32t33.5 13q29 0 54 -28zM689 0h-322v25l32 3q25 2 35.5 9.5t10.5 23.5q0 29 -46 136h-225l-13 -34q-31 -80 -31 -97q0 -19 18.5 -28.5t62.5 -12.5v-25h-202v25q35 6 53 28t46 92l221 545h28l222 -522q38 -90 58.5 -116.5 t51.5 -26.5v-25zM384 236l-101 243l-94 -243h195z" />
+<glyph unicode="&#xc1;" horiz-adv-x="722" d="M229 778l137 157q25 28 53 28q22 0 35 -12t13 -32q0 -17 -8 -27.5t-32 -25.5l-142 -88h-56zM689 0h-322v25l32 3q25 2 35.5 9.5t10.5 23.5q0 29 -46 136h-225l-13 -34q-31 -80 -31 -97q0 -19 18.5 -28.5t62.5 -12.5v-25h-202v25q35 6 53 28t46 92l221 545h28l222 -522 q38 -90 58.5 -116.5t51.5 -26.5v-25zM384 236l-101 243l-94 -243h195z" />
+<glyph unicode="&#xc2;" horiz-adv-x="722" d="M511 778h-57l-112 98l-112 -98h-56l122 176h92zM689 0h-322v25l32 3q25 2 35.5 9.5t10.5 23.5q0 29 -46 136h-225l-13 -34q-31 -80 -31 -97q0 -19 18.5 -28.5t62.5 -12.5v-25h-202v25q35 6 53 28t46 92l221 545h28l222 -522q38 -90 58.5 -116.5t51.5 -26.5v-25zM384 236 l-101 243l-94 -243h195z" />
+<glyph unicode="&#xc3;" horiz-adv-x="722" d="M481 924h43q-34 -127 -116 -127q-32 0 -65 14l-29 13q-48 22 -64 22q-19 0 -32.5 -13t-16.5 -34h-42q14 65 42 95t74 30q31 0 73 -19l40 -18q27 -12 39 -12q20 0 32 11t22 38zM689 0h-322v25l32 3q25 2 35.5 9.5t10.5 23.5q0 29 -46 136h-225l-13 -34q-31 -80 -31 -97 q0 -19 18.5 -28.5t62.5 -12.5v-25h-202v25q35 6 53 28t46 92l221 545h28l222 -522q38 -90 58.5 -116.5t51.5 -26.5v-25zM384 236l-101 243l-94 -243h195z" />
+<glyph unicode="&#xc4;" horiz-adv-x="722" d="M511 850q0 -26 -19 -44.5t-47 -18.5q-26 0 -44.5 19t-18.5 46q0 26 19 45t45 19t45.5 -19.5t19.5 -46.5zM301 850q0 -26 -18.5 -44.5t-46.5 -18.5q-26 0 -45 19t-19 46q0 26 19.5 45t45.5 19t45 -19.5t19 -46.5zM689 0h-322v25l32 3q25 2 35.5 9.5t10.5 23.5 q0 29 -46 136h-225l-13 -34q-31 -80 -31 -97q0 -19 18.5 -28.5t62.5 -12.5v-25h-202v25q35 6 53 28t46 92l221 545h28l222 -522q38 -90 58.5 -116.5t51.5 -26.5v-25zM384 236l-101 243l-94 -243h195z" />
+<glyph unicode="&#xc5;" horiz-adv-x="722" d="M448 895q0 -44 -31 -76t-75 -32q-45 0 -76 30.5t-31 75.5q0 44 32 75.5t76 31.5q43 0 74 -31t31 -74zM400 892q0 25 -18 42.5t-43 17.5q-22 0 -39 -17.5t-17 -40.5q0 -24 17 -41.5t40 -17.5q25 0 42.5 16.5t17.5 40.5zM689 0h-322v25l32 3q25 2 35.5 9.5t10.5 23.5 q0 29 -46 136h-225l-13 -34q-31 -80 -31 -97q0 -19 18.5 -28.5t62.5 -12.5v-25h-202v25q35 6 53 28t46 92l221 545h28l222 -522q38 -90 58.5 -116.5t51.5 -26.5v-25zM384 236l-101 243l-94 -243h195z" />
+<glyph unicode="&#xc6;" horiz-adv-x="1000" d="M951 211l-41 -211h-566v25q55 3 71.5 20.5t16.5 73.5v184h-190l-100 -188q-15 -29 -15 -45q0 -21 13.5 -29.5t52.5 -13.5l17 -2v-25h-206v25q30 5 46 23t64 105l220 402q28 50 28 62q0 18 -19 26t-68 11v22h634v-201h-25q-16 80 -44 114q-42 52 -181 52q-40 0 -53.5 -6 t-13.5 -24v-248q88 7 111 29.5t44 119.5h23v-338h-23q-14 93 -42.5 122.5t-112.5 34.5v-243q0 -32 15.5 -43t58.5 -11q126 0 186 61q26 27 48 60.5t28 55.5h23zM432 343v290h-7l-161 -290h168z" />
+<glyph unicode="&#xc7;" horiz-adv-x="722" d="M657 152l30 -25q-70 -80 -134 -112.5t-152 -33.5l-20 -45q15 5 32 5q42 0 65.5 -18.5t23.5 -51.5q0 -41 -35 -65t-94 -24q-46 0 -97 18l16 37l6 -2q35 -12 53 -12q58 0 58 41q0 36 -46 36q-13 0 -28 -4l-11 8l35 79l-3 1q-136 13 -221.5 110t-85.5 238q0 154 99.5 256.5 t248.5 102.5q70 0 155 -35q32 -14 46 -14t23.5 9.5t20.5 36.5h27v-234h-25q-26 57 -47.5 88.5t-53.5 59.5q-63 56 -133 56q-91 0 -137.5 -80.5t-46.5 -236.5q0 -146 43 -225q22 -39 65.5 -63t92.5 -24q47 0 90 18q37 14 66.5 36.5t73.5 68.5z" />
+<glyph unicode="&#xc8;" horiz-adv-x="667" d="M452 778h-56l-142 88q-40 25 -40 52q0 19 13.5 32t33.5 13q29 0 54 -28zM641 208l-40 -208h-585v25q54 6 71 21t17 55v479q0 38 -18 53t-70 18v25h577v-201h-25q-17 100 -65.5 133.5t-171.5 33.5q-38 0 -51.5 -12t-13.5 -42v-225q81 1 117 32.5t45 116.5h26v-338h-26 q-7 88 -43 121.5t-119 33.5v-242q0 -32 17.5 -44t65.5 -12q117 0 182 54q25 20 42 46t40 77h28z" />
+<glyph unicode="&#xc9;" horiz-adv-x="667" d="M231 778l137 157q25 28 53 28q22 0 35 -12t13 -32q0 -17 -8 -27.5t-32 -25.5l-142 -88h-56zM641 208l-40 -208h-585v25q54 6 71 21t17 55v479q0 38 -18 53t-70 18v25h577v-201h-25q-17 100 -65.5 133.5t-171.5 33.5q-38 0 -51.5 -12t-13.5 -42v-225q81 1 117 32.5 t45 116.5h26v-338h-26q-7 88 -43 121.5t-119 33.5v-242q0 -32 17.5 -44t65.5 -12q117 0 182 54q25 20 42 46t40 77h28z" />
+<glyph unicode="&#xca;" horiz-adv-x="667" d="M511 778h-57l-112 98l-112 -98h-56l122 176h92zM641 208l-40 -208h-585v25q54 6 71 21t17 55v479q0 38 -18 53t-70 18v25h577v-201h-25q-17 100 -65.5 133.5t-171.5 33.5q-38 0 -51.5 -12t-13.5 -42v-225q81 1 117 32.5t45 116.5h26v-338h-26q-7 88 -43 121.5t-119 33.5 v-242q0 -32 17.5 -44t65.5 -12q117 0 182 54q25 20 42 46t40 77h28z" />
+<glyph unicode="&#xcb;" horiz-adv-x="667" d="M511 850q0 -26 -19 -44.5t-47 -18.5q-26 0 -44.5 19t-18.5 46q0 26 19 45t45 19t45.5 -19.5t19.5 -46.5zM301 850q0 -26 -18.5 -44.5t-46.5 -18.5q-26 0 -45 19t-19 46q0 26 19.5 45t45.5 19t45 -19.5t19 -46.5zM641 208l-40 -208h-585v25q54 6 71 21t17 55v479 q0 38 -18 53t-70 18v25h577v-201h-25q-17 100 -65.5 133.5t-171.5 33.5q-38 0 -51.5 -12t-13.5 -42v-225q81 1 117 32.5t45 116.5h26v-338h-26q-7 88 -43 121.5t-119 33.5v-242q0 -32 17.5 -44t65.5 -12q117 0 182 54q25 20 42 46t40 77h28z" />
+<glyph unicode="&#xcc;" horiz-adv-x="389" d="M317 778h-56l-142 88q-40 25 -40 52q0 19 13.5 32t33.5 13q29 0 54 -28zM370 0h-350v25q57 5 75 20t18 61v470q0 41 -19 56t-74 19v25h350v-25q-56 -2 -75.5 -17.5t-19.5 -57.5v-470q0 -48 18.5 -62.5t76.5 -18.5v-25z" />
+<glyph unicode="&#xcd;" horiz-adv-x="389" d="M73 778l137 157q25 28 53 28q22 0 35 -12t13 -32q0 -17 -8 -27.5t-32 -25.5l-142 -88h-56zM370 0h-350v25q57 5 75 20t18 61v470q0 41 -19 56t-74 19v25h350v-25q-56 -2 -75.5 -17.5t-19.5 -57.5v-470q0 -48 18.5 -62.5t76.5 -18.5v-25z" />
+<glyph unicode="&#xce;" horiz-adv-x="389" d="M363 778h-57l-112 98l-112 -98h-56l122 176h92zM370 0h-350v25q57 5 75 20t18 61v470q0 41 -19 56t-74 19v25h350v-25q-56 -2 -75.5 -17.5t-19.5 -57.5v-470q0 -48 18.5 -62.5t76.5 -18.5v-25z" />
+<glyph unicode="&#xcf;" horiz-adv-x="389" d="M363 850q0 -26 -19 -44.5t-47 -18.5q-26 0 -44.5 19t-18.5 46q0 26 19 45t45 19t45.5 -19.5t19.5 -46.5zM153 850q0 -26 -18.5 -44.5t-46.5 -18.5q-26 0 -45 19t-19 46q0 26 19.5 45t45.5 19t45 -19.5t19 -46.5zM370 0h-350v25q57 5 75 20t18 61v470q0 41 -19 56t-74 19 v25h350v-25q-56 -2 -75.5 -17.5t-19.5 -57.5v-470q0 -48 18.5 -62.5t76.5 -18.5v-25z" />
+<glyph unicode="&#xd0;" horiz-adv-x="722" d="M14 676h305q174 0 272.5 -88t98.5 -243q0 -149 -90 -241q-47 -49 -118.5 -76.5t-151.5 -27.5h-316v25q43 1 63 17t20 49v235h-91v47h91v211q0 34 -17.5 48t-65.5 19v25zM259 326v-233q0 -34 12 -46t46 -12q98 0 149 72q50 73 50 223q0 132 -42 212q-54 100 -155 100 q-36 0 -48 -9.5t-12 -37.5v-222h114v-47h-114z" />
+<glyph unicode="&#xd1;" horiz-adv-x="722" d="M498 924h43q-34 -127 -116 -127q-32 0 -65 14l-29 13q-48 22 -64 22q-19 0 -32.5 -13t-16.5 -34h-42q14 65 42 95t74 30q31 0 73 -19l40 -18q27 -12 39 -12q20 0 32 11t22 38zM701 676v-25q-50 -8 -64 -22.5t-14 -60.5v-586h-28l-447 545v-396q0 -58 18 -78.5t76 -27.5 v-25h-226v25q55 7 71.5 22.5t16.5 61.5v470q-52 72 -85 72v25h211l349 -430v299q0 60 -18 80.5t-74 25.5v25h214z" />
+<glyph unicode="&#xd2;" horiz-adv-x="778" d="M503 778h-56l-142 88q-40 25 -40 52q0 19 13.5 32t33.5 13q29 0 54 -28zM743 335q0 -156 -99.5 -255t-255.5 -99q-155 0 -254 99t-99 254q0 159 101 258t258 99q151 0 250 -100.5t99 -255.5zM566 328q0 160 -46.5 245t-134.5 85q-83 0 -128 -85.5t-45 -242.5t46 -236.5 t132 -79.5t131 80t45 234z" />
+<glyph unicode="&#xd3;" horiz-adv-x="778" d="M267 778l137 157q25 28 53 28q22 0 35 -12t13 -32q0 -17 -8 -27.5t-32 -25.5l-142 -88h-56zM743 335q0 -156 -99.5 -255t-255.5 -99q-155 0 -254 99t-99 254q0 159 101 258t258 99q151 0 250 -100.5t99 -255.5zM566 328q0 160 -46.5 245t-134.5 85q-83 0 -128 -85.5 t-45 -242.5t46 -236.5t132 -79.5t131 80t45 234z" />
+<glyph unicode="&#xd4;" horiz-adv-x="778" d="M552 778h-57l-112 98l-112 -98h-56l122 176h92zM743 335q0 -156 -99.5 -255t-255.5 -99q-155 0 -254 99t-99 254q0 159 101 258t258 99q151 0 250 -100.5t99 -255.5zM566 328q0 160 -46.5 245t-134.5 85q-83 0 -128 -85.5t-45 -242.5t46 -236.5t132 -79.5t131 80t45 234z " />
+<glyph unicode="&#xd5;" horiz-adv-x="778" d="M527 924h43q-34 -127 -116 -127q-32 0 -65 14l-29 13q-48 22 -64 22q-19 0 -32.5 -13t-16.5 -34h-42q14 65 42 95t74 30q31 0 73 -19l40 -18q27 -12 39 -12q20 0 32 11t22 38zM743 335q0 -156 -99.5 -255t-255.5 -99q-155 0 -254 99t-99 254q0 159 101 258t258 99 q151 0 250 -100.5t99 -255.5zM566 328q0 160 -46.5 245t-134.5 85q-83 0 -128 -85.5t-45 -242.5t46 -236.5t132 -79.5t131 80t45 234z" />
+<glyph unicode="&#xd6;" horiz-adv-x="778" d="M554 850q0 -26 -19 -44.5t-47 -18.5q-26 0 -44.5 19t-18.5 46q0 26 19 45t45 19t45.5 -19.5t19.5 -46.5zM344 850q0 -26 -18.5 -44.5t-46.5 -18.5q-26 0 -45 19t-19 46q0 26 19.5 45t45.5 19t45 -19.5t19 -46.5zM743 335q0 -156 -99.5 -255t-255.5 -99q-155 0 -254 99 t-99 254q0 159 101 258t258 99q151 0 250 -100.5t99 -255.5zM566 328q0 160 -46.5 245t-134.5 85q-83 0 -128 -85.5t-45 -242.5t46 -236.5t132 -79.5t131 80t45 234z" />
+<glyph unicode="&#xd7;" horiz-adv-x="702" d="M636 29l-62 -62l-223 224l-223 -224l-62 62l223 224l-222 223l62 62l222 -223l223 223l62 -62l-223 -223z" />
+<glyph unicode="&#xd8;" horiz-adv-x="778" d="M685 737l-78 -115q65 -53 93 -106q43 -80 43 -180q0 -156 -99.5 -255.5t-254.5 -99.5q-99 0 -187 49l-71 -104h-50l86 126q-44 38 -66.5 68t-40.5 75q-25 65 -25 140q0 155 100 255.5t255 100.5q94 0 182 -47l63 93h50zM234 151l286 418q-26 48 -56.5 68.5t-74.5 20.5 q-85 0 -131 -85.5t-46 -244.5q0 -99 22 -177zM540 524l-287 -420q26 -48 57.5 -69t78.5 -21q87 0 132 80.5t45 236.5q0 109 -26 193z" />
+<glyph unicode="&#xd9;" horiz-adv-x="722" d="M479 778h-56l-142 88q-40 25 -40 52q0 19 13.5 32t33.5 13q29 0 54 -28zM701 676v-25q-48 -7 -63 -24t-15 -61v-314q0 -156 -76 -216q-68 -55 -184 -55t-185 54q-43 34 -61.5 79t-18.5 117v324q0 59 -14 75t-68 21v25h336v-25q-60 -5 -77.5 -23t-17.5 -78v-318 q0 -202 146 -202q176 0 176 222v300q0 54 -20.5 74t-76.5 25v25h219z" />
+<glyph unicode="&#xda;" horiz-adv-x="722" d="M242 778l137 157q25 28 53 28q22 0 35 -12t13 -32q0 -17 -8 -27.5t-32 -25.5l-142 -88h-56zM701 676v-25q-48 -7 -63 -24t-15 -61v-314q0 -156 -76 -216q-68 -55 -184 -55t-185 54q-43 34 -61.5 79t-18.5 117v324q0 59 -14 75t-68 21v25h336v-25q-60 -5 -77.5 -23 t-17.5 -78v-318q0 -202 146 -202q176 0 176 222v300q0 54 -20.5 74t-76.5 25v25h219z" />
+<glyph unicode="&#xdb;" horiz-adv-x="722" d="M530 778h-57l-112 98l-112 -98h-56l122 176h92zM701 676v-25q-48 -7 -63 -24t-15 -61v-314q0 -156 -76 -216q-68 -55 -184 -55t-185 54q-43 34 -61.5 79t-18.5 117v324q0 59 -14 75t-68 21v25h336v-25q-60 -5 -77.5 -23t-17.5 -78v-318q0 -202 146 -202q176 0 176 222 v300q0 54 -20.5 74t-76.5 25v25h219z" />
+<glyph unicode="&#xdc;" horiz-adv-x="722" d="M533 850q0 -26 -19 -44.5t-47 -18.5q-26 0 -44.5 19t-18.5 46q0 26 19 45t45 19t45.5 -19.5t19.5 -46.5zM323 850q0 -26 -18.5 -44.5t-46.5 -18.5q-26 0 -45 19t-19 46q0 26 19.5 45t45.5 19t45 -19.5t19 -46.5zM701 676v-25q-48 -7 -63 -24t-15 -61v-314 q0 -156 -76 -216q-68 -55 -184 -55t-185 54q-43 34 -61.5 79t-18.5 117v324q0 59 -14 75t-68 21v25h336v-25q-60 -5 -77.5 -23t-17.5 -78v-318q0 -202 146 -202q176 0 176 222v300q0 54 -20.5 74t-76.5 25v25h219z" />
+<glyph unicode="&#xdd;" horiz-adv-x="722" d="M249 778l137 157q25 28 53 28q22 0 35 -12t13 -32q0 -17 -8 -27.5t-32 -25.5l-142 -88h-56zM699 676v-25q-49 -7 -68 -39l-191 -311v-178q0 -58 16.5 -75.5t75.5 -22.5v-25h-347v25q60 5 76.5 25t16.5 78v136l-180 328q-31 56 -83 59v25h335v-25l-27 -2q-32 -2 -43 -7.5 t-11 -21.5q0 -13 24 -59l120 -232l109 178q41 68 41 102q0 22 -16.5 30t-67.5 12v25h220z" />
+<glyph unicode="&#xde;" horiz-adv-x="611" d="M262 546h66q150 0 216 -55q56 -48 56 -128q0 -98 -88 -150q-41 -25 -86 -32t-164 -8v-56q0 -55 14.5 -69.5t73.5 -22.5v-25h-334v25l24 4q36 6 48 23.5t12 64.5v442q0 53 -16 70.5t-68 21.5v25h334v-25q-60 -8 -74 -23t-14 -70v-12zM262 476v-268q98 0 132 31t34 120 q0 82 -27 117t-89 35q-50 0 -50 -35z" />
+<glyph unicode="&#xdf;" horiz-adv-x="556" d="M70 87v420q0 81 58 132.5t149 51.5q86 0 142.5 -43.5t56.5 -110.5q0 -66 -61 -107q-34 -23 -95 -37q106 -31 147 -71q50 -47 50 -128q0 -86 -55 -146t-134 -60q-23 0 -64 15l14 34l10 -7q10 -7 21 -7q36 0 49 36.5t13 137.5q0 125 -39 157q-19 16 -63 19v34q43 1 56.5 25 t13.5 98q0 70 -16.5 101.5t-53.5 31.5q-60 0 -60 -77v-586h-190v24q32 5 41.5 16.5t9.5 46.5z" />
+<glyph unicode="&#xe0;" horiz-adv-x="500" d="M473 64l15 -21q-53 -57 -112 -57q-37 0 -55.5 15.5t-26.5 53.5q-76 -69 -159 -69q-50 0 -80 26.5t-30 79.5q0 67 67 112q50 33 201 76v68q0 49 -18.5 71t-62.5 22q-28 0 -46.5 -10t-18.5 -27q0 -11 11 -23q19 -23 19 -42q0 -26 -19 -43t-49 -17q-31 0 -48 18t-17 50 q0 59 52.5 92.5t138.5 33.5q92 0 144 -35t52 -99v-261q0 -28 21 -28q7 0 11 4zM293 97v148q-122 -34 -122 -121q0 -32 14.5 -49.5t37.5 -17.5q42 0 70 40zM365 528h-56l-142 88q-40 25 -40 52q0 19 13.5 32t33.5 13q29 0 54 -28z" />
+<glyph unicode="&#xe1;" horiz-adv-x="500" d="M145 528l137 157q25 28 53 28q22 0 35 -12t13 -32q0 -17 -8 -27.5t-32 -25.5l-142 -88h-56zM473 64l15 -21q-53 -57 -112 -57q-37 0 -55.5 15.5t-26.5 53.5q-76 -69 -159 -69q-50 0 -80 26.5t-30 79.5q0 67 67 112q50 33 201 76v68q0 49 -18.5 71t-62.5 22 q-28 0 -46.5 -10t-18.5 -27q0 -11 11 -23q19 -23 19 -42q0 -26 -19 -43t-49 -17q-31 0 -48 18t-17 50q0 59 52.5 92.5t138.5 33.5q92 0 144 -35t52 -99v-261q0 -28 21 -28q7 0 11 4zM293 97v148q-122 -34 -122 -121q0 -32 14.5 -49.5t37.5 -17.5q42 0 70 40z" />
+<glyph unicode="&#xe2;" horiz-adv-x="500" d="M424 528h-57l-112 98l-112 -98h-56l122 176h92zM473 64l15 -21q-53 -57 -112 -57q-37 0 -55.5 15.5t-26.5 53.5q-76 -69 -159 -69q-50 0 -80 26.5t-30 79.5q0 67 67 112q50 33 201 76v68q0 49 -18.5 71t-62.5 22q-28 0 -46.5 -10t-18.5 -27q0 -11 11 -23q19 -23 19 -42 q0 -26 -19 -43t-49 -17q-31 0 -48 18t-17 50q0 59 52.5 92.5t138.5 33.5q92 0 144 -35t52 -99v-261q0 -28 21 -28q7 0 11 4zM293 97v148q-122 -34 -122 -121q0 -32 14.5 -49.5t37.5 -17.5q42 0 70 40z" />
+<glyph unicode="&#xe3;" horiz-adv-x="500" d="M394 674h43q-34 -127 -116 -127q-32 0 -65 14l-29 13q-48 22 -64 22q-19 0 -32.5 -13t-16.5 -34h-42q14 65 42 95t74 30q31 0 73 -19l40 -18q27 -12 39 -12q20 0 32 11t22 38zM473 64l15 -21q-53 -57 -112 -57q-37 0 -55.5 15.5t-26.5 53.5q-76 -69 -159 -69 q-50 0 -80 26.5t-30 79.5q0 67 67 112q50 33 201 76v68q0 49 -18.5 71t-62.5 22q-28 0 -46.5 -10t-18.5 -27q0 -11 11 -23q19 -23 19 -42q0 -26 -19 -43t-49 -17q-31 0 -48 18t-17 50q0 59 52.5 92.5t138.5 33.5q92 0 144 -35t52 -99v-261q0 -28 21 -28q7 0 11 4zM293 97 v148q-122 -34 -122 -121q0 -32 14.5 -49.5t37.5 -17.5q42 0 70 40z" />
+<glyph unicode="&#xe4;" horiz-adv-x="500" d="M425 600q0 -26 -19 -44.5t-47 -18.5q-26 0 -44.5 19t-18.5 46q0 26 19 45t45 19t45.5 -19.5t19.5 -46.5zM215 600q0 -26 -18.5 -44.5t-46.5 -18.5q-26 0 -45 19t-19 46q0 26 19.5 45t45.5 19t45 -19.5t19 -46.5zM473 64l15 -21q-53 -57 -112 -57q-37 0 -55.5 15.5 t-26.5 53.5q-76 -69 -159 -69q-50 0 -80 26.5t-30 79.5q0 67 67 112q50 33 201 76v68q0 49 -18.5 71t-62.5 22q-28 0 -46.5 -10t-18.5 -27q0 -11 11 -23q19 -23 19 -42q0 -26 -19 -43t-49 -17q-31 0 -48 18t-17 50q0 59 52.5 92.5t138.5 33.5q92 0 144 -35t52 -99v-261 q0 -28 21 -28q7 0 11 4zM293 97v148q-122 -34 -122 -121q0 -32 14.5 -49.5t37.5 -17.5q42 0 70 40z" />
+<glyph unicode="&#xe5;" horiz-adv-x="500" d="M362 647q0 -44 -31 -76t-75 -32q-45 0 -76 30.5t-31 75.5q0 44 32 75.5t76 31.5q43 0 74 -31t31 -74zM314 644q0 25 -18 42.5t-43 17.5q-22 0 -39 -17.5t-17 -40.5q0 -24 17 -41.5t40 -17.5q25 0 42.5 16.5t17.5 40.5zM473 64l15 -21q-53 -57 -112 -57q-37 0 -55.5 15.5 t-26.5 53.5q-76 -69 -159 -69q-50 0 -80 26.5t-30 79.5q0 67 67 112q50 33 201 76v68q0 49 -18.5 71t-62.5 22q-28 0 -46.5 -10t-18.5 -27q0 -11 11 -23q19 -23 19 -42q0 -26 -19 -43t-49 -17q-31 0 -48 18t-17 50q0 59 52.5 92.5t138.5 33.5q92 0 144 -35t52 -99v-261 q0 -28 21 -28q7 0 11 4zM293 97v148q-122 -34 -122 -121q0 -32 14.5 -49.5t37.5 -17.5q42 0 70 40z" />
+<glyph unicode="&#xe6;" horiz-adv-x="722" d="M673 129l21 -15q-44 -68 -91.5 -95.5t-118.5 -27.5q-101 0 -147 84h-6q-72 -89 -180 -89q-118 0 -118 108q0 55 59 105q50 42 204 86v75q0 44 -18 62.5t-60 18.5q-28 0 -46.5 -10t-18.5 -25q0 -9 12 -22q17 -20 17 -43q0 -28 -18.5 -45t-48.5 -17q-31 0 -48 19.5 t-17 49.5q0 54 52 89.5t132 35.5q95 0 140 -51q46 51 127 51q56 0 100 -26.5t66 -74.5q21 -45 21 -124h-254v-23q0 -85 26.5 -124.5t88.5 -39.5q69 0 124 68zM567 285v33q0 70 -14 97.5t-49 27.5q-38 0 -54 -37t-16 -121h133zM296 81v167q-66 -24 -92.5 -52.5t-26.5 -75.5 q0 -71 57 -71q31 0 62 32z" />
+<glyph unicode="&#xe7;" horiz-adv-x="444" d="M412 109l18 -18q-70 -95 -165 -104l-23 -51q15 5 32 5q42 0 65.5 -18.5t23.5 -51.5q0 -41 -35 -65t-94 -24q-46 0 -97 18l16 37l6 -2q35 -12 53 -12q58 0 58 41q0 36 -46 36q-13 0 -28 -4l-11 8l36 83q-87 6 -141.5 70t-54.5 165q0 110 68 180.5t169 70.5q66 0 110 -31 t44 -79q0 -29 -18.5 -46.5t-49.5 -17.5q-26 0 -41 19t-15 54q0 18 -0.5 26t-2.5 18.5t-6 15t-12.5 7.5t-20.5 3q-38 0 -61 -44.5t-23 -124.5q0 -102 37 -161t102 -59q58 0 107 56z" />
+<glyph unicode="&#xe8;" horiz-adv-x="444" d="M403 126l24 -14q-44 -70 -88.5 -98t-109.5 -28q-90 0 -147 67.5t-57 170.5q0 112 57.5 180.5t151.5 68.5q83 0 128 -50q53 -58 59 -178h-252q3 -42 8 -70.5t17 -57.5t35.5 -44t58.5 -15q32 0 58 15.5t57 52.5zM298 282v21q0 73 -9 92q-12 25 -23.5 36t-31.5 11 q-36 0 -53 -36.5t-17 -123.5h134zM360 528h-56l-142 88q-40 25 -40 52q0 19 13.5 32t33.5 13q29 0 54 -28z" />
+<glyph unicode="&#xe9;" horiz-adv-x="444" d="M124 528l137 157q25 28 53 28q22 0 35 -12t13 -32q0 -17 -8 -27.5t-32 -25.5l-142 -88h-56zM403 126l24 -14q-44 -70 -88.5 -98t-109.5 -28q-90 0 -147 67.5t-57 170.5q0 112 57.5 180.5t151.5 68.5q83 0 128 -50q53 -58 59 -178h-252q3 -42 8 -70.5t17 -57.5t35.5 -44 t58.5 -15q32 0 58 15.5t57 52.5zM298 282v21q0 73 -9 92q-12 25 -23.5 36t-31.5 11q-36 0 -53 -36.5t-17 -123.5h134z" />
+<glyph unicode="&#xea;" horiz-adv-x="444" d="M409 528h-57l-112 98l-112 -98h-56l122 176h92zM403 126l24 -14q-44 -70 -88.5 -98t-109.5 -28q-90 0 -147 67.5t-57 170.5q0 112 57.5 180.5t151.5 68.5q83 0 128 -50q53 -58 59 -178h-252q3 -42 8 -70.5t17 -57.5t35.5 -44t58.5 -15q32 0 58 15.5t57 52.5zM298 282v21 q0 73 -9 92q-12 25 -23.5 36t-31.5 11q-36 0 -53 -36.5t-17 -123.5h134z" />
+<glyph unicode="&#xeb;" horiz-adv-x="444" d="M411 600q0 -26 -19 -44.5t-47 -18.5q-26 0 -44.5 19t-18.5 46q0 26 19 45t45 19t45.5 -19.5t19.5 -46.5zM201 600q0 -26 -18.5 -44.5t-46.5 -18.5q-26 0 -45 19t-19 46q0 26 19.5 45t45.5 19t45 -19.5t19 -46.5zM403 126l24 -14q-44 -70 -88.5 -98t-109.5 -28 q-90 0 -147 67.5t-57 170.5q0 112 57.5 180.5t151.5 68.5q83 0 128 -50q53 -58 59 -178h-252q3 -42 8 -70.5t17 -57.5t35.5 -44t58.5 -15q32 0 58 15.5t57 52.5zM298 282v21q0 73 -9 92q-12 25 -23.5 36t-31.5 11q-36 0 -53 -36.5t-17 -123.5h134z" />
+<glyph unicode="&#xec;" horiz-adv-x="278" d="M257 528h-56l-142 88q-40 25 -40 52q0 19 13.5 32t33.5 13q29 0 54 -28zM256 0h-240v24q34 7 43.5 19t9.5 45v286q0 33 -10.5 44.5t-44.5 18.5v24h194v-376q0 -30 10.5 -43.5t37.5 -17.5v-24z" />
+<glyph unicode="&#xed;" horiz-adv-x="278" d="M256 0h-240v24q35 8 44 19t9 45v285q0 33 -10.5 45t-43.5 19v24h193v-376q0 -32 10.5 -44.5t37.5 -16.5v-24zM20 528l137 157q25 28 53 28q22 0 35 -12t13 -32q0 -17 -8 -27.5t-32 -25.5l-142 -88h-56z" />
+<glyph unicode="&#xee;" horiz-adv-x="278" d="M308 528h-57l-112 98l-112 -98h-56l122 176h92zM212 0h-240v24q35 8 44 19t9 45v285q0 33 -10.5 45t-43.5 19v24h193v-376q0 -32 10.5 -44.5t37.5 -16.5v-24z" />
+<glyph unicode="&#xef;" horiz-adv-x="278" d="M212 0h-240v24q35 8 44 19t9 45v285q0 33 -10.5 45t-43.5 19v24h193v-376q0 -32 10.5 -44.5t37.5 -16.5v-24zM310 600q0 -26 -19 -44.5t-47 -18.5q-26 0 -44.5 19t-18.5 46q0 26 19 45t45 19t45.5 -19.5t19.5 -46.5zM100 600q0 -26 -18.5 -44.5t-46.5 -18.5q-26 0 -45 19 t-19 46q0 26 19.5 45t45.5 19t45 -19.5t19 -46.5z" />
+<glyph unicode="&#xf0;" horiz-adv-x="500" d="M427 661l-92 -47q46 -38 69 -67.5t41 -75.5q31 -77 31 -173q0 -148 -57.5 -230t-167.5 -82q-99 0 -162.5 66.5t-63.5 176.5q0 108 63.5 176t160.5 68q31 0 51 -9t40 -32l2 3q-26 79 -86 139l-110 -56l-48 31l117 59q-63 45 -133 58l46 25q88 -9 160 -46l90 46zM329 230 q0 119 -17.5 165.5t-61.5 46.5q-34 0 -53 -34q-25 -43 -25 -187q0 -44 2.5 -75.5t10 -63.5t24.5 -48.5t43 -16.5q44 0 60.5 46t16.5 167z" />
+<glyph unicode="&#xf1;" horiz-adv-x="556" d="M421 674h43q-34 -127 -116 -127q-32 0 -65 14l-29 13q-48 22 -64 22q-19 0 -32.5 -13t-16.5 -34h-42q14 65 42 95t74 30q31 0 73 -19l40 -18q27 -12 39 -12q20 0 32 11t22 38zM539 0h-234v24q25 3 35.5 16.5t10.5 43.5v237q0 85 -51 85q-36 0 -70 -34q-17 -17 -17 -24 v-264q0 -29 10.5 -42.5t37.5 -17.5v-24h-240v24q33 7 43 19t10 44v289q0 32 -10 44t-43 17v24h191v-75h1q49 87 142 87q62 0 98.5 -38.5t36.5 -103.5v-247q0 -34 10 -46t39 -14v-24z" />
+<glyph unicode="&#xf2;" horiz-adv-x="500" d="M476 229q0 -105 -64.5 -174t-161.5 -69q-95 0 -160 68.5t-65 173.5q0 109 64.5 177t164.5 68q95 0 158.5 -69t63.5 -175zM329 218q0 128 -17 176t-61 48q-46 0 -62.5 -47.5t-16.5 -176.5q0 -109 18 -155t61 -46t60.5 44.5t17.5 156.5zM370 528h-56l-142 88q-40 25 -40 52 q0 19 13.5 32t33.5 13q29 0 54 -28z" />
+<glyph unicode="&#xf3;" horiz-adv-x="500" d="M132 528l137 157q25 28 53 28q22 0 35 -12t13 -32q0 -17 -8 -27.5t-32 -25.5l-142 -88h-56zM476 229q0 -105 -64.5 -174t-161.5 -69q-95 0 -160 68.5t-65 173.5q0 109 64.5 177t164.5 68q95 0 158.5 -69t63.5 -175zM329 218q0 128 -17 176t-61 48q-46 0 -62.5 -47.5 t-16.5 -176.5q0 -109 18 -155t61 -46t60.5 44.5t17.5 156.5z" />
+<glyph unicode="&#xf4;" horiz-adv-x="500" d="M421 528h-57l-112 98l-112 -98h-56l122 176h92zM476 229q0 -105 -64.5 -174t-161.5 -69q-95 0 -160 68.5t-65 173.5q0 109 64.5 177t164.5 68q95 0 158.5 -69t63.5 -175zM329 218q0 128 -17 176t-61 48q-46 0 -62.5 -47.5t-16.5 -176.5q0 -109 18 -155t61 -46t60.5 44.5 t17.5 156.5z" />
+<glyph unicode="&#xf5;" horiz-adv-x="500" d="M391 674h43q-34 -127 -116 -127q-32 0 -65 14l-29 13q-48 22 -64 22q-19 0 -32.5 -13t-16.5 -34h-42q14 65 42 95t74 30q31 0 73 -19l40 -18q27 -12 39 -12q20 0 32 11t22 38zM476 229q0 -105 -64.5 -174t-161.5 -69q-95 0 -160 68.5t-65 173.5q0 109 64.5 177t164.5 68 q95 0 158.5 -69t63.5 -175zM329 218q0 128 -17 176t-61 48q-46 0 -62.5 -47.5t-16.5 -176.5q0 -109 18 -155t61 -46t60.5 44.5t17.5 156.5z" />
+<glyph unicode="&#xf6;" horiz-adv-x="500" d="M421 600q0 -26 -19 -44.5t-47 -18.5q-26 0 -44.5 19t-18.5 46q0 26 19 45t45 19t45.5 -19.5t19.5 -46.5zM211 600q0 -26 -18.5 -44.5t-46.5 -18.5q-26 0 -45 19t-19 46q0 26 19.5 45t45.5 19t45 -19.5t19 -46.5zM476 229q0 -105 -64.5 -174t-161.5 -69q-95 0 -160 68.5 t-65 173.5q0 109 64.5 177t164.5 68q95 0 158.5 -69t63.5 -175zM329 218q0 128 -17 176t-61 48q-46 0 -62.5 -47.5t-16.5 -176.5q0 -109 18 -155t61 -46t60.5 44.5t17.5 156.5z" />
+<glyph unicode="&#xf7;" horiz-adv-x="570" d="M362 461q0 -31 -23 -54t-53 -23q-31 0 -54 22.5t-23 53.5q0 32 22.5 54.5t54.5 22.5q30 0 53 -23t23 -53zM537 209h-504v88h504v-88zM362 47q0 -31 -23.5 -54.5t-53.5 -23.5t-53 23t-23 54t22.5 53.5t54.5 22.5q30 0 53 -23t23 -52z" />
+<glyph unicode="&#xf8;" horiz-adv-x="500" d="M461 549l-73 -123q88 -79 88 -197q0 -105 -64 -174t-161 -69q-56 0 -107 27l-63 -105h-47l76 128q-85 79 -85 193q0 105 64.5 174.5t162.5 69.5q53 0 103 -25l60 101h46zM173 140l143 242q-10 33 -24.5 46.5t-39.5 13.5q-47 0 -63.5 -48.5t-16.5 -184.5q0 -49 1 -69z M327 324l-144 -244q18 -63 68 -63q43 0 60.5 44.5t17.5 155.5q0 60 -2 107z" />
+<glyph unicode="&#xf9;" horiz-adv-x="556" d="M538 20l-63 -7q-83 -9 -132 -26v65q-39 -37 -71.5 -51.5t-73.5 -14.5q-63 0 -98 38t-35 107v241q0 35 -9 47t-40 18v24h188v-334q0 -76 56 -76q39 0 82 47v276q0 34 -12 47t-49 16v24h200v-356q0 -33 12 -47t45 -15v-23zM393 528h-56l-142 88q-40 25 -40 52q0 19 13.5 32 t33.5 13q29 0 54 -28z" />
+<glyph unicode="&#xfa;" horiz-adv-x="556" d="M156 528l137 157q25 28 53 28q22 0 35 -12t13 -32q0 -17 -8 -27.5t-32 -25.5l-142 -88h-56zM538 20l-63 -7q-83 -9 -132 -26v65q-39 -37 -71.5 -51.5t-73.5 -14.5q-63 0 -98 38t-35 107v241q0 35 -9 47t-40 18v24h188v-334q0 -76 56 -76q39 0 82 47v276q0 34 -12 47 t-49 16v24h200v-356q0 -33 12 -47t45 -15v-23z" />
+<glyph unicode="&#xfb;" horiz-adv-x="556" d="M443 528h-57l-112 98l-112 -98h-56l122 176h92zM538 20l-63 -7q-83 -9 -132 -26v65q-39 -37 -71.5 -51.5t-73.5 -14.5q-63 0 -98 38t-35 107v241q0 35 -9 47t-40 18v24h188v-334q0 -76 56 -76q39 0 82 47v276q0 34 -12 47t-49 16v24h200v-356q0 -33 12 -47t45 -15v-23z " />
+<glyph unicode="&#xfc;" horiz-adv-x="556" d="M443 600q0 -26 -19 -44.5t-47 -18.5q-26 0 -44.5 19t-18.5 46q0 26 19 45t45 19t45.5 -19.5t19.5 -46.5zM233 600q0 -26 -18.5 -44.5t-46.5 -18.5q-26 0 -45 19t-19 46q0 26 19.5 45t45.5 19t45 -19.5t19 -46.5zM538 20l-63 -7q-83 -9 -132 -26v65q-39 -37 -71.5 -51.5 t-73.5 -14.5q-63 0 -98 38t-35 107v241q0 35 -9 47t-40 18v24h188v-334q0 -76 56 -76q39 0 82 47v276q0 34 -12 47t-49 16v24h200v-356q0 -33 12 -47t45 -15v-23z" />
+<glyph unicode="&#xfd;" horiz-adv-x="500" d="M129 528l137 157q25 28 53 28q22 0 35 -12t13 -32q0 -17 -8 -27.5t-32 -25.5l-142 -88h-56zM482 461v-24q-24 -3 -36 -13.5t-24 -41.5l-148 -398q-45 -121 -77 -156q-31 -33 -84 -33q-43 0 -70 22t-27 57q0 29 17 48t45 19q25 0 42.5 -15t17.5 -37q0 -4 -2 -14l-1 -6 q0 -7 5 -12t12 -5q38 0 66 82l18 53l-119 290q-49 121 -67 146q-8 10 -34 14v24h249v-24l-16 -1q-36 -3 -36 -25q0 -7 20 -58l72 -186l68 188q11 32 11 49q0 18 -11 25t-43 8v24h152z" />
+<glyph unicode="&#xfe;" horiz-adv-x="556" d="M214 676v-285q22 44 50.5 63t73.5 19q83 0 134.5 -64.5t51.5 -169.5q0 -111 -53.5 -181.5t-138.5 -70.5q-34 0 -58 12.5t-60 47.5v-141q0 -50 16 -69t62 -21v-21h-273v24q36 6 46 16.5t10 41.5v717q0 30 -10 40.5t-45 17.5v24h194zM214 346v-243q28 -61 79 -61 q83 0 83 187t-76 187q-37 0 -68 -37q-18 -21 -18 -33z" />
+<glyph unicode="&#xff;" horiz-adv-x="500" d="M416 600q0 -26 -19 -44.5t-47 -18.5q-26 0 -44.5 19t-18.5 46q0 26 19 45t45 19t45.5 -19.5t19.5 -46.5zM206 600q0 -26 -18.5 -44.5t-46.5 -18.5q-26 0 -45 19t-19 46q0 26 19.5 45t45.5 19t45 -19.5t19 -46.5zM482 461v-24q-24 -3 -36 -13.5t-24 -41.5l-148 -398 q-45 -121 -77 -156q-31 -33 -84 -33q-43 0 -70 22t-27 57q0 29 17 48t45 19q25 0 42.5 -15t17.5 -37q0 -4 -2 -14l-1 -6q0 -7 5 -12t12 -5q38 0 66 82l18 53l-119 290q-49 121 -67 146q-8 10 -34 14v24h249v-24l-16 -1q-36 -3 -36 -25q0 -7 20 -58l72 -186l68 188 q11 32 11 49q0 18 -11 25t-43 8v24h152z" />
+<glyph unicode="&#x100;" horiz-adv-x="722" d="M515 738h-330v72h330v-72zM689 0h-322v25l32 3q25 2 35.5 9.5t10.5 23.5q0 29 -46 136h-225l-13 -34q-31 -80 -31 -97q0 -19 18.5 -28.5t62.5 -12.5v-25h-202v25q35 6 53 28t46 92l221 545h28l222 -522q38 -90 58.5 -116.5t51.5 -26.5v-25zM384 236l-101 243l-94 -243 h195z" />
+<glyph unicode="&#x101;" horiz-adv-x="500" d="M415 528h-330v72h330v-72zM473 64l15 -21q-53 -57 -112 -57q-37 0 -55.5 15.5t-26.5 53.5q-76 -69 -159 -69q-50 0 -80 26.5t-30 79.5q0 67 67 112q50 33 201 76v68q0 49 -18.5 71t-62.5 22q-28 0 -46.5 -10t-18.5 -27q0 -11 11 -23q19 -23 19 -42q0 -26 -19 -43t-49 -17 q-31 0 -48 18t-17 50q0 59 52.5 92.5t138.5 33.5q92 0 144 -35t52 -99v-261q0 -28 21 -28q7 0 11 4zM293 97v148q-122 -34 -122 -121q0 -32 14.5 -49.5t37.5 -17.5q42 0 70 40z" />
+<glyph unicode="&#x102;" horiz-adv-x="722" d="M455 901h44q-6 -75 -43.5 -119t-108.5 -44q-73 0 -111.5 44.5t-39.5 118.5h44q17 -87 102 -87q47 0 73.5 20t39.5 67zM689 0h-322v25l32 3q25 2 35.5 9.5t10.5 23.5q0 29 -46 136h-225l-13 -34q-31 -80 -31 -97q0 -19 18.5 -28.5t62.5 -12.5v-25h-202v25q35 6 53 28 t46 92l221 545h28l222 -522q38 -90 58.5 -116.5t51.5 -26.5v-25zM384 236l-101 243l-94 -243h195z" />
+<glyph unicode="&#x103;" horiz-adv-x="500" d="M351 691h44q-6 -75 -43.5 -119t-108.5 -44q-73 0 -111.5 44.5t-39.5 118.5h44q17 -87 102 -87q47 0 73.5 20t39.5 67zM473 64l15 -21q-53 -57 -112 -57q-37 0 -55.5 15.5t-26.5 53.5q-76 -69 -159 -69q-50 0 -80 26.5t-30 79.5q0 67 67 112q50 33 201 76v68 q0 49 -18.5 71t-62.5 22q-28 0 -46.5 -10t-18.5 -27q0 -11 11 -23q19 -23 19 -42q0 -26 -19 -43t-49 -17q-31 0 -48 18t-17 50q0 59 52.5 92.5t138.5 33.5q92 0 144 -35t52 -99v-261q0 -28 21 -28q7 0 11 4zM293 97v148q-122 -34 -122 -121q0 -32 14.5 -49.5t37.5 -17.5 q42 0 70 40z" />
+<glyph unicode="&#x104;" horiz-adv-x="722" d="M560 0h-193v25l32 3q25 2 35.5 9.5t10.5 23.5q0 29 -46 136h-225l-13 -34q-31 -80 -31 -97q0 -19 18.5 -28.5t62.5 -12.5v-25h-202v25q35 6 53 28t46 92l221 545h28l222 -522q38 -90 58.5 -116.5t51.5 -26.5v-25h-99q-1 -2 -3 -8q-11 -39 -11 -64q0 -35 14 -49.5 t47 -14.5q22 0 48 13q4 2 13 8l23 -16q-18 -34 -54 -54t-72 -20q-47 0 -75 21.5t-28 56.5q0 28 11.5 51.5t42.5 59.5q4 6 8 10zM384 236l-101 243l-94 -243h195z" />
+<glyph unicode="&#x105;" horiz-adv-x="500" d="M546 -115l23 -16q-18 -34 -54 -54t-72 -20q-47 0 -75 21.5t-28 56.5q0 28 11.5 51.5t42.5 59.5l3 3q-7 -1 -21 -1q-37 0 -55.5 15.5t-26.5 53.5q-76 -69 -159 -69q-50 0 -80 26.5t-30 79.5q0 67 67 112q50 33 201 76v68q0 49 -18.5 71t-62.5 22q-28 0 -46.5 -10 t-18.5 -27q0 -11 11 -23q19 -23 19 -42q0 -26 -19 -43t-49 -17q-31 0 -48 18t-17 50q0 59 52.5 92.5t138.5 33.5q92 0 144 -35t52 -99v-261q0 -28 21 -28q7 0 11 4l10 10l15 -21q-24 -27 -50 -42q-2 -3 -3 -9q-11 -39 -11 -64q0 -35 14 -49.5t47 -14.5q22 0 48 13q4 2 13 8z M293 97v148q-122 -34 -122 -121q0 -32 14.5 -49.5t37.5 -17.5q42 0 70 40z" />
+<glyph unicode="&#x106;" horiz-adv-x="722" d="M316 738l137 157q25 28 53 28q22 0 35 -12t13 -32q0 -17 -8 -27.5t-32 -25.5l-142 -88h-56zM657 152l30 -25q-67 -83 -132.5 -114.5t-155.5 -31.5q-159 0 -254.5 96.5t-95.5 245.5q0 160 97.5 264t249.5 104q71 0 156 -35q32 -14 46 -14t23.5 9.5t20.5 36.5h27v-235h-25 q-22 62 -67 115q-75 90 -167 90q-81 0 -132.5 -83.5t-51.5 -229.5q0 -155 54 -240q22 -34 62.5 -55t84.5 -21q64 0 126 34q41 23 104 89z" />
+<glyph unicode="&#x107;" horiz-adv-x="444" d="M162 528l137 157q25 28 53 28q22 0 35 -12t13 -32q0 -17 -8 -27.5t-32 -25.5l-142 -88h-56zM412 109l18 -18q-41 -56 -86 -80.5t-105 -24.5q-95 0 -154.5 65t-59.5 171q0 110 68 180.5t169 70.5q66 0 110 -31t44 -79q0 -29 -18.5 -46.5t-49.5 -17.5q-26 0 -41 19t-15 54 q0 18 -0.5 26t-2.5 18.5t-6 15t-12.5 7.5t-20.5 3q-38 0 -61 -44.5t-23 -124.5q0 -102 37 -161t102 -59q58 0 107 56z" />
+<glyph unicode="&#x108;" horiz-adv-x="722" d="M539 738h-57l-112 98l-112 -98h-56l122 176h92zM657 152l30 -25q-67 -83 -132.5 -114.5t-155.5 -31.5q-159 0 -254.5 96.5t-95.5 245.5q0 160 97.5 264t249.5 104q71 0 156 -35q32 -14 46 -14t23.5 9.5t20.5 36.5h27v-235h-25q-22 62 -67 115q-75 90 -167 90 q-81 0 -132.5 -83.5t-51.5 -229.5q0 -155 54 -240q22 -34 62.5 -55t84.5 -21q64 0 126 34q41 23 104 89z" />
+<glyph unicode="&#x109;" horiz-adv-x="444" d="M399 528h-57l-112 98l-112 -98h-56l122 176h92zM412 109l18 -18q-41 -56 -86 -80.5t-105 -24.5q-95 0 -154.5 65t-59.5 171q0 110 68 180.5t169 70.5q66 0 110 -31t44 -79q0 -29 -18.5 -46.5t-49.5 -17.5q-26 0 -41 19t-15 54q0 18 -0.5 26t-2.5 18.5t-6 15t-12.5 7.5 t-20.5 3q-38 0 -61 -44.5t-23 -124.5q0 -102 37 -161t102 -59q58 0 107 56z" />
+<glyph unicode="&#x10a;" horiz-adv-x="722" d="M435 810q0 -26 -19 -44.5t-47 -18.5q-26 0 -44.5 19t-18.5 46q0 26 19 45t45 19t45.5 -19.5t19.5 -46.5zM657 152l30 -25q-67 -83 -132.5 -114.5t-155.5 -31.5q-159 0 -254.5 96.5t-95.5 245.5q0 160 97.5 264t249.5 104q71 0 156 -35q32 -14 46 -14t23.5 9.5t20.5 36.5 h27v-235h-25q-22 62 -67 115q-75 90 -167 90q-81 0 -132.5 -83.5t-51.5 -229.5q0 -155 54 -240q22 -34 62.5 -55t84.5 -21q64 0 126 34q41 23 104 89z" />
+<glyph unicode="&#x10b;" horiz-adv-x="444" d="M305 600q0 -26 -19 -44.5t-47 -18.5q-26 0 -44.5 19t-18.5 46q0 26 19 45t45 19t45.5 -19.5t19.5 -46.5zM412 109l18 -18q-41 -56 -86 -80.5t-105 -24.5q-95 0 -154.5 65t-59.5 171q0 110 68 180.5t169 70.5q66 0 110 -31t44 -79q0 -29 -18.5 -46.5t-49.5 -17.5 q-26 0 -41 19t-15 54q0 18 -0.5 26t-2.5 18.5t-6 15t-12.5 7.5t-20.5 3q-38 0 -61 -44.5t-23 -124.5q0 -102 37 -161t102 -59q58 0 107 56z" />
+<glyph unicode="&#x10c;" horiz-adv-x="722" d="M564 914l-123 -176h-92l-122 176h57l111 -99l111 99h58zM657 152l30 -25q-67 -83 -132.5 -114.5t-155.5 -31.5q-159 0 -254.5 96.5t-95.5 245.5q0 160 97.5 264t249.5 104q71 0 156 -35q32 -14 46 -14t23.5 9.5t20.5 36.5h27v-235h-25q-22 62 -67 115q-75 90 -167 90 q-81 0 -132.5 -83.5t-51.5 -229.5q0 -155 54 -240q22 -34 62.5 -55t84.5 -21q64 0 126 34q41 23 104 89z" />
+<glyph unicode="&#x10d;" horiz-adv-x="444" d="M416 704l-123 -176h-92l-122 176h57l111 -99l111 99h58zM412 109l18 -18q-41 -56 -86 -80.5t-105 -24.5q-95 0 -154.5 65t-59.5 171q0 110 68 180.5t169 70.5q66 0 110 -31t44 -79q0 -29 -18.5 -46.5t-49.5 -17.5q-26 0 -41 19t-15 54q0 18 -0.5 26t-2.5 18.5t-6 15 t-12.5 7.5t-20.5 3q-38 0 -61 -44.5t-23 -124.5q0 -102 37 -161t102 -59q58 0 107 56z" />
+<glyph unicode="&#x10e;" horiz-adv-x="722" d="M484 914l-123 -176h-92l-122 176h57l111 -99l111 99h58zM14 676h312q171 0 267.5 -88t96.5 -243q0 -77 -30.5 -147t-84.5 -117q-93 -81 -252 -81h-309v25q43 1 63 19t20 54v486q0 34 -17.5 48t-65.5 19v25zM259 598v-498q0 -35 12.5 -50t45.5 -15q98 0 149 72 q23 33 36.5 94.5t13.5 128.5q0 139 -41 211q-58 101 -163 101q-53 0 -53 -44z" />
+<glyph unicode="&#x10f;" horiz-adv-x="680" d="M534 20l-62 -8q-82 -11 -133 -25v65q-35 -37 -64 -51.5t-69 -14.5q-79 0 -130 66t-51 169q0 109 54.5 180.5t137.5 71.5q34 0 60.5 -13.5t58.5 -48.5v183q0 35 -13 44.5t-63 13.5v24h215v-575q0 -32 12.5 -44t46.5 -14v-23zM336 112v243q-11 29 -32 45.5t-46 16.5 q-85 0 -85 -188q0 -187 78 -187q36 0 66 37q19 25 19 33zM544 374l-11 22q109 76 109 133q0 21 -19 21q-3 0 -11 -1t-13 -1q-32 0 -52.5 21t-20.5 55q0 39 23 62t61 23q47 0 73.5 -31t26.5 -85q0 -132 -166 -219z" />
+<glyph unicode="&#x110;" horiz-adv-x="722" d="M14 676h305q174 0 272.5 -88t98.5 -243q0 -149 -90 -241q-47 -49 -118.5 -76.5t-151.5 -27.5h-316v25q43 1 63 17t20 49v235h-91v47h91v211q0 34 -17.5 48t-65.5 19v25zM259 326v-233q0 -34 12 -46t46 -12q98 0 149 72q50 73 50 223q0 132 -42 212q-54 100 -155 100 q-36 0 -48 -9.5t-12 -37.5v-222h114v-47h-114z" />
+<glyph unicode="&#x111;" horiz-adv-x="556" d="M534 20l-62 -8q-82 -11 -133 -25v65q-35 -37 -64 -51.5t-69 -14.5q-79 0 -130 66t-51 169q0 109 54.5 180.5t137.5 71.5q34 0 60.5 -13.5t58.5 -48.5v106h-178v50h178v27q0 35 -13 44.5t-63 13.5v24h215v-109h53v-50h-53v-416q0 -32 12.5 -44t46.5 -14v-23zM336 112v243 q-11 29 -32 45.5t-46 16.5q-85 0 -85 -188q0 -186 78 -186q37 0 66 36q19 25 19 33z" />
+<glyph unicode="&#x112;" horiz-adv-x="667" d="M490 738h-330v72h330v-72zM641 208l-40 -208h-585v25q54 6 71 21t17 55v479q0 38 -18 53t-70 18v25h577v-201h-25q-17 100 -65.5 133.5t-171.5 33.5q-38 0 -51.5 -12t-13.5 -42v-225q81 1 117 32.5t45 116.5h26v-338h-26q-7 88 -43 121.5t-119 33.5v-242q0 -32 17.5 -44 t65.5 -12q117 0 182 54q25 20 42 46t40 77h28z" />
+<glyph unicode="&#x113;" horiz-adv-x="444" d="M395 528h-330v72h330v-72zM403 126l24 -14q-44 -70 -88.5 -98t-109.5 -28q-90 0 -147 67.5t-57 170.5q0 112 57.5 180.5t151.5 68.5q83 0 128 -50q53 -58 59 -178h-252q3 -42 8 -70.5t17 -57.5t35.5 -44t58.5 -15q32 0 58 15.5t57 52.5zM298 282v21q0 73 -9 92 q-12 25 -23.5 36t-31.5 11q-36 0 -53 -36.5t-17 -123.5h134z" />
+<glyph unicode="&#x114;" horiz-adv-x="667" d="M433 901h44q-6 -75 -43.5 -119t-108.5 -44q-73 0 -111.5 44.5t-39.5 118.5h44q17 -87 102 -87q47 0 73.5 20t39.5 67zM641 208l-40 -208h-585v25q54 6 71 21t17 55v479q0 38 -18 53t-70 18v25h577v-201h-25q-17 100 -65.5 133.5t-171.5 33.5q-38 0 -51.5 -12t-13.5 -42 v-225q81 1 117 32.5t45 116.5h26v-338h-26q-7 88 -43 121.5t-119 33.5v-242q0 -32 17.5 -44t65.5 -12q117 0 182 54q25 20 42 46t40 77h28z" />
+<glyph unicode="&#x115;" horiz-adv-x="444" d="M338 691h44q-6 -75 -43.5 -119t-108.5 -44q-73 0 -111.5 44.5t-39.5 118.5h44q17 -87 102 -87q47 0 73.5 20t39.5 67zM403 126l24 -14q-44 -70 -88.5 -98t-109.5 -28q-90 0 -147 67.5t-57 170.5q0 112 57.5 180.5t151.5 68.5q83 0 128 -50q53 -58 59 -178h-252 q3 -42 8 -70.5t17 -57.5t35.5 -44t58.5 -15q32 0 58 15.5t57 52.5zM298 282v21q0 73 -9 92q-12 25 -23.5 36t-31.5 11q-36 0 -53 -36.5t-17 -123.5h134z" />
+<glyph unicode="&#x116;" horiz-adv-x="667" d="M395 810q0 -26 -19 -44.5t-47 -18.5q-26 0 -44.5 19t-18.5 46q0 26 19 45t45 19t45.5 -19.5t19.5 -46.5zM641 208l-40 -208h-585v25q54 6 71 21t17 55v479q0 38 -18 53t-70 18v25h577v-201h-25q-17 100 -65.5 133.5t-171.5 33.5q-38 0 -51.5 -12t-13.5 -42v-225 q81 1 117 32.5t45 116.5h26v-338h-26q-7 88 -43 121.5t-119 33.5v-242q0 -32 17.5 -44t65.5 -12q117 0 182 54q25 20 42 46t40 77h28z" />
+<glyph unicode="&#x117;" horiz-adv-x="444" d="M295 600q0 -26 -19 -44.5t-47 -18.5q-26 0 -44.5 19t-18.5 46q0 26 19 45t45 19t45.5 -19.5t19.5 -46.5zM403 126l24 -14q-44 -70 -88.5 -98t-109.5 -28q-90 0 -147 67.5t-57 170.5q0 112 57.5 180.5t151.5 68.5q83 0 128 -50q53 -58 59 -178h-252q3 -42 8 -70.5 t17 -57.5t35.5 -44t58.5 -15q32 0 58 15.5t57 52.5zM298 282v21q0 73 -9 92q-12 25 -23.5 36t-31.5 11q-36 0 -53 -36.5t-17 -123.5h134z" />
+<glyph unicode="&#x118;" horiz-adv-x="667" d="M407 0h-391v25q54 6 71 21t17 55v479q0 38 -18 53t-70 18v25h577v-201h-25q-17 100 -65.5 133.5t-171.5 33.5q-38 0 -51.5 -12t-13.5 -42v-225q81 1 117 32.5t45 116.5h26v-338h-26q-7 88 -43 121.5t-119 33.5v-242q0 -32 17.5 -44t65.5 -12q117 0 182 54q25 20 42 46 t40 77h28l-40 -208h-164q-1 -2 -3 -8q-11 -39 -11 -64q0 -35 14 -49.5t47 -14.5q22 0 48 13q4 2 13 8l23 -16q-18 -34 -54 -54t-72 -20q-47 0 -75 21.5t-28 56.5q0 28 11.5 51.5t42.5 59.5q5 6 9 10t5 6z" />
+<glyph unicode="&#x119;" horiz-adv-x="444" d="M412 -115l23 -16q-18 -34 -54 -54t-72 -20q-47 0 -75 21.5t-28 56.5q0 28 11.5 51.5t42.5 59.5l1 2q1 2 2 2q-22 -2 -34 -2q-90 0 -147 67.5t-57 170.5q0 112 57.5 180.5t151.5 68.5q83 0 128 -50q53 -58 59 -178h-252q3 -42 8 -70.5t17 -57.5t35.5 -44t58.5 -15 q32 0 58 15.5t57 52.5l24 -14q-59 -92 -124 -115q-1 -1 -1 -2.5t-1 -2.5q-11 -39 -11 -64q0 -35 14 -49.5t47 -14.5q22 0 48 13q4 2 13 8zM298 282v21q0 73 -9 92q-12 25 -23.5 36t-31.5 11q-36 0 -53 -36.5t-17 -123.5h134z" />
+<glyph unicode="&#x11a;" horiz-adv-x="667" d="M509 914l-123 -176h-92l-122 176h57l111 -99l111 99h58zM641 208l-40 -208h-585v25q54 6 71 21t17 55v479q0 38 -18 53t-70 18v25h577v-201h-25q-17 100 -65.5 133.5t-171.5 33.5q-38 0 -51.5 -12t-13.5 -42v-225q81 1 117 32.5t45 116.5h26v-338h-26q-7 88 -43 121.5 t-119 33.5v-242q0 -32 17.5 -44t65.5 -12q117 0 182 54q25 20 42 46t40 77h28z" />
+<glyph unicode="&#x11b;" horiz-adv-x="444" d="M402 704l-123 -176h-92l-122 176h57l111 -99l111 99h58zM403 126l24 -14q-44 -70 -88.5 -98t-109.5 -28q-90 0 -147 67.5t-57 170.5q0 112 57.5 180.5t151.5 68.5q83 0 128 -50q53 -58 59 -178h-252q3 -42 8 -70.5t17 -57.5t35.5 -44t58.5 -15q32 0 58 15.5t57 52.5z M298 282v21q0 73 -9 92q-12 25 -23.5 36t-31.5 11q-36 0 -53 -36.5t-17 -123.5h134z" />
+<glyph unicode="&#x11c;" horiz-adv-x="778" d="M569 738h-57l-112 98l-112 -98h-56l122 176h92zM755 287v-25q-53 -6 -69.5 -27.5t-16.5 -72.5v-118q-49 -29 -124 -46t-153 -17q-154 0 -254.5 96t-100.5 254q0 151 99.5 255.5t248.5 104.5q70 0 155 -35q32 -14 46 -14t23.5 9.5t20.5 36.5h27v-235h-25 q-29 63 -47.5 92.5t-48.5 56.5q-63 56 -138 56q-88 0 -136 -83t-48 -237q0 -157 48 -237q27 -45 63 -66t92 -21q96 0 96 85v89q0 40 -19.5 55t-82.5 19v25h344z" />
+<glyph unicode="&#x11d;" horiz-adv-x="500" d="M419 528h-57l-112 98l-112 -98h-56l122 176h92zM254 68h52q81 0 129 -32.5t48 -87.5q0 -71 -68.5 -112.5t-192.5 -41.5q-194 0 -194 92q0 61 96 75q-47 17 -64.5 35t-17.5 47q0 44 29 71.5t90 45.5q-55 15 -89.5 56t-34.5 96q0 73 56.5 117t146.5 44q52 0 112 -22h129 v-53h-80q40 -36 40 -98q0 -94 -92 -132q-24 -10 -41 -12t-86 -2q-30 0 -49.5 -13.5t-19.5 -35.5q0 -21 21 -29t80 -8zM306 312q0 70 -15.5 100t-51.5 30t-50.5 -29t-14.5 -102q0 -70 15 -99.5t51 -29.5t51 29.5t15 100.5zM315 -52h-164q-21 -17 -28 -28t-7 -27 q0 -67 134 -67q72 0 113 18.5t41 47.5q0 56 -89 56z" />
+<glyph unicode="&#x11e;" horiz-adv-x="778" d="M501 901h44q-6 -75 -43.5 -119t-108.5 -44q-73 0 -111.5 44.5t-39.5 118.5h44q17 -87 102 -87q47 0 73.5 20t39.5 67zM755 287v-25q-53 -6 -69.5 -27.5t-16.5 -72.5v-118q-49 -29 -124 -46t-153 -17q-154 0 -254.5 96t-100.5 254q0 151 99.5 255.5t248.5 104.5 q70 0 155 -35q32 -14 46 -14t23.5 9.5t20.5 36.5h27v-235h-25q-29 63 -47.5 92.5t-48.5 56.5q-63 56 -138 56q-88 0 -136 -83t-48 -237q0 -157 48 -237q27 -45 63 -66t92 -21q96 0 96 85v89q0 40 -19.5 55t-82.5 19v25h344z" />
+<glyph unicode="&#x11f;" horiz-adv-x="500" d="M354 691h44q-6 -75 -43.5 -119t-108.5 -44q-73 0 -111.5 44.5t-39.5 118.5h44q17 -87 102 -87q47 0 73.5 20t39.5 67zM254 68h52q81 0 129 -32.5t48 -87.5q0 -71 -68.5 -112.5t-192.5 -41.5q-194 0 -194 92q0 61 96 75q-47 17 -64.5 35t-17.5 47q0 44 29 71.5t90 45.5 q-55 15 -89.5 56t-34.5 96q0 73 56.5 117t146.5 44q52 0 112 -22h129v-53h-80q40 -36 40 -98q0 -94 -92 -132q-24 -10 -41 -12t-86 -2q-30 0 -49.5 -13.5t-19.5 -35.5q0 -21 21 -29t80 -8zM306 312q0 70 -15.5 100t-51.5 30t-50.5 -29t-14.5 -102q0 -70 15 -99.5t51 -29.5 t51 29.5t15 100.5zM315 -52h-164q-21 -17 -28 -28t-7 -27q0 -67 134 -67q72 0 113 18.5t41 47.5q0 56 -89 56z" />
+<glyph unicode="&#x120;" horiz-adv-x="778" d="M465 810q0 -26 -19 -44.5t-47 -18.5q-26 0 -44.5 19t-18.5 46q0 26 19 45t45 19t45.5 -19.5t19.5 -46.5zM755 287v-25q-53 -6 -69.5 -27.5t-16.5 -72.5v-118q-49 -29 -124 -46t-153 -17q-154 0 -254.5 96t-100.5 254q0 151 99.5 255.5t248.5 104.5q70 0 155 -35 q32 -14 46 -14t23.5 9.5t20.5 36.5h27v-235h-25q-29 63 -47.5 92.5t-48.5 56.5q-63 56 -138 56q-88 0 -136 -83t-48 -237q0 -157 48 -237q27 -45 63 -66t92 -21q96 0 96 85v89q0 40 -19.5 55t-82.5 19v25h344z" />
+<glyph unicode="&#x121;" horiz-adv-x="500" d="M315 600q0 -26 -19 -44.5t-47 -18.5q-26 0 -44.5 19t-18.5 46q0 26 19 45t45 19t45.5 -19.5t19.5 -46.5zM254 68h52q81 0 129 -32.5t48 -87.5q0 -71 -68.5 -112.5t-192.5 -41.5q-194 0 -194 92q0 61 96 75q-47 17 -64.5 35t-17.5 47q0 44 29 71.5t90 45.5 q-55 15 -89.5 56t-34.5 96q0 73 56.5 117t146.5 44q52 0 112 -22h129v-53h-80q40 -36 40 -98q0 -94 -92 -132q-24 -10 -41 -12t-86 -2q-30 0 -49.5 -13.5t-19.5 -35.5q0 -21 21 -29t80 -8zM306 312q0 70 -15.5 100t-51.5 30t-50.5 -29t-14.5 -102q0 -70 15 -99.5t51 -29.5 t51 29.5t15 100.5zM315 -52h-164q-21 -17 -28 -28t-7 -27q0 -67 134 -67q72 0 113 18.5t41 47.5q0 56 -89 56z" />
+<glyph unicode="&#x122;" horiz-adv-x="778" d="M755 287v-25q-53 -6 -69.5 -27.5t-16.5 -72.5v-118q-49 -29 -124 -46t-153 -17q-154 0 -254.5 96t-100.5 254q0 151 99.5 255.5t248.5 104.5q70 0 155 -35q32 -14 46 -14t23.5 9.5t20.5 36.5h27v-235h-25q-29 63 -47.5 92.5t-48.5 56.5q-63 56 -138 56q-88 0 -136 -83 t-48 -237q0 -157 48 -237q27 -45 63 -66t92 -21q96 0 96 85v89q0 40 -19.5 55t-82.5 19v25h344zM317 -378l-11 22q109 76 109 133q0 21 -19 21q-3 0 -11 -1t-13 -1q-32 0 -52.5 21t-20.5 55q0 39 23 62t61 23q47 0 73.5 -31t26.5 -85q0 -132 -166 -219z" />
+<glyph unicode="&#x123;" horiz-adv-x="500" d="M312 863l11 -22q-109 -76 -109 -133q0 -21 19 -21q3 0 11 1t13 1q32 0 52.5 -21t20.5 -55q0 -39 -23 -62t-61 -23q-47 0 -73.5 31t-26.5 85q0 132 166 219zM254 68h52q81 0 129 -32.5t48 -87.5q0 -71 -68.5 -112.5t-192.5 -41.5q-194 0 -194 92q0 61 96 75 q-47 17 -64.5 35t-17.5 47q0 44 29 71.5t90 45.5q-55 15 -89.5 56t-34.5 96q0 73 56.5 117t146.5 44q52 0 112 -22h129v-53h-80q40 -36 40 -98q0 -94 -92 -132q-24 -10 -41 -12t-86 -2q-30 0 -49.5 -13.5t-19.5 -35.5q0 -21 21 -29t80 -8zM306 312q0 70 -15.5 100t-51.5 30 t-50.5 -29t-14.5 -102q0 -70 15 -99.5t51 -29.5t51 29.5t15 100.5zM315 -52h-164q-21 -17 -28 -28t-7 -27q0 -67 134 -67q72 0 113 18.5t41 47.5q0 56 -89 56z" />
+<glyph unicode="&#x124;" horiz-adv-x="778" d="M557 738h-57l-112 98l-112 -98h-56l122 176h92zM759 0h-339v25q54 6 71.5 20.5t17.5 52.5v228h-241v-228q0 -40 17 -53.5t72 -19.5v-25h-336v25q53 7 69 20.5t16 52.5v479q0 41 -17 55t-68 19v25h336v-25q-53 -4 -71 -18.5t-18 -55.5v-204h241v204q0 41 -18 55.5 t-71 18.5v25h339v-25q-51 -4 -69.5 -19t-18.5 -55v-479q0 -39 16.5 -52.5t71.5 -20.5v-25z" />
+<glyph unicode="&#x125;" horiz-adv-x="556" d="M419 738h-57l-112 98l-112 -98h-56l122 176h92zM534 0h-234v24q25 3 35.5 16.5t10.5 44.5v224q0 54 -11 75.5t-40 21.5q-36 0 -70 -34q-17 -17 -17 -24v-263q0 -31 10 -44t38 -17v-24h-240v24q36 7 44.5 16t8.5 49v502q0 35 -9 44.5t-45 16.5v24h193v-280q65 77 147 77 q60 0 95 -38t35 -98v-250q0 -34 11.5 -48.5t37.5 -14.5v-24z" />
+<glyph unicode="&#x126;" horiz-adv-x="778" d="M759 0h-339v25q54 6 71.5 20.5t17.5 52.5v228h-241v-228q0 -40 17 -53.5t72 -19.5v-25h-336v25q53 7 69 20.5t16 52.5v395h-85v47h85v37q0 41 -17 55t-68 19v25h336v-25q-53 -4 -71 -18.5t-18 -55.5v-37h241v37q0 41 -18 55.5t-71 18.5v25h339v-25q-51 -4 -69.5 -19 t-18.5 -55v-37h88v-47h-88v-395q0 -39 16.5 -52.5t71.5 -20.5v-25zM509 373v120h-241v-120h241z" />
+<glyph unicode="&#x127;" horiz-adv-x="556" d="M534 0h-234v24q25 3 35.5 16.5t10.5 44.5v224q0 54 -11 75.5t-40 21.5q-36 0 -70 -34q-17 -17 -17 -24v-263q0 -31 10 -44t38 -17v-24h-240v24q36 7 44.5 16t8.5 49v425h-54v44h54v33q0 35 -9 44.5t-45 16.5v24h193v-118h158v-44h-158v-118q65 77 147 77q60 0 95 -38 t35 -98v-250q0 -34 11.5 -48.5t37.5 -14.5v-24z" />
+<glyph unicode="&#x128;" horiz-adv-x="389" d="M336 884h43q-34 -127 -116 -127q-32 0 -65 14l-29 13q-48 22 -64 22q-19 0 -32.5 -13t-16.5 -34h-42q14 65 42 95t74 30q31 0 73 -19l40 -18q27 -12 39 -12q20 0 32 11t22 38zM370 0h-350v25q57 5 75 20t18 61v470q0 41 -19 56t-74 19v25h350v-25q-56 -2 -75.5 -17.5 t-19.5 -57.5v-470q0 -48 18.5 -62.5t76.5 -18.5v-25z" />
+<glyph unicode="&#x129;" horiz-adv-x="278" d="M275 674h43q-34 -127 -116 -127q-32 0 -65 14l-29 13q-48 22 -64 22q-19 0 -32.5 -13t-16.5 -34h-42q14 65 42 95t74 30q31 0 73 -19l40 -18q27 -12 39 -12q20 0 32 11t22 38zM256 0h-240v24q35 8 44 19t9 45v285q0 33 -10.5 45t-43.5 19v24h193v-376q0 -32 10.5 -44.5 t37.5 -16.5v-24z" />
+<glyph unicode="&#x12a;" horiz-adv-x="389" d="M359 738h-330v72h330v-72zM370 0h-350v25q57 5 75 20t18 61v470q0 41 -19 56t-74 19v25h350v-25q-56 -2 -75.5 -17.5t-19.5 -57.5v-470q0 -48 18.5 -62.5t76.5 -18.5v-25z" />
+<glyph unicode="&#x12b;" horiz-adv-x="278" d="M256 0h-240v24q35 8 44 19t9 45v285q0 33 -10.5 45t-43.5 19v24h193v-376q0 -32 10.5 -44.5t37.5 -16.5v-24zM305 528h-330v72h330v-72z" />
+<glyph unicode="&#x12c;" horiz-adv-x="389" d="M298 900h44q-6 -75 -43.5 -119t-108.5 -44q-73 0 -111.5 44.5t-39.5 118.5h44q17 -87 102 -87q47 0 73.5 20t39.5 67zM370 0h-350v25q57 5 75 20t18 61v470q0 41 -19 56t-74 19v25h350v-25q-56 -2 -75.5 -17.5t-19.5 -57.5v-470q0 -48 18.5 -62.5t76.5 -18.5v-25z" />
+<glyph unicode="&#x12d;" horiz-adv-x="278" d="M248 691h44q-6 -75 -43.5 -119t-108.5 -44q-73 0 -111.5 44.5t-39.5 118.5h44q17 -87 102 -87q47 0 73.5 20t39.5 67zM256 0h-240v24q35 8 44 19t9 45v285q0 33 -10.5 45t-43.5 19v24h193v-376q0 -32 10.5 -44.5t37.5 -16.5v-24z" />
+<glyph unicode="&#x12e;" horiz-adv-x="389" d="M228 0h-208v25q57 5 75 20t18 61v470q0 41 -19 56t-74 19v25h350v-25q-56 -2 -75.5 -17.5t-19.5 -57.5v-470q0 -48 18.5 -62.5t76.5 -18.5v-25h-112q-1 -2 -3 -8q-11 -39 -11 -64q0 -35 14 -49.5t47 -14.5q22 0 48 13q4 2 13 8l23 -16q-18 -34 -54 -54t-72 -20 q-47 0 -75 21.5t-28 56.5q0 28 11.5 51.5t42.5 59.5q4 6 8 10z" />
+<glyph unicode="&#x12f;" horiz-adv-x="278" d="M160 0h-144v24q35 8 44 19t9 45v285q0 33 -10.5 45t-43.5 19v24h193v-376q0 -32 10.5 -44.5t37.5 -16.5v-24h-66q-1 -2 -3 -8q-11 -39 -11 -64q0 -35 14 -49.5t47 -14.5q22 0 48 13q4 2 13 8l23 -16q-18 -34 -54 -54t-72 -20q-47 0 -75 21.5t-28 56.5q0 28 11.5 51.5 t42.5 59.5q4 6 8 10zM215 613q0 -33 -22.5 -55t-55.5 -22t-55 22t-22 55t22.5 55.5t56.5 22.5q31 0 53.5 -23t22.5 -55z" />
+<glyph unicode="&#x130;" horiz-adv-x="389" d="M259 810q0 -26 -19 -44.5t-47 -18.5q-26 0 -44.5 19t-18.5 46q0 26 19 45t45 19t45.5 -19.5t19.5 -46.5zM370 0h-350v25q57 5 75 20t18 61v470q0 41 -19 56t-74 19v25h350v-25q-56 -2 -75.5 -17.5t-19.5 -57.5v-470q0 -48 18.5 -62.5t76.5 -18.5v-25z" />
+<glyph unicode="&#x131;" horiz-adv-x="278" d="M256 0h-240v24q35 8 44 19t9 45v285q0 33 -10.5 45t-43.5 19v24h193v-376q0 -32 10.5 -44.5t37.5 -16.5v-24z" />
+<glyph unicode="&#x134;" horiz-adv-x="500" d="M479 738h-57l-112 98l-112 -98h-56l122 176h92zM478 676v-25q-55 -4 -71.5 -22t-16.5 -73v-430q0 -222 -212 -222q-74 0 -108 23q-29 20 -48 50t-19 60q0 28 21.5 51t49.5 23t50 -23t22 -53q0 -15 -13.5 -34t-13.5 -32q0 -32 45 -32q34 0 49 21.5t15 68.5v550 q0 43 -20 57.5t-81 16.5v25h351z" />
+<glyph unicode="&#x135;" horiz-adv-x="333" d="M335 528h-57l-112 98l-112 -98h-56l122 176h92zM260 461v-459q0 -84 -27 -129q-43 -76 -150 -76q-62 0 -101 28t-39 72q0 27 17 44t45 17q25 0 42 -15.5t17 -38.5q0 -16 -14 -37q-9 -15 -9 -22q0 -17 32 -17q25 0 36.5 18t11.5 58v474q0 32 -12.5 44t-50.5 15v24h202z " />
+<glyph unicode="&#x136;" horiz-adv-x="778" d="M769 0h-334v25q47 1 62 6t15 15q0 13 -25 45l-181 225l-27 -25v-196q0 -37 16.5 -50t70.5 -20v-25h-336v25q55 5 71 19t16 57v472q0 46 -17 60.5t-70 17.5v25h337v-25q-54 -4 -71 -20.5t-17 -63.5v-223l212 215q24 24 32 35t8 23q0 15 -10.5 22t-37.5 9l-35 3v25h289v-25 q-78 -9 -133 -46.5t-189 -180.5l305 -378q16 -20 49 -21v-25zM291 -378l-11 22q109 76 109 133q0 21 -19 21q-3 0 -11 -1t-13 -1q-32 0 -52.5 21t-20.5 55q0 39 23 62t61 23q47 0 73.5 -31t26.5 -85q0 -132 -166 -219z" />
+<glyph unicode="&#x137;" horiz-adv-x="556" d="M543 0h-234v24q42 2 42 19q0 12 -24 45l-95 134l-23 -24v-114q0 -35 8.5 -45t43.5 -15v-24h-239v24q48 4 48 60v510q0 54 -48 58v24h187v-431l128 128q21 21 21 38q0 18 -35 23l-24 4v23h214v-23q-47 -6 -80.5 -29t-108.5 -102l194 -268q11 -15 25 -15v-24zM202 -378 l-11 22q109 76 109 133q0 21 -19 21q-3 0 -11 -1t-13 -1q-32 0 -52.5 21t-20.5 55q0 39 23 62t61 23q47 0 73.5 -31t26.5 -85q0 -132 -166 -219z" />
+<glyph unicode="&#x138;" horiz-adv-x="600" d="M627 0h-168q-41 5 -89 76q-11 17 -26 46.5t-33 56.5q-25 39 -71 54q-5 -1 -27 -1v-145q0 -20 1 -28t5.5 -17.5t15 -13t29.5 -4.5v-24h-245v24q27 7 39 19t12 43v305q0 31 -12 42t-39 13v24h245v-24q-31 -5 -41 -14.5t-10 -41.5v-108q19 0 41 4q78 22 92 31q40 29 64 88 q15 37 36.5 51t62.5 14q32 0 56 -16t24 -40q0 -19 -14 -30.5t-35 -11.5q-19 0 -31 10t-19 20t-16 10q-12 0 -18 -6t-12 -22q-25 -73 -77 -112q22 -8 42 -34q12 -15 45.5 -70.5t41.5 -67.5q25 -37 52.5 -54t78.5 -22v-24z" />
+<glyph unicode="&#x139;" horiz-adv-x="667" d="M638 227l-42 -227h-577v25q55 7 70.5 20t15.5 53v478q0 42 -17.5 57t-68.5 18v25h348v-24q-65 -3 -82.5 -20t-17.5 -79v-464q0 -33 18.5 -45.5t66.5 -12.5q109 0 170 55q42 39 87 141h29zM158 738l137 157q25 28 53 28q22 0 35 -12t13 -32q0 -17 -8 -27.5t-32 -25.5 l-142 -88h-56z" />
+<glyph unicode="&#x13a;" horiz-adv-x="278" d="M22 738l137 157q25 28 53 28q22 0 35 -12t13 -32q0 -17 -8 -27.5t-32 -25.5l-142 -88h-56zM256 0h-240v24q51 4 51 63v500q0 61 -52 65v24h191v-589q0 -33 12 -47.5t38 -15.5v-24z" />
+<glyph unicode="&#x13b;" horiz-adv-x="667" d="M638 227l-42 -227h-577v25q55 7 70.5 20t15.5 53v478q0 42 -17.5 57t-68.5 18v25h348v-24q-65 -3 -82.5 -20t-17.5 -79v-464q0 -33 18.5 -45.5t66.5 -12.5q109 0 170 55q42 39 87 141h29zM256 -378l-11 22q109 76 109 133q0 21 -19 21q-3 0 -11 -1t-13 -1q-32 0 -52.5 21 t-20.5 55q0 39 23 62t61 23q47 0 73.5 -31t26.5 -85q0 -132 -166 -219z" />
+<glyph unicode="&#x13c;" horiz-adv-x="278" d="M256 0h-240v24q51 4 51 63v500q0 61 -52 65v24h191v-589q0 -33 12 -47.5t38 -15.5v-24zM66 -378l-11 22q109 76 109 133q0 21 -19 21q-3 0 -11 -1t-13 -1q-32 0 -52.5 21t-20.5 55q0 39 23 62t61 23q47 0 73.5 -31t26.5 -85q0 -132 -166 -219z" />
+<glyph unicode="&#x13d;" horiz-adv-x="667" d="M638 227l-42 -227h-577v25q55 7 70.5 20t15.5 53v478q0 42 -17.5 57t-68.5 18v25h348v-24q-65 -3 -82.5 -20t-17.5 -79v-464q0 -33 18.5 -45.5t66.5 -12.5q109 0 170 55q42 39 87 141h29zM447 356l-11 22q109 76 109 133q0 21 -19 21q-3 0 -11 -1t-13 -1q-32 0 -52.5 21 t-20.5 55q0 39 23 62t61 23q47 0 73.5 -31t26.5 -85q0 -132 -166 -219z" />
+<glyph unicode="&#x13e;" horiz-adv-x="457" d="M256 0h-240v24q51 4 51 63v500q0 61 -52 65v24h191v-589q0 -33 12 -47.5t38 -15.5v-24zM276 374l-11 22q109 76 109 133q0 21 -19 21q-3 0 -11 -1t-13 -1q-32 0 -52.5 21t-20.5 55q0 39 23 62t61 23q47 0 73.5 -31t26.5 -85q0 -132 -166 -219z" />
+<glyph unicode="&#x13f;" horiz-adv-x="667" d="M638 227l-42 -227h-577v25q55 7 70.5 20t15.5 53v478q0 42 -17.5 57t-68.5 18v25h348v-24q-65 -3 -82.5 -20t-17.5 -79v-464q0 -33 18.5 -45.5t66.5 -12.5q109 0 170 55q42 39 87 141h29zM535 323q0 -35 -24.5 -59.5t-60.5 -24.5t-60 24t-24 60q0 35 25 60t60 25 q34 0 59 -25t25 -60z" />
+<glyph unicode="&#x140;" horiz-adv-x="414" d="M441 340q0 -35 -24.5 -59.5t-60.5 -24.5t-60 24t-24 60q0 35 25 60t60 25q34 0 59 -25t25 -60zM256 0h-240v24q51 4 51 63v500q0 61 -52 65v24h191v-589q0 -33 12 -47.5t38 -15.5v-24z" />
+<glyph unicode="&#x141;" horiz-adv-x="667" d="M638 228l-42 -228h-577v25q55 4 70.5 18.5t15.5 56.5v187l-81 -49v61l81 49v225q0 45 -17.5 60t-69.5 18v25h349v-25q-61 -3 -80.5 -22t-19.5 -77v-109l123 76v-61l-123 -76v-292q0 -33 16 -46t63 -13q122 0 177 52q34 32 86 145h29z" />
+<glyph unicode="&#x142;" horiz-adv-x="278" d="M303 481l-97 -80v-312q0 -63 50 -65v-24h-240v24q51 4 51 65v223l-89 -72v50l89 72v229q0 57 -52 61v24h191v-225l97 80v-50z" />
+<glyph unicode="&#x143;" horiz-adv-x="722" d="M294 738l137 157q25 28 53 28q22 0 35 -12t13 -32q0 -17 -8 -27.5t-32 -25.5l-142 -88h-56zM701 676v-25q-50 -8 -64 -22.5t-14 -60.5v-586h-28l-447 545v-396q0 -58 18 -78.5t76 -27.5v-25h-226v25q55 7 71.5 22.5t16.5 61.5v470q-52 72 -85 72v25h211l349 -430v299 q0 60 -18 80.5t-74 25.5v25h214z" />
+<glyph unicode="&#x144;" horiz-adv-x="556" d="M212 528l137 157q25 28 53 28q22 0 35 -12t13 -32q0 -17 -8 -27.5t-32 -25.5l-142 -88h-56zM539 0h-234v24q25 3 35.5 16.5t10.5 43.5v237q0 85 -51 85q-36 0 -70 -34q-17 -17 -17 -24v-264q0 -29 10.5 -42.5t37.5 -17.5v-24h-240v24q33 7 43 19t10 44v289q0 32 -10 44 t-43 17v24h191v-75h1q49 87 142 87q62 0 98.5 -38.5t36.5 -103.5v-247q0 -34 10 -46t39 -14v-24z" />
+<glyph unicode="&#x145;" horiz-adv-x="722" d="M701 676v-25q-50 -8 -64 -22.5t-14 -60.5v-586h-28l-447 545v-396q0 -58 18 -78.5t76 -27.5v-25h-226v25q55 7 71.5 22.5t16.5 61.5v470q-52 72 -85 72v25h211l349 -430v299q0 60 -18 80.5t-74 25.5v25h214zM286 -378l-11 22q109 76 109 133q0 21 -19 21q-3 0 -11 -1 t-13 -1q-32 0 -52.5 21t-20.5 55q0 39 23 62t61 23q47 0 73.5 -31t26.5 -85q0 -132 -166 -219z" />
+<glyph unicode="&#x146;" horiz-adv-x="556" d="M539 0h-234v24q25 3 35.5 16.5t10.5 43.5v237q0 85 -51 85q-36 0 -70 -34q-17 -17 -17 -24v-264q0 -29 10.5 -42.5t37.5 -17.5v-24h-240v24q33 7 43 19t10 44v289q0 32 -10 44t-43 17v24h191v-75h1q49 87 142 87q62 0 98.5 -38.5t36.5 -103.5v-247q0 -34 10 -46t39 -14 v-24zM206 -378l-11 22q109 76 109 133q0 21 -19 21q-3 0 -11 -1t-13 -1q-32 0 -52.5 21t-20.5 55q0 39 23 62t61 23q47 0 73.5 -31t26.5 -85q0 -132 -166 -219z" />
+<glyph unicode="&#x147;" horiz-adv-x="722" d="M535 914l-123 -176h-92l-122 176h57l111 -99l111 99h58zM701 676v-25q-50 -8 -64 -22.5t-14 -60.5v-586h-28l-447 545v-396q0 -58 18 -78.5t76 -27.5v-25h-226v25q55 7 71.5 22.5t16.5 61.5v470q-52 72 -85 72v25h211l349 -430v299q0 60 -18 80.5t-74 25.5v25h214z" />
+<glyph unicode="&#x148;" horiz-adv-x="556" d="M450 704l-123 -176h-92l-122 176h57l111 -99l111 99h58zM539 0h-234v24q25 3 35.5 16.5t10.5 43.5v237q0 85 -51 85q-36 0 -70 -34q-17 -17 -17 -24v-264q0 -29 10.5 -42.5t37.5 -17.5v-24h-240v24q33 7 43 19t10 44v289q0 32 -10 44t-43 17v24h191v-75h1q49 87 142 87 q62 0 98.5 -38.5t36.5 -103.5v-247q0 -34 10 -46t39 -14v-24z" />
+<glyph unicode="&#x149;" horiz-adv-x="705" d="M693 0h-234v24q25 3 35.5 16.5t10.5 43.5v237q0 85 -51 85q-36 0 -70 -34q-17 -17 -17 -24v-264q0 -29 10.5 -42.5t37.5 -17.5v-24h-240v24q33 7 43 19t10 44v289q0 32 -10 44t-43 17v24h191v-75h1q49 87 142 87q62 0 98.5 -38.5t36.5 -103.5v-247q0 -34 10 -46t39 -14 v-24zM31 374l-11 22q109 76 109 133q0 21 -19 21q-3 0 -11 -1t-13 -1q-32 0 -52.5 21t-20.5 55q0 39 23 62t61 23q47 0 73.5 -31t26.5 -85q0 -132 -166 -219z" />
+<glyph unicode="&#x14a;" horiz-adv-x="732" d="M14 676h322q179 0 277.5 -96.5t98.5 -260.5q0 -107 -33.5 -201t-98 -154t-145.5 -60q-52 0 -93 37t-41 84q0 31 21.5 61.5t53.5 30.5q28 0 48 -22.5t20 -52.5q0 -23 -13.5 -39t-13.5 -27q0 -16 11 -27.5t31 -11.5q41 0 61.5 95t20.5 223q0 85 -16.5 165.5t-39.5 120.5 q-58 101 -163 101q-63 0 -63 -44v-598h-245v25q43 1 63 19t20 54v486q0 34 -17.5 48t-65.5 19v25z" />
+<glyph unicode="&#x14b;" horiz-adv-x="556" d="M490 331v-331q0 -84 -27 -129q-43 -76 -150 -76q-62 0 -101 28t-39 72q0 27 17 44t45 17q25 0 42 -15.5t17 -38.5q0 -16 -14 -37q-9 -15 -9 -22q0 -17 32 -17q25 0 36.5 18t11.5 58v419q0 85 -51 85q-36 0 -70 -34q-17 -17 -17 -24v-264q0 -29 10.5 -42.5t37.5 -17.5v-24 h-240v24q33 7 43 19t10 44v289q0 32 -10 44t-43 17v24h191v-75h1q49 87 142 87q62 0 98.5 -38.5t36.5 -103.5z" />
+<glyph unicode="&#x14c;" horiz-adv-x="778" d="M550 738h-330v72h330v-72zM743 335q0 -156 -99.5 -255t-255.5 -99q-155 0 -254 99t-99 254q0 159 101 258t258 99q151 0 250 -100.5t99 -255.5zM566 328q0 160 -46.5 245t-134.5 85q-83 0 -128 -85.5t-45 -242.5t46 -236.5t132 -79.5t131 80t45 234z" />
+<glyph unicode="&#x14d;" horiz-adv-x="500" d="M415 528h-330v72h330v-72zM476 229q0 -105 -64.5 -174t-161.5 -69q-95 0 -160 68.5t-65 173.5q0 109 64.5 177t164.5 68q95 0 158.5 -69t63.5 -175zM329 218q0 128 -17 176t-61 48q-46 0 -62.5 -47.5t-16.5 -176.5q0 -109 18 -155t61 -46t60.5 44.5t17.5 156.5z" />
+<glyph unicode="&#x14e;" horiz-adv-x="778" d="M498 901h44q-6 -75 -43.5 -119t-108.5 -44q-73 0 -111.5 44.5t-39.5 118.5h44q17 -87 102 -87q47 0 73.5 20t39.5 67zM743 335q0 -156 -99.5 -255t-255.5 -99q-155 0 -254 99t-99 254q0 159 101 258t258 99q151 0 250 -100.5t99 -255.5zM566 328q0 160 -46.5 245 t-134.5 85q-83 0 -128 -85.5t-45 -242.5t46 -236.5t132 -79.5t131 80t45 234z" />
+<glyph unicode="&#x14f;" horiz-adv-x="500" d="M358 691h44q-6 -75 -43.5 -119t-108.5 -44q-73 0 -111.5 44.5t-39.5 118.5h44q17 -87 102 -87q47 0 73.5 20t39.5 67zM476 229q0 -105 -64.5 -174t-161.5 -69q-95 0 -160 68.5t-65 173.5q0 109 64.5 177t164.5 68q95 0 158.5 -69t63.5 -175zM329 218q0 128 -17 176 t-61 48q-46 0 -62.5 -47.5t-16.5 -176.5q0 -109 18 -155t61 -46t60.5 44.5t17.5 156.5z" />
+<glyph unicode="&#x150;" horiz-adv-x="778" d="M370 738l136 157q25 28 54 28q22 0 35 -12t13 -32q0 -17 -8 -28.5t-32 -26.5l-141 -86h-57zM170 738l136 157q25 28 54 28q22 0 35 -12t13 -32q0 -17 -8 -28.5t-32 -26.5l-141 -86h-57zM743 335q0 -156 -99.5 -255t-255.5 -99q-155 0 -254 99t-99 254q0 159 101 258 t258 99q151 0 250 -100.5t99 -255.5zM566 328q0 160 -46.5 245t-134.5 85q-83 0 -128 -85.5t-45 -242.5t46 -236.5t132 -79.5t131 80t45 234z" />
+<glyph unicode="&#x151;" horiz-adv-x="500" d="M238 528l136 157q25 28 54 28q22 0 35 -12t13 -32q0 -17 -8 -28.5t-32 -26.5l-141 -86h-57zM38 528l136 157q25 28 54 28q22 0 35 -12t13 -32q0 -17 -8 -28.5t-32 -26.5l-141 -86h-57zM476 229q0 -105 -64.5 -174t-161.5 -69q-95 0 -160 68.5t-65 173.5q0 109 64.5 177 t164.5 68q95 0 158.5 -69t63.5 -175zM329 218q0 128 -17 176t-61 48q-46 0 -62.5 -47.5t-16.5 -176.5q0 -109 18 -155t61 -46t60.5 44.5t17.5 156.5z" />
+<glyph unicode="&#x152;" horiz-adv-x="1000" d="M981 211l-42 -211h-430q-71 0 -107 -3q-28 -2 -43 -2q-140 0 -226 72q-53 45 -82 114.5t-29 152.5q0 92 36 167.5t101 121.5q87 61 202 61q4 0 25.5 -2t58.5 -4t78 -2h417v-201h-26q-11 60 -26.5 89.5t-46.5 48.5q-47 28 -161 28q-30 0 -41.5 -5.5t-11.5 -20.5v-249 q80 2 105.5 27.5t45.5 120.5h23v-338h-23q-11 89 -41.5 121t-109.5 36v-250q0 -29 14.5 -38.5t57.5 -9.5q107 0 168 50q26 22 44.5 48.5t42.5 77.5h27zM472 212v291q0 92 -18 119q-21 30 -77 30q-185 0 -185 -332q0 -154 40 -224q39 -69 134 -69q63 0 86 32q12 16 16 47 t4 106z" />
+<glyph unicode="&#x153;" horiz-adv-x="722" d="M676 125l20 -16q-49 -70 -92 -96.5t-106 -26.5q-73 0 -115 48q-56 -48 -138 -48q-99 0 -161 67.5t-62 175.5q0 107 63.5 175.5t162.5 68.5q76 0 125 -49q36 28 63.5 38.5t65.5 10.5q114 0 162 -92q24 -45 29 -136h-249v-20q0 -167 113 -167q35 0 59.5 14t59.5 53z M571 282l-2 56q-2 56 -16 81t-44 25q-65 0 -65 -108v-54h127zM308 149v162q0 72 -16 102.5t-53 30.5q-41 0 -56.5 -41.5t-15.5 -153.5q0 -132 16 -182.5t59 -50.5q34 0 50 32t16 101z" />
+<glyph unicode="&#x154;" horiz-adv-x="722" d="M251 738l137 157q25 28 53 28q22 0 35 -12t13 -32q0 -17 -8 -27.5t-32 -25.5l-142 -88h-56zM716 0h-205l-207 313h-28v-196q0 -54 14.5 -69t73.5 -23v-25h-338v25q59 7 73.5 22t14.5 73v431q0 59 -16.5 77.5t-71.5 22.5v25h308q296 0 296 -172q0 -76 -45 -118 q-42 -38 -112 -57l199 -282q15 -22 44 -22v-25zM276 597v-252q103 1 143 31t40 118q0 79 -30 113.5t-100 34.5q-29 0 -41 -10t-12 -35z" />
+<glyph unicode="&#x155;" horiz-adv-x="444" d="M83 528l137 157q25 28 53 28q22 0 35 -12t13 -32q0 -17 -8 -27.5t-32 -25.5l-142 -88h-56zM218 461v-82q35 51 66 72.5t69 21.5q35 0 58 -22.5t23 -56.5q0 -30 -17.5 -49t-45.5 -19q-37 0 -60 38q-14 23 -28 23q-26 0 -43.5 -30t-17.5 -74v-177q0 -48 13.5 -63.5 t58.5 -18.5v-24h-265v24q33 6 43.5 17.5t10.5 42.5v289q0 35 -11 47t-44 17v24h190z" />
+<glyph unicode="&#x156;" horiz-adv-x="722" d="M716 0h-205l-207 313h-28v-196q0 -54 14.5 -69t73.5 -23v-25h-338v25q59 7 73.5 22t14.5 73v431q0 59 -16.5 77.5t-71.5 22.5v25h308q296 0 296 -172q0 -76 -45 -118q-42 -38 -112 -57l199 -282q15 -22 44 -22v-25zM276 597v-252q103 1 143 31t40 118q0 79 -30 113.5 t-100 34.5q-29 0 -41 -10t-12 -35zM306 -378l-11 22q109 76 109 133q0 21 -19 21q-3 0 -11 -1t-13 -1q-32 0 -52.5 21t-20.5 55q0 39 23 62t61 23q47 0 73.5 -31t26.5 -85q0 -132 -166 -219z" />
+<glyph unicode="&#x157;" horiz-adv-x="444" d="M218 461v-82q35 51 66 72.5t69 21.5q35 0 58 -22.5t23 -56.5q0 -30 -17.5 -49t-45.5 -19q-37 0 -60 38q-14 23 -28 23q-26 0 -43.5 -30t-17.5 -74v-177q0 -48 13.5 -63.5t58.5 -18.5v-24h-265v24q33 6 43.5 17.5t10.5 42.5v289q0 35 -11 47t-44 17v24h190zM128 -378 l-11 22q109 76 109 133q0 21 -19 21q-3 0 -11 -1t-13 -1q-32 0 -52.5 21t-20.5 55q0 39 23 62t61 23q47 0 73.5 -31t26.5 -85q0 -132 -166 -219z" />
+<glyph unicode="&#x158;" horiz-adv-x="722" d="M493 914l-123 -176h-92l-122 176h57l111 -99l111 99h58zM716 0h-205l-207 313h-28v-196q0 -54 14.5 -69t73.5 -23v-25h-338v25q59 7 73.5 22t14.5 73v431q0 59 -16.5 77.5t-71.5 22.5v25h308q296 0 296 -172q0 -76 -45 -118q-42 -38 -112 -57l199 -282q15 -22 44 -22v-25 zM276 597v-252q103 1 143 31t40 118q0 79 -30 113.5t-100 34.5q-29 0 -41 -10t-12 -35z" />
+<glyph unicode="&#x159;" horiz-adv-x="444" d="M388 704l-123 -176h-92l-122 176h57l111 -99l111 99h58zM218 461v-82q35 51 66 72.5t69 21.5q35 0 58 -22.5t23 -56.5q0 -30 -17.5 -49t-45.5 -19q-37 0 -60 38q-14 23 -28 23q-26 0 -43.5 -30t-17.5 -74v-177q0 -48 13.5 -63.5t58.5 -18.5v-24h-265v24q33 6 43.5 17.5 t10.5 42.5v289q0 35 -11 47t-44 17v24h190z" />
+<glyph unicode="&#x15a;" horiz-adv-x="556" d="M484 474h-28q-26 85 -70 130q-54 56 -123 56q-51 0 -80.5 -27.5t-29.5 -71.5q0 -36 21 -59t82 -55q18 -10 68.5 -35.5t79.5 -41.5q49 -27 79 -73.5t30 -102.5q0 -95 -68.5 -154t-179.5 -59q-61 0 -130 24q-31 10 -41 10q-12 0 -19 -7.5t-11 -26.5h-29v248h29 q23 -96 60 -143q57 -72 144 -72q58 0 92 30.5t34 82.5q0 48 -57 88q-25 18 -122 65q-89 43 -130 90t-41 120q0 95 58.5 148t160.5 53q55 0 117 -23q27 -9 42 -9q14 0 20.5 6.5t11.5 26.5h30v-218zM191 738l137 157q25 28 53 28q22 0 35 -12t13 -32q0 -17 -8 -27.5t-32 -25.5 l-142 -88h-56z" />
+<glyph unicode="&#x15b;" horiz-adv-x="389" d="M126 528l137 157q25 28 53 28q22 0 35 -12t13 -32q0 -17 -8 -27.5t-32 -25.5l-142 -88h-56zM340 326h-25q-19 56 -47 82q-34 32 -75 32q-28 0 -47 -16.5t-19 -41.5q0 -26 22.5 -46.5t73.5 -41.5q75 -31 106.5 -67t31.5 -89q0 -67 -43 -109.5t-111 -42.5q-52 0 -108 23 q-15 6 -23 6q-11 0 -26 -28h-25v165h28q32 -132 137 -132q34 0 54.5 18t20.5 47q0 24 -22 44.5t-74 42.5q-75 32 -108.5 68.5t-33.5 86.5q0 63 44.5 104.5t112.5 41.5q34 0 78 -15q22 -7 31 -7q17 0 25 20h22v-145z" />
+<glyph unicode="&#x15c;" horiz-adv-x="556" d="M484 474h-28q-26 85 -70 130q-54 56 -123 56q-51 0 -80.5 -27.5t-29.5 -71.5q0 -36 21 -59t82 -55q18 -10 68.5 -35.5t79.5 -41.5q49 -27 79 -73.5t30 -102.5q0 -95 -68.5 -154t-179.5 -59q-61 0 -130 24q-31 10 -41 10q-12 0 -19 -7.5t-11 -26.5h-29v248h29 q23 -96 60 -143q57 -72 144 -72q58 0 92 30.5t34 82.5q0 48 -57 88q-25 18 -122 65q-89 43 -130 90t-41 120q0 95 58.5 148t160.5 53q55 0 117 -23q27 -9 42 -9q14 0 20.5 6.5t11.5 26.5h30v-218zM449 738h-57l-112 98l-112 -98h-56l122 176h92z" />
+<glyph unicode="&#x15d;" horiz-adv-x="389" d="M359 528h-57l-112 98l-112 -98h-56l122 176h92zM340 326h-25q-19 56 -47 82q-34 32 -75 32q-28 0 -47 -16.5t-19 -41.5q0 -26 22.5 -46.5t73.5 -41.5q75 -31 106.5 -67t31.5 -89q0 -67 -43 -109.5t-111 -42.5q-52 0 -108 23q-15 6 -23 6q-11 0 -26 -28h-25v165h28 q32 -132 137 -132q34 0 54.5 18t20.5 47q0 24 -22 44.5t-74 42.5q-75 32 -108.5 68.5t-33.5 86.5q0 63 44.5 104.5t112.5 41.5q34 0 78 -15q22 -7 31 -7q17 0 25 20h22v-145z" />
+<glyph unicode="&#x15e;" horiz-adv-x="556" d="M204 -96l35 78q-48 3 -104 23q-31 10 -41 10q-12 0 -19 -7.5t-11 -26.5h-29v248h29q23 -96 60 -143q57 -72 144 -72q58 0 92 30.5t34 82.5q0 48 -57 88q-25 18 -122 65q-89 43 -130 90t-41 120q0 95 58.5 148t160.5 53q55 0 117 -23q27 -9 42 -9q14 0 20.5 6.5t11.5 26.5 h30v-218h-28q-26 85 -70 130q-54 56 -123 56q-51 0 -80.5 -27.5t-29.5 -71.5q0 -36 21 -59t82 -55q18 -10 68.5 -35.5t79.5 -41.5q49 -27 79 -73.5t30 -102.5q0 -91 -64 -149.5t-168 -62.5l-20 -46q15 5 32 5q42 0 65.5 -18.5t23.5 -51.5q0 -41 -35 -65t-94 -24 q-46 0 -97 18l16 37l6 -2q36 -12 53 -12q58 0 58 41q0 36 -46 36q-13 0 -28 -4z" />
+<glyph unicode="&#x15f;" horiz-adv-x="389" d="M234 0l-28 -64q15 5 32 5q42 0 65.5 -18.5t23.5 -51.5q0 -41 -35 -65t-94 -24q-46 0 -97 18l16 37l6 -2q36 -12 53 -12q58 0 58 41q0 36 -46 36q-13 0 -28 -4l-11 8l43 96h42zM340 326h-25q-19 56 -47 82q-34 32 -75 32q-28 0 -47 -16.5t-19 -41.5q0 -26 22.5 -46.5 t73.5 -41.5q75 -31 106.5 -67t31.5 -89q0 -67 -43 -109.5t-111 -42.5q-52 0 -108 23q-15 6 -23 6q-11 0 -26 -28h-25v165h28q32 -132 137 -132q34 0 54.5 18t20.5 47q0 24 -22 44.5t-74 42.5q-75 32 -108.5 68.5t-33.5 86.5q0 63 44.5 104.5t112.5 41.5q34 0 78 -15 q22 -7 31 -7q17 0 25 20h22v-145z" />
+<glyph unicode="&#x160;" horiz-adv-x="556" d="M484 474h-28q-26 85 -70 130q-54 56 -123 56q-51 0 -80.5 -27.5t-29.5 -71.5q0 -36 21 -59t82 -55q18 -10 68.5 -35.5t79.5 -41.5q49 -27 79 -73.5t30 -102.5q0 -95 -68.5 -154t-179.5 -59q-61 0 -130 24q-31 10 -41 10q-12 0 -19 -7.5t-11 -26.5h-29v248h29 q23 -96 60 -143q57 -72 144 -72q58 0 92 30.5t34 82.5q0 48 -57 88q-25 18 -122 65q-89 43 -130 90t-41 120q0 95 58.5 148t160.5 53q55 0 117 -23q27 -9 42 -9q14 0 20.5 6.5t11.5 26.5h30v-218zM449 914l-123 -176h-92l-122 176h57l111 -99l111 99h58z" />
+<glyph unicode="&#x161;" horiz-adv-x="389" d="M359 704l-123 -176h-92l-122 176h57l111 -99l111 99h58zM340 326h-25q-19 56 -47 82q-34 32 -75 32q-28 0 -47 -16.5t-19 -41.5q0 -26 22.5 -46.5t73.5 -41.5q75 -31 106.5 -67t31.5 -89q0 -67 -43 -109.5t-111 -42.5q-52 0 -108 23q-15 6 -23 6q-11 0 -26 -28h-25v165 h28q32 -132 137 -132q34 0 54.5 18t20.5 47q0 24 -22 44.5t-74 42.5q-75 32 -108.5 68.5t-33.5 86.5q0 63 44.5 104.5t112.5 41.5q34 0 78 -15q22 -7 31 -7q17 0 25 20h22v-145z" />
+<glyph unicode="&#x162;" horiz-adv-x="667" d="M317 0h-161v25q64 5 80.5 20.5t16.5 71.5v527q-93 -3 -136.5 -41.5t-56.5 -127.5h-29l3 201h600l2 -201h-29q-13 89 -56.5 127.5t-135.5 41.5v-527q0 -57 16.5 -72t81.5 -20v-25h-154l-28 -64q15 5 32 5q42 0 65.5 -18.5t23.5 -51.5q0 -41 -35 -65t-94 -24q-46 0 -97 18 l16 37l6 -2q36 -12 53 -12q58 0 58 41q0 36 -46 36q-13 0 -28 -4l-11 8z" />
+<glyph unicode="&#x163;" horiz-adv-x="333" d="M112 -96l39 87q-37 8 -58 35t-21 69v322h-53v27q49 33 82 71.5t85 114.5h25v-169h95v-44h-95v-298q0 -60 39 -60q29 0 57 53l25 -11q-29 -59 -61 -85t-79 -28l-23 -52q15 5 32 5q42 0 65.5 -18.5t23.5 -51.5q0 -41 -35 -65t-94 -24q-46 0 -97 18l16 37l6 -2 q36 -12 53 -12q58 0 58 41q0 36 -46 36q-13 0 -28 -4z" />
+<glyph unicode="&#x164;" horiz-adv-x="667" d="M502 914l-123 -176h-92l-122 176h57l111 -99l111 99h58zM636 475h-29q-13 89 -56.5 127.5t-135.5 41.5v-527q0 -57 16.5 -72t81.5 -20v-25h-357v25q64 5 80.5 20.5t16.5 71.5v527q-93 -3 -136.5 -41.5t-56.5 -127.5h-29l3 201h600z" />
+<glyph unicode="&#x165;" horiz-adv-x="415" d="M279 374l-11 22q109 76 109 133q0 21 -19 21q-3 0 -11 -1t-13 -1q-32 0 -52.5 21t-20.5 55q0 39 23 62t61 23q47 0 73.5 -31t26.5 -85q0 -132 -166 -219zM307 112l25 -11q-31 -62 -64.5 -87.5t-83.5 -25.5q-52 0 -82 28.5t-30 78.5v322h-53v27q49 33 82 71.5t85 114.5h25 v-169h60v-44h-60v-298q0 -60 39 -60q29 0 57 53z" />
+<glyph unicode="&#x166;" horiz-adv-x="667" d="M636 475h-29q-13 89 -56.5 127.5t-135.5 41.5v-288h110v-34h-110v-205q0 -57 16.5 -72t81.5 -20v-25h-357v25q64 5 80.5 20.5t16.5 71.5v205h-114v34h114v288q-93 -3 -136.5 -41.5t-56.5 -127.5h-29l3 201h600z" />
+<glyph unicode="&#x167;" horiz-adv-x="333" d="M307 112l25 -11q-31 -62 -64.5 -87.5t-83.5 -25.5q-52 0 -82 28.5t-30 78.5v134h-55v56h55v132h-53v27q49 33 82 71.5t85 114.5h25v-169h95v-44h-95v-132h92v-56h-92v-110q0 -60 39 -60q29 0 57 53z" />
+<glyph unicode="&#x168;" horiz-adv-x="722" d="M530 886h43q-34 -127 -116 -127q-32 0 -65 14l-29 13q-48 22 -64 22q-19 0 -32.5 -13t-16.5 -34h-42q14 65 42 95t74 30q31 0 73 -19l40 -18q27 -12 39 -12q20 0 32 11t22 38zM701 676v-25q-48 -7 -63 -24t-15 -61v-314q0 -156 -76 -216q-68 -55 -184 -55t-185 54 q-43 34 -61.5 79t-18.5 117v324q0 59 -14 75t-68 21v25h336v-25q-60 -5 -77.5 -23t-17.5 -78v-318q0 -202 146 -202q176 0 176 222v300q0 54 -20.5 74t-76.5 25v25h219z" />
+<glyph unicode="&#x169;" horiz-adv-x="556" d="M405 674h43q-34 -127 -116 -127q-32 0 -65 14l-29 13q-48 22 -64 22q-19 0 -32.5 -13t-16.5 -34h-42q14 65 42 95t74 30q31 0 73 -19l40 -18q27 -12 39 -12q20 0 32 11t22 38zM538 20l-63 -7q-83 -9 -132 -26v65q-39 -37 -71.5 -51.5t-73.5 -14.5q-63 0 -98 38t-35 107 v241q0 35 -9 47t-40 18v24h188v-334q0 -76 56 -76q39 0 82 47v276q0 34 -12 47t-49 16v24h200v-356q0 -33 12 -47t45 -15v-23z" />
+<glyph unicode="&#x16a;" horiz-adv-x="722" d="M515 738h-330v72h330v-72zM701 676v-25q-48 -7 -63 -24t-15 -61v-314q0 -156 -76 -216q-68 -55 -184 -55t-185 54q-43 34 -61.5 79t-18.5 117v324q0 59 -14 75t-68 21v25h336v-25q-60 -5 -77.5 -23t-17.5 -78v-318q0 -202 146 -202q176 0 176 222v300q0 54 -20.5 74 t-76.5 25v25h219z" />
+<glyph unicode="&#x16b;" horiz-adv-x="556" d="M425 528h-330v72h330v-72zM538 20l-63 -7q-83 -9 -132 -26v65q-39 -37 -71.5 -51.5t-73.5 -14.5q-63 0 -98 38t-35 107v241q0 35 -9 47t-40 18v24h188v-334q0 -76 56 -76q39 0 82 47v276q0 34 -12 47t-49 16v24h200v-356q0 -33 12 -47t45 -15v-23z" />
+<glyph unicode="&#x16c;" horiz-adv-x="722" d="M478 901h44q-6 -75 -43.5 -119t-108.5 -44q-73 0 -111.5 44.5t-39.5 118.5h44q17 -87 102 -87q47 0 73.5 20t39.5 67zM701 676v-25q-48 -7 -63 -24t-15 -61v-314q0 -156 -76 -216q-68 -55 -184 -55t-185 54q-43 34 -61.5 79t-18.5 117v324q0 59 -14 75t-68 21v25h336v-25 q-60 -5 -77.5 -23t-17.5 -78v-318q0 -202 146 -202q176 0 176 222v300q0 54 -20.5 74t-76.5 25v25h219z" />
+<glyph unicode="&#x16d;" horiz-adv-x="556" d="M358 691h44q-6 -75 -43.5 -119t-108.5 -44q-73 0 -111.5 44.5t-39.5 118.5h44q17 -87 102 -87q47 0 73.5 20t39.5 67zM538 20l-63 -7q-83 -9 -132 -26v65q-39 -37 -71.5 -51.5t-73.5 -14.5q-63 0 -98 38t-35 107v241q0 35 -9 47t-40 18v24h188v-334q0 -76 56 -76 q39 0 82 47v276q0 34 -12 47t-49 16v24h200v-356q0 -33 12 -47t45 -15v-23z" />
+<glyph unicode="&#x16e;" horiz-adv-x="722" d="M473 830q0 -44 -31 -76t-75 -32q-45 0 -76 30.5t-31 75.5q0 44 32 75.5t76 31.5q43 0 74 -31t31 -74zM425 827q0 25 -18 42.5t-43 17.5q-22 0 -39 -17.5t-17 -40.5q0 -24 17 -41.5t40 -17.5q25 0 42.5 16.5t17.5 40.5zM701 676v-25q-48 -7 -63 -24t-15 -61v-314 q0 -156 -76 -216q-68 -55 -184 -55t-185 54q-43 34 -61.5 79t-18.5 117v324q0 59 -14 75t-68 21v25h336v-25q-60 -5 -77.5 -23t-17.5 -78v-318q0 -202 146 -202q176 0 176 222v300q0 54 -20.5 74t-76.5 25v25h219z" />
+<glyph unicode="&#x16f;" horiz-adv-x="556" d="M377 635q0 -44 -31 -76t-75 -32q-45 0 -76 30.5t-31 75.5q0 44 32 75.5t76 31.5q43 0 74 -31t31 -74zM329 632q0 25 -18 42.5t-43 17.5q-22 0 -39 -17.5t-17 -40.5q0 -24 17 -41.5t40 -17.5q25 0 42.5 16.5t17.5 40.5zM538 20l-63 -7q-83 -9 -132 -26v65 q-39 -37 -71.5 -51.5t-73.5 -14.5q-63 0 -98 38t-35 107v241q0 35 -9 47t-40 18v24h188v-334q0 -76 56 -76q39 0 82 47v276q0 34 -12 47t-49 16v24h200v-356q0 -33 12 -47t45 -15v-23z" />
+<glyph unicode="&#x170;" horiz-adv-x="722" d="M354 738l136 157q25 28 54 28q22 0 35 -12t13 -32q0 -17 -8 -28.5t-32 -26.5l-141 -86h-57zM154 738l136 157q25 28 54 28q22 0 35 -12t13 -32q0 -17 -8 -28.5t-32 -26.5l-141 -86h-57zM701 676v-25q-48 -7 -63 -24t-15 -61v-314q0 -156 -76 -216q-68 -55 -184 -55 t-185 54q-43 34 -61.5 79t-18.5 117v324q0 59 -14 75t-68 21v25h336v-25q-60 -5 -77.5 -23t-17.5 -78v-318q0 -202 146 -202q176 0 176 222v300q0 54 -20.5 74t-76.5 25v25h219z" />
+<glyph unicode="&#x171;" horiz-adv-x="556" d="M252 528l136 157q25 28 54 28q22 0 35 -12t13 -32q0 -17 -8 -28.5t-32 -26.5l-141 -86h-57zM52 528l136 157q25 28 54 28q22 0 35 -12t13 -32q0 -17 -8 -28.5t-32 -26.5l-141 -86h-57zM538 20l-63 -7q-83 -9 -132 -26v65q-39 -37 -71.5 -51.5t-73.5 -14.5q-63 0 -98 38 t-35 107v241q0 35 -9 47t-40 18v24h188v-334q0 -76 56 -76q39 0 82 47v276q0 34 -12 47t-49 16v24h200v-356q0 -33 12 -47t45 -15v-23z" />
+<glyph unicode="&#x172;" horiz-adv-x="722" d="M423 -16l2 2q-33 -5 -62 -5q-116 0 -185 54q-43 34 -61.5 79t-18.5 117v324q0 59 -14 75t-68 21v25h336v-25q-60 -5 -77.5 -23t-17.5 -78v-318q0 -202 146 -202q176 0 176 222v300q0 54 -20.5 74t-76.5 25v25h219v-25q-48 -7 -63 -24t-15 -61v-314q0 -156 -76 -216 q-30 -25 -82 -41q0 -1 -1 -3q-11 -39 -11 -64q0 -35 14 -49.5t47 -14.5q22 0 48 13q4 2 13 8l23 -16q-18 -34 -54 -54t-72 -20q-47 0 -75 21.5t-28 56.5q0 28 11.5 51.5t42.5 59.5z" />
+<glyph unicode="&#x173;" horiz-adv-x="556" d="M524 -115l23 -16q-18 -34 -54 -54t-72 -20q-47 0 -75 21.5t-28 56.5q0 28 11.5 51.5t42.5 59.5q4 6 8 10l6 6l33 12l-6 -20q-11 -39 -11 -64q0 -35 14 -49.5t47 -14.5q22 0 48 13q4 2 13 8zM538 20l-63 -7q-83 -9 -132 -26v65q-39 -37 -71.5 -51.5t-73.5 -14.5 q-63 0 -98 38t-35 107v241q0 35 -9 47t-40 18v24h188v-334q0 -76 56 -76q39 0 82 47v276q0 34 -12 47t-49 16v24h200v-356q0 -33 12 -47t45 -15v-23z" />
+<glyph unicode="&#x174;" horiz-adv-x="1000" d="M683 738h-57l-112 98l-112 -98h-56l122 176h92zM981 676v-25q-50 -5 -69 -64l-200 -602h-27l-171 477l-186 -477h-28l-212 602q-13 37 -25 48t-44 16v25h294v-25q-39 -3 -51.5 -11.5t-12.5 -30.5q0 -13 7 -33l120 -364l118 308l-35 96q-12 32 -72 35v25h312v-25l-13 -1 q-33 -2 -46 -10t-13 -26q0 -13 14 -56l108 -336l112 343q7 20 7 42q0 23 -14.5 32.5t-54.5 11.5v25h182z" />
+<glyph unicode="&#x175;" horiz-adv-x="722" d="M546 528h-57l-112 98l-112 -98h-56l122 176h92zM707 461v-24q-19 -4 -29.5 -14.5t-20.5 -35.5l-155 -401h-23l-102 310l-125 -310h-24l-148 374q-19 47 -28.5 60t-28.5 17v24h222v-24q-38 -5 -38 -28q0 -12 39 -115l45 -118l68 171q-4 12 -6 19q-14 49 -22 58.5t-37 12.5 v24h234v-24q-28 -2 -38 -7t-10 -17q0 -14 27 -106q23 -79 34 -127l35 94q44 118 44 128q0 17 -10 24.5t-38 10.5v24h135z" />
+<glyph unicode="&#x176;" horiz-adv-x="722" d="M543 738h-57l-112 98l-112 -98h-56l122 176h92zM699 676v-25q-49 -7 -68 -39l-191 -311v-178q0 -58 16.5 -75.5t75.5 -22.5v-25h-347v25q60 5 76.5 25t16.5 78v136l-180 328q-31 56 -83 59v25h335v-25l-27 -2q-32 -2 -43 -7.5t-11 -21.5q0 -13 24 -59l120 -232l109 178 q41 68 41 102q0 22 -16.5 30t-67.5 12v25h220z" />
+<glyph unicode="&#x177;" horiz-adv-x="500" d="M419 528h-57l-112 98l-112 -98h-56l122 176h92zM482 461v-24q-24 -3 -36 -13.5t-24 -41.5l-148 -398q-45 -121 -77 -156q-31 -33 -84 -33q-43 0 -70 22t-27 57q0 29 17 48t45 19q25 0 42.5 -15t17.5 -37q0 -4 -2 -14l-1 -6q0 -7 5 -12t12 -5q38 0 66 82l18 53l-119 290 q-49 121 -67 146q-8 10 -34 14v24h249v-24l-16 -1q-36 -3 -36 -25q0 -7 20 -58l72 -186l68 188q11 32 11 49q0 18 -11 25t-43 8v24h152z" />
+<glyph unicode="&#x178;" horiz-adv-x="722" d="M529 810q0 -26 -19 -44.5t-47 -18.5q-26 0 -44.5 19t-18.5 46q0 26 19 45t45 19t45.5 -19.5t19.5 -46.5zM319 810q0 -26 -18.5 -44.5t-46.5 -18.5q-26 0 -45 19t-19 46q0 26 19.5 45t45.5 19t45 -19.5t19 -46.5zM699 676v-25q-49 -7 -68 -39l-191 -311v-178 q0 -58 16.5 -75.5t75.5 -22.5v-25h-347v25q60 5 76.5 25t16.5 78v136l-180 328q-31 56 -83 59v25h335v-25l-27 -2q-32 -2 -43 -7.5t-11 -21.5q0 -13 24 -59l120 -232l109 178q41 68 41 102q0 22 -16.5 30t-67.5 12v25h220z" />
+<glyph unicode="&#x179;" horiz-adv-x="667" d="M634 242l-27 -242h-579v16l382 623l-83 -1q-117 -2 -162 -32.5t-78 -136.5h-28l22 207h523v-16l-379 -625h83q145 0 202 40q27 19 45 45t26.5 47t26.5 75h26zM250 738l137 157q25 28 53 28q22 0 35 -12t13 -32q0 -17 -8 -27.5t-32 -25.5l-142 -88h-56z" />
+<glyph unicode="&#x17a;" horiz-adv-x="444" d="M152 528l137 157q25 28 53 28q22 0 35 -12t13 -32q0 -17 -8 -27.5t-32 -25.5l-142 -88h-56zM420 160l-16 -160h-383v25l234 404q-106 0 -139 -19t-52 -91h-26l7 142h371v-26l-231 -403h29q61 0 91.5 12.5t55.5 46.5q20 30 31 69h28z" />
+<glyph unicode="&#x17b;" horiz-adv-x="667" d="M634 242l-27 -242h-579v16l382 623l-83 -1q-117 -2 -162 -32.5t-78 -136.5h-28l22 207h523v-16l-379 -625h83q145 0 202 40q27 19 45 45t26.5 47t26.5 75h26zM411 810q0 -26 -19 -44.5t-47 -18.5q-26 0 -44.5 19t-18.5 46q0 26 19 45t45 19t45.5 -19.5t19.5 -46.5z" />
+<glyph unicode="&#x17c;" horiz-adv-x="444" d="M303 600q0 -26 -19 -44.5t-47 -18.5q-26 0 -44.5 19t-18.5 46q0 26 19 45t45 19t45.5 -19.5t19.5 -46.5zM420 160l-16 -160h-383v25l234 404q-106 0 -139 -19t-52 -91h-26l7 142h371v-26l-231 -403h29q61 0 91.5 12.5t55.5 46.5q20 30 31 69h28z" />
+<glyph unicode="&#x17d;" horiz-adv-x="667" d="M634 242l-27 -242h-579v16l382 623l-83 -1q-117 -2 -162 -32.5t-78 -136.5h-28l22 207h523v-16l-379 -625h83q145 0 202 40q27 19 45 45t26.5 47t26.5 75h26zM519 914l-123 -176h-92l-122 176h57l111 -99l111 99h58z" />
+<glyph unicode="&#x17e;" horiz-adv-x="444" d="M401 704l-123 -176h-92l-122 176h57l111 -99l111 99h58zM420 160l-16 -160h-383v25l234 404q-106 0 -139 -19t-52 -91h-26l7 142h371v-26l-231 -403h29q61 0 91.5 12.5t55.5 46.5q20 30 31 69h28z" />
+<glyph unicode="&#x17f;" horiz-adv-x="333" d="M30 461h41q0 131 40 179q42 51 135 51q64 0 103.5 -28t39.5 -72q0 -28 -17 -46t-45 -18q-25 0 -42.5 17t-17.5 40q0 20 11 36.5t11 20.5q0 19 -29 19q-27 0 -38.5 -17.5t-11.5 -61.5v-474q0 -50 15 -66t67 -17v-24h-278v24q34 4 45.5 16.5t11.5 46.5v330h-41v44z" />
+<glyph unicode="&#x180;" horiz-adv-x="553" d="M206 515v-98q53 56 122 56q83 0 135.5 -65t52.5 -169q0 -113 -63 -183t-163 -70q-70 0 -132 57l-79 -56h-12v528h-95v46h95v39q0 29 -9.5 37t-45.5 15v24h194v-115h129v-46h-129zM206 360v-263q0 -36 19 -57.5t50 -21.5q94 0 94 203q0 198 -93 198q-25 0 -41 -13.5 t-29 -45.5z" />
+<glyph unicode="&#x188;" horiz-adv-x="568" d="M417 109l18 -18q-41 -56 -86 -80.5t-105 -24.5q-95 0 -154.5 65t-59.5 171q0 110 68 180.5t169 70.5q39 0 69 -11q0 18 5 38q7 30 36.5 53t64.5 23q54 0 93 -27t39 -74q0 -27 -17 -45t-44 -18q-25 0 -42.5 17t-17.5 40q0 20 11 36.5t11 20.5q0 19 -25 19q-64 0 -64 -55 v-55q35 -31 35 -72q0 -29 -18.5 -46.5t-49.5 -17.5q-26 0 -41 19t-15 54q0 18 -0.5 26t-2.5 18.5t-6 15t-12.5 7.5t-20.5 3q-38 0 -61 -44.5t-23 -124.5q0 -102 37 -161t102 -59q58 0 107 56z" />
+<glyph unicode="&#x190;" horiz-adv-x="610" d="M544 174l43 -12q-16 -50 -44 -84t-66 -51t-77.5 -24t-89.5 -7q-48 0 -92.5 9t-86.5 28.5t-67.5 56t-25.5 85.5q0 63 34 112t95 67q-62 33 -90 62.5t-28 82.5q0 47 24 84t63.5 58.5t85 33t92.5 11.5q65 0 110 -15q43 -14 74.5 -43t31.5 -62q0 -29 -14 -48.5t-43 -19.5 q-30 0 -45.5 18t-25.5 62q-12 55 -85 55q-114 0 -114 -159q0 -91 87 -91q25 0 61 5.5t49 5.5q22 0 38 -8t16 -25q0 -20 -26 -33.5t-51 -13.5q-6 0 -44.5 2.5t-46.5 2.5q-45 0 -69 -35t-24 -99q0 -120 137 -120q35 0 55 1t48.5 7t46.5 17t36 32t28 52z" />
+<glyph unicode="&#x192;" horiz-adv-x="500" d="M74 440h120q24 140 71 201q50 65 131 65q46 0 74 -21.5t28 -56.5q0 -26 -15.5 -43.5t-38.5 -17.5q-22 0 -37.5 13.5t-15.5 32.5q0 17 13 37q5 8 5 12q0 5 -7 9.5t-16 4.5q-64 0 -64 -146v-90h122v-46h-122q-15 -247 -22 -290q-20 -126 -73.5 -192.5t-133.5 -66.5 q-43 0 -68 21t-25 57q0 26 15 41.5t40 15.5q23 0 38 -13.5t15 -35.5q0 -14 -11 -28q-7 -8 -7 -12q0 -7 6.5 -11.5t15.5 -4.5q28 0 46 31t19 82l13 406h-116v46z" />
+<glyph unicode="&#x195;" horiz-adv-x="797" d="M484 337v-211q0 -33 22 -59.5t53 -26.5q67 0 110 61.5t43 131.5q0 46 -14 79.5t-27 45t-33 23.5q-21 13 -30 23t-9 25q0 17 14 26.5t35 9.5q33 0 58 -24.5t37.5 -60.5t18 -68t5.5 -57q0 -106 -61.5 -185.5t-169.5 -79.5q-83 0 -137 36t-54 110v188q0 44 -12 63t-39 19 q-36 0 -70 -34q-17 -17 -17 -24v-263q0 -31 10 -44t38 -17v-24h-240v24q36 7 44.5 16t8.5 49v502q0 35 -9 44.5t-45 16.5v24h193v-280q65 77 147 77q60 0 95 -38t35 -98z" />
+<glyph unicode="&#x199;" horiz-adv-x="533" d="M533 0h-234v24q42 2 42 19q0 12 -24 45l-95 134l-23 -24v-114q0 -35 8.5 -45t43.5 -15v-24h-239v24q48 4 48 60v402q0 105 41 154q42 51 135 51q64 0 103 -28t39 -72q0 -28 -17 -46t-44 -18q-25 0 -42.5 17t-17.5 40q0 20 11 36.5t11 20.5q0 19 -29 19q-26 0 -38.5 -16 t-12.5 -55v-344l128 128q21 21 21 38q0 19 -35 23l-24 3v24h214v-24q-48 -6 -81.5 -29t-107.5 -101l194 -268q11 -15 25 -15v-24z" />
+<glyph unicode="&#x19a;" horiz-adv-x="291" d="M265 0h-240v24q51 4 51 63v253h-49v46h49v201q0 61 -52 65v24h191v-290h48v-46h-48v-253q0 -33 12 -47.5t38 -15.5v-24z" />
+<glyph unicode="&#x19b;" horiz-adv-x="536" d="M526 0h-152v24q32 1 43 8t11 25q0 17 -11 49l-68 188l-72 -186q-20 -51 -20 -58q0 -22 36 -25l16 -1v-24h-249v24q26 4 34 14q18 25 67 146l119 290l-9 24l-192 -157v67l174 140q-26 61 -57 61q-7 0 -12 -5t-5 -12q0 -2 1.5 -9.5t1.5 -10.5q0 -22 -17.5 -37t-42.5 -15 q-28 0 -45 19t-17 48q0 35 27 57t70 22q46 0 74 -24t49 -72l114 96v-68l-93 -76l165 -443q12 -31 24 -41.5t36 -13.5v-24z" />
+<glyph unicode="&#x19e;" horiz-adv-x="559" d="M539 -205h-234v24q25 3 35.5 16.5t10.5 43.5v442q0 85 -51 85q-36 0 -70 -34q-17 -17 -17 -24v-264q0 -29 10.5 -42.5t37.5 -17.5v-24h-240v24q33 7 43 19t10 44v289q0 32 -10 44t-43 17v24h191v-75h1q49 87 142 87q62 0 98.5 -38.5t36.5 -103.5v-452q0 -34 10 -46 t39 -14v-24z" />
+<glyph unicode="&#x1a0;" horiz-adv-x="778" d="M659 579h-5q89 -99 89 -244q0 -156 -99.5 -255t-255.5 -99q-155 0 -254 99t-99 254q0 159 101 258t258 99q139 0 234 -86q20 -4 30 -4q30 0 43 5t13 21q-41 25 -41 56q0 17 15 33t38 16q26 0 44 -18t18 -49q0 -32 -20 -53t-52 -28q-22 -5 -57 -5zM566 328 q0 160 -46.5 245t-134.5 85q-83 0 -128 -85.5t-45 -242.5t46 -236.5t132 -79.5t131 80t45 234z" />
+<glyph unicode="&#x1a1;" horiz-adv-x="554" d="M576 438q0 -32 -20 -53t-52 -28q-22 -5 -56 -5q28 -56 28 -123q0 -105 -64.5 -174t-161.5 -69q-95 0 -160 68.5t-65 173.5q0 109 64.5 177t164.5 68q55 0 102.5 -25.5t75.5 -69.5q16 -4 20 -4q50 0 50 26q-41 25 -41 56q0 17 15 33t38 16q26 0 44 -18t18 -49zM329 218 q0 128 -17 176t-61 48q-46 0 -62.5 -47.5t-16.5 -176.5q0 -109 18 -155t61 -46t60.5 44.5t17.5 156.5z" />
+<glyph unicode="&#x1a5;" horiz-adv-x="550" d="M205 568v-173q24 43 54.5 60.5t74.5 17.5q85 0 133 -57.5t48 -166.5q0 -118 -51.5 -190t-140.5 -72q-34 0 -58 12.5t-60 47.5v-126q0 -52 16.5 -76t60.5 -26v-24h-272v24q35 6 45.5 18.5t10.5 44.5v597q0 94 40 143q42 51 135 51q64 0 103 -28t39 -72q0 -28 -17 -46 t-44 -18q-25 0 -42.5 17t-17.5 40q0 20 11 36.5t11 20.5q0 19 -29 19q-27 0 -38.5 -17.5t-11.5 -56.5zM205 346v-239q12 -29 32.5 -47t44.5 -18q85 0 85 192q0 182 -76 182q-37 0 -68 -37q-18 -21 -18 -33z" />
+<glyph unicode="&#x1aa;" horiz-adv-x="446" d="M307 424l-40 -429q-3 -34 -3 -96q0 -97 45 -97q9 0 16 4.5t7 9.5q0 3 -9 18.5t-9 29.5q0 19 15 33t38 14q24 0 39 -17.5t15 -43.5q0 -36 -29.5 -57t-81.5 -21q-84 0 -130.5 52.5t-46.5 137.5q0 37 2 59l36 364q2 15 4.5 46t2.5 35q-16 -6 -44 -6q-45 0 -77 33.5t-32 80.5 q0 46 36.5 80.5t86.5 34.5q75 0 118 -58.5t43 -134.5q0 -48 -2 -72zM190 573q0 25 -18 42.5t-42 17.5t-40.5 -17.5t-16.5 -41.5q0 -23 17 -40.5t41 -17.5q25 0 42 17t17 40z" />
+<glyph unicode="&#x1ab;" horiz-adv-x="347" d="M331 101v-186q0 -54 -28.5 -93.5t-87.5 -39.5q-62 0 -92.5 27t-30.5 73q0 28 17 46t44 18q25 0 42.5 -17t17.5 -40q0 -20 -11 -36.5t-11 -20.5q0 -19 29 -19q24 0 45.5 19.5t21.5 59.5v141q-38 -45 -104 -45q-52 0 -82 28.5t-30 78.5v322h-53v27q49 33 82 71.5t85 114.5 h25v-169h95v-44h-95v-298q0 -60 39 -60q29 0 57 53z" />
+<glyph unicode="&#x1ad;" horiz-adv-x="371" d="M19 417v27q27 17 53 42q2 106 40 154q42 51 135 51q64 0 103 -28t39 -72q0 -28 -17 -46t-44 -18q-25 0 -42.5 17t-17.5 40q0 20 11 36.5t11 20.5q0 19 -29 19q-27 0 -38.5 -17.5t-11.5 -61.5v-120h95v-44h-95v-298q0 -60 39 -60q29 0 57 53l25 -11q-31 -62 -64.5 -87.5 t-83.5 -25.5q-52 0 -82 28.5t-30 78.5v322h-53z" />
+<glyph unicode="&#x1af;" horiz-adv-x="796" d="M482 676h222q57 0 58 29q-41 25 -41 56q0 20 15.5 34.5t39.5 14.5t42 -16.5t18 -48.5q0 -63 -80 -83q-2 0 -68 -13q-40 -7 -52.5 -24t-12.5 -59v-314q0 -156 -76 -216q-68 -55 -184 -55t-185 54q-43 34 -61.5 79t-18.5 117v324q0 59 -14 75t-68 21v25h336v-25 q-60 -5 -77.5 -23t-17.5 -78v-318q0 -202 146 -202q176 0 176 222v300q0 54 -20.5 74t-76.5 25v25z" />
+<glyph unicode="&#x1b0;" horiz-adv-x="600" d="M551 485l-1 8l-8 5q-5 4 -7.5 5.5t-6.5 5t-6 5.5t-5 6t-4 8.5t-2 10t-1 11.5q0 16 15.5 31t38.5 15q26 0 44 -16.5t18 -47.5q0 -68 -72 -87q-27 -8 -62 -8h-11v-332q0 -33 12 -47t45 -15v-23l-63 -7q-83 -9 -132 -26v65q-39 -37 -71.5 -51.5t-73.5 -14.5q-63 0 -98 38 t-35 107v241q0 35 -9 47t-40 18v24h188v-334q0 -76 56 -76q39 0 82 47v276q0 34 -12 47t-49 16v24h205q24 0 44 6t21 18z" />
+<glyph unicode="&#x1ba;" horiz-adv-x="441" d="M415 423l-192 -167q15 4 44 4q67 0 107.5 -35t40.5 -90q0 -31 -20.5 -62.5t-50.5 -48.5l-157 -90q-49 -28 -49 -75q0 -25 23.5 -42t50.5 -17q25 0 45 14t24 36q12 67 67 67q30 0 44.5 -15t14.5 -35q0 -43 -47 -71q-56 -33 -141 -33q-67 0 -113 29q-55 36 -55 100 q0 42 19.5 69.5t58.5 51.5q29 18 126 70q33 19 33 58q0 26 -24.5 40.5t-60.5 14.5q-62 0 -109 -47l-27 24l230 204h-189q-20 0 -44 -23.5t-29 -59.5h-26l34 156h372v-27z" />
+<glyph unicode="&#x1bb;" horiz-adv-x="515" d="M492 314h-135q-20 -23 -25 -27l-162 -154h167q56 0 82 14t44 64h25l-46 -211h-415v23l49 53q41 42 57 60l45 52q30 35 51 65t38 61h-235v62h265q13 36 13 71q0 55 -32 91t-87 36q-78 0 -122 -90h-28q67 204 223 204q83 0 132.5 -50t49.5 -133q0 -70 -39 -129h85v-62z" />
+<glyph unicode="&#x1be;" horiz-adv-x="527" d="M225 438l2 -47q14 2 31 2q87 0 139 -64.5t52 -145.5q0 -88 -60 -140.5t-154 -52.5q-53 0 -102 27q-55 31 -55 79q0 17 14 32.5t39 15.5q55 0 71 -60l8 -25q2 -8 8 -19.5t15.5 -16t22.5 -4.5q19 0 32.5 16t19.5 41t9 48t3 45q0 57 -36.5 91.5t-83.5 34.5h-32v143h-64v46 h64v57h52l3 -57h111v-46h-109z" />
+<glyph unicode="&#x1c0;" horiz-adv-x="186" d="M126 0h-66v740h66v-740z" />
+<glyph unicode="&#x1c1;" horiz-adv-x="313" d="M126 0h-66v740h66v-740zM253 0h-66v740h66v-740z" />
+<glyph unicode="&#x1c2;" horiz-adv-x="445" d="M405 260h-148v-260h-66v260h-152v66h152v84h-152v66h152v264h66v-264h148v-66h-148v-84h148v-66z" />
+<glyph unicode="&#x1c3;" horiz-adv-x="333" d="M182 234h-31q-10 92 -19.5 143t-31.5 123q-18 57 -18 89q0 48 23.5 75t61.5 27q40 0 62 -26.5t22 -73.5q0 -33 -18 -91q-22 -71 -31.5 -122t-19.5 -144zM250 70q0 -36 -24 -59.5t-60 -23.5q-35 0 -60 24.5t-25 59.5q0 37 23.5 61t60.5 24q36 0 60.5 -24.5t24.5 -61.5z " />
+<glyph unicode="&#x1f0;" horiz-adv-x="333" d="M335 704l-123 -176h-92l-122 176h57l111 -99l111 99h58zM260 461v-459q0 -84 -27 -129q-43 -76 -150 -76q-62 0 -101 28t-39 72q0 27 17 44t45 17q25 0 42 -15.5t17 -38.5q0 -16 -14 -37q-9 -15 -9 -22q0 -17 32 -17q25 0 36.5 18t11.5 58v474q0 32 -12.5 44t-50.5 15v24 h202z" />
+<glyph unicode="&#x1fa;" horiz-adv-x="722" d="M374 651l205 -483q38 -90 58.5 -116.5t51.5 -26.5v-25h-322v25l32 3q25 2 35.5 9.5t10.5 23.5q0 29 -46 136h-225l-13 -34q-31 -80 -31 -97q0 -19 18.5 -28.5t62.5 -12.5v-25h-202v25q35 6 53 28t46 92l205 506q-27 9 -43.5 32.5t-16.5 53.5q0 36 27 63t65 27 q35 0 62 -26.5t27 -62.5q0 -29 -17 -53t-43 -34zM384 236l-101 243l-94 -243h195zM386 736q0 18 -11.5 30.5t-32.5 12.5q-18 0 -29.5 -12.5t-11.5 -29.5t12.5 -30t28.5 -13q18 0 31 12.5t13 29.5zM228 825l146 125q25 22 44 22q32 0 32 -33q0 -7 -2 -12t-9.5 -10.5t-13 -9 t-20.5 -11.5l-132 -71h-45z" />
+<glyph unicode="&#x1fb;" horiz-adv-x="500" d="M357 635q0 -44 -31 -76t-75 -32q-45 0 -76 30.5t-31 75.5q0 44 32 75.5t76 31.5q43 0 74 -31t31 -74zM309 632q0 25 -18 42.5t-43 17.5q-22 0 -39 -17.5t-17 -40.5q0 -24 17 -41.5t40 -17.5q25 0 42.5 16.5t17.5 40.5zM122 738l137 157q25 28 53 28q22 0 35 -12t13 -32 q0 -17 -8 -27.5t-32 -25.5l-142 -88h-56zM473 64l15 -21q-53 -57 -112 -57q-37 0 -55.5 15.5t-26.5 53.5q-76 -69 -159 -69q-50 0 -80 26.5t-30 79.5q0 67 67 112q50 33 201 76v68q0 49 -18.5 71t-62.5 22q-28 0 -46.5 -10t-18.5 -27q0 -11 11 -23q19 -23 19 -42 q0 -26 -19 -43t-49 -17q-31 0 -48 18t-17 50q0 59 52.5 92.5t138.5 33.5q92 0 144 -35t52 -99v-261q0 -28 21 -28q7 0 11 4zM293 97v148q-122 -34 -122 -121q0 -32 14.5 -49.5t37.5 -17.5q42 0 70 40z" />
+<glyph unicode="&#x1fc;" horiz-adv-x="1000" d="M951 211l-41 -211h-566v25q55 3 71.5 20.5t16.5 73.5v184h-190l-100 -188q-15 -29 -15 -45q0 -21 13.5 -29.5t52.5 -13.5l17 -2v-25h-206v25q30 5 46 23t64 105l220 402q28 50 28 62q0 18 -19 26t-68 11v22h634v-201h-25q-16 80 -44 114q-42 52 -181 52q-40 0 -53.5 -6 t-13.5 -24v-248q88 7 111 29.5t44 119.5h23v-338h-23q-14 93 -42.5 122.5t-112.5 34.5v-243q0 -32 15.5 -43t58.5 -11q126 0 186 61q26 27 48 60.5t28 55.5h23zM432 343v290h-7l-161 -290h168zM476 738l137 157q25 28 53 28q22 0 35 -12t13 -32q0 -17 -8 -27.5t-32 -25.5 l-142 -88h-56z" />
+<glyph unicode="&#x1fd;" horiz-adv-x="722" d="M673 129l21 -15q-44 -68 -91.5 -95.5t-118.5 -27.5q-101 0 -147 84h-6q-72 -89 -180 -89q-118 0 -118 108q0 55 59 105q50 42 204 86v75q0 44 -18 62.5t-60 18.5q-28 0 -46.5 -10t-18.5 -25q0 -9 12 -22q17 -20 17 -43q0 -28 -18.5 -45t-48.5 -17q-31 0 -48 19.5 t-17 49.5q0 54 52 89.5t132 35.5q95 0 140 -51q46 51 127 51q56 0 100 -26.5t66 -74.5q21 -45 21 -124h-254v-23q0 -85 26.5 -124.5t88.5 -39.5q69 0 124 68zM567 285v33q0 70 -14 97.5t-49 27.5q-38 0 -54 -37t-16 -121h133zM296 81v167q-66 -24 -92.5 -52.5t-26.5 -75.5 q0 -71 57 -71q31 0 62 32zM255 528l137 157q25 28 53 28q22 0 35 -12t13 -32q0 -17 -8 -27.5t-32 -25.5l-142 -88h-56z" />
+<glyph unicode="&#x1fe;" horiz-adv-x="778" d="M685 737l-78 -115q65 -53 93 -106q43 -80 43 -180q0 -156 -99.5 -255.5t-254.5 -99.5q-99 0 -187 49l-71 -104h-50l86 126q-44 38 -66.5 68t-40.5 75q-25 65 -25 140q0 155 100 255.5t255 100.5q94 0 182 -47l63 93h50zM234 151l286 418q-26 48 -56.5 68.5t-74.5 20.5 q-85 0 -131 -85.5t-46 -244.5q0 -99 22 -177zM540 524l-287 -420q26 -48 57.5 -69t78.5 -21q87 0 132 80.5t45 236.5q0 109 -26 193zM270 738l137 157q25 28 53 28q22 0 35 -12t13 -32q0 -17 -8 -27.5t-32 -25.5l-142 -88h-56z" />
+<glyph unicode="&#x1ff;" horiz-adv-x="500" d="M461 549l-73 -123q88 -79 88 -197q0 -105 -64 -174t-161 -69q-56 0 -107 27l-63 -105h-47l76 128q-85 79 -85 193q0 105 64.5 174.5t162.5 69.5q53 0 103 -25l60 101h46zM173 140l143 242q-10 33 -24.5 46.5t-39.5 13.5q-47 0 -63.5 -48.5t-16.5 -184.5q0 -49 1 -69z M327 324l-144 -244q18 -63 68 -63q43 0 60.5 44.5t17.5 155.5q0 60 -2 107zM131 528l137 157q25 28 53 28q22 0 35 -12t13 -32q0 -17 -8 -27.5t-32 -25.5l-142 -88h-56z" />
+<glyph unicode="&#x237;" horiz-adv-x="333" d="M260 461v-459q0 -84 -27 -129q-43 -76 -150 -76q-62 0 -101 28t-39 72q0 27 17 44t45 17q25 0 42 -15.5t17 -38.5q0 -16 -14 -37q-9 -15 -9 -22q0 -17 32 -17q25 0 36.5 18t11.5 58v474q0 32 -12.5 44t-50.5 15v24h202z" />
+<glyph unicode="&#x250;" horiz-adv-x="512" d="M28 395l-15 21q53 57 112 57q37 0 55.5 -15.5t26.5 -53.5q76 69 159 69q50 0 80 -26.5t30 -79.5q0 -67 -67 -112q-50 -33 -201 -76v-68q0 -49 18.5 -71t62.5 -22q28 0 46.5 10t18.5 27q0 11 -11 23q-19 23 -19 42q0 26 19 43t49 17q31 0 48 -18t17 -50q0 -59 -52.5 -92.5 t-138.5 -33.5q-92 0 -144 35t-52 99v261q0 28 -21 28q-7 0 -11 -4zM208 362v-148q122 34 122 121q0 32 -14.5 49.5t-37.5 17.5q-42 0 -70 -40z" />
+<glyph unicode="&#x251;" horiz-adv-x="608" d="M594 50l-194 -58v53q-1 -1 -10 -9t-15 -12.5t-20 -12.5t-27 -13t-32.5 -8.5t-40.5 -3.5t-44 3.5t-56.5 17.5t-59.5 37.5t-44.5 68.5t-18.5 104q0 105 69.5 180.5t176.5 75.5q67 0 122 -46l106 46h14v-388q0 -25 15 -25q6 0 59 7v-17zM400 109v231q0 47 -32.5 74t-68.5 27 q-49 0 -86.5 -47t-37.5 -141q0 -105 42.5 -157t103.5 -52q25 0 52 19.5t27 45.5z" />
+<glyph unicode="&#x252;" horiz-adv-x="608" d="M226 467v-53q1 1 10 9t15 12.5t20 12.5t27 13t32.5 8.5t40.5 3.5t44 -3.5t56.5 -17.5t59.5 -37.5t44.5 -68.5t18.5 -104q0 -105 -69.5 -180.5t-176.5 -75.5q-67 0 -122 46l-106 -46h-14v388q0 25 -15 25q-6 0 -59 -7v17zM226 350v-231q0 -47 32.5 -74t68.5 -27 q49 0 86.5 47t37.5 141q0 105 -42.5 157t-103.5 52q-25 0 -52 -19.5t-27 -45.5z" />
+<glyph unicode="&#x253;" horiz-adv-x="560" d="M213 586v-169q53 56 122 56q83 0 135.5 -65t52.5 -169q0 -113 -63 -183t-163 -70q-70 0 -132 57l-79 -56h-12v479q0 126 40 174q42 51 135 51q64 0 103 -28t39 -72q0 -28 -17 -46t-44 -18q-25 0 -42.5 17t-17.5 40q0 20 11 36.5t11 20.5q0 19 -29 19q-26 0 -38 -17 t-12 -57zM213 360v-263q0 -36 19 -57.5t50 -21.5q94 0 94 203q0 198 -93 198q-25 0 -41 -13.5t-29 -45.5z" />
+<glyph unicode="&#x254;" horiz-adv-x="472" d="M33 350l-18 18q41 56 86 80.5t105 24.5q95 0 154.5 -65t59.5 -171q0 -110 -68 -180.5t-169 -70.5q-66 0 -110 31t-44 79q0 29 18.5 46.5t49.5 17.5q26 0 41 -19t15 -54q0 -18 0.5 -26t2.5 -18.5t6 -15t12.5 -7.5t20.5 -3q38 0 61 44.5t23 124.5q0 102 -37 161t-102 59 q-58 0 -107 -56z" />
+<glyph unicode="&#x255;" horiz-adv-x="477" d="M107 -161l77 156q-52 14 -91 53q-63 63 -63 174q0 110 68 180.5t169 70.5q66 0 110 -31t44 -79q0 -29 -18.5 -46.5t-49.5 -17.5q-26 0 -41 19t-15 54q0 18 -0.5 26t-2.5 18.5t-6 15t-12.5 7.5t-20.5 3q-38 0 -61 -44.5t-23 -124.5q0 -128 56 -195q25 37 36.5 51t33.5 26 t51 12q44 0 70.5 -23t26.5 -60q0 -44 -34 -74.5t-97 -30.5q-67 0 -86 4l-73 -144h-48zM401 84q0 21 -16 32t-37 11q-24 0 -43 -17t-45 -59q13 -11 36.5 -19.5t36.5 -8.5q68 0 68 61z" />
+<glyph unicode="&#x256;" horiz-adv-x="602" d="M482 676v-799q0 -44 11.5 -61.5t38.5 -17.5q29 0 29 19q0 4 -11 20.5t-11 36.5q0 23 17.5 40t42.5 17q27 0 44 -18t17 -46q0 -44 -39 -72t-103 -28q-93 0 -135 51q-40 48 -40 175v59q-36 -38 -63.5 -52t-66.5 -14q-79 0 -130 66t-51 169q0 109 54.5 180.5t137.5 71.5 q34 0 60.5 -13.5t58.5 -48.5v183q0 35 -13 44.5t-63 13.5v24h215zM343 112v243q-11 29 -32 45.5t-46 16.5q-85 0 -85 -188q0 -187 78 -187q36 0 66 37q19 25 19 33z" />
+<glyph unicode="&#x257;" horiz-adv-x="650" d="M343 411v64q0 109 40 157q42 51 135 51q64 0 103 -28t39 -72q0 -28 -17 -46t-44 -18q-25 0 -42.5 17t-17.5 40q0 20 11 36.5t11 20.5q0 19 -29 19q-26 0 -38 -15t-12 -52v-484q0 -32 12.5 -44t46.5 -14v-23l-62 -8q-82 -11 -133 -25v65q-35 -37 -64 -51.5t-69 -14.5 q-79 0 -130 66t-51 169q0 109 54.5 180.5t137.5 71.5q34 0 60.5 -13.5t58.5 -48.5zM343 112v243q-11 29 -32 45.5t-46 16.5q-85 0 -85 -188q0 -187 78 -187q36 0 66 37q19 25 19 33z" />
+<glyph unicode="&#x258;" horiz-adv-x="457" d="M283 245h-252q6 120 59 178q45 50 128 50q94 0 151.5 -68.5t57.5 -180.5q0 -103 -57 -170.5t-147 -67.5q-65 0 -109.5 28t-88.5 98l24 14q31 -37 57 -52.5t58 -15.5q35 0 58.5 15t35.5 44t17 57.5t8 70.5zM154 282h134q0 87 -17 123.5t-53 36.5q-20 0 -31.5 -11 t-23.5 -36q-9 -19 -9 -92v-21z" />
+<glyph unicode="&#x259;" horiz-adv-x="457" d="M43 333l-24 14q44 70 88.5 98t109.5 28q90 0 147 -67.5t57 -170.5q0 -112 -57.5 -180.5t-151.5 -68.5q-83 0 -128 50q-53 58 -59 178h252q-3 42 -8 70.5t-17 57.5t-35.5 44t-58.5 15q-32 0 -58 -15.5t-57 -52.5zM282 177h-134v-21q0 -73 9 -92q12 -25 23.5 -36t31.5 -11 q36 0 53 36.5t17 123.5z" />
+<glyph unicode="&#x25a;" horiz-adv-x="688" d="M677 289l-11 -27q-10 -25 -32.5 -41t-50.5 -16q-40 0 -61.5 21.5t-21.5 61.5q0 86 1 93l-72 -43q14 -45 14 -103q0 -112 -57.5 -180.5t-151.5 -68.5q-83 0 -128 50q-25 28 -39 64t-15 62l252 146q-11 42 -45 67.5t-79 25.5q-32 0 -58 -15.5t-57 -52.5l-24 14 q46 74 91 100t107 26q112 0 172 -103l118 71l13 -12q-5 -85 -5 -140q0 -20 13 -33.5t32 -13.5q22 0 36 12t19 23l10 25zM304 178v88l-129 -75v-53q0 -121 61 -121q68 0 68 161z" />
+<glyph unicode="&#x25b;" horiz-adv-x="493" d="M416 102l23 -18q-44 -61 -94 -79.5t-119 -18.5q-81 0 -141 34.5t-60 102.5q0 44 33 78.5t85 48.5q-47 21 -69 45t-22 63q0 115 189 117q45 0 80 -10t64.5 -35t29.5 -49q0 -51 -50 -51q-28 0 -41.5 14.5t-29.5 55.5q-15 38 -56 38q-36 0 -51 -20.5t-15 -67.5 q0 -29 22 -50.5t48 -29.5q16 -5 52 -6v-37h-53q-36 0 -56.5 -26.5t-20.5 -71.5q0 -42 25.5 -68t65.5 -26q52 0 89 13.5t72 53.5z" />
+<glyph unicode="&#x25c;" horiz-adv-x="493" d="M170 227v37q36 1 52 6q26 8 48 29.5t22 50.5q0 47 -15 67.5t-51 20.5q-41 0 -56 -38q-16 -41 -29.5 -55.5t-41.5 -14.5q-50 0 -50 51q0 24 29.5 49t64.5 35t80 10q189 -2 189 -117q0 -39 -22 -63t-69 -45q52 -14 85 -48.5t33 -78.5q0 -68 -60 -102.5t-141 -34.5 q-69 0 -119 18.5t-94 79.5l23 18q35 -40 72 -53.5t89 -13.5q40 0 65.5 26t25.5 68q0 45 -20.5 71.5t-56.5 26.5h-53z" />
+<glyph unicode="&#x25d;" horiz-adv-x="683" d="M658 289l-11 -27q-10 -25 -32.5 -41t-50.5 -16q-40 0 -61.5 21.5t-21.5 61.5q0 86 1 93l-72 -44q-6 -30 -27.5 -49.5t-61.5 -37.5q52 -14 85.5 -49t33.5 -78q0 -68 -60.5 -102.5t-141.5 -34.5q-68 0 -119 19t-94 79l23 18q35 -40 72 -53.5t89 -13.5q40 0 65.5 26t25.5 68 q0 45 -20.5 71.5t-56.5 26.5h-53v37q36 1 52 6q26 8 48 29.5t22 50.5q0 48 -15 68t-53 20q-39 0 -54 -38q-16 -41 -29.5 -55.5t-41.5 -14.5q-50 0 -50 51q0 24 29.5 49t64.5 35t80 10q169 -2 187 -94l100 60l13 -12q-5 -85 -5 -140q0 -20 13 -33.5t32 -13.5q22 0 36 12 t19 23l10 25z" />
+<glyph unicode="&#x25e;" horiz-adv-x="523" d="M469 123q0 -69 -60.5 -103t-152.5 -34q-33 0 -68 10t-74 34.5t-64 77t-25 125.5q0 108 65 175t155 67q197 0 197 -117q0 -39 -22 -63t-69 -45q52 -14 85 -48.5t33 -78.5zM200 227v37q36 1 52 6q26 8 48 29.5t22 50.5q0 48 -15 68t-53 20q-64 0 -111.5 -56.5t-47.5 -139.5 q0 -91 42.5 -149t101.5 -58q40 0 65 26t25 68q0 45 -20 71.5t-56 26.5h-53z" />
+<glyph unicode="&#x25f;" horiz-adv-x="338" d="M314 461v-24q-51 0 -51 -60v-123h48v-46h-48v-206q0 -84 -27 -129q-43 -76 -150 -76q-62 0 -101 28t-39 72q0 27 17 44t45 17q25 0 42 -15.5t17 -38.5q0 -16 -14 -37q-9 -15 -9 -22q0 -17 32 -17q25 0 36.5 18t11.5 58v304h-101v46h101v123q0 32 -12.5 45.5t-50.5 14.5 v24h253z" />
+<glyph unicode="&#x260;" horiz-adv-x="627" d="M345 -68v110q-44 -56 -123 -56t-132 63.5t-53 169.5q0 108 61.5 181t160.5 73q47 0 86 -22q0 132 40 181q42 51 135 51q64 0 103 -28t39 -72q0 -28 -17 -46t-44 -18q-25 0 -42.5 17t-17.5 40q0 20 11 36.5t11 20.5q0 19 -29 19q-27 0 -38.5 -17.5t-11.5 -61.5v-591 q0 -26 -7.5 -62t-19.5 -56q-62 -109 -206 -109q-88 0 -141 28q-55 29 -55 82q0 27 17 44t45 17q25 0 42 -15.5t17 -38.5q0 -16 -14 -37q-9 -15 -9 -22q0 -14 22.5 -20.5t44.5 -6.5q53 0 89 50t36 96zM345 98v256q0 41 -18.5 64t-48.5 23q-44 0 -69.5 -51t-25.5 -154 q0 -98 25 -147t68 -49q28 0 48.5 15.5t20.5 42.5z" />
+<glyph unicode="&#x261;" horiz-adv-x="571" d="M484 472v-490q0 -26 -7.5 -62t-19.5 -56q-62 -109 -206 -109q-88 0 -141 28q-55 29 -55 82q0 27 17 44t45 17q25 0 42 -15.5t17 -38.5q0 -16 -14 -37q-9 -15 -9 -22q0 -14 22.5 -20.5t44.5 -6.5q53 0 89 50t36 96v110q-44 -56 -123 -56t-132 63.5t-53 169.5 q0 108 61.5 181t160.5 73q38 0 66 -12t66 -44l77 55h16zM345 98v256q0 41 -18.5 64t-48.5 23q-44 0 -69.5 -51t-25.5 -154q0 -98 25 -147t68 -49q28 0 48.5 15.5t20.5 42.5z" />
+<glyph unicode="&#x262;" horiz-adv-x="590" d="M555 192v-16q-38 -4 -50 -18.5t-12 -48.5v-78q-76 -42 -200 -42q-112 0 -185 63.5t-73 168.5q0 100 72.5 170t179.5 70q47 0 114 -24q18 -9 31 -9q11 0 18 6t16 25h19v-156h-18q-21 40 -34.5 59.5t-35.5 39.5q-43 37 -100 37q-64 0 -99.5 -55t-35.5 -157t37 -159t112 -57 q68 0 68 56v59q0 27 -13.5 37.5t-59.5 12.5v16h249z" />
+<glyph unicode="&#x263;" horiz-adv-x="532" d="M507 437h-13q-21 0 -42 -58l-107 -291l43 -106q32 -78 32 -109q0 -47 -35 -76.5t-86 -29.5q-115 0 -115 91q0 22 21 70l33 73l-128 312q-20 48 -49 106q-7 15 -37 18v24h249v-24q-52 0 -52 -24q0 -11 31 -88l61 -158l66 183q13 35 13 55q0 9 -2.5 15t-9 9.5t-9.5 4.5 t-12.5 2.5t-10.5 1.5v23h159v-24zM270 -67l-19 -47q-8 -20 -8 -36q0 -44 31 -44q26 0 26 34q0 22 -7 39z" />
+<glyph unicode="&#x264;" horiz-adv-x="514" d="M275 263l95 142q29 45 62 45t49 -23.5t16 -57.5q0 -29 -13 -68h-10q-17 53 -47 53q-31 0 -50 -30l-70 -108l43 -72q27 -44 27 -75q0 -38 -40.5 -58.5t-82.5 -20.5q-40 0 -67.5 21.5t-27.5 60.5q0 29 24 63l37 52l-60 93q-2 4 -10 16l-14 21q-5 8 -13.5 17.5t-17.5 14.5 t-18 5q-29 0 -48 -53h-10q-12 31 -12 56q0 37 24 64.5t60 27.5q54 0 104 -78zM290 57q0 16 -38 78q-2 -2 -6.5 -8.5t-5.5 -8.5l-6 -8q-4 -5 -5.5 -8t-4 -8.5t-3 -9.5t-1.5 -9.5t-1 -11.5q0 -17 10 -28.5t27 -11.5q14 0 24 10.5t10 23.5z" />
+<glyph unicode="&#x265;" horiz-adv-x="550" d="M536 -226h-193v280q-65 -77 -147 -77q-60 0 -95 38t-35 98v250q0 34 -11.5 48.5t-37.5 14.5v24h234v-24q-25 -3 -35.5 -16.5t-10.5 -44.5v-224q0 -54 11 -75.5t40 -21.5q36 0 70 34q17 17 17 24v263q0 31 -10 44t-38 17v24h240v-24q-36 -7 -44.5 -16t-8.5 -49v-502 q0 -35 9 -44.5t45 -16.5v-24z" />
+<glyph unicode="&#x266;" horiz-adv-x="550" d="M532 0h-234v24q25 3 35.5 16.5t10.5 44.5v224q0 54 -11 75.5t-40 21.5q-36 0 -70 -34q-17 -17 -17 -24v-263q0 -31 10 -44t38 -17v-24h-240v24q36 7 44.5 16t8.5 49v393q0 102 40 150q42 51 135 51q64 0 103 -28t39 -72q0 -28 -17 -46t-44 -18q-25 0 -42.5 17t-17.5 40 q0 20 11 36.5t11 20.5q0 19 -29 19q-26 0 -38 -15t-12 -52v-189q65 77 147 77q60 0 95 -38t35 -98v-250q0 -34 11.5 -48.5t37.5 -14.5v-24z" />
+<glyph unicode="&#x267;" horiz-adv-x="556" d="M485 337v-337q0 -84 -27 -129q-43 -76 -150 -76q-62 0 -101 28t-39 72q0 27 17 44t45 17q25 0 42 -15.5t17 -38.5q0 -16 -14 -37q-9 -15 -9 -22q0 -17 32 -17q48 0 48 65v418q0 54 -11 75.5t-40 21.5q-36 0 -70 -34q-17 -17 -17 -24v-263q0 -31 10 -44t38 -17v-24h-240 v24q36 7 44.5 16t8.5 49v393q0 102 40 150q42 51 135 51q64 0 103 -28t39 -72q0 -28 -17 -46t-44 -18q-25 0 -42.5 17t-17.5 40q0 20 11 36.5t11 20.5q0 19 -29 19q-26 0 -38 -15t-12 -52v-189q65 77 147 77q60 0 95 -38t35 -98z" />
+<glyph unicode="&#x268;" horiz-adv-x="292" d="M221 613q0 -33 -22.5 -55t-55.5 -22t-55 22t-22 55t22.5 55.5t56.5 22.5q31 0 53.5 -23t22.5 -55zM262 0h-240v24q35 8 44 19t9 45v135h-53v46h53v104q0 33 -10.5 45t-43.5 19v24h193v-192h45v-46h-45v-138q0 -32 10.5 -44.5t37.5 -16.5v-24z" />
+<glyph unicode="&#x269;" horiz-adv-x="366" d="M323 95l16 -17q-52 -86 -143 -86q-117 0 -117 136v212q0 48 -12 48q-16 0 -45 -10v27q135 51 177 51q19 0 19 -28v-321q0 -30 11 -43.5t23 -13.5q36 0 71 45z" />
+<glyph unicode="&#x26a;" horiz-adv-x="297" d="M264 0h-238v17q39 4 51.5 14t12.5 42v319q0 29 -13.5 39.5t-50.5 12.5v17h238v-17q-37 -2 -50 -12.5t-13 -39.5v-319q0 -33 12 -43.5t51 -12.5v-17z" />
+<glyph unicode="&#x26b;" horiz-adv-x="395" d="M337 433h43q-34 -127 -115 -127v-219q0 -33 12 -47.5t38 -15.5v-24h-240v24q51 4 51 63v264q-12 4 -20 4q-19 0 -32.5 -13t-16.5 -34h-42q25 122 111 125v154q0 61 -52 65v24h191v-289q7 -3 18 -3q20 0 32 11t22 38z" />
+<glyph unicode="&#x26c;" horiz-adv-x="446" d="M417 384l11 -21q-5 -8 -14.5 -21t-43 -44t-71.5 -50v-161q0 -33 12 -47.5t38 -15.5v-24h-240v24q51 4 51 63v143q-10 -1 -27 -1q-49 0 -82.5 30t-33.5 84q0 57 34 86t82 29q7 0 27 -5v134q0 61 -52 65v24h191v-376q52 18 118 84zM160 276v141q-10 4 -23 4 q-22 0 -41 -21.5t-19 -46.5q0 -65 54 -76q5 -1 29 -1z" />
+<glyph unicode="&#x26d;" horiz-adv-x="326" d="M206 676v-786q0 -37 12.5 -64.5t35.5 -27.5q32 0 32 17q0 7 -9 22q-14 21 -14 37q0 23 17 38.5t42 15.5q28 0 45 -17t17 -44q0 -44 -39 -72t-101 -28q-104 0 -150 76q-27 45 -27 99v645q0 61 -52 65v24h191z" />
+<glyph unicode="&#x26e;" horiz-adv-x="619" d="M587 423l-194 -197q22 6 53 6q59 0 108 -57.5t49 -148.5q0 -87 -34.5 -147t-73.5 -86q-46 -29 -113 -29q-38 0 -78.5 9t-62.5 24q-47 32 -47 71q0 20 14.5 35t44.5 15q57 0 67 -67q4 -22 24 -36t45 -14q87 0 87 207q0 66 -19.5 113t-64.5 47q-62 0 -109 -47l-27 24 l228 232h-204q-16 0 -35 -14.5t-30 -39.5v-236q0 -33 12 -47.5t38 -15.5v-24h-240v24q51 4 51 63v500q0 61 -52 65v24h191v-226h372v-27z" />
+<glyph unicode="&#x26f;" horiz-adv-x="828" d="M815 12h-192v75h-3q-29 -46 -62.5 -66.5t-81.5 -20.5q-47 0 -76 20t-52 67q-39 -48 -71.5 -67.5t-75.5 -19.5q-62 0 -98.5 38t-36.5 104v248q0 32 -10.5 45t-39.5 14v24h237v-24q-28 -2 -38 -14.5t-10 -44.5v-228q0 -95 53 -95q29 0 58 25q9 7 18 18t9 15v265 q0 29 -10 42.5t-36 16.5v24h232v-24q-27 -2 -37 -15t-10 -44v-240q0 -45 12.5 -64t41.5 -19q19 0 51.5 22.5t32.5 39.5v261q0 29 -9.5 42t-35.5 17v24h239v-24q-33 -6 -44 -18.5t-11 -43.5v-287q0 -35 11 -47t45 -17v-24z" />
+<glyph unicode="&#x270;" horiz-adv-x="859" d="M836 -233h-272v24q33 6 44.5 17t11.5 37v242q-29 -46 -62.5 -66.5t-81.5 -20.5q-47 0 -76 20t-52 67q-39 -48 -71.5 -67.5t-75.5 -19.5q-62 0 -98.5 38t-36.5 104v248q0 32 -10.5 45t-39.5 14v24h237v-24q-28 -2 -38 -14.5t-10 -44.5v-228q0 -95 53 -95q29 0 58 25 q9 7 18 18t9 15v265q0 29 -10 42.5t-36 16.5v24h232v-24q-27 -2 -37 -15t-10 -44v-240q0 -45 12.5 -64t41.5 -19q19 0 51.5 22.5t32.5 39.5v261q0 29 -9.5 42t-35.5 17v24h239v-24q-33 -6 -44 -18.5t-11 -43.5v-494q0 -52 16.5 -76t60.5 -26v-24z" />
+<glyph unicode="&#x271;" horiz-adv-x="847" d="M770 331v-359q0 -84 -27 -129q-43 -76 -150 -76q-62 0 -101 28t-39 72q0 27 17 44t45 17q25 0 42 -15.5t17 -38.5q0 -16 -14 -37q-9 -15 -9 -22q0 -17 32 -17q48 0 48 65v448q0 95 -53 95q-29 0 -58 -25q-9 -7 -18 -18t-9 -15v-265q0 -29 10 -42.5t36 -16.5v-24h-232v24 q27 2 37 15t10 44v240q0 45 -12.5 64t-41.5 19q-19 0 -51.5 -22.5t-32.5 -39.5v-261q0 -29 9.5 -42t35.5 -17v-24h-239v24q33 6 44 18.5t11 43.5v287q0 35 -11 47t-45 17v24h192v-75h3q29 46 62.5 66.5t81.5 20.5q47 0 76 -20t52 -67q39 48 71.5 67.5t75.5 19.5 q62 0 98.5 -38t36.5 -104z" />
+<glyph unicode="&#x272;" horiz-adv-x="625" d="M586 0h-234v24q25 3 35.5 16.5t10.5 43.5v237q0 85 -51 85q-36 0 -70 -34q-17 -17 -17 -24v-392q0 -67 -27 -113q-43 -76 -150 -76q-62 0 -101 28t-39 72q0 27 17 44t45 17q25 0 42 -15.5t17 -38.5q0 -16 -14 -37q-9 -15 -9 -22q0 -17 32 -17q48 0 48 65v513q0 32 -10 44 t-43 17v24h191v-75q51 87 143 87q62 0 98.5 -38.5t36.5 -103.5v-247q0 -34 10 -46t39 -14v-24z" />
+<glyph unicode="&#x273;" horiz-adv-x="610" d="M490 331v-448q0 -34 13 -59.5t35 -25.5q32 0 32 17q0 7 -9 22q-14 21 -14 37q0 23 17 38.5t42 15.5q28 0 45 -17t17 -44q0 -44 -39 -72t-101 -28q-104 0 -150 76q-27 44 -27 90v388q0 85 -51 85q-36 0 -70 -34q-17 -17 -17 -24v-264q0 -29 10.5 -42.5t37.5 -17.5v-24 h-240v24q33 7 43 19t10 44v289q0 32 -10 44t-43 17v24h191v-75h1q49 87 142 87q62 0 98.5 -38.5t36.5 -103.5z" />
+<glyph unicode="&#x274;" horiz-adv-x="604" d="M558 461v-17q-38 -5 -48.5 -14.5t-10.5 -41.5v-400h-23l-342 371v-271q0 -39 14.5 -52.5t58.5 -18.5v-17h-173v17q41 5 53.5 15t12.5 41v323q-38 48 -64 48v17h161l268 -294v205q0 40 -14 54.5t-56 17.5v17h163z" />
+<glyph unicode="&#x275;" horiz-adv-x="520" d="M485 229q0 -105 -64.5 -174t-161.5 -69q-95 0 -160 68.5t-65 173.5q0 109 64.5 177t164.5 68q95 0 158.5 -69t63.5 -175zM181 253h156q-2 104 -19.5 146.5t-57.5 42.5q-42 0 -59.5 -42t-19.5 -147zM338 207h-157q0 -106 17.5 -148t61.5 -42q43 0 60 40.5t18 149.5z" />
+<glyph unicode="&#x276;" horiz-adv-x="741" d="M713 141l-30 -143h-306q-60 0 -78 -1q-20 -2 -29 -2q-105 0 -163 48q-79 64 -79 182q0 128 97 195q59 41 145 41q3 0 18.5 -1.5t42 -2.5t55.5 -1h298v-136h-18q-8 40 -19.5 60.5t-34.5 33.5q-30 18 -115 18q-21 0 -28.5 -4t-7.5 -14v-166q58 2 75.5 18t30.5 80h18v-229 h-18q-8 61 -29 82.5t-77 24.5v-170q0 -20 10 -26t41 -6q79 0 120 34q35 28 61 85h20zM349 142v197q0 64 -12 80q-12 18 -56 18q-131 0 -131 -223q0 -108 28 -150q30 -45 96 -45q46 0 62 19q13 15 13 104z" />
+<glyph unicode="&#x277;" horiz-adv-x="696" d="M653 196q0 -81 -53.5 -139.5t-138.5 -58.5q-34 0 -64.5 13.5t-48.5 34.5q-43 -48 -115 -48q-84 0 -137.5 58.5t-53.5 139.5q0 124 92.5 202.5t214.5 78.5q117 0 210.5 -79t93.5 -202zM512 212q0 118 -47.5 179.5t-115.5 61.5q-69 0 -117.5 -61.5t-48.5 -179.5 q0 -61 14.5 -114.5t49.5 -53.5q20 0 40.5 21.5t20.5 51.5q0 27 -11.5 68.5t-11.5 66.5q0 35 12.5 55t50.5 20q37 0 50 -20t13 -55q0 -25 -12 -66.5t-12 -68.5q0 -30 19.5 -51.5t40.5 -21.5q65 0 65 168z" />
+<glyph unicode="&#x278;" horiz-adv-x="713" d="M426 591v-156q41 -4 81.5 -19t77 -40t59.5 -65.5t23 -89.5q0 -90 -76 -153t-165 -69v-138q0 -41 13.5 -53.5t54.5 -14.5v-24h-277v24q41 3 55.5 17t14.5 54v135q-90 6 -166 69t-76 153q0 64 40 113t93 72.5t109 28.5v153q0 41 -14.5 55.5t-55.5 17.5v24h277v-24 q-41 -2 -54.5 -15t-13.5 -55zM426 398v-360q42 21 71 73.5t29 111.5q0 62 -28.5 110.5t-71.5 64.5zM287 39v359q-43 -17 -72 -65t-29 -110q0 -58 29.5 -110.5t71.5 -73.5z" />
+<glyph unicode="&#x279;" horiz-adv-x="456" d="M441 2h-190v82q-35 -51 -66 -72.5t-69 -21.5q-35 0 -58 22.5t-23 56.5q0 30 17.5 49t45.5 19q37 0 60 -38q14 -23 28 -23q26 0 43.5 30t17.5 74v177q0 48 -13.5 63.5t-58.5 18.5v24h265v-24q-33 -6 -43.5 -17.5t-10.5 -42.5v-289q0 -35 11 -47t44 -17v-24z" />
+<glyph unicode="&#x27a;" horiz-adv-x="456" d="M441 2h-190v82q-35 -51 -66 -72.5t-69 -21.5q-35 0 -58 22.5t-23 56.5q0 30 17.5 49t45.5 19q37 0 60 -38q14 -23 28 -23q26 0 43.5 30t17.5 74v407q0 61 -52 65v24h191v-586q0 -35 11 -47t44 -17v-24z" />
+<glyph unicode="&#x27b;" horiz-adv-x="506" d="M386 379v-496q0 -34 13 -59.5t35 -25.5q32 0 32 17q0 7 -9 22q-14 21 -14 37q0 23 17 38.5t42 15.5q28 0 45 -17t17 -44q0 -44 -39 -72t-101 -28q-104 0 -150 76q-27 46 -27 83v152q-35 -50 -65 -69t-66 -19q-35 0 -58 22.5t-23 56.5q0 30 17.5 49t45.5 19q37 0 60 -38 q14 -23 28 -23q26 0 43.5 30t17.5 74v177q0 48 -13.5 63.5t-58.5 18.5v24h265v-24q-33 -6 -43.5 -17.5t-10.5 -42.5z" />
+<glyph unicode="&#x27c;" horiz-adv-x="426" d="M200 461v-82q35 51 66 72.5t69 21.5q35 0 58 -22.5t23 -56.5q0 -30 -17.5 -49t-45.5 -19q-37 0 -60 38q-14 23 -28 23q-26 0 -43.5 -30t-17.5 -74v-410q0 -48 13.5 -63.5t58.5 -18.5v-24h-265v24q33 6 43.5 17.5t10.5 42.5v522q0 35 -11 47t-44 17v24h190z" />
+<glyph unicode="&#x27d;" horiz-adv-x="454" d="M202 461v-82q35 51 66 72.5t69 21.5q35 0 58 -22.5t23 -56.5q0 -30 -17.5 -49t-45.5 -19q-37 0 -60 38q-14 23 -28 23q-26 0 -43.5 -30t-17.5 -74v-406q0 -32 13 -55.5t35 -23.5q32 0 32 17q0 7 -9 22q-14 21 -14 37q0 23 17 38.5t42 15.5q28 0 45 -17t17 -44 q0 -44 -39 -72t-101 -28q-104 0 -150 76q-27 46 -27 83v447q0 35 -11 47t-44 17v24h190z" />
+<glyph unicode="&#x27e;" horiz-adv-x="359" d="M69 84v178q0 122 40 171q42 51 135 51q64 0 103 -28t39 -72q0 -28 -17 -46t-44 -18q-25 0 -42.5 17t-17.5 40q0 20 11 36.5t11 20.5q0 19 -29 19q-50 0 -50 -73v-274q0 -48 13.5 -63.5t58.5 -18.5v-24h-265v24q33 6 43.5 17.5t10.5 42.5z" />
+<glyph unicode="&#x27f;" horiz-adv-x="404" d="M381 0h-265v24q45 3 58.5 18.5t13.5 63.5v274q0 73 -50 73q-29 0 -29 -19q0 -4 11 -20.5t11 -36.5q0 -23 -17.5 -40t-42.5 -17q-27 0 -44 18t-17 46q0 44 39 72t103 28q93 0 135 -51q40 -49 40 -171v-178q0 -31 10.5 -42.5t43.5 -17.5v-24z" />
+<glyph unicode="&#x280;" horiz-adv-x="516" d="M495 0h-141l-142 215h-19v-134q0 -38 9.5 -48.5t50.5 -15.5v-17h-232v17q40 5 50 15t10 51v295q0 41 -11.5 54t-48.5 15v17h211q204 0 204 -118q0 -52 -32 -81q-31 -28 -76 -39l137 -194q10 -15 30 -15v-17zM193 410v-172q71 1 98 21t27 80q0 55 -20.5 78.5t-68.5 23.5 q-20 0 -28 -7t-8 -24z" />
+<glyph unicode="&#x281;" horiz-adv-x="516" d="M495 464v-17q-20 0 -30 -15l-137 -194q45 -11 76 -39q32 -29 32 -81q0 -118 -204 -118h-211v17q37 2 48.5 15t11.5 54v295q0 41 -10 51t-50 15v17h232v-17q-41 -5 -50.5 -15.5t-9.5 -48.5v-134h19l142 215h141zM193 226v-172q0 -17 8 -24t28 -7q48 0 68.5 23.5t20.5 78.5 q0 60 -27 80t-98 21z" />
+<glyph unicode="&#x282;" horiz-adv-x="389" d="M340 326h-25q-19 56 -47 82q-34 32 -75 32q-28 0 -47 -16.5t-19 -41.5q0 -26 22.5 -46.5t73.5 -41.5q75 -31 106.5 -67t31.5 -89q0 -67 -43 -109.5t-111 -42.5q-52 0 -108 23q-15 6 -23 6q-20 0 -20 -27v-73q0 -102 101 -102q37 0 37 17q0 7 -9 22q-14 21 -14 37 q0 23 17 38.5t42 15.5q28 0 45 -17t17 -44q0 -44 -39 -72t-101 -28q-58 0 -92.5 29.5t-34.5 90.5v250h28q32 -132 137 -132q34 0 54.5 18t20.5 47q0 24 -22 44.5t-74 42.5q-75 32 -108.5 68.5t-33.5 86.5q0 63 44.5 104.5t112.5 41.5q34 0 78 -15q22 -7 31 -7q17 0 25 20h22 v-145z" />
+<glyph unicode="&#x283;" horiz-adv-x="458" d="M121 -106v599q0 85 45 137.5t129 52.5q52 0 81.5 -21t29.5 -57q0 -26 -15 -43.5t-39 -17.5q-23 0 -38 14t-15 33q0 14 9 29.5t9 18.5q0 5 -7 9.5t-16 4.5q-42 0 -42 -137v-559q0 -85 -46.5 -137.5t-130.5 -52.5q-52 0 -81.5 21t-29.5 57q0 26 15 43.5t39 17.5 q23 0 38 -14t15 -33q0 -14 -9 -29.5t-9 -18.5q0 -5 7 -9.5t16 -4.5q45 0 45 97z" />
+<glyph unicode="&#x284;" horiz-adv-x="373" d="M121 46v436q0 107 36 150q42 51 131 51q64 0 103 -28t39 -72q0 -28 -17 -46t-44 -18q-25 0 -42.5 17t-17.5 40q0 20 11 36.5t11 20.5q0 19 -29 19q-50 0 -50 -58v-548h62v-46h-62v-28q0 -84 -27 -129q-43 -76 -142 -76q-62 0 -101 28t-39 72q0 27 17 44t45 17 q25 0 42 -15.5t17 -38.5q0 -16 -14 -37q-9 -15 -9 -22q0 -17 32 -17q25 0 36.5 18t11.5 58v126h-64v46h64z" />
+<glyph unicode="&#x285;" horiz-adv-x="396" d="M295 280v-386q0 -97 45 -97q9 0 16 4.5t7 9.5q0 3 -9 18.5t-9 29.5q0 19 15 33t38 14q24 0 39 -17.5t15 -43.5q0 -36 -29.5 -57t-81.5 -21q-84 0 -130.5 52.5t-46.5 137.5v397q0 86 -44 86q-9 0 -16 -4.5t-7 -9.5q0 -3 9 -18.5t9 -29.5q0 -19 -15 -33t-38 -14 q-24 0 -39 17.5t-15 43.5q0 36 29.5 57t81.5 21q84 0 130 -52.5t46 -137.5z" />
+<glyph unicode="&#x286;" horiz-adv-x="399" d="M164 21v472q0 85 45 137.5t129 52.5q52 0 81.5 -21t29.5 -57q0 -26 -15 -43.5t-39 -17.5q-23 0 -38 14t-15 33q0 14 9 29.5t9 18.5q0 5 -7 9.5t-16 4.5q-42 0 -42 -130v-562q38 -43 54 -104q9 -35 9 -100h-34q0 76 -36 139q-15 -58 -58 -93.5t-110 -35.5q-64 0 -100 38 t-36 87q0 59 42.5 96t97.5 37q14 0 40 -4zM164 -106v86q-20 5 -43 5q-45 0 -71 -28t-26 -67q0 -25 21.5 -54t68.5 -29q50 0 50 87z" />
+<glyph unicode="&#x287;" horiz-adv-x="333" d="M332 84v-27q-49 -33 -82 -71.5t-85 -114.5h-25v169h-95v44h95v298q0 60 -39 60q-29 0 -57 -53l-25 11q31 62 64.5 87.5t83.5 25.5q52 0 82 -28.5t30 -78.5v-322h53z" />
+<glyph unicode="&#x288;" horiz-adv-x="339" d="M211 417v-540q0 -32 13 -55.5t35 -23.5q32 0 32 17q0 7 -9 22q-14 21 -14 37q0 23 17 38.5t42 15.5q28 0 45 -17t17 -44q0 -44 -39 -72t-101 -28q-104 0 -150 76q-27 46 -27 83v491h-53v27q49 33 82 71.5t85 114.5h25v-169h95v-44h-95z" />
+<glyph unicode="&#x289;" horiz-adv-x="556" d="M538 20l-63 -7q-83 -9 -132 -26v65q-39 -37 -71.5 -51.5t-73.5 -14.5q-63 0 -98 38t-35 107v92h-56v46h56v103q0 35 -9 47t-40 18v24h188v-192h138v105q0 34 -12 47t-49 16v24h200v-192h57v-46h-57v-118q0 -33 12 -47t45 -15v-23zM342 98v125h-138v-96q0 -76 56 -76 q39 0 82 47z" />
+<glyph unicode="&#x28a;" horiz-adv-x="500" d="M487 428h-75q-8 0 -14.5 -10.5t-6.5 -22.5q0 -18 11 -29q12 -12 28.5 -31.5t35.5 -55t19 -64.5q0 -96 -70 -159.5t-165 -63.5q-94 0 -164.5 63.5t-70.5 155.5q0 74 80 154q16 16 16 31q0 12 -8.5 22t-16.5 10h-73v24h186q-43 -140 -43 -246q0 -26 3.5 -54t12.5 -61 t29.5 -54t48.5 -21q30 0 51 21t29 55.5t11 60.5t3 54q0 106 -43 245h186v-24z" />
+<glyph unicode="&#x28b;" horiz-adv-x="534" d="M228 460v-334q0 -33 22 -59.5t53 -26.5q67 0 110 61.5t43 131.5q0 46 -14 79.5t-27 45t-33 23.5q-21 13 -30 23t-9 25q0 17 14 26.5t35 9.5q33 0 58 -24.5t37.5 -60.5t18 -68t5.5 -57q0 -106 -61.5 -185.5t-169.5 -79.5q-83 0 -137 36t-54 110v235q0 13 -21 13 q-16 0 -45 -9v23q94 28 197 67z" />
+<glyph unicode="&#x28c;" horiz-adv-x="500" d="M485 0h-250v24l18 2q35 4 35 24q0 8 -9 31l-79 203l-72 -182q-11 -26 -11 -45q0 -18 11.5 -24.5t43.5 -8.5v-24h-151v24q24 2 34 11.5t24 43.5l160 396h26l120 -296q47 -116 66 -141q8 -10 34 -14v-24z" />
+<glyph unicode="&#x28d;" horiz-adv-x="722" d="M707 0h-222v24q38 5 38 28q0 12 -39 115l-45 118l-68 -171l20 -62q6 -17 14 -21t31 -7v-24h-234v24q28 2 38 7t10 17q0 4 -27 106l-34 127l-70 -188q-9 -25 -9 -34q0 -17 10 -24.5t38 -10.5v-24h-135v24q19 4 29.5 14t20.5 36l155 401h23l102 -310l125 310h24l148 -374 q19 -47 28.5 -60t28.5 -17v-24z" />
+<glyph unicode="&#x28e;" horiz-adv-x="500" d="M482 0h-249v24l16 1q36 3 36 25q0 7 -20 58l-72 186l-68 -188q-11 -32 -11 -49q0 -18 11 -25t43 -8v-24h-152v24q24 3 36 13.5t24 41.5l148 398q45 121 77 156q31 33 84 33q43 0 70 -22t27 -57q0 -29 -17 -48t-45 -19q-25 0 -42.5 15t-17.5 37q0 4 2 14l1 6q0 7 -5 12 t-12 5q-38 0 -66 -82l-18 -53l119 -290q49 -121 67 -146q8 -10 34 -14v-24z" />
+<glyph unicode="&#x28f;" horiz-adv-x="633" d="M587 464v-17q-37 -6 -53 -27l-151 -214v-122q0 -40 12.5 -51.5t59.5 -15.5v-17h-274v17q48 4 60.5 17t12.5 54v93l-142 225q-25 38 -66 41v17h265v-17l-22 -2q-19 -2 -25.5 -3t-11.5 -5t-5 -12q0 -10 19 -40l95 -159l86 122q33 46 33 70q0 15 -13 20.5t-54 8.5v17h174z " />
+<glyph unicode="&#x290;" horiz-adv-x="531" d="M420 160l-20 -188q-7 -56 -7 -91q0 -28 15 -48t35 -20q36 0 36 17q0 7 -9 22q-14 21 -14 37q0 23 17 38.5t42 15.5q28 0 45 -17t17 -44q0 -44 -38 -72t-99 -28q-35 0 -59 23.5t-24 64.5q0 57 10 130h-346v25l234 404q-106 0 -139 -19t-52 -91h-26l7 142h371v-26 l-231 -403h29q61 0 91.5 12.5t55.5 46.5q20 30 31 69h28z" />
+<glyph unicode="&#x291;" horiz-adv-x="538" d="M185 32h93q42 79 77.5 113.5t76.5 34.5q85 0 85 -75q0 -47 -37.5 -76t-103.5 -29h-73q-61 -107 -82 -150h-43q46 88 84 150h-241v25l234 404q-106 0 -139 -19t-52 -91h-26l7 142h371v-26zM320 32h51q36 0 54 6q37 13 48.5 29.5t11.5 38.5q0 21 -16 31.5t-37 10.5 q-27 0 -58.5 -35.5t-53.5 -80.5z" />
+<glyph unicode="&#x292;" horiz-adv-x="440" d="M414 423l-194 -197q22 6 53 6q59 0 108 -57.5t49 -148.5q0 -87 -34.5 -147t-73.5 -86q-46 -29 -113 -29q-91 0 -141 33q-47 32 -47 71q0 20 14.5 35t44.5 15q57 0 67 -67q4 -22 24 -36t45 -14q87 0 87 207q0 66 -19.5 113t-64.5 47q-62 0 -109 -47l-27 24l228 232h-204 q-20 0 -44 -23.5t-29 -59.5h-26l34 156h372v-27z" />
+<glyph unicode="&#x293;" horiz-adv-x="440" d="M414 423l-194 -197q22 6 53 6q55 0 106 -54.5t51 -163.5q0 -27 -9 -60.5t-26 -68.5t-47.5 -64.5t-68.5 -42.5l43 -85h-49l-38 75q-35 -4 -74 -4q-74 0 -108.5 34.5t-34.5 70.5t26 59.5t73 23.5q40 0 70.5 -24.5t70.5 -107.5q45 40 45 186q0 38 -5.5 71t-25.5 62t-53 29 q-62 0 -109 -47l-27 24l228 232h-204q-20 0 -44 -23.5t-29 -59.5h-26l34 156h372v-27zM219 -196q-55 111 -87 111q-27 0 -27 -41q0 -34 27 -53.5t67 -19.5q8 0 20 3z" />
+<glyph unicode="&#x294;" horiz-adv-x="417" d="M145 378h32q47 0 83.5 34.5t36.5 91.5q0 22 -3 45t-9 48t-19.5 41t-32.5 16q-13 0 -22.5 -4.5t-15.5 -16t-9 -19.5l-7 -25q-16 -60 -71 -60q-25 0 -39 15.5t-14 32.5q0 48 55 79q49 27 102 27q94 0 154 -52.5t60 -140.5q0 -76 -47 -138.5t-127 -70.5v-197q0 -54 70 -60 v-24h-240v24q63 2 63 63v291z" />
+<glyph unicode="&#x295;" horiz-adv-x="417" d="M229 84v197q-80 8 -127 70.5t-47 138.5q0 88 60 140.5t154 52.5q53 0 102 -27q55 -31 55 -79q0 -17 -14 -32.5t-39 -15.5q-55 0 -71 60l-8 25q-2 8 -8 19.5t-15.5 16t-22.5 4.5q-19 0 -32.5 -16t-19.5 -41t-9 -48t-3 -45q0 -57 36.5 -91.5t83.5 -34.5h32v-291 q0 -61 63 -63v-24h-240v24q70 6 70 60z" />
+<glyph unicode="&#x296;" horiz-adv-x="417" d="M252 585v-197q80 -8 127 -70.5t47 -138.5q0 -88 -60 -140.5t-154 -52.5q-53 0 -102 27q-55 31 -55 79q0 17 14 32.5t39 15.5q55 0 71 -60l7 -25q3 -8 9 -19.5t15.5 -16t22.5 -4.5q19 0 32.5 16t19.5 41t9 48t3 45q0 57 -36.5 91.5t-83.5 34.5h-32v291q0 61 -63 63v24h240 v-24q-70 -6 -70 -60z" />
+<glyph unicode="&#x297;" horiz-adv-x="479" d="M447 -38v-40q0 -64 -51 -109t-132 -45q-74 0 -133 45t-59 110v391q0 72 67 115.5t143 43.5q59 0 111.5 -33.5t53.5 -84.5q0 -22 -16 -42.5t-48 -20.5q-22 0 -39 11.5t-17 29.5q0 16 6 30t6 26q0 25 -12.5 35.5t-38.5 10.5q-38 0 -61 -27t-23 -66v-411q0 -46 25 -79.5 t63 -33.5q46 0 79 35t33 83v26h43z" />
+<glyph unicode="&#x298;" horiz-adv-x="723" d="M438 328q0 -33 -22 -55.5t-55 -22.5q-34 0 -57.5 22.5t-23.5 55.5q0 34 23 57t57 23q32 0 55 -23t23 -57zM708 330q0 -146 -97.5 -246.5t-247.5 -100.5q-141 0 -245.5 97.5t-104.5 250.5t102 251t250 98t245.5 -100.5t97.5 -249.5zM580 333q0 138 -57 223t-164 85 q-100 0 -159 -79.5t-59 -228.5q0 -140 55 -223.5t166 -83.5q95 0 156.5 86.5t61.5 220.5z" />
+<glyph unicode="&#x299;" horiz-adv-x="456" d="M15 464h225q85 0 130.5 -28.5t45.5 -81.5q0 -41 -26 -66.5t-86 -37.5q60 -8 98.5 -40.5t38.5 -80.5q0 -57 -50.5 -93t-142.5 -36h-233v17q39 4 50.5 14.5t11.5 39.5v320q0 31 -12.5 42t-49.5 14v17zM190 406v-149q65 0 87.5 20t22.5 72q0 92 -70 92q-21 0 -30.5 -7.5 t-9.5 -27.5zM190 234v-167q0 -24 10.5 -34t34.5 -10q84 0 84 106q0 105 -110 105h-19z" />
+<glyph unicode="&#x29a;" horiz-adv-x="465" d="M455 233q0 -73 -25 -125.5t-64 -77t-74 -34.5t-68 -10q-92 0 -152.5 34t-60.5 103q0 44 33 78.5t85 48.5q-47 21 -69 45t-22 63q0 117 197 117q90 0 155 -67t65 -175zM280 227h-53q-36 0 -56 -26.5t-20 -71.5q0 -42 25 -68t65 -26q59 0 101.5 58t42.5 149 q0 83 -47.5 139.5t-111.5 56.5q-38 0 -53 -20t-15 -68q0 -29 22 -50.5t48 -29.5q16 -5 52 -6v-37z" />
+<glyph unicode="&#x29b;" horiz-adv-x="600" d="M487 110v-79q-79 -42 -199 -42q-113 0 -186 63.5t-73 168.5q0 101 72.5 170.5t179.5 69.5q64 0 125 -30q5 49 26 73q27 33 69 33t68 -18t26 -47q0 -18 -11.5 -29.5t-29.5 -11.5q-16 0 -27 10.5t-11 25.5q0 13 6.5 24t6.5 13q0 13 -19 13q-32 0 -32 -40v-174h-18 q-19 40 -32 59.5t-36 39.5q-42 36 -101 36q-64 0 -99 -54.5t-35 -157.5q0 -102 36 -157q38 -59 112 -59q69 0 69 57v58q0 27 -14.5 37.5t-60.5 13.5v16h251v-16q-39 -5 -51 -19.5t-12 -46.5z" />
+<glyph unicode="&#x29c;" horiz-adv-x="582" d="M561 0h-248v17q40 5 52.5 14.5t12.5 35.5v157h-177v-157q0 -27 13 -36t53 -14v-17h-246v17q39 5 50.5 14t11.5 36v329q0 28 -12.5 38t-49.5 13v17h246v-17q-39 -3 -52.5 -13t-13.5 -38v-140h177v140q0 28 -13 38t-52 13v17h248v-17q-38 -3 -51.5 -13.5t-13.5 -37.5v-329 q0 -27 12.5 -36t52.5 -14v-17z" />
+<glyph unicode="&#x29d;" horiz-adv-x="394" d="M282 613q0 -33 -22.5 -55t-56.5 -22q-33 0 -54.5 22t-21.5 55t22.5 55.5t55.5 22.5q31 0 54 -23t23 -55zM414 -233h-48q-35 44 -103 112q-49 -112 -182 -112q-62 0 -101.5 32t-39.5 86t39.5 86.5t89.5 32.5q33 0 71 -9v383q0 32 -12.5 44t-50.5 15v24h202v-447 q0 -57 -5 -83q13 -11 27.5 -25t24 -24t24.5 -30l20 -26q6 -7 24 -31zM140 -95v40q-33 19 -77 19q-30 0 -54.5 -20.5t-24.5 -54.5q0 -42 26 -62t63 -20q67 0 67 98z" />
+<glyph unicode="&#x29e;" horiz-adv-x="556" d="M543 -215h-187v431l-128 -128q-21 -21 -21 -38q0 -19 35 -23l24 -3v-24h-214v24q48 6 81.5 29t107.5 101l-194 268q-11 15 -25 15v24h234v-24q-42 -1 -42 -19q0 -12 24 -45l95 -134l23 24v114q0 35 -8.5 45t-43.5 15v24h239v-24q-48 -4 -48 -60v-510q0 -54 48 -58v-24z " />
+<glyph unicode="&#x29f;" horiz-adv-x="470" d="M440 156l-27 -156h-396v17q35 4 45 13.5t10 36.5v328q0 29 -11 39.5t-44 12.5v17h238v-17q-42 -1 -53.5 -13.5t-11.5 -53.5v-313q0 -21 21 -32.5t55 -11.5q37 0 56.5 8t39.5 28q29 29 56 97h22z" />
+<glyph unicode="&#x2a0;" horiz-adv-x="636" d="M342 -90v132q-44 -56 -123 -56t-132 63.5t-53 169.5q0 108 61.5 181t160.5 73q50 0 91 -26q9 53 35 84q42 51 135 51q64 0 103 -28t39 -72q0 -28 -17 -46t-44 -18q-25 0 -42.5 17t-17.5 40q0 20 11 36.5t11 20.5q0 19 -29 19q-26 0 -38 -13.5t-12 -46.5v-614 q0 -30 10 -40.5t45 -17.5v-24h-267v24q48 7 60.5 23.5t12.5 67.5zM342 98v256q0 41 -18.5 64t-48.5 23q-44 0 -69.5 -51t-25.5 -154q0 -98 25 -147t68 -49q28 0 48.5 15.5t20.5 42.5z" />
+<glyph unicode="&#x2a1;" horiz-adv-x="500" d="M145 378h32q47 0 83.5 34.5t36.5 91.5q0 22 -3 45t-9 48t-19.5 41t-32.5 16q-13 0 -22.5 -4.5t-15.5 -16t-9 -19.5l-7 -25q-16 -60 -71 -60q-25 0 -39 15.5t-14 32.5q0 48 55 79q49 27 102 27q94 0 154 -52.5t60 -140.5q0 -76 -47 -138.5t-127 -70.5v-73h65v-46h-65v-78 q0 -54 70 -60v-24h-240v24q63 2 63 63v75h-66v46h66v170z" />
+<glyph unicode="&#x2a2;" horiz-adv-x="500" d="M229 208v73q-80 8 -127 70.5t-47 138.5q0 88 60 140.5t154 52.5q53 0 102 -27q55 -31 55 -79q0 -17 -14 -32.5t-39 -15.5q-55 0 -71 60l-8 25q-2 8 -8 19.5t-15.5 16t-22.5 4.5q-19 0 -32.5 -16t-19.5 -41t-9 -48t-3 -45q0 -57 36.5 -91.5t83.5 -34.5h32v-170h66v-46h-66 v-75q0 -61 63 -63v-24h-240v24q70 6 70 60v78h-65v46h65z" />
+<glyph unicode="&#x2a3;" horiz-adv-x="868" d="M843 146l-16 -160h-488v66q-35 -37 -64 -51.5t-69 -14.5q-79 0 -130 66t-51 169q0 109 54.5 180.5t137.5 71.5q34 0 60.5 -13.5t58.5 -48.5v183q0 35 -13 44.5t-63 13.5v24h215v-229h364v-26l-231 -403h29q61 0 91.5 12.5t55.5 46.5q20 30 31 69h28zM479 71l199 344 q-106 0 -139 -19t-52 -91h-12v-204q0 -19 4 -30zM336 112v243q-11 29 -32 45.5t-46 16.5q-85 0 -85 -188q0 -187 78 -187q36 0 66 37q19 25 19 33z" />
+<glyph unicode="&#x2a4;" horiz-adv-x="810" d="M778 423l-194 -197q22 6 53 6q59 0 108 -57.5t49 -148.5q0 -87 -34.5 -147t-73.5 -86q-46 -29 -113 -29q-91 0 -141 33q-47 32 -47 71q0 20 14.5 35t44.5 15q57 0 67 -67q4 -22 24 -36t45 -14q87 0 87 207q0 66 -19.5 113t-64.5 47q-62 0 -108 -46q-62 -61 -121 -130 l-15 1v59q-35 -37 -64 -51.5t-69 -14.5q-79 0 -130 66t-51 169q0 109 54.5 180.5t137.5 71.5q34 0 60.5 -13.5t58.5 -48.5v183q0 35 -13 44.5t-63 13.5v24h215v-226h303v-27zM675 377h-200v-204zM336 112v243q-11 29 -32 45.5t-46 16.5q-85 0 -85 -188q0 -187 78 -187 q36 0 66 37q19 25 19 33z" />
+<glyph unicode="&#x2a5;" horiz-adv-x="960" d="M601 18h93q42 79 77.5 113.5t76.5 34.5q85 0 85 -75q0 -47 -37.5 -76t-103.5 -29h-73q-61 -107 -82 -150h-43q46 88 84 150h-339v66q-35 -37 -64 -51.5t-69 -14.5q-79 0 -130 66t-51 169q0 109 54.5 180.5t137.5 71.5q34 0 60.5 -13.5t58.5 -48.5v183q0 35 -13 44.5 t-63 13.5v24h215v-229h357v-26zM736 18h51q36 0 54 6q37 13 48.5 29.5t11.5 38.5q0 21 -16 31.5t-37 10.5q-27 0 -58.5 -35.5t-53.5 -80.5zM476 79l195 336q-106 0 -139 -19t-52 -91h-5v-204q0 -16 1 -22zM336 112v243q-11 29 -32 45.5t-46 16.5q-85 0 -85 -188 q0 -187 78 -187q36 0 66 37q19 25 19 33z" />
+<glyph unicode="&#x2a6;" horiz-adv-x="626" d="M577 326h-25q-19 56 -47 82q-34 32 -75 32q-28 0 -47 -16.5t-19 -41.5q0 -26 22.5 -46.5t73.5 -41.5q75 -31 106.5 -67t31.5 -89q0 -67 -43 -108.5t-111 -41.5q-109 0 -155 46q-40 -46 -105 -46q-52 0 -82 28.5t-30 78.5v322h-53v27q49 33 82 71.5t85 114.5h25v-169h144 q30 12 66 12q34 0 78 -15q22 -7 31 -7q17 0 25 20h22v-145zM307 112l25 -11q-8 -16 -12 -23q36 -56 107 -56q34 0 54.5 17t20.5 46q0 24 -22 44.5t-74 42.5q-75 32 -108.5 68.5t-33.5 86.5q0 51 31 90h-84v-298q0 -60 39 -60q29 0 57 53z" />
+<glyph unicode="&#x2a7;" horiz-adv-x="540" d="M341 461v32q0 85 45 137.5t129 52.5q52 0 81.5 -21t29.5 -57q0 -26 -15 -43.5t-39 -17.5q-23 0 -38 14t-15 33q0 14 9 29.5t9 18.5q0 5 -7 9.5t-16 4.5q-42 0 -42 -137v-559q0 -85 -46.5 -137.5t-130.5 -52.5q-52 0 -81.5 21t-29.5 57q0 26 15 43.5t39 17.5q23 0 38 -14 t15 -33q0 -14 -9 -29.5t-9 -18.5q0 -5 7 -9.5t16 -4.5q45 0 45 97v162q-57 -38 -89 -53t-68 -15q-52 0 -82 28.5t-30 78.5v322h-53v27q49 33 82 71.5t85 114.5h25v-169h130zM341 110v307h-130v-298q0 -60 39 -60q22 0 91 51z" />
+<glyph unicode="&#x2a8;" horiz-adv-x="700" d="M211 417v-292q0 -34 8 -50t33 -16q38 0 74 12q-51 58 -51 160q0 110 68 180.5t169 70.5q66 0 110 -31t44 -79q0 -29 -18.5 -46.5t-49.5 -17.5q-26 0 -41 19t-15 54q0 18 -0.5 26t-2.5 18.5t-6 15t-12.5 7.5t-20.5 3q-38 0 -61 -44.5t-23 -124.5q0 -98 33 -159 q92 53 144 53q44 0 70.5 -23t26.5 -60q0 -42 -32.5 -73.5t-98.5 -31.5q-85 0 -127 14q-45 16 -75 35q-95 -49 -173 -49q-52 0 -82 28.5t-30 78.5v322h-53v27q49 33 82 71.5t85 114.5h25v-169h95v-44h-95zM646 93q0 21 -16 32t-37 11q-46 0 -120 -49q12 -16 45.5 -35.5 t59.5 -19.5q68 0 68 61z" />
+<glyph unicode="&#x2b0;" horiz-adv-x="378" d="M365 335h-162v18q18 3 25 12.5t7 32.5v169q0 40 -7.5 56.5t-27.5 16.5q-33 0 -60 -42v-199q0 -23 7 -32.5t26 -13.5v-18h-166v18q25 5 31 12t6 37v376q0 26 -6.5 33.5t-31.5 12.5v18h134v-210q46 58 101 58q42 0 66 -28t24 -74v-188q0 -47 34 -47v-18z" />
+<glyph unicode="&#x2b1;" horiz-adv-x="378" d="M365 336h-162v18q18 2 25 12.5t7 33.5v168q0 40 -7.5 56.5t-27.5 16.5q-25 0 -48 -26q-12 -12 -12 -18v-197q0 -23 7 -33t26 -13v-18h-166v18q25 5 31 12t6 37v295q0 76 27 112q30 38 93 38q44 0 71.5 -21t27.5 -54q0 -21 -12 -34.5t-31 -13.5q-17 0 -29 12.5t-12 30.5 q0 15 8 27t8 15q0 15 -21 15q-34 0 -34 -51v-141q45 58 101 58q42 0 66 -28.5t24 -73.5v-187q0 -26 8 -37t26 -11v-18z" />
+<glyph unicode="&#x2b2;" horiz-adv-x="300" d="M273 807q0 -25 -18 -42t-44 -17q-25 0 -41.5 17t-16.5 42q0 26 17.5 43.5t42.5 17.5q24 0 42 -18t18 -43zM270 690v-353q0 -63 -21 -100q-34 -58 -115 -58q-48 0 -78.5 21.5t-30.5 55.5q0 20 13.5 33.5t34.5 13.5q19 0 32.5 -12.5t13.5 -29.5q0 -13 -11 -29 q-7 -10 -7 -16q0 -14 25 -14q37 0 37 59v365q0 25 -9.5 34.5t-39.5 11.5v18h156z" />
+<glyph unicode="&#x2b3;" horiz-adv-x="270" d="M131 690v-60q41 69 84 69q22 0 36.5 -16.5t14.5 -41.5q0 -22 -11 -35.5t-28 -13.5q-23 0 -39 27q-7 17 -16 17q-17 0 -27.5 -21.5t-10.5 -54.5v-148q0 -35 8 -46.5t36 -12.5v-18h-165v18q20 4 26.5 12t6.5 31v230q0 25 -6.5 33.5t-27.5 12.5v18h119z" />
+<glyph unicode="&#x2b4;" horiz-adv-x="292" d="M264 335h-119v60q-41 -69 -84 -69q-22 0 -36.5 16.5t-14.5 41.5q0 22 11 35.5t28 13.5q23 0 39 -27q7 -17 16 -17q17 0 27.5 21.5t10.5 54.5v148q0 35 -8 46.5t-36 12.5v18h165v-18q-20 -4 -26.5 -12t-6.5 -31v-230q0 -25 6.5 -33.5t27.5 -12.5v-18z" />
+<glyph unicode="&#x2b5;" horiz-adv-x="319" d="M230 628v-380q0 -25 8 -43.5t22 -18.5q20 0 20 12q0 6 -6 16q-8 15 -8 27q0 17 10.5 28t26.5 11q17 0 28 -12.5t11 -31.5q0 -32 -25 -52.5t-63 -20.5q-66 0 -94 55q-18 32 -18 61v112q-40 -65 -81 -65q-22 0 -36.5 16t-14.5 41q0 23 11 36.5t29 13.5q24 0 39 -29 q8 -15 15 -15q16 0 27 21t11 52v148q0 37 -8 49t-36 13v18h165v-18q-21 -4 -27 -12.5t-6 -31.5z" />
+<glyph unicode="&#x2b6;" horiz-adv-x="404" d="M397 684v-12q-15 0 -24 -11l-109 -142q35 -8 60 -29q26 -20 26 -59q0 -86 -162 -86h-168v12q29 2 38 11.5t9 39.5v215q0 30 -7.5 37.5t-39.5 11.5v12h184v-12q-32 -4 -39.5 -11.5t-7.5 -35.5v-98h15l113 157h112zM157 510v-126q0 -22 28 -22q38 0 54.5 17t16.5 57 q0 44 -21.5 58.5t-77.5 15.5z" />
+<glyph unicode="&#x2b7;" horiz-adv-x="550" d="M528 681v-18q-14 -3 -22 -10.5t-15 -26.5l-114 -295h-17l-76 228l-92 -228h-18l-109 275q-14 35 -21 44.5t-21 12.5v18h164v-18q-28 -4 -28 -21q0 -7 29 -84l33 -87l50 126l-15 48q-5 11 -11 13.5t-22 4.5v18h173v-18q-21 -1 -28.5 -5t-7.5 -13q0 -5 20 -78 q23 -82 25 -93l26 69q33 87 33 94q0 13 -7.5 18.5t-28.5 7.5v18h100z" />
+<glyph unicode="&#x2b8;" horiz-adv-x="380" d="M374 690v-18q-19 -2 -28 -10.5t-18 -32.5l-114 -305q-33 -91 -59 -120q-24 -25 -64 -25q-33 0 -54 16.5t-21 43.5q0 22 13.5 37t34.5 15q19 0 32.5 -11.5t13.5 -28.5q0 -2 -1 -7.5t-1 -8.5q0 -5 4 -9t9 -4q28 0 50 63l14 41l-91 223q-35 89 -52 113q-5 8 -26 10v18h192 v-18h-13q-27 -3 -27 -20q0 -6 15 -45l55 -143l53 144q8 23 8 38q0 14 -8.5 19.5t-32.5 6.5v18h116z" />
+<glyph unicode="&#x2b9;" horiz-adv-x="208" d="M30 432l93 212q17 40 52 40q14 0 27.5 -13t13.5 -28t-19 -42l-135 -180z" />
+<glyph unicode="&#x2ba;" horiz-adv-x="356" d="M19 432l93 212q17 40 52 40q14 0 27.5 -13t13.5 -28t-19 -42l-135 -180zM178 432l93 212q17 40 52 40q14 0 27.5 -13t13.5 -28t-19 -42l-135 -180z" />
+<glyph unicode="&#x2bb;" horiz-adv-x="333" d="M205 685l11 -22q-109 -76 -109 -133q0 -21 19 -21q3 0 11 1t13 1q32 0 52.5 -21t20.5 -55q0 -39 -23 -62t-61 -23q-47 0 -73.5 31t-26.5 85q0 132 166 219z" />
+<glyph unicode="&#x2bc;" horiz-adv-x="333" d="M57 351l-11 22q109 76 109 133q0 21 -19 21q-3 0 -11 -1t-13 -1q-32 0 -52.5 21t-20.5 55q0 39 23 62t61 23q47 0 73.5 -31t26.5 -85q0 -132 -166 -219z" />
+<glyph unicode="&#x2bd;" horiz-adv-x="250" d="M216 373l-11 -22q-166 87 -166 219q0 54 26.5 85t73.5 31q38 0 61 -23t23 -62q0 -34 -20.5 -55t-52.5 -21q-5 0 -13 1t-11 1q-19 0 -19 -21q0 -57 109 -133z" />
+<glyph unicode="&#x2be;" horiz-adv-x="334" d="M65 662h45q61 0 100.5 -33t39.5 -107t-39.5 -107t-100.5 -33h-45v50h45q90 0 90 90q0 38 -20.5 64t-69.5 26h-45v50z" />
+<glyph unicode="&#x2bf;" horiz-adv-x="334" d="M250 382h-45q-61 0 -100.5 33t-39.5 107t39.5 107t100.5 33h45v-50h-45q-49 0 -69.5 -26t-20.5 -64q0 -90 90 -90h45v-50z" />
+<glyph unicode="&#x2c0;" horiz-adv-x="353" d="M103 441h27q38 0 68 27.5t30 74.5q0 43 -12 83t-41 40q-14 0 -23.5 -8.5t-12.5 -17.5t-8 -27q-12 -49 -58 -49q-20 0 -31.5 12.5t-11.5 26.5q0 41 45 65q39 22 83 22q77 0 126 -43t49 -115q0 -66 -42.5 -118.5t-113.5 -52.5q-14 0 -25 1l-6 -122h-43v201z" />
+<glyph unicode="&#x2c1;" horiz-adv-x="353" d="M217 240l-6 122q-11 -1 -25 -1q-71 0 -113.5 52.5t-42.5 118.5q0 72 49 115t126 43q44 0 83 -22q45 -24 45 -65q0 -14 -11.5 -26.5t-31.5 -12.5q-46 0 -58 49q-5 18 -8 27t-12.5 17.5t-23.5 8.5q-29 0 -41 -40t-12 -83q0 -47 30 -74.5t68 -27.5h27v-201h-43z" />
+<glyph unicode="&#x2c2;" horiz-adv-x="317" d="M297 414l-267 148v50l267 148v-76l-179 -97l179 -97v-76z" />
+<glyph unicode="&#x2c3;" horiz-adv-x="317" d="M297 562l-267 -148v76l179 97l-179 97v76l267 -148v-50z" />
+<glyph unicode="&#x2c4;" horiz-adv-x="317" d="M332 453h-76l-97 179l-97 -179h-76l148 267h50z" />
+<glyph unicode="&#x2c5;" horiz-adv-x="317" d="M332 720l-148 -267h-50l-148 267h76l97 -179l97 179h76z" />
+<glyph unicode="&#x2c6;" horiz-adv-x="333" d="M335 528h-57l-112 98l-112 -98h-56l122 176h92z" />
+<glyph unicode="&#x2c7;" horiz-adv-x="333" d="M335 704l-123 -176h-92l-122 176h57l111 -99l111 99h58z" />
+<glyph unicode="&#x2c8;" horiz-adv-x="279" d="M167 455h-55v265h55v-265z" />
+<glyph unicode="&#x2c9;" horiz-adv-x="370" d="M350 565h-330v72h330v-72z" />
+<glyph unicode="&#x2ca;" horiz-adv-x="266" d="M20 528l137 157q25 28 53 28q22 0 35 -12t13 -32q0 -17 -8 -27.5t-32 -25.5l-142 -88h-56z" />
+<glyph unicode="&#x2cb;" horiz-adv-x="266" d="M258 528h-56l-142 88q-40 25 -40 52q0 19 13.5 32t33.5 13q29 0 54 -28z" />
+<glyph unicode="&#x2cc;" horiz-adv-x="278" d="M167 -195h-55v265h55v-265z" />
+<glyph unicode="&#x2cd;" horiz-adv-x="370" d="M350 -160h-330v72h330v-72z" />
+<glyph unicode="&#x2ce;" horiz-adv-x="333" d="M253 -192h-56l-142 88q-40 25 -40 52q0 19 13.5 32t33.5 13q29 0 54 -28z" />
+<glyph unicode="&#x2cf;" horiz-adv-x="333" d="M80 -192l137 157q25 28 53 28q22 0 35 -12t13 -32q0 -17 -8 -27.5t-32 -25.5l-142 -88h-56z" />
+<glyph unicode="&#x2d0;" horiz-adv-x="333" d="M254 474l-55 -180h-65l-55 180h175zM254 4h-175l55 180h65z" />
+<glyph unicode="&#x2d1;" horiz-adv-x="333" d="M254 474l-55 -180h-65l-55 180h175z" />
+<glyph unicode="&#x2d2;" horiz-adv-x="333" d="M65 378h45q64 0 111 -42t47 -116t-47 -116t-111 -42h-45v68h45q38 0 64 26t26 64t-26 64t-64 26h-45v68z" />
+<glyph unicode="&#x2d3;" horiz-adv-x="333" d="M268 62h-45q-64 0 -111 42t-47 116t47 116t111 42h45v-68h-45q-37 0 -63.5 -26t-26.5 -64t26.5 -64t63.5 -26h45v-68z" />
+<glyph unicode="&#x2d4;" horiz-adv-x="333" d="M281 4h-230v55h87v147h55v-147h88v-55z" />
+<glyph unicode="&#x2d5;" horiz-adv-x="333" d="M281 151h-88v-147h-55v147h-87v55h230v-55z" />
+<glyph unicode="&#x2d6;" horiz-adv-x="334" d="M273 85h-76v-76h-60v76h-76v66h76v76h60v-76h76v-66z" />
+<glyph unicode="&#x2d7;" horiz-adv-x="334" d="M273 84h-212v66h212v-66z" />
+<glyph unicode="&#x2d8;" horiz-adv-x="333" d="M274 691h44q-6 -75 -43.5 -119t-108.5 -44q-73 0 -111.5 44.5t-39.5 118.5h44q17 -87 102 -87q47 0 73.5 20t39.5 67z" />
+<glyph unicode="&#x2d9;" horiz-adv-x="333" d="M231 600q0 -26 -19 -44.5t-47 -18.5q-26 0 -44.5 19t-18.5 46q0 26 19 45t45 19t45.5 -19.5t19.5 -46.5z" />
+<glyph unicode="&#x2da;" horiz-adv-x="333" d="M273 645q0 -44 -31 -76t-75 -32q-45 0 -76 30.5t-31 75.5q0 44 32 75.5t76 31.5q43 0 74 -31t31 -74zM225 642q0 25 -18 42.5t-43 17.5q-22 0 -39 -17.5t-17 -40.5q0 -24 17 -41.5t40 -17.5q25 0 42.5 16.5t17.5 40.5z" />
+<glyph unicode="&#x2db;" horiz-adv-x="333" d="M296 -83l23 -16q-18 -34 -54 -54t-72 -20q-47 0 -75 21.5t-28 56.5q0 28 11.5 51.5t42.5 59.5q4 6 8 10l6 6l33 12l-6 -20q-11 -39 -11 -64q0 -35 14 -49.5t47 -14.5q22 0 48 13q4 2 13 8z" />
+<glyph unicode="&#x2dc;" horiz-adv-x="333" d="M306 674h43q-34 -127 -116 -127q-32 0 -65 14l-29 13q-48 22 -64 22q-19 0 -32.5 -13t-16.5 -34h-42q14 65 42 95t74 30q31 0 73 -19l40 -18q27 -12 39 -12q20 0 32 11t22 38z" />
+<glyph unicode="&#x2dd;" horiz-adv-x="333" d="M187 528l136 157q25 28 54 28q22 0 35 -12t13 -32q0 -17 -8 -28.5t-32 -26.5l-141 -86h-57zM-13 528l136 157q25 28 54 28q22 0 35 -12t13 -32q0 -17 -8 -28.5t-32 -26.5l-141 -86h-57z" />
+<glyph unicode="&#x2de;" horiz-adv-x="292" d="M279 342l23 -64q-16 -44 -28 -60q-25 -32 -63 -32q-40 0 -75 56q-13 23 -56 115q-12 -21 -37.5 -37t-39.5 -20l-3 55q42 28 62 53q22 28 31 73q52 -151 90 -202q19 -25 34 -25q24 0 41 32q8 14 21 56z" />
+<glyph unicode="&#x2df;" horiz-adv-x="260" d="M250 550l-45 -44l-74 74l-76 -74l-45 44l75 76l-74 73l45 45l75 -73l73 73l46 -45l-74 -73z" />
+<glyph unicode="&#x2e0;" horiz-adv-x="420" d="M410 667h-8q-13 0 -38 -42l-111 -189l70 -118q17 -30 17 -55q0 -34 -36 -53.5t-77 -19.5q-114 0 -114 62q0 26 22 64l50 86l-92 159q-40 71 -45 78q-17 27 -38 28v17h152v-17q-29 0 -29 -22q0 -3 15 -29l81 -139l67 113q27 46 27 53q0 24 -32 24v17h119v-17zM209 361 l-25 -44q-25 -42 -25 -62q0 -22 19 -31.5t38 -9.5q18 0 35.5 8.5t17.5 27.5q0 10 -40 77z" />
+<glyph unicode="&#x2e1;" horiz-adv-x="190" d="M186 335h-180v18q20 2 29 12.5t9 34.5v375q0 46 -39 49v18h144v-442q0 -46 37 -47v-18z" />
+<glyph unicode="&#x2e2;" horiz-adv-x="300" d="M262 582h-19q-16 45 -37 63q-27 25 -57 25q-22 0 -36.5 -12.5t-14.5 -32.5q0 -38 74 -68q57 -23 81.5 -51t24.5 -69q0 -52 -33 -84.5t-86 -32.5q-37 0 -83 18q-12 5 -17 5q-9 0 -21 -22h-19v127h22q24 -102 105 -102q26 0 42 13.5t16 36.5q0 19 -17 34.5t-57 32.5 q-58 25 -83.5 53.5t-25.5 66.5q0 48 34.5 80t86.5 32q26 0 60 -11q18 -6 24 -6q12 0 19 16h17v-112z" />
+<glyph unicode="&#x2e3;" horiz-adv-x="380" d="M376 335h-186v18q35 3 35 16q0 11 -25 49l-33 49l-47 -63q-14 -19 -14 -32q0 -16 38 -19v-18h-130v18q21 1 37.5 15t49.5 57l50 65l-99 151q-12 18 -18.5 23t-21.5 8v18h193v-18q-36 -1 -36 -15q0 -12 15 -33l40 -56l27 36q30 39 30 49q0 14 -24 17l-16 2v18h130v-18 q-33 -5 -54 -31l-78 -97l108 -168q15 -23 29 -23v-18z" />
+<glyph unicode="&#x2e4;" horiz-adv-x="328" d="M170 419v108q-7 -1 -16 -1q-59 0 -96.5 53t-37.5 118q0 72 49 115t126 43q44 0 83 -22q45 -24 45 -65q0 -14 -11.5 -26.5t-31.5 -12.5q-46 0 -58 49q-5 18 -8 27t-12.5 17.5t-23.5 8.5q-29 0 -41 -40t-12 -83q0 -47 30 -74.5t68 -27.5h27v-198q0 -31 13.5 -42t55.5 -14 v-17h-224v17q47 3 61 13t14 54z" />
+<glyph unicode="&#x2e5;" horiz-adv-x="405" d="M368 0h-66v610h-262v66h328v-676z" />
+<glyph unicode="&#x2e6;" horiz-adv-x="405" d="M368 0h-66v428h-262v66h262v182h66v-676z" />
+<glyph unicode="&#x2e7;" horiz-adv-x="405" d="M368 0h-66v305h-262v66h262v305h66v-676z" />
+<glyph unicode="&#x2e8;" horiz-adv-x="405" d="M368 0h-66v182h-262v66h262v428h66v-676z" />
+<glyph unicode="&#x2e9;" horiz-adv-x="405" d="M368 0h-328v66h262v610h66v-676z" />
+<glyph unicode="&#x2ec;" horiz-adv-x="314" d="M309 70l-131 -237h-43l-130 237h78l74 -136l74 136h78z" />
+<glyph unicode="&#x2ed;" horiz-adv-x="395" d="M390 648h-385v72h385v-72zM390 528h-385v72h385v-72z" />
+<glyph unicode="&#x300;" horiz-adv-x="0" d="M-131 528h-56l-142 88q-40 25 -40 52q0 19 13.5 32t33.5 13q29 0 54 -28z" />
+<glyph unicode="&#x301;" horiz-adv-x="0" d="M-369 528l137 157q25 28 54 28q20 0 33.5 -13t13.5 -32q0 -27 -40 -52l-142 -88h-56z" />
+<glyph unicode="&#x302;" horiz-adv-x="0" d="M-81 528h-57l-112 98l-112 -98h-56l122 176h92z" />
+<glyph unicode="&#x303;" horiz-adv-x="0" d="M-110 674h43q-34 -127 -116 -127q-36 0 -83 22q-5 2 -20.5 9.5t-21.5 10t-15.5 5t-17.5 2.5q-19 0 -32.5 -13t-16.5 -34h-42q14 65 42 95t74 30q32 0 88 -26q52 -23 62 -23q22 0 34 11t22 38z" />
+<glyph unicode="&#x304;" horiz-adv-x="0" d="M-85 565h-330v72h330v-72z" />
+<glyph unicode="&#x305;" horiz-adv-x="0" d="M0 788h-500v50h500v-50z" />
+<glyph unicode="&#x306;" horiz-adv-x="0" d="M-142 691h44q-6 -75 -43.5 -119t-108.5 -44q-73 0 -111.5 44.5t-39.5 118.5h44q17 -87 102 -87q47 0 73.5 20t39.5 67z" />
+<glyph unicode="&#x307;" horiz-adv-x="0" d="M-185 600q0 -26 -19 -44.5t-47 -18.5q-26 0 -44.5 19t-18.5 46q0 26 19 45t45 19t45.5 -19.5t19.5 -46.5z" />
+<glyph unicode="&#x308;" horiz-adv-x="0" d="M-80 600q0 -26 -19 -44.5t-47 -18.5q-26 0 -44.5 19t-18.5 46q0 26 19 45t45 19t45.5 -19.5t19.5 -46.5zM-290 600q0 -26 -18.5 -44.5t-46.5 -18.5q-26 0 -45 19t-19 46q0 26 19.5 45t45.5 19t45 -19.5t19 -46.5z" />
+<glyph unicode="&#x309;" horiz-adv-x="0" d="M-292 589h18q26 0 46 19t20 45q0 72 -28 72q-11 0 -17 -10t-8 -22t-12.5 -22t-29.5 -10q-13 0 -23 8.5t-10 21.5q0 28 25.5 44t55.5 16q53 0 88.5 -26.5t35.5 -78.5q0 -50 -34.5 -81.5t-85.5 -31.5l-2 -42h-39v98z" />
+<glyph unicode="&#x30a;" horiz-adv-x="0" d="M-143 645q0 -44 -31 -76t-75 -32q-45 0 -76 30.5t-31 75.5q0 44 32 75.5t76 31.5q43 0 74 -31t31 -74zM-191 642q0 25 -18 42.5t-43 17.5q-22 0 -39 -17.5t-17 -40.5q0 -24 17 -41.5t40 -17.5q25 0 42.5 16.5t17.5 40.5z" />
+<glyph unicode="&#x30b;" horiz-adv-x="0" d="M-469 528l137 157q25 28 53 28q22 0 35 -12t13 -32q0 -17 -8 -27.5t-32 -25.5l-142 -88h-56zM-269 528l137 157q25 28 53 28q22 0 35 -12t13 -32q0 -17 -8 -27.5t-32 -25.5l-142 -88h-56z" />
+<glyph unicode="&#x30c;" horiz-adv-x="0" d="M-81 704l-123 -176h-92l-122 176h57l111 -99l111 99h58z" />
+<glyph unicode="&#x30d;" horiz-adv-x="0" d="M-211 530h-66v200h66v-200z" />
+<glyph unicode="&#x30e;" horiz-adv-x="0" d="M-292 530h-66v200h66v-200zM-142 530h-66v200h66v-200z" />
+<glyph unicode="&#x30f;" horiz-adv-x="0" d="M-31 528h-56l-142 88q-24 15 -32 25.5t-8 27.5q0 20 13 32t35 12q28 0 53 -28zM-231 528h-56l-142 88q-24 15 -32 25.5t-8 27.5q0 20 13 32t35 12q28 0 53 -28z" />
+<glyph unicode="&#x310;" horiz-adv-x="0" d="M-185 762q0 -26 -19 -44.5t-47 -18.5q-26 0 -44.5 19t-18.5 46q0 26 19 45t45 19t45.5 -19.5t19.5 -46.5zM-142 691h44q-6 -75 -43.5 -119t-108.5 -44q-73 0 -111.5 44.5t-39.5 118.5h44q17 -87 102 -87q47 0 73.5 20t39.5 67z" />
+<glyph unicode="&#x311;" horiz-adv-x="0" d="M-98 528h-44q-13 47 -39.5 67t-73.5 20q-85 0 -102 -87h-44q1 74 39.5 118.5t111.5 44.5q71 0 108.5 -44t43.5 -119z" />
+<glyph unicode="&#x312;" horiz-adv-x="0" d="M-176 867l11 -22q-109 -76 -109 -133q0 -21 19 -21q3 0 11 1t13 1q32 0 52.5 -21t20.5 -55q0 -39 -23 -62t-61 -23q-47 0 -73.5 31t-26.5 85q0 132 166 219z" />
+<glyph unicode="&#x313;" horiz-adv-x="0" d="M-324 532l-11 22q109 76 109 133q0 21 -19 21q-3 0 -11 -1t-13 -1q-32 0 -52.5 21t-20.5 55q0 39 23 62t61 23q47 0 73.5 -31t26.5 -85q0 -132 -166 -219z" />
+<glyph unicode="&#x314;" horiz-adv-x="0" d="M-165 554l-11 -22q-166 87 -166 219q0 54 26.5 85t73.5 31q38 0 61 -23t23 -62q0 -34 -20.5 -55t-52.5 -21q-5 0 -13 1t-11 1q-19 0 -19 -21q0 -57 109 -133z" />
+<glyph unicode="&#x315;" horiz-adv-x="0" d="M-98 532l-11 22q109 76 109 133q0 21 -19 21q-3 0 -11 -1t-13 -1q-32 0 -52.5 21t-20.5 55q0 39 23 62t61 23q47 0 73.5 -31t26.5 -85q0 -132 -166 -219z" />
+<glyph unicode="&#x316;" horiz-adv-x="0" d="M-131 -255h-56l-142 88q-40 25 -40 52q0 19 13.5 32t33.5 13q29 0 54 -28z" />
+<glyph unicode="&#x317;" horiz-adv-x="0" d="M-369 -255l137 157q25 28 54 28q20 0 33.5 -13t13.5 -32q0 -27 -40 -52l-142 -88h-56z" />
+<glyph unicode="&#x318;" horiz-adv-x="0" d="M-223 -288h-55v88h-147v55h147v87h55v-230z" />
+<glyph unicode="&#x319;" horiz-adv-x="0" d="M-86 -200h-147v-88h-55v230h55v-87h147v-55z" />
+<glyph unicode="&#x31a;" horiz-adv-x="0" d="M-93 531h-72v149h-245v72h317v-221z" />
+<glyph unicode="&#x31b;" horiz-adv-x="0" d="M-62 374h8q46 0 46 25q0 1 -10.5 7.5t-20.5 19.5t-10 30t15 33t38 16q26 0 44 -18t18 -49q0 -32 -20 -53t-52 -28q-22 -5 -56 -5v22z" />
+<glyph unicode="&#x31c;" horiz-adv-x="0" d="M-190 -313h-45q-61 0 -100.5 33t-39.5 107t39.5 107t100.5 33h45v-50h-45q-49 0 -69.5 -26t-20.5 -64q0 -90 90 -90h45v-50z" />
+<glyph unicode="&#x31d;" horiz-adv-x="0" d="M-135 -272h-230v55h87v147h55v-147h88v-55z" />
+<glyph unicode="&#x31e;" horiz-adv-x="0" d="M-135 -125h-88v-147h-55v147h-87v55h230v-55z" />
+<glyph unicode="&#x31f;" horiz-adv-x="0" d="M-144 -206h-76v-81h-60v81h-76v66h76v70h60v-70h76v-66z" />
+<glyph unicode="&#x320;" horiz-adv-x="0" d="M-144 -206h-212v66h212v-66z" />
+<glyph unicode="&#x321;" horiz-adv-x="0" d="M-22 75v-212q0 -76 -27 -112q-30 -38 -93 -38q-44 0 -71.5 21t-27.5 54q0 21 12 34.5t31 13.5q17 0 29 -12.5t12 -30.5q0 -15 -8 -27t-8 -15q0 -15 23 -15q21 0 38.5 13t17.5 38v288h72z" />
+<glyph unicode="&#x322;" horiz-adv-x="0" d="M-22 75v-288q0 -25 17.5 -38t38.5 -13q23 0 23 15q0 3 -8 15t-8 27q0 18 12 30.5t29 12.5q19 0 31 -13.5t12 -34.5q0 -33 -27.5 -54t-71.5 -21q-63 0 -93 38q-27 36 -27 112v212h72z" />
+<glyph unicode="&#x323;" horiz-adv-x="0" d="M-185 -173q0 -27 -19 -46t-47 -19q-26 0 -44.5 19t-18.5 46q0 26 18.5 45t44.5 19q27 0 46.5 -18.5t19.5 -45.5z" />
+<glyph unicode="&#x324;" horiz-adv-x="0" d="M-80 -173q0 -27 -19 -46t-47 -19q-26 0 -44.5 19t-18.5 46q0 26 19 45t45 19t45.5 -19t19.5 -45zM-290 -173q0 -27 -18.5 -46t-46.5 -19q-26 0 -45 19t-19 46q0 26 19.5 45t45.5 19t45 -19.5t19 -44.5z" />
+<glyph unicode="&#x325;" horiz-adv-x="0" d="M-143 -173q0 -44 -31 -75t-75 -31q-45 0 -76 31t-31 75t32 75.5t76 31.5q43 0 74 -31.5t31 -75.5zM-191 -173q0 23 -18 41t-43 18q-22 0 -39 -18t-17 -41q0 -24 17 -41t40 -17q24 0 42 17t18 41z" />
+<glyph unicode="&#x326;" horiz-adv-x="0" d="M-324 -423l-11 22q109 76 109 133q0 21 -19 21q-3 0 -11 -1t-13 -1q-32 0 -52.5 21t-20.5 55q0 39 23 62t61 23q47 0 73.5 -31t26.5 -85q0 -132 -166 -219z" />
+<glyph unicode="&#x327;" horiz-adv-x="0" d="M-230 0l-28 -64q15 5 32 5q42 0 65.5 -18.5t23.5 -51.5q0 -41 -35 -65t-94 -24q-46 0 -97 18l16 37l6 -2q36 -12 53 -12q58 0 58 41q0 36 -46 36q-13 0 -28 -4l-11 8l43 96h42z" />
+<glyph unicode="&#x328;" horiz-adv-x="0" d="M-158 -83l23 -16q-18 -34 -54 -54t-72 -20q-47 0 -75 21.5t-28 56.5q0 28 11.5 51.5t42.5 59.5q4 6 8 10l6 6l33 12l-6 -20q-11 -39 -11 -64q0 -35 14 -49.5t47 -14.5q22 0 48 13q4 2 13 8z" />
+<glyph unicode="&#x329;" horiz-adv-x="0" d="M-222 -239h-55v132h55v-132z" />
+<glyph unicode="&#x32a;" horiz-adv-x="0" d="M-93 -260h-72v102h-188v-102h-72v174h332v-174z" />
+<glyph unicode="&#x32b;" horiz-adv-x="0" d="M-95 -104v-44q0 -47 -27 -70.5t-70 -23.5q-47 0 -68 34q-21 -34 -61 -34q-99 0 -99 94v44h55v-45q0 -38 39 -38t39 38v45h55v-44q0 -39 41 -39t41 39v44h55z" />
+<glyph unicode="&#x32c;" horiz-adv-x="0" d="M-81 -83l-123 -176h-92l-122 176h57l111 -99l111 99h58z" />
+<glyph unicode="&#x32d;" horiz-adv-x="0" d="M-81 -261h-57l-112 98l-112 -98h-56l122 176h92z" />
+<glyph unicode="&#x32e;" horiz-adv-x="0" d="M-142 -78h44q-6 -75 -43.5 -119t-108.5 -44q-73 0 -111.5 44.5t-39.5 118.5h44q17 -87 102 -87q47 0 73.5 20t39.5 67z" />
+<glyph unicode="&#x32f;" horiz-adv-x="0" d="M-98 -241h-44q-13 47 -39.5 67t-73.5 20q-85 0 -102 -87h-44q1 74 39.5 118.5t111.5 44.5q71 0 108.5 -44t43.5 -119z" />
+<glyph unicode="&#x330;" horiz-adv-x="0" d="M-110 -108h43q-34 -127 -116 -127q-36 0 -83 22q-5 2 -20.5 9.5t-21.5 10t-15.5 5t-17.5 2.5q-19 0 -32.5 -13t-16.5 -34h-42q14 65 42 95t74 30q32 0 88 -26q52 -23 62 -23q22 0 34 11t22 38z" />
+<glyph unicode="&#x331;" horiz-adv-x="0" d="M-85 -209h-330v72h330v-72z" />
+<glyph unicode="&#x332;" horiz-adv-x="0" d="M0 -187h-500v50h500v-50z" />
+<glyph unicode="&#x333;" horiz-adv-x="0" d="M0 -287h-500v50h500v-50zM0 -187h-500v50h500v-50z" />
+<glyph unicode="&#x334;" horiz-adv-x="0" d="M-110 316h43q-34 -127 -116 -127q-36 0 -83 22q-5 2 -20.5 9.5t-21.5 10t-15.5 5t-17.5 2.5q-19 0 -32.5 -13t-16.5 -34h-42q14 65 42 95t74 30q32 0 88 -26q52 -23 62 -23q22 0 34 11t22 38z" />
+<glyph unicode="&#x335;" horiz-adv-x="0" d="M-108 224h-306v58h306v-58z" />
+<glyph unicode="&#x336;" horiz-adv-x="0" d="M-10 224h-500v58h500v-58z" />
+<glyph unicode="&#x337;" horiz-adv-x="0" d="M-43 580l-285 -654h-82l285 654h82z" />
+<glyph unicode="&#x338;" horiz-adv-x="0" d="M31 662l-357 -818h-84l357 818h84z" />
+<glyph unicode="&#x339;" horiz-adv-x="0" d="M-375 -33h45q61 0 100.5 -33t39.5 -107t-39.5 -107t-100.5 -33h-45v50h45q90 0 90 90q0 38 -20.5 64t-69.5 26h-45v50z" />
+<glyph unicode="&#x33a;" horiz-adv-x="0" d="M-93 -245h-332v174h72v-102h188v102h72v-174z" />
+<glyph unicode="&#x33b;" horiz-adv-x="0" d="M-167 -264h-186v194h186v-194zM-222 -209v84h-76v-84h76z" />
+<glyph unicode="&#x33c;" horiz-adv-x="0" d="M-109 -115v-68q-36 22 -69 22q-7 0 -12.5 -2t-11 -7t-9 -8.5t-8.5 -13t-7 -13t-7.5 -15.5t-6.5 -14h-38q-2 3 -7 15t-7 16t-7 13t-9 12l-12 9q-6 5 -13.5 6.5t-17.5 1.5q-24 0 -59 -22v68q39 26 65 26q53 0 85 -53q37 53 86 53q27 0 65 -26z" />
+<glyph unicode="&#x33d;" horiz-adv-x="0" d="M-150 558l-38 -38l-62 62l-62 -62l-38 38l62 62l-61 62l38 37l61 -61l61 61l39 -37l-62 -62z" />
+<glyph unicode="&#x33e;" horiz-adv-x="0" d="M-189 881v-42q-21 -3 -34 -16.5t-13 -32.5q0 -8 2.5 -17.5t5 -15.5t10 -21.5t9.5 -20.5q22 -47 22 -83q0 -82 -127 -116v42q27 10 38 22.5t11 34.5q0 10 -23 62q-26 56 -26 88q0 46 30 74t95 42z" />
+<glyph unicode="&#x33f;" horiz-adv-x="0" d="M0 788h-500v50h500v-50zM0 888h-500v50h500v-50z" />
+<glyph unicode="&#x346;" horiz-adv-x="0" d="M-107 544h-78v95h-147v-95h-78v173h303v-173z" />
+<glyph unicode="&#x34c;" horiz-adv-x="0" d="M-124 674h43q-34 -127 -116 -127q-32 0 -65 14l-29 13q-48 22 -64 22q-19 0 -32.5 -13t-16.5 -34h-42q14 65 42 95t74 30q31 0 73 -19l40 -18q27 -12 39 -12q20 0 32 11t22 38zM-124 837h43q-34 -127 -116 -127q-32 0 -65 14l-29 13q-48 22 -64 22q-19 0 -32.5 -13 t-16.5 -34h-42q14 65 42 95t74 30q31 0 73 -19l40 -18q27 -12 39 -12q20 0 32 11t22 38z" />
+<glyph unicode="&#x359;" horiz-adv-x="0" d="M-89 -157q0 -25 -44 -35q-46 -11 -71 -27q31 -17 67 -26q36 -10 44 -22q3 -6 3 -14q0 -28 -27 -28q-17 0 -47 32q-28 30 -48 43q0 -20 9.5 -51t9.5 -48q0 -12 -7.5 -23.5t-21.5 -11.5t-21.5 11.5t-7.5 23.5q0 17 9 47t9 51q-24 -17 -44 -39q-32 -34 -54 -34q-27 0 -27 27 q0 12 9 20t18 11t26 7q26 6 60 24q-21 13 -59 23q-4 1 -14.5 4t-15.5 5t-12 6t-10 10.5t-3 15.5q0 12 7.5 20t17.5 8q25 0 52 -33q17 -22 49 -41q0 21 -9 53.5t-9 49.5q0 11 7 21.5t22 10.5q29 0 29 -32q0 -17 -9.5 -49.5t-9.5 -53.5q32 18 55 47q20 27 43 27 q10 0 17.5 -8.5t7.5 -21.5z" />
+<glyph unicode="&#x35c;" horiz-adv-x="0" d="M256 -79h44q0 -40 -27 -71t-66 -48t-90.5 -27.5t-91 -13.5t-76.5 -3t-76 3t-90.5 13.5t-90.5 27.5t-66 48t-27 71h44q22 -87 306 -87q285 0 307 87z" />
+<glyph unicode="&#x360;" horiz-adv-x="0" d="M355 656h43q-37 -127 -193 -127q-27 0 -107.5 12t-121.5 21q-156 34 -215 34q-67 0 -104 -8.5t-47 -38.5h-42q11 53 62 89t135 36q72 0 219 -33q153 -34 257 -34q37 0 54.5 2t34 13t25.5 34z" />
+<glyph unicode="&#x361;" horiz-adv-x="0" d="M265 534h-29q-6 29 -44 50t-91 30.5t-94.5 13t-75.5 3.5t-75.5 -3.5t-94.5 -13t-91 -30.5t-44 -50h-29q0 40 25.5 70t62 46t86 26t86.5 12.5t74 2.5t74 -2.5t86.5 -12.5t86 -26t62 -46t25.5 -70z" />
+<glyph unicode="&#x362;" horiz-adv-x="0" d="M377 -161v-24q-31 -13 -70.5 -45t-66.5 -63l-33 32q11 14 21 25l13 13q3 3 3 5q0 9 -12 9h-664v72h665q3 0 7.5 3.5t4.5 7.5q0 1 -3.5 4t-13 12.5t-21.5 24.5l34 31q26 -30 65 -62t71 -45z" />
+<glyph unicode="&#x37e;" horiz-adv-x="333" d="M251 387q0 -35 -25 -59.5t-60 -24.5t-59.5 24.5t-24.5 60.5q0 35 24.5 59.5t60.5 24.5q35 0 59.5 -25t24.5 -60zM100 -180l-11 22q109 76 109 133q0 21 -19 21q-3 0 -11 -1t-13 -1q-32 0 -52.5 21t-20.5 55q0 39 23 62t61 23q47 0 73.5 -31t26.5 -85q0 -132 -166 -219z " />
+<glyph unicode="&#x384;" horiz-adv-x="300" d="M118 528l61 136q12 28 47 28q37 0 37 -44q0 -15 -34 -53l-63 -67h-48z" />
+<glyph unicode="&#x385;" horiz-adv-x="390" d="M392 591q0 -26 -19 -44.5t-47 -18.5q-26 0 -44.5 19t-18.5 46q0 26 19 45t45 19t45.5 -19.5t19.5 -46.5zM118 528l61 136q12 28 47 28q37 0 37 -44q0 -15 -34 -53l-63 -67h-48zM127 591q0 -26 -18.5 -44.5t-46.5 -18.5q-26 0 -45 19t-19 46q0 26 19.5 45t45.5 19 t45 -19.5t19 -46.5z" />
+<glyph unicode="&#x386;" horiz-adv-x="722" d="M118 536l61 136q12 28 47 28q37 0 37 -44q0 -15 -34 -53l-63 -67h-48zM689 0h-322v25l32 3q25 2 35.5 9.5t10.5 23.5q0 29 -46 136h-225l-13 -34q-31 -80 -31 -97q0 -19 18.5 -28.5t62.5 -12.5v-25h-202v25q35 6 53 28t46 92l221 545h28l222 -522q38 -90 58.5 -116.5 t51.5 -26.5v-25zM384 236l-101 243l-94 -243h195z" />
+<glyph unicode="&#x387;" horiz-adv-x="333" d="M251 387q0 -35 -25 -59.5t-60 -24.5t-59.5 24.5t-24.5 60.5q0 35 24.5 59.5t60.5 24.5q35 0 59.5 -25t24.5 -60z" />
+<glyph unicode="&#x388;" horiz-adv-x="800" d="M10 536l61 136q12 28 47 28q37 0 37 -44q0 -15 -34 -53l-63 -67h-48zM791 208l-40 -208h-585v25q54 6 71 21t17 55v479q0 38 -18 53t-70 18v25h577v-201h-25q-17 100 -65.5 133.5t-171.5 33.5q-38 0 -51.5 -12t-13.5 -42v-225q81 1 117 32.5t45 116.5h26v-338h-26 q-7 88 -43 121.5t-119 33.5v-242q0 -32 17.5 -44t65.5 -12q117 0 182 54q25 20 42 46t40 77h28z" />
+<glyph unicode="&#x389;" horiz-adv-x="920" d="M10 536l61 136q12 28 47 28q37 0 37 -44q0 -15 -34 -53l-63 -67h-48zM904 0h-339v25q54 6 71.5 20.5t17.5 52.5v228h-241v-228q0 -40 17 -53.5t72 -19.5v-25h-336v25q53 7 69 20.5t16 52.5v479q0 41 -17 55t-68 19v25h336v-25q-53 -4 -71 -18.5t-18 -55.5v-204h241v204 q0 41 -18 55.5t-71 18.5v25h339v-25q-51 -4 -69.5 -19t-18.5 -55v-479q0 -39 16.5 -52.5t71.5 -20.5v-25z" />
+<glyph unicode="&#x38a;" horiz-adv-x="530" d="M10 536l61 136q12 28 47 28q37 0 37 -44q0 -15 -34 -53l-63 -67h-48zM516 0h-350v25q57 5 75 20t18 61v470q0 41 -19 56t-74 19v25h350v-25q-56 -2 -75.5 -17.5t-19.5 -57.5v-470q0 -48 18.5 -62.5t76.5 -18.5v-25z" />
+<glyph unicode="&#x38c;" horiz-adv-x="778" d="M10 536l61 136q12 28 47 28q37 0 37 -44q0 -15 -34 -53l-63 -67h-48zM743 335q0 -156 -99.5 -255t-255.5 -99q-155 0 -254 99t-99 254q0 159 101 258t258 99q151 0 250 -100.5t99 -255.5zM566 328q0 160 -46.5 245t-134.5 85q-83 0 -128 -85.5t-45 -242.5t46 -236.5 t132 -79.5t131 80t45 234z" />
+<glyph unicode="&#x38e;" horiz-adv-x="860" d="M10 536l61 136q12 28 47 28q37 0 37 -44q0 -15 -34 -53l-63 -67h-48zM846 670v-25q-18 5 -31 5q-30 0 -56 -8.5t-53.5 -32t-49 -61.5t-40 -101t-29.5 -146v-178q0 -58 16.5 -75.5t75.5 -22.5v-25h-347v25q60 5 76.5 25t16.5 78v136q0 166 -50.5 264t-141.5 98 q-29 0 -59 -10l-14 24q22 20 57.5 36t66.5 16q59 0 102 -13.5t78 -46.5t55.5 -92t27.5 -146h5q11 58 28 103q34 95 89.5 140t122.5 45q34 0 54 -12z" />
+<glyph unicode="&#x38f;" horiz-adv-x="780" d="M351 0h-302v197h25q7 -48 22 -62.5t49 -14.5h153l-2 29q-98 15 -166.5 88.5t-68.5 172.5q0 121 100 201.5t249 80.5q148 0 243.5 -80.5t95.5 -204.5q0 -95 -69 -165t-166 -93l-2 -29h148q36 0 52.5 15t23.5 62h25v-197h-302l7 181q116 28 116 232q0 101 -48.5 173.5 t-132.5 72.5q-82 0 -127.5 -72t-45.5 -172q0 -206 116 -234zM10 536l61 136q12 28 47 28q37 0 37 -44q0 -15 -34 -53l-63 -67h-48z" />
+<glyph unicode="&#x390;" horiz-adv-x="390" d="M245 461v-349q0 -56 24 -56t49 45l23 -12q-17 -43 -55.5 -73t-87.5 -30q-46 0 -69 26.5t-23 64.5v299q0 33 -11.5 45t-42.5 16v24h193zM392 591q0 -26 -19 -44.5t-47 -18.5q-26 0 -44.5 19t-18.5 46q0 26 19 45t45 19t45.5 -19.5t19.5 -46.5zM118 528l61 136q12 28 47 28 q37 0 37 -44q0 -15 -34 -53l-63 -67h-48zM127 591q0 -26 -18.5 -44.5t-46.5 -18.5q-26 0 -45 19t-19 46q0 26 19.5 45t45.5 19t45 -19.5t19 -46.5z" />
+<glyph unicode="&#x391;" horiz-adv-x="722" d="M689 0h-322v25l32 3q25 2 35.5 9.5t10.5 23.5q0 29 -46 136h-225l-13 -34q-31 -80 -31 -97q0 -19 18.5 -28.5t62.5 -12.5v-25h-202v25q35 6 53 28t46 92l221 545h28l222 -522q38 -90 58.5 -116.5t51.5 -26.5v-25zM384 236l-101 243l-94 -243h195z" />
+<glyph unicode="&#x392;" horiz-adv-x="667" d="M426 365v-1q85 -11 139 -58.5t54 -117.5q0 -83 -72 -135.5t-202 -52.5h-329v25q55 6 71.5 21t16.5 57v467q0 44 -18.5 60.5t-69.5 20.5v25h317q121 0 186.5 -41.5t65.5 -118.5q0 -59 -37 -96.5t-122 -54.5zM264 592v-219q91 0 123.5 30t32.5 106q0 137 -99 137 q-30 0 -43.5 -12.5t-13.5 -41.5zM264 343v-245q0 -36 15 -51t48 -15q58 0 89 40t31 116q0 155 -157 155h-26z" />
+<glyph unicode="&#x393;" horiz-adv-x="620" d="M593 676v-202h-24q-10 57 -22 81.5t-38 47.5q-45 39 -173 39q-38 0 -54 -11.5t-16 -39.5v-490q0 -43 21 -58t89 -18v-25h-360v25q55 6 71.5 21t16.5 57v472q0 43 -18 58t-70 18v25h577z" />
+<glyph unicode="&#x394;" horiz-adv-x="722" d="M357 690l316 -690h-640l296 690h28zM128 120h320l-165 359z" />
+<glyph unicode="&#x395;" horiz-adv-x="667" d="M641 208l-40 -208h-585v25q54 6 71 21t17 55v479q0 38 -18 53t-70 18v25h577v-201h-25q-17 100 -65.5 133.5t-171.5 33.5q-38 0 -51.5 -12t-13.5 -42v-225q81 1 117 32.5t45 116.5h26v-338h-26q-7 88 -43 121.5t-119 33.5v-242q0 -32 17.5 -44t65.5 -12q117 0 182 54 q25 20 42 46t40 77h28z" />
+<glyph unicode="&#x396;" horiz-adv-x="667" d="M634 242l-27 -242h-579v16l382 625l-83 -3q-62 -2 -96.5 -8.5t-63.5 -25t-46 -49.5t-34 -86h-28l22 207h523v-16l-379 -625h83q145 0 202 40q27 19 45 45t26.5 47t26.5 75h26z" />
+<glyph unicode="&#x397;" horiz-adv-x="778" d="M759 0h-339v25q54 6 71.5 20.5t17.5 52.5v228h-241v-228q0 -40 17 -53.5t72 -19.5v-25h-336v25q53 7 69 20.5t16 52.5v479q0 41 -17 55t-68 19v25h336v-25q-53 -4 -71 -18.5t-18 -55.5v-204h241v204q0 41 -18 55.5t-71 18.5v25h339v-25q-51 -4 -69.5 -19t-18.5 -55v-479 q0 -39 16.5 -52.5t71.5 -20.5v-25z" />
+<glyph unicode="&#x398;" horiz-adv-x="778" d="M743 336q0 -156 -99.5 -255t-255.5 -99q-155 0 -254 99t-99 254q0 159 101 258t258 99q151 0 250 -100.5t99 -255.5zM566 329q0 160 -46.5 245t-134.5 85q-83 0 -128 -85.5t-45 -242.5t46 -236.5t132 -79.5t131 80t45 234zM260 456h26q11 -35 21.5 -46t30.5 -11h109 q17 0 25 11.5t15 45.5h26q-12 -55 -12 -110q0 -58 14 -123h-26q-9 56 -43 56h-109q-23 0 -32 -9.5t-19 -46.5h-26q15 51 15 118q0 53 -15 115z" />
+<glyph unicode="&#x399;" horiz-adv-x="389" d="M370 0h-350v25q57 5 75 20t18 61v470q0 41 -19 56t-74 19v25h350v-25q-56 -2 -75.5 -17.5t-19.5 -57.5v-470q0 -48 18.5 -62.5t76.5 -18.5v-25z" />
+<glyph unicode="&#x39a;" horiz-adv-x="778" d="M769 0h-334v25q47 1 62 6t15 15q0 13 -25 45l-181 225l-27 -25v-196q0 -37 16.5 -50t70.5 -20v-25h-336v25q55 5 71 19t16 57v472q0 46 -17 60.5t-70 17.5v25h337v-25q-54 -4 -71 -20.5t-17 -63.5v-223l212 215q24 24 32 35t8 23q0 15 -10.5 22t-37.5 9l-35 3v25h289v-25 q-78 -9 -133 -46.5t-189 -180.5l305 -378q16 -20 49 -21v-25z" />
+<glyph unicode="&#x39b;" horiz-adv-x="707" d="M674 25v-25h-322v25l32 3q25 2 34.5 9.5t9.5 23.5q0 23 -44 136l-108 280h-2l-114 -314q-28 -79 -28 -97q0 -20 17.5 -29t61.5 -12v-25h-202v25q35 6 53.5 28.5t45.5 91.5l213 545h28l215 -522q37 -90 58 -116.5t52 -26.5z" />
+<glyph unicode="&#x39c;" horiz-adv-x="944" d="M921 0h-332v25q55 5 72 22t17 62v496l-252 -605h-27l-252 594v-465q0 -58 20 -79t81 -25v-25h-234v25q59 6 75 20.5t16 62.5v469q0 41 -17 55.5t-72 18.5v25h253l199 -472l201 472h252v-25q-55 -4 -71.5 -22.5t-16.5 -74.5v-428q0 -57 15 -76.5t73 -24.5v-25z" />
+<glyph unicode="&#x39d;" horiz-adv-x="722" d="M701 676v-25q-50 -8 -64 -22.5t-14 -60.5v-586h-28l-447 545v-396q0 -58 18 -78.5t76 -27.5v-25h-226v25q55 7 71.5 22.5t16.5 61.5v470q-52 72 -85 72v25h211l349 -430v299q0 60 -18 80.5t-74 25.5v25h214z" />
+<glyph unicode="&#x39e;" horiz-adv-x="647" d="M67 481v195h513v-195h-25q-8 43 -23 59t-51 16h-307q-67 0 -82 -75h-25zM141 463h25q7 -38 20 -47t50 -9h181q32 0 44.5 9.5t19.5 46.5h25v-223h-25q-7 35 -21 46t-43 11h-182q-35 0 -48.5 -10.5t-20.5 -46.5h-25v223zM40 232h25q8 -49 23.5 -67t58.5 -18h349 q48 0 63 17.5t23 67.5h25v-232h-567v232z" />
+<glyph unicode="&#x39f;" horiz-adv-x="778" d="M743 335q0 -156 -99.5 -255t-255.5 -99q-155 0 -254 99t-99 254q0 159 101 258t258 99q151 0 250 -100.5t99 -255.5zM566 328q0 160 -46.5 245t-134.5 85q-83 0 -128 -85.5t-45 -242.5t46 -236.5t132 -79.5t131 80t45 234z" />
+<glyph unicode="&#x3a0;" horiz-adv-x="778" d="M509 629h-241v-531q0 -40 17 -53.5t72 -19.5v-25h-336v25q53 7 69 20.5t16 52.5v479q0 41 -17 55t-68 19v25h738v-25q-51 -4 -69.5 -19t-18.5 -55v-479q0 -39 16.5 -52.5t71.5 -20.5v-25h-339v25q54 6 71.5 20.5t17.5 52.5v531z" />
+<glyph unicode="&#x3a1;" horiz-adv-x="611" d="M16 676h315q128 0 198.5 -45.5t70.5 -135.5q0 -60 -33.5 -104.5t-95.5 -67.5q-32 -12 -70.5 -15.5t-138.5 -4.5v-192q0 -51 14 -65t73 -21v-25h-333v25q33 3 45 9q23 9 31 30t8 62v427q0 58 -15.5 75.5t-68.5 22.5v25zM262 606v-268q94 1 130 32t36 114q0 84 -27 120.5 t-89 36.5q-50 0 -50 -35z" />
+<glyph unicode="&#x3a3;" horiz-adv-x="671" d="M306 317l-278 343v16h580v-197h-26q-22 94 -57.5 122.5t-100.5 28.5h-182l187 -240l-225 -243h256q30 0 49 3t41.5 13.5t38 34.5t26.5 63h26l-32 -261h-581v16z" />
+<glyph unicode="&#x3a4;" horiz-adv-x="667" d="M636 475h-29q-13 89 -56.5 127.5t-135.5 41.5v-527q0 -57 16.5 -72t81.5 -20v-25h-357v25q64 5 80.5 20.5t16.5 71.5v527q-93 -3 -136.5 -41.5t-56.5 -127.5h-29l3 201h600z" />
+<glyph unicode="&#x3a5;" horiz-adv-x="703" d="M693 670v-25q-18 5 -31 5q-30 0 -56 -8.5t-53.5 -32t-49 -61.5t-40 -101t-29.5 -146v-178q0 -58 16.5 -75.5t75.5 -22.5v-25h-347v25q60 5 76.5 25t16.5 78v136q0 166 -50.5 264t-141.5 98q-29 0 -59 -10l-14 24q22 20 57.5 36t66.5 16q121 0 185.5 -65t77.5 -233h5 q11 58 28 103q34 95 89.5 140t122.5 45q35 0 54 -12z" />
+<glyph unicode="&#x3a6;" horiz-adv-x="836" d="M498 586v-22q56 -2 109.5 -15t102.5 -38.5t78.5 -70t29.5 -102.5q0 -60 -33.5 -107.5t-85 -73t-103.5 -38.5t-98 -13v-15q0 -29 21 -44.5t74 -21.5v-25h-353v25q58 4 77 19t19 47v15q-59 0 -113 12.5t-101 38.5t-75.5 73t-28.5 108q0 58 29.5 102.5t78 70t101.5 38.5 t109 15v24q0 18 -2 27t-9.5 18.5t-25.5 13.5t-48 4v25h332v-25q-29 0 -47 -5t-25.5 -15.5t-10 -20t-2.5 -24.5zM496 530v-390q58 0 104 45.5t46 139.5q0 106 -41 155.5t-109 49.5zM338 140v390q-63 0 -105.5 -50.5t-42.5 -154.5q0 -98 41.5 -141.5t106.5 -43.5z" />
+<glyph unicode="&#x3a7;" horiz-adv-x="722" d="M699 0h-340v25l28 2q52 3 52 28q0 21 -21 54l-101 162l-38 -51q-56 -76 -75 -106.5t-19 -46.5q0 -19 17.5 -28t63.5 -14v-25h-250v25q37 4 59 16t45 40l175 221l-198 291q-23 34 -38 45t-42 13v25h346v-25l-31 -2q-27 -1 -37.5 -8t-10.5 -23q0 -14 15 -37l97 -150l56 77 q36 49 47 69.5t11 36.5q0 18 -11 25t-40 10l-21 2v25h250v-25q-57 -5 -90.5 -30.5t-97.5 -115.5l-80 -111l182 -283q35 -54 53 -69.5t44 -16.5v-25z" />
+<glyph unicode="&#x3a8;" horiz-adv-x="808" d="M326 298v290q0 18 -2 27t-9.5 18.5t-25.5 13.5t-48 4v25h332v-25q-29 0 -47 -5t-25.5 -15.5t-10 -20t-2.5 -24.5v-288q46 0 73 48t27 113q0 84 35 142q55 91 141 91h33v-25q-24 0 -38.5 -30.5t-14.5 -59.5q0 -4 2 -38.5t2 -51.5q0 -60 -22 -105t-59.5 -69.5t-82 -36.5 t-96.5 -12v-141q0 -58 16.5 -75.5t75.5 -22.5v-25h-347v25q60 3 76.5 25t16.5 78v136q-53 0 -98 11.5t-82.5 37t-58.5 70t-21 104.5q0 8 2 43.5t2 46.5q0 32 -14 61t-41 29v25h33q86 0 142 -91q36 -59 36 -142q0 -65 27 -113t73 -48z" />
+<glyph unicode="&#x3a9;" horiz-adv-x="768" d="M330 0h-302v197h25q7 -48 22 -62.5t49 -14.5h153l-2 29q-98 15 -166.5 88.5t-68.5 172.5q0 121 100 201.5t249 80.5q148 0 243.5 -80.5t95.5 -204.5q0 -95 -69 -165t-166 -93l-2 -29h148q36 0 52.5 15t23.5 62h25v-197h-302l7 181q116 28 116 232q0 101 -48.5 173.5 t-132.5 72.5q-82 0 -127.5 -72t-45.5 -172q0 -206 116 -234z" />
+<glyph unicode="&#x3aa;" horiz-adv-x="389" d="M365 849q0 -26 -19 -44.5t-47 -18.5q-26 0 -44.5 19t-18.5 46q0 26 19 45t45 19t45.5 -19.5t19.5 -46.5zM155 849q0 -26 -18.5 -44.5t-46.5 -18.5q-26 0 -45 19t-19 46q0 26 19.5 45t45.5 19t45 -19.5t19 -46.5zM370 0h-350v25q57 5 75 20t18 61v470q0 41 -19 56t-74 19 v25h350v-25q-56 -2 -75.5 -17.5t-19.5 -57.5v-470q0 -48 18.5 -62.5t76.5 -18.5v-25z" />
+<glyph unicode="&#x3ab;" horiz-adv-x="703" d="M693 670v-25q-18 5 -31 5q-30 0 -56 -8.5t-53.5 -32t-49 -61.5t-40 -101t-29.5 -146v-178q0 -58 16.5 -75.5t75.5 -22.5v-25h-347v25q60 5 76.5 25t16.5 78v136q0 166 -50.5 264t-141.5 98q-29 0 -59 -10l-14 24q22 20 57.5 36t66.5 16q121 0 185.5 -65t77.5 -233h5 q11 58 28 103q34 95 89.5 140t122.5 45q35 0 54 -12zM520 849q0 -26 -19 -44.5t-47 -18.5q-26 0 -44.5 19t-18.5 46q0 26 19 45t45 19t45.5 -19.5t19.5 -46.5zM310 849q0 -26 -18.5 -44.5t-46.5 -18.5q-26 0 -45 19t-19 46q0 26 19.5 45t45.5 19t45 -19.5t19 -46.5z" />
+<glyph unicode="&#x3ac;" horiz-adv-x="644" d="M592 154h25q-1 -66 -27 -116t-78 -50q-69 0 -105 77q-34 -44 -73 -61.5t-93 -17.5q-94 0 -155 67t-61 173q0 110 64 178.5t166 68.5q127 0 179 -121h1l29 109h154l-129 -270q0 -8 9 -35q12 -36 22 -54t15.5 -21t14.5 -3q16 0 28 20t14 56zM361 198q-1 28 -8 66t-19 79.5 t-32 70t-44 28.5q-50 0 -68 -46.5t-18 -162.5q0 -119 18 -167.5t62 -48.5q37 0 68 59t41 122zM249 528l61 136q12 28 47 28q37 0 37 -44q0 -15 -34 -53l-63 -67h-48z" />
+<glyph unicode="&#x3ad;" horiz-adv-x="444" d="M412 109l17 -18q-69 -105 -203 -105q-198 0 -198 132q0 77 88 123v1q-32 12 -51 37.5t-19 50.5q0 58 53 100.5t150 42.5q66 0 115 -26.5t49 -79.5q0 -24 -16 -41t-45 -17q-24 0 -40.5 13.5t-16.5 40.5q0 8 4 22.5t4 19.5q0 37 -65 37q-34 0 -56.5 -29.5t-22.5 -70.5 q0 -38 20.5 -61.5t53.5 -23.5q3 0 20 5.5t34 5.5q19 0 29 -7.5t10 -17.5q0 -12 -11 -21t-33 -9q-13 0 -44 9q-32 0 -59 -24t-27 -63q0 -48 30 -71.5t79 -23.5q45 0 88 19t63 50zM155 528l61 136q12 28 47 28q37 0 37 -44q0 -15 -34 -53l-63 -67h-48z" />
+<glyph unicode="&#x3ae;" horiz-adv-x="585" d="M247 0h-139v346q0 56 -24 56q-23 0 -49 -48l-23 11q17 45 53.5 76.5t82.5 31.5q40 0 69 -20t29 -67h1q51 87 143 87q62 0 98 -39t36 -106v-380q0 -106 21 -153h-138q-15 28 -18.5 58t-3.5 94v372q0 87 -50 87q-37 0 -71 -34q-17 -17 -17 -24v-348zM205 528l61 136 q12 28 47 28q37 0 37 -44q0 -15 -34 -53l-63 -67h-48z" />
+<glyph unicode="&#x3af;" horiz-adv-x="326" d="M208 461v-349q0 -56 24 -56t49 45l23 -12q-17 -43 -55.5 -73t-87.5 -30q-46 0 -69 26.5t-23 64.5v299q0 33 -11.5 45t-42.5 16v24h193zM87 528l61 136q12 28 47 28q37 0 37 -44q0 -15 -34 -53l-63 -67h-48z" />
+<glyph unicode="&#x3b0;" horiz-adv-x="576" d="M247 381v-156q0 -52 2.5 -84.5t10 -63.5t23.5 -45.5t42 -14.5t42.5 15.5t24 47t10 64t2.5 82.5q0 88 -30.5 153t-92.5 70v24q126 0 198 -63.5t72 -180.5q0 -107 -63 -175t-163 -68q-105 0 -161 44t-56 143v182q0 47 -24 47q-23 0 -49 -48l-23 11q17 45 53.5 76.5 t82.5 31.5q40 0 69.5 -21.5t29.5 -70.5zM479 591q0 -26 -19 -44.5t-47 -18.5q-26 0 -44.5 19t-18.5 46q0 26 19 45t45 19t45.5 -19.5t19.5 -46.5zM205 528l61 136q12 28 47 28q37 0 37 -44q0 -15 -34 -53l-63 -67h-48zM214 591q0 -26 -18.5 -44.5t-46.5 -18.5q-26 0 -45 19 t-19 46q0 26 19.5 45t45.5 19t45 -19.5t19 -46.5z" />
+<glyph unicode="&#x3b1;" horiz-adv-x="644" d="M592 154h25q-1 -66 -27 -116t-78 -50q-69 0 -105 77q-34 -44 -73 -61.5t-93 -17.5q-94 0 -155 67t-61 173q0 110 64 178.5t166 68.5q127 0 179 -121h1l29 109h154l-129 -270q0 -8 9 -35q12 -36 22 -54t15.5 -21t14.5 -3q16 0 28 20t14 56zM361 198q-1 28 -8 66t-19 79.5 t-32 70t-44 28.5q-50 0 -68 -46.5t-18 -162.5q0 -119 18 -167.5t62 -48.5q37 0 68 59t41 122z" />
+<glyph unicode="&#x3b2;" horiz-adv-x="556" d="M66 -54v386q0 107 20 179t70 124q54 57 151 57q71 0 122.5 -40.5t51.5 -113.5q0 -84 -85 -127l-1 -2q129 -39 129 -183q0 -102 -65 -171t-161 -69q-50 0 -93 26v-66q0 -102 -20 -151h-140q13 28 17 58.5t4 92.5zM205 495v-423q27 -55 85 -55q50 0 68 43.5t18 156.5 q0 56 -13.5 98.5t-28.5 59.5t-25 17q-9 0 -22.5 -4.5t-20.5 -4.5q-19 0 -29.5 8t-10.5 18q0 27 48 27q7 0 24 -4.5t21 -4.5q10 0 16.5 27t6.5 55q0 32 -4.5 63t-20 60t-40.5 29q-41 0 -56.5 -37.5t-15.5 -128.5z" />
+<glyph unicode="&#x3b3;" horiz-adv-x="518" d="M332 461h169l-202 -400q0 -4 8.5 -58.5t8.5 -86.5q0 -50 -21.5 -85.5t-62.5 -35.5q-43 0 -57 27t-14 80q0 73 61 216q-10 110 -34 169q-38 96 -92 96q-48 0 -59 -75h-25q0 28 5 55.5t15.5 53t30.5 41t47 15.5q42 0 68.5 -40t45.5 -112l29 -111z" />
+<glyph unicode="&#x3b4;" horiz-adv-x="502" d="M222 419v2q-84 35 -115 78q-22 29 -22 61q0 40 35 71.5t78 46t81 14.5q39 0 73.5 -6t62.5 -23.5t28 -45.5q0 -15 -12.5 -32.5t-35.5 -17.5q-34 0 -76.5 40.5t-69.5 40.5q-15 0 -32 -3t-35.5 -15t-18.5 -31q0 -25 30 -48.5t70 -41t89.5 -50.5t78.5 -72q46 -59 46 -172 q0 -87 -62.5 -158t-161.5 -71q-103 0 -165 69.5t-62 151.5q0 93 60 154q55 58 136 58zM252 387q-45 0 -62 -42t-17 -141q0 -97 18 -142t62 -45q26 0 42 13t23 43t9 59.5t2 82.5q0 172 -77 172z" />
+<glyph unicode="&#x3b5;" horiz-adv-x="444" d="M412 109l17 -18q-69 -105 -203 -105q-198 0 -198 132q0 77 88 123v1q-32 12 -51 37.5t-19 50.5q0 58 53 100.5t150 42.5q66 0 115 -26.5t49 -79.5q0 -24 -16 -41t-45 -17q-24 0 -40.5 13.5t-16.5 40.5q0 8 4 22.5t4 19.5q0 37 -65 37q-34 0 -56.5 -29.5t-22.5 -70.5 q0 -38 20.5 -61.5t53.5 -23.5q3 0 20 5.5t34 5.5q19 0 29 -7.5t10 -17.5q0 -12 -11 -21t-33 -9q-13 0 -44 9q-32 0 -59 -24t-27 -63q0 -48 30 -71.5t79 -23.5q45 0 88 19t63 50z" />
+<glyph unicode="&#x3b6;" horiz-adv-x="459" d="M243 692l9 -24q-63 -27 -63 -68q0 -20 9.5 -33.5t22.5 -17.5q89 85 144 85q57 0 57 -43q0 -39 -58.5 -65t-133.5 -26q-50 -40 -94.5 -118t-44.5 -152q0 -66 46 -90.5t135 -24.5q165 0 165 -138q0 -87 -52 -134.5t-123 -47.5q-42 0 -67 18t-25 43q0 26 17.5 44t43.5 18 q35 0 63.5 -23t43.5 -23q21 0 39.5 20t18.5 48q0 25 -16.5 39t-45.5 14q-17 0 -61.5 -4.5t-55.5 -4.5q-103 1 -148.5 45t-45.5 146q0 98 51.5 191t111.5 146q-33 5 -53.5 25.5t-20.5 52.5q0 74 131 102z" />
+<glyph unicode="&#x3b7;" horiz-adv-x="585" d="M247 0h-139v346q0 56 -24 56q-23 0 -49 -48l-23 11q17 45 53.5 76.5t82.5 31.5q40 0 69 -20t29 -67h1q51 87 143 87q62 0 98 -39t36 -106v-380q0 -106 21 -153h-138q-15 28 -18.5 58t-3.5 94v372q0 87 -50 87q-37 0 -71 -34q-17 -17 -17 -24v-348z" />
+<glyph unicode="&#x3b8;" horiz-adv-x="501" d="M250 692q70 0 123 -53t78 -132t25 -167q0 -87 -24.5 -166.5t-76 -133.5t-117.5 -54q-76 0 -130.5 54.5t-78.5 132.5t-24 168q0 88 24 166t77 131.5t124 53.5zM172 364h157q0 122 -19 209.5t-60 87.5q-78 0 -78 -297zM329 320h-157q0 -130 18 -216.5t60 -86.5t60.5 86.5 t18.5 216.5z" />
+<glyph unicode="&#x3b9;" horiz-adv-x="326" d="M208 461v-349q0 -56 24 -56t49 45l23 -12q-17 -43 -55.5 -73t-87.5 -30q-46 0 -69 26.5t-23 64.5v299q0 33 -11.5 45t-42.5 16v24h193z" />
+<glyph unicode="&#x3ba;" horiz-adv-x="581" d="M214 461v-201q63 73 110.5 119t78.5 65t48 24t37 5q30 0 50.5 -20.5t20.5 -56.5q0 -23 -18 -44.5t-48 -21.5q-26 0 -49.5 21t-33.5 21q-43 0 -103 -70l179 -232q23 -30 34 -38t28 -8v-24h-248v24q34 1 34 23q0 10 -21 37l-98 129h-1v-213h-139v379q0 31 -12 42.5 t-42 15.5v24h193z" />
+<glyph unicode="&#x3bb;" horiz-adv-x="547" d="M80 527h-25q0 41 8 76t31.5 62t60.5 27q62 0 104 -146l107 -374q29 -100 77 -100q47 0 59 75h25q0 -69 -24 -117t-76 -48q-36 0 -57 34t-35 94l-46 198l-101 -308h-169l226 454l-12 38q-21 66 -42.5 88t-51.5 22q-47 0 -59 -75z" />
+<glyph unicode="&#x3bc;" horiz-adv-x="610" d="M199 9v-77q0 -88 -20 -137h-134q21 43 21 138v528h139v-318q0 -43 21 -67.5t48 -24.5q38 0 79 51v359h139v-350q0 -41 4.5 -56.5t18.5 -15.5q22 0 52 49l21 -12q-43 -107 -144 -107q-82 0 -90 86h-1q-20 -30 -46.5 -49.5t-53.5 -19.5q-39 0 -53 23h-1z" />
+<glyph unicode="&#x3bd;" horiz-adv-x="518" d="M465 473h30q0 -95 -24.5 -173.5t-64 -131t-93.5 -92t-107 -60t-111 -30.5h-26v386q0 35 -10 46.5t-44 18.5v24h193v-323h5q33 6 62.5 18t62.5 37t58 60.5t44 92t25 127.5z" />
+<glyph unicode="&#x3be;" horiz-adv-x="468" d="M240 692l10 -24q-33 -14 -48.5 -33.5t-15.5 -34.5q0 -6 1 -10.5t2 -8t2.5 -6t3.5 -4.5t4 -3l3 -2l3 -1l2 -1q73 71 140 71q63 0 63 -40q0 -36 -52 -57.5t-118 -21.5q-26 0 -39.5 -18t-13.5 -44q0 -19 10.5 -33t24.5 -20q90 41 133 41q19 0 30 -1t25.5 -4.5t21.5 -13 t7 -24.5q0 -30 -43 -45t-82 -15q-41 0 -89 11q-56 -18 -85 -52.5t-29 -72.5q0 -54 44 -82t114 -28q165 0 165 -138q0 -87 -52 -134.5t-123 -47.5q-42 0 -67 18t-25 43q0 26 17.5 44t43.5 18q35 0 63.5 -23t43.5 -23q21 0 39.5 20t18.5 48q0 25 -16.5 39t-45.5 14 q-17 0 -61.5 -4.5t-55.5 -4.5q-94 0 -142.5 51t-48.5 126q0 65 46.5 125t115.5 92q-19 9 -35.5 29t-16.5 45q0 45 38 77v2q-28 4 -45.5 21t-17.5 38q0 33 33 60.5t99 41.5z" />
+<glyph unicode="&#x3bf;" horiz-adv-x="500" d="M476 229q0 -105 -64.5 -174t-161.5 -69q-95 0 -160 68.5t-65 173.5q0 109 64.5 177t164.5 68q95 0 158.5 -69t63.5 -175zM329 218q0 128 -17 176t-61 48q-46 0 -62.5 -47.5t-16.5 -176.5q0 -109 18 -155t61 -46t60.5 44.5t17.5 156.5z" />
+<glyph unicode="&#x3c0;" horiz-adv-x="631" d="M596 361h-117q-11 -44 -11 -142q0 -163 56 -163q45 0 60 71h25q0 -55 -38.5 -98t-103.5 -43q-69 0 -98.5 42.5t-29.5 102.5q0 33 7.5 71t24 95.5t18.5 63.5h-134q0 -8 1 -41t1 -58q0 -55 -4 -97t-16 -87.5t-38 -70.5t-65 -25q-79 0 -79 66q0 20 11.5 37.5t31.5 21.5 q36 7 65.5 100.5t29.5 153.5q-120 0 -148 -52h-25q27 80 67 116t124 36h385v-100z" />
+<glyph unicode="&#x3c1;" horiz-adv-x="547" d="M295 -14h1q-48 0 -91 26v-66q0 -102 -20 -151h-140q13 28 17 58t4 92v168q0 107 20 179.5t70 124.5q24 25 63.5 40.5t78.5 15.5q98 0 157.5 -61.5t59.5 -183.5q0 -105 -64.5 -173.5t-155.5 -68.5zM205 271v-199q27 -55 81 -55q47 0 64.5 45t17.5 158q0 122 -23 172 t-70 50q-39 0 -54.5 -39t-15.5 -132z" />
+<glyph unicode="&#x3c2;" horiz-adv-x="464" d="M396 -58q0 25 -16.5 39t-45.5 14q-17 0 -61.5 -4.5t-55.5 -4.5q-100 0 -147 41.5t-47 144.5q0 59 35.5 127.5t105 121t149.5 52.5q54 0 92.5 -25.5t38.5 -72.5q0 -30 -19 -50.5t-46 -20.5q-38 0 -72 34t-64 34q-69 0 -110.5 -36.5t-41.5 -107.5q0 -31 12 -52.5t28 -33 t43 -17.5t47 -7t51 -1q165 0 165 -138q0 -87 -52 -134.5t-123 -47.5q-42 0 -67 18t-25 43q0 26 17.5 44t43.5 18q35 0 63.5 -23t43.5 -23q21 0 39.5 20t18.5 48z" />
+<glyph unicode="&#x3c3;" horiz-adv-x="568" d="M529 461v-100h-200q12 -22 38 -42t49 -33t41 -39.5t18 -61.5q0 -76 -64.5 -137.5t-160.5 -61.5t-160.5 69t-64.5 177q0 93 70 161t195 68h239zM329 169q0 61 -13 102.5t-51 89.5q-40 0 -66.5 -36.5t-26.5 -105.5q0 -110 18.5 -156t61.5 -46q77 0 77 152z" />
+<glyph unicode="&#x3c4;" horiz-adv-x="492" d="M218 361h-58q-36 0 -71 -25t-46 -67h-25q3 22 11 46t23 50.5t34 47.5t46 34.5t58 13.5h267v-100h-139q-5 -11 -10.5 -62.5t-5.5 -101.5q0 -141 51 -141q45 0 60 71h25q0 -55 -38.5 -98t-103.5 -43q-69 0 -98.5 42.5t-29.5 102.5q0 33 7.5 71t24 95.5t18.5 63.5z" />
+<glyph unicode="&#x3c5;" horiz-adv-x="576" d="M247 381v-156q0 -52 2.5 -84.5t10 -63.5t23.5 -45.5t42 -14.5t42.5 15.5t24 47t10 64t2.5 82.5q0 88 -30.5 153t-92.5 70v24q126 0 198 -63.5t72 -180.5q0 -107 -63 -175t-163 -68q-105 0 -161 44t-56 143v182q0 47 -24 47q-23 0 -49 -48l-23 11q17 45 53.5 76.5 t82.5 31.5q40 0 69.5 -21.5t29.5 -70.5z" />
+<glyph unicode="&#x3c6;" horiz-adv-x="653" d="M396 -205h-139v191q-100 0 -166.5 65.5t-66.5 178.5q0 112 64 177.5t175 65.5h45v-25q-54 0 -86 -30.5t-41.5 -72.5t-9.5 -102q0 -125 17.5 -175.5t59.5 -50.5h9v135q0 69 20 149.5t65 127.5q42 44 101 44q73 0 129.5 -67t56.5 -176q0 -111 -67 -177.5t-166 -66.5v-191z M396 274v-257h8q46 0 62 47t16 179q0 197 -53 199q-33 -2 -33 -168z" />
+<glyph unicode="&#x3c7;" horiz-adv-x="612" d="M431 461h155l-251 -397l18 -64q15 -55 38.5 -85t47.5 -30q55 0 67 76h25q0 -75 -25 -120.5t-73 -45.5q-21 0 -38 15t-29 41.5t-20.5 50.5t-16.5 54q-3 10 -4 15l-15 53l-134 -213h-155l237 375l-22 85q-18 67 -38 89.5t-50 22.5q-19 0 -38.5 -16.5t-28.5 -58.5h-25 q0 66 23.5 115.5t76.5 49.5q40 0 62.5 -37t41.5 -108l25 -97z" />
+<glyph unicode="&#x3c8;" horiz-adv-x="763" d="M312 461h139v-444h17q37 0 53 52t16 182q0 53 5.5 88.5t22 68.5t50.5 49t87 16h49v-25q-78 -13 -78 -115q0 -7 5.5 -59t5.5 -67q0 -97 -61.5 -159t-149.5 -62h-22v-191h-139v191h-22q-88 0 -149.5 62t-61.5 159q0 16 6 65.5t6 60.5q0 98 -79 115v25h49q50 0 83.5 -16.5 t51 -48t24 -68.5t6.5 -89q0 -130 16 -182t53 -52h17v444z" />
+<glyph unicode="&#x3c9;" horiz-adv-x="733" d="M419 448v25h29q134 0 197 -68.5t63 -177.5q0 -113 -65.5 -177t-145.5 -64q-90 0 -132 60q-50 -60 -130 -60t-144.5 65t-64.5 179q0 99 64 171t187 72h34v-25q-39 0 -65.5 -13t-40.5 -31.5t-21.5 -51.5t-9 -59t-1.5 -69q0 -24 0.5 -39t2.5 -43.5t6.5 -46.5t12.5 -38 t21.5 -30t31.5 -10q26 0 49.5 26.5t27.5 68.5q-32 72 -32 132q0 50 18.5 82t56.5 32q37 0 53 -34t16 -77q0 -64 -32 -136q4 -44 26.5 -69t50.5 -25q24 0 41 20.5t24.5 54.5t10.5 65.5t3 66.5q0 41 -2 68.5t-10 59.5t-22.5 51t-41.5 32t-66 13z" />
+<glyph unicode="&#x3ca;" horiz-adv-x="335" d="M236 461v-349q0 -56 24 -56t49 45l23 -12q-17 -43 -55.5 -73t-87.5 -30q-46 0 -69 26.5t-23 64.5v299q0 33 -11.5 45t-42.5 16v24h193zM337 600q0 -26 -19 -44.5t-47 -18.5q-26 0 -44.5 19t-18.5 46q0 26 19 45t45 19t45.5 -19.5t19.5 -46.5zM127 600q0 -26 -18.5 -44.5 t-46.5 -18.5q-26 0 -45 19t-19 46q0 26 19.5 45t45.5 19t45 -19.5t19 -46.5z" />
+<glyph unicode="&#x3cb;" horiz-adv-x="576" d="M247 381v-156q0 -52 2.5 -84.5t10 -63.5t23.5 -45.5t42 -14.5t42.5 15.5t24 47t10 64t2.5 82.5q0 88 -30.5 153t-92.5 70v24q126 0 198 -63.5t72 -180.5q0 -107 -63 -175t-163 -68q-105 0 -161 44t-56 143v182q0 47 -24 47q-23 0 -49 -48l-23 11q17 45 53.5 76.5 t82.5 31.5q40 0 69.5 -21.5t29.5 -70.5zM452 600q0 -26 -19 -44.5t-47 -18.5q-26 0 -44.5 19t-18.5 46q0 26 19 45t45 19t45.5 -19.5t19.5 -46.5zM242 600q0 -26 -18.5 -44.5t-46.5 -18.5q-26 0 -45 19t-19 46q0 26 19.5 45t45.5 19t45 -19.5t19 -46.5z" />
+<glyph unicode="&#x3cc;" horiz-adv-x="500" d="M179 528l61 136q12 28 47 28q37 0 37 -44q0 -15 -34 -53l-63 -67h-48zM476 229q0 -105 -64.5 -174t-161.5 -69q-95 0 -160 68.5t-65 173.5q0 109 64.5 177t164.5 68q95 0 158.5 -69t63.5 -175zM329 218q0 128 -17 176t-61 48q-46 0 -62.5 -47.5t-16.5 -176.5 q0 -109 18 -155t61 -46t60.5 44.5t17.5 156.5z" />
+<glyph unicode="&#x3cd;" horiz-adv-x="576" d="M247 381v-156q0 -52 2.5 -84.5t10 -63.5t23.5 -45.5t42 -14.5t42.5 15.5t24 47t10 64t2.5 82.5q0 88 -30.5 153t-92.5 70v24q126 0 198 -63.5t72 -180.5q0 -107 -63 -175t-163 -68q-105 0 -161 44t-56 143v182q0 47 -24 47q-23 0 -49 -48l-23 11q17 45 53.5 76.5 t82.5 31.5q40 0 69.5 -21.5t29.5 -70.5zM209 528l61 136q12 28 47 28q37 0 37 -44q0 -15 -34 -53l-63 -67h-48z" />
+<glyph unicode="&#x3ce;" horiz-adv-x="733" d="M419 448v25h29q134 0 197 -68.5t63 -177.5q0 -113 -65.5 -177t-145.5 -64q-90 0 -132 60q-50 -60 -130 -60t-144.5 65t-64.5 179q0 99 64 171t187 72h34v-25q-39 0 -65.5 -13t-40.5 -31.5t-21.5 -51.5t-9 -59t-1.5 -69q0 -24 0.5 -39t2.5 -43.5t6.5 -46.5t12.5 -38 t21.5 -30t31.5 -10q26 0 49.5 26.5t27.5 68.5q-32 72 -32 132q0 50 18.5 82t56.5 32q37 0 53 -34t16 -77q0 -64 -32 -136q4 -44 26.5 -69t50.5 -25q24 0 41 20.5t24.5 54.5t10.5 65.5t3 66.5q0 41 -2 68.5t-10 59.5t-22.5 51t-41.5 32t-66 13zM296 528l61 136q12 28 47 28 q37 0 37 -44q0 -15 -34 -53l-63 -67h-48z" />
+<glyph unicode="&#x3d0;" horiz-adv-x="500" d="M462 202q0 -91 -58.5 -151.5t-149.5 -60.5q-70 0 -117 40t-65 96t-18 125q0 123 37 232.5t121 169.5q23 17 59.5 30.5t62.5 13.5q38 0 61 -4t42.5 -23.5t19.5 -56.5q0 -122 -210 -122q-27 0 -38 1q-72 -114 -97 -204q45 49 85.5 75t92.5 26q77 0 124.5 -54.5t47.5 -132.5 zM220 511h12q42 0 76 17q24 12 55.5 51t31.5 63q0 32 -23 32q-61 0 -152 -163zM377 294q0 25 -16 41t-42 16q-43 0 -96.5 -100.5t-53.5 -150.5q0 -15 1 -25.5t5 -22.5t13.5 -18.5t24.5 -6.5q33 0 73 54t65.5 117.5t25.5 95.5z" />
+<glyph unicode="&#x3d1;" horiz-adv-x="647" d="M620 295l-1 -27q-25 0 -69 2q-4 -74 -13 -110q-43 -174 -212 -174q-217 0 -217 186v28q0 48 -24 48q-20 0 -49 -49l-23 12q16 42 52 74.5t84 32.5q38 0 68.5 -25.5t30.5 -75.5v-27q0 -99 14 -136t64 -37q26 0 42 14.5t24 50.5t10.5 79.5t2.5 118.5v5q-287 50 -287 247 q0 46 17.5 79t47 49.5t59.5 24t62 7.5q105 0 176.5 -90t71.5 -247v-56q42 -4 69 -4zM249 554q0 -63 37.5 -121t116.5 -95q-4 197 -37 271q-17 41 -51 41t-50 -27.5t-16 -68.5z" />
+<glyph unicode="&#x3d2;" horiz-adv-x="743" d="M394 394h5q12 74 30 120q67 178 195 178q53 0 81 -31t28 -72q0 -37 -21.5 -60.5t-59.5 -23.5q-31 0 -52 19t-21 49q0 35 23 60q0 8 -11 8q-27 0 -54.5 -31t-46.5 -74q-42 -93 -56 -232v-181q0 -58 16.5 -75.5t75.5 -22.5v-25h-347v25q60 5 76.5 25t16.5 78v136 q0 166 -50.5 264t-141.5 98q-29 0 -59 -10l-14 24q22 20 57.5 36t66.5 16q121 0 185.5 -65t77.5 -233z" />
+<glyph unicode="&#x3d5;" horiz-adv-x="653" d="M396 676v-203h11q96 0 159 -69t63 -175q0 -105 -64.5 -174t-162.5 -69h-6v-191h-139v191h-8q-96 0 -160.5 68.5t-64.5 173.5q0 110 64.5 177.5t164.5 67.5h4v203h139zM257 17v425h-7q-46 0 -62.5 -47.5t-16.5 -176.5q0 -109 18 -155t61 -46h7zM396 442v-425h8 q45 0 61.5 43.5t16.5 156.5q0 128 -16.5 176.5t-59.5 48.5h-10z" />
+<glyph unicode="&#x3d6;" horiz-adv-x="864" d="M851 361h-78q42 -55 42 -136q0 -114 -62.5 -176.5t-149.5 -62.5q-89 0 -131 60q-50 -60 -131 -60q-87 0 -147.5 62t-60.5 177q0 76 49 136h-24q-87 0 -124 -62h-25q56 162 216 162h626v-100zM642 361h-337q-25 -42 -25 -147q0 -197 75 -197q27 0 50 26.5t27 67.5 q-30 73 -30 113q0 37 18.5 63t56.5 26q34 0 51.5 -25.5t17.5 -61.5q0 -10 -1.5 -20.5t-3 -17.5t-5.5 -19l-7 -17q-2 -6 -8.5 -21t-8.5 -20q4 -41 27 -67.5t50 -26.5q79 0 79 198q0 105 -26 146z" />
+<glyph unicode="&#x3d8;" horiz-adv-x="778" d="M308 -88v77q-124 24 -198.5 117.5t-74.5 227.5q0 159 101 258t258 99q151 0 250 -100.5t99 -255.5q0 -134 -75 -227.5t-198 -118.5v-77q0 -57 16.5 -72t81.5 -20v-25h-357v25q64 5 80.5 20.5t16.5 71.5zM385 658q-83 0 -128 -85.5t-45 -242.5t46 -236.5t132 -79.5t131 80 t45 234q0 160 -46.5 245t-134.5 85z" />
+<glyph unicode="&#x3d9;" horiz-adv-x="500" d="M181 -205v202q-70 22 -113 84t-43 147q0 109 64.5 177t164.5 68q95 0 158.5 -69t63.5 -175q0 -84 -43 -147t-113 -85v-202h-139zM251 442q-46 0 -62.5 -47.5t-16.5 -176.5q0 -109 18 -155t61 -46t60.5 44.5t17.5 156.5q0 128 -17 176t-61 48z" />
+<glyph unicode="&#x3da;" horiz-adv-x="680" d="M222 -127l26 28q66 -64 140 -64q53 0 80.5 32t27.5 74q0 47 -46 75t-140 42q-46 7 -79.5 15.5t-71 26.5t-60.5 43.5t-38.5 67.5t-15.5 98q0 77 37.5 149t95.5 121.5t128.5 79.5t136.5 30q184 0 184 -95q0 -31 -19.5 -49.5t-51.5 -18.5q-17 0 -32.5 11.5t-29 27.5 t-28.5 32t-38.5 27.5t-51.5 11.5q-89 0 -157.5 -79t-68.5 -181q0 -40 23 -73q32 -44 111.5 -69t165 -43.5t118.5 -42.5q77 -57 77 -154q0 -95 -71.5 -151t-169.5 -56q-113 0 -182 84z" />
+<glyph unicode="&#x3db;" horiz-adv-x="504" d="M460 503h23q-4 -35 -8 -59t-16.5 -60t-29.5 -58t-49 -38.5t-74 -16.5q-12 0 -43 2.5t-47 2.5q-56 0 -100.5 -27t-44.5 -71q0 -32 23 -49.5t59 -17.5q23 0 63.5 3t55.5 3q85 0 125 -42.5t40 -115.5q0 -68 -54 -115t-121 -47q-42 0 -67 18t-25 43q0 26 17.5 44t43.5 18 q35 0 63.5 -23t43.5 -23q20 0 39 15t19 42q0 26 -17 45t-45 19q-17 0 -61.5 -4.5t-55.5 -4.5q-102 0 -148 43t-46 122q0 95 61 159q75 76 237 88q106 7 139 105z" />
+<glyph unicode="&#x3dc;" horiz-adv-x="620" d="M593 676v-202h-24q-10 57 -22 81.5t-38 47.5q-45 39 -173 39q-38 0 -54 -11.5t-16 -39.5v-218h228v-47h-228v-225q0 -43 21 -58t89 -18v-25h-360v25q55 6 71.5 21t16.5 57v472q0 43 -18 58t-70 18v25h577z" />
+<glyph unicode="&#x3dd;" horiz-adv-x="491" d="M458 361h-253v-220h203v-44h-203v-151q0 -102 -20 -151h-140q13 28 17 58.5t4 92.5v515h392v-100z" />
+<glyph unicode="&#x3de;" horiz-adv-x="757" d="M701 604l14 -17l-214 -438q-13 -28 -13 -50q0 -42 39 -42t72 31l16 -20q-81 -82 -154 -82q-58 0 -88.5 30t-30.5 69q0 49 68 127l144 165l-1 1l-504 -199l-14 17l214 438q13 28 13 50q0 42 -39 42t-72 -31l-16 20q81 82 154 82q58 0 88.5 -29.5t30.5 -68.5 q0 -50 -68 -128l-144 -165l1 -1z" />
+<glyph unicode="&#x3df;" horiz-adv-x="485" d="M258 0h-140l169 296h-258l195 396h140l-169 -296h258z" />
+<glyph unicode="&#x3e0;" horiz-adv-x="839" d="M66 509l-33 25q73 87 150.5 122.5t192.5 35.5q197 0 311 -116t114 -298q0 -116 -46 -222t-136.5 -179t-205.5 -82v33q70 23 122 85.5t77 141.5t25 163q0 116 -48 202q-70 -30 -103 -143t-33 -232v-45h-162q0 148 76 282.5t202 178.5q-41 71 -112.5 117.5t-148.5 46.5 q-20 0 -29 -2v-276h-47v264q-93 -15 -166 -102z" />
+<glyph unicode="&#x3e1;" horiz-adv-x="611" d="M182 238l-22 38l156 90q-124 176 -287 239l15 34q144 -15 267 -94t194 -202q78 -135 78 -297q0 -130 -53 -251l-37 4q7 41 7 86q0 134 -69 284l-157 -91l-22 38l160 92q-39 71 -70 122z" />
+<glyph unicode="&#x3f0;" horiz-adv-x="563" d="M377 461h169l-168 -211q-10 -50 -10 -100q0 -66 51 -66q6 0 22 11.5t36 11.5q18 0 34.5 -14t16.5 -40q0 -35 -24.5 -53.5t-60.5 -18.5q-51 0 -84 37.5t-33 102.5q0 27 7 72l-153 -193h-168l169 214q9 52 9 90q0 66 -51 66q-6 0 -22 -11.5t-36 -11.5q-18 0 -34.5 14 t-16.5 40q0 35 24.5 53.5t60.5 18.5q51 0 84 -37.5t33 -102.5q0 -17 -6 -63z" />
+<glyph unicode="&#x3f1;" horiz-adv-x="511" d="M434 -205h-25q0 17 -10 22.5t-32 6t-49 1.5t-67.5 13t-80.5 36q-84 50 -114.5 133.5t-30.5 189.5q0 127 68 201.5t171 74.5q95 0 158.5 -69t63.5 -175q0 -105 -64.5 -174t-161.5 -69t-152 60l-2 -1q21 -50 71 -79.5t108 -29.5q14 0 41.5 1.5t38.5 1.5q93 0 93 -79 q0 -30 -24 -65zM261 442q-46 0 -62.5 -47.5t-16.5 -176.5q0 -109 18 -155t61 -46t60.5 44.5t17.5 156.5q0 128 -17 176t-61 48z" />
+<glyph unicode="&#x3f4;" horiz-adv-x="778" d="M394 691q151 0 250 -100.5t99 -255.5q0 -156 -99.5 -255t-255.5 -99q-155 0 -254 99t-99 254q0 159 101 258t258 99zM566 317h-354q1 -150 47 -226.5t131 -76.5t130 77t46 226zM212 364h353q-5 143 -51.5 218.5t-128.5 75.5q-78 0 -123 -76.5t-50 -217.5z" />
+<glyph unicode="&#x3f5;" horiz-adv-x="444" d="M412 109l18 -18q-41 -55 -86.5 -80t-104.5 -25q-95 0 -154.5 64.5t-59.5 171.5q0 110 64 180.5t159 70.5q31 0 54 -5t33.5 -10t11.5 -5q21 0 22 20h23l17 -147h-23q-33 117 -115 117q-51 0 -77.5 -51.5t-26.5 -121.5h157v-44h-157q0 -76 42.5 -124.5t95.5 -48.5 q58 0 107 56z" />
+<glyph unicode="&#x3f6;" horiz-adv-x="444" d="M32 350l-18 18q41 55 86.5 80t104.5 25q95 0 154.5 -64.5t59.5 -171.5q0 -110 -64 -180.5t-159 -70.5q-31 0 -54 5t-33.5 10t-11.5 5q-21 0 -22 -20h-23l-17 147h23q33 -117 115 -117q51 0 77.5 51.5t26.5 121.5h-157v44h157q0 76 -42.5 124.5t-95.5 48.5q-58 0 -107 -56 z" />
+<glyph unicode="&#x401;" horiz-adv-x="667" d="M511 850q0 -26 -19 -44.5t-47 -18.5q-26 0 -44.5 19t-18.5 46q0 26 19 45t45 19t45.5 -19.5t19.5 -46.5zM301 850q0 -26 -18.5 -44.5t-46.5 -18.5q-26 0 -45 19t-19 46q0 26 19.5 45t45.5 19t45 -19.5t19 -46.5zM591 676l2 -191h-29q-17 98 -62.5 127.5t-170.5 29.5 q-38 0 -51.5 -12t-13.5 -42v-225q82 1 118 32.5t45 116.5h25v-338h-25q-7 88 -43.5 121.5t-119.5 33.5v-242q0 -32 17.5 -44t65.5 -12q117 0 182 54q25 20 41.5 46t39.5 77h29l-40 -208h-585v25q54 6 71 21t17 55v479q0 38 -18 53t-70 18v25h575z" />
+<glyph unicode="&#x402;" horiz-adv-x="856" d="M401 340v-340h-259v25q64 5 80.5 20.5t16.5 71.5v527q-92 -3 -124.5 -32t-45.5 -117h-29l2 181h566l2 -181h-29q-13 86 -50 116t-130 33v-269q54 45 156 45q114 0 183 -67.5t69 -185.5q0 -101 -63.5 -182.5t-163.5 -81.5q-71 0 -111 32.5t-40 82.5q0 30 21.5 56.5 t54.5 26.5q29 0 47.5 -16.5t18.5 -45.5q0 -23 -13 -38t-13 -26q0 -16 8.5 -27.5t24.5 -11.5q20 0 32.5 18t17.5 54.5t6 62t1 70.5q0 40 -6 76t-20 70.5t-41 55t-65 20.5q-74 0 -104 -23z" />
+<glyph unicode="&#x403;" horiz-adv-x="632" d="M598 676l2 -192h-29q-3 88 -47 122.5t-146 34.5h-109v-543q0 -35 20 -52t69 -21v-25h-338v25q53 4 70 21.5t17 50.5v481q0 40 -17.5 55t-68.5 18v25h577zM212 778l137 157q25 28 53 28q22 0 35 -12t13 -32q0 -17 -8 -27.5t-32 -25.5l-142 -88h-56z" />
+<glyph unicode="&#x404;" horiz-adv-x="685" d="M215 376h289v-50h-290q1 -75 12 -124t40 -96q21 -35 56.5 -56t76.5 -21q61 0 121 34q39 24 99 89l19 -25q-65 -84 -123 -115t-142 -31q-145 0 -240.5 97.5t-95.5 244.5q0 158 95.5 263t237.5 105q67 0 149 -35q33 -14 44 -14q13 0 20 9t18 37h26l4 -235h-29 q-28 82 -57 116q-76 89 -163 89q-68 0 -117.5 -74.5t-49.5 -207.5z" />
+<glyph unicode="&#x405;" horiz-adv-x="556" d="M484 474h-29q-13 48 -28 75.5t-41 54.5q-54 56 -123 56q-51 0 -80.5 -27.5t-29.5 -71.5q0 -36 21 -59t82 -55q18 -10 68.5 -35.5t79.5 -41.5q49 -27 79 -73.5t30 -102.5q0 -95 -68.5 -154t-179.5 -59q-61 0 -130 24q-31 10 -41 10q-12 0 -19 -7.5t-11 -26.5h-29v248h29 q23 -96 60 -143q57 -72 144 -72q58 0 92 30.5t34 82.5q0 48 -57 88q-25 18 -122 65q-89 43 -130 90t-41 120q0 95 58.5 148t160.5 53q55 0 117 -23q30 -10 42 -10q14 0 20.5 7t11.5 27h30v-218z" />
+<glyph unicode="&#x406;" horiz-adv-x="389" d="M370 0h-350v25q57 5 75 20t18 61v470q0 41 -19 56t-74 19v25h350v-25q-56 -2 -75.5 -17.5t-19.5 -57.5v-470q0 -48 18.5 -62.5t76.5 -18.5v-25z" />
+<glyph unicode="&#x407;" horiz-adv-x="389" d="M363 850q0 -26 -19 -44.5t-47 -18.5q-26 0 -44.5 19t-18.5 46q0 26 19 45t45 19t45.5 -19.5t19.5 -46.5zM153 850q0 -26 -18.5 -44.5t-46.5 -18.5q-26 0 -45 19t-19 46q0 26 19.5 45t45.5 19t45 -19.5t19 -46.5zM370 0h-350v25q57 5 75 20t18 61v470q0 41 -19 56t-74 19 v25h350v-25q-56 -2 -75.5 -17.5t-19.5 -57.5v-470q0 -48 18.5 -62.5t76.5 -18.5v-25z" />
+<glyph unicode="&#x408;" horiz-adv-x="500" d="M478 676v-25q-55 -4 -71.5 -22t-16.5 -73v-430q0 -222 -212 -222q-74 0 -108 23q-29 20 -48 50t-19 60q0 28 21.5 51t49.5 23t50 -23t22 -53q0 -15 -13.5 -34t-13.5 -32q0 -32 45 -32q34 0 49 21.5t15 68.5v550q0 43 -20 57.5t-81 16.5v25h351z" />
+<glyph unicode="&#x409;" horiz-adv-x="1005" d="M137 676h549v-25q-52 -2 -67.5 -21t-15.5 -55v-200h73q130 0 206 -45.5t76 -141.5q0 -83 -72 -135.5t-202 -52.5h-329v25q54 6 70 20t16 55v472q0 32 -9.5 43t-40.5 11h-78q-26 0 -34.5 -11t-8.5 -43v-303q0 -287 -150 -287q-110 0 -110 93q0 35 24 53.5t52 18.5 q16 0 28.5 -4.5t21 -15t12.5 -17.5t10 -21l9 -18q53 0 53 226v298q0 27 -16.5 39.5t-66.5 16.5v25zM603 343v-245q0 -36 15 -51t48 -15q58 0 89 40t31 116q0 155 -157 155h-26z" />
+<glyph unicode="&#x40a;" horiz-adv-x="1054" d="M490 103v223h-222v-228q0 -39 15.5 -53t63.5 -20v-25h-326v25q53 7 69 20.5t16 52.5v479q0 41 -17 55t-68 19v25h326v-25q-46 -4 -62.5 -18.5t-16.5 -55.5v-204h222v204q0 41 -16.5 55.5t-62.5 18.5v25h329v-25q-51 -4 -69.5 -19t-18.5 -55v-204h73q130 0 206 -44.5 t76 -140.5q0 -83 -72 -135.5t-202 -52.5h-322v25q48 6 63.5 21t15.5 57zM652 341v-243q0 -36 15 -51t48 -15q58 0 89 40t31 116q0 153 -157 153h-26z" />
+<glyph unicode="&#x40b;" horiz-adv-x="883" d="M557 0v25q46 6 59.5 20t13.5 53v43q0 40 -5.5 75.5t-19 70.5t-40 55.5t-64.5 20.5q-70 0 -100 -23v-242q0 -40 13.5 -53.5t60.5 -19.5v-25h-333v25q64 5 80.5 20.5t16.5 71.5v527q-92 -3 -124.5 -32t-45.5 -117h-29l3 181h564l3 -181h-29q-13 86 -50 116t-130 33v-269 q54 45 159 45q112 0 171 -61.5t59 -181.5v-79q0 -39 15 -53t63 -20v-25h-311z" />
+<glyph unicode="&#x40c;" horiz-adv-x="759" d="M358 676v-25q-54 -4 -71 -20.5t-17 -63.5v-198q43 0 82 21q29 15 52 45t34 54t29 69q24 63 58.5 94.5t97.5 31.5q44 0 70.5 -22.5t26.5 -57.5q0 -31 -19 -52t-49 -21q-23 0 -38 11t-21 23.5t-13 23.5t-15 11q-23 0 -35 -19.5t-34 -78.5q-31 -87 -91 -132v-2 q62 -9 108 -46.5t85 -118.5q5 -11 20 -48.5t29.5 -62.5t36.5 -46q20 -20 57 -21v-25h-243l-90 204q-29 65 -58 93t-80 28v-230q0 -37 16.5 -50t70.5 -20v-25h-336v25q55 5 71 19t16 57v472q0 46 -17 60.5t-70 17.5v25h337zM283 738l137 157q25 28 53 28q22 0 35 -12t13 -32 q0 -17 -8 -27.5t-32 -25.5l-142 -88h-56z" />
+<glyph unicode="&#x40e;" horiz-adv-x="722" d="M631 612l-239 -481q-43 -88 -81 -122q-36 -31 -88 -31q-51 0 -82 23.5t-31 68.5q0 32 22 51.5t46 19.5q18 0 31 -5t22 -16.5t13 -18.5t11 -23q3 -7 11 -14t15 -7q22 0 81 120l-264 415q-35 56 -83 59v25h335v-25l-27 -2q-32 -2 -43 -7.5t-11 -21.5q0 -19 24 -59l140 -229 h6l86 174q38 78 38 103q0 22 -16.5 30t-67.5 12v25h220v-25q-52 -8 -68 -39zM199 869q0 30 18 43.5t39 13.5q17 0 30.5 -11.5t13.5 -29.5q0 -19 -9.5 -30t-9.5 -17q0 -18 23.5 -32.5t66.5 -14.5t66 14t23 33q0 6 -9.5 17.5t-9.5 30.5q0 18 14.5 29t32.5 11q21 0 37.5 -13.5 t16.5 -43.5q0 -43 -29.5 -73.5t-66.5 -42.5t-75 -12q-61 0 -116.5 33t-55.5 95z" />
+<glyph unicode="&#x40f;" horiz-adv-x="770" d="M181 0h-160v25q52 2 67.5 21t15.5 55v475q0 37 -16 56t-67 19v25h312v-25q-38 0 -52.5 -18.5t-14.5 -58.5v-534h242v533q0 39 -15 58.5t-53 19.5v25h313v-25q-83 0 -83 -74v-478q0 -18 2 -28t10 -21t25.5 -17t45.5 -8v-25h-169q-85 0 -128 -43t-55 -133h-28 q-13 91 -57.5 133.5t-134.5 42.5z" />
+<glyph unicode="&#x410;" horiz-adv-x="722" d="M689 0h-322v25l32 3q25 2 35.5 9.5t10.5 23.5q0 29 -46 136h-225l-13 -34q-31 -80 -31 -97q0 -19 18.5 -28.5t62.5 -12.5v-25h-202v25q35 6 53 28t46 92l221 545h28l222 -522q38 -90 58.5 -116.5t51.5 -26.5v-25zM384 236l-101 243l-94 -243h195z" />
+<glyph unicode="&#x411;" horiz-adv-x="667" d="M554 676l2 -172h-29q-2 82 -45.5 111t-147.5 29h-25q-25 -2 -35 -12.5t-10 -36.5v-220h73q130 0 206 -45.5t76 -141.5q0 -83 -72 -135.5t-202 -52.5h-329v25q55 6 71.5 21t16.5 57v467q0 44 -18.5 60.5t-69.5 20.5v25h538zM264 343v-245q0 -36 15 -51t48 -15q58 0 89 40 t31 116q0 155 -157 155h-26z" />
+<glyph unicode="&#x412;" horiz-adv-x="667" d="M16 676h317q252 0 252 -151q0 -59 -37 -96t-122 -54v-1q83 -11 138 -63t55 -123q0 -83 -72 -135.5t-202 -52.5h-329v25q55 6 71.5 21t16.5 57v467q0 44 -18.5 60.5t-69.5 20.5v25zM264 352v-254q0 -36 15 -51t48 -15q58 0 89 40t31 116q0 78 -39.5 121t-117.5 43h-26z M264 590v-206q92 0 124 29.5t32 104.5q0 66 -24 96t-75 30q-30 0 -43.5 -12.5t-13.5 -41.5z" />
+<glyph unicode="&#x413;" horiz-adv-x="632" d="M598 676l2 -192h-29q-3 88 -47 122.5t-146 34.5h-109v-543q0 -35 20 -52t69 -21v-25h-338v25q53 4 70 21.5t17 50.5v481q0 40 -17.5 55t-68.5 18v25h577z" />
+<glyph unicode="&#x414;" horiz-adv-x="715" d="M471 0h-244q-80 0 -121.5 -45t-53.5 -131h-28v202h20q79 0 111 133t32 415q0 36 -13.5 54.5t-61.5 22.5v25h579v-25q-52 -2 -67.5 -21t-15.5 -55v-479q0 -34 15.5 -50.5t67.5 -20.5v-201h-28q-13 91 -57.5 133.5t-134.5 42.5zM160 40h232q29 0 41.5 11.5t12.5 47.5v465 q0 33 -10 47.5t-40 14.5h-116q-25 0 -34 -14.5t-9 -47.5q0 -209 -19 -329.5t-58 -194.5z" />
+<glyph unicode="&#x415;" horiz-adv-x="667" d="M591 676l2 -191h-29q-17 98 -62.5 127.5t-170.5 29.5q-38 0 -51.5 -12t-13.5 -42v-225q82 1 118 32.5t45 116.5h25v-338h-25q-7 88 -43.5 121.5t-119.5 33.5v-241q0 -32 17.5 -44t65.5 -12q118 0 182 53q25 20 41.5 46t39.5 77h29l-40 -208h-585v25q54 6 71 21t17 55v479 q0 38 -18 53t-70 18v25h575z" />
+<glyph unicode="&#x416;" horiz-adv-x="1130" d="M484 369v204q0 46 -17 60.5t-70 17.5v25h330v-25q-54 -4 -71 -20.5t-17 -63.5v-198h22q22 0 40.5 7t33.5 24t25 30.5t21 41.5t15 42l15 44q40 126 146 126q44 0 71.5 -22t27.5 -56q0 -31 -18 -53t-48 -22q-34 0 -48.5 17.5t-19.5 34.5t-14 17q-24 0 -43.5 -51t-45 -112 t-61.5 -77v-2q65 -10 110.5 -43t83.5 -112q7 -14 19.5 -49t27 -61t35.5 -47q20 -20 57 -21v-25h-239l-90 204q-26 60 -47.5 90.5t-48.5 30.5h-27v-230q0 -37 16.5 -50t70.5 -20v-25h-329v25q55 5 71 19t16 57v224h-27q-27 0 -48.5 -30.5t-47.5 -90.5l-90 -204h-239v25 q38 1 57 21q21 21 35.5 47t27 61t19.5 49q38 79 83.5 112t110.5 43v2q-36 16 -61.5 77t-45 112t-43.5 51q-8 0 -13 -11t-8.5 -23.5t-19 -23.5t-41.5 -11q-30 0 -48 22t-18 53q0 34 27.5 56t71.5 22q106 0 146 -126l14 -44q5 -14 16 -42t21 -41.5t25 -30.5t33.5 -24t40.5 -7 h22z" />
+<glyph unicode="&#x417;" horiz-adv-x="570" d="M41 469l4 222h20q8 -34 39 -34q9 0 65 16q62 18 106 18q119 0 178 -46q56 -45 56 -125q0 -81 -74 -128q-47 -30 -112 -36v-2q81 -4 144.5 -47t63.5 -121q0 -104 -76 -154.5t-193 -50.5q-85 0 -139.5 31.5t-100.5 98.5l22 21q63 -59 99 -79.5t89 -20.5q59 0 93.5 41.5 t34.5 111.5q0 83 -38.5 115t-131.5 32v40q48 0 67 6t40 23q47 38 47 107q0 60 -26.5 101t-82.5 41q-81 0 -118.5 -43.5t-46.5 -137.5h-29z" />
+<glyph unicode="&#x418;" horiz-adv-x="778" d="M509 488l-241 -390q0 -40 17 -53.5t72 -19.5v-25h-336v25q53 7 69 20.5t16 52.5v479q0 41 -17 55t-68 19v25h336v-25q-53 -4 -71 -18.5t-18 -55.5v-389l241 389q0 42 -17.5 56t-71.5 18v25h339v-25q-51 -4 -69.5 -19t-18.5 -55v-479q0 -39 16.5 -52.5t71.5 -20.5v-25 h-339v25q54 6 71.5 20.5t17.5 52.5v390z" />
+<glyph unicode="&#x419;" horiz-adv-x="778" d="M509 488l-241 -390q0 -40 17 -53.5t72 -19.5v-25h-336v25q53 7 69 20.5t16 52.5v479q0 41 -17 55t-68 19v25h336v-25q-53 -4 -71 -18.5t-18 -55.5v-389l241 389q0 42 -17.5 56t-71.5 18v25h339v-25q-51 -4 -69.5 -19t-18.5 -55v-479q0 -39 16.5 -52.5t71.5 -20.5v-25 h-339v25q54 6 71.5 20.5t17.5 52.5v390zM217 869q0 30 18 43.5t39 13.5q17 0 30.5 -11.5t13.5 -29.5q0 -19 -9.5 -30t-9.5 -17q0 -18 23.5 -32.5t66.5 -14.5t66 14t23 33q0 6 -9.5 17.5t-9.5 30.5q0 18 14.5 29t32.5 11q21 0 37.5 -13.5t16.5 -43.5q0 -43 -29.5 -73.5 t-66.5 -42.5t-75 -12q-61 0 -116.5 33t-55.5 95z" />
+<glyph unicode="&#x41a;" horiz-adv-x="759" d="M358 676v-25q-54 -4 -71 -20.5t-17 -63.5v-198q43 0 82 21q29 15 52 45t34 54t29 69q24 63 58.5 94.5t97.5 31.5q44 0 70.5 -22.5t26.5 -57.5q0 -31 -19 -52t-49 -21q-23 0 -38 11t-21 23.5t-13 23.5t-15 11q-23 0 -35 -19.5t-34 -78.5q-31 -87 -91 -132v-2 q62 -9 108 -46.5t85 -118.5q5 -11 20 -48.5t29.5 -62.5t36.5 -46q20 -20 57 -21v-25h-243l-90 204q-29 65 -58 93t-80 28v-230q0 -37 16.5 -50t70.5 -20v-25h-336v25q55 5 71 19t16 57v472q0 46 -17 60.5t-70 17.5v25h337z" />
+<glyph unicode="&#x41b;" horiz-adv-x="738" d="M137 676h577v-25q-52 -2 -67.5 -21t-15.5 -55v-475q0 -40 17 -54t71 -21v-25h-339v25q55 6 72 20.5t17 53.5v473q0 32 -9.5 43t-40.5 11h-106q-26 0 -34.5 -11t-8.5 -43v-303q0 -287 -150 -287q-110 0 -110 93q0 35 24 53.5t52 18.5q16 0 28.5 -4.5t21 -15t12.5 -17.5 t10 -21l9 -18q53 0 53 226v298q0 27 -16.5 39.5t-66.5 16.5v25z" />
+<glyph unicode="&#x41c;" horiz-adv-x="944" d="M678 595l-252 -595h-27l-247 586v-457q0 -58 20 -79t81 -25v-25h-239v25q59 6 75 20.5t16 62.5v469q0 41 -17 55.5t-72 18.5v25h253l199 -472l201 472h252v-25q-55 -4 -71.5 -22.5t-16.5 -74.5v-428q0 -57 15 -76.5t73 -24.5v-25h-332v25q55 5 72 22t17 62v486z" />
+<glyph unicode="&#x41d;" horiz-adv-x="778" d="M759 0h-339v25q54 6 71.5 20.5t17.5 52.5v228h-241v-228q0 -40 17 -53.5t72 -19.5v-25h-336v25q53 7 69 20.5t16 52.5v479q0 41 -17 55t-68 19v25h336v-25q-53 -4 -71 -18.5t-18 -55.5v-204h241v204q0 41 -18 55.5t-71 18.5v25h339v-25q-51 -4 -69.5 -19t-18.5 -55v-479 q0 -39 16.5 -52.5t71.5 -20.5v-25z" />
+<glyph unicode="&#x41e;" horiz-adv-x="778" d="M743 335q0 -156 -99.5 -255t-255.5 -99q-155 0 -254 99t-99 254q0 159 101 258t258 99q151 0 250 -100.5t99 -255.5zM566 328q0 160 -46.5 245t-134.5 85q-83 0 -128 -85.5t-45 -242.5t46 -236.5t132 -79.5t131 80t45 234z" />
+<glyph unicode="&#x41f;" horiz-adv-x="762" d="M412 0v25q54 6 71.5 20.5t17.5 52.5v476q0 33 -10 47.5t-39 14.5h-149q-25 0 -34 -14.5t-9 -47.5v-476q0 -40 17 -53.5t72 -19.5v-25h-336v25q53 7 69 20.5t16 52.5v479q0 41 -17 55t-68 19v25h738v-25q-51 -4 -69.5 -19t-18.5 -55v-479q0 -39 16.5 -52.5t71.5 -20.5v-25 h-339z" />
+<glyph unicode="&#x420;" horiz-adv-x="611" d="M262 303v-192q0 -51 14 -65t73 -21v-25h-333v25q33 3 45 9q23 9 31 30t8 62v427q0 58 -15.5 75.5t-68.5 22.5v25h315q128 0 198.5 -45.5t70.5 -135.5q0 -60 -33.5 -104.5t-95.5 -67.5q-32 -12 -70.5 -15.5t-138.5 -4.5zM262 609v-274q94 1 130 33.5t36 115.5 q0 84 -27 122t-89 38q-50 0 -50 -35z" />
+<glyph unicode="&#x421;" horiz-adv-x="709" d="M644 152l30 -25q-67 -83 -132.5 -114.5t-155.5 -31.5q-159 0 -254.5 96.5t-95.5 245.5q0 160 97.5 264t249.5 104q71 0 156 -35q32 -14 46 -14t23.5 9.5t20.5 36.5h27v-225h-29q-8 26 -19 46.5t-19 30.5t-25 29q-79 89 -167 89q-81 0 -132.5 -83.5t-51.5 -229.5 q0 -155 54 -240q22 -34 62.5 -55t84.5 -21q64 0 126 34q41 23 104 89z" />
+<glyph unicode="&#x422;" horiz-adv-x="667" d="M253 117v527q-95 -3 -137.5 -37t-55.5 -122h-29l2 191h601l2 -191h-29q-13 88 -55.5 122t-136.5 37v-527q0 -57 16.5 -72t81.5 -20v-25h-357v25q64 5 80.5 20.5t16.5 71.5z" />
+<glyph unicode="&#x423;" horiz-adv-x="722" d="M631 612l-239 -481q-43 -88 -81 -122q-36 -31 -88 -31q-51 0 -82 23.5t-31 68.5q0 32 22 51.5t46 19.5q18 0 31 -5t22 -16.5t13 -18.5t11 -23q3 -7 11 -14t15 -7q22 0 81 120l-264 415q-35 56 -83 59v25h335v-25l-27 -2q-32 -2 -43 -7.5t-11 -21.5q0 -19 24 -59l140 -229 h6l86 174q38 78 38 103q0 22 -16.5 30t-67.5 12v25h220v-25q-52 -8 -68 -39z" />
+<glyph unicode="&#x424;" horiz-adv-x="850" d="M505 596v-32q56 -2 109.5 -15t102.5 -38.5t78.5 -70t29.5 -102.5q0 -60 -33.5 -107.5t-85 -73.5t-103.5 -39t-98 -13v-24q0 -27 19.5 -38.5t75.5 -17.5v-25h-353v25q61 4 78.5 15t17.5 41v24q-80 0 -149 21.5t-119 76t-50 135.5q0 58 29.5 102.5t78 70t101.5 38.5t109 15 v34q0 31 -17.5 42t-77.5 11v25h352v-25q-56 0 -75.5 -13.5t-19.5 -41.5zM503 530v-390q58 0 104.5 45.5t46.5 139.5q0 106 -41.5 155.5t-109.5 49.5zM345 140v390q-63 0 -106 -50.5t-43 -154.5q0 -98 42 -141.5t107 -43.5z" />
+<glyph unicode="&#x425;" horiz-adv-x="722" d="M688 676v-25q-55 -5 -85.5 -30t-96.5 -115l-84 -115l180 -280q35 -54 53 -69.5t44 -16.5v-25h-340v25l28 2q52 3 52 28q0 21 -21 54l-99 159l-38 -51q-56 -75 -74 -104.5t-18 -45.5q0 -20 16 -29t61 -13v-25h-250v25q38 5 60.5 16.5t43.5 39.5l173 227l-196 285 q-23 34 -38 45t-42 13v25h346v-25l-31 -2q-27 -1 -37.5 -8t-10.5 -23q0 -14 15 -37l95 -147l56 76q37 50 48.5 69t11.5 35q0 18 -11 25t-40 10l-21 2v25h250z" />
+<glyph unicode="&#x426;" horiz-adv-x="770" d="M533 0h-512v25q52 2 67.5 21t15.5 55v475q0 37 -16 56t-67 19v25h312v-25q-38 0 -52.5 -18.5t-14.5 -58.5v-534h242v533q0 39 -15 58.5t-53 19.5v25h313v-25q-83 0 -83 -74v-478q0 -18 2 -28t10 -21t25.5 -17t45.5 -8v-201h-29q-13 92 -57 134t-134 42z" />
+<glyph unicode="&#x427;" horiz-adv-x="732" d="M460 98v197q-81 -37 -162 -37q-39 0 -66.5 3t-56 14t-45.5 30.5t-27.5 53t-10.5 81.5v137q0 38 -18 54t-67 20v25h314v-25q-46 -5 -56.5 -17.5t-10.5 -56.5v-174q0 -54 20.5 -76t74.5 -22q55 0 111 28v244q0 43 -11.5 56.5t-55.5 17.5v25h317v-25q-51 -4 -69.5 -19 t-18.5 -55v-479q0 -39 16.5 -52.5t71.5 -20.5v-25h-339v25q54 6 71.5 20.5t17.5 52.5z" />
+<glyph unicode="&#x428;" horiz-adv-x="1020" d="M756 72v501q0 39 -15 58.5t-53 19.5v25h313v-25q-83 0 -83 -74v-478q0 -18 2 -28t10 -21t25.5 -17t45.5 -8v-25h-980v25q55 5 69 19.5t14 61.5v470q0 43 -15 57t-68 18v25h310v-25q-46 -6 -55.5 -18t-9.5 -57v-503q0 -20 7 -26.5t28 -6.5h99q17 0 23.5 7t6.5 25v500 q0 41 -10.5 59.5t-42.5 19.5v25h262v-25q-47 -3 -47 -77v-501q0 -20 7 -26.5t28 -6.5h99q17 0 23.5 7t6.5 25z" />
+<glyph unicode="&#x429;" horiz-adv-x="1020" d="M756 72v501q0 39 -15 58.5t-53 19.5v25h313v-25q-83 0 -83 -74v-478q0 -18 2 -28t10 -21t25.5 -17t45.5 -8v-201h-29q-13 92 -57 134t-134 42h-760v25q55 5 69 19.5t14 61.5v470q0 43 -15 57t-68 18v25h310v-25q-46 -6 -55.5 -18t-9.5 -57v-503q0 -20 7 -26.5t28 -6.5h99 q17 0 23.5 7t6.5 25v502q0 41 -10 58t-43 19v25h262v-25q-47 -5 -47 -77v-501q0 -20 7 -26.5t28 -6.5h99q17 0 23.5 7t6.5 25z" />
+<glyph unicode="&#x42a;" horiz-adv-x="805" d="M490 676v-25q-55 -2 -71.5 -19t-16.5 -62v-195h73q130 0 206 -45.5t76 -141.5q0 -83 -72 -135.5t-202 -52.5h-331v25q55 6 71.5 21t16.5 57v541q-90 0 -124 -38.5t-46 -120.5h-29l2 191h447zM402 343v-245q0 -36 15 -51t48 -15q58 0 89 40t31 116q0 155 -157 155h-26z " />
+<glyph unicode="&#x42b;" horiz-adv-x="1004" d="M354 676v-25q-55 -2 -71.5 -18t-16.5 -63v-195h73q130 0 206 -45.5t76 -141.5q0 -83 -72 -135.5t-202 -52.5h-331v25q55 6 71.5 21t16.5 57v467q0 44 -18.5 60.5t-69.5 20.5v25h338zM266 343v-245q0 -36 15 -51t48 -15q58 0 89 40t31 116q0 155 -157 155h-26zM985 0h-350 v25q57 5 75 20t18 61v470q0 41 -19 56t-74 19v25h350v-25q-56 -2 -75.5 -17.5t-19.5 -57.5v-470q0 -48 18.5 -62.5t76.5 -18.5v-25z" />
+<glyph unicode="&#x42c;" horiz-adv-x="672" d="M357 676v-25q-55 -2 -71.5 -18t-16.5 -63v-195h73q130 0 206 -45.5t76 -141.5q0 -83 -72 -135.5t-202 -52.5h-331v25q55 6 71.5 21t16.5 57v467q0 44 -18.5 60.5t-69.5 20.5v25h338zM269 343v-245q0 -36 15 -51t48 -15q58 0 89 40t31 116q0 155 -157 155h-26z" />
+<glyph unicode="&#x42d;" horiz-adv-x="685" d="M181 376h289q0 133 -49.5 207.5t-117.5 74.5q-79 0 -140 -59q-53 -51 -80 -136h-29v225h26q10 -27 19 -36.5t23 -9.5q10 0 45 15q79 34 148 34q142 0 237.5 -105t95.5 -263q0 -147 -95.5 -244.5t-240.5 -97.5q-86 0 -148.5 31.5t-126.5 114.5l30 25q61 -67 98 -89 q60 -34 121 -34q41 0 76.5 21t56.5 56q29 47 40 96t12 124h-290v50z" />
+<glyph unicode="&#x42e;" horiz-adv-x="955" d="M268 373h80q10 142 90.5 230t199.5 88q122 0 202 -101t80 -255q0 -156 -80.5 -255t-206.5 -99q-124 0 -204 96.5t-82 248.5h-79v-228q0 -43 10 -55t59 -18v-25h-316v25q53 7 69 20.5t16 52.5v479q0 41 -17 55t-68 19v25h316v-25q-47 -5 -58 -17.5t-11 -56.5v-204z M630 658q-65 0 -93 -82.5t-28 -245.5t29 -239.5t97 -76.5q67 0 95 76.5t28 237.5q0 166 -29.5 248t-98.5 82z" />
+<glyph unicode="&#x42f;" horiz-adv-x="736" d="M114 111l150 207q-182 27 -182 170q0 83 72 135.5t202 52.5h331v-25q-55 -6 -71.5 -21t-16.5 -57v-467q0 -44 18.5 -60.5t69.5 -20.5v-25h-338v25q55 2 71.5 18t16.5 63v205h-12l-231 -311h-182v32q16 4 29 10t21 10.5t17 14t12.5 13.5t12 16t10.5 15zM437 343v235 q0 36 -15 51t-48 15q-58 0 -89 -40t-31 -116t38.5 -110.5t118.5 -34.5h26z" />
+<glyph unicode="&#x430;" horiz-adv-x="517" d="M490 64l15 -21q-53 -57 -112 -57q-37 0 -55.5 15.5t-26.5 53.5q-76 -69 -159 -69q-50 0 -80 26.5t-30 79.5q0 67 67 112q50 33 201 76v68q0 49 -18.5 71t-62.5 22q-28 0 -46.5 -10t-18.5 -27q0 -11 11 -23q19 -23 19 -42q0 -26 -19 -43t-49 -17q-31 0 -48 18t-17 50 q0 59 52.5 92.5t138.5 33.5q92 0 144 -35t52 -99v-261q0 -28 21 -28q7 0 11 4zM310 97v148q-122 -34 -122 -121q0 -32 14.5 -49.5t37.5 -17.5q42 0 70 40z" />
+<glyph unicode="&#x431;" horiz-adv-x="500" d="M441 691h25q-9 -111 -85 -141q-29 -11 -96 -14.5t-93 -12.5q-95 -35 -121 -157h1q68 107 182 107q95 0 158.5 -69t63.5 -175q0 -105 -64.5 -174t-161.5 -69q-101 0 -163 76.5t-62 194.5q0 50 5.5 97t22.5 101.5t44.5 94t76.5 66t114 26.5h98q25 0 37 10.5t18 38.5z M251 442q-46 0 -62.5 -47.5t-16.5 -176.5q0 -109 18 -155t61 -46t60.5 44.5t17.5 156.5q0 128 -17 176t-61 48z" />
+<glyph unicode="&#x432;" horiz-adv-x="492" d="M21 461h240q91 0 139.5 -28t48.5 -81q0 -88 -114 -103v-2q63 -7 101.5 -39.5t38.5 -79.5q0 -57 -53.5 -92.5t-151.5 -35.5h-249v24q33 7 43 19t10 44v289q0 32 -10 44t-43 17v24zM209 231v-156q0 -25 11 -35t37 -10q95 0 95 98q0 103 -123 103h-20zM209 395v-135 q71 0 96 17.5t25 67.5q0 87 -77 87q-44 0 -44 -37z" />
+<glyph unicode="&#x433;" horiz-adv-x="451" d="M213 402v-317q0 -31 12.5 -44t40.5 -17v-24h-245v24q35 8 44 19t9 45v288q0 32 -10.5 44.5t-42.5 16.5v24h410l3 -173h-24q-6 28 -9 39.5t-11.5 32.5t-19 30t-28.5 20t-44 15t-61 4q-24 0 -24 -27z" />
+<glyph unicode="&#x434;" horiz-adv-x="541" d="M19 24h26q22 0 38 12t26.5 37.5t17 54.5t10 72.5t4.5 82t1 92.5q0 35 -7 46t-38 16v24h427v-24q-32 -5 -42.5 -18.5t-10.5 -46.5v-285q0 -32 10.5 -44t42.5 -19v-167h-25q-21 92 -39 117.5t-58 25.5h-251q-43 0 -65.5 -27.5t-42.5 -115.5h-24v167zM182 393v-35 q0 -249 -48 -324v-2h163q35 0 35 38v317q0 22 -6.5 28t-27.5 6h-81q-26 0 -30.5 -4t-4.5 -24z" />
+<glyph unicode="&#x435;" horiz-adv-x="444" d="M403 126l24 -14q-44 -70 -88.5 -98t-109.5 -28q-90 0 -147 67.5t-57 170.5q0 112 57.5 180.5t151.5 68.5q83 0 128 -50q53 -58 59 -178h-255q3 -41 8.5 -70t18 -58t36.5 -44t59 -15q32 0 58 15.5t57 52.5zM164 277h134v26q0 73 -9 92q-12 25 -23.5 36t-31.5 11 q-35 0 -52.5 -38.5t-17.5 -126.5z" />
+<glyph unicode="&#x436;" horiz-adv-x="762" d="M318 262v117q0 54 -48 58v24h222v-23q-31 -4 -39.5 -16t-8.5 -46v-114q31 0 48.5 21t31.5 65.5t23 60.5q16 29 37 43.5t61 14.5q38 0 62 -24t24 -58q0 -26 -13.5 -42.5t-40.5 -16.5q-20 0 -31.5 11.5t-15 25.5t-10.5 25.5t-19 11.5q-19 0 -32.5 -32.5t-27 -70 t-32.5 -45.5v-2q84 -8 122 -67l92 -144q9 -15 25 -15v-24h-162l-121 214q-7 13 -21 13v-143q0 -35 8.5 -45t43.5 -15v-24h-226v24q48 4 48 60v143q-14 0 -21 -13l-121 -214h-162v24q16 0 25 15l92 144q38 59 122 67v2q-19 8 -32.5 45.5t-27 70t-32.5 32.5q-12 0 -19 -11.5 t-10.5 -25.5t-15 -25.5t-31.5 -11.5q-27 0 -40.5 16.5t-13.5 42.5q0 35 24 58.5t62 23.5q40 0 61 -14.5t37 -43.5q9 -16 23 -60.5t31.5 -65.5t48.5 -21z" />
+<glyph unicode="&#x437;" horiz-adv-x="446" d="M46 311l4 160h18q7 -18 13.5 -24.5t16.5 -6.5q12 0 28 9q45 24 100 24q80 0 126.5 -35t46.5 -91q0 -36 -27 -65.5t-68 -40.5v-3q26 -3 49 -11t45 -33t22 -64q0 -68 -65.5 -107.5t-154.5 -39.5q-125 0 -175 78l21 21q36 -30 61 -39t62 -9q51 0 77 26.5t26 64.5 q0 40 -27.5 67.5t-77.5 27.5h-44v32q71 0 106 26q32 24 32 74q0 85 -80 85q-42 0 -70.5 -34t-40.5 -92h-24z" />
+<glyph unicode="&#x438;" horiz-adv-x="556" d="M355 84v225l-146 -225q0 -30 10.5 -43t37.5 -17v-24h-236v24q33 7 43 19t10 44v289q0 32 -10 44t-43 17v24h236v-24q-32 -5 -40 -16t-8 -45v-225l146 225q0 34 -8 45t-40 16v24h236v-24q-33 -5 -43 -17t-10 -44v-289q0 -32 10 -44t43 -19v-24h-236v24q27 4 37.5 17.5 t10.5 42.5z" />
+<glyph unicode="&#x439;" horiz-adv-x="556" d="M355 84v225l-146 -225q0 -30 10.5 -43t37.5 -17v-24h-236v24q33 7 43 19t10 44v289q0 32 -10 44t-43 17v24h236v-24q-32 -5 -40 -16t-8 -45v-225l146 225q0 34 -8 45t-40 16v24h236v-24q-33 -5 -43 -17t-10 -44v-289q0 -32 10 -44t43 -19v-24h-236v24q27 4 37.5 17.5 t10.5 42.5zM111 634q0 30 18 43.5t39 13.5q17 0 30.5 -11.5t13.5 -29.5q0 -19 -9.5 -30t-9.5 -17q0 -18 23.5 -32.5t66.5 -14.5t66 14t23 33q0 6 -9.5 17.5t-9.5 30.5q0 18 14.5 29t32.5 11q21 0 37.5 -13.5t16.5 -43.5q0 -43 -29.5 -73.5t-66.5 -42.5t-75 -12 q-61 0 -116.5 33t-55.5 95z" />
+<glyph unicode="&#x43a;" horiz-adv-x="556" d="M257 461v-23q-31 -4 -39.5 -16t-8.5 -46v-117q32 0 55 16.5t33 34.5t24 52t21 47q32 58 104 58q40 0 65 -22t25 -60q0 -25 -14.5 -43t-41.5 -18q-24 0 -37.5 12t-17 26t-10.5 26t-19 12q-10 0 -19 -9.5t-13.5 -19t-11.5 -27t-9 -21.5q-21 -50 -49 -71v-2q80 -8 122 -67 l102 -144q11 -15 25 -15v-24h-162l-127 197q-11 18 -20 24t-25 6v-143q0 -35 8.5 -45t43.5 -15v-24h-239v24q48 4 48 60v295q0 54 -48 58v24h235z" />
+<glyph unicode="&#x43b;" horiz-adv-x="546" d="M104 461h425v-24q-32 -5 -42.5 -18.5t-10.5 -46.5v-285q0 -31 11 -43.5t42 -19.5v-24h-240v24q27 4 37.5 17.5t10.5 42.5v303q0 22 -5.5 28t-26.5 6h-79q-18 0 -23.5 -6.5t-5.5 -27.5v-203q0 -29 -1 -48t-7 -50t-16.5 -49.5t-32.5 -33t-53 -14.5q-38 0 -56 15 q-20 17 -20 40q0 28 15 43t39 15q18 0 28.5 -14t15.5 -28.5t11 -14.5q37 0 37 159v168q0 34 -10.5 47t-42.5 18v24z" />
+<glyph unicode="&#x43c;" horiz-adv-x="657" d="M400 0v24q28 4 38 17.5t10 45.5v270l-129 -357h-42l-166 366v-282q0 -52 57 -60v-24h-148v24q34 4 45.5 17.5t11.5 45.5v289q0 32 -10 43.5t-43 17.5v24h191l129 -288h1l104 288h191v-24q-33 -5 -43 -17t-10 -44v-289q0 -32 10 -44t43 -19v-24h-240z" />
+<glyph unicode="&#x43d;" horiz-adv-x="560" d="M351 84v141h-138v-141q0 -29 10.5 -42.5t37.5 -17.5v-24h-240v24q33 7 43 19t10 44v289q0 32 -10 44t-43 17v24h240v-24q-32 -5 -40 -16t-8 -45v-119h138v119q0 34 -8 45t-40 16v24h240v-24q-33 -5 -43 -17t-10 -44v-289q0 -32 10 -44t43 -19v-24h-240v24q27 4 37.5 17.5 t10.5 42.5z" />
+<glyph unicode="&#x43e;" horiz-adv-x="500" d="M476 229q0 -105 -64.5 -174t-161.5 -69q-95 0 -160 68.5t-65 173.5q0 109 64.5 177t164.5 68q95 0 158.5 -69t63.5 -175zM329 218q0 128 -17 176t-61 48q-46 0 -62.5 -47.5t-16.5 -176.5q0 -109 18 -155t61 -46t60.5 44.5t17.5 156.5z" />
+<glyph unicode="&#x43f;" horiz-adv-x="556" d="M351 84v296q0 49 -43 49h-53q-24 0 -33 -11.5t-9 -37.5v-296q0 -29 10.5 -42.5t37.5 -17.5v-24h-240v24q33 7 43 19t10 44v289q0 32 -10 44t-43 17v24h522v-24q-33 -5 -43 -17t-10 -44v-289q0 -32 10 -44t43 -19v-24h-240v24q27 4 37.5 17.5t10.5 42.5z" />
+<glyph unicode="&#x440;" horiz-adv-x="556" d="M212 461v-69q25 44 55.5 62.5t75.5 18.5q85 0 133 -57.5t48 -166.5q0 -118 -51.5 -190t-140.5 -72q-34 0 -58 12.5t-60 47.5v-126q0 -52 16.5 -76t60.5 -26v-24h-272v24q35 6 45.5 18.5t10.5 44.5v490q0 33 -11 46.5t-44 18.5v24h192zM214 346v-239q12 -29 32.5 -47 t44.5 -18q85 0 85 192q0 182 -76 182q-37 0 -68 -37q-18 -21 -18 -33z" />
+<glyph unicode="&#x441;" horiz-adv-x="444" d="M412 109l18 -18q-41 -56 -86 -80.5t-105 -24.5q-95 0 -154.5 65t-59.5 171q0 110 68 180.5t169 70.5q66 0 110 -31t44 -79q0 -29 -17.5 -46.5t-47.5 -17.5q-26 0 -42.5 19t-16.5 54q0 18 -0.5 26t-2.5 18.5t-6 15t-12.5 7.5t-20.5 3q-38 0 -61 -44.5t-23 -124.5 q0 -102 37 -161t102 -59q58 0 107 56z" />
+<glyph unicode="&#x442;" horiz-adv-x="509" d="M325 402v-317q0 -31 12.5 -44t40.5 -17v-24h-245v24q35 8 44 19t9 45v314q0 27 -28 27q-53 0 -77.5 -35t-38.5 -106h-24l4 173h469l2 -173h-24q-7 31 -11 47t-13.5 37.5t-20.5 31.5t-30 17.5t-45 7.5q-24 0 -24 -27z" />
+<glyph unicode="&#x443;" horiz-adv-x="520" d="M502 461v-24q-24 -3 -36 -13.5t-24 -41.5l-148 -398q-45 -121 -77 -156q-31 -33 -84 -33q-43 0 -70 22t-27 57q0 29 17 48t45 19q25 0 42.5 -15t17.5 -37q0 -4 -2 -14l-1 -6q0 -7 5 -12t12 -5q38 0 66 82l18 53l-139 290q-9 18 -25 55l-27 61q-11 25 -15 30q-8 10 -34 14 v24h249v-24l-16 -1q-36 -3 -36 -25q0 -16 20 -58l92 -186l68 188q11 32 11 49q0 18 -11 25t-43 8v24h152z" />
+<glyph unicode="&#x444;" horiz-adv-x="726" d="M298 424v153q0 36 -13.5 54t-52.5 21v24h194v-252q35 49 109 49q78 0 118 -68.5t40 -165.5q0 -252 -169 -252q-63 0 -98 50v-116q0 -55 12 -77.5t55 -24.5v-24h-262v24q41 6 54 27.5t13 75.5v115q-35 -50 -98 -50q-169 0 -169 252q0 97 40 165.5t118 68.5q74 0 109 -49z M298 111v238q0 28 -17.5 47t-38.5 19q-76 0 -76 -181q0 -103 17.5 -147.5t56.5 -44.5q25 0 41.5 19.5t16.5 49.5zM426 350v-239q0 -29 18.5 -49t43.5 -20q39 0 54.5 44t15.5 148q0 182 -76 182q-21 0 -38.5 -19t-17.5 -47z" />
+<glyph unicode="&#x445;" horiz-adv-x="500" d="M484 24v-24h-241v24q45 3 45 20q0 15 -33 64l-42 63l-16 -20q-64 -81 -64 -103q0 -21 50 -24v-24h-169v24q27 1 48 18.5t65 74.5l65 84l-128 197q-15 23 -24 29.5t-28 9.5v24h250v-24q-47 -3 -47 -23q0 -18 34 -62l37 -49l36 46q38 49 38 64q0 11 -7 15.5t-24 6.5l-20 2 v24h168v-24q-44 -7 -70 -39l-101 -126l148 -228q8 -13 30 -20z" />
+<glyph unicode="&#x446;" horiz-adv-x="556" d="M213 377v-296q0 -49 43 -49h53q24 0 33 11.5t9 37.5v296q0 29 -10.5 42.5t-37.5 17.5v24h240v-24q-33 -7 -43 -19t-10 -44v-289q0 -32 10 -44t43 -17v-167h-24q-20 88 -42.5 115.5t-65.5 27.5h-390v24q33 5 43 17t10 44v289q0 32 -10 44t-43 19v24h240v-24 q-27 -4 -37.5 -17.5t-10.5 -42.5z" />
+<glyph unicode="&#x447;" horiz-adv-x="559" d="M350 85v110q-56 -25 -111 -25q-35 0 -60.5 4t-51.5 16t-40 38.5t-14 66.5v82q0 32 -10 43.5t-43 16.5v24h240v-24q-32 -5 -40 -16t-8 -45v-102q0 -38 13 -53.5t49 -15.5q35 0 76 19v152q0 34 -8 45t-40 16v24h240v-24q-33 -5 -43 -17t-10 -44v-288q0 -33 10 -45t43 -19 v-24h-248v24q32 0 44 15t12 46z" />
+<glyph unicode="&#x448;" horiz-adv-x="841" d="M530 32h60q24 0 33 11.5t9 37.5v296q0 29 -9 42.5t-36 17.5v24h237v-24q-33 -7 -43 -19t-10 -44v-289q0 -32 10 -44t43 -17v-24h-803v24q33 5 43 17t10 44v289q0 32 -10 44t-43 19v24h237v-24q-27 -4 -36 -17.5t-9 -42.5v-296q0 -49 43 -49h60q21 0 29 11.5t8 37.5v296 q0 29 -9 42.5t-36 17.5v24h234v-24q-33 -7 -41.5 -18.5t-8.5 -44.5v-289q0 -31 8 -42t30 -11z" />
+<glyph unicode="&#x449;" horiz-adv-x="841" d="M530 32h60q24 0 33 11.5t9 37.5v296q0 29 -9 42.5t-36 17.5v24h237v-24q-33 -7 -43 -19t-10 -44v-289q0 -32 10 -44t43 -17v-167h-24q-20 87 -42 115t-62 28h-675v24q33 5 43 17t10 44v289q0 32 -10 44t-43 19v24h237v-24q-27 -4 -36 -17.5t-9 -42.5v-296q0 -49 43 -49 h60q21 0 29 11.5t8 37.5v296q0 29 -9 42.5t-36 17.5v24h234v-24q-33 -7 -41.5 -18.5t-8.5 -44.5v-289q0 -31 8 -42t30 -11z" />
+<glyph unicode="&#x44a;" horiz-adv-x="607" d="M322 376v-115h78q60 0 100.5 -11.5t59 -32t25.5 -41.5t7 -48q0 -57 -51 -92.5t-148 -35.5h-263v24q33 7 43 19t10 44v315q0 27 -28 27q-56 0 -80 -35t-36 -106h-24l4 173h356v-24q-33 -6 -43 -17.5t-10 -43.5zM322 231v-156q0 -45 53 -45q94 0 94 98q0 103 -117 103h-30z " />
+<glyph unicode="&#x44b;" horiz-adv-x="759" d="M211 376v-115h78q60 0 100.5 -11.5t59 -32t25.5 -41.5t7 -48q0 -57 -51 -92.5t-148 -35.5h-260v24q33 7 41.5 18.5t8.5 44.5v289q0 33 -9 44.5t-41 16.5v24h239v-24q-30 -5 -40 -17t-10 -44zM211 231v-156q0 -45 53 -45q94 0 94 98q0 103 -117 103h-30zM691 373v-288 q0 -31 11.5 -44t38.5 -17v-24h-239v24q34 8 42 18.5t8 45.5v285q0 34 -9 45.5t-42 18.5v24h240v-24q-30 -7 -40 -19t-10 -45z" />
+<glyph unicode="&#x44c;" horiz-adv-x="498" d="M213 376v-115h78q60 0 100.5 -11.5t59 -32t25.5 -41.5t7 -48q0 -57 -51 -92.5t-148 -35.5h-263v24q33 7 43 19t10 44v289q0 32 -10 44t-43 17v24h245v-24q-31 -5 -42 -17.5t-11 -43.5zM213 231v-156q0 -45 53 -45q94 0 94 98q0 103 -117 103h-30z" />
+<glyph unicode="&#x44d;" horiz-adv-x="453" d="M141 255h147q0 92 -29 139.5t-77 47.5q-49 0 -83 -35.5t-45 -96.5h-24l3 161h18q7 -18 13.5 -24.5t16.5 -6.5q2 0 32 13q46 20 85 20q105 0 168 -67t63 -186q0 -101 -58.5 -167.5t-150.5 -66.5q-63 0 -108.5 24t-87.5 81l18 18q49 -56 108 -56q34 0 62 18.5t43 46 t22.5 53t7.5 44.5h-144v40z" />
+<glyph unicode="&#x44e;" horiz-adv-x="785" d="M213 257h98q10 98 73 157t155 59q95 0 158.5 -69t63.5 -175q0 -105 -64.5 -174t-161.5 -69q-96 0 -160.5 64t-64.5 175h-97v-141q0 -29 10.5 -42.5t37.5 -17.5v-24h-240v24q33 7 43 19t10 44v289q0 32 -10 44t-43 17v24h240v-24q-32 -5 -40 -16t-8 -45v-119zM536 442 q-46 0 -62.5 -47.5t-16.5 -176.5q0 -109 18 -155t61 -46t60.5 44.5t17.5 156.5q0 128 -17 176t-61 48z" />
+<glyph unicode="&#x44f;" horiz-adv-x="526" d="M317 85v115h-17l-126 -200h-163v24q35 0 73 61l74 119v2q-111 21 -111 127q0 57 51 92.5t148 35.5h263v-24q-33 -7 -43 -19t-10 -44v-289q0 -32 10 -44t43 -17v-24h-245v24q31 5 42 17.5t11 43.5zM317 230v156q0 45 -53 45q-94 0 -94 -98q0 -103 117 -103h30z" />
+<glyph unicode="&#x451;" horiz-adv-x="444" d="M403 126l24 -14q-44 -70 -88.5 -98t-109.5 -28q-90 0 -147 67.5t-57 170.5q0 112 57.5 180.5t151.5 68.5q83 0 128 -50q53 -58 59 -178h-255q3 -41 8.5 -70t18 -58t36.5 -44t59 -15q32 0 58 15.5t57 52.5zM164 277h134v26q0 73 -9 92q-12 25 -23.5 36t-31.5 11 q-35 0 -52.5 -38.5t-17.5 -126.5zM411 600q0 -26 -19 -44.5t-47 -18.5q-26 0 -44.5 19t-18.5 46q0 26 19 45t45 19t45.5 -19.5t19.5 -46.5zM201 600q0 -26 -18.5 -44.5t-46.5 -18.5q-26 0 -45 19t-19 46q0 26 19.5 45t45.5 19t45 -19.5t19 -46.5z" />
+<glyph unicode="&#x452;" horiz-adv-x="556" d="M387 562v-40h-179v-136h1q49 87 141 87q62 0 98.5 -38.5t36.5 -103.5v-331q0 -85 -26 -129q-43 -76 -150 -76q-62 0 -96 23.5t-34 67.5q0 27 17 44t45 17q25 0 42 -15.5t17 -38.5q0 -19 -11.5 -32t-11.5 -14q0 -21 22 -21q25 0 36 18t11 58v419q0 85 -50 85 q-36 0 -70 -34q-18 -18 -18 -24v-263q0 -31 10 -44t38 -17v-24h-240v24q36 7 44.5 16t8.5 49v433h-49v40h49v17q0 37 -10 51.5t-44 21.5v24h193v-114h179z" />
+<glyph unicode="&#x453;" horiz-adv-x="451" d="M213 402v-317q0 -31 12.5 -44t40.5 -17v-24h-245v24q35 8 44 19t9 45v288q0 32 -10.5 44.5t-42.5 16.5v24h410l3 -173h-24q-6 28 -9 39.5t-11.5 32.5t-19 30t-28.5 20t-44 15t-61 4q-24 0 -24 -27zM142 528l137 157q25 28 53 28q22 0 35 -12t13 -32q0 -17 -8 -27.5 t-32 -25.5l-142 -88h-56z" />
+<glyph unicode="&#x454;" horiz-adv-x="453" d="M165 255h147v-40h-144q0 -19 7.5 -44.5t22.5 -53t43 -46t62 -18.5q59 0 108 56l18 -18q-42 -57 -87.5 -81t-108.5 -24q-92 0 -150.5 66.5t-58.5 167.5q0 119 63 186t168 67q39 0 85 -20q30 -13 32 -13q10 0 16.5 6.5t13.5 24.5h18l3 -161h-24q-11 61 -45 96.5t-83 35.5 q-48 0 -77 -47.5t-29 -139.5z" />
+<glyph unicode="&#x455;" horiz-adv-x="389" d="M340 326h-25q-19 56 -47 82q-35 33 -75 33q-28 0 -47 -16.5t-19 -41.5q0 -26 22.5 -47t73.5 -42q75 -31 106.5 -67t31.5 -89q0 -67 -43 -109.5t-111 -42.5q-52 0 -108 23q-15 6 -23 6q-11 0 -26 -28h-25v165h28q32 -134 137 -134q34 0 54.5 18t20.5 47q0 47 -96 89 q-75 32 -108.5 68.5t-33.5 86.5q0 63 44.5 104.5t112.5 41.5q34 0 78 -15q22 -7 31 -7q17 0 25 20h22v-145z" />
+<glyph unicode="&#x456;" horiz-adv-x="278" d="M256 0h-240v24q35 8 44 19t9 45v285q0 33 -10.5 45t-43.5 19v24h193v-376q0 -32 10.5 -44.5t37.5 -16.5v-24zM215 613q0 -33 -22.5 -55t-55.5 -22t-55 22t-22 55t22.5 55.5t56.5 22.5q31 0 53.5 -23t22.5 -55z" />
+<glyph unicode="&#x457;" horiz-adv-x="278" d="M309 600q0 -26 -19 -44.5t-47 -18.5q-26 0 -44.5 19t-18.5 46q0 26 19 45t45 19t45.5 -19.5t19.5 -46.5zM99 600q0 -26 -18.5 -44.5t-46.5 -18.5q-26 0 -45 19t-19 46q0 26 19.5 45t45.5 19t45 -19.5t19 -46.5zM208 461v-376q0 -30 10.5 -43.5t37.5 -17.5v-24h-240v24 q34 7 43.5 19t9.5 45v286q0 33 -10.5 44.5t-44.5 18.5v24h194z" />
+<glyph unicode="&#x458;" horiz-adv-x="333" d="M260 461v-459q0 -84 -27 -129q-43 -76 -150 -76q-62 0 -101 28t-39 72q0 27 17 44t45 17q25 0 42 -15.5t17 -38.5q0 -16 -14 -37q-9 -15 -9 -22q0 -17 32 -17q25 0 36.5 18t11.5 58v474q0 32 -12.5 44t-50.5 15v24h202zM263 613q0 -33 -22.5 -55t-56.5 -22 q-33 0 -54.5 22t-21.5 55t22.5 55.5t55.5 22.5q31 0 54 -23t23 -55z" />
+<glyph unicode="&#x459;" horiz-adv-x="760" d="M288 0v24q27 4 37.5 17.5t10.5 42.5v295q0 23 -7 32.5t-27 9.5h-76q-17 0 -23 -9.5t-6 -32.5v-195q0 -36 -3 -62.5t-12.5 -60.5t-33.5 -53t-61 -19q-38 0 -56 15q-20 17 -20 40q0 28 15 43t39 15q18 0 28.5 -14t15.5 -28.5t11 -14.5q37 0 37 159v168q0 34 -10.5 47 t-42.5 18v24h414v-24q-30 -5 -36.5 -17t-6.5 -48v-117h78q60 0 100.5 -10.5t59 -30t25.5 -39.5t7 -47q0 -57 -51 -92.5t-149 -35.5h-257zM475 225v-155q0 -40 53 -40q94 0 94 98q0 52 -28 74.5t-89 22.5h-30z" />
+<glyph unicode="&#x45a;" horiz-adv-x="775" d="M351 225h-138v-141q0 -29 10.5 -42.5t37.5 -17.5v-24h-240v24q33 7 43 19t10 44v289q0 32 -10 44t-43 17v24h240v-24q-32 -5 -40 -16t-8 -45v-119h138v119q0 34 -8 45t-40 16v24h240v-24q-33 -5 -43 -17t-10 -44v-119h78q60 0 100.5 -10.5t59 -30.5t25.5 -40.5t7 -47.5 q0 -57 -51 -92.5t-149 -35.5h-257v24q27 4 37.5 17t10.5 41v143zM490 225v-155q0 -40 53 -40q94 0 94 98q0 52 -28 74.5t-89 22.5h-30z" />
+<glyph unicode="&#x45b;" horiz-adv-x="556" d="M387 562v-40h-179v-126q65 77 147 77q60 0 95 -38t35 -98v-250q0 -34 11.5 -48.5t37.5 -14.5v-24h-234v24q25 3 35.5 16.5t10.5 44.5v224q0 54 -11 75.5t-40 21.5q-36 0 -70 -34q-17 -17 -17 -24v-263q0 -31 10 -44t38 -17v-24h-240v24q36 7 44.5 16t8.5 49v433h-49v40 h49v29q0 35 -9 44.5t-45 16.5v24h193v-114h179z" />
+<glyph unicode="&#x45c;" horiz-adv-x="556" d="M257 461v-23q-31 -4 -39.5 -16t-8.5 -46v-117q32 0 55 16.5t33 34.5t24 52t21 47q32 58 104 58q40 0 65 -22t25 -60q0 -25 -14.5 -43t-41.5 -18q-24 0 -37.5 12t-17 26t-10.5 26t-19 12q-10 0 -19 -9.5t-13.5 -19t-11.5 -27t-9 -21.5q-21 -50 -49 -71v-2q80 -8 122 -67 l102 -144q11 -15 25 -15v-24h-162l-127 197q-11 18 -20 24t-25 6v-143q0 -35 8.5 -45t43.5 -15v-24h-239v24q48 4 48 60v295q0 54 -48 58v24h235zM169 528l137 157q25 28 53 28q22 0 35 -12t13 -32q0 -17 -8 -27.5t-32 -25.5l-142 -88h-56z" />
+<glyph unicode="&#x45e;" horiz-adv-x="500" d="M502 461v-24q-24 -3 -36 -13.5t-24 -41.5l-148 -398q-45 -121 -77 -156q-31 -33 -84 -33q-43 0 -70 22t-27 57q0 29 17 48t45 19q25 0 42.5 -15t17.5 -37q0 -4 -2 -14l-1 -6q0 -7 5 -12t12 -5q38 0 66 82l18 53l-139 290q-9 18 -25 55l-27 61q-11 25 -15 30q-8 10 -34 14 v24h249v-24l-16 -1q-36 -3 -36 -25q0 -16 20 -58l92 -186l68 188q11 32 11 49q0 18 -11 25t-43 8v24h152zM84 634q0 30 18 43.5t39 13.5q17 0 30.5 -11.5t13.5 -29.5q0 -19 -9.5 -30t-9.5 -17q0 -18 23.5 -32.5t66.5 -14.5t66 14t23 33q0 6 -9.5 17.5t-9.5 30.5 q0 18 14.5 29t32.5 11q21 0 37.5 -13.5t16.5 -43.5q0 -43 -29.5 -73.5t-66.5 -42.5t-75 -12q-61 0 -116.5 33t-55.5 95z" />
+<glyph unicode="&#x45f;" horiz-adv-x="556" d="M213 377v-296q0 -49 43 -49h53q24 0 33 11.5t9 37.5v296q0 29 -10.5 42.5t-37.5 17.5v24h240v-24q-33 -7 -43 -19t-10 -44v-289q0 -32 10 -44t43 -17v-24h-141q-43 0 -65.5 -27.5t-42.5 -115.5h-24q-20 85 -41 114t-59 29h-149v24q33 5 43 17t10 44v289q0 32 -10 44 t-43 19v24h240v-24q-27 -4 -37.5 -17.5t-10.5 -42.5z" />
+<glyph unicode="&#x462;" horiz-adv-x="793" d="M478 676v-25q-55 -2 -71.5 -18t-16.5 -63v-13h197l2 -147h-29q-12 68 -43 82.5t-127 14.5v-132h73q130 0 206 -45.5t76 -141.5q0 -83 -72 -135.5t-202 -52.5h-329v25q55 6 71.5 21t16.5 57v404q-96 0 -127 -14.5t-43 -82.5h-29l2 147h197v13q0 44 -18.5 60.5t-69.5 20.5 v25h336zM390 343v-245q0 -36 15 -51t48 -15q58 0 89 40t31 116q0 155 -157 155h-26z" />
+<glyph unicode="&#x463;" horiz-adv-x="602" d="M317 676v-207h160l3 -181h-24q-5 36 -11 57.5t-18 43t-33 31t-53 9.5q-24 0 -24 -23v-145h78q60 0 100.5 -11.5t59 -32t25.5 -41.5t7 -48q0 -57 -51 -92.5t-148 -35.5h-263v24q33 7 43 19t10 44v319q-3 23 -28 23q-54 0 -78 -35.5t-33 -105.5h-24l3 181h160v122 q0 35 -9 44.5t-45 16.5v24h193zM317 231v-156q0 -45 53 -45q94 0 94 98q0 103 -117 103h-30z" />
+<glyph unicode="&#x46a;" horiz-adv-x="1123" d="M636 301v-172q0 -62 11.5 -80.5t60.5 -23.5v-25h-300v25q51 5 62 23t11 80v173q-67 0 -131.5 -61.5t-64.5 -152.5q0 -41 23 -53q17 -9 23 -9v-25h-301v25q38 1 57 21q36 35 68.5 112t64.5 109q78 78 231 78l-199 331h619l-204 -331q152 0 230 -78q32 -32 65 -109t69 -112 q19 -20 57 -21v-25h-301v25q6 0 23 9q23 12 23 53q0 91 -65 152.5t-132 61.5zM461 626l156 -271l165 271h-321z" />
+<glyph unicode="&#x46b;" horiz-adv-x="762" d="M280 0v24q27 3 32.5 12.5t5.5 47.5v117q-42 -12 -76 -52t-34 -83q0 -42 26 -42v-24h-220v24q40 5 53 38q16 39 29.5 63t39.5 52t66.5 42t95.5 14v2l-155 226h473l-152 -226v-2q55 0 95.5 -14t66.5 -42t39.5 -52t29.5 -63q13 -33 53 -38v-24h-220v24q26 0 26 42 q0 43 -34 82.5t-76 52.5v-117q0 -35 7 -45t35 -15v-24h-206zM307 421l116 -177l118 177h-234z" />
+<glyph unicode="&#x472;" horiz-adv-x="778" d="M394 691q151 0 250 -100.5t99 -255.5q0 -156 -99.5 -255t-255.5 -99q-155 0 -254 99t-99 254q0 159 101 258t258 99zM212 361h1q36 36 59 49t55 13q22 0 50 -21l59 -42q30 -21 58 -21q41 0 72 27q-14 292 -181 292q-79 0 -125 -78t-48 -219zM565 315h-2q-34 -34 -57 -46 t-55 -12q-26 0 -84.5 42t-92.5 42q-31 0 -62 -27q3 -149 49 -224.5t129 -75.5q169 0 175 301z" />
+<glyph unicode="&#x473;" horiz-adv-x="500" d="M254 473q95 0 158.5 -69t63.5 -175q0 -105 -64.5 -174t-161.5 -69q-95 0 -160 68.5t-65 173.5q0 109 64.5 177t164.5 68zM329 230h-1q-7 -22 -22 -32.5t-28 -10.5q-22 0 -46.5 17.5t-34.5 17.5q-12 0 -25 -14q1 -104 18.5 -147.5t60.5 -43.5t60.5 44.5t17.5 156.5v12z M172 243h2q28 34 53 34q18 0 38.5 -15.5t30.5 -15.5q18 0 32 21q-2 98 -19.5 136.5t-57.5 38.5q-44 0 -61 -43t-18 -156z" />
+<glyph unicode="&#x474;" horiz-adv-x="793" d="M289 541l133 -321h2l120 338q23 67 53 100t85 33q43 0 69.5 -26t26.5 -61q0 -31 -16.5 -50t-46.5 -19q-27 0 -41.5 16.5t-21 33.5t-15.5 17q-22 0 -33.5 -18t-30.5 -70l-190 -532h-27l-256 599q-18 42 -32 53.5t-52 16.5v25h336v-25l-33 -2q-53 -3 -53 -36q0 -17 23 -72z " />
+<glyph unicode="&#x475;" horiz-adv-x="559" d="M271 461v-24l-18 -2q-35 -4 -35 -24q0 -9 9 -31l73 -189h2l51 148q24 69 48 100t68 31q37 0 59 -21t22 -51q0 -25 -14 -42t-40 -17q-31 0 -44 31q-2 5 -5 15.5t-6.5 14t-10.5 3.5q-16 0 -23 -21l-140 -396h-26l-120 296q-47 116 -66 141q-8 10 -34 14v24h250z" />
+<glyph unicode="&#x490;" horiz-adv-x="626" d="M594 641h-331v-543q0 -35 20 -52t69 -21v-25h-338v25q53 4 70 21.5t17 50.5v481q0 40 -17.5 55t-68.5 18v25h357q102 0 146 34.5t47 122.5h29v-192z" />
+<glyph unicode="&#x491;" horiz-adv-x="451" d="M431 429h-194q-24 0 -24 -27v-317q0 -31 12.5 -44t40.5 -17v-24h-245v24q35 8 44 19t9 45v288q0 32 -10.5 44.5t-42.5 16.5v24h221q29 0 52.5 4t39 9t28 17.5t19 20t13 27.5t8.5 29t8 34h24z" />
+<glyph unicode="&#x1d00;" horiz-adv-x="515" d="M9 0v24q23 2 33 11.5t25 43.5l175 396h26l135 -296q59 -132 66 -141q8 -10 34 -14v-24h-250v24l18 2q35 4 35 24q0 11 -9 31l-21 46h-148l-12 -26q-11 -23 -11 -44q0 -18 11.5 -24.5t43.5 -8.5v-24h-151zM202 292l-57 -128h114z" />
+<glyph unicode="&#x1d07;" horiz-adv-x="531" d="M472 461v-136h-24q-13 66 -47 82.5t-139 16.5q-29 0 -41 -7.5t-12 -24.5v-137q67 0 92 18.5t32 76.5h24v-231h-24q-7 60 -31.5 79.5t-92.5 19.5v-120q0 -32 11 -46.5t37 -14.5h68q62 0 93 21q20 14 33.5 31.5t33.5 52.5h26l-33 -142h-456v24q29 6 38.5 18.5t9.5 45.5v286 q0 34 -8.5 45t-41.5 18v24h452z" />
+<glyph unicode="&#x1d1c;" horiz-adv-x="600" d="M584 461v-24q-31 -7 -41 -16.5t-10 -34.5v-218q0 -107 -67 -149q-60 -38 -163 -38q-102 0 -164 37q-38 23 -54 54t-16 82v223q0 29 -13 42.5t-40 17.5v24h239v-24q-33 -7 -40 -18t-7 -45v-210q0 -140 130 -140q154 0 154 153v207q0 29 -11 39t-39 14v24h142z" />
+<glyph unicode="&#x1e80;" horiz-adv-x="1000" d="M633 738h-56l-142 88q-40 25 -40 52q0 19 13.5 32t33.5 13q29 0 54 -28zM981 676v-25q-50 -5 -69 -64l-200 -602h-27l-171 477l-186 -477h-28l-212 602q-13 37 -25 48t-44 16v25h294v-25q-39 -3 -51.5 -11.5t-12.5 -30.5q0 -13 7 -33l120 -364l118 308l-35 96 q-12 32 -72 35v25h312v-25l-13 -1q-33 -2 -46 -10t-13 -26q0 -13 14 -56l108 -336l112 343q7 20 7 42q0 23 -14.5 32.5t-54.5 11.5v25h182z" />
+<glyph unicode="&#x1e81;" horiz-adv-x="722" d="M707 461v-24q-19 -4 -29.5 -14.5t-20.5 -35.5l-155 -401h-23l-102 310l-125 -310h-24l-148 374q-19 47 -28.5 60t-28.5 17v24h222v-24q-38 -5 -38 -28q0 -12 39 -115l45 -118l68 171q-4 12 -6 19q-14 49 -22 58.5t-37 12.5v24h234v-24q-28 -2 -38 -7t-10 -17 q0 -14 27 -106q23 -79 34 -127l35 94q44 118 44 128q0 17 -10 24.5t-38 10.5v24h135zM496 528h-56l-142 88q-40 25 -40 52q0 19 13.5 32t33.5 13q29 0 54 -28z" />
+<glyph unicode="&#x1e82;" horiz-adv-x="1000" d="M395 738l137 157q25 28 53 28q22 0 35 -12t13 -32q0 -17 -8 -27.5t-32 -25.5l-142 -88h-56zM981 676v-25q-50 -5 -69 -64l-200 -602h-27l-171 477l-186 -477h-28l-212 602q-13 37 -25 48t-44 16v25h294v-25q-39 -3 -51.5 -11.5t-12.5 -30.5q0 -13 7 -33l120 -364l118 308 l-35 96q-12 32 -72 35v25h312v-25l-13 -1q-33 -2 -46 -10t-13 -26q0 -13 14 -56l108 -336l112 343q7 20 7 42q0 23 -14.5 32.5t-54.5 11.5v25h182z" />
+<glyph unicode="&#x1e83;" horiz-adv-x="722" d="M258 528l137 157q25 28 53 28q22 0 35 -12t13 -32q0 -17 -8 -27.5t-32 -25.5l-142 -88h-56zM707 461v-24q-19 -4 -29.5 -14.5t-20.5 -35.5l-155 -401h-23l-102 310l-125 -310h-24l-148 374q-19 47 -28.5 60t-28.5 17v24h222v-24q-38 -5 -38 -28q0 -12 39 -115l45 -118 l68 171q-4 12 -6 19q-14 49 -22 58.5t-37 12.5v24h234v-24q-28 -2 -38 -7t-10 -17q0 -14 27 -106q23 -79 34 -127l35 94q44 118 44 128q0 17 -10 24.5t-38 10.5v24h135z" />
+<glyph unicode="&#x1e84;" horiz-adv-x="1000" d="M684 810q0 -26 -19 -44.5t-47 -18.5q-26 0 -44.5 19t-18.5 46q0 26 19 45t45 19t45.5 -19.5t19.5 -46.5zM474 810q0 -26 -18.5 -44.5t-46.5 -18.5q-26 0 -45 19t-19 46q0 26 19.5 45t45.5 19t45 -19.5t19 -46.5zM981 676v-25q-50 -5 -69 -64l-200 -602h-27l-171 477 l-186 -477h-28l-212 602q-13 37 -25 48t-44 16v25h294v-25q-39 -3 -51.5 -11.5t-12.5 -30.5q0 -13 7 -33l120 -364l118 308l-35 96q-12 32 -72 35v25h312v-25l-13 -1q-33 -2 -46 -10t-13 -26q0 -13 14 -56l108 -336l112 343q7 20 7 42q0 23 -14.5 32.5t-54.5 11.5v25h182z " />
+<glyph unicode="&#x1e85;" horiz-adv-x="722" d="M547 600q0 -26 -19 -44.5t-47 -18.5q-26 0 -44.5 19t-18.5 46q0 26 19 45t45 19t45.5 -19.5t19.5 -46.5zM337 600q0 -26 -18.5 -44.5t-46.5 -18.5q-26 0 -45 19t-19 46q0 26 19.5 45t45.5 19t45 -19.5t19 -46.5zM707 461v-24q-19 -4 -29.5 -14.5t-20.5 -35.5l-155 -401 h-23l-102 310l-125 -310h-24l-148 374q-19 47 -28.5 60t-28.5 17v24h222v-24q-38 -5 -38 -28q0 -12 39 -115l45 -118l68 171q-4 12 -6 19q-14 49 -22 58.5t-37 12.5v24h234v-24q-28 -2 -38 -7t-10 -17q0 -14 27 -106q23 -79 34 -127l35 94q44 118 44 128q0 17 -10 24.5 t-38 10.5v24h135z" />
+<glyph unicode="&#x1ef2;" horiz-adv-x="722" d="M469 738h-56l-142 88q-40 25 -40 52q0 19 13.5 32t33.5 13q29 0 54 -28zM699 676v-25q-49 -7 -68 -39l-191 -311v-178q0 -58 16.5 -75.5t75.5 -22.5v-25h-347v25q60 5 76.5 25t16.5 78v136l-180 328q-31 56 -83 59v25h335v-25l-27 -2q-32 -2 -43 -7.5t-11 -21.5 q0 -13 24 -59l120 -232l109 178q41 68 41 102q0 22 -16.5 30t-67.5 12v25h220z" />
+<glyph unicode="&#x1ef3;" horiz-adv-x="500" d="M482 461v-24q-24 -3 -36 -13.5t-24 -41.5l-148 -398q-45 -121 -77 -156q-31 -33 -84 -33q-43 0 -70 22t-27 57q0 29 17 48t45 19q25 0 42.5 -15t17.5 -37q0 -4 -2 -14l-1 -6q0 -7 5 -12t12 -5q38 0 66 82l18 53l-119 290q-49 121 -67 146q-8 10 -34 14v24h249v-24l-16 -1 q-36 -3 -36 -25q0 -7 20 -58l72 -186l68 188q11 32 11 49q0 18 -11 25t-43 8v24h152zM369 528h-56l-142 88q-40 25 -40 52q0 19 13.5 32t33.5 13q29 0 54 -28z" />
+<glyph unicode="&#x2000;" horiz-adv-x="527" />
+<glyph unicode="&#x2001;" horiz-adv-x="1055" />
+<glyph unicode="&#x2002;" horiz-adv-x="527" />
+<glyph unicode="&#x2003;" horiz-adv-x="1055" />
+<glyph unicode="&#x2004;" horiz-adv-x="351" />
+<glyph unicode="&#x2005;" horiz-adv-x="263" />
+<glyph unicode="&#x2006;" horiz-adv-x="175" />
+<glyph unicode="&#x2007;" horiz-adv-x="175" />
+<glyph unicode="&#x2008;" horiz-adv-x="131" />
+<glyph unicode="&#x2009;" horiz-adv-x="211" />
+<glyph unicode="&#x200a;" horiz-adv-x="58" />
+<glyph unicode="&#x2010;" horiz-adv-x="333" d="M287 171h-243v116h243v-116z" />
+<glyph unicode="&#x2011;" horiz-adv-x="333" d="M287 171h-243v116h243v-116z" />
+<glyph unicode="&#x2012;" horiz-adv-x="500" d="M500 171h-500v116h500v-116z" />
+<glyph unicode="&#x2013;" horiz-adv-x="500" d="M500 181h-500v90h500v-90z" />
+<glyph unicode="&#x2014;" horiz-adv-x="1000" d="M1000 181h-1000v90h1000v-90z" />
+<glyph unicode="&#x2015;" horiz-adv-x="2000" d="M2000 181h-2000v90h2000v-90z" />
+<glyph unicode="&#x2017;" horiz-adv-x="520" d="M510 -287h-500v50h500v-50zM510 -187h-500v50h500v-50z" />
+<glyph unicode="&#x2018;" horiz-adv-x="333" d="M236 691l11 -22q-109 -76 -109 -133q0 -21 19 -21q3 0 11 1t13 1q32 0 52.5 -21t20.5 -55q0 -39 -23 -62t-61 -23q-47 0 -73.5 31t-26.5 85q0 132 166 219z" />
+<glyph unicode="&#x2019;" horiz-adv-x="333" d="M97 356l-11 22q109 76 109 133q0 21 -19 21q-3 0 -11 -1t-13 -1q-32 0 -52.5 21t-20.5 55q0 39 23 62t61 23q47 0 73.5 -31t26.5 -85q0 -132 -166 -219z" />
+<glyph unicode="&#x201a;" horiz-adv-x="333" d="M97 -180l-11 22q109 76 109 133q0 21 -19 21q-3 0 -11 -1t-13 -1q-32 0 -52.5 21t-20.5 55q0 39 23 62t61 23q47 0 73.5 -31t26.5 -85q0 -132 -166 -219z" />
+<glyph unicode="&#x201b;" horiz-adv-x="333" d="M256 378l-11 -22q-166 87 -166 219q0 54 26.5 85t73.5 31q38 0 61 -23t23 -62q0 -34 -20.5 -55t-52.5 -21q-5 0 -13 1t-11 1q-19 0 -19 -21q0 -57 109 -133z" />
+<glyph unicode="&#x201c;" horiz-adv-x="500" d="M198 691l11 -22q-109 -76 -109 -133q0 -21 19 -21q3 0 11 1t13 1q32 0 52.5 -21t20.5 -55q0 -39 -23 -62t-61 -23q-47 0 -73.5 31t-26.5 85q0 132 166 219zM468 691l11 -22q-109 -76 -109 -133q0 -21 19 -21q3 0 11 1t13 1q32 0 52.5 -21t20.5 -55q0 -39 -23 -62t-61 -23 q-47 0 -73.5 31t-26.5 85q0 132 166 219z" />
+<glyph unicode="&#x201d;" horiz-adv-x="500" d="M32 356l-11 22q109 76 109 133q0 21 -19 21q-3 0 -11 -1t-13 -1q-32 0 -52.5 21t-20.5 55q0 39 23 62t61 23q47 0 73.5 -31t26.5 -85q0 -132 -166 -219zM302 356l-11 22q109 76 109 133q0 21 -19 21q-3 0 -11 -1t-13 -1q-32 0 -52.5 21t-20.5 55q0 39 23 62t61 23 q47 0 73.5 -31t26.5 -85q0 -132 -166 -219z" />
+<glyph unicode="&#x201e;" horiz-adv-x="500" d="M32 -180l-11 22q109 76 109 133q0 21 -19 21q-3 0 -11 -1t-13 -1q-32 0 -52.5 21t-20.5 55q0 39 23 62t61 23q47 0 73.5 -31t26.5 -85q0 -132 -166 -219zM302 -180l-11 22q109 76 109 133q0 21 -19 21q-3 0 -11 -1t-13 -1q-32 0 -52.5 21t-20.5 55q0 39 23 62t61 23 q47 0 73.5 -31t26.5 -85q0 -132 -166 -219z" />
+<glyph unicode="&#x201f;" horiz-adv-x="500" d="M191 378l-11 -22q-166 87 -166 219q0 54 26.5 85t73.5 31q38 0 61 -23t23 -62q0 -34 -20.5 -55t-52.5 -21q-5 0 -13 1t-11 1q-19 0 -19 -21q0 -57 109 -133zM461 378l-11 -22q-166 87 -166 219q0 54 26.5 85t73.5 31q38 0 61 -23t23 -62q0 -34 -20.5 -55t-52.5 -21 q-5 0 -13 1t-11 1q-19 0 -19 -21q0 -57 109 -133z" />
+<glyph unicode="&#x2020;" horiz-adv-x="500" d="M240 -134l-5 144q-5 137 -46 243q-5 12 -5 17q0 6 13 24q24 33 32 62t9 90q-33 -4 -47.5 -8.5t-41.5 -18.5q-30 -16 -52 -16q-23 0 -36.5 14.5t-13.5 39.5q0 53 52 53q20 0 53 -17q42 -22 86 -27q-1 48 -6.5 69t-22.5 52q-15 26 -15 44q0 28 15.5 44t41.5 16q56 0 56 -55 q0 -20 -18 -56t-23 -55.5t-5 -58.5q43 6 89 28q35 16 52 16q24 0 37.5 -14.5t13.5 -39.5q0 -24 -13.5 -38.5t-36.5 -14.5q-24 0 -56 19q-29 17 -43 20.5t-43 3.5q0 -103 52 -169q5 -7 5 -10q0 -2 -1 -4q-20 -45 -34.5 -117t-16.5 -136l-5 -144h-21z" />
+<glyph unicode="&#x2021;" horiz-adv-x="500" d="M221 464h18q-1 40 -6 62t-21 59q-15 33 -15 52q0 24 14.5 39t38.5 15t40 -16t16 -39q0 -18 -16 -55q-17 -39 -22 -60t-6 -57q44 5 92 26q34 15 52 15q23 0 36.5 -13.5t13.5 -35.5q0 -23 -13.5 -36t-36.5 -13q-24 0 -51 16q-19 11 -35 16t-26 6t-32 1q0 -94 47 -155 q7 -9 7 -12t-7 -12q-46 -67 -47 -156q41 0 88 22q39 18 58 18q22 0 35 -13.5t13 -36.5q0 -22 -14 -34t-37 -12q-15 0 -51 14q-5 2 -16 6t-14.5 5.5t-11.5 4t-12 3.5t-10 2l-14 2q-6 1 -14 1q1 -36 6 -56.5t22 -58.5q16 -37 16 -55q0 -24 -16 -39.5t-40 -15.5t-38.5 14.5 t-14.5 39.5q0 19 15 53q17 37 21.5 57.5t5.5 60.5h-18q-23 0 -65 -21q-35 -17 -61 -17q-23 0 -36.5 13t-13.5 35q0 21 14 35t35 14q19 0 57 -17q47 -22 88 -24q-2 47 -13 82t-42 86q31 51 42 84.5t13 82.5q-30 -2 -45 -5.5t-46 -18.5q-32 -15 -53 -15q-22 0 -36 13t-14 35 t13.5 36t35.5 14q23 0 62 -19q41 -20 65 -22z" />
+<glyph unicode="&#x2022;" horiz-adv-x="560" d="M490 253q0 -87 -62 -149t-149 -62t-148 61.5t-61 149.5q0 85 61.5 147t147.5 62q92 0 151.5 -60.5t59.5 -148.5z" />
+<glyph unicode="&#x2025;" horiz-adv-x="666" d="M251 71q0 -35 -25 -59.5t-60 -24.5q-36 0 -60 24t-24 60q0 35 25 60t60 25q34 0 59 -25t25 -60zM584 71q0 -35 -25 -59.5t-60 -24.5q-36 0 -60 24t-24 60q0 35 25 60t60 25q34 0 59 -25t25 -60z" />
+<glyph unicode="&#x2026;" horiz-adv-x="1000" d="M251 71q0 -35 -25 -59.5t-60 -24.5q-36 0 -60 24t-24 60q0 35 25 60t60 25q34 0 59 -25t25 -60zM584 71q0 -35 -25 -59.5t-60 -24.5q-36 0 -60 24t-24 60q0 35 25 60t60 25q34 0 59 -25t25 -60zM917 71q0 -35 -25 -59.5t-60 -24.5q-36 0 -60 24t-24 60q0 35 25 60t60 25 q34 0 59 -25t25 -60z" />
+<glyph unicode="&#x202f;" horiz-adv-x="211" />
+<glyph unicode="&#x2030;" horiz-adv-x="1110" d="M688 214q0 -53 -19.5 -104t-53.5 -86q-39 -42 -99 -42q-57 0 -92.5 38.5t-35.5 99.5q0 85 58.5 149t136.5 64q49 0 77 -31.5t28 -87.5zM663 220q0 35 -17 57.5t-42 22.5q-31 0 -62 -46q-24 -36 -40 -87t-16 -91q0 -66 50 -66q44 0 79 51q48 74 48 159zM626 706l-438 -735 h-48l388 655q-56 -42 -113 -42q-27 0 -60 13q3 -29 3 -42q0 -53 -19.5 -105.5t-50.5 -83.5q-44 -44 -101 -44q-56 0 -91 39t-35 100q0 85 59 149t138 64q35 0 71 -29q38 -30 83 -30q49 0 88.5 21.5t77.5 69.5h48zM332 560q0 25 -6 35.5t-26 18.5q-11 5 -21 11q-14 9 -20 9 q-32 0 -67 -74.5t-35 -141.5q0 -66 50 -66q48 0 86.5 64t38.5 144zM1049 213q0 -52 -19.5 -103t-52.5 -86q-40 -42 -100 -42q-57 0 -92 37.5t-35 98.5q0 88 57.5 151.5t137.5 63.5q49 0 76.5 -32t27.5 -88zM1024 220q0 35 -17 57.5t-43 22.5q-30 0 -60 -45 q-23 -35 -39.5 -87.5t-16.5 -92.5q0 -65 49 -65q44 0 79 51q48 74 48 159z" />
+<glyph unicode="&#x2031;" horiz-adv-x="1472" d="M688 214q0 -53 -19.5 -104t-53.5 -86q-39 -42 -99 -42q-57 0 -92.5 38.5t-35.5 99.5q0 85 58.5 149t136.5 64q49 0 77 -31.5t28 -87.5zM663 220q0 35 -17 57.5t-42 22.5q-31 0 -62 -46q-24 -36 -40 -87t-16 -91q0 -66 50 -66q44 0 79 51q48 74 48 159zM626 706l-438 -735 h-48l388 655q-56 -42 -113 -42q-27 0 -60 13q3 -29 3 -42q0 -53 -19.5 -105.5t-50.5 -83.5q-44 -44 -101 -44q-56 0 -91 39t-35 100q0 85 59 149t138 64q35 0 71 -29q38 -30 83 -30q49 0 88.5 21.5t77.5 69.5h48zM332 560q0 25 -6 35.5t-26 18.5q-11 5 -21 11q-14 9 -20 9 q-32 0 -67 -74.5t-35 -141.5q0 -66 50 -66q48 0 86.5 64t38.5 144zM1411 213q0 -52 -19.5 -103t-52.5 -86q-40 -42 -100 -42q-57 0 -92 37.5t-35 98.5q0 88 57.5 151.5t137.5 63.5q49 0 76.5 -32t27.5 -88zM1386 220q0 35 -17 57.5t-43 22.5q-30 0 -60 -45 q-23 -35 -39.5 -87.5t-16.5 -92.5q0 -65 49 -65q44 0 79 51q48 74 48 159zM1049 213q0 -52 -19.5 -103t-52.5 -86q-40 -42 -100 -42q-57 0 -92 37.5t-35 98.5q0 88 57.5 151.5t137.5 63.5q49 0 76.5 -32t27.5 -88zM1025 220q0 35 -17 57.5t-42 22.5q-31 0 -62 -46 q-24 -36 -40 -87t-16 -91q0 -66 50 -66q44 0 79 51q48 74 48 159z" />
+<glyph unicode="&#x2032;" horiz-adv-x="310" d="M75 445l67 221q14 47 50 47q16 0 29.5 -12.5t13.5 -28.5q0 -15 -14 -39l-113 -195z" />
+<glyph unicode="&#x2033;" horiz-adv-x="467" d="M233 445l66 222q13 46 50 46q16 0 29.5 -12.5t13.5 -28.5q0 -15 -14 -39l-112 -195zM75 445l66 222q13 46 50 46q16 0 29.5 -12.5t13.5 -28.5q0 -15 -14 -39l-112 -195z" />
+<glyph unicode="&#x2034;" horiz-adv-x="625" d="M391 445l66 222q13 46 50 46q16 0 29.5 -12.5t13.5 -28.5q0 -15 -14 -39l-112 -195zM233 445l66 222q13 46 50 46q16 0 29.5 -12.5t13.5 -28.5q0 -15 -14 -39l-112 -195zM75 445l66 222q13 46 50 46q16 0 29.5 -12.5t13.5 -28.5q0 -15 -14 -39l-112 -195z" />
+<glyph unicode="&#x2035;" horiz-adv-x="310" d="M235 445l-33 -7l-113 195q-14 24 -14 39q0 16 13.5 28.5t29.5 12.5q36 0 50 -47z" />
+<glyph unicode="&#x2036;" horiz-adv-x="467" d="M392 445l-33 -7l-112 195q-14 24 -14 39q0 16 13.5 28.5t29.5 12.5q37 0 50 -46zM234 445l-33 -7l-112 195q-14 24 -14 39q0 16 13.5 28.5t29.5 12.5q37 0 50 -46z" />
+<glyph unicode="&#x2037;" horiz-adv-x="625" d="M550 445l-33 -7l-112 195q-14 24 -14 39q0 16 13.5 28.5t29.5 12.5q37 0 50 -46zM392 445l-33 -7l-112 195q-14 24 -14 39q0 16 13.5 28.5t29.5 12.5q37 0 50 -46zM234 445l-33 -7l-112 195q-14 24 -14 39q0 16 13.5 28.5t29.5 12.5q37 0 50 -46z" />
+<glyph unicode="&#x2038;" horiz-adv-x="584" d="M497 -150l-27 -20l-178 216l-176 -216l-25 20l195 267h11z" />
+<glyph unicode="&#x2039;" horiz-adv-x="333" d="M254 393l6 5q21 17 31 17q12 0 12 -11q0 -34 -93 -147q-16 -20 -23 -30q12 -18 40 -54q78 -101 78 -122q0 -15 -11 -15q-12 0 -29 16q-5 5 -8 7l-206 166v4z" />
+<glyph unicode="&#x203a;" horiz-adv-x="333" d="M282 222l-203 -164l-6 -5q-19 -17 -31 -17t-12 11q0 34 93 147q16 20 23 30q-22 32 -40 53q-78 93 -78 123q0 15 11 15q10 0 29 -16q5 -5 8 -7l206 -166v-4z" />
+<glyph unicode="&#x203c;" horiz-adv-x="625" d="M181 234h-31q-10 93 -19.5 144t-31.5 122q-18 58 -18 91q0 47 22 73.5t62 26.5q38 0 61.5 -27t23.5 -75q0 -32 -18 -89q-22 -72 -31.5 -123t-19.5 -143zM251 71q0 -35 -25 -59.5t-60 -24.5q-36 0 -60 23.5t-24 59.5q0 37 24.5 61.5t60.5 24.5q37 0 60.5 -24t23.5 -61z M474 234h-31q-10 93 -19.5 144t-31.5 122q-18 58 -18 91q0 47 22 73.5t62 26.5q38 0 61.5 -27t23.5 -75q0 -32 -18 -89q-22 -72 -31.5 -123t-19.5 -143zM544 71q0 -35 -25 -59.5t-60 -24.5q-36 0 -60 23.5t-24 59.5q0 37 24.5 61.5t60.5 24.5q37 0 60.5 -24t23.5 -61z" />
+<glyph unicode="&#x203e;" horiz-adv-x="500" d="M500 766h-500v72h500v-72z" />
+<glyph unicode="&#x2040;" horiz-adv-x="798" d="M733 523l-19 -15q-60 67 -132 93t-174 26q-105 0 -175.5 -25t-132.5 -94l-21 13q40 92 132.5 148t194.5 56q105 0 195 -54t132 -148z" />
+<glyph unicode="&#x2044;" horiz-adv-x="183" d="M345 688l-439 -700h-74l441 700h72z" />
+<glyph unicode="&#x2047;" horiz-adv-x="947" d="M253 232h-30q-3 25 -3 45q1 46 38.5 123.5t37.5 122.5q0 62 -22 96t-62 34q-28 0 -44.5 -11t-16.5 -29q0 -13 15 -29q22 -25 22 -51q0 -28 -20.5 -47.5t-44.5 -19.5q-29 0 -47.5 22.5t-18.5 55.5q0 63 51 104t133 41q93 0 148.5 -46.5t55.5 -119.5q0 -52 -26 -87.5 t-95 -78.5q-47 -29 -59 -49.5t-12 -75.5zM323 71q0 -35 -24.5 -59.5t-59.5 -24.5q-36 0 -60.5 24.5t-24.5 59.5t25 60t61 25q34 0 58.5 -25t24.5 -60zM700 232h-30q-3 25 -3 45q1 46 38.5 123.5t37.5 122.5q0 62 -22 96t-62 34q-28 0 -44.5 -11t-16.5 -29q0 -13 15 -29 q22 -25 22 -51q0 -28 -20.5 -47.5t-44.5 -19.5q-29 0 -47.5 22.5t-18.5 55.5q0 63 51 104t133 41q93 0 148.5 -46.5t55.5 -119.5q0 -52 -26 -87.5t-95 -78.5q-47 -29 -59 -49.5t-12 -75.5zM770 71q0 -35 -24.5 -59.5t-59.5 -24.5q-36 0 -60.5 24.5t-24.5 59.5t25 60t61 25 q34 0 58.5 -25t24.5 -60z" />
+<glyph unicode="&#x204e;" horiz-adv-x="500" d="M260 42l7 -3q30 24 42 35.5t30 38.5q14 22 26.5 30t29.5 8q21 0 37 -14.5t16 -33.5q0 -23 -25.5 -38t-56.5 -15q-33 0 -48.5 -4.5t-40.5 -21.5v-8q51 -24 97 -28q40 -3 56.5 -14.5t16.5 -36.5q0 -22 -13 -36t-36 -14q-19 0 -32.5 11.5t-42.5 50.5q-15 21 -25.5 30 t-31.5 20l-6 -4q1 -32 6 -49t21 -49q15 -29 15 -45q0 -22 -14.5 -37t-36.5 -15q-21 0 -35 14.5t-14 37.5q0 17 16 46q14 24 18 42t5 55l-6 4q-29 -22 -41.5 -34.5t-32.5 -40.5q-15 -22 -26.5 -29.5t-28.5 -7.5q-21 0 -35.5 13.5t-14.5 34.5q0 47 84 53q32 2 47 7.5t39 21.5 v7q-47 21 -102 26q-68 5 -68 53q0 22 13 35t34 13t34 -9t28 -34q17 -29 29.5 -41t41.5 -28l5 3q-1 33 -4.5 48t-18.5 43q-18 32 -18 53q0 22 14.5 36t37.5 14q21 0 34.5 -15t13.5 -40q0 -15 -18 -47q-22 -37 -22 -77v-15z" />
+<glyph unicode="&#x204f;" horiz-adv-x="333" d="M244 -158l-11 -22q-166 87 -166 219q0 54 26.5 85t73.5 31q38 0 61 -23t23 -62q0 -34 -20.5 -55t-52.5 -21q-5 0 -13 1t-11 1q-19 0 -19 -21q0 -57 109 -133zM249 388q0 -36 -24.5 -60.5t-59.5 -24.5t-60 24.5t-25 59.5t24.5 60t59.5 25q36 0 60.5 -24.5t24.5 -59.5z" />
+<glyph unicode="&#x2051;" horiz-adv-x="500" d="M260 42l7 -3q30 24 42 35.5t30 38.5q14 22 26.5 30t29.5 8q21 0 37 -14.5t16 -33.5q0 -23 -25.5 -38t-56.5 -15q-33 0 -48.5 -4.5t-40.5 -21.5v-8q51 -24 97 -28q40 -3 56.5 -14.5t16.5 -36.5q0 -22 -13 -36t-36 -14q-19 0 -32.5 11.5t-42.5 50.5q-15 21 -25.5 30 t-31.5 20l-6 -4q1 -32 6 -49t21 -49q15 -29 15 -45q0 -22 -14.5 -37t-36.5 -15q-21 0 -35 14.5t-14 37.5q0 17 16 46q14 24 18 42t5 55l-6 4q-29 -22 -41.5 -34.5t-32.5 -40.5q-15 -22 -26.5 -29.5t-28.5 -7.5q-21 0 -35.5 13.5t-14.5 34.5q0 47 84 53q32 2 47 7.5t39 21.5 v7q-47 21 -102 26q-68 5 -68 53q0 22 13 35t34 13t34 -9t28 -34q17 -29 29.5 -41t41.5 -28l5 3q-1 33 -4.5 48t-18.5 43q-18 32 -18 53q0 22 14.5 36t37.5 14q21 0 34.5 -15t13.5 -40q0 -15 -18 -47q-22 -37 -22 -77v-15zM260 512l7 -3q30 24 42 35.5t30 38.5q14 22 26.5 30 t29.5 8q21 0 37 -14.5t16 -33.5q0 -23 -25.5 -38t-56.5 -15q-33 0 -48.5 -4.5t-40.5 -21.5v-8q51 -24 97 -28q40 -3 56.5 -14.5t16.5 -36.5q0 -22 -13 -36t-36 -14q-19 0 -32.5 11.5t-42.5 50.5q-15 21 -25.5 30t-31.5 20l-6 -4q1 -32 6 -49t21 -49q15 -29 15 -45 q0 -22 -14.5 -37t-36.5 -15q-21 0 -35 14.5t-14 37.5q0 17 16 46q14 24 18 42t5 55l-6 4q-29 -22 -41.5 -34.5t-32.5 -40.5q-15 -22 -26.5 -29.5t-28.5 -7.5q-21 0 -35.5 13.5t-14.5 34.5q0 47 84 53q32 2 47 7.5t39 21.5v7q-47 21 -102 26q-68 5 -68 53q0 22 13 35t34 13 t34 -9t28 -34q17 -29 29.5 -41t41.5 -28l5 3q-1 33 -4.5 48t-18.5 43q-18 32 -18 53q0 22 14.5 36t37.5 14q21 0 34.5 -15t13.5 -40q0 -15 -18 -47q-22 -37 -22 -77v-15z" />
+<glyph unicode="&#x2057;" horiz-adv-x="783" d="M233 445l66 222q13 46 50 46q16 0 29.5 -12.5t13.5 -28.5q0 -15 -14 -39l-112 -195zM75 445l66 222q13 46 50 46q16 0 29.5 -12.5t13.5 -28.5q0 -15 -14 -39l-112 -195zM549 445l66 222q13 46 50 46q16 0 29.5 -12.5t13.5 -28.5q0 -15 -14 -39l-112 -195zM391 445l66 222 q13 46 50 46q16 0 29.5 -12.5t13.5 -28.5q0 -15 -14 -39l-112 -195z" />
+<glyph unicode="&#x205f;" horiz-adv-x="263" />
+<glyph unicode="&#x207f;" horiz-adv-x="491" d="M478 275h-206v20q34 6 34 49v216q0 41 -9 57.5t-30 16.5q-24 0 -48 -21q-27 -23 -27 -48v-221q0 -22 7 -34t29 -15v-20h-213v20q31 7 40.5 17.5t9.5 33.5v273q0 24 -10 34t-40 15v20h176v-64h1q16 36 48.5 56t69.5 20q57 0 90 -36.5t33 -93.5v-226q0 -26 9.5 -36.5 t35.5 -12.5v-20z" />
+<glyph unicode="&#x20a3;" horiz-adv-x="611" d="M443 352h-177v-78h177v-40h-177v-133q0 -43 21 -58t89 -18v-25h-360v25q55 6 71.5 21t16.5 57v131h-93v40h93v78h-93v40h93v183q0 43 -18 58t-70 18v25h567v-202h-24q-10 57 -22 81.5t-38 47.5q-45 39 -163 39q-38 0 -54 -11.5t-16 -39.5v-199h177v-40z" />
+<glyph unicode="&#x20a4;" horiz-adv-x="500" d="M406 373h-136q6 -54 6 -78h130v-40h-129q-2 -67 -20 -121q61 -22 96 -22q47 0 68.5 15t32.5 56h23q-9 -107 -38 -149q-34 -50 -93 -50q-31 0 -57 13.5t-68 51.5q-48 -62 -112 -62q-42 0 -65 22t-23 63q0 92 106 92q23 0 51 -7q-4 53 -19 98h-123v40h106q-6 13 -23 78h-83 v40h74q-5 35 -5 78q0 47 21.5 90t57.5 69q49 34 124 34q70 0 110.5 -30.5t40.5 -82.5q0 -34 -18 -53t-50 -19q-28 0 -45 18t-17 47q0 8 1 22.5t1 24.5q1 21 -11 32t-33 11q-25 0 -40.5 -17t-15.5 -45q0 -48 28 -179h147v-40zM181 86q-36 32 -72 32q-26 0 -41 -14t-15 -38 q0 -22 15 -35.5t41 -13.5q28 0 45 16t27 53z" />
+<glyph unicode="&#x20a7;" horiz-adv-x="1369" d="M927 112l25 -11q-31 -62 -64.5 -87.5t-83.5 -25.5q-52 0 -82 28.5t-30 78.5v322h-53v27q49 33 82 71.5t85 114.5h25v-169h95v-44h-95v-298q0 -60 39 -60q29 0 57 53zM1320 326h-25q-19 56 -47 82q-34 32 -75 32q-28 0 -47 -16.5t-19 -41.5q0 -26 22.5 -46.5t73.5 -41.5 q75 -31 106.5 -67t31.5 -89q0 -67 -43 -109.5t-111 -42.5q-52 0 -108 23q-15 6 -23 6q-11 0 -26 -28h-25v165h28q32 -132 137 -132q34 0 54.5 18t20.5 47q0 24 -22 44.5t-74 42.5q-75 32 -108.5 68.5t-33.5 86.5q0 63 44.5 104.5t112.5 41.5q34 0 78 -15q22 -7 31 -7 q17 0 25 20h22v-145zM16 676h315q128 0 198.5 -45.5t70.5 -135.5q0 -60 -33.5 -104.5t-95.5 -67.5q-32 -12 -70.5 -15.5t-138.5 -4.5v-192q0 -51 14 -65t73 -21v-25h-333v25q33 3 45 9q23 9 31 30t8 62v427q0 58 -15.5 75.5t-68.5 22.5v25zM262 606v-268q94 1 130 32t36 114 q0 84 -27 120.5t-89 36.5q-50 0 -50 -35z" />
+<glyph unicode="&#x20ac;" horiz-adv-x="500" d="M424 369h-245q-1 -13 -1 -78h237l-9 -40h-225q0 -35 6 -71t19 -71.5t37.5 -58t56.5 -22.5q54 0 90 28t68 80l20 -10q-36 -68 -81.5 -103t-113.5 -35q-50 0 -90 23t-64 61.5t-38 83.5t-18 95h-44l9 40h30q0 67 1 78h-40l10 40h37q14 107 76.5 185t159.5 78q76 0 149 -50 v-141h-21q-17 69 -50.5 115t-71.5 46q-42 0 -74 -43t-45.5 -93t-16.5 -97h251z" />
+<glyph unicode="&#x20d0;" horiz-adv-x="0" d="M14 637h-484l169 209l19 -16q-50 -71 -50 -88q0 -27 39 -27h307v-78z" />
+<glyph unicode="&#x20d1;" horiz-adv-x="0" d="M14 637h-484v78h307q39 0 39 27q0 17 -50 88l19 16z" />
+<glyph unicode="&#x20d2;" horiz-adv-x="0" d="M-223 -156h-75v818h75v-818z" />
+<glyph unicode="&#x20d6;" horiz-adv-x="0" d="M-16 637h-310q-22 0 -30 -3.5t-8 -15.5q0 -20 51 -93l-18 -17l-169 169l169 169l19 -16q-53 -75 -53 -88q0 -27 39 -27h310v-78z" />
+<glyph unicode="&#x20d7;" horiz-adv-x="0" d="M14 677l-169 -169l-18 17q51 73 51 93q0 12 -8 15.5t-30 3.5h-310v78h310q39 0 39 27q0 13 -53 88l19 16z" />
+<glyph unicode="&#x20db;" horiz-adv-x="0" d="M37 600q0 -26 -19 -44.5t-47 -18.5q-26 0 -44.5 19t-18.5 46q0 26 19 45t45 19t45.5 -19.5t19.5 -46.5zM-173 600q0 -26 -18.5 -44.5t-46.5 -18.5q-26 0 -45 19t-19 46q0 26 19.5 45t45.5 19t45 -19.5t19 -46.5zM-383 600q0 -26 -18.5 -44.5t-46.5 -18.5q-26 0 -45 19 t-19 46q0 26 19.5 45t45.5 19t45 -19.5t19 -46.5z" />
+<glyph unicode="&#x20dc;" horiz-adv-x="0" d="M-288 600q0 -26 -18.5 -44.5t-46.5 -18.5q-26 0 -45 19t-19 46q0 26 19.5 45t45.5 19t45 -19.5t19 -46.5zM132 600q0 -26 -19 -44.5t-47 -18.5q-26 0 -44.5 19t-18.5 46q0 26 19 45t45 19t45.5 -19.5t19.5 -46.5zM-78 600q0 -26 -18.5 -44.5t-46.5 -18.5q-26 0 -45 19 t-19 46q0 26 19.5 45t45.5 19t45 -19.5t19 -46.5zM-498 600q0 -26 -18.5 -44.5t-46.5 -18.5q-26 0 -45 19t-19 46q0 26 19.5 45t45.5 19t45 -19.5t19 -46.5z" />
+<glyph unicode="&#x20dd;" horiz-adv-x="0" d="M-249 760q138 0 254 -68t183.5 -184.5t67.5 -254.5t-67.5 -254.5t-183.5 -184.5t-254 -68t-254 68t-183 184.5t-67 254.5t67 254.5t183 184.5t254 68zM-249 672q-171 0 -293.5 -123.5t-122.5 -295.5q0 -171 122.5 -295t293.5 -124q83 0 160 33.5t133.5 90t90 134 t33.5 161.5q0 171 -123.5 295t-293.5 124z" />
+<glyph unicode="&#x20e1;" horiz-adv-x="0" d="M79 677l-169 -169l-18 17q51 73 51 93q0 12 -8 15.5t-30 3.5h-246q-22 0 -30 -3.5t-8 -15.5q0 -20 51 -93l-18 -17l-169 169l169 169l19 -16q-53 -75 -53 -88q0 -27 31 -27h254q39 0 39 27q0 13 -53 88l19 16z" />
+<glyph unicode="&#x20e4;" horiz-adv-x="0" d="M519 -169h-1517l750 1224zM-838 -81h1198l-608 964z" />
+<glyph unicode="&#x20e5;" horiz-adv-x="0" d="M12 -155h-84l-398 817h84z" />
+<glyph unicode="&#x20e6;" horiz-adv-x="0" d="M-315 -156h-75v818h75v-818zM-111 -156h-75v818h75v-818z" />
+<glyph unicode="&#x20e7;" horiz-adv-x="0" d="M200 -172h-88v844h-755v88h843v-932z" />
+<glyph unicode="&#x20e8;" horiz-adv-x="0" d="M37 -175q0 -26 -19 -44.5t-47 -18.5q-26 0 -44.5 19t-18.5 46q0 26 19 45t45 19t45.5 -19.5t19.5 -46.5zM-173 -175q0 -26 -18.5 -44.5t-46.5 -18.5q-26 0 -45 19t-19 46q0 26 19.5 45t45.5 19t45 -19.5t19 -46.5zM-383 -175q0 -26 -18.5 -44.5t-46.5 -18.5q-26 0 -45 19 t-19 46q0 26 19.5 45t45.5 19t45 -19.5t19 -46.5z" />
+<glyph unicode="&#x20e9;" horiz-adv-x="0" d="M54 544h-78v95h-408v-95h-78v173h564v-173z" />
+<glyph unicode="&#x20ea;" horiz-adv-x="0" d="M148 209h-593q-48 0 -48 -12q0 -4 4.5 -12t8.5 -13l11 -13l6 -7q25 -29 52 -67l-25 -20q-57 65 -114 106t-138 77v11q150 63 252 182l24 -22q-29 -42 -51 -68l-7 -7l-10 -12q-5 -5 -9 -11.5t-4 -10.5q0 -13 48 -13h593v-88z" />
+<glyph unicode="&#x20eb;" horiz-adv-x="0" d="M208 775l-418 -1010h-79l418 1010h79zM-8 775l-418 -1010h-79l418 1010h79z" />
+<glyph unicode="&#x20ec;" horiz-adv-x="0" d="M14 -166l-169 -209l-19 16q50 71 50 88q0 27 -39 27h-307v78h484z" />
+<glyph unicode="&#x20ed;" horiz-adv-x="0" d="M14 -244h-307q-39 0 -39 -27q0 -17 50 -88l-19 -16l-169 209h484v-78z" />
+<glyph unicode="&#x20ee;" horiz-adv-x="0" d="M-6 -244h-310q-22 0 -30 -3.5t-8 -15.5q0 -20 51 -93l-18 -17l-169 169l169 169l19 -16q-53 -75 -53 -88q0 -27 39 -27h310v-78z" />
+<glyph unicode="&#x20ef;" horiz-adv-x="0" d="M14 -204l-169 -169l-18 17q51 73 51 93q0 12 -8 15.5t-30 3.5h-310v78h310q39 0 39 27q0 13 -53 88l19 16z" />
+<glyph unicode="&#x20f0;" horiz-adv-x="0" d="M-115 754q0 -25 -44 -35q-46 -11 -71 -27q31 -17 67 -26q36 -10 44 -22q3 -6 3 -14q0 -28 -27 -28q-17 0 -47 32q-28 30 -48 43q0 -21 9.5 -51t9.5 -48q0 -12 -7.5 -23.5t-21.5 -11.5t-21.5 11.5t-7.5 23.5q0 18 9 48t9 50q-24 -17 -44 -39q-32 -34 -54 -34q-27 0 -27 27 q0 12 9 20t18 11t26 7q26 6 60 24q-21 13 -59 23q-4 1 -14.5 4t-15.5 5t-12 6t-10 10.5t-3 15.5q0 12 7.5 20t17.5 8q25 0 52 -33q17 -22 49 -41q0 21 -9 53.5t-9 49.5q0 11 7 21.5t22 10.5q29 0 29 -32q0 -17 -9.5 -49.5t-9.5 -53.5q32 18 55 47q20 27 43 27 q10 0 17.5 -8.5t7.5 -21.5z" />
+<glyph unicode="&#x2102;" horiz-adv-x="727" d="M626 171l46 -48q-68 -75 -132 -108.5t-157 -33.5q-145 0 -241.5 103.5t-96.5 249.5q0 150 95 253.5t244 103.5q89 0 167.5 -37.5t115.5 -109.5l-46 -47q-46 47 -70 68t-67 38.5t-96 17.5q-82 0 -123 -36v-500q40 -34 122 -34q34 0 60.5 5.5t51 19t39 24t43.5 35t45 36.5z M195 128v414q-80 -79 -80 -208q0 -125 80 -206z" />
+<glyph unicode="&#x2105;" horiz-adv-x="873" d="M835 175q0 -81 -49.5 -134t-124.5 -53q-74 0 -123.5 52.5t-49.5 134.5q0 83 49.5 135.5t126.5 52.5q73 0 122 -53.5t49 -134.5zM722 166q0 99 -13 136t-47 37q-36 0 -48.5 -36.5t-12.5 -136.5q0 -84 13.5 -119t47.5 -35q33 0 46.5 34.5t13.5 119.5zM687 688l-439 -700 h-58l441 700h56zM336 402l14 -14q-59 -80 -147 -80q-73 0 -119 49.5t-46 131.5q0 85 52 139t130 54q51 0 85 -24t34 -60q0 -23 -14 -36t-38 -13q-44 0 -44 56q0 21 -1 30t-8.5 16t-22.5 7q-29 0 -47 -34t-18 -95q0 -79 29 -124.5t79 -45.5q46 0 82 43z" />
+<glyph unicode="&#x2107;" horiz-adv-x="699" d="M470 372v-35q-80 0 -108.5 -5t-63.5 -26q-61 -38 -61 -122q0 -74 37 -114.5t127 -40.5q88 0 133 60q9 13 21.5 33.5t18.5 28.5t17.5 15t27.5 7q20 0 31.5 -12t11.5 -33q0 -37 -41.5 -68.5t-103.5 -54.5q-65 -24 -146 -24q-118 0 -194 41q-112 58 -112 171 q0 78 60.5 121.5t139.5 47.5v1q-76 8 -119 48q-47 44 -47 100q0 78 72 129t206 51q46 0 101 -15q6 -2 48 -18t53 -16q15 0 24 10t20 36h27v-235h-25q-11 32 -31.5 65.5t-49.5 66t-69.5 53t-83.5 20.5q-127 0 -127 -155q0 -85 50 -111q30 -14 53.5 -17t102.5 -3z" />
+<glyph unicode="&#x210c;" horiz-adv-x="843" d="M619 701l21 -15q-15 -70 -79 -124.5t-135 -54.5q-79 0 -129 71q-19 -23 -19 -56q0 -52 72 -144q86 51 173 118q128 -30 200 -100t72 -170q0 -33 -10 -67t-23 -61t-40 -60t-46 -53.5t-56 -52.5l-56 -48l-60.5 -46.5t-54.5 -42.5h-26q-55 46 -97 46q-79 0 -129 -46l-21 17 q92 160 202 160q44 0 78 -24.5t44 -54.5q123 91 123 291q0 87 -39.5 149t-105.5 62q-35 0 -104 -48q46 -40 60.5 -65.5t14.5 -51.5q0 -16 -11 -34.5t-24 -33t-48 -50.5l-127 -137q-87 52 -125 70q-36 -35 -50 -53l-22 14l124 196q2 -2 18 -12l32 -22l35 -24 q18 -12 31.5 -19.5t17.5 -7.5q12 0 12 45q0 25 -29 58.5t-63.5 63.5t-63 71.5t-28.5 79.5q0 27 17 56t50 59.5t61 52.5l70 53l58 43q37 -36 59 -48.5t46 -12.5q71 0 130 63z" />
+<glyph unicode="&#x210d;" horiz-adv-x="768" d="M693 0h-220v304h-178v-304h-220v676h220v-302h178v302h220v-676zM623 70v536h-80v-536h80zM225 70v536h-80v-536h80z" />
+<glyph unicode="&#x210e;" horiz-adv-x="576" d="M523 105l20 -11q-61 -104 -153 -104q-23 0 -46 12.5t-23 33.5q0 15 7 46l54 223q3 15 3 42q0 37 -29 37q-40 0 -93 -92.5t-73 -182.5l-25 -109h-115l138 599q2 8 2 15q0 9 -2 12t-9 3t-44 -10l-5 28l188 38l-81 -354l2 -1q27 50 78.5 89.5t101.5 39.5q89 0 89 -83 q0 -28 -7 -56l-50 -213q-2 -8 -2 -21q0 -28 20 -28q18 0 54 47z" />
+<glyph unicode="&#x210f;" horiz-adv-x="576" d="M523 105l20 -11q-61 -104 -153 -104q-23 0 -46 12.5t-23 33.5q0 15 7 46l54 223q3 15 3 42q0 37 -29 37q-40 0 -93 -92.5t-73 -182.5l-25 -109h-115l108 471l-77 -15l12 49l77 15l18 79q2 8 2 15q0 9 -2 12t-9 3t-44 -10l-5 28l188 38l-33 -143l196 39l-12 -49l-195 -39 l-37 -162l2 -1q27 50 78.5 89.5t101.5 39.5q89 0 89 -83q0 -28 -7 -56l-50 -213q-2 -8 -2 -21q0 -28 20 -28q18 0 54 47z" />
+<glyph unicode="&#x2111;" horiz-adv-x="790" d="M710 694l25 -8l-11 -44q-5 -16 -19.5 -45.5t-31.5 -47t-47 -31.5t-68 -14q-62 0 -129 31t-117 31q-48 0 -78.5 -25.5t-30.5 -67.5q0 -35 24 -59t61 -24q27 0 50 10l12 -22q-34 -27 -91 -27q-69 0 -121.5 43t-52.5 110q0 81 61 139t161 58q54 0 97 -11t66 -24t55.5 -24 t66.5 -11q38 0 71 15t47 48zM721 388l-23 -12q-19 35 -51 35q-22 0 -36 -14t-14 -41q0 -32 23 -63l46 -65q23 -34 23 -74q0 -82 -70 -130.5t-176 -48.5q-59 0 -101.5 14t-65 33.5t-39 39t-35.5 33.5t-43 14q-37 0 -85 -42l-20 14q8 24 20 47.5t32 52t50.5 46t65.5 17.5 q31 0 55 -9.5t38 -20.5t27 -34.5t18 -36.5l13 -41q30 -94 78 -94q33 0 53.5 27.5t20.5 64.5q0 53 -43.5 119.5t-43.5 115.5q0 58 49.5 94t111.5 36q43 0 76.5 -20t45.5 -57z" />
+<glyph unicode="&#x2113;" horiz-adv-x="500" d="M43 429l26 38q28 -19 69 -35t59 -18q195 285 325 285q47 0 78.5 -21.5t31.5 -63.5q0 -56 -34.5 -107t-93.5 -87q-90 -56 -208 -65l-58 -100q-21 -36 -46 -94.5t-25 -91.5t25 -33q29 0 79.5 38t114.5 124l36 -27q-70 -99 -128.5 -142t-121.5 -43q-52 0 -82 31t-30 90 q0 97 103 255q-26 6 -64 27.5t-56 39.5zM333 421l1 -1q83 19 145.5 72t62.5 129q0 28 -25 28q-62 0 -184 -228z" />
+<glyph unicode="&#x2115;" horiz-adv-x="738" d="M663 0h-181l-335 452h-2v-452h-70v676h178l338 -459h2v459h70v-676zM593 70v30l-374 506h-74v-35l371 -501h77z" />
+<glyph unicode="&#x2116;" horiz-adv-x="1093" d="M1042 309q0 -69 -46 -116.5t-114 -47.5q-66 0 -111 47t-45 115q0 69 42.5 117.5t113.5 48.5t115.5 -44.5t44.5 -119.5zM919 295q0 100 -8 123q-9 26 -28 26q-22 0 -28 -26.5t-6 -109.5q0 -96 7 -114q8 -20 26 -20q21 0 29 25t8 96zM1033 -6h-295v90h295v-90zM585 302v111 q0 45 2.5 79.5t11 74t23.5 65t42.5 42.5t64.5 17q110 0 110 -87q0 -35 -23.5 -56.5t-52.5 -21.5q-55 0 -72 58q-5 18 -10 18q-18 0 -29 -14t-16 -43.5t-6 -54t-1 -64.5v-444h-28l-337 545v-257q0 -47 -2 -81.5t-10.5 -76t-23 -68t-42.5 -44.5t-66 -18q-110 0 -110 89 q0 35 23.5 55.5t52.5 20.5q55 0 72 -58q5 -18 10 -18q18 0 29.5 19.5t16 60.5t5.5 69t1 78v280q-33 46 -51 57t-55 16v25h243z" />
+<glyph unicode="&#x2117;" horiz-adv-x="747" d="M231 521h166q146 0 146 -101q0 -71 -68 -97q-32 -12 -117 -13v-102q0 -28 8 -36t41 -12v-18h-176v18q18 2 25 5q22 8 22 52v235q0 33 -8.5 43t-38.5 12v14zM358 479v-147q54 0 77 18t23 64q0 45 -18 65t-54 20q-28 0 -28 -20zM721 335q0 -150 -100 -252t-246 -102 q-149 0 -249 102.5t-100 254.5q0 150 101.5 251.5t252.5 101.5q143 0 242 -103.5t99 -252.5zM650 338q0 126 -81.5 213.5t-198.5 87.5q-112 0 -192.5 -89.5t-80.5 -214.5q0 -126 80.5 -214t196.5 -88q115 0 195.5 88.5t80.5 216.5z" />
+<glyph unicode="&#x2118;" horiz-adv-x="850" d="M475 448h-24q-3 24 -30.5 34.5t-53.5 10.5q-32 0 -66 -14t-66.5 -41.5t-53.5 -75.5t-21 -108q0 -86 42 -109q209 276 449 276q81 0 126 -32.5t45 -114.5q0 -109 -75 -196.5t-186 -87.5q-75 0 -110 33.5t-35 87.5q0 30 23 55t57 25q32 0 49.5 -18t17.5 -39 q0 -19 -10 -31.5t-20 -20.5t-10 -17q0 -35 43 -35q47 0 91 88t44 179q0 35 -14 59.5t-43 24.5q-88 0 -177 -81.5t-169 -201.5q40 -18 77 -56t37 -75q0 -81 -55.5 -133.5t-138.5 -52.5q-52 0 -83.5 30t-31.5 73q0 99 68 212q-65 29 -90.5 69t-25.5 95q0 102 88.5 191.5 t212.5 89.5q48 0 83.5 -24.5t35.5 -68.5zM302 -34q0 19 -11.5 43t-24.5 37q-58 -113 -58 -177q0 -48 16 -48q29 0 53.5 47t24.5 98z" />
+<glyph unicode="&#x2119;" horiz-adv-x="700" d="M75 676h349q109 0 177.5 -53t68.5 -159q0 -107 -67.5 -158.5t-178.5 -51.5h-129v-254h-220v676zM520 594v-259q42 18 61 47.5t19 76.5q0 101 -80 135zM450 328v273q-17 5 -56 5h-99v-282h85q13 0 38 2t32 2zM225 70v536h-80v-536h80z" />
+<glyph unicode="&#x211a;" horiz-adv-x="797" d="M727 27l20 -62q-50 -25 -76 -28q-9 -1 -20 -1q-67 0 -135 66q-58 -21 -123 -21q-146 0 -247 104t-101 250q0 150 99.5 253t249.5 103q146 0 247 -105.5t101 -251.5q0 -90 -40.5 -169t-114.5 -128q33 -31 63 -31q12 0 24.5 3t29.5 9.5t23 8.5zM592 538v-403q80 76 80 199 q0 118 -80 204zM522 105v485q-64 31 -132 31q-65 0 -125 -31v-485q61 63 129 63q40 0 68 -15.5t60 -47.5zM195 135v403q-80 -80 -80 -203q0 -115 80 -200zM463 60q-25 38 -69 38q-43 0 -73 -37q36 -10 76 -10q28 0 66 9z" />
+<glyph unicode="&#x211c;" horiz-adv-x="884" d="M821 117l20 -17q-20 -29 -65.5 -64.5t-90.5 -49.5h-24q-60 27 -79 66t-26 123q-13 153 -44 153l-52 -13q-50 -113 -88 -172.5t-125 -167.5q-25 14 -68 36l-49 25q-1 -1 -9 -8l-19 -18q-11 -10 -23 -25l-21 12l112 196q118 -72 126 -72q21 0 21 316q0 82 -18.5 155.5 t-58.5 73.5q-20 0 -34 -13.5t-14 -40.5q0 -42 37 -99t37 -101q0 -65 -47.5 -108.5t-142.5 -58.5l-8 24q22 8 39 29.5t17 51.5q0 34 -11.5 60.5t-25.5 41t-25.5 39t-11.5 55.5q0 61 51 107q52 46 149 46q118 0 181 -73l102 75q110 0 172.5 -44.5t62.5 -111.5 q0 -52 -31.5 -104t-101.5 -77v-2q64 -42 77 -162q15 -126 42 -126q29 0 67 43zM596 510q0 51 -20 86t-56 35q-30 0 -67 -39q29 -60 29 -136q0 -71 -8 -100q59 8 90.5 51.5t31.5 102.5z" />
+<glyph unicode="&#x211d;" horiz-adv-x="783" d="M758 0h-254l-166 271h-43v-271h-220v676h356q109 0 177.5 -48.5t68.5 -152.5q0 -125 -103 -176zM527 594v-242q80 31 80 121q0 43 -20.5 77t-59.5 44zM457 347v253q-19 6 -56 6h-106v-265h107q39 0 55 6zM634 70l-128 207l-88 -6l123 -201h93zM225 70v536h-80v-536h80z " />
+<glyph unicode="&#x211e;" horiz-adv-x="722" d="M726 0h-195l-27 37l-142 -138l-34 31l148 146l-172 237h-28v-196q0 -53 12.5 -69t55.5 -23v-25h-318v25q59 7 73.5 22t14.5 73v431q0 59 -16.5 77.5t-71.5 22.5v25h308q296 0 296 -172q0 -76 -45 -118q-42 -38 -112 -57l113 -146l95 94l33 -34l-99 -97l77 -99 q18 -22 34 -22v-25zM276 597v-252q103 1 143 31t40 118q0 79 -30 113.5t-100 34.5q-29 0 -41 -10t-12 -35z" />
+<glyph unicode="&#x2122;" horiz-adv-x="1000" d="M977 676v-23q-33 -2 -43.5 -11.5t-10.5 -36.5v-262q0 -32 7 -38.5t44 -9.5v-23h-194v23q37 3 43.5 9t6.5 39v226l-149 -298h-13l-142 296v-203q0 -41 9 -53.5t43 -15.5v-23h-133v23q33 3 42.5 15.5t9.5 53.5v237q-23 50 -70 52v23h139l142 -289l151 289h118zM386 588h-23 q-9 34 -24.5 49t-41.5 15h-46v-309q0 -32 7 -38.5t44 -9.5v-23h-194v23q37 3 43.5 9.5t6.5 38.5v309h-46q-26 0 -41 -14.5t-24 -49.5h-23v88h362v-88z" />
+<glyph unicode="&#x2124;" horiz-adv-x="777" d="M727 0h-675v70l407 551h-359v70h627v-70l-405 -551h405v-70zM642 621h-96l-408 -551h96z" />
+<glyph unicode="&#x2125;" horiz-adv-x="448" d="M255 254v-2q169 -40 169 -209q0 -118 -89 -191q-71 -57 -174 -57q-62 0 -101 28t-39 72q0 27 17 44t45 17q25 0 42 -15.5t17 -37.5q0 -16 -14 -37q-9 -15 -9 -22q0 -17 32 -17q50 0 87.5 62t37.5 139q0 27 -0.5 41t-2.5 38.5t-6 38.5t-12.5 31.5t-20 26.5t-30 15.5 t-42.5 6.5h-75v25l142 178h-163v25l163 190q-54 0 -77.5 -1.5t-42.5 -13.5t-25 -28.5t-17 -56.5h-25l7 132h364v-26l-164 -189h165v-26z" />
+<glyph unicode="&#x2126;" horiz-adv-x="758" d="M262 94l-2 29q-97 17 -161 91t-64 172q0 124 99 215t245 91q145 0 244.5 -91.5t99.5 -217.5q0 -94 -65 -164.5t-160 -95.5l-2 -29h138q33 0 44.5 17t11.5 60h25v-171h-302l7 155q64 15 100 81t36 153q0 66 -19 126t-60.5 102t-97.5 42q-55 0 -96.5 -42t-61 -101.5 t-19.5 -124.5q0 -88 36 -154.5t100 -81.5l7 -155h-302v171h25q0 -44 10 -60.5t41 -16.5h143z" />
+<glyph unicode="&#x2127;" horiz-adv-x="758" d="M496 580l2 -29q95 -25 160 -95.5t65 -164.5q0 -126 -99.5 -217.5t-244.5 -91.5q-146 0 -245 91t-99 215q0 98 64 172t161 91l2 29h-143q-31 0 -41 -16.5t-10 -60.5h-25v171h302l-7 -155q-64 -15 -100 -81.5t-36 -154.5q0 -65 19.5 -124.5t61 -101.5t96.5 -42 q56 0 97.5 42t60.5 102t19 126q0 87 -36 153t-100 81l-7 155h302v-171h-25q0 43 -11.5 60t-44.5 17h-138z" />
+<glyph unicode="&#x2128;" horiz-adv-x="755" d="M516 280v-2q89 -19 138 -77t49 -146q0 -104 -79 -177t-208 -73q-54 0 -93.5 14t-59.5 33.5t-36 39t-34.5 33.5t-43.5 14q-36 0 -84 -42l-21 14q4 17 17 41.5t34 53.5t54.5 48.5t70.5 19.5q109 0 130 -119q8 -49 31 -83t58 -34q92 0 92 203q0 88 -42.5 144t-98.5 56 q-50 0 -83 -14t-70 -60l-21 14q23 37 48 60.5t66 37.5v2q-67 26 -97 87l22 15q51 -65 138 -65q52 0 86.5 42.5t34.5 119.5t-36 119t-96 42q-125 0 -212 -139l-24 10q31 80 102.5 134.5t179.5 54.5q118 0 186 -60q65 -59 65 -157q0 -67 -42.5 -121.5t-120.5 -82.5z" />
+<glyph unicode="&#x2129;" horiz-adv-x="312" d="M244 0h-139v349q0 56 -24 56q-23 0 -49 -45l-23 12q19 45 57.5 74t85.5 29q42 0 67 -24.5t25 -66.5v-384z" />
+<glyph unicode="&#x212b;" horiz-adv-x="722" d="M448 815q0 -44 -31 -76t-75 -32q-45 0 -76 30.5t-31 75.5q0 44 32 75.5t76 31.5q43 0 74 -31t31 -74zM400 812q0 25 -18 42.5t-43 17.5q-22 0 -39 -17.5t-17 -40.5q0 -24 17 -41.5t40 -17.5q25 0 42.5 16.5t17.5 40.5zM689 0h-322v25l32 3q25 2 35.5 9.5t10.5 23.5 q0 29 -46 136h-225l-13 -34q-31 -80 -31 -97q0 -19 18.5 -28.5t62.5 -12.5v-25h-202v25q35 6 53 28t46 92l221 545h28l222 -522q38 -90 58.5 -116.5t51.5 -26.5v-25zM384 236l-101 243l-94 -243h195z" />
+<glyph unicode="&#x212d;" horiz-adv-x="773" d="M710 701l21 -14q-68 -139 -155 -139q-33 0 -66.5 9.5t-51.5 23.5q-12 -20 -12 -52q0 -26 16 -47t38 -36l44 -30q23 -16 39 -38t16 -50q0 -55 -51 -96.5t-118 -41.5q-40 0 -77 22l12 23q14 -10 33 -10q23 0 34.5 17.5t11.5 40.5t-9.5 40.5t-23.5 30.5l-28 26 q-14 13 -23.5 35.5t-9.5 53.5q0 44 55.5 109.5t121.5 120.5q46 -37 83 -37q61 0 100 39zM678 222l22 -12q-16 -43 -40 -81.5t-58.5 -73t-82 -54.5t-102.5 -20q-165 0 -264 109t-99 275q0 68 34 146t94 127q28 23 69.5 38.5t82.5 15.5q53 0 83 -22l-12 -23q-22 8 -38 8 q-43 0 -75 -41t-46.5 -96.5t-14.5 -113.5q0 -120 58 -199t166 -79q139 0 223 96z" />
+<glyph unicode="&#x2132;" horiz-adv-x="616" d="M546 0h-489l-9 85h368v186h-302v85h302v320h130v-676z" />
+<glyph unicode="&#x2135;" horiz-adv-x="766" d="M524 317l117 -125q26 -28 37.5 -49t11.5 -52q0 -68 -67 -125h-25q3 8 3 26q0 25 -92 117l-305 287q-18 -29 -18 -52q0 -24 16.5 -47.5t39.5 -44.5l47 -42q23 -22 39.5 -49.5t16.5 -57.5q0 -41 -34 -72t-96 -31h-137v25q92 4 92 46q0 15 -9.5 29.5t-23.5 29t-28 31 t-23.5 42t-9.5 56.5q0 92 101 160l-63 68q-32 35 -32 82q0 74 64 125h25q-4 -7 -4 -23q0 -25 90 -109l232 -220l34 114q-90 54 -90 124q0 61 63 114h25q-3 -15 -3 -31q0 -32 27 -54l43 -32q28 -20 41 -30.5t28.5 -26t22 -30.5t6.5 -33q0 -21 -11 -51.5t-32 -54.5h-25 q3 9 3 25q0 23 -65 63z" />
+<glyph unicode="&#x2136;" horiz-adv-x="703" d="M637 196l22 -15q-38 -97 -82 -139t-109 -42h-278q-74 0 -109 -34l-21 15q38 97 81.5 139t109.5 42h213q16 78 16 131q0 107 -24.5 143.5t-74.5 36.5q-27 0 -83.5 -12t-87.5 -12q-60 0 -91.5 35.5t-31.5 89.5q0 33 15.5 67t40.5 53h25q-1 -5 -1 -18q0 -25 12.5 -45 t36.5 -20q26 0 83 11t90 11q98 0 145 -58.5t47 -151.5q0 -66 -22 -136.5t-60 -124.5q56 0 86 6t52 28z" />
+<glyph unicode="&#x2137;" horiz-adv-x="562" d="M169 694h26q-3 -15 -3 -22q0 -30 23.5 -40.5t69.5 -10.5q106 0 106 -108q0 -23 -18.5 -79t-18.5 -112q0 -32 40 -74q4 -5 25 -26t29 -30.5t21 -28.5t18.5 -37t5.5 -37q0 -66 -67 -123h-25q3 9 3 18q0 21 -20 44l-43 54q-24 31 -32 68h-2q-63 -150 -151 -150h-85 q0 52 37.5 107t90.5 55q60 0 102 118q10 49 10 124q0 32 -19.5 55t-49.5 23q-55 0 -89 20q-46 26 -46 78q0 62 62 114z" />
+<glyph unicode="&#x2138;" horiz-adv-x="599" d="M95 694h26q-1 -6 -1 -18q0 -24 17 -44.5t43 -20.5t87.5 11t94.5 11q92 0 144.5 -46t52.5 -121q0 -45 -11 -74h-25q-30 64 -118 77q-23 -28 -23 -80q0 -33 30.5 -85.5t32.5 -57.5q29 -70 29 -116q0 -51 -36 -98.5t-102 -65.5l-21 15q26 37 26 81q0 43 -26 119.5t-26 106.5 q0 57 18.5 97t55.5 87v1q-27 0 -89 -12t-101 -12q-61 0 -97 36t-36 90q0 31 15.5 65.5t39.5 53.5z" />
+<glyph unicode="&#x213c;" horiz-adv-x="804" d="M714 135l45 -47q-67 -71 -89 -82q-32 -17 -97 -17q-71 0 -121.5 41t-50.5 111v250h-58v-391h-200v391h-88v70h667v-70h-121v-271q0 -45 7 -61q19 3 32 9.5t18 11.5l22 23q22 22 34 32zM471 391v-238q0 -33 16 -58.5t47 -30.5q-3 54 -3 55v272h-60zM273 70v321h-60v-321 h60z" />
+<glyph unicode="&#x213d;" horiz-adv-x="646" d="M572 479l52 -43q-89 -75 -212 -205q77 -129 77 -240q0 -76 -43 -135t-116 -59q-67 0 -103.5 40.5t-36.5 107.5q0 79 56 175q-27 40 -64 78t-85.5 81.5t-73.5 69.5l161 137l22 -20q19 -19 23 -22.5t21 -19.5t22.5 -22t20 -20.5t21.5 -23.5l20 -21q11 -13 20 -25l18 -23 q76 82 200 190zM179 392l-53 -47l11 -11q7 -6 32 -30l35 -34l30 -30q19 -19 33 -36t27 -35q85 -122 85 -296q40 40 40 129q0 54 -19 107t-55.5 102.5t-69 85t-79.5 79.5zM309 -94q0 76 -23 136q-26 -54 -26 -102q0 -25 12 -47t35 -26q2 13 2 39z" />
+<glyph unicode="&#x213e;" horiz-adv-x="497" d="M643 606h-348v-606h-220v676h568v-70zM225 70v536h-80v-536h80z" />
+<glyph unicode="&#x213f;" horiz-adv-x="768" d="M693 0h-220v606h-178v-606h-220v676h618v-676zM623 70v536h-80v-536h80zM225 70v536h-80v-536h80z" />
+<glyph unicode="&#x2140;" horiz-adv-x="976" d="M952 -269h-902v95l290 445l-304 406v96h800v-95h-414l307 -404l-301 -448h524v-95zM615 270l-313 408h-154l306 -409l-297 -443h161z" />
+<glyph unicode="&#x2145;" horiz-adv-x="748" d="M75 676h289q150 0 244.5 -93.5t94.5 -243.5q0 -146 -96 -242.5t-242 -96.5h-290v676zM553 543v-409q80 71 80 205q0 139 -80 204zM483 97v480q-33 29 -111 29h-77v-536h79q74 0 109 27zM225 70v536h-80v-536h80z" />
+<glyph unicode="&#x2146;" horiz-adv-x="643" d="M583 0h-198v36q-48 -50 -125 -50q-99 0 -154.5 71.5t-55.5 173.5q0 99 58.5 170.5t155.5 71.5q76 0 119 -42v245h200v-676zM513 70v536h-60v-536h60zM383 180v116q0 41 -31 74t-72 33q-29 0 -29 -5v-335q19 -7 35 -7q41 0 69 41t28 83zM181 76v297q-30 -19 -45.5 -60 t-15.5 -82q0 -46 14.5 -90t46.5 -65z" />
+<glyph unicode="&#x2147;" horiz-adv-x="573" d="M523 193h-272v-126q18 -11 48 -11q28 0 47.5 2.5t38.5 13t27 16t31.5 26.5t33.5 29l42 -52q-88 -105 -216 -105q-111 0 -182 66.5t-71 176.5t71.5 177t182.5 67q88 0 153.5 -55t65.5 -142v-83zM453 263v23q0 29 -17 56.5t-43 40.5v-120h60zM323 263v135q-6 5 -35 5 t-37 -7v-133h72zM181 86v289q-61 -39 -61 -145q0 -105 61 -144z" />
+<glyph unicode="&#x2148;" horiz-adv-x="330" d="M265 507h-200v184h200v-184zM195 577v44h-60v-44h60zM265 0h-200v461h200v-461zM195 70v321h-60v-321h60z" />
+<glyph unicode="&#x2149;" horiz-adv-x="371" d="M311 507h-200v184h200v-184zM241 577v44h-60v-44h60zM311 461v-467q0 -95 -66.5 -147t-164.5 -52q-48 0 -100 18l21 69q33 -17 73 -17q28 0 37 4v592h200zM241 -5v396h-60v-510q60 21 60 114z" />
+<glyph unicode="&#x214b;" horiz-adv-x="833" d="M61 561l15 25q31 52 57 73q39 31 93 31q40 0 72.5 -19t76.5 -69q115 87 222 87q86 0 138.5 -48t52.5 -134q0 -69 -45.5 -123t-150.5 -98q32 -50 42 -79.5t10 -64.5q0 -76 -53 -117.5t-149 -41.5q-72 0 -116 33.5t-44 87.5q0 48 36 83t116 64l-151 214q-45 -54 -60.5 -84 t-15.5 -61q0 -22 10.5 -29t53.5 -12v-24h-204v24q33 3 47 10.5t26 29.5q34 62 55 93t65 86q-42 54 -66 72.5t-53 18.5q-35 0 -60 -40zM649 410q0 87 -72 161q-39 42 -89 42q-36 0 -90 -39q5 -8 30 -42l44 -60l48 -71q30 -44 55 -85q41 24 57.5 45t16.5 49zM527 72 q0 64 -74 150q-38 -13 -54 -31.5t-16 -49.5q0 -50 27.5 -87.5t64.5 -37.5q24 0 38 15t14 41z" />
+<glyph unicode="&#x2153;" d="M238 275h-243v20q48 0 62.5 11.5t14.5 48.5v221q0 41 -23 41q-17 0 -43 -10l-13 -5v21l164 65h11v-337q0 -35 13 -45t57 -11v-20zM573 688h56l-439 -700h-58zM502 315l-20 7q52 91 149 91q50 0 78 -21.5t28 -59.5q0 -26 -11 -42.5t-39 -31.5v-4q76 -30 76 -105 q0 -65 -56.5 -110.5t-137.5 -45.5q-46 0 -73 14.5t-27 39.5q0 16 10.5 28.5t29.5 12.5q20 0 31 -6t36 -27q30 -26 49 -26q28 0 45.5 18t17.5 47q0 44 -29 71t-101 50v10q46 14 65 31.5t19 47.5q0 28 -17.5 44.5t-47.5 16.5q-23 0 -39.5 -11t-35.5 -39z" />
+<glyph unicode="&#x2154;" d="M613 688h56l-439 -700h-58zM502 315l-20 7q52 91 149 91q50 0 78 -21.5t28 -59.5q0 -26 -11 -42.5t-39 -31.5v-4q76 -30 76 -105q0 -65 -56.5 -110.5t-137.5 -45.5q-46 0 -73 14.5t-27 39.5q0 16 10.5 28.5t29.5 12.5q20 0 31 -6t36 -27q30 -26 49 -26q28 0 45.5 18 t17.5 47q0 44 -29 71t-101 50v10q46 14 65 31.5t19 47.5q0 28 -17.5 44.5t-47.5 16.5q-23 0 -39.5 -11t-35.5 -39zM328 402l-30 -127h-270v14q112 111 148 161t36 94q0 32 -22 54t-53 22q-47 0 -76 -54h-24q49 122 144 122q52 0 85.5 -31t33.5 -80q0 -33 -16.5 -62.5 t-57.5 -67.5l-93 -87v-5h86q50 0 64.5 7.5t28.5 39.5h16z" />
+<glyph unicode="&#x2155;" d="M238 275h-243v20q48 0 62.5 11.5t14.5 48.5v221q0 41 -23 41q-17 0 -43 -10l-13 -5v21l164 65h11v-337q0 -35 13 -45t57 -11v-20zM573 688h56l-439 -700h-58zM548 320l-12 -35q69 -4 101 -12q57 -14 89.5 -48.5t32.5 -82.5q0 -67 -55.5 -108t-143.5 -41q-46 0 -75 17 t-29 42q0 18 12 30.5t31 12.5q30 0 71 -29q33 -23 63 -23t50.5 15t20.5 39q0 26 -26.5 48t-73.5 34q-32 8 -130 12l72 215h229l-34 -86h-193z" />
+<glyph unicode="&#x2156;" d="M613 688h56l-439 -700h-58zM328 402l-30 -127h-270v14q112 111 148 161t36 94q0 32 -22 54t-53 22q-47 0 -76 -54h-24q49 122 144 122q52 0 85.5 -31t33.5 -80q0 -33 -16.5 -62.5t-57.5 -67.5l-93 -87v-5h86q50 0 64.5 7.5t28.5 39.5h16zM548 320l-12 -35q69 -4 101 -12 q57 -14 89.5 -48.5t32.5 -82.5q0 -67 -55.5 -108t-143.5 -41q-46 0 -75 17t-29 42q0 18 12 30.5t31 12.5q30 0 71 -29q33 -23 63 -23t50.5 15t20.5 39q0 26 -26.5 48t-73.5 34q-32 8 -130 12l72 215h229l-34 -86h-193z" />
+<glyph unicode="&#x2157;" d="M613 688h56l-439 -700h-58zM548 320l-12 -35q69 -4 101 -12q57 -14 89.5 -48.5t32.5 -82.5q0 -67 -55.5 -108t-143.5 -41q-46 0 -75 17t-29 42q0 18 12 30.5t31 12.5q30 0 71 -29q33 -23 63 -23t50.5 15t20.5 39q0 26 -26.5 48t-73.5 34q-32 8 -130 12l72 215h229 l-34 -86h-193zM56 590l-20 7q52 91 149 91q50 0 78 -21.5t28 -59.5q0 -26 -11 -42.5t-39 -31.5v-4q76 -30 76 -105q0 -65 -56.5 -110.5t-137.5 -45.5q-46 0 -73 14.5t-27 39.5q0 16 10.5 28.5t29.5 12.5q20 0 31 -6t36 -27q30 -26 49 -26q28 0 45.5 18t17.5 47q0 44 -29 71 t-101 50v10q46 14 65 31.5t19 47.5q0 28 -17.5 44.5t-47.5 16.5q-23 0 -39.5 -11t-35.5 -39z" />
+<glyph unicode="&#x2158;" d="M613 688h56l-439 -700h-58zM548 320l-12 -35q69 -4 101 -12q57 -14 89.5 -48.5t32.5 -82.5q0 -67 -55.5 -108t-143.5 -41q-46 0 -75 17t-29 42q0 18 12 30.5t31 12.5q30 0 71 -29q33 -23 63 -23t50.5 15t20.5 39q0 26 -26.5 48t-73.5 34q-32 8 -130 12l72 215h229 l-34 -86h-193zM277 428h41v-66h-41v-87h-93v87h-162v67q66 97 164 213l39 46h52v-260zM184 428v175l-137 -175h137z" />
+<glyph unicode="&#x2159;" d="M238 275h-243v20q48 0 62.5 11.5t14.5 48.5v221q0 41 -23 41q-17 0 -43 -10l-13 -5v21l164 65h11v-337q0 -35 13 -45t57 -11v-20zM573 688h56l-439 -700h-58zM754 416v-28q-144 -26 -184 -137q24 9 56 9q61 0 96.5 -33t35.5 -89q0 -65 -42 -105t-109 -40q-74 0 -119 47.5 t-45 127.5q0 108 98 179q45 32 86.5 44.5t126.5 24.5zM588 221q-16 0 -26 -5q-9 -7 -9 -65q0 -82 20 -114q8 -14 35 -14q25 0 34 16.5t9 65.5q0 64 -14 90t-49 26z" />
+<glyph unicode="&#x215a;" d="M613 688h56l-439 -700h-58zM754 416v-28q-144 -26 -184 -137q24 9 56 9q61 0 96.5 -33t35.5 -89q0 -65 -42 -105t-109 -40q-74 0 -119 47.5t-45 127.5q0 108 98 179q45 32 86.5 44.5t126.5 24.5zM588 221q-16 0 -26 -5q-9 -7 -9 -65q0 -82 20 -114q8 -14 35 -14 q25 0 34 16.5t9 65.5q0 64 -14 90t-49 26zM141 602l-12 -35q69 -4 101 -12q57 -14 89.5 -48.5t32.5 -82.5q0 -67 -55.5 -108t-143.5 -41q-46 0 -75 17t-29 42q0 18 12 30.5t31 12.5q30 0 71 -29q33 -23 63 -23t50.5 15t20.5 39q0 26 -26.5 48t-73.5 34q-32 8 -130 12l72 215 h229l-34 -86h-193z" />
+<glyph unicode="&#x215b;" d="M238 275h-243v20q48 0 62.5 11.5t14.5 48.5v221q0 41 -23 41q-17 0 -43 -10l-13 -5v21l164 65h11v-337q0 -35 13 -45t57 -11v-20zM573 688h56l-439 -700h-58zM465 99q0 75 87 100q-43 23 -61.5 48t-18.5 58q0 50 42 79t114 29q64 0 100.5 -25.5t36.5 -65.5q0 -59 -81 -84 q50 -30 70.5 -57.5t20.5 -64.5q0 -55 -44 -89t-118 -34q-67 0 -107.5 28.5t-40.5 77.5zM614 26q29 0 46.5 14.5t17.5 40.5q0 29 -18.5 48t-75.5 51q-35 -41 -35 -78q0 -36 17 -56t48 -20zM621 383q-25 0 -42 -12t-17 -29q0 -44 92 -84q17 19 22.5 31t5.5 30q0 27 -16.5 45.5 t-44.5 18.5z" />
+<glyph unicode="&#x215c;" d="M573 688h56l-439 -700h-58zM465 99q0 75 87 100q-43 23 -61.5 48t-18.5 58q0 50 42 79t114 29q64 0 100.5 -25.5t36.5 -65.5q0 -59 -81 -84q50 -30 70.5 -57.5t20.5 -64.5q0 -55 -44 -89t-118 -34q-67 0 -107.5 28.5t-40.5 77.5zM614 26q29 0 46.5 14.5t17.5 40.5 q0 29 -18.5 48t-75.5 51q-35 -41 -35 -78q0 -36 17 -56t48 -20zM621 383q-25 0 -42 -12t-17 -29q0 -44 92 -84q17 19 22.5 31t5.5 30q0 27 -16.5 45.5t-44.5 18.5zM56 590l-20 7q52 91 149 91q50 0 78 -21.5t28 -59.5q0 -26 -11 -42.5t-39 -31.5v-4q76 -30 76 -105 q0 -65 -56.5 -110.5t-137.5 -45.5q-46 0 -73 14.5t-27 39.5q0 16 10.5 28.5t29.5 12.5q20 0 31 -6t36 -27q30 -26 49 -26q28 0 45.5 18t17.5 47q0 44 -29 71t-101 50v10q46 14 65 31.5t19 47.5q0 28 -17.5 44.5t-47.5 16.5q-23 0 -39.5 -11t-35.5 -39z" />
+<glyph unicode="&#x215d;" d="M591 688h56l-439 -700h-58zM465 99q0 75 87 100q-43 23 -61.5 48t-18.5 58q0 50 42 79t114 29q64 0 100.5 -25.5t36.5 -65.5q0 -59 -81 -84q50 -30 70.5 -57.5t20.5 -64.5q0 -55 -44 -89t-118 -34q-67 0 -107.5 28.5t-40.5 77.5zM614 26q29 0 46.5 14.5t17.5 40.5 q0 29 -18.5 48t-75.5 51q-35 -41 -35 -78q0 -36 17 -56t48 -20zM621 383q-25 0 -42 -12t-17 -29q0 -44 92 -84q17 19 22.5 31t5.5 30q0 27 -16.5 45.5t-44.5 18.5zM141 602l-12 -35q69 -4 101 -12q57 -14 89.5 -48.5t32.5 -82.5q0 -67 -55.5 -108t-143.5 -41q-46 0 -75 17 t-29 42q0 18 12 30.5t31 12.5q30 0 71 -29q33 -23 63 -23t50.5 15t20.5 39q0 26 -26.5 48t-73.5 34q-32 8 -130 12l72 215h229l-34 -86h-193z" />
+<glyph unicode="&#x215e;" d="M573 688h56l-439 -700h-58zM465 99q0 75 87 100q-43 23 -61.5 48t-18.5 58q0 50 42 79t114 29q64 0 100.5 -25.5t36.5 -65.5q0 -59 -81 -84q50 -30 70.5 -57.5t20.5 -64.5q0 -55 -44 -89t-118 -34q-67 0 -107.5 28.5t-40.5 77.5zM614 26q29 0 46.5 14.5t17.5 40.5 q0 29 -18.5 48t-75.5 51q-35 -41 -35 -78q0 -36 17 -56t48 -20zM621 383q-25 0 -42 -12t-17 -29q0 -44 92 -84q17 19 22.5 31t5.5 30q0 27 -16.5 45.5t-44.5 18.5zM362 688l-172 -412h-70l142 319h-129q-35 0 -50.5 -11t-26.5 -40h-26l36 144h296z" />
+<glyph unicode="&#x2190;" horiz-adv-x="977" d="M909 209h-598q-48 0 -48 -13q0 -4 4 -10.5t9 -11.5l10 -12l7 -7q32 -35 61 -78l-24 -22q-110 129 -262 192v11q153 68 262 193l25 -20q-21 -31 -62 -77l-6 -7l-11 -13q-4 -5 -8.5 -13t-4.5 -12q0 -12 48 -12h598v-88z" />
+<glyph unicode="&#x2191;" horiz-adv-x="584" d="M490 414l-20 -25q-31 21 -77 62q-37 30 -45 30q-12 0 -12 -48v-603h-88v603q0 48 -13 48q-4 0 -10.5 -4t-12.5 -9l-11 -10l-7 -7q-35 -32 -78 -61l-22 24q129 110 192 262h11q68 -153 193 -262z" />
+<glyph unicode="&#x2192;" horiz-adv-x="977" d="M909 259v-11q-153 -68 -262 -193l-25 20q22 31 62 77l6 7l10 13q5 5 9.5 13t4.5 12q0 12 -48 12h-598v88h598q48 0 48 13q0 4 -4 10.5t-9 11.5l-11 12q-5 6 -6 7q-32 35 -61 78l24 22q110 -129 262 -192z" />
+<glyph unicode="&#x2193;" horiz-adv-x="584" d="M468 116l22 -24q-129 -110 -192 -262h-11q-68 153 -193 262l20 25q31 -21 77 -62q37 -30 45 -30q12 0 12 48v603h88v-603q0 -48 13 -48q4 0 10.5 4t12.5 9l11 10l7 7q35 32 78 61z" />
+<glyph unicode="&#x2194;" horiz-adv-x="977" d="M948 259v-11q-153 -68 -262 -193l-25 20q21 31 62 77l6 7l11 13q4 5 8.5 13t4.5 12q0 12 -35 12h-458q-35 0 -35 -13q0 -4 4 -10.5t9 -11.5l10 -12l7 -7q32 -35 61 -78l-24 -22q-110 129 -262 192v11q153 68 262 193l25 -20q-21 -31 -62 -77l-6 -7l-11 -13 q-4 -5 -8.5 -13t-4.5 -12q0 -12 48 -12h432q48 0 48 13q0 4 -4 10.5t-9 11.5l-10 12l-7 7q-32 35 -61 78l24 22q110 -129 262 -192z" />
+<glyph unicode="&#x2195;" horiz-adv-x="584" d="M468 56l22 -24q-129 -110 -192 -262h-11q-68 153 -193 262l20 25q31 -21 77 -62q37 -30 45 -30q12 0 12 48v480q0 48 -13 48q-4 0 -10.5 -4t-12.5 -9l-11 -10l-7 -7q-35 -32 -78 -61l-22 24q129 110 192 262h11q68 -153 193 -262l-20 -25q-31 21 -77 62q-37 30 -45 30 q-12 0 -12 -35v-506q0 -35 13 -35q4 0 10.5 4t12.5 9l11 10l7 7q35 32 78 61z" />
+<glyph unicode="&#x2196;" horiz-adv-x="977" d="M911 -108l-62 -62l-637 638q-28 28 -37 28q-4 0 -7.5 -8t-5 -17.5t-2.5 -19.5l-1 -10q-4 -61 -10 -98h-32q0 196 -49 325l8 8q120 -50 322 -50v-32q-46 -10 -98 -12q-1 0 -8.5 -0.5t-13.5 -1.5t-13.5 -2.5t-12 -4t-4.5 -5.5q0 -8 27 -37z" />
+<glyph unicode="&#x2197;" horiz-adv-x="977" d="M903 676l8 -8q-49 -129 -49 -325h-32q-6 37 -10 98l-1 10q-1 10 -2.5 19.5t-5 17.5t-7.5 8q-9 0 -37 -28l-637 -638l-62 62l636 639q27 29 27 37q0 3 -4.5 5.5t-12 4t-13.5 2.5t-13.5 1.5t-8.5 0.5q-52 2 -98 12v32q202 0 322 50z" />
+<glyph unicode="&#x2198;" horiz-adv-x="977" d="M911 -162l-8 -8q-120 50 -322 50v32q46 10 98 12q1 0 8 0.5t13.5 1.5t14 2.5t12 4t4.5 5.5q0 8 -27 37l-636 639l62 62l637 -638q28 -28 37 -28q4 0 7.5 8t5 17.5t2.5 19.5l1 10q4 61 10 98h32q0 -196 49 -325z" />
+<glyph unicode="&#x2199;" horiz-adv-x="977" d="M911 614l-636 -639q-27 -29 -27 -37q0 -3 4.5 -5.5t12 -4t13.5 -2.5t13.5 -1.5t8.5 -0.5q52 -2 98 -12v-32q-202 0 -322 -50l-8 8q49 129 49 325h32q6 -37 10 -98l1 -10q1 -10 2.5 -19.5t5 -17.5t7.5 -8q9 0 37 28l637 638z" />
+<glyph unicode="&#x219a;" horiz-adv-x="977" d="M909 209h-306l-97 -148h-83l97 148h-209q-48 0 -48 -13q0 -4 4 -10.5t9 -11.5l10 -12l7 -7q32 -35 61 -78l-24 -22q-110 129 -262 192v11q153 68 262 193l25 -20q-21 -31 -62 -77l-6 -7l-11 -13q-4 -5 -8.5 -13t-4.5 -12q0 -12 48 -12h266l97 148h83l-97 -148h249v-88z " />
+<glyph unicode="&#x219b;" horiz-adv-x="977" d="M909 259v-11q-153 -68 -262 -193l-25 20q22 31 62 77l6 7l10 13q5 5 9.5 13t4.5 12q0 12 -48 12h-321l-97 -148h-83l97 148h-194v88h251l97 148h83l-97 -148h264q48 0 48 13q0 4 -4 10.5t-9 11.5l-11 12q-5 6 -6 7q-32 35 -61 78l24 22q110 -129 262 -192z" />
+<glyph unicode="&#x219c;" horiz-adv-x="956" d="M890 267l-44 -71q-71 55 -160 55q-42 0 -123 -29q-85 -29 -151 -29q-40 0 -89 15l-31 10q-15 5 -26 5q-17 0 -26.5 -8.5t-9.5 -22.5t5 -29q7 -20 24 -79l-33 -12q-34 97 -60 149q-42 84 -100 135l1 11q129 6 301 95l16 -27q-27 -20 -75 -48q-33 -18 -33 -38 q0 -27 46.5 -47.5t82.5 -20.5q45 0 136 29t128 29q74 0 121 -15t100 -57z" />
+<glyph unicode="&#x219d;" horiz-adv-x="956" d="M889 367l1 -11q-58 -51 -100 -135q-26 -52 -60 -149l-33 12q17 59 24 79q5 15 5 29t-9.5 22.5t-26.5 8.5q-11 0 -26 -5l-31 -10q-49 -15 -89 -15q-66 0 -151 29q-81 29 -123 29q-89 0 -160 -55l-44 71q53 42 100 57t121 15q37 0 128 -29t136 -29q36 0 82.5 20.5 t46.5 47.5q0 20 -33 38q-48 28 -75 48l16 27q172 -89 301 -95z" />
+<glyph unicode="&#x219e;" horiz-adv-x="977" d="M909 209h-364q-48 0 -48 -13q0 -11 30 -41q26 -29 61 -78l-24 -22q-80 94 -185 154h-68q-48 0 -48 -13q0 -11 30 -41q26 -29 61 -78l-24 -22q-110 129 -262 192v11q150 67 262 193l25 -20q-23 -33 -62 -77q-1 -1 -7 -9l-11 -13q-4 -5 -8 -12t-4 -11q0 -12 48 -12h68 q101 57 185 154l25 -20q-23 -33 -62 -77q-1 -1 -7 -9l-11 -13q-4 -5 -8 -12t-4 -11q0 -12 48 -12h364v-88z" />
+<glyph unicode="&#x219f;" horiz-adv-x="568" d="M482 180l-22 -24q-49 35 -78 61q-30 30 -41 30q-13 0 -13 -48v-364h-88v364q0 48 -12 48q-5 0 -11.5 -4t-11.5 -8l-13 -11q-7 -6 -9 -7q-44 -39 -77 -62l-20 25q96 85 154 185v68q0 48 -12 48q-5 0 -11.5 -4t-11.5 -8l-13 -11q-7 -6 -9 -7q-44 -39 -77 -62l-20 25 q124 109 193 262h11q63 -152 192 -262l-22 -24q-49 35 -78 61q-30 30 -41 30q-13 0 -13 -48v-69q59 -103 154 -184z" />
+<glyph unicode="&#x21a0;" horiz-adv-x="977" d="M909 258v-11q-152 -63 -262 -192l-24 22q35 49 61 78q30 30 30 41q0 13 -48 13h-68q-105 -60 -185 -154l-24 22q35 49 61 78q30 30 30 41q0 13 -48 13h-364v88h364q48 0 48 12q0 4 -4 11t-8 12l-10 13q-7 8 -8 9q-39 44 -62 77l25 20q84 -97 185 -154h68q48 0 48 12 q0 4 -4 11t-8 12l-10 13q-7 8 -8 9q-39 44 -62 77l25 20q112 -126 262 -193z" />
+<glyph unicode="&#x21a1;" horiz-adv-x="568" d="M460 121l22 -24q-129 -110 -192 -262h-11q-69 153 -193 262l20 25q33 -23 77 -62q2 -1 9 -8l13 -10q5 -4 11.5 -8t11.5 -4q12 0 12 48v68q-58 100 -154 185l20 25q33 -23 77 -62q2 -1 9 -8l13 -10q5 -4 11.5 -8t11.5 -4q12 0 12 48v364h88v-364q0 -48 13 -48q11 0 41 30 q29 26 78 61l22 -24q-95 -81 -154 -184v-69q0 -48 13 -48q11 0 41 30q29 26 78 61z" />
+<glyph unicode="&#x21a2;" horiz-adv-x="977" d="M884 451l25 -20q-9 -13 -40.5 -50t-45 -64.5t-13.5 -62.5q0 -56 37 -99q35 -40 61 -78l-24 -22q-80 94 -185 154h-388q-48 0 -48 -13q0 -11 30 -41q33 -36 61 -78l-24 -22q-110 129 -262 192v11q150 67 262 193l25 -20q-23 -33 -62 -77q-1 -1 -7 -9l-11 -13q-4 -5 -8 -12 t-4 -11q0 -12 48 -12h388q101 57 185 154z" />
+<glyph unicode="&#x21a3;" horiz-adv-x="977" d="M909 258v-11q-152 -63 -262 -192l-24 22q28 42 61 78q30 30 30 41q0 13 -48 13h-388q-105 -60 -185 -154l-24 22q26 38 61 78q37 43 37 99q0 35 -13.5 62.5t-45 64.5t-40.5 50l25 20q84 -97 185 -154h388q48 0 48 12q0 4 -4 11t-8 12l-10 13q-7 8 -8 9q-39 44 -62 77 l25 20q112 -126 262 -193z" />
+<glyph unicode="&#x21a4;" horiz-adv-x="977" d="M909 55h-70v154h-528q-48 0 -48 -13q0 -11 30 -41q26 -29 61 -78l-24 -22q-110 129 -262 192v11q150 67 262 193l25 -20q-23 -33 -62 -77q-1 -1 -7 -9l-11 -13q-4 -5 -8 -12t-4 -11q0 -12 48 -12h528v154h70v-396z" />
+<glyph unicode="&#x21a5;" horiz-adv-x="584" d="M490 -165h-396v70h154v528q0 48 -12 48q-8 0 -45 -30q-44 -39 -77 -62l-20 25q126 112 193 262h11q63 -152 192 -262l-22 -24q-49 35 -78 61q-30 30 -41 30q-13 0 -13 -48v-528h154v-70z" />
+<glyph unicode="&#x21a6;" horiz-adv-x="977" d="M909 258v-11q-152 -63 -262 -192l-24 22q35 49 61 78q30 30 30 41q0 13 -48 13h-528v-154h-70v396h70v-154h528q48 0 48 12q0 4 -4 11t-8 12l-10 13q-7 8 -8 9q-39 44 -62 77l25 20q112 -126 262 -193z" />
+<glyph unicode="&#x21a7;" horiz-adv-x="584" d="M468 121l22 -24q-129 -110 -192 -262h-11q-67 150 -193 262l20 25q33 -23 77 -62q37 -30 45 -30q12 0 12 48v528h-154v70h396v-70h-154v-528q0 -48 13 -48q11 0 41 30q29 26 78 61z" />
+<glyph unicode="&#x21a8;" horiz-adv-x="584" d="M490 -196h-396v66h193q-68 153 -193 262l20 25q31 -21 77 -62q37 -30 45 -30q12 0 12 48v376q0 48 -13 48q-4 0 -10.5 -4t-12.5 -9l-11 -10l-7 -7q-35 -32 -78 -61l-22 24q129 110 192 262h11q68 -153 193 -262l-20 -25q-31 21 -77 62q-37 30 -45 30q-12 0 -12 -35v-402 q0 -35 13 -35q4 0 10.5 4t12.5 9l11 10l7 7q35 32 78 61l22 -24q-129 -110 -192 -262h192v-66z" />
+<glyph unicode="&#x21a9;" horiz-adv-x="966" d="M666 539h67q72 0 119.5 -45t47.5 -123q0 -65 -49.5 -113.5t-117.5 -48.5h-424q-48 0 -48 -13q0 -4 4 -10.5t9 -11.5l10 -12l7 -7q32 -35 61 -78l-24 -22q-110 129 -262 192v11q153 68 262 193l25 -20q-21 -31 -62 -77l-6 -7l-11 -13q-4 -5 -8.5 -13t-4.5 -12 q0 -12 48 -12h422q36 0 58.5 26t22.5 57q0 32 -22 58.5t-59 26.5h-65v74z" />
+<glyph unicode="&#x21aa;" horiz-adv-x="966" d="M900 258v-11q-152 -63 -262 -192l-24 22q29 43 61 78l7 7l10 12q5 5 9 11.5t4 10.5q0 13 -48 13h-424q-68 0 -117.5 48.5t-49.5 113.5q0 78 47.5 123t119.5 45h67v-74h-65q-37 0 -59 -26.5t-22 -58.5q0 -31 22.5 -57t58.5 -26h422q48 0 48 12q0 4 -4.5 12t-8.5 13l-11 13 l-6 7q-41 46 -62 77l25 20q109 -125 262 -193z" />
+<glyph unicode="&#x21ab;" horiz-adv-x="966" d="M569 297v67q0 84 46.5 130t115.5 46q72 0 120.5 -46t48.5 -123q0 -69 -53.5 -115.5t-125.5 -46.5h-78v-215h-74v215h-260q-48 0 -48 -13q0 -4 4 -10.5t9 -11.5l10 -12l7 -7q32 -35 61 -78l-24 -22q-110 129 -262 192v11q153 68 262 193l25 -20q-21 -31 -62 -77l-6 -7 l-11 -13q-4 -5 -8.5 -13t-4.5 -12q0 -12 48 -12h260zM643 297h74q39 0 67 22t28 62q0 43 -22.5 64t-61.5 21t-62 -28t-23 -72v-69z" />
+<glyph unicode="&#x21ac;" horiz-adv-x="966" d="M900 258v-11q-152 -63 -262 -192l-24 22q29 43 61 78l7 7l10 12q5 5 9 11.5t4 10.5q0 13 -48 13h-260v-215h-74v215h-78q-72 0 -125.5 46.5t-53.5 115.5q0 77 48.5 123t120.5 46q69 0 115.5 -46t46.5 -130v-67h260q48 0 48 12q0 4 -4.5 12t-8.5 13l-11 13l-6 7 q-41 46 -62 77l25 20q109 -125 262 -193zM323 297v69q0 44 -23 72t-62 28t-61.5 -21t-22.5 -64q0 -40 28 -62t67 -22h74z" />
+<glyph unicode="&#x21ad;" horiz-adv-x="1297" d="M1242 258v-11q-152 -63 -262 -192l-24 22q29 43 61 78l7 7l10 12q5 5 9 11.5t4 10.5q0 13 -45 13h-53q-27 0 -54 -37l-8 -12l-9 -12q-2 -4 -8 -11.5t-10 -10.5l-10 -10q-6 -5 -12 -7t-14 -4t-16 -2q-29 0 -49 26.5t-41 75.5q-26 65 -31 74q-20 38 -41 38t-41 -38l-9 -21 q-5 -12 -11 -28t-10 -25q-19 -48 -40 -75t-50 -27q-45 0 -77 49l-26 38q-17 19 -39 19h-53q-40 0 -40 -13q0 -4 4 -10.5t9 -11.5l11 -12q5 -6 6 -7q32 -35 61 -78l-24 -22q-110 129 -262 192v11q153 68 262 193l25 -20q-22 -31 -62 -77l-6 -7l-10 -13q-5 -5 -9.5 -13 t-4.5 -12q0 -12 40 -12h63q9 0 17 -1.5t15.5 -7t12 -8.5t11.5 -12.5t9 -12t9.5 -14.5t8.5 -13q24 -37 47 -37q22 0 37 39q5 12 13.5 39.5t10.5 33.5q34 102 102 102q39 0 62.5 -27t40.5 -75q2 -6 10.5 -33.5t13.5 -39.5q15 -39 37 -39q23 0 47 37q1 1 8.5 13t9.5 14.5t9 12 t12 12.5l11 8q7 5 15 7t17 2h60q48 0 48 12q0 4 -4.5 12t-8.5 13l-11 13l-6 7q-41 46 -62 77l25 20q109 -125 262 -193z" />
+<glyph unicode="&#x21ae;" horiz-adv-x="977" d="M948 259v-11q-153 -68 -262 -193l-25 20q21 31 62 77l6 7l11 13q4 5 8.5 13t4.5 12q0 12 -35 12h-209l-43 -148h-66l43 148h-183q-35 0 -35 -13q0 -4 4 -10.5t9 -11.5l10 -12l7 -7q32 -35 61 -78l-24 -22q-110 129 -262 192v11q153 68 262 193l25 -20q-21 -31 -62 -77 l-6 -7l-11 -13q-4 -5 -8.5 -13t-4.5 -12q0 -12 48 -12h195l42 146h66l-42 -146h171q48 0 48 13q0 4 -4 10.5t-9 11.5l-10 12l-7 7q-32 35 -61 78l24 22q110 -129 262 -192z" />
+<glyph unicode="&#x21af;" horiz-adv-x="562" d="M494 347l-234 -323q-23 -32 -23 -46q0 -17 31 -17q16 0 47 2.5t46 2.5q3 0 8.5 -0.5t8.5 -0.5l3 -32q-168 -12 -307 -87l-6 5q20 80 20 148q0 81 -19 170l31 6q15 -47 23 -89q1 -4 2.5 -11.5t2.5 -11.5q8 -21 19 -21q17 0 41 35l127 182h-239l320 424l73 -49l-211 -287 h236z" />
+<glyph unicode="&#x21b0;" horiz-adv-x="584" d="M503 -170h-88v614h-127q-48 0 -48 -13q0 -11 30 -41q26 -29 61 -78l-24 -22q-110 129 -262 192v11q150 67 262 193l25 -20q-23 -33 -62 -77q-30 -37 -30 -45q0 -12 48 -12h215v-702z" />
+<glyph unicode="&#x21b1;" horiz-adv-x="584" d="M539 493v-11q-152 -63 -262 -192l-24 22q35 49 61 78q30 30 30 41q0 13 -48 13h-127v-614h-88v702h215q48 0 48 12q0 8 -30 45q-39 44 -62 77l25 20q112 -126 262 -193z" />
+<glyph unicode="&#x21b2;" horiz-adv-x="584" d="M503 -16h-215q-48 0 -48 -12q0 -8 30 -45q39 -44 62 -77l-25 -20q-112 126 -262 193v11q152 63 262 192l24 -22q-35 -49 -61 -78q-30 -30 -30 -41q0 -13 48 -13h127v614h88v-702z" />
+<glyph unicode="&#x21b3;" horiz-adv-x="584" d="M539 34v-11q-150 -67 -262 -193l-25 20q23 33 62 77q30 37 30 45q0 12 -48 12h-215v702h88v-614h127q48 0 48 13q0 11 -30 41q-26 29 -61 78l24 22q110 -129 262 -192z" />
+<glyph unicode="&#x21b4;" horiz-adv-x="960" d="M874 125l20 -25q-125 -109 -193 -262h-11q-63 152 -192 262l22 24q43 -29 78 -61l7 -7l11 -10q6 -5 12.5 -9t10.5 -4q13 0 13 48v517h-586v88h673l1 -605q0 -48 12 -48q8 0 45 30q46 41 77 62z" />
+<glyph unicode="&#x21b5;" horiz-adv-x="960" d="M904 -16l-605 -1q-48 0 -48 -12q0 -4 4.5 -12t8.5 -13l11 -13l6 -7q41 -46 62 -77l-25 -20q-109 125 -262 193v11q152 63 262 192l24 -22q-29 -43 -61 -78l-7 -7l-10 -12q-5 -5 -9 -11.5t-4 -10.5q0 -13 48 -13h517v615h88v-702z" />
+<glyph unicode="&#x21b6;" horiz-adv-x="971" d="M905 185h-88q-3 105 -78 178t-180 73q-83 0 -150 -45t-94 -122q-7 -25 -7 -47q0 -27 13 -27q7 0 41 30q36 33 78 61l22 -24q-129 -110 -192 -262h-11q-67 150 -193 262l20 25q33 -23 77 -62q34 -30 45 -30q4 0 6.5 4t3.5 11t1.5 13t0.5 13v7q4 40 27 87q42 89 128 141.5 t186 52.5q138 0 239.5 -100.5t104.5 -238.5z" />
+<glyph unicode="&#x21b7;" horiz-adv-x="971" d="M885 287l20 -25q-126 -112 -193 -262h-11q-63 152 -192 262l22 24q42 -28 78 -61q34 -30 41 -30q13 0 13 27q0 22 -7 47q-27 77 -94 122t-150 45q-105 0 -180 -73t-78 -178h-88q3 138 104.5 238.5t239.5 100.5q100 0 186 -52.5t128 -141.5q23 -47 27 -87v-7q0 -7 0.5 -13 t1.5 -13t3.5 -11t6.5 -4q11 0 45 30q44 39 77 62z" />
+<glyph unicode="&#x21b8;" horiz-adv-x="977" d="M911 -108l-62 -62l-637 638q-28 28 -37 28q-4 0 -7.5 -8t-5 -17.5t-2.5 -19.5l-1 -10q-4 -61 -10 -98h-32q0 196 -49 325l8 8q120 -50 322 -50v-32q-46 -10 -98 -12q-1 0 -8.5 -0.5t-13.5 -1.5t-13.5 -2.5t-12 -4t-4.5 -5.5q0 -8 27 -37zM911 680h-835v88h835v-88z" />
+<glyph unicode="&#x21b9;" horiz-adv-x="977" d="M909 -96h-70v396h70v-396zM909 376h-523q-48 0 -48 -13q0 -4 4 -10.5t9 -12.5l11 -11q5 -6 6 -7q32 -35 61 -78l-24 -22q-110 129 -262 192v11q153 68 262 193l25 -20q-22 -31 -62 -77q-30 -37 -30 -45q0 -12 48 -12h523v-88zM834 89v-11q-152 -63 -262 -192l-24 22 q29 43 61 78l7 7l10 11q5 6 9 12.5t4 10.5q0 13 -48 13h-523v88h523q48 0 48 12q0 8 -30 45q-41 46 -62 77l25 20q109 -125 262 -193zM138 222h-70v396h70v-396z" />
+<glyph unicode="&#x21ba;" horiz-adv-x="974" d="M826 693l13 -29q-72 -42 -120 -66q-21 -10 -21 -20q0 -2 3 -5q168 -128 168 -319q0 -158 -112 -269.5t-270 -111.5t-270 111.5t-112 269.5q0 127 76.5 228t198.5 140l29 -82q-95 -31 -156 -110.5t-61 -177.5q0 -120 86.5 -205t207.5 -85t208 86t87 207q0 67 -30.5 131 t-83.5 102q-1 0 -2.5 0.5t-2.5 0.5q-9 0 -9 -16q0 -7 1 -10q15 -45 33 -135l-30 -10q-56 181 -151 284l5 11h14q124 0 301 80z" />
+<glyph unicode="&#x21bb;" horiz-adv-x="974" d="M565 540l29 82q122 -39 198.5 -140t76.5 -228q0 -158 -112 -269.5t-270 -111.5t-270 111.5t-112 269.5q0 191 168 319q3 3 3 5q0 10 -21 20q-48 24 -120 66l13 29q177 -80 301 -80h14l5 -11q-95 -103 -151 -284l-30 10q18 90 33 135q1 3 1 10q0 16 -9 16q-1 0 -2.5 -0.5 t-2.5 -0.5q-53 -38 -83.5 -102t-30.5 -131q0 -121 87 -207t208 -86t207.5 85t86.5 205q0 98 -61 177.5t-156 110.5z" />
+<glyph unicode="&#x21bc;" horiz-adv-x="977" d="M910 209h-844v4q163 130 308 288l34 -29l-46 -54q-36 -42 -54 -66.5t-18 -33.5q0 -21 25 -21h595v-88z" />
+<glyph unicode="&#x21bd;" horiz-adv-x="977" d="M909 209h-595q-25 0 -25 -21q0 -9 18 -33.5t54 -66.5l46 -54l-34 -29q-145 158 -308 288v4h844v-88z" />
+<glyph unicode="&#x21be;" horiz-adv-x="552" d="M481 418l-22 -24q-43 29 -78 61l-7 7l-12 10q-5 5 -11.5 9t-10.5 4q-13 0 -13 -48v-599h-88v856z" />
+<glyph unicode="&#x21bf;" horiz-adv-x="352" d="M313 -162h-88v599q0 48 -13 48q-4 0 -10.5 -4t-11.5 -9l-12 -10l-7 -7q-35 -32 -78 -61l-22 24l242 276v-856z" />
+<glyph unicode="&#x21c0;" horiz-adv-x="977" d="M910 209h-844v88h595q25 0 25 21q0 9 -18 33.5t-54 66.5l-46 54l34 29q145 -158 308 -288v-4z" />
+<glyph unicode="&#x21c1;" horiz-adv-x="977" d="M910 297v-4q-163 -130 -308 -288l-34 29l46 54q36 42 54 66.5t18 33.5q0 21 -25 21h-595v88h844z" />
+<glyph unicode="&#x21c2;" horiz-adv-x="552" d="M481 114l-242 -276v856h88v-599q0 -48 13 -48q4 0 10.5 4t11.5 9l12 10l7 7q35 32 78 61z" />
+<glyph unicode="&#x21c3;" horiz-adv-x="552" d="M313 -162l-242 276l22 24q43 -29 78 -61l7 -7l12 -10q5 -5 11.5 -9t10.5 -4q13 0 13 48v599h88v-856z" />
+<glyph unicode="&#x21c4;" horiz-adv-x="977" d="M909 425v-11q-152 -63 -262 -192l-24 22q29 43 61 78q1 1 6 7l11 11q5 6 9 12.5t4 10.5q0 13 -48 13h-598v88h598q48 0 48 12q0 8 -30 45q-40 46 -62 77l25 20q109 -125 262 -193zM909 40h-598q-48 0 -48 -13q0 -4 4 -10.5t9 -12.5l10 -11l7 -7q32 -35 61 -78l-24 -22 q-110 129 -262 192v11q153 68 262 193l25 -20q-21 -31 -62 -77q-30 -37 -30 -45q0 -12 48 -12h598v-88z" />
+<glyph unicode="&#x21c5;" horiz-adv-x="864" d="M776 121l22 -24q-129 -110 -192 -262h-11q-68 153 -193 262l20 25q31 -22 77 -62q37 -30 45 -30q12 0 12 48v598h88v-598q0 -48 13 -48q4 0 10.5 4t12.5 9l11 11q6 5 7 6q35 32 78 61zM462 414l-22 -24q-43 29 -78 61l-7 7l-11 10q-6 5 -12.5 9t-10.5 4q-13 0 -13 -48 v-598h-88v598q0 48 -12 48q-8 0 -45 -30q-46 -41 -77 -62l-20 25q125 109 193 262h11q63 -152 192 -262z" />
+<glyph unicode="&#x21c6;" horiz-adv-x="977" d="M909 376h-598q-48 0 -48 -13q0 -4 4 -10.5t9 -12.5l10 -11l7 -7q32 -35 61 -78l-24 -22q-110 129 -262 192v11q153 68 262 193l25 -20q-21 -31 -62 -77q-30 -37 -30 -45q0 -12 48 -12h598v-88zM909 89v-11q-152 -63 -262 -192l-24 22q29 43 61 78q1 1 6 7l11 11 q5 6 9 12.5t4 10.5q0 13 -48 13h-598v88h598q48 0 48 12q0 8 -30 45q-40 46 -62 77l25 20q109 -125 262 -193z" />
+<glyph unicode="&#x21c7;" horiz-adv-x="977" d="M909 40h-598q-48 0 -48 -13q0 -11 30 -41q26 -29 61 -78l-24 -22q-110 129 -262 192v11q139 62 235 163q-101 106 -235 162v11q153 69 262 193l25 -20q-23 -33 -62 -77q-1 -2 -7 -9l-11 -13q-4 -5 -8 -11.5t-4 -11.5q0 -12 48 -12h598v-88h-598q-48 0 -48 -13 q0 -11 30 -41q11 -12 29 -36l27 -33q-26 -34 -56 -68q-1 -2 -7 -9l-11 -13q-4 -5 -8 -11.5t-4 -11.5q0 -12 48 -12h598v-88z" />
+<glyph unicode="&#x21c8;" horiz-adv-x="864" d="M798 414l-22 -24q-49 35 -78 61q-30 30 -41 30q-13 0 -13 -48v-598h-88v598q0 48 -12 48q-5 0 -11.5 -4t-11.5 -8l-13 -11q-7 -6 -9 -7l-68 -56l-33 27q-24 18 -36 29q-30 30 -41 30q-13 0 -13 -48v-598h-88v598q0 48 -12 48q-5 0 -11.5 -4t-11.5 -8l-13 -11q-7 -6 -9 -7 q-44 -39 -77 -62l-20 25q124 109 193 262h11q56 -134 162 -235q101 96 163 235h11q63 -152 192 -262z" />
+<glyph unicode="&#x21c9;" horiz-adv-x="977" d="M909 89v-11q-152 -63 -262 -192l-24 22q35 49 61 78q30 30 30 41q0 13 -48 13h-598v88h598q48 0 48 12q0 5 -4 11.5t-8 11.5t-10.5 12.5t-7.5 9.5q-30 34 -56 68l26 33q19 24 30 36q30 30 30 41q0 13 -48 13h-598v88h598q48 0 48 12q0 5 -4 11.5t-8 11.5t-10.5 12.5 t-7.5 9.5q-39 44 -62 77l25 20q109 -124 262 -193v-11q-134 -56 -235 -162q96 -101 235 -163z" />
+<glyph unicode="&#x21ca;" horiz-adv-x="864" d="M776 121l22 -24q-129 -110 -192 -262h-11q-62 139 -163 235q-106 -101 -162 -235h-11q-69 153 -193 262l20 25q33 -23 77 -62q2 -1 9 -8l13 -10q5 -4 11.5 -8t11.5 -4q12 0 12 48v598h88v-598q0 -48 13 -48q11 0 41 30q12 11 36 30l33 26l68 -56q2 -1 9 -8l13 -10 q5 -4 11.5 -8t11.5 -4q12 0 12 48v598h88v-598q0 -48 13 -48q11 0 41 30q29 26 78 61z" />
+<glyph unicode="&#x21cb;" horiz-adv-x="977" d="M910 329h-844l276 242l24 -22q-29 -43 -61 -78l-7 -7l-10 -12q-5 -5 -9 -11.5t-4 -10.5q0 -13 48 -13h587v-88zM910 221l-276 -242l-24 22q29 43 61 78l7 7l10 12q5 5 9 11.5t4 10.5q0 13 -48 13h-587v88h844z" />
+<glyph unicode="&#x21cc;" horiz-adv-x="977" d="M910 329h-844v88h587q48 0 48 13q0 11 -30 41q-31 35 -61 78l24 22zM910 133h-587q-48 0 -48 -13q0 -11 30 -41q31 -35 61 -78l-24 -22l-276 242h844v-88z" />
+<glyph unicode="&#x21cd;" horiz-adv-x="977" d="M909 107h-226l-52 -171h-73l52 171h-184q-48 0 -48 -21q0 -14 16 -33q43 -48 78 -97l-25 -20q-147 157 -379 312v10q192 123 379 312l24 -22l-28 -38l-31 -40q-16 -18 -18 -21q-16 -19 -16 -29q0 -21 46 -21h273l52 171h73l-52 -171h139v-88h-165l-35 -116h200v-88z M671 311h-420q-19 -5 -31 -22t-12 -36t12 -36.5t31 -21.5h385z" />
+<glyph unicode="&#x21ce;" horiz-adv-x="1240" d="M1190 258v-10q-232 -155 -379 -312l-25 20q35 49 78 97q16 19 16 33q0 21 -48 21h-217l-52 -171h-73l52 171h-134q-48 0 -48 -21q0 -14 16 -33q43 -48 78 -97l-25 -20q-147 157 -379 312v10q192 123 379 312l24 -22l-28 -38l-31 -40q-16 -18 -18 -21q-16 -19 -16 -29 q0 -21 46 -21h223l52 171h73l-52 -171h132q46 0 46 21q0 10 -16 29q-2 3 -18 21l-31 40l-28 38l24 22q187 -189 379 -312zM641 195h366q19 4 31 21.5t12 36.5t-12 36t-31 22h-331zM603 311h-370q-19 -5 -31 -22t-12 -36t12 -36.5t31 -21.5h335z" />
+<glyph unicode="&#x21cf;" horiz-adv-x="977" d="M909 258v-10q-234 -156 -379 -312l-25 20q14 20 42.5 54t35.5 43q16 20 16 33q0 21 -48 21h-270l-52 -171h-73l52 171h-140v88h166l35 116h-201v88h227l52 171h73l-52 -171h185q46 0 46 21q0 8 -16 29l-77 99l24 22q186 -187 379 -312zM307 195h419q3 0 11 4q32 17 32 54 q0 35 -32 54q-8 4 -11 4h-384z" />
+<glyph unicode="&#x21d0;" horiz-adv-x="977" d="M909 107h-485q-46 0 -46 -21q0 -10 16 -29q2 -3 18 -21l31 -40l28 -38l-24 -22q-187 189 -379 312v10q232 155 379 312l25 -20q-35 -49 -78 -97q-16 -19 -16 -33q0 -21 48 -21h483v-88h-658q-19 -4 -31 -21.5t-12 -36.5t12 -36t31 -22h658v-88z" />
+<glyph unicode="&#x21d1;" horiz-adv-x="714" d="M674 297l-20 -25q-49 35 -97 78q-19 16 -33 16q-21 0 -21 -48v-488h-88v663q-4 19 -21.5 31t-36.5 12t-36 -12t-22 -31v-663h-88v490q0 46 -21 46q-10 0 -29 -16q-3 -2 -21.5 -17.5t-39.5 -31.5l-38 -28l-22 24q189 187 312 379h10q155 -232 312 -379z" />
+<glyph unicode="&#x21d2;" horiz-adv-x="977" d="M909 258v-10q-232 -155 -379 -312l-25 20q35 49 78 97q16 19 16 33q0 21 -48 21h-483v88h658q19 4 31 21.5t12 36.5t-12 36t-31 22h-658v88h485q46 0 46 21q0 10 -16 29q-2 3 -17 21l-32 40l-28 38l24 22q187 -189 379 -312z" />
+<glyph unicode="&#x21d3;" horiz-adv-x="714" d="M652 233l22 -24q-189 -187 -312 -379h-10q-155 232 -312 379l20 25q49 -35 97 -78q19 -16 33 -16q21 0 21 48v488h88v-663q4 -19 21.5 -31t36.5 -12t36 12t22 31v663h88v-490q0 -46 21 -46q10 0 29 16q3 2 21.5 17.5t39.5 31.5z" />
+<glyph unicode="&#x21d4;" horiz-adv-x="1240" d="M1190 258v-10q-232 -155 -379 -312l-25 20q35 49 78 97q16 19 16 33q0 21 -48 21h-426q-46 0 -46 -21q0 -10 16 -29q2 -3 18 -21l31 -40l28 -38l-24 -22q-187 189 -379 312v10q232 155 379 312l25 -20q-35 -49 -78 -97q-16 -19 -16 -33q0 -21 48 -21h426q46 0 46 21 q0 10 -16 29q-2 3 -18 21l-31 40l-28 38l24 22q187 -189 379 -312zM233 195h774q19 4 31 21.5t12 36.5t-12 36t-31 22h-774q-19 -4 -31 -21.5t-12 -36.5t12 -36t31 -22z" />
+<glyph unicode="&#x21d5;" horiz-adv-x="714" d="M652 173l22 -24q-189 -187 -312 -379h-10q-155 232 -312 379l20 25q49 -35 97 -78q19 -16 33 -16q21 0 21 48v252q0 46 -21 46q-10 0 -29 -16q-3 -2 -21.5 -17.5t-39.5 -31.5l-38 -28l-22 24q189 187 312 379h10q155 -232 312 -379l-20 -25q-49 35 -97 78q-19 16 -33 16 q-21 0 -21 -48v-252q0 -46 21 -46q10 0 29 16q3 2 21.5 17.5t39.5 31.5zM415 -47v600q-4 19 -21.5 31t-36.5 12t-36 -12t-22 -31v-600q4 -19 21.5 -31t36.5 -12t36 12t22 31z" />
+<glyph unicode="&#x21d6;" horiz-adv-x="926" d="M872 50l-62 -62l-582 582q-7 7 -26 7q-26 0 -44.5 -18t-18.5 -44q0 -20 7 -27l582 -582l-62 -62l-460 459q-23 23 -36 23q-6 0 -11 -5q-7 -7 -9 -32q-8 -84 -16 -124l-32 1q2 264 -48 489l7 7q245 -49 440 -49q33 0 49 1l4 -32q-42 -7 -124 -13q-25 -2 -35 -12 q-5 -5 -5 -11q0 -14 24 -38z" />
+<glyph unicode="&#x21d7;" horiz-adv-x="926" d="M865 662l7 -7q-50 -225 -48 -489l-32 -1q-8 40 -16 124q-2 25 -9 32q-5 5 -11 5q-13 0 -36 -23l-460 -459l-62 62l582 582q7 7 7 27q0 26 -18.5 44t-44.5 18q-19 0 -26 -7l-582 -582l-62 62l458 458q24 24 24 38q0 6 -5 11q-10 10 -35 12q-82 6 -124 13l4 32q16 -1 49 -1 q195 0 440 49z" />
+<glyph unicode="&#x21d8;" horiz-adv-x="926" d="M872 -149l-7 -7q-245 49 -440 49q-33 0 -49 -1l-4 32q42 7 124 13q25 2 35 12q5 5 5 11q0 14 -24 38l-458 458l62 62l582 -582q7 -7 26 -7q26 0 44.5 18t18.5 44q0 20 -7 27l-582 582l62 62l460 -459q23 -23 36 -23q6 0 11 5q7 7 9 32q8 84 16 124l32 -1q-2 -264 48 -489 z" />
+<glyph unicode="&#x21d9;" horiz-adv-x="926" d="M872 456l-458 -458q-24 -24 -24 -38q0 -6 5 -11q10 -10 35 -12q82 -6 124 -13l-4 -32q-16 1 -49 1q-195 0 -440 -49l-7 7q50 225 48 489l32 1q8 -40 16 -124q2 -25 9 -32q5 -5 11 -5q13 0 36 23l460 459l62 -62l-582 -582q-7 -7 -7 -27q0 -26 18.5 -44t44.5 -18 q19 0 26 7l582 582z" />
+<glyph unicode="&#x21dc;" horiz-adv-x="977" d="M914 209h-120l-95 -113l-118 171l-123 -171l-98 113h-55q-48 0 -48 -13q0 -4 4 -10.5t9 -11.5l10 -12l7 -7q32 -35 61 -78l-24 -22q-110 129 -262 192v11q153 68 262 193l27 -20q-13 -19 -64 -77l-6 -7l-11 -13q-4 -5 -8.5 -13t-4.5 -12q0 -12 48 -12h97l54 -60l125 176 l120 -175l54 59h159v-88z" />
+<glyph unicode="&#x21dd;" horiz-adv-x="977" d="M914 258v-11q-152 -63 -262 -192l-24 22q29 43 61 78l7 7l10 12q5 5 9 11.5t4 10.5q0 13 -48 13h-55l-98 -113l-123 171l-118 -171l-95 113h-120v88h159l54 -59l120 175l125 -176l54 60h97q48 0 48 12q0 4 -4.5 12t-8.5 13l-11 13l-6 7q-51 58 -64 77l27 20 q109 -125 262 -193z" />
+<glyph unicode="&#x21e6;" horiz-adv-x="926" d="M866 120h-420v-155l-20 -10q-41 41 -93 85t-83 68l-102 75l-88 65v10l90 67l96 73q37 27 88 69.5t92 83.5l20 -10v-155h420v-266zM805 181v144h-420v105l-147 -113q-54 -42 -54 -64q0 -13 12.5 -26.5t41.5 -36.5l147 -115v106h420z" />
+<glyph unicode="&#x21e7;" horiz-adv-x="685" d="M641 296l-10 -20h-155v-432h-266v432h-155l-10 20q41 41 85 93t68 83l75 102l65 88h10l67 -90l73 -96q27 -37 69.5 -88t83.5 -92zM520 337l-113 147q-42 54 -64 54q-13 0 -26.5 -12.5t-36.5 -41.5l-115 -147h106v-432h144v432h105z" />
+<glyph unicode="&#x21e8;" horiz-adv-x="926" d="M866 258v-10l-88 -65l-102 -75q-31 -24 -83 -68t-93 -85l-20 10v155h-420v266h420v155l20 10q41 -41 92 -83.5t88 -69.5l96 -73zM541 75l147 115q29 23 41.5 36.5t12.5 26.5q0 22 -54 64l-147 113v-105h-420v-144h420v-106z" />
+<glyph unicode="&#x21e9;" horiz-adv-x="685" d="M631 230l10 -20q-41 -41 -83.5 -92t-69.5 -88l-73 -96l-67 -90h-10l-65 88l-75 102q-24 31 -68 83t-85 93l10 20h155v432h266v-432h155zM520 169h-105v432h-144v-432h-106l115 -147q23 -29 36.5 -41.5t26.5 -12.5q22 0 64 54z" />
+<glyph unicode="&#x21ea;" horiz-adv-x="685" d="M641 339l-10 -20h-155v-262h-266v262h-155l-10 20q41 41 85 93t68 84l75 100l65 89h10l67 -89l73 -98q27 -36 69.5 -87t83.5 -92zM520 380l-113 147l-21 27q-7 8 -19.5 17.5t-23.5 9.5q-4 0 -7.5 -1t-7.5 -3t-6.5 -3.5t-7.5 -5.5l-6 -7q-2 -2 -7 -8t-7 -8l-6 -9 q-6 -7 -8 -9l-115 -147h106v-262h144v262h105zM476 -201h-266v193h266v-193zM415 -140v71h-144v-71h144z" />
+<glyph unicode="&#x21f5;" horiz-adv-x="864" d="M798 414l-22 -24q-43 29 -78 61l-7 7l-11 10q-6 5 -12.5 9t-10.5 4q-13 0 -13 -48v-598h-88v598q0 48 -12 48q-8 0 -45 -30q-46 -41 -77 -62l-20 25q125 109 193 262h11q63 -152 192 -262zM440 121l22 -24q-129 -110 -192 -262h-11q-68 153 -193 262l20 25q31 -22 77 -62 q37 -30 45 -30q12 0 12 48v598h88v-598q0 -48 13 -48q4 0 10.5 4t12.5 9l11 11q6 5 7 6q35 32 78 61z" />
+<glyph unicode="&#x2200;" horiz-adv-x="599" d="M594 676l-246 -676h-99l-244 676h105l70 -193h239l70 193h105zM387 395h-176l88 -242z" />
+<glyph unicode="&#x2201;" horiz-adv-x="539" d="M476 244v-139q0 -43 -24 -72.5t-63 -41.5t-68 -16t-58 -4q-200 0 -200 137v520q0 46 23.5 79.5t59 49t65.5 22t56 6.5q27 0 56.5 -5.5t67 -20t61.5 -47.5t24 -79v-122h-104v91q0 26 -12.5 43.5t-32.5 24.5t-33.5 9t-28.5 2q-13 0 -26.5 -2.5t-31.5 -9.5t-29 -24t-11 -42 v-460q0 -68 101 -68q104 0 104 69v100h104z" />
+<glyph unicode="&#x2202;" horiz-adv-x="559" d="M234 627l2 23q43 36 119 36q204 0 204 -256q0 -53 -12 -111.5t-39 -117.5t-64 -105.5t-92.5 -76t-120.5 -29.5q-89 0 -138 46.5t-49 129.5q0 119 89 206t209 87q41 0 80.5 -19t52.5 -51h4v8q2 18 2 27q0 48 -5.5 83.5t-21 69t-47.5 51t-80 17.5q-30 0 -93 -18zM423 293 q0 64 -25.5 95t-63.5 31q-64 0 -119 -88.5t-55 -176.5q0 -70 20.5 -97t67.5 -27q68 0 121.5 82.5t53.5 180.5z" />
+<glyph unicode="&#x2203;" horiz-adv-x="599" d="M523 0h-447v100h348v187h-336v100h336v189h-348v100h447v-676z" />
+<glyph unicode="&#x2204;" horiz-adv-x="599" d="M523 0h-337l-37 -127h-73l37 127h-37v100h67l55 187h-110v100h139l56 189h-207v100h237l37 127h73l-37 -127h137v-676zM424 387v189h-68l-56 -189h124zM424 100v187h-153l-55 -187h208z" />
+<glyph unicode="&#x2205;" horiz-adv-x="787" d="M737 594l-94 -108q93 -98 93 -234q0 -142 -100 -242t-242 -100q-109 0 -199 64l-56 -64h-89l95 108q-93 98 -93 234q0 142 100 242t242 100q109 0 199 -63l55 63h89zM585 420l-332 -379q64 -43 141 -43q105 0 179.5 74.5t74.5 179.5q0 95 -63 168zM203 85l331 379 q-65 42 -140 42q-105 0 -179.5 -74.5t-74.5 -179.5q0 -96 63 -167z" />
+<glyph unicode="&#x2206;" horiz-adv-x="681" d="M658 0h-635l284 676h54zM511 49l-212 480h-1l-202 -480h415z" />
+<glyph unicode="&#x2207;" horiz-adv-x="681" d="M658 676l-284 -676h-54l-297 676h635zM585 626h-415l212 -479h1z" />
+<glyph unicode="&#x2208;" d="M668 -13h-298q-128 0 -208 81t-80 199q0 119 80.5 199.5t210.5 80.5h295v-88h-311q-64 0 -115.5 -42t-66.5 -106h493v-88h-493q15 -64 66.5 -106t116.5 -42h310v-88z" />
+<glyph unicode="&#x2209;" d="M668 -13h-298q-36 0 -73 8l-58 -141h-69l66 162q-72 34 -113 101t-41 150q0 119 80.5 199.5t210.5 80.5h82l55 133h69l-55 -133h144v-88h-180l-61 -148h241v-88h-277l-60 -146q18 -2 27 -2h310v-88zM419 459h-62q-64 0 -115.5 -42t-66.5 -106h183zM322 223h-147 q20 -84 95 -125z" />
+<glyph unicode="&#x220a;" horiz-adv-x="500" d="M440 35h-148q-96 0 -164 68t-68 164t68 164t164 68h148v-88h-148q-48 0 -85.5 -28t-51.5 -72h285v-88h-285q14 -44 51.5 -72t85.5 -28h148v-88z" />
+<glyph unicode="&#x220b;" d="M82 547h295q130 0 210.5 -80.5t80.5 -199.5q0 -118 -80 -199t-208 -81h-298v88h310q65 0 116.5 42t66.5 106h-493v88h493q-15 64 -66.5 106t-115.5 42h-311v88z" />
+<glyph unicode="&#x220c;" d="M579 680l-67 -162q73 -34 114.5 -101t41.5 -150q0 -118 -80 -199t-208 -81h-86l-55 -133h-69l55 133h-143v88h179l61 148h-240v88h276l60 146q-16 2 -25 2h-311v88h295q38 0 75 -8l58 141h69zM427 311h148q-20 86 -96 126zM575 223h-184l-61 -148h62q65 0 116.5 42 t66.5 106z" />
+<glyph unicode="&#x220d;" horiz-adv-x="500" d="M60 499h148q96 0 164 -68t68 -164t-68 -164t-164 -68h-148v88h148q48 0 85.5 28t51.5 72h-285v88h285q-14 44 -51.5 72t-85.5 28h-148v88z" />
+<glyph unicode="&#x220f;" horiz-adv-x="1000" d="M963 -259h-404v38h51q37 0 52 29t15 99v784h-355v-784q0 -128 67 -128h52v-38h-404v38h37q40 0 59 28.5t19 92.5v711q0 67 -23 90.5t-92 23.5v38h926v-38h-36q-43 0 -61.5 -23t-18.5 -94v-725q0 -55 19 -79.5t59 -24.5h38v-38z" />
+<glyph unicode="&#x2210;" horiz-adv-x="982" d="M954 -259h-926v37h38q43 0 60.5 23.5t17.5 94.5v701q0 73 -18.5 101t-59.5 28h-38v37h400v-37h-37q-41 0 -59 -28t-18 -100v-785h355v785q0 72 -18.5 100t-59.5 28h-37v37h400v-37h-37q-40 0 -59 -30.5t-19 -98.5v-701q0 -71 18 -94.5t60 -23.5h37v-37z" />
+<glyph unicode="&#x2211;" horiz-adv-x="914" d="M873 47l-55 -306h-778l401 505l-376 517h736v-258h-38q-4 53 -18.5 89.5t-31.5 55.5t-47 28.5t-50.5 11t-58.5 1.5h-244l274 -382l-321 -398h397q37 0 59.5 4t45.5 17t38 41t25 74h42z" />
+<glyph unicode="&#x2212;" d="M685 209h-619v88h619v-88z" />
+<glyph unicode="&#x2213;" horiz-adv-x="770" d="M685 569h-620v88h620v-88zM685 209h-266v-221h-88v221h-266v88h266v221h88v-221h266v-88z" />
+<glyph unicode="&#x2214;" d="M685 209h-266v-266h-88v266h-266v88h266v266h88v-266h266v-88zM457 711q0 -34 -24 -58t-58 -24t-58 24t-24 58t24 58t58 24t58 -24t24 -58z" />
+<glyph unicode="&#x2215;" horiz-adv-x="584" d="M506 732l-332 -925h-96l332 925h96z" />
+<glyph unicode="&#x2216;" horiz-adv-x="452" d="M427 93h-86l-316 318h86z" />
+<glyph unicode="&#x2217;" horiz-adv-x="585" d="M301 294l7 -3q45 35 60 53q8 10 18 26q16 24 29 32.5t31 8.5q22 0 39.5 -15.5t17.5 -36.5q0 -25 -27.5 -41t-60.5 -16q-35 0 -52.5 -5t-43.5 -23v-8l35 -16q10 -4 27.5 -8t41.5 -6q43 -4 61 -16.5t18 -38.5q0 -24 -14 -39t-39 -15q-21 0 -34.5 12.5t-45.5 54.5 q-17 23 -28 32.5t-34 21.5l-6 -5q1 -34 6.5 -53t22.5 -52q16 -31 16 -48q0 -24 -16 -40t-39 -16q-22 0 -37 16t-15 40q0 19 17 49q15 27 19.5 46.5t5.5 57.5l-7 5q-31 -23 -44 -36.5t-35 -44.5q-17 -24 -29 -32t-30 -8q-23 0 -38.5 15t-15.5 37q0 28 22.5 41t67.5 16 q34 2 50.5 7.5t41.5 23.5v7q-33 15 -53 20t-56 8q-73 7 -73 57q0 23 14 37.5t36 14.5q23 0 37.5 -9.5t29.5 -36.5q18 -31 31 -43.5t45 -30.5l6 3q-1 35 -4.5 51t-20.5 46q-19 34 -19 57t15.5 38.5t39.5 15.5q23 0 37.5 -16.5t14.5 -42.5q0 -17 -19 -50q-24 -40 -24 -83v-16z " />
+<glyph unicode="&#x2218;" horiz-adv-x="394" d="M354 252q0 -65 -46 -111t-111 -46q-66 0 -111.5 46t-45.5 113q0 66 46 110.5t113 44.5q64 0 109.5 -46t45.5 -111zM266 252q0 29 -20 49t-47 20q-31 0 -51 -19.5t-20 -47.5q0 -31 19.5 -51t49.5 -20q29 0 49 20t20 49z" />
+<glyph unicode="&#x2219;" horiz-adv-x="584" d="M499 266q0 -86 -60.5 -146.5t-146.5 -60.5t-146.5 60.5t-60.5 146.5t60.5 146.5t146.5 60.5t146.5 -60.5t60.5 -146.5z" />
+<glyph unicode="&#x221a;" horiz-adv-x="965" d="M1016 946l-481 -1205h-65l-203 504q-13 32 -22.5 44.5t-22.5 12.5q-24 0 -69 -43l-23 35l165 127h45l188 -476h1l400 1001h87z" />
+<glyph unicode="&#x221d;" horiz-adv-x="772" d="M692 0h-5q-70 0 -117 34.5t-94 101.5q-75 -136 -210 -136q-86 0 -136 61t-50 149q0 162 121 220q42 20 80 20q71 0 117 -34t100 -105q39 68 82 103.5t112 35.5v-104q-61 0 -93.5 -20t-68.5 -73q19 -31 31 -49t36.5 -51t48.5 -51t46 -20v-82zM442 193q-106 178 -192 178 q-40 0 -65 -34t-25 -75q0 -62 34.5 -110t94.5 -48q86 0 153 89z" />
+<glyph unicode="&#x221e;" horiz-adv-x="964" d="M884 232q0 -90 -60 -161t-148 -71q-63 0 -109.5 36t-90.5 100q-74 -136 -210 -136q-86 0 -136 61t-50 149q0 162 121 220q40 20 80 20q71 0 117 -34t100 -105q39 68 82 103.5t112 35.5q86 0 139 -65t53 -153zM804 188q0 64 -34 111t-95 47q-50 0 -81.5 -22.5t-63.5 -70.5 q18 -30 26 -42t30.5 -43t39 -46t41 -29t47.5 -14q40 0 65 34t25 75zM442 193q-20 33 -35.5 55t-42.5 55t-56.5 50.5t-57.5 17.5q-40 0 -65 -34t-25 -75q0 -62 34.5 -110t94.5 -48q86 0 153 89z" />
+<glyph unicode="&#x221f;" horiz-adv-x="685" d="M634 0h-584v584h88v-496h496v-88z" />
+<glyph unicode="&#x2220;" horiz-adv-x="792" d="M708 0h-658l568 569l64 -61l-420 -420h446v-88z" />
+<glyph unicode="&#x2221;" horiz-adv-x="792" d="M708 0h-98q0 -37 -6 -74l-87 14q5 31 5 60h-472l334 334q-13 13 -48 40l53 70q42 -32 57 -47l172 172l64 -61l-178 -178q82 -108 101 -242h103v-88zM262 88h254q-16 94 -75 179z" />
+<glyph unicode="&#x2222;" horiz-adv-x="695" d="M667 86l-33 -82l-88 36q-12 -28 -34 -66l-76 45q13 20 28 55l-437 179l435 183q-11 23 -27 53l76 45q26 -48 33 -65l90 37l33 -80l-94 -40q17 -62 17 -133q0 -68 -16 -129zM257 253l234 -95q11 43 11 95q0 49 -12 99z" />
+<glyph unicode="&#x2223;" horiz-adv-x="288" d="M188 -189h-88v879h88v-879z" />
+<glyph unicode="&#x2224;" horiz-adv-x="411" d="M388 302l-138 -71v-420h-88v375l-108 -55l-31 69l139 71v419h88v-374l107 54z" />
+<glyph unicode="&#x2225;" horiz-adv-x="487" d="M188 -189h-88v879h88v-879zM387 -189h-88v879h88v-879z" />
+<glyph unicode="&#x2226;" horiz-adv-x="617" d="M594 354l-142 -72v-471h-88v426l-111 -57v-369h-88v324l-110 -56l-32 69l142 72v470h88v-425l111 56v369h88v-324l110 56z" />
+<glyph unicode="&#x2227;" horiz-adv-x="640" d="M588 -28h-94l-174 413l-174 -413h-94l234 564h68z" />
+<glyph unicode="&#x2228;" horiz-adv-x="640" d="M588 536l-234 -564h-68l-234 564h94l174 -413l174 413h94z" />
+<glyph unicode="&#x2229;" horiz-adv-x="650" d="M584 -33h-88v315q0 70 -50 120.5t-121 50.5t-121 -50.5t-50 -120.5v-315h-88v315q0 107 76 183t183 76t183 -76t76 -183v-315z" />
+<glyph unicode="&#x222a;" horiz-adv-x="650" d="M496 541h88v-315q0 -107 -76 -183t-183 -76t-183 76t-76 183v315h88v-315q0 -70 50 -120.5t121 -50.5t121 50.5t50 120.5v315z" />
+<glyph unicode="&#x222b;" horiz-adv-x="553" d="M234 -108l178 711q21 85 90 156q63 65 142 65q43 0 66 -21t23 -54q0 -31 -21 -55t-57 -24q-18 0 -32.5 13t-14.5 33q0 17 13.5 34t13.5 21q0 11 -17 11q-44 0 -87 -169l-178 -711q-23 -92 -85 -156q-64 -66 -147 -66q-43 0 -66 21.5t-23 54.5q0 31 21 55t57 24 q18 0 32.5 -13t14.5 -33q0 -17 -13.5 -34t-13.5 -21q0 -12 17 -12q45 0 87 170z" />
+<glyph unicode="&#x222c;" horiz-adv-x="863" d="M544 -108l178 711q21 85 90 156q63 65 142 65q43 0 66 -21t23 -54q0 -31 -21 -55t-57 -24q-18 0 -32.5 13t-14.5 33q0 17 13.5 34t13.5 21q0 11 -17 11q-46 0 -87 -169l-178 -711q-23 -92 -85 -156q-64 -66 -147 -66q-43 0 -66 21.5t-23 54.5q0 31 21 55t57 24 q18 0 32.5 -13t14.5 -33q0 -17 -13.5 -34t-13.5 -21q0 -12 17 -12q45 0 87 170zM234 -108l178 711q21 85 90 156q63 65 142 65q43 0 66 -21t23 -54q0 -31 -21 -55t-57 -24q-18 0 -32.5 13t-14.5 33q0 17 13.5 34t13.5 21q0 11 -17 11q-46 0 -87 -169l-178 -711 q-23 -92 -85 -156q-64 -66 -147 -66q-43 0 -66 21.5t-23 54.5q0 31 21 55t57 24q18 0 32.5 -13t14.5 -33q0 -17 -13.5 -34t-13.5 -21q0 -12 17 -12q45 0 87 170z" />
+<glyph unicode="&#x222d;" horiz-adv-x="1174" d="M855 -108l178 711q21 85 90 156q63 65 142 65q43 0 66 -21t23 -54q0 -31 -21 -55t-57 -24q-18 0 -32.5 13t-14.5 33q0 17 13.5 34t13.5 21q0 11 -17 11q-45 0 -87 -169l-178 -711q-23 -92 -85 -156q-64 -66 -147 -66q-43 0 -66 21.5t-23 54.5q0 31 21 55t57 24 q18 0 32.5 -13t14.5 -33q0 -17 -13.5 -34t-13.5 -21q0 -12 17 -12q45 0 87 170zM544 -108l178 711q21 85 90 156q63 65 142 65q43 0 66 -21t23 -54q0 -31 -21 -55t-57 -24q-18 0 -32.5 13t-14.5 33q0 17 13.5 34t13.5 21q0 11 -17 11q-46 0 -87 -169l-177 -711 q-22 -91 -86 -156q-64 -66 -147 -66q-43 0 -66 21.5t-23 54.5q0 31 21 55t57 24q18 0 32.5 -13t14.5 -33q0 -17 -13.5 -34t-13.5 -21q0 -12 17 -12q45 0 87 170zM234 -108l178 711q21 85 90 156q63 65 142 65q43 0 66 -21t23 -54q0 -31 -21 -55t-57 -24q-18 0 -32.5 13 t-14.5 33q0 17 13.5 34t13.5 21q0 11 -17 11q-45 0 -87 -169l-178 -711q-23 -92 -85 -156q-64 -66 -147 -66q-43 0 -66 21.5t-23 54.5q0 31 21 55t57 24q18 0 32.5 -13t14.5 -33q0 -17 -13.5 -34t-13.5 -21q0 -12 17 -12q45 0 87 170z" />
+<glyph unicode="&#x222e;" horiz-adv-x="591" d="M381 490l29 113q23 88 90 156q63 65 142 65q43 0 66 -21t23 -54q0 -31 -21 -55t-57 -24q-18 0 -32.5 13t-14.5 33q0 17 13.5 34t13.5 21q0 11 -17 11q-44 0 -87 -169l-38 -150q57 -31 91 -86.5t34 -121.5q0 -97 -69 -166t-166 -69h-1l-29 -118q-23 -92 -85 -156 q-64 -66 -147 -66q-43 0 -66 21.5t-23 54.5q0 31 21 55t57 24q18 0 32.5 -13t14.5 -33q0 -17 -13.5 -34.5t-13.5 -21.5q0 -11 17 -11q44 0 87 170l39 155q-57 30 -91 85.5t-34 122.5q0 97 69 166t166 69zM478 410l-85 -337q72 5 121.5 57.5t49.5 124.5q0 48 -23.5 89 t-62.5 66zM284 100l84 338q-72 -5 -121 -58t-49 -125q0 -48 23 -89.5t63 -65.5z" />
+<glyph unicode="&#x222f;" horiz-adv-x="903" d="M689 469l33 134q21 85 90 156q63 65 142 65q43 0 66 -21t23 -54q0 -31 -21 -55t-57 -24q-18 0 -32.5 13t-14.5 33q0 17 13.5 34t13.5 21q0 11 -17 11q-45 0 -87 -169l-43 -172q143 -56 143 -185q0 -78 -58.5 -134t-183.5 -78l-36 -142q-23 -92 -85 -156q-64 -66 -147 -66 q-43 0 -66 21.5t-23 54.5q0 31 21 55t57 24q18 0 32.5 -13t14.5 -33q0 -17 -13.5 -34t-13.5 -21q0 -12 17 -12q45 0 87 170l35 141q-13 -1 -41 -1q-77 0 -150 10l-35 -140q-23 -92 -85 -156q-64 -66 -147 -66q-43 0 -66 21.5t-23 54.5q0 31 21 55t57 24q18 0 32.5 -13 t14.5 -33q0 -17 -13.5 -34t-13.5 -21q0 -12 17 -12q45 0 87 170l45 179q-144 56 -144 185q0 79 58.5 135t184.5 77l34 135q21 85 90 156q63 65 142 65q43 0 66 -21t23 -54q0 -31 -21 -55t-57 -24q-18 0 -32.5 13t-14.5 33q0 17 13.5 34t13.5 21q0 11 -17 11q-45 0 -87 -169 l-33 -134q13 1 40 1q82 0 151 -11zM752 256l-40 -156q92 19 134.5 60t42.5 96q0 90 -104 134zM635 256l41 163q-60 9 -138 9q-37 0 -54 -1l-83 -334q59 -9 137 -9q37 0 54 1zM325 256l39 157q-177 -39 -177 -157q0 -90 104 -134z" />
+<glyph unicode="&#x2230;" horiz-adv-x="1214" d="M997 457l36 146q21 85 90 156q63 65 142 65q43 0 66 -21t23 -54q0 -31 -21 -55t-57 -24q-18 0 -32.5 13t-14.5 33q0 17 13.5 34t13.5 21q0 11 -17 11q-45 0 -87 -169l-46 -185q145 -55 145 -172q0 -150 -238 -198l-39 -156q-23 -92 -85 -156q-64 -66 -147 -66 q-43 0 -66 21.5t-23 54.5q0 31 21 55t57 24q18 0 32.5 -13t14.5 -33q0 -17 -13.5 -34t-13.5 -21q0 -12 17 -12q45 0 87 170l37 148q-91 -8 -196 -8l-32 -130q-22 -91 -86 -156q-64 -66 -147 -66q-43 0 -66 21.5t-23 54.5q0 31 21 55t57 24q18 0 32.5 -13t14.5 -33 q0 -17 -13.5 -34t-13.5 -21q0 -12 17 -12q45 0 87 170l36 142q-104 6 -189 20l-38 -152q-23 -92 -85 -156q-64 -66 -147 -66q-43 0 -66 21.5t-23 54.5q0 31 21 55t57 24q18 0 32.5 -13t14.5 -33q0 -17 -13.5 -34t-13.5 -21q0 -12 17 -12q45 0 87 170l48 191 q-147 54 -147 173q0 149 240 199l37 148q21 85 90 156q63 65 142 65q43 0 66 -21t23 -54q0 -31 -21 -55t-57 -24q-18 0 -32.5 13t-14.5 33q0 17 13.5 34t13.5 21q0 11 -17 11q-45 0 -87 -169l-35 -141q90 8 195 8l31 123q21 85 90 156q63 65 142 65q43 0 66 -21t23 -54 q0 -31 -21 -55t-57 -24q-18 0 -32.5 13t-14.5 33q0 17 13.5 34t13.5 21q0 11 -17 11q-46 0 -87 -169l-34 -135q110 -6 190 -21zM1063 256l-36 -143q172 41 172 143q0 81 -105 123zM905 93l79 315q-77 14 -190 18l-85 -342q97 0 196 9zM593 86l85 342q-95 0 -196 -9l-79 -315 q79 -14 190 -18zM325 256l36 144q-174 -41 -174 -144q0 -81 107 -124z" />
+<glyph unicode="&#x2231;" horiz-adv-x="593" d="M353 366l59 237q21 85 90 156q63 65 142 65q43 0 66 -21t23 -54q0 -31 -21 -55t-57 -24q-18 0 -32.5 13t-14.5 33q0 17 13.5 34t13.5 21q0 11 -17 11q-46 0 -87 -169l-67 -267q36 -16 66 -46q15 -15 37 -53q7 -14 14 -14q11 0 38 49l24 -12q-43 -68 -59 -125l-5 -2 q-56 34 -131 45l9 30q35 -11 59 -11q9 0 9 7q0 5 -4 11q-28 45 -70 68l-98 -391q-23 -92 -85 -156q-64 -66 -147 -66q-43 0 -66 21.5t-23 54.5q0 31 21 55t57 24q18 0 32.5 -13t14.5 -33q0 -17 -13.5 -34t-13.5 -21q0 -12 17 -12q44 0 87 170l106 421q-62 -11 -103 -58 t-41 -112h-52q0 90 60.5 154t148.5 69z" />
+<glyph unicode="&#x2232;" horiz-adv-x="593" d="M383 490l29 113q21 85 86 153t146 68q39 0 64 -19t25 -56q0 -33 -22.5 -56t-55.5 -23q-19 0 -33 13.5t-14 32.5q0 16 13.5 33t13.5 22q0 11 -17 11q-46 0 -87 -169l-38 -150q60 -32 102 -106q7 -11 11 -11q8 0 20.5 17.5t18.5 31.5l24 -12q-48 -80 -51 -130 q-5 -99 -71 -166t-165 -67l-29 -118q-21 -89 -84 -155.5t-148 -66.5q-38 0 -63.5 19.5t-25.5 56.5q0 33 22.5 56t55.5 23q19 0 33 -13.5t14 -32.5q0 -17 -13.5 -34t-13.5 -22q0 -11 17 -11q46 0 87 170l39 155q-58 31 -91.5 87t-33.5 121q0 97 69 166t166 69zM480 410 l-85 -337q73 4 123 58.5t48 128.5q-30 24 -92 41l9 28q32 -10 52 -10q16 0 16 9q-23 51 -71 82zM286 100l84 338q-72 -5 -121 -58t-49 -125q0 -47 23 -88.5t63 -66.5z" />
+<glyph unicode="&#x2233;" horiz-adv-x="593" d="M383 490l29 113q21 85 86 153t146 68q38 0 63.5 -19t25.5 -56q0 -33 -22.5 -56t-55.5 -23q-19 0 -33 13.5t-14 32.5q0 17 13.5 34t13.5 21q0 11 -17 11q-46 0 -87 -169l-38 -150q47 -26 81 -72q39 -16 106 -31l-10 -28q-34 12 -51 12q-12 0 -12 -11q0 -10 5.5 -34 t5.5 -38q0 -100 -68 -170.5t-168 -70.5l-29 -118q-21 -89 -84 -155.5t-148 -66.5q-38 0 -63.5 19.5t-25.5 56.5q0 33 22.5 56t55.5 23q19 0 33 -13.5t14 -32.5q0 -17 -13.5 -34.5t-13.5 -21.5q0 -11 17 -11q46 0 87 170l39 155q-58 31 -91.5 87t-33.5 121q0 97 69 166 t166 69zM480 410l-85 -337q73 4 122 57.5t49 126.5q0 58 -16 58q-14 0 -44 -59l-25 14q33 47 47 97q-23 28 -48 43zM286 100l84 338q-72 -5 -121 -58t-49 -125q0 -47 23 -88.5t63 -66.5z" />
+<glyph unicode="&#x2234;" d="M460 488q0 -36 -25.5 -61.5t-61.5 -25.5t-61.5 25.5t-25.5 61.5t25.5 61.5t61.5 25.5t61.5 -25.5t25.5 -61.5zM685 46q0 -36 -25.5 -61.5t-61.5 -25.5t-61.5 25.5t-25.5 61.5t25.5 61.5t61.5 25.5t61.5 -25.5t25.5 -61.5zM240 46q0 -36 -25.5 -61.5t-61.5 -25.5 t-61.5 25.5t-25.5 61.5t25.5 61.5t61.5 25.5t61.5 -25.5t25.5 -61.5z" />
+<glyph unicode="&#x2235;" d="M685 488q0 -36 -25.5 -61.5t-61.5 -25.5t-61.5 25.5t-25.5 61.5t25.5 61.5t61.5 25.5t61.5 -25.5t25.5 -61.5zM240 488q0 -36 -25.5 -61.5t-61.5 -25.5t-61.5 25.5t-25.5 61.5t25.5 61.5t61.5 25.5t61.5 -25.5t25.5 -61.5zM460 46q0 -36 -25.5 -61.5t-61.5 -25.5 t-61.5 25.5t-25.5 61.5t25.5 61.5t61.5 25.5t61.5 -25.5t25.5 -61.5z" />
+<glyph unicode="&#x2236;" horiz-adv-x="554" d="M364 488q0 -36 -25.5 -61.5t-61.5 -25.5t-61.5 25.5t-25.5 61.5t25.5 61.5t61.5 25.5t61.5 -25.5t25.5 -61.5zM364 46q0 -36 -25.5 -61.5t-61.5 -25.5t-61.5 25.5t-25.5 61.5t25.5 61.5t61.5 25.5t61.5 -25.5t25.5 -61.5z" />
+<glyph unicode="&#x2237;" d="M242 488q0 -36 -25.5 -61.5t-61.5 -25.5t-61.5 25.5t-25.5 61.5t25.5 61.5t61.5 25.5t61.5 -25.5t25.5 -61.5zM242 46q0 -36 -25.5 -61.5t-61.5 -25.5t-61.5 25.5t-25.5 61.5t25.5 61.5t61.5 25.5t61.5 -25.5t25.5 -61.5zM683 488q0 -36 -25.5 -61.5t-61.5 -25.5 t-61.5 25.5t-25.5 61.5t25.5 61.5t61.5 25.5t61.5 -25.5t25.5 -61.5zM683 46q0 -36 -25.5 -61.5t-61.5 -25.5t-61.5 25.5t-25.5 61.5t25.5 61.5t61.5 25.5t61.5 -25.5t25.5 -61.5z" />
+<glyph unicode="&#x2238;" d="M685 209h-619v88h619v-88zM456 461q0 -34 -24 -58t-58 -24t-58 24t-24 58t24 58t58 24t58 -24t24 -58z" />
+<glyph unicode="&#x2239;" d="M686 461q0 -34 -24 -58t-58 -24t-58 24t-24 58t24 58t58 24t58 -24t24 -58zM686 45q0 -34 -24 -58t-58 -24t-58 24t-24 58t24 58t58 24t58 -24t24 -58zM475 209h-409v88h409v-88z" />
+<glyph unicode="&#x223a;" d="M685 488q0 -36 -25.5 -61.5t-61.5 -25.5t-61.5 25.5t-25.5 61.5t25.5 61.5t61.5 25.5t61.5 -25.5t25.5 -61.5zM685 46q0 -36 -25.5 -61.5t-61.5 -25.5t-61.5 25.5t-25.5 61.5t25.5 61.5t61.5 25.5t61.5 -25.5t25.5 -61.5zM240 488q0 -36 -25.5 -61.5t-61.5 -25.5 t-61.5 25.5t-25.5 61.5t25.5 61.5t61.5 25.5t61.5 -25.5t25.5 -61.5zM240 46q0 -36 -25.5 -61.5t-61.5 -25.5t-61.5 25.5t-25.5 61.5t25.5 61.5t61.5 25.5t61.5 -25.5t25.5 -61.5zM685 215h-619v104h619v-104z" />
+<glyph unicode="&#x223b;" d="M457 481q0 -34 -24.5 -58.5t-59.5 -24.5t-59 24t-24 59t24.5 59.5t58.5 24.5q35 0 59.5 -24.5t24.5 -59.5zM628 374h54q-6 -87 -52.5 -155.5t-121.5 -68.5q-44 0 -98 29.5t-100.5 59t-74.5 29.5q-80 0 -114 -136h-54q5 94 53.5 159t125.5 65q45 0 98.5 -29.5t98.5 -59 t71 -29.5q80 0 114 136zM457 24q0 -34 -24.5 -58.5t-59.5 -24.5t-59 24.5t-24 58.5q0 35 24.5 59.5t58.5 24.5q35 0 59.5 -25t24.5 -59z" />
+<glyph unicode="&#x223c;" d="M628 374h54q-6 -87 -52.5 -155.5t-121.5 -68.5q-44 0 -98 29.5t-100.5 59t-74.5 29.5q-80 0 -114 -136h-54q5 94 53.5 159t125.5 65q45 0 98.5 -29.5t98.5 -59t71 -29.5q80 0 114 136z" />
+<glyph unicode="&#x223d;" d="M682 132h-54q-34 136 -114 136q-28 0 -74.5 -29.5t-100.5 -59t-98 -29.5q-75 0 -121.5 68.5t-52.5 155.5h54q34 -136 114 -136q26 0 71 29.5t98.5 59t98.5 29.5q77 0 125.5 -65t53.5 -159z" />
+<glyph unicode="&#x223e;" d="M532 326v93q24 0 48.5 -8t48.5 -25t39 -51t15 -79q0 -74 -44 -122.5t-103 -48.5q-93 0 -155 104q-81 137 -167 137q-44 0 -69 -20t-25 -57q0 -35 28.5 -53t75.5 -18v-93q-74 0 -115 52t-41 113q0 71 46 120t106 49q95 0 163 -109q50 -80 82.5 -106t77.5 -26q40 0 64 19.5 t24 54.5q0 74 -99 74z" />
+<glyph unicode="&#x223f;" d="M594 279l90 -10q0 -82 -46 -142t-123 -60q-160 0 -191 204q-9 59 -30.5 84t-60.5 25q-36 0 -56.5 -32t-20.5 -76l-90 10q0 82 45.5 142t121.5 60q89 0 135.5 -58t57.5 -146q7 -58 29 -83.5t61 -25.5q37 0 57.5 32t20.5 76z" />
+<glyph unicode="&#x2240;" horiz-adv-x="348" d="M295 14v-54q-96 5 -169 54t-73 125q0 45 34.5 102t69 105t34.5 72q0 38 -35.5 61.5t-102.5 40.5v55q56 -4 109 -23.5t93 -59.5t40 -91q0 -45 -34.5 -101.5t-69 -105t-34.5 -71.5q0 -75 138 -109z" />
+<glyph unicode="&#x2241;" d="M628 374h54q-6 -87 -52.5 -155.5t-121.5 -68.5q-54 0 -129 46l-77 -134h-76l98 169q-58 37 -89 37q-80 0 -114 -136h-54q5 94 53.5 159t125.5 65q54 0 125 -44l76 132h76l-97 -167q60 -39 88 -39q80 0 114 136z" />
+<glyph unicode="&#x2242;" d="M682 375h-614v88h614v-88zM629 287h54q-3 -55 -22 -104t-60 -84.5t-97 -35.5q-41 0 -95 29.5t-101 59t-72 29.5q-81 0 -114 -136h-54q3 52 22 101t59 86t93 37q43 0 96.5 -29.5t101.5 -59t75 -29.5q81 0 114 136z" />
+<glyph unicode="&#x2243;" d="M629 463h54q-3 -52 -22 -101t-59 -86t-93 -37q-43 0 -96.5 29.5t-101.5 59t-75 29.5q-81 0 -114 -136h-54q3 55 22 104t60 84.5t97 35.5q41 0 95 -29.5t101 -59t72 -29.5q81 0 114 136zM682 45h-614v88h614v-88z" />
+<glyph unicode="&#x2244;" d="M683 36h-364l-40 -90h-72l40 90h-178v88h216l72 166l-20 13l-27 17q-9 6 -24 14t-27.5 12t-22.5 4q-81 0 -114 -136h-54q3 52 22 101t59 86t93 37q58 0 153 -61l67 153h72l-82 -186q42 -24 63 -24q81 0 114 136h54q-3 -55 -22 -104t-60 -84.5t-97 -35.5q-39 0 -89 26 l-58 -134h326v-88z" />
+<glyph unicode="&#x2245;" d="M629 568h54q-6 -87 -52.5 -155.5t-121.5 -68.5q-44 0 -98 29.5t-100.5 59t-74.5 29.5q-80 0 -114 -136h-54q5 94 53.5 159t125.5 65q45 0 98.5 -29.5t98.5 -59t71 -29.5q80 0 114 136zM682 144h-614v88h614v-88zM682 -60h-614v88h614v-88z" />
+<glyph unicode="&#x2246;" d="M629 568h54q-6 -87 -52.5 -155.5t-121.5 -68.5q-44 0 -98 29.5t-100.5 59t-74.5 29.5q-80 0 -114 -136h-54q5 94 53.5 159t125.5 65q45 0 98.5 -29.5t98.5 -59t71 -29.5q80 0 114 136zM682 -60h-391l-46 -90h-80l46 90h-143v88h188l58 116h-246v88h290l39 79h80l-39 -79 h244v-88h-289l-58 -116h347v-88z" />
+<glyph unicode="&#x2247;" d="M629 568h54q-3 -52 -22 -101t-59 -86t-93 -37q-25 0 -55 10l-61 -122h289v-88h-334l-58 -116h392v-88h-437l-46 -92h-79l46 92h-98v88h143l58 116h-201v88h245l77 152q-7 4 -33 21l-43 27q-17 11 -40 20.5t-38 9.5q-81 0 -114 -136h-54q3 55 22 104t60 84.5t97 35.5 q14 0 27.5 -2t29.5 -8.5t26 -10t28.5 -15t24 -14.5t26.5 -17t23 -15l87 174h80l-104 -207q11 -3 20 -3q81 0 114 136z" />
+<glyph unicode="&#x2248;" d="M629 268h54q-6 -87 -52.5 -155.5t-121.5 -68.5q-44 0 -98 29.5t-100.5 59t-74.5 29.5q-80 0 -114 -136h-54q5 94 53.5 159t125.5 65q45 0 98.5 -29.5t98.5 -59t71 -29.5q80 0 114 136zM629 508h54q-6 -87 -52.5 -155.5t-121.5 -68.5q-44 0 -98 29.5t-100.5 59t-74.5 29.5 q-80 0 -114 -136h-54q5 94 53.5 159t125.5 65q45 0 98.5 -29.5t98.5 -59t71 -29.5q80 0 114 136z" />
+<glyph unicode="&#x2249;" d="M629 268h54q-6 -87 -52.5 -155.5t-121.5 -68.5q-27 0 -59 12t-52 23.5t-54 33.5l-71 -161h-72l86 195q-30 15 -51 15q-80 0 -114 -136h-54q5 94 53.5 159t125.5 65q36 0 77 -18l46 104l-28 18q-23 15 -31.5 20t-25 13.5t-27.5 11.5t-22 3q-80 0 -114 -136h-54 q5 94 53.5 159t125.5 65q26 0 57.5 -11.5t50.5 -22.5l53 -32l70 159h72l-85 -195q29 -16 50 -16q80 0 114 136h54q-6 -87 -52.5 -155.5t-121.5 -68.5q-38 0 -81 20l-46 -104q10 -6 36 -23t38 -24t29.5 -14t29.5 -7q80 0 114 136z" />
+<glyph unicode="&#x224a;" d="M629 328h54q-6 -87 -52.5 -155.5t-121.5 -68.5q-44 0 -98 29.5t-100.5 59t-74.5 29.5q-80 0 -114 -136h-54q5 94 53.5 159t125.5 65q45 0 98.5 -29.5t98.5 -59t71 -29.5q80 0 114 136zM629 568h54q-6 -87 -52.5 -155.5t-121.5 -68.5q-44 0 -98 29.5t-100.5 59t-74.5 29.5 q-80 0 -114 -136h-54q5 94 53.5 159t125.5 65q45 0 98.5 -29.5t98.5 -59t71 -29.5q80 0 114 136zM682 -75h-614v88h614v-88z" />
+<glyph unicode="&#x224b;" d="M629 133h54q-6 -87 -52.5 -155.5t-121.5 -68.5q-44 0 -98 29.5t-100.5 59t-74.5 29.5q-80 0 -114 -136h-54q5 94 53.5 159t125.5 65q45 0 98.5 -29.5t98.5 -59t71 -29.5q80 0 114 136zM629 373h54q-6 -87 -52.5 -155.5t-121.5 -68.5q-44 0 -98 29.5t-100.5 59t-74.5 29.5 q-80 0 -114 -136h-54q5 94 53.5 159t125.5 65q45 0 98.5 -29.5t98.5 -59t71 -29.5q80 0 114 136zM629 613h54q-6 -87 -52.5 -155.5t-121.5 -68.5q-44 0 -98 29.5t-100.5 59t-74.5 29.5q-80 0 -114 -136h-54q5 94 53.5 159t125.5 65q45 0 98.5 -29.5t98.5 -59t71 -29.5 q80 0 114 136z" />
+<glyph unicode="&#x224c;" d="M683 326h-54q-34 136 -114 136q-28 0 -74.5 -29.5t-100.5 -59t-98 -29.5q-75 0 -121.5 68.5t-52.5 155.5h54q34 -136 114 -136q26 0 71 29.5t98.5 59t98.5 29.5q77 0 125.5 -65t53.5 -159zM682 144h-614v88h614v-88zM682 -60h-614v88h614v-88z" />
+<glyph unicode="&#x224d;" d="M683 517v-54q-35 -70 -118.5 -114t-188.5 -44q-107 0 -188.5 43.5t-119.5 114.5v55q64 -59 147 -92t161 -33q161 0 307 124zM683 42v-55q-137 128 -307 128q-85 0 -167 -31t-141 -97v55q39 72 120.5 118.5t187.5 46.5q104 0 187.5 -47t119.5 -118z" />
+<glyph unicode="&#x224e;" d="M683 311h-223q-4 37 -25.5 61t-57.5 24t-59 -24t-27 -61h-223v88h169q39 85 138 85q45 0 85.5 -22.5t53.5 -62.5h169v-88zM683 107h-169q-13 -40 -53.5 -62.5t-85.5 -22.5q-99 0 -138 85h-169v88h223q4 -37 27 -61t59 -24t57.5 24t25.5 61h223v-88z" />
+<glyph unicode="&#x224f;" d="M683 311h-223q-4 37 -25.5 61t-57.5 24t-59 -24t-27 -61h-223v88h169q39 85 138 85q45 0 85.5 -22.5t53.5 -62.5h169v-88zM683 107h-615v88h615v-88z" />
+<glyph unicode="&#x2250;" d="M682 311h-614v88h614v-88zM682 107h-614v88h614v-88zM458 583q0 -35 -24 -59t-59 -24t-59.5 24.5t-24.5 58.5q0 35 24.5 59.5t59.5 24.5q34 0 58.5 -24.5t24.5 -59.5z" />
+<glyph unicode="&#x2251;" d="M458 583q0 -35 -24 -59t-59 -24t-59.5 24.5t-24.5 58.5q0 35 24.5 59.5t59.5 24.5q34 0 58.5 -24.5t24.5 -59.5zM682 311h-614v88h614v-88zM682 107h-614v88h614v-88zM458 -77q0 -35 -24.5 -59.5t-58.5 -24.5q-35 0 -59.5 24.5t-24.5 59.5q0 34 24.5 58.5t59.5 24.5 t59 -24t24 -59z" />
+<glyph unicode="&#x2252;" d="M682 311h-614v88h614v-88zM682 107h-614v88h614v-88zM235 583q0 -35 -24.5 -59t-58.5 -24q-35 0 -59.5 24.5t-24.5 58.5q0 35 25 59.5t59 24.5t58.5 -24.5t24.5 -59.5zM682 -77q0 -35 -24.5 -59.5t-58.5 -24.5q-35 0 -59.5 24.5t-24.5 59.5q0 34 24.5 58.5t59.5 24.5 t59 -24t24 -59z" />
+<glyph unicode="&#x2253;" d="M682 311h-614v88h614v-88zM682 107h-614v88h614v-88zM682 583q0 -34 -24.5 -58.5t-59.5 -24.5q-34 0 -58.5 24t-24.5 59t24.5 59.5t58.5 24.5t59 -24.5t25 -59.5zM235 -77q0 -35 -24.5 -59.5t-59.5 -24.5q-34 0 -58.5 24.5t-24.5 59.5t24 59t59 24t59.5 -24.5t24.5 -58.5 z" />
+<glyph unicode="&#x2254;" horiz-adv-x="932" d="M864 311h-569v88h569v-88zM864 107h-569v88h569v-88zM235 399q0 -34 -24.5 -58.5t-59.5 -24.5t-59 24t-24 59t24.5 59.5t58.5 24.5q35 0 59.5 -24.5t24.5 -59.5zM235 133q0 -34 -24.5 -58.5t-59.5 -24.5t-59 24t-24 59t24.5 59.5t58.5 24.5q35 0 59.5 -24.5t24.5 -59.5z " />
+<glyph unicode="&#x2255;" horiz-adv-x="932" d="M864 399q0 -35 -24 -59t-59 -24t-59.5 24.5t-24.5 58.5q0 35 24.5 59.5t59.5 24.5q34 0 58.5 -24.5t24.5 -59.5zM864 133q0 -35 -24 -59t-59 -24t-59.5 24.5t-24.5 58.5q0 35 24.5 59.5t59.5 24.5q34 0 58.5 -24.5t24.5 -59.5zM637 311h-569v88h569v-88zM637 107h-569v88 h569v-88z" />
+<glyph unicode="&#x2256;" d="M682 63h-614v88h212q-55 45 -55 116t55 116h-212v88h614v-88h-212q55 -45 55 -116t-55 -116h212v-88zM459 267q0 35 -24.5 59.5t-59.5 24.5t-59.5 -24.5t-24.5 -59.5t24.5 -59.5t59.5 -24.5t59.5 24.5t24.5 59.5z" />
+<glyph unicode="&#x2257;" d="M682 311h-614v88h614v-88zM682 107h-614v88h614v-88zM525 659q0 -62 -44 -106t-106 -44t-106 44t-44 106t44 106t106 44t106 -44t44 -106zM459 659q0 35 -24.5 59.5t-59.5 24.5t-59.5 -24.5t-24.5 -59.5t24.5 -59.5t59.5 -24.5t59.5 24.5t24.5 59.5z" />
+<glyph unicode="&#x2258;" d="M682 311h-614v88h614v-88zM682 107h-614v88h614v-88zM619 558l-29 -15q-59 70 -108 100t-105 30q-66 0 -115.5 -30.5t-100.5 -99.5l-31 13q36 96 100.5 150.5t144.5 54.5q88 0 150.5 -53t93.5 -150z" />
+<glyph unicode="&#x2259;" d="M682 311h-614v88h614v-88zM682 107h-614v88h614v-88zM594 467h-77l-142 242l-143 -242h-76l219 369z" />
+<glyph unicode="&#x225a;" d="M682 311h-614v88h614v-88zM682 107h-614v88h614v-88zM594 836l-219 -369l-219 369h76l143 -242l142 242h77z" />
+<glyph unicode="&#x225b;" d="M682 311h-614v88h614v-88zM682 107h-614v88h614v-88zM571 690l-96 -82q-8 -6 -8 -15q0 -2 2 -7.5t2 -7.5l20 -109l-99 62q-10 5 -15 5q-9 0 -17 -5l-104 -62l31 105q0 1 1.5 6.5t1.5 7.5q0 10 -9 17l-100 85l118 9q21 1 29 21l47 121l49 -121q5 -11 9.5 -15t16.5 -5z" />
+<glyph unicode="&#x225c;" d="M682 311h-614v88h614v-88zM682 107h-614v88h614v-88zM594 475h-438l219 369zM479 541l-104 176l-104 -176h208z" />
+<glyph unicode="&#x225d;" d="M682 311h-614v88h614v-88zM682 107h-614v88h614v-88zM539 718h30q0 69 20 94q21 26 71 26q33 0 54 -14.5t21 -37.5q0 -14 -9 -23.5t-24 -9.5q-13 0 -22 8.5t-9 20.5q0 11 5.5 19.5t5.5 10.5q0 10 -15 10q-14 0 -20 -9t-6 -32v-63h45v-23h-45v-161q0 -26 8 -34t35 -9v-13 h-145v13q18 2 24 8.5t6 24.5v171h-30v23zM515 542l12 -7q-23 -37 -46 -51.5t-57 -14.5q-47 0 -77 34.5t-30 88.5q0 58 30.5 94t79.5 36q43 0 66 -26q28 -29 31 -93h-132q3 -45 15.5 -70.5t47.5 -25.5q29 0 60 35zM460 623v11q0 38 -5 48q-11 24 -28 24q-37 0 -37 -83h70z M321 487l-33 -4q-34 -4 -69 -13v33q-33 -34 -69 -34q-41 0 -68 34t-27 88q0 56 28.5 93.5t71.5 37.5q33 0 62 -32v95q0 19 -6.5 24t-32.5 7v12h112v-299q0 -17 6.5 -23t24.5 -7v-12zM217 535v126q-11 32 -40 32q-45 0 -45 -98q0 -97 41 -97q19 0 34 20q10 10 10 17z" />
+<glyph unicode="&#x225e;" d="M682 311h-614v88h614v-88zM682 107h-614v88h614v-88zM579 478h-119v12q14 1 19.5 7.5t5.5 22.5v119q0 48 -27 48q-15 0 -29.5 -12.5t-14.5 -23.5v-131q0 -16 4.5 -22.5t18.5 -7.5v-12h-117v12q14 1 19.5 7.5t5.5 22.5v125q0 42 -30 42q-14 0 -28 -13t-14 -23v-131 q0 -15 5 -21.5t18 -8.5v-12h-120v12q16 2 22 9t6 23v149q0 17 -5.5 23t-22.5 8v13h95v-38h2q27 44 73 44q45 0 66 -44q37 44 75 44q32 0 49.5 -19t17.5 -53v-129q0 -17 5 -23t20 -7v-12z" />
+<glyph unicode="&#x225f;" d="M682 311h-614v88h614v-88zM682 107h-614v88h614v-88zM374 593v19q0 30 28.5 75.5t28.5 74.5q0 40 -15 62t-43 22q-19 0 -31 -7t-12 -18q0 -8 11 -20q16 -16 16 -33t-14.5 -30t-31.5 -13q-21 0 -33.5 14.5t-12.5 36.5q0 41 36.5 72.5t92.5 31.5q65 0 103 -30.5t38 -77.5 q0 -35 -18.5 -60.5t-65.5 -51.5q-48 -27 -48 -67h-29zM447 508q0 -25 -17 -42.5t-42 -17.5q-26 0 -43 17.5t-17 42.5t17.5 42t42.5 17q24 0 41.5 -17.5t17.5 -41.5z" />
+<glyph unicode="&#x2260;" d="M682 107h-336l-115 -263h-69l115 263h-209v88h247l51 116h-298v88h336l115 263h69l-115 -263h209v-88h-247l-51 -116h298v-88z" />
+<glyph unicode="&#x2261;" d="M682 419h-614v88h614v-88zM682 223h-614v88h614v-88zM682 27h-614v88h614v-88z" />
+<glyph unicode="&#x2262;" d="M682 27h-371l-80 -183h-69l80 183h-174v88h212l47 108h-259v88h298l47 108h-345v88h383l79 181h69l-79 -181h162v-88h-200l-47 -108h247v-88h-286l-47 -108h333v-88z" />
+<glyph unicode="&#x2263;" d="M682 504h-614v88h614v-88zM682 317h-614v88h614v-88zM682 130h-614v88h614v-88zM682 -57h-614v88h614v-88z" />
+<glyph unicode="&#x2264;" d="M670 68l-590 258v40l590 261v-89l-436 -192l436 -190v-88zM670 -120l-590 -1v88h590v-87z" />
+<glyph unicode="&#x2265;" d="M670 327l-590 -258v88l436 190l-436 192v88l590 -260v-40zM670 -120h-590v88h590v-88z" />
+<glyph unicode="&#x2266;" d="M670 171l-590 258v40l590 260v-88l-436 -192l436 -190v-88zM670 -18h-590v88h590v-88zM670 -222h-590v88h590v-88z" />
+<glyph unicode="&#x2267;" d="M670 -18h-590v88h590v-88zM670 429l-590 -258v88l436 190l-436 192v88l590 -260v-40zM670 -222h-590v88h590v-88z" />
+<glyph unicode="&#x2268;" d="M670 171l-590 258v40l590 260v-88l-436 -192l436 -190v-88zM670 -222h-334l-39 -72h-77l39 72h-179v88h226l62 116h-288v88h335l38 72h77l-38 -72h178v-88h-225l-62 -116h287v-88z" />
+<glyph unicode="&#x2269;" d="M670 429l-590 -258v88l436 190l-436 192v88l590 -260v-40zM670 -222h-334l-39 -72h-77l39 72h-179v88h226l62 116h-288v88h335l38 72h77l-38 -72h178v-88h-225l-62 -116h287v-88z" />
+<glyph unicode="&#x226a;" horiz-adv-x="1000" d="M628 -24l-590 258v40l590 260v-88l-436 -192l436 -190v-88zM961 -24l-590 258v40l590 260v-88l-436 -192l436 -190v-88z" />
+<glyph unicode="&#x226b;" horiz-adv-x="1000" d="M628 234l-590 -258v88l436 190l-436 192v88l590 -260v-40zM961 234l-590 -258v88l436 190l-436 192v88l590 -260v-40z" />
+<glyph unicode="&#x226c;" horiz-adv-x="417" d="M306 732v-27q-40 -33 -70 -71q135 -146 135 -362q0 -218 -136 -365q27 -36 71 -72v-28q-55 32 -98 72q-44 -41 -97 -72v27q45 37 70 72q-135 144 -135 361q0 218 136 366q-31 39 -71 71v28q54 -30 98 -71q46 41 97 71zM258 273q0 119 -9.5 191t-40.5 128 q-31 -56 -40 -128.5t-9 -197.5q0 -123 9 -193t40 -126q31 57 40.5 129.5t9.5 196.5z" />
+<glyph unicode="&#x226d;" d="M683 42v-55q-137 128 -307 128q-20 0 -31 -1l-101 -201h-79l94 187q-118 -31 -191 -113v55q32 60 95.5 103.5t146.5 56.5l52 103q-102 3 -180 46.5t-114 111.5v55q64 -59 147 -92t161 -33q21 0 31 1l99 197h80l-90 -179q100 31 187 105v-54q-29 -58 -92.5 -99t-146.5 -54 l-52 -103q99 -4 178 -50.5t113 -114.5z" />
+<glyph unicode="&#x226e;" d="M670 -24l-303 133l-67 -224h-73l76 252l-223 97v40l305 134l65 217h73l-54 -180l201 89v-88l-231 -101l-48 -159l279 -122v-88zM354 307l-120 -53l92 -40z" />
+<glyph unicode="&#x226f;" d="M670 234l-305 -133l-65 -216h-73l54 179l-201 -88v88l231 101l48 159l-279 122v88l302 -133l68 224h73l-76 -253l223 -98v-40zM516 254l-92 41l-29 -94z" />
+<glyph unicode="&#x2270;" d="M670 -120h-357l-35 -115h-73l35 115h-160v88h186l74 245l-260 114v40l353 156l59 194h73l-47 -157l152 67v-88l-183 -81l-59 -196l242 -105v-88l-265 116l-66 -217h331v-88zM403 421l-169 -74l129 -56z" />
+<glyph unicode="&#x2271;" d="M670 -120h-357l-35 -115h-73l35 115h-160v88h186l64 210l-250 -109v88l280 122l36 121l-316 139v88l340 -150l72 240h73l-81 -268l186 -82v-40l-256 -112l-75 -247h331v-88zM516 347l-55 24l-17 -55z" />
+<glyph unicode="&#x2272;" d="M667 132l-590 260v40l590 258v-88l-436 -190l436 -192v-88zM628 60h54q-5 -94 -53.5 -159t-125.5 -65q-45 0 -98.5 29.5t-98.5 59t-71 29.5q-80 0 -114 -136h-54q6 87 52.5 155.5t121.5 68.5q44 0 98 -29.5t100.5 -59t74.5 -29.5q80 0 114 136z" />
+<glyph unicode="&#x2273;" d="M667 392l-590 -260v88l436 192l-436 190v88l590 -258v-40zM628 60h54q-5 -94 -53.5 -159t-125.5 -65q-45 0 -98.5 29.5t-98.5 59t-71 29.5q-80 0 -114 -136h-54q6 87 52.5 155.5t121.5 68.5q44 0 98 -29.5t100.5 -59t74.5 -29.5q80 0 114 136z" />
+<glyph unicode="&#x2274;" d="M628 60h54q-5 -94 -53.5 -159t-125.5 -65q-20 0 -39.5 4.5t-42.5 16.5l-36 19q-13 7 -40 24l-33 22l-61 -204h-73l71 234q-10 2 -14 2q-80 0 -114 -136h-54q6 87 52.5 155.5t121.5 68.5q18 0 33 -4l71 236l-268 118v40l364 159l57 189h73l-46 -152l142 62v-88l-172 -75 l-62 -204l234 -103v-88l-257 113l-70 -232q23 -12 61 -37t65 -38.5t48 -13.5q80 0 114 136zM411 490l-180 -78l138 -61z" />
+<glyph unicode="&#x2275;" d="M628 60h54q-5 -94 -53.5 -159t-125.5 -65q-20 0 -39.5 4.5t-42.5 16.5l-36 19q-13 7 -40 24l-33 22l-61 -204h-73l71 234q-10 2 -14 2q-80 0 -114 -136h-54q6 87 52.5 155.5t121.5 68.5q18 0 33 -4l63 209l-260 -115v88l291 128l34 112l-325 142v88l348 -152l73 242h73 l-81 -270l177 -78v-40l-246 -108l-81 -271q23 -12 61 -37t65 -38.5t48 -13.5q80 0 114 136zM513 412l-47 20l-14 -47z" />
+<glyph unicode="&#x2276;" d="M670 32l-590 -258v88l436 190l-436 192v88l590 -260v-40zM670 176l-590 258v40l590 260v-88l-436 -192l436 -190v-88z" />
+<glyph unicode="&#x2277;" d="M670 434l-590 -258v88l436 190l-436 192v88l590 -260v-40zM670 -226l-590 258v40l590 260v-88l-436 -192l436 -190v-88z" />
+<glyph unicode="&#x2278;" d="M670 32l-363 -159l-57 -189h-73l46 152l-143 -62v88l173 76l61 203l-234 103v88l258 -114l27 91l-285 125v40l386 170l54 180h73l-43 -143l120 53v-88l-150 -66l-67 -221l217 -95v-88l-240 105l-28 -91l268 -118v-40zM435 543l-201 -89l154 -67zM516 52l-137 60l-42 -138 z" />
+<glyph unicode="&#x2279;" d="M670 -226l-347 152l-73 -242h-73l81 270l-178 78v40l246 109l36 118l-282 -123v88l312 136l29 96l-341 150v88l365 -161l75 251h73l-84 -279l161 -71v-40l-224 -98l-35 -118l259 114v-88l-290 -128l-34 -113l324 -141v-88zM516 454l-30 13l-10 -30zM296 79l-62 -27 l47 -21z" />
+<glyph unicode="&#x227a;" d="M670 98v-121q-94 98 -227 154.5t-279 70.5l-84 8v88l84 8q146 14 279 70.5t227 154.5v-121q-107 -98 -299 -156q192 -58 299 -156z" />
+<glyph unicode="&#x227b;" d="M670 210l-84 -8q-146 -14 -279 -70.5t-227 -154.5v121q107 98 299 156q-192 58 -299 156v121q94 -98 227 -154.5t279 -70.5l84 -8v-88z" />
+<glyph unicode="&#x227c;" d="M670 212v-121q-94 98 -227 154.5t-279 70.5l-84 8v88l84 8q146 14 279 70.5t227 154.5v-121q-107 -98 -299 -156q192 -58 299 -156zM670 -17v-121q-95 98 -227.5 154.5t-278.5 70.5l-84 8v88q188 -8 325 -55q171 -59 265 -145z" />
+<glyph unicode="&#x227d;" d="M670 324l-84 -8q-146 -14 -279 -70.5t-227 -154.5v121q107 98 299 156q-192 58 -299 156v121q94 -98 227 -154.5t279 -70.5l84 -8v-88zM670 95l-84 -8q-146 -14 -278.5 -70.5t-227.5 -154.5v121q94 86 265 145q137 47 325 55v-88z" />
+<glyph unicode="&#x227e;" d="M670 243v-121q-94 98 -227 154.5t-279 70.5l-84 8v88l84 8q146 14 279 70.5t227 154.5v-121q-107 -98 -299 -156q192 -58 299 -156zM628 73h54q-5 -94 -53.5 -159t-125.5 -65q-45 0 -98.5 29.5t-98.5 59t-71 29.5q-80 0 -114 -136h-54q6 87 52.5 155.5t121.5 68.5 q44 0 98 -29.5t100.5 -59t74.5 -29.5q80 0 114 136z" />
+<glyph unicode="&#x227f;" d="M670 355l-84 -8q-146 -14 -279 -70.5t-227 -154.5v121q107 98 299 156q-192 58 -299 156v121q94 -98 227 -154.5t279 -70.5l84 -8v-88zM628 73h54q-5 -94 -53.5 -159t-125.5 -65q-45 0 -98.5 29.5t-98.5 59t-71 29.5q-80 0 -114 -136h-54q6 87 52.5 155.5t121.5 68.5 q44 0 98 -29.5t100.5 -59t74.5 -29.5q80 0 114 136z" />
+<glyph unicode="&#x2280;" d="M670 98v-121q-111 115 -279 175l-81 -267h-73l87 288q-82 22 -160 29l-84 8v88l84 8q109 11 214 45l82 274h73l-72 -241q125 60 209 147v-121q-85 -78 -243 -137l-10 -34q162 -58 253 -141z" />
+<glyph unicode="&#x2281;" d="M670 210l-84 -8q-96 -9 -192 -38l-84 -279h-73l75 249q-138 -59 -232 -157v121q95 86 265 145l6 20q-176 60 -271 147v121q117 -121 297 -181l83 275h73l-89 -295q70 -16 142 -24l84 -8v-88z" />
+<glyph unicode="&#x2282;" d="M668 -13h-298q-128 0 -208 81t-80 199q0 119 80.5 199.5t210.5 80.5h295v-88h-311q-76 0 -131.5 -56t-55.5 -136t56 -136t132 -56h310v-88z" />
+<glyph unicode="&#x2283;" d="M82 547h295q130 0 210.5 -80.5t80.5 -199.5q0 -118 -80 -199t-208 -81h-298v88h310q76 0 132 56t56 136t-55.5 136t-131.5 56h-311v88z" />
+<glyph unicode="&#x2284;" d="M668 -13h-298q-36 0 -73 8l-58 -141h-69l66 162q-72 34 -113 101t-41 150q0 119 80.5 199.5t210.5 80.5h82l55 133h69l-55 -133h144v-88h-180l-157 -382q18 -2 27 -2h310v-88zM419 459h-62q-76 0 -131.5 -56t-55.5 -136q0 -54 27.5 -99t72.5 -70z" />
+<glyph unicode="&#x2285;" d="M579 680l-67 -162q73 -34 114.5 -101t41.5 -150q0 -118 -80 -199t-208 -81h-86l-55 -133h-69l55 133h-143v88h179l157 382q-16 2 -25 2h-311v88h295q38 0 75 -8l58 141h69zM330 75h62q76 0 132 56t56 136q0 54 -28 99.5t-73 70.5z" />
+<glyph unicode="&#x2286;" d="M668 87h-298q-128 0 -208 81t-80 199q0 119 80.5 199.5t210.5 80.5h295v-88h-311q-76 0 -131.5 -56t-55.5 -136t56 -136t132 -56h310v-88zM668 -101h-586v88h586v-88z" />
+<glyph unicode="&#x2287;" d="M82 647h295q130 0 210.5 -80.5t80.5 -199.5q0 -118 -80 -199t-208 -81h-298v88h310q76 0 132 56t56 136t-55.5 136t-131.5 56h-311v88zM668 -101h-586v88h586v-88z" />
+<glyph unicode="&#x2288;" d="M668 -101h-413l-41 -100h-69l41 100h-104v88h141l47 115q-87 28 -137.5 100.5t-50.5 164.5q0 119 80.5 199.5t210.5 80.5h122l41 100h69l-41 -100h104v-88h-141l-158 -384h299v-88h-298q-14 0 -36 2l-42 -102h376v-88zM458 559h-101q-76 0 -131.5 -56t-55.5 -136 q0 -65 38 -115.5t96 -68.5z" />
+<glyph unicode="&#x2289;" d="M668 -101h-413l-41 -100h-69l41 100h-104v88h141l41 100h-182v88h218l154 373q-30 11 -61 11h-311v88h295q61 0 110 -18l49 118h69l-60 -146q58 -37 90.5 -99t32.5 -135q0 -118 -80 -199t-208 -81h-47l-41 -100h376v-88zM369 175h23q76 0 132 56t56 136q0 91 -70 149z " />
+<glyph unicode="&#x228a;" d="M668 174h-298q-128 0 -208 81t-80 199q0 119 80.5 199.5t210.5 80.5h295v-88h-311q-76 0 -131.5 -56t-55.5 -136t56 -136t132 -56h310v-88zM668 -94h-270l-65 -106h-78l65 106h-228v88h281l64 105h78l-64 -105h217v-88z" />
+<glyph unicode="&#x228b;" d="M82 734h295q130 0 210.5 -80.5t80.5 -199.5q0 -118 -80 -199t-208 -81h-298v88h310q76 0 132 56t56 136t-55.5 136t-131.5 56h-311v88zM658 -94h-270l-65 -106h-78l65 106h-228v88h281l64 105h78l-64 -105h217v-88z" />
+<glyph unicode="&#x228c;" horiz-adv-x="650" d="M496 541h88v-315q0 -107 -76 -183t-183 -76t-183 76t-76 183v315h88v-315q0 -70 50 -120.5t121 -50.5t121 50.5t50 120.5v315zM462 270h-80q-33 0 -33 -13q0 -10 19 -33q24 -30 43 -66l-36 -26q-36 49 -54 70.5t-53 49.5t-81 47v12q35 14 61 30.5t49.5 41t36.5 40.5 l40 54l37 -26q-26 -44 -44 -66q-18 -23 -18 -32q0 -13 32 -13h81v-70z" />
+<glyph unicode="&#x228d;" horiz-adv-x="650" d="M496 541h88v-315q0 -107 -76 -183t-183 -76t-183 76t-76 183v315h88v-315q0 -70 50 -120.5t121 -50.5t121 50.5t50 120.5v315zM394 306q0 -28 -20.5 -48.5t-48.5 -20.5q-29 0 -49 20.5t-20 48.5t20 48.5t49 20.5q28 0 48.5 -20.5t20.5 -48.5z" />
+<glyph unicode="&#x228e;" horiz-adv-x="650" d="M496 541h88v-315q0 -107 -76 -183t-183 -76t-183 76t-76 183v315h88v-315q0 -70 50 -120.5t121 -50.5t121 50.5t50 120.5v315zM446 275h-91v-91h-60v91h-91v60h91v91h60v-91h91v-60z" />
+<glyph unicode="&#x228f;" d="M663 -27h-576v559h576v-88h-488v-383h488v-88z" />
+<glyph unicode="&#x2290;" d="M663 -27h-576v88h488v383h-488v88h576v-559z" />
+<glyph unicode="&#x2291;" d="M663 85h-576v559h576v-88h-488v-383h488v-88zM663 -93h-576v88h576v-88z" />
+<glyph unicode="&#x2292;" d="M663 85h-576v88h488v383h-488v88h576v-559zM663 -93h-576v88h576v-88z" />
+<glyph unicode="&#x2293;" horiz-adv-x="650" d="M584 -33h-88v486h-342v-486h-88v574h518v-574z" />
+<glyph unicode="&#x2294;" horiz-adv-x="650" d="M584 -33h-518v574h88v-486h342v486h88v-574z" />
+<glyph unicode="&#x2295;" horiz-adv-x="864" d="M814 252q0 -158 -112 -270t-270 -112t-270 112t-112 270t112 270t270 112t270 -112t112 -270zM476 296h247q-14 95 -83 164t-164 83v-247zM723 208h-247v-247q95 14 164 83t83 164zM388 296v247q-95 -14 -164 -83t-83 -164h247zM388 -39v247h-247q14 -95 83 -164t164 -83 z" />
+<glyph unicode="&#x2296;" horiz-adv-x="864" d="M814 252q0 -158 -112 -270t-270 -112t-270 112t-112 270t112 270t270 112t270 -112t112 -270zM141 296h582q-16 107 -98.5 178.5t-192.5 71.5t-192.5 -71.5t-98.5 -178.5zM723 208h-582q16 -107 98.5 -178.5t192.5 -71.5t192.5 71.5t98.5 178.5z" />
+<glyph unicode="&#x2297;" horiz-adv-x="864" d="M814 252q0 -158 -112 -270t-270 -112t-270 112t-112 270t112 270t270 112t270 -112t112 -270zM432 314l174 175q-77 57 -174 57t-174 -57zM494 252l175 -174q57 77 57 174t-57 174zM370 252l-175 174q-57 -77 -57 -174t57 -174zM606 15l-174 175l-174 -175 q77 -57 174 -57t174 57z" />
+<glyph unicode="&#x2298;" horiz-adv-x="864" d="M814 252q0 -158 -112 -270t-270 -112t-270 112t-112 270t112 270t270 112t270 -112t112 -270zM195 78l411 411q-76 57 -174 57q-122 0 -208 -86t-86 -208q0 -98 57 -174zM669 426l-411 -411q76 -57 174 -57q122 0 208 86t86 208q0 98 -57 174z" />
+<glyph unicode="&#x2299;" horiz-adv-x="784" d="M466 253q0 -30 -20.5 -52.5t-53.5 -22.5t-54 20.5t-21 54.5q0 32 23 53t52 21q30 0 52 -21t22 -53zM734 252q0 -142 -100 -242t-242 -100t-242 100t-100 242t100 242t242 100t242 -100t100 -242zM646 252q0 105 -74.5 179.5t-179.5 74.5t-179.5 -74.5t-74.5 -179.5 t74.5 -179.5t179.5 -74.5t179.5 74.5t74.5 179.5z" />
+<glyph unicode="&#x229a;" horiz-adv-x="842" d="M576 252q0 -65 -46 -111t-111 -46q-66 0 -111.5 46t-45.5 113q0 66 46 110.5t113 44.5q64 0 109.5 -46t45.5 -111zM488 252q0 29 -20 49t-47 20q-31 0 -51 -19.5t-20 -47.5q0 -31 19.5 -51t49.5 -20q29 0 49 20t20 49zM803 252q0 -158 -112 -270t-270 -112t-270 112 t-112 270t112 270t270 112t270 -112t112 -270zM715 252q0 122 -86.5 208t-207.5 86t-207.5 -86t-86.5 -208t86.5 -208t207.5 -86t207.5 86t86.5 208z" />
+<glyph unicode="&#x229b;" horiz-adv-x="864" d="M634 165q0 -24 -13 -39t-41 -15q-9 0 -17.5 3.5t-12.5 5.5t-13 12l-10 10q-1 1 -10 13q-33 42 -63 62q2 -30 26 -105q5 -18 5 -32q0 -21 -16.5 -38.5t-36.5 -17.5t-36.5 17.5t-16.5 38.5q0 10 17 67q11 38 15 70q-13 -10 -25.5 -22t-28 -29.5t-22.5 -24.5 q-28 -30 -58 -30q-23 0 -37.5 13.5t-14.5 32.5q0 14 5 25t10 17.5t18.5 12.5t19 7.5t23.5 6t21 5.5q42 10 64 21q-20 9 -58.5 18.5t-43.5 10.5q-59 16 -59 55q0 24 12.5 40.5t38.5 16.5q10 0 19.5 -3.5t19 -11l15.5 -12.5l15 -16q10 -11 13 -15q31 -33 53 -47q-1 18 -4.5 34 t-12 43.5t-9.5 31.5q-6 22 -6 32q0 22 16.5 37t36.5 15t36.5 -15t16.5 -37q0 -14 -16 -67q-12 -37 -15 -73q11 7 19.5 13.5t16.5 15.5l13 12q4 4 14 16l14 18q22 29 52 29q25 0 38 -15.5t13 -41.5q0 -21 -17 -35t-40 -19q-72 -14 -104 -30q22 -11 103 -31q58 -15 58 -56z M814 252q0 -158 -112 -270t-270 -112t-270 112t-112 270t112 270t270 112t270 -112t112 -270zM726 252q0 122 -86 208t-208 86t-208 -86t-86 -208t86 -208t208 -86t208 86t86 208z" />
+<glyph unicode="&#x229c;" horiz-adv-x="864" d="M646 290h-428v88h428v-88zM646 128h-428v88h428v-88zM814 252q0 -158 -112 -270t-270 -112t-270 112t-112 270t112 270t270 112t270 -112t112 -270zM726 252q0 122 -86 208t-208 86t-208 -86t-86 -208t86 -208t208 -86t208 86t86 208z" />
+<glyph unicode="&#x229d;" horiz-adv-x="864" d="M656 208h-448v88h448v-88zM814 252q0 -158 -112 -270t-270 -112t-270 112t-112 270t112 270t270 112t270 -112t112 -270zM726 252q0 122 -86 208t-208 86t-208 -86t-86 -208t86 -208t208 -86t208 86t86 208z" />
+<glyph unicode="&#x229e;" horiz-adv-x="910" d="M865 -158h-820v819h820v-819zM777 286v287h-287v-287h287zM777 -70v286h-287v-286h287zM420 286v287h-287v-287h287zM420 -70v286h-287v-286h287z" />
+<glyph unicode="&#x229f;" horiz-adv-x="910" d="M865 -158h-820v819h820v-819zM777 286v287h-644v-287h644zM777 -70v286h-644v-286h644z" />
+<glyph unicode="&#x22a0;" horiz-adv-x="910" d="M865 -158h-820v819h820v-819zM730 573h-546l273 -273zM777 -20v540l-270 -270zM727 -70l-270 270l-270 -270h540zM407 250l-274 274v-548z" />
+<glyph unicode="&#x22a1;" horiz-adv-x="910" d="M540 251q0 -35 -25 -60t-60 -25t-60 25t-25 60t25 60t60 25t60 -25t25 -60zM865 -158h-820v819h820v-819zM777 -70v286v357h-644v-357v-286h644z" />
+<glyph unicode="&#x22a2;" d="M659 286h-464v-286h-104v676h104v-286h464v-104z" />
+<glyph unicode="&#x22a3;" d="M659 0h-104v286h-464v104h464v286h104v-676z" />
+<glyph unicode="&#x22a4;" d="M659 572h-232v-572h-104v572h-232v104h568v-104z" />
+<glyph unicode="&#x22a5;" d="M659 0h-568v104h232v572h104v-572h232v-104z" />
+<glyph unicode="&#x22a6;" horiz-adv-x="555" d="M464 286h-269v-286h-104v676h104v-286h269v-104z" />
+<glyph unicode="&#x22a7;" horiz-adv-x="555" d="M464 188h-269v-188h-104v676h104v-188h269v-104h-269v-92h269v-104z" />
+<glyph unicode="&#x22a8;" d="M659 188h-464v-188h-104v676h104v-188h464v-104h-464v-92h464v-104z" />
+<glyph unicode="&#x22a9;" horiz-adv-x="972" d="M882 286h-491v-286h-104v676h104v-286h491v-104zM195 0h-104v676h104v-676z" />
+<glyph unicode="&#x22aa;" horiz-adv-x="944" d="M856 286h-269v-286h-104v676h104v-286h269v-104zM391 0h-104v676h104v-676zM195 0h-104v676h104v-676z" />
+<glyph unicode="&#x22ab;" horiz-adv-x="944" d="M856 188h-464v-188h-104v676h104v-188h464v-104h-464v-92h464v-104zM195 0h-104v676h104v-676z" />
+<glyph unicode="&#x22ac;" horiz-adv-x="913" d="M822 286h-405l-59 -57v-229h-104v129l-134 -129h-99l233 224v452h104v-286h68l297 286h99l-297 -286h297v-104z" />
+<glyph unicode="&#x22ad;" horiz-adv-x="912" d="M822 676l-195 -188h194v-104h-302l-96 -92h398v-104h-464v-188h-104v128l-133 -128h-99l232 223v453h104v-188h171l195 188h99zM420 384h-63v-61z" />
+<glyph unicode="&#x22ae;" horiz-adv-x="1096" d="M1024 676l-375 -286h357v-104h-491v-286h-104v209l-92 -70v-139h-104v59l-78 -59h-116l194 148v528h104v-449l92 70v379h104v-286h18l375 286h116z" />
+<glyph unicode="&#x22af;" horiz-adv-x="1104" d="M1016 676l-246 -188h245v-104h-381l-83 -64v-28h464v-104h-464v-188h-104v240l-92 -70v-170h-104v90l-118 -90h-112l230 176v500h104v-421l92 70v351h104v-188h108l245 188h112z" />
+<glyph unicode="&#x22b0;" d="M473 440h-52q3 45 37.5 74t81.5 29q48 0 80 -32t32 -80q0 -67 -54 -110.5t-133 -57.5q-7 -2 -60 -9q8 -2 22 -4.5t24 -4.5t12 -2q79 -13 134 -57t55 -112q0 -48 -32 -80t-80 -32q-47 0 -81.5 29t-37.5 74h52q4 -16 17.5 -25.5t29.5 -9.5q18 0 31 12t13 30q0 27 -26 49.5 t-67 36t-76.5 21.5t-69.5 12q-134 17 -227 18v87q126 2 227 18q98 16 144 32q95 34 95 87q0 18 -13 30t-31 12q-16 0 -29.5 -9.5t-17.5 -25.5z" />
+<glyph unicode="&#x22b1;" d="M652 296v-87q-93 -1 -227 -18q-34 -4 -69.5 -12t-76.5 -21.5t-67 -36t-26 -49.5q0 -18 13 -30t31 -12q16 0 29.5 9.5t17.5 25.5h52q-3 -45 -37.5 -74t-81.5 -29q-48 0 -80 32t-32 80q0 68 55 112t134 57q2 0 12 2t24 4.5t22 4.5q-53 7 -60 9q-79 14 -133 57.5t-54 110.5 q0 48 32 80t80 32q47 0 81.5 -29t37.5 -74h-52q-4 16 -17.5 25.5t-29.5 9.5q-18 0 -31 -12t-13 -30q0 -53 95 -87q46 -16 144 -32q101 -16 227 -18z" />
+<glyph unicode="&#x22b2;" d="M669 -24l-588 278l588 280v-558zM581 115v280l-295 -141z" />
+<glyph unicode="&#x22b3;" d="M669 254l-588 -278v558zM464 254l-295 141v-280z" />
+<glyph unicode="&#x22b4;" d="M669 63l-588 278l588 280v-558zM581 202v280l-295 -141zM669 -113h-588v88h588v-88z" />
+<glyph unicode="&#x22b5;" d="M669 341l-588 -278v558zM464 341l-295 141v-280zM669 -113h-588v88h588v-88z" />
+<glyph unicode="&#x22b6;" horiz-adv-x="1216" d="M382 319h452q17 52 61.5 84.5t100.5 32.5q70 0 120 -50t50 -120t-50 -120t-120 -50q-56 0 -101 33.5t-61 85.5h-452q-16 -52 -61 -85.5t-101 -33.5q-70 0 -120 50t-50 120t50 120t120 50q56 0 100.5 -32.5t61.5 -84.5zM320 266q0 41 -29.5 70.5t-70.5 29.5t-70.5 -29.5 t-29.5 -70.5t29.5 -70.5t70.5 -29.5t70.5 29.5t29.5 70.5z" />
+<glyph unicode="&#x22b7;" horiz-adv-x="1216" d="M382 319h452q17 52 61.5 84.5t100.5 32.5q70 0 120 -50t50 -120t-50 -120t-120 -50q-56 0 -101 33.5t-61 85.5h-452q-16 -52 -61 -85.5t-101 -33.5q-70 0 -120 50t-50 120t50 120t120 50q56 0 100.5 -32.5t61.5 -84.5zM1096 266q0 41 -29.5 70.5t-70.5 29.5t-70.5 -29.5 t-29.5 -70.5t29.5 -70.5t70.5 -29.5t70.5 29.5t29.5 70.5z" />
+<glyph unicode="&#x22b8;" horiz-adv-x="884" d="M50 319h452q17 51 61.5 84t100.5 33q70 0 120 -50t50 -120t-50 -120t-120 -50q-56 0 -100.5 33.5t-61.5 85.5h-452v104zM764 266q0 41 -29.5 70.5t-70.5 29.5t-70.5 -29.5t-29.5 -70.5t29.5 -70.5t70.5 -29.5t70.5 29.5t29.5 70.5z" />
+<glyph unicode="&#x22b9;" d="M419 347h-88v216h88v-216zM685 209h-216v88h216v-88zM281 297v-88h-216v88h216zM419 -57h-88v216h88v-216z" />
+<glyph unicode="&#x22ba;" horiz-adv-x="498" d="M424 391h-123v-607h-104v607h-123v70h350v-70z" />
+<glyph unicode="&#x22bb;" horiz-adv-x="640" d="M588 536l-234 -564h-68l-234 564h94l174 -413l174 413h94zM573 -189h-506v88h506v-88z" />
+<glyph unicode="&#x22bc;" horiz-adv-x="640" d="M588 -28h-94l-174 413l-174 -413h-94l234 564h68zM573 609h-507v88h507v-88z" />
+<glyph unicode="&#x22bd;" horiz-adv-x="640" d="M588 536l-234 -564h-68l-234 564h94l174 -413l174 413h94zM573 609h-506v88h506v-88z" />
+<glyph unicode="&#x22be;" d="M690 0h-630v630h104v-181q133 -21 228.5 -116.5t116.5 -228.5h181v-104zM164 104h277q-20 105 -96.5 181.5t-180.5 96.5v-278z" />
+<glyph unicode="&#x22bf;" horiz-adv-x="910" d="M865 -158h-820l820 820v-820zM777 -70v520l-521 -520h521z" />
+<glyph unicode="&#x22c4;" horiz-adv-x="584" d="M541 266l-249 -249l-249 249l249 249zM311 159l88 88q9 9 9 20q0 7 -9 18l-88 88q-9 9 -20 9q-7 0 -18 -9l-88 -88q-9 -9 -9 -20q0 -7 9 -18l88 -88q11 -9 20 -9q7 0 18 9z" />
+<glyph unicode="&#x22c7;" d="M461 508q0 -36 -25.5 -61.5t-61.5 -25.5t-61.5 25.5t-25.5 61.5t25.5 61.5t61.5 25.5t61.5 -25.5t25.5 -61.5zM685 29l-74 -74l-236 236l-235 -235l-74 74l185 185h-185v104h181l-181 181l74 74l235 -235l236 236l74 -74l-182 -182h182v-104h-186zM461 24 q0 -36 -25.5 -61.5t-61.5 -25.5t-61.5 25.5t-25.5 61.5t25.5 61.5t61.5 25.5t61.5 -25.5t25.5 -61.5z" />
+<glyph unicode="&#x22c8;" horiz-adv-x="870" d="M803 -72l-368 264l-368 -264v676l368 -264l368 264v-676zM699 126v280l-190 -140zM361 266l-190 140v-280z" />
+<glyph unicode="&#x22c9;" horiz-adv-x="870" d="M817 52l-57 -80l-320 232l-383 -276v676l383 -277l320 227l57 -80l-292 -208zM355 266l-194 140v-280z" />
+<glyph unicode="&#x22ca;" horiz-adv-x="870" d="M813 -72l-383 276l-320 -232l-57 80l292 214l-292 208l57 80l320 -227l383 277v-676zM709 126v280l-194 -140z" />
+<glyph unicode="&#x22cb;" horiz-adv-x="870" d="M773 2l-74 -74l-264 264l-264 -264l-74 74l264 264l-264 264l74 74z" />
+<glyph unicode="&#x22cc;" horiz-adv-x="870" d="M773 2l-74 -74l-264 264l-264 -264l-74 74l602 602l74 -74l-264 -264z" />
+<glyph unicode="&#x22cd;" d="M683 221h-54q-33 136 -114 136q-27 0 -75 -29.5t-101.5 -59t-96.5 -29.5q-53 0 -93 37t-59 86t-22 101h54q33 -136 114 -136q25 0 72 29.5t101 59t95 29.5q56 0 97 -35.5t60 -84.5t22 -104zM682 45h-614v88h614v-88z" />
+<glyph unicode="&#x22ce;" horiz-adv-x="640" d="M480 536h119q-116 -114 -169 -250t-65 -314h-88q-14 183 -66 318t-170 246h119q135 -138 159 -303h4q13 84 50 149.5t107 153.5z" />
+<glyph unicode="&#x22cf;" horiz-adv-x="640" d="M599 -28h-119q-70 88 -107 153.5t-50 149.5h-4q-24 -165 -159 -303h-119q118 111 170 246t66 318h88q12 -178 65 -314t169 -250z" />
+<glyph unicode="&#x22d0;" d="M687 92h-280q-72 0 -123.5 51.5t-51.5 123.5t51.5 123t123.5 51h280v-88h-281q-36 0 -61 -25.5t-25 -61.5t25 -61t61 -25h281v-88zM687 -67h-290q-138 0 -236 98t-98 236t98 235.5t236 97.5h290v-88h-291q-102 0 -173.5 -72t-71.5 -174t71.5 -173.5t173.5 -71.5h291v-88z " />
+<glyph unicode="&#x22d1;" d="M63 600h290q138 0 236 -97.5t98 -235.5t-98 -236t-236 -98h-290v88h291q101 0 173 71.5t72 173.5t-71.5 174t-173.5 72h-291v88zM63 441h280q72 0 123.5 -51t51.5 -123t-51.5 -123.5t-123.5 -51.5h-280v88h281q36 0 61 25t25 61t-25 61.5t-61 25.5h-281v88z" />
+<glyph unicode="&#x22d2;" d="M685 -33h-88v264q0 92 -65 157t-157 65t-157 -65t-65 -157v-264h-88v264q0 128 91 219t219 91t219 -91t91 -219v-264zM526 -33h-88v254q0 26 -18.5 44.5t-44.5 18.5t-44.5 -18.5t-18.5 -44.5v-254h-88v255q0 63 44 106.5t107 43.5t107 -43.5t44 -106.5v-255z" />
+<glyph unicode="&#x22d3;" d="M526 541v-255q0 -63 -44 -106.5t-107 -43.5t-107 43.5t-44 106.5v255h88v-254q0 -26 18.5 -44.5t44.5 -18.5t44.5 18.5t18.5 44.5v254h88zM685 541v-264q0 -128 -91 -219t-219 -91t-219 91t-91 219v264h88v-264q0 -92 65 -157t157 -65t157 65t65 157v264h88z" />
+<glyph unicode="&#x22d4;" horiz-adv-x="650" d="M584 -33h-88v315q0 59 -36 105t-91 60v-480h-88v480q-55 -14 -91 -60t-36 -105v-315h-88v315q0 95 61.5 167t153.5 88v106h88v-106q92 -16 153.5 -88t61.5 -167v-315z" />
+<glyph unicode="&#x22d5;" horiz-adv-x="685" d="M637 106h-151v-295h-88v295h-111v-295h-88v295h-151v88h151v112h-151v88h151v296h88v-296h111v296h88v-296h151v-88h-151v-112h151v-88zM398 194v112h-111v-112h111z" />
+<glyph unicode="&#x22d6;" d="M670 -24l-590 258v40l590 260v-88l-436 -192l436 -190v-88zM625 254q0 -31 -22 -53.5t-53 -22.5q-32 0 -54.5 22.5t-22.5 53.5t22.5 53.5t54.5 22.5q31 0 53 -22.5t22 -53.5z" />
+<glyph unicode="&#x22d7;" d="M670 234l-590 -258v88l436 190l-436 192v88l590 -260v-40zM277 254q0 -31 -22.5 -53.5t-54.5 -22.5q-31 0 -53 22.5t-22 53.5t22 53.5t53 22.5q32 0 54.5 -22.5t22.5 -53.5z" />
+<glyph unicode="&#x22d8;" horiz-adv-x="1336" d="M630 -24l-590 258v40l590 260v-88l-436 -192l436 -190v-88zM963 -24l-590 258v40l590 260v-88l-436 -192l436 -190v-88zM1296 -24l-590 258v40l590 260v-88l-436 -192l436 -190v-88z" />
+<glyph unicode="&#x22d9;" horiz-adv-x="1336" d="M630 234l-590 -258v88l436 190l-436 192v88l590 -260v-40zM963 234l-590 -258v88l436 190l-436 192v88l590 -260v-40zM1296 234l-590 -258v88l436 190l-436 192v88l590 -260v-40z" />
+<glyph unicode="&#x22da;" d="M670 358l-590 258v40l590 260v-88l-436 -192l436 -190v-88zM670 -150l-590 -258v88l436 190l-436 192v88l590 -260v-40zM670 210h-590v88h590v-88z" />
+<glyph unicode="&#x22db;" d="M670 -408l-590 258v40l590 260v-88l-436 -192l436 -190v-88zM670 616l-590 -258v88l436 190l-436 192v88l590 -260v-40zM670 210h-590v88h590v-88z" />
+<glyph unicode="&#x22dc;" d="M670 539h-590v88h590v-88zM670 -120l-590 260v40l590 258v-88l-436 -190l436 -192v-88z" />
+<glyph unicode="&#x22dd;" d="M670 539h-590v88h590v-88zM670 140l-590 -260v88l436 192l-436 190v88l590 -258v-40z" />
+<glyph unicode="&#x22de;" d="M670 -17v-121q-94 98 -227 154.5t-279 70.5l-84 8v88l84 8q146 14 279 70.5t227 154.5v-121q-107 -98 -299 -156q192 -58 299 -156zM670 645v-121q-94 -86 -265 -145q-137 -47 -325 -55v88l84 8q146 14 278.5 70.5t227.5 154.5z" />
+<glyph unicode="&#x22df;" d="M670 95l-84 -8q-146 -14 -279 -70.5t-227 -154.5v121q107 98 299 156q-192 58 -299 156v121q94 -98 227 -154.5t279 -70.5l84 -8v-88zM670 412v-88q-188 8 -325 55q-171 59 -265 145v121q95 -98 227.5 -154.5t278.5 -70.5z" />
+<glyph unicode="&#x22e0;" d="M670 -17v-121q-129 132 -324 190l-76 -251h-73l81 268q-57 12 -114 18l-84 8v88q123 -5 224 -27l38 126q-83 24 -178 34l-84 8v88l84 8q127 13 236 53l79 262h73l-68 -225q112 57 186 135v-121q-79 -72 -221 -129l-14 -49q149 -55 235 -134v-121q-106 109 -262 168 l-36 -120l17 -5q11 -4 16 -6q171 -59 265 -145z" />
+<glyph unicode="&#x22e1;" d="M670 95l-84 -8q-129 -12 -247 -57l-69 -229h-73l57 190q-99 -53 -174 -129v121q79 72 209 124l46 150q-154 -61 -255 -166v121q105 96 287 152l2 7q-189 60 -289 153v121q122 -127 315 -187l84 277h73l-89 -295q55 -13 123 -20l84 -8v-88l-84 -8q-84 -7 -170 -32 l-45 -147q127 38 299 46v-88z" />
+<glyph unicode="&#x22e2;" d="M663 -93h-390l-55 -148h-71l55 148h-115v88h148l34 90h-182v559h390l55 148h71l-55 -148h115v-88h-148l-143 -383h291v-88h-323l-34 -90h357v-88zM444 556h-269v-383h126z" />
+<glyph unicode="&#x22e3;" d="M663 -93h-390l-55 -148h-71l55 148h-115v88h148l34 90h-182v88h214l143 383h-357v88h390l55 148h71l-55 -148h115v-559h-323l-34 -90h357v-88zM575 173v383h-60l-143 -383h203z" />
+<glyph unicode="&#x22e6;" d="M667 132l-590 260v40l590 258v-88l-436 -190l436 -192v-88zM628 60h54q-5 -94 -53.5 -159t-125.5 -65q-51 0 -122 42l-39 -78h-77l58 115q-61 39 -88 39q-80 0 -114 -136h-54q6 87 52.5 155.5t121.5 68.5q52 0 125 -44l40 80h77l-59 -116q60 -38 90 -38q80 0 114 136z " />
+<glyph unicode="&#x22e7;" d="M667 392l-590 -260v88l436 192l-436 190v88l590 -258v-40zM628 60h54q-5 -94 -53.5 -159t-125.5 -65q-51 0 -122 42l-39 -78h-77l58 115q-61 39 -88 39q-80 0 -114 -136h-54q6 87 52.5 155.5t121.5 68.5q52 0 125 -44l40 80h77l-59 -116q60 -38 90 -38q80 0 114 136z" />
+<glyph unicode="&#x22e8;" d="M670 243v-121q-94 98 -227 154.5t-279 70.5l-84 8v88l84 8q146 14 279 70.5t227 154.5v-121q-107 -98 -299 -156q192 -58 299 -156zM628 73h54q-5 -94 -53.5 -159t-125.5 -65q-51 0 -122 42l-39 -78h-77l58 115q-61 39 -88 39q-80 0 -114 -136h-54q6 87 52.5 155.5 t121.5 68.5q52 0 125 -44l40 80h77l-59 -116q60 -38 90 -38q80 0 114 136z" />
+<glyph unicode="&#x22e9;" d="M670 355l-84 -8q-146 -14 -279 -70.5t-227 -154.5v121q107 98 299 156q-192 58 -299 156v121q94 -98 227 -154.5t279 -70.5l84 -8v-88zM628 73h54q-5 -94 -53.5 -159t-125.5 -65q-51 0 -122 42l-39 -78h-77l58 115q-61 39 -88 39q-80 0 -114 -136h-54q6 87 52.5 155.5 t121.5 68.5q52 0 125 -44l40 80h77l-59 -116q60 -38 90 -38q80 0 114 136z" />
+<glyph unicode="&#x22ea;" d="M669 -24l-299 141l-70 -232h-73l79 263l-225 106l300 143l69 228h73l-56 -187l202 96v-558zM581 115v280l-149 -71l-36 -122zM347 283l-61 -29l46 -22z" />
+<glyph unicode="&#x22eb;" d="M669 254l-301 -142l-68 -227h-73l56 187l-202 -96v558l299 -142l70 233h73l-79 -264zM464 254l-46 22l-16 -51zM354 307l-185 88v-280l148 70z" />
+<glyph unicode="&#x22ec;" d="M669 -113h-364l-35 -115h-73l35 115h-151v88h177l75 247l-252 119l336 160l63 210h73l-51 -170l167 80v-558l-272 129l-66 -217h338v-88zM581 202v280l-113 -54l-46 -151zM382 387l-96 -46l72 -34z" />
+<glyph unicode="&#x22ed;" d="M669 -113h-364l-35 -115h-73l35 115h-151v88h177l61 200l-238 -112v558l325 -155l74 245h73l-83 -275l199 -95l-265 -125l-73 -241h338v-88zM464 341l-20 9l-6 -21zM381 381l-212 101v-280l184 87z" />
+<glyph unicode="&#x22ee;" horiz-adv-x="584" d="M375 593q0 -35 -25 -60t-60 -25t-60 25t-25 60t25 60t60 25t60 -25t25 -60zM375 252q0 -35 -25 -60t-60 -25t-60 25t-25 60t25 60t60 25t60 -25t25 -60zM375 -89q0 -35 -25 -60t-60 -25t-60 25t-25 60t25 60t60 25t60 -25t25 -60z" />
+<glyph unicode="&#x22ef;" horiz-adv-x="977" d="M914 266q0 -35 -25 -60t-60 -25t-60 25t-25 60t25 60t60 25t60 -25t25 -60zM573 266q0 -35 -25 -60t-60 -25t-60 25t-25 60t25 60t60 25t60 -25t25 -60zM232 266q0 -35 -25 -60t-60 -25t-60 25t-25 60t25 60t60 25t60 -25t25 -60z" />
+<glyph unicode="&#x22f0;" horiz-adv-x="977" d="M815 494q0 -35 -25 -60t-60 -25t-60 25t-25 60t25 60t60 25t60 -25t25 -60zM573 252q0 -35 -25 -60t-60 -25t-60 25t-25 60t25 60t60 25t60 -25t25 -60zM332 10q0 -35 -25 -60t-60 -25t-60 25t-25 60t25 60t60 25t60 -25t25 -60z" />
+<glyph unicode="&#x22f1;" horiz-adv-x="977" d="M332 494q0 -35 -25 -60t-60 -25t-60 25t-25 60t25 60t60 25t60 -25t25 -60zM573 252q0 -35 -25 -60t-60 -25t-60 25t-25 60t25 60t60 25t60 -25t25 -60zM815 10q0 -35 -25 -60t-60 -25t-60 25t-25 60t25 60t60 25t60 -25t25 -60z" />
+<glyph unicode="&#x22f6;" d="M668 -13h-298q-128 0 -208 81t-80 199q0 119 80.5 199.5t210.5 80.5h295v-88h-311q-64 0 -115.5 -42t-66.5 -106h493v-88h-493q15 -64 66.5 -106t116.5 -42h310v-88zM668 647h-576v88h576v-88z" />
+<glyph unicode="&#x22fd;" d="M82 547h295q130 0 210.5 -80.5t80.5 -199.5q0 -118 -80 -199t-208 -81h-298v88h310q65 0 116.5 42t66.5 106h-493v88h493q-15 64 -66.5 106t-115.5 42h-311v88zM658 647h-576v88h576v-88z" />
+<glyph unicode="&#x2302;" horiz-adv-x="926" d="M871 0h-816v408l408 366l408 -366v-408zM783 88v284l-320 289l-320 -289v-284h640z" />
+<glyph unicode="&#x2308;" horiz-adv-x="469" d="M459 676h-131q-40 0 -50 -13.5t-10 -68.5v-787h-104v924h295v-55z" />
+<glyph unicode="&#x2309;" horiz-adv-x="469" d="M305 -193h-104v787q0 55 -10 68.5t-51 13.5h-130v55h295v-924z" />
+<glyph unicode="&#x230a;" horiz-adv-x="469" d="M459 -193h-295v925h104v-788q0 -55 10 -68.5t51 -13.5h130v-55z" />
+<glyph unicode="&#x230b;" horiz-adv-x="469" d="M305 -193h-295v55h131q40 0 50 13.5t10 68.5v788h104v-925z" />
+<glyph unicode="&#x2310;" d="M685 311h-532v-203h-88v291h620v-88z" />
+<glyph unicode="&#x2319;" d="M685 108h-620v291h88v-203h532v-88z" />
+<glyph unicode="&#x2322;" horiz-adv-x="1026" d="M990 159l-22 -30q-186 135 -451 135q-146 0 -251 -30t-206 -105l-23 31q100 102 226 160t258 58q121 0 234 -55.5t235 -163.5z" />
+<glyph unicode="&#x2323;" horiz-adv-x="1026" d="M967 378l23 -31q-100 -102 -226 -160t-258 -58q-121 0 -234 55.5t-235 163.5l22 30q186 -135 451 -135q146 0 251 30t206 105z" />
+<glyph unicode="&#x2329;" horiz-adv-x="445" d="M399 -193h-100l-230 455v15l226 455h100l-230 -462z" />
+<glyph unicode="&#x232a;" horiz-adv-x="445" d="M376 262l-230 -455h-100l234 463l-230 462h100l226 -455v-15z" />
+<glyph unicode="&#x2336;" horiz-adv-x="926" d="M841 -156h-756v66h333v775h-333v66h756l-1 -66h-334v-775h335v-66z" />
+<glyph unicode="&#x233d;" horiz-adv-x="924" d="M506 694v-62q143 -17 240.5 -125.5t97.5 -254.5t-97.5 -254.5t-240.5 -125.5v-62h-88v62q-143 17 -240.5 125.5t-97.5 254.5t97.5 254.5t240.5 125.5v62h88zM506 543v-582q107 16 178.5 98.5t71.5 192.5t-71.5 192.5t-178.5 98.5zM418 -39v582q-107 -16 -178.5 -98.5 t-71.5 -192.5t71.5 -192.5t178.5 -98.5z" />
+<glyph unicode="&#x233f;" horiz-adv-x="728" d="M673 222h-274l-149 -422h-96l150 422h-249v88h280l151 422h96l-151 -422h242v-88z" />
+<glyph unicode="&#x23af;" horiz-adv-x="315" d="M315 209h-315v88h315v-88z" />
+<glyph unicode="&#x2423;" horiz-adv-x="500" d="M460 -120h-420v151h42v-76h336v76h42v-151z" />
+<glyph unicode="&#x2460;" horiz-adv-x="695" d="M469 141h-241v26q48 1 62 10t14 40v203q0 31 -23 31q-18 0 -56 -13v27l165 59h10v-312q0 -27 12.5 -35.5t56.5 -9.5v-26zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338 q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x2461;" horiz-adv-x="695" d="M496 265l-33 -125h-263v23q108 95 147 146q32 42 32 74q0 26 -19.5 43.5t-55.5 17.5q-53 0 -75 -48h-24q48 121 146 121q52 0 84 -28t32 -75q0 -65 -73 -121l-90 -70h70q50 0 70.5 7.5t27.5 34.5h24zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5 q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x2462;" horiz-adv-x="695" d="M235 416l-20 12q55 89 149 89q46 0 75 -23t29 -55q0 -43 -38 -66q62 -29 62 -95q0 -61 -54.5 -102.5t-136.5 -41.5q-43 0 -69.5 15t-26.5 39q0 17 11.5 28t29.5 11q28 0 61 -32q23 -21 51 -21t45 16t17 42q0 36 -31 59q-22 17 -97 39v22q80 20 80 62q0 48 -60 48 q-25 0 -41.5 -10.5t-35.5 -35.5zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5 t85 216.5z" />
+<glyph unicode="&#x2463;" horiz-adv-x="695" d="M483 217h-40v-76h-96v76h-158v68l202 232h52v-231h40v-69zM347 286v141l-120 -141h120zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5 q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x2464;" horiz-adv-x="695" d="M496 516l-31 -80h-179l-11 -33q68 -4 94 -10q53 -13 82.5 -45t29.5 -77q0 -62 -51 -99.5t-133 -37.5q-43 0 -69.5 15.5t-26.5 38.5q0 17 11.5 28t28.5 11q30 0 66 -26q29 -21 58 -21q28 0 47 14t19 36q0 23 -25 44.5t-68 30.5q-31 7 -120 11l67 200h211zM695 335 q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x2465;" horiz-adv-x="695" d="M486 517v-26q-130 -23 -166 -123q25 8 50 8q55 0 87.5 -30t32.5 -81q0 -59 -38 -95t-99 -36q-68 0 -108.5 43t-40.5 115q0 100 86 160t196 65zM393 235q0 59 -12.5 82t-43.5 23q-19 0 -26 -14t-7 -50q0 -28 1 -43.5t5.5 -34.5t15 -27.5t28.5 -8.5q20 0 29.5 15.5 t9.5 57.5zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x2466;" horiz-adv-x="695" d="M502 517l-161 -383h-65l132 296h-120q-32 0 -46.5 -10t-24.5 -37h-24l33 134h276zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89 t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x2467;" horiz-adv-x="695" d="M496 241q0 -50 -42 -78.5t-112 -28.5q-61 0 -98 26t-37 71q0 68 80 90q-39 22 -56 44.5t-17 53.5q0 44 38.5 71t104.5 27q57 0 90.5 -23.5t33.5 -59.5q0 -54 -74 -77q89 -53 89 -116zM405 431q0 25 -15 41.5t-41 16.5q-23 0 -38 -10.5t-15 -26.5q0 -40 84 -77 q25 29 25 56zM400 214q0 26 -16.5 44t-67.5 46q-33 -40 -33 -71q0 -33 16 -52t44 -19q26 0 41.5 13.5t15.5 38.5zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5 t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x2468;" horiz-adv-x="695" d="M208 134v26q127 22 167 124q-21 -9 -52 -9q-53 0 -85.5 31t-32.5 84q0 54 38.5 90.5t98.5 36.5q67 0 108 -44t41 -118q0 -67 -43.5 -118t-106 -75.5t-133.5 -27.5zM391 386q0 33 -2.5 52t-14 35t-34.5 16q-22 1 -30 -13.5t-8 -56.5q0 -58 12 -83t42 -25q12 0 20 6.5 t11 20t3.5 23t0.5 25.5zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z " />
+<glyph unicode="&#x24b6;" horiz-adv-x="695" d="M548 141h-190v26q45 4 45 13q0 16 -25 67h-131l-10 -23q-12 -27 -12 -41q0 -13 45 -16v-26h-124v26q23 4 35 15t27 46l129 296h13l131 -284q22 -48 33 -60.5t34 -12.5v-26zM364 279l-52 117h-1l-51 -117h104zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5 t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24b7;" horiz-adv-x="695" d="M169 517h189q71 0 109.5 -24t38.5 -69q0 -60 -66 -81q39 -10 62.5 -35t23.5 -60q0 -47 -42.5 -77t-119.5 -30h-195v26q32 4 42 10.5t10 25.5v251q0 19 -11 27t-41 10v26zM317 462v-107q54 0 73 14.5t19 51.5q0 64 -59 64q-33 0 -33 -23zM317 323v-121q0 -29 37 -29 q70 0 70 75t-92 75h-15zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z " />
+<glyph unicode="&#x24b8;" horiz-adv-x="695" d="M524 236l24 -17q-46 -48 -87.5 -66.5t-97.5 -18.5q-98 0 -155 52.5t-57 135.5q0 88 58.5 145t152.5 57q38 0 94 -19q18 -7 27 -7q18 0 29 24h19v-137h-22q-16 46 -53 76.5t-86 30.5q-50 0 -82 -42t-32 -116q0 -162 125 -162q43 0 72.5 14.5t70.5 49.5zM695 335 q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24b9;" horiz-adv-x="695" d="M146 517h186q102 0 159 -49t57 -135q0 -90 -62 -141t-156 -51h-184v26q50 1 50 33v261q0 15 -10.5 21.5t-39.5 8.5v26zM292 468v-267q0 -15 7.5 -21.5t27.5 -6.5q66 0 91 39t27 113q2 160 -121 160q-32 0 -32 -17zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5 t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24ba;" horiz-adv-x="695" d="M527 265l-26 -124h-336v26q30 4 40 10.5t10 23.5v257q0 17 -10.5 24t-39.5 8v26h333v-121h-21q-4 53 -31 71t-98 18q-22 0 -29.5 -5t-7.5 -17v-114q48 0 68 17t24 63h21v-194h-21q-4 47 -24 64.5t-68 17.5v-120q0 -14 9.5 -18.5t37.5 -4.5q71 0 100 23q22 17 49 69h20z M695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24bb;" horiz-adv-x="695" d="M527 395h-21q-7 30 -15 43.5t-26 26.5q-25 19 -94 19q-44 0 -44 -21v-115q48 0 69.5 17.5t28.5 62.5h21v-194h-21q-5 46 -27.5 64t-70.5 18v-115q0 -19 13.5 -26t56.5 -8v-26h-221v26q34 4 44.5 10.5t10.5 25.5v253q0 19 -11.5 25.5t-43.5 8.5v26h351v-121zM695 335 q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24bc;" horiz-adv-x="695" d="M548 310v-27q-30 -3 -39 -13t-9 -33v-69q-60 -34 -154 -34q-91 0 -148 52.5t-57 139.5q0 83 58.5 141t141.5 58q37 0 85 -19q17 -7 24 -7q16 0 26 24h17v-138h-19q-34 108 -125 108q-46 0 -74.5 -42.5t-28.5 -120.5q0 -165 114 -165q53 0 53 43v42q0 18 -11 25t-46 8v27 h192zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24bd;" horiz-adv-x="695" d="M544 141h-181v26q27 4 35 10t8 23v116h-117v-116q0 -17 8 -23t35 -10v-26h-180v26q26 4 33.5 10t7.5 23v257q0 18 -8.5 25t-32.5 9v26h180v-26q-26 -2 -34.5 -8.5t-8.5 -25.5v-103h117v103q0 19 -8.5 25.5t-34.5 8.5v26h181v-26q-25 -2 -33.5 -9t-8.5 -25v-257 q0 -17 8 -23t34 -10v-26zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z " />
+<glyph unicode="&#x24be;" horiz-adv-x="695" d="M442 141h-190v26q28 3 37 10t9 27v253q0 18 -9.5 25t-36.5 9v26h190v-26q-28 -1 -38 -8.5t-10 -25.5v-253q0 -21 9.5 -28t38.5 -9v-26zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338 q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24bf;" horiz-adv-x="695" d="M482 517v-26q-27 -2 -35.5 -10t-8.5 -31v-204q0 -55 -33 -83.5t-88 -28.5q-95 0 -95 72q0 17 12.5 29t27.5 12t27 -10t12 -28q0 -11 -6 -19.5t-6 -11.5q0 -14 21 -14q32 0 32 38v259q0 17 -10 22.5t-40 7.5v26h190zM695 335q0 -150 -100 -252t-246 -102 q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24c0;" horiz-adv-x="695" d="M557 141h-181v26q38 1 38 5q0 7 -10 20l-99 123l-14 -14v-103q0 -15 9 -21t38 -10v-26h-190v26q30 3 38.5 9.5t8.5 25.5v253q0 21 -9.5 27.5t-37.5 8.5v26h190v-26q-29 -2 -38 -10t-9 -29v-112l115 115q21 21 21 26t-26 8l-19 2v26h158v-26q-45 -6 -74 -24t-98 -90 l163 -200q5 -9 26 -10v-26zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5 z" />
+<glyph unicode="&#x24c1;" horiz-adv-x="695" d="M527 278l-25 -137h-309v26q28 4 36 10t8 23v257q0 19 -9 26t-35 8v26h192v-26q-34 -2 -43 -10t-9 -37v-247q0 -14 9.5 -19t34.5 -5q51 0 84 31q28 25 47 74h19zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101 q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24c2;" horiz-adv-x="695" d="M566 141h-181v26q27 3 35 10.5t8 28.5v254l-114 -319h-9l-102 323v-247q0 -27 9.5 -37.5t38.5 -12.5v-26h-121v26q28 4 35.5 10.5t7.5 28.5v251q0 18 -8 25t-34 9v26h129l75 -255h1l89 255h141v-26q-26 -2 -34 -11t-8 -35v-230q0 -27 7.5 -36t34.5 -12v-26zM695 335 q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24c3;" horiz-adv-x="695" d="M533 516v-26q-26 -4 -33 -10.5t-7 -26.5v-319h-23l-233 293v-207q0 -26 9.5 -36t38.5 -14v-26h-122v26q28 4 36 11t8 27v249q-17 33 -43 33v26h114l185 -231v155q0 28 -9 37.5t-38 12.5v26h117zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5 q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24c4;" horiz-adv-x="695" d="M552 328q0 -85 -58.5 -139.5t-147.5 -54.5q-88 0 -146 54.5t-58 138.5q0 87 59.5 142t148.5 55q86 0 144 -55.5t58 -140.5zM447 325q0 81 -26.5 124t-75.5 43q-47 0 -72.5 -43t-25.5 -124q0 -159 100 -159t100 159zM695 335q0 -150 -100 -252t-246 -102 q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24c5;" horiz-adv-x="695" d="M179 517h178q68 0 108.5 -27t40.5 -78q0 -110 -155 -110q-11 0 -31 2v-97q0 -23 8 -30t38 -10v-26h-187v26q25 2 35 12.5t10 35.5v230q0 27 -8.5 35.5t-36.5 10.5v26zM320 473v-137q49 0 69.5 17.5t20.5 53.5q0 41 -15 59.5t-48 18.5q-27 0 -27 -12zM695 335 q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24c6;" horiz-adv-x="695" d="M485 111l6 -26q-53 -20 -91 -20q-31 0 -64.5 18.5t-53.5 59.5q-65 18 -102.5 66.5t-37.5 114.5q0 90 58 145t147 55t147 -55.5t58 -146.5q0 -71 -38 -117.5t-106 -63.5q14 -35 47 -35q12 0 30 5zM447 327q0 165 -101 165q-48 0 -73.5 -42t-25.5 -123q0 -160 100 -160 t100 160zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24c7;" horiz-adv-x="695" d="M535 141h-104l-117 169h-15v-100q0 -25 7.5 -31.5t37.5 -11.5v-26h-187v26q31 4 38.5 11t7.5 34v232q0 27 -8.5 36t-37.5 11v26h172q77 0 119 -25t42 -73q0 -75 -75 -101l98 -141q5 -10 22 -10v-26zM299 467v-126q52 1 73.5 17t21.5 55q0 72 -68 72q-27 0 -27 -18z M695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24c8;" horiz-adv-x="695" d="M478 395h-21q-5 43 -38.5 69.5t-78.5 26.5q-29 0 -47 -14.5t-18 -34.5q0 -9 6 -17t18.5 -15t22 -11.5t28 -12t24.5 -10.5q26 -11 43.5 -21t37.5 -25.5t30.5 -36.5t10.5 -47q0 -51 -43 -81.5t-111 -30.5q-31 0 -64.5 9t-38.5 9q-15 0 -20 -18h-19v144h21q12 -113 122 -113 q34 0 55 14.5t21 38.5q0 7 -3.5 13.5t-11.5 13t-14.5 11t-19.5 10.5l-19 10q-6 3 -21.5 9.5t-17.5 7.5q-55 24 -81 49.5t-26 66.5q0 53 37 83t98 30q29 0 60.5 -8.5t37.5 -8.5q15 0 21 17h19v-127zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5 q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24c9;" horiz-adv-x="695" d="M527 396h-21q-8 49 -31.5 69t-77.5 21v-276q0 -26 9.5 -33.5t47.5 -9.5v-26h-210v26q38 3 47.5 10.5t9.5 32.5v276q-55 -1 -78.5 -21t-31.5 -69h-21l4 121h349zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101 q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24ca;" horiz-adv-x="695" d="M533 517v-26q-25 -4 -32.5 -11t-7.5 -27v-165q0 -73 -38 -110t-107 -37q-68 0 -109 34t-41 100v172q0 27 -7.5 34.5t-35.5 9.5v26h188v-26q-31 -2 -40 -10t-9 -36v-166q0 -100 75 -100q94 0 94 110v157q0 24 -10.5 33.5t-39.5 11.5v26h120zM695 335q0 -150 -100 -252 t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24cb;" horiz-adv-x="695" d="M548 517v-26q-24 -3 -33 -9.5t-19 -29.5l-138 -311h-12l-151 317q-9 19 -17.5 24.5t-31.5 8.5v26h195v-26l-19 -1q-31 -1 -31 -13q0 -8 13 -35l80 -171h2l74 168q12 26 12 35q0 8 -8.5 11.5t-39.5 5.5v26h124zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5 t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24cc;" horiz-adv-x="695" d="M566 517v-26q-24 -3 -33 -31l-93 -319h-10l-77 255l-86 -255h-10l-97 321q-5 16 -10 21.5t-20 7.5v26h132v-26q-29 -2 -29 -16q0 -1 4 -21l52 -177l53 155l-14 44q-4 13 -33 15v26h141v-26q-33 -3 -33 -13l7 -28l48 -170l51 174q0 2 1.5 8t1.5 8q0 17 -29 21v26h83z M695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24cd;" horiz-adv-x="695" d="M527 141h-178v26q42 3 42 12q0 6 -11 23l-53 87l-20 -26q-49 -63 -49 -80q0 -12 42 -16v-26h-130v26q20 2 30.5 8t21.5 20l90 117l-100 150q-11 17 -18.5 22.5t-23.5 6.5v26h181v-26q-41 -2 -41 -12q0 -3 8 -16l48 -79l34 43q28 39 28 49q0 7 -7 10t-30 5v26h130v-26 q-30 -3 -45.5 -14.5t-49.5 -57.5l-44 -59l94 -149q18 -29 27 -36t24 -8v-26zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214 q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24ce;" horiz-adv-x="695" d="M533 517v-26q-29 0 -40 -18l-98 -167v-93q0 -27 8 -35t39 -11v-26h-191v26q31 3 39.5 12.5t8.5 36.5v70l-93 175q-15 28 -43 30v26h173v-26l-14 -1q-28 -1 -28 -10q0 -6 13 -28l70 -119h4l53 90q20 34 20 52q0 8 -6.5 11t-31.5 5v26h117zM695 335q0 -150 -100 -252 t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24cf;" horiz-adv-x="695" d="M527 284l-18 -143h-340v19l219 325h-39q-72 0 -97 -17t-44 -76h-22l16 125h306v-19l-216 -325h42q83 0 113 20q24 16 34.5 33.5t24.5 57.5h21zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252z M643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24d0;" horiz-adv-x="695" d="M480 240l10 -18q-41 -37 -78 -37q-21 0 -28 8t-14 32q-54 -40 -101 -40q-67 0 -67 64q0 44 42 66q42 24 125 42v30q0 24 -12 35t-40 11q-39 0 -39 -15q0 -1 10 -12t10 -23q0 -17 -10 -28t-29 -11q-20 0 -31.5 11.5t-11.5 31.5q0 35 30 54.5t85 19.5q118 0 118 -78v-142 q0 -8 11 -8q13 0 20 7zM369 256v70q-79 -18 -79 -60q0 -29 34 -29q29 0 45 19zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89 t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24d1;" horiz-adv-x="695" d="M305 517v-140q31 33 74 33q54 0 83.5 -36.5t29.5 -97.5q0 -65 -36.5 -104t-101.5 -39q-37 0 -80 33l-36 -33h-13v333q0 12 -6.5 16.5t-29.5 9.5v25h116zM305 339v-139q0 -37 41 -37q35 0 46.5 23.5t11.5 79.5q0 54 -11 78t-41 24q-23 0 -47 -29zM695 335 q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24d2;" horiz-adv-x="695" d="M461 263l19 -15q-31 -34 -60.5 -48.5t-67.5 -14.5q-61 0 -94.5 36t-33.5 98q0 64 39 103t104 39q40 0 70 -18.5t30 -46.5q0 -42 -41 -42q-36 0 -36 47q0 18 -5.5 25t-25.5 7q-25 0 -40 -23t-15 -63q0 -53 24.5 -83t67.5 -30q35 0 65 29zM695 335q0 -150 -100 -252 t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24d3;" horiz-adv-x="695" d="M503 178v-26q-69 -7 -117 -18v37q-41 -38 -87 -38q-51 0 -80.5 37t-29.5 97q0 64 32 103.5t85 39.5q40 0 78 -35v92q0 14 -8 18.5t-41 6.5v25h129v-314q0 -14 8 -19t31 -6zM384 209v127q-13 30 -51 30q-56 0 -56 -95q0 -93 51 -93q37 0 56 31zM695 335q0 -150 -100 -252 t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24d4;" horiz-adv-x="695" d="M457 275l20 -13q-33 -45 -61 -61t-69 -16q-58 0 -90.5 37.5t-32.5 97.5q0 65 33 103t93 38q116 0 119 -135h-162q2 -20 5.5 -33.5t11.5 -27.5t23 -21t38 -7q34 0 72 38zM304 358h88q-1 20 -2 29.5t-5 22.5t-12.5 18t-22.5 5q-45 0 -46 -75zM695 335q0 -150 -100 -252 t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24d5;" horiz-adv-x="695" d="M232 402h37q0 62 25 92t84 30q41 0 64.5 -16.5t23.5 -43.5q0 -41 -35 -41q-17 0 -27.5 10.5t-10.5 26.5q0 11 7 19.5t7 10.5q0 6 -20 6q-38 0 -38 -37v-57h56v-37h-56v-159q0 -23 10 -30.5t44 -8.5v-26h-171v26q22 1 29.5 7t7.5 20v171h-37v37zM695 335q0 -150 -100 -252 t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24d6;" horiz-adv-x="695" d="M346 300h35q53 0 82 -19.5t29 -53.5q0 -43 -43 -68t-124 -25q-124 0 -124 57q0 34 40 45q-31 15 -31 44q0 46 58 65q-61 25 -61 82q0 44 35 70t94 26q29 0 68 -12h87v-43h-42q15 -18 15 -47q0 -51 -36.5 -68.5t-102.5 -17.5q-43 0 -43 -21q0 -8 12.5 -11t51.5 -3z M381 428q0 35 -10.5 50.5t-34.5 15.5q-23 0 -32 -15t-9 -52q0 -35 9 -49t32 -14q24 0 34.5 14t10.5 50zM387 220h-100q-15 0 -21 -8t-6 -16q0 -33 83 -33q47 0 71.5 9.5t24.5 22.5q0 25 -52 25zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5 q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24d7;" horiz-adv-x="695" d="M507 141h-142v26q30 3 30 27v120q0 25 -7.5 35.5t-26.5 10.5q-35 0 -57 -27v-139q0 -13 7 -19t25 -8v-26h-147v26q24 3 29.5 7.5t5.5 21.5v268q0 15 -6 19t-29 8v26h115v-151q45 44 96 44q75 0 75 -81v-134q0 -28 32 -28v-26zM695 335q0 -150 -100 -252t-246 -102 q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24d8;" horiz-adv-x="695" d="M398 509q0 -21 -13.5 -34.5t-35.5 -13.5t-35 13.5t-13 34.5q0 22 13 35.5t36 13.5q21 0 34.5 -13.5t13.5 -35.5zM423 155h-149v26q24 5 30 10t6 20v164q0 14 -7 20t-30 10v26h117v-222q0 -14 7.5 -20t25.5 -8v-26zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5 t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24d9;" horiz-adv-x="695" d="M438 539q0 -21 -13.5 -34.5t-34.5 -13.5q-22 0 -35.5 13.5t-13.5 34.5t13.5 35t34.5 14t35 -14.5t14 -34.5zM429 461v-259q0 -122 -107 -122q-41 0 -67 17.5t-26 45.5q0 18 11.5 30t29.5 12q17 0 28.5 -10.5t11.5 -25.5q0 -9 -4 -16t-8 -10.5t-4 -4.5q0 -8 22 -8 q33 0 33 37v262q0 13 -9 18.5t-35 7.5v26h124zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88 q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24da;" horiz-adv-x="695" d="M513 141h-148v26q27 0 27 4q0 2 -15 20l-63 73l-15 -13v-58q0 -15 5.5 -19t28.5 -7v-26h-146v26q32 1 32 26v272q0 25 -32 26v26h112v-231l78 63q20 17 20 21t-12 5q-14 0 -27 2v26h136v-26q-32 -4 -53.5 -16t-67.5 -52l123 -136q6 -6 17 -6v-26zM695 335 q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24db;" horiz-adv-x="695" d="M421 141h-146v26q33 2 33 28v267q0 27 -34 29v26h114v-322q0 -28 33 -28v-26zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89 t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24dc;" horiz-adv-x="695" d="M578 185h-136v26q15 1 21 6.5t6 18.5v129q0 46 -31 46q-28 0 -49 -28v-147q0 -12 5.5 -18t20.5 -7v-26h-133v26q15 1 21 6.5t6 18.5v135q0 40 -31 40q-27 0 -49 -30v-145q0 -12 5.5 -18t19.5 -7v-26h-137v26q19 3 25.5 8.5t6.5 18.5v161q0 15 -6 20.5t-26 8.5v26h109v-41 h4q32 48 81 48q50 0 75 -51h1q25 29 43 40t41 11q36 0 57 -23t21 -63v-139q0 -14 6 -19t23 -6v-26zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5 q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24dd;" horiz-adv-x="695" d="M497 185h-134v26q26 3 26 26v133q0 41 -29 41q-23 0 -51 -28v-146q0 -13 6 -19t22 -7v-26h-139v26q20 4 25.5 9t5.5 18v163q0 14 -6 19t-25 8v26h110v-43h1q30 50 81 50q36 0 57.5 -23t21.5 -63v-138q0 -14 6 -19.5t22 -6.5v-26zM695 335q0 -150 -100 -252t-246 -102 q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24de;" horiz-adv-x="695" d="M492 322q0 -59 -41 -98t-105 -39q-62 0 -103 38.5t-41 98.5q0 63 41 101t106 38q62 0 102.5 -39t40.5 -100zM404 317q0 64 -13.5 90t-43.5 26q-31 0 -44 -25.5t-13 -90.5q0 -104 57 -104q29 0 43 24t14 80zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5 t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24df;" horiz-adv-x="695" d="M308 516v-40q32 47 78 47q47 0 80 -33t33 -96q0 -68 -33 -108t-92 -40q-30 0 -64 30v-59q0 -25 11 -37t39 -13v-26h-167v26q23 4 30 9.5t7 18.5v267q0 14 -7 19.5t-29 8.5v26h114zM310 431v-105q0 -15 15 -26t30 -11q29 0 42.5 22.5t13.5 74.5q0 93 -50 93 q-18 0 -34.5 -14t-16.5 -34zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5 t85 216.5z" />
+<glyph unicode="&#x24e0;" horiz-adv-x="695" d="M501 141h-164v26q31 4 39.5 12.5t8.5 32.5v68q-31 -34 -71 -34q-52 0 -85.5 35.5t-33.5 96.5q0 63 36.5 104.5t101.5 41.5q45 0 77 -32l46 32h9v-331q0 -12 7 -17t29 -9v-26zM385 314v139q0 19 -12.5 31t-29.5 12q-60 0 -60 -108q0 -99 61 -99q17 0 29 6.5t12 18.5z M695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24e1;" horiz-adv-x="695" d="M334 454v-47q42 54 88 54q24 0 39.5 -14t15.5 -36q0 -20 -12 -30.5t-31 -10.5q-10 0 -14.5 1t-11 5t-15.5 14q-10 10 -14 10q-18 0 -30 -14.5t-12 -36.5v-99q0 -23 9 -30.5t40 -8.5v-26h-166v26q22 3 29.5 8t7.5 18v162q0 15 -7.5 20.5t-29.5 8.5v26h114zM695 335 q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24e2;" horiz-adv-x="695" d="M445 370h-22q-5 30 -25 46q-24 17 -50 17q-18 0 -30.5 -8t-12.5 -19q0 -21 63 -42q49 -16 70 -37t21 -53q0 -39 -28 -64t-74 -25q-22 0 -51 8t-31 8q-13 0 -20 -16h-19v103h22q16 -75 88 -75q22 0 36 9.5t14 22.5q0 20 -64 42q-50 17 -72 38t-22 51q0 37 29.5 61t74.5 24 q16 0 39 -5.5t27 -5.5q13 0 18 11h19v-91zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88 q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24e3;" horiz-adv-x="695" d="M430 217l23 -12q-25 -42 -45 -56.5t-53 -14.5q-71 0 -71 68v177h-37v28q15 8 26.5 16.5t23.5 21.5t17 19t20 26l18 27h12v-99h66v-39h-66v-163q0 -28 27 -28q21 0 39 29zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101 q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24e4;" horiz-adv-x="695" d="M502 204l-118 -18v37q-30 -23 -46.5 -30.5t-42.5 -7.5q-81 0 -81 87v134q0 15 -6 20t-26 9v26h112v-191q0 -20 7.5 -28t26.5 -8q27 0 55 25v148q0 15 -8 20.5t-33 7.5v26h121v-203q0 -15 8.5 -21t30.5 -7v-26zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5 t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24e5;" horiz-adv-x="695" d="M502 461v-26q-17 -1 -23.5 -5t-14.5 -21l-109 -224h-14l-88 188q-30 62 -60 62v26h166v-26q-32 0 -32 -10q0 -7 9 -25l47 -97l48 99q7 16 7 22q0 11 -36 11v26h100zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101 q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24e6;" horiz-adv-x="695" d="M578 461v-26q-15 -2 -22 -7t-13 -18l-106 -225h-11l-71 176h-1l-86 -176h-12l-100 208q-12 24 -19 32t-21 10v26h150v-26q-25 -3 -25 -8q0 -6 8 -24l48 -103h1l43 92l-11 26q-7 16 -31 17v26h158v-26q-33 -3 -33 -10q0 -5 8 -29l33 -94h1l35 77q18 41 18 43q0 9 -33 13 v26h92zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24e7;" horiz-adv-x="695" d="M511 186h-168v26q31 1 31 7q0 5 -24 33l-28 34l-39 -43q-16 -19 -16 -24q0 -6 34 -7v-26h-117v26q21 1 36.5 11t42.5 40l41 45l-83 104q-16 19 -38 23v26h174v-26q-33 -1 -33 -5t12 -18l37 -42l44 42q8 8 8 16q0 3 -36 7v26h117v-26q-34 -5 -52 -24l-64 -65l94 -119 q11 -14 27 -15v-26zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24e8;" horiz-adv-x="695" d="M504 517v-26q-17 -2 -25.5 -8t-15.5 -20l-97 -220q-15 -35 -22.5 -49t-20.5 -31.5t-28.5 -23.5t-37.5 -6q-29 0 -47 14t-18 37q0 20 11 32t30 12q17 0 28.5 -9.5t11.5 -23.5q0 -2 -1 -5t-1 -4q0 -7 12 -7q18 0 27 12.5t28 55.5l-79 160q-2 5 -8 17l-9 18q-2 5 -7.5 15 t-9.5 14.5t-9.5 10t-11.5 7.5t-12 2v26h167v-26q-35 -2 -35 -9q0 -2 2.5 -8t6.5 -13.5t5 -9.5l48 -100l45 103q7 18 7 25q0 11 -36 12v26h102zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252z M643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24e9;" horiz-adv-x="695" d="M487 291l-13 -105h-265v25l156 219q-66 0 -89 -12t-31 -51h-24l5 94h258v-26l-155 -218h14q43 0 62 6.5t34 24.5q13 14 24 43h24zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338 q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24ea;" horiz-adv-x="695" d="M496 325q0 -85 -42.5 -138t-105.5 -53q-64 0 -106.5 52.5t-42.5 136.5q0 78 37.5 136t112.5 58q71 0 109 -58t38 -134zM391 263v124q0 55 -10.5 79.5t-34.5 24.5q-23 0 -32.5 -23.5t-9.5 -80.5v-124q0 -56 10 -79.5t34 -23.5t33.5 23.5t9.5 79.5zM695 335 q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x2500;" horiz-adv-x="708" d="M719 267h-730v73h730v-73z" />
+<glyph unicode="&#x2502;" horiz-adv-x="696" d="M385 -303h-73v1213h73v-1213z" />
+<glyph unicode="&#x250c;" horiz-adv-x="708" d="M720 267h-329v-570h-73v643h402v-73z" />
+<glyph unicode="&#x2510;" horiz-adv-x="708" d="M390 -303h-73v570h-328v73h401v-643z" />
+<glyph unicode="&#x2514;" horiz-adv-x="708" d="M720 267h-402v643h73v-570h329v-73z" />
+<glyph unicode="&#x2518;" horiz-adv-x="708" d="M390 267h-401v73h328v570l73 -1v-642z" />
+<glyph unicode="&#x251c;" horiz-adv-x="708" d="M720 267h-329v-570h-73v1213h73v-570h329v-73z" />
+<glyph unicode="&#x2524;" horiz-adv-x="708" d="M390 -303h-73v570h-328v73h328v570h73v-1213z" />
+<glyph unicode="&#x252c;" horiz-adv-x="708" d="M719 267h-329v-570h-73v570h-328v73h730v-73z" />
+<glyph unicode="&#x2534;" horiz-adv-x="708" d="M719 267h-730v73h328v570h73v-570h329v-73z" />
+<glyph unicode="&#x253c;" horiz-adv-x="708" d="M719 267h-329v-570h-73v570h-328v73h328v570h73v-570h329v-73z" />
+<glyph unicode="&#x2550;" horiz-adv-x="708" d="M719 174h-730v73h730v-73zM719 360h-730v73h730v-73z" />
+<glyph unicode="&#x2551;" horiz-adv-x="708" d="M298 -303h-73v1213h73v-1213zM484 -303h-74v1213h74v-1213z" />
+<glyph unicode="&#x2552;" horiz-adv-x="708" d="M720 174h-329v-477h-73v736h402v-73h-329v-113h329v-73z" />
+<glyph unicode="&#x2553;" horiz-adv-x="708" d="M720 267h-236v-570h-74v562h-112v-562h-73v643h495v-73z" />
+<glyph unicode="&#x2554;" horiz-adv-x="708" d="M719 360h-421v-663h-73v736h494v-73zM719 174h-235v-477h-74v550h309v-73z" />
+<glyph unicode="&#x2555;" horiz-adv-x="708" d="M390 -303h-73v477h-328v73h328v113h-328v73h401v-736z" />
+<glyph unicode="&#x2556;" horiz-adv-x="708" d="M483 -303h-73v570h-112v-570h-74v570h-235v73h494v-643z" />
+<glyph unicode="&#x2557;" horiz-adv-x="708" d="M483 -303h-73v663h-421v73h494v-736zM298 -303h-74v477h-235v73h309v-550z" />
+<glyph unicode="&#x2558;" horiz-adv-x="708" d="M720 174h-402v736h73v-477h329v-73h-329v-113h329v-73z" />
+<glyph unicode="&#x2559;" horiz-adv-x="708" d="M720 267h-495v643h73v-570h112v570h74v-570h236v-73z" />
+<glyph unicode="&#x255a;" horiz-adv-x="708" d="M719 360h-309v550h74v-477h235v-73zM719 174h-494v736h73v-663h421v-73z" />
+<glyph unicode="&#x255b;" horiz-adv-x="708" d="M390 174h-401v73h328v113h-328v73h328v477h73v-736z" />
+<glyph unicode="&#x255c;" horiz-adv-x="708" d="M483 267h-494v73h235v570h74v-570h112v570h73v-643z" />
+<glyph unicode="&#x255d;" horiz-adv-x="708" d="M298 360h-309v73h235v477h74v-550zM483 174h-494v73h421v663h73v-736z" />
+<glyph unicode="&#x255e;" horiz-adv-x="708" d="M720 174h-329v-477h-73v1213h73v-477h329v-73h-329v-113h329v-73z" />
+<glyph unicode="&#x255f;" horiz-adv-x="708" d="M298 -303h-73v1213h73v-1213zM720 267h-236v-570h-74v1213h74v-570h236v-73z" />
+<glyph unicode="&#x2560;" horiz-adv-x="708" d="M298 -303h-73v1213h73v-1213zM720 360h-310v550h74v-477h236v-73zM720 174h-236v-477h-74v550h310v-73z" />
+<glyph unicode="&#x2561;" horiz-adv-x="708" d="M390 -303h-73v477h-328v73h328v113h-328v73h328v477h73v-1213z" />
+<glyph unicode="&#x2562;" horiz-adv-x="708" d="M483 -303h-73v1213h73v-1213zM298 -303h-74v570h-235v73h235v570h74v-1213z" />
+<glyph unicode="&#x2563;" horiz-adv-x="708" d="M483 -303h-73v1213h73v-1213zM298 360h-309v73h235v477h74v-550zM298 -303h-74v477h-235v73h309v-550z" />
+<glyph unicode="&#x2564;" horiz-adv-x="708" d="M719 360h-730v73h730v-73zM719 174h-329v-477h-73v477h-328v73h730v-73z" />
+<glyph unicode="&#x2565;" horiz-adv-x="708" d="M719 267h-236v-570h-73v562h-112v-562h-74v570h-235v73h730v-73z" />
+<glyph unicode="&#x2566;" horiz-adv-x="708" d="M719 360h-730v73h730v-73zM719 174h-236v-477h-73v550h309v-73zM298 -303h-74v477h-235v73h309v-550z" />
+<glyph unicode="&#x2567;" horiz-adv-x="708" d="M719 174h-730v73h730v-73zM719 360h-730v73h328v477h73v-477h329v-73z" />
+<glyph unicode="&#x2568;" horiz-adv-x="708" d="M719 267h-730v73h235v570h74v-570h112v570h73v-570h236v-73z" />
+<glyph unicode="&#x2569;" horiz-adv-x="708" d="M719 174h-730v73h730v-73zM719 360h-309v550h73v-477h236v-73zM298 360h-309v73h235v477h74v-550z" />
+<glyph unicode="&#x256a;" horiz-adv-x="708" d="M719 174h-329v-477h-73v477h-328v73h328v113h-328v73h328v477h73v-477h329v-73h-329v-113h329v-73z" />
+<glyph unicode="&#x256b;" horiz-adv-x="708" d="M719 267h-236v-570h-73v570h-112v-570h-74v570h-235v73h235v570h74v-570h112v570h73v-570h236v-73z" />
+<glyph unicode="&#x256c;" horiz-adv-x="708" d="M719 360h-309v550h74v-477h235v-73zM298 360h-309v73h235v477h74v-550zM719 174h-235v-477h-74v550h309v-73zM298 -303h-74v477h-235v73h309v-550z" />
+<glyph unicode="&#x25b3;" horiz-adv-x="1145" d="M1110 -127h-1075l538 938zM958 -39l-385 673l-386 -673h771z" />
+<glyph unicode="&#x25b7;" horiz-adv-x="1043" d="M1008 253l-938 -537v1075zM831 253l-673 386v-772z" />
+<glyph unicode="&#x25bd;" horiz-adv-x="1145" d="M1110 811l-537 -938l-538 938h1075zM958 723h-771l386 -673z" />
+<glyph unicode="&#x25c1;" horiz-adv-x="1043" d="M973 -284l-938 537l938 538v-1075zM885 -133v772l-673 -386z" />
+<glyph unicode="&#x25ca;" horiz-adv-x="790" d="M745 253l-351 -542l-349 542l350 542zM641 253l-246 380l-245 -380l244 -380z" />
+<glyph unicode="&#x25ec;" horiz-adv-x="1145" d="M1110 -127h-1075l538 938zM958 -39l-385 673l-386 -673h771zM688 239q0 -47 -34 -81t-81 -34t-81 34t-34 81t34 81t81 34t81 -34t34 -81z" />
+<glyph unicode="&#x266d;" horiz-adv-x="437" d="M146 740v-283q38 29 83 29q72 0 116 -36t44 -107q0 -169 -303 -348v745h60zM146 362v-271q123 105 123 253q0 95 -55 95q-27 0 -47.5 -24.5t-20.5 -52.5z" />
+<glyph unicode="&#x266e;" horiz-adv-x="490" d="M393 -176l-60 -34v282l-236 -96v808l60 34v-282l236 96v-808zM333 194v293l-176 -73v-293z" />
+<glyph unicode="&#x266f;" horiz-adv-x="490" d="M438 97l-60 -19v-192l-60 -24v198l-146 -47v-199l-60 -24v205l-60 -19v117l60 19v304l-60 -19v117l60 19v178l60 24v-183l146 45v197l60 24v-202l60 19v-117l-60 -19v-304l60 19v-117zM318 177v303l-146 -45v-305z" />
+<glyph unicode="&#x27c8;" horiz-adv-x="1025" d="M943 -13h-288q-128 0 -208 81t-80 199q0 119 80.5 199.5t210.5 80.5h285v-88h-301q-76 0 -131.5 -56t-55.5 -136t56 -136t132 -56h300v-88zM330 -13h-84l-184 558h83z" />
+<glyph unicode="&#x27c9;" horiz-adv-x="1025" d="M943 545l-184 -558h-84l185 558h83zM62 547h285q130 0 210.5 -80.5t80.5 -199.5q0 -118 -80 -199t-208 -81h-288v88h300q76 0 132 56t56 136t-55.5 136t-131.5 56h-301v88z" />
+<glyph unicode="&#x27e8;" horiz-adv-x="445" d="M399 -193h-100l-230 455v15l226 455h100l-230 -462z" />
+<glyph unicode="&#x27e9;" horiz-adv-x="445" d="M376 262l-230 -455h-100l234 463l-230 462h100l226 -455v-15z" />
+<glyph unicode="&#x2980;" horiz-adv-x="675" d="M570 -200h-88v905h88v-905zM382 -200h-88v905h88v-905zM193 -200h-88v905h88v-905z" />
+<glyph unicode="&#x29b6;" horiz-adv-x="864" d="M814 252q0 -158 -112 -270t-270 -112t-270 112t-112 270t112 270t270 112t270 -112t112 -270zM476 543v-582q107 16 178.5 99t71.5 192t-71.5 192t-178.5 99zM388 -39v582q-107 -16 -178.5 -99t-71.5 -192t71.5 -192t178.5 -99z" />
+<glyph unicode="&#x29b7;" horiz-adv-x="864" d="M582 39h-88v426h88v-426zM368 39h-88v426h88v-426zM814 252q0 -158 -112 -270t-270 -112t-270 112t-112 270t112 270t270 112t270 -112t112 -270zM726 252q0 122 -86 208t-208 86t-208 -86t-86 -208t86 -208t208 -86t208 86t86 208z" />
+<glyph unicode="&#x29b8;" horiz-adv-x="864" d="M814 252q0 -158 -112 -270t-270 -112t-270 112t-112 270t112 270t270 112t270 -112t112 -270zM258 489l411 -411q57 76 57 174q0 122 -86 208t-208 86q-98 0 -174 -57zM606 15l-411 411q-57 -76 -57 -174q0 -122 86 -208t208 -86q98 0 174 57z" />
+<glyph unicode="&#x29c0;" horiz-adv-x="864" d="M579 35l-391 197v39l391 198v-101l-232 -115l232 -115v-103zM814 252q0 -158 -112 -270t-270 -112t-270 112t-112 270t112 270t270 112t270 -112t112 -270zM726 252q0 122 -86 208t-208 86t-208 -86t-86 -208t86 -208t208 -86t208 86t86 208z" />
+<glyph unicode="&#x29c1;" horiz-adv-x="864" d="M676 232l-391 -197v103l232 115l-232 115v101l391 -198v-39zM814 252q0 -158 -112 -270t-270 -112t-270 112t-112 270t112 270t270 112t270 -112t112 -270zM726 252q0 122 -86 208t-208 86t-208 -86t-86 -208t86 -208t208 -86t208 86t86 208z" />
+<glyph unicode="&#x29c4;" horiz-adv-x="910" d="M865 -158h-820v819h820v-819zM777 -70v590l-590 -590h590zM730 573h-597v-597z" />
+<glyph unicode="&#x29c5;" horiz-adv-x="910" d="M865 -158h-820v819h820v-819zM777 -20v593h-593zM727 -70l-594 594v-594h594z" />
+<glyph unicode="&#x29c6;" horiz-adv-x="910" d="M663 338q0 -29 -31 -47q-15 -9 -63.5 -18t-73.5 -20q22 -9 72.5 -19.5t63.5 -18.5q30 -18 30 -48q0 -22 -16 -40t-41 -18q-19 0 -39.5 18t-47 50t-42.5 47q3 -23 20 -75.5t17 -66.5q0 -24 -15 -42.5t-42 -18.5t-42 18.5t-15 42.5q0 14 17 66.5t20 75.5q-18 -16 -53 -57 t-44 -46q-20 -11 -37 -11q-24 0 -39.5 15.5t-15.5 35.5q0 37 30 55q12 7 66 18.5t73 18.5q-18 7 -74 19t-69 20q-29 18 -29 46q0 22 16 41.5t39 19.5q14 0 31 -9q13 -7 50.5 -47t55.5 -55q-3 24 -20 76t-17 66q0 25 14 42t43 17q26 0 41.5 -17.5t15.5 -41.5 q0 -14 -16.5 -65.5t-20.5 -76.5q23 18 56.5 57t45.5 45q17 9 31 9q23 0 39 -19.5t16 -41.5zM865 -158h-820v819h820v-819zM777 -70v643h-644v-643h644z" />
+<glyph unicode="&#x29c7;" horiz-adv-x="910" d="M662 253q0 -85 -61 -146t-146 -61t-146 61t-61 146t61 146t146 61t146 -61t61 -146zM592 253q0 62 -37.5 99.5t-99.5 37.5t-99.5 -37.5t-37.5 -99.5t37.5 -99.5t99.5 -37.5t99.5 37.5t37.5 99.5zM865 -158h-820v819h820v-819zM777 -70v643h-644v-643h644z" />
+<glyph unicode="&#x2a0c;" horiz-adv-x="1484" d="M855 -108l178 711q21 85 90 156q63 65 142 65q43 0 66 -21t23 -54q0 -31 -21 -55t-57 -24q-18 0 -32.5 13t-14.5 33q0 17 13.5 34t13.5 21q0 11 -17 11q-45 0 -87 -169l-178 -711q-23 -92 -85 -156q-64 -66 -147 -66q-43 0 -66 21.5t-23 54.5q0 31 21 55t57 24 q18 0 32.5 -13t14.5 -33q0 -17 -13.5 -34t-13.5 -21q0 -12 17 -12q45 0 87 170zM544 -108l178 711q21 85 90 156q63 65 142 65q43 0 66 -21t23 -54q0 -31 -21 -55t-57 -24q-18 0 -32.5 13t-14.5 33q0 17 13.5 34t13.5 21q0 11 -17 11q-46 0 -87 -169l-177 -711 q-22 -91 -86 -156q-64 -66 -147 -66q-43 0 -66 21.5t-23 54.5q0 31 21 55t57 24q18 0 32.5 -13t14.5 -33q0 -17 -13.5 -34t-13.5 -21q0 -12 17 -12q45 0 87 170zM234 -108l178 711q21 85 90 156q63 65 142 65q43 0 66 -21t23 -54q0 -31 -21 -55t-57 -24q-18 0 -32.5 13 t-14.5 33q0 17 13.5 34t13.5 21q0 11 -17 11q-45 0 -87 -169l-178 -711q-23 -92 -85 -156q-64 -66 -147 -66q-43 0 -66 21.5t-23 54.5q0 31 21 55t57 24q18 0 32.5 -13t14.5 -33q0 -17 -13.5 -34t-13.5 -21q0 -12 17 -12q45 0 87 170zM1165 -108l178 711q21 85 90 156 q63 65 142 65q43 0 66 -21t23 -54q0 -31 -21 -55t-57 -24q-18 0 -32.5 13t-14.5 33q0 17 13.5 34t13.5 21q0 11 -17 11q-45 0 -87 -169l-178 -711q-23 -92 -85 -156q-64 -66 -147 -66q-43 0 -66 21.5t-23 54.5q0 31 21 55t57 24q18 0 32.5 -13t14.5 -33q0 -17 -13.5 -34 t-13.5 -21q0 -12 17 -12q45 0 87 170z" />
+<glyph unicode="&#x2a0d;" horiz-adv-x="593" d="M334 292l78 311q21 85 90 156q63 65 142 65q39 0 64 -19t25 -56q0 -33 -22.5 -56t-55.5 -23q-19 0 -33 13.5t-14 32.5q0 16 13.5 33t13.5 22q0 11 -17 11q-46 0 -87 -169l-80 -321h180v-80h-200l-78 -310q-22 -89 -84.5 -155.5t-147.5 -66.5q-38 0 -63.5 19.5t-25.5 56.5 q0 33 22.5 56t55.5 23q19 0 33 -13.5t14 -32.5q0 -17 -13.5 -34t-13.5 -21q0 -12 17 -12q46 0 87 170l80 320h-177v80h197z" />
+<glyph unicode="&#x2a0e;" horiz-adv-x="593" d="M360 394l52 209q21 85 86 153t146 68q39 0 64 -19t25 -56q0 -33 -22.5 -56t-55.5 -23q-19 0 -33 13.5t-14 32.5q0 16 13.5 33t13.5 22q0 11 -17 11q-46 0 -87 -169l-55 -219h155v-80h-175l-31 -125h206v-80h-226l-52 -207q-22 -89 -84.5 -155.5t-147.5 -66.5 q-38 0 -63.5 19.5t-25.5 56.5q0 33 22.5 56t55.5 23q19 0 33 -13.5t14 -32.5q0 -17 -13.5 -34t-13.5 -21q0 -12 17 -12q46 0 87 170l54 217h-151v80h171l32 125h-203v80h223z" />
+<glyph unicode="&#x2a0f;" horiz-adv-x="593" d="M325 254l87 349q21 85 90 156q63 65 142 65q39 0 64 -19t25 -56q0 -33 -22.5 -56t-55.5 -23q-19 0 -33 13.5t-14 32.5q0 16 13.5 33t13.5 22q0 11 -17 11q-46 0 -87 -169l-71 -285l172 95l38 -72l-237 -130l-80 -319q-22 -89 -84.5 -155.5t-147.5 -66.5q-38 0 -63.5 19.5 t-25.5 56.5q0 33 22.5 56t55.5 23q19 0 33 -13.5t14 -32.5q0 -17 -13.5 -34t-13.5 -21q0 -12 17 -12q46 0 87 170l64 254l-165 -90l-38 71z" />
+<glyph unicode="&#x2a10;" horiz-adv-x="593" d="M383 490l29 113q23 88 90 156q63 65 142 65q43 0 66 -21t23 -54q0 -31 -21 -55t-57 -24q-18 0 -32.5 13t-14.5 33q0 17 13.5 34t13.5 21q0 11 -17 11q-44 0 -87 -169l-38 -150q71 -39 105 -113l-46 -24q-23 53 -72 84l-85 -338q40 3 75 22l24 -46q-51 -28 -111 -28h-1 l-29 -118q-23 -92 -85 -156q-64 -66 -147 -66q-43 0 -66 21.5t-23 54.5q0 31 21 55t57 24q18 0 32.5 -13t14.5 -33q0 -17 -13.5 -34.5t-13.5 -21.5q0 -11 17 -11q45 0 87 170l39 155q-57 30 -91 85.5t-34 122.5q0 97 69 166t166 69zM369 437v1q-71 -5 -120 -58t-49 -125 q0 -48 23 -89.5t63 -65.5z" />
+<glyph unicode="&#x2a11;" horiz-adv-x="593" d="M363 407l49 196q21 85 90 156q63 65 142 65q43 0 66 -21t23 -54q0 -31 -21 -55t-57 -24q-18 0 -32.5 13t-14.5 33q0 17 13.5 34t13.5 21q0 11 -17 11q-46 0 -87 -169l-53 -214l-51 -200q86 13 129 87q4 6 4 11q0 7 -9 7q-17 0 -59 -11l-9 30q75 10 131 45l5 -2 q16 -60 59 -125l-24 -12q-22 49 -38 49q-4 0 -14 -14q-22 -38 -37 -53q-61 -63 -151 -68l-61 -241q-23 -92 -85 -156q-64 -66 -147 -66q-43 0 -66 21.5t-23 54.5q0 31 21 55t57 24q18 0 32.5 -13t14.5 -33q0 -17 -13.5 -34t-13.5 -21q0 -12 17 -12q45 0 87 170l69 275 q-56 28 -90 82t-34 119h52q0 -45 23 -86t62 -64z" />
+<glyph unicode="&#x2a12;" horiz-adv-x="613" d="M473 253q0 -37 -26.5 -63.5t-63.5 -26.5q-41 0 -65.5 24.5t-24.5 65.5q0 37 26.5 63.5t63.5 26.5t63.5 -26.5t26.5 -63.5zM369 435l43 168q23 88 90 156q63 65 142 65q43 0 66 -21t23 -54q0 -31 -21 -55t-57 -24q-18 0 -32.5 13t-14.5 33q0 17 13.5 34t13.5 21 q0 11 -17 11q-44 0 -87 -169l-32 -126h1h139v-470h-254h-3l-29 -115q-23 -92 -85 -156q-64 -66 -147 -66q-43 0 -66 21.5t-23 54.5q0 31 21 55t57 24q18 0 32.5 -13t14.5 -33q0 -17 -13.5 -34t-13.5 -21q0 -12 17 -12q45 0 87 170l44 177h309v366h-99h-119z" />
+<glyph unicode="&#x2a13;" horiz-adv-x="593" d="M473 253q0 -36 -25.5 -63t-64.5 -27q-40 0 -65 24.5t-25 65.5q0 39 27.5 64.5t62.5 25.5q36 0 63 -25.5t27 -64.5zM370 438l42 165q21 85 90 156q63 65 142 65q43 0 66 -21t23 -54q0 -31 -21 -55t-57 -24q-18 0 -32.5 13t-14.5 33q0 17 13.5 34t13.5 21q0 11 -17 11 q-44 0 -87 -169l-38 -150q57 -31 91 -86.5t34 -121.5q0 -97 -69 -166t-166 -69h-1l-29 -118q-23 -92 -85 -156q-64 -66 -147 -66q-43 0 -66 21.5t-23 54.5q0 31 21 55t57 24q18 0 32.5 -13t14.5 -33q0 -17 -13.5 -34.5t-13.5 -21.5q0 -11 17 -11q45 0 87 170l52 208 q44 -28 97 -28q76 0 129.5 53.5t53.5 129.5t-53.5 129.5t-129.5 53.5h-13z" />
+<glyph unicode="&#x2a14;" horiz-adv-x="675" d="M590 253q0 -36 -25.5 -63t-64.5 -27q-40 0 -65 24.5t-25 65.5q0 39 27.5 64.5t62.5 25.5q36 0 63 -25.5t27 -64.5zM531 613l-31 -123q98 0 166.5 -69t68.5 -166t-68.5 -166t-166.5 -69q-60 0 -111 28l-36 -146q-23 -92 -85 -156q-64 -66 -147 -66q-43 0 -66 21.5 t-23 54.5q0 31 21 55t57 24q18 0 32.5 -13t14.5 -33q0 -17 -13.5 -34t-13.5 -21q0 -12 17 -12q45 0 87 170l84 340q9 -68 61 -114t121 -46q76 0 129.5 53.5t53.5 129.5t-53.5 129.5t-129.5 53.5q-91 0 -148 -75l60 240q21 85 90 156q63 65 142 65q43 0 66 -21t23 -54 q0 -31 -21 -55t-57 -24q-18 0 -32.5 13t-14.5 33q0 17 13.5 34t13.5 21q0 11 -17 11q-46 0 -87 -169z" />
+<glyph unicode="&#x2a15;" horiz-adv-x="593" d="M473 253q0 -37 -26.5 -63.5t-63.5 -26.5q-41 0 -65.5 24.5t-24.5 65.5q0 37 26.5 63.5t63.5 26.5t63.5 -26.5t26.5 -63.5zM383 490l29 113q22 86 86.5 153.5t145.5 67.5q39 0 64 -19t25 -56q0 -33 -22.5 -56t-55.5 -23q-19 0 -33 13.5t-14 32.5q0 17 13.5 34t13.5 21 q0 11 -17 11q-46 0 -87 -169l-38 -150q58 -31 91.5 -87t33.5 -121q0 -97 -69 -166t-167 -69l-29 -118q-22 -89 -84.5 -155.5t-147.5 -66.5q-38 0 -63.5 19.5t-25.5 56.5q0 33 22.5 56t55.5 23q19 0 33 -13.5t14 -32.5q0 -17 -13.5 -34t-13.5 -22q0 -11 17 -11q46 0 87 170 l39 155q-58 31 -91.5 87t-33.5 121q0 97 69 166t166 69zM566 255q0 76 -53.5 129.5t-129.5 53.5t-129.5 -53.5t-53.5 -129.5t53.5 -129.5t129.5 -53.5t129.5 53.5t53.5 129.5z" />
+<glyph unicode="&#x2a16;" horiz-adv-x="623" d="M383 487l29 116q21 85 86 153t146 68q39 0 64 -19t25 -56q0 -33 -22.5 -56t-55.5 -23q-19 0 -33 13.5t-14 32.5q0 16 13.5 33t13.5 22q0 11 -17 11q-46 0 -87 -169l-32 -126h140v-470h-257l-29 -115q-22 -89 -84.5 -155.5t-147.5 -66.5q-38 0 -63.5 19.5t-25.5 56.5 q0 33 22.5 56t55.5 23q19 0 33 -13.5t14 -32.5q0 -17 -13.5 -34t-13.5 -21q0 -12 17 -12q46 0 87 170l31 125h-139v470h257zM587 69v366h-101l-91 -366h192zM370 435h-192v-366h100z" />
+<glyph unicode="&#x2a17;" horiz-adv-x="791" d="M537 312h197q57 0 97 -40.5t40 -97.5q0 -50 -37 -92.5t-87 -42.5h-81v81h78q19 0 31 16t15 36v2q0 24 -17.5 40.5t-41.5 16.5h-214l-82 -329q-22 -89 -84.5 -155.5t-147.5 -66.5q-38 0 -63.5 19.5t-25.5 56.5q0 33 22.5 56t55.5 23q19 0 33 -13.5t14 -32.5 q0 -17 -13.5 -34t-13.5 -21q0 -12 17 -12q46 0 87 170l84 339h-185q-6 0 -11.5 -4.5t-5.5 -10.5t12 -20q56 -58 86 -102l-23 -23q-123 142 -241 192v14q116 50 244 196l21 -24q-29 -40 -58 -72l-28 -30q-12 -14 -12 -23q0 -12 15 -12h207l73 291q21 85 90 156q63 65 142 65 q39 0 64 -19t25 -56q0 -33 -22.5 -56t-55.5 -23q-19 0 -33 13.5t-14 32.5q0 16 13.5 33t13.5 22q0 11 -17 11q-46 0 -87 -169z" />
+<glyph unicode="&#x2a18;" horiz-adv-x="633" d="M347 344l65 259q21 85 90 156q63 65 142 65q43 0 66 -21t23 -54q0 -31 -21 -55t-57 -24q-18 0 -32.5 13t-14.5 33q0 17 13.5 34t13.5 21q0 11 -17 11q-44 0 -87 -169l-55 -219l118 107l60 -60l-209 -190l199 -188l-60 -60l-166 157l-65 -258q-23 -92 -85 -156 q-64 -66 -147 -66q-43 0 -66 21.5t-23 54.5q0 31 21 55t57 24q18 0 32.5 -13t14.5 -33q0 -17 -13.5 -34t-13.5 -21q0 -12 17 -12q45 0 87 170l54 216l-116 -105l-60 60l208 189l-199 189l60 60z" />
+<glyph unicode="&#x2a19;" horiz-adv-x="653" d="M390 514l22 89q21 85 86 153t146 68q39 0 64 -19t25 -56q0 -33 -22.5 -56t-55.5 -23q-19 0 -33 13.5t-14 32.5q0 17 13.5 34t13.5 21q0 11 -17 11q-46 0 -87 -169l-32 -126q78 -36 124.5 -108t46.5 -158v-232h-80v232q0 58 -29.5 108t-80.5 78l-127 -505 q-22 -89 -84.5 -155.5t-147.5 -66.5q-38 0 -63.5 19.5t-25.5 56.5q0 33 22.5 56t55.5 23q19 0 33 -13.5t14 -32.5q0 -17 -13.5 -34t-13.5 -21q0 -12 17 -12q46 0 87 170l136 542q-87 -2 -147 -64.5t-60 -148.5v-232h-80v232q0 123 86 208t208 85h13z" />
+<glyph unicode="&#x2a1a;" horiz-adv-x="653" d="M284 94l128 509q21 85 90 156q63 65 142 65q39 0 64 -19t25 -56q0 -33 -22.5 -56t-55.5 -23q-19 0 -33 13.5t-14 32.5q0 17 13.5 34t13.5 21q0 11 -17 11q-46 0 -87 -169l-136 -544q85 5 144 66.5t59 146.5v232h80v-232q0 -122 -86.5 -207.5t-207.5 -85.5h-9l-22 -87 q-22 -89 -84.5 -155.5t-147.5 -66.5q-38 0 -63.5 19.5t-25.5 56.5q0 33 22.5 56t55.5 23q19 0 33 -13.5t14 -32.5q0 -17 -13.5 -34t-13.5 -21q0 -12 17 -12q46 0 87 170l31 122q-79 35 -126.5 108t-47.5 160v232h80v-232q0 -59 30.5 -110t82.5 -78z" />
+<glyph unicode="&#x2a1b;" horiz-adv-x="557" d="M737 879h-506v80h506v-80zM234 -108l178 711q21 85 90 156q63 65 142 65q43 0 66 -21t23 -54q0 -31 -21 -55t-57 -24q-18 0 -32.5 13t-14.5 33q0 17 13.5 34t13.5 21q0 11 -17 11q-46 0 -87 -169l-178 -711q-23 -92 -85 -156q-64 -66 -147 -66q-43 0 -66 21.5t-23 54.5 q0 31 21 55t57 24q18 0 32.5 -13t14.5 -33q0 -17 -13.5 -34t-13.5 -21q0 -12 17 -12q45 0 87 170z" />
+<glyph unicode="&#x2a1c;" horiz-adv-x="557" d="M238 -108l178 711q21 85 90 156q63 65 142 65q43 0 66 -21t23 -54q0 -31 -21 -55t-57 -24q-18 0 -32.5 13t-14.5 33q0 17 13.5 34t13.5 21q0 11 -17 11q-45 0 -87 -169l-178 -711q-23 -92 -85 -156q-64 -66 -147 -66q-43 0 -66 21.5t-23 54.5q0 31 21 55t57 24 q18 0 32.5 -13t14.5 -33q0 -17 -13.5 -34t-13.5 -21q0 -12 17 -12q45 0 87 170zM538 -455h-506v80h506v-80z" />
+<glyph unicode="&#x2a22;" d="M685 209h-266v-266h-88v266h-266v88h266v266h88v-266h266v-88zM519 750q0 -60 -42 -102t-103 -42q-60 0 -102 42t-42 102t42 102t102 42q61 0 103 -42t42 -102zM449 751q0 34 -20.5 53.5t-54.5 19.5t-54 -20t-20 -54q0 -35 20 -54.5t55 -19.5q34 0 54 20t20 55z" />
+<glyph unicode="&#x2a23;" d="M546 560h-57l-112 98l-112 -98h-56l122 176h92zM685 209h-266v-266h-88v266h-266v88h266v266h88v-266h266v-88z" />
+<glyph unicode="&#x2a24;" d="M685 209h-266v-266h-88v266h-266v88h266v266h88v-266h266v-88zM553 746h39q-4 -60 -40 -111.5t-87 -51.5q-36 0 -104 44t-85 44q-26 0 -48.5 -23.5t-30.5 -64.5h-40q3 66 40.5 114.5t89.5 48.5q36 0 104 -44t85 -44q27 0 47.5 23t29.5 65z" />
+<glyph unicode="&#x2a25;" d="M685 209h-266v-266h-88v266h-266v88h266v266h88v-266h266v-88zM457 -205q0 -34 -24 -58t-58 -24t-58 24t-24 58t24 58t58 24t58 -24t24 -58z" />
+<glyph unicode="&#x2a26;" d="M685 209h-266v-266h-88v266h-266v88h266v266h88v-266h266v-88zM552 -77h40q-3 -66 -40.5 -114.5t-89.5 -48.5q-36 0 -104 44t-85 44q-27 0 -47.5 -23t-29.5 -65h-39q4 60 40 111.5t87 51.5q36 0 104 -44t85 -44q26 0 48.5 23.5t30.5 64.5z" />
+<glyph unicode="&#x2a27;" horiz-adv-x="780" d="M685 209h-266v-266h-88v266h-266v88h266v266h88v-266h266v-88zM778 -120l-30 -127h-270v14q112 111 148 161t36 94q0 32 -22 54t-53 22q-47 0 -76 -54h-24q49 122 144 122q52 0 85.5 -31t33.5 -80q0 -33 -16.5 -62.5t-57.5 -67.5l-93 -87v-5h86q50 0 64.5 7.5t28.5 39.5 h16z" />
+<glyph unicode="&#x2a2a;" d="M685 209h-619v88h619v-88zM456 45q0 -34 -24 -58t-58 -24t-58 24t-24 58t24 58t58 24t58 -24t24 -58z" />
+<glyph unicode="&#x2a2b;" d="M685 209h-619v88h619v-88zM685 461q0 -34 -24 -58t-58 -24t-58 24t-24 58t24 58t58 24t58 -24t24 -58zM685 45q0 -34 -24 -58t-58 -24t-58 24t-24 58t24 58t58 24t58 -24t24 -58zM230 461q0 -34 -24 -58t-58 -24t-58 24t-24 58t24 58t58 24t58 -24t24 -58zM230 45 q0 -34 -24 -58t-58 -24t-58 24t-24 58t24 58t58 24t58 -24t24 -58z" />
+<glyph unicode="&#x2a30;" horiz-adv-x="702" d="M636 29l-62 -62l-223 224l-223 -224l-62 62l223 224l-222 223l62 62l222 -223l223 223l62 -62l-223 -223zM433 661q0 -34 -24.5 -58.5t-59.5 -24.5t-59 24t-24 59t24.5 59.5t58.5 24.5q35 0 59.5 -24.5t24.5 -59.5z" />
+<glyph unicode="&#x2a31;" horiz-adv-x="702" d="M636 29l-62 -62l-223 224l-223 -224l-62 62l223 224l-222 223l62 62l222 -223l223 223l62 -62l-223 -223zM574 -191h-446v88h446v-88z" />
+<glyph unicode="&#x2a32;" horiz-adv-x="702" d="M636 -59h-570v88l223 224l-222 223l62 62l222 -223l223 223l62 -62l-223 -223l223 -224v-88zM512 29l-161 162l-161 -162h322z" />
+<glyph unicode="&#x2a3f;" horiz-adv-x="734" d="M707 0h-679v24q53 3 65 21t12 78v439q0 57 -12 71.5t-66 18.5v24h282v-24q-51 -4 -63 -19.5t-12 -70.5v-512h266v512q0 57 -12 71.5t-65 18.5v24h284v-24q-52 -4 -65 -19.5t-13 -70.5v-450q0 -52 13.5 -68.5t64.5 -19.5v-24z" />
+<glyph unicode="&#x2a5e;" horiz-adv-x="640" d="M588 -28h-94l-174 413l-174 -413h-94l234 564h68zM573 799h-506v88h506v-88zM573 609h-506v88h506v-88z" />
+<glyph unicode="&#x2a63;" horiz-adv-x="640" d="M573 -189h-506v88h506v-88zM588 536l-234 -564h-68l-234 564h94l174 -413l174 413h94zM573 -379h-506v88h506v-88z" />
+<glyph unicode="&#x2a66;" d="M682 311h-614v88h614v-88zM682 107h-614v88h614v-88zM458 -77q0 -35 -24.5 -59.5t-58.5 -24.5q-35 0 -59.5 24.5t-24.5 59.5q0 34 24.5 58.5t59.5 24.5t59 -24t24 -59z" />
+<glyph unicode="&#x2a67;" d="M682 419h-614v88h614v-88zM682 223h-614v88h614v-88zM682 27h-614v88h614v-88zM458 691q0 -35 -24 -59t-59 -24t-59.5 24.5t-24.5 58.5q0 35 24.5 59.5t59.5 24.5q34 0 58.5 -24.5t24.5 -59.5z" />
+<glyph unicode="&#x2a6a;" d="M628 374h54q-6 -87 -52.5 -155.5t-121.5 -68.5q-44 0 -98 29.5t-100.5 59t-74.5 29.5q-80 0 -114 -136h-54q5 94 53.5 159t125.5 65q45 0 98.5 -29.5t98.5 -59t71 -29.5q80 0 114 136zM457 481q0 -34 -24.5 -58.5t-59.5 -24.5t-59 24t-24 59t24.5 59.5t58.5 24.5 q35 0 59.5 -24.5t24.5 -59.5z" />
+<glyph unicode="&#x2a6d;" d="M629 568h54q-6 -87 -52.5 -155.5t-121.5 -68.5q-44 0 -98 29.5t-100.5 59t-74.5 29.5q-80 0 -114 -136h-54q5 94 53.5 159t125.5 65q45 0 98.5 -29.5t98.5 -59t71 -29.5q80 0 114 136zM682 144h-614v88h614v-88zM682 -60h-614v88h614v-88zM458 675q0 -34 -24.5 -58.5 t-59.5 -24.5q-34 0 -58.5 24t-24.5 59t24.5 59.5t58.5 24.5t59 -24.5t25 -59.5z" />
+<glyph unicode="&#x2a6e;" d="M682 311h-614v88h614v-88zM682 107h-614v88h614v-88zM386 690l7 -3q30 24 42 35.5t30 38.5q14 22 26.5 30t29.5 8q21 0 37 -14.5t16 -33.5q0 -23 -25.5 -38t-56.5 -15q-33 0 -48.5 -4.5t-40.5 -21.5v-8q51 -24 97 -28q40 -3 56.5 -14.5t16.5 -36.5q0 -22 -13 -36t-36 -14 q-19 0 -32.5 11.5t-42.5 50.5q-15 21 -25.5 30t-31.5 20l-6 -4q1 -32 6 -49t21 -49q15 -29 15 -45q0 -22 -14.5 -37t-36.5 -15q-21 0 -35 14.5t-14 37.5q0 17 16 46q14 24 18 42t5 55l-6 4q-29 -22 -41.5 -34.5t-32.5 -40.5q-15 -22 -26.5 -29.5t-28.5 -7.5 q-21 0 -35.5 13.5t-14.5 34.5q0 47 84 53q32 2 47 7.5t39 21.5v7q-47 21 -102 26q-68 5 -68 53q0 22 13 35t34 13t34 -9t28 -34q17 -29 29.5 -41t41.5 -28l5 3q-1 33 -4.5 48t-18.5 43q-18 32 -18 53q0 22 14.5 36t37.5 14q21 0 34.5 -15t13.5 -40q0 -15 -18 -47 q-22 -37 -22 -77v-15z" />
+<glyph unicode="&#x2a6f;" d="M629 268h54q-6 -87 -52.5 -155.5t-121.5 -68.5q-44 0 -98 29.5t-100.5 59t-74.5 29.5q-80 0 -114 -136h-54q5 94 53.5 159t125.5 65q45 0 98.5 -29.5t98.5 -59t71 -29.5q80 0 114 136zM629 508h54q-6 -87 -52.5 -155.5t-121.5 -68.5q-44 0 -98 29.5t-100.5 59t-74.5 29.5 q-80 0 -114 -136h-54q5 94 53.5 159t125.5 65q45 0 98.5 -29.5t98.5 -59t71 -29.5q80 0 114 136zM546 576h-57l-112 98l-112 -98h-56l122 176h92z" />
+<glyph unicode="&#x2a70;" d="M629 440h54q-6 -87 -52.5 -155.5t-121.5 -68.5q-44 0 -98 29.5t-100.5 59t-74.5 29.5q-80 0 -114 -136h-54q5 94 53.5 159t125.5 65q45 0 98.5 -29.5t98.5 -59t71 -29.5q80 0 114 136zM629 680h54q-6 -87 -52.5 -155.5t-121.5 -68.5q-44 0 -98 29.5t-100.5 59t-74.5 29.5 q-80 0 -114 -136h-54q5 94 53.5 159t125.5 65q45 0 98.5 -29.5t98.5 -59t71 -29.5q80 0 114 136zM681 28h-590v88h590v-88zM681 -176h-590v88h590v-88z" />
+<glyph unicode="&#x2a71;" d="M685 577h-619v88h619v-88zM685 373h-619v88h619v-88zM685 47h-266v-206h-88v206h-266v88h266v215h88v-215h266v-88z" />
+<glyph unicode="&#x2a72;" d="M684 45h-619v88h619v-88zM684 -159h-619v88h619v-88zM685 371h-266v-215h-88v215h-266v88h266v206h88v-206h266v-88z" />
+<glyph unicode="&#x2a73;" d="M682 480h-614v88h614v-88zM682 276h-614v88h614v-88zM628 182h54q-5 -94 -53.5 -159t-125.5 -65q-45 0 -98.5 29.5t-98.5 59t-71 29.5q-80 0 -114 -136h-54q6 87 52.5 155.5t121.5 68.5q44 0 98 -29.5t100.5 -59t74.5 -29.5q80 0 114 136z" />
+<glyph unicode="&#x2a7d;" d="M670 90l-590 260v40l590 258v-88l-436 -190l436 -192v-88zM670 -140l-590 260v88l590 -260v-88z" />
+<glyph unicode="&#x2a7e;" d="M670 350l-590 -260v88l436 192l-436 190v88l590 -258v-40zM670 120l-590 -260v88l590 260v-88z" />
+<glyph unicode="&#x2a87;" d="M670 88l-590 258v40l590 260v-88l-436 -192l436 -190v-88zM670 -101h-288l-60 -112h-77l60 112h-225v88h272l60 113h77l-60 -113h241v-88z" />
+<glyph unicode="&#x2a88;" d="M670 346l-590 -258v88l436 190l-436 192v88l590 -260v-40zM670 -101h-288l-60 -112h-77l60 112h-225v88h272l60 113h77l-60 -113h241v-88z" />
+<glyph unicode="&#x2a89;" d="M670 234l-590 259v40l590 259v-88l-436 -191l436 -191v-88zM628 -45h54q-6 -87 -52.5 -155.5t-121.5 -68.5q-29 0 -64 13.5t-56 26t-58 37.5l-57 -113h-77l74 146q-21 8 -35 8q-80 0 -114 -136h-54q5 94 53.5 159t125.5 65q30 0 66 -13l52 102l-24 15l-24 15q-7 5 -21 13 t-22 11t-18.5 6t-19.5 3q-80 0 -114 -136h-54q5 94 53.5 159t125.5 65q27 0 58 -11.5t51 -23t52 -32.5l52 103h77l-71 -139q30 -15 49 -15q80 0 114 136h54q-6 -87 -52.5 -155.5t-121.5 -68.5q-38 0 -84 22l-51 -101q14 -8 39 -24.5t39 -25t32 -16t31 -7.5q80 0 114 136z " />
+<glyph unicode="&#x2a8a;" d="M670 493l-590 -259v88l436 191l-436 191v88l590 -259v-40zM628 -45h54q-6 -87 -52.5 -155.5t-121.5 -68.5q-29 0 -64 13.5t-56 26t-58 37.5l-57 -113h-77l74 146q-21 8 -35 8q-80 0 -114 -136h-54q5 94 53.5 159t125.5 65q30 0 66 -13l52 102l-24 15l-24 15q-7 5 -21 13 t-22 11t-18.5 6t-19.5 3q-80 0 -114 -136h-54q5 94 53.5 159t125.5 65q27 0 58 -11.5t51 -23t52 -32.5l52 103h77l-71 -139q30 -15 49 -15q80 0 114 136h54q-6 -87 -52.5 -155.5t-121.5 -68.5q-38 0 -84 22l-51 -101q14 -8 39 -24.5t39 -25t32 -16t31 -7.5q80 0 114 136z " />
+<glyph unicode="&#x2a95;" d="M670 -140l-590 258v40l590 260v-88l-436 -192l436 -190v-88zM670 560l-590 -260v88l590 260v-88z" />
+<glyph unicode="&#x2a96;" d="M670 118l-590 -258v88l436 190l-436 192v88l590 -260v-40zM670 300l-590 260v88l590 -260v-88z" />
+<glyph unicode="&#x2a9d;" d="M628 689h54q-6 -87 -52.5 -155.5t-121.5 -68.5q-44 0 -98 29.5t-100.5 59t-74.5 29.5q-80 0 -114 -136h-54q5 94 53.5 159t125.5 65q45 0 98.5 -29.5t98.5 -59t71 -29.5q80 0 114 136zM672 -183l-590 258v40l590 260v-88l-436 -192l436 -190v-88z" />
+<glyph unicode="&#x2a9e;" d="M628 689h54q-6 -87 -52.5 -155.5t-121.5 -68.5q-44 0 -98 29.5t-100.5 59t-74.5 29.5q-80 0 -114 -136h-54q5 94 53.5 159t125.5 65q45 0 98.5 -29.5t98.5 -59t71 -29.5q80 0 114 136zM672 75l-590 -258v88l436 190l-436 192v88l590 -260v-40z" />
+<glyph unicode="&#x2aaf;" d="M670 186v-121q-94 98 -227 154.5t-279 70.5l-84 8v88l84 8q146 14 279 70.5t227 154.5v-121q-107 -98 -299 -156q192 -58 299 -156zM670 -111h-590v88h590v-88z" />
+<glyph unicode="&#x2ab0;" d="M670 298l-84 -8q-146 -14 -279 -70.5t-227 -154.5v121q107 98 299 156q-192 58 -299 156v121q94 -98 227 -154.5t279 -70.5l84 -8v-88zM670 -111h-590v88h590v-88z" />
+<glyph unicode="&#x2abd;" d="M668 -13h-298q-128 0 -208 81t-80 199q0 119 80.5 199.5t210.5 80.5h295v-88h-311q-76 0 -131.5 -56t-55.5 -136t56 -136t132 -56h310v-88zM499 267q0 -29 -20.5 -49t-48.5 -20t-48.5 20t-20.5 49t20.5 49t48.5 20t48.5 -20t20.5 -49z" />
+<glyph unicode="&#x2abe;" d="M82 547h295q130 0 210.5 -80.5t80.5 -199.5q0 -118 -80 -199t-208 -81h-298v88h310q76 0 132 56t56 136t-55.5 136t-131.5 56h-311v88zM389 267q0 -29 -20.5 -49t-48.5 -20t-48.5 20t-20.5 49t20.5 49t48.5 20t48.5 -20t20.5 -49z" />
+<glyph unicode="&#x2ac5;" d="M670 170h-298q-128 0 -208 81t-80 199q0 119 80.5 199.5t210.5 80.5h295v-88h-311q-76 0 -131.5 -56t-55.5 -136t56 -136t132 -56h310v-88zM670 -18h-590v88h590v-88zM670 -222h-590v88h590v-88z" />
+<glyph unicode="&#x2ac6;" d="M80 730h295q130 0 210.5 -80.5t80.5 -199.5q0 -118 -80 -199t-208 -81h-298v88h310q76 0 132 56t56 136t-55.5 136t-131.5 56h-311v88zM670 -18h-590v88h590v-88zM670 -222h-590v88h590v-88z" />
+<glyph unicode="&#x1d400;" horiz-adv-x="722" d="M689 0h-322v25l32 3q25 2 35.5 9.5t10.5 23.5q0 29 -46 136h-225l-13 -34q-31 -80 -31 -97q0 -19 18.5 -28.5t62.5 -12.5v-25h-202v25q35 6 53 28t46 92l221 545h28l222 -522q38 -90 58.5 -116.5t51.5 -26.5v-25zM384 236l-101 243l-94 -243h195z" />
+<glyph unicode="&#x1d401;" horiz-adv-x="667" d="M426 365v-1q85 -11 139 -58.5t54 -117.5q0 -83 -72 -135.5t-202 -52.5h-329v25q55 6 71.5 21t16.5 57v467q0 44 -18.5 60.5t-69.5 20.5v25h317q121 0 186.5 -41.5t65.5 -118.5q0 -59 -37 -96.5t-122 -54.5zM264 592v-219q91 0 123.5 30t32.5 106q0 137 -99 137 q-30 0 -43.5 -12.5t-13.5 -41.5zM264 343v-245q0 -36 15 -51t48 -15q58 0 89 40t31 116q0 155 -157 155h-26z" />
+<glyph unicode="&#x1d402;" horiz-adv-x="722" d="M657 152l30 -25q-67 -83 -132.5 -114.5t-155.5 -31.5q-159 0 -254.5 96.5t-95.5 245.5q0 160 97.5 264t249.5 104q71 0 156 -35q32 -14 46 -14t23.5 9.5t20.5 36.5h27v-235h-25q-22 62 -67 115q-75 90 -167 90q-81 0 -132.5 -83.5t-51.5 -229.5q0 -155 54 -240 q22 -34 62.5 -55t84.5 -21q64 0 126 34q41 23 104 89z" />
+<glyph unicode="&#x1d403;" horiz-adv-x="722" d="M14 676h312q171 0 267.5 -88t96.5 -243q0 -77 -30.5 -147t-84.5 -117q-93 -81 -252 -81h-309v25q43 1 63 19t20 54v486q0 34 -17.5 48t-65.5 19v25zM259 598v-498q0 -35 12.5 -50t45.5 -15q98 0 149 72q23 33 36.5 94.5t13.5 128.5q0 139 -41 211q-58 101 -163 101 q-53 0 -53 -44z" />
+<glyph unicode="&#x1d404;" horiz-adv-x="667" d="M641 208l-40 -208h-585v25q54 6 71 21t17 55v479q0 38 -18 53t-70 18v25h577v-201h-25q-17 100 -65.5 133.5t-171.5 33.5q-38 0 -51.5 -12t-13.5 -42v-225q81 1 117 32.5t45 116.5h26v-338h-26q-7 88 -43 121.5t-119 33.5v-242q0 -32 17.5 -44t65.5 -12q117 0 182 54 q25 20 42 46t40 77h28z" />
+<glyph unicode="&#x1d405;" horiz-adv-x="611" d="M583 474h-24q-10 57 -22 81.5t-38 47.5q-45 39 -163 39q-38 0 -54 -11.5t-16 -39.5v-228q75 0 109 32.5t44 116.5h25v-338h-25q-7 87 -41 120t-112 35v-228q0 -43 21 -58t89 -18v-25h-360v25q55 6 71.5 21t16.5 57v472q0 43 -18 58t-70 18v25h567v-202z" />
+<glyph unicode="&#x1d406;" horiz-adv-x="778" d="M755 287v-25q-53 -6 -69.5 -27.5t-16.5 -72.5v-118q-49 -29 -124 -46t-153 -17q-154 0 -254.5 96t-100.5 254q0 151 99.5 255.5t248.5 104.5q70 0 155 -35q32 -14 46 -14t23.5 9.5t20.5 36.5h27v-235h-25q-29 63 -47.5 92.5t-48.5 56.5q-63 56 -138 56q-88 0 -136 -83 t-48 -237q0 -157 48 -237q27 -45 63 -66t92 -21q96 0 96 85v89q0 40 -19.5 55t-82.5 19v25h344z" />
+<glyph unicode="&#x1d407;" horiz-adv-x="778" d="M759 0h-339v25q54 6 71.5 20.5t17.5 52.5v228h-241v-228q0 -40 17 -53.5t72 -19.5v-25h-336v25q53 7 69 20.5t16 52.5v479q0 41 -17 55t-68 19v25h336v-25q-53 -4 -71 -18.5t-18 -55.5v-204h241v204q0 41 -18 55.5t-71 18.5v25h339v-25q-51 -4 -69.5 -19t-18.5 -55v-479 q0 -39 16.5 -52.5t71.5 -20.5v-25z" />
+<glyph unicode="&#x1d408;" horiz-adv-x="389" d="M370 0h-350v25q57 5 75 20t18 61v470q0 41 -19 56t-74 19v25h350v-25q-56 -2 -75.5 -17.5t-19.5 -57.5v-470q0 -48 18.5 -62.5t76.5 -18.5v-25z" />
+<glyph unicode="&#x1d409;" horiz-adv-x="500" d="M478 676v-25q-55 -4 -71.5 -22t-16.5 -73v-430q0 -222 -212 -222q-74 0 -108 23q-29 20 -48 50t-19 60q0 28 21.5 51t49.5 23t50 -23t22 -53q0 -15 -13.5 -34t-13.5 -32q0 -32 45 -32q34 0 49 21.5t15 68.5v550q0 43 -20 57.5t-81 16.5v25h351z" />
+<glyph unicode="&#x1d40a;" horiz-adv-x="778" d="M769 0h-334v25q47 1 62 6t15 15q0 13 -25 45l-181 225l-27 -25v-196q0 -37 16.5 -50t70.5 -20v-25h-336v25q55 5 71 19t16 57v472q0 46 -17 60.5t-70 17.5v25h337v-25q-54 -4 -71 -20.5t-17 -63.5v-223l212 215q24 24 32 35t8 23q0 15 -10.5 22t-37.5 9l-35 3v25h289v-25 q-78 -9 -133 -46.5t-189 -180.5l305 -378q16 -20 49 -21v-25z" />
+<glyph unicode="&#x1d40b;" horiz-adv-x="667" d="M638 227l-42 -227h-577v25q55 7 70.5 20t15.5 53v478q0 42 -17.5 57t-68.5 18v25h348v-24q-65 -3 -82.5 -20t-17.5 -79v-464q0 -33 18.5 -45.5t66.5 -12.5q109 0 170 55q42 39 87 141h29z" />
+<glyph unicode="&#x1d40c;" horiz-adv-x="944" d="M921 0h-332v25q55 5 72 22t17 62v496l-252 -605h-27l-252 594v-465q0 -58 20 -79t81 -25v-25h-234v25q59 6 75 20.5t16 62.5v469q0 41 -17 55.5t-72 18.5v25h253l199 -472l201 472h252v-25q-55 -4 -71.5 -22.5t-16.5 -74.5v-428q0 -57 15 -76.5t73 -24.5v-25z" />
+<glyph unicode="&#x1d40d;" horiz-adv-x="722" d="M701 676v-25q-50 -8 -64 -22.5t-14 -60.5v-586h-28l-447 545v-396q0 -58 18 -78.5t76 -27.5v-25h-226v25q55 7 71.5 22.5t16.5 61.5v470q-52 72 -85 72v25h211l349 -430v299q0 60 -18 80.5t-74 25.5v25h214z" />
+<glyph unicode="&#x1d40e;" horiz-adv-x="778" d="M743 335q0 -156 -99.5 -255t-255.5 -99q-155 0 -254 99t-99 254q0 159 101 258t258 99q151 0 250 -100.5t99 -255.5zM566 328q0 160 -46.5 245t-134.5 85q-83 0 -128 -85.5t-45 -242.5t46 -236.5t132 -79.5t131 80t45 234z" />
+<glyph unicode="&#x1d40f;" horiz-adv-x="611" d="M16 676h315q128 0 198.5 -45.5t70.5 -135.5q0 -60 -33.5 -104.5t-95.5 -67.5q-32 -12 -70.5 -15.5t-138.5 -4.5v-192q0 -51 14 -65t73 -21v-25h-333v25q33 3 45 9q23 9 31 30t8 62v427q0 58 -15.5 75.5t-68.5 22.5v25zM262 606v-268q94 1 130 32t36 114q0 84 -27 120.5 t-89 36.5q-50 0 -50 -35z" />
+<glyph unicode="&#x1d410;" horiz-adv-x="778" d="M730 -117l6 -24q-91 -35 -179 -35q-140 0 -228 88q-29 29 -56 86q-113 34 -175.5 123.5t-62.5 208.5q0 161 99.5 261t254.5 100q156 0 255 -100t99 -264q0 -126 -66 -211t-187 -122q23 -47 47 -71q52 -52 123 -52q30 0 70 12zM566 335q0 158 -46 240.5t-132 82.5 q-84 0 -130 -83.5t-46 -239.5t45 -238.5t132 -82.5q86 0 131.5 83t45.5 238z" />
+<glyph unicode="&#x1d411;" horiz-adv-x="722" d="M716 0h-205l-207 313h-28v-196q0 -54 14.5 -69t73.5 -23v-25h-338v25q59 7 73.5 22t14.5 73v431q0 59 -16.5 77.5t-71.5 22.5v25h308q296 0 296 -172q0 -76 -45 -118q-42 -38 -112 -57l199 -282q15 -22 44 -22v-25zM276 597v-252q103 1 143 31t40 118q0 79 -30 113.5 t-100 34.5q-29 0 -41 -10t-12 -35z" />
+<glyph unicode="&#x1d412;" horiz-adv-x="556" d="M484 474h-28q-26 85 -70 130q-54 56 -123 56q-51 0 -80.5 -27.5t-29.5 -71.5q0 -36 21 -59t82 -55q18 -10 68.5 -35.5t79.5 -41.5q49 -27 79 -73.5t30 -102.5q0 -95 -68.5 -154t-179.5 -59q-61 0 -130 24q-31 10 -41 10q-12 0 -19 -7.5t-11 -26.5h-29v248h29 q23 -96 60 -143q57 -72 144 -72q58 0 92 30.5t34 82.5q0 48 -57 88q-25 18 -122 65q-89 43 -130 90t-41 120q0 95 58.5 148t160.5 53q55 0 117 -23q27 -9 42 -9q14 0 20.5 6.5t11.5 26.5h30v-218z" />
+<glyph unicode="&#x1d413;" horiz-adv-x="667" d="M636 475h-29q-13 89 -56.5 127.5t-135.5 41.5v-527q0 -57 16.5 -72t81.5 -20v-25h-357v25q64 5 80.5 20.5t16.5 71.5v527q-93 -3 -136.5 -41.5t-56.5 -127.5h-29l3 201h600z" />
+<glyph unicode="&#x1d414;" horiz-adv-x="722" d="M701 676v-25q-48 -7 -63 -24t-15 -61v-314q0 -156 -76 -216q-68 -55 -184 -55t-185 54q-43 34 -61.5 79t-18.5 117v324q0 59 -14 75t-68 21v25h336v-25q-60 -5 -77.5 -23t-17.5 -78v-318q0 -202 146 -202q176 0 176 222v300q0 54 -20.5 74t-76.5 25v25h219z" />
+<glyph unicode="&#x1d415;" horiz-adv-x="722" d="M701 676v-25q-39 -5 -55.5 -20t-34.5 -62l-228 -587h-27l-256 599q-18 42 -32 53.5t-52 16.5v25h336v-25l-33 -2q-53 -3 -53 -36q0 -17 23 -72l138 -334l127 329q20 52 20 71q0 24 -16 32t-70 12v25h213z" />
+<glyph unicode="&#x1d416;" horiz-adv-x="1000" d="M981 676v-25q-50 -5 -69 -64l-200 -602h-27l-171 477l-186 -477h-28l-212 602q-13 37 -25 48t-44 16v25h294v-25q-39 -3 -51.5 -11.5t-12.5 -30.5q0 -13 7 -33l120 -364l118 308l-35 96q-12 32 -72 35v25h312v-25l-13 -1q-33 -2 -46 -10t-13 -26q0 -13 14 -56l108 -336 l112 343q7 20 7 42q0 23 -14.5 32.5t-54.5 11.5v25h182z" />
+<glyph unicode="&#x1d417;" horiz-adv-x="722" d="M699 0h-340v25l28 2q52 3 52 28q0 21 -21 54l-101 162l-38 -51q-56 -76 -75 -106.5t-19 -46.5q0 -19 17.5 -28t63.5 -14v-25h-250v25q37 4 59 16t45 40l175 221l-198 291q-23 34 -38 45t-42 13v25h346v-25l-31 -2q-27 -1 -37.5 -8t-10.5 -23q0 -14 15 -37l97 -150l56 77 q36 49 47 69.5t11 36.5q0 18 -11 25t-40 10l-21 2v25h250v-25q-57 -5 -90.5 -30.5t-97.5 -115.5l-80 -111l182 -283q35 -54 53 -69.5t44 -16.5v-25z" />
+<glyph unicode="&#x1d418;" horiz-adv-x="722" d="M699 676v-25q-49 -7 -68 -39l-191 -311v-178q0 -58 16.5 -75.5t75.5 -22.5v-25h-347v25q60 5 76.5 25t16.5 78v136l-180 328q-31 56 -83 59v25h335v-25l-27 -2q-32 -2 -43 -7.5t-11 -21.5q0 -13 24 -59l120 -232l109 178q41 68 41 102q0 22 -16.5 30t-67.5 12v25h220z " />
+<glyph unicode="&#x1d419;" horiz-adv-x="667" d="M634 242l-27 -242h-579v16l382 623l-83 -1q-117 -2 -162 -32.5t-78 -136.5h-28l22 207h523v-16l-379 -625h83q145 0 202 40q27 19 45 45t26.5 47t26.5 75h26z" />
+<glyph unicode="&#x1d41a;" horiz-adv-x="500" d="M473 64l15 -21q-53 -57 -112 -57q-37 0 -55.5 15.5t-26.5 53.5q-76 -69 -159 -69q-50 0 -80 26.5t-30 79.5q0 67 67 112q50 33 201 76v68q0 49 -18.5 71t-62.5 22q-28 0 -46.5 -10t-18.5 -27q0 -11 11 -23q19 -23 19 -42q0 -26 -19 -43t-49 -17q-31 0 -48 18t-17 50 q0 59 52.5 92.5t138.5 33.5q92 0 144 -35t52 -99v-261q0 -28 21 -28q7 0 11 4zM293 97v148q-122 -34 -122 -121q0 -32 14.5 -49.5t37.5 -17.5q42 0 70 40z" />
+<glyph unicode="&#x1d41b;" horiz-adv-x="556" d="M211 676v-259q53 56 122 56q83 0 135.5 -65t52.5 -169q0 -113 -63 -183t-163 -70q-70 0 -132 57l-79 -56h-12v607q0 30 -10 40.5t-45 17.5v24h194zM211 360v-263q0 -36 19 -57.5t50 -21.5q94 0 94 203q0 198 -93 198q-25 0 -41 -13.5t-29 -45.5z" />
+<glyph unicode="&#x1d41c;" horiz-adv-x="444" d="M412 109l18 -18q-41 -56 -86 -80.5t-105 -24.5q-95 0 -154.5 65t-59.5 171q0 110 68 180.5t169 70.5q66 0 110 -31t44 -79q0 -29 -18.5 -46.5t-49.5 -17.5q-26 0 -41 19t-15 54q0 18 -0.5 26t-2.5 18.5t-6 15t-12.5 7.5t-20.5 3q-38 0 -61 -44.5t-23 -124.5 q0 -102 37 -161t102 -59q58 0 107 56z" />
+<glyph unicode="&#x1d41d;" horiz-adv-x="556" d="M534 20l-62 -8q-82 -11 -133 -25v65q-35 -37 -64 -51.5t-69 -14.5q-79 0 -130 66t-51 169q0 109 54.5 180.5t137.5 71.5q34 0 60.5 -13.5t58.5 -48.5v183q0 35 -13 44.5t-63 13.5v24h215v-575q0 -32 12.5 -44t46.5 -14v-23zM336 112v243q-11 29 -32 45.5t-46 16.5 q-85 0 -85 -188q0 -187 78 -187q36 0 66 37q19 25 19 33z" />
+<glyph unicode="&#x1d41e;" horiz-adv-x="444" d="M403 126l24 -14q-44 -70 -88.5 -98t-109.5 -28q-90 0 -147 67.5t-57 170.5q0 112 57.5 180.5t151.5 68.5q83 0 128 -50q53 -58 59 -178h-252q3 -42 8 -70.5t17 -57.5t35.5 -44t58.5 -15q32 0 58 15.5t57 52.5zM298 282v21q0 73 -9 92q-12 25 -23.5 36t-31.5 11 q-36 0 -53 -36.5t-17 -123.5h134z" />
+<glyph unicode="&#x1d41f;" horiz-adv-x="333" d="M14 461h57q0 131 40 179q42 51 135 51q64 0 103.5 -28t39.5 -72q0 -28 -17 -46t-45 -18q-25 0 -42.5 17t-17.5 40q0 20 11 36.5t11 20.5q0 19 -29 19q-27 0 -38.5 -17.5t-11.5 -61.5v-120h86v-44h-86v-310q0 -50 15 -66t67 -17v-24h-278v24q34 4 45.5 16.5t11.5 46.5v330 h-57v44z" />
+<glyph unicode="&#x1d420;" horiz-adv-x="500" d="M254 68h52q81 0 129 -32.5t48 -87.5q0 -71 -68.5 -112.5t-192.5 -41.5q-194 0 -194 92q0 61 96 75q-47 17 -64.5 35t-17.5 47q0 44 29 71.5t90 45.5q-55 15 -89.5 56t-34.5 96q0 73 56.5 117t146.5 44q52 0 112 -22h129v-53h-80q40 -36 40 -98q0 -94 -92 -132 q-24 -10 -41 -12t-86 -2q-30 0 -49.5 -13.5t-19.5 -35.5q0 -21 21 -29t80 -8zM306 312q0 70 -15.5 100t-51.5 30t-50.5 -29t-14.5 -102q0 -70 15 -99.5t51 -29.5t51 29.5t15 100.5zM315 -52h-164q-21 -17 -28 -28t-7 -27q0 -67 134 -67q72 0 113 18.5t41 47.5q0 56 -89 56z " />
+<glyph unicode="&#x1d421;" horiz-adv-x="556" d="M534 0h-234v24q25 3 35.5 16.5t10.5 44.5v224q0 54 -11 75.5t-40 21.5q-36 0 -70 -34q-17 -17 -17 -24v-263q0 -31 10 -44t38 -17v-24h-240v24q36 7 44.5 16t8.5 49v502q0 35 -9 44.5t-45 16.5v24h193v-280q65 77 147 77q60 0 95 -38t35 -98v-250q0 -34 11.5 -48.5 t37.5 -14.5v-24z" />
+<glyph unicode="&#x1d422;" horiz-adv-x="278" d="M256 0h-240v24q35 8 44 19t9 45v285q0 33 -10.5 45t-43.5 19v24h193v-376q0 -32 10.5 -44.5t37.5 -16.5v-24zM215 613q0 -33 -22.5 -55t-55.5 -22t-55 22t-22 55t22.5 55.5t56.5 22.5q31 0 53.5 -23t22.5 -55z" />
+<glyph unicode="&#x1d423;" horiz-adv-x="333" d="M260 461v-459q0 -84 -27 -129q-43 -76 -150 -76q-62 0 -101 28t-39 72q0 27 17 44t45 17q25 0 42 -15.5t17 -38.5q0 -16 -14 -37q-9 -15 -9 -22q0 -17 32 -17q25 0 36.5 18t11.5 58v474q0 32 -12.5 44t-50.5 15v24h202zM263 613q0 -33 -22.5 -55t-56.5 -22 q-33 0 -54.5 22t-21.5 55t22.5 55.5t55.5 22.5q31 0 54 -23t23 -55z" />
+<glyph unicode="&#x1d424;" horiz-adv-x="556" d="M543 0h-234v24q42 2 42 19q0 12 -24 45l-95 134l-23 -24v-114q0 -35 8.5 -45t43.5 -15v-24h-239v24q48 4 48 60v510q0 54 -48 58v24h187v-431l128 128q21 21 21 38q0 18 -35 23l-24 4v23h214v-23q-47 -6 -80.5 -29t-108.5 -102l194 -268q11 -15 25 -15v-24z" />
+<glyph unicode="&#x1d425;" horiz-adv-x="278" d="M256 0h-240v24q51 4 51 63v500q0 61 -52 65v24h191v-589q0 -33 12 -47.5t38 -15.5v-24z" />
+<glyph unicode="&#x1d426;" horiz-adv-x="833" d="M814 0h-237v24q28 2 38 14.5t10 44.5v228q0 95 -53 95q-29 0 -58 -25q-9 -7 -18 -18t-9 -15v-265q0 -29 10 -42.5t36 -16.5v-24h-232v24q27 2 37 15t10 44v240q0 45 -12.5 64t-41.5 19q-19 0 -51.5 -22.5t-32.5 -39.5v-261q0 -29 9.5 -42t35.5 -17v-24h-239v24 q33 6 44 18.5t11 43.5v287q0 35 -11 47t-45 17v24h192v-75h3q29 46 62.5 66.5t81.5 20.5q47 0 76 -20t52 -67q39 48 71.5 67.5t75.5 19.5q62 0 98.5 -38t36.5 -104v-248q0 -32 10.5 -45t39.5 -14v-24z" />
+<glyph unicode="&#x1d427;" horiz-adv-x="556" d="M539 0h-234v24q25 3 35.5 16.5t10.5 43.5v237q0 85 -51 85q-36 0 -70 -34q-17 -17 -17 -24v-264q0 -29 10.5 -42.5t37.5 -17.5v-24h-240v24q33 7 43 19t10 44v289q0 32 -10 44t-43 17v24h191v-75h1q49 87 142 87q62 0 98.5 -38.5t36.5 -103.5v-247q0 -34 10 -46t39 -14 v-24z" />
+<glyph unicode="&#x1d428;" horiz-adv-x="500" d="M476 229q0 -105 -64.5 -174t-161.5 -69q-95 0 -160 68.5t-65 173.5q0 109 64.5 177t164.5 68q95 0 158.5 -69t63.5 -175zM329 218q0 128 -17 176t-61 48q-46 0 -62.5 -47.5t-16.5 -176.5q0 -109 18 -155t61 -46t60.5 44.5t17.5 156.5z" />
+<glyph unicode="&#x1d429;" horiz-adv-x="556" d="M212 461v-69q25 44 55.5 62.5t75.5 18.5q85 0 133 -57.5t48 -166.5q0 -118 -51.5 -190t-140.5 -72q-34 0 -58 12.5t-60 47.5v-126q0 -52 16.5 -76t60.5 -26v-24h-272v24q35 6 45.5 18.5t10.5 44.5v490q0 33 -11 46.5t-44 18.5v24h192zM214 346v-239q12 -29 32.5 -47 t44.5 -18q85 0 85 192q0 182 -76 182q-37 0 -68 -37q-18 -21 -18 -33z" />
+<glyph unicode="&#x1d42a;" horiz-adv-x="556" d="M536 -205h-267v24q48 7 60.5 23.5t12.5 67.5v132q-44 -56 -123 -56t-132 63.5t-53 169.5q0 108 61.5 181t160.5 73q38 0 66 -12t66 -44l77 55h16v-595q0 -30 10 -40.5t45 -17.5v-24zM342 98v256q0 41 -18.5 64t-48.5 23q-44 0 -69.5 -51t-25.5 -154q0 -98 25 -147t68 -49 q28 0 48.5 15.5t20.5 42.5z" />
+<glyph unicode="&#x1d42b;" horiz-adv-x="444" d="M218 461v-82q35 51 66 72.5t69 21.5q35 0 58 -22.5t23 -56.5q0 -30 -17.5 -49t-45.5 -19q-37 0 -60 38q-14 23 -28 23q-26 0 -43.5 -30t-17.5 -74v-177q0 -48 13.5 -63.5t58.5 -18.5v-24h-265v24q33 6 43.5 17.5t10.5 42.5v289q0 35 -11 47t-44 17v24h190z" />
+<glyph unicode="&#x1d42c;" horiz-adv-x="389" d="M340 326h-25q-19 56 -47 82q-34 32 -75 32q-28 0 -47 -16.5t-19 -41.5q0 -26 22.5 -46.5t73.5 -41.5q75 -31 106.5 -67t31.5 -89q0 -67 -43 -109.5t-111 -42.5q-52 0 -108 23q-15 6 -23 6q-11 0 -26 -28h-25v165h28q32 -132 137 -132q34 0 54.5 18t20.5 47q0 24 -22 44.5 t-74 42.5q-75 32 -108.5 68.5t-33.5 86.5q0 63 44.5 104.5t112.5 41.5q34 0 78 -15q22 -7 31 -7q17 0 25 20h22v-145z" />
+<glyph unicode="&#x1d42d;" horiz-adv-x="333" d="M307 112l25 -11q-31 -62 -64.5 -87.5t-83.5 -25.5q-52 0 -82 28.5t-30 78.5v322h-53v27q49 33 82 71.5t85 114.5h25v-169h95v-44h-95v-298q0 -60 39 -60q29 0 57 53z" />
+<glyph unicode="&#x1d42e;" horiz-adv-x="556" d="M538 20l-63 -7q-83 -9 -132 -26v65q-39 -37 -71.5 -51.5t-73.5 -14.5q-63 0 -98 38t-35 107v241q0 35 -9 47t-40 18v24h188v-334q0 -76 56 -76q39 0 82 47v276q0 34 -12 47t-49 16v24h200v-356q0 -33 12 -47t45 -15v-23z" />
+<glyph unicode="&#x1d42f;" horiz-adv-x="500" d="M485 461v-24q-24 -2 -34 -11.5t-24 -43.5l-160 -396h-26l-120 296q-47 116 -66 141q-8 10 -34 14v24h250v-24l-18 -2q-35 -4 -35 -24q0 -9 9 -31l79 -203l72 182q11 26 11 45q0 18 -11.5 24.5t-43.5 8.5v24h151z" />
+<glyph unicode="&#x1d430;" horiz-adv-x="722" d="M707 461v-24q-19 -4 -29.5 -14.5t-20.5 -35.5l-155 -401h-23l-102 310l-125 -310h-24l-148 374q-19 47 -28.5 60t-28.5 17v24h222v-24q-38 -5 -38 -28q0 -12 39 -115l45 -118l68 171q-4 12 -6 19q-14 49 -22 58.5t-37 12.5v24h234v-24q-28 -2 -38 -7t-10 -17 q0 -14 27 -106q23 -79 34 -127l35 94q44 118 44 128q0 17 -10 24.5t-38 10.5v24h135z" />
+<glyph unicode="&#x1d431;" horiz-adv-x="500" d="M484 0h-241v24q45 3 45 20q0 16 -33 64q-23 32 -42 63q-2 -3 -7.5 -9.5t-8.5 -10.5q-64 -77 -64 -103q0 -21 50 -24v-24h-169v24q28 2 49.5 19.5t63.5 73.5l43 56q5 6 7.5 9.5t3.5 4.5t3.5 4.5t7.5 9.5l-128 197q-15 23 -24 29.5t-28 9.5v24h250v-24q-47 -1 -47 -19 q0 -22 58 -98q10 -12 13 -17l36 46q38 49 38 64q0 11 -7 15.5t-24 6.5l-20 2v24h168v-24q-44 -7 -70 -39l-101 -126l148 -228q8 -13 30 -20v-24z" />
+<glyph unicode="&#x1d432;" horiz-adv-x="500" d="M482 461v-24q-24 -3 -36 -13.5t-24 -41.5l-148 -398q-45 -121 -77 -156q-31 -33 -84 -33q-43 0 -70 22t-27 57q0 29 17 48t45 19q25 0 42.5 -15t17.5 -37q0 -4 -2 -14l-1 -6q0 -7 5 -12t12 -5q38 0 66 82l18 53l-119 290q-49 121 -67 146q-8 10 -34 14v24h249v-24l-16 -1 q-36 -3 -36 -25q0 -7 20 -58l72 -186l68 188q11 32 11 49q0 18 -11 25t-43 8v24h152z" />
+<glyph unicode="&#x1d433;" horiz-adv-x="444" d="M420 160l-16 -160h-383v25l234 404q-106 0 -139 -19t-52 -91h-26l7 142h371v-26l-231 -403h29q61 0 91.5 12.5t55.5 46.5q20 30 31 69h28z" />
+<glyph unicode="&#x1d56c;" horiz-adv-x="856" d="M805 80l-156 -94h-27q-62 37 -78 115l-262 -126q-35 46 -94 86.5t-99 46.5v25q51 21 89.5 46t72.5 62.5t52 90t18 117.5q0 125 -25 178q-19 39 -53 39q-51 0 -51 -51q0 -41 37 -101t37 -109q0 -63 -51.5 -108.5t-138.5 -58.5l-8 24q22 8 39 29.5t17 51.5q0 52 -37 106.5 t-37 99.5q0 67 57.5 108.5t142.5 41.5q55 0 109 -18.5t89 -57.5q45 -51 45 -133q0 -39 -15.5 -76t-35 -63t-55 -55.5t-58.5 -45.5t-61 -40q34 -18 77 -57t66 -69l129 61v266q0 166 -7 196l264 94l8 -25q-36 -11 -58 -27t-31.5 -43t-11.5 -50t-2 -67v-367q0 -43 23 -43 q27 0 67 24z" />
+<glyph unicode="&#x1d56d;" horiz-adv-x="849" d="M664 411v-2q62 -29 96 -79.5t34 -106.5q0 -108 -97.5 -175t-236.5 -67q-49 0 -86.5 9.5t-59.5 22.5t-41 26.5t-42.5 23t-52.5 9.5q-77 0 -107 -42l-21 14q27 69 77.5 116t116.5 47q12 7 18.5 11.5t20 22t21.5 40.5t14.5 65.5t6.5 97.5q0 78 -18 150t-58 72 q-20 0 -34 -15.5t-14 -44.5q0 -43 37 -100.5t37 -99.5q0 -65 -47.5 -108.5t-142.5 -58.5l-8 24q56 25 56 93q0 34 -11.5 60t-25.5 40.5t-25.5 38.5t-11.5 55q0 71 56.5 110t143.5 39q118 0 182 -73l100 75q109 0 168.5 -44.5t59.5 -111.5q0 -94 -105 -134zM604 533 q0 41 -22.5 69.5t-53.5 28.5q-29 0 -63 -36q9 -25 17 -66t8 -61q0 -37 -8 -87q61 10 91.5 55t30.5 97zM298 196v-1q40 -14 75.5 -44.5t55.5 -58.5t44 -50t46 -22q37 0 59 21q44 41 44 128q0 70 -34.5 122.5t-99.5 52.5q-6 0 -18 -2q-24 -48 -62 -79t-110 -67z" />
+<glyph unicode="&#x1d56e;" horiz-adv-x="773" d="M710 701l21 -14q-68 -139 -155 -139q-33 0 -66.5 9.5t-51.5 23.5q-12 -20 -12 -52q0 -26 16 -47t38 -36l44 -30q23 -16 39 -38t16 -50q0 -55 -51 -96.5t-118 -41.5q-40 0 -77 22l12 23q14 -10 33 -10q23 0 34.5 17.5t11.5 40.5t-9.5 40.5t-23.5 30.5l-28 26 q-14 13 -23.5 35.5t-9.5 53.5q0 44 55.5 109.5t121.5 120.5q46 -37 83 -37q61 0 100 39zM678 222l22 -12q-16 -43 -40 -81.5t-58.5 -73t-82 -54.5t-102.5 -20q-165 0 -264 109t-99 275q0 68 34 146t94 127q28 23 69.5 38.5t82.5 15.5q53 0 83 -22l-12 -23q-22 8 -38 8 q-43 0 -75 -41t-46.5 -96.5t-14.5 -113.5q0 -120 58 -199t166 -79q139 0 223 96z" />
+<glyph unicode="&#x1d56f;" horiz-adv-x="891" d="M251 318v-26q-33 -10 -61 -10q-59 0 -97.5 42.5t-38.5 104.5q0 106 90.5 189t232.5 83q81 0 162.5 -30t147.5 -82.5t107.5 -131t41.5 -166.5q0 -132 -83 -214q-98 -96 -271 -96q-49 0 -86 9.5t-59 22.5t-41 26.5t-42.5 23t-52.5 9.5q-76 0 -108 -45l-22 13 q28 72 79.5 119.5t120.5 47.5q19 0 38 -4.5t31.5 -9.5t30.5 -16.5t26 -17.5l27 -21l23 -19q98 -77 160 -77q57 0 95.5 45.5t38.5 127.5q0 109 -90 203t-209 109q-18 -15 -18 -31q0 -20 20.5 -38.5t45 -32.5t45 -38t20.5 -54q0 -46 -45.5 -77.5t-114.5 -31.5q-47 0 -87 22 l12 23q15 -10 34 -10q21 0 33.5 13.5t12.5 32.5q0 18 -28.5 59t-28.5 71q0 51 56 101q-105 0 -157 -30q-70 -41 -70 -112q0 -25 17.5 -51t49.5 -26q8 0 12 1z" />
+<glyph unicode="&#x1d570;" horiz-adv-x="788" d="M710 701l21 -14q-68 -139 -155 -139q-78 0 -118 31q-12 -20 -12 -50q0 -24 16 -46.5t30.5 -34t42.5 -29.5q37 49 59 68.5t50 19.5q46 0 71 -43v-122h-26q-14 34 -35.5 52t-42.5 18q-28 0 -50 -14q38 -33 38 -70q0 -55 -51 -96.5t-118 -41.5q-40 0 -77 22l12 23 q19 -10 33 -10q21 0 33.5 18t12.5 40q0 23 -9.5 40.5t-23.5 30.5l-28 26q-14 13 -23.5 35.5t-9.5 53.5q0 44 55 109t122 120q45 -36 83 -36q61 0 100 39zM678 222l22 -12q-16 -43 -40 -81.5t-58.5 -73t-82 -54.5t-102.5 -20q-165 0 -264 109t-99 275q0 68 34 146t94 127 q28 23 69.5 38.5t82.5 15.5q53 0 83 -22l-12 -23q-22 8 -38 8q-43 0 -75 -41t-46.5 -96.5t-14.5 -113.5q0 -120 58 -199t166 -79q139 0 223 96z" />
+<glyph unicode="&#x1d571;" horiz-adv-x="803" d="M723 676l25 -7q-49 -196 -189 -196h-10q-39 -48 -39 -121q0 -15 6.5 -35t16.5 -28q23 44 56 76t60 32q17 0 29 -5.5t18.5 -12t16.5 -19.5v-128h-26q-27 69 -74 69q-26 0 -55 -41q120 -78 120 -201q0 -103 -80.5 -183.5t-208.5 -80.5q-115 0 -192 50.5t-77 141.5 q0 35 23.5 91t23.5 69q0 38 -39 38q-30 0 -51 -21l-23 11q20 42 61.5 76t93.5 34q61 0 91.5 -30.5t30.5 -72.5q0 -32 -28.5 -90.5t-28.5 -107.5q0 -66 37 -111t81 -45q54 0 88 44.5t34 129.5q0 42 -14 78.5t-26.5 53.5t-38.5 46q-60 66 -60 120q0 20 6 39t24 41l27 32 q8 10 38 37.5t35 32.5q-35 12 -74.5 34.5t-72.5 36t-74 13.5q-31 0 -63 -26t-32 -65q0 -66 76 -85l-5 -26q-7 -1 -22 -1q-76 0 -121.5 39.5t-45.5 102.5q0 86 65 141t171 55q56 0 112 -23.5t102.5 -46.5t80.5 -23q82 0 121 68z" />
+<glyph unicode="&#x1d572;" horiz-adv-x="833" d="M635 443l1 -2q67 -7 106 -51t39 -108q0 -108 -102 -206q-98 -95 -272 -95q-161 0 -257 100t-96 252q0 71 16 133.5t48 114t86 81.5t124 30q29 0 63 -12l-6 -26q-18 2 -22 2q-44 0 -75 -46.5t-44 -114t-13 -147.5q0 -334 189 -334q85 0 139.5 72.5t54.5 174.5 q0 63 -16.5 106t-47.5 43q-26 0 -48 -24q27 -31 44 -69.5t17 -67.5q0 -57 -41.5 -97.5t-114.5 -40.5q-41 0 -80 22l12 23q20 -10 34 -10q35 0 35 58q0 37 -24 79t-47.5 88t-23.5 92q0 113 195 237l17 -19q-43 -45 -62 -79t-19 -75q0 -66 34 -110q88 45 88 83q0 14 -6 39.5 t-6 41.5q0 34 33 63t110 57l17 -19q-22 -22 -22 -54q0 -22 12.5 -50.5t12.5 -43.5q0 -56 -82 -91z" />
+<glyph unicode="&#x1d573;" horiz-adv-x="843" d="M619 701l21 -15q-15 -70 -79 -124.5t-135 -54.5q-79 0 -129 71q-19 -23 -19 -56q0 -52 72 -144q86 51 173 118q128 -30 200 -100t72 -170q0 -33 -10 -67t-23 -61t-40 -60t-46 -53.5t-56 -52.5l-56 -48l-60.5 -46.5t-54.5 -42.5h-26q-55 46 -97 46q-79 0 -129 -46l-21 17 q92 160 202 160q44 0 78 -24.5t44 -54.5q123 91 123 291q0 87 -39.5 149t-105.5 62q-35 0 -104 -48q46 -40 60.5 -65.5t14.5 -51.5q0 -16 -11 -34.5t-24 -33t-48 -50.5l-127 -137q-87 52 -125 70q-36 -35 -50 -53l-22 14l124 196q2 -2 18 -12l32 -22l35 -24 q18 -12 31.5 -19.5t17.5 -7.5q12 0 12 45q0 25 -29 58.5t-63.5 63.5t-63 71.5t-28.5 79.5q0 27 17 56t50 59.5t61 52.5l70 53l58 43q37 -36 59 -48.5t46 -12.5q71 0 130 63z" />
+<glyph unicode="&#x1d574;" horiz-adv-x="790" d="M710 694l25 -8l-11 -44q-5 -16 -19.5 -45.5t-31.5 -47t-47 -31.5t-68 -14q-62 0 -129 31t-117 31q-48 0 -78.5 -25.5t-30.5 -67.5q0 -35 24 -59t61 -24q27 0 50 10l12 -22q-34 -27 -91 -27q-69 0 -121.5 43t-52.5 110q0 81 61 139t161 58q54 0 97 -11t66 -24t55.5 -24 t66.5 -11q38 0 71 15t47 48zM721 388l-23 -12q-19 35 -51 35q-22 0 -36 -14t-14 -41q0 -32 23 -63l46 -65q23 -34 23 -74q0 -82 -70 -130.5t-176 -48.5q-59 0 -101.5 14t-65 33.5t-39 39t-35.5 33.5t-43 14q-37 0 -85 -42l-20 14q8 24 20 47.5t32 52t50.5 46t65.5 17.5 q31 0 55 -9.5t38 -20.5t27 -34.5t18 -36.5l13 -41q30 -94 78 -94q33 0 53.5 27.5t20.5 64.5q0 53 -43.5 119.5t-43.5 115.5q0 58 49.5 94t111.5 36q43 0 76.5 -20t45.5 -57z" />
+<glyph unicode="&#x1d575;" horiz-adv-x="803" d="M725 680l23 -12l-14 -34q-5 -11 -18 -34.5t-26.5 -36.5t-33.5 -28.5t-46.5 -22.5t-58.5 -7q-63 0 -130 30.5t-110 30.5q-42 0 -73.5 -24.5t-31.5 -64.5q0 -36 23 -60.5t64 -24.5q22 0 41 8l12 -23q-29 -24 -87 -24q-72 0 -121.5 42.5t-49.5 110.5q0 81 61 138t161 57 q81 0 172.5 -30.5t125.5 -30.5q75 0 117 40zM715 391l-23 -12q-21 37 -55 37q-22 0 -40 -19.5t-18 -50.5q0 -34 17 -67.5t37 -59.5t37 -73t17 -104q0 -98 -84.5 -172.5t-199.5 -74.5q-113 0 -172 31q-88 45 -88 136q0 13 7.5 43t7.5 42q0 10 -9 20.5t-23 10.5q-28 0 -47 -31 l-25 8q15 50 57 88t96 38q55 0 85 -32.5t30 -72.5q0 -20 -10.5 -59t-10.5 -53q0 -58 23.5 -97t80.5 -39q50 0 84 48t34 115q0 45 -16 88t-35 72.5t-35 72.5t-16 87q0 66 51 112.5t118 46.5q100 0 125 -79z" />
+<glyph unicode="&#x1d576;" horiz-adv-x="864" d="M794 121l20 -20q-20 -28 -66.5 -64.5t-91.5 -50.5h-24q-54 28 -77 71.5t-30 122.5q-5 58 -19.5 90t-33.5 34l-44 -14q21 -30 21 -60q0 -16 -11 -34.5t-24 -33t-48 -50.5l-127 -137q-87 52 -125 70q-22 -19 -50 -53l-22 14l124 196q2 -2 18 -12l32 -22l35 -24 q18 -12 31.5 -19.5t17.5 -7.5q12 0 12 45q0 22 -19 45.5t-46 47.5t-54 51.5t-46 66.5t-19 83q0 63 51.5 121t127.5 91t151 33q221 0 313 -155l-21 -14q-62 73 -123 95t-145 22q-81 0 -142.5 -48t-61.5 -125q23 57 75 85.5t107 28.5q98 0 143 -39q19 -16 34 -42.5t22.5 -46.5 t24.5 -36t43 -18l3 -20l-134 -46q38 -26 58.5 -56.5t26.5 -80.5q15 -131 44 -131q27 0 69 47zM615 389v2q-39 2 -65 13.5t-37 28t-19.5 35t-13.5 34t-18.5 26t-34.5 10.5q-41 0 -79.5 -33t-38.5 -80q18 -26 53 -63t40 -43z" />
+<glyph unicode="&#x1d577;" horiz-adv-x="699" d="M621 171l24 -8q-15 -75 -59.5 -131.5t-117.5 -56.5q-86 0 -160 48q-30 19 -68.5 34.5t-59.5 15.5q-80 0 -104 -77l-25 6q5 28 15 55t28 59t50.5 56.5t74.5 35.5q19 23 19 67q0 29 -14.5 53.5t-35.5 43.5l-42 40q-21 20 -35.5 49.5t-14.5 65.5q0 52 43.5 93t105.5 61 t125 20q60 0 116 -14.5t98.5 -51t42.5 -88.5q0 -45 -27.5 -96.5t-27.5 -91.5q0 -41 20.5 -68t49.5 -37l-4 -25q-88 0 -148 43t-60 97q0 51 27.5 106.5t27.5 95.5q0 44 -31.5 70.5t-74.5 26.5q-45 0 -81.5 -28t-36.5 -78q0 -9 3 -19t6 -17t12 -18l12 -16q4 -5 16 -19t15 -17 q55 -65 55 -113q0 -34 -33.5 -72.5t-75.5 -67.5q50 -4 95 -29l84 -49q37 -23 71 -23q67 0 100 69z" />
+<glyph unicode="&#x1d578;" horiz-adv-x="1133" d="M1061 120l20 -17q-20 -29 -60.5 -65.5t-76.5 -51.5h-24q-55 20 -84 72t-29 125q0 83 41 149.5t124 146.5v2q-43 0 -71 17.5t-41 42.5t-23 50t-24.5 42.5t-37.5 17.5q-36 0 -64 -38q24 -48 33 -90.5t9 -108.5q0 -84 -74 -218q-69 -125 -151 -221l-56 33q-36 22 -51 30 q-29 -29 -51 -55l-22 14l113 198q8 -5 33 -23l46 -33q21 -14 27 -14q15 0 22.5 97t7.5 217q0 72 -26 142t-67 70q-35 0 -64 -40q24 -48 33 -90.5t9 -108.5q0 -24 -5.5 -48.5t-17.5 -51.5l-19 -43q-7 -15 -23.5 -43.5t-18.5 -31.5q-66 -120 -151 -219q-25 14 -68 36l-49 25 q-33 -33 -50 -53l-22 14l112 196q118 -72 126 -72q21 0 21 316q0 82 -18.5 155.5t-58.5 73.5q-48 0 -48 -54q0 -44 37 -102.5t37 -97.5q0 -65 -47.5 -108.5t-142.5 -58.5l-8 24q21 8 38.5 31.5t17.5 53.5q0 35 -18 64l-38 58q-18 31 -18 70q0 85 89 130q47 23 111 23 q104 0 159 -57q78 59 138 59q54 0 86 -12.5t53 -42.5q63 55 148 55q50 0 90 -23q26 -15 41 -43t20.5 -51.5t24 -42t52.5 -19.5v-20q-55 -29 -76.5 -92.5t-21.5 -183.5q0 -151 28 -151q14 0 29 9t20.5 14.5t19.5 21.5z" />
+<glyph unicode="&#x1d579;" horiz-adv-x="862" d="M790 118l20 -17q-20 -28 -60.5 -64t-76.5 -51h-24q-52 13 -82.5 67.5t-30.5 127.5q0 83 41 149.5t124 146.5v2q-43 0 -71 17.5t-41 42.5t-23 50t-24.5 42.5t-37.5 17.5q-34 0 -64 -41q24 -48 33 -89.5t9 -106.5q0 -24 -5.5 -48.5t-17.5 -51.5l-19 -43q-7 -15 -23.5 -43.5 t-18.5 -31.5q-66 -120 -151 -219q-25 14 -68 36l-49 25q-33 -33 -50 -53l-22 14l112 196q118 -72 126 -72q21 0 21 316q0 36 -3.5 72t-11 73t-23 60.5t-36.5 23.5q-20 0 -35.5 -14.5t-15.5 -39.5q0 -44 37 -102.5t37 -97.5q0 -65 -47.5 -108.5t-142.5 -58.5l-8 24 q22 8 39 29.5t17 51.5q0 36 -18 66l-38 60q-18 30 -18 70q0 56 42 98q55 55 158 55q104 0 159 -57q68 59 154 59q50 0 90 -23q26 -15 41 -43t20.5 -52.5t24 -43t52.5 -19.5v-20q-55 -29 -76.5 -92.5t-21.5 -183.5q0 -151 28 -151q14 0 29 9t20.5 14.5t19.5 21.5z" />
+<glyph unicode="&#x1d57a;" horiz-adv-x="909" d="M54 274l18 19q25 -26 53 -26q21 0 35 15.5t14 42.5q0 15 -7 28.5t-13 20.5t-20 20q-17 15 -26.5 26.5t-18.5 33.5t-9 49q0 29 22 63t60.5 64.5t100.5 50.5t132 20q81 0 162.5 -30t147.5 -82.5t107.5 -131t41.5 -166.5q0 -132 -83 -214q-98 -96 -271 -96q-59 0 -103 13 t-64 29t-49.5 29t-64.5 13q-65 0 -105 -56l-22 14q30 75 79.5 126t117.5 51q37 0 71.5 -13.5t53.5 -27t51 -40.5q92 -77 160 -77q57 0 95.5 45.5t38.5 127.5q0 50 -19 110t-51.5 114.5t-83.5 90.5t-108 36q-15 0 -50 -10t-57 -10q-60 0 -93 16.5t-67 60.5q-18 0 -36.5 -18.5 t-18.5 -45.5q0 -26 24.5 -49t53.5 -39t53.5 -45.5t24.5 -65.5q0 -57 -52 -93t-119 -36q-63 0 -106 43z" />
+<glyph unicode="&#x1d57b;" horiz-adv-x="850" d="M791 519v-20q-67 -35 -67 -79q0 -25 35.5 -88t35.5 -108q0 -116 -83 -179.5t-221 -63.5h-13v-186h-162v234q-4 2 -13 8l-13 9q-4 2 -13 6l-14 8q-5 2 -13.5 5t-15.5 4.5t-16 2.5t-19 1q-77 0 -107 -42l-21 14q27 69 77.5 116t116.5 47q27 0 51 -6v235q0 45 -5.5 92.5 t-23.5 92t-46 44.5q-49 0 -49 -54q0 -43 37 -101t37 -99q0 -65 -47.5 -108.5t-142.5 -58.5l-8 24q22 8 39 29.5t17 51.5q0 47 -37 98.5t-37 97.5q0 73 56.5 113t143.5 40q105 0 159 -55q69 57 143 57q50 0 83 -13.5t46 -33.5t23.5 -43.5t16.5 -43.5t23.5 -34t46.5 -14z M701 484v2q-42 0 -70.5 17t-41.5 41t-23 48.5t-24.5 41.5t-37.5 17q-36 0 -64 -38q38 -66 38 -161v-370q36 -62 82 -62q41 0 60 32.5t19 78.5q0 33 -30 103t-30 107q0 98 122 143z" />
+<glyph unicode="&#x1d57c;" horiz-adv-x="930" d="M882 45l20 -16q-45 -88 -131 -88q-40 0 -63.5 17t-43.5 51q-74 -28 -164 -28q-59 0 -103 13t-64 29t-49.5 29t-64.5 13q-65 0 -105 -56l-22 13q30 75 79.5 126.5t117.5 51.5q16 0 30.5 -2t29 -7.5t23 -9t23.5 -14.5t19.5 -14t21 -17.5t19.5 -16.5q92 -77 160 -77 q15 0 32 3q-6 14 -13 35l-13 36q-5 13 -12 26.5t-15 20t-18 6.5q-20 0 -37 -23l-20 16q53 81 114 81q51 0 78 -30.5t47 -83.5q21 39 21 86q0 50 -22 110.5t-58.5 114t-90.5 90t-111 36.5q-15 0 -50 -10t-57 -10q-60 0 -93 16.5t-67 60.5q-18 0 -36.5 -18.5t-18.5 -45.5 q0 -26 24.5 -49t53.5 -39t53.5 -45.5t24.5 -65.5q0 -63 -50.5 -96t-120.5 -33q-63 0 -106 43l18 19q25 -26 53 -26q23 0 36 15.5t13 41.5q0 15 -7 29t-13 21t-20 20q-17 15 -26.5 26.5t-18.5 33.5t-9 49q0 29 22 63t60.5 64.5t100.5 50.5t132 20q81 0 162.5 -30t147.5 -82.5 t107.5 -131t41.5 -166.5q0 -128 -80 -211q12 -33 24.5 -49t32.5 -16q25 0 51 30z" />
+<glyph unicode="&#x1d57d;" horiz-adv-x="884" d="M821 117l20 -17q-20 -29 -65.5 -64.5t-90.5 -49.5h-24q-60 27 -79 66t-26 123q-13 153 -44 153l-52 -13q-50 -113 -88 -172.5t-125 -167.5q-25 14 -68 36l-49 25q-1 -1 -9 -8l-19 -18q-11 -10 -23 -25l-21 12l112 196q118 -72 126 -72q21 0 21 316q0 82 -18.5 155.5 t-58.5 73.5q-20 0 -34 -13.5t-14 -40.5q0 -42 37 -99t37 -101q0 -65 -47.5 -108.5t-142.5 -58.5l-8 24q22 8 39 29.5t17 51.5q0 34 -11.5 60.5t-25.5 41t-25.5 39t-11.5 55.5q0 61 51 107q52 46 149 46q118 0 181 -73l102 75q110 0 172.5 -44.5t62.5 -111.5 q0 -52 -31.5 -104t-101.5 -77v-2q64 -42 77 -162q15 -126 42 -126q29 0 67 43zM596 510q0 51 -20 86t-56 35q-30 0 -67 -39q29 -60 29 -136q0 -71 -8 -100q59 8 90.5 51.5t31.5 102.5z" />
+<glyph unicode="&#x1d57e;" horiz-adv-x="852" d="M458 482l-14 -22q-26 17 -54 17q-33 0 -56 -15.5t-23 -51.5q0 -29 17.5 -48.5t51.5 -19.5q25 0 53 19t51 41.5t64.5 41.5t89.5 19q70 0 117 -43t47 -128q0 -121 -101.5 -216t-250.5 -95q-192 0 -294 110t-102 281q0 79 41 153.5t119 124t172 49.5q64 0 139 -22t102 -22 q80 0 118 46l22 -14q-23 -77 -62.5 -122t-107.5 -45q-57 0 -145 33t-133 33q-99 0 -165.5 -58t-66.5 -154q0 -58 22.5 -100.5t56 -66.5t84 -38t96.5 -18.5t102 -4.5q45 0 92.5 7t100 24t85.5 52.5t33 84.5q0 39 -18.5 56.5t-61.5 17.5q-27 0 -51.5 -19t-47 -46.5t-48.5 -55 t-66.5 -46.5t-89.5 -19q-86 0 -135.5 48.5t-49.5 117.5q0 61 47.5 108.5t119.5 47.5q57 0 100 -42z" />
+<glyph unicode="&#x1d57f;" horiz-adv-x="793" d="M707 680l26 -7q-50 -202 -190 -202q-20 0 -50.5 9.5t-49.5 20.5q-10 -16 -10 -31q0 -20 18 -36t39.5 -25t39.5 -29t18 -47q0 -52 -40 -78.5t-112 -26.5q-44 0 -84 22l12 23q15 -10 34 -10q20 0 29.5 12.5t9.5 28.5q0 18 -22 56t-22 61q0 39 53 98q-68 46 -132 46 q-32 0 -64 -27.5t-32 -74.5t26.5 -75.5t69.5 -30.5l-3 -26q-97 0 -157 45t-60 118q0 89 66 148t171 59q57 0 112 -22.5t100.5 -45t79.5 -22.5q19 0 30 1.5t30 7t35 21t29 39.5zM715 171l25 -8q-14 -78 -64.5 -133t-132.5 -55q-65 0 -159.5 45.5t-148.5 45.5q-87 0 -130 -70 l-23 13q15 83 75 137.5t137 54.5q54 0 103 -15.5t78 -34t61.5 -34t59.5 -15.5q10 0 23.5 2.5t32 9t36 21.5t27.5 36z" />
+<glyph unicode="&#x1d580;" horiz-adv-x="860" d="M809 80l-156 -94h-27q-62 37 -78 115l-282 -126q-34 40 -102 84.5t-110 58.5v15l36 17q11 6 34 23.5t33.5 36t20 51.5t9.5 75v216q0 55 -35 55q-27 0 -78 -29l-13 22l167 101h25q96 -33 96 -145v-125q0 -70 -31 -116.5t-107 -103.5q94 -29 185 -131l148 65v266 q0 166 -7 196l264 94l8 -25q-36 -12 -58 -28t-31.5 -42.5t-11.5 -49.5t-2 -67v-367q0 -43 23 -43q27 0 67 24z" />
+<glyph unicode="&#x1d581;" horiz-adv-x="855" d="M800 524v-20q-37 -20 -52 -38.5t-15 -41.5q0 -24 30.5 -87t30.5 -113q0 -114 -96 -178.5t-238 -64.5q-60 0 -104 14.5t-64 31.5t-49.5 31.5t-64.5 14.5q-24 0 -38 -1.5t-35 -11.5t-34 -29l-21 14q27 69 77.5 116t116.5 47q12 7 18.5 11.5t20 22t21.5 40.5t14.5 65.5 t6.5 97.5q0 33 -3.5 68t-11.5 71t-23.5 59t-37.5 23q-20 0 -34 -15t-14 -44q0 -41 37 -98t37 -102q0 -65 -47.5 -108.5t-142.5 -58.5l-8 24q21 8 38.5 30.5t17.5 52.5q0 32 -11.5 58t-25.5 40.5t-25.5 39.5t-11.5 56q0 73 57 115.5t143 42.5q105 0 159 -55q69 57 143 57 q50 0 83 -12.5t46 -31t23 -41t16 -42t24 -34t47 -16.5zM711 484v2q-42 0 -70 17t-41.5 41t-23.5 48.5t-25 41.5t-38 17q-36 0 -64 -38q41 -69 41 -144q0 -166 -192 -271v-2q40 -14 75 -44.5t55 -59t44 -50.5t46 -22q50 0 85 33t35 78q0 46 -25 108.5t-25 104.5q0 94 123 140 z" />
+<glyph unicode="&#x1d582;" horiz-adv-x="1121" d="M1065 524l1 -20q-67 -36 -67 -80q0 -24 30.5 -87.5t30.5 -113.5q0 -66 -28.5 -111.5t-82.5 -83.5q-64 -47 -145 -47q-113 0 -168 34q-51 -34 -175 -34q-60 0 -104 14.5t-64.5 31.5t-50 31.5t-64.5 14.5q-65 0 -107 -42l-21 14q27 69 77.5 116t116.5 47q12 7 18.5 11.5 t20 22t21.5 40.5t14.5 65.5t6.5 97.5q0 33 -3.5 68t-11.5 71t-23.5 59t-37.5 23q-18 0 -33 -14.5t-15 -39.5q0 -43 37 -99t37 -101q0 -65 -47.5 -108.5t-142.5 -58.5l-8 24q22 8 39 29.5t17 51.5q0 34 -11.5 60.5t-25.5 41t-25.5 39t-11.5 55.5q0 71 57 112t143 41 q105 0 159 -55q67 57 151 57q38 0 80 -13t62 -29q49 42 115 42q51 0 84.5 -12.5t46.5 -31t23 -41t15.5 -42t23 -33.5t46.5 -17zM977 484v2q-42 0 -70.5 17t-41.5 41t-23 48.5t-25 41.5t-38 17q-42 0 -70.5 -50t-28.5 -100q0 -23 7 -44t15 -33l21 -31q25 -33 43.5 -76.5 t18.5 -80.5q0 -43 -11 -69t-36 -57q19 -43 47.5 -66.5t54.5 -23.5q27 0 45.5 29t18.5 75q0 41 -25 102t-25 116q0 95 123 142zM298 198v-2q40 -14 78.5 -44t62.5 -57.5t51 -49t49 -21.5q38 0 64 54t26 114q0 57 -30 96q-50 66 -50 131q0 74 87 180q-14 25 -42.5 38.5 t-59.5 13.5q-55 0 -85 -38q41 -69 41 -144q0 -166 -192 -271z" />
+<glyph unicode="&#x1d583;" horiz-adv-x="819" d="M775 680l-121 -198q-20 16 -71 48.5t-61 32.5q-6 0 -11.5 -17t-9.5 -53t-4 -81q74 0 101.5 4t46.5 24l23 -13q-24 -64 -62.5 -99t-108.5 -39v-43q0 -64 37.5 -104.5t84.5 -40.5q59 0 106 40l16 -21l-187 -134h-25q-101 37 -159 121q-34 -43 -123 -132l-63 35 q-47 27 -62 34q-2 -2 -9 -8.5t-17 -17.5l-24 -27l-22 14l124 196l41 -27l62 -41q27 -17 32 -17q11 0 18.5 49t7.5 122h-19q-39 0 -57 -1t-39 -9t-31 -24l-23 13q27 68 64 103t105 41v27q0 50 -22.5 94.5t-54.5 44.5q-27 0 -63 -13t-63 -35l-16 20l180 144h25 q75 -23 141 -121q31 48 124 130q105 -56 117 -60q13 10 50 53z" />
+<glyph unicode="&#x1d584;" horiz-adv-x="837" d="M434 641h2q21 23 57.5 41.5t79.5 18.5q53 0 94 -25.5t65.5 -69.5t37 -98t12.5 -116q0 -94 -23.5 -177.5t-72 -158.5t-97 -131t-123.5 -130h-25q-39 27 -57.5 36.5t-39.5 9.5q-80 0 -130 -46l-21 14q76 163 203 163q39 0 67.5 -24t38.5 -55q36 54 69.5 191t33.5 328 q0 106 -18.5 171.5t-56.5 65.5q-45 0 -70 -44q26 -66 26 -138q0 -25 -2.5 -46t-9.5 -40l-14 -33q-5 -13 -20 -29l-24 -25q-8 -9 -30 -26l-34 -24l-40 -26l-43 -28v-1q29 -7 70.5 -32t63.5 -46l83 35l12 -23l-209 -137q-36 42 -94.5 73t-105.5 36v25q113 51 172.5 125 t59.5 204q0 124 -25 178q-19 39 -54 39q-21 0 -35.5 -13t-14.5 -42q0 -44 37 -103.5t37 -95.5q0 -63 -51.5 -108.5t-138.5 -58.5l-8 24q22 8 39 29.5t17 51.5q0 34 -11.5 60t-25.5 40.5t-25.5 39t-11.5 55.5q0 73 57 113.5t143 40.5q118 0 184 -58z" />
+<glyph unicode="&#x1d585;" horiz-adv-x="755" d="M516 280v-2q89 -19 138 -77t49 -146q0 -104 -79 -177t-208 -73q-54 0 -93.5 14t-59.5 33.5t-36 39t-34.5 33.5t-43.5 14q-36 0 -84 -42l-21 14q4 17 17 41.5t34 53.5t54.5 48.5t70.5 19.5q109 0 130 -119q8 -49 31 -83t58 -34q92 0 92 203q0 88 -42.5 144t-98.5 56 q-50 0 -83 -14t-70 -60l-21 14q23 37 48 60.5t66 37.5v2q-67 26 -97 87l22 15q51 -65 138 -65q52 0 86.5 42.5t34.5 119.5t-36 119t-96 42q-125 0 -212 -139l-24 10q31 80 102.5 134.5t179.5 54.5q118 0 186 -60q65 -59 65 -157q0 -67 -42.5 -121.5t-120.5 -82.5z" />
+<glyph unicode="&#x1d586;" horiz-adv-x="600" d="M545 71l-126 -91h-24q-45 24 -64 61l-140 -65h-24q-50 30 -81 83t-31 111q0 53 22.5 100.5t65.5 77.5l81 55q55 36 104 72h24q45 -39 77.5 -60t77.5 -35v-25q-18 0 -30.5 -13t-12.5 -32v-188q0 -45 30 -45q15 0 37 16zM325 79v236l-75 60q-56 -62 -56 -175 q0 -50 25.5 -97.5t51.5 -47.5q7 0 14.5 2.5t12 5t14.5 8.5t13 8z" />
+<glyph unicode="&#x1d587;" horiz-adv-x="559" d="M504 335v-116q0 -25 -8 -46t-27.5 -39.5t-32.5 -28t-41 -28.5q-82 -55 -120 -101h-24q-103 59 -206 76v25q34 4 42.5 15t8.5 56v366q0 51 -12.5 95.5t-31.5 67.5l20 18q50 -40 79 -74q24 32 67 52.5t97 20.5q22 0 62 -6v-25q-71 0 -106.5 -34.5t-35.5 -97.5v-113l147 57 h24q98 -17 98 -140zM365 170v134q0 40 -12 60.5t-41 39.5l-77 -26v-235l106 -54q14 15 19 31t5 50z" />
+<glyph unicode="&#x1d588;" horiz-adv-x="464" d="M412 47l-196 -71h-24q-62 34 -99.5 95.5t-37.5 125.5q0 92 37 143t133 97l80 38h24l77 -90l-104 -86l-82 90q-11 -8 -15 -20q-11 -28 -11 -122q0 -76 37.5 -135t100.5 -59q24 0 72 19z" />
+<glyph unicode="&#x1d589;" horiz-adv-x="557" d="M502 336v-149q0 -25 -25.5 -49.5t-71 -55t-65.5 -48.5q-40 -37 -59 -59h-24q-98 60 -157 60h-52v24q46 0 46 51v270v-4q63 17 126 58v2l-42 16q-13 5 -38.5 18.5t-38.5 25.5t-23.5 31.5t-10.5 42.5q0 61 62.5 92.5t148.5 31.5v-25q-72 -11 -72 -51q0 -24 23.5 -41 t65.5 -33.5t56 -25.5q80 -48 115.5 -87t35.5 -95zM363 159v155q0 19 -5 34t-16 26t-19.5 17.5t-23 15t-18.5 11.5l-16 -8q-16 -8 -25 -14q-7 -2 -7 -45v-203l113 -53q17 27 17 64z" />
+<glyph unicode="&#x1d58a;" horiz-adv-x="476" d="M427 62l-190 -86h-23q-43 9 -75.5 34.5t-49.5 58t-25.5 64.5t-8.5 60q0 185 161 250q57 22 116 32h24l70 -215l-232 -90q0 -42 39 -77t73 -35q65 0 109 28zM194 201l57 23q31 16 31 36q0 9 -22 74.5t-28 77.5q-17 -9 -26 -39.5t-10.5 -56.5t-1.5 -69v-46z" />
+<glyph unicode="&#x1d58b;" horiz-adv-x="370" d="M327 700l25 -9q-2 -25 -12.5 -55.5t-35.5 -58.5t-58 -28q-23 0 -43 10.5t-35 10.5q-13 0 -24 -10.5t-11 -32.5q0 -79 136 -79h61v-65h-96l-25 -597h-101l-24 597h-51v25q50 0 50 57q0 15 -4.5 49.5t-4.5 51.5q0 45 24 87t77 42q23 0 54.5 -16t45.5 -16q32 0 52 37z" />
+<glyph unicode="&#x1d58c;" horiz-adv-x="566" d="M506 380v-25q-18 0 -30.5 -13t-12.5 -33v-184q0 -45 20 -98t20 -85q1 -74 -62 -117.5t-140 -43.5q-48 0 -76.5 7.5t-40 18.5t-19.5 23t-26 23t-50 15v24q56 30 110 30q32 0 52.5 -16t26.5 -35.5t13 -35.5t17 -16q27 0 41.5 17.5t14.5 63.5q0 38 -18 80.5t-22 57.5 l-134 -62h-25q-49 30 -79.5 83.5t-30.5 110.5q0 53 22.5 101t64.5 77q24 17 58 39l61 41l66 47h24q84 -73 155 -95zM324 79v236l-75 60q-55 -61 -55 -175q0 -50 25 -97.5t51 -47.5q9 0 17 3t20.5 11t16.5 10z" />
+<glyph unicode="&#x1d58d;" horiz-adv-x="576" d="M516 335v-284q0 -79 -63 -155.5t-125 -114.5l-18 19q29 36 48 87t19 90v327q0 40 -12 60.5t-41 39.5l-77 -26v-242l53 -30l34 37l22 -14q-72 -103 -95 -153h-24q-83 58 -192 76v25q37 4 50 16t13 55v366q0 51 -12.5 95.5t-31.5 67.5l20 18q50 -40 79 -74q24 32 67 52.5 t97 20.5q22 0 62 -6v-25q-71 0 -106.5 -34.5t-35.5 -97.5v-113l147 57h24q98 -17 98 -140z" />
+<glyph unicode="&#x1d58e;" horiz-adv-x="429" d="M269 649q0 -16 -25 -54.5t-45 -38.5q-21 0 -46 38t-25 55q0 20 20 34t51 14t50.5 -14t19.5 -34zM379 101l-141 -125h-24q-49 25 -66 55t-17 91v191q0 55 -33 55q-15 0 -48 -22l-15 22l147 107h24q91 -58 120 -61v-25q-56 -7 -56 -43v-178q0 -85 24 -85q16 0 66 40z" />
+<glyph unicode="&#x1d58f;" horiz-adv-x="389" d="M280 649q0 -16 -25 -54.5t-45 -38.5q-21 0 -46 38t-25 55q0 20 20 34t51 14t50.5 -14t19.5 -34zM337 414v-25q-56 -7 -56 -43v-394q0 -44 12.5 -87t31.5 -67l-20 -17q-46 31 -79 74q-22 -27 -58.5 -50.5t-68.5 -23.5q-31 0 -59 6v27q39 0 70.5 35t31.5 113v351 q0 49 -28 49q-18 0 -57 -26l-15 21l151 118h24q91 -58 120 -61z" />
+<glyph unicode="&#x1d590;" horiz-adv-x="456" d="M402 688v-25q-72 0 -112 -35t-40 -97v-89h33v62q0 56 30.5 81.5t79.5 25.5v-109h-26q-3 27 -20 27q-27 0 -27 -67v-20h73v-65h-143v-240l72 -36l49 56l22 -15q-106 -140 -119 -166h-24q-80 56 -202 76v25q37 4 50 16t13 55v229h-63v25q63 0 63 50v62q0 51 -12.5 95.5 t-31.5 67.5l20 18q50 -40 79 -74q24 32 67 52.5t97 20.5q32 0 72 -6z" />
+<glyph unicode="&#x1d591;" horiz-adv-x="433" d="M357 158l22 -15q-78 -101 -108 -167h-24q-80 56 -202 76v25q37 4 50 16t13 55v366q0 51 -12.5 95.5t-31.5 67.5l20 18q50 -40 79 -74q24 32 67 52.5t97 20.5q22 0 46 -6v-25q-57 0 -91.5 -35.5t-34.5 -96.5v-394l62 -31z" />
+<glyph unicode="&#x1d592;" horiz-adv-x="984" d="M932 90l-128 -114h-24q-49 24 -66 53.5t-17 88.5v215l-56 53l-84 -43v-184q0 -42 8 -55.5t39 -16.5v-25q-92 -8 -104 -86h-24q-11 77 -111 86v25q30 3 41.5 16t11.5 44v176q0 42 -53 65l-87 -44v-185q0 -42 8 -55.5t39 -16.5v-25q-92 -8 -104 -86h-24q-11 77 -111 86v25 q32 4 42.5 18.5t10.5 53.5v154q0 33 -11.5 51t-30.5 18q-24 0 -45 -15l-12 21l127 87h24q33 -16 56 -41t25 -52l173 93h24q33 -16 56.5 -41t25.5 -52l183 93h24q22 -26 52.5 -46.5t59.5 -21.5v-25q-34 -5 -34 -57v-174q0 -68 28 -68q10 0 18.5 5t30.5 24z" />
+<glyph unicode="&#x1d593;" horiz-adv-x="696" d="M644 90l-129 -114h-24q-49 24 -66 53.5t-17 88.5v215l-54 52l-76 -41v-185q0 -42 8 -55.5t39 -16.5v-25q-92 -8 -104 -86h-24q-11 77 -111 86v25q32 4 42.5 18.5t10.5 53.5v154q0 33 -11.5 51t-30.5 18q-24 0 -45 -15l-12 21l127 87h24q33 -16 56 -41t25 -52l173 93h24 q22 -26 52.5 -46.5t59.5 -21.5v-25q-34 -5 -34 -57v-174q0 -68 27 -68q10 0 18.5 5t32.5 24z" />
+<glyph unicode="&#x1d594;" horiz-adv-x="554" d="M499 295v-101q0 -26 -24.5 -51t-71 -58t-64.5 -50q-34 -32 -58 -59h-24q-110 64 -162 64h-50v25q46 0 46 50v254q19 5 46 17l86 39l112 50h24q77 -46 108.5 -84.5t31.5 -95.5zM360 150v134q0 12 -5 24t-13.5 22.5t-17.5 20t-20.5 18t-19.5 13.5l-16 10q-8 6 -9 6l-22 -10 q-7 -2 -7 -51v-186l111 -65q19 32 19 64z" />
+<glyph unicode="&#x1d595;" horiz-adv-x="640" d="M585 335v-120q0 -50 -23.5 -83.5t-68.5 -62.5q-5 -3 -23 -15l-24 -16l-21 -15q-14 -10 -21 -16t-16 -14.5t-16 -16.5h-24q-13 15 -32 19v-214h-139v246q-66 -2 -118 -51l-23 13q53 120 141 162v205q0 24 -15.5 42t-31.5 40t-16 55q0 26 22 54t52 46l21 -15 q-15 -24 -15 -35q0 -18 19 -31t41.5 -20.5t42 -26t19.5 -47.5l137 57h24q53 -19 80.5 -60t27.5 -80zM446 157v137q0 63 -74 104l-56 -21v-220q63 -20 116 -81q10 11 12 26t2 55z" />
+<glyph unicode="&#x1d596;" horiz-adv-x="574" d="M522 366h-20q-38 0 -38 -45v-540h-139v258l-134 -63h-24q-50 30 -81 83t-31 111q0 53 22.5 100.5t65.5 77.5l81 55q55 36 104 72h24q91 -78 170 -85v-24zM325 79v246l-75 50q-56 -62 -56 -175q0 -50 25.5 -97.5t51.5 -47.5q8 0 54 24z" />
+<glyph unicode="&#x1d597;" horiz-adv-x="525" d="M493 370l-110 -84l-85 106l-25 -13v-242l71 -36l70 70l19 -18q-42 -44 -84.5 -98t-55.5 -79h-24q-79 56 -173 56h-25v24q35 3 49 14.5t14 48.5v194q0 69 -43 69q-15 0 -39 -15l-12 21l122 87h24q41 -19 68 -63l134 63h24z" />
+<glyph unicode="&#x1d598;" horiz-adv-x="557" d="M180 536l-24 11q21 47 63 71.5t90 24.5q65 0 112.5 -40.5t47.5 -106.5q0 -57 -43.5 -99.5t-108.5 -42.5q-70 0 -110 63q-15 -30 -15 -79q0 -36 19 -58t46 -22q17 0 29 3.5t16 7.5l18 15q51 51 81 51q39 0 68 -31q36 -36 36 -107q0 -32 -31 -71t-90 -90.5t-66 -59.5h-25 q-42 39 -111 39q-54 0 -110 -46l-20 16q83 133 182 133q71 0 116 -61q16 42 16 81q0 84 -42 84q-4 0 -8.5 -1t-8.5 -2.5t-9 -4.5l-9 -6q-3 -2 -9 -7.5t-9 -7.5t-10 -8.5t-9 -8.5q-35 -31 -73 -31q-56 0 -91 38t-35 96q0 34 24 64.5t71 71.5l84 75h25q13 -23 47 -23 q16 0 32.5 16.5t16.5 44.5q0 36 -19.5 55t-52.5 19q-27 0 -56 -18t-45 -48z" />
+<glyph unicode="&#x1d599;" horiz-adv-x="438" d="M356 167l22 -14q-54 -72 -107 -176h-24q-80 56 -202 76v25q37 4 50 16t13 55v247h-63v25q101 9 101 235h101v-195h113v-65h-113v-258l61 -31z" />
+<glyph unicode="&#x1d59a;" horiz-adv-x="681" d="M629 90l-129 -114h-24q-39 19 -57 40.5t-23 56.5l-170 -97h-24q-22 27 -58.5 52.5t-65.5 26.5v25q26 4 36 15t10 42v172q0 42 -9 57.5t-28 15.5t-40 -15l-12 21l117 87h24q87 -42 87 -136v-219l51 -50l79 43v185q0 40 -7.5 51t-39.5 15v25q92 8 104 86h24q11 -77 111 -86 v-25q-33 -5 -43 -16.5t-10 -49.5v-155q0 -60 27 -60q10 0 18.5 5t32.5 24z" />
+<glyph unicode="&#x1d59b;" horiz-adv-x="573" d="M526 295v-101q0 -26 -24.5 -51t-71 -58t-64.5 -50q-34 -32 -58 -59h-24q-110 64 -162 64h-50v25q46 0 46 52v243q0 18 -10 33t-21.5 25t-21.5 29.5t-10 45.5t22 54t52 46l21 -15q-15 -24 -15 -35q0 -18 17.5 -30.5t38.5 -19.5t41 -23.5t24 -40.5q24 11 106 46h24 q77 -46 108.5 -84.5t31.5 -95.5zM387 150v134q0 12 -5 24t-13.5 22.5t-17.5 20t-20.5 18l-18.5 13.5l-16 10q-9 6 -10 6l-22 -10q-7 -2 -7 -51v-186l111 -65q19 27 19 64z" />
+<glyph unicode="&#x1d59c;" horiz-adv-x="850" d="M795 295v-107q0 -25 -23 -49t-67 -55.5t-63 -48.5q-34 -32 -58 -59h-24l-28 16l-29 16l-25 14q-17 8 -28 11.5t-24.5 6.5t-26.5 3h-48v25q20 0 28 11t8 39v220l-56 51l-74 -28v-218q0 -31 9 -42.5t38 -13.5v-25q-92 -8 -104 -86h-24q-11 77 -111 86v25q30 3 41.5 16 t11.5 44v209q0 19 -10 35t-21.5 26t-21.5 30t-10 46t22 54t52 46l21 -15q-15 -24 -15 -35q0 -18 19 -30t42 -19.5t42 -30.5t19 -61l157 73h24q63 -25 89 -72l149 72h24q52 -39 73.5 -79.5t21.5 -100.5zM656 160v124q0 68 -61 105l-62 -24q-7 -3 -7 -52v-162l113 -64 q17 29 17 73z" />
+<glyph unicode="&#x1d59d;" horiz-adv-x="521" d="M489 385l-114 -77l-67 84l-25 -13v-114h74v-65h-74v-64l70 -41l43 44l18 -18l-117 -145h-25l-128 78q-17 -32 -17 -48q0 -37 20.5 -52.5t78.5 -34.5l-36 -128h-25q-99 43 -99 157q0 83 78 152v100h-70v65h70v48q0 69 -43 69q-15 0 -39 -15l-12 21l122 87h24 q41 -19 68 -63l133 63h24z" />
+<glyph unicode="&#x1d59e;" horiz-adv-x="596" d="M536 283v-147q0 -72 -20.5 -135t-53.5 -106.5t-61 -70t-56 -43.5l-18 19q70 88 70 255v196q0 74 -14.5 104.5t-46.5 52.5l-79 -31v-240l54 -31l38 48l22 -15q-53 -67 -100 -163h-24q-83 58 -192 76v25q37 4 50 16t13 55v208q0 19 -10 35t-21.5 26t-21.5 30t-10 46t22 54 t52 46l21 -15q-15 -24 -15 -35q0 -18 17.5 -29.5t39 -18.5t41 -26.5t23.5 -50.5l135 57h24q121 -45 121 -192z" />
+<glyph unicode="&#x1d59f;" horiz-adv-x="484" d="M205 221l211 -119q21 -30 21 -91q0 -60 -60 -109q-56 -44 -207 -121h-24q-38 23 -68 69.5t-42 86.5v25q143 88 210 191l-95 54v21q94 49 94 114q0 50 -38 50q-53 0 -94 -27l-11 26l66 33q63 31 94 51h25q97 -16 97 -102q0 -21 -12.5 -41.5t-29.5 -35t-44.5 -30 t-46.5 -24.5t-46 -20v-1zM277 132h-3q-38 -73 -109 -144q14 -52 31.5 -84t48.5 -48q26 24 39.5 58.5t13.5 107.5q0 16 -7 57t-14 53z" />
+<glyph unicode="&#x1d5d4;" horiz-adv-x="690" d="M665 0h-130l-66 162h-248l-66 -162h-130l306 690h28zM428 264l-83 204l-83 -204h166z" />
+<glyph unicode="&#x1d5d5;" horiz-adv-x="636" d="M463 373l1 -4q75 -36 102.5 -79.5t27.5 -101.5q0 -81 -73 -134.5t-181 -53.5h-260v676h237q118 0 180 -43t62 -125q0 -41 -25 -77.5t-71 -57.5zM208 413h72q141 0 141 89q0 37 -23 54.5t-77 17.5h-113v-161zM208 102h103q80 0 110.5 29t30.5 80q0 52 -49.5 76t-119.5 24 h-75v-209z" />
+<glyph unicode="&#x1d5d6;" horiz-adv-x="723" d="M619 193l69 -68q-115 -144 -285 -144q-164 0 -259 100.5t-95 258.5q0 152 97.5 251.5t255.5 99.5q80 0 140.5 -20t106.5 -74v-149h-11q-72 141 -218 141q-101 0 -167 -66.5t-66 -180.5q0 -105 56.5 -182t161.5 -77q63 0 111.5 25.5t102.5 84.5z" />
+<glyph unicode="&#x1d5d7;" horiz-adv-x="709" d="M80 676h179q221 0 318 -89t97 -252q0 -48 -12 -94t-40 -90t-69 -77.5t-104 -53.5t-140 -20h-229v676zM210 102h67q259 0 259 234q0 122 -66 180t-182 58h-78v-472z" />
+<glyph unicode="&#x1d5d8;" horiz-adv-x="635" d="M597 102l-27 -102h-490v676h480v-102h-350v-167h241v-103h-241v-202h387z" />
+<glyph unicode="&#x1d5d9;" horiz-adv-x="582" d="M570 574h-360v-169h213v-102h-213v-303h-130v676h477z" />
+<glyph unicode="&#x1d5da;" horiz-adv-x="746" d="M671 357v-279q-32 -24 -48.5 -35t-52 -29t-78.5 -25.5t-98 -7.5q-168 0 -262.5 100t-94.5 259q0 151 98 251t256 100q79 0 138.5 -20.5t107.5 -73.5v-149h-11q-73 141 -223 141q-97 0 -162.5 -66.5t-65.5 -180.5q0 -66 22.5 -123t75 -96.5t125.5 -39.5q76 0 155 43v129 h-107l-31 102h256z" />
+<glyph unicode="&#x1d5db;" horiz-adv-x="715" d="M635 0h-130v297h-295v-297h-130v676h130v-277h295v277h130v-676z" />
+<glyph unicode="&#x1d5dc;" horiz-adv-x="440" d="M375 102l-9 -102h-287l-14 102h90v472h-90l14 102h287l9 -102h-90v-472h90z" />
+<glyph unicode="&#x1d5dd;" horiz-adv-x="481" d="M406 676v-545q0 -150 -102 -203q-45 -24 -110 -24q-95 0 -179 98l49 98h18q33 -49 59 -71.5t63 -22.5q44 0 58 30.5t14 81.5v558h130z" />
+<glyph unicode="&#x1d5de;" horiz-adv-x="712" d="M707 0h-170l-296 306l-33 -29v-277h-128v676h128v-263l295 263h145v-14l-318 -278z" />
+<glyph unicode="&#x1d5df;" horiz-adv-x="603" d="M587 102l-19 -102h-488v676h130v-574h377z" />
+<glyph unicode="&#x1d5e0;" horiz-adv-x="913" d="M833 0h-128v467l-235 -467h-27l-235 467v-467h-128v676h161l214 -440h3l214 440h161v-676z" />
+<glyph unicode="&#x1d5e1;" horiz-adv-x="724" d="M644 -18l-105 20l-331 500v-502h-128v676h157l279 -424v424h128v-694z" />
+<glyph unicode="&#x1d5e2;" horiz-adv-x="778" d="M743 337q0 -157 -99 -256t-254 -99q-154 0 -254.5 99t-100.5 256t100 256t254 99t254 -99t100 -256zM605 337q0 115 -57 184t-159 69t-159 -69t-57 -184q0 -116 57 -184.5t160 -68.5q102 0 158.5 68.5t56.5 184.5z" />
+<glyph unicode="&#x1d5e3;" horiz-adv-x="581" d="M80 676h209q139 0 209.5 -50.5t70.5 -144.5q0 -91 -69.5 -147t-186.5 -56h-103v-278h-130v676zM210 380h71q83 0 119.5 25t36.5 77q0 92 -162 92h-65v-194z" />
+<glyph unicode="&#x1d5e4;" horiz-adv-x="779" d="M754 -160v-16q-50 0 -75.5 0.5t-70 3.5t-70.5 9t-63 17.5t-62 28.5t-52.5 43.5t-49.5 60.5q-125 27 -200.5 119t-75.5 228q0 158 100 257.5t254 99.5q155 0 254.5 -99t99.5 -258q0 -135 -75 -226.5t-199 -119.5q24 -27 59.5 -41.5t62 -17t70.5 -3.5zM605 336 q0 115 -57 184t-159 69t-159 -69t-57 -184q0 -116 57 -184.5t160 -68.5q102 0 158.5 68.5t56.5 184.5z" />
+<glyph unicode="&#x1d5e5;" horiz-adv-x="670" d="M657 0h-159l-247 291h-41v-291h-130v676h216q136 0 205 -48.5t69 -139.5q0 -69 -44.5 -119t-122.5 -69zM210 393h71q85 0 121 23t36 73q0 45 -37.5 65t-125.5 20h-65v-181z" />
+<glyph unicode="&#x1d5e6;" horiz-adv-x="554" d="M483 466h-14q-23 57 -77 90t-109 33q-43 0 -74 -20.5t-31 -61.5q0 -38 33 -62t91 -46q120 -46 164.5 -92t44.5 -124q0 -39 -19.5 -82t-47.5 -68q-59 -52 -178 -52q-132 0 -215 81l-16 162h14q33 -69 98.5 -105t120.5 -36q63 0 89.5 28t26.5 63q0 39 -24.5 59.5 t-94.5 47.5q-117 45 -164.5 95.5t-47.5 127.5q0 83 63 135t157 52q69 0 125.5 -20t84.5 -51v-154z" />
+<glyph unicode="&#x1d5e7;" horiz-adv-x="641" d="M627 574h-240v-574h-130v574h-243l14 102h589z" />
+<glyph unicode="&#x1d5e8;" horiz-adv-x="699" d="M624 676v-430q0 -265 -274 -265q-275 0 -275 265v430h128v-419q0 -79 14 -104q37 -70 133 -70q91 0 132 70q14 23 14 116v407h128z" />
+<glyph unicode="&#x1d5e9;" horiz-adv-x="690" d="M665 676l-306 -694h-28l-306 694h130l190 -465l190 465h130z" />
+<glyph unicode="&#x1d5ea;" horiz-adv-x="997" d="M967 676l-255 -691l-28 1l-184 408h-3l-184 -409h-28l-255 691h131l146 -439l195 439l188 -439l146 439h131z" />
+<glyph unicode="&#x1d5eb;" horiz-adv-x="740" d="M700 0h-154l-179 239l-173 -239h-154l249 343l-248 333h154l170 -228l166 228h154l-242 -333z" />
+<glyph unicode="&#x1d5ec;" horiz-adv-x="694" d="M674 676l-262 -394v-282h-130v282l-262 394h145l182 -283l182 283h145z" />
+<glyph unicode="&#x1d5ed;" horiz-adv-x="653" d="M623 102l-15 -102h-583v16l372 558h-334l13 102h525v-16l-374 -558h396z" />
+<glyph unicode="&#x1d5ee;" horiz-adv-x="489" d="M428 0h-125l-6 44q-32 -33 -66.5 -45.5t-84.5 -12.5t-86.5 36t-36.5 100q0 45 13.5 71.5t40.5 50.5q63 55 222 64v16q0 54 -74 54q-44 0 -69.5 -16t-38.5 -54h-12l-76 44q21 61 76 91t132 30q78 0 130 -35.5t52 -98.5v-263q0 -29 9 -76zM299 152v61q-151 0 -151 -82 q0 -27 17.5 -38.5t39.5 -11.5q29 0 54 19.5t40 51.5z" />
+<glyph unicode="&#x1d5ef;" horiz-adv-x="512" d="M177 426v-1q49 48 125 48q49 0 88 -23q46 -27 71.5 -81t25.5 -124q0 -140 -74 -211q-50 -47 -140 -47q-30 0 -62 12.5t-48 30.5h-3l-92 -43h-13v689h120v-250h2zM175 301v-158q41 -61 94 -61q44 0 68.5 41.5t24.5 107.5t-26.5 106.5t-64.5 40.5q-65 0 -96 -77z" />
+<glyph unicode="&#x1d5f0;" horiz-adv-x="462" d="M373 145l69 -67q-46 -55 -86 -73.5t-111 -18.5q-95 0 -157.5 66.5t-62.5 168.5q0 111 67 181.5t164 70.5q64 0 114 -27.5t63 -77.5l-77 -57h-17q-18 67 -85 67q-43 0 -73.5 -41t-30.5 -111q0 -57 31.5 -97.5t83.5 -40.5q70 0 108 57z" />
+<glyph unicode="&#x1d5f1;" horiz-adv-x="518" d="M463 8l-115 -22l-7 3v45h-2q-46 -48 -122 -48q-89 0 -140.5 65t-51.5 176t56.5 178.5t150.5 67.5q55 0 105 -39v242h120v-550q0 -64 6 -118zM337 169v140q-22 38 -41.5 53.5t-50.5 15.5q-45 0 -70 -43.5t-25 -104.5q0 -62 25.5 -105.5t68.5 -43.5q35 0 55.5 22t37.5 66z " />
+<glyph unicode="&#x1d5f2;" horiz-adv-x="452" d="M363 143l70 -66q-47 -54 -84.5 -72t-102.5 -18q-99 0 -160 64t-61 171q0 123 68 194q54 57 147 57q86 0 134 -66.5t48 -173.5v-28h-272q0 -59 31.5 -88t78.5 -29q67 0 103 55zM159 300h143q0 78 -69 78q-26 0 -49.5 -22.5t-24.5 -55.5z" />
+<glyph unicode="&#x1d5f3;" horiz-adv-x="340" d="M374 638l-22 -90l-17 -1q-29 49 -84 49q-59 0 -59 -84v-51h90v-95h-90v-366h-120v366h-58v95h58v42q0 91 48 139.5t121 48.5q49 0 75.5 -11t57.5 -42z" />
+<glyph unicode="&#x1d5f4;" horiz-adv-x="504" d="M219 76h84q187 0 187 -128q0 -45 -28.5 -78t-75.5 -51q-64 -25 -184 -25q-77 0 -125.5 29.5t-48.5 85.5q0 25 16 47.5t45 37.5q-42 19 -42 67q0 29 16.5 52.5t61.5 51.5v2q-42 27 -61.5 57.5t-19.5 76.5q0 74 59 123t150 49q42 0 80 -14q22 -8 82 -8h72v-95h-56 q16 -10 16 -56q0 -77 -60.5 -118.5t-141.5 -41.5h-25q-48 -5 -48 -33q0 -31 47 -31zM332 304q0 33 -21.5 53.5t-65.5 20.5q-41 0 -64 -21.5t-23 -50.5q0 -35 24 -53t63 -18q41 0 64 19t23 50zM314 -19h-105q-30 -3 -43 -16t-13 -28q0 -48 89 -48q59 0 88 12q35 13 35 46 q0 14 -12.5 24t-38.5 10z" />
+<glyph unicode="&#x1d5f5;" horiz-adv-x="510" d="M455 0h-120v309q0 69 -66 69q-23 0 -50.5 -21t-43.5 -64v-293h-120v676h120v-261h2q58 58 129 58q149 0 149 -151v-322z" />
+<glyph unicode="&#x1d5f6;" horiz-adv-x="245" d="M195 543h-145v145h145v-145zM184 0h-125v461h125v-461z" />
+<glyph unicode="&#x1d5f7;" horiz-adv-x="324" d="M269 543h-145v145h145v-145zM258 461v-478q0 -113 -81 -162q-41 -24 -98 -24q-76 0 -136 67l43 85h18q30 -50 60 -50q69 0 69 95v467h125z" />
+<glyph unicode="&#x1d5f8;" horiz-adv-x="519" d="M506 0h-142l-169 205l-20 -16v-189h-120v676h120v-365l176 150h134v-18l-209 -171z" />
+<glyph unicode="&#x1d5f9;" horiz-adv-x="235" d="M180 0h-125v625l108 51h17v-676z" />
+<glyph unicode="&#x1d5fa;" horiz-adv-x="776" d="M721 0h-118v309q0 69 -66 69q-25 0 -49.5 -20.5t-40.5 -64.5v-293h-118v309q0 69 -66 69q-22 0 -48 -21t-42 -64v-293h-118v461h114v-50h2q62 62 129 62q94 0 128 -62h1q62 62 145 62q147 0 147 -151v-322z" />
+<glyph unicode="&#x1d5fb;" horiz-adv-x="510" d="M455 0h-120v309q0 69 -66 69q-23 0 -50.5 -21t-43.5 -64v-293h-120v461h116v-50h2q62 62 133 62q149 0 149 -151v-322z" />
+<glyph unicode="&#x1d5fc;" horiz-adv-x="501" d="M476 229q0 -105 -64.5 -174t-161.5 -69q-95 0 -160 68.5t-65 173.5q0 109 64.5 177t164.5 68q95 0 158.5 -69t63.5 -175zM351 232q0 69 -26.5 107.5t-77.5 38.5q-48 0 -72.5 -41.5t-24.5 -104.5q0 -66 26 -108.5t74 -42.5q28 0 48.5 14.5t31.5 38t16 48.5t5 50z" />
+<glyph unicode="&#x1d5fd;" horiz-adv-x="512" d="M171 415h2q52 58 133 58q48 0 88 -24q93 -55 93 -201q0 -139 -74 -210q-55 -52 -140 -52q-52 0 -98 41v-195l-103 -37h-17v666h116v-46zM175 290v-140q22 -38 41.5 -53.5t50.5 -15.5q45 0 70 44t25 105q0 148 -89 148q-36 0 -58.5 -23t-39.5 -65z" />
+<glyph unicode="&#x1d5fe;" horiz-adv-x="512" d="M457 -168l-103 -37h-17v231h-2v1q-42 -41 -117 -41q-87 0 -140 65.5t-53 162.5q0 126 75 199q62 60 144 60q64 0 105 -39h3l88 39h17v-641zM337 158v158q-43 62 -92 62q-41 0 -68 -40t-27 -110q0 -69 24.5 -108t68.5 -39q61 0 94 77z" />
+<glyph unicode="&#x1d5ff;" horiz-adv-x="411" d="M406 356h-16q-22 22 -59 22q-48 0 -93.5 -54t-62.5 -135v-189h-120v461h120v-88h2q32 52 73.5 76t79.5 24q49 0 76 -19v-98z" />
+<glyph unicode="&#x1d600;" horiz-adv-x="385" d="M340 306h-15q-44 72 -125 72q-22 0 -35.5 -12t-13.5 -24q0 -21 17.5 -35t52.5 -29q86 -36 111 -65t25 -88q0 -34 -18.5 -64.5t-50.5 -48.5q-44 -25 -110 -25q-50 0 -81.5 14t-71.5 49v120h15q19 -43 60.5 -65.5t80.5 -22.5q22 0 39 12.5t17 31.5q0 16 -13 28t-53 29 q-83 36 -109 68t-26 89t43.5 95t116.5 38q49 0 81.5 -15t62.5 -46v-106z" />
+<glyph unicode="&#x1d601;" horiz-adv-x="386" d="M371 115l-11 -94q-37 -33 -116 -33q-57 0 -97.5 35.5t-40.5 102.5v240h-99v17l63 78h36v61l100 108h20v-169h107v-95h-107v-217q0 -36 17 -51t41 -15q41 0 69 32h18z" />
+<glyph unicode="&#x1d602;" horiz-adv-x="518" d="M463 10l-124 -25v70h-2q-62 -69 -143 -69q-139 0 -139 152v323h120v-310q0 -70 66 -70q22 0 50 24.5t44 67.5v288h120v-351q0 -64 8 -100z" />
+<glyph unicode="&#x1d603;" horiz-adv-x="462" d="M447 461l-203 -475h-26l-203 475h131l84 -252h2l84 252h131z" />
+<glyph unicode="&#x1d604;" horiz-adv-x="701" d="M684 461l-195 -475h-26l-109 252l-116 -252h-26l-195 475h131l81 -256h2l62 173l-35 83h131l86 -244h2l76 244h131z" />
+<glyph unicode="&#x1d605;" horiz-adv-x="506" d="M486 0h-138l-100 143l-90 -143h-138l159 243l-148 218h137l83 -121l79 121h138l-147 -223z" />
+<glyph unicode="&#x1d606;" horiz-adv-x="472" d="M455 461l-180 -496q-33 -91 -74.5 -130.5t-109.5 -39.5q-45 0 -73 22v98h16q27 -25 59 -25q33 0 55.5 24t38.5 79l-169 468h131l93 -275h2l80 275h131z" />
+<glyph unicode="&#x1d607;" horiz-adv-x="441" d="M417 95l-9 -95h-387v25l233 341h-207l8 95h361v-26l-233 -340h234z" />
+<glyph unicode="&#x1d6a8;" horiz-adv-x="735" d="M689 0h-322v25l32 3q25 2 35.5 9.5t10.5 23.5q0 29 -46 136h-225l-13 -34q-31 -80 -31 -97q0 -19 18.5 -28.5t62.5 -12.5v-25h-202v25q35 6 53 28t46 92l221 545h28l222 -522q38 -90 58.5 -116.5t51.5 -26.5v-25zM384 236l-101 243l-94 -243h195z" />
+<glyph unicode="&#x1d6a9;" horiz-adv-x="667" d="M426 365v-1q85 -11 139 -58.5t54 -117.5q0 -83 -72 -135.5t-202 -52.5h-329v25q55 6 71.5 21t16.5 57v467q0 44 -18.5 60.5t-69.5 20.5v25h317q121 0 186.5 -41.5t65.5 -118.5q0 -59 -37 -96.5t-122 -54.5zM264 592v-219q91 0 123.5 30t32.5 106q0 137 -99 137 q-30 0 -43.5 -12.5t-13.5 -41.5zM264 343v-245q0 -36 15 -51t48 -15q58 0 89 40t31 116q0 155 -157 155h-26z" />
+<glyph unicode="&#x1d6aa;" horiz-adv-x="620" d="M593 474h-24q-9 54 -24 85q-10 21 -36 44q-45 39 -173 39q-40 0 -56 -14q-14 -12 -14 -37v-490q0 -47 24 -60q22 -13 86 -16v-25h-360v25q57 6 74 23q14 16 14 55v472q0 45 -21 60q-20 13 -67 16v25h577v-202z" />
+<glyph unicode="&#x1d6ab;" horiz-adv-x="691" d="M340 690l316 -690h-640l296 690h28zM111 120h320l-165 359z" />
+<glyph unicode="&#x1d6ac;" horiz-adv-x="679" d="M641 208l-40 -208h-585v25q54 6 71 21t17 55v479q0 38 -18 53t-70 18v25h577v-201h-25q-17 100 -65.5 133.5t-171.5 33.5q-38 0 -51.5 -12t-13.5 -42v-225q81 1 117 32.5t45 116.5h26v-338h-26q-7 88 -43 121.5t-119 33.5v-242q0 -32 17.5 -44t65.5 -12q117 0 182 54 q25 20 42 46t40 77h28z" />
+<glyph unicode="&#x1d6ad;" horiz-adv-x="693" d="M634 242l-27 -242h-579v16l382 625l-83 -3q-62 -2 -96.5 -8.5t-63.5 -25t-46 -49.5t-34 -86h-28l22 207h523v-16l-379 -625h83q145 0 202 40q27 19 45 45t26.5 47t26.5 75h26z" />
+<glyph unicode="&#x1d6ae;" horiz-adv-x="810" d="M759 0h-339v25q54 6 71.5 20.5t17.5 52.5v228h-241v-228q0 -40 17 -53.5t72 -19.5v-25h-336v25q53 7 69 20.5t16 52.5v479q0 41 -17 55t-68 19v25h336v-25q-53 -4 -71 -18.5t-18 -55.5v-204h241v204q0 41 -18 55.5t-71 18.5v25h339v-25q-51 -4 -69.5 -19t-18.5 -55v-479 q0 -39 16.5 -52.5t71.5 -20.5v-25z" />
+<glyph unicode="&#x1d6af;" horiz-adv-x="778" d="M515 223h-26q-9 56 -43 56h-109q-23 0 -32 -10q-8 -9 -19 -46h-26q15 51 15 118q0 53 -15 115h26q12 -36 23 -47q10 -10 29 -10h109q18 0 27 14q7 11 13 43h26q-12 -54 -12 -110t14 -123zM743 336q0 -166 -113 -267q-98 -87 -242 -87q-165 0 -266 112q-87 98 -87 241 q0 169 115 270q99 87 244 87q162 0 262 -113q87 -99 87 -243zM566 329q0 169 -53 255q-47 75 -128 75q-89 0 -134 -97q-39 -84 -39 -231q0 -316 178 -316q176 0 176 314z" />
+<glyph unicode="&#x1d6b0;" horiz-adv-x="421" d="M370 0h-350v25q57 5 75 20t18 61v470q0 41 -19 56t-74 19v25h350v-25q-56 -2 -75.5 -17.5t-19.5 -57.5v-470q0 -48 18.5 -62.5t76.5 -18.5v-25z" />
+<glyph unicode="&#x1d6b1;" horiz-adv-x="820" d="M769 0h-334v25q47 1 62 6t15 15q0 13 -25 45l-181 225l-27 -25v-196q0 -37 16.5 -50t70.5 -20v-25h-336v25q55 5 71 19t16 57v472q0 46 -17 60.5t-70 17.5v25h337v-25q-54 -4 -71 -20.5t-17 -63.5v-223l212 215q24 24 32 35t8 23q0 15 -10.5 22t-37.5 9l-35 3v25h289v-25 q-78 -9 -133 -46.5t-189 -180.5l305 -378q16 -20 49 -21v-25z" />
+<glyph unicode="&#x1d6b2;" horiz-adv-x="707" d="M674 0h-322v25l32 3q44 5 44 33q0 22 -44 136l-108 280h-2l-114 -314q-28 -78 -28 -97q0 -21 20 -30q20 -8 59 -11v-25h-202v25q36 6 56 32q17 23 43 88l213 545h28l215 -522q40 -97 61 -121q19 -22 49 -22v-25z" />
+<glyph unicode="&#x1d6b3;" horiz-adv-x="972" d="M921 0h-332v25q55 5 72 22t17 62v496l-252 -605h-27l-252 594v-465q0 -58 20 -79t81 -25v-25h-234v25q59 6 75 20.5t16 62.5v469q0 41 -17 55.5t-72 18.5v25h253l199 -472l201 472h252v-25q-55 -4 -71.5 -22.5t-16.5 -74.5v-428q0 -57 15 -76.5t73 -24.5v-25z" />
+<glyph unicode="&#x1d6b4;" horiz-adv-x="722" d="M701 676v-25q-50 -8 -64 -22.5t-14 -60.5v-586h-28l-447 545v-396q0 -58 18 -78.5t76 -27.5v-25h-226v25q55 7 71.5 22.5t16.5 61.5v470q-52 72 -85 72v25h211l349 -430v299q0 60 -18 80.5t-74 25.5v25h214z" />
+<glyph unicode="&#x1d6b5;" horiz-adv-x="623" d="M568 481h-25q-9 46 -25 61q-16 14 -49 14h-307q-67 0 -82 -75h-25v195h513v-195zM494 240h-25q-7 37 -24 49q-13 8 -40 8h-182q-37 0 -50 -12q-11 -10 -19 -45h-25v223h25q7 -40 24 -49q12 -7 46 -7h181q35 0 45 10q11 10 19 46h25v-223zM595 0h-567v232h25q9 -53 24 -68 q17 -17 58 -17h349q51 0 67 23q12 17 19 62h25v-232z" />
+<glyph unicode="&#x1d6b6;" horiz-adv-x="778" d="M743 335q0 -156 -99.5 -255t-255.5 -99q-155 0 -254 99t-99 254q0 159 101 258t258 99q151 0 250 -100.5t99 -255.5zM566 328q0 160 -46.5 245t-134.5 85q-83 0 -128 -85.5t-45 -242.5t46 -236.5t132 -79.5t131 80t45 234z" />
+<glyph unicode="&#x1d6b7;" horiz-adv-x="780" d="M759 0h-339v25q57 6 74 23q15 15 15 50v531h-241v-531q0 -42 20 -56q15 -11 69 -17v-25h-336v25q57 8 71 22t14 51v479q0 43 -20 57q-17 13 -65 17v25h738v-25q-54 -5 -72 -21q-16 -15 -16 -53v-479q0 -42 19 -55q16 -12 69 -18v-25z" />
+<glyph unicode="&#x1d6b8;" horiz-adv-x="611" d="M16 676h315q128 0 198.5 -45.5t70.5 -135.5q0 -60 -33.5 -104.5t-95.5 -67.5q-32 -12 -70.5 -15.5t-138.5 -4.5v-192q0 -51 14 -65t73 -21v-25h-333v25q33 3 45 9q23 9 31 30t8 62v427q0 58 -15.5 75.5t-68.5 22.5v25zM262 606v-268q94 1 130 32t36 114q0 84 -27 120.5 t-89 36.5q-50 0 -50 -35z" />
+<glyph unicode="&#x1d6b9;" horiz-adv-x="778" d="M743 336q0 -156 -99.5 -255t-255.5 -99q-155 0 -254 99t-99 254q0 159 101 258t258 99q151 0 250 -100.5t99 -255.5zM214 394h349q-9 129 -54.5 197t-123.5 68q-74 0 -118.5 -68.5t-52.5 -196.5zM565 304h-353q4 -144 50 -216.5t128 -72.5q167 0 175 289z" />
+<glyph unicode="&#x1d6ba;" horiz-adv-x="665" d="M627 261l-32 -261h-581v16l278 301l-278 343v16h580v-197h-26q-22 99 -67 130q-30 21 -91 21h-182l187 -240l-225 -243h256q65 0 96 20q40 26 59 94h26z" />
+<glyph unicode="&#x1d6bb;" horiz-adv-x="667" d="M636 475h-29q-13 89 -56.5 127.5t-135.5 41.5v-527q0 -57 16.5 -72t81.5 -20v-25h-357v25q64 5 80.5 20.5t16.5 71.5v527q-93 -3 -136.5 -41.5t-56.5 -127.5h-29l3 201h600z" />
+<glyph unicode="&#x1d6bc;" horiz-adv-x="722" d="M699 670v-25q-18 5 -31 5q-30 0 -56 -8.5t-53.5 -32t-49 -61.5t-40 -101t-29.5 -146v-178q0 -58 16.5 -75.5t75.5 -22.5v-25h-347v25q60 5 76.5 25t16.5 78v136q0 164 -55 263t-147 99q-29 0 -59 -10l-14 24q22 20 57.5 36t66.5 16q59 0 103.5 -13.5t81.5 -46t59 -92 t29 -146.5h5q10 52 29 103q34 95 89 140t122 45q35 0 54 -12z" />
+<glyph unicode="&#x1d6bd;" horiz-adv-x="836" d="M498 586v-22q136 -5 225 -62q95 -61 95 -164q0 -121 -131 -187q-90 -45 -189 -45v-15q0 -31 23 -46q21 -14 72 -20v-25h-353v25q62 5 81 22q15 13 15 44v15q-138 0 -227 60q-91 61 -91 172q0 118 120 179q82 42 198 47v24q0 36 -14 48q-18 15 -71 15v25h332v-25 q-57 0 -75 -23q-10 -13 -10 -42zM496 530v-390q63 0 105 47q45 49 45 138q0 112 -49 164q-38 41 -101 41zM338 140v390q-68 0 -108 -53t-40 -152q0 -105 50 -151q37 -34 98 -34z" />
+<glyph unicode="&#x1d6be;" horiz-adv-x="747" d="M699 0h-340v25l28 2q52 3 52 28q0 21 -21 54l-101 162l-38 -51q-56 -76 -75 -106.5t-19 -46.5q0 -19 17.5 -28t63.5 -14v-25h-250v25q37 4 59 16t45 40l175 221l-198 291q-23 34 -38 45t-42 13v25h346v-25l-31 -2q-27 -1 -37.5 -8t-10.5 -23q0 -14 15 -37l97 -150l56 77 q36 49 47 69.5t11 36.5q0 18 -11 25t-40 10l-21 2v25h250v-25q-57 -5 -90.5 -30.5t-97.5 -115.5l-80 -111l182 -283q35 -54 53 -69.5t44 -16.5v-25z" />
+<glyph unicode="&#x1d6bf;" horiz-adv-x="800" d="M785 692v-25q-25 0 -41 -37q-12 -27 -12 -48v-5l4 -90v-13q0 -111 -91 -168q-66 -42 -169 -42v-141q0 -61 20 -78q19 -16 72 -20v-25h-347v25q63 3 81 31q12 20 12 72v136q-122 0 -190 56q-70 57 -70 156v11l4 90v6q0 31 -14 56q-15 28 -41 28v25h33q87 0 142 -91 q36 -59 36 -142q0 -70 29 -117q26 -44 71 -44v290q0 36 -13 48q-18 15 -72 15v25h332v-25q-56 0 -74 -23q-11 -14 -11 -42v-288q50 0 78 56q22 44 22 105q0 84 35 142q55 91 141 91h33z" />
+<glyph unicode="&#x1d6c0;" horiz-adv-x="778" d="M262 94l-2 29q-97 17 -161 91t-64 172q0 124 99 215t245 91q145 0 244.5 -91.5t99.5 -217.5q0 -94 -65 -164.5t-160 -95.5l-2 -29h138q33 0 44.5 17t11.5 60h25v-171h-302l7 155q64 15 100 81t36 153q0 66 -19 126t-60.5 102t-97.5 42q-55 0 -96.5 -42t-61 -101.5 t-19.5 -124.5q0 -88 36 -154.5t100 -81.5l7 -155h-302v171h25q0 -44 10 -60.5t41 -16.5h143z" />
+<glyph unicode="&#x1d6c1;" horiz-adv-x="691" d="M656 676l-296 -690h-28l-316 690h640zM561 556h-320l165 -359z" />
+<glyph unicode="&#x1d6c2;" horiz-adv-x="644" d="M618 461l-129 -270q0 -8 9 -35q18 -55 32 -70q7 -8 20 -8q38 0 42 76h25q0 -70 -28 -118q-29 -48 -77 -48q-69 0 -105 77q-61 -79 -166 -79q-100 0 -162 76q-54 66 -54 164q0 117 73 187q63 60 157 60q127 0 179 -121h1l29 109h154zM361 198q-3 76 -31 157q-30 87 -72 87 q-53 0 -71 -55q-15 -45 -15 -154q0 -127 21 -175q18 -41 59 -41q40 0 74 70q26 53 35 111z" />
+<glyph unicode="&#x1d6c3;" horiz-adv-x="556" d="M396 411l-1 -2q129 -39 129 -183q0 -110 -73 -180q-63 -60 -153 -60q-51 0 -93 26v-66q0 -100 -20 -151h-140q21 43 21 151v386q0 114 21 185q20 66 69 118q54 57 151 57q76 0 126 -44q48 -42 48 -110q0 -84 -85 -127zM205 495v-423q27 -55 85 -55q53 0 71 51 q15 44 15 149q0 84 -30 138q-20 37 -37 37l-43 -9q-40 0 -40 26q0 27 48 27l45 -9q10 0 18 32q5 20 5 50q0 62 -14 101q-18 51 -51 51q-44 0 -59 -44q-13 -35 -13 -122z" />
+<glyph unicode="&#x1d6c4;" horiz-adv-x="518" d="M501 461l-202 -400q1 -5 3.5 -19t3.5 -24q10 -64 10 -102q0 -52 -23 -87q-23 -34 -61 -34q-46 0 -61 34q-10 21 -10 73q0 75 61 216q-11 110 -34 169q-39 96 -92 96q-48 0 -59 -75h-25q0 68 24 115q26 50 74 50q73 0 114 -152l29 -111l79 251h169z" />
+<glyph unicode="&#x1d6c5;" horiz-adv-x="502" d="M395 567l-146 81q-32 0 -55 -10q-31 -13 -31 -39q0 -32 50 -62q15 -9 62 -34q109 -57 156 -116q46 -60 46 -172q0 -94 -68 -164q-64 -65 -156 -65q-109 0 -176 82q-51 63 -51 139q0 93 60 154q56 58 136 58v2q-82 34 -115 78q-22 31 -22 61q0 63 79 103q57 29 115 29 q69 0 114 -18q50 -20 50 -57q0 -17 -13 -33q-13 -17 -35 -17zM329 215q0 172 -77 172q-46 0 -65 -51q-14 -42 -14 -132q0 -105 19 -147q19 -40 61 -40q52 0 67 61q9 38 9 137z" />
+<glyph unicode="&#x1d6c6;" horiz-adv-x="444" d="M412 109l17 -18q-69 -105 -203 -105q-198 0 -198 132q0 77 88 123v1q-35 13 -54 41q-16 23 -16 47q0 62 57 103q55 40 146 40q71 0 117 -28q47 -29 47 -78q0 -25 -17 -42q-16 -16 -44 -16q-57 0 -57 54l8 42q0 37 -65 37q-38 0 -60 -33q-19 -28 -19 -67t23 -64 q20 -21 51 -21l54 11q39 0 39 -25q0 -30 -44 -30q-14 0 -44 9q-35 0 -61 -26q-25 -25 -25 -61q0 -95 109 -95q49 0 93 21q40 19 58 48z" />
+<glyph unicode="&#x1d6c7;" horiz-adv-x="459" d="M243 692l9 -24q-63 -27 -63 -68q0 -40 32 -51q88 85 144 85q57 0 57 -43q0 -42 -68 -69q-54 -22 -124 -22q-55 -45 -97 -122q-42 -78 -42 -148q0 -69 57 -96q39 -19 124 -19q165 0 165 -138q0 -92 -62 -143q-48 -39 -113 -39q-44 0 -71 21q-21 16 -21 40q0 28 19 46 q18 16 42 16l107 -46q23 0 41 22q17 20 17 46q0 53 -54 53h-8l-117 -9q-109 1 -154 51q-40 46 -40 140q0 104 64 213q45 77 99 124q-36 4 -56 28q-18 21 -18 50q0 74 131 102z" />
+<glyph unicode="&#x1d6c8;" horiz-adv-x="580" d="M545 -205h-138q-14 29 -19 67q-3 24 -3 85v372q0 87 -50 87q-37 0 -71 -34q-17 -17 -17 -24v-348h-139v346q0 56 -24 56t-49 -48l-23 11q18 47 56 78q38 30 80 30q98 0 98 -87h1q51 87 143 87q67 0 103 -44q31 -38 31 -101v-380q0 -106 21 -153z" />
+<glyph unicode="&#x1d6c9;" horiz-adv-x="501" d="M476 340q0 -148 -64 -254q-61 -100 -154 -100q-120 0 -184 127q-49 97 -49 228q0 151 64 252q63 99 161 99q112 0 176 -126q50 -96 50 -226zM172 364h157q0 135 -19 212q-21 85 -60 85q-78 0 -78 -297zM329 320h-157q0 -303 78 -303q79 0 79 303z" />
+<glyph unicode="&#x1d6ca;" horiz-adv-x="326" d="M281 101l23 -12q-18 -45 -58 -75q-38 -28 -85 -28q-49 0 -73 32q-19 25 -19 59v299q0 33 -14 47q-11 11 -40 14v24h193v-349q0 -56 24 -56t49 45z" />
+<glyph unicode="&#x1d6cb;" horiz-adv-x="581" d="M214 461v-201q123 143 196 189q39 24 78 24q33 0 52 -22q19 -20 19 -55q0 -25 -19 -45q-20 -21 -47 -21l-83 42q-43 0 -103 -70l179 -232q24 -32 36 -39t26 -7v-24h-248v24q34 1 34 23q0 10 -21 37l-98 129h-1v-213h-139v379q0 33 -14 44q-11 9 -40 14v24h193z" />
+<glyph unicode="&#x1d6cc;" horiz-adv-x="546" d="M502 147h25q0 -75 -25 -119q-25 -46 -75 -46q-62 0 -92 128l-46 198l-101 -308h-169l226 454l-12 38q-22 68 -48 93q-19 17 -46 17q-47 0 -59 -75h-25q0 73 24 116q25 49 76 49q62 0 104 -146l107 -374q28 -100 77 -100q47 0 59 75z" />
+<glyph unicode="&#x1d6cd;" horiz-adv-x="610" d="M567 88l21 -12q-43 -107 -144 -107q-81 0 -90 86h-1q-45 -69 -100 -69q-39 0 -53 23h-1v-77q0 -86 -20 -137h-134q21 43 21 138v528h139v-318q0 -46 25 -72q20 -20 44 -20q38 0 79 51v359h139v-350q0 -43 5 -58q5 -14 18 -14q22 0 52 49z" />
+<glyph unicode="&#x1d6ce;" horiz-adv-x="518" d="M465 473h30q0 -238 -148 -370q-102 -91 -252 -117h-26v386q0 36 -12 48q-11 11 -42 17v24h193v-323h5q225 40 252 335z" />
+<glyph unicode="&#x1d6cf;" horiz-adv-x="465" d="M240 692l10 -24q-28 -12 -46 -31t-18 -37q0 -26 21 -36q74 71 140 71q63 0 63 -40q0 -39 -61 -61q-48 -18 -109 -18q-26 0 -42 -22q-11 -17 -11 -40q0 -38 35 -53q91 41 133 41q43 0 60 -7q24 -9 24 -36q0 -33 -55 -49q-38 -11 -70 -11q-39 0 -89 11q-61 -20 -90 -58 q-24 -32 -24 -67q0 -58 52 -87q40 -23 106 -23q165 0 165 -138q0 -92 -62 -143q-48 -39 -113 -39q-44 0 -71 21q-21 16 -21 40q0 28 20 46q18 16 41 16l107 -46q23 0 41 22q17 20 17 46q0 53 -54 53h-8l-117 -9q-6 -1 -17 -1q-83 0 -134 61q-40 46 -40 117q0 69 54 134 q45 54 108 83q-22 11 -36 29q-16 20 -16 45q0 45 38 77v2q-30 5 -48 24q-15 17 -15 35q0 36 36 63q34 27 96 39z" />
+<glyph unicode="&#x1d6d0;" horiz-adv-x="500" d="M476 229q0 -105 -64.5 -174t-161.5 -69q-95 0 -160 68.5t-65 173.5q0 109 64.5 177t164.5 68q95 0 158.5 -69t63.5 -175zM329 218q0 128 -17 176t-61 48q-46 0 -62.5 -47.5t-16.5 -176.5q0 -109 18 -155t61 -46t60.5 44.5t17.5 156.5z" />
+<glyph unicode="&#x1d6d1;" horiz-adv-x="631" d="M584 127h25q0 -59 -42 -101q-39 -40 -100 -40q-74 0 -106 53q-22 35 -22 92q0 47 21 127q3 12 18 62q2 7 5.5 21.5t5.5 19.5h-134l2 -99v-27q0 -125 -32 -189t-91 -64q-79 0 -79 66q0 21 12 39q12 17 31 20q38 8 71 118q24 83 24 136q-120 0 -148 -52h-25q29 87 69 118 q43 34 122 34h385v-100h-117q-11 -46 -11 -142q0 -163 56 -163q45 0 60 71z" />
+<glyph unicode="&#x1d6d2;" horiz-adv-x="547" d="M66 -55v168q0 115 21 185q20 67 69 119q25 26 69 43q36 13 73 13q105 0 162 -67q55 -64 55 -178q0 -112 -74 -183q-60 -59 -146 -59h1q-49 0 -91 26v-66q0 -100 -20 -151h-140q21 43 21 150zM205 271v-199q27 -55 81 -55q49 0 67 52q15 45 15 151q0 129 -28 181 q-23 41 -65 41t-57 -45q-13 -38 -13 -126z" />
+<glyph unicode="&#x1d6d3;" horiz-adv-x="464" d="M334 -5l-117 -9q-7 -1 -21 -1q-85 0 -130 47q-43 43 -43 140q0 60 37 128q38 72 102 120q71 53 151 53q56 0 95 -28q36 -27 36 -70q0 -32 -22 -53q-18 -18 -43 -18l-136 68q-75 0 -115 -40q-37 -37 -37 -104q0 -76 67 -98q39 -13 114 -13q165 0 165 -138q0 -92 -62 -143 q-48 -39 -113 -39q-44 0 -71 21q-21 16 -21 40q0 28 19 46q18 16 42 16l107 -46q23 0 41 22q17 20 17 46q0 53 -54 53h-8z" />
+<glyph unicode="&#x1d6d4;" horiz-adv-x="568" d="M529 361h-200q12 -23 38.5 -43.5t49.5 -33.5t40.5 -38.5t17.5 -60.5q0 -85 -69 -142t-156 -57q-102 0 -163.5 71.5t-61.5 174.5q0 107 78 168t187 61h239v-100zM329 169q0 59 -14.5 103t-49.5 89q-33 0 -55.5 -24.5t-30 -54.5t-7.5 -63q0 -120 21 -163q19 -39 59 -39 q77 0 77 152z" />
+<glyph unicode="&#x1d6d5;" horiz-adv-x="492" d="M457 361h-139q-4 -10 -10 -65q-6 -52 -6 -99q0 -141 51 -141q45 0 60 71h25q0 -59 -42 -101q-39 -40 -100 -40q-73 0 -106 53q-22 35 -22 92q0 47 21 127q3 12 18 62q9 34 11 41h-58q-38 0 -73 -27q-34 -26 -44 -65h-25q10 71 56 129q50 63 116 63h267v-100z" />
+<glyph unicode="&#x1d6d6;" horiz-adv-x="576" d="M281 449v24q135 0 206 -71q64 -64 64 -173q0 -114 -71 -183q-62 -60 -155 -60q-217 0 -217 187v182q0 47 -24 47t-49 -48l-23 11q18 47 56 78q38 30 80 30t69 -21q30 -24 30 -71v-156q0 -113 15 -157q17 -51 63 -51q53 0 69 69q10 41 10 140q0 94 -32 156q-33 63 -91 67z " />
+<glyph unicode="&#x1d6d7;" horiz-adv-x="653" d="M257 17v135q0 48 9 99t28.5 103t58 85.5t90.5 33.5q78 0 134 -72q52 -67 52 -171q0 -106 -64 -175t-169 -69v-191h-139v191q-106 0 -169.5 69t-63.5 175q0 113 63.5 178t175.5 65h45v-25q-137 0 -137 -205q0 -136 20 -183q11 -25 25.5 -34t40.5 -9zM396 17h8q45 0 64 54 q14 43 14 172q0 199 -53 199q-33 0 -33 -168v-257z" />
+<glyph unicode="&#x1d6d8;" horiz-adv-x="612" d="M586 461l-251 -397l18 -64q33 -115 86 -115q55 0 67 76h25q0 -81 -27 -125q-25 -41 -71 -41q-43 0 -74 70q-11 25 -34 106l-15 53l-134 -213h-155l237 375l-22 85q-18 70 -43 95q-17 17 -45 17q-52 0 -67 -75h-25q0 71 24 116q26 49 76 49q42 0 69 -48q19 -33 35 -97 l25 -97l146 230h155z" />
+<glyph unicode="&#x1d6d9;" horiz-adv-x="763" d="M751 473v-25q-37 -5 -58 -30.5t-21 -68.5q0 -11 1 -16l11 -126q1 -6 1 -17q0 -87 -72 -151q-59 -53 -140 -53h-22v-191h-139v191h-22q-94 0 -156 69q-55 61 -55 152l12 126q0 98 -79 115v25h49q101 0 139 -72q26 -49 26 -150q0 -139 19 -190q17 -44 50 -44h17v444h139 v-444h17q40 0 55 59q14 56 14 175q0 118 33 166q38 56 132 56h49z" />
+<glyph unicode="&#x1d6da;" horiz-adv-x="734" d="M419 473h29q142 0 209 -82q51 -63 51 -164q0 -120 -78 -189q-58 -52 -133 -52q-90 0 -132 60q-51 -60 -130 -60q-87 0 -148 69q-61 68 -61 175t68 175t183 68h34v-25q-94 0 -123 -77q-15 -40 -15 -147q0 -96 11 -137q18 -70 64 -70q27 0 51 28q23 28 26 67 q-32 73 -32 132q0 53 20 84q19 30 55 30q39 0 57 -43q12 -29 12 -68q0 -63 -32 -136q4 -46 31 -73q21 -21 46 -21q79 0 79 207q0 117 -25 164q-32 60 -117 60v25z" />
+<glyph unicode="&#x1d6db;" horiz-adv-x="515" d="M88 606l-19 20q58 81 175 81q114 0 179 -100q68 -104 68 -301q0 -141 -58 -224q-67 -96 -178 -96q-103 0 -166.5 70t-63.5 171q0 100 56 166q69 80 174 80q56 0 95 -22l3 3q-8 90 -48.5 137.5t-101.5 47.5q-77 0 -115 -33zM340 218q0 124 -21 174t-67 50t-62.5 -47.5 t-16.5 -176.5q0 -109 18 -155t61 -46q45 0 66.5 46t21.5 155z" />
+<glyph unicode="&#x1d6dc;" horiz-adv-x="444" d="M412 109l18 -18q-78 -105 -191 -105q-102 0 -162 73q-52 64 -52 163q0 118 72 190q61 61 151 61l99 -20q20 0 22 20h23l17 -147h-23q-33 117 -115 117q-54 0 -83 -62q-21 -47 -21 -111h157v-44h-157q0 -82 49 -132q39 -41 89 -41q57 0 107 56z" />
+<glyph unicode="&#x1d6dd;" horiz-adv-x="647" d="M620 295l-1 -27q-11 0 -69 2q-5 -77 -13 -110q-43 -174 -212 -174q-217 0 -217 186v28q0 48 -24 48q-21 0 -49 -49l-23 12q16 44 53 75q38 32 83 32q43 0 70 -26q29 -26 29 -75v-27q0 -105 15 -138q16 -35 63 -35q53 0 68 72q11 55 11 191v5q-287 50 -287 247 q0 92 72 133q48 27 114 27q113 0 183 -99q65 -92 65 -238v-56q37 -4 69 -4zM403 338q-4 193 -37 271q-18 41 -51 41q-65 0 -65 -96q0 -69 40 -125q40 -57 113 -91z" />
+<glyph unicode="&#x1d6de;" horiz-adv-x="563" d="M546 461l-168 -211q-10 -49 -10 -100q0 -66 51 -66l58 23q20 0 35 -15q16 -15 16 -39q0 -38 -28 -57q-22 -15 -57 -15q-55 0 -87 41q-30 38 -30 99q0 29 7 72l-153 -193h-168l169 214q9 52 9 90q0 66 -50 66l-58 -23q-21 0 -36 15q-16 15 -16 39q0 37 29 57q23 15 56 15 q56 0 88 -41q29 -36 29 -99q0 -18 -6 -63l151 191h169z" />
+<glyph unicode="&#x1d6df;" horiz-adv-x="653" d="M396 473h11q101 0 166 -78q56 -68 56 -166q0 -112 -73 -183q-63 -60 -154 -60h-6v-191h-139v191h-8q-102 0 -168 77q-57 67 -57 165q0 117 74 186q64 59 155 59h4v203h139v-203zM396 17h8q48 0 64 50q14 45 14 150q0 132 -19 183q-17 42 -57 42h-10v-425zM257 17v425h-7 q-49 0 -65 -55q-14 -45 -14 -169q0 -118 20 -161q18 -40 59 -40h7z" />
+<glyph unicode="&#x1d6e0;" horiz-adv-x="511" d="M379 -177l-43 1q-86 1 -166 50q-145 87 -145 323q0 137 79 213q64 63 160 63q102 0 166 -77q56 -68 56 -167q0 -113 -73 -183q-63 -60 -153 -60q-96 0 -152 60l-2 -1q23 -54 78 -84q48 -26 101 -25l80 3h6q87 0 87 -79q0 -29 -24 -65h-25q0 28 -30 28zM339 218 q0 135 -20 183q-16 41 -58 41q-49 0 -65 -55q-14 -45 -14 -169q0 -116 21 -161q18 -40 58 -40q47 0 63 51q15 45 15 150z" />
+<glyph unicode="&#x1d6e1;" horiz-adv-x="864" d="M851 361h-79q42 -55 42 -136q0 -121 -73 -187q-56 -52 -138 -52q-89 0 -131 60q-51 -60 -131 -60q-93 0 -152 67q-56 65 -56 172q0 77 49 136h-24q-88 0 -124 -62h-25q55 162 216 162h626v-100zM642 361h-337q-25 -41 -25 -147q0 -197 74 -197q30 0 53 29q21 26 25 65 q-31 76 -31 113q0 40 20 65q19 24 56 24q36 0 54 -30q14 -23 14 -57t-33 -115q4 -45 30 -72q21 -22 46 -22q79 0 79 198q0 106 -25 146z" />
+<glyph unicode="&#x1d756;" horiz-adv-x="690" d="M665 0h-130l-66 162h-248l-66 -162h-130l306 690h28zM428 264l-83 204l-83 -204h166z" />
+<glyph unicode="&#x1d757;" horiz-adv-x="636" d="M463 373l1 -4q75 -36 102.5 -79.5t27.5 -101.5q0 -81 -73 -134.5t-181 -53.5h-260v676h237q118 0 180 -43t62 -125q0 -41 -25 -77.5t-71 -57.5zM208 413h72q141 0 141 89q0 37 -23 54.5t-77 17.5h-113v-161zM208 102h103q80 0 110.5 29t30.5 80q0 52 -49.5 76t-119.5 24 h-75v-209z" />
+<glyph unicode="&#x1d758;" horiz-adv-x="591" d="M569 574h-359v-574h-130v676h477z" />
+<glyph unicode="&#x1d759;" horiz-adv-x="720" d="M680 0h-640l306 690h28zM508 102l-148 366l-148 -366h296z" />
+<glyph unicode="&#x1d75a;" horiz-adv-x="635" d="M597 102l-27 -102h-490v676h480v-102h-350v-167h241v-103h-241v-202h387z" />
+<glyph unicode="&#x1d75b;" horiz-adv-x="653" d="M623 102l-15 -102h-583v16l372 558h-334l13 102h525v-16l-374 -558h396z" />
+<glyph unicode="&#x1d75c;" horiz-adv-x="715" d="M635 0h-130v297h-295v-297h-130v676h130v-277h295v277h130v-676z" />
+<glyph unicode="&#x1d75d;" horiz-adv-x="778" d="M743 336q0 -157 -99 -256t-254 -99q-154 0 -254.5 99t-100.5 256t100 256t254 99t254 -99t100 -256zM605 336q0 115 -57 184t-159 69t-159 -69t-57 -184q0 -116 57 -184.5t160 -68.5q102 0 158.5 68.5t56.5 184.5zM531 296h-282l12 102h256z" />
+<glyph unicode="&#x1d75e;" horiz-adv-x="440" d="M375 102l-9 -102h-287l-14 102h90v472h-90l14 102h287l9 -102h-90v-472h90z" />
+<glyph unicode="&#x1d75f;" horiz-adv-x="712" d="M707 0h-170l-296 306l-33 -29v-277h-128v676h128v-263l295 263h145v-14l-318 -278z" />
+<glyph unicode="&#x1d760;" horiz-adv-x="706" d="M666 0h-130l-183 468l-183 -468h-130l299 690h28z" />
+<glyph unicode="&#x1d761;" horiz-adv-x="913" d="M833 0h-128v467l-235 -467h-27l-235 467v-467h-128v676h161l214 -440h3l214 440h161v-676z" />
+<glyph unicode="&#x1d762;" horiz-adv-x="724" d="M644 -18l-105 20l-331 500v-502h-128v676h157l279 -424v424h128v-694z" />
+<glyph unicode="&#x1d763;" horiz-adv-x="640" d="M582 584h-524l13 92h498zM503 299h-366v102h366v-102zM605 102l-12 -102h-546l-12 102h570z" />
+<glyph unicode="&#x1d764;" horiz-adv-x="778" d="M743 337q0 -157 -99 -256t-254 -99q-154 0 -254.5 99t-100.5 256t100 256t254 99t254 -99t100 -256zM605 337q0 115 -57 184t-159 69t-159 -69t-57 -184q0 -116 57 -184.5t160 -68.5q102 0 158.5 68.5t56.5 184.5z" />
+<glyph unicode="&#x1d765;" horiz-adv-x="715" d="M635 0h-130v574h-295v-574h-130v676h555v-676z" />
+<glyph unicode="&#x1d766;" horiz-adv-x="581" d="M80 676h209q139 0 209.5 -50.5t70.5 -144.5q0 -91 -69.5 -147t-186.5 -56h-103v-278h-130v676zM210 380h71q83 0 119.5 25t36.5 77q0 92 -162 92h-65v-194z" />
+<glyph unicode="&#x1d767;" horiz-adv-x="778" d="M743 336q0 -157 -99 -256t-254 -99q-154 0 -254.5 99t-100.5 256t100 256t254 99t254 -99t100 -256zM177 398h423q-14 89 -68.5 140t-142.5 51t-142.5 -51t-69.5 -140zM603 296h-428q9 -99 65 -156t150 -57q93 0 148 57t65 156z" />
+<glyph unicode="&#x1d768;" horiz-adv-x="674" d="M632 102l-15 -102h-586v16l281 330l-284 314v16h562v-102h-330l205 -226l-210 -246h377z" />
+<glyph unicode="&#x1d769;" horiz-adv-x="641" d="M627 574h-240v-574h-130v574h-243l14 102h589z" />
+<glyph unicode="&#x1d76a;" horiz-adv-x="748" d="M728 675l-33 -98q-36 12 -52 12q-17 0 -31.5 -3.5t-38.5 -20.5t-44.5 -47.5t-45 -91t-44.5 -144.5v-282h-130v282q-20 84 -44.5 144.5t-45 91t-44.5 47.5t-38.5 20.5t-31.5 3.5q-12 0 -53 -11l-32 97q49 16 88 16q20 0 44 -5t58.5 -22.5t64 -44t57 -75t41.5 -111.5 q19 76 56 131t78.5 80.5t74 36t58.5 10.5q39 0 88 -16z" />
+<glyph unicode="&#x1d76b;" horiz-adv-x="800" d="M465 676v-102q80 -3 148.5 -28.5t115 -79.5t46.5 -127t-46.5 -128.5t-115 -82t-148.5 -29.5v-99h-130v99q-126 4 -218 67.5t-92 172.5q0 73 46 127t114.5 79.5t149.5 28.5v102h130zM464 472v-271q90 6 131.5 45t41.5 93q0 53 -41.5 90.5t-131.5 42.5zM336 201v271 q-90 -5 -131.5 -42.5t-41.5 -90.5q0 -54 41.5 -93t131.5 -45z" />
+<glyph unicode="&#x1d76c;" horiz-adv-x="740" d="M700 0h-154l-179 239l-173 -239h-154l249 343l-248 333h154l170 -228l166 228h154l-242 -333z" />
+<glyph unicode="&#x1d76d;" horiz-adv-x="806" d="M791 691l-31 -102q-18 -3 -29 -15.5t-15 -34t-5 -35t-1 -36.5q0 -93 -72.5 -148t-169.5 -61v-259h-130v259q-97 6 -169.5 62.5t-72.5 150.5q0 22 -1 35.5t-5 34t-15 32.5t-29 15l-31 102h39q77 0 124.5 -49.5t47.5 -162.5q0 -48 30 -79.5t82 -37.5v314h130v-314 q52 6 82 37.5t30 79.5q0 112 48 162t124 50h39z" />
+<glyph unicode="&#x1d76e;" horiz-adv-x="752" d="M720 102l-15 -102h-295l11 207q70 17 116.5 64t46.5 126q0 87 -58.5 139.5t-149.5 52.5q-90 0 -149 -58t-59 -134q0 -148 163 -191l11 -206h-295l-15 102h202l-4 29q-72 19 -131 87.5t-59 166.5q0 76 36.5 144.5t115 115t184.5 46.5q153 0 244.5 -91.5t91.5 -214.5 q0 -98 -59 -166.5t-131 -87.5l-4 -29h202z" />
+<glyph unicode="&#x1d76f;" horiz-adv-x="735" d="M685 664l-306 -694h-28l-306 694h640zM512 560h-294l147 -361z" />
+<glyph unicode="&#x1d770;" horiz-adv-x="662" d="M629 461l-116 -245q11 -35 20 -55q33 -80 92 -80v-16l-35 -79q-59 0 -87 13q-43 20 -65 78h-2q-30 -43 -64 -64q-43 -27 -115 -27q-94 0 -155.5 69t-61.5 172q0 95 64.5 170.5t170.5 75.5q116 0 181 -98l44 86h129zM383 209q-8 78 -39.5 123.5t-74.5 45.5 q-48 0 -76 -42.5t-28 -103.5q0 -65 28 -108t77 -43q42 0 70 38t43 90z" />
+<glyph unicode="&#x1d771;" horiz-adv-x="512" d="M372 416l2 -1q50 -12 81.5 -61t31.5 -106q0 -62 -19.5 -118t-55.5 -92q-53 -52 -140 -52q-55 0 -97 38v-135q0 -61 -17 -94h-119q16 37 16 88v527q0 57 10 103.5t33 88.5t67.5 66t107.5 24q67 0 118 -42.5t51 -111.5q0 -85 -70 -122zM175 442v-292q22 -38 41.5 -53.5 t50.5 -15.5q34 0 64.5 42t30.5 108q0 44 -9.5 71t-32 39t-44.5 15t-62 3v16l42 79q71 0 71 76q0 27 -14.5 47t-46.5 20q-91 0 -91 -155z" />
+<glyph unicode="&#x1d772;" horiz-adv-x="502" d="M477 461l-174 -411v-245l-13 -10l-107 24q8 124 8 227q0 104 -33 198q-17 49 -56 91.5t-92 42.5v16l50 79q75 0 135.5 -87.5t66.5 -177.5h2l83 253h130z" />
+<glyph unicode="&#x1d773;" horiz-adv-x="502" d="M380 539h-17q-60 58 -107 58q-21 0 -38 -12t-17 -34q0 -35 91 -80q90 -43 137.5 -102t47.5 -156q0 -87 -59 -157t-167 -70t-167 69.5t-59 157.5q0 75 35 131t102 84q-81 45 -81 123q0 69 51.5 105t127.5 36q57 0 99.5 -15.5t74.5 -58.5zM352 208q0 58 -20 92.5t-64 53.5 q-55 -3 -86.5 -43t-31.5 -103q0 -51 28.5 -89t71.5 -38q49 0 75.5 37.5t26.5 89.5z" />
+<glyph unicode="&#x1d774;" horiz-adv-x="451" d="M389 140l45 -61q-42 -60 -89 -76.5t-123 -16.5q-109 0 -162 53q-35 36 -35 91q0 34 19.5 64.5t60.5 44.5v3q-60 33 -60 90q0 66 58 103.5t139 37.5q69 0 112 -19.5t66 -70.5l-53 -61h-16q-22 34 -42.5 45t-60.5 11q-37 0 -60 -11.5t-23 -32.5q0 -41 72 -41h57l40 -82 l-11 -13h-96q-37 0 -57 -16.5t-20 -38.5q0 -25 24.5 -43.5t64.5 -18.5q98 0 134 59h16z" />
+<glyph unicode="&#x1d775;" horiz-adv-x="500" d="M281 81h56q58 0 104.5 -31t46.5 -96q0 -72 -46 -115.5t-122 -43.5q-53 0 -76 21v98h16q26 -24 61 -24q72 0 72 50q0 46 -79 46h-90q-81 0 -126 38q-70 61 -70 190q0 81 32 156t91 131v3q-64 41 -64 107q0 50 24 81h16l76 -17q-14 -30 -14 -54q0 -38 33 -53q53 31 82 43 t80 23h17l17 -95q-101 -11 -182 -92q-37 -37 -60 -95t-23 -124q0 -57 24 -96q33 -51 104 -51z" />
+<glyph unicode="&#x1d776;" horiz-adv-x="510" d="M474 -205h-127q-12 24 -12 95v419q0 69 -65 69q-24 0 -51.5 -21t-43.5 -64v-293h-120v349q0 51 -20 89l101 35h9q18 -20 26 -62h2q60 62 133 62q74 0 111.5 -39t37.5 -113v-437q0 -54 19 -89z" />
+<glyph unicode="&#x1d777;" horiz-adv-x="500" d="M477 341q0 -88 -25.5 -167t-78.5 -133.5t-123 -54.5t-123 54.5t-78.5 133.5t-25.5 167q0 87 25.5 165.5t78.5 132t123 53.5t123 -53.5t78.5 -132t25.5 -165.5zM148 388h204q0 82 -29 144.5t-73 62.5q-48 0 -75 -61t-27 -146zM352 293h-204q0 -89 29 -150.5t73 -61.5 q45 0 73.5 62t28.5 150z" />
+<glyph unicode="&#x1d778;" horiz-adv-x="319" d="M296 108l-14 -100q-39 -22 -90 -22q-68 0 -101 32q-38 36 -38 98v345h120v-298q0 -82 53 -82q28 0 54 27h16z" />
+<glyph unicode="&#x1d779;" horiz-adv-x="527" d="M512 0h-155l-163 187l-19 -20v-167h-120v461h120v-163h2q140 160 286 175l38 -79v-16q-55 -5 -97.5 -22.5t-64 -34.5t-62.5 -55z" />
+<glyph unicode="&#x1d77a;" horiz-adv-x="554" d="M520 65l-46 -79q-59 0 -101.5 36t-69.5 139l-36 137l-118 -298h-131l206 459q-21 83 -59.5 110.5t-97.5 27.5v16l50 79q68 0 118.5 -48t85.5 -166l76 -256q23 -79 49 -110t74 -31v-16z" />
+<glyph unicode="&#x1d77b;" horiz-adv-x="550" d="M517 65l-35 -79q-113 0 -136 70h-2q-16 -34 -43.5 -52t-56.5 -18q-49 0 -71 24h-2v-121q0 -61 -17 -94h-115q16 41 16 88v578h120v-312q0 -68 66 -68q29 0 54.5 21t39.5 62v297h120v-306q0 -36 12 -55t50 -19v-16z" />
+<glyph unicode="&#x1d77c;" horiz-adv-x="492" d="M339 453l116 20q17 -31 17 -109q0 -87 -54 -175t-146 -145.5t-191 -57.5h-26v475h120v-331h2q74 24 122 91t48 146q0 48 -13 76z" />
+<glyph unicode="&#x1d77d;" horiz-adv-x="501" d="M277 81h61q58 0 104.5 -31t46.5 -96q0 -72 -46 -115.5t-122 -43.5q-53 0 -76 21v98h16q26 -24 61 -24q72 0 72 50q0 46 -79 46h-89q-83 0 -140.5 50.5t-57.5 131.5q0 63 35 117t102 89v3q-59 27 -59 88q0 51 44 89q-25 17 -35.5 32.5t-10.5 43.5q0 32 23 62h16l77 -17 q-14 -18 -14 -35q0 -23 28 -38q84 32 143 32l11 -3l8 -92q-71 0 -120.5 -21.5t-49.5 -58.5q0 -30 36 -41q61 21 158 21l8 -5l-8 -90q-109 0 -188 -45.5t-79 -117.5q0 -100 124 -100z" />
+<glyph unicode="&#x1d77e;" horiz-adv-x="501" d="M476 229q0 -105 -64.5 -174t-161.5 -69q-95 0 -160 68.5t-65 173.5q0 109 64.5 177t164.5 68q95 0 158.5 -69t63.5 -175zM351 232q0 69 -26.5 107.5t-77.5 38.5q-48 0 -72.5 -41.5t-24.5 -104.5q0 -66 26 -108.5t74 -42.5q28 0 48.5 14.5t31.5 38t16 48.5t5 50z" />
+<glyph unicode="&#x1d77f;" horiz-adv-x="594" d="M572 366h-99q-12 -90 -12 -175q0 -55 19 -78.5t77 -31.5v-17l-40 -78q-28 0 -49 3t-47.5 12.5t-43.5 26.5t-29 48t-12 74q0 76 17 216h-76q0 -47 -0.5 -75t-2.5 -65.5t-6 -60t-11 -50.5t-17 -44t-25 -33.5t-34 -27t-44.5 -16t-57.5 -8.5l-13 95q26 7 36.5 10.5t24 15.5 t17 25t8 46t5 70.5t0.5 105.5q-15 0 -33.5 -19t-28.5 -55l-85 38q46 143 189 143h373v-95z" />
+<glyph unicode="&#x1d780;" horiz-adv-x="511" d="M54 -117v242q0 95 8.5 147.5t37.5 104.5q55 96 182 96q90 0 147 -63t57 -163q0 -138 -75 -210q-52 -51 -139 -51q-52 0 -98 41v-138q0 -61 -17 -94h-119q16 37 16 88zM361 230q0 148 -89 148q-69 0 -90 -92q-8 -33 -8 -136q22 -38 41.5 -53.5t50.5 -15.5q45 0 70 44 t25 105z" />
+<glyph unicode="&#x1d781;" horiz-adv-x="498" d="M279 81h56q58 0 104.5 -31t46.5 -96q0 -72 -46 -115.5t-122 -43.5q-53 0 -76 21v98h16q26 -24 61 -24q72 0 72 50q0 46 -79 46h-80q-87 0 -146.5 60t-59.5 152q0 119 76.5 197t194.5 78q62 0 115 -26.5t67 -78.5l-72 -57h-17q-18 67 -95 67q-67 0 -105.5 -45t-38.5 -107 q0 -60 21 -94q33 -51 107 -51z" />
+<glyph unicode="&#x1d782;" horiz-adv-x="520" d="M552 366h-165v-2q42 -33 65 -77t23 -88q0 -31 -14 -66.5t-40 -69t-70.5 -55.5t-98.5 -22q-96 0 -161.5 67.5t-65.5 171.5q0 62 22.5 110t58 74t72.5 39t73 13h301v-95zM350 210q0 102 -103 156q-45 0 -71 -38t-26 -99q0 -65 26.5 -106.5t75.5 -41.5q48 0 73 41t25 88z " />
+<glyph unicode="&#x1d783;" horiz-adv-x="479" d="M472 366h-153q-12 -90 -12 -175q0 -52 23.5 -77t83.5 -33v-17l-40 -78q-28 0 -50 3t-50 12.5t-46.5 26.5t-32 48t-13.5 74q0 76 21 216q-49 0 -74.5 -27.5t-37.5 -73.5l-85 38q26 81 64 119.5t105 38.5h297v-95z" />
+<glyph unicode="&#x1d784;" horiz-adv-x="514" d="M247 378v95q105 0 173.5 -61.5t68.5 -182.5q0 -105 -65 -174t-161 -69q-101 0 -154.5 50.5t-53.5 140.5v147q0 91 -20 113l102 36h16q22 -41 22 -73v-193q0 -52 21.5 -89t68.5 -37q48 0 73.5 46t25.5 96q0 155 -117 155z" />
+<glyph unicode="&#x1d785;" horiz-adv-x="634" d="M258 81v102q0 39 0.5 61.5t4 57.5t9.5 55.5t18 45.5t29.5 38t44.5 22.5t61 9.5q68 0 126 -67.5t58 -181.5q0 -99 -57.5 -168.5t-174.5 -69.5v-191h-120v191q-117 0 -174.5 69t-57.5 169q0 74 36 145t94 92l69 -58v-12q-74 -39 -74 -158q0 -152 108 -152zM376 212v-131 q108 0 108 150q0 80 -12 113.5t-47 33.5q-32 0 -40.5 -40.5t-8.5 -125.5z" />
+<glyph unicode="&#x1d786;" horiz-adv-x="573" d="M553 461l-215 -340q5 -89 44 -156t117 -75v-16l-48 -79q-39 0 -73 19.5t-57 52.5t-38.5 67t-24.5 70l-1 4l-110 -203h-138l210 333q-2 44 -11.5 82t-28 74.5t-53 58.5t-80.5 25v16l50 79q78 0 129 -60t75 -156l1 -4l114 208h138z" />
+<glyph unicode="&#x1d787;" horiz-adv-x="680" d="M699 473l-22 -95q-49 -17 -49 -152q0 -104 -48 -165t-158 -75v-191h-120v191q-206 24 -206 240q0 135 -49 152l-22 95q89 0 142.5 -55.5t53.5 -142.5q0 -109 14.5 -145.5t66.5 -48.5v380h120v-380q50 13 65.5 50t15.5 144q0 86 53.5 142t142.5 56z" />
+<glyph unicode="&#x1d788;" horiz-adv-x="740" d="M455 410l81 51q69 -19 111 -89.5t42 -151.5q0 -131 -70 -193q-47 -41 -117 -41q-44 0 -81 22t-55 61h-2q-16 -39 -53.5 -61t-81.5 -22q-76 0 -120 43q-67 62 -67 191q0 80 41.5 151t109.5 90l83 -51v-16q-56 -22 -82.5 -71.5t-26.5 -108.5q0 -133 62 -133q75 0 75 145v92 l107 29l13 -10v-111q0 -75 22 -110t56 -35q62 0 62 133q0 60 -26 109t-83 71v16z" />
+<glyph unicode="&#x1d789;" horiz-adv-x="501" d="M103 608l30 83q77 -4 136.5 -28.5t98 -62.5t63.5 -90.5t35 -109.5t10 -123q0 -154 -72 -227q-64 -64 -154 -64q-96 0 -160.5 68.5t-64.5 173.5q0 106 63 175.5t160 69.5q49 0 90 -33l3 2q-55 152 -222 154zM351 232q0 69 -26.5 107.5t-77.5 38.5q-48 0 -72.5 -41.5 t-24.5 -104.5q0 -66 26 -108.5t74 -42.5q28 0 48.5 14.5t31.5 38t16 48.5t5 50z" />
+<glyph unicode="&#x1d78a;" horiz-adv-x="462" d="M373 145l67 -65q-46 -56 -85.5 -75t-109.5 -19q-95 0 -157.5 66.5t-62.5 168.5q0 111 67 181.5t164 70.5q88 0 130 -30v-124h-16q-16 27 -38.5 41t-37.5 16t-37 2q-35 0 -66 -22.5t-39 -65.5h149v-95h-150q5 -48 36.5 -77.5t77.5 -29.5q70 0 108 57z" />
+<glyph unicode="&#x1d78b;" horiz-adv-x="536" d="M522 380v-95q-18 0 -43 5v-31q0 -130 -60 -201.5t-158 -71.5q-100 0 -153 50.5t-53 140.5v65q0 81 -20 103l102 36h16q22 -41 22 -73v-101q0 -53 20.5 -89.5t67.5 -36.5q91 0 91 172q0 44 -1 68q-222 72 -222 237q0 67 40 100.5t93 33.5q82 0 137.5 -76t70.5 -227 q24 -6 50 -9zM351 431q-3 78 -27 121.5t-61 43.5t-37 -48q0 -30 35.5 -67t89.5 -50z" />
+<glyph unicode="&#x1d78c;" horiz-adv-x="570" d="M554 85v-88q-39 -11 -71 -11q-61 0 -100.5 50t-46.5 152l-225 -202l-97 91l121 108v12q0 101 -19 141q-20 39 -68 39q-9 0 -21 -3v88q39 11 61 11q121 0 127 -215l240 215l97 -91l-136 -122q0 -78 29 -128t88 -50q9 0 21 3z" />
+<glyph unicode="&#x1d78d;" horiz-adv-x="634" d="M377 692v-219q51 0 91 -13t66 -35.5t43 -54.5t24.5 -66.5t7.5 -74.5q0 -106 -57 -174.5t-175 -68.5v-191h-120v191q-118 0 -175 68.5t-57 174.5q0 108 55 176t177 68v219h120zM376 378v-297q108 0 108 150q0 75 -30 111t-78 36zM258 81v297q-48 0 -78 -36t-30 -111 q0 -150 108 -150z" />
+<glyph unicode="&#x1d78e;" horiz-adv-x="494" d="M299 -205h-17q-5 14 -26.5 24t-60 30.5t-73.5 53.5q-97 93 -97 279q0 154 72 227q64 64 155 64q95 0 156 -69t61 -175t-62 -174.5t-159 -68.5q-49 0 -90 33l-3 -2q11 -29 38 -48.5t57.5 -30.5t59.5 -23t48 -36t19 -60zM344 232q0 146 -99 146q-47 0 -71 -46t-24 -110 q0 -65 24.5 -103t73.5 -38q52 0 74 46t22 105z" />
+<glyph unicode="&#x1d78f;" horiz-adv-x="848" d="M839 366h-92q39 -69 39 -146q0 -136 -70 -193q-50 -41 -117 -41q-95 0 -136 83h-2q-39 -83 -135 -83q-76 0 -120 43q-67 62 -67 184q0 86 45 152q-41 -4 -61 -30t-32 -70l-85 38q26 81 64 119.5t105 38.5h664v-95zM521 307v-81q0 -75 22 -110t56 -35q62 0 62 133 q0 98 -62 152h-273q-62 -54 -62 -152q0 -57 16 -95t46 -38q75 0 75 145v62l107 29z" />
+<glyph unicode="&#x1d7ce;" horiz-adv-x="500" d="M476 337q0 -157 -63 -253.5t-162 -96.5t-163 96t-64 251q0 51 7 99.5t24.5 95.5t43 81.5t65.5 56t89 21.5q75 0 127.5 -54.5t74 -131t21.5 -165.5zM318 224v225q0 111 -16 161t-53 50t-52 -48.5t-15 -162.5v-225q0 -112 16 -160.5t53 -48.5t52 48t15 161z" />
+<glyph unicode="&#x1d7cf;" horiz-adv-x="500" d="M441 0h-373v24q74 1 96 20.5t22 84.5v378q0 70 -36 70q-24 0 -65 -16l-20 -8v26l251 109h18v-570q0 -57 19.5 -75t87.5 -19v-24z" />
+<glyph unicode="&#x1d7d0;" horiz-adv-x="500" d="M478 211l-46 -211h-415v23q109 116 151.5 166.5t80.5 109.5q51 78 51 148q0 54 -31 90.5t-88 36.5q-77 0 -122 -90h-28q68 204 223 204q82 0 132 -49.5t50 -133.5q0 -110 -114 -218l-162 -154h140q81 0 107.5 13t45.5 65h25z" />
+<glyph unicode="&#x1d7d1;" horiz-adv-x="500" d="M58 524l-21 12q79 152 229 152q74 0 119 -40.5t45 -96.5q0 -38 -20.5 -73t-63.5 -54q57 -20 89.5 -68.5t32.5 -109.5q0 -110 -85.5 -185t-214.5 -75q-69 0 -110.5 24.5t-41.5 65.5q0 26 18.5 43t46.5 17q45 0 96 -57q39 -43 79 -43q45 0 71.5 34t26.5 88q0 75 -49 121 q-26 24 -56 39t-97 38v17q70 22 100.5 54t30.5 77q0 103 -99 103q-40 0 -69 -18.5t-57 -64.5z" />
+<glyph unicode="&#x1d7d2;" horiz-adv-x="500" d="M476 144h-64v-144h-145v144h-248v113l313 431h80v-433h64v-111zM268 255v294l-208 -294h208z" />
+<glyph unicode="&#x1d7d3;" horiz-adv-x="500" d="M470 676l-45 -127h-276l-22 -81q104 -6 151 -20q82 -23 127.5 -79.5t45.5 -134.5q0 -109 -78.5 -175.5t-203.5 -66.5q-65 0 -106 26t-41 62q0 26 17.5 43.5t43.5 17.5q46 0 100 -46q49 -42 90 -42q42 0 71 29.5t29 74.5q0 51 -36.5 90.5t-105.5 61.5q-49 15 -180 22 l97 345h322z" />
+<glyph unicode="&#x1d7d4;" horiz-adv-x="500" d="M470 688v-26q-109 -22 -173 -85t-93 -173q39 17 84 17q85 0 136 -54t51 -145q0 -105 -59 -170t-156 -65q-106 0 -169 77.5t-63 209.5q0 175 139 297q61 53 118.5 73.5t184.5 43.5zM323 165q0 117 -20 164t-69 47q-25 0 -37 -10q-13 -11 -13 -121q0 -150 27 -202 q15 -29 51 -29q35 0 48 31t13 120z" />
+<glyph unicode="&#x1d7d5;" horiz-adv-x="500" d="M477 676l-235 -676h-95l200 539h-199q-47 0 -68.5 -18t-36.5 -67h-26l45 222h415z" />
+<glyph unicode="&#x1d7d6;" horiz-adv-x="500" d="M472 187q0 -91 -62 -145.5t-170 -54.5q-96 0 -154 45.5t-58 124.5q0 132 149 168q-74 44 -106 87.5t-32 100.5q0 80 60.5 127.5t163.5 47.5q91 0 143 -41.5t52 -103.5q0 -98 -136 -140q84 -57 117 -105t33 -111zM339 537q0 53 -23.5 87.5t-64.5 34.5q-35 0 -59 -24 t-24 -59q0 -87 130 -154q25 33 33 56t8 59zM333 127q0 55 -25.5 89.5t-107.5 89.5q-51 -75 -51 -145q0 -68 24 -105t69 -37q42 0 66.5 28t24.5 80z" />
+<glyph unicode="&#x1d7d7;" horiz-adv-x="500" d="M31 -13v26q107 22 171.5 85t96.5 175q-37 -19 -88 -19q-83 0 -134 55.5t-51 149.5q0 97 61 163t154 66q105 0 168.5 -80t63.5 -214q0 -183 -145 -297q-67 -53 -126.5 -75t-170.5 -35zM317 461q0 117 -25 167q-17 33 -54 33q-34 0 -47 -30.5t-13 -117.5q0 -116 19.5 -165 t65.5 -49q28 0 41 9q4 2 5 20q8 31 8 86v47z" />
+<glyph unicode="&#x1d7ec;" horiz-adv-x="500" d="M476 337q0 -155 -64 -252.5t-162 -97.5t-162 97.5t-64 252.5t64 253t162 98t162 -98t64 -253zM351 341q0 252 -101 252t-101 -252q0 -259 101 -259t101 259z" />
+<glyph unicode="&#x1d7ed;" horiz-adv-x="500" d="M334 0h-120v542l-132 -50v90l233 106h19v-688z" />
+<glyph unicode="&#x1d7ee;" horiz-adv-x="500" d="M474 95l-33 -95h-421v23l242 300q69 85 69 167q0 41 -25.5 72t-68.5 31q-37 0 -67 -27t-43 -84h-95q18 95 76 150.5t147 55.5q90 0 143 -55t53 -135q0 -61 -21.5 -106.5t-82.5 -118.5l-147 -178h274z" />
+<glyph unicode="&#x1d7ef;" horiz-adv-x="500" d="M380 375v-2q42 -20 70.5 -61.5t28.5 -92.5q0 -76 -39.5 -130.5t-105.5 -81.5q-51 -20 -126 -20q-121 0 -190 73l58 77q49 -55 139 -55q74 0 110 32q34 31 34 84q0 51 -48 84q-49 33 -146 33v16l59 79q47 0 80 29t33 66q0 43 -25.5 65.5t-67.5 22.5q-35 0 -64 -22.5 t-42 -71.5l-90 31q27 73 82 115.5t132 42.5q79 0 134.5 -47t55.5 -122q0 -40 -19 -81t-53 -63z" />
+<glyph unicode="&#x1d7f0;" horiz-adv-x="500" d="M484 240l-22 -95h-50v-145h-120v145h-273v112l313 431h80v-448h72zM292 240v234l-170 -234h170z" />
+<glyph unicode="&#x1d7f1;" horiz-adv-x="500" d="M483 676l-38 -105h-225l-36 -116q108 -6 169 -40q108 -61 108 -183q0 -73 -36 -131t-95 -88q-52 -26 -126 -26q-122 0 -191 73l58 77q56 -55 136 -55q56 0 92.5 35t36.5 86q0 39 -15.5 63t-53.5 43q-50 26 -191 26l-15 11l93 330h329z" />
+<glyph unicode="&#x1d7f2;" horiz-adv-x="500" d="M159 389l2 -1q47 36 118 36q78 0 137 -55t59 -157q0 -100 -64 -164q-61 -61 -154 -61q-110 0 -170.5 82t-60.5 199q0 169 116 282q69 66 137.5 93.5t182.5 44.5l7 -9l-44 -86q-80 -6 -162.5 -64.5t-103.5 -139.5zM355 201q0 57 -23.5 92.5t-70.5 35.5q-34 0 -65 -21.5 t-50 -64.5q0 -70 29.5 -115.5t83.5 -45.5q49 0 72.5 35t23.5 84z" />
+<glyph unicode="&#x1d7f3;" horiz-adv-x="500" d="M471 676l-235 -676h-116l210 561h-295l23 115h413z" />
+<glyph unicode="&#x1d7f4;" horiz-adv-x="500" d="M472 166q0 -76 -58.5 -127.5t-162.5 -51.5q-94 0 -147 34q-76 47 -76 144q0 118 122 185q-107 65 -107 160q0 77 60.5 127.5t153.5 50.5q85 0 143.5 -46.5t58.5 -117.5q0 -55 -27 -92t-90 -68q74 -50 102 -94.5t28 -103.5zM344 522q0 32 -27 51.5t-70 19.5t-66 -20 t-23 -50q0 -55 99 -99q87 39 87 98zM352 168q0 36 -25.5 63t-89.5 64q-89 -49 -89 -122q0 -31 26 -61t76 -30q41 0 71.5 24.5t30.5 61.5z" />
+<glyph unicode="&#x1d7f5;" horiz-adv-x="500" d="M342 286l-2 1q-47 -36 -118 -36q-78 0 -137 55t-59 157q0 100 64 164q61 61 154 61q110 0 170.5 -82t60.5 -199q0 -169 -116 -282q-70 -67 -140.5 -96t-182.5 -42l-7 9l44 86q81 7 164.5 65t104.5 139zM355 432q0 70 -29.5 115.5t-83.5 45.5q-49 0 -72.5 -35t-23.5 -84 q0 -57 23.5 -92.5t70.5 -35.5q34 0 65 21.5t50 64.5z" />
+</font>
+</defs></svg> 
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/stixgeneral-bundle/stixgeneralbol-webfont.ttf b/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/stixgeneral-bundle/stixgeneralbol-webfont.ttf
new file mode 100644
index 0000000..837445a
Binary files /dev/null and b/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/stixgeneral-bundle/stixgeneralbol-webfont.ttf differ
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/stixgeneral-bundle/stixgeneralbol-webfont.woff b/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/stixgeneral-bundle/stixgeneralbol-webfont.woff
new file mode 100644
index 0000000..a7b6468
Binary files /dev/null and b/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/stixgeneral-bundle/stixgeneralbol-webfont.woff differ
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/stixgeneral-bundle/stixgeneralbolita-webfont.eot b/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/stixgeneral-bundle/stixgeneralbolita-webfont.eot
new file mode 100644
index 0000000..96db677
Binary files /dev/null and b/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/stixgeneral-bundle/stixgeneralbolita-webfont.eot differ
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/stixgeneral-bundle/stixgeneralbolita-webfont.svg b/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/stixgeneral-bundle/stixgeneralbolita-webfont.svg
new file mode 100644
index 0000000..5175320
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/stixgeneral-bundle/stixgeneralbolita-webfont.svg
@@ -0,0 +1,1137 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>
+This is a custom SVG webfont generated by Font Squirrel.
+Designer    : MicroPress Inc., with final additions and corrections provided by Coen Hoffman, Elsevier (retired)
+Foundry URL : http://www.stixfonts.org
+</metadata>
+<defs>
+<font id="webfontSsfHxKRo" horiz-adv-x="500" >
+<font-face units-per-em="1000" ascent="750" descent="-250" />
+<missing-glyph horiz-adv-x="250" />
+<glyph unicode="IJ" horiz-adv-x="823" d="M913 669v-25q-40 -5 -55.5 -19t-29.5 -66l-122 -457q-26 -99 -82 -150t-133 -51q-67 0 -107.5 26.5t-40.5 74.5q0 30 18.5 51t45.5 21t45 -18t18 -47q0 -17 -11.5 -32t-11.5 -22q0 -18 27 -18t43.5 32t44.5 138l114 432q13 51 13 64q0 29 -41 36l-33 5v25h298zM406 669 v-25q-38 -4 -55 -19t-29 -61l-112 -412q-17 -62 -17 -87q0 -21 14.5 -29.5t56.5 -10.5v-25h-296v25q39 5 54 18t29 64l117 429q14 51 14 71q0 28 -42 33l-32 4v25h298z" />
+<glyph unicode="ij" horiz-adv-x="552" d="M504 462l-116 -444q-31 -119 -81 -172t-126 -53q-47 0 -76 22t-29 55q0 22 14.5 37.5t34.5 15.5q22 0 35.5 -13.5t13.5 -35.5q0 -11 -7.5 -20t-7.5 -15q0 -15 24 -15q21 0 38 31t36 105l89 350q12 45 12 67q0 30 -41 30h-22v27q136 12 209 28zM544 617q0 -28 -20 -47.5 t-49 -19.5q-28 0 -47 20t-19 49q0 26 20 46t46 20q28 0 48.5 -20t20.5 -48zM216 142l22 -14q-48 -79 -85 -108t-83 -29q-68 0 -68 63q0 22 15 76l55 203q8 32 8 45q0 29 -46 29h-14v27q118 9 203 28l-91 -334q-9 -31 -9 -51q0 -16 15 -16q21 0 64 61zM262 616 q0 -28 -19.5 -47t-48.5 -19q-28 0 -47 20t-19 49q0 25 20 45t45 20q28 0 48.5 -20t20.5 -48z" />
+<glyph unicode="&#xfb00;" horiz-adv-x="613" d="M236 449h165q35 125 79 181q55 68 147 68q45 0 72 -21.5t27 -58.5q0 -24 -14 -39t-37 -15q-21 0 -35 14.5t-14 35.5q0 13 8 24.5t8 17.5q0 13 -18 13q-26 0 -50 -40.5t-42 -113.5l-16 -66h135l-9 -42h-133q-63 -298 -95 -394q-42 -126 -90 -172q-47 -46 -114 -46 q-43 0 -71 22t-28 57q0 23 15 39t36 16q20 0 35 -14t15 -35q0 -14 -8 -25t-8 -17q0 -12 18 -12q30 0 48.5 39t41.5 150q11 54 88 392h-163q-63 -298 -95 -394q-42 -126 -90 -172q-47 -46 -114 -46q-43 0 -71 22t-28 57q0 23 15 39t36 16q20 0 35 -14t15 -35q0 -14 -8 -25 t-8 -17q0 -12 18 -12q30 0 48.5 39t41.5 150q11 54 88 392h-74l9 42h74q35 125 79 181q55 68 147 68q45 0 70.5 -20.5t25.5 -57.5q0 -24 -14 -39t-37 -15q-21 0 -33.5 13.5t-12.5 34.5q0 13 8 24.5t8 17.5q0 13 -18 13q-26 0 -50 -40.5t-42 -113.5z" />
+<glyph unicode="&#xfb01;" horiz-adv-x="556" d="M492 140l22 -13q-50 -78 -86 -107t-81 -29q-34 0 -52.5 17.5t-18.5 48.5q0 28 15 84l70 266h-150l-94 -385q-10 -39 -32 -85t-45 -75q-53 -67 -131 -67q-42 0 -69.5 22t-27.5 56q0 24 13.5 39.5t35.5 15.5t36.5 -14t14.5 -36q0 -13 -9.5 -23.5t-9.5 -15.5q0 -10 17 -10 q33 0 51 35t42 142l89 401h-75l10 42h76q32 96 51 132.5t60 69.5q64 52 151 52q65 0 103.5 -26t38.5 -69q0 -26 -16 -42t-41 -16t-41.5 16.5t-16.5 39.5q0 16 11 30t11 20q0 17 -26 17q-59 0 -90 -37q-24 -29 -39.5 -66t-37.5 -121h117q6 0 22 1t54 4t80 5l-75 -280 q-20 -77 -20 -102q0 -6 5 -11t10 -5q23 0 78 79z" />
+<glyph unicode="&#xfb02;" horiz-adv-x="556" d="M553 701l-151 -602q-4 -15 -4 -20q0 -7 5 -12t12 -5q26 0 76 75l20 -11q-51 -79 -85 -107t-78 -28q-32 0 -52 16t-20 42q0 15 5 37l79 321h-147l-76 -314q-35 -144 -92.5 -221t-133.5 -77q-44 0 -70.5 23t-26.5 58q0 25 13.5 39.5t38.5 14.5q21 0 34 -13t13 -34 q0 -13 -8 -23t-8 -17q0 -13 22 -13q26 0 42.5 35.5t43.5 153.5l89 388h-73l10 42h73q28 90 48 131t58 74q58 50 143 50q50 0 101 -15zM372 449l30 119q-21 15 -21 39q0 12 10.5 27t10.5 22t-11 13t-25 6q-48 0 -89 -62q-26 -39 -56 -164h151z" />
+<glyph unicode="&#xfb03;" horiz-adv-x="856" d="M792 140l22 -13q-50 -78 -86 -107t-81 -29q-34 0 -52.5 17.5t-18.5 48.5q0 28 15 84l70 266h-150l-94 -385q-10 -39 -32 -85t-45 -75q-53 -67 -131 -67q-42 0 -69.5 22t-27.5 56q0 24 13.5 39.5t35.5 15.5t36.5 -14t14.5 -36q0 -13 -9.5 -23.5t-9.5 -15.5q0 -13 17 -13 q32 0 50.5 36t42.5 144l89 401h-163q-63 -298 -95 -394q-42 -126 -90 -172q-47 -46 -114 -46q-43 0 -71 22t-28 57q0 23 15 39t36 16q20 0 35 -14t15 -35q0 -14 -8 -25t-8 -17q0 -12 18 -12q30 0 48.5 39t41.5 150q11 54 88 392h-74l9 42h74q35 125 79 181q55 68 147 68 q45 0 71 -20.5t26 -57.5q0 -24 -14 -39t-37 -15q-21 0 -34 13.5t-13 34.5q0 13 8 24.5t8 17.5q0 13 -18 13q-26 0 -50 -40.5t-42 -113.5l-16 -66h167q32 96 51 132.5t60 69.5q64 52 151 52q65 0 103.5 -26t38.5 -69q0 -26 -16 -42t-41 -16t-41.5 16.5t-16.5 39.5q0 16 11 30 t11 20q0 17 -26 17q-59 0 -90 -37q-24 -29 -39.5 -66t-37.5 -121h117q6 0 22 1t54 4t80 5l-75 -280q-20 -77 -20 -102q0 -6 5 -11t10 -5q23 0 78 79z" />
+<glyph unicode="&#xfb04;" horiz-adv-x="854" d="M851 701l-151 -602q-4 -15 -4 -20q0 -7 5 -12t12 -5q26 0 76 75l20 -11q-51 -79 -85 -107t-78 -28q-32 0 -52 16t-20 42q0 15 5 37l79 321h-147l-76 -314q-35 -144 -92.5 -221t-133.5 -77q-44 0 -70.5 23t-26.5 58q0 25 13.5 39.5t38.5 14.5q21 0 34 -13t13 -34 q0 -13 -8 -23t-8 -17q0 -13 22 -13q26 0 42.5 35.5t43.5 153.5l89 388h-163q-63 -298 -95 -394q-42 -126 -90 -172q-47 -46 -114 -46q-43 0 -71 22t-28 57q0 23 15 39t36 16q20 0 35 -14t15 -35q0 -14 -8 -25t-8 -17q0 -12 18 -12q30 0 48.5 39t41.5 150q11 54 88 392h-74 l9 42h74q35 125 79 181q55 68 147 68q45 0 71 -21t26 -58q0 -24 -14 -39t-37 -15q-21 0 -34 14t-13 35q0 13 8 24.5t8 17.5q0 13 -18 13q-26 0 -50 -40.5t-42 -113.5l-16 -66h166q28 90 48 131t58 74q58 50 143 50q50 0 101 -15zM670 449l30 119q-21 15 -21 39q0 12 10.5 27 t10.5 22t-11 13t-25 6q-48 0 -89 -62q-26 -39 -56 -164h151z" />
+<glyph unicode="fj" horiz-adv-x="556" d="M27 449h76q32 96 51 132.5t60 69.5q64 52 151 52q66 0 109 -26.5t43 -68.5q0 -26 -16 -42t-41 -16t-41.5 16.5t-16.5 39.5q0 16 6 30t6 20q0 17 -26 17q-59 0 -90 -37q-24 -29 -39.5 -66t-37.5 -121h117q62 0 178 13l-116 -444q-31 -118 -81 -170.5t-126 -52.5 q-47 0 -76 22t-29 55q0 22 14.5 37.5t34.5 15.5q22 0 36.5 -13.5t14.5 -35.5q0 -11 -8.5 -20t-8.5 -15q0 -15 24 -15q21 0 38.5 30t35.5 104l89 350q12 45 12 67q0 30 -35 30h-124l-94 -385q-10 -39 -32 -85t-45 -75q-53 -67 -131 -67q-42 0 -69.5 22t-27.5 56 q0 24 13.5 39.5t35.5 15.5t36.5 -14t14.5 -36q0 -13 -9.5 -23.5t-9.5 -15.5q0 -10 17 -10q33 0 51 35t42 142l89 401h-75z" />
+<glyph unicode=" "  horiz-adv-x="250" />
+<glyph unicode="&#x09;" horiz-adv-x="250" />
+<glyph unicode="&#xa0;" horiz-adv-x="250" />
+<glyph unicode="!" horiz-adv-x="389" d="M196 204l-29 9q44 233 52 353q1 26 4.5 44.5t12 36.5t24 27.5t38.5 9.5q72 0 72 -73q0 -29 -30 -89q-91 -180 -144 -318zM213 58q0 -30 -21.5 -50.5t-52.5 -20.5t-51.5 20t-20.5 51q0 32 21 53.5t52 21.5q29 0 51 -22.5t22 -52.5z" />
+<glyph unicode="&#x22;" horiz-adv-x="555" d="M396 398l15 214q2 29 26.5 51t53.5 22q19 0 32 -14.5t13 -34.5q0 -16 -13 -47l-85 -191h-42zM136 398l15 214q2 29 26.5 51t53.5 22q19 0 32 -14.5t13 -34.5q0 -18 -13 -47l-85 -191h-42z" />
+<glyph unicode="#" d="M532 490l-20 -73h-96l-54 -134h86l-20 -73h-96l-85 -210h-78l85 210h-113l-85 -210h-78l85 210h-95l20 73h105l54 134h-95l20 73h104l87 210h77l-86 -210h113l87 210h77l-86 -210h87zM338 417h-113l-54 -134h113z" />
+<glyph unicode="$" d="M497 598l-42 -134l-21 5q1 11 1 31q0 53 -18.5 81.5t-65.5 43.5l-59 -215q83 -72 111.5 -115t28.5 -97q0 -89 -67.5 -143.5t-186.5 -54.5l-28 -100h-52l29 107q-49 12 -80 28.5t-67 51.5l42 141l22 -6q2 -82 20 -117.5t73 -62.5l74 261q-78 60 -105 99t-27 91 q0 81 55 129t141 48q16 0 38 -2l18 65h50l-20 -72q74 -13 136 -63zM248 436l55 199q-5 2 -15 2q-50 0 -80 -26t-30 -69q0 -30 15 -53t55 -53zM253 274l-67 -242q61 0 99 32.5t38 96.5q0 37 -14.5 61t-55.5 52z" />
+<glyph unicode="%" horiz-adv-x="757" d="M707 214q0 -53 -19.5 -104t-53.5 -86q-39 -42 -99 -42q-57 0 -92.5 38.5t-35.5 99.5q0 85 58.5 149t136.5 64q49 0 77 -31.5t28 -87.5zM682 220q0 35 -17 57.5t-42 22.5q-31 0 -62 -46q-24 -36 -40 -87t-16 -91q0 -66 50 -66q44 0 79 51q48 74 48 159zM645 706l-438 -735 h-48l388 655q-56 -42 -113 -42q-28 0 -60 13q3 -29 3 -42q0 -53 -19.5 -105.5t-50.5 -83.5q-44 -44 -101 -44q-56 0 -91 39t-35 100q0 85 59 149t138 64q35 0 71 -29q38 -30 83 -30q49 0 88.5 21.5t77.5 69.5h48zM351 560q0 25 -6 35.5t-26 18.5q-11 5 -21 11q-14 9 -20 9 q-32 0 -67 -74.5t-35 -141.5q0 -66 50 -66q48 0 86.5 64t38.5 144z" />
+<glyph unicode="&#x26;" horiz-adv-x="849" d="M745 101l26 -21q-46 -56 -82.5 -77t-85.5 -21q-80 0 -142 62q-83 -63 -198 -63q-87 0 -137 42t-50 119q0 190 240 242q-11 56 -11 92q0 94 52.5 150t136.5 56q62 0 98 -31.5t36 -82.5q0 -54 -44.5 -95.5t-137.5 -76.5q15 -112 86 -227q74 88 74 129q0 17 -12 25t-44 13 v25h212v-25q-38 -3 -62 -25t-105 -129l-38 -49q52 -72 110 -72q38 0 78 40zM548 582q0 32 -13.5 49.5t-38.5 17.5q-33 0 -51.5 -30.5t-18.5 -82.5q0 -34 11 -102q62 33 86.5 67t24.5 81zM433 80q-44 62 -67.5 120.5t-41.5 142.5q-63 -31 -89 -65.5t-26 -87.5q0 -60 35.5 -99 t89.5 -39q53 0 99 28z" />
+<glyph unicode="'" horiz-adv-x="278" d="M128 398l16 215q2 34 25 53t54 19q19 0 32 -14.5t13 -34.5q0 -14 -15 -48l-83 -190h-42z" />
+<glyph unicode="(" horiz-adv-x="333" d="M326 685l18 -20q-62 -57 -95 -99t-60 -101q-67 -147 -67 -346q0 -90 15 -150.5t56 -132.5l-23 -15q-77 106 -109.5 191.5t-32.5 194.5q0 182 117 321q54 63 181 157z" />
+<glyph unicode=")" horiz-adv-x="333" d="M105 670l23 15q74 -101 102 -172q41 -103 41 -214q0 -137 -68 -251q-70 -117 -230 -227l-17 20q68 61 99.5 105t61.5 117q60 146 60 331q0 84 -16.5 146t-55.5 130z" />
+<glyph unicode="*" d="M312 468l11 -6q27 -15 41.5 -19t46.5 -4q33 0 57 -12t24 -39q0 -22 -16 -38t-36 -16q-19 0 -31.5 10t-28.5 37q-18 29 -29.5 41.5t-35.5 25.5l-11 6v-12q0 -42 26 -87q17 -29 17 -52t-14 -37t-37 -14t-36.5 14t-13.5 38q0 22 17 51q26 45 26 87v12l-11 -6 q-24 -13 -35.5 -25.5t-29.5 -41.5q-16 -27 -28.5 -37t-31.5 -10q-20 0 -36 16t-16 38q0 27 24 39t57 12q32 0 46.5 4t41.5 19l11 6l-11 6q-26 14 -41 18t-47 5q-33 0 -57 12.5t-24 39.5q0 21 15 37.5t34 16.5q33 0 63 -47q19 -29 31 -42.5t34 -25.5l11 -6v12q0 44 -26 88 q-17 29 -17 51q0 24 13.5 38t36.5 14t37 -14t14 -38q0 -22 -17 -51q-26 -44 -26 -88v-12l11 6q22 12 34 25.5t31 42.5q30 47 63 47q19 0 34 -16.5t15 -37.5q0 -27 -24 -39.5t-57 -12.5q-32 -1 -47 -5t-41 -18z" />
+<glyph unicode="+" horiz-adv-x="570" d="M537 209h-208v-209h-88v209h-208v88h208v209h88v-209h208v-88z" />
+<glyph unicode="," horiz-adv-x="250" d="M-47 -182l-13 25q118 63 118 116q0 21 -30 37q-40 22 -40 65q0 35 20.5 54t52.5 19q39 0 61 -26t22 -68q0 -67 -51 -125.5t-140 -96.5z" />
+<glyph unicode="-" horiz-adv-x="333" d="M271 282l-23 -116h-246l24 116h245z" />
+<glyph unicode="." horiz-adv-x="250" d="M139 61q0 -31 -21.5 -52.5t-53.5 -21.5q-31 0 -52 21t-21 52q0 32 21.5 53.5t53.5 21.5q30 0 51.5 -21.5t21.5 -52.5z" />
+<glyph unicode="/" horiz-adv-x="278" d="M342 685l-319 -703h-87l319 703h87z" />
+<glyph unicode="0" d="M477 442q0 -113 -47.5 -225t-118.5 -176q-61 -55 -134 -55q-77 0 -118.5 59t-41.5 161q0 112 42 220.5t110 186.5q61 70 158 70q71 0 110.5 -65t39.5 -176zM374 582q0 34 -13 53t-36 19q-21 0 -38 -19.5t-38 -63.5q-44 -97 -86.5 -262t-42.5 -228q0 -30 13.5 -48 t36.5 -18q31 0 55.5 33t50.5 111q98 300 98 423z" />
+<glyph unicode="1" d="M419 683l-154 -560q-14 -52 -14 -63q0 -21 20.5 -28t78.5 -9v-23h-345v23q58 3 83 19.5t38 62.5l124 445q6 27 6 30q0 33 -48 33q-30 0 -62 -5l2 23q121 16 271 52z" />
+<glyph unicode="2" d="M86 507l-22 12q31 76 87.5 120t130.5 44q76 0 120 -47.5t44 -120.5q0 -59 -34.5 -116t-109.5 -121l-196 -167h138q65 0 95.5 15.5t55.5 64.5h24l-80 -191h-366v24l89 92q145 151 197.5 224t52.5 136q0 117 -92 117q-76 0 -134 -86z" />
+<glyph unicode="3" d="M117 537l-21 13q82 133 207 133q61 0 104 -39t43 -97q0 -104 -119 -149v-2q43 -32 60 -64.5t17 -81.5q0 -108 -83.5 -185.5t-206.5 -77.5q-61 0 -96.5 21.5t-35.5 58.5q0 26 16 42t43 16q22 0 37.5 -14t30 -38t22.5 -32q14 -14 40 -14q45 0 77.5 49.5t32.5 112.5 q0 71 -36 112q-23 26 -49.5 34.5t-72.5 11.5l4 22q190 40 190 153q0 90 -87 90q-35 0 -60.5 -16t-56.5 -59z" />
+<glyph unicode="4" d="M503 683l-119 -435h70l-27 -98h-69l-42 -150h-128l41 150h-244l28 105l427 428h63zM335 528l-282 -280h203z" />
+<glyph unicode="5" d="M486 669l-36 -109h-253l-34 -77q82 -15 111 -26t65 -41q73 -62 73 -165q0 -108 -82 -186t-204 -78q-63 0 -100 21.5t-37 57.5q0 26 16.5 42t42.5 16q44 0 71 -54q21 -43 59 -43q48 0 88.5 49.5t40.5 112.5q0 49 -26.5 90t-74.5 65q-47 24 -133 28l131 297h282z" />
+<glyph unicode="6" d="M503 679l6 -24q-178 -62 -278 -246q30 13 62 13q71 0 110.5 -44t39.5 -127q0 -116 -71 -191t-175 -75q-83 0 -128.5 54t-45.5 150q0 103 46 196.5t130 163.5q67 56 129.5 82t174.5 48zM319 315q0 35 -15.5 51t-52.5 16q-22 0 -32.5 -8t-22.5 -36q-27 -63 -44 -131 t-17 -112q0 -78 55 -78q36 0 61 39q27 43 47.5 123.5t20.5 135.5z" />
+<glyph unicode="7" d="M525 669l-381 -669h-92l332 556h-127q-84 0 -114.5 -14t-58.5 -63h-26l87 190h380z" />
+<glyph unicode="8" d="M183 341v4q-42 44 -58 77.5t-16 76.5q0 83 55 133.5t136 50.5q79 0 130 -44q46 -41 46 -99q0 -54 -33 -92.5t-110 -67.5v-4q49 -55 67.5 -95t18.5 -88q0 -94 -64.5 -150t-163.5 -56q-86 0 -137 45.5t-51 120.5q0 64 44 109t136 79zM383 544q0 47 -22 76.5t-55 29.5 q-39 0 -62.5 -26.5t-23.5 -71.5q0 -40 19.5 -74t70.5 -75q43 45 58 74t15 67zM306 140q0 43 -18 79.5t-79 101.5q-58 -37 -83.5 -78t-25.5 -102q0 -57 26 -90.5t70 -33.5q47 0 78.5 35.5t31.5 87.5z" />
+<glyph unicode="9" d="M-6 -10l-6 25q184 56 277 244q-32 -14 -61 -14q-68 0 -109.5 46t-41.5 121q0 114 71.5 192.5t174.5 78.5q74 0 118 -44q58 -60 58 -163q0 -109 -57 -212t-155 -172q-58 -41 -114.5 -62.5t-154.5 -39.5zM363 582q0 69 -49 69q-48 0 -79 -63q-23 -47 -40.5 -117.5 t-17.5 -118.5q0 -64 66 -64q32 0 44.5 14.5t32.5 74.5q43 128 43 205z" />
+<glyph unicode=":" horiz-adv-x="333" d="M171 61q0 -31 -21.5 -52.5t-53.5 -21.5q-31 0 -52 21t-21 53t21.5 53t53.5 21q30 0 51.5 -22t21.5 -52zM264 385q0 -31 -21.5 -52.5t-53.5 -21.5q-31 0 -52 21t-21 53t21.5 53t53.5 21q30 0 51.5 -22t21.5 -52z" />
+<glyph unicode=";" horiz-adv-x="333" d="M264 385q0 -31 -21.5 -52.5t-53.5 -21.5q-31 0 -52 21t-21 53t21.5 53t53.5 21q30 0 51.5 -22t21.5 -52zM-12 -183l-13 25q118 63 118 116q0 21 -30 37q-41 23 -41 65q0 35 21 54t53 19q39 0 61 -26t22 -68q0 -67 -51 -125.5t-140 -96.5z" />
+<glyph unicode="&#x3c;" horiz-adv-x="570" d="M539 -12l-508 223v84l508 223v-96l-385 -169l385 -169v-96z" />
+<glyph unicode="=" horiz-adv-x="570" d="M537 107h-504v88h504v-88zM537 311h-504v88h504v-88z" />
+<glyph unicode="&#x3e;" horiz-adv-x="570" d="M539 211l-508 -223v96l385 169l-385 169v96l508 -223v-84z" />
+<glyph unicode="?" d="M227 61q0 -31 -21.5 -52.5t-53.5 -21.5q-31 0 -52 21t-21 53t21.5 53t53.5 21q30 0 51.5 -22t21.5 -52zM196 208l-29 8q7 100 112 209q64 67 64 149q0 37 -18.5 58t-50.5 21q-24 0 -43 -11.5t-19 -26.5q0 -11 14.5 -28t14.5 -39q0 -25 -18 -43.5t-43 -18.5 q-26 0 -43.5 21.5t-17.5 50.5q0 51 52.5 88.5t128.5 37.5q74 0 122 -38.5t48 -105.5q0 -98 -126 -171q-72 -42 -98.5 -72.5t-49.5 -88.5z" />
+<glyph unicode="@" horiz-adv-x="939" d="M703 77l13 -35q-116 -60 -231 -60q-156 0 -261.5 102t-105.5 241q0 154 108 257t265 103q144 0 239 -82t95 -216q0 -103 -50.5 -173.5t-136.5 -71.5q-37 0 -64 22t-29 53q-56 -74 -122 -74q-43 0 -69.5 31.5t-26.5 82.5q0 96 56.5 177t144.5 81q27 0 41 -10t31 -42l11 38 h71l-61 -243q-6 -30 -6 -34q0 -21 11 -32.5t30 -11.5q37 0 67 38.5t43 84.5t13 83q0 109 -84.5 184.5t-202.5 75.5q-124 0 -203.5 -91.5t-79.5 -235.5q0 -125 80 -208t207 -83q125 0 207 49zM583 402q0 64 -42 65q-59 1 -98.5 -62t-39.5 -130q0 -39 16 -62t43 -23 q47 0 82 68q39 76 39 144z" />
+<glyph unicode="A" horiz-adv-x="667" d="M593 0h-303v25q77 6 77 49q0 3 -2 15l-12 119h-215l-57 -96q-17 -28 -17 -50q0 -37 64 -37v-25h-195l-1 25q26 3 43 19.5t43 56.5l370 582h25l94 -560q11 -62 25 -78.5t61 -19.5v-25zM346 248l-37 243l-148 -243h185z" />
+<glyph unicode="B" horiz-adv-x="667" d="M118 669h265q241 0 241 -146q0 -39 -13.5 -67t-44 -47t-57 -29.5t-74.5 -24.5v-1q72 -20 104.5 -55.5t32.5 -92.5q0 -99 -78 -152.5t-217 -53.5h-302v25q36 5 54 22t30 61l119 438q11 39 11 57t-10.5 27.5t-23.5 11.5t-37 2v25zM334 577l-57 -209q5 0 21.5 1.5t21.5 1.5 t18.5 1.5t19 2.5t16 3.5t16.5 5.5l13 6q8 3 14.5 7.5t12.5 10.5q47 44 47 128q0 101 -87 101q-25 0 -35 -10t-21 -50zM269 338l-64 -236q-7 -27 -7 -37q0 -33 57 -33q73 0 121 59q43 52 43 138q0 58 -35 85q-28 21 -115 24z" />
+<glyph unicode="C" horiz-adv-x="667" d="M677 685l-51 -235l-32 6q3 20 3 36q0 72 -34.5 115t-96.5 43q-80 0 -145 -73q-61 -69 -98 -165t-37 -203q0 -81 42 -127.5t113 -46.5q61 0 105 28t99 91l31 -22q-42 -58 -78 -85q-86 -65 -199 -65q-122 0 -194.5 69t-72.5 183q0 109 42.5 202t116.5 156q111 93 249 93 q64 0 131 -21q24 -8 38 -8q20 0 38 29h30z" />
+<glyph unicode="D" horiz-adv-x="722" d="M94 669h290q141 0 221 -70.5t80 -193.5q0 -82 -31.5 -159t-87.5 -129q-127 -117 -324 -117h-288v25q37 5 53.5 21.5t29.5 62.5l115 422q15 53 15 71t-8.5 26t-30.5 11l-34 5v25zM318 600l-126 -465q-15 -53 -15 -67q0 -34 58 -34q130 0 210 105q93 121 93 318 q0 181 -165 181q-25 0 -37 -8.5t-18 -29.5z" />
+<glyph unicode="E" horiz-adv-x="667" d="M653 669l-43 -190l-27 5q-3 60 -9.5 82t-35.5 41q-47 30 -137 30q-32 0 -45 -9t-22 -42l-59 -216q99 0 134.5 18.5t70.5 88.5l28 -4l-74 -274l-28 4q4 25 4 44q0 52 -30 71.5t-114 19.5l-63 -234q-8 -32 -8 -38q0 -34 61 -34q131 0 214 61q28 20 47 42t44 64l25 -5 l-60 -194h-553v25q39 6 54 20.5t28 59.5l119 432q12 44 12 70q0 15 -9 22.5t-32 10.5l-33 4v25h541z" />
+<glyph unicode="F" horiz-adv-x="667" d="M660 669l-43 -190l-27 5q0 75 -20 100q-24 30 -59 41.5t-98 11.5q-30 0 -42.5 -9.5t-20.5 -38.5l-61 -219q99 1 133 19t65 88l28 -4l-74 -274l-28 5q4 25 4 44q0 51 -28.5 70t-108.5 20l-55 -206q-15 -56 -15 -63q0 -23 14.5 -32t56.5 -12v-25h-294v25q41 4 55.5 19.5 t26.5 59.5l121 442q10 38 10 61q0 28 -42 33l-31 4v25h533z" />
+<glyph unicode="G" horiz-adv-x="722" d="M705 330v-26q-38 -3 -52 -19t-30 -77l-44 -167l-28 -13q-42 -20 -108.5 -33t-125.5 -13q-133 0 -214.5 74t-81.5 200q0 96 43.5 185t119.5 152q112 92 264 92q64 0 124 -21q24 -9 36 -9q27 0 42 30h31l-51 -221l-29 4q-3 82 -24 119q-36 62 -115 62q-96 0 -173 -98 q-51 -67 -81.5 -155.5t-30.5 -179.5q0 -97 42 -146.5t122 -49.5q73 0 94 30l31 104q27 92 27 114q0 16 -12 24q-14 7 -63 12v26h287z" />
+<glyph unicode="H" horiz-adv-x="778" d="M799 669v-25q-36 0 -53.5 -16.5t-28.5 -57.5l-111 -408q-22 -84 -22 -96q0 -22 16 -30.5t57 -10.5v-25h-316v25q51 3 70 17.5t32 61.5l62 225h-239l-54 -197q-12 -43 -12 -67q0 -34 71 -40v-25h-295v25q39 5 54 18.5t27 55.5l121 447q11 38 11 58q0 17 -9.5 25t-32.5 11 l-31 4v25h316v-25q-49 -2 -69 -17t-33 -63l-52 -191h239l47 173q10 38 10 61q0 15 -9 22.5t-32 10.5l-31 4v25h297z" />
+<glyph unicode="I" horiz-adv-x="389" d="M406 669v-25q-38 -4 -55 -19t-29 -61l-112 -412q-17 -62 -17 -87q0 -21 14.5 -29.5t56.5 -10.5v-25h-296v25q39 5 54 18t29 64l117 429q14 51 14 71q0 28 -42 33l-32 4v25h298z" />
+<glyph unicode="J" d="M524 669v-25q-40 -5 -55.5 -19t-29.5 -66l-122 -457q-26 -99 -82 -150t-133 -51q-67 0 -107.5 26.5t-40.5 74.5q0 30 18.5 51t45.5 21t45 -18t18 -47q0 -17 -11.5 -32t-11.5 -22q0 -18 27 -18t43.5 32t44.5 138l114 432q13 51 13 64q0 29 -41 36l-33 5v25h298z" />
+<glyph unicode="K" horiz-adv-x="667" d="M702 669v-25q-33 -5 -47.5 -12t-46.5 -36l-216 -199l157 -333q9 -19 22 -27.5t41 -11.5v-25h-280l1 25l26 4q21 3 29.5 8t8.5 15q0 16 -15 49l-111 236l-67 -249q-2 -10 -2 -17q0 -25 13 -34t52 -12v-25h-288v25q36 4 52.5 17t26.5 51l123 453q11 38 11 58q0 17 -9 25 t-32 11l-33 4v25h311v-25q-45 -4 -64.5 -18.5t-29.5 -53.5l-62 -227l197 175q77 68 77 97q0 22 -35 25l-21 2v25h211z" />
+<glyph unicode="L" horiz-adv-x="611" d="M590 195l-60 -195h-552v25q40 5 55 20.5t27 57.5l121 443q11 42 11 61q0 15 -9 22t-32 10q-20 4 -34 5v25h318v-25q-50 -3 -69.5 -16.5t-29.5 -53.5l-129 -473q-6 -24 -6 -39q0 -30 72 -30q104 0 178 45q38 23 61.5 48.5t53.5 74.5z" />
+<glyph unicode="M" horiz-adv-x="889" d="M917 669v-25q-39 -5 -55 -20t-29 -61l-119 -438q-10 -34 -10 -57q0 -25 14 -34t57 -9v-25h-311v25q50 3 69.5 18.5t31.5 60.5l123 457l-375 -573h-28l-67 559l-101 -369q-20 -71 -20 -92q0 -33 15.5 -44.5t64.5 -16.5v-25h-206v25q40 9 58 36.5t45 120.5l107 369 q11 41 11 58q0 22 -12 28.5t-59 6.5v25h219l54 -480l311 480h212z" />
+<glyph unicode="N" horiz-adv-x="722" d="M748 669v-25q-42 -8 -58.5 -32.5t-43.5 -120.5l-143 -506h-28l-257 547l-99 -354q-19 -66 -19 -94q0 -29 17.5 -42t61.5 -17v-25h-206v25q42 8 56 30t45 125l120 407q-15 34 -28.5 43.5t-53.5 13.5v25h193l216 -467l81 289q19 71 19 94q0 59 -81 59v25h208z" />
+<glyph unicode="O" horiz-adv-x="722" d="M691 444q0 -95 -49.5 -194.5t-130.5 -171.5q-108 -96 -248 -96q-108 0 -172 62.5t-64 176.5q0 101 51 202.5t135 169.5q114 92 236 92q104 0 173 -66.5t69 -174.5zM547 528q0 60 -27 91.5t-74 31.5q-91 0 -162 -120q-46 -78 -79.5 -189.5t-33.5 -198.5q0 -57 27.5 -92 t74.5 -35q46 0 82 28t75 86q49 72 83 191t34 207z" />
+<glyph unicode="P" horiz-adv-x="611" d="M112 669h282q219 0 219 -155q0 -80 -59 -131q-75 -66 -214 -66q-37 0 -81 5l-54 -199q-11 -37 -11 -58q0 -20 15 -29t57 -11v-25h-294v25q40 6 55.5 20.5t28.5 61.5l117 426q13 46 13 74q0 15 -9 22.5t-32 10.5l-33 4v25zM330 584l-61 -229q17 -3 42 -3q46 0 74.5 14.5 t48.5 47.5q33 52 33 136q0 40 -22.5 63.5t-61.5 23.5q-26 0 -35 -9.5t-18 -43.5z" />
+<glyph unicode="Q" horiz-adv-x="722" d="M203 -17l2 4l-16 6q-162 58 -162 218q0 110 49.5 211.5t130.5 169.5q112 93 242 93q105 0 173.5 -66t68.5 -167q0 -94 -40.5 -187t-114.5 -164q-67 -65 -124 -89.5t-160 -28.5l-44 -47v-3q101 -5 186 -35q46 -16 85 -16q46 0 79 16.5t76 61.5l21 -19 q-58 -84 -116.5 -116.5t-142.5 -32.5q-55 0 -136 26q-68 21 -104 21q-43 0 -114 -28l-14 24zM547 532q0 53 -28 86t-73 33q-91 0 -162 -119q-45 -76 -79 -195t-34 -201q0 -55 27.5 -87t74.5 -32q94 0 169 137q43 80 74 189.5t31 188.5z" />
+<glyph unicode="R" horiz-adv-x="667" d="M110 669h286q227 0 227 -143q0 -92 -96 -151q-31 -19 -96 -32l85 -254q12 -36 28.5 -48t58.5 -16v-25h-202l-107 331h-30l-52 -182q-18 -62 -18 -82q0 -22 14 -30.5t58 -11.5v-25h-294v25q36 4 53 21.5t29 62.5l120 437q10 38 10 61q0 16 -9 24t-33 10l-32 3v25zM330 583 l-57 -220q91 1 127 25q33 20 52.5 62t19.5 92q0 46 -21 70.5t-61 24.5q-25 0 -38 -10.5t-22 -43.5z" />
+<glyph unicode="S" horiz-adv-x="556" d="M526 681l-40 -202l-27 4q-9 76 -22 101q-33 66 -116 66q-41 0 -69.5 -29t-28.5 -76q0 -41 22.5 -66.5t84.5 -70.5q80 -58 109 -104t29 -113q0 -63 -29 -110.5t-81 -73.5q-52 -25 -120 -25q-53 0 -122 24q-32 11 -46 11t-21.5 -6.5t-16.5 -28.5h-30l36 225l29 -2 q7 -54 16 -84t32 -55q44 -50 106 -50q56 0 89 34q37 37 37 92q0 43 -25.5 75.5t-89.5 78.5q-66 47 -98 92.5t-32 105.5q0 84 58.5 137.5t145.5 53.5q50 0 91.5 -15t54.5 -15q31 0 44 26h30z" />
+<glyph unicode="T" horiz-adv-x="611" d="M650 669l-36 -192l-27 2q0 85 -31.5 120t-106.5 35l-135 -489q-17 -58 -17 -74q0 -46 83 -46v-25h-331v25h15q72 0 91 72l148 537q-79 -2 -130 -34t-88 -109l-25 7l39 171h551z" />
+<glyph unicode="U" horiz-adv-x="722" d="M744 669v-25q-32 -6 -44.5 -14t-25.5 -36.5t-32 -96.5l-65 -234q-25 -89 -52.5 -145t-68.5 -89q-59 -47 -166 -47q-101 0 -162 42.5t-61 120.5q0 47 37 189l51 193q15 55 15 78q0 17 -9 25.5t-32 10.5l-32 3v25h311v-25q-46 -2 -64 -16.5t-30 -59.5l-81 -294 q-28 -101 -28 -135q0 -101 122 -101q78 0 123 47q49 51 90 197l57 209q19 70 19 96q0 57 -79 57v25h207z" />
+<glyph unicode="V" horiz-adv-x="667" d="M715 669v-25q-39 -8 -62 -44l-390 -618h-32l-76 513q-8 56 -13.5 81.5t-15.5 43t-22.5 21t-37.5 3.5v25h296v-25q-51 -4 -63 -11.5t-12 -33.5q0 -11 2 -23l50 -394l187 297q63 101 63 129q0 31 -41 34l-24 2v25h191z" />
+<glyph unicode="W" horiz-adv-x="889" d="M940 669v-24q-32 -5 -48 -19t-40 -63l-282 -581h-29l-59 489l-233 -489h-29l-78 572q-8 54 -19.5 68.5t-58.5 22.5v24h278v-25q-35 -4 -48 -15t-13 -35q0 -14 1 -19l40 -349l149 314q0 60 -12.5 79.5t-57.5 25.5v24h267v-25q-39 -4 -50.5 -14.5t-11.5 -39.5q0 -5 7 -73 l33 -291l155 327q15 33 15 46q0 27 -10.5 34.5t-52.5 10.5v25h187z" />
+<glyph unicode="X" horiz-adv-x="667" d="M694 669v-25q-28 -4 -47.5 -16t-51.5 -45l-199 -205l75 -237q21 -66 41.5 -88t73.5 -28v-25h-307v25q42 4 54.5 11t12.5 27q0 30 -37 141l-20 60l-130 -144q-32 -35 -32 -55q0 -34 63 -40v-25h-214v25q10 2 17.5 4t16.5 8l17 11q7 4 19 16l22 20l26 27l30 33l38 42l45 49 l68 74l-83 269q-12 40 -29 50.5t-64 15.5v25h305v-25l-29 -3q-25 -2 -35 -9t-10 -24q0 -21 35 -132l17 -55l94 99q70 74 70 98q0 21 -33 24l-21 2v25h202z" />
+<glyph unicode="Y" horiz-adv-x="611" d="M659 669v-25q-27 -4 -46.5 -20t-45.5 -52l-189 -264l-52 -191q-10 -40 -10 -51q0 -22 17 -31.5t62 -9.5v-25h-323v25q52 5 72 18.5t32 59.5l57 208l-87 270q-12 35 -23.5 45t-51.5 18v25h285v-25q-42 -2 -55.5 -9.5t-13.5 -29.5q0 -19 29 -110l46 -143l128 183 q28 40 28 67q0 23 -13 32t-53 10v25h207z" />
+<glyph unicode="Z" horiz-adv-x="611" d="M589 640l-434 -605h75q70 0 115.5 11t83.5 39q49 37 97 114l27 -5l-60 -194h-505v29l434 605h-83q-79 0 -133.5 -32t-113.5 -115l-28 4l58 178h467v-29z" />
+<glyph unicode="[" horiz-adv-x="333" d="M362 674l-7 -35h-69q-27 0 -34.5 -10t-18.5 -56l-155 -667q-1 -3 -1 -9q0 -21 34 -21h78l-7 -35h-219l199 833h200z" />
+<glyph unicode="\" horiz-adv-x="278" d="M279 -18h-84l-196 703h85z" />
+<glyph unicode="]" horiz-adv-x="333" d="M343 674l-200 -831h-199l7 35h68q26 0 33 9t18 54l157 667l1 10q0 21 -34 21h-78l7 35h220z" />
+<glyph unicode="^" horiz-adv-x="570" d="M503 304h-89l-129 272l-129 -272h-89l178 365h80z" />
+<glyph unicode="_" d="M500 -125h-500v50h500v-50z" />
+<glyph unicode="`" horiz-adv-x="333" d="M297 516h-46l-132 88q-34 23 -34 48q0 18 13.5 31.5t31.5 13.5q31 0 56 -33z" />
+<glyph unicode="a" d="M435 127l21 -15q-78 -126 -156 -126q-29 0 -46 16.5t-17 47.5q0 21 14 69q-42 -71 -80 -101.5t-84 -30.5q-49 0 -78.5 35t-29.5 92q0 117 87 231q89 117 186 117q32 0 49.5 -17t24.5 -55h1l17 59l111 7l-75 -251q-30 -99 -30 -133q0 -15 12 -15t27 14.5t46 55.5zM303 373 q0 20 -10.5 33.5t-26.5 13.5q-52 0 -108 -115q-25 -51 -40.5 -105.5t-15.5 -84.5q0 -57 43 -57q45 0 86 75q29 52 50.5 123.5t21.5 116.5z" />
+<glyph unicode="b" d="M284 699l-91 -326q65 89 144 89q47 0 77 -37.5t30 -93.5q0 -135 -97 -239.5t-223 -104.5q-53 0 -95.5 17.5t-42.5 43.5q0 9 20 81l94 327q39 136 39 156q0 30 -46 30h-19v27q123 14 210 30zM319 325q0 69 -41 69q-52 0 -92 -84q-24 -52 -62 -182q-15 -51 -15 -81 q0 -12 8.5 -19.5t22.5 -7.5q55 0 108 78q30 43 50.5 112t20.5 115z" />
+<glyph unicode="c" horiz-adv-x="444" d="M318 142l28 -18l-38 -50q-13 -17 -34.5 -37.5t-42.5 -31.5q-35 -18 -83 -18q-70 0 -111.5 39.5t-41.5 111.5q0 134 105 239q83 85 180 85q46 0 79 -25.5t33 -64.5q0 -32 -17 -51.5t-45 -19.5q-25 0 -41.5 15t-16.5 38q0 16 10.5 32t10.5 26q0 7 -7.5 12t-16.5 5 q-26 0 -47.5 -22.5t-45.5 -65.5q-53 -98 -53 -201q0 -43 19.5 -66t53.5 -23q32 0 59 20t63 71z" />
+<glyph unicode="d" d="M517 699l-117 -421q-51 -184 -51 -203q0 -5 3.5 -10t7.5 -5q24 0 68 71l22 -16q-79 -126 -150 -126q-28 0 -44 16t-16 45q0 20 11 68q-72 -131 -166 -131q-48 0 -77 32.5t-29 92.5q0 72 37 150t94 132q70 68 138 68q46 0 75 -33l18 64q29 102 29 122q0 28 -41 28h-21v27 q129 10 209 29zM308 371q0 21 -10.5 35t-26.5 14q-57 1 -114 -112q-24 -48 -39 -100.5t-15 -85.5q0 -27 11.5 -45t29.5 -18q45 0 86 74q27 48 52.5 126.5t25.5 111.5z" />
+<glyph unicode="e" horiz-adv-x="444" d="M317 143l29 -17q-78 -139 -195 -139q-67 0 -106.5 37.5t-39.5 109.5q0 124 89.5 226t198.5 102q48 0 76.5 -24t28.5 -63q0 -63 -69 -122q-32 -27 -73.5 -42.5t-114.5 -28.5q-6 -30 -6 -49q0 -82 64 -82q32 0 57.5 20t60.5 72zM306 390q0 39 -31 39q-71 0 -127 -215 q68 15 113 64.5t45 111.5z" />
+<glyph unicode="f" horiz-adv-x="333" d="M47 449h74q35 125 79 181q55 68 147 68q45 0 72 -21.5t27 -58.5q0 -24 -14 -39t-37 -15q-21 0 -35 14.5t-14 35.5q0 13 8 24.5t8 17.5q0 13 -18 13q-26 0 -50 -40.5t-42 -113.5l-16 -66h91l-9 -42h-89q-63 -298 -95 -394q-42 -126 -90 -172q-47 -46 -114 -46 q-43 0 -71 22t-28 57q0 23 15 39t36 16q20 0 35 -14t15 -35q0 -14 -8 -25t-8 -17q0 -12 18 -12q30 0 48.5 39t41.5 150q11 54 88 392h-74z" />
+<glyph unicode="g" d="M477 373h-66q6 -12 6 -42q0 -81 -71 -132q-64 -46 -145 -46q-27 0 -51 8q-10 0 -19 -10t-9 -26q0 -12 15 -23.5t39 -17.5l50 -12q81 -19 115 -47.5t34 -75.5q0 -63 -64.5 -107.5t-172.5 -44.5q-89 0 -139.5 25.5t-50.5 75.5q0 59 40 83t93 26q-62 21 -62 66q0 30 21 53 t75 44q-80 34 -80 110q0 78 62.5 130t155.5 52q75 0 114 -33h110v-56zM300 372q0 59 -45 59q-30 0 -57 -32q-23 -29 -35 -73t-12 -83q0 -59 42 -59q47 0 78 69q29 63 29 119zM266 -100q0 37 -42 58q-17 8 -58.5 21.5t-50.5 14.5q-7 -1 -24.5 -11t-26.5 -19q-29 -28 -29 -55 q0 -35 31.5 -56.5t81.5 -21.5q52 0 85 20.5t33 48.5z" />
+<glyph unicode="h" horiz-adv-x="556" d="M476 142l22 -15q-50 -77 -85.5 -106.5t-81.5 -29.5q-30 0 -48 17t-18 47t11 70t50 155l20 59q7 21 7 30q0 21 -20 21q-42 0 -106 -94q-36 -53 -58 -108t-61 -188h-121l152 562q10 37 10 47q0 33 -42 33h-22v27q99 9 209 30l-108 -416q74 105 118 142t95 37q37 0 56.5 -20 t19.5 -55q0 -28 -29 -118l-59 -182q-3 -8 -3 -12q0 -5 5.5 -10.5t11.5 -5.5q17 0 75 83z" />
+<glyph unicode="i" horiz-adv-x="278" d="M216 142l22 -14q-48 -79 -85 -108t-83 -29q-68 0 -68 63q0 22 15 76l55 203q8 32 8 45q0 29 -46 29h-14v27q118 9 203 28l-91 -334q-9 -31 -9 -51q0 -16 15 -16q21 0 64 61zM262 616q0 -28 -19.5 -47t-48.5 -19q-28 0 -47 20t-19 49q0 25 20 45t45 20q28 0 48.5 -20 t20.5 -48z" />
+<glyph unicode="j" horiz-adv-x="278" d="M239 462l-116 -444q-31 -119 -81 -172t-126 -53q-47 0 -76 22t-29 55q0 22 14.5 37.5t34.5 15.5q22 0 35.5 -13.5t13.5 -35.5q0 -11 -7.5 -20t-7.5 -15q0 -15 24 -15q21 0 38 31t36 105l89 350q12 45 12 67q0 30 -41 30h-22v27q136 12 209 28zM279 617q0 -28 -20 -47.5 t-49 -19.5q-28 0 -47 20t-19 49q0 26 20 46t46 20q28 0 48.5 -20t20.5 -48z" />
+<glyph unicode="k" d="M483 449v-25q-37 -5 -61.5 -18.5t-73.5 -57.5l-64 -58q19 -95 33 -145.5t24 -66t22 -15.5q28 0 64 64l22 -11q-32 -68 -65 -96t-73 -28q-47 0 -72.5 46.5t-50.5 176.5l-39 -27l-50 -188h-122l157 566q7 24 7 42q0 20 -7 27t-23 7h-34v27q96 5 209 30l-124 -461 q95 75 130 109.5t35 53.5q0 12 -10.5 16.5t-39.5 6.5v25h206z" />
+<glyph unicode="l" horiz-adv-x="278" d="M290 699l-145 -523q-22 -79 -22 -100q0 -15 15 -15q25 0 79 80l22 -14q-52 -80 -87 -108t-82 -28q-30 0 -49 18t-19 45q0 34 34 155l74 259q34 118 34 145q0 30 -42 30q-11 0 -22 -1v27q98 9 210 30z" />
+<glyph unicode="m" horiz-adv-x="778" d="M701 135l22 -13q-38 -71 -75.5 -101t-85.5 -30q-67 0 -67 66q0 43 37 151l44 130q7 23 7 30q0 8 -7 14.5t-16 6.5q-47 0 -112 -116q-27 -48 -42.5 -89t-58.5 -184h-120l65 207q45 143 45 160q0 22 -18 22q-25 0 -65 -47q-43 -51 -75 -126t-72 -216h-121l66 232 q36 125 36 150t-38 25h-18v27q130 10 200 27l-63 -199h1q70 108 104 142q58 58 114 58q32 0 49.5 -18t17.5 -49q0 -37 -26 -105q61 99 102.5 135.5t95.5 36.5q35 0 56 -20t21 -51q0 -43 -23 -109l-45 -128q-21 -60 -21 -77q0 -18 16 -18q22 0 58 58q6 11 12 18z" />
+<glyph unicode="n" horiz-adv-x="556" d="M472 135l22 -13q-41 -72 -77.5 -101.5t-82.5 -29.5q-68 0 -68 60q0 47 26 125l55 165q7 23 7 28q0 21 -25 21q-13 0 -33 -16.5t-36 -37.5q-47 -62 -79 -135t-66 -201h-121l57 204q45 164 45 179q0 14 -11.5 18.5t-43.5 5.5v27q90 3 199 27l-62 -198h1q51 75 73 103.5 t49 54.5q43 41 100 41q73 0 73 -77q0 -34 -28 -116l-35 -104q-24 -71 -24 -89q0 -17 14 -17q13 0 27 15t44 61z" />
+<glyph unicode="o" d="M280 462h4q73 0 115 -41t42 -110t-29 -135.5t-76 -113.5q-75 -75 -175 -75q-73 0 -118.5 38.5t-45.5 109.5q0 73 27 139t73 111q79 77 183 77zM322 372q0 28 -12.5 44.5t-34.5 16.5q-32 0 -60 -31q-43 -48 -71 -144.5t-28 -177.5q0 -64 49 -64q41 0 71 49q36 59 61 149.5 t25 157.5z" />
+<glyph unicode="p" d="M177 347h1q41 64 77.5 89.5t80.5 25.5q53 0 81.5 -32.5t28.5 -88.5q0 -138 -85 -246t-192 -108q-38 0 -68 22l-12 -41q-24 -83 -24 -114q0 -18 13.5 -24.5t51.5 -7.5v-27h-250v27q36 0 50 15t28 71l96 380q22 88 22 94q0 14 -10 18.5t-44 6.5v27q51 6 192 28zM321 336 q0 55 -39 55q-40 0 -87 -71q-13 -19 -20 -37t-24 -76q-38 -128 -38 -149q0 -15 11.5 -25.5t27.5 -10.5q30 0 62 30q46 45 76.5 137t30.5 147z" />
+<glyph unicode="q" d="M471 449l-129 -461q-36 -131 -36 -138q0 -28 49 -28h17v-27h-268v27q45 0 62 13t30 56l61 207q-60 -111 -154 -111q-49 0 -75.5 34t-26.5 96q0 84 54 178q44 77 102.5 122t115.5 45q40 0 57 -22q10 -13 17 -50l15 59h109zM325 371q0 48 -35 48q-27 0 -58 -35.5t-53 -79.5 q-53 -109 -53 -188q0 -57 39 -57q45 0 88 74q27 47 49.5 121t22.5 117z" />
+<glyph unicode="r" horiz-adv-x="389" d="M160 253h1q60 121 95.5 165t75.5 44q26 0 41.5 -18t15.5 -48q0 -31 -16.5 -52t-41.5 -21q-22 0 -37.5 19t-23.5 19q-23 0 -65 -76q-36 -65 -74 -186l-31 -99h-121q102 345 102 382q0 14 -11.5 19.5t-44.5 5.5v27q131 11 200 28z" />
+<glyph unicode="s" horiz-adv-x="389" d="M333 461l-23 -154l-27 2q-12 63 -33 91.5t-55 28.5q-24 0 -38.5 -14.5t-14.5 -38.5q0 -33 57 -99q80 -93 80 -162q0 -56 -43 -92t-105 -36q-35 0 -64 12q-21 8 -30 8q-20 0 -29 -20h-27l22 166l27 -3q17 -133 93 -133q29 0 44.5 14.5t15.5 39.5q0 41 -56 104 q-50 56 -65 87.5t-15 73.5q0 59 36.5 92.5t97.5 33.5q33 0 58 -12q21 -10 37 -10q11 0 16 4t12 17h29z" />
+<glyph unicode="t" horiz-adv-x="278" d="M281 407h-83l-34 -119q-53 -185 -53 -209q0 -18 16 -18q25 0 76 80l23 -15q-49 -76 -86.5 -105.5t-83.5 -29.5q-67 0 -67 65q0 28 25 115l67 236h-52v35q62 21 103 55t81 97h35l-39 -145h72v-42z" />
+<glyph unicode="u" horiz-adv-x="556" d="M471 133l22 -13q-39 -67 -76.5 -98t-82.5 -31q-68 0 -68 60q0 31 26 110h-1q-70 -103 -109.5 -136.5t-88.5 -33.5q-78 0 -78 79q0 27 22 106l37 128q17 62 17 75q0 24 -58 28v27q87 2 210 28l-93 -302q-16 -51 -16 -72q0 -25 24 -25q28 0 70 55q47 61 75.5 125t66.5 206 h118l-78 -266q-25 -88 -25 -103q0 -21 14 -21q24 0 72 74z" />
+<glyph unicode="v" horiz-adv-x="444" d="M15 408v27q101 14 156 27q31 -99 31 -334q74 84 100 123.5t26 65.5q0 13 -20 36q-25 28 -25 53q0 23 17 39.5t40 16.5q27 0 44 -20t17 -47q0 -67 -60 -154q-41 -60 -88 -111.5t-142 -142.5h-26q5 91 5 177q0 175 -25 225q-10 19 -50 19z" />
+<glyph unicode="w" horiz-adv-x="667" d="M387 462l31 -333q120 140 120 187q0 15 -20 38q-22 25 -22 48q0 29 16.5 44.5t40.5 15.5q25 0 43 -18.5t18 -43.5q0 -131 -272 -413h-27l-23 285q-85 -158 -114 -201l-56 -84h-27v46q0 4 0.5 24.5t0.5 37.5q0 94 -11.5 191.5t-26.5 110.5q-11 10 -43 10v27q110 18 156 28 q33 -123 33 -274l156 274h27z" />
+<glyph unicode="x" d="M41 438l165 24q29 -43 47 -138q57 83 89.5 110.5t68.5 27.5q23 0 40.5 -18.5t17.5 -42.5q0 -22 -16.5 -37.5t-39.5 -15.5q-12 0 -29 10t-28 10q-17 0 -42.5 -26t-49.5 -68l32 -157q6 -29 14.5 -41t22.5 -12q13 0 25.5 10.5t41.5 48.5l21 -14q-46 -66 -80.5 -94t-70.5 -28 q-37 0 -58.5 34.5t-38.5 120.5l-24 -39q-44 -72 -69 -94t-62 -22q-28 0 -45.5 16.5t-17.5 42.5q0 24 15.5 40.5t38.5 16.5q16 0 34.5 -11t27.5 -11q14 0 22.5 7.5t24.5 32.5l44 71l-29 152q-7 37 -20 53t-37 16q-16 0 -35 -2v27z" />
+<glyph unicode="y" horiz-adv-x="444" d="M239 110h2q52 99 69.5 141t17.5 66q0 13 -25 34q-31 25 -31 54q0 21 16 39t42 18q25 0 43.5 -19t18.5 -45q0 -76 -75.5 -227t-173.5 -270q-41 -50 -87.5 -78t-87.5 -28q-26 0 -44 17.5t-18 42.5q0 22 15.5 39t34.5 17q25 0 51 -18t43 -18q13 0 32 15t35 37q25 35 25 71 q0 50 -50 288q-21 94 -40 113q-8 8 -14.5 10t-25.5 2v27q86 8 150 24q43 -111 66 -274z" />
+<glyph unicode="z" horiz-adv-x="389" d="M368 439l-281 -335q52 -23 86 -69q6 -8 19 -32.5t24.5 -38t24.5 -13.5q10 0 16 5t6 12q0 6 -10 18t-10 27q0 21 15 37t35 16q21 0 37 -16t16 -37q0 -45 -31 -68t-79 -23q-59 0 -129 50q-46 33 -74 33q-13 0 -32 -14q-12 -10 -19 -14l-25 22l292 354h-136 q-29 0 -45.5 -13.5t-27.5 -47.5l-27 3l44 154h311v-10z" />
+<glyph unicode="{" horiz-adv-x="348" d="M436 686l-3 -12q-61 -11 -92 -39t-46 -85l-45 -171q-16 -63 -47 -89.5t-105 -40.5q57 -15 75 -30t18 -46q0 -38 -29 -130q-30 -99 -30 -140q0 -34 18.5 -52t62.5 -26l-3 -12q-104 2 -143 21.5t-39 69.5q0 56 35 159q26 80 26 116q0 26 -19.5 42t-65.5 28q68 14 96 37.5 t42 78.5l46 179q21 81 74.5 111.5t173.5 30.5z" />
+<glyph unicode="|" horiz-adv-x="220" d="M154 -18h-88v703h88v-703z" />
+<glyph unicode="}" horiz-adv-x="348" d="M94 674l3 12q70 -1 104.5 -8t53.5 -24q24 -21 24 -56q0 -57 -35 -162q-26 -80 -26 -116q0 -26 19.5 -42t65.5 -28q-67 -15 -95.5 -38.5t-42.5 -77.5l-46 -179q-21 -82 -74 -112t-174 -30l3 12q61 11 92 39t46 85l45 171q16 63 47 89.5t105 40.5q-57 15 -75 30t-18 46 q0 38 28 130q31 107 31 141q0 33 -19 51t-62 26z" />
+<glyph unicode="~" horiz-adv-x="570" d="M461 308l55 -48q-34 -48 -61 -66.5t-62 -18.5q-48 0 -105 33q-62 35 -112 35q-22 0 -36.5 -9t-32.5 -33l-53 46q48 84 121 84q27 0 53 -8t83 -33q60 -27 82 -27q33 0 68 45z" />
+<glyph unicode="&#xa1;" horiz-adv-x="389" d="M320 423q0 -32 -21 -53.5t-52 -21.5q-29 0 -51 22.5t-22 52.5t21.5 50.5t52.5 20.5t51.5 -20t20.5 -51zM193 275l29 -8q-45 -230 -53 -354q-2 -51 -12 -72q-22 -46 -69 -46q-31 0 -50 20t-19 54q0 19 5.5 35t25.5 53q78 149 143 318z" />
+<glyph unicode="&#xa2;" d="M431 576l-45 -127q53 -29 53 -79q0 -29 -18.5 -48.5t-46.5 -19.5q-21 0 -35 11l-92 -261q59 3 118 89l27 -18q-47 -68 -82 -95.5t-85 -37.5l-47 -133h-34l46 130q-71 5 -109.5 44.5t-38.5 106.5q0 121 89.5 222.5t195.5 101.5q10 0 28 -3l41 117h35zM339 413v2 q-2 14 -22 14q-45 0 -86 -73q-27 -48 -44.5 -107t-17.5 -102q0 -64 45 -90z" />
+<glyph unicode="&#xa3;" d="M45 370h105q19 93 40 144.5t58 92.5q65 76 153 76q47 0 78 -26t31 -65q0 -29 -17.5 -48.5t-43.5 -19.5q-23 0 -38 14.5t-15 36.5q0 10 4 34q3 11 3 19q0 9 -7 15t-17 6q-45 0 -60 -77l-39 -202h114l-10 -60h-115q-24 -107 -64 -169l-11 -17q82 -32 125 -32q36 0 54.5 13 t35.5 50h25q-15 -75 -45 -114q-42 -53 -106 -53q-58 0 -127 61q-38 -60 -98 -60q-40 0 -65 24t-25 62q0 39 26.5 63t69.5 24q28 0 61 -14q4 36 19 162h-109zM113 90q-33 30 -64 30q-23 0 -37 -13.5t-14 -36.5t15.5 -37t40.5 -14q43 0 59 71z" />
+<glyph unicode="&#xa4;" d="M526 48l-58 -58l-96 98q-60 -37 -122 -37t-122 37l-96 -98l-58 58l98 98q-37 56 -37 120q0 65 37 122l-98 98l58 56l96 -96q56 35 122 35t122 -35l96 96l58 -56l-98 -98q37 -59 37 -122q0 -69 -37 -120zM377 264q0 57 -37 96t-90 39t-90 -38.5t-37 -94.5t37 -94.5 t90 -38.5q52 0 89.5 39t37.5 92z" />
+<glyph unicode="&#xa5;" d="M628 669v-25q-29 -6 -49 -20.5t-44 -48.5l-166 -233h135l-13 -50h-150l-21 -78h152l-14 -50h-152l-3 -11q-16 -59 -16 -85q0 -25 15.5 -33t65.5 -10v-25h-322v25q57 4 77 17t32 55l19 67h-141l14 50h141l22 78h-142l14 50h125l-79 239q-12 38 -25.5 48t-56.5 15v25h280 v-25q-43 -2 -59 -8.5t-16 -23.5q0 -14 6 -32l80 -236l135 194q26 37 26 60q0 26 -14 35t-56 11v25h200z" />
+<glyph unicode="&#xa6;" horiz-adv-x="220" d="M154 426h-88v259h88v-259zM154 -18h-88v259h88v-259z" />
+<glyph unicode="&#xa7;" d="M221 419l2 3q-55 61 -55 129q0 59 43 96.5t112 37.5q59 0 97.5 -27.5t38.5 -70.5q0 -26 -16.5 -44t-41.5 -18q-23 0 -39 16.5t-16 38.5q0 17 9 27t18 15.5t9 12.5q0 11 -18 19.5t-41 8.5q-38 0 -61.5 -20.5t-23.5 -52.5q0 -41 69 -122l69 -81q59 -68 59 -144 q0 -58 -33 -90t-84 -32q-14 0 -30 4l-2 -4q59 -74 59 -130t-47.5 -95t-116.5 -39q-61 0 -103 30.5t-42 74.5q0 26 16.5 43.5t41.5 17.5t40.5 -14.5t15.5 -36.5q0 -16 -17.5 -33t-17.5 -30q0 -11 20.5 -20t46.5 -9q38 0 62 21t24 55q0 24 -14.5 47t-69.5 90l-66 80 q-50 61 -50 126q0 61 29 93.5t75 32.5q23 0 49 -6zM364 206q0 50 -62.5 122t-106.5 72q-24 0 -40 -16.5t-16 -41.5q0 -36 29 -76q42 -59 79 -91q31 -27 58 -27q24 0 41.5 17.5t17.5 40.5z" />
+<glyph unicode="&#xa8;" horiz-adv-x="333" d="M185 589q0 -26 -19.5 -45t-46.5 -19q-25 0 -44.5 19.5t-19.5 44.5q0 27 19 46.5t45 19.5q27 0 46.5 -19.5t19.5 -46.5zM397 589q0 -26 -19.5 -45t-46.5 -19q-25 0 -44.5 19.5t-19.5 44.5q0 27 19 46.5t45 19.5q27 0 46.5 -19.5t19.5 -46.5z" />
+<glyph unicode="&#xa9;" horiz-adv-x="747" d="M544 250l-17 -72q-2 -11 -12 -14q-5 -3 -52 -15q-31 -9 -66 -9q-101 0 -159 52t-58 143q0 92 61.5 147.5t163.5 55.5q50 0 100 -18q22 -9 22 -21v-71h-17q-19 90 -110 90q-64 0 -99.5 -46t-35.5 -130q0 -86 36 -132.5t102 -46.5q43 0 72 20.5t51 66.5h18zM718 334 q0 -150 -100 -251t-249 -101q-140 0 -239.5 102.5t-99.5 247.5q0 148 100 250.5t244 102.5t244 -102t100 -249zM657 334q0 125 -83.5 215t-199.5 90t-199.5 -90t-83.5 -216q0 -124 83 -214.5t196 -90.5q120 0 203.5 89t83.5 217z" />
+<glyph unicode="&#xaa;" horiz-adv-x="266" d="M330 680l-46 -140q-22 -66 -22 -89q0 -9 5 -9q11 0 41 36l5 6l13 -9q-54 -76 -97 -76q-18 0 -31 11.5t-13 26.5q0 14 11 51q-28 -49 -52.5 -68.5t-57.5 -19.5q-31 0 -50.5 21t-19.5 55q0 72 59 140.5t121 68.5q37 0 47 -45l11 36zM218 630q0 12 -5.5 20t-14.5 8 q-26 1 -65 -67.5t-39 -117.5q0 -11 7 -19.5t17 -8.5q31 0 64 62q14 28 25 65t11 58z" />
+<glyph unicode="&#xab;" d="M197 226l170 124q30 21 47 37q28 28 41 28q5 0 9 -3.5t4 -8.5q0 -30 -101 -134q-6 -6 -20 -22t-25 -27l40 -83q33 -69 33 -90q0 -15 -15 -15q-6 0 -15 10q-30 34 -168 175v9zM12 226l170 124q30 21 47 37q28 28 41 28q5 0 9 -3.5t4 -8.5q0 -30 -101 -134q-32 -34 -45 -49 l40 -83q33 -69 33 -90q0 -15 -15 -15q-6 0 -15 10q-30 34 -168 175v9z" />
+<glyph unicode="&#xac;" horiz-adv-x="606" d="M555 108h-88v203h-416v88h504v-291z" />
+<glyph unicode="&#xad;" horiz-adv-x="333" d="M271 282l-23 -116h-246l24 116h245z" />
+<glyph unicode="&#xae;" horiz-adv-x="747" d="M562 151h-70q-14 0 -28.5 17.5t-39.5 63.5q-23 41 -52 85h-44v-101q0 -32 6 -38.5t42 -10.5v-16h-166v16q35 4 41 10.5t6 38.5v247q0 32 -6 38t-41 10v16h183q54 0 85.5 -25.5t31.5 -69.5q0 -74 -81 -104l59 -82q42 -60 74 -84v-11zM328 337h41q68 0 68 91q0 78 -69 78 h-40v-169zM718 334q0 -150 -100 -251t-249 -101q-140 0 -239.5 102.5t-99.5 247.5q0 148 100 250.5t244 102.5t244 -102t100 -249zM657 334q0 125 -83.5 215t-199.5 90t-199.5 -90t-83.5 -216q0 -124 83 -214.5t196 -90.5q120 0 203.5 89t83.5 217z" />
+<glyph unicode="&#xaf;" horiz-adv-x="333" d="M393 623l-16 -70h-326l17 70h325z" />
+<glyph unicode="&#xb0;" horiz-adv-x="400" d="M369 545q0 -59 -42 -101t-101 -42t-101 42t-42 101t42 101t101 42t101 -42t42 -101zM314 545q0 37 -25.5 62.5t-62.5 25.5t-62.5 -25.5t-25.5 -62.5t25.5 -62.5t62.5 -25.5t62.5 25.5t25.5 62.5z" />
+<glyph unicode="&#xb1;" horiz-adv-x="570" d="M537 0h-504v88h504v-88zM537 271h-208v-143h-88v143h-208v88h208v209h88v-209h208v-88z" />
+<glyph unicode="&#xb2;" horiz-adv-x="300" d="M79 574l-18 11q53 98 144 98q46 0 77 -28.5t31 -70.5q0 -36 -21 -67.5t-71 -72.5l-125 -101h89q37 0 54 8.5t36 36.5h16l-51 -114h-238v16q119 113 148 145q70 77 70 121q0 31 -15.5 48.5t-43.5 17.5q-39 0 -82 -48z" />
+<glyph unicode="&#xb3;" horiz-adv-x="300" d="M103 590l-14 13q57 80 133 80q42 0 70.5 -23.5t28.5 -57.5q0 -28 -14.5 -45t-57.5 -42l-7 -4q29 -20 40.5 -39.5t11.5 -48.5q0 -65 -56 -111.5t-135 -46.5q-86 0 -86 50q0 18 10.5 29.5t26.5 11.5q24 0 43 -28q16 -21 22 -25.5t20 -4.5q30 0 50.5 26.5t20.5 65.5 q0 87 -100 91l2 14q121 22 121 85q0 24 -15 38t-40 14q-38 0 -75 -42z" />
+<glyph unicode="&#xb4;" horiz-adv-x="333" d="M139 516l122 131q47 50 70 50q20 0 34 -14t14 -33q0 -14 -8.5 -24t-30.5 -23l-152 -87h-49z" />
+<glyph unicode="&#xb5;" horiz-adv-x="576" d="M516 449l-104 -336q-5 -17 -5 -27q0 -14 12 -14q22 0 63 62l22 -16q-54 -77 -88.5 -104t-77.5 -27q-28 0 -45.5 17.5t-17.5 45.5q0 22 11 68q-40 -67 -68.5 -92.5t-63.5 -25.5q-46 0 -62 24q-23 -71 -23 -133q0 -47 -21 -72.5t-58 -25.5q-50 0 -50 66q0 27 29.5 96 t44.5 119l111 375h135l-93 -312q-7 -25 -7 -42q0 -25 19 -25q32 0 79 66.5t72 148.5l51 164h135z" />
+<glyph unicode="&#xb6;" horiz-adv-x="617" d="M679 669l-6 -25q-58 0 -72.5 -11t-28.5 -65l-166 -636q-11 -47 -11 -60q0 -34 45 -38l23 -2l-7 -25h-171l217 837h-55l-217 -837h-170l7 25q64 5 78 18q9 9 28 82l85 326q-69 0 -107 33t-38 100q0 57 22 117t54 95q61 66 195 66h295zM264 283l94 361q-49 -12 -74 -29.5 t-47 -55.5q-45 -77 -45 -165q0 -40 19 -70t53 -41z" />
+<glyph unicode="&#xb7;" horiz-adv-x="250" d="M199 331q0 -31 -21.5 -52.5t-53.5 -21.5q-31 0 -52 21t-21 53t21.5 53t53.5 21q30 0 51.5 -22t21.5 -52z" />
+<glyph unicode="&#xb8;" horiz-adv-x="333" d="M85 5l-45 -67q15 3 26 3q39 0 64.5 -20.5t25.5 -51.5q0 -37 -35.5 -62t-88.5 -25q-51 0 -112 25l22 33q38 -17 67 -17q26 0 41 11t15 30q0 36 -47 36q-14 0 -30 -4l-13 12l66 97h44z" />
+<glyph unicode="&#xb9;" horiz-adv-x="300" d="M301 683l-100 -330q-6 -18 -6 -34t11 -21t48 -5v-19h-224v19q42 0 58.5 15t29.5 65q2 8 13 41l26 81l25 83q10 34 9 35q-5 21 -26 21q-4 0 -32 -2l-11 -1l2 21q103 16 177 31z" />
+<glyph unicode="&#xba;" horiz-adv-x="300" d="M347 587q0 -74 -57.5 -130.5t-127.5 -56.5q-46 0 -76 25t-30 64q0 75 57.5 135.5t129.5 60.5q47 0 75.5 -27.5t28.5 -70.5zM266 627q0 38 -25 38q-31 1 -60 -48q-17 -30 -30.5 -79.5t-13.5 -82.5q0 -35 28 -35q35 0 65 65q36 78 36 142z" />
+<glyph unicode="&#xbb;" d="M283 221l-170 -124q-31 -23 -47 -38q-28 -27 -41 -27t-13 12q0 30 101 134l45 49l-40 83q-33 67 -33 90q0 15 15 15q6 0 15 -10q47 -53 168 -175v-9zM468 221l-170 -124q-31 -23 -47 -38q-29 -27 -41 -27q-13 0 -13 12q0 30 101 134l45 49l-40 83q-33 67 -33 90 q0 15 15 15q6 0 15 -10q47 -53 168 -175v-9z" />
+<glyph unicode="&#xbc;" horiz-adv-x="750" d="M721 410l-78 -261h45l-17 -61h-44l-28 -88h-86l27 88h-159l16 67l278 255h46zM609 319l-184 -170h132zM629 683l-435 -697h-58l435 697h58zM278 683l-100 -330q-6 -18 -6 -34t11 -21t48 -5v-19h-224v19q42 0 58 15t30 65q2 8 13 41q60 184 60 199q0 8 -8 14.5t-18 6.5 q-4 0 -32 -2l-11 -1l2 21q103 16 177 31z" />
+<glyph unicode="&#xbd;" horiz-adv-x="750" d="M489 300l-18 11q53 98 144 98q46 0 77 -28.5t31 -70.5q0 -36 -21 -67.5t-71 -72.5l-125 -101h89q37 0 54 8.5t36 36.5h16l-51 -114h-238v16q119 113 148 145q70 77 70 121q0 31 -15.5 48.5t-43.5 17.5q-39 0 -82 -48zM614 683l-435 -697h-58l435 697h58zM262 683 l-100 -330q-6 -18 -6 -34t11 -21t48 -5v-19h-224v19q42 0 58 15t30 65q2 8 13 41q60 184 60 199q0 8 -8 14.5t-18 6.5q-4 0 -32 -2l-11 -1l2 21q103 16 177 31z" />
+<glyph unicode="&#xbe;" horiz-adv-x="750" d="M726 410l-78 -261h45l-17 -61h-44l-28 -88h-86l27 88h-159l16 67l278 255h46zM614 319l-184 -170h132zM634 683l-435 -697h-58l435 697h58zM93 590l-14 13q57 80 133 80q42 0 70.5 -23.5t28.5 -57.5q0 -28 -14.5 -45t-57.5 -42l-7 -4q29 -20 40.5 -39.5t11.5 -48.5 q0 -65 -56 -111.5t-135 -46.5q-86 0 -86 50q0 18 10.5 29.5t26.5 11.5q24 0 43 -28q16 -21 22 -25.5t20 -4.5q30 0 50.5 26.5t20.5 64.5q0 88 -100 92l2 14q121 22 121 85q0 24 -15 38t-40 14q-38 0 -75 -42z" />
+<glyph unicode="&#xbf;" d="M421 418q0 -32 -21.5 -53t-53.5 -21q-30 0 -51.5 22t-21.5 52q0 31 21.5 52.5t53.5 21.5q31 0 52 -21t21 -53zM262 105l-41 -51q-64 -78 -64 -148q0 -37 18.5 -58.5t50.5 -21.5q24 0 43 12t19 26q0 8 -11 22q-18 24 -18 45q0 25 17.5 42.5t43.5 17.5t43.5 -19.5 t17.5 -47.5q0 -56 -49.5 -92.5t-125.5 -36.5q-79 0 -127.5 39.5t-48.5 104.5q0 47 29.5 87.5t96.5 83.5l66 43q29 19 45 42.5t37 75.5l29 -7q-7 -78 -71 -159z" />
+<glyph unicode="&#xc0;" horiz-adv-x="667" d="M516 766h-46l-132 88q-34 23 -34 48q0 18 13.5 31.5t31.5 13.5q31 0 56 -33zM593 0h-303v25q77 6 77 49q0 3 -2 15l-12 119h-215l-57 -96q-17 -28 -17 -50q0 -37 64 -37v-25h-195l-1 25q26 3 43 19.5t43 56.5l370 582h25l94 -560q11 -62 25 -78.5t61 -19.5v-25zM346 248 l-37 243l-148 -243h185z" />
+<glyph unicode="&#xc1;" horiz-adv-x="667" d="M326 766l122 131q47 50 70 50q20 0 34 -14t14 -33q0 -14 -8.5 -24t-30.5 -23l-152 -87h-49zM593 0h-303v25q77 6 77 49q0 3 -2 15l-12 119h-215l-57 -96q-17 -28 -17 -50q0 -37 64 -37v-25h-195l-1 25q26 3 43 19.5t43 56.5l370 582h25l94 -560q11 -62 25 -78.5t61 -19.5 v-25zM346 248l-37 243l-148 -243h185z" />
+<glyph unicode="&#xc2;" horiz-adv-x="667" d="M587 766h-51l-88 95l-131 -95h-57l160 174h81zM593 0h-303v25q77 6 77 49q0 3 -2 15l-12 119h-215l-57 -96q-17 -28 -17 -50q0 -37 64 -37v-25h-195l-1 25q26 3 43 19.5t43 56.5l370 582h25l94 -560q11 -62 25 -78.5t61 -19.5v-25zM346 248l-37 243l-148 -243h185z" />
+<glyph unicode="&#xc3;" horiz-adv-x="667" d="M571 905h41q-16 -63 -44 -91t-73 -28q-25 0 -57 13l-59 23q-21 8 -38 8q-31 0 -48 -43h-40q10 54 41.5 86t74.5 32q38 0 97 -26q39 -16 54 -16q17 0 28.5 9t22.5 33zM593 0h-303v25q77 6 77 49q0 3 -2 15l-12 119h-215l-57 -96q-17 -28 -17 -50q0 -37 64 -37v-25h-195 l-1 25q26 3 43 19.5t43 56.5l370 582h25l94 -560q11 -62 25 -78.5t61 -19.5v-25zM346 248l-37 243l-148 -243h185z" />
+<glyph unicode="&#xc4;" horiz-adv-x="667" d="M387 839q0 -26 -19.5 -45t-46.5 -19q-25 0 -44.5 19.5t-19.5 44.5q0 27 19 46.5t45 19.5q27 0 46.5 -19.5t19.5 -46.5zM599 839q0 -26 -19.5 -45t-46.5 -19q-25 0 -44.5 19.5t-19.5 44.5q0 27 19 46.5t45 19.5q27 0 46.5 -19.5t19.5 -46.5zM593 0h-303v25q77 6 77 49 q0 3 -2 15l-12 119h-215l-57 -96q-17 -28 -17 -50q0 -37 64 -37v-25h-195l-1 25q26 3 43 19.5t43 56.5l370 582h25l94 -560q11 -62 25 -78.5t61 -19.5v-25zM346 248l-37 243l-148 -243h185z" />
+<glyph unicode="&#xc5;" horiz-adv-x="667" d="M546 898q0 -44 -31.5 -75.5t-75.5 -31.5q-48 0 -77 30t-29 78q0 44 31.5 74.5t75.5 30.5q47 0 76.5 -30.5t29.5 -75.5zM498 896q0 25 -17.5 42.5t-42.5 17.5q-23 0 -40 -17.5t-17 -41.5t17 -41t40 -17q25 0 42.5 17t17.5 40zM593 0h-303v25q77 6 77 49q0 3 -2 15l-12 119 h-215l-57 -96q-17 -28 -17 -50q0 -37 64 -37v-25h-195l-1 25q26 3 43 19.5t43 56.5l370 582h25l94 -560q11 -62 25 -78.5t61 -19.5v-25zM346 248l-37 243l-148 -243h185z" />
+<glyph unicode="&#xc6;" horiz-adv-x="944" d="M918 669l-45 -190l-24 5l-2 40q-6 113 -162 113q-32 0 -43 -6t-16 -26l-65 -235h19q76 0 110.5 20.5t64.5 85.5l26 -4l-73 -273l-25 5q3 24 3 46q0 50 -24 66.5t-109 21.5l-63 -241q-5 -20 -5 -28q0 -37 68 -37q59 0 97.5 10.5t72.5 36.5q36 27 101 120l26 -3l-59 -196 h-527v25q38 6 53 22.5t28 58.5l43 149h-192l-114 -157q-15 -20 -15 -39q0 -16 14 -23.5t50 -10.5v-25h-195v25q19 2 30 9q9 3 59 68l364 472q20 27 20 44q0 14 -15.5 19.5t-64.5 8.5v23h589zM490 627h-12l-253 -333h173z" />
+<glyph unicode="&#xc7;" horiz-adv-x="667" d="M677 685l-51 -234l-32 6q3 19 3 35q0 73 -35 115.5t-96 42.5q-93 0 -168 -100q-51 -66 -81.5 -156.5t-30.5 -184.5q0 -81 41.5 -127.5t108.5 -46.5q48 0 90 18q30 13 52.5 33t66.5 68l31 -22q-42 -58 -78 -85q-86 -65 -194 -65q-42 0 -64 4l-33 -48q15 3 26 3 q39 0 64.5 -20.5t25.5 -51.5q0 -37 -35.5 -62t-88.5 -25q-52 0 -112 25l22 33q37 -17 67 -17q26 0 41 11t15 30q0 36 -47 36q-14 0 -30 -4l-13 12l59 88q-81 27 -125 91t-44 154q0 93 35 177.5t96 146.5q118 120 277 120q64 0 131 -21q24 -8 38 -8q20 0 38 29h30z" />
+<glyph unicode="&#xc8;" horiz-adv-x="667" d="M531 766h-46l-132 88q-34 23 -34 48q0 18 13.5 31.5t31.5 13.5q31 0 56 -33zM653 669l-43 -190l-27 5q-3 60 -9.5 82t-35.5 41q-47 30 -137 30q-32 0 -45 -9t-22 -42l-59 -216q99 0 134.5 18.5t70.5 88.5l28 -4l-74 -274l-28 4q4 25 4 44q0 52 -30 71.5t-114 19.5 l-63 -234q-8 -32 -8 -38q0 -34 61 -34q131 0 214 61q28 20 47 42t44 64l25 -5l-60 -194h-553v25q39 6 54 20.5t28 59.5l119 432q12 44 12 70q0 15 -9 22.5t-32 10.5l-33 4v25h541z" />
+<glyph unicode="&#xc9;" horiz-adv-x="667" d="M306 766l122 131q47 50 70 50q20 0 34 -14t14 -33q0 -14 -8.5 -24t-30.5 -23l-152 -87h-49zM653 669l-43 -190l-27 5q-3 60 -9.5 82t-35.5 41q-47 30 -137 30q-32 0 -45 -9t-22 -42l-59 -216q99 0 134.5 18.5t70.5 88.5l28 -4l-74 -274l-28 4q4 25 4 44q0 52 -30 71.5 t-114 19.5l-63 -234q-8 -32 -8 -38q0 -34 61 -34q131 0 214 61q28 20 47 42t44 64l25 -5l-60 -194h-553v25q39 6 54 20.5t28 59.5l119 432q12 44 12 70q0 15 -9 22.5t-32 10.5l-33 4v25h541z" />
+<glyph unicode="&#xca;" horiz-adv-x="667" d="M586 766h-51l-88 95l-131 -95h-57l160 174h81zM653 669l-43 -190l-27 5q-3 60 -9.5 82t-35.5 41q-47 30 -137 30q-32 0 -45 -9t-22 -42l-59 -216q99 0 134.5 18.5t70.5 88.5l28 -4l-74 -274l-28 4q4 25 4 44q0 52 -30 71.5t-114 19.5l-63 -234q-8 -32 -8 -38 q0 -34 61 -34q131 0 214 61q28 20 47 42t44 64l25 -5l-60 -194h-553v25q39 6 54 20.5t28 59.5l119 432q12 44 12 70q0 15 -9 22.5t-32 10.5l-33 4v25h541z" />
+<glyph unicode="&#xcb;" horiz-adv-x="667" d="M389 839q0 -26 -19.5 -45t-46.5 -19q-25 0 -44.5 19.5t-19.5 44.5q0 27 19 46.5t45 19.5q27 0 46.5 -19.5t19.5 -46.5zM601 839q0 -26 -19.5 -45t-46.5 -19q-25 0 -44.5 19.5t-19.5 44.5q0 27 19 46.5t45 19.5q27 0 46.5 -19.5t19.5 -46.5zM653 669l-43 -190l-27 5 q-3 60 -9.5 82t-35.5 41q-47 30 -137 30q-32 0 -45 -9t-22 -42l-59 -216q99 0 134.5 18.5t70.5 88.5l28 -4l-74 -274l-28 4q4 25 4 44q0 52 -30 71.5t-114 19.5l-63 -234q-8 -32 -8 -38q0 -34 61 -34q131 0 214 61q28 20 47 42t44 64l25 -5l-60 -194h-553v25q39 6 54 20.5 t28 59.5l119 432q12 44 12 70q0 15 -9 22.5t-32 10.5l-33 4v25h541z" />
+<glyph unicode="&#xcc;" horiz-adv-x="389" d="M404 766h-46l-132 88q-34 23 -34 48q0 18 13.5 31.5t31.5 13.5q31 0 56 -33zM406 669v-25q-38 -4 -55 -19t-29 -61l-112 -412q-17 -62 -17 -87q0 -21 14.5 -29.5t56.5 -10.5v-25h-296v25q39 5 54 18t29 64l117 429q14 51 14 71q0 28 -42 33l-32 4v25h298z" />
+<glyph unicode="&#xcd;" horiz-adv-x="389" d="M200 766l122 131q47 50 70 50q20 0 34 -14t14 -33q0 -14 -8.5 -24t-30.5 -23l-152 -87h-49zM406 669v-25q-38 -4 -55 -19t-29 -61l-112 -412q-17 -62 -17 -87q0 -21 14.5 -29.5t56.5 -10.5v-25h-296v25q39 5 54 18t29 64l117 429q14 51 14 71q0 28 -42 33l-32 4v25h298z " />
+<glyph unicode="&#xce;" horiz-adv-x="389" d="M469 766h-51l-88 95l-131 -95h-57l160 174h81zM406 669v-25q-38 -4 -55 -19t-29 -61l-112 -412q-17 -62 -17 -87q0 -21 14.5 -29.5t56.5 -10.5v-25h-296v25q39 5 54 18t29 64l117 429q14 51 14 71q0 28 -42 33l-32 4v25h298z" />
+<glyph unicode="&#xcf;" horiz-adv-x="389" d="M406 669v-25q-38 -4 -55 -19t-29 -61l-112 -412q-17 -62 -17 -87q0 -21 14.5 -29.5t56.5 -10.5v-25h-296v25q39 5 54 18t29 64l117 429q14 51 14 71q0 28 -42 33l-32 4v25h298zM480 839q0 -26 -19.5 -45t-46.5 -19q-26 0 -45 19.5t-19 44.5q0 27 19 46.5t45 19.5 q27 0 46.5 -19.5t19.5 -46.5zM268 839q0 -26 -19.5 -45t-46.5 -19q-26 0 -45 19.5t-19 44.5q0 27 19 46.5t45 19.5q27 0 46.5 -19.5t19.5 -46.5z" />
+<glyph unicode="&#xd0;" horiz-adv-x="722" d="M109 669h290q142 0 221.5 -72.5t79.5 -200.5q0 -171 -126.5 -283.5t-318.5 -112.5h-286v25q36 5 53 19.5t27 52.5l63 232h-102l12 44h102l46 170q12 44 12 59q0 17 -10 25t-32 12l-31 5v25zM260 329l-56 -207q-12 -46 -12 -54q0 -34 54 -34q142 0 223 118q39 58 61.5 140 t22.5 165q0 181 -165 181q-46 0 -55 -38l-61 -227h122l-12 -44h-122z" />
+<glyph unicode="&#xd1;" horiz-adv-x="722" d="M619 905h41q-16 -63 -44 -91t-73 -28q-25 0 -57 13l-59 23q-21 8 -38 8q-31 0 -48 -43h-40q10 54 41.5 86t74.5 32q38 0 97 -26q39 -16 54 -16q17 0 28.5 9t22.5 33zM748 669v-25q-42 -8 -58.5 -32.5t-43.5 -120.5l-143 -506h-28l-257 547l-99 -354q-19 -66 -19 -94 q0 -29 17.5 -42t61.5 -17v-25h-206v25q42 8 56 30t45 125l120 407q-15 34 -28.5 43.5t-53.5 13.5v25h193l216 -467l81 289q19 71 19 94q0 59 -81 59v25h208z" />
+<glyph unicode="&#xd2;" horiz-adv-x="722" d="M580 766h-46l-132 88q-34 23 -34 48q0 18 13.5 31.5t31.5 13.5q31 0 56 -33zM691 444q0 -95 -49.5 -194.5t-130.5 -171.5q-108 -96 -248 -96q-108 0 -172 62.5t-64 176.5q0 101 51 202.5t135 169.5q114 92 236 92q104 0 173 -66.5t69 -174.5zM547 528q0 60 -27 91.5 t-74 31.5q-91 0 -162 -120q-46 -78 -79.5 -189.5t-33.5 -198.5q0 -57 27.5 -92t74.5 -35q46 0 82 28t75 86q49 72 83 191t34 207z" />
+<glyph unicode="&#xd3;" horiz-adv-x="722" d="M355 766l122 131q47 50 70 50q20 0 34 -14t14 -33q0 -14 -8.5 -24t-30.5 -23l-152 -87h-49zM691 444q0 -95 -49.5 -194.5t-130.5 -171.5q-108 -96 -248 -96q-108 0 -172 62.5t-64 176.5q0 101 51 202.5t135 169.5q114 92 236 92q104 0 173 -66.5t69 -174.5zM547 528 q0 60 -27 91.5t-74 31.5q-91 0 -162 -120q-46 -78 -79.5 -189.5t-33.5 -198.5q0 -57 27.5 -92t74.5 -35q46 0 82 28t75 86q49 72 83 191t34 207z" />
+<glyph unicode="&#xd4;" horiz-adv-x="722" d="M638 766h-51l-88 95l-131 -95h-57l160 174h81zM691 444q0 -95 -49.5 -194.5t-130.5 -171.5q-108 -96 -248 -96q-108 0 -172 62.5t-64 176.5q0 101 51 202.5t135 169.5q114 92 236 92q104 0 173 -66.5t69 -174.5zM547 528q0 60 -27 91.5t-74 31.5q-91 0 -162 -120 q-46 -78 -79.5 -189.5t-33.5 -198.5q0 -57 27.5 -92t74.5 -35q46 0 82 28t75 86q49 72 83 191t34 207z" />
+<glyph unicode="&#xd5;" horiz-adv-x="722" d="M620 905h41q-16 -63 -44 -91t-73 -28q-25 0 -57 13l-59 23q-21 8 -38 8q-31 0 -48 -43h-40q10 54 41.5 86t74.5 32q38 0 97 -26q39 -16 54 -16q17 0 28.5 9t22.5 33zM691 444q0 -95 -49.5 -194.5t-130.5 -171.5q-108 -96 -248 -96q-108 0 -172 62.5t-64 176.5 q0 101 51 202.5t135 169.5q114 92 236 92q104 0 173 -66.5t69 -174.5zM547 528q0 60 -27 91.5t-74 31.5q-91 0 -162 -120q-46 -78 -79.5 -189.5t-33.5 -198.5q0 -57 27.5 -92t74.5 -35q46 0 82 28t75 86q49 72 83 191t34 207z" />
+<glyph unicode="&#xd6;" horiz-adv-x="722" d="M439 839q0 -26 -19.5 -45t-46.5 -19q-25 0 -44.5 19.5t-19.5 44.5q0 27 19 46.5t45 19.5q27 0 46.5 -19.5t19.5 -46.5zM651 839q0 -26 -19.5 -45t-46.5 -19q-25 0 -44.5 19.5t-19.5 44.5q0 27 19 46.5t45 19.5q27 0 46.5 -19.5t19.5 -46.5zM691 444q0 -95 -49.5 -194.5 t-130.5 -171.5q-108 -96 -248 -96q-108 0 -172 62.5t-64 176.5q0 101 51 202.5t135 169.5q114 92 236 92q104 0 173 -66.5t69 -174.5zM547 528q0 60 -27 91.5t-74 31.5q-91 0 -162 -120q-46 -78 -79.5 -189.5t-33.5 -198.5q0 -57 27.5 -92t74.5 -35q46 0 82 28t75 86 q49 72 83 191t34 207z" />
+<glyph unicode="&#xd7;" horiz-adv-x="570" d="M522 78l-62 -62l-175 176l-175 -176l-62 62l175 175l-175 175l62 62l175 -176l175 176l62 -62l-176 -175z" />
+<glyph unicode="&#xd8;" horiz-adv-x="722" d="M633 764l-63 -108q55 -26 88 -82t33 -121q0 -111 -48.5 -207.5t-134.5 -168.5q-114 -95 -240 -95q-45 0 -85 13l-70 -120h-48l79 136q-117 63 -117 201q0 122 58.5 231.5t156.5 175.5t207 66q40 0 82 -13l53 92h49zM182 77l324 553q-27 21 -63 21q-92 0 -165 -130 q-43 -77 -75 -190t-32 -190q0 -33 11 -64zM533 593l-325 -555q28 -22 67 -22q46 0 91.5 38t74.5 97q41 85 73.5 194.5t32.5 181.5q0 30 -14 66z" />
+<glyph unicode="&#xd9;" horiz-adv-x="722" d="M578 766h-46l-132 88q-34 23 -34 48q0 18 13.5 31.5t31.5 13.5q31 0 56 -33zM744 669v-25q-32 -6 -44.5 -14t-25.5 -36.5t-32 -96.5l-65 -234q-25 -89 -52.5 -145t-68.5 -89q-59 -47 -166 -47q-101 0 -162 42.5t-61 120.5q0 47 37 189l51 193q15 55 15 78q0 17 -9 25.5 t-32 10.5l-32 3v25h311v-25q-46 -2 -64 -16.5t-30 -59.5l-81 -294q-28 -101 -28 -135q0 -101 122 -101q78 0 123 47q49 51 90 197l57 209q19 70 19 96q0 57 -79 57v25h207z" />
+<glyph unicode="&#xda;" horiz-adv-x="722" d="M354 766l122 131q47 50 70 50q20 0 34 -14t14 -33q0 -14 -8.5 -24t-30.5 -23l-152 -87h-49zM744 669v-25q-32 -6 -44.5 -14t-25.5 -36.5t-32 -96.5l-65 -234q-25 -89 -52.5 -145t-68.5 -89q-59 -47 -166 -47q-101 0 -162 42.5t-61 120.5q0 47 37 189l51 193q15 55 15 78 q0 17 -9 25.5t-32 10.5l-32 3v25h311v-25q-46 -2 -64 -16.5t-30 -59.5l-81 -294q-28 -101 -28 -135q0 -101 122 -101q78 0 123 47q49 51 90 197l57 209q19 70 19 96q0 57 -79 57v25h207z" />
+<glyph unicode="&#xdb;" horiz-adv-x="722" d="M637 766h-51l-88 95l-131 -95h-57l160 174h81zM744 669v-25q-32 -6 -44.5 -14t-25.5 -36.5t-32 -96.5l-65 -234q-25 -89 -52.5 -145t-68.5 -89q-59 -47 -166 -47q-101 0 -162 42.5t-61 120.5q0 47 37 189l51 193q15 55 15 78q0 17 -9 25.5t-32 10.5l-32 3v25h311v-25 q-46 -2 -64 -16.5t-30 -59.5l-81 -294q-28 -101 -28 -135q0 -101 122 -101q78 0 123 47q49 51 90 197l57 209q19 70 19 96q0 57 -79 57v25h207z" />
+<glyph unicode="&#xdc;" horiz-adv-x="722" d="M744 669v-25q-32 -6 -44.5 -14t-25.5 -36.5t-32 -96.5l-65 -234q-25 -89 -52.5 -145t-68.5 -89q-59 -47 -166 -47q-101 0 -162 42.5t-61 120.5q0 47 37 189l51 193q15 55 15 78q0 17 -9 25.5t-32 10.5l-32 3v25h311v-25q-46 -2 -64 -16.5t-30 -59.5l-81 -294 q-28 -101 -28 -135q0 -101 122 -101q78 0 123 47q49 51 90 197l57 209q19 70 19 96q0 57 -79 57v25h207zM648 839q0 -26 -19.5 -45t-46.5 -19q-26 0 -45 19.5t-19 44.5q0 27 19 46.5t45 19.5q27 0 46.5 -19.5t19.5 -46.5zM436 839q0 -26 -19.5 -45t-46.5 -19q-26 0 -45 19.5 t-19 44.5q0 27 19 46.5t45 19.5q27 0 46.5 -19.5t19.5 -46.5z" />
+<glyph unicode="&#xdd;" horiz-adv-x="611" d="M357 766l122 131q47 50 70 50q20 0 34 -14t14 -33q0 -14 -8.5 -24t-30.5 -23l-152 -87h-49zM659 669v-25q-27 -4 -46.5 -20t-45.5 -52l-189 -264l-52 -191q-10 -40 -10 -51q0 -22 17 -31.5t62 -9.5v-25h-323v25q52 5 72 18.5t32 59.5l57 208l-87 270q-12 35 -23.5 45 t-51.5 18v25h285v-25q-42 -2 -55.5 -9.5t-13.5 -29.5q0 -19 29 -110l46 -143l128 183q28 40 28 67q0 23 -13 32t-53 10v25h207z" />
+<glyph unicode="&#xde;" horiz-adv-x="611" d="M312 534h44q217 0 217 -148q0 -90 -64 -143q-75 -61 -209 -61q-37 0 -81 5l-16 -61q-8 -31 -8 -62q0 -20 14.5 -28.5t56.5 -10.5v-25h-293v25q38 6 54 22t27 55l120 436q12 46 12 69q0 15 -10 22.5t-33 10.5l-31 4v25h295l-1 -25q-40 -6 -53 -17.5t-28 -54.5zM292 451 l-63 -232q34 -2 42 -2q82 0 117 52q17 26 28 67t11 75q0 43 -22 67t-62 24q-25 0 -34 -10.5t-17 -40.5z" />
+<glyph unicode="&#xdf;" d="M-16 -20l92 423q66 302 251 302q64 0 105 -34.5t41 -91.5q0 -45 -16 -76t-53 -59q-9 -7 -22.5 -13.5t-21.5 -9.5t-34 -11l-35 -11v-1q68 -11 106 -46.5t38 -96.5q0 -102 -73 -190q-60 -72 -149 -72q-39 0 -71 22l20 35l4 -5q14 -18 45 -18q33 0 61 60q18 39 30.5 103 t12.5 114q0 47 -24 65q-14 10 -52 15l7 37h17q19 0 38.5 13.5t31.5 39.5q29 63 29 140q0 61 -46 61q-34 0 -58 -39t-44 -127l-89 -398q-38 -169 -92.5 -240t-135.5 -71q-45 0 -71 21t-26 56q0 24 14.5 40t37.5 16q22 0 34.5 -12.5t12.5 -33.5q0 -14 -8.5 -24t-8.5 -17 q0 -15 16 -15q35 0 49 34q20 39 37 115z" />
+<glyph unicode="&#xe0;" d="M435 127l21 -15q-78 -126 -156 -126q-29 0 -46 16.5t-17 47.5q0 21 14 69q-42 -71 -80 -101.5t-84 -30.5q-49 0 -78.5 35t-29.5 92q0 117 87 231q89 117 186 117q32 0 49.5 -17t24.5 -55h1l17 59l111 7l-75 -251q-30 -99 -30 -133q0 -15 12 -15t27 14.5t46 55.5zM303 373 q0 20 -10.5 33.5t-26.5 13.5q-52 0 -108 -115q-25 -51 -40.5 -105.5t-15.5 -84.5q0 -57 43 -57q45 0 86 75q29 52 50.5 123.5t21.5 116.5zM416 516h-46l-132 88q-34 23 -34 48q0 18 13.5 31.5t31.5 13.5q31 0 56 -33z" />
+<glyph unicode="&#xe1;" d="M192 516l122 131q47 50 70 50q20 0 34 -14t14 -33q0 -14 -8.5 -24t-30.5 -23l-152 -87h-49zM435 127l21 -15q-78 -126 -156 -126q-29 0 -46 16.5t-17 47.5q0 21 14 69q-42 -71 -80 -101.5t-84 -30.5q-49 0 -78.5 35t-29.5 92q0 117 87 231q89 117 186 117q32 0 49.5 -17 t24.5 -55h1l17 59l111 7l-75 -251q-30 -99 -30 -133q0 -15 12 -15t27 14.5t46 55.5zM303 373q0 20 -10.5 33.5t-26.5 13.5q-52 0 -108 -115q-25 -51 -40.5 -105.5t-15.5 -84.5q0 -57 43 -57q45 0 86 75q29 52 50.5 123.5t21.5 116.5z" />
+<glyph unicode="&#xe2;" d="M475 516h-51l-88 95l-131 -95h-57l160 174h81zM435 127l21 -15q-78 -126 -156 -126q-29 0 -46 16.5t-17 47.5q0 21 14 69q-42 -71 -80 -101.5t-84 -30.5q-49 0 -78.5 35t-29.5 92q0 117 87 231q89 117 186 117q32 0 49.5 -17t24.5 -55h1l17 59l111 7l-75 -251 q-30 -99 -30 -133q0 -15 12 -15t27 14.5t46 55.5zM303 373q0 20 -10.5 33.5t-26.5 13.5q-52 0 -108 -115q-25 -51 -40.5 -105.5t-15.5 -84.5q0 -57 43 -57q45 0 86 75q29 52 50.5 123.5t21.5 116.5z" />
+<glyph unicode="&#xe3;" d="M456 655h41q-16 -63 -44 -91t-73 -28q-25 0 -57 13l-59 23q-21 8 -38 8q-31 0 -48 -43h-40q10 54 41.5 86t74.5 32q38 0 97 -26q39 -16 54 -16q17 0 28.5 9t22.5 33zM435 127l21 -15q-78 -126 -156 -126q-29 0 -46 16.5t-17 47.5q0 21 14 69q-42 -71 -80 -101.5 t-84 -30.5q-49 0 -78.5 35t-29.5 92q0 117 87 231q89 117 186 117q32 0 49.5 -17t24.5 -55h1l17 59l111 7l-75 -251q-30 -99 -30 -133q0 -15 12 -15t27 14.5t46 55.5zM303 373q0 20 -10.5 33.5t-26.5 13.5q-52 0 -108 -115q-25 -51 -40.5 -105.5t-15.5 -84.5q0 -57 43 -57 q45 0 86 75q29 52 50.5 123.5t21.5 116.5z" />
+<glyph unicode="&#xe4;" d="M273 589q0 -26 -19.5 -45t-46.5 -19q-25 0 -44.5 19.5t-19.5 44.5q0 27 19 46.5t45 19.5q27 0 46.5 -19.5t19.5 -46.5zM485 589q0 -26 -19.5 -45t-46.5 -19q-25 0 -44.5 19.5t-19.5 44.5q0 27 19 46.5t45 19.5q27 0 46.5 -19.5t19.5 -46.5zM435 127l21 -15 q-78 -126 -156 -126q-29 0 -46 16.5t-17 47.5q0 21 14 69q-42 -71 -80 -101.5t-84 -30.5q-49 0 -78.5 35t-29.5 92q0 117 87 231q89 117 186 117q32 0 49.5 -17t24.5 -55h1l17 59l111 7l-75 -251q-30 -99 -30 -133q0 -15 12 -15t27 14.5t46 55.5zM303 373q0 20 -10.5 33.5 t-26.5 13.5q-52 0 -108 -115q-25 -51 -40.5 -105.5t-15.5 -84.5q0 -57 43 -57q45 0 86 75q29 52 50.5 123.5t21.5 116.5z" />
+<glyph unicode="&#xe5;" d="M426 650q0 -44 -31.5 -75.5t-75.5 -31.5q-48 0 -77 30t-29 78q0 44 31.5 74.5t75.5 30.5q47 0 76.5 -30.5t29.5 -75.5zM378 648q0 25 -17.5 42.5t-42.5 17.5q-23 0 -40 -17.5t-17 -41.5t17 -41t40 -17q25 0 42.5 17t17.5 40zM435 127l21 -15q-78 -126 -156 -126 q-29 0 -46 16.5t-17 47.5q0 21 14 69q-42 -71 -80 -101.5t-84 -30.5q-49 0 -78.5 35t-29.5 92q0 117 87 231q89 117 186 117q32 0 49.5 -17t24.5 -55h1l17 59l111 7l-75 -251q-30 -99 -30 -133q0 -15 12 -15t27 14.5t46 55.5zM303 373q0 20 -10.5 33.5t-26.5 13.5 q-52 0 -108 -115q-25 -51 -40.5 -105.5t-15.5 -84.5q0 -57 43 -57q45 0 86 75q29 52 50.5 123.5t21.5 116.5z" />
+<glyph unicode="&#xe6;" horiz-adv-x="722" d="M473 459l-20 -65q28 36 55.5 50.5t64.5 14.5q47 0 73.5 -23t26.5 -64q0 -64 -61.5 -116t-168.5 -69l-37 -6q-5 -25 -5 -46q0 -40 17.5 -62.5t48.5 -22.5q72 0 124 90l28 -17q-66 -136 -194 -136t-143 131q-42 -70 -82.5 -100t-90.5 -30q-52 0 -83 30t-31 88 q0 66 29.5 135t77.5 124q84 97 168 97q33 0 51 -14.5t31 -51.5l18 58zM418 231l-5 -17q65 8 117.5 60.5t52.5 113.5q0 41 -35 41q-72 0 -130 -198zM333 363q0 25 -13.5 40.5t-34.5 15.5q-43 0 -83 -58t-60.5 -125.5t-20.5 -111.5q0 -66 48 -66q47 0 93 79q30 50 50.5 117 t20.5 109z" />
+<glyph unicode="&#xe7;" horiz-adv-x="444" d="M31 -92l60 88q-96 29 -96 142q0 63 27.5 125t73.5 110q39 41 88.5 65t94.5 24q47 0 80 -25.5t33 -65.5q0 -31 -17 -50.5t-45 -19.5q-25 0 -41.5 15t-16.5 38q0 13 10.5 30t10.5 28q0 17 -22 17q-53 0 -96 -87q-24 -48 -38 -108t-14 -94q0 -40 20 -64.5t53 -24.5 q32 0 59 20t63 70l28 -18q-57 -87 -103 -113q-40 -23 -95 -23q-11 0 -18 1l-34 -50q15 3 26 3q39 0 64.5 -20.5t25.5 -51.5q0 -37 -35.5 -62t-88.5 -25q-51 0 -112 25l22 33q37 -17 67 -17q26 0 41 11t15 30q0 36 -47 36q-14 0 -30 -4z" />
+<glyph unicode="&#xe8;" horiz-adv-x="444" d="M317 143l29 -17q-78 -139 -195 -139q-67 0 -106.5 37.5t-39.5 109.5q0 124 89.5 226t198.5 102q48 0 76.5 -24t28.5 -63q0 -63 -69 -122q-32 -27 -73.5 -42.5t-114.5 -28.5q-6 -30 -6 -49q0 -82 64 -82q32 0 57.5 20t60.5 72zM306 390q0 39 -31 39q-71 0 -127 -215 q68 15 113 64.5t45 111.5zM388 516h-46l-132 88q-34 23 -34 48q0 18 13.5 31.5t31.5 13.5q31 0 56 -33z" />
+<glyph unicode="&#xe9;" horiz-adv-x="444" d="M179 516l122 131q47 50 70 50q20 0 34 -14t14 -33q0 -14 -8.5 -24t-30.5 -23l-152 -87h-49zM317 143l29 -17q-78 -139 -195 -139q-67 0 -106.5 37.5t-39.5 109.5q0 124 89.5 226t198.5 102q48 0 76.5 -24t28.5 -63q0 -63 -69 -122q-32 -27 -73.5 -42.5t-114.5 -28.5 q-6 -30 -6 -49q0 -82 64 -82q32 0 57.5 20t60.5 72zM306 390q0 39 -31 39q-71 0 -127 -215q68 15 113 64.5t45 111.5z" />
+<glyph unicode="&#xea;" horiz-adv-x="444" d="M462 516h-51l-88 95l-131 -95h-57l160 174h81zM317 143l29 -17q-78 -139 -195 -139q-67 0 -106.5 37.5t-39.5 109.5q0 124 89.5 226t198.5 102q48 0 76.5 -24t28.5 -63q0 -63 -69 -122q-32 -27 -73.5 -42.5t-114.5 -28.5q-6 -30 -6 -49q0 -82 64 -82q32 0 57.5 20 t60.5 72zM306 390q0 39 -31 39q-71 0 -127 -215q68 15 113 64.5t45 111.5z" />
+<glyph unicode="&#xeb;" horiz-adv-x="444" d="M317 143l29 -17q-78 -139 -195 -139q-67 0 -106.5 37.5t-39.5 109.5q0 124 89.5 226t198.5 102q48 0 76.5 -24t28.5 -63q0 -63 -69 -122q-32 -27 -73.5 -42.5t-114.5 -28.5q-6 -30 -6 -49q0 -82 64 -82q32 0 57.5 20t60.5 72zM306 390q0 39 -31 39q-71 0 -127 -215 q68 15 113 64.5t45 111.5zM470 589q0 -26 -19.5 -45t-46.5 -19q-26 0 -45 19.5t-19 44.5q0 27 19 46.5t45 19.5q27 0 46.5 -19.5t19.5 -46.5zM258 589q0 -26 -19.5 -45t-46.5 -19q-26 0 -45 19.5t-19 44.5q0 27 19 46.5t45 19.5q27 0 46.5 -19.5t19.5 -46.5z" />
+<glyph unicode="&#xec;" horiz-adv-x="278" d="M216 142l22 -14q-48 -79 -85 -108t-83 -29q-68 0 -68 63q0 22 15 76l55 203q8 32 8 45q0 29 -46 29h-14v27q118 9 203 28l-91 -334q-9 -31 -9 -51q0 -16 15 -16q21 0 64 61zM294 516h-46l-132 88q-34 23 -34 48q0 18 13.5 31.5t31.5 13.5q31 0 56 -33z" />
+<glyph unicode="&#xed;" horiz-adv-x="278" d="M216 142l22 -14q-48 -79 -85 -108t-83 -29q-68 0 -68 63q0 22 15 76l55 203q8 32 8 45q0 29 -46 29h-14v27q118 9 203 28l-91 -334q-9 -31 -9 -51q0 -16 15 -16q21 0 64 61zM70 516l122 131q47 50 70 50q20 0 34 -14t14 -33q0 -14 -8.5 -24t-30.5 -23l-152 -87h-49z" />
+<glyph unicode="&#xee;" horiz-adv-x="278" d="M353 516h-51l-88 95l-131 -95h-57l160 174h81zM216 142l22 -14q-48 -79 -85 -108t-83 -29q-68 0 -68 63q0 22 15 76l55 203q8 32 8 45q0 29 -46 29h-14v27q118 9 203 28l-91 -334q-9 -31 -9 -51q0 -16 15 -16q21 0 64 61z" />
+<glyph unicode="&#xef;" horiz-adv-x="278" d="M216 142l22 -14q-48 -79 -85 -108t-83 -29q-68 0 -68 63q0 22 15 76l55 203q8 32 8 45q0 29 -46 29h-14v27q118 9 203 28l-91 -334q-9 -31 -9 -51q0 -16 15 -16q21 0 64 61zM362 589q0 -26 -19.5 -45t-46.5 -19q-26 0 -45 19.5t-19 44.5q0 27 19 46.5t45 19.5 q27 0 46.5 -19.5t19.5 -46.5zM150 589q0 -26 -19.5 -45t-46.5 -19q-26 0 -45 19.5t-19 44.5q0 27 19 46.5t45 19.5q27 0 46.5 -19.5t19.5 -46.5z" />
+<glyph unicode="&#xf0;" d="M454 664l-107 -56q51 -56 72.5 -108t21.5 -120q0 -160 -81.5 -276.5t-204.5 -116.5q-70 0 -114 41.5t-44 105.5q0 130 85 229t190 99q47 0 71 -42l2 4q-6 78 -62 150l-119 -62l-33 31l122 64q-57 55 -117 65l45 27q71 -10 132 -60l107 57zM322 375q0 27 -12.5 42.5 t-33.5 15.5q-41 0 -79.5 -65t-59.5 -145t-21 -137q0 -70 49 -70q60 0 109 129q20 55 34 121t14 109z" />
+<glyph unicode="&#xf1;" horiz-adv-x="556" d="M466 655h41q-16 -63 -44 -91t-73 -28q-25 0 -57 13l-59 23q-21 8 -38 8q-31 0 -48 -43h-40q10 54 41.5 86t74.5 32q38 0 97 -26q39 -16 54 -16q17 0 28.5 9t22.5 33zM472 135l22 -13q-41 -72 -77.5 -101.5t-82.5 -29.5q-68 0 -68 60q0 47 26 125l55 165q7 23 7 28 q0 21 -25 21q-13 0 -33 -16.5t-36 -37.5q-47 -62 -79 -135t-66 -201h-121l57 204q45 164 45 179q0 14 -11.5 18.5t-43.5 5.5v27q90 3 199 27l-62 -198h1q51 75 73 103.5t49 54.5q43 41 100 41q73 0 73 -77q0 -34 -28 -116l-35 -104q-24 -71 -24 -89q0 -17 14 -17q13 0 27 15 t44 61z" />
+<glyph unicode="&#xf2;" d="M280 462h4q73 0 115 -41t42 -110t-29 -135.5t-76 -113.5q-75 -75 -175 -75q-73 0 -118.5 38.5t-45.5 109.5q0 73 27 139t73 111q79 77 183 77zM322 372q0 28 -12.5 44.5t-34.5 16.5q-32 0 -60 -31q-43 -48 -71 -144.5t-28 -177.5q0 -64 49 -64q41 0 71 49q36 59 61 149.5 t25 157.5zM405 516h-46l-132 88q-34 23 -34 48q0 18 13.5 31.5t31.5 13.5q31 0 56 -33z" />
+<glyph unicode="&#xf3;" d="M179 516l122 131q47 50 70 50q20 0 34 -14t14 -33q0 -14 -8.5 -24t-30.5 -23l-152 -87h-49zM280 462h4q73 0 115 -41t42 -110t-29 -135.5t-76 -113.5q-75 -75 -175 -75q-73 0 -118.5 38.5t-45.5 109.5q0 73 27 139t73 111q79 77 183 77zM322 372q0 28 -12.5 44.5 t-34.5 16.5q-32 0 -60 -31q-43 -48 -71 -144.5t-28 -177.5q0 -64 49 -64q41 0 71 49q36 59 61 149.5t25 157.5z" />
+<glyph unicode="&#xf4;" d="M462 516h-51l-88 95l-131 -95h-57l160 174h81zM280 462h4q73 0 115 -41t42 -110t-29 -135.5t-76 -113.5q-75 -75 -175 -75q-73 0 -118.5 38.5t-45.5 109.5q0 73 27 139t73 111q79 77 183 77zM322 372q0 28 -12.5 44.5t-34.5 16.5q-32 0 -60 -31q-43 -48 -71 -144.5 t-28 -177.5q0 -64 49 -64q41 0 71 49q36 59 61 149.5t25 157.5z" />
+<glyph unicode="&#xf5;" d="M444 655h41q-16 -63 -44 -91t-73 -28q-25 0 -57 13l-59 23q-21 8 -38 8q-31 0 -48 -43h-40q10 54 41.5 86t74.5 32q38 0 97 -26q39 -16 54 -16q17 0 28.5 9t22.5 33zM280 462h4q73 0 115 -41t42 -110t-29 -135.5t-76 -113.5q-75 -75 -175 -75q-73 0 -118.5 38.5 t-45.5 109.5q0 73 27 139t73 111q79 77 183 77zM322 372q0 28 -12.5 44.5t-34.5 16.5q-32 0 -60 -31q-43 -48 -71 -144.5t-28 -177.5q0 -64 49 -64q41 0 71 49q36 59 61 149.5t25 157.5z" />
+<glyph unicode="&#xf6;" d="M280 462h4q73 0 115 -41t42 -110t-29 -135.5t-76 -113.5q-75 -75 -175 -75q-73 0 -118.5 38.5t-45.5 109.5q0 73 27 139t73 111q79 77 183 77zM322 372q0 28 -12.5 44.5t-34.5 16.5q-32 0 -60 -31q-43 -48 -71 -144.5t-28 -177.5q0 -64 49 -64q41 0 71 49q36 59 61 149.5 t25 157.5zM470 589q0 -26 -19.5 -45t-46.5 -19q-26 0 -45 19.5t-19 44.5q0 27 19 46.5t45 19.5q27 0 46.5 -19.5t19.5 -46.5zM258 589q0 -26 -19.5 -45t-46.5 -19q-26 0 -45 19.5t-19 44.5q0 27 19 46.5t45 19.5q27 0 46.5 -19.5t19.5 -46.5z" />
+<glyph unicode="&#xf7;" horiz-adv-x="570" d="M537 209h-504v88h504v-88zM359 45q0 -31 -21.5 -52.5t-53.5 -21.5q-31 0 -52 21t-21 53t21.5 53t53.5 21q30 0 51.5 -22t21.5 -52zM359 461q0 -31 -21.5 -52.5t-53.5 -21.5q-31 0 -52 21t-21 53t21.5 53t53.5 21q30 0 51.5 -22t21.5 -52z" />
+<glyph unicode="&#xf8;" d="M424 560l-65 -116q82 -40 82 -133q0 -127 -86.5 -225.5t-197.5 -98.5q-24 0 -51 8l-64 -114h-40l72 126q-77 44 -77 127q0 128 88.5 228t200.5 100q20 0 42 -6l59 104h37zM116 78l191 341q-14 14 -32 14q-48 0 -86 -68q-27 -49 -50 -136.5t-23 -142.5v-8zM321 377 l-193 -343q14 -18 37 -18q57 0 101 109q22 52 39 127t17 120q0 3 -1 5z" />
+<glyph unicode="&#xf9;" horiz-adv-x="556" d="M471 133l22 -13q-39 -67 -76.5 -98t-82.5 -31q-68 0 -68 60q0 31 26 110h-1q-70 -103 -109.5 -136.5t-88.5 -33.5q-78 0 -78 79q0 27 22 106l37 128q17 62 17 75q0 24 -58 28v27q87 2 210 28l-93 -302q-16 -51 -16 -72q0 -25 24 -25q28 0 70 55q47 61 75.5 125t66.5 206 h118l-78 -266q-25 -88 -25 -103q0 -21 14 -21q24 0 72 74zM422 516h-46l-132 88q-34 23 -34 48q0 18 13.5 31.5t31.5 13.5q31 0 56 -33z" />
+<glyph unicode="&#xfa;" horiz-adv-x="556" d="M196 516l122 131q47 50 70 50q20 0 34 -14t14 -33q0 -14 -8.5 -24t-30.5 -23l-152 -87h-49zM471 133l22 -13q-39 -67 -76.5 -98t-82.5 -31q-68 0 -68 60q0 31 26 110h-1q-70 -103 -109.5 -136.5t-88.5 -33.5q-78 0 -78 79q0 27 22 106l37 128q17 62 17 75q0 24 -58 28v27 q87 2 210 28l-93 -302q-16 -51 -16 -72q0 -25 24 -25q28 0 70 55q47 61 75.5 125t66.5 206h118l-78 -266q-25 -88 -25 -103q0 -21 14 -21q24 0 72 74z" />
+<glyph unicode="&#xfb;" horiz-adv-x="556" d="M481 516h-51l-88 95l-131 -95h-57l160 174h81zM471 133l22 -13q-39 -67 -76.5 -98t-82.5 -31q-68 0 -68 60q0 31 26 110h-1q-70 -103 -109.5 -136.5t-88.5 -33.5q-78 0 -78 79q0 27 22 106l37 128q17 62 17 75q0 24 -58 28v27q87 2 210 28l-93 -302q-16 -51 -16 -72 q0 -25 24 -25q28 0 70 55q47 61 75.5 125t66.5 206h118l-78 -266q-25 -88 -25 -103q0 -21 14 -21q24 0 72 74z" />
+<glyph unicode="&#xfc;" horiz-adv-x="556" d="M277 589q0 -26 -19.5 -45t-46.5 -19q-25 0 -44.5 19.5t-19.5 44.5q0 27 19 46.5t45 19.5q27 0 46.5 -19.5t19.5 -46.5zM489 589q0 -26 -19.5 -45t-46.5 -19q-25 0 -44.5 19.5t-19.5 44.5q0 27 19 46.5t45 19.5q27 0 46.5 -19.5t19.5 -46.5zM471 133l22 -13 q-39 -67 -76.5 -98t-82.5 -31q-68 0 -68 60q0 31 26 110h-1q-70 -103 -109.5 -136.5t-88.5 -33.5q-78 0 -78 79q0 27 22 106l37 128q17 62 17 75q0 24 -58 28v27q87 2 210 28l-93 -302q-16 -51 -16 -72q0 -25 24 -25q28 0 70 55q47 61 75.5 125t66.5 206h118l-78 -266 q-25 -88 -25 -103q0 -21 14 -21q24 0 72 74z" />
+<glyph unicode="&#xfd;" horiz-adv-x="444" d="M161 516l122 131q47 50 70 50q20 0 34 -14t14 -33q0 -14 -8.5 -24t-30.5 -23l-152 -87h-49zM239 110h2q52 99 69.5 141t17.5 66q0 13 -25 34q-31 25 -31 54q0 21 16 39t42 18q25 0 43.5 -19t18.5 -45q0 -76 -75.5 -227t-173.5 -270q-41 -50 -87.5 -78t-87.5 -28 q-26 0 -44 17.5t-18 42.5q0 22 15.5 39t34.5 17q25 0 51 -18t43 -18q13 0 32 15t35 37q25 35 25 71q0 50 -50 288q-21 94 -40 113q-8 8 -14.5 10t-25.5 2v27q86 8 150 24q43 -111 66 -274z" />
+<glyph unicode="&#xfe;" d="M185 359l3 -3q38 57 73 81.5t78 24.5q49 0 78 -33t29 -88q0 -85 -40.5 -167.5t-105.5 -134.5t-131 -52q-25 0 -68 22q-10 -38 -11 -41q-26 -96 -26 -114t13.5 -24.5t51.5 -7.5v-27h-249v27q35 0 50 17t28 68l162 630q17 64 17 75q0 30 -45 30h-18v27q117 13 206 30z M321 334q0 57 -39 57q-20 0 -43.5 -17t-41.5 -46q-18 -27 -46 -121q-38 -128 -38 -149q0 -15 11.5 -25.5t27.5 -10.5q50 0 97 82q29 53 50.5 118t21.5 112z" />
+<glyph unicode="&#xff;" horiz-adv-x="444" d="M239 110h2q52 99 69.5 141t17.5 66q0 13 -25 34q-31 25 -31 54q0 21 16 39t42 18q25 0 43.5 -19t18.5 -45q0 -76 -75.5 -227t-173.5 -270q-41 -50 -87.5 -78t-87.5 -28q-26 0 -44 17.5t-18 42.5q0 22 15.5 39t34.5 17q25 0 51 -18t43 -18q13 0 32 15t35 37q25 35 25 71 q0 50 -50 288q-21 94 -40 113q-8 8 -14.5 10t-25.5 2v27q86 8 150 24q43 -111 66 -274zM460 589q0 -26 -19.5 -45t-46.5 -19q-26 0 -45 19.5t-19 44.5q0 27 19 46.5t45 19.5q27 0 46.5 -19.5t19.5 -46.5zM248 589q0 -26 -19.5 -45t-46.5 -19q-26 0 -45 19.5t-19 44.5 q0 27 19 46.5t45 19.5q27 0 46.5 -19.5t19.5 -46.5z" />
+<glyph unicode="&#x100;" horiz-adv-x="667" d="M571 793l-16 -70h-326l17 70h325zM593 0h-303v25q77 6 77 49q0 3 -2 15l-12 119h-215l-57 -96q-17 -28 -17 -50q0 -37 64 -37v-25h-195l-1 25q26 3 43 19.5t43 56.5l370 582h25l94 -560q11 -62 25 -78.5t61 -19.5v-25zM346 248l-37 243l-148 -243h185z" />
+<glyph unicode="&#x101;" d="M486 586l-16 -70h-326l17 70h325zM435 127l21 -15q-78 -126 -156 -126q-29 0 -46 16.5t-17 47.5q0 21 14 69q-42 -71 -80 -101.5t-84 -30.5q-49 0 -78.5 35t-29.5 92q0 117 87 231q89 117 186 117q32 0 49.5 -17t24.5 -55h1l17 59l111 7l-75 -251q-30 -99 -30 -133 q0 -15 12 -15t27 14.5t46 55.5zM303 373q0 20 -10.5 33.5t-26.5 13.5q-52 0 -108 -115q-25 -51 -40.5 -105.5t-15.5 -84.5q0 -57 43 -57q45 0 86 75q29 52 50.5 123.5t21.5 116.5z" />
+<glyph unicode="&#x102;" horiz-adv-x="667" d="M519 885h39q-33 -162 -178 -162q-138 0 -138 149v13h43q8 -90 99 -90q50 0 81 20.5t54 69.5zM593 0h-303v25q77 6 77 49q0 3 -2 15l-12 119h-215l-57 -96q-17 -28 -17 -50q0 -37 64 -37v-25h-195l-1 25q26 3 43 19.5t43 56.5l370 582h25l94 -560q11 -62 25 -78.5 t61 -19.5v-25zM346 248l-37 243l-148 -243h185z" />
+<glyph unicode="&#x103;" d="M444 678h39q-33 -162 -178 -162q-138 0 -138 149v13h43q8 -90 99 -90q50 0 81 20.5t54 69.5zM435 127l21 -15q-78 -126 -156 -126q-29 0 -46 16.5t-17 47.5q0 21 14 69q-42 -71 -80 -101.5t-84 -30.5q-49 0 -78.5 35t-29.5 92q0 117 87 231q89 117 186 117q32 0 49.5 -17 t24.5 -55h1l17 59l111 7l-75 -251q-30 -99 -30 -133q0 -15 12 -15t27 14.5t46 55.5zM303 373q0 20 -10.5 33.5t-26.5 13.5q-52 0 -108 -115q-25 -51 -40.5 -105.5t-15.5 -84.5q0 -57 43 -57q45 0 86 75q29 52 50.5 123.5t21.5 116.5z" />
+<glyph unicode="&#x104;" horiz-adv-x="667" d="M453 0h-163v25q77 6 77 49q0 3 -2 15l-12 119h-215l-57 -96q-17 -28 -17 -50q0 -37 64 -37v-25h-195l-1 25q26 3 43 19.5t43 56.5l370 582h25l94 -560q11 -62 25 -78.5t61 -19.5v-25h-92q-6 -28 -6 -42q0 -62 61 -62q22 0 48 13l14 7l22 -14q-19 -35 -53 -55t-73 -20 q-47 0 -75 21t-28 60t42 92zM161 248h185l-37 243z" />
+<glyph unicode="&#x105;" d="M485 -84l22 -14q-19 -35 -53 -55t-73 -20q-47 0 -75 21t-28 60q0 34 32 79q-4 -1 -10 -1q-29 0 -46 16.5t-17 47.5q0 21 14 69q-42 -71 -80 -101.5t-84 -30.5q-49 0 -78.5 35t-29.5 92q0 117 87 231q89 117 186 117q32 0 49.5 -17t24.5 -55h1l17 59l111 7l-75 -251 q-30 -99 -30 -133q0 -15 12 -15t27 14.5t46 55.5l21 -15q-43 -71 -85 -100q-9 -39 -9 -54q0 -62 61 -62q22 0 48 13zM266 420q-52 0 -108 -115q-25 -51 -40.5 -105.5t-15.5 -84.5q0 -57 43 -57q45 0 86 75q29 52 50.5 123.5t21.5 116.5q0 20 -10.5 33.5t-26.5 13.5z" />
+<glyph unicode="&#x106;" horiz-adv-x="667" d="M360 723l122 131q47 50 70 50q20 0 34 -14t14 -33q0 -14 -8.5 -24t-30.5 -23l-152 -87h-49zM677 685l-51 -235l-32 6q3 20 3 36q0 72 -34.5 115t-96.5 43q-80 0 -145 -73q-61 -69 -98 -165t-37 -203q0 -81 42 -127.5t113 -46.5q61 0 105 28t99 91l31 -22q-42 -58 -78 -85 q-86 -65 -199 -65q-122 0 -194.5 69t-72.5 183q0 109 42.5 202t116.5 156q111 93 249 93q64 0 131 -21q24 -8 38 -8q20 0 38 29h30z" />
+<glyph unicode="&#x107;" horiz-adv-x="444" d="M139 516l122 131q47 50 70 50q20 0 34 -14t14 -33q0 -14 -8.5 -24t-30.5 -23l-152 -87h-49zM318 142l28 -18l-38 -50q-13 -17 -34.5 -37.5t-42.5 -31.5q-35 -18 -83 -18q-70 0 -111.5 39.5t-41.5 111.5q0 134 105 239q83 85 180 85q46 0 79 -25.5t33 -64.5 q0 -32 -17 -51.5t-45 -19.5q-25 0 -41.5 15t-16.5 38q0 16 10.5 32t10.5 26q0 7 -7.5 12t-16.5 5q-26 0 -47.5 -22.5t-45.5 -65.5q-53 -98 -53 -201q0 -43 19.5 -66t53.5 -23q32 0 59 20t63 71z" />
+<glyph unicode="&#x108;" horiz-adv-x="667" d="M624 723h-51l-88 95l-131 -95h-57l160 174h81zM677 685l-51 -235l-32 6q3 20 3 36q0 72 -34.5 115t-96.5 43q-80 0 -145 -73q-61 -69 -98 -165t-37 -203q0 -81 42 -127.5t113 -46.5q61 0 105 28t99 91l31 -22q-42 -58 -78 -85q-86 -65 -199 -65q-122 0 -194.5 69 t-72.5 183q0 109 42.5 202t116.5 156q111 93 249 93q64 0 131 -21q24 -8 38 -8q20 0 38 29h30z" />
+<glyph unicode="&#x109;" horiz-adv-x="444" d="M415 516h-51l-88 95l-131 -95h-57l160 174h81zM318 142l28 -18l-38 -50q-13 -17 -34.5 -37.5t-42.5 -31.5q-35 -18 -83 -18q-70 0 -111.5 39.5t-41.5 111.5q0 134 105 239q83 85 180 85q46 0 79 -25.5t33 -64.5q0 -32 -17 -51.5t-45 -19.5q-25 0 -41.5 15t-16.5 38 q0 16 10.5 32t10.5 26q0 7 -7.5 12t-16.5 5q-26 0 -47.5 -22.5t-45.5 -65.5q-53 -98 -53 -201q0 -43 19.5 -66t53.5 -23q32 0 59 20t63 71z" />
+<glyph unicode="&#x10a;" horiz-adv-x="667" d="M677 685l-51 -235l-32 6q3 20 3 36q0 72 -34.5 115t-96.5 43q-80 0 -145 -73q-61 -69 -98 -165t-37 -203q0 -81 42 -127.5t113 -46.5q61 0 105 28t99 91l31 -22q-42 -58 -78 -85q-86 -65 -199 -65q-122 0 -194.5 69t-72.5 183q0 109 42.5 202t116.5 156q111 93 249 93 q64 0 131 -21q24 -8 38 -8q20 0 38 29h30zM449 862q27 0 46.5 -19.5t19.5 -46.5q0 -26 -19.5 -45t-46.5 -19q-25 0 -44.5 19t-19.5 45q0 27 19 46.5t45 19.5z" />
+<glyph unicode="&#x10b;" horiz-adv-x="444" d="M345 589q0 -26 -19.5 -45t-46.5 -19q-25 0 -44.5 19.5t-19.5 44.5q0 27 19 46.5t45 19.5q27 0 46.5 -19.5t19.5 -46.5zM318 142l28 -18l-38 -50q-13 -17 -34.5 -37.5t-42.5 -31.5q-35 -18 -83 -18q-70 0 -111.5 39.5t-41.5 111.5q0 134 105 239q83 85 180 85 q46 0 79 -25.5t33 -64.5q0 -32 -17 -51.5t-45 -19.5q-25 0 -41.5 15t-16.5 38q0 16 10.5 32t10.5 26q0 7 -7.5 12t-16.5 5q-26 0 -47.5 -22.5t-45.5 -65.5q-53 -98 -53 -201q0 -43 19.5 -66t53.5 -23q32 0 59 20t63 71z" />
+<glyph unicode="&#x10c;" horiz-adv-x="667" d="M616 897l-162 -174h-82l-88 174h51l90 -97l134 97h57zM677 685l-51 -235l-32 6q3 20 3 36q0 72 -34.5 115t-96.5 43q-80 0 -145 -73q-61 -69 -98 -165t-37 -203q0 -81 42 -127.5t113 -46.5q61 0 105 28t99 91l31 -22q-42 -58 -78 -85q-86 -65 -199 -65q-122 0 -194.5 69 t-72.5 183q0 109 42.5 202t116.5 156q111 93 249 93q64 0 131 -21q24 -8 38 -8q20 0 38 29h30z" />
+<glyph unicode="&#x10d;" horiz-adv-x="444" d="M437 690l-162 -174h-82l-88 174h51l90 -97l134 97h57zM318 142l28 -18l-38 -50q-13 -17 -34.5 -37.5t-42.5 -31.5q-35 -18 -83 -18q-70 0 -111.5 39.5t-41.5 111.5q0 134 105 239q83 85 180 85q46 0 79 -25.5t33 -64.5q0 -32 -17 -51.5t-45 -19.5q-25 0 -41.5 15 t-16.5 38q0 16 10.5 32t10.5 26q0 7 -7.5 12t-16.5 5q-26 0 -47.5 -22.5t-45.5 -65.5q-53 -98 -53 -201q0 -43 19.5 -66t53.5 -23q32 0 59 20t63 71z" />
+<glyph unicode="&#x10e;" horiz-adv-x="722" d="M586 897l-162 -174h-82l-88 174h51l90 -97l134 97h57zM94 669h290q141 0 221 -70.5t80 -193.5q0 -82 -31.5 -159t-87.5 -129q-127 -117 -324 -117h-288v25q37 5 53.5 21.5t29.5 62.5l115 422q15 53 15 71t-8.5 26t-30.5 11l-34 5v25zM318 600l-126 -465q-15 -53 -15 -67 q0 -34 58 -34q130 0 210 105q93 121 93 318q0 181 -165 181q-25 0 -37 -8.5t-18 -29.5z" />
+<glyph unicode="&#x10f;" horiz-adv-x="658" d="M517 699l-117 -421q-51 -184 -51 -203q0 -5 3.5 -10t7.5 -5q24 0 68 71l22 -16q-79 -126 -150 -126q-28 0 -44 16t-16 45q0 20 11 68q-72 -131 -166 -131q-48 0 -77 32.5t-29 92.5q0 72 37 150t94 132q70 68 138 68q46 0 75 -33l18 64q29 102 29 122q0 28 -41 28h-21v27 q129 10 209 29zM308 371q0 21 -10.5 35t-26.5 14q-57 1 -114 -112q-24 -48 -39 -100.5t-15 -85.5q0 -27 11.5 -45t29.5 -18q45 0 86 74q27 48 52.5 126.5t25.5 111.5zM535 394l-13 25q118 63 118 116q0 21 -30 37q-40 22 -40 65q0 35 20.5 54t52.5 19q39 0 61 -26t22 -68 q0 -67 -51 -125.5t-140 -96.5z" />
+<glyph unicode="&#x110;" horiz-adv-x="722" d="M109 669h290q142 0 221.5 -72.5t79.5 -200.5q0 -171 -126.5 -283.5t-318.5 -112.5h-286v25q36 5 53 19.5t27 52.5l63 232h-102l12 44h102l46 170q12 44 12 59q0 17 -10 25t-32 12l-31 5v25zM260 329l-56 -207q-12 -46 -12 -54q0 -34 54 -34q142 0 223 118q39 58 61.5 140 t22.5 165q0 181 -165 181q-46 0 -55 -38l-61 -227h122l-12 -44h-122z" />
+<glyph unicode="&#x111;" d="M180 568h181q9 37 9 47q0 28 -41 28h-21v27q129 10 209 29l-37 -131h61l-14 -50h-61l-66 -240q-51 -184 -51 -203q0 -5 3.5 -10t7.5 -5q24 0 68 71l22 -16q-79 -126 -150 -126q-28 0 -44 16t-16 45q0 20 11 68q-72 -131 -166 -131q-48 0 -77 32.5t-29 92.5q0 72 37 150 t94 132q70 68 138 68q46 0 75 -33l25 89h-182zM271 420q-57 1 -114 -112q-24 -48 -39 -100.5t-15 -85.5q0 -27 11.5 -45t29.5 -18q45 0 86 74q27 48 52.5 126.5t25.5 111.5q0 21 -10.5 35t-26.5 14z" />
+<glyph unicode="&#x112;" horiz-adv-x="667" d="M601 793l-16 -70h-326l17 70h325zM653 669l-43 -190l-27 5q-3 60 -9.5 82t-35.5 41q-47 30 -137 30q-32 0 -45 -9t-22 -42l-59 -216q99 0 134.5 18.5t70.5 88.5l28 -4l-74 -274l-28 4q4 25 4 44q0 52 -30 71.5t-114 19.5l-63 -234q-8 -32 -8 -38q0 -34 61 -34 q131 0 214 61q28 20 47 42t44 64l25 -5l-60 -194h-553v25q39 6 54 20.5t28 59.5l119 432q12 44 12 70q0 15 -9 22.5t-32 10.5l-33 4v25h541z" />
+<glyph unicode="&#x113;" horiz-adv-x="444" d="M431 586l-16 -70h-326l17 70h325zM317 143l29 -17q-78 -139 -195 -139q-67 0 -106.5 37.5t-39.5 109.5q0 124 89.5 226t198.5 102q48 0 76.5 -24t28.5 -63q0 -63 -69 -122q-32 -27 -73.5 -42.5t-114.5 -28.5q-6 -30 -6 -49q0 -82 64 -82q32 0 57.5 20t60.5 72zM306 390 q0 39 -31 39q-71 0 -127 -215q68 15 113 64.5t45 111.5z" />
+<glyph unicode="&#x114;" horiz-adv-x="667" d="M569 885h39q-33 -162 -178 -162q-138 0 -138 149v13h43q8 -90 99 -90q50 0 81 20.5t54 69.5zM653 669l-43 -190l-27 5q-3 60 -9.5 82t-35.5 41q-47 30 -137 30q-32 0 -45 -9t-22 -42l-59 -216q99 0 134.5 18.5t70.5 88.5l28 -4l-74 -274l-28 4q4 25 4 44q0 52 -30 71.5 t-114 19.5l-63 -234q-8 -32 -8 -38q0 -34 61 -34q131 0 214 61q28 20 47 42t44 64l25 -5l-60 -194h-553v25q39 6 54 20.5t28 59.5l119 432q12 44 12 70q0 15 -9 22.5t-32 10.5l-33 4v25h541z" />
+<glyph unicode="&#x115;" horiz-adv-x="444" d="M439 678h39q-33 -162 -178 -162q-138 0 -138 149v13h43q8 -90 99 -90q50 0 81 20.5t54 69.5zM317 143l29 -17q-78 -139 -195 -139q-67 0 -106.5 37.5t-39.5 109.5q0 124 89.5 226t198.5 102q48 0 76.5 -24t28.5 -63q0 -63 -69 -122q-32 -27 -73.5 -42.5t-114.5 -28.5 q-6 -30 -6 -49q0 -82 64 -82q32 0 57.5 20t60.5 72zM306 390q0 39 -31 39q-71 0 -127 -215q68 15 113 64.5t45 111.5z" />
+<glyph unicode="&#x116;" horiz-adv-x="667" d="M653 669l-43 -190l-27 5q-3 60 -9.5 82t-35.5 41q-47 30 -137 30q-32 0 -45 -9t-22 -42l-59 -216q99 0 134.5 18.5t70.5 88.5l28 -4l-74 -274l-28 4q4 25 4 44q0 52 -30 71.5t-114 19.5l-63 -234q-8 -32 -8 -38q0 -34 61 -34q131 0 214 61q28 20 47 42t44 64l25 -5 l-60 -194h-553v25q39 6 54 20.5t28 59.5l119 432q12 44 12 70q0 15 -9 22.5t-32 10.5l-33 4v25h541zM429 862q27 0 46.5 -19.5t19.5 -46.5q0 -26 -19.5 -45t-46.5 -19q-25 0 -44.5 19t-19.5 45q0 27 19 46.5t45 19.5z" />
+<glyph unicode="&#x117;" horiz-adv-x="444" d="M355 589q0 -26 -19.5 -45t-46.5 -19q-25 0 -44.5 19.5t-19.5 44.5q0 27 19 46.5t45 19.5q27 0 46.5 -19.5t19.5 -46.5zM317 143l29 -17q-78 -139 -195 -139q-67 0 -106.5 37.5t-39.5 109.5q0 124 89.5 226t198.5 102q48 0 76.5 -24t28.5 -63q0 -63 -69 -122 q-32 -27 -73.5 -42.5t-114.5 -28.5q-6 -30 -6 -49q0 -82 64 -82q32 0 57.5 20t60.5 72zM306 390q0 39 -31 39q-71 0 -127 -215q68 15 113 64.5t45 111.5z" />
+<glyph unicode="&#x118;" horiz-adv-x="667" d="M311 0h-338v25q39 6 54 20.5t28 59.5l119 432q12 44 12 70q0 15 -9 22.5t-32 10.5l-33 4v25h541l-43 -190l-27 5q-3 60 -9.5 82t-35.5 41q-47 30 -137 30q-32 0 -45 -9t-22 -42l-59 -216q99 0 134.5 18.5t70.5 88.5l28 -4l-74 -274l-28 4q4 25 4 44q0 52 -30 71.5 t-114 19.5l-63 -234q-8 -32 -8 -38q0 -34 61 -34q131 0 214 61q28 20 47 42t44 64l25 -5l-60 -194h-172q-8 -38 -8 -51q0 -62 61 -62q22 0 48 13l14 7l22 -14q-19 -35 -53 -55t-73 -20q-47 0 -75 21t-28 60q0 24 10.5 45t38.5 56z" />
+<glyph unicode="&#x119;" horiz-adv-x="444" d="M153 -13h-2q-67 0 -106.5 37.5t-39.5 109.5q0 124 89.5 226t198.5 102q48 0 76.5 -24t28.5 -63q0 -63 -69 -122q-32 -27 -73.5 -42.5t-114.5 -28.5q-6 -30 -6 -49q0 -82 64 -82q32 0 57.5 20t60.5 72l29 -17q-60 -108 -141 -132q-7 -28 -7 -45q0 -62 61 -62q22 0 48 13 l14 7l22 -14q-19 -35 -53 -55t-73 -20q-47 0 -75 21t-28 60q0 38 39 88zM148 214q68 15 113 64.5t45 111.5q0 39 -31 39q-71 0 -127 -215z" />
+<glyph unicode="&#x11a;" horiz-adv-x="667" d="M616 897l-162 -174h-82l-88 174h51l90 -97l134 97h57zM653 669l-43 -190l-27 5q-3 60 -9.5 82t-35.5 41q-47 30 -137 30q-32 0 -45 -9t-22 -42l-59 -216q99 0 134.5 18.5t70.5 88.5l28 -4l-74 -274l-28 4q4 25 4 44q0 52 -30 71.5t-114 19.5l-63 -234q-8 -32 -8 -38 q0 -34 61 -34q131 0 214 61q28 20 47 42t44 64l25 -5l-60 -194h-553v25q39 6 54 20.5t28 59.5l119 432q12 44 12 70q0 15 -9 22.5t-32 10.5l-33 4v25h541z" />
+<glyph unicode="&#x11b;" horiz-adv-x="444" d="M486 690l-162 -174h-82l-88 174h51l90 -97l134 97h57zM317 143l29 -17q-78 -139 -195 -139q-67 0 -106.5 37.5t-39.5 109.5q0 124 89.5 226t198.5 102q48 0 76.5 -24t28.5 -63q0 -63 -69 -122q-32 -27 -73.5 -42.5t-114.5 -28.5q-6 -30 -6 -49q0 -82 64 -82q32 0 57.5 20 t60.5 72zM306 390q0 39 -31 39q-71 0 -127 -215q68 15 113 64.5t45 111.5z" />
+<glyph unicode="&#x11c;" horiz-adv-x="722" d="M614 723h-51l-88 95l-131 -95h-57l160 174h81zM705 330v-26q-38 -3 -52 -19t-30 -77l-44 -167l-28 -13q-42 -20 -108.5 -33t-125.5 -13q-133 0 -214.5 74t-81.5 200q0 96 43.5 185t119.5 152q112 92 264 92q64 0 124 -21q24 -9 36 -9q27 0 42 30h31l-51 -221l-29 4 q-3 82 -24 119q-36 62 -115 62q-96 0 -173 -98q-51 -67 -81.5 -155.5t-30.5 -179.5q0 -97 42 -146.5t122 -49.5q73 0 94 30l31 104q27 92 27 114q0 16 -12 24q-14 7 -63 12v26h287z" />
+<glyph unicode="&#x11d;" d="M454 516h-51l-88 95l-131 -95h-57l160 174h81zM477 373h-66q6 -12 6 -42q0 -81 -71 -132q-64 -46 -145 -46q-27 0 -51 8q-10 0 -19 -10t-9 -26q0 -12 15 -23.5t39 -17.5l50 -12q81 -19 115 -47.5t34 -75.5q0 -63 -64.5 -107.5t-172.5 -44.5q-89 0 -139.5 25.5t-50.5 75.5 q0 59 40 83t93 26q-62 21 -62 66q0 30 21 53t75 44q-80 34 -80 110q0 78 62.5 130t155.5 52q75 0 114 -33h110v-56zM300 372q0 59 -45 59q-30 0 -57 -32q-23 -29 -35 -73t-12 -83q0 -59 42 -59q47 0 78 69q29 63 29 119zM266 -100q0 37 -42 58q-17 8 -58.5 21.5t-50.5 14.5 q-7 -1 -24.5 -11t-26.5 -19q-29 -28 -29 -55q0 -35 31.5 -56.5t81.5 -21.5q52 0 85 20.5t33 48.5z" />
+<glyph unicode="&#x11e;" horiz-adv-x="722" d="M579 885h39q-33 -162 -178 -162q-138 0 -138 149v13h43q8 -90 99 -90q50 0 81 20.5t54 69.5zM705 330v-26q-38 -3 -52 -19t-30 -77l-44 -167l-28 -13q-42 -20 -108.5 -33t-125.5 -13q-133 0 -214.5 74t-81.5 200q0 96 43.5 185t119.5 152q112 92 264 92q64 0 124 -21 q24 -9 36 -9q27 0 42 30h31l-51 -221l-29 4q-3 82 -24 119q-36 62 -115 62q-96 0 -173 -98q-51 -67 -81.5 -155.5t-30.5 -179.5q0 -97 42 -146.5t122 -49.5q73 0 94 30l31 104q27 92 27 114q0 16 -12 24q-14 7 -63 12v26h287z" />
+<glyph unicode="&#x11f;" d="M429 678h39q-33 -162 -178 -162q-138 0 -138 149v13h43q8 -90 99 -90q50 0 81 20.5t54 69.5zM477 373h-66q6 -12 6 -42q0 -81 -71 -132q-64 -46 -145 -46q-27 0 -51 8q-10 0 -19 -10t-9 -26q0 -12 15 -23.5t39 -17.5l50 -12q81 -19 115 -47.5t34 -75.5 q0 -63 -64.5 -107.5t-172.5 -44.5q-89 0 -139.5 25.5t-50.5 75.5q0 59 40 83t93 26q-62 21 -62 66q0 30 21 53t75 44q-80 34 -80 110q0 78 62.5 130t155.5 52q75 0 114 -33h110v-56zM300 372q0 59 -45 59q-30 0 -57 -32q-23 -29 -35 -73t-12 -83q0 -59 42 -59q47 0 78 69 q29 63 29 119zM266 -100q0 37 -42 58q-17 8 -58.5 21.5t-50.5 14.5q-7 -1 -24.5 -11t-26.5 -19q-29 -28 -29 -55q0 -35 31.5 -56.5t81.5 -21.5q52 0 85 20.5t33 48.5z" />
+<glyph unicode="&#x120;" horiz-adv-x="722" d="M705 330v-26q-38 -3 -52 -19t-30 -77l-44 -167l-28 -13q-42 -20 -108.5 -33t-125.5 -13q-133 0 -214.5 74t-81.5 200q0 96 43.5 185t119.5 152q112 92 264 92q64 0 124 -21q24 -9 36 -9q27 0 42 30h31l-51 -221l-29 4q-3 82 -24 119q-36 62 -115 62q-96 0 -173 -98 q-51 -67 -81.5 -155.5t-30.5 -179.5q0 -97 42 -146.5t122 -49.5q73 0 94 30l31 104q27 92 27 114q0 16 -12 24q-14 7 -63 12v26h287zM459 862q27 0 46.5 -19.5t19.5 -46.5q0 -26 -19.5 -45t-46.5 -19q-25 0 -44.5 19t-19.5 45q0 27 19 46.5t45 19.5z" />
+<glyph unicode="&#x121;" d="M345 589q0 -26 -19.5 -45t-46.5 -19q-25 0 -44.5 19.5t-19.5 44.5q0 27 19 46.5t45 19.5q27 0 46.5 -19.5t19.5 -46.5zM477 373h-66q6 -12 6 -42q0 -81 -71 -132q-64 -46 -145 -46q-27 0 -51 8q-10 0 -19 -10t-9 -26q0 -12 15 -23.5t39 -17.5l50 -12q81 -19 115 -47.5 t34 -75.5q0 -63 -64.5 -107.5t-172.5 -44.5q-89 0 -139.5 25.5t-50.5 75.5q0 59 40 83t93 26q-62 21 -62 66q0 30 21 53t75 44q-80 34 -80 110q0 78 62.5 130t155.5 52q75 0 114 -33h110v-56zM300 372q0 59 -45 59q-30 0 -57 -32q-23 -29 -35 -73t-12 -83q0 -59 42 -59 q47 0 78 69q29 63 29 119zM266 -100q0 37 -42 58q-17 8 -58.5 21.5t-50.5 14.5q-7 -1 -24.5 -11t-26.5 -19q-29 -28 -29 -55q0 -35 31.5 -56.5t81.5 -21.5q52 0 85 20.5t33 48.5z" />
+<glyph unicode="&#x122;" horiz-adv-x="722" d="M705 330v-26q-38 -3 -52 -19t-30 -77l-44 -167l-28 -13q-42 -20 -108.5 -33t-125.5 -13q-133 0 -214.5 74t-81.5 200q0 96 43.5 185t119.5 152q112 92 264 92q64 0 124 -21q24 -9 36 -9q27 0 42 30h31l-51 -221l-29 4q-3 82 -24 119q-36 62 -115 62q-96 0 -173 -98 q-51 -67 -81.5 -155.5t-30.5 -179.5q0 -97 42 -146.5t122 -49.5q73 0 94 30l31 104q27 92 27 114q0 16 -12 24q-14 7 -63 12v26h287zM171 -359l-13 25q118 63 118 116q0 21 -30 37q-40 23 -40 65q0 32 21 52.5t52 20.5q39 0 61 -26t22 -68q0 -67 -51 -125.5t-140 -96.5z" />
+<glyph unicode="&#x123;" d="M477 373h-66q6 -12 6 -42q0 -81 -71 -132q-64 -46 -145 -46q-27 0 -51 8q-10 0 -19 -10t-9 -26q0 -12 15 -23.5t39 -17.5l50 -12q81 -19 115 -47.5t34 -75.5q0 -63 -64.5 -107.5t-172.5 -44.5q-89 0 -139.5 25.5t-50.5 75.5q0 59 40 83t93 26q-62 21 -62 66q0 30 21 53 t75 44q-80 34 -80 110q0 78 62.5 130t155.5 52q75 0 114 -33h110v-56zM300 372q0 59 -45 59q-30 0 -57 -32q-23 -29 -35 -73t-12 -83q0 -59 42 -59q47 0 78 69q29 63 29 119zM266 -100q0 37 -42 58q-17 8 -58.5 21.5t-50.5 14.5q-7 -1 -24.5 -11t-26.5 -19q-29 -28 -29 -55 q0 -35 31.5 -56.5t81.5 -21.5q52 0 85 20.5t33 48.5zM370 832l13 -25q-118 -63 -118 -116q0 -21 30 -37q40 -22 40 -65q0 -35 -20.5 -54t-52.5 -19q-39 0 -61 26t-22 68q0 67 51 125.5t140 96.5z" />
+<glyph unicode="&#x124;" horiz-adv-x="778" d="M634 723h-51l-88 95l-131 -95h-57l160 174h81zM799 669v-25q-36 0 -53.5 -16.5t-28.5 -57.5l-111 -408q-22 -84 -22 -96q0 -22 16 -30.5t57 -10.5v-25h-316v25q51 3 70 17.5t32 61.5l62 225h-239l-54 -197q-12 -43 -12 -67q0 -34 71 -40v-25h-295v25q39 5 54 18.5 t27 55.5l121 447q11 38 11 58q0 17 -9.5 25t-32.5 11l-31 4v25h316v-25q-49 -2 -69 -17t-33 -63l-52 -191h239l47 173q10 38 10 61q0 15 -9 22.5t-32 10.5l-31 4v25h297z" />
+<glyph unicode="&#x125;" horiz-adv-x="556" d="M494 723h-51l-88 95l-131 -95h-57l160 174h81zM476 142l22 -15q-50 -77 -85.5 -106.5t-81.5 -29.5q-30 0 -48 17t-18 47t11 70t50 155l20 59q7 21 7 30q0 21 -20 21q-42 0 -106 -94q-36 -53 -58 -108t-61 -188h-121l152 562q10 37 10 47q0 33 -42 33h-22v27q99 9 209 30 l-108 -416q74 105 118 142t95 37q37 0 56.5 -20t19.5 -55q0 -28 -29 -118l-59 -182q-3 -8 -3 -12q0 -5 5.5 -10.5t11.5 -5.5q17 0 75 83z" />
+<glyph unicode="&#x126;" horiz-adv-x="778" d="M62 496v44h114q13 44 13 64q0 17 -9.5 25t-32.5 11l-31 4v25h316v-25q-49 -2 -68.5 -17t-33.5 -63l-7 -24h239q12 43 12 67q0 15 -9 22.5t-32 10.5l-31 4v25h297v-25q-36 0 -53.5 -16.5t-28.5 -57.5l-8 -30h91v-44h-103l-91 -334q-22 -84 -22 -96q0 -22 16 -30.5 t57 -10.5v-25h-316v25q51 3 70 17.5t32 61.5l62 225h-239l-54 -197q-12 -43 -12 -67q0 -34 71 -40v-25h-295v25q39 5 54 18.5t27 55.5l107 397h-102zM278 373h239l33 123h-239z" />
+<glyph unicode="&#x127;" horiz-adv-x="556" d="M65 514l12 44h61q11 39 11 51q0 33 -42 33h-22v27q99 9 209 30l-37 -141h159l-12 -44h-158l-60 -231q74 105 118 142t95 37q37 0 56.5 -20t19.5 -55q0 -28 -29 -118l-59 -182q-3 -8 -3 -12q0 -5 5.5 -10.5t11.5 -5.5q17 0 75 83l22 -15q-50 -77 -85.5 -106.5t-81.5 -29.5 q-30 0 -48 17t-18 47t11 70t50 155l20 59q7 21 7 30q0 21 -20 21q-42 0 -106 -94q-36 -53 -58 -108t-61 -188h-121l139 514h-61z" />
+<glyph unicode="&#x128;" horiz-adv-x="389" d="M429 862h41q-16 -63 -44 -91t-73 -28q-25 0 -57 13l-59 23q-21 8 -38 8q-31 0 -48 -43h-40q10 54 41.5 86t74.5 32q38 0 97 -26q39 -16 54 -16q17 0 28.5 9t22.5 33zM406 669v-25q-38 -4 -55 -19t-29 -61l-112 -412q-17 -62 -17 -87q0 -21 14.5 -29.5t56.5 -10.5v-25 h-296v25q39 5 54 18t29 64l117 429q14 51 14 71q0 28 -42 33l-32 4v25h298z" />
+<glyph unicode="&#x129;" horiz-adv-x="278" d="M309 655h41q-16 -63 -44 -91t-73 -28q-25 0 -57 13l-59 23q-21 8 -38 8q-31 0 -48 -43h-40q10 54 41.5 86t74.5 32q38 0 97 -26q39 -16 54 -16q17 0 28.5 9t22.5 33zM216 142l22 -14q-48 -79 -85 -108t-83 -29q-68 0 -68 63q0 22 15 76l55 203q8 32 8 45q0 29 -46 29h-14 v27q118 9 203 28l-91 -334q-9 -31 -9 -51q0 -16 15 -16q21 0 64 61z" />
+<glyph unicode="&#x12a;" horiz-adv-x="389" d="M451 793l-16 -70h-326l17 70h325zM406 669v-25q-38 -4 -55 -19t-29 -61l-112 -412q-17 -62 -17 -87q0 -21 14.5 -29.5t56.5 -10.5v-25h-296v25q39 5 54 18t29 64l117 429q14 51 14 71q0 28 -42 33l-32 4v25h298z" />
+<glyph unicode="&#x12b;" horiz-adv-x="278" d="M216 142l22 -14q-48 -79 -85 -108t-83 -29q-68 0 -68 63q0 22 15 76l55 203q8 32 8 45q0 29 -46 29h-14v27q118 9 203 28l-91 -334q-9 -31 -9 -51q0 -16 15 -16q21 0 64 61zM331 586l-16 -70h-326l17 70h325z" />
+<glyph unicode="&#x12c;" horiz-adv-x="389" d="M419 885h39q-33 -162 -178 -162q-138 0 -138 149v13h43q8 -90 99 -90q50 0 81 20.5t54 69.5zM406 669v-25q-38 -4 -55 -19t-29 -61l-112 -412q-17 -62 -17 -87q0 -21 14.5 -29.5t56.5 -10.5v-25h-296v25q39 5 54 18t29 64l117 429q14 51 14 71q0 28 -42 33l-32 4v25h298z " />
+<glyph unicode="&#x12d;" horiz-adv-x="278" d="M289 678h39q-33 -162 -178 -162q-138 0 -138 149v13h43q8 -90 99 -90q50 0 81 20.5t54 69.5zM216 142l22 -14q-48 -79 -85 -108t-83 -29q-68 0 -68 63q0 22 15 76l55 203q8 32 8 45q0 29 -46 29h-14v27q118 9 203 28l-91 -334q-9 -31 -9 -51q0 -16 15 -16q21 0 64 61z " />
+<glyph unicode="&#x12e;" horiz-adv-x="389" d="M90 0h-122v25q39 5 54 18t29 64l117 429q14 51 14 71q0 28 -42 33l-32 4v25h298v-25q-38 -4 -55 -19t-29 -61l-112 -412q-17 -62 -17 -87q0 -21 14.5 -29.5t56.5 -10.5v-25h-126q-6 -28 -6 -42q0 -62 61 -62q22 0 48 13l14 7l22 -14q-19 -35 -53 -55t-73 -20 q-47 0 -75 21t-28 60t42 92z" />
+<glyph unicode="&#x12f;" horiz-adv-x="278" d="M222 -84l22 -14q-19 -35 -53 -55t-73 -20q-47 0 -75 21t-28 60q0 37 36 85q-49 8 -49 61q0 22 15 76l55 203q8 32 8 45q0 29 -46 29h-14v27q118 9 203 28l-91 -334q-9 -31 -9 -51q0 -16 15 -16q21 0 64 61l14 20l22 -14q-40 -64 -70.5 -94.5t-63.5 -38.5q-5 -27 -5 -37 q0 -62 61 -62q22 0 48 13zM193 684q28 0 48.5 -20t20.5 -48t-19.5 -47t-48.5 -19q-28 0 -47 20t-19 49q0 25 20 45t45 20z" />
+<glyph unicode="&#x130;" horiz-adv-x="389" d="M406 669v-25q-38 -4 -55 -19t-29 -61l-112 -412q-17 -62 -17 -87q0 -21 14.5 -29.5t56.5 -10.5v-25h-296v25q39 5 54 18t29 64l117 429q14 51 14 71q0 28 -42 33l-32 4v25h298zM279 862q27 0 46.5 -19.5t19.5 -46.5q0 -26 -19.5 -45t-46.5 -19q-25 0 -44.5 19t-19.5 45 q0 27 19 46.5t45 19.5z" />
+<glyph unicode="&#x131;" horiz-adv-x="278" d="M216 142l22 -14q-48 -79 -85 -108t-83 -29q-68 0 -68 63q0 22 15 76l55 203q8 32 8 45q0 29 -46 29h-14v27q118 9 203 28l-91 -334q-9 -31 -9 -51q0 -16 15 -16q21 0 64 61z" />
+<glyph unicode="&#x134;" d="M554 723h-51l-88 95l-131 -95h-57l160 174h81zM524 669v-25q-40 -5 -55.5 -19t-29.5 -66l-122 -457q-26 -99 -82 -150t-133 -51q-67 0 -107.5 26.5t-40.5 74.5q0 30 18.5 51t45.5 21t45 -18t18 -47q0 -17 -11.5 -32t-11.5 -22q0 -18 27 -18t43.5 32t44.5 138l114 432 q13 51 13 64q0 29 -41 36l-33 5v25h298z" />
+<glyph unicode="&#x135;" horiz-adv-x="278" d="M314 516h-51l-88 95l-131 -95h-57l160 174h81zM202 322l-79 -304q-31 -119 -81 -172t-126 -53q-47 0 -76 22t-29 55q0 22 14.5 37.5t34.5 15.5q22 0 35.5 -13.5t13.5 -35.5q0 -11 -7.5 -20t-7.5 -15q0 -15 24 -15q21 0 38 31t36 105l89 350q12 45 12 67q0 30 -41 30h-22 v27q136 12 209 28z" />
+<glyph unicode="&#x136;" horiz-adv-x="667" d="M702 669v-25q-33 -5 -47.5 -12t-46.5 -36l-216 -199l157 -333q9 -19 22 -27.5t41 -11.5v-25h-280l1 25l26 4q21 3 29.5 8t8.5 15q0 16 -15 49l-111 236l-67 -249q-2 -10 -2 -17q0 -25 13 -34t52 -12v-25h-288v25q36 4 52.5 17t26.5 51l123 453q11 38 11 58q0 17 -9 25 t-32 11l-33 4v25h311v-25q-45 -4 -64.5 -18.5t-29.5 -53.5l-62 -227l197 175q77 68 77 97q0 22 -35 25l-21 2v25h211zM161 -359l-13 25q118 63 118 116q0 21 -30 37q-40 23 -40 65q0 32 21 52.5t52 20.5q39 0 61 -26t22 -68q0 -67 -51 -125.5t-140 -96.5z" />
+<glyph unicode="&#x137;" d="M483 449v-25q-37 -5 -61.5 -18.5t-73.5 -57.5l-64 -58q19 -95 33 -145.5t24 -66t22 -15.5q28 0 64 64l22 -11q-32 -68 -65 -96t-73 -28q-47 0 -72.5 46.5t-50.5 176.5l-39 -27l-50 -188h-122l157 566q7 24 7 42q0 20 -7 27t-23 7h-34v27q96 5 209 30l-124 -461 q95 75 130 109.5t35 53.5q0 12 -10.5 16.5t-39.5 6.5v25h206zM51 -359l-13 25q118 63 118 116q0 21 -30 37q-40 23 -40 65q0 32 21 52.5t52 20.5q39 0 61 -26t22 -68q0 -67 -51 -125.5t-140 -96.5z" />
+<glyph unicode="&#x138;" horiz-adv-x="600" d="M614 0h-168q-40 5 -69 76q-7 17 -13.5 47t-17.5 56q-15 39 -56 54q-5 -1 -27 -1l-40 -145q-7 -26 -7 -37q0 -25 42 -26l-7 -24h-245l7 24q29 7 44 19t23 43l84 305q4 12 4 24q0 28 -41 31l7 24h245l-7 -24q-33 -5 -45 -14.5t-21 -41.5l-29 -108q23 0 39 3q76 16 102 32 q51 31 90 88q29 42 46.5 53.5t63.5 11.5q28 0 49.5 -17t21.5 -39q0 -20 -14 -31t-36 -11q-19 0 -30.5 10t-18.5 20t-16 10q-21 0 -38 -28q-46 -74 -108 -112q21 -8 33 -34q6 -14 24.5 -69t24.5 -69q14 -37 37.5 -54t73.5 -22z" />
+<glyph unicode="&#x139;" horiz-adv-x="611" d="M262 723l122 131q47 50 70 50q20 0 34 -14t14 -33q0 -14 -8.5 -24t-30.5 -23l-152 -87h-49zM590 195l-60 -195h-552v25q40 5 55 20.5t27 57.5l121 443q11 42 11 61q0 15 -9 22t-32 10q-20 4 -34 5v25h318v-25q-50 -3 -69.5 -16.5t-29.5 -53.5l-129 -473q-6 -24 -6 -39 q0 -30 72 -30q104 0 178 45q38 23 61.5 48.5t53.5 74.5z" />
+<glyph unicode="&#x13a;" horiz-adv-x="278" d="M104 723l122 131q47 50 70 50q20 0 34 -14t14 -33q0 -14 -8.5 -24t-30.5 -23l-152 -87h-49zM290 699l-145 -523q-22 -79 -22 -100q0 -15 15 -15q25 0 79 80l22 -14q-52 -80 -87 -108t-82 -28q-30 0 -49 18t-19 45q0 34 34 155l74 259q34 118 34 145q0 30 -42 30 q-11 0 -22 -1v27q98 9 210 30z" />
+<glyph unicode="&#x13b;" horiz-adv-x="611" d="M590 195l-60 -195h-552v25q40 5 55 20.5t27 57.5l121 443q11 42 11 61q0 15 -9 22t-32 10q-20 4 -34 5v25h318v-25q-50 -3 -69.5 -16.5t-29.5 -53.5l-129 -473q-6 -24 -6 -39q0 -30 72 -30q104 0 178 45q38 23 61.5 48.5t53.5 74.5zM141 -359l-13 25q118 63 118 116 q0 21 -30 37q-40 23 -40 65q0 32 21 52.5t52 20.5q39 0 61 -26t22 -68q0 -67 -51 -125.5t-140 -96.5z" />
+<glyph unicode="&#x13c;" horiz-adv-x="278" d="M290 699l-145 -523q-22 -79 -22 -100q0 -15 15 -15q25 0 79 80l22 -14q-52 -80 -87 -108t-82 -28q-30 0 -49 18t-19 45q0 34 34 155l74 259q34 118 34 145q0 30 -42 30q-11 0 -22 -1v27q98 9 210 30zM-49 -359l-13 25q118 63 118 116q0 21 -30 37q-40 23 -40 65 q0 32 21 52.5t52 20.5q39 0 61 -26t22 -68q0 -67 -51 -125.5t-140 -96.5z" />
+<glyph unicode="&#x13d;" horiz-adv-x="611" d="M476 369l-13 25q118 63 118 116q0 21 -30 37q-40 23 -40 65q0 35 20.5 54t52.5 19q39 0 61 -26t22 -68q0 -67 -51 -125.5t-140 -96.5zM590 195l-60 -195h-552v25q40 5 55 20.5t27 57.5l121 443q11 42 11 61q0 15 -9 22t-32 10q-20 4 -34 5v25h318v-25q-50 -3 -69.5 -16.5 t-29.5 -53.5l-129 -473q-6 -24 -6 -39q0 -30 72 -30q104 0 178 45q38 23 61.5 48.5t53.5 74.5z" />
+<glyph unicode="&#x13e;" horiz-adv-x="451" d="M290 699l-145 -523q-22 -79 -22 -100q0 -15 15 -15q25 0 79 80l22 -14q-52 -80 -87 -108t-82 -28q-30 0 -49 18t-19 45q0 34 34 155l74 259q34 118 34 145q0 30 -42 30q-11 0 -22 -1v27q98 9 210 30zM308 394l-13 25q118 63 118 116q0 21 -30 37q-40 22 -40 65 q0 35 20.5 54t52.5 19q39 0 61 -26t22 -68q0 -67 -51 -125.5t-140 -96.5z" />
+<glyph unicode="&#x13f;" horiz-adv-x="611" d="M488 335q0 -31 -21.5 -52.5t-53.5 -21.5q-31 0 -52 21t-21 53t21.5 53t53.5 21q30 0 51.5 -22t21.5 -52zM590 195l-60 -195h-552v25q40 5 55 20.5t27 57.5l121 443q11 42 11 61q0 15 -9 22t-32 10q-20 4 -34 5v25h318v-25q-50 -3 -69.5 -16.5t-29.5 -53.5l-129 -473 q-6 -24 -6 -39q0 -30 72 -30q104 0 178 45q38 23 61.5 48.5t53.5 74.5z" />
+<glyph unicode="&#x140;" horiz-adv-x="375" d="M382 328q0 -31 -21.5 -52.5t-53.5 -21.5q-31 0 -52 21t-21 53t21.5 53t53.5 21q30 0 51.5 -22t21.5 -52zM290 699l-145 -523q-22 -79 -22 -100q0 -15 15 -15q25 0 79 80l22 -14q-52 -80 -87 -108t-82 -28q-30 0 -49 18t-19 45q0 34 34 155l74 259q34 118 34 145 q0 30 -42 30q-11 0 -22 -1v27q98 9 210 30z" />
+<glyph unicode="&#x141;" horiz-adv-x="611" d="M590 194l-60 -194h-552v25q38 5 53.5 19t26.5 53l50 182l-104 -56l22 70l100 53l55 200q10 38 10 61q0 15 -8.5 21.5t-32.5 10.5l-32 5v25h317v-25q-50 -3 -69.5 -17t-31.5 -58l-44 -158l150 81l-21 -70l-148 -83l-66 -245q-5 -18 -5 -30q0 -32 69 -32q115 0 181 44 q38 25 61 50t55 73z" />
+<glyph unicode="&#x142;" horiz-adv-x="278" d="M216 141l22 -14q-50 -78 -84.5 -107t-82.5 -29q-69 0 -69 62q0 44 62 257l-77 -43l19 70l78 43q60 216 60 235q0 28 -42 28q-12 0 -22 -1v27q98 9 210 30l-75 -271l86 47l-19 -68l-86 -47l-51 -184q-22 -82 -22 -100q0 -6 5 -10.5t11 -4.5q13 0 29.5 17.5t47.5 62.5z" />
+<glyph unicode="&#x143;" horiz-adv-x="722" d="M350 723l122 131q47 50 70 50q20 0 34 -14t14 -33q0 -14 -8.5 -24t-30.5 -23l-152 -87h-49zM748 669v-25q-42 -8 -58.5 -32.5t-43.5 -120.5l-143 -506h-28l-257 547l-99 -354q-19 -66 -19 -94q0 -29 17.5 -42t61.5 -17v-25h-206v25q42 8 56 30t45 125l120 407 q-15 34 -28.5 43.5t-53.5 13.5v25h193l216 -467l81 289q19 71 19 94q0 59 -81 59v25h208z" />
+<glyph unicode="&#x144;" horiz-adv-x="556" d="M161 516l122 131q47 50 70 50q20 0 34 -14t14 -33q0 -14 -8.5 -24t-30.5 -23l-152 -87h-49zM472 135l22 -13q-41 -72 -77.5 -101.5t-82.5 -29.5q-68 0 -68 60q0 47 26 125l55 165q7 23 7 28q0 21 -25 21q-13 0 -33 -16.5t-36 -37.5q-47 -62 -79 -135t-66 -201h-121 l57 204q45 164 45 179q0 14 -11.5 18.5t-43.5 5.5v27q90 3 199 27l-62 -198h1q51 75 73 103.5t49 54.5q43 41 100 41q73 0 73 -77q0 -34 -28 -116l-35 -104q-24 -71 -24 -89q0 -17 14 -17q13 0 27 15t44 61z" />
+<glyph unicode="&#x145;" horiz-adv-x="722" d="M748 669v-25q-42 -8 -58.5 -32.5t-43.5 -120.5l-143 -506h-28l-257 547l-99 -354q-19 -66 -19 -94q0 -29 17.5 -42t61.5 -17v-25h-206v25q42 8 56 30t45 125l120 407q-15 34 -28.5 43.5t-53.5 13.5v25h193l216 -467l81 289q19 71 19 94q0 59 -81 59v25h208zM141 -359 l-13 25q118 63 118 116q0 21 -30 37q-40 23 -40 65q0 32 21 52.5t52 20.5q39 0 61 -26t22 -68q0 -67 -51 -125.5t-140 -96.5z" />
+<glyph unicode="&#x146;" horiz-adv-x="556" d="M472 135l22 -13q-41 -72 -77.5 -101.5t-82.5 -29.5q-68 0 -68 60q0 47 26 125l55 165q7 23 7 28q0 21 -25 21q-13 0 -33 -16.5t-36 -37.5q-47 -62 -79 -135t-66 -201h-121l57 204q45 164 45 179q0 14 -11.5 18.5t-43.5 5.5v27q90 3 199 27l-62 -198h1q51 75 73 103.5 t49 54.5q43 41 100 41q73 0 73 -77q0 -34 -28 -116l-35 -104q-24 -71 -24 -89q0 -17 14 -17q13 0 27 15t44 61zM81 -359l-13 25q118 63 118 116q0 21 -30 37q-40 23 -40 65q0 32 21 52.5t52 20.5q39 0 61 -26t22 -68q0 -67 -51 -125.5t-140 -96.5z" />
+<glyph unicode="&#x147;" horiz-adv-x="722" d="M636 897l-162 -174h-82l-88 174h51l90 -97l134 97h57zM748 669v-25q-42 -8 -58.5 -32.5t-43.5 -120.5l-143 -506h-28l-257 547l-99 -354q-19 -66 -19 -94q0 -29 17.5 -42t61.5 -17v-25h-206v25q42 8 56 30t45 125l120 407q-15 34 -28.5 43.5t-53.5 13.5v25h193l216 -467 l81 289q19 71 19 94q0 59 -81 59v25h208z" />
+<glyph unicode="&#x148;" horiz-adv-x="556" d="M506 690l-162 -174h-82l-88 174h51l90 -97l134 97h57zM472 135l22 -13q-41 -72 -77.5 -101.5t-82.5 -29.5q-68 0 -68 60q0 47 26 125l55 165q7 23 7 28q0 21 -25 21q-13 0 -33 -16.5t-36 -37.5q-47 -62 -79 -135t-66 -201h-121l57 204q45 164 45 179q0 14 -11.5 18.5 t-43.5 5.5v27q90 3 199 27l-62 -198h1q51 75 73 103.5t49 54.5q43 41 100 41q73 0 73 -77q0 -34 -28 -116l-35 -104q-24 -71 -24 -89q0 -17 14 -17q13 0 27 15t44 61z" />
+<glyph unicode="&#x149;" horiz-adv-x="700" d="M635 135l22 -13q-41 -72 -77.5 -101.5t-82.5 -29.5q-68 0 -68 60q0 47 26 125l55 165q7 23 7 28q0 21 -25 21q-13 0 -33 -16.5t-36 -37.5q-47 -62 -79 -135t-66 -201h-121l57 204q45 164 45 179q0 14 -11.5 18.5t-43.5 5.5v27q90 3 199 27l-62 -198h1q51 75 73 103.5 t49 54.5q43 41 100 41q73 0 73 -77q0 -34 -28 -116l-35 -104q-24 -71 -24 -89q0 -17 14 -17q13 0 27 15t44 61zM55 394l-13 25q118 63 118 116q0 21 -30 37q-40 22 -40 65q0 35 20.5 54t52.5 19q39 0 61 -26t22 -68q0 -67 -51 -125.5t-140 -96.5z" />
+<glyph unicode="&#x14a;" horiz-adv-x="722" d="M94 669h290q141 0 221 -70.5t80 -193.5q0 -81 -30.5 -184.5t-81 -198.5t-128.5 -160t-162 -65q-67 0 -107.5 26.5t-40.5 74.5q0 30 18.5 51t45.5 21t45 -18t18 -47q0 -17 -11.5 -32t-11.5 -22q0 -18 27 -18q46 0 110.5 98t113 248t48.5 278q0 181 -165 181 q-25 0 -37 -8.5t-18 -29.5l-168 -600h-196v25q37 5 53.5 21.5t29.5 62.5l115 422q15 53 15 71t-8.5 26t-30.5 11l-34 5v25z" />
+<glyph unicode="&#x14b;" horiz-adv-x="543" d="M249 -38l95 354q10 35 10 53q0 21 -25 21q-13 0 -33 -16.5t-36 -37.5q-47 -62 -79 -135t-66 -201h-121l57 204q45 164 45 179q0 14 -11.5 19t-43.5 5v27q94 3 199 27l-62 -198h1q51 75 73 103.5t49 54.5q43 41 100 41q73 0 73 -77q0 -24 -88 -361q-31 -119 -82 -175 t-127 -56q-47 0 -76 22t-29 55q0 22 14.5 37.5t34.5 15.5q22 0 35.5 -13.5t13.5 -35.5q0 -11 -7.5 -20t-7.5 -15q0 -15 24 -15q20 0 34.5 29.5t35.5 108.5z" />
+<glyph unicode="&#x14c;" horiz-adv-x="722" d="M651 793l-16 -70h-326l17 70h325zM691 444q0 -95 -49.5 -194.5t-130.5 -171.5q-108 -96 -248 -96q-108 0 -172 62.5t-64 176.5q0 101 51 202.5t135 169.5q114 92 236 92q104 0 173 -66.5t69 -174.5zM547 528q0 60 -27 91.5t-74 31.5q-91 0 -162 -120 q-46 -78 -79.5 -189.5t-33.5 -198.5q0 -57 27.5 -92t74.5 -35q46 0 82 28t75 86q49 72 83 191t34 207z" />
+<glyph unicode="&#x14d;" d="M461 586l-16 -70h-326l17 70h325zM280 462h4q73 0 115 -41t42 -110t-29 -135.5t-76 -113.5q-75 -75 -175 -75q-73 0 -118.5 38.5t-45.5 109.5q0 73 27 139t73 111q79 77 183 77zM322 372q0 28 -12.5 44.5t-34.5 16.5q-32 0 -60 -31q-43 -48 -71 -144.5t-28 -177.5 q0 -64 49 -64q41 0 71 49q36 59 61 149.5t25 157.5z" />
+<glyph unicode="&#x14e;" horiz-adv-x="722" d="M629 885h39q-33 -162 -178 -162q-138 0 -138 149v13h43q8 -90 99 -90q50 0 81 20.5t54 69.5zM691 444q0 -95 -49.5 -194.5t-130.5 -171.5q-108 -96 -248 -96q-108 0 -172 62.5t-64 176.5q0 101 51 202.5t135 169.5q114 92 236 92q104 0 173 -66.5t69 -174.5zM547 528 q0 60 -27 91.5t-74 31.5q-91 0 -162 -120q-46 -78 -79.5 -189.5t-33.5 -198.5q0 -57 27.5 -92t74.5 -35q46 0 82 28t75 86q49 72 83 191t34 207z" />
+<glyph unicode="&#x14f;" d="M449 678h39q-33 -162 -178 -162q-138 0 -138 149v13h43q8 -90 99 -90q50 0 81 20.5t54 69.5zM280 462h4q73 0 115 -41t42 -110t-29 -135.5t-76 -113.5q-75 -75 -175 -75q-73 0 -118.5 38.5t-45.5 109.5q0 73 27 139t73 111q79 77 183 77zM322 372q0 28 -12.5 44.5 t-34.5 16.5q-32 0 -60 -31q-43 -48 -71 -144.5t-28 -177.5q0 -64 49 -64q41 0 71 49q36 59 61 149.5t25 157.5z" />
+<glyph unicode="&#x150;" horiz-adv-x="722" d="M460 723l122 133q43 48 70 48q20 0 34 -14t14 -33q0 -27 -39 -49l-151 -85h-50zM271 723l122 133q43 48 70 48q20 0 34 -13t14 -32q0 -29 -39 -51l-149 -85h-52zM691 444q0 -95 -49.5 -194.5t-130.5 -171.5q-108 -96 -248 -96q-108 0 -172 62.5t-64 176.5q0 101 51 202.5 t135 169.5q114 92 236 92q104 0 173 -66.5t69 -174.5zM547 528q0 60 -27 91.5t-74 31.5q-91 0 -162 -120q-46 -78 -79.5 -189.5t-33.5 -198.5q0 -57 27.5 -92t74.5 -35q46 0 82 28t75 86q49 72 83 191t34 207z" />
+<glyph unicode="&#x151;" d="M279 516l122 133q43 48 70 48q20 0 34 -14t14 -33q0 -27 -39 -49l-151 -85h-50zM90 516l122 133q43 48 70 48q20 0 34 -13t14 -32q0 -29 -39 -51l-149 -85h-52zM280 462h4q73 0 115 -41t42 -110t-29 -135.5t-76 -113.5q-75 -75 -175 -75q-73 0 -118.5 38.5t-45.5 109.5 q0 73 27 139t73 111q79 77 183 77zM322 372q0 28 -12.5 44.5t-34.5 16.5q-32 0 -60 -31q-43 -48 -71 -144.5t-28 -177.5q0 -64 49 -64q41 0 71 49q36 59 61 149.5t25 157.5z" />
+<glyph unicode="&#x152;" horiz-adv-x="944" d="M946 669l-46 -191l-25 6q2 28 2 37q0 59 -40 87q-41 29 -125 29q-26 0 -35.5 -8t-17.5 -39l-61 -220h25q67 0 103.5 23t60.5 80l27 -3l-72 -272l-27 5l1 19q0 7 1.5 21.5t1.5 19.5q0 31 -21 48q-11 10 -31.5 14.5t-77.5 10.5l-64 -245q-4 -18 -4 -25q0 -34 73 -34 q88 0 146.5 38t110.5 129l27 -5l-60 -194h-324q-34 0 -102 -4t-98 -4h-18q-120 0 -184 57q-69 61 -69 175q0 108 55 212.5t146 170.5q53 38 107 54t133 16q26 0 56 -3q70 -5 91 -5h335zM392 123l108 391q12 46 12 69q0 62 -73 62q-90 0 -161 -106q-46 -68 -80 -181.5 t-34 -199.5q0 -60 33 -96.5t88 -36.5q43 0 67.5 22.5t39.5 75.5z" />
+<glyph unicode="&#x153;" horiz-adv-x="722" d="M591 139l28 -15q-31 -64 -72 -97q-52 -40 -116 -40q-63 0 -117 57q-63 -57 -148 -57q-71 0 -115.5 43.5t-44.5 113.5q0 61 29 127t75 112q80 79 190 79q40 0 66 -14t50 -48q44 35 75.5 48.5t70.5 13.5q52 0 82 -24.5t30 -65.5q0 -71 -87 -127q-36 -23 -68 -35t-105 -26 q-8 -39 -8 -56q0 -78 67 -78q35 0 59.5 18.5t58.5 70.5zM421 218q59 17 90.5 38.5t52.5 58.5q22 41 22 77q0 40 -37 40q-22 0 -36 -16q-26 -30 -43.5 -65.5t-48.5 -132.5zM282 433q-48 0 -86 -74q-27 -51 -49.5 -130.5t-22.5 -131.5q0 -81 53 -81q52 0 97 97q22 48 42.5 128 t20.5 118q0 74 -55 74z" />
+<glyph unicode="&#x154;" horiz-adv-x="667" d="M280 723l122 131q47 50 70 50q20 0 34 -14t14 -33q0 -14 -8.5 -24t-30.5 -23l-152 -87h-49zM110 669h286q227 0 227 -143q0 -92 -96 -151q-31 -19 -96 -32l85 -254q12 -36 28.5 -48t58.5 -16v-25h-202l-107 331h-30l-52 -182q-18 -62 -18 -82q0 -22 14 -30.5t58 -11.5 v-25h-294v25q36 4 53 21.5t29 62.5l120 437q10 38 10 61q0 16 -9 24t-33 10l-32 3v25zM330 583l-57 -220q91 1 127 25q33 20 52.5 62t19.5 92q0 46 -21 70.5t-61 24.5q-25 0 -38 -10.5t-22 -43.5z" />
+<glyph unicode="&#x155;" horiz-adv-x="389" d="M139 516l122 131q47 50 70 50q20 0 34 -14t14 -33q0 -14 -8.5 -24t-30.5 -23l-152 -87h-49zM160 253h1q60 121 95.5 165t75.5 44q26 0 41.5 -18t15.5 -48q0 -31 -16.5 -52t-41.5 -21q-22 0 -37.5 19t-23.5 19q-23 0 -65 -76q-36 -65 -74 -186l-31 -99h-121 q102 345 102 382q0 14 -11.5 19.5t-44.5 5.5v27q131 11 200 28z" />
+<glyph unicode="&#x156;" horiz-adv-x="667" d="M110 669h286q227 0 227 -143q0 -92 -96 -151q-31 -19 -96 -32l85 -254q12 -36 28.5 -48t58.5 -16v-25h-202l-107 331h-30l-52 -182q-18 -62 -18 -82q0 -22 14 -30.5t58 -11.5v-25h-294v25q36 4 53 21.5t29 62.5l120 437q10 38 10 61q0 16 -9 24t-33 10l-32 3v25zM330 583 l-57 -220q91 1 127 25q33 20 52.5 62t19.5 92q0 46 -21 70.5t-61 24.5q-25 0 -38 -10.5t-22 -43.5zM140 -359l-13 25q118 63 118 116q0 21 -30 37q-40 23 -40 65q0 32 21 52.5t52 20.5q39 0 61 -26t22 -68q0 -67 -51 -125.5t-140 -96.5z" />
+<glyph unicode="&#x157;" horiz-adv-x="389" d="M160 253h1q60 121 95.5 165t75.5 44q26 0 41.5 -18t15.5 -48q0 -31 -16.5 -52t-41.5 -21q-22 0 -37.5 19t-23.5 19q-23 0 -65 -76q-36 -65 -74 -186l-31 -99h-121q102 345 102 382q0 14 -11.5 19.5t-44.5 5.5v27q131 11 200 28zM-89 -359l-13 25q118 63 118 116 q0 21 -30 37q-40 23 -40 65q0 32 21 52.5t52 20.5q39 0 61 -26t22 -68q0 -67 -51 -125.5t-140 -96.5z" />
+<glyph unicode="&#x158;" horiz-adv-x="667" d="M566 897l-162 -174h-82l-88 174h51l90 -97l134 97h57zM110 669h286q227 0 227 -143q0 -92 -96 -151q-31 -19 -96 -32l85 -254q12 -36 28.5 -48t58.5 -16v-25h-202l-107 331h-30l-52 -182q-18 -62 -18 -82q0 -22 14 -30.5t58 -11.5v-25h-294v25q36 4 53 21.5t29 62.5 l120 437q10 38 10 61q0 16 -9 24t-33 10l-32 3v25zM330 583l-57 -220q91 1 127 25q33 20 52.5 62t19.5 92q0 46 -21 70.5t-61 24.5q-25 0 -38 -10.5t-22 -43.5z" />
+<glyph unicode="&#x159;" horiz-adv-x="389" d="M411 690l-162 -174h-82l-88 174h51l90 -97l134 97h57zM160 253h1q60 121 95.5 165t75.5 44q26 0 41.5 -18t15.5 -48q0 -31 -16.5 -52t-41.5 -21q-22 0 -37.5 19t-23.5 19q-23 0 -65 -76q-36 -65 -74 -186l-31 -99h-121q102 345 102 382q0 14 -11.5 19.5t-44.5 5.5v27 q131 11 200 28z" />
+<glyph unicode="&#x15a;" horiz-adv-x="556" d="M200 723l122 131q47 50 70 50q20 0 34 -14t14 -33q0 -14 -8.5 -24t-30.5 -23l-152 -87h-49zM526 681l-40 -202l-27 4q-9 76 -22 101q-33 66 -116 66q-41 0 -69.5 -29t-28.5 -76q0 -41 22.5 -66.5t84.5 -70.5q80 -58 109 -104t29 -113q0 -63 -29 -110.5t-81 -73.5 q-52 -25 -120 -25q-53 0 -122 24q-32 11 -46 11t-21.5 -6.5t-16.5 -28.5h-30l36 225l29 -2q7 -54 16 -84t32 -55q44 -50 106 -50q56 0 89 34q37 37 37 92q0 43 -25.5 75.5t-89.5 78.5q-66 47 -98 92.5t-32 105.5q0 84 58.5 137.5t145.5 53.5q50 0 91.5 -15t54.5 -15 q31 0 44 26h30z" />
+<glyph unicode="&#x15b;" horiz-adv-x="389" d="M139 516l122 131q47 50 70 50q20 0 34 -14t14 -33q0 -14 -8.5 -24t-30.5 -23l-152 -87h-49zM333 461l-23 -154l-27 2q-12 63 -33 91.5t-55 28.5q-24 0 -38.5 -14.5t-14.5 -38.5q0 -33 57 -99q80 -93 80 -162q0 -56 -43 -92t-105 -36q-35 0 -64 12q-21 8 -30 8 q-20 0 -29 -20h-27l22 166l27 -3q17 -133 93 -133q29 0 44.5 14.5t15.5 39.5q0 41 -56 104q-50 56 -65 87.5t-15 73.5q0 59 36.5 92.5t97.5 33.5q33 0 58 -12q21 -10 37 -10q11 0 16 4t12 17h29z" />
+<glyph unicode="&#x15c;" horiz-adv-x="556" d="M484 723h-51l-88 95l-131 -95h-57l160 174h81zM526 681l-40 -202l-27 4q-9 76 -22 101q-33 66 -116 66q-41 0 -69.5 -29t-28.5 -76q0 -41 22.5 -66.5t84.5 -70.5q80 -58 109 -104t29 -113q0 -63 -29 -110.5t-81 -73.5q-52 -25 -120 -25q-53 0 -122 24q-32 11 -46 11 t-21.5 -6.5t-16.5 -28.5h-30l36 225l29 -2q7 -54 16 -84t32 -55q44 -50 106 -50q56 0 89 34q37 37 37 92q0 43 -25.5 75.5t-89.5 78.5q-66 47 -98 92.5t-32 105.5q0 84 58.5 137.5t145.5 53.5q50 0 91.5 -15t54.5 -15q31 0 44 26h30z" />
+<glyph unicode="&#x15d;" horiz-adv-x="389" d="M367 516h-51l-88 95l-131 -95h-57l160 174h81zM333 461l-23 -154l-27 2q-12 63 -33 91.5t-55 28.5q-24 0 -38.5 -14.5t-14.5 -38.5q0 -33 57 -99q80 -93 80 -162q0 -56 -43 -92t-105 -36q-35 0 -64 12q-21 8 -30 8q-20 0 -29 -20h-27l22 166l27 -3q17 -133 93 -133 q29 0 44.5 14.5t15.5 39.5q0 41 -56 104q-50 56 -65 87.5t-15 73.5q0 59 36.5 92.5t97.5 33.5q33 0 58 -12q21 -10 37 -10q11 0 16 4t12 17h29z" />
+<glyph unicode="&#x15e;" horiz-adv-x="556" d="M172 -92l51 74q-46 3 -107 24q-32 11 -46 11t-21.5 -6.5t-16.5 -28.5h-30l36 225l29 -2q7 -54 16 -84t32 -55q44 -50 106 -50q56 0 89 34q37 37 37 92q0 43 -25.5 75.5t-89.5 78.5q-66 47 -98 92.5t-32 105.5q0 84 58.5 137.5t145.5 53.5q50 0 91.5 -15t54.5 -15 q31 0 44 26h30l-40 -202l-27 4q-9 76 -22 101q-33 66 -116 66q-41 0 -69.5 -29t-28.5 -76q0 -41 22.5 -66.5t84.5 -70.5q80 -58 109 -104t29 -113q0 -63 -29 -110.5t-81 -73.5q-39 -20 -91 -24l-30 -45q15 3 26 3q39 0 64.5 -20.5t25.5 -51.5q0 -37 -35.5 -62t-88.5 -25 q-51 0 -112 25l22 33q38 -17 67 -17q26 0 41 11t15 30q0 36 -47 36q-14 0 -30 -4z" />
+<glyph unicode="&#x15f;" horiz-adv-x="389" d="M65 -92l54 79q-25 1 -52 12q-21 8 -30 8q-20 0 -29 -20h-27l22 166l27 -3q17 -133 93 -133q29 0 44.5 14.5t15.5 39.5q0 41 -56 104q-50 56 -65 87.5t-15 73.5q0 59 36.5 92.5t97.5 33.5q33 0 58 -12q21 -10 37 -10q11 0 16 4t12 17h29l-23 -154l-27 2q-12 63 -33 91.5 t-55 28.5q-24 0 -38.5 -14.5t-14.5 -38.5q0 -33 57 -99q80 -93 80 -162q0 -47 -32 -81t-82 -44l-35 -52q15 3 26 3q39 0 64.5 -20.5t25.5 -51.5q0 -37 -35.5 -62t-88.5 -25q-51 0 -112 25l22 33q38 -17 67 -17q26 0 41 11t15 30q0 36 -47 36q-14 0 -30 -4z" />
+<glyph unicode="&#x160;" horiz-adv-x="556" d="M516 897l-162 -174h-82l-88 174h51l90 -97l134 97h57zM526 681l-40 -202l-27 4q-9 76 -22 101q-33 66 -116 66q-41 0 -69.5 -29t-28.5 -76q0 -41 22.5 -66.5t84.5 -70.5q80 -58 109 -104t29 -113q0 -63 -29 -110.5t-81 -73.5q-52 -25 -120 -25q-53 0 -122 24 q-32 11 -46 11t-21.5 -6.5t-16.5 -28.5h-30l36 225l29 -2q7 -54 16 -84t32 -55q44 -50 106 -50q56 0 89 34q37 37 37 92q0 43 -25.5 75.5t-89.5 78.5q-66 47 -98 92.5t-32 105.5q0 84 58.5 137.5t145.5 53.5q50 0 91.5 -15t54.5 -15q31 0 44 26h30z" />
+<glyph unicode="&#x161;" horiz-adv-x="389" d="M411 690l-162 -174h-82l-88 174h51l90 -97l134 97h57zM333 461l-23 -154l-27 2q-12 63 -33 91.5t-55 28.5q-24 0 -38.5 -14.5t-14.5 -38.5q0 -33 57 -99q80 -93 80 -162q0 -56 -43 -92t-105 -36q-35 0 -64 12q-21 8 -30 8q-20 0 -29 -20h-27l22 166l27 -3 q17 -133 93 -133q29 0 44.5 14.5t15.5 39.5q0 41 -56 104q-50 56 -65 87.5t-15 73.5q0 59 36.5 92.5t97.5 33.5q33 0 58 -12q21 -10 37 -10q11 0 16 4t12 17h29z" />
+<glyph unicode="&#x162;" horiz-adv-x="611" d="M190 0h-141v25h15q72 0 91 72l148 537q-79 -2 -130 -34t-88 -109l-25 7l39 171h551l-36 -192l-27 2q0 85 -31.5 120t-106.5 35l-135 -489q-17 -58 -17 -74q0 -46 83 -46v-25h-146l-42 -62q15 3 26 3q39 0 64.5 -20.5t25.5 -51.5q0 -37 -35.5 -62t-88.5 -25q-51 0 -112 25 l22 33q38 -17 67 -17q26 0 41 11t15 30q0 36 -47 36q-14 0 -30 -4l-13 12z" />
+<glyph unicode="&#x163;" horiz-adv-x="278" d="M-20 -92l59 86q-42 11 -42 62q0 28 25 115l67 236h-52v35q62 21 103 55t81 97h35l-39 -145h72v-42h-83l-34 -119q-53 -185 -53 -209q0 -18 16 -18q25 0 76 80l23 -15q-45 -69 -79.5 -99t-73.5 -35l-36 -54q15 3 26 3q39 0 64.5 -20.5t25.5 -51.5q0 -37 -35.5 -62 t-88.5 -25q-51 0 -112 25l22 33q38 -17 67 -17q26 0 41 11t15 30q0 36 -47 36q-14 0 -30 -4z" />
+<glyph unicode="&#x164;" horiz-adv-x="611" d="M596 897l-162 -174h-82l-88 174h51l90 -97l134 97h57zM650 669l-36 -192l-27 2q0 85 -31.5 120t-106.5 35l-135 -489q-17 -58 -17 -74q0 -46 83 -46v-25h-331v25h15q72 0 91 72l148 537q-79 -2 -130 -34t-88 -109l-25 7l39 171h551z" />
+<glyph unicode="&#x165;" horiz-adv-x="411" d="M308 394l-13 25q118 63 118 116q0 21 -30 37q-40 22 -40 65q0 35 20.5 54t52.5 19q39 0 61 -26t22 -68q0 -67 -51 -125.5t-140 -96.5zM266 407h-68l-34 -119q-53 -183 -53 -209q0 -18 16 -18q27 0 76 80l23 -15q-25 -40 -44 -64.5t-53.5 -47.5t-72.5 -23q-67 0 -67 65 q0 31 25 115l67 236h-52v35q64 22 105 56.5t79 95.5h35l-39 -145h57v-42z" />
+<glyph unicode="&#x166;" horiz-adv-x="611" d="M100 322l9 34h117l77 278q-79 -2 -130 -34t-88 -109l-25 7l39 171h551l-36 -192l-27 2q0 85 -31.5 120t-106.5 35l-77 -278h114l-9 -34h-114l-49 -177q-17 -58 -17 -74q0 -46 83 -46v-25h-331v25h15q72 0 91 72l62 225h-117z" />
+<glyph unicode="&#x167;" horiz-adv-x="278" d="M-30 232l16 56h61l34 119h-52v35q62 21 103 55t81 97h35l-39 -145h72v-42h-83l-34 -119h92l-16 -56h-92q-37 -133 -37 -153q0 -18 16 -18q25 0 76 80l23 -15q-49 -76 -86.5 -105.5t-83.5 -29.5q-67 0 -67 65q0 28 25 115l17 61h-61z" />
+<glyph unicode="&#x168;" horiz-adv-x="722" d="M599 841h41q-16 -63 -44 -91t-73 -28q-25 0 -57 13l-59 23q-21 8 -38 8q-31 0 -48 -43h-40q10 54 41.5 86t74.5 32q38 0 97 -26q39 -16 54 -16q17 0 28.5 9t22.5 33zM744 669v-25q-32 -6 -44.5 -14t-25.5 -36.5t-32 -96.5l-65 -234q-25 -89 -52.5 -145t-68.5 -89 q-59 -47 -166 -47q-101 0 -162 42.5t-61 120.5q0 47 37 189l51 193q15 55 15 78q0 17 -9 25.5t-32 10.5l-32 3v25h311v-25q-46 -2 -64 -16.5t-30 -59.5l-81 -294q-28 -101 -28 -135q0 -101 122 -101q78 0 123 47q49 51 90 197l57 209q19 70 19 96q0 57 -79 57v25h207z" />
+<glyph unicode="&#x169;" horiz-adv-x="556" d="M449 655h41q-16 -63 -44 -91t-73 -28q-25 0 -57 13l-59 23q-21 8 -38 8q-31 0 -48 -43h-40q10 54 41.5 86t74.5 32q38 0 97 -26q39 -16 54 -16q17 0 28.5 9t22.5 33zM471 133l22 -13q-39 -67 -76.5 -98t-82.5 -31q-68 0 -68 60q0 31 26 110h-1q-70 -103 -109.5 -136.5 t-88.5 -33.5q-78 0 -78 79q0 27 22 106l37 128q17 62 17 75q0 24 -58 28v27q87 2 210 28l-93 -302q-16 -51 -16 -72q0 -25 24 -25q28 0 70 55q47 61 75.5 125t66.5 206h118l-78 -266q-25 -88 -25 -103q0 -21 14 -21q24 0 72 74z" />
+<glyph unicode="&#x16a;" horiz-adv-x="722" d="M641 793l-16 -70h-326l17 70h325zM744 669v-25q-32 -6 -44.5 -14t-25.5 -36.5t-32 -96.5l-65 -234q-25 -89 -52.5 -145t-68.5 -89q-59 -47 -166 -47q-101 0 -162 42.5t-61 120.5q0 47 37 189l51 193q15 55 15 78q0 17 -9 25.5t-32 10.5l-32 3v25h311v-25 q-46 -2 -64 -16.5t-30 -59.5l-81 -294q-28 -101 -28 -135q0 -101 122 -101q78 0 123 47q49 51 90 197l57 209q19 70 19 96q0 57 -79 57v25h207z" />
+<glyph unicode="&#x16b;" horiz-adv-x="556" d="M481 586l-16 -70h-326l17 70h325zM471 133l22 -13q-39 -67 -76.5 -98t-82.5 -31q-68 0 -68 60q0 31 26 110h-1q-70 -103 -109.5 -136.5t-88.5 -33.5q-78 0 -78 79q0 27 22 106l37 128q17 62 17 75q0 24 -58 28v27q87 2 210 28l-93 -302q-16 -51 -16 -72q0 -25 24 -25 q28 0 70 55q47 61 75.5 125t66.5 206h118l-78 -266q-25 -88 -25 -103q0 -21 14 -21q24 0 72 74z" />
+<glyph unicode="&#x16c;" horiz-adv-x="722" d="M589 885h39q-33 -162 -178 -162q-138 0 -138 149v13h43q8 -90 99 -90q50 0 81 20.5t54 69.5zM744 669v-25q-32 -6 -44.5 -14t-25.5 -36.5t-32 -96.5l-65 -234q-25 -89 -52.5 -145t-68.5 -89q-59 -47 -166 -47q-101 0 -162 42.5t-61 120.5q0 47 37 189l51 193q15 55 15 78 q0 17 -9 25.5t-32 10.5l-32 3v25h311v-25q-46 -2 -64 -16.5t-30 -59.5l-81 -294q-28 -101 -28 -135q0 -101 122 -101q78 0 123 47q49 51 90 197l57 209q19 70 19 96q0 57 -79 57v25h207z" />
+<glyph unicode="&#x16d;" horiz-adv-x="556" d="M439 678h39q-33 -162 -178 -162q-138 0 -138 149v13h43q8 -90 99 -90q50 0 81 20.5t54 69.5zM471 133l22 -13q-39 -67 -76.5 -98t-82.5 -31q-68 0 -68 60q0 31 26 110h-1q-70 -103 -109.5 -136.5t-88.5 -33.5q-78 0 -78 79q0 27 22 106l37 128q17 62 17 75q0 24 -58 28 v27q87 2 210 28l-93 -302q-16 -51 -16 -72q0 -25 24 -25q28 0 70 55q47 61 75.5 125t66.5 206h118l-78 -266q-25 -88 -25 -103q0 -21 14 -21q24 0 72 74z" />
+<glyph unicode="&#x16e;" horiz-adv-x="722" d="M567 815q0 -44 -31.5 -75.5t-75.5 -31.5q-48 0 -77 30t-29 78q0 44 31.5 74.5t75.5 30.5q47 0 76.5 -30.5t29.5 -75.5zM519 813q0 25 -17.5 42.5t-42.5 17.5q-23 0 -40 -17.5t-17 -41.5t17 -41t40 -17q25 0 42.5 17t17.5 40zM744 669v-25q-32 -6 -44.5 -14t-25.5 -36.5 t-32 -96.5l-65 -234q-25 -89 -52.5 -145t-68.5 -89q-59 -47 -166 -47q-101 0 -162 42.5t-61 120.5q0 47 37 189l51 193q15 55 15 78q0 17 -9 25.5t-32 10.5l-32 3v25h311v-25q-46 -2 -64 -16.5t-30 -59.5l-81 -294q-28 -101 -28 -135q0 -101 122 -101q78 0 123 47 q49 51 90 197l57 209q19 70 19 96q0 57 -79 57v25h207z" />
+<glyph unicode="&#x16f;" horiz-adv-x="556" d="M417 623q0 -44 -31.5 -75.5t-75.5 -31.5q-48 0 -77 30t-29 78q0 44 31.5 74.5t75.5 30.5q47 0 76.5 -30.5t29.5 -75.5zM369 621q0 25 -17.5 42.5t-42.5 17.5q-23 0 -40 -17.5t-17 -41.5t17 -41t40 -17q25 0 42.5 17t17.5 40zM471 133l22 -13q-39 -67 -76.5 -98t-82.5 -31 q-68 0 -68 60q0 31 26 110h-1q-70 -103 -109.5 -136.5t-88.5 -33.5q-78 0 -78 79q0 27 22 106l37 128q17 62 17 75q0 24 -58 28v27q87 2 210 28l-93 -302q-16 -51 -16 -72q0 -25 24 -25q28 0 70 55q47 61 75.5 125t66.5 206h118l-78 -266q-25 -88 -25 -103q0 -21 14 -21 q24 0 72 74z" />
+<glyph unicode="&#x170;" horiz-adv-x="722" d="M438 708l122 133q43 48 70 48q20 0 34 -14t14 -33q0 -27 -39 -49l-151 -85h-50zM249 708l122 133q43 48 70 48q20 0 34 -13t14 -32q0 -29 -39 -51l-149 -85h-52zM744 669v-25q-32 -6 -44.5 -14t-25.5 -36.5t-32 -96.5l-65 -234q-25 -89 -52.5 -145t-68.5 -89 q-59 -47 -166 -47q-101 0 -162 42.5t-61 120.5q0 47 37 189l51 193q15 55 15 78q0 17 -9 25.5t-32 10.5l-32 3v25h311v-25q-46 -2 -64 -16.5t-30 -59.5l-81 -294q-28 -101 -28 -135q0 -101 122 -101q78 0 123 47q49 51 90 197l57 209q19 70 19 96q0 57 -79 57v25h207z" />
+<glyph unicode="&#x171;" horiz-adv-x="556" d="M287 516l122 133q43 48 70 48q20 0 34 -14t14 -33q0 -27 -39 -49l-151 -85h-50zM98 516l122 133q43 48 70 48q20 0 34 -13t14 -32q0 -29 -39 -51l-149 -85h-52zM471 133l22 -13q-39 -67 -76.5 -98t-82.5 -31q-68 0 -68 60q0 31 26 110h-1q-70 -103 -109.5 -136.5 t-88.5 -33.5q-78 0 -78 79q0 27 22 106l37 128q17 62 17 75q0 24 -58 28v27q87 2 210 28l-93 -302q-16 -51 -16 -72q0 -25 24 -25q28 0 70 55q47 61 75.5 125t66.5 206h118l-78 -266q-25 -88 -25 -103q0 -21 14 -21q24 0 72 74z" />
+<glyph unicode="&#x172;" horiz-adv-x="722" d="M496 -84l22 -14q-19 -35 -53 -55t-73 -20q-47 0 -75 21t-28 60q0 35 29 75q-9 -1 -28 -1q-101 0 -162 42.5t-61 120.5q0 47 37 189l51 193q15 55 15 78q0 17 -9 25.5t-32 10.5l-32 3v25h311v-25q-46 -2 -64 -16.5t-30 -59.5l-81 -294q-28 -101 -28 -135q0 -101 122 -101 q78 0 123 47q49 51 90 197l57 209q19 70 19 96q0 57 -79 57v25h207v-25q-32 -6 -44.5 -14t-25.5 -36.5t-32 -96.5l-65 -234q-25 -89 -52.5 -145t-68.5 -89q-36 -28 -79 -37q-4 -20 -4 -34q0 -62 61 -62q22 0 48 13z" />
+<glyph unicode="&#x173;" horiz-adv-x="556" d="M337 -9h-3q-68 0 -68 60q0 31 26 110h-1q-70 -103 -109.5 -136.5t-88.5 -33.5q-78 0 -78 79q0 27 22 106l37 128q17 62 17 75q0 24 -58 28v27q87 2 210 28l-93 -302q-16 -51 -16 -72q0 -25 24 -25q28 0 70 55q47 61 75.5 125t66.5 206h118l-78 -266q-25 -88 -25 -103 q0 -21 14 -21q24 0 72 74l22 -13q-52 -87 -99 -113q-8 -37 -8 -49q0 -62 61 -62q22 0 48 13l14 7l22 -14q-19 -35 -53 -55t-73 -20q-47 0 -75 21t-28 60q0 37 35 83z" />
+<glyph unicode="&#x174;" horiz-adv-x="889" d="M704 723h-51l-88 95l-131 -95h-57l160 174h81zM940 669v-24q-32 -5 -48 -19t-40 -63l-282 -581h-29l-59 489l-233 -489h-29l-78 572q-8 54 -19.5 68.5t-58.5 22.5v24h278v-25q-35 -4 -48 -15t-13 -35q0 -14 1 -19l40 -349l149 314q0 60 -12.5 79.5t-57.5 25.5v24h267v-25 q-39 -4 -50.5 -14.5t-11.5 -39.5q0 -5 7 -73l33 -291l155 327q15 33 15 46q0 27 -10.5 34.5t-52.5 10.5v25h187z" />
+<glyph unicode="&#x175;" horiz-adv-x="667" d="M534 516h-51l-88 95l-131 -95h-57l160 174h81zM387 462l31 -333q120 140 120 187q0 15 -20 38q-22 25 -22 48q0 29 16.5 44.5t40.5 15.5q25 0 43 -18.5t18 -43.5q0 -131 -272 -413h-27l-23 285q-85 -158 -114 -201l-56 -84h-27v46q0 4 0.5 24.5t0.5 37.5 q0 94 -11.5 191.5t-26.5 110.5q-11 10 -43 10v27q110 18 156 28q33 -123 33 -274l156 274h27z" />
+<glyph unicode="&#x176;" horiz-adv-x="611" d="M564 723h-51l-88 95l-131 -95h-57l160 174h81zM659 669v-25q-27 -4 -46.5 -20t-45.5 -52l-189 -264l-52 -191q-10 -40 -10 -51q0 -22 17 -31.5t62 -9.5v-25h-323v25q52 5 72 18.5t32 59.5l57 208l-87 270q-12 35 -23.5 45t-51.5 18v25h285v-25q-42 -2 -55.5 -9.5 t-13.5 -29.5q0 -19 29 -110l46 -143l128 183q28 40 28 67q0 23 -13 32t-53 10v25h207z" />
+<glyph unicode="&#x177;" horiz-adv-x="444" d="M393 516h-51l-88 95l-131 -95h-57l160 174h81zM239 110h2q52 99 69.5 141t17.5 66q0 13 -25 34q-31 25 -31 54q0 21 16 39t42 18q25 0 43.5 -19t18.5 -45q0 -76 -75.5 -227t-173.5 -270q-41 -50 -87.5 -78t-87.5 -28q-26 0 -44 17.5t-18 42.5q0 22 15.5 39t34.5 17 q25 0 51 -18t43 -18q13 0 32 15t35 37q25 35 25 71q0 50 -50 288q-21 94 -40 113q-8 8 -14.5 10t-25.5 2v27q86 8 150 24q43 -111 66 -274z" />
+<glyph unicode="&#x178;" horiz-adv-x="611" d="M659 669v-25q-27 -4 -46.5 -20t-45.5 -52l-189 -264l-52 -191q-10 -40 -10 -51q0 -22 17 -31.5t62 -9.5v-25h-323v25q52 5 72 18.5t32 59.5l57 208l-87 270q-12 35 -23.5 45t-51.5 18v25h285v-25q-42 -2 -55.5 -9.5t-13.5 -29.5q0 -19 29 -110l46 -143l128 183 q28 40 28 67q0 23 -13 32t-53 10v25h207zM293 862q27 0 46.5 -19.5t19.5 -46.5q0 -26 -19.5 -45t-46.5 -19q-25 0 -44.5 19t-19.5 45q0 27 19 46.5t45 19.5zM505 862q27 0 46.5 -19.5t19.5 -46.5q0 -26 -19.5 -45t-46.5 -19q-25 0 -44.5 19t-19.5 45q0 27 19 46.5t45 19.5z " />
+<glyph unicode="&#x179;" horiz-adv-x="611" d="M270 723l122 131q47 50 70 50q20 0 34 -14t14 -33q0 -14 -8.5 -24t-30.5 -23l-152 -87h-49zM589 640l-434 -605h75q70 0 115.5 11t83.5 39q49 37 97 114l27 -5l-60 -194h-505v29l434 605h-83q-79 0 -133.5 -32t-113.5 -115l-28 4l58 178h467v-29z" />
+<glyph unicode="&#x17a;" horiz-adv-x="389" d="M139 516l122 131q47 50 70 50q20 0 34 -14t14 -33q0 -14 -8.5 -24t-30.5 -23l-152 -87h-49zM368 439l-281 -335q52 -23 86 -69q6 -8 19 -32.5t24.5 -38t24.5 -13.5q10 0 16 5t6 12q0 6 -10 18t-10 27q0 21 15 37t35 16q21 0 37 -16t16 -37q0 -45 -31 -68t-79 -23 q-59 0 -129 50q-46 33 -74 33q-13 0 -32 -14q-12 -10 -19 -14l-25 22l292 354h-136q-29 0 -45.5 -13.5t-27.5 -47.5l-27 3l44 154h311v-10z" />
+<glyph unicode="&#x17b;" horiz-adv-x="611" d="M589 640l-434 -605h75q70 0 115.5 11t83.5 39q49 37 97 114l27 -5l-60 -194h-505v29l434 605h-83q-79 0 -133.5 -32t-113.5 -115l-28 4l58 178h467v-29zM369 862q27 0 46.5 -19.5t19.5 -46.5q0 -26 -19.5 -45t-46.5 -19q-25 0 -44.5 19t-19.5 45q0 27 19 46.5t45 19.5z " />
+<glyph unicode="&#x17c;" horiz-adv-x="389" d="M293 589q0 -26 -19.5 -45t-46.5 -19q-25 0 -44.5 19.5t-19.5 44.5q0 27 19 46.5t45 19.5q27 0 46.5 -19.5t19.5 -46.5zM368 439l-281 -335q52 -23 86 -69q6 -8 19 -32.5t24.5 -38t24.5 -13.5q10 0 16 5t6 12q0 6 -10 18t-10 27q0 21 15 37t35 16q21 0 37 -16t16 -37 q0 -45 -31 -68t-79 -23q-59 0 -129 50q-46 33 -74 33q-13 0 -32 -14q-12 -10 -19 -14l-25 22l292 354h-136q-29 0 -45.5 -13.5t-27.5 -47.5l-27 3l44 154h311v-10z" />
+<glyph unicode="&#x17d;" horiz-adv-x="611" d="M556 897l-162 -174h-82l-88 174h51l90 -97l134 97h57zM589 640l-434 -605h75q70 0 115.5 11t83.5 39q49 37 97 114l27 -5l-60 -194h-505v29l434 605h-83q-79 0 -133.5 -32t-113.5 -115l-28 4l58 178h467v-29z" />
+<glyph unicode="&#x17e;" horiz-adv-x="389" d="M411 690l-162 -174h-82l-88 174h51l90 -97l134 97h57zM368 439l-281 -335q52 -23 86 -69q6 -8 19 -32.5t24.5 -38t24.5 -13.5q10 0 16 5t6 12q0 6 -10 18t-10 27q0 21 15 37t35 16q21 0 37 -16t16 -37q0 -45 -31 -68t-79 -23q-59 0 -129 50q-46 33 -74 33q-13 0 -32 -14 q-12 -10 -19 -14l-25 22l292 354h-136q-29 0 -45.5 -13.5t-27.5 -47.5l-27 3l44 154h311v-10z" />
+<glyph unicode="&#x17f;" horiz-adv-x="333" d="M165 418h-41l10 44h41q30 130 80 178q28 27 59.5 39t83.5 12q60 0 99 -28.5t39 -70.5q0 -28 -17.5 -46t-45.5 -18q-25 0 -42 17t-17 38t11 37.5t11 21.5q0 18 -27 18t-42.5 -17.5t-25.5 -61.5l-107 -474q-6 -25 -6 -41q0 -23 15.5 -32t54.5 -10l-6 -24h-278l6 24 q35 4 49 16.5t22 46.5z" />
+<glyph unicode="&#x180;" d="M232 515l-39 -142q65 89 144 89q47 0 77 -37.5t30 -93.5q0 -135 -97 -239.5t-223 -104.5q-53 0 -95.5 17.5t-42.5 43.5q0 9 20 81l110 386h-115l14 46h114q10 39 10 51q0 30 -46 30h-19v27q123 14 210 30l-39 -138h118l-13 -46h-118zM319 325q0 69 -41 69q-52 0 -92 -84 q-24 -52 -62 -182q-15 -51 -15 -81q0 -12 8.5 -19.5t22.5 -7.5q55 0 108 78q30 43 50.5 112t20.5 115z" />
+<glyph unicode="&#x188;" horiz-adv-x="560" d="M361 435l17 63q10 35 39.5 56.5t77.5 21.5q54 0 93 -27t39 -74q0 -27 -17 -45t-44 -18q-25 0 -42.5 17t-17.5 40q0 20 11 36.5t11 20.5q0 19 -25 19q-65 0 -79 -57l-34 -136q-12 -51 -60 -51q-25 0 -41.5 15t-16.5 38q0 16 10.5 32t10.5 26q0 7 -7.5 12t-16.5 5 q-26 0 -47.5 -22.5t-45.5 -65.5q-53 -98 -53 -201q0 -43 19.5 -66t53.5 -23q32 0 59 20t63 71l28 -18l-38 -50q-13 -17 -34.5 -37.5t-42.5 -31.5q-35 -18 -83 -18q-70 0 -111.5 39.5t-41.5 111.5q0 134 105 239q83 85 180 85q48 0 81 -27z" />
+<glyph unicode="&#x190;" horiz-adv-x="512" d="M566 174l39 -12q-56 -95 -135.5 -130.5t-185.5 -35.5q-42 0 -80.5 7t-73 22t-55.5 42.5t-21 65.5q0 73 54 136t129 85q-36 11 -61 43.5t-25 70.5q0 55 30.5 99t78 68.5t99.5 37.5t102 13q75 0 119 -18q39 -16 67.5 -43t28.5 -59q0 -29 -14 -48.5t-43 -19.5 q-30 0 -46.5 19t-24.5 60q-5 25 -26.5 40.5t-58.5 15.5q-60 0 -108.5 -54t-48.5 -137q0 -12 3.5 -24t16 -23.5t33.5 -11.5q17 0 50 5.5t48 5.5q22 0 38.5 -8t16.5 -25q0 -20 -26 -33.5t-51 -13.5q-6 0 -43.5 2.5t-45.5 2.5q-51 0 -94 -53.5t-43 -122.5q0 -78 113 -78 q44 0 69.5 2.5t60.5 12t63 33t51 61.5z" />
+<glyph unicode="&#x192;" d="M86 440h107q28 126 89.5 196.5t144.5 70.5q47 0 78.5 -25t31.5 -62q0 -28 -16.5 -44.5t-43.5 -16.5q-24 0 -38.5 13.5t-14.5 36.5q0 21 20 40q9 9 9 13q0 15 -25 15q-32 0 -54 -37q-22 -39 -49 -200h118l-9 -44h-116l-27 -154q-35 -202 -101 -300t-167 -98 q-49 0 -79.5 24t-30.5 63q0 26 16 43t41 17q22 0 37.5 -14.5t15.5 -35.5q0 -17 -18 -38q-10 -10 -10 -17q0 -13 25 -13q24 0 38 15q34 34 55 144l70 364h-105z" />
+<glyph unicode="&#x195;" horiz-adv-x="735" d="M467 338l-80 -251q-7 -19 -7 -28q0 -19 34 -19q83 0 148.5 84.5t65.5 165.5q0 20 -5.5 31t-18.5 22t-18 17q-19 23 -19 48q0 20 16.5 37t40.5 17q68 0 68 -112q0 -85 -38 -166.5t-112.5 -137.5t-165.5 -56q-55 0 -83.5 13.5t-28.5 51.5q0 23 9 52l76 232q6 18 6 30 q0 21 -20 21q-44 0 -108 -94q-36 -53 -58 -108t-61 -188h-121l152 562q10 37 10 47q0 33 -42 33h-22v27q99 9 209 30l-108 -416q74 105 118 142t95 37q37 0 56.5 -20t19.5 -55q0 -23 -8 -49z" />
+<glyph unicode="&#x199;" d="M483 449v-25q-37 -5 -61.5 -18.5t-73.5 -57.5l-64 -58q19 -95 33 -145.5t24 -66t22 -15.5q28 0 64 64l22 -11q-32 -68 -65 -96t-73 -28q-47 0 -72.5 46.5t-50.5 176.5l-39 -27l-50 -188h-122l135 486q25 88 74.5 146.5t124.5 58.5q64 0 103 -28t39 -72q0 -28 -17 -46 t-44 -18q-25 0 -42.5 17t-17.5 40q0 20 11 36.5t11 20.5q0 19 -29 19q-50 0 -67 -65l-96 -357q95 75 130 109.5t35 53.5q0 12 -10.5 16.5t-39.5 6.5v25h206z" />
+<glyph unicode="&#x19a;" horiz-adv-x="278" d="M290 699l-87 -313h51l-13 -46h-51l-45 -164q-22 -79 -22 -100q0 -15 15 -15q25 0 79 80l22 -14q-52 -80 -87 -108t-82 -28q-30 0 -49 18t-19 45q0 34 34 155l37 131h-55l12 46h56l24 82q34 118 34 145q0 30 -42 30q-11 0 -22 -1v27q98 9 210 30z" />
+<glyph unicode="&#x19b;" horiz-adv-x="480" d="M452 568l-79 -56l53 -512h-40l-27 294l-193 -294h-150l322 474l-1 15l-184 -134v67l176 124q-3 25 -14.5 44t-23.5 19q-18 0 -18 -18q0 -2 1.5 -8t1.5 -10q0 -23 -17.5 -38t-42.5 -15q-28 0 -45 19t-17 48q0 35 27 57t70 22q85 0 110 -97l91 67v-68z" />
+<glyph unicode="&#x19e;" horiz-adv-x="536" d="M178 263h1q51 75 73 103.5t49 54.5q43 41 100 41q73 0 73 -77q0 -34 -28 -116l-161 -474h-118l179 546q7 23 7 28q0 21 -24 21q-13 0 -33 -16.5t-36 -37.5q-47 -62 -79 -135t-66 -201h-121l57 204q45 164 45 179q0 14 -11.5 18.5t-43.5 5.5v27q90 3 199 27z" />
+<glyph unicode="&#x1a0;" horiz-adv-x="722" d="M806 649q0 -32 -20 -53.5t-51 -27.5q-16 -4 -73 -4q29 -55 29 -120q0 -95 -49.5 -194.5t-130.5 -171.5q-108 -96 -248 -96q-108 0 -172 62.5t-64 176.5q0 101 51 202.5t135 169.5q114 92 236 92q118 0 187 -82q30 -18 52 -18q43 0 44 26q-41 25 -41 56q0 17 15 33t38 16 q26 0 44 -18t18 -49zM547 528q0 60 -27 91.5t-74 31.5q-91 0 -162 -120q-46 -78 -79.5 -189.5t-33.5 -198.5q0 -57 27.5 -92t74.5 -35q46 0 82 28t75 86q49 72 83 191t34 207z" />
+<glyph unicode="&#x1a1;" horiz-adv-x="537" d="M307 462h4q87 0 130 -59q1 -1 10 -9.5t16.5 -13t15.5 -4.5q21 0 29 6.5t9 20.5q-42 26 -42 57q0 17 16 32t39 15q25 0 43 -17.5t18 -46.5q0 -33 -20 -55.5t-51 -28.5q-13 -4 -62 -4q6 -21 6 -44q0 -69 -29 -135.5t-76 -113.5q-75 -75 -175 -75q-73 0 -118.5 38.5 t-45.5 109.5q0 73 27 139t73 111q79 77 183 77zM349 372q0 28 -12.5 44.5t-34.5 16.5q-32 0 -60 -31q-43 -48 -71 -144.5t-28 -177.5q0 -64 49 -64q41 0 71 49q36 59 61 149.5t25 157.5z" />
+<glyph unicode="&#x1a5;" horiz-adv-x="520" d="M197 347h1q41 64 77.5 89.5t80.5 25.5q53 0 81.5 -32.5t28.5 -88.5q0 -138 -85 -246t-192 -108q-38 0 -68 22l-12 -41q-24 -83 -24 -114q0 -18 13.5 -24.5t51.5 -7.5v-27h-250v27q36 0 50 15t28 71l138 545q56 220 195 220q64 0 103 -28t39 -72q0 -28 -17 -46t-44 -18 q-25 0 -42.5 17t-17.5 40q0 20 11 36.5t11 20.5q0 19 -28 19q-27 0 -43 -17.5t-27 -56.5zM341 336q0 55 -39 55q-40 0 -87 -71q-13 -19 -20 -37t-24 -76q-38 -128 -38 -149q0 -15 11.5 -25.5t27.5 -10.5q30 0 62 30q46 45 76.5 137t30.5 147z" />
+<glyph unicode="&#x1aa;" horiz-adv-x="400" d="M233 455h-18q-36 0 -70 31t-34 83q0 47 37 81t87 34q60 0 102.5 -42.5t42.5 -89.5q0 -56 -27 -133l-155 -429q-10 -28 -24.5 -81.5t-14.5 -72.5q0 -13 0.5 -19.5t6 -13t15.5 -6.5q9 0 16 4.5t7 9.5q0 3 -9 18t-9 30q0 19 15 33t38 14q24 0 39 -17.5t15 -43.5 q0 -35 -29 -56.5t-80 -21.5q-68 0 -103 33t-35 92q0 48 27 124zM276 569q0 24 -18 41.5t-41 17.5q-26 0 -42 -18t-16 -42q0 -23 18 -40t39 -17q25 0 42.5 16.5t17.5 41.5z" />
+<glyph unicode="&#x1ab;" horiz-adv-x="286" d="M289 407h-83l-34 -119q-53 -185 -53 -209q0 -18 16 -18q25 0 76 80l23 -15l-54 -197q-8 -28 -12.5 -42.5t-14 -38t-19.5 -35.5t-26 -21.5t-35 -9.5q-60 0 -91 27t-31 73q0 28 17 46t45 18q25 0 42 -17t17 -40q0 -20 -11 -36.5t-11 -20.5q0 -7 6.5 -13t18.5 -6q18 0 31 20 t28 74l38 136q-49 -52 -108 -52q-67 0 -67 65q0 28 25 115l67 236h-52v35q62 21 103 55t81 97h35l-39 -145h72v-42z" />
+<glyph unicode="&#x1ad;" horiz-adv-x="360" d="M37 407v35q42 15 70 32q33 118 84 166q26 23 59 37t57 14q64 0 103.5 -28t39.5 -72q0 -28 -17 -46t-44 -18q-25 0 -42.5 17t-17.5 40q0 20 11 36.5t11 20.5q0 19 -28 19q-26 0 -42 -15t-25 -51l-39 -145h72v-42h-83l-34 -119q-53 -185 -53 -209q0 -18 16 -18q25 0 76 80 l23 -15q-49 -76 -86.5 -105.5t-83.5 -29.5q-67 0 -67 65q0 28 25 115l67 236h-52z" />
+<glyph unicode="&#x1af;" horiz-adv-x="775" d="M537 669h227q55 0 55 29q-15 9 -21 13.5t-13.5 17.5t-7.5 30q0 14 15.5 29t38.5 15q26 0 44 -16.5t18 -47.5q0 -34 -22 -55t-54 -28q-5 -1 -41.5 -7t-50.5 -9q-30 -8 -44.5 -32t-38.5 -111l-65 -234q-25 -89 -52.5 -145t-68.5 -89q-59 -47 -166 -47q-101 0 -162 42.5 t-61 120.5q0 47 37 189l51 193q15 55 15 78q0 17 -9 25.5t-32 10.5l-32 3v25h311v-25q-46 -2 -64 -16.5t-30 -59.5l-81 -294q-28 -101 -28 -135q0 -101 122 -101q78 0 123 47q49 51 90 197l57 209q19 70 19 96q0 57 -79 57v25z" />
+<glyph unicode="&#x1b0;" horiz-adv-x="556" d="M370 449h118q28 0 56 3q37 5 38 27q-42 12 -42 55q0 18 15.5 33.5t39.5 15.5q25 0 43 -17t18 -47q0 -33 -21.5 -58.5t-51.5 -31.5q-30 -7 -102 -7l-71 -239q-25 -82 -25 -103t14 -21q24 0 72 74l22 -13q-39 -67 -76.5 -98t-82.5 -31q-68 0 -68 60q0 31 26 110h-1 q-70 -103 -109.5 -136.5t-88.5 -33.5q-78 0 -78 79q0 27 22 106l37 128q17 62 17 75q0 24 -58 28v27q87 2 210 28l-93 -302q-16 -51 -16 -72q0 -25 24 -25q28 0 70 55q47 61 75.5 125t66.5 206z" />
+<glyph unicode="&#x1ba;" horiz-adv-x="496" d="M458 423l-236 -167q15 4 45 4q56 0 87.5 -25t31.5 -67t-30.5 -82t-75.5 -62l-181 -90q-29 -14 -49.5 -37.5t-20.5 -48.5q0 -22 13.5 -35t35.5 -13q24 0 44.5 13.5t25.5 39.5q11 64 66 64q30 0 44.5 -15t14.5 -35q0 -51 -65 -80q-54 -24 -121 -24q-68 0 -107 29 q-32 26 -32 69q0 91 114 152q34 18 145 70q50 25 50 69q0 21 -20 32.5t-51 11.5q-62 0 -122 -47l-21 24l285 204h-189q-20 0 -50.5 -23.5t-44.5 -59.5h-26l76 156h364v-27z" />
+<glyph unicode="&#x1bb;" d="M469 376l-16 -62h-111l-40 -36l-196 -167h138q63 0 94 14.5t57 65.5h24l-80 -191h-366v24l89 92q136 140 177 198h-233l15 62h262q29 53 29 100q0 117 -92 117q-76 0 -134 -86l-22 12q30 74 86 119t132 45q74 0 119 -46.5t45 -121.5q0 -71 -50 -139h73z" />
+<glyph unicode="&#x1be;" d="M304 438l-10 -47q14 2 31 2q70 0 104 -42.5t34 -107.5q0 -110 -78.5 -181.5t-190.5 -71.5q-50 0 -100 26q-57 30 -57 80q0 17 14 32.5t39 15.5q54 0 71 -61q6 -21 10.5 -32t15.5 -21.5t28 -10.5q42 0 80.5 70t38.5 117q0 41 -27.5 65t-65.5 24h-32l38 143h-64l13 46h64 l15 57h52l-12 -57h111l-13 -46h-109z" />
+<glyph unicode="&#x1c0;" horiz-adv-x="208" d="M278 740l-198 -740h-66l198 740h66z" />
+<glyph unicode="&#x1c1;" horiz-adv-x="345" d="M278 740l-198 -740h-66l198 740h66zM415 740l-198 -740h-66l198 740h66z" />
+<glyph unicode="&#x1c2;" horiz-adv-x="368" d="M438 476l-18 -66h-148l-23 -84h148l-17 -66h-148l-70 -260h-66l70 260h-152l17 66h152l23 84h-152l18 66h152l70 264h66l-70 -264h148z" />
+<glyph unicode="&#x1c3;" horiz-adv-x="300" d="M168 203l-31 9q47 233 55 354q4 55 21.5 86.5t64.5 31.5q77 0 77 -73q0 -20 -6 -36t-26 -53q-97 -178 -155 -319zM214 70q0 -36 -24 -59.5t-60 -23.5q-35 0 -60 24.5t-25 59.5q0 37 23.5 61t60.5 24q36 0 60.5 -24.5t24.5 -61.5z" />
+<glyph unicode="&#x1f0;" horiz-adv-x="350" d="M474 690l-162 -174h-82l-88 174h51l90 -97l134 97h57zM324 462l-37 -140l-79 -304q-31 -119 -81 -172t-126 -53q-47 0 -76 22t-29 55q0 22 14.5 37.5t34.5 15.5q22 0 35.5 -13.5t13.5 -35.5q0 -11 -7.5 -20t-7.5 -15q0 -15 24 -15q21 0 38 31t36 105l89 350q12 45 12 67 q0 30 -41 30h-22v27q136 12 209 28z" />
+<glyph unicode="&#x1fa;" horiz-adv-x="667" d="M419 646l88 -523q11 -62 25 -78.5t61 -19.5v-25h-303v25q77 6 77 49q0 3 -2 15l-12 119h-215l-57 -96q-17 -28 -17 -50q0 -37 64 -37v-25h-195l-1 25q26 3 43 19.5t43 56.5l355 558q-44 24 -44 78q0 36 27 63t65 27q35 0 62 -26.5t27 -62.5q0 -38 -26.5 -65t-63.5 -27h-1 zM346 248l-37 243l-148 -243h185zM462 736q0 18 -11.5 30.5t-32.5 12.5q-18 0 -29.5 -12.5t-11.5 -29.5t12.5 -30t28.5 -13q18 0 31 12.5t13 29.5zM304 825l146 125q25 22 44 22q32 0 32 -33q0 -7 -2 -12t-9.5 -10.5t-13 -9t-20.5 -11.5l-132 -71h-45z" />
+<glyph unicode="&#x1fb;" d="M387 623q0 -44 -31.5 -75.5t-75.5 -31.5q-48 0 -77 30t-29 78q0 44 31.5 74.5t75.5 30.5q47 0 76.5 -30.5t29.5 -75.5zM339 621q0 25 -17.5 42.5t-42.5 17.5q-23 0 -40 -17.5t-17 -41.5t17 -41t40 -17q25 0 42.5 17t17.5 40zM160 728l122 131q47 50 70 50q20 0 34 -14 t14 -33q0 -14 -8.5 -24t-30.5 -23l-152 -87h-49zM435 127l21 -15q-78 -126 -156 -126q-29 0 -46 16.5t-17 47.5q0 21 14 69q-42 -71 -80 -101.5t-84 -30.5q-49 0 -78.5 35t-29.5 92q0 117 87 231q89 117 186 117q32 0 49.5 -17t24.5 -55h1l17 59l111 7l-75 -251 q-30 -99 -30 -133q0 -15 12 -15t27 14.5t46 55.5zM303 373q0 20 -10.5 33.5t-26.5 13.5q-52 0 -108 -115q-25 -51 -40.5 -105.5t-15.5 -84.5q0 -57 43 -57q45 0 86 75q29 52 50.5 123.5t21.5 116.5z" />
+<glyph unicode="&#x1fc;" horiz-adv-x="944" d="M918 669l-45 -190l-24 5l-2 40q-6 113 -162 113q-32 0 -43 -6t-16 -26l-65 -235h19q76 0 110.5 20.5t64.5 85.5l26 -4l-73 -273l-25 5q3 24 3 46q0 50 -24 66.5t-109 21.5l-63 -241q-5 -20 -5 -28q0 -37 68 -37q59 0 97.5 10.5t72.5 36.5q36 27 101 120l26 -3l-59 -196 h-527v25q38 6 53 22.5t28 58.5l43 149h-192l-114 -157q-15 -20 -15 -39q0 -16 14 -23.5t50 -10.5v-25h-195v25q19 2 30 9q9 3 59 68l364 472q20 27 20 44q0 14 -15.5 19.5t-64.5 8.5v23h589zM490 627h-12l-253 -333h173zM520 723l122 131q47 50 70 50q20 0 34 -14t14 -33 q0 -14 -8.5 -24t-30.5 -23l-152 -87h-49z" />
+<glyph unicode="&#x1fd;" horiz-adv-x="722" d="M473 459l-20 -65q28 36 55.5 50.5t64.5 14.5q47 0 73.5 -23t26.5 -64q0 -64 -61.5 -116t-168.5 -69l-37 -6q-5 -25 -5 -46q0 -40 17.5 -62.5t48.5 -22.5q72 0 124 90l28 -17q-66 -136 -194 -136t-143 131q-42 -70 -82.5 -100t-90.5 -30q-52 0 -83 30t-31 88 q0 66 29.5 135t77.5 124q84 97 168 97q33 0 51 -14.5t31 -51.5l18 58zM418 231l-5 -17q65 8 117.5 60.5t52.5 113.5q0 41 -35 41q-72 0 -130 -198zM333 363q0 25 -13.5 40.5t-34.5 15.5q-43 0 -83 -58t-60.5 -125.5t-20.5 -111.5q0 -66 48 -66q47 0 93 79q30 50 50.5 117 t20.5 109zM300 516l122 131q47 50 70 50q20 0 34 -14t14 -33q0 -14 -8.5 -24t-30.5 -23l-152 -87h-49z" />
+<glyph unicode="&#x1fe;" horiz-adv-x="722" d="M633 764l-63 -108q55 -26 88 -82t33 -121q0 -111 -48.5 -207.5t-134.5 -168.5q-114 -95 -240 -95q-45 0 -85 13l-70 -120h-48l79 136q-117 63 -117 201q0 122 58.5 231.5t156.5 175.5t207 66q40 0 82 -13l53 92h49zM182 77l324 553q-27 21 -63 21q-92 0 -165 -130 q-43 -77 -75 -190t-32 -190q0 -33 11 -64zM533 593l-325 -555q28 -22 67 -22q46 0 91.5 38t74.5 97q41 85 73.5 194.5t32.5 181.5q0 30 -14 66zM290 723l122 131q47 50 70 50q20 0 34 -14t14 -33q0 -14 -8.5 -24t-30.5 -23l-152 -87h-49z" />
+<glyph unicode="&#x1ff;" d="M424 560l-65 -116q82 -40 82 -133q0 -127 -86.5 -225.5t-197.5 -98.5q-24 0 -51 8l-64 -114h-40l72 126q-77 44 -77 127q0 128 88.5 228t200.5 100q20 0 42 -6l59 104h37zM116 78l191 341q-14 14 -32 14q-48 0 -86 -68q-27 -49 -50 -136.5t-23 -142.5v-8zM321 377 l-193 -343q14 -18 37 -18q57 0 101 109q22 52 39 127t17 120q0 3 -1 5zM139 516l122 131q47 50 70 50q20 0 34 -14t14 -33q0 -14 -8.5 -24t-30.5 -23l-152 -87h-49z" />
+<glyph unicode="&#x237;" horiz-adv-x="278" d="M239 462l-116 -444q-31 -119 -81 -172t-126 -53q-47 0 -76 22t-29 55q0 22 14.5 37.5t34.5 15.5q22 0 35.5 -13.5t13.5 -35.5q0 -11 -7.5 -20t-7.5 -15q0 -15 24 -15q21 0 38 31t36 105l89 350q12 45 12 67q0 30 -41 30h-22v27q136 12 209 28z" />
+<glyph unicode="&#x250;" horiz-adv-x="512" d="M50 395l-10 21q68 57 128 57q36 0 49.5 -15t13.5 -54q95 69 178 69t83 -69q0 -93 -99 -149q-58 -33 -221 -76l-18 -68q-7 -30 -7 -43q0 -50 63 -50q32 0 59 9t27 26q0 11 -15 30t-15 35q0 28 19 45t50 17q30 0 47 -18.5t17 -52.5q0 -58 -65 -90.5t-156 -32.5 q-79 0 -122 26t-43 74q0 14 5 34l70 261q2 10 2 13q0 15 -15 15q-8 0 -25 -14zM221 362l-40 -148q159 45 159 148q0 40 -38 40q-42 0 -81 -40z" />
+<glyph unicode="&#x251;" horiz-adv-x="612" d="M592 473l-104 -388q-2 -12 -2 -14q0 -11 10 -11q16 0 61 7v-19l-214 -56l14 53q-1 -1 -10 -7l-15 -11q-6 -4 -18 -10.5t-23.5 -11.5t-26.5 -9.5t-32.5 -7t-35.5 -2.5q-23 0 -47 5t-54.5 19.5t-50 47.5t-19.5 81q0 127 98.5 230.5t226.5 103.5q67 0 109 -46l119 46h14z M374 109l62 231q4 13 4 27q0 35 -24 54.5t-54 19.5q-64 0 -129 -87t-65 -190q0 -60 32 -90t78 -30q25 0 57 19.5t39 45.5z" />
+<glyph unicode="&#x252;" horiz-adv-x="612" d="M274 467l-14 -53q1 1 10 8l15 10q6 4 18 10.5t23.5 11.5t26.5 9.5t32.5 7t35.5 2.5q23 0 47 -5t54.5 -19.5t50 -47.5t19.5 -81q0 -128 -98.5 -231t-226.5 -103q-67 0 -109 46l-119 -46h-14l104 388q2 12 2 14q0 11 -10 11q-8 0 -61 -7v18zM243 350l-62 -231 q-4 -13 -4 -27q0 -35 24 -54.5t54 -19.5q64 0 129 87t65 190q0 60 -32 90t-78 30q-25 0 -57 -19.5t-39 -45.5z" />
+<glyph unicode="&#x253;" d="M6 129l103 358q35 120 78.5 162t119.5 42q64 0 103 -28t39 -72q0 -28 -17 -46t-44 -18q-25 0 -42.5 17t-17.5 40q0 20 11 36.5t11 20.5q0 19 -28 19q-26 0 -42.5 -17.5t-27.5 -58.5l-59 -211q65 89 144 89q47 0 77 -37.5t30 -93.5q0 -135 -97 -239.5t-223 -104.5 q-53 0 -95.5 17.5t-42.5 43.5q0 9 20 81zM319 325q0 69 -41 69q-52 0 -92 -84q-24 -52 -62 -182q-15 -51 -15 -81q0 -12 8.5 -19.5t22.5 -7.5q55 0 108 78q30 43 50.5 112t20.5 115z" />
+<glyph unicode="&#x254;" horiz-adv-x="444" d="M69 307l-28 18l38 51q13 16 34.5 36.5t42.5 31.5q34 18 83 18q70 0 111.5 -39.5t41.5 -111.5q0 -134 -105 -239q-83 -85 -180 -85q-46 0 -79 25.5t-33 64.5q0 32 17 51.5t45 19.5q25 0 41.5 -15t16.5 -38q0 -16 -10.5 -32t-10.5 -26q0 -7 7.5 -12t16.5 -5q26 0 47.5 22.5 t45.5 65.5q53 98 53 201q0 43 -19.5 66t-53.5 23q-32 0 -59 -20t-63 -71z" />
+<glyph unicode="&#x255;" horiz-adv-x="444" d="M-1 -157l112 147q-116 23 -116 148q0 134 105 239q83 85 180 85q46 0 79 -25.5t33 -64.5q0 -32 -17 -51.5t-45 -19.5q-25 0 -41.5 15t-16.5 38q0 16 10.5 32t10.5 26q0 7 -7.5 12t-16.5 5q-26 0 -47.5 -22.5t-45.5 -65.5q-53 -98 -53 -201q0 -61 38 -81q91 115 167 115 q36 0 57 -21t21 -50q0 -51 -46.5 -86t-116.5 -35h-25q-45 0 -63 3l-108 -142h-48zM361 99q0 30 -44 30q-45 0 -120 -86q31 -16 77 -16q41 0 64 22t23 50z" />
+<glyph unicode="&#x256;" d="M517 699l-199 -725q-32 -110 -32 -120q0 -29 18 -42.5t44 -13.5q28 0 28 19q0 4 -11 20.5t-11 36.5q0 23 17.5 40t42.5 17q27 0 44 -18t17 -46q0 -45 -39.5 -72.5t-103.5 -27.5q-69 0 -102 26.5t-33 83.5q0 43 20 116l34 125q-72 -131 -166 -131q-48 0 -77 32.5t-29 92.5 q0 72 37 150t94 132q70 68 138 68q46 0 75 -33l18 64q29 102 29 122q0 28 -41 28h-21v27q129 10 209 29zM308 371q0 21 -10.5 35t-26.5 14q-57 1 -114 -112q-24 -48 -39 -100.5t-15 -85.5q0 -28 11.5 -46t29.5 -18q45 0 86 75q27 48 52.5 126.5t25.5 111.5z" />
+<glyph unicode="&#x257;" horiz-adv-x="570" d="M323 429l18 64q11 37 18 58.5t21.5 50t30.5 43.5t41.5 26.5t58.5 11.5q64 0 103 -28t39 -72q0 -28 -17 -46t-44 -18q-25 0 -42.5 17t-17.5 40q0 20 11 36.5t11 20.5q0 19 -28 19q-6 0 -10.5 -1.5t-11 -11.5t-12.5 -30l-129 -471q-14 -53 -14 -63q0 -5 3.5 -10t7.5 -5 q24 0 68 71l22 -16q-79 -126 -150 -126q-28 0 -44 16t-16 45q0 20 11 68q-72 -131 -166 -131q-48 0 -77 32.5t-29 92.5q0 72 37 150t94 132q70 68 138 68q46 0 75 -33zM308 371q0 21 -10.5 35t-26.5 14q-57 1 -114 -112q-24 -48 -39 -100.5t-15 -85.5q0 -28 11.5 -46 t29.5 -18q45 0 86 75q27 48 52.5 126.5t25.5 111.5z" />
+<glyph unicode="&#x258;" horiz-adv-x="444" d="M5 126l37 17q7 -48 34.5 -70t64.5 -22q40 0 78 39.5t50 91.5q-88 21 -128.5 50.5t-40.5 85.5q0 60 51 102t116 42q72 0 113 -48t41 -124q0 -114 -81 -208.5t-185 -94.5q-63 0 -106 34.5t-44 104.5zM306 365q0 64 -39 64q-32 0 -53.5 -41t-21.5 -74q0 -37 23 -63t63 -37 q28 94 28 151z" />
+<glyph unicode="&#x259;" horiz-adv-x="444" d="M86 306l-29 17q78 139 195 139q67 0 106.5 -37.5t39.5 -109.5q0 -124 -89.5 -226t-198.5 -102q-48 0 -76.5 24t-28.5 63q0 63 69 122q32 27 73.5 42.5t114.5 28.5q6 30 6 49q0 82 -64 82q-32 0 -57.5 -20t-60.5 -72zM255 235q-68 -15 -113 -64.5t-45 -111.5q0 -39 31 -39 q71 0 127 215z" />
+<glyph unicode="&#x25a;" horiz-adv-x="626" d="M626 279l-18 -27q-16 -25 -43 -41t-55 -16q-65 0 -65 54q0 16 4 29l26 93l-78 -40q1 -5 1 -16q0 -124 -89.5 -226t-198.5 -102q-48 0 -76.5 24t-28.5 63q0 96 107 149l156 80v16q0 79 -64 79q-32 0 -57.5 -20t-60.5 -72l-29 17q78 139 195 139q114 0 140 -96l127 65 l10 -12l-45 -142q-2 -10 -2 -22q0 -23 37 -23q39 0 64 35l17 25zM261 262l-89 -46q-41 -21 -58 -67.5t-17 -89.5q0 -39 31 -39q40 0 75 68t58 174z" />
+<glyph unicode="&#x25b;" horiz-adv-x="444" d="M394 102l19 -18q-61 -61 -116 -79.5t-124 -18.5q-70 0 -119 26.5t-49 79.5q0 55 45.5 98t110.5 60q-66 34 -66 80q0 53 35.5 87t82 46t103.5 12q40 0 75 -11q37 -12 64 -36t27 -48q0 -50 -49 -50q-28 0 -42 14.5t-30 55.5q-15 38 -55 38q-37 0 -64 -28.5t-27 -76.5 q0 -28 24.5 -48.5t49.5 -20.5h17v-37h-53q-41 0 -74.5 -39t-33.5 -89q0 -30 19 -47t51 -17q52 0 92.5 13.5t86.5 53.5z" />
+<glyph unicode="&#x25c;" horiz-adv-x="480" d="M198 264h24q49 0 88 38t39 89q0 47 -53 47q-38 0 -51 -33q-17 -44 -30.5 -59.5t-42.5 -15.5q-50 0 -50 51q0 24 29.5 49t67.5 36q33 9 78 9q72 0 122 -21t50 -69q0 -49 -32 -79.5t-92 -55.5q40 -11 64 -38t24 -62q0 -41 -23.5 -74t-61 -52t-78 -28.5t-79.5 -9.5 q-33 0 -55.5 3t-49 12t-47 30t-34.5 53l27 18q25 -40 58 -53.5t85 -13.5q50 0 86.5 39.5t36.5 92.5q0 28 -15 44t-42 16h-43v37z" />
+<glyph unicode="&#x25d;" horiz-adv-x="689" d="M689 289l-18 -27q-16 -25 -43 -41t-55 -16q-65 0 -65 54q0 16 4 29l26 93l-78 -40q-20 -52 -115 -91q40 -11 64 -38t24 -62q0 -41 -23.5 -74t-61 -52t-78 -28.5t-79.5 -9.5q-33 0 -55.5 3t-49 12t-47 30t-34.5 53l27 18q25 -40 58 -53.5t85 -13.5q50 0 86.5 39.5 t36.5 92.5q0 28 -15 44t-42 16h-43v37h24q49 0 88 38t39 89q0 47 -53 47q-38 0 -51 -33q-17 -44 -30.5 -59.5t-42.5 -15.5q-50 0 -50 51q0 24 29.5 49t67.5 36q33 9 78 9q172 0 172 -92l113 58l10 -12l-45 -142q-2 -10 -2 -22q0 -23 37 -23q40 0 64 35l17 25z" />
+<glyph unicode="&#x25e;" horiz-adv-x="486" d="M475 385q0 -48 -32 -79.5t-92 -55.5q40 -11 64 -38t24 -62q0 -52 -38 -90.5t-92.5 -56t-114.5 -17.5q-28 0 -56.5 7t-59.5 23t-51 50t-20 82q0 130 91.5 228.5t202.5 98.5q77 0 125.5 -21.5t48.5 -68.5zM204 264h24q49 0 88 38t39 89q0 47 -52 47q-83 0 -152.5 -86.5 t-69.5 -187.5q0 -59 27.5 -94t71.5 -35q50 0 87 39t37 94q0 28 -15 43.5t-42 15.5h-43v37z" />
+<glyph unicode="&#x25f;" horiz-adv-x="367" d="M364 462v-24q-46 -1 -60 -62l-30 -122h51l-13 -46h-50l-49 -187q-30 -114 -78.5 -171t-129.5 -57q-47 0 -76 22t-29 55q0 22 14.5 37.5t34.5 15.5q22 0 35.5 -13.5t13.5 -35.5q0 -11 -7.5 -20t-7.5 -15q0 -15 24 -15q21 0 38 31t36 105l63 248h-109l13 46h108l31 124 q4 13 4 27q0 33 -44 33v24h217z" />
+<glyph unicode="&#x260;" horiz-adv-x="720" d="M258 -68l43 154q-68 -99 -155 -99q-42 0 -72 29.5t-30 105.5q0 68 39 147.5t103 136t128 56.5q52 0 76 -33q51 161 97 203q56 51 123 51q63 0 102 -28t39 -72q0 -28 -17 -46t-44 -18q-25 0 -42.5 17t-17.5 40q0 20 11 36.5t11 20.5q0 19 -29 19q-28 0 -45.5 -17.5 t-29.5 -62.5l-164 -588q-63 -229 -265 -229q-69 0 -121 31q-50 30 -50 80q0 26 17 43t45 17q25 0 42 -15.5t17 -38.5q0 -15 -11.5 -33.5t-11.5 -25.5q0 -27 41 -27q56 0 105.5 44t65.5 102zM368 369q0 50 -35 50q-34 0 -73.5 -54t-65 -124t-25.5 -120q0 -22 4 -35.5t12 -19 t13.5 -6.5t16.5 -1q18 0 42.5 23t45.5 64q24 48 44.5 116t20.5 107z" />
+<glyph unicode="&#x261;" horiz-adv-x="549" d="M520 472l-136 -488q-65 -229 -265 -229q-69 0 -121 31q-50 30 -50 80q0 26 17 43t45 17q25 0 42 -15.5t17 -38.5q0 -15 -11.5 -33.5t-11.5 -25.5q0 -27 41 -27q56 0 105.5 44t65.5 102l43 154q-68 -99 -155 -99q-42 0 -72 29.5t-30 105.5q0 68 39 147.5t103 136t128 56.5 q30 0 52 -9.5t47 -35.5l91 55h16zM368 369q0 50 -35 50q-34 0 -73.5 -54t-65 -124t-25.5 -120q0 -22 4 -35.5t12 -19t13.5 -6.5t16.5 -1q18 0 42.5 23t45.5 64q24 48 44.5 116t20.5 107z" />
+<glyph unicode="&#x262;" horiz-adv-x="561" d="M544 460l-42 -157h-18q-10 40 -17.5 60t-24.5 40q-33 37 -90 37q-80 0 -141.5 -99t-61.5 -214q0 -56 22.5 -86t79.5 -30q68 0 83 56l16 59q3 12 3 21q0 14 -13.5 21t-49.5 9v16h250v-16q-40 -4 -55 -18.5t-25 -49.5l-22 -78q-87 -42 -211 -42q-95 0 -150.5 45t-55.5 124 q0 120 100.5 212t225.5 92q49 0 107 -24q17 -9 30 -9q19 0 41 31h19z" />
+<glyph unicode="&#x263;" horiz-adv-x="444" d="M236 188l11 -81q89 166 89 210q0 13 -25 34q-31 25 -31 54q0 21 16 39t42 18q25 0 43.5 -19t18.5 -45q0 -53 -40.5 -149t-103.5 -200l17 -122q4 -24 4 -68q0 -43 -38.5 -68t-92.5 -25q-73 0 -73 67q0 33 31 78l50 72q-9 87 -54 303q-21 94 -40 113q-8 8 -14.5 10t-25.5 2 v27q86 8 150 24q45 -116 66 -274zM162 -69l-30 -47q-19 -29 -19 -55q0 -30 26 -30q32 0 32 49q0 19 -3 37z" />
+<glyph unicode="&#x264;" horiz-adv-x="493" d="M240 263l102 116q63 71 90 71q25 0 40.5 -18.5t15.5 -43.5q0 -32 -16 -73h-10q-11 42 -46 42q-32 0 -72 -47l-83 -94l11 -28l14 -36q4 -12 8.5 -31t4.5 -32q0 -48 -46.5 -73.5t-99.5 -25.5q-33 0 -54.5 15.5t-21.5 46.5q0 38 41 83l49 52l-48 117l-11 24q-4 9 -14.5 19 t-23.5 10q-15 0 -26 -12.5t-15 -29.5h-10q-9 22 -9 37q0 39 31 68.5t70 29.5q52 0 82 -73zM208 65q0 20 -21 70l-10 -10l-11 -11q-2 -2 -9 -10t-8.5 -12t-5.5 -11.5t-5 -14.5t-1 -15q0 -28 28 -28q17 0 30 13t13 29z" />
+<glyph unicode="&#x265;" horiz-adv-x="556" d="M498 450l-152 -562q-10 -37 -10 -47q0 -33 42 -33h22v-27q-99 -9 -209 -30l108 416q-74 -105 -118 -142t-95 -37q-36 0 -56 20t-20 55q0 24 7 46l81 254q3 8 3 12q0 16 -17 16t-75 -83l-22 15q50 77 85.5 106.5t81.5 29.5q30 0 48.5 -17t18.5 -47q0 -23 -10 -55l-75 -229 q-6 -18 -6 -30q0 -21 20 -21q44 0 108 94q36 53 58 108t61 188h121z" />
+<glyph unicode="&#x266;" horiz-adv-x="556" d="M476 142l22 -15q-50 -77 -85.5 -106.5t-81.5 -29.5q-30 0 -48.5 17t-18.5 47q0 25 7 46l78 238q6 18 6 30q0 21 -20 21q-44 0 -108 -94q-36 -53 -58 -108t-61 -188h-121l150 555q35 128 182 128q64 0 103 -28t39 -72q0 -28 -17 -46t-44 -18q-25 0 -42.5 17t-17.5 40 q0 20 11 36.5t11 20.5q0 19 -29 19q-51 0 -69 -69l-78 -300q74 105 118 142t95 37q37 0 56.5 -20t19.5 -55q0 -21 -7 -46l-81 -254q-3 -8 -3 -12q0 -16 17 -16t75 83z" />
+<glyph unicode="&#x267;" horiz-adv-x="533" d="M264 583l-78 -300q74 105 118 142t95 37q37 0 56.5 -20t19.5 -55q0 -21 -8 -49l-108 -338q-31 -95 -61 -129q-33 -39 -67.5 -57.5t-84.5 -18.5q-62 0 -101 28t-39 72q0 27 17 44t45 17q25 0 42 -15.5t17 -38.5q0 -15 -11.5 -33t-11.5 -26q0 -17 34 -17q44 0 65 65 l146 448q6 18 6 30q0 21 -20 21q-44 0 -108 -94q-36 -53 -58 -108t-61 -188h-121l150 555q35 128 182 128q64 0 103 -28t39 -72q0 -28 -17 -46t-44 -18q-25 0 -42.5 17t-17.5 40q0 20 11 36.5t11 20.5q0 19 -29 19q-51 0 -69 -69z" />
+<glyph unicode="&#x268;" horiz-adv-x="278" d="M262 616q0 -28 -19.5 -47t-48.5 -19q-28 0 -47 20t-19 49q0 25 20 45t45 20q28 0 48.5 -20t20.5 -48zM216 142l22 -14q-48 -79 -85 -108t-83 -29q-68 0 -68 63q0 22 15 76l25 93h-52l13 46h51l18 64q8 27 8 45q0 29 -46 29h-14v27q118 9 203 28l-53 -193h57l-13 -46h-56 l-26 -95q-9 -31 -9 -51q0 -16 15 -16q21 0 64 61z" />
+<glyph unicode="&#x269;" horiz-adv-x="253" d="M225 95l12 -17l-15 -17q-14 -17 -18 -21t-19 -17t-25.5 -17t-28 -9t-36.5 -5q-93 0 -93 79q0 14 12 59l56 207q7 28 7 40q0 11 -6 11q-16 0 -47 -10l8 27q13 5 40 14l41 14l34 11q19 6 31.5 9t19.5 3q15 0 15 -14q0 -6 -2 -14l-82 -300q-9 -33 -9 -48q0 -30 22 -30 q37 0 83 45z" />
+<glyph unicode="&#x26a;" horiz-adv-x="304" d="M321 462v-17q-38 -2 -54.5 -12.5t-23.5 -39.5l-86 -320q-5 -18 -5 -27q0 -16 12 -21.5t43 -7.5v-17h-239v17q40 4 55.5 14.5t23.5 41.5l85 320q3 12 3 21q0 16 -12 22.5t-40 8.5v17h238z" />
+<glyph unicode="&#x26b;" horiz-adv-x="320" d="M327 447h41q-16 -63 -44 -91t-73 -28q-18 0 -26 2l-43 -154q-22 -79 -22 -100q0 -15 15 -15q25 0 79 80l22 -14q-52 -80 -87 -108t-82 -28q-30 0 -49 18t-19 45q0 34 34 155l45 159q-7 2 -21 2q-17 0 -28 -9t-20 -32h-40q10 54 40 86t73 32q7 0 19 -2l34 129q6 24 6 39 q0 30 -42 30q-11 0 -22 -1v27q98 9 210 30l-80 -288q18 -6 29 -6q17 0 28.5 9t22.5 33z" />
+<glyph unicode="&#x26c;" horiz-adv-x="445" d="M412 384l5 -21q-7 -8 -20 -21t-54.5 -44t-84.5 -50l-20 -72q-22 -79 -22 -100q0 -15 15 -15q25 0 79 80l22 -14q-52 -80 -87 -108t-82 -28q-30 0 -49 18t-19 45q0 34 34 155l6 21q-11 -1 -28 -1q-40 0 -65 20.5t-25 58.5q0 66 48.5 108t103.5 42q15 0 30 -5l29 105 q9 36 9 55q0 30 -42 30q-11 0 -22 -1v27q98 9 210 30l-111 -399q59 20 140 84zM148 276l40 141q-10 4 -25 4q-31 0 -58.5 -32t-27.5 -65q0 -38 41 -47q5 -1 30 -1z" />
+<glyph unicode="&#x26d;" horiz-adv-x="291" d="M290 699l-224 -809q-5 -18 -5 -33q0 -25 10.5 -42t28.5 -17q32 0 32 17q0 7 -11.5 26t-11.5 33q0 23 17 38.5t42 15.5q28 0 45 -17t17 -44q0 -44 -39 -72t-101 -28q-67 0 -102 33t-35 91q0 26 7 51l150 526q34 118 34 145q0 30 -42 30q-11 0 -22 -1v27q98 9 210 30z" />
+<glyph unicode="&#x26e;" horiz-adv-x="623" d="M585 423l-209 -191h17q46 0 79 -37t33 -100q0 -140 -97 -235.5t-204 -95.5q-41 0 -82 10.5t-61 24.5q-44 31 -44 69q0 20 14.5 35t44.5 15q57 0 67 -67q4 -22 24.5 -36t44.5 -14q43 0 83 54.5t61.5 121.5t21.5 116q0 75 -56 75q-19 0 -43 -23l-102 -98q-58 -56 -107 -56 q-32 0 -50 18.5t-18 43.5q0 37 24 120l105 370q13 45 13 70q0 30 -40 30q-16 0 -24 -1v27q108 11 210 30l-69 -249h364v-27zM476 377h-211q-17 0 -46.5 -21t-37.5 -50l-48 -174q-10 -34 -10 -47q0 -19 11 -19q4 0 14.5 8.5t27.5 25.5l17 16z" />
+<glyph unicode="&#x26f;" horiz-adv-x="778" d="M723 453l-66 -232q-36 -125 -36 -150t38 -25h18v-27q-130 -10 -200 -27l63 199h-1q-70 -108 -104 -142q-58 -58 -114 -58q-31 0 -49 17.5t-18 49.5q0 37 26 105q-61 -99 -102.5 -135.5t-95.5 -36.5q-35 0 -56 20t-21 51q0 35 9 61l72 214q8 25 8 39q0 18 -16 18 q-22 0 -58 -58q-6 -10 -12 -18l-22 13q38 71 75.5 101t85.5 30q68 0 68 -66q0 -26 -11 -62l-72 -219q-6 -19 -6 -30q0 -8 6.5 -14.5t15.5 -6.5q48 0 113 116q27 48 42.5 89t58.5 184h120l-65 -207q-42 -134 -42 -160q0 -22 17 -22q23 0 63 47q43 51 75 126t72 216h121z" />
+<glyph unicode="&#x270;" horiz-adv-x="778" d="M723 453l-195 -686h-123l135 424h-1q-68 -105 -100 -138q-60 -62 -118 -62q-31 0 -49 17.5t-18 49.5q0 37 26 105q-61 -99 -102.5 -135.5t-95.5 -36.5q-35 0 -56 20t-21 51q0 35 9 61l72 214q8 25 8 39q0 18 -16 18q-22 0 -58 -58q-6 -10 -12 -18l-22 13q38 71 75.5 101 t85.5 30q68 0 68 -66q0 -26 -11 -62l-72 -219q-6 -19 -6 -30q0 -8 6.5 -14.5t15.5 -6.5q48 0 113 116q27 48 42.5 89t58.5 184h120l-65 -207q-42 -134 -42 -160q0 -22 17 -22q23 0 63 47q43 51 75 126t72 216h121z" />
+<glyph unicode="&#x271;" horiz-adv-x="759" d="M169 262h1q70 108 104 142q58 58 114 58q32 0 49.5 -18t17.5 -49q0 -37 -26 -105q61 99 102.5 135.5t95.5 36.5q35 0 56 -20t21 -51q0 -35 -9 -62l-140 -422q-16 -45 -32 -64q-61 -76 -164 -76q-62 0 -101 28t-39 72q0 27 17 44t45 17q25 0 42 -16t17 -39 q0 -13 -11.5 -32t-11.5 -27q0 -16 34 -16q49 0 70 65l156 475q6 20 6 30q0 8 -6.5 14.5t-15.5 6.5q-48 0 -113 -116q-27 -48 -42.5 -89t-58.5 -184h-120l65 207q42 134 42 160q0 22 -17 22q-23 0 -63 -47q-43 -51 -75 -126t-72 -216h-121l66 232q36 125 36 150t-38 25h-18 v27q130 10 200 27z" />
+<glyph unicode="&#x272;" horiz-adv-x="694" d="M610 135l22 -13q-41 -72 -77.5 -101.5t-82.5 -29.5q-68 0 -68 60q0 47 26 125l55 165q6 20 6 28q0 21 -24 21q-13 0 -33 -16.5t-36 -37.5q-79 -103 -125 -264l-46 -161q-21 -76 -66 -110t-130 -34q-62 0 -101 28t-39 72q0 27 17 44t45 17q25 0 42 -15.5t17 -38.5 q0 -14 -11.5 -33t-11.5 -26q0 -17 32 -17q25 0 44.5 16.5t28.5 48.5l95 341q45 164 45 179q0 14 -11.5 18.5t-43.5 5.5v27q90 3 199 27l-62 -198h1q51 75 73 103.5t49 54.5q43 41 100 41q73 0 73 -77q0 -34 -28 -116l-35 -104q-24 -71 -24 -89q0 -17 14 -17q13 0 27 15 t44 61z" />
+<glyph unicode="&#x273;" horiz-adv-x="505" d="M446 269l-127 -379q-7 -21 -7 -46q0 -19 14 -32.5t30 -13.5q32 0 32 17q0 6 -11.5 25.5t-11.5 33.5q0 23 17 38.5t42 15.5q28 0 45 -17t17 -44q0 -44 -39 -72t-101 -28q-67 0 -103 34t-36 93q0 25 15 70l124 377q7 23 7 28q0 21 -24 21q-13 0 -33 -16.5t-36 -37.5 q-47 -62 -79 -135t-66 -201h-121l57 204q45 164 45 179q0 14 -11.5 18.5t-43.5 5.5v27q90 3 199 27l-62 -198h1q51 75 73 103.5t49 54.5q43 41 100 41q73 0 73 -77q0 -34 -28 -116z" />
+<glyph unicode="&#x274;" horiz-adv-x="588" d="M614 462v-17q-40 -5 -53.5 -15t-21.5 -41l-107 -401h-23l-244 372l-73 -271q-6 -21 -6 -34q0 -19 13.5 -27t47.5 -11v-17h-174v17q43 5 58.5 15.5t23.5 41.5l86 323q-27 48 -52 48v17h167l190 -294l55 205q6 21 6 35q0 19 -13 27t-44 10v17h164z" />
+<glyph unicode="&#x275;" d="M441 311q0 -69 -29 -135.5t-76 -113.5q-75 -75 -175 -75q-73 0 -118.5 38.5t-45.5 109.5q0 73 27 139t73 111q79 77 183 77q75 0 118 -41t43 -110zM143 253h164q15 66 15 119q0 28 -12.5 44.5t-34.5 16.5q-32 0 -60 -31q-44 -48 -72 -149zM295 207h-165q-14 -68 -14 -127 q0 -64 49 -64q41 0 71 49q34 54 59 142z" />
+<glyph unicode="&#x276;" horiz-adv-x="749" d="M751 457l-36 -137h-18q1 9 1 25q0 49 -29 70q-25 18 -111 18q-36 0 -41 -18l-45 -167q59 3 81 19t52 80h18l-62 -229h-17q3 22 3 41q0 35 -18 49t-63 16l-46 -170q-3 -8 -3 -14q0 -10 10 -14t36 -4q82 0 129 34q46 35 85 86h20l-69 -144h-307q-60 0 -78 -1q-20 -2 -30 -2 q-190 0 -190 160q0 80 44 152.5t115 113.5q73 41 156 41q3 0 18 -1t41.5 -2.5t55.5 -1.5h298zM332 142l53 197q12 43 12 63q0 10 -3 18q-7 18 -50 18q-54 0 -103.5 -51.5t-78 -129.5t-28.5 -155q0 -43 20.5 -63t68.5 -20q46 0 68 19q17 16 41 104z" />
+<glyph unicode="&#x277;" horiz-adv-x="685" d="M626 265q0 -102 -76 -184.5t-180 -82.5q-58 0 -94 48q-53 -48 -134 -48q-68 0 -106.5 39.5t-38.5 101.5q0 58 25 111.5t65.5 94t91.5 71t105 46t103 15.5q99 0 169 -58t70 -154zM489 314q0 69 -29.5 104t-79.5 35q-56 0 -113 -47.5t-95 -129t-38 -169.5q0 -27 11 -45 t31 -18q26 0 55 17.5t29 55.5q0 36 -2.5 75.5t-2.5 49.5q0 31 22 58t61 27q53 0 53 -66q0 -28 -30 -78.5t-30 -85.5q0 -24 10.5 -38.5t27.5 -14.5q30 0 54.5 32.5t38 79.5t20.5 89t7 69z" />
+<glyph unicode="&#x278;" horiz-adv-x="691" d="M483 591l-41 -156q75 -8 132.5 -50.5t57.5 -114.5t-51.5 -135t-121.5 -97.5t-134 -38.5l-37 -138q-6 -23 -6 -36q0 -18 12.5 -24t43.5 -8v-24h-277v24q42 3 60 17t29 54l36 135q-75 5 -132 53.5t-57 121.5q0 57 31 106.5t78.5 81.5t99 51t97.5 22l41 153q5 18 5 34 q0 20 -12.5 28.5t-43.5 10.5v24h277v-24q-42 -2 -59 -15t-28 -55zM432 398l-97 -360q61 27 109 100t48 145q0 89 -60 115zM196 39l97 359q-57 -18 -106.5 -89t-49.5 -143q0 -43 16 -77t43 -50z" />
+<glyph unicode="&#x279;" horiz-adv-x="427" d="M289 462h121q-102 -345 -102 -382q0 -14 11.5 -19.5t44.5 -5.5v-27q-131 -11 -200 -28l65 209h-1q-60 -121 -95.5 -165t-75.5 -44q-26 0 -41.5 18t-15.5 48q0 31 16.5 52t41.5 21q22 0 37.5 -19t23.5 -19q23 0 65 76q36 65 74 186z" />
+<glyph unicode="&#x27a;" horiz-adv-x="493" d="M476 699l-139 -489q-44 -156 -44 -158q0 -25 71 -25v-27h-200l65 209h-1q-60 -121 -95.5 -165t-75.5 -44q-26 0 -41.5 18t-15.5 48q0 31 16.5 52t41.5 21q22 0 37.5 -19t23.5 -19q23 0 65 76q44 79 74 186l56 196q10 33 10 54q0 30 -36 30q-11 0 -22 -1v28q109 10 210 29 z" />
+<glyph unicode="&#x27b;" horiz-adv-x="436" d="M409 462l-162 -569q-4 -12 -4 -28q0 -28 12.5 -47.5t30.5 -19.5q33 0 33 16q0 8 -11.5 26.5t-11.5 33.5q0 23 17 38.5t42 15.5q28 0 45 -17t17 -44q0 -44 -39 -72t-101 -28q-68 0 -104 34.5t-36 94.5q0 15 5 33l87 280h-1q-60 -121 -95.5 -165t-75.5 -44q-26 0 -41.5 18 t-15.5 48q0 31 16.5 52t41.5 21q22 0 37.5 -19t23.5 -19q23 0 65 76q36 65 74 186l31 99h120z" />
+<glyph unicode="&#x27c;" horiz-adv-x="389" d="M160 253h1q60 121 95.5 165t75.5 44q26 0 41.5 -18t15.5 -48q0 -31 -16.5 -52t-41.5 -21q-22 0 -37.5 19t-23.5 19q-23 0 -65 -76q-36 -65 -74 -186l-103 -332h-115l134 468q34 117 34 147q0 14 -11.5 19.5t-44.5 5.5v27q131 11 200 28z" />
+<glyph unicode="&#x27d;" horiz-adv-x="389" d="M160 253h1q60 121 95.5 165t75.5 44q26 0 41.5 -18t15.5 -48q0 -31 -16.5 -52t-41.5 -21q-22 0 -37.5 19t-23.5 19q-22 0 -65 -76q-15 -27 -23 -44.5t-26.5 -70.5t-51.5 -156q-45 -141 -45 -155q0 -25 12.5 -43t30.5 -18q32 0 32 17q0 6 -11.5 25.5t-11.5 33.5 q0 23 17 38.5t42 15.5q28 0 45 -17t17 -44q0 -44 -39 -72t-101 -28q-67 0 -103 33.5t-36 92.5q0 13 5 33l91 316q32 110 32 140q0 14 -11.5 19.5t-44.5 5.5v27q131 11 200 28z" />
+<glyph unicode="&#x27e;" horiz-adv-x="360" d="M-21 0l76 267q19 66 35.5 102.5t45.5 63.5q56 51 139 51q64 0 103 -28t39 -72q0 -28 -17 -46t-44 -18q-25 0 -42.5 17t-17.5 40q0 20 11 36.5t11 20.5q0 19 -29 19q-48 0 -72 -75l-118 -378h-120z" />
+<glyph unicode="&#x27f;" horiz-adv-x="338" d="M63 0l110 380q5 16 5 33q0 40 -40 40q-29 0 -29 -19q0 -4 11 -20.5t11 -36.5q0 -23 -17.5 -40t-42.5 -17q-27 0 -44 18t-17 46q0 44 39 72t103 28q102 0 130 -51q10 -19 10 -44q0 -46 -26 -127l-82 -262h-121z" />
+<glyph unicode="&#x280;" horiz-adv-x="498" d="M123 464h215q91 0 134 -21.5t43 -73.5q0 -56 -41 -92.5t-103 -50.5l85 -194q7 -15 26 -15v-17h-146l-84 215h-19l-36 -134q-7 -24 -7 -36q0 -14 10.5 -19t39.5 -9v-17h-232v17q41 5 53.5 15t23.5 51l79 295q7 24 7 38q0 16 -11 22.5t-37 8.5v17zM239 238h21 q66 0 101.5 39.5t35.5 108.5q0 29 -16 42t-52 13q-20 0 -29.5 -7t-14.5 -24z" />
+<glyph unicode="&#x281;" horiz-adv-x="498" d="M597 464v-17q-21 0 -34 -15l-189 -194q84 -23 84 -88q0 -75 -66 -112.5t-178 -37.5h-206v17q38 2 53 15.5t25 53.5l79 295q7 24 7 38t-10.5 19.5t-38.5 8.5v17h232v-17q-42 -5 -54 -15.5t-23 -48.5l-36 -134h19l199 215h137zM236 226l-47 -172q-2 -10 -2 -13 q0 -18 30 -18q55 0 89 40.5t34 105.5q0 32 -24 44t-80 13z" />
+<glyph unicode="&#x282;" horiz-adv-x="389" d="M333 461l-23 -154l-27 2q-12 63 -33 91.5t-55 28.5q-24 0 -38.5 -14.5t-14.5 -38.5q0 -33 57 -99q80 -93 80 -162q0 -56 -43 -92t-105 -36q-35 0 -64 12q-21 8 -31 8q-12 0 -20 -8t-9 -17l-9 -84q-1 -6 -1 -16q0 -69 73 -69q39 0 39 17q0 7 -11.5 25.5t-11.5 33.5 q0 23 17 38.5t42 15.5q28 0 45 -17t17 -44q0 -44 -39.5 -72t-101.5 -28q-98 0 -98 91q0 18 2 30l33 250l27 -3q17 -133 93 -133q29 0 44.5 14.5t15.5 39.5q0 41 -56 104q-50 56 -65 87.5t-15 73.5q0 59 36.5 92.5t97.5 33.5q33 0 58 -12q21 -10 37 -10q11 0 16 4t12 17h29z " />
+<glyph unicode="&#x283;" horiz-adv-x="424" d="M106 -53l116 466q14 56 32 99t47 84.5t73 64t100 22.5q52 0 81 -21t29 -57q0 -26 -15 -43.5t-39 -17.5q-23 0 -38 14t-15 33q0 14 9 29.5t9 18.5q0 5 -6.5 9.5t-16.5 4.5q-19 0 -34.5 -13.5t-27 -42.5t-16.5 -45t-14 -50l-114 -454q-15 -60 -33 -104.5t-47.5 -87.5 t-75 -66t-104.5 -23q-50 0 -80 21t-30 57q0 26 15 43.5t39 17.5q23 0 38 -14t15 -33q0 -14 -9 -29.5t-9 -18.5q0 -14 26 -14q21 0 36.5 12t27 39.5t17 44.5t14.5 54z" />
+<glyph unicode="&#x284;" horiz-adv-x="394" d="M113 46l110 437q26 103 76 149q56 51 135 51q64 0 103 -28t39 -72q0 -28 -17 -46t-44 -18q-25 0 -42.5 17t-17.5 40q0 20 11 36.5t11 20.5q0 19 -29 19q-60 0 -76 -60l-143 -546h68l-12 -46h-68q-31 -109 -80 -158t-122 -49q-47 0 -76 22t-29 55q0 22 14.5 37.5 t34.5 15.5q22 0 35.5 -13.5t13.5 -35.5q0 -11 -7.5 -20t-7.5 -15q0 -15 24 -15q21 0 38 31t36 105l10 40h-62l12 46h62z" />
+<glyph unicode="&#x285;" horiz-adv-x="415" d="M324 280l-103 -386q-11 -44 -11 -59q0 -14 1 -20t6 -12t16 -6q9 0 15.5 4.5t6.5 9.5q0 3 -9 18.5t-9 29.5q0 19 15 33t38 14q24 0 39 -17.5t15 -43.5q0 -36 -29.5 -57t-81.5 -21q-67 0 -101.5 34t-34.5 92q0 29 9 64l107 397q8 30 8 50q0 36 -29 36q-10 0 -17 -4.5 t-7 -9.5q0 -3 9 -18.5t9 -29.5q0 -19 -15 -33t-38 -14q-24 0 -39 17.5t-15 43.5q0 36 29.5 57t81.5 21q67 0 105 -34t38 -91q0 -31 -9 -65z" />
+<glyph unicode="&#x286;" horiz-adv-x="521" d="M181 21l97 388q14 56 32 100t47 86t73 65t101 23q51 0 80.5 -21t29.5 -57q0 -26 -15.5 -43.5t-38.5 -17.5t-38 13.5t-15 33.5q0 14 9 29.5t9 18.5q0 5 -6.5 9.5t-15.5 4.5q-20 0 -35.5 -13.5t-27 -40.5t-16.5 -44.5t-13 -48.5l-108 -430q-21 -84 -34 -115q18 -36 18 -105 q0 -50 -17 -99h-42q19 51 19 82q0 12 -7 54q-71 -126 -211 -126q-48 0 -72 26.5t-24 64.5q0 76 53 121.5t136 45.5q8 0 32 -4zM171 -19q-15 4 -39 4q-56 0 -94 -35.5t-38 -83.5q0 -24 15 -41.5t50 -17.5q30 0 51 24.5t31 56.5q6 19 24 93z" />
+<glyph unicode="&#x287;" horiz-adv-x="310" d="M85 363l-23 15q49 76 86.5 105.5t83.5 29.5q67 0 67 -65q0 -28 -25 -115l-67 -236h52v-35q-62 -21 -103 -55t-81 -97h-35l39 145h-72v42h83l34 119q53 185 53 209q0 18 -16 18q-25 0 -76 -80z" />
+<glyph unicode="&#x288;" horiz-adv-x="311" d="M281 407h-83l-146 -512q-3 -11 -3 -28q0 -29 11 -49t29 -20q33 0 33 17q0 6 -11.5 25.5t-11.5 33.5q0 23 17 38.5t42 15.5q28 0 45 -17t17 -44q0 -44 -39 -72t-101 -28q-68 0 -104 32.5t-36 91.5q0 20 4 35l137 481h-52v35q62 21 103 55t81 97h35l-39 -145h72v-42z" />
+<glyph unicode="&#x289;" horiz-adv-x="556" d="M514 269l-13 -46h-80l-11 -40q-25 -88 -25 -103q0 -21 14 -21q24 0 72 74l22 -13q-39 -67 -76.5 -98t-82.5 -31q-68 0 -68 60q0 31 26 110h-1q-70 -103 -109.5 -136.5t-88.5 -33.5q-78 0 -78 79q0 27 22 106l13 47h-66l15 46h65l10 35q17 62 17 75q0 24 -58 28v27 q87 2 210 28l-60 -193h131q23 58 56 180h118l-53 -180h79zM294 223h-125l-19 -63q-16 -51 -16 -72q0 -25 24 -25q28 0 70 55q41 53 66 105z" />
+<glyph unicode="&#x28a;" d="M552 428h-75q-15 0 -23.5 -13.5t-8.5 -31.5q0 -10 26 -54.5t26 -85.5q0 -69 -46 -128t-114.5 -91t-138.5 -32q-85 0 -134 46t-49 120q0 107 128 207q25 20 25 38q0 25 -17 25h-73v24h192l-47 -93q-31 -60 -42.5 -86.5t-23 -73t-11.5 -95.5q0 -88 58 -88q93 0 145 191 q24 86 24 192q0 34 -1 53h180v-24z" />
+<glyph unicode="&#x28b;" horiz-adv-x="534" d="M243 462l-101 -328q-4 -13 -4 -32q0 -27 23.5 -44.5t53.5 -17.5q81 0 147 83.5t66 166.5q0 20 -5.5 31t-18.5 22t-18 17q-19 23 -19 48q0 20 16.5 37t40.5 17q68 0 68 -112q0 -85 -38.5 -166.5t-112.5 -137.5t-163 -56q-160 0 -160 104q0 12 10 50l57 199q6 30 6 33 q0 20 -20 25q-18 5 -38 6v27q73 0 210 28z" />
+<glyph unicode="&#x28c;" horiz-adv-x="444" d="M401 41v-27q-101 -14 -156 -27q-31 99 -31 334q-74 -84 -100 -123.5t-26 -65.5q0 -13 20 -36q25 -28 25 -53q0 -23 -17 -39.5t-40 -16.5q-27 0 -44 20t-17 47q0 67 60 154q41 60 88 111.5t142 142.5h26q-5 -91 -5 -177q0 -175 25 -225q10 -19 50 -19z" />
+<glyph unicode="&#x28d;" horiz-adv-x="667" d="M614 42v-27q-110 -18 -156 -28q-33 123 -33 274l-156 -274h-27l-31 333q-120 -140 -120 -187q0 -15 20 -38q22 -25 22 -48q0 -29 -16.5 -44.5t-40.5 -15.5q-25 0 -43 18.5t-18 43.5q0 131 272 413h27l23 -285q85 157 114 201l56 84h27v-46q0 -4 -0.5 -24.5t-0.5 -37.5 q0 -94 11.5 -191.5t26.5 -110.5q11 -10 43 -10z" />
+<glyph unicode="&#x28e;" horiz-adv-x="444" d="M169 352h-2q-52 -99 -69.5 -141t-17.5 -66q0 -13 25 -34q31 -25 31 -54q0 -21 -16 -39t-42 -18q-25 0 -43.5 19t-18.5 45q0 76 75.5 227t173.5 270q41 50 87.5 78t87.5 28q26 0 44 -17.5t18 -42.5q0 -22 -15.5 -39t-34.5 -17q-25 0 -51 18t-43 18q-13 0 -32 -15t-35 -37 q-25 -35 -25 -71q0 -50 50 -288q21 -94 40 -113q8 -8 14.5 -10t25.5 -2v-27q-86 -8 -150 -24q-43 111 -66 274z" />
+<glyph unicode="&#x28f;" horiz-adv-x="633" d="M606 464v-17q-38 -5 -60 -27l-209 -214l-32 -122q-7 -26 -7 -35q0 -17 13 -23t48 -9v-17h-274v17q49 4 65.5 17.5t26.5 53.5l24 93l-81 225q-13 38 -55 41v17h265v-17l-23 -2q-20 -2 -27.5 -3t-14 -6t-6.5 -15q0 -7 9 -36l53 -159l118 122q53 57 53 78q0 10 -12.5 14.5 t-47.5 6.5v17h174z" />
+<glyph unicode="&#x290;" horiz-adv-x="440" d="M343 156l-97 -275q-7 -21 -7 -34q0 -34 31 -34q37 0 37 17q0 6 -11.5 25.5t-11.5 33.5q0 23 17 38.5t42 15.5q28 0 45 -17t17 -44q0 -44 -37.5 -72t-98.5 -28q-28 0 -48 16t-20 43q0 22 10 50l40 109h-275v22l273 331h-136q-29 0 -45.5 -13.5t-27.5 -47.5l-27 3l44 154 h311v-10l-287 -343h174q29 0 60 60h28z" />
+<glyph unicode="&#x291;" horiz-adv-x="411" d="M80 96h95q54 84 114 84q87 0 87 -75q0 -46 -37 -75.5t-106 -29.5h-71l-55 -97h-42l55 97h-144v22l273 331h-136q-29 0 -45.5 -13.5t-27.5 -47.5l-27 3l44 154h311v-10zM219 96h57q57 0 57 25q0 12 -12.5 19t-26.5 7q-37 0 -75 -51z" />
+<glyph unicode="&#x292;" horiz-adv-x="499" d="M558 423l-246 -197q22 6 54 6q46 0 79 -37t33 -100q0 -140 -97 -235.5t-204 -95.5q-41 0 -82 10.5t-61 24.5q-44 31 -44 69q0 20 14.5 35t44.5 15q57 0 67 -67q4 -22 24.5 -36t44.5 -14q43 0 83 54.5t61.5 121.5t21.5 116q0 75 -56 75q-62 0 -122 -47l-20 24l290 232 h-204q-20 0 -50.5 -23.5t-44.5 -59.5h-26l76 156h364v-27z" />
+<glyph unicode="&#x293;" horiz-adv-x="499" d="M528 423l-246 -197q24 6 52 6q45 0 79.5 -35t34.5 -107q0 -93 -56.5 -181t-162.5 -130l22 -86h-48l-18 75q-20 -4 -53 -4q-142 0 -142 94q0 43 34 68.5t88 25.5q38 0 62.5 -25t40.5 -97q40 32 73 118t33 137q0 83 -56 83q-61 0 -122 -47l-20 24l290 232h-204 q-20 0 -50.5 -23.5t-44.5 -59.5h-26l76 156h364v-27zM177 -195q-27 110 -59 110q-19 0 -30 -14t-11 -36q0 -28 23 -46t56 -18q13 0 21 4z" />
+<glyph unicode="&#x294;" horiz-adv-x="530" d="M193 380h31q72 0 119.5 65t47.5 149q0 62 -35 62q-25 0 -45 -19t-26 -43q-16 -63 -72 -63q-25 0 -39 15.5t-14 32.5q0 47 55 79q47 27 123 27q79 0 130.5 -40.5t51.5 -105.5q0 -104 -70 -180.5t-178 -76.5l-44 -161q-12 -42 -12 -55q0 -41 49 -42v-24h-240v24q38 3 61 22 q13 10 18.5 19.5t12.5 36.5z" />
+<glyph unicode="&#x295;" horiz-adv-x="530" d="M152 84l54 198q-61 6 -94 49t-33 102q0 106 82 179t192 73q60 0 106 -30q50 -31 50 -76q0 -17 -14 -32.5t-39 -15.5q-55 0 -71 60l-7 25q-3 8 -9 19.5t-15.5 16t-22.5 4.5q-41 0 -82 -70t-41 -116q0 -41 30 -65.5t70 -24.5h32l-81 -293q-3 -12 -3 -21q0 -40 49 -42v-24 h-240v24q72 6 87 60z" />
+<glyph unicode="&#x296;" horiz-adv-x="487" d="M453 669v-24q-72 -6 -86 -60l-52 -196q63 -7 100 -50.5t37 -101.5q0 -108 -80 -179.5t-189 -71.5q-62 0 -110 23.5t-48 63.5q0 29 15 48t47 19q31 0 43 -17t18 -48q5 -25 21 -42.5t41 -17.5q44 0 78.5 60.5t34.5 126.5q0 40 -35 64.5t-75 24.5h-32l78 291q3 12 3 21 q0 40 -49 42v24h240z" />
+<glyph unicode="&#x297;" horiz-adv-x="479" d="M24 -82l104 385q13 49 57.5 86.5t95.5 55t98 17.5q60 0 112.5 -34.5t52.5 -84.5q0 -21 -16 -41.5t-47 -20.5q-23 0 -40 11.5t-17 29.5q0 16 6 30t6 26q0 25 -12.5 35.5t-38.5 10.5q-39 0 -73 -27t-45 -66l-109 -405q-6 -20 -6 -38q0 -33 17 -54t47 -21q46 0 88.5 35 t55.5 83l7 26h43l-11 -40q-18 -64 -80.5 -109t-143.5 -45q-64 0 -109.5 34.5t-45.5 88.5q0 17 4 32z" />
+<glyph unicode="&#x298;" horiz-adv-x="723" d="M438 328q0 -33 -22 -55.5t-55 -22.5q-34 0 -57.5 22.5t-23.5 55.5q0 34 23 57t57 23q32 0 55 -23t23 -57zM734 429q0 -115 -64 -218.5t-169 -165.5t-219 -62q-117 0 -193 68.5t-76 183.5q0 89 40.5 172.5t105 142.5t147.5 94.5t165 35.5q121 0 192 -69.5t71 -181.5z M606 464q0 177 -151 177q-81 0 -154 -63.5t-116.5 -166t-43.5 -213.5q0 -172 152 -172q81 0 154.5 67t116 168.5t42.5 202.5z" />
+<glyph unicode="&#x299;" horiz-adv-x="493" d="M105 464h229q152 0 152 -83q0 -52 -36 -83.5t-109 -47.5q50 -7 80.5 -32t30.5 -62q0 -69 -63.5 -112.5t-170.5 -43.5h-228v17q40 5 54.5 15t21.5 39l86 320q4 13 4 25q0 15 -11.5 22t-39.5 9v17zM229 257h14q65 0 96 36t31 98q0 50 -52 50q-40 0 -49 -35zM223 234 l-45 -167q-3 -13 -3 -19q0 -25 36 -25q48 0 83.5 43t35.5 102q0 66 -88 66h-19z" />
+<glyph unicode="&#x29a;" horiz-adv-x="465" d="M504 307q0 -61 -20.5 -114.5t-53 -90t-73 -63.5t-81 -40t-76.5 -13q-82 0 -133 25.5t-51 80.5t45.5 98t110.5 60q-66 34 -66 80q0 75 64.5 110t157.5 35q76 0 126 -45t50 -123zM317 227h-53q-42 0 -75 -39t-33 -90q0 -29 19 -46t51 -17q69 0 138.5 84t69.5 184 q0 60 -32 97.5t-83 37.5q-39 0 -66 -28.5t-27 -76.5q0 -29 24.5 -49t48.5 -20h18v-37z" />
+<glyph unicode="&#x29b;" horiz-adv-x="580" d="M467 109l-21 -79q-84 -41 -211 -41q-95 0 -150.5 45.5t-55.5 125.5q0 119 100.5 210.5t225.5 91.5q56 0 118 -28q14 41 44 73q40 31 81 31t66.5 -17.5t25.5 -47.5q0 -18 -11.5 -29.5t-29.5 -11.5q-16 0 -27.5 10.5t-11.5 25.5q0 13 7.5 25t7.5 14q0 11 -19 11 q-36 0 -48 -41l-48 -172h-18q-9 40 -17 59t-25 39q-32 37 -91 37q-79 0 -141 -99.5t-62 -214.5q0 -56 23 -86t81 -30q67 0 83 57l12 43q6 24 6 35q0 17 -13 23.5t-50 8.5v16h251v-16q-41 -4 -57 -19t-25 -49z" />
+<glyph unicode="&#x29c;" horiz-adv-x="582" d="M676 464v-17q-39 -3 -55.5 -13.5t-23.5 -37.5l-88 -329q-3 -12 -3 -20q0 -14 12 -20t43 -10v-17h-248v17q41 5 56 14.5t22 35.5l42 157h-177l-42 -157q-3 -12 -3 -20q0 -14 12 -20t44 -10v-17h-246v17q39 5 53.5 14t21.5 36l88 329q4 18 4 22q0 15 -11.5 21t-40.5 8v17 h246v-17q-40 -3 -56.5 -13t-23.5 -38l-37 -140h177l37 140q3 12 3 21q0 15 -12 21.5t-42 8.5v17h248z" />
+<glyph unicode="&#x29d;" horiz-adv-x="475" d="M463 617q0 -28 -20 -47.5t-49 -19.5q-28 0 -47 20t-19 49q0 26 20 46t46 20q28 0 48.5 -20t20.5 -48zM423 462l-116 -444q-13 -51 -29 -87q17 -15 32 -38t22.5 -36.5t23.5 -48.5l18 -41h-48q-34 87 -70 120q-41 -65 -85.5 -92.5t-106.5 -27.5q-51 0 -82.5 28t-31.5 70 q0 63 52.5 101t112.5 38q44 0 69 -13l81 319q12 45 12 67q0 30 -41 30h-22v27q136 12 209 28zM163 -87l10 35q-27 16 -75 16q-38 0 -73 -28t-35 -70q0 -29 23 -44t53 -15q39 0 61 28t36 78z" />
+<glyph unicode="&#x29e;" d="M528 449l-157 -566q-7 -24 -7 -42q0 -20 7 -27t23 -7h34v-27q-96 -5 -209 -30l124 461q-95 -75 -130 -109.5t-35 -53.5q0 -12 10.5 -16.5t39.5 -6.5v-25h-206v25q37 5 61.5 18.5t73.5 57.5l64 58q-19 95 -33 145.5t-24 66t-22 15.5q-28 0 -64 -64l-22 11q32 68 65 96 t73 28q47 0 72.5 -46.5t50.5 -176.5l39 27l50 188h122z" />
+<glyph unicode="&#x29f;" horiz-adv-x="485" d="M468 156l-66 -156h-392v17q34 4 48.5 16t19.5 34l81 328q4 20 4 24q0 15 -10.5 20.5t-35.5 7.5v17h238v-17q-43 -1 -56.5 -13t-24.5 -54l-76 -303q-4 -14 -4 -23q0 -31 60 -31q67 0 112 36q36 29 80 97h22z" />
+<glyph unicode="&#x2a0;" horiz-adv-x="488" d="M347 390l24 93q26 99 161 99q64 0 103 -28t39 -72q0 -28 -17 -46t-44 -18q-25 0 -42.5 17t-17.5 40q0 20 11 36.5t11 20.5q0 19 -29 19q-25 0 -39.5 -14.5t-24.5 -48.5l-140 -500q-36 -131 -36 -138q0 -28 49 -28h17v-27h-268v27q45 0 62 13t30 56l61 207 q-60 -111 -154 -111q-49 0 -75.5 34t-26.5 96q0 84 54 178q44 77 102.5 122t115.5 45q40 0 57 -22q10 -13 17 -50zM325 371q0 48 -35 48q-27 0 -58 -35.5t-53 -79.5q-53 -109 -53 -188q0 -57 39 -57q45 0 88 74q27 47 49.5 121t22.5 117z" />
+<glyph unicode="&#x2a1;" horiz-adv-x="530" d="M193 380h31q72 0 119.5 65t47.5 149q0 62 -35 62q-25 0 -45 -19t-26 -43q-16 -63 -72 -63q-25 0 -39 15.5t-14 32.5q0 47 55 79q47 27 123 27q79 0 130.5 -40.5t51.5 -105.5q0 -104 -70 -180.5t-178 -76.5l-21 -74h66l-12 -46h-66l-11 -41q-12 -45 -12 -55q0 -41 49 -42 v-24h-240v24q38 3 61 22q13 10 18.5 19.5t12.5 36.5l16 60h-66l12 46h66z" />
+<glyph unicode="&#x2a2;" horiz-adv-x="530" d="M184 208l21 74q-62 6 -95 49t-33 102q0 107 82.5 179.5t191.5 72.5q55 0 101 -27q55 -32 55 -79q0 -17 -14 -32.5t-39 -15.5q-54 0 -71 60q-9 34 -19.5 49.5t-34.5 15.5q-41 0 -82 -70t-41 -116q0 -41 30 -65.5t70 -24.5h32l-47 -172h66l-12 -46h-66l-21 -75 q-3 -12 -3 -21q0 -40 50 -42v-24h-240v24q71 6 86 60l21 78h-65l12 46h65z" />
+<glyph unicode="&#x2a3;" horiz-adv-x="750" d="M735 439l-288 -343h175q29 0 60 60h28l-55 -156h-297q-51 -11 -58 -11q-28 0 -44 16t-16 45q0 20 11 68q-72 -131 -166 -131q-48 0 -77 32.5t-29 92.5q0 72 37 150t94 132q70 68 138 68q46 0 75 -33l18 64q29 102 29 122q0 28 -41 28h-21v27q129 10 209 29l-69 -250h287 v-10zM616 353h-136q-29 0 -45.5 -13.5t-27.5 -47.5h-2l-42 -154q-14 -53 -14 -63q0 -5 3.5 -10t7.5 -5q14 0 35 25zM308 371q0 21 -10.5 35t-26.5 14q-57 1 -114 -112q-24 -48 -39 -100.5t-15 -85.5q0 -28 11.5 -46t29.5 -18q45 0 86 75q27 48 52.5 126.5t25.5 111.5z" />
+<glyph unicode="&#x2a4;" horiz-adv-x="820" d="M813 423l-209 -191h17q46 0 79 -37t33 -100q0 -140 -97 -235.5t-204 -95.5q-41 0 -82 10.5t-61 24.5q-44 31 -44 69q0 20 14.5 35t44.5 15q57 0 67 -67q4 -22 24.5 -36t44.5 -14q43 0 83 54.5t61.5 121.5t21.5 116q0 75 -56 75q-19 0 -43 -23l-102 -98q-61 -58 -105 -58 q-28 0 -44 16t-16 45q0 20 11 68q-72 -131 -166 -131q-48 0 -77 32.5t-29 92.5q0 72 37 150t94 132q70 68 138 68q46 0 75 -33l18 64q29 102 29 122q0 28 -41 28h-21v27q129 10 209 29l-68 -249h364v-27zM704 377h-211q-17 0 -46.5 -21t-37.5 -50l-50 -183q-8 -29 -8 -38 q0 -19 11 -19q4 0 14.5 8.5t27.5 25.5l17 16zM308 371q0 21 -10.5 35t-26.5 14q-57 1 -114 -112q-24 -48 -39 -100.5t-15 -85.5q0 -28 11.5 -46t29.5 -18q45 0 86 75q27 48 52.5 126.5t25.5 111.5z" />
+<glyph unicode="&#x2a5;" horiz-adv-x="817" d="M448 96h94q54 84 114 84q87 0 87 -75q0 -46 -37 -75.5t-106 -29.5h-71l-55 -97h-42l55 97h-124q-44 -11 -63 -11q-28 0 -44 16t-16 45q0 20 11 68q-72 -131 -166 -131q-48 0 -77 32.5t-29 92.5q0 72 37 150t94 132q70 68 138 68q46 0 75 -33l18 64q29 102 29 122 q0 28 -41 28h-21v27q129 10 209 29l-69 -250h287v-10zM586 96h57q57 0 57 25q0 12 -12.5 19t-26.5 7q-37 0 -75 -51zM616 353h-136q-29 0 -45.5 -13.5t-27.5 -47.5h-2l-42 -154q-14 -53 -14 -63q0 -5 3.5 -10t7.5 -5q14 0 39 30zM308 371q0 21 -10.5 35t-26.5 14 q-57 1 -114 -112q-24 -48 -39 -100.5t-15 -85.5q0 -28 11.5 -46t29.5 -18q45 0 86 75q27 48 52.5 126.5t25.5 111.5z" />
+<glyph unicode="&#x2a6;" horiz-adv-x="560" d="M524 461l-23 -154l-27 2q-12 63 -33 91.5t-55 28.5q-24 0 -38.5 -14.5t-14.5 -38.5q0 -33 57 -99q80 -93 80 -162q0 -56 -43 -92t-105 -36q-35 0 -64 12q-16 6 -37.5 23.5t-35.5 35.5q-56 -67 -121 -67q-67 0 -67 65q0 28 25 115l67 236h-52v35q62 21 103 55t81 97h35 l-39 -145h88q31 13 67 13q32 0 58 -12q21 -10 37 -10q11 0 16 4t12 17h29zM211 141l23 -15q-3 -5 -7 -11q22 -98 87 -98q29 0 44.5 14.5t15.5 39.5q0 41 -56 104q-50 56 -65 87.5t-15 73.5t18 71h-50l-34 -119q-53 -185 -53 -209q0 -18 16 -18q25 0 76 80z" />
+<glyph unicode="&#x2a7;" horiz-adv-x="453" d="M190 449h128q68 234 242 234q52 0 81 -21t29 -57q0 -26 -15 -43.5t-39 -17.5q-23 0 -38 14t-15 33q0 14 9 29.5t9 18.5q0 5 -6.5 9.5t-16.5 4.5q-19 0 -34.5 -13.5t-27 -42.5t-16.5 -45t-14 -50l-114 -454q-15 -60 -33 -104.5t-47.5 -87.5t-75 -66t-104.5 -23 q-50 0 -80 21t-30 57q0 26 15 43.5t39 17.5q23 0 38 -14t15 -33q0 -14 -9 -29.5t-9 -18.5q0 -14 26 -14q21 0 36.5 12t27 39.5t17 44.5t14.5 54l41 166q-43 -42 -64.5 -61t-60 -40t-71.5 -21q-67 0 -67 65q0 28 25 115l67 236h-52v35q62 21 103 55t81 97h35zM306 407h-127 l-34 -119q-53 -185 -53 -209q0 -18 16 -18t57 34.5t86 93.5z" />
+<glyph unicode="&#x2a8;" horiz-adv-x="600" d="M335 144v-19q128 49 205 49q36 0 57 -21t21 -50q0 -67 -70 -100q-44 -21 -115 -21q-42 0 -70 2.5t-67 17.5t-64 43q-36 -18 -88 -36t-80 -18q-67 0 -67 65q0 28 25 115l67 236h-52v35q62 21 103 55t81 97h35l-39 -145h72v-42h-83l-34 -119q-53 -185 -53 -209 q0 -18 16 -18q21 0 81 18q-9 25 -9 59q0 134 105 239q83 85 180 85q46 0 79 -25.5t33 -64.5q0 -32 -17 -51.5t-45 -19.5q-25 0 -41.5 15t-16.5 38q0 16 10.5 32t10.5 26q0 7 -7.5 12t-16.5 5q-26 0 -47.5 -22.5t-45.5 -65.5q-53 -99 -53 -197zM573 99q0 30 -47 30 q-69 0 -179 -43q14 -29 54 -44t85 -15q41 0 64 22t23 50z" />
+<glyph unicode="&#x2b0;" horiz-adv-x="380" d="M349 440l16 -11q-35 -57 -60 -79t-57 -22q-21 0 -34 13t-13 35q0 19 4 31l56 179q4 15 4 22q0 16 -14 16q-31 0 -76 -70q-26 -40 -41.5 -81t-41.5 -138h-85l106 414q7 26 7 37q0 24 -29 24h-15v20q68 6 146 22l-76 -308q52 79 83 106t67 27q25 0 39 -15t14 -41 q0 -16 -6 -36l-56 -185q-2 -6 -2 -9q0 -12 12 -12t52 61z" />
+<glyph unicode="&#x2b1;" horiz-adv-x="380" d="M349 441l16 -11q-35 -57 -60 -79t-57 -22q-21 0 -34 13t-13 35q0 16 5 34l55 176q4 15 4 22q0 16 -14 16q-31 0 -76 -70q-25 -40 -41 -81t-42 -138h-85l105 411q24 94 127 94q45 0 72.5 -20.5t27.5 -53.5q0 -21 -12 -34t-31 -13q-18 0 -30 12.5t-12 29.5q0 15 8 27t8 15 q0 14 -21 14q-36 0 -48 -51l-55 -222q52 79 83 106t67 27q25 0 39 -15t14 -41q0 -16 -5 -34l-57 -187q-2 -6 -2 -10q0 -11 12 -11t52 61z" />
+<glyph unicode="&#x2b2;" horiz-adv-x="350" d="M384 965q0 -22 -15.5 -37t-37.5 -15q-21 0 -36 15.5t-15 37.5q0 20 15.5 35.5t35.5 15.5q22 0 37.5 -15.5t15.5 -36.5zM353 845l-89 -341q-24 -91 -62 -132t-97 -41q-36 0 -58.5 16.5t-22.5 42.5q0 17 11 29t27 12q17 0 27 -10.5t10 -27.5q0 -9 -5.5 -15.5t-5.5 -11.5 q0 -11 18 -11q17 0 29.5 23t27.5 81l69 269q9 34 9 52q0 23 -32 23h-16v21q101 8 160 21z" />
+<glyph unicode="&#x2b3;" horiz-adv-x="389" d="M181 533h1q53 91 84.5 124t66.5 33q23 0 37 -13.5t14 -35.5q0 -24 -14.5 -39.5t-37.5 -15.5q-19 0 -33 14t-21 14q-20 0 -57 -57q-34 -52 -66 -139l-27 -74h-107q90 257 90 286q0 11 -10.5 15t-39.5 4v20q118 9 178 21z" />
+<glyph unicode="&#x2b4;" horiz-adv-x="389" d="M258 690h107q-90 -257 -90 -286q0 -11 10.5 -15t39.5 -4v-20q-118 -9 -178 -21l58 157h-1q-53 -91 -84.5 -124t-66.5 -33q-23 0 -37 13.5t-14 35.5q0 24 14.5 39.5t37.5 15.5q19 0 33 -14t21 -14q20 0 57 57q34 52 66 139z" />
+<glyph unicode="&#x2b5;" horiz-adv-x="389" d="M364 690l-143 -425q-4 -8 -4 -21q0 -21 11 -35.5t27 -14.5q30 0 30 9q0 6 -10.5 17t-10.5 27q0 20 15 32t37 12q24 0 39.5 -15t15.5 -36q0 -32 -34 -50.5t-90 -18.5q-60 0 -91.5 26t-31.5 70q0 14 4 25l77 209h-1q-53 -90 -84.5 -123t-66.5 -33q-23 0 -37 13.5t-14 35.5 q0 24 14.5 39.5t37.5 15.5q19 0 33 -14.5t21 -14.5q19 0 57 57q34 52 66 139l27 74h106z" />
+<glyph unicode="&#x2b6;" horiz-adv-x="390" d="M466 684v-12q-14 0 -27 -11l-147 -142q69 -16 69 -65q0 -55 -51.5 -82t-140.5 -27h-164v12q46 0 60 51l58 215q5 20 5 28q0 11 -8 15t-31 6v12h184v-12q-34 -4 -43 -11.5t-17 -35.5l-26 -98h15l155 157h109zM183 510l-34 -126q-1 -3 -1 -9q0 -13 23 -13q44 0 70 28t26 76 q0 42 -84 44z" />
+<glyph unicode="&#x2b7;" horiz-adv-x="450" d="M296 690l23 -252q91 106 91 142q0 10 -15 29q-17 18 -17 36q0 21 12.5 33t30.5 12q19 0 32.5 -14t13.5 -33q0 -98 -205 -312h-20l-18 216q-54 -103 -86 -152l-42 -64h-20v82q0 71 -8.5 144.5t-19.5 83.5q-10 8 -33 8v20q91 15 118 21q25 -96 25 -207q40 74 118 207h20z " />
+<glyph unicode="&#x2b8;" horiz-adv-x="350" d="M268 419h2q67 128 67 159q0 10 -19 26q-24 20 -24 42q0 16 12 30t32 14q19 0 33.5 -14.5t14.5 -34.5q0 -58 -58.5 -174.5t-133.5 -208.5q-66 -82 -135 -82q-20 0 -34 13.5t-14 32.5q0 17 12 30t27 13q19 0 39.5 -13.5t32.5 -13.5q24 0 52 40q19 26 19 54q0 41 -38 222 q-16 72 -31 87q-10 10 -31 10v21q63 5 116 18q34 -88 51 -211z" />
+<glyph unicode="&#x2bb;" horiz-adv-x="333" d="M319 685l13 -25q-118 -63 -118 -116q0 -21 30 -37q40 -23 40 -65q0 -35 -20.5 -54t-52.5 -19q-39 0 -61 26t-22 68q0 67 51 125.5t140 96.5z" />
+<glyph unicode="&#x2c0;" horiz-adv-x="343" d="M52 441h26q60 0 99.5 53t39.5 121q0 51 -28 51q-13 0 -22.5 -8.5t-13 -18t-7.5 -24.5q-13 -51 -60 -51q-21 0 -32.5 12.5t-11.5 26.5q0 39 46 65q40 22 86 22q65 0 107 -33.5t42 -86.5q0 -77 -67 -143t-152 -66q-14 0 -25 1l-39 -122h-43z" />
+<glyph unicode="&#x2c1;" horiz-adv-x="326" d="M135 240l27 122q-11 -1 -25 -1q-57 0 -87 35t-30 87q0 89 63 148t152 59q49 0 87 -24q42 -26 42 -63q0 -14 -11.5 -26.5t-31.5 -12.5q-44 0 -57 46q-5 19 -8 28t-12.5 18.5t-23.5 9.5q-33 0 -63.5 -57t-30.5 -95q0 -34 23.5 -53.5t55.5 -19.5h27l-54 -201h-43z" />
+<glyph unicode="&#x2c6;" horiz-adv-x="333" d="M367 516h-51l-88 95l-131 -95h-57l160 174h81z" />
+<glyph unicode="&#x2c7;" horiz-adv-x="333" d="M411 690l-162 -174h-82l-88 174h51l90 -97l134 97h57z" />
+<glyph unicode="&#x2d8;" horiz-adv-x="333" d="M348 678h39q-33 -162 -178 -162q-138 0 -138 149v13h43q8 -90 99 -90q50 0 81 20.5t54 69.5z" />
+<glyph unicode="&#x2d9;" horiz-adv-x="333" d="M293 589q0 -26 -19.5 -45t-46.5 -19q-25 0 -44.5 19.5t-19.5 44.5q0 27 19 46.5t45 19.5q27 0 46.5 -19.5t19.5 -46.5z" />
+<glyph unicode="&#x2da;" horiz-adv-x="333" d="M340 648q0 -44 -31.5 -75.5t-75.5 -31.5q-48 0 -77 30t-29 78q0 44 31.5 74.5t75.5 30.5q47 0 76.5 -30.5t29.5 -75.5zM292 646q0 25 -17.5 42.5t-42.5 17.5q-23 0 -40 -17.5t-17 -41.5t17 -41t40 -17q25 0 42.5 17t17.5 40z" />
+<glyph unicode="&#x2db;" horiz-adv-x="333" d="M167 -84l22 -14q-19 -35 -53 -55t-73 -20q-47 0 -75 21t-28 60q0 25 11.5 47t42.5 60l14 17l33 12l-5 -20q-12 -50 -12 -66q0 -62 61 -62q22 0 48 13z" />
+<glyph unicode="&#x2dc;" horiz-adv-x="333" d="M366 655h41q-16 -63 -44 -91t-73 -28q-25 0 -57 13l-59 23q-21 8 -38 8q-31 0 -48 -43h-40q10 54 41.5 86t74.5 32q38 0 97 -26q39 -16 54 -16q17 0 28.5 9t22.5 33z" />
+<glyph unicode="&#x2dd;" horiz-adv-x="333" d="M258 516l122 133q43 48 70 48q20 0 34 -14t14 -33q0 -27 -39 -49l-151 -85h-50zM69 516l122 133q43 48 70 48q20 0 34 -13t14 -32q0 -29 -39 -51l-149 -85h-52z" />
+<glyph unicode="&#x2e0;" horiz-adv-x="379" d="M423 667h-8q-14 0 -50 -42l-161 -189l38 -117q5 -17 5 -34q0 -44 -42.5 -69.5t-92.5 -25.5q-98 0 -98 47q0 33 40 78l73 87l-50 159q-21 69 -24 78q-5 15 -11 21t-19 7v17h152v-17q-35 0 -35 -25q0 -3 7 -26l44 -139l97 113q42 49 42 59q0 18 -26 18v17h119v-17zM140 361 l-37 -44q-43 -52 -43 -71q0 -17 15.5 -24.5t31.5 -7.5q18 0 41 10.5t23 30.5q0 16 -20 72z" />
+<glyph unicode="&#x2e1;" horiz-adv-x="222" d="M217 857l-108 -390q-16 -58 -16 -74q0 -12 11 -12q18 0 59 60l16 -10q-39 -60 -64.5 -81t-61.5 -21q-22 0 -36.5 13.5t-14.5 33.5q0 24 26 116l55 193q25 90 25 108q0 23 -31 23q-8 0 -16 -1v20q74 7 156 22z" />
+<glyph unicode="&#x2e2;" horiz-adv-x="280" d="M274 689l-18 -116l-20 2q-17 90 -67 90q-18 0 -29 -11t-11 -29q0 -25 43 -75q61 -70 61 -122q0 -42 -32.5 -69.5t-79.5 -27.5q-27 0 -48 9q-15 6 -23 6q-15 0 -22 -15h-20l16 126l21 -3q12 -98 70 -98q45 0 45 39q0 30 -42 78q-37 42 -48.5 66t-11.5 56q0 45 27.5 70 t73.5 25q25 0 44 -9q14 -7 28 -7q12 0 21 15h22z" />
+<glyph unicode="&#x2e3;" horiz-adv-x="389" d="M68 672l123 18q22 -33 35 -103q42 62 66.5 82.5t51.5 20.5q17 0 30 -13.5t13 -31.5q0 -16 -12 -28t-29 -12q-9 0 -22 7.5t-21 7.5q-13 0 -32 -19.5t-37 -50.5l24 -118q8 -39 28 -39q10 0 19 8t31 36l16 -11q-35 -49 -60.5 -70t-52.5 -21q-28 0 -44 25.5t-29 90.5l-18 -29 q-33 -54 -51.5 -70.5t-46.5 -16.5q-21 0 -34 12t-13 32q0 18 12 30.5t29 12.5q12 0 25.5 -8t20.5 -8q10 0 16.5 5.5t18.5 23.5l33 53l-22 114q-5 28 -14.5 40t-27.5 12q-12 0 -26 -2v20z" />
+<glyph unicode="&#x2e4;" horiz-adv-x="328" d="M102 413l28 107q-54 2 -82 36.5t-28 85.5q0 89 63 148t152 59q49 0 87 -24q42 -26 42 -63q0 -14 -11.5 -26.5t-31.5 -12.5q-44 0 -57 46q-5 19 -8 28t-12.5 18.5t-23.5 9.5q-33 0 -63.5 -57t-30.5 -95q0 -34 23.5 -53.5t55.5 -19.5h27l-53 -198q-4 -18 -4 -24 q0 -16 13 -23t45 -9v-17h-224v17q48 3 64.5 13t28.5 54z" />
+<glyph unicode="&#x2ec;" horiz-adv-x="314" d="M309 70l-131 -237h-43l-130 237h78l74 -136l74 136h78z" />
+<glyph unicode="&#x2ed;" horiz-adv-x="395" d="M390 648h-385v72h385v-72zM390 528h-385v72h385v-72z" />
+<glyph unicode="&#x384;" horiz-adv-x="300" d="M140 516l98 136q20 28 54 28q10 0 18.5 -8.5t8.5 -20.5q0 -19 -10 -31t-40 -37l-81 -67h-48z" />
+<glyph unicode="&#x385;" horiz-adv-x="380" d="M140 516l98 136q20 28 54 28q10 0 18.5 -8.5t8.5 -20.5q0 -19 -10 -31t-40 -37l-81 -67h-48zM440 580q0 -26 -19.5 -45t-46.5 -19q-26 0 -45 19t-19 45q0 27 19 46.5t45 19.5q27 0 46.5 -19.5t19.5 -46.5zM157 580q0 -26 -19.5 -45t-46.5 -19q-25 0 -44.5 19t-19.5 45 q0 27 19 46.5t45 19.5q27 0 46.5 -19.5t19.5 -46.5z" />
+<glyph unicode="&#x386;" horiz-adv-x="667" d="M123 529l98 136q20 28 54 28q10 0 18.5 -8.5t8.5 -20.5q0 -19 -10 -31t-40 -37l-81 -67h-48zM593 0h-303v25q77 6 77 49q0 3 -2 15l-12 119h-215l-57 -96q-17 -28 -17 -50q0 -37 64 -37v-25h-195l-1 25q26 3 43 19.5t43 56.5l370 582h25l94 -560q11 -62 25 -78.5 t61 -19.5v-25zM346 248l-37 243l-148 -243h185z" />
+<glyph unicode="&#x387;" horiz-adv-x="333" d="M264 385q0 -31 -21.5 -52.5t-53.5 -21.5q-31 0 -52 21t-21 53t21.5 53t53.5 21q30 0 51.5 -22t21.5 -52z" />
+<glyph unicode="&#x388;" horiz-adv-x="700" d="M10 529l98 136q20 28 54 28q10 0 18.5 -8.5t8.5 -20.5q0 -19 -10 -31t-40 -37l-81 -67h-48zM748 669l-43 -190l-27 5q-3 60 -9.5 82t-35.5 41q-47 30 -137 30q-32 0 -45 -9t-22 -42l-59 -216q99 0 134.5 18.5t70.5 88.5l28 -4l-74 -274l-28 4q4 25 4 44q0 52 -30 71.5 t-114 19.5l-63 -234q-8 -32 -8 -38q0 -34 61 -34q131 0 214 61q28 20 47 42t44 64l25 -5l-60 -194h-553v25q39 6 54 20.5t28 59.5l119 432q12 44 12 70q0 15 -9 22.5t-32 10.5l-33 4v25h541z" />
+<glyph unicode="&#x389;" horiz-adv-x="850" d="M9 529l98 136q20 28 54 28q10 0 18.5 -8.5t8.5 -20.5q0 -19 -10 -31t-40 -37l-81 -67h-48zM889 669v-25q-36 0 -53.5 -16.5t-28.5 -57.5l-111 -408q-22 -84 -22 -96q0 -22 16 -30.5t57 -10.5v-25h-316v25q51 3 70 17.5t32 61.5l62 225h-239l-54 -197q-12 -43 -12 -67 q0 -34 71 -40v-25h-295v25q39 5 54 18.5t27 55.5l121 447q11 38 11 58q0 17 -9.5 25t-32.5 11l-31 4v25h316v-25q-49 -2 -69 -17t-33 -63l-52 -191h239l47 173q10 38 10 61q0 15 -9 22.5t-32 10.5l-31 4v25h297z" />
+<glyph unicode="&#x38a;" horiz-adv-x="450" d="M9 529l98 136q20 28 54 28q10 0 18.5 -8.5t8.5 -20.5q0 -19 -10 -31t-40 -37l-81 -67h-48zM503 669v-25q-38 -4 -55 -19t-29 -61l-112 -412q-17 -62 -17 -87q0 -21 14.5 -29.5t56.5 -10.5v-25h-296v25q39 5 54 18t29 64l117 429q14 51 14 71q0 28 -42 33l-32 4v25h298z " />
+<glyph unicode="&#x38c;" horiz-adv-x="722" d="M11 529l98 136q20 28 54 28q10 0 18.5 -8.5t8.5 -20.5q0 -19 -10 -31t-40 -37l-81 -67h-48zM691 444q0 -95 -49.5 -194.5t-130.5 -171.5q-108 -96 -248 -96q-108 0 -172 62.5t-64 176.5q0 101 51 202.5t135 169.5q114 92 236 92q104 0 173 -66.5t69 -174.5zM547 528 q0 60 -27 91.5t-74 31.5q-91 0 -162 -120q-46 -78 -79.5 -189.5t-33.5 -198.5q0 -57 27.5 -92t74.5 -35q46 0 82 28t75 86q49 72 83 191t34 207z" />
+<glyph unicode="&#x38e;" horiz-adv-x="700" d="M855 628l-17 -19q-31 26 -75 26q-62 0 -119 -79q-62 -87 -106 -248l-53 -192q-10 -34 -10 -49q0 -24 16.5 -33t62.5 -9v-25h-323v25q51 5 71.5 19t32.5 59l56 209q0 40 -5 84.5t-17 97.5t-39 87.5t-65 34.5q-30 0 -68 -29l-18 18q52 80 150 80q52 0 89.5 -24t57.5 -65 t29 -86.5t9 -98.5h4q36 109 102 187.5t141 78.5q63 0 94 -49zM8 529l98 136q20 28 54 28q10 0 18.5 -8.5t8.5 -20.5q0 -19 -10 -31t-40 -37l-81 -67h-48z" />
+<glyph unicode="&#x38f;" horiz-adv-x="808" d="M279 124v32q-84 34 -117 85t-33 126q0 72 46.5 145t127.5 119q95 54 231 54q118 0 179 -57t61 -159q0 -112 -74.5 -197t-207.5 -118l-9 -30h111q52 0 75.5 13.5t52.5 61.5l25 -6l-64 -193h-295l60 192q80 17 131 103t51 186q0 170 -107 170q-62 0 -120.5 -46.5 t-94 -119.5t-35.5 -147q0 -56 14 -89t53 -57l-29 -192h-286l41 199l25 6q0 -44 22.5 -62.5t66.5 -18.5h99zM26 529l98 136q20 28 54 28q10 0 18.5 -8.5t8.5 -20.5q0 -19 -10 -31t-40 -37l-81 -67h-48z" />
+<glyph unicode="&#x390;" horiz-adv-x="278" d="M250 142l22 -14q-48 -79 -85 -108t-83 -29q-68 0 -68 63q0 22 15 76l55 203q8 32 8 45q0 29 -46 29h-14v27q118 9 203 28l-91 -334q-9 -31 -9 -51q0 -16 15 -16q21 0 64 61zM119 516l98 136q20 28 54 28q10 0 18.5 -8.5t8.5 -20.5q0 -19 -10 -31t-40 -37l-81 -67h-48z M419 580q0 -26 -19.5 -45t-46.5 -19q-25 0 -44.5 19t-19.5 45q0 27 19 46.5t45 19.5q27 0 46.5 -19.5t19.5 -46.5zM136 580q0 -26 -19.5 -45t-46.5 -19q-26 0 -45 19t-19 45q0 27 19 46.5t45 19.5q27 0 46.5 -19.5t19.5 -46.5z" />
+<glyph unicode="&#x391;" horiz-adv-x="667" d="M593 0h-303v25q77 6 77 49q0 3 -2 15l-12 119h-215l-57 -96q-17 -28 -17 -50q0 -37 64 -37v-25h-195l-1 25q26 3 43 19.5t43 56.5l370 582h25l94 -560q11 -62 25 -78.5t61 -19.5v-25zM346 248l-37 243l-148 -243h185z" />
+<glyph unicode="&#x392;" horiz-adv-x="667" d="M118 669h265q241 0 241 -146q0 -39 -13.5 -67t-44 -47t-57 -29.5t-74.5 -24.5v-1q72 -20 104.5 -55.5t32.5 -92.5q0 -99 -78 -152.5t-217 -53.5h-302v25q36 5 54 22t30 61l119 438q11 39 11 57t-10.5 27.5t-23.5 11.5t-37 2v25zM334 577l-57 -209q5 0 21.5 1.5t21.5 1.5 t18.5 1.5t19 2.5t16 3.5t16.5 5.5l13 6q8 3 14.5 7.5t12.5 10.5q47 44 47 128q0 101 -87 101q-25 0 -35 -10t-21 -50zM269 338l-64 -236q-7 -27 -7 -37q0 -33 57 -33q73 0 121 59q43 52 43 138q0 58 -35 85q-28 21 -115 24z" />
+<glyph unicode="&#x393;" horiz-adv-x="585" d="M670 669l-43 -190l-27 5q0 75 -20 100q-42 53 -167 53q-31 0 -43 -9.5t-20 -38.5l-125 -457q-15 -56 -15 -63q0 -23 14.5 -32t56.5 -12v-25h-294v25q41 4 55.5 19.5t26.5 59.5l121 442q10 38 10 61q0 28 -42 33l-31 4v25h543z" />
+<glyph unicode="&#x394;" horiz-adv-x="667" d="M549 0h-614l453 683h25zM384 124l-75 367l-240 -367h315z" />
+<glyph unicode="&#x395;" horiz-adv-x="667" d="M653 669l-43 -190l-27 5q-3 60 -9.5 82t-35.5 41q-47 30 -137 30q-32 0 -45 -9t-22 -42l-59 -216q99 0 134.5 18.5t70.5 88.5l28 -4l-74 -274l-28 4q4 25 4 44q0 52 -30 71.5t-114 19.5l-63 -234q-8 -32 -8 -38q0 -34 61 -34q131 0 214 61q28 20 47 42t44 64l25 -5 l-60 -194h-553v25q39 6 54 20.5t28 59.5l119 432q12 44 12 70q0 15 -9 22.5t-32 10.5l-33 4v25h541z" />
+<glyph unicode="&#x396;" horiz-adv-x="611" d="M589 640l-434 -605h75q70 0 115.5 11t83.5 39q49 37 97 114l27 -5l-60 -194h-505v29l434 605h-83q-79 0 -133.5 -32t-113.5 -115l-28 4l58 178h467v-29z" />
+<glyph unicode="&#x397;" horiz-adv-x="778" d="M799 669v-25q-36 0 -53.5 -16.5t-28.5 -57.5l-111 -408q-22 -84 -22 -96q0 -22 16 -30.5t57 -10.5v-25h-316v25q51 3 70 17.5t32 61.5l62 225h-239l-54 -197q-12 -43 -12 -67q0 -34 71 -40v-25h-295v25q39 5 54 18.5t27 55.5l121 447q11 38 11 58q0 17 -9.5 25t-32.5 11 l-31 4v25h316v-25q-49 -2 -69 -17t-33 -63l-52 -191h239l47 173q10 38 10 61q0 15 -9 22.5t-32 10.5l-31 4v25h297z" />
+<glyph unicode="&#x398;" horiz-adv-x="718" d="M466 457l28 -4q-41 -88 -59 -254l-27 3q0 39 -7 52t-35 13h-41q-34 0 -49 -12.5t-37 -52.5l-26 10q47 96 56 241l29 4q1 -43 10.5 -56.5t46.5 -13.5h34q30 0 43.5 13t33.5 57zM691 444q0 -95 -49.5 -194.5t-130.5 -171.5q-108 -96 -248 -96q-108 0 -172 62.5t-64 176.5 q0 101 51 202.5t135 169.5q114 92 236 92q104 0 173 -66.5t69 -174.5zM547 528q0 60 -27 91.5t-74 31.5q-52 0 -89.5 -20.5t-72.5 -79.5q-45 -76 -79 -197.5t-34 -210.5q0 -57 27.5 -92t74.5 -35q46 0 82 28t75 86q49 72 83 191t34 207z" />
+<glyph unicode="&#x399;" horiz-adv-x="389" d="M406 669v-25q-38 -4 -55 -19t-29 -61l-112 -412q-17 -62 -17 -87q0 -21 14.5 -29.5t56.5 -10.5v-25h-296v25q39 5 54 18t29 64l117 429q14 51 14 71q0 28 -42 33l-32 4v25h298z" />
+<glyph unicode="&#x39a;" horiz-adv-x="667" d="M702 669v-25q-33 -5 -47.5 -12t-46.5 -36l-216 -199l157 -333q9 -19 22 -27.5t41 -11.5v-25h-280l1 25l26 4q21 3 29.5 8t8.5 15q0 16 -15 49l-111 236l-67 -249q-2 -10 -2 -17q0 -25 13 -34t52 -12v-25h-288v25q36 4 52.5 17t26.5 51l123 453q11 38 11 58q0 17 -9 25 t-32 11l-33 4v25h311v-25q-45 -4 -64.5 -18.5t-29.5 -53.5l-62 -227l197 175q77 68 77 97q0 22 -35 25l-21 2v25h211z" />
+<glyph unicode="&#x39b;" horiz-adv-x="655" d="M581 0h-303v25q77 6 77 49q0 3 -2 15l-50 399h-2l-220 -376q-17 -28 -17 -50q0 -37 64 -37v-25h-195l-1 25q26 3 43 19.5t43 56.5l364 582h25l88 -560q10 -62 24.5 -78.5t61.5 -19.5v-25z" />
+<glyph unicode="&#x39c;" horiz-adv-x="889" d="M917 669v-25q-39 -5 -55 -20t-29 -61l-119 -438q-10 -34 -10 -57q0 -25 14 -34t57 -9v-25h-311v25q50 3 69.5 18.5t31.5 60.5l123 457l-375 -573h-28l-67 559l-101 -369q-20 -71 -20 -92q0 -33 15.5 -44.5t64.5 -16.5v-25h-206v25q40 9 58 36.5t45 120.5l107 369 q11 41 11 58q0 22 -12 28.5t-59 6.5v25h219l54 -480l311 480h212z" />
+<glyph unicode="&#x39d;" horiz-adv-x="722" d="M748 669v-25q-42 -8 -58.5 -32.5t-43.5 -120.5l-143 -506h-28l-257 547l-99 -354q-19 -66 -19 -94q0 -29 17.5 -42t61.5 -17v-25h-206v25q42 8 56 30t45 125l120 407q-15 34 -28.5 43.5t-53.5 13.5v25h193l216 -467l81 289q19 71 19 94q0 59 -81 59v25h208z" />
+<glyph unicode="&#x39e;" horiz-adv-x="746" d="M740 669l-28 -183l-25 5q0 38 -18 48t-74 10h-301q-33 0 -50.5 -11t-45.5 -52l-26 7l58 176h510zM618 462l-64 -231l-25 3q0 33 -12 46t-45 13h-161q-41 0 -56.5 -12t-31.5 -50l-25 3l64 236l25 -2q0 -34 10 -47.5t46 -13.5h159q35 0 56 11t35 50zM653 199l-64 -199h-564 l41 205l25 6q0 -44 22.5 -62.5t66.5 -18.5h320q52 0 75.5 13.5t52.5 61.5z" />
+<glyph unicode="&#x39f;" horiz-adv-x="722" d="M691 444q0 -95 -49.5 -194.5t-130.5 -171.5q-108 -96 -248 -96q-108 0 -172 62.5t-64 176.5q0 101 51 202.5t135 169.5q114 92 236 92q104 0 173 -66.5t69 -174.5zM547 528q0 60 -27 91.5t-74 31.5q-91 0 -162 -120q-46 -78 -79.5 -189.5t-33.5 -198.5q0 -57 27.5 -92 t74.5 -35q46 0 82 28t75 86q49 72 83 191t34 207z" />
+<glyph unicode="&#x3a0;" horiz-adv-x="778" d="M799 669v-25q-36 0 -53.5 -16.5t-28.5 -57.5l-111 -408q-22 -84 -22 -96q0 -22 16 -30.5t57 -10.5v-25h-316v25q51 3 70 17.5t32 61.5l144 525h-239l-136 -497q-12 -43 -12 -67q0 -34 71 -40v-25h-295v25q39 5 54 18.5t27 55.5l121 447q11 38 11 58q0 17 -9.5 25 t-32.5 11l-31 4v25h683z" />
+<glyph unicode="&#x3a1;" horiz-adv-x="611" d="M112 669h282q219 0 219 -155q0 -80 -59 -131q-75 -66 -214 -66q-37 0 -81 5l-54 -199q-11 -37 -11 -58q0 -20 15 -29t57 -11v-25h-294v25q40 6 55.5 20.5t28.5 61.5l117 426q13 46 13 74q0 15 -9 22.5t-32 10.5l-33 4v25zM330 584l-61 -229q17 -3 42 -3q46 0 74.5 14.5 t48.5 47.5q33 52 33 136q0 40 -22.5 63.5t-61.5 23.5q-26 0 -35 -9.5t-18 -43.5z" />
+<glyph unicode="&#x3a3;" horiz-adv-x="633" d="M619 669l-37 -181l-25 4q0 71 -30.5 106.5t-96.5 35.5h-152l146 -262l-260 -238h225q62 0 88.5 15t55.5 64l26 -5l-61 -208h-509v28l313 287l-186 325v29h503z" />
+<glyph unicode="&#x3a4;" horiz-adv-x="611" d="M650 669l-36 -192l-27 2q0 85 -31.5 120t-106.5 35l-135 -489q-17 -58 -17 -74q0 -46 83 -46v-25h-331v25h15q72 0 91 72l148 537q-79 -2 -130 -34t-88 -109l-25 7l39 171h551z" />
+<glyph unicode="&#x3a5;" horiz-adv-x="611" d="M697 628l-17 -19q-31 26 -75 26q-62 0 -119 -79q-62 -87 -106 -248l-53 -192q-10 -34 -10 -49q0 -24 16.5 -33t62.5 -9v-25h-323v25q51 5 71.5 19t32.5 59l56 209q0 40 -5 84.5t-17 97.5t-39 87.5t-65 34.5q-30 0 -68 -29l-18 18q52 80 150 80q52 0 89.5 -24t57.5 -65 t29 -86.5t9 -98.5h4q36 109 102 187.5t141 78.5q63 0 94 -49z" />
+<glyph unicode="&#x3a6;" horiz-adv-x="771" d="M538 581l-4 -18q101 -1 165 -44t64 -132q0 -72 -38 -131t-95 -92.5t-115 -51t-107 -17.5q-4 -16 -4 -29q0 -22 17 -31.5t62 -9.5v-25h-311v25q48 4 61.5 15t25.5 55h-8q-103 0 -164 51t-61 143q0 85 56 149.5t133.5 94.5t157.5 30h15q7 33 7 44q0 28 -45 33l-35 4v25h311 v-25q-74 0 -88 -63zM521 529l-108 -400q83 0 144.5 80.5t61.5 178.5q0 52 -24.5 90t-73.5 51zM272 129l109 400q-86 0 -148.5 -85.5t-62.5 -188.5q0 -126 102 -126z" />
+<glyph unicode="&#x3a7;" horiz-adv-x="667" d="M694 669v-25q-28 -4 -47.5 -16t-51.5 -45l-199 -205l75 -237q21 -66 41.5 -88t73.5 -28v-25h-307v25q42 4 54.5 11t12.5 27q0 30 -37 141l-20 60l-130 -144q-32 -35 -32 -55q0 -34 63 -40v-25h-214v25q10 2 17.5 4t16.5 8l17 11q7 4 19 16l22 20l26 27l30 33l38 42l45 49 l68 74l-83 269q-12 40 -29 50.5t-64 15.5v25h305v-25l-29 -3q-25 -2 -35 -9t-10 -24q0 -21 35 -132l17 -55l94 99q70 74 70 98q0 21 -33 24l-21 2v25h202z" />
+<glyph unicode="&#x3a8;" horiz-adv-x="661" d="M780 685v-25q-20 0 -35 -9t-23.5 -20t-15 -31t-8.5 -32t-5 -33q-9 -63 -43 -109.5t-82 -70.5t-95 -35t-93 -11l-52 -192q-10 -40 -10 -51q0 -22 17 -31.5t62 -9.5v-25h-323v25q49 5 70.5 19t33.5 59l56 206q-212 0 -212 157q0 31 14.5 78.5t14.5 77.5q0 37 -34 38v25h36 q59 0 93 -34.5t34 -93.5q0 -17 -7 -55.5t-7 -54.5q0 -46 19.5 -75t57.5 -29l53 193q14 51 14 71q0 28 -42 33l-34 4v25h305v-25q-67 0 -81 -54l-68 -247q48 0 87.5 42t54.5 104q25 109 80 152.5t135 43.5h33z" />
+<glyph unicode="&#x3a9;" horiz-adv-x="808" d="M279 124v32q-84 34 -117 85t-33 126q0 72 46.5 145t127.5 119q95 54 231 54q118 0 179 -57t61 -159q0 -112 -74.5 -197t-207.5 -118l-9 -30h111q52 0 75.5 13.5t52.5 61.5l25 -6l-64 -193h-295l60 192q80 17 131 103t51 186q0 170 -107 170q-62 0 -120.5 -46.5 t-94 -119.5t-35.5 -147q0 -56 14 -89t53 -57l-29 -192h-286l41 199l25 6q0 -44 22.5 -62.5t66.5 -18.5h99z" />
+<glyph unicode="&#x3aa;" horiz-adv-x="389" d="M406 669v-25q-38 -4 -55 -19t-29 -61l-112 -412q-17 -62 -17 -87q0 -21 14.5 -29.5t56.5 -10.5v-25h-296v25q39 5 54 18t29 64l117 429q14 51 14 71q0 28 -42 33l-32 4v25h298zM486 839q0 -26 -19.5 -45t-46.5 -19q-26 0 -45 19.5t-19 44.5q0 27 19 46.5t45 19.5 q27 0 46.5 -19.5t19.5 -46.5zM274 839q0 -26 -19.5 -45t-46.5 -19q-26 0 -45 19.5t-19 44.5q0 27 19 46.5t45 19.5q27 0 46.5 -19.5t19.5 -46.5z" />
+<glyph unicode="&#x3ab;" horiz-adv-x="611" d="M697 628l-17 -19q-31 26 -75 26q-62 0 -119 -79q-62 -87 -106 -248l-53 -192q-10 -34 -10 -49q0 -24 16.5 -33t62.5 -9v-25h-323v25q51 5 71.5 19t32.5 59l56 209q0 40 -5 84.5t-17 97.5t-39 87.5t-65 34.5q-30 0 -68 -29l-18 18q52 80 150 80q52 0 89.5 -24t57.5 -65 t29 -86.5t9 -98.5h4q36 109 102 187.5t141 78.5q63 0 94 -49zM592 839q0 -26 -19.5 -45t-46.5 -19q-26 0 -45 19.5t-19 44.5q0 27 19 46.5t45 19.5q27 0 46.5 -19.5t19.5 -46.5zM380 839q0 -26 -19.5 -45t-46.5 -19q-26 0 -45 19.5t-19 44.5q0 27 19 46.5t45 19.5 q27 0 46.5 -19.5t19.5 -46.5z" />
+<glyph unicode="&#x3ac;" horiz-adv-x="576" d="M574 449l-158 -255q0 -56 10.5 -95.5t27.5 -39.5q35 0 58 77l24 -7q-10 -56 -42.5 -98t-78.5 -42q-39 0 -62.5 23.5t-29.5 55.5q-41 -45 -78.5 -63t-89.5 -18q-60 0 -100 25q-58 37 -58 133q0 79 34 151.5t98 119t142 46.5q54 0 88 -26t47 -68l44 81h124zM312 285 q0 67 -10 107.5t-41 40.5q-20 0 -45 -29.5t-47 -75.5t-37.5 -111t-15.5 -129q0 -36 13 -53.5t32 -17.5q41 0 91.5 68t51.5 124q8 44 8 76zM251 516l98 136q20 28 54 28q10 0 18.5 -8.5t8.5 -20.5q0 -19 -10 -31t-40 -37l-81 -67h-48z" />
+<glyph unicode="&#x3ad;" horiz-adv-x="454" d="M83 234v1q-44 25 -44 71q0 63 76 109.5t175 46.5q47 0 82.5 -25t35.5 -65q0 -30 -17.5 -50.5t-44.5 -20.5q-25 0 -41.5 15t-16.5 38q0 15 10.5 31.5t10.5 26.5q0 7 -10 12t-20 5q-35 0 -69.5 -36.5t-34.5 -83.5q0 -52 43 -52q4 0 18.5 4.5t29.5 4.5q35 0 35 -23 q0 -34 -53 -34q-4 0 -14.5 3t-18.5 3q-40 0 -66 -29.5t-26 -65.5q0 -29 19 -49t54 -20q84 0 143 83l28 -18q-88 -129 -207 -129q-86 0 -125.5 34.5t-39.5 85.5q0 88 88 127zM201 516l98 136q20 28 54 28q10 0 18.5 -8.5t8.5 -20.5q0 -19 -10 -31t-40 -37l-81 -67h-48z" />
+<glyph unicode="&#x3ae;" horiz-adv-x="488" d="M178 263h1q51 75 73 103.5t49 54.5q43 41 100 41q73 0 73 -77q0 -24 -26 -121l-68 -258q-30 -115 -30 -173q0 -26 5 -38h-112q-13 21 -13 50q0 57 108 448q11 42 11 76q0 21 -20 21q-13 0 -33 -16.5t-36 -37.5q-47 -62 -79 -135t-66 -201h-121l87 309q12 46 12 55 q0 21 -17 21q-20 0 -63 -49l-20 18q68 101 167 101q58 0 58 -47q0 -26 -18 -78zM216 516l98 136q20 28 54 28q10 0 18.5 -8.5t8.5 -20.5q0 -19 -10 -31t-40 -37l-81 -67h-48z" />
+<glyph unicode="&#x3af;" horiz-adv-x="278" d="M107 516l98 136q20 28 54 28q10 0 18.5 -8.5t8.5 -20.5q0 -19 -10 -31t-40 -37l-81 -67h-48zM216 142l22 -14q-48 -79 -85 -108t-83 -29q-68 0 -68 63q0 22 15 76l55 203q8 32 8 45q0 29 -46 29h-14v27q118 9 203 28l-91 -334q-9 -31 -9 -51q0 -16 15 -16q21 0 64 61z " />
+<glyph unicode="&#x3b0;" horiz-adv-x="536" d="M300 435v27q53 0 88 -13q89 -33 89 -138q0 -128 -83 -226t-192 -98q-160 0 -160 128q0 34 13 86l24 91q14 52 15 66q0 27 -17 27q-24 0 -64 -49l-20 18q28 42 73 71.5t95 29.5q57 0 57 -48q0 -23 -12 -67l-38 -144q-16 -62 -16 -111q0 -35 14.5 -52t37.5 -17 q34 0 64.5 43t49 102.5t29.5 117t11 93.5q0 39 -14 51t-44 12zM200 516l98 136q20 28 54 28q10 0 18.5 -8.5t8.5 -20.5q0 -19 -10 -31t-40 -37l-81 -67h-48zM500 580q0 -26 -19.5 -45t-46.5 -19q-26 0 -45 19t-19 45q0 27 19 46.5t45 19.5q27 0 46.5 -19.5t19.5 -46.5z M217 580q0 -26 -19.5 -45t-46.5 -19q-25 0 -44.5 19t-19.5 45q0 27 19 46.5t45 19.5q27 0 46.5 -19.5t19.5 -46.5z" />
+<glyph unicode="&#x3b1;" horiz-adv-x="576" d="M574 449l-158 -255q0 -56 10.5 -95.5t27.5 -39.5q35 0 58 77l24 -7q-10 -56 -42.5 -98t-78.5 -42q-39 0 -62.5 23.5t-29.5 55.5q-41 -45 -78.5 -63t-89.5 -18q-60 0 -100 25q-58 37 -58 133q0 79 34 151.5t98 119t142 46.5q54 0 88 -26t47 -68l44 81h124zM312 285 q0 67 -10 107.5t-41 40.5q-20 0 -45 -29.5t-47 -75.5t-37.5 -111t-15.5 -129q0 -36 13 -53.5t32 -17.5q41 0 91.5 68t51.5 124q8 44 8 76z" />
+<glyph unicode="&#x3b2;" d="M-50 -122l135 505q13 47 37.5 99t60 102t84 82t98.5 32q49 0 82 -24.5t33 -79.5q0 -56 -34 -110t-81 -74v-2q29 -6 56.5 -38t27.5 -84q0 -67 -31.5 -134.5t-96 -116t-146.5 -48.5q-42 0 -75 22l-36 -138q-14 -55 -25 -76h-118q16 29 29 83zM216 454l-101 -388 q0 -44 40 -44q47 0 87.5 52.5t61 120t20.5 123.5q0 69 -32 69q-9 0 -16 -3t-12 -3q-27 0 -27 21q0 13 11 22t27 9q6 0 19 -2t20 -2q29 0 45.5 62t16.5 113q0 65 -31 65q-34 0 -71 -66t-58 -149z" />
+<glyph unicode="&#x3b3;" horiz-adv-x="438" d="M461 449l-263 -411q0 -35 -4.5 -71.5t-15.5 -77.5t-35 -67t-57 -26q-29 0 -40.5 20t-11.5 43q0 17 6.5 37t20 45t25.5 45l34 52l32 50q12 88 12 141q0 58 -16 97t-50 39q-51 0 -68 -68h-27q13 69 47 117t78 48q25 0 41.5 -10.5t24 -31.5t10 -41.5t2.5 -51.5 q0 -80 -5 -135l136 257h124z" />
+<glyph unicode="&#x3b4;" horiz-adv-x="496" d="M236 429v2q-53 24 -79.5 50t-26.5 71q0 62 65 104t127 42q48 0 91 -19t43 -60q0 -21 -10 -32.5t-38 -11.5q-21 0 -34.5 12.5t-19.5 27t-20 27t-37 12.5q-72 0 -72 -60q0 -33 24.5 -59t74.5 -55q117 -67 117 -167q0 -53 -20.5 -114t-58.5 -110q-80 -102 -201 -102 q-79 0 -121.5 43t-42.5 106q0 92 31 143q77 126 208 150zM322 342q0 59 -52 59q-65 -7 -109.5 -96.5t-44.5 -182.5q0 -54 10 -80t37 -26q53 0 102 106q20 44 38.5 111.5t18.5 108.5z" />
+<glyph unicode="&#x3b5;" horiz-adv-x="454" d="M83 234v1q-44 25 -44 71q0 63 76 109.5t175 46.5q47 0 82.5 -25t35.5 -65q0 -30 -17.5 -50.5t-44.5 -20.5q-25 0 -41.5 15t-16.5 38q0 15 10.5 31.5t10.5 26.5q0 7 -10 12t-20 5q-35 0 -69.5 -36.5t-34.5 -83.5q0 -52 43 -52q4 0 18.5 4.5t29.5 4.5q35 0 35 -23 q0 -34 -53 -34q-4 0 -14.5 3t-18.5 3q-40 0 -66 -29.5t-26 -65.5q0 -29 19 -49t54 -20q84 0 143 83l28 -18q-88 -129 -207 -129q-86 0 -125.5 34.5t-39.5 85.5q0 88 88 127z" />
+<glyph unicode="&#x3b6;" horiz-adv-x="415" d="M283 698l6 -26q-41 -13 -61 -39t-20 -47q0 -39 39 -49l27 18l30 19q7 5 25 15t28.5 14t25 7.5t27.5 3.5q27 0 45 -13t18 -36q0 -93 -201 -93q-168 -118 -168 -293q0 -86 106 -86q147 0 147 -109q0 -61 -65 -125t-131 -64q-38 0 -57 17t-19 42q0 20 13 37t43 17 q25 0 40 -26.5t29 -26.5q29 0 51 30t22 66q0 26 -11 36.5t-42 10.5q-11 0 -45 -5.5t-50 -5.5q-65 0 -102.5 42.5t-37.5 108.5q1 95 48.5 175t153.5 177q-87 15 -87 87q0 47 48 82t125 39z" />
+<glyph unicode="&#x3b7;" horiz-adv-x="488" d="M178 263h1q51 75 73 103.5t49 54.5q43 41 100 41q73 0 73 -77q0 -24 -26 -121l-68 -258q-30 -115 -30 -173q0 -26 5 -38h-112q-13 21 -13 50q0 57 108 448q11 42 11 76q0 21 -20 21q-13 0 -33 -16.5t-36 -37.5q-47 -62 -79 -135t-66 -201h-121l87 309q12 46 12 55 q0 21 -17 21q-20 0 -63 -49l-20 18q68 101 167 101q58 0 58 -47q0 -26 -18 -78z" />
+<glyph unicode="&#x3b8;" horiz-adv-x="501" d="M488 508q0 -234 -146 -417q-81 -104 -191 -104q-71 0 -112.5 50t-41.5 153q0 110 41.5 216t99.5 179q91 113 202 113q72 0 110 -50.5t38 -139.5zM158 368h178q33 122 33 222q0 79 -36 79q-29 0 -71 -59q-56 -78 -104 -242zM325 326h-179q-30 -117 -30 -221 q0 -40 10.5 -64.5t29.5 -24.5q38 0 83 86q45 89 86 224z" />
+<glyph unicode="&#x3b9;" horiz-adv-x="278" d="M216 142l22 -14q-48 -79 -85 -108t-83 -29q-68 0 -68 63q0 22 15 76l55 203q8 32 8 45q0 29 -46 29h-14v27q118 9 203 28l-91 -334q-9 -31 -9 -51q0 -16 15 -16q21 0 64 61z" />
+<glyph unicode="&#x3ba;" d="M163 244h1q103 127 161.5 172.5t107.5 45.5q36 0 53.5 -21.5t17.5 -50.5q0 -24 -15 -43t-44 -19q-23 0 -37.5 12t-23.5 23.5t-18 11.5q-36 0 -126 -102l118 -196q19 -31 35 -40.5t59 -9.5v-27q-39 -12 -95 -12q-22 0 -41 6t-30.5 11.5t-24.5 20t-17 20t-14 22.5l-11 18 l-68 111l-52 -197h-122l92 334q9 34 9 44q0 29 -46 29h-14v27q119 9 204 28z" />
+<glyph unicode="&#x3bb;" horiz-adv-x="484" d="M432 150h27q-6 -86 -34 -127t-88 -41q-69 0 -69 120q0 113 12 188l-190 -290h-124l314 444l-4 51q-8 105 -65 105q-16 0 -34 -16.5t-28 -51.5h-27q9 41 16.5 64.5t20 50t31.5 39t44 12.5q29 0 47 -23t24.5 -55t8.5 -80l17 -363q3 -59 13.5 -78t30.5 -19q8 0 14 1.5 t16 7.5t17 21.5t10 39.5z" />
+<glyph unicode="&#x3bc;" horiz-adv-x="523" d="M460 133l23 -13q-38 -68 -74.5 -100.5t-80.5 -32.5q-70 0 -70 64q0 24 12 80h-1q-28 -50 -49 -79t-42.5 -42.5t-38 -16.5t-47.5 -3l-33 -122q-6 -22 -24 -73h-117q13 25 27 75l155 579h121l-77 -289q-10 -40 -10 -60q0 -16 7.5 -26.5t19.5 -10.5q27 0 62.5 49t68.5 119 l58 218h119l-71 -266q-22 -84 -22 -103q0 -23 15 -23q23 0 69 76z" />
+<glyph unicode="&#x3bd;" horiz-adv-x="469" d="M414 462l27 -5q-12 -83 -45 -155t-77 -123t-99 -91.5t-108.5 -64t-107.5 -36.5h-27l93 346q8 28 8 44q0 30 -60 30v27q83 2 203 28l-92 -340h2q99 20 174.5 105t108.5 235z" />
+<glyph unicode="&#x3be;" horiz-adv-x="415" d="M275 698l5 -27q-83 -30 -83 -76q0 -22 15 -32q33 26 75 44t75 18q64 0 64 -36q0 -42 -49 -68.5t-128 -26.5q-28 0 -46 -20t-18 -45q0 -26 20 -42q63 36 141 36q30 0 46.5 -12t16.5 -30q0 -36 -39 -57.5t-99 -21.5q-36 0 -72 6q-95 -39 -95 -129q0 -86 106 -86 q147 0 147 -109q0 -61 -65 -125t-131 -64q-38 0 -57 17t-19 42q0 20 13 37t43 17q25 0 40 -26.5t29 -26.5q29 0 51 30t22 66q0 26 -11 36.5t-42 10.5q-11 0 -45 -5.5t-50 -5.5q-66 0 -103 38t-37 103q0 134 132 216v2q-15 8 -27.5 28t-12.5 40q0 56 55 93v2q-16 4 -30.5 21 t-14.5 43q0 52 49 83.5t129 41.5z" />
+<glyph unicode="&#x3bf;" d="M280 462h4q73 0 115 -41t42 -110t-29 -135.5t-76 -113.5q-75 -75 -175 -75q-73 0 -118.5 38.5t-45.5 109.5q0 73 27 139t73 111q79 77 183 77zM322 372q0 28 -12.5 44.5t-34.5 16.5q-32 0 -60 -31q-43 -48 -71 -144.5t-28 -177.5q0 -64 49 -64q41 0 71 49q36 59 61 149.5 t25 157.5z" />
+<glyph unicode="&#x3c0;" horiz-adv-x="558" d="M570 449l-21 -100h-108q-53 -147 -53 -227q0 -22 9 -41.5t25 -19.5q37 0 65 71l23 -12q-43 -129 -157 -129q-40 0 -64.5 25t-24.5 58q0 74 89 275h-89q-15 -62 -46 -149t-64 -145q-40 -70 -99 -70q-61 0 -61 51q0 41 42 56q41 14 68 62q62 108 86 195h-35 q-27 0 -57.5 -16t-46.5 -39h-27q45 79 94.5 117t128.5 38h323z" />
+<glyph unicode="&#x3c1;" horiz-adv-x="495" d="M-52 -122l74 279q38 144 129 234q73 71 159 71q137 0 137 -125q0 -69 -33.5 -149t-82.5 -128q-75 -73 -158 -73q-46 0 -75 22l-34 -138q-12 -46 -27 -76h-118q14 25 29 83zM151 219l-37 -153q0 -44 39 -44q47 0 95 76q33 52 53.5 123.5t20.5 129.5q0 82 -37 82 q-34 0 -68 -52q-41 -62 -66 -162z" />
+<glyph unicode="&#x3c2;" horiz-adv-x="415" d="M447 393q0 -30 -19 -49.5t-50 -19.5q-34 0 -69 24.5t-59 24.5q-75 0 -110.5 -49.5t-35.5 -134.5q0 -96 106 -96q147 0 147 -109q0 -61 -65 -125t-131 -64q-38 0 -57 17t-19 42q0 20 13 37t43 17q25 0 40 -26.5t29 -26.5q29 0 51 30t22 66q0 26 -11 36.5t-42 10.5 q-11 0 -45 -5.5t-50 -5.5q-65 0 -102.5 42.5t-37.5 108.5q0 114 92 208q53 54 123.5 85t133.5 31q44 0 73.5 -18t29.5 -51z" />
+<glyph unicode="&#x3c3;" horiz-adv-x="499" d="M536 449l-21 -100h-187q9 -22 29.5 -39t38 -27t31.5 -30.5t14 -49.5q0 -89 -83.5 -152.5t-196.5 -63.5q-76 0 -120 39.5t-44 108.5q0 72 37.5 143t113 121t169.5 50h219zM322 222q0 46 -13.5 80t-32.5 47q-61 0 -110.5 -84t-49.5 -184q0 -65 49 -65q59 0 108 63t49 143z " />
+<glyph unicode="&#x3c4;" horiz-adv-x="415" d="M455 449l-23 -100h-126q-23 -59 -38 -114t-19.5 -81.5t-4.5 -39.5q0 -53 32 -53q36 0 67 73l24 -11q-13 -53 -56.5 -92.5t-94.5 -39.5q-48 0 -72 24.5t-24 63.5q0 37 16 89t75 181h-46q-36 0 -75.5 -23t-58.5 -65h-27q9 32 25.5 61.5t44.5 60t75 48.5t106 18h200z" />
+<glyph unicode="&#x3c5;" horiz-adv-x="536" d="M300 435v27q53 0 88 -13q89 -33 89 -138q0 -128 -83 -226t-192 -98q-160 0 -160 128q0 34 13 86l24 91q14 52 15 66q0 27 -17 27q-24 0 -64 -49l-20 18q28 42 73 71.5t95 29.5q57 0 57 -48q0 -23 -12 -67l-38 -144q-16 -62 -16 -111q0 -35 14.5 -52t37.5 -17 q34 0 64.5 43t49 102.5t29.5 117t11 93.5q0 39 -14 51t-44 12z" />
+<glyph unicode="&#x3c6;" horiz-adv-x="678" d="M195 16l37 139q38 145 117 226q67 69 139 69q60 0 95.5 -33.5t35.5 -105.5q0 -69 -29.5 -139t-83.5 -120q-69 -65 -205 -65l-51 -192h-114l51 192q-92 0 -141 37t-49 111q0 59 19 115.5t55 104.5t96.5 77.5t135.5 29.5h40v-27q-55 0 -95 -16t-71 -66q-61 -98 -61 -231 q0 -106 79 -106zM369 253l-60 -237q23 0 53.5 13t48.5 34q89 106 89 255q0 103 -32 103q-55 0 -99 -168z" />
+<glyph unicode="&#x3c7;" horiz-adv-x="404" d="M515 449l-300 -372l10 -88q6 -50 20.5 -73t31.5 -23q51 0 64 70h27q-6 -82 -36.5 -125t-80.5 -43q-67 0 -73 162l-3 90l-187 -236h-124l307 373l-6 78q-5 60 -20 81t-42 21q-19 0 -37 -16.5t-24 -51.5h-27q4 28 11 53t20 52.5t36 44t53 16.5q38 0 52.5 -36t19.5 -121 l5 -85l179 229h124z" />
+<glyph unicode="&#x3c8;" horiz-adv-x="652" d="M715 462v-27q-48 -4 -80.5 -48.5t-49.5 -106.5q-13 -47 -27.5 -85t-39 -78.5t-54.5 -67.5t-74.5 -44.5t-97.5 -17.5l-51 -192h-114l51 192q-73 0 -117 40t-44 107q0 50 21 120.5t21 96.5q0 74 -64 84v27h57q70 0 95 -31t25 -85q0 -29 -18 -130t-18 -135q0 -65 51 -65 l116 433h114l-116 -433q39 0 67 38q25 35 47 93.5t38.5 109.5t41 99.5t68.5 77t107 28.5h45z" />
+<glyph unicode="&#x3c9;" horiz-adv-x="735" d="M473 435v27q145 0 186 -81q17 -32 17 -72q0 -95 -60 -190t-152 -123q-28 -9 -62 -9q-90 0 -112 62q-22 -30 -60 -46t-81 -16q-52 0 -86 20q-66 37 -66 120q0 160 103 260q80 75 220 75v-27q-71 0 -101 -34q-48 -52 -75.5 -140t-27.5 -178q0 -29 11.5 -48t35.5 -19 q35 0 62.5 30t45.5 79q0 5 -0.5 21.5t-0.5 27.5q0 43 11.5 87t37 77t57.5 33q18 0 27.5 -18t9.5 -47q0 -27 -10 -65q-12 -42 -54 -115q-3 -20 -3 -38q0 -72 53 -72q37 0 69 42.5t50 101.5t28.5 111t10.5 79q0 32 -8 52q-13 33 -76 33z" />
+<glyph unicode="&#x3ca;" horiz-adv-x="278" d="M216 142l22 -14q-48 -79 -85 -108t-83 -29q-68 0 -68 63q0 22 15 76l55 203q8 32 8 45q0 29 -46 29h-14v27q118 9 203 28l-91 -334q-9 -31 -9 -51q0 -16 15 -16q21 0 64 61zM139 589q0 -26 -19.5 -45t-46.5 -19q-25 0 -44.5 19.5t-19.5 44.5q0 27 19 46.5t45 19.5 q27 0 46.5 -19.5t19.5 -46.5zM351 589q0 -26 -19.5 -45t-46.5 -19q-25 0 -44.5 19.5t-19.5 44.5q0 27 19 46.5t45 19.5q27 0 46.5 -19.5t19.5 -46.5z" />
+<glyph unicode="&#x3cb;" horiz-adv-x="536" d="M300 435v27q53 0 88 -13q89 -33 89 -138q0 -128 -83 -226t-192 -98q-160 0 -160 128q0 34 13 86l24 91q14 52 15 66q0 27 -17 27q-24 0 -64 -49l-20 18q28 42 73 71.5t95 29.5q57 0 57 -48q0 -23 -12 -67l-38 -144q-16 -62 -16 -111q0 -35 14.5 -52t37.5 -17 q34 0 64.5 43t49 102.5t29.5 117t11 93.5q0 39 -14 51t-44 12zM255 589q0 -26 -19.5 -45t-46.5 -19q-25 0 -44.5 19.5t-19.5 44.5q0 27 19 46.5t45 19.5q27 0 46.5 -19.5t19.5 -46.5zM467 589q0 -26 -19.5 -45t-46.5 -19q-25 0 -44.5 19.5t-19.5 44.5q0 27 19 46.5t45 19.5 q27 0 46.5 -19.5t19.5 -46.5z" />
+<glyph unicode="&#x3cc;" d="M223 516l98 136q20 28 54 28q10 0 18.5 -8.5t8.5 -20.5q0 -19 -10 -31t-40 -37l-81 -67h-48zM280 462h4q73 0 115 -41t42 -110t-29 -135.5t-76 -113.5q-75 -75 -175 -75q-73 0 -118.5 38.5t-45.5 109.5q0 73 27 139t73 111q79 77 183 77zM322 372q0 28 -12.5 44.5 t-34.5 16.5q-32 0 -60 -31q-43 -48 -71 -144.5t-28 -177.5q0 -64 49 -64q41 0 71 49q36 59 61 149.5t25 157.5z" />
+<glyph unicode="&#x3cd;" horiz-adv-x="536" d="M300 435v27q53 0 88 -13q89 -33 89 -138q0 -128 -83 -226t-192 -98q-160 0 -160 128q0 34 13 86l24 91q14 52 15 66q0 27 -17 27q-24 0 -64 -49l-20 18q28 42 73 71.5t95 29.5q57 0 57 -48q0 -23 -12 -67l-38 -144q-16 -62 -16 -111q0 -35 14.5 -52t37.5 -17 q34 0 64.5 43t49 102.5t29.5 117t11 93.5q0 39 -14 51t-44 12zM216 516l98 136q20 28 54 28q10 0 18.5 -8.5t8.5 -20.5q0 -19 -10 -31t-40 -37l-81 -67h-48z" />
+<glyph unicode="&#x3ce;" horiz-adv-x="735" d="M473 435v27q145 0 186 -81q17 -32 17 -72q0 -95 -60 -190t-152 -123q-28 -9 -62 -9q-90 0 -112 62q-22 -30 -60 -46t-81 -16q-52 0 -86 20q-66 37 -66 120q0 160 103 260q80 75 220 75v-27q-71 0 -101 -34q-48 -52 -75.5 -140t-27.5 -178q0 -29 11.5 -48t35.5 -19 q35 0 62.5 30t45.5 79q0 5 -0.5 21.5t-0.5 27.5q0 43 11.5 87t37 77t57.5 33q18 0 27.5 -18t9.5 -47q0 -27 -10 -65q-12 -42 -54 -115q-3 -20 -3 -38q0 -72 53 -72q37 0 69 42.5t50 101.5t28.5 111t10.5 79q0 32 -8 52q-13 33 -76 33zM344 516l98 136q20 28 54 28 q10 0 18.5 -8.5t8.5 -20.5q0 -19 -10 -31t-40 -37l-81 -67h-48z" />
+<glyph unicode="&#x3d0;" d="M479 617q0 -35 -22.5 -60.5t-53 -38.5t-74 -20.5t-74.5 -9t-64 -1.5q-48 -70 -87 -186q45 43 85.5 65t91.5 22q68 0 109.5 -55t41.5 -125q0 -90 -66 -155t-156 -65q-47 0 -81 21.5t-52.5 58.5t-26.5 76.5t-8 83.5q0 111 47.5 238.5t127.5 183.5q24 17 65 31.5t69 14.5 q128 0 128 -79zM413 640q0 32 -19 32q-47 0 -99 -50.5t-85 -104.5q111 2 164 51q39 37 39 72zM363 268q0 28 -16.5 50.5t-44.5 22.5q-45 0 -113.5 -92.5t-68.5 -139.5q0 -29 15.5 -53t42.5 -24t72.5 47t79 104t33.5 85z" />
+<glyph unicode="&#x3d1;" horiz-adv-x="582" d="M589 235l-5 -31q-43 2 -97 12q-20 -51 -40 -88t-48 -71t-64.5 -52t-81.5 -18q-160 0 -160 128q0 21 8 57t8 50q0 27 -17 27q-24 0 -64 -49l-20 18q28 43 72.5 72t93.5 29q59 0 59 -48q0 -27 -11 -67q-19 -73 -19 -119q0 -35 14 -52t36 -17q67 0 128 228 q-105 38 -154.5 104.5t-49.5 147.5q0 96 58 149t136 53q32 0 49.5 -5.5t44.5 -20.5q80 -45 80 -190q0 -100 -44 -228q57 -16 88 -19zM429 541q0 119 -60 119q-36 0 -58 -42t-22 -107q0 -145 105 -212q35 148 35 242z" />
+<glyph unicode="&#x3d2;" horiz-adv-x="611" d="M356 411h4q90 272 237 272q51 0 75 -27t24 -66q0 -29 -19 -51t-48 -22q-32 0 -49 16t-17 39q0 32 24 54q0 9 -15 9q-27 0 -55 -26.5t-52 -66.5q-42 -73 -86 -235l-52 -191q-10 -34 -10 -49q0 -24 16.5 -33t62.5 -9v-25h-323v25q51 5 71.5 19t32.5 59l56 209q0 40 -5 84.5 t-17 97.5t-39 87.5t-65 34.5q-30 0 -68 -29l-18 18q52 80 150 80q52 0 89.5 -24t57.5 -65t29 -86.5t9 -98.5z" />
+<glyph unicode="&#x3d5;" horiz-adv-x="678" d="M494 699l-65 -237q94 0 142 -36t48 -115q0 -68 -32 -139.5t-85 -119.5q-71 -65 -200 -65l-51 -192h-115l51 192q-91 0 -140.5 37t-49.5 111q0 58 19.5 114.5t56.5 104.5t100 78t141 30l62 237h118zM421 433l-113 -417q24 0 53 13t46 34q93 110 93 275q0 95 -79 95z M195 16l112 417q-43 0 -71 -17t-57 -63q-63 -99 -63 -230q0 -107 79 -107z" />
+<glyph unicode="&#x3d6;" horiz-adv-x="828" d="M844 449l-21 -100h-60q7 -21 7 -58q0 -112 -80.5 -208t-189.5 -96q-77 0 -105 62q-56 -62 -132 -62q-59 0 -90 18q-62 37 -62 130q0 59 23 121t52 92h-22q-99 0 -139 -81h-27q52 182 248 182h598zM651 349h-364q-24 -47 -40.5 -116.5t-16.5 -128.5q0 -39 12 -63.5 t31 -24.5q31 0 58 29.5t44 76.5q-3 15 -3 36q0 58 22 101t70 43q21 0 33 -14.5t12 -35.5q0 -52 -57 -138q-2 -20 -2 -26q0 -72 53 -72q32 0 61.5 43t47.5 101t28.5 110.5t10.5 78.5z" />
+<glyph unicode="&#x3d8;" horiz-adv-x="722" d="M166 -93l23 84q-76 18 -119 77.5t-43 152.5q0 101 51 202.5t135 169.5q114 92 236 92q104 0 173 -66.5t69 -174.5q0 -95 -49.5 -194.5t-130.5 -171.5q-79 -70 -176 -89l-10 -37q-17 -62 -17 -87q0 -21 14.5 -29.5t56.5 -10.5v-25h-296v25q39 5 54 18t29 64zM547 528 q0 60 -27 91.5t-74 31.5q-91 0 -162 -120q-46 -78 -79.5 -189.5t-33.5 -198.5q0 -57 27.5 -92t74.5 -35q46 0 82 28t75 86q49 72 83 191t34 207z" />
+<glyph unicode="&#x3d9;" d="M280 462h4q73 0 115 -41t42 -110t-29 -135.5t-76 -113.5q-56 -56 -124 -69l-54 -198h-115l56 201q-48 13 -75 48.5t-27 90.5q0 73 27 139t73 111q79 77 183 77zM322 372q0 28 -12.5 44.5t-34.5 16.5q-32 0 -60 -31q-43 -48 -71 -144.5t-28 -177.5q0 -64 49 -64 q41 0 71 49q36 59 61 149.5t25 157.5z" />
+<glyph unicode="&#x3da;" horiz-adv-x="669" d="M98 -120l26 24q39 -63 114 -63q58 0 104.5 38t46.5 93q0 70 -157 94q-200 31 -200 189q0 123 67.5 223t175 153.5t229.5 53.5q67 0 114 -22t47 -64q0 -36 -17.5 -55.5t-46.5 -19.5q-25 0 -41.5 11t-27 26t-22.5 30.5t-33.5 26.5t-53.5 11q-57 0 -119.5 -39t-107 -106 t-44.5 -138q0 -52 25 -85.5t66.5 -50t85 -27t90.5 -26t74 -37.5q45 -38 45 -98q0 -46 -24.5 -91t-62.5 -73q-85 -63 -198 -63q-108 0 -155 85z" />
+<glyph unicode="&#x3db;" horiz-adv-x="475" d="M486 492h23q-16 -127 -78.5 -178t-168.5 -55q-14 -1 -46 -1t-48.5 -1t-37.5 -6.5t-35 -16.5q-38 -29 -38 -69q0 -35 18.5 -56t51.5 -21q13 0 55 9t59 9q54 0 85 -35t31 -87q0 -61 -65 -125t-131 -64q-38 0 -57 17t-19 42q0 20 13 37t43 17q25 0 40 -26.5t29 -26.5 q29 0 51 30t22 66q0 26 -11 36.5t-42 10.5q-11 0 -45 -5.5t-50 -5.5q-67 0 -103.5 33.5t-36.5 97.5q0 99 88.5 170.5t199.5 82.5q100 10 142 39.5t61 81.5z" />
+<glyph unicode="&#x3dc;" horiz-adv-x="667" d="M670 669l-43 -190l-27 5q0 75 -20 100q-42 53 -167 53q-31 0 -43 -9.5t-20 -38.5l-60 -219h220l-13 -44h-219l-53 -194q-15 -56 -15 -63q0 -23 14.5 -32t56.5 -12v-25h-294v25q41 4 55.5 19.5t26.5 59.5l121 442q10 38 10 61q0 28 -42 33l-31 4v25h543z" />
+<glyph unicode="&#x3dd;" horiz-adv-x="525" d="M507 450l-20 -84h-203l-53 -231h153l-12 -50h-153l-63 -275h-124l148 640h327z" />
+<glyph unicode="&#x3de;" horiz-adv-x="757" d="M758 570l-322 -425q-28 -38 -28 -62q0 -14 9.5 -21.5t23.5 -7.5q37 0 77 30l10 -20q-102 -82 -176 -82q-49 0 -72 21.5t-23 53.5q0 36 23 67t82 84l178 160v6l-538 -184l-9 15l321 425q28 37 28 64q0 29 -31 29q-36 0 -79 -32l-10 20q102 82 176 82q49 0 72.5 -21 t23.5 -53q0 -33 -21.5 -64t-84.5 -88l-178 -159v-6l538 184z" />
+<glyph unicode="&#x3df;" horiz-adv-x="485" d="M466 399l-301 -399h-140l279 299h-288l301 399h140l-289 -299h298z" />
+<glyph unicode="&#x3e0;" horiz-adv-x="734" d="M52 503l-25 28q94 85 180 119.5t201 34.5q153 0 227.5 -89t74.5 -228q0 -136 -67.5 -263.5t-184 -212t-251.5 -97.5v40q142 39 246.5 187.5t104.5 311.5q0 42 -11 81q-82 -32 -149 -156.5t-87 -258.5h-161q23 142 135 276.5t253 179.5q-22 70 -80.5 116.5t-134.5 46.5 q-20 0 -29 -2l-64 -274h-46l60 262q-97 -15 -192 -102z" />
+<glyph unicode="&#x3e1;" horiz-adv-x="530" d="M47 605l24 34q116 -11 208.5 -79.5t140 -164.5t47.5 -197q0 -241 -136 -403l-36 4q19 43 30 86q20 76 20 153q0 63 -13 131l-181 -91l-12 38l185 92q-19 66 -38 122l-184 -92l-12 38l180 90q-77 176 -223 239z" />
+<glyph unicode="&#x3f0;" horiz-adv-x="569" d="M592 449l-154 -146q-16 -34 -31 -87t-15 -83q0 -36 36 -36q28 0 42.5 -15t14.5 -36q0 -23 -16.5 -42t-52.5 -19q-41 0 -61 30t-20 75q0 35 11.5 79t27.5 74l-260 -243h-164l157 147q17 34 31.5 86t14.5 81q0 36 -36 36q-28 0 -42.5 15t-14.5 36q0 23 16.5 42t52.5 19 q41 0 61 -30t20 -75q0 -78 -38 -150l256 242h164z" />
+<glyph unicode="&#x3f1;" horiz-adv-x="517" d="M303 -206h-25q2 8 2 10q0 17 -25 17t-78 8.5t-102 43.5q-87 63 -87 192q0 87 37.5 178t88.5 142q79 77 184 77q73 0 116.5 -41t43.5 -110t-29 -135.5t-76 -113.5q-75 -75 -175 -75q-95 0 -127 90h-2q0 -78 36 -114.5t97 -36.5q14 0 42 1.5t39 1.5q77 0 77 -54 q0 -26 -7 -40t-30 -41zM339 372q0 28 -12.5 44.5t-34.5 16.5q-32 0 -60 -31q-43 -48 -71 -144.5t-28 -177.5q0 -64 49 -64q41 0 71 49q36 59 61 149.5t25 157.5z" />
+<glyph unicode="&#x3f4;" horiz-adv-x="722" d="M691 444q0 -95 -49.5 -194.5t-130.5 -171.5q-108 -96 -248 -96q-108 0 -172 62.5t-64 176.5q0 101 51 202.5t135 169.5q114 92 236 92q104 0 173 -66.5t69 -174.5zM209 359h314q24 98 24 169q0 60 -27 91.5t-74 31.5q-91 0 -162 -120q-45 -75 -75 -172zM511 315h-315 q-25 -94 -25 -172q0 -57 27.5 -92t74.5 -35q46 0 82 28t75 86q46 67 81 185z" />
+<glyph unicode="&#x3f5;" horiz-adv-x="466" d="M429 462l-26 -152h-27q0 24 -2.5 40.5t-9.5 35.5t-24.5 29t-43.5 10q-51 0 -93 -52.5t-59 -115.5h177l-10 -42h-177q-9 -27 -9 -66q0 -98 73 -98q74 0 133 83l29 -18q-92 -129 -199 -129q-85 0 -124.5 42.5t-39.5 114.5q0 116 86.5 215t196.5 103q28 1 46.5 -7t29 -16 t17.5 -8t18 10t15 21h23z" />
+<glyph unicode="&#x3f6;" horiz-adv-x="486" d="M93 313l-29 18q92 129 199 129q85 0 124.5 -42.5t39.5 -114.5q0 -116 -86.5 -215t-196.5 -103q-28 -1 -46.5 7t-29 16t-17.5 8t-18 -10t-15 -21h-23l26 152h27q0 -24 2.5 -40.5t9.5 -35.5t24.5 -29t43.5 -10q51 0 93 52.5t59 115.5h-177l10 42h177q9 27 9 66q0 98 -73 98 q-74 0 -133 -83z" />
+<glyph unicode="&#x401;" horiz-adv-x="667" d="M381 839q0 -26 -19.5 -45t-46.5 -19q-25 0 -44.5 19.5t-19.5 44.5q0 27 19 46.5t45 19.5q27 0 46.5 -19.5t19.5 -46.5zM593 839q0 -26 -19.5 -45t-46.5 -19q-25 0 -44.5 19.5t-19.5 44.5q0 27 19 46.5t45 19.5q27 0 46.5 -19.5t19.5 -46.5zM645 669l-43 -190l-27 5 q-3 60 -9.5 82t-35.5 41q-47 30 -137 30q-32 0 -45 -9t-22 -42l-59 -216q99 0 134.5 18.5t70.5 88.5l28 -4l-74 -274l-28 4q4 25 4 44q0 52 -30 71.5t-114 19.5l-63 -234q-8 -32 -8 -38q0 -34 61 -34q131 0 214 61q28 20 47 42t44 64l25 -5l-60 -194h-553v25q39 6 54 20.5 t28 59.5l119 432q12 44 12 70q0 15 -9 22.5t-32 10.5l-33 4v25h541z" />
+<glyph unicode="&#x402;" horiz-adv-x="789" d="M418 405h1q67 44 143 44q92 0 133.5 -52t41.5 -140q0 -96 -43 -203.5t-115 -183t-146 -75.5q-66 0 -102 24.5t-36 68.5q0 32 20 54t47 22t45 -18t18 -47q0 -17 -11.5 -32t-11.5 -22q0 -15 27 -15q60 0 107.5 143t47.5 328q0 54 -21.5 77.5t-65.5 23.5q-38 0 -89 -32 l-61 -227q-13 -46 -13 -70q0 -23 15 -35.5t54 -12.5v-25h-323v25h15q72 0 91 72l148 537q-82 -2 -130.5 -28.5t-84.5 -102.5l-25 7l36 159h551l-31 -166l-27 2q0 81 -31 105t-112 24z" />
+<glyph unicode="&#x403;" horiz-adv-x="604" d="M658 669l-46 -203l-27 3q0 165 -131 165h-112l-145 -532q-6 -20 -6 -41q1 -35 73 -35v-26h-296v26q40 4 55 19t27 58l121 443q11 37 11 61q0 15 -8.5 21.5t-32.5 10.5l-34 5v25h551zM342 766l122 131q47 50 70 50q20 0 34 -14t14 -33q0 -14 -8.5 -24t-30.5 -23l-152 -87 h-49z" />
+<glyph unicode="&#x404;" horiz-adv-x="657" d="M689 685l-51 -235l-32 6q3 20 3 36q0 72 -34.5 115t-96.5 43q-80 0 -145 -73q-78 -88 -112 -201h263l-12 -50h-263q-11 -63 -11 -117q0 -83 43 -137.5t112 -54.5q44 0 74 20t30 50q0 5 -2.5 18.5t-2.5 19.5q0 40 27.5 63.5t61.5 23.5q23 0 39.5 -16.5t16.5 -39.5 q0 -40 -47 -89q-80 -85 -239 -85q-122 0 -194.5 69t-72.5 183q0 109 42.5 202t116.5 156q111 93 249 93q64 0 131 -21q24 -8 38 -8q20 0 38 29h30z" />
+<glyph unicode="&#x405;" horiz-adv-x="556" d="M502 681l-40 -202l-27 4q-9 76 -22 101q-33 66 -116 66q-41 0 -69.5 -29t-28.5 -76q0 -41 22.5 -66.5t84.5 -70.5q80 -58 109 -104t29 -113q0 -63 -29 -110.5t-81 -73.5q-52 -25 -120 -25q-53 0 -122 24q-32 11 -46 11t-21.5 -6.5t-16.5 -28.5h-30l36 225l29 -2 q7 -54 16 -84t32 -55q44 -50 106 -50q56 0 89 34q37 37 37 92q0 43 -25.5 75.5t-89.5 78.5q-66 47 -98 92.5t-32 105.5q0 84 58.5 137.5t145.5 53.5q50 0 91.5 -15t54.5 -15q31 0 44 26h30z" />
+<glyph unicode="&#x406;" horiz-adv-x="389" d="M406 669v-25q-38 -4 -55 -19t-29 -61l-112 -412q-17 -62 -17 -87q0 -21 14.5 -29.5t56.5 -10.5v-25h-296v25q39 5 54 18t29 64l117 429q14 51 14 71q0 28 -42 33l-32 4v25h298z" />
+<glyph unicode="&#x407;" horiz-adv-x="389" d="M265 839q0 -26 -19.5 -45t-46.5 -19q-25 0 -44.5 19.5t-19.5 44.5q0 27 19 46.5t45 19.5q27 0 46.5 -19.5t19.5 -46.5zM477 839q0 -26 -19.5 -45t-46.5 -19q-25 0 -44.5 19.5t-19.5 44.5q0 27 19 46.5t45 19.5q27 0 46.5 -19.5t19.5 -46.5zM403 669v-25q-38 -4 -55 -19 t-29 -61l-112 -412q-17 -62 -17 -87q0 -21 14.5 -29.5t56.5 -10.5v-25h-296v25q39 5 54 18t29 64l117 429q14 51 14 71q0 28 -42 33l-32 4v25h298z" />
+<glyph unicode="&#x408;" d="M562 669v-25q-40 -5 -55.5 -19t-29.5 -66l-122 -457q-26 -99 -82 -150t-133 -51q-67 0 -107.5 26.5t-40.5 74.5q0 30 18.5 51t45.5 21t45 -18t18 -47q0 -17 -11.5 -32t-11.5 -22q0 -18 27 -18t43.5 32t44.5 138l114 432q13 51 13 64q0 29 -41 36l-33 5v25h298z" />
+<glyph unicode="&#x409;" horiz-adv-x="954" d="M601 370h81q214 0 214 -164q0 -99 -78 -152.5t-217 -53.5h-302v25q36 5 54 22t30 61l115 428q9 34 10 58q0 25 -39 25h-85q-24 0 -36.5 -14t-21.5 -47l-79 -292q-10 -36 -16.5 -57.5t-21 -60.5t-30.5 -63.5t-38 -50.5t-51.5 -39t-64.5 -13q-39 0 -61.5 21.5t-22.5 53.5 q0 44 23.5 64t54.5 20q21 0 33.5 -11t15.5 -24.5t9 -24.5t16 -11q51 0 110 224l79 295q3 11 3 19q0 16 -13.5 24.5t-49.5 11.5v25h515v-25q-36 0 -53.5 -16.5t-28.5 -57.5zM593 338l-64 -236q-7 -27 -7 -37q0 -33 57 -33q77 0 120.5 58t43.5 139q0 65 -36.5 87t-113.5 22z " />
+<glyph unicode="&#x40a;" horiz-adv-x="982" d="M629 373h81q214 0 214 -167q0 -99 -78 -152.5t-217 -53.5h-305v25q41 1 57.5 18.5t29.5 64.5l60 221h-213l-54 -197q-12 -43 -12 -67q0 -34 66 -40v-25h-290v25q39 5 54 18.5t27 55.5l121 447q11 38 11 58q0 17 -9.5 25t-32.5 11l-31 4v25h306v-25q-47 -1 -62.5 -15.5 t-29.5 -64.5l-52 -191h213l47 173q11 39 11 57q0 27 -13.5 34t-47.5 7v25h295v-25q-46 0 -61.5 -12.5t-27.5 -54.5zM621 340l-64 -238q-7 -27 -7 -37q0 -33 57 -33q77 0 120.5 58t43.5 139q0 65 -37 88t-113 23z" />
+<glyph unicode="&#x40b;" horiz-adv-x="830" d="M757 0h-311v26q49 3 69 18.5t32 60.5l28 107q23 88 23 118q0 37 -20 54.5t-81 17.5q-47 0 -98 -32l-61 -225q-17 -58 -17 -80q0 -8 1.5 -13t7.5 -11.5t20 -10.5t37 -5v-25h-316v25h15q72 0 91 72l148 537q-82 -2 -130.5 -28.5t-84.5 -102.5l-25 7l36 159h571l-31 -166 l-27 2q0 79 -39 104t-124 25l-63 -228q65 43 153 43q76 0 126.5 -30t50.5 -89q0 -43 -24 -134l-26 -98q-5 -18 -5 -30q0 -22 17 -31.5t57 -11.5v-25z" />
+<glyph unicode="&#x40c;" horiz-adv-x="678" d="M321 572l-55 -202q52 0 97 26q53 30 101 131l28 55q9 17 29 44.5t43.5 39.5t52.5 12q31 0 55.5 -19.5t24.5 -47.5q0 -12 -3 -25.5t-18.5 -29.5t-41.5 -16q-17 0 -30.5 12t-22 24.5t-13.5 12.5q-22 0 -40.5 -26t-32 -61t-45.5 -78t-76 -69q44 -37 69 -98l76 -188 q8 -21 25 -30.5t60 -13.5v-25h-202l-105 278q-10 27 -17.5 36.5t-25.5 11.5l-64 -238q-2 -10 -2 -17q0 -25 13 -34t52 -12v-25h-288v25q36 4 52.5 17t26.5 51l123 453q11 38 11 58q0 17 -9 25t-32 11l-33 4v25h311v-25q-45 -4 -64.5 -18.5t-29.5 -53.5zM350 766l122 131 q47 50 70 50q20 0 34 -14t14 -33q0 -14 -8.5 -24t-30.5 -23l-152 -87h-49z" />
+<glyph unicode="&#x40e;" horiz-adv-x="666" d="M608 894q0 -43 -29.5 -73.5t-66.5 -42.5t-75 -12q-61 0 -116.5 33t-55.5 95q0 30 18 43.5t39 13.5q17 0 30.5 -11.5t13.5 -29.5q0 -19 -9.5 -30t-9.5 -17q0 -18 23.5 -32.5t66.5 -14.5t66 14t23 33q0 6 -9.5 17.5t-9.5 30.5q0 18 14.5 29t32.5 11q21 0 37.5 -13.5 t16.5 -43.5zM712 669v-25q-50 -7 -69 -39l-275 -471q-47 -79 -86.5 -115.5t-92.5 -36.5q-36 0 -63 20.5t-27 51.5q0 48 26 68t55 20q21 0 34 -13t16.5 -28.5t10.5 -28.5t17 -13q22 0 96 128l-155 394q-14 36 -25.5 45.5t-49.5 17.5v25h285v-25q-40 -4 -54.5 -11t-14.5 -28 q0 -39 29 -110l69 -165h2l108 199q18 32 18 65q0 45 -61 50v25h207z" />
+<glyph unicode="&#x40f;" horiz-adv-x="778" d="M791 669v-25q-39 -5 -54 -18t-29 -64l-117 -429q-14 -51 -14 -71q0 -28 42 -33l32 -4l-7 -25h-152q-96 0 -149.5 -46.5t-79.5 -137.5h-28q5 25 5 51q0 133 -134 133h-139v25q38 4 55 19t29 61l112 412q17 62 17 87q0 21 -14.5 29.5t-56.5 10.5v25h296v-25q-39 -5 -54 -18 t-29 -64l-143 -522h241l129 477q17 62 17 87q0 21 -14.5 29.5t-56.5 10.5v25h296z" />
+<glyph unicode="&#x410;" horiz-adv-x="667" d="M604 0h-303v25q77 6 77 49q0 3 -2 15l-12 119h-215l-57 -96q-17 -28 -17 -50q0 -37 64 -37v-25h-195l-1 25q26 3 43 19.5t43 56.5l370 582h25l94 -560q11 -62 25 -78.5t61 -19.5v-25zM357 248l-37 243l-148 -243h185z" />
+<glyph unicode="&#x411;" horiz-adv-x="635" d="M629 669l-46 -193l-27 3q0 88 -28.5 121.5t-119.5 33.5q-32 0 -44.5 -10.5t-22.5 -46.5l-57 -209h76q219 0 219 -162q0 -103 -89 -161q-70 -45 -206 -45h-302v25q36 5 54 22t30 61l119 438q11 39 11 57t-10.5 27.5t-23.5 11.5t-37 2v25h504zM276 338l-64 -236 q-7 -27 -7 -37q0 -33 57 -33q77 0 120.5 58t43.5 139q0 65 -35 86t-115 23z" />
+<glyph unicode="&#x412;" horiz-adv-x="654" d="M118 669h265q241 0 241 -146q0 -75 -50.5 -113.5t-138.5 -54.5v-1q59 -12 98 -49.5t39 -98.5q0 -100 -82 -157q-69 -49 -213 -49h-302v25q36 5 54 22t30 61l119 438q11 39 11 57t-10.5 27.5t-23.5 11.5t-37 2v25zM334 577l-57 -209q5 0 21.5 1.5t21.5 1.5t18.5 1.5 t19 2.5t16 3.5t16.5 5.5l13 6q8 3 14.5 7.5t12.5 10.5q47 44 47 128q0 101 -87 101q-25 0 -35 -10t-21 -50zM269 338l-64 -236q-7 -27 -7 -37q0 -33 57 -33q73 0 121 59q43 52 43 138q0 58 -35 85q-28 21 -115 24z" />
+<glyph unicode="&#x413;" horiz-adv-x="604" d="M658 669l-46 -203l-27 3q0 165 -131 165h-112l-145 -532q-6 -20 -6 -41q1 -35 73 -35v-26h-296v26q40 4 55 19t27 58l121 443q11 37 11 61q0 15 -8.5 21.5t-32.5 10.5l-34 5v25h551z" />
+<glyph unicode="&#x414;" horiz-adv-x="696" d="M718 669v-25q-28 0 -45.5 -11.5t-23.5 -24.5t-13 -38l-123 -454q-10 -37 -10 -52q0 -19 15.5 -27.5t57.5 -11.5l-57 -209l-29 4q4 24 4 47q0 65 -31 99t-101 34h-236q-139 0 -214 -182l-27 -2l57 209h20q73 0 138.5 132t140.5 411q6 20 6 35q0 18 -11 28.5t-41 12.5l6 25 h517zM362 104l118 427q10 33 10 57q0 31 -39 31h-103q-23 0 -36 -16t-22 -50q-112 -422 -212 -518h211q54 0 73 69z" />
+<glyph unicode="&#x415;" horiz-adv-x="667" d="M645 669l-43 -190l-27 5q-3 60 -9.5 82t-35.5 41q-47 30 -137 30q-32 0 -45 -9t-22 -42l-59 -216q99 0 134.5 18.5t70.5 88.5l28 -4l-74 -274l-28 4q4 25 4 44q0 52 -30 71.5t-114 19.5l-63 -234q-8 -32 -8 -38q0 -34 61 -34q131 0 214 61q28 20 47 42t44 64l25 -5 l-60 -194h-553v25q39 6 54 20.5t28 59.5l119 432q12 44 12 70q0 15 -9 22.5t-32 10.5l-33 4v25h541z" />
+<glyph unicode="&#x416;" horiz-adv-x="927" d="M613 564l-53 -194q51 0 96 26q28 16 49 52t35 73.5t31 74t46.5 59.5t72.5 23q31 0 55 -19.5t24 -47.5q0 -13 -3 -26t-18 -29t-41 -16q-17 0 -30.5 12t-22 24.5t-13.5 12.5q-22 0 -37 -26.5t-25 -61.5t-39 -78.5t-73 -69.5q48 -37 66 -94l59 -190q7 -21 24.5 -30.5 t60.5 -13.5v-25h-200l-88 277q-14 45 -41 49l-47 -174q-17 -62 -17 -87q0 -21 13 -29.5t48 -10.5v-25h-291v25q42 5 61 19t32 63l59 219q-41 -5 -69 -43l-206 -283h-194v25q26 3 45 12.5t26.5 18t20.5 27.5l124 171q39 54 76.5 75.5t89.5 28.5v3q-45 41 -45 110q0 14 1 40 t1 35q0 43 -24 43q-7 0 -12.5 -7.5t-10 -17t-16 -17t-28.5 -7.5q-24 0 -37.5 14t-16.5 26.5t-3 24.5q0 31 27.5 52t58.5 21q46 0 76.5 -33t30.5 -77q0 -12 -1 -31.5t-1 -27.5q0 -68 20.5 -103t78.5 -36l46 166q14 51 14 71q0 28 -42 33l-32 4v25h293v-25q-38 -4 -55 -19 t-29 -61z" />
+<glyph unicode="&#x417;" horiz-adv-x="561" d="M154 686h30q1 -13 11 -22.5t22 -9.5q7 0 10 1.5t8 4.5t14 6q58 19 110 19q94 0 142 -44t48 -108q0 -66 -52 -117.5t-134 -55.5v-2q56 -13 95 -52.5t39 -98.5q0 -57 -33.5 -104t-84.5 -76q-49 -28 -95.5 -36.5t-112.5 -8.5q-75 0 -128 36t-53 107q0 37 24 60t50 23 q28 0 46.5 -16.5t18.5 -45.5q0 -24 -16 -44t-16 -32q0 -19 23 -31t63 -12q70 0 115.5 52.5t45.5 148.5q0 110 -134 110l12 38q86 0 133 41t47 120q0 53 -28 79t-66 26q-126 0 -170 -146h-27z" />
+<glyph unicode="&#x418;" horiz-adv-x="768" d="M790 669v-25q-36 0 -53.5 -16.5t-28.5 -57.5l-111 -408q-22 -84 -22 -96q0 -22 16 -30.5t57 -10.5v-25h-316v25q51 3 70 17.5t32 61.5l98 357l-329 -329q-12 -48 -12 -67q0 -34 71 -40v-25h-295v25q39 5 54 18.5t27 55.5l121 447q11 38 11 58q0 17 -9.5 25t-32.5 11 l-31 4v25h316v-25q-49 -2 -69 -17t-33 -63l-95 -348l329 330q10 47 10 61q0 15 -9 22.5t-32 10.5l-31 4v25h297z" />
+<glyph unicode="&#x419;" horiz-adv-x="768" d="M790 669v-25q-36 0 -53.5 -16.5t-28.5 -57.5l-111 -408q-22 -84 -22 -96q0 -22 16 -30.5t57 -10.5v-25h-316v25q51 3 70 17.5t32 61.5l98 357l-329 -329q-12 -48 -12 -67q0 -34 71 -40v-25h-295v25q39 5 54 18.5t27 55.5l121 447q11 38 11 58q0 17 -9.5 25t-32.5 11 l-31 4v25h316v-25q-49 -2 -69 -17t-33 -63l-95 -348l329 330q10 47 10 61q0 15 -9 22.5t-32 10.5l-31 4v25h297zM651 891q0 -63 -49.5 -94t-111.5 -31q-37 0 -72 11.5t-62.5 41t-27.5 72.5q0 30 18 43.5t39 13.5q17 0 30.5 -11.5t13.5 -29.5q0 -19 -9.5 -30t-9.5 -17 q0 -44 80 -44q79 0 79 44q0 6 -9.5 17.5t-9.5 30.5q0 18 14.5 29t32.5 11q21 0 37.5 -13.5t16.5 -43.5z" />
+<glyph unicode="&#x41a;" horiz-adv-x="678" d="M321 572l-55 -202q52 0 97 26q53 30 101 131l28 55q9 17 29 44.5t43.5 39.5t52.5 12q31 0 55.5 -19.5t24.5 -47.5q0 -12 -3 -25.5t-18.5 -29.5t-41.5 -16q-17 0 -30.5 12t-22 24.5t-13.5 12.5q-22 0 -40.5 -26t-32 -61t-45.5 -78t-76 -69q44 -37 69 -98l76 -188 q8 -21 25 -30.5t60 -13.5v-25h-202l-105 278q-10 27 -17.5 36.5t-25.5 11.5l-64 -238q-2 -10 -2 -17q0 -25 13 -34t52 -12v-25h-288v25q36 4 52.5 17t26.5 51l123 453q11 38 11 58q0 17 -9 25t-32 11l-33 4v25h311v-25q-45 -4 -64.5 -18.5t-29.5 -53.5z" />
+<glyph unicode="&#x41b;" horiz-adv-x="742" d="M764 669v-25q-36 0 -53.5 -16.5t-28.5 -57.5l-111 -408q-22 -84 -22 -96q0 -22 16 -30.5t57 -10.5v-25h-316v25q51 3 70 17.5t32 61.5l119 432q9 34 10 58q0 25 -39 25h-114q-24 0 -36.5 -14t-21.5 -47l-78 -292q-11 -40 -21 -70t-29.5 -73.5t-42 -71.5t-56.5 -48.5 t-74 -20.5q-39 0 -61.5 21.5t-22.5 53.5q0 44 23.5 64t54.5 20q21 0 33.5 -11t15.5 -24.5t9 -24.5t16 -11q51 0 110 224l79 295q3 11 3 19q0 16 -13.5 24.5t-49.5 11.5v25h542z" />
+<glyph unicode="&#x41c;" horiz-adv-x="890" d="M912 669v-25q-39 -5 -55 -20t-29 -61l-119 -438q-10 -34 -10 -57q0 -25 14 -34t57 -9v-25h-311v25q50 3 69.5 18.5t31.5 60.5l123 457l-375 -573h-28l-67 559l-101 -369q-20 -71 -20 -92q0 -33 15.5 -44.5t64.5 -16.5v-25h-206v25q40 9 58 36.5t45 120.5l107 369 q11 41 11 58q0 22 -12.5 28.5t-58.5 6.5v25h219l54 -480l311 480h212z" />
+<glyph unicode="&#x41d;" horiz-adv-x="769" d="M791 669v-25q-36 0 -53.5 -16.5t-28.5 -57.5l-111 -408q-22 -84 -22 -96q0 -22 16 -30.5t57 -10.5v-25h-316v25q51 3 70 17.5t32 61.5l62 225h-239l-54 -197q-12 -43 -12 -67q0 -34 71 -40v-25h-295v25q39 5 54 18.5t27 55.5l121 447q11 38 11 58q0 17 -9.5 25t-32.5 11 l-31 4v25h316v-25q-49 -2 -69 -17t-33 -63l-52 -191h239l47 173q10 38 10 61q0 15 -9 22.5t-32 10.5l-31 4v25h297z" />
+<glyph unicode="&#x41e;" horiz-adv-x="722" d="M717 444q0 -95 -49.5 -194.5t-130.5 -171.5q-108 -96 -248 -96q-108 0 -172 62.5t-64 176.5q0 101 51 202.5t135 169.5q114 92 236 92q104 0 173 -66.5t69 -174.5zM573 528q0 60 -27 91.5t-74 31.5q-91 0 -162 -120q-46 -78 -79.5 -189.5t-33.5 -198.5q0 -57 27.5 -92 t74.5 -35q46 0 82 28t75 86q49 72 83 191t34 207z" />
+<glyph unicode="&#x41f;" horiz-adv-x="767" d="M789 669v-25q-38 -4 -55 -19t-29 -61l-112 -412q-17 -62 -17 -87q0 -21 14.5 -29.5t56.5 -10.5v-25h-296v25q39 5 54 18t29 64l143 522h-240l-130 -477q-17 -62 -17 -87q0 -21 14.5 -29.5t56.5 -10.5v-25h-296v25q39 5 54 18t29 64l117 429q14 51 14 71q0 28 -42 33 l-32 4v25h684z" />
+<glyph unicode="&#x420;" horiz-adv-x="590" d="M110 669h282q219 0 219 -155q0 -80 -59 -131q-75 -66 -214 -66q-37 0 -81 5l-54 -199q-11 -37 -11 -58q0 -20 15 -29t57 -11v-25h-294v25q40 6 55.5 20.5t28.5 61.5l117 426q13 46 13 74q0 15 -9 22.5t-32 10.5l-33 4v25zM328 584l-61 -229q17 -3 42 -3q46 0 74.5 14.5 t48.5 47.5q33 52 33 136q0 40 -22.5 63.5t-61.5 23.5q-26 0 -35 -9.5t-18 -43.5z" />
+<glyph unicode="&#x421;" horiz-adv-x="667" d="M710 685l-51 -235l-32 6q3 20 3 36q0 72 -34.5 115t-96.5 43q-80 0 -145 -73q-61 -69 -98 -165t-37 -203q0 -81 42 -127.5t113 -46.5q61 0 105 28t99 91l31 -22q-42 -58 -78 -85q-86 -65 -199 -65q-122 0 -194.5 69t-72.5 183q0 109 42.5 202t116.5 156q111 93 249 93 q63 0 131 -21q24 -8 38 -8q20 0 38 29h30z" />
+<glyph unicode="&#x422;" horiz-adv-x="611" d="M681 669l-36 -192l-27 2q0 86 -28 120.5t-110 34.5l-135 -489q-17 -58 -17 -74q0 -46 83 -46v-25h-331v25h15q72 0 91 72l148 537q-76 -1 -129.5 -39t-91.5 -118l-25 7l42 185h551z" />
+<glyph unicode="&#x423;" horiz-adv-x="666" d="M712 669v-25q-50 -7 -69 -39l-275 -471q-47 -79 -86.5 -115.5t-92.5 -36.5q-36 0 -63 19.5t-27 50.5q0 48 27.5 69t56.5 21q21 0 33.5 -13t15.5 -28.5t9.5 -28.5t16.5 -13q22 0 96 128l-155 394q-14 36 -25.5 45.5t-49.5 17.5v25h285v-25q-40 -4 -54.5 -11t-14.5 -28 q0 -15 29 -110l69 -165h2l108 199q18 32 18 65q0 45 -61 50v25h207z" />
+<glyph unicode="&#x424;" horiz-adv-x="833" d="M588 581l-4 -18q102 -1 167 -44t65 -132q0 -72 -38 -131t-95.5 -92.5t-116 -51t-107.5 -17.5q-4 -16 -4 -29q0 -22 17 -31.5t62 -9.5v-25h-323v25q52 5 72.5 17t31.5 53h-8q-104 0 -169.5 51.5t-65.5 142.5q0 84 58.5 149t138.5 95t160 30h15q7 33 7 44q0 28 -45 33 l-32 4v25h318v-25q-48 0 -72 -12t-32 -51zM577 529l-108 -400q70 0 136.5 73t66.5 169q0 64 -24 111t-71 47zM328 129l109 400q-75 0 -148 -81.5t-73 -171.5q0 -60 31.5 -103.5t80.5 -43.5z" />
+<glyph unicode="&#x425;" horiz-adv-x="607" d="M657 669v-25q-28 -4 -47.5 -16t-51.5 -45l-199 -205l75 -237q21 -66 41.5 -88t73.5 -28v-25h-307v25q42 4 54.5 11t12.5 27q0 30 -37 141l-20 60l-130 -144q-32 -35 -32 -55q0 -34 63 -40v-25h-214v25q10 2 17.5 4t16.5 8l17 11q7 4 19 16l22 20l26 27l30 33l38 42l45 49 l68 74l-83 269q-12 40 -29 50.5t-64 15.5v25h305v-25l-29 -3q-25 -2 -35 -9t-10 -24q0 -21 35 -132l17 -55l94 99q70 74 70 98q0 21 -33 24l-21 2v25h202z" />
+<glyph unicode="&#x426;" horiz-adv-x="770" d="M792 669v-25q-39 -5 -54 -18t-29 -64l-117 -429q-14 -51 -14 -71q0 -28 42 -33l32 -4l-56 -209l-30 4q4 24 4 47q0 133 -132 133h-470v25q38 4 55 19t29 61l112 412q17 62 17 87q0 21 -14.5 29.5t-56.5 10.5v25h296v-25q-39 -5 -54 -18t-29 -64l-142 -522h239l130 477 q17 62 17 87q0 21 -14.5 29.5t-56.5 10.5v25h296z" />
+<glyph unicode="&#x427;" horiz-adv-x="758" d="M780 669v-25q-36 0 -53.5 -16.5t-28.5 -57.5l-111 -408q-22 -84 -22 -96q0 -22 16 -30.5t57 -10.5v-25h-316v25q51 3 70 17.5t32 61.5l52 188q-86 -37 -175 -37q-77 0 -118.5 20.5t-41.5 81.5q0 33 12 79l35 135q5 18 5 33q0 17 -9.5 25t-32.5 11l-31 4v25h306v-25 q-44 -2 -61.5 -17t-30.5 -63l-46 -165q-8 -29 -8 -47q0 -50 81 -50q25 0 65.5 10t59.5 17l59 217q10 38 10 61q0 15 -8.5 21.5t-32.5 11.5l-21 4v25h287z" />
+<glyph unicode="&#x428;" horiz-adv-x="960" d="M982 669v-25q-39 -5 -54 -18t-29 -64l-117 -429q-12 -43 -12 -69q0 -21 14.5 -29t56.5 -10v-25h-874v25q38 4 55 19t29 61l112 412q17 62 17 87q0 21 -14.5 29.5t-56.5 10.5v25h266v-25q-27 -7 -39.5 -23t-23.5 -59l-132 -486q-4 -16 -4 -20q0 -16 29 -16h85 q20 0 29.5 6.5t14.5 25.5l126 456q17 63 17 75q0 20 -8 29t-37 12v25h236v-25q-28 -5 -40.5 -25t-22.5 -57l-132 -485q-4 -14 -4 -21q0 -16 20 -16h100q19 0 27 6t13 25l121 446q18 70 18 84q0 36 -42 43v25h256z" />
+<glyph unicode="&#x429;" horiz-adv-x="960" d="M982 669v-25q-39 -5 -54 -18t-29 -64l-117 -429q-14 -51 -14 -71q0 -28 42 -33l32 -4l-57 -209l-30 4q4 24 4 47q0 133 -131 133h-661v25q38 4 55 19t29 61l112 412q17 62 17 87q0 21 -14.5 29.5t-56.5 10.5v25h266v-25q-27 -7 -39.5 -23t-23.5 -59l-132 -486 q-4 -16 -4 -20q0 -16 29 -16h85q20 0 29.5 6.5t14.5 25.5l126 456q17 63 17 75q0 20 -8 29t-37 12v25h236v-25q-28 -5 -40.5 -25t-22.5 -57l-132 -485q-4 -14 -4 -21q0 -16 20 -16h100q19 0 27 6t13 25l121 446q18 70 18 84q0 36 -42 43v25h256z" />
+<glyph unicode="&#x42a;" horiz-adv-x="780" d="M427 370h81q214 0 214 -164q0 -99 -78 -152.5t-217 -53.5h-302v25q36 5 54 22t30 61l119 438q11 39 11 57q0 31 -33 31q-45 0 -91 -35t-81 -108l-27 7l39 171h427v-25q-46 0 -61.5 -12.5t-27.5 -54.5zM419 338l-64 -236q-7 -27 -7 -37q0 -33 57 -33q77 0 120.5 58 t43.5 139q0 65 -36.5 87t-113.5 22z" />
+<glyph unicode="&#x42b;" horiz-adv-x="985" d="M283 370h81q214 0 214 -164q0 -99 -78 -152.5t-217 -53.5h-302v25q36 5 54 22t30 61l119 438q11 39 11 57t-10.5 27.5t-23.5 11.5t-37 2v25h305v-25q-46 0 -61.5 -12.5t-27.5 -54.5zM275 338l-64 -236q-7 -27 -7 -37q0 -33 57 -33q77 0 120.5 58t43.5 139q0 65 -36.5 87 t-113.5 22zM1007 669v-25q-38 -4 -55 -19t-29 -61l-112 -412q-17 -62 -17 -87q0 -21 14.5 -29.5t56.5 -10.5v-25h-296v25q39 5 54 18t29 64l117 429q14 51 14 71q0 28 -42 33l-32 4v25h298z" />
+<glyph unicode="&#x42c;" horiz-adv-x="636" d="M283 370h81q214 0 214 -164q0 -99 -78 -152.5t-217 -53.5h-302v25q36 5 54 22t30 61l119 438q11 39 11 57t-10.5 27.5t-23.5 11.5t-37 2v25h305v-25q-46 0 -61.5 -12.5t-27.5 -54.5zM275 338l-64 -236q-7 -27 -7 -37q0 -33 57 -33q77 0 120.5 58t43.5 139q0 65 -36.5 87 t-113.5 22z" />
+<glyph unicode="&#x42d;" horiz-adv-x="671" d="M157 685h30q1 -13 11 -22t22 -9q23 0 56 12q54 19 125 19q105 0 176 -63t71 -184q0 -124 -57.5 -228.5t-158 -166t-219.5 -61.5q-90 0 -149.5 34t-59.5 110q0 37 24 60t50 23q28 0 46.5 -16.5t18.5 -45.5q0 -23 -16 -44t-16 -32q0 -54 89 -54q90 0 162.5 86t109.5 220 h-255l11 50h254q12 57 12 117q0 72 -36 116t-82 44q-75 0 -141 -49t-102 -154h-32z" />
+<glyph unicode="&#x42e;" horiz-adv-x="905" d="M264 373h70q48 130 144 220q100 92 201 92q86 0 139 -66t53 -175q0 -92 -47 -192t-119 -174q-96 -96 -212 -96q-89 0 -138 62t-49 177q0 52 14 108h-68l-54 -197q-12 -43 -12 -67q0 -34 71 -40v-25h-295v25q39 5 54 18.5t27 55.5l121 447q11 38 11 58q0 17 -9.5 25 t-32.5 11l-31 4v25h316v-25q-49 -2 -69 -17t-33 -63zM754 528q0 123 -79 123q-76 0 -140 -120q-45 -82 -78.5 -193t-33.5 -195q0 -58 20.5 -92.5t59.5 -34.5q38 0 69.5 28t66.5 86q46 74 80.5 194t34.5 204z" />
+<glyph unicode="&#x42f;" horiz-adv-x="710" d="M732 669v-25q-38 -3 -54.5 -18.5t-29.5 -61.5l-124 -459q-5 -17 -5 -35q0 -22 17 -32t54 -13v-25h-301v25q47 1 61 17.5t27 64.5l61 220q-23 -5 -38 -5l-274 -322h-190l-1 25q35 6 49.5 14.5t34.5 31.5l219 256q-105 38 -105 136q1 98 76 152t217 54h306zM447 364l57 208 q5 20 5 32q0 34 -46 34q-81 0 -129.5 -58.5t-48.5 -139.5q0 -83 100 -83q31 0 62 7z" />
+<glyph unicode="&#x430;" horiz-adv-x="527" d="M476 127l21 -15q-78 -126 -156 -126q-29 0 -46 16.5t-17 47.5q0 21 14 69q-42 -71 -80 -101.5t-84 -30.5q-49 0 -78.5 35t-29.5 92q0 117 87 231q89 117 186 117q32 0 49.5 -17t24.5 -55h1l17 59l111 7l-75 -251q-30 -99 -30 -133q0 -15 12 -15t27 14.5t46 55.5zM344 373 q0 20 -10.5 33.5t-26.5 13.5q-52 0 -108 -115q-25 -51 -40.5 -105.5t-15.5 -84.5q0 -57 43 -57q45 0 86 75q29 52 50.5 123.5t21.5 116.5z" />
+<glyph unicode="&#x431;" horiz-adv-x="499" d="M544 685h26q-37 -111 -116 -140q-30 -11 -94 -13.5t-92 -12.5q-85 -29 -153 -162l3 -1q40 48 91.5 77t104.5 29q73 0 115 -41t42 -110t-29 -135.5t-76 -113.5q-75 -75 -175 -75q-73 0 -116 45t-43 129q0 116 59 242q48 103 123.5 168.5t175.5 65.5h92q24 0 37.5 10 t24.5 38zM352 372q0 28 -12.5 44.5t-34.5 16.5q-32 0 -60 -31q-43 -48 -71 -144.5t-28 -177.5q0 -64 49 -64q41 0 71 49q36 59 61 149.5t25 157.5z" />
+<glyph unicode="&#x432;" horiz-adv-x="482" d="M324 256v-2q112 -11 112 -90q0 -71 -79.5 -124t-172.5 -53q-89 0 -124 36t-35 111q0 133 83 230.5t217 97.5q60 0 96.5 -23t36.5 -63q0 -43 -32 -75.5t-102 -44.5zM364 383q0 24 -14.5 35t-33.5 11q-62 0 -95.5 -52t-48.5 -145q192 34 192 151zM317 165q0 25 -16 38 t-42 13q-38 0 -95 -25q-13 -49 -13 -91q0 -37 11.5 -60.5t34.5 -23.5q40 0 68.5 27.5t40 59.5t11.5 62z" />
+<glyph unicode="&#x433;" horiz-adv-x="368" d="M77 342l-19 20q79 99 188 99q57 0 91 -21.5t34 -63.5q0 -80 -86 -121l-38 -17l-43 -21q-14 -7 -33.5 -20t-31.5 -26q-28 -31 -28 -74q0 -51 51 -51q66 0 126 72l19 -19q-48 -60 -95 -86.5t-103 -26.5q-117 0 -117 93q0 18 7.5 35t15.5 28t27 24.5t28.5 19t34 18.5 t29.5 16q57 31 87.5 60t30.5 70q0 51 -57 51q-34 0 -61 -14t-57 -45z" />
+<glyph unicode="&#x434;" horiz-adv-x="496" d="M166 672l20 23q81 -12 144.5 -56.5t98.5 -106.5q37 -67 37 -152q0 -160 -81.5 -276.5t-204.5 -116.5q-67 0 -112.5 40t-45.5 107q0 130 85 229t190 99q47 0 71 -42l2 4q-10 101 -74.5 168t-129.5 80zM347 375q0 27 -12.5 42.5t-33.5 15.5q-41 0 -79.5 -65t-59.5 -145 t-21 -137q0 -70 49 -70q60 0 109 129q20 55 34 121t14 109z" />
+<glyph unicode="&#x435;" horiz-adv-x="431" d="M334 143l29 -17q-78 -139 -195 -139q-67 0 -106.5 37.5t-39.5 109.5q0 124 89.5 226t198.5 102q48 0 76.5 -24t28.5 -63q0 -63 -69 -122q-32 -27 -73.5 -42.5t-114.5 -28.5q-6 -30 -6 -49q0 -82 64 -82q32 0 57.5 20t60.5 72zM323 390q0 39 -31 39q-71 0 -127 -215 q68 15 113 64.5t45 111.5z" />
+<glyph unicode="&#x436;" horiz-adv-x="898" d="M506 249h74q20 68 70 130q67 83 144 83q39 0 67.5 -25t28.5 -67q0 -31 -17 -50.5t-41 -19.5q-21 0 -35 15t-14 38q0 16 9 32t9 26q0 7 -6.5 12.5t-14.5 5.5q-39 0 -69.5 -104t-30.5 -172q0 -34 2 -53t11 -34t27 -15q27 0 49 20t53 71l26 -18q-55 -92 -99 -119 q-29 -18 -69 -18q-57 0 -87.5 39t-30.5 112q0 27 10 77h-75l-59 -215h-112l59 215h-75q-20 -78 -75 -145q-69 -83 -144 -83q-40 0 -67.5 24t-27.5 68q0 31 17 50.5t41 19.5q21 0 35 -15t14 -38q0 -16 -9 -32t-9 -26q0 -7 6.5 -12.5t14.5 -5.5q39 0 69.5 104t30.5 172 q0 34 -2 53t-11 34t-27 15q-27 0 -49 -20t-53 -71l-26 18q55 92 99 119q29 18 69 18q57 0 87.5 -39t30.5 -112q0 -24 -8 -62h79l54 200h111z" />
+<glyph unicode="&#x437;" horiz-adv-x="400" d="M101 462h23q1 -3 1.5 -7t1 -6.5t1.5 -5t1.5 -4t2 -3t3 -2t3.5 -0.5q6 0 36 14t59 14q60 0 95 -20q50 -29 50 -85q0 -92 -106 -125v-2q41 -5 64.5 -29.5t23.5 -54.5q0 -76 -73 -119q-67 -40 -166 -40q-53 0 -92.5 22t-39.5 70q0 27 17 47.5t46 20.5q21 0 37.5 -13 t16.5 -39q0 -15 -10.5 -27.5t-10.5 -24.5q0 -10 12.5 -16.5t29.5 -6.5q57 0 82.5 38t25.5 88q0 32 -12 50.5t-47 18.5h-49l10 34h54q40 0 63.5 31t23.5 70q0 75 -67 75q-44 0 -75 -33.5t-49 -81.5h-27z" />
+<glyph unicode="&#x438;" horiz-adv-x="542" d="M490 133l22 -13q-39 -67 -76.5 -98t-82.5 -31q-68 0 -68 60q0 31 26 110h-1q-70 -103 -109.5 -136.5t-88.5 -33.5q-78 0 -78 79q0 27 22 106l37 128q17 62 17 75q0 24 -58 28v27q87 2 210 28l-93 -302q-16 -51 -16 -75q0 -22 24 -22q28 0 70 55q47 61 75.5 125t66.5 206 h118l-78 -266q-25 -88 -25 -103q0 -21 14 -21q24 0 72 74z" />
+<glyph unicode="&#x439;" horiz-adv-x="542" d="M490 133l22 -13q-39 -67 -76.5 -98t-82.5 -31q-68 0 -68 60q0 31 26 110h-1q-70 -103 -109.5 -136.5t-88.5 -33.5q-78 0 -78 79q0 27 22 106l37 128q17 62 17 75q0 24 -58 28v27q87 2 210 28l-93 -302q-16 -51 -16 -75q0 -22 24 -22q28 0 70 55q47 61 75.5 125t66.5 206 h118l-78 -266q-25 -88 -25 -103q0 -21 14 -21q24 0 72 74zM490 697h24q-6 -44 -25 -84t-61 -70.5t-99 -30.5q-55 0 -98.5 33.5t-43.5 91.5q0 30 18 45t39 15q17 0 30.5 -11t13.5 -28t-9.5 -29t-9.5 -21q0 -18 23 -32t49 -14q111 0 149 135z" />
+<glyph unicode="&#x43a;" horiz-adv-x="522" d="M258 461l-58 -209q34 6 62 29.5t48 52.5l39 56q20 29 48 48t63 19q36 0 51.5 -20t15.5 -46q0 -32 -16 -49t-43 -17q-18 0 -31 12t-22 24t-17 12q-16 0 -31 -21l-37 -50q-23 -30 -52 -47v-3q30 -17 50.5 -50.5t27.5 -63.5t17.5 -52.5t24.5 -22.5q28 0 64 64l22 -11 q-32 -68 -65 -96t-73 -28q-48 0 -72.5 29.5t-37.5 81.5q-28 108 -45 115l-58 -218h-121l90 328q11 42 11 50q0 25 -58 29v27q106 5 203 27z" />
+<glyph unicode="&#x43b;" horiz-adv-x="507" d="M455 135l22 -13q-40 -71 -79.5 -101t-85.5 -30q-34 0 -53.5 15t-19.5 45q0 47 26 125l50 152q6 20 6 36q0 26 -32 26q-24 0 -51 -24q-30 -26 -54.5 -97t-44.5 -143t-36 -93q-33 -44 -81 -44q-31 0 -50.5 16t-19.5 48q0 25 15 42t40 17q17 0 27 -10t16.5 -20t15.5 -10 q12 0 24 31t23.5 77.5t14.5 53.5q47 136 97 179q57 49 136 49q39 0 61 -20.5t22 -56.5q0 -27 -28 -116l-32 -104q-24 -81 -24 -89q0 -17 19 -17q14 0 31 16t45 60z" />
+<glyph unicode="&#x43c;" horiz-adv-x="667" d="M615 135l22 -13q-40 -71 -79.5 -101t-85.5 -30q-68 0 -68 59q0 41 29 131l40 125h-1l-207 -306h-26q-4 54 -19.5 163.5t-17.5 167.5h-1q-45 -196 -85.5 -269t-93.5 -73q-31 0 -50.5 16t-19.5 48q0 25 15 42t40 17q17 0 27 -10t16.5 -20t15.5 -10q20 0 44.5 66t54.5 184 l32 127h105q10 -155 33 -289q28 38 57 82l69 108l64 99h101l-82 -287q-24 -82 -24 -86q0 -17 19 -17q14 0 31 16t45 60z" />
+<glyph unicode="&#x43d;" horiz-adv-x="543" d="M491 135l22 -13q-41 -72 -77.5 -101.5t-82.5 -29.5q-68 0 -68 60q0 20 27 126l10 38h-128l-60 -215h-121l57 204q45 164 45 179q0 14 -11.5 18.5t-43.5 5.5v27q92 3 205 28l-60 -213h128l55 200h117l-76 -266q-23 -80 -23 -107q0 -17 14 -17q13 0 27 15t44 61z" />
+<glyph unicode="&#x43e;" d="M468 311q0 -69 -29 -135.5t-76 -113.5q-75 -75 -175 -75q-73 0 -118.5 38.5t-45.5 109.5q0 73 27 139t73 111q79 77 183 77q75 0 118 -41t43 -110zM349 372q0 28 -12.5 44.5t-34.5 16.5q-32 0 -60 -31q-43 -48 -71 -144.5t-28 -177.5q0 -64 49 -64q41 0 71 49 q36 59 61 149.5t25 157.5z" />
+<glyph unicode="&#x43f;" horiz-adv-x="543" d="M491 135l22 -13q-41 -72 -77.5 -101.5t-82.5 -29.5q-66 0 -66 60q0 53 24 125l55 165q8 27 8 28q0 21 -26 21q-13 0 -33 -16.5t-36 -37.5q-47 -62 -79 -135t-66 -201h-121l57 204q45 164 45 179q0 14 -11.5 18.5t-43.5 5.5v27q85 3 199 28l-62 -199h1q43 69 66.5 98 t55.5 60q43 41 100 41q73 0 73 -77q0 -34 -28 -116l-35 -104q-24 -71 -24 -89q0 -17 14 -17q13 0 27 15t44 61z" />
+<glyph unicode="&#x440;" horiz-adv-x="497" d="M201 347h1q41 64 77.5 89.5t80.5 25.5q53 0 81.5 -32.5t28.5 -88.5q0 -138 -85 -246t-192 -108q-38 0 -68 22l-12 -41q-24 -83 -24 -114q0 -18 13.5 -24.5t51.5 -7.5v-27h-250v27q36 0 50 15t28 71l96 380q22 88 22 94q0 14 -10 18.5t-44 6.5v27q51 6 192 28zM345 336 q0 55 -39 55q-40 0 -87 -71q-13 -19 -20 -37t-24 -76q-38 -128 -38 -149q0 -15 11.5 -25.5t27.5 -10.5q30 0 62 30q46 45 76.5 137t30.5 147z" />
+<glyph unicode="&#x441;" horiz-adv-x="435" d="M349 142l28 -18l-38 -50q-13 -17 -34.5 -37.5t-42.5 -31.5q-34 -18 -83 -18q-70 0 -111.5 39.5t-41.5 111.5q0 129 105 239q80 85 180 85q46 0 79 -25.5t33 -64.5q0 -32 -17 -51.5t-45 -19.5q-26 0 -42 14.5t-16 36.5q0 16 10.5 33t10.5 27q0 7 -7.5 12t-16.5 5 q-52 0 -92 -77q-25 -48 -39.5 -110.5t-14.5 -101.5q0 -43 19.5 -66t53.5 -23q32 0 59 20t63 71z" />
+<glyph unicode="&#x442;" horiz-adv-x="777" d="M725 135l22 -13q-38 -71 -75.5 -101t-85.5 -30q-66 0 -66 66q0 46 36 151l44 130q7 23 7 30q0 8 -7 14.5t-16 6.5q-47 0 -112 -116q-27 -48 -42.5 -89t-58.5 -184h-120l65 207q45 143 45 160q0 22 -18 22q-25 0 -65 -47q-43 -51 -75 -126t-72 -216h-121l66 232 q36 125 36 150t-38 25h-18v27q130 10 200 27l-63 -199h1q53 91 104 142q58 58 114 58q32 0 50 -18t18 -49q0 -35 -27 -105q55 98 99 135t99 37q35 0 55 -19.5t20 -51.5q0 -49 -21 -109l-45 -128q-21 -60 -21 -77q0 -18 16 -18q22 0 58 58q6 11 12 18z" />
+<glyph unicode="&#x443;" horiz-adv-x="447" d="M241 99h2q56 75 85.5 133.5t29.5 84.5q0 13 -25 34q-31 25 -31 54q0 21 17 39t43 18q28 0 44 -18.5t16 -45.5q0 -71 -86 -218.5t-193 -278.5q-63 -78 -126 -98q-26 -8 -49 -8q-26 0 -44 18t-18 44q0 22 15 38t35 16q25 0 51 -18t43 -18q13 0 32 15t35 37q25 35 25 71 q0 50 -50 288q-20 88 -40 109q-8 8 -14.5 10t-25.5 2v27q69 6 150 28q23 -59 64 -282z" />
+<glyph unicode="&#x444;" horiz-adv-x="750" d="M465 347l3 4q60 111 154 111q95 0 95 -118q0 -47 -15 -102.5t-36 -91.5q-44 -77 -100.5 -120t-113.5 -43q-40 0 -57 22q-10 11 -14 33l-43 -157q-6 -21 -6 -35q0 -27 66 -28v-27h-263v27q46 0 61.5 14t25.5 49l61 221l-6 -8q-60 -111 -154 -111q-95 0 -95 130 q0 87 52 178q45 78 101 122.5t112 44.5q40 0 57 -22q10 -12 15 -38l45 164q7 24 7 42q0 20 -7 27t-23 7h-34v27q96 5 209 30zM428 211l-19 -67q-9 -31 -9 -66q0 -48 35 -48q27 0 58 35.5t53 79.5q53 109 53 188q0 57 -39 57q-45 0 -88 -74q-29 -51 -44 -105zM345 371 q0 48 -35 48q-27 0 -58 -35.5t-53 -79.5q-53 -109 -53 -188q0 -57 39 -57q45 0 88 74q27 47 49.5 121t22.5 117z" />
+<glyph unicode="&#x445;" horiz-adv-x="456" d="M272 335l9 -30q75 99 106.5 128t65.5 29q24 0 41 -16t17 -40q0 -22 -17 -40t-39 -18q-12 0 -29 10t-28 10q-16 0 -40.5 -26t-63.5 -80l43 -147q9 -30 18.5 -40.5t24.5 -10.5q13 0 25.5 10.5t41.5 48.5l21 -14q-46 -66 -80.5 -94t-70.5 -28q-37 0 -60.5 34.5t-50.5 125.5 l-37 -47q-55 -69 -81.5 -91t-62.5 -22q-29 0 -46 16t-17 42q0 24 15.5 41t38.5 17q16 0 34.5 -11t27.5 -11q31 0 60 37l55 72l-42 139q-23 80 -68 80q-16 0 -35 -2v27l165 28q1 -1 9 -12.5t9.5 -14.5t8.5 -15t10 -22l10 -26q6 -17 12 -37z" />
+<glyph unicode="&#x446;" horiz-adv-x="542" d="M490 133l22 -13q-28 -47 -49 -70q-18 -29 -18 -53q0 -11 3.5 -30t3.5 -32q0 -37 -20.5 -58.5t-99.5 -55.5l-9 24q23 10 33.5 31t10.5 41q0 1 -1 15.5t-1 17.5q0 22 17 45l-1 1q-15 -5 -28 -5q-68 0 -68 60q0 31 26 110h-1q-70 -103 -109.5 -136.5t-88.5 -33.5 q-78 0 -78 79q0 27 22 106l37 128q17 62 17 75q0 24 -58 28v27q87 2 210 28l-93 -302q-16 -51 -16 -72q0 -25 24 -25q28 0 70 55q47 61 75.5 125t66.5 206h118l-78 -266q-25 -88 -25 -103q0 -21 14 -21q24 0 72 74z" />
+<glyph unicode="&#x447;" horiz-adv-x="531" d="M479 135l22 -13q-41 -72 -77.5 -101.5t-82.5 -29.5q-68 0 -68 60q0 21 25 113l6 22q-92 -38 -129 -38q-61 0 -82 23.5t-21 68.5q0 14 9 48q22 82 22 95q0 14 -11.5 18.5t-43.5 5.5v27q92 3 205 28l-57 -198q-7 -28 -7 -33q0 -36 41 -36q28 0 81 21l67 233h117l-78 -266 q-23 -81 -23 -107q0 -17 14 -17q13 0 27 15t44 61z" />
+<glyph unicode="&#x448;" horiz-adv-x="800" d="M748 133l22 -13q-39 -67 -76.5 -98t-82.5 -31q-68 0 -68 60q0 31 26 110h-1q-69 -102 -110.5 -136t-91.5 -34q-75 0 -75 60q0 37 26 110h-1q-69 -102 -110.5 -136t-91.5 -34q-78 0 -78 79q0 27 22 106l37 128q17 62 17 75q0 24 -58 28v27q87 2 210 28l-93 -302 q-16 -51 -16 -72q0 -25 24 -25q32 0 74 55q45 58 71 121t66 210h118l-85 -290l-1 -1q-15 -50 -15 -70q0 -25 24 -25q32 0 74 55q45 58 71 121t66 210h118l-73 -266q-25 -88 -25 -103q0 -21 14 -21q24 0 72 74z" />
+<glyph unicode="&#x449;" horiz-adv-x="800" d="M748 133l22 -13q-28 -47 -49 -70q-18 -29 -18 -53q0 -11 3.5 -30t3.5 -32q0 -37 -20.5 -58.5t-99.5 -55.5l-9 24q44 19 44 71q0 3 -1 18t-1 16q0 22 17 45l-1 1q-15 -5 -28 -5q-68 0 -68 60q0 31 26 110h-1q-69 -102 -110.5 -136t-91.5 -34q-75 0 -75 60q0 31 26 110h-1 q-69 -102 -110.5 -136t-91.5 -34q-78 0 -78 79q0 27 22 106l37 128q17 62 17 75q0 24 -58 28v27q87 2 210 28l-93 -302q-16 -51 -16 -72q0 -25 24 -25q32 0 74 55q45 58 71 121t66 210h118l-85 -290l-1 -1q-15 -50 -15 -70q0 -25 24 -25q32 0 74 55q45 58 71 121t66 210h118 l-73 -266q-25 -88 -25 -103q0 -21 14 -21q24 0 72 74z" />
+<glyph unicode="&#x44a;" horiz-adv-x="594" d="M300 245h1q58 53 139 53q55 0 85.5 -27.5t30.5 -76.5q0 -84 -77.5 -145.5t-186.5 -61.5q-36 0 -67 9.5t-55 36.5t-24 69q0 75 29.5 135.5t104.5 135.5l-2 2q-29 -10 -75 -10q-23 0 -53 10.5t-35 10.5q-34 0 -62 -54l-24 12q47 118 129 118q30 0 63.5 -14.5t65.5 -14.5 q56 0 85 29l21 -17q-67 -92 -93 -200zM437 202q0 51 -55 51q-37 0 -67 -37t-43 -79.5t-13 -74.5q0 -26 12 -36t34 -10q46 0 89 67t43 119z" />
+<glyph unicode="&#x44b;" horiz-adv-x="754" d="M197 245h1q58 53 139 53q55 0 85.5 -27.5t30.5 -76.5q0 -84 -77.5 -145.5t-186.5 -61.5q-37 0 -67 8t-54.5 33.5t-24.5 67.5q0 26 15 80l37 128q17 62 17 75q0 24 -58 28v27q87 2 210 28zM334 202q0 51 -55 51q-37 0 -67 -37t-43 -79.5t-13 -74.5q0 -26 12 -36t34 -10 q46 0 89 67t43 119zM702 135l22 -13q-41 -72 -77.5 -101.5t-82.5 -29.5q-68 0 -68 60q0 25 13 74l92 324h117l-78 -266q-23 -81 -23 -107q0 -17 14 -17q13 0 27 15t44 61z" />
+<glyph unicode="&#x44c;" horiz-adv-x="491" d="M197 245h1q58 53 139 53q55 0 85.5 -27.5t30.5 -76.5q0 -84 -77.5 -145.5t-186.5 -61.5q-37 0 -67 8t-54.5 33.5t-24.5 67.5q0 26 15 80l37 128q17 62 17 75q0 24 -58 28v27q87 2 210 28zM334 202q0 51 -55 51q-37 0 -67 -37t-43 -79.5t-13 -74.5q0 -26 12 -36t34 -10 q46 0 89 67t43 119z" />
+<glyph unicode="&#x44d;" horiz-adv-x="444" d="M108 462h23q1 -3 1.5 -7t1 -6.5t1.5 -5t1.5 -4t2 -3t3 -2t3.5 -0.5q6 0 38 14t61 14q76 0 118.5 -37t42.5 -114q0 -134 -105 -239q-83 -85 -198 -85q-48 0 -81 24t-33 66q0 31 19 50.5t47 19.5q25 0 39.5 -14.5t14.5 -37.5q0 -16 -10.5 -30t-10.5 -24q0 -7 9 -12t19 -5 q61 0 107 84q25 48 39 104h-148l11 40h145q8 34 8 69q0 45 -13 74.5t-42 29.5q-44 0 -77 -34t-51 -81h-27z" />
+<glyph unicode="&#x44e;" horiz-adv-x="740" d="M203 249h81q25 80 82 136q79 77 183 77q75 0 118 -41t43 -110t-29 -135.5t-76 -113.5q-75 -75 -175 -75q-73 0 -118.5 38.5t-45.5 109.5q0 40 8 80h-81l-59 -215h-122l57 204q45 164 45 179q0 14 -11.5 18.5t-43.5 5.5v27q92 3 205 28zM591 372q0 28 -12.5 44.5 t-34.5 16.5q-32 0 -60 -31q-43 -48 -71 -144.5t-28 -177.5q0 -64 49 -64q41 0 71 49q36 59 61 149.5t25 157.5z" />
+<glyph unicode="&#x44f;" horiz-adv-x="538" d="M486 135l22 -13q-41 -72 -77.5 -101.5t-82.5 -29.5q-68 0 -68 60q0 28 27 126l4 14h-23q-27 0 -42 -21t-38 -84q-20 -53 -49.5 -75t-76.5 -22q-39 0 -59.5 25.5t-20.5 62.5q0 35 15 65h26q-5 -27 -5 -40q0 -34 25 -34q26 0 44 54q19 56 65 73v2q-42 9 -62 33t-20 53 q0 73 59 119.5t168 46.5h185l-78 -266q-23 -81 -23 -107q0 -17 14 -17q13 0 27 15t44 61zM319 221l44 154q3 9 3 17q0 28 -41 28q-48 0 -83 -34.5t-36 -99.5q0 -65 85 -65h28z" />
+<glyph unicode="&#x451;" horiz-adv-x="434" d="M275 589q0 -26 -19.5 -45t-46.5 -19q-25 0 -44.5 19.5t-19.5 44.5q0 27 19 46.5t45 19.5q27 0 46.5 -19.5t19.5 -46.5zM487 589q0 -26 -19.5 -45t-46.5 -19q-25 0 -44.5 19.5t-19.5 44.5q0 27 19 46.5t45 19.5q27 0 46.5 -19.5t19.5 -46.5zM334 143l29 -17 q-78 -139 -195 -139q-67 0 -106.5 37.5t-39.5 109.5q0 124 89.5 226t198.5 102q48 0 76.5 -24t28.5 -63q0 -63 -69 -122q-32 -27 -73.5 -42.5t-114.5 -28.5q-6 -30 -6 -49q0 -82 64 -82q32 0 57.5 20t60.5 72zM323 390q0 39 -31 39q-71 0 -127 -215q68 15 113 64.5t45 111.5 z" />
+<glyph unicode="&#x452;" horiz-adv-x="523" d="M205 275h1q46 73 63.5 97t43.5 49q43 41 102 41q75 0 75 -77q0 -28 -19 -97l-60 -222q-35 -129 -94 -200t-134 -71q-46 0 -70.5 21.5t-24.5 55.5q0 22 14.5 37.5t34.5 15.5q22 0 35.5 -13.5t13.5 -35.5q0 -11 -7.5 -20t-7.5 -15q0 -15 24 -15q27 0 47 49t56 187l65 250 q8 28 8 57q0 21 -28 21q-13 0 -33 -16.5t-36 -37.5q-43 -56 -73.5 -126t-70.5 -210h-118l138 510h-79l12 40h78l3 12q10 37 10 47q0 33 -42 33h-22v27q95 8 207 30l-39 -149h159l-12 -40h-157z" />
+<glyph unicode="&#x453;" horiz-adv-x="368" d="M77 342l-19 20q79 99 188 99q57 0 91 -21.5t34 -63.5q0 -80 -86 -121l-38 -17l-43 -21q-14 -7 -33.5 -20t-31.5 -26q-28 -31 -28 -74q0 -51 51 -51q66 0 126 72l19 -19q-48 -60 -95 -86.5t-103 -26.5q-117 0 -117 93q0 18 7.5 35t15.5 28t27 24.5t28.5 19t34 18.5 t29.5 16q57 31 87.5 60t30.5 70q0 51 -57 51q-34 0 -61 -14t-57 -45zM216 516l122 131q47 50 70 50q20 0 34 -14t14 -33q0 -14 -8.5 -24t-30.5 -23l-152 -87h-49z" />
+<glyph unicode="&#x454;" horiz-adv-x="415" d="M450 462l-42 -152h-27q0 25 -2 41.5t-8 36.5t-21.5 30.5t-39.5 10.5q-44 0 -85 -55.5t-58 -121.5h148l-9 -40h-147q-9 -32 -9 -75q0 -55 21.5 -84t56.5 -29q55 0 55 51q0 7 -2.5 16t-2.5 17q0 23 17 38.5t45 15.5q20 0 34.5 -14.5t14.5 -35.5q0 -36 -26.5 -65.5 t-63.5 -43.5q-44 -16 -109 -16q-86 0 -127 41t-41 111q0 116 89 219.5t194 103.5q28 0 46 -8t28 -15.5t17 -7.5q20 0 31 31h23z" />
+<glyph unicode="&#x455;" horiz-adv-x="389" d="M352 461l-23 -154l-27 2q-12 63 -33 91.5t-55 28.5q-24 0 -38.5 -14.5t-14.5 -38.5q0 -33 57 -99q80 -93 80 -162q0 -56 -43 -92t-105 -36q-35 0 -64 12q-21 8 -30 8q-20 0 -29 -20h-27l22 166l27 -3q17 -133 93 -133q29 0 44.5 14.5t15.5 39.5q0 41 -56 104 q-50 56 -65 87.5t-15 73.5q0 59 36.5 92.5t97.5 33.5q32 0 58 -12q21 -10 37 -10q11 0 16 4t12 17h29z" />
+<glyph unicode="&#x456;" horiz-adv-x="278" d="M234 142l22 -14q-48 -79 -85 -108t-83 -29q-68 0 -68 63q0 22 15 76l55 203q8 32 8 45q0 29 -46 29h-14v27q118 9 203 28l-91 -334q-9 -31 -9 -51q0 -16 15 -16q21 0 64 61zM280 616q0 -28 -19.5 -47t-48.5 -19q-28 0 -47 20t-19 49q0 25 20 45t45 20q28 0 48.5 -20 t20.5 -48z" />
+<glyph unicode="&#x457;" horiz-adv-x="278" d="M236 142l22 -14q-48 -79 -85 -108t-83 -29q-68 0 -68 63q0 22 15 76l55 203q8 32 8 45q0 29 -46 29h-14v27q118 9 203 28l-91 -334q-9 -31 -9 -51q0 -16 15 -16q21 0 64 61zM382 589q0 -26 -19.5 -45t-46.5 -19q-26 0 -45 19.5t-19 44.5q0 27 19 46.5t45 19.5 q27 0 46.5 -19.5t19.5 -46.5zM170 589q0 -26 -19.5 -45t-46.5 -19q-26 0 -45 19.5t-19 44.5q0 27 19 46.5t45 19.5q27 0 46.5 -19.5t19.5 -46.5z" />
+<glyph unicode="&#x458;" horiz-adv-x="278" d="M267 462l-116 -444q-31 -119 -81 -172t-126 -53q-47 0 -76 22t-29 55q0 22 14.5 37.5t34.5 15.5q22 0 35.5 -13.5t13.5 -35.5q0 -11 -7.5 -20t-7.5 -15q0 -15 24 -15q21 0 38 31t36 105l89 350q12 45 12 67q0 30 -41 30h-22v27q136 12 209 28zM307 617q0 -28 -20 -47.5 t-49 -19.5q-28 0 -47 20t-19 49q0 26 20 46t46 20q28 0 48.5 -20t20.5 -48z" />
+<glyph unicode="&#x459;" horiz-adv-x="694" d="M409 246h1q58 53 129 53q55 0 86 -26.5t31 -75.5q0 -85 -73.5 -147.5t-181.5 -62.5q-59 0 -102 26t-43 86q0 15 2 28.5t16 60.5l41 140q6 20 6 36q0 26 -32 26q-25 0 -52 -24q-30 -26 -54.5 -97t-44 -143t-35.5 -93q-32 -44 -81 -44q-31 0 -50.5 16t-19.5 48q0 25 15 42 t40 17q17 0 27 -10t16.5 -20t15.5 -10q12 0 24 30t24 79l14 53q41 131 97 179q57 49 136 49q39 0 61 -20.5t22 -56.5q0 -46 -35 -139zM536 203q0 51 -55 51q-28 0 -51 -21.5t-35.5 -53.5t-19 -62.5t-6.5 -53.5q0 -47 46 -47t83.5 67t37.5 120z" />
+<glyph unicode="&#x45a;" horiz-adv-x="733" d="M449 245h1q58 53 129 53q55 0 85.5 -27.5t30.5 -76.5q0 -85 -73 -146t-181 -61q-37 0 -67 8t-54.5 33.5t-24.5 67.5q0 21 16 80l11 39h-128l-58 -215h-124l57 204q44 160 44 179q0 14 -11.5 18.5t-43.5 5.5v27q92 3 205 28l-60 -213h128l16 55q17 62 17 75t-8.5 19.5 t-36.5 8.5v27q72 1 197 28zM576 202q0 51 -55 51q-28 0 -51.5 -21.5t-36 -53.5t-19 -62.5t-6.5 -53.5q0 -26 12 -36t34 -10q46 0 84 66.5t38 119.5z" />
+<glyph unicode="&#x45b;" horiz-adv-x="556" d="M493 142l22 -15q-50 -77 -85.5 -106.5t-81.5 -29.5q-30 0 -47.5 17t-17.5 47q0 26 6.5 50.5t41.5 132.5l32 98q7 21 7 33q0 21 -24 21q-38 0 -99 -99q-36 -59 -58.5 -113t-58.5 -178h-118l138 510h-79l12 40h78l3 12q10 37 10 47q0 33 -42 33h-22v27q93 8 206 30 l-39 -149h159l-12 -40h-157l-62 -235q71 108 114 147.5t93 39.5q37 0 57 -20t20 -55q0 -34 -27 -118l-57 -178q-3 -8 -3 -16q0 -16 16 -16q17 0 75 83z" />
+<glyph unicode="&#x45c;" horiz-adv-x="522" d="M258 461l-58 -209q34 6 62 29.5t48 52.5l39 56q20 29 48 48t63 19q36 0 51.5 -20t15.5 -46q0 -32 -16 -49t-43 -17q-18 0 -31 12t-22 24t-17 12q-16 0 -31 -21l-37 -50q-23 -30 -52 -47v-3q30 -17 50.5 -50.5t27.5 -63.5t17.5 -52.5t24.5 -22.5q28 0 64 64l22 -11 q-32 -68 -65 -96t-73 -28q-48 0 -72.5 29.5t-37.5 81.5q-28 108 -45 115l-58 -218h-121l90 328q11 42 11 50q0 25 -58 29v27q106 5 203 27zM193 516l122 131q47 50 70 50q20 0 34 -14t14 -33q0 -14 -8.5 -24t-30.5 -23l-152 -87h-49z" />
+<glyph unicode="&#x45e;" horiz-adv-x="447" d="M241 99h2q56 75 85.5 133.5t29.5 84.5q0 13 -25 34q-31 25 -31 54q0 21 17 39t43 18q28 0 44 -18.5t16 -45.5q0 -71 -86 -218.5t-193 -278.5q-63 -78 -126 -98q-26 -8 -49 -8q-26 0 -44 18t-18 44q0 22 15 38t35 16q25 0 51 -18t43 -18q13 0 32 15t35 37q25 35 25 71 q0 50 -50 288q-20 88 -40 109q-8 8 -14.5 10t-25.5 2v27q69 6 150 28q23 -59 64 -282zM412 697h24q-6 -44 -25 -84t-61 -70.5t-99 -30.5q-55 0 -98.5 33.5t-43.5 91.5q0 30 18 45t39 15q17 0 30.5 -11t13.5 -28t-9.5 -29t-9.5 -21q0 -18 23 -32t49 -14q111 0 149 135z" />
+<glyph unicode="&#x45f;" horiz-adv-x="538" d="M486 133l22 -13q-39 -67 -76.5 -98t-82.5 -31q-68 0 -68 60q0 31 26 110h-1q-57 -83 -87 -115q-19 -32 -19 -49q0 -15 3.5 -36.5t3.5 -32.5q0 -19 -5 -32.5t-17 -23t-24 -15.5l-35 -17q-22 -10 -39 -19l-9 24q23 10 33.5 31t10.5 41q0 1 -1 15.5t-1 17.5q0 21 16 43v2 q-16 -4 -28 -4q-78 0 -78 79q0 27 22 106l37 128q17 62 17 75q0 24 -58 28v27q87 2 210 28l-93 -302q-16 -51 -16 -75q0 -22 24 -22q28 0 70 55q47 61 75.5 125t66.5 206h118l-78 -266q-25 -88 -25 -103q0 -21 14 -21q24 0 72 74z" />
+<glyph unicode="&#x462;" horiz-adv-x="761" d="M412 370h81q214 0 214 -164q0 -99 -78 -152.5t-217 -53.5h-302v25q36 5 54 22t30 61l109 400h-10q-85 0 -127.5 -21t-78.5 -95l-25 7l36 159h218q8 32 8 45q0 18 -10.5 27.5t-23.5 11.5t-37 2v25h305v-25q-46 0 -61.5 -12.5t-27.5 -54.5l-5 -19h185l-31 -166l-27 2 q0 28 -3 47.5t-12.5 32t-18 19.5t-28.5 10t-34.5 4t-44.5 1zM404 338l-64 -236q-7 -27 -7 -37q0 -33 57 -33q77 0 120.5 58t43.5 139q0 65 -36.5 87t-113.5 22z" />
+<glyph unicode="&#x463;" horiz-adv-x="569" d="M275 245h1q58 53 139 53q55 0 85.5 -27.5t30.5 -76.5q0 -84 -77.5 -145.5t-186.5 -61.5q-37 0 -67 8t-54.5 33.5t-24.5 67.5q0 24 15 80l53 202q3 10 3 17q0 22 -21 22q-56 0 -76.5 -15t-50.5 -72h-24l36 127h154l22 84q9 33 9 66q0 17 -12 26t-42 10v27q81 2 210 29 l-65 -242h155l-35 -127h-24q0 51 -16.5 69t-66.5 18q-26 0 -31 -22zM412 202q0 51 -55 51q-37 0 -67 -37t-43 -79.5t-13 -74.5q0 -26 12 -36t34 -10q46 0 89 67t43 119z" />
+<glyph unicode="&#x46a;" horiz-adv-x="978" d="M918 0h-278v25q4 0 26 9q25 12 37 53q7 27 7 54q0 73 -36 120t-88 47l-49 -179q-13 -47 -13 -65q0 -19 14.5 -27.5t47.5 -11.5v-25h-291v25q28 3 43 7.5t25.5 20t15 28t13.5 47.5l49 180h-1q-64 0 -137 -64.5t-98 -156.5q-4 -11 -4 -26q0 -19 13 -27t20 -9v-25h-256v25 q28 7 49 25t31.5 36t28 52t28.5 53q97 161 311 161l-101 317h520l-228 -317h1q134 0 191 -78q20 -27 22 -69.5t4.5 -86t24.5 -72.5q14 -19 58 -21v-25zM747 619h-260l79 -254z" />
+<glyph unicode="&#x46b;" horiz-adv-x="844" d="M799 142l26 -18q-55 -92 -99 -119q-28 -18 -69 -18q-59 0 -93.5 36.5t-34.5 107.5q0 50 -49 65l-53 -196h-113l54 198q-17 -2 -30.5 -9t-25 -21.5t-16.5 -23t-16.5 -30.5t-13.5 -27q-28 -53 -77 -80q-35 -20 -93 -20q-42 0 -71 25t-29 67q0 31 17 50.5t41 19.5 q22 0 35.5 -13.5t13.5 -37.5q0 -16 -9 -33t-9 -27q0 -18 17 -18q20 0 26 25q35 127 124 165q41 18 96 19l-87 220h449l-197 -220q48 -3 82 -23q32 -18 42 -43t14 -66q4 -46 46 -46q27 0 49 20t53 71zM621 409h-219l69 -169z" />
+<glyph unicode="&#x472;" horiz-adv-x="722" d="M717 444q0 -95 -49.5 -194.5t-130.5 -171.5q-108 -96 -248 -96q-108 0 -172 62.5t-64 176.5q0 101 51 202.5t135 169.5q114 92 236 92q104 0 173 -66.5t69 -174.5zM573 528q0 60 -27 91.5t-74 31.5q-91 0 -162 -120q-42 -71 -73 -168q47 37 71 49.5t55 12.5 q18 0 31.5 -12.5t21.5 -28t24 -28t38 -12.5q40 0 72 21q23 97 23 163zM537 317q-44 -35 -68.5 -46.5t-55.5 -11.5q-18 0 -33.5 12.5t-25 28t-27 28t-39.5 12.5q-31 0 -65 -24q-26 -99 -26 -173q0 -57 27.5 -92t74.5 -35q46 0 82 28t75 86q49 74 81 187z" />
+<glyph unicode="&#x473;" d="M468 311q0 -69 -29 -135.5t-76 -113.5q-75 -75 -175 -75q-73 0 -118.5 38.5t-45.5 109.5q0 73 27 139t73 111q79 77 183 77q75 0 118 -41t43 -110zM166 240h2q37 34 62 34q18 0 38.5 -15.5t30.5 -15.5q16 0 36 20q14 61 14 109q0 28 -12.5 44.5t-34.5 16.5q-32 0 -60 -31 q-46 -51 -76 -162zM327 227h-2q-13 -21 -30.5 -32t-29.5 -11q-22 0 -45.5 17.5t-33.5 17.5q-12 0 -28 -13q-15 -68 -15 -126q0 -64 49 -64q41 0 71 49q39 64 64 162z" />
+<glyph unicode="&#x474;" horiz-adv-x="667" d="M339 200l186 343l22 41q7 12 23 34t28 32.5t31 19t40 8.5q38 0 59.5 -21t21.5 -53q0 -26 -16 -45t-46 -19q-20 0 -32 12t-19.5 24.5t-16.5 12.5q-28 0 -51 -43l-306 -564h-32l-76 513q-8 56 -13.5 81.5t-15.5 43t-22.5 21t-37.5 3.5v25h296v-25q-51 -4 -63 -11.5 t-12 -33.5q0 -11 2 -23l48 -376h2z" />
+<glyph unicode="&#x475;" horiz-adv-x="487" d="M237 174h2q41 98 86 164q80 119 150 119q24 0 41.5 -16.5t17.5 -41.5q0 -24 -17 -41t-41 -17q-12 0 -35 8t-29 8q-28 0 -64 -49q-80 -109 -164 -321h-26q-21 258 -93 401q-10 19 -50 19v27q83 11 152 28q59 -133 70 -288z" />
+<glyph unicode="&#x490;" horiz-adv-x="539" d="M641 834l-56 -200h-243l-145 -532q-6 -20 -6 -41q1 -35 73 -35v-26h-296v26q40 4 55 19t27 58l121 443q11 37 11 61q0 15 -8.5 21.5t-32.5 10.5l-34 5v25h300q91 0 129 33t77 132h28z" />
+<glyph unicode="&#x491;" horiz-adv-x="360" d="M457 590l-50 -175h-144q-23 0 -30 -25l-72 -262q-9 -31 -9 -51q0 -16 15 -16q21 0 64 61l14 20l22 -14q-48 -79 -85 -108t-83 -29q-68 0 -68 63q0 22 15 76l60 218q8 27 8 45q0 29 -46 29h-14v27h213q71 0 105 31.5t61 109.5h24z" />
+<glyph unicode="&#x1e80;" horiz-adv-x="889" d="M626 723h-46l-132 88q-34 23 -34 48q0 18 13.5 31.5t31.5 13.5q31 0 56 -33zM940 669v-24q-32 -5 -48 -19t-40 -63l-282 -581h-29l-59 489l-233 -489h-29l-78 572q-8 54 -19.5 68.5t-58.5 22.5v24h278v-25q-35 -4 -48 -15t-13 -35q0 -14 1 -19l40 -349l149 314 q0 60 -12.5 79.5t-57.5 25.5v24h267v-25q-39 -4 -50.5 -14.5t-11.5 -39.5q0 -5 7 -73l33 -291l155 327q15 33 15 46q0 27 -10.5 34.5t-52.5 10.5v25h187z" />
+<glyph unicode="&#x1e81;" horiz-adv-x="667" d="M387 462l31 -333q120 140 120 187q0 15 -20 38q-22 25 -22 48q0 29 16.5 44.5t40.5 15.5q25 0 43 -18.5t18 -43.5q0 -131 -272 -413h-27l-23 285q-85 -158 -114 -201l-56 -84h-27v46q0 4 0.5 24.5t0.5 37.5q0 94 -11.5 191.5t-26.5 110.5q-11 10 -43 10v27q110 18 156 28 q33 -123 33 -274l156 274h27zM476 516h-46l-132 88q-34 23 -34 48q0 18 13.5 31.5t31.5 13.5q31 0 56 -33z" />
+<glyph unicode="&#x1e82;" horiz-adv-x="889" d="M440 723l122 131q47 50 70 50q20 0 34 -14t14 -33q0 -14 -8.5 -24t-30.5 -23l-152 -87h-49zM940 669v-24q-32 -5 -48 -19t-40 -63l-282 -581h-29l-59 489l-233 -489h-29l-78 572q-8 54 -19.5 68.5t-58.5 22.5v24h278v-25q-35 -4 -48 -15t-13 -35q0 -14 1 -19l40 -349 l149 314q0 60 -12.5 79.5t-57.5 25.5v24h267v-25q-39 -4 -50.5 -14.5t-11.5 -39.5q0 -5 7 -73l33 -291l155 327q15 33 15 46q0 27 -10.5 34.5t-52.5 10.5v25h187z" />
+<glyph unicode="&#x1e83;" horiz-adv-x="667" d="M250 516l122 131q47 50 70 50q20 0 34 -14t14 -33q0 -14 -8.5 -24t-30.5 -23l-152 -87h-49zM387 462l31 -333q120 140 120 187q0 15 -20 38q-22 25 -22 48q0 29 16.5 44.5t40.5 15.5q25 0 43 -18.5t18 -43.5q0 -131 -272 -413h-27l-23 285q-85 -158 -114 -201l-56 -84 h-27v46q0 4 0.5 24.5t0.5 37.5q0 94 -11.5 191.5t-26.5 110.5q-11 10 -43 10v27q110 18 156 28q33 -123 33 -274l156 274h27z" />
+<glyph unicode="&#x1e84;" horiz-adv-x="889" d="M940 669v-24q-32 -5 -48 -19t-40 -63l-282 -581h-29l-59 489l-233 -489h-29l-78 572q-8 54 -19.5 68.5t-58.5 22.5v24h278v-25q-35 -4 -48 -15t-13 -35q0 -14 1 -19l40 -349l149 314q0 60 -12.5 79.5t-57.5 25.5v24h267v-25q-39 -4 -50.5 -14.5t-11.5 -39.5q0 -5 7 -73 l33 -291l155 327q15 33 15 46q0 27 -10.5 34.5t-52.5 10.5v25h187zM701 796q0 -26 -19.5 -45t-46.5 -19q-25 0 -44.5 19t-19.5 45q0 27 19 46.5t45 19.5q27 0 46.5 -19.5t19.5 -46.5zM489 796q0 -26 -19.5 -45t-46.5 -19q-25 0 -44.5 19t-19.5 45q0 27 19 46.5t45 19.5 q27 0 46.5 -19.5t19.5 -46.5z" />
+<glyph unicode="&#x1e85;" horiz-adv-x="667" d="M329 589q0 -26 -19.5 -45t-46.5 -19q-25 0 -44.5 19.5t-19.5 44.5q0 27 19 46.5t45 19.5q27 0 46.5 -19.5t19.5 -46.5zM541 589q0 -26 -19.5 -45t-46.5 -19q-25 0 -44.5 19.5t-19.5 44.5q0 27 19 46.5t45 19.5q27 0 46.5 -19.5t19.5 -46.5zM387 462l31 -333 q120 140 120 187q0 15 -20 38q-22 25 -22 48q0 29 16.5 44.5t40.5 15.5q25 0 43 -18.5t18 -43.5q0 -131 -272 -413h-27l-23 285q-85 -158 -114 -201l-56 -84h-27v46q0 4 0.5 24.5t0.5 37.5q0 94 -11.5 191.5t-26.5 110.5q-11 10 -43 10v27q110 18 156 28q33 -123 33 -274 l156 274h27z" />
+<glyph unicode="&#x1ef2;" horiz-adv-x="611" d="M496 723h-46l-132 88q-34 23 -34 48q0 18 13.5 31.5t31.5 13.5q31 0 56 -33zM659 669v-25q-27 -4 -46.5 -20t-45.5 -52l-189 -264l-52 -191q-10 -40 -10 -51q0 -22 17 -31.5t62 -9.5v-25h-323v25q52 5 72 18.5t32 59.5l57 208l-87 270q-12 35 -23.5 45t-51.5 18v25h285 v-25q-42 -2 -55.5 -9.5t-13.5 -29.5q0 -19 29 -110l46 -143l128 183q28 40 28 67q0 23 -13 32t-53 10v25h207z" />
+<glyph unicode="&#x1ef3;" horiz-adv-x="444" d="M239 110h2q52 99 69.5 141t17.5 66q0 13 -25 34q-31 25 -31 54q0 21 16 39t42 18q25 0 43.5 -19t18.5 -45q0 -76 -75.5 -227t-173.5 -270q-41 -50 -87.5 -78t-87.5 -28q-26 0 -44 17.5t-18 42.5q0 22 15.5 39t34.5 17q25 0 51 -18t43 -18q13 0 32 15t35 37q25 35 25 71 q0 50 -50 288q-21 94 -40 113q-8 8 -14.5 10t-25.5 2v27q86 8 150 24q43 -111 66 -274zM297 516h-46l-132 88q-34 23 -34 48q0 18 13.5 31.5t31.5 13.5q31 0 56 -33z" />
+<glyph unicode="&#x2000;" horiz-adv-x="508" />
+<glyph unicode="&#x2001;" horiz-adv-x="1017" />
+<glyph unicode="&#x2002;" horiz-adv-x="508" />
+<glyph unicode="&#x2003;" horiz-adv-x="1017" />
+<glyph unicode="&#x2004;" horiz-adv-x="339" />
+<glyph unicode="&#x2005;" horiz-adv-x="254" />
+<glyph unicode="&#x2006;" horiz-adv-x="169" />
+<glyph unicode="&#x2007;" horiz-adv-x="169" />
+<glyph unicode="&#x2008;" horiz-adv-x="127" />
+<glyph unicode="&#x2009;" horiz-adv-x="203" />
+<glyph unicode="&#x200a;" horiz-adv-x="56" />
+<glyph unicode="&#x2010;" horiz-adv-x="333" d="M273 282l-30 -116h-247l34 116h243z" />
+<glyph unicode="&#x2011;" horiz-adv-x="333" d="M273 282l-30 -116h-247l34 116h243z" />
+<glyph unicode="&#x2012;" d="M477 282l-17 -116h-500l17 116h500z" />
+<glyph unicode="&#x2013;" d="M477 269l-17 -91h-500l17 91h500z" />
+<glyph unicode="&#x2014;" horiz-adv-x="1000" d="M977 269l-17 -91h-1000l17 91h1000z" />
+<glyph unicode="&#x2018;" horiz-adv-x="333" d="M319 685l13 -25q-118 -63 -118 -116q0 -21 30 -37q40 -23 40 -65q0 -35 -20.5 -54t-52.5 -19q-39 0 -61 26t-22 68q0 67 51 125.5t140 96.5z" />
+<glyph unicode="&#x2019;" horiz-adv-x="333" d="M111 369l-13 25q118 63 118 116q0 21 -30 37q-40 23 -40 65q0 35 20.5 54t52.5 19q39 0 61 -26t22 -68q0 -67 -51 -125.5t-140 -96.5z" />
+<glyph unicode="&#x201a;" horiz-adv-x="333" d="M8 -182l-13 25q118 63 118 116q0 21 -30 37q-40 22 -40 65q0 32 21 52.5t52 20.5q39 0 61 -26t22 -68q0 -67 -51 -125.5t-140 -96.5z" />
+<glyph unicode="&#x201b;" horiz-adv-x="333" d="M265 397l-18 -28q-119 67 -119 163q0 64 27 108.5t78 44.5q32 0 50.5 -19.5t18.5 -54.5q0 -59 -64 -70q-55 -10 -55 -42q0 -24 18 -45.5t64 -56.5z" />
+<glyph unicode="&#x201c;" d="M244 685l13 -25q-118 -63 -118 -116q0 -21 30 -37q40 -23 40 -65q0 -35 -20.5 -54t-52.5 -19q-39 0 -61 26t-22 68q0 67 51 125.5t140 96.5zM500 685l13 -25q-118 -63 -118 -116q0 -21 30 -37q40 -23 40 -65q0 -35 -20.5 -54t-52.5 -19q-39 0 -61 26t-22 68 q0 67 51 125.5t140 96.5z" />
+<glyph unicode="&#x201d;" d="M66 369l-13 25q118 63 118 116q0 21 -30 37q-40 23 -40 65q0 35 20.5 54t52.5 19q39 0 61 -26t22 -68q0 -67 -51 -125.5t-140 -96.5zM322 369l-13 25q118 63 118 116q0 21 -30 37q-40 23 -40 65q0 35 20.5 54t52.5 19q39 0 61 -26t22 -68q0 -67 -51 -125.5t-140 -96.5z " />
+<glyph unicode="&#x201e;" d="M-44 -182l-13 25q118 63 118 116q0 21 -30 37q-40 22 -40 65q0 35 20.5 54t52.5 19q39 0 61 -26t22 -68q0 -67 -51 -125.5t-140 -96.5zM212 -182l-13 25q118 63 118 116q0 21 -30 37q-40 22 -40 65q0 35 20.5 54t52.5 19q39 0 61 -26t22 -68q0 -67 -51 -125.5t-140 -96.5 z" />
+<glyph unicode="&#x201f;" d="M476 397l-18 -28q-119 67 -119 163q0 64 27 108.5t78 44.5q32 0 50.5 -19.5t18.5 -54.5q0 -59 -64 -70q-55 -10 -55 -42q0 -24 18 -45.5t64 -56.5zM229 397l-18 -28q-119 67 -119 163q0 64 27 108.5t78 44.5q32 0 50.5 -19.5t18.5 -54.5q0 -59 -64 -70q-55 -10 -55 -42 q0 -24 18 -45.5t64 -56.5z" />
+<glyph unicode="&#x2020;" d="M352 560l-15 -19q-18 -23 -29 -74q38 1 82 23q33 16 50 16q25 0 39.5 -14t14.5 -38q0 -23 -16 -37.5t-42 -14.5q-16 0 -46 17q-41 24 -76 24h-11q-6 -35 -6 -56q0 -52 26 -118q-59 -74 -109 -281q-13 -55 -35 -133h-23l28 173q13 80 13 172q0 37 -6 78q33 29 56.5 74 t30.5 91q-27 -1 -38 -4t-37 -16q-35 -19 -61 -19q-23 0 -37 14t-14 37t14 37t38 14q21 0 56 -17q46 -22 83 -22q9 31 9 54q0 15 -9 45q-10 37 -10 58q0 29 15 45t41 16q24 0 40 -15.5t16 -38.5q0 -31 -32 -71z" />
+<glyph unicode="&#x2021;" d="M268 471h13q6 25 6 55q0 25 -8 58q-6 25 -6 42q0 59 54 59q23 0 38.5 -14.5t15.5 -36.5q0 -23 -28 -62q-22 -31 -30.5 -48t-19.5 -54q47 5 93 23q33 13 47 13q21 0 35.5 -13.5t14.5 -33.5q0 -22 -15.5 -37t-37.5 -15q-18 0 -51 16q-48 22 -89 25q-7 -27 -7 -68t4.5 -61 t19.5 -46q-37 -34 -55 -69t-36 -107q40 0 88 24q31 15 42 15h5q52 -2 52 -49q0 -22 -14.5 -35.5t-38.5 -13.5q-14 0 -49 16q-43 21 -77 21h-12q-6 -24 -6 -55q0 -28 8 -58q6 -21 6 -42q0 -59 -54 -59q-23 0 -38.5 14.5t-15.5 36.5q0 23 28 62q22 32 30.5 49t19.5 53 q-53 -5 -93 -23q-30 -13 -47 -13q-21 0 -35.5 13.5t-14.5 33.5q0 22 15 37t37 15q16 0 52 -16q45 -22 89 -25q7 28 7 70q0 39 -4.5 59t-19.5 46q37 34 55 69t36 107q-43 -1 -88 -24q-31 -15 -42 -15h-5q-52 2 -52 49q0 22 14.5 35.5t37.5 13.5q15 0 50 -16q43 -21 76 -21z " />
+<glyph unicode="&#x2022;" horiz-adv-x="560" d="M490 253q0 -87 -62 -149t-149 -62t-148 61.5t-61 149.5q0 85 61.5 147t147.5 62q92 0 151.5 -60.5t59.5 -148.5z" />
+<glyph unicode="&#x2026;" horiz-adv-x="1000" d="M188 61q0 -31 -21.5 -52.5t-53.5 -21.5q-31 0 -52 21t-21 53t21.5 53t53.5 21q30 0 51.5 -22t21.5 -52zM520 61q0 -31 -21.5 -52.5t-53.5 -21.5q-31 0 -52 21t-21 53t21.5 53t53.5 21q30 0 51.5 -22t21.5 -52zM852 61q0 -31 -21.5 -52.5t-53.5 -21.5q-31 0 -52 21t-21 53 t21.5 53t53.5 21q30 0 51.5 -22t21.5 -52z" />
+<glyph unicode="&#x202f;" horiz-adv-x="203" />
+<glyph unicode="&#x2030;" horiz-adv-x="1118" d="M707 214q0 -53 -19.5 -104t-53.5 -86q-39 -42 -99 -42q-57 0 -92.5 38.5t-35.5 99.5q0 85 58.5 149t136.5 64q49 0 77 -31.5t28 -87.5zM682 220q0 35 -17 57.5t-42 22.5q-31 0 -62 -46q-24 -36 -40 -87t-16 -91q0 -66 50 -66q44 0 79 51q48 74 48 159zM645 706l-438 -735 h-48l388 655q-56 -42 -113 -42q-28 0 -60 13q3 -29 3 -42q0 -53 -19.5 -105.5t-50.5 -83.5q-44 -44 -101 -44q-56 0 -91 39t-35 100q0 85 59 149t138 64q35 0 71 -29q38 -30 83 -30q49 0 88.5 21.5t77.5 69.5h48zM351 560q0 25 -6 35.5t-26 18.5q-11 5 -21 11q-14 9 -20 9 q-32 0 -67 -74.5t-35 -141.5q0 -66 50 -66q48 0 86.5 64t38.5 144zM1068 213q0 -52 -19.5 -103t-52.5 -86q-40 -42 -100 -42q-57 0 -92 37.5t-35 98.5q0 88 57.5 151.5t137.5 63.5q49 0 76.5 -32t27.5 -88zM1043 220q0 35 -17 57.5t-43 22.5q-30 0 -60 -45 q-23 -35 -39.5 -87.5t-16.5 -92.5q0 -65 49 -65q44 0 79 51q48 74 48 159z" />
+<glyph unicode="&#x2031;" horiz-adv-x="1480" d="M707 214q0 -53 -19.5 -104t-53.5 -86q-39 -42 -99 -42q-57 0 -92.5 38.5t-35.5 99.5q0 85 58.5 149t136.5 64q49 0 77 -31.5t28 -87.5zM682 220q0 35 -17 57.5t-42 22.5q-31 0 -62 -46q-24 -36 -40 -87t-16 -91q0 -66 50 -66q44 0 79 51q48 74 48 159zM645 706l-438 -735 h-48l388 655q-56 -42 -113 -42q-28 0 -60 13q3 -29 3 -42q0 -53 -19.5 -105.5t-50.5 -83.5q-44 -44 -101 -44q-56 0 -91 39t-35 100q0 85 59 149t138 64q35 0 71 -29q38 -30 83 -30q49 0 88.5 21.5t77.5 69.5h48zM351 560q0 25 -6 35.5t-26 18.5q-11 5 -21 11q-14 9 -20 9 q-32 0 -67 -74.5t-35 -141.5q0 -66 50 -66q48 0 86.5 64t38.5 144zM1430 213q0 -52 -19.5 -103t-52.5 -86q-40 -42 -100 -42q-57 0 -92 37.5t-35 98.5q0 88 57.5 151.5t137.5 63.5q49 0 76.5 -32t27.5 -88zM1405 220q0 35 -17 57.5t-43 22.5q-30 0 -60 -45 q-23 -35 -39.5 -87.5t-16.5 -92.5q0 -65 49 -65q44 0 79 51q48 74 48 159zM1068 213q0 -52 -19.5 -103t-52.5 -86q-40 -42 -100 -42q-57 0 -92 37.5t-35 98.5q0 88 57.5 151.5t137.5 63.5q49 0 76.5 -32t27.5 -88zM1044 220q0 35 -17 57.5t-42 22.5q-31 0 -62 -46 q-24 -36 -40 -87t-16 -91q0 -66 50 -66q44 0 79 51q48 74 48 159z" />
+<glyph unicode="&#x2039;" horiz-adv-x="333" d="M32 226l170 124q30 21 47 37q28 28 41 28q5 0 9 -3.5t4 -8.5q0 -30 -101 -134l-20 -23l-25 -26l40 -83q33 -69 33 -90q0 -15 -15 -15q-6 0 -15 10q-30 34 -168 175v9z" />
+<glyph unicode="&#x203a;" horiz-adv-x="333" d="M281 221l-170 -124q-31 -23 -47 -38q-28 -27 -41 -27t-13 12q0 30 101 134l45 49l-40 83q-33 67 -33 90q0 15 15 15q6 0 15 -10q47 -53 168 -175v-9z" />
+<glyph unicode="&#x203e;" d="M500 565h-500v72h500v-72z" />
+<glyph unicode="&#x2044;" horiz-adv-x="183" d="M345 688l-439 -700h-74l441 700h72z" />
+<glyph unicode="&#x205f;" horiz-adv-x="254" />
+<glyph unicode="&#x20a3;" horiz-adv-x="668" d="M661 669l-45 -190l-26 5q0 70 -21 101q-36 52 -150 52q-37 0 -49 -10t-21 -43l-54 -192h177l-12 -40h-175l-22 -78h177l-11 -40h-176l-37 -132q-6 -24 -6 -33q0 -23 15 -32.5t56 -11.5v-25h-294v25q39 1 55.5 20t28.5 65l34 124h-91l11 40h91l20 78h-93l12 40h93l48 178 q5 22 5 33q0 22 -16.5 30.5t-57.5 10.5v25h534z" />
+<glyph unicode="&#x20a4;" d="M45 400h105q23 89 41 126.5t57 80.5q65 76 153 76q47 0 78 -26t31 -65q0 -29 -17.5 -48.5t-43.5 -19.5q-23 0 -38 14.5t-15 36.5q0 10 4 34q3 11 3 19q0 9 -7 15t-17 6q-42 0 -60 -77l-39 -172h114l-10 -40h-115l-20 -88h134l-10 -40h-135q-18 -69 -33 -91l-11 -17 q82 -32 125 -32q36 0 54.5 13t35.5 50h25q-15 -75 -45 -114q-42 -53 -106 -53q-58 0 -127 61q-38 -60 -98 -60q-40 0 -65 24t-25 62q0 39 26.5 63t69.5 24q28 0 61 -14q3 32 7 84h-108l10 40h101q3 39 9 88h-109zM113 90q-33 30 -64 30q-23 0 -37 -13.5t-14 -36.5t15.5 -37 t40.5 -14q43 0 59 71z" />
+<glyph unicode="&#x20a7;" horiz-adv-x="1229" d="M1173 461l-23 -154l-27 2q-12 63 -33 91.5t-55 28.5q-24 0 -38.5 -14.5t-14.5 -38.5q0 -33 57 -99q80 -93 80 -162q0 -56 -43 -92t-105 -36q-35 0 -64 12q-21 8 -30 8q-20 0 -29 -20h-27l22 166l27 -3q17 -133 93 -133q29 0 44.5 14.5t15.5 39.5q0 41 -56 104 q-50 56 -65 87.5t-15 73.5q0 59 36.5 92.5t97.5 33.5q33 0 58 -12q21 -10 37 -10q11 0 16 4t12 17h29zM863 407h-83l-34 -119q-53 -185 -53 -209q0 -18 16 -18q25 0 76 80l23 -15q-49 -76 -86.5 -105.5t-83.5 -29.5q-67 0 -67 65q0 28 25 115l67 236h-52v35q62 21 103 55 t81 97h35l-39 -145h72v-42zM112 669h262q216 0 216 -155q0 -80 -59 -131q-75 -66 -201 -66q-27 0 -71 5l-54 -199q-11 -37 -11 -58q0 -20 15 -29t57 -11v-25h-294v25q40 6 55.5 20.5t28.5 61.5l117 426q13 46 13 74q0 15 -9 22.5t-32 10.5l-33 4v25zM330 584l-61 -229 q17 -3 32 -3q44 0 66 13.5t44 48.5q33 52 33 136q0 40 -21 63.5t-60 23.5q-6 0 -10 -1t-6.5 -2.5t-4.5 -6.5l-4 -9q-1 -4 -3.5 -15t-4.5 -19z" />
+<glyph unicode="&#x20ac;" horiz-adv-x="562" d="M546 630l-23 -149l-34 4q-11 166 -86 166q-43 0 -84 -43.5t-63.5 -94t-34.5 -97.5h251l-12 -40h-245q-12 -31 -17 -88h235l-12 -40h-230q-8 -34 -8 -75q0 -62 21.5 -105.5t68.5 -43.5q54 0 96.5 28.5t85.5 80.5l19 -10q-50 -69 -103 -104.5t-122 -35.5q-91 0 -136.5 65.5 t-45.5 158.5q0 15 2 41h-35l10 40h30q10 62 18 88h-41l13 40h37q34 108 116.5 186.5t183.5 78.5q81 0 145 -51z" />
+<glyph unicode="&#x20dd;" horiz-adv-x="0" d="M-249 760q138 0 254 -68t183.5 -184.5t67.5 -254.5t-67.5 -254.5t-183.5 -184.5t-254 -68t-254 68t-183 184.5t-67 254.5t67 254.5t183 184.5t254 68zM-249 672q-171 0 -293.5 -123.5t-122.5 -295.5q0 -171 122.5 -295t293.5 -124q83 0 160 33.5t133.5 90t90 134 t33.5 161.5q0 171 -123.5 295t-293.5 124z" />
+<glyph unicode="&#x2102;" horiz-adv-x="713" d="M704 545l-41 -45q-81 122 -210 122q-97 0 -134 -38l-137 -502q39 -33 134 -33q35 0 64.5 5.5t60 22t45.5 25.5t53 38l50 37l36 -44q-142 -147 -332 -147q-115 0 -186.5 69.5t-71.5 184.5q0 117 54.5 219t152.5 164t216 62q91 0 141.5 -30t104.5 -110zM128 116l118 438 q-68 -56 -108 -134t-40 -163q0 -72 30 -141z" />
+<glyph unicode="&#x2105;" horiz-adv-x="847" d="M795 232q0 -106 -79 -189q-56 -56 -134 -56q-56 0 -90.5 29t-34.5 83q0 113 77 190q58 58 140 58q55 0 88 -31.5t33 -83.5zM703 267q0 21 -9 33.5t-25 12.5q-23 0 -46 -24q-34 -38 -53.5 -99t-19.5 -120q0 -49 37 -49q34 0 55 37q61 106 61 209zM636 683l-435 -697h-58 l435 697h58zM295 444l23 -17q-31 -61 -87 -91q-24 -12 -63 -12q-53 0 -84.5 30t-31.5 84q0 100 79 182q63 63 138 63q35 0 60 -19t25 -48q0 -25 -15 -42.5t-37 -17.5q-17 0 -29.5 10t-12.5 27q0 12 8 23.5t8 19.5q0 13 -18 13q-40 0 -70 -56q-38 -71 -38 -146q0 -67 54 -67 q26 0 46 13.5t45 50.5z" />
+<glyph unicode="&#x210a;" horiz-adv-x="819" d="M771 449l-278 -518q25 -12 73 -12q56 0 110 35l20 -41q-60 -44 -141 -44q-49 0 -89 14q-90 -107 -238 -107q-60 0 -94 23t-34 54q0 32 29.5 58t70.5 42q39 15 121 15q25 0 75 -8l40 72h-3q-63 -43 -143 -43q-50 0 -83.5 30.5t-33.5 79.5q0 55 32 117q-42 -14 -82 -14 q-51 0 -96 23l12 43q38 -16 82 -16q81 0 150 58q60 65 142.5 108.5t143.5 43.5q60 0 88 -31h2l10 18h114zM591 375q0 37 -33 37q-75 0 -187 -162q-83 -119 -83 -176q0 -16 9.5 -25.5t20.5 -9.5q56 0 123 68t108.5 147t41.5 121zM369 -91q-30 9 -63 9q-43 -1 -74 -16t-32 -46 q0 -30 40 -30q74 0 129 83z" />
+<glyph unicode="&#x210b;" horiz-adv-x="1171" d="M816 658l-24 -19q-67 -53 -119.5 -115.5t-101.5 -158.5q62 15 89 27q110 145 223 226t194 81q77 0 77 -63q0 -78 -95.5 -141.5t-247.5 -106.5q-74 -104 -120.5 -191.5t-46.5 -127.5q0 -28 29 -28q46 0 146 124l42 -26q-52 -80 -111 -121q-53 -36 -104 -36 q-63 0 -92.5 31.5t-29.5 82.5q0 96 83 222q-13 -5 -41 -13.5t-32 -9.5q-68 -125 -167.5 -220.5t-197.5 -95.5q-104 0 -104 77q0 61 61 119q42 40 100 67t160 63q4 7 20 33t22 35l22 32q15 23 27 37l31 36q19 22 41 43.5t49 45.5v2q-39 0 -71.5 11.5t-51 26t-43 26 t-48.5 11.5q-39 0 -66.5 -30.5t-27.5 -68.5q0 -36 17.5 -54t42.5 -18q33 0 57 23l29 -35q-40 -43 -106 -43q-61 0 -96 36.5t-35 90.5q0 60 50 107t139 47q56 0 134 -25t116 -25q44 0 79 13q30 11 69 37zM875 473v-2q63 16 126.5 61t63.5 95q0 17 -18 17q-27 0 -78 -49 t-94 -122zM344 225l-1 2q-75 -24 -131 -75t-56 -98q0 -20 20 -20q29 0 78.5 58t89.5 133z" />
+<glyph unicode="&#x210d;" horiz-adv-x="773" d="M808 669l-180 -669h-209l81 300h-189l-81 -300h-209l180 669h209l-80 -299h189l80 299h209zM725 606h-77l-146 -543h77zM327 606h-77l-146 -543h77z" />
+<glyph unicode="&#x2110;" horiz-adv-x="997" d="M141 66v-1q10 -13 38 -22t49 -9q94 0 164.5 48.5t131.5 182.5q2 5 8 18t10 20q-49 17 -79 56q-37 45 -37 108q0 79 60 137q87 83 237 83q63 0 121 -9q45 21 81 21q23 0 37.5 -10t14.5 -25q0 -31 -25 -47t-68 -16q-16 0 -32 3q-17 -12 -32 -30t-29.5 -46t-24 -48 t-26.5 -60l-24 -57l1 -2q69 33 120 115l43 -26q-67 -128 -195 -154q-64 -134 -122 -187q-142 -130 -328 -130q-86 0 -137 36t-51 93q0 38 24.5 65.5t59.5 27.5q31 0 49.5 -20t18.5 -47q0 -24 -15 -43.5t-43 -24.5zM769 604v3q-130 0 -191 -47t-61 -119q0 -57 54 -83 q29 57 51.5 94t62 81t84.5 71z" />
+<glyph unicode="&#x2112;" horiz-adv-x="1036" d="M678 648l-22 -44q-72 40 -166 40q-80 0 -140.5 -37.5t-60.5 -103.5t64.5 -103.5t166.5 -37.5q25 0 44 2q45 91 83 148q45 65 117.5 116t140.5 51q56 0 83 -23.5t27 -63.5q0 -70 -94.5 -151.5t-225.5 -117.5q-95 -192 -254 -272v-2q44 -13 78 -13q151 0 278 141l36 -35 q-139 -163 -311 -163q-85 0 -168 29q-82 -25 -162 -25q-75 0 -108 17q-44 22 -44 61q0 38 44 62q39 21 100 21q35 0 71 -9.5t56 -18.5l57 -29q71 47 168 220h-28q-56 0 -108 10.5t-99 33t-75 63t-28 93.5q0 81 83 136.5t204 55.5q112 0 193 -51zM722 389l2 -1 q78 27 139 81.5t61 120.5q0 16 -10 25t-23 9q-43 0 -88 -69.5t-81 -165.5zM290 53v1q-53 35 -115 35q-14 0 -29 -5.5t-15 -16.5q0 -29 64 -29q45 0 95 15z" />
+<glyph unicode="&#x2113;" d="M43 429l26 38q28 -19 69 -35t59 -18q195 285 325 285q47 0 78.5 -21.5t31.5 -63.5q0 -56 -34.5 -107t-93.5 -87q-90 -56 -208 -65l-58 -100q-21 -36 -46 -94.5t-25 -91.5t25 -33q29 0 79.5 38t114.5 124l36 -27q-70 -99 -128.5 -142t-121.5 -43q-52 0 -82 31t-30 90 q0 97 103 255q-26 6 -64 27.5t-56 39.5zM333 421l1 -1q83 19 145.5 72t62.5 129q0 28 -25 28q-62 0 -184 -228z" />
+<glyph unicode="&#x2115;" horiz-adv-x="760" d="M783 669l-178 -669h-157l-225 485h-2l-129 -485h-65l178 669h155l227 -485h2l129 485h65zM562 86l-240 520h-70l-5 -21l241 -522h69z" />
+<glyph unicode="&#x2116;" horiz-adv-x="1055" d="M1031 374q0 -89 -60.5 -162.5t-147.5 -73.5q-52 0 -80.5 31.5t-28.5 84.5q0 66 49 138q64 91 159 91q50 0 79.5 -29.5t29.5 -79.5zM944 427q0 14 -8.5 22.5t-21.5 8.5q-24 0 -42 -29q-20 -33 -44 -113t-24 -117q0 -35 28 -35q8 0 16 3.5t14.5 10.5t12 14t11.5 19l9 20 q4 8 8 22t6 20t6 19t4 15q25 89 25 120zM961 76l-24 -82h-295l24 82h295zM552 288h2l73 251q40 136 132 136q34 0 58.5 -21.5t24.5 -55.5q0 -27 -18 -45.5t-45 -18.5q-18 0 -31.5 9.5t-19.5 21.5t-13.5 21.5t-13.5 9.5q-7 0 -13 -5.5t-11 -16t-8 -19t-6 -21t-4 -14.5 l-157 -535h-17l-21 87l-42 169l-48 191q-18 76 -17 76h-2l-110 -375q-19 -66 -49.5 -107t-86.5 -41q-34 0 -59.5 21t-25.5 54q0 27 18.5 45t45.5 18q18 0 31.5 -10t19.5 -21.5t13 -21.5t13 -10q21 0 47 92l127 427q-6 17 -9 24.5t-12 18t-24 14.5t-39 4l9 29h196z" />
+<glyph unicode="&#x2119;" horiz-adv-x="497" d="M198 669h329q84 0 136 -38t52 -119q0 -124 -77 -193t-202 -69h-142l-67 -250h-209zM652 501q0 29 -11.5 56.5t-35.5 34.5l-3 -12q-5 -20 -69 -257q52 6 85.5 64t33.5 114zM466 319l76 282q-17 5 -56 5h-96l-79 -293h99q29 0 56 6zM324 606h-77l-146 -543h77z" />
+<glyph unicode="&#x211a;" horiz-adv-x="754" d="M639 11l27 -47q-42 -38 -104 -38q-71 0 -124 81q-66 -21 -135 -21q-121 0 -194.5 67t-73.5 187q0 117 54.5 219t152.5 164t216 62q125 0 200.5 -65.5t75.5 -188.5q0 -125 -61 -232t-169 -164q30 -46 67 -46q28 0 68 22zM637 537l-112 -417q70 45 108 125.5t38 168.5 q0 72 -34 123zM455 104l130 483q-55 35 -132 35q-81 0 -128 -23l-135 -506q42 39 74 55.5t80 16.5q63 0 111 -61zM134 132l113 424q-70 -47 -109.5 -129t-39.5 -170q0 -71 36 -125zM402 59q-33 43 -74 43q-49 0 -89 -43q42 -10 77 -10q39 0 86 10z" />
+<glyph unicode="&#x211b;" horiz-adv-x="1048" d="M934 175l39 -33q-58 -81 -110.5 -120.5t-113.5 -39.5q-57 0 -90 27t-33 67q0 37 42.5 101t42.5 90q0 24 -14 27q-22 0 -30 5q-87 -169 -192.5 -244.5t-234.5 -75.5q-85 0 -135 36.5t-50 93.5q0 38 23 65t58 27q31 0 49.5 -20t18.5 -47q0 -24 -15 -43.5t-43 -24.5v-1 q25 -31 87 -31q85 0 139 49.5t137 198.5q70 128 122.5 202t118.5 126q-72 34 -151 34q-147 0 -246.5 -65t-99.5 -160q0 -43 27.5 -70.5t64.5 -27.5q75 0 113 66q31 52 35 133h50q0 -104 -52 -179t-159 -75q-71 0 -120.5 42.5t-49.5 114.5q0 65 46.5 125.5t128.5 99.5 q107 51 255 51q122 0 224 -45q44 25 98 44l19 -47q-30 -13 -55 -29q93 -61 93 -146q0 -67 -52 -111t-126 -50v-2q34 -34 34 -86q0 -27 -39 -83.5t-39 -75.5q0 -27 26 -27q52 0 159 134zM857 481q0 53 -43 88q-21 -21 -40 -50t-27 -44.5t-27 -58.5l-22 -49q33 0 62 -18 q38 7 67.5 47.5t29.5 84.5z" />
+<glyph unicode="&#x211d;" horiz-adv-x="727" d="M198 669h332q84 0 136 -38t52 -119q0 -83 -38.5 -146t-112.5 -93l96 -273h-212q-2 4 -19 49l-72 201h-66l-67 -250h-209zM607 593l-73 -271q57 12 89 64.5t32 114.5q0 66 -48 92zM469 319l75 282q-45 5 -55 5h-99l-79 -293h102q39 0 56 6zM574 63l-67 192q-26 -5 -80 -5 l68 -187h79zM324 606h-77l-146 -543h77z" />
+<glyph unicode="&#x2122;" horiz-adv-x="1000" d="M977 676v-23q-33 -2 -43.5 -11.5t-10.5 -36.5v-262q0 -32 7 -38.5t44 -9.5v-23h-194v23q37 3 43.5 9t6.5 39v226l-149 -298h-13l-142 296v-203q0 -41 9 -53.5t43 -15.5v-23h-133v23q33 3 42.5 15.5t9.5 53.5v237q-23 50 -70 52v23h139l142 -289l151 289h118zM386 588h-23 q-9 34 -24.5 49t-41.5 15h-46v-309q0 -32 7 -38.5t44 -9.5v-23h-194v23q37 3 43.5 9.5t6.5 38.5v309h-46q-26 0 -41 -14.5t-24 -49.5h-23v88h362v-88z" />
+<glyph unicode="&#x2124;" horiz-adv-x="807" d="M837 606l-528 -541v-2h394l-16 -63h-664v63l531 541v2h-346l16 63h613v-63zM753 606h-107l-538 -543h108z" />
+<glyph unicode="&#x212c;" horiz-adv-x="1060" d="M966 690l17 -45q-37 -15 -74 -39q76 -60 76 -131q0 -50 -36.5 -92t-102.5 -56v-2q46 -22 70 -58t24 -73q0 -45 -26.5 -92t-76.5 -80q-51 -35 -129 -35q-56 0 -83 30t-27 65q0 44 37.5 85t118.5 51l8 -50q-43 -4 -70 -27.5t-27 -56.5q0 -21 13 -31.5t32 -10.5 q44 0 72.5 48.5t28.5 107.5q0 72 -39 102q-22 -6 -54 -6q-5 0 -35 6q-168 -321 -443 -321q-86 0 -135.5 36t-49.5 93q0 38 23 65.5t58 27.5q31 0 49.5 -20t18.5 -47q0 -24 -15 -43.5t-43 -24.5v-1q25 -31 77 -31q83 0 150.5 52t150.5 196q74 130 129 199.5t136 120.5 q-69 42 -177 42q-92 0 -171.5 -25.5t-133.5 -81t-54 -130.5q0 -43 29 -70.5t71 -27.5q63 0 115.5 56.5t56.5 162.5h50q0 -107 -62.5 -190.5t-165.5 -83.5q-87 0 -133 42q-52 47 -52 118q0 74 49.5 134.5t128.5 98.5q108 52 263 52q154 0 252 -58q45 27 111 49zM871 480 q0 48 -26 77q-59 -58 -130 -189q49 -3 71 -14q38 7 61.5 44t23.5 82z" />
+<glyph unicode="&#x212f;" horiz-adv-x="726" d="M35 284l29 35q47 -55 133 -69q52 89 145.5 150.5t182.5 61.5q54 0 88.5 -23t34.5 -61q0 -42 -35 -78q-44 -47 -129.5 -75.5t-178.5 -30.5q-12 -11 -22 -41.5t-10 -58.5t14.5 -43t39.5 -15q52 0 131.5 54t135.5 122l32 -32q-88 -109 -189 -160q-68 -34 -135 -34 q-68 0 -106 33.5t-38 90.5q0 50 17 94q-91 20 -140 80zM330 244l1 -1q101 11 160 54.5t59 92.5q0 13 -8.5 20t-17.5 7q-81 0 -194 -173z" />
+<glyph unicode="&#x2130;" horiz-adv-x="826" d="M414 683l-14 -48q-30 9 -77 9q-62 0 -99.5 -26t-37.5 -69q0 -85 148 -96q15 93 119 163.5t208 70.5q130 0 130 -80q0 -64 -99 -129t-241 -80v-3q80 -10 80 -37q0 -18 -18.5 -29.5t-53.5 -11.5t-63 14q-72 -25 -114.5 -78.5t-42.5 -117.5q0 -45 31 -73t83 -28 q69 0 118.5 37.5t49.5 98.5q0 30 -18.5 47t-40.5 17q-94 0 -129 -128l-49 10q36 173 206 173q145 0 145 -116q0 -60 -53 -111q-42 -40 -106.5 -61.5t-127.5 -21.5q-103 0 -173 46.5t-70 130.5q0 77 62.5 136.5t176.5 87.5v2q-6 10 -7 16q-111 6 -176.5 47t-65.5 107 q0 61 60 104t156 43q65 0 103 -16zM456 455l2 -2q101 14 171.5 58t70.5 90q0 31 -45 31q-56 0 -118 -55.5t-81 -121.5z" />
+<glyph unicode="&#x2131;" horiz-adv-x="1042" d="M999 699l26 -42q-44 -38 -102.5 -62.5t-115.5 -24.5q-82 0 -196.5 37t-160.5 37q-86 0 -141.5 -43.5t-55.5 -108.5q0 -51 28.5 -76t63.5 -25q43 0 80.5 34t55.5 110l45 -9q-7 -85 -62 -137.5t-130 -52.5q-46 0 -89 22q-37 20 -60 56t-23 81q0 101 118 163q77 41 229 41 q56 0 175 -19t171 -19q29 0 71 10.5t73 27.5zM718 558l35 -36q-5 -5 -9 -10.5t-8 -13.5l-8 -12q-3 -5 -7 -14l-7 -16l-7 -18t-7.5 -19l-9.5 -23l-9 -26q68 13 134 13q40 56 79 56q22 0 35 -13t13 -31q0 -31 -26.5 -53t-73.5 -28q0 -49 8 -73l-70 -26q-4 15 -4 34q0 20 6 50 q-68 0 -133 -14q-42 -105 -110.5 -176t-142 -100.5t-153.5 -29.5q-85 0 -131.5 35.5t-46.5 93.5q0 38 24.5 65.5t59.5 27.5q31 0 49.5 -20t18.5 -47q0 -24 -15 -43.5t-43 -24.5v-1q23 -31 80 -31q73 0 128 48.5t102 137.5l4 8q-91 -43 -140 -85l-35 36q92 87 227 144 q58 102 100 150.5t93 84.5z" />
+<glyph unicode="&#x2133;" horiz-adv-x="1300" d="M1234 691l11 -17q-142 -219 -228.5 -388t-86.5 -218q0 -27 26 -27q47 0 167 133l37 -34q-66 -79 -120 -118.5t-112 -39.5q-119 0 -119 95q0 161 284 539l-2 1q-68 -47 -133.5 -132.5t-155.5 -246.5l-46 -81q-14 -24 -36.5 -56t-41.5 -51q-56 -54 -124 -54q-33 0 -57 21.5 t-24 54.5q0 51 35 121q88 178 259 414l-1 1q-70 -49 -125.5 -118t-127.5 -188q-7 -11 -25 -42l-24 -40l-22 -36l-23 -36q-7 -11 -20 -29.5l-21 -29.5l-20 -24q-10 -13 -20 -23q-61 -63 -137 -63q-63 0 -102 31.5t-39 86.5q0 38 24.5 64.5t59.5 26.5q31 0 50.5 -21.5 t19.5 -48.5q0 -25 -16 -44.5t-47 -19.5v-1q14 -19 61 -19t86 45t124 184q136 224 231 317q119 119 235 119q20 0 37 -8l10 -17q-99 -137 -191.5 -294t-130.5 -243q-19 -42 -19 -60q0 -14 11 -14q42 0 145 194q116 217 231 334q106 108 201 108q38 0 52 -8z" />
+<glyph unicode="&#x2134;" horiz-adv-x="848" d="M757 232l23 -39q-46 -31 -99 -31q-36 0 -63 9q-62 -99 -143 -148q-61 -37 -131 -37q-65 0 -104 31.5t-39 92.5q0 54 24 113q-43 -20 -96 -20q-51 0 -94 22l12 43q36 -15 80 -15q97 0 163 71q64 69 137 104q71 34 148 34q51 0 79 -28.5t28 -79.5q0 -67 -35 -131 q12 -11 38 -11q17 0 25 0.5t20.5 5t26.5 14.5zM626 371q0 41 -47 41q-53 0 -116.5 -59.5t-105 -136t-41.5 -127.5q0 -53 46 -53q58 0 113 48t96 114q-30 27 -30 75q0 37 25 64.5t60 33.5z" />
+<glyph unicode="&#x213c;" horiz-adv-x="730" d="M715 386h-117l-67 -256q-11 -42 -11 -58q0 -13 6 -21q21 5 36 18q4 3 34 31q28 26 41 37l41 -45q-82 -78 -108 -90q-33 -15 -105 -15q-55 0 -91.5 30t-36.5 84q0 14 6 40l65 245h-77q-83 -315 -103 -386h-190l31 122l38 142l33 122h-108v63h683v-63zM535 386h-63 l-62 -234q-10 -35 -10 -46q0 -26 16.5 -41t43.5 -15l2 1q-5 13 -5 24q0 19 7 44zM267 386h-64l-85 -323h63z" />
+<glyph unicode="&#x213f;" horiz-adv-x="796" d="M821 669l-179 -669h-210l166 606h-188l-167 -606h-208l180 669h606zM739 606h-78l-147 -543h80zM341 606h-78l-147 -543h80z" />
+<glyph unicode="&#x2145;" horiz-adv-x="748" d="M198 669h289q111 0 178.5 -69t67.5 -180q0 -172 -114.5 -296t-284.5 -124h-316zM635 534l-111 -412q68 53 107 129t39 161q0 66 -35 122zM451 90l130 488q-46 28 -130 28h-15h-46l-146 -543h43h16q95 0 148 27zM324 606h-77l-146 -543h77z" />
+<glyph unicode="&#x2146;" horiz-adv-x="633" d="M698 699l-186 -699h-193l9 32h-1q-44 -45 -127 -45q-68 0 -111.5 46t-43.5 114q0 127 70 221t193 94q73 0 123 -42h1l75 279h191zM618 636h-64l-154 -573h64zM289 393l-91 -340q15 -3 30 -3q55 0 91.5 42.5t51.5 101.5q27 98 27 130q0 33 -18.5 54t-50.5 21q-28 0 -40 -6 zM138 70l83 309q-51 -28 -82 -90.5t-31 -123.5q0 -33 5.5 -51t24.5 -44z" />
+<glyph unicode="&#x2147;" horiz-adv-x="575" d="M451 131l36 -38q-67 -106 -239 -106q-88 0 -145.5 48t-57.5 135q0 128 88 210t217 82q74 0 132 -42t58 -113q0 -30 -25 -114h-281l-35 -133q17 -10 56 -10q16 0 29.5 1t24 1t21.5 3.5t17.5 4.5t17 7t14.5 7.5t16 11t15.5 12t19.5 16.5zM406 256h60q11 31 11 52 q0 38 -40 64zM342 256l36 135q-15 8 -37 8q-43 0 -55 -14l-35 -129h91zM218 372q-48 -31 -79 -88t-31 -114q0 -48 31 -93z" />
+<glyph unicode="&#x2148;" horiz-adv-x="379" d="M413 669l-49 -180h-193l50 180h192zM332 606h-64l-16 -54h64zM354 449l-121 -449h-193l122 449h192zM273 386h-64l-88 -323h64z" />
+<glyph unicode="&#x2149;" horiz-adv-x="421" d="M455 669l-49 -180h-193l50 180h192zM374 606h-64l-16 -54h64zM398 449l-123 -458q-25 -92 -103.5 -144t-177.5 -52q-42 0 -87 18l32 57q23 -12 74 -12q24 0 35 4l157 587h193zM318 386h-67l-138 -514q77 37 99 118z" />
+<glyph unicode="&#x2202;" horiz-adv-x="559" d="M234 627l2 23q43 36 119 36q204 0 204 -256q0 -53 -12 -111.5t-39 -117.5t-64 -105.5t-92.5 -76t-120.5 -29.5q-89 0 -138 46.5t-49 129.5q0 119 89 206t209 87q41 0 80.5 -19t52.5 -51h4v8q2 18 2 27q0 48 -5.5 83.5t-21 69t-47.5 51t-80 17.5q-30 0 -93 -18zM423 293 q0 64 -25.5 95t-63.5 31q-64 0 -119 -88.5t-55 -176.5q0 -70 20.5 -97t67.5 -27q68 0 121.5 82.5t53.5 180.5z" />
+<glyph unicode="&#x2212;" horiz-adv-x="606" d="M555 209h-504v88h504v-88z" />
+<glyph unicode="&#x2423;" d="M460 -120h-420v151h42v-76h336v76h42v-151z" />
+<glyph unicode="&#x2460;" horiz-adv-x="695" d="M455 517l-88 -307q-6 -24 -6 -29q0 -13 63 -14v-26h-221v26q38 2 53 9.5t21 28.5l68 231q4 12 4 19q0 11 -30 11q-16 0 -40 -3v25q98 12 176 29zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252z M643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x2461;" horiz-adv-x="695" d="M248 411l-18 10q45 96 139 96q49 0 79 -28t30 -69q0 -66 -87 -130l-105 -77h71q42 0 61 8.5t33 34.5h21l-51 -115h-234v23l54 50q88 82 119 118t31 66q0 58 -59 58q-49 0 -84 -45zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251 t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x2462;" horiz-adv-x="695" d="M266 427l-20 10q55 80 133 80q40 0 69 -23.5t29 -56.5q0 -57 -61 -81q41 -28 41 -80q0 -59 -50.5 -100.5t-128.5 -41.5q-39 0 -63.5 14t-24.5 36q0 16 10 26t28 10q22 0 45 -31q17 -21 40 -21q27 0 46 23.5t19 54.5q0 35 -25 57q-24 20 -81 22v25q121 22 121 73 q0 44 -55 44q-40 0 -72 -40zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5 t85 216.5z" />
+<glyph unicode="&#x2463;" horiz-adv-x="695" d="M476 517l-66 -232h45l-19 -65h-44l-22 -80h-86l21 80h-154l20 68l261 229h44zM363 417l-153 -132h114zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5 q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x2464;" horiz-adv-x="695" d="M489 517l-27 -72h-163l-14 -30q76 -12 111 -37q52 -37 52 -98q0 -62 -52 -104t-130 -42q-41 0 -66.5 14t-25.5 36q0 17 11 27t28 10q27 0 49 -32q13 -20 38 -20q30 0 54 23.5t24 53.5q0 52 -69 82q-27 12 -91 15l83 174h188zM695 335q0 -150 -100 -252t-246 -102 q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x2465;" horiz-adv-x="695" d="M483 517l8 -25q-109 -32 -165 -116q13 4 29 4q46 0 73.5 -26t27.5 -76q0 -64 -43.5 -104t-108.5 -40q-55 0 -85.5 32t-30.5 86q0 119 103 194q44 31 82.5 45t109.5 26zM372 311q0 19 -9.5 27t-32.5 8q-15 0 -21.5 -4t-11.5 -16q-33 -75 -33 -126q0 -36 34 -36q25 0 37 18 q16 22 26.5 61t10.5 68zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z " />
+<glyph unicode="&#x2466;" horiz-adv-x="695" d="M522 517l-244 -383h-69l204 307h-74q-56 0 -75.5 -7.5t-37.5 -35.5h-23l59 119h260zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89 t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x2467;" horiz-adv-x="695" d="M480 433q0 -32 -18.5 -52t-62.5 -36q52 -48 52 -97q0 -54 -39.5 -84.5t-102.5 -30.5q-55 0 -89.5 27t-34.5 69q0 37 24.5 61t77.5 42q-43 39 -43 82q0 47 34 75t85 28q45 0 81 -22t36 -62zM417 434q0 24 -14.5 38t-35.5 14q-23 0 -37 -11.5t-14 -31.5q0 -37 59 -76 q42 38 42 67zM377 218q0 23 -12 41.5t-53 52.5q-33 -20 -47.5 -39.5t-14.5 -47.5q0 -29 17 -45t45 -16t46.5 15t18.5 39zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5 t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x2468;" horiz-adv-x="695" d="M193 134l-8 25q111 30 164 115q-15 -3 -29 -3q-43 0 -72 27.5t-29 71.5q0 65 43.5 106t109.5 41q52 0 84.5 -32.5t32.5 -86.5q0 -64 -33 -118t-92 -90q-62 -38 -171 -56zM413 449q0 38 -31 38q-27 0 -46.5 -29.5t-26 -61.5t-6.5 -58q0 -33 42 -33q20 0 27 7.5t18 37.5 q23 65 23 99zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24b6;" horiz-adv-x="695" d="M548 141h-186v26q45 4 45 17q0 10 -2 16l-9 54h-127l-30 -50q-10 -15 -10 -23q0 -14 40 -14v-26h-122v26q17 2 27.5 10.5t23.5 28.5l210 318h16l69 -309q6 -29 15.5 -37.5t39.5 -10.5v-26zM389 288l-25 118l-74 -118h99zM695 335q0 -150 -100 -252t-246 -102 q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24b7;" horiz-adv-x="695" d="M238 517h150q139 0 139 -88q0 -40 -20.5 -59t-62.5 -31q60 -23 60 -81t-42.5 -87.5t-119.5 -29.5h-172v26q21 3 31 11.5t15 29.5l58 238q5 22 5 28q0 17 -41 17v26zM336 356h9q47 0 71.5 17.5t25.5 60.5q1 53 -50 53q-14 0 -21 -5t-11 -23zM330 322l-29 -117 q-4 -20 -4 -22q0 -12 32 -12q41 0 63 27.5t22 70.5q0 34 -19 43t-65 10zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214 q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24b8;" horiz-adv-x="695" d="M548 524l-30 -139h-24q2 15 2 29q0 36 -22.5 57t-61.5 21q-72 0 -119 -69.5t-47 -148.5q0 -49 27.5 -73.5t73.5 -24.5q39 0 66 14.5t60 48.5l26 -16q-63 -89 -178 -89q-78 0 -124 39.5t-46 105.5q0 109 69 177t174 68q46 0 84 -11q18 -4 23 -4q13 0 24 15h23zM695 335 q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24b9;" horiz-adv-x="695" d="M211 517h163q80 0 127 -41t47 -112q0 -104 -67 -163.5t-173 -59.5h-162v26q21 3 30.5 11.5t14.5 29.5l56 229q6 25 6 37q0 16 -42 17v26zM340 471l-61 -252q-7 -26 -7 -35q0 -13 32 -13q79 0 119 63.5t40 151.5q0 101 -95 101q-24 0 -28 -16zM695 335q0 -150 -100 -252 t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24ba;" horiz-adv-x="695" d="M527 516l-23 -116h-16q-2 25 -3.5 34.5t-6.5 20t-15 16.5q-25 15 -73 15q-17 0 -24 -4.5t-10 -18.5l-25 -107q53 0 70 8.5t35 44.5h17l-37 -157h-18q2 12 2 24q0 28 -16 37t-62 9l-27 -120q-4 -12 -4 -18q0 -13 32 -13q69 0 113 32q29 23 47 55h18l-32 -117h-299v26 q22 4 30 11t13 28l55 234q5 22 5 36t-41 14v26h295zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88 q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24bb;" horiz-adv-x="695" d="M527 516l-22 -113h-17q-2 43 -13 56q-24 27 -84 27q-16 0 -22.5 -4.5t-9.5 -17.5l-27 -108q54 1 70.5 9t31.5 44h19l-37 -157h-18q2 12 2 25q0 27 -15.5 35.5t-60.5 9.5l-24 -105q-7 -30 -7 -32q0 -15 40 -18v-26h-163v26q23 3 31 10.5t13 27.5l56 240q5 20 5 31 q0 12 -41 14v26h293zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24bc;" horiz-adv-x="695" d="M548 334v-26q-23 -2 -31 -10.5t-15 -36.5l-23 -95l-15 -6q-65 -26 -138 -26q-79 0 -129.5 42.5t-50.5 113.5q0 101 71 167.5t171 66.5q35 0 74 -11q15 -5 20 -5q16 0 25 16h21l-28 -129h-19q-1 48 -20 72.5t-64 24.5q-70 0 -113 -69.5t-43 -145.5q0 -110 99 -110 q48 0 53 15l26 92q3 12 3 17q0 11 -45 17v26h171zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88 q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24bd;" horiz-adv-x="695" d="M564 516v-26q-16 0 -23.5 -8.5t-12.5 -28.5l-52 -217q-11 -44 -11 -52q0 -14 40 -17v-26h-163v26q23 3 31 10.5t14 32.5l27 112h-128l-23 -96q-9 -36 -9 -43q0 -15 40 -16v-26h-163v26q15 3 21 5t13 10t10 23l56 240q5 22 5 29q0 8 -7.5 11t-33.5 5v26h166v-26 q-23 -1 -31.5 -8.5t-12.5 -30.5l-24 -95h128l21 89q5 23 5 31q0 10 -41 14v26h158zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89 t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24be;" horiz-adv-x="695" d="M460 516v-26q-23 -1 -31 -8t-13 -30l-54 -226q-9 -38 -9 -42q0 -16 40 -17v-26h-163v26q26 3 33 13t14 39l52 220q6 24 6 36q0 8 -8 10t-33 5v26h166zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103 t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24bf;" horiz-adv-x="695" d="M491 516v-26q-23 -2 -30.5 -7.5t-12.5 -28.5l-52 -218q-24 -102 -119 -102q-39 0 -63.5 15t-24.5 41q0 17 10.5 28t25.5 11q17 0 28.5 -10.5t11.5 -27.5q0 -14 -12 -26q4 -2 13 -2q16 0 26 17t21 61l45 189q8 32 8 41q0 10 -6 13t-35 6v26h166zM695 335q0 -150 -100 -252 t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24c0;" horiz-adv-x="695" d="M548 516v-26q-22 -3 -30 -6.5t-23 -17.5l-116 -105l93 -176q7 -14 38 -18v-26h-162v26q35 3 35 9q0 5 -9 23l-67 122l-26 -108q-1 -5 -2.5 -11.5t-2.5 -10t-1 -6.5q0 -16 40 -18v-26h-163v26q35 5 42 32l58 243q5 23 5 32q0 8 -7.5 11t-33.5 5v26h166v-26q-24 -1 -31 -8 t-12 -27l-27 -111l103 90q42 37 42 48q0 7 -33 8v26h124zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214 t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24c1;" horiz-adv-x="695" d="M503 259l-27 -118h-287v26q17 1 27 9t12.5 15t6.5 24l55 233q4 16 4 28q0 4 -3.5 6.5t-9 4t-10.5 2t-11 1t-7 0.5v26h166v-26q-22 0 -30 -7.5t-12 -21.5l-58 -243q-8 -30 -8 -35q0 -12 45 -12q48 0 82 24q18 12 28.5 25t22.5 39h14zM695 335q0 -150 -100 -252t-246 -102 q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24c2;" horiz-adv-x="695" d="M578 516v-26q-23 0 -30.5 -7.5t-13.5 -30.5l-51 -215q-12 -46 -12 -50q0 -17 40 -20v-26h-163v26q23 2 31.5 12.5t14.5 34.5l52 220l-155 -299h-9l-31 299l-49 -191q-7 -28 -7 -45q0 -16 7.5 -22t30.5 -9v-26h-102v26q19 8 25.5 21t19.5 61l52 199q5 22 5 28 q0 9 -4.5 11.5t-26.5 2.5v26h92l26 -258l138 258h120zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214 t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24c3;" horiz-adv-x="695" d="M532 517v-26q-22 -5 -31 -18.5t-18 -60.5l-57 -278h-18l-130 295l-40 -186q-7 -37 -7 -47q0 -14 8.5 -20t29.5 -8v-26h-104v26q20 4 26.5 15.5t18.5 64.5l48 215q-13 28 -34 28v26h92l109 -252l33 151q7 35 7 47q0 28 -39 28v26h106zM695 335q0 -150 -100 -252t-246 -102 q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24c4;" horiz-adv-x="695" d="M550 386q0 -97 -77.5 -174.5t-177.5 -77.5q-68 0 -110 37.5t-42 101.5q0 96 77 173.5t173 77.5q66 0 111.5 -38.5t45.5 -99.5zM455 429q0 64 -62 64q-48 0 -85 -47.5t-53.5 -104.5t-16.5 -105q0 -34 17 -52.5t46 -18.5q49 0 86 50t52.5 108.5t15.5 105.5zM695 335 q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24c5;" horiz-adv-x="695" d="M238 516h160q129 0 129 -92q0 -58 -43.5 -84.5t-109.5 -26.5q-27 0 -47 2l-24 -102q-6 -24 -6 -28q0 -15 40 -18v-26h-163v26q23 4 31.5 11.5t13.5 31.5l53 226q7 28 7 39q0 12 -41 15v26zM361 457l-26 -111q9 -1 22 -1q82 0 84 98q0 43 -49 43q-14 0 -20.5 -6.5 t-10.5 -22.5zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24c6;" horiz-adv-x="695" d="M150 133l95 77q-46 10 -76 44.5t-30 82.5q0 102 72 180t170 78q63 0 108 -38.5t45 -98.5q0 -95 -73.5 -174t-169.5 -79h-10l-14 -14q51 -4 99 -19q25 -8 49 -8q27 0 45.5 8.5t42.5 32.5l17 -15q-35 -49 -68.5 -68.5t-81.5 -19.5q-34 0 -81 14q-37 11 -59 11 q-28 0 -64 -15zM439 502q0 28 -16.5 45t-42.5 17q-36 0 -65.5 -29.5t-46 -72.5t-25.5 -86t-9 -76q0 -31 16 -47.5t43 -16.5q37 0 66.5 30t46 74.5t25 87t8.5 74.5zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101 q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24c7;" horiz-adv-x="695" d="M528 141h-113l-68 179h-19l-21 -91l-10 -45q0 -14 40 -17v-26h-163v26q22 3 31 11.5t15 34.5l54 231q5 22 5 29q0 9 -7 12t-34 5v26h160q129 0 129 -95q0 -76 -98 -94l49 -129q7 -17 16 -23t34 -8v-26zM336 350h12q93 0 93 88q0 48 -47 48q-26 0 -32 -25zM695 335 q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24c8;" horiz-adv-x="695" d="M490 524l-22 -121h-15q-5 42 -15 58q-18 31 -65 31q-22 0 -34.5 -12.5t-12.5 -34.5q0 -21 12.5 -35t44.5 -35q50 -34 71.5 -61t21.5 -66q0 -53 -42 -83.5t-95 -30.5q-36 0 -75 13q-16 6 -26 6q-13 0 -21 -19h-20l18 133h17q5 -45 31 -73t66 -28q27 0 44 14.5t17 43.5 q0 22 -15 38.5t-52 41.5q-79 51 -79 112q0 49 35 78.5t84 29.5q34 0 60 -10q16 -6 23 -6q15 0 24 16h20zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5 q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24c9;" horiz-adv-x="695" d="M527 516l-19 -109h-20q-1 45 -19 61t-62 16l-58 -242q-13 -54 -13 -58q0 -17 51 -17v-26h-183v26q44 0 52 35l67 282q-45 -1 -70 -18t-46 -59h-17l22 109h315zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101 q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24ca;" horiz-adv-x="695" d="M547 516v-26q-24 -5 -32 -15t-19 -58l-31 -126q-21 -84 -52.5 -120.5t-103.5 -36.5q-55 0 -91.5 25.5t-36.5 72.5q0 20 6 45l35 145q10 40 10 52q0 8 -7.5 11t-33.5 5v26h166v-26q-16 0 -25 -5t-12 -11t-6 -18l-40 -163q-12 -46 -12 -66q0 -50 66 -50q28 0 47 9.5t31 31 t17.5 38t13.5 48.5l27 113q8 37 8 49q-2 24 -44 24v26h119zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214 t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24cb;" horiz-adv-x="695" d="M527 517v-26q-23 -4 -33 -20l-203 -330h-17l-52 277q-10 50 -18 61.5t-34 11.5v26h164v-26q-26 -2 -33 -4t-7 -9q0 -3 0.5 -10t0.5 -8l35 -200l93 154q32 52 32 64q0 11 -36 13v26h108zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5 q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24cc;" horiz-adv-x="695" d="M566 517v-26q-18 -3 -25.5 -9.5t-16.5 -28.5l-132 -312h-14l-38 258l-107 -258h-14l-49 308q-4 24 -10 30.5t-30 11.5v26h140v-26q-29 -4 -29 -17q0 -7 3 -28l23 -163l66 162q-1 26 -8 34.5t-29 11.5v26h135v-26q-18 -1 -24 -5t-6 -13q0 -7 5 -42l21 -148l68 168 q7 16 7 23q0 10 -5.5 12.5t-26.5 4.5v26h96zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88 q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24cd;" horiz-adv-x="695" d="M527 516v-26q-15 -2 -25 -8.5t-25 -23.5l-95 -110l41 -122q11 -33 22 -44t39 -15v-26h-160v26q34 4 34 14q0 17 -22 75l-11 28l-61 -77q-15 -19 -15 -24q0 -12 33 -16v-26h-112v26q19 4 33.5 18t52.5 60l59 71l-45 142q-6 18 -15 23.5t-34 8.5v26h159v-26l-16 -2 q-22 -3 -22 -11q0 -7 4 -19l25 -77l45 53q34 40 34 47q0 5 -29 9v26h106zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214 q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24ce;" horiz-adv-x="695" d="M527 517v-26q-18 -2 -29 -10.5t-25 -26.5l-107 -143l-28 -103q-5 -17 -5 -24q0 -17 49 -17v-26h-197v26q31 3 43 10t17 28l28 110l-57 146q-11 30 -46 30v26h175v-26q-14 -1 -20.5 -1.5t-12 -2t-7 -3.5t-1.5 -6q0 -14 19 -60l30 -74l71 98q16 23 16 32t-8.5 12t-32.5 5 v26h128zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24cf;" horiz-adv-x="695" d="M527 490l-244 -317h36q79 0 119 26q35 21 58 60h22l-37 -118h-312v26l244 317h-40q-50 0 -82.5 -16.5t-66.5 -60.5h-21l36 109h288v-26zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338 q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24d0;" horiz-adv-x="695" d="M485 290l22 -12q-59 -80 -109 -80q-41 0 -41 45q0 8 1 14q-45 -59 -98 -59q-33 0 -51.5 22t-18.5 58q0 66 54 125t117 59q38 0 50 -36h2l11 31l73 3l-49 -142q-16 -44 -16 -56q0 -8 6 -8q15 0 47 36zM395 405q0 17 -24 17q-38 0 -69.5 -55.5t-31.5 -90.5q0 -21 28 -21 q38 0 67.5 56.5t29.5 93.5zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5 z" />
+<glyph unicode="&#x24d1;" horiz-adv-x="695" d="M386 524l-52 -169q38 43 86 43q30 0 50 -22t20 -55q0 -75 -60.5 -131t-138.5 -56q-32 0 -57.5 11t-26.5 28q0 3 12 44l55 174q21 69 21 80t-28 11h-13v26q72 6 132 16zM410 318q0 32 -26 32q-36 0 -57 -41q-19 -38 -37 -96q-8 -24 -8 -41q0 -9 19 -9q45 0 77 54.5 t32 100.5zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24d2;" horiz-adv-x="695" d="M433 291l20 -12q-43 -48 -66.5 -64.5t-64.5 -16.5q-46 0 -73.5 23.5t-27.5 65.5q0 68 55.5 121.5t123.5 53.5q29 0 50 -15.5t21 -39.5q0 -19 -11 -31t-29 -12q-16 0 -25.5 10t-9.5 25q0 14 13 30q-1 3 -16 3q-36 0 -64 -52t-28 -90q0 -46 51 -46q42 0 81 47zM695 335 q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24d3;" horiz-adv-x="695" d="M519 524l-88 -294l-11 -42l6 -3q17 0 42 36l19 -10q-54 -77 -98 -77q-18 0 -30.5 11t-13.5 29q0 14 4 27q-45 -67 -100 -67q-31 0 -50.5 19t-19.5 55q0 63 52 126.5t114 63.5q27 0 48 -18l21 67q6 18 6 25q0 10 -26 10h-15v26q83 5 140 16zM384 344q0 19 -24 19 q-39 0 -70 -54.5t-31 -94.5q0 -13 7.5 -21t18.5 -8q30 0 53 36q16 25 31 65.5t15 57.5zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89 t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24d4;" horiz-adv-x="695" d="M431 297l22 -13q-57 -86 -134 -86q-44 0 -68 22.5t-24 65.5q0 70 53 123t125 53q32 0 52 -16t20 -40q0 -28 -14.5 -47.5t-43.5 -31t-51 -17t-58 -11.5q-3 -5 -3 -16q0 -32 44 -32q42 0 80 46zM412 412q0 14 -19 14q-45 0 -75 -91q42 10 68 30.5t26 46.5zM695 335 q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24d5;" horiz-adv-x="695" d="M291 435h44q18 60 47 92.5t84 32.5q28 0 46.5 -13t18.5 -34q0 -13 -9.5 -23t-23.5 -10q-13 0 -22.5 9.5t-9.5 22.5q0 12 8 20q-5 2 -9 2q-31 0 -51 -69l-9 -30h55l-8 -33h-52q-37 -158 -50 -194q-40 -113 -119 -113q-26 0 -45.5 13.5t-19.5 34.5q0 14 10.5 22.5t23.5 8.5 q12 0 21.5 -9t9.5 -22q0 -15 -9 -20q5 -1 10 -1q18 0 28 19t23 73l45 188h-44zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89 t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24d6;" horiz-adv-x="695" d="M523 460h-43q3 -12 3 -19q0 -50 -45 -78t-99 -28q-6 0 -18.5 2t-16.5 2q-18 0 -18 -13q0 -10 37 -17q77 -14 107 -34.5t30 -50.5q0 -39 -43 -64.5t-116 -25.5q-130 0 -130 65q0 52 62 64q-17 12 -17 36q0 18 10.5 30t37.5 23q-41 20 -41 62q0 48 41.5 79t104.5 31 q44 0 77 -20h77v-44zM402 466q0 26 -31 26q-33 0 -50 -32t-17 -65q0 -29 29 -29q30 0 49.5 33.5t19.5 66.5zM386 199q0 13 -20 22.5t-50 16t-33 7.5q-13 -1 -33 -15.5t-20 -25.5q0 -16 22 -27t55 -11q35 0 57 10t22 23zM695 335q0 -150 -100 -252t-246 -102 q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24d7;" horiz-adv-x="695" d="M492 226l18 -11q-34 -47 -56.5 -64t-49.5 -17q-19 0 -31.5 11.5t-12.5 30.5t7 39l37 103q7 20 7 25q0 4 -12 4q-23 0 -60 -48q-23 -30 -37 -60t-37 -100h-79l90 302q7 26 7 29q0 11 -27 11h-15v27q64 4 133 16l-63 -220q45 56 70 74.5t56 18.5q49 0 49 -46q0 -16 -6 -34 l-35 -98q-10 -25 -10 -28q0 -7 9 -7q15 0 48 42zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88 q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24d8;" horiz-adv-x="695" d="M427 474q0 -17 -12 -29.5t-29 -12.5q-18 0 -31 13t-13 30q0 18 11.5 30t30.5 12q18 0 30.5 -12.5t12.5 -30.5zM405 226l18 -10q-33 -47 -57 -64.5t-53 -17.5q-41 0 -42 40q0 14 9 42l32 109q4 13 4 24q0 8 -29 8h-10v27q84 6 130 15l-56 -186q-5 -15 -5 -21q0 -7 9 -7 q13 0 39 29zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24d9;" horiz-adv-x="695" d="M483 520q0 -17 -12 -29.5t-28 -12.5q-18 0 -31.5 13t-13.5 30t12.5 29.5t29.5 12.5q18 0 30.5 -13t12.5 -30zM464 450l-67 -236q-18 -63 -47 -91t-75 -28q-29 0 -49 12t-20 32q0 35 32 35q13 0 23 -9t10 -22q0 -10 -8 -18q7 -2 13 -2q25 0 43 65l49 178q6 20 6 32 q0 11 -24 11h-15v26q86 7 129 15zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5 t85 216.5z" />
+<glyph unicode="&#x24da;" horiz-adv-x="695" d="M507 390v-27q-24 -2 -39.5 -9t-45.5 -30l-38 -29q18 -68 29 -89.5t23 -21.5q18 0 40 34l18 -8q-41 -76 -90 -76q-29 0 -46.5 25t-35.5 94l-20 -12l-30 -103h-80l92 309q3 9 3 17v4q0 12 -18 12h-23v27q67 3 134 17l-72 -245q100 67 100 79q0 4 -33 5v27h132zM695 335 q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24db;" horiz-adv-x="695" d="M434 524l-86 -287q-1 -5 -5 -16t-6.5 -19t-2.5 -11q0 -7 10 -7q19 0 50 41l18 -10q-36 -48 -57.5 -64.5t-50.5 -16.5q-19 0 -32 11.5t-13 28.5q0 16 20 84l43 138q20 63 20 75q0 11 -28 11q-8 0 -14 -1v28q60 4 134 15zM695 335q0 -150 -100 -252t-246 -102 q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24dc;" horiz-adv-x="695" d="M588 287l19 -9q-49 -80 -107 -80q-19 0 -30.5 11t-11.5 32t8 42l34 91q7 19 7 32q0 5 -14 5q-30 0 -71 -59q-17 -26 -27 -49t-36 -100h-80l51 142q18 51 18 60q0 6 -11 6q-17 0 -41 -24q-28 -28 -47.5 -67.5t-44.5 -116.5h-77l42 132q21 64 21 78q0 8 -24 8h-13v27 q83 5 130 14l-37 -102q40 53 60 69q38 33 74 33q43 0 43 -42q0 -15 -8 -41q25 38 56.5 60.5t63.5 22.5q23 0 35 -12t12 -31q0 -27 -13 -61l-25 -69q-11 -33 -11 -37q0 -5 11 -5q13 0 44 40zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5 q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24dd;" horiz-adv-x="695" d="M493 287l20 -9q-53 -80 -107 -80q-43 0 -43 40q0 19 6 37l37 101q9 24 9 28q0 7 -19 7q-17 0 -43 -26q-54 -59 -90 -182h-77l55 180q8 29 8 31q0 6 -37 7v27q60 2 129 14l-37 -103q51 62 73 80q28 23 65 23q48 0 48 -47q0 -16 -7 -36l-30 -83q-15 -41 -15 -46q0 -3 9 -3 q17 0 46 40zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24de;" horiz-adv-x="695" d="M490 375q0 -71 -53 -124t-124 -53q-48 0 -79 23t-31 64q0 76 53 126.5t126 50.5q50 0 79 -23.5t29 -63.5zM410 405q0 29 -30 29q-45 0 -71 -60.5t-26 -114.5q0 -33 32 -33q31 0 54 36.5t32 76t9 66.5zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5 q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24df;" horiz-adv-x="695" d="M380 524l-22 -59q46 59 98 59q36 0 56 -20.5t20 -57.5q0 -81 -55 -139.5t-125 -58.5q-24 0 -44 13l-19 -63q-2 -8 -2 -17q0 -7 8.5 -9t35.5 -3v-28h-167v28q24 0 32.5 7.5t16.5 36.5l59 210q13 42 13 51q0 6 -37 7v28q3 0 47 5zM447 446q0 25 -25 25q-54 0 -84 -97 q-22 -69 -22 -80q0 -5 7.5 -9.5t17.5 -4.5q32 0 58 34.5t37 71.5t11 60zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214 q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24e0;" horiz-adv-x="695" d="M502 517l-81 -264q-21 -71 -21 -74q0 -10 44 -10v-28h-179v28q31 0 42 6.5t18 27.5l31 99q-35 -54 -93 -54q-34 0 -53 21.5t-19 58.5q0 67 58 131.5t118 64.5q27 0 37 -12q9 -10 14 -31l10 36h74zM403 466q0 21 -23 21q-41 0 -72.5 -59t-31.5 -99q0 -28 26 -28 q41 0 71 60.5t30 104.5zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z " />
+<glyph unicode="&#x24e1;" horiz-adv-x="695" d="M379 462l-33 -92q33 52 54.5 71.5t45.5 19.5q20 0 33 -13t13 -34q0 -19 -12 -32.5t-29 -13.5t-29.5 10t-15.5 10q-18 0 -44 -39q-18 -29 -43 -92l-23 -59h-84l62 185q5 14 5 26q0 9 -16 9h-24v28q70 3 140 16zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5 t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24e2;" horiz-adv-x="695" d="M467 462l-15 -98h-18q-18 61 -64 61q-35 0 -35 -14q0 -13 41 -49q6 -6 22 -19.5t20 -18.5l12 -14q8 -9 10.5 -17.5t2.5 -19.5q0 -35 -31.5 -55t-75.5 -20q-29 0 -50 6q-15 5 -21 5q-15 0 -20 -11h-20l14 104h19q6 -33 26 -50t47 -17q37 0 37 18q0 13 -41 48 q-40 33 -52 48.5t-12 39.5q0 35 27.5 54t69.5 19q20 0 39 -6q12 -4 27 -4q12 0 19 10h22zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89 t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24e3;" horiz-adv-x="695" d="M448 388h-67l-34 -117q-15 -53 -15 -69q0 -13 8 -13q21 0 57 47l21 -13q-45 -61 -61.5 -75t-48.5 -14q-51 0 -51 54q0 12 17 71l37 129h-31v41q45 12 71 32.5t58 62.5h12l-27 -92h54v-44zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5 q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24e4;" horiz-adv-x="695" d="M481 291l25 -12q-59 -81 -114 -81q-42 0 -42 44q0 18 5 35q-42 -49 -62.5 -64t-48.5 -15q-56 0 -56 52q0 25 7 44l29 85q8 24 8 31q0 6 -40 7v28q35 1 142 17l-61 -169q-10 -26 -10 -32q0 -7 14 -7q21 0 45 26q31 32 49 65.5t41 109.5h79l-53 -149q-13 -39 -13 -44 q0 -8 10 -8q16 0 46 37zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z " />
+<glyph unicode="&#x24e5;" horiz-adv-x="695" d="M424 379l-14 14q-16 16 -16 33q0 16 10 26t25 10q19 0 32 -12.5t13 -29.5q0 -35 -37 -84q-25 -33 -54 -59.5t-94 -78.5h-16q4 38 4 57q0 135 -23 159q-4 7 -32 7v27q61 6 98 14q23 -57 27 -177q45 44 61 63.5t16 30.5zM695 335q0 -150 -100 -252t-246 -102 q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24e6;" horiz-adv-x="695" d="M391 462l26 -177q73 73 73 93q0 4 -13 16q-15 14 -15 31q0 18 11 27.5t27 9.5q17 0 29.5 -11t12.5 -28q0 -72 -173 -225h-17l-19 152l-25 -39q-39 -60 -44 -66l-37 -47h-20q2 20 2 55q0 49 -9 103.5t-20 61.5q-4 3 -27 3v27q34 4 99 14q23 -67 27 -146l97 146h15z M695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24e7;" horiz-adv-x="695" d="M235 450l104 12q19 -22 34 -77q36 47 56.5 62t43.5 15q15 0 27 -11.5t12 -27.5q0 -14 -11 -23.5t-26 -9.5q-5 0 -16 5t-20 5q-24 0 -56 -47l22 -79q6 -22 24 -22q10 0 18 5.5t24 23.5l19 -9q-59 -74 -101 -74q-24 0 -38 18.5t-27 66.5l-19 -29q-22 -34 -38.5 -45 t-39.5 -11q-19 0 -30 10.5t-11 27.5q0 15 9.5 26t24.5 11q10 0 21 -6.5t19 -6.5q16 0 30 20l25 36l-20 76q-8 31 -36 31q-11 0 -24 -1v28zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338 q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24e8;" horiz-adv-x="695" d="M400 363l8 -41q54 89 54 112q0 4 -20 16q-17 12 -17 36q0 14 10.5 26t28.5 12q17 0 29 -13t12 -30q0 -48 -47.5 -133.5t-110.5 -151.5q-58 -63 -118 -63q-18 0 -30.5 12t-12.5 29q0 15 10 27t25 12q20 0 36 -13q11 -9 26 -9q22 0 43 26q18 21 18 36q0 23 -38 163 q-14 50 -29 61q-7 5 -29 5v27q50 3 101 15q34 -70 51 -161zM695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214 t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24e9;" horiz-adv-x="695" d="M488 446l-179 -182q34 -17 52 -37q4 -4 12 -17.5t16 -22t19 -8.5q13 0 15 5q-15 10 -15 27q0 14 11.5 24t26.5 10q14 0 25 -10.5t11 -26.5q0 -29 -21 -43t-55 -14q-35 0 -89 30q-31 17 -51 17q-16 0 -33 -15l-25 17l188 194h-81q-38 0 -50 -33h-20l31 101h212v-16z M695 335q0 -150 -100 -252t-246 -102q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x24ea;" horiz-adv-x="695" d="M497 384q0 -92 -53.5 -171t-133.5 -79q-51 0 -81 36t-30 95q0 60 22 118.5t67.5 99.5t102.5 41q47 0 76.5 -38.5t29.5 -101.5zM423 459q0 37 -33 37t-62 -71.5t-42 -139t-13 -89.5q0 -16 9 -25t23 -9q32 0 60.5 62t43 130t14.5 105zM695 335q0 -150 -100 -252t-246 -102 q-149 0 -249 102.5t-100 254.5q0 150 101.5 251t252.5 101q143 0 242 -103t99 -252zM643 338q0 127 -85.5 213.5t-213.5 86.5q-121 0 -206.5 -89t-85.5 -214q0 -126 86 -214t210 -88q125 0 210 88.5t85 216.5z" />
+<glyph unicode="&#x2500;" horiz-adv-x="708" d="M719 267h-730v73h730v-73z" />
+<glyph unicode="&#x2502;" horiz-adv-x="696" d="M385 -303h-73v1213h73v-1213z" />
+<glyph unicode="&#x250c;" horiz-adv-x="708" d="M720 267h-329v-570h-73v643h402v-73z" />
+<glyph unicode="&#x2510;" horiz-adv-x="708" d="M390 -303h-73v570h-328v73h401v-643z" />
+<glyph unicode="&#x2514;" horiz-adv-x="708" d="M720 267h-402v643h73v-570h329v-73z" />
+<glyph unicode="&#x2518;" horiz-adv-x="708" d="M390 267h-401v73h328v570l73 -1v-642z" />
+<glyph unicode="&#x251c;" horiz-adv-x="708" d="M720 267h-329v-570h-73v1213h73v-570h329v-73z" />
+<glyph unicode="&#x2524;" horiz-adv-x="708" d="M390 -303h-73v570h-328v73h328v570h73v-1213z" />
+<glyph unicode="&#x252c;" horiz-adv-x="708" d="M719 267h-329v-570h-73v570h-328v73h730v-73z" />
+<glyph unicode="&#x2534;" horiz-adv-x="708" d="M719 267h-730v73h328v570h73v-570h329v-73z" />
+<glyph unicode="&#x253c;" horiz-adv-x="708" d="M719 267h-329v-570h-73v570h-328v73h328v570h73v-570h329v-73z" />
+<glyph unicode="&#x2550;" horiz-adv-x="708" d="M719 174h-730v73h730v-73zM719 360h-730v73h730v-73z" />
+<glyph unicode="&#x2551;" horiz-adv-x="708" d="M298 -303h-73v1213h73v-1213zM484 -303h-74v1213h74v-1213z" />
+<glyph unicode="&#x2552;" horiz-adv-x="708" d="M720 174h-329v-477h-73v736h402v-73h-329v-113h329v-73z" />
+<glyph unicode="&#x2553;" horiz-adv-x="708" d="M720 267h-236v-570h-74v562h-112v-562h-73v643h495v-73z" />
+<glyph unicode="&#x2554;" horiz-adv-x="708" d="M719 360h-421v-663h-73v736h494v-73zM719 174h-235v-477h-74v550h309v-73z" />
+<glyph unicode="&#x2555;" horiz-adv-x="708" d="M390 -303h-73v477h-328v73h328v113h-328v73h401v-736z" />
+<glyph unicode="&#x2556;" horiz-adv-x="708" d="M483 -303h-73v570h-112v-570h-74v570h-235v73h494v-643z" />
+<glyph unicode="&#x2557;" horiz-adv-x="708" d="M483 -303h-73v663h-421v73h494v-736zM298 -303h-74v477h-235v73h309v-550z" />
+<glyph unicode="&#x2558;" horiz-adv-x="708" d="M720 174h-402v736h73v-477h329v-73h-329v-113h329v-73z" />
+<glyph unicode="&#x2559;" horiz-adv-x="708" d="M720 267h-495v643h73v-570h112v570h74v-570h236v-73z" />
+<glyph unicode="&#x255a;" horiz-adv-x="708" d="M719 360h-309v550h74v-477h235v-73zM719 174h-494v736h73v-663h421v-73z" />
+<glyph unicode="&#x255b;" horiz-adv-x="708" d="M390 174h-401v73h328v113h-328v73h328v477h73v-736z" />
+<glyph unicode="&#x255c;" horiz-adv-x="708" d="M483 267h-494v73h235v570h74v-570h112v570h73v-643z" />
+<glyph unicode="&#x255d;" horiz-adv-x="708" d="M298 360h-309v73h235v477h74v-550zM483 174h-494v73h421v663h73v-736z" />
+<glyph unicode="&#x255e;" horiz-adv-x="708" d="M720 174h-329v-477h-73v1213h73v-477h329v-73h-329v-113h329v-73z" />
+<glyph unicode="&#x255f;" horiz-adv-x="708" d="M298 -303h-73v1213h73v-1213zM720 267h-236v-570h-74v1213h74v-570h236v-73z" />
+<glyph unicode="&#x2560;" horiz-adv-x="708" d="M298 -303h-73v1213h73v-1213zM720 360h-310v550h74v-477h236v-73zM720 174h-236v-477h-74v550h310v-73z" />
+<glyph unicode="&#x2561;" horiz-adv-x="708" d="M390 -303h-73v477h-328v73h328v113h-328v73h328v477h73v-1213z" />
+<glyph unicode="&#x2562;" horiz-adv-x="708" d="M483 -303h-73v1213h73v-1213zM298 -303h-74v570h-235v73h235v570h74v-1213z" />
+<glyph unicode="&#x2563;" horiz-adv-x="708" d="M483 -303h-73v1213h73v-1213zM298 360h-309v73h235v477h74v-550zM298 -303h-74v477h-235v73h309v-550z" />
+<glyph unicode="&#x2564;" horiz-adv-x="708" d="M719 360h-730v73h730v-73zM719 174h-329v-477h-73v477h-328v73h730v-73z" />
+<glyph unicode="&#x2565;" horiz-adv-x="708" d="M719 267h-236v-570h-73v562h-112v-562h-74v570h-235v73h730v-73z" />
+<glyph unicode="&#x2566;" horiz-adv-x="708" d="M719 360h-730v73h730v-73zM719 174h-236v-477h-73v550h309v-73zM298 -303h-74v477h-235v73h309v-550z" />
+<glyph unicode="&#x2567;" horiz-adv-x="708" d="M719 174h-730v73h730v-73zM719 360h-730v73h328v477h73v-477h329v-73z" />
+<glyph unicode="&#x2568;" horiz-adv-x="708" d="M719 267h-730v73h235v570h74v-570h112v570h73v-570h236v-73z" />
+<glyph unicode="&#x2569;" horiz-adv-x="708" d="M719 174h-730v73h730v-73zM719 360h-309v550h73v-477h236v-73zM298 360h-309v73h235v477h74v-550z" />
+<glyph unicode="&#x256a;" horiz-adv-x="708" d="M719 174h-329v-477h-73v477h-328v73h328v113h-328v73h328v477h73v-477h329v-73h-329v-113h329v-73z" />
+<glyph unicode="&#x256b;" horiz-adv-x="708" d="M719 267h-236v-570h-73v570h-112v-570h-74v570h-235v73h235v570h74v-570h112v570h73v-570h236v-73z" />
+<glyph unicode="&#x256c;" horiz-adv-x="708" d="M719 360h-309v550h74v-477h235v-73zM298 360h-309v73h235v477h74v-550zM719 174h-235v-477h-74v550h309v-73zM298 -303h-74v477h-235v73h309v-550z" />
+<glyph unicode="&#x1d468;" horiz-adv-x="759" d="M724 23l-2 -23h-319l4 23h31q51 0 51 45q0 22 -2 34l-15 108h-159l-80 -139q-6 -12 -6 -22q0 -26 22 -26h56l-6 -23h-260l4 23q37 4 60.5 19t47.5 56l346 587h49l94 -624q6 -38 47 -38h37zM466 256l-23 178l-103 -178h126z" />
+<glyph unicode="&#x1d469;" horiz-adv-x="726" d="M197 669h265q41 0 74.5 -3t68 -13t57.5 -26t38 -44t15 -66q0 -100 -100 -147q-27 -13 -64 -24q49 -9 89.5 -45.5t40.5 -87.5q0 -99 -73.5 -156t-225.5 -57h-340l4 23h40q42 0 58.5 14.5t24.5 47.5l116 502q2 8 2 22q-2 20 -13 28.5t-43 8.5h-37zM440 624l-58 -251 q12 -2 32 -2q24 0 40 4q54 12 81.5 52t27.5 98q0 22 -4.5 42t-22.5 38.5t-47 18.5h-49zM373 324l-64 -274q24 -5 52 -5q68 0 116.5 49t48.5 127q0 103 -122 103h-31z" />
+<glyph unicode="&#x1d46a;" horiz-adv-x="701" d="M745 685l-54 -234h-23q2 20 2 30q0 66 -40 111.5t-121 45.5q-87 0 -156.5 -58t-104.5 -142.5t-35 -174.5q0 -93 43.5 -155.5t129.5 -62.5q168 0 245 114l22 -15q-31 -50 -93 -96q-82 -60 -202 -60q-150 0 -226.5 78t-76.5 210q0 79 33 156.5t95 135.5q125 117 311 117 q33 0 93 -14t79 -14q40 0 57 28h22z" />
+<glyph unicode="&#x1d46b;" horiz-adv-x="818" d="M197 669h289q151 0 227.5 -78.5t76.5 -196.5q0 -76 -29.5 -150t-86.5 -129q-117 -115 -309 -115h-323l4 23h37q42 0 60 14t25 46l116 504q3 12 3 23q0 36 -57 36h-37zM440 624l-117 -508q-7 -28 -7 -32q1 -17 14.5 -26.5t27.5 -11t36 -1.5q65 0 113.5 32.5t75 86 t39.5 111t13 117.5q0 38 -6 75t-20.5 74t-43.5 60t-70 23h-55z" />
+<glyph unicode="&#x1d46c;" horiz-adv-x="732" d="M754 669l-40 -168h-23q3 17 3 38q0 34 -22.5 54t-46.5 25.5t-52 5.5h-135l-55 -239h55q34 0 57 5t46.5 27.5t33.5 62.5h22l-54 -251h-23q6 24 6 65q0 46 -85 46h-69l-58 -258q-2 -12 -2 -17q0 -20 42 -20h65q111 0 171 36.5t91 124.5h22l-61 -206h-600l4 23h36 q42 0 60 14.5t25 46.5l115 504q2 12 2 16q0 42 -59 42h-37l4 23h562z" />
+<glyph unicode="&#x1d46d;" horiz-adv-x="635" d="M750 669l-42 -168h-23q3 17 3 41q0 82 -123 82h-124l-56 -248h59q25 0 43.5 3t39 12t34.5 29.5t21 51.5h24l-57 -253h-23q7 37 7 66q0 46 -84 46h-75l-58 -249q-4 -12 -4 -24q0 -35 60 -35h52l-3 -23h-377l4 23h36q43 0 60.5 14.5t24.5 46.5l116 504q3 12 3 23 q0 35 -60 35h-37l4 23h555z" />
+<glyph unicode="&#x1d46e;" horiz-adv-x="768" d="M768 342l-5 -23h-24q-43 0 -61.5 -14t-27.5 -47l-59 -218q-108 -52 -234 -52q-147 0 -224.5 83.5t-77.5 206.5q0 77 31 151.5t90 131.5q127 124 334 124q46 0 90.5 -16.5t71.5 -16.5q13 0 33 8.5t24 24.5h23l-53 -224h-23q6 21 6 40q0 58 -47 98.5t-119 40.5 q-90 0 -161 -61.5t-106.5 -151.5t-35.5 -185q0 -35 7 -68.5t23 -66.5t48.5 -53.5t77.5 -20.5q47 0 78 20l57 208q4 12 4 24q-1 18 -12 26t-43 8h-35l5 23h345z" />
+<glyph unicode="&#x1d46f;" horiz-adv-x="891" d="M946 669l-5 -23h-37q-43 0 -60 -14t-24 -47l-114 -503q-6 -21 -6 -22v-3q1 -19 12.5 -26.5t45.5 -7.5h41l-5 -23h-349l4 23h23q43 0 61.5 14.5t25.5 46.5l57 251h-242l-59 -253q0 -3 -2 -10.5t-2 -12.5q2 -21 14 -28.5t46 -7.5h25l-5 -23h-349l4 23h36q43 0 61 14.5 t25 46.5l115 503q3 12 3 21q0 38 -57 38h-40l6 23h348l-3 -23h-25q-44 0 -61 -14t-24 -46l-46 -203h242l47 204q3 12 3 23q0 36 -60 36h-37l3 23h364z" />
+<glyph unicode="&#x1d470;" horiz-adv-x="502" d="M557 669l-4 -23h-38q-43 0 -60.5 -14.5t-24.5 -46.5l-116 -503q-1 -5 -1 -25q1 -18 13 -26t45 -8h37l-4 -23h-362l4 23h38q43 0 59 14t24 47l115 502q3 12 3 21q0 39 -57 39h-37l4 23h362z" />
+<glyph unicode="&#x1d471;" horiz-adv-x="558" d="M646 669l-3 -23h-37q-42 0 -61 -14.5t-26 -46.5l-96 -420q-22 -101 -95 -148q-43 -29 -118 -29q-59 0 -101.5 30t-42.5 71q0 31 20.5 54.5t64.5 23.5q31 0 56 -17.5t25 -40.5q0 -17 -13.5 -31.5t-13.5 -27.5q0 -18 19 -18q22 0 43 93l105 463q3 12 3 22q0 36 -56 36h-38 l3 23h362z" />
+<glyph unicode="&#x1d472;" horiz-adv-x="795" d="M839 669l-4 -23q-38 0 -65.5 -14.5t-69.5 -48.5l-248 -201l191 -284q33 -49 60 -62t75 -13l-4 -23h-328l4 23h29q29 0 29 22q0 18 -16 40l-138 208l-48 -211q-1 -5 -1 -21q1 -21 13 -29.5t45 -8.5h38l-5 -23h-354l5 23h30q44 0 59 14t23 47l115 503q4 16 4 23 q0 36 -58 36h-37l4 23h347l-6 -23h-27q-40 0 -56.5 -15.5t-24.5 -48.5l-40 -178h2l243 198q15 13 15 23q0 9 -8.5 15t-22.5 6h-24l4 23h250z" />
+<glyph unicode="&#x1d473;" horiz-adv-x="744" d="M700 199l-59 -199h-599l4 23h35q45 0 62 14t25 47l116 496q2 10 2 15q0 21 -15 36t-45 15h-36l4 23h360l-4 -23h-37q-38 0 -55.5 -16.5t-26.5 -53.5l-115 -492q-3 -15 -3 -16q1 -14 6 -18.5t15 -4.5h120q45 0 77.5 5.5t63.5 21.5t51 47.5t31 80.5z" />
+<glyph unicode="&#x1d474;" horiz-adv-x="1016" d="M1071 669l-3 -23h-34q-46 0 -63.5 -15.5t-25.5 -49.5l-115 -499q-3 -10 -3 -20q0 -39 59 -39h39l-4 -23h-362l4 23h35q44 0 60.5 14.5t24.5 46.5l82 354h-1l-283 -438h-56l-90 441l-80 -348q-3 -15 -3 -40q2 -17 12.5 -23.5t42.5 -6.5h38l-3 -23h-300l4 23h36 q43 0 61.5 17.5t26.5 54.5l111 486q4 12 4 33q0 17 -13.5 24.5t-44.5 7.5h-39l4 23h246l91 -468l297 468h245z" />
+<glyph unicode="&#x1d475;" horiz-adv-x="869" d="M924 669l-3 -23h-38q-43 0 -61.5 -15t-25.5 -49l-131 -582h-57l-263 491l-92 -409q-2 -12 -2 -18v-8q1 -18 12.5 -25.5t44.5 -7.5h39l-4 -23h-301l4 23h36q43 0 60.5 14.5t24.5 46.5l117 510q-21 52 -71 52h-38l3 23h232l222 -435l80 350q2 7 2 20q0 42 -57 42h-37l4 23 h300z" />
+<glyph unicode="&#x1d476;" horiz-adv-x="777" d="M755 432q0 -117 -58 -220.5t-157.5 -165.5t-213.5 -62q-128 0 -199.5 75t-71.5 188q0 107 51 206t151.5 165.5t225.5 66.5q127 0 199.5 -74.5t72.5 -178.5zM601 467q0 73 -32 122t-97 49t-118 -46.5t-83 -116t-45.5 -140t-15.5 -128.5q0 -75 31.5 -125.5t94.5 -50.5 q60 0 112 45.5t84 114t50.5 142t18.5 134.5z" />
+<glyph unicode="&#x1d477;" horiz-adv-x="612" d="M198 669h284q128 0 189.5 -38t61.5 -125q0 -83 -74 -144.5t-223 -61.5q-46 0 -67 3l-51 -221q-4 -20 -4 -24q2 -21 13.5 -28t46.5 -7h52l-4 -23h-380l4 23h40q43 0 60.5 14.5t24.5 46.5l115 504q3 12 3 21q-1 19 -14 28t-46 9h-37zM441 623l-61 -273q22 -5 40 -5 q69 0 113 49t44 127q0 44 -26 73.5t-80 29.5q-21 0 -30 -1z" />
+<glyph unicode="&#x1d478;" horiz-adv-x="810" d="M97 -112l159 101q-88 14 -144.5 82t-56.5 160q0 82 30 163t84 146t136 105t178 40q119 0 195 -70.5t77 -183.5q2 -175 -117 -305t-303 -144l-52 -30q8 1 23 1q35 0 119.5 -17t126.5 -17q86 0 145 68l17 -13q-100 -128 -258 -128q-67 0 -146 17q-118 26 -129 26 q-28 0 -72 -21zM601 479q0 78 -41 118.5t-88 40.5q-53 0 -98 -31.5t-74.5 -81t-50.5 -110.5t-30 -119.5t-9 -109.5q0 -56 30.5 -106t84.5 -50q65 0 119.5 45.5t87.5 115t51 145.5t18 143z" />
+<glyph unicode="&#x1d479;" horiz-adv-x="801" d="M784 23l-4 -23h-223l-154 317q-2 0 -5 0.5t-11 1t-19 0.5l-55 -237q-2 -10 -2 -22q2 -21 12.5 -29t43.5 -8h39l-4 -23h-360l4 23h36q45 0 60.5 14t23.5 47l114 500q4 20 4 27q0 35 -59 35h-37l4 23h284q122 0 178.5 -43.5t56.5 -111.5q0 -61 -46 -108.5t-126 -67.5 l115 -231q20 -41 48.5 -62.5t81.5 -21.5zM379 364h40q72 0 105.5 39.5t33.5 102.5q0 97 -72 114q-21 4 -34 4h-16z" />
+<glyph unicode="&#x1d47a;" horiz-adv-x="671" d="M704 682l-50 -219h-23q0 33 -1 50q-2 51 -50.5 88t-118.5 37q-35 0 -67.5 -21t-32.5 -63q0 -35 18 -66.5t38 -49.5t57 -46q126 -96 126 -210q0 -74 -70.5 -133t-186.5 -59q-79 0 -157 32q-27 9 -41 9q-15 0 -35 -9.5t-33 -29.5h-22l59 245h24v-35q0 -68 48 -115.5 t132 -47.5q67 0 101 33.5t34 85.5q0 70 -43 113q-16 16 -56 48t-66 56t-49 62.5t-23 78.5q0 73 60 121t177 48q52 0 111 -20t68 -20q15 0 30.5 10.5t19.5 26.5h22z" />
+<glyph unicode="&#x1d47b;" horiz-adv-x="568" d="M700 669l-44 -187h-24q7 21 7 54q0 88 -111 88h-78l-123 -541q-4 -24 -4 -25q1 -19 12.5 -27t44.5 -8h42l-3 -23h-368l4 23h40q43 0 60.5 14.5t24.5 46.5l124 540h-75q-74 0 -119 -37.5t-60 -104.5h-22l43 187h629z" />
+<glyph unicode="&#x1d47c;" horiz-adv-x="733" d="M810 669l-4 -23h-38q-44 0 -61.5 -13.5t-24.5 -46.5l-80 -359q-12 -51 -31 -92q-67 -145 -249 -145q-119 0 -179.5 57.5t-60.5 136.5q0 28 15 95l70 307q2 8 2 15q0 45 -60 45h-37l4 23h363l-4 -23h-39q-45 0 -60 -13t-23 -47l-83 -363q-7 -30 -7 -67q0 -45 34 -77.5 t93 -32.5q128 0 170 187l79 355q2 5 2 24q-1 19 -13 26.5t-44 7.5h-37l4 23h299z" />
+<glyph unicode="&#x1d47d;" horiz-adv-x="593" d="M797 669l-4 -23q-46 0 -75.5 -21t-56.5 -57l-431 -583h-52l-20 573q0 14 -1 20q-2 33 -14.5 50.5t-51.5 17.5h-25l3 23h326l-4 -23h-36q-49 0 -49 -69v-8l8 -350l242 336q33 46 33 71q0 11 -7 15.5t-27 4.5h-37l3 23h276z" />
+<glyph unicode="&#x1d47e;" horiz-adv-x="925" d="M1129 669l-3 -23q-33 0 -62 -15.5t-42.5 -30.5t-32.5 -41l-425 -576h-53l-21 407l-260 -407h-53l-21 575q-2 51 -15 69.5t-55 18.5h-20l3 23h314l-4 -23h-22q-29 0 -42.5 -17t-12.5 -61l8 -331l182 278l-3 65q-4 66 -59 66h-24l4 23h318l-4 -23h-37q-52 0 -50 -78l5 -354 l242 331q34 47 34 79q0 13 -7 17.5t-28 4.5h-37l3 23h280z" />
+<glyph unicode="&#x1d47f;" horiz-adv-x="808" d="M830 669l-3 -23h-24q-15 0 -28.5 -3.5t-21.5 -6t-19.5 -13t-15 -14t-16.5 -19t-15 -18.5l-177 -212l98 -270q13 -35 26 -51t36 -16h36l-4 -23h-316l3 23h28q49 0 49 36q0 15 -5 27l-63 171l-154 -179q-8 -9 -8 -22q0 -14 10.5 -23.5t28.5 -9.5h42l-4 -23h-285l4 23 q84 10 142 77l198 229l-89 237q-29 80 -84 80h-27l4 23h318l-4 -23h-39q-34 0 -34 -27q0 -8 8 -32l53 -155l137 162q10 12 10 27q0 25 -28 25h-31l4 23h260z" />
+<glyph unicode="&#x1d480;" horiz-adv-x="549" d="M725 669l-3 -23q-40 0 -67.5 -19t-57.5 -57l-197 -252l-56 -236l-2 -10q-1 -10 -1 -17q0 -32 58 -32h39l-4 -23h-362l4 23h37q43 0 59.5 14.5t24.5 46.5l56 243l-92 238q-17 43 -41.5 62t-80.5 19l3 23h331l-4 -23h-35q-43 0 -43 -28q0 -15 15 -54l63 -172l150 191 q11 14 11 37q0 26 -51 26h-28l4 23h270z" />
+<glyph unicode="&#x1d481;" horiz-adv-x="797" d="M830 669l-548 -623h194q32 0 55.5 2t52 10.5t49 23t38.5 41t28 64.5h23l-44 -187h-612l555 624h-177q-42 0 -68 -3t-60.5 -13.5t-60.5 -36.5t-43 -68h-23l46 166h595z" />
+<glyph unicode="&#x1d482;" horiz-adv-x="581" d="M529 105l19 -12q-29 -51 -65 -77t-90 -26q-29 0 -48.5 17t-20.5 53h-6q-67 -70 -146 -70q-57 0 -92.5 30.5t-35.5 91.5q0 53 21 113.5t57 113.5t90 88t113 35q38 0 60 -19.5t24 -44.5h2l11 51h115l-74 -316q-6 -21 -6 -45q0 -31 16 -31q9 0 19 7.5t16.5 15t20.5 25.5z M382 324q0 98 -54 98q-35 0 -74.5 -44t-66.5 -114.5t-27 -138.5q0 -65 45 -65q53 0 115 91t62 173z" />
+<glyph unicode="&#x1d483;" horiz-adv-x="509" d="M263 429l7 -1q47 31 93 31q124 0 124 -163q0 -49 -19 -101.5t-52.5 -98t-86.5 -75t-115 -29.5q-88 0 -164 55l127 563q2 10 2 14q0 17 -14 17q-15 0 -43 -7l-4 23l198 28zM219 253l-47 -203q2 -11 14 -17t23 -6q46 0 85 47.5t58 109.5t19 115q0 49 -14.5 72.5t-34.5 23.5 q-21 0 -39 -15t-30.5 -39t-20.5 -45.5t-13 -42.5z" />
+<glyph unicode="&#x1d484;" horiz-adv-x="477" d="M412 114l18 -8q-92 -116 -224 -116q-86 0 -124 47.5t-38 114.5q0 50 20.5 104t57 100.5t93.5 76t123 29.5q53 0 87.5 -24t34.5 -58q0 -30 -20 -52t-58 -22q-29 0 -40.5 14t-11.5 29q0 20 11.5 32t11.5 21q0 20 -15 20q-49 0 -92 -49.5t-64.5 -110t-21.5 -107.5 q0 -64 28.5 -92t72.5 -28q78 0 151 79z" />
+<glyph unicode="&#x1d485;" horiz-adv-x="595" d="M589 685l-130 -565q-8 -35 -8 -41q0 -24 24 -24q18 0 53 47l19 -11q-16 -40 -59.5 -72.5t-99.5 -32.5q-30 0 -48 21.5t-18 47.5h-5q-67 -69 -141 -69q-65 0 -98.5 34t-33.5 92q0 56 18 115.5t51.5 112t88 86t120.5 33.5q53 0 85 -21l37 152q4 14 4 26q0 22 -17 22 q-12 0 -42 -7l-4 23zM385 346q0 34 -18 53.5t-42 19.5q-59 0 -112.5 -95t-53.5 -202q0 -34 14.5 -50.5t33.5 -16.5q40 0 88.5 56t68.5 127q21 69 21 108z" />
+<glyph unicode="&#x1d486;" horiz-adv-x="498" d="M412 114l19 -7q-46 -57 -97.5 -87t-131.5 -30q-84 0 -121 47.5t-37 110.5q0 34 6 59q30 122 113.5 188.5t172.5 66.5q123 0 123 -84q0 -56 -51.5 -101.5t-116.5 -68t-127 -27.5q-4 -10 -4 -23q0 -59 28.5 -91t73.5 -32q41 0 72.5 17t77.5 62zM358 386q0 20 -7.5 28 t-26.5 8q-48 0 -97 -69t-56 -132q63 9 125 61.5t62 103.5z" />
+<glyph unicode="&#x1d487;" horiz-adv-x="572" d="M249 449h52q17 0 26.5 13t22 49t21.5 55q23 49 65.5 84t101.5 35q46 0 70 -23t24 -54q0 -29 -15.5 -51t-44.5 -22q-57 0 -57 49q0 20 10 31t10 20q0 7 -10 7q-22 0 -40.5 -36t-29.5 -92l-13 -65h80l-12 -47h-79l-88 -387q-11 -50 -38 -104q-25 -48 -67 -83t-100 -35 q-46 0 -70 23t-24 54q0 29 15.5 51t44.5 22q30 0 43.5 -15.5t13.5 -37.5q0 -20 -10 -29t-10 -18q0 -7 10 -7q13 0 25 16t22 47t16 55t13.5 62t9.5 45l78 341h-79z" />
+<glyph unicode="&#x1d488;" horiz-adv-x="527" d="M527 435l-14 -60h-77q13 -19 13 -48q0 -60 -40.5 -108t-113.5 -56q-74 -7 -74 -49q0 -17 36 -30t79.5 -22t79.5 -35.5t36 -67.5q0 -60 -59 -111t-170 -51q-100 0 -150.5 35.5t-50.5 82.5q0 39 33 69t86 49q-22 18 -22 51q0 29 22.5 54.5t56.5 32.5q-47 15 -70 47.5 t-23 67.5q0 69 53.5 122.5t138.5 53.5q31 0 58.5 -10t39.5 -21zM334 361q0 61 -32 61q-30 0 -54.5 -46.5t-24.5 -100.5q0 -80 35 -80t55.5 55.5t20.5 110.5zM346 -81q0 34 -23 51.5t-67 26.5q-42 7 -77 17l-17 -13q-14 -11 -26 -33t-12 -43q0 -40 29.5 -66t87.5 -26 q52 0 78.5 24.5t26.5 61.5z" />
+<glyph unicode="&#x1d489;" horiz-adv-x="576" d="M523 105l20 -11q-61 -104 -153 -104q-23 0 -46 12.5t-23 33.5q0 15 7 46l54 223q3 15 3 42q0 37 -29 37q-40 0 -93 -92.5t-73 -182.5l-25 -109h-115l138 599q2 8 2 15q0 9 -2 12t-9 3t-44 -10l-5 28l188 38l-81 -354l2 -1q27 50 78.5 89.5t101.5 39.5q89 0 89 -83 q0 -28 -7 -56l-50 -213q-2 -8 -2 -21q0 -28 20 -28q18 0 54 47z" />
+<glyph unicode="&#x1d48a;" horiz-adv-x="357" d="M300 558q0 -24 -19 -43t-47 -19q-27 0 -46.5 19.5t-19.5 42.5q0 22 19.5 42t46.5 20q28 0 47 -19.5t19 -42.5zM255 104l19 -12q-57 -101 -152 -101q-67 0 -67 56q0 16 4 31l66 285q5 22 5 27q0 18 -20 18q-21 0 -37 -3l-4 23l197 34l-78 -331q-8 -30 -8 -48 q0 -10 6 -17.5t15 -7.5q5 0 10 2t8.5 4.5t9 8t8.5 9t9 11.5t9 11z" />
+<glyph unicode="&#x1d48b;" horiz-adv-x="431" d="M414 558q0 -24 -19 -43t-47 -19q-27 0 -46.5 19.5t-19.5 42.5q0 22 19.5 42t46.5 20q28 0 47 -19.5t19 -42.5zM384 462l-102 -447q-10 -43 -36 -96q-26 -50 -69 -88t-101 -38q-46 0 -70 23t-24 54q0 29 15.5 51t44.5 22q26 0 41.5 -16t15.5 -37q0 -20 -10.5 -30 t-10.5 -15q0 -9 10 -9q37 0 73 160l84 368q3 14 3 25q0 18 -20 18q-21 0 -37 -3l-4 23z" />
+<glyph unicode="&#x1d48c;" horiz-adv-x="580" d="M563 449l-6 -19q-34 -4 -58.5 -14t-38 -20t-35.5 -32l-95 -94l64 -149q25 -57 40 -57q32 0 51 67h25q0 -15 -11.5 -46t-41.5 -63.5t-67 -32.5q-18 0 -30.5 4t-23 15.5t-14.5 16.5t-13.5 24t-10.5 22l-64 124l-24 -22l-39 -173h-116l138 601q2 6 2 16q0 13 -11 13 q-4 0 -44 -9l-5 27l193 37l-97 -423l124 111q7 6 15.5 19.5t8.5 23.5q0 12 -17 12h-30l7 21h224z" />
+<glyph unicode="&#x1d48d;" horiz-adv-x="346" d="M310 685l-132 -574q-4 -15 -4 -31q2 -14 18 -14q24 0 52 37l19 -15q-22 -35 -64.5 -66t-88.5 -31q-25 0 -42.5 12t-17.5 34t6 47l118 515q2 12 2 16q0 15 -11 15q-10 0 -44 -10l-5 28z" />
+<glyph unicode="&#x1d48e;" horiz-adv-x="760" d="M708 106l19 -15q-58 -100 -157 -100q-22 0 -41 13t-20 35q0 17 11 66l46 202q9 42 9 60q0 22 -16 22q-25 0 -81 -98t-67 -151l-29 -140h-119l73 307q8 36 8 60q-2 21 -18 21q-25 0 -78 -96.5t-66 -151.5l-32 -140h-117l89 388q0 26 -12 26q-9 0 -45 -9l-5 28l197 34 l-27 -111h2q77 106 153 106q37 0 56.5 -26t20.5 -59q0 -9 -2 -19q28 33 45 50.5t48.5 35.5t62.5 18q37 0 56 -21.5t19 -55.5q0 -33 -8 -68l-41 -186q-8 -37 -8 -46q0 -24 23 -24q21 0 51 45z" />
+<glyph unicode="&#x1d48f;" horiz-adv-x="559" d="M506 105l20 -11q-61 -104 -153 -104q-68 0 -68 58q0 10 6 34l54 223q3 15 3 47q0 35 -29 35q-40 0 -93 -94t-73 -184l-25 -109h-115l88 384q2 8 2 15q0 9 -2 12t-9 3q-14 0 -47 -9l-5 28l195 34l-27 -111h4q25 47 71.5 76.5t98.5 29.5q89 0 89 -81q0 -33 -7 -61l-50 -213 q-3 -18 -3 -22q0 -27 21 -27q18 0 54 47z" />
+<glyph unicode="&#x1d490;" horiz-adv-x="561" d="M539 297q0 -136 -90.5 -221.5t-217.5 -85.5q-88 0 -137.5 48.5t-49.5 131.5q0 126 87.5 209t207.5 83q91 0 145.5 -43t54.5 -122zM423 300q0 64 -25 93t-64 29q-64 0 -119 -88t-55 -176q0 -71 21 -99.5t67 -28.5q68 0 121.5 86t53.5 184z" />
+<glyph unicode="&#x1d491;" horiz-adv-x="571" d="M294 429h5q36 33 91 33q68 0 116 -41t48 -130q0 -121 -85.5 -212t-187.5 -91q-59 0 -88 19l-25 -105q-4 -16 -4 -32q0 -54 41 -54h36l-7 -21h-267l7 21q38 5 52.5 26t24.5 63l103 440q5 25 5 39q0 32 -23 32q-10 0 -25 -4l-6 17l198 40zM244 241l-33 -154q1 -31 20 -45 t47 -14q55 0 108.5 85.5t53.5 175.5q0 67 -19.5 95t-57.5 28t-71 -50.5t-48 -120.5z" />
+<glyph unicode="&#x1d492;" horiz-adv-x="526" d="M532 449l-129 -561q-5 -18 -5 -27q1 -45 32 -45h34l-6 -21h-288l6 21h36q35 0 50.5 19t23.5 53l38 168h-1q-27 -37 -72 -51.5t-81 -14.5q-58 0 -92 40t-34 96q0 78 32.5 154t98 129t147.5 53q65 0 85 -51h4l10 38h111zM388 345q0 37 -18.5 57t-42.5 20 q-66 0 -117.5 -96.5t-51.5 -208.5q0 -70 53 -70q55 0 116 94.5t61 203.5z" />
+<glyph unicode="&#x1d493;" horiz-adv-x="441" d="M257 467l-20 -91q57 86 125 86q29 0 45.5 -16.5t16.5 -38.5q0 -31 -21 -58.5t-60 -27.5q-18 0 -26.5 9.5t-12.5 19t-10 9.5q-27 0 -70.5 -112.5t-56.5 -166.5l-20 -80h-114l88 380q0 2 1.5 10t1.5 11q0 15 -16 15q-11 0 -41 -11l-3 28z" />
+<glyph unicode="&#x1d494;" horiz-adv-x="474" d="M419 462l-22 -160h-22q-1 52 -29 87.5t-59 35.5q-46 0 -46 -55q0 -8 3 -17t11.5 -21t14.5 -18l20 -24l19 -22q4 -4 15 -17.5t14.5 -17.5t12.5 -15.5t11.5 -17.5t8.5 -17t7 -19l4 -20q2 -12 2 -25q0 -53 -42 -91t-113 -38q-34 0 -67.5 10.5t-42.5 10.5q-17 0 -39 -22h-25 l22 165h24q1 -51 35 -89.5t71 -38.5q32 0 47.5 23t15.5 57q0 11 -2.5 21t-9 20t-10.5 15.5t-13.5 16t-11.5 12.5q-3 4 -15 17.5t-16 19.5l-15 18l-15 20l-12 18q-7 12 -10 21t-5.5 19.5t-2.5 20.5q0 56 39.5 86.5t90.5 30.5q33 0 61 -11t32 -11q29 0 39 22h25z" />
+<glyph unicode="&#x1d495;" horiz-adv-x="351" d="M318 460l-12 -47h-67l-69 -302q-3 -15 -3 -19q0 -32 20 -32q23 0 54 44l20 -10q-24 -45 -64.5 -74.5t-86.5 -29.5q-66 0 -66 61q0 18 4 33l76 329h-74l8 47q43 0 70.5 7t45.5 27.5t26.5 38t24.5 59.5h54l-29 -132h68z" />
+<glyph unicode="&#x1d496;" horiz-adv-x="535" d="M482 104l20 -10q-59 -104 -155 -104q-23 0 -44.5 12.5t-22.5 34.5q0 38 17 82h-3q-80 -129 -182 -129q-79 0 -79 82q0 27 7 57l54 237q3 16 3 25q0 21 -13 21q-9 0 -44 -7l-3 24l194 34l-79 -344q-6 -18 -6 -32q0 -22 21 -22q36 0 104 104.5t86 189.5l19 90h113l-78 -337 q-2 -10 -2 -19q0 -35 19 -35q20 0 54 46z" />
+<glyph unicode="&#x1d497;" horiz-adv-x="554" d="M60 412v24q79 3 229 37q-7 -22 -18 -63.5t-16 -57.5q-1 -2 -21.5 -69t-30.5 -108t-10 -66q0 -42 50 -42q46 0 115 77.5t83 129.5q5 18 5 34q0 25 -23.5 50.5t-23.5 54.5q0 24 19.5 42t43.5 18q31 0 54 -23t23 -54q0 -38 -38 -109q-40 -75 -99 -145t-124 -113 q-64 -43 -130 -43q-41 0 -68.5 20t-27.5 59t9.5 83.5t30.5 115.5l25 82q7 30 7 39q0 27 -64 27z" />
+<glyph unicode="&#x1d498;" horiz-adv-x="814" d="M565 462l-76 -279q-20 -71 -20 -87q0 -29 34 -29q37 0 81.5 43t77.5 91q44 61 44 106q0 29 -23.5 53t-23.5 54q0 24 19.5 41.5t43.5 17.5q31 0 54 -22.5t23 -53.5q0 -40 -38 -109q-40 -75 -100.5 -146.5t-123.5 -113.5t-129 -42q-42 0 -58 20t-16 63q0 19 24 91 q-98 -174 -214 -174q-41 0 -66.5 20.5t-25.5 60.5q0 49 17 110l37 134q18 63 18 76q0 26 -49 26h-15v24q118 8 230 36l-91 -312q-14 -51 -14 -68q0 -29 24 -29q30 0 64 38t54.5 75t35.5 73q26 61 64 212h138z" />
+<glyph unicode="&#x1d499;" horiz-adv-x="587" d="M327 334l22 34q61 94 122 94q33 0 52.5 -15.5t19.5 -34.5q0 -66 -62 -66q-17 0 -26 17t-14 17q-10 0 -16.5 -7.5t-21.5 -32.5l-47 -79l49 -138q1 -4 4 -13t5 -14.5t5.5 -12.5t8 -10.5t10.5 -3.5q16 0 28.5 12.5t26.5 55.5h24q-38 -145 -119 -145q-21 0 -37 7t-26.5 20.5 t-16 24.5t-12.5 29l-29 75l-36 -62q-56 -94 -130 -94q-36 0 -57 17.5t-21 42.5t15.5 41.5t44.5 16.5q20 0 28.5 -11t11 -22.5t9.5 -11.5q8 0 17 11.5t32 47.5l61 97l-33 91q-17 47 -35 69t-45 22q-14 0 -52 -15l-8 24l153 50q65 -38 89 -109z" />
+<glyph unicode="&#x1d49a;" horiz-adv-x="519" d="M330 128h1q30 44 61 102q46 85 46 107q0 10 -7 15.5t-16 9t-16 15t-7 31.5q0 16 18.5 35t41.5 19q70 0 70 -75q0 -51 -72.5 -186t-123.5 -211l-52 -76q-16 -23 -46.5 -57.5t-57.5 -48t-57 -13.5q-38 0 -57 18t-20 40q-1 25 12 45.5t48 20.5q18 0 28.5 -12.5t15 -24.5 t10.5 -12q10 0 41 41.5t45 76.5l-53 317q-4 26 -6.5 37.5t-8.5 31.5t-14.5 28.5t-20.5 8.5q-8 0 -51 -8l-4 24l170 33q18 -15 34 -58.5t22 -83.5z" />
+<glyph unicode="&#x1d49b;" horiz-adv-x="531" d="M499 452l-318 -337l1 -1q17 4 39 4q33 0 62.5 -27t49.5 -53.5t32 -26.5q18 0 18 19q0 7 -10 22.5t-10 29.5q0 24 16.5 41.5t40.5 17.5q25 0 43 -18t18 -43q0 -52 -39 -75.5t-96 -23.5q-34 0 -100 12t-100 12q-46 0 -93 -19l-18 25l321 340h-165q-35 0 -49 -9.5t-25 -41.5 l-24 3l46 159h360v-10z" />
+<glyph unicode="&#x1d4d0;" horiz-adv-x="984" d="M945 691l10 -17q-92 -178 -259 -569q41 12 80 33l21 -43q-41 -32 -127 -50l-18 -45h-147l18 41q-66 0 -135 29q-88 -91 -187 -91q-68 0 -109.5 37t-41.5 94q0 38 24.5 64.5t59.5 26.5q31 0 50.5 -21.5t19.5 -48.5q0 -23 -17 -41.5t-46 -23.5v-1q15 -31 61 -31 q62 0 131 64q-59 37 -95 90t-36 118q0 87 68.5 144.5t152.5 57.5q91 0 161 -68q74 113 131 165q103 94 183 94q18 0 47 -8zM809 610l-2 2q-48 -31 -88 -78t-100 -139q23 -40 30 -79h2q78 165 158 294zM596 222q0 58 -18 107q-6 -9 -22 -37l-26 -41l-25 -37q-16 -24 -34 -47 l-39 -48q57 -23 117 -23q24 48 45 97q2 9 2 29zM547 384q-51 64 -126 64q-50 0 -89 -38t-39 -97q0 -105 88 -166q68 78 166 237z" />
+<glyph unicode="&#x1d4d1;" horiz-adv-x="1060" d="M966 690l17 -45q-37 -15 -74 -39q76 -60 76 -131q0 -50 -36.5 -92t-102.5 -56v-2q46 -22 70 -58t24 -73q0 -45 -26.5 -92t-76.5 -80q-51 -35 -129 -35q-56 0 -83 30t-27 65q0 44 37.5 85t118.5 51l8 -50q-43 -4 -70 -27.5t-27 -56.5q0 -21 13 -31.5t32 -10.5 q44 0 72.5 48.5t28.5 107.5q0 72 -39 102q-22 -6 -54 -6q-5 0 -35 6q-168 -321 -443 -321q-86 0 -135.5 36t-49.5 93q0 38 23 65.5t58 27.5q31 0 49.5 -20t18.5 -47q0 -24 -15 -43.5t-43 -24.5v-1q25 -31 77 -31q83 0 150.5 52t150.5 196q74 130 129 199.5t136 120.5 q-69 42 -177 42q-92 0 -171.5 -25.5t-133.5 -81t-54 -130.5q0 -43 29 -70.5t71 -27.5q63 0 115.5 56.5t56.5 162.5h50q0 -107 -62.5 -190.5t-165.5 -83.5q-87 0 -133 42q-52 47 -52 118q0 74 49.5 134.5t128.5 98.5q108 52 263 52q154 0 252 -58q45 27 111 49zM871 480 q0 48 -26 77q-59 -58 -130 -189q49 -3 71 -14q38 7 61.5 44t23.5 82z" />
+<glyph unicode="&#x1d4d2;" horiz-adv-x="912" d="M487 668l-22 -45q-35 21 -111 21q-79 0 -141 -35t-62 -105q0 -53 35.5 -84.5t80.5 -35.5q82 120 225.5 211.5t255.5 91.5q129 0 129 -79q0 -61 -69 -128t-185.5 -113.5t-237.5 -47.5q-60 -91 -60 -179q0 -46 30.5 -76t76.5 -30q73 0 123 42t50 98q0 34 -18.5 52t-39.5 18 q-49 0 -81 -34.5t-44 -101.5l-50 8q10 83 64.5 133t137.5 50q67 0 106 -28.5t39 -81.5q0 -42 -28.5 -84.5t-74.5 -74.5q-74 -51 -198 -51q-98 0 -162.5 48.5t-64.5 132.5q0 86 44 167q-75 17 -125 61.5t-50 113.5q0 79 79.5 138t207.5 59q83 0 140 -31zM414 375l1 -1 q64 1 150 31.5t153.5 83.5t67.5 106q0 37 -46 37q-66 0 -162.5 -75t-163.5 -182z" />
+<glyph unicode="&#x1d4d3;" horiz-adv-x="991" d="M889 613l17 -47q-36 -15 -69 -48q61 -96 61 -194q0 -144 -108 -244.5t-247 -100.5q-89 0 -169 28q-74 -24 -158 -24q-72 0 -107 15q-49 20 -49 63q0 42 51 65q36 16 91 16q36 0 73 -10t56 -19l57 -28q32 24 69.5 73t99.5 148l53 82q20 28 54 66t75 71q-44 58 -115.5 88.5 t-150.5 30.5q-125 0 -204 -60q-85 -65 -85 -160q0 -60 35.5 -98t98.5 -38q78 0 133 58.5t56 187.5h50q1 -20 1 -36q0 -66 -23.5 -119t-60 -84.5t-77 -48t-78.5 -16.5q-105 0 -165.5 52.5t-60.5 149.5q0 123 122 201q104 66 252 66q101 0 187 -35.5t143 -97.5q48 32 92 47z M461 49v-2q37 -13 78 -13q109 0 185 79.5t76 222.5q0 54 -18 108h-1q-22 -33 -79 -144q-90 -176 -241 -251zM310 51v1q-53 35 -115 35q-14 0 -29 -5.5t-15 -16.5q0 -27 64 -27q52 0 95 13z" />
+<glyph unicode="&#x1d4d4;" horiz-adv-x="826" d="M414 683l-14 -48q-30 9 -77 9q-62 0 -99.5 -26t-37.5 -69q0 -85 148 -96q15 93 119 163.5t208 70.5q130 0 130 -80q0 -64 -99 -129t-241 -80v-3q80 -10 80 -37q0 -18 -18.5 -29.5t-53.5 -11.5t-63 14q-72 -25 -114.5 -78.5t-42.5 -117.5q0 -45 31 -73t83 -28 q69 0 118.5 37.5t49.5 98.5q0 30 -18.5 47t-40.5 17q-94 0 -129 -128l-49 10q36 173 206 173q145 0 145 -116q0 -60 -53 -111q-42 -40 -106.5 -61.5t-127.5 -21.5q-103 0 -173 46.5t-70 130.5q0 77 62.5 136.5t176.5 87.5v2q-6 10 -7 16q-111 6 -176.5 47t-65.5 107 q0 61 60 104t156 43q65 0 103 -16zM456 455l2 -2q101 14 171.5 58t70.5 90q0 31 -45 31q-56 0 -118 -55.5t-81 -121.5z" />
+<glyph unicode="&#x1d4d5;" horiz-adv-x="1042" d="M999 699l26 -42q-44 -38 -102.5 -62.5t-115.5 -24.5q-82 0 -196.5 37t-160.5 37q-86 0 -141.5 -43.5t-55.5 -108.5q0 -51 28.5 -76t63.5 -25q43 0 80.5 34t55.5 110l45 -9q-7 -85 -62 -137.5t-130 -52.5q-46 0 -89 22q-37 20 -60 56t-23 81q0 101 118 163q77 41 229 41 q56 0 175 -19t171 -19q29 0 71 10.5t73 27.5zM718 558l35 -36q-5 -5 -9 -10.5t-8 -13.5l-8 -12q-3 -5 -7 -14l-7 -16l-7 -18t-7.5 -19l-9.5 -23l-9 -26q68 13 134 13q40 56 79 56q22 0 35 -13t13 -31q0 -31 -26.5 -53t-73.5 -28q0 -49 8 -73l-70 -26q-4 15 -4 34q0 20 6 50 q-68 0 -133 -14q-42 -105 -110.5 -176t-142 -100.5t-153.5 -29.5q-85 0 -131.5 35.5t-46.5 93.5q0 38 24.5 65.5t59.5 27.5q31 0 49.5 -20t18.5 -47q0 -24 -15 -43.5t-43 -24.5v-1q23 -31 80 -31q73 0 128 48.5t102 137.5l4 8q-91 -43 -140 -85l-35 36q92 87 227 144 q58 102 100 150.5t93 84.5z" />
+<glyph unicode="&#x1d4d6;" horiz-adv-x="834" d="M422 682l-14 -48q-35 10 -84 10q-70 0 -110.5 -25.5t-40.5 -70.5q0 -67 111 -91q71 104 178.5 167t202.5 63q134 0 134 -85q0 -42 -40.5 -82.5t-109.5 -71.5q-120 -54 -259 -57q-30 -54 -30 -112q0 -62 46 -62q65 0 111 28t151 123l39 -32q-14 -13 -26 -34t-19 -38 t-21 -55q-41 -114 -135 -172t-234 -58q-86 0 -137 36t-51 93q0 38 24 65.5t59 27.5q31 0 50 -20t19 -47q0 -24 -15 -43.5t-43 -24.5v-1q23 -31 86 -31q145 0 229 145l-2 2q-44 -19 -102 -19q-71 0 -117 36t-46 98q0 54 27 105q-80 18 -125.5 55t-45.5 92q0 65 67 108t168 43 q59 0 105 -17zM424 447v-1q116 7 200 49.5t84 97.5q0 39 -43 39q-55 0 -123 -53.5t-118 -131.5z" />
+<glyph unicode="&#x1d4d7;" horiz-adv-x="1171" d="M816 658l-24 -19q-67 -53 -119.5 -115.5t-101.5 -158.5q62 15 89 27q110 145 223 226t194 81q77 0 77 -63q0 -78 -95.5 -141.5t-247.5 -106.5q-74 -104 -120.5 -191.5t-46.5 -127.5q0 -28 29 -28q46 0 146 124l42 -26q-52 -80 -111 -121q-53 -36 -104 -36 q-63 0 -92.5 31.5t-29.5 82.5q0 96 83 222q-13 -5 -41 -13.5t-32 -9.5q-68 -125 -167.5 -220.5t-197.5 -95.5q-104 0 -104 77q0 61 61 119q42 40 100 67t160 63q4 7 20 33t22 35l22 32q15 23 27 37l31 36q19 22 41 43.5t49 45.5v2q-39 0 -71.5 11.5t-51 26t-43 26 t-48.5 11.5q-39 0 -66.5 -30.5t-27.5 -68.5q0 -36 17.5 -54t42.5 -18q33 0 57 23l29 -35q-40 -43 -106 -43q-61 0 -96 36.5t-35 90.5q0 60 50 107t139 47q56 0 134 -25t116 -25q44 0 79 13q30 11 69 37zM875 473v-2q63 16 126.5 61t63.5 95q0 17 -18 17q-27 0 -78 -49 t-94 -122zM344 225l-1 2q-75 -24 -131 -75t-56 -98q0 -20 20 -20q29 0 78.5 58t89.5 133z" />
+<glyph unicode="&#x1d4d8;" horiz-adv-x="997" d="M141 66v-1q10 -13 38 -22t49 -9q94 0 164.5 48.5t131.5 182.5q2 5 8 18t10 20q-49 17 -79 56q-37 45 -37 108q0 79 60 137q87 83 237 83q63 0 121 -9q45 21 81 21q23 0 37.5 -10t14.5 -25q0 -31 -25 -47t-68 -16q-16 0 -32 3q-17 -12 -32 -30t-29.5 -46t-24 -48 t-26.5 -60l-24 -57l1 -2q69 33 120 115l43 -26q-67 -128 -195 -154q-64 -134 -122 -187q-142 -130 -328 -130q-86 0 -137 36t-51 93q0 38 24.5 65.5t59.5 27.5q31 0 49.5 -20t18.5 -47q0 -24 -15 -43.5t-43 -24.5zM769 604v3q-130 0 -191 -47t-61 -119q0 -57 54 -83 q29 57 51.5 94t62 81t84.5 71z" />
+<glyph unicode="&#x1d4d9;" horiz-adv-x="906" d="M625 228l35 -36q-58 -64 -171 -104q-61 -128 -161 -220t-204 -92q-49 0 -77 24t-28 67q0 88 105 160t240 100q31 86 82 193q-53 13 -83 52q-30 38 -30 93q0 119 124 183q77 39 175 39q29 0 50 -1.5t41.5 -4t30.5 -3.5q31 21 78 21q25 0 39.5 -10t14.5 -25q0 -31 -25 -47 t-67 -16q-16 0 -33 3q-58 -45 -141 -222l2 -1q62 27 117 113l43 -25q-29 -58 -84 -104.5t-112 -51.5q-9 -20 -26.5 -64t-31.5 -73l3 -1q56 22 94 53zM678 605v2q-116 0 -168 -24q-38 -17 -62 -50t-24 -74q0 -70 50 -85q71 131 204 231zM333 50l-1 1q-74 -21 -148 -79.5 t-74 -111.5q0 -13 8 -21t21 -8q47 0 101 66t93 153z" />
+<glyph unicode="&#x1d4da;" horiz-adv-x="1154" d="M842 699l30 -41q-43 -30 -76.5 -62.5t-62 -74t-42.5 -65.5l-41 -76q21 0 40 -12q46 21 115 118q149 213 250 213q36 0 55.5 -20.5t19.5 -47.5q0 -28 -19 -47.5t-47 -19.5q-27 0 -44 14.5t-21 38.5h-2q-33 -103 -100.5 -179.5t-155.5 -100.5v-3q49 -28 49 -84 q0 -32 -18 -66q-9 -17 -27 -43.5t-28 -44t-10 -28.5q0 -27 26 -27q48 0 155 134l39 -33q-113 -160 -222 -160q-56 0 -87.5 26.5t-31.5 67.5q0 44 49 118q37 55 37 90q0 8 -7.5 17.5t-19.5 9.5h-21q-72 -177 -177 -254.5t-224 -77.5q-83 0 -130.5 36t-47.5 93q0 38 24.5 65.5 t59.5 27.5q31 0 49.5 -20t18.5 -47q0 -24 -15 -43.5t-43 -24.5v-1q23 -31 70 -31q62 0 119 52t99 134q35 70 51.5 100.5t47 78.5t65 84t80.5 73h-9q-51 0 -98.5 22t-84 44t-60.5 22q-44 0 -77 -28t-33 -80q0 -40 21.5 -69.5t57.5 -29.5q26 0 41.5 9t39.5 39l38 -30 q-53 -73 -134 -73q-72 0 -113.5 42t-41.5 110q0 63 58.5 114t146.5 51q119 0 180 -36q47 -27 79 -27q90 0 160 63z" />
+<glyph unicode="&#x1d4db;" horiz-adv-x="1036" d="M678 648l-22 -44q-72 40 -166 40q-80 0 -140.5 -37.5t-60.5 -103.5t64.5 -103.5t166.5 -37.5q25 0 44 2q45 91 83 148q45 65 117.5 116t140.5 51q56 0 83 -23.5t27 -63.5q0 -70 -94.5 -151.5t-225.5 -117.5q-95 -192 -254 -272v-2q44 -13 78 -13q151 0 278 141l36 -35 q-139 -163 -311 -163q-85 0 -168 29q-82 -25 -162 -25q-75 0 -108 17q-44 22 -44 61q0 38 44 62q39 21 100 21q35 0 71 -9.5t56 -18.5l57 -29q71 47 168 220h-28q-56 0 -108 10.5t-99 33t-75 63t-28 93.5q0 81 83 136.5t204 55.5q112 0 193 -51zM722 389l2 -1 q78 27 139 81.5t61 120.5q0 16 -10 25t-23 9q-43 0 -88 -69.5t-81 -165.5zM290 53v1q-53 35 -115 35q-14 0 -29 -5.5t-15 -16.5q0 -29 64 -29q45 0 95 15z" />
+<glyph unicode="&#x1d4dc;" horiz-adv-x="1300" d="M1234 691l11 -17q-142 -219 -228.5 -388t-86.5 -218q0 -27 26 -27q47 0 167 133l37 -34q-66 -79 -120 -118.5t-112 -39.5q-119 0 -119 95q0 161 284 539l-2 1q-68 -47 -133.5 -132.5t-155.5 -246.5l-46 -81q-14 -24 -36.5 -56t-41.5 -51q-56 -54 -124 -54q-33 0 -57 21.5 t-24 54.5q0 51 35 121q88 178 259 414l-1 1q-70 -49 -125.5 -118t-127.5 -188q-7 -11 -25 -42l-24 -40l-22 -36l-23 -36q-7 -11 -20 -29.5l-21 -29.5l-20 -24q-10 -13 -20 -23q-61 -63 -137 -63q-63 0 -102 31.5t-39 86.5q0 38 24.5 64.5t59.5 26.5q31 0 50.5 -21.5 t19.5 -48.5q0 -25 -16 -44.5t-47 -19.5v-1q14 -19 61 -19t86 45t124 184q136 224 231 317q119 119 235 119q20 0 37 -8l10 -17q-99 -137 -191.5 -294t-130.5 -243q-19 -42 -19 -60q0 -14 11 -14q42 0 145 194q116 217 231 334q106 108 201 108q38 0 52 -8z" />
+<glyph unicode="&#x1d4dd;" horiz-adv-x="1095" d="M695 175h4q48 63 85 165q9 25 26 80l30 92q12 36 33 78t44 66q40 43 89 43q34 0 53 -20.5t19 -47.5q0 -28 -19.5 -47.5t-46.5 -19.5q-43 0 -64 39h-4q-19 -16 -36.5 -64.5t-42.5 -128.5t-48 -135q-37 -85 -92.5 -163t-116.5 -125h-51q4 23 7 47.5t4 57.5l3 57q1 23 2 72 t2 76q4 119 28 215h-2q-45 -71 -100 -183q-108 -219 -171 -284q-63 -66 -138 -66q-57 0 -94.5 32.5t-37.5 86.5q0 34 25 62t61 28q33 0 52 -21t19 -50q0 -21 -18 -41.5t-48 -20.5v-1q10 -20 48 -20q55 0 109.5 72.5t136.5 235.5q57 115 95.5 179t77.5 105q34 36 101 68 l25 -22q-7 -19 -12 -55t-7 -65l-6 -89q-4 -61 -6 -88q-11 -156 -18 -200z" />
+<glyph unicode="&#x1d4de;" horiz-adv-x="809" d="M749 562l-38 -9q-13 40 -56 65.5t-89 25.5q-88 0 -173.5 -69.5t-139.5 -182t-54 -229.5q0 -53 28 -91t78 -38q54 0 106 25q82 40 134.5 127.5t52.5 185.5q0 52 -23.5 89.5t-52.5 37.5q-43 0 -71.5 -41.5t-28.5 -97.5q0 -52 26 -95l-44 -22q-37 60 -37 126q0 83 51.5 139 t130.5 56q62 0 105.5 -44.5t43.5 -127.5q0 -68 -32 -141t-86 -133.5t-133 -99.5t-164 -39q-98 0 -154.5 60t-56.5 151q0 101 39.5 195t105 162.5t156 110t187.5 41.5q79 0 131.5 -40t57.5 -97z" />
+<glyph unicode="&#x1d4df;" horiz-adv-x="1025" d="M914 698l19 -47q-27 -12 -55 -29q116 -76 116 -183q0 -71 -46 -118t-124 -47q-36 0 -65 22.5t-29 58.5q0 42 29 71l41 -28q-15 -18 -15 -37q0 -15 10.5 -23.5t22.5 -8.5q27 0 44.5 28t17.5 72q0 83 -67 140q-33 -35 -57.5 -79t-50 -104.5t-41.5 -90.5q-90 -170 -193 -243 t-231 -73q-85 0 -135 36.5t-50 93.5q0 38 23 65t58 27q31 0 49.5 -20t18.5 -47q0 -24 -15 -43.5t-43 -24.5v-1q25 -31 84 -31q85 0 141 50t138 198q68 124 122 200t119 128q-72 34 -151 34q-147 0 -246.5 -65t-99.5 -160q0 -43 27 -70.5t65 -27.5q61 0 102 50.5t47 157.5h50 q0 -66 -19 -123t-68.5 -98.5t-122.5 -41.5q-74 0 -123 41.5t-49 115.5q0 65 46.5 126t128.5 100q105 50 255 50q122 0 224 -45q49 28 98 44z" />
+<glyph unicode="&#x1d4e0;" horiz-adv-x="809" d="M749 562l-38 -9q-13 40 -56 65.5t-89 25.5q-88 0 -173.5 -69.5t-139.5 -182t-54 -229.5q0 -53 28 -91t78 -38q54 0 115 29q-16 29 -39 29q-14 0 -25 -5t-35 -24l-30 40q71 73 121 73q56 0 93 -45q93 104 93 241q0 56 -22.5 91.5t-63.5 35.5q-43 0 -66.5 -38t-23.5 -91 q0 -55 27 -95l-44 -22q-38 58 -38 124q0 77 50.5 132t131.5 55q62 0 105.5 -44.5t43.5 -127.5q0 -80 -43 -165t-115 -148q34 -48 51 -48q16 0 32 9t50 41l33 -34q-39 -51 -71.5 -75t-70.5 -24q-41 0 -67 15t-50 54q-83 -38 -164 -38q-98 0 -154.5 60t-56.5 151 q0 101 39.5 195t105 162.5t156 110t187.5 41.5q79 0 131.5 -40t57.5 -97z" />
+<glyph unicode="&#x1d4e1;" horiz-adv-x="1048" d="M934 175l39 -33q-58 -81 -110.5 -120.5t-113.5 -39.5q-57 0 -90 27t-33 67q0 37 42.5 101t42.5 90q0 24 -14 27q-22 0 -30 5q-87 -169 -192.5 -244.5t-234.5 -75.5q-85 0 -135 36.5t-50 93.5q0 38 23 65t58 27q31 0 49.5 -20t18.5 -47q0 -24 -15 -43.5t-43 -24.5v-1 q25 -31 87 -31q85 0 139 49.5t137 198.5q70 128 122.5 202t118.5 126q-72 34 -151 34q-147 0 -246.5 -65t-99.5 -160q0 -43 27.5 -70.5t64.5 -27.5q75 0 113 66q31 52 35 133h50q0 -104 -52 -179t-159 -75q-71 0 -120.5 42.5t-49.5 114.5q0 65 46.5 125.5t128.5 99.5 q107 51 255 51q122 0 224 -45q44 25 98 44l19 -47q-30 -13 -55 -29q93 -61 93 -146q0 -67 -52 -111t-126 -50v-2q34 -34 34 -86q0 -27 -39 -83.5t-39 -75.5q0 -27 26 -27q52 0 159 134zM857 481q0 53 -43 88q-21 -21 -40 -50t-27 -44.5t-27 -58.5l-22 -49q33 0 62 -18 q38 7 67.5 47.5t29.5 84.5z" />
+<glyph unicode="&#x1d4e2;" horiz-adv-x="816" d="M437 136l-49 -10q-12 73 -40 99t-67 26t-62.5 -31t-23.5 -71q0 -41 36 -78t90 -37q68 0 115.5 41t47.5 122q0 31 -16.5 59.5t-39.5 51.5l-47 48q-23 25 -39.5 57.5t-16.5 68.5q0 70 46.5 121t108.5 73.5t126 22.5q68 0 121.5 -30.5t53.5 -91.5q0 -62 -64 -106.5 t-137 -44.5v50q49 4 79.5 27.5t30.5 67.5q0 35 -25.5 54t-59.5 19q-55 0 -103.5 -39.5t-48.5 -102.5q0 -34 17 -64.5t41 -54.5l49 -48q24 -24 41 -56t17 -69q0 -103 -87 -167t-216 -64q-99 0 -166.5 42.5t-67.5 125.5q0 74 58 116.5t136 42.5q144 0 162 -170z" />
+<glyph unicode="&#x1d4e3;" horiz-adv-x="1030" d="M999 699l26 -42q-44 -38 -102.5 -62.5t-115.5 -24.5q-82 0 -196.5 37t-160.5 37q-85 0 -141 -46t-56 -111q0 -53 29 -80t72 -27q58 0 95 40t65 129l48 -12q-19 -99 -77 -155.5t-133 -56.5q-67 0 -108 22q-82 44 -82 133q0 54 32 101.5t86 76.5q77 41 229 41q56 0 175 -19 t171 -19q29 0 71 10.5t73 27.5zM718 558l35 -36q-28 -29 -46.5 -70.5t-36 -101t-28.5 -85.5q-38 -98 -108 -168q-60 -60 -136.5 -89t-153.5 -29q-85 0 -132 35.5t-47 93.5q0 38 24.5 65.5t59.5 27.5q31 0 49.5 -20t18.5 -47q0 -24 -15 -43.5t-43 -24.5v-1q23 -31 80 -31 q72 0 130 50t121 176q47 94 82 146.5t61 78t85 73.5z" />
+<glyph unicode="&#x1d4e4;" horiz-adv-x="964" d="M904 669l-304 -563q-9 -18 -9 -36q0 -29 23 -29q46 0 149 130l41 -33q-53 -78 -112 -120q-50 -36 -104 -36q-100 0 -118 86h-1q-40 -50 -82.5 -69.5t-97.5 -19.5q-49 0 -81 26t-32 70q0 49 79 171l149 230q30 45 30 89q0 36 -24 57.5t-73 21.5q-74 0 -130 -47.5 t-56 -116.5q0 -31 16 -50.5t40 -19.5q41 0 66 25.5t45 78.5l48 -15q-18 -59 -59.5 -101.5t-106.5 -42.5q-50 0 -84 21q-56 35 -56 104q0 94 87 156.5t199 62.5q85 0 147 -40t62 -112q0 -40 -54 -128l-180 -291q-24 -36 -24 -67q0 -27 27 -27q40 0 98 66q77 87 200 307 l147 262h135z" />
+<glyph unicode="&#x1d4e5;" horiz-adv-x="1040" d="M332 62l3 -4q62 38 111 78t91.5 91.5t65 83t64.5 96.5l68 103q22 33 56 78t55.5 63.5t49 33t54.5 14.5q39 0 56.5 -21t17.5 -47q0 -28 -18.5 -47.5t-45.5 -19.5q-25 0 -43 14.5t-23 38.5h-2q-62 -53 -168 -224q-136 -220 -262 -314q-131 -100 -228 -100q-15 0 -66 9 q41 39 70.5 93t50.5 109.5t46 114t71 124.5t111 123v4q-76 0 -119 17q-29 11 -69.5 41t-68.5 30q-44 0 -76.5 -28.5t-32.5 -80.5q0 -38 21 -62.5t51 -24.5q27 0 47 10.5t43 39.5l38 -32q-32 -36 -61.5 -54.5t-72.5 -18.5q-65 0 -111 39.5t-46 108.5q0 73 62 115.5t142 42.5 q31 0 51 -1.5t50 -10t59 -24.5q47 -27 79 -27q92 0 160 63l36 -35q-74 -78 -113.5 -144t-79.5 -165q-75 -184 -174 -293z" />
+<glyph unicode="&#x1d4e6;" horiz-adv-x="1320" d="M634 62l3 -4q46 25 89.5 63.5t86.5 93t69 91.5l67 101l68 103q22 33 56 78t55.5 63.5t49 33t54.5 14.5q39 0 56.5 -21t17.5 -47q0 -28 -18 -47.5t-45 -19.5q-26 0 -44 14.5t-23 38.5h-2q-62 -53 -168 -224q-42 -68 -80.5 -123t-87 -111t-95 -94t-100.5 -62t-107 -24 q-28 0 -58 9q43 38 76 96.5t84 188.5q11 29 44 103h-2l-42 -66l-48 -71q-36 -52 -59 -78.5t-63 -67t-73 -61t-76 -37t-85 -16.5q-27 0 -60 9q36 29 61.5 78t46 106.5t45.5 119t73.5 132t116.5 130.5v2q-76 0 -119 17q-29 11 -69.5 41t-68.5 30q-44 0 -76.5 -28.5 t-32.5 -80.5q0 -38 21 -62.5t51 -24.5q27 0 47 10.5t43 39.5l38 -32q-32 -36 -61.5 -54.5t-72.5 -18.5q-71 0 -114 40.5t-43 107.5q0 62 58.5 110t145.5 48q31 0 51 -1.5t50 -10t59 -24.5q47 -27 79 -27q92 0 160 63l36 -35q-59 -57 -100.5 -119.5t-66.5 -119.5l-50 -114 q-24 -57 -63.5 -123t-93.5 -126l2 -4q43 18 87.5 59t84.5 93t81 111l82 117q42 58 84 108t90.5 88t97.5 53q25 0 49 -8q-47 -50 -83.5 -116t-61.5 -130l-51 -128q-26 -64 -64.5 -128.5t-88.5 -114.5z" />
+<glyph unicode="&#x1d4e7;" horiz-adv-x="1033" d="M664 567h2q40 58 88 95t115 37q56 0 98.5 -32.5t42.5 -86.5q0 -34 -24 -61t-60 -27q-34 0 -53.5 20t-19.5 49q0 21 18 41.5t48 20.5v1q-10 20 -48 20q-60 0 -103 -46t-84 -147t-70.5 -197.5t-29.5 -141.5q0 -34 14.5 -52.5t35.5 -18.5q30 0 69.5 29t100.5 99l38 -30 q-134 -157 -239 -157q-63 0 -97.5 25.5t-60.5 79.5h-2q-82 -108 -228 -108q-57 0 -104 32.5t-47 86.5q0 34 25 62t61 28q33 0 52 -21t19 -50q0 -21 -18 -41.5t-48 -20.5v-1q4 -8 21.5 -14t36.5 -6q79 0 133.5 47t105.5 147q42 82 67 159.5t25 115.5q0 71 -22.5 106t-76.5 35 q-73 0 -132 -57t-59 -126q0 -37 19 -60t52 -23q35 0 55.5 18.5t42.5 60.5l44 -18q-30 -58 -64.5 -87t-92.5 -29q-64 0 -105.5 37.5t-41.5 106.5q0 50 34.5 98t83.5 82q76 52 169 52q82 0 137.5 -35t76.5 -97z" />
+<glyph unicode="&#x1d4e8;" horiz-adv-x="989" d="M825 669h138q-131 -175 -212.5 -297.5t-147.5 -250.5l2 -1q50 24 100 64l35 -36q-64 -66 -178 -116q-52 -106 -147 -181t-206 -75q-44 0 -75 21.5t-31 61.5q0 85 105 137q22 11 52.5 20.5t52 14.5t63.5 14l61 13q11 24 56 101l-3 1q-71 -62 -145 -62q-53 0 -83 25t-30 71 q0 34 22 70t92 126q68 87 83 115.5t15 59.5q0 35 -28.5 57t-78.5 22q-74 0 -130 -47.5t-56 -116.5q0 -31 16 -50.5t40 -19.5q78 0 116 102l43 -12q-16 -59 -57 -102t-106 -43q-53 0 -84 19q-59 35 -59 106q0 94 87 156.5t199 62.5q87 0 153 -40t66 -112q0 -10 -1 -19t-5 -20 t-7.5 -19t-12.5 -22l-15 -23q-6 -10 -19.5 -29.5l-22.5 -32.5l-30 -38l-32 -44q-42 -57 -54.5 -80.5t-12.5 -41.5q0 -21 23 -21q66 0 265 266zM396 -23l-1 1q-29 -6 -58.5 -14.5t-64 -23.5t-56.5 -36.5t-22 -46.5q0 -10 7 -18t22 -8q37 0 83.5 35t89.5 111z" />
+<glyph unicode="&#x1d4e9;" horiz-adv-x="996" d="M440 531l45 -22q-58 -117 -177 -117q-68 0 -111.5 36t-43.5 97q0 66 65.5 120t174.5 54q168 0 278 -72q85 61 164 61q70 0 105.5 -23.5t35.5 -53.5q0 -34 -32.5 -60.5t-110.5 -26.5q-39 0 -131 28q-53 -68 -106 -216q48 2 92 43l32 -33q-73 -90 -157 -90q-5 -11 -15 -31 q-50 -92 -127 -154q64 -24 126 -24q64 0 127.5 31t89.5 101h50q-43 -200 -264 -200q-100 0 -157 18q-31 11 -52 22q-80 -37 -160 -37q-71 0 -101 23t-30 56q0 39 42 62q38 21 100 21q50 0 147 -40q20 26 32 47q14 26 56 128h-2q-48 0 -103 -44l-30 40q74 84 171 84 q67 145 151 217q-115 55 -225 55q-62 0 -103.5 -29.5t-41.5 -78.5q0 -37 21.5 -56.5t55.5 -19.5q70 0 119 84zM742 600v-2q57 -19 90 -19q53 0 53 29q0 25 -49 25q-57 0 -94 -33zM278 56q-57 33 -97 33t-40 -28q0 -24 57 -24q42 0 80 19z" />
+<glyph unicode="&#x1d4ea;" horiz-adv-x="942" d="M830 210l35 -29q-148 -192 -274 -192q-65 0 -87 56q-47 -35 -82 -47t-81 -12q-61 0 -101.5 30t-40.5 94q0 55 24 111q-46 -18 -92 -18q-53 0 -96 22l12 43q36 -15 82 -15q104 0 172 81v-1q58 59 133.5 94t147.5 35q112 0 142 -75l-41 -19q-19 27 -37.5 35.5t-50.5 8.5 q-66 0 -133.5 -59t-107.5 -134.5t-40 -131.5q0 -25 12.5 -38t32.5 -13q31 0 69.5 19.5t63.5 52.5q-1 9 -1 29q0 69 40 129.5t98 60.5q50 0 50 -49q0 -45 -35 -100t-86 -91q6 -27 15.5 -37.5t33.5 -10.5q81 0 223 171z" />
+<glyph unicode="&#x1d4eb;" horiz-adv-x="646" d="M92 541l31 36q31 -26 71.5 -48t65.5 -23q31 39 65 74q116 119 198 119q43 0 72 -20t29 -51q0 -44 -33 -85.5t-88 -68.5q-73 -35 -156 -35q-58 -79 -119 -196.5t-61 -173.5q0 -14 10 -23.5t23 -9.5q60 0 117 51t95 119q-17 30 -17 81q0 61 32.5 104t70.5 43q45 0 45 -49 q0 -33 -16.5 -79t-33.5 -75q19 -14 48 -14q18 0 39 7l11 -44q-30 -13 -66 -13q-37 0 -60 13q-67 -98 -135 -146t-152 -48q-53 0 -85.5 31t-32.5 89q0 59 46 157t117 195q-65 19 -131 83zM378 503l1 -2q62 1 108.5 40t46.5 87q0 21 -18 21q-23 0 -53 -30t-85 -116z" />
+<glyph unicode="&#x1d4ec;" horiz-adv-x="764" d="M35 225l12 43q36 -15 82 -15q100 0 161 68q59 64 129.5 102.5t138.5 38.5q53 0 89 -21.5t36 -61.5q0 -35 -20 -61t-53 -26q-28 0 -42.5 14t-14.5 36t19.5 37t19.5 22q0 11 -17 11q-60 0 -122.5 -57.5t-100.5 -132t-38 -130.5q0 -28 12 -42t30 -14q118 0 275 192l34 -30 q-87 -112 -162 -162t-156 -50q-67 0 -107.5 33t-40.5 90q0 55 25 113q-44 -19 -93 -19q-53 0 -96 22z" />
+<glyph unicode="&#x1d4ed;" horiz-adv-x="949" d="M912 699l-323 -598q-11 -19 -11 -39q0 -9 5 -16t11 -7q71 0 211 170l35 -29q-71 -97 -133.5 -144t-139.5 -47q-91 0 -93 75h-2q-73 -78 -179 -78q-56 0 -90.5 30.5t-34.5 81.5t35 118q-41 -13 -79 -13q-53 0 -96 22l12 43q36 -15 82 -15q86 0 154 63q93 91 181 127 q48 19 103 19q60 0 81 -39h2l145 276h124zM588 376q0 36 -30 36q-36 0 -86 -37t-101 -109q-88 -125 -88 -193q0 -16 8.5 -26.5t21.5 -10.5q55 0 123 63q61 58 106.5 139t45.5 138z" />
+<glyph unicode="&#x1d4ee;" horiz-adv-x="726" d="M35 284l29 35q47 -55 133 -69q52 89 145.5 150.5t182.5 61.5q54 0 88.5 -23t34.5 -61q0 -42 -35 -78q-44 -47 -129.5 -75.5t-178.5 -30.5q-12 -11 -22 -41.5t-10 -58.5t14.5 -43t39.5 -15q52 0 131.5 54t135.5 122l32 -32q-88 -109 -189 -160q-68 -34 -135 -34 q-68 0 -106 33.5t-38 90.5q0 50 17 94q-91 20 -140 80zM330 244l1 -1q101 11 160 54.5t59 92.5q0 13 -8.5 20t-17.5 7q-81 0 -194 -173z" />
+<glyph unicode="&#x1d4ef;" horiz-adv-x="768" d="M25 -205l192 367q-16 27 -16 59q0 43 35.5 84t95.5 68q90 176 157 251t153 75q51 0 79 -20t28 -53q0 -46 -31 -90t-80.5 -78t-95.5 -57.5t-93 -41.5l-117 -210q25 -12 61 -12q76 0 137 54l27 -36q-81 -68 -177 -68q-44 0 -75 9l-156 -301h-124zM483 432l2 -2 q70 34 122 85t52 104q0 17 -6 23.5t-20 6.5q-47 0 -150 -217z" />
+<glyph unicode="&#x1d4f0;" horiz-adv-x="819" d="M771 449l-278 -518q25 -12 73 -12q56 0 110 35l20 -41q-60 -44 -141 -44q-49 0 -89 14q-90 -107 -238 -107q-60 0 -94 23t-34 54q0 32 29.5 58t70.5 42q39 15 121 15q25 0 75 -8l40 72h-3q-63 -43 -143 -43q-50 0 -83.5 30.5t-33.5 79.5q0 55 32 117q-42 -14 -82 -14 q-51 0 -96 23l12 43q38 -16 82 -16q81 0 150 58q60 65 142.5 108.5t143.5 43.5q60 0 88 -31h2l10 18h114zM591 375q0 37 -33 37q-75 0 -187 -162q-83 -119 -83 -176q0 -16 9.5 -25.5t20.5 -9.5q56 0 123 68t108.5 147t41.5 121zM369 -91q-30 9 -63 9q-43 -1 -74 -16t-32 -46 q0 -30 40 -30q74 0 129 83z" />
+<glyph unicode="&#x1d4f1;" horiz-adv-x="838" d="M722 214l36 -28q-144 -200 -283 -200q-41 0 -65.5 25.5t-24.5 57.5q0 64 46 129l108 151q17 24 17 43q0 16 -20 16q-60 0 -150.5 -96t-176.5 -255l-31 -57h-123l249 458q-94 19 -143 80l31 33q28 -26 69 -43t70 -21q58 108 106.5 150t117.5 42q50 0 76.5 -22.5 t26.5 -54.5q0 -41 -24.5 -74.5t-63.5 -53.5t-78.5 -31t-77.5 -14l-43 -79l3 -1q42 43 91 66t90 23q45 0 73 -18.5t28 -52.5q0 -39 -49 -117l-105 -171q-17 -25 -17 -43q0 -20 17 -20q67 0 220 178zM442 509l1 -1q125 31 125 117q0 12 -6 18t-12 6q-22 0 -41.5 -24 t-66.5 -116z" />
+<glyph unicode="&#x1d4f2;" horiz-adv-x="558" d="M534 633q0 -26 -18.5 -44t-45.5 -18t-45 19t-18 47q0 24 19 42.5t43 18.5q27 0 46 -19t19 -46zM450 205l36 -28q-80 -106 -132 -148.5t-117 -42.5q-47 0 -75 24.5t-28 67.5q0 36 14 70.5t45 91.5q6 11 9 16l49 91q-53 -29 -115 -29q-53 0 -96 22l12 43q36 -15 82 -15 q104 0 172 81h118l-164 -315q-19 -36 -19 -69q0 -12 6 -20.5t15 -8.5q48 0 188 169z" />
+<glyph unicode="&#x1d4f3;" horiz-adv-x="840" d="M823 633q0 -26 -18.5 -44t-45.5 -18t-45 19t-18 47q0 24 19 42.5t43 18.5q27 0 46 -19t19 -46zM710 449l-276 -518q25 -12 73 -12q56 0 110 35l20 -41q-60 -44 -141 -44q-49 0 -89 14q-90 -107 -238 -107q-60 0 -94 22.5t-34 54.5t29.5 58t70.5 42q39 15 121 15 q25 0 75 -8l207 387q-53 -29 -126 -29q-53 0 -96 22l12 43q36 -15 82 -15q64 0 111 26t71 55h112zM310 -91q-30 9 -63 9q-43 -1 -74 -16t-32 -46q0 -30 40 -30q74 0 129 83z" />
+<glyph unicode="&#x1d4f4;" horiz-adv-x="810" d="M694 209l36 -28q-82 -105 -139 -150t-122 -45q-44 0 -72.5 19t-28.5 53q0 28 18.5 62.5t18.5 58.5q0 36 -47 39l18 45q80 8 132 46t52 79q0 20 -23 20q-59 0 -150.5 -96t-177.5 -255l-31 -57h-123l249 458q-82 17 -133 80l31 33q56 -52 129 -64q58 108 106.5 150 t117.5 42q46 0 74.5 -20.5t28.5 -51.5q0 -53 -43 -94.5t-96 -60.5t-105 -23l-43 -79l3 -1q89 89 191 89q41 0 68 -20t27 -47q0 -48 -62.5 -94t-147.5 -60v-3q55 -37 55 -81q0 -21 -16.5 -49.5t-16.5 -45.5q0 -7 5.5 -14.5t13.5 -7.5q65 0 203 173zM442 509l1 -1 q125 31 125 117q0 12 -6 18t-12 6q-22 0 -41.5 -24t-66.5 -116z" />
+<glyph unicode="&#x1d4f5;" horiz-adv-x="650" d="M43 429l26 38q28 -19 69 -35t59 -18q195 285 325 285q47 0 78.5 -21.5t31.5 -63.5q0 -56 -34.5 -107t-93.5 -87q-90 -56 -208 -65l-58 -100q-21 -36 -46 -94.5t-25 -91.5t25 -33q29 0 79.5 38t114.5 124l36 -27q-70 -99 -128.5 -142t-121.5 -43q-52 0 -82 31t-30 90 q0 97 103 255q-26 6 -64 27.5t-56 39.5zM333 421l1 -1q83 19 145.5 72t62.5 129q0 28 -25 28q-62 0 -184 -228z" />
+<glyph unicode="&#x1d4f6;" horiz-adv-x="1137" d="M1021 214l36 -28q-73 -101 -140 -150.5t-143 -49.5q-41 0 -65.5 25.5t-24.5 57.5q0 64 46 129l108 151q17 23 17 43t-23 20q-59 0 -148 -97.5t-176 -257.5l-31 -57h-123l203 356q12 21 12 37q0 19 -20 19q-60 0 -150.5 -97.5t-176.5 -257.5l-31 -57h-123l187 347 q-52 -29 -114 -29q-53 0 -96 22l12 43q36 -15 82 -15q104 0 172 81h114l-41 -79l3 -1q43 44 92 68.5t89 24.5q46 0 73.5 -19.5t27.5 -55.5q0 -7 -3 -18h3q43 44 92.5 68.5t89.5 24.5q46 0 75 -19.5t29 -55.5q0 -39 -49 -117l-105 -171q-17 -25 -17 -43q0 -20 16 -20 q68 0 221 178z" />
+<glyph unicode="&#x1d4f7;" horiz-adv-x="851" d="M735 214l36 -28q-73 -101 -140 -150.5t-143 -49.5q-41 0 -65.5 25.5t-24.5 57.5q0 64 46 129l108 155q17 24 17 43q0 16 -20 16q-60 0 -150.5 -97.5t-176.5 -257.5l-31 -57h-123l187 347q-52 -29 -114 -29q-53 0 -96 22l12 43q36 -15 81 -15q105 0 173 81h114l-41 -79 l3 -1q43 44 92 68.5t89 24.5q46 0 73.5 -19.5t27.5 -55.5q0 -38 -49 -117l-105 -171q-17 -25 -17 -43q0 -20 18 -20q66 0 219 178z" />
+<glyph unicode="&#x1d4f8;" horiz-adv-x="848" d="M757 232l23 -39q-46 -31 -99 -31q-36 0 -63 9q-62 -99 -143 -148q-61 -37 -131 -37q-65 0 -104 31.5t-39 92.5q0 54 24 113q-43 -20 -96 -20q-51 0 -94 22l12 43q36 -15 80 -15q97 0 163 71q64 69 137 104q71 34 148 34q51 0 79 -28.5t28 -79.5q0 -67 -35 -131 q12 -11 38 -11q17 0 25 0.5t20.5 5t26.5 14.5zM626 371q0 41 -47 41q-53 0 -116.5 -59.5t-105 -136t-41.5 -127.5q0 -53 46 -53q58 0 113 48t96 114q-30 27 -30 75q0 37 25 64.5t60 33.5z" />
+<glyph unicode="&#x1d4f9;" horiz-adv-x="885" d="M453 370l3 -1q43 44 92 68.5t89 24.5q133 0 133 -124q0 -70 -46.5 -150t-97.5 -116q67 -42 111 -110l-37 -27q-61 69 -123 101q-76 -50 -147 -50q-44 0 -65.5 14t-21.5 36q0 31 36.5 59.5t87.5 29.5q37 0 65 -9q45 32 79 92q44 77 44 150q0 54 -47 54q-58 0 -143 -96 t-174 -259l-143 -262h-123l299 551q-53 -28 -114 -28q-53 0 -96 22l12 43q36 -15 82 -15q104 0 172 81h114z" />
+<glyph unicode="&#x1d4fa;" horiz-adv-x="913" d="M802 224l31 -31q-55 -59 -220 -213q-64 -60 -116 -115t-63 -70h-123l127 237h-2q-67 -46 -143 -46q-50 0 -83.5 30.5t-33.5 79.5q0 58 32 120q-39 -13 -77 -13q-53 0 -96 22l12 43q36 -15 82 -15q80 0 148 57q61 65 141.5 108.5t141.5 43.5q60 0 88 -31h2l10 18h121 l-251 -467l1 -1zM594 376q0 36 -30 36q-36 0 -86 -37t-101 -109q-86 -122 -86 -193q0 -16 8 -26.5t21 -10.5q29 0 56 13.5t66 49.5q61 58 106.5 139t45.5 138z" />
+<glyph unicode="&#x1d4fb;" horiz-adv-x="677" d="M636 332l12 -43q-27 -14 -67 -14q-63 0 -88 28l-248 -192l-59 -111h-123l187 347q-52 -29 -114 -29q-53 0 -96 22l12 43q36 -15 82 -15q104 0 172 81h120l-113 -211l1 -1l150 112q-2 14 -2 19q0 42 31.5 68t72.5 26q50 0 73 -28l-101 -90q17 -19 58 -19q26 0 40 7z" />
+<glyph unicode="&#x1d4fc;" horiz-adv-x="562" d="M139 240l-19 41q38 15 59.5 25.5t57.5 37.5t67 64q-4 5 -8.5 25t-4.5 27q0 52 28.5 74.5t56.5 22.5q24 0 37 -15.5t13 -36.5q0 -25 -12.5 -56t-36.5 -52l19 -25q14 -19 20.5 -30t15.5 -29.5t13 -40t4 -46.5q0 -59 -35.5 -115t-89.5 -90q-57 -35 -140 -35 q-52 0 -92.5 24.5t-40.5 72.5q0 35 20.5 59t46.5 24q21 0 40 -11.5t19 -34.5q0 -19 -8.5 -27.5t-17.5 -14t-9 -16.5q0 -26 35 -26q63 0 110 66t47 176q0 19 -9 71q-71 -71 -186 -109z" />
+<glyph unicode="&#x1d4fd;" horiz-adv-x="618" d="M612 538l-22 -50h-145l-185 -354q-20 -40 -20 -69t21 -29q26 0 70 41t124 137l36 -28q-86 -112 -137.5 -156t-116.5 -44q-47 0 -72 24.5t-25 67.5q0 39 14 75.5t48 101.5l32 61h-2q-59 -55 -181 -66l-4 46q78 6 148.5 50.5t109.5 102.5l21 39h-101l22 50h102l70 131h120 l-69 -131h142z" />
+<glyph unicode="&#x1d4fe;" horiz-adv-x="842" d="M726 208l36 -28l-56 -71q-15 -19 -44 -50t-47.5 -41.5t-46.5 -19.5t-61 -9q-41 0 -66.5 24.5t-25.5 60.5v8h-1q-43 -47 -83 -71.5t-101 -24.5q-44 0 -72 25.5t-28 70.5q0 60 46 143l66 122q-53 -29 -115 -29q-53 0 -96 22l12 43q36 -15 82 -15q104 0 172 81h120 l-163 -308q-24 -45 -24 -78q0 -27 23 -27q66 0 151.5 111.5t174.5 301.5h120l-166 -318q-18 -34 -18 -62q0 -30 23 -30q48 0 188 169z" />
+<glyph unicode="&#x1d4ff;" horiz-adv-x="732" d="M659 224l11 -44q-27 -13 -60 -13q-45 0 -70 13q-67 -98 -135 -146t-150 -48q-52 0 -82.5 27t-30.5 78q0 58 59 165l49 90q-53 -28 -114 -28q-53 0 -96 22l12 43q36 -15 82 -15q104 0 172 81h118l-161 -307q-21 -38 -21 -73q0 -13 10 -23t23 -10q60 0 117 51t95 119 q-23 41 -23 91q0 69 31.5 115t75.5 46q26 0 36.5 -18.5t10.5 -54.5q0 -35 -15 -80t-35 -74q19 -14 52 -14q18 0 39 7z" />
+<glyph unicode="&#x1d500;" horiz-adv-x="1012" d="M939 224l11 -44q-27 -13 -60 -13q-45 0 -70 13q-67 -98 -135 -146t-150 -48q-47 0 -77.5 24t-35.5 68h-1q-50 -49 -87.5 -70.5t-95.5 -21.5q-44 0 -71.5 25.5t-27.5 70.5q0 60 46 143l66 122q-53 -29 -115 -29q-53 0 -96 22l12 43q36 -15 82 -15q104 0 172 81h120 l-164 -308q-23 -43 -23 -75q0 -12 6.5 -21t15.5 -9q66 0 149.5 111t173.5 302h120l-162 -307q-20 -37 -20 -73q0 -13 10 -23t23 -10q60 0 117 51t95 119q-23 41 -23 91q0 68 31.5 114.5t75.5 46.5q26 0 36.5 -18.5t10.5 -54.5q0 -35 -15 -80t-35 -74q19 -14 52 -14 q18 0 39 7z" />
+<glyph unicode="&#x1d501;" horiz-adv-x="820" d="M140 234l-38 29q88 110 153.5 153t134.5 43q63 0 99 -55q58 58 139 58q51 0 81.5 -23t30.5 -65q0 -36 -21 -60.5t-55 -24.5q-21 0 -36 12t-15 36q0 15 5.5 24t12.5 12.5t12.5 9t5.5 12.5q0 17 -24 17q-40 0 -79.5 -44.5t-65 -104t-41.5 -113.5t-16 -78q0 -33 30 -33 q41 0 103 42.5t136 134.5l35 -30q-103 -131 -196 -175q-48 -22 -99 -22q-85 0 -109 55q-73 -58 -146 -58q-54 0 -84 27.5t-30 69.5q0 33 20.5 57t53.5 24q21 0 37 -12t16 -36q0 -19 -9 -28.5t-18 -15.5t-9 -17q0 -8 8 -13.5t17 -5.5q51 0 104 70.5t83 147t30 111.5 q0 44 -31 44q-41 0 -90 -35.5t-135 -139.5z" />
+<glyph unicode="&#x1d502;" horiz-adv-x="784" d="M711 449l-272 -518q25 -12 73 -12q58 0 110 34l20 -40q-60 -44 -141 -44q-49 0 -89 14q-90 -107 -238 -107q-60 0 -94 23t-34 54q0 32 29.5 58t70.5 42q39 15 121 15q25 0 75 -8l45 85h-2q-34 -30 -66.5 -44.5t-80.5 -14.5q-44 0 -72 25.5t-28 70.5q0 58 47 143l66 122 q-53 -29 -115 -29q-53 0 -96 22l12 43q36 -15 82 -15q104 0 172 81h120l-164 -308q-24 -45 -24 -75q0 -12 7 -21t16 -9q66 0 154 112.5t176 300.5h120zM315 -91q-30 9 -63 9q-43 -1 -74 -16t-32 -46q0 -30 40 -30q74 0 129 83z" />
+<glyph unicode="&#x1d503;" horiz-adv-x="782" d="M665 224l37 -26q-58 -82 -93 -118q-47 -49 -91.5 -70t-98.5 -21q-76 0 -76 55q0 17 12.5 36.5t12.5 31.5q0 13 -20 13q-22 0 -45.5 -14t-71.5 -52q-57 -73 -127 -73q-22 0 -32.5 10.5t-10.5 25.5q0 35 41.5 67t108.5 44l230 189v1q-27 -7 -57 -7q-55 0 -89 16 q-76 -91 -200 -108l-12 39q35 8 54.5 14.5t50.5 24.5t53 45q-45 29 -45 72q0 33 20.5 53.5t53.5 20.5q30 0 47.5 -18t17.5 -42q0 -29 -10 -52q30 -15 76 -15q55 0 95 20q50 77 118 77q20 0 33.5 -9.5t13.5 -26.5q0 -24 -23 -45q-33 -30 -105 -47l-196 -162l1 -1q21 3 38 3 q47 0 75 -18t28 -43q0 -15 -10.5 -34.5t-10.5 -26.5q0 -12 13 -12q30 0 85.5 50t108.5 133z" />
+<glyph unicode="&#x1d63c;" horiz-adv-x="690" d="M665 0h-130l-26 162h-248l-106 -162h-130l478 690h28zM493 264l-32 204l-134 -204h166z" />
+<glyph unicode="&#x1d63d;" horiz-adv-x="636" d="M248 676h237q206 0 206 -125q0 -53 -35 -102t-101 -76l1 -4q92 -49 92 -128q0 -100 -90 -170.5t-218 -70.5h-260zM310 413h72q88 0 128 32.5t40 79.5q0 49 -86 49h-113zM233 102h103q86 0 128.5 37t42.5 93q0 41 -42 60t-105 19h-75z" />
+<glyph unicode="&#x1d63e;" horiz-adv-x="723" d="M797 597l-37 -149h-11q-36 141 -183 141q-117 0 -211 -91.5t-94 -238.5q0 -78 41 -127t123 -49q63 0 118 25.5t124 84.5l52 -68q-152 -144 -321 -144q-135 0 -207 69t-72 185q0 121 62 226.5t167 167.5t226 62q80 0 135.5 -20t87.5 -74z" />
+<glyph unicode="&#x1d63f;" horiz-adv-x="709" d="M248 676h179q345 0 345 -232q0 -51 -15 -108t-50.5 -117.5t-86.5 -108.5t-132 -79t-179 -31h-229zM235 102h67q258 0 317 234q11 47 11 81q0 157 -199 157h-78z" />
+<glyph unicode="&#x1d640;" horiz-adv-x="635" d="M728 676l-25 -102h-350l-42 -167h241l-26 -103h-241l-50 -202h387l-52 -102h-490l168 676h480z" />
+<glyph unicode="&#x1d641;" horiz-adv-x="582" d="M725 676l-12 -102h-360l-43 -169h213l-25 -102h-213l-75 -303h-130l168 676h477z" />
+<glyph unicode="&#x1d642;" horiz-adv-x="746" d="M785 597l-37 -149h-11q-37 141 -188 141q-72 0 -139 -38t-113.5 -115t-46.5 -175q0 -78 41 -128t127 -50q77 0 166 43l32 129h-112v102h256l-70 -279q-46 -31 -75.5 -47t-92 -33t-133.5 -17q-137 0 -209.5 68t-72.5 184q0 120 61 225.5t166.5 169t228.5 63.5 q79 0 133.5 -20.5t88.5 -73.5z" />
+<glyph unicode="&#x1d643;" horiz-adv-x="715" d="M803 676l-168 -676h-130l74 297h-295l-74 -297h-130l168 676h130l-69 -277h295l69 277h130z" />
+<glyph unicode="&#x1d644;" horiz-adv-x="440" d="M534 676l-16 -102h-90l-118 -472h90l-34 -102h-287l11 102h90l118 472h-90l39 102h287z" />
+<glyph unicode="&#x1d645;" horiz-adv-x="481" d="M574 676l-136 -545q-26 -104 -96.5 -165.5t-171.5 -61.5q-96 0 -155 98l73 98h18q21 -49 41.5 -71.5t57.5 -22.5q44 0 65.5 30.5t34.5 81.5l139 558h130z" />
+<glyph unicode="&#x1d646;" horiz-adv-x="712" d="M816 676l-3 -14l-388 -278l282 -384h-170l-220 306l-40 -29l-69 -277h-128l168 676h128l-66 -263l361 263h145z" />
+<glyph unicode="&#x1d647;" horiz-adv-x="603" d="M612 102l-44 -102h-488l168 676h130l-143 -574h377z" />
+<glyph unicode="&#x1d648;" horiz-adv-x="913" d="M1001 676l-168 -676h-128l116 467l-351 -467h-27l-119 467l-116 -467h-128l168 676h161l104 -440h3l324 440h161z" />
+<glyph unicode="&#x1d649;" horiz-adv-x="724" d="M812 676l-173 -694l-100 20l-206 500l-125 -502h-128l168 676h157l173 -424l106 424h128z" />
+<glyph unicode="&#x1d64a;" horiz-adv-x="778" d="M840 434q0 -42 -13 -97q-40 -157 -163.5 -256t-278.5 -99q-128 0 -203.5 70t-75.5 187q0 126 66.5 231.5t170.5 163.5t218 58q128 0 203.5 -70.5t75.5 -187.5zM701 425q0 77 -42 121t-123 44q-120 0 -205.5 -98.5t-85.5 -244.5q0 -77 42 -120t123 -43q103 0 176.5 68.5 t102.5 184.5q12 48 12 88z" />
+<glyph unicode="&#x1d64b;" horiz-adv-x="581" d="M248 676h209q238 0 238 -144q0 -110 -90.5 -182t-222.5 -72h-103l-69 -278h-130zM304 380h71q89 0 137 32t48 92q0 70 -142 70h-65z" />
+<glyph unicode="&#x1d64c;" horiz-adv-x="779" d="M714 -160l-4 -16q-50 0 -75.5 0.5t-69.5 3.5t-68.5 9t-58 17.5t-54.5 28.5t-42 43.5t-35 60.5q-95 21 -148.5 86.5t-53.5 162.5q0 127 67 233.5t171.5 164t217.5 57.5q128 0 203 -69.5t75 -187.5q0 -167 -110 -290.5t-263 -155.5q17 -27 48.5 -41.5t57.5 -17t70 -3.5z M700 425q0 77 -42 120.5t-123 43.5q-119 0 -205 -98.5t-86 -243.5q0 -77 42.5 -120.5t123.5 -43.5q102 0 175.5 68.5t102.5 184.5q12 48 12 89z" />
+<glyph unicode="&#x1d64d;" horiz-adv-x="670" d="M248 676h216q116 0 175 -36t59 -104q0 -84 -62.5 -149.5t-158.5 -86.5l180 -300h-159l-175 291h-41l-72 -291h-130zM307 393h71q184 0 184 119q0 32 -34 47t-110 15h-65z" />
+<glyph unicode="&#x1d64e;" horiz-adv-x="554" d="M637 620l-38 -154h-14q-9 57 -55 90t-101 33q-47 0 -87 -25.5t-40 -73.5q0 -30 26 -50.5t73 -40.5q89 -38 126 -74t37 -87q0 -50 -31.5 -109.5t-80.5 -95.5q-72 -52 -191 -52q-133 0 -195 81l24 162h14q16 -69 72.5 -105t111.5 -36q42 0 72.5 13.5t44.5 34t19.5 37 t5.5 30.5q0 27 -21 44t-74 39q-87 37 -125.5 76.5t-38.5 93.5q0 102 82 171t192 69q69 0 120 -20t72 -51z" />
+<glyph unicode="&#x1d64f;" horiz-adv-x="641" d="M785 676l-15 -102h-240l-143 -574h-130l143 574h-243l39 102h589z" />
+<glyph unicode="&#x1d650;" horiz-adv-x="699" d="M792 676l-107 -430q-65 -265 -340 -265q-222 0 -222 171q0 43 13 94l107 430h128l-104 -419q-15 -60 -15 -82q0 -44 31 -68t87 -24q91 0 150 70q20 24 43 116l101 407h128z" />
+<glyph unicode="&#x1d651;" horiz-adv-x="690" d="M833 676l-479 -694h-28l-133 694h130l74 -465l306 465h130z" />
+<glyph unicode="&#x1d652;" horiz-adv-x="997" d="M1135 676l-427 -691l-28 1l-82 408h-3l-286 -409h-28l-83 691h130l38 -439l304 439l79 -439l255 439h131z" />
+<glyph unicode="&#x1d653;" horiz-adv-x="740" d="M853 676l-325 -333l172 -343h-154l-120 239l-232 -239h-154l334 343l-165 333h154l113 -228l223 228h154z" />
+<glyph unicode="&#x1d654;" horiz-adv-x="694" d="M842 676l-360 -394l-70 -282h-130l70 282l-164 394h145l111 -283l253 283h145z" />
+<glyph unicode="&#x1d655;" horiz-adv-x="653" d="M769 676l-4 -16l-513 -558h396l-40 -102h-583l3 16l512 558h-334l38 102h525z" />
+<glyph unicode="&#x1d656;" horiz-adv-x="489" d="M181 308l-65 44q36 61 98.5 91t139.5 30q67 0 110 -27.5t43 -76.5q0 -15 -4 -30l-66 -263q-7 -29 -9 -76h-125l4 44q-40 -33 -77.5 -45.5t-87.5 -12.5q-41 0 -67.5 25t-26.5 70q0 41 18.5 81.5t47.5 66.5q74 68 261 79l4 16q2 10 2 15q0 39 -62 39q-85 0 -126 -70h-12z M336 152l16 61q-28 0 -54.5 -4t-55.5 -13t-46.5 -29.5t-17.5 -49.5q0 -36 47 -36q60 0 111 71z" />
+<glyph unicode="&#x1d657;" horiz-adv-x="512" d="M283 426l-1 -1q62 48 137 48q65 0 102 -40t37 -111q0 -77 -39.5 -160t-97.5 -128q-61 -47 -152 -47q-30 0 -59 12.5t-40 30.5h-3l-103 -43h-13l172 689h120l-62 -250h2zM250 301l-40 -158q25 -61 79 -61q52 0 95 63.5t43 144.5q0 41 -17 64.5t-45 23.5q-65 0 -115 -77z " />
+<glyph unicode="&#x1d658;" horiz-adv-x="462" d="M524 368l-91 -57h-17q-1 67 -68 67q-47 0 -97 -54.5t-50 -139.5q0 -42 22 -69t63 -27q71 0 123 57l52 -67q-59 -55 -104 -73.5t-116 -18.5q-78 0 -124 46t-46 122q0 90 47.5 165t116 114.5t138.5 39.5q64 0 107.5 -27.5t43.5 -77.5z" />
+<glyph unicode="&#x1d659;" horiz-adv-x="518" d="M625 676l-137 -550q-17 -68 -24 -118l-120 -22l-6 3l11 45h-2q-58 -48 -134 -48q-69 0 -106.5 40t-37.5 113q0 142 84.5 238t195.5 96q56 0 96 -39l60 242h120zM379 169l35 140q-14 38 -29 53.5t-46 15.5q-56 0 -98 -67t-42 -140q0 -41 16.5 -65.5t48.5 -24.5 q35 0 60.5 22t54.5 66z" />
+<glyph unicode="&#x1d65a;" horiz-adv-x="452" d="M398 143l54 -66q-61 -54 -103.5 -72t-106.5 -18q-81 0 -126 44t-45 120q0 51 20.5 109.5t49.5 98.5q82 114 216 114q67 0 101 -40.5t34 -110.5q0 -41 -12 -89l-7 -28h-272q-5 -15 -5 -39q-1 -39 23 -58.5t62 -19.5q67 0 117 55zM233 300h143q4 16 4 30q0 48 -53 48 q-26 0 -55 -22.5t-39 -55.5z" />
+<glyph unicode="&#x1d65b;" horiz-adv-x="340" d="M533 639l-45 -90l-17 -1q-17 49 -72 49q-59 0 -80 -84l-13 -51h90l-23 -95h-90l-91 -367h-120l91 367h-58l23 95h58l11 42q24 92 83.5 140t132.5 48q49 0 73 -11t47 -42z" />
+<glyph unicode="&#x1d65c;" horiz-adv-x="504" d="M599 451l-24 -95h-56q7 -4 7 -23q0 -62 -42 -108t-96.5 -65.5t-108.5 -19.5h-25q-57 -6 -57 -41q0 -23 40 -23h84q160 0 160 -94q0 -52 -27.5 -89.5t-76 -58.5t-105 -30.5t-122.5 -9.5q-68 0 -108 23t-40 67q0 32 21.5 61.5t63.5 48.5q-28 15 -28 46q0 35 23.5 63.5 t83.5 61.5v2q-53 41 -53 93q0 87 77 150t180 63q42 0 77 -14q15 -6 25 -7t55 -1h72zM410 326q0 52 -71 52q-50 0 -79 -29.5t-29 -62.5q0 -51 72 -51q48 0 77.5 25.5t29.5 65.5zM309 -19h-105q-38 -4 -53 -21t-15 -33q0 -38 78 -38q138 0 138 66q0 26 -43 26z" />
+<glyph unicode="&#x1d65d;" horiz-adv-x="510" d="M278 415h2q73 58 143 58q119 0 119 -98q0 -25 -7 -53l-80 -322h-120l77 309q3 13 3 25q0 44 -52 44q-23 0 -56 -21t-59 -64l-73 -293h-120l168 676h120z" />
+<glyph unicode="&#x1d65e;" horiz-adv-x="245" d="M366 688l-36 -145h-145l36 145h145zM298 462l-114 -462h-125l114 462h125z" />
+<glyph unicode="&#x1d65f;" horiz-adv-x="324" d="M440 688l-36 -145h-145l36 145h145zM372 462l-119 -478q-22 -90 -84.5 -138t-140.5 -48q-75 0 -118 67l64 85h18q16 -50 46 -50q70 0 93 95l116 467h125z" />
+<glyph unicode="&#x1d660;" horiz-adv-x="519" d="M599 462l-4 -18l-252 -171l163 -273h-142l-118 205l-24 -16l-47 -189h-120l168 676h120l-91 -364l213 150h134z" />
+<glyph unicode="&#x1d661;" horiz-adv-x="235" d="M348 676l-168 -676h-125l155 625l121 51h17z" />
+<glyph unicode="&#x1d662;" horiz-adv-x="776" d="M530 412h1q78 61 160 61q118 0 118 -95q0 -23 -8 -55l-80 -323h-118l77 310q3 14 3 25q0 44 -52 44q-25 0 -55 -20.5t-56 -64.5l-73 -294h-118l77 310q3 14 3 25q0 44 -52 44q-23 0 -54 -21t-57 -64l-73 -294h-118l114 462h114l-12 -50h2q78 61 144 61q94 0 113 -61z" />
+<glyph unicode="&#x1d663;" horiz-adv-x="510" d="M273 412h2q78 61 148 61q119 0 119 -97q0 -25 -7 -53l-80 -323h-120l77 310q3 14 3 25q0 44 -52 44q-23 0 -56 -21t-59 -64l-73 -294h-120l114 462h116z" />
+<glyph unicode="&#x1d664;" horiz-adv-x="501" d="M542 298q0 -127 -92 -219.5t-204 -92.5q-78 0 -126 48t-48 127q0 131 93 221.5t206 90.5q78 0 124.5 -48t46.5 -127zM417 295q0 83 -76 83q-59 0 -100.5 -65.5t-41.5 -142.5q0 -89 71 -89q40 0 71 27t46 65.5t22.5 70t7.5 51.5z" />
+<glyph unicode="&#x1d665;" horiz-adv-x="512" d="M274 416h2q68 57 147 57q63 0 99.5 -39t36.5 -105q0 -140 -88 -241.5t-202 -101.5q-52 0 -88 41l-48 -195l-113 -37h-17l166 667h116zM247 291l-35 -141q13 -38 28.5 -53.5t46.5 -15.5q60 0 101.5 74.5t41.5 149.5q0 74 -63 74t-120 -88z" />
+<glyph unicode="&#x1d666;" horiz-adv-x="512" d="M574 473l-159 -641l-113 -37h-17l58 231l-2 1q-52 -41 -127 -41q-69 0 -107 43t-38 113q0 130 89.5 230.5t202.5 100.5q64 0 96 -39l100 39h17zM376 158l39 158q-27 62 -76 62q-48 0 -95 -61t-47 -153q0 -39 17 -61t49 -22q61 0 113 77z" />
+<glyph unicode="&#x1d667;" horiz-adv-x="411" d="M519 455l-25 -98h-16q-15 22 -53 22q-48 0 -107 -54t-96 -136l-47 -189h-120l114 462h120l-22 -88h2q45 52 92.5 75.5t85.5 23.5q49 0 72 -18z" />
+<glyph unicode="&#x1d668;" horiz-adv-x="385" d="M442 412l-26 -106h-15q-26 72 -107 72q-29 0 -44 -16t-15 -30q0 -17 14 -29t41 -25q60 -28 82.5 -50.5t22.5 -54.5q0 -77 -62 -131.5t-159 -54.5q-50 0 -78 14t-59 49l30 120h15q8 -43 44 -65.5t75 -22.5q25 0 46.5 15.5t21.5 38.5q0 12 -11 22t-42 25q-57 28 -80 53 t-23 58q0 72 55.5 125.5t144.5 53.5q49 0 78 -15t51 -46z" />
+<glyph unicode="&#x1d669;" horiz-adv-x="386" d="M447 462l-23 -95h-107l-54 -218q-4 -13 -4 -25q0 -41 45 -41q40 0 77 32h18l-34 -94q-45 -33 -124 -33q-47 0 -78 24.5t-31 72.5q0 22 5 41l60 241h-99l4 17l82 78h36l16 61l127 108h20l-43 -169h107z" />
+<glyph unicode="&#x1d66a;" horiz-adv-x="518" d="M569 462l-87 -352q-16 -67 -17 -100l-130 -25l17 70h-2q-79 -69 -160 -69q-109 0 -109 94q0 24 8 58l80 324h120l-77 -311q-3 -13 -3 -25q0 -45 52 -45q22 0 56 24.5t61 67.5l71 289h120z" />
+<glyph unicode="&#x1d66b;" horiz-adv-x="462" d="M561 462l-321 -476h-26l-85 476h130l23 -253h2l146 253h131z" />
+<glyph unicode="&#x1d66c;" horiz-adv-x="701" d="M798 462l-313 -476h-26l-46 253l-179 -253h-26l-77 476h130l19 -257h2l105 174l-15 83h131l26 -245h2l136 245h131z" />
+<glyph unicode="&#x1d66d;" horiz-adv-x="506" d="M582 462l-202 -223l106 -239h-138l-65 143l-125 -143h-138l219 244l-94 218h137l53 -121l109 121h138z" />
+<glyph unicode="&#x1d66e;" horiz-adv-x="472" d="M569 462l-303 -496q-55 -90 -107 -130t-120 -40q-44 0 -66 22l24 98h15q21 -25 53 -25q63 0 120 103l-53 468h131l25 -275h2l148 275h131z" />
+<glyph unicode="&#x1d66f;" horiz-adv-x="441" d="M530 462l-6 -26l-318 -341h234l-32 -95h-387l6 25l318 342h-207l31 95h361z" />
+<glyph unicode="&#x1d71c;" horiz-adv-x="759" d="M724 23l-2 -23h-319l4 23h31q51 0 51 45q0 22 -2 34l-15 108h-159l-80 -139q-6 -12 -6 -22q0 -26 22 -26h56l-6 -23h-260l4 23q37 4 60.5 19t47.5 56l346 587h49l94 -624q6 -38 47 -38h37zM466 256l-23 178l-103 -178h126z" />
+<glyph unicode="&#x1d71d;" horiz-adv-x="726" d="M197 669h265q41 0 74.5 -3t68 -13t57.5 -26t38 -44t15 -66q0 -100 -100 -147q-27 -13 -64 -24q49 -9 89.5 -45.5t40.5 -87.5q0 -99 -73.5 -156t-225.5 -57h-340l4 23h40q42 0 58.5 14.5t24.5 47.5l116 502q2 8 2 22q-2 20 -13 28.5t-43 8.5h-37zM440 624l-58 -251 q12 -2 32 -2q24 0 40 4q54 12 81.5 52t27.5 98q0 22 -4.5 42t-22.5 38.5t-47 18.5h-49zM373 324l-64 -274q24 -5 52 -5q68 0 116.5 49t48.5 127q0 103 -122 103h-31z" />
+<glyph unicode="&#x1d71e;" horiz-adv-x="634" d="M749 669l-43 -184h-23q5 24 5 50q0 46 -27.5 67.5t-66.5 21.5h-155l-125 -542q-3 -15 -3 -25q0 -19 13.5 -26.5t45.5 -7.5h52l-5 -23h-375l4 23h36q43 0 60.5 14.5t24.5 46.5l115 503q3 15 3 37q-1 14 -12.5 18t-43.5 4h-38l3 23h555z" />
+<glyph unicode="&#x1d71f;" horiz-adv-x="632" d="M589 0h-557l405 685h48zM427 102l-44 332l-192 -332h236z" />
+<glyph unicode="&#x1d720;" horiz-adv-x="732" d="M754 669l-40 -168h-23q3 17 3 38q0 34 -22.5 54t-46.5 25.5t-52 5.5h-135l-55 -239h55q34 0 57 5t46.5 27.5t33.5 62.5h22l-54 -251h-23q6 24 6 65q0 46 -85 46h-69l-58 -258q-2 -12 -2 -17q0 -20 42 -20h65q111 0 171 36.5t91 124.5h22l-61 -206h-600l4 23h36 q42 0 60 14.5t25 46.5l115 504q2 12 2 16q0 42 -59 42h-37l4 23h562z" />
+<glyph unicode="&#x1d721;" horiz-adv-x="797" d="M830 669l-548 -623h194q32 0 55.5 2t52 10.5t49 23t38.5 41t28 64.5h23l-44 -187h-612l555 624h-177q-42 0 -68 -3t-60.5 -13.5t-60.5 -36.5t-43 -68h-23l46 166h595z" />
+<glyph unicode="&#x1d722;" horiz-adv-x="891" d="M946 669l-5 -23h-37q-43 0 -60 -14t-24 -47l-114 -503q-6 -21 -6 -22v-3q1 -19 12.5 -26.5t45.5 -7.5h41l-5 -23h-349l4 23h23q43 0 61.5 14.5t25.5 46.5l57 251h-242l-59 -253q0 -3 -2 -10.5t-2 -12.5q2 -21 14 -28.5t46 -7.5h25l-5 -23h-349l4 23h36q43 0 61 14.5 t25 46.5l115 503q3 12 3 21q0 38 -57 38h-40l6 23h348l-3 -23h-25q-44 0 -61 -14t-24 -46l-46 -203h242l47 204q3 12 3 23q0 36 -60 36h-37l3 23h364z" />
+<glyph unicode="&#x1d723;" horiz-adv-x="783" d="M533 440h23q-43 -93 -43 -199h-23v15q0 41 -30 41h-115q-23 0 -34 -9.5t-30 -46.5h-23q45 87 45 199h22q0 -33 9 -45t30 -12h116q17 0 28 11.5t25 45.5zM755 430q0 -84 -34.5 -165.5t-92 -143t-137 -99.5t-165.5 -38q-128 0 -199.5 74.5t-71.5 186.5q0 74 30.5 151.5 t84.5 142t136.5 105.5t176.5 41q127 0 199.5 -75.5t72.5 -179.5zM601 465q0 73 -32 123t-97 50q-53 0 -98 -31.5t-74 -79.5t-50 -107.5t-30.5 -114t-9.5 -100.5q0 -75 31.5 -124.5t94.5 -49.5q60 0 112 45.5t84 113t50.5 141t18.5 134.5z" />
+<glyph unicode="&#x1d724;" horiz-adv-x="502" d="M557 669l-4 -23h-38q-43 0 -60.5 -14.5t-24.5 -46.5l-116 -503q-1 -5 -1 -25q1 -18 13 -26t45 -8h37l-4 -23h-362l4 23h38q43 0 59 14t24 47l115 502q3 12 3 21q0 39 -57 39h-37l4 23h362z" />
+<glyph unicode="&#x1d725;" horiz-adv-x="795" d="M839 669l-4 -23q-38 0 -65.5 -14.5t-69.5 -48.5l-248 -201l191 -284q33 -49 60 -62t75 -13l-4 -23h-328l4 23h29q29 0 29 22q0 18 -16 40l-138 208l-48 -211q-1 -5 -1 -21q1 -21 13 -29.5t45 -8.5h38l-5 -23h-354l5 23h30q44 0 59 14t23 47l115 503q4 16 4 23 q0 36 -58 36h-37l4 23h347l-6 -23h-27q-40 0 -56.5 -15.5t-24.5 -48.5l-40 -178h2l243 198q15 13 15 23q0 9 -8.5 15t-22.5 6h-24l4 23h250z" />
+<glyph unicode="&#x1d726;" horiz-adv-x="759" d="M724 23l-2 -23h-319l4 23h31q51 0 51 45q0 22 -2 34l-44 332l-210 -363q-6 -12 -6 -22q0 -26 22 -26h56l-6 -23h-260l4 23q37 4 60.5 19t47.5 56l346 587h49l94 -624q6 -38 47 -38h37z" />
+<glyph unicode="&#x1d727;" horiz-adv-x="1016" d="M1071 669l-3 -23h-34q-46 0 -63.5 -15.5t-25.5 -49.5l-115 -499q-3 -10 -3 -20q0 -39 59 -39h39l-4 -23h-362l4 23h35q44 0 60.5 14.5t24.5 46.5l82 354h-1l-283 -438h-56l-90 441l-80 -348q-3 -15 -3 -40q2 -17 12.5 -23.5t42.5 -6.5h38l-3 -23h-300l4 23h36 q43 0 61.5 17.5t26.5 54.5l111 486q4 12 4 33q0 17 -13.5 24.5t-44.5 7.5h-39l4 23h246l91 -468l297 468h245z" />
+<glyph unicode="&#x1d728;" horiz-adv-x="869" d="M924 669l-3 -23h-38q-43 0 -61.5 -15t-25.5 -49l-131 -582h-57l-263 491l-92 -409q-2 -12 -2 -18v-8q1 -18 12.5 -25.5t44.5 -7.5h39l-4 -23h-301l4 23h36q43 0 60.5 14.5t24.5 46.5l117 510q-21 52 -71 52h-38l3 23h232l222 -435l80 350q2 7 2 20q0 42 -57 42h-37l4 23 h300z" />
+<glyph unicode="&#x1d729;" horiz-adv-x="718" d="M757 669l-38 -182h-23q4 15 4 30q0 46 -53 46h-337q-33 0 -59 -20t-34 -56h-23l38 182h525zM635 459l-51 -239h-23q4 16 4 31q-1 36 -45 36h-204q-40 0 -52.5 -13.5t-21.5 -53.5h-23l51 239h23q-5 -22 -5 -32q0 -20 11 -27t38 -7h203q31 0 47 14t25 52h23zM663 187 l-39 -187h-567l39 187h23q-4 -16 -4 -25q0 -50 71 -50h349q52 0 73.5 15.5t31.5 59.5h23z" />
+<glyph unicode="&#x1d72a;" horiz-adv-x="777" d="M755 432q0 -117 -58 -220.5t-157.5 -165.5t-213.5 -62q-128 0 -199.5 75t-71.5 188q0 107 51 206t151.5 165.5t225.5 66.5q127 0 199.5 -74.5t72.5 -178.5zM601 467q0 73 -32 122t-97 49t-118 -46.5t-83 -116t-45.5 -140t-15.5 -128.5q0 -75 31.5 -125.5t94.5 -50.5 q60 0 112 45.5t84 114t50.5 142t18.5 134.5z" />
+<glyph unicode="&#x1d72b;" horiz-adv-x="887" d="M942 669l-5 -23h-37q-43 0 -60 -13.5t-24 -46.5l-115 -504q-4 -20 -4 -26q0 -18 12.5 -25.5t45.5 -7.5h40l-5 -23h-349l5 23h22q45 0 61.5 11.5t24.5 49.5l123 540h-242l-124 -542q-3 -15 -3 -26q0 -15 8 -22.5t19 -9t32 -1.5h25l-5 -23h-348l5 23h35q42 0 59.5 14 t25.5 47l115 504q1 6 2 20t1 16q0 8 -15 15t-42 7h-40l5 23h752z" />
+<glyph unicode="&#x1d72c;" horiz-adv-x="612" d="M198 669h284q128 0 189.5 -38t61.5 -125q0 -83 -74 -144.5t-223 -61.5q-46 0 -67 3l-51 -221q-4 -20 -4 -24q2 -21 13.5 -28t46.5 -7h52l-4 -23h-380l4 23h40q43 0 60.5 14.5t24.5 46.5l115 504q3 12 3 21q-1 19 -14 28t-46 9h-37zM441 623l-61 -273q22 -5 40 -5 q69 0 113 49t44 127q0 44 -26 73.5t-80 29.5q-21 0 -30 -1z" />
+<glyph unicode="&#x1d72d;" horiz-adv-x="783" d="M755 430q0 -84 -34.5 -165.5t-92 -143t-137 -99.5t-165.5 -38q-128 0 -199.5 74.5t-71.5 186.5q0 74 30.5 151.5t84.5 142t136.5 105.5t176.5 41q127 0 199.5 -75.5t72.5 -179.5zM237 383h356q8 46 8 82q0 73 -32 123t-97 50q-58 0 -106.5 -38.5t-78.5 -93t-50 -123.5z M574 297h-356q-8 -45 -8 -92q0 -75 31.5 -124.5t94.5 -49.5q81 0 142.5 77t95.5 189z" />
+<glyph unicode="&#x1d72e;" horiz-adv-x="759" d="M787 669l-39 -168h-23q3 17 3 50q0 24 -9 39.5t-26 22t-33.5 9t-39.5 2.5h-212l159 -250l-286 -266h270q63 0 97.5 19t63.5 73h25l-76 -200h-597l372 338l-217 331h568z" />
+<glyph unicode="&#x1d72f;" horiz-adv-x="568" d="M700 669l-44 -187h-24q7 21 7 54q0 88 -111 88h-78l-123 -541q-4 -24 -4 -25q1 -19 12.5 -27t44.5 -8h42l-3 -23h-368l4 23h40q43 0 60.5 14.5t24.5 46.5l124 540h-75q-74 0 -119 -37.5t-60 -104.5h-22l43 187h629z" />
+<glyph unicode="&#x1d730;" horiz-adv-x="589" d="M721 681l-9 -23q-20 0 -42 -15t-36.5 -31t-40.5 -48l-200 -245l-54 -233q-4 -18 -4 -29q0 -19 12 -26.5t45 -7.5h40l-6 -23h-361l8 23h34q42 0 58 14t24 47l57 244l-80 205q-13 34 -22.5 52.5t-25 37.5t-36.5 27t-51 8l6 23q49 4 103 4q35 0 62 -9.5t42 -20.5t30 -36 t20 -38l17 -45l51 -141l151 181q47 57 88 81t120 24z" />
+<glyph unicode="&#x1d731;" horiz-adv-x="827" d="M546 587l-5 -24q49 0 93 -10t82 -29.5t60.5 -54t22.5 -79.5q0 -58 -26.5 -107t-67 -81t-90.5 -55t-96 -33t-84 -10h-1l-7 -32q-1 -6 -1 -19q0 -30 52 -30h47l-5 -23h-365l6 23q61 0 85.5 8.5t30.5 35.5l8 37q-109 0 -183 48.5t-74 140.5q0 67 35 121t90 85.5t116.5 47.5 t121.5 16l10 44q1 2 1 7q0 14 -16 23t-42 9h-41l5 23h364l-5 -23h-41q-39 0 -56 -14.5t-24 -44.5zM529 517l-85 -366q63 0 127.5 71.5t64.5 157.5q0 56 -29.5 96.5t-77.5 40.5zM298 151l85 366q-66 0 -131.5 -78t-65.5 -154q0 -59 31 -96.5t81 -37.5z" />
+<glyph unicode="&#x1d732;" horiz-adv-x="808" d="M830 669l-3 -23h-24q-15 0 -28.5 -3.5t-21.5 -6t-19.5 -13t-15 -14t-16.5 -19t-15 -18.5l-177 -212l98 -270q13 -35 26 -51t36 -16h36l-4 -23h-316l3 23h28q49 0 49 36q0 15 -5 27l-63 171l-154 -179q-8 -9 -8 -22q0 -14 10.5 -23.5t28.5 -9.5h42l-4 -23h-285l4 23 q84 10 142 77l198 229l-89 237q-29 80 -84 80h-27l4 23h318l-4 -23h-39q-34 0 -34 -27q0 -8 8 -32l53 -155l137 162q10 12 10 27q0 25 -28 25h-31l4 23h260z" />
+<glyph unicode="&#x1d733;" horiz-adv-x="694" d="M781 684l-5 -23q-9 0 -16.5 -2.5t-13.5 -9t-11 -12.5t-10 -16.5t-7.5 -17t-6 -19.5t-5 -18t-4.5 -18t-3 -14q-27 -118 -55 -158q-77 -112 -255 -112l-39 -171q-6 -24 -6 -36q0 -34 80 -34h17l-5 -23h-362l5 23h23q48 0 69.5 14t31.5 58l39 169q-48 0 -94 14t-81 49 t-35 84q0 33 18.5 94t18.5 94q0 21 -10 41.5t-29 21.5l5 23h33q62 0 94 -39t32 -102q0 -46 -17 -102q-13 -43 -13 -63q0 -64 89 -68l62 271q3 10 3 21q0 44 -72 44q-18 0 -25 -1l6 23h362l-6 -23h-29q-5 0 -23 -1.5t-24 -5.5t-17.5 -10.5t-17 -18.5t-9.5 -28l-63 -271 q87 0 124 85q12 26 23 77.5t18 71.5q25 69 68.5 104t114.5 35h33z" />
+<glyph unicode="&#x1d734;" horiz-adv-x="826" d="M300 92l6 31q-74 13 -116 62.5t-42 122.5q0 61 27 126t76 121.5t127.5 93t170.5 36.5q130 0 198 -69t68 -178q0 -115 -79 -201t-196 -114l-9 -31h153q42 0 63 75h23l-38 -167h-305l42 153q79 17 134 113t55 197q0 70 -30.5 122t-89.5 52q-62 0 -116.5 -55t-84.5 -134.5 t-30 -155.5q0 -118 83 -139l-28 -153h-305l38 167h23q-5 -25 -5 -38q0 -20 9 -28.5t32 -8.5h146z" />
+<glyph unicode="&#x1d735;" horiz-adv-x="632" d="M600 669l-405 -685h-48l-104 685h557zM441 567h-236l44 -332z" />
+<glyph unicode="&#x1d736;" horiz-adv-x="624" d="M630 449l-163 -258q-1 -6 -1 -12q0 -17 1 -23q9 -98 41 -98q35 0 58 76l24 -7q-34 -139 -121 -139q-33 0 -58 24.5t-31 54.5q-72 -77 -181 -77q-72 0 -113.5 43.5t-41.5 124.5q0 117 79.5 210t196.5 93q54 0 88.5 -28.5t47.5 -70.5l49 87h125zM369 280q0 60 -14.5 100.5 t-47.5 40.5q-43 0 -95 -83.5t-52 -194.5q0 -48 14.5 -82t42.5 -34q36 0 79 57.5t67 120.5q6 33 6 75z" />
+<glyph unicode="&#x1d737;" horiz-adv-x="555" d="M54 -114l114 487q24 104 63 166.5t102 107.5q53 38 129 38q51 0 86 -33.5t35 -84.5q0 -57 -31.5 -105t-81.5 -68v-2q38 -6 63 -36.5t25 -89.5q0 -65 -28.5 -127t-90 -106.5t-143.5 -44.5q-67 0 -97 18l-28 -124q-12 -54 -26 -87h-117q10 24 26 91zM304 480l-87 -393 q0 -30 19.5 -44.5t47.5 -14.5q64 0 110 74.5t46 152.5q0 117 -52 117q-9 0 -23.5 -3t-21.5 -3q-33 0 -33 25q0 14 14 25t42 11q7 0 30.5 -5.5t27.5 -5.5q26 0 41 43.5t15 88.5q0 40 -18 62.5t-44 22.5q-47 0 -72 -37t-42 -116z" />
+<glyph unicode="&#x1d738;" horiz-adv-x="490" d="M503 449l-264 -401q0 -35 -5 -73t-16 -80.5t-35 -70t-57 -27.5q-29 0 -43 19.5t-14 41.5q0 20 10 45.5t20.5 43.5t31.5 50t29 46q13 95 13 208q0 47 -10.5 94t-34.5 47q-38 0 -61 -81h-23q41 151 121 151q49 0 66.5 -36.5t17.5 -98.5q0 -48 -7 -125l135 247h126z" />
+<glyph unicode="&#x1d739;" horiz-adv-x="538" d="M44 169v1q0 89 67 166.5t170 94.5q-45 23 -74.5 55.5t-29.5 68.5q0 64 57 97t135 33q48 0 95 -17t47 -46q0 -62 -59 -62q-23 0 -40.5 12.5t-26.5 28t-25.5 28t-39.5 12.5q-68 0 -68 -56q0 -24 29.5 -46.5t71.5 -43.5t84 -46t71.5 -66t29.5 -93q0 -125 -91.5 -211.5 t-216.5 -86.5q-87 0 -136.5 47t-49.5 130zM422 259q0 55 -39 94.5t-68 39.5q-69 -17 -112 -84t-43 -154q0 -69 20.5 -96t67.5 -27q67 0 120.5 77.5t53.5 149.5z" />
+<glyph unicode="&#x1d73a;" horiz-adv-x="495" d="M451 389l-18 -7q-11 13 -19 20t-30 13.5t-54 6.5q-52 0 -89.5 -31.5t-37.5 -76.5q0 -24 16.5 -37.5t43.5 -13.5q5 0 31 4.5t43 4.5q47 0 47 -22q0 -37 -65 -37q-5 0 -27.5 3t-31.5 3q-38 0 -77 -30.5t-39 -78.5q0 -37 28.5 -56t72.5 -19q43 0 76.5 17.5t74.5 61.5l18 -8 q-92 -116 -224 -116q-72 0 -117 31.5t-45 76.5q0 48 29.5 86.5t78.5 55.5v3q-22 7 -35.5 27t-13.5 40q0 62 61 107t166 45q48 0 87.5 -22t49.5 -51z" />
+<glyph unicode="&#x1d73b;" horiz-adv-x="472" d="M330 685l7 -21q-39 -15 -59.5 -36.5t-20.5 -39.5q0 -33 31 -41q118 104 186 104q48 0 48 -30q0 -39 -65.5 -84t-133.5 -45q-73 -49 -123 -133t-50 -180q0 -42 26.5 -64t73.5 -22q73 0 114.5 -23.5t41.5 -69.5q0 -72 -74 -138q-74 -65 -121 -65q-37 0 -57 18.5t-20 44.5 q0 54 61 54q25 0 36.5 -21t25.5 -21q30 0 51.5 22t21.5 58q0 25 -14.5 35.5t-47.5 10.5q-5 0 -34 -3.5t-39 -3.5q-64 0 -107.5 41.5t-43.5 105.5q0 97 50.5 186.5t155.5 185.5q-29 4 -51.5 20t-22.5 39q0 39 38 70.5t116 45.5z" />
+<glyph unicode="&#x1d73c;" horiz-adv-x="517" d="M248 356l6 1q25 47 70.5 76t97.5 29q49 0 69 -19.5t20 -55.5q0 -26 -8 -64l-76 -325q-8 -35 -15 -94.5t-7 -87.5q0 -7 6 -21h-113q-13 25 -13 52q0 51 100 467q3 15 3 38q0 35 -29 35q-40 0 -92 -93.5t-74 -183.5l-26 -110h-115l74 318q6 26 6 52q0 22 -18 22 q-24 0 -61 -45l-20 12q28 43 71.5 73t89.5 30q60 0 60 -47q0 -19 -6 -59z" />
+<glyph unicode="&#x1d73d;" horiz-adv-x="566" d="M555 476q0 -127 -50.5 -241t-129.5 -180t-163 -66q-80 0 -124 61t-44 165q0 116 47 225.5t124 177t159 67.5q83 0 132 -54.5t49 -154.5zM184 359h243q13 67 13 128q0 87 -14.5 122.5t-51.5 35.5q-57 0 -110 -84.5t-80 -201.5zM417 315h-245q-15 -71 -15 -132 q0 -154 70 -154q57 0 107 83t83 203z" />
+<glyph unicode="&#x1d73e;" horiz-adv-x="318" d="M255 104l19 -12q-57 -101 -152 -101q-67 0 -67 56q0 16 4 31l64 276q6 26 6 36q0 18 -20 18q-21 0 -37 -3l-4 23l197 34l-77 -331q-8 -40 -8 -48q0 -10 6 -17.5t15 -7.5q5 0 10 2t8.5 4.5t9 8t8.5 9t9 11.5t9 11z" />
+<glyph unicode="&#x1d73f;" horiz-adv-x="560" d="M240 294l129 101q84 67 140 67q68 0 68 -50q0 -62 -59 -62q-18 0 -28.5 7t-13.5 16t-10.5 16t-19.5 7q-14 0 -49 -29l-114 -93l112 -199q18 -32 40 -42t63 -10l-5 -23h-269l5 23h29q28 0 28 15q0 14 -13 36l-60 107l-42 -181h-116l82 363q4 16 4 28q0 17 -26 17 q-15 0 -32 -3l-3 23l196 34z" />
+<glyph unicode="&#x1d740;" horiz-adv-x="570" d="M514 130h23q-13 -62 -45 -104t-83 -42q-69 0 -69 117q0 22 2.5 46t8 64t8.5 64l-192 -275h-112l302 435v50q0 130 -55 130q-37 0 -60 -77h-23q40 147 125 147q19 0 30.5 -11t16.5 -34.5t6.5 -45t1.5 -55.5v-387q0 -53 16.5 -75.5t38.5 -22.5q16 0 32.5 20t27.5 56z" />
+<glyph unicode="&#x1d741;" horiz-adv-x="636" d="M583 83l20 -12q-58 -103 -161 -103q-29 0 -43 18t-14 43q0 28 16 78l-3 1q-23 -44 -62 -77t-73 -33q-38 0 -55 27h-2l-15 -59l-13 -52q-4 -16 -10.5 -38.5t-10.5 -34.5t-9.5 -24.5t-11.5 -21.5h-103q24 40 48 138l122 516h113l-74 -316q-3 -12 -3 -23q1 -21 9.5 -29 t30.5 -8q49 0 103.5 91.5t82.5 202.5l21 82h111l-79 -338q-7 -28 -7 -44q0 -31 19 -31q22 0 53 47z" />
+<glyph unicode="&#x1d742;" horiz-adv-x="523" d="M510 455l24 -7q-30 -122 -102.5 -228t-188.5 -230h-52l-58 378q-5 34 -76 34l-2 23q99 4 182 34l45 -315h1q67 65 117.5 130.5t69.5 100.5t40 80z" />
+<glyph unicode="&#x1d743;" horiz-adv-x="476" d="M332 685l6 -23q-79 -32 -79 -73q0 -7 2.5 -13.5t5 -9.5t5.5 -5.5t3 -3.5q31 29 78 51.5t80 22.5q54 0 54 -29q0 -41 -53.5 -66t-121.5 -25q-32 0 -49 -23t-17 -55q0 -21 14 -43q68 39 134 39q74 0 74 -31q0 -22 -15.5 -37t-41 -21t-45 -8.5t-38.5 -2.5q-32 0 -64 8 q-56 -24 -95 -68.5t-39 -103.5q0 -39 23 -55t77 -16q97 0 142 -21.5t45 -72.5q0 -70 -67 -134q-73 -69 -128 -69q-37 0 -57 19t-20 46q0 23 15 37.5t44 14.5q20 0 30 -11t16.5 -21.5t18.5 -10.5q31 0 51.5 24.5t20.5 57.5q0 45 -61 45q-10 0 -34.5 -3.5t-35.5 -3.5 q-84 0 -133 29.5t-49 91.5q0 138 174 249q-28 27 -28 75q0 22 18 48t41 37v3q-23 3 -38 18.5t-15 37.5q0 75 152 105z" />
+<glyph unicode="&#x1d744;" horiz-adv-x="561" d="M539 297q0 -136 -90.5 -221.5t-217.5 -85.5q-88 0 -137.5 48.5t-49.5 131.5q0 126 87.5 209t207.5 83q91 0 145.5 -43t54.5 -122zM423 300q0 64 -25 93t-64 29q-64 0 -119 -88t-55 -176q0 -71 21 -99.5t67 -28.5q68 0 121.5 86t53.5 184z" />
+<glyph unicode="&#x1d745;" horiz-adv-x="579" d="M590 449l-21 -91h-113q-17 -47 -35 -119.5t-18 -114.5q0 -22 9 -41.5t25 -19.5q37 0 65 71l24 -6q-12 -53 -55.5 -94t-101.5 -41q-73 0 -73 83q0 24 7 61q9 44 32.5 121.5t29.5 99.5h-61q-10 -28 -24 -83l-26 -100q-13 -45 -31.5 -90.5t-47 -71.5t-65.5 -26q-71 0 -71 51 q0 36 42 51q39 14 58 68l71 201q-76 0 -118 -54h-23q43 76 92.5 110.5t130.5 34.5h298z" />
+<glyph unicode="&#x1d746;" horiz-adv-x="595" d="M58 -110l62 267q24 101 67.5 169t94.5 101q53 35 115 35q67 0 116 -45t49 -135q0 -119 -85.5 -206.5t-188.5 -87.5q-54 0 -87 19l-25 -110q-15 -69 -28 -102h-115q8 20 25 95zM252 240l-33 -152q1 -30 20.5 -45t47.5 -15q55 0 108 82t53 171q0 131 -76 131q-39 0 -72 -50 t-48 -122z" />
+<glyph unicode="&#x1d747;" horiz-adv-x="480" d="M508 388q0 -19 -16 -36t-40 -17q-29 0 -51.5 23.5t-45.5 23.5q-79 0 -146.5 -65t-67.5 -152q0 -39 23 -55t77 -16q97 0 142 -21.5t45 -72.5q0 -35 -19 -75t-48 -68q-64 -60 -128 -60q-37 0 -57 19t-20 46q0 23 15 37.5t44 14.5q20 0 30 -11t16.5 -21.5t18.5 -10.5 q31 0 51.5 24.5t20.5 57.5q0 45 -61 45q-10 0 -34.5 -3.5t-35.5 -3.5q-84 0 -133 29.5t-49 91.5q0 75 49 151.5t125 127.5q107 71 192 71q46 0 74.5 -19.5t28.5 -54.5z" />
+<glyph unicode="&#x1d748;" horiz-adv-x="592" d="M603 449l-21 -91h-176q8 -17 26 -32t34 -25.5t28.5 -33.5t12.5 -56q0 -90 -81.5 -155.5t-193.5 -65.5q-89 0 -138.5 47.5t-49.5 129.5q0 112 84.5 197t226.5 85h248zM391 207v1q0 56 -15 89.5t-44 60.5q-67 0 -119.5 -54.5t-52.5 -148.5q0 -70 21 -97.5t67 -27.5 q58 0 100.5 56t42.5 121z" />
+<glyph unicode="&#x1d749;" horiz-adv-x="469" d="M502 449l-21 -91h-149l-53 -188q-8 -29 -8 -56q0 -51 32 -51q37 0 67 71l22 -6q-11 -51 -55 -93t-94 -42q-38 0 -63.5 17t-25.5 53q0 52 15 100l59 195h-32q-36 0 -77 -23.5t-63 -65.5h-23q23 63 82.5 121.5t131.5 58.5h255z" />
+<glyph unicode="&#x1d74a;" horiz-adv-x="552" d="M303 423l5 39q102 0 164.5 -43t62.5 -131q0 -124 -90.5 -211t-200.5 -87q-74 0 -121 27.5t-47 81.5q0 20 12 71l29 125q12 53 12 66q0 27 -17 27q-24 0 -59 -45l-20 12q27 43 69 73t91 30q29 0 44 -13.5t15 -34.5q0 -23 -10 -67l-40 -172q-9 -40 -9 -64q0 -77 67 -77 q68 0 122 82t54 178q0 133 -133 133z" />
+<glyph unicode="&#x1d74b;" horiz-adv-x="706" d="M259 30l27 122q22 101 52 155t92 105q15 13 47 27.5t52 14.5q58 0 98 -44.5t40 -118.5q0 -115 -82 -204t-220 -97l-44 -195h-117l45 195q-92 7 -143 58.5t-51 129.5q0 120 88 202t209 82h41l-10 -39q-82 0 -147 -80.5t-65 -172.5q0 -54 24 -93.5t64 -46.5zM424 241 l-49 -211q63 6 119.5 85t56.5 182q0 62 -10 84.5t-29 22.5q-50 0 -88 -163z" />
+<glyph unicode="&#x1d74c;" horiz-adv-x="621" d="M676 449l-293 -360l13 -121q11 -102 44 -102q47 0 67 79h23q-17 -75 -44 -112t-73 -37q-23 0 -38 12.5t-22 38.5t-10 49.5t-4 60.5l-3 89l-182 -230h-121l302 363l-6 83q-5 72 -19.5 101t-40.5 29q-18 0 -38 -20.5t-29 -55.5h-23q8 59 36 102.5t85 43.5q39 0 56.5 -38 t20.5 -119l3 -86l177 230h119z" />
+<glyph unicode="&#x1d74d;" horiz-adv-x="701" d="M756 462l-5 -39q-53 -5 -80.5 -42t-42.5 -100q-12 -49 -23.5 -85t-33.5 -77.5t-50 -67.5t-72.5 -43.5t-99.5 -17.5l-44 -195h-116l44 195q-79 6 -123.5 48.5t-44.5 120.5q0 29 20.5 93t19.5 100q-2 61 -72 71l7 39h49q65 0 94.5 -32t29.5 -83q0 -34 -16 -99.5t-16 -98.5 q0 -49 16.5 -81.5t44.5 -37.5l98 419h116l-98 -419q36 0 69.5 44t53 96.5t33.5 112.5q10 40 21.5 67.5t32.5 55.5t56 42t83 14h49z" />
+<glyph unicode="&#x1d74e;" horiz-adv-x="687" d="M441 462h39q85 0 135 -49.5t50 -127.5q0 -115 -76 -205t-168 -90q-74 0 -104 65q-55 -65 -144 -65q-75 0 -113 50.5t-38 125.5q0 68 36 135.5t94 107.5q76 53 173 53h32l-10 -39q-56 0 -112 -47q-46 -39 -71.5 -107t-25.5 -142q0 -38 17 -67.5t43 -29.5q25 0 50.5 24 t38.5 66q-10 47 -10 84q0 62 27.5 115t79.5 53t52 -71q0 -68 -74 -179q-2 -10 -2 -18q0 -35 20 -54.5t46 -19.5q33 0 62.5 44.5t45 101t15.5 101.5q0 146 -116 146z" />
+<glyph unicode="&#x1d74f;" horiz-adv-x="559" d="M234 627l2 23q43 36 119 36q204 0 204 -256q0 -53 -12 -111.5t-39 -117.5t-64 -105.5t-92.5 -76t-120.5 -29.5q-89 0 -138 46.5t-49 129.5q0 119 89 206t209 87q41 0 80.5 -19t52.5 -51h4v8q2 18 2 27q0 48 -5.5 83.5t-21 69t-47.5 51t-80 17.5q-30 0 -93 -18zM423 293 q0 64 -25.5 95t-63.5 31q-64 0 -119 -88.5t-55 -176.5q0 -70 20.5 -97t67.5 -27q68 0 121.5 82.5t53.5 180.5z" />
+<glyph unicode="&#x1d750;" horiz-adv-x="481" d="M481 461l-26 -140h-23q0 24 -2.5 39.5t-10.5 31.5t-27 24t-49 8q-51 0 -98 -50.5t-65 -110.5h188l-10 -44h-188q-10 -30 -10 -66q0 -58 27 -88t74 -30q80 0 152 79l18 -6q-17 -22 -30.5 -36.5t-41 -36.5t-66 -33.5t-85.5 -11.5q-82 0 -123 45.5t-41 112.5q0 116 85 214.5 t198 98.5q41 0 67 -9.5t31 -9.5q26 0 33 19h23z" />
+<glyph unicode="&#x1d751;" horiz-adv-x="607" d="M584 241l-5 -31q-45 2 -67 6q-18 -47 -36.5 -81.5t-46.5 -71t-66.5 -56.5t-84.5 -20q-160 0 -160 128q0 21 8 62t8 45v4q0 23 -17 23q-24 0 -64 -49l-20 18q26 39 68.5 69t83.5 30q33 0 49.5 -24t16.5 -58q0 -11 -4 -31q-19 -84 -19 -120q0 -68 50 -68q68 0 128 228 q-204 98 -204 252q0 88 53.5 145t140.5 57q48 0 94 -26q80 -47 80 -190q0 -100 -44 -228q33 -11 58 -13zM454 541q0 119 -60 119q-42 0 -61 -48t-19 -98q0 -117 105 -215q35 146 35 242z" />
+<glyph unicode="&#x1d752;" horiz-adv-x="607" d="M630 449l-154 -146q-18 -35 -33 -92q-13 -48 -13 -78q0 -36 36 -36q31 0 46 -18q11 -12 11 -33q0 -26 -17 -43q-18 -18 -52 -18q-44 0 -65 36q-16 26 -16 69q0 81 39 153l-260 -243h-164l157 147q17 35 33 91q13 48 13 76q0 36 -36 36q-30 0 -45 18q-12 14 -12 33 q0 25 17 42q19 19 52 19q44 0 65 -36q16 -26 16 -69q0 -77 -38 -150l256 242h164z" />
+<glyph unicode="&#x1d753;" horiz-adv-x="683" d="M512 685l-51 -223q84 0 139 -43.5t55 -125.5q0 -66 -29 -127q-37 -80 -109.5 -125.5t-163.5 -50.5l-44 -195h-117l45 195q-86 6 -139.5 55.5t-53.5 132.5q0 64 32 126q40 76 111 117t158 41l50 223h117zM453 423l-90 -393q59 12 108 74.5t63 127.5q5 21 5 53 q0 48 -21.5 89.5t-64.5 48.5zM247 30l90 393q-73 -11 -125 -90.5t-52 -157.5q0 -52 21 -93.5t66 -51.5z" />
+<glyph unicode="&#x1d754;" horiz-adv-x="585" d="M252 -205h-19q3 7 3 15q0 19 -30 39.5t-66 38.5t-66 55.5t-30 86.5q0 100 38.5 198t115 166t172.5 68q89 0 141 -43t52 -125q0 -121 -87.5 -212.5t-209.5 -91.5q-88 0 -131 61l-5 -1q0 -37 23.5 -64.5t51.5 -41.5t51.5 -34t23.5 -44q0 -45 -28 -71zM448 297 q0 64 -25.5 94.5t-63.5 30.5q-42 0 -83.5 -44t-66 -107t-24.5 -119q0 -70 20.5 -96t67.5 -26q68 0 121.5 84.5t53.5 182.5z" />
+<glyph unicode="&#x1d755;" horiz-adv-x="868" d="M879 449l-21 -91h-73q15 -33 15 -75q0 -115 -76 -204t-168 -89q-74 0 -104 65q-55 -65 -144 -65q-75 0 -113 50.5t-38 125.5q0 106 78 192h-36q-92 0 -143 -91h-23q52 182 248 182h598zM668 358h-312q-40 -41 -61.5 -103t-21.5 -128q0 -38 17 -67.5t43 -29.5 q25 0 49.5 22.5t37.5 64.5q-6 34 -6 57q0 17 4 40.5t13.5 52t29.5 48t48 19.5q44 0 44 -68q0 -28 -8.5 -54t-18 -43t-29.5 -47q-2 -10 -2 -18q0 -35 20 -54.5t46 -19.5q33 0 62.5 44t45 100t15.5 101q0 51 -16 83z" />
+<glyph unicode="&#x1d790;" horiz-adv-x="690" d="M665 0h-130l-26 162h-248l-106 -162h-130l478 690h28zM493 264l-32 204l-134 -204h166z" />
+<glyph unicode="&#x1d791;" horiz-adv-x="706" d="M228 676h237q206 0 206 -125q0 -53 -35 -102t-101 -76l1 -4q92 -49 92 -128q0 -100 -90 -170.5t-218 -70.5h-260zM290 413h72q88 0 128 32.5t40 79.5q0 49 -86 49h-113zM213 102h103q86 0 128.5 37t42.5 93q0 41 -42 60t-105 19h-75z" />
+<glyph unicode="&#x1d792;" horiz-adv-x="602" d="M705 676l-13 -102h-359l-143 -574h-130l168 676h477z" />
+<glyph unicode="&#x1d793;" horiz-adv-x="720" d="M680 0h-640l478 690h28zM533 102l-57 366l-239 -366h296z" />
+<glyph unicode="&#x1d794;" horiz-adv-x="683" d="M708 676l-25 -102h-350l-42 -167h241l-26 -103h-241l-50 -202h387l-52 -102h-490l168 676h480z" />
+<glyph unicode="&#x1d795;" horiz-adv-x="707" d="M769 676l-4 -16l-513 -558h396l-40 -102h-583l3 16l512 558h-334l38 102h525z" />
+<glyph unicode="&#x1d796;" horiz-adv-x="748" d="M783 676l-168 -676h-130l74 297h-295l-74 -297h-130l168 676h130l-69 -277h295l69 277h130z" />
+<glyph unicode="&#x1d797;" horiz-adv-x="847" d="M600 398l-12 -102h-282l38 102h256zM822 434q0 -95 -38.5 -180.5t-102 -144.5t-145.5 -93.5t-167 -34.5q-128 0 -203.5 70t-75.5 188q0 95 39.5 180t103 144t145.5 93.5t167 34.5q127 0 202 -70t75 -187zM684 425q0 77 -42 120.5t-123 43.5q-119 0 -205 -98.5t-86 -243.5 q0 -77 42.5 -120.5t123.5 -43.5q122 0 206 102t84 240z" />
+<glyph unicode="&#x1d798;" horiz-adv-x="435" d="M505 676l-16 -102h-90l-118 -472h90l-34 -102h-287l11 102h90l118 472h-90l39 102h287z" />
+<glyph unicode="&#x1d799;" horiz-adv-x="712" d="M796 676l-3 -14l-388 -278l282 -384h-170l-220 306l-40 -29l-69 -277h-128l168 676h128l-66 -263l361 263h145z" />
+<glyph unicode="&#x1d79a;" horiz-adv-x="686" d="M646 0h-130l-67 468l-299 -468h-130l471 690h28z" />
+<glyph unicode="&#x1d79b;" horiz-adv-x="933" d="M981 676l-168 -676h-128l116 467l-351 -467h-27l-119 467l-116 -467h-128l168 676h161l104 -440h3l324 440h161z" />
+<glyph unicode="&#x1d79c;" horiz-adv-x="744" d="M792 676l-173 -694l-100 20l-206 500l-125 -502h-128l168 676h157l173 -424l106 424h128z" />
+<glyph unicode="&#x1d79d;" horiz-adv-x="690" d="M737 676l-10 -112h-524l36 112h498zM602 411l-25 -122h-366l25 122h366zM630 122l-37 -122h-546l13 122h570z" />
+<glyph unicode="&#x1d79e;" horiz-adv-x="849" d="M824 434q0 -42 -13 -97q-40 -157 -163.5 -256t-278.5 -99q-128 0 -203.5 70t-75.5 187q0 126 66.5 231.5t170.5 163.5t218 58q128 0 203.5 -70.5t75.5 -187.5zM685 425q0 77 -42 121t-123 44q-120 0 -205.5 -98.5t-85.5 -244.5q0 -77 42 -120t123 -43q103 0 176.5 68.5 t102.5 184.5q12 48 12 88z" />
+<glyph unicode="&#x1d79f;" horiz-adv-x="745" d="M783 676l-168 -676h-130l143 574h-295l-143 -574h-130l168 676h555z" />
+<glyph unicode="&#x1d7a0;" horiz-adv-x="581" d="M228 676h209q238 0 238 -144q0 -110 -90.5 -182t-222.5 -72h-103l-69 -278h-130zM284 380h71q89 0 137 32t48 92q0 70 -142 70h-65z" />
+<glyph unicode="&#x1d7a1;" horiz-adv-x="847" d="M822 434q0 -95 -38.5 -180.5t-102 -144.5t-145.5 -93.5t-167 -34.5q-128 0 -203.5 70t-75.5 188q0 95 39.5 180t103 144t145.5 93.5t167 34.5q127 0 202 -70t75 -187zM257 398h426q1 10 1 27q0 77 -42 120.5t-123 43.5q-84 0 -155 -52t-107 -139zM662 296h-431 q-3 -24 -3 -49q0 -77 42.5 -120.5t123.5 -43.5q91 0 163 59.5t105 153.5z" />
+<glyph unicode="&#x1d7a2;" horiz-adv-x="696" d="M748 676l-25 -102h-330l148 -226l-271 -246h377l-40 -102h-586l3 16l364 330l-206 314l4 16h562z" />
+<glyph unicode="&#x1d7a3;" horiz-adv-x="641" d="M715 676l-15 -102h-240l-143 -574h-130l143 574h-243l39 102h589z" />
+<glyph unicode="&#x1d7a4;" horiz-adv-x="671" d="M799 675l-58 -98q-33 12 -49 12q-17 0 -32 -3.5t-43.5 -20.5t-56.5 -47.5t-67.5 -91t-80.5 -144.5l-70 -282h-130l70 282q0 157 -28 227q-31 80 -100 80q-13 0 -55 -11l-8 97q54 16 92 16q18 0 40 -4.5t50.5 -20t51.5 -39t40 -66t19 -96.5q0 -20 -1 -32q39 76 89.5 131 t98 80.5t83 36t61.5 10.5q39 0 84 -16z" />
+<glyph unicode="&#x1d7a5;" horiz-adv-x="835" d="M603 676l-25 -102q108 -3 182.5 -52t74.5 -134q0 -66 -35.5 -122t-91.5 -90.5t-120.5 -54.5t-128.5 -22l-24 -99h-130l24 99q-109 3 -183 52.5t-74 136.5q0 67 35 122t90.5 89.5t120.5 53.5t130 21l25 102h130zM551 472l-67 -271q103 6 157 57t54 110q0 42 -34.5 71 t-109.5 33zM356 201l67 271q-107 -6 -158.5 -55t-51.5 -110q0 -43 34 -72t109 -34z" />
+<glyph unicode="&#x1d7a6;" horiz-adv-x="740" d="M833 676l-325 -333l172 -343h-154l-120 239l-232 -239h-154l334 343l-165 333h154l113 -228l223 228h154z" />
+<glyph unicode="&#x1d7a7;" horiz-adv-x="791" d="M901 691l-57 -102q-53 -9 -80 -121q-23 -93 -109 -148t-185 -61l-64 -259h-130l64 259q-81 5 -138 49t-57 117q0 16 9 55t9 60q0 42 -33 49l-5 102h39q131 0 131 -127q0 -14 -8 -54t-8 -62q0 -36 22.5 -58.5t64.5 -27.5l78 314h130l-78 -314q53 6 91 37.5t50 79.5 q28 112 88.5 162t136.5 50h39z" />
+<glyph unicode="&#x1d7a8;" horiz-adv-x="816" d="M259 102l3 29q-54 15 -94.5 65.5t-40.5 124.5q0 61 30.5 125.5t84 119.5t134.5 90t172 35q129 0 198.5 -67t69.5 -167q0 -65 -26.5 -124t-67 -99t-84.5 -66.5t-84 -36.5l-11 -29h202l-40 -102h-295l62 207q85 20 151 81.5t66 160.5q0 65 -45.5 102.5t-121.5 37.5 q-107 0 -185 -77.5t-78 -165.5q0 -105 123 -140l-40 -206h-295l10 102h202z" />
+<glyph unicode="&#x1d7a9;" horiz-adv-x="780" d="M760 664l-453 -694h-28l-159 694h640zM565 560h-294l70 -361z" />
+<glyph unicode="&#x1d7aa;" horiz-adv-x="678" d="M703 462l-177 -246q0 -2 1.5 -19.5t3 -25t4.5 -24.5t8.5 -26t13.5 -19.5t20 -15.5t28 -5l-4 -16l-55 -79q-22 0 -33.5 0.5t-31 5.5t-30.5 14t-21 27t-13 44h-2q-27 -27 -47.5 -43.5t-62 -32t-92.5 -15.5q-77 0 -121.5 47t-44.5 124q0 50 22.5 105t60.5 102t97 78t125 31 q117 0 157 -97l65 86h129zM399 261q0 56 -20.5 87t-55.5 31q-59 0 -104 -64.5t-45 -139.5q0 -43 19.5 -68.5t56.5 -25.5q75 0 145 128q4 25 4 52z" />
+<glyph unicode="&#x1d7ab;" horiz-adv-x="552" d="M25 -117l132 527q71 282 288 282q57 0 96.5 -32t39.5 -86q0 -53 -30.5 -95t-75.5 -63l2 -1q37 -9 57 -42t20 -77q0 -24 -6 -48q-29 -113 -105.5 -187.5t-174.5 -74.5q-54 0 -88 38l-33 -135q-15 -61 -41 -94h-118q24 37 37 88zM307 375l62 79q41 0 66.5 26.5t25.5 70.5 q0 46 -47 46q-91 0 -129 -155l-73 -292q13 -38 28.5 -53.5t46.5 -15.5q40 0 90.5 60.5t50.5 146.5q0 46 -30 58.5t-95 12.5z" />
+<glyph unicode="&#x1d7ac;" horiz-adv-x="525" d="M571 462l-276 -411l-61 -245l-16 -10l-101 24q38 119 65 227q19 78 19 145q0 15 -0.5 29.5t-7 46t-17.5 53.5t-35 40t-57 18l4 16l69 78q64 0 102.5 -65t38.5 -147q0 -24 -5 -52h2l146 253h130z" />
+<glyph unicode="&#x1d7ad;" horiz-adv-x="507" d="M547 618l-74 -79h-17q-14 18 -23.5 27.5t-29 20t-40.5 10.5q-22 0 -44.5 -14t-22.5 -39q0 -33 72 -73q64 -35 97.5 -78t33.5 -107q0 -33 -10.5 -72t-34.5 -79.5t-57 -73.5t-83 -54t-108 -21q-89 0 -132.5 48.5t-43.5 119.5q0 91 54.5 166t142.5 108q-54 36 -54 90 q0 57 35 98t83 58.5t100 17.5q57 0 96 -15.5t60 -58.5zM371 266q0 61 -56 88q-62 -3 -111 -56.5t-49 -126.5q0 -39 19.5 -64.5t54.5 -25.5q64 0 103 60t39 125z" />
+<glyph unicode="&#x1d7ae;" horiz-adv-x="504" d="M508 383l-69 -61h-16q-14 35 -32 45.5t-57 10.5q-35 0 -65 -12.5t-30 -42.5t63 -30h68l-24 -95h-78q-43 0 -68 -21q-24 -19 -24 -46q0 -26 23.5 -38t51.5 -12q111 0 159 73l36 -75q-53 -55 -103.5 -74t-131.5 -19q-30 0 -56.5 5t-52.5 16t-41.5 33.5t-15.5 54.5 q0 50 31.5 89.5t80.5 54.5v3q-40 25 -40 69q0 57 57 104q70 58 178 58q64 0 104.5 -18t51.5 -72z" />
+<glyph unicode="&#x1d7af;" horiz-adv-x="480" d="M539 634l-7 -95q-103 -11 -205 -92q-56 -45 -100.5 -122t-44.5 -150q0 -94 99 -94h56q49 0 86 -23t37 -71q0 -82 -65 -137t-147 -55q-53 0 -70 21l24 98h16q21 -24 55 -24q86 0 86 60q0 36 -69 36h-90q-151 0 -151 144q0 95 57 198t149 173l1 3q-41 32 -41 77 q0 22 12 54.5t36 56.5h16l72 -17q-30 -41 -30 -70q0 -26 22 -37q61 31 93 43t86 23h17z" />
+<glyph unicode="&#x1d7b0;" horiz-adv-x="532" d="M255 411h3q76 62 148 62q119 0 119 -99q0 -26 -7 -53l-109 -437q-8 -32 -8 -56q0 -20 4 -33h-127q-2 6 -2 19q0 20 14 76l105 419q3 13 3 25q0 44 -51 44q-24 0 -57 -21t-59 -64l-73 -293h-120l87 349q6 23 6 52q0 21 -4 37l109 35h9q11 -18 11 -51q0 -5 -1 -11z" />
+<glyph unicode="&#x1d7b1;" horiz-adv-x="560" d="M553 471q0 -71 -25.5 -155t-68.5 -158t-107 -123t-132 -49q-77 0 -116 62.5t-39 159.5q0 99 41.5 209.5t120.5 192.5t169 82q78 0 117.5 -62t39.5 -159zM218 388h204q12 48 12 93q0 51 -16 83.5t-46 32.5q-48 0 -90.5 -62t-63.5 -147zM399 293h-204q-14 -58 -14 -101 q0 -51 16.5 -81t46.5 -30q45 0 89 62t66 150z" />
+<glyph unicode="&#x1d7b2;" horiz-adv-x="325" d="M302 108l-39 -100q-44 -22 -95 -22q-112 0 -112 93q0 15 5 37l86 346h120l-74 -299q-6 -25 -6 -41q0 -41 39 -41q29 0 60 27h16z" />
+<glyph unicode="&#x1d7b3;" horiz-adv-x="537" d="M582 395l-4 -16q-56 -5 -103.5 -22.5t-72.5 -34.5t-76 -55l169 -267h-155l-117 187l-24 -20l-41 -167h-120l114 462h120l-40 -163h2q182 159 329 174z" />
+<glyph unicode="&#x1d7b4;" horiz-adv-x="574" d="M540 81l-4 -16l-66 -79q-59 0 -94 36t-35 139v137l-192 -298h-131l320 459q0 83 -32 110.5t-91 27.5l4 16l70 79q68 0 106.5 -48t44.5 -166l12 -256q4 -79 22 -110t66 -31z" />
+<glyph unicode="&#x1d7b5;" horiz-adv-x="594" d="M569 462l-76 -307q-5 -22 -5 -35q0 -39 49 -39l-4 -16l-55 -79q-112 0 -119 70h-2q-24 -34 -56 -52t-61 -18q-26 0 -40.5 4.5t-24.5 19.5h-2l-30 -121q-15 -61 -41 -94h-114q25 42 37 88l144 579h120l-77 -313q-3 -13 -3 -24q0 -44 52 -44q29 0 59.5 21t54.5 62l74 298 h120z" />
+<glyph unicode="&#x1d7b6;" horiz-adv-x="525" d="M441 454l121 19q3 -11 3 -24q0 -73 -42.5 -155t-109.5 -150t-160 -113t-186 -45h-26l118 476h120l-82 -332h2q94 28 165.5 113.5t71.5 179.5q0 7 -2 21z" />
+<glyph unicode="&#x1d7b7;" horiz-adv-x="481" d="M525 631l-15 -92q-75 0 -133 -24.5t-58 -65.5q0 -22 27 -31q65 21 163 21l7 -5l-31 -90q-78 0 -148.5 -23.5t-116.5 -68.5t-46 -101q0 -70 103 -70h61q49 0 86 -23t37 -71q0 -82 -65 -137t-147 -55q-53 0 -70 21l24 98h16q21 -24 55 -24q86 0 86 60q0 36 -69 36h-89 q-71 0 -115 37t-44 100q0 73 53.5 142t141.5 109v3q-41 22 -41 61q0 30 19 61.5t52 54.5q-30 25 -30 52q0 45 41 86h16l73 -17q-24 -24 -24 -42t20 -31q91 32 151 32z" />
+<glyph unicode="&#x1d7b8;" horiz-adv-x="543" d="M515 298q0 -127 -92 -219.5t-204 -92.5q-78 0 -126 48t-48 127q0 131 93 221.5t206 90.5q78 0 124.5 -48t46.5 -127zM390 295q0 83 -76 83q-59 0 -100.5 -65.5t-41.5 -142.5q0 -89 71 -89q40 0 71 27t46 65.5t22.5 70t7.5 51.5z" />
+<glyph unicode="&#x1d7b9;" horiz-adv-x="632" d="M656 462l-23 -95h-99q-64 -164 -64 -225q0 -27 17.5 -41t59.5 -20l-5 -17l-59 -78q-30 0 -52 3.5t-46 14t-37 33t-13 56.5q0 30 27.5 120t51.5 154h-76l-22 -85q-8 -30 -21.5 -72t-24.5 -65t-28 -52t-35 -44.5t-42.5 -31t-54 -22.5t-65.5 -9l11 95q28 7 39 10.5 t27.5 15.5t23.5 25.5t19.5 46t22.5 70.5l27 106q-15 0 -39 -19.5t-42 -54.5l-75 38q81 143 224 143h373z" />
+<glyph unicode="&#x1d7ba;" horiz-adv-x="560" d="M4 -117l61 242q24 96 45 148.5t63 103.5q78 96 206 96q73 0 115 -43t42 -115q0 -32 -9 -68q-29 -118 -105 -189.5t-174 -71.5q-52 0 -88 41l-34 -138q-15 -61 -41 -94h-118q24 37 37 88zM409 304q0 74 -63 74q-69 0 -113 -92q-16 -32 -42 -136q13 -38 28.5 -53.5 t46.5 -15.5q60 0 101.5 74t41.5 149z" />
+<glyph unicode="&#x1d7bb;" horiz-adv-x="517" d="M554 368l-86 -57h-17q-1 67 -78 67q-85 0 -137.5 -66t-52.5 -145q0 -45 28.5 -65.5t71.5 -20.5h56q49 0 86 -23t37 -71q0 -82 -65 -137t-147 -55q-53 0 -70 21l24 98h16q21 -24 55 -24q86 0 86 60q0 36 -69 36h-80q-72 0 -116 42.5t-44 112.5q0 89 52 167t131.5 121.5 t162.5 43.5q62 0 108.5 -26.5t47.5 -78.5z" />
+<glyph unicode="&#x1d7bc;" horiz-adv-x="614" d="M639 462l-23 -95h-165l-1 -2q52 -52 52 -123q0 -24 -5 -42q-12 -44 -46 -91t-96.5 -85t-133.5 -38q-79 0 -127.5 47.5t-48.5 125.5q0 73 31 133.5t78 96t95.5 54.5t88.5 19h301zM380 251q0 75 -69 116q-55 0 -97 -58.5t-42 -139.5q0 -41 18.5 -64.5t54.5 -23.5 q33 0 60.5 20t43 48.5t23.5 55.5t8 46z" />
+<glyph unicode="&#x1d7bd;" horiz-adv-x="523" d="M547 462l-23 -95h-153q-36 -96 -56 -175q-6 -24 -6 -42q0 -31 20 -46.5t66 -22.5l-5 -17l-59 -78q-31 0 -54 4t-49 14.5t-40.5 34t-14.5 58.5q0 25 7 53q17 73 75 217q-85 0 -137 -101l-76 38q46 81 93.5 119.5t114.5 38.5h297z" />
+<glyph unicode="&#x1d7be;" horiz-adv-x="550" d="M311 378l23 95q86 0 139 -42t53 -125q0 -131 -91.5 -225.5t-205.5 -94.5q-83 0 -125.5 34.5t-42.5 97.5q0 25 8 59l36 147q14 58 14 84q0 20 -6 29l111 36h16q8 -20 8 -45q0 -15 -4 -28l-48 -193q-7 -30 -7 -51q0 -75 66 -75q62 0 103 70.5t41 140.5q0 86 -88 86z" />
+<glyph unicode="&#x1d7bf;" horiz-adv-x="683" d="M262 81l25 102q11 45 19 72t22 66t30.5 62t40 46t55.5 33.5t72 10.5q53 0 93 -44.5t40 -122.5q0 -53 -18.5 -107.5t-54 -103t-95.5 -79t-134 -30.5l-48 -191h-120l48 191q-94 0 -138 45.5t-44 119.5q0 83 57 182t141 128l55 -58l-3 -12q-49 -23 -76 -69t-37 -89 q-10 -39 -10 -69q0 -83 80 -83zM412 212l-32 -131q108 0 145 150q17 66 17 100q0 47 -39 47q-22 0 -40 -25t-28 -56t-23 -85z" />
+<glyph unicode="&#x1d7c0;" horiz-adv-x="575" d="M626 462l-299 -341q-8 -40 -8 -76q0 -144 111 -155l-4 -16l-68 -79q-52 0 -85.5 35.5t-44.5 79.5t-11 94v4l-160 -203h-137l292 334q9 42 9 86q0 146 -122 154l4 16l69 78q78 0 114.5 -60t36.5 -155v-4l165 208h138z" />
+<glyph unicode="&#x1d7c1;" horiz-adv-x="703" d="M751 473l-45 -94q-54 -17 -87 -152q-26 -105 -89 -166t-177 -75l-48 -191h-120l48 191q-158 20 -158 155q0 31 13.5 99t13.5 83q0 46 -25 56v94q73 0 113.5 -38.5t40.5 -102.5q0 -30 -15 -100.5t-15 -83.5q0 -30 13 -45t43 -22l94 381h120l-94 -381q53 13 78 50.5 t51 144.5q21 86 89 141.5t156 55.5z" />
+<glyph unicode="&#x1d7c2;" horiz-adv-x="756" d="M537 410l93 51q50 -15 76 -61.5t26 -107.5q0 -36 -9 -72q-29 -115 -96.5 -174.5t-148.5 -59.5q-44 0 -76 22t-39 61h-2q-26 -39 -69 -61t-87 -22q-66 0 -103.5 37t-37.5 108q0 61 26.5 129.5t79 125.5t117.5 75l71 -51l-4 -16q-57 -20 -96 -67.5t-54 -95t-15 -92.5 q0 -58 40 -58q74 0 111 145l23 92l114 29l11 -10l-28 -111q-11 -46 -11 -73q0 -72 53 -72q39 0 71 61.5t32 131.5q0 90 -72 120z" />
+<glyph unicode="&#x1d7c3;" horiz-adv-x="548" d="M227 608l51 83q261 -15 261 -260q0 -74 -20.5 -150t-58 -143t-101 -109.5t-140.5 -42.5q-79 0 -126.5 47.5t-47.5 126.5q0 126 91 219.5t202 93.5q49 0 82 -33l4 2q-17 152 -184 154zM390 295q0 83 -76 83q-59 0 -100.5 -65.5t-41.5 -142.5q0 -89 71 -89q40 0 71 27 t46 65.5t22.5 70t7.5 51.5z" />
+<glyph unicode="&#x1d7c4;" horiz-adv-x="468" d="M470 443l-31 -124h-16q-9 27 -28.5 41t-33.5 16t-36 2q-35 0 -71.5 -22.5t-55.5 -65.5h149l-24 -95h-150q-2 -14 -2 -19q0 -40 24 -64t65 -24q71 0 123 57l50 -65q-60 -56 -104 -75t-114 -19q-78 0 -124 46t-46 122q0 90 47.5 165t116 114.5t138.5 39.5q88 0 123 -30z " />
+<glyph unicode="&#x1d7c5;" horiz-adv-x="579" d="M579 380l-23 -95q-19 0 -42 5l-8 -31q-34 -130 -111 -201.5t-175 -71.5q-82 0 -124 34t-42 97q0 25 8 60q28 117 28 139q0 18 -6 29l110 36h16q8 -18 8 -45q0 -14 -29 -129q-7 -31 -7 -53q0 -73 64 -73q90 0 134 172q11 44 16 68q-170 60 -170 185q0 87 53 136.5 t120 49.5t103.5 -50t36.5 -150q0 -52 -8 -103q21 -6 48 -9zM430 507q0 90 -56 90q-18 0 -34.5 -17.5t-16.5 -44.5q0 -31 26 -62t72 -42q9 43 9 76z" />
+<glyph unicode="&#x1d7c6;" horiz-adv-x="646" d="M665 462l-184 -166q2 -112 18 -150t76 -61l-4 -16l-56 -79q-38 4 -64 26t-38 58t-17 66.5t-7 71.5l-234 -212h-165l182 166q-2 113 -17.5 151t-75.5 62l4 16l56 78q38 -5 63.5 -27t38 -59t17 -67.5t6.5 -71.5l235 214h166z" />
+<glyph unicode="&#x1d7c7;" horiz-adv-x="678" d="M526 692l-55 -219q96 0 139.5 -43.5t43.5 -117.5q0 -81 -34 -154t-105 -122.5t-165 -49.5l-48 -191h-120l48 191q-93 0 -137.5 44.5t-44.5 118.5q0 60 19.5 116.5t55.5 103.5t95.5 75.5t132.5 28.5l55 219h120zM447 378l-74 -297q108 0 145 150q8 31 8 61q0 86 -79 86z M255 81l74 297q-48 0 -87.5 -36t-57.5 -111q-10 -39 -10 -69q0 -81 81 -81z" />
+<glyph unicode="&#x1d7c8;" horiz-adv-x="544" d="M232 -205h-17q-1 12 -13.5 21t-30 16t-43 25.5t-46.5 45.5q-44 57 -44 152q0 99 36 193t110.5 159.5t169.5 65.5q77 0 121.5 -47t44.5 -125q0 -129 -89.5 -222t-201.5 -93q-49 0 -82 33l-3 -2q3 -27 22.5 -46t44.5 -29l50 -22q25 -10 42 -28t17 -45q0 -15 -4 -28z M396 299q0 79 -72 79q-59 0 -100.5 -72t-41.5 -145q0 -80 71 -80q40 0 70.5 28t45 68t21 71.5t6.5 50.5z" />
+<glyph unicode="&#x1d7c9;" horiz-adv-x="889" d="M912 462l-23 -95h-92q11 -36 11 -75q0 -58 -25 -122t-59 -103q-71 -81 -170 -81q-94 0 -115 83h-2q-59 -83 -156 -83q-66 0 -103.5 37t-37.5 108q0 56 23.5 121t70.5 114q-42 -4 -68.5 -30t-49.5 -70l-76 38q46 81 93.5 119.5t114.5 38.5h664zM556 308l-20 -81 q-11 -47 -11 -74q0 -72 53 -72q39 0 71.5 61.5t32.5 131.5q0 57 -33 93h-273q-55 -39 -82.5 -102t-27.5 -121q0 -63 39 -63q34 0 63.5 35t47.5 111l15 62l115 29z" />
+</font>
+</defs></svg> 
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/stixgeneral-bundle/stixgeneralbolita-webfont.ttf b/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/stixgeneral-bundle/stixgeneralbolita-webfont.ttf
new file mode 100644
index 0000000..6b8c251
Binary files /dev/null and b/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/stixgeneral-bundle/stixgeneralbolita-webfont.ttf differ
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/stixgeneral-bundle/stixgeneralbolita-webfont.woff b/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/stixgeneral-bundle/stixgeneralbolita-webfont.woff
new file mode 100644
index 0000000..63a6f8e
Binary files /dev/null and b/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/stixgeneral-bundle/stixgeneralbolita-webfont.woff differ
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/stixgeneral-bundle/stixgeneralitalic-webfont.eot b/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/stixgeneral-bundle/stixgeneralitalic-webfont.eot
new file mode 100644
index 0000000..3573ca1
Binary files /dev/null and b/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/stixgeneral-bundle/stixgeneralitalic-webfont.eot differ
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/stixgeneral-bundle/stixgeneralitalic-webfont.svg b/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/stixgeneral-bundle/stixgeneralitalic-webfont.svg
new file mode 100644
index 0000000..295068d
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/stixgeneral-bundle/stixgeneralitalic-webfont.svg
@@ -0,0 +1,1089 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>
+This is a custom SVG webfont generated by Font Squirrel.
+Designer    : MicroPress Inc., with final additions and corrections provided by Coen Hoffman, Elsevier (retired)
+Foundry URL : http://www.stixfonts.org
+</metadata>
+<defs>
+<font id="webfont2oJeLJIt" horiz-adv-x="500" >
+<font-face units-per-em="1000" ascent="750" descent="-250" />
+<missing-glyph horiz-adv-x="250" />
+<glyph unicode="IJ" horiz-adv-x="750" d="M783 653v-16q-43 -6 -56 -17.5t-26 -56.5l-103 -367q-29 -104 -71 -159t-124 -55q-53 0 -85 24t-32 64q0 24 12.5 40t32.5 16t35.5 -13.5t15.5 -32.5q0 -6 -1.5 -14.5t-1.5 -12.5q0 -39 35 -39t53 64l127 454q12 44 12 64t-15 28.5t-62 12.5v16h254zM384 653v-16 q-42 -5 -55.5 -18t-26.5 -59l-120 -429q-15 -53 -15 -76q0 -20 12.5 -27t56.5 -12v-16h-244v16q42 8 57.5 21t26.5 54l120 441q13 46 13 62q0 20 -16 30.5t-56 12.5v16h247z" />
+<glyph unicode="ij" d="M467 438l-104 -410q-31 -121 -76.5 -178t-110.5 -57q-35 0 -57 17t-22 44q0 18 12 31t29 13q39 0 39 -37q0 -12 -6 -19.5t-6 -14.5q0 -12 18 -12q30 0 50.5 39t46.5 143l72 292q16 65 16 80q0 17 -10.5 24t-37.5 7h-26v16q45 3 169 25zM500 598q0 -20 -15 -35t-35 -15 q-23 0 -38.5 14.5t-15.5 37.5q0 22 16 37t37 15q20 0 35.5 -16.5t15.5 -37.5zM222 114l13 -11q-42 -65 -71 -89.5t-66 -24.5q-49 0 -49 55q0 29 22 111l48 177q9 32 9 44q0 15 -11.5 19t-52.5 5v16q46 4 160 25l4 -3l-94 -343q-10 -34 -10 -44q0 -15 14 -15q25 0 84 78z M264 599q0 -21 -14.5 -36t-34.5 -15q-22 0 -35 14.5t-13 38.5q0 23 13.5 38t33.5 15t35 -16.5t15 -38.5z" />
+<glyph unicode="&#xfb00;" horiz-adv-x="527" d="M211 428h172q39 126 72 173q54 77 131 77q37 0 62 -17.5t25 -44.5q0 -17 -12.5 -30t-29.5 -13q-14 0 -25.5 11t-11.5 28q0 10 5 19t5 12q0 13 -22 13q-42 0 -71 -54.5t-51 -173.5h107l-6 -32h-108l-72 -320q-64 -283 -200 -283q-34 0 -56.5 17.5t-22.5 43.5q0 17 11 29.5 t27 12.5q17 0 27.5 -10.5t10.5 -26.5q0 -7 -4.5 -15.5t-4.5 -13.5q0 -16 20 -16q63 0 97 162l88 420h-170l-72 -320q-64 -283 -200 -283q-34 0 -56.5 17.5t-22.5 43.5q0 17 11 29.5t27 12.5q17 0 27.5 -10.5t10.5 -26.5q0 -7 -4.5 -15.5t-4.5 -13.5q0 -16 20 -16 q62 0 97 162l88 420h-91l7 32h93q39 126 72 173q54 77 132 77q37 0 61.5 -17.5t24.5 -44.5q0 -17 -12.5 -30t-29.5 -13q-14 0 -25.5 11t-11.5 28q0 10 5 19t5 12q0 13 -22 13q-42 0 -71 -54.5t-51 -173.5z" />
+<glyph unicode="&#xfb01;" d="M51 428h88q27 92 46 129t59 73q56 51 134 51q45 0 74 -19.5t29 -48.5q0 -19 -12 -32t-30 -13q-19 0 -30 12t-11 31q0 14 9 23q4 5 4 9q0 16 -34 16q-54 0 -86 -42q-25 -32 -39 -67.5t-36 -121.5h150q40 0 81 6q4 0 8 0.5t6 1t4 0.5l5 -3v-3q0 -7 -5 -25l-1 -4 q-2 -10 -8 -29.5t-7 -23.5q-1 -5 -7 -26q-72 -263 -72 -275q0 -10 11 -10q21 0 77 70l16 -9q-43 -58 -73 -82t-60 -24q-46 0 -46 50q0 29 74 296q12 42 12 48q0 10 -16 10h-155l-72 -318q-43 -187 -117 -252q-39 -33 -84 -33q-34 0 -56 16.5t-22 43.5q0 18 11 31t26 13 q16 0 27.5 -12t11.5 -28q0 -7 -5 -16q-4 -7 -4 -11q0 -13 20 -13q37 0 61 47q28 52 58 224q45 253 67 308h-88z" />
+<glyph unicode="&#xfb02;" d="M46 428h92q21 64 31 90t28.5 55.5t47.5 54.5q64 54 138 54q32 0 61 -7q28 -4 31 -4q4 0 28 8q6 3 10 3q5 0 5 -9t-21 -88q-30 -115 -78.5 -320.5t-48.5 -217.5q0 -11 11 -11q18 0 78 69l16 -9q-45 -61 -73 -83t-59 -22q-22 0 -35 13.5t-13 36.5t47 217l33 138h-166 l-69 -310q-65 -290 -205 -290q-34 0 -55 17.5t-21 44.5q0 17 10.5 29.5t25.5 12.5q16 0 28 -12t12 -27q0 -8 -5 -17q-4 -7 -4 -10q0 -13 20 -13q29 0 47 24q13 17 18 31q22 58 91 388l28 132h-90zM383 428l37 148q0 5 -5 15q-5 12 -5 17q0 10 8 21q4 5 4 9q0 9 -13 15.5 t-30 6.5q-55 0 -93 -51t-64 -157l-6 -24h167z" />
+<glyph unicode="&#xfb03;" horiz-adv-x="744" d="M211 428h172q27 92 46 129t59 73q56 51 134 51q45 0 74 -19.5t29 -48.5q0 -19 -12 -32t-30 -13q-19 0 -30 12t-11 31q0 14 9 23q4 5 4 9q0 13 -34 13q-29 0 -48.5 -7.5t-37.5 -31.5q-25 -32 -39 -67.5t-36 -121.5h150q40 0 81 6q4 0 8 0.5t6 1t4 0.5l5 -3v-3q0 -7 -5 -25 l-1 -4q-2 -10 -8 -29.5t-7 -23.5q-1 -5 -7 -26q-72 -263 -72 -275q0 -10 11 -10q21 0 77 70l16 -9q-43 -58 -73 -82t-60 -24q-46 0 -46 50q0 29 74 296q12 42 12 48q0 10 -16 10h-155l-72 -318q-43 -187 -117 -252q-39 -33 -84 -33q-34 0 -56 16.5t-22 43.5q0 18 11 31 t26 13q16 0 27.5 -12t11.5 -28q0 -7 -5 -16q-4 -7 -4 -11q0 -13 20 -13q37 0 61 47q28 52 58 224q49 276 66 308h-171l-72 -320q-64 -283 -200 -283q-34 0 -56.5 17.5t-22.5 43.5q0 17 11 29.5t27 12.5q17 0 27.5 -10.5t10.5 -26.5q0 -7 -4.5 -15.5t-4.5 -13.5q0 -16 20 -16 q62 0 97 162l88 420h-91l7 32h93q39 126 72 173q54 77 132 77q37 0 61.5 -17.5t24.5 -44.5q0 -17 -12.5 -30t-29.5 -13q-14 0 -25.5 11t-11.5 28q0 10 5 19t5 12q0 13 -22 13q-42 0 -71 -54.5t-51 -173.5z" />
+<glyph unicode="&#xfb04;" horiz-adv-x="745" d="M211 428h172q21 64 31 90t28.5 55.5t47.5 54.5q64 54 138 54q32 0 61 -7q28 -4 31 -4q4 0 28 8q6 3 10 3q5 0 5 -9t-21 -88q-30 -115 -78.5 -320.5t-48.5 -217.5q0 -11 11 -11q18 0 78 69l16 -9q-45 -61 -73 -83t-59 -22q-22 0 -35 13.5t-13 36.5t47 217l33 138h-166 l-69 -310q-32 -144 -84.5 -218.5t-120.5 -74.5q-34 0 -55 18.5t-21 46.5q0 17 10.5 29.5t25.5 12.5q16 0 28 -12t12 -27q0 -8 -5 -17q-4 -7 -4 -10q0 -20 20 -20q23 0 47 31q13 17 18 31q22 58 91 388l28 132h-171l-72 -320q-64 -283 -200 -283q-34 0 -56.5 17.5t-22.5 43.5 q0 17 11 29.5t27 12.5q17 0 27.5 -10.5t10.5 -26.5q0 -7 -4.5 -15.5t-4.5 -13.5q0 -16 20 -16q62 0 97 162l88 420h-91l7 32h93q39 126 72 173q54 77 132 77q37 0 61.5 -17.5t24.5 -44.5q0 -17 -12.5 -30t-29.5 -13q-14 0 -25.5 11t-11.5 28q0 10 5 19t5 12q0 13 -22 13 q-42 0 -71 -54.5t-51 -173.5zM628 428l37 148q0 5 -5 15q-5 12 -5 17q0 10 8 21q4 5 4 9q0 9 -13 15.5t-30 6.5q-55 0 -93 -51q-37 -51 -64 -157l-6 -24h167z" />
+<glyph unicode="fj" d="M51 428h88q27 92 46 129t59 73q56 51 134 51q55 0 85 -28q17 -4 29 -19.5t12 -34.5q0 -21 -14.5 -36t-34.5 -15q-40 0 -50 37q-7 10 -7 26q0 14 9 23q4 5 4 9q0 16 -34 16q-54 0 -86 -42q-25 -32 -39 -67.5t-36 -121.5h150q40 0 81 6q4 0 8 0.5t6 1t4 0.5l5 -3v-3 q0 -7 -5 -25l-1 -4q-2 -10 -8 -29.5t-7 -23.5q-1 -5 -7 -26l-36 -138l-26 -111q-10 -41 -10 -45q-31 -121 -76.5 -178t-110.5 -57q-35 0 -57 17t-22 44q0 18 12 31t29 13q39 0 39 -37q0 -12 -6 -19.5t-6 -14.5q0 -12 18 -12q30 0 50.5 39t46.5 143l83 341q11 46 11 48 q0 10 -16 10h-155l-72 -318q-43 -187 -117 -252q-39 -33 -84 -33q-34 0 -56 16.5t-22 43.5q0 18 11 31t26 13q16 0 27.5 -12t11.5 -28q0 -7 -5 -16q-4 -7 -4 -11q0 -13 20 -13q37 0 61 47q28 52 58 224q45 253 67 308h-88z" />
+<glyph unicode=" "  horiz-adv-x="250" />
+<glyph unicode="&#x09;" horiz-adv-x="250" />
+<glyph unicode="&#xa0;" horiz-adv-x="250" />
+<glyph unicode="!" horiz-adv-x="333" d="M137 177l-17 5q49 227 71 369q10 64 25.5 90t43.5 26q44 0 44 -51q0 -40 -39 -123q-56 -120 -128 -316zM145 41q0 -21 -16.5 -36.5t-39.5 -15.5q-22 0 -36 15.5t-14 38.5q0 21 16.5 36.5t37.5 15.5q23 0 37.5 -16t14.5 -38z" />
+<glyph unicode="&#x22;" horiz-adv-x="420" d="M346 421h-23q13 158 22 203q4 20 19.5 31t34.5 11q13 0 23 -8t10 -20q0 -30 -86 -217zM167 421h-23q13 158 22 203q4 20 19.5 31t35.5 11q13 0 22.5 -8t9.5 -20q0 -32 -86 -217z" />
+<glyph unicode="#" horiz-adv-x="501" d="M540 464l-11 -54h-104l-54 -143h94l-11 -54h-104l-79 -213h-62l80 213h-130l-79 -213h-62l80 213h-96l11 54h106l54 143h-97l11 54h106l80 212h61l-80 -212h130l80 212h61l-80 -212h95zM364 410h-130l-54 -143h130z" />
+<glyph unicode="$" d="M497 611l-28 -114l-15 2q-2 57 -20.5 87t-64.5 47l-56 -237q88 -65 115 -104t27 -102q0 -92 -67 -143q-40 -30 -72.5 -38.5t-100.5 -8.5l-21 -89h-35l22 91q-95 18 -149 66l26 123l16 3q4 -76 29 -109.5t86 -52.5l69 297q-76 49 -105.5 86.5t-29.5 92.5q0 61 42 106 q30 32 65 43t93 11h18l17 63h34l-16 -68q72 -17 121 -52zM336 641h-16q-53 0 -86 -32.5t-33 -76.5q0 -35 17.5 -61t62.5 -53zM289 306l-68 -281q159 13 159 144q0 42 -15.5 65t-69.5 67z" />
+<glyph unicode="%" horiz-adv-x="755" d="M705 213q0 -91 -50 -161.5t-114 -70.5q-51 0 -86 40t-35 98q0 80 58.5 145.5t130.5 65.5q46 0 71 -30.5t25 -86.5zM682 215q0 39 -17.5 63t-45.5 24q-29 0 -49 -23q-33 -35 -55.5 -93.5t-22.5 -109.5q0 -29 16 -48.5t40 -19.5q52 0 93 63.5t41 143.5zM640 706l-430 -724 h-47l394 658q-28 -32 -54.5 -44.5t-66.5 -12.5q-35 0 -76 14q4 -23 4 -44q0 -52 -22 -104t-58 -86q-38 -37 -86 -37q-50 0 -84 39.5t-34 97.5q0 85 58 149t135 64q26 0 60 -28q47 -39 96 -39q46 0 72 15t95 82h44zM340 569q0 22 -4.5 30t-20.5 16q-23 11 -44 34 q-31 -15 -44 -26.5t-28 -36.5q-48 -76 -48 -163q0 -31 15.5 -50.5t41.5 -19.5q53 0 92.5 65t39.5 151z" />
+<glyph unicode="&#x26;" horiz-adv-x="778" d="M712 63l11 -11q-42 -70 -132 -70q-74 0 -134 79q-57 -45 -102.5 -62t-96.5 -17q-84 0 -133 40.5t-49 112.5q0 90 75 151q37 30 180 92q-7 42 -7 94q0 88 43 141t116 53q45 0 74 -27t29 -67q0 -55 -56 -103q-34 -30 -116 -72q27 -142 87 -237q46 52 62.5 82t16.5 57 q0 17 -10.5 23.5t-40.5 8.5v19h188v-17q-37 -4 -54.5 -18.5t-56.5 -71.5q-20 -30 -86 -118q30 -50 58.5 -72t63.5 -22q37 0 70 32zM517 572q0 62 -39 62q-32 0 -52.5 -33t-20.5 -97q0 -38 5 -76q61 38 84 71t23 73zM436 93q-49 62 -103 252q-74 -29 -118.5 -78.5 t-44.5 -106.5q0 -56 34.5 -91t93.5 -35q61 0 138 59z" />
+<glyph unicode="'" horiz-adv-x="214" d="M155 421h-23q13 168 23 206q9 39 51 39q16 0 25.5 -9t9.5 -22q0 -29 -86 -214z" />
+<glyph unicode="(" horiz-adv-x="333" d="M302 669l13 -15q-107 -101 -155.5 -251t-48.5 -318q0 -73 10 -128.5t38 -131.5l-18 -6q-99 159 -99 361q0 169 74 290q27 44 67 85.5t119 113.5z" />
+<glyph unicode=")" horiz-adv-x="333" d="M171 664l19 5q35 -63 51 -102.5t29 -94.5q19 -89 19 -168q0 -148 -78 -282q-52 -89 -182 -202l-13 15q62 65 95.5 123t59.5 139q49 152 49 305q0 145 -49 262z" />
+<glyph unicode="*" d="M328 459l37 -19q32 -16 63 -20q64 -9 64 -44q0 -37 -38 -37q-20 0 -46 32q-8 10 -14 16.5t-14 13.5l-11 9q-3 3 -16 12l-16 11l-18 13q1 -64 20 -117q8 -24 8 -34q0 -40 -37 -40t-37 38q0 11 10 41q18 50 18 112q-3 -2 -16 -10q-25 -15 -38 -26.5t-33 -36.5 q-27 -33 -51 -33q-15 0 -25 8.5t-10 23.5q0 38 62 48q35 6 53 13t51 27l-12 7q-45 26 -93 32q-61 7 -61 44q0 16 9.5 27.5t23.5 11.5q22 0 49 -31q42 -47 91 -76q0 48 -18 107q-8 27 -8 42q0 42 35 42q17 0 26.5 -11.5t9.5 -29.5q0 -10 -11 -48q-16 -51 -16 -104 q33 22 46 33.5t54 54.5q19 21 38 21q17 0 26 -11t9 -28q0 -36 -57 -43q-34 -4 -53.5 -12t-53.5 -29z" />
+<glyph unicode="+" horiz-adv-x="675" d="M590 220h-219v-220h-66v220h-219v66h219v220h66v-220h219v-66z" />
+<glyph unicode="," horiz-adv-x="250" d="M5 -129l-10 18q76 49 76 90q0 14 -20 29q-25 19 -25 49q0 18 14.5 31t36.5 13q26 0 42 -21.5t16 -52.5q0 -88 -130 -156z" />
+<glyph unicode="-" horiz-adv-x="333" d="M282 255l-13 -63h-220l14 63h219z" />
+<glyph unicode="." horiz-adv-x="250" d="M138 43q0 -22 -17 -38t-41 -16q-21 0 -37 16t-16 38q0 24 16 40.5t39 16.5t39.5 -17t16.5 -40z" />
+<glyph unicode="/" horiz-adv-x="278" d="M386 666l-378 -684h-73l378 684h73z" />
+<glyph unicode="0" d="M497 425q0 -110 -52 -222t-129 -167q-61 -43 -126 -43q-76 0 -117 59t-41 164q0 115 43.5 222t114.5 172.5t148 65.5t118 -65t41 -186zM418 518q0 130 -84 130q-67 0 -120 -95q-39 -71 -71 -194t-32 -203q0 -63 22 -99t59 -36q73 0 129 100q43 76 70 187.5t27 209.5z" />
+<glyph unicode="1" d="M401 676h3q5 0 5 -7q0 -8 -6 -29l-143 -519q-18 -64 -18 -74q0 -32 66 -32h21v-15h-279v15q59 4 81.5 15t30.5 40l136 488q8 30 8 36q0 31 -35 31h-3q-21 0 -59 -2v15l23 5q48 10 91.5 18t77.5 15z" />
+<glyph unicode="2" d="M101 507l-21 7q34 83 82 120q55 42 128 42q71 0 116.5 -48.5t45.5 -120.5q0 -50 -29.5 -96t-119.5 -138l-188 -192v-5h181q43 0 64 13.5t39 51.5l17 -7l-50 -134h-354v17l210 224q98 104 135 187q9 20 9 54q0 54 -31 87.5t-88 33.5q-96 0 -146 -96z" />
+<glyph unicode="3" d="M178 567l-16 5q48 104 171 104q58 0 95 -34t37 -88q0 -55 -34.5 -89t-120.5 -64v-3q50 -19 72.5 -53.5t22.5 -90.5q0 -117 -93 -199q-71 -62 -185 -62q-53 0 -82 16t-29 41q0 19 12 31t31 12q30 0 64 -30q36 -32 71 -32q52 0 93 46q38 45 38 126q0 79 -42.5 118.5 t-117.5 39.5h-24v16q119 21 175 60q62 43 62 106q0 41 -24 66t-64 25q-61 0 -112 -67z" />
+<glyph unicode="4" d="M479 676l-121 -435h96l-14 -63h-101l-46 -178h-79l49 178h-262l20 67l417 431h41zM373 563h-4l-304 -318v-4h212z" />
+<glyph unicode="5" d="M491 666l-23 -71h-230l-39 -88q220 -42 220 -223q0 -123 -87 -207t-211 -84q-47 0 -76.5 14t-29.5 43q0 17 11.5 29.5t28.5 12.5q22 0 56 -28q15 -13 22.5 -17.5t17.5 -8t24 -3.5q68 0 121.5 64t53.5 147q0 82 -53 125q-55 45 -166 61v16l104 218h256z" />
+<glyph unicode="6" d="M521 686v-16q-90 -12 -180 -79.5t-142 -162.5l4 -2q34 21 92 21q70 0 118.5 -50t48.5 -126q0 -114 -74.5 -196t-179.5 -82q-88 0 -133 57t-45 158t48.5 196.5t135.5 163.5q70 55 135 80t172 38zM373 289q0 54 -32.5 88t-84.5 34q-62 0 -98 -56q-23 -35 -37.5 -92.5 t-14.5 -112.5q0 -60 27.5 -95.5t70.5 -35.5q64 0 111 69q26 39 42 95t16 106z" />
+<glyph unicode="7" d="M537 656l-388 -664h-70l367 598l-2 3h-215q-48 0 -75 -14.5t-64 -58.5l-15 10l82 136h373z" />
+<glyph unicode="8" d="M225 360v1q-50 56 -68.5 89.5t-18.5 73.5q0 71 50 111.5t132 40.5q80 0 126.5 -37.5t46.5 -98.5q0 -59 -37 -95t-127 -63v-1q65 -60 90 -103t25 -97q0 -83 -60.5 -135.5t-154.5 -52.5q-84 0 -141.5 42t-57.5 126q0 69 51.5 120.5t143.5 78.5zM425 530q0 54 -29.5 88.5 t-77.5 34.5t-75 -29.5t-27 -78.5q0 -33 19 -63t76 -83q64 30 89 59.5t25 71.5zM369 155q0 43 -19.5 73t-102.5 116q-68 -26 -108.5 -78t-40.5 -117q0 -59 42.5 -96.5t96.5 -37.5q57 0 94.5 43t37.5 97z" />
+<glyph unicode="9" d="M352 272l-4 2q-72 -45 -129 -45q-66 0 -108 50t-42 129q0 59 25 115.5t68 95.5q63 57 149 57t133.5 -58.5t47.5 -159.5q0 -104 -50 -199.5t-142 -166.5q-60 -46 -118.5 -69t-158.5 -40v19q59 13 102 35t99 68q46 38 80.5 84.5t47.5 82.5zM417 518q0 62 -26 97t-73 35 q-62 0 -108 -61q-53 -70 -53 -175q0 -67 26 -103t74 -36q67 0 108 46q21 22 36.5 81.5t15.5 115.5z" />
+<glyph unicode=":" horiz-adv-x="333" d="M261 384q0 -23 -16.5 -38.5t-40.5 -15.5q-22 0 -38 16t-16 38q0 24 16 40.5t39 16.5t39.5 -16.5t16.5 -40.5zM161 43q0 -23 -16.5 -38.5t-40.5 -15.5q-22 0 -38 16t-16 38q0 23 16.5 40t39.5 17q22 0 38.5 -17t16.5 -40z" />
+<glyph unicode=";" horiz-adv-x="333" d="M261 384q0 -23 -16.5 -38.5t-40.5 -15.5q-22 0 -38 16t-16 38q0 24 16 40.5t39 16.5t39.5 -16.5t16.5 -40.5zM36 -129l-10 18q76 49 76 90q0 14 -20 29q-25 19 -25 49q0 18 14.5 31t36.5 13q26 0 42 -21.5t16 -52.5q0 -88 -130 -156z" />
+<glyph unicode="&#x3c;" horiz-adv-x="675" d="M592 -10l-508 230v66l508 230v-72l-420 -191l420 -191v-72z" />
+<glyph unicode="=" horiz-adv-x="675" d="M590 120h-504v66h504v-66zM590 320h-504v66h504v-66z" />
+<glyph unicode="&#x3e;" horiz-adv-x="675" d="M592 220l-508 -230v72l420 191l-420 191v72l508 -230v-66z" />
+<glyph unicode="?" d="M216 174l-18 3q14 79 33.5 117.5t82.5 101.5q84 84 84 164q0 35 -21.5 58.5t-58.5 23.5q-33 0 -51.5 -12.5t-18.5 -35.5q0 -10 8 -27q6 -13 6 -25q0 -13 -12.5 -24.5t-29.5 -11.5q-36 0 -36 49q0 48 38 78.5t97 30.5q153 0 153 -124q0 -49 -24 -85.5t-107 -98.5 q-55 -41 -81 -75.5t-37 -78.5zM237 38q0 -21 -16 -35.5t-37 -14.5q-23 0 -37.5 14t-14.5 36q0 24 15 39.5t37 15.5t37.5 -16.5t15.5 -38.5z" />
+<glyph unicode="@" horiz-adv-x="920" d="M686 68l12 -29q-122 -57 -224 -57q-150 0 -253 97.5t-103 239.5q0 145 105.5 246t257.5 101q145 0 235 -87t90 -206q0 -96 -55 -165.5t-129 -69.5q-73 0 -89 72q-52 -71 -121 -71q-38 0 -64.5 29.5t-26.5 75.5q0 54 23.5 112.5t70.5 101.5t104 43q50 0 68 -52l10 37h69 l-61 -236q-7 -27 -7 -39q0 -40 40 -40q47 0 87.5 61t40.5 140q0 107 -85 185t-202 78q-123 0 -200.5 -88t-77.5 -229q0 -131 78.5 -214t206.5 -83q97 0 200 47zM570 394q0 62 -40 62q-20 0 -46 -15t-45 -40q-47 -62 -47 -136q0 -39 15.5 -61.5t43.5 -22.5q43 0 81 68t38 145 z" />
+<glyph unicode="A" horiz-adv-x="611" d="M564 0h-245v16q45 2 61 14t16 39q0 8 -2 26l-20 131h-220l-59 -111q-22 -41 -22 -66q0 -30 62 -33v-16h-186v16q34 7 55.5 32t78.5 124l285 496h26l92 -553q10 -62 24 -79t54 -20v-16zM369 262l-45 263l-149 -263h194z" />
+<glyph unicode="B" horiz-adv-x="611" d="M130 653h250q208 0 208 -150q0 -70 -64 -113q-34 -23 -111 -39v-1q126 -38 126 -150q0 -98 -74.5 -149t-200.5 -51h-272v16q41 6 55.5 20t27.5 60l121 436q11 39 11 64q0 22 -15 29.5t-62 11.5v16zM248 363h38q98 0 149.5 39t51.5 113q0 56 -28 82t-89 26 q-23 0 -31.5 -1.5t-15.5 -9t-12 -25.5zM238 331l-32 -119q-35 -133 -35 -140q0 -42 67 -42q88 0 140.5 44t52.5 126q0 45 -19 77t-48 42q-34 12 -126 12z" />
+<glyph unicode="C" horiz-adv-x="667" d="M689 664l-37 -200l-18 3q-18 163 -149 163q-109 0 -199 -97q-53 -56 -80.5 -136t-27.5 -165q0 -205 175 -205q62 0 113.5 26t115.5 93l18 -15q-67 -79 -131.5 -114t-141.5 -35q-117 0 -189 69.5t-72 191.5q0 103 51 196.5t136 153.5q102 73 219 73q69 0 117 -17 q20 -7 41 -7q27 0 38 22h21z" />
+<glyph unicode="D" horiz-adv-x="722" d="M131 653h277q134 0 213 -70t79 -199q0 -177 -160 -301q-106 -83 -291 -83h-257v16q43 8 56.5 20t25.5 56l122 445q11 39 11 59q0 21 -16 30.5t-60 10.5v16zM310 584l-118 -422q-22 -80 -22 -95q0 -37 68 -37q148 0 241 90q52 50 81 129.5t29 158.5q0 121 -78 180 q-47 35 -131 35q-32 0 -47.5 -7.5t-22.5 -31.5z" />
+<glyph unicode="E" horiz-adv-x="611" d="M634 653l-31 -154l-22 2q3 25 3 46q0 45 -37 59t-155 14q-42 0 -55 -4.5t-18 -21.5l-66 -233h78q66 0 88 16t51 81l18 -4l-68 -232l-20 5q7 31 7 52q0 24 -7 31q-16 15 -78 15h-78l-32 -112q-36 -127 -36 -146q0 -34 79 -34q129 0 203 39q38 20 94 98l16 -8l-62 -162 h-507v16q43 8 56 19.5t25 54.5l123 442q11 37 11 64q0 20 -15.5 28.5t-61.5 12.5v16h497z" />
+<glyph unicode="F" horiz-adv-x="611" d="M645 653l-32 -154l-21 2q3 22 3 33q0 39 -14 55.5t-54 23.5t-131 7q-35 0 -49 -6.5t-19 -25.5l-64 -227q49 1 71.5 1t48.5 4.5t34.5 8t22.5 17t20 25t19 38.5l18 -5l-76 -235l-17 5q8 41 8 61q0 28 -17.5 36t-57.5 8q-28 0 -83 3l-59 -213q-14 -50 -14 -60q0 -18 17 -27 t60 -12v-16h-251v16q41 3 56 19t27 59l123 442q10 36 10 61q0 21 -13.5 28.5t-62.5 11.5v16h497z" />
+<glyph unicode="G" horiz-adv-x="722" d="M722 319v-16q-49 -3 -67.5 -16.5t-29.5 -55.5l-49 -187q-111 -62 -237 -62q-137 0 -213 76q-35 35 -54.5 88t-19.5 105q0 103 50 194t133 149q104 72 220 72q72 0 134 -24q26 -10 44 -10q36 0 60 34l15 -5l-49 -197l-18 3q-3 64 -37 106q-48 59 -141 59q-117 0 -195 -99 q-50 -63 -78 -143t-28 -162q0 -99 53 -154t149 -55q71 0 105 34q9 9 16 26.5t23 74.5q26 87 26 113q0 29 -47 33l-32 3v16h267z" />
+<glyph unicode="H" horiz-adv-x="722" d="M769 653v-16q-44 -8 -58 -20t-26 -54l-132 -481q-3 -12 -3 -24q0 -21 15 -29t64 -13v-16h-274v16q51 4 71.5 21t30.5 56l64 233h-285l-66 -244q-3 -10 -3 -22q0 -22 12.5 -30t57.5 -14v-16h-245v16q41 4 56.5 20t29.5 66l118 430q12 46 12 64q0 21 -14.5 28.5t-62.5 12.5 v16h271v-16q-45 -3 -67.5 -19t-32.5 -52l-54 -198h285l46 164q14 52 14 63q0 19 -16 29t-56 13v16h248z" />
+<glyph unicode="I" horiz-adv-x="333" d="M384 653v-16q-42 -5 -55.5 -18t-26.5 -59l-120 -429q-15 -53 -15 -76q0 -20 12.5 -27t56.5 -12v-16h-244v16q42 8 57.5 21t26.5 54l120 441q13 46 13 62q0 20 -16 30.5t-56 12.5v16h247z" />
+<glyph unicode="J" horiz-adv-x="444" d="M491 653v-16q-43 -6 -56 -17.5t-26 -56.5l-103 -367q-29 -104 -71 -159t-124 -55q-53 0 -85 24t-32 64q0 24 12.5 40t32.5 16t35.5 -13.5t15.5 -32.5q0 -6 -1.5 -14.5t-1.5 -12.5q0 -39 35 -39t53 64l127 454q12 44 12 64t-15 28.5t-62 12.5v16h254z" />
+<glyph unicode="K" horiz-adv-x="667" d="M722 653v-16q-28 0 -77 -37l-298 -225l168 -293q23 -40 40 -50.5t64 -15.5v-16h-275v16l29 3q46 4 46 32q0 6 -1.5 13t-6.5 16l-8 16l-11 19q-8 14 -10 18l-123 215l-65 -237q-11 -39 -11 -51q0 -23 14.5 -31.5t56.5 -12.5v-16h-247v16q43 5 56 17t25 54l124 445 q14 50 14 62q0 21 -17 31t-62 12v16h270v-16q-42 -3 -65 -18.5t-34 -55.5l-53 -194l153 109q143 101 143 137q0 15 -36 19l-24 3v16h221z" />
+<glyph unicode="L" horiz-adv-x="556" d="M559 180l-58 -180h-509v16q42 4 55 17t27 61l122 438q11 37 11 62q0 22 -15.5 31t-61.5 12v16h273v-16q-46 -3 -67.5 -19t-33.5 -58l-120 -429q-10 -38 -10 -54q0 -23 22 -32t83 -9q77 0 110.5 7t69.5 31q41 27 82 112z" />
+<glyph unicode="M" horiz-adv-x="833" d="M872 653v-16q-41 -7 -55.5 -20.5t-25.5 -53.5l-123 -443q-14 -50 -14 -62q0 -20 18 -30.5t63 -11.5l-1 -16h-271v16q49 5 69 22t33 64l126 459l-376 -561h-17l-62 546l-118 -428q-9 -32 -9 -54q0 -43 70 -48v-16h-197v16q40 5 58.5 28.5t41.5 105.5l114 401q12 41 12 52 q0 30 -74 34v16h181l56 -492l335 492h166z" />
+<glyph unicode="N" horiz-adv-x="667" d="M727 653v-16q-27 -6 -37.5 -9.5t-23 -21t-18.5 -38.5l-23 -76l-146 -507h-18l-230 550l-114 -422q-9 -31 -9 -54q0 -21 15.5 -30.5t54.5 -12.5v-16h-198v16q43 6 61 31.5t45 120.5l117 415q-23 54 -86 54v16h160l207 -499l106 388q8 28 8 44q0 27 -13.5 37t-55.5 14v16 h198z" />
+<glyph unicode="O" horiz-adv-x="722" d="M699 418q0 -107 -57.5 -205t-149.5 -160q-105 -71 -214 -71q-99 0 -158.5 62t-59.5 172q0 91 49 187.5t128 165.5q112 97 237 97q107 1 166 -66t59 -182zM594 481q0 71 -34.5 111.5t-94.5 40.5q-99 0 -186 -117q-53 -72 -83.5 -163t-30.5 -169q0 -82 33.5 -125.5 t96.5 -43.5q92 0 170 95q59 74 94 181t35 190z" />
+<glyph unicode="P" horiz-adv-x="611" d="M146 653h241q218 0 218 -148q0 -40 -18.5 -78.5t-49.5 -64.5q-69 -57 -205 -57q-55 0 -90 8l-53 -193q-14 -54 -14 -63q0 -18 15 -27.5t54 -13.5v-16h-244v16q43 6 56.5 19.5t27.5 62.5l116 414q17 61 17 83q0 20 -14 28.5t-57 13.5v16zM320 592l-69 -245q29 -5 52 -5 q87 0 128 24q71 40 71 134q0 123 -130 123q-44 0 -52 -31z" />
+<glyph unicode="Q" horiz-adv-x="722" d="M69 -169l-10 16q58 41 83.5 61t93.5 80q-85 17 -130.5 78.5t-45.5 158.5q0 93 46 185t127 162q111 94 241 94q101 0 163 -67t62 -170q0 -117 -71 -229.5t-185 -172.5q-68 -37 -164 -43l-54 -57h25q35 0 123 -20q86 -21 111 -21q54 0 90 16.5t78 60.5l16 -11 q-24 -34 -52 -59q-83 -75 -191 -75q-66 0 -148 26q-55 18 -93 18q-59 0 -115 -31zM594 480q0 71 -34.5 112t-94.5 41q-110 0 -194 -125q-45 -67 -75.5 -159.5t-30.5 -165.5q0 -75 34 -120.5t90 -45.5q114 0 198 124q46 70 76.5 166t30.5 173z" />
+<glyph unicode="R" horiz-adv-x="611" d="M132 653h252q97 0 150.5 -38t53.5 -103q0 -78 -66 -128q-39 -30 -131 -51l89 -235q17 -46 35.5 -64t51.5 -18v-16h-147l-123 324l-66 5l-55 -203q-13 -46 -13 -63q0 -23 13 -33t54 -14v-16h-243v16q40 5 56.5 22t28.5 63l119 431q12 46 12 63q0 18 -14 28q-12 8 -57 14 v16zM306 593l-63 -227q31 -5 51 -5q89 0 139 40t50 110q0 52 -31 82t-89 30q-49 0 -57 -30z" />
+<glyph unicode="S" d="M508 667l-40 -200l-18 3q0 83 -25 123t-94 40q-52 0 -82 -26.5t-30 -73.5q0 -38 16 -63.5t83 -92.5q67 -68 90 -109t23 -91q0 -85 -57.5 -140t-144.5 -55q-38 0 -104 23q-32 12 -47 12q-33 0 -43 -32h-18l34 224l20 -2q-2 -9 -2 -23q0 -73 40.5 -120t103.5 -47 q58 0 94.5 35.5t36.5 92.5q0 33 -13 59.5t-47 63.5l-39 42q-3 3 -17 18.5t-22 23.5q-45 48 -60 78.5t-15 71.5q0 76 51.5 120t126.5 44q52 0 85 -14q29 -11 46 -11t26 5t19 21h23z" />
+<glyph unicode="T" horiz-adv-x="556" d="M633 653l-44 -164l-17 2q3 25 3 46q0 81 -101 81h-58l-137 -490q-14 -49 -14 -66q0 -23 11 -31.5t42 -11.5l35 -3v-16h-288v16q52 5 74 20t33 55l143 527q-119 0 -160.5 -21.5t-77.5 -102.5l-18 4l42 155h532z" />
+<glyph unicode="U" horiz-adv-x="722" d="M765 653v-16q-21 -5 -31.5 -9.5t-20.5 -11t-17.5 -24.5t-14.5 -39t-20 -65l-83 -285q-34 -116 -97 -169q-60 -52 -158 -52t-159.5 46t-61.5 118q0 55 44 216l52 189q9 32 9 45q0 20 -17.5 30t-62.5 11v16h272v-16q-51 -5 -70.5 -22t-33.5 -69l-63 -226q-40 -141 -40 -179 q0 -53 39.5 -85.5t98.5 -32.5q84 0 135 54t85 178l64 233q23 85 23 103q0 22 -15 32t-55 14v16h198z" />
+<glyph unicode="V" horiz-adv-x="611" d="M688 653v-16q-32 -1 -56 -40l-373 -615h-19l-82 503q-17 105 -28.5 126t-53.5 26v16h240v-16q-47 -5 -61.5 -15t-14.5 -36q0 -10 1 -15l65 -443l210 360q49 84 49 115q0 27 -62 34v16h185z" />
+<glyph unicode="W" horiz-adv-x="833" d="M906 653v-16q-29 -9 -42.5 -22t-34.5 -53l-301 -580h-20l-50 453h-5l-222 -453h-19l-61 514q-8 70 -13 92.5t-16 33.5q-10 10 -51 15v16h235v-16q-41 -4 -56.5 -14t-15.5 -37q0 -13 1 -20l44 -404l172 348l-8 65q-4 38 -17.5 49t-57.5 13v16h236v-16q-39 -4 -53.5 -14 t-14.5 -34q0 -3 1 -8.5t1 -6.5l40 -412l188 365q23 44 23 68q0 41 -67 42v16h184z" />
+<glyph unicode="X" horiz-adv-x="611" d="M655 653v-16q-33 -11 -60.5 -31.5t-64.5 -63.5l-169 -194l101 -255q18 -45 36 -58t69 -19v-16h-271v16q43 1 60 9.5t17 27.5q0 16 -14 51l-67 165l-151 -172q-23 -26 -23 -48q0 -33 66 -33v-16h-213v16q40 7 76 40.5t144 159.5l83 97l-103 255q-15 37 -33.5 51t-61.5 18 v16h263v-16q-41 -5 -56 -13.5t-15 -27.5q0 -17 16 -56l59 -147l145 167q21 24 21 43q0 31 -61 34v16h207z" />
+<glyph unicode="Y" horiz-adv-x="556" d="M633 653v-16q-21 -7 -32 -17.5t-38 -43.5l-219 -270l-36 -123q-30 -103 -30 -127q0 -19 11.5 -27t41.5 -10l36 -3v-16h-289v16q51 3 72.5 18.5t34.5 62.5l59 205l-76 267q-11 40 -23.5 51t-53.5 17v16h239v-16q-44 -4 -58 -11.5t-14 -24.5t36 -144l31 -110l39 46 q149 176 149 213q0 24 -40 28l-29 3v16h189z" />
+<glyph unicode="Z" horiz-adv-x="556" d="M606 639l-483 -603h161q71 0 108.5 6t64.5 26q41 30 77 104l19 -3l-54 -169h-505v14l479 603h-171q-102 0 -142 -27q-22 -15 -32.5 -30.5t-33.5 -58.5l-19 5l45 147h486v-14z" />
+<glyph unicode="[" horiz-adv-x="389" d="M391 663l-7 -27h-62q-21 0 -31.5 -9t-15.5 -29l-158 -667q-6 -24 -6 -29q0 -28 49 -28h56l-7 -27h-188l197 816h173z" />
+<glyph unicode="\" horiz-adv-x="278" d="M319 -18h-71l-289 684h72z" />
+<glyph unicode="]" horiz-adv-x="389" d="M382 663l-197 -816h-173l7 27h62q22 0 32 9t15 32l160 670q4 16 4 25q0 26 -49 26h-57l7 27h189z" />
+<glyph unicode="^" horiz-adv-x="422" d="M422 301h-68l-143 289h-1l-142 -289h-68l181 365h60z" />
+<glyph unicode="_" d="M500 -125h-500v50h500v-50z" />
+<glyph unicode="`" horiz-adv-x="333" d="M311 492h-32l-140 106q-19 15 -19 32q0 16 10 25t26 9q22 0 40 -23z" />
+<glyph unicode="a" horiz-adv-x="501" d="M463 111l13 -11q-56 -68 -82.5 -89t-56.5 -21q-40 0 -40 41q0 25 23 115q-56 -84 -103 -120.5t-100 -36.5q-44 0 -72 30.5t-28 85.5q0 76 43.5 155t110.5 130t132 51q67 0 80 -58l11 48l3 3l61 7l7 -3q-1 -4 -6 -21q-89 -324 -89 -363q0 -13 14 -13q15 0 52 41zM365 361 q0 26 -15 42t-41 16q-68 0 -131 -92q-33 -49 -55 -109t-22 -106q0 -74 60 -74q59 0 127 98q77 111 77 225z" />
+<glyph unicode="b" d="M163 290h1q50 83 94.5 117t98.5 34q52 0 84 -32t32 -88q0 -77 -47 -155t-122.5 -127.5t-150.5 -49.5q-46 0 -88 16t-42 37v6l142 523q9 36 9 47q0 16 -9.5 19.5t-54.5 5.5v17q75 9 153 23l5 -5l-21 -82zM388 306q0 86 -70 86q-69 0 -137 -115q-32 -54 -52 -119.5 t-20 -111.5q0 -34 46 -34q66 0 123 59q46 48 78 114.5t32 120.5z" />
+<glyph unicode="c" horiz-adv-x="444" d="M350 107l16 -10q-46 -58 -89.5 -83t-99.5 -25q-71 0 -109 39t-38 115q0 67 34 129.5t89 107.5q77 61 167 61q46 0 75.5 -23t29.5 -58q0 -20 -14 -34t-34 -14t-29.5 11.5t-9.5 28.5q0 9 7.5 23.5t7.5 24.5q0 20 -37 20q-63 0 -109 -48q-91 -96 -91 -233q0 -54 23 -84 t66 -30q39 0 71 19t74 63z" />
+<glyph unicode="d" d="M521 683l6 -6l-39 -152l-60 -219q-65 -239 -65 -246q0 -20 18 -20q13 0 27.5 12.5t54.5 58.5l12 -10q-77 -114 -147 -114q-19 0 -30 12t-11 33q0 30 13 89q-43 -73 -84.5 -102.5t-93.5 -29.5q-50 0 -78.5 30.5t-28.5 86.5q0 119 96.5 227t195.5 108q31 0 45.5 -14 t19.5 -44h1l45 163q14 49 14 71q0 16 -11 20t-53 6v17q77 7 153 23zM356 361q0 26 -14.5 41.5t-32.5 15.5q-47 0 -91 -46q-50 -53 -83 -126.5t-33 -135.5q0 -34 15.5 -53.5t42.5 -19.5q45 0 91 49t75.5 125t29.5 150z" />
+<glyph unicode="e" horiz-adv-x="444" d="M358 109l12 -12q-88 -108 -204 -108q-61 0 -98 37.5t-37 99.5q0 117 93.5 216t205.5 99q39 0 60.5 -18t21.5 -50q0 -66 -76.5 -118t-207.5 -69q-10 -20 -10 -61t25.5 -66t67.5 -25q33 0 63 15.5t84 59.5zM152 252l-17 -44q112 27 161 74q50 48 50 97q0 39 -35 39 q-42 0 -87.5 -48.5t-71.5 -117.5z" />
+<glyph unicode="f" horiz-adv-x="278" d="M41 428h93q39 126 72 173q54 77 132 77q37 0 61.5 -17.5t24.5 -44.5q0 -17 -12.5 -30t-29.5 -13q-14 0 -25.5 11t-11.5 28q0 10 5 19t5 12q0 13 -22 13q-42 0 -71 -54.5t-51 -173.5h107l-6 -32h-108l-72 -320q-64 -283 -200 -283q-34 0 -56.5 17.5t-22.5 43.5 q0 17 11 29.5t27 12.5q17 0 27.5 -10.5t10.5 -26.5q0 -7 -4.5 -15.5t-4.5 -13.5q0 -16 20 -16q62 0 97 162l88 420h-91z" />
+<glyph unicode="g" d="M471 366h-49q9 -18 9 -51q0 -63 -57.5 -113.5t-127.5 -50.5q-18 0 -31 3q-3 1 -7 1q-13 0 -24.5 -13t-11.5 -28q0 -24 71 -42q142 -34 142 -127q0 -67 -56 -109t-154 -42q-78 0 -122.5 27.5t-44.5 80.5q0 39 22.5 66.5t94.5 70.5q-27 17 -27 39q0 48 77 84 q-79 28 -79 108q0 74 61 122.5t140 48.5q58 0 98 -28q11 -8 16 -8h60v-39zM352 348q0 39 -13.5 55t-42.5 16q-48 0 -85 -50t-37 -122q0 -35 16 -55t44 -20q50 0 85 59q33 56 33 117zM325 -90q0 35 -31.5 58.5t-111.5 48.5q-24 7 -34 11q-7 0 -30.5 -19t-34.5 -33 q-20 -25 -20 -58q0 -102 127 -102q59 0 97 27.5t38 66.5z" />
+<glyph unicode="h" d="M465 118l13 -13q-46 -65 -77 -89.5t-69 -24.5q-20 0 -32 11.5t-12 30.5q0 17 20 92l55 207q7 28 7 33q0 25 -28 25q-27 0 -69.5 -40t-82.5 -100q-31 -48 -49 -93.5t-47 -156.5h-75l146 554q13 50 13 62t-13 18.5t-28 6.5h-27v15q76 9 157 27l7 -6l-121 -447 q130 211 230 211q33 0 49 -18.5t16 -48.5q0 -43 -48 -193q-33 -101 -33 -125q0 -18 16 -18q12 0 26.5 14.5t55.5 65.5z" />
+<glyph unicode="i" horiz-adv-x="278" d="M222 114l13 -11q-42 -65 -71 -89.5t-66 -24.5q-49 0 -49 55q0 29 22 111l48 177q9 32 9 44q0 15 -11.5 19t-52.5 5v16q46 4 160 25l4 -3l-94 -343q-10 -34 -10 -44q0 -15 14 -15q25 0 84 78zM264 599q0 -21 -14.5 -36t-34.5 -15q-22 0 -35 14.5t-13 38.5q0 23 13.5 38 t33.5 15t35 -16.5t15 -38.5z" />
+<glyph unicode="j" horiz-adv-x="278" d="M246 438l-104 -410q-31 -121 -76.5 -178t-110.5 -57q-35 0 -57 17t-22 44q0 18 12 31t29 13q39 0 39 -37q0 -12 -6 -19.5t-6 -14.5q0 -12 18 -12q30 0 50.5 39t46.5 143l72 292q16 65 16 80q0 17 -10.5 24t-37.5 7h-26v16q45 3 169 25zM279 598q0 -20 -15 -35t-35 -15 q-23 0 -38.5 14.5t-15.5 37.5q0 22 16 37t37 15q20 0 35.5 -16.5t15.5 -37.5z" />
+<glyph unicode="k" horiz-adv-x="444" d="M461 428v-16q-36 -2 -76 -29.5t-149 -124.5l37 -88q55 -129 81 -129q21 0 45 42q5 8 15 26l15 -11q-35 -63 -58 -86t-53 -23q-22 0 -39.5 17.5t-41.5 64.5q-30 58 -60 141l-40 -32l-48 -180h-75l141 528q14 50 18 88q-3 24 -51 24h-18v16q75 9 157 27l6 -6l-120 -456 l43 33q143 110 143 140q0 18 -37 18h-14v16h179z" />
+<glyph unicode="l" horiz-adv-x="278" d="M279 678l-153 -585q-8 -29 -8 -43q0 -18 17 -18q27 0 67 57l25 35l14 -10q-45 -71 -77.5 -98t-73.5 -27q-49 0 -49 56q0 17 4 30l137 524q3 10 3 19q0 22 -49 22h-18v16q70 8 155 27z" />
+<glyph unicode="m" horiz-adv-x="722" d="M704 105l-5 -7q-77 -107 -144 -107q-40 0 -40 46q0 15 13 66l58 227q7 28 7 38q0 9 -6 15t-14 6q-47 0 -131 -117q-37 -52 -58 -104.5t-50 -167.5h-75l27 93q68 235 68 271q0 25 -22 25q-25 0 -66 -39.5t-83 -103.5q-25 -39 -42.5 -83t-53.5 -163h-75l43 144 q55 183 55 228q0 22 -41 22h-25v16l162 31l3 -2l-58 -209q130 211 220 211q29 0 44.5 -16t15.5 -44q0 -38 -40 -152q53 84 88.5 126.5t71.5 65.5q32 20 63 20q27 0 42.5 -17.5t15.5 -45.5q0 -13 -3 -28l-68 -251q-10 -38 -10 -45q0 -16 12 -16q22 0 65 53l21 26z" />
+<glyph unicode="n" d="M460 117l14 -13q-51 -70 -78 -91.5t-62 -21.5q-20 0 -33.5 13.5t-13.5 40.5q0 16 16 75l44 162q14 54 14 79q0 29 -24 29q-29 0 -63.5 -34.5t-84.5 -107.5q-33 -49 -48.5 -88t-51.5 -160h-75l96 350q2 10 2 17q0 15 -13.5 20.5t-51.5 6.5v16q39 8 87 16.5t75 14.5l4 -2 l-67 -218q74 118 128 169t103 51q31 0 48 -16.5t17 -44.5q0 -25 -10 -60l-56 -203q-14 -50 -14 -61q0 -18 16 -18q19 0 61 53q7 8 21 26z" />
+<glyph unicode="o" d="M468 301q0 -57 -28.5 -118.5t-77.5 -110.5q-83 -83 -188 -83q-70 0 -108.5 36.5t-38.5 102.5q0 83 50.5 162t129.5 121q56 30 120 30q62 0 101.5 -37.5t39.5 -102.5zM384 326q0 45 -19 69.5t-52 24.5q-67 0 -128 -91q-74 -113 -74 -228q0 -44 21 -67.5t57 -23.5 q61 0 121 83q34 46 54 110.5t20 122.5z" />
+<glyph unicode="p" horiz-adv-x="504" d="M215 428l-29 -100q75 113 171 113q55 0 85 -33t30 -92q0 -123 -93.5 -225t-203.5 -102q-36 0 -69 17q-40 -165 -40 -166q0 -16 13.5 -22.5t48.5 -6.5v-16h-203v16q32 1 45.5 14t22.5 49l115 432q16 58 16 71q0 27 -44 27h-22l-2 15l156 22q5 0 5 -4q-1 -5 -2 -9zM382 313 q0 44 -14.5 64.5t-47.5 20.5q-39 0 -78 -34t-57 -80q-22 -57 -43.5 -135t-21.5 -103q0 -17 13.5 -27.5t34.5 -10.5q78 0 145 95q69 96 69 210z" />
+<glyph unicode="q" d="M484 428l-165 -579q-2 -8 -2 -11q0 -31 57 -31h15v-16h-237v16q46 3 64 15t27 41l90 290q-59 -94 -104 -129t-104 -35q-47 0 -73.5 31t-26.5 85q0 77 44.5 156t113 129.5t135.5 50.5q63 0 77 -62l16 49h73zM380 359q0 25 -17 42.5t-42 17.5q-41 0 -93 -49 q-51 -49 -84 -119t-33 -132q0 -77 53 -77q41 0 82 36q51 44 92.5 131.5t41.5 149.5z" />
+<glyph unicode="r" horiz-adv-x="389" d="M176 223l16 35q34 75 94 138q43 45 79 45q21 0 34 -14t13 -37t-12.5 -38.5t-34.5 -15.5q-19 0 -35 26q-8 14 -16 14q-27 0 -82 -94q-34 -58 -54.5 -109.5t-56.5 -172.5h-76l81 292q16 59 16 82q0 26 -38 26q-8 0 -31 -3v17l155 27l3 -2z" />
+<glyph unicode="s" horiz-adv-x="389" d="M366 442l-20 -140h-16q-14 116 -89 116q-27 0 -43 -15t-16 -42q0 -38 54 -102q68 -79 68 -136q0 -61 -40.5 -97.5t-103.5 -36.5q-29 0 -55 10q-21 9 -44 9q-20 0 -29 -21h-16l20 159h16q20 -136 100 -136q36 0 56 20t20 57q0 45 -56 115q-63 79 -63 131q0 50 33 79t88 29 q20 0 56 -10q22 -7 36 -7q20 0 30 18h14z" />
+<glyph unicode="t" horiz-adv-x="278" d="M296 428l-5 -32h-84l-87 -328q-2 -8 -2 -14q0 -16 15 -16q12 0 28 15.5t53 63.5l13 -7q-46 -70 -75.5 -95.5t-67.5 -25.5q-46 0 -46 37q0 10 16 74l78 296h-75l-1 6q0 18 33 25q25 6 66 38.5t67 71.5q6 9 14 9q9 0 9 -8q0 -5 -1 -7l-28 -103h80z" />
+<glyph unicode="u" d="M461 119l14 -9q-48 -73 -75 -96t-63 -23q-48 0 -48 48q0 45 45 197q-89 -146 -137.5 -196.5t-101.5 -50.5t-53 53q0 18 27 128l35 139q14 58 14 67q0 12 -11 18t-50 6v14q69 8 150 27l4 -3l-89 -355q-3 -9 -3 -16q0 -25 20 -25q45 0 142 147q33 50 51.5 91.5t58.5 151.5 h74l-79 -299q-19 -72 -19 -78q0 -17 11 -17q12 0 29 16t54 65z" />
+<glyph unicode="v" horiz-adv-x="444" d="M207 70l31 32q54 55 95.5 125.5t41.5 105.5q0 12 -18 29q-25 22 -25 45q0 15 11 24.5t27 9.5q24 0 40 -18.5t16 -40.5q0 -58 -63 -155q-55 -85 -119 -153l-22 -23q-13 -14 -19 -21t-15 -16l-14 -14q-5 -5 -11 -10t-10 -6.5t-8 -1.5q-9 0 -9 27v24q0 138 -24 278 q-10 57 -21.5 75t-39.5 18q-20 0 -31 -1v13q55 9 112 21q11 4 20 4q6 0 9.5 -13t20.5 -101q18 -91 25 -257z" />
+<glyph unicode="w" horiz-adv-x="667" d="M403 426l32 -352q99 123 132 175.5t33 84.5q0 14 -22 35q-21 20 -21 41q0 12 11.5 21.5t27.5 9.5q22 0 37 -16t15 -40q0 -91 -212 -349l-9 -11q-35 -43 -45 -43q-8 0 -11 35l-29 310l-89 -152q-23 -38 -55 -99q-49 -94 -64 -94q-7 0 -9 9t-4 38l-4 91q-8 164 -27 242 q-7 27 -15.5 34.5t-31.5 7.5h-28v13q79 13 95 17q5 1 11.5 3t10.5 3t7 1q8 0 11 -5t8 -29q25 -120 32 -281l192 304q6 10 13 10q8 0 8 -14z" />
+<glyph unicode="x" horiz-adv-x="444" d="M243 355l12 -57q53 81 85.5 112t65.5 31q18 0 29.5 -10.5t11.5 -26.5t-9.5 -26t-24.5 -10q-9 0 -24 8.5t-28 8.5q-29 0 -98 -121q0 -13 8 -45l32 -134q10 -41 30 -41q16 0 47 40l7 10l7 10q3 4 7 8l15 -9q-43 -67 -68 -90.5t-54 -23.5q-24 0 -37 15t-22 53l-29 119 l-88 -119q-31 -42 -50.5 -55t-44.5 -13q-23 0 -36.5 11t-13.5 31q0 15 9.5 25.5t24.5 10.5q12 0 32 -11q15 -9 26 -9q17 0 51 49l82 116l-28 124q-10 44 -18.5 56t-27.5 12q-12 0 -39 -7l-18 -5l-3 16l11 4q80 29 117 29q19 0 30 -18t21 -68z" />
+<glyph unicode="y" horiz-adv-x="444" d="M243 186l21 -110q67 110 94.5 167.5t27.5 89.5q0 16 -26 32q-26 17 -26 39q0 16 11.5 26.5t28.5 10.5q22 0 37 -16t15 -39q0 -87 -131 -305q-78 -129 -151.5 -208t-116.5 -79q-23 0 -37 12t-14 31q0 17 11.5 28.5t27.5 11.5q19 0 34 -14t27 -14q18 0 48 33 q13 13 38.5 46.5t32.5 44.5q10 20 10 35q0 30 -31 155.5t-51 176.5q-14 37 -30.5 50.5t-46.5 13.5q-16 0 -31 -4v17q22 4 32 6q41 8 107 18h4q11 0 41.5 -93t43.5 -162z" />
+<glyph unicode="z" horiz-adv-x="389" d="M380 417l-289 -344q46 -10 68.5 -25t51.5 -58q34 -50 70 -50q27 0 27 15q0 5 -5 15q-8 16 -8 28q1 13 11 23.5t22 10.5q16 0 25.5 -10t9.5 -27q0 -31 -26 -53.5t-67 -22.5q-42 0 -113 44q-68 42 -105 42q-23 0 -45 -18l-9 9l310 372h-136q-40 0 -58 -11.5t-33 -48.5 l-16 4l32 116h283v-11z" />
+<glyph unicode="{" horiz-adv-x="400" d="M407 687l-3 -11q-47 -12 -70 -38.5t-39 -85.5l-45 -168q-16 -62 -40.5 -89t-73.5 -40q56 -24 56 -63q0 -31 -44 -190q-22 -84 -22 -102q0 -28 12 -43t41 -23l-3 -11q-69 2 -97 19.5t-28 58.5q0 33 32 144q34 116 34 153q0 22 -11.5 34t-41.5 23q48 13 69.5 36t36.5 78 l48 178q22 79 63 109.5t126 30.5z" />
+<glyph unicode="|" horiz-adv-x="275" d="M171 -18h-66v684h66v-684z" />
+<glyph unicode="}" horiz-adv-x="400" d="M221 676l3 11q69 -2 97 -19.5t28 -58.5q0 -35 -32 -144q-34 -117 -34 -153q0 -22 11.5 -34t41.5 -23q-48 -13 -69.5 -36t-36.5 -78l-48 -178q-22 -79 -63.5 -109.5t-125.5 -30.5l3 11q47 12 70 38.5t39 85.5l45 168q16 62 40 89t74 40q-56 24 -56 63q0 31 44 190 q22 80 22 101q0 52 -53 67z" />
+<glyph unicode="~" horiz-adv-x="541" d="M466 323l36 -50q-33 -48 -61.5 -67t-63.5 -19q-46 0 -103 33q-60 35 -113 35q-25 0 -48.5 -18.5t-36.5 -53.5l-36 50q44 86 122 86q47 0 114 -31l18 -9l27 -13q12 -5 27 -10t25 -5q29 0 46.5 14.5t46.5 57.5z" />
+<glyph unicode="&#xa1;" horiz-adv-x="389" d="M321 419q0 -20 -16 -35.5t-36 -15.5q-22 0 -38 16t-16 38q0 21 16.5 36.5t38.5 15.5t36.5 -15.5t14.5 -39.5zM224 285l17 -4q-46 -204 -72 -370q-10 -62 -26.5 -89t-43.5 -27q-40 0 -40 50q0 41 38 124q50 108 127 316z" />
+<glyph unicode="&#xa2;" d="M414 560l-42 -120q45 -4 70 -22q30 -23 30 -58q0 -20 -13.5 -34t-34.5 -14q-18 0 -28.5 11t-10.5 29q0 12 9 29q6 13 6 18q0 20 -35 21l-137 -391q11 -4 24 -4q38 0 70 18.5t75 64.5l16 -10q-45 -58 -89 -83.5t-98 -25.5q-6 0 -11 1l-47 -133h-31l48 136q-37 8 -58 25 q-50 39 -50 122q0 77 40.5 148t111.5 115q42 26 113 37l42 120h30zM202 41l132 376q-47 -10 -85 -48q-41 -42 -63.5 -104t-22.5 -123q0 -68 39 -101z" />
+<glyph unicode="&#xa3;" d="M82 361h109q15 87 36.5 141.5t59.5 99.5q57 68 137 68q41 0 67 -21t26 -55q0 -41 -39 -41q-30 0 -36 44t-40 44q-42 0 -64.5 -53t-57.5 -227h124l-7 -42h-127q-19 -81 -30.5 -114t-42.5 -101q90 -38 160 -38q39 0 79 28l10 7l11 -9q-41 -100 -142 -100q-37 0 -65.5 13 t-78.5 52q-28 -37 -48.5 -50t-47.5 -13q-31 0 -48 17t-17 47q0 28 24 48t64 20q34 0 62 -11l25 204h-112zM146 73q-35 25 -61 25q-23 0 -38 -12.5t-15 -32.5q0 -16 12.5 -26.5t30.5 -10.5q20 0 40 16t31 41z" />
+<glyph unicode="&#xa4;" d="M522 40l-48 -50l-98 98q-59 -41 -125 -41q-68 0 -127 41l-96 -98l-50 50l98 96q-41 59 -41 126q0 69 41 126l-98 98l50 48l96 -96q60 39 127 39q69 0 125 -39l98 96l48 -48l-96 -98q39 -57 39 -125q0 -67 -39 -127zM397 263q0 62 -42.5 106t-101.5 44q-62 0 -106 -43.5 t-44 -105.5q0 -64 43 -108.5t105 -44.5q61 0 103.5 44t42.5 108z" />
+<glyph unicode="&#xa5;" d="M605 653v-16q-25 -11 -38.5 -21.5t-36.5 -39.5l-181 -224h149l-12 -40h-168l-6 -8l-24 -82h178l-12 -40h-178q-31 -94 -31 -118q0 -41 54 -45l36 -3v-16h-283l4 16q54 5 76 21t35 61l25 84h-164l12 40h163l23 80l-3 10h-162l12 40h139l-63 216q-12 40 -26 51.5t-62 17.5 v16h237v-16q-46 -4 -59.5 -11t-13.5 -23q0 -27 39 -156l29 -100q19 21 28 33q93 108 127 154.5t35 71.5q0 24 -42 28l-25 3v16h189z" />
+<glyph unicode="&#xa6;" horiz-adv-x="275" d="M171 391h-66v275h66v-275zM171 -18h-66v275h66v-275z" />
+<glyph unicode="&#xa7;" d="M249 398l2 3q-38 47 -52.5 77t-14.5 63q0 55 41.5 90t105.5 35q57 0 93.5 -28t36.5 -71q0 -25 -14 -40t-38 -15q-20 0 -33 12.5t-13 32.5t21 38q13 12 13 19q0 13 -17.5 22t-42.5 9q-43 0 -67.5 -22.5t-24.5 -60.5q0 -40 26 -72l123 -150q41 -50 41 -114 q0 -57 -32.5 -91.5t-85.5 -34.5q-19 0 -33 7l-2 -3q39 -50 51 -74.5t12 -54.5q0 -59 -44.5 -98t-111.5 -39q-57 0 -96.5 31t-39.5 77q0 26 15 41t41 15q47 0 47 -43q0 -30 -27 -46q-15 -10 -15 -17q0 -15 21.5 -26t49.5 -11q45 0 73.5 25t28.5 65q0 39 -50 97l-76 87 q-71 82 -71 153q0 51 31 87t75 36q25 0 53 -11zM377 192q0 25 -12.5 51t-44.5 69q-57 76 -107 76q-28 0 -47 -19t-19 -47q0 -53 60.5 -127t104.5 -74q27 0 46 21t19 50z" />
+<glyph unicode="&#xa8;" horiz-adv-x="333" d="M205 557q0 -20 -14.5 -34.5t-34.5 -14.5q-21 0 -35 14.5t-14 35.5q0 20 14.5 34t35.5 14q19 0 33.5 -15t14.5 -34zM405 557q0 -20 -14.5 -34.5t-34.5 -14.5q-21 0 -35 14.5t-14 35.5q0 20 14.5 34t35.5 14q19 0 33.5 -15t14.5 -34z" />
+<glyph unicode="&#xa9;" horiz-adv-x="760" d="M545 240l-15 -68q-1 -8 -5 -11t-16 -7q-64 -18 -111 -18q-95 0 -151 51t-56 136q0 89 60.5 144.5t157.5 55.5q46 0 99 -18q21 -6 21 -21v-69h-16q-15 88 -107 88q-67 0 -102.5 -44.5t-35.5 -127.5q0 -84 36.5 -129.5t104.5 -45.5q43 0 71 20t49 64h16zM719 318 q0 -139 -98.5 -237.5t-238.5 -98.5q-143 0 -242 99t-99 242t99 243t240 100q144 0 241.5 -100t97.5 -248zM664 319q0 127 -82.5 216t-200.5 89q-116 0 -200.5 -89t-84.5 -212q0 -122 84.5 -210.5t200.5 -88.5q115 0 199 88t84 207z" />
+<glyph unicode="&#xaa;" horiz-adv-x="276" d="M299 673l53 2q-48 -168 -54 -203l-3 -15q-1 -3 -1 -7q0 -7 4 -7q7 0 31 24l14 15l7 -10q-37 -41 -53.5 -53.5t-36.5 -12.5q-31 0 -31 25q0 19 17 62q-38 -51 -63.5 -69t-62.5 -18q-36 0 -57 18.5t-21 51.5q0 70 61.5 135t127.5 65q50 0 59 -35l7 30zM269 620q0 36 -19 38 q-40 0 -87.5 -61.5t-47.5 -116.5q0 -16 9 -28t20 -12q39 0 79 60q20 29 33 63.5t13 56.5z" />
+<glyph unicode="&#xab;" d="M215 216v9q103 80 127 101q88 77 97 77q6 0 6 -7q0 -29 -91 -112q-31 -28 -65 -67q6 -14 20 -40q62 -116 62 -133q0 -7 -7 -7q-6 0 -20 16.5t-33.5 42.5t-28.5 36q-44 50 -67 84zM53 216v9q103 80 127 101q88 77 97 77q6 0 6 -7q0 -29 -91 -112q-25 -22 -65 -67 q6 -14 20 -40q62 -116 62 -133q0 -7 -7 -7t-21 16.5t-32.5 42t-28.5 36.5q-44 50 -67 84z" />
+<glyph unicode="&#xac;" horiz-adv-x="675" d="M590 108h-66v212h-438v66h504v-278z" />
+<glyph unicode="&#xad;" horiz-adv-x="333" d="M282 255l-13 -63h-220l14 63h219z" />
+<glyph unicode="&#xae;" horiz-adv-x="760" d="M563 146h-63q-13 0 -28 17t-41 62q-21 37 -51 82h-47v-97q0 -32 6 -38.5t42 -10.5v-15h-160v15q36 4 42 10.5t6 38.5v237q0 33 -6 39t-42 10v15h175q53 0 83.5 -24.5t30.5 -66.5q0 -71 -79 -103l57 -78q46 -62 75 -84v-9zM333 325h42q68 0 68 89q0 78 -69 78h-41v-167z M719 318q0 -139 -98.5 -237.5t-238.5 -98.5q-143 0 -242 99t-99 242t99 243t240 100q144 0 241.5 -100t97.5 -248zM664 319q0 127 -82.5 216t-200.5 89q-116 0 -200.5 -89t-84.5 -212q0 -122 84.5 -210.5t200.5 -88.5q115 0 199 88t84 207z" />
+<glyph unicode="&#xaf;" horiz-adv-x="333" d="M411 583l-11 -51h-301l11 51h301z" />
+<glyph unicode="&#xb0;" horiz-adv-x="400" d="M387 533q0 -61 -41.5 -102t-103.5 -41q-58 0 -99.5 42t-41.5 101q0 60 41.5 101.5t101.5 41.5t101.5 -41.5t41.5 -101.5zM348 533q0 44 -30.5 76.5t-73.5 32.5t-73.5 -32t-30.5 -77q0 -44 30.5 -76.5t72.5 -32.5q43 0 74 32t31 77z" />
+<glyph unicode="&#xb1;" horiz-adv-x="675" d="M590 0h-504v66h504v-66zM590 282h-219v-160h-66v160h-219v66h219v220h66v-220h219v-66z" />
+<glyph unicode="&#xb2;" horiz-adv-x="300" d="M91 572l-13 8q18 42 43 63q39 33 92 33q46 0 78.5 -29.5t32.5 -71.5q0 -26 -17 -49.5t-82 -86.5l-114 -110l2 -5h108q27 0 40 7t25 27l11 -8l-33 -79h-231v18l133 130q93 91 93 139q0 28 -23 47.5t-55 19.5q-50 0 -90 -53z" />
+<glyph unicode="&#xb3;" horiz-adv-x="300" d="M149 608l-10 7q34 61 105 61q40 0 67.5 -22t27.5 -54q0 -29 -21.5 -48t-79.5 -39l4 -2q28 -14 38 -24q21 -24 21 -62q0 -69 -52 -113t-133 -44q-73 0 -73 39q0 12 8.5 20t21.5 8q14 0 38 -17q28 -19 43 -19q36 0 60 26.5t24 66.5q0 46 -26.5 71.5t-73.5 25.5h-13v9 q147 28 147 94q0 22 -14.5 37t-35.5 15q-34 0 -73 -36z" />
+<glyph unicode="&#xb4;" horiz-adv-x="333" d="M180 494l162 160q10 10 25 10t25.5 -10.5t10.5 -25.5q0 -18 -17 -28l-171 -106h-35z" />
+<glyph unicode="&#xb5;" d="M497 428l-78 -336q-6 -27 -6 -34q0 -28 26 -28q23 0 56 26l-3 -9q-32 -32 -55 -44.5t-52 -12.5q-57 0 -57 59q0 12 4 31q-77 -90 -154 -90q-76 0 -103 76q-2 -21 -2 -48q0 -25 1 -42t1 -43q0 -65 -19.5 -103.5t-51.5 -38.5q-34 0 -34 45t38 118q26 66 34 100l85 374h88 l-67 -284q-3 -10 -3 -30q0 -32 18.5 -50.5t50.5 -18.5q68 0 122 70l73 313h88z" />
+<glyph unicode="&#xb6;" horiz-adv-x="559" d="M621 653l-6 -21q-56 -4 -72 -14t-25 -44l-160 -600q-11 -42 -11 -50q0 -20 49 -24l23 -2l-5 -21h-148l200 755h-58l-200 -755h-148l5 21q58 5 74 13q10 6 13 15q18 51 68 245l30 112q-71 3 -108 28q-45 31 -45 92q0 47 16 94.5t43 79.5q34 40 82.5 58t125.5 18h257z M260 304l79 328q-62 -4 -101 -49q-28 -32 -46 -81.5t-18 -95.5q0 -53 33 -83q15 -15 53 -19z" />
+<glyph unicode="&#xb7;" horiz-adv-x="250" d="M181 253q0 -22 -17 -38t-40 -16q-22 0 -38 16t-16 38q0 24 16 40.5t39 16.5t39.5 -17t16.5 -40z" />
+<glyph unicode="&#xb8;" horiz-adv-x="333" d="M119 0l-44 -66q15 3 25 3q38 0 60 -18.5t22 -49.5q0 -38 -33.5 -62t-85.5 -24q-38 0 -93 21l17 29q41 -15 68 -15q53 0 53 41q0 19 -13 31.5t-33 12.5q-12 0 -32 -7l-9 8l60 96h38z" />
+<glyph unicode="&#xb9;" horiz-adv-x="300" d="M270 676h9q5 0 5 -5t-4 -16l-86 -274q-19 -58 -19 -74q0 -11 10 -15t39 -5v-16h-181v16q35 4 48 9t17 16l90 285q5 15 5 21q0 17 -21 17h-34v19q33 5 122 22z" />
+<glyph unicode="&#xba;" horiz-adv-x="310" d="M362 592q0 -69 -62.5 -127.5t-135.5 -58.5q-44 0 -70.5 22.5t-26.5 60.5q0 72 61 129.5t137 57.5q43 0 70 -23.5t27 -60.5zM289 607q0 47 -31 47q-41 1 -79.5 -57t-38.5 -121q0 -21 10.5 -33.5t27.5 -12.5q29 0 49 22q27 28 44.5 72t17.5 83z" />
+<glyph unicode="&#xbb;" d="M447 215l-36 -27q-47 -35 -91 -74q-87 -77 -97 -77q-6 0 -6 7q0 29 91 112q35 31 65 67l-20 40q-62 114 -62 133q0 7 7 7t20.5 -16t33 -42.5t28.5 -36.5q49 -57 67 -84v-9zM285 215l-36 -27q-47 -35 -91 -74q-87 -77 -97 -77q-6 0 -6 7q0 19 91 112l65 67l-20 40 q-62 114 -62 133q0 7 7 7q6 0 20 -16.5t33 -42t29 -36.5q49 -57 67 -84v-9z" />
+<glyph unicode="&#xbc;" horiz-adv-x="750" d="M649 676l-455 -686h-51l455 686h51zM736 406l-79 -259h55l-9 -43h-58l-30 -104h-63l32 105h-168l13 42l271 259h36zM653 333l-189 -186h129zM138 635v19q9 1 70 12q52 10 60 10q5 0 5 -5q0 -7 -3 -16l-86 -274q-19 -58 -19 -74q0 -11 10 -15t39 -5v-16h-181v16q35 4 48 9 t17 16l90 285q5 15 5 21q0 17 -25 17h-30z" />
+<glyph unicode="&#xbd;" horiz-adv-x="750" d="M635 676l-455 -686h-51l455 686h51zM516 301l-13 8q18 42 43 63q40 34 93 34q45 0 77.5 -30t32.5 -72q0 -26 -17 -49.5t-82 -86.5l-114 -110l2 -5h108q27 0 40 7t25 27l11 -8l-33 -79h-231v18l133 130q93 91 93 139q0 28 -23 47.5t-55 19.5q-50 0 -90 -53zM139 635v19 q8 1 70 12q52 10 60 10q5 0 5 -5q0 -7 -3 -16l-86 -274q-19 -60 -19 -74q0 -11 10 -15t39 -5v-16h-181v16q35 4 48 9t17 16l90 285q5 15 5 22q0 16 -24 16h-31z" />
+<glyph unicode="&#xbe;" horiz-adv-x="750" d="M650 676l-455 -686h-51l455 686h51zM736 406l-79 -259h55l-9 -43h-58l-30 -104h-63l32 105h-168l13 42l271 259h36zM653 333l-189 -186h129zM129 608l-10 7q15 28 43 44.5t62 16.5q40 0 67.5 -22t27.5 -54q0 -29 -21.5 -48t-79.5 -39v-3q27 -7 42 -23q21 -24 21 -62 q0 -69 -52 -113t-133 -44q-73 0 -73 39q0 12 8.5 20t21.5 8q14 0 38 -17q28 -19 43 -19q36 0 60 26.5t24 66.5q0 46 -26.5 71.5t-73.5 25.5h-13v9q147 28 147 94q0 22 -14.5 37t-35.5 15q-34 0 -73 -36z" />
+<glyph unicode="&#xbf;" d="M367 421q0 -22 -15 -37.5t-37 -15.5q-23 0 -38 15.5t-15 37.5q0 21 15.5 36.5t36.5 15.5q22 0 37.5 -15t15.5 -37zM284 285l17 -2q-13 -75 -31 -109.5t-81 -106.5q-49 -57 -68 -92t-19 -74q0 -40 21 -62t59 -22q32 0 51 13t19 35q0 8 -7.5 23t-7.5 28q0 17 11 27.5 t29 10.5t28.5 -13.5t10.5 -36.5q0 -48 -39.5 -78.5t-101.5 -30.5q-69 0 -108 30.5t-39 90.5q0 47 25.5 84t108.5 105q54 43 79.5 76t35.5 75z" />
+<glyph unicode="&#xc0;" horiz-adv-x="611" d="M500 742h-32l-140 106q-19 15 -19 32q0 16 10 25t26 9q22 0 40 -23zM564 0h-245v16q45 2 61 14t16 39q0 8 -2 26l-20 131h-220l-59 -111q-22 -41 -22 -66q0 -30 62 -33v-16h-186v16q34 7 55.5 32t78.5 124l285 496h26l92 -553q10 -62 24 -79t54 -20v-16zM369 262l-45 263 l-149 -263h194z" />
+<glyph unicode="&#xc1;" horiz-adv-x="611" d="M292 744l162 160q10 10 25 10t25.5 -10.5t10.5 -25.5q0 -18 -17 -28l-171 -106h-35zM564 0h-245v16q45 2 61 14t16 39q0 8 -2 26l-20 131h-220l-59 -111q-22 -41 -22 -66q0 -30 62 -33v-16h-186v16q34 7 55.5 32t78.5 124l285 496h26l92 -553q10 -62 24 -79t54 -20v-16z M369 262l-45 263l-149 -263h194z" />
+<glyph unicode="&#xc2;" horiz-adv-x="611" d="M548 742h-36l-82 104l-137 -104h-39l157 169h49zM564 0h-245v16q45 2 61 14t16 39q0 8 -2 26l-20 131h-220l-59 -111q-22 -41 -22 -66q0 -30 62 -33v-16h-186v16q34 7 55.5 32t78.5 124l285 496h26l92 -553q10 -62 24 -79t54 -20v-16zM369 262l-45 263l-149 -263h194z " />
+<glyph unicode="&#xc3;" horiz-adv-x="611" d="M544 874h28q-22 -104 -95 -104q-18 0 -57 15q-71 29 -95 29q-36 0 -51 -47h-29q15 58 38 82t62 24q32 0 86 -24q41 -19 62 -19q20 0 31.5 9.5t19.5 34.5zM564 0h-245v16q45 2 61 14t16 39q0 8 -2 26l-20 131h-220l-59 -111q-22 -41 -22 -66q0 -30 62 -33v-16h-186v16 q34 7 55.5 32t78.5 124l285 496h26l92 -553q10 -62 24 -79t54 -20v-16zM369 262l-45 263l-149 -263h194z" />
+<glyph unicode="&#xc4;" horiz-adv-x="611" d="M354 807q0 -20 -14.5 -34.5t-34.5 -14.5q-21 0 -35 14.5t-14 35.5q0 20 14.5 34t35.5 14q19 0 33.5 -15t14.5 -34zM554 807q0 -20 -14.5 -34.5t-34.5 -14.5q-21 0 -35 14.5t-14 35.5q0 20 14.5 34t35.5 14q19 0 33.5 -15t14.5 -34zM564 0h-245v16q45 2 61 14t16 39 q0 8 -2 26l-20 131h-220l-59 -111q-22 -41 -22 -66q0 -30 62 -33v-16h-186v16q34 7 55.5 32t78.5 124l285 496h26l92 -553q10 -62 24 -79t54 -20v-16zM369 262l-45 263l-149 -263h194z" />
+<glyph unicode="&#xc5;" horiz-adv-x="611" d="M505 857q0 -41 -29.5 -70t-70.5 -29q-43 0 -71.5 29t-28.5 71q0 40 29.5 69.5t69.5 29.5q42 0 71.5 -29.5t29.5 -70.5zM471 857q0 28 -19.5 47t-47.5 19q-26 0 -45.5 -19.5t-19.5 -45.5q0 -28 18.5 -47t46.5 -19q29 0 48 18.5t19 46.5zM564 0h-245v16q45 2 61 14t16 39 q0 8 -2 26l-20 131h-220l-59 -111q-22 -41 -22 -66q0 -30 62 -33v-16h-186v16q34 7 55.5 32t78.5 124l285 496h26l92 -553q10 -62 24 -79t54 -20v-16zM369 262l-45 263l-149 -263h194z" />
+<glyph unicode="&#xc6;" horiz-adv-x="889" d="M911 653l-33 -153l-17 2q1 13 1 36q0 53 -34.5 67.5t-157.5 14.5q-35 0 -46 -6.5t-18 -30.5l-61 -222q54 0 80 2t49.5 6t36 16.5t22 27t23.5 45.5l18 -4l-69 -232l-17 4q6 36 6 52q0 31 -22.5 40.5t-95.5 9.5h-40q-71 -253 -71 -266q0 -29 51 -29h30q112 0 167.5 27 t112.5 109l18 -5l-64 -164h-498v16q44 4 58.5 13.5t21.5 34.5l49 170h-190q-20 -25 -25 -30q-100 -120 -100 -157q0 -15 12 -20.5t52 -10.5v-16h-187v16q19 4 33.5 17.5t50.5 58.5l369 465q23 29 27.5 36.5t4.5 16.5q0 23 -38 26l-26 2v15h517zM517 613l-268 -342h173z" />
+<glyph unicode="&#xc7;" horiz-adv-x="667" d="M689 664l-37 -200l-18 3q-12 163 -153 163q-49 0 -100.5 -26.5t-94.5 -71.5q-108 -114 -108 -300q0 -205 175 -205q62 0 112.5 26t117.5 92l17 -14q-67 -79 -131.5 -114t-141.5 -35q-26 0 -50 4l-35 -52q15 3 25 3q38 0 60 -18.5t22 -49.5q0 -38 -33.5 -62t-85.5 -24 q-38 0 -93 21l17 29q41 -15 68 -15q53 0 53 41q0 19 -13 31.5t-33 12.5q-12 0 -32 -7l-9 8l56 90q-81 18 -129.5 86.5t-48.5 162.5q0 109 56.5 207t150.5 157t199 59q49 0 117 -17q29 -7 41 -7q27 0 38 22h21z" />
+<glyph unicode="&#xc8;" horiz-adv-x="611" d="M526 742h-32l-140 106q-19 15 -19 32q0 16 10 25t26 9q22 0 40 -23zM634 653l-31 -154l-22 2q3 25 3 46q0 45 -37 59t-155 14q-42 0 -55 -4.5t-18 -21.5l-66 -233h78q66 0 88 16t51 81l18 -4l-68 -232l-20 5q7 31 7 52q0 24 -7 31q-16 15 -78 15h-78l-32 -112 q-36 -127 -36 -146q0 -34 79 -34q129 0 203 39q38 20 94 98l16 -8l-62 -162h-507v16q43 8 56 19.5t25 54.5l123 442q11 37 11 64q0 20 -15.5 28.5t-61.5 12.5v16h497z" />
+<glyph unicode="&#xc9;" horiz-adv-x="611" d="M322 744l162 160q10 10 25 10t25.5 -10.5t10.5 -25.5q0 -18 -17 -28l-171 -106h-35zM634 653l-31 -154l-22 2q3 25 3 46q0 45 -37 59t-155 14q-42 0 -55 -4.5t-18 -21.5l-66 -233h78q66 0 88 16t51 81l18 -4l-68 -232l-20 5q7 31 7 52q0 24 -7 31q-16 15 -78 15h-78 l-32 -112q-36 -127 -36 -146q0 -34 79 -34q129 0 203 39q38 20 94 98l16 -8l-62 -162h-507v16q43 8 56 19.5t25 54.5l123 442q11 37 11 64q0 20 -15.5 28.5t-61.5 12.5v16h497z" />
+<glyph unicode="&#xca;" horiz-adv-x="611" d="M577 742h-36l-82 104l-137 -104h-39l157 169h49zM634 653l-31 -154l-22 2q3 25 3 46q0 45 -37 59t-155 14q-42 0 -55 -4.5t-18 -21.5l-66 -233h78q66 0 88 16t51 81l18 -4l-68 -232l-20 5q7 31 7 52q0 24 -7 31q-16 15 -78 15h-78l-32 -112q-36 -127 -36 -146 q0 -34 79 -34q129 0 203 39q38 20 94 98l16 -8l-62 -162h-507v16q43 8 56 19.5t25 54.5l123 442q11 37 11 64q0 20 -15.5 28.5t-61.5 12.5v16h497z" />
+<glyph unicode="&#xcb;" horiz-adv-x="611" d="M385 807q0 -20 -14.5 -34.5t-34.5 -14.5q-21 0 -35 14.5t-14 35.5q0 20 14.5 34t35.5 14q19 0 33.5 -15t14.5 -34zM585 807q0 -20 -14.5 -34.5t-34.5 -14.5q-21 0 -35 14.5t-14 35.5q0 20 14.5 34t35.5 14q19 0 33.5 -15t14.5 -34zM634 653l-31 -154l-22 2q3 25 3 46 q0 45 -37 59t-155 14q-42 0 -55 -4.5t-18 -21.5l-66 -233h78q66 0 88 16t51 81l18 -4l-68 -232l-20 5q7 31 7 52q0 24 -7 31q-16 15 -78 15h-78l-32 -112q-36 -127 -36 -146q0 -34 79 -34q129 0 203 39q38 20 94 98l16 -8l-62 -162h-507v16q43 8 56 19.5t25 54.5l123 442 q11 37 11 64q0 20 -15.5 28.5t-61.5 12.5v16h497z" />
+<glyph unicode="&#xcc;" horiz-adv-x="333" d="M398 742h-32l-140 106q-19 15 -19 32q0 16 10 25t26 9q22 0 40 -23zM384 653v-16q-42 -5 -55.5 -18t-26.5 -59l-120 -429q-15 -53 -15 -76q0 -20 12.5 -27t56.5 -12v-16h-244v16q42 8 57.5 21t26.5 54l120 441q13 46 13 62q0 20 -16 30.5t-56 12.5v16h247z" />
+<glyph unicode="&#xcd;" horiz-adv-x="333" d="M191 744l162 160q10 10 25 10t25.5 -10.5t10.5 -25.5q0 -18 -17 -28l-171 -106h-35zM384 653v-16q-42 -5 -55.5 -18t-26.5 -59l-120 -429q-15 -53 -15 -76q0 -20 12.5 -27t56.5 -12v-16h-244v16q42 8 57.5 21t26.5 54l120 441q13 46 13 62q0 20 -16 30.5t-56 12.5v16h247 z" />
+<glyph unicode="&#xce;" horiz-adv-x="333" d="M450 742h-36l-82 104l-137 -104h-39l157 169h49zM384 653v-16q-42 -5 -55.5 -18t-26.5 -59l-120 -429q-15 -53 -15 -76q0 -20 12.5 -27t56.5 -12v-16h-244v16q42 8 57.5 21t26.5 54l120 441q13 46 13 62q0 20 -16 30.5t-56 12.5v16h247z" />
+<glyph unicode="&#xcf;" horiz-adv-x="333" d="M257 807q0 -20 -14.5 -34.5t-34.5 -14.5q-21 0 -35 14.5t-14 35.5q0 20 14.5 34t35.5 14q19 0 33.5 -15t14.5 -34zM457 807q0 -20 -14.5 -34.5t-34.5 -14.5q-21 0 -35 14.5t-14 35.5q0 20 14.5 34t35.5 14q19 0 33.5 -15t14.5 -34zM384 653v-16q-42 -5 -55.5 -18 t-26.5 -59l-120 -429q-15 -53 -15 -76q0 -20 12.5 -27t56.5 -12v-16h-244v16q42 8 57.5 21t26.5 54l120 441q13 46 13 62q0 20 -16 30.5t-56 12.5v16h247z" />
+<glyph unicode="&#xd0;" horiz-adv-x="722" d="M130 653h276q139 0 216.5 -68.5t77.5 -200.5q0 -87 -43 -166t-117 -135q-110 -83 -303 -83h-245v16q43 8 56 19.5t25 54.5l65 236h-90l12 42h90l46 164q11 39 11 64q0 20 -15 28.5t-62 12.5v16zM238 326l-46 -164q-22 -80 -22 -95q0 -37 69 -37q151 0 240 90 q51 51 80.5 127t29.5 157q0 108 -54 163.5t-160 55.5q-32 0 -44.5 -6t-17.5 -23l-63 -226h153l-12 -42h-153z" />
+<glyph unicode="&#xd1;" horiz-adv-x="667" d="M609 874h28q-22 -104 -95 -104q-18 0 -57 15q-71 29 -95 29q-36 0 -51 -47h-29q15 58 38 82t62 24q32 0 86 -24q41 -19 62 -19q20 0 31.5 9.5t19.5 34.5zM727 653v-16q-27 -6 -37.5 -9.5t-23 -21t-18.5 -38.5l-23 -76l-146 -507h-18l-230 550l-114 -422q-9 -31 -9 -54 q0 -21 15.5 -30.5t54.5 -12.5v-16h-198v16q43 6 61 31.5t45 120.5l117 415q-23 54 -86 54v16h160l207 -499l106 388q8 28 8 44q0 27 -13.5 37t-55.5 14v16h198z" />
+<glyph unicode="&#xd2;" horiz-adv-x="722" d="M587 742h-32l-140 106q-19 15 -19 32q0 16 10 25t26 9q22 0 40 -23zM699 418q0 -107 -57.5 -205t-149.5 -160q-105 -71 -214 -71q-99 0 -158.5 62t-59.5 172q0 91 49 187.5t128 165.5q112 97 237 97q107 1 166 -66t59 -182zM594 481q0 71 -34.5 111.5t-94.5 40.5 q-99 0 -186 -117q-53 -72 -83.5 -163t-30.5 -169q0 -82 33.5 -125.5t96.5 -43.5q92 0 170 95q59 74 94 181t35 190z" />
+<glyph unicode="&#xd3;" horiz-adv-x="722" d="M383 744l162 160q10 10 25 10t25.5 -10.5t10.5 -25.5q0 -18 -17 -28l-171 -106h-35zM699 418q0 -107 -57.5 -205t-149.5 -160q-105 -71 -214 -71q-99 0 -158.5 62t-59.5 172q0 91 49 187.5t128 165.5q112 97 237 97q107 1 166 -66t59 -182zM594 481q0 71 -34.5 111.5 t-94.5 40.5q-99 0 -186 -117q-53 -72 -83.5 -163t-30.5 -169q0 -82 33.5 -125.5t96.5 -43.5q92 0 170 95q59 74 94 181t35 190z" />
+<glyph unicode="&#xd4;" horiz-adv-x="722" d="M638 742h-36l-82 104l-137 -104h-39l157 169h49zM699 418q0 -107 -57.5 -205t-149.5 -160q-105 -71 -214 -71q-99 0 -158.5 62t-59.5 172q0 91 49 187.5t128 165.5q112 97 237 97q107 1 166 -66t59 -182zM594 481q0 71 -34.5 111.5t-94.5 40.5q-99 0 -186 -117 q-53 -72 -83.5 -163t-30.5 -169q0 -82 33.5 -125.5t96.5 -43.5q92 0 170 95q59 74 94 181t35 190z" />
+<glyph unicode="&#xd5;" horiz-adv-x="722" d="M634 874h28q-22 -104 -95 -104q-18 0 -57 15q-71 29 -95 29q-36 0 -51 -47h-29q15 58 38 82t62 24q32 0 86 -24q41 -19 62 -19q20 0 31.5 9.5t19.5 34.5zM699 418q0 -107 -57.5 -205t-149.5 -160q-105 -71 -214 -71q-99 0 -158.5 62t-59.5 172q0 91 49 187.5t128 165.5 q112 97 237 97q107 1 166 -66t59 -182zM594 481q0 71 -34.5 111.5t-94.5 40.5q-99 0 -186 -117q-53 -72 -83.5 -163t-30.5 -169q0 -82 33.5 -125.5t96.5 -43.5q92 0 170 95q59 74 94 181t35 190z" />
+<glyph unicode="&#xd6;" horiz-adv-x="722" d="M443 807q0 -20 -14.5 -34.5t-34.5 -14.5q-21 0 -35 14.5t-14 35.5q0 20 14.5 34t35.5 14q19 0 33.5 -15t14.5 -34zM643 807q0 -20 -14.5 -34.5t-34.5 -14.5q-21 0 -35 14.5t-14 35.5q0 20 14.5 34t35.5 14q19 0 33.5 -15t14.5 -34zM699 418q0 -107 -57.5 -205 t-149.5 -160q-105 -71 -214 -71q-99 0 -158.5 62t-59.5 172q0 91 49 187.5t128 165.5q112 97 237 97q107 1 166 -66t59 -182zM594 481q0 71 -34.5 111.5t-94.5 40.5q-99 0 -186 -117q-53 -72 -83.5 -163t-30.5 -169q0 -82 33.5 -125.5t96.5 -43.5q92 0 170 95q59 74 94 181 t35 190z" />
+<glyph unicode="&#xd7;" horiz-adv-x="675" d="M582 56l-48 -48l-197 197l-196 -197l-48 48l196 197l-196 196l48 48l196 -197l197 197l48 -48l-197 -196z" />
+<glyph unicode="&#xd8;" horiz-adv-x="722" d="M669 722l-64 -96q43 -34 63 -69q31 -56 31 -126q0 -83 -36 -165.5t-94 -144.5t-134.5 -100.5t-153.5 -38.5q-41 0 -94 21l-74 -108h-44l86 127q-95 69 -95 200q0 91 46 182t128 161q120 101 234 101q53 0 105 -22l52 78h44zM190 74l356 533q-34 26 -82 26 q-110 0 -193 -125q-46 -68 -76 -162t-30 -170q0 -55 25 -102zM570 574l-355 -530q32 -29 80 -29q109 0 192 123q46 69 76.5 165t30.5 172q0 58 -24 99z" />
+<glyph unicode="&#xd9;" horiz-adv-x="722" d="M588 742h-32l-140 106q-19 15 -19 32q0 16 10 25t26 9q22 0 40 -23zM765 653v-16q-21 -5 -31.5 -9.5t-20.5 -11t-17.5 -24.5t-14.5 -39t-20 -65l-83 -285q-34 -116 -97 -169q-60 -52 -158 -52t-159.5 46t-61.5 118q0 55 44 216l52 189q9 32 9 45q0 20 -17.5 30t-62.5 11 v16h272v-16q-51 -5 -70.5 -22t-33.5 -69l-63 -226q-40 -141 -40 -179q0 -53 39.5 -85.5t98.5 -32.5q84 0 135 54t85 178l64 233q23 85 23 103q0 22 -15 32t-55 14v16h198z" />
+<glyph unicode="&#xda;" horiz-adv-x="722" d="M383 744l162 160q10 10 25 10t25.5 -10.5t10.5 -25.5q0 -18 -17 -28l-171 -106h-35zM765 653v-16q-21 -5 -31.5 -9.5t-20.5 -11t-17.5 -24.5t-14.5 -39t-20 -65l-83 -285q-34 -116 -97 -169q-60 -52 -158 -52t-159.5 46t-61.5 118q0 55 44 216l52 189q9 32 9 45 q0 20 -17.5 30t-62.5 11v16h272v-16q-51 -5 -70.5 -22t-33.5 -69l-63 -226q-40 -141 -40 -179q0 -53 39.5 -85.5t98.5 -32.5q84 0 135 54t85 178l64 233q23 85 23 103q0 22 -15 32t-55 14v16h198z" />
+<glyph unicode="&#xdb;" horiz-adv-x="722" d="M635 742h-36l-82 104l-137 -104h-39l157 169h49zM765 653v-16q-21 -5 -31.5 -9.5t-20.5 -11t-17.5 -24.5t-14.5 -39t-20 -65l-83 -285q-34 -116 -97 -169q-60 -52 -158 -52t-159.5 46t-61.5 118q0 55 44 216l52 189q9 32 9 45q0 20 -17.5 30t-62.5 11v16h272v-16 q-51 -5 -70.5 -22t-33.5 -69l-63 -226q-40 -141 -40 -179q0 -53 39.5 -85.5t98.5 -32.5q84 0 135 54t85 178l64 233q23 85 23 103q0 22 -15 32t-55 14v16h198z" />
+<glyph unicode="&#xdc;" horiz-adv-x="722" d="M445 807q0 -20 -14.5 -34.5t-34.5 -14.5q-21 0 -35 14.5t-14 35.5q0 20 14.5 34t35.5 14q19 0 33.5 -15t14.5 -34zM645 807q0 -20 -14.5 -34.5t-34.5 -14.5q-21 0 -35 14.5t-14 35.5q0 20 14.5 34t35.5 14q19 0 33.5 -15t14.5 -34zM765 653v-16q-21 -5 -31.5 -9.5 t-20.5 -11t-17.5 -24.5t-14.5 -39t-20 -65l-83 -285q-34 -116 -97 -169q-60 -52 -158 -52t-159.5 46t-61.5 118q0 55 44 216l52 189q9 32 9 45q0 20 -17.5 30t-62.5 11v16h272v-16q-51 -5 -70.5 -22t-33.5 -69l-63 -226q-40 -141 -40 -179q0 -53 39.5 -85.5t98.5 -32.5 q84 0 135 54t85 178l64 233q23 85 23 103q0 22 -15 32t-55 14v16h198z" />
+<glyph unicode="&#xdd;" horiz-adv-x="556" d="M301 744l162 160q10 10 25 10t25.5 -10.5t10.5 -25.5q0 -18 -17 -28l-171 -106h-35zM633 653v-16q-21 -7 -32 -17.5t-38 -43.5l-219 -270l-36 -123q-30 -103 -30 -127q0 -19 11.5 -27t41.5 -10l36 -3v-16h-289v16q51 3 72.5 18.5t34.5 62.5l59 205l-76 267 q-11 40 -23.5 51t-53.5 17v16h239v-16q-44 -4 -58 -11.5t-14 -24.5t36 -144l31 -110l39 46q149 176 149 213q0 24 -40 28l-29 3v16h189z" />
+<glyph unicode="&#xde;" horiz-adv-x="611" d="M302 518h56q211 0 211 -144q0 -46 -22 -88.5t-60 -69.5q-64 -46 -192 -46q-58 0 -89 10l-17 -60q-12 -42 -12 -57q0 -26 9.5 -33t56.5 -14v-16h-243v16q43 6 56 17.5t26 56.5l118 425q17 63 17 80q0 21 -12.5 29t-54.5 13v16h235v-16q-31 -4 -43.5 -12.5t-19.5 -33.5z M286 459l-71 -248q30 -5 52 -5q97 0 148 39t51 129q0 114 -134 114q-38 0 -46 -29z" />
+<glyph unicode="&#xdf;" d="M23 -4l72 319q44 192 104.5 278t154.5 86q62 0 100.5 -36t38.5 -95q0 -55 -36 -92.5t-119 -68.5l-8 -3v-3q43 -5 67 -22q26 -18 41.5 -49.5t15.5 -65.5q0 -52 -23 -106t-61 -94q-54 -57 -129 -57q-36 0 -58 18.5t-22 47.5q0 22 12 34.5t32 12.5q17 0 27.5 -11t10.5 -29 q0 -14 -8 -27q-4 -8 -4 -11q0 -13 18 -13q40 0 71 54q47 86 47 199q0 104 -81 107q-26 1 -26 15q0 13 17 13q60 0 98 50.5t38 129.5t-62 79q-87 0 -145 -218l-111 -426q-27 -103 -76 -161t-109 -58q-35 0 -56.5 17t-21.5 45q0 19 10.5 30.5t28.5 11.5q17 0 28.5 -10 t11.5 -26q0 -12 -8 -26q-4 -5 -4 -10q0 -8 17 -8q38 0 61.5 39t45.5 140z" />
+<glyph unicode="&#xe0;" horiz-adv-x="501" d="M463 111l13 -11q-56 -68 -82.5 -89t-56.5 -21q-40 0 -40 41q0 25 23 115q-56 -84 -103 -120.5t-100 -36.5q-44 0 -72 30.5t-28 85.5q0 76 43.5 155t110.5 130t132 51q67 0 80 -58l11 48l3 3l61 7l7 -3q-1 -4 -6 -21q-89 -324 -89 -363q0 -13 14 -13q15 0 52 41zM365 361 q0 26 -15 42t-41 16q-68 0 -131 -92q-33 -49 -55 -109t-22 -106q0 -74 60 -74q59 0 127 98q77 111 77 225zM446 492h-32l-140 106q-19 15 -19 32q0 16 10 25t26 9q22 0 40 -23z" />
+<glyph unicode="&#xe1;" horiz-adv-x="501" d="M243 494l162 160q10 10 25 10t25.5 -10.5t10.5 -25.5q0 -18 -17 -28l-171 -106h-35zM463 111l13 -11q-56 -68 -82.5 -89t-56.5 -21q-40 0 -40 41q0 25 23 115q-56 -84 -103 -120.5t-100 -36.5q-44 0 -72 30.5t-28 85.5q0 76 43.5 155t110.5 130t132 51q67 0 80 -58l11 48 l3 3l61 7l7 -3q-1 -4 -6 -21q-89 -324 -89 -363q0 -13 14 -13q15 0 52 41zM365 361q0 26 -15 42t-41 16q-68 0 -131 -92q-33 -49 -55 -109t-22 -106q0 -74 60 -74q59 0 127 98q77 111 77 225z" />
+<glyph unicode="&#xe2;" horiz-adv-x="501" d="M497 492h-36l-82 104l-137 -104h-39l157 169h49zM463 111l13 -11q-56 -68 -82.5 -89t-56.5 -21q-40 0 -40 41q0 25 23 115q-56 -84 -103 -120.5t-100 -36.5q-44 0 -72 30.5t-28 85.5q0 76 43.5 155t110.5 130t132 51q67 0 80 -58l11 48l3 3l61 7l7 -3q-1 -4 -6 -21 q-89 -324 -89 -363q0 -13 14 -13q15 0 52 41zM365 361q0 26 -15 42t-41 16q-68 0 -131 -92q-33 -49 -55 -109t-22 -106q0 -74 60 -74q59 0 127 98q77 111 77 225z" />
+<glyph unicode="&#xe3;" horiz-adv-x="501" d="M493 624h28q-22 -104 -95 -104q-18 0 -57 15q-71 29 -95 29q-36 0 -51 -47h-29q15 58 38 82t62 24q32 0 86 -24q41 -19 62 -19q20 0 31.5 9.5t19.5 34.5zM463 111l13 -11q-56 -68 -82.5 -89t-56.5 -21q-40 0 -40 41q0 25 23 115q-56 -84 -103 -120.5t-100 -36.5 q-44 0 -72 30.5t-28 85.5q0 76 43.5 155t110.5 130t132 51q67 0 80 -58l11 48l3 3l61 7l7 -3q-1 -4 -6 -21q-89 -324 -89 -363q0 -13 14 -13q15 0 52 41zM365 361q0 26 -15 42t-41 16q-68 0 -131 -92q-33 -49 -55 -109t-22 -106q0 -74 60 -74q59 0 127 98q77 111 77 225z " />
+<glyph unicode="&#xe4;" horiz-adv-x="501" d="M303 557q0 -20 -14.5 -34.5t-34.5 -14.5q-21 0 -35 14.5t-14 35.5q0 20 14.5 34t35.5 14q19 0 33.5 -15t14.5 -34zM503 557q0 -20 -14.5 -34.5t-34.5 -14.5q-21 0 -35 14.5t-14 35.5q0 20 14.5 34t35.5 14q19 0 33.5 -15t14.5 -34zM463 111l13 -11q-56 -68 -82.5 -89 t-56.5 -21q-40 0 -40 41q0 25 23 115q-56 -84 -103 -120.5t-100 -36.5q-44 0 -72 30.5t-28 85.5q0 76 43.5 155t110.5 130t132 51q67 0 80 -58l11 48l3 3l61 7l7 -3q-1 -4 -6 -21q-89 -324 -89 -363q0 -13 14 -13q15 0 52 41zM365 361q0 26 -15 42t-41 16q-68 0 -131 -92 q-33 -49 -55 -109t-22 -106q0 -74 60 -74q59 0 127 98q77 111 77 225z" />
+<glyph unicode="&#xe5;" horiz-adv-x="501" d="M453 609q0 -41 -29.5 -70t-70.5 -29q-43 0 -71.5 29t-28.5 71q0 40 29.5 69.5t69.5 29.5q42 0 71.5 -29.5t29.5 -70.5zM419 609q0 28 -19.5 47t-47.5 19q-26 0 -45.5 -19.5t-19.5 -45.5q0 -28 18.5 -47t46.5 -19q29 0 48 18.5t19 46.5zM463 111l13 -11q-56 -68 -82.5 -89 t-56.5 -21q-40 0 -40 41q0 25 23 115q-56 -84 -103 -120.5t-100 -36.5q-44 0 -72 30.5t-28 85.5q0 76 43.5 155t110.5 130t132 51q67 0 80 -58l11 48l3 3l61 7l7 -3q-1 -4 -6 -21q-89 -324 -89 -363q0 -13 14 -13q15 0 52 41zM365 361q0 26 -15 42t-41 16q-68 0 -131 -92 q-33 -49 -55 -109t-22 -106q0 -74 60 -74q59 0 127 98q77 111 77 225z" />
+<glyph unicode="&#xe6;" horiz-adv-x="667" d="M459 439l-22 -62q59 64 122 64q37 0 59 -19t22 -51q0 -58 -66 -101q-52 -33 -190 -72q-8 -34 -8 -60q0 -55 16.5 -78.5t53.5 -23.5q60 0 142 77l10 -12q-42 -51 -96.5 -81.5t-101.5 -30.5t-75.5 33t-28.5 89q0 20 6 40q-59 -92 -102.5 -127t-92.5 -35q-38 0 -61 25.5 t-23 72.5q0 79 44.5 163t110.5 137.5t125 53.5q54 0 66 -47l19 45h71zM574 380q0 36 -35 36q-33 0 -65 -35q-28 -30 -45 -62t-39 -96q68 20 104.5 42t61.5 55q18 24 18 60zM350 370q0 23 -12.5 37t-32.5 14q-53 1 -113 -86q-37 -54 -60 -118t-23 -118q0 -60 34 -60 q42 0 80 41q54 58 90.5 141.5t36.5 148.5z" />
+<glyph unicode="&#xe7;" horiz-adv-x="444" d="M77 -96l56 90q-103 25 -103 145q0 117 89 209.5t201 92.5q46 0 75.5 -23t29.5 -58q0 -20 -13.5 -33t-34.5 -13q-39 0 -39 38q0 12 9 29q6 11 6 19q0 20 -37 20q-63 0 -109 -48q-42 -43 -66.5 -106t-24.5 -127q0 -54 24 -84t67 -30q37 0 69.5 18.5t73.5 62.5l16 -10 q-46 -58 -89.5 -82.5t-100.5 -24.5h-8l-37 -55q15 3 25 3q38 0 60 -18.5t22 -49.5q0 -38 -33.5 -62t-85.5 -24q-38 0 -93 21l17 29q41 -15 68 -15q53 0 53 41q0 19 -13 31.5t-33 12.5q-12 0 -32 -7z" />
+<glyph unicode="&#xe8;" horiz-adv-x="444" d="M358 109l12 -12q-88 -108 -204 -108q-61 0 -98 37.5t-37 99.5q0 117 93.5 216t205.5 99q39 0 60.5 -18t21.5 -50q0 -66 -76.5 -118t-207.5 -69q-10 -20 -10 -61t25.5 -66t67.5 -25q33 0 63 15.5t84 59.5zM152 252l-17 -44q112 27 161 74q50 48 50 97q0 39 -35 39 q-42 0 -87.5 -48.5t-71.5 -117.5zM414 492h-32l-140 106q-19 15 -19 32q0 16 10 25t26 9q22 0 40 -23z" />
+<glyph unicode="&#xe9;" horiz-adv-x="444" d="M208 494l162 160q10 10 25 10t25.5 -10.5t10.5 -25.5q0 -18 -17 -28l-171 -106h-35zM358 109l12 -12q-88 -108 -204 -108q-61 0 -98 37.5t-37 99.5q0 117 93.5 216t205.5 99q39 0 60.5 -18t21.5 -50q0 -66 -76.5 -118t-207.5 -69q-10 -20 -10 -61t25.5 -66t67.5 -25 q33 0 63 15.5t84 59.5zM152 252l-17 -44q112 27 161 74q50 48 50 97q0 39 -35 39q-42 0 -87.5 -48.5t-71.5 -117.5z" />
+<glyph unicode="&#xea;" horiz-adv-x="444" d="M466 492h-36l-82 104l-137 -104h-39l157 169h49zM358 109l12 -12q-88 -108 -204 -108q-61 0 -98 37.5t-37 99.5q0 117 93.5 216t205.5 99q39 0 60.5 -18t21.5 -50q0 -66 -76.5 -118t-207.5 -69q-10 -20 -10 -61t25.5 -66t67.5 -25q33 0 63 15.5t84 59.5zM152 252l-17 -44 q112 27 161 74q50 48 50 97q0 39 -35 39q-42 0 -87.5 -48.5t-71.5 -117.5z" />
+<glyph unicode="&#xeb;" horiz-adv-x="444" d="M275 557q0 -20 -14.5 -34.5t-34.5 -14.5q-21 0 -35 14.5t-14 35.5q0 20 14.5 34t35.5 14q19 0 33.5 -15t14.5 -34zM475 557q0 -20 -14.5 -34.5t-34.5 -14.5q-21 0 -35 14.5t-14 35.5q0 20 14.5 34t35.5 14q19 0 33.5 -15t14.5 -34zM358 109l12 -12q-88 -108 -204 -108 q-61 0 -98 37.5t-37 99.5q0 117 93.5 216t205.5 99q39 0 60.5 -18t21.5 -50q0 -66 -76.5 -118t-207.5 -69q-10 -20 -10 -61t25.5 -66t67.5 -25q33 0 63 15.5t84 59.5zM152 252l-17 -44q112 27 161 74q50 48 50 97q0 39 -35 39q-42 0 -87.5 -48.5t-71.5 -117.5z" />
+<glyph unicode="&#xec;" horiz-adv-x="278" d="M302 492h-32l-140 106q-19 15 -19 32q0 16 10 25t26 9q22 0 40 -23zM221 115l14 -12q-41 -63 -71 -88.5t-67 -25.5q-50 0 -50 57q0 20 24 110l48 175q9 34 9 45q0 15 -11 19t-52 5v16q44 3 159 25l5 -3l-96 -342q-9 -34 -9 -45q0 -6 5 -10.5t11 -4.5q12 0 30 17.5 t51 61.5z" />
+<glyph unicode="&#xed;" horiz-adv-x="278" d="M95 494l162 160q10 10 25 10t25.5 -10.5t10.5 -25.5q0 -18 -17 -28l-171 -106h-35zM221 115l14 -12q-41 -63 -71 -88.5t-67 -25.5q-50 0 -50 57q0 20 24 110l48 175q9 34 9 45q0 15 -11 19t-52 5v16q44 3 159 25l5 -3l-96 -342q-9 -34 -9 -45q0 -6 5 -10.5t11 -4.5 q12 0 30 17.5t51 61.5z" />
+<glyph unicode="&#xee;" horiz-adv-x="278" d="M351 492h-36l-82 104l-137 -104h-39l157 169h49zM221 115l14 -12q-41 -63 -71 -88.5t-67 -25.5q-50 0 -50 57q0 20 24 110l48 175q9 34 9 45q0 15 -11 19t-52 5v16q44 3 159 25l5 -3l-96 -342q-9 -34 -9 -45q0 -6 5 -10.5t11 -4.5q12 0 30 17.5t51 61.5z" />
+<glyph unicode="&#xef;" horiz-adv-x="278" d="M361 557q0 -20 -14.5 -34.5t-34.5 -14.5q-21 0 -35 14.5t-14 35.5q0 20 14.5 34t35.5 14q19 0 33.5 -15t14.5 -34zM161 557q0 -20 -14.5 -34.5t-34.5 -14.5q-21 0 -35 14.5t-14 35.5q0 20 14.5 34t35.5 14q19 0 33.5 -15t14.5 -34zM221 115l14 -12q-41 -63 -71 -88.5 t-67 -25.5q-50 0 -50 57q0 20 24 110l48 175q9 34 9 45q0 15 -11 19t-52 5v16q44 3 159 25l5 -3l-96 -342q-9 -34 -9 -45q0 -6 5 -10.5t11 -4.5q12 0 30 17.5t51 61.5z" />
+<glyph unicode="&#xf0;" d="M482 637l-101 -45q86 -98 86 -233q0 -97 -38 -182t-106 -136.5t-149 -51.5q-70 0 -108.5 35.5t-38.5 104.5q0 115 86.5 213.5t193.5 98.5q59 0 87 -49l2 1q-14 99 -72 174l-117 -51l-33 29l123 54q-47 44 -103 67l35 17q66 -15 122 -61l99 43zM384 326q0 43 -19.5 68.5 t-51.5 25.5q-69 0 -132 -89q-70 -97 -70 -224q0 -42 21.5 -69.5t56.5 -27.5q70 0 124 82q32 47 51.5 113t19.5 121z" />
+<glyph unicode="&#xf1;" d="M460 624h28q-22 -104 -95 -104q-18 0 -57 15q-71 29 -95 29q-36 0 -51 -47h-29q15 58 38 82t62 24q32 0 86 -24q41 -19 62 -19q20 0 31.5 9.5t19.5 34.5zM460 117l14 -13q-51 -70 -78 -91.5t-62 -21.5q-20 0 -33.5 13.5t-13.5 40.5q0 16 16 75l44 162q14 54 14 79 q0 29 -24 29q-29 0 -63.5 -34.5t-84.5 -107.5q-33 -49 -48.5 -88t-51.5 -160h-75l96 350q2 10 2 17q0 15 -13.5 20.5t-51.5 6.5v16q39 8 87 16.5t75 14.5l4 -2l-67 -218q74 118 128 169t103 51q31 0 48 -16.5t17 -44.5q0 -25 -10 -60l-56 -203q-14 -50 -14 -61q0 -18 16 -18 q19 0 61 53q7 8 21 26z" />
+<glyph unicode="&#xf2;" d="M468 301q0 -57 -28.5 -118.5t-77.5 -110.5q-83 -83 -188 -83q-70 0 -108.5 36.5t-38.5 102.5q0 83 50.5 162t129.5 121q56 30 120 30q62 0 101.5 -37.5t39.5 -102.5zM384 326q0 45 -19 69.5t-52 24.5q-67 0 -128 -91q-74 -113 -74 -228q0 -44 21 -67.5t57 -23.5 q61 0 121 83q34 46 54 110.5t20 122.5zM418 492h-32l-140 106q-19 15 -19 32q0 16 10 25t26 9q22 0 40 -23z" />
+<glyph unicode="&#xf3;" d="M215 494l162 160q10 10 25 10t25.5 -10.5t10.5 -25.5q0 -18 -17 -28l-171 -106h-35zM468 301q0 -57 -28.5 -118.5t-77.5 -110.5q-83 -83 -188 -83q-70 0 -108.5 36.5t-38.5 102.5q0 83 50.5 162t129.5 121q56 30 120 30q62 0 101.5 -37.5t39.5 -102.5zM384 326 q0 45 -19 69.5t-52 24.5q-67 0 -128 -91q-74 -113 -74 -228q0 -44 21 -67.5t57 -23.5q61 0 121 83q34 46 54 110.5t20 122.5z" />
+<glyph unicode="&#xf4;" d="M468 492h-36l-82 104l-137 -104h-39l157 169h49zM468 301q0 -57 -28.5 -118.5t-77.5 -110.5q-83 -83 -188 -83q-70 0 -108.5 36.5t-38.5 102.5q0 83 50.5 162t129.5 121q56 30 120 30q62 0 101.5 -37.5t39.5 -102.5zM384 326q0 45 -19 69.5t-52 24.5q-67 0 -128 -91 q-74 -113 -74 -228q0 -44 21 -67.5t57 -23.5q61 0 121 83q34 46 54 110.5t20 122.5z" />
+<glyph unicode="&#xf5;" d="M466 624h28q-22 -104 -95 -104q-18 0 -57 15q-71 29 -95 29q-36 0 -51 -47h-29q15 58 38 82t62 24q32 0 86 -24q41 -19 62 -19q20 0 31.5 9.5t19.5 34.5zM468 301q0 -57 -28.5 -118.5t-77.5 -110.5q-83 -83 -188 -83q-70 0 -108.5 36.5t-38.5 102.5q0 83 50.5 162 t129.5 121q56 30 120 30q62 0 101.5 -37.5t39.5 -102.5zM384 326q0 45 -19 69.5t-52 24.5q-67 0 -128 -91q-74 -113 -74 -228q0 -44 21 -67.5t57 -23.5q61 0 121 83q34 46 54 110.5t20 122.5z" />
+<glyph unicode="&#xf6;" d="M274 557q0 -20 -14.5 -34.5t-34.5 -14.5q-21 0 -35 14.5t-14 35.5q0 20 14.5 34t35.5 14q19 0 33.5 -15t14.5 -34zM474 557q0 -20 -14.5 -34.5t-34.5 -14.5q-21 0 -35 14.5t-14 35.5q0 20 14.5 34t35.5 14q19 0 33.5 -15t14.5 -34zM468 301q0 -57 -28.5 -118.5 t-77.5 -110.5q-83 -83 -188 -83q-70 0 -108.5 36.5t-38.5 102.5q0 83 50.5 162t129.5 121q56 30 120 30q62 0 101.5 -37.5t39.5 -102.5zM384 326q0 45 -19 69.5t-52 24.5q-67 0 -128 -91q-74 -113 -74 -228q0 -44 21 -67.5t57 -23.5q61 0 121 83q34 46 54 110.5t20 122.5z " />
+<glyph unicode="&#xf7;" horiz-adv-x="675" d="M590 220h-504v66h504v-66zM394 460q0 -22 -17 -38t-40 -16q-22 0 -38 16t-16 38q0 24 16 40.5t39 16.5t39.5 -17t16.5 -40zM394 43q0 -22 -17 -38t-41 -16q-21 0 -37 16t-16 38q0 24 16 40.5t39 16.5t39.5 -17t16.5 -40z" />
+<glyph unicode="&#xf8;" d="M428 554l-58 -119q31 -9 48.5 -22t30.5 -37q20 -35 20 -78q0 -60 -34 -125t-90 -113q-83 -71 -169 -71q-8 0 -20 2l-61 -126h-35l64 131q-39 13 -59 34q-37 39 -37 100q0 115 93 213t201 98q11 0 17 -1l55 114h34zM357 406l-190 -392q11 -4 22 -4q66 0 122 82 q32 49 53 114t21 119q0 50 -28 81zM140 29l188 389l-10 2q-52 0 -95 -46q-49 -53 -80 -129.5t-31 -147.5q0 -40 28 -68z" />
+<glyph unicode="&#xf9;" d="M461 119l14 -9q-48 -73 -75 -96t-63 -23q-48 0 -48 48q0 45 45 197q-89 -146 -137.5 -196.5t-101.5 -50.5t-53 53q0 18 27 128l35 139q14 58 14 67q0 12 -11 18t-50 6v14q69 8 150 27l4 -3l-89 -355q-3 -9 -3 -16q0 -25 20 -25q45 0 142 147q33 50 51.5 91.5t58.5 151.5 h74l-79 -299q-19 -72 -19 -78q0 -17 11 -17q12 0 29 16t54 65zM415 492h-32l-140 106q-19 15 -19 32q0 16 10 25t26 9q22 0 40 -23z" />
+<glyph unicode="&#xfa;" d="M210 494l162 160q10 10 25 10t25.5 -10.5t10.5 -25.5q0 -18 -17 -28l-171 -106h-35zM461 119l14 -9q-48 -73 -75 -96t-63 -23q-48 0 -48 48q0 45 45 197q-89 -146 -137.5 -196.5t-101.5 -50.5t-53 53q0 18 27 128l35 139q14 58 14 67q0 12 -11 18t-50 6v14q69 8 150 27 l4 -3l-89 -355q-3 -9 -3 -16q0 -25 20 -25q45 0 142 147q33 50 51.5 91.5t58.5 151.5h74l-79 -299q-19 -72 -19 -78q0 -17 11 -17q12 0 29 16t54 65z" />
+<glyph unicode="&#xfb;" d="M465 492h-36l-82 104l-137 -104h-39l157 169h49zM461 119l14 -9q-48 -73 -75 -96t-63 -23q-48 0 -48 48q0 45 45 197q-89 -146 -137.5 -196.5t-101.5 -50.5t-53 53q0 18 27 128l35 139q14 58 14 67q0 12 -11 18t-50 6v14q69 8 150 27l4 -3l-89 -355q-3 -9 -3 -16 q0 -25 20 -25q45 0 142 147q33 50 51.5 91.5t58.5 151.5h74l-79 -299q-19 -72 -19 -78q0 -17 11 -17q12 0 29 16t54 65z" />
+<glyph unicode="&#xfc;" d="M269 557q0 -20 -14.5 -34.5t-34.5 -14.5q-21 0 -35 14.5t-14 35.5q0 20 14.5 34t35.5 14q19 0 33.5 -15t14.5 -34zM469 557q0 -20 -14.5 -34.5t-34.5 -14.5q-21 0 -35 14.5t-14 35.5q0 20 14.5 34t35.5 14q19 0 33.5 -15t14.5 -34zM461 119l14 -9q-48 -73 -75 -96 t-63 -23q-48 0 -48 48q0 45 45 197q-89 -146 -137.5 -196.5t-101.5 -50.5t-53 53q0 18 27 128l35 139q14 58 14 67q0 12 -11 18t-50 6v14q69 8 150 27l4 -3l-89 -355q-3 -9 -3 -16q0 -25 20 -25q45 0 142 147q33 50 51.5 91.5t58.5 151.5h74l-79 -299q-19 -72 -19 -78 q0 -17 11 -17q12 0 29 16t54 65z" />
+<glyph unicode="&#xfd;" horiz-adv-x="444" d="M178 494l162 160q10 10 25 10t25.5 -10.5t10.5 -25.5q0 -18 -17 -28l-171 -106h-35zM243 186l21 -110q67 110 94.5 167.5t27.5 89.5q0 16 -26 32q-26 17 -26 39q0 16 11.5 26.5t28.5 10.5q22 0 37 -16t15 -39q0 -87 -131 -305q-78 -129 -151.5 -208t-116.5 -79 q-23 0 -37 12t-14 31q0 17 11.5 28.5t27.5 11.5q19 0 34 -14t27 -14q18 0 48 33q13 13 38.5 46.5t32.5 44.5q10 20 10 35q0 30 -31 155.5t-51 176.5q-14 37 -30.5 50.5t-46.5 13.5q-16 0 -31 -4v17q22 4 32 6q41 8 107 18h4q11 0 41.5 -93t43.5 -162z" />
+<glyph unicode="&#xfe;" d="M189 335l2 -2q68 108 162 108q55 0 85.5 -33.5t30.5 -92.5q0 -78 -44 -154t-114.5 -124t-141.5 -48q-33 0 -66 17q-37 -143 -37 -165q0 -17 14.5 -24t49.5 -7v-15h-205v16q32 1 45 13t22 46l114 434l68 250l5 19q9 35 9 43q0 17 -10.5 21.5t-54.5 5.5v17q77 9 152 23 l5 -5q-71 -275 -91 -343zM379 313q0 85 -62 85q-40 0 -77.5 -31.5t-57.5 -82.5q-22 -56 -43.5 -134.5t-21.5 -104.5q0 -16 13.5 -26.5t34.5 -10.5q82 0 145 95q31 46 50 103t19 107z" />
+<glyph unicode="&#xff;" horiz-adv-x="444" d="M242 557q0 -20 -14.5 -34.5t-34.5 -14.5q-21 0 -35 14.5t-14 35.5q0 20 14.5 34t35.5 14q19 0 33.5 -15t14.5 -34zM442 557q0 -20 -14.5 -34.5t-34.5 -14.5q-21 0 -35 14.5t-14 35.5q0 20 14.5 34t35.5 14q19 0 33.5 -15t14.5 -34zM243 186l21 -110q67 110 94.5 167.5 t27.5 89.5q0 16 -26 32q-26 17 -26 39q0 16 11.5 26.5t28.5 10.5q22 0 37 -16t15 -39q0 -87 -131 -305q-78 -129 -151.5 -208t-116.5 -79q-23 0 -37 12t-14 31q0 17 11.5 28.5t27.5 11.5q19 0 34 -14t27 -14q18 0 48 33q13 13 38.5 46.5t32.5 44.5q10 20 10 35 q0 30 -31 155.5t-51 176.5q-14 37 -30.5 50.5t-46.5 13.5q-16 0 -31 -4v17q22 4 32 6q41 8 107 18h4q11 0 41.5 -93t43.5 -162z" />
+<glyph unicode="&#x100;" horiz-adv-x="611" d="M536 757l-11 -51h-301l11 51h301zM564 0h-245v16q45 2 61 14t16 39q0 8 -2 26l-20 131h-220l-59 -111q-22 -41 -22 -66q0 -30 62 -33v-16h-186v16q34 7 55.5 32t78.5 124l285 496h26l92 -553q10 -62 24 -79t54 -20v-16zM369 262l-45 263l-149 -263h194z" />
+<glyph unicode="&#x101;" horiz-adv-x="501" d="M481 543l-11 -51h-301l11 51h301zM463 111l13 -11q-56 -68 -82.5 -89t-56.5 -21q-40 0 -40 41q0 25 23 115q-56 -84 -103 -120.5t-100 -36.5q-44 0 -72 30.5t-28 85.5q0 76 43.5 155t110.5 130t132 51q67 0 80 -58l11 48l3 3l61 7l7 -3q-1 -4 -6 -21q-89 -324 -89 -363 q0 -13 14 -13q15 0 52 41zM365 361q0 26 -15 42t-41 16q-68 0 -131 -92q-33 -49 -55 -109t-22 -106q0 -74 60 -74q59 0 127 98q77 111 77 225z" />
+<glyph unicode="&#x102;" horiz-adv-x="611" d="M502 862h29q-11 -67 -60 -112.5t-113 -45.5q-67 0 -97.5 39.5t-30.5 118.5h29q8 -99 107 -99q46 0 83 26.5t53 72.5zM564 0h-245v16q45 2 61 14t16 39q0 8 -2 26l-20 131h-220l-59 -111q-22 -41 -22 -66q0 -30 62 -33v-16h-186v16q34 7 55.5 32t78.5 124l285 496h26 l92 -553q10 -62 24 -79t54 -20v-16zM369 262l-45 263l-149 -263h194z" />
+<glyph unicode="&#x103;" horiz-adv-x="501" d="M452 650h29q-11 -67 -60 -112.5t-113 -45.5q-67 0 -97.5 39.5t-30.5 118.5h29q8 -99 107 -99q46 0 83 26.5t53 72.5zM463 111l13 -11q-56 -68 -82.5 -89t-56.5 -21q-40 0 -40 41q0 25 23 115q-56 -84 -103 -120.5t-100 -36.5q-44 0 -72 30.5t-28 85.5q0 76 43.5 155 t110.5 130t132 51q67 0 80 -58l11 48l3 3l61 7l7 -3q-1 -4 -6 -21q-89 -324 -89 -363q0 -13 14 -13q15 0 52 41zM365 361q0 26 -15 42t-41 16q-68 0 -131 -92q-33 -49 -55 -109t-22 -106q0 -74 60 -74q59 0 127 98q77 111 77 225z" />
+<glyph unicode="&#x104;" horiz-adv-x="611" d="M433 0h-114v16q45 2 61 14t16 39q0 8 -2 26l-20 131h-220l-59 -111q-22 -41 -22 -66q0 -30 62 -33v-16h-186v16q34 7 55.5 32t78.5 124l285 496h26l92 -553q10 -62 24 -79t54 -20v-16h-87q-10 -26 -10 -53q0 -23 16.5 -38t42.5 -15q47 0 83 32l17 -18q-52 -77 -125 -77 q-40 0 -67.5 26.5t-27.5 68.5q0 41 27 74zM369 262l-45 263l-149 -263h194z" />
+<glyph unicode="&#x105;" horiz-adv-x="501" d="M512 -74l17 -18q-52 -77 -125 -77q-40 0 -67.5 26.5t-27.5 68.5q0 37 20 64q-32 4 -32 41q0 25 23 115q-56 -84 -103 -120.5t-100 -36.5q-44 0 -72 30.5t-28 85.5q0 76 43.5 155t110.5 130t132 51q67 0 80 -58l11 48l3 3l61 7l7 -3q-1 -4 -6 -21q-89 -324 -89 -363 q0 -13 14 -13q15 0 52 41l27 29l13 -11q-65 -80 -95 -98q-11 -26 -11 -55q0 -23 16.5 -38t42.5 -15q47 0 83 32zM365 361q0 26 -15 42t-41 16q-68 0 -131 -92q-33 -49 -55 -109t-22 -106q0 -74 60 -74q59 0 127 98q77 111 77 225z" />
+<glyph unicode="&#x106;" horiz-adv-x="667" d="M389 706l162 160q10 10 25 10t25.5 -10.5t10.5 -25.5q0 -18 -17 -28l-171 -106h-35zM689 664l-37 -200l-18 3q-18 163 -149 163q-109 0 -199 -97q-53 -56 -80.5 -136t-27.5 -165q0 -205 175 -205q62 0 113.5 26t115.5 93l18 -15q-67 -79 -131.5 -114t-141.5 -35 q-117 0 -189 69.5t-72 191.5q0 103 51 196.5t136 153.5q102 73 219 73q69 0 117 -17q20 -7 41 -7q27 0 38 22h21z" />
+<glyph unicode="&#x107;" horiz-adv-x="444" d="M208 494l162 160q10 10 25 10t25.5 -10.5t10.5 -25.5q0 -18 -17 -28l-171 -106h-35zM350 107l16 -10q-46 -58 -89.5 -83t-99.5 -25q-71 0 -109 39t-38 115q0 67 34 129.5t89 107.5q77 61 167 61q46 0 75.5 -23t29.5 -58q0 -20 -14 -34t-34 -14t-29.5 11.5t-9.5 28.5 q0 9 7.5 23.5t7.5 24.5q0 20 -37 20q-63 0 -109 -48q-91 -96 -91 -233q0 -54 23 -84t66 -30q39 0 71 19t74 63z" />
+<glyph unicode="&#x108;" horiz-adv-x="667" d="M647 706h-36l-82 104l-137 -104h-39l157 169h49zM689 664l-37 -200l-18 3q-18 163 -149 163q-109 0 -199 -97q-53 -56 -80.5 -136t-27.5 -165q0 -205 175 -205q62 0 113.5 26t115.5 93l18 -15q-67 -79 -131.5 -114t-141.5 -35q-117 0 -189 69.5t-72 191.5q0 103 51 196.5 t136 153.5q102 73 219 73q69 0 117 -17q20 -7 41 -7q27 0 38 22h21z" />
+<glyph unicode="&#x109;" horiz-adv-x="444" d="M427 492h-36l-82 104l-137 -104h-39l157 169h49zM350 107l16 -10q-46 -58 -89.5 -83t-99.5 -25q-71 0 -109 39t-38 115q0 67 34 129.5t89 107.5q77 61 167 61q46 0 75.5 -23t29.5 -58q0 -20 -14 -34t-34 -14t-29.5 11.5t-9.5 28.5q0 9 7.5 23.5t7.5 24.5q0 20 -37 20 q-63 0 -109 -48q-91 -96 -91 -233q0 -54 23 -84t66 -30q39 0 71 19t74 63z" />
+<glyph unicode="&#x10a;" horiz-adv-x="667" d="M549 769q0 -20 -14.5 -34.5t-34.5 -14.5q-21 0 -35 14.5t-14 35.5q0 20 14.5 34t35.5 14q19 0 33.5 -15t14.5 -34zM689 664l-37 -200l-18 3q-18 163 -149 163q-109 0 -199 -97q-53 -56 -80.5 -136t-27.5 -165q0 -205 175 -205q62 0 113.5 26t115.5 93l18 -15 q-67 -79 -131.5 -114t-141.5 -35q-117 0 -189 69.5t-72 191.5q0 103 51 196.5t136 153.5q102 73 219 73q69 0 117 -17q20 -7 41 -7q27 0 38 22h21z" />
+<glyph unicode="&#x10b;" horiz-adv-x="444" d="M369 557q0 -20 -14.5 -34.5t-34.5 -14.5q-21 0 -35 14.5t-14 35.5q0 20 14.5 34t35.5 14q19 0 33.5 -15t14.5 -34zM350 107l16 -10q-46 -58 -89.5 -83t-99.5 -25q-71 0 -109 39t-38 115q0 67 34 129.5t89 107.5q77 61 167 61q46 0 75.5 -23t29.5 -58q0 -20 -14 -34 t-34 -14t-29.5 11.5t-9.5 28.5q0 9 7.5 23.5t7.5 24.5q0 20 -37 20q-63 0 -109 -48q-91 -96 -91 -233q0 -54 23 -84t66 -30q39 0 71 19t74 63z" />
+<glyph unicode="&#x10c;" horiz-adv-x="667" d="M647 875l-162 -169h-48l-95 169h38l89 -105l141 105h37zM689 664l-37 -200l-18 3q-18 163 -149 163q-109 0 -199 -97q-53 -56 -80.5 -136t-27.5 -165q0 -205 175 -205q62 0 113.5 26t115.5 93l18 -15q-67 -79 -131.5 -114t-141.5 -35q-117 0 -189 69.5t-72 191.5 q0 103 51 196.5t136 153.5q102 73 219 73q69 0 117 -17q20 -7 41 -7q27 0 38 22h21z" />
+<glyph unicode="&#x10d;" horiz-adv-x="444" d="M473 661l-162 -169h-48l-95 169h38l89 -105l141 105h37zM350 107l16 -10q-46 -58 -89.5 -83t-99.5 -25q-71 0 -109 39t-38 115q0 67 34 129.5t89 107.5q77 61 167 61q46 0 75.5 -23t29.5 -58q0 -20 -14 -34t-34 -14t-29.5 11.5t-9.5 28.5q0 9 7.5 23.5t7.5 24.5 q0 20 -37 20q-63 0 -109 -48q-91 -96 -91 -233q0 -54 23 -84t66 -30q39 0 71 19t74 63z" />
+<glyph unicode="&#x10e;" horiz-adv-x="722" d="M603 875l-162 -169h-48l-95 169h38l89 -105l141 105h37zM131 653h277q134 0 213 -70t79 -199q0 -177 -160 -301q-106 -83 -291 -83h-257v16q43 8 56.5 20t25.5 56l122 445q11 39 11 59q0 21 -16 30.5t-60 10.5v16zM310 584l-118 -422q-22 -80 -22 -95q0 -37 68 -37 q148 0 241 90q52 50 81 129.5t29 158.5q0 121 -78 180q-47 35 -131 35q-32 0 -47.5 -7.5t-22.5 -31.5z" />
+<glyph unicode="&#x10f;" horiz-adv-x="609" d="M567 461l-9 17q75 50 75 88q0 14 -20 33q-25 22 -25 46q0 20 14.5 33t36.5 13q25 0 41.5 -20.5t16.5 -50.5q0 -86 -130 -159zM521 683l6 -6l-39 -152l-60 -219q-65 -239 -65 -246q0 -20 18 -20q13 0 27.5 12.5t54.5 58.5l12 -10q-77 -114 -147 -114q-19 0 -30 12t-11 33 q0 30 13 89q-43 -73 -84.5 -102.5t-93.5 -29.5q-50 0 -78.5 30.5t-28.5 86.5q0 119 96.5 227t195.5 108q31 0 45.5 -14t19.5 -44h1l45 163q14 49 14 71q0 16 -11 20t-53 6v17q77 7 153 23zM356 361q0 26 -14.5 41.5t-32.5 15.5q-47 0 -91 -46q-50 -53 -83 -126.5t-33 -135.5 q0 -34 15.5 -53.5t42.5 -19.5q45 0 91 49t75.5 125t29.5 150z" />
+<glyph unicode="&#x110;" horiz-adv-x="722" d="M130 653h276q139 0 216.5 -68.5t77.5 -200.5q0 -87 -43 -166t-117 -135q-110 -83 -303 -83h-245v16q43 8 56 19.5t25 54.5l65 236h-90l12 42h90l46 164q11 39 11 64q0 20 -15 28.5t-62 12.5v16zM238 326l-46 -164q-22 -80 -22 -95q0 -37 69 -37q151 0 240 90 q51 51 80.5 127t29.5 157q0 108 -54 163.5t-160 55.5q-32 0 -44.5 -6t-17.5 -23l-63 -226h153l-12 -42h-153z" />
+<glyph unicode="&#x111;" d="M580 560l-10 -39h-84l-58 -215q-65 -239 -65 -246q0 -20 18 -20q13 0 27.5 12.5t54.5 58.5l12 -10q-77 -114 -147 -114q-19 0 -30 12t-11 33q0 30 13 89q-43 -73 -84.5 -102.5t-93.5 -29.5q-50 0 -78.5 30.5t-28.5 86.5q0 119 96.5 227t195.5 108q31 0 45.5 -14t19.5 -44 h1l37 138h-182l7 39h187q10 40 10 57q0 16 -11 20t-53 6v17q77 7 153 23l6 -6l-30 -117h83zM356 361q0 26 -14.5 41.5t-32.5 15.5q-47 0 -91 -46q-50 -53 -83 -126.5t-33 -135.5q0 -34 15.5 -53.5t42.5 -19.5q45 0 91 49t75.5 125t29.5 150z" />
+<glyph unicode="&#x112;" horiz-adv-x="611" d="M596 757l-11 -51h-301l11 51h301zM634 653l-31 -154l-22 2q3 25 3 46q0 45 -37 59t-155 14q-42 0 -55 -4.5t-18 -21.5l-66 -233h78q66 0 88 16t51 81l18 -4l-68 -232l-20 5q7 31 7 52q0 24 -7 31q-16 15 -78 15h-78l-32 -112q-36 -127 -36 -146q0 -34 79 -34 q129 0 203 39q38 20 94 98l16 -8l-62 -162h-507v16q43 8 56 19.5t25 54.5l123 442q11 37 11 64q0 20 -15.5 28.5t-61.5 12.5v16h497z" />
+<glyph unicode="&#x113;" horiz-adv-x="444" d="M466 542l-11 -51h-301l11 51h301zM358 109l12 -12q-88 -108 -204 -108q-61 0 -98 37.5t-37 99.5q0 117 93.5 216t205.5 99q39 0 60.5 -18t21.5 -50q0 -66 -76.5 -118t-207.5 -69q-10 -20 -10 -61t25.5 -66t67.5 -25q33 0 63 15.5t84 59.5zM152 252l-17 -44q112 27 161 74 q50 48 50 97q0 39 -35 39q-42 0 -87.5 -48.5t-71.5 -117.5z" />
+<glyph unicode="&#x114;" horiz-adv-x="611" d="M572 866h29q-11 -67 -60 -112.5t-113 -45.5q-67 0 -97.5 39.5t-30.5 118.5h29q8 -99 107 -99q46 0 83 26.5t53 72.5zM634 653l-31 -154l-22 2q3 25 3 46q0 45 -37 59t-155 14q-42 0 -55 -4.5t-18 -21.5l-66 -233h78q66 0 88 16t51 81l18 -4l-68 -232l-20 5q7 31 7 52 q0 24 -7 31q-16 15 -78 15h-78l-32 -112q-36 -127 -36 -146q0 -34 79 -34q129 0 203 39q38 20 94 98l16 -8l-62 -162h-507v16q43 8 56 19.5t25 54.5l123 442q11 37 11 64q0 20 -15.5 28.5t-61.5 12.5v16h497z" />
+<glyph unicode="&#x115;" horiz-adv-x="444" d="M442 650h29q-11 -67 -60 -112.5t-113 -45.5q-67 0 -97.5 39.5t-30.5 118.5h29q8 -99 107 -99q46 0 83 26.5t53 72.5zM358 109l12 -12q-88 -108 -204 -108q-61 0 -98 37.5t-37 99.5q0 117 93.5 216t205.5 99q39 0 60.5 -18t21.5 -50q0 -66 -76.5 -118t-207.5 -69 q-10 -20 -10 -61t25.5 -66t67.5 -25q33 0 63 15.5t84 59.5zM152 252l-17 -44q112 27 161 74q50 48 50 97q0 39 -35 39q-42 0 -87.5 -48.5t-71.5 -117.5z" />
+<glyph unicode="&#x116;" horiz-adv-x="611" d="M499 769q0 -20 -14.5 -34.5t-34.5 -14.5q-21 0 -35 14.5t-14 35.5q0 20 14.5 34t35.5 14q19 0 33.5 -15t14.5 -34zM634 653l-31 -154l-22 2q3 25 3 46q0 45 -37 59t-155 14q-42 0 -55 -4.5t-18 -21.5l-66 -233h78q66 0 88 16t51 81l18 -4l-68 -232l-20 5q7 31 7 52 q0 24 -7 31q-16 15 -78 15h-78l-32 -112q-36 -127 -36 -146q0 -34 79 -34q129 0 203 39q38 20 94 98l16 -8l-62 -162h-507v16q43 8 56 19.5t25 54.5l123 442q11 37 11 64q0 20 -15.5 28.5t-61.5 12.5v16h497z" />
+<glyph unicode="&#x117;" horiz-adv-x="444" d="M359 557q0 -20 -14.5 -34.5t-34.5 -14.5q-21 0 -35 14.5t-14 35.5q0 20 14.5 34t35.5 14q19 0 33.5 -15t14.5 -34zM358 109l12 -12q-88 -108 -204 -108q-61 0 -98 37.5t-37 99.5q0 117 93.5 216t205.5 99q39 0 60.5 -18t21.5 -50q0 -66 -76.5 -118t-207.5 -69 q-10 -20 -10 -61t25.5 -66t67.5 -25q33 0 63 15.5t84 59.5zM152 252l-17 -44q112 27 161 74q50 48 50 97q0 39 -35 39q-42 0 -87.5 -48.5t-71.5 -117.5z" />
+<glyph unicode="&#x118;" horiz-adv-x="611" d="M299 0h-300v16q43 8 56 19.5t25 54.5l123 442q11 37 11 64q0 20 -15.5 28.5t-61.5 12.5v16h497l-31 -154l-22 2q3 25 3 46q0 45 -37 59t-155 14q-42 0 -55 -4.5t-18 -21.5l-66 -233h78q66 0 88 16t51 81l18 -4l-68 -232l-20 5q7 31 7 52q0 24 -7 31q-16 15 -78 15h-78 l-32 -112q-36 -127 -36 -146q0 -34 79 -34q129 0 203 39q38 20 94 98l16 -8l-62 -162h-165q-13 -29 -13 -59q0 -23 16.5 -38t42.5 -15q47 0 83 32l17 -18q-52 -77 -125 -77q-40 0 -67.5 26.5t-27.5 68.5q0 44 32 80z" />
+<glyph unicode="&#x119;" horiz-adv-x="444" d="M343 -80l17 -18q-52 -77 -125 -77q-40 0 -67.5 26.5t-27.5 68.5q0 39 23 69q-59 1 -95.5 38.5t-36.5 98.5q0 117 93.5 216t205.5 99q39 0 60.5 -18t21.5 -50q0 -66 -76.5 -118t-207.5 -69q-10 -20 -10 -61t25.5 -66t67.5 -25q33 0 63 15.5t84 59.5l12 -12 q-71 -88 -159 -104q-10 -26 -10 -52q0 -23 16.5 -38t42.5 -15q47 0 83 32zM152 252l-17 -44q112 27 161 74q50 48 50 97q0 39 -35 39q-42 0 -87.5 -48.5t-71.5 -117.5z" />
+<glyph unicode="&#x11a;" horiz-adv-x="611" d="M603 875l-162 -169h-48l-95 169h38l89 -105l141 105h37zM634 653l-31 -154l-22 2q3 25 3 46q0 45 -37 59t-155 14q-42 0 -55 -4.5t-18 -21.5l-66 -233h78q66 0 88 16t51 81l18 -4l-68 -232l-20 5q7 31 7 52q0 24 -7 31q-16 15 -78 15h-78l-32 -112q-36 -127 -36 -146 q0 -34 79 -34q129 0 203 39q38 20 94 98l16 -8l-62 -162h-507v16q43 8 56 19.5t25 54.5l123 442q11 37 11 64q0 20 -15.5 28.5t-61.5 12.5v16h497z" />
+<glyph unicode="&#x11b;" horiz-adv-x="444" d="M502 661l-162 -169h-48l-95 169h38l89 -105l141 105h37zM358 109l12 -12q-88 -108 -204 -108q-61 0 -98 37.5t-37 99.5q0 117 93.5 216t205.5 99q39 0 60.5 -18t21.5 -50q0 -66 -76.5 -118t-207.5 -69q-10 -20 -10 -61t25.5 -66t67.5 -25q33 0 63 15.5t84 59.5zM152 252 l-17 -44q112 27 161 74q50 48 50 97q0 39 -35 39q-42 0 -87.5 -48.5t-71.5 -117.5z" />
+<glyph unicode="&#x11c;" horiz-adv-x="722" d="M653 708h-36l-82 104l-137 -104h-39l157 169h49zM722 319v-16q-49 -3 -67.5 -16.5t-29.5 -55.5l-49 -187q-111 -62 -237 -62q-137 0 -213 76q-35 35 -54.5 88t-19.5 105q0 103 50 194t133 149q104 72 220 72q72 0 134 -24q26 -10 44 -10q36 0 60 34l15 -5l-49 -197l-18 3 q-3 64 -37 106q-48 59 -141 59q-117 0 -195 -99q-50 -63 -78 -143t-28 -162q0 -99 53 -154t149 -55q71 0 105 34q9 9 16 26.5t23 74.5q26 87 26 113q0 29 -47 33l-32 3v16h267z" />
+<glyph unicode="&#x11d;" d="M447 492h-36l-82 104l-137 -104h-39l157 169h49zM471 366h-49q9 -18 9 -51q0 -63 -57.5 -113.5t-127.5 -50.5q-18 0 -31 3q-3 1 -7 1q-13 0 -24.5 -13t-11.5 -28q0 -24 71 -42q142 -34 142 -127q0 -67 -56 -109t-154 -42q-78 0 -122.5 27.5t-44.5 80.5q0 39 22.5 66.5 t94.5 70.5q-27 17 -27 39q0 48 77 84q-79 28 -79 108q0 74 61 122.5t140 48.5q58 0 98 -28q11 -8 16 -8h60v-39zM352 348q0 39 -13.5 55t-42.5 16q-48 0 -85 -50t-37 -122q0 -35 16 -55t44 -20q50 0 85 59q33 56 33 117zM325 -90q0 35 -31.5 58.5t-111.5 48.5q-24 7 -34 11 q-7 0 -30.5 -19t-34.5 -33q-20 -25 -20 -58q0 -102 127 -102q59 0 97 27.5t38 66.5z" />
+<glyph unicode="&#x11e;" horiz-adv-x="722" d="M632 866h29q-11 -67 -60 -112.5t-113 -45.5q-67 0 -97.5 39.5t-30.5 118.5h29q8 -99 107 -99q46 0 83 26.5t53 72.5zM722 319v-16q-49 -3 -67.5 -16.5t-29.5 -55.5l-49 -187q-111 -62 -237 -62q-137 0 -213 76q-35 35 -54.5 88t-19.5 105q0 103 50 194t133 149 q104 72 220 72q72 0 134 -24q26 -10 44 -10q36 0 60 34l15 -5l-49 -197l-18 3q-3 64 -37 106q-48 59 -141 59q-117 0 -195 -99q-50 -63 -78 -143t-28 -162q0 -99 53 -154t149 -55q71 0 105 34q9 9 16 26.5t23 74.5q26 87 26 113q0 29 -47 33l-32 3v16h267z" />
+<glyph unicode="&#x11f;" d="M447 650h29q-11 -67 -60 -112.5t-113 -45.5q-67 0 -97.5 39.5t-30.5 118.5h29q8 -99 107 -99q46 0 83 26.5t53 72.5zM471 366h-49q9 -18 9 -51q0 -63 -57.5 -113.5t-127.5 -50.5q-18 0 -31 3q-3 1 -7 1q-13 0 -24.5 -13t-11.5 -28q0 -24 71 -42q142 -34 142 -127 q0 -67 -56 -109t-154 -42q-78 0 -122.5 27.5t-44.5 80.5q0 39 22.5 66.5t94.5 70.5q-27 17 -27 39q0 48 77 84q-79 28 -79 108q0 74 61 122.5t140 48.5q58 0 98 -28q11 -8 16 -8h60v-39zM352 348q0 39 -13.5 55t-42.5 16q-48 0 -85 -50t-37 -122q0 -35 16 -55t44 -20 q50 0 85 59q33 56 33 117zM325 -90q0 35 -31.5 58.5t-111.5 48.5q-24 7 -34 11q-7 0 -30.5 -19t-34.5 -33q-20 -25 -20 -58q0 -102 127 -102q59 0 97 27.5t38 66.5z" />
+<glyph unicode="&#x120;" horiz-adv-x="722" d="M539 769q0 -20 -14.5 -34.5t-34.5 -14.5q-21 0 -35 14.5t-14 35.5q0 20 14.5 34t35.5 14q19 0 33.5 -15t14.5 -34zM722 319v-16q-49 -3 -67.5 -16.5t-29.5 -55.5l-49 -187q-111 -62 -237 -62q-137 0 -213 76q-35 35 -54.5 88t-19.5 105q0 103 50 194t133 149 q104 72 220 72q72 0 134 -24q26 -10 44 -10q36 0 60 34l15 -5l-49 -197l-18 3q-3 64 -37 106q-48 59 -141 59q-117 0 -195 -99q-50 -63 -78 -143t-28 -162q0 -99 53 -154t149 -55q71 0 105 34q9 9 16 26.5t23 74.5q26 87 26 113q0 29 -47 33l-32 3v16h267z" />
+<glyph unicode="&#x121;" d="M350 557q0 -20 -14.5 -34.5t-34.5 -14.5q-21 0 -35 14.5t-14 35.5q0 20 14.5 34t35.5 14q19 0 33.5 -15t14.5 -34zM471 366h-49q9 -18 9 -51q0 -63 -57.5 -113.5t-127.5 -50.5q-18 0 -31 3q-3 1 -7 1q-13 0 -24.5 -13t-11.5 -28q0 -24 71 -42q142 -34 142 -127 q0 -67 -56 -109t-154 -42q-78 0 -122.5 27.5t-44.5 80.5q0 39 22.5 66.5t94.5 70.5q-27 17 -27 39q0 48 77 84q-79 28 -79 108q0 74 61 122.5t140 48.5q58 0 98 -28q11 -8 16 -8h60v-39zM352 348q0 39 -13.5 55t-42.5 16q-48 0 -85 -50t-37 -122q0 -35 16 -55t44 -20 q50 0 85 59q33 56 33 117zM325 -90q0 35 -31.5 58.5t-111.5 48.5q-24 7 -34 11q-7 0 -30.5 -19t-34.5 -33q-20 -25 -20 -58q0 -102 127 -102q59 0 97 27.5t38 66.5z" />
+<glyph unicode="&#x122;" horiz-adv-x="722" d="M259 -267l-9 18q75 50 75 88q0 11 -21 31q-24 21 -24 47q0 20 14.5 33t36.5 13q25 0 41.5 -20.5t16.5 -50.5q0 -87 -130 -159zM722 319v-16q-49 -3 -67.5 -16.5t-29.5 -55.5l-49 -187q-111 -62 -237 -62q-137 0 -213 76q-35 35 -54.5 88t-19.5 105q0 103 50 194t133 149 q104 72 220 72q72 0 134 -24q26 -10 44 -10q36 0 60 34l15 -5l-49 -197l-18 3q-3 64 -37 106q-48 59 -141 59q-117 0 -195 -99q-50 -63 -78 -143t-28 -162q0 -99 53 -154t149 -55q71 0 105 34q9 9 16 26.5t23 74.5q26 87 26 113q0 29 -47 33l-32 3v16h267z" />
+<glyph unicode="&#x123;" d="M386 724l9 -17q-75 -50 -75 -89q0 -13 20 -32q25 -22 25 -45q0 -20 -14.5 -33.5t-36.5 -13.5q-25 0 -41.5 20t-16.5 51q0 87 130 159zM471 366h-49q9 -18 9 -51q0 -63 -57.5 -113.5t-127.5 -50.5q-18 0 -31 3q-3 1 -7 1q-13 0 -24.5 -13t-11.5 -28q0 -24 71 -42 q142 -34 142 -127q0 -67 -56 -109t-154 -42q-78 0 -122.5 27.5t-44.5 80.5q0 39 22.5 66.5t94.5 70.5q-27 17 -27 39q0 48 77 84q-79 28 -79 108q0 74 61 122.5t140 48.5q58 0 98 -28q11 -8 16 -8h60v-39zM352 348q0 39 -13.5 55t-42.5 16q-48 0 -85 -50t-37 -122 q0 -35 16 -55t44 -20q50 0 85 59q33 56 33 117zM325 -90q0 35 -31.5 58.5t-111.5 48.5q-24 7 -34 11q-7 0 -30.5 -19t-34.5 -33q-20 -25 -20 -58q0 -102 127 -102q59 0 97 27.5t38 66.5z" />
+<glyph unicode="&#x124;" horiz-adv-x="722" d="M627 706h-36l-82 104l-137 -104h-39l157 169h49zM769 653v-16q-44 -8 -58 -20t-26 -54l-132 -481q-3 -12 -3 -24q0 -21 15 -29t64 -13v-16h-274v16q51 4 71.5 21t30.5 56l64 233h-285l-66 -244q-3 -10 -3 -22q0 -22 12.5 -30t57.5 -14v-16h-245v16q41 4 56.5 20t29.5 66 l118 430q12 46 12 64q0 21 -14.5 28.5t-62.5 12.5v16h271v-16q-45 -3 -67.5 -19t-32.5 -52l-54 -198h285l46 164q14 52 14 63q0 19 -16 29t-56 13v16h248z" />
+<glyph unicode="&#x125;" d="M447 706h-36l-82 104l-137 -104h-39l157 169h49zM465 118l13 -13q-46 -65 -77 -89.5t-69 -24.5q-20 0 -32 11.5t-12 30.5q0 17 20 92l55 207q7 28 7 33q0 25 -28 25q-27 0 -69.5 -40t-82.5 -100q-31 -48 -49 -93.5t-47 -156.5h-75l146 554q13 50 13 62t-13 18.5t-28 6.5 h-27v15q76 9 157 27l7 -6l-121 -447q130 211 230 211q33 0 49 -18.5t16 -48.5q0 -43 -48 -193q-33 -101 -33 -125q0 -18 16 -18q12 0 26.5 14.5t55.5 65.5z" />
+<glyph unicode="&#x126;" horiz-adv-x="722" d="M769 653v-16q-44 -8 -58 -20t-26 -54l-12 -43h88l-12 -44h-88l-108 -394q-3 -12 -3 -24q0 -21 15 -29t64 -13v-16h-274v16q51 4 71.5 21t30.5 56l64 233h-285l-66 -244q-3 -10 -3 -22q0 -22 12.5 -30t57.5 -14v-16h-245v16q41 4 56.5 20t29.5 66l102 374h-103l12 44h103 q16 57 16 76q0 21 -14.5 28.5t-62.5 12.5v16h271v-16q-45 -3 -67 -19t-33 -52l-13 -46h286q18 62 18 75q0 19 -16 29t-56 13v16h248zM563 476h-286l-29 -108h285z" />
+<glyph unicode="&#x127;" d="M465 118l13 -13q-46 -65 -77 -89.5t-69 -24.5q-20 0 -32 11.5t-12 30.5q0 17 20 92l55 207q7 28 7 33q0 25 -28 25q-27 0 -69.5 -40t-82.5 -100q-31 -48 -49 -93.5t-47 -156.5h-75l132 500h-63l15 54h62q13 50 13 62t-13 18.5t-28 6.5h-27v15q76 9 157 27l7 -6l-33 -123 h159l-15 -54h-159l-73 -270q130 211 230 211q33 0 49 -18.5t16 -48.5q0 -43 -48 -193q-33 -101 -33 -125q0 -18 16 -18q12 0 26.5 14.5t55.5 65.5z" />
+<glyph unicode="&#x128;" horiz-adv-x="333" d="M416 836h28q-22 -104 -95 -104q-18 0 -57 15q-71 29 -95 29q-36 0 -51 -47h-29q15 58 38 82t62 24q32 0 86 -24q41 -19 62 -19q20 0 31.5 9.5t19.5 34.5zM384 653v-16q-42 -5 -55.5 -18t-26.5 -59l-120 -429q-15 -53 -15 -76q0 -20 12.5 -27t56.5 -12v-16h-244v16 q42 8 57.5 21t26.5 54l120 441q13 46 13 62q0 20 -16 30.5t-56 12.5v16h247z" />
+<glyph unicode="&#x129;" horiz-adv-x="278" d="M329 624h28q-22 -104 -95 -104q-18 0 -57 15q-71 29 -95 29q-36 0 -51 -47h-29q15 58 38 82t62 24q32 0 86 -24q41 -19 62 -19q20 0 31.5 9.5t19.5 34.5zM221 115l14 -12q-41 -63 -71 -88.5t-67 -25.5q-50 0 -50 57q0 20 24 110l48 175q9 34 9 45q0 15 -11 19t-52 5v16 q44 3 159 25l5 -3l-96 -342q-9 -34 -9 -45q0 -15 16 -15q12 0 30 17.5t51 61.5z" />
+<glyph unicode="&#x12a;" horiz-adv-x="333" d="M439 757l-11 -51h-301l11 51h301zM384 653v-16q-42 -5 -55.5 -18t-26.5 -59l-120 -429q-15 -53 -15 -76q0 -20 12.5 -27t56.5 -12v-16h-244v16q42 8 57.5 21t26.5 54l120 441q13 46 13 62q0 20 -16 30.5t-56 12.5v16h247z" />
+<glyph unicode="&#x12b;" horiz-adv-x="278" d="M221 115l14 -12q-41 -63 -71 -88.5t-67 -25.5q-50 0 -50 57q0 20 24 110l48 175q9 34 9 45q0 15 -11 19t-52 5v16q44 3 159 25l5 -3l-96 -342q-9 -34 -9 -45q0 -15 16 -15q12 0 30 17.5t51 61.5zM341 543l-11 -51h-301l11 51h301z" />
+<glyph unicode="&#x12c;" horiz-adv-x="333" d="M419 866h29q-11 -67 -60 -112.5t-113 -45.5q-67 0 -97.5 39.5t-30.5 118.5h29q8 -99 107 -99q46 0 83 26.5t53 72.5zM384 653v-16q-42 -5 -55.5 -18t-26.5 -59l-120 -429q-15 -53 -15 -76q0 -20 12.5 -27t56.5 -12v-16h-244v16q42 8 57.5 21t26.5 54l120 441q13 46 13 62 q0 20 -16 30.5t-56 12.5v16h247z" />
+<glyph unicode="&#x12d;" horiz-adv-x="278" d="M318 650h29q-11 -67 -60 -112.5t-113 -45.5q-67 0 -97.5 39.5t-30.5 118.5h29q8 -99 107 -99q46 0 83 26.5t53 72.5zM221 115l14 -12q-41 -63 -71 -88.5t-67 -25.5q-50 0 -50 57q0 20 24 110l48 175q9 34 9 45q0 15 -11 19t-52 5v16q44 3 159 25l5 -3l-96 -342 q-9 -34 -9 -45q0 -15 16 -15q12 0 30 17.5t51 61.5z" />
+<glyph unicode="&#x12e;" horiz-adv-x="333" d="M94 0h-102v16q42 8 57.5 21t26.5 54l120 441q13 46 13 62q0 20 -16 30.5t-56 12.5v16h247v-16q-42 -5 -55.5 -18t-26.5 -59l-120 -429q-15 -53 -15 -76q0 -20 12.5 -27t56.5 -12v-16h-98q-10 -26 -10 -53q0 -23 16.5 -38t42.5 -15q47 0 83 32l17 -18q-52 -77 -125 -77 q-40 0 -67.5 26.5t-27.5 68.5q0 41 27 74z" />
+<glyph unicode="&#x12f;" horiz-adv-x="278" d="M102 -11h-4q-49 0 -49 55q0 29 22 111l48 177q9 32 9 44q0 15 -11.5 19t-52.5 5v16q46 4 160 25l4 -3l-94 -343q-10 -34 -10 -44q0 -15 14 -15q25 0 84 78l13 -11q-46 -71 -76 -93q-15 -30 -15 -63q0 -23 16.5 -38t42.5 -15q47 0 83 32l17 -18q-52 -77 -125 -77 q-40 0 -67.5 26.5t-27.5 68.5q0 35 19 63zM264 599q0 -21 -14.5 -36t-34.5 -15q-22 0 -35 14.5t-13 38.5q0 23 13.5 38t33.5 15t35 -16.5t15 -38.5z" />
+<glyph unicode="&#x130;" horiz-adv-x="333" d="M344 769q0 -20 -14.5 -34.5t-34.5 -14.5q-21 0 -35 14.5t-14 35.5q0 20 14.5 34t35.5 14q19 0 33.5 -15t14.5 -34zM384 653v-16q-42 -5 -55.5 -18t-26.5 -59l-120 -429q-15 -53 -15 -76q0 -20 12.5 -27t56.5 -12v-16h-244v16q42 8 57.5 21t26.5 54l120 441q13 46 13 62 q0 20 -16 30.5t-56 12.5v16h247z" />
+<glyph unicode="&#x131;" horiz-adv-x="278" d="M221 115l14 -12q-41 -63 -71 -88.5t-67 -25.5q-50 0 -50 57q0 20 24 110l48 175q9 34 9 45q0 15 -11 19t-52 5v16q44 3 159 25l5 -3l-96 -342q-9 -34 -9 -45q0 -15 16 -15q12 0 30 17.5t51 61.5z" />
+<glyph unicode="&#x134;" horiz-adv-x="444" d="M536 708h-36l-82 104l-137 -104h-39l157 169h49zM491 653v-16q-43 -6 -56 -17.5t-26 -56.5l-103 -367q-29 -104 -71 -159t-124 -55q-53 0 -85 24t-32 64q0 24 12.5 40t32.5 16t35.5 -13.5t15.5 -32.5q0 -6 -1.5 -14.5t-1.5 -12.5q0 -39 35 -39t53 64l127 454q12 44 12 64 t-15 28.5t-62 12.5v16h254z" />
+<glyph unicode="&#x135;" horiz-adv-x="278" d="M353 492h-36l-82 104l-137 -104h-39l157 169h49zM246 438l-104 -410q-31 -121 -76.5 -178t-110.5 -57q-35 0 -57 17t-22 44q0 18 12 31t29 13q39 0 39 -37q0 -12 -6 -19.5t-6 -14.5q0 -12 18 -12q30 0 50.5 39t46.5 143l72 292q16 65 16 80q0 17 -10.5 24t-37.5 7h-26v16 q45 3 169 25z" />
+<glyph unicode="&#x136;" horiz-adv-x="667" d="M211 -267l-9 18q75 50 75 88q0 11 -21 31q-24 21 -24 47q0 20 14.5 33t36.5 13q25 0 41.5 -20.5t16.5 -50.5q0 -87 -130 -159zM722 653v-16q-28 0 -77 -37l-298 -225l168 -293q23 -40 40 -50.5t64 -15.5v-16h-275v16l29 3q46 4 46 32q0 6 -1.5 13t-6.5 16l-8 16l-11 19 q-8 14 -10 18l-123 215l-65 -237q-11 -39 -11 -51q0 -23 14.5 -31.5t56.5 -12.5v-16h-247v16q43 5 56 17t25 54l124 445q14 50 14 62q0 21 -17 31t-62 12v16h270v-16q-42 -3 -65 -18.5t-34 -55.5l-53 -194l153 109q143 101 143 137q0 15 -36 19l-24 3v16h221z" />
+<glyph unicode="&#x137;" horiz-adv-x="444" d="M85 -267l-9 18q75 50 75 88q0 11 -21 31q-24 21 -24 47q0 20 14.5 33t36.5 13q25 0 41.5 -20.5t16.5 -50.5q0 -87 -130 -159zM461 428v-16q-36 -2 -76 -29.5t-149 -124.5l37 -88q55 -129 81 -129q21 0 45 42q5 8 15 26l15 -11q-35 -63 -58 -86t-53 -23q-22 0 -39.5 17.5 t-41.5 64.5q-30 58 -60 141l-40 -32l-48 -180h-75l141 528q14 50 18 88q-3 24 -51 24h-18v16q75 9 157 27l6 -6l-120 -456l43 33q143 110 143 140q0 18 -37 18h-14v16h179z" />
+<glyph unicode="&#x138;" horiz-adv-x="542" d="M243 276l42 4q35 3 69 28q37 26 75 88q24 39 42 51t58 12q26 0 49 -14t23 -38q0 -18 -15 -29.5t-34 -11.5t-30.5 10t-18 19.5t-14.5 9.5q-21 0 -37 -30q-42 -74 -98 -109q15 -6 26 -22q10 -15 27.5 -76t21.5 -70q13 -32 43 -53.5t64 -29.5l-4 -15h-130q-38 25 -57 72 q-9 22 -19 63l-14 53q-15 48 -24 54q-40 -2 -54 -2l-43 -162q-4 -13 -4 -27q0 -20 16.5 -27t47.5 -8l-5 -16h-241l5 16q46 0 63 11q20 11 30 50l80 305q4 15 4 28q0 6 -1.5 10.5t-3 8t-5.5 5.5l-7 4q-3 1 -10 2l-10 2q-4 0 -13.5 0.5t-14.5 0.5l4 16h241l-4 -16 q-46 -2 -62 -11q-19 -11 -30 -51z" />
+<glyph unicode="&#x139;" horiz-adv-x="556" d="M260 706l162 160q10 10 25 10t25.5 -10.5t10.5 -25.5q0 -18 -17 -28l-171 -106h-35zM559 180l-58 -180h-509v16q42 4 55 17t27 61l122 438q11 37 11 62q0 22 -15.5 31t-61.5 12v16h273v-16q-46 -3 -67.5 -19t-33.5 -58l-120 -429q-10 -38 -10 -54q0 -23 22 -32t83 -9 q77 0 110.5 7t69.5 31q41 27 82 112z" />
+<glyph unicode="&#x13a;" horiz-adv-x="278" d="M125 706l162 160q10 10 25 10t25.5 -10.5t10.5 -25.5q0 -18 -17 -28l-171 -106h-35zM279 678l-153 -585q-8 -29 -8 -43q0 -18 17 -18q27 0 67 57l25 35l14 -10q-45 -71 -77.5 -98t-73.5 -27q-49 0 -49 56q0 17 4 30l137 524q3 10 3 19q0 22 -49 22h-18v16q70 8 155 27z " />
+<glyph unicode="&#x13b;" horiz-adv-x="556" d="M160 -267l-9 18q75 50 75 88q0 11 -21 31q-24 21 -24 47q0 20 14.5 33t36.5 13q25 0 41.5 -20.5t16.5 -50.5q0 -87 -130 -159zM559 180l-58 -180h-509v16q42 4 55 17t27 61l122 438q11 37 11 62q0 22 -15.5 31t-61.5 12v16h273v-16q-46 -3 -67.5 -19t-33.5 -58l-120 -429 q-10 -38 -10 -54q0 -23 22 -32t83 -9q77 0 110.5 7t69.5 31q41 27 82 112z" />
+<glyph unicode="&#x13c;" horiz-adv-x="278" d="M16 -267l-9 18q75 50 75 88q0 11 -21 31q-24 21 -24 47q0 20 14.5 33t36.5 13q25 0 41.5 -20.5t16.5 -50.5q0 -87 -130 -159zM279 678l-153 -585q-8 -29 -8 -43q0 -18 17 -18q27 0 67 57l25 35l14 -10q-45 -71 -77.5 -98t-73.5 -27q-49 0 -49 56q0 17 4 30l137 524 q3 10 3 19q0 22 -49 22h-18v16q70 8 155 27z" />
+<glyph unicode="&#x13d;" horiz-adv-x="556" d="M465 436l-9 17q75 50 75 88q0 14 -20 33q-25 22 -25 46q0 20 14.5 33t36.5 13q25 0 41.5 -20.5t16.5 -50.5q0 -86 -130 -159zM559 180l-58 -180h-509v16q42 4 55 17t27 61l122 438q11 37 11 62q0 22 -15.5 31t-61.5 12v16h273v-16q-46 -3 -67.5 -19t-33.5 -58l-120 -429 q-10 -38 -10 -54q0 -23 22 -32t83 -9q77 0 110.5 7t69.5 31q41 27 82 112z" />
+<glyph unicode="&#x13e;" horiz-adv-x="278" d="M318 463l-9 17q75 50 75 88q0 14 -20 33q-25 22 -25 46q0 20 14.5 33t36.5 13q25 0 41.5 -20.5t16.5 -50.5q0 -86 -130 -159zM279 678l-153 -585q-8 -29 -8 -43q0 -18 17 -18q27 0 67 57l25 35l14 -10q-45 -71 -77.5 -98t-73.5 -27q-49 0 -49 56q0 17 4 30l137 524 q3 10 3 19q0 22 -49 22h-18v16q70 8 155 27z" />
+<glyph unicode="&#x13f;" horiz-adv-x="556" d="M459 337q0 -22 -17 -38t-40 -16q-22 0 -38 16t-16 38q0 24 16 40.5t39 16.5t39.5 -17t16.5 -40zM559 180l-58 -180h-509v16q42 4 55 17t27 61l122 438q11 37 11 62q0 22 -15.5 31t-61.5 12v16h273v-16q-46 -3 -67.5 -19t-33.5 -58l-120 -429q-10 -38 -10 -54 q0 -23 22 -32t83 -9q77 0 110.5 7t69.5 31q41 27 82 112z" />
+<glyph unicode="&#x140;" horiz-adv-x="323" d="M386 337q0 -22 -17 -38t-40 -16q-22 0 -38 16t-16 38q0 24 16 40.5t39 16.5t39.5 -17t16.5 -40zM279 678l-153 -585q-8 -29 -8 -43q0 -18 17 -18q27 0 67 57l25 35l14 -10q-45 -71 -77.5 -98t-73.5 -27q-49 0 -49 56q0 17 4 30l137 524q3 10 3 19q0 22 -49 22h-18v16 q70 8 155 27z" />
+<glyph unicode="&#x141;" horiz-adv-x="556" d="M559 180l-59 -180h-508v16q41 5 56 19t27 58l52 191l-99 -59l13 48l99 59l56 200q11 37 11 62q0 22 -15.5 30t-62.5 13v16h273v-16q-44 0 -66 -16.5t-32 -51.5l-51 -181l143 85l-14 -49l-142 -83l-54 -195q-17 -60 -17 -74q0 -19 23 -27.5t75 -8.5q80 0 116.5 6.5 t71.5 29.5q42 27 84 114z" />
+<glyph unicode="&#x142;" horiz-adv-x="278" d="M307 460l-12 -46l-98 -50l-72 -275q-7 -25 -7 -38q0 -19 15 -19q26 0 69 57l26 34l13 -9q-49 -73 -80.5 -99t-70.5 -26q-49 0 -49 56q0 16 16 75l52 194l-72 -36l12 46l72 36q65 242 65 256q0 24 -49 24h-20v16q73 9 156 27l6 -6l-70 -267z" />
+<glyph unicode="&#x143;" horiz-adv-x="667" d="M361 706l162 160q10 10 25 10t25.5 -10.5t10.5 -25.5q0 -18 -17 -28l-171 -106h-35zM727 653v-16q-27 -6 -37.5 -9.5t-23 -21t-18.5 -38.5l-23 -76l-146 -507h-18l-230 550l-114 -422q-9 -31 -9 -54q0 -21 15.5 -30.5t54.5 -12.5v-16h-198v16q43 6 61 31.5t45 120.5 l117 415q-23 54 -86 54v16h160l207 -499l106 388q8 28 8 44q0 27 -13.5 37t-55.5 14v16h198z" />
+<glyph unicode="&#x144;" d="M180 494l162 160q10 10 25 10t25.5 -10.5t10.5 -25.5q0 -18 -17 -28l-171 -106h-35zM460 117l14 -13q-51 -70 -78 -91.5t-62 -21.5q-20 0 -33.5 13.5t-13.5 40.5q0 16 16 75l44 162q14 54 14 79q0 29 -24 29q-29 0 -63.5 -34.5t-84.5 -107.5q-33 -49 -48.5 -88 t-51.5 -160h-75l96 350q2 10 2 17q0 15 -13.5 20.5t-51.5 6.5v16q39 8 87 16.5t75 14.5l4 -2l-67 -218q74 118 128 169t103 51q31 0 48 -16.5t17 -44.5q0 -25 -10 -60l-56 -203q-14 -50 -14 -61q0 -18 16 -18q19 0 61 53q7 8 21 26z" />
+<glyph unicode="&#x145;" horiz-adv-x="667" d="M182 -267l-9 18q75 50 75 88q0 11 -21 31q-24 21 -24 47q0 20 14.5 33t36.5 13q25 0 41.5 -20.5t16.5 -50.5q0 -87 -130 -159zM727 653v-16q-27 -6 -37.5 -9.5t-23 -21t-18.5 -38.5l-23 -76l-146 -507h-18l-230 550l-114 -422q-9 -31 -9 -54q0 -21 15.5 -30.5t54.5 -12.5 v-16h-198v16q43 6 61 31.5t45 120.5l117 415q-23 54 -86 54v16h160l207 -499l106 388q8 28 8 44q0 27 -13.5 37t-55.5 14v16h198z" />
+<glyph unicode="&#x146;" d="M107 -267l-9 18q75 50 75 88q0 11 -21 31q-24 21 -24 47q0 20 14.5 33t36.5 13q25 0 41.5 -20.5t16.5 -50.5q0 -87 -130 -159zM460 117l14 -13q-51 -70 -78 -91.5t-62 -21.5q-20 0 -33.5 13.5t-13.5 40.5q0 16 16 75l44 162q14 54 14 79q0 29 -24 29q-29 0 -63.5 -34.5 t-84.5 -107.5q-33 -49 -48.5 -88t-51.5 -160h-75l96 350q2 10 2 17q0 15 -13.5 20.5t-51.5 6.5v16q39 8 87 16.5t75 14.5l4 -2l-67 -218q74 118 128 169t103 51q31 0 48 -16.5t17 -44.5q0 -25 -10 -60l-56 -203q-14 -50 -14 -61q0 -18 16 -18q19 0 61 53q7 8 21 26z" />
+<glyph unicode="&#x147;" horiz-adv-x="667" d="M635 875l-162 -169h-48l-95 169h38l89 -105l141 105h37zM727 653v-16q-27 -6 -37.5 -9.5t-23 -21t-18.5 -38.5l-23 -76l-146 -507h-18l-230 550l-114 -422q-9 -31 -9 -54q0 -21 15.5 -30.5t54.5 -12.5v-16h-198v16q43 6 61 31.5t45 120.5l117 415q-23 54 -86 54v16h160 l207 -499l106 388q8 28 8 44q0 27 -13.5 37t-55.5 14v16h198z" />
+<glyph unicode="&#x148;" d="M475 661l-162 -169h-48l-95 169h38l89 -105l141 105h37zM460 117l14 -13q-51 -70 -78 -91.5t-62 -21.5q-20 0 -33.5 13.5t-13.5 40.5q0 16 16 75l44 162q14 54 14 79q0 29 -24 29q-29 0 -63.5 -34.5t-84.5 -107.5q-33 -49 -48.5 -88t-51.5 -160h-75l96 350q2 10 2 17 q0 15 -13.5 20.5t-51.5 6.5v16q39 8 87 16.5t75 14.5l4 -2l-67 -218q74 118 128 169t103 51q31 0 48 -16.5t17 -44.5q0 -25 -10 -60l-56 -203q-14 -50 -14 -61q0 -18 16 -18q19 0 61 53q7 8 21 26z" />
+<glyph unicode="&#x149;" horiz-adv-x="577" d="M67 461l-9 17q75 50 75 88q0 14 -20 33q-25 22 -25 46q0 20 14.5 33t36.5 13q25 0 41.5 -20.5t16.5 -50.5q0 -86 -130 -159zM526 117l14 -13q-51 -70 -78 -91.5t-62 -21.5q-20 0 -33.5 13.5t-13.5 40.5q0 16 16 75l44 162q14 54 14 79q0 29 -24 29q-29 0 -63.5 -34.5 t-84.5 -107.5q-33 -49 -48.5 -88t-51.5 -160h-75l96 350q2 10 2 17q0 15 -13.5 20.5t-51.5 6.5v16q39 8 87 16.5t75 14.5l4 -2l-67 -218q74 118 128 169t103 51q31 0 48 -16.5t17 -44.5q0 -25 -10 -60l-56 -203q-14 -50 -14 -61q0 -18 16 -18q19 0 61 53q7 8 21 26z" />
+<glyph unicode="&#x14a;" horiz-adv-x="722" d="M329 653l-34 -120q59 74 114.5 103.5t117.5 29.5q84 0 128.5 -61.5t44.5 -157.5q0 -57 -11 -117.5t-38 -123.5t-65.5 -112t-99.5 -80.5t-135 -31.5q-40 0 -63.5 21t-23.5 53q0 36 22.5 60.5t56.5 24.5q22 0 37.5 -18t15.5 -39q0 -9 -7 -26t-7 -21q0 -18 12 -18t28 5.5 t39 19.5t44.5 43t41 69t31 105.5t11.5 145.5q0 213 -102 213q-101 0 -219 -187l-90 -322q-11 -37 -11 -54q0 -41 55 -41h14v-16h-244v16q43 8 56.5 20t25.5 56l123 446q10 38 10 59q0 20 -15 30t-55 10h-6v16h198z" />
+<glyph unicode="&#x14b;" d="M213 439l-67 -218q74 118 128 169t103 51q31 0 48 -16.5t17 -44.5q0 -25 -10 -60l-77 -292q-32 -123 -77 -179.5t-110 -56.5q-34 0 -56.5 17.5t-22.5 44.5q0 18 12 31t29 13q39 0 39 -37q0 -12 -6 -19.5t-6 -14.5q0 -13 18 -13q30 0 50.5 39.5t46.5 143.5l72 293 q17 68 17 71q0 29 -24 29q-29 0 -63.5 -34.5t-84.5 -107.5q-33 -50 -49 -89.5t-51 -158.5h-75l96 350q2 5 2 17q0 15 -13.5 20.5t-51.5 6.5v16q39 8 87 16.5t75 14.5z" />
+<glyph unicode="&#x14c;" horiz-adv-x="722" d="M666 757l-11 -51h-301l11 51h301zM699 418q0 -107 -57.5 -205t-149.5 -160q-105 -71 -214 -71q-99 0 -158.5 62t-59.5 172q0 91 49 187.5t128 165.5q112 97 237 97q107 1 166 -66t59 -182zM594 481q0 71 -34.5 111.5t-94.5 40.5q-99 0 -186 -117q-53 -72 -83.5 -163 t-30.5 -169q0 -82 33.5 -125.5t96.5 -43.5q92 0 170 95q59 74 94 181t35 190z" />
+<glyph unicode="&#x14d;" d="M511 543l-11 -51h-301l11 51h301zM468 301q0 -57 -28.5 -118.5t-77.5 -110.5q-83 -83 -188 -83q-70 0 -108.5 36.5t-38.5 102.5q0 83 50.5 162t129.5 121q56 30 120 30q62 0 101.5 -37.5t39.5 -102.5zM384 326q0 45 -19 69.5t-52 24.5q-67 0 -128 -91q-74 -113 -74 -228 q0 -44 21 -67.5t57 -23.5q61 0 121 83q34 46 54 110.5t20 122.5z" />
+<glyph unicode="&#x14e;" horiz-adv-x="722" d="M680 866h29q-11 -67 -60 -112.5t-113 -45.5q-67 0 -97.5 39.5t-30.5 118.5h29q8 -99 107 -99q46 0 83 26.5t53 72.5zM699 418q0 -107 -57.5 -205t-149.5 -160q-105 -71 -214 -71q-99 0 -158.5 62t-59.5 172q0 91 49 187.5t128 165.5q112 97 237 97q107 1 166 -66t59 -182 zM594 481q0 71 -34.5 111.5t-94.5 40.5q-99 0 -186 -117q-53 -72 -83.5 -163t-30.5 -169q0 -82 33.5 -125.5t96.5 -43.5q92 0 170 95q59 74 94 181t35 190z" />
+<glyph unicode="&#x14f;" d="M504 650h29q-11 -67 -60 -112.5t-113 -45.5q-67 0 -97.5 39.5t-30.5 118.5h29q8 -99 107 -99q46 0 83 26.5t53 72.5zM468 301q0 -57 -28.5 -118.5t-77.5 -110.5q-83 -83 -188 -83q-70 0 -108.5 36.5t-38.5 102.5q0 83 50.5 162t129.5 121q56 30 120 30q62 0 101.5 -37.5 t39.5 -102.5zM384 326q0 45 -19 69.5t-52 24.5q-67 0 -128 -91q-74 -113 -74 -228q0 -44 21 -67.5t57 -23.5q61 0 121 83q34 46 54 110.5t20 122.5z" />
+<glyph unicode="&#x150;" horiz-adv-x="722" d="M497 706l160 160q10 10 27 10q15 0 25.5 -10.5t10.5 -25.5q0 -20 -17 -30l-171 -104h-35zM327 706l160 160q10 10 27 10q15 0 25.5 -10.5t10.5 -25.5q0 -20 -17 -30l-169 -104h-37zM699 418q0 -107 -57.5 -205t-149.5 -160q-105 -71 -214 -71q-99 0 -158.5 62t-59.5 172 q0 91 49 187.5t128 165.5q112 97 237 97q107 1 166 -66t59 -182zM594 481q0 71 -34.5 111.5t-94.5 40.5q-99 0 -186 -117q-53 -72 -83.5 -163t-30.5 -169q0 -82 33.5 -125.5t96.5 -43.5q92 0 170 95q59 74 94 181t35 190z" />
+<glyph unicode="&#x151;" d="M318 494l160 160q10 10 27 10q15 0 25.5 -10.5t10.5 -25.5q0 -20 -17 -30l-171 -104h-35zM148 494l160 160q10 10 27 10q15 0 25.5 -10.5t10.5 -25.5q0 -20 -17 -30l-169 -104h-37zM468 301q0 -57 -28.5 -118.5t-77.5 -110.5q-83 -83 -188 -83q-70 0 -108.5 36.5 t-38.5 102.5q0 83 50.5 162t129.5 121q56 30 120 30q62 0 101.5 -37.5t39.5 -102.5zM384 326q0 45 -19 69.5t-52 24.5q-67 0 -128 -91q-74 -113 -74 -228q0 -44 21 -67.5t57 -23.5q61 0 121 83q34 46 54 110.5t20 122.5z" />
+<glyph unicode="&#x152;" horiz-adv-x="944" d="M964 653l-31 -150h-16q0 65 -12 85q-18 32 -108 32h-96q-28 0 -37 -32l-64 -227q83 0 116 5.5t53 23.5t41 66l18 -4l-66 -230l-20 2q1 8 2.5 16t2 13t1.5 13q-1 34 -19.5 45t-75.5 14l-62 3l-56 -204q-11 -43 -11 -55q0 -20 16 -28t59 -8q109 0 166.5 28t117.5 111l16 -6 l-65 -166h-346q-12 0 -45.5 -2.5t-85.5 -2.5q-19 0 -46 -1.5t-35 -1.5q-98 0 -162.5 66.5t-64.5 166.5q0 114 54.5 216.5t146 163.5t193.5 61q36 0 98 -8q37 -5 54 -5h369zM458 199l73 268q21 77 21 88q0 34 -29.5 56.5t-74.5 22.5q-74 0 -136 -54q-68 -59 -111.5 -165.5 t-43.5 -212.5q0 -178 144 -178q68 0 99 39q31 37 58 136z" />
+<glyph unicode="&#x153;" horiz-adv-x="667" d="M593 105l11 -11q-107 -106 -197 -106q-69 0 -104 68q-38 -38 -68.5 -52.5t-69.5 -14.5q-63 0 -104 41t-41 105q0 70 41 142t105.5 118t127.5 46q40 0 69.5 -21.5t42.5 -58.5q52 47 85 63.5t74 16.5q38 0 59.5 -18t21.5 -50q0 -61 -70 -109q-30 -21 -77.5 -39.5 t-79.5 -21.5q-31 -2 -36 -19q-10 -34 -10 -70q0 -37 21 -60.5t54 -23.5q28 0 57 15t88 60zM580 378q0 17 -9 27.5t-25 10.5q-34 0 -70 -39q-29 -32 -47 -65.5t-37 -96.5q65 20 88.5 31t46.5 31q53 48 53 101zM343 352q0 30 -16 48t-43 18q-40 0 -73 -35q-48 -52 -78 -130.5 t-30 -152.5q0 -43 18 -67t49 -24q49 0 89 60q29 43 56.5 135.5t27.5 147.5z" />
+<glyph unicode="&#x154;" horiz-adv-x="611" d="M289 706l162 160q10 10 25 10t25.5 -10.5t10.5 -25.5q0 -18 -17 -28l-171 -106h-35zM132 653h252q97 0 150.5 -38t53.5 -103q0 -78 -66 -128q-39 -30 -131 -51l89 -235q17 -46 35.5 -64t51.5 -18v-16h-147l-123 324l-66 5l-55 -203q-13 -46 -13 -63q0 -23 13 -33t54 -14 v-16h-243v16q40 5 56.5 22t28.5 63l119 431q12 46 12 63q0 18 -14 28q-12 8 -57 14v16zM306 593l-63 -227q31 -5 51 -5q89 0 139 40t50 110q0 52 -31 82t-89 30q-49 0 -57 -30z" />
+<glyph unicode="&#x155;" horiz-adv-x="389" d="M180 494l162 160q10 10 25 10t25.5 -10.5t10.5 -25.5q0 -18 -17 -28l-171 -106h-35zM176 223l16 35q34 75 94 138q43 45 79 45q21 0 34 -14t13 -37t-12.5 -38.5t-34.5 -15.5q-19 0 -35 26q-8 14 -16 14q-27 0 -82 -94q-34 -58 -54.5 -109.5t-56.5 -172.5h-76l81 292 q16 59 16 82q0 26 -38 26q-8 0 -31 -3v17l155 27l3 -2z" />
+<glyph unicode="&#x156;" horiz-adv-x="611" d="M177 -267l-9 18q75 50 75 88q0 11 -21 31q-24 21 -24 47q0 20 14.5 33t36.5 13q25 0 41.5 -20.5t16.5 -50.5q0 -87 -130 -159zM132 653h252q97 0 150.5 -38t53.5 -103q0 -78 -66 -128q-39 -30 -131 -51l89 -235q17 -46 35.5 -64t51.5 -18v-16h-147l-123 324l-66 5 l-55 -203q-13 -46 -13 -63q0 -23 13 -33t54 -14v-16h-243v16q40 5 56.5 22t28.5 63l119 431q12 46 12 63q0 18 -14 28q-12 8 -57 14v16zM306 593l-63 -227q31 -5 51 -5q89 0 139 40t50 110q0 52 -31 82t-89 30q-49 0 -57 -30z" />
+<glyph unicode="&#x157;" horiz-adv-x="389" d="M7 -267l-9 18q75 50 75 88q0 11 -21 31q-24 21 -24 47q0 20 14.5 33t36.5 13q25 0 41.5 -20.5t16.5 -50.5q0 -87 -130 -159zM176 223l16 35q34 75 94 138q43 45 79 45q21 0 34 -14t13 -37t-12.5 -38.5t-34.5 -15.5q-19 0 -35 26q-8 14 -16 14q-27 0 -82 -94 q-34 -58 -54.5 -109.5t-56.5 -172.5h-76l81 292q16 59 16 82q0 26 -38 26q-8 0 -31 -3v17l155 27l3 -2z" />
+<glyph unicode="&#x158;" horiz-adv-x="611" d="M574 875l-162 -169h-48l-95 169h38l89 -105l141 105h37zM132 653h252q97 0 150.5 -38t53.5 -103q0 -78 -66 -128q-39 -30 -131 -51l89 -235q17 -46 35.5 -64t51.5 -18v-16h-147l-123 324l-66 5l-55 -203q-13 -46 -13 -63q0 -23 13 -33t54 -14v-16h-243v16q40 5 56.5 22 t28.5 63l119 431q12 46 12 63q0 18 -14 28q-12 8 -57 14v16zM306 593l-63 -227q31 -5 51 -5q89 0 139 40t50 110q0 52 -31 82t-89 30q-49 0 -57 -30z" />
+<glyph unicode="&#x159;" horiz-adv-x="389" d="M426 663l-162 -169h-48l-95 169h38l89 -105l141 105h37zM176 223l16 35q34 75 94 138q43 45 79 45q21 0 34 -14t13 -37t-12.5 -38.5t-34.5 -15.5q-19 0 -35 26q-8 14 -16 14q-27 0 -82 -94q-34 -58 -54.5 -109.5t-56.5 -172.5h-76l81 292q16 59 16 82q0 26 -38 26 q-8 0 -31 -3v17l155 27l3 -2z" />
+<glyph unicode="&#x15a;" d="M236 706l162 160q10 10 25 10t25.5 -10.5t10.5 -25.5q0 -18 -17 -28l-171 -106h-35zM508 667l-40 -200l-18 3q0 83 -25 123t-94 40q-52 0 -82 -26.5t-30 -73.5q0 -38 16 -63.5t83 -92.5q67 -68 90 -109t23 -91q0 -85 -57.5 -140t-144.5 -55q-38 0 -104 23q-32 12 -47 12 q-33 0 -43 -32h-18l34 224l20 -2q-2 -9 -2 -23q0 -73 40.5 -120t103.5 -47q58 0 94.5 35.5t36.5 92.5q0 33 -13 59.5t-47 63.5l-39 42q-3 3 -17 18.5t-22 23.5q-45 48 -60 78.5t-15 71.5q0 76 51.5 120t126.5 44q52 0 85 -14q29 -11 46 -11t26 5t19 21h23z" />
+<glyph unicode="&#x15b;" horiz-adv-x="389" d="M180 494l162 160q10 10 25 10t25.5 -10.5t10.5 -25.5q0 -18 -17 -28l-171 -106h-35zM366 442l-20 -140h-16q-14 116 -89 116q-27 0 -43 -15t-16 -42q0 -38 54 -102q68 -79 68 -136q0 -61 -40.5 -97.5t-103.5 -36.5q-29 0 -55 10q-21 9 -44 9q-20 0 -29 -21h-16l20 159h16 q20 -136 100 -136q36 0 56 20t20 57q0 45 -56 115q-63 79 -63 131q0 50 33 79t88 29q20 0 56 -10q22 -7 36 -7q20 0 30 18h14z" />
+<glyph unicode="&#x15c;" d="M484 708h-36l-82 104l-137 -104h-39l157 169h49zM508 667l-40 -200l-18 3q0 83 -25 123t-94 40q-52 0 -82 -26.5t-30 -73.5q0 -38 16 -63.5t83 -92.5q67 -68 90 -109t23 -91q0 -85 -57.5 -140t-144.5 -55q-38 0 -104 23q-32 12 -47 12q-33 0 -43 -32h-18l34 224l20 -2 q-2 -9 -2 -23q0 -73 40.5 -120t103.5 -47q58 0 94.5 35.5t36.5 92.5q0 33 -13 59.5t-47 63.5l-39 42q-3 3 -17 18.5t-22 23.5q-45 48 -60 78.5t-15 71.5q0 76 51.5 120t126.5 44q52 0 85 -14q29 -11 46 -11t26 5t19 21h23z" />
+<glyph unicode="&#x15d;" horiz-adv-x="389" d="M385 492h-36l-82 104l-137 -104h-39l157 169h49zM366 442l-20 -140h-16q-14 116 -89 116q-27 0 -43 -15t-16 -42q0 -38 54 -102q68 -79 68 -136q0 -61 -40.5 -97.5t-103.5 -36.5q-29 0 -55 10q-21 9 -44 9q-20 0 -29 -21h-16l20 159h16q20 -136 100 -136q36 0 56 20 t20 57q0 45 -56 115q-63 79 -63 131q0 50 33 79t88 29q20 0 56 -10q22 -7 36 -7q20 0 30 18h14z" />
+<glyph unicode="&#x15e;" d="M157 -96l50 79q-29 4 -82 22q-32 12 -47 12q-33 0 -43 -32h-18l34 224l20 -2q-2 -9 -2 -23q0 -73 40.5 -120t103.5 -47q58 0 94.5 35.5t36.5 92.5q0 33 -13 59.5t-47 63.5l-39 42q-3 3 -17 18.5t-22 23.5q-45 48 -60 78.5t-15 71.5q0 76 51.5 120t126.5 44q52 0 85 -14 q29 -11 46 -11t26 5t19 21h23l-40 -200l-18 3q0 83 -25 123t-94 40q-52 0 -82 -26.5t-30 -73.5q0 -38 16 -63.5t83 -92.5q67 -68 90 -109t23 -91q0 -81 -53 -135t-135 -59l-32 -49q15 3 25 3q38 0 60 -18.5t22 -49.5q0 -38 -33.5 -62t-85.5 -24q-38 0 -93 21l17 29 q41 -15 68 -15q53 0 53 41q0 19 -13 31.5t-33 12.5q-12 0 -32 -7z" />
+<glyph unicode="&#x15f;" horiz-adv-x="389" d="M80 -96l54 87q-11 1 -29 8q-21 9 -44 9q-20 0 -29 -21h-16l20 159h16q20 -136 100 -136q36 0 56 20t20 57q0 45 -56 115q-63 79 -63 131q0 50 33 79t88 29q20 0 56 -10q22 -7 36 -7q20 0 30 18h14l-20 -140h-16q-14 116 -89 116q-27 0 -43 -15t-16 -42q0 -38 54 -102 q68 -79 68 -136q0 -58 -37 -94t-96 -40l-37 -55q15 3 25 3q38 0 60 -18.5t22 -49.5q0 -38 -33.5 -62t-85.5 -24q-38 0 -93 21l17 29q41 -15 68 -15q53 0 53 41q0 19 -13 31.5t-33 12.5q-12 0 -32 -7z" />
+<glyph unicode="&#x160;" d="M532 875l-162 -169h-48l-95 169h38l89 -105l141 105h37zM508 667l-40 -200l-18 3q0 83 -25 123t-94 40q-52 0 -82 -26.5t-30 -73.5q0 -38 16 -63.5t83 -92.5q67 -68 90 -109t23 -91q0 -85 -57.5 -140t-144.5 -55q-38 0 -104 23q-32 12 -47 12q-33 0 -43 -32h-18l34 224 l20 -2q-2 -9 -2 -23q0 -73 40.5 -120t103.5 -47q58 0 94.5 35.5t36.5 92.5q0 33 -13 59.5t-47 63.5l-39 42q-3 3 -17 18.5t-22 23.5q-45 48 -60 78.5t-15 71.5q0 76 51.5 120t126.5 44q52 0 85 -14q29 -11 46 -11t26 5t19 21h23z" />
+<glyph unicode="&#x161;" horiz-adv-x="389" d="M426 663l-162 -169h-48l-95 169h38l89 -105l141 105h37zM366 442l-20 -140h-16q-14 116 -89 116q-27 0 -43 -15t-16 -42q0 -38 54 -102q68 -79 68 -136q0 -61 -40.5 -97.5t-103.5 -36.5q-29 0 -55 10q-21 9 -44 9q-20 0 -29 -21h-16l20 159h16q20 -136 100 -136 q36 0 56 20t20 57q0 45 -56 115q-63 79 -63 131q0 50 33 79t88 29q20 0 56 -10q22 -7 36 -7q20 0 30 18h14z" />
+<glyph unicode="&#x162;" horiz-adv-x="556" d="M179 0h-114v16q52 5 74 20t33 55l143 527q-119 0 -160.5 -21.5t-77.5 -102.5l-18 4l42 155h532l-44 -164l-17 2q3 25 3 46q0 81 -101 81h-58l-137 -490q-14 -49 -14 -66q0 -23 11 -31.5t42 -11.5l35 -3v-16h-136l-44 -66q15 3 25 3q38 0 60 -18.5t22 -49.5 q0 -38 -33.5 -62t-85.5 -24q-38 0 -93 21l17 29q41 -15 68 -15q53 0 53 41q0 19 -13 31.5t-33 12.5q-12 0 -32 -7l-9 8z" />
+<glyph unicode="&#x163;" horiz-adv-x="278" d="M111 0l-44 -66q15 3 25 3q38 0 60 -18.5t22 -49.5q0 -38 -33.5 -62t-85.5 -24q-38 0 -93 21l17 29q41 -15 68 -15q53 0 53 41q0 19 -13 31.5t-33 12.5q-12 0 -32 -7l-9 8l60 96h38zM296 428l-5 -32h-84l-87 -328q-2 -8 -2 -14q0 -16 15 -16q12 0 28 15.5t53 63.5l13 -7 q-46 -70 -75.5 -95.5t-67.5 -25.5q-46 0 -46 37q0 10 16 74l78 296h-75l-1 6q0 18 33 25q25 6 66 38.5t67 71.5q6 9 14 9q9 0 9 -8q0 -5 -1 -7l-28 -103h80z" />
+<glyph unicode="&#x164;" horiz-adv-x="556" d="M565 875l-162 -169h-48l-95 169h38l89 -105l141 105h37zM633 653l-44 -164l-17 2q3 25 3 46q0 81 -101 81h-58l-137 -490q-14 -49 -14 -66q0 -23 11 -31.5t42 -11.5l35 -3v-16h-288v16q52 5 74 20t33 55l143 527q-119 0 -160.5 -21.5t-77.5 -102.5l-18 4l42 155h532z" />
+<glyph unicode="&#x165;" horiz-adv-x="278" d="M323 463l-9 17q75 50 75 88q0 14 -20 33q-25 22 -25 46q0 20 14.5 33t36.5 13q25 0 41.5 -20.5t16.5 -50.5q0 -86 -130 -159zM296 428l-5 -32h-84l-87 -328q-2 -8 -2 -14q0 -16 15 -16q12 0 28 15.5t53 63.5l13 -7q-46 -70 -75.5 -95.5t-67.5 -25.5q-46 0 -46 37 q0 10 16 74l78 296h-75l-1 6q0 18 33 25q25 6 66 38.5t67 71.5q6 9 14 9q9 0 9 -8q0 -5 -1 -7l-28 -103h80z" />
+<glyph unicode="&#x166;" horiz-adv-x="556" d="M633 653l-44 -164l-17 2q3 25 3 46q0 81 -101 81h-58l-76 -271h130l-12 -44h-130l-49 -175q-14 -49 -14 -66q0 -23 11 -31.5t42 -11.5l35 -3v-16h-288v16q52 5 74 20t33 55l57 212h-115l12 44h115l74 271q-119 0 -160.5 -21.5t-77.5 -102.5l-18 4l42 155h532z" />
+<glyph unicode="&#x167;" horiz-adv-x="278" d="M296 428l-5 -32h-84l-36 -134h98l-12 -44h-97l-40 -150q-2 -8 -2 -14q0 -16 15 -16q12 0 28 15.5t53 63.5l13 -7q-46 -70 -75.5 -95.5t-67.5 -25.5q-46 0 -46 37q0 10 16 74l31 118h-57l12 44h56l36 134h-75l-1 6q0 18 33 25q25 6 66 38.5t67 71.5q6 9 14 9q9 0 9 -8 q0 -5 -1 -7l-28 -103h80z" />
+<glyph unicode="&#x168;" horiz-adv-x="722" d="M625 836h28q-22 -104 -95 -104q-18 0 -57 15q-71 29 -95 29q-36 0 -51 -47h-29q15 58 38 82t62 24q32 0 86 -24q41 -19 62 -19q20 0 31.5 9.5t19.5 34.5zM765 653v-16q-21 -5 -31.5 -9.5t-20.5 -11t-17.5 -24.5t-14.5 -39t-20 -65l-83 -285q-34 -116 -97 -169 q-60 -52 -158 -52t-159.5 46t-61.5 118q0 55 44 216l52 189q9 32 9 45q0 20 -17.5 30t-62.5 11v16h272v-16q-51 -5 -70.5 -22t-33.5 -69l-63 -226q-40 -141 -40 -179q0 -53 39.5 -85.5t98.5 -32.5q84 0 135 54t85 178l64 233q23 85 23 103q0 22 -15 32t-55 14v16h198z" />
+<glyph unicode="&#x169;" d="M444 624h28q-22 -104 -95 -104q-18 0 -57 15q-71 29 -95 29q-36 0 -51 -47h-29q15 58 38 82t62 24q32 0 86 -24q41 -19 62 -19q20 0 31.5 9.5t19.5 34.5zM461 119l14 -9q-48 -73 -75 -96t-63 -23q-48 0 -48 48q0 45 45 197q-89 -146 -137.5 -196.5t-101.5 -50.5t-53 53 q0 18 27 128l35 139q14 58 14 67q0 12 -11 18t-50 6v14q69 8 150 27l4 -3l-89 -355q-3 -9 -3 -16q0 -25 20 -25q45 0 142 147q33 50 51.5 91.5t58.5 151.5h74l-79 -299q-19 -72 -19 -78q0 -17 11 -17q12 0 29 16t54 65z" />
+<glyph unicode="&#x16a;" horiz-adv-x="722" d="M651 757l-11 -51h-301l11 51h301zM765 653v-16q-21 -5 -31.5 -9.5t-20.5 -11t-17.5 -24.5t-14.5 -39t-20 -65l-83 -285q-34 -116 -97 -169q-60 -52 -158 -52t-159.5 46t-61.5 118q0 55 44 216l52 189q9 32 9 45q0 20 -17.5 30t-62.5 11v16h272v-16q-51 -5 -70.5 -22 t-33.5 -69l-63 -226q-40 -141 -40 -179q0 -53 39.5 -85.5t98.5 -32.5q84 0 135 54t85 178l64 233q23 85 23 103q0 22 -15 32t-55 14v16h198z" />
+<glyph unicode="&#x16b;" d="M456 543l-11 -51h-301l11 51h301zM461 119l14 -9q-48 -73 -75 -96t-63 -23q-48 0 -48 48q0 45 45 197q-89 -146 -137.5 -196.5t-101.5 -50.5t-53 53q0 18 27 128l35 139q14 58 14 67q0 12 -11 18t-50 6v14q69 8 150 27l4 -3l-89 -355q-3 -9 -3 -16q0 -25 20 -25 q45 0 142 147q33 50 51.5 91.5t58.5 151.5h74l-79 -299q-19 -72 -19 -78q0 -17 11 -17q12 0 29 16t54 65z" />
+<glyph unicode="&#x16c;" horiz-adv-x="722" d="M641 866h29q-11 -67 -60 -112.5t-113 -45.5q-67 0 -97.5 39.5t-30.5 118.5h29q8 -99 107 -99q46 0 83 26.5t53 72.5zM765 653v-16q-21 -5 -31.5 -9.5t-20.5 -11t-17.5 -24.5t-14.5 -39t-20 -65l-83 -285q-34 -116 -97 -169q-60 -52 -158 -52t-159.5 46t-61.5 118 q0 55 44 216l52 189q9 32 9 45q0 20 -17.5 30t-62.5 11v16h272v-16q-51 -5 -70.5 -22t-33.5 -69l-63 -226q-40 -141 -40 -179q0 -53 39.5 -85.5t98.5 -32.5q84 0 135 54t85 178l64 233q23 85 23 103q0 22 -15 32t-55 14v16h198z" />
+<glyph unicode="&#x16d;" d="M451 650h29q-11 -67 -60 -112.5t-113 -45.5q-67 0 -97.5 39.5t-30.5 118.5h29q8 -99 107 -99q46 0 83 26.5t53 72.5zM461 119l14 -9q-48 -73 -75 -96t-63 -23q-48 0 -48 48q0 45 45 197q-89 -146 -137.5 -196.5t-101.5 -50.5t-53 53q0 18 27 128l35 139q14 58 14 67 q0 12 -11 18t-50 6v14q69 8 150 27l4 -3l-89 -355q-3 -9 -3 -16q0 -25 20 -25q45 0 142 147q33 50 51.5 91.5t58.5 151.5h74l-79 -299q-19 -72 -19 -78q0 -17 11 -17q12 0 29 16t54 65z" />
+<glyph unicode="&#x16e;" horiz-adv-x="722" d="M765 653v-16q-21 -5 -31.5 -9.5t-20.5 -11t-17.5 -24.5t-14.5 -39t-20 -65l-83 -285q-34 -116 -97 -169q-60 -52 -158 -52t-159.5 46t-61.5 118q0 55 44 216l52 189q9 32 9 45q0 20 -17.5 30t-62.5 11v16h272v-16q-51 -5 -70.5 -22t-33.5 -69l-63 -226q-40 -141 -40 -179 q0 -53 39.5 -85.5t98.5 -32.5q84 0 135 54t85 178l64 233q23 85 23 103q0 22 -15 32t-55 14v16h198zM590 807q0 -41 -29.5 -70t-70.5 -29q-43 0 -71.5 29t-28.5 71q0 40 29 69.5t70 29.5q42 0 71.5 -29.5t29.5 -70.5zM556 807q0 28 -19.5 47t-47.5 19q-26 0 -45.5 -19.5 t-19.5 -45.5q0 -28 18.5 -47t46.5 -19q29 0 48 18.5t19 46.5z" />
+<glyph unicode="&#x16f;" d="M461 119l14 -9q-48 -73 -75 -96t-63 -23q-48 0 -48 48q0 45 45 197q-89 -146 -137.5 -196.5t-101.5 -50.5t-53 53q0 18 27 128l35 139q14 58 14 67q0 12 -11 18t-50 6v14q69 8 150 27l4 -3l-89 -355q-3 -9 -3 -16q0 -25 20 -25q45 0 142 147q33 50 51.5 91.5t58.5 151.5 h74l-79 -299q-19 -72 -19 -78q0 -17 11 -17q12 0 29 16t54 65zM410 591q0 -41 -29.5 -70t-70.5 -29q-43 0 -71.5 29t-28.5 71q0 40 29 69.5t70 29.5q42 0 71.5 -29.5t29.5 -70.5zM376 591q0 28 -19.5 47t-47.5 19q-26 0 -45.5 -19.5t-19.5 -45.5q0 -28 18.5 -47t46.5 -19 q29 0 48 18.5t19 46.5z" />
+<glyph unicode="&#x170;" horiz-adv-x="722" d="M461 706l160 160q10 10 27 10q15 0 25.5 -10.5t10.5 -25.5q0 -20 -17 -30l-171 -104h-35zM291 706l160 160q10 10 27 10q15 0 25.5 -10.5t10.5 -25.5q0 -20 -17 -30l-169 -104h-37zM765 653v-16q-21 -5 -31.5 -9.5t-20.5 -11t-17.5 -24.5t-14.5 -39t-20 -65l-83 -285 q-34 -116 -97 -169q-60 -52 -158 -52t-159.5 46t-61.5 118q0 55 44 216l52 189q9 32 9 45q0 20 -17.5 30t-62.5 11v16h272v-16q-51 -5 -70.5 -22t-33.5 -69l-63 -226q-40 -141 -40 -179q0 -53 39.5 -85.5t98.5 -32.5q84 0 135 54t85 178l64 233q23 85 23 103q0 22 -15 32 t-55 14v16h198z" />
+<glyph unicode="&#x171;" d="M288 494l160 160q10 10 27 10q15 0 25.5 -10.5t10.5 -25.5q0 -20 -17 -30l-171 -104h-35zM118 494l160 160q10 10 27 10q15 0 25.5 -10.5t10.5 -25.5q0 -20 -17 -30l-169 -104h-37zM461 119l14 -9q-48 -73 -75 -96t-63 -23q-48 0 -48 48q0 45 45 197 q-89 -146 -137.5 -196.5t-101.5 -50.5t-53 53q0 18 27 128l35 139q14 58 14 67q0 12 -11 18t-50 6v14q69 8 150 27l4 -3l-89 -355q-3 -9 -3 -16q0 -25 20 -25q45 0 142 147q33 50 51.5 91.5t58.5 151.5h74l-79 -299q-19 -72 -19 -78q0 -17 11 -17q12 0 29 16t54 65z" />
+<glyph unicode="&#x172;" horiz-adv-x="722" d="M548 -74l17 -18q-52 -77 -125 -77q-40 0 -67.5 26.5t-27.5 68.5q0 31 15 58q-24 -2 -37 -2q-98 0 -159.5 46t-61.5 118q0 55 44 216l52 189q9 32 9 45q0 20 -17.5 30t-62.5 11v16h272v-16q-51 -5 -70.5 -22t-33.5 -69l-63 -226q-40 -141 -40 -179q0 -53 39.5 -85.5 t98.5 -32.5q84 0 135 54t85 178l64 233q23 85 23 103q0 22 -15 32t-55 14v16h198v-16q-21 -5 -31.5 -9.5t-20.5 -11t-17.5 -24.5t-14.5 -39t-20 -65l-83 -285q-34 -116 -97 -169q-31 -26 -66 -38q-9 -26 -9 -49t16.5 -38t42.5 -15q47 0 83 32z" />
+<glyph unicode="&#x173;" d="M338 -9h-1q-48 0 -48 48q0 45 45 197q-89 -146 -137.5 -196.5t-101.5 -50.5t-53 53q0 18 27 128l35 139q14 58 14 67q0 12 -11 18t-50 6v14q69 8 150 27l4 -3l-89 -355q-3 -9 -3 -16q0 -25 20 -25q45 0 142 147q33 50 51.5 91.5t58.5 151.5h74l-79 -299q-19 -72 -19 -78 q0 -17 11 -17q12 0 29 16t54 65l14 -9q-51 -78 -82 -102q-14 -29 -14 -61q0 -23 16.5 -38t42.5 -15q47 0 83 32l17 -18q-52 -77 -125 -77q-40 0 -67.5 26.5t-27.5 68.5q0 36 20 65z" />
+<glyph unicode="&#x174;" horiz-adv-x="833" d="M643 708h-36l-82 104l-137 -104h-39l157 169h49zM906 653v-16q-29 -9 -42.5 -22t-34.5 -53l-301 -580h-20l-50 453h-5l-222 -453h-19l-61 514q-8 70 -13 92.5t-16 33.5q-10 10 -51 15v16h235v-16q-41 -4 -56.5 -14t-15.5 -37q0 -13 1 -20l44 -404l172 348l-8 65 q-4 38 -17.5 49t-57.5 13v16h236v-16q-39 -4 -53.5 -14t-14.5 -34q0 -3 1 -8.5t1 -6.5l40 -412l188 365q23 44 23 68q0 41 -67 42v16h184z" />
+<glyph unicode="&#x175;" horiz-adv-x="667" d="M537 492h-36l-82 104l-137 -104h-39l157 169h49zM403 426l32 -352q99 123 132 175.5t33 84.5q0 14 -22 35q-21 20 -21 41q0 12 11.5 21.5t27.5 9.5q22 0 37 -16t15 -40q0 -91 -212 -349l-9 -11q-35 -43 -45 -43q-8 0 -11 35l-29 310l-89 -152q-23 -38 -55 -99 q-49 -94 -64 -94q-7 0 -9 9t-4 38l-4 91q-8 164 -27 242q-7 27 -15.5 34.5t-31.5 7.5h-28v13q79 13 95 17q5 1 11.5 3t10.5 3t7 1q8 0 11 -5t8 -29q25 -120 32 -281l192 304q6 10 13 10q8 0 8 -14z" />
+<glyph unicode="&#x176;" horiz-adv-x="556" d="M537 708h-36l-82 104l-137 -104h-39l157 169h49zM633 653v-16q-21 -7 -32 -17.5t-38 -43.5l-219 -270l-36 -123q-30 -103 -30 -127q0 -19 11.5 -27t41.5 -10l36 -3v-16h-289v16q51 3 72.5 18.5t34.5 62.5l59 205l-76 267q-11 40 -23.5 51t-53.5 17v16h239v-16 q-44 -4 -58 -11.5t-14 -24.5t36 -144l31 -110l39 46q149 176 149 213q0 24 -40 28l-29 3v16h189z" />
+<glyph unicode="&#x177;" horiz-adv-x="444" d="M398 492h-36l-82 104l-137 -104h-39l157 169h49zM243 186l21 -110q67 110 94.5 167.5t27.5 89.5q0 16 -26 32q-26 17 -26 39q0 16 11.5 26.5t28.5 10.5q22 0 37 -16t15 -39q0 -87 -131 -305q-78 -129 -151.5 -208t-116.5 -79q-23 0 -37 12t-14 31q0 17 11.5 28.5 t27.5 11.5q19 0 34 -14t27 -14q18 0 48 33q13 13 38.5 46.5t32.5 44.5q10 20 10 35q0 30 -31 155.5t-51 176.5q-14 37 -30.5 50.5t-46.5 13.5q-16 0 -31 -4v17q22 4 32 6q41 8 107 18h4q11 0 41.5 -93t43.5 -162z" />
+<glyph unicode="&#x178;" horiz-adv-x="556" d="M339 769q0 -20 -14.5 -34.5t-34.5 -14.5q-21 0 -35 14.5t-14 35.5q0 20 14.5 34t35.5 14q19 0 33.5 -15t14.5 -34zM539 769q0 -20 -14.5 -34.5t-34.5 -14.5q-21 0 -35 14.5t-14 35.5q0 20 14.5 34t35.5 14q19 0 33.5 -15t14.5 -34zM633 653v-16q-21 -7 -32 -17.5 t-38 -43.5l-219 -270l-36 -123q-30 -103 -30 -127q0 -19 11.5 -27t41.5 -10l36 -3v-16h-289v16q51 3 72.5 18.5t34.5 62.5l59 205l-76 267q-11 40 -23.5 51t-53.5 17v16h239v-16q-44 -4 -58 -11.5t-14 -24.5t36 -144l31 -110l39 46q149 176 149 213q0 24 -40 28l-29 3v16 h189z" />
+<glyph unicode="&#x179;" horiz-adv-x="556" d="M297 706l162 160q10 10 25 10t25.5 -10.5t10.5 -25.5q0 -18 -17 -28l-171 -106h-35zM606 639l-483 -603h161q71 0 108.5 6t64.5 26q41 30 77 104l19 -3l-54 -169h-505v14l479 603h-171q-102 0 -142 -27q-22 -15 -32.5 -30.5t-33.5 -58.5l-19 5l45 147h486v-14z" />
+<glyph unicode="&#x17a;" horiz-adv-x="389" d="M167 494l162 160q10 10 25 10t25.5 -10.5t10.5 -25.5q0 -18 -17 -28l-171 -106h-35zM380 417l-289 -344q46 -10 68.5 -25t51.5 -58q34 -50 70 -50q27 0 27 15q0 5 -5 15q-8 16 -8 28q1 13 11 23.5t22 10.5q16 0 25.5 -10t9.5 -27q0 -31 -26 -53.5t-67 -22.5 q-42 0 -113 44q-68 42 -105 42q-23 0 -45 -18l-9 9l310 372h-136q-40 0 -58 -11.5t-33 -48.5l-16 4l32 116h283v-11z" />
+<glyph unicode="&#x17b;" horiz-adv-x="556" d="M399 769q0 -20 -14.5 -34.5t-34.5 -14.5q-21 0 -35 14.5t-14 35.5q0 20 14.5 34t35.5 14q19 0 33.5 -15t14.5 -34zM606 639l-483 -603h161q71 0 108.5 6t64.5 26q41 30 77 104l19 -3l-54 -169h-505v14l479 603h-171q-102 0 -142 -27q-22 -15 -32.5 -30.5t-33.5 -58.5 l-19 5l45 147h486v-14z" />
+<glyph unicode="&#x17c;" horiz-adv-x="389" d="M289 557q0 -20 -14.5 -34.5t-34.5 -14.5q-21 0 -35 14.5t-14 35.5q0 20 14.5 34t35.5 14q19 0 33.5 -15t14.5 -34zM380 417l-289 -344q46 -10 68.5 -25t51.5 -58q34 -50 70 -50q27 0 27 15q0 5 -5 15q-8 16 -8 28q1 13 11 23.5t22 10.5q16 0 25.5 -10t9.5 -27 q0 -31 -26 -53.5t-67 -22.5q-42 0 -113 44q-68 42 -105 42q-23 0 -45 -18l-9 9l310 372h-136q-40 0 -58 -11.5t-33 -48.5l-16 4l32 116h283v-11z" />
+<glyph unicode="&#x17d;" horiz-adv-x="556" d="M513 875l-162 -169h-48l-95 169h38l89 -105l141 105h37zM606 639l-483 -603h161q71 0 108.5 6t64.5 26q41 30 77 104l19 -3l-54 -169h-505v14l479 603h-171q-102 0 -142 -27q-22 -15 -32.5 -30.5t-33.5 -58.5l-19 5l45 147h486v-14z" />
+<glyph unicode="&#x17e;" horiz-adv-x="389" d="M426 663l-162 -169h-48l-95 169h38l89 -105l141 105h37zM380 417l-289 -344q46 -10 68.5 -25t51.5 -58q34 -50 70 -50q27 0 27 15q0 5 -5 15q-8 16 -8 28q1 13 11 23.5t22 10.5q16 0 25.5 -10t9.5 -27q0 -31 -26 -53.5t-67 -22.5q-42 0 -113 44q-68 42 -105 42 q-23 0 -45 -18l-9 9l310 372h-136q-40 0 -58 -11.5t-33 -48.5l-16 4l32 116h283v-11z" />
+<glyph unicode="&#x17f;" horiz-adv-x="383" d="M164 450h27q12 57 28 94q63 139 190 139q40 0 72 -15.5t32 -47.5q0 -15 -12 -27.5t-28 -12.5q-28 0 -45 33q-24 42 -53 42q-57 0 -76 -91l-100 -476q-3 -16 -3 -29q0 -20 9 -29q13 -13 71 -15l-3 -15h-260l3 15q50 3 69 16q21 15 30 59l69 328h-27z" />
+<glyph unicode="&#x180;" d="M223 509l-60 -219q51 83 95.5 117t98.5 34q52 0 84 -32t32 -88q0 -77 -47 -155t-122.5 -127.5t-150.5 -49.5q-46 0 -88 16t-42 37v6l125 461h-123l13 31h118l9 31q9 31 9 47t-9.5 19.5t-54.5 5.5v17q75 9 153 23l5 -5q-3 -11 -10 -40t-11 -42l-16 -56h162l-8 -31h-162z M388 306q0 86 -70 86q-69 0 -137 -115q-32 -54 -52 -119.5t-20 -111.5q0 -34 46 -34q66 0 123 59q46 48 78 114.5t32 120.5z" />
+<glyph unicode="&#x188;" d="M350 107l16 -10q-46 -58 -89.5 -83t-99.5 -25q-71 0 -109 39t-38 115q0 67 34 129.5t89 107.5q77 61 167 61q28 0 49 -9q15 53 51.5 84.5t86.5 31.5q27 0 48.5 -16t21.5 -42q0 -28 -25 -28q-14 0 -22 9.5t-11 21t-11.5 21t-22.5 9.5q-41 0 -61 -83l-10 -43q11 -16 11 -37 q0 -20 -14 -34t-34 -14t-29.5 11.5t-9.5 28.5q0 9 7.5 23.5t7.5 24.5q0 20 -37 20q-63 0 -109 -48q-91 -96 -91 -233q0 -54 23 -84t66 -30q39 0 71 19t74 63z" />
+<glyph unicode="&#x190;" horiz-adv-x="667" d="M563 168l34 -9q-15 -54 -65.5 -93t-110.5 -55.5t-122 -16.5q-59 0 -108.5 12t-87 44.5t-37.5 82.5q0 74 56.5 140t130.5 79q-49 26 -72 48.5t-23 60.5q0 55 30 99t77.5 70t100 40t102.5 14q54 0 106 -16q37 -11 67 -41.5t30 -63.5q0 -23 -13 -41.5t-34 -18.5 q-45 0 -64 81q-7 26 -38 41t-54 15q-84 0 -145 -52.5t-61 -140.5q0 -37 20 -53.5t75 -16.5q9 0 50.5 5.5t52.5 5.5q16 0 31.5 -7.5t15.5 -21.5q0 -18 -26.5 -30t-47.5 -12q-8 0 -41 2.5t-39 2.5q-74 0 -128.5 -49.5t-54.5 -125.5q0 -93 165 -93q89 0 136 21.5t92 92.5z" />
+<glyph unicode="&#x192;" horiz-adv-x="472" d="M100 437h107q69 269 210 269q32 0 54.5 -17t22.5 -42q0 -21 -15 -37.5t-35 -16.5q-14 0 -24.5 9t-10.5 21t8.5 24.5t8.5 17.5q0 12 -19 12q-27 0 -44 -18q-35 -39 -58 -146q-2 -9 -7 -35l-8 -41h126l-6 -31h-128q-21 -118 -66.5 -271t-71.5 -197q-55 -97 -132 -97 q-32 0 -53 16.5t-21 42.5q0 24 15 39.5t38 15.5q14 0 23 -11t9 -25q0 -19 -9.5 -30t-9.5 -12q0 -12 18 -12q68 0 101 174l27 158q19 99 47 209h-103z" />
+<glyph unicode="&#x195;" horiz-adv-x="672" d="M444 343l-69 -247q-9 -31 -9 -38q0 -20 17 -20q62 0 116.5 43t84 105t29.5 122q0 16 -5 29q-2 5 -25.5 26.5t-23.5 43.5q0 16 11 25t25 9q22 0 37 -13.5t20 -36.5q2 -9 2 -30q0 -63 -21 -128.5t-58 -119.5t-94 -88.5t-122 -34.5q-16 0 -25 1t-21.5 4.5t-18.5 13t-6 24.5 q0 17 20 92l55 207q7 28 7 33q0 25 -28 25q-27 0 -69.5 -40t-82.5 -100q-31 -48 -49 -93.5t-47 -156.5h-75l146 554q13 50 13 62t-13 18.5t-28 6.5h-27v15q76 9 157 27l7 -6l-121 -447q130 211 230 211q33 0 49 -18.5t16 -48.5q0 -15 -4 -31z" />
+<glyph unicode="&#x199;" d="M14 0l124 465q24 91 95 154.5t164 63.5q38 0 65.5 -15t27.5 -41q0 -16 -12.5 -27t-27.5 -11q-22 0 -47 30t-42 30q-38 0 -79.5 -37t-55.5 -91l-79 -300l43 33q143 110 143 140q0 18 -37 18h-14v16h179v-16q-36 -2 -76 -29.5t-149 -124.5l37 -88q55 -129 81 -129 q21 0 45 42q5 8 15 26l15 -11q-35 -63 -58 -86t-53 -23q-22 0 -39.5 17.5t-41.5 64.5q-30 58 -60 141l-40 -32l-48 -180h-75z" />
+<glyph unicode="&#x19a;" horiz-adv-x="278" d="M279 678l-79 -300h78l-8 -31h-78l-66 -254q-8 -29 -8 -43q0 -18 17 -18q27 0 67 57l25 35l14 -10q-45 -71 -77.5 -98t-73.5 -27q-49 0 -49 56q0 17 4 30l71 272h-74l8 31h74l58 221q3 10 3 19q0 22 -49 22h-18v16q70 8 155 27z" />
+<glyph unicode="&#x19b;" horiz-adv-x="490" d="M478 575l-102 -75l58 -500h-44l-34 333l-232 -333h-94l245 341q49 67 61 91q0 28 -1 39l-172 -127v54l165 119q-17 67 -45 67q-10 0 -32.5 -10t-40.5 -10q-20 0 -34 12t-14 34q0 25 19 41.5t51 16.5q105 0 136 -124l110 85v-54z" />
+<glyph unicode="&#x19e;" d="M213 439l-67 -218q74 118 128 169t103 51q31 0 48 -16.5t17 -44.5q0 -25 -10 -60l-153 -553h-81l149 515q17 60 17 79q0 13 -7.5 20.5t-19.5 7.5q-29 0 -64 -34t-84 -107q-33 -49 -48.5 -88t-51.5 -160h-75l96 350q2 10 2 17q0 15 -13.5 20.5t-51.5 6.5v16q39 8 87 16.5 t75 14.5z" />
+<glyph unicode="&#x1a0;" horiz-adv-x="722" d="M783 635q0 -55 -66 -68q-24 -3 -33 -3q-11 0 -20 2q35 -61 35 -148q0 -107 -57.5 -205t-149.5 -160q-105 -71 -214 -71q-99 0 -158.5 62t-59.5 172q0 91 49 187.5t128 165.5q112 97 239 97q105 0 164 -67q21 -18 47 -18q17 0 26.5 6t9.5 15q0 1 -8.5 6.5t-17.5 16.5 t-9 26t13.5 27.5t32.5 12.5q21 0 35 -15t14 -41zM594 481q0 71 -34.5 111.5t-94.5 40.5q-99 0 -186 -117q-53 -72 -83.5 -163t-30.5 -169q0 -82 33.5 -125.5t96.5 -43.5q92 0 170 95q59 74 94 181t35 190z" />
+<glyph unicode="&#x1a1;" horiz-adv-x="534" d="M583 411q0 -55 -66 -68q-24 -3 -34 -3t-20 2q5 -22 5 -41q0 -57 -28.5 -118.5t-77.5 -110.5q-83 -83 -188 -83q-70 0 -108.5 36.5t-38.5 102.5q0 83 50.5 162t129.5 121q56 30 120 30q45 0 78.5 -20t49.5 -57q15 -7 32 -7q36 0 36 22l-9 6q-8 6 -17 17t-9 25 q0 15 13.5 27.5t32.5 12.5q21 0 35 -15t14 -41zM384 326q0 45 -19 69.5t-52 24.5q-67 0 -128 -91q-74 -113 -74 -228q0 -44 21 -67.5t57 -23.5q61 0 121 83q34 46 54 110.5t20 122.5z" />
+<glyph unicode="&#x1a5;" horiz-adv-x="504" d="M237 535l-51 -207q75 113 171 113q55 0 85 -33t30 -92q0 -123 -93.5 -225t-203.5 -102q-36 0 -69 17l-36 -135q-4 -16 -4 -31q0 -16 13.5 -22.5t48.5 -6.5v-16h-203v16q32 1 45.5 14t22.5 49l148 558q11 40 21 70.5t27.5 63.5t38 54t51.5 35t68 14q38 0 65.5 -15 t27.5 -41q0 -16 -12.5 -27t-27.5 -11q-22 0 -47 30t-41 30q-50 0 -75 -100zM382 313q0 44 -14.5 64.5t-47.5 20.5q-39 0 -78 -34t-57 -80q-22 -57 -43.5 -135t-21.5 -103q0 -17 13.5 -27.5t34.5 -10.5q78 0 145 95q69 96 69 210z" />
+<glyph unicode="&#x1aa;" horiz-adv-x="340" d="M65 45l158 442q-35 -24 -75 -24q-38 0 -61.5 24t-23.5 60q0 52 44.5 94.5t96.5 42.5q57 1 86 -36.5t29 -94.5q0 -37 -8 -59l-184 -531q-28 -82 -28 -121q0 -41 36 -41q19 0 44 30t47 30q16 0 28 -11t12 -27q0 -29 -29.5 -42.5t-62.5 -13.5q-67 0 -105 34.5t-38 91.5 q0 58 34 152zM247 597q0 53 -46 53q-40 0 -72 -27t-32 -69q0 -25 17 -41t43 -16q23 0 46 13.5t37 34.5q7 40 7 52z" />
+<glyph unicode="&#x1ab;" horiz-adv-x="278" d="M296 428l-5 -32h-84l-87 -328q-2 -8 -2 -14q0 -16 15 -16q12 0 28 15.5t53 63.5l13 -7q-35 -87 -47 -133l-29 -102q-27 -93 -112 -93q-38 0 -65.5 15t-27.5 41q0 16 12.5 27t27.5 11q22 0 47 -30t42 -30q12 0 25.5 16.5t20.5 39.5l30 99q3 11 10 52q-34 -34 -77 -34 q-46 0 -46 37q0 10 16 74l78 296h-75l-1 6q0 18 33 25q25 6 66 38.5t67 71.5q6 9 14 9q9 0 9 -8q0 -5 -1 -7l-28 -103h80z" />
+<glyph unicode="&#x1ad;" horiz-adv-x="310" d="M132 396h-75l-1 6q0 18 33 25q22 5 58 32q27 108 76 166t136 58q34 0 63.5 -13.5t29.5 -42.5q0 -15 -12 -26.5t-27 -11.5q-22 0 -47 30t-42 30q-21 0 -37.5 -18t-23 -35.5t-14.5 -46.5l-33 -121h80l-5 -32h-84l-87 -328q-2 -8 -2 -14q0 -16 15 -16q12 0 28 15.5t53 63.5 l13 -7q-46 -70 -75.5 -95.5t-67.5 -25.5q-46 0 -46 37q0 10 16 74z" />
+<glyph unicode="&#x1af;" horiz-adv-x="754" d="M567 653h199q21 0 34 4.5t16.5 9t3.5 9.5q0 2 -8.5 7t-17 16t-8.5 26t13 27.5t32 12.5q21 0 35.5 -15t14.5 -40q0 -27 -18 -45.5t-49 -24.5q-7 -1 -27.5 -3t-32.5 -3q-35 -4 -51 -29t-42 -117l-83 -285q-34 -116 -97 -169q-60 -52 -158 -52t-159.5 46t-61.5 118 q0 55 44 216l52 189q9 32 9 45q0 20 -17.5 30t-62.5 11v16h272v-16q-51 -5 -70.5 -22t-33.5 -69l-63 -226q-40 -141 -40 -179q0 -53 39.5 -85.5t98.5 -32.5q84 0 135 54t85 178l64 233q23 85 23 103q0 22 -15 32t-55 14v16z" />
+<glyph unicode="&#x1b0;" horiz-adv-x="573" d="M391 432h74q82 0 82 21q0 2 -8.5 7.5t-17.5 16.5t-9 26t13 27.5t32 12.5q20 0 35 -16t15 -41q0 -27 -18 -45t-48 -23q-33 -6 -74 -6h-7l-74 -279q-19 -72 -19 -78q0 -17 11 -17q12 0 29 16t54 65l14 -9q-48 -73 -75 -96t-63 -23q-48 0 -48 48q0 45 45 197 q-89 -146 -137.5 -196.5t-101.5 -50.5t-53 53q0 18 27 128l35 139q14 58 14 67q0 12 -11 18t-50 6v14q69 8 150 27l4 -3l-89 -355q-3 -9 -3 -16q0 -25 20 -25q45 0 142 147q33 50 51.5 91.5t58.5 151.5z" />
+<glyph unicode="&#x1ba;" d="M462 429l-237 -186q41 17 70 17q46 0 72 -24t26 -64q0 -93 -92 -141l-197 -101q-54 -28 -54 -83q0 -54 65 -54q28 0 49.5 15t26.5 40q13 64 52 64q22 0 35 -13t13 -31t-13.5 -41t-41.5 -36q-54 -25 -113 -25q-48 0 -81.5 26.5t-33.5 70.5q0 46 28.5 83t70.5 59l150 76 q56 29 56 73q0 50 -75 50q-38 0 -63 -10t-61 -38q-11 11 -16 18l264 212h-162q-46 0 -64 -19t-37 -67h-18l61 150h320v-21z" />
+<glyph unicode="&#x1bb;" d="M500 360l-9 -46h-148q-29 -32 -228 -233v-5h181q43 0 64 13.5t39 51.5l17 -7l-50 -134h-354v17l210 224q56 61 66 73h-248l9 46h274q43 64 43 122q0 56 -31.5 88.5t-87.5 32.5q-96 0 -146 -96l-21 7q27 75 80 118.5t130 43.5q72 0 117 -48.5t45 -120.5q0 -41 -17.5 -74 t-51.5 -73h117z" />
+<glyph unicode="&#x1be;" d="M297 447l-12 -62q7 1 23 1q68 0 106.5 -43.5t38.5 -109.5q0 -111 -72.5 -178t-180.5 -67q-50 0 -101.5 28.5t-51.5 74.5q0 19 13.5 31.5t32.5 12.5q23 0 36 -20t18 -44t22 -44t46 -20q51 0 93 69t42 121q0 47 -34.5 74t-86.5 27h-20l37 149h-77l8 31h77l15 61h47l-12 -61 h78l-8 -31h-77z" />
+<glyph unicode="&#x1c0;" horiz-adv-x="170" d="M258 736l-192 -736h-51l192 736h51z" />
+<glyph unicode="&#x1c1;" horiz-adv-x="290" d="M379 736l-193 -736h-51l193 736h51zM259 736l-193 -736h-51l193 736h51z" />
+<glyph unicode="&#x1c2;" horiz-adv-x="340" d="M429 464l-13 -51h-157l-22 -90h157l-13 -51h-157l-74 -272h-51l73 272h-157l13 51h158l22 90h-158l13 51h159l71 272h51l-72 -272h157z" />
+<glyph unicode="&#x1c3;" horiz-adv-x="333" d="M137 177l-17 5q49 227 71 369q10 64 25.5 90t43.5 26q44 0 44 -51q0 -40 -39 -123q-56 -120 -128 -316zM145 41q0 -21 -16.5 -36.5t-39.5 -15.5q-22 0 -36 15.5t-14 38.5q0 21 16.5 36.5t37.5 15.5q23 0 37.5 -16t14.5 -38z" />
+<glyph unicode="&#x1f0;" horiz-adv-x="278" d="M397 661l-162 -169h-48l-95 169h38l89 -105l141 105h37zM246 438l-104 -410q-31 -121 -76.5 -178t-110.5 -57q-35 0 -57 17t-22 44q0 18 12 31t29 13q39 0 39 -37q0 -12 -6 -19.5t-6 -14.5q0 -12 18 -12q30 0 50.5 39t46.5 143l72 292q16 65 16 80q0 17 -10.5 24t-37.5 7 h-26v16q45 3 169 25z" />
+<glyph unicode="&#x1fa;" horiz-adv-x="611" d="M396 656l90 -541q10 -62 24 -79t54 -20v-16h-245v16q45 2 61 14t16 39q0 8 -2 26l-20 131h-220l-59 -111q-22 -41 -22 -66q0 -30 62 -33v-16h-186v16q34 7 55.5 32t78.5 124l279 486q-24 8 -39.5 29t-15.5 48q0 33 23.5 56t57.5 23q32 0 55 -23.5t23 -56.5 q0 -29 -20 -51.5t-50 -26.5zM369 262l-45 263l-149 -263h194zM433 736q0 19 -14 32t-34 13q-17 0 -31 -13.5t-14 -31.5q0 -20 13.5 -34t31.5 -14q21 0 34.5 14t13.5 34zM284 810l141 121q14 12 20.5 15.5t19.5 3.5q25 0 25 -26q0 -16 -32 -35l-141 -79h-33z" />
+<glyph unicode="&#x1fb;" horiz-adv-x="501" d="M463 111l13 -11q-56 -68 -82.5 -89t-56.5 -21q-40 0 -40 41q0 25 23 115q-56 -84 -103 -120.5t-100 -36.5q-44 0 -72 30.5t-28 85.5q0 76 43.5 155t110.5 130t132 51q67 0 80 -58l11 48l3 3l61 7l7 -3q-1 -4 -6 -21q-89 -324 -89 -363q0 -13 14 -13q15 0 52 41zM365 361 q0 26 -15 42t-41 16q-68 0 -131 -92q-33 -49 -55 -109t-22 -106q0 -74 60 -74q59 0 127 98q77 111 77 225zM209 690l162 160q10 10 25 10t25.5 -10.5t10.5 -25.5q0 -18 -17 -28l-171 -106h-35zM420 591q0 -41 -29.5 -70t-70.5 -29q-43 0 -71.5 29t-28.5 71q0 40 29 69.5 t70 29.5q42 0 71.5 -29.5t29.5 -70.5zM386 591q0 28 -19.5 47t-47.5 19q-26 0 -45.5 -19.5t-19.5 -45.5q0 -28 18.5 -47t46.5 -19q29 0 48 18.5t19 46.5z" />
+<glyph unicode="&#x1fc;" horiz-adv-x="889" d="M559 706l162 160q10 10 25 10t25.5 -10.5t10.5 -25.5q0 -18 -17 -28l-171 -106h-35zM911 653l-33 -153l-17 2q1 13 1 36q0 53 -34.5 67.5t-157.5 14.5q-35 0 -46 -6.5t-18 -30.5l-61 -222q54 0 80 2t49.5 6t36 16.5t22 27t23.5 45.5l18 -4l-69 -232l-17 4q6 36 6 52 q0 31 -22.5 40.5t-95.5 9.5h-40l-62 -217q-9 -32 -9 -49q0 -29 51 -29h30q112 0 167.5 27t112.5 109l18 -5l-64 -164h-498v16q44 4 58.5 13.5t21.5 34.5l49 170h-190l-101 -131q-24 -32 -24 -56q0 -15 12 -20.5t52 -10.5v-16h-187v16q19 4 33.5 17.5t50.5 58.5l369 465 q23 29 27.5 36.5t4.5 16.5q0 25 -38 26l-26 1v16h517zM517 613l-268 -342h173z" />
+<glyph unicode="&#x1fd;" horiz-adv-x="667" d="M459 439l-22 -62q59 64 122 64q37 0 59 -19t22 -51q0 -58 -66 -101q-52 -33 -190 -72q-8 -34 -8 -60q0 -55 16.5 -78.5t53.5 -23.5q60 0 142 77l10 -12q-42 -51 -96.5 -81.5t-101.5 -30.5t-75.5 33t-28.5 89q0 20 6 40q-59 -92 -102.5 -127t-92.5 -35q-38 0 -61 25.5 t-23 72.5q0 79 44.5 163t110.5 137.5t125 53.5q54 0 66 -47l19 45h71zM574 380q0 36 -35 36q-33 0 -65 -35q-28 -30 -45 -62t-39 -96q68 20 104.5 42t61.5 55q18 24 18 60zM350 370q0 23 -12.5 37t-32.5 14q-53 1 -113 -86q-37 -54 -60 -118t-23 -118q0 -60 34 -60 q42 0 80 41q54 58 90.5 141.5t36.5 148.5zM307 494l162 160q10 10 25 10t25.5 -10.5t10.5 -25.5q0 -18 -17 -28l-171 -106h-35z" />
+<glyph unicode="&#x1fe;" horiz-adv-x="722" d="M355 706l162 160q10 10 25 10t25.5 -10.5t10.5 -25.5q0 -18 -17 -28l-171 -106h-35zM669 722l-61 -94q47 -36 69 -86.5t22 -127.5q0 -109 -63 -210.5t-159 -161.5t-192 -60q-58 0 -104 18l-68 -105h-44l80 124q-89 60 -89 196q0 73 34 153.5t89 146t132 108.5t157 43 q53 0 104 -20l49 76h44zM188 74l357 533q-34 26 -84 26q-78 0 -148.5 -77t-109 -179t-38.5 -187q0 -73 23 -116zM571 575l-358 -531q32 -29 82 -29q67 0 126.5 50.5t95.5 124t56.5 150t20.5 135.5q0 61 -23 100z" />
+<glyph unicode="&#x1ff;" d="M180 494l162 160q10 10 25 10t25.5 -10.5t10.5 -25.5q0 -18 -17 -28l-171 -106h-35zM428 554l-58 -119q48 -11 73.5 -48.5t25.5 -88.5q0 -60 -34 -125t-90 -113q-83 -71 -169 -71q-8 0 -20 2l-61 -126h-35l64 131q-39 13 -59 34q-37 39 -37 100q0 115 93 213t201 98 q11 0 17 -1l55 114h34zM357 406l-190 -392q11 -4 22 -4q66 0 122 82q32 49 53 114t21 119q0 50 -28 81zM140 29l188 389l-10 2q-52 0 -95 -46q-49 -53 -80 -129.5t-31 -147.5q0 -40 28 -68z" />
+<glyph unicode="&#x237;" horiz-adv-x="278" d="M246 438l-104 -410q-31 -121 -76.5 -178t-110.5 -57q-35 0 -57 17t-22 44q0 18 12 31t29 13q39 0 39 -37q0 -12 -6 -19.5t-6 -14.5q0 -12 18 -12q30 0 50.5 39t46.5 143l72 292q16 65 16 80q0 17 -10.5 24t-37.5 7h-26v16q45 3 169 25z" />
+<glyph unicode="&#x250;" horiz-adv-x="444" d="M173 387h1q83 73 164 73q39 0 61 -19t22 -54q0 -88 -103 -148q-56 -32 -201 -81q-18 -74 -18 -87q0 -57 60 -57q33 0 60.5 14t27.5 35q0 9 -3 20t-3 22q0 15 13.5 28t32.5 13q17 0 30 -13t13 -33q0 -46 -65 -81q-53 -29 -124 -29q-56 0 -88 22t-32 66q0 22 12 68l48 191 q5 23 5 36q0 29 -20 29q-21 0 -47 -18l7 28q49 48 102 48q47 0 47 -48q0 -16 -2 -25zM159 323l-36 -141q99 32 145 66q57 42 57 104q0 50 -54 50q-39 0 -71.5 -23t-40.5 -56z" />
+<glyph unicode="&#x251;" horiz-adv-x="511" d="M487 460l-87 -346q-6 -26 -6 -33q0 -24 41 -24q11 0 18 1l-4 -16l-159 -52l-4 3l15 61q-62 -64 -146 -64q-17 0 -36 5t-44.5 18t-41.5 44t-16 76q0 119 87.5 223t192.5 104q56 0 95 -43l74 43h21zM313 102l58 230q2 7 2 20q0 38 -23 59t-57 21q-65 0 -127.5 -80 t-62.5 -184q0 -63 31 -94.5t75 -31.5q34 0 66 17t38 43z" />
+<glyph unicode="&#x252;" horiz-adv-x="511" d="M218 457l-15 -61q62 64 146 64q17 0 36 -5t44.5 -18t41.5 -44t16 -76q0 -119 -87.5 -223t-192.5 -104q-56 0 -95 43l-74 -43h-21l87 346q6 26 6 33q0 24 -41 24q-11 0 -18 -1l4 16l159 52zM191 348l-58 -230q-2 -7 -2 -20q0 -38 23 -59t57 -21q65 0 127.5 80t62.5 184 q0 63 -31 94.5t-75 31.5q-34 0 -66 -17t-38 -43z" />
+<glyph unicode="&#x253;" d="M23 48l114 421q25 93 92.5 153.5t168.5 60.5q35 0 62.5 -15t27.5 -41q0 -16 -12.5 -27t-27.5 -11q-22 0 -47 30t-41 30q-38 0 -79 -38t-56 -93l-62 -228h1q50 83 94.5 117t98.5 34q52 0 84 -32t32 -88q0 -77 -47 -155t-122.5 -127.5t-150.5 -49.5q-46 0 -88 16t-42 37v6z M388 306q0 86 -70 86q-69 0 -137 -115q-32 -54 -52 -119.5t-20 -111.5q0 -34 46 -34q66 0 123 59q46 48 78 114.5t32 120.5z" />
+<glyph unicode="&#x254;" horiz-adv-x="444" d="M105 323l-16 10q46 58 89.5 83t99.5 25q71 0 109 -39t38 -115q0 -67 -34 -129.5t-89 -107.5q-77 -61 -167 -61q-46 0 -75.5 23t-29.5 58q0 20 14 34t34 14t29.5 -11.5t9.5 -28.5q0 -9 -7.5 -23.5t-7.5 -24.5q0 -20 37 -20q63 0 109 48q91 96 91 233q0 54 -23 84t-66 30 q-39 0 -71 -19t-74 -63z" />
+<glyph unicode="&#x255;" horiz-adv-x="444" d="M-3 -160l119 158q-86 31 -86 145q0 67 34 129.5t89 107.5q77 61 167 61q46 0 75.5 -23t29.5 -58q0 -20 -14 -34t-34 -14t-29.5 11.5t-9.5 28.5q0 9 7.5 23.5t7.5 24.5q0 20 -37 20q-63 0 -109 -48q-91 -96 -91 -233q0 -69 34 -95q35 40 52 57.5t43 32.5t54 15 q34 0 59 -18.5t25 -45.5q0 -49 -36 -75t-103 -26h-22q-42 0 -71 7l-118 -151h-36zM350 80q0 15 -16 25.5t-37 10.5q-12 0 -22.5 -3.5t-18 -7t-19 -14t-17 -16l-20.5 -21.5l-22 -25q34 -12 78 -12q53 0 73.5 19t20.5 44z" />
+<glyph unicode="&#x256;" d="M521 683l6 -6l-39 -152l-166 -606q-10 -39 -10 -64q2 -54 44 -54q17 0 42 30t46 30q18 0 29.5 -11.5t11.5 -26.5q0 -30 -30 -43t-64 -13q-67 0 -103 32.5t-36 91.5q0 39 13 91l35 139q-43 -73 -84.5 -102.5t-93.5 -29.5q-50 0 -78.5 30.5t-28.5 86.5q0 119 96.5 227 t195.5 108q31 0 45.5 -14t19.5 -44h1l45 163q14 49 14 71q0 16 -11 20t-53 6v17q77 7 153 23zM356 361q0 26 -14.5 41.5t-32.5 15.5q-47 0 -91 -46q-50 -53 -83 -126.5t-33 -135.5q0 -34 15.5 -53.5t42.5 -19.5q45 0 91 49t75.5 125t29.5 150z" />
+<glyph unicode="&#x257;" d="M372 383l29 101q25 87 92.5 143t164.5 56q35 0 62.5 -15t27.5 -41q0 -16 -12.5 -27t-27.5 -11q-22 0 -47 30t-41 30q-37 0 -78 -36.5t-55 -90.5q-124 -455 -124 -462q0 -20 18 -20q13 0 27.5 12.5t54.5 58.5l12 -10q-77 -114 -147 -114q-19 0 -30 12t-11 33q0 30 13 89 q-43 -73 -84.5 -102.5t-93.5 -29.5q-50 0 -78.5 30.5t-28.5 86.5q0 119 96.5 227t195.5 108q31 0 45.5 -14t19.5 -44zM356 361q0 26 -14.5 41.5t-32.5 15.5q-47 0 -91 -46q-50 -53 -83 -126.5t-33 -135.5q0 -34 15.5 -53.5t42.5 -19.5q45 0 91 49t75.5 125t29.5 150z" />
+<glyph unicode="&#x258;" horiz-adv-x="444" d="M31 97l18 12q32 -44 54 -59.5t55 -15.5q58 0 105 46t54 107q-98 13 -150 49.5t-52 86.5q0 51 37 84.5t91 33.5q79 0 126 -53t47 -133q0 -101 -69.5 -183.5t-165.5 -82.5q-115 0 -150 108zM329 285q0 57 -21.5 95t-57.5 38q-31 0 -50 -25.5t-19 -59.5q0 -23 16 -51 q15 -27 42 -42.5t83 -31.5q7 64 7 77z" />
+<glyph unicode="&#x259;" horiz-adv-x="444" d="M85 321l-12 12q88 108 204 108q61 0 98 -37.5t37 -99.5q0 -117 -93.5 -216t-205.5 -99q-39 0 -60.5 18t-21.5 50q0 66 76.5 118t207.5 69q10 20 10 61t-25.5 66t-67.5 25q-33 0 -63 -15.5t-84 -59.5zM291 178l17 44q-112 -27 -161 -74q-50 -48 -50 -97q0 -39 35 -39 q42 0 87.5 48.5t71.5 117.5z" />
+<glyph unicode="&#x25a;" horiz-adv-x="639" d="M612 293l27 -12q-16 -29 -44 -50t-57 -21q-65 0 -65 58q0 14 10 56l16 61l-91 -47q4 -15 4 -34q0 -117 -93.5 -216t-205.5 -99q-39 0 -60.5 18t-21.5 50q0 36 14.5 67.5t40.5 55.5t49 40t53 32l117 64q-17 80 -73 80q-33 0 -63 -15.5t-84 -59.5l-12 12q88 108 204 108 q45 0 77.5 -21t47.5 -58l134 68l5 -4l-32 -119q-6 -24 -6 -26q0 -24 11 -32.5t32 -8.5q36 0 66 53zM306 289l-98 -57q-42 -24 -76.5 -69.5t-34.5 -110.5q0 -21 7.5 -30.5t27.5 -9.5q42 0 86.5 47.5t72.5 118.5q15 38 15 111z" />
+<glyph unicode="&#x25b;" horiz-adv-x="444" d="M209 249v2q-93 21 -93 83t58 101.5t138 39.5q59 0 105 -26q22 -12 36 -33.5t14 -40.5q0 -18 -13 -31t-35 -13q-35 0 -49 52q-10 36 -19 47.5t-29 11.5q-46 0 -82 -33.5t-36 -78.5q0 -33 23 -50t61 -17h6v-30h-11q-63 0 -110.5 -38.5t-47.5 -94.5q0 -36 22.5 -57t61.5 -21 q79 0 172 62l9 -12q-92 -86 -200 -86q-76 0 -123 34q-36 25 -36 73q0 40 24.5 76.5t64.5 55.5q33 16 89 24z" />
+<glyph unicode="&#x25c;" horiz-adv-x="480" d="M223 233v30q52 1 80 21q56 38 56 91q0 30 -20 48.5t-53 18.5q-18 0 -27 -13.5t-19 -48.5q-5 -19 -17.5 -34t-30.5 -15q-22 0 -35 13t-13 31q0 16 12 38t36 35q46 27 108 27q65 0 106 -26t41 -69q0 -98 -142 -129v-2q113 -14 113 -102q0 -36 -26.5 -71.5t-63.5 -55.5 q-63 -34 -139 -34q-109 0 -158 86l15 12q62 -62 140 -62q54 0 96 40t42 95q0 35 -23 55.5t-67 20.5h-11z" />
+<glyph unicode="&#x25d;" horiz-adv-x="666" d="M639 293l27 -12q-18 -30 -45.5 -50.5t-55.5 -20.5q-65 0 -65 59q0 13 11 59l15 57l-85 -44q-23 -66 -136 -90v-2q52 -6 82.5 -32t30.5 -70q0 -36 -26.5 -71.5t-63.5 -55.5q-63 -34 -139 -34q-109 0 -158 86l15 12q62 -62 140 -62q54 0 96 40t42 95q0 35 -23 55.5 t-67 20.5h-11v30q52 1 80 21q56 38 56 91q0 30 -20 48.5t-52 18.5q-19 0 -28 -13t-18 -45q-14 -53 -51 -53q-19 0 -32.5 12.5t-13.5 29.5q0 20 13 41.5t37 34.5q46 26 107 26q64 0 105 -26.5t41 -68.5v-9l116 59l5 -4l-36 -133q-2 -8 -2 -13q0 -24 10.5 -32t32.5 -8 q34 0 66 53z" />
+<glyph unicode="&#x25e;" horiz-adv-x="490" d="M316 251v-2q113 -14 113 -103q0 -35 -25 -68.5t-56 -52.5q-65 -39 -145 -39q-87 0 -130 42t-43 117q0 84 34 159t100 123t149 48q57 0 101 -24t44 -73q0 -96 -142 -127zM234 233v30q39 0 63 11q30 14 51.5 41.5t21.5 58.5q0 30 -20 49t-51 19q-59 0 -107 -51t-70.5 -114 t-22.5 -116q0 -58 23 -98.5t70 -40.5q54 0 92 32q51 42 51 101q0 57 -51 73q-18 5 -50 5z" />
+<glyph unicode="&#x25f;" horiz-adv-x="357" d="M340 441v-16q-47 -2 -64 -17t-29 -60l-28 -112h65l-7 -31h-66l-45 -177q-31 -121 -76.5 -178t-110.5 -57q-35 0 -57 17t-22 44q0 18 12 31t29 13q39 0 39 -37q0 -12 -6 -19.5t-6 -14.5q0 -12 18 -12q30 0 50.5 39t46.5 143l51 208h-138l7 31h139l30 123q4 18 4 26 q0 23 -15.5 31.5t-51.5 8.5v16h231z" />
+<glyph unicode="&#x260;" horiz-adv-x="714" d="M484 434l8 31q56 218 216 218q37 0 64 -15.5t27 -41.5q0 -16 -12.5 -26.5t-27.5 -10.5q-22 0 -47 30t-41 30q-34 0 -50.5 -32t-34.5 -107l-134 -537q-23 -90 -101.5 -137.5t-171.5 -47.5q-51 0 -111 19.5t-60 59.5q0 16 10.5 26.5t26.5 10.5t31 -14t27 -30t37 -30t57 -14 q62 0 108 41t62 103l23 93q-81 -67 -158 -67q-70 0 -109 51t-39 124q0 115 94.5 214.5t208.5 99.5q56 0 97 -41zM399 88l56 225q4 15 4 33q0 41 -24 69t-66 28q-54 0 -100 -42.5t-69.5 -99t-23.5 -106.5q0 -64 30 -107.5t86 -43.5q53 0 107 44z" />
+<glyph unicode="&#x261;" horiz-adv-x="595" d="M579 482l-127 -509q-23 -89 -101.5 -137t-171.5 -48q-51 0 -111 19.5t-60 59.5q0 15 10.5 26t26.5 11t31 -14t27 -30t37 -30t57 -14q62 0 108 41t62 103l23 93q-81 -67 -158 -67q-70 0 -109 51t-39 124q0 115 94.5 214.5t208.5 99.5q59 0 107 -51l14 10q6 5 12 11.5 t8.5 9.5t10.5 13.5t11 13.5h29zM399 88l56 225q4 15 4 33q0 41 -24 69t-66 28q-80 0 -136.5 -84.5t-56.5 -164.5q0 -62 29 -106t87 -44q53 0 107 44z" />
+<glyph unicode="&#x262;" horiz-adv-x="562" d="M562 231v-11q-31 -2 -44.5 -12.5t-20.5 -41.5l-32 -130q-3 -13 -82.5 -30t-112.5 -17q-98 0 -158 41t-60 125q0 70 35 130.5t96 100.5q85 55 189 55q34 0 92 -13q5 -1 14 -3t15 -3.5t8 -1.5q25 0 37 21h16l-29 -139h-16q-14 53 -34 76q-33 37 -99 37q-79 0 -132 -41 q-46 -34 -77 -97t-31 -126t39.5 -99.5t110.5 -36.5q35 0 71 10t40 28l26 104q5 23 5 35q0 16 -12 21.5t-43 6.5v11h189z" />
+<glyph unicode="&#x263;" horiz-adv-x="444" d="M243 186l21 -110q67 110 94.5 167.5t27.5 89.5q0 16 -26 32q-26 17 -26 39q0 16 11.5 26.5t28.5 10.5q22 0 37 -16t15 -39q0 -50 -44 -144q-40 -86 -109 -197l13 -73q8 -43 8 -78q0 -61 -31 -94.5t-86 -33.5q-35 0 -52.5 16.5t-17.5 44.5q0 6 1.5 13t6.5 17t10 18l15 23 q10 16 18 26l23 34l27 38q-5 52 -35.5 174t-49.5 170q-14 37 -30.5 50.5t-46.5 13.5q-16 0 -31 -4v17q15 3 34.5 7.5t39.5 8t49 6.5q8 2 20 2q11 0 41.5 -93t43.5 -162zM225 -84l-9 45q-75 -98 -75 -125q0 -37 30 -37q26 0 42 19.5t16 49.5q0 27 -4 48z" />
+<glyph unicode="&#x264;" horiz-adv-x="480" d="M232 263l63 70l25 31l32 36q14 15 28 28q24 22 43 22q24 0 38 -17.5t14 -41.5q0 -29 -11 -69q-6 23 -24.5 39t-41.5 16q-8 0 -16.5 -3t-14 -6.5t-14.5 -11.5t-12 -11t-12 -14t-10 -12l-73 -82l12 -31q8 -23 11.5 -34.5t7.5 -30t4 -35.5q0 -47 -42.5 -81.5t-89.5 -34.5 q-78 0 -78 62q0 43 47 92l57 60l-59 136q-7 16 -22 25.5t-32 9.5q-43 0 -58 -53q0 43 28.5 85.5t69.5 42.5q19 0 32.5 -6t24 -20t16 -24.5t13.5 -30.5zM185 175l-46 -50q-33 -37 -33 -63q0 -16 12.5 -24.5t29.5 -8.5q24 0 43 20t19 44q0 10 -3 22t-5.5 19t-9 22.5t-7.5 18.5 z" />
+<glyph unicode="&#x265;" d="M478 441l-146 -554q-13 -50 -13 -62t13 -18.5t28 -6.5h27v-15q-76 -9 -157 -27l-7 6l121 447q-130 -211 -230 -211q-33 0 -49 18.5t-16 48.5q0 43 48 193q34 104 34 125q0 7 -5 12.5t-12 5.5q-12 0 -26.5 -14.5t-55.5 -65.5l-13 13q46 65 77 89.5t69 24.5q20 0 32 -11.5 t12 -30.5q0 -17 -20 -92l-55 -207q-7 -28 -7 -33q0 -25 28 -25q27 0 69.5 40t82.5 100q31 48 49 93.5t47 156.5h75z" />
+<glyph unicode="&#x266;" d="M19 0l124 470q25 93 92.5 153t168.5 60q35 0 62.5 -15t27.5 -41q0 -16 -12.5 -27t-27.5 -11q-22 0 -47 30t-41 30q-37 0 -78.5 -36.5t-55.5 -90.5l-79 -292q130 211 230 211q33 0 49 -18.5t16 -48.5q0 -43 -48 -193q-34 -104 -34 -125q0 -7 5 -12.5t12 -5.5 q12 0 26.5 14.5t55.5 65.5l13 -13q-46 -65 -77 -89.5t-69 -24.5q-20 0 -32 11.5t-12 30.5q0 17 20 92l55 207q7 28 7 33q0 25 -28 25q-27 0 -69.5 -40t-82.5 -100q-31 -48 -49 -93.5t-47 -156.5h-75z" />
+<glyph unicode="&#x267;" d="M19 0l124 470q25 93 92.5 153t168.5 60q35 0 62.5 -15t27.5 -41q0 -16 -12.5 -27t-27.5 -11q-22 0 -47 30t-41 30q-37 0 -78.5 -36.5t-55.5 -90.5l-79 -292q130 211 230 211q33 0 49 -18.5t16 -48.5q0 -15 -9 -48l-94 -346q-25 -93 -92.5 -153t-168.5 -60q-35 0 -62.5 15 t-27.5 41q0 16 12.5 27t27.5 11q22 0 47 -30t41 -30q37 0 78.5 36.5t55.5 90.5l107 404q7 28 7 33q0 25 -28 25q-27 0 -69.5 -40t-82.5 -100q-31 -48 -49 -93.5t-47 -156.5h-75z" />
+<glyph unicode="&#x268;" horiz-adv-x="278" d="M264 599q0 -21 -14.5 -36t-34.5 -15q-22 0 -35 14.5t-13 38.5q0 23 13.5 38t33.5 15t35 -16.5t15 -38.5zM253 261l-8 -31h-74l-37 -135q-10 -34 -10 -44q0 -15 14 -15q25 0 84 78l13 -11q-42 -65 -71 -89.5t-66 -24.5q-49 0 -49 55q0 29 22 111l20 75h-75l9 31h75l19 71 q9 32 9 44q0 15 -11.5 19t-52.5 5v16q46 4 160 25l4 -3l-49 -177h74z" />
+<glyph unicode="&#x269;" horiz-adv-x="333" d="M253 80l13 -12q-78 -78 -143 -78q-72 0 -72 65q0 23 12 69l56 209q8 26 8 37q0 15 -8 19.5t-24 4.5q-17 0 -31 -4v19l117 36q31 9 42 9q5 0 5 -11q0 -5 -6 -26l-84 -308q-4 -16 -4 -25q0 -40 44 -40q32 0 75 36z" />
+<glyph unicode="&#x26a;" horiz-adv-x="247" d="M298 441v-17q-44 -2 -57.5 -16t-24.5 -56l-65 -259q-6 -24 -6 -40q0 -18 11.5 -26.5t40.5 -9.5v-17h-205v17q44 1 58 15.5t24 55.5l66 269q8 32 8 38q0 14 -12 20.5t-42 8.5v17h204z" />
+<glyph unicode="&#x26b;" horiz-adv-x="278" d="M303 423h28q-22 -104 -95 -104q-15 0 -48 11l-62 -237q-8 -29 -8 -43q0 -18 17 -18q27 0 67 57l25 35l14 -10q-45 -71 -77.5 -98t-73.5 -27q-49 0 -49 56q0 17 4 30l73 281q-22 6 -34 6q-37 0 -51 -46h-29q15 58 38 82t62 24q9 0 31 -4l47 181q3 10 3 19q0 22 -49 22h-18 v16q70 8 155 27l6 -5l-75 -287q28 -12 48 -12t31.5 9.5t19.5 34.5z" />
+<glyph unicode="&#x26c;" horiz-adv-x="375" d="M358 360l8 -13q-58 -58 -153 -90l-9 -3l-42 -161q-8 -29 -8 -43q0 -18 17 -18q27 0 67 57l25 35l14 -10q-45 -71 -77.5 -98t-73.5 -27q-49 0 -49 56q0 17 4 30l43 164q-16 -2 -29 -2q-37 0 -60 22.5t-23 57.5q0 52 43 92.5t93 40.5q10 0 30 -5l40 154q3 10 3 19 q0 22 -49 22h-18v16q70 8 155 27l6 -5l-102 -390l8 2q33 8 74 30t63 40zM133 275l37 142q-8 3 -16 3q-30 0 -59 -28.5t-29 -58.5q0 -24 14 -41.5t36 -17.5q13 0 17 1z" />
+<glyph unicode="&#x26d;" horiz-adv-x="252" d="M279 678l-193 -738q-15 -60 -15 -89q0 -50 39 -50q17 0 42 30t47 30q15 0 27.5 -11t12.5 -27q0 -25 -26 -40.5t-63 -15.5q-84 0 -113 33t-29 96q0 36 11 80l163 623q3 10 3 19q0 22 -49 22h-18v16q70 8 155 27z" />
+<glyph unicode="&#x26e;" horiz-adv-x="575" d="M537 400l-206 -204q11 3 24 3q54 0 88.5 -35t34.5 -98q0 -133 -87 -216t-203 -83q-57 0 -104 31q-20 13 -31.5 33t-11.5 37q0 18 13 31t36 13q36 0 49 -58q9 -38 22.5 -48t51.5 -10q60 0 121 64t61 169q0 30 -11 52.5t-29 33t-35.5 15.5t-36.5 5q-13 0 -37 -27l-88 -90 q-29 -29 -65 -29q-23 0 -34.5 16t-11.5 37q0 19 7 46l121 462q16 61 16 66q0 24 -55 24h-12v16q72 9 155 27l6 -6l-60 -227h312v-50zM486 386h-202q-47 0 -66.5 -20t-31.5 -66l-49 -187q-13 -52 -13 -57q0 -16 14 -16q8 0 21 13z" />
+<glyph unicode="&#x26f;" horiz-adv-x="722" d="M704 432l-88 -318q-10 -38 -10 -54q0 -22 41 -22h25v-16l-162 -31l-3 2l58 209q-130 -211 -220 -211q-29 0 -44.5 16t-15.5 44q0 38 40 152q-53 -84 -88.5 -126.5t-71.5 -65.5q-32 -20 -63 -20q-27 0 -42.5 17.5t-15.5 45.5q0 13 3 28l68 251q10 37 10 45q0 16 -12 16 q-22 0 -65 -53l-21 -26l-15 12l5 7q77 107 144 107q42 0 42 -46q0 -15 -13 -66l-60 -227q-8 -32 -8 -38q0 -9 6.5 -15t14.5 -6q47 0 131 117q37 52 58 104.5t50 167.5h75l-86 -318q-8 -30 -8 -46q0 -25 21 -25q25 0 66 39.5t83 103.5q25 39 42.5 83t53.5 163h75z" />
+<glyph unicode="&#x270;" horiz-adv-x="722" d="M704 432l-176 -665h-84l121 435q-130 -211 -220 -211q-29 0 -44.5 16t-15.5 44q0 38 40 152q-53 -84 -88.5 -126.5t-71.5 -65.5q-32 -20 -63 -20q-27 0 -42.5 17.5t-15.5 45.5q0 13 3 28l68 251q10 38 10 45q0 16 -12 16q-22 0 -65 -53l-21 -26l-15 12l5 7 q77 107 144 107q42 0 42 -46q0 -15 -13 -66l-61 -227q-7 -28 -7 -38q0 -9 6.5 -15t14.5 -6q47 0 131 117q37 52 58 104.5t50 167.5h75l-27 -93q-67 -231 -67 -271q0 -25 21 -25q25 0 66 39.5t83 103.5q25 39 42.5 83t53.5 163h75z" />
+<glyph unicode="&#x271;" horiz-adv-x="690" d="M209 439l-58 -209q130 211 220 211q29 0 44.5 -16t15.5 -44q0 -38 -40 -152q53 84 88.5 126.5t71.5 65.5q32 20 63 20q27 0 42.5 -17.5t15.5 -45.5q0 -13 -3 -28l-114 -423q-20 -73 -78 -116.5t-139 -43.5q-37 0 -64.5 15t-27.5 41q0 16 12.5 27t27.5 11q22 0 47 -30 t44 -30q35 0 61.5 35t42.5 95l106 399q7 28 7 38q0 9 -6 15t-14 6q-22 0 -58 -32t-74 -85q-37 -52 -58 -104.5t-50 -167.5h-75l27 93q67 231 67 271q0 25 -21 25q-25 0 -66 -39.5t-83 -103.5q-25 -39 -42.5 -83t-53.5 -163h-75l90 325q8 30 8 47q0 22 -41 22h-25v16l162 31z " />
+<glyph unicode="&#x272;" horiz-adv-x="606" d="M566 117l14 -13q-51 -70 -78 -91.5t-62 -21.5q-21 0 -35.5 13.5t-14.5 40.5q0 18 16 75l47 162q17 60 17 79q0 13 -7.5 20.5t-19.5 7.5q-30 0 -67 -38t-88 -113q-45 -66 -86 -215l-24 -88q-45 -168 -197 -168q-37 0 -64 15.5t-27 40.5q0 16 12.5 27t27.5 11q22 0 47 -30 t41 -30q12 0 21.5 3.5t17.5 14.5t13 19t12 29t10 31t11 39l113 413q2 10 2 17q0 15 -13.5 20.5t-51.5 6.5v16q39 8 87 16.5t75 14.5l4 -2l-67 -218q74 118 128 169t103 51q31 0 48 -16.5t17 -44.5q0 -25 -10 -60l-56 -203q-14 -50 -14 -61q0 -18 16 -18q19 0 61 53 q7 8 21 26z" />
+<glyph unicode="&#x273;" horiz-adv-x="498" d="M432 320l-105 -379q-13 -49 -13 -80q0 -60 44 -60q17 0 42 30t47 30q15 0 27.5 -11t12.5 -27q0 -26 -27.5 -41t-64.5 -15q-69 0 -105 37t-36 97q0 59 10 92l83 289q17 60 17 77q0 30 -25 30q-30 0 -65.5 -34t-84.5 -107q-33 -49 -48.5 -88t-51.5 -160h-75l96 350 q2 10 2 17q0 15 -13.5 20.5t-51.5 6.5v16q39 8 87 16.5t75 14.5l4 -2l-67 -218q74 118 128 169t103 51q31 0 48 -16.5t17 -44.5q0 -25 -10 -60z" />
+<glyph unicode="&#x274;" horiz-adv-x="539" d="M599 441v-17q-37 -4 -53 -12q-27 -20 -41 -79l-84 -341h-14l-234 362l-63 -251q-8 -34 -8 -48q0 -20 12 -27.5t43 -10.5v-17h-177v17q50 4 67 19t30 67l71 285q-16 22 -27 29t-39 7v17h134l204 -319l54 218q7 27 7 45q0 11 -5 21q-8 14 -54 18v17h177z" />
+<glyph unicode="&#x275;" d="M468 301q0 -57 -28.5 -118.5t-77.5 -110.5q-83 -83 -188 -83q-70 0 -108.5 36.5t-38.5 102.5q0 83 50.5 162t129.5 121q56 30 120 30q62 0 101.5 -37.5t39.5 -102.5zM138 240h235q11 46 11 86q0 45 -19 69.5t-52 24.5q-67 0 -128 -91q-31 -47 -47 -89zM365 207h-238 q-16 -51 -16 -106q0 -44 21 -67.5t57 -23.5q61 0 121 83q35 48 55 114z" />
+<glyph unicode="&#x276;" horiz-adv-x="718" d="M738 437l-24 -94h-18q1 6 1 18q0 32 -21.5 41.5t-87.5 9.5h-41q-53 0 -59 -23l-36 -148h76q61 0 84.5 12.5t39.5 52.5h16l-39 -155h-16v18q0 27 -14.5 37t-52.5 10h-101l-39 -157q-2 -5 -2 -14q0 -22 38 -22h89q39 0 71.5 19t70.5 66h18l-60 -110h-265q-25 0 -75.5 -2 t-67.5 -2q-81 0 -127.5 40.5t-46.5 114.5q0 80 43 149.5t111 106.5q67 36 154 36q11 0 47 -2q28 -2 89 -2h245zM336 86l64 260q4 15 4 28q0 42 -58 42q-87 0 -150.5 -83t-63.5 -194q0 -120 111 -120q76 0 93 67z" />
+<glyph unicode="&#x277;" horiz-adv-x="668" d="M638 262q0 -101 -70 -183.5t-169 -82.5q-40 0 -64 22.5t-30 61.5q-57 -84 -136 -84q-66 0 -102.5 40t-36.5 103q0 94 60 173.5t145.5 121t168.5 41.5q99 0 166.5 -58.5t67.5 -154.5zM549 299q0 77 -41 116.5t-109 39.5q-103 0 -188 -95.5t-85 -233.5q0 -88 61 -88 q32 0 60 22t35 54q5 26 5 83q0 21 1 35t5 33.5t11 31.5t21.5 20.5t34.5 8.5q23 0 37 -13t14 -31q0 -35 -31.5 -94.5t-35.5 -73.5q-2 -7 -2 -19q0 -25 16.5 -41t42.5 -16q38 0 68 30t46.5 73.5t25 85t8.5 72.5z" />
+<glyph unicode="&#x278;" horiz-adv-x="660" d="M472 599l-43 -164q87 -8 144 -49t57 -114q0 -75 -48.5 -138t-120.5 -97.5t-149 -39.5l-39 -146q-6 -21 -6 -34q0 -19 14 -26t49 -9v-15h-236v15q46 3 65.5 17t30.5 55l38 143q-87 5 -142.5 51.5t-55.5 119.5q0 78 50 139.5t120 92t145 35.5l43 161q5 22 5 33 q0 20 -14 28.5t-48 10.5v15h236v-15q-47 -2 -65.5 -14.5t-29.5 -54.5zM421 407l-102 -382q93 14 151 91.5t60 171.5q2 52 -25.5 83.5t-83.5 35.5zM235 25l102 382q-86 -4 -146.5 -79t-60.5 -168q0 -54 26.5 -90.5t78.5 -44.5z" />
+<glyph unicode="&#x279;" horiz-adv-x="402" d="M322 441l-81 -292q-16 -59 -16 -82q0 -26 38 -26q9 0 31 3v-17l-155 -27l-3 2l55 216l-16 -35q-34 -75 -94 -138q-43 -45 -79 -45q-21 0 -34 14t-13 37t12.5 38.5t34.5 15.5q19 0 35 -26q8 -14 16 -14q27 0 82 94q34 58 54.5 109.5t56.5 172.5h76z" />
+<glyph unicode="&#x27a;" horiz-adv-x="383" d="M384 678l-159 -608q-2 -10 -2 -18q0 -26 35 -33q9 -2 36 -4v-15h-158l55 218l-16 -35q-34 -75 -94 -138q-43 -45 -79 -45q-21 0 -34 14t-13 37t12.5 38.5t34.5 15.5q19 0 35 -26q8 -14 16 -14q27 0 82 94q43 73 65 137q35 103 47 149l30 116q13 48 13 54q0 25 -49 25h-18 v16q68 8 155 27z" />
+<glyph unicode="&#x27b;" horiz-adv-x="353" d="M322 441l-123 -443q-30 -106 -30 -140q0 -28 12 -42.5t32 -14.5q17 0 42 30t46 30q17 0 29 -11t12 -28q0 -27 -28 -41t-66 -14q-63 0 -101 31t-38 92q0 28 34 155l48 173l-16 -35q-34 -75 -94 -138q-43 -45 -79 -45q-21 0 -34 14t-13 37t12.5 38.5t34.5 15.5q19 0 35 -26 q8 -14 16 -14q27 0 82 94q34 58 54.5 109.5t56.5 172.5h76z" />
+<glyph unicode="&#x27c;" horiz-adv-x="333" d="M176 223l16 35q34 75 94 138q43 45 79 45q21 0 34 -14t13 -37t-12.5 -38.5t-34.5 -15.5q-19 0 -35 26q-8 14 -17 14q-24 0 -69 -73.5t-63 -120.5q-27 -71 -47 -138l-81 -277h-73l146 525q16 59 16 82q0 26 -38 26q-8 0 -31 -3v17l155 27l3 -2z" />
+<glyph unicode="&#x27d;" horiz-adv-x="390" d="M176 223l16 35q34 75 94 138q43 45 79 45q21 0 34 -14t13 -37t-12.5 -38.5t-34.5 -15.5q-19 0 -35 26q-8 14 -16 14q-26 0 -82 -94q-37 -62 -66 -140q-82 -221 -82 -284q0 -28 12 -42.5t32 -14.5q17 0 42 30t46 30q17 0 29 -11t12 -28q0 -27 -28 -41t-66 -14 q-63 0 -101 31t-38 92q0 36 21 110l81 292q16 59 16 82q0 26 -38 26q-8 0 -31 -3v17l155 27l3 -2z" />
+<glyph unicode="&#x27e;" horiz-adv-x="401" d="M45 0l69 249q30 106 78.5 163.5t138.5 57.5q38 0 65.5 -15t27.5 -41q0 -16 -12.5 -27t-27.5 -11q-22 0 -47 30t-41 30q-34 0 -54 -33.5t-40 -105.5l-81 -297h-76z" />
+<glyph unicode="&#x27f;" horiz-adv-x="338" d="M134 0l83 297q13 45 13 94q0 45 -35 45q-17 0 -42 -30t-47 -30q-15 0 -27.5 11t-12.5 27q0 26 27.5 41t65.5 15q68 0 101 -35t33 -97q0 -41 -14 -91l-69 -247h-76z" />
+<glyph unicode="&#x280;" horiz-adv-x="475" d="M132 464h227q66 0 104 -26t38 -70q0 -101 -154 -146l72 -170q14 -34 45 -34h10v-18h-124l-92 209h-37l-26 -106q-7 -30 -7 -43q0 -22 12.5 -31.5t40.5 -10.5v-18h-216v18q42 4 59 20t28 60l65 257q8 29 8 46q0 40 -53 45v18zM229 242h17q63 0 112.5 34t49.5 91 q0 30 -21.5 47.5t-61.5 17.5q-21 0 -50 -7z" />
+<glyph unicode="&#x281;" horiz-adv-x="475" d="M581 446h-10q-31 0 -62 -34l-157 -170q94 -29 94 -95q0 -64 -60 -105.5t-143 -41.5h-218v18q38 4 59 24q19 17 31 67l64 257q7 27 7 40q0 38 -54 40v18h216v-18q-39 -2 -58.5 -20t-30.5 -65l-26 -106h37l196 209h115v-18zM224 222l-45 -183q25 -7 46 -7q53 0 90.5 31.5 t37.5 80.5q0 41 -32 59.5t-80 18.5h-17z" />
+<glyph unicode="&#x282;" horiz-adv-x="389" d="M376 442l-20 -140h-16q-14 116 -89 116q-27 0 -43 -15t-16 -42q0 -38 54 -102q68 -79 68 -136q0 -61 -40.5 -97.5t-103.5 -36.5q-29 0 -55 10q-21 9 -44 9q-3 0 -11 -2l-19 -138q-1 -8 -1 -20q0 -32 26 -32q17 0 42 30t47 30q15 0 27.5 -11t12.5 -27q0 -26 -27.5 -41 t-65.5 -15q-93 0 -93 65q0 10 2 20l35 279h16q20 -136 100 -136q36 0 56 20t20 57q0 45 -56 115q-63 79 -63 131q0 50 33 79t88 29q20 0 56 -10q22 -7 36 -7q20 0 30 18h14z" />
+<glyph unicode="&#x283;" horiz-adv-x="415" d="M112 -72l140 537q24 94 85.5 156t150.5 62q37 0 63 -15.5t26 -40.5q0 -16 -12.5 -27t-27.5 -11q-22 0 -47 30t-41 30q-62 0 -98 -140l-136 -524q-24 -94 -85 -156t-150 -62q-36 0 -63 15.5t-27 39.5q0 17 12.5 28t27.5 11q22 0 47 -30t41 -30q60 0 94 127z" />
+<glyph unicode="&#x284;" horiz-adv-x="453" d="M137 31l116 465q20 80 89.5 133.5t162.5 53.5q35 0 62.5 -15t27.5 -41q0 -16 -12.5 -27t-27.5 -11q-22 0 -47 30t-41 30q-40 0 -75.5 -26.5t-51.5 -89.5l-127 -502h80l-5 -31h-84q-31 -110 -89.5 -171.5t-133.5 -61.5q-35 0 -63 15t-28 40q0 17 12 28t27 11q23 0 48 -30 t41 -30q27 0 58 54t54 145h-80l7 31h80z" />
+<glyph unicode="&#x285;" horiz-adv-x="339" d="M297 252l-78 -312q-23 -92 -23 -108q0 -31 30 -31q17 0 42 30t47 30q15 0 27.5 -11t12.5 -27q0 -26 -27.5 -41t-65.5 -15q-129 0 -129 129q0 39 13 89l78 312q18 72 18 99q0 40 -34 40q-17 0 -42 -30t-47 -30q-15 0 -27.5 11t-12.5 27q0 26 27.5 41t65.5 15 q133 0 133 -134q0 -54 -8 -84z" />
+<glyph unicode="&#x286;" horiz-adv-x="439" d="M159 14l116 442q30 117 101 177q59 50 137 50q32 0 60.5 -14t28.5 -43q0 -15 -12 -26t-27 -11q-23 0 -48 30t-41 30q-22 0 -39 -15t-30.5 -45.5t-20 -51.5t-16.5 -59l-131 -505q44 -44 44 -117q0 -59 -23 -99h-26q20 56 20 93q0 54 -26 90q-39 -90 -81.5 -131t-115.5 -41 q-38 0 -64.5 25.5t-26.5 61.5q0 68 57 115.5t121 47.5q26 0 43 -4zM153 -13q-23 6 -47 6q-48 0 -95.5 -41t-47.5 -93q0 -28 21 -47t53 -19q27 0 48.5 18.5t30.5 46.5q13 37 37 129z" />
+<glyph unicode="&#x287;" horiz-adv-x="330" d="M120 332l-13 7q46 70 75.5 95.5t67.5 25.5q46 0 46 -37q0 -10 -16 -74l-78 -296h75l1 -6q0 -18 -33 -25q-25 -6 -66 -38.5t-67 -71.5q-6 -9 -14 -9q-9 0 -9 8q0 5 1 7l28 103h-80l5 32h84l87 328q2 8 2 14q0 16 -15 16q-12 0 -28 -15.5t-53 -63.5z" />
+<glyph unicode="&#x288;" horiz-adv-x="278" d="M308 428l-5 -32h-84l-138 -520q-7 -26 -7 -42q0 -33 22 -33q18 0 43 30t47 30q16 0 28 -11t12 -28q0 -26 -28 -40.5t-69 -14.5q-56 0 -89.5 24.5t-33.5 58.5q0 21 12 67l126 479h-75l-1 6q0 18 33 25q25 6 66 38.5t67 71.5q6 9 14 9q9 0 9 -8q0 -5 -1 -7l-28 -103h80z " />
+<glyph unicode="&#x289;" d="M479 261l-5 -31h-63l-25 -97q-19 -72 -19 -78q0 -17 11 -17q12 0 29 16t54 65l14 -9q-48 -73 -75 -96t-63 -23q-48 0 -48 48q0 45 43 191q-88 -142 -136.5 -191.5t-100.5 -49.5q-53 0 -53 53q0 18 27 128l15 60h-75l7 31h76l12 48q14 58 14 67q0 12 -11 18t-50 6v14 q69 8 150 27l4 -3l-45 -177h157q21 42 68 171h74l-46 -171h60zM307 230h-148l-36 -147q-3 -9 -3 -16q0 -25 19 -25q45 0 142 147z" />
+<glyph unicode="&#x28a;" horiz-adv-x="537" d="M552 430h-38q-21 0 -36.5 -16t-15.5 -35q0 -7 19.5 -44t19.5 -81q0 -103 -90 -183.5t-190 -80.5q-77 0 -124.5 48t-47.5 120q0 26 6 51q20 81 105 154q18 16 18 37q0 13 -9.5 21.5t-22.5 8.5h-38v20h145q-84 -139 -111 -246q-13 -52 -13 -90q0 -45 25.5 -74.5t70.5 -29.5 q70 0 115.5 58t65.5 137q17 70 17 143q0 46 -6 102h135v-20z" />
+<glyph unicode="&#x28b;" d="M211 438l-75 -311q-6 -24 -6 -32q0 -28 22 -46t54 -18q61 0 115.5 46.5t83.5 110t29 120.5q0 16 -5 29q-2 5 -25.5 26.5t-23.5 43.5q0 16 11 25t25 9q22 0 37 -13.5t20 -36.5q2 -9 2 -30q0 -63 -20.5 -127.5t-57.5 -119.5t-94.5 -89.5t-123.5 -34.5q-127 0 -127 90 q0 22 7 50l53 212q6 24 6 34q0 12 -11 18t-50 6v14q69 8 150 27z" />
+<glyph unicode="&#x28c;" horiz-adv-x="444" d="M426 20v-13q-55 -9 -112 -21q-11 -4 -20 -4q-6 0 -9.5 13t-20.5 101q-18 91 -25 257l-31 -32q-54 -55 -95.5 -125.5t-41.5 -105.5q0 -12 18 -29q25 -22 25 -45q0 -15 -11 -24.5t-27 -9.5q-24 0 -40 18.5t-16 40.5q0 58 63 155q55 85 119 153l22 23q13 14 19 21l15 17 l14 14l11 9t10 6.5t8 1.5q9 0 9 -27v-24q0 -138 24 -278q10 -57 21.5 -75t39.5 -18q20 0 31 1z" />
+<glyph unicode="&#x28d;" horiz-adv-x="667" d="M648 19v-13q-79 -13 -95 -17q-5 -1 -11.5 -3t-10.5 -3t-7 -1q-8 0 -11 5t-8 29q-25 120 -32 281l-192 -305q-6 -10 -13 -10q-8 0 -8 14l-32 353q-99 -123 -132 -175.5t-33 -84.5q0 -14 22 -35q21 -20 21 -41q0 -12 -11.5 -21.5t-27.5 -9.5q-22 0 -37 16t-15 40 q0 91 212 349l9 11q35 43 45 43q8 0 11 -35l29 -310l89 152q23 38 55 99q49 94 64 94q7 0 9 -9t4 -38l4 -91q8 -164 27 -242q7 -27 15.5 -34.5t31.5 -7.5h28z" />
+<glyph unicode="&#x28e;" horiz-adv-x="444" d="M193 255l-21 110q-67 -110 -94.5 -167.5t-27.5 -89.5q0 -16 26 -32q26 -17 26 -39q0 -16 -11.5 -26.5t-28.5 -10.5q-22 0 -37 16t-15 39q0 87 131 305q78 129 151.5 208t116.5 79q23 0 37 -12t14 -31q0 -17 -11.5 -28.5t-27.5 -11.5q-19 0 -34 14t-27 14q-18 0 -48 -33 q-13 -13 -38.5 -46.5t-32.5 -44.5q-10 -20 -10 -35q0 -30 31 -155.5t51 -176.5q14 -37 30.5 -50.5t46.5 -13.5q16 0 31 4v-17q-22 -4 -32 -6q-41 -8 -107 -18h-4q-11 0 -41.5 93t-43.5 162z" />
+<glyph unicode="&#x28f;" horiz-adv-x="633" d="M603 464v-18q-36 -3 -56 -16t-71 -63l-158 -155l-27 -106q-7 -28 -7 -45q0 -43 53 -43v-18h-216v18q23 0 39.5 7t26 20t13.5 24t8 27l27 110l-70 133q-36 69 -54 87t-49 20v18h210v-18q-34 -1 -44 -6t-10 -16q0 -7 11 -29l78 -151l153 151q22 22 22 40q0 10 -37 11v18 h158z" />
+<glyph unicode="&#x290;" horiz-adv-x="405" d="M348 96l-62 -206q-9 -29 -9 -44q0 -16 4.5 -23t18.5 -7q17 0 42 30t47 30q15 0 27.5 -11t12.5 -27q0 -26 -27.5 -41t-65.5 -15q-45 0 -65.5 18.5t-20.5 46.5q0 15 16 69l25 84h-274v18l291 350h-136q-40 0 -58 -11.5t-33 -48.5l-16 4l32 116h283v-11l-300 -357h209 q25 0 43 40z" />
+<glyph unicode="&#x291;" horiz-adv-x="393" d="M380 417l-300 -357h116q50 84 105 84q31 0 50 -16t19 -44q0 -84 -119 -84h-66q-18 -32 -25 -47h-24q1 1 10.5 20t14.5 27h-144v18l291 350h-136q-40 0 -58 -11.5t-33 -48.5l-16 4l32 116h283v-11zM221 60h74q22 0 34.5 8t12.5 19q0 15 -13 25.5t-28 10.5q-36 0 -80 -63z " />
+<glyph unicode="&#x292;" horiz-adv-x="413" d="M517 400l-215 -204q16 3 33 3q54 0 88.5 -35t34.5 -98q0 -133 -87 -216t-203 -83q-57 0 -104 31q-20 13 -31.5 33t-11.5 37q0 18 13 31t36 13q36 0 49 -58q9 -38 22.5 -48t51.5 -10q60 0 121 64t61 169q0 54 -32 80t-87 26q-11 0 -57 -19l-11 11l278 259h-199 q-35 0 -56 -12t-29 -26.5t-20 -47.5h-18l61 150h312v-50z" />
+<glyph unicode="&#x293;" horiz-adv-x="457" d="M544 450l-4 -15l-244 -268q2 0 6 0.5t8 0.5q52 0 95 -32.5t43 -100.5q0 -92 -59.5 -158t-139.5 -93l25 -89h-37l-24 78q-31 -6 -78 -6q-58 0 -93 20.5t-35 56.5q0 41 31 66.5t80 25.5q43 0 68 -27.5t51 -95.5q49 27 83 81t34 122q0 61 -33 90t-87 29q-11 0 -60 -19 l-11 11l264 293h-138q-50 0 -69 -19.5t-37 -68.5h-18l33 118h346zM205 -201q-25 62 -41.5 82.5t-39.5 20.5q-19 0 -33 -16t-14 -37q0 -25 26 -39t55 -14q35 0 47 3z" />
+<glyph unicode="&#x294;" d="M152 102l68 254q79 1 136.5 69.5t57.5 150.5q0 90 -59 90q-20 0 -39 -18t-24 -42q-16 -68 -55 -68q-18 0 -32 13t-14 29q0 17 11.5 39t37.5 37q48 27 110 27q85 0 122 -35.5t37 -89.5q0 -90 -68.5 -153.5t-142.5 -68.5l-62 -234q-9 -32 -9 -50q0 -22 14 -28.5t51 -8.5 v-15h-237v15q45 3 62 15q20 14 35 72z" />
+<glyph unicode="&#x295;" d="M155 102l62 234q-51 10 -85.5 40t-34.5 85q0 38 13.5 75.5t41 71t76.5 54.5t112 21q31 0 65.5 -10.5t53.5 -25.5q36 -29 36 -65q0 -18 -13 -31t-35 -13q-19 0 -32.5 16.5t-18.5 43.5q-4 23 -22 45.5t-44 22.5q-50 0 -94 -67.5t-44 -124.5q0 -49 33 -83.5t81 -34.5 l-67 -254q-8 -28 -8 -49q0 -19 13 -27.5t48 -10.5v-15h-237v15q49 2 67.5 17t32.5 70z" />
+<glyph unicode="&#x296;" horiz-adv-x="393" d="M413 662v-15q-49 -2 -67.5 -17t-32.5 -70l-60 -227q51 -10 85.5 -40t34.5 -85q0 -38 -13.5 -75.5t-41 -71t-76.5 -54.5t-112 -21q-31 0 -65.5 10.5t-53.5 25.5q-36 28 -36 65q0 18 13 31t35 13q19 0 32.5 -16.5t18.5 -43.5q4 -23 22 -45.5t44 -22.5q50 0 94 67.5 t44 124.5q0 49 -33 83.5t-81 34.5l65 247q8 34 8 49q0 19 -13 27.5t-48 10.5v15h237z" />
+<glyph unicode="&#x297;" horiz-adv-x="450" d="M28 -84l92 367q18 71 80 114.5t133 43.5q53 0 89.5 -33.5t36.5 -83.5q0 -22 -10.5 -41.5t-29.5 -19.5q-11 0 -20 8.5t-9 19.5q0 9 7 25t7 24q0 29 -19.5 47.5t-45.5 18.5q-38 0 -78.5 -28.5t-49.5 -66.5l-97 -387q-3 -14 -3 -28q0 -38 23.5 -63t61.5 -25q54 0 91.5 34.5 t50.5 86.5q2 8 4 24h25l-9 -38q-16 -65 -71 -109t-132 -44q-55 0 -93 35t-38 87q0 17 4 32z" />
+<glyph unicode="&#x298;" horiz-adv-x="723" d="M421 332q0 -27 -17.5 -45.5t-45.5 -18.5q-24 0 -43.5 18t-19.5 45q0 26 18.5 44.5t44.5 18.5t44.5 -18t18.5 -44zM704 432q0 -115 -57 -218.5t-156 -167t-213 -63.5q-115 0 -185.5 67.5t-70.5 181.5q0 118 60 221.5t159.5 164.5t211.5 61q119 0 185 -68t66 -179zM611 445 q0 94 -43.5 150t-127.5 56q-60 0 -119.5 -36.5t-104.5 -96t-73 -140t-28 -163.5q0 -92 42.5 -145.5t127.5 -53.5q80 0 156.5 64.5t123 164.5t46.5 200z" />
+<glyph unicode="&#x299;" horiz-adv-x="460" d="M126 464h208q171 0 171 -92q0 -56 -37.5 -87.5t-97.5 -39.5q109 -21 109 -93q0 -70 -64.5 -111t-159.5 -41h-236v18q44 0 64.5 16.5t29.5 54.5l70 281q4 15 4 29q0 21 -13.5 32t-47.5 15v18zM237 260h53q136 0 136 108q0 64 -112 64h-16q-18 0 -24 -22zM228 226l-40 -162 q-2 -8 -2 -12q0 -20 43 -20q68 0 114 30t46 94q0 23 -10.5 37.5t-32 21.5t-43.5 9t-54 2h-21z" />
+<glyph unicode="&#x29a;" horiz-adv-x="479" d="M198 249v2q-93 21 -93 83q0 39 24 69.5t63 48.5q52 23 105 23q84 0 128.5 -45.5t44.5 -121.5q0 -131 -85 -226.5t-207 -95.5q-57 0 -107.5 25t-50.5 80q0 45 25 80t66 55q35 17 87 23zM283 233h-13q-58 0 -107 -37.5t-49 -94.5q0 -37 23 -58t62 -21q57 0 106 52.5 t74 117.5t25 115q0 57 -22.5 96t-71.5 39q-45 0 -81 -33.5t-36 -79.5q0 -31 23 -48.5t60 -17.5h7v-30z" />
+<glyph unicode="&#x29b;" horiz-adv-x="570" d="M473 167l-32 -131q-3 -14 -84 -30.5t-108 -16.5q-102 0 -161 41t-59 125q0 122 98 204t219 82q17 0 36.5 -2.5t31.5 -4.5t35 -7t31 -7q13 42 43 68.5t70 26.5q22 0 39.5 -13t17.5 -35t-20 -22q-12 0 -19 7.5t-9.5 17t-9 17t-17.5 7.5q-34 0 -49 -67l-26 -124h-16 q-10 57 -42.5 84.5t-92.5 27.5q-99 0 -167.5 -80.5t-68.5 -182.5q0 -64 39 -100.5t110 -36.5q29 0 67.5 9t43.5 30l26 106q5 22 5 29q0 12 -7 18t-16 7.5t-32 3.5v13h189v-13q-31 -2 -44.5 -11.5t-20.5 -39.5z" />
+<glyph unicode="&#x29c;" horiz-adv-x="572" d="M671 464v-18q-45 -3 -60 -15t-25 -52l-72 -289q-5 -22 -5 -34q0 -20 12.5 -28.5t42.5 -9.5v-18h-216v18q46 2 60 15.5t26 60.5l32 126h-242l-32 -126q-6 -22 -6 -38q0 -19 12 -28t42 -10v-18h-215v18q46 3 60.5 17t26.5 62l70 282q6 23 6 36q0 17 -12 23t-44 8v18h215 v-18q-43 -3 -58.5 -14.5t-25.5 -52.5l-31 -126h242l31 126q6 24 6 37q0 16 -11.5 21.5t-44.5 8.5v18h216z" />
+<glyph unicode="&#x29d;" horiz-adv-x="403" d="M394 598q0 -20 -15 -35t-35 -15q-23 0 -38.5 14.5t-15.5 37.5q0 22 16 37t37 15q20 0 35.5 -16.5t15.5 -37.5zM361 438l-104 -410q-13 -56 -28 -88q54 -67 100 -173h-40q-24 62 -75 137q-69 -137 -190 -137q-44 0 -74 26.5t-30 67.5q0 58 51 98.5t107 40.5q53 0 91 -23 l77 312q16 65 16 80q0 17 -10.5 24t-37.5 7h-26v16q45 3 169 25zM161 -55q-16 8 -45 14t-43 6q-40 0 -79 -30.5t-39 -71.5q0 -31 25.5 -46t63.5 -15q26 0 45 10t32.5 33.5t20.5 42.5t19 57z" />
+<glyph unicode="&#x29e;" horiz-adv-x="463" d="M473 428l-141 -528q-18 -66 -18 -88q0 -24 51 -24h18v-16q-75 -9 -157 -27l-6 6l120 456l-43 -33q-143 -110 -143 -140q0 -18 37 -18h14v-16h-179v16q36 2 76 29.5t149 124.5l-37 88q-55 129 -81 129q-21 0 -45 -42q-5 -8 -15 -26l-15 11q35 63 58 86t53 23 q22 0 39.5 -17.5t41.5 -64.5q30 -58 60 -141l40 32l48 180h75z" />
+<glyph unicode="&#x29f;" horiz-adv-x="470" d="M473 127l-67 -127h-381v18q38 1 53 14.5t24 50.5l73 294q7 28 7 39q0 15 -10.5 21.5t-39.5 8.5v18h193v-18q-42 -2 -55 -16.5t-22 -53.5l-76 -307q-3 -9 -3 -18q0 -12 12 -15.5t46 -3.5h50q88 0 134 43q15 15 43 52h19z" />
+<glyph unicode="&#x2a0;" horiz-adv-x="480" d="M395 379l27 84q18 56 51.5 87.5t73.5 31.5q53 0 85 -18q34 -19 34 -53q0 -12 -8.5 -22.5t-24.5 -10.5q-31 0 -47 30q-16 31 -38 31q-19 0 -30.5 -16t-26.5 -71l-172 -603q-2 -8 -2 -11q0 -31 57 -31h15v-16h-237v16q46 3 64 15t27 41l90 290q-59 -94 -104 -129t-104 -35 q-47 0 -73.5 31t-26.5 85q0 77 44.5 156t113 129.5t135.5 50.5q63 0 77 -62zM380 359q0 25 -17 42.5t-42 17.5q-41 0 -93 -49q-51 -49 -84 -119t-33 -132q0 -77 53 -77q41 0 82 36q51 44 92.5 131.5t41.5 149.5z" />
+<glyph unicode="&#x2a1;" d="M176 193l44 163q79 1 136.5 69.5t57.5 150.5q0 90 -59 90q-20 0 -39 -18t-24 -42q-16 -68 -55 -68q-18 0 -32 13t-14 29q0 17 11.5 39t37.5 37q48 27 110 27q85 0 122 -35.5t37 -89.5q0 -90 -68.5 -153.5t-142.5 -68.5l-39 -143h77l-8 -31h-77l-16 -60q-8 -28 -8 -50 t13.5 -28.5t50.5 -8.5v-15h-236v15q44 3 61 15q21 15 36 72l16 60h-78l8 31h78z" />
+<glyph unicode="&#x2a2;" d="M179 193l38 143q-51 10 -85.5 40t-34.5 85q0 38 13.5 75.5t41 71t76.5 54.5t112 21q31 0 65.5 -10.5t53.5 -25.5q36 -29 36 -65q0 -18 -13 -31t-35 -13q-19 0 -32.5 16.5t-18.5 43.5q-4 23 -22 45.5t-44 22.5q-50 0 -94 -67.5t-44 -124.5q0 -49 33 -83.5t81 -34.5 l-43 -163h75l-8 -31h-75l-16 -60q-8 -28 -8 -49q0 -19 13 -27.5t48 -10.5v-15h-237v15q49 2 67.5 17t32.5 70l16 60h-79l8 31h79z" />
+<glyph unicode="&#x2a3;" horiz-adv-x="743" d="M741 417l-300 -357h209q26 0 43 40l16 -4l-29 -96h-302q-24 -13 -50 -13q-19 0 -30 12t-11 33q0 30 13 89q-43 -73 -84.5 -102.5t-93.5 -29.5q-50 0 -78.5 30.5t-28.5 86.5q0 119 96.5 227t195.5 108q31 0 45 -13t21 -45l45 163q14 49 14 71q0 16 -11 20t-53 6v17 q77 7 153 23l6 -6l-39 -151l-27 -98h280v-11zM669 368h-136q-40 0 -58 -11.5t-33 -48.5l-12 3l-60 -216q-7 -26 -7 -35q0 -20 18 -20q15 0 25 12zM356 361q0 26 -14.5 41.5t-32.5 15.5q-47 0 -91 -46q-50 -53 -83 -126.5t-33 -135.5q0 -34 15.5 -53.5t42.5 -19.5q45 0 91 49 t75.5 125t29.5 150z" />
+<glyph unicode="&#x2a4;" horiz-adv-x="743" d="M780 400l-206 -204q11 3 24 3q54 0 88.5 -35t34.5 -98q0 -133 -87 -216t-203 -83q-57 0 -104 31q-20 13 -31.5 33t-11.5 37q0 18 13 31t36 13q36 0 49 -58q9 -38 22.5 -48t51.5 -10q60 0 121 64t61 169q0 57 -34 81.5t-78 24.5q-13 0 -37 -27l-88 -90q-30 -31 -73 -31 q-19 0 -30 12t-11 33q0 30 13 89q-43 -73 -84.5 -102.5t-93.5 -29.5q-50 0 -78.5 30.5t-28.5 86.5q0 119 96.5 227t195.5 108q31 0 45.5 -14t19.5 -44h1l45 163q14 49 14 71q0 16 -11 20t-53 6v17q77 7 153 23l6 -6l-59 -227h312v-50zM729 386h-202q-47 0 -67.5 -21 t-33.5 -67l-54 -195q-9 -36 -9 -43q0 -20 18 -20q8 0 21 13zM356 361q0 26 -14.5 41.5t-32.5 15.5q-47 0 -91 -46q-50 -53 -83 -126.5t-33 -135.5q0 -34 15.5 -53.5t42.5 -19.5q45 0 91 49t75.5 125t29.5 150z" />
+<glyph unicode="&#x2a5;" horiz-adv-x="754" d="M741 417l-300 -357h116q50 84 105 84q31 0 50 -16t19 -44q0 -84 -119 -84h-66q-18 -32 -25 -47h-24q1 1 10.5 20t14.5 27h-144q-30 -13 -50 -13q-19 0 -30 12t-11 33q0 30 13 89q-43 -73 -84.5 -102.5t-93.5 -29.5q-50 0 -78.5 30.5t-28.5 86.5q0 119 96.5 227t195.5 108 q31 0 46 -14t20 -44l45 163q14 49 14 71q0 16 -11 20t-53 6v17q77 7 153 23l6 -6l-39 -152l-27 -97h280v-11zM582 60h74q22 0 34.5 8t12.5 19q0 15 -13 25.5t-28 10.5q-36 0 -80 -63zM669 368h-136q-40 0 -58 -11.5t-33 -48.5l-12 3l-60 -215q-7 -24 -7 -36q0 -20 18 -20 q14 0 27 15zM356 361q0 26 -14.5 41.5t-32.5 15.5q-47 0 -91 -46q-50 -53 -83 -126.5t-33 -135.5q0 -34 15.5 -53.5t42.5 -19.5q45 0 91 49t75.5 125t29.5 150z" />
+<glyph unicode="&#x2a6;" d="M523 442l-20 -140h-16q-14 116 -89 116q-27 0 -43 -15t-16 -42q0 -38 54 -102q68 -79 68 -136q0 -61 -40.5 -97.5t-103.5 -36.5q-29 0 -55 10q-45 18 -70 53q-19 -29 -50 -46t-58 -17q-46 0 -46 37q0 10 16 74l78 296h-75l-1 6q0 18 33 25q25 6 66 38.5t67 71.5q6 9 14 9 q9 0 9 -8q0 -5 -1 -7l-28 -103h107q29 13 64 13q20 0 56 -10q22 -7 36 -7q20 0 30 18h14zM214 117l13 -7q-6 -10 -9 -14q26 -86 91 -86q35 0 55.5 20t20.5 57q0 45 -56 115q-63 79 -63 131q0 36 19 63h-78l-87 -328q-2 -8 -2 -14q0 -16 15 -16q12 0 28 15.5t53 63.5z" />
+<glyph unicode="&#x2a7;" horiz-adv-x="517" d="M320 428l10 37q25 94 86 156t150 62q37 0 63 -15.5t26 -40.5q0 -16 -12.5 -27t-27.5 -11q-22 0 -47 30t-41 30q-62 0 -98 -140l-136 -524q-24 -94 -85 -156t-150 -62q-36 0 -63 15.5t-27 39.5q0 17 12.5 28t27.5 11q22 0 47 -30t41 -30q60 0 94 127l38 146 q-50 -46 -81.5 -65.5t-62.5 -19.5q-46 0 -46 37q0 10 16 74l78 296h-75l-1 6q0 18 33 25q25 6 66 38.5t67 71.5q6 9 14 9q9 0 9 -8q0 -5 -1 -7l-28 -103h104zM312 396h-105l-87 -328q-2 -8 -2 -14q0 -16 15 -16q21 0 106 79z" />
+<glyph unicode="&#x2a8;" horiz-adv-x="632" d="M207 396l-87 -328q-2 -8 -2 -17q0 -14 30 -14q32 0 84 25q-15 33 -15 81q0 67 34 129.5t89 107.5q77 61 167 61q46 0 75.5 -23t29.5 -58q0 -20 -14 -34t-34 -14t-29.5 11.5t-9.5 28.5q0 9 7.5 23.5t7.5 24.5q0 20 -37 20q-63 0 -109 -48q-91 -96 -91 -233q0 -26 4 -40 q103 50 178 50q34 0 59.5 -18.5t25.5 -46.5q0 -45 -34 -72.5t-107 -27.5q-88 0 -128 15t-55 39q-96 -49 -163 -49q-17 0 -31 8.5t-14 28.5q0 10 16 74l78 296h-75l-1 6q0 18 33 25q25 6 66 38.5t67 71.5q6 9 14 9q9 0 9 -8q0 -5 -1 -7l-28 -103h80l-5 -32h-84zM537 79 q0 17 -16 27t-41 10q-74 0 -165 -45q9 -23 39.5 -36.5t50.5 -15.5t38 -2q47 0 70.5 17.5t23.5 44.5z" />
+<glyph unicode="&#x2b0;" horiz-adv-x="378" d="M380 420l11 -9q-38 -49 -64.5 -67t-58.5 -18q-16 0 -26 8.5t-10 22.5q0 12 17 68l46 154q6 22 6 24q0 19 -25 19q-21 0 -57 -30t-69 -74q-26 -35 -41 -68.5t-39 -116.5h-63l120 404q13 41 13 52q0 8 -11 13t-24 5h-22v11q67 8 132 20l6 -4l-102 -331q108 156 192 156 q27 0 41 -13.5t14 -35.5q0 -11 -4 -23l-60 -188q-5 -18 -5 -25q0 -13 14 -13q10 0 23 11t46 48z" />
+<glyph unicode="&#x2b1;" horiz-adv-x="378" d="M7 333l112 377q17 55 63.5 91.5t103.5 36.5q53 0 90.5 -15.5t37.5 -39.5q0 -11 -8 -19t-20 -8q-5 0 -9.5 1.5t-7 2.5t-7 5t-6.5 6l-6 9q-5 6 -7 8q-26 31 -54 31q-33 0 -61.5 -27.5t-39.5 -63.5l-69 -225q108 156 192 156q28 0 41.5 -13.5t13.5 -35.5q0 -11 -4 -23 l-60 -188q-5 -15 -5 -25q0 -5 4.5 -9t9.5 -4q10 0 22.5 10.5t46.5 48.5l11 -9q-38 -49 -64 -67t-58 -18q-37 0 -37 31q0 12 17 68l46 154q6 22 6 24q0 19 -24 19q-22 0 -58 -30t-69 -74q-26 -35 -41 -68.5t-39 -116.5h-63z" />
+<glyph unicode="&#x2b2;" horiz-adv-x="300" d="M350 810q0 -16 -11 -27t-27 -11q-18 0 -29.5 11t-11.5 29q0 16 11.5 27.5t28.5 11.5q16 0 27.5 -12.5t11.5 -28.5zM325 688l-79 -311q-23 -92 -57.5 -135t-84.5 -43q-26 0 -43 13t-17 33q0 14 9 24t22 10q30 0 30 -28q0 -9 -4.5 -15t-4.5 -11q0 -8 13 -8q23 0 38.5 29 t35.5 108l55 221q12 49 12 61q0 13 -8 18t-29 5h-19v13q31 1 128 18z" />
+<glyph unicode="&#x2b3;" horiz-adv-x="320" d="M116 519l13 28q26 55 82 108q37 35 68 35q19 0 30 -11t11 -29t-11 -30t-30 -12q-17 0 -30 20q-7 11 -14 11q-24 0 -71 -73q-29 -45 -46.5 -85t-49.5 -136h-66l70 228q14 44 14 65q0 20 -33 20q-14 0 -27 -2v13l135 21l2 -2z" />
+<glyph unicode="&#x2b4;" horiz-adv-x="320" d="M318 690l-70 -228q-14 -44 -14 -65q0 -20 33 -20q1 0 27 2v-13l-135 -21l-2 2l47 169l-13 -28q-26 -55 -82 -108q-37 -35 -68 -35q-19 0 -30 11t-11 29t11 30t30 12q17 0 30 -20q7 -11 14 -11q24 0 71 73q29 45 46.5 85t49.5 136h66z" />
+<glyph unicode="&#x2b5;" horiz-adv-x="320" d="M318 690l-107 -347q-26 -82 -26 -109q0 -22 10.5 -33.5t27.5 -11.5q15 0 36.5 23.5t39.5 23.5q15 0 25.5 -8t10.5 -22q0 -21 -24 -32t-57 -11q-56 0 -88.5 24t-32.5 72q0 22 30 121l41 135l-14 -27q-32 -61 -81 -108q-37 -35 -68 -35q-19 0 -30 11t-11 29t11 30t30 12 q15 0 30 -20q7 -11 14 -11q23 0 71 73q30 45 47.5 85t48.5 136h66z" />
+<glyph unicode="&#x2b6;" horiz-adv-x="390" d="M462 671h-9q-25 0 -51 -25l-127 -124q82 -21 82 -72q0 -47 -49.5 -76t-117.5 -29h-184v13q35 4 49 17t24 50l47 187q5 22 5 28q0 28 -47 31v13h182v-13q-33 -2 -48.5 -15t-24.5 -47l-20 -78h31l161 153h97v-13zM167 507l-33 -134q20 -5 40 -5q44 0 74 22.5t30 58.5 q0 30 -32 47q-21 11 -64 11h-15z" />
+<glyph unicode="&#x2b7;" d="M321 678l26 -278q78 97 104 138.5t26 66.5q0 11 -17 28q-17 16 -17 32q0 10 9 17.5t22 7.5q17 0 29 -13t12 -32q0 -64 -168 -276q-33 -42 -42 -42q-6 0 -9 27l-23 246l-70 -121q-43 -76 -44 -78q-38 -74 -50 -74q-9 0 -10 37q-10 207 -25 263q-5 22 -12 28t-25 6h-22v9 q45 8 75 15q4 1 9 2t8.5 2t5.5 1q6 0 8 -4t7 -23q19 -78 25 -222l152 240q5 8 10 8q6 0 6 -11z" />
+<glyph unicode="&#x2b8;" horiz-adv-x="330" d="M218 499l16 -83q93 155 93 195q0 11 -20 24t-20 30q0 12 8.5 20t21.5 8q17 0 28.5 -12.5t11.5 -29.5q0 -67 -99 -232q-60 -98 -115.5 -157.5t-88.5 -59.5q-17 0 -27.5 9t-10.5 23q0 13 8.5 22t20.5 9q14 0 26 -11t21 -11q14 0 36 25q10 11 29.5 36.5t24.5 33.5q7 16 7 26 q0 23 -23.5 118.5t-38.5 133.5q-11 28 -23.5 38.5t-34.5 10.5q-11 0 -24 -3v12q65 13 94 18q1 0 6 0.5t9 0.5q8 0 31 -70.5t33 -123.5z" />
+<glyph unicode="&#x2bb;" horiz-adv-x="333" d="M232 686l4 -19q-51 -28 -76.5 -60.5t-25.5 -49.5q0 -10 10 -10q2 0 10.5 2t14.5 2q21 0 35.5 -12.5t14.5 -37.5q0 -29 -24 -43.5t-48 -14.5q-13 0 -27 4t-27.5 19t-13.5 40q0 20 4 33q15 55 64.5 97t84.5 50z" />
+<glyph unicode="&#x2c0;" horiz-adv-x="326" d="M67 446h12q68 0 110.5 45t42.5 111q0 75 -47 75q-17 0 -31.5 -15t-18.5 -32q-12 -55 -42 -55q-17 0 -27.5 10.5t-10.5 24.5q0 13 10 30.5t30 28.5q37 21 88 21q124 0 124 -99q0 -83 -60.5 -149t-135.5 -66q-13 0 -18 1l-26 -82h-37z" />
+<glyph unicode="&#x2c1;" horiz-adv-x="326" d="M141 295l14 82q-5 -1 -18 -1q-49 0 -81.5 32t-32.5 82v6q4 83 51 138.5t146 55.5q52 0 89 -25q34 -22 34 -55q0 -14 -10.5 -24.5t-27.5 -10.5q-30 0 -41 52q-4 19 -19 34.5t-32 15.5q-41 0 -78 -52.5t-37 -97.5q0 -35 29.5 -58t75.5 -23h12l-37 -151h-37z" />
+<glyph unicode="&#x2c6;" horiz-adv-x="333" d="M385 492h-36l-82 104l-137 -104h-39l157 169h49z" />
+<glyph unicode="&#x2c7;" horiz-adv-x="333" d="M426 661l-162 -169h-48l-95 169h38l89 -105l141 105h37z" />
+<glyph unicode="&#x2d8;" horiz-adv-x="333" d="M389 650h29q-11 -67 -60 -112.5t-113 -45.5q-67 0 -97.5 39.5t-30.5 118.5h29q8 -99 107 -99q46 0 83 26.5t53 72.5z" />
+<glyph unicode="&#x2d9;" horiz-adv-x="333" d="M305 557q0 -20 -14.5 -34.5t-34.5 -14.5q-21 0 -35 14.5t-14 35.5q0 20 14.5 34t35.5 14q19 0 33.5 -15t14.5 -34z" />
+<glyph unicode="&#x2da;" horiz-adv-x="333" d="M355 607q0 -41 -29.5 -70t-70.5 -29q-43 0 -71.5 29t-28.5 71q0 40 29.5 69.5t69.5 29.5q42 0 71.5 -29.5t29.5 -70.5zM321 607q0 28 -19.5 47t-47.5 19q-26 0 -45.5 -19.5t-19.5 -45.5q0 -28 18.5 -47t46.5 -19q29 0 48 18.5t19 46.5z" />
+<glyph unicode="&#x2db;" horiz-adv-x="333" d="M183 -74l17 -18q-52 -77 -125 -77q-40 0 -67.5 26.5t-27.5 68.5q0 61 70 114h24q-33 -45 -33 -93q0 -23 16.5 -38t42.5 -15q47 0 83 32z" />
+<glyph unicode="&#x2dc;" horiz-adv-x="333" d="M399 624h28q-22 -104 -95 -104q-18 0 -57 15q-71 29 -95 29q-36 0 -51 -47h-29q15 58 38 82t62 24q32 0 86 -24q41 -19 62 -19q20 0 31.5 9.5t19.5 34.5z" />
+<glyph unicode="&#x2dd;" horiz-adv-x="333" d="M263 494l160 160q10 10 27 10q15 0 25.5 -10.5t10.5 -25.5q0 -20 -17 -30l-171 -104h-35zM93 494l160 160q10 10 27 10q15 0 25.5 -10.5t10.5 -25.5q0 -20 -17 -30l-169 -104h-37z" />
+<glyph unicode="&#x2e0;" horiz-adv-x="315" d="M335 684v-11q-7 0 -13.5 -3.5t-10.5 -6t-10 -9.5l-8 -10q-2 -3 -8 -13t-7 -11l-125 -191l14 -75q4 -22 4 -34q0 -44 -23 -73t-63 -29q-26 0 -44 12.5t-18 34.5q0 32 21 60l56 73l-26 157q-8 54 -19 93q-6 25 -31 25v11h133v-11h-11q-26 -3 -26 -29q0 -13 3 -34l24 -155 l104 163q17 28 17 38q0 17 -27 17v11h94zM107 372l-44 -61q-12 -24 -12 -43q0 -12 7 -20t19 -8q18 0 30.5 13.5t12.5 33.5q0 13 -5 38z" />
+<glyph unicode="&#x2e1;" horiz-adv-x="220" d="M214 833l-111 -424q-6 -21 -6 -32q0 -13 12 -13q20 0 49 42l18 25l10 -7q-32 -52 -56 -71.5t-54 -19.5q-35 0 -35 41q0 10 3 21l99 381q2 7 2 14q0 16 -35 16h-13v11q44 5 112 20z" />
+<glyph unicode="&#x2e2;" horiz-adv-x="300" d="M290 691l-16 -110h-13q-10 91 -69 91q-21 0 -34 -12t-13 -33q0 -29 43 -79q53 -63 53 -107q0 -48 -31.5 -76.5t-81.5 -28.5q-22 0 -43 8q-17 7 -34 7q-15 0 -23 -16h-12l15 124h13q16 -105 78 -105q28 0 43.5 15.5t15.5 43.5q0 36 -43 90q-50 62 -50 103q0 38 26 61 t69 23q17 0 44 -8q19 -5 28 -5q15 0 24 14h11z" />
+<glyph unicode="&#x2e3;" horiz-adv-x="380" d="M217 623l10 -45q41 64 67 88.5t52 24.5q14 0 23.5 -8t9.5 -21t-7.5 -21t-19.5 -8q-7 0 -19 7t-22 7q-23 0 -78 -96q0 -13 6 -36l26 -106q7 -32 23 -32q15 0 38 32l16 22l12 -7q-35 -54 -54.5 -72.5t-41.5 -18.5q-19 0 -29 12t-18 42l-23 94l-70 -94q-25 -34 -40 -44 t-35 -10q-39 0 -39 34q0 12 7.5 20t19.5 8q10 0 25 -9q14 -7 20 -7q13 0 41 39l65 92l-23 98q-8 36 -14.5 45t-21.5 9q-9 0 -45 -10l-2 13q71 26 101 26q15 0 23 -13.5t17 -54.5z" />
+<glyph unicode="&#x2e4;" horiz-adv-x="318" d="M87 412l41 166q-93 19 -93 96q0 66 47.5 119.5t141.5 53.5q45 0 82 -21q39 -23 39 -57q0 -14 -10.5 -24.5t-27.5 -10.5q-30 0 -40 50q-5 21 -19.5 35.5t-31.5 14.5q-39 0 -72.5 -52.5t-33.5 -97.5q0 -38 25 -64.5t62 -26.5l-45 -181q-7 -32 -7 -39q0 -15 10 -20.5 t37 -7.5v-12h-184v12q39 2 53.5 13t25.5 54z" />
+<glyph unicode="&#x2ec;" horiz-adv-x="320" d="M305 70l-132 -217h-26l-132 217h69l76 -120l76 120h69z" />
+<glyph unicode="&#x2ed;" horiz-adv-x="405" d="M395 611h-385v54h385v-54zM395 507h-385v54h385v-54z" />
+<glyph unicode="&#x384;" horiz-adv-x="289" d="M160 494l94 132q17 23 43 23q9 0 17 -6t8 -16q0 -15 -40 -52l-88 -81h-34z" />
+<glyph unicode="&#x385;" horiz-adv-x="333" d="M160 494l94 132q17 23 43 23q9 0 17 -6t8 -16q0 -15 -40 -52l-88 -81h-34zM168 543q0 -20 -14.5 -34.5t-34.5 -14.5q-21 0 -35 14.5t-14 35.5q0 20 14.5 34t35.5 14q19 0 33.5 -15t14.5 -34zM387 543q0 -20 -14.5 -34.5t-34.5 -14.5q-21 0 -35 14.5t-14 35.5 q0 20 14.5 34t35.5 14q19 0 33.5 -15t14.5 -34z" />
+<glyph unicode="&#x386;" horiz-adv-x="611" d="M139 523l94 132q17 23 43 23q9 0 17 -6t8 -16q0 -15 -40 -52l-88 -81h-34zM564 0h-245v16q45 2 61 14t16 39q0 8 -2 26l-20 131h-220l-59 -111q-22 -41 -22 -66q0 -30 62 -33v-16h-186v16q34 7 55.5 32t78.5 124l285 496h26l92 -553q10 -62 24 -79t54 -20v-16zM369 262 l-45 263l-149 -263h194z" />
+<glyph unicode="&#x387;" horiz-adv-x="333" d="M261 384q0 -23 -16.5 -38.5t-40.5 -15.5q-22 0 -38 16t-16 38q0 24 16 40.5t39 16.5t39.5 -16.5t16.5 -40.5z" />
+<glyph unicode="&#x388;" horiz-adv-x="630" d="M7 523l94 132q17 23 43 23q9 0 17 -6t8 -16q0 -15 -40 -52l-88 -81h-34zM679 653l-31 -154l-22 2q3 25 3 46q0 45 -37 59t-155 14q-42 0 -55 -4.5t-18 -21.5l-66 -233h78q66 0 88 16t51 81l18 -4l-68 -232l-20 5q7 31 7 52q0 24 -7 31q-17 15 -78 15h-78l-32 -112 q-36 -127 -36 -146q0 -34 79 -34q129 0 203 39q38 20 94 98l16 -8l-62 -162h-507v16q43 8 56 19.5t25 54.5l123 442q11 37 11 64q0 20 -15.5 28.5t-61.5 12.5v16h497z" />
+<glyph unicode="&#x389;" horiz-adv-x="740" d="M4 523l94 132q17 23 43 23q9 0 17 -6t8 -16q0 -15 -40 -52l-88 -81h-34zM821 653v-16q-44 -8 -58 -20t-26 -54l-132 -481q-3 -12 -3 -24q0 -21 15 -29t64 -13v-16h-274v16q51 4 71.5 21t30.5 56l64 233h-285l-66 -244q-3 -10 -3 -22q0 -22 12.5 -30t57.5 -14v-16h-245v16 q41 4 56.5 20t29.5 66l118 430q12 46 12 64q0 21 -14.5 28.5t-62.5 12.5v16h271v-16q-45 -3 -67.5 -19t-32.5 -52l-54 -198h285l46 164q14 52 14 63q0 19 -16 29t-56 13v16h248z" />
+<glyph unicode="&#x38a;" horiz-adv-x="350" d="M3 523l94 132q17 23 43 23q9 0 17 -6t8 -16q0 -15 -40 -52l-88 -81h-34zM429 653v-16q-42 -5 -55.5 -18t-26.5 -59l-120 -429q-15 -53 -15 -76q0 -20 12.5 -27t56.5 -12v-16h-244v16q42 8 57.5 21t26.5 54l120 441q13 46 13 62q0 20 -16 30.5t-56 12.5v16h247z" />
+<glyph unicode="&#x38c;" horiz-adv-x="722" d="M58 523l94 132q17 23 43 23q9 0 17 -6t8 -16q0 -15 -40 -52l-88 -81h-34zM699 418q0 -107 -57.5 -205t-149.5 -160q-105 -71 -214 -71q-99 0 -158.5 62t-59.5 172q0 91 49 187.5t128 165.5q112 97 237 97q107 1 166 -66t59 -182zM594 481q0 71 -34.5 111.5t-94.5 40.5 q-99 0 -186 -117q-53 -72 -83.5 -163t-30.5 -169q0 -82 33.5 -125.5t96.5 -43.5q92 0 170 95q59 74 94 181t35 190z" />
+<glyph unicode="&#x38e;" horiz-adv-x="580" d="M725 604l-16 -7q-17 25 -40 25q-47 0 -92.5 -40.5t-79 -104t-55.5 -119t-37 -107.5l-40 -140q-10 -34 -10 -55q0 -19 11.5 -27t41.5 -10l36 -3v-16h-289v16q51 3 72.5 19t34.5 63l56 197q10 66 10 128q0 105 -24.5 149t-84.5 44q-20 0 -46 -11l-7 14q36 26 61.5 37.5 t57.5 11.5q143 0 143 -207q0 -30 -2 -46h3v1q37 101 100.5 175.5t121.5 74.5q28 0 48 -14q18 -14 26 -48zM8 523l94 132q17 23 43 23q9 0 17 -6t8 -16q0 -15 -40 -52l-88 -81h-34z" />
+<glyph unicode="&#x38f;" horiz-adv-x="762" d="M242 94l5 37q-147 48 -147 203q0 65 35.5 129t96.5 114q109 89 273 89q118 0 176 -62t58 -168q0 -107 -76.5 -193t-205.5 -112l-7 -37h128q24 2 34 3.5t27 7t26.5 13.5t21 23.5t19.5 37.5l18 -5l-56 -174h-280l40 166q87 19 146.5 103.5t59.5 182.5q0 181 -140 181 q-108 0 -192 -87q-97 -102 -97 -216q0 -61 21 -105.5t63 -58.5l-24 -166h-271l42 179l17 -5q-4 -20 -4 -36q0 -26 16 -35t46 -9h131zM50 523l94 132q17 23 43 23q9 0 17 -6t8 -16q0 -15 -40 -52l-88 -81h-34z" />
+<glyph unicode="&#x390;" horiz-adv-x="278" d="M222 114l13 -11q-42 -65 -71 -89.5t-66 -24.5q-49 0 -49 55q0 29 22 111l48 177q9 32 9 44q0 15 -11.5 19t-52.5 5v16q46 4 160 25l4 -3l-94 -343q-10 -34 -10 -44q0 -15 14 -15q25 0 84 78zM160 494l94 132q17 23 43 23q9 0 17 -6t8 -16q0 -15 -40 -52l-88 -81h-34z M168 543q0 -20 -14.5 -34.5t-34.5 -14.5q-21 0 -35 14.5t-14 35.5q0 20 14.5 34t35.5 14q19 0 33.5 -15t14.5 -34zM387 543q0 -20 -14.5 -34.5t-34.5 -14.5q-21 0 -35 14.5t-14 35.5q0 20 14.5 34t35.5 14q19 0 33.5 -15t14.5 -34z" />
+<glyph unicode="&#x391;" horiz-adv-x="611" d="M564 0h-245v16q45 2 61 14t16 39q0 8 -2 26l-20 131h-220l-59 -111q-22 -41 -22 -66q0 -30 62 -33v-16h-186v16q34 7 55.5 32t78.5 124l285 496h26l92 -553q10 -62 24 -79t54 -20v-16zM369 262l-45 263l-149 -263h194z" />
+<glyph unicode="&#x392;" horiz-adv-x="611" d="M130 653h250q208 0 208 -150q0 -70 -64 -113q-34 -23 -111 -39v-1q126 -38 126 -150q0 -98 -74.5 -149t-200.5 -51h-272v16q41 6 55.5 20t27.5 60l121 436q11 39 11 64q0 22 -15 29.5t-62 11.5v16zM248 363h38q98 0 149.5 39t51.5 113q0 56 -28 82t-89 26 q-23 0 -31.5 -1.5t-15.5 -9t-12 -25.5zM238 331l-32 -119q-35 -133 -35 -140q0 -42 67 -42q88 0 140.5 44t52.5 126q0 45 -19 77t-48 42q-34 12 -126 12z" />
+<glyph unicode="&#x393;" horiz-adv-x="611" d="M645 653l-32 -154l-21 2q3 22 3 33q0 39 -14 55.5t-54 23.5t-131 7q-35 0 -49 -6.5t-19 -25.5l-132 -473q-14 -50 -14 -60q0 -18 17 -27t60 -12v-16h-251v16q41 3 56 19t27 59l123 442q10 36 10 61q0 21 -13.5 28.5t-62.5 11.5v16h497z" />
+<glyph unicode="&#x394;" horiz-adv-x="611" d="M526 0h-558l400 668h26zM411 94l-87 432l-255 -432h342z" />
+<glyph unicode="&#x395;" horiz-adv-x="611" d="M634 653l-31 -154l-22 2q3 25 3 46q0 45 -37 59t-155 14q-42 0 -55 -4.5t-18 -21.5l-66 -233h78q66 0 88 16t51 81l18 -4l-68 -232l-20 5q7 31 7 52q0 24 -7 31q-16 15 -78 15h-78l-32 -112q-36 -127 -36 -146q0 -34 79 -34q129 0 203 39q38 20 94 98l16 -8l-62 -162 h-507v16q43 8 56 19.5t25 54.5l123 442q11 37 11 64q0 20 -15.5 28.5t-61.5 12.5v16h497z" />
+<glyph unicode="&#x396;" horiz-adv-x="556" d="M606 639l-483 -603h161q71 0 108.5 6t64.5 26q41 30 77 104l19 -3l-54 -169h-505v14l479 603h-171q-102 0 -142 -27q-22 -15 -32.5 -30.5t-33.5 -58.5l-19 5l45 147h486v-14z" />
+<glyph unicode="&#x397;" horiz-adv-x="722" d="M769 653v-16q-44 -8 -58 -20t-26 -54l-132 -481q-3 -12 -3 -24q0 -21 15 -29t64 -13v-16h-274v16q51 4 71.5 21t30.5 56l64 233h-285l-66 -244q-3 -10 -3 -22q0 -22 12.5 -30t57.5 -14v-16h-245v16q41 4 56.5 20t29.5 66l118 430q12 46 12 64q0 21 -14.5 28.5t-62.5 12.5 v16h271v-16q-45 -3 -67.5 -19t-32.5 -52l-54 -198h285l46 164q14 52 14 63q0 19 -16 29t-56 13v16h248z" />
+<glyph unicode="&#x398;" horiz-adv-x="722" d="M524 429h19q-53 -137 -53 -209h-19q0 32 -10.5 45t-36.5 13h-105q-60 0 -84 -58h-19q53 129 53 209h19q6 -35 16 -46t36 -11h98q29 0 54 15t32 42zM699 418q0 -107 -57.5 -205t-149.5 -160q-105 -71 -218 -71q-99 0 -156.5 61.5t-57.5 172.5q0 91 49 187.5t128 165.5 q112 97 237 97q107 1 166 -66t59 -182zM594 481q0 71 -34.5 111.5t-94.5 40.5q-99 0 -186 -117q-53 -72 -83.5 -163t-30.5 -169q0 -82 33.5 -125.5t96.5 -43.5q92 0 170 95q59 74 94 181t35 190z" />
+<glyph unicode="&#x399;" horiz-adv-x="333" d="M384 653v-16q-42 -5 -55.5 -18t-26.5 -59l-120 -429q-15 -53 -15 -76q0 -20 12.5 -27t56.5 -12v-16h-244v16q42 8 57.5 21t26.5 54l120 441q13 46 13 62q0 20 -16 30.5t-56 12.5v16h247z" />
+<glyph unicode="&#x39a;" horiz-adv-x="667" d="M722 653v-16q-28 0 -77 -37l-298 -225l168 -293q23 -40 40 -50.5t64 -15.5v-16h-275v16l29 3q46 4 46 32q0 6 -1.5 13t-6.5 16l-8 16l-11 19q-8 14 -10 18l-123 215l-65 -237q-11 -39 -11 -51q0 -23 14.5 -31.5t56.5 -12.5v-16h-247v16q43 5 56 17t25 54l124 445 q14 50 14 62q0 21 -17 31t-62 12v16h270v-16q-42 -3 -65 -18.5t-34 -55.5l-53 -194l153 109q143 101 143 137q0 15 -36 19l-24 3v16h221z" />
+<glyph unicode="&#x39b;" horiz-adv-x="611" d="M564 0h-245v16q45 2 61 14t16 39q0 8 -2 26l-70 430l-229 -410q-22 -41 -22 -66q0 -30 62 -33v-16h-186v16q34 7 55.5 32t78.5 124l285 496h26l92 -553q10 -62 24 -79t54 -20v-16z" />
+<glyph unicode="&#x39c;" horiz-adv-x="833" d="M872 653v-16q-41 -7 -55.5 -20.5t-25.5 -53.5l-123 -443q-14 -50 -14 -62q0 -20 18 -30.5t63 -11.5l-1 -16h-271v16q49 5 69 22t33 64l126 459l-376 -561h-17l-62 546l-118 -428q-9 -32 -9 -54q0 -43 70 -48v-16h-197v16q40 5 58.5 28.5t41.5 105.5l114 401q12 41 12 52 q0 30 -74 34v16h181l56 -492l335 492h166z" />
+<glyph unicode="&#x39d;" horiz-adv-x="667" d="M727 653v-16q-27 -6 -37.5 -9.5t-23 -21t-18.5 -38.5l-23 -76l-146 -507h-18l-230 550l-114 -422q-9 -31 -9 -54q0 -21 15.5 -30.5t54.5 -12.5v-16h-198v16q43 6 61 31.5t45 120.5l117 415q-23 54 -86 54v16h160l207 -499l106 388q8 28 8 44q0 27 -13.5 37t-55.5 14v16 h198z" />
+<glyph unicode="&#x39e;" horiz-adv-x="651" d="M680 653l-44 -164l-17 2q2 18 2 23q0 28 -14 38.5t-58 10.5h-285q-41 0 -64.5 -14.5t-38.5 -54.5l-18 4l42 155h495zM553 456l-59 -218l-17 2q2 12 2 27q0 21 -10.5 29t-50.5 8h-150q-33 0 -53.5 -12t-35.5 -49l-18 4l56 209l19 -4q-3 -11 -3 -29q0 -22 14.5 -27.5 t47.5 -5.5h143q33 0 51.5 8.5t25.5 19.5t20 41zM587 174l-56 -174h-537l44 179l17 -5q-4 -19 -4 -36q0 -44 62 -44h319q52 0 84 16t53 69z" />
+<glyph unicode="&#x39f;" horiz-adv-x="722" d="M699 418q0 -107 -57.5 -205t-149.5 -160q-105 -71 -214 -71q-99 0 -158.5 62t-59.5 172q0 91 49 187.5t128 165.5q112 97 237 97q107 1 166 -66t59 -182zM594 481q0 71 -34.5 111.5t-94.5 40.5q-99 0 -186 -117q-53 -72 -83.5 -163t-30.5 -169q0 -82 33.5 -125.5 t96.5 -43.5q92 0 170 95q59 74 94 181t35 190z" />
+<glyph unicode="&#x3a0;" horiz-adv-x="722" d="M769 653v-16q-44 -8 -58 -20t-26 -54l-132 -481q-3 -12 -3 -24q0 -21 15 -29t64 -13v-16h-274v16q50 4 70.5 20.5t31.5 56.5l145 520h-285l-147 -531q-3 -10 -3 -22q0 -22 12.5 -30t57.5 -14v-16h-245v16q41 4 56.5 20t29.5 66l118 430q12 46 12 64q0 21 -14.5 28.5 t-62.5 12.5v16h638z" />
+<glyph unicode="&#x3a1;" horiz-adv-x="611" d="M146 653h241q218 0 218 -148q0 -40 -18.5 -78.5t-49.5 -64.5q-69 -57 -205 -57q-55 0 -90 8l-53 -193q-14 -54 -14 -63q0 -18 15 -27.5t54 -13.5v-16h-244v16q43 6 56.5 19.5t27.5 62.5l116 414q17 61 17 83q0 20 -14 28.5t-57 13.5v16zM320 592l-69 -245q29 -5 52 -5 q87 0 128 24q71 40 71 134q0 123 -130 123q-44 0 -52 -31z" />
+<glyph unicode="&#x3a3;" horiz-adv-x="620" d="M659 653l-31 -154l-22 2q3 15 3 43q0 45 -32.5 59t-122.5 14h-178l160 -262l-300 -261h305q57 0 90 23.5t60 81.5l19 -3l-66 -196h-550v15l350 310l-193 314v14h508z" />
+<glyph unicode="&#x3a4;" horiz-adv-x="556" d="M633 653l-44 -164l-17 2q3 25 3 46q0 81 -101 81h-58l-137 -490q-14 -49 -14 -66q0 -23 11 -31.5t42 -11.5l35 -3v-16h-288v16q52 5 74 20t33 55l143 527q-119 0 -160.5 -21.5t-77.5 -102.5l-18 4l42 155h532z" />
+<glyph unicode="&#x3a5;" horiz-adv-x="556" d="M648 604l-16 -7q-17 25 -40 25q-47 0 -92.5 -40.5t-79 -104t-55.5 -119t-37 -107.5l-40 -140q-10 -34 -10 -55q0 -19 11.5 -27t41.5 -10l36 -3v-16h-289v16q51 3 72.5 19t34.5 63l56 197q10 66 10 128q0 105 -24.5 149t-84.5 44q-20 0 -46 -11l-7 14q36 26 61.5 37.5 t57.5 11.5q143 0 143 -207q0 -30 -2 -46h3v1q37 101 100.5 175.5t121.5 74.5q28 0 48 -14q18 -14 26 -48z" />
+<glyph unicode="&#x3a6;" horiz-adv-x="741" d="M510 582l-12 -42q101 -4 167 -47t66 -132q0 -96 -91 -173q-85 -72 -260 -75q-11 -29 -11 -56q0 -23 21 -32t72 -9v-16h-297v16h9q46 0 70 20.5t36 76.5q-98 1 -164 45.5t-66 132.5q0 95 88 171q86 74 261 78q14 49 14 64q0 19 -12.5 26t-57.5 7v16h287v-16h-17 q-88 0 -103 -55zM488 510l-99 -361q120 0 179 63q60 64 60 154q0 63 -35.5 100.5t-104.5 43.5zM291 149l99 361q-113 0 -180 -70q-32 -34 -44.5 -68.5t-12.5 -83.5q0 -129 138 -139z" />
+<glyph unicode="&#x3a7;" horiz-adv-x="611" d="M655 653v-16q-33 -11 -60.5 -31.5t-64.5 -63.5l-169 -194l101 -255q18 -45 36 -58t69 -19v-16h-271v16q43 1 60 9.5t17 27.5q0 16 -14 51l-67 165l-151 -172q-23 -26 -23 -48q0 -33 66 -33v-16h-213v16q40 7 76 40.5t144 159.5l83 97l-103 255q-15 37 -33.5 51t-61.5 18 v16h263v-16q-41 -5 -56 -13.5t-15 -27.5q0 -17 16 -56l59 -147l145 167q21 24 21 43q0 31 -61 34v16h207z" />
+<glyph unicode="&#x3a8;" horiz-adv-x="675" d="M778 667v-16q-17 -4 -29.5 -12t-20 -22t-11 -23.5t-8.5 -29.5l-7 -29q-19 -65 -54 -111.5t-79.5 -72t-90.5 -36.5t-98 -11l-59 -210q-6 -24 -6 -32q0 -24 18.5 -35t71.5 -11v-16h-289v16q49 0 72.5 17t34.5 57l59 214q-197 0 -197 146q0 30 17 81t17 66q0 54 -42 54v16 h29q47 0 73.5 -28t26.5 -82q0 -17 -10.5 -58t-10.5 -60q0 -47 29 -72.5t78 -25.5l59 217q10 37 10 46q0 19 -11 26t-50 7h-11v16h278v-16h-17q-77 0 -93 -55l-67 -241q15 1 39 9t55 23.5t58 46t38 69.5q12 43 22.5 69t31 54t53 41.5t78.5 13.5h13z" />
+<glyph unicode="&#x3a9;" horiz-adv-x="762" d="M242 94l5 37q-147 48 -147 203q0 65 35.5 129t96.5 114q109 89 273 89q118 0 176 -62t58 -168q0 -107 -76.5 -193t-205.5 -112l-7 -37h128q24 2 34 3.5t27 7t26.5 13.5t21 23.5t19.5 37.5l18 -5l-56 -174h-280l40 166q87 19 146.5 103.5t59.5 182.5q0 181 -140 181 q-108 0 -192 -87q-97 -102 -97 -216q0 -61 21 -105.5t63 -58.5l-24 -166h-271l42 179l17 -5q-4 -20 -4 -36q0 -26 16 -35t46 -9h131z" />
+<glyph unicode="&#x3aa;" horiz-adv-x="333" d="M260 807q0 -20 -14.5 -34.5t-34.5 -14.5q-21 0 -35 14.5t-14 35.5q0 20 14.5 34t35.5 14q19 0 33.5 -15t14.5 -34zM460 807q0 -20 -14.5 -34.5t-34.5 -14.5q-21 0 -35 14.5t-14 35.5q0 20 14.5 34t35.5 14q19 0 33.5 -15t14.5 -34zM384 653v-16q-42 -5 -55.5 -18 t-26.5 -59l-120 -429q-15 -53 -15 -76q0 -20 12.5 -27t56.5 -12v-16h-244v16q42 8 57.5 21t26.5 54l120 441q13 46 13 62q0 20 -16 30.5t-56 12.5v16h247z" />
+<glyph unicode="&#x3ab;" horiz-adv-x="556" d="M648 604l-16 -7q-17 25 -40 25q-47 0 -92.5 -40.5t-79 -104t-55.5 -119t-37 -107.5l-40 -140q-10 -34 -10 -55q0 -19 11.5 -27t41.5 -10l36 -3v-16h-289v16q51 3 72.5 19t34.5 63l56 197q10 66 10 128q0 105 -24.5 149t-84.5 44q-20 0 -46 -11l-7 14q36 26 61.5 37.5 t57.5 11.5q143 0 143 -207q0 -30 -2 -46h3v1q37 101 100.5 175.5t121.5 74.5q28 0 48 -14q18 -14 26 -48zM376 807q0 -20 -14.5 -34.5t-34.5 -14.5q-21 0 -35 14.5t-14 35.5q0 20 14.5 34t35.5 14q19 0 33.5 -15t14.5 -34zM576 807q0 -20 -14.5 -34.5t-34.5 -14.5 q-21 0 -35 14.5t-14 35.5q0 20 14.5 34t35.5 14q19 0 33.5 -15t14.5 -34z" />
+<glyph unicode="&#x3ac;" horiz-adv-x="552" d="M549 428l-142 -261v-18q0 -39 9 -69t25 -30q23 0 51 74l16 -7q-37 -126 -101 -126q-49 0 -52 105q-88 -107 -194 -107q-69 0 -101.5 42t-32.5 110q0 61 24.5 120.5t66.5 102.5q34 34 80.5 55.5t92.5 21.5q60 0 93 -35.5t33 -83.5l46 106h86zM359 272q0 148 -77 148 q-52 0 -112.5 -92t-60.5 -203q0 -48 17 -81.5t52 -33.5q73 0 165 191q1 6 5.5 19.5t7.5 26.5t3 25zM300 494l94 132q17 23 43 23q9 0 17 -6t8 -16q0 -15 -40 -52l-88 -81h-34z" />
+<glyph unicode="&#x3ad;" horiz-adv-x="444" d="M360 98l16 -10q-78 -99 -199 -99q-147 0 -147 111q0 45 33 81t83 49q-25 4 -39 22.5t-14 41.5q1 60 62.5 103.5t161.5 43.5q48 0 78 -23.5t30 -59.5q0 -20 -16 -33t-32 -13q-18 0 -28.5 11t-10.5 29q0 10 7.5 24.5t7.5 23.5q0 20 -37 20q-53 0 -97 -30t-44 -92 q0 -26 20.5 -39.5t53.5 -13.5q3 0 21 3.5t32 3.5t24 -6t10 -15q0 -27 -45 -27q-9 0 -22 4.5t-24 4.5q-44 0 -86.5 -28t-42.5 -79q0 -42 26 -61.5t63 -19.5q87 0 155 73zM248 494l94 132q17 23 43 23q9 0 17 -6t8 -16q0 -15 -40 -52l-88 -81h-34z" />
+<glyph unicode="&#x3ae;" horiz-adv-x="474" d="M148 228l2 -1q133 214 221 214q31 0 51 -14.5t20 -42.5q0 -24 -10 -63l-87 -321q-30 -109 -30 -171q0 -15 8 -34h-73q-11 13 -11 44q0 50 33 170l75 274q14 47 14 72q0 35 -25 35q-40 0 -113 -93.5t-102 -190.5l-32 -106h-75l82 305q14 50 14 62q0 17 -14 17 q-4 0 -8.5 -2t-9.5 -6l-10 -9q-4 -4 -9.5 -10.5t-9 -11t-9 -11t-7.5 -8.5l-12 10q13 22 29 41q49 61 97 61q40 0 40 -45q0 -41 -39 -165zM231 494l94 132q17 23 43 23q9 0 17 -6t8 -16q0 -15 -40 -52l-88 -81h-34z" />
+<glyph unicode="&#x3af;" horiz-adv-x="278" d="M222 114l13 -11q-42 -65 -71 -89.5t-66 -24.5q-49 0 -49 55q0 29 22 111l48 177q9 32 9 44q0 15 -11.5 19t-52.5 5v16q46 4 160 25l4 -3l-94 -343q-10 -34 -10 -44q0 -15 14 -15q25 0 84 78zM126 494l94 132q17 23 43 23q9 0 17 -6t8 -16q0 -15 -40 -52l-88 -81h-34z" />
+<glyph unicode="&#x3b0;" horiz-adv-x="478" d="M276 426v15q85 0 127.5 -29.5t42.5 -108.5q0 -47 -21.5 -101.5t-56.5 -101.5t-85.5 -78.5t-103.5 -31.5q-134 0 -134 104q0 42 32 146l28 93q8 29 8 39q0 14 -12 14q-22 0 -69 -60l-13 9q70 106 131 106q44 0 44 -45q0 -25 -8 -52l-50 -181q-11 -39 -11 -74q0 -78 57 -78 q50 0 93.5 59.5t65 131.5t21.5 125q0 54 -20 74t-66 25zM207 494l94 132q17 23 43 23q9 0 17 -6t8 -16q0 -15 -40 -52l-88 -81h-34zM215 543q0 -20 -14.5 -34.5t-34.5 -14.5q-21 0 -35 14.5t-14 35.5q0 20 14.5 34t35.5 14q19 0 33.5 -15t14.5 -34zM434 543 q0 -20 -14.5 -34.5t-34.5 -14.5q-21 0 -35 14.5t-14 35.5q0 20 14.5 34t35.5 14q19 0 33.5 -15t14.5 -34z" />
+<glyph unicode="&#x3b1;" horiz-adv-x="552" d="M549 428l-142 -261v-18q0 -39 9 -69t25 -30q23 0 51 74l16 -7q-37 -126 -101 -126q-49 0 -52 105q-88 -107 -194 -107q-69 0 -101.5 42t-32.5 110q0 61 24.5 120.5t66.5 102.5q34 34 80.5 55.5t92.5 21.5q60 0 93 -35.5t33 -83.5l46 106h86zM359 272q0 148 -77 148 q-52 0 -112.5 -92t-60.5 -203q0 -48 17 -81.5t52 -33.5q73 0 165 191q1 6 5.5 19.5t7.5 26.5t3 25z" />
+<glyph unicode="&#x3b2;" horiz-adv-x="506" d="M-9 -127l137 495q13 48 27.5 86.5t37.5 82t50 73t66 49t84 19.5q47 0 84 -24.5t37 -76.5q0 -57 -39.5 -108t-88.5 -73v-1q33 -3 60.5 -32.5t27.5 -78.5q0 -69 -53 -147.5t-124 -117.5q-53 -30 -124 -30q-29 0 -66 17l-38 -133q-14 -49 -31 -78h-78q16 24 31 78zM233 477 l-114 -432q0 -16 13.5 -26.5t34.5 -10.5q82 0 150 102t68 207q0 59 -40 59q-9 0 -25.5 -4t-24.5 -4q-13 0 -21.5 6.5t-8.5 15.5q0 24 44 24q3 0 19 -3t24 -3q31 0 60.5 56t29.5 102q0 53 -18 72t-49 19q-50 0 -86.5 -53t-55.5 -127z" />
+<glyph unicode="&#x3b3;" horiz-adv-x="410" d="M438 428l-274 -389l-3 -51q-1 -16 -5 -51.5t-10 -55t-15.5 -43t-24 -34t-33.5 -10.5q-38 0 -38 50q0 24 16.5 61t43.5 86t37 71q15 140 15 181q0 129 -48 129q-15 0 -33 -19t-31 -57h-16q37 139 99 139q36 0 50 -30.5t14 -87.5q0 -28 -3 -62t-8.5 -75.5t-6.5 -52.5 l178 301h96z" />
+<glyph unicode="&#x3b4;" horiz-adv-x="460" d="M460 604q0 -19 -9.5 -33.5t-29.5 -14.5q-18 0 -29 7.5t-16.5 18t-12.5 21t-22.5 18t-40.5 7.5q-32 0 -63 -16t-31 -42t26 -50t71.5 -53.5t68.5 -51.5q35 -33 50 -63.5t15 -84.5q0 -105 -75.5 -191.5t-189.5 -86.5q-71 0 -109.5 37t-38.5 105q0 96 76 178.5t172 91.5 l-34 32q-25 24 -35 35.5t-21 32t-11 39.5q0 45 30 75.5t66.5 41.5t72.5 11q44 0 82 -16.5t38 -47.5zM356 266q0 60 -19 87t-48 27q-66 0 -123.5 -88t-57.5 -191q0 -41 21.5 -66t56.5 -25q43 0 84 48t63.5 107t22.5 101z" />
+<glyph unicode="&#x3b5;" horiz-adv-x="444" d="M360 98l16 -10q-78 -99 -199 -99q-147 0 -147 111q0 45 33 81t83 49q-25 4 -39 22.5t-14 41.5q1 60 62.5 103.5t161.5 43.5q48 0 78 -23.5t30 -59.5q0 -20 -16 -33t-32 -13q-18 0 -28.5 11t-10.5 29q0 10 7.5 24.5t7.5 23.5q0 20 -37 20q-53 0 -97 -30t-44 -92 q0 -26 20.5 -39.5t53.5 -13.5q3 0 21 3.5t32 3.5t24 -6t10 -15q0 -27 -45 -27q-9 0 -22 4.5t-24 4.5q-44 0 -86.5 -28t-42.5 -79q0 -42 26 -61.5t63 -19.5q87 0 155 73z" />
+<glyph unicode="&#x3b6;" horiz-adv-x="454" d="M290 683l5 -15q-35 -13 -54 -32t-19 -38q0 -40 48 -48q30 36 84 71.5t90 35.5q31 0 31 -25q0 -33 -61.5 -69.5t-128.5 -42.5q-71 -48 -137.5 -156.5t-66.5 -200.5q0 -49 27.5 -71t81.5 -22q7 0 21 0.5t17 0.5q63 0 97 -25t34 -67q0 -45 -28 -85q-22 -34 -61 -56.5 t-73 -22.5q-28 0 -47.5 13t-19.5 39q0 17 12 29.5t31 12.5q16 0 34.5 -14.5t30.5 -14.5q33 0 57 19.5t24 49.5q0 50 -76 50q-13 0 -44.5 -5t-46.5 -5q-122 0 -122 118q0 208 212 415l-1 1q-26 0 -48 15.5t-22 42.5q0 32 30.5 59.5t88.5 42.5z" />
+<glyph unicode="&#x3b7;" horiz-adv-x="474" d="M148 228l2 -1q133 214 221 214q31 0 51 -14.5t20 -42.5q0 -24 -10 -63l-87 -321q-30 -109 -30 -171q0 -15 8 -34h-73q-11 13 -11 44q0 50 33 170l75 274q14 47 14 72q0 35 -25 35q-40 0 -113 -93.5t-102 -190.5l-32 -106h-75l82 305q14 50 14 62q0 17 -14 17 q-4 0 -8.5 -2t-9.5 -6l-10 -9q-4 -4 -9.5 -10.5t-9 -11t-9 -11t-7.5 -8.5l-12 10q13 22 29 41q49 61 97 61q40 0 40 -45q0 -41 -39 -165z" />
+<glyph unicode="&#x3b8;" horiz-adv-x="480" d="M494 511q0 -115 -37 -220t-97 -185q-88 -117 -205 -117q-60 0 -94 46t-34 126q0 151 65.5 278.5t156.5 196.5q56 42 122 42q56 0 89.5 -41t33.5 -126zM147 347h233q30 102 30 205q0 105 -53 105q-40 0 -87 -61t-77.5 -128.5t-45.5 -120.5zM373 315h-233q-29 -76 -29 -165 q0 -140 56 -140q34 0 69 33t61.5 83t46 99t29.5 90z" />
+<glyph unicode="&#x3b9;" horiz-adv-x="278" d="M222 114l13 -11q-42 -65 -71 -89.5t-66 -24.5q-49 0 -49 55q0 29 22 111l48 177q9 32 9 44q0 15 -11.5 19t-52.5 5v16q46 4 160 25l4 -3l-94 -343q-10 -34 -10 -44q0 -15 14 -15q25 0 84 78z" />
+<glyph unicode="&#x3ba;" horiz-adv-x="444" d="M153 225l3 1q133 171 229 210q13 5 26 5q26 0 40 -13.5t14 -33.5q0 -21 -13 -33.5t-33 -12.5q-12 0 -28 9.5t-26 9.5q-26 0 -54 -22.5t-90 -87.5l98 -172q25 -44 42 -56.5t49 -12.5v-16q-39 -13 -69 -13q-62 0 -98 64l-93 160l-60 -211h-76l86 309q14 53 14 67 q0 24 -33 24h-28v14q53 7 151 27l3 -3z" />
+<glyph unicode="&#x3bb;" horiz-adv-x="458" d="M415 123h16q-31 -139 -101 -139q-23 0 -38 23.5t-15 70.5q0 27 2.5 61t7 87t6.5 89l-209 -315h-96l310 428q4 36 4 79q0 108 -49 108q-14 0 -33 -18t-32 -56h-16q33 137 101 137q28 0 46 -35t18 -100q0 -68 -10 -200.5t-10 -195.5q0 -53 9.5 -76.5t31.5 -23.5q30 0 57 76 z" />
+<glyph unicode="&#x3bc;" horiz-adv-x="526" d="M469 117l14 -9q-46 -71 -74.5 -95t-62.5 -24q-21 0 -35 12t-14 33q0 31 15 76l33 104h-1q-68 -121 -113.5 -172t-89.5 -51q-28 0 -36 28l-19 -77l-16 -60q-4 -19 -10 -39t-11 -30t-11 -18h-71q24 35 44 112l131 521h75l-75 -298q-4 -18 -4 -27q0 -48 40 -48t105 96.5 t80 154.5l33 122h77l-79 -300q-19 -76 -19 -77q0 -15 11 -15q12 0 28.5 15.5t54.5 65.5z" />
+<glyph unicode="&#x3bd;" horiz-adv-x="470" d="M443 434l16 -4q-11 -64 -29 -122t-51.5 -118t-77 -103.5t-109 -72.5t-144.5 -32q-28 0 -28 22q0 6 3 13l92 333q2 10 2 17q0 16 -15 21t-50 6v16l163 31l3 -2l-105 -378q232 22 330 373z" />
+<glyph unicode="&#x3be;" horiz-adv-x="454" d="M296 683l4 -16q-73 -24 -73 -72q0 -24 29 -29q91 61 143 61q47 0 47 -31q0 -30 -39.5 -47.5t-116.5 -17.5q-37 0 -61 -34t-24 -61q0 -34 26 -53q59 41 138 41q53 0 53 -30q0 -18 -13 -30.5t-33 -18.5t-37 -8.5t-32 -2.5q-29 0 -72 13q-54 -18 -103.5 -75t-50.5 -109 q0 -49 27.5 -71t81.5 -22q7 0 21 0.5t17 0.5q63 0 97 -25t34 -67q0 -45 -28 -85q-22 -34 -61 -56.5t-73 -22.5q-28 0 -47.5 13t-19.5 39q0 17 12 29.5t31 12.5q16 0 34.5 -14.5t30.5 -14.5q33 0 57 19.5t24 49.5q0 50 -76 50q-13 0 -44.5 -5t-46.5 -5q-122 0 -122 118 q1 82 49.5 151t125.5 107q-37 25 -37 63q0 59 58 107q-13 0 -30 13.5t-17 31.5q0 73 117 103z" />
+<glyph unicode="&#x3bf;" d="M468 301q0 -57 -28.5 -118.5t-77.5 -110.5q-83 -83 -188 -83q-70 0 -108.5 36.5t-38.5 102.5q0 83 50.5 162t129.5 121q56 30 120 30q62 0 101.5 -37.5t39.5 -102.5zM384 326q0 45 -19 69.5t-52 24.5q-67 0 -128 -91q-74 -113 -74 -228q0 -44 21 -67.5t57 -23.5 q61 0 121 83q34 46 54 110.5t20 122.5z" />
+<glyph unicode="&#x3c0;" horiz-adv-x="504" d="M536 428l-21 -74h-102q-3 -11 -22 -76l-32 -110q-13 -47 -13 -56q0 -42 31 -42q44 0 71 61h16q-13 -55 -49.5 -98.5t-87.5 -43.5q-30 0 -44.5 21.5t-14.5 53.5q0 34 17 80l76 210h-104q-12 -32 -38 -124.5t-52 -149.5t-62 -86q-17 -12 -36 -12q-20 0 -35 13t-15 31 q0 41 30 49q50 13 72 70l82 209h-6q-45 0 -69 -9t-54 -46h-16q42 70 87.5 99.5t119.5 29.5h271z" />
+<glyph unicode="&#x3c1;" horiz-adv-x="504" d="M-9 -135l75 286q34 132 103 211t150 79q23 0 37 -1t38.5 -8t39 -20.5t26 -41t11.5 -66.5q0 -115 -95.5 -215t-202.5 -100q-38 0 -68 17l-36 -141q-10 -41 -31 -70h-78q20 31 31 70zM382 312q0 46 -17.5 77t-48.5 31q-43 0 -86 -51t-65 -130q-46 -166 -46 -194 q0 -16 14 -26.5t35 -10.5q62 1 113 53t76 120.5t25 130.5z" />
+<glyph unicode="&#x3c2;" horiz-adv-x="454" d="M453 386q0 -54 -50 -54q-12 0 -44 5.5t-49 5.5q-90 0 -159.5 -51.5t-69.5 -128.5q0 -49 27.5 -71t81.5 -22q7 0 21 0.5t17 0.5q63 0 97 -25t34 -67q0 -45 -28 -85q-22 -34 -61 -56.5t-73 -22.5q-28 0 -47.5 13t-19.5 39q0 17 12 29.5t31 12.5q16 0 34.5 -14.5t30.5 -14.5 q33 0 57 19.5t24 49.5q0 50 -76 50q-13 0 -44.5 -5t-46.5 -5q-122 0 -122 118q0 88 53 166.5t131 123t154 44.5q31 0 58 -14t27 -41z" />
+<glyph unicode="&#x3c3;" horiz-adv-x="498" d="M531 428l-18 -74h-170q15 -24 41 -44.5t40.5 -40t14.5 -52.5q0 -84 -81.5 -156t-184.5 -72q-70 0 -108 37.5t-38 103.5q0 69 37 136.5t110 114.5t163 47h194zM355 221q0 46 -16.5 82t-41.5 51q-58 0 -122 -77.5t-64 -176.5q0 -44 21 -67t57 -23q67 0 116.5 72t49.5 139z " />
+<glyph unicode="&#x3c4;" horiz-adv-x="410" d="M426 428l-21 -74h-133q-70 -159 -70 -238q0 -51 36 -51q18 0 40 20.5t35 48.5h16q-18 -61 -58.5 -103t-86.5 -42q-64 0 -64 71q0 79 98 294h-61q-80 0 -129 -88h-16q25 61 77 111.5t119 50.5h218z" />
+<glyph unicode="&#x3c5;" horiz-adv-x="478" d="M276 426v15q85 0 127.5 -29.5t42.5 -108.5q0 -47 -21.5 -101.5t-56.5 -101.5t-85.5 -78.5t-103.5 -31.5q-134 0 -134 104q0 42 32 146l28 93q8 29 8 39q0 14 -12 14q-22 0 -69 -60l-13 9q70 106 131 106q44 0 44 -45q0 -25 -8 -52l-50 -181q-11 -39 -11 -74q0 -78 57 -78 q50 0 93.5 59.5t65 131.5t21.5 125q0 54 -20 74t-66 25z" />
+<glyph unicode="&#x3c6;" horiz-adv-x="622" d="M219 10l47 167q14 51 30 90.5t39.5 79.5t56.5 62t72 22q126 0 126 -127q0 -53 -23.5 -112.5t-74.5 -114t-118 -76.5q-39 -12 -85 -12l-53 -194h-77l54 194q-83 0 -112 11q-74 29 -74 127q0 77 49.5 158.5t122.5 123.5q57 32 99 32v-16q-51 -13 -95 -68.5t-68 -125 t-24 -131.5q0 -50 28 -70t80 -20zM359 249l-64 -239q41 0 69 15q56 30 99 126.5t43 176.5q0 36 -7 55t-15 23t-21 4q-33 0 -57.5 -40.5t-46.5 -120.5z" />
+<glyph unicode="&#x3c7;" horiz-adv-x="457" d="M498 428l-285 -353q-1 -26 -1 -69q0 -89 10.5 -119.5t34.5 -30.5q12 0 28 18.5t29 55.5h16q-27 -137 -93 -137q-32 0 -47.5 36.5t-15.5 91.5q0 74 8 124l-197 -244h-93l287 345v89q0 76 -9.5 109.5t-35.5 33.5q-13 0 -30.5 -17.5t-30.5 -55.5h-16q8 30 15 50t18.5 42 t27.5 33t37 11q29 0 43.5 -32t14.5 -112q0 -3 -0.5 -13t-1.5 -38.5t-2 -71.5l196 254h93z" />
+<glyph unicode="&#x3c8;" horiz-adv-x="584" d="M668 441v-16q-28 -5 -50 -22t-35 -35t-25 -52t-16 -52l-14 -56q-50 -219 -259 -219l-54 -194h-76l54 194h-9q-69 0 -98 21q-53 38 -53 125q0 37 19 102t19 98q0 84 -56 90l1 16h53q83 0 83 -102q0 -28 -17.5 -109t-17.5 -110q0 -58 20.5 -84t61.5 -26l115 418h76 l-115 -418q37 0 68 21q75 53 105 187q10 43 17 68t22.5 58.5t34.5 51.5t51 31.5t73 13.5h22z" />
+<glyph unicode="&#x3c9;" horiz-adv-x="686" d="M472 439h18q80 0 119 -33q45 -38 45 -121q0 -73 -43 -154q-38 -70 -90 -106t-104 -36q-36 0 -60.5 11.5t-34 24.5t-19.5 35q-31 -37 -63.5 -54t-83.5 -17q-53 0 -91 36t-38 105q0 42 10 81q26 96 101 162t176 66h18v-16q-81 0 -134 -65q-38 -47 -62.5 -119.5 t-24.5 -134.5q0 -94 57 -94q33 0 70 34.5t52 76.5q-3 23 -3 51q0 41 12 86q11 42 33 71t48 29q35 0 35 -46q0 -73 -42 -146q-18 -32 -31 -51q-2 -7 -2 -21q0 -34 17.5 -59t47.5 -25q70 0 117 88q22 42 35 100.5t13 109.5q0 42 -5 61q-8 32 -32 43t-61 11v16z" />
+<glyph unicode="&#x3ca;" horiz-adv-x="278" d="M222 114l13 -11q-42 -65 -71 -89.5t-66 -24.5q-49 0 -49 55q0 29 22 111l48 177q9 32 9 44q0 15 -11.5 19t-52.5 5v16q46 4 160 25l4 -3l-94 -343q-10 -34 -10 -44q0 -15 14 -15q25 0 84 78zM159 557q0 -20 -14.5 -34.5t-34.5 -14.5q-21 0 -35 14.5t-14 35.5 q0 20 14.5 34t35.5 14q19 0 33.5 -15t14.5 -34zM359 557q0 -20 -14.5 -34.5t-34.5 -14.5q-21 0 -35 14.5t-14 35.5q0 20 14.5 34t35.5 14q19 0 33.5 -15t14.5 -34z" />
+<glyph unicode="&#x3cb;" horiz-adv-x="478" d="M276 426v15q85 0 127.5 -29.5t42.5 -108.5q0 -47 -21.5 -101.5t-56.5 -101.5t-85.5 -78.5t-103.5 -31.5q-134 0 -134 104q0 42 32 146l28 93q8 29 8 39q0 14 -12 14q-22 0 -69 -60l-13 9q70 106 131 106q44 0 44 -45q0 -25 -8 -52l-50 -181q-11 -39 -11 -74q0 -78 57 -78 q50 0 93.5 59.5t65 131.5t21.5 125q0 54 -20 74t-66 25zM221 557q0 -20 -14.5 -34.5t-34.5 -14.5q-21 0 -35 14.5t-14 35.5q0 20 14.5 34t35.5 14q19 0 33.5 -15t14.5 -34zM421 557q0 -20 -14.5 -34.5t-34.5 -14.5q-21 0 -35 14.5t-14 35.5q0 20 14.5 34t35.5 14 q19 0 33.5 -15t14.5 -34z" />
+<glyph unicode="&#x3cc;" d="M263 494l94 132q17 23 43 23q9 0 17 -6t8 -16q0 -15 -40 -52l-88 -81h-34zM468 301q0 -57 -28.5 -118.5t-77.5 -110.5q-83 -83 -188 -83q-70 0 -108.5 36.5t-38.5 102.5q0 83 50.5 162t129.5 121q56 30 120 30q62 0 101.5 -37.5t39.5 -102.5zM384 326q0 45 -19 69.5 t-52 24.5q-67 0 -128 -91q-74 -113 -74 -228q0 -44 21 -67.5t57 -23.5q61 0 121 83q34 46 54 110.5t20 122.5z" />
+<glyph unicode="&#x3cd;" horiz-adv-x="478" d="M276 426v15q85 0 127.5 -29.5t42.5 -108.5q0 -47 -21.5 -101.5t-56.5 -101.5t-85.5 -78.5t-103.5 -31.5q-134 0 -134 104q0 42 32 146l28 93q8 29 8 39q0 14 -12 14q-22 0 -69 -60l-13 9q70 106 131 106q44 0 44 -45q0 -25 -8 -52l-50 -181q-11 -39 -11 -74q0 -78 57 -78 q50 0 93.5 59.5t65 131.5t21.5 125q0 54 -20 74t-66 25zM216 494l94 132q17 23 43 23q9 0 17 -6t8 -16q0 -15 -40 -52l-88 -81h-34z" />
+<glyph unicode="&#x3ce;" horiz-adv-x="686" d="M472 439h18q80 0 119 -33q45 -38 45 -121q0 -73 -43 -154q-38 -70 -90 -106t-104 -36q-36 0 -60.5 11.5t-34 24.5t-19.5 35q-31 -37 -63.5 -54t-83.5 -17q-53 0 -91 36t-38 105q0 42 10 81q26 96 101 162t176 66h18v-16q-81 0 -134 -65q-38 -47 -62.5 -119.5 t-24.5 -134.5q0 -94 57 -94q33 0 70 34.5t52 76.5q-3 23 -3 51q0 41 12 86q11 42 33 71t48 29q35 0 35 -46q0 -73 -42 -146q-18 -32 -31 -51q-2 -7 -2 -21q0 -34 17.5 -59t47.5 -25q70 0 117 88q22 42 35 100.5t13 109.5q0 42 -5 61q-8 32 -32 43t-61 11v16zM355 494l94 132 q17 23 43 23q9 0 17 -6t8 -16q0 -15 -40 -52l-88 -81h-34z" />
+<glyph unicode="&#x3d0;" horiz-adv-x="456" d="M436 617q0 -33 -22 -60t-55 -42q-56 -26 -162 -26q-20 0 -29 1q-62 -87 -96 -243q29 43 50 68.5t59 48t81 22.5q60 0 92 -50.5t32 -114.5q0 -86 -56 -158.5t-139 -72.5q-43 0 -73 20t-45 54t-21.5 69.5t-6.5 75.5q0 132 44.5 252t138.5 189q60 44 104 44q42 0 73 -19 t31 -58zM183 515h7q60 0 97.5 9.5t72.5 43.5q39 37 39 72q0 14 -9 24t-23 10q-48 0 -99.5 -51t-84.5 -108zM346 268q0 30 -17 52.5t-46 22.5q-38 0 -82.5 -43.5t-73 -98.5t-28.5 -92q0 -30 16 -54.5t44 -24.5q53 0 120 91t67 147z" />
+<glyph unicode="&#x3d1;" horiz-adv-x="556" d="M526 206l-5 -19q-37 3 -71 12q-39 -92 -99 -150.5t-140 -58.5q-134 0 -134 104q0 30 7 53l21 65q8 24 8 39q0 14 -12 14q-22 0 -69 -60l-13 9q70 106 131 106q44 0 44 -45q0 -25 -8 -52l-18 -60q-11 -39 -11 -74q0 -78 57 -78q107 0 168 212q-92 40 -150 112t-58 157 q0 88 55 140q49 46 122 46q54 0 90.5 -30.5t50.5 -73t14 -93.5q0 -129 -47 -257q42 -14 67 -18zM422 484q0 161 -79 161q-41 0 -63 -43.5t-22 -103.5q0 -38 9 -76t41 -86.5t84 -79.5q30 121 30 228z" />
+<glyph unicode="&#x3d2;" horiz-adv-x="596" d="M347 408h3q111 260 259 260q38 0 61 -22.5t23 -54.5q0 -76 -62 -76q-20 0 -33 12.5t-13 32.5q0 18 9.5 29t18.5 15t9 5q0 13 -20 13q-47 0 -94 -41.5t-82.5 -105t-59.5 -119.5t-38 -105l-41 -140q-9 -30 -9 -55q0 -19 11.5 -27t41.5 -10l36 -3v-16h-289v16q51 3 72.5 19 t34.5 63l56 197q10 66 10 128q0 105 -24.5 149t-84.5 44q-20 0 -46 -11l-7 14q36 26 61.5 37.5t57.5 11.5q74 0 108.5 -49t34.5 -149q0 -31 -4 -62z" />
+<glyph unicode="&#x3d5;" horiz-adv-x="627" d="M481 683l-67 -242q70 0 101 -12q80 -31 80 -126q0 -36 -12.5 -77t-38.5 -83t-61.5 -76.5t-86 -56t-107.5 -21.5l-54 -194h-78l54 194q-73 0 -107 11q-77 25 -77 128q0 31 13 71t38.5 82.5t60 78t83 58.5t100.5 23h15l67 242h77zM408 420l-113 -410q37 0 69 16 q57 29 102 130t45 171q0 58 -45 86q-12 7 -58 7zM217 10l114 410q-56 0 -108 -50.5t-82 -124.5t-30 -144q0 -64 48 -83q21 -8 58 -8z" />
+<glyph unicode="&#x3d6;" horiz-adv-x="792" d="M832 428l-22 -74h-64q8 -32 8 -69q0 -73 -43 -154q-38 -70 -90 -106t-104 -36q-51 0 -74.5 18t-39.5 54q-31 -39 -63 -55.5t-84 -16.5q-53 0 -91 36t-38 105q0 42 10 81q21 76 78 143h-35q-46 0 -79 -25.5t-68 -72.5h-16q24 60 80.5 116t120.5 56h614zM664 354h-370 q-35 -47 -59 -119t-24 -131q0 -94 57 -94q35 0 73.5 37t48.5 74q-2 15 -2 59t23 86t56 42q32 0 32 -46q0 -59 -57 -147q-2 -7 -2 -21q0 -34 17.5 -59t47.5 -25q44 0 78.5 33.5t52 83.5t26 96.5t8.5 84.5q0 20 -6 46z" />
+<glyph unicode="&#x3d8;" horiz-adv-x="722" d="M210 -114l27 99q-82 12 -129.5 72.5t-47.5 158.5q0 91 49 187.5t128 165.5q112 97 237 97q107 1 166 -66t59 -182q0 -107 -57.5 -205t-149.5 -160q-76 -51 -159 -66l-17 -61q-15 -53 -15 -76q0 -20 12.5 -27t56.5 -12v-16h-244v16q42 8 57.5 21t26.5 54zM594 481 q0 71 -34.5 111.5t-94.5 40.5q-99 0 -186 -117q-53 -72 -83.5 -163t-30.5 -169q0 -82 33.5 -125.5t96.5 -43.5q92 0 170 95q59 74 94 181t35 190z" />
+<glyph unicode="&#x3d9;" d="M92 -205l54 196q-57 7 -88 42.5t-31 94.5q0 83 50.5 162t129.5 121q56 30 120 30q62 0 101.5 -37.5t39.5 -102.5q0 -57 -28.5 -118.5t-77.5 -110.5q-61 -61 -135 -77l-56 -200h-79zM384 326q0 45 -19 69.5t-52 24.5q-67 0 -128 -91q-74 -113 -74 -228q0 -44 21 -67.5 t57 -23.5q61 0 121 83q34 46 54 110.5t20 122.5z" />
+<glyph unicode="&#x3da;" horiz-adv-x="673" d="M141 -124l18 16q18 -25 60 -39.5t82 -14.5q74 0 124.5 36t50.5 93q0 44 -32 70q-42 34 -174 50q-47 5 -81.5 14.5t-67 27.5t-49.5 49t-17 74q0 84 44.5 162.5t113.5 132.5t153 86.5t163 32.5q136 0 136 -69q0 -25 -13.5 -39t-39.5 -14q-17 0 -30.5 10t-22.5 22t-31 22 t-54 10q-75 0 -150 -38t-126 -107t-51 -148q0 -40 20 -66t56.5 -38t74.5 -19l86 -15q49 -9 81 -22q52 -20 76.5 -56t24.5 -76q0 -110 -75 -170t-177 -60q-118 0 -173 83z" />
+<glyph unicode="&#x3db;" horiz-adv-x="444" d="M467 458h15q-14 -166 -100 -213q-38 -20 -136 -20q-78 0 -121.5 -19t-43.5 -73q0 -65 77 -65q11 0 41.5 9t44.5 9q60 0 87.5 -30.5t27.5 -76.5q0 -45 -28 -85q-22 -34 -61 -56.5t-73 -22.5q-28 0 -47.5 13t-19.5 39q0 17 12 29.5t31 12.5q16 0 34.5 -14.5t30.5 -14.5 q33 0 57 19.5t24 49.5q0 50 -76 50q-13 0 -44.5 -5t-46.5 -5q-48 0 -85 27t-37 81q0 81 64 140q72 66 204 75q133 9 169 146z" />
+<glyph unicode="&#x3dc;" horiz-adv-x="557" d="M645 653l-32 -154l-21 2q3 22 3 33q0 39 -14 55.5t-54 23.5t-131 7q-35 0 -49 -6.5t-19 -25.5l-64 -227h205l-11 -36h-204l-58 -210q-14 -50 -14 -60q0 -18 17 -27t60 -12v-16h-251v16q41 3 56 19t27 59l123 442q10 36 10 61q0 21 -13.5 28.5t-62.5 11.5v16h497z" />
+<glyph unicode="&#x3dd;" horiz-adv-x="487" d="M472 433l-13 -56h-219l-60 -255h180l-9 -37h-180l-64 -275h-75l146 623h294z" />
+<glyph unicode="&#x3de;" horiz-adv-x="645" d="M675 498l-267 -354q-38 -51 -38 -73q0 -37 35 -37q48 0 91 35l8 -15q-85 -72 -146 -72q-40 0 -60 21t-20 50q0 34 18 63.5t82 98.5l162 172l-511 -144l-10 13l278 355q38 46 38 75q0 16 -10 25.5t-25 9.5q-48 0 -91 -35l-8 15q46 38 79 55t67 17q41 0 60.5 -19t19.5 -47 q0 -32 -21 -62.5t-92 -105.5l-162 -172l515 145z" />
+<glyph unicode="&#x3df;" horiz-adv-x="457" d="M445 381l-294 -381h-100l290 307h-310l294 376h100l-290 -302h310z" />
+<glyph unicode="&#x3e0;" horiz-adv-x="708" d="M23 503l-16 18q95 78 181 111.5t183 33.5q129 0 213 -89t84 -236q0 -215 -132 -373t-320 -175v23q97 21 177 98.5t122 179t42 201.5q0 63 -13 120q-57 -10 -108 -56t-87 -111t-60 -127.5t-37 -120.5h-94q14 59 46.5 128t79 137t113 119.5t136.5 66.5q-26 71 -90.5 113 t-143.5 42q-24 0 -45 -4l-75 -280h-43l72 270q-99 -26 -185 -89z" />
+<glyph unicode="&#x3e1;" horiz-adv-x="528" d="M93 532l10 20q261 -79 325 -291q20 -65 20 -137q0 -186 -105 -334l-18 11l11 27q7 16 11.5 28.5t8.5 25.5q21 78 21 156q0 52 -11 115l-180 -90l-9 27l183 92q-10 48 -32 104l-184 -92l-9 28l181 90q-67 143 -223 220z" />
+<glyph unicode="&#x3f0;" horiz-adv-x="533" d="M559 428l-156 -145q-20 -31 -41.5 -84.5t-21.5 -85.5q0 -41 49 -41q25 0 38 -11t13 -27q0 -19 -16 -33t-43 -14q-35 0 -59 23.5t-24 63.5q0 60 48 154l-1 1l-252 -229h-109l148 136q13 22 34 87t21 103q0 17 -6 22.5t-20 5.5q-12 0 -19 1t-17 4.5t-14.5 12.5t-4.5 24 q0 20 17 32.5t36 12.5q31 0 49.5 -20t18.5 -57q0 -72 -45 -181l1 -1l268 246h108z" />
+<glyph unicode="&#x3f1;" horiz-adv-x="516" d="M313 -205h-16q3 6 3 12q0 17 -28 29t-68 25t-80.5 32.5t-68.5 61t-28 100.5q0 149 86 261q41 54 103.5 89.5t126.5 35.5q62 0 101.5 -37.5t39.5 -102.5q0 -57 -28.5 -118.5t-77.5 -110.5q-83 -83 -188 -83q-77 0 -110 57l-2 -1q4 -47 33.5 -73t68 -34t76.5 -13.5t64 -21 t26 -46.5q0 -33 -33 -62zM400 326q0 45 -19 69.5t-52 24.5q-67 0 -128 -91q-74 -113 -74 -228q0 -44 21 -67.5t57 -23.5q61 0 121 83q34 46 54 110.5t20 122.5z" />
+<glyph unicode="&#x3f4;" horiz-adv-x="722" d="M699 418q0 -107 -57.5 -205t-149.5 -160q-105 -71 -214 -71q-99 0 -158.5 62t-59.5 172q0 91 49 187.5t128 165.5q112 97 237 97q107 1 166 -66t59 -182zM197 359h381q16 64 16 122q0 71 -34.5 111.5t-94.5 40.5q-99 0 -186 -117q-49 -65 -82 -157zM567 317h-383 q-19 -69 -19 -133q0 -82 33.5 -125.5t96.5 -43.5q92 0 170 95q64 79 102 207z" />
+<glyph unicode="&#x3f5;" horiz-adv-x="444" d="M420 441l-18 -129h-16q-16 107 -99 107q-48 0 -94.5 -57.5t-59.5 -116.5h179l-6 -32h-180q-10 -31 -10 -68q0 -56 23 -88t66 -32q40 0 70.5 18t76.5 64l16 -10q-47 -58 -88.5 -83t-111.5 -25q-66 0 -102 43t-36 108q0 71 35.5 140.5t97.5 115t130 45.5q27 0 53 -8.5 t37 -8.5q15 0 21 17h16z" />
+<glyph unicode="&#x3f6;" horiz-adv-x="444" d="M92 323l-16 10q47 58 88.5 83t111.5 25q66 0 102 -43t36 -108q0 -71 -35.5 -140.5t-97.5 -115t-130 -45.5q-27 0 -53 8.5t-37 8.5q-15 0 -21 -17h-16l18 129h16q16 -107 99 -107q48 0 94.5 57.5t59.5 116.5h-179l6 32h180q10 31 10 68q0 56 -23 88t-66 32 q-40 0 -70.5 -18t-76.5 -64z" />
+<glyph unicode="&#x401;" horiz-adv-x="611" d="M631 653l-31 -154l-22 2q3 25 3 46q0 45 -37.5 59t-155.5 14q-42 0 -55 -4.5t-18 -21.5l-63 -233h78q66 0 88 16t51 81l18 -4l-68 -232l-20 5q7 31 7 52q0 32 -17.5 39t-67.5 7h-78l-31 -112q-35 -126 -35 -146q0 -34 79 -34q127 0 201 39q38 20 94 98l16 -8l-62 -162 h-504v16q43 8 56 19.5t25 54.5l119 442q11 44 11 64t-15.5 28.5t-61.5 12.5v16h496zM385 807q0 -20 -14.5 -34.5t-34.5 -14.5q-21 0 -35 14.5t-14 35.5q0 20 14.5 34t35.5 14q19 0 33.5 -15t14.5 -34zM585 807q0 -20 -14.5 -34.5t-34.5 -14.5q-21 0 -35 14.5t-14 35.5 q0 20 14.5 34t35.5 14q19 0 33.5 -15t14.5 -34z" />
+<glyph unicode="&#x402;" horiz-adv-x="723" d="M341 336h1q94 88 196 88q125 0 125 -108q0 -97 -50.5 -246.5t-112.5 -214.5q-60 -63 -125 -63q-39 0 -65 24.5t-26 57.5q0 32 16 53t46 21q21 0 36 -13t15 -36q0 -19 -14 -33t-14 -18q0 -19 23 -19q31 0 73 101.5t70 210.5t28 146q0 41 -13 65.5t-52 24.5 q-40 0 -77.5 -19.5t-91.5 -63.5l-45 -166q-16 -62 -16 -70q0 -41 70 -42v-16h-268v16q54 5 75 19t32 56l140 526h-51q-77 0 -111 -25t-66 -98l-18 4l42 155h512l-43 -159l-18 2q3 17 3 41q0 80 -102 80h-50z" />
+<glyph unicode="&#x403;" horiz-adv-x="569" d="M603 653l-44 -164l-17 2q3 18 3 48q0 78 -101 78h-158l-132 -489q-15 -58 -15 -73q0 -18 16.5 -27t59.5 -12v-16h-251v16q42 3 56.5 18.5t26.5 59.5l123 442q10 36 10 61q0 21 -13.5 30.5t-47.5 9.5v16h484zM355 744l162 160q10 10 25 10t25.5 -10.5t10.5 -25.5 q0 -18 -17 -28l-171 -106h-35z" />
+<glyph unicode="&#x404;" horiz-adv-x="657" d="M680 664l-37 -198l-18 1q-9 83 -42 123t-97 40q-109 0 -199 -97q-66 -70 -93 -175h266l-13 -42h-261q-7 -39 -7 -84q0 -101 49 -157t126 -56q51 0 87.5 13.5t36.5 40.5q0 5 -5.5 17t-5.5 25q0 30 18 48t47 18q22 0 36 -15t14 -34q0 -44 -40 -82q-68 -68 -214 -68 q-117 0 -189 69.5t-72 191.5q0 103 51 196.5t136 153.5q102 73 219 73q59 0 107 -17q20 -7 41 -7q27 0 38 22h21z" />
+<glyph unicode="&#x405;" d="M498 667l-40 -200l-18 3q0 83 -25 123t-94 40q-52 0 -82 -26.5t-30 -73.5q0 -38 16 -63.5t83 -92.5q67 -68 90 -109t23 -91q0 -85 -57.5 -140t-144.5 -55q-38 0 -104 23q-32 12 -47 12q-33 0 -43 -32h-18l34 224l20 -2q-2 -9 -2 -23q0 -73 40.5 -120t103.5 -47 q58 0 94.5 35.5t36.5 92.5q0 33 -13 59.5t-47 63.5l-39 42q-3 3 -17 18.5t-22 23.5q-45 48 -60 78.5t-15 71.5q0 76 51.5 120t126.5 44q52 0 85 -14q29 -11 46 -11t26 5t19 21h23z" />
+<glyph unicode="&#x406;" horiz-adv-x="333" d="M382 653v-16q-42 -5 -55.5 -18t-26.5 -59l-116 -429q-15 -53 -15 -76q0 -20 12.5 -27t56.5 -12v-16h-245v16q42 8 57.5 21t26.5 54l117 441q13 46 13 62q0 20 -16 30.5t-56 12.5v16h247z" />
+<glyph unicode="&#x407;" horiz-adv-x="333" d="M358 653v-16q-42 -5 -55.5 -18t-26.5 -59l-116 -429q-15 -53 -15 -76q0 -20 12.5 -27t56.5 -12v-16h-245v16q42 8 57.5 21t26.5 54l117 441q13 46 13 62q0 20 -16 30.5t-56 12.5v16h247zM233 807q0 -20 -14.5 -34.5t-34.5 -14.5q-21 0 -35 14.5t-14 35.5q0 20 14.5 34 t35.5 14q19 0 33.5 -15t14.5 -34zM433 807q0 -20 -14.5 -34.5t-34.5 -14.5q-21 0 -35 14.5t-14 35.5q0 20 14.5 34t35.5 14q19 0 33.5 -15t14.5 -34z" />
+<glyph unicode="&#x408;" horiz-adv-x="444" d="M463 653v-16q-43 -6 -56 -17.5t-26 -56.5l-103 -367q-29 -104 -71 -159t-124 -55q-53 0 -85 24t-32 64q0 24 12.5 40t32.5 16t35.5 -13.5t15.5 -32.5q0 -6 -1.5 -14.5t-1.5 -12.5q0 -39 35 -39t53 64l127 454q12 44 12 64t-15 28.5t-62 12.5v16h254z" />
+<glyph unicode="&#x409;" horiz-adv-x="961" d="M588 364h87q226 0 226 -132q0 -104 -81 -168t-201 -64h-286v16q41 6 56 20.5t27 59.5l129 480q4 16 4 22q0 19 -26 19h-119q-20 0 -29.5 -8.5t-14.5 -29.5l-89 -323q-47 -171 -101 -226q-44 -46 -114 -46q-36 0 -63.5 22.5t-27.5 55.5q0 55 53 55q19 0 30 -12t14 -27 t12.5 -27t26.5 -12q41 0 71 59t65 187l70 259q8 32 8 47q0 26 -15 35.5t-48 10.5l5 16h464v-16q-63 -8 -75 -55zM578 328l-50 -186q-15 -45 -15 -64q0 -42 67 -42q93 0 151 45.5t58 144.5q0 102 -140 102h-71z" />
+<glyph unicode="&#x40a;" horiz-adv-x="966" d="M591 364h89q112 0 156 -21q31 -15 50.5 -45t19.5 -70q0 -103 -81 -165.5t-201 -62.5h-286v16q41 6 56 20.5t27 59.5l63 232h-267l-67 -246q-3 -10 -3 -22q0 -22 12.5 -30t57.5 -14v-16h-245v16q41 4 57 20.5t30 65.5l117 430q12 46 12 64q0 21 -14.5 28.5t-62.5 12.5v16 h271v-16q-45 -3 -67.5 -19t-32.5 -52l-55 -202h267l44 168q12 44 12 62q0 21 -14 29.5t-57 13.5v16h247v-16q-63 -8 -76 -55zM583 328l-51 -186q-14 -42 -14 -64q0 -42 66 -42q93 0 151.5 45.5t58.5 144.5q0 102 -138 102h-73z" />
+<glyph unicode="&#x40b;" horiz-adv-x="786" d="M701 0h-269v16q50 4 69 20.5t30 56.5l21 77q22 80 22 118q0 89 -76 89q-40 0 -77.5 -19.5t-91.5 -63.5l-51 -183q-10 -38 -10 -52q0 -22 15.5 -31t54.5 -12v-16h-268v16q53 5 73 18.5t32 56.5l143 526h-51q-78 0 -112 -25t-66 -98l-18 4l42 155h512l-43 -159l-18 2 q3 17 3 41q0 80 -101 80h-50l-75 -281h1q90 88 196 88q62 0 99 -27.5t37 -81.5q0 -49 -12 -93l-34 -128q-6 -24 -6 -39q0 -18 16 -26t63 -13v-16z" />
+<glyph unicode="&#x40c;" horiz-adv-x="621" d="M225 370h28q77 0 119 39t82 121q32 66 59 94q35 37 84 37q23 0 41.5 -15.5t18.5 -35.5q0 -54 -50 -54q-18 0 -33.5 20t-21.5 20q-7 0 -14 -5t-12.5 -12t-12 -17.5t-10 -17.5t-8 -17t-5.5 -11q-42 -80 -77 -119t-90 -55v-2q30 -18 46.5 -39.5t37.5 -67.5l67 -151 q23 -40 40 -50.5t64 -15.5v-16h-165l-114 248q-3 6 -7 16l-6 14l-6 11.5t-5.5 10t-5 7.5t-5.5 7l-6 4q-4 3 -8 4.5t-9 2.5q-13 3 -27 3l-57 -217q-11 -44 -11 -51q0 -23 14.5 -31.5t56.5 -12.5v-16h-245v16q43 5 57 18t24 53l118 445q14 50 14 62q0 21 -17 31t-62 12v16h270 v-16q-42 -3 -65 -18.5t-34 -55.5zM340 744l162 160q10 10 25 10t25.5 -10.5t10.5 -25.5q0 -18 -17 -28l-171 -106h-35z" />
+<glyph unicode="&#x40e;" horiz-adv-x="656" d="M629 831q0 -45 -45 -72.5t-98 -27.5q-52 0 -98 27.5t-46 72.5q0 28 17 42t36 14q16 0 28 -10.5t12 -27.5t-8.5 -27t-8.5 -16q0 -17 17.5 -30t50.5 -13t50 12.5t17 30.5q0 6 -8.5 16.5t-8.5 27.5q0 16 13 26.5t30 10.5q19 0 34.5 -14t15.5 -42zM716 653v-16 q-40 -4 -66.5 -25t-62.5 -86l-221 -394q-81 -146 -173 -146q-34 0 -58.5 18t-24.5 48q0 31 16.5 46t36.5 15q21 0 33 -12t14 -27t5 -27t10 -12q28 0 65 49t67 117l-84 281q-30 102 -44 124t-55 31v16h239v-16l-26 -3q-27 -3 -38 -11t-11 -27q0 -15 5 -33l79 -261l145 262 q20 38 20 48q0 25 -60 25v16h189z" />
+<glyph unicode="&#x40f;" horiz-adv-x="722" d="M747 653v-16q-44 -8 -58 -20t-25 -54l-117 -442q-14 -49 -14 -63q0 -21 14 -29t57 -13l-4 -16h-182q-72 0 -126 -75q-21 -29 -42 -104h-19q9 41 9 80q0 99 -84 99h-181v16q42 4 57.5 20.5t28.5 65.5l115 430q12 45 12 64q0 21 -14 28.5t-63 12.5v16h271v-16 q-46 -4 -68 -19.5t-32 -51.5l-131 -491q-4 -18 -4 -21q0 -18 28 -18h214q20 0 29.5 8t16.5 32l132 495q3 11 3 22q0 20 -15.5 30.5t-55.5 13.5v16h248z" />
+<glyph unicode="&#x410;" horiz-adv-x="611" d="M566 0h-245v16q45 2 61 14t16 39q0 8 -2 26l-20 131h-220l-59 -111q-22 -41 -22 -66q0 -30 62 -33v-16h-186v16q34 7 55.5 32t78.5 124l285 496h26l92 -553q10 -62 24 -79t54 -20v-16zM371 262l-45 263l-149 -263h194z" />
+<glyph unicode="&#x411;" horiz-adv-x="590" d="M603 653l-44 -165l-17 3q3 33 3 47q0 79 -103 79h-93q-32 0 -45 -6t-19 -29l-58 -218h87q226 0 226 -132q0 -104 -81 -168t-201 -64h-286v16q41 6 57.5 21.5t28.5 59.5l117 435q12 44 12 62q0 21 -13.5 29.5t-56.5 13.5v16h486zM217 328l-51 -187q-13 -39 -13 -63 q0 -42 66 -42q86 0 132.5 28.5t69.5 112.5q7 25 7 49q0 102 -140 102h-71z" />
+<glyph unicode="&#x412;" horiz-adv-x="597" d="M113 653h250q102 0 155 -34.5t53 -95.5q0 -74 -49.5 -116.5t-125.5 -55.5v-1q128 -39 128 -150q0 -98 -74.5 -149t-200.5 -51h-272v16q43 6 59 20.5t28 59.5l115 436q11 39 11 64q0 22 -15 29.5t-62 11.5v16zM232 365h37q201 0 201 150q0 55 -27.5 78.5t-89.5 23.5 q-23 0 -32 -1.5t-17 -9t-13 -25.5zM222 329l-32 -117q-32 -116 -32 -134q0 -42 67 -42q89 0 140 41.5t51 122.5q0 45 -19.5 77t-49.5 42q-29 10 -125 10z" />
+<glyph unicode="&#x413;" horiz-adv-x="569" d="M603 653l-44 -164l-17 2q3 18 3 48q0 78 -101 78h-158l-132 -489q-15 -58 -15 -73q0 -18 16.5 -27t59.5 -12v-16h-251v16q42 3 56.5 18.5t26.5 59.5l123 442q10 36 10 61q0 21 -13.5 30.5t-47.5 9.5v16h484z" />
+<glyph unicode="&#x414;" horiz-adv-x="655" d="M696 653v-16q-43 -6 -57.5 -18.5t-26.5 -56.5l-120 -448q-9 -36 -9 -52q0 -46 67 -46l-52 -195h-19q9 63 9 80q0 58 -25.5 78.5t-71.5 20.5h-306q-99 0 -169 -179h-19l53 195h19q76 0 138 118t142 410q8 27 8 47q0 26 -15 35.5t-49 10.5l5 16h498zM387 81l134 501 q3 10 3 18q0 17 -28 17h-151q-20 0 -28.5 -8t-14.5 -27q-67 -243 -113.5 -365t-100.5 -181h251q36 0 48 45z" />
+<glyph unicode="&#x415;" horiz-adv-x="611" d="M631 653l-31 -154l-22 2q3 25 3 46q0 45 -37.5 59t-155.5 14q-42 0 -55 -4.5t-18 -21.5l-63 -233h78q66 0 88 16t51 81l18 -4l-68 -232l-20 5q7 31 7 52q0 32 -17.5 39t-67.5 7h-78l-31 -112q-35 -126 -35 -146q0 -34 79 -34q127 0 201 39q38 20 94 98l16 -8l-62 -162 h-504v16q43 8 56 19.5t25 54.5l119 442q11 44 11 64t-15.5 28.5t-61.5 12.5v16h496z" />
+<glyph unicode="&#x416;" horiz-adv-x="956" d="M548 370h17q62 0 108 26q59 35 108 134q36 74 56 95q19 20 34 28t41 8q23 0 41.5 -15.5t18.5 -35.5q0 -54 -46 -54q-18 0 -29.5 20t-17.5 20q-19 0 -37 -32l-47 -84q-28 -51 -59 -80q-47 -43 -97 -58v-2q30 -18 46.5 -39.5t37.5 -67.5l67 -151q23 -40 40 -50.5t64 -15.5 v-16h-165l-114 248q-20 44 -30 57.5t-31 19.5q-14 3 -16 3l-57 -217q-11 -44 -11 -51q0 -24 11.5 -32t51.5 -12v-16h-251v16q46 5 64.5 18.5t28.5 52.5l65 241q-35 0 -61.5 -14.5t-66.5 -63.5l-204 -250h-163v16q49 5 64 13.5t51 52.5l146 180q64 78 140 81v2 q-73 36 -73 119q0 13 2.5 41t2.5 43q0 53 -19 53q-6 0 -27 -22t-39 -22q-22 0 -33.5 14t-11.5 31q0 23 24 41t57 18q88 0 88 -96q0 -13 -2.5 -47t-2.5 -45q0 -61 31.5 -82t96.5 -21h10l44 162q14 50 14 62q0 21 -17 31t-62 12v16h270v-16q-42 -3 -65 -18.5t-34 -55.5z" />
+<glyph unicode="&#x417;" horiz-adv-x="564" d="M184 667v-3q0 -18 34 -18q17 0 53 9q46 13 100 13q92 0 134.5 -42.5t42.5 -105.5q0 -61 -47 -108q-55 -55 -116 -61v-2q42 -6 80 -38.5t38 -90.5q0 -77 -46 -132t-119 -81q-64 -23 -151 -23q-86 0 -132 36t-46 99q0 31 14.5 51.5t44.5 20.5q26 0 39 -14t13 -36 q0 -17 -16 -38q-3 -4 -9.5 -10.5t-9 -11t-2.5 -8.5q0 -22 32 -37t77 -15q91 0 147 56t56 145q0 51 -32.5 79t-90.5 28h-45l9 36h40q76 0 123.5 43.5t47.5 113.5q0 45 -27 77.5t-72 32.5q-73 0 -121 -39t-84 -126l-18 -1l37 201h22z" />
+<glyph unicode="&#x418;" horiz-adv-x="708" d="M749 653v-16q-43 -7 -57.5 -19.5t-26.5 -54.5l-121 -453q-10 -34 -10 -44q0 -29 13 -37t64 -13v-16h-269v16q52 3 71 20t30 57l109 405l-399 -403q-6 -19 -6 -33q0 -23 16.5 -33.5t53.5 -12.5v-16h-242v16q47 7 60 23t31 82l110 412q12 46 12 63q0 22 -14 29t-63 12v16 h267v-16q-43 -3 -66.5 -21.5t-37.5 -72.5l-101 -381l396 401q6 24 6 37q0 18 -15 26t-51 11v16h240z" />
+<glyph unicode="&#x419;" horiz-adv-x="708" d="M749 653v-16q-43 -7 -57.5 -19.5t-26.5 -54.5l-121 -453q-10 -34 -10 -44q0 -29 13 -37t64 -13v-16h-269v16q52 3 71 20t30 57l109 405l-399 -403q-6 -19 -6 -33q0 -23 16.5 -33.5t53.5 -12.5v-16h-242v16q47 7 60 23t31 82l110 412q12 46 12 63q0 22 -14 29t-63 12v16 h267v-16q-43 -3 -66.5 -21.5t-37.5 -72.5l-101 -381l396 401q6 24 6 37q0 18 -15 26t-51 11v16h240zM613 831q0 -45 -45 -72.5t-98 -27.5q-52 0 -98 27.5t-46 72.5q0 28 17 42t36 14q16 0 28 -10.5t12 -27.5t-8.5 -27t-8.5 -16q0 -17 17.5 -30t50.5 -13t50 12.5t17 30.5 q0 6 -8.5 16.5t-8.5 27.5q0 16 13 26.5t30 10.5q19 0 34.5 -14t15.5 -42z" />
+<glyph unicode="&#x41a;" horiz-adv-x="621" d="M225 370h28q77 0 119 39t82 121q32 66 59 94q35 37 84 37q23 0 41.5 -15.5t18.5 -35.5q0 -54 -50 -54q-18 0 -33.5 20t-21.5 20q-7 0 -14 -5t-12.5 -12t-12 -17.5t-10 -17.5t-8 -17t-5.5 -11q-42 -80 -77 -119t-90 -55v-2q30 -18 46.5 -39.5t37.5 -67.5l67 -151 q23 -40 40 -50.5t64 -15.5v-16h-165l-114 248q-3 6 -7 16l-6 14l-6 11.5t-5.5 10t-5 7.5t-5.5 7l-6 4q-4 3 -8 4.5t-9 2.5q-13 3 -27 3l-57 -217q-11 -44 -11 -51q0 -23 14.5 -31.5t56.5 -12.5v-16h-245v16q43 5 57 18t24 53l118 445q14 50 14 62q0 21 -17 31t-62 12v16h270 v-16q-42 -3 -65 -18.5t-34 -55.5z" />
+<glyph unicode="&#x41b;" horiz-adv-x="699" d="M740 653v-16q-44 -7 -58 -19t-26 -55l-129 -481q-3 -12 -3 -24q0 -21 19 -30t60 -12v-16h-271v16q56 4 75 23.5t36 84.5l121 455q3 11 3 19q0 19 -26 19h-137q-20 0 -29.5 -8.5t-14.5 -29.5l-89 -323q-47 -171 -101 -226q-44 -46 -114 -46q-38 0 -64.5 20t-26.5 55 q0 27 14.5 42.5t38.5 15.5q18 0 29.5 -12.5t15.5 -28t13.5 -28t24.5 -12.5q41 0 71.5 61.5t64.5 187.5l70 259q8 32 8 47q0 26 -15 35.5t-48 10.5l5 16h483z" />
+<glyph unicode="&#x41c;" horiz-adv-x="814" d="M855 653v-16q-41 -7 -55.5 -20.5t-25.5 -53.5l-118 -443q-14 -50 -14 -62q0 -20 18 -30.5t63 -11.5l-1 -16h-270v16q49 5 69 22t33 64l123 459l-377 -561h-17l-62 546l-118 -428q-9 -32 -9 -54q0 -43 70 -48v-16h-197v16q40 5 58.5 28.5t41.5 105.5l114 401q12 41 12 52 q0 30 -74 34v16h181l56 -492l335 492h164z" />
+<glyph unicode="&#x41d;" horiz-adv-x="708" d="M749 653v-16q-44 -8 -58.5 -20t-25.5 -54l-128 -481q-3 -12 -3 -24q0 -21 15 -29t64 -13v-16h-272v16q51 4 71.5 21t30.5 56l63 233h-287l-66 -244q-3 -10 -3 -22q0 -22 12.5 -30t57.5 -14v-16h-246l2 16q42 4 57.5 20.5t28.5 65.5l115 430q12 46 12 64q0 22 -14 29 t-62 12v16h271v-16q-45 -3 -68.5 -19t-33.5 -52l-52 -198h286l45 164q14 52 14 63q0 19 -16 29t-56 13v16h246z" />
+<glyph unicode="&#x41e;" horiz-adv-x="712" d="M699 418q0 -107 -57.5 -205t-149.5 -160q-105 -71 -214 -71q-99 0 -158.5 62t-59.5 172q0 91 49 187.5t128 165.5q112 97 237 97q107 1 166 -66t59 -182zM594 481q0 71 -34.5 111.5t-94.5 40.5q-99 0 -186 -117q-53 -72 -83.5 -163t-30.5 -169q0 -82 33.5 -125.5 t96.5 -43.5q92 0 170 95q59 74 94 181t35 190z" />
+<glyph unicode="&#x41f;" horiz-adv-x="704" d="M745 653v-16q-44 -8 -58.5 -20t-25.5 -54l-128 -481q-3 -12 -3 -24q0 -21 15 -29t64 -13v-16h-271v16q51 4 71.5 21t30.5 56l128 485q4 18 4 21q0 18 -28 18h-215q-21 0 -30.5 -8t-16.5 -32l-133 -495q-3 -10 -3 -22q0 -22 12.5 -30t57.5 -14v-16h-245v16q42 4 58.5 20.5 t29.5 65.5l114 430q12 46 12 64q0 21 -14.5 28.5t-62.5 12.5v16h637z" />
+<glyph unicode="&#x420;" horiz-adv-x="568" d="M119 653h241q218 0 218 -148q0 -40 -18.5 -78.5t-49.5 -64.5q-69 -57 -205 -57q-50 0 -89 9l-51 -194q-14 -54 -14 -63q0 -18 15 -27.5t54 -13.5v-16h-244v16q43 6 56.5 19.5t27.5 62.5l113 414q17 63 17 83t-14 28.5t-57 13.5v16zM291 586l-66 -240q29 -5 51 -5 q85 0 128 25q71 40 71 134q0 64 -33.5 90.5t-98.5 26.5q-44 0 -52 -31z" />
+<glyph unicode="&#x421;" horiz-adv-x="667" d="M690 664l-37 -200l-18 3q-18 163 -149 163q-109 0 -199 -97q-53 -56 -80.5 -136t-27.5 -165q0 -205 175 -205q62 0 113.5 26t115.5 93l18 -15q-67 -79 -131.5 -114t-141.5 -35q-117 0 -189 69.5t-72 191.5q0 103 51 196.5t136 153.5q102 73 219 73q69 0 117 -17 q20 -7 41 -7q27 0 38 22h21z" />
+<glyph unicode="&#x422;" horiz-adv-x="556" d="M644 653l-43 -159l-18 2q3 17 3 41q0 80 -101 80h-62l-130 -489q-14 -49 -14 -66q0 -25 17 -35.5t71 -10.5v-16h-288v16q52 5 74.5 20t32.5 55l140 526h-60q-78 0 -112 -25t-66 -98l-18 4l42 155h532z" />
+<glyph unicode="&#x423;" horiz-adv-x="656" d="M716 653v-16q-40 -4 -66.5 -25t-62.5 -86l-221 -394q-81 -146 -173 -146q-34 0 -58.5 18t-24.5 48q0 31 16.5 46t36.5 15q21 0 33 -12t14 -27t5 -27t10 -12q28 0 64 48.5t66 117.5l-82 281q-29 101 -43.5 123.5t-55.5 31.5v16h239v-16l-26 -3q-27 -3 -38 -11t-11 -27 q0 -15 5 -33l77 -261l147 262q20 38 20 48q0 25 -60 25v16h189z" />
+<glyph unicode="&#x424;" horiz-adv-x="772" d="M531 582l-12 -42q102 -4 170.5 -47.5t68.5 -131.5q0 -96 -91 -173q-85 -72 -262 -75q-11 -29 -11 -51q0 -24 21.5 -35t71.5 -11v-16h-297v16h9q47 0 71.5 20.5t36.5 76.5q-99 1 -166.5 45.5t-67.5 132.5q0 95 88 171q86 74 263 78q14 49 14 64q0 18 -17 25.5t-63 7.5v16 h281v-16h-5q-88 0 -103 -55zM509 504l-95 -355q120 0 179 63q60 64 60 154q0 126 -144 138zM316 149l96 355q-116 0 -177 -64q-32 -34 -44.5 -68.5t-12.5 -83.5q0 -129 138 -139z" />
+<glyph unicode="&#x425;" horiz-adv-x="575" d="M617 653v-16q-33 -11 -60.5 -31.5t-64.5 -63.5l-169 -194l101 -255q18 -45 36 -58t69 -19v-16h-271v16q43 1 60 9.5t17 27.5q0 16 -14 51l-67 165l-151 -172q-23 -26 -23 -48q0 -33 66 -33v-16h-213v16q40 7 76 40.5t144 159.5l83 97l-103 255q-15 37 -33.5 51t-61.5 18 v16h263v-16q-41 -5 -56 -13.5t-15 -27.5q0 -17 16 -56l59 -147l145 167q21 24 21 43q0 31 -61 34v16h207z" />
+<glyph unicode="&#x426;" horiz-adv-x="706" d="M747 653v-16q-44 -8 -58.5 -20t-26.5 -54l-118 -442q-14 -49 -14 -63q0 -20 15 -28.5t59 -13.5l-52 -195h-19q2 6 5.5 36.5t3.5 42.5q0 58 -24.5 79t-69.5 21h-473v16q42 4 57.5 20.5t28.5 65.5l115 430q12 45 12 64q0 21 -14 28.5t-63 12.5v16h271v-16q-46 -4 -68 -19.5 t-32 -51.5l-131 -491q-4 -18 -4 -21q0 -18 28 -18h214q20 0 29.5 8t16.5 32l132 495q3 11 3 22q0 20 -15.5 30.5t-55.5 13.5v16h248z" />
+<glyph unicode="&#x427;" horiz-adv-x="622" d="M663 653v-16q-44 -8 -58.5 -20t-25.5 -54l-128 -481q-3 -12 -3 -24q0 -21 14.5 -29t63.5 -13v-16h-272v16q51 4 71.5 21t30.5 56l60 219q-92 -46 -190 -46q-69 0 -108.5 18.5t-39.5 69.5q0 28 10 65l36 134q8 32 8 43q0 21 -15 28.5t-63 12.5v16h271v-16 q-45 -2 -67.5 -18t-32.5 -53l-37 -138q-10 -38 -10 -57q0 -61 102 -61q71 0 145 37l50 185q13 50 13 63q0 19 -15 29t-55 13v16h245z" />
+<glyph unicode="&#x428;" horiz-adv-x="936" d="M977 653v-16q-44 -8 -58.5 -20t-25.5 -54l-117 -442q-14 -49 -14 -63q0 -20 17 -28t62 -14l-1 -16h-854v16q42 4 57.5 20.5t28.5 65.5l115 430q8 30 8 64q0 21 -13 28.5t-61 12.5v16h261v-16q-45 -4 -62.5 -18.5t-27.5 -52.5l-131 -489q-4 -12 -4 -21q0 -20 28 -20h138 q32 0 45 48l131 487q3 11 3 22q0 22 -10.5 31.5t-48.5 12.5v16h232v-16q-43 -8 -56 -19.5t-25 -54.5l-132 -486q-4 -12 -4 -21q0 -20 29 -20h132q20 0 30 9t17 33l132 493q3 11 3 22q0 21 -14.5 31t-54.5 13v16h245z" />
+<glyph unicode="&#x429;" horiz-adv-x="936" d="M977 653v-16q-44 -8 -58.5 -20t-25.5 -54l-117 -442q-14 -49 -14 -63q0 -20 15 -28.5t59 -13.5l-52 -195h-19q2 6 5.5 36.5t3.5 42.5q0 58 -24.5 79t-69.5 21h-694v16q42 4 57.5 20.5t28.5 65.5l115 430q8 30 8 64q0 21 -13 28.5t-61 12.5v16h261v-16q-45 -4 -62.5 -18.5 t-27.5 -52.5l-131 -489q-4 -12 -4 -21q0 -20 28 -20h138q32 0 45 48l131 487q3 11 3 22q0 22 -10.5 31.5t-48.5 12.5v16h232v-16q-43 -8 -56 -19.5t-25 -54.5l-132 -486q-4 -12 -4 -21q0 -20 29 -20h132q20 0 30 9t17 33l132 493q3 11 3 22q0 21 -14.5 31t-54.5 13v16h245z " />
+<glyph unicode="&#x42a;" horiz-adv-x="695" d="M339 364h87q226 0 226 -132q0 -104 -81 -168t-201 -64h-282v16q41 6 56 20.5t27 59.5l123 464q2 8 2 25q0 33 -42 33q-78 0 -108 -23t-65 -101l-18 4l42 155h365v-16q-31 -4 -48.5 -16t-24.5 -39zM329 328l-51 -186q-14 -42 -14 -64q0 -42 67 -42q93 0 151 45.5t58 144.5 q0 102 -140 102h-71z" />
+<glyph unicode="&#x42b;" horiz-adv-x="852" d="M893 653v-16q-42 -5 -56 -18.5t-26 -58.5l-114 -429q-15 -53 -15 -76q0 -20 12.5 -27t56.5 -12v-16h-246v16q42 8 57.5 21t26.5 54l117 441q13 46 13 62q0 20 -16 30.5t-56 12.5v16h246zM223 364h87q226 0 226 -132q0 -104 -81 -168t-201 -64h-282v16q41 6 56 20.5 t27 59.5l116 436q12 44 12 62q0 21 -14 29.5t-57 13.5v16h242v-16q-61 -8 -73 -55zM213 328l-49 -186q-15 -45 -15 -64q0 -42 67 -42q93 0 150.5 45.5t57.5 144.5q0 102 -140 102h-71z" />
+<glyph unicode="&#x42c;" horiz-adv-x="597" d="M224 364h87q125 0 176 -39q50 -37 50 -102q0 -97 -81.5 -160t-200.5 -63h-283v16q41 6 56 20.5t27 59.5l117 436q12 44 12 62q0 21 -14 29.5t-57 13.5v16h244v-16q-61 -8 -74 -55zM214 328l-49 -186q-15 -45 -15 -64q0 -42 67 -42q93 0 150.5 45.5t57.5 144.5 q0 102 -140 102h-71z" />
+<glyph unicode="&#x42d;" horiz-adv-x="658" d="M157 665h22q4 -22 29 -22q34 0 74 12q40 11 124 11q98 0 164 -72t66 -187q0 -176 -140 -313q-115 -112 -291 -112q-85 0 -137.5 34t-52.5 102q0 30 14.5 50.5t44.5 20.5q25 0 38.5 -14.5t13.5 -35.5t-18.5 -41t-18.5 -27q0 -22 32.5 -37t84.5 -15q120 0 210 95 q73 78 98 202h-271l11 42h266q4 27 4 60q0 212 -155 212q-84 0 -140 -39t-91 -124l-18 -1z" />
+<glyph unicode="&#x42e;" horiz-adv-x="877" d="M222 368h85q46 117 135 201q102 97 214 97q94 0 144 -60t50 -173q0 -115 -54.5 -216t-141.5 -164q-95 -71 -192 -71q-87 0 -137.5 59t-50.5 164q0 61 18 121h-82l-64 -244q-3 -10 -3 -22q0 -22 12.5 -30t57.5 -14v-16h-245v16q42 5 58 20t29 66l114 430q12 46 12 64 q0 21 -14.5 28.5t-62.5 12.5v16h272v-16q-45 -3 -67.5 -19t-32.5 -52zM756 490q0 67 -28.5 105t-80.5 38q-87 0 -169 -117q-51 -74 -80.5 -166t-29.5 -178q0 -157 109 -157q84 0 155 95q56 75 90 183.5t34 196.5z" />
+<glyph unicode="&#x42f;" horiz-adv-x="635" d="M676 653v-15q-44 -9 -58.5 -21t-25.5 -54l-117 -442q-11 -40 -11 -58q0 -23 17 -34t60 -13v-16h-274v16q51 4 71.5 21t30.5 56l58 212h-31l-293 -305h-152v16q50 3 96 49l240 245v2q-66 0 -113 39.5t-47 99.5q0 74 53 125q81 77 275 77h221zM437 347l51 185q13 43 13 63 q0 15 -7.5 21.5t-28.5 6.5q-99 0 -167 -43.5t-68 -134.5q0 -49 38.5 -76.5t104.5 -27.5q51 0 64 6z" />
+<glyph unicode="&#x430;" horiz-adv-x="514" d="M469 111l13 -11q-56 -68 -82.5 -89t-56.5 -21q-40 0 -40 41q0 25 23 115q-56 -84 -103 -120.5t-100 -36.5q-44 0 -72 30.5t-28 85.5q0 67 34 136.5t89 121.5q83 78 163 78q67 0 80 -58l11 48l3 3l61 7l7 -3q-1 -4 -6 -21q-89 -324 -89 -363q0 -13 14 -13q15 0 52 41z M371 361q0 26 -15 42t-41 16q-68 0 -131 -92q-33 -49 -55 -109t-22 -106q0 -74 60 -74q59 0 127 98q77 111 77 225z" />
+<glyph unicode="&#x431;" horiz-adv-x="498" d="M519 683h16q-28 -80 -94 -104q-21 -8 -64.5 -8.5t-54.5 -1.5q-46 -6 -90 -45.5t-73 -89t-46 -101.5l2 -1q59 57 101 79q56 30 120 30q62 0 101.5 -37.5t39.5 -102.5q0 -57 -28.5 -118.5t-77.5 -110.5q-83 -83 -188 -83q-70 0 -108.5 36.5t-38.5 102.5q0 58 15 115 q11 39 23 75t32.5 85.5t47 89.5t58.5 76t74.5 56t89.5 20h60q36 0 53 6.5t30 31.5zM393 326q0 45 -19 69.5t-52 24.5q-67 0 -128 -91q-74 -113 -74 -228q0 -44 21 -67.5t57 -23.5q61 0 121 83q34 46 54 110.5t20 122.5z" />
+<glyph unicode="&#x432;" horiz-adv-x="442" d="M276 245v-2q18 0 29.5 -0.5t31.5 -5.5t32 -14t21.5 -27.5t9.5 -44.5q0 -66 -66 -114t-147 -48q-87 0 -121.5 42t-34.5 115q0 45 15.5 93t47 95t89 77t131.5 30q48 0 78.5 -20t30.5 -63q0 -45 -41 -73.5t-106 -39.5zM357 360q0 60 -63 60q-48 0 -97.5 -46.5t-73.5 -150.5 q49 10 84 20t72.5 26.5t57.5 39t20 51.5zM313 148q0 73 -66 73q-55 0 -128 -26q-12 -33 -12 -83q0 -102 80 -102q57 0 91.5 42.5t34.5 95.5z" />
+<glyph unicode="&#x433;" horiz-adv-x="390" d="M101 348l-10 13q84 80 182 80q50 0 80.5 -25t30.5 -66q0 -38 -31 -66.5t-75 -47.5l-88 -36q-44 -19 -75 -46t-31 -62q0 -55 79 -55q34 0 64 9.5t75 40.5l12 -12q-56 -51 -96.5 -68.5t-87.5 -17.5q-61 0 -95 24t-34 67q0 34 31 63.5t75 50.5l89 42q44 20 75 45.5t31 53.5 q0 25 -19 41.5t-52 16.5q-39 0 -67.5 -10t-62.5 -35z" />
+<glyph unicode="&#x434;" horiz-adv-x="489" d="M211 666l13 17q107 -24 176.5 -117.5t69.5 -206.5q0 -97 -38 -182t-106 -136.5t-149 -51.5q-70 0 -108.5 35.5t-38.5 104.5q0 115 86.5 213.5t193.5 98.5q59 0 87 -49l2 1q-10 83 -60.5 164.5t-127.5 108.5zM387 326q0 43 -19.5 68.5t-51.5 25.5q-69 0 -132 -89 q-70 -97 -70 -224q0 -42 21.5 -69.5t56.5 -27.5q70 0 124 82q32 47 51.5 113t19.5 121z" />
+<glyph unicode="&#x435;" horiz-adv-x="440" d="M368 109l12 -12q-88 -108 -204 -108q-62 0 -102 38t-40 99q0 116 96.5 215.5t209.5 99.5q39 0 60.5 -18t21.5 -50q0 -65 -80.5 -117.5t-213.5 -69.5q-10 -20 -10 -61t25.5 -66t67.5 -25q74 0 157 75zM134 209l1 -1q68 17 106 33t65 41q50 48 50 97q0 39 -35 39 q-41 0 -100.5 -69t-86.5 -140z" />
+<glyph unicode="&#x436;" horiz-adv-x="799" d="M438 242h58q27 82 87.5 140.5t135.5 58.5q37 0 54.5 -15.5t17.5 -39.5q0 -21 -11 -31t-25 -10q-19 0 -28.5 10t-11 22.5t-8.5 22.5t-21 10q-25 0 -56 -34q-36 -40 -58 -111.5t-22 -125.5q0 -56 19.5 -85.5t51.5 -29.5q55 0 102 70l13 -9q-37 -55 -68 -75.5t-77 -20.5 q-50 0 -81 40t-31 114q0 40 10 77h-56l-61 -220h-73l61 220h-57q-24 -88 -82.5 -159.5t-135.5 -71.5q-39 0 -58 11q-27 16 -27 43q0 20 13.5 33.5t26.5 13.5q18 0 25.5 -11t6.5 -24t4 -24t20 -11q14 0 33 9.5t33 24.5q36 39 57 111t21 126q0 56 -19.5 85.5t-51.5 29.5 q-55 0 -102 -70l-13 9q37 55 68 75.5t77 20.5q51 0 81.5 -34.5t30.5 -107.5q0 -38 -4 -57h58l52 190h73z" />
+<glyph unicode="&#x437;" horiz-adv-x="376" d="M101 441h14q0 -17 13 -17q10 0 40 8.5t58 8.5q69 0 100 -27.5t31 -69.5q0 -50 -40 -79t-92 -36l-1 -1q48 -11 73 -36t25 -60q0 -50 -35 -85q-55 -58 -169 -58q-64 0 -100 24.5t-36 64.5q0 26 13 39t33 13q18 0 28.5 -11.5t10.5 -30.5q0 -11 -8 -24t-8 -25q0 -10 14 -19.5 t38 -9.5q65 0 98.5 37t33.5 90q0 38 -23 59.5t-63 21.5q-14 0 -22 -1l7 23h30q49 0 83 33t34 72q0 36 -18 55.5t-49 19.5q-85 0 -133 -108h-16z" />
+<glyph unicode="&#x438;" horiz-adv-x="527" d="M481 119l14 -9q-48 -74 -75 -96.5t-63 -22.5q-48 0 -48 48q0 45 45 197q-89 -146 -137.5 -196.5t-101.5 -50.5t-53 53q0 30 27 128l35 129q17 65 17 78q0 17 -10 17q-26 0 -88 -82l-14 10q47 72 76.5 95.5t66.5 23.5q46 0 46 -48q0 -33 -22 -112l-54 -198q-3 -9 -3 -16 q0 -25 20 -25q45 0 142 147q33 50 51.5 91.5t58.5 151.5h74l-83 -303q-15 -57 -15 -74t11 -17q12 0 29 16t54 65z" />
+<glyph unicode="&#x439;" horiz-adv-x="527" d="M481 119l14 -9q-48 -74 -75 -96.5t-63 -22.5q-48 0 -48 48q0 45 45 197q-89 -146 -137.5 -196.5t-101.5 -50.5t-53 53q0 30 27 128l35 129q17 65 17 78q0 17 -10 17q-26 0 -88 -82l-14 10q47 72 76.5 95.5t66.5 23.5q46 0 46 -48q0 -33 -22 -112l-54 -198q-3 -9 -3 -16 q0 -25 20 -25q45 0 142 147q33 50 51.5 91.5t58.5 151.5h74l-83 -303q-15 -57 -15 -74t11 -17q12 0 29 16t54 65zM458 667h18q-8 -61 -47.5 -108.5t-102.5 -47.5q-48 0 -88.5 28.5t-40.5 74.5q0 25 15.5 39t33.5 14q16 0 28 -10.5t12 -27.5t-8.5 -27t-8.5 -16 q0 -16 18 -29.5t47 -13.5q48 0 79 34.5t45 89.5z" />
+<glyph unicode="&#x43a;" horiz-adv-x="491" d="M159 242h11q35 0 63.5 20.5t48.5 49.5l38 59q20 29 47.5 49.5t61.5 20.5q23 0 39.5 -15.5t16.5 -33.5q0 -23 -13.5 -35t-32.5 -12q-17 0 -32 18.5t-31 18.5q-12 0 -28 -20t-31 -45.5t-40.5 -51.5t-53.5 -35v-2q57 -5 88 -63q11 -22 20 -55t15.5 -51t16.5 -18q25 0 49 42 q5 8 15 26l15 -11q-30 -60 -57 -84.5t-58 -24.5q-38 0 -57 27.5t-33 77.5l-9 32q-3 11 -10.5 30t-15 29t-20.5 20.5t-29 14.5l-60 -220h-75l78 292q19 73 19 81q0 15 -12 21t-42 6h-11v15q91 13 160 26l4 -2z" />
+<glyph unicode="&#x43b;" horiz-adv-x="474" d="M428 115l14 -13q-49 -67 -79 -89t-67 -22q-20 0 -33.5 13.5t-13.5 40.5q0 16 16 75l44 162q15 58 15 83q0 33 -29 33q-27 0 -58 -29q-34 -33 -64 -134l-18 -61q0 -1 -6.5 -23l-8.5 -29l-10 -27q-7 -20 -12 -30t-13.5 -23.5t-16.5 -22.5q-29 -31 -73 -31q-25 0 -42 13 t-17 38q0 23 13 34.5t31 11.5q23 0 34 -24q3 -6 4 -16t2 -15.5t5 -5.5q14 0 25.5 11t23 38t18.5 51l22 70l14 48q33 114 82.5 156.5t109.5 42.5q29 0 46.5 -17t17.5 -44q0 -25 -10 -60l-56 -203q-12 -43 -12 -61t15 -18q25 0 66 51z" />
+<glyph unicode="&#x43c;" horiz-adv-x="633" d="M587 116l14 -13q-51 -70 -78 -91.5t-62 -21.5q-20 0 -33.5 13.5t-13.5 40.5q0 89 58 268l-211 -312h-8l-39 327l-48 -150q-35 -109 -65 -145q-19 -23 -36.5 -33.5t-49.5 -10.5q-25 0 -42.5 12.5t-17.5 37.5q0 23 12.5 34.5t30.5 11.5q23 0 34 -23q3 -6 3.5 -16t1.5 -15.5 t5 -5.5q27 0 50.5 43.5t49.5 126.5l75 238h59l39 -308h2l205 308h60q-28 -85 -60.5 -211t-32.5 -165q0 -19 16 -19q18 0 61 53z" />
+<glyph unicode="&#x43d;" horiz-adv-x="504" d="M458 117l14 -13q-51 -70 -78 -91.5t-62 -21.5q-20 0 -33.5 13.5t-13.5 40.5q0 16 16 75l24 91h-174l-58 -211h-73l93 350q2 10 2 23q0 15 -13.5 20.5t-51.5 6.5v15q79 9 161 26l4 -2l-58 -206h173l54 199h73l-83 -315q-14 -56 -14 -61q0 -18 16 -18q19 0 61 53q7 8 21 26 z" />
+<glyph unicode="&#x43e;" horiz-adv-x="489" d="M470 301q0 -57 -28.5 -118.5t-77.5 -110.5q-83 -83 -188 -83q-70 0 -108.5 36.5t-38.5 102.5q0 83 50.5 162t129.5 121q56 30 120 30q62 0 101.5 -37.5t39.5 -102.5zM386 326q0 45 -19 69.5t-52 24.5q-67 0 -128 -91q-74 -113 -74 -228q0 -44 21 -67.5t57 -23.5 q61 0 121 83q34 46 54 110.5t20 122.5z" />
+<glyph unicode="&#x43f;" horiz-adv-x="511" d="M465 117l14 -13q-51 -70 -78 -91.5t-62 -21.5q-20 0 -33.5 13.5t-13.5 40.5q0 16 16 75l44 162q14 54 14 79q0 29 -24 29q-29 0 -63.5 -34.5t-84.5 -107.5q-33 -49 -48.5 -88t-51.5 -160h-75l96 353q2 10 2 20q0 15 -13.5 20.5t-51.5 6.5v15q104 14 162 26l4 -2l-67 -218 q74 118 128 169t103 51q31 0 48 -16.5t17 -44.5q0 -25 -10 -60l-56 -203q-14 -50 -14 -61q0 -18 16 -18q19 0 61 53q7 8 21 26z" />
+<glyph unicode="&#x440;" horiz-adv-x="483" d="M215 437l-31 -109q75 113 171 113q109 0 109 -125q0 -81 -42 -157t-110 -123t-139 -47q-36 0 -69 17q-40 -165 -40 -166q0 -16 13.5 -22.5t48.5 -6.5v-16h-203v16q32 1 45.5 14t22.5 49l115 432q15 55 15 67q0 27 -44 27h-24v15l157 26zM380 313q0 44 -14.5 64.5 t-47.5 20.5q-39 0 -78 -34t-57 -80q-22 -57 -43.5 -135t-21.5 -103q0 -17 13.5 -27.5t34.5 -10.5q78 0 145 95q69 96 69 210z" />
+<glyph unicode="&#x441;" horiz-adv-x="441" d="M347 107l16 -10q-46 -58 -89.5 -83t-99.5 -25q-71 0 -109 39t-38 115q0 67 34 129.5t89 107.5q77 61 167 61q46 0 75.5 -23t29.5 -58q0 -20 -14 -34t-34 -14t-29.5 11.5t-9.5 28.5q0 9 7.5 23.5t7.5 24.5q0 20 -37 20q-63 0 -109 -48q-91 -96 -91 -233q0 -54 23 -84 t66 -30q39 0 71 19t74 63z" />
+<glyph unicode="&#x442;" horiz-adv-x="741" d="M709 105l-5 -7q-77 -107 -144 -107q-40 0 -40 46q0 15 13 66l58 227q7 28 7 38q0 9 -6 15t-14 6q-47 0 -131 -117q-37 -52 -58 -104.5t-50 -167.5h-75l27 93q68 235 68 271q0 25 -22 25q-25 0 -66 -39.5t-83 -103.5q-25 -39 -42.5 -83t-53.5 -163h-75l73 262 q25 91 25 116q0 22 -41 22h-25v15q105 15 162 26l3 -2l-58 -209q130 211 220 211q29 0 44.5 -16t15.5 -44q0 -38 -40 -152q53 84 88.5 126.5t71.5 65.5q32 20 63 20q27 0 42.5 -16.5t15.5 -42.5q0 -19 -13 -67l-58 -216q-10 -38 -10 -45q0 -16 12 -16q22 0 65 53l21 26z" />
+<glyph unicode="&#x443;" horiz-adv-x="421" d="M206 186l21 -110q67 110 94.5 167.5t27.5 89.5q0 16 -26 32q-26 17 -26 39q0 16 11.5 26.5t28.5 10.5q22 0 37 -16t15 -39q0 -87 -131 -305q-78 -129 -151.5 -208t-116.5 -79q-23 0 -37 12t-14 31q0 17 11.5 28.5t27.5 11.5q19 0 31.5 -14t24.5 -14q25 0 63 43t61 81 q10 20 10 35q0 30 -31 155.5t-51 176.5q-14 37 -30.5 50.5t-46.5 13.5q-16 0 -31 -4v17q22 4 32 6q41 8 107 18h4q11 0 41.5 -93t43.5 -162z" />
+<glyph unicode="&#x444;" horiz-adv-x="702" d="M422 351h2q34 50 66 70t82 20q44 0 74.5 -39t30.5 -97q0 -74 -29.5 -146t-84 -121t-119.5 -49q-46 0 -69.5 27t-25.5 56l-41 -159q-16 -60 -16 -73q0 -16 13.5 -22.5t48.5 -6.5v-16h-203v16q32 1 45.5 14t22.5 49l48 182h-1q-31 -40 -59.5 -53.5t-65.5 -13.5 q-53 0 -82.5 45t-29.5 108q0 67 29.5 135t84.5 116t119 48q71 0 92 -69q60 220 60 242q-1 27 -41 27h-27v15q96 13 157 27l7 -6zM606 302q0 44 -19.5 74t-52.5 30q-36 0 -69 -32t-44 -64q-54 -156 -54 -203q0 -36 22.5 -59.5t46.5 -23.5q44 0 79 29.5t53.5 74.5t28 90 t9.5 84zM339 319v4q0 36 -23 59.5t-47 23.5q-41 0 -75 -30t-53.5 -74t-30 -89t-10.5 -81q0 -45 19.5 -76.5t51.5 -31.5q37 0 71 32.5t43 63.5z" />
+<glyph unicode="&#x445;" horiz-adv-x="444" d="M235 355l12 -57q53 81 85.5 112t65.5 31q18 0 29.5 -10.5t11.5 -26.5t-9.5 -26t-24.5 -10q-9 0 -24 8.5t-28 8.5q-29 0 -98 -121q0 -13 8 -45l32 -134q10 -41 30 -41q16 0 47 40l7 10l7 10q3 4 7 8l15 -9q-43 -67 -68 -90.5t-54 -23.5q-24 0 -37 15t-22 53l-29 119 l-88 -119q-31 -42 -50.5 -55t-44.5 -13q-23 0 -36.5 11t-13.5 31q0 15 9.5 25.5t24.5 10.5q12 0 32 -11q15 -9 26 -9q17 0 51 49l82 116l-28 124q-10 44 -18.5 56t-27.5 12q-12 0 -39 -7l-18 -5l-3 16l11 4q80 29 117 29q19 0 30 -18t21 -68z" />
+<glyph unicode="&#x446;" horiz-adv-x="527" d="M495 110l-34 -52q-23 -35 -23 -68q0 -13 3.5 -31.5t3.5 -29.5q0 -35 -18 -60t-78 -51l-9 18q23 11 32 23.5t9 37.5q0 4 -1.5 17t-1.5 15q0 34 41 82l-1 1q-26 -21 -61 -21q-48 0 -48 48q0 45 45 197q-89 -146 -137.5 -196.5t-101.5 -50.5t-53 53q0 30 27 128l35 129 q17 65 17 78q0 17 -10 17q-26 0 -88 -82l-14 10q47 72 76.5 95.5t66.5 23.5q46 0 46 -48q0 -33 -22 -112l-54 -198q-3 -9 -3 -16q0 -25 20 -25q45 0 142 147q33 50 51.5 91.5t58.5 151.5h74l-83 -303q-15 -57 -15 -74t11 -17q12 0 29 16t54 65z" />
+<glyph unicode="&#x447;" horiz-adv-x="482" d="M436 122l14 -9q-48 -73 -77 -97.5t-65 -24.5q-47 0 -47 48q0 14 22 100l13 50q-69 -32 -124 -32q-104 0 -104 72q0 16 28 118q7 25 7 29q0 12 -11 18t-50 6v15q66 7 150 26l4 -3l-47 -172q-4 -16 -4 -34q0 -23 13.5 -34t47.5 -11q44 0 97 28l59 217h74l-79 -299 q-19 -73 -19 -78q0 -17 11 -17q23 0 87 84z" />
+<glyph unicode="&#x448;" horiz-adv-x="785" d="M739 119l14 -9q-48 -73 -75 -96t-63 -23q-48 0 -48 48q0 36 47 197h-2q-89 -146 -137.5 -196.5t-101.5 -50.5t-53 53q0 24 31 131l29 97h-2l-21 -34q-90 -146 -138.5 -196.5t-101.5 -50.5t-53 53q0 30 27 128l35 129q17 65 17 78q0 17 -10 17q-26 0 -88 -82l-14 10 q47 72 76.5 95.5t66.5 23.5q46 0 46 -48q0 -33 -22 -112l-54 -198q-3 -9 -3 -16q0 -25 20 -25q45 0 142 147q34 51 53 93.5t58 149.5h74l-88 -349q-3 -9 -3 -16q0 -25 20 -25q45 0 142 147q33 50 51.5 91.5t58.5 151.5h74l-79 -299q-19 -72 -19 -78q0 -17 11 -17q12 0 29 16 t54 65z" />
+<glyph unicode="&#x449;" horiz-adv-x="785" d="M739 119l14 -9l-34 -52q-23 -38 -23 -66q0 -13 3.5 -32.5t3.5 -30.5q0 -35 -18 -60t-78 -51l-9 18q23 11 32 23.5t9 37.5q0 4 -1.5 17t-1.5 15q0 34 41 82l-1 1q-25 -21 -61 -21q-48 0 -48 48q0 36 47 197h-2q-89 -146 -137.5 -196.5t-101.5 -50.5t-53 53q0 24 31 131 l29 97h-2l-21 -34q-90 -146 -138.5 -196.5t-101.5 -50.5t-53 53q0 30 27 128l35 129q17 65 17 78q0 17 -10 17q-26 0 -88 -82l-14 10q47 72 76.5 95.5t66.5 23.5q46 0 46 -48q0 -33 -22 -112l-54 -198q-3 -9 -3 -16q0 -25 20 -25q45 0 142 147q34 51 53 93.5t58 149.5h74 l-88 -349q-3 -9 -3 -16q0 -25 20 -25q45 0 142 147q33 50 51.5 91.5t58.5 151.5h74l-79 -299q-19 -72 -19 -78q0 -17 11 -17q12 0 29 16t54 65z" />
+<glyph unicode="&#x44a;" horiz-adv-x="567" d="M245 213h3q76 72 157 72q61 0 92 -28.5t31 -73.5q0 -77 -73.5 -135.5t-172.5 -58.5q-76 0 -108.5 32t-32.5 92q0 69 40.5 144t95.5 123l-1 2q-31 -13 -74 -13q-16 0 -49 7t-57 7q-43 0 -72 -53l-12 6q27 59 50.5 82t71.5 23q27 0 68 -11.5t69 -11.5q44 0 71 23l10 -9 q-44 -43 -74 -111.5t-33 -107.5zM442 179q0 68 -72 68q-49 0 -101 -41q-51 -39 -51 -140q0 -23 18.5 -38t50.5 -15q65 0 110 56t45 110z" />
+<glyph unicode="&#x44b;" horiz-adv-x="689" d="M643 117l14 -9q-43 -69 -73 -93t-67 -24q-20 0 -33.5 13.5t-13.5 40.5q0 16 16 75l82 312h73l-82 -315q-14 -56 -14 -61q0 -18 16 -18q11 0 24 11.5t37 41.5zM151 214l1 -1q76 72 157 72q61 0 92.5 -28.5t31.5 -73.5q0 -77 -74 -135.5t-173 -58.5q-76 0 -106 23t-30 65 q0 25 17 93l35 139q14 58 14 67q0 12 -11 18t-50 6v15q78 10 150 26l4 -3zM347 179q0 68 -73 68q-49 0 -101 -41q-51 -39 -51 -140q0 -23 18.5 -38t50.5 -15q65 0 110.5 56t45.5 110z" />
+<glyph unicode="&#x44c;" horiz-adv-x="471" d="M151 214l1 -1q76 72 157 72q61 0 92.5 -28.5t31.5 -73.5q0 -77 -74 -135.5t-173 -58.5q-76 0 -106 23t-30 65q0 23 17 93l35 139q14 58 14 67q0 12 -11 18t-50 6v15q78 10 150 26l4 -3zM347 179q0 68 -73 68q-49 0 -101 -41q-51 -39 -51 -140q0 -23 18.5 -38t50.5 -15 q65 0 110.5 56t45.5 110z" />
+<glyph unicode="&#x44d;" horiz-adv-x="408" d="M105 441h14q0 -17 13 -17q11 0 41 8.5t57 8.5q79 0 120 -44.5t41 -118.5q0 -119 -80 -204t-191 -85q-52 0 -82.5 25t-30.5 62q0 27 13 40.5t33 13.5q18 0 28.5 -11.5t10.5 -30.5q0 -11 -8 -24t-8 -25q0 -13 13 -21t32 -8q83 0 138 88q27 46 39 117h-137l5 22h135 q4 28 4 54q0 59 -19 94t-58 35q-90 0 -142 -108h-16z" />
+<glyph unicode="&#x44e;" horiz-adv-x="674" d="M160 233h75q23 56 64.5 103t94.5 75q56 30 120 30q62 0 101.5 -37.5t39.5 -102.5q0 -57 -28.5 -118.5t-77.5 -110.5q-83 -83 -188 -83q-70 0 -108.5 36.5t-38.5 102.5q0 42 13 83h-72l-58 -211h-76l79 292q19 70 19 80q0 28 -41 28h-25v15q105 15 162 26l3 -2zM571 326 q0 45 -19 69.5t-52 24.5q-67 0 -128 -91q-74 -113 -74 -228q0 -44 21 -67.5t57 -23.5q61 0 121 83q34 46 54 110.5t20 122.5z" />
+<glyph unicode="&#x44f;" horiz-adv-x="481" d="M435 119l14 -9q-48 -73 -75 -96t-63 -23q-48 0 -48 48q0 51 36 162h-31q-14 0 -25 -3t-28 -13.5t-34.5 -37.5t-33.5 -68q-19 -49 -44 -68.5t-63 -19.5q-28 0 -46.5 19t-18.5 60q0 23 8 40h16q-4 -20 -4 -28q0 -24 9 -36.5t23 -12.5q18 0 29.5 15.5t24.5 56.5q16 51 43 73 t68 27l1 2q-47 4 -74.5 26.5t-27.5 54.5q0 55 36 89t81.5 44.5t101.5 10.5h129l-80 -298q-18 -72 -18 -79q0 -17 11 -17q12 0 29 16t54 65zM304 223l41 157q2 8 2 11q0 19 -23 19q-151 0 -151 -118q0 -32 28.5 -50.5t72.5 -18.5h30z" />
+<glyph unicode="&#x451;" horiz-adv-x="440" d="M368 109l12 -12q-88 -108 -204 -108q-62 0 -102 38t-40 99q0 116 96.5 215.5t209.5 99.5q39 0 60.5 -18t21.5 -50q0 -65 -80.5 -117.5t-213.5 -69.5q-10 -20 -10 -61t25.5 -66t67.5 -25q74 0 157 75zM134 209l1 -1q68 17 106 33t65 41q50 48 50 97q0 39 -35 39 q-41 0 -100.5 -69t-86.5 -140zM275 557q0 -20 -14.5 -34.5t-34.5 -14.5q-21 0 -35 14.5t-14 35.5q0 20 14.5 34t35.5 14q19 0 33.5 -15t14.5 -34zM475 557q0 -20 -14.5 -34.5t-34.5 -14.5q-21 0 -35 14.5t-14 35.5q0 20 14.5 34t35.5 14q19 0 33.5 -15t14.5 -34z" />
+<glyph unicode="&#x452;" horiz-adv-x="479" d="M154 231h1q71 112 125.5 161t102.5 49q31 0 48 -16.5t17 -44.5q0 -25 -10 -60l-77 -292q-32 -123 -77 -179.5t-110 -56.5q-34 0 -56.5 17.5t-22.5 44.5q0 18 12 31t29 13q39 0 39 -37q0 -12 -6 -19.5t-6 -14.5q0 -13 18 -13q30 0 50.5 39.5t46.5 143.5l72 293 q17 68 17 71q0 29 -24 29q-26 0 -70 -40.5t-83 -101.5q-30 -47 -44 -85t-51 -163h-75l129 491h-103l12 38h101l7 25q13 45 13 62q0 12 -13 18.5t-28 6.5h-27v15q76 9 157 27l7 -6l-40 -148h169l-12 -38h-168z" />
+<glyph unicode="&#x453;" horiz-adv-x="390" d="M101 348l-10 13q84 80 182 80q50 0 80.5 -25t30.5 -66q0 -38 -31 -66.5t-75 -47.5l-88 -36q-44 -19 -75 -46t-31 -62q0 -55 79 -55q34 0 64 9.5t75 40.5l12 -12q-56 -51 -96.5 -68.5t-87.5 -17.5q-61 0 -95 24t-34 67q0 34 31 63.5t75 50.5l89 42q44 20 75 45.5t31 53.5 q0 25 -19 41.5t-52 16.5q-39 0 -67.5 -10t-62.5 -35zM232 494l162 160q10 10 25 10t25.5 -10.5t10.5 -25.5q0 -18 -17 -28l-171 -106h-35z" />
+<glyph unicode="&#x454;" horiz-adv-x="428" d="M441 441l-36 -129h-16q0 108 -63 108q-57 0 -116.5 -53t-84.5 -130h161l-5 -22h-161q-8 -29 -8 -72q0 -63 22.5 -98t64.5 -35q67 0 67 68q0 23 15 37.5t39 14.5q15 0 25 -10.5t10 -23.5q0 -46 -63 -79q-54 -28 -113 -28q-73 0 -113 37t-40 112q0 112 91.5 207.5 t202.5 95.5q27 0 50 -8.5t34 -8.5q15 0 21 17h16z" />
+<glyph unicode="&#x455;" horiz-adv-x="389" d="M341 442l-20 -140h-16q-14 116 -89 116q-27 0 -43 -15t-16 -42q0 -38 54 -102q68 -79 68 -136q0 -61 -40.5 -97.5t-103.5 -36.5q-29 0 -55 10q-21 9 -44 9q-20 0 -29 -21h-16l20 159h16q20 -136 100 -136q35 0 55.5 20t20.5 57q0 45 -56 115q-63 79 -63 131q0 50 33 79 t88 29q20 0 56 -10q22 -7 36 -7q20 0 30 18h14z" />
+<glyph unicode="&#x456;" horiz-adv-x="278" d="M258 599q0 -21 -14.5 -36t-34.5 -15q-22 0 -35 14.5t-13 38.5q0 23 13.5 38t33.5 15t35 -16.5t15 -38.5zM216 114l13 -11q-42 -65 -71 -89.5t-66 -24.5q-49 0 -49 55q0 29 22 111l48 177q9 32 9 44q0 15 -11.5 19t-52.5 5v15q65 5 160 26l4 -3l-94 -343q-10 -34 -10 -44 q0 -15 14 -15q25 0 84 78z" />
+<glyph unicode="&#x457;" horiz-adv-x="278" d="M357 557q0 -20 -14.5 -34.5t-34.5 -14.5q-21 0 -35 14.5t-14 35.5q0 20 14.5 34t35.5 14q19 0 33.5 -15t14.5 -34zM157 557q0 -20 -14.5 -34.5t-34.5 -14.5q-21 0 -35 14.5t-14 35.5q0 20 14.5 34t35.5 14q19 0 33.5 -15t14.5 -34zM217 115l14 -12q-41 -63 -71 -88.5 t-67 -25.5q-50 0 -50 57q0 20 24 110l48 175q9 34 9 45q0 15 -11 19t-52 5v15q55 4 159 26l5 -3l-96 -342q-9 -34 -9 -45q0 -6 5 -10.5t11 -4.5q12 0 30 17.5t51 61.5z" />
+<glyph unicode="&#x458;" horiz-adv-x="278" d="M231 598q0 -20 -15 -35t-35 -15q-23 0 -38.5 14.5t-15.5 37.5q0 22 16 37t37 15q20 0 35.5 -16.5t15.5 -37.5zM198 438l-104 -410q-31 -121 -76.5 -178t-110.5 -57q-35 0 -57 17t-22 44q0 18 12 31t29 13q39 0 39 -37q0 -12 -6 -19.5t-6 -14.5q0 -12 18 -12q30 0 50.5 39 t46.5 143l72 292q16 65 16 80q0 17 -10.5 24t-37.5 7h-26v15q36 2 169 26z" />
+<glyph unicode="&#x459;" horiz-adv-x="679" d="M364 213h1q68 72 147 72q61 0 90 -28t29 -74q0 -77 -70.5 -135.5t-161.5 -58.5q-76 0 -106 23t-30 65q0 31 17 93l29 112q15 58 15 83q0 33 -29 33q-27 0 -58 -29q-33 -32 -64 -134l-18 -61q0 -1 -6.5 -23l-8.5 -29l-10 -27q-7 -20 -12 -30t-13.5 -23.5t-16.5 -22.5 q-29 -31 -73 -31q-25 0 -42 13t-17 38q0 23 13 34.5t31 11.5q23 0 34 -24q3 -6 4 -16t2 -15.5t5 -5.5q14 0 25.5 11t23 38t18.5 51l22 70l14 48q33 114 82.5 156.5t109.5 42.5q29 0 46.5 -17t17.5 -44q0 -25 -10 -60zM545 179q0 68 -68 68q-50 0 -91 -41q-51 -51 -51 -140 q0 -23 15.5 -38t46.5 -15q65 0 106.5 55.5t41.5 110.5z" />
+<glyph unicode="&#x45a;" horiz-adv-x="697" d="M442 438l-59 -225q68 72 147 72q61 0 90 -28t29 -74q0 -77 -70.5 -135.5t-161.5 -58.5q-76 0 -106 23t-30 65q0 23 17 93l10 41h-154l-57 -211h-76l95 350q1 5 1 23q0 15 -13.5 20.5t-51.5 6.5v15q79 9 161 26l4 -2l-58 -206h154l22 76q14 50 14 67q0 12 -11 18 q-13 6 -50 6v15q82 10 150 26zM563 179q0 68 -68 68q-50 0 -91 -41q-51 -51 -51 -140q0 -23 15.5 -38t46.5 -15q65 0 106.5 55.5t41.5 110.5z" />
+<glyph unicode="&#x45b;" horiz-adv-x="511" d="M466 118l13 -13q-46 -65 -77 -89.5t-69 -24.5q-20 0 -32 11.5t-12 30.5q0 17 20 92l55 207q7 28 7 33q0 25 -28 25q-27 0 -69.5 -40t-82.5 -100q-31 -48 -49 -93.5t-47 -156.5h-75l129 491h-103l12 38h101l7 25q13 45 13 62q0 12 -13 18.5t-28 6.5h-27v15q76 9 157 27 l7 -6l-40 -148h169l-12 -38h-168l-70 -261q130 211 230 211q33 0 49 -18.5t16 -48.5q0 -43 -48 -193q-33 -101 -33 -125q0 -18 16 -18q12 0 26.5 14.5t55.5 65.5z" />
+<glyph unicode="&#x45c;" horiz-adv-x="491" d="M159 242h11q35 0 63.5 20.5t48.5 49.5l38 59q20 29 47.5 49.5t61.5 20.5q23 0 39.5 -15.5t16.5 -33.5q0 -23 -13.5 -35t-32.5 -12q-17 0 -32 18.5t-31 18.5q-12 0 -28 -20t-31 -45.5t-40.5 -51.5t-53.5 -35v-2q57 -5 88 -63q11 -22 20 -55t15.5 -51t16.5 -18q25 0 49 42 q5 8 15 26l15 -11q-30 -60 -57 -84.5t-58 -24.5q-38 0 -57 27.5t-33 77.5l-9 32q-3 11 -10.5 30t-15 29t-20.5 20.5t-29 14.5l-60 -220h-75l78 292q19 73 19 81q0 15 -12 21t-42 6h-11v15q91 13 160 26l4 -2zM189 494l162 160q10 10 25 10t25.5 -10.5t10.5 -25.5 q0 -18 -17 -28l-171 -106h-35z" />
+<glyph unicode="&#x45e;" horiz-adv-x="421" d="M206 186l21 -110q67 110 94.5 167.5t27.5 89.5q0 16 -26 32q-26 17 -26 39q0 16 11.5 26.5t28.5 10.5q22 0 37 -16t15 -39q0 -87 -131 -305q-78 -129 -151.5 -208t-116.5 -79q-23 0 -37 12t-14 31q0 17 11.5 28.5t27.5 11.5q19 0 34 -14t27 -14q18 0 48 33 q13 13 38.5 46.5t32.5 44.5q10 20 10 35q0 30 -31 155.5t-51 176.5q-14 37 -30.5 50.5t-46.5 13.5q-16 0 -31 -4v17q22 4 32 6q41 8 107 18h4q11 0 41.5 -93t43.5 -162zM399 667h18q-8 -61 -47.5 -108.5t-102.5 -47.5q-48 0 -88.5 28.5t-40.5 74.5q0 25 15.5 39t33.5 14 q16 0 28 -10.5t12 -27.5t-8.5 -27t-8.5 -16q0 -16 18 -29.5t47 -13.5q48 0 79 34.5t45 89.5z" />
+<glyph unicode="&#x45f;" horiz-adv-x="527" d="M481 119l14 -9q-48 -74 -75 -96.5t-63 -22.5q-48 0 -48 48q0 45 45 197q-99 -162 -150 -209q-13 -37 -13 -51q0 -13 4 -26t4 -24q0 -31 -18.5 -56.5t-77.5 -51.5l-9 18q23 11 32 23.5t9 37.5q0 4 -1.5 16.5t-1.5 14.5q0 9 2 16.5t7 16.5t7.5 13t11.5 14.5t10 12.5v1 q-26 -13 -55 -13q-53 0 -53 53q0 30 27 128l35 129q17 65 17 78q0 17 -10 17q-26 0 -88 -82l-14 10q47 72 76.5 95.5t66.5 23.5q46 0 46 -48q0 -33 -22 -112l-54 -198q-3 -9 -3 -16q0 -25 20 -25q45 0 142 147q33 50 51.5 91.5t58.5 151.5h74l-83 -303q-15 -57 -15 -74 t11 -17q12 0 29 16t54 65z" />
+<glyph unicode="&#x462;" horiz-adv-x="681" d="M308 364h87q226 0 226 -132q0 -104 -81 -168t-201 -64h-286l3 16q41 6 56 20.5t27 59.5l110 407h-44q-33 0 -48 -1t-35.5 -5.5t-31.5 -15.5t-25 -30.5t-28 -50.5l-18 4l32 135h208q10 40 10 55q0 21 -14 29.5t-57 13.5v16h243v-16q-61 -8 -74 -55l-12 -43h204l-37 -139 l-18 2q3 26 3 36q0 37 -27 51t-80 14h-54zM298 328l-50 -186q-15 -45 -15 -64q0 -42 66 -42q93 0 151.5 45.5t58.5 144.5q0 102 -140 102h-71z" />
+<glyph unicode="&#x463;" horiz-adv-x="542" d="M221 204l1 -1q76 72 158 72q61 0 92.5 -28.5t31.5 -73.5q0 -77 -72.5 -130.5t-172.5 -53.5q-76 0 -106 23t-30 65q0 28 17 93l61 232h-55q-57 0 -73.5 -10.5t-42.5 -61.5h-17l31 102h165l32 119q14 54 14 64q0 12 -12.5 19t-27.5 7h-28v15q84 10 157 27l7 -6l-68 -245 h165l-26 -102h-18q1 11 1 21q0 28 -18.5 39.5t-62.5 11.5h-49zM418 169q0 68 -73 68q-50 0 -102 -41q-26 -20 -37 -48t-11 -82q0 -23 18.5 -38t50.5 -15q66 0 110 51.5t44 104.5z" />
+<glyph unicode="&#x46a;" horiz-adv-x="953" d="M893 0h-280v16q71 4 71 79q0 27 -12 62q-24 66 -60.5 105t-80.5 42l-52 -193q-11 -39 -11 -51q0 -25 9 -32.5t48 -11.5v-16h-228v16q40 5 52 17t24 54l60 217q-48 -3 -108 -37.5t-113 -97.5q-54 -64 -54 -121q0 -29 43 -32v-16h-256v16q37 3 62.5 24t55.5 63q40 57 69 91 t73 72.5t97.5 57.5t118.5 22l-85 307h481l-252 -307q95 -4 162 -97q18 -25 34 -69l27 -76q11 -32 37.5 -58.5t67.5 -29.5v-16zM733 611h-289l71 -264z" />
+<glyph unicode="&#x46b;" horiz-adv-x="741" d="M673 94l13 -9q-53 -96 -137 -96q-63 0 -77 77q-1 4 -5 31t-7 35l-10 26q-7 18 -18.5 27.5t-28.5 15.5l-55 -201h-71l55 201h-1q-33 -12 -58 -39t-41 -55.5t-34 -55.5t-47.5 -44.5t-72.5 -17.5q-37 0 -57.5 15.5t-20.5 38.5q0 20 13.5 31.5t27.5 11.5q18 0 27 -10.5 t10 -22.5t7.5 -22.5t20.5 -10.5q18 0 29 21q8 15 19 43.5t23.5 51t33.5 43.5q39 39 109 44l-96 209h389l-189 -207v-2q57 -6 88.5 -38.5t31.5 -81.5q0 -3 -1 -16t-1 -17q0 -46 31 -46q53 0 100 70zM548 402h-219l76 -158z" />
+<glyph unicode="&#x472;" horiz-adv-x="712" d="M699 418q0 -107 -57.5 -205t-149.5 -160q-105 -71 -214 -71q-99 0 -158.5 62t-59.5 172q0 91 49 187.5t128 165.5q112 97 237 97q107 1 166 -66t59 -182zM594 481q0 71 -34.5 111.5t-94.5 40.5q-99 0 -186 -117q-50 -68 -80 -153q46 31 74 40t63 9q22 0 43.5 -16 t36.5 -34.5t38 -34.5t47 -16q31 0 73 28q20 80 20 142zM559 291q-61 -45 -132 -45q-25 0 -48.5 16t-38.5 34.5t-37 34.5t-45 16q-30 0 -74 -30q-19 -69 -19 -133q0 -82 33.5 -125.5t96.5 -43.5q92 0 170 95q56 68 94 181z" />
+<glyph unicode="&#x473;" horiz-adv-x="489" d="M470 301q0 -57 -28.5 -118.5t-77.5 -110.5q-83 -83 -188 -83q-70 0 -108.5 36.5t-38.5 102.5q0 83 50.5 162t129.5 121q56 30 119 30q62 0 102 -37.5t40 -102.5zM386 326q0 45 -19 69.5t-52 24.5q-67 0 -128 -91q-32 -49 -50 -97q50 38 84 38q27 0 56 -31.5t51 -31.5 q19 0 43 17q15 57 15 102zM363 195q-49 -38 -92 -38q-19 0 -33 10t-21 21.5t-18 21.5t-25 10q-21 0 -47 -19q-14 -51 -14 -100q0 -44 21 -67.5t57 -23.5q61 0 121 83q33 46 51 102z" />
+<glyph unicode="&#x474;" horiz-adv-x="646" d="M306 141l213 386q18 32 30 50.5t31.5 41t42.5 33t51 10.5q36 0 52 -16t16 -35q0 -54 -50 -54q-17 0 -32.5 20t-24.5 20q-14 0 -24.5 -8.5t-25.5 -34.5l-326 -572h-19l-82 503q-17 105 -28.5 126t-53.5 26v16h240v-16q-47 -5 -61.5 -15t-14.5 -36q0 -10 1 -15l63 -430h2z " />
+<glyph unicode="&#x475;" horiz-adv-x="464" d="M237 115h1q70 195 158 281q46 45 88 45q18 0 31 -12.5t13 -30.5q0 -46 -48 -46q-11 0 -22.5 9.5t-18.5 9.5q-25 0 -55.5 -34t-54.5 -77.5t-49.5 -103t-37.5 -90.5l-21 -59q-9 -25 -28 -25q-16 0 -16 28q-10 172 -46 297q-17 56 -29 75t-38 19h-30v15q72 11 109 20 q20 5 23 5q4 0 10 -16q27 -68 43 -155.5t18 -154.5z" />
+<glyph unicode="&#x490;" horiz-adv-x="524" d="M622 783l-49 -166h-282l-131 -489q-16 -62 -16 -73q0 -18 17 -27t60 -12v-16h-251v16q42 3 56.5 18.5t26.5 59.5l119 442q10 36 10 61q0 21 -13.5 30.5t-47.5 9.5v16h316q32 0 51.5 3t43 15t40.5 39.5t29 72.5h21z" />
+<glyph unicode="&#x491;" horiz-adv-x="337" d="M404 507l-29 -97h-134q-27 0 -34 -25l-80 -290q-8 -30 -8 -44q0 -15 12 -15q25 0 84 78l13 -11q-42 -65 -71 -89.5t-66 -24.5q-49 0 -49 55q0 29 22 111l58 215q4 13 4 24q0 13 -10.5 17t-42.5 6v15h186q66 0 86 11t42 64h17z" />
+<glyph unicode="&#x1e80;" horiz-adv-x="833" d="M576 708h-32l-140 106q-19 15 -19 32q0 16 10 25t26 9q22 0 40 -23zM906 653v-16q-29 -9 -42.5 -22t-34.5 -53l-301 -580h-20l-50 453h-5l-222 -453h-19l-61 514q-8 70 -13 92.5t-16 33.5q-10 10 -51 15v16h235v-16q-41 -4 -56.5 -14t-15.5 -37q0 -13 1 -20l44 -404 l172 348l-8 65q-4 38 -17.5 49t-57.5 13v16h236v-16q-39 -4 -53.5 -14t-14.5 -34q0 -3 1 -8.5t1 -6.5l40 -412l188 365q23 44 23 68q0 41 -67 42v16h184z" />
+<glyph unicode="&#x1e81;" horiz-adv-x="667" d="M403 426l32 -352q99 123 132 175.5t33 84.5q0 14 -22 35q-21 20 -21 41q0 12 11.5 21.5t27.5 9.5q22 0 37 -16t15 -40q0 -91 -212 -349l-9 -11q-35 -43 -45 -43q-8 0 -11 35l-29 310l-89 -152q-23 -38 -55 -99q-49 -94 -64 -94q-7 0 -9 9t-4 38l-4 91q-8 164 -27 242 q-7 27 -15.5 34.5t-31.5 7.5h-28v13q79 13 95 17q5 1 11.5 3t10.5 3t7 1q8 0 11 -5t8 -29q25 -120 32 -281l192 304q6 10 13 10q8 0 8 -14zM466 492h-32l-140 106q-19 15 -19 32q0 16 10 25t26 9q22 0 40 -23z" />
+<glyph unicode="&#x1e82;" horiz-adv-x="833" d="M389 706l162 160q10 10 25 10t25.5 -10.5t10.5 -25.5q0 -18 -17 -28l-171 -106h-35zM906 653v-16q-29 -9 -42.5 -22t-34.5 -53l-301 -580h-20l-50 453h-5l-222 -453h-19l-61 514q-8 70 -13 92.5t-16 33.5q-10 10 -51 15v16h235v-16q-41 -4 -56.5 -14t-15.5 -37 q0 -13 1 -20l44 -404l172 348l-8 65q-4 38 -17.5 49t-57.5 13v16h236v-16q-39 -4 -53.5 -14t-14.5 -34q0 -3 1 -8.5t1 -6.5l40 -412l188 365q23 44 23 68q0 41 -67 42v16h184z" />
+<glyph unicode="&#x1e83;" horiz-adv-x="667" d="M269 494l162 160q10 10 25 10t25.5 -10.5t10.5 -25.5q0 -18 -17 -28l-171 -106h-35zM403 426l32 -352q99 123 132 175.5t33 84.5q0 14 -22 35q-21 20 -21 41q0 12 11.5 21.5t27.5 9.5q22 0 37 -16t15 -40q0 -91 -212 -349l-9 -11q-35 -43 -45 -43q-8 0 -11 35l-29 310 l-89 -152q-23 -38 -55 -99q-49 -94 -64 -94q-7 0 -9 9t-4 38l-4 91q-8 164 -27 242q-7 27 -15.5 34.5t-31.5 7.5h-28v13q79 13 95 17q5 1 11.5 3t10.5 3t7 1q8 0 11 -5t8 -29q25 -120 32 -281l192 304q6 10 13 10q8 0 8 -14z" />
+<glyph unicode="&#x1e84;" horiz-adv-x="833" d="M439 769q0 -20 -14.5 -34.5t-34.5 -14.5q-21 0 -35 14.5t-14 35.5q0 20 14.5 34t35.5 14q19 0 33.5 -15t14.5 -34zM639 769q0 -20 -14.5 -34.5t-34.5 -14.5q-21 0 -35 14.5t-14 35.5q0 20 14.5 34t35.5 14q19 0 33.5 -15t14.5 -34zM906 653v-16q-29 -9 -42.5 -22 t-34.5 -53l-301 -580h-20l-50 453h-5l-222 -453h-19l-61 514q-8 70 -13 92.5t-16 33.5q-10 10 -51 15v16h235v-16q-41 -4 -56.5 -14t-15.5 -37q0 -13 1 -20l44 -404l172 348l-8 65q-4 38 -17.5 49t-57.5 13v16h236v-16q-39 -4 -53.5 -14t-14.5 -34q0 -3 1 -8.5t1 -6.5 l40 -412l188 365q23 44 23 68q0 41 -67 42v16h184z" />
+<glyph unicode="&#x1e85;" horiz-adv-x="667" d="M329 557q0 -20 -14.5 -34.5t-34.5 -14.5q-21 0 -35 14.5t-14 35.5q0 20 14.5 34t35.5 14q19 0 33.5 -15t14.5 -34zM529 557q0 -20 -14.5 -34.5t-34.5 -14.5q-21 0 -35 14.5t-14 35.5q0 20 14.5 34t35.5 14q19 0 33.5 -15t14.5 -34zM403 426l32 -352q99 123 132 175.5 t33 84.5q0 14 -22 35q-21 20 -21 41q0 12 11.5 21.5t27.5 9.5q22 0 37 -16t15 -40q0 -91 -212 -349l-9 -11q-35 -43 -45 -43q-8 0 -11 35l-29 310l-89 -152q-23 -38 -55 -99q-49 -94 -64 -94q-7 0 -9 9t-4 38l-4 91q-8 164 -27 242q-7 27 -15.5 34.5t-31.5 7.5h-28v13 q79 13 95 17q5 1 11.5 3t10.5 3t7 1q8 0 11 -5t8 -29q25 -120 32 -281l192 304q6 10 13 10q8 0 8 -14z" />
+<glyph unicode="&#x1ef2;" horiz-adv-x="556" d="M466 708h-32l-140 106q-19 15 -19 32q0 16 10 25t26 9q22 0 40 -23zM633 653v-16q-21 -7 -32 -17.5t-38 -43.5l-219 -270l-36 -123q-30 -103 -30 -127q0 -19 11.5 -27t41.5 -10l36 -3v-16h-289v16q51 3 72.5 18.5t34.5 62.5l59 205l-76 267q-11 40 -23.5 51t-53.5 17v16 h239v-16q-44 -4 -58 -11.5t-14 -24.5t36 -144l31 -110l39 46q149 176 149 213q0 24 -40 28l-29 3v16h189z" />
+<glyph unicode="&#x1ef3;" horiz-adv-x="444" d="M243 186l21 -110q67 110 94.5 167.5t27.5 89.5q0 16 -26 32q-26 17 -26 39q0 16 11.5 26.5t28.5 10.5q22 0 37 -16t15 -39q0 -87 -131 -305q-78 -129 -151.5 -208t-116.5 -79q-23 0 -37 12t-14 31q0 17 11.5 28.5t27.5 11.5q19 0 34 -14t27 -14q18 0 48 33 q13 13 38.5 46.5t32.5 44.5q10 20 10 35q0 30 -31 155.5t-51 176.5q-14 37 -30.5 50.5t-46.5 13.5q-16 0 -31 -4v17q22 4 32 6q41 8 107 18h4q11 0 41.5 -93t43.5 -162zM311 492h-32l-140 106q-19 15 -19 32q0 16 10 25t26 9q22 0 40 -23z" />
+<glyph unicode="&#x2000;" horiz-adv-x="511" />
+<glyph unicode="&#x2001;" horiz-adv-x="1023" />
+<glyph unicode="&#x2002;" horiz-adv-x="511" />
+<glyph unicode="&#x2003;" horiz-adv-x="1023" />
+<glyph unicode="&#x2004;" horiz-adv-x="341" />
+<glyph unicode="&#x2005;" horiz-adv-x="255" />
+<glyph unicode="&#x2006;" horiz-adv-x="170" />
+<glyph unicode="&#x2007;" horiz-adv-x="170" />
+<glyph unicode="&#x2008;" horiz-adv-x="127" />
+<glyph unicode="&#x2009;" horiz-adv-x="204" />
+<glyph unicode="&#x200a;" horiz-adv-x="56" />
+<glyph unicode="&#x2010;" horiz-adv-x="333" d="M282 257l-13 -66h-220l14 66h219z" />
+<glyph unicode="&#x2011;" horiz-adv-x="333" d="M282 257l-13 -66h-220l14 66h219z" />
+<glyph unicode="&#x2012;" d="M508 258l-8 -66h-508l8 66h508z" />
+<glyph unicode="&#x2013;" d="M505 243l-8 -46h-503l8 46h503z" />
+<glyph unicode="&#x2014;" horiz-adv-x="889" d="M894 243l-8 -46h-892l8 46h892z" />
+<glyph unicode="&#x2018;" horiz-adv-x="333" d="M301 666l9 -17q-75 -50 -75 -89q0 -13 20 -32q25 -22 25 -45q0 -20 -14.5 -33.5t-36.5 -13.5q-25 0 -41.5 20t-16.5 51q0 87 130 159z" />
+<glyph unicode="&#x2019;" horiz-adv-x="333" d="M160 436l-9 17q75 50 75 88q0 14 -20 33q-25 22 -25 46q0 20 14.5 33t36.5 13q25 0 41.5 -20.5t16.5 -50.5q0 -86 -130 -159z" />
+<glyph unicode="&#x201a;" horiz-adv-x="333" d="M53 -129l-9 18q75 50 75 88q0 11 -21 31q-24 21 -24 47q0 20 14.5 33t36.5 13q25 0 41.5 -20.5t16.5 -50.5q0 -87 -130 -159z" />
+<glyph unicode="&#x201b;" horiz-adv-x="333" d="M268 455l-13 -19q-86 47 -86 131q0 39 19 69t53 30q25 0 37 -13.5t12 -33.5q0 -19 -13 -32.5t-34 -14.5q-17 -1 -25.5 -10.5t-8.5 -20.5q0 -44 59 -86z" />
+<glyph unicode="&#x201c;" horiz-adv-x="556" d="M296 666l9 -17q-75 -50 -75 -89q0 -13 20 -32q25 -22 25 -45q0 -20 -14.5 -33.5t-36.5 -13.5q-25 0 -41.5 20t-16.5 51q0 87 130 159zM505 666l9 -17q-75 -50 -75 -89q0 -13 20 -32q25 -22 25 -45q0 -20 -14.5 -33.5t-36.5 -13.5q-25 0 -41.5 20t-16.5 51q0 87 130 159z " />
+<glyph unicode="&#x201d;" horiz-adv-x="556" d="M160 436l-9 17q75 50 75 88q0 14 -20 33q-25 22 -25 46q0 20 14.5 33t36.5 13q25 0 41.5 -20.5t16.5 -50.5q0 -86 -130 -159zM369 436l-9 17q75 50 75 88q0 14 -20 33q-25 22 -25 46q0 20 14.5 33t36.5 13q25 0 41.5 -20.5t16.5 -50.5q0 -86 -130 -159z" />
+<glyph unicode="&#x201e;" horiz-adv-x="556" d="M275 -129l-9 17q75 50 75 89q0 13 -20 32q-25 22 -25 46q0 20 14.5 33t36.5 13q25 0 41.5 -20.5t16.5 -50.5q0 -87 -130 -159zM66 -129l-9 17q75 50 75 89q0 13 -20 32q-25 22 -25 46q0 20 14.5 33t36.5 13q25 0 41.5 -20.5t16.5 -50.5q0 -87 -130 -159z" />
+<glyph unicode="&#x201f;" horiz-adv-x="556" d="M268 455l-13 -19q-86 47 -86 131q0 39 19 69t53 30q25 0 37 -13.5t12 -33.5q0 -19 -13 -32.5t-34 -14.5q-17 -1 -25.5 -10.5t-8.5 -20.5q0 -44 59 -86zM477 455l-13 -19q-86 47 -86 131q0 39 19 69t53 30q25 0 37 -13.5t12 -33.5q0 -19 -13 -32.5t-34 -14.5 q-17 -1 -25.5 -10.5t-8.5 -20.5q0 -44 59 -86z" />
+<glyph unicode="&#x2020;" d="M179 -159h-22q7 40 20 101q34 172 34 252q0 12 -3 41q-2 16 -2 27q56 62 74 164q-47 0 -96 -20q-24 -11 -39 -11q-44 0 -44 42q0 40 48 40q17 0 46 -12q42 -17 90 -18q10 55 10 86q0 17 -5 41q-4 23 -4 35q0 57 47 57q42 0 42 -45q0 -19 -24 -60q-35 -60 -47 -114 q48 1 90 18q28 12 47 12q47 0 47 -40q0 -42 -44 -42q-14 0 -38 10q-49 21 -105 21q-9 -45 -9 -83q0 -54 16 -85q-20 -29 -44.5 -91.5t-36.5 -115.5z" />
+<glyph unicode="&#x2021;" d="M282 427h-18q-25 0 -64 -17q-34 -14 -51 -14q-21 0 -34.5 11.5t-13.5 30.5q0 18 12.5 29t33.5 11q16 0 48 -12q45 -17 91 -18q9 46 9 76q0 28 -6 62q-3 16 -3 26q0 22 14.5 38t33.5 16q18 0 29.5 -12.5t11.5 -32.5q0 -24 -26 -64q-35 -56 -43 -109q46 1 91 18 q33 12 49 12q20 0 32.5 -11t12.5 -29q0 -19 -13.5 -30.5t-34.5 -11.5q-17 0 -51 14q-39 17 -64 17h-26q-11 -50 -11 -85q0 -27 16 -83q-28 -27 -45 -63.5t-31 -99.5h19q25 0 64 17q34 14 51 14q21 0 34.5 -12t13.5 -30t-12.5 -29t-34.5 -11q-15 0 -47 12q-44 17 -91 18 q-10 -46 -10 -76q0 -27 6 -62q3 -17 3 -26q0 -22 -14.5 -38t-33.5 -16t-30 12.5t-11 33.5q0 24 26 64q35 56 43 108q-47 -1 -91 -18q-30 -12 -49 -12q-20 0 -32.5 11t-12.5 29q0 19 13.5 30.5t34.5 11.5q17 0 51 -14q39 -17 64 -17h26q11 52 11 86q0 12 -14 73l-2 9 q28 27 45 63.5t31 99.5z" />
+<glyph unicode="&#x2022;" horiz-adv-x="523" d="M455 252q0 -79 -57 -136t-136 -57q-80 0 -136 56.5t-56 136.5q0 78 56.5 135t135.5 57q84 0 138.5 -56t54.5 -136z" />
+<glyph unicode="&#x2026;" horiz-adv-x="889" d="M168 43q0 -22 -17 -38t-41 -16q-21 0 -37 16t-16 38q0 24 16 40.5t39 16.5t39.5 -17t16.5 -40zM465 43q0 -22 -17 -38t-41 -16q-21 0 -37 16t-16 38q0 24 16 40.5t39 16.5t39.5 -17t16.5 -40zM762 43q0 -22 -17 -38t-41 -16q-21 0 -37 16t-16 38q0 24 16 40.5t39 16.5 t39.5 -17t16.5 -40z" />
+<glyph unicode="&#x202f;" horiz-adv-x="204" />
+<glyph unicode="&#x2030;" horiz-adv-x="1117" d="M705 213q0 -91 -50 -161.5t-114 -70.5q-51 0 -86 40t-35 98q0 80 58.5 145.5t130.5 65.5q46 0 71 -30.5t25 -86.5zM682 215q0 39 -17.5 63t-45.5 24q-29 0 -49 -23q-33 -35 -55.5 -93.5t-22.5 -109.5q0 -29 16 -48.5t40 -19.5q52 0 93 63.5t41 143.5zM640 706l-430 -724 h-47l394 658q-28 -32 -54.5 -44.5t-66.5 -12.5q-35 0 -76 14q4 -23 4 -44q0 -52 -22 -104t-58 -86q-38 -37 -86 -37q-50 0 -84 39.5t-34 97.5q0 85 58 149t135 64q26 0 60 -28q47 -39 96 -39q46 0 72 15t95 82h44zM340 569q0 22 -4.5 30t-20.5 16q-23 11 -44 34 q-31 -15 -44 -26.5t-28 -36.5q-48 -76 -48 -163q0 -31 15.5 -50.5t41.5 -19.5q53 0 92.5 65t39.5 151zM1067 213q0 -91 -49.5 -161.5t-113.5 -70.5q-52 0 -87 40t-35 99q0 80 58.5 145t130.5 65q46 0 71 -30.5t25 -86.5zM1044 215q0 39 -17.5 63t-45.5 24q-35 0 -66 -43 q-24 -32 -42.5 -86.5t-18.5 -94.5q0 -31 15.5 -50.5t40.5 -19.5q52 0 93 63.5t41 143.5z" />
+<glyph unicode="&#x2031;" horiz-adv-x="1479" d="M1067 213q0 -91 -49.5 -161.5t-113.5 -70.5q-52 0 -87 40t-35 99q0 80 58.5 145t130.5 65q46 0 71 -30.5t25 -86.5zM1044 215q0 39 -17.5 63t-45.5 24q-35 0 -66 -43q-24 -32 -42.5 -86.5t-18.5 -94.5q0 -31 15.5 -50.5t40.5 -19.5q52 0 93 63.5t41 143.5zM705 213 q0 -91 -50 -161.5t-114 -70.5q-51 0 -86 40t-35 98q0 80 58.5 145.5t130.5 65.5q46 0 71 -30.5t25 -86.5zM682 215q0 39 -17.5 63t-45.5 24q-29 0 -49 -23q-33 -35 -55.5 -93.5t-22.5 -109.5q0 -29 16 -48.5t40 -19.5q52 0 93 63.5t41 143.5zM640 706l-430 -724h-47l394 658 q-28 -32 -54.5 -44.5t-66.5 -12.5q-35 0 -76 14q4 -23 4 -44q0 -52 -22 -104t-58 -86q-38 -37 -86 -37q-50 0 -84 39.5t-34 97.5q0 85 58 149t135 64q26 0 60 -28q47 -39 96 -39q46 0 72 15t95 82h44zM340 569q0 22 -4.5 30t-20.5 16q-23 11 -44 34q-31 -15 -44 -26.5 t-28 -36.5q-48 -76 -48 -163q0 -31 15.5 -50.5t41.5 -19.5q53 0 92.5 65t39.5 151zM1429 213q0 -91 -49.5 -161.5t-113.5 -70.5q-52 0 -87 40t-35 99q0 80 58.5 145t130.5 65q46 0 71 -30.5t25 -86.5zM1406 215q0 39 -17.5 63t-45.5 24q-35 0 -66 -43q-24 -32 -42.5 -86.5 t-18.5 -94.5q0 -31 15.5 -50.5t40.5 -19.5q52 0 93 63.5t41 143.5z" />
+<glyph unicode="&#x2039;" horiz-adv-x="333" d="M51 216v9q103 80 127 101q88 77 97 77q6 0 6 -7q0 -17 -27 -47q-15 -16 -62.5 -62t-66.5 -70q6 -14 20 -40q62 -116 62 -133q0 -7 -7 -7q-4 0 -23 21q-20 22 -58.5 71.5t-50.5 63.5q-16 20 -17 23z" />
+<glyph unicode="&#x203a;" horiz-adv-x="333" d="M282 215l-36 -27q-47 -35 -91 -74q-87 -77 -97 -77q-6 0 -6 7q0 18 91 112l65 67l-20 40q-62 114 -62 133q0 7 7 7q16 0 61 -68q8 -12 21 -27q49 -57 67 -84v-9z" />
+<glyph unicode="&#x203e;" d="M500 532h-500v50h500v-50z" />
+<glyph unicode="&#x2044;" horiz-adv-x="167" d="M337 676l-455 -686h-51l455 686h51z" />
+<glyph unicode="&#x205f;" horiz-adv-x="255" />
+<glyph unicode="&#x20a3;" horiz-adv-x="611" d="M51 270h89l25 90h-89l8 30h89l41 146q10 36 10 61q0 21 -13.5 28.5t-62.5 11.5v16h497l-32 -154l-21 2q3 22 3 33q0 39 -14 55.5t-54 23.5t-131 7q-35 0 -49 -6.5t-19 -25.5l-55 -198h168l-8 -30h-169l-25 -90h169l-8 -30h-169l-35 -125q-14 -50 -14 -60q0 -18 17 -27 t60 -12v-16h-251v16q41 3 56.5 19t26.5 59l40 146h-88z" />
+<glyph unicode="&#x20a4;" d="M60 285h120q8 65 13 90h-109l8 30h107q27 124 88 197q57 68 137 68q41 0 67 -21t26 -55q0 -41 -39 -41q-30 0 -36 44t-40 44q-39 0 -61.5 -46.5t-51.5 -189.5h132l-8 -30h-130q-1 -3 -21 -90h128l-8 -30h-128q-16 -60 -57 -151q90 -38 160 -38q39 0 79 28l10 7l11 -9 q-41 -100 -142 -100q-37 0 -65.5 13t-78.5 52q-28 -37 -48.5 -50t-47.5 -13q-31 0 -48 17t-17 47q0 28 24 48t64 20q34 0 62 -11l17 140h-125zM146 73q-35 25 -61 25q-23 0 -38 -12.5t-15 -32.5q0 -16 12.5 -26.5t30.5 -10.5q20 0 40 16t31 41z" />
+<glyph unicode="&#x20a7;" horiz-adv-x="1149" d="M1126 442l-20 -140h-16q-14 116 -89 116q-27 0 -43 -15t-16 -42q0 -38 54 -102q68 -79 68 -136q0 -61 -40.5 -97.5t-103.5 -36.5q-29 0 -55 10q-21 9 -44 9q-20 0 -29 -21h-16l20 159h16q20 -136 100 -136q36 0 56 20t20 57q0 45 -56 115q-63 79 -63 131q0 50 33 79 t88 29q20 0 56 -10q22 -7 36 -7q20 0 30 18h14zM825 428l-5 -32h-84l-87 -328q-2 -8 -2 -14q0 -16 15 -16q12 0 28 15.5t53 63.5l13 -7q-46 -70 -75.5 -95.5t-67.5 -25.5q-46 0 -46 37q0 10 16 74l78 296h-75l-1 6q0 18 33 25q25 6 66 38.5t67 71.5q6 9 14 9q9 0 9 -8 q0 -5 -1 -7l-28 -103h80zM242 313l-53 -193q-14 -54 -14 -63q0 -18 15 -27.5t54 -13.5v-16h-244v16q43 6 56.5 19.5t27.5 62.5l116 414q17 61 17 83q0 20 -14 28.5t-57 13.5v16h221q108 0 156.5 -37t48.5 -111q0 -89 -65 -143q-69 -57 -185 -57q-45 0 -80 8zM320 592 l-69 -245q22 -5 42 -5q44 0 63.5 4.5t44.5 19.5q68 39 68 134q0 66 -27.5 94.5t-89.5 28.5q-6 0 -10 -0.5t-7.5 -2t-5 -2.5t-3 -4.5t-2 -5t-2 -7.5t-2.5 -9z" />
+<glyph unicode="&#x20ac;" d="M24 290h33q10 47 25 90h-34l8 30h38q49 113 130.5 183.5t166.5 70.5q41 0 84.5 -13.5t62.5 -39.5l-30 -111h-15l1 15v10q0 49 -30.5 80.5t-79.5 31.5q-52 0 -104 -60.5t-93 -166.5h208l-8 -30h-210q-15 -48 -26 -90h213l-8 -30h-212q-11 -57 -11 -99q0 -133 77 -133 q48 0 82.5 20.5t93.5 85.5l10 -10q-64 -77 -110.5 -106.5t-102.5 -29.5q-66 0 -104 47t-38 129q0 38 10 96h-35z" />
+<glyph unicode="&#x20d0;" horiz-adv-x="0" d="M-17 627h-436l132 133l18 -8q-36 -30 -36 -52q0 -19 41 -19h281v-54z" />
+<glyph unicode="&#x20d1;" horiz-adv-x="0" d="M10 627h-436v54h281q41 0 41 19q0 22 -36 52l18 8z" />
+<glyph unicode="&#x20d2;" horiz-adv-x="0" d="M-234 -156h-66v818h66v-818z" />
+<glyph unicode="&#x20d6;" horiz-adv-x="0" d="M-17 627h-286q-49 0 -49 -15q0 -3 2 -6.5t7.5 -9t10 -10.5t14.5 -14l16 -16l-18 -8l-133 106l132 106l18 -8q-49 -41 -49 -56t49 -15h286v-54z" />
+<glyph unicode="&#x20d7;" horiz-adv-x="0" d="M-453 681h286q49 0 49 15q0 3 -2 6.5t-7.5 9t-10 10.5t-14.5 14l-16 16l18 8l133 -106l-132 -106l-18 8q49 41 49 56t-49 15h-286v54z" />
+<glyph unicode="&#x20db;" horiz-adv-x="0" d="M-205 622q20 0 35 -15t15 -35t-15 -34.5t-36 -14.5q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5zM-6 622q20 0 35 -15t15 -35t-15 -34.5t-36 -14.5q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5zM-404 622q20 0 35 -15t15 -35t-15 -34.5t-36 -14.5 q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5z" />
+<glyph unicode="&#x20dc;" horiz-adv-x="0" d="M-135 622q20 0 35 -15t15 -35t-15 -34.5t-36 -14.5q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5zM64 622q20 0 35 -15t15 -35t-15 -34.5t-36 -14.5q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5zM-334 622q20 0 35 -15t15 -35t-15 -34.5t-36 -14.5 q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5zM-533 622q20 0 35 -15t15 -35t-15 -34.5t-36 -14.5q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5z" />
+<glyph unicode="&#x20dd;" horiz-adv-x="0" d="M-723 252q0 128 63.5 237t172.5 172.5t237 63.5t237 -63.5t172.5 -172.5t63.5 -237t-63.5 -237t-172.5 -172.5t-237 -63.5t-237 63.5t-172.5 172.5t-63.5 237zM-657 252q0 -169 119 -288t288 -119t288 119t119 288t-119 288t-288 119t-288 -119t-119 -288z" />
+<glyph unicode="&#x20e1;" horiz-adv-x="0" d="M-107 548l-18 8q49 41 49 56t-49 15h-177q-50 0 -50 -15q0 -3 2 -6.5t7.5 -9t10 -10.5t14.5 -14l16 -16l-18 -8l-133 106l132 106l18 -8q-49 -41 -49 -56t49 -15h178q49 0 49 15q0 3 -2 6.5t-7.5 9t-10 10.5t-14.5 14l-16 16l18 8l133 -106z" />
+<glyph unicode="&#x20e4;" horiz-adv-x="0" d="M490 -155h-1460l721 1178zM-839 -89h1198l-608 964z" />
+<glyph unicode="&#x20e5;" horiz-adv-x="0" d="M-24 -156h-71l-335 818h71z" />
+<glyph unicode="&#x20e6;" horiz-adv-x="0" d="M-86 -156h-66v818h66v-818zM-285 -156h-66v818h66v-818z" />
+<glyph unicode="&#x20e7;" horiz-adv-x="0" d="M-595 659v66h816v-903h-66v837h-750z" />
+<glyph unicode="&#x20e8;" horiz-adv-x="0" d="M-214 -119q20 0 35 -15t15 -35t-15 -34.5t-36 -14.5q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5zM-15 -119q20 0 35 -15t15 -35t-15 -34.5t-36 -14.5q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5zM-413 -119q20 0 35 -15t15 -35t-15 -34.5t-36 -14.5 q-20 0 -34 14.5t-14 35.5q0 20 14.5 34.5t34.5 14.5z" />
+<glyph unicode="&#x20e9;" horiz-adv-x="0" d="M-478 538v143h533v-143h-54v89h-425v-89h-54z" />
+<glyph unicode="&#x20ea;" horiz-adv-x="0" d="M-606 286h759v-66h-758q-26 0 -26 -20q0 -14 14 -28q21 -22 52 -66l-20 -19q-54 63 -97.5 97.5t-110.5 63.5v10q67 28 110.5 63t97.5 98l20 -19q-3 -5 -9 -14l-8 -12q-2 -3 -6.5 -9t-8 -10t-9.5 -9l-12 -13q-14 -14 -14 -25q0 -7 9 -14.5t17 -7.5z" />
+<glyph unicode="&#x20ec;" horiz-adv-x="0" d="M-17 681l-132 -133l-18 8q36 30 36 52q0 19 -41 19h-281v54h436z" />
+<glyph unicode="&#x20ed;" horiz-adv-x="0" d="M-453 681h436v-54h-281q-41 0 -41 -19q0 -22 36 -52l-18 -8z" />
+<glyph unicode="&#x20ee;" horiz-adv-x="0" d="M-17 -173h-286q-49 0 -49 -15q0 -3 2 -6.5t7.5 -9t10 -10.5t14.5 -14l16 -16l-18 -8l-133 106l132 106l18 -8q-49 -41 -49 -56t49 -15h286v-54z" />
+<glyph unicode="&#x20ef;" horiz-adv-x="0" d="M-167 -173h-286v54h286q49 0 49 15t-49 56l18 8l132 -106l-133 -106l-18 8l16 16q10 9 14.5 14t10 10.5t7.5 9t2 6.5q0 15 -49 15z" />
+<glyph unicode="&#x2102;" horiz-adv-x="702" d="M702 530l-25 -21l-29 30q-20 21 -28 28l-23 21q-16 14 -27 18l-30 12q-19 7 -39.5 9t-46.5 2q-118 0 -186 -52l-132 -501q70 -57 161 -57q43 0 78 6.5t57.5 13.5t55 29t46.5 34l58 48l21 -26q-119 -142 -322 -142q-118 0 -187 64.5t-69 181.5q0 183 117 310.5t298 127.5 q166 0 252 -136zM106 103l123 459q-74 -58 -115.5 -142.5t-41.5 -177.5q0 -95 34 -139z" />
+<glyph unicode="&#x2105;" horiz-adv-x="855" d="M808 234q0 -45 -22.5 -94t-61.5 -88q-67 -66 -150 -66q-57 0 -87.5 29t-30.5 82q0 66 40.5 129t103.5 97q45 23 96 23q49 0 80.5 -30t31.5 -82zM738 248q0 76 -54 76q-53 0 -101 -72q-57 -86 -57 -172q0 -72 60 -72q44 0 92 65q60 83 60 175zM646 676l-450 -690h-49 l453 690h46zM302 411l12 -9q-36 -46 -70.5 -66t-78.5 -20q-56 0 -87 34.5t-31 96.5q0 98 79 170q65 59 142 59q40 0 67 -21.5t27 -49.5q0 -16 -11 -27.5t-27 -11.5t-24 9.5t-8 23.5q0 7 6 18.5t6 19.5q0 16 -29 16q-51 0 -87 -38q-70 -73 -70 -174q0 -40 20 -65.5t49 -25.5 q32 0 57.5 13t57.5 48z" />
+<glyph unicode="&#x210a;" horiz-adv-x="738" d="M678 424l-269 -498q44 -23 91 -23q59 0 100 30l12 -26q-54 -34 -117 -34q-61 0 -102 22q-77 -114 -203 -114q-47 0 -72.5 21.5t-25.5 49.5q0 48 54 80q44 26 115 26q59 0 91 -13l87 156l-1 1q-54 -58 -102.5 -85.5t-104.5 -27.5q-38 0 -61 29t-23 76q0 48 23 99 q-30 -20 -70 -20q-39 0 -70 17l10 26q31 -13 57 -13q64 0 129 79q57 69 131.5 114t134.5 45q36 0 60 -16.5t28 -48.5h2l28 48h68zM550 364q0 42 -54 42q-95 0 -205 -159q-86 -125 -86 -187q0 -19 12 -30t29 -11q61 0 134.5 64.5t121.5 146t48 134.5zM337 -86l-1 1 q-29 13 -84 13q-57 0 -91.5 -20t-34.5 -52q0 -18 15.5 -29.5t40.5 -11.5q93 0 155 99z" />
+<glyph unicode="&#x210b;" horiz-adv-x="997" d="M714 664l-18 -14q-124 -96 -232 -310q22 9 62 21.5t53 17.5l33 43q100 125 187.5 195t134.5 70q57 0 57 -50q0 -39 -25.5 -76t-72 -68.5t-95 -56t-111.5 -49.5q-174 -251 -174 -334q0 -15 9.5 -25t24.5 -10q55 0 167 129l21 -13q-120 -146 -202 -146q-39 0 -63 24t-24 65 q0 101 104 262l-107 -41q-57 -111 -132 -193t-145 -109q-30 -11 -56 -11q-25 0 -41 16.5t-16 43.5q0 128 283 247q4 7 20 33l22 37l23 33.5t29 38.5l30 38q19 22 40.5 43t46.5 43q-7 -1 -20 -1q-44 0 -124 44q-63 34 -102 34q-47 0 -81.5 -30.5t-34.5 -70.5q0 -42 21.5 -68 t66.5 -26q38 0 66 21.5t55 64.5l18 -9q-54 -107 -141 -107q-59 0 -93 35t-34 91q0 59 50 105t125 46q29 0 58 -10.5t84 -38.5q60 -31 86 -31q41 0 80 19q14 7 43 28l32 24zM958 635q0 22 -24 22q-27 0 -85.5 -63t-128.5 -160q238 105 238 201zM307 241q-105 -48 -163 -96 t-58 -101q0 -25 24 -29q67 0 197 226z" />
+<glyph unicode="&#x210d;" horiz-adv-x="732" d="M767 653l-175 -653h-154l83 309h-266l-84 -309h-154l175 653h154l-81 -307h266l82 307h154zM719 616h-78l-155 -579h78zM298 616h-78l-155 -579h78z" />
+<glyph unicode="&#x210e;" horiz-adv-x="513" d="M469 106l14 -11q-2 -3 -18.5 -23.5t-26.5 -29.5l-25 -24q-16 -15 -31.5 -22t-31.5 -7t-28.5 10t-12.5 32t64 267q7 24 7 44q0 35 -24 35t-63 -42.5t-71 -90.5q-58 -88 -67 -122l-32 -122h-78l152 600q2 8 2 10q0 22 -31 22q-13 0 -29 -2l-2 14l159 24l-109 -416h4 q12 14 43 53l52 65q22 26 55.5 48.5t65.5 22.5q29 0 43 -20t14 -50q0 -18 -11 -64l-58 -230q0 -2 -1 -5t-1 -5q0 -14 13 -14q22 0 63 53z" />
+<glyph unicode="&#x2110;" horiz-adv-x="897" d="M63 95h-2q0 -23 35.5 -51t84.5 -28q102 0 174 53.5t138 201.5q15 35 27 59q-56 12 -90 48t-34 93q0 91 86 145q65 40 183 40q51 0 118 -8q40 27 76 27q12 0 20.5 -5.5t8.5 -14.5q0 -52 -109 -52q-36 -26 -69 -83t-77 -152q74 20 125 99l16 -10q-51 -100 -157 -124 q-79 -170 -133 -227q-117 -121 -285 -121q-77 0 -125 35.5t-48 86.5q0 31 17 51.5t42 20.5q22 0 36.5 -13.5t14.5 -34.5q0 -20 -11.5 -34t-31.5 -14q-23 0 -30 12zM729 601v2q-15 1 -53 1q-100 0 -154 -24q-36 -16 -60.5 -47.5t-24.5 -70.5q0 -34 25 -64t74 -36 q45 87 89.5 143t103.5 96z" />
+<glyph unicode="&#x2112;" horiz-adv-x="946" d="M608 643l-12 -19q-55 33 -145 33q-86 0 -154 -42t-68 -115q0 -74 66.5 -116t175.5 -42q25 0 63 5l30 57l30 59q13 23 26 43q42 63 106.5 113t121.5 50q42 0 62.5 -22.5t20.5 -59.5q0 -68 -87 -143.5t-217 -110.5q-47 -102 -119 -185.5t-136 -108.5q69 -23 103 -23 q141 0 265 139l19 -14q-131 -156 -281 -156q-84 0 -164 30q-70 -24 -155 -24q-126 0 -126 61q0 23 29.5 40t78.5 17q21 0 46 -5.5t39 -10.5t46.5 -18t41.5 -16q42 27 99.5 98t104.5 158q-26 -3 -53 -3q-50 0 -96.5 10.5t-88 31.5t-67 60t-25.5 90q0 78 73.5 130.5 t181.5 52.5q99 0 165 -44zM890 588q0 44 -49 44q-55 0 -108.5 -80t-89.5 -183q45 12 104 45q62 34 102.5 80t40.5 94zM266 35v1q-74 43 -125 43q-67 0 -67 -25q0 -33 87 -33q66 0 105 14z" />
+<glyph unicode="&#x2113;" horiz-adv-x="579" d="M77 389l14 26q36 -25 94 -25q85 125 174.5 211t147.5 86q64 0 64 -67q0 -81 -96.5 -161t-225.5 -99q-143 -231 -143 -298q0 -43 36 -43q33 0 76.5 38t122.5 129l21 -17q-85 -99 -133.5 -139.5t-93.5 -40.5q-37 0 -62 22.5t-25 64.5q0 84 77 218q12 22 40 66q-49 2 -88 29 zM268 396l1 -1q117 26 194.5 91.5t77.5 137.5q0 31 -35 31q-37 0 -82 -47q-58 -59 -156 -212z" />
+<glyph unicode="&#x2115;" horiz-adv-x="727" d="M755 653l-174 -653h-111l-262 528h-4l-142 -528h-37l175 653h112l262 -527h2l142 527h37zM561 70l-271 546h-63l-7 -28l273 -551h59z" />
+<glyph unicode="&#x2116;" horiz-adv-x="1046" d="M1031 355q0 -86 -62.5 -155t-147.5 -69q-52 0 -80.5 36t-28.5 89q0 83 63.5 150t146.5 67q49 0 79 -34t30 -84zM970 395q0 24 -12 38.5t-35 14.5q-41 0 -77.5 -44.5t-54.5 -98t-18 -93.5q0 -25 12 -40t36 -15q39 0 75 45.5t55 100t19 92.5zM945 49l-17 -60h-280l19 60 h278zM536 183l107 386q12 42 38 70.5t65 28.5q30 0 52 -19t22 -49q0 -21 -14 -34.5t-35 -13.5t-32.5 12.5t-18 25t-13.5 12.5q-5 0 -9 -3t-8 -8t-6.5 -10.5t-5 -13.5t-4.5 -13t-3.5 -12t-2.5 -9l-155 -548h-19l-162 550h-2l-123 -429q-34 -121 -112 -121q-31 0 -53.5 22.5 t-22.5 53.5q0 22 13.5 36t35.5 14q20 0 32 -10t14.5 -22.5t6.5 -22.5t11 -10q24 0 53 101l127 449q-23 41 -86 39l5 18h163l140 -470h2z" />
+<glyph unicode="&#x2119;" horiz-adv-x="687" d="M192 653h333q73 0 117 -44.5t44 -117.5q0 -95 -56 -160q-72 -84 -223 -84h-170l-66 -247h-154zM605 595l-81 -296q57 17 91 73t34 118q0 66 -44 105zM486 293l85 313q-23 10 -58 10h-177l-89 -332h159q53 0 80 9zM298 616h-78l-155 -579h78z" />
+<glyph unicode="&#x211a;" horiz-adv-x="723" d="M606 -19l8 -33q-37 -19 -82 -19q-33 0 -63 20t-47 51q-60 -18 -124 -18q-121 0 -192 63.5t-71 182.5t51.5 219t147.5 159.5t216 59.5q121 0 192 -63.5t71 -182.5q0 -134 -67 -245t-186 -161q30 -48 77 -48q37 0 69 15zM641 541l-121 -454q75 54 115.5 139t40.5 180 q0 73 -35 135zM477 60l136 512q-28 27 -72.5 42t-86.5 15q-111 0 -182 -40l-137 -514q23 -22 54 -34q51 62 131 62q41 0 66.5 -13.5t52.5 -47.5q21 8 38 18zM107 108l121 454q-75 -56 -115.5 -140.5t-40.5 -179.5q0 -80 35 -134zM399 30q-32 36 -82 36q-54 0 -90 -38 q35 -9 70 -9q49 0 102 11z" />
+<glyph unicode="&#x211b;" horiz-adv-x="944" d="M852 669l7 -19q-34 -14 -66 -38q83 -53 83 -139q0 -64 -48.5 -111t-131.5 -50v-2q54 -40 54 -84q0 -37 -38 -97t-38 -77q0 -34 32 -34q52 0 145 101l17 -16q-101 -115 -176 -115q-37 0 -65 23.5t-28 58.5q0 33 21 63.5t42 58t21 53.5q0 48 -33 48q-30 0 -47 11 q-82 -169 -178.5 -244t-217.5 -75q-77 0 -125 36t-48 87q0 31 17 51t42 20q22 0 36.5 -13.5t14.5 -34.5q0 -20 -11.5 -34t-31.5 -14q-23 0 -30 12h-2q0 -28 35 -53.5t85 -25.5q93 0 152.5 52t144.5 203q78 139 131.5 214t120.5 124q-76 48 -192 48q-149 0 -250 -75 t-101 -174q0 -41 30 -68.5t73 -27.5q159 0 205 245h20q-7 -107 -68.5 -191t-158.5 -84q-63 0 -102.5 35.5t-39.5 94.5q0 107 111 191t282 84q125 0 221 -59q36 23 84 41zM814 486q0 64 -48 102q-11 -10 -21 -23l-18 -23q-8 -10 -19 -28l-16 -26l-16 -32l-16 -31l-17 -35 q-13 -27 -17 -36q34 0 60 -17q57 6 92.5 50t35.5 99z" />
+<glyph unicode="&#x211d;" horiz-adv-x="687" d="M192 653h333q73 0 117 -44.5t44 -117.5q0 -92 -51.5 -149.5t-142.5 -73.5l137 -268h-172l-125 264h-90l-71 -264h-154zM604 597l-74 -281q59 19 89 65t30 109q0 70 -45 107zM491 309l79 296q-31 11 -55 11h-179l-84 -315h159q51 0 80 8zM567 37l-114 228q-11 -2 -34 -2 q-8 0 -23.5 0.5t-22.5 0.5l107 -227h87zM298 616h-78l-155 -579h78z" />
+<glyph unicode="&#x2122;" horiz-adv-x="980" d="M957 653v-20q-32 -2 -44 -14t-12 -41v-254q0 -36 6.5 -43.5t43.5 -11.5v-20h-170v20q37 4 43 11.5t6 43.5v235l-154 -312h-11l-151 310v-223q0 -36 10.5 -48.5t42.5 -16.5v-20h-131v20q32 4 42 16.5t10 48.5v249q-21 48 -69 50v20h121l154 -309l160 309h103zM375 565h-20 q-11 37 -26 52.5t-41 15.5h-50v-309q0 -36 6.5 -43.5t43.5 -11.5v-20h-171v20q37 4 43.5 11.5t6.5 43.5v309h-49q-27 0 -42.5 -15.5t-25.5 -52.5h-20v88h345v-88z" />
+<glyph unicode="&#x2124;" horiz-adv-x="754" d="M750 616l-534 -576v-3h429l-9 -37h-629v37l539 577v2h-404l9 37h599v-37zM698 616h-100l-537 -579h103z" />
+<glyph unicode="&#x212c;" horiz-adv-x="950" d="M895 660l7 -19q-42 -19 -72 -40q72 -59 72 -138q0 -50 -44.5 -93.5t-108.5 -51.5v-2q45 -19 67.5 -55t22.5 -75q0 -44 -25.5 -89t-70.5 -75q-49 -33 -112 -33q-44 0 -69 24t-25 54q0 50 36 85.5t102 46.5l4 -23q-42 -5 -73.5 -33t-31.5 -61q0 -20 14.5 -34t35.5 -14 q36 0 61 15q36 21 57 63.5t21 90.5q0 69 -46 95q-24 -6 -49 -6q-38 0 -47 19q-157 -326 -414 -326q-77 0 -125 35.5t-48 86.5q0 31 17 51.5t42 20.5q22 0 36.5 -13.5t14.5 -34.5q0 -20 -11.5 -34t-31.5 -14q-23 0 -30 12h-2q0 -28 35 -53.5t85 -25.5q95 0 161.5 53.5 t150.5 201.5q71 125 134.5 203t140.5 127q-81 56 -210 56q-93 0 -177.5 -31.5t-139.5 -92.5t-55 -137q0 -47 30 -76.5t81 -29.5q84 0 144 75t65 196h20q0 -125 -64 -213t-170 -88q-63 0 -105 37t-42 106q0 66 40 122t102.5 90t132.5 53t136 19q144 0 244 -67q34 20 87 40z M841 485q0 53 -40 95q-45 -38 -81.5 -92.5t-80.5 -139.5q7 4 23 4q27 0 55 -14q60 5 92 49t32 98z" />
+<glyph unicode="&#x212f;" horiz-adv-x="627" d="M534 196l20 -20q-92 -93 -170 -140t-154 -47q-52 0 -79 29.5t-27 81.5q0 46 18 92q-34 4 -65 23.5t-47 48.5l23 17q29 -57 101 -62q44 91 132.5 156.5t176.5 65.5q32 0 51.5 -14t19.5 -41q0 -56 -85.5 -114.5t-224.5 -79.5q-42 -74 -42 -118q0 -26 15 -40.5t39 -14.5 q119 0 298 177zM245 227l1 -1q105 15 181.5 64.5t76.5 93.5q0 27 -36 27q-47 0 -106 -46.5t-117 -137.5z" />
+<glyph unicode="&#x2130;" horiz-adv-x="750" d="M421 658l-10 -18q-44 17 -110 17q-72 0 -116 -31t-44 -80q0 -53 55 -83.5t136 -30.5q6 65 56 118t116.5 80.5t129.5 27.5q100 0 100 -73q0 -62 -97.5 -118.5t-233.5 -66.5q1 -6 4 -12q75 -3 75 -31t-42 -28q-28 0 -53 14q-88 -23 -141.5 -83t-53.5 -126q0 -49 39 -84 t105 -35q94 0 149 60q35 38 35 85q0 34 -24 54t-63 20q-53 0 -99.5 -39.5t-64.5 -102.5l-21 6q20 82 74.5 130t127.5 48q66 0 100 -31.5t34 -83.5q0 -68 -78 -122t-180 -54q-91 0 -153.5 44.5t-62.5 124.5q0 79 63 140.5t174 84.5v2q-2 2 -4 7l-3 9q-2 4 -4 4 q-107 2 -171.5 41.5t-64.5 106.5q0 57 52.5 97.5t136.5 40.5q75 0 132 -29zM693 588q0 15 -15 24t-37 9q-72 0 -150 -62t-88 -129q118 7 204 57.5t86 100.5z" />
+<glyph unicode="&#x2131;" horiz-adv-x="919" d="M896 662l11 -15q-89 -73 -176 -73q-57 0 -181 30t-168 30q-93 0 -148 -39t-55 -104q0 -56 31.5 -84t75.5 -28q71 0 114.5 43.5t71.5 132.5l20 -1q-39 -205 -209 -205q-59 0 -102 37t-43 98q0 78 64 132q76 64 227 64q56 0 180.5 -28t173.5 -28q47 0 113 38zM657 568 l14 -14q-34 -33 -57 -83t-50 -134q69 14 121 15q18 27 40 42t38 15q23 0 23 -22q0 -15 -20.5 -37.5t-51.5 -37.5q-8 -22 -8 -60q0 -12 3 -26l-59 -20v18q0 33 11 70q-62 -3 -115 -12q-105 -282 -354 -282q-59 0 -104 28.5t-45 82.5q0 32 16.5 50.5t43.5 18.5q20 0 35 -14.5 t15 -34.5q0 -21 -12 -35.5t-32 -14.5q-21 0 -29 13h-2q4 -27 33.5 -45t72.5 -18q76 0 132.5 48t120.5 177q-97 -31 -177 -85l-13 15q58 70 216 124q3 6 8 17.5t6 13.5q30 69 72 120t108 107z" />
+<glyph unicode="&#x2133;" horiz-adv-x="1072" d="M1048 672l8 -13q-142 -225 -230.5 -393t-88.5 -213q0 -35 33 -35q55 0 170 132l19 -16q-120 -146 -203 -146q-37 0 -61.5 22t-24.5 60q0 149 308 563l-1 2q-66 -25 -144.5 -120t-185.5 -284q-81 -143 -113 -181q-46 -54 -100 -54q-25 0 -40.5 19t-15.5 51q0 88 143 307 q126 196 192 270l-1 1q-53 -22 -118.5 -91t-120.5 -156l-51 -83l-48 -76l-40 -64q-24 -38 -39 -58.5t-35 -45.5t-35 -37.5t-33.5 -25t-36.5 -17.5t-37 -5q-34 0 -57 22.5t-23 55.5q0 28 17.5 46.5t41.5 18.5q22 0 37 -16t15 -36q0 -18 -12 -31t-31 -13q-8 0 -15 4h-3 q3 -21 31 -21q50 0 98 51t127 184q145 242 238.5 333t179.5 91q7 0 17 -2l15 -12q-100 -141 -191.5 -297t-130.5 -245q-17 -45 -17 -61q0 -18 13 -18q18 0 36.5 23t49.5 72l60 100l68 117q28 48 72.5 110.5t82.5 103t86.5 72t96.5 37.5q16 0 28 -2z" />
+<glyph unicode="&#x2134;" horiz-adv-x="697" d="M668 223l12 -25q-31 -21 -75 -21q-41 0 -69 18q-119 -206 -269 -206q-51 0 -80 29.5t-29 87.5q0 46 18 91q-29 -24 -82 -24q-33 0 -64 17l10 26q31 -13 57 -13q68 0 123 72t130.5 119t146.5 47q39 0 63 -24.5t24 -62.5q0 -62 -34 -130q25 -17 59 -17q36 0 59 16zM554 355 q-5 51 -55 51q-53 0 -122 -62.5t-115 -139.5t-46 -121q0 -27 14 -45.5t42 -18.5q56 0 118 46t116 146q-16 25 -16 59q0 29 19 55t45 30z" />
+<glyph unicode="&#x213c;" horiz-adv-x="635" d="M630 391h-119l-74 -268q-14 -52 -14 -79q0 -11 4 -19q23 0 43 8t30 16t32 28l29 27l27 -26q-5 -4 -22 -19.5t-20 -18.5l-18 -14q-13 -11 -17.5 -12.5t-16.5 -8.5t-20 -8.5t-21.5 -4.5t-27 -3.5t-30.5 -0.5q-44 0 -74 25.5t-30 68.5q0 22 9 53l71 256h-84l-106 -391h-141 l108 391h-95v37h577v-37zM475 391h-68l-65 -241q-14 -51 -14 -68q0 -49 56 -57l2 2q0 42 13 89zM252 391h-66l-99 -354h66z" />
+<glyph unicode="&#x213f;" horiz-adv-x="750" d="M780 653l-173 -653h-155l165 616h-266l-166 -616h-155l176 653h574zM733 616h-79l-154 -579h79zM312 616h-78l-156 -579h80z" />
+<glyph unicode="&#x2145;" horiz-adv-x="713" d="M192 653h251q116 0 188 -64t72 -179q0 -183 -117 -296.5t-300 -113.5h-269zM631 539l-114 -430q71 41 110 124.5t39 171.5q0 86 -35 134zM470 86l129 473q-46 57 -156 57h-108l-153 -579h110q95 0 178 49zM298 616h-78l-156 -579h80z" />
+<glyph unicode="&#x2146;" horiz-adv-x="581" d="M634 683l-188 -683h-137l10 48q-54 -59 -140 -59q-65 0 -102 43t-37 109q0 72 27.5 139.5t85 114t131.5 46.5q37 0 73 -15t51 -45h2l83 302h141zM587 646h-67l-168 -609h67zM346 150l29 102q10 35 10 56q0 38 -23 67t-60 29q-43 0 -65 -10l-98 -356q14 -12 56 -12 q51 0 94 37t57 87zM107 56l90 326q-57 -31 -88.5 -97.5t-31.5 -136.5q0 -37 30 -92z" />
+<glyph unicode="&#x2147;" horiz-adv-x="515" d="M408 128l28 -21q-46 -60 -96 -89t-120 -29q-84 0 -132 44t-48 126q0 114 80.5 198t194.5 84q70 0 120 -40t50 -108q0 -46 -22 -110h-282l-37 -140q30 -17 77 -17q45 0 79 14t52 30.5t56 57.5zM365 220h71q12 34 12 67q0 56 -40 86zM329 220l47 169q-36 15 -66 15 q-42 0 -72 -13l-47 -171h138zM110 56l89 324q-50 -23 -86 -93.5t-36 -129.5q0 -49 33 -101z" />
+<glyph unicode="&#x2148;" horiz-adv-x="293" d="M346 653l-36 -135h-142l37 135h141zM299 616h-67l-17 -61h68zM285 428l-118 -428h-140l117 428h141zM238 391h-67l-97 -354h67z" />
+<glyph unicode="&#x2149;" horiz-adv-x="341" d="M394 653l-36 -135h-142l37 135h141zM347 616h-67l-17 -61h68zM329 428l-125 -469q-21 -79 -84 -127.5t-145 -48.5q-43 0 -79 16l25 33q34 -13 69 -13q27 0 42 7l160 602h137zM280 391h-60l-152 -568q29 14 54.5 44t33.5 60z" />
+<glyph unicode="&#x2202;" horiz-adv-x="471" d="M195 625l-10 20q38 23 98 23q188 0 188 -260q0 -49 -8 -101t-29 -110t-53 -103.5t-85 -75t-120 -29.5q-69 0 -102.5 46t-33.5 116q0 109 75.5 196.5t181.5 87.5q69 0 96 -48q7 39 7 70q0 77 -30.5 129t-100.5 52q-33 0 -74 -13zM367 319q0 44 -18.5 65t-42.5 21 q-73 0 -129 -90.5t-56 -197.5q0 -98 67 -98q54 0 97.5 59t66.5 143q15 55 15 98z" />
+<glyph unicode="&#x2212;" horiz-adv-x="675" d="M590 220h-504v66h504v-66z" />
+<glyph unicode="&#x2423;" d="M460 -120h-420v136h30v-76h360v76h30v-136z" />
+<glyph unicode="&#x2460;" horiz-adv-x="684" d="M304 473v25q26 1 54.5 5.5t46.5 9t19 4.5q7 0 7 -11q0 -2 -7 -30l-76 -266q-7 -28 -7 -30q0 -19 34 -19h15v-20h-173v20q35 2 48.5 7.5t17.5 18.5l75 259l4 20q0 10 -20 10q-5 0 -38 -3zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244 q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x2461;" horiz-adv-x="684" d="M251 413l-20 6q36 98 130 98q45 0 74.5 -28.5t29.5 -71.5q0 -29 -19 -55.5t-70 -73.5l-101 -93h95q26 0 38.5 7t23.5 28l19 -6l-32 -83h-218v19l124 122l43 44q13 13 26 35.5t13 43.5q0 27 -18 43.5t-51 16.5q-58 0 -87 -52zM684 330q0 -145 -99 -244.5t-242 -99.5 q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x2462;" horiz-adv-x="684" d="M290 443l-20 6q32 68 109 68q37 0 61.5 -20.5t24.5 -52.5q0 -65 -78 -84q46 -23 46 -79q0 -68 -50 -107.5t-119 -39.5q-70 0 -72 38q0 13 7.5 21t20.5 8q18 0 42 -18q20 -15 42 -15q35 0 55 23.5t20 58.5q0 84 -97 84h-18v21l32 7q22 4 33.5 7t28.5 9t26 13t15.5 19 t6.5 27q0 20 -14.5 32t-37.5 12q-32 0 -64 -38zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88 t86 214z" />
+<glyph unicode="&#x2463;" horiz-adv-x="684" d="M462 517l-68 -234h58l-10 -48h-62l-25 -95h-54l26 95h-159l15 48l249 234h30zM386 439l-164 -156h116zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5 t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x2464;" horiz-adv-x="684" d="M487 517l-19 -52h-142l-17 -37q63 -10 99.5 -42.5t36.5 -87.5q0 -71 -53 -117.5t-130 -46.5q-31 0 -50 10t-19 29q0 12 7.5 20.5t18.5 8.5q14 0 38 -17q19 -15 37 -15q40 0 71.5 32.5t31.5 74.5q0 44 -34 66q-32 23 -105 32v19l64 123h165zM684 330q0 -145 -99 -244.5 t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x2465;" horiz-adv-x="684" d="M479 524v-21q-52 -7 -102.5 -38t-82.5 -77q19 6 47 6q45 0 76.5 -29.5t31.5 -75.5q0 -65 -45 -110t-110 -45q-55 0 -85 34t-30 94q0 57 28.5 108.5t79.5 88.5q42 30 82.5 43.5t109.5 21.5zM387 297q0 30 -19 46t-50 16q-44 0 -64.5 -38t-20.5 -90q0 -33 16.5 -51.5 t41.5 -18.5q44 0 70 43.5t26 92.5zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x2466;" horiz-adv-x="684" d="M495 506l-235 -372h-54l218 331h-123q-29 0 -46 -8.5t-39 -32.5l-18 9l54 84h233zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89 t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x2467;" horiz-adv-x="684" d="M484 436q0 -34 -20.5 -54.5t-69.5 -34.5q35 -29 49.5 -53t14.5 -54q0 -48 -36.5 -77.5t-93.5 -29.5q-53 0 -90 25.5t-37 74.5q0 78 108 110q-27 27 -37.5 45t-10.5 40q0 43 30 66t81 23q50 0 81 -22.5t31 -58.5zM436 430q0 27 -18.5 44.5t-46.5 17.5q-27 0 -42 -14 t-15 -37q0 -16 11.5 -32t44.5 -43q37 15 51.5 30t14.5 34zM405 224q0 22 -12 39t-60 60q-38 -13 -61 -39t-23 -57t25 -50t58 -19t53 19t20 47zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5 t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x2468;" horiz-adv-x="684" d="M200 134v21q36 6 61.5 18.5t58.5 37.5q46 36 70 76q-31 -21 -73 -21q-41 0 -69.5 29.5t-28.5 73.5q0 62 42.5 105t103.5 43q54 0 85.5 -34t31.5 -91q0 -117 -113 -198q-35 -26 -70.5 -38t-98.5 -22zM428 423q0 67 -58 67q-42 0 -65.5 -35t-23.5 -79q0 -75 58 -75 q89 0 89 122zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24b6;" horiz-adv-x="684" d="M544 141h-164v22q50 3 50 20q0 5 -2 15l-16 67h-133l-34 -56q-15 -26 -15 -34q0 -11 40 -12v-22h-124v22q23 4 37.5 19.5t45.5 65.5l169 276h19l75 -310q7 -30 17 -40t35 -11v-22zM404 299l-30 124l-75 -124h105zM684 330q0 -145 -99 -244.5t-242 -99.5 q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24b7;" horiz-adv-x="684" d="M238 517h152q130 0 130 -92q0 -64 -80 -84q58 -26 58 -85q0 -57 -44 -86t-119 -29h-165v22q26 5 34 11.5t14 28.5l63 242q5 17 5 33q0 8 -9.5 11.5t-38.5 5.5v22zM322 357h18q114 0 114 72q0 31 -16.5 44.5t-52.5 13.5q-17 0 -22.5 -2t-8.5 -13zM313 323l-18 -75l-14 -60 q0 -17 39 -17q50 0 79 21.5t29 62.5q0 48 -41 63q-15 5 -74 5zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5 t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24b8;" horiz-adv-x="684" d="M544 524l-21 -125h-20q-9 92 -94 92q-79 0 -132 -62t-53 -142q0 -115 115 -115q40 0 73 14.5t72 51.5l18 -14q-86 -90 -179 -90q-78 0 -127.5 41.5t-49.5 114.5q0 99 77.5 166.5t177.5 67.5q44 0 73 -9q16 -5 28 -5q14 0 23 14h19zM684 330q0 -145 -99 -244.5t-242 -99.5 q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24b9;" horiz-adv-x="684" d="M211 517h160q77 0 125 -42.5t48 -117.5q0 -100 -72.5 -158t-177.5 -58h-148v22q25 5 32.5 11t12.5 26l60 248q4 17 4 30q0 16 -44 17v22zM318 470l-60 -246q-7 -29 -7 -39q0 -14 37 -14q85 0 136.5 54.5t51.5 138.5q0 73 -47 105q-28 18 -73 18q-34 0 -38 -17zM684 330 q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24ba;" horiz-adv-x="684" d="M520 517l-17 -99h-17q1 13 1 33q-1 21 -21 27.5t-85 6.5q-36 0 -38 -9l-30 -121h36q37 0 50 8t27 42h16l-37 -141h-17q4 20 4 36q0 21 -33 21h-54l-14 -57q-18 -72 -18 -79q1 -12 43 -12q72 0 109 21q25 14 48 48h21l-36 -101h-288v22q25 4 31.5 10t11.5 26l62 251 q4 15 4 28t-45 17v22h286zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24bb;" horiz-adv-x="684" d="M520 517l-17 -99h-18l2 22q0 30 -18 37.5t-91 7.5q-31 0 -35 -12l-30 -118h37q36 0 48.5 8.5t27.5 39.5h17l-39 -143h-17q4 20 4 37q0 16 -8 20t-30 4h-48l-28 -118q-5 -20 -5 -25q0 -12 43 -15v-22h-145v22q24 1 32 9.5t13 28.5l60 246q4 19 4 32q0 8 -8 11t-36 5v22 h285zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24bc;" horiz-adv-x="684" d="M544 333v-22q-30 -2 -40.5 -8t-15.5 -27l-25 -107q-67 -35 -141 -35q-76 0 -126 43t-50 118q0 95 68 162t162 67q42 0 80 -13q17 -6 25 -6q21 0 37 19h12l-27 -125h-19q-3 40 -22 62q-28 31 -81 31q-76 0 -120.5 -64.5t-44.5 -145.5q0 -55 32 -85t88 -30q24 0 43.5 9 t23.5 22l22 73q4 15 4 25q0 11 -48 15v22h163zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88 t86 214z" />
+<glyph unicode="&#x24bd;" horiz-adv-x="684" d="M537 517v-22q-19 -4 -26 -11.5t-11 -24.5l-69 -258q-5 -23 -5 -25q0 -9 28 -13v-22h-143v22q48 4 56 38l31 121h-125l-31 -121q-5 -20 -5 -25q0 -11 25 -13v-22h-133v22q21 2 32 11.5t17 31.5l63 239q5 19 5 33q0 8 -7.5 11.5t-29.5 5.5v22h144v-22q-37 -3 -45 -34 l-25 -103h126l25 94q3 9 3 26q-2 15 -35 17v22h135zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5 t211 88t86 214z" />
+<glyph unicode="&#x24be;" horiz-adv-x="684" d="M448 517v-22q-25 -3 -33.5 -12t-15.5 -38l-60 -235q-7 -25 -7 -35q0 -12 25 -12v-22h-133v22q39 4 49 43l62 235q7 26 7 35q0 10 -8.5 13.5t-29.5 5.5v22h144zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100 q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24bf;" horiz-adv-x="684" d="M480 517v-22q-17 -2 -27 -8t-12.5 -11.5t-5.5 -17.5l-52 -202q-17 -65 -40 -93.5t-78 -28.5q-36 0 -58.5 16t-22.5 40q0 16 10.5 26.5t24.5 10.5t24 -8t10 -22q0 -5 -1.5 -9.5t-1.5 -7.5q0 -15 21 -15q24 0 34 41l63 239q5 20 5 32q0 9 -7 12.5t-30 5.5v22h144zM684 330 q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24c0;" horiz-adv-x="684" d="M544 517v-22q-19 0 -43 -18l-162 -121l100 -159q13 -21 22.5 -26.5t37.5 -7.5v-22h-161v22q41 2 41 13q0 7 -17 33l-76 123l-30 -122q-6 -22 -6 -29q0 -9 9 -12.5t33 -5.5v-22h-149v22q26 3 34 9t13 25l62 258q4 20 4 22q0 15 -47 18v22h163v-22q-48 -3 -56 -36l-22 -96 l78 56q75 54 75 66q0 6 -17 8l-17 2v22h131zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88 t86 214z" />
+<glyph unicode="&#x24c1;" horiz-adv-x="684" d="M492 253l-34 -112h-276v22q38 4 47 38l65 244q6 23 6 32q0 16 -38 18v22h144v-22q-21 -1 -30.5 -10.5t-14.5 -27.5l-60 -233q-6 -24 -6 -32q0 -11 10.5 -14.5t40.5 -3.5q39 0 57.5 4t34.5 17q22 17 39 58h15zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100 t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24c2;" horiz-adv-x="684" d="M571 517v-22q-23 -4 -31 -11t-13 -25l-67 -257q-5 -22 -5 -26q0 -7 8.5 -9.5t33.5 -3.5v-22h-150v22q38 3 50 47l61 231l-185 -300h-11l-19 295l-56 -225q-4 -20 -4 -27q0 -18 39 -21v-22h-106v22q21 2 30.5 15t19.5 55l55 222q5 19 5 27q0 10 -39 13v22h96l16 -273 l171 273h101zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24c3;" horiz-adv-x="684" d="M520 517v-22q-23 -8 -30.5 -19.5t-17.5 -59.5l-60 -282h-11l-118 301l-47 -222q-4 -22 -4 -28q0 -17 37 -20v-22h-99v22q21 3 29.5 17t18.5 64l42 194q4 24 4 29q0 10 -11.5 18t-28.5 8v22h79l106 -274h1l43 202q4 16 4 28q0 18 -36 22v22h99zM684 330q0 -145 -99 -244.5 t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24c4;" horiz-adv-x="684" d="M543 378q0 -98 -78 -171t-177 -73q-63 0 -102.5 37.5t-39.5 102.5q0 93 77 171.5t173 78.5q68 0 107.5 -40t39.5 -106zM473 407q0 41 -22.5 63t-59.5 22q-74 0 -124.5 -79t-50.5 -153q0 -47 22 -70.5t61 -23.5q40 0 74 25.5t55 63.5t33 78.5t12 73.5zM684 330 q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24c5;" horiz-adv-x="684" d="M249 517h139q132 0 132 -92q0 -59 -44 -87t-112 -28q-36 0 -53 6l-30 -117q-4 -16 -4 -22q2 -14 42 -14v-22h-150v22q24 3 34 13.5t17 37.5l58 219q9 33 9 44q0 16 -38 18v22zM351 470l-32 -124q13 -1 26 -1q51 0 79.5 15.5t29.5 59.5q1 35 -18 51t-56 16q-24 0 -29 -17z M684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24c6;" horiz-adv-x="684" d="M162 116l-13 18q60 39 101 72q-49 12 -76 47.5t-27 88.5q0 96 76 172.5t173 76.5q65 0 105.5 -40t40.5 -102q0 -96 -76 -172t-177 -76l-18 -18q33 0 91 -14q35 -8 58 -8q33 0 54.5 9.5t48.5 34.5l17 -13q-68 -83 -156 -83q-44 0 -94 15q-37 10 -56 10q-36 0 -72 -18z M472 473q0 42 -22 64t-59 22q-74 0 -124 -77t-50 -156q0 -43 22 -68t56 -25q77 0 127 79t50 161zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5 t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24c7;" horiz-adv-x="684" d="M520 141h-91l-82 181l-35 2l-27 -108q-8 -28 -8 -38q0 -14 42 -15v-22h-150v22q24 3 34 14t17 38l61 228q6 23 6 32q0 11 -7.5 14t-30.5 6v22h145q55 0 90 -22.5t35 -64.5q0 -85 -108 -103l55 -122q10 -24 21 -33t33 -9v-22zM351 470l-30 -114q11 -1 26 -1q51 0 79 18 t28 52q0 62 -72 62q-26 0 -31 -17zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24c8;" horiz-adv-x="684" d="M492 523l-22 -122h-18q-2 47 -15.5 68.5t-52.5 21.5q-28 0 -45 -12.5t-17 -34.5q0 -18 9.5 -30.5t52.5 -50.5q42 -38 57 -62.5t15 -55.5q0 -49 -36 -80t-88 -31q-32 0 -68 13q-19 7 -27 7q-18 0 -24 -20h-16l18 137h21q-3 -9 -3 -26q0 -35 23 -57t60 -22q32 0 52 17 t20 45q0 9 -5.5 20t-11.5 20t-18 22t-18 19l-19 19l-14 12q-29 26 -38.5 45t-9.5 44q0 44 33 69t78 25q35 0 57 -8q17 -5 26 -5q17 0 26 13h18zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5 t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24c9;" horiz-adv-x="684" d="M531 516l-28 -103h-20q2 18 2 27q0 23 -13 33t-43 10h-36l-67 -259q-10 -38 -10 -48q0 -13 39 -13v-22h-160v22q33 1 44.5 11.5t19.5 38.5l71 270q-69 0 -91 -12.5t-43 -57.5h-22l28 103h329zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244 q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24ca;" horiz-adv-x="684" d="M538 517v-22q-24 -6 -30.5 -16t-19.5 -61l-40 -158q-15 -58 -51.5 -92t-90.5 -34q-56 0 -94 25.5t-38 67.5q0 23 9 55l41 156q8 27 8 40q0 16 -43 17v22h155v-22q-26 -1 -36.5 -10.5t-17.5 -35.5l-47 -185q-5 -20 -5 -43q0 -25 19.5 -38t50.5 -13q44 0 69.5 22.5 t45.5 100.5l33 128q10 40 10 55t-38 19v22h110zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88 t86 214z" />
+<glyph unicode="&#x24cb;" horiz-adv-x="684" d="M544 517v-22q-21 -1 -33 -19l-214 -335h-13l-61 274q-12 54 -19.5 65.5t-33.5 14.5v22h150v-22q-27 -3 -35.5 -7t-8.5 -13q0 -10 2 -20l44 -218l118 189q25 38 25 51q0 15 -39 18v22h118zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244 q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24cc;" horiz-adv-x="684" d="M569 517v-21q-16 -5 -23.5 -12t-16.5 -26l-151 -317h-12l-35 245l-110 -245h-12l-42 284q-8 54 -17 63q-4 4 -29 7v22h130v-22q-21 -2 -29 -6.5t-8 -14.5q0 -12 2 -20l28 -199l80 179l-5 33q-2 17 -9.5 21.5t-31.5 6.5v22h131v-22q-34 -4 -34 -17q0 -9 5 -49l23 -174 l89 189q10 23 10 34q0 16 -36 17v22h103zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88 t86 214z" />
+<glyph unicode="&#x24cd;" horiz-adv-x="684" d="M520 517v-21q-38 -17 -66 -52l-81 -103l57 -139q9 -22 19 -29t38 -10v-22h-147v22q40 0 40 13q0 7 -9 27l-38 88l-71 -94q-11 -15 -11 -21q0 -13 36 -13v-22h-117v22q24 5 43 23.5t70 85.5l38 49l-57 140q-7 17 -17 24.5t-34 9.5v22h143v-22q-37 -5 -37 -15q0 -7 10 -30 l31 -77l72 90q8 11 8 19q0 12 -34 13v22h114zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88 t86 214z" />
+<glyph unicode="&#x24ce;" horiz-adv-x="684" d="M536 517v-21q-32 -10 -52 -33l-128 -149l-26 -101q-8 -29 -8 -36q0 -14 41 -14v-22h-165v22q54 0 64 40l30 112l-54 146q-7 19 -15.5 25t-34.5 9v22h156v-22q-45 -4 -45 -13q0 -8 8 -29l38 -105l81 91q30 33 30 42q0 10 -46 14v22h126zM684 330q0 -145 -99 -244.5 t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24cf;" horiz-adv-x="684" d="M520 500l-260 -326h82q76 0 100 18q21 16 42 55h18l-28 -106h-304v17l261 326h-89q-59 0 -81 -14q-20 -13 -38 -51h-18l25 98h290v-17zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5z M642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24d0;" horiz-adv-x="684" d="M482 264l16 -12q-40 -43 -58.5 -56.5t-38.5 -13.5q-30 0 -30 31q0 16 7 43q-59 -73 -121 -73q-30 0 -50 19t-20 53q0 67 58.5 126.5t123.5 59.5q37 0 53 -27l5 20l4 3l40 4l8 -3l-5 -20q-50 -177 -50 -191q3 -3 6 -3q10 0 52 40zM408 388q0 28 -34 28q-46 0 -81 -47 q-46 -59 -46 -109q0 -38 39 -38q38 0 77 51q45 58 45 115zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5 t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24d1;" horiz-adv-x="684" d="M337 469l-42 -145q50 69 112 69q34 0 57 -20t23 -55q0 -68 -63.5 -126t-136.5 -58q-31 0 -60 10.5t-29 26.5q0 3 1 5l79 283q5 17 5 21q0 8 -42 9v21q53 5 103 14l6 -7q-8 -32 -13 -48zM427 310q0 43 -44 43q-40 0 -82 -60q-41 -61 -41 -119q0 -15 27 -15q42 0 76 31 q27 24 45.5 58t18.5 62zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24d2;" horiz-adv-x="684" d="M428 262l15 -12q-61 -68 -128 -68q-48 0 -75 24t-27 70q0 69 57.5 117t127.5 48q32 0 53 -15t21 -36q0 -14 -10 -23t-24 -9q-29 0 -29 28q0 7 4.5 16t4.5 10q0 4 -22 4q-55 0 -89 -44.5t-34 -95.5q0 -61 60 -61q43 0 95 47zM684 330q0 -145 -99 -244.5t-242 -99.5 q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24d3;" horiz-adv-x="684" d="M496 524l8 -7q-2 -7 -17 -55l-59 -211q-2 -8 -7 -26l-9 -31q-3 -12 -3 -14q0 -5 10 -5q12 0 51 39l15 -11q-49 -69 -100 -69q-13 0 -22 9t-9 22q0 12 4 30q-45 -59 -104 -59q-35 0 -54.5 18.5t-19.5 53.5q0 68 59.5 126.5t122.5 58.5q32 0 43 -28l23 80q7 23 7 37 q0 7 -42 8v21q52 3 103 13zM392 340q0 27 -28 27q-48 0 -85.5 -54.5t-37.5 -100.5q0 -37 37 -37q42 0 78 52t36 113zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330 q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24d4;" horiz-adv-x="684" d="M433 261l16 -12q-59 -67 -138 -67q-41 0 -67.5 23t-26.5 61q0 66 59.5 120.5t133.5 54.5q27 0 42 -12t15 -32q0 -39 -49 -68.5t-134 -39.5q-4 -9 -4 -25q0 -20 17 -32t44 -12q40 0 92 41zM418 399q0 16 -21 16q-27 0 -55 -26.5t-48 -72.5q50 6 87 28t37 55zM684 330 q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24d5;" horiz-adv-x="684" d="M278 432h56q14 44 19 52q39 76 100 76q23 0 39 -12.5t16 -29.5q0 -12 -7.5 -21t-20.5 -9q-27 0 -27 23q0 6 4 12.5t4 7.5q0 6 -10 6q-46 0 -65 -105h65l-6 -28h-65l-35 -160q-32 -149 -117 -149q-22 0 -37 11t-15 27q0 12 7.5 20t19.5 8q11 0 18 -6.5t7 -16.5 q0 -7 -6 -15q2 -5 9 -5q37 0 53 78l42 208h-54zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88 t86 214z" />
+<glyph unicode="&#x24d6;" horiz-adv-x="684" d="M500 467h-30q3 -7 3 -24q0 -41 -38.5 -71t-86.5 -30q-12 0 -19 1.5t-8 1.5q-7 0 -13 -5.5t-6 -11.5q0 -9 46 -18q103 -22 103 -84q0 -41 -38.5 -66.5t-105.5 -25.5q-56 0 -89 18.5t-33 53.5q0 23 14 39.5t56 38.5q-11 9 -11 22q0 30 36 47q-42 21 -42 69q0 45 41.5 73.5 t95.5 28.5q41 0 79 -21h46v-36zM412 460q0 38 -37 38q-30 0 -53.5 -26t-23.5 -63q0 -41 40 -41q33 0 54 31q20 31 20 61zM404 207q0 21 -33 35q-15 7 -31 12t-34 9.5t-24 6.5q-53 -24 -53 -54q0 -56 87 -56q38 0 63 14t25 33zM684 330q0 -145 -99 -244.5t-242 -99.5 q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24d7;" horiz-adv-x="684" d="M480 214l16 -11q-33 -40 -53.5 -55t-45.5 -15q-32 0 -32 30q0 18 10 51l33 113q3 11 3 18q0 6 -15 6q-17 0 -43.5 -21t-50.5 -53q-20 -27 -31 -52t-26 -87h-56l87 322q5 18 5 20q0 9 -25 9h-20v21q62 6 104 14l8 -7l-63 -226q75 101 135 101q22 0 34 -12.5t12 -32.5 q0 -7 -6 -31l-34 -117q-5 -18 -5 -23q0 -4 8 -4q13 0 51 42zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5 t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24d8;" horiz-adv-x="684" d="M406 473q0 -15 -9.5 -25t-23.5 -10q-15 0 -26 10.5t-11 24.5q0 15 10.5 25t24.5 10q15 0 25 -10.5t10 -24.5zM387 214l15 -11q-27 -39 -47 -54.5t-44 -15.5q-15 0 -25 9.5t-10 27.5q0 13 13 62l26 95q5 17 5 24q0 6 -41 6v21q62 2 101 15l10 -8l-57 -196q-2 -6 -2 -11 q0 -6 7 -6q14 0 49 42zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24d9;" horiz-adv-x="684" d="M462 527q0 -14 -10 -24t-24 -10q-15 0 -25.5 10.5t-10.5 24.5t10 24.5t24 10.5q15 0 25.5 -11t10.5 -25zM445 443l-54 -219q-32 -129 -116 -129q-23 0 -38 11t-15 28q0 12 9 21t20 9t18.5 -7.5t7.5 -16.5q0 -4 -7 -16q2 -5 9 -5q18 0 29 19.5t24 72.5l38 155q8 32 8 40 q0 11 -27 11h-20v20q59 3 106 13zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24da;" horiz-adv-x="684" d="M485 385v-22q-25 -1 -50 -15t-89 -64l22 -43q35 -67 52 -67q13 0 38 38l17 -10q-25 -40 -40.5 -54.5t-35.5 -14.5q-31 0 -59 48q-10 17 -38 73l-22 -16l-27 -99h-55l81 296q10 39 10 47q0 6 -31 6h-15v21q37 2 105 15l7 -7l-65 -241l40 29q67 48 67 55q0 3 -21 3h-12v22 h121zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24db;" horiz-adv-x="684" d="M415 518l-83 -316q-6 -20 -6 -28q0 -4 9 -4q15 0 54 50l17 -9q-30 -44 -52 -60.5t-48 -16.5q-35 0 -35 36q0 9 5 29l71 269l2 15q0 5 -28 5h-14v21q47 5 99 15zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100 q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24dc;" horiz-adv-x="684" d="M559 263l18 -9q-53 -72 -104 -72q-29 0 -29 34q0 13 7 36l35 122q3 10 3 19q0 7 -13 7t-36.5 -17t-44.5 -44q-23 -29 -35.5 -58t-30.5 -94h-57l18 59q40 133 40 147q0 7 -12 7q-17 0 -43.5 -21t-50.5 -55q-26 -36 -60 -137h-56l28 87q31 96 31 123q0 6 -25 6h-19v21 q91 14 109 17l8 -3l-28 -96q72 99 130 99q21 0 32.5 -11t11.5 -29t-13 -57q25 34 38.5 49.5t39 31.5t53.5 16q18 0 29 -11.5t12 -29.5q0 -8 -4 -30l-37 -131q-4 -8 -4 -14q0 -4 5 -4q14 0 39 26zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244 q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24dd;" horiz-adv-x="684" d="M482 263l16 -11q-36 -43 -54.5 -56.5t-41.5 -13.5q-15 0 -25 9t-10 27q0 16 8 43l27 87q8 28 8 40t-17 12q-36 0 -94 -80q-17 -24 -26.5 -46t-30.5 -87h-56l55 189q3 10 3 19q0 8 -24 8h-20v21q31 4 110 17l8 -3l-33 -99q77 102 136 102q45 0 45 -42q0 -19 -4 -32 l-32 -111q-7 -21 -7 -31q0 -4 8 -4q12 0 51 42zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88 t86 214z" />
+<glyph unicode="&#x24de;" horiz-adv-x="684" d="M486 355q0 -68 -59.5 -120.5t-128.5 -52.5q-47 0 -74 22.5t-27 61.5q0 70 59 122.5t133 52.5q42 0 69.5 -23t27.5 -63zM426 366q0 50 -46 50q-48 0 -85.5 -55t-37.5 -105q0 -49 50 -49t84.5 53t34.5 106zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100 t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24df;" horiz-adv-x="684" d="M343 523l6 -8q-2 -10 -12 -45q46 53 103 53q40 0 62 -21.5t22 -59.5q0 -74 -61 -132t-135 -58q-24 0 -46 9l-18 -65l-4 -23q0 -10 44 -10v-22h-143v22q21 0 29.5 6.5t13.5 25.5l67 246q9 29 9 39q0 8 -26 8h-19v22zM457 436q0 27 -9.5 38t-31.5 11q-26 0 -50 -18t-35 -43 q-14 -33 -26 -75t-12 -58q0 -15 30 -15q53 0 93.5 52.5t40.5 107.5zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215 q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24e0;" horiz-adv-x="684" d="M496 516l-96 -320q-1 -4 -2.5 -9.5t-2.5 -8.5t-1 -4q0 -11 35 -11h14v-22h-165v22q52 2 61 30l43 136q-33 -42 -61 -58.5t-64 -16.5q-33 0 -53.5 20t-20.5 55q0 71 62.5 132.5t131.5 61.5q40 0 53 -31l9 24h57zM418 468q0 12 -11.5 20.5t-27.5 8.5q-50 0 -89.5 -56 t-39.5 -104q0 -40 32 -40q27 0 54 19q31 24 56.5 71t25.5 81zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5 t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24e1;" horiz-adv-x="684" d="M343 437l-25 -92q26 45 55 69q32 27 55 27q16 0 27.5 -10t11.5 -24q0 -37 -33 -37q-17 0 -26 11t-13 11q-17 0 -50 -50q-23 -33 -35 -61.5t-34 -98.5h-57l49 171q10 35 10 40q0 12 -24 12h-24v22q59 6 106 14zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100 t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24e2;" horiz-adv-x="684" d="M455 440l-13 -88h-18q-7 63 -54 63q-34 0 -34 -23q0 -18 36 -51q47 -46 47 -80q0 -38 -25 -58t-67 -20q-22 0 -37 5q-13 5 -27 5q-15 0 -18 -10h-15l11 97h17q12 -72 63 -72q44 0 44 32q0 23 -37 61q-46 46 -46 75q0 64 80 64q19 0 38 -5q16 -4 21 -4q13 0 19 9h15z M684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24e3;" horiz-adv-x="684" d="M442 446l-6 -38h-67l-52 -190q-7 -24 -7 -29t10 -5q9 0 20.5 11t40.5 45l20 -13q-39 -54 -63.5 -73.5t-54.5 -19.5q-41 0 -42 33q0 6 11 52l49 189h-53l-3 13q0 18 28 24q21 4 51 25t48 46q7 8 15 8q11 0 11 -12q0 -5 -3 -17l-14 -49h61zM684 330q0 -145 -99 -244.5 t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24e4;" horiz-adv-x="684" d="M470 265l17 -10q-32 -44 -52 -58t-44 -14q-35 0 -35 33q0 25 17 83q-48 -68 -77 -92.5t-62 -24.5q-38 0 -38 36q0 21 15 75l17 64q8 28 8 41q0 8 -24 8h-16v21q68 7 101 14l7 -4l-49 -190l-4 -16q0 -7 11 -7q28 0 87 78q36 47 67 134h55l-52 -182q-7 -23 -7 -29 q0 -3 6 -3q13 0 52 43zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24e5;" horiz-adv-x="684" d="M207 406v21q24 2 54 8t35 6q17 0 36 -123q5 -28 9 -77q43 36 70.5 76t27.5 59q0 3 -11 11q-19 14 -19 29q0 11 8 18t20 7q17 0 28.5 -11t11.5 -28q0 -39 -38 -87q-46 -58 -97 -104q-34 -29 -41 -29q-9 0 -9 21q0 66 -23 160q-7 27 -14 35t-24 8h-24zM684 330 q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24e6;" horiz-adv-x="684" d="M388 428l27 -184q97 100 97 132q0 1 -15 13q-15 13 -15 28q0 10 8.5 17t19.5 7q16 0 28 -11t12 -27q0 -63 -138 -198q-24 -23 -31 -23t-11 30l-24 150l-47 -74q-3 -4 -13 -20.5t-18 -28.5l-18 -27q-10 -14 -18 -22t-12 -8q-12 0 -12 31q0 26 -8.5 85.5t-18.5 90.5 q-4 11 -9.5 14t-18.5 3h-22v21l31 5l34 6q15 3 17 3q7 0 10 -3.5t7 -20.5q16 -60 25 -141l112 156q7 9 11 9q8 0 10 -13zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330 q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24e7;" horiz-adv-x="684" d="M363 388l6 -23q33 43 54 59.5t42 16.5q13 0 21.5 -7.5t8.5 -18.5q0 -27 -24 -27q-5 0 -14.5 5t-19.5 5q-19 0 -59 -65l29 -90q6 -18 18 -18t28 19l17 20l16 -11q-31 -42 -48.5 -56.5t-37.5 -14.5q-16 0 -25.5 9t-17.5 33l-20 59l-51 -61q-22 -25 -34 -32.5t-28 -7.5 q-17 0 -27.5 8.5t-10.5 22.5q0 11 7 18t18 7q8 0 19.5 -5.5t18.5 -5.5q12 0 31 24l49 60l-19 62q-7 21 -13 28t-17 7q-16 0 -37 -6l-6 19l10 4q53 16 77 16q13 0 22 -11.5t17 -41.5zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246 t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24e8;" horiz-adv-x="684" d="M374 369l13 -54q75 104 75 139q0 4 -19 14q-19 11 -19 29q0 12 8 19.5t21 7.5q17 0 28.5 -11.5t11.5 -28.5q0 -57 -82 -179q-75 -112 -129 -151q-27 -20 -50 -20q-17 0 -28.5 9t-12.5 23q0 13 8.5 21.5t21.5 8.5q11 0 23 -8t16 -8q15 0 33 18q51 51 51 67q0 14 -24 86.5 t-40 104.5q-16 33 -49 33q-8 0 -26 -2v22q30 4 55 8l34 5q9 2 12 2q7 0 33 -59t35 -96zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89 t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24e9;" horiz-adv-x="684" d="M473 425l-184 -192q23 -4 37.5 -13.5t37.5 -33.5q14 -15 22.5 -20.5t23.5 -5.5q13 0 13 7q0 1 -4.5 7.5t-4.5 14.5q0 10 8 17t18 7q11 0 18.5 -8.5t7.5 -21.5q0 -20 -18 -34t-46 -14q-25 0 -78 26q-42 21 -68 21q-13 0 -30 -11l-14 14l197 210h-75q-25 0 -36.5 -7 t-20.5 -28l-21 4l23 77h194v-16zM684 330q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x24ea;" horiz-adv-x="684" d="M488 376q0 -89 -53.5 -165.5t-133.5 -76.5q-49 0 -76.5 36t-27.5 100q0 101 56 177.5t129 76.5q49 0 77.5 -39.5t28.5 -108.5zM431 422q0 73 -50 73q-32 0 -58 -30t-40 -73.5t-21.5 -84.5t-7.5 -71q0 -35 12.5 -54t34.5 -19q34 0 61 29t41 72.5t21 84t7 73.5zM684 330 q0 -145 -99 -244.5t-242 -99.5q-144 0 -243.5 100t-99.5 244q0 146 100.5 246t247.5 100q139 0 237.5 -101.5t98.5 -244.5zM642 330q0 127 -86 215.5t-211 88.5t-214 -89t-89 -215q0 -125 89 -213.5t214 -88.5t211 88t86 214z" />
+<glyph unicode="&#x2500;" horiz-adv-x="708" d="M719 267h-730v73h730v-73z" />
+<glyph unicode="&#x2502;" horiz-adv-x="708" d="M390 -303h-73v1213h73v-1213z" />
+<glyph unicode="&#x250c;" horiz-adv-x="708" d="M720 267h-330v-570h-73v643h403v-73z" />
+<glyph unicode="&#x2510;" horiz-adv-x="708" d="M390 -303h-73v570h-328v73h401v-643z" />
+<glyph unicode="&#x2514;" horiz-adv-x="708" d="M720 267h-403v643h73v-570h330v-73z" />
+<glyph unicode="&#x2518;" horiz-adv-x="708" d="M390 267h-401v73h328v570h73v-643z" />
+<glyph unicode="&#x251c;" horiz-adv-x="708" d="M719 267h-329v-570h-73v1213h73v-570h329v-73z" />
+<glyph unicode="&#x2524;" horiz-adv-x="708" d="M390 -303h-73v570h-328v73h328v570h73v-1213z" />
+<glyph unicode="&#x252c;" horiz-adv-x="708" d="M719 267h-329v-570h-73v570h-328v73h730v-73z" />
+<glyph unicode="&#x2534;" horiz-adv-x="708" d="M719 267h-730v73h328v570h73v-570h329v-73z" />
+<glyph unicode="&#x253c;" horiz-adv-x="708" d="M719 267h-329v-570h-73v570h-328v73h328v570h73v-570h329v-73z" />
+<glyph unicode="&#x2550;" horiz-adv-x="708" d="M719 174h-730v73h730v-73zM719 360h-730v73h730v-73z" />
+<glyph unicode="&#x2551;" horiz-adv-x="708" d="M298 -303h-73v1213h73v-1213zM483 -303h-73v1213h73v-1213z" />
+<glyph unicode="&#x2552;" horiz-adv-x="708" d="M720 174h-330v-477h-73v736h403v-73h-330v-113h330v-73z" />
+<glyph unicode="&#x2553;" horiz-adv-x="708" d="M720 267h-237v-570h-73v562h-112v-562h-73v643h495v-73z" />
+<glyph unicode="&#x2554;" horiz-adv-x="708" d="M719 360h-421v-663h-73v736h494v-73zM719 174h-236v-477h-73v550h309v-73z" />
+<glyph unicode="&#x2555;" horiz-adv-x="708" d="M390 -303h-73v477h-328v73h328v113h-328v73h401v-736z" />
+<glyph unicode="&#x2556;" horiz-adv-x="708" d="M483 -303h-73v570h-112v-570h-73v570h-236v73h494v-643z" />
+<glyph unicode="&#x2557;" horiz-adv-x="708" d="M483 -303h-73v663h-421v73h494v-736zM298 -303h-73v477h-236v73h309v-550z" />
+<glyph unicode="&#x2558;" horiz-adv-x="708" d="M720 174h-403v736h73v-477h330v-73h-330v-113h330v-73z" />
+<glyph unicode="&#x2559;" horiz-adv-x="708" d="M720 267h-495v643h73v-570h112v570h73v-570h237v-73z" />
+<glyph unicode="&#x255a;" horiz-adv-x="708" d="M719 360h-309v550h73v-477h236v-73zM719 174h-494v736h73v-663h421v-73z" />
+<glyph unicode="&#x255b;" horiz-adv-x="708" d="M390 174h-401v73h328v113h-328v73h328v477h73v-736z" />
+<glyph unicode="&#x255c;" horiz-adv-x="708" d="M483 267h-494v73h236v570h73v-570h112v570h73v-643z" />
+<glyph unicode="&#x255d;" horiz-adv-x="708" d="M298 360h-309v73h236v477h73v-550zM483 174h-494v73h421v663h73v-736z" />
+<glyph unicode="&#x255e;" horiz-adv-x="708" d="M720 174h-330v-477h-73v1213h73v-477h330v-73h-330v-113h330v-73z" />
+<glyph unicode="&#x255f;" horiz-adv-x="708" d="M298 -303h-73v1213h73v-1213zM720 267h-237v-570h-73v1213h73v-570h237v-73z" />
+<glyph unicode="&#x2560;" horiz-adv-x="708" d="M298 -303h-73v1213h73v-1213zM720 360h-310v550h73v-477h237v-73zM720 174h-237v-477h-73v550h310v-73z" />
+<glyph unicode="&#x2561;" horiz-adv-x="708" d="M390 -303h-73v477h-328v73h328v113h-328v73h328v477h73v-1213z" />
+<glyph unicode="&#x2562;" horiz-adv-x="708" d="M483 -303h-73v1213h73v-1213zM298 -303h-73v570h-236v73h236v570h73v-1213z" />
+<glyph unicode="&#x2563;" horiz-adv-x="708" d="M483 -303h-73v1213h73v-1213zM298 360h-309v73h236v477h73v-550zM298 -303h-73v477h-236v73h309v-550z" />
+<glyph unicode="&#x2564;" horiz-adv-x="708" d="M719 360h-730v73h730v-73zM719 174h-329v-477h-73v477h-328v73h730v-73z" />
+<glyph unicode="&#x2565;" horiz-adv-x="708" d="M719 267h-236v-570h-73v570h-112v-570h-73v570h-236v73h730v-73z" />
+<glyph unicode="&#x2566;" horiz-adv-x="708" d="M719 360h-730v73h730v-73zM719 174h-236v-477h-73v550h309v-73zM298 -303h-73v477h-236v73h309v-550z" />
+<glyph unicode="&#x2567;" horiz-adv-x="708" d="M719 174h-730v73h730v-73zM719 360h-730v73h328v477h73v-477h329v-73z" />
+<glyph unicode="&#x2568;" horiz-adv-x="708" d="M719 267h-730v73h236v570h73v-570h112v570h73v-570h236v-73z" />
+<glyph unicode="&#x2569;" horiz-adv-x="708" d="M719 174h-730v73h730v-73zM719 360h-309v550h73v-477h236v-73zM298 360h-309v73h236v477h73v-550z" />
+<glyph unicode="&#x256a;" horiz-adv-x="708" d="M719 174h-329v-477h-73v477h-328v73h328v113h-328v73h328v477h73v-477h329v-73h-329v-113h329v-73z" />
+<glyph unicode="&#x256b;" horiz-adv-x="708" d="M719 267h-236v-570h-73v570h-112v-570h-73v570h-236v73h236v570h73v-570h112v570h73v-570h236v-73z" />
+<glyph unicode="&#x256c;" horiz-adv-x="708" d="M719 360h-309v550h73v-477h236v-73zM298 360h-309v73h236v477h73v-550zM719 174h-236v-477h-73v550h309v-73zM298 -303h-73v477h-236v73h309v-550z" />
+<glyph unicode="&#x1d434;" horiz-adv-x="717" d="M685 0h-285v16h16q40 0 56 14.5t16 46.5q0 7 -2 21l-13 113h-198l-84 -140q-10 -11 -10 -26q2 -29 43 -29h29v-16h-218v16q67 8 108 74l356 577h18l78 -581q10 -70 74 -70h16v-16zM466 248l-25 227h-6l-139 -227h170z" />
+<glyph unicode="&#x1d435;" horiz-adv-x="696" d="M198 653h252q236 0 236 -145q0 -102 -91 -147q-28 -14 -74 -26l3 -4q52 -9 89.5 -44t37.5 -94q0 -82 -72 -137.5t-217 -55.5h-324l4 16h20q52 0 74 16.5t29 46.5l123 495q2 10 2 21q0 42 -78 42h-19zM406 611l-59 -252q30 -6 53 -6q82 0 125 44t43 119q0 52 -35 75 t-84 23q-23 0 -43 -3zM338 314l-68 -267q32 -9 71 -9q80 0 135 41t55 131q0 52 -40 80t-102 28q-36 0 -51 -4z" />
+<glyph unicode="&#x1d436;" horiz-adv-x="671" d="M711 659l-53 -223h-16q1 8 1 42q0 59 -35 101.5t-117 42.5q-72 0 -134 -34t-101.5 -88t-61.5 -119.5t-22 -130.5q0 -91 49.5 -152.5t145.5 -61.5q126 0 216 98q9 10 17 20l20 -13q-35 -53 -89 -92q-87 -61 -193 -61q-138 0 -213 80t-75 198q0 112 60 203t161.5 140.5 t221.5 49.5q27 0 79.5 -13.5t78.5 -13.5t42 27h18z" />
+<glyph unicode="&#x1d437;" horiz-adv-x="790" d="M194 653h282q140 0 214.5 -72.5t74.5 -202.5q0 -162 -115.5 -270t-305.5 -108h-306l4 16h18q90 0 105 62l122 497q4 16 4 24q0 37 -77 37h-25zM405 612l-122 -504q-5 -19 -5 -27q0 -43 95 -43q69 0 123 30.5t85 79.5t47 104t16 111q0 48 -8 89t-26.5 79.5t-56 61 t-89.5 22.5q-35 0 -59 -3z" />
+<glyph unicode="&#x1d438;" horiz-adv-x="714" d="M734 653l-42 -158h-16q2 26 2 35q-4 87 -109 87h-160l-60 -248h80q51 0 81 19t45 76h16l-58 -242h-17q0 2 3 26t3 34q0 51 -72 51h-90l-66 -258q-2 -8 -2 -10q0 -27 63 -27h67q115 0 169 36t88 124h16l-66 -198h-571l4 16h19q89 0 104 62l120 488q5 22 5 36q0 19 -16 27 t-59 8h-19l4 16h534z" />
+<glyph unicode="&#x1d439;" horiz-adv-x="618" d="M723 653l-40 -160h-16q1 8 1 36q-3 87 -110 87h-147l-62 -248h83q36 0 57.5 5.5t41.5 27t30 62.5h16l-60 -242h-16q5 23 5 61q0 50 -70 50h-97l-62 -254q0 -1 -2 -9t-2 -12q0 -41 79 -41h32l-4 -16h-342l4 16h18q52 0 75 16t31 46l124 497q4 16 4 24q0 39 -76 39h-19 l4 15h520z" />
+<glyph unicode="&#x1d43a;" horiz-adv-x="734" d="M734 329v-16q-59 0 -81.5 -15.5t-31.5 -46.5l-62 -216q-37 -22 -80 -33t-68.5 -12.5t-68.5 -1.5q-127 0 -209.5 63.5t-82.5 190.5q0 106 55 203t156.5 160t223.5 63q53 0 103 -16q6 -2 28 -11.5t35 -9.5q15 0 28 12t15 25h16l-45 -223h-16q2 20 2 32q0 62 -40.5 108 t-119.5 46q-66 0 -120.5 -27.5t-90.5 -71.5t-60.5 -100.5t-35.5 -114t-11 -113.5q0 -34 8 -63t27 -56.5t56.5 -43.5t89.5 -16q57 0 97 25l57 201q3 12 3 25q0 18 -16 27.5t-59 9.5h-19l4 16h313z" />
+<glyph unicode="&#x1d43b;" horiz-adv-x="873" d="M923 653l-4 -16h-18q-52 0 -75 -16.5t-31 -46.5l-123 -496q-4 -18 -4 -28q0 -34 78 -34h19l-4 -16h-329l4 16h18q51 0 74.5 16t30.5 46l61 242h-280l-61 -242q-4 -12 -4 -24q0 -38 77 -38h20l-4 -16h-330l4 16h18q91 0 106 62l123 496q4 12 4 24q0 39 -78 39h-20l4 16 h330l-4 -16h-18q-54 0 -76 -16t-29 -47l-52 -217h278l53 217q4 20 4 24q0 39 -76 39h-20l4 16h330z" />
+<glyph unicode="&#x1d43c;" horiz-adv-x="480" d="M530 653l-4 -16h-19q-53 0 -75.5 -16t-30.5 -46l-123 -497q-3 -12 -3 -29q0 -33 78 -33h17l-4 -16h-328l4 16h19q52 0 75 16.5t30 45.5l123 497q4 16 4 24q0 38 -77 38h-18l4 16h328z" />
+<glyph unicode="&#x1d43d;" horiz-adv-x="540" d="M620 653l-4 -16h-18q-92 0 -108 -63l-103 -413q-25 -100 -92 -145q-44 -28 -109 -28q-53 0 -89.5 26.5t-36.5 70.5q0 30 17.5 50.5t52.5 20.5q25 0 44.5 -14.5t19.5 -36.5q0 -17 -13.5 -31.5t-13.5 -27.5q0 -21 24 -21q49 0 74 96q117 455 117 477q0 39 -75 39h-20l4 16 h329z" />
+<glyph unicode="&#x1d43e;" horiz-adv-x="762" d="M802 653l-4 -16q-35 0 -59 -12t-61 -41l-271 -211l187 -278q26 -38 54.5 -58.5t72.5 -20.5l-4 -16h-287l4 16h11q24 0 35.5 6.5t11.5 26.5q0 6 -1.5 11t-3.5 7.5t-5 8.5l-6 8l-156 237h-4l-62 -243q-3 -12 -3 -22q0 -40 78 -40h17l-4 -16h-304l4 16h18q68 0 84 62 l117 472q10 39 10 49q0 38 -76 38h-18l4 16h312l-4 -16h-11q-51 0 -70 -15.5t-27 -46.5l-53 -209h5l282 221q18 14 18 29q-1 11 -11 16t-40 5l4 16h216z" />
+<glyph unicode="&#x1d43f;" horiz-adv-x="708" d="M668 190l-61 -190h-569l4 16h17q92 0 107 62l118 477q7 28 7 45q0 37 -76 37h-18l4 16h327l-4 -16h-18q-52 0 -74.5 -16t-30.5 -47l-122 -481q-5 -19 -5 -31q0 -24 40 -24h122q79 0 122.5 23.5t76.5 91.5q9 14 17 37h16z" />
+<glyph unicode="&#x1d440;" horiz-adv-x="1005" d="M1055 653l-4 -16h-17q-55 0 -76 -15t-29 -46l-127 -498q-2 -7 -2 -28q0 -34 77 -34h19l-4 -16h-330l4 16h17q54 0 76 16.5t29 45.5l112 439h-6l-345 -517h-25l-94 517h-3l-109 -428q-5 -22 -5 -40q0 -33 76 -33h20l-4 -16h-267l4 16h19q54 0 76.5 19t31.5 54l119 475 q5 21 5 38q0 35 -77 35h-19l4 16h213l89 -493h4l333 493h215z" />
+<glyph unicode="&#x1d441;" horiz-adv-x="851" d="M901 653l-4 -16h-18q-53 0 -76.5 -16t-30.5 -47l-144 -574h-24l-274 526h-6l-108 -448q-3 -12 -3 -27q0 -35 76 -35h19l-4 -16h-266l4 16h18q91 0 106 62l126 509q-22 50 -92 50h-19l4 16h200l236 -465h5l97 386q4 18 4 26q0 37 -76 37h-20l4 16h266z" />
+<glyph unicode="&#x1d442;" horiz-adv-x="732" d="M712 420q0 -75 -29 -151t-80 -138.5t-130 -102t-170 -39.5q-112 0 -182.5 65t-70.5 168q0 77 29.5 155.5t81 144t131 106.5t171.5 41q118 0 183.5 -73.5t65.5 -175.5zM596 443q0 86 -34.5 137.5t-106.5 51.5q-66 0 -118 -34t-82.5 -84.5t-50 -115.5t-26.5 -119t-7 -102 q0 -70 39.5 -110t100.5 -40t111 30t81.5 75.5t53 103t30.5 110t9 97.5z" />
+<glyph unicode="&#x1d443;" horiz-adv-x="594" d="M201 653h271q117 0 174.5 -48t57.5 -112q0 -82 -71.5 -140.5t-213.5 -58.5q-44 0 -74 5q-4 0 -12 2l-56 -223q-3 -12 -3 -23q0 -39 77 -39h32l-4 -16h-341l4 16h17q53 0 75.5 16t30.5 46l125 497q4 16 4 25q0 37 -78 37h-19zM411 613l-68 -274q32 -8 60 -8q78 0 130 48 t52 124q0 50 -29.5 81.5t-95.5 31.5q-24 0 -49 -3z" />
+<glyph unicode="&#x1d444;" horiz-adv-x="781" d="M83 -115l164 107q-88 13 -142.5 73.5t-54.5 156.5q0 76 34 155.5t91 143.5t141 105t176 41q110 0 174.5 -65.5t64.5 -181.5q0 -102 -56 -201t-157.5 -164t-219.5 -65l-64 -43l4 -5q21 4 43 4q30 0 114.5 -17t130.5 -17q74 0 136 66l13 -11q-48 -59 -105.5 -89t-141.5 -30 q-68 0 -142 16l-47 11q-34 8 -53.5 12t-33.5 4q-21 0 -58 -18zM612 467q0 163 -130 163q-63 0 -117 -34t-89 -86t-60 -115t-35.5 -119t-10.5 -100q0 -72 35 -110.5t96 -38.5q77 0 139.5 46t98 116t54.5 142.5t19 135.5z" />
+<glyph unicode="&#x1d445;" horiz-adv-x="740" d="M725 16l-2 -16h-169l-150 315q-20 -2 -29 -2q-10 0 -38 4l-62 -239q-3 -12 -3 -23q0 -39 76 -39h19l-4 -16h-325l4 16h16q52 0 74.5 16t30.5 46l124 497q5 20 5 25q0 37 -77 37h-20l4 16h271q113 0 164.5 -41t51.5 -110q0 -62 -48.5 -108.5t-129.5 -62.5l115 -229 q18 -37 41 -60t61 -26zM410 613l-64 -260q17 -4 32 -4q96 0 143.5 38t47.5 104q0 73 -34 99t-91 26q-18 0 -34 -3z" />
+<glyph unicode="&#x1d446;" horiz-adv-x="650" d="M680 668l-53 -221h-16q1 8 1 24q0 68 -40.5 114t-119.5 46q-41 0 -81 -24.5t-40 -72.5q0 -14 3 -27.5t11 -26.5l14 -22q6 -9 20 -22l21 -20q6 -6 24 -21l24 -20q55 -46 86.5 -90.5t31.5 -103.5q0 -79 -65.5 -135t-178.5 -56q-49 0 -107 19t-94 19q-32 0 -55 -38h-16 l60 236h16q0 -5 0.5 -15.5t0.5 -15.5q3 -70 42 -118.5t129 -48.5q156 0 156 136q0 50 -46 96q-16 16 -56.5 51t-57.5 51q-73 73 -73 131q0 69 56.5 122t166.5 53q46 0 106 -18.5t77 -18.5q14 0 24 12t13 25h16z" />
+<glyph unicode="&#x1d447;" horiz-adv-x="550" d="M670 653l-46 -179h-16q5 42 5 71q0 31 -17.5 47.5t-36 20t-45.5 3.5h-98l-133 -538q-5 -22 -5 -25q0 -37 76 -37h21l-4 -16h-329l4 16h18q54 0 76.5 16t29.5 46l133 538h-91q-62 0 -109.5 -40.5t-61.5 -101.5h-16l46 179h599z" />
+<glyph unicode="&#x1d448;" horiz-adv-x="705" d="M775 653l-4 -16h-16q-52 0 -75.5 -16.5t-31.5 -46.5l-87 -356q-9 -36 -20 -65t-32.5 -61.5t-49 -54t-71.5 -36t-99 -14.5q-111 0 -166.5 55t-55.5 132q0 6 6 46.5t8 48.5l76 330q1 2 1 7q0 31 -75 31h-18l4 16h328l-4 -16h-17q-54 0 -76 -16t-30 -47l-90 -360 q-7 -26 -7 -68q0 -45 38 -78.5t106 -33.5q149 0 195 189l86 351q4 14 4 26q-1 19 -17.5 28t-57.5 9h-19l4 16h263z" />
+<glyph unicode="&#x1d449;" horiz-adv-x="575" d="M760 653l-4 -16q-77 -5 -132 -77l-441 -576h-24v571q0 82 -99 82l4 16h294l-4 -16h-19q-44 0 -57 -19t-13 -51v-391l4 -1l280 366q38 48 38 74q0 22 -52 22h-20l4 16h241z" />
+<glyph unicode="&#x1d44a;" horiz-adv-x="916" d="M1101 653l-4 -16q-78 -4 -134 -77l-438 -576h-29v442h-11l-297 -442h-29v569q0 41 -23.5 62.5t-65.5 21.5h-10l4 16h288l-4 -16h-7q-19 0 -29 -1.5t-23 -7.5t-18.5 -21.5t-5.5 -40.5v-377h5l226 332v61q0 55 -82 55h-8l4 16h285l-4 -16h-18q-71 0 -71 -72v-395h6l278 370 q40 52 40 72q0 25 -54 25h-17l4 16h242z" />
+<glyph unicode="&#x1d44b;" horiz-adv-x="790" d="M810 653l-4 -16h-4q-33 0 -58.5 -11t-39.5 -23.5t-37 -39.5l-187 -213l96 -266q11 -32 28 -50t51 -18h14l-4 -16h-281l4 16h11q34 0 50.5 8t16.5 33q0 13 -4 26l-69 194l-181 -201q-12 -13 -12 -28q0 -32 56 -32h22l-4 -16h-249l4 16q78 10 140 77l208 230l-85 231 q-6 18 -10.5 27t-16 25t-30.5 23.5t-45 7.5h-9l4 16h283l-4 -16h-19q-26 0 -39 -7t-13 -28q0 -12 6 -28l60 -179l164 184q15 18 15 34q-2 24 -45 24h-9l4 16h222z" />
+<glyph unicode="&#x1d44c;" horiz-adv-x="535" d="M695 653l-4 -16q-72 -5 -124 -69l-209 -256l-59 -234q-3 -14 -3 -26q0 -36 76 -36h20l-4 -16h-328l4 16h17q53 0 75.5 16t29.5 46l61 246l-89 237q-14 37 -41.5 56.5t-81.5 19.5l4 16h299l-4 -16h-19q-35 0 -46.5 -9.5t-11.5 -30.5q0 -3 7 -27l75 -207h4l174 212 q16 20 16 34q0 28 -79 28l4 16h237z" />
+<glyph unicode="&#x1d44d;" horiz-adv-x="772" d="M802 653l-566 -615h218q42 0 70 4t59.5 17t53 43t34.5 76h16l-46 -178h-581l573 616h-202q-44 0 -71.5 -3t-60.5 -14t-55 -37t-36 -67h-17l48 158h563z" />
+<glyph unicode="&#x1d44e;" horiz-adv-x="502" d="M472 428l-91 -345q-1 -2 -1 -11q0 -17 14 -17q24 0 64 54l12 -12q-28 -42 -64 -74.5t-69 -32.5q-42 0 -42 55q0 15 11 50h-4q-82 -105 -173 -105q-45 0 -67 33.5t-22 85.5q0 67 38 144t104 132.5t134 55.5q30 0 47 -14t19 -32h1l9 33h80zM367 341q0 71 -50 71 q-47 0 -90 -50t-72 -121q-28 -70 -28 -124q0 -66 58 -66q49 0 97 57.5t70 132.5q15 49 15 100z" />
+<glyph unicode="&#x1d44f;" horiz-adv-x="470" d="M214 382l4 -4q65 63 121 63q51 0 81 -43.5t30 -107.5q0 -46 -20 -98t-53.5 -97.5t-85 -75.5t-107.5 -30q-67 0 -139 48l144 563q2 8 2 11q-1 9 -10 15t-19 6q-19 0 -30 -4l-3 16l158 24zM179 252l-55 -215q0 -5 19 -12t36 -7q57 0 102 49t65.5 110.5t20.5 116.5 q0 48 -21 70t-50 22q-47 0 -76 -42.5t-41 -91.5z" />
+<glyph unicode="&#x1d450;" horiz-adv-x="415" d="M363 111l12 -13q-93 -109 -198 -109q-68 0 -102.5 45.5t-34.5 109.5q0 108 79.5 202.5t183.5 94.5q40 0 68.5 -20.5t28.5 -55.5q0 -31 -13.5 -50.5t-40.5 -19.5q-18 0 -28 12t-10 26q0 12 14.5 29.5t14.5 28.5q0 21 -34 21q-55 0 -97.5 -49.5t-60.5 -107t-18 -102.5 q0 -60 27 -84.5t67 -24.5q73 0 142 67z" />
+<glyph unicode="&#x1d451;" horiz-adv-x="532" d="M527 668l-149 -598q-2 -6 -2 -12q0 -9 15 -9q25 0 62 56l11 -12q-28 -41 -63 -73t-67 -32q-40 0 -40 41q0 27 10 64h-5q-84 -105 -171 -105q-49 0 -68.5 38t-19.5 89q0 56 31 130t93 135t133 61q40 0 60 -15t21 -35h2l53 209q2 8 2 12q0 20 -33 20q-6 0 -27 -3l-4 15z M363 340q0 36 -13 53.5t-43 17.5q-46 0 -89.5 -54.5t-67 -123t-23.5 -118.5q0 -34 16 -50t40 -16q50 0 95.5 56t68.5 130q16 51 16 105z" />
+<glyph unicode="&#x1d452;" horiz-adv-x="445" d="M363 112l14 -13q-90 -110 -200 -110q-68 0 -102.5 47t-34.5 109q0 32 6 60q20 89 95.5 162.5t166.5 73.5q40 0 71 -17t31 -59q0 -45 -27.5 -80.5t-71.5 -56t-91.5 -32t-95.5 -13.5v-28q0 -47 33 -77t80 -30q76 0 126 64zM124 211h9q79 0 138.5 46t59.5 111q0 19 -12.5 31 t-31.5 12q-50 0 -93 -61t-70 -139z" />
+<glyph unicode="&#x1d453;" horiz-adv-x="555" d="M248 437h37q28 0 42.5 19.5t29 59.5t29.5 62q59 90 150 90q37 0 58 -16t21 -43q0 -20 -12 -30t-29 -10q-35 0 -35 25q0 8 4.5 21t4.5 16q0 8 -15 8q-36 0 -65 -35.5t-45 -96.5l-19 -70h80l-12 -38h-76l-79 -306q-20 -78 -30 -102q-71 -178 -175 -178q-35 0 -53.5 15 t-18.5 39q0 20 11.5 34.5t31.5 14.5q19 0 28 -10t9 -23q0 -10 -8 -18.5t-8 -13.5q0 -9 15 -9q13 0 25.5 8.5t22.5 25t18 32.5t15.5 41t11.5 40t9.5 38.5t7.5 29.5l87 342h-77z" />
+<glyph unicode="&#x1d454;" horiz-adv-x="492" d="M492 413l-13 -45h-81q17 -20 17 -50q0 -57 -38 -98.5t-103 -49.5q-42 -6 -65 -22t-23 -36t36.5 -32t80 -18.5t80 -31t36.5 -66.5q0 -60 -55.5 -105.5t-159.5 -45.5q-94 0 -139 33t-45 82q0 70 117 108q-24 16 -24 47q0 30 25.5 58.5t59.5 28.5v4q-47 11 -70.5 41 t-23.5 68q0 62 49 110t125 48q60 0 88 -28h126zM336 349q0 31 -11.5 46.5t-42.5 15.5q-39 0 -68.5 -43.5t-29.5 -95.5q0 -81 56 -81q33 0 56 29t31.5 63t8.5 66zM349 -69q0 27 -22.5 44.5t-50 24t-65.5 13.5t-54 13q-1 -1 -11 -6.5t-15 -9.5q-48 -35 -48 -72q0 -39 36 -68 t103 -29q63 0 95 26.5t32 63.5z" />
+<glyph unicode="&#x1d456;" horiz-adv-x="311" d="M257 566q0 -19 -14 -32.5t-34 -13.5q-21 0 -34.5 13t-13.5 33t13.5 35t34.5 15q19 0 33.5 -15.5t14.5 -34.5zM227 441l-92 -364q-1 -6 -1 -14q0 -10 13 -10q6 0 10.5 1.5t7.5 3t9 6.5t9 9t12.5 14t15.5 17l13 -10q-82 -105 -134 -105q-40 0 -40 46q0 31 79 338q2 4 2 12 q0 13 -7 17.5t-24 4.5q-14 0 -28 -4l-3 16z" />
+<glyph unicode="&#x1d457;" horiz-adv-x="389" d="M372 566q0 -19 -14 -32.5t-34 -13.5q-21 0 -34.5 13t-13.5 33t13.5 35t34.5 15q19 0 33.5 -15.5t14.5 -34.5zM351 441l-108 -425q-9 -36 -23.5 -69t-36.5 -64.5t-55 -50.5t-71 -19q-37 0 -55 18.5t-18 42.5q0 20 11.5 36t35.5 16q15 0 25 -10.5t10 -27.5q0 -7 -8 -16.5 t-8 -17.5q0 -3 3 -6.5t7 -3.5q60 0 103 172l92 363q0 22 -32 22q-15 0 -27 -5l-3 17z" />
+<glyph unicode="&#x1d458;" horiz-adv-x="542" d="M527 428l-4 -12q-47 -5 -74 -18t-59 -40l-106 -92l64 -152q13 -31 24 -45t29 -14q9 0 17 4.5t16 13t14 15.5l14 21l13 19l15 -11q0 -1 -8 -17l-16 -26q-6 -11 -18.5 -28.5t-24 -28.5t-28 -19.5t-32.5 -8.5t-29.5 7.5t-23.5 23t-14 24.5l-11 24l-63 147l-56 -49l-45 -166 h-76l148 589q3 9 3 20q0 22 -32 22q-19 0 -27 -2l-3 14l158 25l-113 -456l167 149q21 19 21 36q0 8 -8.5 13.5t-17.5 5.5h-12l4 12h194z" />
+<glyph unicode="&#x1d459;" horiz-adv-x="318" d="M278 668l-148 -591q-1 -4 -1 -11q0 -13 12 -13q15 0 33.5 19t28.5 36l16 -12q-3 -4 -20.5 -25.5t-26 -30.5t-24.5 -23.5t-31.5 -20.5t-32.5 -6q-39 0 -39 51q0 16 6 36l128 510q3 13 3 24q0 22 -31 22q-3 0 -27 -3l-3 15z" />
+<glyph unicode="&#x1d45a;" horiz-adv-x="710" d="M667 107l13 -11q-26 -44 -62 -74t-69 -30q-39 0 -39 49q0 13 6 37l56 221q6 21 6 40q0 38 -24 38q-37 0 -101.5 -94t-77.5 -148l-34 -135h-79l77 299q5 23 5 40q0 38 -23 38q-36 0 -100 -94t-78 -148l-35 -135h-78l95 374q0 31 -33 31q-11 0 -27 -2l-2 14l157 24 l-44 -169h6q111 169 192 169q27 0 41 -23t14 -58q0 -22 -9 -52l-10 -36h5q23 41 58.5 82t71.5 65q32 22 61 22q54 0 54 -71q0 -33 -7 -61l-61 -231q-2 -6 -2 -12q0 -12 15 -12q14 0 31.5 13.5t30.5 39.5z" />
+<glyph unicode="&#x1d45b;" horiz-adv-x="497" d="M467 96l-5 -6q-1 -1 -8.5 -10.5l-10.5 -13.5l-11 -12q-8 -9 -12 -14l-13 -12l-13.5 -11.5t-14 -10t-15 -8t-14.5 -4.5t-16 -2q-41 0 -41 46q0 14 7 40l57 221q7 28 7 42q0 38 -24 38q-44 0 -132 -133q-58 -87 -68 -122l-33 -124h-77l95 374q0 10 -1.5 16.5t-8.5 11 t-20 4.5q-7 0 -28 -3l-2 15l159 23l-51 -189h3q7 0 56 73q93 116 160 116q56 0 56 -62q0 -26 -11 -70l-59 -231q-1 -2 -1 -10q2 -14 15 -14q7 0 14 3.5t14 10.5l12 12q5 5 13 15t9 12z" />
+<glyph unicode="&#x1d45c;" horiz-adv-x="458" d="M438 287q0 -110 -76.5 -204t-186.5 -94q-69 0 -102 49t-33 114t31 131t90.5 112t129.5 46q64 0 105.5 -38.5t41.5 -115.5zM357 318q0 36 -15.5 64.5t-51.5 28.5q-61 0 -115 -91.5t-54 -193.5q0 -107 59 -107q49 0 92 60t64 128t21 111z" />
+<glyph unicode="&#x1d45d;" horiz-adv-x="489" d="M253 370l14 13q61 58 113 58q94 0 94 -155q0 -65 -32.5 -133.5t-92.5 -116.5t-129 -48q-37 0 -61 19l-24 -100q-5 -22 -5 -35q0 -43 61 -43h16l-3 -12h-234l3 12q22 1 36.5 6t23 18t12 22.5t9.5 32.5l117 464q0 12 -1.5 17.5t-8.5 10.5t-21 5q-12 0 -28 -4l-2 16l158 24 l-18 -69zM214 238l-46 -200q18 -21 46 -21q48 0 90 48.5t64 113.5t22 123q0 43 -15.5 63t-35.5 20q-40 0 -75 -41.5t-50 -105.5z" />
+<glyph unicode="&#x1d45e;" horiz-adv-x="458" d="M463 428l-131 -522q-3 -10 -3 -29q0 -22 13 -35t36 -13h14l-3 -12h-250l3 12h19q46 0 65 21t28 57l44 184h-6q-74 -103 -163 -103q-45 0 -67 33.5t-22 81.5q0 89 49.5 173.5t119.5 130.5q50 34 91 34q34 0 52 -15t20 -37h3l7 39h81zM358 338q0 74 -49 74q-27 0 -61 -27 q-48 -39 -85.5 -123t-37.5 -150q0 -63 52 -63q34 0 58 17q50 35 86.5 112.5t36.5 159.5z" />
+<glyph unicode="&#x1d45f;" horiz-adv-x="408" d="M175 267l5 -1q10 20 32 56q75 119 137 119q21 0 32.5 -13.5t11.5 -34.5q0 -31 -18 -56.5t-47 -25.5q-13 0 -21 6t-10.5 13t-6 13t-9.5 6q-27 0 -65.5 -69t-59.5 -124t-28 -80l-21 -76h-77l92 364q4 15 4 23q0 19 -33 19q-9 0 -27 -3l-2 15l157 23z" />
+<glyph unicode="&#x1d460;" horiz-adv-x="440" d="M390 441l-24 -146h-15q0 50 -25.5 85t-66.5 35q-21 0 -36 -14.5t-15 -43.5q0 -22 33.5 -63t67 -89.5t33.5 -89.5q0 -50 -36.5 -87.5t-98.5 -37.5q-20 0 -63.5 10t-46.5 10q-15 0 -30 -21h-17l25 156h16q0 -50 29.5 -90t74.5 -40q40 0 56.5 26.5t16.5 62.5 q0 27 -20.5 56.5t-44.5 52t-44.5 55.5t-20.5 66q0 55 33.5 81t80.5 26q23 0 51 -10t41 -10q14 0 30 20h16z" />
+<glyph unicode="&#x1d461;" horiz-adv-x="313" d="M283 438l-10 -38h-70l-78 -320q-2 -6 -2 -11q0 -12 16 -12q23 2 60 52l13 -11q-2 -2 -11.5 -15.5l-14.5 -20.5l-18 -19q-11 -13 -20 -20l-20 -15q-12 -9 -24.5 -13t-24.5 -4q-39 0 -39 52q0 19 5 37l81 320h-77l5 29q123 23 177 138h13l-31 -129h70z" />
+<glyph unicode="&#x1d462;" horiz-adv-x="474" d="M444 428l-89 -348q-1 -4 -1 -9q0 -14 14 -14q4 0 8.5 1.5t9.5 4.5l8 5q3 3 8 8.5t8 8.5l8 9q5 7 7 9l5 6l13 -11q-19 -27 -32.5 -44.5t-43.5 -40t-56 -22.5q-40 0 -40 52q0 21 4 37l26 95h-1q-2 -1 -28 -34l-58 -71q-33 -38 -51 -51q-38 -28 -72 -28q-61 0 -61 74 q0 29 8 59l59 231q6 23 6 25q0 23 -33 23q-16 0 -26 -3l-3 15l157 26l-84 -326q-3 -13 -3 -24q0 -34 26 -34q41 0 100 77q77 102 109 219l21 75h77z" />
+<glyph unicode="&#x1d463;" horiz-adv-x="506" d="M247 454l-89 -326q-4 -13 -4 -32q0 -30 15.5 -48t44.5 -18q73 0 127 60.5t83 142.5q15 45 15 74q0 25 -9.5 42t-21 24t-21 18t-9.5 25q0 42 54 42q47 0 47 -83q0 -146 -97 -280q-33 -46 -86 -75t-108 -29q-116 0 -116 93q0 32 9 62l58 210q5 20 5 25q0 20 -57 20v15 q14 4 48.5 11t60 14t47.5 17z" />
+<glyph unicode="&#x1d464;" horiz-adv-x="775" d="M531 450l-80 -289q-12 -46 -12 -70q0 -61 59 -61q123 0 195 203q15 45 15 74q0 25 -9.5 42t-20.5 24t-20.5 18t-10.5 25q-1 24 15 33t39 9q47 0 47 -83q0 -44 -12 -95.5t-36 -102.5t-56.5 -92.5t-77.5 -67.5t-94 -26q-111 0 -111 100q0 41 23 125q-17 -39 -38.5 -74 t-51 -71t-67 -58t-77.5 -22q-78 0 -78 87q0 21 19 95l47 177q5 15 5 29q0 22 -54 22v15q84 14 155 44l4 -3l-81 -307q-11 -48 -11 -73q0 -47 28 -47q56 1 153 151q37 56 60.5 116t49.5 153h84z" />
+<glyph unicode="&#x1d465;" horiz-adv-x="550" d="M305 288l45 69q55 84 111 84q49 0 49 -33q0 -16 -10.5 -29t-28.5 -13q-12 0 -24 4.5t-20 4.5q-14 0 -24.5 -5.5t-16 -12t-14.5 -20.5l-55 -85q9 -20 26.5 -75t34.5 -88.5t37 -33.5q33 0 61 57l14 -10q-2 -2 -15 -23t-25.5 -38.5t-33.5 -33.5t-41 -16q-45 0 -73 77 l-40 113l-63 -98q-20 -31 -32.5 -47t-35.5 -30.5t-49 -14.5q-25 0 -38.5 14t-13.5 33q0 14 10.5 25.5t27.5 11.5q13 0 24 -10t23 -10q31 0 70 59l65 101l-33 92q-32 89 -98 89q-23 0 -38 -6l-3 18l132 33q49 -27 75 -98z" />
+<glyph unicode="&#x1d466;" horiz-adv-x="496" d="M270 307l28 -235q71 97 118 184q28 52 28 75q0 8 -13 17.5t-26 22.5t-13 29q0 17 13 28.5t34 11.5q25 0 41 -16.5t16 -45.5q0 -51 -77 -179.5t-127 -191.5l-30 -39l-32 -40l-28 -34q-17 -21 -29.5 -32t-28 -23t-30 -17t-28.5 -5q-26 0 -41 17.5t-15 37.5t13.5 30.5 t26.5 10.5q25 0 38.5 -15.5t18.5 -15.5q12 0 45.5 35t54.5 67l-38 314q-3 30 -7.5 49t-20.5 37.5t-42 18.5l-36 -4l-2 16l150 25q17 -24 24.5 -50.5t14.5 -82.5z" />
+<glyph unicode="&#x1d467;" horiz-adv-x="499" d="M467 450v-16l-322 -360l3 -1q28 21 67 21q31 0 54 -13.5t33.5 -29.5t24 -29.5t28.5 -13.5q27 0 27 24q0 5 -6 15.5t-6 22.5q0 14 12 26t26 12q18 0 29 -12t11 -30q0 -37 -33.5 -58.5t-72.5 -21.5q-9 0 -68 14q-50 14 -99 14q-67 0 -122 -24l-11 10l328 370h-131 q-46 0 -67 -11t-37 -50l-18 4l36 137h314z" />
+<glyph unicode="&#x1d49c;" horiz-adv-x="855" d="M837 672l9 -14q-103 -202 -265 -589q60 12 103 34l9 -16q-42 -31 -124 -45l-17 -42h-97l18 39q-90 6 -162 40q-92 -94 -173 -94q-48 0 -77.5 26t-29.5 66q0 32 18 52t44 20q21 0 35.5 -14t14.5 -34q0 -18 -11.5 -33t-31.5 -15q-22 0 -29 12h-2q0 -17 18 -33.5t47 -16.5 q41 0 74 17.5t76 59.5q-122 69 -122 207q0 83 57 132t130 49q102 0 161 -82q43 62 75.5 104.5t73 85.5t79 64.5t75.5 21.5q16 0 24 -2zM772 638h-1q-56 -20 -112.5 -86t-132.5 -181q31 -61 33 -144q129 283 213 411zM536 199q0 84 -29 145q-112 -172 -172 -239 q67 -32 151 -38l49 109q1 8 1 23zM492 372q-50 75 -143 75q-57 0 -101.5 -42t-44.5 -104q0 -118 107 -182q63 69 182 253z" />
+<glyph unicode="&#x1d49e;" horiz-adv-x="797" d="M449 645l-12 -19q-55 31 -136 31q-53 0 -102.5 -16.5t-85 -53.5t-35.5 -86q0 -62 43 -97.5t108 -42.5q81 125 216.5 216.5t239.5 91.5q46 0 71 -19.5t25 -55.5q0 -60 -66.5 -123t-177 -105t-225.5 -42q-69 -100 -69 -199q0 -49 31 -79.5t86 -30.5q80 0 141 50t61 108 q0 37 -20.5 55.5t-50.5 18.5q-54 0 -102.5 -53t-55.5 -131l-22 2q0 91 58.5 158t138.5 67q55 0 86.5 -26.5t31.5 -76.5q0 -41 -27 -80t-69 -68q-78 -54 -174 -54q-85 0 -141 46.5t-56 126.5q0 81 48 171q-71 12 -120.5 55t-49.5 115q0 75 71.5 131.5t184.5 56.5 q91 0 156 -42zM331 355l1 -1q123 0 244 62q73 37 118.5 85t45.5 91q0 40 -50 40q-72 0 -173.5 -79t-185.5 -198z" />
+<glyph unicode="&#x1d49f;" horiz-adv-x="885" d="M810 587l8 -20q-27 -12 -37.5 -20t-33.5 -33q57 -89 57 -190q0 -140 -98.5 -239.5t-223.5 -99.5q-70 0 -156 33q-75 -27 -161 -27q-61 0 -95 17t-34 46q0 25 30 40t77 15q71 0 170 -52q82 50 203 246q83 135 179 216q-44 61 -121 98.5t-159 37.5q-144 0 -224.5 -64 t-80.5 -169q0 -60 46 -102.5t118 -42.5q96 0 155.5 64.5t60.5 196.5h19q2 -15 2 -43q0 -63 -23 -113t-59.5 -78t-76 -42.5t-76.5 -14.5q-89 0 -148 50.5t-59 132.5q0 110 97.5 183.5t241.5 73.5q96 0 179.5 -39t137.5 -105q39 28 85 44zM756 336q0 76 -37 144 q-41 -55 -103 -178q-75 -151 -196 -234q-33 -22 -53 -32q58 -20 111 -20q114 0 196 87.5t82 232.5zM276 39q-75 40 -132 40q-67 0 -67 -25q0 -33 87 -33q66 0 112 18z" />
+<glyph unicode="&#x1d4a2;" horiz-adv-x="773" d="M417 653l-9 -18q-49 22 -111 22q-76 0 -124.5 -34t-48.5 -82q0 -44 37 -74t102 -39q69 109 177 175t197 66q44 0 73.5 -20.5t29.5 -55.5q0 -50 -57.5 -97.5t-150 -76.5t-189.5 -29q-41 -60 -41 -128q0 -29 17 -48t49 -19q54 0 117.5 35.5t151.5 115.5l15 -16 q-34 -34 -66 -121q-82 -224 -330 -224q-72 0 -120.5 33.5t-48.5 76.5q0 30 16.5 49.5t42.5 19.5q20 0 35.5 -14t15.5 -33q0 -21 -12 -36t-32 -15q-21 0 -29 13h-2q5 -24 41.5 -43.5t82.5 -19.5q87 0 145.5 48t108.5 144l-1 1q-66 -44 -138 -44q-60 0 -98.5 34.5t-38.5 92.5 q0 55 26 106q-78 13 -122.5 49.5t-44.5 93.5q0 61 59 103.5t148 42.5q70 0 127 -34zM699 590q0 20 -16 31t-41 11q-65 0 -149 -63.5t-132 -148.5q83 0 162.5 26t127.5 65.5t48 78.5z" />
+<glyph unicode="&#x1d4a5;" horiz-adv-x="802" d="M552 193l15 -16q-71 -63 -151 -92q-53 -102 -145 -182t-184 -80q-36 0 -57 18t-21 47q0 75 125 134q35 16 190 64q20 39 53.5 125t49.5 120q-55 11 -88 44.5t-33 88.5q0 49 25.5 88.5t66.5 62t86.5 34t90.5 11.5t127 -6q36 20 66 20q9 0 16.5 -5.5t7.5 -14.5 q0 -48 -104 -48q-66 -47 -152 -240q77 18 131 101l16 -11q-53 -103 -162 -124l-87 -208q68 26 118 69zM639 605v1q-26 2 -43 2q-82 0 -130 -17q-49 -18 -84 -54t-35 -83q0 -38 28.5 -64t67.5 -27q81 159 196 242zM302 43q-17 -6 -55.5 -17.5t-63 -20t-44.5 -18.5 q-88 -43 -88 -97q0 -15 10 -26t26 -11q61 0 112.5 49t102.5 141z" />
+<glyph unicode="&#x1d4a6;" horiz-adv-x="1009" d="M771 669l13 -16q-26 -20 -49.5 -44t-40 -43.5t-37 -51t-30.5 -48.5l-31 -54l-29 -52q27 0 42 -14q32 7 60 33.5t72 91.5q76 111 125.5 163.5t86.5 52.5q22 0 36.5 -10.5t14.5 -30.5t-11 -32.5t-31 -12.5q-16 0 -30 11.5t-15 33.5h-1q-8 -7 -18.5 -26t-24.5 -49.5 t-24 -48.5q-49 -89 -97.5 -133.5t-113.5 -65.5v-2q48 -48 48 -89q0 -37 -38 -100t-38 -80q0 -34 32 -34q57 0 169 129l19 -15q-117 -144 -202 -144q-37 0 -65 23.5t-28 58.5q0 41 42.5 108t42.5 97q0 31 -40 31q-26 0 -34 15q-46 -101 -93 -169.5t-93 -103.5t-87.5 -49 t-89.5 -14q-63 0 -103 32t-40 74q0 30 17 52t46 22q20 0 33.5 -14t13.5 -36q0 -20 -12 -34.5t-32 -14.5q-21 0 -29 13h-2q3 -25 33 -44t73 -19q60 0 105 44t105 150l44 80q31 57 43.5 78t38.5 59t53 66t63 57l-1 3q-15 -5 -36 -5q-44 0 -124 44q-63 34 -102 34 q-48 0 -83 -30.5t-35 -70.5t27 -67t73 -27q77 0 131 86l18 -9q-54 -107 -151 -107q-60 0 -99.5 35.5t-39.5 90.5q0 59 51 105t126 46q29 0 58 -10.5t84 -38.5q60 -31 86 -31q34 0 76.5 19t78.5 52z" />
+<glyph unicode="&#x1d4a9;" horiz-adv-x="970" d="M569 131h1q35 54 122 263q82 196 138 256q34 37 74 37q23 0 37.5 -12.5t14.5 -33.5t-12.5 -33.5t-30.5 -12.5q-16 0 -31.5 11.5t-15.5 33.5h-3q-48 -25 -151 -277q-36 -89 -61.5 -145.5t-68.5 -125.5t-86 -105h-20q26 104 32 310q5 188 27 265l-1 1q-60 -81 -143 -248 q-91 -182 -150 -256t-123 -74q-34 0 -57 22.5t-23 54.5q0 29 17 47.5t42 18.5q22 0 37 -15.5t15 -35.5q0 -18 -11.5 -31.5t-30.5 -13.5q-9 0 -16 4h-3q1 -10 10.5 -16t20.5 -6q53 0 108.5 74t129.5 224q157 318 252 357l13 -11q-14 -48 -26 -267q-8 -165 -27 -260z" />
+<glyph unicode="&#x1d4aa;" horiz-adv-x="692" d="M663 549l-20 -2q-31 98 -126 98q-81 0 -170.5 -85.5t-147 -202.5t-57.5 -207q0 -58 29 -96.5t85 -38.5q113 0 213 103q42 44 79.5 118t37.5 160q0 52 -27.5 81t-64.5 29q-51 0 -89.5 -43t-38.5 -116q0 -53 27 -105l-22 -10q-35 57 -35 130q0 77 48.5 128.5t112.5 51.5 q55 0 97.5 -36.5t42.5 -109.5q0 -72 -30.5 -145.5t-80.5 -132.5t-121 -96t-147 -37q-83 0 -129.5 58.5t-46.5 144.5q0 126 59.5 240t161.5 183t218 69q64 0 103 -38t39 -93z" />
+<glyph unicode="&#x1d4ab;" horiz-adv-x="910" d="M856 669l7 -19q-34 -14 -66 -38q89 -67 89 -165q0 -68 -43.5 -121.5t-105.5 -53.5q-35 0 -53.5 19t-18.5 47q0 22 16 43.5t42 35.5l10 -18q-36 -21 -36 -54q0 -13 9 -21t25 -8q41 0 67.5 43t26.5 106q0 75 -55 123q-24 -23 -45.5 -57t-35.5 -62l-39 -81l-40 -86 q-84 -169 -181 -243t-218 -74q-77 0 -125 36t-48 87q0 31 17 51t42 20q22 0 36.5 -13.5t14.5 -34.5q0 -20 -11.5 -34t-31.5 -14q-23 0 -30 12h-2q0 -28 35 -53.5t85 -25.5q94 0 156 52.5t146 202.5l64 113q21 36 54 86t63.5 81.5t65.5 57.5q-76 48 -192 48q-149 0 -250 -75 t-101 -174q0 -41 30 -68.5t73 -27.5q158 0 205 249h20q-8 -113 -67 -196t-160 -83q-63 0 -102.5 35.5t-39.5 94.5q0 107 111 191t282 84q125 0 221 -59q36 23 84 41z" />
+<glyph unicode="&#x1d4ac;" horiz-adv-x="692" d="M663 549l-20 -2q-31 98 -126 98q-81 0 -170.5 -85.5t-147 -202.5t-57.5 -207q0 -58 29 -96.5t85 -38.5q71 0 134 38q-27 43 -60 43q-38 0 -76 -29l-13 17q62 58 108 58q53 0 86 -56q28 25 34 32q42 44 79.5 118t37.5 160q0 52 -27.5 81t-64.5 29q-51 0 -89.5 -43 t-38.5 -116q0 -53 27 -105l-22 -10q-35 57 -35 130q0 77 48.5 128.5t112.5 51.5q55 0 97.5 -36.5t42.5 -109.5q0 -95 -50.5 -190t-132.5 -154q26 -42 62 -42q53 0 102 48l15 -14q-68 -82 -133 -82q-33 0 -53 16t-39 45q-73 -38 -150 -38q-83 0 -129.5 58.5t-46.5 144.5 q0 126 59.5 240t161.5 183t218 69q63 0 102.5 -38t39.5 -93z" />
+<glyph unicode="&#x1d4ae;" horiz-adv-x="743" d="M397 143l-20 -4q-21 71 -54 94t-82 23q-40 0 -76 -33.5t-36 -85.5t41.5 -87t101.5 -35q76 0 134.5 47t58.5 129q0 29 -16 56.5t-39 50.5l-47 48q-23 24 -39 57t-16 69q0 67 42 116.5t97.5 70.5t113.5 21q56 0 98 -29t42 -87q0 -53 -44.5 -91t-97.5 -38v21q48 5 78.5 33 t30.5 74q0 42 -31.5 61.5t-76.5 19.5q-63 0 -119 -44.5t-56 -108.5q0 -30 16.5 -58.5t40.5 -52.5l48 -49q24 -25 40.5 -58t16.5 -69q0 -99 -82 -159t-201 -60q-81 0 -139 39t-58 118q0 71 50.5 114t116.5 43q61 0 107.5 -39.5t55.5 -116.5z" />
+<glyph unicode="&#x1d4af;" horiz-adv-x="912" d="M896 675l11 -18q-89 -73 -176 -73q-57 0 -181 28.5t-168 28.5q-92 0 -152.5 -47.5t-60.5 -113.5q0 -57 34 -89t83 -32q71 0 116.5 46.5t73.5 135.5h20q-20 -101 -76 -156.5t-141 -55.5q-64 0 -107.5 39.5t-43.5 104.5q0 96 87.5 155t223.5 59q56 0 175.5 -26.5 t168.5 -26.5q51 0 113 41zM658 553l13 -14q-38 -37 -63.5 -92t-50.5 -143q-23 -81 -69.5 -149.5t-109.5 -109.5q-90 -60 -187 -60q-61 0 -104.5 30.5t-43.5 75.5q0 35 17 54.5t44 19.5q20 0 34.5 -14.5t14.5 -34.5t-12.5 -34.5t-32.5 -14.5q-21 0 -28 12h-2q3 -27 31.5 -45 t74.5 -18q83 0 142.5 57t127.5 204q48 103 93 161.5t111 114.5z" />
+<glyph unicode="&#x1d4b0;" horiz-adv-x="842" d="M805 658l-296 -550q-17 -32 -17 -55q0 -35 33 -35q56 0 168 129l21 -13q-120 -146 -203 -146q-37 0 -61.5 21.5t-24.5 56.5q0 33 17 71l-3 1q-53 -72 -107.5 -112.5t-97.5 -40.5q-36 0 -58.5 24t-22.5 64q0 57 70 167l145 227q36 56 36 101q0 36 -38 60t-83 24 q-84 0 -145 -49.5t-61 -128.5q0 -37 19.5 -60.5t53.5 -23.5q98 0 139 119h20q-12 -56 -55 -102.5t-103 -46.5q-51 0 -83 31.5t-32 82.5q0 90 78.5 151.5t177.5 61.5q73 0 126 -38.5t53 -107.5q0 -66 -38 -124l-186 -287q-39 -61 -39 -87q0 -28 29 -28q39 0 93.5 47.5 t106 117.5t90 130t62.5 105l130 243h86z" />
+<glyph unicode="&#x1d4b1;" horiz-adv-x="932" d="M214 21l2 -2q54 11 102.5 41t98 83t91 109.5t99.5 144.5q52 80 82 122t66 86.5t63.5 63t53.5 18.5q21 0 35.5 -13t14.5 -34q0 -18 -12.5 -30.5t-30.5 -12.5q-20 0 -32 13t-12 36h-1q-52 -30 -200 -261q-146 -228 -249 -308q-117 -92 -204 -92q-14 0 -47 6q41 38 68.5 89 t78.5 182q35 88 79 152t114 131l-3 3q-15 -5 -36 -5q-52 0 -131 41.5t-110 41.5q-48 0 -83 -30.5t-35 -70.5t27.5 -67t72.5 -27q77 0 131 86l16 -9q-54 -107 -149 -107q-60 0 -99.5 35.5t-39.5 90.5q0 57 55.5 104t127.5 47q28 0 52.5 -9.5t83.5 -39.5q60 -31 86 -31 q65 0 124 49l27 22l15 -15q-72 -77 -108.5 -141.5t-76.5 -165.5q-88 -219 -207 -326z" />
+<glyph unicode="&#x1d4b2;" horiz-adv-x="1078" d="M455 24l2 -2q68 27 130 99.5t137 201.5q126 219 183.5 291.5t112.5 72.5q21 0 35.5 -12.5t14.5 -34.5q0 -18 -12.5 -30.5t-30.5 -12.5q-43 0 -43 50h-1q-27 -8 -80 -87.5t-166 -273.5q-175 -301 -319 -301q-33 0 -46 4q85 80 141 233q44 122 99.5 214t137.5 179l-1 1 q-97 -17 -262 -312q-177 -319 -326 -319q-19 0 -47 6q31 26 59 72t44.5 85t43.5 111q56 150 192 287l-2 2q-15 -5 -36 -5q-49 0 -125 41.5t-106 41.5q-47 0 -77.5 -30t-30.5 -71t24 -67.5t66 -26.5q38 0 66 21.5t55 64.5l16 -9q-54 -107 -139 -107q-56 0 -92.5 35.5 t-36.5 90.5q0 59 46.5 105t116.5 46q49 0 146 -49q7 -4 19 -10t17 -9t13 -6t14.5 -4.5t12.5 -1.5q65 0 124 49l27 22l15 -16q-117 -115 -196 -321q-79 -205 -196 -310l2 -3q50 18 104 74t88 108.5t75 125.5q183 324 309 324q18 0 51 -11q-21 -15 -39 -36t-38 -60l-30 -57 q-9 -19 -34.5 -78.5t-31.5 -74.5q-91 -206 -195 -310z" />
+<glyph unicode="&#x1d4b3;" horiz-adv-x="891" d="M571 489h2q112 198 226 198q33 0 53.5 -15.5t20.5 -47.5q0 -26 -16 -41t-38 -15q-21 0 -35.5 12t-14.5 34q0 23 17 40q-53 0 -119.5 -88.5t-134.5 -242.5q-67 -151 -67 -228q0 -65 50 -65q27 0 63 29t93 95l20 -15q-62 -80 -105.5 -116.5t-99.5 -36.5q-48 0 -74.5 25.5 t-26.5 74.5q0 32 9 55h-2q-54 -77 -111.5 -116.5t-130.5 -39.5q-53 0 -83.5 32.5t-30.5 73.5q0 30 16 51t42 21q20 0 35.5 -14t15.5 -33q0 -21 -13.5 -37t-33.5 -16q-15 0 -25 6q24 -54 94 -54q55 0 118 65.5t122 168.5q88 155 88 257q0 148 -124 148q-68 0 -114.5 -44 t-46.5 -113q0 -42 22.5 -68.5t64.5 -26.5q88 0 126 106l19 -5q-17 -61 -56.5 -96t-91.5 -35q-57 0 -91 34t-34 92q0 80 59.5 134.5t145.5 54.5q89 0 143 -56.5t54 -141.5z" />
+<glyph unicode="&#x1d4b4;" horiz-adv-x="926" d="M825 658h91q-242 -324 -370 -581q75 28 137 80l15 -15q-31 -28 -63 -49t-49.5 -30t-54.5 -25q-53 -102 -144 -183t-183 -81q-36 0 -58.5 18t-22.5 47t16.5 54.5t38.5 42t61 34t65 26.5l72 22l62 18q73 144 103 196l-3 4q-51 -71 -108 -112.5t-100 -41.5q-39 0 -62 24.5 t-23 68.5q0 36 23.5 79t83.5 121q71 91 92.5 129t21.5 65q0 33 -39.5 58t-86.5 25q-91 0 -149.5 -45t-58.5 -122q0 -32 22.5 -53.5t56.5 -21.5q103 0 149 125h20q-21 -78 -68.5 -116.5t-106.5 -38.5q-48 0 -81 30.5t-33 76.5q0 87 77.5 143.5t178.5 56.5q75 0 127 -41.5 t52 -104.5q0 -45 -29 -95.5t-111 -153.5q-86 -108 -86 -151q0 -12 7.5 -20.5t21.5 -8.5q51 0 126 71t187 224zM419 -2q-50 -16 -70 -23t-58 -21.5t-54 -24t-36.5 -24.5t-28 -30.5t-7.5 -33.5q0 -15 11.5 -26t27.5 -11q60 0 112 50t103 144z" />
+<glyph unicode="&#x1d4b5;" horiz-adv-x="932" d="M407 519l18 -8q-25 -48 -56.5 -73t-81.5 -25q-51 0 -89.5 32t-38.5 83q0 59 52 109t145 50q50 0 108.5 -13t93.5 -26t92 -36q72 46 150 46q57 0 84.5 -17t27.5 -43q0 -24 -33 -41t-83 -17q-55 0 -133 26q-56 -64 -116 -236q5 -1 11 -1q60 2 93 27l14 -17 q-55 -59 -118 -59q-14 0 -18 1q-54 -143 -158 -221q106 -36 157 -36q79 0 132 36.5t72 102.5l20 -1q-14 -85 -71.5 -131t-150.5 -46q-36 0 -75.5 10.5t-121.5 38.5q-75 -43 -162 -43q-112 0 -112 60q0 24 33 41t83 17q45 0 142 -31q59 56 120 215q-4 1 -12 1q-53 0 -95 -32 l-17 16q60 65 126 65q11 0 17 -1q68 165 157 241q-57 22 -87.5 32t-85.5 21.5t-105 11.5q-64 0 -99.5 -39.5t-35.5 -80.5q0 -40 25.5 -62.5t61.5 -22.5q42 0 68.5 17.5t51.5 58.5zM871 598q0 30 -71 30q-62 0 -106 -33q68 -25 112 -25q27 0 46 8.5t19 19.5zM283 51 q-76 28 -118 28q-27 0 -46 -8.5t-19 -19.5q0 -30 71 -30q65 0 112 30z" />
+<glyph unicode="&#x1d4b6;" horiz-adv-x="819" d="M737 194l21 -17q-141 -185 -247 -185q-37 0 -56.5 24t-19.5 61q0 19 4 32l-1 1q-110 -121 -197 -121q-44 0 -68 29.5t-24 79.5q0 45 22 95q-35 -20 -71 -20q-39 0 -70 17l10 26q31 -13 57 -13q62 0 129 79v-1q56 70 130.5 115t141.5 45q91 0 118 -71l-21 -10 q-28 51 -84 51q-73 0 -143 -70q-65 -66 -113 -150t-48 -127q0 -45 39 -45q49 0 98.5 40t104.5 105q9 52 38.5 102.5t71.5 50.5q27 0 27 -28q0 -44 -110 -146q-11 -39 -11 -63q0 -58 55 -58q31 0 87.5 40.5t129.5 131.5z" />
+<glyph unicode="&#x1d4b7;" horiz-adv-x="580" d="M127 493l20 22q32 -38 85 -47q66 92 136 155.5t130 63.5q29 0 45 -15.5t16 -39.5q0 -75 -77.5 -137.5t-190.5 -62.5q-63 -94 -124.5 -206t-61.5 -164q0 -44 36 -44q58 0 121.5 54.5t124.5 153.5q-10 29 -10 56q0 57 28 97t58 40q9 0 16.5 -8.5t7.5 -20.5q0 -67 -55 -158 q19 -32 63 -32q18 0 30 5l7 -26q-16 -9 -38 -9q-51 0 -84 32h-1q-66 -104 -136 -159t-133 -55q-41 0 -67 25.5t-26 67.5q0 64 49.5 168t116.5 192q-55 14 -86 52zM529 624q0 31 -35 31q-31 0 -73.5 -47t-109.5 -146q87 0 152.5 52.5t65.5 109.5z" />
+<glyph unicode="&#x1d4b8;" horiz-adv-x="662" d="M567 225l22 -17q-89 -110 -173.5 -164.5t-154.5 -54.5q-47 0 -75 31.5t-28 85.5q0 46 18 91q-30 -24 -76 -24q-39 0 -70 17l10 26q31 -13 57 -13q61 0 120 69q52 73 128 121t142 48q88 0 88 -79q0 -26 -18 -45.5t-43 -19.5q-40 0 -40 33q0 15 9.5 24t21.5 11.5t21.5 8.5 t9.5 16q0 21 -34 21q-55 0 -124.5 -65t-115.5 -145.5t-46 -126.5q0 -26 15 -40.5t39 -14.5q52 0 131.5 50.5t165.5 155.5z" />
+<glyph unicode="&#x1d4b9;" horiz-adv-x="845" d="M827 687l-321 -590q-14 -25 -14 -48q0 -27 28 -27q71 0 212 172l23 -17q-75 -95 -132.5 -140t-109.5 -45q-37 0 -55 20t-18 51q0 23 9 47h-2q-59 -61 -107.5 -91t-101.5 -30q-43 0 -67 28t-24 77q0 46 24 99q-31 -20 -71 -20q-39 0 -70 17l10 26q31 -13 57 -13 q62 0 129 79v-1q56 70 130 115t140 45q36 0 57 -19.5t21 -58.5h2l172 324h79zM544 365q0 41 -48 41q-41 0 -97.5 -42t-106.5 -115q-87 -125 -87 -189q0 -41 41 -41q64 -1 143 73q64 60 109.5 139t45.5 134z" />
+<glyph unicode="&#x1d4bb;" horiz-adv-x="685" d="M27 -209l194 374q-13 25 -13 58q0 87 117 147l41 80l38 66q22 41 36.5 61t35.5 45t39 36.5t39.5 20t44.5 8.5q35 0 54.5 -21.5t19.5 -48.5q0 -145 -271 -252l-115 -221q33 -18 81 -18q69 0 129 54l17 -23q-73 -61 -153 -61q-51 0 -89 19l-166 -324h-79zM643 606 q0 49 -42 49q-18 0 -36.5 -12.5t-35 -36.5t-26 -40t-22.5 -41l-62 -120q87 33 155.5 87t68.5 114z" />
+<glyph unicode="&#x1d4bd;" horiz-adv-x="753" d="M669 195l21 -17q-160 -189 -264 -189q-32 0 -51 18.5t-19 53.5q0 60 46 128l106 157q17 26 17 39q0 26 -25 26q-68 0 -171.5 -101t-185.5 -257l-28 -53h-77l237 440q-80 14 -126 69l20 21q46 -54 122 -61q69 123 115.5 170.5t103.5 47.5q31 0 47 -20t16 -45 q0 -42 -26 -78.5t-63.5 -58.5t-75.5 -34.5t-66 -12.5l-78 -153l3 -2q134 158 237 158q33 0 53 -16.5t20 -45.5q0 -48 -42 -115l-103 -164q-24 -39 -24 -60t23 -21q88 0 238 176zM359 472l1 -2q54 0 118.5 44.5t64.5 105.5q0 15 -9.5 25t-26.5 10q-30 0 -63 -40t-85 -143z " />
+<glyph unicode="&#x1d4be;" horiz-adv-x="496" d="M484 608q0 -20 -15 -35t-36 -15q-19 0 -32.5 13t-13.5 30q0 20 16.5 36t38.5 16q15 0 28.5 -14t13.5 -31zM417 188l21 -17q-78 -95 -131.5 -138.5t-98.5 -43.5q-36 0 -58 21.5t-22 60.5q0 63 57 165l60 109q-37 -30 -89 -30q-42 0 -73 17l10 26q31 -13 60 -13 q69 0 136 79h73l-160 -295q-22 -40 -22 -78q0 -14 9 -23t24 -9q35 0 80 39t124 130z" />
+<glyph unicode="&#x1d4bf;" horiz-adv-x="730" d="M718 608q0 -20 -15 -35t-36 -15q-19 0 -32.5 13t-13.5 30q0 20 16.5 36t38.5 16q15 0 28.5 -14t13.5 -31zM596 424l-264 -499q42 -22 85 -22q59 0 100 30l12 -26q-54 -34 -117 -34q-52 0 -100 22q-43 -63 -92.5 -88.5t-112.5 -25.5q-47 0 -72.5 21.5t-25.5 49.5 q0 48 54 80q42 26 115 26q58 0 91 -13l209 394q-44 -43 -114 -43q-42 0 -68 16l10 26q26 -12 60 -12q44 0 81 27t76 71h73zM254 -86l-1 1q-29 13 -84 13q-57 0 -91.5 -20t-34.5 -52q0 -18 15.5 -29.5t40.5 -11.5q93 0 155 99z" />
+<glyph unicode="&#x1d4c0;" horiz-adv-x="726" d="M643 187l23 -17q-75 -93 -133 -137t-109 -44q-35 0 -59.5 16t-24.5 47t21.5 67t21.5 53q0 18 -15 32.5t-46 14.5l11 30q76 4 142.5 45t66.5 83q0 34 -33 34q-65 0 -176 -103t-189 -255l-27 -53h-77l237 440q-80 14 -126 69l20 21q46 -54 122 -61q69 123 115.5 170.5 t103.5 47.5q31 0 47 -20t16 -45q0 -43 -26 -79.5t-63.5 -58t-75.5 -34t-66 -12.5l-88 -168l2 -1q149 172 268 172q30 0 49 -18t19 -43q0 -48 -65 -92.5t-147 -54.5l-1 -3q54 -32 54 -82q0 -28 -16.5 -59t-16.5 -43q0 -27 31 -27q33 0 86.5 40.5t123.5 127.5zM361 472l1 -2 q54 0 118.5 44.5t64.5 105.5q0 15 -9.5 25t-26.5 10q-30 0 -63 -40t-85 -143z" />
+<glyph unicode="&#x1d4c1;" horiz-adv-x="579" d="M77 389l14 26q36 -25 94 -25q85 125 174.5 211t147.5 86q64 0 64 -67q0 -81 -96.5 -161t-225.5 -99q-143 -231 -143 -298q0 -43 36 -43q33 0 76.5 38t122.5 129l21 -17q-85 -99 -133.5 -139.5t-93.5 -40.5q-37 0 -62 22.5t-25 64.5q0 84 77 218q12 22 40 66q-49 2 -88 29 zM268 396l1 -1q117 26 194.5 91.5t77.5 137.5q0 31 -35 31q-37 0 -82 -47q-58 -59 -156 -212z" />
+<glyph unicode="&#x1d4c2;" horiz-adv-x="1038" d="M957 195l21 -16q-153 -190 -265 -190q-30 0 -49.5 19t-19.5 53q0 63 45 128l104 152q19 29 19 44q0 26 -27 26q-74 0 -185 -117t-199 -294h-75l190 337q20 36 20 47q0 27 -28 27q-74 0 -185.5 -118t-196.5 -293h-77l184 342q-52 -46 -125 -46q-32 0 -58 16l10 26 q26 -12 50 -12q80 0 167 98h68l-70 -139l3 -2q134 158 238 158q31 0 51.5 -16.5t20.5 -45.5q0 -35 -17 -74l2 -1q116 137 219 137q34 0 53 -16.5t19 -45.5q0 -49 -49 -127l-96 -152q-23 -38 -23 -59q0 -22 23 -22q87 0 238 176z" />
+<glyph unicode="&#x1d4c3;" horiz-adv-x="761" d="M680 195l21 -17q-155 -189 -264 -189q-31 0 -50.5 18.5t-19.5 53.5q0 60 46 128l106 157q17 26 17 39q0 10 -7.5 18t-20.5 8q-67 0 -169.5 -101t-184.5 -257l-28 -53h-77l183 342q-52 -46 -125 -46q-32 0 -58 16l10 26q25 -12 50 -12q80 0 167 98h72l-73 -139l3 -2 q134 158 237 158q33 0 53 -16.5t20 -45.5q0 -48 -42 -115l-103 -164q-24 -39 -24 -60t23 -21q88 0 238 176z" />
+<glyph unicode="&#x1d4c5;" horiz-adv-x="773" d="M362 285l3 -2q134 158 237 158q38 0 65 -24t27 -75q0 -71 -52 -160t-122 -136q70 -28 105 -75l-22 -20q-40 35 -64.5 49t-59.5 17q-49 -28 -93 -28q-36 0 -54 9t-18 23q0 18 25.5 33t64.5 15q36 0 57 -4q46 26 108 132.5t62 173.5q0 40 -36 40q-67 0 -168.5 -100.5 t-185.5 -257.5l-141 -262h-77l296 551q-45 -46 -125 -46q-32 0 -58 16l10 26q26 -12 50 -12q81 0 167 97l72 1z" />
+<glyph unicode="&#x1d4c6;" horiz-adv-x="780" d="M725 202l18 -18q-67 -70 -219 -209q-48 -43 -89.5 -87t-60.5 -66t-25 -31h-78l169 310l-2 1q-54 -58 -102.5 -85.5t-104.5 -27.5q-38 0 -61 29t-23 76q0 48 23 99q-30 -20 -70 -20q-39 0 -70 17l10 26q31 -13 57 -13q64 0 129 79q57 69 131.5 114t134.5 45q36 0 60 -16.5 t28 -48.5h2l28 48h68l-281 -525l3 -2q31 34 166 157.5t159 147.5zM550 364q0 42 -54 42q-95 0 -205 -159q-86 -125 -86 -187q0 -19 12 -30t29 -11q61 0 134.5 64.5t121.5 146t48 134.5z" />
+<glyph unicode="&#x1d4c7;" horiz-adv-x="580" d="M569 311l3 -27q-14 -7 -32 -7q-66 0 -87 48l-260 -192l-71 -133h-73l183 346q-53 -50 -126 -50q-32 0 -58 16l10 26q26 -12 50 -12q80 0 167 98h72l-120 -228l2 -1l214 160q0 41 21.5 65t55.5 24q19 0 30.5 -9t11.5 -18l-84 -74q16 -36 62 -36q13 0 29 4z" />
+<glyph unicode="&#x1d4c8;" horiz-adv-x="515" d="M129 243l-9 27q111 38 200 149q-5 15 -5 27q0 37 18.5 61t34.5 24q11 0 19.5 -8t8.5 -24q0 -48 -42 -90q58 -95 58 -181q0 -101 -77 -172q-70 -67 -173 -67q-41 0 -70.5 19.5t-29.5 55.5q0 31 18.5 53t41.5 22q18 0 30 -9.5t12 -27.5q0 -17 -9 -26t-20 -10.5t-20 -6 t-9 -13.5q0 -11 17 -19t37 -8q74 0 130 73t56 186q0 44 -16 106h-2q-48 -56 -92.5 -85.5t-106.5 -55.5z" />
+<glyph unicode="&#x1d4c9;" horiz-adv-x="551" d="M532 526l-13 -30h-146l-209 -387q-14 -27 -14 -58q0 -14 9 -23t24 -9q36 0 79.5 38.5t127.5 134.5l21 -17q-79 -98 -133 -142t-104 -44q-33 0 -54.5 21t-21.5 60q0 59 57 164l50 92q-55 -50 -117 -50q-32 0 -58 16l10 26q26 -12 58 -12q72 0 158 117l39 73h-102l13 30 h103l71 132h79l-72 -132h145z" />
+<glyph unicode="&#x1d4ca;" horiz-adv-x="753" d="M670 190l23 -17q-75 -93 -131.5 -137t-109.5 -44q-36 0 -53 19.5t-17 51.5q0 27 8 59l-3 1q-117 -134 -211 -134q-34 0 -55.5 22.5t-21.5 65.5q0 53 46 139l68 126q-57 -46 -125 -46q-32 0 -58 16l10 26q26 -12 50 -12q80 0 167 98h75l-159 -295q-22 -39 -22 -78 q0 -13 9 -22.5t24 -9.5q71 0 170.5 114t184.5 291h78l-160 -297q-23 -42 -23 -74q0 -31 29 -31q34 0 82.5 39.5t124.5 128.5z" />
+<glyph unicode="&#x1d4cb;" horiz-adv-x="618" d="M575 210l7 -27q-21 -9 -47 -9q-43 0 -75 29q-67 -108 -131 -161t-136 -53q-37 0 -64 25t-27 72q0 60 57 162l51 92q-53 -44 -122 -44q-32 0 -58 16l10 26q26 -12 50 -12q80 0 167 98h75l-158 -295q-20 -36 -20 -70q0 -17 13.5 -28.5t34.5 -11.5q51 0 115 52t119 157 q-16 36 -16 72q0 56 22.5 98.5t54.5 42.5q29 0 29 -50q0 -36 -14.5 -84t-32.5 -74q25 -29 62 -29q17 0 34 6z" />
+<glyph unicode="&#x1d4cc;" horiz-adv-x="888" d="M845 210l7 -27q-21 -9 -47 -9q-43 0 -75 29q-67 -108 -131 -161t-136 -53q-37 0 -64 25t-27 72q0 11 1 18h-2q-89 -115 -178 -115q-37 0 -64 25t-27 72q0 60 57 162l51 92q-55 -44 -122 -44q-32 0 -58 16l10 26q26 -12 50 -12q80 0 167 98h75l-158 -295q-20 -36 -20 -70 q0 -17 13.5 -28.5t34.5 -11.5q99 0 227 229l98 176h75l-158 -295q-20 -36 -20 -70q0 -17 13.5 -28.5t34.5 -11.5q51 0 115 52t119 157q-16 36 -16 72q0 56 22.5 98.5t54.5 42.5q29 0 29 -50q0 -36 -14.5 -84t-32.5 -74q25 -29 62 -29q16 0 34 6z" />
+<glyph unicode="&#x1d4cd;" horiz-adv-x="752" d="M653 203l22 -17q-152 -194 -272 -194q-38 0 -64 20.5t-26 64.5h-2q-87 -88 -160 -88q-39 0 -62.5 19.5t-23.5 55.5q0 28 18.5 50t41.5 22q42 0 42 -36q0 -16 -9 -25.5t-20 -12t-20 -8t-9 -14.5q0 -21 36 -21q43 0 89.5 44.5t80 103.5t55.5 114t22 79q0 48 -37 48 q-41 0 -102.5 -41t-139.5 -134l-22 17q157 188 271 188q39 0 63.5 -22.5t24.5 -61.5h2q68 87 136 87q82 0 82 -76q0 -26 -18.5 -47t-42.5 -21q-40 0 -40 33q0 16 9 25t19.5 11t19.5 7.5t9 15.5q0 22 -34 22q-37 0 -91 -68t-92 -150.5t-38 -126.5q0 -20 12 -32t30 -12 q89 0 240 181z" />
+<glyph unicode="&#x1d4ce;" horiz-adv-x="658" d="M617 424l-171 -328q-53 -103 -97 -170q44 -23 90 -23q59 0 100 30l12 -26q-54 -34 -117 -34q-54 0 -102 22q-77 -114 -203 -114q-47 0 -72.5 21.5t-25.5 49.5q0 48 54 80q42 26 115 26q58 0 91 -13l99 177l-3 1q-117 -134 -211 -134q-34 0 -55.5 22.5t-21.5 65.5 q0 53 46 139l68 126q-55 -46 -125 -46q-32 0 -58 16l10 26q26 -12 50 -12q80 0 167 98h75l-159 -295q-22 -39 -22 -78q0 -32 33 -32q71 0 170.5 114t184.5 291h78zM276 -86l-1 1q-29 13 -84 13q-57 0 -91.5 -20t-34.5 -52q0 -18 15.5 -29.5t40.5 -11.5q93 0 155 99z" />
+<glyph unicode="&#x1d4cf;" horiz-adv-x="691" d="M594 178l23 -16q-73 -102 -132 -137.5t-118 -35.5q-60 0 -60 46q0 16 10 35.5t10 30.5t-9 19t-20 8q-65 0 -127 -71q-55 -63 -97 -63q-22 0 -22 20q0 49 127 108l231 188l-1 2q-18 -7 -43 -7q-55 0 -99 34q-24 -25 -58 -40t-65 -15q-35 0 -61 16l12 26q25 -12 48 -12 q58 0 102 44q-26 31 -26 63q0 23 13.5 40t33.5 17q19 0 29.5 -14.5t10.5 -35.5q0 -23 -18 -61q25 -32 77 -32q42 0 76 17q34 46 66.5 67.5t54.5 21.5q31 0 31 -23q0 -50 -120 -89l-223 -186l1 -1q31 16 72 16q36 0 55 -16.5t19 -39.5q0 -15 -8.5 -32.5t-8.5 -27.5 q0 -6 5.5 -10t11.5 -4q89 0 197 150z" />
+<glyph unicode="&#x1d608;" horiz-adv-x="666" d="M635 0h-96l-33 200h-249l-130 -200h-96l457 674h26zM495 274l-37 229l-151 -229h188z" />
+<glyph unicode="&#x1d609;" horiz-adv-x="604" d="M239 662h205q197 0 197 -117q0 -57 -33.5 -104.5t-97.5 -74.5q91 -33 91 -122q0 -102 -84 -173t-203 -71h-240zM259 394h90q200 0 200 131q0 63 -112 63h-130zM179 74h126q96 0 151.5 45t55.5 111q0 52 -42.5 69.5t-150.5 17.5h-79z" />
+<glyph unicode="&#x1d60a;" horiz-adv-x="671" d="M755 554l-26 -101h-19q-8 55 -41 89.5t-71.5 46t-84.5 11.5q-133 0 -229.5 -106t-96.5 -247q0 -87 50.5 -136t144.5 -49q123 0 246 108l38 -51q-136 -133 -306 -133q-128 0 -196 65.5t-68 176.5q0 119 59.5 222.5t160 164.5t215.5 61q75 0 136.5 -29.5t87.5 -92.5z" />
+<glyph unicode="&#x1d60b;" horiz-adv-x="692" d="M239 662h166q346 0 346 -233q0 -77 -31 -152.5t-87.5 -137.5t-146 -100.5t-197.5 -38.5h-215zM179 74h49q94 0 147 7.5t107 32.5q80 37 128.5 117.5t48.5 177.5q0 179 -292 179h-60z" />
+<glyph unicode="&#x1d60c;" horiz-adv-x="583" d="M678 662l-19 -74h-352l-50 -202h305l-19 -75h-305l-59 -237h379l-35 -74h-449l165 662h439z" />
+<glyph unicode="&#x1d60d;" horiz-adv-x="535" d="M679 662l-10 -74h-362l-50 -202h296l-19 -75h-296l-77 -311h-87l165 662h440z" />
+<glyph unicode="&#x1d60e;" horiz-adv-x="695" d="M755 565l-25 -103h-19q-32 138 -189 138q-94 0 -171.5 -50.5t-119 -127.5t-41.5 -160q0 -87 52 -143.5t152 -56.5q83 0 126.5 18t49.5 43l40 158h-89v76h195l-75 -298q-45 -26 -69 -37t-78.5 -23.5t-122.5 -12.5q-129 0 -201.5 67.5t-72.5 180.5q0 87 36.5 168.5 t97 141.5t142.5 96t168 36q165 0 214 -111z" />
+<glyph unicode="&#x1d60f;" horiz-adv-x="658" d="M749 662l-165 -662h-87l75 301h-336l-75 -301h-87l165 662h87l-72 -287h336l72 287h87z" />
+<glyph unicode="&#x1d610;" horiz-adv-x="401" d="M512 662l-10 -74h-111l-128 -514h111l-27 -74h-288l4 74h111l128 514h-111l33 74h288z" />
+<glyph unicode="&#x1d611;" horiz-adv-x="398" d="M470 662l-113 -450q-27 -107 -77 -166.5t-141 -59.5q-76 0 -117 56l38 76h17q14 -23 37.5 -39.5t46.5 -16.5q25 0 44 12.5t31.5 38t18.5 43.5t14 50l114 456h87z" />
+<glyph unicode="&#x1d612;" horiz-adv-x="634" d="M729 662l-5 -17l-378 -288l284 -357h-119l-241 302l-42 -33l-67 -269h-87l165 662h87l-72 -287l380 287h95z" />
+<glyph unicode="&#x1d613;" horiz-adv-x="559" d="M564 74l-36 -74h-454l165 662h87l-147 -588h385z" />
+<glyph unicode="&#x1d614;" horiz-adv-x="843" d="M933 662l-165 -662h-85l135 543l-386 -543h-21l-117 541l-134 -541h-85l165 662h123l104 -482l343 482h123z" />
+<glyph unicode="&#x1d615;" horiz-adv-x="675" d="M766 662l-169 -676l-65 14l-231 564l-140 -564h-87l165 662h121l198 -484l121 484h87z" />
+<glyph unicode="&#x1d616;" horiz-adv-x="714" d="M779 430q0 -123 -63.5 -227t-161 -160.5t-201.5 -56.5q-116 0 -185 66.5t-69 179.5q0 124 63.5 228t160.5 160t202 56q116 0 185 -66.5t69 -179.5zM689 421q0 85 -47.5 132t-135.5 47q-110 0 -192 -72.5t-113 -196.5q-12 -49 -12 -90q0 -85 47.5 -132t135.5 -47 q110 0 192 72.5t113 196.5q12 49 12 90z" />
+<glyph unicode="&#x1d617;" horiz-adv-x="525" d="M239 662h184q215 0 215 -133q0 -102 -81 -173t-205 -71h-120l-71 -285h-87zM250 359h88q105 0 157 40.5t52 108.5q0 80 -157 80h-83z" />
+<glyph unicode="&#x1d618;" horiz-adv-x="716" d="M651 -157l-4 -18q-39 0 -59 0.5t-54.5 2t-54 6t-47.5 12t-45.5 20t-37 30t-33.5 41.5t-24 55q-90 17 -141.5 81t-51.5 160q0 124 63.5 227.5t160.5 159.5t202 56q116 0 185 -66.5t69 -179.5q0 -85 -32.5 -163.5t-85.5 -135t-121 -94t-139 -47.5q11 -31 30.5 -50 t47.5 -27.5t50 -11t57 -2.5zM689 421q0 85 -47.5 132t-135.5 47q-110 0 -192 -72.5t-113 -196.5q-12 -49 -12 -90q0 -85 47.5 -132t135.5 -47q110 0 192 72.5t113 196.5q12 49 12 90z" />
+<glyph unicode="&#x1d619;" horiz-adv-x="589" d="M239 662h185q215 0 215 -130q0 -88 -65 -151t-164 -78l171 -303h-103l-173 299h-70l-74 -299h-87zM253 373h89q207 0 207 141q0 39 -38 56.5t-121 17.5h-83z" />
+<glyph unicode="&#x1d61a;" horiz-adv-x="541" d="M597 596l-30 -119h-19q-9 60 -49 91.5t-98 31.5q-51 0 -91.5 -35t-40.5 -77q0 -59 112 -110q79 -35 113.5 -72t34.5 -87q0 -104 -82.5 -168.5t-192.5 -64.5q-145 0 -192 84l21 135h18q14 -73 62.5 -108t105.5 -35q74 0 120 35.5t46 88.5q0 33 -23.5 57.5t-75.5 47.5 q-82 37 -119.5 75.5t-37.5 89.5q0 94 74.5 157t171.5 63q124 0 172 -80z" />
+<glyph unicode="&#x1d61b;" horiz-adv-x="608" d="M748 662l-9 -74h-245l-147 -588h-87l146 588h-245l29 74h558z" />
+<glyph unicode="&#x1d61c;" horiz-adv-x="661" d="M757 662l-105 -419q-32 -126 -114.5 -191.5t-211.5 -65.5q-209 0 -209 168q0 40 12 89l105 419h87l-102 -406q-14 -55 -14 -83q0 -52 37 -81.5t103 -29.5q55 0 102 21.5t76 57.5q25 31 49 128l98 393h87z" />
+<glyph unicode="&#x1d61d;" horiz-adv-x="654" d="M788 662l-451 -673h-26l-115 673h95l77 -498l324 498h96z" />
+<glyph unicode="&#x1d61e;" horiz-adv-x="921" d="M1057 662l-396 -673h-28l-67 446l-284 -446h-28l-60 673h95l34 -476v2l301 474l65 -476v2l273 474h95z" />
+<glyph unicode="&#x1d61f;" horiz-adv-x="700" d="M806 662l-317 -313l180 -349h-105l-145 283l-283 -283h-105l352 349l-162 313h106l125 -248l247 248h107z" />
+<glyph unicode="&#x1d620;" horiz-adv-x="630" d="M774 662l-344 -374l-72 -288h-87l71 288l-156 374h95l124 -300l274 300h95z" />
+<glyph unicode="&#x1d621;" horiz-adv-x="637" d="M763 662l-6 -21l-569 -567h433l-26 -74h-567l6 25l566 563h-392l27 74h528z" />
+<glyph unicode="&#x1d622;" horiz-adv-x="448" d="M169 302l-41 31q30 68 85.5 99t120.5 31q63 0 98 -26.5t35 -74.5q0 -14 -5 -36l-63 -250q-8 -29 -8 -76h-85l5 44q-72 -54 -162 -54q-44 0 -69 19.5t-25 56.5q0 168 320 228l8 33q2 10 2 15q0 23 -19.5 36.5t-51.5 13.5q-76 0 -130 -90h-15zM334 132l23 90 q-218 -35 -218 -126q0 -35 48 -35q68 0 147 71z" />
+<glyph unicode="&#x1d623;" horiz-adv-x="496" d="M311 679l-66 -265q67 49 140 49q70 0 110 -40.5t40 -109.5q0 -131 -95 -227t-215 -96q-103 0 -151 57l153 613l76 24zM217 302l-52 -208q31 -33 83 -33q72 0 138 63t66 164q0 48 -25.5 76t-74.5 28q-36 0 -72.5 -23.5t-62.5 -66.5z" />
+<glyph unicode="&#x1d624;" horiz-adv-x="456" d="M503 371l-57 -54h-16q-14 75 -95 75q-64 0 -124.5 -61t-60.5 -162q0 -51 28.5 -79.5t74.5 -28.5q81 0 155 105l56 -34q-96 -142 -235 -142q-74 0 -118 42t-44 118q0 130 92 221.5t198 91.5q55 0 94.5 -23t51.5 -69z" />
+<glyph unicode="&#x1d625;" horiz-adv-x="494" d="M600 679l-138 -551q-16 -66 -22 -115l-78 -24l-8 5l10 50q-69 -54 -150 -54q-65 0 -103.5 40.5t-38.5 113.5q0 125 92 222t196 97q55 0 98 -37l58 234l76 24zM391 158l43 171q-27 63 -88 63q-65 0 -128 -65.5t-63 -158.5q0 -53 26.5 -80t70.5 -27q35 0 73 26.5t66 70.5z " />
+<glyph unicode="&#x1d626;" horiz-adv-x="444" d="M403 167l57 -35q-56 -76 -108.5 -109t-124.5 -33q-73 0 -115.5 41.5t-42.5 116.5q0 96 45.5 170t109.5 109.5t129 35.5q64 0 99 -34.5t35 -94.5q0 -29 -7 -57l-14 -55h-309q-7 -28 -7 -54q0 -51 28.5 -79t74.5 -28q79 0 150 106zM188 293h215q4 16 4 33q0 66 -80 66 q-40 0 -79 -25t-60 -74z" />
+<glyph unicode="&#x1d627;" horiz-adv-x="336" d="M526 633l-38 -59l-17 -1q-24 22 -37.5 30.5t-32.5 8.5q-31 0 -56.5 -25t-38.5 -78l-14 -56h114l-17 -71h-114l-95 -382h-79l95 382h-81l17 71h81l11 41q28 101 84 149q50 40 104 40q68 0 114 -50z" />
+<glyph unicode="&#x1d628;" horiz-adv-x="496" d="M575 436l-16 -67h-78q4 -20 4 -30q0 -83 -66 -142t-147 -59q-31 0 -59 8q-54 -28 -54 -55q0 -26 40 -27q144 -5 187 -19q61 -20 61 -76q0 -49 -29.5 -86.5t-76.5 -58t-98.5 -30.5t-103.5 -10q-67 0 -106.5 22t-39.5 66q0 41 27 78.5t73 59.5q-23 18 -23 45q0 28 19.5 54 t69.5 69q-28 33 -28 78q0 80 68.5 143.5t157.5 63.5q29 0 74 -13.5t76 -13.5h68zM404 329q0 63 -71 63q-49 0 -85 -36.5t-36 -80.5q0 -30 21 -48t58 -18q49 0 81 36.5t32 83.5zM197 -15h-20q-46 -13 -73.5 -35t-27.5 -48q0 -47 89 -47q81 0 139.5 22.5t58.5 70.5 q0 37 -166 37z" />
+<glyph unicode="&#x1d629;" horiz-adv-x="487" d="M311 679l-69 -274q44 35 80.5 46.5t82.5 11.5q49 0 77 -25t28 -72q0 -21 -6 -45l-80 -321h-79l75 304q5 22 5 34q0 54 -65 54q-29 0 -73.5 -25t-69.5 -65l-75 -302h-79l164 660l76 24z" />
+<glyph unicode="&#x1d62a;" horiz-adv-x="220" d="M325 679l-23 -93h-92l23 93h92zM266 459l-114 -459h-83l109 440l80 24z" />
+<glyph unicode="&#x1d62b;" horiz-adv-x="254" d="M354 679l-23 -93h-93l23 93h93zM294 459l-121 -485q-24 -93 -74 -141.5t-117 -48.5q-50 0 -100 36l43 64h16q36 -28 58 -28q63 0 88 102l120 481l79 25z" />
+<glyph unicode="&#x1d62c;" horiz-adv-x="453" d="M556 453l-3 -14l-292 -184l191 -255h-103l-156 207l-51 -207h-79l164 660l76 24l8 -5l-94 -376l235 150h104z" />
+<glyph unicode="&#x1d62d;" horiz-adv-x="205" d="M313 679l-169 -679h-83l164 660l80 24z" />
+<glyph unicode="&#x1d62e;" horiz-adv-x="756" d="M253 459l-14 -57q64 61 154 61q88 0 115 -65q74 65 158 65q49 0 79 -26t30 -76q0 -21 -6 -46l-78 -315h-77l73 293q6 24 6 42q0 57 -61 57q-27 0 -72 -25.5t-68 -64.5l-75 -302h-77l71 290q7 32 7 45q0 57 -59 57q-27 0 -72.5 -25t-69.5 -65l-75 -302h-77l109 440l71 24z " />
+<glyph unicode="&#x1d62f;" horiz-adv-x="487" d="M251 459l-12 -57q45 36 83 48.5t83 12.5q47 0 76 -25.5t29 -65.5q0 -24 -6 -51l-80 -321h-79l75 304q5 22 5 35q0 53 -65 53q-29 0 -73.5 -25t-69.5 -65l-75 -302h-79l109 440l71 24z" />
+<glyph unicode="&#x1d630;" horiz-adv-x="499" d="M536 300q0 -49 -20.5 -103t-56.5 -100.5t-92.5 -76.5t-121.5 -30q-79 0 -124 47t-45 123q0 115 84.5 209t199.5 94q82 0 129 -43t47 -120zM455 282q0 52 -29.5 81t-82.5 29q-75 0 -130.5 -67t-55.5 -148q0 -53 28.5 -84.5t78.5 -31.5q48 0 87 26t60.5 63t32.5 72t11 60z " />
+<glyph unicode="&#x1d631;" horiz-adv-x="498" d="M256 459l-11 -50q69 54 151 54q65 0 103.5 -41.5t38.5 -114.5q0 -123 -92.5 -220t-195.5 -97q-56 0 -98 36l-54 -218l-76 -24l-8 5l162 651l73 24zM219 295l-43 -172q23 -62 88 -62q76 0 133.5 67.5t57.5 155.5q0 48 -25 78t-72 30q-35 0 -73 -26.5t-66 -70.5z" />
+<glyph unicode="&#x1d632;" horiz-adv-x="498" d="M549 458l-167 -669l-10 -5l-64 24l58 234q-67 -52 -148 -52q-66 0 -106 41.5t-40 115.5q0 123 92.5 219.5t195.5 96.5q66 0 105 -35l74 36zM395 158l43 171q-12 30 -37.5 46.5t-54.5 16.5q-65 0 -128 -65.5t-63 -158.5q0 -48 25 -77.5t72 -29.5q35 0 75.5 27t67.5 70z " />
+<glyph unicode="&#x1d633;" horiz-adv-x="336" d="M439 447l-18 -70h-20q-3 7 -15 11t-20 4q-43 0 -87 -42t-79 -116l-58 -234h-79l109 440l76 24l8 -5l-14 -64q64 68 144 68q37 0 53 -16z" />
+<glyph unicode="&#x1d634;" horiz-adv-x="389" d="M432 410l-22 -89h-15q-17 44 -42 58t-64 14t-58.5 -21.5t-19.5 -41.5t17 -34.5t50 -30.5q60 -29 83.5 -51.5t23.5 -55.5q0 -68 -56 -118t-143 -50q-45 0 -72 13t-53 42l25 103h15q18 -87 109 -87q34 0 63 17.5t29 49.5q0 15 -16 28.5t-54 32.5q-55 27 -79.5 53.5 t-24.5 60.5q0 62 52 111t129 49q87 0 123 -53z" />
+<glyph unicode="&#x1d635;" horiz-adv-x="291" d="M376 453l-17 -71h-104l-61 -245q-6 -24 -6 -39q0 -37 38 -37q36 0 70 26h12l-30 -75q-34 -22 -93 -22q-41 0 -62.5 20.5t-21.5 56.5q0 15 5 37l70 278h-80l4 17l58 54h35l16 64l77 63h18l-32 -127h104z" />
+<glyph unicode="&#x1d636;" horiz-adv-x="491" d="M536 453l-81 -325q-16 -66 -22 -115l-77 -24l-8 5l14 65q-37 -32 -83 -50.5t-85 -18.5q-47 0 -76 25.5t-29 65.5q0 25 6 50l80 322h79l-75 -304q-5 -19 -5 -35q0 -53 65 -53q28 0 74.5 29.5t71.5 70.5l72 292h79z" />
+<glyph unicode="&#x1d637;" horiz-adv-x="474" d="M555 453l-311 -467h-22l-79 467h85l48 -299l194 299h85z" />
+<glyph unicode="&#x1d638;" horiz-adv-x="702" d="M787 453l-312 -467h-22l-37 244l-183 -244h-21l-72 467h84l47 -304l129 176q-3 25 -10.5 73.5t-8.5 54.5h84l48 -294l189 294h85z" />
+<glyph unicode="&#x1d639;" horiz-adv-x="482" d="M544 453l-200 -217l108 -236h-94l-79 175l-155 -175h-94l220 239l-96 214h94l68 -151l134 151h94z" />
+<glyph unicode="&#x1d63a;" horiz-adv-x="484" d="M565 453l-301 -497q-54 -89 -102.5 -130.5t-112.5 -41.5q-48 0 -68 24l18 72h16q26 -24 54 -24q32 0 69 38.5t71 99.5q2 4 9 15.5t10 17.5q-14 81 -45 237t-37 189h86l59 -323l189 323h85z" />
+<glyph unicode="&#x1d63b;" horiz-adv-x="447" d="M517 453l-5 -20l-342 -362h264l-27 -71h-382l4 20l342 362h-227l29 71h344z" />
+<glyph unicode="&#x1d6a4;" horiz-adv-x="278" d="M221 115l14 -12q-41 -63 -71 -88.5t-67 -25.5q-50 0 -50 57q0 20 24 110l48 175q9 34 9 45q0 15 -11 19t-52 5v16q44 3 159 25l5 -3l-96 -342q-9 -34 -9 -45q0 -15 16 -15q12 0 30 17.5t51 61.5z" />
+<glyph unicode="&#x1d6a5;" horiz-adv-x="278" d="M246 438l-104 -410q-31 -121 -76.5 -178t-110.5 -57q-35 0 -57 17t-22 44q0 18 12 31t29 13q39 0 39 -37q0 -12 -6 -19.5t-6 -14.5q0 -12 18 -12q30 0 50.5 39t46.5 143l72 292q16 65 16 80q0 17 -10.5 24t-37.5 7h-26v16q45 3 169 25z" />
+<glyph unicode="&#x1d6e2;" horiz-adv-x="717" d="M685 0h-285v16h16q40 0 56 14.5t16 46.5q0 7 -2 21l-13 113h-198l-84 -140q-10 -11 -10 -26q2 -29 43 -29h29v-16h-218v16q67 8 108 74l356 577h18l78 -581q10 -70 74 -70h16v-16zM466 248l-25 227h-6l-139 -227h170z" />
+<glyph unicode="&#x1d6e3;" horiz-adv-x="696" d="M198 653h252q236 0 236 -145q0 -102 -91 -147q-28 -14 -74 -26l3 -4q52 -9 89.5 -44t37.5 -94q0 -82 -72 -137.5t-217 -55.5h-324l4 16h20q52 0 74 16.5t29 46.5l123 495q2 10 2 21q0 42 -78 42h-19zM406 611l-59 -252q30 -6 53 -6q82 0 125 44t43 119q0 52 -35 75 t-84 23q-23 0 -43 -3zM338 314l-68 -267q32 -9 71 -9q80 0 135 41t55 131q0 52 -40 80t-102 28q-36 0 -51 -4z" />
+<glyph unicode="&#x1d6e4;" horiz-adv-x="616" d="M721 653l-39 -175h-17q5 45 5 50q-1 88 -114 88h-146l-133 -538q-4 -18 -4 -24q0 -38 79 -38h32l-4 -16h-342l4 16h18q53 0 75.5 16t29.5 46l123 497q4 16 4 24q0 39 -76 39h-19l4 15h520z" />
+<glyph unicode="&#x1d6e5;" horiz-adv-x="596" d="M556 0h-526l412 667h19zM429 82l-45 393h-6l-241 -393h292z" />
+<glyph unicode="&#x1d6e6;" horiz-adv-x="714" d="M734 653l-42 -158h-16q2 26 2 35q-4 87 -109 87h-160l-60 -248h80q51 0 81 19t45 76h16l-58 -242h-17q0 2 3 26t3 34q0 51 -72 51h-90l-66 -258q-2 -8 -2 -10q0 -27 63 -27h67q115 0 169 36t88 124h16l-66 -198h-571l4 16h19q89 0 104 62l120 488q5 22 5 36q0 19 -16 27 t-59 8h-19l4 16h534z" />
+<glyph unicode="&#x1d6e7;" horiz-adv-x="772" d="M802 653l-566 -615h218q42 0 70 4t59.5 17t53 43t34.5 76h16l-46 -178h-581l573 616h-202q-44 0 -71.5 -3t-60.5 -14t-55 -37t-36 -67h-17l48 158h563z" />
+<glyph unicode="&#x1d6e8;" horiz-adv-x="873" d="M923 653l-4 -16h-18q-52 0 -75 -16.5t-31 -46.5l-123 -496q-4 -18 -4 -28q0 -34 78 -34h19l-4 -16h-329l4 16h18q51 0 74.5 16t30.5 46l61 242h-280l-61 -242q-4 -12 -4 -24q0 -38 77 -38h20l-4 -16h-330l4 16h18q91 0 106 62l123 496q4 12 4 24q0 39 -78 39h-20l4 16 h330l-4 -16h-18q-54 0 -76 -16t-29 -47l-52 -217h278l53 217q4 20 4 24q0 39 -76 39h-20l4 16h330z" />
+<glyph unicode="&#x1d6e9;" horiz-adv-x="737" d="M520 425h16q-30 -77 -30 -163v-27h-16q-1 31 -13 44t-38 13h-117q-28 0 -43 -12t-31 -45h-16q30 75 30 176v14h16q6 -34 17 -45.5t39 -11.5h118q48 0 68 57zM712 395q0 -96 -50.5 -188.5t-147 -155t-212.5 -62.5q-112 0 -182 65t-70 168q0 61 18 124t54 121t84.5 103 t115 72t140.5 27q66 0 115.5 -23t78 -62.5t42.5 -87t14 -101.5zM596 444q0 85 -34.5 136.5t-107.5 51.5q-66 0 -118.5 -34.5t-82.5 -85t-49.5 -115.5t-26 -119t-6.5 -102q0 -72 39 -110.5t100 -38.5q75 0 133 43t89.5 109.5t47.5 134.5t16 130z" />
+<glyph unicode="&#x1d6ea;" horiz-adv-x="480" d="M530 653l-4 -16h-19q-53 0 -75.5 -16t-30.5 -46l-123 -497q-3 -12 -3 -29q0 -33 78 -33h17l-4 -16h-328l4 16h19q52 0 75 16.5t30 45.5l123 497q4 16 4 24q0 38 -77 38h-18l4 16h328z" />
+<glyph unicode="&#x1d6eb;" horiz-adv-x="762" d="M802 653l-4 -16q-35 0 -59 -12t-61 -41l-271 -211l187 -278q26 -38 54.5 -58.5t72.5 -20.5l-4 -16h-287l4 16h11q24 0 35.5 6.5t11.5 26.5q0 6 -1.5 11t-3.5 7.5t-5 8.5l-6 8l-156 237h-4l-62 -243q-3 -12 -3 -22q0 -40 78 -40h17l-4 -16h-304l4 16h18q68 0 84 62 l117 472q10 39 10 49q0 38 -76 38h-18l4 16h312l-4 -16h-11q-51 0 -70 -15.5t-27 -46.5l-53 -209h5l282 221q18 14 18 29q-1 11 -11 16t-40 5l4 16h216z" />
+<glyph unicode="&#x1d6ec;" horiz-adv-x="718" d="M686 0h-287l2 16h15q70 0 70 61q0 14 -1 21l-44 378h-5l-245 -405q-10 -15 -10 -26q0 -29 43 -29h29v-16h-218v16q67 8 108 74l357 577h17l78 -569q6 -46 24 -64t50 -18h17v-16z" />
+<glyph unicode="&#x1d6ed;" horiz-adv-x="1005" d="M1055 653l-4 -16h-17q-55 0 -76 -15t-29 -46l-127 -498q-2 -7 -2 -28q0 -34 77 -34h19l-4 -16h-330l4 16h17q54 0 76 16.5t29 45.5l112 439h-6l-345 -517h-25l-94 517h-3l-109 -428q-5 -22 -5 -40q0 -33 76 -33h20l-4 -16h-267l4 16h19q54 0 76.5 19t31.5 54l119 475 q5 21 5 38q0 35 -77 35h-19l4 16h213l89 -493h4l333 493h215z" />
+<glyph unicode="&#x1d6ee;" horiz-adv-x="851" d="M901 653l-4 -16h-18q-53 0 -76.5 -16t-30.5 -47l-144 -574h-24l-274 526h-6l-108 -448q-3 -12 -3 -27q0 -35 76 -35h19l-4 -16h-266l4 16h18q91 0 106 62l126 509q-22 50 -92 50h-19l4 16h200l236 -465h5l97 386q4 18 4 26q0 37 -76 37h-20l4 16h266z" />
+<glyph unicode="&#x1d6ef;" horiz-adv-x="706" d="M741 653l-35 -152h-16q3 13 3 33q0 16 -4.5 25t-16 12.5t-20.5 4.5t-29 1h-299q-40 0 -62.5 -17.5t-33.5 -58.5h-16l37 152h492zM609 450l-52 -209h-15l2 26q0 18 -11 29.5t-28 11.5h-185q-27 0 -48.5 -20t-30.5 -47h-16l52 209h16q-3 -15 -3 -25q0 -24 16 -32.5t47 -8.5 h145q50 0 67 14t28 52h16zM629 158l-40 -158h-537l40 158h13v-14v-21q0 -24 16.5 -32.5t48.5 -8.5h339q34 0 48.5 3t29 19.5t26.5 53.5h16z" />
+<glyph unicode="&#x1d6f0;" horiz-adv-x="732" d="M712 420q0 -75 -29 -151t-80 -138.5t-130 -102t-170 -39.5q-112 0 -182.5 65t-70.5 168q0 77 29.5 155.5t81 144t131 106.5t171.5 41q118 0 183.5 -73.5t65.5 -175.5zM596 443q0 86 -34.5 137.5t-106.5 51.5q-66 0 -118 -34t-82.5 -84.5t-50 -115.5t-26.5 -119t-7 -102 q0 -70 39.5 -110t100.5 -40t111 30t81.5 75.5t53 103t30.5 110t9 97.5z" />
+<glyph unicode="&#x1d6f1;" horiz-adv-x="873" d="M923 653l-4 -16h-19q-53 0 -75 -15.5t-30 -45.5l-123 -498q-3 -10 -3 -27q0 -18 16.5 -26.5t60.5 -8.5h20l-4 -16h-331l4 16h18q54 0 75.5 13.5t30.5 48.5l132 538h-278l-133 -538q-3 -15 -3 -26q0 -22 17.5 -29t57.5 -7h19l-4 -16h-329l4 16h18q91 0 106 62l122 498 q3 12 3 24q0 19 -17 28t-59 9h-20l4 16h724z" />
+<glyph unicode="&#x1d6f2;" horiz-adv-x="594" d="M201 653h271q117 0 174.5 -48t57.5 -112q0 -82 -71.5 -140.5t-213.5 -58.5q-44 0 -74 5q-4 0 -12 2l-56 -223q-3 -12 -3 -23q0 -39 77 -39h32l-4 -16h-341l4 16h17q53 0 75.5 16t30.5 46l125 497q4 16 4 25q0 37 -78 37h-19zM411 613l-68 -274q32 -8 60 -8q78 0 130 48 t52 124q0 50 -29.5 81.5t-95.5 31.5q-24 0 -49 -3z" />
+<glyph unicode="&#x1d6f3;" horiz-adv-x="737" d="M712 395q0 -96 -50.5 -188.5t-147 -155t-212.5 -62.5q-112 0 -182 65t-70 168q0 61 18 124t54 121t84.5 103t115 72t140.5 27q66 0 115.5 -23t78 -62.5t42.5 -87t14 -101.5zM195 368h395q6 40 6 76q0 85 -34.5 136.5t-107.5 51.5q-54 0 -98.5 -22t-75 -61.5t-51 -83.5 t-34.5 -97zM575 292h-395q-9 -57 -9 -116q0 -72 39 -110.5t100 -38.5q103 0 169.5 76t95.5 189z" />
+<glyph unicode="&#x1d6f4;" horiz-adv-x="735" d="M760 653l-40 -159h-16q3 7 3 29q0 26 -8 44.5t-18.5 27.5t-30 14t-34 6t-38.5 1h-205l161 -255l-317 -279h315q57 0 94.5 26t64.5 83h16l-83 -191h-566l378 327l-210 326h534z" />
+<glyph unicode="&#x1d6f5;" horiz-adv-x="550" d="M670 653l-46 -179h-16q5 42 5 71q0 31 -17.5 47.5t-36 20t-45.5 3.5h-98l-133 -538q-5 -22 -5 -25q0 -37 76 -37h21l-4 -16h-329l4 16h18q54 0 76.5 16t29.5 46l133 538h-91q-62 0 -109.5 -40.5t-61.5 -101.5h-16l46 179h599z" />
+<glyph unicode="&#x1d6f6;" horiz-adv-x="567" d="M687 661v-16q-58 0 -126 -81l-212 -251l-57 -235q-4 -14 -4 -26q0 -36 77 -36h21l-4 -16h-328l4 16h17q53 0 75 16t29 46l61 247l-78 208q-23 61 -51 87.5t-83 26.5l4 16q53 5 85 5q31 0 55 -7.5t37.5 -16t25.5 -28t16.5 -31t13.5 -36.5l64 -185h5l176 207q27 33 42 48 t41 29.5t54 14.5q26 0 40 -2z" />
+<glyph unicode="&#x1d6f7;" horiz-adv-x="772" d="M508 578l-9 -31q102 0 175 -44t73 -132q0 -56 -24 -103t-61 -78t-83.5 -53t-91 -32t-83.5 -10h-19l-7 -31q-2 -10 -2 -15q0 -33 73 -33h26l-4 -16h-330l3 16q66 0 91 15t38 64h-13q-113 0 -174 46.5t-61 111.5q0 76 33 134.5t87 92t115.5 50.5t125.5 17q10 29 10 51 q0 39 -75 39h-19l4 16h321l-4 -16h-16q-82 0 -99 -59zM490 510l-95 -377q92 0 162.5 64t70.5 177q0 58 -34.5 97t-103.5 39zM283 133l93 377q-63 0 -118 -41t-84.5 -100t-29.5 -115q0 -52 35 -86.5t104 -34.5z" />
+<glyph unicode="&#x1d6f8;" horiz-adv-x="790" d="M810 653l-4 -16h-4q-33 0 -58.5 -11t-39.5 -23.5t-37 -39.5l-187 -213l96 -266q11 -32 28 -50t51 -18h14l-4 -16h-281l4 16h11q34 0 50.5 8t16.5 33q0 13 -4 26l-69 194l-181 -201q-12 -13 -12 -28q0 -32 56 -32h22l-4 -16h-249l4 16q78 10 140 77l208 230l-85 231 q-6 18 -10.5 27t-16 25t-30.5 23.5t-45 7.5h-9l4 16h283l-4 -16h-19q-26 0 -39 -7t-13 -28q0 -12 6 -28l60 -179l164 184q15 18 15 34q-2 24 -45 24h-9l4 16h222z" />
+<glyph unicode="&#x1d6f9;" horiz-adv-x="670" d="M743 667l-4 -16q-38 -8 -55 -51q-5 -13 -11 -41q-18 -86 -37 -124q-43 -89 -113 -127t-175 -38l-43 -181q-8 -37 -8 -43q0 -31 77 -31q16 0 21 1l-4 -16h-328l4 16q66 0 84 8q30 14 42 65l42 181q-50 0 -93.5 12t-76.5 46t-33 85q0 31 17 92t17 92q0 50 -38 54l4 16h18 q49 0 80.5 -33t31.5 -82q0 -31 -20.5 -88t-20.5 -88q0 -69 124 -69l54 218q17 71 17 77q0 8 -3.5 14t-11 9.5t-14.5 6t-18 3.5t-17.5 1.5t-16.5 0.5h-13l4 16h321l-4 -16q-29 0 -48.5 -2.5t-40.5 -15.5t-27 -38l-68 -274q78 0 116.5 37.5t64.5 118.5q3 10 9.5 34t12 41.5 t13.5 32.5q47 96 150 96h18z" />
+<glyph unicode="&#x1d6fa;" horiz-adv-x="800" d="M280 94l5 37q-147 48 -147 203q0 69 41 139q36 59 91 104q107 89 273 89q126 0 186 -73q48 -59 48 -157q0 -115 -84 -202q-76 -79 -198 -103l-7 -37h128q56 6 79 19q31 19 49 66l18 -5l-56 -174h-280l40 166q94 21 155 115q51 79 51 171q0 181 -140 181q-108 0 -192 -87 q-97 -101 -97 -216q0 -65 23 -109q23 -43 61 -55l-24 -166h-271l42 179l17 -5q-4 -17 -4 -36q0 -44 62 -44h131z" />
+<glyph unicode="&#x1d6fb;" horiz-adv-x="627" d="M600 653l-400 -668h-26l-132 668h558zM499 559h-342l87 -432z" />
+<glyph unicode="&#x1d6fc;" horiz-adv-x="524" d="M529 428l-139 -241v-37q0 -40 8.5 -69.5t25.5 -29.5q20 0 46 74l15 -7q-14 -58 -38.5 -93t-56.5 -35q-26 0 -45 26t-21 61h-2q-59 -87 -153 -87q-61 0 -95 47t-34 114q0 37 7 66q22 92 84.5 158t140.5 66q55 0 84.5 -39.5t29.5 -96.5l64 123h79zM322 273q0 31 -1.5 51 t-7.5 42.5t-19 33.5t-34 11q-46 0 -91 -86.5t-45 -199.5q0 -52 10 -78.5t44 -26.5q29 0 60 36t49 73t30 73q5 25 5 71z" />
+<glyph unicode="&#x1d6fd;" horiz-adv-x="493" d="M47 -105l116 479q25 103 49 145t84 94q64 55 123 55q42 0 70.5 -32t28.5 -82q0 -57 -27.5 -108t-72.5 -71v-1q56 -15 56 -102q0 -48 -18.5 -101.5t-44.5 -86.5q-75 -96 -192 -96q-38 0 -64 21l-28 -122q-8 -37 -23 -70h-79q8 17 22 78zM266 459l-102 -419q22 -23 49 -23 q54 0 96.5 50.5t61 112.5t18.5 115q0 63 -21 63q-10 0 -21.5 -4t-20.5 -4q-13 0 -22.5 6.5t-9.5 15.5q0 10 11.5 18.5t35.5 8.5q3 0 19.5 -2.5t24.5 -2.5q29 0 44.5 46t15.5 78q0 40 -15.5 70t-45.5 30q-22 0 -39.5 -9t-28.5 -22t-21 -36t-15.5 -42t-13.5 -50z" />
+<glyph unicode="&#x1d6fe;" horiz-adv-x="428" d="M458 428l-266 -371q-8 -87 -16 -128q-24 -116 -83 -116q-17 0 -26.5 12.5t-9.5 31.5q0 36 14.5 67.5t41.5 70t39 62.5q13 92 13 182q0 138 -58 138q-29 0 -56 -74h-16q39 138 102 138q66 0 66 -128q0 -37 -6.5 -104t-7.5 -75l179 294h90z" />
+<glyph unicode="&#x1d6ff;" horiz-adv-x="463" d="M451 608q0 -18 -12 -32t-34 -14t-32 10t-11 22.5t-15.5 22.5t-45.5 10t-60.5 -20t-29.5 -47q0 -26 23 -53t56 -51l66 -52q33 -26 56 -62t23 -75q0 -66 -18 -112q-29 -70 -89.5 -118t-141.5 -48q-70 0 -108 41t-38 104q0 93 69 174t170 91q-12 12 -35 31.5t-35.5 31.5 t-23 30.5t-10.5 37.5q0 45 29 78t65.5 46.5t72.5 13.5q43 0 76 -15t33 -45zM351 269q0 39 -13.5 69.5t-40.5 30.5q-61 0 -120 -88.5t-59 -160.5q0 -43 19.5 -72.5t50.5 -29.5q63 0 113 86t50 165z" />
+<glyph unicode="&#x1d700;" horiz-adv-x="484" d="M444 372l-14 -8q-18 26 -46 36.5t-74 10.5q-51 0 -95 -32t-44 -81q0 -24 22 -37.5t56 -13.5q10 0 29.5 4.5t32.5 4.5q38 0 38 -20q0 -31 -43 -31q-3 0 -26 3t-35 3q-45 0 -89 -27.5t-44 -75.5q0 -42 36 -60t89 -18q42 0 84.5 19.5t66.5 53.5l13 -10q-35 -50 -84 -77 t-126 -27q-86 0 -126 29t-40 73q0 53 32 88.5t84 48.5q-58 20 -58 66q0 63 61 105t164 42q46 0 86 -21t50 -48z" />
+<glyph unicode="&#x1d701;" horiz-adv-x="435" d="M290 668l4 -16q-36 -13 -55 -33.5t-19 -40.5q0 -35 49 -45q31 36 87 71t92 35q32 0 32 -24q0 -34 -63.5 -70.5t-132.5 -42.5q-72 -50 -129 -143.5t-57 -185.5q0 -91 92 -91h6q6 0 17.5 0.5t23.5 0.5q63 0 93.5 -23t30.5 -76q0 -62 -59 -114.5t-122 -52.5q-24 0 -38.5 17 t-14.5 37q0 18 12.5 30t35.5 12q11 0 27.5 -15t25.5 -15q36 0 66.5 19.5t30.5 48.5q0 49 -82 49q-5 0 -36 -4.5t-40 -4.5q-55 0 -91 39t-36 103q0 110 54.5 200t145.5 171v1q-27 0 -50 16t-23 43q0 32 32 61t91 43z" />
+<glyph unicode="&#x1d702;" horiz-adv-x="460" d="M173 251h2l57 73q45 58 83.5 87.5t79.5 29.5q60 0 60 -54q0 -13 -15 -78l-75 -313q-23 -97 -23 -144q0 -25 5 -35h-76q-11 13 -11 46q0 30 16.5 101t82.5 335q8 27 8 48q0 13 -7.5 21t-20.5 8q-31 0 -104.5 -98t-95.5 -173l-31 -105h-78l77 304q13 54 13 59q0 13 -13 13 q-22 0 -60 -50l-13 10q30 42 46 58q19 19 43.5 33t40.5 14q41 0 41 -41q0 -19 -5.5 -45.5t-15 -61t-11.5 -42.5z" />
+<glyph unicode="&#x1d703;" horiz-adv-x="484" d="M474 472q0 -98 -41 -210.5t-112 -192.5t-144 -80q-71 0 -104 44t-33 135q0 68 21.5 152t59.5 162.5t98 132t127 53.5q57 0 92.5 -50t35.5 -146zM159 344h206q25 117 25 166q0 129 -51 129q-50 0 -104 -97t-76 -198zM356 308h-207q-25 -78 -25 -165q0 -125 58 -125 q45 0 87.5 69.5t70.5 160.5l10 34z" />
+<glyph unicode="&#x1d704;" horiz-adv-x="267" d="M227 441l-92 -364q-1 -6 -1 -14q0 -11 13 -11q6 0 10.5 1.5t8 3t8.5 7t9 9.5t12.5 14t15.5 17l13 -10q-82 -105 -134 -105q-40 0 -40 46q0 27 79 334q2 4 2 12q0 13 -7 17.5t-24 4.5q-14 0 -28 -4l-3 16z" />
+<glyph unicode="&#x1d705;" horiz-adv-x="534" d="M193 251l183 136q44 33 70 43.5t56 10.5q47 0 47 -41q0 -16 -10.5 -27t-31.5 -11q-15 0 -29 13.5t-31 13.5q-26 0 -52 -21l-143 -113l112 -187q17 -29 35 -38t66 -14l-1 -16h-235l1 16q58 0 58 17q0 16 -13 33l-90 153l-57 -219h-78l94 371v9q0 20 -32 20q-12 0 -28 -3 l-2 15l161 27z" />
+<glyph unicode="&#x1d706;" horiz-adv-x="541" d="M495 124h16q-38 -140 -104 -140q-22 0 -38 27t-16 68q0 27 3 57l6 76q4 46 7 85l-218 -297h-101l319 431q2 16 2 31q0 35 -1 46q-7 96 -56 96q-25 0 -53 -74h-16q37 138 104 138q55 0 55 -136v-383q0 -101 38 -101q25 0 53 76z" />
+<glyph unicode="&#x1d707;" horiz-adv-x="579" d="M549 428l-86 -338q-8 -32 -8 -39q0 -14 17 -14q30 0 57 48l15 -6q-12 -34 -54.5 -70t-76.5 -36q-41 0 -41 41q0 37 33 171q-71 -107 -114.5 -149t-79.5 -42q-13 0 -25 7.5t-16 17.5q-39 -155 -51 -179q-6 -13 -15 -23h-74q26 37 45 114l125 497h79l-71 -298 q-4 -18 -4 -27q0 -45 54 -45q37 0 109 115t88 184l16 71h78z" />
+<glyph unicode="&#x1d708;" horiz-adv-x="452" d="M444 446l18 -5q-14 -134 -83.5 -252.5t-185.5 -197.5h-21l-62 369q-7 42 -44 42h-16v16q57 2 128 23l60 -350q136 103 206 355z" />
+<glyph unicode="&#x1d709;" horiz-adv-x="433" d="M293 668l4 -16q-32 -9 -50.5 -25.5t-22 -26.5t-3.5 -18q0 -12 8 -21.5t24 -9.5q88 67 144 67q46 0 46 -34q0 -31 -49.5 -51t-106.5 -20q-37 0 -61.5 -25t-24.5 -53t31 -52q70 46 140 46q24 0 39.5 -8t15.5 -21q0 -24 -25 -39t-50 -19t-48 -4q-37 0 -68 9 q-66 -25 -110 -75.5t-44 -110.5q0 -44 24 -61t85 -17q12 0 28 0.5t21 0.5q63 0 93.5 -23.5t30.5 -76.5q0 -62 -59.5 -114.5t-121.5 -52.5q-24 0 -38.5 17t-14.5 37q0 18 12.5 30t35.5 12q11 0 27.5 -15t25.5 -15q36 0 66.5 19.5t30.5 48.5q0 49 -82 49q-10 0 -37.5 -4.5 t-36.5 -4.5q-147 2 -147 118q0 82 47 148t123 108q-30 26 -29 69q3 51 57 89q-21 5 -35.5 20t-14.5 31q0 34 30 59t90 35z" />
+<glyph unicode="&#x1d70a;" horiz-adv-x="458" d="M438 287q0 -110 -76.5 -204t-186.5 -94q-69 0 -102 49t-33 114t31 131t90.5 112t129.5 46q64 0 105.5 -38.5t41.5 -115.5zM357 318q0 36 -15.5 64.5t-51.5 28.5q-61 0 -115 -91.5t-54 -193.5q0 -107 59 -107q49 0 92 60t64 128t21 111z" />
+<glyph unicode="&#x1d70b;" horiz-adv-x="558" d="M568 428l-23 -73h-112q-3 -8 -16 -45l-23 -66q-10 -29 -19 -66.5t-9 -60.5q0 -18 11 -33t27 -15q44 0 73 66h16q-17 -59 -56 -100.5t-88 -41.5q-28 0 -42.5 21.5t-14.5 53.5q0 34 9 62q9 27 36.5 102.5t41.5 122.5h-94q-12 -32 -33 -97l-34 -106q-14 -41 -39.5 -86.5 t-54.5 -67.5q-13 -11 -38 -11q-20 0 -35.5 13t-15.5 31q0 40 31 48q49 14 74 70l89 206q-36 0 -53.5 -2t-41 -14t-44.5 -37h-16q69 126 212 126h282z" />
+<glyph unicode="&#x1d70c;" horiz-adv-x="502" d="M30 -183l84 336q50 202 166 259q58 29 98 29q94 0 94 -155q0 -65 -32.5 -133.5t-92.5 -116.5t-129 -48q-37 0 -61 18l-44 -189h-83zM212 238l-46 -200q18 -21 46 -21q48 0 90 48.5t64 113.5t22 123q0 43 -15.5 63t-35.5 20q-41 0 -75 -39t-50 -108z" />
+<glyph unicode="&#x1d70d;" horiz-adv-x="439" d="M464 438q0 -43 -48 -43q-20 0 -32 18.5t-31 18.5q-55 0 -114.5 -31t-102.5 -89t-43 -125q0 -50 17.5 -76.5t73.5 -26.5q13 0 28 0.5t18 0.5q126 0 126 -92q0 -74 -55.5 -125t-125.5 -51q-24 0 -38.5 18t-14.5 38q0 18 12.5 30t35.5 12q11 0 27.5 -16t25.5 -16q35 0 66 21 t31 50q0 49 -82 48q-10 0 -39 -4.5t-47 -4.5q-47 0 -82 40t-35 109q0 80 52.5 162t132.5 134t156 52q32 0 60 -13t28 -39z" />
+<glyph unicode="&#x1d70e;" horiz-adv-x="537" d="M547 428l-20 -73h-173q9 -25 30.5 -46t37.5 -43t16 -54q0 -86 -75 -154.5t-181 -68.5q-71 0 -106.5 48.5t-35.5 111.5q0 122 78.5 200.5t181.5 78.5h247zM286 355h-2q-57 -5 -110 -70.5t-53 -163.5q0 -20 4.5 -41t20 -41t40.5 -20q69 0 120.5 70t51.5 137 q0 44 -21.5 77.5t-50.5 51.5z" />
+<glyph unicode="&#x1d70f;" horiz-adv-x="442" d="M472 428l-22 -73h-155q-27 -66 -60 -189q-7 -25 -7 -46q0 -26 8 -37.5t28 -11.5q19 0 41.5 20t35.5 47h16q-18 -60 -59.5 -101.5t-89.5 -41.5q-64 0 -64 67q0 12 2.5 26t5.5 23l8 25q6 15 7 19l66 200h-51q-39 0 -75 -24.5t-61 -63.5h-16q25 58 83 109.5t124 51.5h235z " />
+<glyph unicode="&#x1d710;" horiz-adv-x="460" d="M293 425l2 14q150 -24 150 -168q0 -101 -73.5 -191.5t-176.5 -90.5q-62 0 -100 29t-38 75q0 27 19 94l41 141q9 29 9 39q0 14 -15 14q-13 0 -25.5 -9.5t-42.5 -46.5l-13 9q35 51 72 78t68 27q24 0 35 -7.5t11 -28.5q0 -19 -68 -240q-13 -41 -13 -74q0 -71 63 -71 q55 0 100 48.5t66 109t21 113.5q0 120 -92 136z" />
+<glyph unicode="&#x1d711;" horiz-adv-x="666" d="M247 19l34 130q75 289 245 289q47 0 76 -38.5t29 -116.5q0 -72 -36.5 -138.5t-109.5 -111t-165 -44.5l-40 -172h-83l43 172q-83 0 -136.5 44.5t-53.5 121.5q0 112 81 199t198 87h25l-5 -16q-86 -9 -150.5 -88.5t-64.5 -177.5q0 -59 33 -99.5t80 -40.5zM380 238l-53 -219 q73 0 146.5 87t73.5 183q0 55 -12 74t-32 19q-36 0 -72 -41.5t-51 -102.5z" />
+<glyph unicode="&#x1d712;" horiz-adv-x="595" d="M645 428l-290 -343q0 -131 9 -177t32 -46q29 0 54 67h16q-34 -131 -102 -131q-55 0 -55 112q0 34 7 125l-185 -218h-101l296 349v78q0 70 -12 101.5t-40 31.5q-33 0 -57 -66h-16q16 59 39 94.5t63 35.5q56 0 56 -138q0 -21 -1 -31l-4 -72l191 228h100z" />
+<glyph unicode="&#x1d713;" horiz-adv-x="661" d="M711 439v-16q-23 -3 -42 -13t-33 -29t-23.5 -35.5t-18.5 -44.5t-13 -45l-11 -46q-22 -96 -98.5 -158.5t-169.5 -62.5l-42 -172h-81l43 172h-10q-66 0 -109.5 39.5t-43.5 125.5q0 27 16 87.5t16 95.5q0 80 -61 86l5 16q19 2 55 2q41 0 64.5 -32.5t23.5 -78.5 q0 -28 -15.5 -92t-15.5 -93q0 -55 22 -88t61 -38l100 409h81l-100 -409q58 11 105 60t65 127l11 46l11 40q8 30 15 42l18 32q12 22 25 31.5t31 21t41.5 16t51.5 4.5h26z" />
+<glyph unicode="&#x1d714;" horiz-adv-x="681" d="M465 425l6 16q190 0 190 -161q0 -120 -80 -205.5t-165 -85.5q-44 0 -72.5 25t-31.5 64q-73 -89 -154 -89q-48 0 -80.5 27t-45 61.5t-12.5 72.5q0 123 83.5 207t214.5 84h16l3 -16q-93 0 -164 -93.5t-71 -219.5q0 -37 18 -65t50 -28q41 0 78.5 34t48.5 71q-3 22 -3 51 q0 41 8.5 81t32 72.5t56.5 32.5q14 0 23.5 -14t9.5 -33q0 -82 -78 -195q0 -43 16.5 -71.5t53.5 -28.5q41 0 81 51t62 114t22 108q0 69 -27.5 97.5t-88.5 35.5z" />
+<glyph unicode="&#x1d715;" horiz-adv-x="471" d="M195 625l-10 20q38 23 98 23q188 0 188 -260q0 -49 -8 -101t-29 -110t-53 -103.5t-85 -75t-120 -29.5q-69 0 -102.5 46t-33.5 116q0 109 75.5 196.5t181.5 87.5q69 0 96 -48q7 39 7 70q0 77 -30.5 129t-100.5 52q-33 0 -74 -13zM367 319q0 44 -18.5 65t-42.5 21 q-73 0 -129 -90.5t-56 -197.5q0 -98 67 -98q54 0 97.5 59t66.5 143q15 55 15 98z" />
+<glyph unicode="&#x1d716;" horiz-adv-x="430" d="M430 441l-19 -132h-15q-16 105 -93 105q-56 0 -98.5 -51.5t-62.5 -115.5h181l-5 -36h-185q-7 -20 -7 -66q0 -47 25 -74t67 -27q74 0 144 68l12 -14q-46 -52 -91.5 -80.5t-102.5 -28.5q-67 0 -103.5 43t-36.5 109q0 72 34 140.5t97.5 114t137.5 45.5q27 0 49.5 -10 t33.5 -10q14 0 23 20h15z" />
+<glyph unicode="&#x1d717;" horiz-adv-x="554" d="M33 205l-13 9q72 106 131 106q44 0 44 -45q0 -30 -18.5 -89.5t-18.5 -96.5q0 -78 57 -78q107 0 168 212q-88 38 -148 109.5t-60 159.5q0 81 48.5 133.5t128.5 52.5q78 0 116.5 -57.5t38.5 -139.5q0 -129 -47 -257q40 -13 45 -14l-5 -19q-20 1 -49 8q-87 -209 -239 -209 q-134 0 -134 104q0 12 1.5 23.5t5 25.5t5.5 21l8 25l8 23q8 24 8 39q0 14 -12 14q-21 0 -69 -60zM423 484q0 161 -79 161q-31 0 -51.5 -27t-27 -58t-6.5 -62q0 -75 35.5 -139.5t98.5 -102.5q30 123 30 228z" />
+<glyph unicode="&#x1d718;" horiz-adv-x="561" d="M587 428l-156 -145q-22 -36 -42 -86q-21 -54 -21 -84q0 -41 49 -41q51 0 51 -38q0 -20 -17 -34q-16 -13 -42 -13q-37 0 -61 26q-22 23 -22 61q0 60 48 154l-1 1l-252 -229h-109l148 136q16 26 35 90q20 66 20 100q0 28 -26 28q-27 0 -38 6q-17 11 -17 36q0 22 21 35 q14 10 32 10q68 0 68 -77q0 -72 -45 -181l1 -1l268 246h108z" />
+<glyph unicode="&#x1d719;" horiz-adv-x="645" d="M480 668l-55 -228q86 0 140.5 -36.5t54.5 -118.5q0 -118 -80 -204q-85 -92 -226 -92l-48 -172h-81l46 172q-85 0 -138 44t-53 127q0 110 84 196q83 84 205 84h16q32 127 53 228h82zM418 411l-97 -392q86 0 150 86t64 175q0 63 -28 97.5t-89 33.5zM240 19l99 392 q-93 0 -154 -79t-61 -174q0 -51 33 -95t83 -44z" />
+<glyph unicode="&#x1d71a;" horiz-adv-x="509" d="M221 -187l-14 7q4 7 4 16q0 13 -15 24.5t-34.5 20t-44.5 24t-40 32.5q-37 43 -37 122q0 108 82 233q41 62 99.5 105.5t126.5 43.5t104.5 -42t36.5 -112q0 -115 -73.5 -206t-194.5 -91q-53 0 -86 30.5t-33 75.5h-2q-6 -22 -6 -44q0 -34 14.5 -57.5t35 -36.5t41 -24t35 -28 t14.5 -41q0 -23 -13 -52zM409 324q0 34 -15.5 61t-48.5 27q-64 0 -126.5 -91.5t-62.5 -193.5q0 -39 17.5 -73.5t52.5 -34.5q44 0 81 36t58 87t32.5 100t11.5 82z" />
+<glyph unicode="&#x1d71b;" horiz-adv-x="856" d="M866 428l-22 -73h-80q18 -35 18 -83q0 -61 -23.5 -115.5t-60 -90t-79.5 -56.5t-82 -21q-44 0 -72.5 24t-31.5 62q-71 -86 -154 -86q-70 0 -104 48.5t-34 109.5q0 123 90 208h-50q-76 0 -135 -87h-16q22 63 80 111.5t127 48.5h629zM690 355h-371q-96 -93 -96 -246 q0 -37 18 -63.5t50 -26.5q41 0 79 32.5t48 69.5q-4 30 -4 51q0 149 69 149q18 0 29 -14.5t11 -41.5q0 -68 -56 -149q0 -97 70 -97q41 0 81 49t62 110t22 106q0 42 -12 71z" />
+</font>
+</defs></svg> 
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/stixgeneral-bundle/stixgeneralitalic-webfont.ttf b/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/stixgeneral-bundle/stixgeneralitalic-webfont.ttf
new file mode 100644
index 0000000..256bf6c
Binary files /dev/null and b/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/stixgeneral-bundle/stixgeneralitalic-webfont.ttf differ
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/stixgeneral-bundle/stixgeneralitalic-webfont.woff b/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/stixgeneral-bundle/stixgeneralitalic-webfont.woff
new file mode 100644
index 0000000..c6d5aae
Binary files /dev/null and b/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/font/stixgeneral-bundle/stixgeneralitalic-webfont.woff differ
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/mathquill.css b/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/mathquill.css
new file mode 100644
index 0000000..adf27ea
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/mathquill.css
@@ -0,0 +1,357 @@
+/*
+ * LaTeX Math in pure HTML and CSS -- No images whatsoever
+ * v0.xa
+ * by Jay and Han
+ * Lesser GPL Licensed: http: //www.gnu.org/licenses/lgpl.html
+ *
+ * This file is automatically included by mathquill.js
+ *
+ */
+@font-face {
+  font-family: Symbola;
+  src: url(font/Symbola.eot);
+  src: local("Symbola Regular"), local("Symbola"), url(font/Symbola.ttf) format("truetype"), url(font/Symbola.otf) format("opentype"), url(font/Symbola.svg#Symbola) format("svg");
+}
+.mathquill-editable {
+  display: -moz-inline-box;
+  display: inline-block;
+  white-space: pre-wrap;
+}
+.mathquill-editable .cursor {
+  border-left: 1px solid black;
+  margin-right: -1px;
+  position: relative;
+  z-index: 1;
+  padding: 0;
+  display: -moz-inline-box;
+  display: inline-block;
+}
+.mathquill-editable .cursor.blink {
+  visibility: hidden;
+}
+.mathquill-editable,
+.mathquill-embedded-latex .mathquill-editable {
+  border: 1px solid gray;
+  padding: 2px;
+}
+.mathquill-embedded-latex .mathquill-editable {
+  margin: 1px;
+}
+.mathquill-editable.hasCursor,
+.mathquill-editable .hasCursor {
+  -webkit-box-shadow: #68b4df 0 0 3px 2px;
+  -moz-box-shadow: #68b4df 0 0 3px 2px;
+  box-shadow: #68b4df 0 0 3px 2px;
+}
+.mathquill-editable .latex-command-input {
+  color: inherit;
+  font-family: "Courier New", monospace;
+  border: 1px solid gray;
+  padding-right: 1px;
+  margin-right: 1px;
+  margin-left: 2px;
+}
+.mathquill-editable .latex-command-input.empty {
+  background: transparent;
+}
+.mathquill-editable .latex-command-input.hasCursor {
+  border-color: ActiveBorder;
+}
+.mathquill-editable.empty:after,
+.mathquill-textbox:after,
+.mathquill-rendered-math .empty:after {
+  visibility: hidden;
+  content: 'c';
+}
+.mathquill-editable .cursor:only-child:after,
+.mathquill-editable .textarea + .cursor:last-child:after {
+  visibility: hidden;
+  content: 'c';
+}
+.mathquill-textbox {
+  overflow-x: auto;
+  overflow-y: hidden;
+}
+.mathquill-rendered-math {
+  font-variant: normal;
+  font-weight: normal;
+  font-style: normal;
+  font-size: 115%;
+  line-height: 1;
+  display: -moz-inline-box;
+  display: inline-block;
+}
+.mathquill-rendered-math .non-leaf,
+.mathquill-rendered-math .scaled {
+  display: -moz-inline-box;
+  display: inline-block;
+}
+.mathquill-rendered-math var,
+.mathquill-rendered-math .text,
+.mathquill-rendered-math .nonSymbola {
+  font-family: "Times New Roman", Symbola, serif;
+  line-height: .9;
+}
+.mathquill-rendered-math * {
+  font-size: inherit;
+  line-height: inherit;
+  margin: 0;
+  padding: 0;
+  border-color: black;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  user-select: none;
+}
+.mathquill-rendered-math .empty {
+  background: #ccc;
+}
+.mathquill-rendered-math.empty {
+  background: transparent;
+}
+.mathquill-rendered-math .text {
+  font-size: 87%;
+}
+.mathquill-rendered-math .font {
+  font: 1em "Times New Roman", Symbola, serif;
+}
+.mathquill-rendered-math .font * {
+  font-family: inherit;
+  font-style: inherit;
+}
+.mathquill-rendered-math b,
+.mathquill-rendered-math b.font {
+  font-weight: bolder;
+}
+.mathquill-rendered-math var,
+.mathquill-rendered-math i,
+.mathquill-rendered-math i.font {
+  font-syle: italic;
+}
+.mathquill-rendered-math var.florin {
+  margin: 0 -0.1em;
+}
+.mathquill-rendered-math big {
+  font-size: 125%;
+}
+.mathquill-rendered-math .roman {
+  font-style: normal;
+}
+.mathquill-rendered-math .sans-serif {
+  font-family: sans-serif, Symbola, serif;
+}
+.mathquill-rendered-math .monospace {
+  font-family: monospace, Symbola, serif;
+}
+.mathquill-rendered-math .overline {
+  border-top: 1px solid black;
+  margin-top: 1px;
+}
+.mathquill-rendered-math .underline {
+  border-bottom: 1px solid black;
+  margin-bottom: 1px;
+}
+.mathquill-rendered-math .binary-operator {
+  padding: 0 0.2em;
+  display: -moz-inline-box;
+  display: inline-block;
+}
+.mathquill-rendered-math .unary-operator {
+  padding-left: 0.2em;
+}
+.mathquill-rendered-math sup,
+.mathquill-rendered-math sub {
+  position: relative;
+  font-size: 90%;
+}
+.mathquill-rendered-math sup .binary-operator,
+.mathquill-rendered-math sub .binary-operator {
+  padding: 0 .1em;
+}
+.mathquill-rendered-math sup .unary-operator,
+.mathquill-rendered-math sub .unary-operator {
+  padding-left: .1em;
+}
+.mathquill-rendered-math sup.limit,
+.mathquill-rendered-math sub.limit,
+.mathquill-rendered-math sup.nthroot,
+.mathquill-rendered-math sub.nthroot {
+  font-size: 80%;
+}
+.mathquill-rendered-math sup .fraction,
+.mathquill-rendered-math sub .fraction {
+  font-size: 70%;
+  vertical-align: -0.4em;
+}
+.mathquill-rendered-math sup .numerator,
+.mathquill-rendered-math sub .numerator {
+  padding-bottom: 0;
+}
+.mathquill-rendered-math sup .denominator,
+.mathquill-rendered-math sub .denominator {
+  padding-top: 0;
+}
+.mathquill-rendered-math sup {
+  vertical-align: .5em;
+}
+.mathquill-rendered-math sup.limit,
+.mathquill-rendered-math sup.nthroot {
+  vertical-align: 0.8em;
+}
+.mathquill-rendered-math sup.nthroot {
+  margin-right: -0.6em;
+  margin-left: .2em;
+  min-width: .5em;
+}
+.mathquill-rendered-math sub {
+  vertical-align: -0.4em;
+}
+.mathquill-rendered-math sub.limit {
+  vertical-align: -0.6em;
+}
+.mathquill-rendered-math .paren {
+  padding: 0 .1em;
+  vertical-align: bottom;
+  -webkit-transform-origin: bottom center;
+  -moz-transform-origin: bottom center;
+  -ms-transform-origin: bottom center;
+  -o-transform-origin: bottom center;
+  transform-origin: bottom center;
+}
+.mathquill-rendered-math .array {
+  vertical-align: middle;
+  text-align: center;
+}
+.mathquill-rendered-math .array > span {
+  display: block;
+}
+.mathquill-rendered-math .non-italicized-function {
+  font-family: Symbola, "Times New Roman", serif;
+  line-height: .9;
+  font-style: normal;
+  padding-right: .2em;
+}
+.mathquill-rendered-math .fraction {
+  font-size: 90%;
+  text-align: center;
+  vertical-align: -0.5em;
+  padding: 0 .2em;
+}
+.mathquill-rendered-math .fraction,
+.mathquill-rendered-math x:-moz-any-link {
+  display: -moz-groupbox;
+}
+.mathquill-rendered-math .fraction,
+.mathquill-rendered-math x:-moz-any-link,
+.mathquill-rendered-math x:default {
+  display: inline-block;
+}
+.mathquill-rendered-math .numerator,
+.mathquill-rendered-math .denominator {
+  display: block;
+}
+.mathquill-rendered-math .numerator {
+  padding: 0 0.1em;
+  margin-bottom: -0.1em;
+}
+.mathquill-rendered-math .denominator {
+  border-top: 1px solid;
+  float: right;
+  width: 100%;
+  padding: .1em .1em 0 .1em;
+  margin-right: -0.1em;
+  margin-left: -0.1em;
+}
+.mathquill-rendered-math .sqrt-prefix {
+  padding-top: 0;
+  position: relative;
+  top: .1em;
+  vertical-align: top;
+  -webkit-transform-origin: top;
+  -moz-transform-origin: top;
+  -ms-transform-origin: top;
+  -o-transform-origin: top;
+  transform-origin: top;
+}
+.mathquill-rendered-math .sqrt-stem {
+  border-top: 1px solid;
+  margin-top: 1px;
+  padding-left: .15em;
+  padding-right: .2em;
+  margin-right: .1em;
+}
+.mathquill-rendered-math .vector-prefix {
+  display: block;
+  text-align: center;
+  line-height: .25em;
+  margin-bottom: -0.1em;
+  font-size: 0.75em;
+}
+.mathquill-rendered-math .vector-stem {
+  display: block;
+}
+.mathquill-rendered-math,
+.mathquill-rendered-math .mathquill-editable {
+  cursor: text;
+  font-family: Symbola, "Times New Roman", serif;
+}
+.mathquill-rendered-math .selection,
+.mathquill-editable .selection,
+.mathquill-rendered-math .selection .non-leaf,
+.mathquill-editable .selection .non-leaf,
+.mathquill-rendered-math .selection .scaled,
+.mathquill-editable .selection .scaled {
+  background: #B4D5FE !important;
+  background: Highlight !important;
+  color: HighlightText;
+  border-color: HighlightText;
+}
+.mathquill-rendered-math .selection .matrixed,
+.mathquill-editable .selection .matrixed {
+  background: #39F !important;
+}
+.mathquill-rendered-math .selection .matrixed-container,
+.mathquill-editable .selection .matrixed-container {
+  filter: progid:DXImageTransform.Microsoft.Chroma(color='#3399FF') !important;
+}
+.mathquill-rendered-math .selection.blur,
+.mathquill-editable .selection.blur,
+.mathquill-rendered-math .selection.blur .non-leaf,
+.mathquill-editable .selection.blur .non-leaf,
+.mathquill-rendered-math .selection.blur .scaled,
+.mathquill-editable .selection.blur .scaled,
+.mathquill-rendered-math .selection.blur .matrixed,
+.mathquill-editable .selection.blur .matrixed {
+  background: #D4D4D4 !important;
+  color: black;
+  border-color: black;
+}
+.mathquill-rendered-math .selection.blur .matrixed-container,
+.mathquill-editable .selection.blur .matrixed-container {
+  filter: progid:DXImageTransform.Microsoft.Chroma(color='#D4D4D4') !important;
+}
+.mathquill-editable .textarea,
+.mathquill-rendered-math .textarea {
+  position: relative;
+  -webkit-user-select: text;
+  -moz-user-select: text;
+  user-select: text;
+}
+.mathquill-editable .textarea textarea,
+.mathquill-rendered-math .textarea textarea,
+.mathquill-editable .selectable,
+.mathquill-rendered-math .selectable {
+  -webkit-user-select: text;
+  -moz-user-select: text;
+  user-select: text;
+  position: absolute;
+  clip: rect(1em 1em 1em 1em);
+}
+.mathquill-rendered-math .matrixed {
+  background: white;
+  display: -moz-inline-box;
+  display: inline-block;
+}
+.mathquill-rendered-math .matrixed-container {
+  filter: progid:DXImageTransform.Microsoft.Chroma(color='white');
+  margin-top: -0.1em;
+}
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/mathquill.js b/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/mathquill.js
new file mode 100644
index 0000000..5c8b991
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/mathquill.js
@@ -0,0 +1,3888 @@
+/**
+ * Copyleft 2010-2011 Jay and Han (laughinghan@gmail.com)
+ *   under the GNU Lesser General Public License
+ *     http://www.gnu.org/licenses/lgpl.html
+ * Project Website: http://mathquill.com
+ */
+
+(function() {
+
+var jQuery = window.jQuery,
+  undefined,
+  _, //temp variable of prototypes
+  mqCmdId = 'mathquill-command-id',
+  mqBlockId = 'mathquill-block-id',
+  min = Math.min,
+  max = Math.max;
+
+var __slice = [].slice;
+
+function noop() {}
+
+/**
+ * sugar to make defining lots of commands easier.
+ * TODO: rethink this.
+ */
+function bind(cons /*, args... */) {
+  var args = __slice.call(arguments, 1);
+  return function() {
+    return cons.apply(this, args);
+  };
+}
+
+/**
+ * a development-only debug method.  This definition and all
+ * calls to `pray` will be stripped from the minified
+ * build of mathquill.
+ *
+ * This function must be called by name to be removed
+ * at compile time.  Do not define another function
+ * with the same name, and only call this function by
+ * name.
+ */
+function pray(message, cond) {
+  if (!cond) throw new Error('prayer failed: '+message);
+}
+var P = (function(prototype, ownProperty, undefined) {
+  // helper functions that also help minification
+  function isObject(o) { return typeof o === 'object'; }
+  function isFunction(f) { return typeof f === 'function'; }
+
+  // a function that gets reused to make uninitialized objects
+  function BareConstructor() {}
+
+  function P(_superclass /* = Object */, definition) {
+    // handle the case where no superclass is given
+    if (definition === undefined) {
+      definition = _superclass;
+      _superclass = Object;
+    }
+
+    // C is the class to be returned.
+    //
+    // It delegates to instantiating an instance of `Bare`, so that it
+    // will always return a new instance regardless of the calling
+    // context.
+    //
+    //  TODO: the Chrome inspector shows all created objects as `C`
+    //        rather than `Object`.  Setting the .name property seems to
+    //        have no effect.  Is there a way to override this behavior?
+    function C() {
+      var self = new Bare;
+      if (isFunction(self.init)) self.init.apply(self, arguments);
+      return self;
+    }
+
+    // C.Bare is a class with a noop constructor.  Its prototype is the
+    // same as C, so that instances of C.Bare are also instances of C.
+    // New objects can be allocated without initialization by calling
+    // `new MyClass.Bare`.
+    function Bare() {}
+    C.Bare = Bare;
+
+    // Set up the prototype of the new class.
+    var _super = BareConstructor[prototype] = _superclass[prototype];
+    var proto = Bare[prototype] = C[prototype] = new BareConstructor;
+
+    // other variables, as a minifier optimization
+    var extensions;
+
+
+    // set the constructor property on the prototype, for convenience
+    proto.constructor = C;
+
+    C.mixin = function(def) {
+      Bare[prototype] = C[prototype] = P(C, def)[prototype];
+      return C;
+    }
+
+    return (C.open = function(def) {
+      extensions = {};
+
+      if (isFunction(def)) {
+        // call the defining function with all the arguments you need
+        // extensions captures the return value.
+        extensions = def.call(C, proto, _super, C, _superclass);
+      }
+      else if (isObject(def)) {
+        // if you passed an object instead, we'll take it
+        extensions = def;
+      }
+
+      // ...and extend it
+      if (isObject(extensions)) {
+        for (var ext in extensions) {
+          if (ownProperty.call(extensions, ext)) {
+            proto[ext] = extensions[ext];
+          }
+        }
+      }
+
+      // if there's no init, we assume we're inheriting a non-pjs class, so
+      // we default to applying the superclass's constructor.
+      if (!isFunction(proto.init)) {
+        proto.init = _superclass;
+      }
+
+      return C;
+    })(definition);
+  }
+
+  // ship it
+  return P;
+
+  // as a minifier optimization, we've closured in a few helper functions
+  // and the string 'prototype' (C[p] is much shorter than C.prototype)
+})('prototype', ({}).hasOwnProperty);
+/*************************************************
+ * Textarea Manager
+ *
+ * An abstraction layer wrapping the textarea in
+ * an object with methods to manipulate and listen
+ * to events on, that hides all the nasty cross-
+ * browser incompatibilities behind a uniform API.
+ *
+ * Design goal: This is a *HARD* internal
+ * abstraction barrier. Cross-browser
+ * inconsistencies are not allowed to leak through
+ * and be dealt with by event handlers. All future
+ * cross-browser issues that arise must be dealt
+ * with here, and if necessary, the API updated.
+ *
+ * Organization:
+ * - key values map and stringify()
+ * - manageTextarea()
+ *    + defer() and flush()
+ *    + event handler logic
+ *    + attach event handlers and export methods
+ ************************************************/
+
+var manageTextarea = (function() {
+  // The following [key values][1] map was compiled from the
+  // [DOM3 Events appendix section on key codes][2] and
+  // [a widely cited report on cross-browser tests of key codes][3],
+  // except for 10: 'Enter', which I've empirically observed in Safari on iOS
+  // and doesn't appear to conflict with any other known key codes.
+  //
+  // [1]: http://www.w3.org/TR/2012/WD-DOM-Level-3-Events-20120614/#keys-keyvalues
+  // [2]: http://www.w3.org/TR/2012/WD-DOM-Level-3-Events-20120614/#fixed-virtual-key-codes
+  // [3]: http://unixpapa.com/js/key.html
+  var KEY_VALUES = {
+    8: 'Backspace',
+    9: 'Tab',
+
+    10: 'Enter', // for Safari on iOS
+
+    13: 'Enter',
+
+    16: 'Shift',
+    17: 'Control',
+    18: 'Alt',
+    20: 'CapsLock',
+
+    27: 'Esc',
+
+    32: 'Spacebar',
+
+    33: 'PageUp',
+    34: 'PageDown',
+    35: 'End',
+    36: 'Home',
+
+    37: 'Left',
+    38: 'Up',
+    39: 'Right',
+    40: 'Down',
+
+    45: 'Insert',
+
+    46: 'Del',
+
+    144: 'NumLock'
+  };
+
+  // To the extent possible, create a normalized string representation
+  // of the key combo (i.e., key code and modifier keys).
+  function stringify(evt) {
+    var which = evt.which || evt.keyCode;
+    var keyVal = KEY_VALUES[which];
+    var key;
+    var modifiers = [];
+
+    if (evt.ctrlKey) modifiers.push('Ctrl');
+    if (evt.originalEvent && evt.originalEvent.metaKey) modifiers.push('Meta');
+    if (evt.altKey) modifiers.push('Alt');
+    if (evt.shiftKey) modifiers.push('Shift');
+
+    key = keyVal || String.fromCharCode(which);
+
+    if (!modifiers.length && !keyVal) return key;
+
+    modifiers.push(key);
+    return modifiers.join('-');
+  }
+
+  // create a textarea manager that calls callbacks at useful times
+  // and exports useful public methods
+  return function manageTextarea(el, opts) {
+    var keydown = null;
+    var keypress = null;
+
+    if (!opts) opts = {};
+    var textCallback = opts.text || noop;
+    var keyCallback = opts.key || noop;
+    var pasteCallback = opts.paste || noop;
+    var onCut = opts.cut || noop;
+
+    var textarea = jQuery(el);
+    var target = jQuery(opts.container || textarea);
+
+    // checkTextareaFor() is called after keypress or paste events to
+    // say "Hey, I think something was just typed" or "pasted" (resp.),
+    // so that at all subsequent opportune times (next event or timeout),
+    // will check for expected typed or pasted text.
+    // Need to check repeatedly because #135: in Safari 5.1 (at least),
+    // after selecting something and then typing, the textarea is
+    // incorrectly reported as selected during the input event (but not
+    // subsequently).
+    var checkTextarea = noop, timeoutId;
+    function checkTextareaFor(checker) {
+      checkTextarea = checker;
+      clearTimeout(timeoutId);
+      timeoutId = setTimeout(checker);
+    }
+    target.bind('keydown keypress input keyup focusout paste', function() { checkTextarea(); });
+
+
+    // -*- public methods -*- //
+    function select(text) {
+      // check textarea at least once/one last time before munging (so
+      // no race condition if selection happens after keypress/paste but
+      // before checkTextarea), then never again ('cos it's been munged)
+      checkTextarea();
+      checkTextarea = noop;
+      clearTimeout(timeoutId);
+
+      textarea.val(text);
+      if (text) textarea[0].select();
+    }
+
+    // -*- helper subroutines -*- //
+
+    // Determine whether there's a selection in the textarea.
+    // This will always return false in IE < 9, which don't support
+    // HTMLTextareaElement::selection{Start,End}.
+    function hasSelection() {
+      var dom = textarea[0];
+
+      if (!('selectionStart' in dom)) return false;
+      return dom.selectionStart !== dom.selectionEnd;
+    }
+
+    function popText(callback) {
+      var text = textarea.val();
+      textarea.val('');
+      if (text) callback(text);
+    }
+
+    function handleKey() {
+      keyCallback(stringify(keydown), keydown);
+    }
+
+    // -*- event handlers -*- //
+    function onKeydown(e) {
+      keydown = e;
+      keypress = null;
+
+      handleKey();
+    }
+
+    function onKeypress(e) {
+      // call the key handler for repeated keypresses.
+      // This excludes keypresses that happen directly
+      // after keydown.  In that case, there will be
+      // no previous keypress, so we skip it here
+      if (keydown && keypress) handleKey();
+
+      keypress = e;
+
+      checkTextareaFor(typedText);
+    }
+    function typedText() {
+      // If there is a selection, the contents of the textarea couldn't
+      // possibly have just been typed in.
+      // This happens in browsers like Firefox and Opera that fire
+      // keypress for keystrokes that are not text entry and leave the
+      // selection in the textarea alone, such as Ctrl-C.
+      // Note: we assume that browsers that don't support hasSelection()
+      // also never fire keypress on keystrokes that are not text entry.
+      // This seems reasonably safe because:
+      // - all modern browsers including IE 9+ support hasSelection(),
+      //   making it extremely unlikely any browser besides IE < 9 won't
+      // - as far as we know IE < 9 never fires keypress on keystrokes
+      //   that aren't text entry, which is only as reliable as our
+      //   tests are comprehensive, but the IE < 9 way to do
+      //   hasSelection() is poorly documented and is also only as
+      //   reliable as our tests are comprehensive
+      // If anything like #40 or #71 is reported in IE < 9, see
+      // b1318e5349160b665003e36d4eedd64101ceacd8
+      if (hasSelection()) return;
+
+      popText(textCallback);
+    }
+
+    function onBlur() { keydown = keypress = null; }
+
+    function onPaste(e) {
+      // browsers are dumb.
+      //
+      // In Linux, middle-click pasting causes onPaste to be called,
+      // when the textarea is not necessarily focused.  We focus it
+      // here to ensure that the pasted text actually ends up in the
+      // textarea.
+      //
+      // It's pretty nifty that by changing focus in this handler,
+      // we can change the target of the default action.  (This works
+      // on keydown too, FWIW).
+      //
+      // And by nifty, we mean dumb (but useful sometimes).
+      textarea.focus();
+
+      checkTextareaFor(pastedText);
+    }
+    function pastedText() {
+      popText(pasteCallback);
+    }
+
+    // -*- attach event handlers -*- //
+    target.bind({
+      keydown: onKeydown,
+      keypress: onKeypress,
+      focusout: onBlur,
+      cut: onCut,
+      paste: onPaste
+    });
+
+    // -*- export public methods -*- //
+    return {
+      select: select
+    };
+  };
+}());
+var Parser = P(function(_, _super, Parser) {
+  // The Parser object is a wrapper for a parser function.
+  // Externally, you use one to parse a string by calling
+  //   var result = SomeParser.parse('Me Me Me! Parse Me!');
+  // You should never call the constructor, rather you should
+  // construct your Parser from the base parsers and the
+  // parser combinator methods.
+
+  function parseError(stream, message) {
+    if (stream) {
+      stream = "'"+stream+"'";
+    }
+    else {
+      stream = 'EOF';
+    }
+
+    throw 'Parse Error: '+message+' at '+stream;
+  }
+
+  _.init = function(body) { this._ = body; };
+
+  _.parse = function(stream) {
+    return this.skip(eof)._(stream, success, parseError);
+
+    function success(stream, result) { return result; }
+  };
+
+  // -*- primitive combinators -*- //
+  _.or = function(alternative) {
+    pray('or is passed a parser', alternative instanceof Parser);
+
+    var self = this;
+
+    return Parser(function(stream, onSuccess, onFailure) {
+      return self._(stream, onSuccess, failure);
+
+      function failure(newStream) {
+        return alternative._(stream, onSuccess, onFailure);
+      }
+    });
+  };
+
+  _.then = function(next) {
+    var self = this;
+
+    return Parser(function(stream, onSuccess, onFailure) {
+      return self._(stream, success, onFailure);
+
+      function success(newStream, result) {
+        var nextParser = (next instanceof Parser ? next : next(result));
+        pray('a parser is returned', nextParser instanceof Parser);
+        return nextParser._(newStream, onSuccess, onFailure);
+      }
+    });
+  };
+
+  // -*- optimized iterative combinators -*- //
+  _.many = function() {
+    var self = this;
+
+    return Parser(function(stream, onSuccess, onFailure) {
+      var xs = [];
+      while (self._(stream, success, failure));
+      return onSuccess(stream, xs);
+
+      function success(newStream, x) {
+        stream = newStream;
+        xs.push(x);
+        return true;
+      }
+
+      function failure() {
+        return false;
+      }
+    });
+  };
+
+  _.times = function(min, max) {
+    if (arguments.length < 2) max = min;
+    var self = this;
+
+    return Parser(function(stream, onSuccess, onFailure) {
+      var xs = [];
+      var result = true;
+      var failure;
+
+      for (var i = 0; i < min; i += 1) {
+        result = self._(stream, success, firstFailure);
+        if (!result) return onFailure(stream, failure);
+      }
+
+      for (; i < max && result; i += 1) {
+        result = self._(stream, success, secondFailure);
+      }
+
+      return onSuccess(stream, xs);
+
+      function success(newStream, x) {
+        xs.push(x);
+        stream = newStream;
+        return true;
+      }
+
+      function firstFailure(newStream, msg) {
+        failure = msg;
+        stream = newStream;
+        return false;
+      }
+
+      function secondFailure(newStream, msg) {
+        return false;
+      }
+    });
+  };
+
+  // -*- higher-level combinators -*- //
+  _.result = function(res) { return this.then(succeed(res)); };
+  _.atMost = function(n) { return this.times(0, n); };
+  _.atLeast = function(n) {
+    var self = this;
+    return self.times(n).then(function(start) {
+      return self.many().map(function(end) {
+        return start.concat(end);
+      });
+    });
+  };
+
+  _.map = function(fn) {
+    return this.then(function(result) { return succeed(fn(result)); });
+  };
+
+  _.skip = function(two) {
+    return this.then(function(result) { return two.result(result); });
+  };
+
+  // -*- primitive parsers -*- //
+  var string = this.string = function(str) {
+    var len = str.length;
+    var expected = "expected '"+str+"'";
+
+    return Parser(function(stream, onSuccess, onFailure) {
+      var head = stream.slice(0, len);
+
+      if (head === str) {
+        return onSuccess(stream.slice(len), head);
+      }
+      else {
+        return onFailure(stream, expected);
+      }
+    });
+  };
+
+  var regex = this.regex = function(re) {
+    pray('regexp parser is anchored', re.toString().charAt(1) === '^');
+
+    var expected = 'expected '+re;
+
+    return Parser(function(stream, onSuccess, onFailure) {
+      var match = re.exec(stream);
+
+      if (match) {
+        var result = match[0];
+        return onSuccess(stream.slice(result.length), result);
+      }
+      else {
+        return onFailure(stream, expected);
+      }
+    });
+  };
+
+  var succeed = Parser.succeed = function(result) {
+    return Parser(function(stream, onSuccess) {
+      return onSuccess(stream, result);
+    });
+  };
+
+  var fail = Parser.fail = function(msg) {
+    return Parser(function(stream, _, onFailure) {
+      return onFailure(stream, msg);
+    });
+  };
+
+  var letter = Parser.letter = regex(/^[a-z]/i);
+  var letters = Parser.letters = regex(/^[a-z]*/i);
+  var digit = Parser.digit = regex(/^[0-9]/);
+  var digits = Parser.digits = regex(/^[0-9]*/);
+  var whitespace = Parser.whitespace = regex(/^\s+/);
+  var optWhitespace = Parser.optWhitespace = regex(/^\s*/);
+
+  var any = Parser.any = Parser(function(stream, onSuccess, onFailure) {
+    if (!stream) return onFailure(stream, 'expected any character');
+
+    return onSuccess(stream.slice(1), stream.charAt(0));
+  });
+
+  var all = Parser.all = Parser(function(stream, onSuccess, onFailure) {
+    return onSuccess('', stream);
+  });
+
+  var eof = Parser.eof = Parser(function(stream, onSuccess, onFailure) {
+    if (stream) return onFailure(stream, 'expected EOF');
+
+    return onSuccess(stream, stream);
+  });
+});
+/*************************************************
+ * Base classes of the MathQuill virtual DOM tree
+ *
+ * Only doing tree node manipulation via these
+ * adopt/ disown methods guarantees well-formedness
+ * of the tree.
+ ************************************************/
+
+// L = 'left'
+// R = 'right'
+//
+// the contract is that they can be used as object properties
+// and (-L) === R, and (-R) === L.
+var L = -1;
+var R = 1;
+
+function prayDirection(dir) {
+  pray('a direction was passed', dir === L || dir === R);
+}
+
+/**
+ * Tiny extension of jQuery adding directionalized DOM manipulation methods.
+ *
+ * Funny how Pjs v3 almost just works with `jQuery.fn.init`.
+ *
+ * jQuery features that don't work on $:
+ *   - jQuery.*, like jQuery.ajax, obviously (Pjs doesn't and shouldn't
+ *                                            copy constructor properties)
+ *
+ *   - jQuery(function), the shortcut for `jQuery(document).ready(function)`,
+ *     because `jQuery.fn.init` is idiosyncratic and Pjs doing, essentially,
+ *     `jQuery.fn.init.apply(this, arguments)` isn't quite right, you need:
+ *
+ *       _.init = function(s, c) { jQuery.fn.init.call(this, s, c, $(document)); };
+ *
+ *     if you actually give a shit (really, don't bother),
+ *     see https://github.com/jquery/jquery/blob/1.7.2/src/core.js#L889
+ *
+ *   - jQuery(selector), because jQuery translates that to
+ *     `jQuery(document).find(selector)`, but Pjs doesn't (should it?) let
+ *     you override the result of a constructor call
+ *       + note that because of the jQuery(document) shortcut-ness, there's also
+ *         the 3rd-argument-needs-to-be-`$(document)` thing above, but the fix
+ *         for that (as can be seen above) is really easy. This problem requires
+ *         a way more intrusive fix
+ *
+ * And that's it! Everything else just magically works because jQuery internally
+ * uses `this.constructor()` everywhere (hence calling `$`), but never ever does
+ * `this.constructor.find` or anything like that, always doing `jQuery.find`.
+ */
+var $ = P(jQuery, function(_) {
+  _.insDirOf = function(dir, el) {
+    return dir === L ?
+      this.insertBefore(el.first()) : this.insertAfter(el.last());
+  };
+  _.insAtDirEnd = function(dir, el) {
+    return dir === L ? this.prependTo(el) : this.appendTo(el);
+  };
+});
+
+var Point = P(function(_) {
+  _.parent = 0;
+  _[L] = 0;
+  _[R] = 0;
+
+  _.init = function(parent, leftward, rightward) {
+    this.parent = parent;
+    this[L] = leftward;
+    this[R] = rightward;
+  };
+});
+
+/**
+ * MathQuill virtual-DOM tree-node abstract base class
+ */
+var Node = P(function(_) {
+  _[L] = 0;
+  _[R] = 0
+  _.parent = 0;
+
+  _.init = function() {
+    this.ends = {};
+    this.ends[L] = 0;
+    this.ends[R] = 0;
+  };
+
+  _.children = function() {
+    return Fragment(this.ends[L], this.ends[R]);
+  };
+
+  _.eachChild = function(fn) {
+    return this.children().each(fn);
+  };
+
+  _.foldChildren = function(fold, fn) {
+    return this.children().fold(fold, fn);
+  };
+
+  _.adopt = function(parent, leftward, rightward) {
+    Fragment(this, this).adopt(parent, leftward, rightward);
+    return this;
+  };
+
+  _.disown = function() {
+    Fragment(this, this).disown();
+    return this;
+  };
+});
+
+/**
+ * An entity outside the virtual tree with one-way pointers (so it's only a
+ * "view" of part of the tree, not an actual node/entity in the tree) that
+ * delimits a doubly-linked list of sibling nodes.
+ * It's like a fanfic love-child between HTML DOM DocumentFragment and the Range
+ * classes: like DocumentFragment, its contents must be sibling nodes
+ * (unlike Range, whose contents are arbitrary contiguous pieces of subtrees),
+ * but like Range, it has only one-way pointers to its contents, its contents
+ * have no reference to it and in fact may still be in the visible tree (unlike
+ * DocumentFragment, whose contents must be detached from the visible tree
+ * and have their 'parent' pointers set to the DocumentFragment).
+ */
+var Fragment = P(function(_) {
+  _.init = function(leftEnd, rightEnd) {
+    pray('no half-empty fragments', !leftEnd === !rightEnd);
+
+    this.ends = {};
+
+    if (!leftEnd) return;
+
+    pray('left end node is passed to Fragment', leftEnd instanceof Node);
+    pray('right end node is passed to Fragment', rightEnd instanceof Node);
+    pray('leftEnd and rightEnd have the same parent',
+         leftEnd.parent === rightEnd.parent);
+
+    this.ends[L] = leftEnd;
+    this.ends[R] = rightEnd;
+  };
+
+  function prayWellFormed(parent, leftward, rightward) {
+    pray('a parent is always present', parent);
+    pray('leftward is properly set up', (function() {
+      // either it's empty and `rightward` is the left end child (possibly empty)
+      if (!leftward) return parent.ends[L] === rightward;
+
+      // or it's there and its [R] and .parent are properly set up
+      return leftward[R] === rightward && leftward.parent === parent;
+    })());
+
+    pray('rightward is properly set up', (function() {
+      // either it's empty and `leftward` is the right end child (possibly empty)
+      if (!rightward) return parent.ends[R] === leftward;
+
+      // or it's there and its [L] and .parent are properly set up
+      return rightward[L] === leftward && rightward.parent === parent;
+    })());
+  }
+
+  _.adopt = function(parent, leftward, rightward) {
+    prayWellFormed(parent, leftward, rightward);
+
+    var self = this;
+    self.disowned = false;
+
+    var leftEnd = self.ends[L];
+    if (!leftEnd) return this;
+
+    var rightEnd = self.ends[R];
+
+    if (leftward) {
+      // NB: this is handled in the ::each() block
+      // leftward[R] = leftEnd
+    } else {
+      parent.ends[L] = leftEnd;
+    }
+
+    if (rightward) {
+      rightward[L] = rightEnd;
+    } else {
+      parent.ends[R] = rightEnd;
+    }
+
+    self.ends[R][R] = rightward;
+
+    self.each(function(el) {
+      el[L] = leftward;
+      el.parent = parent;
+      if (leftward) leftward[R] = el;
+
+      leftward = el;
+    });
+
+    return self;
+  };
+
+  _.disown = function() {
+    var self = this;
+    var leftEnd = self.ends[L];
+
+    // guard for empty and already-disowned fragments
+    if (!leftEnd || self.disowned) return self;
+
+    self.disowned = true;
+
+    var rightEnd = self.ends[R]
+    var parent = leftEnd.parent;
+
+    prayWellFormed(parent, leftEnd[L], leftEnd);
+    prayWellFormed(parent, rightEnd, rightEnd[R]);
+
+    if (leftEnd[L]) {
+      leftEnd[L][R] = rightEnd[R];
+    } else {
+      parent.ends[L] = rightEnd[R];
+    }
+
+    if (rightEnd[R]) {
+      rightEnd[R][L] = leftEnd[L];
+    } else {
+      parent.ends[R] = leftEnd[L];
+    }
+
+    return self;
+  };
+
+  _.each = function(fn) {
+    var self = this;
+    var el = self.ends[L];
+    if (!el) return self;
+
+    for (;el !== self.ends[R][R]; el = el[R]) {
+      if (fn.call(self, el) === false) break;
+    }
+
+    return self;
+  };
+
+  _.fold = function(fold, fn) {
+    this.each(function(el) {
+      fold = fn.call(this, fold, el);
+    });
+
+    return fold;
+  };
+});
+/*************************************************
+ * Abstract classes of math blocks and commands.
+ ************************************************/
+
+var uuid = (function() {
+  var id = 0;
+
+  return function() { return id += 1; };
+})();
+
+/**
+ * Math tree node base class.
+ * Some math-tree-specific extensions to Node.
+ * Both MathBlock's and MathCommand's descend from it.
+ */
+var MathElement = P(Node, function(_, _super) {
+  _.init = function(obj) {
+    _super.init.call(this);
+    this.id = uuid();
+    MathElement[this.id] = this;
+  };
+
+  _.toString = function() {
+    return '[MathElement '+this.id+']';
+  };
+
+  _.bubble = function(event /*, args... */) {
+    var args = __slice.call(arguments, 1);
+
+    for (var ancestor = this; ancestor; ancestor = ancestor.parent) {
+      var res = ancestor[event] && ancestor[event].apply(ancestor, args);
+      if (res === false) break;
+    }
+
+    return this;
+  };
+
+  _.postOrder = function(fn /*, args... */) {
+    var args = __slice.call(arguments, 1);
+
+    if (typeof fn === 'string') {
+      var methodName = fn;
+      fn = function(el) {
+        if (methodName in el) el[methodName].apply(el, args);
+      };
+    }
+
+    (function recurse(desc) {
+      desc.eachChild(recurse);
+      fn(desc);
+    })(this);
+  };
+
+  _.jQ = $();
+  _.jQadd = function(jQ) { this.jQ = this.jQ.add(jQ); };
+
+  this.jQize = function(html) {
+    // Sets the .jQ of the entire math subtree rooted at this command.
+    // Expects .createBlocks() to have been called already, since it
+    // calls .html().
+    var jQ = $(html);
+    jQ.find('*').andSelf().each(function() {
+      var jQ = $(this),
+        cmdId = jQ.attr('mathquill-command-id'),
+        blockId = jQ.attr('mathquill-block-id');
+      if (cmdId) MathElement[cmdId].jQadd(jQ);
+      if (blockId) MathElement[blockId].jQadd(jQ);
+    });
+    return jQ;
+  };
+
+  _.finalizeInsert = function() {
+    var self = this;
+    self.postOrder('finalizeTree');
+
+    // note: this order is important.
+    // empty elements need the empty box provided by blur to
+    // be present in order for their dimensions to be measured
+    // correctly in redraw.
+    self.postOrder('blur');
+
+    // adjust context-sensitive spacing
+    self.postOrder('respace');
+    if (self[R].respace) self[R].respace();
+    if (self[L].respace) self[L].respace();
+
+    self.postOrder('redraw');
+    self.bubble('redraw');
+  };
+});
+
+/**
+ * Commands and operators, like subscripts, exponents, or fractions.
+ * Descendant commands are organized into blocks.
+ */
+var MathCommand = P(MathElement, function(_, _super) {
+  _.init = function(ctrlSeq, htmlTemplate, textTemplate) {
+    var cmd = this;
+    _super.init.call(cmd);
+
+    if (!cmd.ctrlSeq) cmd.ctrlSeq = ctrlSeq;
+    if (htmlTemplate) cmd.htmlTemplate = htmlTemplate;
+    if (textTemplate) cmd.textTemplate = textTemplate;
+  };
+
+  // obvious methods
+  _.replaces = function(replacedFragment) {
+    replacedFragment.disown();
+    this.replacedFragment = replacedFragment;
+  };
+  _.isEmpty = function() {
+    return this.foldChildren(true, function(isEmpty, child) {
+      return isEmpty && child.isEmpty();
+    });
+  };
+
+  _.parser = function() {
+    var block = latexMathParser.block;
+    var self = this;
+
+    return block.times(self.numBlocks()).map(function(blocks) {
+      self.blocks = blocks;
+
+      for (var i = 0; i < blocks.length; i += 1) {
+        blocks[i].adopt(self, self.ends[R], 0);
+      }
+
+      return self;
+    });
+  };
+
+  // createLeftOf(cursor) and the methods it calls
+  _.createLeftOf = function(cursor) {
+    var cmd = this;
+    var replacedFragment = cmd.replacedFragment;
+
+    cmd.createBlocks();
+    MathElement.jQize(cmd.html());
+    if (replacedFragment) {
+      replacedFragment.adopt(cmd.ends[L], 0, 0);
+      replacedFragment.jQ.appendTo(cmd.ends[L].jQ);
+    }
+
+    cursor.jQ.before(cmd.jQ);
+    cursor[L] = cmd.adopt(cursor.parent, cursor[L], cursor[R]);
+
+    cmd.finalizeInsert(cursor);
+
+    cmd.placeCursor(cursor);
+  };
+  _.createBlocks = function() {
+    var cmd = this,
+      numBlocks = cmd.numBlocks(),
+      blocks = cmd.blocks = Array(numBlocks);
+
+    for (var i = 0; i < numBlocks; i += 1) {
+      var newBlock = blocks[i] = MathBlock();
+      newBlock.adopt(cmd, cmd.ends[R], 0);
+    }
+  };
+  _.respace = noop; //placeholder for context-sensitive spacing
+  _.placeCursor = function(cursor) {
+    //insert the cursor at the right end of the first empty child, searching
+    //left-to-right, or if none empty, the right end child
+    cursor.insAtRightEnd(this.foldChildren(this.ends[L], function(leftward, child) {
+      return leftward.isEmpty() ? leftward : child;
+    }));
+  };
+
+  // remove()
+  _.remove = function() {
+    this.disown();
+    this.jQ.remove();
+
+    this.postOrder(function(el) { delete MathElement[el.id]; });
+
+    return this;
+  };
+
+  // methods involved in creating and cross-linking with HTML DOM nodes
+  /*
+    They all expect an .htmlTemplate like
+      '<span>&0</span>'
+    or
+      '<span><span>&0</span><span>&1</span></span>'
+
+    See html.test.js for more examples.
+
+    Requirements:
+    - For each block of the command, there must be exactly one "block content
+      marker" of the form '&<number>' where <number> is the 0-based index of the
+      block. (Like the LaTeX \newcommand syntax, but with a 0-based rather than
+      1-based index, because JavaScript because C because Dijkstra.)
+    - The block content marker must be the sole contents of the containing
+      element, there can't even be surrounding whitespace, or else we can't
+      guarantee sticking to within the bounds of the block content marker when
+      mucking with the HTML DOM.
+    - The HTML not only must be well-formed HTML (of course), but also must
+      conform to the XHTML requirements on tags, specifically all tags must
+      either be self-closing (like '<br/>') or come in matching pairs.
+      Close tags are never optional.
+
+    Note that &<number> isn't well-formed HTML; if you wanted a literal '&123',
+    your HTML template would have to have '&amp;123'.
+  */
+  _.numBlocks = function() {
+    var matches = this.htmlTemplate.match(/&\d+/g);
+    return matches ? matches.length : 0;
+  };
+  _.html = function() {
+    // Render the entire math subtree rooted at this command, as HTML.
+    // Expects .createBlocks() to have been called already, since it uses the
+    // .blocks array of child blocks.
+    //
+    // See html.test.js for example templates and intended outputs.
+    //
+    // Given an .htmlTemplate as described above,
+    // - insert the mathquill-command-id attribute into all top-level tags,
+    //   which will be used to set this.jQ in .jQize().
+    //   This is straightforward:
+    //     * tokenize into tags and non-tags
+    //     * loop through top-level tokens:
+    //         * add #cmdId attribute macro to top-level self-closing tags
+    //         * else add #cmdId attribute macro to top-level open tags
+    //             * skip the matching top-level close tag and all tag pairs
+    //               in between
+    // - for each block content marker,
+    //     + replace it with the contents of the corresponding block,
+    //       rendered as HTML
+    //     + insert the mathquill-block-id attribute into the containing tag
+    //   This is even easier, a quick regex replace, since block tags cannot
+    //   contain anything besides the block content marker.
+    //
+    // Two notes:
+    // - The outermost loop through top-level tokens should never encounter any
+    //   top-level close tags, because we should have first encountered a
+    //   matching top-level open tag, all inner tags should have appeared in
+    //   matching pairs and been skipped, and then we should have skipped the
+    //   close tag in question.
+    // - All open tags should have matching close tags, which means our inner
+    //   loop should always encounter a close tag and drop nesting to 0. If
+    //   a close tag is missing, the loop will continue until i >= tokens.length
+    //   and token becomes undefined. This will not infinite loop, even in
+    //   production without pray(), because it will then TypeError on .slice().
+
+    var cmd = this;
+    var blocks = cmd.blocks;
+    var cmdId = ' mathquill-command-id=' + cmd.id;
+    var tokens = cmd.htmlTemplate.match(/<[^<>]+>|[^<>]+/g);
+
+    pray('no unmatched angle brackets', tokens.join('') === this.htmlTemplate);
+
+    // add cmdId to all top-level tags
+    for (var i = 0, token = tokens[0]; token; i += 1, token = tokens[i]) {
+      // top-level self-closing tags
+      if (token.slice(-2) === '/>') {
+        tokens[i] = token.slice(0,-2) + cmdId + '/>';
+      }
+      // top-level open tags
+      else if (token.charAt(0) === '<') {
+        pray('not an unmatched top-level close tag', token.charAt(1) !== '/');
+
+        tokens[i] = token.slice(0,-1) + cmdId + '>';
+
+        // skip matching top-level close tag and all tag pairs in between
+        var nesting = 1;
+        do {
+          i += 1, token = tokens[i];
+          pray('no missing close tags', token);
+          // close tags
+          if (token.slice(0,2) === '</') {
+            nesting -= 1;
+          }
+          // non-self-closing open tags
+          else if (token.charAt(0) === '<' && token.slice(-2) !== '/>') {
+            nesting += 1;
+          }
+        } while (nesting > 0);
+      }
+    }
+    return tokens.join('').replace(/>&(\d+)/g, function($0, $1) {
+      return ' mathquill-block-id=' + blocks[$1].id + '>' + blocks[$1].join('html');
+    });
+  };
+
+  // methods to export a string representation of the math tree
+  _.latex = function() {
+    return this.foldChildren(this.ctrlSeq, function(latex, child) {
+      return latex + '{' + (child.latex() || ' ') + '}';
+    });
+  };
+  _.textTemplate = [''];
+  _.text = function() {
+    var cmd = this, i = 0;
+    return cmd.foldChildren(cmd.textTemplate[i], function(text, child) {
+      i += 1;
+      var child_text = child.text();
+      if (text && cmd.textTemplate[i] === '('
+          && child_text[0] === '(' && child_text.slice(-1) === ')')
+        return text + child_text.slice(1, -1) + cmd.textTemplate[i];
+      return text + child.text() + (cmd.textTemplate[i] || '');
+    });
+  };
+});
+
+/**
+ * Lightweight command without blocks or children.
+ */
+var Symbol = P(MathCommand, function(_, _super) {
+  _.init = function(ctrlSeq, html, text) {
+    if (!text) text = ctrlSeq && ctrlSeq.length > 1 ? ctrlSeq.slice(1) : ctrlSeq;
+
+    _super.init.call(this, ctrlSeq, html, [ text ]);
+  };
+
+  _.parser = function() { return Parser.succeed(this); };
+  _.numBlocks = function() { return 0; };
+
+  _.replaces = function(replacedFragment) {
+    replacedFragment.remove();
+  };
+  _.createBlocks = noop;
+  _.latex = function(){ return this.ctrlSeq; };
+  _.text = function(){ return this.textTemplate; };
+  _.placeCursor = noop;
+  _.isEmpty = function(){ return true; };
+});
+
+/**
+ * Children and parent of MathCommand's. Basically partitions all the
+ * symbols and operators that descend (in the Math DOM tree) from
+ * ancestor operators.
+ */
+var MathBlock = P(MathElement, function(_) {
+  _.join = function(methodName) {
+    return this.foldChildren('', function(fold, child) {
+      return fold + child[methodName]();
+    });
+  };
+  _.latex = function() { return this.join('latex'); };
+  _.text = function() {
+    return this.ends[L] === this.ends[R] ?
+      this.ends[L].text() :
+      '(' + this.join('text') + ')'
+    ;
+  };
+  _.isEmpty = function() {
+    return this.ends[L] === 0 && this.ends[R] === 0;
+  };
+  _.write = function(cursor, ch, replacedFragment) {
+    var cmd;
+    if (ch.match(/^[a-eg-zA-Z]$/)) //exclude f because want florin
+      cmd = Variable(ch);
+    else if (cmd = CharCmds[ch] || LatexCmds[ch])
+      cmd = cmd(ch);
+    else
+      cmd = VanillaSymbol(ch);
+
+    if (replacedFragment) cmd.replaces(replacedFragment);
+
+    cmd.createLeftOf(cursor);
+  };
+  _.focus = function() {
+    this.jQ.addClass('hasCursor');
+    this.jQ.removeClass('empty');
+
+    return this;
+  };
+  _.blur = function() {
+    this.jQ.removeClass('hasCursor');
+    if (this.isEmpty())
+      this.jQ.addClass('empty');
+
+    return this;
+  };
+});
+
+/**
+ * Math tree fragment base class.
+ * Some math-tree-specific extensions to Fragment.
+ */
+var MathFragment = P(Fragment, function(_, _super) {
+  _.init = function(leftEnd, rightEnd) {
+    // just select one thing if only one argument
+    _super.init.call(this, leftEnd, rightEnd || leftEnd);
+    this.jQ = this.fold($(), function(jQ, child){ return child.jQ.add(jQ); });
+  };
+  _.latex = function() {
+    return this.fold('', function(latex, el){ return latex + el.latex(); });
+  };
+  _.remove = function() {
+    this.jQ.remove();
+
+    this.each(function(el) {
+      el.postOrder(function(desc) {
+        delete MathElement[desc.id];
+      });
+    });
+
+    return this.disown();
+  };
+});
+/*********************************************
+ * Root math elements with event delegation.
+ ********************************************/
+
+function createRoot(jQ, root, textbox, editable) {
+  var contents = jQ.contents().detach();
+
+  if (!textbox) {
+    jQ.addClass('mathquill-rendered-math');
+  }
+
+  root.jQ = jQ.attr(mqBlockId, root.id);
+  root.revert = function() {
+    jQ.empty().unbind('.mathquill')
+      .removeClass('mathquill-rendered-math mathquill-editable mathquill-textbox')
+      .append(contents);
+  };
+
+  var cursor = root.cursor = Cursor(root);
+
+  root.renderLatex(contents.text());
+
+  //textarea stuff
+  var textareaSpan = root.textarea = $('<span class="textarea"><textarea></textarea></span>'),
+    textarea = textareaSpan.children();
+
+  /******
+   * TODO [Han]: Document this
+   */
+  var textareaSelectionTimeout;
+  root.selectionChanged = function() {
+    if (textareaSelectionTimeout === undefined) {
+      textareaSelectionTimeout = setTimeout(setTextareaSelection);
+    }
+    forceIERedraw(jQ[0]);
+  };
+  function setTextareaSelection() {
+    textareaSelectionTimeout = undefined;
+    var latex = cursor.selection ? '$'+cursor.selection.latex()+'$' : '';
+    textareaManager.select(latex);
+  }
+
+  //prevent native selection except textarea
+  jQ.bind('selectstart.mathquill', function(e) {
+    if (e.target !== textarea[0]) e.preventDefault();
+    e.stopPropagation();
+  });
+
+  //drag-to-select event handling
+  var anticursor, blink = cursor.blink;
+  jQ.bind('mousedown.mathquill', function(e) {
+    function mousemove(e) {
+      cursor.seek($(e.target), e.pageX, e.pageY);
+
+      if (cursor[L] !== anticursor[L]
+          || cursor.parent !== anticursor.parent) {
+        cursor.selectFrom(anticursor);
+      }
+
+      return false;
+    }
+
+    // docmousemove is attached to the document, so that
+    // selection still works when the mouse leaves the window.
+    function docmousemove(e) {
+      // [Han]: i delete the target because of the way seek works.
+      // it will not move the mouse to the target, but will instead
+      // just seek those X and Y coordinates.  If there is a target,
+      // it will try to move the cursor to document, which will not work.
+      // cursor.seek needs to be refactored.
+      delete e.target;
+
+      return mousemove(e);
+    }
+
+    function mouseup(e) {
+      anticursor = undefined;
+      cursor.blink = blink;
+      if (!cursor.selection) {
+        if (editable) {
+          cursor.show();
+        }
+        else {
+          textareaSpan.detach();
+        }
+      }
+
+      // delete the mouse handlers now that we're not dragging anymore
+      jQ.unbind('mousemove', mousemove);
+      $(e.target.ownerDocument).unbind('mousemove', docmousemove).unbind('mouseup', mouseup);
+    }
+
+    setTimeout(function() { textarea.focus(); });
+      // preventDefault won't prevent focus on mousedown in IE<9
+      // that means immediately after this mousedown, whatever was
+      // mousedown-ed will receive focus
+      // http://bugs.jquery.com/ticket/10345
+
+    cursor.blink = noop;
+    cursor.seek($(e.target), e.pageX, e.pageY);
+
+    anticursor = Point(cursor.parent, cursor[L], cursor[R]);
+
+    if (!editable) jQ.prepend(textareaSpan);
+
+    jQ.mousemove(mousemove);
+    $(e.target.ownerDocument).mousemove(docmousemove).mouseup(mouseup);
+
+    return false;
+  });
+
+  if (!editable) {
+    var textareaManager = manageTextarea(textarea, { container: jQ });
+    jQ.bind('cut paste', false).bind('copy', setTextareaSelection)
+      .prepend('<span class="selectable">$'+root.latex()+'$</span>');
+    textarea.blur(function() {
+      cursor.clearSelection();
+      setTimeout(detach); //detaching during blur explodes in WebKit
+    });
+    function detach() {
+      textareaSpan.detach();
+    }
+    return;
+  }
+
+  var textareaManager = manageTextarea(textarea, {
+    container: jQ,
+    key: function(key, evt) {
+      cursor.parent.bubble('onKey', key, evt);
+    },
+    text: function(text) {
+      cursor.parent.bubble('onText', text);
+    },
+    cut: function(e) {
+      if (cursor.selection) {
+        setTimeout(function() {
+          cursor.prepareEdit();
+          cursor.parent.bubble('redraw');
+        });
+      }
+
+      e.stopPropagation();
+    },
+    paste: function(text) {
+      // FIXME HACK the parser in RootTextBlock needs to be moved to
+      // Cursor::writeLatex or something so this'll work with
+      // MathQuill textboxes
+      if (text.slice(0,1) === '$' && text.slice(-1) === '$') {
+        text = text.slice(1, -1);
+      }
+      else {
+        text = '\\text{' + text + '}';
+      }
+
+      cursor.writeLatex(text).show();
+    }
+  });
+
+  jQ.prepend(textareaSpan);
+
+  //root CSS classes
+  jQ.addClass('mathquill-editable');
+  if (textbox)
+    jQ.addClass('mathquill-textbox');
+
+  //focus and blur handling
+  textarea.focus(function(e) {
+    if (!cursor.parent)
+      cursor.insAtRightEnd(root);
+    cursor.parent.jQ.addClass('hasCursor');
+    if (cursor.selection) {
+      cursor.selection.jQ.removeClass('blur');
+      setTimeout(root.selectionChanged); //re-select textarea contents after tabbing away and back
+    }
+    else
+      cursor.show();
+    e.stopPropagation();
+  }).blur(function(e) {
+    cursor.hide().parent.blur();
+    if (cursor.selection)
+      cursor.selection.jQ.addClass('blur');
+    e.stopPropagation();
+  });
+
+  jQ.bind('focus.mathquill blur.mathquill', function(e) {
+    textarea.trigger(e);
+  }).blur();
+}
+
+var RootMathBlock = P(MathBlock, function(_, _super) {
+  _.latex = function() {
+    return _super.latex.call(this).replace(/(\\[a-z]+) (?![a-z])/ig,'$1');
+  };
+  _.text = function() {
+    return this.foldChildren('', function(text, child) {
+      return text + child.text();
+    });
+  };
+  _.renderLatex = function(latex) {
+    var jQ = this.jQ;
+
+    jQ.children().slice(1).remove();
+    this.ends[L] = this.ends[R] = 0;
+
+    delete this.cursor.selection;
+    this.cursor.insAtRightEnd(this).writeLatex(latex);
+  };
+  _.onKey = function(key, e) {
+    switch (key) {
+    case 'Ctrl-Shift-Backspace':
+    case 'Ctrl-Backspace':
+      while (this.cursor[L] || this.cursor.selection) {
+        this.cursor.backspace();
+      }
+      break;
+
+    case 'Shift-Backspace':
+    case 'Backspace':
+      this.cursor.backspace();
+      break;
+
+    // Tab or Esc -> go one block right if it exists, else escape right.
+    case 'Esc':
+    case 'Tab':
+    case 'Spacebar':
+      var parent = this.cursor.parent;
+      // cursor is in root editable, continue default
+      if (parent === this.cursor.root) {
+        if (key === 'Spacebar') e.preventDefault();
+        return;
+      }
+
+      this.cursor.prepareMove();
+      if (parent[R]) {
+        // go one block right
+        this.cursor.insAtLeftEnd(parent[R]);
+      } else {
+        // get out of the block
+        this.cursor.insRightOf(parent.parent);
+      }
+      break;
+
+    // Shift-Tab -> go one block left if it exists, else escape left.
+    case 'Shift-Tab':
+    case 'Shift-Esc':
+    case 'Shift-Spacebar':
+      var parent = this.cursor.parent;
+      //cursor is in root editable, continue default
+      if (parent === this.cursor.root) {
+        if (key === 'Shift-Spacebar') e.preventDefault();
+        return;
+      }
+
+      this.cursor.prepareMove();
+      if (parent[L]) {
+        // go one block left
+        this.cursor.insAtRightEnd(parent[L]);
+      } else {
+        //get out of the block
+        this.cursor.insLeftOf(parent.parent);
+      }
+      break;
+
+    // Prevent newlines from showing up
+    case 'Enter': break;
+
+
+    // End -> move to the end of the current block.
+    case 'End':
+      this.cursor.prepareMove().insAtRightEnd(this.cursor.parent);
+      break;
+
+    // Ctrl-End -> move all the way to the end of the root block.
+    case 'Ctrl-End':
+      this.cursor.prepareMove().insAtRightEnd(this);
+      break;
+
+    // Shift-End -> select to the end of the current block.
+    case 'Shift-End':
+      while (this.cursor[R]) {
+        this.cursor.selectRight();
+      }
+      break;
+
+    // Ctrl-Shift-End -> select to the end of the root block.
+    case 'Ctrl-Shift-End':
+      while (this.cursor[R] || this.cursor.parent !== this) {
+        this.cursor.selectRight();
+      }
+      break;
+
+    // Home -> move to the start of the root block or the current block.
+    case 'Home':
+      this.cursor.prepareMove().insAtLeftEnd(this.cursor.parent);
+      break;
+
+    // Ctrl-Home -> move to the start of the current block.
+    case 'Ctrl-Home':
+      this.cursor.prepareMove().insAtLeftEnd(this);
+      break;
+
+    // Shift-Home -> select to the start of the current block.
+    case 'Shift-Home':
+      while (this.cursor[L]) {
+        this.cursor.selectLeft();
+      }
+      break;
+
+    // Ctrl-Shift-Home -> move to the start of the root block.
+    case 'Ctrl-Shift-Home':
+      while (this.cursor[L] || this.cursor.parent !== this) {
+        this.cursor.selectLeft();
+      }
+      break;
+
+    case 'Left': this.cursor.moveLeft(); break;
+    case 'Shift-Left': this.cursor.selectLeft(); break;
+    case 'Ctrl-Left': break;
+
+    case 'Right': this.cursor.moveRight(); break;
+    case 'Shift-Right': this.cursor.selectRight(); break;
+    case 'Ctrl-Right': break;
+
+    case 'Up': this.cursor.moveUp(); break;
+    case 'Down': this.cursor.moveDown(); break;
+
+    case 'Shift-Up':
+      if (this.cursor[L]) {
+        while (this.cursor[L]) this.cursor.selectLeft();
+      } else {
+        this.cursor.selectLeft();
+      }
+
+    case 'Shift-Down':
+      if (this.cursor[R]) {
+        while (this.cursor[R]) this.cursor.selectRight();
+      }
+      else {
+        this.cursor.selectRight();
+      }
+
+    case 'Ctrl-Up': break;
+    case 'Ctrl-Down': break;
+
+    case 'Ctrl-Shift-Del':
+    case 'Ctrl-Del':
+      while (this.cursor[R] || this.cursor.selection) {
+        this.cursor.deleteForward();
+      }
+      break;
+
+    case 'Shift-Del':
+    case 'Del':
+      this.cursor.deleteForward();
+      break;
+
+    case 'Meta-A':
+    case 'Ctrl-A':
+      //so not stopPropagation'd at RootMathCommand
+      if (this !== this.cursor.root) return;
+
+      this.cursor.prepareMove().insAtRightEnd(this);
+      while (this.cursor[L]) this.cursor.selectLeft();
+      break;
+
+    default:
+      return false;
+    }
+    e.preventDefault();
+    return false;
+  };
+  _.onText = function(ch) {
+    this.cursor.write(ch);
+    return false;
+  };
+});
+
+var RootMathCommand = P(MathCommand, function(_, _super) {
+  _.init = function(cursor) {
+    _super.init.call(this, '$');
+    this.cursor = cursor;
+  };
+  _.htmlTemplate = '<span class="mathquill-rendered-math">&0</span>';
+  _.createBlocks = function() {
+    this.ends[L] =
+    this.ends[R] =
+      RootMathBlock();
+
+    this.blocks = [ this.ends[L] ];
+
+    this.ends[L].parent = this;
+
+    this.ends[L].cursor = this.cursor;
+    this.ends[L].write = function(cursor, ch, replacedFragment) {
+      if (ch !== '$')
+        MathBlock.prototype.write.call(this, cursor, ch, replacedFragment);
+      else if (this.isEmpty()) {
+        cursor.insRightOf(this.parent).backspace().show();
+        VanillaSymbol('\\$','$').createLeftOf(cursor);
+      }
+      else if (!cursor[R])
+        cursor.insRightOf(this.parent);
+      else if (!cursor[L])
+        cursor.insLeftOf(this.parent);
+      else
+        MathBlock.prototype.write.call(this, cursor, ch, replacedFragment);
+    };
+  };
+  _.latex = function() {
+    return '$' + this.ends[L].latex() + '$';
+  };
+});
+
+var RootTextBlock = P(MathBlock, function(_) {
+  _.renderLatex = function(latex) {
+    var self = this;
+    var cursor = self.cursor;
+    self.jQ.children().slice(1).remove();
+    self.ends[L] = self.ends[R] = 0;
+    delete cursor.selection;
+    cursor.show().insAtRightEnd(self);
+
+    var regex = Parser.regex;
+    var string = Parser.string;
+    var eof = Parser.eof;
+    var all = Parser.all;
+
+    // Parser RootMathCommand
+    var mathMode = string('$').then(latexMathParser)
+      // because TeX is insane, math mode doesn't necessarily
+      // have to end.  So we allow for the case that math mode
+      // continues to the end of the stream.
+      .skip(string('$').or(eof))
+      .map(function(block) {
+        // HACK FIXME: this shouldn't have to have access to cursor
+        var rootMathCommand = RootMathCommand(cursor);
+
+        rootMathCommand.createBlocks();
+        var rootMathBlock = rootMathCommand.ends[L];
+        block.children().adopt(rootMathBlock, 0, 0);
+
+        return rootMathCommand;
+      })
+    ;
+
+    var escapedDollar = string('\\$').result('$');
+    var textChar = escapedDollar.or(regex(/^[^$]/)).map(VanillaSymbol);
+    var latexText = mathMode.or(textChar).many();
+    var commands = latexText.skip(eof).or(all.result(false)).parse(latex);
+
+    if (commands) {
+      for (var i = 0; i < commands.length; i += 1) {
+        commands[i].adopt(self, self.ends[R], 0);
+      }
+
+      var html = self.join('html');
+      MathElement.jQize(html).appendTo(self.jQ);
+
+      this.finalizeInsert();
+    }
+  };
+  _.onKey = function(key) {
+    if (key === 'Spacebar' || key === 'Shift-Spacebar') return;
+    RootMathBlock.prototype.onKey.apply(this, arguments);
+  };
+  _.onText = RootMathBlock.prototype.onText;
+  _.write = function(cursor, ch, replacedFragment) {
+    if (replacedFragment) replacedFragment.remove();
+    if (ch === '$')
+      RootMathCommand(cursor).createLeftOf(cursor);
+    else {
+      var html;
+      if (ch === '<') html = '&lt;';
+      else if (ch === '>') html = '&gt;';
+      VanillaSymbol(ch, html).createLeftOf(cursor);
+    }
+  };
+});
+/***************************
+ * Commands and Operators.
+ **************************/
+
+var CharCmds = {}, LatexCmds = {}; //single character commands, LaTeX commands
+
+var scale, // = function(jQ, x, y) { ... }
+//will use a CSS 2D transform to scale the jQuery-wrapped HTML elements,
+//or the filter matrix transform fallback for IE 5.5-8, or gracefully degrade to
+//increasing the fontSize to match the vertical Y scaling factor.
+
+//ideas from http://github.com/louisremi/jquery.transform.js
+//see also http://msdn.microsoft.com/en-us/library/ms533014(v=vs.85).aspx
+
+  forceIERedraw = noop,
+  div = document.createElement('div'),
+  div_style = div.style,
+  transformPropNames = {
+    transform:1,
+    WebkitTransform:1,
+    MozTransform:1,
+    OTransform:1,
+    msTransform:1
+  },
+  transformPropName;
+
+for (var prop in transformPropNames) {
+  if (prop in div_style) {
+    transformPropName = prop;
+    break;
+  }
+}
+
+if (transformPropName) {
+  scale = function(jQ, x, y) {
+    jQ.css(transformPropName, 'scale('+x+','+y+')');
+  };
+}
+else if ('filter' in div_style) { //IE 6, 7, & 8 fallback, see https://github.com/laughinghan/mathquill/wiki/Transforms
+  forceIERedraw = function(el){ el.className = el.className; };
+  scale = function(jQ, x, y) { //NOTE: assumes y > x
+    x /= (1+(y-1)/2);
+    jQ.css('fontSize', y + 'em');
+    if (!jQ.hasClass('matrixed-container')) {
+      jQ.addClass('matrixed-container')
+      .wrapInner('<span class="matrixed"></span>');
+    }
+    var innerjQ = jQ.children()
+    .css('filter', 'progid:DXImageTransform.Microsoft'
+        + '.Matrix(M11=' + x + ",SizingMethod='auto expand')"
+    );
+    function calculateMarginRight() {
+      jQ.css('marginRight', (innerjQ.width()-1)*(x-1)/x + 'px');
+    }
+    calculateMarginRight();
+    var intervalId = setInterval(calculateMarginRight);
+    $(window).load(function() {
+      clearTimeout(intervalId);
+      calculateMarginRight();
+    });
+  };
+}
+else {
+  scale = function(jQ, x, y) {
+    jQ.css('fontSize', y + 'em');
+  };
+}
+
+var Style = P(MathCommand, function(_, _super) {
+  _.init = function(ctrlSeq, tagName, attrs) {
+    _super.init.call(this, ctrlSeq, '<'+tagName+' '+attrs+'>&0</'+tagName+'>');
+  };
+});
+
+//fonts
+LatexCmds.mathrm = bind(Style, '\\mathrm', 'span', 'class="roman font"');
+LatexCmds.mathit = bind(Style, '\\mathit', 'i', 'class="font"');
+LatexCmds.mathbf = bind(Style, '\\mathbf', 'b', 'class="font"');
+LatexCmds.mathsf = bind(Style, '\\mathsf', 'span', 'class="sans-serif font"');
+LatexCmds.mathtt = bind(Style, '\\mathtt', 'span', 'class="monospace font"');
+//text-decoration
+LatexCmds.underline = bind(Style, '\\underline', 'span', 'class="non-leaf underline"');
+LatexCmds.overline = LatexCmds.bar = bind(Style, '\\overline', 'span', 'class="non-leaf overline"');
+
+var SupSub = P(MathCommand, function(_, _super) {
+  _.init = function(ctrlSeq, tag, text) {
+    _super.init.call(this, ctrlSeq, '<'+tag+' class="non-leaf">&0</'+tag+'>', [ text ]);
+  };
+  _.finalizeTree = function() {
+    //TODO: use inheritance
+    pray('SupSub is only _ and ^',
+      this.ctrlSeq === '^' || this.ctrlSeq === '_'
+    );
+
+    if (this.ctrlSeq === '_') {
+      this.down = this.ends[L];
+      this.ends[L].up = insLeftOfMeUnlessAtEnd;
+    }
+    else {
+      this.up = this.ends[L];
+      this.ends[L].down = insLeftOfMeUnlessAtEnd;
+    }
+    function insLeftOfMeUnlessAtEnd(cursor) {
+      // cursor.insLeftOf(cmd), unless cursor at the end of block, and every
+      // ancestor cmd is at the end of every ancestor block
+      var cmd = this.parent, ancestorCmd = cursor;
+      do {
+        if (ancestorCmd[R]) {
+          cursor.insLeftOf(cmd);
+          return false;
+        }
+        ancestorCmd = ancestorCmd.parent.parent;
+      } while (ancestorCmd !== cmd);
+      cursor.insRightOf(cmd);
+      return false;
+    }
+  };
+  _.latex = function() {
+    var latex = this.ends[L].latex();
+    if (latex.length === 1)
+      return this.ctrlSeq + latex;
+    else
+      return this.ctrlSeq + '{' + (latex || ' ') + '}';
+  };
+  _.redraw = function() {
+    if (this[L])
+      this[L].respace();
+    //SupSub::respace recursively calls respace on all the following SupSubs
+    //so if leftward is a SupSub, no need to call respace on this or following nodes
+    if (!(this[L] instanceof SupSub)) {
+      this.respace();
+      //and if rightward is a SupSub, then this.respace() will have already called
+      //this[R].respace()
+      if (this[R] && !(this[R] instanceof SupSub))
+        this[R].respace();
+    }
+  };
+  _.respace = function() {
+    if (
+      this[L].ctrlSeq === '\\int ' || (
+        this[L] instanceof SupSub && this[L].ctrlSeq != this.ctrlSeq
+        && this[L][L] && this[L][L].ctrlSeq === '\\int '
+      )
+    ) {
+      if (!this.limit) {
+        this.limit = true;
+        this.jQ.addClass('limit');
+      }
+    }
+    else {
+      if (this.limit) {
+        this.limit = false;
+        this.jQ.removeClass('limit');
+      }
+    }
+
+    this.respaced = this[L] instanceof SupSub && this[L].ctrlSeq != this.ctrlSeq && !this[L].respaced;
+    if (this.respaced) {
+      var fontSize = +this.jQ.css('fontSize').slice(0,-2),
+        leftWidth = this[L].jQ.outerWidth(),
+        thisWidth = this.jQ.outerWidth();
+      this.jQ.css({
+        left: (this.limit && this.ctrlSeq === '_' ? -.25 : 0) - leftWidth/fontSize + 'em',
+        marginRight: .1 - min(thisWidth, leftWidth)/fontSize + 'em'
+          //1px extra so it doesn't wrap in retarded browsers (Firefox 2, I think)
+      });
+    }
+    else if (this.limit && this.ctrlSeq === '_') {
+      this.jQ.css({
+        left: '-.25em',
+        marginRight: ''
+      });
+    }
+    else {
+      this.jQ.css({
+        left: '',
+        marginRight: ''
+      });
+    }
+
+    if (this[R] instanceof SupSub)
+      this[R].respace();
+
+    return this;
+  };
+});
+
+LatexCmds.subscript =
+LatexCmds._ = bind(SupSub, '_', 'sub', '_');
+
+LatexCmds.superscript =
+LatexCmds.supscript =
+LatexCmds['^'] = bind(SupSub, '^', 'sup', '**');
+
+var Fraction =
+LatexCmds.frac =
+LatexCmds.dfrac =
+LatexCmds.cfrac =
+LatexCmds.fraction = P(MathCommand, function(_, _super) {
+  _.ctrlSeq = '\\frac';
+  _.htmlTemplate =
+      '<span class="fraction non-leaf">'
+    +   '<span class="numerator">&0</span>'
+    +   '<span class="denominator">&1</span>'
+    +   '<span style="display:inline-block;width:0">&nbsp;</span>'
+    + '</span>'
+  ;
+  _.textTemplate = ['(', '/', ')'];
+  _.finalizeTree = function() {
+    this.up = this.ends[R].up = this.ends[L];
+    this.down = this.ends[L].down = this.ends[R];
+  };
+});
+
+var LiveFraction =
+LatexCmds.over =
+CharCmds['/'] = P(Fraction, function(_, _super) {
+  _.createLeftOf = function(cursor) {
+    if (!this.replacedFragment) {
+      var leftward = cursor[L];
+      while (leftward &&
+        !(
+          leftward instanceof BinaryOperator ||
+          leftward instanceof TextBlock ||
+          leftward instanceof BigSymbol ||
+          ',;:'.split('').indexOf(leftward.ctrlSeq) > -1
+        ) //lookbehind for operator
+      )
+        leftward = leftward[L];
+
+      if (leftward instanceof BigSymbol && leftward[R] instanceof SupSub) {
+        leftward = leftward[R];
+        if (leftward[R] instanceof SupSub && leftward[R].ctrlSeq != leftward.ctrlSeq)
+          leftward = leftward[R];
+      }
+
+      if (leftward !== cursor[L]) {
+        this.replaces(MathFragment(leftward[R] || cursor.parent.ends[L], cursor[L]));
+        cursor[L] = leftward;
+      }
+    }
+    _super.createLeftOf.call(this, cursor);
+  };
+});
+
+var SquareRoot =
+LatexCmds.sqrt =
+LatexCmds['√'] = P(MathCommand, function(_, _super) {
+  _.ctrlSeq = '\\sqrt';
+  _.htmlTemplate =
+      '<span class="non-leaf">'
+    +   '<span class="scaled sqrt-prefix">&radic;</span>'
+    +   '<span class="non-leaf sqrt-stem">&0</span>'
+    + '</span>'
+  ;
+  _.textTemplate = ['sqrt(', ')'];
+  _.parser = function() {
+    return latexMathParser.optBlock.then(function(optBlock) {
+      return latexMathParser.block.map(function(block) {
+        var nthroot = NthRoot();
+        nthroot.blocks = [ optBlock, block ];
+        optBlock.adopt(nthroot, 0, 0);
+        block.adopt(nthroot, optBlock, 0);
+        return nthroot;
+      });
+    }).or(_super.parser.call(this));
+  };
+  _.redraw = function() {
+    var block = this.ends[R].jQ;
+    scale(block.prev(), 1, block.innerHeight()/+block.css('fontSize').slice(0,-2) - .1);
+  };
+});
+
+var Vec = LatexCmds.vec = P(MathCommand, function(_, _super) {
+  _.ctrlSeq = '\\vec';
+  _.htmlTemplate =
+      '<span class="non-leaf">'
+    +   '<span class="vector-prefix">&rarr;</span>'
+    +   '<span class="vector-stem">&0</span>'
+    + '</span>'
+  ;
+  _.textTemplate = ['vec(', ')'];
+});
+
+var NthRoot =
+LatexCmds.nthroot = P(SquareRoot, function(_, _super) {
+  _.htmlTemplate =
+      '<sup class="nthroot non-leaf">&0</sup>'
+    + '<span class="scaled">'
+    +   '<span class="sqrt-prefix scaled">&radic;</span>'
+    +   '<span class="sqrt-stem non-leaf">&1</span>'
+    + '</span>'
+  ;
+  _.textTemplate = ['sqrt[', '](', ')'];
+  _.latex = function() {
+    return '\\sqrt['+this.ends[L].latex()+']{'+this.ends[R].latex()+'}';
+  };
+});
+
+// Round/Square/Curly/Angle Brackets (aka Parens/Brackets/Braces)
+var Bracket = P(MathCommand, function(_, _super) {
+  _.init = function(open, close, ctrlSeq, end) {
+    _super.init.call(this, '\\left'+ctrlSeq,
+        '<span class="non-leaf">'
+      +   '<span class="scaled paren">'+open+'</span>'
+      +   '<span class="non-leaf">&0</span>'
+      +   '<span class="scaled paren">'+close+'</span>'
+      + '</span>',
+      [open, close]);
+    this.end = '\\right'+end;
+  };
+  _.jQadd = function() {
+    _super.jQadd.apply(this, arguments);
+    var jQ = this.jQ;
+    this.bracketjQs = jQ.children(':first').add(jQ.children(':last'));
+  };
+  _.latex = function() {
+    return this.ctrlSeq + this.ends[L].latex() + this.end;
+  };
+  _.redraw = function() {
+    var blockjQ = this.ends[L].jQ;
+
+    var height = blockjQ.outerHeight()/+blockjQ.css('fontSize').slice(0,-2);
+
+    scale(this.bracketjQs, min(1 + .2*(height - 1), 1.2), 1.05*height);
+  };
+});
+
+LatexCmds.left = P(MathCommand, function(_) {
+  _.parser = function() {
+    var regex = Parser.regex;
+    var string = Parser.string;
+    var succeed = Parser.succeed;
+    var optWhitespace = Parser.optWhitespace;
+
+    return optWhitespace.then(regex(/^(?:[([|]|\\\{)/))
+      .then(function(open) {
+        if (open.charAt(0) === '\\') open = open.slice(1);
+
+        var cmd = CharCmds[open]();
+
+        return latexMathParser
+          .map(function (block) {
+            cmd.blocks = [ block ];
+            block.adopt(cmd, 0, 0);
+          })
+          .then(string('\\right'))
+          .skip(optWhitespace)
+          .then(regex(/^(?:[\])|]|\\\})/))
+          .then(function(close) {
+            if (close.slice(-1) !== cmd.end.slice(-1)) {
+              return Parser.fail('open doesn\'t match close');
+            }
+
+            return succeed(cmd);
+          })
+        ;
+      })
+    ;
+  };
+});
+
+LatexCmds.right = P(MathCommand, function(_) {
+  _.parser = function() {
+    return Parser.fail('unmatched \\right');
+  };
+});
+
+LatexCmds.lbrace =
+CharCmds['{'] = bind(Bracket, '{', '}', '\\{', '\\}');
+LatexCmds.langle =
+LatexCmds.lang = bind(Bracket, '&lang;','&rang;','\\langle ','\\rangle ');
+
+// Closing bracket matching opening bracket above
+var CloseBracket = P(Bracket, function(_, _super) {
+  _.createLeftOf = function(cursor) {
+    // if I'm at the end of my parent who is a matching open-paren,
+    // and I am not replacing a selection fragment, don't create me,
+    // just put cursor after my parent
+    if (!cursor[R] && cursor.parent.parent && cursor.parent.parent.end === this.end && !this.replacedFragment)
+      cursor.insRightOf(cursor.parent.parent);
+    else
+      _super.createLeftOf.call(this, cursor);
+  };
+  _.placeCursor = function(cursor) {
+    this.ends[L].blur();
+    cursor.insRightOf(this);
+  };
+});
+
+LatexCmds.rbrace =
+CharCmds['}'] = bind(CloseBracket, '{','}','\\{','\\}');
+LatexCmds.rangle =
+LatexCmds.rang = bind(CloseBracket, '&lang;','&rang;','\\langle ','\\rangle ');
+
+var parenMixin = function(_, _super) {
+  _.init = function(open, close) {
+    _super.init.call(this, open, close, open, close);
+  };
+};
+
+var Paren = P(Bracket, parenMixin);
+
+LatexCmds.lparen =
+CharCmds['('] = bind(Paren, '(', ')');
+LatexCmds.lbrack =
+LatexCmds.lbracket =
+CharCmds['['] = bind(Paren, '[', ']');
+
+var CloseParen = P(CloseBracket, parenMixin);
+
+LatexCmds.rparen =
+CharCmds[')'] = bind(CloseParen, '(', ')');
+LatexCmds.rbrack =
+LatexCmds.rbracket =
+CharCmds[']'] = bind(CloseParen, '[', ']');
+
+var Pipes =
+LatexCmds.lpipe =
+LatexCmds.rpipe =
+CharCmds['|'] = P(Paren, function(_, _super) {
+  _.init = function() {
+    _super.init.call(this, '|', '|');
+  };
+
+  _.createLeftOf = CloseBracket.prototype.createLeftOf;
+});
+
+var TextBlock =
+CharCmds.$ =
+LatexCmds.text =
+LatexCmds.textnormal =
+LatexCmds.textrm =
+LatexCmds.textup =
+LatexCmds.textmd = P(MathCommand, function(_, _super) {
+  _.ctrlSeq = '\\text';
+  _.htmlTemplate = '<span class="text">&0</span>';
+  _.replaces = function(replacedText) {
+    if (replacedText instanceof MathFragment)
+      this.replacedText = replacedText.remove().jQ.text();
+    else if (typeof replacedText === 'string')
+      this.replacedText = replacedText;
+  };
+  _.textTemplate = ['"', '"'];
+  _.parser = function() {
+    var self = this;
+
+    // TODO: correctly parse text mode
+    var string = Parser.string;
+    var regex = Parser.regex;
+    var optWhitespace = Parser.optWhitespace;
+    return optWhitespace
+      .then(string('{')).then(regex(/^[^}]*/)).skip(string('}'))
+      .map(function(text) {
+        self.createBlocks();
+        var block = self.ends[L];
+        for (var i = 0; i < text.length; i += 1) {
+          var ch = VanillaSymbol(text.charAt(i));
+          ch.adopt(block, block.ends[R], 0);
+        }
+        return self;
+      })
+    ;
+  };
+  _.createBlocks = function() {
+    //FIXME: another possible Law of Demeter violation, but this seems much cleaner, like it was supposed to be done this way
+    this.ends[L] =
+    this.ends[R] =
+      InnerTextBlock();
+
+    this.blocks = [ this.ends[L] ];
+
+    this.ends[L].parent = this;
+  };
+  _.finalizeInsert = function() {
+    //FIXME HACK blur removes the TextBlock
+    this.ends[L].blur = function() { delete this.blur; return this; };
+    _super.finalizeInsert.call(this);
+  };
+  _.createLeftOf = function(cursor) {
+    _super.createLeftOf.call(this, this.cursor = cursor);
+
+    if (this.replacedText)
+      for (var i = 0; i < this.replacedText.length; i += 1)
+        this.ends[L].write(cursor, this.replacedText.charAt(i));
+  };
+});
+
+var InnerTextBlock = P(MathBlock, function(_, _super) {
+  _.onKey = function(key, e) {
+    if (key === 'Spacebar' || key === 'Shift-Spacebar') return false;
+  };
+  // backspace and delete at ends of block don't unwrap
+  _.deleteOutOf = function(dir, cursor) {
+    if (this.isEmpty()) cursor.insRightOf(this.parent);
+  };
+  _.write = function(cursor, ch, replacedFragment) {
+    if (replacedFragment) replacedFragment.remove();
+
+    if (ch !== '$') {
+      var html;
+      if (ch === '<') html = '&lt;';
+      else if (ch === '>') html = '&gt;';
+      VanillaSymbol(ch, html).createLeftOf(cursor);
+    }
+    else if (this.isEmpty()) {
+      cursor.insRightOf(this.parent).backspace();
+      VanillaSymbol('\\$','$').createLeftOf(cursor);
+    }
+    else if (!cursor[R])
+      cursor.insRightOf(this.parent);
+    else if (!cursor[L])
+      cursor.insLeftOf(this.parent);
+    else { //split apart
+      var rightward = TextBlock();
+      rightward.replaces(MathFragment(cursor[R], this.ends[R]));
+
+      cursor.insRightOf(this.parent);
+
+      // FIXME HACK: pretend no prev so they don't get merged when
+      // .createLeftOf() calls blur on the InnerTextBlock
+      rightward.adopt = function() {
+        delete this.adopt;
+        this.adopt.apply(this, arguments);
+        this[L] = 0;
+      };
+      rightward.createLeftOf(cursor);
+      rightward[L] = this.parent;
+
+      cursor.insLeftOf(rightward);
+    }
+    return false;
+  };
+  _.blur = function() {
+    this.jQ.removeClass('hasCursor');
+    if (this.isEmpty()) {
+      var textblock = this.parent, cursor = textblock.cursor;
+      if (cursor.parent === this)
+        this.jQ.addClass('empty');
+      else {
+        cursor.hide();
+        textblock.remove();
+        if (cursor[R] === textblock)
+          cursor[R] = textblock[R];
+        else if (cursor[L] === textblock)
+          cursor[L] = textblock[L];
+
+        cursor.show().parent.bubble('redraw');
+      }
+    }
+    return this;
+  };
+  _.focus = function() {
+    _super.focus.call(this);
+
+    var textblock = this.parent;
+    if (textblock[R].ctrlSeq === textblock.ctrlSeq) { //TODO: seems like there should be a better way to move MathElements around
+      var innerblock = this,
+        cursor = textblock.cursor,
+        rightward = textblock[R].ends[L];
+
+      rightward.eachChild(function(child){
+        child.parent = innerblock;
+        child.jQ.appendTo(innerblock.jQ);
+      });
+
+      if (this.ends[R])
+        this.ends[R][R] = rightward.ends[L];
+      else
+        this.ends[L] = rightward.ends[L];
+
+      rightward.ends[L][L] = this.ends[R];
+      this.ends[R] = rightward.ends[R];
+
+      rightward.parent.remove();
+
+      if (cursor[L])
+        cursor.insRightOf(cursor[L]);
+      else
+        cursor.insAtLeftEnd(this);
+
+      cursor.parent.bubble('redraw');
+    }
+    else if (textblock[L].ctrlSeq === textblock.ctrlSeq) {
+      var cursor = textblock.cursor;
+      if (cursor[L])
+        textblock[L].ends[L].focus();
+      else
+        cursor.insAtRightEnd(textblock[L].ends[L]);
+    }
+    return this;
+  };
+});
+
+
+function makeTextBlock(latex, tagName, attrs) {
+  return P(TextBlock, {
+    ctrlSeq: latex,
+    htmlTemplate: '<'+tagName+' '+attrs+'>&0</'+tagName+'>'
+  });
+}
+
+LatexCmds.em = LatexCmds.italic = LatexCmds.italics =
+LatexCmds.emph = LatexCmds.textit = LatexCmds.textsl =
+  makeTextBlock('\\textit', 'i', 'class="text"');
+LatexCmds.strong = LatexCmds.bold = LatexCmds.textbf =
+  makeTextBlock('\\textbf', 'b', 'class="text"');
+LatexCmds.sf = LatexCmds.textsf =
+  makeTextBlock('\\textsf', 'span', 'class="sans-serif text"');
+LatexCmds.tt = LatexCmds.texttt =
+  makeTextBlock('\\texttt', 'span', 'class="monospace text"');
+LatexCmds.textsc =
+  makeTextBlock('\\textsc', 'span', 'style="font-variant:small-caps" class="text"');
+LatexCmds.uppercase =
+  makeTextBlock('\\uppercase', 'span', 'style="text-transform:uppercase" class="text"');
+LatexCmds.lowercase =
+  makeTextBlock('\\lowercase', 'span', 'style="text-transform:lowercase" class="text"');
+
+// input box to type a variety of LaTeX commands beginning with a backslash
+var LatexCommandInput =
+CharCmds['\\'] = P(MathCommand, function(_, _super) {
+  _.ctrlSeq = '\\';
+  _.replaces = function(replacedFragment) {
+    this._replacedFragment = replacedFragment.disown();
+    this.isEmpty = function() { return false; };
+  };
+  _.htmlTemplate = '<span class="latex-command-input non-leaf">\\<span>&0</span></span>';
+  _.textTemplate = ['\\'];
+  _.createBlocks = function() {
+    _super.createBlocks.call(this);
+    this.ends[L].focus = function() {
+      this.parent.jQ.addClass('hasCursor');
+      if (this.isEmpty())
+        this.parent.jQ.removeClass('empty');
+
+      return this;
+    };
+    this.ends[L].blur = function() {
+      this.parent.jQ.removeClass('hasCursor');
+      if (this.isEmpty())
+        this.parent.jQ.addClass('empty');
+
+      return this;
+    };
+  };
+  _.createLeftOf = function(cursor) {
+    _super.createLeftOf.call(this, cursor);
+
+    this.cursor = cursor.insAtRightEnd(this.ends[L]);
+    if (this._replacedFragment) {
+      var el = this.jQ[0];
+      this.jQ =
+        this._replacedFragment.jQ.addClass('blur').bind(
+          'mousedown mousemove', //FIXME: is monkey-patching the mousedown and mousemove handlers the right way to do this?
+          function(e) {
+            $(e.target = el).trigger(e);
+            return false;
+          }
+        ).insertBefore(this.jQ).add(this.jQ);
+    }
+
+    this.ends[L].write = function(cursor, ch, replacedFragment) {
+      if (replacedFragment) replacedFragment.remove();
+
+      if (ch.match(/[a-z]/i)) VanillaSymbol(ch).createLeftOf(cursor);
+      else {
+        this.parent.renderCommand();
+        if (ch !== '\\' || !this.isEmpty()) this.parent.parent.write(cursor, ch);
+      }
+    };
+  };
+  _.latex = function() {
+    return '\\' + this.ends[L].latex() + ' ';
+  };
+  _.onKey = function(key, e) {
+    if (key === 'Tab' || key === 'Enter' || key === 'Spacebar') {
+      this.renderCommand();
+      e.preventDefault();
+      return false;
+    }
+  };
+  _.renderCommand = function() {
+    this.jQ = this.jQ.last();
+    this.remove();
+    if (this[R]) {
+      this.cursor.insLeftOf(this[R]);
+    } else {
+      this.cursor.insAtRightEnd(this.parent);
+    }
+
+    var latex = this.ends[L].latex(), cmd;
+    if (!latex) latex = 'backslash';
+    this.cursor.insertCmd(latex, this._replacedFragment);
+  };
+});
+
+var Binomial =
+LatexCmds.binom =
+LatexCmds.binomial = P(MathCommand, function(_, _super) {
+  _.ctrlSeq = '\\binom';
+  _.htmlTemplate =
+      '<span class="paren scaled">(</span>'
+    + '<span class="non-leaf">'
+    +   '<span class="array non-leaf">'
+    +     '<span>&0</span>'
+    +     '<span>&1</span>'
+    +   '</span>'
+    + '</span>'
+    + '<span class="paren scaled">)</span>'
+  ;
+  _.textTemplate = ['choose(',',',')'];
+  _.redraw = function() {
+    var blockjQ = this.jQ.eq(1);
+
+    var height = blockjQ.outerHeight()/+blockjQ.css('fontSize').slice(0,-2);
+
+    var parens = this.jQ.filter('.paren');
+    scale(parens, min(1 + .2*(height - 1), 1.2), 1.05*height);
+  };
+});
+
+var Choose =
+LatexCmds.choose = P(Binomial, function(_) {
+  _.createLeftOf = LiveFraction.prototype.createLeftOf;
+});
+
+var Vector =
+LatexCmds.vector = P(MathCommand, function(_, _super) {
+  _.ctrlSeq = '\\vector';
+  _.htmlTemplate = '<span class="array"><span>&0</span></span>';
+  _.latex = function() {
+    return '\\begin{matrix}' + this.foldChildren([], function(latex, child) {
+      latex.push(child.latex());
+      return latex;
+    }).join('\\\\') + '\\end{matrix}';
+  };
+  _.text = function() {
+    return '[' + this.foldChildren([], function(text, child) {
+      text.push(child.text());
+      return text;
+    }).join() + ']';
+  };
+  _.createLeftOf = function(cursor) {
+    _super.createLeftOf.call(this, this.cursor = cursor);
+  };
+  _.onKey = function(key, e) {
+    var currentBlock = this.cursor.parent;
+
+    if (currentBlock.parent === this) {
+      if (key === 'Enter') { //enter
+        var newBlock = MathBlock();
+        newBlock.parent = this;
+        newBlock.jQ = $('<span></span>')
+          .attr(mqBlockId, newBlock.id)
+          .insertAfter(currentBlock.jQ);
+        if (currentBlock[R])
+          currentBlock[R][L] = newBlock;
+        else
+          this.ends[R] = newBlock;
+
+        newBlock[R] = currentBlock[R];
+        currentBlock[R] = newBlock;
+        newBlock[L] = currentBlock;
+        this.bubble('redraw').cursor.insAtRightEnd(newBlock);
+
+        e.preventDefault();
+        return false;
+      }
+      else if (key === 'Tab' && !currentBlock[R]) {
+        if (currentBlock.isEmpty()) {
+          if (currentBlock[L]) {
+            this.cursor.insRightOf(this);
+            delete currentBlock[L][R];
+            this.ends[R] = currentBlock[L];
+            currentBlock.jQ.remove();
+            this.bubble('redraw');
+
+            e.preventDefault();
+            return false;
+          }
+          else
+            return;
+        }
+
+        var newBlock = MathBlock();
+        newBlock.parent = this;
+        newBlock.jQ = $('<span></span>').attr(mqBlockId, newBlock.id).appendTo(this.jQ);
+        this.ends[R] = newBlock;
+        currentBlock[R] = newBlock;
+        newBlock[L] = currentBlock;
+        this.bubble('redraw').cursor.insAtRightEnd(newBlock);
+
+        e.preventDefault();
+        return false;
+      }
+      else if (e.which === 8) { //backspace
+        if (currentBlock.isEmpty()) {
+          if (currentBlock[L]) {
+            this.cursor.insAtRightEnd(currentBlock[L])
+            currentBlock[L][R] = currentBlock[R];
+          }
+          else {
+            this.cursor.insLeftOf(this);
+            this.ends[L] = currentBlock[R];
+          }
+
+          if (currentBlock[R])
+            currentBlock[R][L] = currentBlock[L];
+          else
+            this.ends[R] = currentBlock[L];
+
+          currentBlock.jQ.remove();
+          if (this.isEmpty())
+            this.cursor.deleteForward();
+          else
+            this.bubble('redraw');
+
+          e.preventDefault();
+          return false;
+        }
+        else if (!this.cursor[L]) {
+          e.preventDefault();
+          return false;
+        }
+      }
+    }
+  };
+});
+
+LatexCmds.editable = P(RootMathCommand, function(_, _super) {
+  _.init = function() {
+    MathCommand.prototype.init.call(this, '\\editable');
+  };
+
+  _.jQadd = function() {
+    var self = this;
+    // FIXME: this entire method is a giant hack to get around
+    // having to call createBlocks, and createRoot expecting to
+    // render the contents' LaTeX. Both need to be refactored.
+    _super.jQadd.apply(self, arguments);
+    var block = self.ends[L].disown();
+    var blockjQ = self.jQ.children().detach();
+
+    self.ends[L] =
+    self.ends[R] =
+      RootMathBlock();
+
+    self.blocks = [ self.ends[L] ];
+
+    self.ends[L].parent = self;
+
+    createRoot(self.jQ, self.ends[L], false, true);
+    self.cursor = self.ends[L].cursor;
+
+    block.children().adopt(self.ends[L], 0, 0);
+    blockjQ.appendTo(self.ends[L].jQ);
+
+    self.ends[L].cursor.insAtRightEnd(self.ends[L]);
+  };
+
+  _.latex = function(){ return this.ends[L].latex(); };
+  _.text = function(){ return this.ends[L].text(); };
+});
+/**********************************
+ * Symbols and Special Characters
+ *********************************/
+
+LatexCmds.f = bind(Symbol, 'f', '<var class="florin">&fnof;</var><span style="display:inline-block;width:0">&nbsp;</span>');
+
+var Variable = P(Symbol, function(_, _super) {
+  _.init = function(ch, html) {
+    _super.init.call(this, ch, '<var>'+(html || ch)+'</var>');
+  };
+  _.text = function() {
+    var text = this.ctrlSeq;
+    if (this[L] && !(this[L] instanceof Variable)
+        && !(this[L] instanceof BinaryOperator))
+      text = '*' + text;
+    if (this[R] && !(this[R] instanceof BinaryOperator)
+        && !(this[R].ctrlSeq === '^'))
+      text += '*';
+    return text;
+  };
+});
+
+var VanillaSymbol = P(Symbol, function(_, _super) {
+  _.init = function(ch, html) {
+    _super.init.call(this, ch, '<span>'+(html || ch)+'</span>');
+  };
+});
+
+CharCmds[' '] = bind(VanillaSymbol, '\\:', ' ');
+
+LatexCmds.prime = CharCmds["'"] = bind(VanillaSymbol, "'", '&prime;');
+
+// does not use Symbola font
+var NonSymbolaSymbol = P(Symbol, function(_, _super) {
+  _.init = function(ch, html) {
+    _super.init.call(this, ch, '<span class="nonSymbola">'+(html || ch)+'</span>');
+  };
+});
+
+LatexCmds['@'] = NonSymbolaSymbol;
+LatexCmds['&'] = bind(NonSymbolaSymbol, '\\&', '&amp;');
+LatexCmds['%'] = bind(NonSymbolaSymbol, '\\%', '%');
+
+//the following are all Greek to me, but this helped a lot: http://www.ams.org/STIX/ion/stixsig03.html
+
+//lowercase Greek letter variables
+LatexCmds.alpha =
+LatexCmds.beta =
+LatexCmds.gamma =
+LatexCmds.delta =
+LatexCmds.zeta =
+LatexCmds.eta =
+LatexCmds.theta =
+LatexCmds.iota =
+LatexCmds.kappa =
+LatexCmds.mu =
+LatexCmds.nu =
+LatexCmds.xi =
+LatexCmds.rho =
+LatexCmds.sigma =
+LatexCmds.tau =
+LatexCmds.chi =
+LatexCmds.psi =
+LatexCmds.omega = P(Variable, function(_, _super) {
+  _.init = function(latex) {
+    _super.init.call(this,'\\'+latex+' ','&'+latex+';');
+  };
+});
+
+//why can't anybody FUCKING agree on these
+LatexCmds.phi = //W3C or Unicode?
+  bind(Variable,'\\phi ','&#981;');
+
+LatexCmds.phiv = //Elsevier and 9573-13
+LatexCmds.varphi = //AMS and LaTeX
+  bind(Variable,'\\varphi ','&phi;');
+
+LatexCmds.epsilon = //W3C or Unicode?
+  bind(Variable,'\\epsilon ','&#1013;');
+
+LatexCmds.epsiv = //Elsevier and 9573-13
+LatexCmds.varepsilon = //AMS and LaTeX
+  bind(Variable,'\\varepsilon ','&epsilon;');
+
+LatexCmds.piv = //W3C/Unicode and Elsevier and 9573-13
+LatexCmds.varpi = //AMS and LaTeX
+  bind(Variable,'\\varpi ','&piv;');
+
+LatexCmds.sigmaf = //W3C/Unicode
+LatexCmds.sigmav = //Elsevier
+LatexCmds.varsigma = //LaTeX
+  bind(Variable,'\\varsigma ','&sigmaf;');
+
+LatexCmds.thetav = //Elsevier and 9573-13
+LatexCmds.vartheta = //AMS and LaTeX
+LatexCmds.thetasym = //W3C/Unicode
+  bind(Variable,'\\vartheta ','&thetasym;');
+
+LatexCmds.upsilon = //AMS and LaTeX and W3C/Unicode
+LatexCmds.upsi = //Elsevier and 9573-13
+  bind(Variable,'\\upsilon ','&upsilon;');
+
+//these aren't even mentioned in the HTML character entity references
+LatexCmds.gammad = //Elsevier
+LatexCmds.Gammad = //9573-13 -- WTF, right? I dunno if this was a typo in the reference (see above)
+LatexCmds.digamma = //LaTeX
+  bind(Variable,'\\digamma ','&#989;');
+
+LatexCmds.kappav = //Elsevier
+LatexCmds.varkappa = //AMS and LaTeX
+  bind(Variable,'\\varkappa ','&#1008;');
+
+LatexCmds.rhov = //Elsevier and 9573-13
+LatexCmds.varrho = //AMS and LaTeX
+  bind(Variable,'\\varrho ','&#1009;');
+
+//Greek constants, look best in un-italicised Times New Roman
+LatexCmds.pi = LatexCmds['π'] = bind(NonSymbolaSymbol,'\\pi ','&pi;');
+LatexCmds.lambda = bind(NonSymbolaSymbol,'\\lambda ','&lambda;');
+
+//uppercase greek letters
+
+LatexCmds.Upsilon = //LaTeX
+LatexCmds.Upsi = //Elsevier and 9573-13
+LatexCmds.upsih = //W3C/Unicode "upsilon with hook"
+LatexCmds.Upsih = //'cos it makes sense to me
+  bind(Symbol,'\\Upsilon ','<var style="font-family: serif">&upsih;</var>'); //Symbola's 'upsilon with a hook' is a capital Y without hooks :(
+
+//other symbols with the same LaTeX command and HTML character entity reference
+LatexCmds.Gamma =
+LatexCmds.Delta =
+LatexCmds.Theta =
+LatexCmds.Lambda =
+LatexCmds.Xi =
+LatexCmds.Pi =
+LatexCmds.Sigma =
+LatexCmds.Phi =
+LatexCmds.Psi =
+LatexCmds.Omega =
+LatexCmds.forall = P(VanillaSymbol, function(_, _super) {
+  _.init = function(latex) {
+    _super.init.call(this,'\\'+latex+' ','&'+latex+';');
+  };
+});
+
+// symbols that aren't a single MathCommand, but are instead a whole
+// Fragment. Creates the Fragment from a LaTeX string
+var LatexFragment = P(MathCommand, function(_) {
+  _.init = function(latex) { this.latex = latex; };
+  _.createLeftOf = function(cursor) { cursor.writeLatex(this.latex); };
+  _.parser = function() {
+    var frag = latexMathParser.parse(this.latex).children();
+    return Parser.succeed(frag);
+  };
+});
+
+// for what seems to me like [stupid reasons][1], Unicode provides
+// subscripted and superscripted versions of all ten Arabic numerals,
+// as well as [so-called "vulgar fractions"][2].
+// Nobody really cares about most of them, but some of them actually
+// predate Unicode, dating back to [ISO-8859-1][3], apparently also
+// known as "Latin-1", which among other things [Windows-1252][4]
+// largely coincides with, so Microsoft Word sometimes inserts them
+// and they get copy-pasted into MathQuill.
+//
+// (Irrelevant but funny story: Windows-1252 is actually a strict
+// superset of the "closely related but distinct"[3] "ISO 8859-1" --
+// see the lack of a dash after "ISO"? Completely different character
+// set, like elephants vs elephant seals, or "Zombies" vs "Zombie
+// Redneck Torture Family". What kind of idiot would get them confused.
+// People in fact got them confused so much, it was so common to
+// mislabel Windows-1252 text as ISO-8859-1, that most modern web
+// browsers and email clients treat the MIME charset of ISO-8859-1
+// as actually Windows-1252, behavior now standard in the HTML5 spec.)
+//
+// [1]: http://en.wikipedia.org/wiki/Unicode_subscripts_and_superscripts
+// [2]: http://en.wikipedia.org/wiki/Number_Forms
+// [3]: http://en.wikipedia.org/wiki/ISO/IEC_8859-1
+// [4]: http://en.wikipedia.org/wiki/Windows-1252
+LatexCmds['¹'] = bind(LatexFragment, '^1');
+LatexCmds['²'] = bind(LatexFragment, '^2');
+LatexCmds['³'] = bind(LatexFragment, '^3');
+LatexCmds['¼'] = bind(LatexFragment, '\\frac14');
+LatexCmds['½'] = bind(LatexFragment, '\\frac12');
+LatexCmds['¾'] = bind(LatexFragment, '\\frac34');
+
+var BinaryOperator = P(Symbol, function(_, _super) {
+  _.init = function(ctrlSeq, html, text) {
+    _super.init.call(this,
+      ctrlSeq, '<span class="binary-operator">'+html+'</span>', text
+    );
+  };
+});
+
+var PlusMinus = P(BinaryOperator, function(_) {
+  _.init = VanillaSymbol.prototype.init;
+
+  _.respace = function() {
+    if (!this[L]) {
+      this.jQ[0].className = '';
+    }
+    else if (
+      this[L] instanceof BinaryOperator &&
+      this[R] && !(this[R] instanceof BinaryOperator)
+    ) {
+      this.jQ[0].className = 'unary-operator';
+    }
+    else {
+      this.jQ[0].className = 'binary-operator';
+    }
+    return this;
+  };
+});
+
+LatexCmds['+'] = bind(PlusMinus, '+', '+');
+//yes, these are different dashes, I think one is an en dash and the other is a hyphen
+LatexCmds['–'] = LatexCmds['-'] = bind(PlusMinus, '-', '&minus;');
+LatexCmds['±'] = LatexCmds.pm = LatexCmds.plusmn = LatexCmds.plusminus =
+  bind(PlusMinus,'\\pm ','&plusmn;');
+LatexCmds.mp = LatexCmds.mnplus = LatexCmds.minusplus =
+  bind(PlusMinus,'\\mp ','&#8723;');
+
+CharCmds['*'] = LatexCmds.sdot = LatexCmds.cdot =
+  bind(BinaryOperator, '\\cdot ', '&middot;');
+//semantically should be &sdot;, but &middot; looks better
+
+LatexCmds['='] = bind(BinaryOperator, '=', '=');
+LatexCmds['<'] = bind(BinaryOperator, '<', '&lt;');
+LatexCmds['>'] = bind(BinaryOperator, '>', '&gt;');
+
+LatexCmds.notin =
+LatexCmds.sim =
+LatexCmds.cong =
+LatexCmds.equiv =
+LatexCmds.oplus =
+LatexCmds.otimes = P(BinaryOperator, function(_, _super) {
+  _.init = function(latex) {
+    _super.init.call(this, '\\'+latex+' ', '&'+latex+';');
+  };
+});
+
+LatexCmds.times = bind(BinaryOperator, '\\times ', '&times;', '[x]');
+
+LatexCmds['÷'] = LatexCmds.div = LatexCmds.divide = LatexCmds.divides =
+  bind(BinaryOperator,'\\div ','&divide;', '[/]');
+
+LatexCmds['≠'] = LatexCmds.ne = LatexCmds.neq = bind(BinaryOperator,'\\ne ','&ne;');
+
+LatexCmds.ast = LatexCmds.star = LatexCmds.loast = LatexCmds.lowast =
+  bind(BinaryOperator,'\\ast ','&lowast;');
+  //case 'there4 = // a special exception for this one, perhaps?
+LatexCmds.therefor = LatexCmds.therefore =
+  bind(BinaryOperator,'\\therefore ','&there4;');
+
+LatexCmds.cuz = // l33t
+LatexCmds.because = bind(BinaryOperator,'\\because ','&#8757;');
+
+LatexCmds.prop = LatexCmds.propto = bind(BinaryOperator,'\\propto ','&prop;');
+
+LatexCmds['≈'] = LatexCmds.asymp = LatexCmds.approx = bind(BinaryOperator,'\\approx ','&asymp;');
+
+LatexCmds.lt = bind(BinaryOperator,'<','&lt;');
+
+LatexCmds.gt = bind(BinaryOperator,'>','&gt;');
+
+LatexCmds['≤'] = LatexCmds.le = LatexCmds.leq = bind(BinaryOperator,'\\le ','&le;');
+
+LatexCmds['≥'] = LatexCmds.ge = LatexCmds.geq = bind(BinaryOperator,'\\ge ','&ge;');
+
+LatexCmds.isin = LatexCmds['in'] = bind(BinaryOperator,'\\in ','&isin;');
+
+LatexCmds.ni = LatexCmds.contains = bind(BinaryOperator,'\\ni ','&ni;');
+
+LatexCmds.notni = LatexCmds.niton = LatexCmds.notcontains = LatexCmds.doesnotcontain =
+  bind(BinaryOperator,'\\not\\ni ','&#8716;');
+
+LatexCmds.sub = LatexCmds.subset = bind(BinaryOperator,'\\subset ','&sub;');
+
+LatexCmds.sup = LatexCmds.supset = LatexCmds.superset =
+  bind(BinaryOperator,'\\supset ','&sup;');
+
+LatexCmds.nsub = LatexCmds.notsub =
+LatexCmds.nsubset = LatexCmds.notsubset =
+  bind(BinaryOperator,'\\not\\subset ','&#8836;');
+
+LatexCmds.nsup = LatexCmds.notsup =
+LatexCmds.nsupset = LatexCmds.notsupset =
+LatexCmds.nsuperset = LatexCmds.notsuperset =
+  bind(BinaryOperator,'\\not\\supset ','&#8837;');
+
+LatexCmds.sube = LatexCmds.subeq = LatexCmds.subsete = LatexCmds.subseteq =
+  bind(BinaryOperator,'\\subseteq ','&sube;');
+
+LatexCmds.supe = LatexCmds.supeq =
+LatexCmds.supsete = LatexCmds.supseteq =
+LatexCmds.supersete = LatexCmds.superseteq =
+  bind(BinaryOperator,'\\supseteq ','&supe;');
+
+LatexCmds.nsube = LatexCmds.nsubeq =
+LatexCmds.notsube = LatexCmds.notsubeq =
+LatexCmds.nsubsete = LatexCmds.nsubseteq =
+LatexCmds.notsubsete = LatexCmds.notsubseteq =
+  bind(BinaryOperator,'\\not\\subseteq ','&#8840;');
+
+LatexCmds.nsupe = LatexCmds.nsupeq =
+LatexCmds.notsupe = LatexCmds.notsupeq =
+LatexCmds.nsupsete = LatexCmds.nsupseteq =
+LatexCmds.notsupsete = LatexCmds.notsupseteq =
+LatexCmds.nsupersete = LatexCmds.nsuperseteq =
+LatexCmds.notsupersete = LatexCmds.notsuperseteq =
+  bind(BinaryOperator,'\\not\\supseteq ','&#8841;');
+
+
+//sum, product, coproduct, integral
+var BigSymbol = P(Symbol, function(_, _super) {
+  _.init = function(ch, html) {
+    _super.init.call(this, ch, '<big>'+html+'</big>');
+  };
+});
+
+LatexCmds['∑'] = LatexCmds.sum = LatexCmds.summation = bind(BigSymbol,'\\sum ','&sum;');
+LatexCmds['∏'] = LatexCmds.prod = LatexCmds.product = bind(BigSymbol,'\\prod ','&prod;');
+LatexCmds.coprod = LatexCmds.coproduct = bind(BigSymbol,'\\coprod ','&#8720;');
+LatexCmds['∫'] = LatexCmds['int'] = LatexCmds.integral = bind(BigSymbol,'\\int ','&int;');
+
+
+
+//the canonical sets of numbers
+LatexCmds.N = LatexCmds.naturals = LatexCmds.Naturals =
+  bind(VanillaSymbol,'\\mathbb{N}','&#8469;');
+
+LatexCmds.P =
+LatexCmds.primes = LatexCmds.Primes =
+LatexCmds.projective = LatexCmds.Projective =
+LatexCmds.probability = LatexCmds.Probability =
+  bind(VanillaSymbol,'\\mathbb{P}','&#8473;');
+
+LatexCmds.Z = LatexCmds.integers = LatexCmds.Integers =
+  bind(VanillaSymbol,'\\mathbb{Z}','&#8484;');
+
+LatexCmds.Q = LatexCmds.rationals = LatexCmds.Rationals =
+  bind(VanillaSymbol,'\\mathbb{Q}','&#8474;');
+
+LatexCmds.R = LatexCmds.reals = LatexCmds.Reals =
+  bind(VanillaSymbol,'\\mathbb{R}','&#8477;');
+
+LatexCmds.C =
+LatexCmds.complex = LatexCmds.Complex =
+LatexCmds.complexes = LatexCmds.Complexes =
+LatexCmds.complexplane = LatexCmds.Complexplane = LatexCmds.ComplexPlane =
+  bind(VanillaSymbol,'\\mathbb{C}','&#8450;');
+
+LatexCmds.H = LatexCmds.Hamiltonian = LatexCmds.quaternions = LatexCmds.Quaternions =
+  bind(VanillaSymbol,'\\mathbb{H}','&#8461;');
+
+//spacing
+LatexCmds.quad = LatexCmds.emsp = bind(VanillaSymbol,'\\quad ','    ');
+LatexCmds.qquad = bind(VanillaSymbol,'\\qquad ','        ');
+/* spacing special characters, gonna have to implement this in LatexCommandInput::onText somehow
+case ',':
+  return VanillaSymbol('\\, ',' ');
+case ':':
+  return VanillaSymbol('\\: ','  ');
+case ';':
+  return VanillaSymbol('\\; ','   ');
+case '!':
+  return Symbol('\\! ','<span style="margin-right:-.2em"></span>');
+*/
+
+//binary operators
+LatexCmds.diamond = bind(VanillaSymbol, '\\diamond ', '&#9671;');
+LatexCmds.bigtriangleup = bind(VanillaSymbol, '\\bigtriangleup ', '&#9651;');
+LatexCmds.ominus = bind(VanillaSymbol, '\\ominus ', '&#8854;');
+LatexCmds.uplus = bind(VanillaSymbol, '\\uplus ', '&#8846;');
+LatexCmds.bigtriangledown = bind(VanillaSymbol, '\\bigtriangledown ', '&#9661;');
+LatexCmds.sqcap = bind(VanillaSymbol, '\\sqcap ', '&#8851;');
+LatexCmds.triangleleft = bind(VanillaSymbol, '\\triangleleft ', '&#8882;');
+LatexCmds.sqcup = bind(VanillaSymbol, '\\sqcup ', '&#8852;');
+LatexCmds.triangleright = bind(VanillaSymbol, '\\triangleright ', '&#8883;');
+LatexCmds.odot = bind(VanillaSymbol, '\\odot ', '&#8857;');
+LatexCmds.bigcirc = bind(VanillaSymbol, '\\bigcirc ', '&#9711;');
+LatexCmds.dagger = bind(VanillaSymbol, '\\dagger ', '&#0134;');
+LatexCmds.ddagger = bind(VanillaSymbol, '\\ddagger ', '&#135;');
+LatexCmds.wr = bind(VanillaSymbol, '\\wr ', '&#8768;');
+LatexCmds.amalg = bind(VanillaSymbol, '\\amalg ', '&#8720;');
+
+//relationship symbols
+LatexCmds.models = bind(VanillaSymbol, '\\models ', '&#8872;');
+LatexCmds.prec = bind(VanillaSymbol, '\\prec ', '&#8826;');
+LatexCmds.succ = bind(VanillaSymbol, '\\succ ', '&#8827;');
+LatexCmds.preceq = bind(VanillaSymbol, '\\preceq ', '&#8828;');
+LatexCmds.succeq = bind(VanillaSymbol, '\\succeq ', '&#8829;');
+LatexCmds.simeq = bind(VanillaSymbol, '\\simeq ', '&#8771;');
+LatexCmds.mid = bind(VanillaSymbol, '\\mid ', '&#8739;');
+LatexCmds.ll = bind(VanillaSymbol, '\\ll ', '&#8810;');
+LatexCmds.gg = bind(VanillaSymbol, '\\gg ', '&#8811;');
+LatexCmds.parallel = bind(VanillaSymbol, '\\parallel ', '&#8741;');
+LatexCmds.bowtie = bind(VanillaSymbol, '\\bowtie ', '&#8904;');
+LatexCmds.sqsubset = bind(VanillaSymbol, '\\sqsubset ', '&#8847;');
+LatexCmds.sqsupset = bind(VanillaSymbol, '\\sqsupset ', '&#8848;');
+LatexCmds.smile = bind(VanillaSymbol, '\\smile ', '&#8995;');
+LatexCmds.sqsubseteq = bind(VanillaSymbol, '\\sqsubseteq ', '&#8849;');
+LatexCmds.sqsupseteq = bind(VanillaSymbol, '\\sqsupseteq ', '&#8850;');
+LatexCmds.doteq = bind(VanillaSymbol, '\\doteq ', '&#8784;');
+LatexCmds.frown = bind(VanillaSymbol, '\\frown ', '&#8994;');
+LatexCmds.vdash = bind(VanillaSymbol, '\\vdash ', '&#8870;');
+LatexCmds.dashv = bind(VanillaSymbol, '\\dashv ', '&#8867;');
+
+//arrows
+LatexCmds.longleftarrow = bind(VanillaSymbol, '\\longleftarrow ', '&#8592;');
+LatexCmds.longrightarrow = bind(VanillaSymbol, '\\longrightarrow ', '&#8594;');
+LatexCmds.Longleftarrow = bind(VanillaSymbol, '\\Longleftarrow ', '&#8656;');
+LatexCmds.Longrightarrow = bind(VanillaSymbol, '\\Longrightarrow ', '&#8658;');
+LatexCmds.longleftrightarrow = bind(VanillaSymbol, '\\longleftrightarrow ', '&#8596;');
+LatexCmds.updownarrow = bind(VanillaSymbol, '\\updownarrow ', '&#8597;');
+LatexCmds.Longleftrightarrow = bind(VanillaSymbol, '\\Longleftrightarrow ', '&#8660;');
+LatexCmds.Updownarrow = bind(VanillaSymbol, '\\Updownarrow ', '&#8661;');
+LatexCmds.mapsto = bind(VanillaSymbol, '\\mapsto ', '&#8614;');
+LatexCmds.nearrow = bind(VanillaSymbol, '\\nearrow ', '&#8599;');
+LatexCmds.hookleftarrow = bind(VanillaSymbol, '\\hookleftarrow ', '&#8617;');
+LatexCmds.hookrightarrow = bind(VanillaSymbol, '\\hookrightarrow ', '&#8618;');
+LatexCmds.searrow = bind(VanillaSymbol, '\\searrow ', '&#8600;');
+LatexCmds.leftharpoonup = bind(VanillaSymbol, '\\leftharpoonup ', '&#8636;');
+LatexCmds.rightharpoonup = bind(VanillaSymbol, '\\rightharpoonup ', '&#8640;');
+LatexCmds.swarrow = bind(VanillaSymbol, '\\swarrow ', '&#8601;');
+LatexCmds.leftharpoondown = bind(VanillaSymbol, '\\leftharpoondown ', '&#8637;');
+LatexCmds.rightharpoondown = bind(VanillaSymbol, '\\rightharpoondown ', '&#8641;');
+LatexCmds.nwarrow = bind(VanillaSymbol, '\\nwarrow ', '&#8598;');
+
+//Misc
+LatexCmds.ldots = bind(VanillaSymbol, '\\ldots ', '&#8230;');
+LatexCmds.cdots = bind(VanillaSymbol, '\\cdots ', '&#8943;');
+LatexCmds.vdots = bind(VanillaSymbol, '\\vdots ', '&#8942;');
+LatexCmds.ddots = bind(VanillaSymbol, '\\ddots ', '&#8944;');
+LatexCmds.surd = bind(VanillaSymbol, '\\surd ', '&#8730;');
+LatexCmds.triangle = bind(VanillaSymbol, '\\triangle ', '&#9653;');
+LatexCmds.ell = bind(VanillaSymbol, '\\ell ', '&#8467;');
+LatexCmds.top = bind(VanillaSymbol, '\\top ', '&#8868;');
+LatexCmds.flat = bind(VanillaSymbol, '\\flat ', '&#9837;');
+LatexCmds.natural = bind(VanillaSymbol, '\\natural ', '&#9838;');
+LatexCmds.sharp = bind(VanillaSymbol, '\\sharp ', '&#9839;');
+LatexCmds.wp = bind(VanillaSymbol, '\\wp ', '&#8472;');
+LatexCmds.bot = bind(VanillaSymbol, '\\bot ', '&#8869;');
+LatexCmds.clubsuit = bind(VanillaSymbol, '\\clubsuit ', '&#9827;');
+LatexCmds.diamondsuit = bind(VanillaSymbol, '\\diamondsuit ', '&#9826;');
+LatexCmds.heartsuit = bind(VanillaSymbol, '\\heartsuit ', '&#9825;');
+LatexCmds.spadesuit = bind(VanillaSymbol, '\\spadesuit ', '&#9824;');
+
+//variable-sized
+LatexCmds.oint = bind(VanillaSymbol, '\\oint ', '&#8750;');
+LatexCmds.bigcap = bind(VanillaSymbol, '\\bigcap ', '&#8745;');
+LatexCmds.bigcup = bind(VanillaSymbol, '\\bigcup ', '&#8746;');
+LatexCmds.bigsqcup = bind(VanillaSymbol, '\\bigsqcup ', '&#8852;');
+LatexCmds.bigvee = bind(VanillaSymbol, '\\bigvee ', '&#8744;');
+LatexCmds.bigwedge = bind(VanillaSymbol, '\\bigwedge ', '&#8743;');
+LatexCmds.bigodot = bind(VanillaSymbol, '\\bigodot ', '&#8857;');
+LatexCmds.bigotimes = bind(VanillaSymbol, '\\bigotimes ', '&#8855;');
+LatexCmds.bigoplus = bind(VanillaSymbol, '\\bigoplus ', '&#8853;');
+LatexCmds.biguplus = bind(VanillaSymbol, '\\biguplus ', '&#8846;');
+
+//delimiters
+LatexCmds.lfloor = bind(VanillaSymbol, '\\lfloor ', '&#8970;');
+LatexCmds.rfloor = bind(VanillaSymbol, '\\rfloor ', '&#8971;');
+LatexCmds.lceil = bind(VanillaSymbol, '\\lceil ', '&#8968;');
+LatexCmds.rceil = bind(VanillaSymbol, '\\rceil ', '&#8969;');
+LatexCmds.slash = bind(VanillaSymbol, '\\slash ', '&#47;');
+LatexCmds.opencurlybrace = bind(VanillaSymbol, '\\opencurlybrace ', '&#123;');
+LatexCmds.closecurlybrace = bind(VanillaSymbol, '\\closecurlybrace ', '&#125;');
+
+//various symbols
+
+LatexCmds.caret = bind(VanillaSymbol,'\\caret ','^');
+LatexCmds.underscore = bind(VanillaSymbol,'\\underscore ','_');
+LatexCmds.backslash = bind(VanillaSymbol,'\\backslash ','\\');
+LatexCmds.vert = bind(VanillaSymbol,'|');
+LatexCmds.perp = LatexCmds.perpendicular = bind(VanillaSymbol,'\\perp ','&perp;');
+LatexCmds.nabla = LatexCmds.del = bind(VanillaSymbol,'\\nabla ','&nabla;');
+LatexCmds.hbar = bind(VanillaSymbol,'\\hbar ','&#8463;');
+
+LatexCmds.AA = LatexCmds.Angstrom = LatexCmds.angstrom =
+  bind(VanillaSymbol,'\\text\\AA ','&#8491;');
+
+LatexCmds.ring = LatexCmds.circ = LatexCmds.circle =
+  bind(VanillaSymbol,'\\circ ','&#8728;');
+
+LatexCmds.bull = LatexCmds.bullet = bind(VanillaSymbol,'\\bullet ','&bull;');
+
+LatexCmds.setminus = LatexCmds.smallsetminus =
+  bind(VanillaSymbol,'\\setminus ','&#8726;');
+
+LatexCmds.not = //bind(Symbol,'\\not ','<span class="not">/</span>');
+LatexCmds['¬'] = LatexCmds.neg = bind(VanillaSymbol,'\\neg ','&not;');
+
+LatexCmds['…'] = LatexCmds.dots = LatexCmds.ellip = LatexCmds.hellip =
+LatexCmds.ellipsis = LatexCmds.hellipsis =
+  bind(VanillaSymbol,'\\dots ','&hellip;');
+
+LatexCmds.converges =
+LatexCmds.darr = LatexCmds.dnarr = LatexCmds.dnarrow = LatexCmds.downarrow =
+  bind(VanillaSymbol,'\\downarrow ','&darr;');
+
+LatexCmds.dArr = LatexCmds.dnArr = LatexCmds.dnArrow = LatexCmds.Downarrow =
+  bind(VanillaSymbol,'\\Downarrow ','&dArr;');
+
+LatexCmds.diverges = LatexCmds.uarr = LatexCmds.uparrow =
+  bind(VanillaSymbol,'\\uparrow ','&uarr;');
+
+LatexCmds.uArr = LatexCmds.Uparrow = bind(VanillaSymbol,'\\Uparrow ','&uArr;');
+
+LatexCmds.to = bind(BinaryOperator,'\\to ','&rarr;');
+
+LatexCmds.rarr = LatexCmds.rightarrow = bind(VanillaSymbol,'\\rightarrow ','&rarr;');
+
+LatexCmds.implies = bind(BinaryOperator,'\\Rightarrow ','&rArr;');
+
+LatexCmds.rArr = LatexCmds.Rightarrow = bind(VanillaSymbol,'\\Rightarrow ','&rArr;');
+
+LatexCmds.gets = bind(BinaryOperator,'\\gets ','&larr;');
+
+LatexCmds.larr = LatexCmds.leftarrow = bind(VanillaSymbol,'\\leftarrow ','&larr;');
+
+LatexCmds.impliedby = bind(BinaryOperator,'\\Leftarrow ','&lArr;');
+
+LatexCmds.lArr = LatexCmds.Leftarrow = bind(VanillaSymbol,'\\Leftarrow ','&lArr;');
+
+LatexCmds.harr = LatexCmds.lrarr = LatexCmds.leftrightarrow =
+  bind(VanillaSymbol,'\\leftrightarrow ','&harr;');
+
+LatexCmds.iff = bind(BinaryOperator,'\\Leftrightarrow ','&hArr;');
+
+LatexCmds.hArr = LatexCmds.lrArr = LatexCmds.Leftrightarrow =
+  bind(VanillaSymbol,'\\Leftrightarrow ','&hArr;');
+
+LatexCmds.Re = LatexCmds.Real = LatexCmds.real = bind(VanillaSymbol,'\\Re ','&real;');
+
+LatexCmds.Im = LatexCmds.imag =
+LatexCmds.image = LatexCmds.imagin = LatexCmds.imaginary = LatexCmds.Imaginary =
+  bind(VanillaSymbol,'\\Im ','&image;');
+
+LatexCmds.part = LatexCmds.partial = bind(VanillaSymbol,'\\partial ','&part;');
+
+LatexCmds.inf = LatexCmds.infin = LatexCmds.infty = LatexCmds.infinity =
+  bind(VanillaSymbol,'\\infty ','&infin;');
+
+LatexCmds.alef = LatexCmds.alefsym = LatexCmds.aleph = LatexCmds.alephsym =
+  bind(VanillaSymbol,'\\aleph ','&alefsym;');
+
+LatexCmds.xist = //LOL
+LatexCmds.xists = LatexCmds.exist = LatexCmds.exists =
+  bind(VanillaSymbol,'\\exists ','&exist;');
+
+LatexCmds.and = LatexCmds.land = LatexCmds.wedge =
+  bind(VanillaSymbol,'\\wedge ','&and;');
+
+LatexCmds.or = LatexCmds.lor = LatexCmds.vee = bind(VanillaSymbol,'\\vee ','&or;');
+
+LatexCmds.o = LatexCmds.O =
+LatexCmds.empty = LatexCmds.emptyset =
+LatexCmds.oslash = LatexCmds.Oslash =
+LatexCmds.nothing = LatexCmds.varnothing =
+  bind(BinaryOperator,'\\varnothing ','&empty;');
+
+LatexCmds.cup = LatexCmds.union = bind(BinaryOperator,'\\cup ','&cup;');
+
+LatexCmds.cap = LatexCmds.intersect = LatexCmds.intersection =
+  bind(BinaryOperator,'\\cap ','&cap;');
+
+LatexCmds.deg = LatexCmds.degree = bind(VanillaSymbol,'^\\circ ','&deg;');
+
+LatexCmds.ang = LatexCmds.angle = bind(VanillaSymbol,'\\angle ','&ang;');
+
+
+var NonItalicizedFunction = P(Symbol, function(_, _super) {
+  _.init = function(fn) {
+    _super.init.call(this, '\\'+fn+' ', '<span>'+fn+'</span>');
+  };
+  _.respace = function()
+  {
+    this.jQ[0].className =
+      (this[R] instanceof SupSub || this[R] instanceof Bracket) ?
+      '' : 'non-italicized-function';
+  };
+});
+
+LatexCmds.ln =
+LatexCmds.lg =
+LatexCmds.log =
+LatexCmds.span =
+LatexCmds.proj =
+LatexCmds.det =
+LatexCmds.dim =
+LatexCmds.min =
+LatexCmds.max =
+LatexCmds.mod =
+LatexCmds.lcm =
+LatexCmds.gcd =
+LatexCmds.gcf =
+LatexCmds.hcf =
+LatexCmds.lim = NonItalicizedFunction;
+
+(function() {
+  var trig = ['sin', 'cos', 'tan', 'sec', 'cosec', 'csc', 'cotan', 'cot'];
+  for (var i in trig) {
+    LatexCmds[trig[i]] =
+    LatexCmds[trig[i]+'h'] =
+    LatexCmds['a'+trig[i]] = LatexCmds['arc'+trig[i]] =
+    LatexCmds['a'+trig[i]+'h'] = LatexCmds['arc'+trig[i]+'h'] =
+      NonItalicizedFunction;
+  }
+}());
+
+// Parser MathCommand
+var latexMathParser = (function() {
+  function commandToBlock(cmd) {
+    var block = MathBlock();
+    cmd.adopt(block, 0, 0);
+    return block;
+  }
+  function joinBlocks(blocks) {
+    var firstBlock = blocks[0] || MathBlock();
+
+    for (var i = 1; i < blocks.length; i += 1) {
+      blocks[i].children().adopt(firstBlock, firstBlock.ends[R], 0);
+    }
+
+    return firstBlock;
+  }
+
+  var string = Parser.string;
+  var regex = Parser.regex;
+  var letter = Parser.letter;
+  var any = Parser.any;
+  var optWhitespace = Parser.optWhitespace;
+  var succeed = Parser.succeed;
+  var fail = Parser.fail;
+
+  // Parsers yielding MathCommands
+  var variable = letter.map(Variable);
+  var symbol = regex(/^[^${}\\_^]/).map(VanillaSymbol);
+
+  var controlSequence =
+    regex(/^[^\\a-eg-zA-Z]/) // hotfix #164; match MathBlock::write
+    .or(string('\\').then(
+      regex(/^[a-z]+/i)
+      .or(regex(/^\s+/).result(' '))
+      .or(any)
+    )).then(function(ctrlSeq) {
+      var cmdKlass = LatexCmds[ctrlSeq];
+
+      if (cmdKlass) {
+        return cmdKlass(ctrlSeq).parser();
+      }
+      else {
+        return fail('unknown command: \\'+ctrlSeq);
+      }
+    })
+  ;
+
+  var command =
+    controlSequence
+    .or(variable)
+    .or(symbol)
+  ;
+
+  // Parsers yielding MathBlocks
+  var mathGroup = string('{').then(function() { return mathSequence; }).skip(string('}'));
+  var mathBlock = optWhitespace.then(mathGroup.or(command.map(commandToBlock)));
+  var mathSequence = mathBlock.many().map(joinBlocks).skip(optWhitespace);
+
+  var optMathBlock =
+    string('[').then(
+      mathBlock.then(function(block) {
+        return block.join('latex') !== ']' ? succeed(block) : fail();
+      })
+      .many().map(joinBlocks).skip(optWhitespace)
+    ).skip(string(']'))
+  ;
+
+  var latexMath = mathSequence;
+
+  latexMath.block = mathBlock;
+  latexMath.optBlock = optMathBlock;
+  return latexMath;
+})();
+/********************************************
+ * Cursor and Selection "singleton" classes
+ *******************************************/
+
+/* The main thing that manipulates the Math DOM. Makes sure to manipulate the
+HTML DOM to match. */
+
+/* Sort of singletons, since there should only be one per editable math
+textbox, but any one HTML document can contain many such textboxes, so any one
+JS environment could actually contain many instances. */
+
+//A fake cursor in the fake textbox that the math is rendered in.
+var Cursor = P(Point, function(_) {
+  _.init = function(root) {
+    this.parent = this.root = root;
+    var jQ = this.jQ = this._jQ = $('<span class="cursor">&zwj;</span>');
+
+    //closured for setInterval
+    this.blink = function(){ jQ.toggleClass('blink'); };
+
+    this.upDownCache = {};
+  };
+
+  _.show = function() {
+    this.jQ = this._jQ.removeClass('blink');
+    if ('intervalId' in this) //already was shown, just restart interval
+      clearInterval(this.intervalId);
+    else { //was hidden and detached, insert this.jQ back into HTML DOM
+      if (this[R]) {
+        if (this.selection && this.selection.ends[L][L] === this[L])
+          this.jQ.insertBefore(this.selection.jQ);
+        else
+          this.jQ.insertBefore(this[R].jQ.first());
+      }
+      else
+        this.jQ.appendTo(this.parent.jQ);
+      this.parent.focus();
+    }
+    this.intervalId = setInterval(this.blink, 500);
+    return this;
+  };
+  _.hide = function() {
+    if ('intervalId' in this)
+      clearInterval(this.intervalId);
+    delete this.intervalId;
+    this.jQ.detach();
+    this.jQ = $();
+    return this;
+  };
+
+  _.withDirInsertAt = function(dir, parent, withDir, oppDir) {
+    var oldParent = this.parent;
+    this.parent = parent;
+    this[dir] = withDir;
+    this[-dir] = oppDir;
+    oldParent.blur();
+  };
+  _.insDirOf = function(dir, el) {
+    prayDirection(dir);
+    this.withDirInsertAt(dir, el.parent, el[dir], el);
+    this.parent.jQ.addClass('hasCursor');
+    this.jQ.insDirOf(dir, el.jQ);
+    return this;
+  };
+  _.insLeftOf = function(el) { return this.insDirOf(L, el); };
+  _.insRightOf = function(el) { return this.insDirOf(R, el); };
+
+  _.insAtDirEnd = function(dir, el) {
+    prayDirection(dir);
+    this.withDirInsertAt(dir, el, 0, el.ends[dir]);
+
+    // never insert before textarea
+    if (dir === L && el.textarea) {
+      this.jQ.insDirOf(-dir, el.textarea);
+    }
+    else {
+      this.jQ.insAtDirEnd(dir, el.jQ);
+    }
+
+    el.focus();
+
+    return this;
+  };
+  _.insAtLeftEnd = function(el) { return this.insAtDirEnd(L, el); };
+  _.insAtRightEnd = function(el) { return this.insAtDirEnd(R, el); };
+
+  _.hopDir = function(dir) {
+    prayDirection(dir);
+
+    this.jQ.insDirOf(dir, this[dir].jQ);
+    this[-dir] = this[dir];
+    this[dir] = this[dir][dir];
+    return this;
+  };
+  _.hopLeft = function() { return this.hopDir(L); };
+  _.hopRight = function() { return this.hopDir(R); };
+
+  _.moveDirWithin = function(dir, block) {
+    prayDirection(dir);
+
+    if (this[dir]) {
+      if (this[dir].ends[-dir]) this.insAtDirEnd(-dir, this[dir].ends[-dir]);
+      else this.hopDir(dir);
+    }
+    else {
+      // we're at the beginning/end of the containing block, so do nothing
+      if (this.parent === block) return;
+
+      if (this.parent[dir]) this.insAtDirEnd(-dir, this.parent[dir]);
+      else this.insDirOf(dir, this.parent.parent);
+    }
+  };
+  _.moveLeftWithin = function(block) {
+    return this.moveDirWithin(L, block);
+  };
+  _.moveRightWithin = function(block) {
+    return this.moveDirWithin(R, block);
+  };
+  _.moveDir = function(dir) {
+    prayDirection(dir);
+
+    clearUpDownCache(this);
+
+    if (this.selection)  {
+      this.insDirOf(dir, this.selection.ends[dir]).clearSelection();
+    }
+    else {
+      this.moveDirWithin(dir, this.root);
+    }
+
+    return this.show();
+  };
+  _.moveLeft = function() { return this.moveDir(L); };
+  _.moveRight = function() { return this.moveDir(R); };
+
+  /**
+   * moveUp and moveDown have almost identical algorithms:
+   * - first check left and right, if so insAtLeft/RightEnd of them
+   * - else check the parent's 'up'/'down' property - if it's a function,
+   *   call it with the cursor as the sole argument and use the return value.
+   *
+   *   Given undefined, will bubble up to the next ancestor block.
+   *   Given false, will stop bubbling.
+   *   Given a MathBlock,
+   *     + moveUp will insAtRightEnd of it
+   *     + moveDown will insAtLeftEnd of it
+   *
+   */
+  _.moveUp = function() { return moveUpDown(this, 'up'); };
+  _.moveDown = function() { return moveUpDown(this, 'down'); };
+  function moveUpDown(self, dir) {
+    if (self[R][dir]) self.insAtLeftEnd(self[R][dir]);
+    else if (self[L][dir]) self.insAtRightEnd(self[L][dir]);
+    else {
+      var ancestorBlock = self.parent;
+      do {
+        var prop = ancestorBlock[dir];
+        if (prop) {
+          if (typeof prop === 'function') prop = ancestorBlock[dir](self);
+          if (prop === false || prop instanceof MathBlock) {
+            self.upDownCache[ancestorBlock.id] = Point(self.parent, self[L], self[R]);
+
+            if (prop instanceof MathBlock) {
+              var cached = self.upDownCache[prop.id];
+
+              if (cached) {
+                if (cached[R]) {
+                  self.insLeftOf(cached[R]);
+                } else {
+                  self.insAtRightEnd(cached.parent);
+                }
+              } else {
+                var pageX = offset(self).left;
+                self.insAtRightEnd(prop);
+                self.seekHoriz(pageX, prop);
+              }
+            }
+            break;
+          }
+        }
+        ancestorBlock = ancestorBlock.parent.parent;
+      } while (ancestorBlock);
+    }
+
+    return self.clearSelection().show();
+  }
+
+  _.seek = function(target, pageX, pageY) {
+    clearUpDownCache(this);
+    var cmd, block, cursor = this.clearSelection().show();
+    if (target.hasClass('empty')) {
+      cursor.insAtLeftEnd(MathElement[target.attr(mqBlockId)]);
+      return cursor;
+    }
+
+    cmd = MathElement[target.attr(mqCmdId)];
+    if (cmd instanceof Symbol) { //insert at whichever side is closer
+      if (target.outerWidth() > 2*(pageX - target.offset().left))
+        cursor.insLeftOf(cmd);
+      else
+        cursor.insRightOf(cmd);
+
+      return cursor;
+    }
+    if (!cmd) {
+      block = MathElement[target.attr(mqBlockId)];
+      if (!block) { //if no MathQuill data, try parent, if still no, just start from the root
+        target = target.parent();
+        cmd = MathElement[target.attr(mqCmdId)];
+        if (!cmd) {
+          block = MathElement[target.attr(mqBlockId)];
+          if (!block) block = cursor.root;
+        }
+      }
+    }
+
+    if (cmd)
+      cursor.insRightOf(cmd);
+    else
+      cursor.insAtRightEnd(block);
+
+    return cursor.seekHoriz(pageX, cursor.root);
+  };
+  _.seekHoriz = function(pageX, block) {
+    //move cursor to position closest to click
+    var cursor = this;
+    var dist = offset(cursor).left - pageX;
+    var leftDist;
+
+    do {
+      cursor.moveLeftWithin(block);
+      leftDist = dist;
+      dist = offset(cursor).left - pageX;
+    }
+    while (dist > 0 && (cursor[L] || cursor.parent !== block));
+
+    if (-dist > leftDist) cursor.moveRightWithin(block);
+
+    return cursor;
+  };
+  function offset(self) {
+    //in Opera 11.62, .getBoundingClientRect() and hence jQuery::offset()
+    //returns all 0's on inline elements with negative margin-right (like
+    //the cursor) at the end of their parent, so temporarily remove the
+    //negative margin-right when calling jQuery::offset()
+    //Opera bug DSK-360043
+    //http://bugs.jquery.com/ticket/11523
+    //https://github.com/jquery/jquery/pull/717
+    var offset = self.jQ.removeClass('cursor').offset();
+    self.jQ.addClass('cursor');
+    return offset;
+  }
+  _.writeLatex = function(latex) {
+    var self = this;
+    clearUpDownCache(self);
+    self.show().deleteSelection();
+
+    var all = Parser.all;
+    var eof = Parser.eof;
+
+    var block = latexMathParser.skip(eof).or(all.result(false)).parse(latex);
+
+    if (block) {
+      block.children().adopt(self.parent, self[L], self[R]);
+      MathElement.jQize(block.join('html')).insertBefore(self.jQ);
+      self[L] = block.ends[R];
+      block.finalizeInsert();
+      self.parent.bubble('redraw');
+    }
+
+    return this.hide();
+  };
+  _.write = function(ch) {
+    var seln = this.prepareWrite();
+    return this.insertCh(ch, seln);
+  };
+  _.insertCh = function(ch, replacedFragment) {
+    this.parent.write(this, ch, replacedFragment);
+    return this;
+  };
+  _.insertCmd = function(latexCmd, replacedFragment) {
+    var cmd = LatexCmds[latexCmd];
+    if (cmd) {
+      cmd = cmd(latexCmd);
+      if (replacedFragment) cmd.replaces(replacedFragment);
+      cmd.createLeftOf(this);
+    }
+    else {
+      cmd = TextBlock();
+      cmd.replaces(latexCmd);
+      cmd.ends[L].focus = function(){ delete this.focus; return this; };
+      cmd.createLeftOf(this);
+      this.insRightOf(cmd);
+      if (replacedFragment)
+        replacedFragment.remove();
+    }
+    return this;
+  };
+  _.unwrapGramp = function() {
+    var gramp = this.parent.parent;
+    var greatgramp = gramp.parent;
+    var rightward = gramp[R];
+    var cursor = this;
+
+    var leftward = gramp[L];
+    gramp.disown().eachChild(function(uncle) {
+      if (uncle.isEmpty()) return;
+
+      uncle.children()
+        .adopt(greatgramp, leftward, rightward)
+        .each(function(cousin) {
+          cousin.jQ.insertBefore(gramp.jQ.first());
+        })
+      ;
+
+      leftward = uncle.ends[R];
+    });
+
+    if (!this[R]) { //then find something to be rightward to insLeftOf
+      if (this[L])
+        this[R] = this[L][R];
+      else {
+        while (!this[R]) {
+          this.parent = this.parent[R];
+          if (this.parent)
+            this[R] = this.parent.ends[L];
+          else {
+            this[R] = gramp[R];
+            this.parent = greatgramp;
+            break;
+          }
+        }
+      }
+    }
+    if (this[R])
+      this.insLeftOf(this[R]);
+    else
+      this.insAtRightEnd(greatgramp);
+
+    gramp.jQ.remove();
+
+    if (gramp[L])
+      gramp[L].respace();
+    if (gramp[R])
+      gramp[R].respace();
+  };
+  _.deleteDir = function(dir) {
+    prayDirection(dir);
+    clearUpDownCache(this);
+    this.show();
+
+    if (this.deleteSelection()); // pass
+    else if (this[dir]) {
+      if (this[dir].isEmpty())
+        this[dir] = this[dir].remove()[dir];
+      else
+        this.selectDir(dir);
+    }
+    else if (this.parent !== this.root) {
+      if (this.parent.parent.isEmpty())
+        return this.insDirOf(-dir, this.parent.parent).deleteDir(dir);
+      else
+        this.unwrapGramp();
+    }
+
+    if (this[L])
+      this[L].respace();
+    if (this[R])
+      this[R].respace();
+    this.parent.bubble('redraw');
+
+    return this;
+  };
+  _.backspace = function() { return this.deleteDir(L); };
+  _.deleteForward = function() { return this.deleteDir(R); };
+  _.selectFrom = function(anticursor) {
+    //find ancestors of each with common parent
+    var oneA = this, otherA = anticursor; //one ancestor, the other ancestor
+    loopThroughAncestors: while (true) {
+      for (var oneI = this; oneI !== oneA.parent.parent; oneI = oneI.parent.parent) //one intermediate, the other intermediate
+        if (oneI.parent === otherA.parent) {
+          left = oneI;
+          right = otherA;
+          break loopThroughAncestors;
+        }
+
+      for (var otherI = anticursor; otherI !== otherA.parent.parent; otherI = otherI.parent.parent)
+        if (oneA.parent === otherI.parent) {
+          left = oneA;
+          right = otherI;
+          break loopThroughAncestors;
+        }
+
+      if (oneA.parent.parent)
+        oneA = oneA.parent.parent;
+      if (otherA.parent.parent)
+        otherA = otherA.parent.parent;
+    }
+    //figure out which is leftward and which is rightward
+    var left, right, leftRight;
+    if (left[R] !== right) {
+      for (var rightward = left; rightward; rightward = rightward[R]) {
+        if (rightward === right[L]) {
+          leftRight = true;
+          break;
+        }
+      }
+      if (!leftRight) {
+        leftRight = right;
+        right = left;
+        left = leftRight;
+      }
+    }
+    this.hide().selection = Selection(left[L][R] || left.parent.ends[L], right[R][L] || right.parent.ends[R]);
+    this.insRightOf(right[R][L] || right.parent.ends[R]);
+    this.root.selectionChanged();
+  };
+  _.selectDir = function(dir) {
+    prayDirection(dir);
+    clearUpDownCache(this);
+
+    if (this.selection) {
+      // if cursor is at the (dir) edge of selection
+      if (this.selection.ends[dir] === this[-dir]) {
+        // then extend (dir) if possible
+        if (this[dir]) this.hopDir(dir).selection.extendDir(dir);
+        // else level up if possible
+        else if (this.parent !== this.root) {
+          this.insDirOf(dir, this.parent.parent).selection.levelUp();
+        }
+      }
+      // else cursor is at the (-dir) edge of selection, retract if possible
+      else {
+        this.hopDir(dir);
+
+        // clear the selection if we only have one thing selected
+        if (this.selection.ends[dir] === this.selection.ends[-dir]) {
+          this.clearSelection().show();
+          return;
+        }
+
+        this.selection.retractDir(dir);
+      }
+    }
+    // no selection, create one
+    else {
+      if (this[dir]) this.hopDir(dir);
+      // else edge of a block
+      else {
+        if (this.parent === this.root) return;
+
+        this.insDirOf(dir, this.parent.parent);
+      }
+
+      this.hide().selection = Selection(this[-dir]);
+    }
+
+    this.root.selectionChanged();
+  };
+  _.selectLeft = function() { return this.selectDir(L); };
+  _.selectRight = function() { return this.selectDir(R); };
+
+  function clearUpDownCache(self) {
+    self.upDownCache = {};
+  }
+
+  _.prepareMove = function() {
+    clearUpDownCache(this);
+    return this.show().clearSelection();
+  };
+  _.prepareEdit = function() {
+    clearUpDownCache(this);
+    return this.show().deleteSelection();
+  };
+  _.prepareWrite = function() {
+    clearUpDownCache(this);
+    return this.show().replaceSelection();
+  };
+
+  _.clearSelection = function() {
+    if (this.selection) {
+      this.selection.clear();
+      delete this.selection;
+      this.root.selectionChanged();
+    }
+    return this;
+  };
+  _.deleteSelection = function() {
+    if (!this.selection) return false;
+
+    this[L] = this.selection.ends[L][L];
+    this[R] = this.selection.ends[R][R];
+    this.selection.remove();
+    this.root.selectionChanged();
+    return delete this.selection;
+  };
+  _.replaceSelection = function() {
+    var seln = this.selection;
+    if (seln) {
+      this[L] = seln.ends[L][L];
+      this[R] = seln.ends[R][R];
+      delete this.selection;
+    }
+    return seln;
+  };
+});
+
+var Selection = P(MathFragment, function(_, _super) {
+  _.init = function() {
+    var frag = this;
+    _super.init.apply(frag, arguments);
+
+    frag.jQwrap(frag.jQ);
+  };
+  _.jQwrap = function(children) {
+    this.jQ = children.wrapAll('<span class="selection"></span>').parent();
+      //can't do wrapAll(this.jQ = $(...)) because wrapAll will clone it
+  };
+  _.adopt = function() {
+    this.jQ.replaceWith(this.jQ = this.jQ.children());
+    return _super.adopt.apply(this, arguments);
+  };
+  _.clear = function() {
+    this.jQ.replaceWith(this.jQ.children());
+    return this;
+  };
+  _.levelUp = function() {
+    var seln = this,
+      gramp = seln.ends[L] = seln.ends[R] = seln.ends[R].parent.parent;
+    seln.clear().jQwrap(gramp.jQ);
+    return seln;
+  };
+  _.extendDir = function(dir) {
+    prayDirection(dir);
+    this.ends[dir] = this.ends[dir][dir];
+    this.ends[dir].jQ.insAtDirEnd(dir, this.jQ);
+    return this;
+  };
+  _.extendLeft = function() { return this.extendDir(L); };
+  _.extendRight = function() { return this.extendDir(R); };
+
+  _.retractDir = function(dir) {
+    prayDirection(dir);
+    this.ends[-dir].jQ.insDirOf(-dir, this.jQ);
+    this.ends[-dir] = this.ends[-dir][dir];
+  };
+  _.retractRight = function() { return this.retractDir(R); };
+  _.retractLeft = function() { return this.retractDir(L); };
+});
+/*********************************************************
+ * The actual jQuery plugin and document ready handlers.
+ ********************************************************/
+
+//The publicy exposed method of jQuery.prototype, available (and meant to be
+//called) on jQuery-wrapped HTML DOM elements.
+jQuery.fn.mathquill = function(cmd, latex) {
+  switch (cmd) {
+  case 'redraw':
+    return this.each(function() {
+      var blockId = $(this).attr(mqBlockId),
+        rootBlock = blockId && MathElement[blockId];
+      if (rootBlock) {
+        (function postOrderRedraw(el) {
+          el.eachChild(postOrderRedraw);
+          if (el.redraw) el.redraw();
+        }(rootBlock));
+      }
+    });
+  case 'revert':
+    return this.each(function() {
+      var blockId = $(this).attr(mqBlockId),
+        block = blockId && MathElement[blockId];
+      if (block && block.revert)
+        block.revert();
+    });
+  case 'latex':
+    if (arguments.length > 1) {
+      return this.each(function() {
+        var blockId = $(this).attr(mqBlockId),
+          block = blockId && MathElement[blockId];
+        if (block)
+          block.renderLatex(latex);
+      });
+    }
+
+    var blockId = $(this).attr(mqBlockId),
+      block = blockId && MathElement[blockId];
+    return block && block.latex();
+  case 'text':
+    var blockId = $(this).attr(mqBlockId),
+      block = blockId && MathElement[blockId];
+    return block && block.text();
+  case 'html':
+    return this.html().replace(/ ?hasCursor|hasCursor /, '')
+      .replace(/ class=(""|(?= |>))/g, '')
+      .replace(/<span class="?cursor( blink)?"?><\/span>/i, '')
+      .replace(/<span class="?textarea"?><textarea><\/textarea><\/span>/i, '');
+  case 'write':
+    if (arguments.length > 1)
+      return this.each(function() {
+        var blockId = $(this).attr(mqBlockId),
+          block = blockId && MathElement[blockId],
+          cursor = block && block.cursor;
+
+        if (cursor)
+          cursor.writeLatex(latex).parent.blur();
+      });
+  case 'cmd':
+    if (arguments.length > 1)
+      return this.each(function() {
+        var blockId = $(this).attr(mqBlockId),
+          block = blockId && MathElement[blockId],
+          cursor = block && block.cursor;
+
+        if (cursor) {
+          var seln = cursor.prepareWrite();
+          if (/^\\[a-z]+$/i.test(latex)) cursor.insertCmd(latex.slice(1), seln);
+          else cursor.insertCh(latex, seln);
+          cursor.hide().parent.blur();
+        }
+      });
+  default:
+    var textbox = cmd === 'textbox',
+      editable = textbox || cmd === 'editable',
+      RootBlock = textbox ? RootTextBlock : RootMathBlock;
+    return this.each(function() {
+      createRoot($(this), RootBlock(), textbox, editable);
+    });
+  }
+};
+
+//on document ready, mathquill-ify all `<tag class="mathquill-*">latex</tag>`
+//elements according to their CSS class.
+jQuery(function() {
+  jQuery('.mathquill-editable:not(.mathquill-rendered-math)').mathquill('editable');
+  jQuery('.mathquill-textbox:not(.mathquill-rendered-math)').mathquill('textbox');
+  jQuery('.mathquill-embedded-latex').mathquill();
+});
+
+
+}());
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/mathquill.min.js b/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/mathquill.min.js
new file mode 100644
index 0000000..7ad7e0c
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/page/umeditor/third-party/mathquill/mathquill.min.js
@@ -0,0 +1,2 @@
+(function(){function t(){}function e(t){var e=o.call(arguments,1);return function(){return t.apply(this,e)}}function n(t,e){if(!e)throw Error("prayer failed: "+t)}function i(t){n("a direction was passed",t===u||t===p)}function r(e,n,i,r){function s(){g=a;var t=c.selection?"$"+c.selection.latex()+"$":"";w.select(t)}function o(){l.detach()}var c,l,m,g,b,v,w,x=e.contents().detach();return i||e.addClass("mathquill-rendered-math"),n.jQ=e.attr(ce,n.id),n.revert=function(){e.empty().unbind(".mathquill").removeClass("mathquill-rendered-math mathquill-editable mathquill-textbox").append(x)},c=n.cursor=re(n),n.renderLatex(x.text()),l=n.textarea=f('<span class="textarea"><textarea></textarea></span>'),m=l.children(),n.selectionChanged=function(){g===a&&(g=setTimeout(s)),O(e[0])},e.bind("selectstart.mathquill",function(t){t.target!==m[0]&&t.preventDefault(),t.stopPropagation()}),v=c.blink,e.bind("mousedown.mathquill",function(n){function i(t){return c.seek(f(t.target),t.pageX,t.pageY),(c[u]!==b[u]||c.parent!==b.parent)&&c.selectFrom(b),!1}function s(t){return delete t.target,i(t)}function o(t){b=a,c.blink=v,c.selection||(r?c.show():l.detach()),e.unbind("mousemove",i),f(t.target.ownerDocument).unbind("mousemove",s).unbind("mouseup",o)}return setTimeout(function(){m.focus()}),c.blink=t,c.seek(f(n.target),n.pageX,n.pageY),b=d(c.parent,c[u],c[p]),r||e.prepend(l),e.mousemove(i),f(n.target.ownerDocument).mousemove(s).mouseup(o),!1}),r?(w=h(m,{container:e,key:function(t,e){c.parent.bubble("onKey",t,e)},text:function(t){c.parent.bubble("onText",t)},cut:function(t){c.selection&&setTimeout(function(){c.prepareEdit(),c.parent.bubble("redraw")}),t.stopPropagation()},paste:function(t){t="$"===t.slice(0,1)&&"$"===t.slice(-1)?t.slice(1,-1):"\\text{"+t+"}",c.writeLatex(t).show()}}),e.prepend(l),e.addClass("mathquill-editable"),i&&e.addClass("mathquill-textbox"),m.focus(function(t){c.parent||c.insAtRightEnd(n),c.parent.jQ.addClass("hasCursor"),c.selection?(c.selection.jQ.removeClass("blur"),setTimeout(n.selectionChanged)):c.show(),t.stopPropagation()}).blur(function(t){c.hide().parent.blur(),c.selection&&c.selection.jQ.addClass("blur"),t.stopPropagation()}),e.bind("focus.mathquill blur.mathquill",function(t){m.trigger(t)}).blur(),a):(w=h(m,{container:e}),e.bind("cut paste",!1).bind("copy",s).prepend('<span class="selectable">$'+n.latex()+"$</span>"),m.blur(function(){c.clearSelection(),setTimeout(o)}),a)}function s(t,e,n){return c(K,{ctrlSeq:t,htmlTemplate:"<"+e+" "+n+">&0</"+e+">"})}var a,o,c,h,l,u,p,f,d,m,g,b,v,w,x,j,k,q,y,Q,C,S,L,D,O,E,A,R,T,z,B,I,$,_,W,M,F,P,U,H,K,N,G,X,Z,Y,J,V,te,ee,ne,ie,re,se,ae=window.jQuery,oe="mathquill-command-id",ce="mathquill-block-id",he=Math.min;Math.max,o=[].slice,c=function(t,e,n){function i(t){return"object"==typeof t}function r(t){return"function"==typeof t}function s(){}function a(o,c){function h(){var t=new l;return r(t.init)&&t.init.apply(t,arguments),t}function l(){}var u,p,f;return c===n&&(c=o,o=Object),h.Bare=l,u=s[t]=o[t],p=l[t]=h[t]=new s,p.constructor=h,h.mixin=function(e){return l[t]=h[t]=a(h,e)[t],h},(h.open=function(t){if(f={},r(t)?f=t.call(h,p,u,h,o):i(t)&&(f=t),i(f))for(var n in f)e.call(f,n)&&(p[n]=f[n]);return r(p.init)||(p.init=o),h})(c)}return a}("prototype",{}.hasOwnProperty),h=function(){function e(t){var e,i=t.which||t.keyCode,r=n[i],s=[];return t.ctrlKey&&s.push("Ctrl"),t.originalEvent&&t.originalEvent.metaKey&&s.push("Meta"),t.altKey&&s.push("Alt"),t.shiftKey&&s.push("Shift"),e=r||String.fromCharCode(i),s.length||r?(s.push(e),s.join("-")):e}var n={8:"Backspace",9:"Tab",10:"Enter",13:"Enter",16:"Shift",17:"Control",18:"Alt",20:"CapsLock",27:"Esc",32:"Spacebar",33:"PageUp",34:"PageDown",35:"End",36:"Home",37:"Left",38:"Up",39:"Right",40:"Down",45:"Insert",46:"Del",144:"NumLock"};return function(n,i){function r(t){k=t,clearTimeout(j),j=setTimeout(t)}function s(e){k(),k=t,clearTimeout(j),w.val(e),e&&w[0].select()}function a(){var t=w[0];return"selectionStart"in t?t.selectionStart!==t.selectionEnd:!1}function o(t){var e=w.val();w.val(""),e&&t(e)}function c(){g(e(q),q)}function h(t){q=t,y=null,c()}function l(t){q&&y&&c(),y=t,r(u)}function u(){a()||o(m)}function p(){q=y=null}function f(){w.focus(),r(d)}function d(){o(b)}var m,g,b,v,w,x,j,k,q=null,y=null;return i||(i={}),m=i.text||t,g=i.key||t,b=i.paste||t,v=i.cut||t,w=ae(n),x=ae(i.container||w),k=t,x.bind("keydown keypress input keyup focusout paste",function(){k()}),x.bind({keydown:h,keypress:l,focusout:p,cut:v,paste:f}),{select:s}}}(),l=c(function(t,e,i){function r(t,e){throw t=t?"'"+t+"'":"EOF","Parse Error: "+e+" at "+t}var s,a,o;t.init=function(t){this._=t},t.parse=function(t){function e(t,e){return e}return this.skip(o)._(t,e,r)},t.or=function(t){n("or is passed a parser",t instanceof i);var e=this;return i(function(n,i,r){function s(){return t._(n,i,r)}return e._(n,i,s)})},t.then=function(t){var e=this;return i(function(r,s,a){function o(e,r){var o=t instanceof i?t:t(r);return n("a parser is returned",o instanceof i),o._(e,s,a)}return e._(r,o,a)})},t.many=function(){var t=this;return i(function(e,n){function i(t,n){return e=t,s.push(n),!0}function r(){return!1}for(var s=[];t._(e,i,r););return n(e,s)})},t.times=function(t,e){2>arguments.length&&(e=t);var n=this;return i(function(i,r,s){function a(t,e){return u.push(e),i=t,!0}function o(t,e){return h=e,i=t,!1}function c(){return!1}var h,l,u=[],p=!0;for(l=0;t>l;l+=1)if(p=n._(i,a,o),!p)return s(i,h);for(;e>l&&p;l+=1)p=n._(i,a,c);return r(i,u)})},t.result=function(t){return this.then(a(t))},t.atMost=function(t){return this.times(0,t)},t.atLeast=function(t){var e=this;return e.times(t).then(function(t){return e.many().map(function(e){return t.concat(e)})})},t.map=function(t){return this.then(function(e){return a(t(e))})},t.skip=function(t){return this.then(function(e){return t.result(e)})},this.string=function(t){var e=t.length,n="expected '"+t+"'";return i(function(i,r,s){var a=i.slice(0,e);return a===t?r(i.slice(e),a):s(i,n)})},s=this.regex=function(t){n("regexp parser is anchored","^"===(""+t).charAt(1));var e="expected "+t;return i(function(n,i,r){var s,a=t.exec(n);return a?(s=a[0],i(n.slice(s.length),s)):r(n,e)})},a=i.succeed=function(t){return i(function(e,n){return n(e,t)})},i.fail=function(t){return i(function(e,n,i){return i(e,t)})},i.letter=s(/^[a-z]/i),i.letters=s(/^[a-z]*/i),i.digit=s(/^[0-9]/),i.digits=s(/^[0-9]*/),i.whitespace=s(/^\s+/),i.optWhitespace=s(/^\s*/),i.any=i(function(t,e,n){return t?e(t.slice(1),t.charAt(0)):n(t,"expected any character")}),i.all=i(function(t,e){return e("",t)}),o=i.eof=i(function(t,e,n){return t?n(t,"expected EOF"):e(t,t)})}),u=-1,p=1,f=c(ae,function(t){t.insDirOf=function(t,e){return t===u?this.insertBefore(e.first()):this.insertAfter(e.last())},t.insAtDirEnd=function(t,e){return t===u?this.prependTo(e):this.appendTo(e)}}),d=c(function(t){t.parent=0,t[u]=0,t[p]=0,t.init=function(t,e,n){this.parent=t,this[u]=e,this[p]=n}}),m=c(function(t){t[u]=0,t[p]=0,t.parent=0,t.init=function(){this.ends={},this.ends[u]=0,this.ends[p]=0},t.children=function(){return g(this.ends[u],this.ends[p])},t.eachChild=function(t){return this.children().each(t)},t.foldChildren=function(t,e){return this.children().fold(t,e)},t.adopt=function(t,e,n){return g(this,this).adopt(t,e,n),this},t.disown=function(){return g(this,this).disown(),this}}),g=c(function(t){function e(t,e,i){n("a parent is always present",t),n("leftward is properly set up",function(){return e?e[p]===i&&e.parent===t:t.ends[u]===i}()),n("rightward is properly set up",function(){return i?i[u]===e&&i.parent===t:t.ends[p]===e}())}t.init=function(t,e){n("no half-empty fragments",!t==!e),this.ends={},t&&(n("left end node is passed to Fragment",t instanceof m),n("right end node is passed to Fragment",e instanceof m),n("leftEnd and rightEnd have the same parent",t.parent===e.parent),this.ends[u]=t,this.ends[p]=e)},t.adopt=function(t,n,i){var r,s,a;return e(t,n,i),r=this,r.disowned=!1,(s=r.ends[u])?(a=r.ends[p],n||(t.ends[u]=s),i?i[u]=a:t.ends[p]=a,r.ends[p][p]=i,r.each(function(e){e[u]=n,e.parent=t,n&&(n[p]=e),n=e}),r):this},t.disown=function(){var t,n,i=this,r=i.ends[u];return!r||i.disowned?i:(i.disowned=!0,t=i.ends[p],n=r.parent,e(n,r[u],r),e(n,t,t[p]),r[u]?r[u][p]=t[p]:n.ends[u]=t[p],t[p]?t[p][u]=r[u]:n.ends[p]=r[u],i)},t.each=function(t){var e=this,n=e.ends[u];if(!n)return e;for(;n!==e.ends[p][p]&&t.call(e,n)!==!1;n=n[p]);return e},t.fold=function(t,e){return this.each(function(n){t=e.call(this,t,n)}),t}}),b=function(){var t=0;return function(){return t+=1}}(),v=c(m,function(t,e){t.init=function(){e.init.call(this),this.id=b(),v[this.id]=this},t.toString=function(){return"[MathElement "+this.id+"]"},t.bubble=function(t){var e,n,i=o.call(arguments,1);for(e=this;e&&(n=e[t]&&e[t].apply(e,i),n!==!1);e=e.parent);return this},t.postOrder=function(t){var e,n=o.call(arguments,1);"string"==typeof t&&(e=t,t=function(t){e in t&&t[e].apply(t,n)}),function i(e){e.eachChild(i),t(e)}(this)},t.jQ=f(),t.jQadd=function(t){this.jQ=this.jQ.add(t)},this.jQize=function(t){var e=f(t);return e.find("*").andSelf().each(function(){var t=f(this),e=t.attr("mathquill-command-id"),n=t.attr("mathquill-block-id");e&&v[e].jQadd(t),n&&v[n].jQadd(t)}),e},t.finalizeInsert=function(){var t=this;t.postOrder("finalizeTree"),t.postOrder("blur"),t.postOrder("respace"),t[p].respace&&t[p].respace(),t[u].respace&&t[u].respace(),t.postOrder("redraw"),t.bubble("redraw")}}),w=c(v,function(e,i){e.init=function(t,e,n){var r=this;i.init.call(r),r.ctrlSeq||(r.ctrlSeq=t),e&&(r.htmlTemplate=e),n&&(r.textTemplate=n)},e.replaces=function(t){t.disown(),this.replacedFragment=t},e.isEmpty=function(){return this.foldChildren(!0,function(t,e){return t&&e.isEmpty()})},e.parser=function(){var t=ie.block,e=this;return t.times(e.numBlocks()).map(function(t){e.blocks=t;for(var n=0;t.length>n;n+=1)t[n].adopt(e,e.ends[p],0);return e})},e.createLeftOf=function(t){var e=this,n=e.replacedFragment;e.createBlocks(),v.jQize(e.html()),n&&(n.adopt(e.ends[u],0,0),n.jQ.appendTo(e.ends[u].jQ)),t.jQ.before(e.jQ),t[u]=e.adopt(t.parent,t[u],t[p]),e.finalizeInsert(t),e.placeCursor(t)},e.createBlocks=function(){var t,e,n=this,i=n.numBlocks(),r=n.blocks=Array(i);for(t=0;i>t;t+=1)e=r[t]=j(),e.adopt(n,n.ends[p],0)},e.respace=t,e.placeCursor=function(t){t.insAtRightEnd(this.foldChildren(this.ends[u],function(t,e){return t.isEmpty()?t:e}))},e.remove=function(){return this.disown(),this.jQ.remove(),this.postOrder(function(t){delete v[t.id]}),this},e.numBlocks=function(){var t=this.htmlTemplate.match(/&\d+/g);return t?t.length:0},e.html=function(){var t,e,i,r=this,s=r.blocks,a=" mathquill-command-id="+r.id,o=r.htmlTemplate.match(/<[^<>]+>|[^<>]+/g);for(n("no unmatched angle brackets",o.join("")===this.htmlTemplate),t=0,e=o[0];e;t+=1,e=o[t])if("/>"===e.slice(-2))o[t]=e.slice(0,-2)+a+"/>";else if("<"===e.charAt(0)){n("not an unmatched top-level close tag","/"!==e.charAt(1)),o[t]=e.slice(0,-1)+a+">",i=1;do t+=1,e=o[t],n("no missing close tags",e),"</"===e.slice(0,2)?i-=1:"<"===e.charAt(0)&&"/>"!==e.slice(-2)&&(i+=1);while(i>0)}return o.join("").replace(/>&(\d+)/g,function(t,e){return" mathquill-block-id="+s[e].id+">"+s[e].join("html")})},e.latex=function(){return this.foldChildren(this.ctrlSeq,function(t,e){return t+"{"+(e.latex()||" ")+"}"})},e.textTemplate=[""],e.text=function(){var t=this,e=0;return t.foldChildren(t.textTemplate[e],function(n,i){e+=1;var r=i.text();return n&&"("===t.textTemplate[e]&&"("===r[0]&&")"===r.slice(-1)?n+r.slice(1,-1)+t.textTemplate[e]:n+i.text()+(t.textTemplate[e]||"")})}}),x=c(w,function(e,n){e.init=function(t,e,i){i||(i=t&&t.length>1?t.slice(1):t),n.init.call(this,t,e,[i])},e.parser=function(){return l.succeed(this)},e.numBlocks=function(){return 0},e.replaces=function(t){t.remove()},e.createBlocks=t,e.latex=function(){return this.ctrlSeq},e.text=function(){return this.textTemplate},e.placeCursor=t,e.isEmpty=function(){return!0}}),j=c(v,function(t){t.join=function(t){return this.foldChildren("",function(e,n){return e+n[t]()})},t.latex=function(){return this.join("latex")},t.text=function(){return this.ends[u]===this.ends[p]?this.ends[u].text():"("+this.join("text")+")"},t.isEmpty=function(){return 0===this.ends[u]&&0===this.ends[p]},t.write=function(t,e,n){var i;i=e.match(/^[a-eg-zA-Z]$/)?X(e):(i=C[e]||S[e])?i(e):Z(e),n&&i.replaces(n),i.createLeftOf(t)},t.focus=function(){return this.jQ.addClass("hasCursor"),this.jQ.removeClass("empty"),this},t.blur=function(){return this.jQ.removeClass("hasCursor"),this.isEmpty()&&this.jQ.addClass("empty"),this}}),k=c(g,function(t,e){t.init=function(t,n){e.init.call(this,t,n||t),this.jQ=this.fold(f(),function(t,e){return e.jQ.add(t)})},t.latex=function(){return this.fold("",function(t,e){return t+e.latex()})},t.remove=function(){return this.jQ.remove(),this.each(function(t){t.postOrder(function(t){delete v[t.id]})}),this.disown()}}),q=c(j,function(t,e){t.latex=function(){return e.latex.call(this).replace(/(\\[a-z]+) (?![a-z])/gi,"$1")},t.text=function(){return this.foldChildren("",function(t,e){return t+e.text()})},t.renderLatex=function(t){var e=this.jQ;e.children().slice(1).remove(),this.ends[u]=this.ends[p]=0,delete this.cursor.selection,this.cursor.insAtRightEnd(this).writeLatex(t)},t.onKey=function(t,e){var n;switch(t){case"Ctrl-Shift-Backspace":case"Ctrl-Backspace":for(;this.cursor[u]||this.cursor.selection;)this.cursor.backspace();break;case"Shift-Backspace":case"Backspace":this.cursor.backspace();break;case"Esc":case"Tab":case"Spacebar":if(n=this.cursor.parent,n===this.cursor.root)return"Spacebar"===t&&e.preventDefault(),a;this.cursor.prepareMove(),n[p]?this.cursor.insAtLeftEnd(n[p]):this.cursor.insRightOf(n.parent);break;case"Shift-Tab":case"Shift-Esc":case"Shift-Spacebar":if(n=this.cursor.parent,n===this.cursor.root)return"Shift-Spacebar"===t&&e.preventDefault(),a;this.cursor.prepareMove(),n[u]?this.cursor.insAtRightEnd(n[u]):this.cursor.insLeftOf(n.parent);break;case"Enter":break;case"End":this.cursor.prepareMove().insAtRightEnd(this.cursor.parent);break;case"Ctrl-End":this.cursor.prepareMove().insAtRightEnd(this);break;case"Shift-End":for(;this.cursor[p];)this.cursor.selectRight();break;case"Ctrl-Shift-End":for(;this.cursor[p]||this.cursor.parent!==this;)this.cursor.selectRight();break;case"Home":this.cursor.prepareMove().insAtLeftEnd(this.cursor.parent);break;case"Ctrl-Home":this.cursor.prepareMove().insAtLeftEnd(this);break;case"Shift-Home":for(;this.cursor[u];)this.cursor.selectLeft();break;case"Ctrl-Shift-Home":for(;this.cursor[u]||this.cursor.parent!==this;)this.cursor.selectLeft();break;case"Left":this.cursor.moveLeft();break;case"Shift-Left":this.cursor.selectLeft();break;case"Ctrl-Left":break;case"Right":this.cursor.moveRight();break;case"Shift-Right":this.cursor.selectRight();break;case"Ctrl-Right":break;case"Up":this.cursor.moveUp();break;case"Down":this.cursor.moveDown();break;case"Shift-Up":if(this.cursor[u])for(;this.cursor[u];)this.cursor.selectLeft();else this.cursor.selectLeft();case"Shift-Down":if(this.cursor[p])for(;this.cursor[p];)this.cursor.selectRight();else this.cursor.selectRight();case"Ctrl-Up":break;case"Ctrl-Down":break;case"Ctrl-Shift-Del":case"Ctrl-Del":for(;this.cursor[p]||this.cursor.selection;)this.cursor.deleteForward();break;case"Shift-Del":case"Del":this.cursor.deleteForward();break;case"Meta-A":case"Ctrl-A":if(this!==this.cursor.root)return;for(this.cursor.prepareMove().insAtRightEnd(this);this.cursor[u];)this.cursor.selectLeft();break;default:return!1}return e.preventDefault(),!1},t.onText=function(t){return this.cursor.write(t),!1}}),y=c(w,function(t,e){t.init=function(t){e.init.call(this,"$"),this.cursor=t},t.htmlTemplate='<span class="mathquill-rendered-math">&0</span>',t.createBlocks=function(){this.ends[u]=this.ends[p]=q(),this.blocks=[this.ends[u]],this.ends[u].parent=this,this.ends[u].cursor=this.cursor,this.ends[u].write=function(t,e,n){"$"!==e?j.prototype.write.call(this,t,e,n):this.isEmpty()?(t.insRightOf(this.parent).backspace().show(),Z("\\$","$").createLeftOf(t)):t[p]?t[u]?j.prototype.write.call(this,t,e,n):t.insLeftOf(this.parent):t.insRightOf(this.parent)}},t.latex=function(){return"$"+this.ends[u].latex()+"$"}}),Q=c(j,function(t){t.renderLatex=function(t){var e,n,i,r,s,a,o,c,h,f,d,m=this,g=m.cursor;if(m.jQ.children().slice(1).remove(),m.ends[u]=m.ends[p]=0,delete g.selection,g.show().insAtRightEnd(m),e=l.regex,n=l.string,i=l.eof,r=l.all,s=n("$").then(ie).skip(n("$").or(i)).map(function(t){var e,n=y(g);return n.createBlocks(),e=n.ends[u],t.children().adopt(e,0,0),n}),a=n("\\$").result("$"),o=a.or(e(/^[^$]/)).map(Z),c=s.or(o).many(),h=c.skip(i).or(r.result(!1)).parse(t)){for(f=0;h.length>f;f+=1)h[f].adopt(m,m.ends[p],0);d=m.join("html"),v.jQize(d).appendTo(m.jQ),this.finalizeInsert()}},t.onKey=function(t){"Spacebar"!==t&&"Shift-Spacebar"!==t&&q.prototype.onKey.apply(this,arguments)},t.onText=q.prototype.onText,t.write=function(t,e,n){if(n&&n.remove(),"$"===e)y(t).createLeftOf(t);else{var i;"<"===e?i="&lt;":">"===e&&(i="&gt;"),Z(e,i).createLeftOf(t)}}}),C={},S={},O=t,E=document.createElement("div"),A=E.style,R={transform:1,WebkitTransform:1,MozTransform:1,OTransform:1,msTransform:1};for(T in R)if(T in A){D=T;break}D?L=function(t,e,n){t.css(D,"scale("+e+","+n+")")}:"filter"in A?(O=function(t){t.className=t.className},L=function(t,e,n){function i(){t.css("marginRight",(r.width()-1)*(e-1)/e+"px")}var r,s;e/=1+(n-1)/2,t.css("fontSize",n+"em"),t.hasClass("matrixed-container")||t.addClass("matrixed-container").wrapInner('<span class="matrixed"></span>'),r=t.children().css("filter","progid:DXImageTransform.Microsoft.Matrix(M11="+e+",SizingMethod='auto expand')"),i(),s=setInterval(i),f(window).load(function(){clearTimeout(s),i()})}):L=function(t,e,n){t.css("fontSize",n+"em")},z=c(w,function(t,e){t.init=function(t,n,i){e.init.call(this,t,"<"+n+" "+i+">&0</"+n+">")}}),S.mathrm=e(z,"\\mathrm","span",'class="roman font"'),S.mathit=e(z,"\\mathit","i",'class="font"'),S.mathbf=e(z,"\\mathbf","b",'class="font"'),S.mathsf=e(z,"\\mathsf","span",'class="sans-serif font"'),S.mathtt=e(z,"\\mathtt","span",'class="monospace font"'),S.underline=e(z,"\\underline","span",'class="non-leaf underline"'),S.overline=S.bar=e(z,"\\overline","span",'class="non-leaf overline"'),B=c(w,function(t,e){t.init=function(t,n,i){e.init.call(this,t,"<"+n+' class="non-leaf">&0</'+n+">",[i])},t.finalizeTree=function(){function t(t){var e=this.parent,n=t;do{if(n[p])return t.insLeftOf(e),!1;n=n.parent.parent}while(n!==e);return t.insRightOf(e),!1}n("SupSub is only _ and ^","^"===this.ctrlSeq||"_"===this.ctrlSeq),"_"===this.ctrlSeq?(this.down=this.ends[u],this.ends[u].up=t):(this.up=this.ends[u],this.ends[u].down=t)},t.latex=function(){var t=this.ends[u].latex();return 1===t.length?this.ctrlSeq+t:this.ctrlSeq+"{"+(t||" ")+"}"},t.redraw=function(){this[u]&&this[u].respace(),this[u]instanceof B||(this.respace(),!this[p]||this[p]instanceof B||this[p].respace())},t.respace=function(){if("\\int "===this[u].ctrlSeq||this[u]instanceof B&&this[u].ctrlSeq!=this.ctrlSeq&&this[u][u]&&"\\int "===this[u][u].ctrlSeq?this.limit||(this.limit=!0,this.jQ.addClass("limit")):this.limit&&(this.limit=!1,this.jQ.removeClass("limit")),this.respaced=this[u]instanceof B&&this[u].ctrlSeq!=this.ctrlSeq&&!this[u].respaced,this.respaced){var t=+this.jQ.css("fontSize").slice(0,-2),e=this[u].jQ.outerWidth(),n=this.jQ.outerWidth();this.jQ.css({left:(this.limit&&"_"===this.ctrlSeq?-.25:0)-e/t+"em",marginRight:.1-he(n,e)/t+"em"})}else this.limit&&"_"===this.ctrlSeq?this.jQ.css({left:"-.25em",marginRight:""}):this.jQ.css({left:"",marginRight:""});return this[p]instanceof B&&this[p].respace(),this}}),S.subscript=S._=e(B,"_","sub","_"),S.superscript=S.supscript=S["^"]=e(B,"^","sup","**"),I=S.frac=S.dfrac=S.cfrac=S.fraction=c(w,function(t){t.ctrlSeq="\\frac",t.htmlTemplate='<span class="fraction non-leaf"><span class="numerator">&0</span><span class="denominator">&1</span><span style="display:inline-block;width:0">&nbsp;</span></span>',t.textTemplate=["(","/",")"],t.finalizeTree=function(){this.up=this.ends[p].up=this.ends[u],this.down=this.ends[u].down=this.ends[p]}}),$=S.over=C["/"]=c(I,function(t,e){t.createLeftOf=function(t){if(!this.replacedFragment){for(var n=t[u];n&&!(n instanceof V||n instanceof K||n instanceof ee||",;:".split("").indexOf(n.ctrlSeq)>-1);)n=n[u];n instanceof ee&&n[p]instanceof B&&(n=n[p],n[p]instanceof B&&n[p].ctrlSeq!=n.ctrlSeq&&(n=n[p])),n!==t[u]&&(this.replaces(k(n[p]||t.parent.ends[u],t[u])),t[u]=n)}e.createLeftOf.call(this,t)}}),_=S.sqrt=S["√"]=c(w,function(t,e){t.ctrlSeq="\\sqrt",t.htmlTemplate='<span class="non-leaf"><span class="scaled sqrt-prefix">&radic;</span><span class="non-leaf sqrt-stem">&0</span></span>',t.textTemplate=["sqrt(",")"],t.parser=function(){return ie.optBlock.then(function(t){return ie.block.map(function(e){var n=W();return n.blocks=[t,e],t.adopt(n,0,0),e.adopt(n,t,0),n})}).or(e.parser.call(this))},t.redraw=function(){var t=this.ends[p].jQ;L(t.prev(),1,t.innerHeight()/+t.css("fontSize").slice(0,-2)-.1)}}),S.vec=c(w,function(t){t.ctrlSeq="\\vec",t.htmlTemplate='<span class="non-leaf"><span class="vector-prefix">&rarr;</span><span class="vector-stem">&0</span></span>',t.textTemplate=["vec(",")"]}),W=S.nthroot=c(_,function(t){t.htmlTemplate='<sup class="nthroot non-leaf">&0</sup><span class="scaled"><span class="sqrt-prefix scaled">&radic;</span><span class="sqrt-stem non-leaf">&1</span></span>',t.textTemplate=["sqrt[","](",")"],t.latex=function(){return"\\sqrt["+this.ends[u].latex()+"]{"+this.ends[p].latex()+"}"}}),M=c(w,function(t,e){t.init=function(t,n,i,r){e.init.call(this,"\\left"+i,'<span class="non-leaf"><span class="scaled paren">'+t+"</span>"+'<span class="non-leaf">&0</span>'+'<span class="scaled paren">'+n+"</span>"+"</span>",[t,n]),this.end="\\right"+r},t.jQadd=function(){e.jQadd.apply(this,arguments);var t=this.jQ;this.bracketjQs=t.children(":first").add(t.children(":last"))},t.latex=function(){return this.ctrlSeq+this.ends[u].latex()+this.end},t.redraw=function(){var t=this.ends[u].jQ,e=t.outerHeight()/+t.css("fontSize").slice(0,-2);L(this.bracketjQs,he(1+.2*(e-1),1.2),1.05*e)}}),S.left=c(w,function(t){t.parser=function(){var t=l.regex,e=l.string,n=l.succeed,i=l.optWhitespace;return i.then(t(/^(?:[([|]|\\\{)/)).then(function(r){"\\"===r.charAt(0)&&(r=r.slice(1));var s=C[r]();return ie.map(function(t){s.blocks=[t],t.adopt(s,0,0)}).then(e("\\right")).skip(i).then(t(/^(?:[\])|]|\\\})/)).then(function(t){return t.slice(-1)!==s.end.slice(-1)?l.fail("open doesn't match close"):n(s)})})}}),S.right=c(w,function(t){t.parser=function(){return l.fail("unmatched \\right")}}),S.lbrace=C["{"]=e(M,"{","}","\\{","\\}"),S.langle=S.lang=e(M,"&lang;","&rang;","\\langle ","\\rangle "),F=c(M,function(t,e){t.createLeftOf=function(t){t[p]||!t.parent.parent||t.parent.parent.end!==this.end||this.replacedFragment?e.createLeftOf.call(this,t):t.insRightOf(t.parent.parent)},t.placeCursor=function(t){this.ends[u].blur(),t.insRightOf(this)}}),S.rbrace=C["}"]=e(F,"{","}","\\{","\\}"),S.rangle=S.rang=e(F,"&lang;","&rang;","\\langle ","\\rangle "),P=function(t,e){t.init=function(t,n){e.init.call(this,t,n,t,n)}},U=c(M,P),S.lparen=C["("]=e(U,"(",")"),S.lbrack=S.lbracket=C["["]=e(U,"[","]"),H=c(F,P),S.rparen=C[")"]=e(H,"(",")"),S.rbrack=S.rbracket=C["]"]=e(H,"[","]"),S.lpipe=S.rpipe=C["|"]=c(U,function(t,e){t.init=function(){e.init.call(this,"|","|")},t.createLeftOf=F.prototype.createLeftOf}),K=C.$=S.text=S.textnormal=S.textrm=S.textup=S.textmd=c(w,function(t,e){t.ctrlSeq="\\text",t.htmlTemplate='<span class="text">&0</span>',t.replaces=function(t){t instanceof k?this.replacedText=t.remove().jQ.text():"string"==typeof t&&(this.replacedText=t)},t.textTemplate=['"','"'],t.parser=function(){var t=this,e=l.string,n=l.regex,i=l.optWhitespace;return i.then(e("{")).then(n(/^[^}]*/)).skip(e("}")).map(function(e){var n,i,r;for(t.createBlocks(),n=t.ends[u],i=0;e.length>i;i+=1)r=Z(e.charAt(i)),r.adopt(n,n.ends[p],0);return t})},t.createBlocks=function(){this.ends[u]=this.ends[p]=N(),this.blocks=[this.ends[u]],this.ends[u].parent=this},t.finalizeInsert=function(){this.ends[u].blur=function(){return delete this.blur,this},e.finalizeInsert.call(this)},t.createLeftOf=function(t){if(e.createLeftOf.call(this,this.cursor=t),this.replacedText)for(var n=0;this.replacedText.length>n;n+=1)this.ends[u].write(t,this.replacedText.charAt(n))}}),N=c(j,function(t,e){t.onKey=function(t){return"Spacebar"===t||"Shift-Spacebar"===t?!1:a},t.deleteOutOf=function(t,e){this.isEmpty()&&e.insRightOf(this.parent)},t.write=function(t,e,n){var i,r;return n&&n.remove(),"$"!==e?("<"===e?i="&lt;":">"===e&&(i="&gt;"),Z(e,i).createLeftOf(t)):this.isEmpty()?(t.insRightOf(this.parent).backspace(),Z("\\$","$").createLeftOf(t)):t[p]?t[u]?(r=K(),r.replaces(k(t[p],this.ends[p])),t.insRightOf(this.parent),r.adopt=function(){delete this.adopt,this.adopt.apply(this,arguments),this[u]=0},r.createLeftOf(t),r[u]=this.parent,t.insLeftOf(r)):t.insLeftOf(this.parent):t.insRightOf(this.parent),!1},t.blur=function(){if(this.jQ.removeClass("hasCursor"),this.isEmpty()){var t=this.parent,e=t.cursor;e.parent===this?this.jQ.addClass("empty"):(e.hide(),t.remove(),e[p]===t?e[p]=t[p]:e[u]===t&&(e[u]=t[u]),e.show().parent.bubble("redraw"))}return this},t.focus=function(){var t,n,i,r;return e.focus.call(this),t=this.parent,t[p].ctrlSeq===t.ctrlSeq?(n=this,i=t.cursor,r=t[p].ends[u],r.eachChild(function(t){t.parent=n,t.jQ.appendTo(n.jQ)}),this.ends[p]?this.ends[p][p]=r.ends[u]:this.ends[u]=r.ends[u],r.ends[u][u]=this.ends[p],this.ends[p]=r.ends[p],r.parent.remove(),i[u]?i.insRightOf(i[u]):i.insAtLeftEnd(this),i.parent.bubble("redraw")):t[u].ctrlSeq===t.ctrlSeq&&(i=t.cursor,i[u]?t[u].ends[u].focus():i.insAtRightEnd(t[u].ends[u])),this}}),S.em=S.italic=S.italics=S.emph=S.textit=S.textsl=s("\\textit","i",'class="text"'),S.strong=S.bold=S.textbf=s("\\textbf","b",'class="text"'),S.sf=S.textsf=s("\\textsf","span",'class="sans-serif text"'),S.tt=S.texttt=s("\\texttt","span",'class="monospace text"'),S.textsc=s("\\textsc","span",'style="font-variant:small-caps" class="text"'),S.uppercase=s("\\uppercase","span",'style="text-transform:uppercase" class="text"'),S.lowercase=s("\\lowercase","span",'style="text-transform:lowercase" class="text"'),C["\\"]=c(w,function(t,e){t.ctrlSeq="\\",t.replaces=function(t){this._replacedFragment=t.disown(),this.isEmpty=function(){return!1}},t.htmlTemplate='<span class="latex-command-input non-leaf">\\<span>&0</span></span>',t.textTemplate=["\\"],t.createBlocks=function(){e.createBlocks.call(this),this.ends[u].focus=function(){return this.parent.jQ.addClass("hasCursor"),this.isEmpty()&&this.parent.jQ.removeClass("empty"),this},this.ends[u].blur=function(){return this.parent.jQ.removeClass("hasCursor"),this.isEmpty()&&this.parent.jQ.addClass("empty"),this}},t.createLeftOf=function(t){if(e.createLeftOf.call(this,t),this.cursor=t.insAtRightEnd(this.ends[u]),this._replacedFragment){var n=this.jQ[0];this.jQ=this._replacedFragment.jQ.addClass("blur").bind("mousedown mousemove",function(t){return f(t.target=n).trigger(t),!1}).insertBefore(this.jQ).add(this.jQ)}this.ends[u].write=function(t,e,n){n&&n.remove(),e.match(/[a-z]/i)?Z(e).createLeftOf(t):(this.parent.renderCommand(),"\\"===e&&this.isEmpty()||this.parent.parent.write(t,e))}},t.latex=function(){return"\\"+this.ends[u].latex()+" "},t.onKey=function(t,e){return"Tab"===t||"Enter"===t||"Spacebar"===t?(this.renderCommand(),e.preventDefault(),!1):a},t.renderCommand=function(){this.jQ=this.jQ.last(),this.remove(),this[p]?this.cursor.insLeftOf(this[p]):this.cursor.insAtRightEnd(this.parent);var t=this.ends[u].latex();t||(t="backslash"),this.cursor.insertCmd(t,this._replacedFragment)}}),G=S.binom=S.binomial=c(w,function(t){t.ctrlSeq="\\binom",t.htmlTemplate='<span class="paren scaled">(</span><span class="non-leaf"><span class="array non-leaf"><span>&0</span><span>&1</span></span></span><span class="paren scaled">)</span>',t.textTemplate=["choose(",",",")"],t.redraw=function(){var t=this.jQ.eq(1),e=t.outerHeight()/+t.css("fontSize").slice(0,-2),n=this.jQ.filter(".paren");L(n,he(1+.2*(e-1),1.2),1.05*e)}}),S.choose=c(G,function(t){t.createLeftOf=$.prototype.createLeftOf}),S.vector=c(w,function(t,e){t.ctrlSeq="\\vector",t.htmlTemplate='<span class="array"><span>&0</span></span>',t.latex=function(){return"\\begin{matrix}"+this.foldChildren([],function(t,e){return t.push(e.latex()),t}).join("\\\\")+"\\end{matrix}"},t.text=function(){return"["+this.foldChildren([],function(t,e){return t.push(e.text()),t}).join()+"]"},t.createLeftOf=function(t){e.createLeftOf.call(this,this.cursor=t)},t.onKey=function(t,e){var n,i=this.cursor.parent;if(i.parent===this){if("Enter"===t)return n=j(),n.parent=this,n.jQ=f("<span></span>").attr(ce,n.id).insertAfter(i.jQ),i[p]?i[p][u]=n:this.ends[p]=n,n[p]=i[p],i[p]=n,n[u]=i,this.bubble("redraw").cursor.insAtRightEnd(n),e.preventDefault(),!1;if("Tab"===t&&!i[p])return i.isEmpty()?i[u]?(this.cursor.insRightOf(this),delete i[u][p],this.ends[p]=i[u],i.jQ.remove(),this.bubble("redraw"),e.preventDefault(),!1):a:(n=j(),n.parent=this,n.jQ=f("<span></span>").attr(ce,n.id).appendTo(this.jQ),this.ends[p]=n,i[p]=n,n[u]=i,this.bubble("redraw").cursor.insAtRightEnd(n),e.preventDefault(),!1);if(8===e.which){if(i.isEmpty())return i[u]?(this.cursor.insAtRightEnd(i[u]),i[u][p]=i[p]):(this.cursor.insLeftOf(this),this.ends[u]=i[p]),i[p]?i[p][u]=i[u]:this.ends[p]=i[u],i.jQ.remove(),this.isEmpty()?this.cursor.deleteForward():this.bubble("redraw"),e.preventDefault(),!1;if(!this.cursor[u])return e.preventDefault(),!1}}}}),S.editable=c(y,function(t,e){t.init=function(){w.prototype.init.call(this,"\\editable")},t.jQadd=function(){var t,n,i=this;e.jQadd.apply(i,arguments),t=i.ends[u].disown(),n=i.jQ.children().detach(),i.ends[u]=i.ends[p]=q(),i.blocks=[i.ends[u]],i.ends[u].parent=i,r(i.jQ,i.ends[u],!1,!0),i.cursor=i.ends[u].cursor,t.children().adopt(i.ends[u],0,0),n.appendTo(i.ends[u].jQ),i.ends[u].cursor.insAtRightEnd(i.ends[u])},t.latex=function(){return this.ends[u].latex()},t.text=function(){return this.ends[u].text()}}),S.f=e(x,"f",'<var class="florin">&fnof;</var><span style="display:inline-block;width:0">&nbsp;</span>'),X=c(x,function(t,e){t.init=function(t,n){e.init.call(this,t,"<var>"+(n||t)+"</var>")},t.text=function(){var t=this.ctrlSeq;return!this[u]||this[u]instanceof X||this[u]instanceof V||(t="*"+t),!this[p]||this[p]instanceof V||"^"===this[p].ctrlSeq||(t+="*"),t}}),Z=c(x,function(t,e){t.init=function(t,n){e.init.call(this,t,"<span>"+(n||t)+"</span>")}}),C[" "]=e(Z,"\\:"," "),S.prime=C["'"]=e(Z,"'","&prime;"),Y=c(x,function(t,e){t.init=function(t,n){e.init.call(this,t,'<span class="nonSymbola">'+(n||t)+"</span>")}}),S["@"]=Y,S["&"]=e(Y,"\\&","&amp;"),S["%"]=e(Y,"\\%","%"),S.alpha=S.beta=S.gamma=S.delta=S.zeta=S.eta=S.theta=S.iota=S.kappa=S.mu=S.nu=S.xi=S.rho=S.sigma=S.tau=S.chi=S.psi=S.omega=c(X,function(t,e){t.init=function(t){e.init.call(this,"\\"+t+" ","&"+t+";")}}),S.phi=e(X,"\\phi ","&#981;"),S.phiv=S.varphi=e(X,"\\varphi ","&phi;"),S.epsilon=e(X,"\\epsilon ","&#1013;"),S.epsiv=S.varepsilon=e(X,"\\varepsilon ","&epsilon;"),S.piv=S.varpi=e(X,"\\varpi ","&piv;"),S.sigmaf=S.sigmav=S.varsigma=e(X,"\\varsigma ","&sigmaf;"),S.thetav=S.vartheta=S.thetasym=e(X,"\\vartheta ","&thetasym;"),S.upsilon=S.upsi=e(X,"\\upsilon ","&upsilon;"),S.gammad=S.Gammad=S.digamma=e(X,"\\digamma ","&#989;"),S.kappav=S.varkappa=e(X,"\\varkappa ","&#1008;"),S.rhov=S.varrho=e(X,"\\varrho ","&#1009;"),S.pi=S["π"]=e(Y,"\\pi ","&pi;"),S.lambda=e(Y,"\\lambda ","&lambda;"),S.Upsilon=S.Upsi=S.upsih=S.Upsih=e(x,"\\Upsilon ",'<var style="font-family: serif">&upsih;</var>'),S.Gamma=S.Delta=S.Theta=S.Lambda=S.Xi=S.Pi=S.Sigma=S.Phi=S.Psi=S.Omega=S.forall=c(Z,function(t,e){t.init=function(t){e.init.call(this,"\\"+t+" ","&"+t+";")}}),J=c(w,function(t){t.init=function(t){this.latex=t},t.createLeftOf=function(t){t.writeLatex(this.latex)},t.parser=function(){var t=ie.parse(this.latex).children();return l.succeed(t)}}),S["¹"]=e(J,"^1"),S["²"]=e(J,"^2"),S["³"]=e(J,"^3"),S["¼"]=e(J,"\\frac14"),S["½"]=e(J,"\\frac12"),S["¾"]=e(J,"\\frac34"),V=c(x,function(t,e){t.init=function(t,n,i){e.init.call(this,t,'<span class="binary-operator">'+n+"</span>",i)
+}}),te=c(V,function(t){t.init=Z.prototype.init,t.respace=function(){return this.jQ[0].className=this[u]?this[u]instanceof V&&this[p]&&!(this[p]instanceof V)?"unary-operator":"binary-operator":"",this}}),S["+"]=e(te,"+","+"),S["–"]=S["-"]=e(te,"-","&minus;"),S["±"]=S.pm=S.plusmn=S.plusminus=e(te,"\\pm ","&plusmn;"),S.mp=S.mnplus=S.minusplus=e(te,"\\mp ","&#8723;"),C["*"]=S.sdot=S.cdot=e(V,"\\cdot ","&middot;"),S["="]=e(V,"=","="),S["<"]=e(V,"<","&lt;"),S[">"]=e(V,">","&gt;"),S.notin=S.sim=S.cong=S.equiv=S.oplus=S.otimes=c(V,function(t,e){t.init=function(t){e.init.call(this,"\\"+t+" ","&"+t+";")}}),S.times=e(V,"\\times ","&times;","[x]"),S["÷"]=S.div=S.divide=S.divides=e(V,"\\div ","&divide;","[/]"),S["≠"]=S.ne=S.neq=e(V,"\\ne ","&ne;"),S.ast=S.star=S.loast=S.lowast=e(V,"\\ast ","&lowast;"),S.therefor=S.therefore=e(V,"\\therefore ","&there4;"),S.cuz=S.because=e(V,"\\because ","&#8757;"),S.prop=S.propto=e(V,"\\propto ","&prop;"),S["≈"]=S.asymp=S.approx=e(V,"\\approx ","&asymp;"),S.lt=e(V,"<","&lt;"),S.gt=e(V,">","&gt;"),S["≤"]=S.le=S.leq=e(V,"\\le ","&le;"),S["≥"]=S.ge=S.geq=e(V,"\\ge ","&ge;"),S.isin=S["in"]=e(V,"\\in ","&isin;"),S.ni=S.contains=e(V,"\\ni ","&ni;"),S.notni=S.niton=S.notcontains=S.doesnotcontain=e(V,"\\not\\ni ","&#8716;"),S.sub=S.subset=e(V,"\\subset ","&sub;"),S.sup=S.supset=S.superset=e(V,"\\supset ","&sup;"),S.nsub=S.notsub=S.nsubset=S.notsubset=e(V,"\\not\\subset ","&#8836;"),S.nsup=S.notsup=S.nsupset=S.notsupset=S.nsuperset=S.notsuperset=e(V,"\\not\\supset ","&#8837;"),S.sube=S.subeq=S.subsete=S.subseteq=e(V,"\\subseteq ","&sube;"),S.supe=S.supeq=S.supsete=S.supseteq=S.supersete=S.superseteq=e(V,"\\supseteq ","&supe;"),S.nsube=S.nsubeq=S.notsube=S.notsubeq=S.nsubsete=S.nsubseteq=S.notsubsete=S.notsubseteq=e(V,"\\not\\subseteq ","&#8840;"),S.nsupe=S.nsupeq=S.notsupe=S.notsupeq=S.nsupsete=S.nsupseteq=S.notsupsete=S.notsupseteq=S.nsupersete=S.nsuperseteq=S.notsupersete=S.notsuperseteq=e(V,"\\not\\supseteq ","&#8841;"),ee=c(x,function(t,e){t.init=function(t,n){e.init.call(this,t,"<big>"+n+"</big>")}}),S["∑"]=S.sum=S.summation=e(ee,"\\sum ","&sum;"),S["∏"]=S.prod=S.product=e(ee,"\\prod ","&prod;"),S.coprod=S.coproduct=e(ee,"\\coprod ","&#8720;"),S["∫"]=S["int"]=S.integral=e(ee,"\\int ","&int;"),S.N=S.naturals=S.Naturals=e(Z,"\\mathbb{N}","&#8469;"),S.P=S.primes=S.Primes=S.projective=S.Projective=S.probability=S.Probability=e(Z,"\\mathbb{P}","&#8473;"),S.Z=S.integers=S.Integers=e(Z,"\\mathbb{Z}","&#8484;"),S.Q=S.rationals=S.Rationals=e(Z,"\\mathbb{Q}","&#8474;"),S.R=S.reals=S.Reals=e(Z,"\\mathbb{R}","&#8477;"),S.C=S.complex=S.Complex=S.complexes=S.Complexes=S.complexplane=S.Complexplane=S.ComplexPlane=e(Z,"\\mathbb{C}","&#8450;"),S.H=S.Hamiltonian=S.quaternions=S.Quaternions=e(Z,"\\mathbb{H}","&#8461;"),S.quad=S.emsp=e(Z,"\\quad ","    "),S.qquad=e(Z,"\\qquad ","        "),S.diamond=e(Z,"\\diamond ","&#9671;"),S.bigtriangleup=e(Z,"\\bigtriangleup ","&#9651;"),S.ominus=e(Z,"\\ominus ","&#8854;"),S.uplus=e(Z,"\\uplus ","&#8846;"),S.bigtriangledown=e(Z,"\\bigtriangledown ","&#9661;"),S.sqcap=e(Z,"\\sqcap ","&#8851;"),S.triangleleft=e(Z,"\\triangleleft ","&#8882;"),S.sqcup=e(Z,"\\sqcup ","&#8852;"),S.triangleright=e(Z,"\\triangleright ","&#8883;"),S.odot=e(Z,"\\odot ","&#8857;"),S.bigcirc=e(Z,"\\bigcirc ","&#9711;"),S.dagger=e(Z,"\\dagger ","&#0134;"),S.ddagger=e(Z,"\\ddagger ","&#135;"),S.wr=e(Z,"\\wr ","&#8768;"),S.amalg=e(Z,"\\amalg ","&#8720;"),S.models=e(Z,"\\models ","&#8872;"),S.prec=e(Z,"\\prec ","&#8826;"),S.succ=e(Z,"\\succ ","&#8827;"),S.preceq=e(Z,"\\preceq ","&#8828;"),S.succeq=e(Z,"\\succeq ","&#8829;"),S.simeq=e(Z,"\\simeq ","&#8771;"),S.mid=e(Z,"\\mid ","&#8739;"),S.ll=e(Z,"\\ll ","&#8810;"),S.gg=e(Z,"\\gg ","&#8811;"),S.parallel=e(Z,"\\parallel ","&#8741;"),S.bowtie=e(Z,"\\bowtie ","&#8904;"),S.sqsubset=e(Z,"\\sqsubset ","&#8847;"),S.sqsupset=e(Z,"\\sqsupset ","&#8848;"),S.smile=e(Z,"\\smile ","&#8995;"),S.sqsubseteq=e(Z,"\\sqsubseteq ","&#8849;"),S.sqsupseteq=e(Z,"\\sqsupseteq ","&#8850;"),S.doteq=e(Z,"\\doteq ","&#8784;"),S.frown=e(Z,"\\frown ","&#8994;"),S.vdash=e(Z,"\\vdash ","&#8870;"),S.dashv=e(Z,"\\dashv ","&#8867;"),S.longleftarrow=e(Z,"\\longleftarrow ","&#8592;"),S.longrightarrow=e(Z,"\\longrightarrow ","&#8594;"),S.Longleftarrow=e(Z,"\\Longleftarrow ","&#8656;"),S.Longrightarrow=e(Z,"\\Longrightarrow ","&#8658;"),S.longleftrightarrow=e(Z,"\\longleftrightarrow ","&#8596;"),S.updownarrow=e(Z,"\\updownarrow ","&#8597;"),S.Longleftrightarrow=e(Z,"\\Longleftrightarrow ","&#8660;"),S.Updownarrow=e(Z,"\\Updownarrow ","&#8661;"),S.mapsto=e(Z,"\\mapsto ","&#8614;"),S.nearrow=e(Z,"\\nearrow ","&#8599;"),S.hookleftarrow=e(Z,"\\hookleftarrow ","&#8617;"),S.hookrightarrow=e(Z,"\\hookrightarrow ","&#8618;"),S.searrow=e(Z,"\\searrow ","&#8600;"),S.leftharpoonup=e(Z,"\\leftharpoonup ","&#8636;"),S.rightharpoonup=e(Z,"\\rightharpoonup ","&#8640;"),S.swarrow=e(Z,"\\swarrow ","&#8601;"),S.leftharpoondown=e(Z,"\\leftharpoondown ","&#8637;"),S.rightharpoondown=e(Z,"\\rightharpoondown ","&#8641;"),S.nwarrow=e(Z,"\\nwarrow ","&#8598;"),S.ldots=e(Z,"\\ldots ","&#8230;"),S.cdots=e(Z,"\\cdots ","&#8943;"),S.vdots=e(Z,"\\vdots ","&#8942;"),S.ddots=e(Z,"\\ddots ","&#8944;"),S.surd=e(Z,"\\surd ","&#8730;"),S.triangle=e(Z,"\\triangle ","&#9653;"),S.ell=e(Z,"\\ell ","&#8467;"),S.top=e(Z,"\\top ","&#8868;"),S.flat=e(Z,"\\flat ","&#9837;"),S.natural=e(Z,"\\natural ","&#9838;"),S.sharp=e(Z,"\\sharp ","&#9839;"),S.wp=e(Z,"\\wp ","&#8472;"),S.bot=e(Z,"\\bot ","&#8869;"),S.clubsuit=e(Z,"\\clubsuit ","&#9827;"),S.diamondsuit=e(Z,"\\diamondsuit ","&#9826;"),S.heartsuit=e(Z,"\\heartsuit ","&#9825;"),S.spadesuit=e(Z,"\\spadesuit ","&#9824;"),S.oint=e(Z,"\\oint ","&#8750;"),S.bigcap=e(Z,"\\bigcap ","&#8745;"),S.bigcup=e(Z,"\\bigcup ","&#8746;"),S.bigsqcup=e(Z,"\\bigsqcup ","&#8852;"),S.bigvee=e(Z,"\\bigvee ","&#8744;"),S.bigwedge=e(Z,"\\bigwedge ","&#8743;"),S.bigodot=e(Z,"\\bigodot ","&#8857;"),S.bigotimes=e(Z,"\\bigotimes ","&#8855;"),S.bigoplus=e(Z,"\\bigoplus ","&#8853;"),S.biguplus=e(Z,"\\biguplus ","&#8846;"),S.lfloor=e(Z,"\\lfloor ","&#8970;"),S.rfloor=e(Z,"\\rfloor ","&#8971;"),S.lceil=e(Z,"\\lceil ","&#8968;"),S.rceil=e(Z,"\\rceil ","&#8969;"),S.slash=e(Z,"\\slash ","&#47;"),S.opencurlybrace=e(Z,"\\opencurlybrace ","&#123;"),S.closecurlybrace=e(Z,"\\closecurlybrace ","&#125;"),S.caret=e(Z,"\\caret ","^"),S.underscore=e(Z,"\\underscore ","_"),S.backslash=e(Z,"\\backslash ","\\"),S.vert=e(Z,"|"),S.perp=S.perpendicular=e(Z,"\\perp ","&perp;"),S.nabla=S.del=e(Z,"\\nabla ","&nabla;"),S.hbar=e(Z,"\\hbar ","&#8463;"),S.AA=S.Angstrom=S.angstrom=e(Z,"\\text\\AA ","&#8491;"),S.ring=S.circ=S.circle=e(Z,"\\circ ","&#8728;"),S.bull=S.bullet=e(Z,"\\bullet ","&bull;"),S.setminus=S.smallsetminus=e(Z,"\\setminus ","&#8726;"),S.not=S["¬"]=S.neg=e(Z,"\\neg ","&not;"),S["…"]=S.dots=S.ellip=S.hellip=S.ellipsis=S.hellipsis=e(Z,"\\dots ","&hellip;"),S.converges=S.darr=S.dnarr=S.dnarrow=S.downarrow=e(Z,"\\downarrow ","&darr;"),S.dArr=S.dnArr=S.dnArrow=S.Downarrow=e(Z,"\\Downarrow ","&dArr;"),S.diverges=S.uarr=S.uparrow=e(Z,"\\uparrow ","&uarr;"),S.uArr=S.Uparrow=e(Z,"\\Uparrow ","&uArr;"),S.to=e(V,"\\to ","&rarr;"),S.rarr=S.rightarrow=e(Z,"\\rightarrow ","&rarr;"),S.implies=e(V,"\\Rightarrow ","&rArr;"),S.rArr=S.Rightarrow=e(Z,"\\Rightarrow ","&rArr;"),S.gets=e(V,"\\gets ","&larr;"),S.larr=S.leftarrow=e(Z,"\\leftarrow ","&larr;"),S.impliedby=e(V,"\\Leftarrow ","&lArr;"),S.lArr=S.Leftarrow=e(Z,"\\Leftarrow ","&lArr;"),S.harr=S.lrarr=S.leftrightarrow=e(Z,"\\leftrightarrow ","&harr;"),S.iff=e(V,"\\Leftrightarrow ","&hArr;"),S.hArr=S.lrArr=S.Leftrightarrow=e(Z,"\\Leftrightarrow ","&hArr;"),S.Re=S.Real=S.real=e(Z,"\\Re ","&real;"),S.Im=S.imag=S.image=S.imagin=S.imaginary=S.Imaginary=e(Z,"\\Im ","&image;"),S.part=S.partial=e(Z,"\\partial ","&part;"),S.inf=S.infin=S.infty=S.infinity=e(Z,"\\infty ","&infin;"),S.alef=S.alefsym=S.aleph=S.alephsym=e(Z,"\\aleph ","&alefsym;"),S.xist=S.xists=S.exist=S.exists=e(Z,"\\exists ","&exist;"),S.and=S.land=S.wedge=e(Z,"\\wedge ","&and;"),S.or=S.lor=S.vee=e(Z,"\\vee ","&or;"),S.o=S.O=S.empty=S.emptyset=S.oslash=S.Oslash=S.nothing=S.varnothing=e(V,"\\varnothing ","&empty;"),S.cup=S.union=e(V,"\\cup ","&cup;"),S.cap=S.intersect=S.intersection=e(V,"\\cap ","&cap;"),S.deg=S.degree=e(Z,"^\\circ ","&deg;"),S.ang=S.angle=e(Z,"\\angle ","&ang;"),ne=c(x,function(t,e){t.init=function(t){e.init.call(this,"\\"+t+" ","<span>"+t+"</span>")},t.respace=function(){this.jQ[0].className=this[p]instanceof B||this[p]instanceof M?"":"non-italicized-function"}}),S.ln=S.lg=S.log=S.span=S.proj=S.det=S.dim=S.min=S.max=S.mod=S.lcm=S.gcd=S.gcf=S.hcf=S.lim=ne,function(){var t,e=["sin","cos","tan","sec","cosec","csc","cotan","cot"];for(t in e)S[e[t]]=S[e[t]+"h"]=S["a"+e[t]]=S["arc"+e[t]]=S["a"+e[t]+"h"]=S["arc"+e[t]+"h"]=ne}(),ie=function(){function t(t){var e=j();return t.adopt(e,0,0),e}function e(t){var e,n=t[0]||j();for(e=1;t.length>e;e+=1)t[e].children().adopt(n,n.ends[p],0);return n}var n=l.string,i=l.regex,r=l.letter,s=l.any,a=l.optWhitespace,o=l.succeed,c=l.fail,h=r.map(X),u=i(/^[^${}\\_^]/).map(Z),f=i(/^[^\\a-eg-zA-Z]/).or(n("\\").then(i(/^[a-z]+/i).or(i(/^\s+/).result(" ")).or(s))).then(function(t){var e=S[t];return e?e(t).parser():c("unknown command: \\"+t)}),d=f.or(h).or(u),m=n("{").then(function(){return b}).skip(n("}")),g=a.then(m.or(d.map(t))),b=g.many().map(e).skip(a),v=n("[").then(g.then(function(t){return"]"!==t.join("latex")?o(t):c()}).many().map(e).skip(a)).skip(n("]")),w=b;return w.block=g,w.optBlock=v,w}(),re=c(d,function(t){function e(t,e){var i,r,s,a;if(t[p][e])t.insAtLeftEnd(t[p][e]);else if(t[u][e])t.insAtRightEnd(t[u][e]);else{i=t.parent;do{if(r=i[e],r&&("function"==typeof r&&(r=i[e](t)),r===!1||r instanceof j)){t.upDownCache[i.id]=d(t.parent,t[u],t[p]),r instanceof j&&(s=t.upDownCache[r.id],s?s[p]?t.insLeftOf(s[p]):t.insAtRightEnd(s.parent):(a=n(t).left,t.insAtRightEnd(r),t.seekHoriz(a,r)));break}i=i.parent.parent}while(i)}return t.clearSelection().show()}function n(t){var e=t.jQ.removeClass("cursor").offset();return t.jQ.addClass("cursor"),e}function r(t){t.upDownCache={}}t.init=function(t){this.parent=this.root=t;var e=this.jQ=this._jQ=f('<span class="cursor">&zwj;</span>');this.blink=function(){e.toggleClass("blink")},this.upDownCache={}},t.show=function(){return this.jQ=this._jQ.removeClass("blink"),"intervalId"in this?clearInterval(this.intervalId):(this[p]?this.selection&&this.selection.ends[u][u]===this[u]?this.jQ.insertBefore(this.selection.jQ):this.jQ.insertBefore(this[p].jQ.first()):this.jQ.appendTo(this.parent.jQ),this.parent.focus()),this.intervalId=setInterval(this.blink,500),this},t.hide=function(){return"intervalId"in this&&clearInterval(this.intervalId),delete this.intervalId,this.jQ.detach(),this.jQ=f(),this},t.withDirInsertAt=function(t,e,n,i){var r=this.parent;this.parent=e,this[t]=n,this[-t]=i,r.blur()},t.insDirOf=function(t,e){return i(t),this.withDirInsertAt(t,e.parent,e[t],e),this.parent.jQ.addClass("hasCursor"),this.jQ.insDirOf(t,e.jQ),this},t.insLeftOf=function(t){return this.insDirOf(u,t)},t.insRightOf=function(t){return this.insDirOf(p,t)},t.insAtDirEnd=function(t,e){return i(t),this.withDirInsertAt(t,e,0,e.ends[t]),t===u&&e.textarea?this.jQ.insDirOf(-t,e.textarea):this.jQ.insAtDirEnd(t,e.jQ),e.focus(),this},t.insAtLeftEnd=function(t){return this.insAtDirEnd(u,t)},t.insAtRightEnd=function(t){return this.insAtDirEnd(p,t)},t.hopDir=function(t){return i(t),this.jQ.insDirOf(t,this[t].jQ),this[-t]=this[t],this[t]=this[t][t],this},t.hopLeft=function(){return this.hopDir(u)},t.hopRight=function(){return this.hopDir(p)},t.moveDirWithin=function(t,e){if(i(t),this[t])this[t].ends[-t]?this.insAtDirEnd(-t,this[t].ends[-t]):this.hopDir(t);else{if(this.parent===e)return;this.parent[t]?this.insAtDirEnd(-t,this.parent[t]):this.insDirOf(t,this.parent.parent)}},t.moveLeftWithin=function(t){return this.moveDirWithin(u,t)},t.moveRightWithin=function(t){return this.moveDirWithin(p,t)},t.moveDir=function(t){return i(t),r(this),this.selection?this.insDirOf(t,this.selection.ends[t]).clearSelection():this.moveDirWithin(t,this.root),this.show()},t.moveLeft=function(){return this.moveDir(u)},t.moveRight=function(){return this.moveDir(p)},t.moveUp=function(){return e(this,"up")},t.moveDown=function(){return e(this,"down")},t.seek=function(t,e){r(this);var n,i,s=this.clearSelection().show();return t.hasClass("empty")?(s.insAtLeftEnd(v[t.attr(ce)]),s):(n=v[t.attr(oe)],n instanceof x?(t.outerWidth()>2*(e-t.offset().left)?s.insLeftOf(n):s.insRightOf(n),s):(n||(i=v[t.attr(ce)],i||(t=t.parent(),n=v[t.attr(oe)],n||(i=v[t.attr(ce)],i||(i=s.root)))),n?s.insRightOf(n):s.insAtRightEnd(i),s.seekHoriz(e,s.root)))},t.seekHoriz=function(t,e){var i,r=this,s=n(r).left-t;do r.moveLeftWithin(e),i=s,s=n(r).left-t;while(s>0&&(r[u]||r.parent!==e));return-s>i&&r.moveRightWithin(e),r},t.writeLatex=function(t){var e,n,i,s=this;return r(s),s.show().deleteSelection(),e=l.all,n=l.eof,i=ie.skip(n).or(e.result(!1)).parse(t),i&&(i.children().adopt(s.parent,s[u],s[p]),v.jQize(i.join("html")).insertBefore(s.jQ),s[u]=i.ends[p],i.finalizeInsert(),s.parent.bubble("redraw")),this.hide()},t.write=function(t){var e=this.prepareWrite();return this.insertCh(t,e)},t.insertCh=function(t,e){return this.parent.write(this,t,e),this},t.insertCmd=function(t,e){var n=S[t];return n?(n=n(t),e&&n.replaces(e),n.createLeftOf(this)):(n=K(),n.replaces(t),n.ends[u].focus=function(){return delete this.focus,this},n.createLeftOf(this),this.insRightOf(n),e&&e.remove()),this},t.unwrapGramp=function(){var t=this.parent.parent,e=t.parent,n=t[p],i=t[u];if(t.disown().eachChild(function(r){r.isEmpty()||(r.children().adopt(e,i,n).each(function(e){e.jQ.insertBefore(t.jQ.first())}),i=r.ends[p])}),!this[p])if(this[u])this[p]=this[u][p];else for(;!this[p];){if(this.parent=this.parent[p],!this.parent){this[p]=t[p],this.parent=e;break}this[p]=this.parent.ends[u]}this[p]?this.insLeftOf(this[p]):this.insAtRightEnd(e),t.jQ.remove(),t[u]&&t[u].respace(),t[p]&&t[p].respace()},t.deleteDir=function(t){if(i(t),r(this),this.show(),this.deleteSelection());else if(this[t])this[t].isEmpty()?this[t]=this[t].remove()[t]:this.selectDir(t);else if(this.parent!==this.root){if(this.parent.parent.isEmpty())return this.insDirOf(-t,this.parent.parent).deleteDir(t);this.unwrapGramp()}return this[u]&&this[u].respace(),this[p]&&this[p].respace(),this.parent.bubble("redraw"),this},t.backspace=function(){return this.deleteDir(u)},t.deleteForward=function(){return this.deleteDir(p)},t.selectFrom=function(t){var e,n,i,r,s,a,o=this,c=t;t:for(;;){for(e=this;e!==o.parent.parent;e=e.parent.parent)if(e.parent===c.parent){i=e,r=c;break t}for(n=t;n!==c.parent.parent;n=n.parent.parent)if(o.parent===n.parent){i=o,r=n;break t}o.parent.parent&&(o=o.parent.parent),c.parent.parent&&(c=c.parent.parent)}if(i[p]!==r){for(a=i;a;a=a[p])if(a===r[u]){s=!0;break}s||(s=r,r=i,i=s)}this.hide().selection=se(i[u][p]||i.parent.ends[u],r[p][u]||r.parent.ends[p]),this.insRightOf(r[p][u]||r.parent.ends[p]),this.root.selectionChanged()},t.selectDir=function(t){if(i(t),r(this),this.selection)if(this.selection.ends[t]===this[-t])this[t]?this.hopDir(t).selection.extendDir(t):this.parent!==this.root&&this.insDirOf(t,this.parent.parent).selection.levelUp();else{if(this.hopDir(t),this.selection.ends[t]===this.selection.ends[-t])return this.clearSelection().show(),a;this.selection.retractDir(t)}else{if(this[t])this.hopDir(t);else{if(this.parent===this.root)return;this.insDirOf(t,this.parent.parent)}this.hide().selection=se(this[-t])}this.root.selectionChanged()},t.selectLeft=function(){return this.selectDir(u)},t.selectRight=function(){return this.selectDir(p)},t.prepareMove=function(){return r(this),this.show().clearSelection()},t.prepareEdit=function(){return r(this),this.show().deleteSelection()},t.prepareWrite=function(){return r(this),this.show().replaceSelection()},t.clearSelection=function(){return this.selection&&(this.selection.clear(),delete this.selection,this.root.selectionChanged()),this},t.deleteSelection=function(){return this.selection?(this[u]=this.selection.ends[u][u],this[p]=this.selection.ends[p][p],this.selection.remove(),this.root.selectionChanged(),delete this.selection):!1},t.replaceSelection=function(){var t=this.selection;return t&&(this[u]=t.ends[u][u],this[p]=t.ends[p][p],delete this.selection),t}}),se=c(k,function(t,e){t.init=function(){var t=this;e.init.apply(t,arguments),t.jQwrap(t.jQ)},t.jQwrap=function(t){this.jQ=t.wrapAll('<span class="selection"></span>').parent()},t.adopt=function(){return this.jQ.replaceWith(this.jQ=this.jQ.children()),e.adopt.apply(this,arguments)},t.clear=function(){return this.jQ.replaceWith(this.jQ.children()),this},t.levelUp=function(){var t=this,e=t.ends[u]=t.ends[p]=t.ends[p].parent.parent;return t.clear().jQwrap(e.jQ),t},t.extendDir=function(t){return i(t),this.ends[t]=this.ends[t][t],this.ends[t].jQ.insAtDirEnd(t,this.jQ),this},t.extendLeft=function(){return this.extendDir(u)},t.extendRight=function(){return this.extendDir(p)},t.retractDir=function(t){i(t),this.ends[-t].jQ.insDirOf(-t,this.jQ),this.ends[-t]=this.ends[-t][t]},t.retractRight=function(){return this.retractDir(p)},t.retractLeft=function(){return this.retractDir(u)}}),ae.fn.mathquill=function(t,e){var n,i,s,a,o;switch(t){case"redraw":return this.each(function(){var t=f(this).attr(ce),e=t&&v[t];e&&function n(t){t.eachChild(n),t.redraw&&t.redraw()}(e)});case"revert":return this.each(function(){var t=f(this).attr(ce),e=t&&v[t];e&&e.revert&&e.revert()});case"latex":return arguments.length>1?this.each(function(){var t=f(this).attr(ce),n=t&&v[t];n&&n.renderLatex(e)}):(n=f(this).attr(ce),i=n&&v[n],i&&i.latex());case"text":return n=f(this).attr(ce),i=n&&v[n],i&&i.text();case"html":return this.html().replace(/ ?hasCursor|hasCursor /,"").replace(/ class=(""|(?= |>))/g,"").replace(/<span class="?cursor( blink)?"?><\/span>/i,"").replace(/<span class="?textarea"?><textarea><\/textarea><\/span>/i,"");case"write":if(arguments.length>1)return this.each(function(){var t=f(this).attr(ce),n=t&&v[t],i=n&&n.cursor;i&&i.writeLatex(e).parent.blur()});case"cmd":if(arguments.length>1)return this.each(function(){var t,n=f(this).attr(ce),i=n&&v[n],r=i&&i.cursor;r&&(t=r.prepareWrite(),/^\\[a-z]+$/i.test(e)?r.insertCmd(e.slice(1),t):r.insertCh(e,t),r.hide().parent.blur())});default:return s="textbox"===t,a=s||"editable"===t,o=s?Q:q,this.each(function(){r(f(this),o(),s,a)})}},ae(function(){ae(".mathquill-editable:not(.mathquill-rendered-math)").mathquill("editable"),ae(".mathquill-textbox:not(.mathquill-rendered-math)").mathquill("textbox"),ae(".mathquill-embedded-latex").mathquill()})})();
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/third-party/template.min.js b/pluss-manage-page/src/main/webapp/page/umeditor/third-party/template.min.js
new file mode 100644
index 0000000..51384c3
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/page/umeditor/third-party/template.min.js
@@ -0,0 +1,9 @@
+/**
+ * ETPL (Enterprise Template)
+ * Copyright 2013 Baidu Inc. All rights reserved.
+ *
+ * @file 模板引擎
+ * @author errorrik(errorrik@gmail.com)
+ *         otakustay(otakustay@gmail.com)
+ */
+!function(t){function e(t,e){for(var n in e)e.hasOwnProperty(n)&&(t[n]=e[n]);return t}function n(){this.raw=[],this.length=0}function r(){return"___"+I++}function i(t,n){var r=t.prototype,i=new Function;i.prototype=n.prototype,t.prototype=new i,t.prototype.constructor=t,e(t.prototype,r)}function o(t){return D[t]}function s(t){return'"'+t.replace(/\x5C/g,"\\\\").replace(/"/g,'\\"').replace(/\x0A/g,"\\n").replace(/\x09/g,"\\t").replace(/\x0D/g,"\\r")+'"'}function a(t){return t.replace(/[\^\[\]\$\(\)\{\}\?\*\.\+]/g,function(t){return"\\"+t})}function p(t){var e=arguments;return t.replace(/\{([0-9]+)\}/g,function(t,n){return e[n-0+1]})}function h(t){return t=t.replace(/^\s*\*/,""),p('gv({0},["{1}"])',s(t),t.replace(/\[['"]?([^'"]+)['"]?\]/g,function(t,e){return"."+e}).split(".").join('","'))}function c(t,e,n,r,i,o){for(var s=n.length,a=t.split(e),p=0,h=[],c=0,l=a.length;l>c;c++){var u=a[c];if(c){var f=1;for(p++;;){var d=u.indexOf(n);if(0>d){h.push(p>1&&f?e:"",u);break}if(p=r?p-1:0,h.push(p>0&&f?e:"",u.slice(0,d),p>0?n:""),u=u.slice(d+s),f=0,0===p)break}0===p&&(i(h.join("")),o(u),h=[])}else u&&o(u)}p>0&&h.length>0&&(o(e),o(h.join("")))}function l(t,e,n){var r,i=[],o=e.options,a="",p="",u="",f="";return n&&(a="ts(",p=")",u=S,f=z,r=o.defaultFilter),c(t,o.variableOpen,o.variableClose,1,function(t){n&&t.indexOf("|")<0&&r&&(t+="|"+r);var o=t.indexOf("|"),s=(o>0?t.slice(0,o):t).replace(/^\s+/,"").replace(/\s+$/,""),c=o>0?t.slice(o+1):"",d=0===s.indexOf("*"),g=[d?"":a,h(s),d?"":p];if(c){c=l(c,e);for(var y=c.split("|"),v=0,m=y.length;m>v;v++){var w=y[v],R=w.match(/^\s*([a-z0-9_-]+)(\((.*)\))?\s*$/i);R&&(g.unshift('fs["'+R[1]+'"]('),R[3]&&g.push(",",R[3]),g.push(")"))}}i.push(u,g.join(""),f)},function(t){i.push(u,n?s(t):t,f)}),i.join("")}function u(t,e){this.value=t,this.engine=e}function f(t,e){this.value=t,this.engine=e,this.children=[],this.cloneProps=[]}function d(t,e){var n=t.stack,r=e?n.find(function(t){return t instanceof e}):n.bottom();if(r){for(var i;(i=n.top())!==r;){if(!i.autoClose)throw new Error(i.type+" must be closed manually: "+i.value);i.autoClose(t)}r.close(t)}return r}function g(t,e){var n=t.match(/^\s*([a-z0-9\/\._-]+)\s*(\(\s*master\s*=\s*([a-z0-9\/\._-]+)\s*\))?\s*/i);if(!n)throw new Error("Invalid "+this.type+" syntax: "+t);this.master=n[3],this.name=n[1],f.call(this,t,e),this.blocks={}}function y(t,e){var n=t.match(/^\s*([a-z0-9\/\._-]+)\s*$/i);if(!n)throw new Error("Invalid "+this.type+" syntax: "+t);this.name=n[1],f.call(this,t,e),this.cloneProps=["name"]}function v(t,e){var n=t.match(/^\s*([a-z0-9\/\._-]+)\s*$/i);if(!n)throw new Error("Invalid "+this.type+" syntax: "+t);this.name=n[1],f.call(this,t,e),this.cloneProps=["name","state","blocks","target"],this.blocks={}}function m(t,e){var n=t.match(/^\s*([a-z0-9_]+)\s*=([\s\S]*)$/i);if(!n)throw new Error("Invalid "+this.type+" syntax: "+t);this.name=n[1],this.expr=n[2],f.call(this,t,e),this.cloneProps=["name","expr"]}function w(t,e){var n=t.match(/^\s*([a-z0-9_-]+)\s*(\(([\s\S]*)\))?\s*$/i);if(!n)throw new Error("Invalid "+this.type+" syntax: "+t);this.name=n[1],this.args=n[3],f.call(this,t,e),this.cloneProps=["name","args"]}function R(t,e){var n=t.match(/^\s*([a-z0-9\/\._-]+)\s*(\(([\s\S]*)\))?\s*$/i);if(!n)throw new Error("Invalid "+this.type+" syntax: "+t);this.name=n[1],this.args=n[3],f.call(this,t,e),this.cloneProps=["name","args"]}function E(t,e){var n=new RegExp(p("^\\s*({0}[\\s\\S]+{1})\\s+as\\s+{0}([0-9a-z_]+){1}\\s*(,\\s*{0}([0-9a-z_]+){1})?\\s*$",a(e.options.variableOpen),a(e.options.variableClose)),"i"),r=t.match(n);if(!r)throw new Error("Invalid "+this.type+" syntax: "+t);this.list=r[1],this.item=r[2],this.index=r[4],f.call(this,t,e),this.cloneProps=["list","item","index"]}function b(t,e){f.call(this,t,e)}function x(t,e){b.call(this,t,e)}function k(t,e){f.call(this,t,e)}function A(t,e){e.target=t;var n=e.engine,r=t.name;if(n.targets[r])switch(n.options.namingConflict){case"override":n.targets[r]=t,e.targets.push(r);case"ignore":break;default:throw new Error("[ETPL_TARGET_EXISTS]"+r)}else n.targets[r]=t,e.targets.push(r)}function C(t,e,n){t.commandTypes[e]=n,n.prototype.type=e}function P(t){this.options={commandOpen:"<!--",commandClose:"-->",commandSyntax:/^\s*(\/)?([a-z]*)\s*(?::([\s\S]*))?$/,variableOpen:"${",variableClose:"}",defaultFilter:"html"},this.commandTypes={},C(this,"target",g),C(this,"block",y),C(this,"import",v),C(this,"use",R),C(this,"var",m),C(this,"for",E),C(this,"if",b),C(this,"elif",x),C(this,"else",k),C(this,"filter",w),this.config(t),this.targets={},this.filters=e({},B)}function _(t,e){function r(){var t;if(l.length>0&&(t=l.join(""))){var n=new u(t,e);n.beforeAdd(h),p.top().addChild(n),l=[],e.options.strip&&h.current instanceof f&&(n.value=t.replace(/^[\x20\t\r]*\n/,"")),h.current=n}}var i,o=e.options.commandOpen,s=e.options.commandClose,a=e.options.commandSyntax,p=new n,h={engine:e,targets:[],stack:p,target:null,deps:{}},l=[];c(t,o,s,0,function(t){var n,p=a.exec(t);if(p&&(n=p[2]||"target")&&(i=e.commandTypes[n.toLowerCase()])&&"function"==typeof i){r();var c=h.current;e.options.strip&&c instanceof u&&(c.value=c.value.replace(/\r?\n[\x20\t]*$/,"\n")),p[1]?c=d(h,i):(c=new i(p[3],e),"function"==typeof c.init&&c.init(h),c.beforeOpen(h),c.open(h)),h.current=c}else/^\s*\/\//.test(t)||l.push(o,t,s);i=null},function(t){l.push(t)}),r(),d(h);var g=[];for(var y in h.deps)g.push(y);return{targets:h.targets,deps:g}}n.prototype={push:function(t){this.raw[this.length++]=t},pop:function(){if(this.length>0){var t=this.raw[--this.length];return this.raw.length=this.length,t}},top:function(){return this.raw[this.length-1]},bottom:function(){return this.raw[0]},find:function(t){for(var e=this.length;e--;){var n=this.raw[e];if(t(n))return n}}};var I=178245,D={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#39;"},B={html:function(t){return t.replace(/[&<>"']/g,o)},url:encodeURIComponent,raw:function(t){return t}},T='var r="";',S="r+=",z=";",O="return r;",$="undefined"!=typeof navigator&&navigator.userAgent.match(/msie\s*([0-9]+)/i);$&&$[1]-0<8&&(T="var r=[],ri=0;",S="r[ri++]=",O='return r.join("");'),u.prototype={getRendererBody:function(){var t=this.value,e=this.engine.options;return!t||e.strip&&/^\s*$/.test(t)?"":l(t,this.engine,1)},clone:function(){return this}},f.prototype={addChild:function(t){this.children.push(t)},open:function(t){var e=t.stack.top();e&&e.addChild(this),t.stack.push(this)},close:function(t){t.stack.top()===this&&t.stack.pop()},getRendererBody:function(){for(var t=[],e=this.children,n=0;n<e.length;n++)t.push(e[n].getRendererBody());return t.join("")},clone:function(){for(var t=this.constructor,e=new t(this.value,this.engine),n=0,r=this.children.length;r>n;n++)e.addChild(this.children[n].clone());for(var n=0,r=this.cloneProps.length;r>n;n++){var i=this.cloneProps[n];e[i]=this[i]}return e}};var j='data=data||{};var v={},fs=engine.filters,hg=typeof data.get=="function",gv=function(n,ps){var p=ps[0],d=v[p];if(d==null){if(hg){return data.get(n);}d=data[p];}for(var i=1,l=ps.length;i<l;i++)if(d!=null)d = d[ps[i]];return d;},ts=function(s){if(typeof s==="string"){return s;}if(s==null){s="";}return ""+s;};';i(g,f),i(y,f),i(v,f),i(m,f),i(w,f),i(R,f),i(E,f),i(b,f),i(x,b),i(k,b),g.prototype.init=function(t){this.master&&(t.deps[this.master]=!0)},R.prototype.init=v.prototype.init=function(t){t.deps[this.name]=!0};var L={READING:1,READED:2,APPLIED:3,READY:4};v.prototype.applyMaster=g.prototype.applyMaster=function(t){function e(t){var r=t.children;if(r instanceof Array)for(var i=0,o=r.length;o>i;i++){var s=r[i];s instanceof y&&n[s.name]&&(s=r[i]=n[s.name]),e(s)}}if(this.state>=L.APPLIED)return 1;var n=this.blocks,r=this.engine.targets[t];if(r){if(r.applyMaster(r.master))return this.children=r.clone().children,e(this),this.state=L.APPLIED,1}else if("error"===this.engine.options.missTarget)throw new Error("[ETPL_MISS_TARGET]"+t+", when extended by "+(this.target?this.target.name:this.name))},g.prototype.isReady=function(){function t(i){for(var o=0,s=i.children.length;s>o;o++){var a=i.children[o];if(a instanceof v){var p=e.targets[a.name];if(!p&&"error"===e.options.missTarget)throw new Error("[ETPL_MISS_TARGET]"+a.name+", when imported by "+n);r=r&&p&&p.isReady(e)}else a instanceof f&&t(a)}}if(this.state>=L.READY)return 1;var e=this.engine,n=this.name,r=1;return this.applyMaster(this.master)?(t(this),r&&(this.state=L.READY),r):void 0},g.prototype.getRenderer=function(){if(this.renderer)return this.renderer;if(this.isReady()){var t=new Function("data","engine",[j,T,this.getRendererBody(),O].join("\n")),e=this.engine;return this.renderer=function(n){return t(n,e)},this.renderer}return null},g.prototype.open=function(t){d(t),f.prototype.open.call(this,t),this.state=L.READING,A(this,t)},m.prototype.open=R.prototype.open=function(t){t.stack.top().addChild(this)},y.prototype.open=function(t){f.prototype.open.call(this,t),t.stack.find(function(t){return t.blocks}).blocks[this.name]=this},x.prototype.open=function(t){var e=new k;e.open(t);var n=d(t,b);n.addChild(this),t.stack.push(this)},k.prototype.open=function(t){var e=d(t,b);e.addChild(this),t.stack.push(this)},v.prototype.open=function(t){this.parent=t.stack.top(),this.target=t.target,f.prototype.open.call(this,t),this.state=L.READING},R.prototype.close=m.prototype.close=function(){},v.prototype.close=function(t){f.prototype.close.call(this,t),this.state=L.READED},g.prototype.close=function(t){f.prototype.close.call(this,t),this.state=this.master?L.READED:L.APPLIED,t.target=null},v.prototype.autoClose=function(t){var e=this.parent.children;e.push.apply(e,this.children),this.children.length=0;for(var n in this.blocks)this.target.blocks[n]=this.blocks[n];this.blocks={},this.close(t)},f.prototype.beforeOpen=u.prototype.beforeAdd=function(t){if(!t.stack.bottom()){var e=new g(r(),t.engine);e.open(t)}},g.prototype.beforeOpen=function(){},v.prototype.getRendererBody=function(){return this.applyMaster(this.name),f.prototype.getRendererBody.call(this)},R.prototype.getRendererBody=function(){return p("{0}engine.render({2},{{3}}){1}",S,z,s(this.name),l(this.args,this.engine).replace(/(^|,)\s*([a-z0-9_]+)\s*=/gi,function(t,e,n){return(e||"")+s(n)+":"}))},m.prototype.getRendererBody=function(){return this.expr?p("v[{0}]={1};",s(this.name),l(this.expr,this.engine)):""},b.prototype.getRendererBody=function(){return p("if({0}){{1}}",l(this.value,this.engine),f.prototype.getRendererBody.call(this))},k.prototype.getRendererBody=function(){return p("}else{{0}",f.prototype.getRendererBody.call(this))},E.prototype.getRendererBody=function(){return p('var {0}={1};if({0} instanceof Array)for (var {4}=0,{5}={0}.length;{4}<{5};{4}++){v[{2}]={4};v[{3}]={0}[{4}];{6}}else if(typeof {0}==="object")for(var {4} in {0}){v[{2}]={4};v[{3}]={0}[{4}];{6}}',r(),l(this.list,this.engine),s(this.index||r()),s(this.item),r(),r(),f.prototype.getRendererBody.call(this))},w.prototype.getRendererBody=function(){var t=this.args;return p("{2}fs[{5}]((function(){{0}{4}{1}})(){6}){3}",T,O,S,z,f.prototype.getRendererBody.call(this),s(this.name),t?","+l(t,this.engine):"")},P.prototype.config=function(t){e(this.options,t)},P.prototype.compile=P.prototype.parse=function(t){var e=new Function('return ""');if(t){var n=_(t,this),r=n.targets;r.length&&(e=this.targets[r[0]].getRenderer())}return e},P.prototype.getRenderer=function(t){var e=this.targets[t];return e?e.getRenderer():void 0},P.prototype.render=function(t,e){var n=this.getRenderer(t);return n?n(e):""},P.prototype.addCommand=function(t,e){var n=e;"function"!=typeof n&&(n=function(t,e){f.call(this,t,e)},n.prototype=e),i(n,f),C(this,t,n)},P.prototype.addFilter=function(t,e){"function"==typeof e&&(this.filters[t]=e)};var F=new P;F.Engine=P,F.version="3.2.0",F.Command=f,F.util={inherits:i,stringFormat:p,stringLiteralize:s,compileVariable:l,parseSource:_},"object"==typeof exports&&"object"==typeof module?exports=module.exports=F:"function"==typeof define&&define.amd?define(F):t.etpl=F}(this);
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/umeditor.config.js b/pluss-manage-page/src/main/webapp/page/umeditor/umeditor.config.js
new file mode 100644
index 0000000..c05635e
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/page/umeditor/umeditor.config.js
@@ -0,0 +1,336 @@
+/**
+ *  umeditor完整配置项
+ *  可以在这里配置整个编辑器的特性
+ */
+/**************************提示********************************
+ * 所有被注释的配置项均为UEditor默认值。
+ * 修改默认配置请首先确保已经完全明确该参数的真实用途。
+ * 主要有两种修改方案，一种是取消此处注释，然后修改成对应参数；另一种是在实例化编辑器时传入对应参数。
+ * 当升级编辑器时，可直接使用旧版配置文件替换新版配置文件,不用担心旧版配置文件中因缺少新功能所需的参数而导致脚本报错。
+ **************************提示********************************/
+
+etpl.config({
+    commandOpen: '<%',
+    commandClose: '%>'
+});
+
+(function () {
+    /**
+     * 编辑器资源文件根路径。它所表示的含义是：以编辑器实例化页面为当前路径，指向编辑器资源文件（即dialog等文件夹）的路径。
+     * 鉴于很多同学在使用编辑器的时候出现的种种路径问题，此处强烈建议大家使用"相对于网站根目录的相对路径"进行配置。
+     * "相对于网站根目录的相对路径"也就是以斜杠开头的形如"/myProject/umeditor/"这样的路径。
+     * 如果站点中有多个不在同一层级的页面需要实例化编辑器，且引用了同一UEditor的时候，此处的URL可能不适用于每个页面的编辑器。
+     * 因此，UEditor提供了针对不同页面的编辑器可单独配置的根路径，具体来说，在需要实例化编辑器的页面最顶部写上如下代码即可。当然，需要令此处的URL等于对应的配置。
+     * window.UMEDITOR_HOME_URL = "/xxxx/xxxx/";
+     */
+    var URL = window.UMEDITOR_HOME_URL || (function(){
+
+        function PathStack() {
+
+            this.documentURL = self.document.URL || self.location.href;
+
+            this.separator = '/';
+            this.separatorPattern = /\\|\//g;
+            this.currentDir = './';
+            this.currentDirPattern = /^[.]\/]/;
+
+            this.path = this.documentURL;
+            this.stack = [];
+
+            this.push( this.documentURL );
+
+        }
+
+        PathStack.isParentPath = function( path ){
+            return path === '..';
+        };
+
+        PathStack.hasProtocol = function( path ){
+            return !!PathStack.getProtocol( path );
+        };
+
+        PathStack.getProtocol = function( path ){
+
+            var protocol = /^[^:]*:\/*/.exec( path );
+
+            return protocol ? protocol[0] : null;
+
+        };
+
+        PathStack.prototype = {
+            push: function( path ){
+
+                this.path = path;
+
+                update.call( this );
+                parse.call( this );
+
+                return this;
+
+            },
+            getPath: function(){
+                return this + "";
+            },
+            toString: function(){
+                return this.protocol + ( this.stack.concat( [''] ) ).join( this.separator );
+            }
+        };
+
+        function update() {
+
+            var protocol = PathStack.getProtocol( this.path || '' );
+
+            if( protocol ) {
+
+                //根协议
+                this.protocol = protocol;
+
+                //local
+                this.localSeparator = /\\|\//.exec( this.path.replace( protocol, '' ) )[0];
+
+                this.stack = [];
+            } else {
+                protocol = /\\|\//.exec( this.path );
+                protocol && (this.localSeparator = protocol[0]);
+            }
+
+        }
+
+        function parse(){
+
+            var parsedStack = this.path.replace( this.currentDirPattern, '' );
+
+            if( PathStack.hasProtocol( this.path ) ) {
+                parsedStack = parsedStack.replace( this.protocol , '');
+            }
+
+            parsedStack = parsedStack.split( this.localSeparator );
+            parsedStack.length = parsedStack.length - 1;
+
+            for(var i= 0,tempPath,l=parsedStack.length,root = this.stack;i<l;i++){
+                tempPath = parsedStack[i];
+                if(tempPath){
+                    if( PathStack.isParentPath( tempPath ) ) {
+                        root.pop();
+                    } else {
+                        root.push( tempPath );
+                    }
+                }
+
+            }
+
+
+        }
+
+        var currentPath = document.getElementsByTagName('script');
+
+        currentPath = currentPath[ currentPath.length -1 ].src;
+
+        return new PathStack().push( currentPath ) + "";
+
+
+    })();
+    /**
+     * 配置项主体。注意，此处所有涉及到路径的配置别遗漏URL变量。
+     */
+    window.UMEDITOR_CONFIG = {
+
+        //为编辑器实例添加一个路径，这个不能被注释
+        UMEDITOR_HOME_URL : URL
+
+        //图片上传配置区
+        ,imageUrl:URL+"jsp/imageUp.jsp"             //图片上传提交地址
+        ,imagePath:""                    //图片修正地址，引用了fixedImagePath,如有特殊需求，可自行配置
+        ,imageFieldName:"upfile"                   //图片数据的key,若此处修改，需要在后台对应文件修改对应参数
+
+
+        //工具栏上的所有的功能按钮和下拉框，可以在new编辑器的实例时选择自己需要的从新定义
+        ,toolbar:[
+            'source | undo redo | bold italic underline strikethrough | superscript subscript | forecolor backcolor | removeformat |',
+            'insertorderedlist insertunorderedlist | cleardoc | justifyleft justifycenter justifyright fontsize' ,
+            '| fontfamily justifyjustify |',
+            'link unlink | image video',
+            '| horizontal print preview fullscreen', 'formula'
+        ]
+//    ,toolbar:[
+//              'source | undo redo | bold italic underline strikethrough | superscript subscript | forecolor backcolor | removeformat |',
+//              'insertorderedlist insertunorderedlist | selectall cleardoc paragraph | fontfamily fontsize' ,
+//              '| justifyleft justifycenter justifyright justifyjustify |',
+//              'link unlink | emotion image video  | map',
+//              '| horizontal print preview fullscreen', 'drafts', 'formula'
+//          ]
+        //语言配置项,默认是zh-cn。有需要的话也可以使用如下这样的方式来自动多语言切换，当然，前提条件是lang文件夹下存在对应的语言文件：
+        //lang值也可以通过自动获取 (navigator.language||navigator.browserLanguage ||navigator.userLanguage).toLowerCase()
+        //,lang:"zh-cn"
+        //,langPath:URL +"lang/"
+
+        //ie下的链接自动监测
+        //,autourldetectinie:false
+
+        //主题配置项,默认是default。有需要的话也可以使用如下这样的方式来自动多主题切换，当然，前提条件是themes文件夹下存在对应的主题文件：
+        //现有如下皮肤:default
+        //,theme:'default'
+        //,themePath:URL +"themes/"
+
+
+
+        //针对getAllHtml方法，会在对应的head标签中增加该编码设置。
+        //,charset:"utf-8"
+
+        //常用配置项目
+        //,isShow : true    //默认显示编辑器
+
+        //,initialContent:'欢迎使用UMEDITOR!'    //初始化编辑器的内容,也可以通过textarea/script给值，看官网例子
+
+        //,initialFrameWidth:500 //初始化编辑器宽度,默认500
+        //,initialFrameHeight:500  //初始化编辑器高度,默认500
+
+        //,autoClearinitialContent:true //是否自动清除编辑器初始内容，注意：如果focus属性设置为true,这个也为真，那么编辑器一上来就会触发导致初始化的内容看不到了
+
+        //,textarea:'editorValue' // 提交表单时，服务器获取编辑器提交内容的所用的参数，多实例时可以给容器name属性，会将name给定的值最为每个实例的键值，不用每次实例化的时候都设置这个值
+
+        //,focus:false //初始化时，是否让编辑器获得焦点true或false
+
+        //,autoClearEmptyNode : true //getContent时，是否删除空的inlineElement节点（包括嵌套的情况）
+
+        //,fullscreen : false //是否开启初始化时即全屏，默认关闭
+
+        //,readonly : false //编辑器初始化结束后,编辑区域是否是只读的，默认是false
+
+        //,zIndex : 900     //编辑器层级的基数,默认是900
+
+        //如果自定义，最好给p标签如下的行高，要不输入中文时，会有跳动感
+        //注意这里添加的样式，最好放在.edui-editor-body .edui-body-container这两个的下边，防止跟页面上css冲突
+        //,initialStyle:'.edui-editor-body .edui-body-container p{line-height:1em}'
+
+        //,autoSyncData:true //自动同步编辑器要提交的数据
+
+        //,emotionLocalization:false //是否开启表情本地化，默认关闭。若要开启请确保emotion文件夹下包含官网提供的images表情文件夹
+    	
+    	,retainOnlyLabelPasted: false
+    
+        ,allHtmlEnabled:true //提交到后台的数据是否包含整个html字符串
+
+        //fontfamily
+        //字体设置
+//        ,'fontfamily':[
+//              { name: 'songti', val: '宋体,SimSun'},
+//          ]
+
+        //fontsize
+        //字号
+        //,'fontsize':[10, 11, 12, 14, 16, 18, 20, 24, 36]
+
+        //paragraph
+        //段落格式 值留空时支持多语言自动识别，若配置，则以配置值为准
+        //,'paragraph':{'p':'', 'h1':'', 'h2':'', 'h3':'', 'h4':'', 'h5':'', 'h6':''}
+
+        //undo
+        //可以最多回退的次数,默认20
+        //,maxUndoCount:20
+        //当输入的字符数超过该值时，保存一次现场
+        //,maxInputCount:1
+
+        //imageScaleEnabled
+        // 是否允许点击文件拖拽改变大小,默认true
+        //,imageScaleEnabled:true
+
+        //dropFileEnabled
+        // 是否允许拖放图片到编辑区域，上传并插入,默认true
+        //,dropFileEnabled:true
+
+        //pasteImageEnabled
+        // 是否允许粘贴QQ截屏，上传并插入,默认true
+        //,pasteImageEnabled:true
+
+        //autoHeightEnabled
+        // 是否自动长高,默认true
+        //,autoHeightEnabled:true
+
+        //autoFloatEnabled
+        //是否保持toolbar的位置不动,默认true
+        //,autoFloatEnabled:true
+
+        //浮动时工具栏距离浏览器顶部的高度，用于某些具有固定头部的页面
+        //,topOffset:30
+
+        //填写过滤规则
+        ,filterRules: {}
+        // xss 过滤是否开启,inserthtml等操作
+ 		,xssFilterRules: true
+ 		//input xss过滤
+ 		,inputXssFilter: true
+ 		//output xss过滤
+ 		,outputXssFilter: true
+ 		// xss过滤白名单 名单来源: https://raw.githubusercontent.com/leizongmin/js-xss/master/lib/default.js
+        ,whiteList: {
+            a:      ['target', 'href', 'title', 'style', 'class', 'id'],
+			abbr:   ['title', 'style', 'class', 'id'],
+			address: ['style', 'class', 'id'],
+			area:   ['shape', 'coords', 'href', 'alt', 'style', 'class', 'id'],
+			article: ['style', 'class', 'id'],
+			aside:  ['style', 'class', 'id'],
+			audio:  ['autoplay', 'controls', 'loop', 'preload', 'src', 'style', 'class', 'id'],
+			b:      ['style', 'class', 'id'],
+			bdi:    ['dir'],
+			bdo:    ['dir'],
+			big:    [],
+			blockquote: ['cite', 'style', 'class', 'id'],
+			br:     [],
+			caption: ['style', 'class', 'id'],
+			center: [],
+			cite:   [],
+			code:   ['style', 'class', 'id'],
+			col:    ['align', 'valign', 'span', 'width', 'style', 'class', 'id'],
+			colgroup: ['align', 'valign', 'span', 'width', 'style', 'class', 'id'],
+			dd:     ['style', 'class', 'id'],
+			del:    ['datetime', 'style', 'class', 'id'],
+			details: ['open', 'style', 'class', 'id'],
+			div:    ['style', 'class', 'id'],
+			dl:     ['style', 'class', 'id'],
+			dt:     ['style', 'class', 'id'],
+			em:     ['style', 'class', 'id'],
+            embed:  ['type', 'class', 'pluginspage', 'src', 'width', 'height', 'align', 'style', 'wmode', 'play',  'autoplay','loop', 'menu', 'allowscriptaccess', 'allowfullscreen', 'controls', 'preload'],
+			font:   ['color', 'size', 'face', 'style', 'class', 'id'],
+			footer: ['style', 'class', 'id'],
+			h1:     ['style', 'class', 'id'],
+			h2:     ['style', 'class', 'id'],
+			h3:     ['style', 'class', 'id'],
+			h4:     ['style', 'class', 'id'],
+			h5:     ['style', 'class', 'id'],
+			h6:     ['style', 'class', 'id'],
+			header: ['style', 'class', 'id'],
+			hr:     ['style', 'class', 'id'],
+			i:      ['style', 'class', 'id'],
+            iframe: ['src', 'class', 'height', 'width', 'max-width', 'max-height', 'align', 'frameborder', 'allowfullscreen'],
+			img:    ['src', 'alt', 'title', 'width', 'height', 'style', 'class', 'id', '_url'],
+			ins:    ['datetime', 'style', 'class', 'id'],
+			li:     ['style', 'class', 'id'],
+			mark:   [],
+			nav:    [],
+			ol:     ['style', 'class', 'id'],
+			p:      ['style', 'class', 'id'],
+			pre:    ['style', 'class', 'id'],
+			s:      [],
+			section:['class', 'style'],
+			small:  ['style', 'class', 'id'],
+			span:   ['style', 'class', 'id'],
+			sub:    ['style', 'class', 'id'],
+			sup:    ['style', 'class', 'id'],
+			strong: ['style', 'class', 'id'],
+			table:  ['width', 'border', 'align', 'valign', 'style', 'class', 'id'],
+			tbody:  ['align', 'valign', 'style', 'class', 'id'],
+			td:     ['width', 'rowspan', 'colspan', 'align', 'valign', 'style', 'class', 'id'],
+			tfoot:  ['align', 'valign', 'style', 'class', 'id'],
+			th:     ['width', 'rowspan', 'colspan', 'align', 'valign', 'style', 'class', 'id'],
+			thead:  ['align', 'valign', 'style', 'class', 'id'],
+			tr:     ['rowspan', 'align', 'valign', 'style', 'class', 'id'],
+			tt:     ['style', 'class', 'id'],
+			u:      [],
+			ul:     ['style', 'class', 'id'],
+            svg:    ['style', 'class', 'id', 'width', 'height', 'xmlns', 'fill', 'viewBox'],
+			video:  ['autoplay', 'controls', 'loop', 'preload', 'src', 'height', 'width', 'style', 'class', 'id'],
+			source: ['src', 'type']
+        }
+    };
+})();
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/umeditor.js b/pluss-manage-page/src/main/webapp/page/umeditor/umeditor.js
new file mode 100644
index 0000000..e5d4fc0
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/page/umeditor/umeditor.js
@@ -0,0 +1,11017 @@
+/*!
+ * UEditor Mini版本
+ * version: 1.2.2
+ * build: Fri Feb 10 2017 15:01:51 GMT+0800 (CST)
+ */
+
+(function($){
+
+UMEDITOR_CONFIG = window.UMEDITOR_CONFIG || {};
+
+window.UM = {
+    plugins : {},
+
+    commands : {},
+
+    I18N : {},
+
+    version : "1.2.2"
+};
+
+var dom = UM.dom = {};
+/**
+ * 浏览器判断模块
+ * @file
+ * @module UE.browser
+ * @since 1.2.6.1
+ */
+
+/**
+ * 提供浏览器检测的模块
+ * @unfile
+ * @module UE.browser
+ */
+var browser = UM.browser = function(){
+    var agent = navigator.userAgent.toLowerCase(),
+        opera = window.opera,
+        browser = {
+            /**
+             * @property {boolean} ie 检测当前浏览器是否为IE
+             * @example
+             * ```javascript
+             * if ( UE.browser.ie ) {
+         *     console.log( '当前浏览器是IE' );
+         * }
+             * ```
+             */
+            ie		:  /(msie\s|trident.*rv:)([\w.]+)/.test(agent),
+
+            /**
+             * @property {boolean} opera 检测当前浏览器是否为Opera
+             * @example
+             * ```javascript
+             * if ( UE.browser.opera ) {
+         *     console.log( '当前浏览器是Opera' );
+         * }
+             * ```
+             */
+            opera	: ( !!opera && opera.version ),
+
+            /**
+             * @property {boolean} webkit 检测当前浏览器是否是webkit内核的浏览器
+             * @example
+             * ```javascript
+             * if ( UE.browser.webkit ) {
+         *     console.log( '当前浏览器是webkit内核浏览器' );
+         * }
+             * ```
+             */
+            webkit	: ( agent.indexOf( ' applewebkit/' ) > -1 ),
+
+            /**
+             * @property {boolean} mac 检测当前浏览器是否是运行在mac平台下
+             * @example
+             * ```javascript
+             * if ( UE.browser.mac ) {
+         *     console.log( '当前浏览器运行在mac平台下' );
+         * }
+             * ```
+             */
+            mac	: ( agent.indexOf( 'macintosh' ) > -1 ),
+
+            /**
+             * @property {boolean} quirks 检测当前浏览器是否处于“怪异模式”下
+             * @example
+             * ```javascript
+             * if ( UE.browser.quirks ) {
+         *     console.log( '当前浏览器运行处于“怪异模式”' );
+         * }
+             * ```
+             */
+            quirks : ( document.compatMode == 'BackCompat' )
+        };
+
+    /**
+     * @property {boolean} gecko 检测当前浏览器内核是否是gecko内核
+     * @example
+     * ```javascript
+     * if ( UE.browser.gecko ) {
+    *     console.log( '当前浏览器内核是gecko内核' );
+    * }
+     * ```
+     */
+    browser.gecko =( navigator.product == 'Gecko' && !browser.webkit && !browser.opera && !browser.ie);
+
+    var version = 0;
+
+    // Internet Explorer 6.0+
+    if ( browser.ie ){
+
+
+        var v1 =  agent.match(/(?:msie\s([\w.]+))/);
+        var v2 = agent.match(/(?:trident.*rv:([\w.]+))/);
+        if(v1 && v2 && v1[1] && v2[1]){
+            version = Math.max(v1[1]*1,v2[1]*1);
+        }else if(v1 && v1[1]){
+            version = v1[1]*1;
+        }else if(v2 && v2[1]){
+            version = v2[1]*1;
+        }else{
+            version = 0;
+        }
+
+        browser.ie11Compat = document.documentMode == 11;
+        /**
+         * @property { boolean } ie9Compat 检测浏览器模式是否为 IE9 兼容模式
+         * @warning 如果浏览器不是IE， 则该值为undefined
+         * @example
+         * ```javascript
+         * if ( UE.browser.ie9Compat ) {
+         *     console.log( '当前浏览器运行在IE9兼容模式下' );
+         * }
+         * ```
+         */
+        browser.ie9Compat = document.documentMode == 9;
+
+        /**
+         * @property { boolean } ie8 检测浏览器是否是IE8浏览器
+         * @warning 如果浏览器不是IE， 则该值为undefined
+         * @example
+         * ```javascript
+         * if ( UE.browser.ie8 ) {
+         *     console.log( '当前浏览器是IE8浏览器' );
+         * }
+         * ```
+         */
+        browser.ie8 = !!document.documentMode;
+
+        /**
+         * @property { boolean } ie8Compat 检测浏览器模式是否为 IE8 兼容模式
+         * @warning 如果浏览器不是IE， 则该值为undefined
+         * @example
+         * ```javascript
+         * if ( UE.browser.ie8Compat ) {
+         *     console.log( '当前浏览器运行在IE8兼容模式下' );
+         * }
+         * ```
+         */
+        browser.ie8Compat = document.documentMode == 8;
+
+        /**
+         * @property { boolean } ie7Compat 检测浏览器模式是否为 IE7 兼容模式
+         * @warning 如果浏览器不是IE， 则该值为undefined
+         * @example
+         * ```javascript
+         * if ( UE.browser.ie7Compat ) {
+         *     console.log( '当前浏览器运行在IE7兼容模式下' );
+         * }
+         * ```
+         */
+        browser.ie7Compat = ( ( version == 7 && !document.documentMode )
+            || document.documentMode == 7 );
+
+        /**
+         * @property { boolean } ie6Compat 检测浏览器模式是否为 IE6 模式 或者怪异模式
+         * @warning 如果浏览器不是IE， 则该值为undefined
+         * @example
+         * ```javascript
+         * if ( UE.browser.ie6Compat ) {
+         *     console.log( '当前浏览器运行在IE6模式或者怪异模式下' );
+         * }
+         * ```
+         */
+        browser.ie6Compat = ( version < 7 || browser.quirks );
+
+        browser.ie9above = version > 8;
+
+        browser.ie9below = version < 9;
+
+    }
+
+    // Gecko.
+    if ( browser.gecko ){
+        var geckoRelease = agent.match( /rv:([\d\.]+)/ );
+        if ( geckoRelease )
+        {
+            geckoRelease = geckoRelease[1].split( '.' );
+            version = geckoRelease[0] * 10000 + ( geckoRelease[1] || 0 ) * 100 + ( geckoRelease[2] || 0 ) * 1;
+        }
+    }
+
+    /**
+     * @property { Number } chrome 检测当前浏览器是否为Chrome, 如果是，则返回Chrome的大版本号
+     * @warning 如果浏览器不是chrome， 则该值为undefined
+     * @example
+     * ```javascript
+     * if ( UE.browser.chrome ) {
+     *     console.log( '当前浏览器是Chrome' );
+     * }
+     * ```
+     */
+    if (/chrome\/(\d+\.\d)/i.test(agent)) {
+        browser.chrome = + RegExp['\x241'];
+    }
+
+    /**
+     * @property { Number } safari 检测当前浏览器是否为Safari, 如果是，则返回Safari的大版本号
+     * @warning 如果浏览器不是safari， 则该值为undefined
+     * @example
+     * ```javascript
+     * if ( UE.browser.safari ) {
+     *     console.log( '当前浏览器是Safari' );
+     * }
+     * ```
+     */
+    if(/(\d+\.\d)?(?:\.\d)?\s+safari\/?(\d+\.\d+)?/i.test(agent) && !/chrome/i.test(agent)){
+        browser.safari = + (RegExp['\x241'] || RegExp['\x242']);
+    }
+
+
+    // Opera 9.50+
+    if ( browser.opera )
+        version = parseFloat( opera.version() );
+
+    // WebKit 522+ (Safari 3+)
+    if ( browser.webkit )
+        version = parseFloat( agent.match( / applewebkit\/(\d+)/ )[1] );
+
+    /**
+     * @property { Number } version 检测当前浏览器版本号
+     * @remind
+     * <ul>
+     *     <li>IE系列返回值为5,6,7,8,9,10等</li>
+     *     <li>gecko系列会返回10900，158900等</li>
+     *     <li>webkit系列会返回其build号 (如 522等)</li>
+     * </ul>
+     * @example
+     * ```javascript
+     * console.log( '当前浏览器版本号是： ' + UE.browser.version );
+     * ```
+     */
+    browser.version = version;
+
+    /**
+     * @property { boolean } isCompatible 检测当前浏览器是否能够与UEditor良好兼容
+     * @example
+     * ```javascript
+     * if ( UE.browser.isCompatible ) {
+     *     console.log( '浏览器与UEditor能够良好兼容' );
+     * }
+     * ```
+     */
+    browser.isCompatible =
+        !browser.mobile && (
+            ( browser.ie && version >= 6 ) ||
+                ( browser.gecko && version >= 10801 ) ||
+                ( browser.opera && version >= 9.5 ) ||
+                ( browser.air && version >= 1 ) ||
+                ( browser.webkit && version >= 522 ) ||
+                false );
+    return browser;
+}();
+//快捷方式
+var ie = browser.ie,
+    webkit = browser.webkit,
+    gecko = browser.gecko,
+    opera = browser.opera;
+/**
+ * @file
+ * @name UM.Utils
+ * @short Utils
+ * @desc UEditor封装使用的静态工具函数
+ * @import editor.js
+ */
+var utils = UM.utils = {
+    /**
+     * 遍历数组，对象，nodeList
+     * @name each
+     * @grammar UM.utils.each(obj,iterator,[context])
+     * @since 1.2.4+
+     * @desc
+     * * obj 要遍历的对象
+     * * iterator 遍历的方法,方法的第一个是遍历的值，第二个是索引，第三个是obj
+     * * context  iterator的上下文
+     * @example
+     * UM.utils.each([1,2],function(v,i){
+     *     console.log(v)//值
+     *     console.log(i)//索引
+     * })
+     * UM.utils.each(document.getElementsByTagName('*'),function(n){
+     *     console.log(n.tagName)
+     * })
+     */
+    each : function(obj, iterator, context) {
+        if (obj == null) return;
+        if (obj.length === +obj.length) {
+            for (var i = 0, l = obj.length; i < l; i++) {
+                if(iterator.call(context, obj[i], i, obj) === false)
+                    return false;
+            }
+        } else {
+            for (var key in obj) {
+                if (obj.hasOwnProperty(key)) {
+                    if(iterator.call(context, obj[key], key, obj) === false)
+                        return false;
+                }
+            }
+        }
+    },
+
+    makeInstance:function (obj) {
+        var noop = new Function();
+        noop.prototype = obj;
+        obj = new noop;
+        noop.prototype = null;
+        return obj;
+    },
+    /**
+     * 将source对象中的属性扩展到target对象上
+     * @name extend
+     * @grammar UM.utils.extend(target,source)  => Object  //覆盖扩展
+     * @grammar UM.utils.extend(target,source,true)  ==> Object  //保留扩展
+     */
+    extend:function (t, s, b) {
+        if (s) {
+            for (var k in s) {
+                if (!b || !t.hasOwnProperty(k)) {
+                    t[k] = s[k];
+                }
+            }
+        }
+        return t;
+    },
+    extend2:function (t) {
+        var a = arguments;
+        for (var i = 1; i < a.length; i++) {
+            var x = a[i];
+            for (var k in x) {
+                if (!t.hasOwnProperty(k)) {
+                    t[k] = x[k];
+                }
+            }
+        }
+        return t;
+    },
+    /**
+     * 模拟继承机制，subClass继承superClass
+     * @name inherits
+     * @grammar UM.utils.inherits(subClass,superClass) => subClass
+     * @example
+     * function SuperClass(){
+     *     this.name = "小李";
+     * }
+     * SuperClass.prototype = {
+     *     hello:function(str){
+     *         console.log(this.name + str);
+     *     }
+     * }
+     * function SubClass(){
+     *     this.name = "小张";
+     * }
+     * UM.utils.inherits(SubClass,SuperClass);
+     * var sub = new SubClass();
+     * sub.hello("早上好!"); ==> "小张早上好！"
+     */
+    inherits:function (subClass, superClass) {
+        var oldP = subClass.prototype,
+            newP = utils.makeInstance(superClass.prototype);
+        utils.extend(newP, oldP, true);
+        subClass.prototype = newP;
+        return (newP.constructor = subClass);
+    },
+
+    /**
+     * 用指定的context作为fn上下文，也就是this
+     * @name bind
+     * @grammar UM.utils.bind(fn,context)  =>  fn
+     */
+    bind:function (fn, context) {
+        return function () {
+            return fn.apply(context, arguments);
+        };
+    },
+
+    /**
+     * 创建延迟delay执行的函数fn
+     * @name defer
+     * @grammar UM.utils.defer(fn,delay)  =>fn   //延迟delay毫秒执行fn，返回fn
+     * @grammar UM.utils.defer(fn,delay,exclusion)  =>fn   //延迟delay毫秒执行fn，若exclusion为真，则互斥执行fn
+     * @example
+     * function test(){
+     *     console.log("延迟输出！");
+     * }
+     * //非互斥延迟执行
+     * var testDefer = UM.utils.defer(test,1000);
+     * testDefer();   =>  "延迟输出！";
+     * testDefer();   =>  "延迟输出！";
+     * //互斥延迟执行
+     * var testDefer1 = UM.utils.defer(test,1000,true);
+     * testDefer1();   =>  //本次不执行
+     * testDefer1();   =>  "延迟输出！";
+     */
+    defer:function (fn, delay, exclusion) {
+        var timerID;
+        return function () {
+            if (exclusion) {
+                clearTimeout(timerID);
+            }
+            timerID = setTimeout(fn, delay);
+        };
+    },
+
+    /**
+     * 查找元素item在数组array中的索引, 若找不到返回-1
+     * @name indexOf
+     * @grammar UM.utils.indexOf(array,item)  => index|-1  //默认从数组开头部开始搜索
+     * @grammar UM.utils.indexOf(array,item,start)  => index|-1  //start指定开始查找的位置
+     */
+    indexOf:function (array, item, start) {
+        var index = -1;
+        start = this.isNumber(start) ? start : 0;
+        this.each(array, function (v, i) {
+            if (i >= start && v === item) {
+                index = i;
+                return false;
+            }
+        });
+        return index;
+    },
+
+    /**
+     * 移除数组array中的元素item
+     * @name removeItem
+     * @grammar UM.utils.removeItem(array,item)
+     */
+    removeItem:function (array, item) {
+        for (var i = 0, l = array.length; i < l; i++) {
+            if (array[i] === item) {
+                array.splice(i, 1);
+                i--;
+            }
+        }
+    },
+
+    /**
+     * 删除字符串str的首尾空格
+     * @name trim
+     * @grammar UM.utils.trim(str) => String
+     */
+    trim:function (str) {
+        return str.replace(/(^[ \t\n\r]+)|([ \t\n\r]+$)/g, '');
+    },
+
+    /**
+     * 将字符串list(以','分隔)或者数组list转成哈希对象
+     * @name listToMap
+     * @grammar UM.utils.listToMap(list)  => Object  //Object形如{test:1,br:1,textarea:1}
+     */
+    listToMap:function (list) {
+        if (!list)return {};
+        list = utils.isArray(list) ? list : list.split(',');
+        for (var i = 0, ci, obj = {}; ci = list[i++];) {
+            obj[ci.toUpperCase()] = obj[ci] = 1;
+        }
+        return obj;
+    },
+
+    /**
+     * 将str中的html符号转义,默认将转义''&<">''四个字符，可自定义reg来确定需要转义的字符
+     * @name unhtml
+     * @grammar UM.utils.unhtml(str);  => String
+     * @grammar UM.utils.unhtml(str,reg)  => String
+     * @example
+     * var html = '<body>You say:"你好！Baidu & UEditor!"</body>';
+     * UM.utils.unhtml(html);   ==>  &lt;body&gt;You say:&quot;你好！Baidu &amp; UEditor!&quot;&lt;/body&gt;
+     * UM.utils.unhtml(html,/[<>]/g)  ==>  &lt;body&gt;You say:"你好！Baidu & UEditor!"&lt;/body&gt;
+     */
+    unhtml:function (str, reg) {
+        return str ? str.replace(reg || /[&<">'](?:(amp|lt|quot|gt|#39|nbsp);)?/g, function (a, b) {
+            if (b) {
+                return a;
+            } else {
+                return {
+                    '<':'&lt;',
+                    '&':'&amp;',
+                    '"':'&quot;',
+                    '>':'&gt;',
+                    "'":'&#39;'
+                }[a]
+            }
+
+        }) : '';
+    },
+    /**
+     * 将str中的转义字符还原成html字符
+     * @name html
+     * @grammar UM.utils.html(str)  => String   //详细参见<code><a href = '#unhtml'>unhtml</a></code>
+     */
+    html:function (str) {
+        return str ? str.replace(/&((g|l|quo)t|amp|#39);/g, function (m) {
+            return {
+                '&lt;':'<',
+                '&amp;':'&',
+                '&quot;':'"',
+                '&gt;':'>',
+                '&#39;':"'"
+            }[m]
+        }) : '';
+    },
+    /**
+     * 将css样式转换为驼峰的形式。如font-size => fontSize
+     * @name cssStyleToDomStyle
+     * @grammar UM.utils.cssStyleToDomStyle(cssName)  => String
+     */
+    cssStyleToDomStyle:function () {
+        var test = document.createElement('div').style,
+            cache = {
+                'float':test.cssFloat != undefined ? 'cssFloat' : test.styleFloat != undefined ? 'styleFloat' : 'float'
+            };
+
+        return function (cssName) {
+            return cache[cssName] || (cache[cssName] = cssName.toLowerCase().replace(/-./g, function (match) {
+                return match.charAt(1).toUpperCase();
+            }));
+        };
+    }(),
+    /**
+     * 动态加载文件到doc中，并依据obj来设置属性，加载成功后执行回调函数fn
+     * @name loadFile
+     * @grammar UM.utils.loadFile(doc,obj)
+     * @grammar UM.utils.loadFile(doc,obj,fn)
+     * @example
+     * //指定加载到当前document中一个script文件，加载成功后执行function
+     * utils.loadFile( document, {
+     *     src:"test.js",
+     *     tag:"script",
+     *     type:"text/javascript",
+     *     defer:"defer"
+     * }, function () {
+     *     console.log('加载成功！')
+     * });
+     */
+    loadFile:function () {
+        var tmpList = [];
+
+        function getItem(doc, obj) {
+            try {
+                for (var i = 0, ci; ci = tmpList[i++];) {
+                    if (ci.doc === doc && ci.url == (obj.src || obj.href)) {
+                        return ci;
+                    }
+                }
+            } catch (e) {
+                return null;
+            }
+
+        }
+
+        return function (doc, obj, fn) {
+            var item = getItem(doc, obj);
+            if (item) {
+                if (item.ready) {
+                    fn && fn();
+                } else {
+                    item.funs.push(fn)
+                }
+                return;
+            }
+            tmpList.push({
+                doc:doc,
+                url:obj.src || obj.href,
+                funs:[fn]
+            });
+            if (!doc.body) {
+                var html = [];
+                for (var p in obj) {
+                    if (p == 'tag')continue;
+                    html.push(p + '="' + obj[p] + '"')
+                }
+                doc.write('<' + obj.tag + ' ' + html.join(' ') + ' ></' + obj.tag + '>');
+                return;
+            }
+            if (obj.id && doc.getElementById(obj.id)) {
+                return;
+            }
+            var element = doc.createElement(obj.tag);
+            delete obj.tag;
+            for (var p in obj) {
+                element.setAttribute(p, obj[p]);
+            }
+            element.onload = element.onreadystatechange = function () {
+                if (!this.readyState || /loaded|complete/.test(this.readyState)) {
+                    item = getItem(doc, obj);
+                    if (item.funs.length > 0) {
+                        item.ready = 1;
+                        for (var fi; fi = item.funs.pop();) {
+                            fi();
+                        }
+                    }
+                    element.onload = element.onreadystatechange = null;
+                }
+            };
+            element.onerror = function () {
+                throw Error('The load ' + (obj.href || obj.src) + ' fails,check the url settings of file umeditor.config.js ')
+            };
+            doc.getElementsByTagName("head")[0].appendChild(element);
+        }
+    }(),
+    /**
+     * 判断obj对象是否为空
+     * @name isEmptyObject
+     * @grammar UM.utils.isEmptyObject(obj)  => true|false
+     * @example
+     * UM.utils.isEmptyObject({}) ==>true
+     * UM.utils.isEmptyObject([]) ==>true
+     * UM.utils.isEmptyObject("") ==>true
+     */
+    isEmptyObject:function (obj) {
+        if (obj == null) return true;
+        if (this.isArray(obj) || this.isString(obj)) return obj.length === 0;
+        for (var key in obj) if (obj.hasOwnProperty(key)) return false;
+        return true;
+    },
+
+    /**
+     * 统一将颜色值使用16进制形式表示
+     * @name fixColor
+     * @grammar UM.utils.fixColor(name,value) => value
+     * @example
+     * rgb(255,255,255)  => "#ffffff"
+     */
+    fixColor:function (name, value) {
+        if (/color/i.test(name) && /rgba?/.test(value)) {
+            var array = value.split(",");
+            if (array.length > 3)
+                return "";
+            value = "#";
+            for (var i = 0, color; color = array[i++];) {
+                color = parseInt(color.replace(/[^\d]/gi, ''), 10).toString(16);
+                value += color.length == 1 ? "0" + color : color;
+            }
+            value = value.toUpperCase();
+        }
+        return  value;
+    },
+
+    /**
+     * 深度克隆对象，从source到target
+     * @name clone
+     * @grammar UM.utils.clone(source) => anthorObj 新的对象是完整的source的副本
+     * @grammar UM.utils.clone(source,target) => target包含了source的所有内容，重名会覆盖
+     */
+    clone:function (source, target) {
+        var tmp;
+        target = target || {};
+        for (var i in source) {
+            if (source.hasOwnProperty(i)) {
+                tmp = source[i];
+                if (typeof tmp == 'object') {
+                    target[i] = utils.isArray(tmp) ? [] : {};
+                    utils.clone(source[i], target[i])
+                } else {
+                    target[i] = tmp;
+                }
+            }
+        }
+        return target;
+    },
+    /**
+     * 转换cm/pt到px
+     * @name transUnitToPx
+     * @grammar UM.utils.transUnitToPx('20pt') => '27px'
+     * @grammar UM.utils.transUnitToPx('0pt') => '0'
+     */
+    transUnitToPx:function (val) {
+        if (!/(pt|cm)/.test(val)) {
+            return val
+        }
+        var unit;
+        val.replace(/([\d.]+)(\w+)/, function (str, v, u) {
+            val = v;
+            unit = u;
+        });
+        switch (unit) {
+            case 'cm':
+                val = parseFloat(val) * 25;
+                break;
+            case 'pt':
+                val = Math.round(parseFloat(val) * 96 / 72);
+        }
+        return val + (val ? 'px' : '');
+    },
+    /**
+     * 动态添加css样式
+     * @name cssRule
+     * @grammar UM.utils.cssRule('添加的样式的节点名称',['样式'，'放到哪个document上'])
+     * @grammar UM.utils.cssRule('body','body{background:#ccc}') => null  //给body添加背景颜色
+     * @grammar UM.utils.cssRule('body') =>样式的字符串  //取得key值为body的样式的内容,如果没有找到key值先关的样式将返回空，例如刚才那个背景颜色，将返回 body{background:#ccc}
+     * @grammar UM.utils.cssRule('body','') =>null //清空给定的key值的背景颜色
+     */
+    cssRule:browser.ie && browser.version != 11 ? function (key, style, doc) {
+        var indexList, index;
+        doc = doc || document;
+        if (doc.indexList) {
+            indexList = doc.indexList;
+        } else {
+            indexList = doc.indexList = {};
+        }
+        var sheetStyle;
+        if (!indexList[key]) {
+            if (style === undefined) {
+                return ''
+            }
+            sheetStyle = doc.createStyleSheet('', index = doc.styleSheets.length);
+            indexList[key] = index;
+        } else {
+            sheetStyle = doc.styleSheets[indexList[key]];
+        }
+        if (style === undefined) {
+            return sheetStyle.cssText
+        }
+        sheetStyle.cssText = style || ''
+    } : function (key, style, doc) {
+        doc = doc || document;
+        var head = doc.getElementsByTagName('head')[0], node;
+        if (!(node = doc.getElementById(key))) {
+            if (style === undefined) {
+                return ''
+            }
+            node = doc.createElement('style');
+            node.id = key;
+            head.appendChild(node)
+        }
+        if (style === undefined) {
+            return node.innerHTML
+        }
+        if (style !== '') {
+            node.innerHTML = style;
+        } else {
+            head.removeChild(node)
+        }
+    },
+    /**
+     * etpl 渲染函数
+     * @name render
+     * @grammar UM.utils.render(tpl, data) => string
+     */
+    render: function (tpl, data) {
+        var _render = etpl.compile(tpl);
+        return _render(data);
+    }
+
+};
+/**
+ * 判断str是否为字符串
+ * @name isString
+ * @grammar UM.utils.isString(str) => true|false
+ */
+/**
+ * 判断array是否为数组
+ * @name isArray
+ * @grammar UM.utils.isArray(obj) => true|false
+ */
+/**
+ * 判断obj对象是否为方法
+ * @name isFunction
+ * @grammar UM.utils.isFunction(obj)  => true|false
+ */
+/**
+ * 判断obj对象是否为数字
+ * @name isNumber
+ * @grammar UM.utils.isNumber(obj)  => true|false
+ */
+utils.each(['String', 'Function', 'Array', 'Number', 'RegExp', 'Object'], function (v) {
+    UM.utils['is' + v] = function (obj) {
+        return Object.prototype.toString.apply(obj) == '[object ' + v + ']';
+    }
+});
+/**
+ * @file
+ * @name UM.EventBase
+ * @short EventBase
+ * @import editor.js,core/utils.js
+ * @desc UE采用的事件基类，继承此类的对应类将获取addListener,removeListener,fireEvent方法。
+ * 在UE中，Editor以及所有ui实例都继承了该类，故可以在对应的ui对象以及editor对象上使用上述方法。
+ */
+var EventBase = UM.EventBase = function () {};
+
+EventBase.prototype = {
+    /**
+     * 注册事件监听器
+     * @name addListener
+     * @grammar editor.addListener(types,fn)  //types为事件名称，多个可用空格分隔
+     * @example
+     * editor.addListener('selectionchange',function(){
+     *      console.log("选区已经变化！");
+     * })
+     * editor.addListener('beforegetcontent aftergetcontent',function(type){
+     *         if(type == 'beforegetcontent'){
+     *             //do something
+     *         }else{
+     *             //do something
+     *         }
+     *         console.log(this.getContent) // this是注册的事件的编辑器实例
+     * })
+     */
+    addListener:function (types, listener) {
+        types = utils.trim(types).split(' ');
+        for (var i = 0, ti; ti = types[i++];) {
+            getListener(this, ti, true).push(listener);
+        }
+    },
+    /**
+     * 移除事件监听器
+     * @name removeListener
+     * @grammar editor.removeListener(types,fn)  //types为事件名称，多个可用空格分隔
+     * @example
+     * //changeCallback为方法体
+     * editor.removeListener("selectionchange",changeCallback);
+     */
+    removeListener:function (types, listener) {
+        types = utils.trim(types).split(' ');
+        for (var i = 0, ti; ti = types[i++];) {
+            utils.removeItem(getListener(this, ti) || [], listener);
+        }
+    },
+    /**
+     * 触发事件
+     * @name fireEvent
+     * @grammar editor.fireEvent(types)  //types为事件名称，多个可用空格分隔
+     * @example
+     * editor.fireEvent("selectionchange");
+     */
+    fireEvent:function () {
+        var types = arguments[0];
+        types = utils.trim(types).split(' ');
+        for (var i = 0, ti; ti = types[i++];) {
+            var listeners = getListener(this, ti),
+                r, t, k;
+            if (listeners) {
+                k = listeners.length;
+                while (k--) {
+                    if(!listeners[k])continue;
+                    t = listeners[k].apply(this, arguments);
+                    if(t === true){
+                        return t;
+                    }
+                    if (t !== undefined) {
+                        r = t;
+                    }
+                }
+            }
+            if (t = this['on' + ti.toLowerCase()]) {
+                r = t.apply(this, arguments);
+            }
+        }
+        return r;
+    }
+};
+/**
+ * 获得对象所拥有监听类型的所有监听器
+ * @public
+ * @function
+ * @param {Object} obj  查询监听器的对象
+ * @param {String} type 事件类型
+ * @param {Boolean} force  为true且当前所有type类型的侦听器不存在时，创建一个空监听器数组
+ * @returns {Array} 监听器数组
+ */
+function getListener(obj, type, force) {
+    var allListeners;
+    type = type.toLowerCase();
+    return ( ( allListeners = ( obj.__allListeners || force && ( obj.__allListeners = {} ) ) )
+        && ( allListeners[type] || force && ( allListeners[type] = [] ) ) );
+}
+
+
+///import editor.js
+///import core/dom/dom.js
+///import core/utils.js
+/**
+ * dtd html语义化的体现类
+ * @constructor
+ * @namespace dtd
+ */
+var dtd = dom.dtd = (function() {
+    function _( s ) {
+        for (var k in s) {
+            s[k.toUpperCase()] = s[k];
+        }
+        return s;
+    }
+    var X = utils.extend2;
+    var A = _({isindex:1,fieldset:1}),
+        B = _({input:1,button:1,select:1,textarea:1,label:1}),
+        C = X( _({a:1}), B ),
+        D = X( {iframe:1}, C ),
+        E = _({hr:1,ul:1,menu:1,div:1,blockquote:1,noscript:1,table:1,center:1,address:1,dir:1,pre:1,h5:1,dl:1,h4:1,noframes:1,h6:1,ol:1,h1:1,h3:1,h2:1}),
+        F = _({ins:1,del:1,script:1,style:1}),
+        G = X( _({b:1,acronym:1,bdo:1,'var':1,'#':1,abbr:1,code:1,br:1,i:1,cite:1,kbd:1,u:1,strike:1,s:1,tt:1,strong:1,q:1,samp:1,em:1,dfn:1,span:1}), F ),
+        H = X( _({sub:1,img:1,embed:1,object:1,sup:1,basefont:1,map:1,applet:1,font:1,big:1,small:1}), G ),
+        I = X( _({p:1}), H ),
+        J = X( _({iframe:1}), H, B ),
+        K = _({img:1,embed:1,noscript:1,br:1,kbd:1,center:1,button:1,basefont:1,h5:1,h4:1,samp:1,h6:1,ol:1,h1:1,h3:1,h2:1,form:1,font:1,'#':1,select:1,menu:1,ins:1,abbr:1,label:1,code:1,table:1,script:1,cite:1,input:1,iframe:1,strong:1,textarea:1,noframes:1,big:1,small:1,span:1,hr:1,sub:1,bdo:1,'var':1,div:1,object:1,sup:1,strike:1,dir:1,map:1,dl:1,applet:1,del:1,isindex:1,fieldset:1,ul:1,b:1,acronym:1,a:1,blockquote:1,i:1,u:1,s:1,tt:1,address:1,q:1,pre:1,p:1,em:1,dfn:1}),
+
+        L = X( _({a:0}), J ),//a不能被切开，所以把他
+        M = _({tr:1}),
+        N = _({'#':1}),
+        O = X( _({param:1}), K ),
+        P = X( _({form:1}), A, D, E, I ),
+        Q = _({li:1,ol:1,ul:1}),
+        R = _({style:1,script:1}),
+        S = _({base:1,link:1,meta:1,title:1}),
+        T = X( S, R ),
+        U = _({head:1,body:1}),
+        V = _({html:1});
+
+    var block = _({address:1,blockquote:1,center:1,dir:1,div:1,dl:1,fieldset:1,form:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,hr:1,isindex:1,menu:1,noframes:1,ol:1,p:1,pre:1,table:1,ul:1}),
+
+        empty =  _({area:1,base:1,basefont:1,br:1,col:1,command:1,dialog:1,embed:1,hr:1,img:1,input:1,isindex:1,keygen:1,link:1,meta:1,param:1,source:1,track:1,wbr:1});
+
+    return  _({
+
+        // $ 表示自定的属性
+
+        // body外的元素列表.
+        $nonBodyContent: X( V, U, S ),
+
+        //块结构元素列表
+        $block : block,
+
+        //内联元素列表
+        $inline : L,
+
+        $inlineWithA : X(_({a:1}),L),
+
+        $body : X( _({script:1,style:1}), block ),
+
+        $cdata : _({script:1,style:1}),
+
+        //自闭和元素
+        $empty : empty,
+
+        //不是自闭合，但不能让range选中里边
+        $nonChild : _({iframe:1,textarea:1}),
+        //列表元素列表
+        $listItem : _({dd:1,dt:1,li:1}),
+
+        //列表根元素列表
+        $list: _({ul:1,ol:1,dl:1}),
+
+        //不能认为是空的元素
+        $isNotEmpty : _({table:1,ul:1,ol:1,dl:1,iframe:1,area:1,base:1,col:1,hr:1,img:1,embed:1,input:1,link:1,meta:1,param:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1}),
+
+        //如果没有子节点就可以删除的元素列表，像span,a
+        $removeEmpty : _({a:1,abbr:1,acronym:1,address:1,b:1,bdo:1,big:1,cite:1,code:1,del:1,dfn:1,em:1,font:1,i:1,ins:1,label:1,kbd:1,q:1,s:1,samp:1,small:1,span:1,strike:1,strong:1,sub:1,sup:1,tt:1,u:1,'var':1}),
+
+        $removeEmptyBlock : _({'p':1,'div':1}),
+
+        //在table元素里的元素列表
+        $tableContent : _({caption:1,col:1,colgroup:1,tbody:1,td:1,tfoot:1,th:1,thead:1,tr:1,table:1}),
+        //不转换的标签
+        $notTransContent : _({pre:1,script:1,style:1,textarea:1}),
+        html: U,
+        head: T,
+        style: N,
+        script: N,
+        body: P,
+        base: {},
+        link: {},
+        meta: {},
+        title: N,
+        col : {},
+        tr : _({td:1,th:1}),
+        img : {},
+        embed: {},
+        colgroup : _({thead:1,col:1,tbody:1,tr:1,tfoot:1}),
+        noscript : P,
+        td : P,
+        br : {},
+        th : P,
+        center : P,
+        kbd : L,
+        button : X( I, E ),
+        basefont : {},
+        h5 : L,
+        h4 : L,
+        samp : L,
+        h6 : L,
+        ol : Q,
+        h1 : L,
+        h3 : L,
+        option : N,
+        h2 : L,
+        form : X( A, D, E, I ),
+        select : _({optgroup:1,option:1}),
+        font : L,
+        ins : L,
+        menu : Q,
+        abbr : L,
+        label : L,
+        table : _({thead:1,col:1,tbody:1,tr:1,colgroup:1,caption:1,tfoot:1}),
+        code : L,
+        tfoot : M,
+        cite : L,
+        li : P,
+        input : {},
+        iframe : P,
+        strong : L,
+        textarea : N,
+        noframes : P,
+        big : L,
+        small : L,
+        //trace:
+        span :_({'#':1,br:1,b:1,strong:1,u:1,i:1,em:1,sub:1,sup:1,strike:1,span:1}),
+        hr : L,
+        dt : L,
+        sub : L,
+        optgroup : _({option:1}),
+        param : {},
+        bdo : L,
+        'var' : L,
+        div : P,
+        object : O,
+        sup : L,
+        dd : P,
+        strike : L,
+        area : {},
+        dir : Q,
+        map : X( _({area:1,form:1,p:1}), A, F, E ),
+        applet : O,
+        dl : _({dt:1,dd:1}),
+        del : L,
+        isindex : {},
+        fieldset : X( _({legend:1}), K ),
+        thead : M,
+        ul : Q,
+        acronym : L,
+        b : L,
+        a : X( _({a:1}), J ),
+        blockquote :X(_({td:1,tr:1,tbody:1,li:1}),P),
+        caption : L,
+        i : L,
+        u : L,
+        tbody : M,
+        s : L,
+        address : X( D, I ),
+        tt : L,
+        legend : L,
+        q : L,
+        pre : X( G, C ),
+        p : X(_({'a':1}),L),
+        em :L,
+        dfn : L
+    });
+})();
+
+/**
+ * @file
+ * @name UM.dom.domUtils
+ * @short DomUtils
+ * @import editor.js, core/utils.js,core/browser.js,core/dom/dtd.js
+ * @desc UEditor封装的底层dom操作库
+ */
+
+function getDomNode(node, start, ltr, startFromChild, fn, guard) {
+    var tmpNode = startFromChild && node[start],
+        parent;
+    !tmpNode && (tmpNode = node[ltr]);
+    while (!tmpNode && (parent = (parent || node).parentNode)) {
+        if (parent.tagName == 'BODY' || guard && !guard(parent)) {
+            return null;
+        }
+        tmpNode = parent[ltr];
+    }
+    if (tmpNode && fn && !fn(tmpNode)) {
+        return  getDomNode(tmpNode, start, ltr, false, fn);
+    }
+    return tmpNode;
+}
+var attrFix = ie && browser.version < 9 ? {
+        tabindex: "tabIndex",
+        readonly: "readOnly",
+        "for": "htmlFor",
+        "class": "className",
+        maxlength: "maxLength",
+        cellspacing: "cellSpacing",
+        cellpadding: "cellPadding",
+        rowspan: "rowSpan",
+        colspan: "colSpan",
+        usemap: "useMap",
+        frameborder: "frameBorder"
+    } : {
+        tabindex: "tabIndex",
+        readonly: "readOnly"
+    },
+    styleBlock = utils.listToMap([
+        '-webkit-box', '-moz-box', 'block' ,
+        'list-item' , 'table' , 'table-row-group' ,
+        'table-header-group', 'table-footer-group' ,
+        'table-row' , 'table-column-group' , 'table-column' ,
+        'table-cell' , 'table-caption'
+    ]);
+var domUtils = dom.domUtils = {
+    //节点常量
+    NODE_ELEMENT: 1,
+    NODE_DOCUMENT: 9,
+    NODE_TEXT: 3,
+    NODE_COMMENT: 8,
+    NODE_DOCUMENT_FRAGMENT: 11,
+
+    //位置关系
+    POSITION_IDENTICAL: 0,
+    POSITION_DISCONNECTED: 1,
+    POSITION_FOLLOWING: 2,
+    POSITION_PRECEDING: 4,
+    POSITION_IS_CONTAINED: 8,
+    POSITION_CONTAINS: 16,
+    //ie6使用其他的会有一段空白出现
+    fillChar: ie && browser.version == '6' ? '\ufeff' : '\u200B',
+    //-------------------------Node部分--------------------------------
+    keys: {
+        /*Backspace*/ 8: 1, /*Delete*/ 46: 1,
+        /*Shift*/ 16: 1, /*Ctrl*/ 17: 1, /*Alt*/ 18: 1,
+        37: 1, 38: 1, 39: 1, 40: 1,
+        13: 1 /*enter*/
+    },
+    breakParent:function (node, parent) {
+        var tmpNode,
+            parentClone = node,
+            clone = node,
+            leftNodes,
+            rightNodes;
+        do {
+            parentClone = parentClone.parentNode;
+            if (leftNodes) {
+                tmpNode = parentClone.cloneNode(false);
+                tmpNode.appendChild(leftNodes);
+                leftNodes = tmpNode;
+                tmpNode = parentClone.cloneNode(false);
+                tmpNode.appendChild(rightNodes);
+                rightNodes = tmpNode;
+            } else {
+                leftNodes = parentClone.cloneNode(false);
+                rightNodes = leftNodes.cloneNode(false);
+            }
+            while (tmpNode = clone.previousSibling) {
+                leftNodes.insertBefore(tmpNode, leftNodes.firstChild);
+            }
+            while (tmpNode = clone.nextSibling) {
+                rightNodes.appendChild(tmpNode);
+            }
+            clone = parentClone;
+        } while (parent !== parentClone);
+        tmpNode = parent.parentNode;
+        tmpNode.insertBefore(leftNodes, parent);
+        tmpNode.insertBefore(rightNodes, parent);
+        tmpNode.insertBefore(node, rightNodes);
+        domUtils.remove(parent);
+        return node;
+    },
+    trimWhiteTextNode:function (node) {
+        function remove(dir) {
+            var child;
+            while ((child = node[dir]) && child.nodeType == 3 && domUtils.isWhitespace(child)) {
+                node.removeChild(child);
+            }
+        }
+        remove('firstChild');
+        remove('lastChild');
+    },
+    /**
+     * 获取节点A相对于节点B的位置关系
+     * @name getPosition
+     * @grammar UM.dom.domUtils.getPosition(nodeA,nodeB)  =>  Number
+     * @example
+     *  switch (returnValue) {
+     *      case 0: //相等，同一节点
+     *      case 1: //无关，节点不相连
+     *      case 2: //跟随，即节点A头部位于节点B头部的后面
+     *      case 4: //前置，即节点A头部位于节点B头部的前面
+     *      case 8: //被包含，即节点A被节点B包含
+     *      case 10://组合类型，即节点A满足跟随节点B且被节点B包含。实际上，如果被包含，必定跟随，所以returnValue事实上不会存在8的情况。
+     *      case 16://包含，即节点A包含节点B
+     *      case 20://组合类型，即节点A满足前置节点A且包含节点B。同样，如果包含，必定前置，所以returnValue事实上也不会存在16的情况
+     *  }
+     */
+    getPosition: function (nodeA, nodeB) {
+        // 如果两个节点是同一个节点
+        if (nodeA === nodeB) {
+            // domUtils.POSITION_IDENTICAL
+            return 0;
+        }
+        var node,
+            parentsA = [nodeA],
+            parentsB = [nodeB];
+        node = nodeA;
+        while (node = node.parentNode) {
+            // 如果nodeB是nodeA的祖先节点
+            if (node === nodeB) {
+                // domUtils.POSITION_IS_CONTAINED + domUtils.POSITION_FOLLOWING
+                return 10;
+            }
+            parentsA.push(node);
+        }
+        node = nodeB;
+        while (node = node.parentNode) {
+            // 如果nodeA是nodeB的祖先节点
+            if (node === nodeA) {
+                // domUtils.POSITION_CONTAINS + domUtils.POSITION_PRECEDING
+                return 20;
+            }
+            parentsB.push(node);
+        }
+        parentsA.reverse();
+        parentsB.reverse();
+        if (parentsA[0] !== parentsB[0]) {
+            // domUtils.POSITION_DISCONNECTED
+            return 1;
+        }
+        var i = -1;
+        while (i++, parentsA[i] === parentsB[i]) {
+        }
+        nodeA = parentsA[i];
+        nodeB = parentsB[i];
+        while (nodeA = nodeA.nextSibling) {
+            if (nodeA === nodeB) {
+                // domUtils.POSITION_PRECEDING
+                return 4
+            }
+        }
+        // domUtils.POSITION_FOLLOWING
+        return  2;
+    },
+
+    /**
+     * 返回节点node在父节点中的索引位置
+     * @name getNodeIndex
+     * @grammar UM.dom.domUtils.getNodeIndex(node)  => Number  //索引值从0开始
+     */
+    getNodeIndex: function (node, ignoreTextNode) {
+        var preNode = node,
+            i = 0;
+        while (preNode = preNode.previousSibling) {
+            if (ignoreTextNode && preNode.nodeType == 3) {
+                if (preNode.nodeType != preNode.nextSibling.nodeType) {
+                    i++;
+                }
+                continue;
+            }
+            i++;
+        }
+        return i;
+    },
+
+    /**
+     * 检测节点node是否在节点doc的树上，实质上是检测是否被doc包含
+     * @name inDoc
+     * @grammar UM.dom.domUtils.inDoc(node,doc)   =>  true|false
+     */
+    inDoc: function (node, doc) {
+        return domUtils.getPosition(node, doc) == 10;
+    },
+    /**
+     * 查找node节点的祖先节点
+     * @name findParent
+     * @grammar UM.dom.domUtils.findParent(node)  => Element  // 直接返回node节点的父节点
+     * @grammar UM.dom.domUtils.findParent(node,filterFn)  => Element  //filterFn为过滤函数，node作为参数，返回true时才会将node作为符合要求的节点返回
+     * @grammar UM.dom.domUtils.findParent(node,filterFn,includeSelf)  => Element  //includeSelf指定是否包含自身
+     */
+    findParent: function (node, filterFn, includeSelf) {
+        if (node && !domUtils.isBody(node)) {
+            node = includeSelf ? node : node.parentNode;
+            while (node) {
+                if (!filterFn || filterFn(node) || domUtils.isBody(node)) {
+                    return filterFn && !filterFn(node) && domUtils.isBody(node) ? null : node;
+                }
+                node = node.parentNode;
+            }
+        }
+        return null;
+    },
+    /**
+     * 通过tagName查找node节点的祖先节点
+     * @name findParentByTagName
+     * @grammar UM.dom.domUtils.findParentByTagName(node,tagNames)   =>  Element  //tagNames支持数组，区分大小写
+     * @grammar UM.dom.domUtils.findParentByTagName(node,tagNames,includeSelf)   =>  Element  //includeSelf指定是否包含自身
+     * @grammar UM.dom.domUtils.findParentByTagName(node,tagNames,includeSelf,excludeFn)   =>  Element  //excludeFn指定例外过滤条件，返回true时忽略该节点
+     */
+    findParentByTagName: function (node, tagNames, includeSelf, excludeFn) {
+        tagNames = utils.listToMap(utils.isArray(tagNames) ? tagNames : [tagNames]);
+        return domUtils.findParent(node, function (node) {
+            return tagNames[node.tagName] && !(excludeFn && excludeFn(node));
+        }, includeSelf);
+    },
+    /**
+     * 查找节点node的祖先节点集合
+     * @name findParents
+     * @grammar UM.dom.domUtils.findParents(node)  => Array  //返回一个祖先节点数组集合，不包含自身
+     * @grammar UM.dom.domUtils.findParents(node,includeSelf)  => Array  //返回一个祖先节点数组集合，includeSelf指定是否包含自身
+     * @grammar UM.dom.domUtils.findParents(node,includeSelf,filterFn)  => Array  //返回一个祖先节点数组集合，filterFn指定过滤条件，返回true的node将被选取
+     * @grammar UM.dom.domUtils.findParents(node,includeSelf,filterFn,closerFirst)  => Array  //返回一个祖先节点数组集合，closerFirst为true的话，node的直接父亲节点是数组的第0个
+     */
+    findParents: function (node, includeSelf, filterFn, closerFirst) {
+        var parents = includeSelf && ( filterFn && filterFn(node) || !filterFn ) ? [node] : [];
+        while (node = domUtils.findParent(node, filterFn)) {
+            parents.push(node);
+        }
+        return closerFirst ? parents : parents.reverse();
+    },
+
+    /**
+     * 在节点node后面插入新节点newNode
+     * @name insertAfter
+     * @grammar UM.dom.domUtils.insertAfter(node,newNode)  => newNode
+     */
+    insertAfter: function (node, newNode) {
+        return node.parentNode.insertBefore(newNode, node.nextSibling);
+    },
+
+    /**
+     * 删除节点node，并根据keepChildren指定是否保留子节点
+     * @name remove
+     * @grammar UM.dom.domUtils.remove(node)  =>  node
+     * @grammar UM.dom.domUtils.remove(node,keepChildren)  =>  node
+     */
+    remove: function (node, keepChildren) {
+
+        var parent = node.parentNode,
+            child;
+        if (parent) {
+            if (keepChildren && node.hasChildNodes()) {
+                while (child = node.firstChild) {
+                    parent.insertBefore(child, node);
+                }
+            }
+            parent.removeChild(node);
+        }
+        return node;
+    },
+
+
+    /**
+     * 取得node节点的下一个兄弟节点， 如果该节点其后没有兄弟节点， 则递归查找其父节点之后的第一个兄弟节点，
+     * 直到找到满足条件的节点或者递归到BODY节点之后才会结束。
+     * @method getNextDomNode
+     * @param { Node } node 需要获取其后的兄弟节点的节点对象
+     * @return { Node | NULL } 如果找满足条件的节点， 则返回该节点， 否则返回NULL
+     * @example
+     * ```html
+     *     <body>
+     *      <div id="test">
+     *          <span></span>
+     *      </div>
+     *      <i>xxx</i>
+     * </body>
+     * <script>
+     *
+     *     //output: i节点
+     *     console.log( UE.dom.domUtils.getNextDomNode( document.getElementById( "test" ) ) );
+     *
+     * </script>
+     * ```
+     * @example
+     * ```html
+     * <body>
+     *      <div>
+     *          <span></span>
+     *          <i id="test">xxx</i>
+     *      </div>
+     *      <b>xxx</b>
+     * </body>
+     * <script>
+     *
+     *     //由于id为test的i节点之后没有兄弟节点， 则查找其父节点（div）后面的兄弟节点
+     *     //output: b节点
+     *     console.log( UE.dom.domUtils.getNextDomNode( document.getElementById( "test" ) ) );
+     *
+     * </script>
+     * ```
+     */
+
+    /**
+     * 取得node节点的下一个兄弟节点， 如果startFromChild的值为ture，则先获取其子节点，
+     * 如果有子节点则直接返回第一个子节点；如果没有子节点或者startFromChild的值为false，
+     * 则执行<a href="#UE.dom.domUtils.getNextDomNode(Node)">getNextDomNode(Node node)</a>的查找过程。
+     * @method getNextDomNode
+     * @param { Node } node 需要获取其后的兄弟节点的节点对象
+     * @param { Boolean } startFromChild 查找过程是否从其子节点开始
+     * @return { Node | NULL } 如果找满足条件的节点， 则返回该节点， 否则返回NULL
+     * @see UE.dom.domUtils.getNextDomNode(Node)
+     */
+    getNextDomNode:function (node, startFromChild, filterFn, guard) {
+        return getDomNode(node, 'firstChild', 'nextSibling', startFromChild, filterFn, guard);
+    },
+    getPreDomNode:function (node, startFromChild, filterFn, guard) {
+        return getDomNode(node, 'lastChild', 'previousSibling', startFromChild, filterFn, guard);
+    },
+
+    /**
+     * 检测节点node是否属于bookmark节点
+     * @name isBookmarkNode
+     * @grammar UM.dom.domUtils.isBookmarkNode(node)  => true|false
+     */
+    isBookmarkNode: function (node) {
+        return node.nodeType == 1 && node.id && /^_baidu_bookmark_/i.test(node.id);
+    },
+    /**
+     * 获取节点node所在的window对象
+     * @name  getWindow
+     * @grammar UM.dom.domUtils.getWindow(node)  => window对象
+     */
+    getWindow: function (node) {
+        var doc = node.ownerDocument || node;
+        return doc.defaultView || doc.parentWindow;
+    },
+
+    /**
+     * 获取离nodeA与nodeB最近的公共的祖先节点
+     * @method  getCommonAncestor
+     * @param { Node } nodeA 第一个节点
+     * @param { Node } nodeB 第二个节点
+     * @remind 如果给定的两个节点是同一个节点， 将直接返回该节点。
+     * @return { Node | NULL } 如果未找到公共节点， 返回NULL， 否则返回最近的公共祖先节点。
+     * @example
+     * ```javascript
+     * var commonAncestor = UE.dom.domUtils.getCommonAncestor( document.body, document.body.firstChild );
+     * //output: true
+     * console.log( commonAncestor.tagName.toLowerCase() === 'body' );
+     * ```
+     */
+    getCommonAncestor:function (nodeA, nodeB) {
+        if (nodeA === nodeB)
+            return nodeA;
+        var parentsA = [nodeA] , parentsB = [nodeB], parent = nodeA, i = -1;
+        while (parent = parent.parentNode) {
+            if (parent === nodeB) {
+                return parent;
+            }
+            parentsA.push(parent);
+        }
+        parent = nodeB;
+        while (parent = parent.parentNode) {
+            if (parent === nodeA)
+                return parent;
+            parentsB.push(parent);
+        }
+        parentsA.reverse();
+        parentsB.reverse();
+        while (i++, parentsA[i] === parentsB[i]) {
+        }
+        return i == 0 ? null : parentsA[i - 1];
+
+    },
+    /**
+     * 清除node节点左右连续为空的兄弟inline节点
+     * @method clearEmptySibling
+     * @param { Node } node 执行的节点对象， 如果该节点的左右连续的兄弟节点是空的inline节点，
+     * 则这些兄弟节点将被删除
+     * @grammar UE.dom.domUtils.clearEmptySibling(node,ignoreNext)  //ignoreNext指定是否忽略右边空节点
+     * @grammar UE.dom.domUtils.clearEmptySibling(node,ignoreNext,ignorePre)  //ignorePre指定是否忽略左边空节点
+     * @example
+     * ```html
+     * <body>
+     *     <div></div>
+     *     <span id="test"></span>
+     *     <i></i>
+     *     <b></b>
+     *     <em>xxx</em>
+     *     <span></span>
+     * </body>
+     * <script>
+     *
+     *      UE.dom.domUtils.clearEmptySibling( document.getElementById( "test" ) );
+     *
+     *      //output: <div></div><span id="test"></span><em>xxx</em><span></span>
+     *      console.log( document.body.innerHTML );
+     *
+     * </script>
+     * ```
+     */
+
+    /**
+     * 清除node节点左右连续为空的兄弟inline节点， 如果ignoreNext的值为true，
+     * 则忽略对右边兄弟节点的操作。
+     * @method clearEmptySibling
+     * @param { Node } node 执行的节点对象， 如果该节点的左右连续的兄弟节点是空的inline节点，
+     * @param { Boolean } ignoreNext 是否忽略忽略对右边的兄弟节点的操作
+     * 则这些兄弟节点将被删除
+     * @see UE.dom.domUtils.clearEmptySibling(Node)
+     */
+
+    /**
+     * 清除node节点左右连续为空的兄弟inline节点， 如果ignoreNext的值为true，
+     * 则忽略对右边兄弟节点的操作， 如果ignorePre的值为true，则忽略对左边兄弟节点的操作。
+     * @method clearEmptySibling
+     * @param { Node } node 执行的节点对象， 如果该节点的左右连续的兄弟节点是空的inline节点，
+     * @param { Boolean } ignoreNext 是否忽略忽略对右边的兄弟节点的操作
+     * @param { Boolean } ignorePre 是否忽略忽略对左边的兄弟节点的操作
+     * 则这些兄弟节点将被删除
+     * @see UE.dom.domUtils.clearEmptySibling(Node)
+     */
+    clearEmptySibling:function (node, ignoreNext, ignorePre) {
+        function clear(next, dir) {
+            var tmpNode;
+            while (next && !domUtils.isBookmarkNode(next) && (domUtils.isEmptyInlineElement(next)
+                //这里不能把空格算进来会吧空格干掉，出现文字间的空格丢掉了
+                || !new RegExp('[^\t\n\r' + domUtils.fillChar + ']').test(next.nodeValue) )) {
+                tmpNode = next[dir];
+                domUtils.remove(next);
+                next = tmpNode;
+            }
+        }
+        !ignoreNext && clear(node.nextSibling, 'nextSibling');
+        !ignorePre && clear(node.previousSibling, 'previousSibling');
+    },
+
+    /**
+     * 将一个文本节点node拆分成两个文本节点，offset指定拆分位置
+     * @name split
+     * @grammar UM.dom.domUtils.split(node,offset)  =>  TextNode  //返回从切分位置开始的后一个文本节点
+     */
+    split: function (node, offset) {
+        var doc = node.ownerDocument;
+        if (browser.ie && offset == node.nodeValue.length) {
+            var next = doc.createTextNode('');
+            return domUtils.insertAfter(node, next);
+        }
+        var retval = node.splitText(offset);
+        //ie8下splitText不会跟新childNodes,我们手动触发他的更新
+        if (browser.ie8) {
+            var tmpNode = doc.createTextNode('');
+            domUtils.insertAfter(retval, tmpNode);
+            domUtils.remove(tmpNode);
+        }
+        return retval;
+    },
+
+    /**
+     * 检测节点node是否为空节点（包括空格、换行、占位符等字符）
+     * @name  isWhitespace
+     * @grammar  UM.dom.domUtils.isWhitespace(node)  => true|false
+     */
+    isWhitespace: function (node) {
+        return !new RegExp('[^ \t\n\r' + domUtils.fillChar + ']').test(node.nodeValue);
+    },
+    /**
+     * 获取元素element相对于viewport的位置坐标
+     * @name getXY
+     * @grammar UM.dom.domUtils.getXY(element)  => Object //返回坐标对象{x:left,y:top}
+     */
+    getXY: function (element) {
+        var x = 0, y = 0;
+        while (element.offsetParent) {
+            y += element.offsetTop;
+            x += element.offsetLeft;
+            element = element.offsetParent;
+        }
+        return { 'x': x, 'y': y};
+    },
+    /**
+     * 检查节点node是否是空inline节点
+     * @name  isEmptyInlineElement
+     * @grammar   UM.dom.domUtils.isEmptyInlineElement(node)  => 1|0
+     * @example
+     * <b><i></i></b> => 1
+     * <b><i></i><u></u></b> => 1
+     * <b></b> => 1
+     * <b>xx<i></i></b> => 0
+     */
+    isEmptyInlineElement: function (node) {
+        if (node.nodeType != 1 || !dtd.$removeEmpty[ node.tagName ]) {
+            return 0;
+        }
+        node = node.firstChild;
+        while (node) {
+            //如果是创建的bookmark就跳过
+            if (domUtils.isBookmarkNode(node)) {
+                return 0;
+            }
+            if (node.nodeType == 1 && !domUtils.isEmptyInlineElement(node) ||
+                node.nodeType == 3 && !domUtils.isWhitespace(node)
+                ) {
+                return 0;
+            }
+            node = node.nextSibling;
+        }
+        return 1;
+
+    },
+
+
+    /**
+     * 检查节点node是否为块元素
+     * @name isBlockElm
+     * @grammar UM.dom.domUtils.isBlockElm(node)  => true|false
+     */
+    isBlockElm: function (node) {
+        return node.nodeType == 1 && (dtd.$block[node.tagName] || styleBlock[domUtils.getComputedStyle(node, 'display')]) && !dtd.$nonChild[node.tagName];
+    },
+
+
+    /**
+     * 原生方法getElementsByTagName的封装
+     * @name getElementsByTagName
+     * @grammar UM.dom.domUtils.getElementsByTagName(node,tagName)  => Array  //节点集合数组
+     */
+    getElementsByTagName: function (node, name, filter) {
+        if (filter && utils.isString(filter)) {
+            var className = filter;
+            filter = function (node) {
+                var result = false;
+                $.each(utils.trim(className).replace(/[ ]{2,}/g, ' ').split(' '), function (i, v) {
+                    if ($(node).hasClass(v)) {
+                        result = true;
+                        return false;
+                    }
+                })
+                return result;
+            }
+        }
+        name = utils.trim(name).replace(/[ ]{2,}/g, ' ').split(' ');
+        var arr = [];
+        for (var n = 0, ni; ni = name[n++];) {
+            var list = node.getElementsByTagName(ni);
+            for (var i = 0, ci; ci = list[i++];) {
+                if (!filter || filter(ci))
+                    arr.push(ci);
+            }
+        }
+        return arr;
+    },
+
+
+    /**
+     * 设置节点node及其子节点不会被选中
+     * @name unSelectable
+     * @grammar UM.dom.domUtils.unSelectable(node)
+     */
+    unSelectable: ie && browser.ie9below || browser.opera ? function (node) {
+        //for ie9
+        node.onselectstart = function () {
+            return false;
+        };
+        node.onclick = node.onkeyup = node.onkeydown = function () {
+            return false;
+        };
+        node.unselectable = 'on';
+        node.setAttribute("unselectable", "on");
+        for (var i = 0, ci; ci = node.all[i++];) {
+            switch (ci.tagName.toLowerCase()) {
+                case 'iframe' :
+                case 'textarea' :
+                case 'input' :
+                case 'select' :
+                    break;
+                default :
+                    ci.unselectable = 'on';
+                    node.setAttribute("unselectable", "on");
+            }
+        }
+    } : function (node) {
+        node.style.MozUserSelect =
+            node.style.webkitUserSelect =
+                    node.style.msUserSelect =
+                        node.style.KhtmlUserSelect = 'none';
+    },
+    /**
+     * 删除节点node上的属性attrNames，attrNames为属性名称数组
+     * @name  removeAttributes
+     * @grammar UM.dom.domUtils.removeAttributes(node,attrNames)
+     * @example
+     * //Before remove
+     * <span style="font-size:14px;" id="test" name="followMe">xxxxx</span>
+     * //Remove
+     * UM.dom.domUtils.removeAttributes(node,["id","name"]);
+     * //After remove
+     * <span style="font-size:14px;">xxxxx</span>
+     */
+    removeAttributes: function (node, attrNames) {
+        attrNames = utils.isArray(attrNames) ? attrNames : utils.trim(attrNames).replace(/[ ]{2,}/g, ' ').split(' ');
+        for (var i = 0, ci; ci = attrNames[i++];) {
+            ci = attrFix[ci] || ci;
+            switch (ci) {
+                case 'className':
+                    node[ci] = '';
+                    break;
+                case 'style':
+                    node.style.cssText = '';
+                    if (node.getAttributeNode('style')) {
+                        !browser.ie && node.removeAttributeNode(node.getAttributeNode('style'))
+                    }
+            }
+            node.removeAttribute(ci);
+        }
+    },
+    /**
+     * 在doc下创建一个标签名为tag，属性为attrs的元素
+     * @name createElement
+     * @grammar UM.dom.domUtils.createElement(doc,tag,attrs)  =>  Node  //返回创建的节点
+     */
+    createElement: function (doc, tag, attrs) {
+        return domUtils.setAttributes(doc.createElement(tag), attrs)
+    },
+    /**
+     * 为节点node添加属性attrs，attrs为属性键值对
+     * @name setAttributes
+     * @grammar UM.dom.domUtils.setAttributes(node,attrs)  => node
+     */
+    setAttributes: function (node, attrs) {
+        for (var attr in attrs) {
+            if (attrs.hasOwnProperty(attr)) {
+                var value = attrs[attr];
+                switch (attr) {
+                    case 'class':
+                        //ie下要这样赋值，setAttribute不起作用
+                        node.className = value;
+                        break;
+                    case 'style' :
+                        node.style.cssText = node.style.cssText + ";" + value;
+                        break;
+                    case 'innerHTML':
+                        node[attr] = value;
+                        break;
+                    case 'value':
+                        node.value = value;
+                        break;
+                    default:
+                        node.setAttribute(attrFix[attr] || attr, value);
+                }
+            }
+        }
+        return node;
+    },
+
+    /**
+     * 获取元素element的计算样式
+     * @name getComputedStyle
+     * @grammar UM.dom.domUtils.getComputedStyle(element,styleName)  => String //返回对应样式名称的样式值
+     * @example
+     * getComputedStyle(document.body,"font-size")  =>  "15px"
+     * getComputedStyle(form,"color")  =>  "#ffccdd"
+     */
+    getComputedStyle: function (element, styleName) {
+        return utils.transUnitToPx(utils.fixColor(styleName, $(element).css(styleName)));
+    },
+
+    /**
+     * 阻止事件默认行为
+     * @param {Event} evt    需要组织的事件对象
+     */
+    preventDefault: function (evt) {
+        evt.preventDefault ? evt.preventDefault() : (evt.returnValue = false);
+    },
+
+    /**
+     * 删除元素element指定的样式
+     * @method removeStyle
+     * @param { Element } element 需要删除样式的元素
+     * @param { String } styleName 需要删除的样式名
+     * @example
+     * ```html
+     * <span id="test" style="color: red; background: blue;"></span>
+     *
+     * <script>
+     *
+     *     var testNode = document.getElementById("test");
+     *
+     *     UE.dom.domUtils.removeStyle( testNode, 'color' );
+     *
+     *     //output: background: blue;
+     *     console.log( testNode.style.cssText );
+     *
+     * </script>
+     * ```
+     */
+    removeStyle:function (element, name) {
+        if(browser.ie ){
+            //针对color先单独处理一下
+            if(name == 'color'){
+                name = '(^|;)' + name;
+            }
+            element.style.cssText = element.style.cssText.replace(new RegExp(name + '[^:]*:[^;]+;?','ig'),'')
+        }else{
+            if (element.style.removeProperty) {
+                element.style.removeProperty (name);
+            }else {
+                element.style.removeAttribute (utils.cssStyleToDomStyle(name));
+            }
+        }
+
+
+        if (!element.style.cssText) {
+            domUtils.removeAttributes(element, ['style']);
+        }
+    },
+
+    /**
+     * 获取元素element的某个样式值
+     * @name getStyle
+     * @grammar UM.dom.domUtils.getStyle(element,name)  => String
+     */
+    getStyle: function (element, name) {
+        var value = element.style[ utils.cssStyleToDomStyle(name) ];
+        return utils.fixColor(name, value);
+    },
+    /**
+     * 为元素element设置样式属性值
+     * @name setStyle
+     * @grammar UM.dom.domUtils.setStyle(element,name,value)
+     */
+    setStyle: function (element, name, value) {
+        element.style[utils.cssStyleToDomStyle(name)] = value;
+        if (!utils.trim(element.style.cssText)) {
+            this.removeAttributes(element, 'style')
+        }
+    },
+
+    /**
+     * 删除_moz_dirty属性
+     * @function
+     */
+    removeDirtyAttr: function (node) {
+        for (var i = 0, ci, nodes = node.getElementsByTagName('*'); ci = nodes[i++];) {
+            ci.removeAttribute('_moz_dirty');
+        }
+        node.removeAttribute('_moz_dirty');
+    },
+    /**
+     * 返回子节点的数量
+     * @function
+     * @param {Node}    node    父节点
+     * @param  {Function}    fn    过滤子节点的规则，若为空，则得到所有子节点的数量
+     * @return {Number}    符合条件子节点的数量
+     */
+    getChildCount: function (node, fn) {
+        var count = 0, first = node.firstChild;
+        fn = fn || function () {
+            return 1;
+        };
+        while (first) {
+            if (fn(first)) {
+                count++;
+            }
+            first = first.nextSibling;
+        }
+        return count;
+    },
+
+    /**
+     * 判断是否为空节点
+     * @function
+     * @param {Node}    node    节点
+     * @return {Boolean}    是否为空节点
+     */
+    isEmptyNode: function (node) {
+        return !node.firstChild || domUtils.getChildCount(node, function (node) {
+            return  !domUtils.isBr(node) && !domUtils.isBookmarkNode(node) && !domUtils.isWhitespace(node)
+        }) == 0
+    },
+
+    /**
+     * 判断节点是否为br
+     * @function
+     * @param {Node}    node   节点
+     */
+    isBr: function (node) {
+        return node.nodeType == 1 && node.tagName == 'BR';
+    },
+    
+    isEmptyBlock: function (node, reg) {
+        if (node.nodeType != 1)
+            return 0;
+        reg = reg || new RegExp('[ \t\r\n' + domUtils.fillChar + ']', 'g');
+        if (node[browser.ie ? 'innerText' : 'textContent'].replace(reg, '').length > 0) {
+            return 0;
+        }
+        for (var n in dtd.$isNotEmpty) {
+            if (node.getElementsByTagName(n).length) {
+                return 0;
+            }
+        }
+        return 1;
+    },
+
+    //判断是否是编辑器自定义的参数
+    isCustomeNode: function (node) {
+        return node.nodeType == 1 && node.getAttribute('_ue_custom_node_');
+    },
+    fillNode: function (doc, node) {
+        var tmpNode = browser.ie ? doc.createTextNode(domUtils.fillChar) : doc.createElement('br');
+        node.innerHTML = '';
+        node.appendChild(tmpNode);
+    },
+    isBoundaryNode: function (node, dir) {
+        var tmp;
+        while (!domUtils.isBody(node)) {
+            tmp = node;
+            node = node.parentNode;
+            if (tmp !== node[dir]) {
+                return false;
+            }
+        }
+        return true;
+    },
+    isFillChar: function (node, isInStart) {
+        return node.nodeType == 3 && !node.nodeValue.replace(new RegExp((isInStart ? '^' : '' ) + domUtils.fillChar), '').length
+    },
+    isBody: function(node){
+        return $(node).hasClass('edui-body-container');
+    }
+};
+var fillCharReg = new RegExp(domUtils.fillChar, 'g');
+///import editor.js
+///import core/utils.js
+///import core/browser.js
+///import core/dom/dom.js
+///import core/dom/dtd.js
+///import core/dom/domUtils.js
+/**
+ * @file
+ * @name UM.dom.Range
+ * @anthor zhanyi
+ * @short Range
+ * @import editor.js,core/utils.js,core/browser.js,core/dom/domUtils.js,core/dom/dtd.js
+ * @desc Range范围实现类，本类是UEditor底层核心类，统一w3cRange和ieRange之间的差异，包括接口和属性
+ */
+(function () {
+    var guid = 0,
+        fillChar = domUtils.fillChar,
+        fillData;
+
+    /**
+     * 更新range的collapse状态
+     * @param  {Range}   range    range对象
+     */
+    function updateCollapse(range) {
+        range.collapsed =
+            range.startContainer && range.endContainer &&
+                range.startContainer === range.endContainer &&
+                range.startOffset == range.endOffset;
+    }
+
+    function selectOneNode(rng){
+        return !rng.collapsed && rng.startContainer.nodeType == 1 && rng.startContainer === rng.endContainer && rng.endOffset - rng.startOffset == 1
+    }
+    function setEndPoint(toStart, node, offset, range) {
+        //如果node是自闭合标签要处理
+        if (node.nodeType == 1 && (dtd.$empty[node.tagName] || dtd.$nonChild[node.tagName])) {
+            offset = domUtils.getNodeIndex(node) + (toStart ? 0 : 1);
+            node = node.parentNode;
+        }
+        if (toStart) {
+            range.startContainer = node;
+            range.startOffset = offset;
+            if (!range.endContainer) {
+                range.collapse(true);
+            }
+        } else {
+            range.endContainer = node;
+            range.endOffset = offset;
+            if (!range.startContainer) {
+                range.collapse(false);
+            }
+        }
+        updateCollapse(range);
+        return range;
+    }
+
+
+    /**
+     * @name Range
+     * @grammar new UM.dom.Range(document)  => Range 实例
+     * @desc 创建一个跟document绑定的空的Range实例
+     * - ***startContainer*** 开始边界的容器节点,可以是elementNode或者是textNode
+     * - ***startOffset*** 容器节点中的偏移量，如果是elementNode就是childNodes中的第几个，如果是textNode就是nodeValue的第几个字符
+     * - ***endContainer*** 结束边界的容器节点,可以是elementNode或者是textNode
+     * - ***endOffset*** 容器节点中的偏移量，如果是elementNode就是childNodes中的第几个，如果是textNode就是nodeValue的第几个字符
+     * - ***document*** 跟range关联的document对象
+     * - ***collapsed*** 是否是闭合状态
+     */
+    var Range = dom.Range = function (document,body) {
+        var me = this;
+        me.startContainer =
+            me.startOffset =
+                me.endContainer =
+                    me.endOffset = null;
+        me.document = document;
+        me.collapsed = true;
+        me.body = body;
+    };
+
+    /**
+     * 删除fillData
+     * @param doc
+     * @param excludeNode
+     */
+    function removeFillData(doc, excludeNode) {
+        try {
+            if (fillData && domUtils.inDoc(fillData, doc)) {
+                if (!fillData.nodeValue.replace(fillCharReg, '').length) {
+                    var tmpNode = fillData.parentNode;
+                    domUtils.remove(fillData);
+                    while (tmpNode && domUtils.isEmptyInlineElement(tmpNode) &&
+                        //safari的contains有bug
+                        (browser.safari ? !(domUtils.getPosition(tmpNode,excludeNode) & domUtils.POSITION_CONTAINS) : !tmpNode.contains(excludeNode))
+                        ) {
+                        fillData = tmpNode.parentNode;
+                        domUtils.remove(tmpNode);
+                        tmpNode = fillData;
+                    }
+                } else {
+                    fillData.nodeValue = fillData.nodeValue.replace(fillCharReg, '');
+                }
+            }
+        } catch (e) {
+        }
+    }
+
+    /**
+     *
+     * @param node
+     * @param dir
+     */
+    function mergeSibling(node, dir) {
+        var tmpNode;
+        node = node[dir];
+        while (node && domUtils.isFillChar(node)) {
+            tmpNode = node[dir];
+            domUtils.remove(node);
+            node = tmpNode;
+        }
+    }
+
+    function execContentsAction(range, action) {
+        //调整边界
+        //range.includeBookmark();
+        var start = range.startContainer,
+            end = range.endContainer,
+            startOffset = range.startOffset,
+            endOffset = range.endOffset,
+            doc = range.document,
+            frag = doc.createDocumentFragment(),
+            tmpStart, tmpEnd;
+        if (start.nodeType == 1) {
+            start = start.childNodes[startOffset] || (tmpStart = start.appendChild(doc.createTextNode('')));
+        }
+        if (end.nodeType == 1) {
+            end = end.childNodes[endOffset] || (tmpEnd = end.appendChild(doc.createTextNode('')));
+        }
+        if (start === end && start.nodeType == 3) {
+            frag.appendChild(doc.createTextNode(start.substringData(startOffset, endOffset - startOffset)));
+            //is not clone
+            if (action) {
+                start.deleteData(startOffset, endOffset - startOffset);
+                range.collapse(true);
+            }
+            return frag;
+        }
+        var current, currentLevel, clone = frag,
+            startParents = domUtils.findParents(start, true), endParents = domUtils.findParents(end, true);
+        for (var i = 0; startParents[i] == endParents[i];) {
+            i++;
+        }
+        for (var j = i, si; si = startParents[j]; j++) {
+            current = si.nextSibling;
+            if (si == start) {
+                if (!tmpStart) {
+                    if (range.startContainer.nodeType == 3) {
+                        clone.appendChild(doc.createTextNode(start.nodeValue.slice(startOffset)));
+                        //is not clone
+                        if (action) {
+                            start.deleteData(startOffset, start.nodeValue.length - startOffset);
+                        }
+                    } else {
+                        clone.appendChild(!action ? start.cloneNode(true) : start);
+                    }
+                }
+            } else {
+                currentLevel = si.cloneNode(false);
+                clone.appendChild(currentLevel);
+            }
+            while (current) {
+                if (current === end || current === endParents[j]) {
+                    break;
+                }
+                si = current.nextSibling;
+                clone.appendChild(!action ? current.cloneNode(true) : current);
+                current = si;
+            }
+            clone = currentLevel;
+        }
+        clone = frag;
+        if (!startParents[i]) {
+            clone.appendChild(startParents[i - 1].cloneNode(false));
+            clone = clone.firstChild;
+        }
+        for (var j = i, ei; ei = endParents[j]; j++) {
+            current = ei.previousSibling;
+            if (ei == end) {
+                if (!tmpEnd && range.endContainer.nodeType == 3) {
+                    clone.appendChild(doc.createTextNode(end.substringData(0, endOffset)));
+                    //is not clone
+                    if (action) {
+                        end.deleteData(0, endOffset);
+                    }
+                }
+            } else {
+                currentLevel = ei.cloneNode(false);
+                clone.appendChild(currentLevel);
+            }
+            //如果两端同级，右边第一次已经被开始做了
+            if (j != i || !startParents[i]) {
+                while (current) {
+                    if (current === start) {
+                        break;
+                    }
+                    ei = current.previousSibling;
+                    clone.insertBefore(!action ? current.cloneNode(true) : current, clone.firstChild);
+                    current = ei;
+                }
+            }
+            clone = currentLevel;
+        }
+        if (action) {
+            range.setStartBefore(!endParents[i] ? endParents[i - 1] : !startParents[i] ? startParents[i - 1] : endParents[i]).collapse(true);
+        }
+        tmpStart && domUtils.remove(tmpStart);
+        tmpEnd && domUtils.remove(tmpEnd);
+        return frag;
+    }
+    Range.prototype = {
+        /**
+         * @name deleteContents
+         * @grammar range.deleteContents()  => Range
+         * @desc 删除当前选区范围中的所有内容并返回range实例，这时的range已经变成了闭合状态
+         * @example
+         * DOM Element :
+         * <b>x<i>x[x<i>xx]x</b>
+         * //执行方法后
+         * <b>x<i>x<i>|x</b>
+         * 注意range改变了
+         * range.startContainer => b
+         * range.startOffset  => 2
+         * range.endContainer => b
+         * range.endOffset => 2
+         * range.collapsed => true
+         */
+        deleteContents:function () {
+            var txt;
+            if (!this.collapsed) {
+                execContentsAction(this, 1);
+            }
+            if (browser.webkit) {
+                txt = this.startContainer;
+                if (txt.nodeType == 3 && !txt.nodeValue.length) {
+                    this.setStartBefore(txt).collapse(true);
+                    domUtils.remove(txt);
+                }
+            }
+            return this;
+        },
+        inFillChar : function(){
+            var start = this.startContainer;
+            if(this.collapsed && start.nodeType == 3
+                && start.nodeValue.replace(new RegExp('^' + domUtils.fillChar),'').length + 1 == start.nodeValue.length
+                ){
+                return true;
+            }
+            return false;
+        },
+        /**
+         * @name  setStart
+         * @grammar range.setStart(node,offset)  => Range
+         * @desc    设置range的开始位置位于node节点内，偏移量为offset
+         * 如果node是elementNode那offset指的是childNodes中的第几个，如果是textNode那offset指的是nodeValue的第几个字符
+         */
+        setStart:function (node, offset) {
+            return setEndPoint(true, node, offset, this);
+        },
+        /**
+         * 设置range的结束位置位于node节点，偏移量为offset
+         * 如果node是elementNode那offset指的是childNodes中的第几个，如果是textNode那offset指的是nodeValue的第几个字符
+         * @name  setEnd
+         * @grammar range.setEnd(node,offset)  => Range
+         */
+        setEnd:function (node, offset) {
+            return setEndPoint(false, node, offset, this);
+        },
+        /**
+         * 将Range开始位置设置到node节点之后
+         * @name  setStartAfter
+         * @grammar range.setStartAfter(node)  => Range
+         * @example
+         * <b>xx<i>x|x</i>x</b>
+         * 执行setStartAfter(i)后
+         * range.startContainer =>b
+         * range.startOffset =>2
+         */
+        setStartAfter:function (node) {
+            return this.setStart(node.parentNode, domUtils.getNodeIndex(node) + 1);
+        },
+        /**
+         * 将Range开始位置设置到node节点之前
+         * @name  setStartBefore
+         * @grammar range.setStartBefore(node)  => Range
+         * @example
+         * <b>xx<i>x|x</i>x</b>
+         * 执行setStartBefore(i)后
+         * range.startContainer =>b
+         * range.startOffset =>1
+         */
+        setStartBefore:function (node) {
+            return this.setStart(node.parentNode, domUtils.getNodeIndex(node));
+        },
+        /**
+         * 将Range结束位置设置到node节点之后
+         * @name  setEndAfter
+         * @grammar range.setEndAfter(node)  => Range
+         * @example
+         * <b>xx<i>x|x</i>x</b>
+         * setEndAfter(i)后
+         * range.endContainer =>b
+         * range.endtOffset =>2
+         */
+        setEndAfter:function (node) {
+            return this.setEnd(node.parentNode, domUtils.getNodeIndex(node) + 1);
+        },
+        /**
+         * 将Range结束位置设置到node节点之前
+         * @name  setEndBefore
+         * @grammar range.setEndBefore(node)  => Range
+         * @example
+         * <b>xx<i>x|x</i>x</b>
+         * 执行setEndBefore(i)后
+         * range.endContainer =>b
+         * range.endtOffset =>1
+         */
+        setEndBefore:function (node) {
+            return this.setEnd(node.parentNode, domUtils.getNodeIndex(node));
+        },
+        /**
+         * 将Range开始位置设置到node节点内的开始位置
+         * @name  setStartAtFirst
+         * @grammar range.setStartAtFirst(node)  => Range
+         */
+        setStartAtFirst:function (node) {
+            return this.setStart(node, 0);
+        },
+        /**
+         * 将Range开始位置设置到node节点内的结束位置
+         * @name  setStartAtLast
+         * @grammar range.setStartAtLast(node)  => Range
+         */
+        setStartAtLast:function (node) {
+            return this.setStart(node, node.nodeType == 3 ? node.nodeValue.length : node.childNodes.length);
+        },
+        /**
+         * 将Range结束位置设置到node节点内的开始位置
+         * @name  setEndAtFirst
+         * @grammar range.setEndAtFirst(node)  => Range
+         */
+        setEndAtFirst:function (node) {
+            return this.setEnd(node, 0);
+        },
+        /**
+         * 将Range结束位置设置到node节点内的结束位置
+         * @name  setEndAtLast
+         * @grammar range.setEndAtLast(node)  => Range
+         */
+        setEndAtLast:function (node) {
+            return this.setEnd(node, node.nodeType == 3 ? node.nodeValue.length : node.childNodes.length);
+        },
+
+        /**
+         * 选中完整的指定节点,并返回包含该节点的range
+         * @name  selectNode
+         * @grammar range.selectNode(node)  => Range
+         */
+        selectNode:function (node) {
+            return this.setStartBefore(node).setEndAfter(node);
+        },
+        /**
+         * 选中node内部的所有节点，并返回对应的range
+         * @name selectNodeContents
+         * @grammar range.selectNodeContents(node)  => Range
+         * @example
+         * <b>xx[x<i>xxx</i>]xxx</b>
+         * 执行后
+         * <b>[xxx<i>xxx</i>xxx]</b>
+         * range.startContainer =>b
+         * range.startOffset =>0
+         * range.endContainer =>b
+         * range.endOffset =>3
+         */
+        selectNodeContents:function (node) {
+            return this.setStart(node, 0).setEndAtLast(node);
+        },
+
+        /**
+         * 克隆一个新的range对象
+         * @name  cloneRange
+         * @grammar range.cloneRange() => Range
+         */
+        cloneRange:function () {
+            var me = this;
+            return new Range(me.document).setStart(me.startContainer, me.startOffset).setEnd(me.endContainer, me.endOffset);
+
+        },
+
+        /**
+         * 让选区闭合到尾部，若toStart为真，则闭合到头部
+         * @name  collapse
+         * @grammar range.collapse() => Range
+         * @grammar range.collapse(true) => Range   //闭合选区到头部
+         */
+        collapse:function (toStart) {
+            var me = this;
+            if (toStart) {
+                me.endContainer = me.startContainer;
+                me.endOffset = me.startOffset;
+            } else {
+                me.startContainer = me.endContainer;
+                me.startOffset = me.endOffset;
+            }
+            me.collapsed = true;
+            return me;
+        },
+
+        /**
+         * 调整range的边界，使其"收缩"到最小的位置
+         * @name  shrinkBoundary
+         * @grammar range.shrinkBoundary()  => Range  //range开始位置和结束位置都调整，参见<code><a href="#adjustmentboundary">adjustmentBoundary</a></code>
+         * @grammar range.shrinkBoundary(true)  => Range  //仅调整开始位置，忽略结束位置
+         * @example
+         * <b>xx[</b>xxxxx] ==> <b>xx</b>[xxxxx]
+         * <b>x[xx</b><i>]xxx</i> ==> <b>x[xx]</b><i>xxx</i>
+         * [<b><i>xxxx</i>xxxxxxx</b>] ==> <b><i>[xxxx</i>xxxxxxx]</b>
+         */
+        shrinkBoundary:function (ignoreEnd) {
+            var me = this, child,
+                collapsed = me.collapsed;
+            function check(node){
+                return node.nodeType == 1 && !domUtils.isBookmarkNode(node) && !dtd.$empty[node.tagName] && !dtd.$nonChild[node.tagName]
+            }
+            while (me.startContainer.nodeType == 1 //是element
+                && (child = me.startContainer.childNodes[me.startOffset]) //子节点也是element
+                && check(child)) {
+                me.setStart(child, 0);
+            }
+            if (collapsed) {
+                return me.collapse(true);
+            }
+            if (!ignoreEnd) {
+                while (me.endContainer.nodeType == 1//是element
+                    && me.endOffset > 0 //如果是空元素就退出 endOffset=0那么endOffst-1为负值，childNodes[endOffset]报错
+                    && (child = me.endContainer.childNodes[me.endOffset - 1]) //子节点也是element
+                    && check(child)) {
+                    me.setEnd(child, child.childNodes.length);
+                }
+            }
+            return me;
+        },
+
+        /**
+         * 调整边界容器，如果是textNode,就调整到elementNode上
+         * @name trimBoundary
+         * @grammar range.trimBoundary([ignoreEnd])  => Range //true忽略结束边界
+         * @example
+         * DOM Element :
+         * <b>|xxx</b>
+         * startContainer = xxx; startOffset = 0
+         * //执行后本方法后
+         * startContainer = <b>;  startOffset = 0
+         * @example
+         * Dom Element :
+         * <b>xx|x</b>
+         * startContainer = xxx;  startOffset = 2
+         * //执行本方法后，xxx被实实在在地切分成两个TextNode
+         * startContainer = <b>; startOffset = 1
+         */
+        trimBoundary:function (ignoreEnd) {
+            this.txtToElmBoundary();
+            var start = this.startContainer,
+                offset = this.startOffset,
+                collapsed = this.collapsed,
+                end = this.endContainer;
+            if (start.nodeType == 3) {
+                if (offset == 0) {
+                    this.setStartBefore(start);
+                } else {
+                    if (offset >= start.nodeValue.length) {
+                        this.setStartAfter(start);
+                    } else {
+                        var textNode = domUtils.split(start, offset);
+                        //跟新结束边界
+                        if (start === end) {
+                            this.setEnd(textNode, this.endOffset - offset);
+                        } else if (start.parentNode === end) {
+                            this.endOffset += 1;
+                        }
+                        this.setStartBefore(textNode);
+                    }
+                }
+                if (collapsed) {
+                    return this.collapse(true);
+                }
+            }
+            if (!ignoreEnd) {
+                offset = this.endOffset;
+                end = this.endContainer;
+                if (end.nodeType == 3) {
+                    if (offset == 0) {
+                        this.setEndBefore(end);
+                    } else {
+                        offset < end.nodeValue.length && domUtils.split(end, offset);
+                        this.setEndAfter(end);
+                    }
+                }
+            }
+            return this;
+        },
+        /**
+         * 如果选区在文本的边界上，就扩展选区到文本的父节点上
+         * @name  txtToElmBoundary
+         * @example
+         * Dom Element :
+         * <b> |xxx</b>
+         * startContainer = xxx;  startOffset = 0
+         * //本方法执行后
+         * startContainer = <b>; startOffset = 0
+         * @example
+         * Dom Element :
+         * <b> xxx| </b>
+         * startContainer = xxx; startOffset = 3
+         * //本方法执行后
+         * startContainer = <b>; startOffset = 1
+         */
+        txtToElmBoundary:function (ignoreCollapsed) {
+            function adjust(r, c) {
+                var container = r[c + 'Container'],
+                    offset = r[c + 'Offset'];
+                if (container.nodeType == 3) {
+                    if (!offset) {
+                        r['set' + c.replace(/(\w)/, function (a) {
+                            return a.toUpperCase();
+                        }) + 'Before'](container);
+                    } else if (offset >= container.nodeValue.length) {
+                        r['set' + c.replace(/(\w)/, function (a) {
+                            return a.toUpperCase();
+                        }) + 'After' ](container);
+                    }
+                }
+            }
+
+            if (ignoreCollapsed || !this.collapsed) {
+                adjust(this, 'start');
+                adjust(this, 'end');
+            }
+            return this;
+        },
+
+        /**
+         * 在当前选区的开始位置前插入一个节点或者fragment，range的开始位置会在插入节点的前边
+         * @name  insertNode
+         * @grammar range.insertNode(node)  => Range //node可以是textNode,elementNode,fragment
+         * @example
+         * Range :
+         * xxx[x<p>xxxx</p>xxxx]x<p>sdfsdf</p>
+         * 待插入Node :
+         * <p>ssss</p>
+         * 执行本方法后的Range :
+         * xxx[<p>ssss</p>x<p>xxxx</p>xxxx]x<p>sdfsdf</p>
+         */
+        insertNode:function (node) {
+            var first = node, length = 1;
+            if (node.nodeType == 11) {
+                first = node.firstChild;
+                length = node.childNodes.length;
+            }
+            this.trimBoundary(true);
+            var start = this.startContainer,
+                offset = this.startOffset;
+            var nextNode = start.childNodes[ offset ];
+            if (nextNode) {
+                start.insertBefore(node, nextNode);
+            } else {
+                start.appendChild(node);
+            }
+            if (first.parentNode === this.endContainer) {
+                this.endOffset = this.endOffset + length;
+            }
+            return this.setStartBefore(first);
+        },
+        /**
+         * 设置光标闭合位置,toEnd设置为true时光标将闭合到选区的结尾
+         * @name  setCursor
+         * @grammar range.setCursor([toEnd])  =>  Range   //toEnd为true时，光标闭合到选区的末尾
+         */
+        setCursor:function (toEnd, noFillData) {
+            return this.collapse(!toEnd).select(noFillData);
+        },
+        /**
+         * 创建当前range的一个书签，记录下当前range的位置，方便当dom树改变时，还能找回原来的选区位置
+         * @name createBookmark
+         * @grammar range.createBookmark([serialize])  => Object  //{start:开始标记,end:结束标记,id:serialize} serialize为真时，开始结束标记是插入节点的id，否则是插入节点的引用
+         */
+        createBookmark:function (serialize, same) {
+            var endNode,
+                startNode = this.document.createElement('span');
+            startNode.style.cssText = 'display:none;line-height:0px;';
+            startNode.appendChild(this.document.createTextNode('\u200D'));
+            startNode.id = '_baidu_bookmark_start_' + (same ? '' : guid++);
+
+            if (!this.collapsed) {
+                endNode = startNode.cloneNode(true);
+                endNode.id = '_baidu_bookmark_end_' + (same ? '' : guid++);
+            }
+            this.insertNode(startNode);
+            if (endNode) {
+                this.collapse().insertNode(endNode).setEndBefore(endNode);
+            }
+            this.setStartAfter(startNode);
+            return {
+                start:serialize ? startNode.id : startNode,
+                end:endNode ? serialize ? endNode.id : endNode : null,
+                id:serialize
+            }
+        },
+        /**
+         *  移动边界到书签位置，并删除插入的书签节点
+         *  @name  moveToBookmark
+         *  @grammar range.moveToBookmark(bookmark)  => Range //让当前的range选到给定bookmark的位置,bookmark对象是由range.createBookmark创建的
+         */
+        moveToBookmark:function (bookmark) {
+            var start = bookmark.id ? this.document.getElementById(bookmark.start) : bookmark.start,
+                end = bookmark.end && bookmark.id ? this.document.getElementById(bookmark.end) : bookmark.end;
+            this.setStartBefore(start);
+            domUtils.remove(start);
+            if (end) {
+                this.setEndBefore(end);
+                domUtils.remove(end);
+            } else {
+                this.collapse(true);
+            }
+            return this;
+        },
+
+        /**
+         * 调整Range的边界，使其"缩小"到最合适的位置
+         * @name adjustmentBoundary
+         * @grammar range.adjustmentBoundary() => Range   //参见<code><a href="#shrinkboundary">shrinkBoundary</a></code>
+         * @example
+         * <b>xx[</b>xxxxx] ==> <b>xx</b>[xxxxx]
+         * <b>x[xx</b><i>]xxx</i> ==> <b>x[xx</b>]<i>xxx</i>
+         */
+        adjustmentBoundary:function () {
+            if (!this.collapsed) {
+                while (!domUtils.isBody(this.startContainer) &&
+                    this.startOffset == this.startContainer[this.startContainer.nodeType == 3 ? 'nodeValue' : 'childNodes'].length &&
+                    this.startContainer[this.startContainer.nodeType == 3 ? 'nodeValue' : 'childNodes'].length
+                    ) {
+
+                    this.setStartAfter(this.startContainer);
+                }
+                while (!domUtils.isBody(this.endContainer) && !this.endOffset &&
+                    this.endContainer[this.endContainer.nodeType == 3 ? 'nodeValue' : 'childNodes'].length
+                    ) {
+                    this.setEndBefore(this.endContainer);
+                }
+            }
+            return this;
+        },
+
+        /**
+         * 得到一个自闭合的节点,常用于获取自闭和的节点，例如图片节点
+         * @name  getClosedNode
+         * @grammar range.getClosedNode()  => node|null
+         * @example
+         * <b>xxxx[<img />]xxx</b>
+         */
+        getClosedNode:function () {
+            var node;
+            if (!this.collapsed) {
+                var range = this.cloneRange().adjustmentBoundary().shrinkBoundary();
+                if (selectOneNode(range)) {
+                    var child = range.startContainer.childNodes[range.startOffset];
+                    if (child && child.nodeType == 1 && (dtd.$empty[child.tagName] || dtd.$nonChild[child.tagName])) {
+                        node = child;
+                    }
+                }
+            }
+            return node;
+        },
+        /**
+         * 根据当前range选中内容节点（在页面上表现为反白显示）
+         * @name select
+         * @grammar range.select();  => Range
+         */
+        select:browser.ie ? function (noFillData, textRange) {
+            var nativeRange;
+            if (!this.collapsed)
+                this.shrinkBoundary();
+            var node = this.getClosedNode();
+            if (node && !textRange) {
+                try {
+                    nativeRange = this.document.body.createControlRange();
+                    nativeRange.addElement(node);
+                    nativeRange.select();
+                } catch (e) {}
+                return this;
+            }
+            var bookmark = this.createBookmark(),
+                start = bookmark.start,
+                end;
+            nativeRange = this.document.body.createTextRange();
+            nativeRange.moveToElementText(start);
+            nativeRange.moveStart('character', 1);
+            if (!this.collapsed) {
+                var nativeRangeEnd = this.document.body.createTextRange();
+                end = bookmark.end;
+                nativeRangeEnd.moveToElementText(end);
+                nativeRange.setEndPoint('EndToEnd', nativeRangeEnd);
+            } else {
+                if (!noFillData && this.startContainer.nodeType != 3) {
+                    //使用<span>|x<span>固定住光标
+                    var tmpText = this.document.createTextNode(fillChar),
+                        tmp = this.document.createElement('span');
+                    tmp.appendChild(this.document.createTextNode(fillChar));
+                    start.parentNode.insertBefore(tmp, start);
+                    start.parentNode.insertBefore(tmpText, start);
+                    //当点b,i,u时，不能清除i上边的b
+                    removeFillData(this.document, tmpText);
+                    fillData = tmpText;
+                    mergeSibling(tmp, 'previousSibling');
+                    mergeSibling(start, 'nextSibling');
+                    nativeRange.moveStart('character', -1);
+                    nativeRange.collapse(true);
+                }
+            }
+            this.moveToBookmark(bookmark);
+            tmp && domUtils.remove(tmp);
+            //IE在隐藏状态下不支持range操作，catch一下
+            try {
+                nativeRange.select();
+            } catch (e) {
+            }
+            return this;
+        } : function (notInsertFillData) {
+            function checkOffset(rng){
+
+                function check(node,offset,dir){
+                    if(node.nodeType == 3 && node.nodeValue.length < offset){
+                        rng[dir + 'Offset'] = node.nodeValue.length
+                    }
+                }
+                check(rng.startContainer,rng.startOffset,'start');
+                check(rng.endContainer,rng.endOffset,'end');
+            }
+            var win = domUtils.getWindow(this.document),
+                sel = win.getSelection(),
+                txtNode;
+            //FF下关闭自动长高时滚动条在关闭dialog时会跳
+            //ff下如果不body.focus将不能定位闭合光标到编辑器内
+            browser.gecko ? this.body.focus() : win.focus();
+            if (sel) {
+                sel.removeAllRanges();
+                // trace:870 chrome/safari后边是br对于闭合得range不能定位 所以去掉了判断
+                // this.startContainer.nodeType != 3 &&! ((child = this.startContainer.childNodes[this.startOffset]) && child.nodeType == 1 && child.tagName == 'BR'
+                if (this.collapsed && !notInsertFillData) {
+//                    //opear如果没有节点接着，原生的不能够定位,不能在body的第一级插入空白节点
+//                    if (notInsertFillData && browser.opera && !domUtils.isBody(this.startContainer) && this.startContainer.nodeType == 1) {
+//                        var tmp = this.document.createTextNode('');
+//                        this.insertNode(tmp).setStart(tmp, 0).collapse(true);
+//                    }
+//
+                    //处理光标落在文本节点的情况
+                    //处理以下的情况
+                    //<b>|xxxx</b>
+                    //<b>xxxx</b>|xxxx
+                    //xxxx<b>|</b>
+                    var start = this.startContainer,child = start;
+                    if(start.nodeType == 1){
+                        child = start.childNodes[this.startOffset];
+
+                    }
+                    if( !(start.nodeType == 3 && this.startOffset)  &&
+                        (child ?
+                            (!child.previousSibling || child.previousSibling.nodeType != 3)
+                            :
+                            (!start.lastChild || start.lastChild.nodeType != 3)
+                            )
+                        ){
+                        txtNode = this.document.createTextNode(fillChar);
+                        //跟着前边走
+                        this.insertNode(txtNode);
+                        removeFillData(this.document, txtNode);
+                        mergeSibling(txtNode, 'previousSibling');
+                        mergeSibling(txtNode, 'nextSibling');
+                        fillData = txtNode;
+                        this.setStart(txtNode, browser.webkit ? 1 : 0).collapse(true);
+                    }
+                }
+                var nativeRange = this.document.createRange();
+                if(this.collapsed && browser.opera && this.startContainer.nodeType == 1){
+                    var child = this.startContainer.childNodes[this.startOffset];
+                    if(!child){
+                        //往前靠拢
+                        child = this.startContainer.lastChild;
+                        if( child && domUtils.isBr(child)){
+                            this.setStartBefore(child).collapse(true);
+                        }
+                    }else{
+                        //向后靠拢
+                        while(child && domUtils.isBlockElm(child)){
+                            if(child.nodeType == 1 && child.childNodes[0]){
+                                child = child.childNodes[0]
+                            }else{
+                                break;
+                            }
+                        }
+                        child && this.setStartBefore(child).collapse(true)
+                    }
+
+                }
+                //是createAddress最后一位算的不准，现在这里进行微调
+                checkOffset(this);
+                nativeRange.setStart(this.startContainer, this.startOffset);
+                nativeRange.setEnd(this.endContainer, this.endOffset);
+                sel.addRange(nativeRange);
+            }
+            return this;
+        },
+      
+
+        createAddress : function(ignoreEnd,ignoreTxt){
+            var addr = {},me = this;
+
+            function getAddress(isStart){
+                var node = isStart ? me.startContainer : me.endContainer;
+                var parents = domUtils.findParents(node,true,function(node){return !domUtils.isBody(node)}),
+                    addrs = [];
+                for(var i = 0,ci;ci = parents[i++];){
+                    addrs.push(domUtils.getNodeIndex(ci,ignoreTxt));
+                }
+                var firstIndex = 0;
+
+                if(ignoreTxt){
+                    if(node.nodeType == 3){
+                        var tmpNode = node.previousSibling;
+                        while(tmpNode && tmpNode.nodeType == 3){
+                            firstIndex += tmpNode.nodeValue.replace(fillCharReg,'').length;
+                            tmpNode = tmpNode.previousSibling;
+                        }
+                        firstIndex +=  (isStart ? me.startOffset : me.endOffset)// - (fillCharReg.test(node.nodeValue) ? 1 : 0 )
+                    }else{
+                        node =  node.childNodes[ isStart ? me.startOffset : me.endOffset];
+                        if(node){
+                            firstIndex = domUtils.getNodeIndex(node,ignoreTxt);
+                        }else{
+                            node = isStart ? me.startContainer : me.endContainer;
+                            var first = node.firstChild;
+                            while(first){
+                                if(domUtils.isFillChar(first)){
+                                    first = first.nextSibling;
+                                    continue;
+                                }
+                                firstIndex++;
+                                if(first.nodeType == 3){
+                                    while( first && first.nodeType == 3){
+                                        first = first.nextSibling;
+                                    }
+                                }else{
+                                    first = first.nextSibling;
+                                }
+                            }
+                        }
+                    }
+
+                }else{
+                    firstIndex = isStart ? domUtils.isFillChar(node) ? 0 : me.startOffset  : me.endOffset
+                }
+                if(firstIndex < 0){
+                    firstIndex = 0;
+                }
+                addrs.push(firstIndex);
+                return addrs;
+            }
+            addr.startAddress = getAddress(true);
+            if(!ignoreEnd){
+                addr.endAddress = me.collapsed ? [].concat(addr.startAddress) : getAddress();
+            }
+            return addr;
+        },
+        moveToAddress : function(addr,ignoreEnd){
+            var me = this;
+            function getNode(address,isStart){
+                var tmpNode = me.body,
+                    parentNode,offset;
+                for(var i= 0,ci,l=address.length;i<l;i++){
+                    ci = address[i];
+                    parentNode = tmpNode;
+                    tmpNode = tmpNode.childNodes[ci];
+                    if(!tmpNode){
+                        offset = ci;
+                        break;
+                    }
+                }
+                if(isStart){
+                    if(tmpNode){
+                        me.setStartBefore(tmpNode)
+                    }else{
+                        me.setStart(parentNode,offset)
+                    }
+                }else{
+                    if(tmpNode){
+                        me.setEndBefore(tmpNode)
+                    }else{
+                        me.setEnd(parentNode,offset)
+                    }
+                }
+            }
+            getNode(addr.startAddress,true);
+            !ignoreEnd && addr.endAddress &&  getNode(addr.endAddress);
+            return me;
+        },
+        equals : function(rng){
+            for(var p in this){
+                if(this.hasOwnProperty(p)){
+                    if(this[p] !== rng[p])
+                        return false
+                }
+            }
+            return true;
+
+        },
+        scrollIntoView : function(){
+            var $span = $('<span style="padding:0;margin:0;display:block;border:0">&nbsp;</span>');
+            this.cloneRange().insertNode($span.get(0));
+            var winScrollTop = $(window).scrollTop(),
+                winHeight = $(window).height(),
+                spanTop = $span.offset().top;
+            if(spanTop < winScrollTop-winHeight || spanTop > winScrollTop + winHeight ){
+                if(spanTop > winScrollTop + winHeight){
+                    window.scrollTo(0,spanTop - winHeight + $span.height())
+                }else{
+                    window.scrollTo(0,winScrollTop - spanTop)
+                }
+
+            }
+            $span.remove();
+        },
+        getOffset : function(){
+            var bk = this.createBookmark();
+            var offset = $(bk.start).css('display','inline-block').offset();
+            this.moveToBookmark(bk);
+            return offset
+        }
+    };
+})();
+///import editor.js
+///import core/browser.js
+///import core/dom/dom.js
+///import core/dom/dtd.js
+///import core/dom/domUtils.js
+///import core/dom/Range.js
+/**
+ * @class UM.dom.Selection    Selection类
+ */
+(function () {
+
+    function getBoundaryInformation( range, start ) {
+        var getIndex = domUtils.getNodeIndex;
+        range = range.duplicate();
+        range.collapse( start );
+        var parent = range.parentElement();
+        //如果节点里没有子节点，直接退出
+        if ( !parent.hasChildNodes() ) {
+            return  {container:parent, offset:0};
+        }
+        var siblings = parent.children,
+            child,
+            testRange = range.duplicate(),
+            startIndex = 0, endIndex = siblings.length - 1, index = -1,
+            distance;
+        while ( startIndex <= endIndex ) {
+            index = Math.floor( (startIndex + endIndex) / 2 );
+            child = siblings[index];
+            testRange.moveToElementText( child );
+            var position = testRange.compareEndPoints( 'StartToStart', range );
+            if ( position > 0 ) {
+                endIndex = index - 1;
+            } else if ( position < 0 ) {
+                startIndex = index + 1;
+            } else {
+                //trace:1043
+                return  {container:parent, offset:getIndex( child )};
+            }
+        }
+        if ( index == -1 ) {
+            testRange.moveToElementText( parent );
+            testRange.setEndPoint( 'StartToStart', range );
+            distance = testRange.text.replace( /(\r\n|\r)/g, '\n' ).length;
+            siblings = parent.childNodes;
+            if ( !distance ) {
+                child = siblings[siblings.length - 1];
+                return  {container:child, offset:child.nodeValue.length};
+            }
+
+            var i = siblings.length;
+            while ( distance > 0 ){
+                distance -= siblings[ --i ].nodeValue.length;
+            }
+            return {container:siblings[i], offset:-distance};
+        }
+        testRange.collapse( position > 0 );
+        testRange.setEndPoint( position > 0 ? 'StartToStart' : 'EndToStart', range );
+        distance = testRange.text.replace( /(\r\n|\r)/g, '\n' ).length;
+        if ( !distance ) {
+            return  dtd.$empty[child.tagName] || dtd.$nonChild[child.tagName] ?
+            {container:parent, offset:getIndex( child ) + (position > 0 ? 0 : 1)} :
+            {container:child, offset:position > 0 ? 0 : child.childNodes.length}
+        }
+        while ( distance > 0 ) {
+            try {
+                var pre = child;
+                child = child[position > 0 ? 'previousSibling' : 'nextSibling'];
+                distance -= child.nodeValue.length;
+            } catch ( e ) {
+                return {container:parent, offset:getIndex( pre )};
+            }
+        }
+        return  {container:child, offset:position > 0 ? -distance : child.nodeValue.length + distance}
+    }
+
+    /**
+     * 将ieRange转换为Range对象
+     * @param {Range}   ieRange    ieRange对象
+     * @param {Range}   range      Range对象
+     * @return  {Range}  range       返回转换后的Range对象
+     */
+    function transformIERangeToRange( ieRange, range ) {
+        if ( ieRange.item ) {
+            range.selectNode( ieRange.item( 0 ) );
+        } else {
+            var bi = getBoundaryInformation( ieRange, true );
+            range.setStart( bi.container, bi.offset );
+            if ( ieRange.compareEndPoints( 'StartToEnd', ieRange ) != 0 ) {
+                bi = getBoundaryInformation( ieRange, false );
+                range.setEnd( bi.container, bi.offset );
+            }
+        }
+        return range;
+    }
+
+    /**
+     * 获得ieRange
+     * @param {Selection} sel    Selection对象
+     * @return {ieRange}    得到ieRange
+     */
+    function _getIERange( sel,txtRange ) {
+        var ieRange;
+        //ie下有可能报错
+        try {
+            ieRange = sel.getNative(txtRange).createRange();
+        } catch ( e ) {
+            return null;
+        }
+        var el = ieRange.item ? ieRange.item( 0 ) : ieRange.parentElement();
+        if ( ( el.ownerDocument || el ) === sel.document ) {
+            return ieRange;
+        }
+        return null;
+    }
+
+    var Selection = dom.Selection = function ( doc,body ) {
+        var me = this;
+        me.document = doc;
+        me.body = body;
+        if ( browser.ie9below ) {
+            $( body).on('beforedeactivate', function () {
+                me._bakIERange = me.getIERange();
+            } ).on('activate', function () {
+                try {
+                    var ieNativRng =  _getIERange( me );
+                    if ( (!ieNativRng || !me.rangeInBody(ieNativRng)) && me._bakIERange ) {
+                        me._bakIERange.select();
+                    }
+                } catch ( ex ) {
+                }
+                me._bakIERange = null;
+            } );
+        }
+    };
+
+    Selection.prototype = {
+        hasNativeRange : function(){
+            var rng;
+            if(!browser.ie || browser.ie9above){
+                var nativeSel = this.getNative();
+                if(!nativeSel.rangeCount){
+                    return false;
+                }
+                rng = nativeSel.getRangeAt(0);
+            }else{
+                rng = _getIERange(this);
+            }
+            return this.rangeInBody(rng);
+        },
+        /**
+         * 获取原生seleciton对象
+         * @public
+         * @function
+         * @name    UM.dom.Selection.getNative
+         * @return {Selection}    获得selection对象
+         */
+        getNative:function (txtRange) {
+            var doc = this.document;
+            try {
+                return !doc ? null : browser.ie9below || txtRange? doc.selection : domUtils.getWindow( doc ).getSelection();
+            } catch ( e ) {
+                return null;
+            }
+        },
+        /**
+         * 获得ieRange
+         * @public
+         * @function
+         * @name    UM.dom.Selection.getIERange
+         * @return {ieRange}    返回ie原生的Range
+         */
+        getIERange:function (txtRange) {
+            var ieRange = _getIERange( this,txtRange );
+            if ( !ieRange  || !this.rangeInBody(ieRange,txtRange)) {
+                if ( this._bakIERange ) {
+                    return this._bakIERange;
+                }
+            }
+            return ieRange;
+        },
+        rangeInBody : function(rng,txtRange){
+            var node = browser.ie9below || txtRange ? rng.item ? rng.item() : rng.parentElement() : rng.startContainer;
+
+            return node === this.body || domUtils.inDoc(node,this.body);
+        },
+        /**
+         * 缓存当前选区的range和选区的开始节点
+         * @public
+         * @function
+         * @name    UM.dom.Selection.cache
+         */
+        cache:function () {
+            this.clear();
+            this._cachedRange = this.getRange();
+            this._cachedStartElement = this.getStart();
+            this._cachedStartElementPath = this.getStartElementPath();
+        },
+
+        getStartElementPath:function () {
+            if ( this._cachedStartElementPath ) {
+                return this._cachedStartElementPath;
+            }
+            var start = this.getStart();
+            if ( start ) {
+                return domUtils.findParents( start, true, null, true )
+            }
+            return [];
+        },
+        /**
+         * 清空缓存
+         * @public
+         * @function
+         * @name    UM.dom.Selection.clear
+         */
+        clear:function () {
+            this._cachedStartElementPath = this._cachedRange = this._cachedStartElement = null;
+        },
+        /**
+         * 编辑器是否得到了选区
+         */
+        isFocus:function () {
+            return this.hasNativeRange()
+
+        },
+        /**
+         * 获取选区对应的Range
+         * @public
+         * @function
+         * @name    UM.dom.Selection.getRange
+         * @returns {UM.dom.Range}    得到Range对象
+         */
+        getRange:function () {
+            var me = this;
+            function optimze( range ) {
+                var child = me.body.firstChild,
+                    collapsed = range.collapsed;
+                while ( child && child.firstChild ) {
+                    range.setStart( child, 0 );
+                    child = child.firstChild;
+                }
+                if ( !range.startContainer ) {
+                    range.setStart( me.body, 0 )
+                }
+                if ( collapsed ) {
+                    range.collapse( true );
+                }
+            }
+
+            if ( me._cachedRange != null ) {
+                return this._cachedRange;
+            }
+            var range = new dom.Range( me.document,me.body );
+            if ( browser.ie9below ) {
+                var nativeRange = me.getIERange();
+                if ( nativeRange  && this.rangeInBody(nativeRange)) {
+
+                    try{
+                        transformIERangeToRange( nativeRange, range );
+                    }catch(e){
+                        optimze( range );
+                    }
+
+                } else {
+                    optimze( range );
+                }
+            } else {
+                var sel = me.getNative();
+                if ( sel && sel.rangeCount && me.rangeInBody(sel.getRangeAt( 0 ))) {
+                    var firstRange = sel.getRangeAt( 0 );
+                    var lastRange = sel.getRangeAt( sel.rangeCount - 1 );
+                    range.setStart( firstRange.startContainer, firstRange.startOffset ).setEnd( lastRange.endContainer, lastRange.endOffset );
+                    if ( range.collapsed && domUtils.isBody( range.startContainer ) && !range.startOffset ) {
+                        optimze( range );
+                    }
+                } else {
+                    //trace:1734 有可能已经不在dom树上了，标识的节点
+                    if ( this._bakRange && (this._bakRange.startContainer === this.body || domUtils.inDoc( this._bakRange.startContainer, this.body )) ){
+                        return this._bakRange;
+                    }
+                    optimze( range );
+                }
+            }
+
+            return this._bakRange = range;
+        },
+
+        /**
+         * 获取开始元素，用于状态反射
+         * @public
+         * @function
+         * @name    UM.dom.Selection.getStart
+         * @return {Element}     获得开始元素
+         */
+        getStart:function () {
+            if ( this._cachedStartElement ) {
+                return this._cachedStartElement;
+            }
+            var range = browser.ie9below ? this.getIERange() : this.getRange(),
+                tmpRange,
+                start, tmp, parent;
+            if ( browser.ie9below ) {
+                if ( !range ) {
+                    //todo 给第一个值可能会有问题
+                    return this.document.body.firstChild;
+                }
+                //control元素
+                if ( range.item ){
+                    return range.item( 0 );
+                }
+                tmpRange = range.duplicate();
+                //修正ie下<b>x</b>[xx] 闭合后 <b>x|</b>xx
+                tmpRange.text.length > 0 && tmpRange.moveStart( 'character', 1 );
+                tmpRange.collapse( 1 );
+                start = tmpRange.parentElement();
+                parent = tmp = range.parentElement();
+                while ( tmp = tmp.parentNode ) {
+                    if ( tmp == start ) {
+                        start = parent;
+                        break;
+                    }
+                }
+            } else {
+                start = range.startContainer;
+                if ( start.nodeType == 1 && start.hasChildNodes() ){
+                    start = start.childNodes[Math.min( start.childNodes.length - 1, range.startOffset )];
+                }
+                if ( start.nodeType == 3 ){
+                    return start.parentNode;
+                }
+            }
+            return start;
+        },
+        /**
+         * 得到选区中的文本
+         * @public
+         * @function
+         * @name    UM.dom.Selection.getText
+         * @return  {String}    选区中包含的文本
+         */
+        getText:function () {
+            var nativeSel, nativeRange;
+            if ( this.isFocus() && (nativeSel = this.getNative()) ) {
+                nativeRange = browser.ie9below ? nativeSel.createRange() : nativeSel.getRangeAt( 0 );
+                return browser.ie9below ? nativeRange.text : nativeRange.toString();
+            }
+            return '';
+        }
+    };
+})();
+/**
+ * @file
+ * @name UM.Editor
+ * @short Editor
+ * @import editor.js,core/utils.js,core/EventBase.js,core/browser.js,core/dom/dtd.js,core/dom/domUtils.js,core/dom/Range.js,core/dom/Selection.js,plugins/serialize.js
+ * @desc 编辑器主类，包含编辑器提供的大部分公用接口
+ */
+(function () {
+    var uid = 0, _selectionChangeTimer;
+
+    /**
+     * @private
+     * @ignore
+     * @param form  编辑器所在的form元素
+     * @param editor  编辑器实例对象
+     */
+    function setValue(form, editor) {
+        var textarea;
+        if (editor.textarea) {
+            if (utils.isString(editor.textarea)) {
+                for (var i = 0, ti, tis = domUtils.getElementsByTagName(form, 'textarea'); ti = tis[i++];) {
+                    if (ti.id == 'umeditor_textarea_' + editor.options.textarea) {
+                        textarea = ti;
+                        break;
+                    }
+                }
+            } else {
+                textarea = editor.textarea;
+            }
+        }
+        if (!textarea) {
+            form.appendChild(textarea = domUtils.createElement(document, 'textarea', {
+                'name': editor.options.textarea,
+                'id': 'umeditor_textarea_' + editor.options.textarea,
+                'style': "display:none"
+            }));
+            //不要产生多个textarea
+            editor.textarea = textarea;
+        }
+        textarea.value = editor.hasContents() ?
+            (editor.options.allHtmlEnabled ? editor.getAllHtml() : editor.getContent(null, null, true)) :
+            ''
+    }
+    function loadPlugins(me){
+        //初始化插件
+        for (var pi in UM.plugins) {
+            if(me.options.excludePlugins.indexOf(pi) == -1){
+                UM.plugins[pi].call(me);
+                me.plugins[pi] = 1;
+            }
+        }
+        me.langIsReady = true;
+
+        me.fireEvent("langReady");
+    }
+    function checkCurLang(I18N){
+        for(var lang in I18N){
+            return lang
+        }
+    }
+    /**
+     * UEditor编辑器类
+     * @name Editor
+     * @desc 创建一个跟编辑器实例
+     * - ***container*** 编辑器容器对象
+     * - ***iframe*** 编辑区域所在的iframe对象
+     * - ***window*** 编辑区域所在的window
+     * - ***document*** 编辑区域所在的document对象
+     * - ***body*** 编辑区域所在的body对象
+     * - ***selection*** 编辑区域的选区对象
+     */
+    var Editor = UM.Editor = function (options) {
+        var me = this;
+        me.uid = uid++;
+        EventBase.call(me);
+        me.commands = {};
+        me.options = utils.extend(utils.clone(options || {}), UMEDITOR_CONFIG, true);
+        me.shortcutkeys = {};
+        me.inputRules = [];
+        me.outputRules = [];
+        //设置默认的常用属性
+        me.setOpt({
+            isShow: true,
+            initialContent: '',
+            initialStyle:'',
+            autoClearinitialContent: false,
+            textarea: 'editorValue',
+            focus: false,
+            focusInEnd: true,
+            autoClearEmptyNode: true,
+            fullscreen: false,
+            readonly: false,
+            zIndex: 999,
+            enterTag: 'p',
+            lang: 'zh-cn',
+            langPath: me.options.UMEDITOR_HOME_URL + 'lang/',
+            theme: 'default',
+            themePath: me.options.UMEDITOR_HOME_URL + 'themes/',
+            allHtmlEnabled: false,
+            autoSyncData : true,
+            autoHeightEnabled : true,
+            excludePlugins:''
+        });
+        me.plugins = {};
+        if(!utils.isEmptyObject(UM.I18N)){
+            //修改默认的语言类型
+            me.options.lang = checkCurLang(UM.I18N);
+            loadPlugins(me)
+        }else{
+            utils.loadFile(document, {
+                src: me.options.langPath + me.options.lang + "/" + me.options.lang + ".js",
+                tag: "script",
+                type: "text/javascript",
+                defer: "defer"
+            }, function () {
+                loadPlugins(me)
+            });
+        }
+
+    };
+    Editor.prototype = {
+        /**
+         * 当编辑器ready后执行传入的fn,如果编辑器已经完成ready，就马上执行fn，fn的中的this是编辑器实例。
+         * 大部分的实例接口都需要放在该方法内部执行，否则在IE下可能会报错。
+         * @name ready
+         * @grammar editor.ready(fn) fn是当编辑器渲染好后执行的function
+         * @example
+         * var editor = new UM.ui.Editor();
+         * editor.render("myEditor");
+         * editor.ready(function(){
+         *     editor.setContent("欢迎使用UEditor！");
+         * })
+         */
+        ready: function (fn) {
+            var me = this;
+            if (fn) {
+                me.isReady ? fn.apply(me) : me.addListener('ready', fn);
+            }
+        },
+        /**
+         * 为编辑器设置默认参数值。若用户配置为空，则以默认配置为准
+         * @grammar editor.setOpt(key,value);      //传入一个键、值对
+         * @grammar editor.setOpt({ key:value});   //传入一个json对象
+         */
+        setOpt: function (key, val) {
+            var obj = {};
+            if (utils.isString(key)) {
+                obj[key] = val
+            } else {
+                obj = key;
+            }
+            utils.extend(this.options, obj, true);
+        },
+        getOpt:function(key){
+            return this.options[key] || ''
+        },
+        /**
+         * 销毁编辑器实例对象
+         * @name destroy
+         * @grammar editor.destroy();
+         */
+        destroy: function () {
+
+            var me = this;
+            me.fireEvent('destroy');
+            var container = me.container.parentNode;
+            if(container === document.body){
+                container = me.container;
+            }
+            var textarea = me.textarea;
+            if (!textarea) {
+                textarea = document.createElement('textarea');
+                container.parentNode.insertBefore(textarea, container);
+            } else {
+                textarea.style.display = ''
+            }
+
+            textarea.style.width = me.body.offsetWidth + 'px';
+            textarea.style.height = me.body.offsetHeight + 'px';
+            textarea.value = me.getContent();
+            textarea.id = me.key;
+            if(container.contains(textarea)){
+                $(textarea).insertBefore(container);
+            }
+            container.innerHTML = '';
+
+            domUtils.remove(container);
+            UM.clearCache(me.id);
+            //trace:2004
+            for (var p in me) {
+                if (me.hasOwnProperty(p)) {
+                    delete this[p];
+                }
+            }
+
+        },
+        initialCont : function(holder){
+
+            if(holder){
+                holder.getAttribute('name') && ( this.options.textarea = holder.getAttribute('name'));
+                if (holder && /script|textarea/ig.test(holder.tagName)) {
+                    var newDiv = document.createElement('div');
+                    holder.parentNode.insertBefore(newDiv, holder);
+                    this.options.initialContent = UM.htmlparser(holder.value || holder.innerHTML|| this.options.initialContent).toHtml();
+                    holder.className && (newDiv.className = holder.className);
+                    holder.style.cssText && (newDiv.style.cssText = holder.style.cssText);
+
+                    if (/textarea/i.test(holder.tagName)) {
+                        this.textarea = holder;
+                        this.textarea.style.display = 'none';
+
+                    } else {
+                        holder.parentNode.removeChild(holder);
+                        holder.id && (newDiv.id = holder.id);
+                    }
+                    holder = newDiv;
+                    holder.innerHTML = '';
+                }
+                return holder;
+            }else{
+                return null;
+            }
+
+        },
+        /**
+         * 渲染编辑器的DOM到指定容器，必须且只能调用一次
+         * @name render
+         * @grammar editor.render(containerId);    //可以指定一个容器ID
+         * @grammar editor.render(containerDom);   //也可以直接指定容器对象
+         */
+        render: function (container) {
+            var me = this,
+                options = me.options,
+                getStyleValue=function(attr){
+                    return parseInt($(container).css(attr));
+                };
+
+            if (utils.isString(container)) {
+                container = document.getElementById(container);
+            }
+            if (container) {
+                this.id = container.getAttribute('id');
+                UM.setEditor(this);
+                utils.cssRule('edui-style-body',me.options.initialStyle,document);
+
+                container = this.initialCont(container);
+
+                container.className += ' edui-body-container';
+
+                if(options.initialFrameWidth){
+                    options.minFrameWidth = options.initialFrameWidth
+                }else{
+                    //都没给值，先写死了
+                    options.minFrameWidth = options.initialFrameWidth = $(container).width() || UM.defaultWidth;
+                }
+                if(options.initialFrameHeight){
+                    options.minFrameHeight = options.initialFrameHeight
+                }else{
+
+                    options.initialFrameHeight = options.minFrameHeight = $(container).height() || UM.defaultHeight;
+                }
+
+                container.style.width = /%$/.test(options.initialFrameWidth) ?  '100%' : options.initialFrameWidth -
+                    getStyleValue("padding-left")-
+                    getStyleValue("padding-right")  +'px';
+
+                var height = /%$/.test(options.initialFrameHeight) ?  '100%' : (options.initialFrameHeight - getStyleValue("padding-top")- getStyleValue("padding-bottom") );
+                if(this.options.autoHeightEnabled){
+                    container.style.minHeight = height +'px';
+                    container.style.height = '';
+                    if(browser.ie && browser.version <= 6){
+                        container.style.height = height ;
+                        container.style.setExpression('height', 'this.scrollHeight <= ' + height + ' ? "' + height + 'px" : "auto"');
+                    }
+                }else{
+                    $(container).height(height)
+                }
+                container.style.zIndex = options.zIndex;
+                this._setup(container);
+
+            }
+        },
+        /**
+         * 编辑器初始化
+         * @private
+         * @ignore
+         * @param {Element} doc 编辑器Iframe中的文档对象
+         */
+        _setup: function (cont) {
+            var me = this,
+                options = me.options;
+
+            cont.contentEditable = true;
+            document.body.spellcheck = false;
+
+            me.document = document;
+            me.window = document.defaultView || document.parentWindow;
+            me.body = cont;
+            me.$body = $(cont);
+            me.selection = new dom.Selection(document,me.body);
+            me._isEnabled = false;
+            //gecko初始化就能得到range,无法判断isFocus了
+            var geckoSel;
+            if (browser.gecko && (geckoSel = this.selection.getNative())) {
+                geckoSel.removeAllRanges();
+            }
+            this._initEvents();
+            //为form提交提供一个隐藏的textarea
+            for (var form = cont.parentNode; form && !domUtils.isBody(form); form = form.parentNode) {
+                if (form.tagName == 'FORM') {
+                    me.form = form;
+                    if(me.options.autoSyncData){
+                        $(cont).on('blur',function(){
+                            setValue(form,me);
+                        })
+                    }else{
+                        $(form).on('submit', function () {
+                            setValue(this, me);
+                        })
+                    }
+                    break;
+                }
+            }
+            if (options.initialContent) {
+                if (options.autoClearinitialContent) {
+                    var oldExecCommand = me.execCommand;
+                    me.execCommand = function () {
+                        me.fireEvent('firstBeforeExecCommand');
+                        return oldExecCommand.apply(me, arguments);
+                    };
+                    this._setDefaultContent(options.initialContent);
+                } else
+                    this.setContent(options.initialContent, false, true);
+            }
+
+            //编辑器不能为空内容
+
+            if (domUtils.isEmptyNode(me.body)) {
+                me.body.innerHTML = '<p>' + (browser.ie ? '' : '<br/>') + '</p>';
+            }
+            //如果要求focus, 就把光标定位到内容开始
+            if (options.focus) {
+                setTimeout(function () {
+                    me.focus(me.options.focusInEnd);
+                    //如果自动清除开着，就不需要做selectionchange;
+                    !me.options.autoClearinitialContent && me._selectionChange();
+                }, 0);
+            }
+            if (!me.container) {
+                me.container = cont.parentNode;
+            }
+
+            me._bindshortcutKeys();
+            me.isReady = 1;
+            me.fireEvent('ready');
+            options.onready && options.onready.call(me);
+            if(!browser.ie || browser.ie9above){
+
+                $(me.body).on( 'blur focus', function (e) {
+                    var nSel = me.selection.getNative();
+                    //chrome下会出现alt+tab切换时，导致选区位置不对
+                    if (e.type == 'blur') {
+                        if(nSel.rangeCount > 0 ){
+                            me._bakRange = nSel.getRangeAt(0);
+                        }
+                    } else {
+                        try {
+                            me._bakRange && nSel.addRange(me._bakRange)
+                        } catch (e) {
+                        }
+                        me._bakRange = null;
+                    }
+                });
+            }
+
+            !options.isShow && me.setHide();
+            options.readonly && me.setDisabled();
+        },
+        /**
+         * 同步编辑器的数据，为提交数据做准备，主要用于你是手动提交的情况
+         * @name sync
+         * @grammar editor.sync(); //从编辑器的容器向上查找，如果找到就同步数据
+         * @grammar editor.sync(formID); //formID制定一个要同步数据的form的id,编辑器的数据会同步到你指定form下
+         * @desc
+         * 后台取得数据得键值使用你容器上得''name''属性，如果没有就使用参数传入的''textarea''
+         * @example
+         * editor.sync();
+         * form.sumbit(); //form变量已经指向了form元素
+         *
+         */
+        sync: function (formId) {
+            var me = this,
+                form = formId ? document.getElementById(formId) :
+                    domUtils.findParent(me.body.parentNode, function (node) {
+                        return node.tagName == 'FORM'
+                    }, true);
+            form && setValue(form, me);
+        },
+        /**
+         * 设置编辑器高度
+         * @name setHeight
+         * @grammar editor.setHeight(number);  //纯数值，不带单位
+         */
+        setHeight: function (height,notSetHeight) {
+            !notSetHeight && (this.options.initialFrameHeight = height);
+            if(this.options.autoHeightEnabled){
+                $(this.body).css({
+                    'min-height':height + 'px'
+                });
+                if(browser.ie && browser.version <= 6 && this.container){
+                    this.container.style.height = height ;
+                    this.container.style.setExpression('height', 'this.scrollHeight <= ' + height + ' ? "' + height + 'px" : "auto"');
+                }
+            }else{
+                $(this.body).height(height)
+            }
+            this.fireEvent('resize');
+        },
+        /**
+         * 设置编辑器宽度
+         * @name setWidth
+         * @grammar editor.setWidth(number);  //纯数值，不带单位
+         */
+        setWidth:function(width){
+            this.$container && this.$container.width(width);
+            $(this.body).width(width - $(this.body).css('padding-left').replace('px','') * 1 - $(this.body).css('padding-right').replace('px','') * 1);
+            this.fireEvent('resize');
+        },
+        addshortcutkey: function (cmd, keys) {
+            var obj = {};
+            if (keys) {
+                obj[cmd] = keys
+            } else {
+                obj = cmd;
+            }
+            utils.extend(this.shortcutkeys, obj)
+        },
+        _bindshortcutKeys: function () {
+            var me = this, shortcutkeys = this.shortcutkeys;
+            me.addListener('keydown', function (type, e) {
+                var keyCode = e.keyCode || e.which;
+                for (var i in shortcutkeys) {
+                    var tmp = shortcutkeys[i].split(',');
+                    for (var t = 0, ti; ti = tmp[t++];) {
+                        ti = ti.split(':');
+                        var key = ti[0], param = ti[1];
+                        if (/^(ctrl)(\+shift)?\+(\d+)$/.test(key.toLowerCase()) || /^(\d+)$/.test(key)) {
+                            if (( (RegExp.$1 == 'ctrl' ? (e.ctrlKey || e.metaKey) : 0)
+                                && (RegExp.$2 != "" ? e[RegExp.$2.slice(1) + "Key"] : 1)
+                                && keyCode == RegExp.$3
+                                ) ||
+                                keyCode == RegExp.$1
+                                ) {
+                                if (me.queryCommandState(i,param) != -1)
+                                    me.execCommand(i, param);
+                                domUtils.preventDefault(e);
+                            }
+                        }
+                    }
+
+                }
+            });
+        },
+        /**
+         * 获取编辑器内容
+         * @name getContent
+         * @grammar editor.getContent()  => String //若编辑器中只包含字符"&lt;p&gt;&lt;br /&gt;&lt;/p/&gt;"会返回空。
+         * @grammar editor.getContent(fn)  => String
+         * @example
+         * getContent默认是会现调用hasContents来判断编辑器是否为空，如果是，就直接返回空字符串
+         * 你也可以传入一个fn来接替hasContents的工作，定制判断的规则
+         * editor.getContent(function(){
+         *     return false //编辑器没有内容 ，getContent直接返回空
+         * })
+         */
+        getContent: function (cmd, fn,notSetCursor,ignoreBlank,formatter) {
+            var me = this;
+            if (cmd && utils.isFunction(cmd)) {
+                fn = cmd;
+                cmd = '';
+            }
+            if (fn ? !fn() : !this.hasContents()) {
+                return '';
+            }
+            me.fireEvent('beforegetcontent');
+            var root = UM.htmlparser(me.body.innerHTML,ignoreBlank);
+            me.filterOutputRule(root);
+            me.fireEvent('aftergetcontent',root);
+            return  root.toHtml(formatter);
+        },
+        /**
+         * 取得完整的html代码，可以直接显示成完整的html文档
+         * @name getAllHtml
+         * @grammar editor.getAllHtml()  => String
+         */
+        getAllHtml: function () {
+            var me = this,
+                headHtml = [],
+                html = '';
+            me.fireEvent('getAllHtml', headHtml);
+            if (browser.ie && browser.version > 8) {
+                var headHtmlForIE9 = '';
+                utils.each(me.document.styleSheets, function (si) {
+                    headHtmlForIE9 += ( si.href ? '<link rel="stylesheet" type="text/css" href="' + si.href + '" />' : '<style>' + si.cssText + '</style>');
+                });
+                utils.each(me.document.getElementsByTagName('script'), function (si) {
+                    headHtmlForIE9 += si.outerHTML;
+                });
+            }
+            return '<html><head>' + (me.options.charset ? '<meta http-equiv="Content-Type" content="text/html; charset=' + me.options.charset + '"/>' : '')
+                + (headHtmlForIE9 || me.document.getElementsByTagName('head')[0].innerHTML) + headHtml.join('\n') + '</head>'
+                + '<body ' + (ie && browser.version < 9 ? 'class="view"' : '') + '>' + me.getContent(null, null, true) + '</body></html>';
+        },
+        /**
+         * 得到编辑器的纯文本内容，但会保留段落格式
+         * @name getPlainTxt
+         * @grammar editor.getPlainTxt()  => String
+         */
+        getPlainTxt: function () {
+            var reg = new RegExp(domUtils.fillChar, 'g'),
+                html = this.body.innerHTML.replace(/[\n\r]/g, '');//ie要先去了\n在处理
+            html = html.replace(/<(p|div)[^>]*>(<br\/?>|&nbsp;)<\/\1>/gi, '\n')
+                .replace(/<br\/?>/gi, '\n')
+                .replace(/<[^>/]+>/g, '')
+                .replace(/(\n)?<\/([^>]+)>/g, function (a, b, c) {
+                    return dtd.$block[c] ? '\n' : b ? b : '';
+                });
+            //取出来的空格会有c2a0会变成乱码，处理这种情况\u00a0
+            return html.replace(reg, '').replace(/\u00a0/g, ' ').replace(/&nbsp;/g, ' ');
+        },
+
+        /**
+         * 获取编辑器中的纯文本内容,没有段落格式
+         * @name getContentTxt
+         * @grammar editor.getContentTxt()  => String
+         */
+        getContentTxt: function () {
+            var reg = new RegExp(domUtils.fillChar, 'g');
+            //取出来的空格会有c2a0会变成乱码，处理这种情况\u00a0
+            return this.body[browser.ie ? 'innerText' : 'textContent'].replace(reg, '').replace(/\u00a0/g, ' ');
+        },
+
+        /**
+         * 将html设置到编辑器中, 如果是用于初始化时给编辑器赋初值，则必须放在ready方法内部执行
+         * @name setContent
+         * @grammar editor.setContent(html)
+         * @example
+         * var editor = new UM.ui.Editor()
+         * editor.ready(function(){
+         *     //需要ready后执行，否则可能报错
+         *     editor.setContent("欢迎使用UEditor！");
+         * })
+         */
+        setContent: function (html, isAppendTo, notFireSelectionchange) {
+            var me = this;
+
+            me.fireEvent('beforesetcontent', html);
+            var root = UM.htmlparser(html);
+            me.filterInputRule(root);
+            html = root.toHtml();
+
+
+            me.body.innerHTML = (isAppendTo ? me.body.innerHTML : '') + html;
+
+
+            function isCdataDiv(node){
+                return  node.tagName == 'DIV' && node.getAttribute('cdata_tag');
+            }
+            //给文本或者inline节点套p标签
+            if (me.options.enterTag == 'p') {
+
+                var child = this.body.firstChild, tmpNode;
+                if (!child || child.nodeType == 1 &&
+                    (dtd.$cdata[child.tagName] || isCdataDiv(child) ||
+                        domUtils.isCustomeNode(child)
+                        )
+                    && child === this.body.lastChild) {
+                    this.body.innerHTML = '<p>' + (browser.ie ? '&nbsp;' : '<br/>') + '</p>' + this.body.innerHTML;
+
+                } else {
+                    var p = me.document.createElement('p');
+                    while (child) {
+                        while (child && (child.nodeType == 3 || child.nodeType == 1 && dtd.p[child.tagName] && !dtd.$cdata[child.tagName])) {
+                            tmpNode = child.nextSibling;
+                            p.appendChild(child);
+                            child = tmpNode;
+                        }
+                        if (p.firstChild) {
+                            if (!child) {
+                                me.body.appendChild(p);
+                                break;
+                            } else {
+                                child.parentNode.insertBefore(p, child);
+                                p = me.document.createElement('p');
+                            }
+                        }
+                        child = child.nextSibling;
+                    }
+                }
+            }
+            me.fireEvent('aftersetcontent');
+            me.fireEvent('contentchange');
+
+            !notFireSelectionchange && me._selectionChange();
+            //清除保存的选区
+            me._bakRange = me._bakIERange = me._bakNativeRange = null;
+            //trace:1742 setContent后gecko能得到焦点问题
+            var geckoSel;
+            if (browser.gecko && (geckoSel = this.selection.getNative())) {
+                geckoSel.removeAllRanges();
+            }
+            if(me.options.autoSyncData){
+                me.form && setValue(me.form,me);
+            }
+        },
+
+        /**
+         * 让编辑器获得焦点，toEnd确定focus位置
+         * @name focus
+         * @grammar editor.focus([toEnd])   //默认focus到编辑器头部，toEnd为true时focus到内容尾部
+         */
+        focus: function (toEnd) {
+            try {
+                var me = this,
+                    rng = me.selection.getRange();
+                if (toEnd) {
+                    rng.setStartAtLast(me.body.lastChild).setCursor(false, true);
+                } else {
+                    rng.select(true);
+                }
+                this.fireEvent('focus');
+            } catch (e) {
+            }
+        },
+        /**
+         * 使编辑区域失去焦点
+         */
+        blur:function(){
+            var sel = this.selection.getNative();
+            sel.empty ? sel.empty() : sel.removeAllRanges();
+            this.fireEvent('blur')
+        },
+        /**
+         * 判断编辑器当前是否获得了焦点
+         */
+        isFocus : function(){
+            if(this.fireEvent('isfocus')===true){
+                return true;
+            }
+            return this.selection.isFocus();
+        },
+
+        /**
+         * 初始化UE事件及部分事件代理
+         * @private
+         * @ignore
+         */
+        _initEvents: function () {
+            var me = this,
+                cont = me.body,
+                _proxyDomEvent = function(){
+                    me._proxyDomEvent.apply(me, arguments);
+                };
+
+            $(cont)
+                .on( 'click contextmenu mousedown keydown keyup keypress mouseup mouseover mouseout selectstart', _proxyDomEvent)
+                .on( 'focus blur', _proxyDomEvent)
+                .on('mouseup keydown', function (evt) {
+                    //特殊键不触发selectionchange
+                    if (evt.type == 'keydown' && (evt.ctrlKey || evt.metaKey || evt.shiftKey || evt.altKey)) {
+                        return;
+                    }
+                    if (evt.button == 2)return;
+                    me._selectionChange(250, evt);
+                });
+        },
+        /**
+         * 触发事件代理
+         * @private
+         * @ignore
+         */
+        _proxyDomEvent: function (evt) {
+            return this.fireEvent(evt.type.replace(/^on/, ''), evt);
+        },
+        /**
+         * 变化选区
+         * @private
+         * @ignore
+         */
+        _selectionChange: function (delay, evt) {
+            var me = this;
+            //有光标才做selectionchange 为了解决未focus时点击source不能触发更改工具栏状态的问题（source命令notNeedUndo=1）
+//            if ( !me.selection.isFocus() ){
+//                return;
+//            }
+
+
+            var hackForMouseUp = false;
+            var mouseX, mouseY;
+            if (browser.ie && browser.version < 9 && evt && evt.type == 'mouseup') {
+                var range = this.selection.getRange();
+                if (!range.collapsed) {
+                    hackForMouseUp = true;
+                    mouseX = evt.clientX;
+                    mouseY = evt.clientY;
+                }
+            }
+            clearTimeout(_selectionChangeTimer);
+            _selectionChangeTimer = setTimeout(function () {
+                if (!me.selection.getNative()) {
+                    return;
+                }
+                //修复一个IE下的bug: 鼠标点击一段已选择的文本中间时，可能在mouseup后的一段时间内取到的range是在selection的type为None下的错误值.
+                //IE下如果用户是拖拽一段已选择文本，则不会触发mouseup事件，所以这里的特殊处理不会对其有影响
+                var ieRange;
+                if (hackForMouseUp && me.selection.getNative().type == 'None') {
+                    ieRange = me.document.body.createTextRange();
+                    try {
+                        ieRange.moveToPoint(mouseX, mouseY);
+                    } catch (ex) {
+                        ieRange = null;
+                    }
+                }
+                var bakGetIERange;
+                if (ieRange) {
+                    bakGetIERange = me.selection.getIERange;
+                    me.selection.getIERange = function () {
+                        return ieRange;
+                    };
+                }
+                me.selection.cache();
+                if (bakGetIERange) {
+                    me.selection.getIERange = bakGetIERange;
+                }
+                if (me.selection._cachedRange && me.selection._cachedStartElement) {
+                    me.fireEvent('beforeselectionchange');
+                    // 第二个参数causeByUi为true代表由用户交互造成的selectionchange.
+                    me.fireEvent('selectionchange', !!evt);
+                    me.fireEvent('afterselectionchange');
+                    me.selection.clear();
+                }
+            }, delay || 50);
+        },
+        _callCmdFn: function (fnName, args) {
+            args = Array.prototype.slice.call(args,0);
+            var cmdName = args.shift().toLowerCase(),
+                cmd, cmdFn;
+            cmd = this.commands[cmdName] || UM.commands[cmdName];
+            cmdFn = cmd && cmd[fnName];
+            //没有querycommandstate或者没有command的都默认返回0
+            if ((!cmd || !cmdFn) && fnName == 'queryCommandState') {
+                return 0;
+            } else if (cmdFn) {
+                return cmdFn.apply(this, [cmdName].concat(args));
+            }
+        },
+
+        /**
+         * 执行编辑命令cmdName，完成富文本编辑效果
+         * @name execCommand
+         * @grammar editor.execCommand(cmdName)   => {*}
+         */
+        execCommand: function (cmdName) {
+            if(!this.isFocus()){
+                var bakRange = this.selection._bakRange;
+                if(bakRange){
+                    bakRange.select()
+                }else{
+                    this.focus(true)
+                }
+
+            }
+            cmdName = cmdName.toLowerCase();
+            var me = this,
+                result,
+                cmd = me.commands[cmdName] || UM.commands[cmdName];
+            if (!cmd || !cmd.execCommand) {
+                return null;
+            }
+            if (!cmd.notNeedUndo && !me.__hasEnterExecCommand) {
+                me.__hasEnterExecCommand = true;
+                if (me.queryCommandState.apply(me,arguments) != -1) {
+                    me.fireEvent('saveScene');
+                    me.fireEvent('beforeexeccommand', cmdName);
+                    result = this._callCmdFn('execCommand', arguments);
+                    (!cmd.ignoreContentChange && !me._ignoreContentChange) && me.fireEvent('contentchange');
+                    me.fireEvent('afterexeccommand', cmdName);
+                    me.fireEvent('saveScene');
+                }
+                me.__hasEnterExecCommand = false;
+            } else {
+                result = this._callCmdFn('execCommand', arguments);
+                (!me.__hasEnterExecCommand && !cmd.ignoreContentChange && !me._ignoreContentChange) && me.fireEvent('contentchange')
+            }
+            (!me.__hasEnterExecCommand && !cmd.ignoreContentChange && !me._ignoreContentChange) && me._selectionChange();
+            return result;
+        },
+        /**
+         * 根据传入的command命令，查选编辑器当前的选区，返回命令的状态
+         * @name  queryCommandState
+         * @grammar editor.queryCommandState(cmdName)  => (-1|0|1)
+         * @desc
+         * * ''-1'' 当前命令不可用
+         * * ''0'' 当前命令可用
+         * * ''1'' 当前命令已经执行过了
+         */
+        queryCommandState: function (cmdName) {
+            try{
+                return this._callCmdFn('queryCommandState', arguments);
+            }catch(e){
+                return 0
+            }
+
+        },
+
+        /**
+         * 根据传入的command命令，查选编辑器当前的选区，根据命令返回相关的值
+         * @name  queryCommandValue
+         * @grammar editor.queryCommandValue(cmdName)  =>  {*}
+         */
+        queryCommandValue: function (cmdName) {
+            try{
+                return this._callCmdFn('queryCommandValue', arguments);
+            }catch(e){
+                return null
+            }
+        },
+        /**
+         * 检查编辑区域中是否有内容，若包含tags中的节点类型，直接返回true
+         * @name  hasContents
+         * @desc
+         * 默认有文本内容，或者有以下节点都不认为是空
+         * <code>{table:1,ul:1,ol:1,dl:1,iframe:1,area:1,base:1,col:1,hr:1,img:1,embed:1,input:1,link:1,meta:1,param:1}</code>
+         * @grammar editor.hasContents()  => (true|false)
+         * @grammar editor.hasContents(tags)  =>  (true|false)  //若文档中包含tags数组里对应的tag，直接返回true
+         * @example
+         * editor.hasContents(['span']) //如果编辑器里有这些，不认为是空
+         */
+        hasContents: function (tags) {
+            if (tags) {
+                for (var i = 0, ci; ci = tags[i++];) {
+                    if (this.body.getElementsByTagName(ci).length > 0) {
+                        return true;
+                    }
+                }
+            }
+            if (!domUtils.isEmptyBlock(this.body)) {
+                return true
+            }
+            //随时添加,定义的特殊标签如果存在，不能认为是空
+            tags = ['div'];
+            for (i = 0; ci = tags[i++];) {
+                var nodes = domUtils.getElementsByTagName(this.body, ci);
+                for (var n = 0, cn; cn = nodes[n++];) {
+                    if (domUtils.isCustomeNode(cn)) {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        },
+        /**
+         * 重置编辑器，可用来做多个tab使用同一个编辑器实例
+         * @name  reset
+         * @desc
+         * * 清空编辑器内容
+         * * 清空回退列表
+         * @grammar editor.reset()
+         */
+        reset: function () {
+            this.fireEvent('reset');
+        },
+        isEnabled: function(){
+            return this._isEnabled != true;
+        },
+
+        setEnabled: function () {
+            var me = this, range;
+
+            me.body.contentEditable = true;
+
+            /* 恢复选区 */
+            if (me.lastBk) {
+                range = me.selection.getRange();
+                try {
+                    range.moveToBookmark(me.lastBk);
+                    delete me.lastBk
+                } catch (e) {
+                    range.setStartAtFirst(me.body).collapse(true)
+                }
+                range.select(true);
+            }
+
+            /* 恢复query函数 */
+            if (me.bkqueryCommandState) {
+                me.queryCommandState = me.bkqueryCommandState;
+                delete me.bkqueryCommandState;
+            }
+
+            /* 恢复原生事件 */
+            if (me._bkproxyDomEvent) {
+                me._proxyDomEvent = me._bkproxyDomEvent;
+                delete me._bkproxyDomEvent;
+            }
+
+            /* 触发事件 */
+            me.fireEvent('setEnabled');
+        },
+        /**
+         * 设置当前编辑区域可以编辑
+         * @name enable
+         * @grammar editor.enable()
+         */
+        enable: function () {
+            return this.setEnabled();
+        },
+        setDisabled: function (except, keepDomEvent) {
+            var me = this;
+
+            me.body.contentEditable = false;
+            me._except = except ? utils.isArray(except) ? except : [except] : [];
+
+            /* 备份最后的选区 */
+            if (!me.lastBk) {
+                me.lastBk = me.selection.getRange().createBookmark(true);
+            }
+
+            /* 备份并重置query函数 */
+            if(!me.bkqueryCommandState) {
+                me.bkqueryCommandState = me.queryCommandState;
+                me.queryCommandState = function (type) {
+                    if (utils.indexOf(me._except, type) != -1) {
+                        return me.bkqueryCommandState.apply(me, arguments);
+                    }
+                    return -1;
+                };
+            }
+
+            /* 备份并墙原生事件 */
+            if(!keepDomEvent && !me._bkproxyDomEvent) {
+                me._bkproxyDomEvent = me._proxyDomEvent;
+                me._proxyDomEvent = function () {
+                    return false;
+                };
+            }
+
+            /* 触发事件 */
+            me.fireEvent('selectionchange');
+            me.fireEvent('setDisabled', me._except);
+        },
+        /** 设置当前编辑区域不可编辑,except中的命令除外
+         * @name disable
+         * @grammar editor.disable()
+         * @grammar editor.disable(except)  //例外的命令，也即即使设置了disable，此处配置的命令仍然可以执行
+         * @example
+         * //禁用工具栏中除加粗和插入图片之外的所有功能
+         * editor.disable(['bold','insertimage']);//可以是单一的String,也可以是Array
+         */
+        disable: function (except) {
+            return this.setDisabled(except);
+        },
+        /**
+         * 设置默认内容
+         * @ignore
+         * @private
+         * @param  {String} cont 要存入的内容
+         */
+        _setDefaultContent: function () {
+            function clear() {
+                var me = this;
+                if (me.document.getElementById('initContent')) {
+                    me.body.innerHTML = '<p>' + (ie ? '' : '<br/>') + '</p>';
+                    me.removeListener('firstBeforeExecCommand focus', clear);
+                    setTimeout(function () {
+                        me.focus();
+                        me._selectionChange();
+                    }, 0)
+                }
+            }
+
+            return function (cont) {
+                var me = this;
+                me.body.innerHTML = '<p id="initContent">' + cont + '</p>';
+
+                me.addListener('firstBeforeExecCommand focus', clear);
+            }
+        }(),
+        /**
+         * show方法的兼容版本
+         * @private
+         * @ignore
+         */
+        setShow: function () {
+            var me = this, range = me.selection.getRange();
+            if (me.container.style.display == 'none') {
+                //有可能内容丢失了
+                try {
+                    range.moveToBookmark(me.lastBk);
+                    delete me.lastBk
+                } catch (e) {
+                    range.setStartAtFirst(me.body).collapse(true)
+                }
+                //ie下focus实效，所以做了个延迟
+                setTimeout(function () {
+                    range.select(true);
+                }, 100);
+                me.container.style.display = '';
+            }
+
+        },
+        /**
+         * 显示编辑器
+         * @name show
+         * @grammar editor.show()
+         */
+        show: function () {
+            return this.setShow();
+        },
+        /**
+         * hide方法的兼容版本
+         * @private
+         * @ignore
+         */
+        setHide: function () {
+            var me = this;
+            if (!me.lastBk) {
+                me.lastBk = me.selection.getRange().createBookmark(true);
+            }
+            me.container.style.display = 'none'
+        },
+        /**
+         * 隐藏编辑器
+         * @name hide
+         * @grammar editor.hide()
+         */
+        hide: function () {
+            return this.setHide();
+        },
+        /**
+         * 根据制定的路径，获取对应的语言资源
+         * @name  getLang
+         * @grammar editor.getLang(path)  =>  （JSON|String) 路径根据的是lang目录下的语言文件的路径结构
+         * @example
+         * editor.getLang('contextMenu.delete') //如果当前是中文，那返回是的是删除
+         */
+        getLang: function (path) {
+            var lang = UM.I18N[this.options.lang];
+            if (!lang) {
+                throw Error("not import language file");
+            }
+            path = (path || "").split(".");
+            for (var i = 0, ci; ci = path[i++];) {
+                lang = lang[ci];
+                if (!lang)break;
+            }
+            return lang;
+        },
+        /**
+         * 计算编辑器当前内容的长度
+         * @name  getContentLength
+         * @grammar editor.getContentLength(ingoneHtml,tagNames)  =>
+         * @example
+         * editor.getLang(true)
+         */
+        getContentLength: function (ingoneHtml, tagNames) {
+            var count = this.getContent(false,false,true).length;
+            if (ingoneHtml) {
+                tagNames = (tagNames || []).concat([ 'hr', 'img', 'iframe']);
+                count = this.getContentTxt().replace(/[\t\r\n]+/g, '').length;
+                for (var i = 0, ci; ci = tagNames[i++];) {
+                    count += this.body.getElementsByTagName(ci).length;
+                }
+            }
+            return count;
+        },
+        addInputRule: function (rule,ignoreUndo) {
+            rule.ignoreUndo = ignoreUndo;
+            this.inputRules.push(rule);
+        },
+        filterInputRule: function (root,isUndoLoad) {
+            for (var i = 0, ci; ci = this.inputRules[i++];) {
+                if(isUndoLoad && ci.ignoreUndo){
+                    continue;
+                }
+                ci.call(this, root)
+            }
+        },
+        addOutputRule: function (rule,ignoreUndo) {
+            rule.ignoreUndo = ignoreUndo;
+            this.outputRules.push(rule)
+        },
+        filterOutputRule: function (root,isUndoLoad) {
+            for (var i = 0, ci; ci = this.outputRules[i++];) {
+                if(isUndoLoad && ci.ignoreUndo){
+                    continue;
+                }
+                ci.call(this, root)
+            }
+        }
+    };
+    utils.inherits(Editor, EventBase);
+})();
+
+/**
+ * @file
+ * @name UM.filterWord
+ * @short filterWord
+ * @desc 用来过滤word粘贴过来的字符串
+ * @import editor.js,core/utils.js
+ * @anthor zhanyi
+ */
+var filterWord = UM.filterWord = function () {
+
+    //是否是word过来的内容
+    function isWordDocument( str ) {
+        return /(class="?Mso|style="[^"]*\bmso\-|w:WordDocument|<(v|o):|lang=)/ig.test( str );
+    }
+    //去掉小数
+    function transUnit( v ) {
+        v = v.replace( /[\d.]+\w+/g, function ( m ) {
+            return utils.transUnitToPx(m);
+        } );
+        return v;
+    }
+
+    function filterPasteWord( str ) {
+        return str.replace(/[\t\r\n]+/g,' ')
+            .replace( /<!--[\s\S]*?-->/ig, "" )
+            //转换图片
+            .replace(/<v:shape [^>]*>[\s\S]*?.<\/v:shape>/gi,function(str){
+                //opera能自己解析出image所这里直接返回空
+                if(browser.opera){
+                    return '';
+                }
+                try{
+                    //有可能是bitmap占为图，无用，直接过滤掉，主要体现在粘贴excel表格中
+                    if(/Bitmap/i.test(str)){
+                        return '';
+                    }
+                    var width = str.match(/width:([ \d.]*p[tx])/i)[1],
+                        height = str.match(/height:([ \d.]*p[tx])/i)[1],
+                        src =  str.match(/src=\s*"([^"]*)"/i)[1];
+                    return '<img width="'+ transUnit(width) +'" height="'+transUnit(height) +'" src="' + src + '" />';
+                } catch(e){
+                    return '';
+                }
+            })
+            //针对wps添加的多余标签处理
+            .replace(/<\/?div[^>]*>/g,'')
+            //去掉多余的属性
+            .replace( /v:\w+=(["']?)[^'"]+\1/g, '' )
+            .replace( /<(!|script[^>]*>.*?<\/script(?=[>\s])|\/?(\?xml(:\w+)?|xml|meta|link|style|\w+:\w+)(?=[\s\/>]))[^>]*>/gi, "" )
+            .replace( /<p [^>]*class="?MsoHeading"?[^>]*>(.*?)<\/p>/gi, "<p><strong>$1</strong></p>" )
+            //去掉多余的属性
+            .replace( /\s+(class|lang|align)\s*=\s*(['"]?)([\w-]+)\2/ig, function(str,name,marks,val){
+                //保留list的标示
+                return name == 'class' && val == 'MsoListParagraph' ? str : ''
+            })
+            //清除多余的font/span不能匹配&nbsp;有可能是空格
+            .replace( /<(font|span)[^>]*>(\s*)<\/\1>/gi, function(a,b,c){
+                return c.replace(/[\t\r\n ]+/g,' ')
+            })
+            //处理style的问题
+            .replace( /(<[a-z][^>]*)\sstyle=(["'])([^\2]*?)\2/gi, function( str, tag, tmp, style ) {
+                var n = [],
+                    s = style.replace( /^\s+|\s+$/, '' )
+                        .replace(/&#39;/g,'\'')
+                        .replace( /&quot;/gi, "'" )
+                        .split( /;\s*/g );
+
+                for ( var i = 0,v; v = s[i];i++ ) {
+
+                    var name, value,
+                        parts = v.split( ":" );
+
+                    if ( parts.length == 2 ) {
+                        name = parts[0].toLowerCase();
+                        value = parts[1].toLowerCase();
+                        if(/^(background)\w*/.test(name) && value.replace(/(initial|\s)/g,'').length == 0
+                            ||
+                            /^(margin)\w*/.test(name) && /^0\w+$/.test(value)
+                            ){
+                            continue;
+                        }
+
+                        switch ( name ) {
+                            case "mso-padding-alt":
+                            case "mso-padding-top-alt":
+                            case "mso-padding-right-alt":
+                            case "mso-padding-bottom-alt":
+                            case "mso-padding-left-alt":
+                            case "mso-margin-alt":
+                            case "mso-margin-top-alt":
+                            case "mso-margin-right-alt":
+                            case "mso-margin-bottom-alt":
+                            case "mso-margin-left-alt":
+                            //ie下会出现挤到一起的情况
+                            //case "mso-table-layout-alt":
+                            case "mso-height":
+                            case "mso-width":
+                            case "mso-vertical-align-alt":
+                                //trace:1819 ff下会解析出padding在table上
+                                if(!/<table/.test(tag))
+                                    n[i] = name.replace( /^mso-|-alt$/g, "" ) + ":" + transUnit( value );
+                                continue;
+                            case "horiz-align":
+                                n[i] = "text-align:" + value;
+                                continue;
+
+                            case "vert-align":
+                                n[i] = "vertical-align:" + value;
+                                continue;
+
+                            case "font-color":
+                            case "mso-foreground":
+                                n[i] = "color:" + value;
+                                continue;
+
+                            case "mso-background":
+                            case "mso-highlight":
+                                n[i] = "background:" + value;
+                                continue;
+
+                            case "mso-default-height":
+                                n[i] = "min-height:" + transUnit( value );
+                                continue;
+
+                            case "mso-default-width":
+                                n[i] = "min-width:" + transUnit( value );
+                                continue;
+
+                            case "mso-padding-between-alt":
+                                n[i] = "border-collapse:separate;border-spacing:" + transUnit( value );
+                                continue;
+
+                            case "text-line-through":
+                                if ( (value == "single") || (value == "double") ) {
+                                    n[i] = "text-decoration:line-through";
+                                }
+                                continue;
+                            case "mso-zero-height":
+                                if ( value == "yes" ) {
+                                    n[i] = "display:none";
+                                }
+                                continue;
+//                                case 'background':
+//                                    break;
+                            case 'margin':
+                                if ( !/[1-9]/.test( value ) ) {
+                                    continue;
+                                }
+
+                        }
+
+                        if ( /^(mso|column|font-emph|lang|layout|line-break|list-image|nav|panose|punct|row|ruby|sep|size|src|tab-|table-border|text-(?:decor|trans)|top-bar|version|vnd|word-break)/.test( name )
+                            ||
+                            /text\-indent|padding|margin/.test(name) && /\-[\d.]+/.test(value)
+                            ) {
+                            continue;
+                        }
+
+                        n[i] = name + ":" + parts[1];
+                    }
+                }
+                return tag + (n.length ? ' style="' + n.join( ';').replace(/;{2,}/g,';') + '"' : '');
+            })
+            .replace(/[\d.]+(cm|pt)/g,function(str){
+                return utils.transUnitToPx(str)
+            })
+
+    }
+
+    return function ( html ) {
+        return (isWordDocument( html ) ? filterPasteWord( html ) : html);
+    };
+}();
+///import editor.js
+///import core/utils.js
+///import core/dom/dom.js
+///import core/dom/dtd.js
+///import core/htmlparser.js
+//模拟的节点类
+//by zhanyi
+(function () {
+    var uNode = UM.uNode = function (obj) {
+        this.type = obj.type;
+        this.data = obj.data;
+        this.tagName = obj.tagName;
+        this.parentNode = obj.parentNode;
+        this.attrs = obj.attrs || {};
+        this.children = obj.children;
+    };
+    var notTransAttrs = {
+        'href':1,
+        'src':1,
+        '_src':1,
+        '_href':1,
+        'cdata_data':1
+    };
+
+    var notTransTagName = {
+        style:1,
+        script:1
+    };
+
+    var indentChar = '    ',
+        breakChar = '\n';
+
+    function insertLine(arr, current, begin) {
+        arr.push(breakChar);
+        return current + (begin ? 1 : -1);
+    }
+
+    function insertIndent(arr, current) {
+        //插入缩进
+        for (var i = 0; i < current; i++) {
+            arr.push(indentChar);
+        }
+    }
+
+    //创建uNode的静态方法
+    //支持标签和html
+    uNode.createElement = function (html) {
+        if (/[<>]/.test(html)) {
+            return UM.htmlparser(html).children[0]
+        } else {
+            return new uNode({
+                type:'element',
+                children:[],
+                tagName:html
+            })
+        }
+    };
+    uNode.createText = function (data,noTrans) {
+        return new UM.uNode({
+            type:'text',
+            'data':noTrans ? data : utils.unhtml(data || '')
+        })
+    };
+    function nodeToHtml(node, arr, formatter, current) {
+        switch (node.type) {
+            case 'root':
+                for (var i = 0, ci; ci = node.children[i++];) {
+                    //插入新行
+                    if (formatter && ci.type == 'element' && !dtd.$inlineWithA[ci.tagName] && i > 1) {
+                        insertLine(arr, current, true);
+                        insertIndent(arr, current)
+                    }
+                    nodeToHtml(ci, arr, formatter, current)
+                }
+                break;
+            case 'text':
+                isText(node, arr);
+                break;
+            case 'element':
+                isElement(node, arr, formatter, current);
+                break;
+            case 'comment':
+                isComment(node, arr, formatter);
+        }
+        return arr;
+    }
+
+    function isText(node, arr) {
+        if(node.parentNode.tagName == 'pre'){
+            //源码模式下输入html标签，不能做转换处理，直接输出
+            arr.push(node.data)
+        }else{
+            arr.push(notTransTagName[node.parentNode.tagName] ? utils.html(node.data) : node.data.replace(/[ ]{2}/g,' &nbsp;'))
+        }
+
+    }
+
+    function isElement(node, arr, formatter, current) {
+        var attrhtml = '';
+        if (node.attrs) {
+            attrhtml = [];
+            var attrs = node.attrs;
+            for (var a in attrs) {
+                //这里就针对
+                //<p>'<img src='http://nsclick.baidu.com/u.gif?&asdf=\"sdf&asdfasdfs;asdf'></p>
+                //这里边的\"做转换，要不用innerHTML直接被截断了，属性src
+                //有可能做的不够
+                attrhtml.push(a + (attrs[a] !== undefined ? '="' + (notTransAttrs[a] ? utils.html(attrs[a]).replace(/["]/g, function (a) {
+                    return '&quot;'
+                }) : utils.unhtml(attrs[a])) + '"' : ''))
+            }
+            attrhtml = attrhtml.join(' ');
+        }
+        arr.push('<' + node.tagName +
+            (attrhtml ? ' ' + attrhtml  : '') +
+            (dtd.$empty[node.tagName] ? '\/' : '' ) + '>'
+        );
+        //插入新行
+        if (formatter  &&  !dtd.$inlineWithA[node.tagName] && node.tagName != 'pre') {
+            if(node.children && node.children.length){
+                current = insertLine(arr, current, true);
+                insertIndent(arr, current)
+            }
+
+        }
+        if (node.children && node.children.length) {
+            for (var i = 0, ci; ci = node.children[i++];) {
+                if (formatter && ci.type == 'element' &&  !dtd.$inlineWithA[ci.tagName] && i > 1) {
+                    insertLine(arr, current);
+                    insertIndent(arr, current)
+                }
+                nodeToHtml(ci, arr, formatter, current)
+            }
+        }
+        if (!dtd.$empty[node.tagName]) {
+            if (formatter && !dtd.$inlineWithA[node.tagName]  && node.tagName != 'pre') {
+
+                if(node.children && node.children.length){
+                    current = insertLine(arr, current);
+                    insertIndent(arr, current)
+                }
+            }
+            arr.push('<\/' + node.tagName + '>');
+        }
+
+    }
+
+    function isComment(node, arr) {
+        arr.push('<!--' + node.data + '-->');
+    }
+
+    function getNodeById(root, id) {
+        var node;
+        if (root.type == 'element' && root.getAttr('id') == id) {
+            return root;
+        }
+        if (root.children && root.children.length) {
+            for (var i = 0, ci; ci = root.children[i++];) {
+                if (node = getNodeById(ci, id)) {
+                    return node;
+                }
+            }
+        }
+    }
+
+    function getNodesByTagName(node, tagName, arr) {
+        if (node.type == 'element' && node.tagName == tagName) {
+            arr.push(node);
+        }
+        if (node.children && node.children.length) {
+            for (var i = 0, ci; ci = node.children[i++];) {
+                getNodesByTagName(ci, tagName, arr)
+            }
+        }
+    }
+    function nodeTraversal(root,fn){
+        if(root.children && root.children.length){
+            for(var i= 0,ci;ci=root.children[i];){
+                nodeTraversal(ci,fn);
+                //ci被替换的情况，这里就不再走 fn了
+                if(ci.parentNode ){
+                    if(ci.children && ci.children.length){
+                        fn(ci)
+                    }
+                    if(ci.parentNode) i++
+                }
+            }
+        }else{
+            fn(root)
+        }
+
+    }
+    uNode.prototype = {
+
+        /**
+         * 当前节点对象，转换成html文本
+         * @method toHtml
+         * @return { String } 返回转换后的html字符串
+         * @example
+         * ```javascript
+         * node.toHtml();
+         * ```
+         */
+
+        /**
+         * 当前节点对象，转换成html文本
+         * @method toHtml
+         * @param { Boolean } formatter 是否格式化返回值
+         * @return { String } 返回转换后的html字符串
+         * @example
+         * ```javascript
+         * node.toHtml( true );
+         * ```
+         */
+        toHtml:function (formatter) {
+            var arr = [];
+            nodeToHtml(this, arr, formatter, 0);
+            return arr.join('')
+        },
+
+        /**
+         * 获取节点的html内容
+         * @method innerHTML
+         * @warning 假如节点的type不是'element'，或节点的标签名称不在dtd列表里，直接返回当前节点
+         * @return { String } 返回节点的html内容
+         * @example
+         * ```javascript
+         * var htmlstr = node.innerHTML();
+         * ```
+         */
+
+        /**
+         * 设置节点的html内容
+         * @method innerHTML
+         * @warning 假如节点的type不是'element'，或节点的标签名称不在dtd列表里，直接返回当前节点
+         * @param { String } htmlstr 传入要设置的html内容
+         * @return { UM.uNode } 返回节点本身
+         * @example
+         * ```javascript
+         * node.innerHTML('<span>text</span>');
+         * ```
+         */
+        innerHTML:function (htmlstr) {
+            if (this.type != 'element' || dtd.$empty[this.tagName]) {
+                return this;
+            }
+            if (utils.isString(htmlstr)) {
+                if(this.children){
+                    for (var i = 0, ci; ci = this.children[i++];) {
+                        ci.parentNode = null;
+                    }
+                }
+                this.children = [];
+                var tmpRoot = UM.htmlparser(htmlstr);
+                for (var i = 0, ci; ci = tmpRoot.children[i++];) {
+                    this.children.push(ci);
+                    ci.parentNode = this;
+                }
+                return this;
+            } else {
+                var tmpRoot = new UM.uNode({
+                    type:'root',
+                    children:this.children
+                });
+                return tmpRoot.toHtml();
+            }
+        },
+
+        /**
+         * 获取节点的纯文本内容
+         * @method innerText
+         * @warning 假如节点的type不是'element'，或节点的标签名称不在dtd列表里，直接返回当前节点
+         * @return { String } 返回节点的存文本内容
+         * @example
+         * ```javascript
+         * var textStr = node.innerText();
+         * ```
+         */
+
+        /**
+         * 设置节点的纯文本内容
+         * @method innerText
+         * @warning 假如节点的type不是'element'，或节点的标签名称不在dtd列表里，直接返回当前节点
+         * @param { String } textStr 传入要设置的文本内容
+         * @return { UM.uNode } 返回节点本身
+         * @example
+         * ```javascript
+         * node.innerText('<span>text</span>');
+         * ```
+         */
+        innerText:function (textStr,noTrans) {
+            if (this.type != 'element' || dtd.$empty[this.tagName]) {
+                return this;
+            }
+            if (textStr) {
+                if(this.children){
+                    for (var i = 0, ci; ci = this.children[i++];) {
+                        ci.parentNode = null;
+                    }
+                }
+                this.children = [];
+                this.appendChild(uNode.createText(textStr,noTrans));
+                return this;
+            } else {
+                return this.toHtml().replace(/<[^>]+>/g, '');
+            }
+        },
+
+        /**
+         * 获取当前对象的data属性
+         * @method getData
+         * @return { Object } 若节点的type值是elemenet，返回空字符串，否则返回节点的data属性
+         * @example
+         * ```javascript
+         * node.getData();
+         * ```
+         */
+        getData:function () {
+            if (this.type == 'element')
+                return '';
+            return this.data
+        },
+
+        /**
+         * 获取当前节点下的第一个子节点
+         * @method firstChild
+         * @return { UM.uNode } 返回第一个子节点
+         * @example
+         * ```javascript
+         * node.firstChild(); //返回第一个子节点
+         * ```
+         */
+        firstChild:function () {
+//            if (this.type != 'element' || dtd.$empty[this.tagName]) {
+//                return this;
+//            }
+            return this.children ? this.children[0] : null;
+        },
+
+        /**
+         * 获取当前节点下的最后一个子节点
+         * @method lastChild
+         * @return { UM.uNode } 返回最后一个子节点
+         * @example
+         * ```javascript
+         * node.lastChild(); //返回最后一个子节点
+         * ```
+         */
+        lastChild:function () {
+//            if (this.type != 'element' || dtd.$empty[this.tagName] ) {
+//                return this;
+//            }
+            return this.children ? this.children[this.children.length - 1] : null;
+        },
+
+        /**
+         * 获取和当前节点有相同父亲节点的前一个节点
+         * @method previousSibling
+         * @return { UM.uNode } 返回前一个节点
+         * @example
+         * ```javascript
+         * node.children[2].previousSibling(); //返回子节点node.children[1]
+         * ```
+         */
+        previousSibling : function(){
+            var parent = this.parentNode;
+            for (var i = 0, ci; ci = parent.children[i]; i++) {
+                if (ci === this) {
+                    return i == 0 ? null : parent.children[i-1];
+                }
+            }
+
+        },
+
+        /**
+         * 获取和当前节点有相同父亲节点的后一个节点
+         * @method nextSibling
+         * @return { UM.uNode } 返回后一个节点,找不到返回null
+         * @example
+         * ```javascript
+         * node.children[2].nextSibling(); //如果有，返回子节点node.children[3]
+         * ```
+         */
+        nextSibling : function(){
+            var parent = this.parentNode;
+            for (var i = 0, ci; ci = parent.children[i++];) {
+                if (ci === this) {
+                    return parent.children[i];
+                }
+            }
+        },
+
+        /**
+         * 用新的节点替换当前节点
+         * @method replaceChild
+         * @param { UM.uNode } target 要替换成该节点参数
+         * @param { UM.uNode } source 要被替换掉的节点
+         * @return { UM.uNode } 返回替换之后的节点对象
+         * @example
+         * ```javascript
+         * node.replaceChild(newNode, childNode); //用newNode替换childNode,childNode是node的子节点
+         * ```
+         */
+        replaceChild:function (target, source) {
+            if (this.children) {
+                if(target.parentNode){
+                    target.parentNode.removeChild(target);
+                }
+                for (var i = 0, ci; ci = this.children[i]; i++) {
+                    if (ci === source) {
+                        this.children.splice(i, 1, target);
+                        source.parentNode = null;
+                        target.parentNode = this;
+                        return target;
+                    }
+                }
+            }
+        },
+
+        /**
+         * 在节点的子节点列表最后位置插入一个节点
+         * @method appendChild
+         * @param { UM.uNode } node 要插入的节点
+         * @return { UM.uNode } 返回刚插入的子节点
+         * @example
+         * ```javascript
+         * node.appendChild( newNode ); //在node内插入子节点newNode
+         * ```
+         */
+        appendChild:function (node) {
+            if (this.type == 'root' || (this.type == 'element' && !dtd.$empty[this.tagName])) {
+                if (!this.children) {
+                    this.children = []
+                }
+                if(node.parentNode){
+                    node.parentNode.removeChild(node);
+                }
+                for (var i = 0, ci; ci = this.children[i]; i++) {
+                    if (ci === node) {
+                        this.children.splice(i, 1);
+                        break;
+                    }
+                }
+                this.children.push(node);
+                node.parentNode = this;
+                return node;
+            }
+
+
+        },
+
+        /**
+         * 在传入节点的前面插入一个节点
+         * @method insertBefore
+         * @param { UM.uNode } target 要插入的节点
+         * @param { UM.uNode } source 在该参数节点前面插入
+         * @return { UM.uNode } 返回刚插入的子节点
+         * @example
+         * ```javascript
+         * node.parentNode.insertBefore(newNode, node); //在node节点后面插入newNode
+         * ```
+         */
+        insertBefore:function (target, source) {
+            if (this.children) {
+                if(target.parentNode){
+                    target.parentNode.removeChild(target);
+                }
+                for (var i = 0, ci; ci = this.children[i]; i++) {
+                    if (ci === source) {
+                        this.children.splice(i, 0, target);
+                        target.parentNode = this;
+                        return target;
+                    }
+                }
+
+            }
+        },
+
+        /**
+         * 在传入节点的后面插入一个节点
+         * @method insertAfter
+         * @param { UM.uNode } target 要插入的节点
+         * @param { UM.uNode } source 在该参数节点后面插入
+         * @return { UM.uNode } 返回刚插入的子节点
+         * @example
+         * ```javascript
+         * node.parentNode.insertAfter(newNode, node); //在node节点后面插入newNode
+         * ```
+         */
+        insertAfter:function (target, source) {
+            if (this.children) {
+                if(target.parentNode){
+                    target.parentNode.removeChild(target);
+                }
+                for (var i = 0, ci; ci = this.children[i]; i++) {
+                    if (ci === source) {
+                        this.children.splice(i + 1, 0, target);
+                        target.parentNode = this;
+                        return target;
+                    }
+
+                }
+            }
+        },
+
+        /**
+         * 从当前节点的子节点列表中，移除节点
+         * @method removeChild
+         * @param { UM.uNode } node 要移除的节点引用
+         * @param { Boolean } keepChildren 是否保留移除节点的子节点，若传入true，自动把移除节点的子节点插入到移除的位置
+         * @return { * } 返回刚移除的子节点
+         * @example
+         * ```javascript
+         * node.removeChild(childNode,true); //在node的子节点列表中移除child节点，并且吧child的子节点插入到移除的位置
+         * ```
+         */
+        removeChild:function (node,keepChildren) {
+            if (this.children) {
+                for (var i = 0, ci; ci = this.children[i]; i++) {
+                    if (ci === node) {
+                        this.children.splice(i, 1);
+                        ci.parentNode = null;
+                        if(keepChildren && ci.children && ci.children.length){
+                            for(var j= 0,cj;cj=ci.children[j];j++){
+                                this.children.splice(i+j,0,cj);
+                                cj.parentNode = this;
+
+                            }
+                        }
+                        return ci;
+                    }
+                }
+            }
+        },
+
+        /**
+         * 获取当前节点所代表的元素属性，即获取attrs对象下的属性值
+         * @method getAttr
+         * @param { String } attrName 要获取的属性名称
+         * @return { * } 返回attrs对象下的属性值
+         * @example
+         * ```javascript
+         * node.getAttr('title');
+         * ```
+         */
+        getAttr:function (attrName) {
+            return this.attrs && this.attrs[attrName.toLowerCase()]
+        },
+
+        /**
+         * 设置当前节点所代表的元素属性，即设置attrs对象下的属性值
+         * @method setAttr
+         * @param { String } attrName 要设置的属性名称
+         * @param { * } attrVal 要设置的属性值，类型视设置的属性而定
+         * @return { * } 返回attrs对象下的属性值
+         * @example
+         * ```javascript
+         * node.setAttr('title','标题');
+         * ```
+         */
+        setAttr:function (attrName, attrVal) {
+            if (!attrName) {
+                delete this.attrs;
+                return;
+            }
+            if(!this.attrs){
+                this.attrs = {};
+            }
+            if (utils.isObject(attrName)) {
+                for (var a in attrName) {
+                    if (!attrName[a]) {
+                        delete this.attrs[a]
+                    } else {
+                        this.attrs[a.toLowerCase()] = attrName[a];
+                    }
+                }
+            } else {
+                if (!attrVal) {
+                    delete this.attrs[attrName]
+                } else {
+                    this.attrs[attrName.toLowerCase()] = attrVal;
+                }
+
+            }
+        },
+        hasAttr: function( attrName ){
+            var attrVal = this.getAttr( attrName );
+            return ( attrVal !== null ) && ( attrVal !== undefined );
+        },
+        /**
+         * 获取当前节点在父节点下的位置索引
+         * @method getIndex
+         * @return { Number } 返回索引数值，如果没有父节点，返回-1
+         * @example
+         * ```javascript
+         * node.getIndex();
+         * ```
+         */
+        getIndex:function(){
+            var parent = this.parentNode;
+            for(var i= 0,ci;ci=parent.children[i];i++){
+                if(ci === this){
+                    return i;
+                }
+            }
+            return -1;
+        },
+
+        /**
+         * 在当前节点下，根据id查找节点
+         * @method getNodeById
+         * @param { String } id 要查找的id
+         * @return { UM.uNode } 返回找到的节点
+         * @example
+         * ```javascript
+         * node.getNodeById('textId');
+         * ```
+         */
+        getNodeById:function (id) {
+            var node;
+            if (this.children && this.children.length) {
+                for (var i = 0, ci; ci = this.children[i++];) {
+                    if (node = getNodeById(ci, id)) {
+                        return node;
+                    }
+                }
+            }
+        },
+
+        /**
+         * 在当前节点下，根据元素名称查找节点列表
+         * @method getNodesByTagName
+         * @param { String } tagNames 要查找的元素名称
+         * @return { Array } 返回找到的节点列表
+         * @example
+         * ```javascript
+         * node.getNodesByTagName('span');
+         * ```
+         */
+        getNodesByTagName:function (tagNames) {
+            tagNames = utils.trim(tagNames).replace(/[ ]{2,}/g, ' ').split(' ');
+            var arr = [], me = this;
+            utils.each(tagNames, function (tagName) {
+                if (me.children && me.children.length) {
+                    for (var i = 0, ci; ci = me.children[i++];) {
+                        getNodesByTagName(ci, tagName, arr)
+                    }
+                }
+            });
+            return arr;
+        },
+
+        /**
+         * 根据样式名称，获取节点的样式值
+         * @method getStyle
+         * @param { String } name 要获取的样式名称
+         * @return { String } 返回样式值
+         * @example
+         * ```javascript
+         * node.getStyle('font-size');
+         * ```
+         */
+        getStyle:function (name) {
+            var cssStyle = this.getAttr('style');
+            if (!cssStyle) {
+                return ''
+            }
+            var reg = new RegExp('(^|;)\\s*' + name + ':([^;]+)','i');
+            var match = cssStyle.match(reg);
+            if (match && match[0]) {
+                return match[2]
+            }
+            return '';
+        },
+
+        /**
+         * 给节点设置样式
+         * @method setStyle
+         * @param { String } name 要设置的的样式名称
+         * @param { String } val 要设置的的样值
+         * @example
+         * ```javascript
+         * node.setStyle('font-size', '12px');
+         * ```
+         */
+        setStyle:function (name, val) {
+            function exec(name, val) {
+                var reg = new RegExp('(^|;)\\s*' + name + ':([^;]+;?)', 'gi');
+                cssStyle = cssStyle.replace(reg, '$1');
+                if (val) {
+                    cssStyle = name + ':' + utils.unhtml(val) + ';' + cssStyle
+                }
+
+            }
+
+            var cssStyle = this.getAttr('style');
+            if (!cssStyle) {
+                cssStyle = '';
+            }
+            if (utils.isObject(name)) {
+                for (var a in name) {
+                    exec(a, name[a])
+                }
+            } else {
+                exec(name, val)
+            }
+            this.setAttr('style', utils.trim(cssStyle))
+        },
+        hasClass: function( className ){
+            if( this.hasAttr('class') ) {
+                var classNames = this.getAttr('class').split(/\s+/),
+                    hasClass = false;
+                $.each(classNames, function(key, item){
+                    if( item === className ) {
+                        hasClass = true;
+                    }
+                });
+                return hasClass;
+            } else {
+                return false;
+            }
+        },
+        addClass: function( className ){
+
+            var classes = null,
+                hasClass = false;
+
+            if( this.hasAttr('class') ) {
+
+                classes = this.getAttr('class');
+                classes = classes.split(/\s+/);
+
+                classes.forEach( function( item ){
+
+                    if( item===className ) {
+                        hasClass = true;
+                        return;
+                    }
+
+                } );
+
+                !hasClass && classes.push( className );
+
+                this.setAttr('class', classes.join(" "));
+
+            } else {
+                this.setAttr('class', className);
+            }
+
+        },
+        removeClass: function( className ){
+            if( this.hasAttr('class') ) {
+                var cl = this.getAttr('class');
+                cl = cl.replace(new RegExp('\\b' + className + '\\b', 'g'),'');
+                this.setAttr('class', utils.trim(cl).replace(/[ ]{2,}/g,' '));
+            }
+        },
+        /**
+         * 传入一个函数，递归遍历当前节点下的所有节点
+         * @method traversal
+         * @param { Function } fn 遍历到节点的时，传入节点作为参数，运行此函数
+         * @example
+         * ```javascript
+         * traversal(node, function(){
+         *     console.log(node.type);
+         * });
+         * ```
+         */
+        traversal:function(fn){
+            if(this.children && this.children.length){
+                nodeTraversal(this,fn);
+            }
+            return this;
+        }
+    }
+})();
+
+//html字符串转换成uNode节点
+//by zhanyi
+var htmlparser = UM.htmlparser = function (htmlstr,ignoreBlank) {
+    //todo 原来的方式  [^"'<>\/] 有\/就不能配对上 <TD vAlign=top background=../AAA.JPG> 这样的标签了
+    //先去掉了，加上的原因忘了，这里先记录
+    var re_tag = /<(?:(?:\/([^>]+)>)|(?:!--([\S|\s]*?)-->)|(?:([^\s\/>]+)\s*((?:(?:"[^"]*")|(?:'[^']*')|[^"'<>])*)\/?>))/g,
+        re_attr = /([\w\-:.]+)(?:(?:\s*=\s*(?:(?:"([^"]*)")|(?:'([^']*)')|([^\s>]+)))|(?=\s|$))/g;
+
+    //ie下取得的html可能会有\n存在，要去掉，在处理replace(/[\t\r\n]*/g,'');代码高量的\n不能去除
+    var allowEmptyTags = {
+        b:1,code:1,i:1,u:1,strike:1,s:1,tt:1,strong:1,q:1,samp:1,em:1,span:1,
+        sub:1,img:1,sup:1,font:1,big:1,small:1,iframe:1,a:1,br:1,pre:1
+    };
+    htmlstr = htmlstr.replace(new RegExp(domUtils.fillChar, 'g'), '');
+    if(!ignoreBlank){
+        htmlstr = htmlstr.replace(new RegExp('[\\r\\t\\n'+(ignoreBlank?'':' ')+']*<\/?(\\w+)\\s*(?:[^>]*)>[\\r\\t\\n'+(ignoreBlank?'':' ')+']*','g'), function(a,b){
+            //br暂时单独处理
+            if(b && allowEmptyTags[b.toLowerCase()]){
+                return a.replace(/(^[\n\r]+)|([\n\r]+$)/g,'');
+            }
+            return a.replace(new RegExp('^[\\r\\n'+(ignoreBlank?'':' ')+']+'),'').replace(new RegExp('[\\r\\n'+(ignoreBlank?'':' ')+']+$'),'');
+        });
+    }
+
+    var notTransAttrs = {
+        'href':1,
+        'src':1
+    };
+
+    var uNode = UM.uNode,
+        needParentNode = {
+            'td':'tr',
+            'tr':['tbody','thead','tfoot'],
+            'tbody':'table',
+            'th':'tr',
+            'thead':'table',
+            'tfoot':'table',
+            'caption':'table',
+            'li':['ul', 'ol'],
+            'dt':'dl',
+            'dd':'dl',
+            'option':'select'
+        },
+        needChild = {
+            'ol':'li',
+            'ul':'li'
+        };
+
+    function text(parent, data) {
+
+        if(needChild[parent.tagName]){
+            var tmpNode = uNode.createElement(needChild[parent.tagName]);
+            parent.appendChild(tmpNode);
+            tmpNode.appendChild(uNode.createText(data));
+            parent = tmpNode;
+        }else{
+
+            parent.appendChild(uNode.createText(data));
+        }
+    }
+
+    function element(parent, tagName, htmlattr) {
+        var needParentTag;
+        if (needParentTag = needParentNode[tagName]) {
+            var tmpParent = parent,hasParent;
+            while(tmpParent.type != 'root'){
+                if(utils.isArray(needParentTag) ? utils.indexOf(needParentTag, tmpParent.tagName) != -1 : needParentTag == tmpParent.tagName){
+                    parent = tmpParent;
+                    hasParent = true;
+                    break;
+                }
+                tmpParent = tmpParent.parentNode;
+            }
+            if(!hasParent){
+                parent = element(parent, utils.isArray(needParentTag) ? needParentTag[0] : needParentTag)
+            }
+        }
+        //按dtd处理嵌套
+//        if(parent.type != 'root' && !dtd[parent.tagName][tagName])
+//            parent = parent.parentNode;
+        var elm = new uNode({
+            parentNode:parent,
+            type:'element',
+            tagName:tagName.toLowerCase(),
+            //是自闭合的处理一下
+            children:dtd.$empty[tagName] ? null : []
+        });
+        //如果属性存在，处理属性
+        if (htmlattr) {
+            var attrs = {}, match;
+            while (match = re_attr.exec(htmlattr)) {
+                attrs[match[1].toLowerCase()] = notTransAttrs[match[1].toLowerCase()] ? (match[2] || match[3] || match[4]) : utils.unhtml(match[2] || match[3] || match[4])
+            }
+            elm.attrs = attrs;
+        }
+
+        parent.children.push(elm);
+        //如果是自闭合节点返回父亲节点
+        return  dtd.$empty[tagName] ? parent : elm
+    }
+
+    function comment(parent, data) {
+        parent.children.push(new uNode({
+            type:'comment',
+            data:data,
+            parentNode:parent
+        }));
+    }
+
+    var match, currentIndex = 0, nextIndex = 0;
+    //设置根节点
+    var root = new uNode({
+        type:'root',
+        children:[]
+    });
+    var currentParent = root;
+
+    while (match = re_tag.exec(htmlstr)) {
+        currentIndex = match.index;
+        try{
+            if (currentIndex > nextIndex) {
+                //text node
+                text(currentParent, htmlstr.slice(nextIndex, currentIndex));
+            }
+            if (match[3]) {
+
+                if(dtd.$cdata[currentParent.tagName]){
+                    text(currentParent, match[0]);
+                }else{
+                    //start tag
+                    currentParent = element(currentParent, match[3].toLowerCase(), match[4]);
+                }
+
+
+            } else if (match[1]) {
+                if(currentParent.type != 'root'){
+                    if(dtd.$cdata[currentParent.tagName] && !dtd.$cdata[match[1]]){
+                        text(currentParent, match[0]);
+                    }else{
+                        var tmpParent = currentParent;
+                        while(currentParent.type == 'element' && currentParent.tagName != match[1].toLowerCase()){
+                            currentParent = currentParent.parentNode;
+                            if(currentParent.type == 'root'){
+                                currentParent = tmpParent;
+                                throw 'break'
+                            }
+                        }
+                        //end tag
+                        currentParent = currentParent.parentNode;
+                    }
+
+                }
+
+            } else if (match[2]) {
+                //comment
+                comment(currentParent, match[2])
+            }
+        }catch(e){}
+
+        nextIndex = re_tag.lastIndex;
+
+    }
+    //如果结束是文本，就有可能丢掉，所以这里手动判断一下
+    //例如 <li>sdfsdfsdf<li>sdfsdfsdfsdf
+    if (nextIndex < htmlstr.length) {
+        text(currentParent, htmlstr.slice(nextIndex));
+    }
+    return root;
+};
+/**
+ * @file
+ * @name UM.filterNode
+ * @short filterNode
+ * @desc 根据给定的规则过滤节点
+ * @import editor.js,core/utils.js
+ * @anthor zhanyi
+ */
+var filterNode = UM.filterNode = function () {
+    function filterNode(node,rules){
+        switch (node.type) {
+            case 'text':
+                break;
+            case 'element':
+                var val;
+                if(val = rules[node.tagName]){
+                    if(val === '-'){
+                        node.parentNode.removeChild(node)
+                    }else if(utils.isFunction(val)){
+                        var parentNode = node.parentNode,
+                            index = node.getIndex();
+                        val(node);
+                        if(node.parentNode){
+                            if(node.children){
+                                for(var i = 0,ci;ci=node.children[i];){
+                                    filterNode(ci,rules);
+                                    if(ci.parentNode){
+                                        i++;
+                                    }
+                                }
+                            }
+                        }else{
+                            for(var i = index,ci;ci=parentNode.children[i];){
+                                filterNode(ci,rules);
+                                if(ci.parentNode){
+                                    i++;
+                                }
+                            }
+                        }
+
+
+                    }else{
+                        var attrs = val['$'];
+                        if(attrs && node.attrs){
+                            var tmpAttrs = {},tmpVal;
+                            for(var a in attrs){
+                                tmpVal = node.getAttr(a);
+                                //todo 只先对style单独处理
+                                if(a == 'style' && utils.isArray(attrs[a])){
+                                    var tmpCssStyle = [];
+                                    utils.each(attrs[a],function(v){
+                                        var tmp;
+                                        if(tmp = node.getStyle(v)){
+                                            tmpCssStyle.push(v + ':' + tmp);
+                                        }
+                                    });
+                                    tmpVal = tmpCssStyle.join(';')
+                                }
+                                if(tmpVal){
+                                    tmpAttrs[a] = tmpVal;
+                                }
+
+                            }
+                            node.attrs = tmpAttrs;
+                        }
+                        if(node.children){
+                            for(var i = 0,ci;ci=node.children[i];){
+                                filterNode(ci,rules);
+                                if(ci.parentNode){
+                                    i++;
+                                }
+                            }
+                        }
+                    }
+                }else{
+                    //如果不在名单里扣出子节点并删除该节点,cdata除外
+                    if(dtd.$cdata[node.tagName]){
+                        node.parentNode.removeChild(node)
+                    }else{
+                        var parentNode = node.parentNode,
+                            index = node.getIndex();
+                        node.parentNode.removeChild(node,true);
+                        for(var i = index,ci;ci=parentNode.children[i];){
+                            filterNode(ci,rules);
+                            if(ci.parentNode){
+                                i++;
+                            }
+                        }
+                    }
+                }
+                break;
+            case 'comment':
+                node.parentNode.removeChild(node)
+        }
+
+    }
+    return function(root,rules){
+        if(utils.isEmptyObject(rules)){
+            return root;
+        }
+        var val;
+        if(val = rules['-']){
+            utils.each(val.split(' '),function(k){
+                rules[k] = '-'
+            })
+        }
+        for(var i= 0,ci;ci=root.children[i];){
+            filterNode(ci,rules);
+            if(ci.parentNode){
+                i++;
+            }
+        }
+        return root;
+    }
+}();
+///import core
+/**
+ * @description 插入内容
+ * @name baidu.editor.execCommand
+ * @param   {String}   cmdName     inserthtml插入内容的命令
+ * @param   {String}   html                要插入的内容
+ * @author zhanyi
+ */
+UM.commands['inserthtml'] = {
+    execCommand: function (command,html,notNeedFilter){
+        var me = this,
+            range,
+            div;
+        if(!html){
+            return;
+        }
+        if(me.fireEvent('beforeinserthtml',html) === true){
+            return;
+        }
+        range = me.selection.getRange();
+        div = range.document.createElement( 'div' );
+        div.style.display = 'inline';
+
+        if (!notNeedFilter) {
+            var root = UM.htmlparser(html);
+            //如果给了过滤规则就先进行过滤
+            if(me.options.filterRules){
+                UM.filterNode(root,me.options.filterRules);
+            }
+            //执行默认的处理
+            me.filterInputRule(root);
+            html = root.toHtml()
+        }
+        div.innerHTML = utils.trim( html );
+
+        if ( !range.collapsed ) {
+            var tmpNode = range.startContainer;
+            if(domUtils.isFillChar(tmpNode)){
+                range.setStartBefore(tmpNode)
+            }
+            tmpNode = range.endContainer;
+            if(domUtils.isFillChar(tmpNode)){
+                range.setEndAfter(tmpNode)
+            }
+            range.txtToElmBoundary();
+            //结束边界可能放到了br的前边，要把br包含进来
+            // x[xxx]<br/>
+            if(range.endContainer && range.endContainer.nodeType == 1){
+                tmpNode = range.endContainer.childNodes[range.endOffset];
+                if(tmpNode && domUtils.isBr(tmpNode)){
+                    range.setEndAfter(tmpNode);
+                }
+            }
+            if(range.startOffset == 0){
+                tmpNode = range.startContainer;
+                if(domUtils.isBoundaryNode(tmpNode,'firstChild') ){
+                    tmpNode = range.endContainer;
+                    if(range.endOffset == (tmpNode.nodeType == 3 ? tmpNode.nodeValue.length : tmpNode.childNodes.length) && domUtils.isBoundaryNode(tmpNode,'lastChild')){
+                        me.body.innerHTML = '<p>'+(browser.ie ? '' : '<br/>')+'</p>';
+                        range.setStart(me.body.firstChild,0).collapse(true)
+
+                    }
+                }
+            }
+            !range.collapsed && range.deleteContents();
+            if(range.startContainer.nodeType == 1){
+                var child = range.startContainer.childNodes[range.startOffset],pre;
+                if(child && domUtils.isBlockElm(child) && (pre = child.previousSibling) && domUtils.isBlockElm(pre)){
+                    range.setEnd(pre,pre.childNodes.length).collapse();
+                    while(child.firstChild){
+                        pre.appendChild(child.firstChild);
+                    }
+                    domUtils.remove(child);
+                }
+            }
+
+        }
+
+
+        var child,parent,pre,tmp,hadBreak = 0, nextNode;
+        //如果当前位置选中了fillchar要干掉，要不会产生空行
+        if(range.inFillChar()){
+            child = range.startContainer;
+            if(domUtils.isFillChar(child)){
+                range.setStartBefore(child).collapse(true);
+                domUtils.remove(child);
+            }else if(domUtils.isFillChar(child,true)){
+                child.nodeValue = child.nodeValue.replace(fillCharReg,'');
+                range.startOffset--;
+                range.collapsed && range.collapse(true)
+            }
+        }
+        while ( child = div.firstChild ) {
+            if(hadBreak){
+                var p = me.document.createElement('p');
+                while(child && (child.nodeType == 3 || !dtd.$block[child.tagName])){
+                    nextNode = child.nextSibling;
+                    p.appendChild(child);
+                    child = nextNode;
+                }
+                if(p.firstChild){
+
+                    child = p
+                }
+            }
+            range.insertNode( child );
+            nextNode = child.nextSibling;
+            if ( !hadBreak && child.nodeType == domUtils.NODE_ELEMENT && domUtils.isBlockElm( child ) ){
+
+                parent = domUtils.findParent( child,function ( node ){ return domUtils.isBlockElm( node ); } );
+                if ( parent && parent.tagName.toLowerCase() != 'body' && !(dtd[parent.tagName][child.nodeName] && child.parentNode === parent)){
+                    if(!dtd[parent.tagName][child.nodeName]){
+                        pre = parent;
+                    }else{
+                        tmp = child.parentNode;
+                        while (tmp !== parent){
+                            pre = tmp;
+                            tmp = tmp.parentNode;
+
+                        }
+                    }
+
+
+                    domUtils.breakParent( child, pre || tmp );
+                    //去掉break后前一个多余的节点  <p>|<[p> ==> <p></p><div></div><p>|</p>
+                    var pre = child.previousSibling;
+                    domUtils.trimWhiteTextNode(pre);
+                    if(!pre.childNodes.length){
+                        domUtils.remove(pre);
+                    }
+                    //trace:2012,在非ie的情况，切开后剩下的节点有可能不能点入光标添加br占位
+
+                    if(!browser.ie &&
+                        (next = child.nextSibling) &&
+                        domUtils.isBlockElm(next) &&
+                        next.lastChild &&
+                        !domUtils.isBr(next.lastChild)){
+                        next.appendChild(me.document.createElement('br'));
+                    }
+                    hadBreak = 1;
+                }
+            }
+            var next = child.nextSibling;
+            if(!div.firstChild && next && domUtils.isBlockElm(next)){
+
+                range.setStart(next,0).collapse(true);
+                break;
+            }
+            range.setEndAfter( child ).collapse();
+
+        }
+
+        child = range.startContainer;
+
+        if(nextNode && domUtils.isBr(nextNode)){
+            domUtils.remove(nextNode)
+        }
+        //用chrome可能有空白展位符
+        if(domUtils.isBlockElm(child) && domUtils.isEmptyNode(child)){
+            if(nextNode = child.nextSibling){
+                domUtils.remove(child);
+                if(nextNode.nodeType == 1 && dtd.$block[nextNode.tagName]){
+
+                    range.setStart(nextNode,0).collapse(true).shrinkBoundary()
+                }
+            }else{
+
+                try{
+                    child.innerHTML = browser.ie ? domUtils.fillChar : '<br/>';
+                }catch(e){
+                    range.setStartBefore(child);
+                    domUtils.remove(child)
+                }
+
+            }
+
+        }
+        //加上true因为在删除表情等时会删两次，第一次是删的fillData
+        try{
+            if(browser.ie9below && range.startContainer.nodeType == 1 && !range.startContainer.childNodes[range.startOffset]){
+                var start = range.startContainer,pre = start.childNodes[range.startOffset-1];
+                if(pre && pre.nodeType == 1 && dtd.$empty[pre.tagName]){
+                    var txt = this.document.createTextNode(domUtils.fillChar);
+                    range.insertNode(txt).setStart(txt,0).collapse(true);
+                }
+            }
+            setTimeout(function(){
+                range.select(true);
+            })
+
+        }catch(e){}
+
+
+        setTimeout(function(){
+            range = me.selection.getRange();
+            range.scrollIntoView();
+            me.fireEvent('afterinserthtml');
+        },200);
+    }
+};
+
+///import core
+///import plugins\inserthtml.js
+///commands 插入图片，操作图片的对齐方式
+///commandsName  InsertImage,ImageNone,ImageLeft,ImageRight,ImageCenter
+///commandsTitle  图片,默认,居左,居右,居中
+///commandsDialog  dialogs\image
+/**
+ * Created by .
+ * User: zhanyi
+ * for image
+ */
+UM.commands['insertimage'] = {
+    execCommand:function (cmd, opt) {
+        opt = utils.isArray(opt) ? opt : [opt];
+        if (!opt.length) {
+            return;
+        }
+        var me = this;
+        var html = [], str = '', ci;
+        ci = opt[0];
+        if (opt.length == 1) {
+            str = '<img src="' + ci.src + '" ' + (ci._src ? ' _src="' + ci._src + '" ' : '') +
+                (ci.width ? 'width="' + ci.width + '" ' : '') +
+                (ci.height ? ' height="' + ci.height + '" ' : '') +
+                (ci['floatStyle'] == 'left' || ci['floatStyle'] == 'right' ? ' style="float:' + ci['floatStyle'] + ';"' : '') +
+                (ci.title && ci.title != "" ? ' title="' + ci.title + '"' : '') +
+                (ci.border && ci.border != "0" ? ' border="' + ci.border + '"' : '') +
+                (ci.alt && ci.alt != "" ? ' alt="' + ci.alt + '"' : '') +
+                (ci.hspace && ci.hspace != "0" ? ' hspace = "' + ci.hspace + '"' : '') +
+                (ci.vspace && ci.vspace != "0" ? ' vspace = "' + ci.vspace + '"' : '') + '/>';
+            if (ci['floatStyle'] == 'center') {
+                str = '<p style="text-align: center">' + str + '</p>';
+            }
+            html.push(str);
+
+        } else {
+            for (var i = 0; ci = opt[i++];) {
+                str = '<p ' + (ci['floatStyle'] == 'center' ? 'style="text-align: center" ' : '') + '><img src="' + ci.src + '" ' +
+                    (ci.width ? 'width="' + ci.width + '" ' : '') + (ci._src ? ' _src="' + ci._src + '" ' : '') +
+                    (ci.height ? ' height="' + ci.height + '" ' : '') +
+                    ' style="' + (ci['floatStyle'] && ci['floatStyle'] != 'center' ? 'float:' + ci['floatStyle'] + ';' : '') +
+                    (ci.border || '') + '" ' +
+                    (ci.title ? ' title="' + ci.title + '"' : '') + ' /></p>';
+                html.push(str);
+            }
+        }
+
+        me.execCommand('insertHtml', html.join(''), true);
+    }
+};
+///import core
+///commands 段落格式,居左,居右,居中,两端对齐
+///commandsName  JustifyLeft,JustifyCenter,JustifyRight,JustifyJustify
+///commandsTitle  居左对齐,居中对齐,居右对齐,两端对齐
+/**
+ * @description 居左右中
+ * @name UM.execCommand
+ * @param   {String}   cmdName     justify执行对齐方式的命令
+ * @param   {String}   align               对齐方式：left居左，right居右，center居中，justify两端对齐
+ * @author zhanyi
+ */
+UM.plugins['justify']=function(){
+    var me = this;
+    $.each('justifyleft justifyright justifycenter justifyfull'.split(' '),function(i,cmdName){
+        me.commands[cmdName] = {
+            execCommand:function (cmdName) {
+                return this.document.execCommand(cmdName);
+            },
+            queryCommandValue: function (cmdName) {
+                var val = this.document.queryCommandValue(cmdName);
+                return   val === true || val === 'true' ? cmdName.replace(/justify/,'') : '';
+            },
+            queryCommandState: function (cmdName) {
+                return this.document.queryCommandState(cmdName) ? 1 : 0
+            }
+        };
+    })
+};
+
+///import core
+///import plugins\removeformat.js
+///commands 字体颜色,背景色,字号,字体,下划线,删除线
+///commandsName  ForeColor,BackColor,FontSize,FontFamily,Underline,StrikeThrough
+///commandsTitle  字体颜色,背景色,字号,字体,下划线,删除线
+/**
+ * @description 字体
+ * @name UM.execCommand
+ * @param {String}     cmdName    执行的功能名称
+ * @param {String}    value             传入的值
+ */
+UM.plugins['font'] = function () {
+    var me = this,
+        fonts = {
+            'forecolor': 'forecolor',
+            'backcolor': 'backcolor',
+            'fontsize': 'fontsize',
+            'fontfamily': 'fontname'
+        },
+        cmdNameToStyle = {
+            'forecolor': 'color',
+            'backcolor': 'background-color',
+            'fontsize': 'font-size',
+            'fontfamily': 'font-family'
+        },
+        cmdNameToAttr = {
+            'forecolor': 'color',
+            'fontsize': 'size',
+            'fontfamily': 'face'
+        };
+    me.setOpt({
+        'fontfamily': [
+            { name: 'songti', val: '宋体,SimSun'},
+            { name: 'yahei', val: '微软雅黑,Microsoft YaHei'},
+            { name: 'kaiti', val: '楷体,楷体_GB2312, SimKai'},
+            { name: 'heiti', val: '黑体, SimHei'},
+            { name: 'lishu', val: '隶书, SimLi'},
+            { name: 'andaleMono', val: 'andale mono'},
+            { name: 'arial', val: 'arial, helvetica,sans-serif'},
+            { name: 'arialBlack', val: 'arial black,avant garde'},
+            { name: 'comicSansMs', val: 'comic sans ms'},
+            { name: 'impact', val: 'impact,chicago'},
+            { name: 'timesNewRoman', val: 'times new roman'},
+            { name: 'sans-serif',val:'sans-serif'}
+        ],
+        'fontsize': [10, 12,  16, 18,24, 32,48]
+    });
+
+    me.addOutputRule(function (root) {
+        utils.each(root.getNodesByTagName('font'), function (node) {
+            if (node.tagName == 'font') {
+                var cssStyle = [];
+                for (var p in node.attrs) {
+                    switch (p) {
+                        case 'size':
+                            var val =  node.attrs[p];
+                            $.each({
+                                '10':'1',
+                                '12':'2',
+                                '16':'3',
+                                '18':'4',
+                                '24':'5',
+                                '32':'6',
+                                '48':'7'
+                            },function(k,v){
+                                if(v == val){
+                                    val = k;
+                                    return false;
+                                }
+                            });
+                            cssStyle.push('font-size:' + val + 'px');
+                            break;
+                        case 'color':
+                            cssStyle.push('color:' + node.attrs[p]);
+                            break;
+                        case 'face':
+                            cssStyle.push('font-family:' + node.attrs[p]);
+                            break;
+                        case 'style':
+                            cssStyle.push(node.attrs[p]);
+                    }
+                }
+                node.attrs = {
+                    'style': cssStyle.join(';')
+                };
+            }
+            node.tagName = 'span';
+            if(node.parentNode.tagName == 'span' && node.parentNode.children.length == 1){
+                $.each(node.attrs,function(k,v){
+
+                    node.parentNode.attrs[k] = k == 'style' ? node.parentNode.attrs[k] + v : v;
+                })
+                node.parentNode.removeChild(node,true);
+            }
+        });
+    });
+    for(var p in fonts){
+        (function (cmd) {
+            me.commands[cmd] = {
+                execCommand: function (cmdName,value) {
+                    if(value == 'transparent'){
+                        return;
+                    }
+                    var rng = this.selection.getRange();
+                    if(rng.collapsed){
+                        var span = $('<span></span>').css(cmdNameToStyle[cmdName],value)[0];
+                        rng.insertNode(span).setStart(span,0).setCursor();
+                    }else{
+                        if(cmdName == 'fontsize'){
+                            value  = {
+                                '10':'1',
+                                '12':'2',
+                                '16':'3',
+                                '18':'4',
+                                '24':'5',
+                                '32':'6',
+                                '48':'7'
+                            }[(value+"").replace(/px/,'')]
+                        }
+                        this.document.execCommand(fonts[cmdName],false, value);
+                        if(browser.gecko){
+                            $.each(this.$body.find('a'),function(i,a){
+                                var parent = a.parentNode;
+                                if(parent.lastChild === parent.firstChild && /FONT|SPAN/.test(parent.tagName)){
+                                    var cloneNode = parent.cloneNode(false);
+                                    cloneNode.innerHTML = a.innerHTML;
+                                    $(a).html('').append(cloneNode).insertBefore(parent);
+
+                                    $(parent).remove();
+                                }
+                            });
+                        }
+                        if(!browser.ie){
+                            var nativeRange = this.selection.getNative().getRangeAt(0);
+                            var common = nativeRange.commonAncestorContainer;
+                            var rng = this.selection.getRange(),
+                                bk = rng.createBookmark(true);
+
+                            $(common).find('a').each(function(i,n){
+                                var parent = n.parentNode;
+                                if(parent.nodeName == 'FONT'){
+                                    var font = parent.cloneNode(false);
+                                    font.innerHTML = n.innerHTML;
+                                    $(n).html('').append(font);
+                                }
+                            });
+                            rng.moveToBookmark(bk).select()
+                        }
+                        return true
+                    }
+
+                },
+                queryCommandValue: function (cmdName) {
+                    var start = me.selection.getStart();
+                    var val = $(start).css(cmdNameToStyle[cmdName]);
+                    if(val === undefined){
+                        val = $(start).attr(cmdNameToAttr[cmdName])
+                    }
+                    return val ? utils.fixColor(cmdName,val).replace(/px/,'') : '';
+                },
+                queryCommandState: function (cmdName) {
+                    return this.queryCommandValue(cmdName)
+                }
+            };
+        })(p);
+    }
+};
+///import core
+///commands 超链接,取消链接
+///commandsName  Link,Unlink
+///commandsTitle  超链接,取消链接
+///commandsDialog  dialogs\link
+/**
+ * 超链接
+ * @function
+ * @name UM.execCommand
+ * @param   {String}   cmdName     link插入超链接
+ * @param   {Object}  options         url地址，title标题，target是否打开新页
+ * @author zhanyi
+ */
+/**
+ * 取消链接
+ * @function
+ * @name UM.execCommand
+ * @param   {String}   cmdName     unlink取消链接
+ * @author zhanyi
+ */
+
+UM.plugins['link'] = function(){
+    var me = this;
+
+    me.setOpt('autourldetectinie',false);
+    //在ie下禁用autolink
+    if(browser.ie && this.options.autourldetectinie === false){
+        this.addListener('keyup',function(cmd,evt){
+            var me = this,keyCode = evt.keyCode;
+            if(keyCode == 13 || keyCode == 32){
+                var rng = me.selection.getRange();
+                var start = rng.startContainer;
+                if(keyCode == 13){
+                    if(start.nodeName == 'P'){
+                        var pre = start.previousSibling;
+                        if(pre && pre.nodeType == 1){
+                            var pre = pre.lastChild;
+                            if(pre && pre.nodeName == 'A' && !pre.getAttribute('_href')){
+                                domUtils.remove(pre,true);
+                            }
+                        }
+                    }
+                }else if(keyCode == 32){
+                   if(start.nodeType == 3 && /^\s$/.test(start.nodeValue)){
+                       start = start.previousSibling;
+                       if(start && start.nodeName == 'A' && !start.getAttribute('_href')){
+                           domUtils.remove(start,true);
+                       }
+                   }
+                }
+
+            }
+
+
+        });
+    }
+
+    this.addOutputRule(function(root){
+        $.each(root.getNodesByTagName('a'),function(i,a){
+            var _href = a.getAttr('href');
+            if(!/^(ftp|https?|\/|file)/.test(_href)){
+                _href = 'http://' + _href;
+            }
+            if(_href!='http://undefined'){
+            	a.setAttr('href', _href);
+            }
+            a.setAttr('_href')
+            if(a.getAttr('title')==''){
+                a.setAttr('title')
+            }
+        })
+    });
+    this.addInputRule(function(root){
+        $.each(root.getNodesByTagName('a'),function(i,a){
+            a.setAttr('_href', a.getAttr('href'));
+        })
+    });
+    me.commands['link'] = {
+        execCommand : function( cmdName, opt ) {
+
+            var me = this;
+            var rng = me.selection.getRange();
+            opt._href && (opt._href = utils.unhtml(opt._href, /[<">'](?:(amp|lt|quot|gt|#39|nbsp);)?/g));
+            opt.href && (opt.href = utils.unhtml(opt.href, /[<">'](?:(amp|lt|quot|gt|#39|nbsp);)?/g));
+            if(rng.collapsed){
+                var start = rng.startContainer;
+                if(start = domUtils.findParentByTagName(start,'a',true)){
+                    $(start).attr(opt);
+                    rng.selectNode(start).select()
+                }else{
+                    rng.insertNode($('<a>' + opt.href +'</a>').attr(opt)[0]).select()
+
+                }
+
+            }else{
+                me.document.execCommand('createlink',false,'_umeditor_link');
+                utils.each(domUtils.getElementsByTagName(me.body,'a',function(n){
+
+                    return n.getAttribute('href') == '_umeditor_link'
+                }),function(l){
+                    if($(l).text() == '_umeditor_link'){
+                        $(l).text(opt.href);
+                    }
+                    domUtils.setAttributes(l,opt);
+                    rng.selectNode(l).select()
+                })
+            }
+
+        },
+        queryCommandState:function(){
+            return this.queryCommandValue('link') ? 1 : 0;
+        },
+        queryCommandValue:function(){
+            var path = this.selection.getStartElementPath();
+            var result;
+            $.each(path,function(i,n){
+                if(n.nodeName == "A"){
+                    result = n;
+                    return false;
+                }
+            })
+            return result;
+        }
+    };
+    me.commands['unlink'] = {
+        execCommand : function() {
+            this.document.execCommand('unlink');
+        }
+    };
+};
+///import core
+///commands 打印
+///commandsName  Print
+///commandsTitle  打印
+/**
+ * @description 打印
+ * @name baidu.editor.execCommand
+ * @param   {String}   cmdName     print打印编辑器内容
+ * @author zhanyi
+ */
+UM.commands['print'] = {
+    execCommand : function(){
+        var me = this,
+            id = 'editor_print_' + +new Date();
+
+        $('<iframe src="" id="' + id + '" name="' + id + '" frameborder="0"></iframe>').attr('id', id)
+            .css({
+                width:'0px',
+                height:'0px',
+                'overflow':'hidden',
+                'float':'left',
+                'position':'absolute',
+                top:'-10000px',
+                left:'-10000px'
+            })
+            .appendTo(me.$container.find('.edui-dialog-container'));
+
+        var w = window.open('', id, ''),
+            d = w.document;
+        d.open();
+        d.write('<html><head></head><body><div>'+this.getContent(null,null,true)+'</div><script>' +
+            "setTimeout(function(){" +
+            "window.print();" +
+            "setTimeout(function(){" +
+            "window.parent.$('#" + id + "').remove();" +
+            "},100);" +
+            "},200);" +
+            '</script></body></html>');
+        d.close();
+    },
+    notNeedUndo : 1
+};
+///import core
+///commands 格式
+///commandsName  Paragraph
+///commandsTitle  段落格式
+/**
+ * 段落样式
+ * @function
+ * @name UM.execCommand
+ * @param   {String}   cmdName     paragraph插入段落执行命令
+ * @param   {String}   style               标签值为：'p', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6'
+ * @param   {String}   attrs               标签的属性
+ * @author zhanyi
+ */
+UM.plugins['paragraph'] = function() {
+    var me = this;
+    me.setOpt('paragraph',{'p':'', 'h1':'', 'h2':'', 'h3':'', 'h4':'', 'h5':'', 'h6':''});
+    me.commands['paragraph'] = {
+        execCommand : function( cmdName, style ) {
+            return this.document.execCommand('formatBlock',false,'<' + style + '>');
+        },
+        queryCommandValue : function() {
+            try{
+                var  val = this.document.queryCommandValue('formatBlock')
+            }catch(e){
+            }
+            return val ;
+        }
+    };
+};
+
+///import core
+///import plugins\inserthtml.js
+///commands 分割线
+///commandsName  Horizontal
+///commandsTitle  分隔线
+/**
+ * 分割线
+ * @function
+ * @name UM.execCommand
+ * @param {String}     cmdName    horizontal插入分割线
+ */
+UM.plugins['horizontal'] = function(){
+    var me = this;
+    me.commands['horizontal'] = {
+        execCommand : function(  ) {
+            this.document.execCommand('insertHorizontalRule');
+            var rng = me.selection.getRange().txtToElmBoundary(true),
+                start = rng.startContainer;
+            if(domUtils.isBody(rng.startContainer)){
+                var next = rng.startContainer.childNodes[rng.startOffset];
+                if(!next){
+                    next = $('<p></p>').appendTo(rng.startContainer).html(browser.ie ? '&nbsp;' : '<br/>')[0]
+                }
+                rng.setStart(next,0).setCursor()
+            }else{
+
+                while(dtd.$inline[start.tagName] && start.lastChild === start.firstChild){
+
+                    var parent = start.parentNode;
+                    parent.appendChild(start.firstChild);
+                    parent.removeChild(start);
+                    start = parent;
+                }
+                while(dtd.$inline[start.tagName]){
+                    start = start.parentNode;
+                }
+                if(start.childNodes.length == 1 && start.lastChild.nodeName == 'HR'){
+                    var hr = start.lastChild;
+                    $(hr).insertBefore(start);
+                    rng.setStart(start,0).setCursor();
+                }else{
+                    hr = $('hr',start)[0];
+                    domUtils.breakParent(hr,start);
+                    var pre = hr.previousSibling;
+                    if(pre && domUtils.isEmptyBlock(pre)){
+                        $(pre).remove()
+                    }
+                    rng.setStart(hr.nextSibling,0).setCursor();
+                }
+
+            }
+        }
+    };
+
+};
+
+
+///import core
+///commands 清空文档
+///commandsName  ClearDoc
+///commandsTitle  清空文档
+/**
+ *
+ * 清空文档
+ * @function
+ * @name UM.execCommand
+ * @param   {String}   cmdName     cleardoc清空文档
+ */
+
+UM.commands['cleardoc'] = {
+    execCommand : function() {
+        var me = this,
+            range = me.selection.getRange();
+        me.body.innerHTML = "<p>"+(ie ? "" : "<br/>")+"</p>";
+        range.setStart(me.body.firstChild,0).setCursor(false,true);
+        setTimeout(function(){
+            me.fireEvent("clearDoc");
+        },0);
+
+    }
+};
+
+
+///import core
+///commands 撤销和重做
+///commandsName  Undo,Redo
+///commandsTitle  撤销,重做
+/**
+ * @description 回退
+ * @author zhanyi
+ */
+
+UM.plugins['undo'] = function () {
+    var saveSceneTimer;
+    var me = this,
+        maxUndoCount = me.options.maxUndoCount || 20,
+        maxInputCount = me.options.maxInputCount || 20,
+        fillchar = new RegExp(domUtils.fillChar + '|<\/hr>', 'gi');// ie会产生多余的</hr>
+    var noNeedFillCharTags = {
+        ol:1,ul:1,table:1,tbody:1,tr:1,body:1
+    };
+    var orgState = me.options.autoClearEmptyNode;
+    function compareAddr(indexA, indexB) {
+        if (indexA.length != indexB.length)
+            return 0;
+        for (var i = 0, l = indexA.length; i < l; i++) {
+            if (indexA[i] != indexB[i])
+                return 0
+        }
+        return 1;
+    }
+
+    function compareRangeAddress(rngAddrA, rngAddrB) {
+        if (rngAddrA.collapsed != rngAddrB.collapsed) {
+            return 0;
+        }
+        if (!compareAddr(rngAddrA.startAddress, rngAddrB.startAddress) || !compareAddr(rngAddrA.endAddress, rngAddrB.endAddress)) {
+            return 0;
+        }
+        return 1;
+    }
+
+    function UndoManager() {
+        this.list = [];
+        this.index = 0;
+        this.hasUndo = false;
+        this.hasRedo = false;
+        this.undo = function () {
+            if (this.hasUndo) {
+                if (!this.list[this.index - 1] && this.list.length == 1) {
+                    this.reset();
+                    return;
+                }
+                while (this.list[this.index].content == this.list[this.index - 1].content) {
+                    this.index--;
+                    if (this.index == 0) {
+                        return this.restore(0);
+                    }
+                }
+                this.restore(--this.index);
+            }
+        };
+        this.redo = function () {
+            if (this.hasRedo) {
+                while (this.list[this.index].content == this.list[this.index + 1].content) {
+                    this.index++;
+                    if (this.index == this.list.length - 1) {
+                        return this.restore(this.index);
+                    }
+                }
+                this.restore(++this.index);
+            }
+        };
+
+        this.restore = function () {
+            var me = this.editor;
+            var scene = this.list[this.index];
+            var root = UM.htmlparser(scene.content.replace(fillchar, ''));
+            me.options.autoClearEmptyNode = false;
+            me.filterInputRule(root,true);
+            me.options.autoClearEmptyNode = orgState;
+            //trace:873
+            //去掉展位符
+            me.body.innerHTML = root.toHtml();
+            me.fireEvent('afterscencerestore');
+            //处理undo后空格不展位的问题
+            if (browser.ie) {
+                utils.each(domUtils.getElementsByTagName(me.document,'td th caption p'),function(node){
+                    if(domUtils.isEmptyNode(node)){
+                        domUtils.fillNode(me.document, node);
+                    }
+                })
+            }
+
+            try{
+                var rng = new dom.Range(me.document,me.body).moveToAddress(scene.address);
+                if(browser.ie && rng.collapsed && rng.startContainer.nodeType == 1){
+                    var tmpNode = rng.startContainer.childNodes[rng.startOffset];
+                    if( !tmpNode || tmpNode.nodeType == 1 && dtd.$empty[tmpNode]){
+                        rng.insertNode(me.document.createTextNode(' ')).collapse(true);
+                    }
+                }
+                rng.select(noNeedFillCharTags[rng.startContainer.nodeName.toLowerCase()]);
+            }catch(e){}
+
+            this.update();
+            this.clearKey();
+            //不能把自己reset了
+            me.fireEvent('reset', true);
+        };
+
+        this.getScene = function () {
+            var me = this.editor;
+            var rng = me.selection.getRange(),
+                rngAddress = rng.createAddress(false,true);
+            me.fireEvent('beforegetscene');
+            var root = UM.htmlparser(me.body.innerHTML,true);
+            me.options.autoClearEmptyNode = false;
+            me.filterOutputRule(root,true);
+            me.options.autoClearEmptyNode = orgState;
+            var cont = root.toHtml();
+            browser.ie && (cont = cont.replace(/>&nbsp;</g, '><').replace(/\s*</g, '<').replace(/>\s*/g, '>'));
+            me.fireEvent('aftergetscene');
+            return {
+                address:rngAddress,
+                content:cont
+            }
+        };
+        this.save = function (notCompareRange,notSetCursor) {
+            clearTimeout(saveSceneTimer);
+            var currentScene = this.getScene(notSetCursor),
+                lastScene = this.list[this.index];
+            //内容相同位置相同不存
+            if (lastScene && lastScene.content == currentScene.content &&
+                ( notCompareRange ? 1 : compareRangeAddress(lastScene.address, currentScene.address) )
+                ) {
+                return;
+            }
+            this.list = this.list.slice(0, this.index + 1);
+            this.list.push(currentScene);
+            //如果大于最大数量了，就把最前的剔除
+            if (this.list.length > maxUndoCount) {
+                this.list.shift();
+            }
+            this.index = this.list.length - 1;
+            this.clearKey();
+            //跟新undo/redo状态
+            this.update();
+
+        };
+        this.update = function () {
+            this.hasRedo = !!this.list[this.index + 1];
+            this.hasUndo = !!this.list[this.index - 1];
+        };
+        this.reset = function () {
+            this.list = [];
+            this.index = 0;
+            this.hasUndo = false;
+            this.hasRedo = false;
+            this.clearKey();
+        };
+        this.clearKey = function () {
+            keycont = 0;
+            lastKeyCode = null;
+        };
+    }
+
+    me.undoManger = new UndoManager();
+    me.undoManger.editor = me;
+    function saveScene() {
+        this.undoManger.save();
+    }
+
+    me.addListener('saveScene', function () {
+        var args = Array.prototype.splice.call(arguments,1);
+        this.undoManger.save.apply(this.undoManger,args);
+    });
+
+    me.addListener('beforeexeccommand', saveScene);
+    me.addListener('afterexeccommand', saveScene);
+
+    me.addListener('reset', function (type, exclude) {
+        if (!exclude) {
+            this.undoManger.reset();
+        }
+    });
+    me.commands['redo'] = me.commands['undo'] = {
+        execCommand:function (cmdName) {
+            this.undoManger[cmdName]();
+        },
+        queryCommandState:function (cmdName) {
+            return this.undoManger['has' + (cmdName.toLowerCase() == 'undo' ? 'Undo' : 'Redo')] ? 0 : -1;
+        },
+        notNeedUndo:1
+    };
+
+    var keys = {
+            //  /*Backspace*/ 8:1, /*Delete*/ 46:1,
+            /*Shift*/ 16:1, /*Ctrl*/ 17:1, /*Alt*/ 18:1,
+            37:1, 38:1, 39:1, 40:1
+
+        },
+        keycont = 0,
+        lastKeyCode;
+    //输入法状态下不计算字符数
+    var inputType = false;
+    me.addListener('ready', function () {
+        $(this.body).on('compositionstart', function () {
+            inputType = true;
+        }).on('compositionend', function () {
+            inputType = false;
+        })
+    });
+    //快捷键
+    me.addshortcutkey({
+        "Undo":"ctrl+90", //undo
+        "Redo":"ctrl+89,shift+ctrl+z" //redo
+
+    });
+    var isCollapsed = true;
+    me.addListener('keydown', function (type, evt) {
+
+        var me = this;
+        var keyCode = evt.keyCode || evt.which;
+        if (!keys[keyCode] && !evt.ctrlKey && !evt.metaKey && !evt.shiftKey && !evt.altKey) {
+            if (inputType)
+                return;
+
+            if(!me.selection.getRange().collapsed){
+                me.undoManger.save(false,true);
+                isCollapsed = false;
+                return;
+            }
+            if (me.undoManger.list.length == 0) {
+                me.undoManger.save(true);
+            }
+            clearTimeout(saveSceneTimer);
+            function save(cont){
+
+                if (cont.selection.getRange().collapsed)
+                    cont.fireEvent('contentchange');
+                cont.undoManger.save(false,true);
+                cont.fireEvent('selectionchange');
+            }
+            saveSceneTimer = setTimeout(function(){
+                if(inputType){
+                    var interalTimer = setInterval(function(){
+                        if(!inputType){
+                            save(me);
+                            clearInterval(interalTimer)
+                        }
+                    },300)
+                    return;
+                }
+                save(me);
+            },200);
+
+            lastKeyCode = keyCode;
+            keycont++;
+            if (keycont >= maxInputCount ) {
+                save(me)
+            }
+        }
+    });
+    me.addListener('keyup', function (type, evt) {
+        var keyCode = evt.keyCode || evt.which;
+        if (!keys[keyCode] && !evt.ctrlKey && !evt.metaKey && !evt.shiftKey && !evt.altKey) {
+            if (inputType)
+                return;
+            if(!isCollapsed){
+                this.undoManger.save(false,true);
+                isCollapsed = true;
+            }
+        }
+    });
+
+};
+
+///import core
+///import plugins/inserthtml.js
+///import plugins/undo.js
+///import plugins/serialize.js
+///commands 粘贴
+///commandsName  PastePlain
+///commandsTitle  纯文本粘贴模式
+/**
+ * @description 粘贴
+ * @author zhanyi
+ */
+UM.plugins['paste'] = function () {
+    function getClipboardData(callback) {
+        var doc = this.document;
+        if (doc.getElementById('baidu_pastebin')) {
+            return;
+        }
+        var range = this.selection.getRange(),
+            bk = range.createBookmark(),
+        //创建剪贴的容器div
+            pastebin = doc.createElement('div');
+        pastebin.id = 'baidu_pastebin';
+        // Safari 要求div必须有内容，才能粘贴内容进来
+        browser.webkit && pastebin.appendChild(doc.createTextNode(domUtils.fillChar + domUtils.fillChar));
+        this.body.appendChild(pastebin);
+        //trace:717 隐藏的span不能得到top
+        //bk.start.innerHTML = '&nbsp;';
+        bk.start.style.display = '';
+
+        pastebin.style.cssText = "position:absolute;width:1px;height:1px;overflow:hidden;left:-1000px;white-space:nowrap;top:" +
+        //要在现在光标平行的位置加入，否则会出现跳动的问题
+        $(bk.start).position().top  + 'px';
+
+        range.selectNodeContents(pastebin).select(true);
+
+        setTimeout(function () {
+            if (browser.webkit) {
+                for (var i = 0, pastebins = doc.querySelectorAll('#baidu_pastebin'), pi; pi = pastebins[i++];) {
+                    if (domUtils.isEmptyNode(pi)) {
+                        domUtils.remove(pi);
+                    } else {
+                        pastebin = pi;
+                        break;
+                    }
+                }
+            }
+            try {
+                pastebin.parentNode.removeChild(pastebin);
+            } catch (e) {
+            }
+            range.moveToBookmark(bk).select(true);
+            callback(pastebin);
+        }, 0);
+    }
+
+    var me = this;
+
+
+    function filter(div) {
+        var html;
+        if (div.firstChild) {
+            //去掉cut中添加的边界值
+            var nodes = domUtils.getElementsByTagName(div, 'span');
+            for (var i = 0, ni; ni = nodes[i++];) {
+                if (ni.id == '_baidu_cut_start' || ni.id == '_baidu_cut_end') {
+                    domUtils.remove(ni);
+                }
+            }
+
+            if (browser.webkit) {
+
+                var brs = div.querySelectorAll('div br');
+                for (var i = 0, bi; bi = brs[i++];) {
+                    var pN = bi.parentNode;
+                    if (pN.tagName == 'DIV' && pN.childNodes.length == 1) {
+                        pN.innerHTML = '<p><br/></p>';
+                        domUtils.remove(pN);
+                    }
+                }
+                var divs = div.querySelectorAll('#baidu_pastebin');
+                for (var i = 0, di; di = divs[i++];) {
+                    var tmpP = me.document.createElement('p');
+                    di.parentNode.insertBefore(tmpP, di);
+                    while (di.firstChild) {
+                        tmpP.appendChild(di.firstChild);
+                    }
+                    domUtils.remove(di);
+                }
+
+                var metas = div.querySelectorAll('meta');
+                for (var i = 0, ci; ci = metas[i++];) {
+                    domUtils.remove(ci);
+                }
+
+                var brs = div.querySelectorAll('br');
+                for (i = 0; ci = brs[i++];) {
+                    if (/^apple-/i.test(ci.className)) {
+                        domUtils.remove(ci);
+                    }
+                }
+            }
+            if (browser.gecko) {
+                var dirtyNodes = div.querySelectorAll('[_moz_dirty]');
+                for (i = 0; ci = dirtyNodes[i++];) {
+                    ci.removeAttribute('_moz_dirty');
+                }
+            }
+            if (!browser.ie) {
+                var spans = div.querySelectorAll('span.Apple-style-span');
+                for (var i = 0, ci; ci = spans[i++];) {
+                    domUtils.remove(ci, true);
+                }
+            }
+
+            //ie下使用innerHTML会产生多余的\r\n字符，也会产生&nbsp;这里过滤掉
+            html = div.innerHTML;//.replace(/>(?:(\s|&nbsp;)*?)</g,'><');
+
+            //过滤word粘贴过来的冗余属性
+            html = UM.filterWord(html);
+            //取消了忽略空白的第二个参数，粘贴过来的有些是有空白的，会被套上相关的标签
+            var root = UM.htmlparser(html);
+            //如果给了过滤规则就先进行过滤
+            if (me.options.filterRules) {
+                UM.filterNode(root, me.options.filterRules);
+            }
+            //执行默认的处理
+            me.filterInputRule(root);
+            //针对chrome的处理
+            if (browser.webkit) {
+                var br = root.lastChild();
+                if (br && br.type == 'element' && br.tagName == 'br') {
+                    root.removeChild(br)
+                }
+                utils.each(me.body.querySelectorAll('div'), function (node) {
+                    if (domUtils.isEmptyBlock(node)) {
+                        domUtils.remove(node)
+                    }
+                })
+            }
+            html = {'html': root.toHtml()};
+            me.fireEvent('beforepaste', html, root);
+            //抢了默认的粘贴，那后边的内容就不执行了，比如表格粘贴
+            if(!html.html){
+                return;
+            }
+
+            me.execCommand('insertHtml', html.html, true);
+            me.fireEvent("afterpaste", html);
+        }
+    }
+
+
+    me.addListener('ready', function () {
+        $(me.body).on( 'cut', function () {
+            var range = me.selection.getRange();
+            if (!range.collapsed && me.undoManger) {
+                me.undoManger.save();
+            }
+        }).on(browser.ie || browser.opera ? 'keydown' : 'paste', function (e) {
+            //ie下beforepaste在点击右键时也会触发，所以用监控键盘才处理
+            if ((browser.ie || browser.opera) && ((!e.ctrlKey && !e.metaKey) || e.keyCode != '86')) {
+                return;
+            }
+            getClipboardData.call(me, function (div) {
+                filter(div);
+            });
+        });
+
+    });
+};
+
+
+///import core
+///commands 有序列表,无序列表
+///commandsName  InsertOrderedList,InsertUnorderedList
+///commandsTitle  有序列表,无序列表
+/**
+ * 有序列表
+ * @function
+ * @name UM.execCommand
+ * @param   {String}   cmdName     insertorderlist插入有序列表
+ * @param   {String}   style               值为：decimal,lower-alpha,lower-roman,upper-alpha,upper-roman
+ * @author zhanyi
+ */
+/**
+ * 无序链接
+ * @function
+ * @name UM.execCommand
+ * @param   {String}   cmdName     insertunorderlist插入无序列表
+ * * @param   {String}   style            值为：circle,disc,square
+ * @author zhanyi
+ */
+
+UM.plugins['list'] = function () {
+    var me = this;
+
+    me.setOpt( {
+        'insertorderedlist':{
+            'decimal':'',
+            'lower-alpha':'',
+            'lower-roman':'',
+            'upper-alpha':'',
+            'upper-roman':''
+        },
+        'insertunorderedlist':{
+            'circle':'',
+            'disc':'',
+            'square':''
+        }
+    } );
+
+    this.addInputRule(function(root){
+        utils.each(root.getNodesByTagName('li'), function (node) {
+            if(node.children.length == 0){
+                node.parentNode.removeChild(node);
+            }
+        })
+    });
+    me.commands['insertorderedlist'] =
+    me.commands['insertunorderedlist'] = {
+            execCommand:function (cmdName) {
+                this.document.execCommand(cmdName);
+                var rng = this.selection.getRange(),
+                    bk = rng.createBookmark(true);
+
+                this.$body.find('ol,ul').each(function(i,n){
+                    var parent = n.parentNode;
+                    if(parent.tagName == 'P' && parent.lastChild === parent.firstChild){
+                        $(n).children().each(function(j,li){
+                            var p = parent.cloneNode(false);
+                            $(p).append(li.innerHTML);
+                            $(li).html('').append(p);
+                        });
+                        $(n).insertBefore(parent);
+                        $(parent).remove();
+                    }
+
+                    if(dtd.$inline[parent.tagName]){
+                        if(parent.tagName == 'SPAN'){
+
+                            $(n).children().each(function(k,li){
+                                var span = parent.cloneNode(false);
+                                if(li.firstChild.nodeName != 'P'){
+
+                                    while(li.firstChild){
+                                        span.appendChild(li.firstChild)
+                                    };
+                                    $('<p></p>').appendTo(li).append(span);
+                                }else{
+                                    while(li.firstChild){
+                                        span.appendChild(li.firstChild)
+                                    };
+                                    $(li.firstChild).append(span);
+                                }
+                            })
+
+                        }
+                        domUtils.remove(parent,true)
+                    }
+                });
+
+
+
+
+                rng.moveToBookmark(bk).select();
+                return true;
+            },
+            queryCommandState:function (cmdName) {
+                return this.document.queryCommandState(cmdName);
+            }
+        };
+};
+
+
+///import core
+///import plugins/serialize.js
+///import plugins/undo.js
+///commands 查看源码
+///commandsName  Source
+///commandsTitle  查看源码
+(function (){
+    var sourceEditors = {
+        textarea: function (editor, holder){
+            var textarea = holder.ownerDocument.createElement('textarea');
+            textarea.style.cssText = 'resize:none;border:0;padding:0;margin:0;overflow-y:auto;outline:0';
+            // todo: IE下只有onresize属性可用... 很纠结
+            if (browser.ie && browser.version < 8) {
+
+                textarea.style.width = holder.offsetWidth + 'px';
+                textarea.style.height = holder.offsetHeight + 'px';
+                holder.onresize = function (){
+                    textarea.style.width = holder.offsetWidth + 'px';
+                    textarea.style.height = holder.offsetHeight + 'px';
+                };
+            }
+            holder.appendChild(textarea);
+            return {
+                container : textarea,
+                setContent: function (content){
+                    textarea.value = content;
+                },
+                getContent: function (){
+                    return textarea.value;
+                },
+                select: function (){
+                    var range;
+                    if (browser.ie) {
+                        range = textarea.createTextRange();
+                        range.collapse(true);
+                        range.select();
+                    } else {
+                        //todo: chrome下无法设置焦点
+                        textarea.setSelectionRange(0, 0);
+                        textarea.focus();
+                    }
+                },
+                dispose: function (){
+                    holder.removeChild(textarea);
+                    // todo
+                    holder.onresize = null;
+                    textarea = null;
+                    holder = null;
+                }
+            };
+        }
+    };
+
+    UM.plugins['source'] = function (){
+        var me = this;
+        var opt = this.options;
+        var sourceMode = false;
+        var sourceEditor;
+
+        opt.sourceEditor = 'textarea';
+
+        me.setOpt({
+            sourceEditorFirst:false
+        });
+        function createSourceEditor(holder){
+            return sourceEditors.textarea(me, holder);
+        }
+
+        var bakCssText;
+        //解决在源码模式下getContent不能得到最新的内容问题
+        var oldGetContent = me.getContent,
+            bakAddress;
+
+        me.commands['source'] = {
+            execCommand: function (){
+
+                sourceMode = !sourceMode;
+                if (sourceMode) {
+                    bakAddress = me.selection.getRange().createAddress(false,true);
+                    me.undoManger && me.undoManger.save(true);
+                    if(browser.gecko){
+                        me.body.contentEditable = false;
+                    }
+
+//                    bakCssText = me.body.style.cssText;
+                    me.body.style.cssText += ';position:absolute;left:-32768px;top:-32768px;';
+
+
+                    me.fireEvent('beforegetcontent');
+                    var root = UM.htmlparser(me.body.innerHTML);
+                    me.filterOutputRule(root);
+                    root.traversal(function (node) {
+                        if (node.type == 'element') {
+                            switch (node.tagName) {
+                                case 'td':
+                                case 'th':
+                                case 'caption':
+                                    if(node.children && node.children.length == 1){
+                                        if(node.firstChild().tagName == 'br' ){
+                                            node.removeChild(node.firstChild())
+                                        }
+                                    };
+                                    break;
+                                case 'pre':
+                                    node.innerText(node.innerText().replace(/&nbsp;/g,' '))
+
+                            }
+                        }
+                    });
+
+                    me.fireEvent('aftergetcontent');
+
+                    var content = root.toHtml(true);
+
+                    sourceEditor = createSourceEditor(me.body.parentNode);
+
+                    sourceEditor.setContent(content);
+
+                    var getStyleValue=function(attr){
+                        return parseInt($(me.body).css(attr));
+                    };
+                    $(sourceEditor.container).width($(me.body).width()+getStyleValue("padding-left")+getStyleValue("padding-right"))
+                        .height($(me.body).height());
+                    setTimeout(function (){
+                        sourceEditor.select();
+                    });
+                    //重置getContent，源码模式下取值也能是最新的数据
+                    me.getContent = function (){
+                        return sourceEditor.getContent() || '<p>' + (browser.ie ? '' : '<br/>')+'</p>';
+                    };
+                } else {
+                    me.$body.css({
+                        'position':'',
+                        'left':'',
+                        'top':''
+                    });
+//                    me.body.style.cssText = bakCssText;
+                    var cont = sourceEditor.getContent() || '<p>' + (browser.ie ? '' : '<br/>')+'</p>';
+                    //处理掉block节点前后的空格,有可能会误命中，暂时不考虑
+                    cont = cont.replace(new RegExp('[\\r\\t\\n ]*<\/?(\\w+)\\s*(?:[^>]*)>','g'), function(a,b){
+                        if(b && !dtd.$inlineWithA[b.toLowerCase()]){
+                            return a.replace(/(^[\n\r\t ]*)|([\n\r\t ]*$)/g,'');
+                        }
+                        return a.replace(/(^[\n\r\t]*)|([\n\r\t]*$)/g,'')
+                    });
+                    me.setContent(cont);
+                    sourceEditor.dispose();
+                    sourceEditor = null;
+                    //还原getContent方法
+                    me.getContent = oldGetContent;
+                    var first = me.body.firstChild;
+                    //trace:1106 都删除空了，下边会报错，所以补充一个p占位
+                    if(!first){
+                        me.body.innerHTML = '<p>'+(browser.ie?'':'<br/>')+'</p>';
+                    }
+                    //要在ifm为显示时ff才能取到selection,否则报错
+                    //这里不能比较位置了
+                    me.undoManger && me.undoManger.save(true);
+                    if(browser.gecko){
+                        me.body.contentEditable = true;
+                    }
+                    try{
+                        me.selection.getRange().moveToAddress(bakAddress).select();
+                    }catch(e){}
+
+                }
+                this.fireEvent('sourcemodechanged', sourceMode);
+            },
+            queryCommandState: function (){
+                return sourceMode|0;
+            },
+            notNeedUndo : 1
+        };
+        var oldQueryCommandState = me.queryCommandState;
+
+
+        me.queryCommandState = function (cmdName){
+            cmdName = cmdName.toLowerCase();
+            if (sourceMode) {
+                //源码模式下可以开启的命令
+                return cmdName in {
+                    'source' : 1,
+                    'fullscreen' : 1
+                } ? oldQueryCommandState.apply(this, arguments)  : -1
+            }
+            return oldQueryCommandState.apply(this, arguments);
+        };
+
+    };
+
+})();
+///import core
+///import plugins/undo.js
+///commands 设置回车标签p或br
+///commandsName  EnterKey
+///commandsTitle  设置回车标签p或br
+/**
+ * @description 处理回车
+ * @author zhanyi
+ */
+UM.plugins['enterkey'] = function() {
+    var hTag,
+        me = this,
+        tag = me.options.enterTag;
+    me.addListener('keyup', function(type, evt) {
+
+        var keyCode = evt.keyCode || evt.which;
+        if (keyCode == 13) {
+            var range = me.selection.getRange(),
+                start = range.startContainer,
+                doSave;
+
+            //修正在h1-h6里边回车后不能嵌套p的问题
+            if (!browser.ie) {
+
+                if (/h\d/i.test(hTag)) {
+                    if (browser.gecko) {
+                        var h = domUtils.findParentByTagName(start, [ 'h1', 'h2', 'h3', 'h4', 'h5', 'h6','blockquote','caption','table'], true);
+                        if (!h) {
+                            me.document.execCommand('formatBlock', false, '<p>');
+                            doSave = 1;
+                        }
+                    } else {
+                        //chrome remove div
+                        if (start.nodeType == 1) {
+                            var tmp = me.document.createTextNode(''),div;
+                            range.insertNode(tmp);
+                            div = domUtils.findParentByTagName(tmp, 'div', true);
+                            if (div) {
+                                var p = me.document.createElement('p');
+                                while (div.firstChild) {
+                                    p.appendChild(div.firstChild);
+                                }
+                                div.parentNode.insertBefore(p, div);
+                                domUtils.remove(div);
+                                range.setStartBefore(tmp).setCursor();
+                                doSave = 1;
+                            }
+                            domUtils.remove(tmp);
+
+                        }
+                    }
+
+                    if (me.undoManger && doSave) {
+                        me.undoManger.save();
+                    }
+                }
+                //没有站位符，会出现多行的问题
+                browser.opera &&  range.select();
+            }else{
+                me.fireEvent('saveScene',true,true)
+            }
+        }
+    });
+
+    me.addListener('keydown', function(type, evt) {
+        var keyCode = evt.keyCode || evt.which;
+        if (keyCode == 13) {//回车
+            if(me.fireEvent('beforeenterkeydown')){
+                domUtils.preventDefault(evt);
+                return;
+            }
+            me.fireEvent('saveScene',true,true);
+            hTag = '';
+
+
+            var range = me.selection.getRange();
+
+            if (!range.collapsed) {
+                //跨td不能删
+                var start = range.startContainer,
+                    end = range.endContainer,
+                    startTd = domUtils.findParentByTagName(start, 'td', true),
+                    endTd = domUtils.findParentByTagName(end, 'td', true);
+                if (startTd && endTd && startTd !== endTd || !startTd && endTd || startTd && !endTd) {
+                    evt.preventDefault ? evt.preventDefault() : ( evt.returnValue = false);
+                    return;
+                }
+            }
+            if (tag == 'p') {
+
+
+                if (!browser.ie) {
+
+                    start = domUtils.findParentByTagName(range.startContainer, ['ol','ul','p', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6','blockquote','caption'], true);
+
+                    //opera下执行formatblock会在table的场景下有问题，回车在opera原生支持很好，所以暂时在opera去掉调用这个原生的command
+                    //trace:2431
+                    if (!start && !browser.opera) {
+
+                        me.document.execCommand('formatBlock', false, '<p>');
+
+                        if (browser.gecko) {
+                            range = me.selection.getRange();
+                            start = domUtils.findParentByTagName(range.startContainer, 'p', true);
+                            start && domUtils.removeDirtyAttr(start);
+                        }
+
+
+                    } else {
+                        hTag = start.tagName;
+                        start.tagName.toLowerCase() == 'p' && browser.gecko && domUtils.removeDirtyAttr(start);
+                    }
+
+                }
+
+            }
+
+        }
+    });
+
+    browser.ie && me.addListener('setDisabled',function(){
+        $(me.body).find('p').each(function(i,p){
+            if(domUtils.isEmptyBlock(p)){
+                p.innerHTML = '&nbsp;'
+            }
+        })
+    })
+};
+
+///import core
+///commands 预览
+///commandsName  Preview
+///commandsTitle  预览
+/**
+ * 预览
+ * @function
+ * @name UM.execCommand
+ * @param   {String}   cmdName     preview预览编辑器内容
+ */
+UM.commands['preview'] = {
+    execCommand : function(){
+        var w = window.open('', '_blank', ''),
+            d = w.document,
+            c = this.getContent(null,null,true),
+            path = this.getOpt('UMEDITOR_HOME_URL'),
+            formula = c.indexOf('mathquill-embedded-latex')!=-1 ?
+                '<link rel="stylesheet" href=' + path + '"third-party/mathquill/mathquill.css"/>' +
+                '<script src=' + path + '"third-party/jquery.min.js"></script>' +
+                '<script src=' + path + '"third-party/mathquill/mathquill.min.js"></script>':'';
+        d.open();
+        d.write('<html><head>' + formula + '</head><body><div>'+c+'</div></body></html>');
+        d.close();
+    },
+    notNeedUndo : 1
+};
+
+///import core
+///commands 加粗,斜体,上标,下标
+///commandsName  Bold,Italic,Subscript,Superscript
+///commandsTitle  加粗,加斜,下标,上标
+/**
+ * b u i等基础功能实现
+ * @function
+ * @name UM.execCommands
+ * @param    {String}    cmdName    bold加粗。italic斜体。subscript上标。superscript下标。
+*/
+UM.plugins['basestyle'] = function(){
+    var basestyles = ['bold','underline','superscript','subscript','italic','strikethrough'],
+        me = this;
+    //添加快捷键
+    me.addshortcutkey({
+        "Bold" : "ctrl+66",//^B
+        "Italic" : "ctrl+73", //^I
+        "Underline" : "ctrl+shift+85",//^U
+        "strikeThrough" : 'ctrl+shift+83' //^s
+    });
+    //过滤最后的产出数据
+    me.addOutputRule(function(root){
+        $.each(root.getNodesByTagName('b i u strike s'),function(i,node){
+            switch (node.tagName){
+                case 'b':
+                    node.tagName = 'strong';
+                    break;
+                case 'i':
+                    node.tagName = 'em';
+                    break;
+                case 'u':
+                    node.tagName = 'span';
+                    node.setStyle('text-decoration','underline');
+                    break;
+                case 's':
+                case 'strike':
+                    node.tagName = 'span';
+                    node.setStyle('text-decoration','line-through')
+            }
+        });
+    });
+    $.each(basestyles,function(i,cmd){
+        me.commands[cmd] = {
+            execCommand : function( cmdName ) {
+                var rng = this.selection.getRange();
+                if(rng.collapsed && this.queryCommandState(cmdName) != 1){
+                    var node = this.document.createElement({
+                        'bold':'strong',
+                        'underline':'u',
+                        'superscript':'sup',
+                        'subscript':'sub',
+                        'italic':'em',
+                        'strikethrough':'strike'
+                    }[cmdName]);
+                    rng.insertNode(node).setStart(node,0).setCursor(false);
+                    return true;
+                }else{
+                    return this.document.execCommand(cmdName)
+                }
+
+            },
+            queryCommandState : function(cmdName) {
+                if(browser.gecko){
+                    return this.document.queryCommandState(cmdName)
+                }
+                var path = this.selection.getStartElementPath(),result = false;
+                $.each(path,function(i,n){
+                    switch (cmdName){
+                        case 'bold':
+                            if(n.nodeName == 'STRONG' || n.nodeName == 'B'){
+                                result = 1;
+                                return false;
+                            }
+                            break;
+                        case 'underline':
+                            if(n.nodeName == 'U' || n.nodeName == 'SPAN' && $(n).css('text-decoration') == 'underline'){
+                                result = 1;
+                                return false;
+                            }
+                            break;
+                        case 'superscript':
+                            if(n.nodeName == 'SUP'){
+                                result = 1;
+                                return false;
+                            }
+                            break;
+                        case 'subscript':
+                            if(n.nodeName == 'SUB'){
+                                result = 1;
+                                return false;
+                            }
+                            break;
+                        case 'italic':
+                            if(n.nodeName == 'EM' || n.nodeName == 'I'){
+                                result = 1;
+                                return false;
+                            }
+                            break;
+                        case 'strikethrough':
+                            if(n.nodeName == 'S' || n.nodeName == 'STRIKE' || n.nodeName == 'SPAN' && $(n).css('text-decoration') == 'line-through'){
+                                result = 1;
+                                return false;
+                            }
+                            break;
+                    }
+                })
+                return result
+            }
+        };
+    })
+};
+
+
+///import core
+///import plugins/inserthtml.js
+///commands 视频
+///commandsName InsertVideo
+///commandsTitle  插入视频
+///commandsDialog  dialogs\video
+UM.plugins['video'] = function (){
+    var me =this,
+        div;
+
+    /**
+     * 创建插入视频字符窜
+     * @param url 视频地址
+     * @param width 视频宽度
+     * @param height 视频高度
+     * @param align 视频对齐
+     * @param toEmbed 是否以flash代替显示
+     * @param addParagraph  是否需要添加P 标签
+     */
+    function creatInsertStr(url,width,height,id,align,toEmbed){
+        return  !toEmbed ?
+
+                '<img ' + (id ? 'id="' + id+'"' : '') + ' width="'+ width +'" height="' + height + '" _url="'+url+'" class="edui-faked-video"'  +
+                ' src=' + me.options.UMEDITOR_HOME_URL+'"themes/default/images/spacer.gif" style="background:url('+me.options.UMEDITOR_HOME_URL+'themes/default/images/videologo.gif) no-repeat center center; border:1px solid gray;'+(align ? 'float:' + align + ';': '')+'" />'
+
+                :
+                '<embed type="application/x-shockwave-flash" class="edui-faked-video" pluginspage="http://www.macromedia.com/go/getflashplayer"' +
+                ' src="' + url + '" width="' + width  + '" height="' + height  + '"'  + (align ? ' style="float:' + align + '"': '') +
+                ' wmode="transparent" play="true" loop="false" menu="false" allowscriptaccess="never" allowfullscreen="true" >';
+    }
+
+    function switchImgAndEmbed(root,img2embed){
+        utils.each(root.getNodesByTagName(img2embed ? 'img' : 'embed'),function(node){
+            if(node.getAttr('class') == 'edui-faked-video'){
+
+                var html = creatInsertStr( img2embed ? node.getAttr('_url') : node.getAttr('src'),node.getAttr('width'),node.getAttr('height'),null,node.getStyle('float') || '',img2embed);
+                node.parentNode.replaceChild(UM.uNode.createElement(html),node)
+            }
+        })
+    }
+
+    me.addOutputRule(function(root){
+        switchImgAndEmbed(root,true)
+    });
+    me.addInputRule(function(root){
+        switchImgAndEmbed(root)
+    });
+
+    me.commands["insertvideo"] = {
+        execCommand: function (cmd, videoObjs){
+            videoObjs = utils.isArray(videoObjs)?videoObjs:[videoObjs];
+            var html = [],id = 'tmpVedio';
+            for(var i=0,vi,len = videoObjs.length;i<len;i++){
+                 vi = videoObjs[i];
+                 vi.url = utils.unhtml(vi.url, /[<">'](?:(amp|lt|quot|gt|#39|nbsp);)?/g);
+                 html.push(creatInsertStr( vi.url, vi.width || 420,  vi.height || 280, id + i,vi.align,false));
+            }
+            me.execCommand("inserthtml",html.join(""),true);
+
+        },
+        queryCommandState : function(){
+            var img = me.selection.getRange().getClosedNode(),
+                flag = img && (img.className == "edui-faked-video");
+            return flag ? 1 : 0;
+        }
+    };
+};
+///import core
+///commands 全选
+///commandsName  SelectAll
+///commandsTitle  全选
+/**
+ * 选中所有
+ * @function
+ * @name UM.execCommand
+ * @param   {String}   cmdName    selectall选中编辑器里的所有内容
+ * @author zhanyi
+*/
+UM.plugins['selectall'] = function(){
+    var me = this;
+    me.commands['selectall'] = {
+        execCommand : function(){
+            //去掉了原生的selectAll,因为会出现报错和当内容为空时，不能出现闭合状态的光标
+            var me = this,body = me.body,
+                range = me.selection.getRange();
+            range.selectNodeContents(body);
+            if(domUtils.isEmptyBlock(body)){
+                //opera不能自动合并到元素的里边，要手动处理一下
+                if(browser.opera && body.firstChild && body.firstChild.nodeType == 1){
+                    range.setStartAtFirst(body.firstChild);
+                }
+                range.collapse(true);
+            }
+            range.select(true);
+        },
+        notNeedUndo : 1
+    };
+
+
+    //快捷键
+    me.addshortcutkey({
+         "selectAll" : "ctrl+65"
+    });
+};
+
+//UM.plugins['removeformat'] = function () {
+//    var me = this;
+//    me.commands['removeformat'] = {
+//        execCommand: function () {
+//            me.document.execCommand('removeformat');
+//
+//            /* 处理ie8和firefox选区有链接时,清除格式的bug */
+//            if (browser.gecko || browser.ie8 || browser.webkit) {
+//                var nativeRange = this.selection.getNative().getRangeAt(0),
+//                    common = nativeRange.commonAncestorContainer,
+//                    rng = me.selection.getRange(),
+//                    bk = rng.createBookmark();
+//
+//                function isEleInBookmark(node, bk){
+//                    if ( (domUtils.getPosition(node, bk.start) & domUtils.POSITION_FOLLOWING) &&
+//                        (domUtils.getPosition(bk.end, node) & domUtils.POSITION_FOLLOWING) ) {
+//                        return true;
+//                    } else if ( (domUtils.getPosition(node, bk.start) & domUtils.POSITION_CONTAINS) ||
+//                        (domUtils.getPosition(node, bk.end) & domUtils.POSITION_CONTAINS) ) {
+//                        return true;
+//                    }
+//                    return false;
+//                }
+//
+//                $(common).find('a').each(function (k, a) {
+//                    if ( isEleInBookmark(a, bk) ) {
+//                        a.removeAttribute('style');
+//                    }
+//                });
+//
+//            }
+//        }
+//    };
+//
+//};
+//
+
+
+UM.plugins['removeformat'] = function(){
+    var me = this;
+    me.setOpt({
+        'removeFormatTags': 'b,big,code,del,dfn,em,font,i,ins,kbd,q,samp,small,span,strike,strong,sub,sup,tt,u,var',
+        'removeFormatAttributes':'class,style,lang,width,height,align,hspace,valign'
+    });
+    me.commands['removeformat'] = {
+        execCommand : function( cmdName, tags, style, attrs,notIncludeA ) {
+
+            var tagReg = new RegExp( '^(?:' + (tags || this.options.removeFormatTags).replace( /,/g, '|' ) + ')$', 'i' ) ,
+                removeFormatAttributes = style ? [] : (attrs || this.options.removeFormatAttributes).split( ',' ),
+                range = new dom.Range( this.document ),
+                bookmark,node,parent,
+                filter = function( node ) {
+                    return node.nodeType == 1;
+                };
+
+            function isRedundantSpan (node) {
+                if (node.nodeType == 3 || node.tagName.toLowerCase() != 'span'){
+                    return 0;
+                }
+                if (browser.ie) {
+                    //ie 下判断实效，所以只能简单用style来判断
+                    //return node.style.cssText == '' ? 1 : 0;
+                    var attrs = node.attributes;
+                    if ( attrs.length ) {
+                        for ( var i = 0,l = attrs.length; i<l; i++ ) {
+                            if ( attrs[i].specified ) {
+                                return 0;
+                            }
+                        }
+                        return 1;
+                    }
+                }
+                return !node.attributes.length;
+            }
+            function doRemove( range ) {
+
+                var bookmark1 = range.createBookmark();
+                if ( range.collapsed ) {
+                    range.enlarge( true );
+                }
+
+                //不能把a标签切了
+                if(!notIncludeA){
+                    var aNode = domUtils.findParentByTagName(range.startContainer,'a',true);
+                    if(aNode){
+                        range.setStartBefore(aNode);
+                    }
+
+                    aNode = domUtils.findParentByTagName(range.endContainer,'a',true);
+                    if(aNode){
+                        range.setEndAfter(aNode);
+                    }
+
+                }
+
+
+                bookmark = range.createBookmark();
+
+                node = bookmark.start;
+
+                //切开始
+                while ( (parent = node.parentNode) && !domUtils.isBlockElm( parent ) ) {
+                    domUtils.breakParent( node, parent );
+                    domUtils.clearEmptySibling( node );
+                }
+                if ( bookmark.end ) {
+                    //切结束
+                    node = bookmark.end;
+                    while ( (parent = node.parentNode) && !domUtils.isBlockElm( parent ) ) {
+                        domUtils.breakParent( node, parent );
+                        domUtils.clearEmptySibling( node );
+                    }
+
+                    //开始去除样式
+                    var current = domUtils.getNextDomNode( bookmark.start, false, filter ),
+                        next;
+                    while ( current ) {
+                        if ( current == bookmark.end ) {
+                            break;
+                        }
+
+                        next = domUtils.getNextDomNode( current, true, filter );
+
+                        if ( !dtd.$empty[current.tagName.toLowerCase()] && !domUtils.isBookmarkNode( current ) ) {
+                            if ( tagReg.test( current.tagName ) ) {
+                                if ( style ) {
+                                    domUtils.removeStyle( current, style );
+                                    if ( isRedundantSpan( current ) && style != 'text-decoration'){
+                                        domUtils.remove( current, true );
+                                    }
+                                } else {
+                                    domUtils.remove( current, true );
+                                }
+                            } else {
+                                //trace:939  不能把list上的样式去掉
+                                if(!dtd.$tableContent[current.tagName] && !dtd.$list[current.tagName]){
+                                    domUtils.removeAttributes( current, removeFormatAttributes );
+                                    if ( isRedundantSpan( current ) ){
+                                        domUtils.remove( current, true );
+                                    }
+                                }
+
+                            }
+                        }
+                        current = next;
+                    }
+                }
+                //trace:1035
+                //trace:1096 不能把td上的样式去掉，比如边框
+                var pN = bookmark.start.parentNode;
+                if(domUtils.isBlockElm(pN) && !dtd.$tableContent[pN.tagName] && !dtd.$list[pN.tagName]){
+                    domUtils.removeAttributes(  pN,removeFormatAttributes );
+                }
+                pN = bookmark.end.parentNode;
+                if(bookmark.end && domUtils.isBlockElm(pN) && !dtd.$tableContent[pN.tagName]&& !dtd.$list[pN.tagName]){
+                    domUtils.removeAttributes(  pN,removeFormatAttributes );
+                }
+                range.moveToBookmark( bookmark ).moveToBookmark(bookmark1);
+                //清除冗余的代码 <b><bookmark></b>
+                var node = range.startContainer,
+                    tmp,
+                    collapsed = range.collapsed;
+                while(node.nodeType == 1 && domUtils.isEmptyNode(node) && dtd.$removeEmpty[node.tagName]){
+                    tmp = node.parentNode;
+                    range.setStartBefore(node);
+                    //trace:937
+                    //更新结束边界
+                    if(range.startContainer === range.endContainer){
+                        range.endOffset--;
+                    }
+                    domUtils.remove(node);
+                    node = tmp;
+                }
+
+                if(!collapsed){
+                    node = range.endContainer;
+                    while(node.nodeType == 1 && domUtils.isEmptyNode(node) && dtd.$removeEmpty[node.tagName]){
+                        tmp = node.parentNode;
+                        range.setEndBefore(node);
+                        domUtils.remove(node);
+
+                        node = tmp;
+                    }
+
+
+                }
+            }
+
+
+
+            range = this.selection.getRange();
+            if(!range.collapsed) {
+                doRemove( range );
+                range.select();
+            }
+
+        }
+
+    };
+
+};
+/*
+ *   处理特殊键的兼容性问题
+ */
+UM.plugins['keystrokes'] = function() {
+    var me = this;
+    var collapsed = true;
+    me.addListener('keydown', function(type, evt) {
+        var keyCode = evt.keyCode || evt.which,
+            rng = me.selection.getRange();
+
+        //处理全选的情况
+        if(!rng.collapsed && !(evt.ctrlKey || evt.shiftKey || evt.altKey || evt.metaKey) && (keyCode >= 65 && keyCode <=90
+            || keyCode >= 48 && keyCode <= 57 ||
+            keyCode >= 96 && keyCode <= 111 || {
+            13:1,
+            8:1,
+            46:1
+        }[keyCode])
+            ){
+
+            var tmpNode = rng.startContainer;
+            if(domUtils.isFillChar(tmpNode)){
+                rng.setStartBefore(tmpNode)
+            }
+            tmpNode = rng.endContainer;
+            if(domUtils.isFillChar(tmpNode)){
+                rng.setEndAfter(tmpNode)
+            }
+            rng.txtToElmBoundary();
+            //结束边界可能放到了br的前边，要把br包含进来
+            // x[xxx]<br/>
+            if(rng.endContainer && rng.endContainer.nodeType == 1){
+                tmpNode = rng.endContainer.childNodes[rng.endOffset];
+                if(tmpNode && domUtils.isBr(tmpNode)){
+                    rng.setEndAfter(tmpNode);
+                }
+            }
+            if(rng.startOffset == 0){
+                tmpNode = rng.startContainer;
+                if(domUtils.isBoundaryNode(tmpNode,'firstChild') ){
+                    tmpNode = rng.endContainer;
+                    if(rng.endOffset == (tmpNode.nodeType == 3 ? tmpNode.nodeValue.length : tmpNode.childNodes.length) && domUtils.isBoundaryNode(tmpNode,'lastChild')){
+                        me.fireEvent('saveScene');
+                        me.body.innerHTML = '<p>'+(browser.ie ? '' : '<br/>')+'</p>';
+                        rng.setStart(me.body.firstChild,0).setCursor(false,true);
+                        me._selectionChange();
+                        return;
+                    }
+                }
+            }
+        }
+
+        //处理backspace
+        if (keyCode == 8) {
+            rng = me.selection.getRange();
+            collapsed = rng.collapsed;
+            if(me.fireEvent('delkeydown',evt)){
+                return;
+            }
+            var start,end;
+            //避免按两次删除才能生效的问题
+            if(rng.collapsed && rng.inFillChar()){
+                start = rng.startContainer;
+
+                if(domUtils.isFillChar(start)){
+                    rng.setStartBefore(start).shrinkBoundary(true).collapse(true);
+                    domUtils.remove(start)
+                }else{
+                    start.nodeValue = start.nodeValue.replace(new RegExp('^' + domUtils.fillChar ),'');
+                    rng.startOffset--;
+                    rng.collapse(true).select(true)
+                }
+            }
+            //解决选中control元素不能删除的问题
+            if (start = rng.getClosedNode()) {
+                me.fireEvent('saveScene');
+                rng.setStartBefore(start);
+                domUtils.remove(start);
+                rng.setCursor();
+                me.fireEvent('saveScene');
+                domUtils.preventDefault(evt);
+                return;
+            }
+            //阻止在table上的删除
+            if (!browser.ie) {
+                start = domUtils.findParentByTagName(rng.startContainer, 'table', true);
+                end = domUtils.findParentByTagName(rng.endContainer, 'table', true);
+                if (start && !end || !start && end || start !== end) {
+                    evt.preventDefault();
+                    return;
+                }
+            }
+            start = rng.startContainer;
+            if(rng.collapsed && start.nodeType == 1){
+                var currentNode = start.childNodes[rng.startOffset-1];
+                if(currentNode && currentNode.nodeType == 1 && currentNode.tagName == 'BR'){
+                    me.fireEvent('saveScene');
+                    rng.setStartBefore(currentNode).collapse(true);
+                    domUtils.remove(currentNode);
+                    rng.select();
+                    me.fireEvent('saveScene');
+                }
+            }
+
+            //trace:3613
+            if(browser.chrome){
+                if(rng.collapsed){
+
+                    while(rng.startOffset == 0 && !domUtils.isEmptyBlock(rng.startContainer)){
+                        rng.setStartBefore(rng.startContainer)
+                    }
+                    var pre = rng.startContainer.childNodes[rng.startOffset-1];
+                    if(pre && pre.nodeName == 'BR'){
+                        rng.setStartBefore(pre);
+                        me.fireEvent('saveScene');
+                        $(pre).remove();
+                        rng.setCursor();
+                        me.fireEvent('saveScene');
+                    }
+
+                }
+            }
+        }
+        //trace:1634
+        //ff的del键在容器空的时候，也会删除
+        if(browser.gecko && keyCode == 46){
+            var range = me.selection.getRange();
+            if(range.collapsed){
+                start = range.startContainer;
+                if(domUtils.isEmptyBlock(start)){
+                    var parent = start.parentNode;
+                    while(domUtils.getChildCount(parent) == 1 && !domUtils.isBody(parent)){
+                        start = parent;
+                        parent = parent.parentNode;
+                    }
+                    if(start === parent.lastChild)
+                        evt.preventDefault();
+                    return;
+                }
+            }
+        }
+    });
+    me.addListener('keyup', function(type, evt) {
+        var keyCode = evt.keyCode || evt.which,
+            rng,me = this;
+        if(keyCode == 8){
+            if(me.fireEvent('delkeyup')){
+                return;
+            }
+            rng = me.selection.getRange();
+            if(rng.collapsed){
+                var tmpNode,
+                    autoClearTagName = ['h1','h2','h3','h4','h5','h6'];
+                if(tmpNode = domUtils.findParentByTagName(rng.startContainer,autoClearTagName,true)){
+                    if(domUtils.isEmptyBlock(tmpNode)){
+                        var pre = tmpNode.previousSibling;
+                        if(pre && pre.nodeName != 'TABLE'){
+                            domUtils.remove(tmpNode);
+                            rng.setStartAtLast(pre).setCursor(false,true);
+                            return;
+                        }else{
+                            var next = tmpNode.nextSibling;
+                            if(next && next.nodeName != 'TABLE'){
+                                domUtils.remove(tmpNode);
+                                rng.setStartAtFirst(next).setCursor(false,true);
+                                return;
+                            }
+                        }
+                    }
+                }
+                //处理当删除到body时，要重新给p标签展位
+                if(domUtils.isBody(rng.startContainer)){
+                    var tmpNode = domUtils.createElement(me.document,'p',{
+                        'innerHTML' : browser.ie ? domUtils.fillChar : '<br/>'
+                    });
+                    rng.insertNode(tmpNode).setStart(tmpNode,0).setCursor(false,true);
+                }
+            }
+
+
+            //chrome下如果删除了inline标签，浏览器会有记忆，在输入文字还是会套上刚才删除的标签，所以这里再选一次就不会了
+            if( !collapsed && (rng.startContainer.nodeType == 3 || rng.startContainer.nodeType == 1 && domUtils.isEmptyBlock(rng.startContainer))){
+                if(browser.ie){
+                    var span = rng.document.createElement('span');
+                    rng.insertNode(span).setStartBefore(span).collapse(true);
+                    rng.select();
+                    domUtils.remove(span)
+                }else{
+                    rng.select()
+                }
+
+            }
+        }
+
+    })
+};
+/**
+ * 自动保存草稿
+ */
+UM.plugins['autosave'] = function() {
+
+
+    var me = this,
+        //无限循环保护
+        lastSaveTime = new Date(),
+        //最小保存间隔时间
+        MIN_TIME = 20,
+        //auto save key
+        saveKey = null;
+
+
+    //默认间隔时间
+    me.setOpt('saveInterval', 500);
+
+    //存储媒介封装
+    var LocalStorage = UM.LocalStorage = ( function () {
+
+        var storage = window.localStorage || getUserData() || null,
+            LOCAL_FILE = "localStorage";
+
+        return {
+
+            saveLocalData: function ( key, data ) {
+
+                if ( storage && data) {
+                    storage.setItem( key, data  );
+                    return true;
+                }
+
+                return false;
+
+            },
+
+            getLocalData: function ( key ) {
+
+                if ( storage ) {
+                    return storage.getItem( key );
+                }
+
+                return null;
+
+            },
+
+            removeItem: function ( key ) {
+
+                storage && storage.removeItem( key );
+
+            }
+
+        };
+
+        function getUserData () {
+
+            var container = document.createElement( "div" );
+            container.style.display = "none";
+
+            if( !container.addBehavior ) {
+                return null;
+            }
+
+            container.addBehavior("#default#userdata");
+
+            return {
+
+                getItem: function ( key ) {
+
+                    var result = null;
+
+                    try {
+                        document.body.appendChild( container );
+                        container.load( LOCAL_FILE );
+                        result = container.getAttribute( key );
+                        document.body.removeChild( container );
+                    } catch ( e ) {
+                    }
+
+                    return result;
+
+                },
+
+                setItem: function ( key, value ) {
+
+                    document.body.appendChild( container );
+                    container.setAttribute( key, value );
+                    container.save( LOCAL_FILE );
+                    document.body.removeChild( container );
+
+                },
+//               暂时没有用到
+//                clear: function () {
+//
+//                    var expiresTime = new Date();
+//                    expiresTime.setFullYear( expiresTime.getFullYear() - 1 );
+//                    document.body.appendChild( container );
+//                    container.expires = expiresTime.toUTCString();
+//                    container.save( LOCAL_FILE );
+//                    document.body.removeChild( container );
+//
+//                },
+
+                removeItem: function ( key ) {
+
+                    document.body.appendChild( container );
+                    container.removeAttribute( key );
+                    container.save( LOCAL_FILE );
+                    document.body.removeChild( container );
+
+                }
+
+            };
+
+        }
+
+    } )();
+
+    function save ( editor ) {
+
+        var saveData = null;
+
+        if ( new Date() - lastSaveTime < MIN_TIME ) {
+            return;
+        }
+
+        if ( !editor.hasContents() ) {
+            //这里不能调用命令来删除， 会造成事件死循环
+            saveKey && LocalStorage.removeItem( saveKey );
+            return;
+        }
+
+        lastSaveTime = new Date();
+
+        editor._saveFlag = null;
+
+        saveData = me.body.innerHTML;
+
+        if ( editor.fireEvent( "beforeautosave", {
+            content: saveData
+        } ) === false ) {
+            return;
+        }
+
+        LocalStorage.saveLocalData( saveKey, saveData );
+
+        editor.fireEvent( "afterautosave", {
+            content: saveData
+        } );
+
+    }
+
+    me.addListener('ready', function(){
+        var _suffix = "-drafts-data",
+            key = null;
+
+        if ( me.key ) {
+            key = me.key + _suffix;
+        } else {
+            key = ( me.container.parentNode.id || 'ue-common' ) + _suffix;
+        }
+
+        //页面地址+编辑器ID 保持唯一
+        saveKey = ( location.protocol + location.host + location.pathname ).replace( /[.:\/]/g, '_' ) + key;
+    });
+
+    me.addListener('contentchange', function(){
+
+        if ( !saveKey ) {
+            return;
+        }
+
+        if ( me._saveFlag ) {
+            window.clearTimeout( me._saveFlag );
+        }
+
+        if ( me.options.saveInterval > 0 ) {
+
+            me._saveFlag = window.setTimeout( function () {
+
+                save( me );
+
+            }, me.options.saveInterval );
+
+        } else {
+
+            save(me);
+
+        }
+
+    })
+
+
+    me.commands['clearlocaldata'] = {
+        execCommand:function (cmd, name) {
+            if ( saveKey && LocalStorage.getLocalData( saveKey ) ) {
+                LocalStorage.removeItem( saveKey )
+            }
+        },
+        notNeedUndo: true,
+        ignoreContentChange:true
+    };
+
+    me.commands['getlocaldata'] = {
+        execCommand:function (cmd, name) {
+            return saveKey ? LocalStorage.getLocalData( saveKey ) || '' : '';
+        },
+        notNeedUndo: true,
+        ignoreContentChange:true
+    };
+
+    me.commands['drafts'] = {
+        execCommand:function (cmd, name) {
+            if ( saveKey ) {
+                me.body.innerHTML = LocalStorage.getLocalData( saveKey ) || '<p>'+(browser.ie ? '&nbsp;' : '<br/>')+'</p>';
+                me.focus(true);
+            }
+        },
+        queryCommandState: function () {
+            return saveKey ? ( LocalStorage.getLocalData( saveKey ) === null ? -1 : 0 ) : -1;
+        },
+        notNeedUndo: true,
+        ignoreContentChange:true
+    }
+
+};
+
+/**
+ * @description
+ * 1.拖放文件到编辑区域，自动上传并插入到选区
+ * 2.插入粘贴板的图片，自动上传并插入到选区
+ * @author Jinqn
+ *
+ */
+UM.plugins['autoupload'] = function () {
+
+    var me = this;
+
+    me.setOpt('pasteImageEnabled', true);
+    me.setOpt('dropFileEnabled', true);
+    var sendAndInsertImage = function (file, editor) {
+        //模拟数据
+        var fd = new FormData();
+        fd.append(editor.options.imageFieldName || 'upfile', file, file.name || ('blob.' + file.type.substr('image/'.length)));
+        fd.append('type', 'ajax');
+        var xhr = new XMLHttpRequest();
+        xhr.open("post", me.options.imageUrl, true);
+        xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
+        xhr.addEventListener('load', function (e) {
+            try {
+                var json = eval('('+e.target.response+')'),
+                    link = json.url,
+                    picLink = me.options.imagePath + link;
+                editor.execCommand('insertimage', {
+                    src: picLink,
+                    _src: picLink
+                });
+            } catch (er) {
+            }
+        });
+        xhr.send(fd);
+    };
+
+    function getPasteImage(e) {
+        return e.clipboardData && e.clipboardData.items && e.clipboardData.items.length == 1 && /^image\//.test(e.clipboardData.items[0].type) ? e.clipboardData.items : null;
+    }
+
+    function getDropImage(e) {
+        return  e.dataTransfer && e.dataTransfer.files ? e.dataTransfer.files : null;
+    }
+
+    me.addListener('ready', function () {
+        if (window.FormData && window.FileReader) {
+            var autoUploadHandler = function (e) {
+                var hasImg = false,
+                    items;
+                //获取粘贴板文件列表或者拖放文件列表
+                items = e.type == 'paste' ? getPasteImage(e.originalEvent) : getDropImage(e.originalEvent);
+                if (items) {
+                    var len = items.length,
+                        file;
+                    while (len--) {
+                        file = items[len];
+                        if (file.getAsFile) file = file.getAsFile();
+                        if (file && file.size > 0 && /image\/\w+/i.test(file.type)) {
+                            sendAndInsertImage(file, me);
+                            hasImg = true;
+                        }
+                    }
+                    if (hasImg) return false;
+                }
+
+            };
+            me.getOpt('pasteImageEnabled') && me.$body.on('paste', autoUploadHandler);
+            me.getOpt('dropFileEnabled') && me.$body.on('drop', autoUploadHandler);
+
+            //取消拖放图片时出现的文字光标位置提示
+            me.$body.on('dragover', function (e) {
+                if (e.originalEvent.dataTransfer.types[0] == 'Files') {
+                    return false;
+                }
+            });
+        }
+    });
+
+};
+/**
+ * 公式插件
+ */
+UM.plugins['formula'] = function () {
+    var me = this;
+
+    function getActiveIframe() {
+        return me.$body.find('iframe.edui-formula-active')[0] || null;
+    }
+
+    function blurActiveIframe(){
+        var iframe = getActiveIframe();
+        iframe && iframe.contentWindow.formula.blur();
+    }
+
+    me.addInputRule(function (root) {
+        $.each(root.getNodesByTagName('span'), function (i, node) {
+            if (node.hasClass('mathquill-embedded-latex')) {
+                var firstChild, latex = '';
+                while(firstChild = node.firstChild()){
+                    latex += firstChild.data;
+                    node.removeChild(firstChild);
+                }
+                node.tagName = 'iframe';
+                node.setAttr({
+                    'frameborder': '0',
+                    'src': me.getOpt('UMEDITOR_HOME_URL') + 'dialogs/formula/formula.html',
+                    'data-latex': utils.unhtml(latex)
+                });
+            }
+        });
+    });
+    me.addOutputRule(function (root) {
+        $.each(root.getNodesByTagName('iframe'), function (i, node) {
+            if (node.hasClass('mathquill-embedded-latex')) {
+                node.tagName = 'span';
+                node.appendChild(UM.uNode.createText(node.getAttr('data-latex')));
+                node.setAttr({
+                    'frameborder': '',
+                    'src': '',
+                    'data-latex': ''
+                });
+            }
+        });
+    });
+    me.addListener('click', function(){
+        blurActiveIframe();
+    });
+    me.addListener('afterexeccommand', function(type, cmd){
+        if(cmd != 'formula') {
+            blurActiveIframe();
+        }
+    });
+
+    me.commands['formula'] = {
+        execCommand: function (cmd, latex) {
+            var iframe = getActiveIframe();
+            if (iframe) {
+                iframe.contentWindow.formula.insertLatex(latex);
+            } else {
+                me.execCommand('inserthtml', '<span class="mathquill-embedded-latex">' + latex + '</span>');
+                browser.ie && browser.ie9below && setTimeout(function(){
+                    var rng = me.selection.getRange(),
+                        startContainer = rng.startContainer;
+                    if(startContainer.nodeType == 1 && !startContainer.childNodes[rng.startOffset]){
+                        rng.insertNode(me.document.createTextNode(' '));
+                        rng.setCursor()
+                    }
+                },100)
+            }
+        },
+        queryCommandState: function (cmd) {
+            return 0;
+        },
+        queryCommandValue: function (cmd) {
+            var iframe = getActiveIframe();
+            return iframe && iframe.contentWindow.formula.getLatex();
+        }
+    }
+
+};
+
+/**
+ * @file xssFilter.js
+ * @desc xss过滤器
+ * @author robbenmu
+ */
+
+UM.plugins.xssFilter = function() {
+
+	var config = UMEDITOR_CONFIG;
+	var whiteList = config.whiteList;
+
+	function filter(node) {
+
+		var tagName = node.tagName;
+		var attrs = node.attrs;
+
+		if (!whiteList.hasOwnProperty(tagName)) {
+			node.parentNode.removeChild(node);
+			return false;
+		}
+
+		UM.utils.each(attrs, function (val, key) {
+
+			if (UM.utils.indexOf(whiteList[tagName], key) === -1) {
+				node.setAttr(key);
+			}
+		});
+	}
+
+	// 添加inserthtml\paste等操作用的过滤规则
+	if (whiteList && config.xssFilterRules) {
+		this.options.filterRules = function () {
+
+			var result = {};
+
+			UM.utils.each(whiteList, function(val, key) {
+				result[key] = function (node) {
+					return filter(node);
+				};
+			});
+
+			return result;
+		}();
+	}
+
+	var tagList = [];
+
+	UM.utils.each(whiteList, function (val, key) {
+		tagList.push(key);
+	});
+
+	// 添加input过滤规则
+	//
+	if (whiteList && config.inputXssFilter) {
+		this.addInputRule(function (root) {
+
+			root.traversal(function(node) {
+				if (node.type !== 'element') {
+					return false;
+				}
+				filter(node);
+			});
+		});
+	}
+	// 添加output过滤规则
+	//
+	if (whiteList && config.outputXssFilter) {
+		this.addOutputRule(function (root) {
+
+			root.traversal(function(node) {
+				if (node.type !== 'element') {
+					return false;
+				}
+				filter(node);
+			});
+		});
+	}
+
+};
+
+(function ($) {
+    //对jquery的扩展
+    $.parseTmpl = function parse(str, data) {
+        var tmpl = 'var __p=[],print=function(){__p.push.apply(__p,arguments);};' + 'with(obj||{}){__p.push(\'' + str.replace(/\\/g, '\\\\').replace(/'/g, "\\'").replace(/<%=([\s\S]+?)%>/g,function (match, code) {
+            return "',obj." + code.replace(/\\'/g, "'") + ",'";
+        }).replace(/<%([\s\S]+?)%>/g,function (match, code) {
+                return "');" + code.replace(/\\'/g, "'").replace(/[\r\n\t]/g, ' ') + "__p.push('";
+            }).replace(/\r/g, '\\r').replace(/\n/g, '\\n').replace(/\t/g, '\\t') + "');}return __p.join('');";
+        var func = new Function('obj', tmpl);
+        return data ? func(data) : func;
+    };
+    $.extend2 = function (t, s) {
+        var a = arguments,
+            notCover = $.type(a[a.length - 1]) == 'boolean' ? a[a.length - 1] : false,
+            len = $.type(a[a.length - 1]) == 'boolean' ? a.length - 1 : a.length;
+        for (var i = 1; i < len; i++) {
+            var x = a[i];
+            for (var k in x) {
+                if (!notCover || !t.hasOwnProperty(k)) {
+                    t[k] = x[k];
+                }
+            }
+        }
+        return t;
+    };
+
+    $.IE6 = !!window.ActiveXObject && parseFloat(navigator.userAgent.match(/msie (\d+)/i)[1]) == 6;
+
+    //所有ui的基类
+    var _eventHandler = [];
+    var _widget = function () {
+    };
+    var _prefix = 'edui';
+    _widget.prototype = {
+        on: function (ev, cb) {
+            this.root().on(ev, $.proxy(cb, this));
+            return this;
+        },
+        off: function (ev, cb) {
+            this.root().off(ev, $.proxy(cb, this));
+            return this;
+        },
+        trigger: function (ev, data) {
+            return  this.root().trigger(ev, data) === false ? false : this;
+        },
+        root: function ($el) {
+            return this._$el || (this._$el = $el);
+        },
+        destroy: function () {
+
+        },
+        data: function (key, val) {
+            if (val !== undefined) {
+                this.root().data(_prefix + key, val);
+                return this;
+            } else {
+                return this.root().data(_prefix + key)
+            }
+        },
+        register: function (eventName, $el, fn) {
+            _eventHandler.push({
+                'evtname': eventName,
+                '$els': $.isArray($el) ? $el : [$el],
+                handler: $.proxy(fn, $el)
+            })
+        }
+    };
+
+    //从jq实例上拿到绑定的widget实例
+    $.fn.edui = function (obj) {
+        return obj ? this.data('eduiwidget', obj) : this.data('eduiwidget');
+    };
+
+    function _createClass(ClassObj, properties, supperClass) {
+        ClassObj.prototype = $.extend2(
+            $.extend({}, properties),
+            (UM.ui[supperClass] || _widget).prototype,
+            true
+        );
+        ClassObj.prototype.supper = (UM.ui[supperClass] || _widget).prototype;
+        //父class的defaultOpt 合并
+        if( UM.ui[supperClass] && UM.ui[supperClass].prototype.defaultOpt ) {
+
+            var parentDefaultOptions = UM.ui[supperClass].prototype.defaultOpt,
+                subDefaultOptions = ClassObj.prototype.defaultOpt;
+
+            ClassObj.prototype.defaultOpt = $.extend( {}, parentDefaultOptions, subDefaultOptions || {} );
+
+        }
+        return ClassObj
+    }
+
+    var _guid = 1;
+
+    function mergeToJQ(ClassObj, className) {
+        $[_prefix + className] = ClassObj;
+        $.fn[_prefix + className] = function (opt) {
+            var result, args = Array.prototype.slice.call(arguments, 1);
+
+            this.each(function (i, el) {
+                var $this = $(el);
+                var obj = $this.edui();
+                if (!obj) {
+                    ClassObj(!opt || !$.isPlainObject(opt) ? {} : opt, $this);
+                    $this.edui(obj)
+                }
+                if ($.type(opt) == 'string') {
+                    if (opt == 'this') {
+                        result = obj;
+                    } else {
+                        result = obj[opt].apply(obj, args);
+                        if (result !== obj && result !== undefined) {
+                            return false;
+                        }
+                        result = null;
+                    }
+
+                }
+            });
+
+            return result !== null ? result : this;
+        }
+    }
+
+    UM.ui = {
+        define: function (className, properties, supperClass) {
+            var ClassObj = UM.ui[className] = _createClass(function (options, $el) {
+                    var _obj = function () {
+                    };
+                    $.extend(_obj.prototype, ClassObj.prototype, {
+                            guid: className + _guid++,
+                            widgetName: className
+                        }
+                    );
+                    var obj = new _obj;
+                    if ($.type(options) == 'string') {
+                        obj.init && obj.init({});
+                        obj.root().edui(obj);
+                        obj.root().find('a').click(function (evt) {
+                            evt.preventDefault()
+                        });
+                        return obj.root()[_prefix + className].apply(obj.root(), arguments)
+                    } else {
+                        $el && obj.root($el);
+                        obj.init && obj.init(!options || $.isPlainObject(options) ? $.extend2(options || {}, obj.defaultOpt || {}, true) : options);
+                        try{
+                            obj.root().find('a').click(function (evt) {
+                                evt.preventDefault()
+                            });
+                        }catch(e){
+                        }
+
+                        return obj.root().edui(obj);
+                    }
+
+                },properties, supperClass);
+
+            mergeToJQ(ClassObj, className);
+        }
+    };
+
+    $(function () {
+        $(document).on('click mouseup mousedown dblclick mouseover', function (evt) {
+            $.each(_eventHandler, function (i, obj) {
+                if (obj.evtname == evt.type) {
+                    $.each(obj.$els, function (i, $el) {
+                        if ($el[0] !== evt.target && !$.contains($el[0], evt.target)) {
+                            obj.handler(evt);
+                        }
+                    })
+                }
+            })
+        })
+    })
+})(jQuery);
+//button 类
+UM.ui.define('button', {
+    tpl: '<<%if : !${texttype}%>div class="edui-btn edui-btn-${icon} <%if : ${name}%>edui-btn-name-${name}<%/if%>" unselectable="on" onmousedown="return false" <%else%>a class="edui-text-btn"<%/if%><% if: ${title} %> data-original-title="${title}" <%/if%>> ' +
+        '<% if: ${icon} %><div unselectable="on" class="edui-icon-${icon} edui-icon"></div><%/if%><%if: ${text} %><span unselectable="on" onmousedown="return false" class="edui-button-label">${text}</span><%/if%>' +
+        '<%if: ${caret} && ${text}%><span class="edui-button-spacing"></span><%/if%>' +
+        '<% if: ${caret} %><span unselectable="on" onmousedown="return false" class="edui-caret"></span><%/if%></<%if: !${texttype}%>div<%else%>a<%/if%>>',
+
+    defaultOpt: {
+        text: '',
+        title: '',
+        icon: '',
+        width: '',
+        caret: false,
+        texttype: false,
+        click: function () {
+        }
+    },
+    init: function (options) {
+        var me = this;
+        
+        me.root($(UM.utils.render(me.tpl, options)))
+            .click(function (evt) {
+                me.wrapclick(options.click, evt)
+            });
+
+        me.root().hover(function () {
+            if(!me.root().hasClass("edui-disabled")){
+                me.root().toggleClass('edui-hover')
+            }
+        })
+
+        return me;
+    },
+    wrapclick: function (fn, evt) {
+        if (!this.disabled()) {
+            this.root().trigger('wrapclick');
+            $.proxy(fn, this, evt)()
+        }
+        return this;
+    },
+    label: function (text) {
+        if (text === undefined) {
+            return this.root().find('.edui-button-label').text();
+        } else {
+            this.root().find('.edui-button-label').text(text);
+            return this;
+        }
+    },
+    disabled: function (state) {
+        if (state === undefined) {
+            return this.root().hasClass('edui-disabled')
+        }
+        this.root().toggleClass('edui-disabled', state);
+        if(this.root().hasClass('edui-disabled')){
+            this.root().removeClass('edui-hover')
+        }
+        return this;
+    },
+    active: function (state) {
+        if (state === undefined) {
+            return this.root().hasClass('edui-active')
+        }
+        this.root().toggleClass('edui-active', state)
+
+        return this;
+    },
+    mergeWith: function ($obj) {
+        var me = this;
+        me.data('$mergeObj', $obj);
+        $obj.edui().data('$mergeObj', me.root());
+        if (!$.contains(document.body, $obj[0])) {
+            $obj.appendTo(me.root());
+        }
+        me.on('click',function () {
+            me.wrapclick(function () {
+                $obj.edui().show();
+            })
+        }).register('click', me.root(), function (evt) {
+                $obj.hide()
+            });
+    }
+});
+//toolbar 类
+(function () {
+    UM.ui.define('toolbar', {
+        tpl: '<div class="edui-toolbar"  ><div class="edui-btn-toolbar" unselectable="on" onmousedown="return false"  ></div></div>'
+          ,
+        init: function () {
+            var $root = this.root($(this.tpl));
+            this.data('$btnToolbar', $root.find('.edui-btn-toolbar'))
+        },
+        appendToBtnmenu : function(data){
+            var $cont = this.data('$btnToolbar');
+            data = $.isArray(data) ? data : [data];
+            $.each(data,function(i,$item){
+                $cont.append($item)
+            })
+        }
+    });
+})();
+
+//menu 类
+UM.ui.define('menu',{
+    show : function($obj,dir,fnname,topOffset,leftOffset){
+
+        fnname = fnname || 'position';
+        if(this.trigger('beforeshow') === false){
+            return;
+        }else{
+            this.root().css($.extend({display:'block'},$obj ? {
+                top : $obj[fnname]().top + ( dir == 'right' ? 0 : $obj.outerHeight()) - (topOffset || 0),
+                left : $obj[fnname]().left + (dir == 'right' ?  $obj.outerWidth() : 0) -  (leftOffset || 0)
+            }:{}))
+            this.trigger('aftershow');
+        }
+    },
+    hide : function(all){
+        var $parentmenu;
+        if(this.trigger('beforehide') === false){
+            return;
+        } else {
+
+            if($parentmenu = this.root().data('parentmenu')){
+                if($parentmenu.data('parentmenu')|| all)
+                    $parentmenu.edui().hide();
+            }
+            this.root().css('display','none');
+            this.trigger('afterhide');
+        }
+    },
+    attachTo : function($obj){
+        var me = this;
+        if(!$obj.data('$mergeObj')){
+            $obj.data('$mergeObj',me.root());
+            $obj.on('wrapclick',function(evt){
+                me.show()
+            });
+            me.register('click',$obj,function(evt){
+               me.hide()
+            });
+            me.data('$mergeObj',$obj)
+        }
+    }
+});
+//dropmenu 类
+UM.ui.define('dropmenu', {
+    tmpl: '<ul class="edui-dropdown-menu" aria-labelledby="dropdownMenu" >' +
+        '<%for: ${data} as ${ci}%>' +
+        '<%if: ${ci.divider}%><li class="edui-divider"></li><%else%>' +
+        '<li class="${ci.active} || ${ci.disabled}" data-value="${ci.value}">' +
+        '<a href="#" tabindex="-1"><em class="edui-dropmenu-checkbox"><i class="edui-icon-ok"></i></em>${ci.label}</a>' +
+        '</li><%/if%>' +
+        '<%/for%>' +
+        '</ul>',
+    defaultOpt: {
+        data: [],
+        click: function () {
+
+        }
+    },
+    init: function (options) {
+        var me = this;
+        var eventName = {
+            click: 1,
+            mouseover: 1,
+            mouseout: 1
+        };
+
+        this.root($(UM.utils.render(this.tmpl, options))).on('click', 'li[class!="edui-disabled edui-divider edui-dropdown-submenu"]',function (evt) {
+            $.proxy(options.click, me, evt, $(this).data('value'), $(this))()
+        }).find('li').each(function (i, el) {
+                var $this = $(this);
+                if (!$this.hasClass("edui-disabled edui-divider edui-dropdown-submenu")) {
+                    var data = options.data[i];
+                    $.each(eventName, function (k) {
+                        data[k] && $this[k](function (evt) {
+                            $.proxy(data[k], el)(evt, data, me.root)
+                        })
+                    })
+                }
+            })
+
+    },
+    disabled: function (cb) {
+        $('li[class!=edui-divider]', this.root()).each(function () {
+            var $el = $(this);
+            if (cb === true) {
+                $el.addClass('edui-disabled')
+            } else if ($.isFunction(cb)) {
+                $el.toggleClass('edui-disabled', cb(li))
+            } else {
+                $el.removeClass('edui-disabled')
+            }
+
+        });
+    },
+    val: function (val) {
+        var currentVal;
+        $('li[class!="edui-divider edui-disabled edui-dropdown-submenu"]', this.root()).each(function () {
+            var $el = $(this);
+            if (val === undefined) {
+                if ($el.find('em.edui-dropmenu-checked').length) {
+                    currentVal = $el.data('value');
+                    return false
+                }
+            } else {
+                $el.find('em').toggleClass('edui-dropmenu-checked', $el.data('value') == val)
+            }
+        });
+        if (val === undefined) {
+            return currentVal
+        }
+    },
+    addSubmenu: function (label, menu, index) {
+        index = index || 0;
+
+        var $list = $('li[class!=edui-divider]', this.root());
+        var $node = $('<li class="edui-dropdown-submenu"><a tabindex="-1" href="#">' + label + '</a></li>').append(menu);
+
+        if (index >= 0 && index < $list.length) {
+            $node.insertBefore($list[index]);
+        } else if (index < 0) {
+            $node.insertBefore($list[0]);
+        } else if (index >= $list.length) {
+            $node.appendTo($list);
+        }
+    }
+}, 'menu');
+//splitbutton 类
+///import button
+UM.ui.define('splitbutton',{
+    tpl :'<div class="edui-splitbutton <%if: ${name}%>edui-splitbutton-${name}<%/if%>"  unselectable="on" <%if: ${title}%>data-original-title="${title}"<%/if%>><div class="edui-btn"  unselectable="on" ><%if: ${icon}%><div  unselectable="on" class="edui-icon-${icon} edui-icon"></div><%/if%><%if: ${text}%>${text}<%/if%></div>'+
+            '<div  unselectable="on" class="edui-btn edui-dropdown-toggle" >'+
+                '<div  unselectable="on" class="edui-caret"><\/div>'+
+            '</div>'+
+        '</div>',
+    defaultOpt:{
+        text:'',
+        title:'',
+        click:function(){}
+    },
+    init : function(options){
+        var me = this;
+        me.root( $(UM.utils.render(me.tpl, options)));
+        me.root().find('.edui-btn:first').click(function(evt){
+            if(!me.disabled()){
+                $.proxy(options.click,me)();
+            }
+        });
+        me.root().find('.edui-dropdown-toggle').click(function(){
+            if(!me.disabled()){
+                me.trigger('arrowclick')
+            }
+        });
+        me.root().hover(function () {
+            if(!me.root().hasClass("edui-disabled")){
+                me.root().toggleClass('edui-hover')
+            }
+        });
+
+        return me;
+    },
+    wrapclick:function(fn,evt){
+        if(!this.disabled()){
+            $.proxy(fn,this,evt)()
+        }
+        return this;
+    },
+    disabled : function(state){
+        if(state === undefined){
+            return this.root().hasClass('edui-disabled')
+        }
+        this.root().toggleClass('edui-disabled',state).find('.edui-btn').toggleClass('edui-disabled',state);
+        return this;
+    },
+    active:function(state){
+        if(state === undefined){
+            return this.root().hasClass('edui-active')
+        }
+        this.root().toggleClass('edui-active',state).find('.edui-btn:first').toggleClass('edui-active',state);
+        return this;
+    },
+    mergeWith:function($obj){
+        var me = this;
+        me.data('$mergeObj',$obj);
+        $obj.edui().data('$mergeObj',me.root());
+        if(!$.contains(document.body,$obj[0])){
+            $obj.appendTo(me.root());
+        }
+        me.root().delegate('.edui-dropdown-toggle','click',function(){
+            me.wrapclick(function(){
+                $obj.edui().show();
+            })
+        });
+        me.register('click',me.root().find('.edui-dropdown-toggle'),function(evt){
+            $obj.hide()
+        });
+    }
+});
+/**
+ * Created with JetBrains PhpStorm.
+ * User: hn
+ * Date: 13-7-10
+ * Time: 下午3:07
+ * To change this template use File | Settings | File Templates.
+ */
+UM.ui.define('colorsplitbutton',{
+
+    tpl : '<div class="edui-splitbutton <%if : ${name}%>edui-splitbutton-${name}<%/if%>"  unselectable="on" <%if: ${title}%>data-original-title="${title}"<%/if%>><div class="edui-btn"  unselectable="on" ><%if: ${icon}%><div unselectable="on" class="edui-icon-${icon} edui-icon"></div><%/if%><div class="edui-splitbutton-color-label" <%if: ${color}%>style="background: ${color}"<%/if%>></div><%if: ${text}%>${text}<%/if%></div>'+
+            '<div  unselectable="on" class="edui-btn edui-dropdown-toggle" >'+
+            '<div  unselectable="on" class="edui-caret"><\/div>'+
+            '</div>'+
+            '</div>',
+    defaultOpt: {
+        color: ''
+    },
+    init: function( options ){
+
+        var me = this;
+
+        me.supper.init.call( me, options );
+
+    },
+    colorLabel: function(){
+        return this.root().find('.edui-splitbutton-color-label');
+    }
+
+}, 'splitbutton');
+//popup 类
+UM.ui.define('popup', {
+    tpl: '<div class="edui-dropdown-menu edui-popup"'+
+        '<%if:!${stopprop}%>onmousedown="return false"<%/if%>'+
+        '><div class="edui-popup-body" unselectable="on" onmousedown="return false">${subtpl|raw}</div>' +
+        '<div class="edui-popup-caret"></div>' +
+        '</div>',
+    defaultOpt: {
+        stopprop:false,
+        subtpl: '',
+        width: '',
+        height: ''
+    },
+    init: function (options) {
+        this.root($(UM.utils.render(this.tpl, options)));
+        return this;
+    },
+    mergeTpl: function (data) {
+        return UM.utils.render(this.tpl, {subtpl: data});
+    },
+    show: function ($obj, posObj) {
+        if (!posObj) posObj = {};
+
+        var fnname = posObj.fnname || 'position';
+        if (this.trigger('beforeshow') === false) {
+            return;
+        } else {
+            this.root().css($.extend({display: 'block'}, $obj ? {
+                top: $obj[fnname]().top + ( posObj.dir == 'right' ? 0 : $obj.outerHeight()) - (posObj.offsetTop || 0),
+                left: $obj[fnname]().left + (posObj.dir == 'right' ? $obj.outerWidth() : 0) - (posObj.offsetLeft || 0),
+                position: 'absolute'
+            } : {}));
+
+            this.root().find('.edui-popup-caret').css({
+                top: posObj.caretTop || 0,
+                left: posObj.caretLeft || 0,
+                position: 'absolute'
+            }).addClass(posObj.caretDir || "up")
+
+        }
+        this.trigger("aftershow");
+    },
+    hide: function () {
+        this.root().css('display', 'none');
+        this.trigger('afterhide')
+    },
+    attachTo: function ($obj, posObj) {
+        var me = this
+        if (!$obj.data('$mergeObj')) {
+            $obj.data('$mergeObj', me.root());
+            $obj.on('wrapclick', function (evt) {
+                me.show($obj, posObj)
+            });
+            me.register('click', $obj, function (evt) {
+                me.hide()
+            });
+            me.data('$mergeObj', $obj)
+        }
+    },
+    getBodyContainer: function () {
+        return this.root().find(".edui-popup-body");
+    }
+});
+//scale 类
+UM.ui.define('scale', {
+    tpl: '<div class="edui-scale" unselectable="on">' +
+        '<span class="edui-scale-hand0"></span>' +
+        '<span class="edui-scale-hand1"></span>' +
+        '<span class="edui-scale-hand2"></span>' +
+        '<span class="edui-scale-hand3"></span>' +
+        '<span class="edui-scale-hand4"></span>' +
+        '<span class="edui-scale-hand5"></span>' +
+        '<span class="edui-scale-hand6"></span>' +
+        '<span class="edui-scale-hand7"></span>' +
+        '</div>',
+    defaultOpt: {
+        $doc: $(document),
+        $wrap: $(document)
+    },
+    init: function (options) {
+        if(options.$doc) this.defaultOpt.$doc = options.$doc;
+        if(options.$wrap) this.defaultOpt.$wrap = options.$wrap;
+        this.root($(UM.utils.render(this.tpl, options)));
+        this.initStyle();
+        this.startPos = this.prePos = {x: 0, y: 0};
+        this.dragId = -1;
+        return this;
+    },
+    initStyle: function () {
+        utils.cssRule('edui-style-scale', '.edui-scale{display:none;position:absolute;border:1px solid #38B2CE;cursor:hand;}' +
+            '.edui-scale span{position:absolute;left:0;top:0;width:7px;height:7px;overflow:hidden;font-size:0px;display:block;background-color:#3C9DD0;}'
+            + '.edui-scale .edui-scale-hand0{cursor:nw-resize;top:0;margin-top:-4px;left:0;margin-left:-4px;}'
+            + '.edui-scale .edui-scale-hand1{cursor:n-resize;top:0;margin-top:-4px;left:50%;margin-left:-4px;}'
+            + '.edui-scale .edui-scale-hand2{cursor:ne-resize;top:0;margin-top:-4px;left:100%;margin-left:-3px;}'
+            + '.edui-scale .edui-scale-hand3{cursor:w-resize;top:50%;margin-top:-4px;left:0;margin-left:-4px;}'
+            + '.edui-scale .edui-scale-hand4{cursor:e-resize;top:50%;margin-top:-4px;left:100%;margin-left:-3px;}'
+            + '.edui-scale .edui-scale-hand5{cursor:sw-resize;top:100%;margin-top:-3px;left:0;margin-left:-4px;}'
+            + '.edui-scale .edui-scale-hand6{cursor:s-resize;top:100%;margin-top:-3px;left:50%;margin-left:-4px;}'
+            + '.edui-scale .edui-scale-hand7{cursor:se-resize;top:100%;margin-top:-3px;left:100%;margin-left:-3px;}');
+    },
+    _eventHandler: function (e) {
+        var me = this,
+            $doc = me.defaultOpt.$doc;
+        switch (e.type) {
+            case 'mousedown':
+                var hand = e.target || e.srcElement, hand;
+                if (hand.className.indexOf('edui-scale-hand') != -1) {
+                    me.dragId = hand.className.slice(-1);
+                    me.startPos.x = me.prePos.x = e.clientX;
+                    me.startPos.y = me.prePos.y = e.clientY;
+                    $doc.bind('mousemove', $.proxy(me._eventHandler, me));
+                }
+                break;
+            case 'mousemove':
+                if (me.dragId != -1) {
+                    me.updateContainerStyle(me.dragId, {x: e.clientX - me.prePos.x, y: e.clientY - me.prePos.y});
+                    me.prePos.x = e.clientX;
+                    me.prePos.y = e.clientY;
+                    me.updateTargetElement();
+                }
+                break;
+            case 'mouseup':
+                if (me.dragId != -1) {
+                    me.dragId = -1;
+                    me.updateTargetElement();
+                    var $target = me.data('$scaleTarget');
+                    if ($target.parent()) me.attachTo(me.data('$scaleTarget'));
+                }
+                $doc.unbind('mousemove', $.proxy(me._eventHandler, me));
+                break;
+            default:
+                break;
+        }
+    },
+    updateTargetElement: function () {
+        var me = this,
+            $root = me.root(),
+            $target = me.data('$scaleTarget');
+        $target.css({width: $root.width(), height: $root.height()});
+        me.attachTo($target);
+    },
+    updateContainerStyle: function (dir, offset) {
+        var me = this,
+            $dom = me.root(),
+            tmp,
+            rect = [
+                //[left, top, width, height]
+                [0, 0, -1, -1],
+                [0, 0, 0, -1],
+                [0, 0, 1, -1],
+                [0, 0, -1, 0],
+                [0, 0, 1, 0],
+                [0, 0, -1, 1],
+                [0, 0, 0, 1],
+                [0, 0, 1, 1]
+            ];
+
+        if (rect[dir][0] != 0) {
+            tmp = parseInt($dom.offset().left) + offset.x;
+            $dom.css('left', me._validScaledProp('left', tmp));
+        }
+        if (rect[dir][1] != 0) {
+            tmp = parseInt($dom.offset().top) + offset.y;
+            $dom.css('top', me._validScaledProp('top', tmp));
+        }
+        if (rect[dir][2] != 0) {
+            tmp = $dom.width() + rect[dir][2] * offset.x;
+            $dom.css('width', me._validScaledProp('width', tmp));
+        }
+        if (rect[dir][3] != 0) {
+            tmp = $dom.height() + rect[dir][3] * offset.y;
+            $dom.css('height', me._validScaledProp('height', tmp));
+        }
+    },
+    _validScaledProp: function (prop, value) {
+        var $ele = this.root(),
+            $wrap = this.defaultOpt.$doc,
+            calc = function(val, a, b){
+                return (val + a) > b ? b - a : value;
+            };
+
+        value = isNaN(value) ? 0 : value;
+        switch (prop) {
+            case 'left':
+                return value < 0 ? 0 : calc(value, $ele.width(), $wrap.width());
+            case 'top':
+                return value < 0 ? 0 : calc(value, $ele.height(),$wrap.height());
+            case 'width':
+                return value <= 0 ? 1 : calc(value, $ele.offset().left, $wrap.width());
+            case 'height':
+                return value <= 0 ? 1 : calc(value, $ele.offset().top, $wrap.height());
+        }
+    },
+    show: function ($obj) {
+        var me = this;
+        if ($obj) me.attachTo($obj);
+        me.root().bind('mousedown', $.proxy(me._eventHandler, me));
+        me.defaultOpt.$doc.bind('mouseup', $.proxy(me._eventHandler, me));
+        me.root().show();
+        me.trigger("aftershow");
+    },
+    hide: function () {
+        var me = this;
+        me.root().unbind('mousedown', $.proxy(me._eventHandler, me));
+        me.defaultOpt.$doc.unbind('mouseup', $.proxy(me._eventHandler, me));
+        me.root().hide();
+        me.trigger('afterhide')
+    },
+    attachTo: function ($obj) {
+        var me = this,
+            imgPos = $obj.offset(),
+            $root = me.root(),
+            $wrap = me.defaultOpt.$wrap,
+            posObj = $wrap.offset();
+
+        me.data('$scaleTarget', $obj);
+        me.root().css({
+            position: 'absolute',
+            width: $obj.width(),
+            height: $obj.height(),
+            left: imgPos.left - posObj.left - parseInt($wrap.css('border-left-width')) - parseInt($root.css('border-left-width')),
+            top: imgPos.top - posObj.top - parseInt($wrap.css('border-top-width')) - parseInt($root.css('border-top-width'))
+        });
+    },
+    getScaleTarget: function () {
+        return this.data('$scaleTarget')[0];
+    }
+});
+//colorpicker 类
+UM.ui.define('colorpicker', {
+    tpl: function (opt) {
+        var COLORS = (
+            'ffffff,000000,eeece1,1f497d,4f81bd,c0504d,9bbb59,8064a2,4bacc6,f79646,' +
+                'f2f2f2,7f7f7f,ddd9c3,c6d9f0,dbe5f1,f2dcdb,ebf1dd,e5e0ec,dbeef3,fdeada,' +
+                'd8d8d8,595959,c4bd97,8db3e2,b8cce4,e5b9b7,d7e3bc,ccc1d9,b7dde8,fbd5b5,' +
+                'bfbfbf,3f3f3f,938953,548dd4,95b3d7,d99694,c3d69b,b2a2c7,92cddc,fac08f,' +
+                'a5a5a5,262626,494429,17365d,366092,953734,76923c,5f497a,31859b,e36c09,' +
+                '7f7f7f,0c0c0c,1d1b10,0f243e,244061,632423,4f6128,3f3151,205867,974806,' +
+                'c00000,ff0000,ffc000,ffff00,92d050,00b050,00b0f0,0070c0,002060,7030a0,').split(',');
+
+        var html = '<div unselectable="on" onmousedown="return false" class="edui-colorpicker<%if : ${name}%> edui-colorpicker-${name}<%/if%>" >' +
+            '<table unselectable="on" onmousedown="return false">' +
+            '<tr><td colspan="10">'+opt.lang_themeColor+'</td> </tr>' +
+            '<tr class="edui-colorpicker-firstrow" >';
+
+        for (var i = 0; i < COLORS.length; i++) {
+            if (i && i % 10 === 0) {
+                html += '</tr>' + (i == 60 ? '<tr><td colspan="10">'+opt.lang_standardColor+'</td></tr>' : '') + '<tr' + (i == 60 ? ' class="edui-colorpicker-firstrow"' : '') + '>';
+            }
+            html += i < 70 ? '<td><a unselectable="on" onmousedown="return false" title="' + COLORS[i] + '" class="edui-colorpicker-colorcell"' +
+                ' data-color="#' + COLORS[i] + '"' +
+                ' style="background-color:#' + COLORS[i] + ';border:solid #ccc;' +
+                (i < 10 || i >= 60 ? 'border-width:1px;' :
+                    i >= 10 && i < 20 ? 'border-width:1px 1px 0 1px;' :
+                        'border-width:0 1px 0 1px;') +
+                '"' +
+                '></a></td>' : '';
+        }
+        html += '</tr></table></div>';
+        return html;
+    },
+    init: function (options) {
+        var me = this;
+        me.root($(UM.utils.render(me.supper.mergeTpl(me.tpl(options)),options)));
+
+        me.root().on("click",function (e) {
+            me.trigger('pickcolor',  $(e.target).data('color'));
+        });
+    }
+}, 'popup');
+/**
+ * Created with JetBrains PhpStorm.
+ * User: hn
+ * Date: 13-5-29
+ * Time: 下午8:01
+ * To change this template use File | Settings | File Templates.
+ */
+
+(function(){
+
+    var widgetName = 'combobox',
+        itemClassName = 'edui-combobox-item',
+        HOVER_CLASS = 'edui-combobox-item-hover',
+        ICON_CLASS = 'edui-combobox-checked-icon',
+        labelClassName = 'edui-combobox-item-label';
+
+    UM.ui.define( widgetName, ( function(){
+
+        return {
+            tpl: "<ul class=\"dropdown-menu edui-combobox-menu<%if: ${comboboxName} !==''%> edui-combobox-${comboboxName}<%/if%>\" unselectable=\"on\" onmousedown=\"return false\" role=\"menu\" aria-labelledby=\"dropdownMenu\">" +
+                "<%if: ${autoRecord} %>" +
+                "<%for : ${recordStack} as ${recordItem}, ${index}%>" + 
+                "<%var : style = ${itemStyles}[${recordItem}]%><%var : record = ${items}[${recordItem}]%>" +
+                "<li class=\"${itemClassName}<%if: ${selected} == ${recordItem}%> edui-combobox-checked<%/if%>\" data-item-index=\"${recordItem}\" unselectable=\"on\" onmousedown=\"return false\">" +
+                "<span class=\"edui-combobox-icon\" unselectable=\"on\" onmousedown=\"return false\"></span>" +
+                "<label class=\"${labelClassName}\" style=\"${style}\" unselectable=\"on\" onmousedown=\"return false\">${record}</label>" +
+                "</li>" +
+                "<%/for%>" +
+                "<%if: ${index} %>" +
+                "<li class=\"edui-combobox-item-separator\"></li>" +
+                "<%/if%>" +
+                "<%/if%>" +
+                "<%for: ${items} as ${item}, ${itemIndex}%>" +
+                "<%var : labelStyle = ${itemStyles}[${itemIndex}]%>" + 
+                "<li class=\"${itemClassName}<%if: ${selected} == ${item} %> edui-combobox-checked<%/if%> edui-combobox-item-${itemIndex}\" data-item-index=\"${itemIndex}\" unselectable=\"on\" onmousedown=\"return false\">" +
+                "<span class=\"edui-combobox-icon\" unselectable=\"on\" onmousedown=\"return false\"></span>" +
+                "<label class=\"${labelClassName}\" style=\"${labelStyle}\" unselectable=\"on\" onmousedown=\"return false\">${item}</label>" +
+                "</li>" +
+                "<%/for%>" +
+                "</ul>",
+            defaultOpt: {
+                //记录栈初始列表
+                recordStack: [],
+                //可用项列表
+                items: [],
+		        //item对应的值列表
+                value: [],
+                comboboxName: '',
+                selected: '',
+                //自动记录
+                autoRecord: true,
+                //最多记录条数
+                recordCount: 5
+            },
+            init: function( options ){
+
+                var me = this;
+
+                $.extend( me._optionAdaptation( options ), me._createItemMapping( options.recordStack, options.items ), {
+                    itemClassName: itemClassName,
+                    iconClass: ICON_CLASS,
+                    labelClassName: labelClassName
+                } );
+
+                this._transStack( options );
+                
+                me.root( $( UM.utils.render(me.tpl, options) ) );
+
+                this.data( 'options', options ).initEvent();
+
+            },
+            initEvent: function(){
+
+                var me = this;
+
+                me.initSelectItem();
+
+                this.initItemActive();
+
+            },
+            /**
+             * 初始化选择项
+             */
+            initSelectItem: function(){
+
+                var me = this,
+                    labelClass = "."+labelClassName;
+
+                me.root().delegate('.' + itemClassName, 'click', function(){
+
+                    var $li = $(this),
+                        index = $li.attr('data-item-index');
+
+                    me.trigger('comboboxselect', {
+                        index: index,
+                        label: $li.find(labelClass).text(),
+                        value: me.data('options').value[ index ]
+                    }).select( index );
+
+                    me.hide();
+
+                    return false;
+
+                });
+
+            },
+            initItemActive: function(){
+                var fn = {
+                    mouseenter: 'addClass',
+                    mouseleave: 'removeClass'
+                };
+                if ($.IE6) {
+                    this.root().delegate( '.'+itemClassName,  'mouseenter mouseleave', function( evt ){
+                        $(this)[ fn[ evt.type ] ]( HOVER_CLASS );
+                    }).one('afterhide', function(){
+                    });
+                }
+            },
+            /**
+             * 选择给定索引的项
+             * @param index 项索引
+             * @returns {*} 如果存在对应索引的项，则返回该项；否则返回null
+             */
+            select: function( index ){
+
+                var itemCount = this.data('options').itemCount,
+                    items = this.data('options').autowidthitem;
+
+                if ( items && !items.length ) {
+                    items = this.data('options').items;
+                }
+
+                if( itemCount == 0 ) {
+                    return null;
+                }
+
+                if( index < 0 ) {
+
+                    index = itemCount + index % itemCount;
+
+                } else if ( index >= itemCount ) {
+
+                    index = itemCount-1;
+
+                }
+
+                this.trigger( 'changebefore', items[ index ] );
+
+                this._update( index );
+
+                this.trigger( 'changeafter', items[ index ] );
+
+                return null;
+
+            },
+            selectItemByLabel: function( label ){
+
+                var itemMapping = this.data('options').itemMapping,
+                    me = this,
+                    index = null;
+
+                !$.isArray( label ) && ( label = [ label ] );
+
+                $.each( label, function( i, item ){
+
+                    index = itemMapping[ item ];
+
+                    if( index !== undefined ) {
+
+                        me.select( index );
+                        return false;
+
+                    }
+
+                } );
+
+            },
+            /**
+             * 转换记录栈
+             */
+            _transStack: function( options ) {
+
+                var temp = [],
+                    itemIndex = -1,
+                    selected = -1;
+
+                $.each( options.recordStack, function( index, item ){
+
+                    itemIndex = options.itemMapping[ item ];
+
+                    if( $.isNumeric( itemIndex ) ) {
+
+                        temp.push( itemIndex );
+
+                        //selected的合法性检测
+                        if( item == options.selected ) {
+                            selected = itemIndex;
+                        }
+
+                    }
+
+                } );
+
+                options.recordStack = temp;
+                options.selected = selected;
+                temp = null;
+
+            },
+            _optionAdaptation: function( options ) {
+
+                if( !( 'itemStyles' in options ) ) {
+
+                    options.itemStyles = [];
+
+                    for( var i = 0, len = options.items.length; i < len; i++ ) {
+                        options.itemStyles.push('');
+                    }
+
+                }
+
+                options.autowidthitem = options.autowidthitem || options.items;
+                options.itemCount = options.items.length;
+
+                return options;
+
+            },
+            _createItemMapping: function( stackItem, items ){
+
+                var temp = {},
+                    result = {
+                        recordStack: [],
+                        mapping: {}
+                    };
+
+                $.each( items, function( index, item ){
+                    temp[ item ] = index;
+                } );
+
+                result.itemMapping = temp;
+
+                $.each( stackItem, function( index, item ){
+
+                    if( temp[ item ] !== undefined ) {
+                        result.recordStack.push( temp[ item ] );
+                        result.mapping[ item ] = temp[ item ];
+                    }
+
+                } );
+
+                return result;
+
+            },
+            _update: function ( index ) {
+
+                var options = this.data("options"),
+                    newStack = [],
+                    newChilds = null;
+
+                $.each( options.recordStack, function( i, item ){
+
+                    if( item != index ) {
+                        newStack.push( +item );
+                    }
+
+                } );
+
+                //压入最新的记录
+                newStack.unshift( +index );
+
+                if( newStack.length > options.recordCount ) {
+                    newStack.length = options.recordCount;
+                }
+
+                options.recordStack = newStack;
+                options.selected = +index;
+                newChilds = $( UM.utils.render(this.tpl, options ) );
+
+                //重新渲染
+                this.root().html( newChilds.html() );
+
+                newChilds = null;
+                newStack = null;
+
+            }
+        };
+
+    } )(), 'menu' );
+
+})();
+
+/**
+ * Combox 抽象基类
+ * User: hn
+ * Date: 13-5-29
+ * Time: 下午8:01
+ * To change this template use File | Settings | File Templates.
+ */
+
+(function(){
+
+    var widgetName = 'buttoncombobox';
+
+    UM.ui.define( widgetName, ( function(){
+
+        return {
+            defaultOpt: {
+                //按钮初始文字
+                label: '',
+                title: ''
+            },
+            init: function( options ) {
+
+                var me = this;
+
+                var btnWidget = $.eduibutton({
+                    caret: true,
+                    name: options.comboboxName,
+                    title: options.title,
+                    text: options.label,
+                    click: function(){
+                        me.show( this.root() );
+                    }
+                });
+
+                me.supper.init.call( me, options );
+
+                //监听change， 改变button显示内容
+                me.on('changebefore', function( e, label ){
+                    btnWidget.eduibutton('label', label );
+                });
+
+                me.data( 'button', btnWidget );
+
+                me.attachTo(btnWidget)
+
+            },
+            button: function(){
+                return this.data( 'button' );
+            }
+        }
+
+    } )(), 'combobox' );
+
+})();
+
+/*modal 类*/
+UM.ui.define('modal', {
+    tpl: '<div class="edui-modal" tabindex="-1" >' +
+        '<div class="edui-modal-header">' +
+        '<div class="edui-close" data-hide="modal"></div>' +
+        '<h3 class="edui-title">${title}</h3>' +
+        '</div>' +
+        '<div class="edui-modal-body"  style="<%if: ${width}%>width:${width}px;<%/if%>' +
+        '<%if: ${height}%>height:${height}px;<%/if%>">' +
+        ' </div>' +
+        '<% if: ${cancellabel} || ${oklabel} %>' +
+        '<div class="edui-modal-footer">' +
+        '<div class="edui-modal-tip"></div>' +
+        '<%if: ${oklabel}%><div class="edui-btn edui-btn-primary" data-ok="modal">${oklabel}</div><%/if%>' +
+        '<%if: ${cancellabel}%><div class="edui-btn" data-hide="modal">${cancellabel}</div><%/if%>' +
+        '</div>' +
+        '<%/if%></div>',
+    defaultOpt: {
+        title: "",
+        cancellabel: "",
+        oklabel: "",
+        width: '',
+        height: '',
+        backdrop: true,
+        keyboard: true
+    },
+    init: function (options) {
+        var me = this;
+
+        me.root($(UM.utils.render(me.tpl, options || {})));
+
+        me.data("options", options);
+        if (options.okFn) {
+            me.on('ok', $.proxy(options.okFn, me))
+        }
+        if (options.cancelFn) {
+            me.on('beforehide', $.proxy(options.cancelFn, me))
+        }
+
+        me.root().delegate('[data-hide="modal"]', 'click', $.proxy(me.hide, me))
+            .delegate('[data-ok="modal"]', 'click', $.proxy(me.ok, me));
+
+        $('[data-hide="modal"],[data-ok="modal"]',me.root()).hover(function(){
+            $(this).toggleClass('edui-hover')
+        });
+    },
+    toggle: function () {
+        var me = this;
+        return me[!me.data("isShown") ? 'show' : 'hide']();
+    },
+    show: function () {
+
+        var me = this;
+
+        me.trigger("beforeshow");
+
+        if (me.data("isShown")) return;
+
+        me.data("isShown", true);
+
+        me.escape();
+
+        me.backdrop(function () {
+            me.autoCenter();
+            me.root()
+                .show()
+                .focus()
+                .trigger('aftershow');
+        })
+    },
+    showTip: function ( text ) {
+        $( '.edui-modal-tip', this.root() ).html( text ).fadeIn();
+    },
+    hideTip: function ( text ) {
+        $( '.edui-modal-tip', this.root() ).fadeOut( function (){
+            $(this).html('');
+        } );
+    },
+    autoCenter: function () {
+        //ie6下不用处理了
+        !$.IE6 && this.root().css("margin-left", -(this.root().width() / 2));
+    },
+    hide: function () {
+        var me = this;
+
+        me.trigger("beforehide");
+
+        if (!me.data("isShown")) return;
+
+        me.data("isShown", false);
+
+        me.escape();
+
+        me.hideModal();
+    },
+    escape: function () {
+        var me = this;
+        if (me.data("isShown") && me.data("options").keyboard) {
+            me.root().on('keyup', function (e) {
+                e.which == 27 && me.hide();
+            })
+        }
+        else if (!me.data("isShown")) {
+            me.root().off('keyup');
+        }
+    },
+    hideModal: function () {
+        var me = this;
+        me.root().hide();
+        me.backdrop(function () {
+            me.removeBackdrop();
+            me.trigger('afterhide');
+        })
+    },
+    removeBackdrop: function () {
+        this.$backdrop && this.$backdrop.remove();
+        this.$backdrop = null;
+    },
+    backdrop: function (callback) {
+        var me = this;
+        if (me.data("isShown") && me.data("options").backdrop) {
+            me.$backdrop = $('<div class="edui-modal-backdrop" />').click(
+                me.data("options").backdrop == 'static' ?
+                    $.proxy(me.root()[0].focus, me.root()[0])
+                    : $.proxy(me.hide, me)
+            )
+        }
+        me.trigger('afterbackdrop');
+        callback && callback();
+
+    },
+    attachTo: function ($obj) {
+        var me = this
+        if (!$obj.data('$mergeObj')) {
+
+            $obj.data('$mergeObj', me.root());
+            $obj.on('click', function () {
+                me.toggle($obj)
+            });
+            me.data('$mergeObj', $obj)
+        }
+    },
+    ok: function () {
+        var me = this;
+        me.trigger('beforeok');
+        if (me.trigger("ok", me) === false) {
+            return;
+        }
+        me.hide();
+    },
+    getBodyContainer: function () {
+        return this.root().find('.edui-modal-body')
+    }
+});
+
+
+/*tooltip 类*/
+UM.ui.define('tooltip', {
+    tpl: '<div class="edui-tooltip" unselectable="on" onmousedown="return false">' +
+        '<div class="edui-tooltip-arrow" unselectable="on" onmousedown="return false"></div>' +
+        '<div class="edui-tooltip-inner" unselectable="on" onmousedown="return false"></div>' +
+        '</div>',
+    init: function (options) {
+        var me = this;
+        me.root($(UM.utils.render(me.tpl, options || {})));
+    },
+    content: function (e) {
+        var me = this,
+            title = $(e.currentTarget).attr("data-original-title");
+
+        me.root().find('.edui-tooltip-inner')['text'](title);
+    },
+    position: function (e) {
+        var me = this,
+            $obj = $(e.currentTarget);
+
+        me.root().css($.extend({display: 'block'}, $obj ? {
+            top: $obj.outerHeight(),
+            left: (($obj.outerWidth() - me.root().outerWidth()) / 2)
+        } : {}))
+    },
+    show: function (e) {
+        if ($(e.currentTarget).hasClass('edui-disabled')) return;
+
+        var me = this;
+        me.content(e);
+        me.root().appendTo($(e.currentTarget));
+        me.position(e);
+        me.root().css('display', 'block');
+    },
+    hide: function () {
+        var me = this;
+        me.root().css('display', 'none')
+    },
+    attachTo: function ($obj) {
+        var me = this;
+
+        function tmp($obj) {
+            var me = this;
+
+            if (!$.contains(document.body, me.root()[0])) {
+                me.root().appendTo($obj);
+            }
+
+            me.data('tooltip', me.root());
+
+            $obj.each(function () {
+                if ($(this).attr("data-original-title")) {
+                    $(this).on('mouseenter', $.proxy(me.show, me))
+                        .on('mouseleave click', $.proxy(me.hide, me))
+
+                }
+            });
+
+        }
+
+        if ($.type($obj) === "undefined") {
+            $("[data-original-title]").each(function (i, el) {
+                tmp.call(me, $(el));
+            })
+
+        } else {
+            if (!$obj.data('tooltip')) {
+                tmp.call(me, $obj);
+            }
+        }
+    }
+});
+
+/*tab 类*/
+UM.ui.define('tab', {
+    init: function (options) {
+        var me = this,
+            slr = options.selector;
+
+        if ($.type(slr)) {
+            me.root($(slr, options.context));
+            me.data("context", options.context);
+
+            $(slr, me.data("context")).on('click', function (e) {
+                me.show(e);
+            });
+        }
+    },
+    show: function (e) {
+
+        var me = this,
+            $cur = $(e.target),
+            $ul = $cur.closest('ul'),
+            selector,
+            previous,
+            $target,
+            e;
+
+        selector = $cur.attr('data-context');
+        selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '');
+
+        var $tmp = $cur.parent('li');
+
+        if (!$tmp.length || $tmp.hasClass('edui-active')) return;
+
+        previous = $ul.find('.edui-active:last a')[0];
+
+        e = $.Event('beforeshow', {
+            target: $cur[0],
+            relatedTarget: previous
+        });
+
+        me.trigger(e);
+
+        if (e.isDefaultPrevented()) return;
+
+        $target = $(selector, me.data("context"));
+
+        me.activate($cur.parent('li'), $ul);
+        me.activate($target, $target.parent(), function () {
+            me.trigger({
+                type: 'aftershow', relatedTarget: previous
+            })
+        });
+    },
+    activate: function (element, container, callback) {
+        if (element === undefined) {
+            return $(".edui-tab-item.edui-active",this.root()).index();
+        }
+
+        var $active = container.find('> .edui-active');
+
+        $active.removeClass('edui-active');
+
+        element.addClass('edui-active');
+
+        callback && callback();
+    }
+});
+
+
+//button 类
+UM.ui.define('separator', {
+    tpl: '<div class="edui-separator" unselectable="on" onmousedown="return false" ></div>',
+    init: function (options) {
+        var me = this;
+        me.root($($.parseTmpl(me.tpl, options)));
+        return me;
+    }
+});
+/**
+ * @file adapter.js
+ * @desc adapt ui to editor
+ * @import core/Editor.js, core/utils.js
+ */
+
+(function () {
+    var _editorUI = {},
+        _editors = {},
+        _readyFn = [],
+        _activeWidget = null,
+        _widgetData = {},
+        _widgetCallBack = {},
+        _cacheUI = {},
+        _maxZIndex = null;
+
+    utils.extend(UM, {
+        defaultWidth : 500,
+        defaultHeight : 500,
+        registerUI: function (name, fn) {
+            utils.each(name.split(/\s+/), function (uiname) {
+                _editorUI[uiname] = fn;
+            })
+        },
+
+        setEditor : function(editor){
+            !_editors[editor.id] && (_editors[editor.id] = editor);
+        },
+        registerWidget : function(name,pro,cb){
+            _widgetData[name] = $.extend2(pro,{
+                $root : '',
+                _preventDefault:false,
+                root:function($el){
+                    return this.$root || (this.$root = $el);
+                },
+                preventDefault:function(){
+                    this._preventDefault = true;
+                },
+                clear:false
+            });
+            if(cb){
+                _widgetCallBack[name] = cb;
+            }
+        },
+        getWidgetData : function(name){
+            return _widgetData[name]
+        },
+        setWidgetBody : function(name,$widget,editor){
+            if(!editor._widgetData){
+
+                utils.extend(editor,{
+                    _widgetData : {},
+                    getWidgetData : function(name){
+                        return this._widgetData[name];
+                    },
+                    getWidgetCallback : function(widgetName){
+                        var me = this;
+                        return function(){
+                            return  _widgetCallBack[widgetName].apply(me,[me,$widget].concat(Array.prototype.slice.call(arguments,0)))
+                        }
+                    }
+                })
+
+            }
+            var pro = _widgetData[name];
+            if(!pro){
+                return null;
+            }
+            pro = editor._widgetData[name];
+            if(!pro){
+                pro = _widgetData[name];
+                pro = editor._widgetData[name] = $.type(pro) == 'function' ? pro : utils.clone(pro);
+            }
+
+            pro.root($widget.edui().getBodyContainer());
+
+            pro.initContent(editor,$widget);
+            if(!pro._preventDefault){
+                pro.initEvent(editor,$widget);
+            }
+
+            pro.width &&  $widget.width(pro.width);
+
+
+        },
+        setActiveWidget : function($widget){
+            _activeWidget = $widget;
+        },
+        getEditor: function (id, options) {
+            var editor = _editors[id] || (_editors[id] = this.createEditor(id, options));
+            _maxZIndex = _maxZIndex ? Math.max(editor.getOpt('zIndex'), _maxZIndex):editor.getOpt('zIndex');
+            return editor;
+        },
+        setTopEditor: function(editor){
+            $.each(_editors, function(i, o){
+                if(editor == o) {
+                    editor.$container && editor.$container.css('zIndex', _maxZIndex + 1);
+                } else {
+                    o.$container && o.$container.css('zIndex', o.getOpt('zIndex'));
+                }
+            });
+        },
+        clearCache : function(id){
+            if ( _editors[id]) {
+                delete  _editors[id]
+            }
+        },
+        delEditor: function (id) {
+            var editor;
+            if (editor = _editors[id]) {
+                editor.destroy();
+            }
+        },
+        ready: function( fn ){
+            _readyFn.push( fn );
+        },
+        createEditor: function (id, opt) {
+            var editor = new UM.Editor(opt);
+            var T = this;
+
+            editor.langIsReady ? $.proxy(renderUI,T)() : editor.addListener("langReady", $.proxy(renderUI,T));
+            function renderUI(){
+
+
+                var $container = this.createUI('#' + id, editor);
+                editor.key=id;
+                editor.ready(function(){
+                    $.each( _readyFn, function( index, fn ){
+                        $.proxy( fn, editor )();
+                    } );
+                });
+                var options = editor.options;
+                if(options.initialFrameWidth){
+                    options.minFrameWidth = options.initialFrameWidth
+                }else{
+                    options.minFrameWidth = options.initialFrameWidth = editor.$body.width() || UM.defaultWidth;
+                }
+
+                $container.css({
+                    width: options.initialFrameWidth,
+                    zIndex:editor.getOpt('zIndex')
+                });
+
+                //ie6下缓存图片
+                UM.browser.ie && UM.browser.version === 6 && document.execCommand("BackgroundImageCache", false, true);
+
+                editor.render(id);
+
+
+                //添加tooltip;
+                $.eduitooltip && $.eduitooltip('attachTo', $("[data-original-title]",$container)).css('z-index',editor.getOpt('zIndex')+1);
+
+                $container.find('a').click(function(evt){
+                    evt.preventDefault()
+                });
+
+                editor.fireEvent("afteruiready");
+            }
+
+            return editor;
+
+        },
+        createUI: function (id, editor) {
+            var $editorCont = $(id),
+                $container = $('<div class="edui-container"><div class="edui-editor-body"></div></div>').insertBefore($editorCont);
+            editor.$container = $container;
+            editor.container = $container[0];
+
+            editor.$body = $editorCont;
+
+            //修正在ie9+以上的版本中，自动长高收起时的，残影问题
+            if(browser.ie && browser.ie9above){
+                var $span = $('<span style="padding:0;margin:0;height:0;width:0"></span>');
+                $span.insertAfter($container);
+            }
+            //初始化注册的ui组件
+            $.each(_editorUI,function(n,v){
+                var widget = v.call(editor,n);
+                if(widget){
+                    _cacheUI[n] = widget;
+                }
+
+            });
+
+            $container.find('.edui-editor-body').append($editorCont).before(this.createToolbar(editor.options, editor));
+
+            $container.find('.edui-toolbar').append($('<div class="edui-dialog-container"></div>'));
+
+
+            return $container;
+        },
+        createToolbar: function (options, editor) {
+            var $toolbar = $.eduitoolbar(), toolbar = $toolbar.edui();
+            //创建下来菜单列表
+
+            if (options.toolbar && options.toolbar.length) {
+                var btns = [];
+                $.each(options.toolbar,function(i,uiNames){
+                    $.each(uiNames.split(/\s+/),function(index,name){
+                        if(name == '|'){
+                                $.eduiseparator && btns.push($.eduiseparator());
+                        }else{
+                            var ui = _cacheUI[name];
+                            if(name=="fullscreen"){
+                                ui&&btns.unshift(ui);
+                            }else{
+                                ui && btns.push(ui);
+                            }
+                        }
+
+                    });
+                    btns.length && toolbar.appendToBtnmenu(btns);
+                });
+            } else {
+                $toolbar.find('.edui-btn-toolbar').remove()
+            }
+            return $toolbar;
+        }
+
+    })
+
+
+})();
+
+
+
+UM.registerUI('bold italic redo undo underline strikethrough superscript subscript insertorderedlist insertunorderedlist ' +
+    'cleardoc selectall link unlink print preview justifyleft justifycenter justifyright justifyfull removeformat horizontal drafts',
+    function(name) {
+        var me = this;
+        var $btn = $.eduibutton({
+            icon : name,
+            click : function(){
+                me.execCommand(name);
+            },
+            title: this.getLang('labelMap')[name] || ''
+        });
+
+        this.addListener('selectionchange',function(){
+            var state = this.queryCommandState(name);
+            $btn.edui().disabled(state == -1).active(state == 1)
+        });
+        return $btn;
+    }
+);
+
+
+/**
+ * 全屏组件
+ */
+
+(function(){
+
+    //状态缓存
+    var STATUS_CACHE = {},
+    //状态值列表
+        STATUS_LIST = [ 'width', 'height', 'position', 'top', 'left', 'margin', 'padding', 'overflowX', 'overflowY' ],
+        CONTENT_AREA_STATUS = {},
+    //页面状态
+        DOCUMENT_STATUS = {},
+        DOCUMENT_ELEMENT_STATUS = {},
+
+        FULLSCREENS = {};
+
+
+    UM.registerUI('fullscreen', function( name ){
+
+        var me = this,
+            $button = $.eduibutton({
+                'icon': 'fullscreen',
+                'title': (me.options.labelMap && me.options.labelMap[name]) || me.getLang("labelMap." + name),
+                'click': function(){
+                    //切换
+                    me.execCommand( name );
+                    UM.setTopEditor(me);
+                }
+            });
+
+        me.addListener( "selectionchange", function () {
+
+            var state = this.queryCommandState( name );
+            $button.edui().disabled( state == -1 ).active( state == 1 );
+
+        } );
+
+        //切换至全屏
+        me.addListener('ready', function(){
+
+            me.options.fullscreen && Fullscreen.getInstance( me ).toggle();
+
+        });
+
+        return $button;
+
+    });
+
+    UM.commands[ 'fullscreen' ] = {
+
+        execCommand: function (cmdName) {
+
+            Fullscreen.getInstance( this ).toggle();
+
+        },
+        queryCommandState: function (cmdName) {
+
+            return this._edui_fullscreen_status;
+        },
+        notNeedUndo: 1
+
+    };
+
+    function Fullscreen( editor ) {
+
+        var me = this;
+
+        if( !editor ) {
+            throw new Error('invalid params, notfound editor');
+        }
+
+        me.editor = editor;
+
+        //记录初始化的全屏组件
+        FULLSCREENS[ editor.uid ] = this;
+
+        editor.addListener('destroy', function(){
+            delete FULLSCREENS[ editor.uid ];
+            me.editor = null;
+        });
+
+    }
+
+    Fullscreen.prototype = {
+
+        /**
+         * 全屏状态切换
+         */
+        toggle: function(){
+
+            var editor = this.editor,
+            //当前编辑器的缩放状态
+                _edui_fullscreen_status = this.isFullState();
+            editor.fireEvent('beforefullscreenchange', !_edui_fullscreen_status );
+
+            //更新状态
+            this.update( !_edui_fullscreen_status );
+
+            !_edui_fullscreen_status ? this.enlarge() : this.revert();
+
+            editor.fireEvent('afterfullscreenchange', !_edui_fullscreen_status );
+            if(editor.body.contentEditable === 'true'){
+                editor.fireEvent( 'fullscreenchanged', !_edui_fullscreen_status );
+            }
+
+            editor.fireEvent( 'selectionchange' );
+
+        },
+        /**
+         * 执行放大
+         */
+        enlarge: function(){
+
+            this.saveSataus();
+
+            this.setDocumentStatus();
+
+            this.resize();
+
+        },
+        /**
+         * 全屏还原
+         */
+        revert: function(){
+
+            //还原CSS表达式
+            var options = this.editor.options,
+                height = /%$/.test(options.initialFrameHeight) ?  '100%' : (options.initialFrameHeight - this.getStyleValue("padding-top")- this.getStyleValue("padding-bottom") - this.getStyleValue('border-width'));
+
+            $.IE6 && this.getEditorHolder().style.setExpression('height', 'this.scrollHeight <= ' + height + ' ? "' + height + 'px" : "auto"');
+
+            //还原容器状态
+            this.revertContainerStatus();
+
+            this.revertContentAreaStatus();
+
+            this.revertDocumentStatus();
+
+        },
+        /**
+         * 更新状态
+         * @param isFull 当前状态是否是全屏状态
+         */
+        update: function( isFull ) {
+            this.editor._edui_fullscreen_status = isFull;
+        },
+        /**
+         * 调整当前编辑器的大小, 如果当前编辑器不处于全屏状态， 则不做调整
+         */
+        resize: function(){
+
+            var $win = null,
+                height = 0,
+                width = 0,
+                borderWidth = 0,
+                paddingWidth = 0,
+                editor = this.editor,
+                me = this,
+                bound = null,
+                editorBody = null;
+
+            if( !this.isFullState() ) {
+                return;
+            }
+
+            $win = $( window );
+            width = $win.width();
+            height = $win.height();
+            editorBody = this.getEditorHolder();
+            //文本编辑区border宽度
+            borderWidth = parseInt( domUtils.getComputedStyle( editorBody, 'border-width' ), 10 ) || 0;
+            //容器border宽度
+            borderWidth += parseInt( domUtils.getComputedStyle( editor.container, 'border-width' ), 10 ) || 0;
+            //容器padding
+            paddingWidth += parseInt( domUtils.getComputedStyle( editorBody, 'padding-left' ), 10 ) + parseInt( domUtils.getComputedStyle( editorBody, 'padding-right' ), 10 ) || 0;
+
+            //干掉css表达式
+            $.IE6 && editorBody.style.setExpression( 'height', null );
+
+            bound = this.getBound();
+
+            $( editor.container ).css( {
+                width: width + 'px',
+                height: height + 'px',
+                position: !$.IE6 ? 'fixed' : 'absolute',
+                top: bound.top,
+                left: bound.left,
+                margin: 0,
+                padding: 0,
+                overflowX: 'hidden',
+                overflowY: 'hidden'
+            } );
+
+            $( editorBody ).css({
+                width: width - 2*borderWidth - paddingWidth + 'px',
+                height: height - 2*borderWidth - ( editor.options.withoutToolbar ? 0 : $( '.edui-toolbar', editor.container ).outerHeight() ) - $( '.edui-bottombar', editor.container).outerHeight() + 'px',
+                overflowX: 'hidden',
+                overflowY: 'auto'
+            });
+
+        },
+        /**
+         * 保存状态
+         */
+        saveSataus: function(){
+
+            var styles = this.editor.container.style,
+                tmp = null,
+                cache = {};
+
+            for( var i= 0, len = STATUS_LIST.length; i<len; i++ ) {
+
+                tmp = STATUS_LIST[ i ];
+                cache[ tmp ] = styles[ tmp ];
+
+            }
+
+            STATUS_CACHE[ this.editor.uid ] = cache;
+
+            this.saveContentAreaStatus();
+            this.saveDocumentStatus();
+
+        },
+        saveContentAreaStatus: function(){
+
+            var $holder = $(this.getEditorHolder());
+
+            CONTENT_AREA_STATUS[ this.editor.uid ] = {
+                width: $holder.css("width"),
+                overflowX: $holder.css("overflowX"),
+                overflowY: $holder.css("overflowY"),
+                height: $holder.css("height")
+            };
+
+        },
+        /**
+         * 保存与指定editor相关的页面的状态
+         */
+        saveDocumentStatus: function(){
+
+            var $doc = $( this.getEditorDocumentBody() );
+
+            DOCUMENT_STATUS[ this.editor.uid ] = {
+                overflowX: $doc.css( 'overflowX' ),
+                overflowY: $doc.css( 'overflowY' )
+            };
+            DOCUMENT_ELEMENT_STATUS[ this.editor.uid ] = {
+                overflowX: $( this.getEditorDocumentElement() ).css( 'overflowX'),
+                overflowY: $( this.getEditorDocumentElement() ).css( 'overflowY' )
+            };
+
+        },
+        /**
+         * 恢复容器状态
+         */
+        revertContainerStatus: function(){
+            $( this.editor.container ).css( this.getEditorStatus() );
+        },
+        /**
+         * 恢复编辑区状态
+         */
+        revertContentAreaStatus: function(){
+            var holder = this.getEditorHolder(),
+                state = this.getContentAreaStatus();
+
+            if ( this.supportMin() ) {
+                delete state.height;
+                holder.style.height = null;
+            }
+
+            $( holder ).css( state );
+        },
+        /**
+         * 恢复页面状态
+         */
+        revertDocumentStatus: function() {
+
+            var status = this.getDocumentStatus();
+            $( this.getEditorDocumentBody() ).css( 'overflowX', status.body.overflowX );
+            $( this.getEditorDocumentElement() ).css( 'overflowY', status.html.overflowY );
+
+        },
+        setDocumentStatus: function(){
+            $(this.getEditorDocumentBody()).css( {
+                overflowX: 'hidden',
+                overflowY: 'hidden'
+            } );
+            $(this.getEditorDocumentElement()).css( {
+                overflowX: 'hidden',
+                overflowY: 'hidden'
+            } );
+        },
+        /**
+         * 检测当前编辑器是否处于全屏状态全屏状态
+         * @returns {boolean} 是否处于全屏状态
+         */
+        isFullState: function(){
+            return !!this.editor._edui_fullscreen_status;
+        },
+        /**
+         * 获取编辑器状态
+         */
+        getEditorStatus: function(){
+            return STATUS_CACHE[ this.editor.uid ];
+        },
+        getContentAreaStatus: function(){
+            return CONTENT_AREA_STATUS[ this.editor.uid ];
+        },
+        getEditorDocumentElement: function(){
+            return this.editor.container.ownerDocument.documentElement;
+        },
+        getEditorDocumentBody: function(){
+            return this.editor.container.ownerDocument.body;
+        },
+        /**
+         * 获取编辑区包裹对象
+         */
+        getEditorHolder: function(){
+            return this.editor.body;
+        },
+        /**
+         * 获取编辑器状态
+         * @returns {*}
+         */
+        getDocumentStatus: function(){
+            return {
+                'body': DOCUMENT_STATUS[ this.editor.uid ],
+                'html': DOCUMENT_ELEMENT_STATUS[ this.editor.uid ]
+            };
+        },
+        supportMin: function () {
+
+            var node = null;
+
+            if ( !this._support ) {
+
+                node = document.createElement("div");
+
+                this._support = "minWidth" in node.style;
+
+                node = null;
+
+            }
+
+            return this._support;
+
+        },
+        getBound: function () {
+
+            var tags = {
+                    html: true,
+                    body: true
+                },
+                result = {
+                    top: 0,
+                    left: 0
+                },
+                offsetParent = null;
+
+            if ( !$.IE6 ) {
+                return result;
+            }
+
+            offsetParent = this.editor.container.offsetParent;
+
+            if( offsetParent && !tags[ offsetParent.nodeName.toLowerCase() ] ) {
+                tags = offsetParent.getBoundingClientRect();
+                result.top = -tags.top;
+                result.left = -tags.left;
+            }
+
+            return result;
+
+        },
+        getStyleValue: function (attr) {
+            return parseInt(domUtils.getComputedStyle( this.getEditorHolder() ,attr));
+        }
+    };
+
+
+    $.extend( Fullscreen, {
+        /**
+         * 监听resize
+         */
+        listen: function(){
+
+            var timer = null;
+
+            if( Fullscreen._hasFullscreenListener ) {
+                return;
+            }
+
+            Fullscreen._hasFullscreenListener = true;
+
+            $( window ).on( 'resize', function(){
+
+                if( timer !== null ) {
+                    window.clearTimeout( timer );
+                    timer = null;
+                }
+
+                timer = window.setTimeout(function(){
+
+                    for( var key in FULLSCREENS ) {
+                        FULLSCREENS[ key ].resize();
+                    }
+
+                    timer = null;
+
+                }, 50);
+
+            } );
+
+        },
+
+        getInstance: function ( editor ) {
+
+            if ( !FULLSCREENS[editor.uid  ] ) {
+                new Fullscreen( editor );
+            }
+
+            return FULLSCREENS[editor.uid  ];
+
+        }
+
+    });
+
+    //开始监听
+    Fullscreen.listen();
+
+})();
+UM.registerUI('link image video map formula',function(name){
+
+    var me = this, currentRange, $dialog,
+        opt = {
+            title: (me.options.labelMap && me.options.labelMap[name]) || me.getLang("labelMap." + name),
+            url: me.options.UMEDITOR_HOME_URL + 'dialogs/' + name + '/' + name + '.js'
+        };
+
+    var $btn = $.eduibutton({
+        icon: name,
+        title: this.getLang('labelMap')[name] || ''
+    });
+    //加载模版数据
+    utils.loadFile(document,{
+        src: opt.url,
+        tag: "script",
+        type: "text/javascript",
+        defer: "defer"
+    },function(){
+        //调整数据
+        var data = UM.getWidgetData(name);
+        if(!data) return;
+        if(data.buttons){
+            var ok = data.buttons.ok;
+            if(ok){
+                opt.oklabel = ok.label || me.getLang('ok');
+                if(ok.exec){
+                    opt.okFn = function(){
+                        return $.proxy(ok.exec,null,me,$dialog)()
+                    }
+                }
+            }
+            var cancel = data.buttons.cancel;
+            if(cancel){
+                opt.cancellabel = cancel.label || me.getLang('cancel');
+                if(cancel.exec){
+                    opt.cancelFn = function(){
+                        return $.proxy(cancel.exec,null,me,$dialog)()
+                    }
+                }
+            }
+        }
+        data.width && (opt.width = data.width);
+        data.height && (opt.height = data.height);
+
+        $dialog = $.eduimodal(opt);
+
+        $dialog.attr('id', 'edui-dialog-' + name).addClass('edui-dialog-' + name)
+            .find('.edui-modal-body').addClass('edui-dialog-' + name + '-body');
+
+        $dialog.edui().on('beforehide',function () {
+            var rng = me.selection.getRange();
+            if (rng.equals(currentRange)) {
+                rng.select()
+            }
+        }).on('beforeshow', function () {
+                var $root = this.root(),
+                    win = null,
+                    offset = null;
+                currentRange = me.selection.getRange();
+                if (!$root.parent()[0]) {
+                    me.$container.find('.edui-dialog-container').append($root);
+                }
+
+                //IE6下 特殊处理, 通过计算进行定位
+                if( $.IE6 ) {
+
+                    win = {
+                        width: $( window ).width(),
+                        height: $( window ).height()
+                    };
+                    offset = $root.parents(".edui-toolbar")[0].getBoundingClientRect();
+                    $root.css({
+                        position: 'absolute',
+                        margin: 0,
+                        left: ( win.width - $root.width() ) / 2 - offset.left,
+                        top: 100 - offset.top
+                    });
+
+                }
+                UM.setWidgetBody(name,$dialog,me);
+                UM.setTopEditor(me);
+        }).on('afterbackdrop',function(){
+            this.$backdrop.css('zIndex',me.getOpt('zIndex')+1).appendTo(me.$container.find('.edui-dialog-container'))
+            $dialog.css('zIndex',me.getOpt('zIndex')+2)
+        }).on('beforeok',function(){
+            try{
+                currentRange.select()
+            }catch(e){}
+        }).attachTo($btn)
+    });
+
+
+
+
+    me.addListener('selectionchange', function () {
+        var state = this.queryCommandState(name);
+        $btn.edui().disabled(state == -1).active(state == 1)
+    });
+    return $btn;
+});
+UM.registerUI( 'emotion formula', function( name ){
+    var me = this,
+        url  = me.options.UMEDITOR_HOME_URL + 'dialogs/' +name+ '/'+name+'.js';
+
+    var $btn = $.eduibutton({
+        icon: name,
+        title: this.getLang('labelMap')[name] || ''
+    });
+
+    //加载模版数据
+    utils.loadFile(document,{
+        src: url,
+        tag: "script",
+        type: "text/javascript",
+        defer: "defer"
+    },function(){
+        var opt = {
+            url : url
+        };
+        //调整数据
+        var data = UM.getWidgetData(name);
+
+        data.width && (opt.width = data.width);
+        data.height && (opt.height = data.height);
+
+        $.eduipopup(opt).css('zIndex',me.options.zIndex + 1)
+            .addClass('edui-popup-' + name)
+            .edui()
+            .on('beforeshow',function(){
+                var $root = this.root();
+                if(!$root.parent().length){
+                    me.$container.find('.edui-dialog-container').append($root);
+                }
+                UM.setWidgetBody(name,$root,me);
+                UM.setTopEditor(me);
+            }).attachTo($btn,{
+                offsetTop:-5,
+                offsetLeft:10,
+                caretLeft:11,
+                caretTop:-8
+            });
+        me.addListener('selectionchange', function () {
+            var state = this.queryCommandState(name);
+            $btn.edui().disabled(state == -1).active(state == 1);
+        });
+    });
+    return $btn;
+
+} );
+UM.registerUI('imagescale',function () {
+    var me = this,
+        $imagescale;
+
+    me.setOpt('imageScaleEnabled', true);
+
+    if (browser.webkit && me.getOpt('imageScaleEnabled')) {
+
+        me.addListener('click', function (type, e) {
+            var range = me.selection.getRange(),
+                img = range.getClosedNode(),
+                target = e.target;
+
+            /* 点击第一个图片的后面,八个角不消失 fix:3652 */
+            if (img && img.tagName == 'IMG' && target == img) {
+
+                if (!$imagescale) {
+                    $imagescale = $.eduiscale({'$wrap':me.$container}).css('zIndex', me.options.zIndex);
+                    me.$container.append($imagescale);
+
+                    var _keyDownHandler = function () {
+                        $imagescale.edui().hide();
+                    }, _mouseDownHandler = function (e) {
+                        var ele = e.target || e.srcElement;
+                        if (ele && ele.className.indexOf('edui-scale') == -1) {
+                            _keyDownHandler(e);
+                        }
+                    }, timer;
+
+                    $imagescale.edui()
+                        .on('aftershow', function () {
+                            $(document).bind('keydown', _keyDownHandler);
+                            $(document).bind('mousedown', _mouseDownHandler);
+                            me.selection.getNative().removeAllRanges();
+                        })
+                        .on('afterhide', function () {
+                            $(document).unbind('keydown', _keyDownHandler);
+                            $(document).unbind('mousedown', _mouseDownHandler);
+                            var target = $imagescale.edui().getScaleTarget();
+                            if (target.parentNode) {
+                                me.selection.getRange().selectNode(target).select();
+                            }
+                        })
+                        .on('mousedown', function (e) {
+                            me.selection.getNative().removeAllRanges();
+                            var ele = e.target || e.srcElement;
+                            if (ele && ele.className.indexOf('edui-scale-hand') == -1) {
+                                timer = setTimeout(function() {
+                                    $imagescale.edui().hide();
+                                }, 200);
+                            }
+                        })
+                        .on('mouseup', function (e) {
+                            var ele = e.target || e.srcElement;
+                            if (ele && ele.className.indexOf('edui-scale-hand') == -1) {
+                                clearTimeout(timer);
+                            }
+                        });
+                }
+                $imagescale.edui().show($(img));
+
+            } else {
+                if ($imagescale && $imagescale.css('display') != 'none') $imagescale.edui().hide();
+
+            }
+        });
+
+        me.addListener('click', function (type, e) {
+            if (e.target.tagName == 'IMG') {
+                var range = new dom.Range(me.document, me.body);
+                range.selectNode(e.target).select();
+            }
+        });
+
+    }
+});
+UM.registerUI('autofloat',function(){
+    var me = this,
+        lang = me.getLang();
+    me.setOpt({
+        autoFloatEnabled: true,
+        topOffset: 0
+    });
+    var optsAutoFloatEnabled = me.options.autoFloatEnabled !== false,
+        topOffset = me.options.topOffset;
+
+
+    //如果不固定toolbar的位置，则直接退出
+    if(!optsAutoFloatEnabled){
+        return;
+    }
+    me.ready(function(){
+        var LteIE6 = browser.ie && browser.version <= 6,
+            quirks = browser.quirks;
+
+        function checkHasUI(){
+            if(!UM.ui){
+                alert(lang.autofloatMsg);
+                return 0;
+            }
+            return 1;
+        }
+        function fixIE6FixedPos(){
+            var docStyle = document.body.style;
+            docStyle.backgroundImage = 'url("about:blank")';
+            docStyle.backgroundAttachment = 'fixed';
+        }
+        var	bakCssText,
+            placeHolder = document.createElement('div'),
+            toolbarBox,orgTop,
+            getPosition=function(element){
+                var bcr;
+                //trace  IE6下在控制编辑器显隐时可能会报错，catch一下
+                try{
+                    bcr = element.getBoundingClientRect();
+                }catch(e){
+                    bcr={left:0,top:0,height:0,width:0}
+                }
+                var rect = {
+                    left: Math.round(bcr.left),
+                    top: Math.round(bcr.top),
+                    height: Math.round(bcr.bottom - bcr.top),
+                    width: Math.round(bcr.right - bcr.left)
+                };
+                var doc;
+                while ((doc = element.ownerDocument) !== document &&
+                    (element = domUtils.getWindow(doc).frameElement)) {
+                    bcr = element.getBoundingClientRect();
+                    rect.left += bcr.left;
+                    rect.top += bcr.top;
+                }
+                rect.bottom = rect.top + rect.height;
+                rect.right = rect.left + rect.width;
+                return rect;
+            };
+        var isFullScreening = false;
+        function setFloating(){
+            if(isFullScreening){
+                return;
+            }
+            var toobarBoxPos = domUtils.getXY(toolbarBox),
+                origalFloat = domUtils.getComputedStyle(toolbarBox,'position'),
+                origalLeft = domUtils.getComputedStyle(toolbarBox,'left');
+            toolbarBox.style.width = toolbarBox.offsetWidth + 'px';
+            toolbarBox.style.zIndex = me.options.zIndex * 1 + 1;
+            toolbarBox.parentNode.insertBefore(placeHolder, toolbarBox);
+            if (LteIE6 || (quirks && browser.ie)) {
+                if(toolbarBox.style.position != 'absolute'){
+                    toolbarBox.style.position = 'absolute';
+                }
+                toolbarBox.style.top = (document.body.scrollTop||document.documentElement.scrollTop) - orgTop + topOffset  + 'px';
+            } else {
+                if(toolbarBox.style.position != 'fixed'){
+                    toolbarBox.style.position = 'fixed';
+                    toolbarBox.style.top = topOffset +"px";
+                    ((origalFloat == 'absolute' || origalFloat == 'relative') && parseFloat(origalLeft)) && (toolbarBox.style.left = toobarBoxPos.x + 'px');
+                }
+            }
+        }
+        function unsetFloating(){
+
+            if(placeHolder.parentNode){
+                placeHolder.parentNode.removeChild(placeHolder);
+            }
+            toolbarBox.style.cssText = bakCssText;
+        }
+
+        function updateFloating(){
+            var rect3 = getPosition(me.container);
+            var offset=me.options.toolbarTopOffset||0;
+            if (rect3.top < 0 && rect3.bottom - toolbarBox.offsetHeight > offset) {
+                setFloating();
+            }else{
+                unsetFloating();
+            }
+        }
+        var defer_updateFloating = utils.defer(function(){
+            updateFloating();
+        },browser.ie ? 200 : 100,true);
+
+        me.addListener('destroy',function(){
+            $(window).off('scroll resize',updateFloating);
+            me.removeListener('keydown', defer_updateFloating);
+        });
+
+        if(checkHasUI(me)){
+            toolbarBox = $('.edui-toolbar',me.container)[0];
+            me.addListener("afteruiready",function(){
+                setTimeout(function(){
+                    orgTop = $(toolbarBox).offset().top;
+                },100);
+            });
+            bakCssText = toolbarBox.style.cssText;
+            placeHolder.style.height = toolbarBox.offsetHeight + 'px';
+            if(LteIE6){
+                fixIE6FixedPos();
+            }
+
+            $(window).on('scroll resize',updateFloating);
+            me.addListener('keydown', defer_updateFloating);
+            me.addListener('resize', function(){
+                unsetFloating();
+                placeHolder.style.height = toolbarBox.offsetHeight + 'px';
+                updateFloating();
+            });
+
+            me.addListener('beforefullscreenchange', function (t, enabled){
+                if (enabled) {
+                    unsetFloating();
+                    isFullScreening = enabled;
+                }
+            });
+            me.addListener('fullscreenchanged', function (t, enabled){
+                if (!enabled) {
+                    updateFloating();
+                }
+                isFullScreening = enabled;
+            });
+            me.addListener('sourcemodechanged', function (t, enabled){
+                setTimeout(function (){
+                    updateFloating();
+                },0);
+            });
+            me.addListener("clearDoc",function(){
+                setTimeout(function(){
+                    updateFloating();
+                },0);
+
+            })
+        }
+    })
+
+
+});
+UM.registerUI('source',function(name){
+    var me = this;
+    me.addListener('fullscreenchanged',function(){
+        me.$container.find('textarea').width(me.$body.width() - 10).height(me.$body.height())
+
+    });
+    var $btn = $.eduibutton({
+        icon : name,
+        click : function(){
+            me.execCommand(name);
+            UM.setTopEditor(me);
+        },
+        title: this.getLang('labelMap')[name] || ''
+    });
+
+    this.addListener('selectionchange',function(){
+        var state = this.queryCommandState(name);
+        $btn.edui().disabled(state == -1).active(state == 1)
+    });
+    return $btn;
+});
+
+UM.registerUI('paragraph fontfamily fontsize', function( name ) {
+
+    var me = this,
+        label = (me.options.labelMap && me.options.labelMap[name]) || me.getLang("labelMap." + name),
+        options = {
+            label: label,
+            title: label,
+            comboboxName: name,
+            items: me.options[ name ] || [],
+            itemStyles: [],
+            value: [],
+            autowidthitem: []
+        },
+        $combox = null,
+        comboboxWidget = null;
+    if(options.items.length == 0){
+        return null;
+    }
+    switch ( name ) {
+
+        case 'paragraph':
+            options = transForParagraph( options );
+            break;
+
+        case 'fontfamily':
+            options = transForFontfamily( options );
+            break;
+
+        case 'fontsize':
+            options = transForFontsize( options );
+            break;
+
+    }
+
+    //实例化
+    $combox =  $.eduibuttoncombobox(options).css('zIndex',me.getOpt('zIndex') + 1);
+    comboboxWidget =  $combox.edui();
+
+    comboboxWidget.on('comboboxselect', function( evt, res ){
+                        me.execCommand( name, res.value );
+                    }).on("beforeshow", function(){
+                        if( $combox.parent().length === 0 ) {
+                            $combox.appendTo(  me.$container.find('.edui-dialog-container') );
+                        }
+                        UM.setTopEditor(me);
+                    });
+
+
+    //状态反射
+    this.addListener('selectionchange',function( evt ){
+
+        var state  = this.queryCommandState( name ),
+            value = this.queryCommandValue( name );
+
+        //设置按钮状态
+        comboboxWidget.button().edui().disabled( state == -1 ).active( state == 1 );
+        if(value){
+            //设置label
+            value = value.replace(/['"]/g, '').toLowerCase().split(/['|"]?\s*,\s*[\1]?/);
+
+            comboboxWidget.selectItemByLabel( value );
+        }
+
+
+    });
+
+    return comboboxWidget.button().addClass('edui-combobox');
+
+    /**
+     * 宽度自适应工具函数
+     * @param word 单词内容
+     * @param hasSuffix 是否含有后缀
+     */
+    function wordCountAdaptive ( word, hasSuffix ) {
+
+        var $tmpNode = $('<span>' ).html( word ).css( {
+                display: 'inline',
+                position: 'absolute',
+                top: -10000000,
+                left: -100000
+            } ).appendTo( document.body),
+            width = $tmpNode.width();
+
+        $tmpNode.remove();
+        $tmpNode = null;
+
+        if( width < 50 ) {
+
+            return word;
+
+        } else {
+
+            word = word.slice( 0, hasSuffix ? -4 : -1 );
+
+            if( !word.length ) {
+                return '...';
+            }
+
+            return wordCountAdaptive( word + '...', true );
+
+        }
+
+    }
+
+
+    //段落参数转换
+    function transForParagraph ( options ) {
+
+        var tempItems = [];
+
+        for( var key in options.items ) {
+
+            options.value.push( key );
+            tempItems.push( key );
+            options.autowidthitem.push( wordCountAdaptive( key ) );
+
+        }
+
+        options.items = tempItems;
+        options.autoRecord = false;
+
+        return options;
+
+    }
+
+    //字体参数转换
+    function transForFontfamily ( options ) {
+
+        var temp = null,
+            tempItems = [];
+
+        for( var i = 0, len = options.items.length; i < len; i++ ) {
+
+            temp = options.items[ i ].val;
+            tempItems.push( temp.split(/\s*,\s*/)[0] );
+            options.itemStyles.push('font-family: ' + temp);
+            options.value.push( temp );
+            options.autowidthitem.push( wordCountAdaptive( tempItems[ i ] ) );
+
+        }
+
+        options.items = tempItems;
+
+        return options;
+
+    }
+
+    //字体大小参数转换
+    function transForFontsize ( options ) {
+
+        var temp = null,
+            tempItems = [];
+
+        options.itemStyles = [];
+        options.value = [];
+
+        for( var i = 0, len = options.items.length; i < len; i++ ) {
+
+            temp = options.items[ i ];
+            tempItems.push( temp );
+            options.itemStyles.push('font-size: ' + temp +'px');
+
+        }
+
+        options.value = options.items;
+        options.items = tempItems;
+        options.autoRecord = false;
+
+        return options;
+
+    }
+
+});
+
+
+UM.registerUI('forecolor backcolor', function( name ) {
+    function getCurrentColor() {
+        return domUtils.getComputedStyle( $colorLabel[0], 'background-color' );
+    }
+
+    var me = this,
+        $colorPickerWidget = null,
+        $colorLabel = null,
+        $btn = null;
+
+    //querycommand
+    this.addListener('selectionchange', function(){
+
+        var state = this.queryCommandState( name );
+        $btn.edui().disabled( state == -1 ).active( state == 1 );
+
+    });
+
+    $btn = $.eduicolorsplitbutton({
+        icon: name,
+        caret: true,
+        name: name,
+        title: me.getLang("labelMap")[name],
+        click: function() {
+            me.execCommand( name, getCurrentColor() );
+        }
+    });
+
+    $colorLabel = $btn.edui().colorLabel();
+
+    $colorPickerWidget = $.eduicolorpicker({
+        name: name,
+        lang_clearColor: me.getLang('clearColor') || '',
+        lang_themeColor: me.getLang('themeColor') || '',
+        lang_standardColor: me.getLang('standardColor') || ''
+    })
+        .on('pickcolor', function( evt, color ){
+            window.setTimeout( function(){
+                $colorLabel.css("backgroundColor", color);
+                me.execCommand( name, color );
+            }, 0 );
+        })
+        .on('show',function(){
+            UM.setActiveWidget( colorPickerWidget.root() );
+        }).css('zIndex',me.getOpt('zIndex') + 1);
+
+    $btn.edui().on('arrowclick',function(){
+        if(!$colorPickerWidget.parent().length){
+            me.$container.find('.edui-dialog-container').append($colorPickerWidget);
+        }
+        $colorPickerWidget.edui().show($btn,{
+            caretDir:"down",
+            offsetTop:-5,
+            offsetLeft:8,
+            caretLeft:11,
+            caretTop:-8
+        });
+        UM.setTopEditor(me);
+    }).register('click', $btn, function () {
+            $colorPickerWidget.edui().hide()
+        });
+
+    return $btn;
+
+});
+
+})(jQuery)
\ No newline at end of file
diff --git a/pluss-manage-page/src/main/webapp/page/umeditor/umeditor.min.js b/pluss-manage-page/src/main/webapp/page/umeditor/umeditor.min.js
new file mode 100644
index 0000000..d598f93
--- /dev/null
+++ b/pluss-manage-page/src/main/webapp/page/umeditor/umeditor.min.js
@@ -0,0 +1,273 @@
+/*
+ UEditor Mini??
+ version: 1.2.2
+ build: Fri Feb 10 2017 15:01:51 GMT+0800 (CST)
+*/
+var $jscomp={scope:{},findInternal:function(g,B,w){g instanceof String&&(g=String(g));for(var x=g.length,m=0;m<x;m++){var E=g[m];if(B.call(w,E,m,g))return{i:m,v:E}}return{i:-1,v:void 0}}};$jscomp.defineProperty="function"==typeof Object.defineProperties?Object.defineProperty:function(g,B,w){if(w.get||w.set)throw new TypeError("ES3 does not support getters and setters.");g!=Array.prototype&&g!=Object.prototype&&(g[B]=w.value)};
+$jscomp.getGlobal=function(g){return"undefined"!=typeof window&&window===g?g:"undefined"!=typeof global&&null!=global?global:g};$jscomp.global=$jscomp.getGlobal(this);$jscomp.polyfill=function(g,B,w,x){if(B){w=$jscomp.global;g=g.split(".");for(x=0;x<g.length-1;x++){var m=g[x];m in w||(w[m]={});w=w[m]}g=g[g.length-1];x=w[g];B=B(x);B!=x&&null!=B&&$jscomp.defineProperty(w,g,{configurable:!0,writable:!0,value:B})}};
+$jscomp.polyfill("Array.prototype.find",function(g){return g?g:function(g,w){return $jscomp.findInternal(this,g,w).v}},"es6-impl","es3");
+(function(g){function B(a,b,d){var c;b=b.toLowerCase();return(c=a.__allListeners||d&&(a.__allListeners={}))&&(c[b]||d&&(c[b]=[]))}function w(a,b,d,c,f,h){c=c&&a[b];var e;for(!c&&(c=a[d]);!c&&(e=(e||a).parentNode);){if("BODY"==e.tagName||h&&!h(e))return null;c=e[d]}return c&&f&&!f(c)?w(c,b,d,!1,f):c}UMEDITOR_CONFIG=window.UMEDITOR_CONFIG||{};window.UM={plugins:{},commands:{},I18N:{},version:"1.2.2"};var x=UM.dom={},m=UM.browser=function(){var a=navigator.userAgent.toLowerCase(),b=window.opera,d={ie:/(msie\s|trident.*rv:)([\w.]+)/.test(a),
+opera:!!b&&b.version,webkit:-1<a.indexOf(" applewebkit/"),mac:-1<a.indexOf("macintosh"),quirks:"BackCompat"==document.compatMode};d.gecko="Gecko"==navigator.product&&!d.webkit&&!d.opera&&!d.ie;var c=0;if(d.ie){var c=a.match(/(?:msie\s([\w.]+))/),f=a.match(/(?:trident.*rv:([\w.]+))/),c=c&&f&&c[1]&&f[1]?Math.max(1*c[1],1*f[1]):c&&c[1]?1*c[1]:f&&f[1]?1*f[1]:0;d.ie11Compat=11==document.documentMode;d.ie9Compat=9==document.documentMode;d.ie8=!!document.documentMode;d.ie8Compat=8==document.documentMode;
+d.ie7Compat=7==c&&!document.documentMode||7==document.documentMode;d.ie6Compat=7>c||d.quirks;d.ie9above=8<c;d.ie9below=9>c}d.gecko&&(f=a.match(/rv:([\d\.]+)/))&&(f=f[1].split("."),c=1E4*f[0]+100*(f[1]||0)+1*(f[2]||0));/chrome\/(\d+\.\d)/i.test(a)&&(d.chrome=+RegExp.$1);/(\d+\.\d)?(?:\.\d)?\s+safari\/?(\d+\.\d+)?/i.test(a)&&!/chrome/i.test(a)&&(d.safari=+(RegExp.$1||RegExp.$2));d.opera&&(c=parseFloat(b.version()));d.webkit&&(c=parseFloat(a.match(/ applewebkit\/(\d+)/)[1]));d.version=c;d.isCompatible=
+!d.mobile&&(d.ie&&6<=c||d.gecko&&10801<=c||d.opera&&9.5<=c||d.air&&1<=c||d.webkit&&522<=c||!1);return d}(),E=m.ie,n=UM.utils={each:function(a,b,d){if(null!=a)if(a.length===+a.length)for(var c=0,f=a.length;c<f;c++){if(!1===b.call(d,a[c],c,a))return!1}else for(c in a)if(a.hasOwnProperty(c)&&!1===b.call(d,a[c],c,a))return!1},makeInstance:function(a){var b=new Function;b.prototype=a;a=new b;b.prototype=null;return a},extend:function(a,b,d){if(b)for(var c in b)d&&a.hasOwnProperty(c)||(a[c]=b[c]);return a},
+extend2:function(a){for(var b=arguments,d=1;d<b.length;d++){var c=b[d],f;for(f in c)a.hasOwnProperty(f)||(a[f]=c[f])}return a},inherits:function(a,b){var d=a.prototype,c=n.makeInstance(b.prototype);n.extend(c,d,!0);a.prototype=c;return c.constructor=a},bind:function(a,b){return function(){return a.apply(b,arguments)}},defer:function(a,b,d){var c;return function(){d&&clearTimeout(c);c=setTimeout(a,b)}},indexOf:function(a,b,d){var c=-1;d=this.isNumber(d)?d:0;this.each(a,function(a,h){if(h>=d&&a===b)return c=
+h,!1});return c},removeItem:function(a,b){for(var d=0,c=a.length;d<c;d++)a[d]===b&&(a.splice(d,1),d--)},trim:function(a){return a.replace(/(^[ \t\n\r]+)|([ \t\n\r]+$)/g,"")},listToMap:function(a){if(!a)return{};a=n.isArray(a)?a:a.split(",");for(var b=0,d,c={};d=a[b++];)c[d.toUpperCase()]=c[d]=1;return c},unhtml:function(a,b){return a?a.replace(b||/[&<">'](?:(amp|lt|quot|gt|#39|nbsp);)?/g,function(a,b){return b?a:{"<":"&lt;","&":"&amp;",'"':"&quot;",">":"&gt;","'":"&#39;"}[a]}):""},html:function(a){return a?
+a.replace(/&((g|l|quo)t|amp|#39);/g,function(a){return{"&lt;":"<","&amp;":"&","&quot;":'"',"&gt;":">","&#39;":"'"}[a]}):""},cssStyleToDomStyle:function(){var a=document.createElement("div").style,b={"float":void 0!=a.cssFloat?"cssFloat":void 0!=a.styleFloat?"styleFloat":"float"};return function(a){return b[a]||(b[a]=a.toLowerCase().replace(/-./g,function(a){return a.charAt(1).toUpperCase()}))}}(),loadFile:function(){function a(a,c){try{for(var d=0,h;h=b[d++];)if(h.doc===a&&h.url==(c.src||c.href))return h}catch(e){return null}}
+var b=[];return function(d,c,f){var h=a(d,c);if(h)h.ready?f&&f():h.funs.push(f);else if(b.push({doc:d,url:c.src||c.href,funs:[f]}),!d.body){f=[];for(var e in c)"tag"!=e&&f.push(e+'="'+c[e]+'"');d.write("<"+c.tag+" "+f.join(" ")+" ></"+c.tag+">")}else if(!c.id||!d.getElementById(c.id)){var l=d.createElement(c.tag);delete c.tag;for(e in c)l.setAttribute(e,c[e]);l.onload=l.onreadystatechange=function(){if(!this.readyState||/loaded|complete/.test(this.readyState)){h=a(d,c);if(0<h.funs.length){h.ready=
+1;for(var b;b=h.funs.pop();)b()}l.onload=l.onreadystatechange=null}};l.onerror=function(){throw Error("The load "+(c.href||c.src)+" fails,check the url settings of file umeditor.config.js ");};d.getElementsByTagName("head")[0].appendChild(l)}}}(),isEmptyObject:function(a){if(null==a)return!0;if(this.isArray(a)||this.isString(a))return 0===a.length;for(var b in a)if(a.hasOwnProperty(b))return!1;return!0},fixColor:function(a,b){if(/color/i.test(a)&&/rgba?/.test(b)){var d=b.split(",");if(3<d.length)return"";
+b="#";for(var c=0,f;f=d[c++];)f=parseInt(f.replace(/[^\d]/gi,""),10).toString(16),b+=1==f.length?"0"+f:f;b=b.toUpperCase()}return b},clone:function(a,b){var d;b=b||{};for(var c in a)a.hasOwnProperty(c)&&(d=a[c],"object"==typeof d?(b[c]=n.isArray(d)?[]:{},n.clone(a[c],b[c])):b[c]=d);return b},transUnitToPx:function(a){if(!/(pt|cm)/.test(a))return a;var b;a.replace(/([\d.]+)(\w+)/,function(d,c,f){a=c;b=f});switch(b){case "cm":a=25*parseFloat(a);break;case "pt":a=Math.round(96*parseFloat(a)/72)}return a+
+(a?"px":"")},cssRule:m.ie&&11!=m.version?function(a,b,d){var c;d=d||document;c=d.indexList?d.indexList:d.indexList={};var f;if(c[a])f=d.styleSheets[c[a]];else{if(void 0===b)return"";f=d.createStyleSheet("",d=d.styleSheets.length);c[a]=d}if(void 0===b)return f.cssText;f.cssText=b||""}:function(a,b,d){d=d||document;var c=d.getElementsByTagName("head")[0],f;if(!(f=d.getElementById(a))){if(void 0===b)return"";f=d.createElement("style");f.id=a;c.appendChild(f)}if(void 0===b)return f.innerHTML;""!==b?f.innerHTML=
+b:c.removeChild(f)},render:function(a,b){return etpl.compile(a)(b)}};n.each("String Function Array Number RegExp Object".split(" "),function(a){UM.utils["is"+a]=function(b){return Object.prototype.toString.apply(b)=="[object "+a+"]"}});var I=UM.EventBase=function(){};I.prototype={addListener:function(a,b){a=n.trim(a).split(" ");for(var d=0,c;c=a[d++];)B(this,c,!0).push(b)},removeListener:function(a,b){a=n.trim(a).split(" ");for(var d=0,c;c=a[d++];)n.removeItem(B(this,c)||[],b)},fireEvent:function(){for(var a=
+arguments[0],a=n.trim(a).split(" "),b=0,d;d=a[b++];){var c=B(this,d),f,h,e;if(c)for(e=c.length;e--;)if(c[e]){h=c[e].apply(this,arguments);if(!0===h)return h;void 0!==h&&(f=h)}if(h=this["on"+d.toLowerCase()])f=h.apply(this,arguments)}return f}};var p=x.dtd=function(){function a(a){for(var b in a)a[b.toUpperCase()]=a[b];return a}var b=n.extend2,d=a({isindex:1,fieldset:1}),c=a({input:1,button:1,select:1,textarea:1,label:1}),f=b(a({a:1}),c),h=b({iframe:1},f),e=a({hr:1,ul:1,menu:1,div:1,blockquote:1,noscript:1,
+table:1,center:1,address:1,dir:1,pre:1,h5:1,dl:1,h4:1,noframes:1,h6:1,ol:1,h1:1,h3:1,h2:1}),l=a({ins:1,del:1,script:1,style:1}),t=b(a({b:1,acronym:1,bdo:1,"var":1,"#":1,abbr:1,code:1,br:1,i:1,cite:1,kbd:1,u:1,strike:1,s:1,tt:1,strong:1,q:1,samp:1,em:1,dfn:1,span:1}),l),v=b(a({sub:1,img:1,embed:1,object:1,sup:1,basefont:1,map:1,applet:1,font:1,big:1,small:1}),t),r=b(a({p:1}),v),c=b(a({iframe:1}),v,c),v=a({img:1,embed:1,noscript:1,br:1,kbd:1,center:1,button:1,basefont:1,h5:1,h4:1,samp:1,h6:1,ol:1,h1:1,
+h3:1,h2:1,form:1,font:1,"#":1,select:1,menu:1,ins:1,abbr:1,label:1,code:1,table:1,script:1,cite:1,input:1,iframe:1,strong:1,textarea:1,noframes:1,big:1,small:1,span:1,hr:1,sub:1,bdo:1,"var":1,div:1,object:1,sup:1,strike:1,dir:1,map:1,dl:1,applet:1,del:1,isindex:1,fieldset:1,ul:1,b:1,acronym:1,a:1,blockquote:1,i:1,u:1,s:1,tt:1,address:1,q:1,pre:1,p:1,em:1,dfn:1}),q=b(a({a:0}),c),y=a({tr:1}),g=a({"#":1}),k=b(a({param:1}),v),u=b(a({form:1}),d,h,e,r),m=a({li:1,ol:1,ul:1}),p=a({style:1,script:1}),C=a({base:1,
+link:1,meta:1,title:1}),p=b(C,p),F=a({head:1,body:1}),z=a({html:1}),D=a({address:1,blockquote:1,center:1,dir:1,div:1,dl:1,fieldset:1,form:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,hr:1,isindex:1,menu:1,noframes:1,ol:1,p:1,pre:1,table:1,ul:1}),w=a({area:1,base:1,basefont:1,br:1,col:1,command:1,dialog:1,embed:1,hr:1,img:1,input:1,isindex:1,keygen:1,link:1,meta:1,param:1,source:1,track:1,wbr:1});return a({$nonBodyContent:b(z,F,C),$block:D,$inline:q,$inlineWithA:b(a({a:1}),q),$body:b(a({script:1,style:1}),D),$cdata:a({script:1,
+style:1}),$empty:w,$nonChild:a({iframe:1,textarea:1}),$listItem:a({dd:1,dt:1,li:1}),$list:a({ul:1,ol:1,dl:1}),$isNotEmpty:a({table:1,ul:1,ol:1,dl:1,iframe:1,area:1,base:1,col:1,hr:1,img:1,embed:1,input:1,link:1,meta:1,param:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1}),$removeEmpty:a({a:1,abbr:1,acronym:1,address:1,b:1,bdo:1,big:1,cite:1,code:1,del:1,dfn:1,em:1,font:1,i:1,ins:1,label:1,kbd:1,q:1,s:1,samp:1,small:1,span:1,strike:1,strong:1,sub:1,sup:1,tt:1,u:1,"var":1}),$removeEmptyBlock:a({p:1,div:1}),$tableContent:a({caption:1,
+col:1,colgroup:1,tbody:1,td:1,tfoot:1,th:1,thead:1,tr:1,table:1}),$notTransContent:a({pre:1,script:1,style:1,textarea:1}),html:F,head:p,style:g,script:g,body:u,base:{},link:{},meta:{},title:g,col:{},tr:a({td:1,th:1}),img:{},embed:{},colgroup:a({thead:1,col:1,tbody:1,tr:1,tfoot:1}),noscript:u,td:u,br:{},th:u,center:u,kbd:q,button:b(r,e),basefont:{},h5:q,h4:q,samp:q,h6:q,ol:m,h1:q,h3:q,option:g,h2:q,form:b(d,h,e,r),select:a({optgroup:1,option:1}),font:q,ins:q,menu:m,abbr:q,label:q,table:a({thead:1,
+col:1,tbody:1,tr:1,colgroup:1,caption:1,tfoot:1}),code:q,tfoot:y,cite:q,li:u,input:{},iframe:u,strong:q,textarea:g,noframes:u,big:q,small:q,span:a({"#":1,br:1,b:1,strong:1,u:1,i:1,em:1,sub:1,sup:1,strike:1,span:1}),hr:q,dt:q,sub:q,optgroup:a({option:1}),param:{},bdo:q,"var":q,div:u,object:k,sup:q,dd:u,strike:q,area:{},dir:m,map:b(a({area:1,form:1,p:1}),d,l,e),applet:k,dl:a({dt:1,dd:1}),del:q,isindex:{},fieldset:b(a({legend:1}),v),thead:y,ul:m,acronym:q,b:q,a:b(a({a:1}),c),blockquote:b(a({td:1,tr:1,
+tbody:1,li:1}),u),caption:q,i:q,u:q,tbody:y,s:q,address:b(h,r),tt:q,legend:q,q:q,pre:b(t,f),p:b(a({a:1}),q),em:q,dfn:q})}(),J=E&&9>m.version?{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder"}:{tabindex:"tabIndex",readonly:"readOnly"},K=n.listToMap("-webkit-box -moz-box block list-item table table-row-group table-header-group table-footer-group table-row table-column-group table-column table-cell table-caption".split(" ")),
+k=x.domUtils={NODE_ELEMENT:1,NODE_DOCUMENT:9,NODE_TEXT:3,NODE_COMMENT:8,NODE_DOCUMENT_FRAGMENT:11,POSITION_IDENTICAL:0,POSITION_DISCONNECTED:1,POSITION_FOLLOWING:2,POSITION_PRECEDING:4,POSITION_IS_CONTAINED:8,POSITION_CONTAINS:16,fillChar:E&&"6"==m.version?"\ufeff":"\u200b",keys:{8:1,46:1,16:1,17:1,18:1,37:1,38:1,39:1,40:1,13:1},breakParent:function(a,b){var d,c=a,f=a,h,e;do{c=c.parentNode;h?(d=c.cloneNode(!1),d.appendChild(h),h=d,d=c.cloneNode(!1),d.appendChild(e),e=d):(h=c.cloneNode(!1),e=h.cloneNode(!1));
+for(;d=f.previousSibling;)h.insertBefore(d,h.firstChild);for(;d=f.nextSibling;)e.appendChild(d);f=c}while(b!==c);d=b.parentNode;d.insertBefore(h,b);d.insertBefore(e,b);d.insertBefore(a,e);k.remove(b);return a},trimWhiteTextNode:function(a){function b(b){for(var c;(c=a[b])&&3==c.nodeType&&k.isWhitespace(c);)a.removeChild(c)}b("firstChild");b("lastChild")},getPosition:function(a,b){if(a===b)return 0;var d,c=[a],f=[b];for(d=a;d=d.parentNode;){if(d===b)return 10;c.push(d)}for(d=b;d=d.parentNode;){if(d===
+a)return 20;f.push(d)}c.reverse();f.reverse();if(c[0]!==f[0])return 1;for(d=-1;d++,c[d]===f[d];);a=c[d];for(b=f[d];a=a.nextSibling;)if(a===b)return 4;return 2},getNodeIndex:function(a,b){for(var d=a,c=0;d=d.previousSibling;)b&&3==d.nodeType?d.nodeType!=d.nextSibling.nodeType&&c++:c++;return c},inDoc:function(a,b){return 10==k.getPosition(a,b)},findParent:function(a,b,d){if(a&&!k.isBody(a))for(a=d?a:a.parentNode;a;){if(!b||b(a)||k.isBody(a))return b&&!b(a)&&k.isBody(a)?null:a;a=a.parentNode}return null},
+findParentByTagName:function(a,b,d,c){b=n.listToMap(n.isArray(b)?b:[b]);return k.findParent(a,function(a){return b[a.tagName]&&!(c&&c(a))},d)},findParents:function(a,b,d,c){for(b=b&&(d&&d(a)||!d)?[a]:[];a=k.findParent(a,d);)b.push(a);return c?b:b.reverse()},insertAfter:function(a,b){return a.parentNode.insertBefore(b,a.nextSibling)},remove:function(a,b){var d=a.parentNode,c;if(d){if(b&&a.hasChildNodes())for(;c=a.firstChild;)d.insertBefore(c,a);d.removeChild(a)}return a},getNextDomNode:function(a,
+b,d,c){return w(a,"firstChild","nextSibling",b,d,c)},getPreDomNode:function(a,b,d,c){return w(a,"lastChild","previousSibling",b,d,c)},isBookmarkNode:function(a){return 1==a.nodeType&&a.id&&/^_baidu_bookmark_/i.test(a.id)},getWindow:function(a){a=a.ownerDocument||a;return a.defaultView||a.parentWindow},getCommonAncestor:function(a,b){if(a===b)return a;for(var d=[a],c=[b],f=a,h=-1;f=f.parentNode;){if(f===b)return f;d.push(f)}for(f=b;f=f.parentNode;){if(f===a)return f;c.push(f)}d.reverse();for(c.reverse();h++,
+d[h]===c[h];);return 0==h?null:d[h-1]},clearEmptySibling:function(a,b,d){function c(a,b){for(var c;a&&!k.isBookmarkNode(a)&&(k.isEmptyInlineElement(a)||!(new RegExp("[^\t\n\r"+k.fillChar+"]")).test(a.nodeValue));)c=a[b],k.remove(a),a=c}!b&&c(a.nextSibling,"nextSibling");!d&&c(a.previousSibling,"previousSibling")},split:function(a,b){var d=a.ownerDocument;if(m.ie&&b==a.nodeValue.length){var c=d.createTextNode("");return k.insertAfter(a,c)}c=a.splitText(b);m.ie8&&(d=d.createTextNode(""),k.insertAfter(c,
+d),k.remove(d));return c},isWhitespace:function(a){return!(new RegExp("[^ \t\n\r"+k.fillChar+"]")).test(a.nodeValue)},getXY:function(a){for(var b=0,d=0;a.offsetParent;)d+=a.offsetTop,b+=a.offsetLeft,a=a.offsetParent;return{x:b,y:d}},isEmptyInlineElement:function(a){if(1!=a.nodeType||!p.$removeEmpty[a.tagName])return 0;for(a=a.firstChild;a;){if(k.isBookmarkNode(a)||1==a.nodeType&&!k.isEmptyInlineElement(a)||3==a.nodeType&&!k.isWhitespace(a))return 0;a=a.nextSibling}return 1},isBlockElm:function(a){return 1==
+a.nodeType&&(p.$block[a.tagName]||K[k.getComputedStyle(a,"display")])&&!p.$nonChild[a.tagName]},getElementsByTagName:function(a,b,d){if(d&&n.isString(d)){var c=d;d=function(a){var b=!1;g.each(n.trim(c).replace(/[ ]{2,}/g," ").split(" "),function(l,c){if(g(a).hasClass(c))return b=!0,!1});return b}}b=n.trim(b).replace(/[ ]{2,}/g," ").split(" ");for(var f=[],h=0,e;e=b[h++];){e=a.getElementsByTagName(e);for(var l=0,t;t=e[l++];)d&&!d(t)||f.push(t)}return f},unSelectable:E&&m.ie9below||m.opera?function(a){a.onselectstart=
+function(){return!1};a.onclick=a.onkeyup=a.onkeydown=function(){return!1};a.unselectable="on";a.setAttribute("unselectable","on");for(var b=0,d;d=a.all[b++];)switch(d.tagName.toLowerCase()){case "iframe":case "textarea":case "input":case "select":break;default:d.unselectable="on",a.setAttribute("unselectable","on")}}:function(a){a.style.MozUserSelect=a.style.webkitUserSelect=a.style.msUserSelect=a.style.KhtmlUserSelect="none"},removeAttributes:function(a,b){b=n.isArray(b)?b:n.trim(b).replace(/[ ]{2,}/g,
+" ").split(" ");for(var d=0,c;c=b[d++];){c=J[c]||c;switch(c){case "className":a[c]="";break;case "style":a.style.cssText="",a.getAttributeNode("style")&&!m.ie&&a.removeAttributeNode(a.getAttributeNode("style"))}a.removeAttribute(c)}},createElement:function(a,b,d){return k.setAttributes(a.createElement(b),d)},setAttributes:function(a,b){for(var d in b)if(b.hasOwnProperty(d)){var c=b[d];switch(d){case "class":a.className=c;break;case "style":a.style.cssText=a.style.cssText+";"+c;break;case "innerHTML":a[d]=
+c;break;case "value":a.value=c;break;default:a.setAttribute(J[d]||d,c)}}return a},getComputedStyle:function(a,b){return n.transUnitToPx(n.fixColor(b,g(a).css(b)))},preventDefault:function(a){a.preventDefault?a.preventDefault():a.returnValue=!1},removeStyle:function(a,b){m.ie?("color"==b&&(b="(^|;)"+b),a.style.cssText=a.style.cssText.replace(new RegExp(b+"[^:]*:[^;]+;?","ig"),"")):a.style.removeProperty?a.style.removeProperty(b):a.style.removeAttribute(n.cssStyleToDomStyle(b));a.style.cssText||k.removeAttributes(a,
+["style"])},getStyle:function(a,b){var d=a.style[n.cssStyleToDomStyle(b)];return n.fixColor(b,d)},setStyle:function(a,b,d){a.style[n.cssStyleToDomStyle(b)]=d;n.trim(a.style.cssText)||this.removeAttributes(a,"style")},removeDirtyAttr:function(a){for(var b=0,d,c=a.getElementsByTagName("*");d=c[b++];)d.removeAttribute("_moz_dirty");a.removeAttribute("_moz_dirty")},getChildCount:function(a,b){var d=0,c=a.firstChild;for(b=b||function(){return 1};c;)b(c)&&d++,c=c.nextSibling;return d},isEmptyNode:function(a){return!a.firstChild||
+0==k.getChildCount(a,function(a){return!k.isBr(a)&&!k.isBookmarkNode(a)&&!k.isWhitespace(a)})},isBr:function(a){return 1==a.nodeType&&"BR"==a.tagName},isEmptyBlock:function(a,b){if(1!=a.nodeType)return 0;b=b||new RegExp("[ \t\r\n"+k.fillChar+"]","g");if(0<a[m.ie?"innerText":"textContent"].replace(b,"").length)return 0;for(var d in p.$isNotEmpty)if(a.getElementsByTagName(d).length)return 0;return 1},isCustomeNode:function(a){return 1==a.nodeType&&a.getAttribute("_ue_custom_node_")},fillNode:function(a,
+b){var d=m.ie?a.createTextNode(k.fillChar):a.createElement("br");b.innerHTML="";b.appendChild(d)},isBoundaryNode:function(a,b){for(var d;!k.isBody(a);)if(d=a,a=a.parentNode,d!==a[b])return!1;return!0},isFillChar:function(a,b){return 3==a.nodeType&&!a.nodeValue.replace(new RegExp((b?"^":"")+k.fillChar),"").length},isBody:function(a){return g(a).hasClass("edui-body-container")}},H=new RegExp(k.fillChar,"g");(function(){function a(a,b,c,e){1==b.nodeType&&(p.$empty[b.tagName]||p.$nonChild[b.tagName])&&
+(c=k.getNodeIndex(b)+(a?0:1),b=b.parentNode);a?(e.startContainer=b,e.startOffset=c,e.endContainer||e.collapse(!0)):(e.endContainer=b,e.endOffset=c,e.startContainer||e.collapse(!1));e.collapsed=e.startContainer&&e.endContainer&&e.startContainer===e.endContainer&&e.startOffset==e.endOffset;return e}function b(a,b){try{if(h&&k.inDoc(h,a))if(h.nodeValue.replace(H,"").length)h.nodeValue=h.nodeValue.replace(H,"");else{var l=h.parentNode;for(k.remove(h);l&&k.isEmptyInlineElement(l)&&(m.safari?!(k.getPosition(l,
+b)&k.POSITION_CONTAINS):!l.contains(b));)h=l.parentNode,k.remove(l),l=h}}catch(r){}}function d(a,b){var l;for(a=a[b];a&&k.isFillChar(a);)l=a[b],k.remove(a),a=l}var c=0,f=k.fillChar,h,e=x.Range=function(a,b){this.startContainer=this.startOffset=this.endContainer=this.endOffset=null;this.document=a;this.collapsed=!0;this.body=b};e.prototype={deleteContents:function(){var a;if(!this.collapsed){a=this.startContainer;var b=this.endContainer,c=this.startOffset,e=this.endOffset,d=this.document,f=d.createDocumentFragment(),
+h,g;1==a.nodeType&&(a=a.childNodes[c]||(h=a.appendChild(d.createTextNode(""))));1==b.nodeType&&(b=b.childNodes[e]||(g=b.appendChild(d.createTextNode(""))));if(a===b&&3==a.nodeType)f.appendChild(d.createTextNode(a.substringData(c,e-c))),a.deleteData(c,e-c),this.collapse(!0);else{for(var u,n,p=f,C=k.findParents(a,!0),F=k.findParents(b,!0),z=0;C[z]==F[z];)z++;for(var D=z,w;w=C[D];D++){u=w.nextSibling;w==a?h||(3==this.startContainer.nodeType?(p.appendChild(d.createTextNode(a.nodeValue.slice(c))),a.deleteData(c,
+a.nodeValue.length-c)):p.appendChild(a)):(n=w.cloneNode(!1),p.appendChild(n));for(;u&&u!==b&&u!==F[D];)w=u.nextSibling,p.appendChild(u),u=w;p=n}p=f;C[z]||(p.appendChild(C[z-1].cloneNode(!1)),p=p.firstChild);for(D=z;c=F[D];D++){u=c.previousSibling;c==b?g||3!=this.endContainer.nodeType||(p.appendChild(d.createTextNode(b.substringData(0,e))),b.deleteData(0,e)):(n=c.cloneNode(!1),p.appendChild(n));if(D!=z||!C[z])for(;u&&u!==a;)c=u.previousSibling,p.insertBefore(u,p.firstChild),u=c;p=n}this.setStartBefore(F[z]?
+C[z]?F[z]:C[z-1]:F[z-1]).collapse(!0);h&&k.remove(h);g&&k.remove(g)}}m.webkit&&(a=this.startContainer,3!=a.nodeType||a.nodeValue.length||(this.setStartBefore(a).collapse(!0),k.remove(a)));return this},inFillChar:function(){var a=this.startContainer;return this.collapsed&&3==a.nodeType&&a.nodeValue.replace(new RegExp("^"+k.fillChar),"").length+1==a.nodeValue.length?!0:!1},setStart:function(b,c){return a(!0,b,c,this)},setEnd:function(b,c){return a(!1,b,c,this)},setStartAfter:function(a){return this.setStart(a.parentNode,
+k.getNodeIndex(a)+1)},setStartBefore:function(a){return this.setStart(a.parentNode,k.getNodeIndex(a))},setEndAfter:function(a){return this.setEnd(a.parentNode,k.getNodeIndex(a)+1)},setEndBefore:function(a){return this.setEnd(a.parentNode,k.getNodeIndex(a))},setStartAtFirst:function(a){return this.setStart(a,0)},setStartAtLast:function(a){return this.setStart(a,3==a.nodeType?a.nodeValue.length:a.childNodes.length)},setEndAtFirst:function(a){return this.setEnd(a,0)},setEndAtLast:function(a){return this.setEnd(a,
+3==a.nodeType?a.nodeValue.length:a.childNodes.length)},selectNode:function(a){return this.setStartBefore(a).setEndAfter(a)},selectNodeContents:function(a){return this.setStart(a,0).setEndAtLast(a)},cloneRange:function(){return(new e(this.document)).setStart(this.startContainer,this.startOffset).setEnd(this.endContainer,this.endOffset)},collapse:function(a){a?(this.endContainer=this.startContainer,this.endOffset=this.startOffset):(this.startContainer=this.endContainer,this.startOffset=this.endOffset);
+this.collapsed=!0;return this},shrinkBoundary:function(a){function b(a){return 1==a.nodeType&&!k.isBookmarkNode(a)&&!p.$empty[a.tagName]&&!p.$nonChild[a.tagName]}for(var c,l=this.collapsed;1==this.startContainer.nodeType&&(c=this.startContainer.childNodes[this.startOffset])&&b(c);)this.setStart(c,0);if(l)return this.collapse(!0);if(!a)for(;1==this.endContainer.nodeType&&0<this.endOffset&&(c=this.endContainer.childNodes[this.endOffset-1])&&b(c);)this.setEnd(c,c.childNodes.length);return this},trimBoundary:function(a){this.txtToElmBoundary();
+var b=this.startContainer,c=this.startOffset,l=this.collapsed,e=this.endContainer;if(3==b.nodeType){if(0==c)this.setStartBefore(b);else if(c>=b.nodeValue.length)this.setStartAfter(b);else{var d=k.split(b,c);b===e?this.setEnd(d,this.endOffset-c):b.parentNode===e&&(this.endOffset+=1);this.setStartBefore(d)}if(l)return this.collapse(!0)}a||(c=this.endOffset,e=this.endContainer,3==e.nodeType&&(0==c?this.setEndBefore(e):(c<e.nodeValue.length&&k.split(e,c),this.setEndAfter(e))));return this},txtToElmBoundary:function(a){function b(a,
+b){var c=a[b+"Container"],l=a[b+"Offset"];if(3==c.nodeType)if(!l)a["set"+b.replace(/(\w)/,function(a){return a.toUpperCase()})+"Before"](c);else if(l>=c.nodeValue.length)a["set"+b.replace(/(\w)/,function(a){return a.toUpperCase()})+"After"](c)}if(a||!this.collapsed)b(this,"start"),b(this,"end");return this},insertNode:function(a){var b=a,c=1;11==a.nodeType&&(b=a.firstChild,c=a.childNodes.length);this.trimBoundary(!0);var l=this.startContainer,e=l.childNodes[this.startOffset];e?l.insertBefore(a,e):
+l.appendChild(a);b.parentNode===this.endContainer&&(this.endOffset+=c);return this.setStartBefore(b)},setCursor:function(a,b){return this.collapse(!a).select(b)},createBookmark:function(a,b){var l,e=this.document.createElement("span");e.style.cssText="display:none;line-height:0px;";e.appendChild(this.document.createTextNode("\u200d"));e.id="_baidu_bookmark_start_"+(b?"":c++);this.collapsed||(l=e.cloneNode(!0),l.id="_baidu_bookmark_end_"+(b?"":c++));this.insertNode(e);l&&this.collapse().insertNode(l).setEndBefore(l);
+this.setStartAfter(e);return{start:a?e.id:e,end:l?a?l.id:l:null,id:a}},moveToBookmark:function(a){var b=a.id?this.document.getElementById(a.start):a.start;a=a.end&&a.id?this.document.getElementById(a.end):a.end;this.setStartBefore(b);k.remove(b);a?(this.setEndBefore(a),k.remove(a)):this.collapse(!0);return this},adjustmentBoundary:function(){if(!this.collapsed){for(;!k.isBody(this.startContainer)&&this.startOffset==this.startContainer[3==this.startContainer.nodeType?"nodeValue":"childNodes"].length&&
+this.startContainer[3==this.startContainer.nodeType?"nodeValue":"childNodes"].length;)this.setStartAfter(this.startContainer);for(;!k.isBody(this.endContainer)&&!this.endOffset&&this.endContainer[3==this.endContainer.nodeType?"nodeValue":"childNodes"].length;)this.setEndBefore(this.endContainer)}return this},getClosedNode:function(){var a;if(!this.collapsed){var b=this.cloneRange().adjustmentBoundary().shrinkBoundary();b.collapsed||1!=b.startContainer.nodeType||b.startContainer!==b.endContainer||
+1!=b.endOffset-b.startOffset||(b=b.startContainer.childNodes[b.startOffset])&&1==b.nodeType&&(p.$empty[b.tagName]||p.$nonChild[b.tagName])&&(a=b)}return a},select:m.ie?function(a,c){var l;this.collapsed||this.shrinkBoundary();var e=this.getClosedNode();if(e&&!c){try{l=this.document.body.createControlRange(),l.addElement(e),l.select()}catch(G){}return this}var e=this.createBookmark(),t=e.start;l=this.document.body.createTextRange();l.moveToElementText(t);l.moveStart("character",1);if(!this.collapsed){var g=
+this.document.body.createTextRange(),t=e.end;g.moveToElementText(t);l.setEndPoint("EndToEnd",g)}else if(!a&&3!=this.startContainer.nodeType){var g=this.document.createTextNode(f),A=this.document.createElement("span");A.appendChild(this.document.createTextNode(f));t.parentNode.insertBefore(A,t);t.parentNode.insertBefore(g,t);b(this.document,g);h=g;d(A,"previousSibling");d(t,"nextSibling");l.moveStart("character",-1);l.collapse(!0)}this.moveToBookmark(e);A&&k.remove(A);try{l.select()}catch(G){}return this}:
+function(a){function c(a){function b(b,c,e){3==b.nodeType&&b.nodeValue.length<c&&(a[e+"Offset"]=b.nodeValue.length)}b(a.startContainer,a.startOffset,"start");b(a.endContainer,a.endOffset,"end")}var e=k.getWindow(this.document),l=e.getSelection();m.gecko?this.body.focus():e.focus();if(l){l.removeAllRanges();this.collapsed&&!a&&(a=e=this.startContainer,1==e.nodeType&&(a=e.childNodes[this.startOffset]),3==e.nodeType&&this.startOffset||(a?a.previousSibling&&3==a.previousSibling.nodeType:e.lastChild&&
+3==e.lastChild.nodeType)||(a=this.document.createTextNode(f),this.insertNode(a),b(this.document,a),d(a,"previousSibling"),d(a,"nextSibling"),h=a,this.setStart(a,m.webkit?1:0).collapse(!0)));e=this.document.createRange();if(this.collapsed&&m.opera&&1==this.startContainer.nodeType)if(a=this.startContainer.childNodes[this.startOffset]){for(;a&&k.isBlockElm(a);)if(1==a.nodeType&&a.childNodes[0])a=a.childNodes[0];else break;a&&this.setStartBefore(a).collapse(!0)}else(a=this.startContainer.lastChild)&&
+k.isBr(a)&&this.setStartBefore(a).collapse(!0);c(this);e.setStart(this.startContainer,this.startOffset);e.setEnd(this.endContainer,this.endOffset);l.addRange(e)}return this},createAddress:function(a,b){function c(a){for(var c=a?l.startContainer:l.endContainer,e=k.findParents(c,!0,function(a){return!k.isBody(a)}),d=[],f=0,h;h=e[f++];)d.push(k.getNodeIndex(h,b));e=0;if(b)if(3==c.nodeType){for(c=c.previousSibling;c&&3==c.nodeType;)e+=c.nodeValue.replace(H,"").length,c=c.previousSibling;e+=a?l.startOffset:
+l.endOffset}else if(c=c.childNodes[a?l.startOffset:l.endOffset])e=k.getNodeIndex(c,b);else for(c=a?l.startContainer:l.endContainer,a=c.firstChild;a;)if(k.isFillChar(a))a=a.nextSibling;else if(e++,3==a.nodeType)for(;a&&3==a.nodeType;)a=a.nextSibling;else a=a.nextSibling;else e=a?k.isFillChar(c)?0:l.startOffset:l.endOffset;0>e&&(e=0);d.push(e);return d}var e={},l=this;e.startAddress=c(!0);a||(e.endAddress=l.collapsed?[].concat(e.startAddress):c());return e},moveToAddress:function(a,b){function c(a,
+b){for(var c=e.body,l,d,f=0,h,t=a.length;f<t;f++)if(h=a[f],l=c,c=c.childNodes[h],!c){d=h;break}b?c?e.setStartBefore(c):e.setStart(l,d):c?e.setEndBefore(c):e.setEnd(l,d)}var e=this;c(a.startAddress,!0);!b&&a.endAddress&&c(a.endAddress);return e},equals:function(a){for(var b in this)if(this.hasOwnProperty(b)&&this[b]!==a[b])return!1;return!0},scrollIntoView:function(){var a=g('<span style="padding:0;margin:0;display:block;border:0">&nbsp;</span>');this.cloneRange().insertNode(a.get(0));var b=g(window).scrollTop(),
+c=g(window).height(),e=a.offset().top;if(e<b-c||e>b+c)e>b+c?window.scrollTo(0,e-c+a.height()):window.scrollTo(0,b-e);a.remove()},getOffset:function(){var a=this.createBookmark(),b=g(a.start).css("display","inline-block").offset();this.moveToBookmark(a);return b}}})();(function(){function a(a,b){var c=k.getNodeIndex;a=a.duplicate();a.collapse(b);var e=a.parentElement();if(!e.hasChildNodes())return{container:e,offset:0};for(var l=e.children,d,f=a.duplicate(),r=0,g=l.length-1,y=-1;r<=g;){y=Math.floor((r+
+g)/2);d=l[y];f.moveToElementText(d);var A=f.compareEndPoints("StartToStart",a);if(0<A)g=y-1;else if(0>A)r=y+1;else return{container:e,offset:c(d)}}if(-1==y){f.moveToElementText(e);f.setEndPoint("StartToStart",a);f=f.text.replace(/(\r\n|\r)/g,"\n").length;l=e.childNodes;if(!f)return d=l[l.length-1],{container:d,offset:d.nodeValue.length};for(c=l.length;0<f;)f-=l[--c].nodeValue.length;return{container:l[c],offset:-f}}f.collapse(0<A);f.setEndPoint(0<A?"StartToStart":"EndToStart",a);f=f.text.replace(/(\r\n|\r)/g,
+"\n").length;if(!f)return p.$empty[d.tagName]||p.$nonChild[d.tagName]?{container:e,offset:c(d)+(0<A?0:1)}:{container:d,offset:0<A?0:d.childNodes.length};for(;0<f;)try{l=d,d=d[0<A?"previousSibling":"nextSibling"],f-=d.nodeValue.length}catch(G){return{container:e,offset:c(l)}}return{container:d,offset:0<A?-f:d.nodeValue.length+f}}function b(b,d){if(b.item)d.selectNode(b.item(0));else{var c=a(b,!0);d.setStart(c.container,c.offset);0!=b.compareEndPoints("StartToEnd",b)&&(c=a(b,!1),d.setEnd(c.container,
+c.offset))}return d}function d(a,b){var c;try{c=a.getNative(b).createRange()}catch(l){return null}var e=c.item?c.item(0):c.parentElement();return(e.ownerDocument||e)===a.document?c:null}(x.Selection=function(a,b){var c=this;c.document=a;c.body=b;if(m.ie9below)g(b).on("beforedeactivate",function(){c._bakIERange=c.getIERange()}).on("activate",function(){try{var a=d(c);a&&c.rangeInBody(a)||!c._bakIERange||c._bakIERange.select()}catch(l){}c._bakIERange=null})}).prototype={hasNativeRange:function(){var a;
+if(!m.ie||m.ie9above){a=this.getNative();if(!a.rangeCount)return!1;a=a.getRangeAt(0)}else a=d(this);return this.rangeInBody(a)},getNative:function(a){var b=this.document;try{return b?m.ie9below||a?b.selection:k.getWindow(b).getSelection():null}catch(h){return null}},getIERange:function(a){var b=d(this,a);return b&&this.rangeInBody(b,a)||!this._bakIERange?b:this._bakIERange},rangeInBody:function(a,b){var c=m.ie9below||b?a.item?a.item():a.parentElement():a.startContainer;return c===this.body||k.inDoc(c,
+this.body)},cache:function(){this.clear();this._cachedRange=this.getRange();this._cachedStartElement=this.getStart();this._cachedStartElementPath=this.getStartElementPath()},getStartElementPath:function(){if(this._cachedStartElementPath)return this._cachedStartElementPath;var a=this.getStart();return a?k.findParents(a,!0,null,!0):[]},clear:function(){this._cachedStartElementPath=this._cachedRange=this._cachedStartElement=null},isFocus:function(){return this.hasNativeRange()},getRange:function(){function a(a){for(var b=
+d.body.firstChild,c=a.collapsed;b&&b.firstChild;)a.setStart(b,0),b=b.firstChild;a.startContainer||a.setStart(d.body,0);c&&a.collapse(!0)}var d=this;if(null!=d._cachedRange)return this._cachedRange;var h=new x.Range(d.document,d.body);if(m.ie9below){var e=d.getIERange();if(e&&this.rangeInBody(e))try{b(e,h)}catch(t){a(h)}else a(h)}else{var l=d.getNative();if(l&&l.rangeCount&&d.rangeInBody(l.getRangeAt(0)))e=l.getRangeAt(0),l=l.getRangeAt(l.rangeCount-1),h.setStart(e.startContainer,e.startOffset).setEnd(l.endContainer,
+l.endOffset),h.collapsed&&k.isBody(h.startContainer)&&!h.startOffset&&a(h);else{if(this._bakRange&&(this._bakRange.startContainer===this.body||k.inDoc(this._bakRange.startContainer,this.body)))return this._bakRange;a(h)}}return this._bakRange=h},getStart:function(){if(this._cachedStartElement)return this._cachedStartElement;var a=m.ie9below?this.getIERange():this.getRange(),b,d;if(m.ie9below){if(!a)return this.document.body.firstChild;if(a.item)return a.item(0);b=a.duplicate();0<b.text.length&&b.moveStart("character",
+1);b.collapse(1);b=b.parentElement();for(d=a=a.parentElement();a=a.parentNode;)if(a==b){b=d;break}}else if(b=a.startContainer,1==b.nodeType&&b.hasChildNodes()&&(b=b.childNodes[Math.min(b.childNodes.length-1,a.startOffset)]),3==b.nodeType)return b.parentNode;return b},getText:function(){var a;return this.isFocus()&&(a=this.getNative())?(a=m.ie9below?a.createRange():a.getRangeAt(0),m.ie9below?a.text:a.toString()):""}}})();(function(){function a(a,b){var c;if(b.textarea)if(n.isString(b.textarea))for(var e=
+0,d,l=k.getElementsByTagName(a,"textarea");d=l[e++];){if(d.id=="umeditor_textarea_"+b.options.textarea){c=d;break}}else c=b.textarea;c||(a.appendChild(c=k.createElement(document,"textarea",{name:b.options.textarea,id:"umeditor_textarea_"+b.options.textarea,style:"display:none"})),b.textarea=c);c.value=b.hasContents()?b.options.allHtmlEnabled?b.getAllHtml():b.getContent(null,null,!0):""}function b(a){for(var b in UM.plugins)-1==a.options.excludePlugins.indexOf(b)&&(UM.plugins[b].call(a),a.plugins[b]=
+1);a.langIsReady=!0;a.fireEvent("langReady")}function d(a){for(var b in a)return b}var c=0,f,h=UM.Editor=function(a){var e=this;e.uid=c++;I.call(e);e.commands={};e.options=n.extend(n.clone(a||{}),UMEDITOR_CONFIG,!0);e.shortcutkeys={};e.inputRules=[];e.outputRules=[];e.setOpt({isShow:!0,initialContent:"",initialStyle:"",autoClearinitialContent:!1,textarea:"editorValue",focus:!1,focusInEnd:!0,autoClearEmptyNode:!0,fullscreen:!1,readonly:!1,zIndex:999,enterTag:"p",lang:"zh-cn",langPath:e.options.UMEDITOR_HOME_URL+
+"lang/",theme:"default",themePath:e.options.UMEDITOR_HOME_URL+"themes/",allHtmlEnabled:!1,autoSyncData:!0,autoHeightEnabled:!0,excludePlugins:""});e.plugins={};n.isEmptyObject(UM.I18N)?n.loadFile(document,{src:e.options.langPath+e.options.lang+"/"+e.options.lang+".js",tag:"script",type:"text/javascript",defer:"defer"},function(){b(e)}):(e.options.lang=d(UM.I18N),b(e))};h.prototype={ready:function(a){a&&(this.isReady?a.apply(this):this.addListener("ready",a))},setOpt:function(a,b){var c={};n.isString(a)?
+c[a]=b:c=a;n.extend(this.options,c,!0)},getOpt:function(a){return this.options[a]||""},destroy:function(){this.fireEvent("destroy");var a=this.container.parentNode;a===document.body&&(a=this.container);var b=this.textarea;b?b.style.display="":(b=document.createElement("textarea"),a.parentNode.insertBefore(b,a));b.style.width=this.body.offsetWidth+"px";b.style.height=this.body.offsetHeight+"px";b.value=this.getContent();b.id=this.key;a.contains(b)&&g(b).insertBefore(a);a.innerHTML="";k.remove(a);UM.clearCache(this.id);
+for(var c in this)this.hasOwnProperty(c)&&delete this[c]},initialCont:function(a){if(a){a.getAttribute("name")&&(this.options.textarea=a.getAttribute("name"));if(a&&/script|textarea/ig.test(a.tagName)){var b=document.createElement("div");a.parentNode.insertBefore(b,a);this.options.initialContent=UM.htmlparser(a.value||a.innerHTML||this.options.initialContent).toHtml();a.className&&(b.className=a.className);a.style.cssText&&(b.style.cssText=a.style.cssText);/textarea/i.test(a.tagName)?(this.textarea=
+a,this.textarea.style.display="none"):(a.parentNode.removeChild(a),a.id&&(b.id=a.id));a=b;a.innerHTML=""}return a}return null},render:function(a){var b=this.options,c=function(b){return parseInt(g(a).css(b))};n.isString(a)&&(a=document.getElementById(a));a&&(this.id=a.getAttribute("id"),UM.setEditor(this),n.cssRule("edui-style-body",this.options.initialStyle,document),a=this.initialCont(a),a.className+=" edui-body-container",b.minFrameWidth=b.initialFrameWidth?b.initialFrameWidth:b.initialFrameWidth=
+g(a).width()||UM.defaultWidth,b.initialFrameHeight?b.minFrameHeight=b.initialFrameHeight:b.initialFrameHeight=b.minFrameHeight=g(a).height()||UM.defaultHeight,a.style.width=/%$/.test(b.initialFrameWidth)?"100%":b.initialFrameWidth-c("padding-left")-c("padding-right")+"px",c=/%$/.test(b.initialFrameHeight)?"100%":b.initialFrameHeight-c("padding-top")-c("padding-bottom"),this.options.autoHeightEnabled?(a.style.minHeight=c+"px",a.style.height="",m.ie&&6>=m.version&&(a.style.height=c,a.style.setExpression("height",
+"this.scrollHeight <= "+c+' ? "'+c+'px" : "auto"'))):g(a).height(c),a.style.zIndex=b.zIndex,this._setup(a))},_setup:function(b){var c=this,d=c.options;b.contentEditable=!0;document.body.spellcheck=!1;c.document=document;c.window=document.defaultView||document.parentWindow;c.body=b;c.$body=g(b);c.selection=new x.Selection(document,c.body);c._isEnabled=!1;var e;m.gecko&&(e=this.selection.getNative())&&e.removeAllRanges();this._initEvents();for(var f=b.parentNode;f&&!k.isBody(f);f=f.parentNode)if("FORM"==
+f.tagName){c.form=f;if(c.options.autoSyncData)g(b).on("blur",function(){a(f,c)});else g(f).on("submit",function(){a(this,c)});break}if(d.initialContent)if(d.autoClearinitialContent){var h=c.execCommand;c.execCommand=function(){c.fireEvent("firstBeforeExecCommand");return h.apply(c,arguments)};this._setDefaultContent(d.initialContent)}else this.setContent(d.initialContent,!1,!0);k.isEmptyNode(c.body)&&(c.body.innerHTML="<p>"+(m.ie?"":"<br/>")+"</p>");d.focus&&setTimeout(function(){c.focus(c.options.focusInEnd);
+!c.options.autoClearinitialContent&&c._selectionChange()},0);c.container||(c.container=b.parentNode);c._bindshortcutKeys();c.isReady=1;c.fireEvent("ready");d.onready&&d.onready.call(c);if(!m.ie||m.ie9above)g(c.body).on("blur focus",function(a){var b=c.selection.getNative();if("blur"==a.type)0<b.rangeCount&&(c._bakRange=b.getRangeAt(0));else{try{c._bakRange&&b.addRange(c._bakRange)}catch(G){}c._bakRange=null}});!d.isShow&&c.setHide();d.readonly&&c.setDisabled()},sync:function(b){(b=b?document.getElementById(b):
+k.findParent(this.body.parentNode,function(a){return"FORM"==a.tagName},!0))&&a(b,this)},setHeight:function(a,b){!b&&(this.options.initialFrameHeight=a);this.options.autoHeightEnabled?(g(this.body).css({"min-height":a+"px"}),m.ie&&6>=m.version&&this.container&&(this.container.style.height=a,this.container.style.setExpression("height","this.scrollHeight <= "+a+' ? "'+a+'px" : "auto"'))):g(this.body).height(a);this.fireEvent("resize")},setWidth:function(a){this.$container&&this.$container.width(a);g(this.body).width(a-
+1*g(this.body).css("padding-left").replace("px","")-1*g(this.body).css("padding-right").replace("px",""));this.fireEvent("resize")},addshortcutkey:function(a,b){var c={};b?c[a]=b:c=a;n.extend(this.shortcutkeys,c)},_bindshortcutKeys:function(){var a=this,b=this.shortcutkeys;a.addListener("keydown",function(c,d){var e=d.keyCode||d.which,f;for(f in b)for(var l=b[f].split(","),h=0,t;t=l[h++];){t=t.split(":");var g=t[0];t=t[1];if(/^(ctrl)(\+shift)?\+(\d+)$/.test(g.toLowerCase())||/^(\d+)$/.test(g))if("ctrl"==
+RegExp.$1&&(d.ctrlKey||d.metaKey)&&(""!=RegExp.$2?d[RegExp.$2.slice(1)+"Key"]:1)&&e==RegExp.$3||e==RegExp.$1)-1!=a.queryCommandState(f,t)&&a.execCommand(f,t),k.preventDefault(d)}})},getContent:function(a,b,c,d,f){a&&n.isFunction(a)&&(b=a);if(b?!b():!this.hasContents())return"";this.fireEvent("beforegetcontent");a=UM.htmlparser(this.body.innerHTML,d);this.filterOutputRule(a);this.fireEvent("aftergetcontent",a);return a.toHtml(f)},getAllHtml:function(){var a=[];this.fireEvent("getAllHtml",a);if(m.ie&&
+8<m.version){var b="";n.each(this.document.styleSheets,function(a){b+=a.href?'<link rel="stylesheet" type="text/css" href="'+a.href+'" />':"<style>"+a.cssText+"</style>"});n.each(this.document.getElementsByTagName("script"),function(a){b+=a.outerHTML})}return"<html><head>"+(this.options.charset?'<meta http-equiv="Content-Type" content="text/html; charset='+this.options.charset+'"/>':"")+(b||this.document.getElementsByTagName("head")[0].innerHTML)+a.join("\n")+"</head><body "+(E&&9>m.version?'class="view"':
+"")+">"+this.getContent(null,null,!0)+"</body></html>"},getPlainTxt:function(){var a=new RegExp(k.fillChar,"g"),b=this.body.innerHTML.replace(/[\n\r]/g,""),b=b.replace(/<(p|div)[^>]*>(<br\/?>|&nbsp;)<\/\1>/gi,"\n").replace(/<br\/?>/gi,"\n").replace(/<[^>/]+>/g,"").replace(/(\n)?<\/([^>]+)>/g,function(a,b,c){return p.$block[c]?"\n":b?b:""});return b.replace(a,"").replace(/\u00a0/g," ").replace(/&nbsp;/g," ")},getContentTxt:function(){return this.body[m.ie?"innerText":"textContent"].replace(new RegExp(k.fillChar,
+"g"),"").replace(/\u00a0/g," ")},setContent:function(b,c,d){this.fireEvent("beforesetcontent",b);b=UM.htmlparser(b);this.filterInputRule(b);b=b.toHtml();this.body.innerHTML=(c?this.body.innerHTML:"")+b;if("p"==this.options.enterTag)if(c=this.body.firstChild,!c||1==c.nodeType&&(p.$cdata[c.tagName]||"DIV"==c.tagName&&c.getAttribute("cdata_tag")||k.isCustomeNode(c))&&c===this.body.lastChild)this.body.innerHTML="<p>"+(m.ie?"&nbsp;":"<br/>")+"</p>"+this.body.innerHTML;else for(var e=this.document.createElement("p");c;){for(;c&&
+(3==c.nodeType||1==c.nodeType&&p.p[c.tagName]&&!p.$cdata[c.tagName]);)b=c.nextSibling,e.appendChild(c),c=b;if(e.firstChild)if(c)c.parentNode.insertBefore(e,c),e=this.document.createElement("p");else{this.body.appendChild(e);break}c=c.nextSibling}this.fireEvent("aftersetcontent");this.fireEvent("contentchange");!d&&this._selectionChange();this._bakRange=this._bakIERange=this._bakNativeRange=null;var f;m.gecko&&(f=this.selection.getNative())&&f.removeAllRanges();this.options.autoSyncData&&this.form&&
+a(this.form,this)},focus:function(a){try{var b=this.selection.getRange();a?b.setStartAtLast(this.body.lastChild).setCursor(!1,!0):b.select(!0);this.fireEvent("focus")}catch(t){}},blur:function(){var a=this.selection.getNative();a.empty?a.empty():a.removeAllRanges();this.fireEvent("blur")},isFocus:function(){return!0===this.fireEvent("isfocus")?!0:this.selection.isFocus()},_initEvents:function(){var a=this,b=function(){a._proxyDomEvent.apply(a,arguments)};g(a.body).on("click contextmenu mousedown keydown keyup keypress mouseup mouseover mouseout selectstart",
+b).on("focus blur",b).on("mouseup keydown",function(b){"keydown"==b.type&&(b.ctrlKey||b.metaKey||b.shiftKey||b.altKey)||2!=b.button&&a._selectionChange(250,b)})},_proxyDomEvent:function(a){return this.fireEvent(a.type.replace(/^on/,""),a)},_selectionChange:function(a,b){var c=this,d=!1,e,l;m.ie&&9>m.version&&b&&"mouseup"==b.type&&!this.selection.getRange().collapsed&&(d=!0,e=b.clientX,l=b.clientY);clearTimeout(f);f=setTimeout(function(){if(c.selection.getNative()){var a;if(d&&"None"==c.selection.getNative().type){a=
+c.document.body.createTextRange();try{a.moveToPoint(e,l)}catch(G){a=null}}var f;a&&(f=c.selection.getIERange,c.selection.getIERange=function(){return a});c.selection.cache();f&&(c.selection.getIERange=f);c.selection._cachedRange&&c.selection._cachedStartElement&&(c.fireEvent("beforeselectionchange"),c.fireEvent("selectionchange",!!b),c.fireEvent("afterselectionchange"),c.selection.clear())}},a||50)},_callCmdFn:function(a,b){b=Array.prototype.slice.call(b,0);var c=b.shift().toLowerCase(),d,e;e=(d=
+this.commands[c]||UM.commands[c])&&d[a];if(!(d&&e||"queryCommandState"!=a))return 0;if(e)return e.apply(this,[c].concat(b))},execCommand:function(a){if(!this.isFocus()){var b=this.selection._bakRange;b?b.select():this.focus(!0)}a=a.toLowerCase();var c,b=this.commands[a]||UM.commands[a];if(!b||!b.execCommand)return null;b.notNeedUndo||this.__hasEnterExecCommand?(c=this._callCmdFn("execCommand",arguments),this.__hasEnterExecCommand||b.ignoreContentChange||this._ignoreContentChange||this.fireEvent("contentchange")):
+(this.__hasEnterExecCommand=!0,-1!=this.queryCommandState.apply(this,arguments)&&(this.fireEvent("saveScene"),this.fireEvent("beforeexeccommand",a),c=this._callCmdFn("execCommand",arguments),b.ignoreContentChange||this._ignoreContentChange||this.fireEvent("contentchange"),this.fireEvent("afterexeccommand",a),this.fireEvent("saveScene")),this.__hasEnterExecCommand=!1);this.__hasEnterExecCommand||b.ignoreContentChange||this._ignoreContentChange||this._selectionChange();return c},queryCommandState:function(a){try{return this._callCmdFn("queryCommandState",
+arguments)}catch(l){return 0}},queryCommandValue:function(a){try{return this._callCmdFn("queryCommandValue",arguments)}catch(l){return null}},hasContents:function(a){if(a)for(var b=0,c;c=a[b++];)if(0<this.body.getElementsByTagName(c).length)return!0;if(!k.isEmptyBlock(this.body))return!0;a=["div"];for(b=0;c=a[b++];){c=k.getElementsByTagName(this.body,c);for(var d=0,e;e=c[d++];)if(k.isCustomeNode(e))return!0}return!1},reset:function(){this.fireEvent("reset")},isEnabled:function(){return 1!=this._isEnabled},
+setEnabled:function(){var a;this.body.contentEditable=!0;if(this.lastBk){a=this.selection.getRange();try{a.moveToBookmark(this.lastBk),delete this.lastBk}catch(l){a.setStartAtFirst(this.body).collapse(!0)}a.select(!0)}this.bkqueryCommandState&&(this.queryCommandState=this.bkqueryCommandState,delete this.bkqueryCommandState);this._bkproxyDomEvent&&(this._proxyDomEvent=this._bkproxyDomEvent,delete this._bkproxyDomEvent);this.fireEvent("setEnabled")},enable:function(){return this.setEnabled()},setDisabled:function(a,
+b){var c=this;c.body.contentEditable=!1;c._except=a?n.isArray(a)?a:[a]:[];c.lastBk||(c.lastBk=c.selection.getRange().createBookmark(!0));c.bkqueryCommandState||(c.bkqueryCommandState=c.queryCommandState,c.queryCommandState=function(a){return-1!=n.indexOf(c._except,a)?c.bkqueryCommandState.apply(c,arguments):-1});b||c._bkproxyDomEvent||(c._bkproxyDomEvent=c._proxyDomEvent,c._proxyDomEvent=function(){return!1});c.fireEvent("selectionchange");c.fireEvent("setDisabled",c._except)},disable:function(a){return this.setDisabled(a)},
+_setDefaultContent:function(){function a(){var b=this;b.document.getElementById("initContent")&&(b.body.innerHTML="<p>"+(E?"":"<br/>")+"</p>",b.removeListener("firstBeforeExecCommand focus",a),setTimeout(function(){b.focus();b._selectionChange()},0))}return function(b){this.body.innerHTML='<p id="initContent">'+b+"</p>";this.addListener("firstBeforeExecCommand focus",a)}}(),setShow:function(){var a=this.selection.getRange();if("none"==this.container.style.display){try{a.moveToBookmark(this.lastBk),
+delete this.lastBk}catch(l){a.setStartAtFirst(this.body).collapse(!0)}setTimeout(function(){a.select(!0)},100);this.container.style.display=""}},show:function(){return this.setShow()},setHide:function(){this.lastBk||(this.lastBk=this.selection.getRange().createBookmark(!0));this.container.style.display="none"},hide:function(){return this.setHide()},getLang:function(a){var b=UM.I18N[this.options.lang];if(!b)throw Error("not import language file");a=(a||"").split(".");for(var c=0,d;(d=a[c++])&&(b=b[d],
+b););return b},getContentLength:function(a,b){var c=this.getContent(!1,!1,!0).length;if(a){b=(b||[]).concat(["hr","img","iframe"]);for(var c=this.getContentTxt().replace(/[\t\r\n]+/g,"").length,d=0,e;e=b[d++];)c+=this.body.getElementsByTagName(e).length}return c},addInputRule:function(a,b){a.ignoreUndo=b;this.inputRules.push(a)},filterInputRule:function(a,b){for(var c=0,d;d=this.inputRules[c++];)b&&d.ignoreUndo||d.call(this,a)},addOutputRule:function(a,b){a.ignoreUndo=b;this.outputRules.push(a)},
+filterOutputRule:function(a,b){for(var c=0,d;d=this.outputRules[c++];)b&&d.ignoreUndo||d.call(this,a)}};n.inherits(h,I)})();UM.filterWord=function(){function a(a){return a=a.replace(/[\d.]+\w+/g,function(a){return n.transUnitToPx(a)})}function b(b){return b.replace(/[\t\r\n]+/g," ").replace(/\x3c!--[\s\S]*?--\x3e/ig,"").replace(/<v:shape [^>]*>[\s\S]*?.<\/v:shape>/gi,function(b){if(m.opera)return"";try{if(/Bitmap/i.test(b))return"";var c=b.match(/width:([ \d.]*p[tx])/i)[1],d=b.match(/height:([ \d.]*p[tx])/i)[1],
+e=b.match(/src=\s*"([^"]*)"/i)[1];return'<img width="'+a(c)+'" height="'+a(d)+'" src="'+e+'" />'}catch(l){return""}}).replace(/<\/?div[^>]*>/g,"").replace(/v:\w+=(["']?)[^'"]+\1/g,"").replace(/<(!|script[^>]*>.*?<\/script(?=[>\s])|\/?(\?xml(:\w+)?|xml|meta|link|style|\w+:\w+)(?=[\s\/>]))[^>]*>/gi,"").replace(/<p [^>]*class="?MsoHeading"?[^>]*>(.*?)<\/p>/gi,"<p><strong>$1</strong></p>").replace(/\s+(class|lang|align)\s*=\s*(['"]?)([\w-]+)\2/ig,function(a,b,d,e){return"class"==b&&"MsoListParagraph"==
+e?a:""}).replace(/<(font|span)[^>]*>(\s*)<\/\1>/gi,function(a,b,d){return d.replace(/[\t\r\n ]+/g," ")}).replace(/(<[a-z][^>]*)\sstyle=(["'])([^\2]*?)\2/gi,function(b,d,h,e){b=[];e=e.replace(/^\s+|\s+$/,"").replace(/&#39;/g,"'").replace(/&quot;/gi,"'").split(/;\s*/g);h=0;for(var c;c=e[h];h++){var f,g=c.split(":");if(2==g.length&&(c=g[0].toLowerCase(),f=g[1].toLowerCase(),!(/^(background)\w*/.test(c)&&0==f.replace(/(initial|\s)/g,"").length||/^(margin)\w*/.test(c)&&/^0\w+$/.test(f)))){switch(c){case "mso-padding-alt":case "mso-padding-top-alt":case "mso-padding-right-alt":case "mso-padding-bottom-alt":case "mso-padding-left-alt":case "mso-margin-alt":case "mso-margin-top-alt":case "mso-margin-right-alt":case "mso-margin-bottom-alt":case "mso-margin-left-alt":case "mso-height":case "mso-width":case "mso-vertical-align-alt":/<table/.test(d)||
+(b[h]=c.replace(/^mso-|-alt$/g,"")+":"+a(f));continue;case "horiz-align":b[h]="text-align:"+f;continue;case "vert-align":b[h]="vertical-align:"+f;continue;case "font-color":case "mso-foreground":b[h]="color:"+f;continue;case "mso-background":case "mso-highlight":b[h]="background:"+f;continue;case "mso-default-height":b[h]="min-height:"+a(f);continue;case "mso-default-width":b[h]="min-width:"+a(f);continue;case "mso-padding-between-alt":b[h]="border-collapse:separate;border-spacing:"+a(f);continue;
+case "text-line-through":if("single"==f||"double"==f)b[h]="text-decoration:line-through";continue;case "mso-zero-height":"yes"==f&&(b[h]="display:none");continue;case "margin":if(!/[1-9]/.test(f))continue}/^(mso|column|font-emph|lang|layout|line-break|list-image|nav|panose|punct|row|ruby|sep|size|src|tab-|table-border|text-(?:decor|trans)|top-bar|version|vnd|word-break)/.test(c)||/text\-indent|padding|margin/.test(c)&&/\-[\d.]+/.test(f)||(b[h]=c+":"+g[1])}}return d+(b.length?' style="'+b.join(";").replace(/;{2,}/g,
+";")+'"':"")}).replace(/[\d.]+(cm|pt)/g,function(a){return n.transUnitToPx(a)})}return function(a){return/(class="?Mso|style="[^"]*\bmso\-|w:WordDocument|<(v|o):|lang=)/ig.test(a)?b(a):a}}();(function(){function a(a,b,c){a.push("\n");return b+(c?1:-1)}function b(a,b){for(var c=0;c<b;c++)a.push("    ")}function d(f,e,l,h){switch(f.type){case "root":for(var r=0,g;g=f.children[r++];)l&&"element"==g.type&&!p.$inlineWithA[g.tagName]&&1<r&&(a(e,h,!0),b(e,h)),d(g,e,l,h);break;case "text":"pre"==f.parentNode.tagName?
+e.push(f.data):e.push(k[f.parentNode.tagName]?n.html(f.data):f.data.replace(/[ ]{2}/g," &nbsp;"));break;case "element":c(f,e,l,h);break;case "comment":e.push("\x3c!--"+f.data+"--\x3e")}return e}function c(c,f,e,l){var h="";if(c.attrs){var h=[],r=c.attrs,g;for(g in r)h.push(g+(void 0!==r[g]?'="'+(t[g]?n.html(r[g]).replace(/["]/g,function(a){return"&quot;"}):n.unhtml(r[g]))+'"':""));h=h.join(" ")}f.push("<"+c.tagName+(h?" "+h:"")+(p.$empty[c.tagName]?"/":"")+">");e&&!p.$inlineWithA[c.tagName]&&"pre"!=
+c.tagName&&c.children&&c.children.length&&(l=a(f,l,!0),b(f,l));if(c.children&&c.children.length)for(h=0;r=c.children[h++];)e&&"element"==r.type&&!p.$inlineWithA[r.tagName]&&1<h&&(a(f,l),b(f,l)),d(r,f,e,l);p.$empty[c.tagName]||(e&&!p.$inlineWithA[c.tagName]&&"pre"!=c.tagName&&c.children&&c.children.length&&(l=a(f,l),b(f,l)),f.push("</"+c.tagName+">"))}function f(a,b){var c;if("element"==a.type&&a.getAttr("id")==b)return a;if(a.children&&a.children.length)for(var d=0;c=a.children[d++];)if(c=f(c,b))return c}
+function h(a,b,c){"element"==a.type&&a.tagName==b&&c.push(a);if(a.children&&a.children.length)for(var d=0,f;f=a.children[d++];)h(f,b,c)}function e(a,b){if(a.children&&a.children.length)for(var c=0,d;d=a.children[c];)e(d,b),d.parentNode&&(d.children&&d.children.length&&b(d),d.parentNode&&c++);else b(a)}var l=UM.uNode=function(a){this.type=a.type;this.data=a.data;this.tagName=a.tagName;this.parentNode=a.parentNode;this.attrs=a.attrs||{};this.children=a.children},t={href:1,src:1,_src:1,_href:1,cdata_data:1},
+k={style:1,script:1};l.createElement=function(a){return/[<>]/.test(a)?UM.htmlparser(a).children[0]:new l({type:"element",children:[],tagName:a})};l.createText=function(a,b){return new UM.uNode({type:"text",data:b?a:n.unhtml(a||"")})};l.prototype={toHtml:function(a){var b=[];d(this,b,a,0);return b.join("")},innerHTML:function(a){if("element"!=this.type||p.$empty[this.tagName])return this;if(n.isString(a)){if(this.children)for(var b=0,c;c=this.children[b++];)c.parentNode=null;this.children=[];a=UM.htmlparser(a);
+for(b=0;c=a.children[b++];)this.children.push(c),c.parentNode=this;return this}a=new UM.uNode({type:"root",children:this.children});return a.toHtml()},innerText:function(a,b){if("element"!=this.type||p.$empty[this.tagName])return this;if(a){if(this.children)for(var c=0,d;d=this.children[c++];)d.parentNode=null;this.children=[];this.appendChild(l.createText(a,b));return this}return this.toHtml().replace(/<[^>]+>/g,"")},getData:function(){return"element"==this.type?"":this.data},firstChild:function(){return this.children?
+this.children[0]:null},lastChild:function(){return this.children?this.children[this.children.length-1]:null},previousSibling:function(){for(var a=this.parentNode,b=0,c;c=a.children[b];b++)if(c===this)return 0==b?null:a.children[b-1]},nextSibling:function(){for(var a=this.parentNode,b=0,c;c=a.children[b++];)if(c===this)return a.children[b]},replaceChild:function(a,b){if(this.children){a.parentNode&&a.parentNode.removeChild(a);for(var c=0,d;d=this.children[c];c++)if(d===b)return this.children.splice(c,
+1,a),b.parentNode=null,a.parentNode=this,a}},appendChild:function(a){if("root"==this.type||"element"==this.type&&!p.$empty[this.tagName]){this.children||(this.children=[]);a.parentNode&&a.parentNode.removeChild(a);for(var b=0,c;c=this.children[b];b++)if(c===a){this.children.splice(b,1);break}this.children.push(a);a.parentNode=this;return a}},insertBefore:function(a,b){if(this.children){a.parentNode&&a.parentNode.removeChild(a);for(var c=0,d;d=this.children[c];c++)if(d===b)return this.children.splice(c,
+0,a),a.parentNode=this,a}},insertAfter:function(a,b){if(this.children){a.parentNode&&a.parentNode.removeChild(a);for(var c=0,d;d=this.children[c];c++)if(d===b)return this.children.splice(c+1,0,a),a.parentNode=this,a}},removeChild:function(a,b){if(this.children)for(var c=0,d;d=this.children[c];c++)if(d===a){this.children.splice(c,1);d.parentNode=null;if(b&&d.children&&d.children.length)for(var f=0,e;e=d.children[f];f++)this.children.splice(c+f,0,e),e.parentNode=this;return d}},getAttr:function(a){return this.attrs&&
+this.attrs[a.toLowerCase()]},setAttr:function(a,b){if(a)if(this.attrs||(this.attrs={}),n.isObject(a))for(var c in a)a[c]?this.attrs[c.toLowerCase()]=a[c]:delete this.attrs[c];else b?this.attrs[a.toLowerCase()]=b:delete this.attrs[a];else delete this.attrs},hasAttr:function(a){a=this.getAttr(a);return null!==a&&void 0!==a},getIndex:function(){for(var a=this.parentNode,b=0,c;c=a.children[b];b++)if(c===this)return b;return-1},getNodeById:function(a){var b;if(this.children&&this.children.length)for(var c=
+0;b=this.children[c++];)if(b=f(b,a))return b},getNodesByTagName:function(a){a=n.trim(a).replace(/[ ]{2,}/g," ").split(" ");var b=[],c=this;n.each(a,function(a){if(c.children&&c.children.length)for(var d=0,f;f=c.children[d++];)h(f,a,b)});return b},getStyle:function(a){var b=this.getAttr("style");return b?(a=b.match(new RegExp("(^|;)\\s*"+a+":([^;]+)","i")))&&a[0]?a[2]:"":""},setStyle:function(a,b){function c(a,b){d=d.replace(new RegExp("(^|;)\\s*"+a+":([^;]+;?)","gi"),"$1");b&&(d=a+":"+n.unhtml(b)+
+";"+d)}var d=this.getAttr("style");d||(d="");if(n.isObject(a))for(var f in a)c(f,a[f]);else c(a,b);this.setAttr("style",n.trim(d))},hasClass:function(a){if(this.hasAttr("class")){var b=this.getAttr("class").split(/\s+/),c=!1;g.each(b,function(b,d){d===a&&(c=!0)});return c}return!1},addClass:function(a){var b=null,c=!1;this.hasAttr("class")?(b=this.getAttr("class"),b=b.split(/\s+/),b.forEach(function(b){b===a&&(c=!0)}),!c&&b.push(a),this.setAttr("class",b.join(" "))):this.setAttr("class",a)},removeClass:function(a){if(this.hasAttr("class")){var b=
+this.getAttr("class"),b=b.replace(new RegExp("\\b"+a+"\\b","g"),"");this.setAttr("class",n.trim(b).replace(/[ ]{2,}/g," "))}},traversal:function(a){this.children&&this.children.length&&e(this,a);return this}}})();UM.htmlparser=function(a,b){function d(a,b){if(r[a.tagName]){var c=g.createElement(r[a.tagName]);a.appendChild(c);c.appendChild(g.createText(b))}else a.appendChild(g.createText(b))}function c(a,b,d){var f;if(f=v[b]){for(var e=a,t;"root"!=e.type;){if(n.isArray(f)?-1!=n.indexOf(f,e.tagName):
+f==e.tagName){a=e;t=!0;break}e=e.parentNode}t||(a=c(a,n.isArray(f)?f[0]:f))}f=new g({parentNode:a,type:"element",tagName:b.toLowerCase(),children:p.$empty[b]?null:[]});if(d){for(e={};t=h.exec(d);)e[t[1].toLowerCase()]=l[t[1].toLowerCase()]?t[2]||t[3]||t[4]:n.unhtml(t[2]||t[3]||t[4]);f.attrs=e}a.children.push(f);return p.$empty[b]?a:f}var f=/<(?:(?:\/([^>]+)>)|(?:!--([\S|\s]*?)--\x3e)|(?:([^\s\/>]+)\s*((?:(?:"[^"]*")|(?:'[^']*')|[^"'<>])*)\/?>))/g,h=/([\w\-:.]+)(?:(?:\s*=\s*(?:(?:"([^"]*)")|(?:'([^']*)')|([^\s>]+)))|(?=\s|$))/g,
+e={b:1,code:1,i:1,u:1,strike:1,s:1,tt:1,strong:1,q:1,samp:1,em:1,span:1,sub:1,img:1,sup:1,font:1,big:1,small:1,iframe:1,a:1,br:1,pre:1};a=a.replace(new RegExp(k.fillChar,"g"),"");b||(a=a.replace(new RegExp("[\\r\\t\\n"+(b?"":" ")+"]*</?(\\w+)\\s*(?:[^>]*)>[\\r\\t\\n"+(b?"":" ")+"]*","g"),function(a,c){return c&&e[c.toLowerCase()]?a.replace(/(^[\n\r]+)|([\n\r]+$)/g,""):a.replace(new RegExp("^[\\r\\n"+(b?"":" ")+"]+"),"").replace(new RegExp("[\\r\\n"+(b?"":" ")+"]+$"),"")}));for(var l={href:1,src:1},
+g=UM.uNode,v={td:"tr",tr:["tbody","thead","tfoot"],tbody:"table",th:"tr",thead:"table",tfoot:"table",caption:"table",li:["ul","ol"],dt:"dl",dd:"dl",option:"select"},r={ol:"li",ul:"li"},q,y=0,m=0,G=new g({type:"root",children:[]}),u=G;q=f.exec(a);){y=q.index;try{if(y>m&&d(u,a.slice(m,y)),q[3])p.$cdata[u.tagName]?d(u,q[0]):u=c(u,q[3].toLowerCase(),q[4]);else if(q[1]){if("root"!=u.type)if(p.$cdata[u.tagName]&&!p.$cdata[q[1]])d(u,q[0]);else{for(y=u;"element"==u.type&&u.tagName!=q[1].toLowerCase();)if(u=
+u.parentNode,"root"==u.type)throw u=y,"break";u=u.parentNode}}else q[2]&&u.children.push(new g({type:"comment",data:q[2],parentNode:u}))}catch(L){}m=f.lastIndex}m<a.length&&d(u,a.slice(m));return G};UM.filterNode=function(){function a(b,d){switch(b.type){case "element":var c;if(c=d[b.tagName])if("-"===c)b.parentNode.removeChild(b);else if(n.isFunction(c)){var f=b.parentNode,h=b.getIndex();c(b);if(b.parentNode){if(b.children)for(c=0;h=b.children[c];)a(h,d),h.parentNode&&c++}else for(c=h;h=f.children[c];)a(h,
+d),h.parentNode&&c++}else{if((c=c.$)&&b.attrs){var h={},e;for(f in c){e=b.getAttr(f);if("style"==f&&n.isArray(c[f])){var l=[];n.each(c[f],function(a){var c;(c=b.getStyle(a))&&l.push(a+":"+c)});e=l.join(";")}e&&(h[f]=e)}b.attrs=h}if(b.children)for(c=0;h=b.children[c];)a(h,d),h.parentNode&&c++}else if(p.$cdata[b.tagName])b.parentNode.removeChild(b);else for(f=b.parentNode,h=b.getIndex(),b.parentNode.removeChild(b,!0),c=h;h=f.children[c];)a(h,d),h.parentNode&&c++;break;case "comment":b.parentNode.removeChild(b)}}
+return function(b,d){if(n.isEmptyObject(d))return b;var c;(c=d["-"])&&n.each(c.split(" "),function(a){d[a]="-"});c=0;for(var f;f=b.children[c];)a(f,d),f.parentNode&&c++;return b}}();UM.commands.inserthtml={execCommand:function(a,b,d){var c=this,f;if(b&&!0!==c.fireEvent("beforeinserthtml",b)){f=c.selection.getRange();a=f.document.createElement("div");a.style.display="inline";d||(b=UM.htmlparser(b),c.options.filterRules&&UM.filterNode(b,c.options.filterRules),c.filterInputRule(b),b=b.toHtml());a.innerHTML=
+n.trim(b);if(!f.collapsed&&(b=f.startContainer,k.isFillChar(b)&&f.setStartBefore(b),b=f.endContainer,k.isFillChar(b)&&f.setEndAfter(b),f.txtToElmBoundary(),f.endContainer&&1==f.endContainer.nodeType&&(b=f.endContainer.childNodes[f.endOffset])&&k.isBr(b)&&f.setEndAfter(b),0==f.startOffset&&(b=f.startContainer,k.isBoundaryNode(b,"firstChild")&&(b=f.endContainer,f.endOffset==(3==b.nodeType?b.nodeValue.length:b.childNodes.length)&&k.isBoundaryNode(b,"lastChild")&&(c.body.innerHTML="<p>"+(m.ie?"":"<br/>")+
+"</p>",f.setStart(c.body.firstChild,0).collapse(!0)))),!f.collapsed&&f.deleteContents(),1==f.startContainer.nodeType)){b=f.startContainer.childNodes[f.startOffset];var h;if(b&&k.isBlockElm(b)&&(h=b.previousSibling)&&k.isBlockElm(h)){for(f.setEnd(h,h.childNodes.length).collapse();b.firstChild;)h.appendChild(b.firstChild);k.remove(b)}}var e,l;d=0;var g;f.inFillChar()&&(b=f.startContainer,k.isFillChar(b)?(f.setStartBefore(b).collapse(!0),k.remove(b)):k.isFillChar(b,!0)&&(b.nodeValue=b.nodeValue.replace(H,
+""),f.startOffset--,f.collapsed&&f.collapse(!0)));for(;b=a.firstChild;){if(d){for(e=c.document.createElement("p");b&&(3==b.nodeType||!p.$block[b.tagName]);)g=b.nextSibling,e.appendChild(b),b=g;e.firstChild&&(b=e)}f.insertNode(b);g=b.nextSibling;if(!d&&b.nodeType==k.NODE_ELEMENT&&k.isBlockElm(b)&&(e=k.findParent(b,function(a){return k.isBlockElm(a)}))&&"body"!=e.tagName.toLowerCase()&&(!p[e.tagName][b.nodeName]||b.parentNode!==e)){if(p[e.tagName][b.nodeName])for(l=b.parentNode;l!==e;)h=l,l=l.parentNode;
+else h=e;k.breakParent(b,h||l);h=b.previousSibling;k.trimWhiteTextNode(h);h.childNodes.length||k.remove(h);!m.ie&&(v=b.nextSibling)&&k.isBlockElm(v)&&v.lastChild&&!k.isBr(v.lastChild)&&v.appendChild(c.document.createElement("br"));d=1}var v=b.nextSibling;if(!a.firstChild&&v&&k.isBlockElm(v)){f.setStart(v,0).collapse(!0);break}f.setEndAfter(b).collapse()}b=f.startContainer;g&&k.isBr(g)&&k.remove(g);if(k.isBlockElm(b)&&k.isEmptyNode(b))if(g=b.nextSibling)k.remove(b),1==g.nodeType&&p.$block[g.tagName]&&
+f.setStart(g,0).collapse(!0).shrinkBoundary();else try{b.innerHTML=m.ie?k.fillChar:"<br/>"}catch(q){f.setStartBefore(b),k.remove(b)}try{if(m.ie9below&&1==f.startContainer.nodeType&&!f.startContainer.childNodes[f.startOffset]&&(h=f.startContainer.childNodes[f.startOffset-1])&&1==h.nodeType&&p.$empty[h.tagName]){var r=this.document.createTextNode(k.fillChar);f.insertNode(r).setStart(r,0).collapse(!0)}setTimeout(function(){f.select(!0)})}catch(q){}setTimeout(function(){f=c.selection.getRange();f.scrollIntoView();
+c.fireEvent("afterinserthtml")},200)}}};UM.commands.insertimage={execCommand:function(a,b){b=n.isArray(b)?b:[b];if(b.length){var d=[],c,f;f=b[0];if(1==b.length)c='<img src="'+f.src+'" '+(f._src?' _src="'+f._src+'" ':"")+(f.width?'width="'+f.width+'" ':"")+(f.height?' height="'+f.height+'" ':"")+("left"==f.floatStyle||"right"==f.floatStyle?' style="float:'+f.floatStyle+';"':"")+(f.title&&""!=f.title?' title="'+f.title+'"':"")+(f.border&&"0"!=f.border?' border="'+f.border+'"':"")+(f.alt&&""!=f.alt?
+' alt="'+f.alt+'"':"")+(f.hspace&&"0"!=f.hspace?' hspace = "'+f.hspace+'"':"")+(f.vspace&&"0"!=f.vspace?' vspace = "'+f.vspace+'"':"")+"/>","center"==f.floatStyle&&(c='<p style="text-align: center">'+c+"</p>"),d.push(c);else for(var h=0;f=b[h++];)c="<p "+("center"==f.floatStyle?'style="text-align: center" ':"")+'><img src="'+f.src+'" '+(f.width?'width="'+f.width+'" ':"")+(f._src?' _src="'+f._src+'" ':"")+(f.height?' height="'+f.height+'" ':"")+' style="'+(f.floatStyle&&"center"!=f.floatStyle?"float:"+
+f.floatStyle+";":"")+(f.border||"")+'" '+(f.title?' title="'+f.title+'"':"")+" /></p>",d.push(c);this.execCommand("insertHtml",d.join(""),!0)}}};UM.plugins.justify=function(){var a=this;g.each(["justifyleft","justifyright","justifycenter","justifyfull"],function(b,d){a.commands[d]={execCommand:function(a){return this.document.execCommand(a)},queryCommandValue:function(a){var b=this.document.queryCommandValue(a);return!0===b||"true"===b?a.replace(/justify/,""):""},queryCommandState:function(a){return this.document.queryCommandState(a)?
+1:0}}})};UM.plugins.font=function(){var a=this,b={forecolor:"forecolor",backcolor:"backcolor",fontsize:"fontsize",fontfamily:"fontname"},d={forecolor:"color",backcolor:"background-color",fontsize:"font-size",fontfamily:"font-family"},c={forecolor:"color",fontsize:"size",fontfamily:"face"};a.setOpt({fontfamily:[{name:"songti",val:"\u5b8b\u4f53,SimSun"},{name:"yahei",val:"\u5fae\u8f6f\u96c5\u9ed1,Microsoft YaHei"},{name:"kaiti",val:"\u6977\u4f53,\u6977\u4f53_GB2312, SimKai"},{name:"heiti",val:"\u9ed1\u4f53, SimHei"},
+{name:"lishu",val:"\u96b6\u4e66, SimLi"},{name:"andaleMono",val:"andale mono"},{name:"arial",val:"arial, helvetica,sans-serif"},{name:"arialBlack",val:"arial black,avant garde"},{name:"comicSansMs",val:"comic sans ms"},{name:"impact",val:"impact,chicago"},{name:"timesNewRoman",val:"times new roman"},{name:"sans-serif",val:"sans-serif"}],fontsize:[10,12,16,18,24,32,48]});a.addOutputRule(function(a){n.each(a.getNodesByTagName("font"),function(a){if("font"==a.tagName){var b=[],c;for(c in a.attrs)switch(c){case "size":var d=
+a.attrs[c];g.each({10:"1",12:"2",16:"3",18:"4",24:"5",32:"6",48:"7"},function(a,b){if(b==d)return d=a,!1});b.push("font-size:"+d+"px");break;case "color":b.push("color:"+a.attrs[c]);break;case "face":b.push("font-family:"+a.attrs[c]);break;case "style":b.push(a.attrs[c])}a.attrs={style:b.join(";")}}a.tagName="span";"span"==a.parentNode.tagName&&1==a.parentNode.children.length&&(g.each(a.attrs,function(b,c){a.parentNode.attrs[b]="style"==b?a.parentNode.attrs[b]+c:c}),a.parentNode.removeChild(a,!0))})});
+for(var f in b)(function(f){a.commands[f]={execCommand:function(a,c){if("transparent"!=c){var f=this.selection.getRange();if(f.collapsed){var e=g("<span></span>").css(d[a],c)[0];f.insertNode(e).setStart(e,0).setCursor()}else{"fontsize"==a&&(c={10:"1",12:"2",16:"3",18:"4",24:"5",32:"6",48:"7"}[(c+"").replace(/px/,"")]);this.document.execCommand(b[a],!1,c);m.gecko&&g.each(this.$body.find("a"),function(a,b){var c=b.parentNode;if(c.lastChild===c.firstChild&&/FONT|SPAN/.test(c.tagName)){var d=c.cloneNode(!1);
+d.innerHTML=b.innerHTML;g(b).html("").append(d).insertBefore(c);g(c).remove()}});if(!m.ie){var e=this.selection.getNative().getRangeAt(0).commonAncestorContainer,f=this.selection.getRange(),l=f.createBookmark(!0);g(e).find("a").each(function(a,b){var c=b.parentNode;"FONT"==c.nodeName&&(c=c.cloneNode(!1),c.innerHTML=b.innerHTML,g(b).html("").append(c))});f.moveToBookmark(l).select()}return!0}}},queryCommandValue:function(b){var f=a.selection.getStart(),e=g(f).css(d[b]);void 0===e&&(e=g(f).attr(c[b]));
+return e?n.fixColor(b,e).replace(/px/,""):""},queryCommandState:function(a){return this.queryCommandValue(a)}}})(f)};UM.plugins.link=function(){this.setOpt("autourldetectinie",!1);m.ie&&!1===this.options.autourldetectinie&&this.addListener("keyup",function(a,b){var d=b.keyCode;if(13==d||32==d){var c=this.selection.getRange().startContainer;13==d?"P"==c.nodeName&&(d=c.previousSibling)&&1==d.nodeType&&(d=d.lastChild)&&"A"==d.nodeName&&!d.getAttribute("_href")&&k.remove(d,!0):32==d&&3==c.nodeType&&/^\s$/.test(c.nodeValue)&&
+(c=c.previousSibling)&&"A"==c.nodeName&&!c.getAttribute("_href")&&k.remove(c,!0)}});this.addOutputRule(function(a){g.each(a.getNodesByTagName("a"),function(a,d){var b=d.getAttr("href");/^(ftp|https?|\/|file)/.test(b)||(b="http://"+b);if(b!='http://undefined')d.setAttr("href",b);d.setAttr("_href");""==d.getAttr("title")&&d.setAttr("title")})});this.addInputRule(function(a){g.each(a.getNodesByTagName("a"),function(a,d){d.setAttr("_href",d.getAttr("href"))})});this.commands.link={execCommand:function(a,b){var d=this.selection.getRange();
+b._href&&(b._href=n.unhtml(b._href,/[<">'](?:(amp|lt|quot|gt|#39|nbsp);)?/g));b.href&&(b.href=n.unhtml(b.href,/[<">'](?:(amp|lt|quot|gt|#39|nbsp);)?/g));if(d.collapsed){var c=d.startContainer;(c=k.findParentByTagName(c,"a",!0))?(g(c).attr(b),d.selectNode(c).select()):d.insertNode(g("<a>"+b.href+"</a>").attr(b)[0]).select()}else this.document.execCommand("createlink",!1,"_umeditor_link"),n.each(k.getElementsByTagName(this.body,"a",function(a){return"_umeditor_link"==a.getAttribute("href")}),function(a){"_umeditor_link"==
+g(a).text()&&g(a).text(b.href);k.setAttributes(a,b);d.selectNode(a).select()})},queryCommandState:function(){return this.queryCommandValue("link")?1:0},queryCommandValue:function(){var a=this.selection.getStartElementPath(),b;g.each(a,function(a,c){if("A"==c.nodeName)return b=c,!1});return b}};this.commands.unlink={execCommand:function(){this.document.execCommand("unlink")}}};UM.commands.print={execCommand:function(){var a="editor_print_"+ +new Date;g('<iframe src="" id="'+a+'" name="'+a+'" frameborder="0"></iframe>').attr("id",
+a).css({width:"0px",height:"0px",overflow:"hidden","float":"left",position:"absolute",top:"-10000px",left:"-10000px"}).appendTo(this.$container.find(".edui-dialog-container"));var b=window.open("",a,"").document;b.open();b.write("<html><head></head><body><div>"+this.getContent(null,null,!0)+"</div><script>setTimeout(function(){window.print();setTimeout(function(){window.parent.$('#"+a+"').remove();},100);},200);\x3c/script></body></html>");b.close()},notNeedUndo:1};UM.plugins.paragraph=function(){this.setOpt("paragraph",
+{p:"",h1:"",h2:"",h3:"",h4:"",h5:"",h6:""});this.commands.paragraph={execCommand:function(a,b){return this.document.execCommand("formatBlock",!1,"<"+b+">")},queryCommandValue:function(){try{var a=this.document.queryCommandValue("formatBlock")}catch(b){}return a}}};UM.plugins.horizontal=function(){var a=this;a.commands.horizontal={execCommand:function(){this.document.execCommand("insertHorizontalRule");var b=a.selection.getRange().txtToElmBoundary(!0),d=b.startContainer;if(k.isBody(b.startContainer))(d=
+b.startContainer.childNodes[b.startOffset])||(d=g("<p></p>").appendTo(b.startContainer).html(m.ie?"&nbsp;":"<br/>")[0]),b.setStart(d,0).setCursor();else{for(;p.$inline[d.tagName]&&d.lastChild===d.firstChild;){var c=d.parentNode;c.appendChild(d.firstChild);c.removeChild(d);d=c}for(;p.$inline[d.tagName];)d=d.parentNode;1==d.childNodes.length&&"HR"==d.lastChild.nodeName?(c=d.lastChild,g(c).insertBefore(d),b.setStart(d,0).setCursor()):(c=g("hr",d)[0],k.breakParent(c,d),(d=c.previousSibling)&&k.isEmptyBlock(d)&&
+g(d).remove(),b.setStart(c.nextSibling,0).setCursor())}}}};UM.commands.cleardoc={execCommand:function(){var a=this,b=a.selection.getRange();a.body.innerHTML="<p>"+(E?"":"<br/>")+"</p>";b.setStart(a.body.firstChild,0).setCursor(!1,!0);setTimeout(function(){a.fireEvent("clearDoc")},0)}};UM.plugins.undo=function(){function a(a,b){if(a.length!=b.length)return 0;for(var c=0,d=a.length;c<d;c++)if(a[c]!=b[c])return 0;return 1}function b(){this.undoManger.save()}var d,c=this.options.maxUndoCount||20,f=this.options.maxInputCount||
+20,h=new RegExp(k.fillChar+"|</hr>","gi"),e={ol:1,ul:1,table:1,tbody:1,tr:1,body:1},l=this.options.autoClearEmptyNode;this.undoManger=new function(){this.list=[];this.index=0;this.hasRedo=this.hasUndo=!1;this.undo=function(){if(this.hasUndo)if(this.list[this.index-1]||1!=this.list.length){for(;this.list[this.index].content==this.list[this.index-1].content;)if(this.index--,0==this.index)return this.restore(0);this.restore(--this.index)}else this.reset()};this.redo=function(){if(this.hasRedo){for(;this.list[this.index].content==
+this.list[this.index+1].content;)if(this.index++,this.index==this.list.length-1)return this.restore(this.index);this.restore(++this.index)}};this.restore=function(){var a=this.editor,b=this.list[this.index],c=UM.htmlparser(b.content.replace(h,""));a.options.autoClearEmptyNode=!1;a.filterInputRule(c,!0);a.options.autoClearEmptyNode=l;a.body.innerHTML=c.toHtml();a.fireEvent("afterscencerestore");m.ie&&n.each(k.getElementsByTagName(a.document,"td th caption p"),function(b){k.isEmptyNode(b)&&k.fillNode(a.document,
+b)});try{var d=(new x.Range(a.document,a.body)).moveToAddress(b.address);if(m.ie&&d.collapsed&&1==d.startContainer.nodeType){var f=d.startContainer.childNodes[d.startOffset];(!f||1==f.nodeType&&p.$empty[f])&&d.insertNode(a.document.createTextNode(" ")).collapse(!0)}d.select(e[d.startContainer.nodeName.toLowerCase()])}catch(M){}this.update();this.clearKey();a.fireEvent("reset",!0)};this.getScene=function(){var a=this.editor,b=a.selection.getRange().createAddress(!1,!0);a.fireEvent("beforegetscene");
+var c=UM.htmlparser(a.body.innerHTML,!0);a.options.autoClearEmptyNode=!1;a.filterOutputRule(c,!0);a.options.autoClearEmptyNode=l;c=c.toHtml();m.ie&&(c=c.replace(/>&nbsp;</g,"><").replace(/\s*</g,"<").replace(/>\s*/g,">"));a.fireEvent("aftergetscene");return{address:b,content:c}};this.save=function(b,f){clearTimeout(d);var e=this.getScene(f),l=this.list[this.index],h;if(h=l&&l.content==e.content)b?l=1:(l=l.address,h=e.address,l=l.collapsed!=h.collapsed?0:a(l.startAddress,h.startAddress)&&a(l.endAddress,
+h.endAddress)?1:0),h=l;h||(this.list=this.list.slice(0,this.index+1),this.list.push(e),this.list.length>c&&this.list.shift(),this.index=this.list.length-1,this.clearKey(),this.update())};this.update=function(){this.hasRedo=!!this.list[this.index+1];this.hasUndo=!!this.list[this.index-1]};this.reset=function(){this.list=[];this.index=0;this.hasRedo=this.hasUndo=!1;this.clearKey()};this.clearKey=function(){v=0}};this.undoManger.editor=this;this.addListener("saveScene",function(){var a=Array.prototype.splice.call(arguments,
+1);this.undoManger.save.apply(this.undoManger,a)});this.addListener("beforeexeccommand",b);this.addListener("afterexeccommand",b);this.addListener("reset",function(a,b){b||this.undoManger.reset()});this.commands.redo=this.commands.undo={execCommand:function(a){this.undoManger[a]()},queryCommandState:function(a){return this.undoManger["has"+("undo"==a.toLowerCase()?"Undo":"Redo")]?0:-1},notNeedUndo:1};var t={16:1,17:1,18:1,37:1,38:1,39:1,40:1},v=0,r=!1;this.addListener("ready",function(){g(this.body).on("compositionstart",
+function(){r=!0}).on("compositionend",function(){r=!1})});this.addshortcutkey({Undo:"ctrl+90",Redo:"ctrl+89,shift+ctrl+z"});var q=!0;this.addListener("keydown",function(a,b){var c=this;if(!(t[b.keyCode||b.which]||b.ctrlKey||b.metaKey||b.shiftKey||b.altKey)){var e=function(a){a.selection.getRange().collapsed&&a.fireEvent("contentchange");a.undoManger.save(!1,!0);a.fireEvent("selectionchange")};r||(c.selection.getRange().collapsed?(0==c.undoManger.list.length&&c.undoManger.save(!0),clearTimeout(d),
+d=setTimeout(function(){if(r)var a=setInterval(function(){r||(e(c),clearInterval(a))},300);else e(c)},200),v++,v>=f&&e(c)):(c.undoManger.save(!1,!0),q=!1))}});this.addListener("keyup",function(a,b){t[b.keyCode||b.which]||b.ctrlKey||b.metaKey||b.shiftKey||b.altKey||r||q||(this.undoManger.save(!1,!0),q=!0)})};UM.plugins.paste=function(){function a(a){var b=this.document;if(!b.getElementById("baidu_pastebin")){var c=this.selection.getRange(),d=c.createBookmark(),l=b.createElement("div");l.id="baidu_pastebin";
+m.webkit&&l.appendChild(b.createTextNode(k.fillChar+k.fillChar));this.body.appendChild(l);d.start.style.display="";l.style.cssText="position:absolute;width:1px;height:1px;overflow:hidden;left:-1000px;white-space:nowrap;top:"+g(d.start).position().top+"px";c.selectNodeContents(l).select(!0);setTimeout(function(){if(m.webkit)for(var f=0,e=b.querySelectorAll("#baidu_pastebin"),h;h=e[f++];)if(k.isEmptyNode(h))k.remove(h);else{l=h;break}try{l.parentNode.removeChild(l)}catch(q){}c.moveToBookmark(d).select(!0);
+a(l)},0)}}function b(a){var b;if(a.firstChild){var c=k.getElementsByTagName(a,"span");b=0;for(var e;e=c[b++];)"_baidu_cut_start"!=e.id&&"_baidu_cut_end"!=e.id||k.remove(e);if(m.webkit){e=a.querySelectorAll("div br");for(b=0;c=e[b++];)c=c.parentNode,"DIV"==c.tagName&&1==c.childNodes.length&&(c.innerHTML="<p><br/></p>",k.remove(c));c=a.querySelectorAll("#baidu_pastebin");for(b=0;e=c[b++];){var l=d.document.createElement("p");for(e.parentNode.insertBefore(l,e);e.firstChild;)l.appendChild(e.firstChild);
+k.remove(e)}e=a.querySelectorAll("meta");for(b=0;c=e[b++];)k.remove(c);e=a.querySelectorAll("br");for(b=0;c=e[b++];)/^apple-/i.test(c.className)&&k.remove(c)}if(m.gecko)for(e=a.querySelectorAll("[_moz_dirty]"),b=0;c=e[b++];)c.removeAttribute("_moz_dirty");if(!m.ie)for(e=a.querySelectorAll("span.Apple-style-span"),b=0;c=e[b++];)k.remove(c,!0);b=a.innerHTML;b=UM.filterWord(b);a=UM.htmlparser(b);d.options.filterRules&&UM.filterNode(a,d.options.filterRules);d.filterInputRule(a);m.webkit&&((b=a.lastChild())&&
+"element"==b.type&&"br"==b.tagName&&a.removeChild(b),n.each(d.body.querySelectorAll("div"),function(a){k.isEmptyBlock(a)&&k.remove(a)}));b={html:a.toHtml()};d.fireEvent("beforepaste",b,a);b.html&&(d.execCommand("insertHtml",b.html,!0),d.fireEvent("afterpaste",b))}}var d=this;d.addListener("ready",function(){g(d.body).on("cut",function(){!d.selection.getRange().collapsed&&d.undoManger&&d.undoManger.save()}).on(m.ie||m.opera?"keydown":"paste",function(c){(!m.ie&&!m.opera||(c.ctrlKey||c.metaKey)&&"86"==
+c.keyCode)&&a.call(d,function(a){b(a)})})})};UM.plugins.list=function(){this.setOpt({insertorderedlist:{decimal:"","lower-alpha":"","lower-roman":"","upper-alpha":"","upper-roman":""},insertunorderedlist:{circle:"",disc:"",square:""}});this.addInputRule(function(a){n.each(a.getNodesByTagName("li"),function(a){0==a.children.length&&a.parentNode.removeChild(a)})});this.commands.insertorderedlist=this.commands.insertunorderedlist={execCommand:function(a){this.document.execCommand(a);a=this.selection.getRange();
+var b=a.createBookmark(!0);this.$body.find("ol,ul").each(function(a,b){var c=b.parentNode;"P"==c.tagName&&c.lastChild===c.firstChild&&(g(b).children().each(function(a,b){var d=c.cloneNode(!1);g(d).append(b.innerHTML);g(b).html("").append(d)}),g(b).insertBefore(c),g(c).remove());p.$inline[c.tagName]&&("SPAN"==c.tagName&&g(b).children().each(function(a,b){var d=c.cloneNode(!1);if("P"!=b.firstChild.nodeName){for(;b.firstChild;)d.appendChild(b.firstChild);g("<p></p>").appendTo(b).append(d)}else{for(;b.firstChild;)d.appendChild(b.firstChild);
+g(b.firstChild).append(d)}}),k.remove(c,!0))});a.moveToBookmark(b).select();return!0},queryCommandState:function(a){return this.document.queryCommandState(a)}}};(function(){var a={textarea:function(a,d){var b=d.ownerDocument.createElement("textarea");b.style.cssText="resize:none;border:0;padding:0;margin:0;overflow-y:auto;outline:0";m.ie&&8>m.version&&(b.style.width=d.offsetWidth+"px",b.style.height=d.offsetHeight+"px",d.onresize=function(){b.style.width=d.offsetWidth+"px";b.style.height=d.offsetHeight+
+"px"});d.appendChild(b);return{container:b,setContent:function(a){b.value=a},getContent:function(){return b.value},select:function(){var a;m.ie?(a=b.createTextRange(),a.collapse(!0),a.select()):(b.setSelectionRange(0,0),b.focus())},dispose:function(){d.removeChild(b);d=b=d.onresize=null}}}};UM.plugins.source=function(){var b=this,d=!1,c;this.options.sourceEditor="textarea";b.setOpt({sourceEditorFirst:!1});var f=b.getContent,h;b.commands.source={execCommand:function(){if(d=!d){h=b.selection.getRange().createAddress(!1,
+!0);b.undoManger&&b.undoManger.save(!0);m.gecko&&(b.body.contentEditable=!1);b.body.style.cssText+=";position:absolute;left:-32768px;top:-32768px;";b.fireEvent("beforegetcontent");var e=UM.htmlparser(b.body.innerHTML);b.filterOutputRule(e);e.traversal(function(a){if("element"==a.type)switch(a.tagName){case "td":case "th":case "caption":a.children&&1==a.children.length&&"br"==a.firstChild().tagName&&a.removeChild(a.firstChild());break;case "pre":a.innerText(a.innerText().replace(/&nbsp;/g," "))}});
+b.fireEvent("aftergetcontent");e=e.toHtml(!0);c=a.textarea(b,b.body.parentNode);c.setContent(e);g(c.container).width(g(b.body).width()+parseInt(g(b.body).css("padding-left"))+parseInt(g(b.body).css("padding-right"))).height(g(b.body).height());setTimeout(function(){c.select()});b.getContent=function(){return c.getContent()||"<p>"+(m.ie?"":"<br/>")+"</p>"}}else{b.$body.css({position:"",left:"",top:""});e=c.getContent()||"<p>"+(m.ie?"":"<br/>")+"</p>";e=e.replace(RegExp("[\\r\\t\\n ]*</?(\\w+)\\s*(?:[^>]*)>",
+"g"),function(a,b){return b&&!p.$inlineWithA[b.toLowerCase()]?a.replace(/(^[\n\r\t ]*)|([\n\r\t ]*$)/g,""):a.replace(/(^[\n\r\t]*)|([\n\r\t]*$)/g,"")});b.setContent(e);c.dispose();c=null;b.getContent=f;b.body.firstChild||(b.body.innerHTML="<p>"+(m.ie?"":"<br/>")+"</p>");b.undoManger&&b.undoManger.save(!0);m.gecko&&(b.body.contentEditable=!0);try{b.selection.getRange().moveToAddress(h).select()}catch(t){}}this.fireEvent("sourcemodechanged",d)},queryCommandState:function(){return d|0},notNeedUndo:1};
+var e=b.queryCommandState;b.queryCommandState=function(a){a=a.toLowerCase();return d?a in{source:1,fullscreen:1}?e.apply(this,arguments):-1:e.apply(this,arguments)}}})();UM.plugins.enterkey=function(){var a,b=this,d=b.options.enterTag;b.addListener("keyup",function(c,d){if(13==(d.keyCode||d.which)){var f=b.selection.getRange(),e=f.startContainer,l;if(m.ie)b.fireEvent("saveScene",!0,!0);else{if(/h\d/i.test(a)){if(m.gecko)k.findParentByTagName(e,"h1 h2 h3 h4 h5 h6 blockquote caption table".split(" "),
+!0)||(b.document.execCommand("formatBlock",!1,"<p>"),l=1);else if(1==e.nodeType){var e=b.document.createTextNode(""),g;f.insertNode(e);if(g=k.findParentByTagName(e,"div",!0)){for(l=b.document.createElement("p");g.firstChild;)l.appendChild(g.firstChild);g.parentNode.insertBefore(l,g);k.remove(g);f.setStartBefore(e).setCursor();l=1}k.remove(e)}b.undoManger&&l&&b.undoManger.save()}m.opera&&f.select()}}});b.addListener("keydown",function(c,f){if(13==(f.keyCode||f.which))if(b.fireEvent("beforeenterkeydown"))k.preventDefault(f);
+else{b.fireEvent("saveScene",!0,!0);a="";var h=b.selection.getRange();if(!h.collapsed){var e=h.startContainer,l=h.endContainer,e=k.findParentByTagName(e,"td",!0),l=k.findParentByTagName(l,"td",!0);if(e&&l&&e!==l||!e&&l||e&&!l){f.preventDefault?f.preventDefault():f.returnValue=!1;return}}"p"!=d||m.ie||((e=k.findParentByTagName(h.startContainer,"ol ul p h1 h2 h3 h4 h5 h6 blockquote caption".split(" "),!0))||m.opera?(a=e.tagName,"p"==e.tagName.toLowerCase()&&m.gecko&&k.removeDirtyAttr(e)):(b.document.execCommand("formatBlock",
+!1,"<p>"),m.gecko&&(h=b.selection.getRange(),(e=k.findParentByTagName(h.startContainer,"p",!0))&&k.removeDirtyAttr(e))))}});m.ie&&b.addListener("setDisabled",function(){g(b.body).find("p").each(function(a,b){k.isEmptyBlock(b)&&(b.innerHTML="&nbsp;")})})};UM.commands.preview={execCommand:function(){var a=window.open("","_blank","").document,b=this.getContent(null,null,!0),d=this.getOpt("UMEDITOR_HOME_URL"),d=-1!=b.indexOf("mathquill-embedded-latex")?'<link rel="stylesheet" href='+d+'"third-party/mathquill/mathquill.css"/><script src='+
+d+'"third-party/jquery.min.js">\x3c/script><script src='+d+'"third-party/mathquill/mathquill.min.js">\x3c/script>':"";a.open();a.write("<html><head>"+d+"</head><body><div>"+b+"</div></body></html>");a.close()},notNeedUndo:1};UM.plugins.basestyle=function(){var a=this;a.addshortcutkey({Bold:"ctrl+66",Italic:"ctrl+73",Underline:"ctrl+shift+85",strikeThrough:"ctrl+shift+83"});a.addOutputRule(function(a){g.each(a.getNodesByTagName("b i u strike s"),function(a,b){switch(b.tagName){case "b":b.tagName="strong";
+break;case "i":b.tagName="em";break;case "u":b.tagName="span";b.setStyle("text-decoration","underline");break;case "s":case "strike":b.tagName="span",b.setStyle("text-decoration","line-through")}})});g.each("bold underline superscript subscript italic strikethrough".split(" "),function(b,d){a.commands[d]={execCommand:function(a){var b=this.selection.getRange();return b.collapsed&&1!=this.queryCommandState(a)?(a=this.document.createElement({bold:"strong",underline:"u",superscript:"sup",subscript:"sub",
+italic:"em",strikethrough:"strike"}[a]),b.insertNode(a).setStart(a,0).setCursor(!1),!0):this.document.execCommand(a)},queryCommandState:function(a){if(m.gecko)return this.document.queryCommandState(a);var b=this.selection.getStartElementPath(),c=!1;g.each(b,function(b,d){switch(a){case "bold":if("STRONG"==d.nodeName||"B"==d.nodeName)return c=1,!1;break;case "underline":if("U"==d.nodeName||"SPAN"==d.nodeName&&"underline"==g(d).css("text-decoration"))return c=1,!1;break;case "superscript":if("SUP"==
+d.nodeName)return c=1,!1;break;case "subscript":if("SUB"==d.nodeName)return c=1,!1;break;case "italic":if("EM"==d.nodeName||"I"==d.nodeName)return c=1,!1;break;case "strikethrough":if("S"==d.nodeName||"STRIKE"==d.nodeName||"SPAN"==d.nodeName&&"line-through"==g(d).css("text-decoration"))return c=1,!1}});return c}}})};UM.plugins.video=function(){function a(a,b,h,e,l,g){return g?'<embed type="application/x-shockwave-flash" class="edui-faked-video" pluginspage="http://www.macromedia.com/go/getflashplayer" src="'+
+a+'" width="'+b+'" height="'+h+'"'+(l?' style="float:'+l+'"':"")+' wmode="transparent" play="true" loop="false" menu="false" allowscriptaccess="never" allowfullscreen="true" >':"<img "+(e?'id="'+e+'"':"")+' width="'+b+'" height="'+h+'" _url="'+a+'" class="edui-faked-video" src='+d.options.UMEDITOR_HOME_URL+'"themes/default/images/spacer.gif" style="background:url('+d.options.UMEDITOR_HOME_URL+"themes/default/images/videologo.gif) no-repeat center center; border:1px solid gray;"+(l?"float:"+l+";":
+"")+'" />'}function b(b,d){n.each(b.getNodesByTagName(d?"img":"embed"),function(b){if("edui-faked-video"==b.getAttr("class")){var c=a(d?b.getAttr("_url"):b.getAttr("src"),b.getAttr("width"),b.getAttr("height"),null,b.getStyle("float")||"",d);b.parentNode.replaceChild(UM.uNode.createElement(c),b)}})}var d=this;d.addOutputRule(function(a){b(a,!0)});d.addInputRule(function(a){b(a)});d.commands.insertvideo={execCommand:function(b,f){f=n.isArray(f)?f:[f];for(var c=[],e=0,l,g=f.length;e<g;e++)l=f[e],l.url=
+n.unhtml(l.url,/[<">'](?:(amp|lt|quot|gt|#39|nbsp);)?/g),c.push(a(l.url,l.width||420,l.height||280,"tmpVedio"+e,l.align,!1));d.execCommand("inserthtml",c.join(""),!0)},queryCommandState:function(){var a=d.selection.getRange().getClosedNode();return a&&"edui-faked-video"==a.className?1:0}}};UM.plugins.selectall=function(){this.commands.selectall={execCommand:function(){var a=this.body,b=this.selection.getRange();b.selectNodeContents(a);k.isEmptyBlock(a)&&(m.opera&&a.firstChild&&1==a.firstChild.nodeType&&
+b.setStartAtFirst(a.firstChild),b.collapse(!0));b.select(!0)},notNeedUndo:1};this.addshortcutkey({selectAll:"ctrl+65"})};UM.plugins.removeformat=function(){this.setOpt({removeFormatTags:"b,big,code,del,dfn,em,font,i,ins,kbd,q,samp,small,span,strike,strong,sub,sup,tt,u,var",removeFormatAttributes:"class,style,lang,width,height,align,hspace,valign"});this.commands.removeformat={execCommand:function(a,b,d,c,f){function h(a){if(3==a.nodeType||"span"!=a.tagName.toLowerCase())return 0;if(m.ie){var b=a.attributes;
+if(b.length){a=0;for(var c=b.length;a<c;a++)if(b[a].specified)return 0;return 1}}return!a.attributes.length}function e(a){var b=a.createBookmark();a.collapsed&&a.enlarge(!0);if(!f){var c=k.findParentByTagName(a.startContainer,"a",!0);c&&a.setStartBefore(c);(c=k.findParentByTagName(a.endContainer,"a",!0))&&a.setEndAfter(c)}v=a.createBookmark();for(c=v.start;(r=c.parentNode)&&!k.isBlockElm(r);)k.breakParent(c,r),k.clearEmptySibling(c);if(v.end){for(c=v.end;(r=c.parentNode)&&!k.isBlockElm(r);)k.breakParent(c,
+r),k.clearEmptySibling(c);for(var c=k.getNextDomNode(v.start,!1,q),e;c&&c!=v.end;)e=k.getNextDomNode(c,!0,q),p.$empty[c.tagName.toLowerCase()]||k.isBookmarkNode(c)||(l.test(c.tagName)?d?(k.removeStyle(c,d),h(c)&&"text-decoration"!=d&&k.remove(c,!0)):k.remove(c,!0):p.$tableContent[c.tagName]||p.$list[c.tagName]||(k.removeAttributes(c,g),h(c)&&k.remove(c,!0))),c=e}c=v.start.parentNode;!k.isBlockElm(c)||p.$tableContent[c.tagName]||p.$list[c.tagName]||k.removeAttributes(c,g);c=v.end.parentNode;v.end&&
+k.isBlockElm(c)&&!p.$tableContent[c.tagName]&&!p.$list[c.tagName]&&k.removeAttributes(c,g);a.moveToBookmark(v).moveToBookmark(b);c=a.startContainer;for(e=a.collapsed;1==c.nodeType&&k.isEmptyNode(c)&&p.$removeEmpty[c.tagName];)b=c.parentNode,a.setStartBefore(c),a.startContainer===a.endContainer&&a.endOffset--,k.remove(c),c=b;if(!e)for(c=a.endContainer;1==c.nodeType&&k.isEmptyNode(c)&&p.$removeEmpty[c.tagName];)b=c.parentNode,a.setEndBefore(c),k.remove(c),c=b}var l=new RegExp("^(?:"+(b||this.options.removeFormatTags).replace(/,/g,
+"|")+")$","i"),g=d?[]:(c||this.options.removeFormatAttributes).split(",");a=new x.Range(this.document);var v,r,q=function(a){return 1==a.nodeType};a=this.selection.getRange();a.collapsed||(e(a),a.select())}}};UM.plugins.keystrokes=function(){var a=this,b=!0;a.addListener("keydown",function(d,c){var f=c.keyCode||c.which,h=a.selection.getRange();if(!(h.collapsed||c.ctrlKey||c.shiftKey||c.altKey||c.metaKey)&&(65<=f&&90>=f||48<=f&&57>=f||96<=f&&111>=f||{13:1,8:1,46:1}[f])){var e=h.startContainer;k.isFillChar(e)&&
+h.setStartBefore(e);e=h.endContainer;k.isFillChar(e)&&h.setEndAfter(e);h.txtToElmBoundary();h.endContainer&&1==h.endContainer.nodeType&&(e=h.endContainer.childNodes[h.endOffset])&&k.isBr(e)&&h.setEndAfter(e);if(0==h.startOffset&&(e=h.startContainer,k.isBoundaryNode(e,"firstChild")&&(e=h.endContainer,h.endOffset==(3==e.nodeType?e.nodeValue.length:e.childNodes.length)&&k.isBoundaryNode(e,"lastChild")))){a.fireEvent("saveScene");a.body.innerHTML="<p>"+(m.ie?"":"<br/>")+"</p>";h.setStart(a.body.firstChild,
+0).setCursor(!1,!0);a._selectionChange();return}}if(8==f){h=a.selection.getRange();b=h.collapsed;if(a.fireEvent("delkeydown",c))return;var l;h.collapsed&&h.inFillChar()&&(e=h.startContainer,k.isFillChar(e)?(h.setStartBefore(e).shrinkBoundary(!0).collapse(!0),k.remove(e)):(e.nodeValue=e.nodeValue.replace(new RegExp("^"+k.fillChar),""),h.startOffset--,h.collapse(!0).select(!0)));if(e=h.getClosedNode()){a.fireEvent("saveScene");h.setStartBefore(e);k.remove(e);h.setCursor();a.fireEvent("saveScene");k.preventDefault(c);
+return}if(!m.ie&&(e=k.findParentByTagName(h.startContainer,"table",!0),l=k.findParentByTagName(h.endContainer,"table",!0),e&&!l||!e&&l||e!==l)){c.preventDefault();return}e=h.startContainer;h.collapsed&&1==e.nodeType&&(e=e.childNodes[h.startOffset-1])&&1==e.nodeType&&"BR"==e.tagName&&(a.fireEvent("saveScene"),h.setStartBefore(e).collapse(!0),k.remove(e),h.select(),a.fireEvent("saveScene"));if(m.chrome&&h.collapsed){for(;0==h.startOffset&&!k.isEmptyBlock(h.startContainer);)h.setStartBefore(h.startContainer);
+(e=h.startContainer.childNodes[h.startOffset-1])&&"BR"==e.nodeName&&(h.setStartBefore(e),a.fireEvent("saveScene"),g(e).remove(),h.setCursor(),a.fireEvent("saveScene"))}}if(m.gecko&&46==f&&(f=a.selection.getRange(),f.collapsed&&(e=f.startContainer,k.isEmptyBlock(e)))){for(f=e.parentNode;1==k.getChildCount(f)&&!k.isBody(f);)e=f,f=f.parentNode;e===f.lastChild&&c.preventDefault()}});a.addListener("keyup",function(a,c){var d;if(8==(c.keyCode||c.which)&&!this.fireEvent("delkeyup")){d=this.selection.getRange();
+if(d.collapsed){var h;if((h=k.findParentByTagName(d.startContainer,"h1 h2 h3 h4 h5 h6".split(" "),!0))&&k.isEmptyBlock(h)){var e=h.previousSibling;if(e&&"TABLE"!=e.nodeName){k.remove(h);d.setStartAtLast(e).setCursor(!1,!0);return}if((e=h.nextSibling)&&"TABLE"!=e.nodeName){k.remove(h);d.setStartAtFirst(e).setCursor(!1,!0);return}}k.isBody(d.startContainer)&&(h=k.createElement(this.document,"p",{innerHTML:m.ie?k.fillChar:"<br/>"}),d.insertNode(h).setStart(h,0).setCursor(!1,!0))}!b&&(3==d.startContainer.nodeType||
+1==d.startContainer.nodeType&&k.isEmptyBlock(d.startContainer))&&(m.ie?(h=d.document.createElement("span"),d.insertNode(h).setStartBefore(h).collapse(!0),d.select(),k.remove(h)):d.select())}})};UM.plugins.autosave=function(){function a(a){var e;20>new Date-d||(a.hasContents()?(d=new Date,a._saveFlag=null,e=b.body.innerHTML,!1!==a.fireEvent("beforeautosave",{content:e})&&(f.saveLocalData(c,e),a.fireEvent("afterautosave",{content:e}))):c&&f.removeItem(c))}var b=this,d=new Date,c=null;b.setOpt("saveInterval",
+500);var f=UM.LocalStorage=function(){function a(){var a=document.createElement("div");a.style.display="none";if(!a.addBehavior)return null;a.addBehavior("#default#userdata");return{getItem:function(b){var d=null;try{document.body.appendChild(a),a.load(c),d=a.getAttribute(b),document.body.removeChild(a)}catch(q){}return d},setItem:function(b,d){document.body.appendChild(a);a.setAttribute(b,d);a.save(c);document.body.removeChild(a)},removeItem:function(b){document.body.appendChild(a);a.removeAttribute(b);
+a.save(c);document.body.removeChild(a)}}}var b=window.localStorage||a()||null,c="localStorage";return{saveLocalData:function(a,c){return b&&c?(b.setItem(a,c),!0):!1},getLocalData:function(a){return b?b.getItem(a):null},removeItem:function(a){b&&b.removeItem(a)}}}();b.addListener("ready",function(){var a;a=b.key?b.key+"-drafts-data":(b.container.parentNode.id||"ue-common")+"-drafts-data";c=(location.protocol+location.host+location.pathname).replace(/[.:\/]/g,"_")+a});b.addListener("contentchange",
+function(){c&&(b._saveFlag&&window.clearTimeout(b._saveFlag),0<b.options.saveInterval?b._saveFlag=window.setTimeout(function(){a(b)},b.options.saveInterval):a(b))});b.commands.clearlocaldata={execCommand:function(a,b){c&&f.getLocalData(c)&&f.removeItem(c)},notNeedUndo:!0,ignoreContentChange:!0};b.commands.getlocaldata={execCommand:function(a,b){return c?f.getLocalData(c)||"":""},notNeedUndo:!0,ignoreContentChange:!0};b.commands.drafts={execCommand:function(a,d){c&&(b.body.innerHTML=f.getLocalData(c)||
+"<p>"+(m.ie?"&nbsp;":"<br/>")+"</p>",b.focus(!0))},queryCommandState:function(){return c?null===f.getLocalData(c)?-1:0:-1},notNeedUndo:!0,ignoreContentChange:!0}};UM.plugins.autoupload=function(){var a=this;a.setOpt("pasteImageEnabled",!0);a.setOpt("dropFileEnabled",!0);var b=function(b,c){var d=new FormData;d.append(c.options.imageFieldName||"upfile",b,b.name||"blob."+b.type.substr(6));d.append("type","ajax");var h=new XMLHttpRequest;h.open("post",a.options.imageUrl,!0);h.setRequestHeader("X-Requested-With",
+"XMLHttpRequest");h.addEventListener("load",function(b){try{var d=eval("("+b.target.response+")").url,e=a.options.imagePath+d;c.execCommand("insertimage",{src:e,_src:e})}catch(v){}});h.send(d)};a.addListener("ready",function(){if(window.FormData&&window.FileReader){var d=function(c){var d=!1;"paste"==c.type?(c=c.originalEvent,c=c.clipboardData&&c.clipboardData.items&&1==c.clipboardData.items.length&&/^image\//.test(c.clipboardData.items[0].type)?c.clipboardData.items:null):(c=c.originalEvent,c=c.dataTransfer&&
+c.dataTransfer.files?c.dataTransfer.files:null);if(c){for(var h=c.length,e;h--;)e=c[h],e.getAsFile&&(e=e.getAsFile()),e&&0<e.size&&/image\/\w+/i.test(e.type)&&(b(e,a),d=!0);if(d)return!1}};a.getOpt("pasteImageEnabled")&&a.$body.on("paste",d);a.getOpt("dropFileEnabled")&&a.$body.on("drop",d);a.$body.on("dragover",function(a){if("Files"==a.originalEvent.dataTransfer.types[0])return!1})}})};UM.plugins.formula=function(){function a(){return d.$body.find("iframe.edui-formula-active")[0]||null}function b(){var b=
+a();b&&b.contentWindow.formula.blur()}var d=this;d.addInputRule(function(a){g.each(a.getNodesByTagName("span"),function(a,b){if(b.hasClass("mathquill-embedded-latex")){for(var c,f="";c=b.firstChild();)f+=c.data,b.removeChild(c);b.tagName="iframe";b.setAttr({frameborder:"0",src:d.getOpt("UMEDITOR_HOME_URL")+"dialogs/formula/formula.html","data-latex":n.unhtml(f)})}})});d.addOutputRule(function(a){g.each(a.getNodesByTagName("iframe"),function(a,b){b.hasClass("mathquill-embedded-latex")&&(b.tagName=
+"span",b.appendChild(UM.uNode.createText(b.getAttr("data-latex"))),b.setAttr({frameborder:"",src:"","data-latex":""}))})});d.addListener("click",function(){b()});d.addListener("afterexeccommand",function(a,d){"formula"!=d&&b()});d.commands.formula={execCommand:function(b,f){var c=a();c?c.contentWindow.formula.insertLatex(f):(d.execCommand("inserthtml",'<span class="mathquill-embedded-latex">'+f+"</span>"),m.ie&&m.ie9below&&setTimeout(function(){var a=d.selection.getRange(),b=a.startContainer;1!=b.nodeType||
+b.childNodes[a.startOffset]||(a.insertNode(d.document.createTextNode(" ")),a.setCursor())},100))},queryCommandState:function(a){return 0},queryCommandValue:function(b){return(b=a())&&b.contentWindow.formula.getLatex()}}};UM.plugins.xssFilter=function(){function a(a){var b=a.tagName,c=a.attrs;if(!d.hasOwnProperty(b))return a.parentNode.removeChild(a),!1;UM.utils.each(c,function(c,e){-1===UM.utils.indexOf(d[b],e)&&a.setAttr(e)})}var b=UMEDITOR_CONFIG,d=b.whiteList;d&&b.xssFilterRules&&(this.options.filterRules=
+function(){var b={};UM.utils.each(d,function(c,d){b[d]=function(b){return a(b)}});return b}());var c=[];UM.utils.each(d,function(a,b){c.push(b)});d&&b.inputXssFilter&&this.addInputRule(function(b){b.traversal(function(b){if("element"!==b.type)return!1;a(b)})});d&&b.outputXssFilter&&this.addOutputRule(function(b){b.traversal(function(b){if("element"!==b.type)return!1;a(b)})})};(function(a){function b(b,c,d){b.prototype=a.extend2(a.extend({},c),(UM.ui[d]||f).prototype,!0);b.prototype.supper=(UM.ui[d]||
+f).prototype;UM.ui[d]&&UM.ui[d].prototype.defaultOpt&&(b.prototype.defaultOpt=a.extend({},UM.ui[d].prototype.defaultOpt,b.prototype.defaultOpt||{}));return b}function d(b,c){a["edui"+c]=b;a.fn["edui"+c]=function(c){var d,e=Array.prototype.slice.call(arguments,1);this.each(function(f,l){var g=a(l),h=g.edui();h||(b(c&&a.isPlainObject(c)?c:{},g),g.edui(h));if("string"==a.type(c))if("this"==c)d=h;else{d=h[c].apply(h,e);if(d!==h&&void 0!==d)return!1;d=null}});return null!==d?d:this}}a.parseTmpl=function(a,
+b){var c="var __p=[],print=function(){__p.push.apply(__p,arguments);};with(obj||{}){__p.push('"+a.replace(/\\/g,"\\\\").replace(/'/g,"\\'").replace(/<%=([\s\S]+?)%>/g,function(a,b){return"',obj."+b.replace(/\\'/g,"'")+",'"}).replace(/<%([\s\S]+?)%>/g,function(a,b){return"');"+b.replace(/\\'/g,"'").replace(/[\r\n\t]/g," ")+"__p.push('"}).replace(/\r/g,"\\r").replace(/\n/g,"\\n").replace(/\t/g,"\\t")+"');}return __p.join('');",c=new Function("obj",c);return b?c(b):c};a.extend2=function(b,c){for(var d=
+arguments,e="boolean"==a.type(d[d.length-1])?d[d.length-1]:!1,f="boolean"==a.type(d[d.length-1])?d.length-1:d.length,l=1;l<f;l++){var g=d[l],h;for(h in g)e&&b.hasOwnProperty(h)||(b[h]=g[h])}return b};a.IE6=!!window.ActiveXObject&&6==parseFloat(navigator.userAgent.match(/msie (\d+)/i)[1]);var c=[],f=function(){};f.prototype={on:function(b,c){this.root().on(b,a.proxy(c,this));return this},off:function(b,c){this.root().off(b,a.proxy(c,this));return this},trigger:function(a,b){return!1===this.root().trigger(a,
+b)?!1:this},root:function(a){return this._$el||(this._$el=a)},destroy:function(){},data:function(a,b){return void 0!==b?(this.root().data("edui"+a,b),this):this.root().data("edui"+a)},register:function(b,d,f){c.push({evtname:b,$els:a.isArray(d)?d:[d],handler:a.proxy(f,d)})}};a.fn.edui=function(a){return a?this.data("eduiwidget",a):this.data("eduiwidget")};var g=1;UM.ui={define:function(c,f,h){var e=UM.ui[c]=b(function(b,d){var f=function(){};a.extend(f.prototype,e.prototype,{guid:c+g++,widgetName:c});
+f=new f;if("string"==a.type(b))return f.init&&f.init({}),f.root().edui(f),f.root().find("a").click(function(a){a.preventDefault()}),f.root()["edui"+c].apply(f.root(),arguments);d&&f.root(d);f.init&&f.init(!b||a.isPlainObject(b)?a.extend2(b||{},f.defaultOpt||{},!0):b);try{f.root().find("a").click(function(a){a.preventDefault()})}catch(A){}return f.root().edui(f)},f,h);d(e,c)}};a(function(){a(document).on("click mouseup mousedown dblclick mouseover",function(b){a.each(c,function(c,d){d.evtname==b.type&&
+a.each(d.$els,function(c,f){f[0]===b.target||a.contains(f[0],b.target)||d.handler(b)})})})})})(jQuery);UM.ui.define("button",{tpl:'<<%if : !${texttype}%>div class="edui-btn edui-btn-${icon} <%if : ${name}%>edui-btn-name-${name}<%/if%>" unselectable="on" onmousedown="return false" <%else%>a class="edui-text-btn"<%/if%><% if: ${title} %> data-original-title="${title}" <%/if%>> <% if: ${icon} %><div unselectable="on" class="edui-icon-${icon} edui-icon"></div><%/if%><%if: ${text} %><span unselectable="on" onmousedown="return false" class="edui-button-label">${text}</span><%/if%><%if: ${caret} && ${text}%><span class="edui-button-spacing"></span><%/if%><% if: ${caret} %><span unselectable="on" onmousedown="return false" class="edui-caret"></span><%/if%></<%if: !${texttype}%>div<%else%>a<%/if%>>',
+defaultOpt:{text:"",title:"",icon:"",width:"",caret:!1,texttype:!1,click:function(){}},init:function(a){var b=this;b.root(g(UM.utils.render(b.tpl,a))).click(function(d){b.wrapclick(a.click,d)});b.root().hover(function(){b.root().hasClass("edui-disabled")||b.root().toggleClass("edui-hover")});return b},wrapclick:function(a,b){this.disabled()||(this.root().trigger("wrapclick"),g.proxy(a,this,b)());return this},label:function(a){if(void 0===a)return this.root().find(".edui-button-label").text();this.root().find(".edui-button-label").text(a);
+return this},disabled:function(a){if(void 0===a)return this.root().hasClass("edui-disabled");this.root().toggleClass("edui-disabled",a);this.root().hasClass("edui-disabled")&&this.root().removeClass("edui-hover");return this},active:function(a){if(void 0===a)return this.root().hasClass("edui-active");this.root().toggleClass("edui-active",a);return this},mergeWith:function(a){var b=this;b.data("$mergeObj",a);a.edui().data("$mergeObj",b.root());g.contains(document.body,a[0])||a.appendTo(b.root());b.on("click",
+function(){b.wrapclick(function(){a.edui().show()})}).register("click",b.root(),function(b){a.hide()})}});(function(){UM.ui.define("toolbar",{tpl:'<div class="edui-toolbar"  ><div class="edui-btn-toolbar" unselectable="on" onmousedown="return false"  ></div></div>',init:function(){var a=this.root(g(this.tpl));this.data("$btnToolbar",a.find(".edui-btn-toolbar"))},appendToBtnmenu:function(a){var b=this.data("$btnToolbar");a=g.isArray(a)?a:[a];g.each(a,function(a,c){b.append(c)})}})})();UM.ui.define("menu",
+{show:function(a,b,d,c,f){d=d||"position";!1!==this.trigger("beforeshow")&&(this.root().css(g.extend({display:"block"},a?{top:a[d]().top+("right"==b?0:a.outerHeight())-(c||0),left:a[d]().left+("right"==b?a.outerWidth():0)-(f||0)}:{})),this.trigger("aftershow"))},hide:function(a){var b;!1!==this.trigger("beforehide")&&((b=this.root().data("parentmenu"))&&(b.data("parentmenu")||a)&&b.edui().hide(),this.root().css("display","none"),this.trigger("afterhide"))},attachTo:function(a){var b=this;a.data("$mergeObj")||
+(a.data("$mergeObj",b.root()),a.on("wrapclick",function(a){b.show()}),b.register("click",a,function(a){b.hide()}),b.data("$mergeObj",a))}});UM.ui.define("dropmenu",{tmpl:'<ul class="edui-dropdown-menu" aria-labelledby="dropdownMenu" ><%for: ${data} as ${ci}%><%if: ${ci.divider}%><li class="edui-divider"></li><%else%><li class="${ci.active} || ${ci.disabled}" data-value="${ci.value}"><a href="#" tabindex="-1"><em class="edui-dropmenu-checkbox"><i class="edui-icon-ok"></i></em>${ci.label}</a></li><%/if%><%/for%></ul>',
+defaultOpt:{data:[],click:function(){}},init:function(a){var b=this,d={click:1,mouseover:1,mouseout:1};this.root(g(UM.utils.render(this.tmpl,a))).on("click",'li[class!="edui-disabled edui-divider edui-dropdown-submenu"]',function(c){g.proxy(a.click,b,c,g(this).data("value"),g(this))()}).find("li").each(function(c,f){var h=g(this);if(!h.hasClass("edui-disabled edui-divider edui-dropdown-submenu")){var e=a.data[c];g.each(d,function(a){e[a]&&h[a](function(c){g.proxy(e[a],f)(c,e,b.root)})})}})},disabled:function(a){g("li[class!=edui-divider]",
+this.root()).each(function(){var b=g(this);!0===a?b.addClass("edui-disabled"):g.isFunction(a)?b.toggleClass("edui-disabled",a(li)):b.removeClass("edui-disabled")})},val:function(a){var b;g('li[class!="edui-divider edui-disabled edui-dropdown-submenu"]',this.root()).each(function(){var d=g(this);if(void 0===a){if(d.find("em.edui-dropmenu-checked").length)return b=d.data("value"),!1}else d.find("em").toggleClass("edui-dropmenu-checked",d.data("value")==a)});if(void 0===a)return b},addSubmenu:function(a,
+b,d){d=d||0;var c=g("li[class!=edui-divider]",this.root());a=g('<li class="edui-dropdown-submenu"><a tabindex="-1" href="#">'+a+"</a></li>").append(b);0<=d&&d<c.length?a.insertBefore(c[d]):0>d?a.insertBefore(c[0]):d>=c.length&&a.appendTo(c)}},"menu");UM.ui.define("splitbutton",{tpl:'<div class="edui-splitbutton <%if: ${name}%>edui-splitbutton-${name}<%/if%>"  unselectable="on" <%if: ${title}%>data-original-title="${title}"<%/if%>><div class="edui-btn"  unselectable="on" ><%if: ${icon}%><div  unselectable="on" class="edui-icon-${icon} edui-icon"></div><%/if%><%if: ${text}%>${text}<%/if%></div><div  unselectable="on" class="edui-btn edui-dropdown-toggle" ><div  unselectable="on" class="edui-caret"></div></div></div>',
+defaultOpt:{text:"",title:"",click:function(){}},init:function(a){var b=this;b.root(g(UM.utils.render(b.tpl,a)));b.root().find(".edui-btn:first").click(function(d){b.disabled()||g.proxy(a.click,b)()});b.root().find(".edui-dropdown-toggle").click(function(){b.disabled()||b.trigger("arrowclick")});b.root().hover(function(){b.root().hasClass("edui-disabled")||b.root().toggleClass("edui-hover")});return b},wrapclick:function(a,b){this.disabled()||g.proxy(a,this,b)();return this},disabled:function(a){if(void 0===
+a)return this.root().hasClass("edui-disabled");this.root().toggleClass("edui-disabled",a).find(".edui-btn").toggleClass("edui-disabled",a);return this},active:function(a){if(void 0===a)return this.root().hasClass("edui-active");this.root().toggleClass("edui-active",a).find(".edui-btn:first").toggleClass("edui-active",a);return this},mergeWith:function(a){var b=this;b.data("$mergeObj",a);a.edui().data("$mergeObj",b.root());g.contains(document.body,a[0])||a.appendTo(b.root());b.root().delegate(".edui-dropdown-toggle",
+"click",function(){b.wrapclick(function(){a.edui().show()})});b.register("click",b.root().find(".edui-dropdown-toggle"),function(b){a.hide()})}});UM.ui.define("colorsplitbutton",{tpl:'<div class="edui-splitbutton <%if : ${name}%>edui-splitbutton-${name}<%/if%>"  unselectable="on" <%if: ${title}%>data-original-title="${title}"<%/if%>><div class="edui-btn"  unselectable="on" ><%if: ${icon}%><div unselectable="on" class="edui-icon-${icon} edui-icon"></div><%/if%><div class="edui-splitbutton-color-label" <%if: ${color}%>style="background: ${color}"<%/if%>></div><%if: ${text}%>${text}<%/if%></div><div  unselectable="on" class="edui-btn edui-dropdown-toggle" ><div  unselectable="on" class="edui-caret"></div></div></div>',
+defaultOpt:{color:""},init:function(a){this.supper.init.call(this,a)},colorLabel:function(){return this.root().find(".edui-splitbutton-color-label")}},"splitbutton");UM.ui.define("popup",{tpl:'<div class="edui-dropdown-menu edui-popup"<%if:!${stopprop}%>onmousedown="return false"<%/if%>><div class="edui-popup-body" unselectable="on" onmousedown="return false">${subtpl|raw}</div><div class="edui-popup-caret"></div></div>',defaultOpt:{stopprop:!1,subtpl:"",width:"",height:""},init:function(a){this.root(g(UM.utils.render(this.tpl,
+a)));return this},mergeTpl:function(a){return UM.utils.render(this.tpl,{subtpl:a})},show:function(a,b){b||(b={});var d=b.fnname||"position";!1!==this.trigger("beforeshow")&&(this.root().css(g.extend({display:"block"},a?{top:a[d]().top+("right"==b.dir?0:a.outerHeight())-(b.offsetTop||0),left:a[d]().left+("right"==b.dir?a.outerWidth():0)-(b.offsetLeft||0),position:"absolute"}:{})),this.root().find(".edui-popup-caret").css({top:b.caretTop||0,left:b.caretLeft||0,position:"absolute"}).addClass(b.caretDir||
+"up"),this.trigger("aftershow"))},hide:function(){this.root().css("display","none");this.trigger("afterhide")},attachTo:function(a,b){var d=this;a.data("$mergeObj")||(a.data("$mergeObj",d.root()),a.on("wrapclick",function(c){d.show(a,b)}),d.register("click",a,function(a){d.hide()}),d.data("$mergeObj",a))},getBodyContainer:function(){return this.root().find(".edui-popup-body")}});UM.ui.define("scale",{tpl:'<div class="edui-scale" unselectable="on"><span class="edui-scale-hand0"></span><span class="edui-scale-hand1"></span><span class="edui-scale-hand2"></span><span class="edui-scale-hand3"></span><span class="edui-scale-hand4"></span><span class="edui-scale-hand5"></span><span class="edui-scale-hand6"></span><span class="edui-scale-hand7"></span></div>',
+defaultOpt:{$doc:g(document),$wrap:g(document)},init:function(a){a.$doc&&(this.defaultOpt.$doc=a.$doc);a.$wrap&&(this.defaultOpt.$wrap=a.$wrap);this.root(g(UM.utils.render(this.tpl,a)));this.initStyle();this.startPos=this.prePos={x:0,y:0};this.dragId=-1;return this},initStyle:function(){n.cssRule("edui-style-scale",".edui-scale{display:none;position:absolute;border:1px solid #38B2CE;cursor:hand;}.edui-scale span{position:absolute;left:0;top:0;width:7px;height:7px;overflow:hidden;font-size:0px;display:block;background-color:#3C9DD0;}.edui-scale .edui-scale-hand0{cursor:nw-resize;top:0;margin-top:-4px;left:0;margin-left:-4px;}.edui-scale .edui-scale-hand1{cursor:n-resize;top:0;margin-top:-4px;left:50%;margin-left:-4px;}.edui-scale .edui-scale-hand2{cursor:ne-resize;top:0;margin-top:-4px;left:100%;margin-left:-3px;}.edui-scale .edui-scale-hand3{cursor:w-resize;top:50%;margin-top:-4px;left:0;margin-left:-4px;}.edui-scale .edui-scale-hand4{cursor:e-resize;top:50%;margin-top:-4px;left:100%;margin-left:-3px;}.edui-scale .edui-scale-hand5{cursor:sw-resize;top:100%;margin-top:-3px;left:0;margin-left:-4px;}.edui-scale .edui-scale-hand6{cursor:s-resize;top:100%;margin-top:-3px;left:50%;margin-left:-4px;}.edui-scale .edui-scale-hand7{cursor:se-resize;top:100%;margin-top:-3px;left:100%;margin-left:-3px;}")},
+_eventHandler:function(a){var b=this.defaultOpt.$doc;switch(a.type){case "mousedown":var d=a.target||a.srcElement;-1!=d.className.indexOf("edui-scale-hand")&&(this.dragId=d.className.slice(-1),this.startPos.x=this.prePos.x=a.clientX,this.startPos.y=this.prePos.y=a.clientY,b.bind("mousemove",g.proxy(this._eventHandler,this)));break;case "mousemove":-1!=this.dragId&&(this.updateContainerStyle(this.dragId,{x:a.clientX-this.prePos.x,y:a.clientY-this.prePos.y}),this.prePos.x=a.clientX,this.prePos.y=a.clientY,
+this.updateTargetElement());break;case "mouseup":-1!=this.dragId&&(this.dragId=-1,this.updateTargetElement(),this.data("$scaleTarget").parent()&&this.attachTo(this.data("$scaleTarget"))),b.unbind("mousemove",g.proxy(this._eventHandler,this))}},updateTargetElement:function(){var a=this.root(),b=this.data("$scaleTarget");b.css({width:a.width(),height:a.height()});this.attachTo(b)},updateContainerStyle:function(a,b){var d=this.root(),c,f=[[0,0,-1,-1],[0,0,0,-1],[0,0,1,-1],[0,0,-1,0],[0,0,1,0],[0,0,-1,
+1],[0,0,0,1],[0,0,1,1]];0!=f[a][0]&&(c=parseInt(d.offset().left)+b.x,d.css("left",this._validScaledProp("left",c)));0!=f[a][1]&&(c=parseInt(d.offset().top)+b.y,d.css("top",this._validScaledProp("top",c)));0!=f[a][2]&&(c=d.width()+f[a][2]*b.x,d.css("width",this._validScaledProp("width",c)));0!=f[a][3]&&(c=d.height()+f[a][3]*b.y,d.css("height",this._validScaledProp("height",c)))},_validScaledProp:function(a,b){var d=this.root(),c=this.defaultOpt.$doc,f=function(a,c,d){return a+c>d?d-c:b};b=isNaN(b)?
+0:b;switch(a){case "left":return 0>b?0:f(b,d.width(),c.width());case "top":return 0>b?0:f(b,d.height(),c.height());case "width":return 0>=b?1:f(b,d.offset().left,c.width());case "height":return 0>=b?1:f(b,d.offset().top,c.height())}},show:function(a){a&&this.attachTo(a);this.root().bind("mousedown",g.proxy(this._eventHandler,this));this.defaultOpt.$doc.bind("mouseup",g.proxy(this._eventHandler,this));this.root().show();this.trigger("aftershow")},hide:function(){this.root().unbind("mousedown",g.proxy(this._eventHandler,
+this));this.defaultOpt.$doc.unbind("mouseup",g.proxy(this._eventHandler,this));this.root().hide();this.trigger("afterhide")},attachTo:function(a){var b=a.offset(),d=this.root(),c=this.defaultOpt.$wrap,f=c.offset();this.data("$scaleTarget",a);this.root().css({position:"absolute",width:a.width(),height:a.height(),left:b.left-f.left-parseInt(c.css("border-left-width"))-parseInt(d.css("border-left-width")),top:b.top-f.top-parseInt(c.css("border-top-width"))-parseInt(d.css("border-top-width"))})},getScaleTarget:function(){return this.data("$scaleTarget")[0]}});
+UM.ui.define("colorpicker",{tpl:function(a){for(var b="ffffff 000000 eeece1 1f497d 4f81bd c0504d 9bbb59 8064a2 4bacc6 f79646 f2f2f2 7f7f7f ddd9c3 c6d9f0 dbe5f1 f2dcdb ebf1dd e5e0ec dbeef3 fdeada d8d8d8 595959 c4bd97 8db3e2 b8cce4 e5b9b7 d7e3bc ccc1d9 b7dde8 fbd5b5 bfbfbf 3f3f3f 938953 548dd4 95b3d7 d99694 c3d69b b2a2c7 92cddc fac08f a5a5a5 262626 494429 17365d 366092 953734 76923c 5f497a 31859b e36c09 7f7f7f 0c0c0c 1d1b10 0f243e 244061 632423 4f6128 3f3151 205867 974806 c00000 ff0000 ffc000 ffff00 92d050 00b050 00b0f0 0070c0 002060 7030a0 ".split(" "),
+d='<div unselectable="on" onmousedown="return false" class="edui-colorpicker<%if : ${name}%> edui-colorpicker-${name}<%/if%>" ><table unselectable="on" onmousedown="return false"><tr><td colspan="10">'+a.lang_themeColor+'</td> </tr><tr class="edui-colorpicker-firstrow" >',c=0;c<b.length;c++)c&&0===c%10&&(d+="</tr>"+(60==c?'<tr><td colspan="10">'+a.lang_standardColor+"</td></tr>":"")+"<tr"+(60==c?' class="edui-colorpicker-firstrow"':"")+">"),d+=70>c?'<td><a unselectable="on" onmousedown="return false" title="'+
+b[c]+'" class="edui-colorpicker-colorcell" data-color="#'+b[c]+'" style="background-color:#'+b[c]+";border:solid #ccc;"+(10>c||60<=c?"border-width:1px;":10<=c&&20>c?"border-width:1px 1px 0 1px;":"border-width:0 1px 0 1px;")+'"></a></td>':"";return d+"</tr></table></div>"},init:function(a){var b=this;b.root(g(UM.utils.render(b.supper.mergeTpl(b.tpl(a)),a)));b.root().on("click",function(a){b.trigger("pickcolor",g(a.target).data("color"))})}},"popup");(function(){UM.ui.define("combobox",function(){return{tpl:'<ul class="dropdown-menu edui-combobox-menu<%if: ${comboboxName} !==\'\'%> edui-combobox-${comboboxName}<%/if%>" unselectable="on" onmousedown="return false" role="menu" aria-labelledby="dropdownMenu"><%if: ${autoRecord} %><%for : ${recordStack} as ${recordItem}, ${index}%><%var : style = ${itemStyles}[${recordItem}]%><%var : record = ${items}[${recordItem}]%><li class="${itemClassName}<%if: ${selected} == ${recordItem}%> edui-combobox-checked<%/if%>" data-item-index="${recordItem}" unselectable="on" onmousedown="return false"><span class="edui-combobox-icon" unselectable="on" onmousedown="return false"></span><label class="${labelClassName}" style="${style}" unselectable="on" onmousedown="return false">${record}</label></li><%/for%><%if: ${index} %><li class="edui-combobox-item-separator"></li><%/if%><%/if%><%for: ${items} as ${item}, ${itemIndex}%><%var : labelStyle = ${itemStyles}[${itemIndex}]%><li class="${itemClassName}<%if: ${selected} == ${item} %> edui-combobox-checked<%/if%> edui-combobox-item-${itemIndex}" data-item-index="${itemIndex}" unselectable="on" onmousedown="return false"><span class="edui-combobox-icon" unselectable="on" onmousedown="return false"></span><label class="${labelClassName}" style="${labelStyle}" unselectable="on" onmousedown="return false">${item}</label></li><%/for%></ul>',
+defaultOpt:{recordStack:[],items:[],value:[],comboboxName:"",selected:"",autoRecord:!0,recordCount:5},init:function(a){g.extend(this._optionAdaptation(a),this._createItemMapping(a.recordStack,a.items),{itemClassName:"edui-combobox-item",iconClass:"edui-combobox-checked-icon",labelClassName:"edui-combobox-item-label"});this._transStack(a);this.root(g(UM.utils.render(this.tpl,a)));this.data("options",a).initEvent()},initEvent:function(){this.initSelectItem();this.initItemActive()},initSelectItem:function(){var a=
+this;a.root().delegate(".edui-combobox-item","click",function(){var b=g(this),d=b.attr("data-item-index");a.trigger("comboboxselect",{index:d,label:b.find(".edui-combobox-item-label").text(),value:a.data("options").value[d]}).select(d);a.hide();return!1})},initItemActive:function(){var a={mouseenter:"addClass",mouseleave:"removeClass"};if(g.IE6)this.root().delegate(".edui-combobox-item","mouseenter mouseleave",function(b){g(this)[a[b.type]]("edui-combobox-item-hover")}).one("afterhide",function(){})},
+select:function(a){var b=this.data("options").itemCount,d=this.data("options").autowidthitem;d&&!d.length&&(d=this.data("options").items);if(0==b)return null;0>a?a=b+a%b:a>=b&&(a=b-1);this.trigger("changebefore",d[a]);this._update(a);this.trigger("changeafter",d[a]);return null},selectItemByLabel:function(a){var b=this.data("options").itemMapping,d=this,c=null;!g.isArray(a)&&(a=[a]);g.each(a,function(a,g){c=b[g];if(void 0!==c)return d.select(c),!1})},_transStack:function(a){var b=[],d=-1,c=-1;g.each(a.recordStack,
+function(f,h){d=a.itemMapping[h];g.isNumeric(d)&&(b.push(d),h==a.selected&&(c=d))});a.recordStack=b;a.selected=c;b=null},_optionAdaptation:function(a){if(!("itemStyles"in a)){a.itemStyles=[];for(var b=0,d=a.items.length;b<d;b++)a.itemStyles.push("")}a.autowidthitem=a.autowidthitem||a.items;a.itemCount=a.items.length;return a},_createItemMapping:function(a,b){var d={},c={recordStack:[],mapping:{}};g.each(b,function(a,b){d[b]=a});c.itemMapping=d;g.each(a,function(a,b){void 0!==d[b]&&(c.recordStack.push(d[b]),
+c.mapping[b]=d[b])});return c},_update:function(a){var b=this.data("options"),d=[],c=null;g.each(b.recordStack,function(b,c){c!=a&&d.push(+c)});d.unshift(+a);d.length>b.recordCount&&(d.length=b.recordCount);b.recordStack=d;b.selected=+a;c=g(UM.utils.render(this.tpl,b));this.root().html(c.html());d=c=null}}}(),"menu")})();(function(){UM.ui.define("buttoncombobox",function(){return{defaultOpt:{label:"",title:""},init:function(a){var b=this,d=g.eduibutton({caret:!0,name:a.comboboxName,title:a.title,
+text:a.label,click:function(){b.show(this.root())}});b.supper.init.call(b,a);b.on("changebefore",function(a,b){d.eduibutton("label",b)});b.data("button",d);b.attachTo(d)},button:function(){return this.data("button")}}}(),"combobox")})();UM.ui.define("modal",{tpl:'<div class="edui-modal" tabindex="-1" ><div class="edui-modal-header"><div class="edui-close" data-hide="modal"></div><h3 class="edui-title">${title}</h3></div><div class="edui-modal-body"  style="<%if: ${width}%>width:${width}px;<%/if%><%if: ${height}%>height:${height}px;<%/if%>"> </div><% if: ${cancellabel} || ${oklabel} %><div class="edui-modal-footer"><div class="edui-modal-tip"></div><%if: ${oklabel}%><div class="edui-btn edui-btn-primary" data-ok="modal">${oklabel}</div><%/if%><%if: ${cancellabel}%><div class="edui-btn" data-hide="modal">${cancellabel}</div><%/if%></div><%/if%></div>',
+defaultOpt:{title:"",cancellabel:"",oklabel:"",width:"",height:"",backdrop:!0,keyboard:!0},init:function(a){this.root(g(UM.utils.render(this.tpl,a||{})));this.data("options",a);if(a.okFn)this.on("ok",g.proxy(a.okFn,this));if(a.cancelFn)this.on("beforehide",g.proxy(a.cancelFn,this));this.root().delegate('[data-hide="modal"]',"click",g.proxy(this.hide,this)).delegate('[data-ok="modal"]',"click",g.proxy(this.ok,this));g('[data-hide="modal"],[data-ok="modal"]',this.root()).hover(function(){g(this).toggleClass("edui-hover")})},
+toggle:function(){return this[this.data("isShown")?"hide":"show"]()},show:function(){var a=this;a.trigger("beforeshow");a.data("isShown")||(a.data("isShown",!0),a.escape(),a.backdrop(function(){a.autoCenter();a.root().show().focus().trigger("aftershow")}))},showTip:function(a){g(".edui-modal-tip",this.root()).html(a).fadeIn()},hideTip:function(a){g(".edui-modal-tip",this.root()).fadeOut(function(){g(this).html("")})},autoCenter:function(){!g.IE6&&this.root().css("margin-left",-(this.root().width()/
+2))},hide:function(){this.trigger("beforehide");this.data("isShown")&&(this.data("isShown",!1),this.escape(),this.hideModal())},escape:function(){var a=this;if(a.data("isShown")&&a.data("options").keyboard)a.root().on("keyup",function(b){27==b.which&&a.hide()});else a.data("isShown")||a.root().off("keyup")},hideModal:function(){var a=this;a.root().hide();a.backdrop(function(){a.removeBackdrop();a.trigger("afterhide")})},removeBackdrop:function(){this.$backdrop&&this.$backdrop.remove();this.$backdrop=
+null},backdrop:function(a){this.data("isShown")&&this.data("options").backdrop&&(this.$backdrop=g('<div class="edui-modal-backdrop" />').click("static"==this.data("options").backdrop?g.proxy(this.root()[0].focus,this.root()[0]):g.proxy(this.hide,this)));this.trigger("afterbackdrop");a&&a()},attachTo:function(a){var b=this;a.data("$mergeObj")||(a.data("$mergeObj",b.root()),a.on("click",function(){b.toggle(a)}),b.data("$mergeObj",a))},ok:function(){this.trigger("beforeok");!1!==this.trigger("ok",this)&&
+this.hide()},getBodyContainer:function(){return this.root().find(".edui-modal-body")}});UM.ui.define("tooltip",{tpl:'<div class="edui-tooltip" unselectable="on" onmousedown="return false"><div class="edui-tooltip-arrow" unselectable="on" onmousedown="return false"></div><div class="edui-tooltip-inner" unselectable="on" onmousedown="return false"></div></div>',init:function(a){this.root(g(UM.utils.render(this.tpl,a||{})))},content:function(a){a=g(a.currentTarget).attr("data-original-title");this.root().find(".edui-tooltip-inner").text(a)},
+position:function(a){a=g(a.currentTarget);this.root().css(g.extend({display:"block"},a?{top:a.outerHeight(),left:(a.outerWidth()-this.root().outerWidth())/2}:{}))},show:function(a){g(a.currentTarget).hasClass("edui-disabled")||(this.content(a),this.root().appendTo(g(a.currentTarget)),this.position(a),this.root().css("display","block"))},hide:function(){this.root().css("display","none")},attachTo:function(a){function b(a){var b=this;g.contains(document.body,b.root()[0])||b.root().appendTo(a);b.data("tooltip",
+b.root());a.each(function(){if(g(this).attr("data-original-title"))g(this).on("mouseenter",g.proxy(b.show,b)).on("mouseleave click",g.proxy(b.hide,b))})}var d=this;"undefined"===g.type(a)?g("[data-original-title]").each(function(a,f){b.call(d,g(f))}):a.data("tooltip")||b.call(d,a)}});UM.ui.define("tab",{init:function(a){var b=this,d=a.selector;g.type(d)&&(b.root(g(d,a.context)),b.data("context",a.context),g(d,b.data("context")).on("click",function(a){b.show(a)}))},show:function(a){var b=this,d=g(a.target),
+c=d.closest("ul"),f,h;f=(f=d.attr("data-context"))&&f.replace(/.*(?=#[^\s]*$)/,"");a=d.parent("li");a.length&&!a.hasClass("edui-active")&&(h=c.find(".edui-active:last a")[0],a=g.Event("beforeshow",{target:d[0],relatedTarget:h}),b.trigger(a),a.isDefaultPrevented()||(f=g(f,b.data("context")),b.activate(d.parent("li"),c),b.activate(f,f.parent(),function(){b.trigger({type:"aftershow",relatedTarget:h})})))},activate:function(a,b,d){if(void 0===a)return g(".edui-tab-item.edui-active",this.root()).index();
+b.find("> .edui-active").removeClass("edui-active");a.addClass("edui-active");d&&d()}});UM.ui.define("separator",{tpl:'<div class="edui-separator" unselectable="on" onmousedown="return false" ></div>',init:function(a){this.root(g(g.parseTmpl(this.tpl,a)));return this}});(function(){var a={},b={},d=[],c={},f={},h={},e=null;n.extend(UM,{defaultWidth:500,defaultHeight:500,registerUI:function(b,c){n.each(b.split(/\s+/),function(b){a[b]=c})},setEditor:function(a){!b[a.id]&&(b[a.id]=a)},registerWidget:function(a,
+b,d){c[a]=g.extend2(b,{$root:"",_preventDefault:!1,root:function(a){return this.$root||(this.$root=a)},preventDefault:function(){this._preventDefault=!0},clear:!1});d&&(f[a]=d)},getWidgetData:function(a){return c[a]},setWidgetBody:function(a,b,d){d._widgetData||n.extend(d,{_widgetData:{},getWidgetData:function(a){return this._widgetData[a]},getWidgetCallback:function(a){var c=this;return function(){return f[a].apply(c,[c,b].concat(Array.prototype.slice.call(arguments,0)))}}});var e=c[a];if(!e)return null;
+e=d._widgetData[a];e||(e=c[a],e=d._widgetData[a]="function"==g.type(e)?e:n.clone(e));e.root(b.edui().getBodyContainer());e.initContent(d,b);e._preventDefault||e.initEvent(d,b);e.width&&b.width(e.width)},setActiveWidget:function(a){},getEditor:function(a,c){var d=b[a]||(b[a]=this.createEditor(a,c));e=e?Math.max(d.getOpt("zIndex"),e):d.getOpt("zIndex");return d},setTopEditor:function(a){g.each(b,function(b,c){a==c?a.$container&&a.$container.css("zIndex",e+1):c.$container&&c.$container.css("zIndex",
+c.getOpt("zIndex"))})},clearCache:function(a){b[a]&&delete b[a]},delEditor:function(a){var c;(c=b[a])&&c.destroy()},ready:function(a){d.push(a)},createEditor:function(a,b){function c(){var b=this.createUI("#"+a,e);e.key=a;e.ready(function(){g.each(d,function(a,b){g.proxy(b,e)()})});var c=e.options;c.minFrameWidth=c.initialFrameWidth?c.initialFrameWidth:c.initialFrameWidth=e.$body.width()||UM.defaultWidth;b.css({width:c.initialFrameWidth,zIndex:e.getOpt("zIndex")});UM.browser.ie&&6===UM.browser.version&&
+document.execCommand("BackgroundImageCache",!1,!0);e.render(a);g.eduitooltip&&g.eduitooltip("attachTo",g("[data-original-title]",b)).css("z-index",e.getOpt("zIndex")+1);b.find("a").click(function(a){a.preventDefault()});e.fireEvent("afteruiready")}var e=new UM.Editor(b);e.langIsReady?g.proxy(c,this)():e.addListener("langReady",g.proxy(c,this));return e},createUI:function(b,c){var d=g(b),e=g('<div class="edui-container"><div class="edui-editor-body"></div></div>').insertBefore(d);c.$container=e;c.container=
+e[0];c.$body=d;m.ie&&m.ie9above&&g('<span style="padding:0;margin:0;height:0;width:0"></span>').insertAfter(e);g.each(a,function(a,b){var d=b.call(c,a);d&&(h[a]=d)});e.find(".edui-editor-body").append(d).before(this.createToolbar(c.options,c));e.find(".edui-toolbar").append(g('<div class="edui-dialog-container"></div>'));return e},createToolbar:function(a,b){var c=g.eduitoolbar(),d=c.edui();if(a.toolbar&&a.toolbar.length){var e=[];g.each(a.toolbar,function(a,b){g.each(b.split(/\s+/),function(a,b){if("|"==
+b)g.eduiseparator&&e.push(g.eduiseparator());else{var c=h[b];"fullscreen"==b?c&&e.unshift(c):c&&e.push(c)}});e.length&&d.appendToBtnmenu(e)})}else c.find(".edui-btn-toolbar").remove();return c}})})();UM.registerUI("bold italic redo undo underline strikethrough superscript subscript insertorderedlist insertunorderedlist cleardoc selectall link unlink print preview justifyleft justifycenter justifyright justifyfull removeformat horizontal drafts",function(a){var b=this,d=g.eduibutton({icon:a,click:function(){b.execCommand(a)},
+title:this.getLang("labelMap")[a]||""});this.addListener("selectionchange",function(){var b=this.queryCommandState(a);d.edui().disabled(-1==b).active(1==b)});return d});(function(){function a(a){var b=this;if(!a)throw Error("invalid params, notfound editor");b.editor=a;e[a.uid]=this;a.addListener("destroy",function(){delete e[a.uid];b.editor=null})}var b={},d="width height position top left margin padding overflowX overflowY".split(" "),c={},f={},h={},e={};UM.registerUI("fullscreen",function(b){var c=
+this,d=g.eduibutton({icon:"fullscreen",title:c.options.labelMap&&c.options.labelMap[b]||c.getLang("labelMap."+b),click:function(){c.execCommand(b);UM.setTopEditor(c)}});c.addListener("selectionchange",function(){var a=this.queryCommandState(b);d.edui().disabled(-1==a).active(1==a)});c.addListener("ready",function(){c.options.fullscreen&&a.getInstance(c).toggle()});return d});UM.commands.fullscreen={execCommand:function(b){a.getInstance(this).toggle()},queryCommandState:function(a){return this._edui_fullscreen_status},
+notNeedUndo:1};a.prototype={toggle:function(){var a=this.editor,b=this.isFullState();a.fireEvent("beforefullscreenchange",!b);this.update(!b);b?this.revert():this.enlarge();a.fireEvent("afterfullscreenchange",!b);"true"===a.body.contentEditable&&a.fireEvent("fullscreenchanged",!b);a.fireEvent("selectionchange")},enlarge:function(){this.saveSataus();this.setDocumentStatus();this.resize()},revert:function(){var a=this.editor.options,a=/%$/.test(a.initialFrameHeight)?"100%":a.initialFrameHeight-this.getStyleValue("padding-top")-
+this.getStyleValue("padding-bottom")-this.getStyleValue("border-width");g.IE6&&this.getEditorHolder().style.setExpression("height","this.scrollHeight <= "+a+' ? "'+a+'px" : "auto"');this.revertContainerStatus();this.revertContentAreaStatus();this.revertDocumentStatus()},update:function(a){this.editor._edui_fullscreen_status=a},resize:function(){var a,b,c,d=0,e=this.editor,f,h;this.isFullState()&&(a=g(window),b=a.width(),a=a.height(),h=this.getEditorHolder(),c=parseInt(k.getComputedStyle(h,"border-width"),
+10)||0,c+=parseInt(k.getComputedStyle(e.container,"border-width"),10)||0,d+=parseInt(k.getComputedStyle(h,"padding-left"),10)+parseInt(k.getComputedStyle(h,"padding-right"),10)||0,g.IE6&&h.style.setExpression("height",null),f=this.getBound(),g(e.container).css({width:b+"px",height:a+"px",position:g.IE6?"absolute":"fixed",top:f.top,left:f.left,margin:0,padding:0,overflowX:"hidden",overflowY:"hidden"}),g(h).css({width:b-2*c-d+"px",height:a-2*c-(e.options.withoutToolbar?0:g(".edui-toolbar",e.container).outerHeight())-
+g(".edui-bottombar",e.container).outerHeight()+"px",overflowX:"hidden",overflowY:"auto"}))},saveSataus:function(){for(var a=this.editor.container.style,c,e={},f=0,g=d.length;f<g;f++)c=d[f],e[c]=a[c];b[this.editor.uid]=e;this.saveContentAreaStatus();this.saveDocumentStatus()},saveContentAreaStatus:function(){var a=g(this.getEditorHolder());c[this.editor.uid]={width:a.css("width"),overflowX:a.css("overflowX"),overflowY:a.css("overflowY"),height:a.css("height")}},saveDocumentStatus:function(){var a=
+g(this.getEditorDocumentBody());f[this.editor.uid]={overflowX:a.css("overflowX"),overflowY:a.css("overflowY")};h[this.editor.uid]={overflowX:g(this.getEditorDocumentElement()).css("overflowX"),overflowY:g(this.getEditorDocumentElement()).css("overflowY")}},revertContainerStatus:function(){g(this.editor.container).css(this.getEditorStatus())},revertContentAreaStatus:function(){var a=this.getEditorHolder(),b=this.getContentAreaStatus();this.supportMin()&&(delete b.height,a.style.height=null);g(a).css(b)},
+revertDocumentStatus:function(){var a=this.getDocumentStatus();g(this.getEditorDocumentBody()).css("overflowX",a.body.overflowX);g(this.getEditorDocumentElement()).css("overflowY",a.html.overflowY)},setDocumentStatus:function(){g(this.getEditorDocumentBody()).css({overflowX:"hidden",overflowY:"hidden"});g(this.getEditorDocumentElement()).css({overflowX:"hidden",overflowY:"hidden"})},isFullState:function(){return!!this.editor._edui_fullscreen_status},getEditorStatus:function(){return b[this.editor.uid]},
+getContentAreaStatus:function(){return c[this.editor.uid]},getEditorDocumentElement:function(){return this.editor.container.ownerDocument.documentElement},getEditorDocumentBody:function(){return this.editor.container.ownerDocument.body},getEditorHolder:function(){return this.editor.body},getDocumentStatus:function(){return{body:f[this.editor.uid],html:h[this.editor.uid]}},supportMin:function(){var a;this._support||(a=document.createElement("div"),this._support="minWidth"in a.style);return this._support},
+getBound:function(){var a={html:!0,body:!0},b={top:0,left:0},c;if(!g.IE6)return b;(c=this.editor.container.offsetParent)&&!a[c.nodeName.toLowerCase()]&&(a=c.getBoundingClientRect(),b.top=-a.top,b.left=-a.left);return b},getStyleValue:function(a){return parseInt(k.getComputedStyle(this.getEditorHolder(),a))}};g.extend(a,{listen:function(){var b=null;a._hasFullscreenListener||(a._hasFullscreenListener=!0,g(window).on("resize",function(){null!==b&&(window.clearTimeout(b),b=null);b=window.setTimeout(function(){for(var a in e)e[a].resize();
+b=null},50)}))},getInstance:function(b){e[b.uid]||new a(b);return e[b.uid]}});a.listen()})();UM.registerUI("link image video map formula",function(a){var b=this,d,c,f={title:b.options.labelMap&&b.options.labelMap[a]||b.getLang("labelMap."+a),url:b.options.UMEDITOR_HOME_URL+"dialogs/"+a+"/"+a+".js"},h=g.eduibutton({icon:a,title:this.getLang("labelMap")[a]||""});n.loadFile(document,{src:f.url,tag:"script",type:"text/javascript",defer:"defer"},function(){var e=UM.getWidgetData(a);if(e){if(e.buttons){var l=
+e.buttons.ok;l&&(f.oklabel=l.label||b.getLang("ok"),l.exec&&(f.okFn=function(){return g.proxy(l.exec,null,b,c)()}));var k=e.buttons.cancel;k&&(f.cancellabel=k.label||b.getLang("cancel"),k.exec&&(f.cancelFn=function(){return g.proxy(k.exec,null,b,c)()}))}e.width&&(f.width=e.width);e.height&&(f.height=e.height);c=g.eduimodal(f);c.attr("id","edui-dialog-"+a).addClass("edui-dialog-"+a).find(".edui-modal-body").addClass("edui-dialog-"+a+"-body");c.edui().on("beforehide",function(){var a=b.selection.getRange();
+a.equals(d)&&a.select()}).on("beforeshow",function(){var e,f=this.root(),h;d=b.selection.getRange();f.parent()[0]||b.$container.find(".edui-dialog-container").append(f);g.IE6&&(e=g(window).width(),g(window).height(),h=f.parents(".edui-toolbar")[0].getBoundingClientRect(),f.css({position:"absolute",margin:0,left:(e-f.width())/2-h.left,top:100-h.top}));UM.setWidgetBody(a,c,b);UM.setTopEditor(b)}).on("afterbackdrop",function(){this.$backdrop.css("zIndex",b.getOpt("zIndex")+1).appendTo(b.$container.find(".edui-dialog-container"));
+c.css("zIndex",b.getOpt("zIndex")+2)}).on("beforeok",function(){try{d.select()}catch(v){}}).attachTo(h)}});b.addListener("selectionchange",function(){var b=this.queryCommandState(a);h.edui().disabled(-1==b).active(1==b)});return h});UM.registerUI("emotion formula",function(a){var b=this,d=b.options.UMEDITOR_HOME_URL+"dialogs/"+a+"/"+a+".js",c=g.eduibutton({icon:a,title:this.getLang("labelMap")[a]||""});n.loadFile(document,{src:d,tag:"script",type:"text/javascript",defer:"defer"},function(){var f=
+{url:d},h=UM.getWidgetData(a);h.width&&(f.width=h.width);h.height&&(f.height=h.height);g.eduipopup(f).css("zIndex",b.options.zIndex+1).addClass("edui-popup-"+a).edui().on("beforeshow",function(){var c=this.root();c.parent().length||b.$container.find(".edui-dialog-container").append(c);UM.setWidgetBody(a,c,b);UM.setTopEditor(b)}).attachTo(c,{offsetTop:-5,offsetLeft:10,caretLeft:11,caretTop:-8});b.addListener("selectionchange",function(){var b=this.queryCommandState(a);c.edui().disabled(-1==b).active(1==
+b)})});return c});UM.registerUI("imagescale",function(){var a=this,b;a.setOpt("imageScaleEnabled",!0);m.webkit&&a.getOpt("imageScaleEnabled")&&(a.addListener("click",function(d,c){var f=a.selection.getRange().getClosedNode(),h=c.target;if(f&&"IMG"==f.tagName&&h==f){if(!b){b=g.eduiscale({$wrap:a.$container}).css("zIndex",a.options.zIndex);a.$container.append(b);var e=function(){b.edui().hide()},k=function(a){var b=a.target||a.srcElement;b&&-1==b.className.indexOf("edui-scale")&&e(a)},m;b.edui().on("aftershow",
+function(){g(document).bind("keydown",e);g(document).bind("mousedown",k);a.selection.getNative().removeAllRanges()}).on("afterhide",function(){g(document).unbind("keydown",e);g(document).unbind("mousedown",k);var c=b.edui().getScaleTarget();c.parentNode&&a.selection.getRange().selectNode(c).select()}).on("mousedown",function(c){a.selection.getNative().removeAllRanges();(c=c.target||c.srcElement)&&-1==c.className.indexOf("edui-scale-hand")&&(m=setTimeout(function(){b.edui().hide()},200))}).on("mouseup",
+function(a){(a=a.target||a.srcElement)&&-1==a.className.indexOf("edui-scale-hand")&&clearTimeout(m)})}b.edui().show(g(f))}else b&&"none"!=b.css("display")&&b.edui().hide()}),a.addListener("click",function(b,c){"IMG"==c.target.tagName&&(new x.Range(a.document,a.body)).selectNode(c.target).select()}))});UM.registerUI("autofloat",function(){var a=this,b=a.getLang();a.setOpt({autoFloatEnabled:!0,topOffset:0});var d=a.options.topOffset;!1!==a.options.autoFloatEnabled&&a.ready(function(){function c(){var a=
+document.body.style;a.backgroundImage='url("about:blank")';a.backgroundAttachment="fixed"}function f(){v.parentNode&&v.parentNode.removeChild(v);r.style.cssText=p}function h(){var b=a.container,c;try{c=b.getBoundingClientRect()}catch(z){c={left:0,top:0,height:0,width:0}}for(var g=Math.round(c.top),h=Math.round(c.bottom-c.top),n;(n=b.ownerDocument)!==document&&(b=k.getWindow(n).frameElement);)c=b.getBoundingClientRect(),g+=c.top;b=a.options.toolbarTopOffset||0;0>g&&g+h-r.offsetHeight>b?y||(g=k.getXY(r),
+h=k.getComputedStyle(r,"position"),b=k.getComputedStyle(r,"left"),r.style.width=r.offsetWidth+"px",r.style.zIndex=1*a.options.zIndex+1,r.parentNode.insertBefore(v,r),e||l&&m.ie?("absolute"!=r.style.position&&(r.style.position="absolute"),r.style.top=(document.body.scrollTop||document.documentElement.scrollTop)-q+d+"px"):"fixed"!=r.style.position&&(r.style.position="fixed",r.style.top=d+"px",("absolute"==h||"relative"==h)&&parseFloat(b)&&(r.style.left=g.x+"px"))):f()}var e=m.ie&&6>=m.version,l=m.quirks,
+p,v=document.createElement("div"),r,q,y=!1,w=n.defer(function(){h()},m.ie?200:100,!0);a.addListener("destroy",function(){g(window).off("scroll resize",h);a.removeListener("keydown",w)});var x;UM.ui?x=1:(alert(b.autofloatMsg),x=0);x&&(r=g(".edui-toolbar",a.container)[0],a.addListener("afteruiready",function(){setTimeout(function(){q=g(r).offset().top},100)}),p=r.style.cssText,v.style.height=r.offsetHeight+"px",e&&c(),g(window).on("scroll resize",h),a.addListener("keydown",w),a.addListener("resize",
+function(){f();v.style.height=r.offsetHeight+"px";h()}),a.addListener("beforefullscreenchange",function(a,b){b&&(f(),y=b)}),a.addListener("fullscreenchanged",function(a,b){b||h();y=b}),a.addListener("sourcemodechanged",function(a,b){setTimeout(function(){h()},0)}),a.addListener("clearDoc",function(){setTimeout(function(){h()},0)}))})});UM.registerUI("source",function(a){var b=this;b.addListener("fullscreenchanged",function(){b.$container.find("textarea").width(b.$body.width()-10).height(b.$body.height())});
+var d=g.eduibutton({icon:a,click:function(){b.execCommand(a);UM.setTopEditor(b)},title:this.getLang("labelMap")[a]||""});this.addListener("selectionchange",function(){var b=this.queryCommandState(a);d.edui().disabled(-1==b).active(1==b)});return d});UM.registerUI("paragraph fontfamily fontsize",function(a){function b(a,c){var d=g("<span>").html(a).css({display:"inline",position:"absolute",top:-1E7,left:-1E5}).appendTo(document.body),e=d.width();d.remove();if(50>e)return a;a=a.slice(0,c?-4:-1);return a.length?
+b(a+"...",!0):"..."}function d(a){var c=[],d;for(d in a.items)a.value.push(d),c.push(d),a.autowidthitem.push(b(d));a.items=c;a.autoRecord=!1;return a}function c(a){for(var c,d=[],e=0,f=a.items.length;e<f;e++)c=a.items[e].val,d.push(c.split(/\s*,\s*/)[0]),a.itemStyles.push("font-family: "+c),a.value.push(c),a.autowidthitem.push(b(d[e]));a.items=d;return a}function f(a){var b,c=[];a.itemStyles=[];a.value=[];for(var d=0,e=a.items.length;d<e;d++)b=a.items[d],c.push(b),a.itemStyles.push("font-size: "+
+b+"px");a.value=a.items;a.items=c;a.autoRecord=!1;return a}var h=this,e=h.options.labelMap&&h.options.labelMap[a]||h.getLang("labelMap."+a),e={label:e,title:e,comboboxName:a,items:h.options[a]||[],itemStyles:[],value:[],autowidthitem:[]},k=null,m=null;if(0==e.items.length)return null;switch(a){case "paragraph":e=d(e);break;case "fontfamily":e=c(e);break;case "fontsize":e=f(e)}k=g.eduibuttoncombobox(e).css("zIndex",h.getOpt("zIndex")+1);m=k.edui();m.on("comboboxselect",function(b,c){h.execCommand(a,
+c.value)}).on("beforeshow",function(){0===k.parent().length&&k.appendTo(h.$container.find(".edui-dialog-container"));UM.setTopEditor(h)});this.addListener("selectionchange",function(b){b=this.queryCommandState(a);var c=this.queryCommandValue(a);m.button().edui().disabled(-1==b).active(1==b);c&&(c=c.replace(/['"]/g,"").toLowerCase().split(/['|"]?\s*,\s*[\1]?/),m.selectItemByLabel(c))});return m.button().addClass("edui-combobox")});UM.registerUI("forecolor backcolor",function(a){var b=this,d=null,c=
+null,f=null;this.addListener("selectionchange",function(){var b=this.queryCommandState(a);f.edui().disabled(-1==b).active(1==b)});f=g.eduicolorsplitbutton({icon:a,caret:!0,name:a,title:b.getLang("labelMap")[a],click:function(){b.execCommand(a,k.getComputedStyle(c[0],"background-color"))}});c=f.edui().colorLabel();d=g.eduicolorpicker({name:a,lang_clearColor:b.getLang("clearColor")||"",lang_themeColor:b.getLang("themeColor")||"",lang_standardColor:b.getLang("standardColor")||""}).on("pickcolor",function(d,
+e){window.setTimeout(function(){c.css("backgroundColor",e);b.execCommand(a,e)},0)}).on("show",function(){UM.setActiveWidget(colorPickerWidget.root())}).css("zIndex",b.getOpt("zIndex")+1);f.edui().on("arrowclick",function(){d.parent().length||b.$container.find(".edui-dialog-container").append(d);d.edui().show(f,{caretDir:"down",offsetTop:-5,offsetLeft:8,caretLeft:11,caretTop:-8});UM.setTopEditor(b)}).register("click",f,function(){d.edui().hide()});return f})})(jQuery);
diff --git a/pluss-model-bundle/pom.xml b/pluss-model-bundle/pom.xml
new file mode 100644
index 0000000..c1752a0
--- /dev/null
+++ b/pluss-model-bundle/pom.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>pluss-parent</artifactId>
+        <groupId>cn.pluss.platform</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>pluss-model-bundle</artifactId>
+    <version>1.0.0</version>
+    <packaging>jar</packaging>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.jdom</groupId>
+            <artifactId>jdom2</artifactId>
+        </dependency>
+
+        <!-- 引用comoon服务 -->
+        <dependency>
+            <groupId>cn.pluss.platform</groupId>
+            <artifactId>pluss-common-bundle</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+
+
+
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-annotation</artifactId>
+            <version>3.3.2</version>
+        </dependency>
+        
+        <!-- https://mvnrepository.com/artifact/com.thoughtworks.xstream/xstream -->
+        <dependency>
+            <groupId>com.thoughtworks.xstream</groupId>
+            <artifactId>xstream</artifactId>
+            <version>1.4.11</version>
+        </dependency>
+        
+        <dependency>
+          <groupId>dom4j</groupId>
+          <artifactId>dom4j</artifactId>
+          <version>1.6.1</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+            <version>2.9.2</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>mapstruct</artifactId>
+                    <groupId>org.mapstruct</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+    </dependencies>
+    
+</project>
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/alidevice/AliScanCodeDeviceEnum.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/alidevice/AliScanCodeDeviceEnum.java
new file mode 100644
index 0000000..66db8ce
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/alidevice/AliScanCodeDeviceEnum.java
@@ -0,0 +1,14 @@
+package cn.pluss.platform.alidevice;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 阿里扫码设备枚举
+ * @author: Administrator
+ * @DATE: 2021/12/22 13:52
+ */
+@Getter
+@AllArgsConstructor
+public enum AliScanCodeDeviceEnum {
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/alidevice/AliScanCodeDevicePayEntity.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/alidevice/AliScanCodeDevicePayEntity.java
new file mode 100644
index 0000000..5bcc6c4
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/alidevice/AliScanCodeDevicePayEntity.java
@@ -0,0 +1,84 @@
+package cn.pluss.platform.alidevice;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.util.StringUtil;
+import lombok.Data;
+
+/**
+ *
+ *阿里云扫码设备收款参数
+ *@author: bzg
+ *@time: 2021/12/22 14:26
+ */
+@Data
+public class AliScanCodeDevicePayEntity {
+
+
+    public static Integer SCAN_PAY_TYPE = 2;
+
+    /**
+     * 设备SN号
+     * @date: 2021/12/22 14:29
+     */
+    private String code;
+
+    /**
+     * 收款金额
+     * @date: 2021/12/22 14:29
+     */
+    private Double fee;
+
+    /**
+     * 付款类型 扫码收款固定为2
+     * @date: 2021/12/22 14:29
+     */
+    private Integer type;
+
+    /**
+     * 付款码
+     * @date: 2021/12/22 14:31
+     */
+    private String auth;
+
+    /**
+     * 备注
+     * @date: 2021/12/22 14:35
+     */
+    private String remark;
+
+    /**
+     * sn
+     */
+    private String sn;
+
+    /**
+     * 支付方式
+     * @date: 2021/12/23 18:46
+     */
+    private String p_type;
+
+    private String trace;
+
+    public static Result success(String message,Object data){
+        return new Result(0,message,data);
+    }
+
+    public static Result fail(String message){
+        return new Result(1,message);
+    }
+
+    public static Result fail(String message,Object data){
+        return new Result(1,message,data);
+    }
+
+    public static Result await(String message,Object data){
+        return new Result(2,message,data);
+    }
+
+    public String getCode() {
+        if (StringUtil.isEmpty(code)){
+            return sn;
+        }
+        return code;
+    }
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/alidevice/AliScanCodeDevicePayEnum.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/alidevice/AliScanCodeDevicePayEnum.java
new file mode 100644
index 0000000..1ab6662
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/alidevice/AliScanCodeDevicePayEnum.java
@@ -0,0 +1,24 @@
+package cn.pluss.platform.alidevice;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 阿里扫码设备收款类型枚举
+ * @author: Administrator
+ * @DATE: 2021/12/22 13:52
+ */
+@Getter
+@AllArgsConstructor
+public enum AliScanCodeDevicePayEnum {
+
+    QRCODE(1,"qrcode","扫码支付"),
+    BARCODE(2,"barcode","反扫支付");
+    private int status;
+
+    private String code;
+
+    private String name;
+
+
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/alidevice/AliScanCodeDeviceStatus.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/alidevice/AliScanCodeDeviceStatus.java
new file mode 100644
index 0000000..1c76546
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/alidevice/AliScanCodeDeviceStatus.java
@@ -0,0 +1,68 @@
+package cn.pluss.platform.alidevice;
+
+import cn.pluss.platform.entity.DeviceStock;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.Getter;
+
+
+/**
+ *
+ *阿里扫码设备状态返回参数封装
+ *@author: bzg
+ *@time: 2021/12/22 11:39
+ */
+@Data
+public class AliScanCodeDeviceStatus {
+
+
+    /**
+     * 绑定状态值
+     * @date: 2021/12/22 11:47
+     */
+    private Integer status;
+
+    private String store_name;
+
+    private String merchant_name;
+
+    private String mercId;
+
+
+    @Getter
+    @AllArgsConstructor
+    enum DeviceStatusEnum{
+        SUCCESS(1,"已绑定"),
+        FAIL(0,"未绑定");
+
+        private Integer code;
+
+        private String name;
+    }
+
+    /**
+     * 获取设备绑定状态
+     * @date: 2021/12/22 13:45
+     * @param deviceStock:
+     * @return java.lang.Integer
+     */
+    public static RespDeviceEntity getAliDeviceStatusV1(DeviceStock deviceStock){
+        if(deviceStock == null || !"3".equals(deviceStock.getStatus())){
+            return RespDeviceEntity.fail("设备号有误或设备状态异常",DeviceStatusEnum.FAIL.code);
+        }
+        return RespDeviceEntity.success("获取成功", DeviceStatusEnum.SUCCESS.code);
+    }
+
+    public static RespDeviceEntity getAliDeviceStatusV2(DeviceStock deviceStock) {
+        AliScanCodeDeviceStatus deviceStatus = new AliScanCodeDeviceStatus();
+        RespDeviceEntity v1 = getAliDeviceStatusV1(deviceStock);
+        deviceStatus.setStatus((Integer) v1.getData());
+        if(DeviceStatusEnum.SUCCESS.getCode().equals(deviceStatus.getStatus())){
+            deviceStatus.setStore_name(deviceStock.getActMercName());
+            deviceStatus.setMerchant_name(deviceStock.getActMercName());
+            deviceStatus.setMercId(deviceStock.getActMercId());
+            v1.setData(deviceStatus);
+        }
+        return v1;
+    }
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/alidevice/RespDeviceEntity.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/alidevice/RespDeviceEntity.java
new file mode 100644
index 0000000..1148396
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/alidevice/RespDeviceEntity.java
@@ -0,0 +1,46 @@
+package cn.pluss.platform.alidevice;
+
+import lombok.Data;
+
+/**
+ *
+ *封装阿里云设备 RespDeviceEntity
+ *@author: bzg
+ *@time: 2021/12/23 10:22
+ */
+@Data
+public class RespDeviceEntity<T> {
+
+    private Integer code;
+
+    private String message;
+
+    private T data;
+
+    public RespDeviceEntity(Integer code, String message, T data) {
+        this.code = code;
+        this.message = message;
+        this.data = data;
+    }
+
+    public RespDeviceEntity(Integer code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+    public static RespDeviceEntity success(String message, Object data){
+        return new RespDeviceEntity(0,message,data);
+    }
+
+    public static RespDeviceEntity fail(String message){
+        return new RespDeviceEntity(1,message);
+    }
+
+    public static RespDeviceEntity fail(String message,Object data){
+        return new RespDeviceEntity(1,message,data);
+    }
+
+    public static RespDeviceEntity await(String message,Object data){
+        return new RespDeviceEntity(2,message,data);
+    }
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/api/MercSubSplitAccount.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/api/MercSubSplitAccount.java
new file mode 100644
index 0000000..cb1844e
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/api/MercSubSplitAccount.java
@@ -0,0 +1,37 @@
+package cn.pluss.platform.api;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * TODO
+ * 分账子商户配置
+ * @author crystal
+ * @date 2022/6/29 16:07
+ */
+@Data
+public class MercSubSplitAccount {
+
+    /**
+     * 商户编号
+     */
+    private String merchantCode;
+
+    /**
+     * 分账金额
+     */
+    private String divAmount;
+
+    /**
+     * 分账比例，divMode=01时必填，小数格式，最小长度1位，最大4位小数位（例：0.2365）, 分账比例之和必须为1
+     */
+    private String divRatio;
+
+    /**
+     * 是否收取手续费（01：是，02否）
+     * 若配置手续费收支分离，该参数配置的手续费承担方不生效
+     */
+    private String isChargeFee;
+
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/api/SplitRefund.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/api/SplitRefund.java
new file mode 100644
index 0000000..50a1be9
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/api/SplitRefund.java
@@ -0,0 +1,24 @@
+package cn.pluss.platform.api;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * TODO
+ * 分账退款参数封装
+ * @author crystal
+ * @date 2022/7/4 16:33
+ */
+@Data
+public class SplitRefund {
+
+    private String merchantCode;
+
+    private String refundAmt;
+
+    private String divisionMode;
+
+    private String merchantId;
+
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/api/SplitReq.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/api/SplitReq.java
new file mode 100644
index 0000000..0bc86fc
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/api/SplitReq.java
@@ -0,0 +1,212 @@
+package cn.pluss.platform.api;
+
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.util.StringUtil;
+import com.alibaba.fastjson.JSONObject;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.Getter;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.List;
+
+/**
+ * TODO
+ * 商户分账接口请求参数封装操作
+ * @author crystal
+ * @date 2022/6/29 15:54
+ */
+@Data
+public class SplitReq {
+
+    /**
+     * 请求日志id
+     */
+    private String logId;
+
+    /**
+     * 请求方法名称
+     */
+    @Getter
+    @AllArgsConstructor
+    public enum Method{
+
+        /**
+         * 分账设置
+         */
+        MERC_ACCEPT("syb.split.merc.accept","分账设置"),
+        ORDER_ACCEPT("syb.split.order.accept","订单分账"),
+        SPLIT_QUERY("syb.split.merc.query","分账查询"),
+        REFUND_QUERY("syb.split.refund.query","退款查询"),
+        MERC_REFUND("syb.split.order.refund","分账退款");
+        private String code;
+
+        private String name;
+
+        public static boolean vailMethod(String method){
+            if(StringUtil.isEmpty(method)){
+                return false;
+            }
+            for (Method m:Method.values()){
+                if(m.getCode().equals(method)){
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        public static Method getVal(String method){
+            for (Method m:Method.values()){
+                if(m.getCode().equals(method)){
+                    return m;
+                }
+            }
+            return null;
+        }
+    }
+
+    @Getter
+    @AllArgsConstructor
+    public enum DivisionMode{
+
+        /**
+         * 分账类型比例
+         */
+        SCALE("01","比例"),
+
+        /**
+         * 分账类型金额
+         */
+        AMT("02","金额");
+
+        private String value;
+
+        private String name;
+
+        public static boolean vailMode(String mode){
+            if(StringUtil.isEmpty(mode)){
+                return false;
+            }
+            if(mode.equals(AMT.getValue())){
+                MsgException.throwException("分账类型为金额暂不可用");
+            }
+            for (DivisionMode m:DivisionMode.values()){
+                if(m.getValue().equals(mode)){
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
+
+    /**
+     * 商户编号
+     */
+    private String merchantCode;
+
+
+    private String method;
+
+    /**
+     * 分账模式 01：比例 02：金额
+     */
+    private String divisionMode;
+
+    /**
+     * 是否重新分账Y：是，N：否
+     */
+    private String isAgainDivision;
+
+    /**
+     * 原订单是否参与分账01：是，02否
+     */
+    private String isDivistion;
+
+    /**
+     * 签名
+     */
+    private String sign;
+
+    /**
+     * 商户订单号
+     */
+    private String mercOrderNo;
+
+    /**
+     * 退款金额
+     */
+    private String refundAmt;
+
+    /**
+     * 退款原因
+     */
+    private String refundReason;
+
+    /**
+     * 商户退款单号
+     */
+    private String mercRefundNo;
+
+    /**
+     * 异步通知地址
+     */
+    private String notifyUrl;
+
+    /**
+     * 原订单交易金额
+     */
+    private String orderAmt;
+
+    private List<MercSubSplitAccount> divList;
+
+    private List<SplitRefund> refundList;
+
+    public Method checkParams() {
+        MsgException.checkBlank(this.getMerchantCode(),"收款方商户号不能为空");
+        MsgException.checkBlank(this.getLogId(),"请求日志id不能为空");
+        MsgException.checkBlank(this.getMethod(),"请求方法method参数不能为空");
+        MsgException.checkBlank(this.getSign(),"签名不能为空！");
+        boolean flag = Method.vailMethod(this.getMethod());
+        MsgException.check(!flag,"请求method参数有误！");
+        Method val = Method.getVal(this.getMethod());
+        switch (val){
+            case MERC_ACCEPT:
+                MsgException.checkBlank(this.getNotifyUrl(),"异步通知地址不能为空");
+                MsgException.checkBlank(this.getDivisionMode(),"分账类型不能为空");
+                MsgException.check(!DivisionMode.vailMode(this.getDivisionMode()),"分账类型参数有误");
+                MsgException.checkBlank(this.getDivList(),"分账商户数据不能为空");
+                for (MercSubSplitAccount sub:this.getDivList()) {
+                    MsgException.checkBlank(sub.getMerchantCode(),"分账商户号不能为空");
+                }
+                break;
+            case ORDER_ACCEPT:
+                MsgException.checkBlank(this.getMercOrderNo(),"原商户订单号不能为空");
+                MsgException.checkBlank(this.getNotifyUrl(),"异步通知地址不能为空");
+                MsgException.checkBlank(this.getDivisionMode(),"分账类型不能为空");
+                MsgException.check(!DivisionMode.vailMode(this.getDivisionMode()),"分账类型参数有误");
+                MsgException.checkBlank(this.getDivList(),"分账详情数据不能为空");
+                break;
+            case SPLIT_QUERY:
+                MsgException.checkBlank(this.getMercOrderNo(),"原交易单号不能为空！");
+                break;
+            case REFUND_QUERY:
+                MsgException.checkBlank(this.getMercOrderNo(),"原商户交易单号不能为空！");
+                MsgException.checkBlank(this.getMercRefundNo(),"商户退款单号不能为空！");
+                break;
+            case MERC_REFUND:
+                MsgException.checkBlank(this.getMercOrderNo(),"原商户交易单号不能为空！");
+                MsgException.checkNull(this.getRefundAmt(),"退款金额不能为空！");
+                MsgException.check(!StringUtil.isNumber(this.getRefundAmt()),"退款金额格式有误，单位(元)保留两位小数!");
+                MsgException.checkBlank(this.getRefundReason(),"退款原因不能为空！");
+                MsgException.checkBlank(this.getNotifyUrl(),"异步回调地址不能为空！");
+                MsgException.checkBlank(this.getMercRefundNo(),"商户退款单号不能为空！");
+                MsgException.checkNull(this.getRefundList(),"分账商户退款信息不能为空！");
+                MsgException.check(this.getRefundList().isEmpty(),"分账商户的退款参数不能为空！");
+                break;
+            default:
+                MsgException.throwException("请求方法method参数有误！");
+        }
+        return val;
+    }
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/converter/BankCardConverter.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/converter/BankCardConverter.java
new file mode 100644
index 0000000..bf10cfa
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/converter/BankCardConverter.java
@@ -0,0 +1,23 @@
+package cn.pluss.platform.converter;
+
+import cn.pluss.platform.dto.BankInfoDTO;
+import cn.pluss.platform.entity.BankCard;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+/**
+ * 银行卡信息转换接口
+ * @author DJH
+ */
+@Mapper
+public interface BankCardConverter {
+
+    BankCardConverter INSTANCE = Mappers.getMapper(BankCardConverter.class);
+
+    /**
+     * 属性转换
+     * @param bankInfoDTO
+     * @return  BankCard实体类
+     */
+    BankCard dto2Domain(BankInfoDTO bankInfoDTO);
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/converter/Converter.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/converter/Converter.java
new file mode 100644
index 0000000..6fa39d9
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/converter/Converter.java
@@ -0,0 +1,184 @@
+package cn.pluss.platform.converter;
+
+import cn.pluss.platform.dto.*;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.vo.*;
+import com.aliyuncs.geoip.model.v20200101.DescribeIpv4LocationResponse;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.MappingTarget;
+import org.mapstruct.NullValuePropertyMappingStrategy;
+import org.mapstruct.factory.Mappers;
+
+/**
+ * @author djh
+ */
+@Mapper(nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE)
+public interface Converter {
+
+    Converter INSTANCE = Mappers.getMapper(Converter.class);
+
+    /**
+     * MerchantCashPlaceStaff转换为VO
+     *
+     * @param cashPlaceStaff MerchantCashPlaceStaff对象
+     * @return
+     */
+    MerchantCashPlaceStaffVO toVO(MerchantCashPlaceStaff cashPlaceStaff);
+
+    /**
+     * MerchantChannelStatus转换为VO
+     *
+     * @param entity MerchantChannelStatus对象
+     * @return
+     */
+    ChannelStatusVO toVO(MerchantChannelStatus entity);
+
+    RegionReflect toEntity(RegionReflectDTO dto);
+
+    MerchantRateNewVO toVO(MerchantRateNew merchantRateNew);
+
+    MerchantRateNew trans(MerchantRateNewRecord rateNewRecord);
+
+    MerchantRateNewRecord trans(MerchantRateNew rateNew);
+
+    @Mapping(target = "id", ignore = true)
+    @Mapping(target = "createTime", ignore = true)
+    @Mapping(target = "updateTime", ignore = true)
+    void cp(MerchantRateNewRecord source, @MappingTarget MerchantRateNew target);
+
+    MerchantRateNewRecordVO toVO(MerchantRateNewRecord rateNewRecord);
+
+    AccountDTO toDTO(Account account);
+
+    Account toEntity(AccountDTO accountDTO);
+
+    @Mapping(target = "id", ignore = true)
+    @Mapping(target = "createTime", ignore = true)
+    @Mapping(target = "updateTime", ignore = true)
+    void cp(IdCard source, @MappingTarget IdCard target);
+
+    /**
+     * 参数复制
+     * @param source    源数据对象
+     * @param target    目标对象
+     */
+    @Mapping(target = "id", ignore = true)
+    @Mapping(target = "createTime", ignore = true)
+    @Mapping(target = "updateTime", ignore = true)
+    void cp(BankCard source, @MappingTarget BankCard target);
+
+    /**
+     * 参数复制
+     * @param source    源数据对象
+     * @param target    目标对象
+     */
+    void cp(Account source, @MappingTarget AccountDTO target);
+
+    /**
+     * 参数复制
+     * @param source    源数据对象
+     * @param target    目标对象
+     */
+    void cp(AccountDTO source, @MappingTarget Account target);
+
+    /**
+     * 参数复制
+     * @param source    源数据对象
+     * @param target    目标对象
+     */
+    void cp(BankInfoDTO source, @MappingTarget BankCard target);
+
+    /**
+     * 参数复制
+     * @param source    源数据对象
+     * @param target    目标对象
+     */
+    void cp(UserApp source, @MappingTarget UserAppVO target);
+
+    /**
+     * dto转VO
+     * @param accountDTO
+     * @return
+     */
+    AccountVO toVO(AccountDTO accountDTO);
+
+    /**
+     * dto 转为 entity
+     *
+     * @param deviceStockDTO
+     * @return
+     */
+    DeviceStock toEntity(DeviceStockDTO deviceStockDTO);
+
+    /**
+     * dto 转为 entity
+     *
+     * @param bankCardDTO
+     * @return
+     */
+    BankCard toEntity(BankCardDTO bankCardDTO);
+
+    /**
+     * 参数复制
+     * @param source    源数据对象
+     * @param target    目标对象
+     */
+    void cp(IpLocationCache source, @MappingTarget DescribeIpv4LocationResponse target);
+
+    /**
+     * 参数复制
+     * @param source    源数据对象
+     * @param target    目标对象
+     */
+    @Mapping(target = "id", ignore = true)
+    @Mapping(target = "createTime", ignore = true)
+    @Mapping(target = "updateTime", ignore = true)
+    void cp(DescribeIpv4LocationResponse source, @MappingTarget IpLocationCache target);
+
+    DeviceStockVO toVO(DeviceStock entity);
+
+    DeviceDetailVO toVO(DeviceDetail entity);
+
+    /**
+     * 参数复制
+     * @param source    源数据对象
+     * @param target    目标对象
+     */
+    @Mapping(target = "id", ignore = true)
+    void cp(UserVoice source, @MappingTarget UserVoice target);
+
+    /**
+     * 参数复制
+     * @param source    源数据对象
+     * @param target    目标对象
+     */
+    void cp(MercTradeDataDTO source, @MappingTarget MercTradeDataDTO target);
+
+    /**
+     * 参数复制
+     * @param entity
+     * @return
+     */
+    JftReceiptInfoVO toVO(JftReceiptInfo entity);
+
+    @Mapping(target = "id", ignore = true)
+    JftBankCard toJftData(BankCard bankCard);
+
+    @Mapping(target = "id", ignore = true)
+    JftMerchantRateRecord toRecord(JftMerchantRate entity);
+
+    @Mapping(target = "id", ignore = true)
+    @Mapping(target = "createTime", ignore = true)
+    @Mapping(target = "updateTime", ignore = true)
+    void cp(JftMerchantRateRecord source, @MappingTarget JftMerchantRate target);
+
+    @Mapping(target = "id", ignore = true)
+    MercMemberSetVO toVO(MercMemberSet mercMemberSet);
+
+    @Mapping(target = "id", ignore = true)
+    JftMercBaseInfoVO toVO(JftMercBaseInfo jftMercBaseInfo);
+
+    @Mapping(target = "id", ignore = true)
+    JftMercPaymentChannelVO toVO(JftMercPaymentChannel jftMercPaymentChannel);
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/converter/ImgConverter.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/converter/ImgConverter.java
new file mode 100644
index 0000000..5f572df
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/converter/ImgConverter.java
@@ -0,0 +1,22 @@
+package cn.pluss.platform.converter;
+
+import cn.pluss.platform.entity.MerchantImage;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+/**
+ * 图片实体类属性转换接口
+ * @author DJH
+ */
+@Mapper
+public interface ImgConverter {
+
+    ImgConverter INSTANCE = Mappers.getMapper(ImgConverter.class);
+
+    /**
+     * 属性复制
+     * @param merchantImage MerchantImage实体类
+     * @return  MerchantImage实体类
+     */
+    MerchantImage imgCopy(MerchantImage merchantImage);
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/converter/MerchantBaseInfoConverter.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/converter/MerchantBaseInfoConverter.java
new file mode 100644
index 0000000..7d6148e
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/converter/MerchantBaseInfoConverter.java
@@ -0,0 +1,73 @@
+package cn.pluss.platform.converter;
+
+import cn.pluss.platform.dto.MerchantBaseInfoDTO;
+import cn.pluss.platform.entity.MerchantBaseInfo;
+import cn.pluss.platform.entity.MerchantStore;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.vo.MerchantBaseInfoVO;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.Mappings;
+import org.mapstruct.factory.Mappers;
+
+import java.util.List;
+
+/**
+ * @author DJH
+ * 实体类属性转换类
+ */
+@Mapper
+public interface MerchantBaseInfoConverter {
+    MerchantBaseInfoConverter INSTANCE = Mappers.getMapper(MerchantBaseInfoConverter.class);
+
+    /**
+     * 实体类转DTO
+     * @param entity
+     * @return
+     */
+    MerchantBaseInfoDTO domain2dto(MerchantBaseInfo entity);
+
+    /**
+     * @param entity
+     * @return
+     */
+    MerchantBaseInfoVO domain2VO(MerchantBaseInfo entity);
+
+    /**
+     * @param entity
+     * @return
+     */
+    MerchantBaseInfo vo2domain(MerchantBaseInfoVO entity);
+
+    /**
+     * DTO转实体类
+     * @param dto
+     * @return
+     */
+    MerchantBaseInfo dto2Domain(MerchantBaseInfoDTO dto);
+
+    /**
+     * MerchantBaseInfo 转 MerchantStore
+     * @param entity
+     * @return
+     */
+    @Mappings({
+            @Mapping(source = "alias", target = "storeName"),
+            @Mapping(source = "alias", target = "merchantName")
+    })
+    MerchantStore baseInfo2StoreInfo(MerchantBaseInfo entity);
+
+    /**
+     * MerchantBaseInfo 属性映射到 UserApp中
+     * @param entity
+     * @return
+     */
+    UserApp baseInfo2UserApp(MerchantBaseInfo entity);
+
+    /**
+     * 实体类转DTO
+     * @param entityList
+     * @return
+     */
+    List<MerchantBaseInfoDTO> domain2dto(List<MerchantBaseInfo> entityList);
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/converter/MerchantCashPlaceConverter.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/converter/MerchantCashPlaceConverter.java
new file mode 100644
index 0000000..cba95bc
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/converter/MerchantCashPlaceConverter.java
@@ -0,0 +1,22 @@
+package cn.pluss.platform.converter;
+
+import cn.pluss.platform.entity.MerchantCashPlace;
+import cn.pluss.platform.vo.MerchantCashPlaceVO;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+/**
+ * @author DJH
+ */
+@Mapper
+public interface MerchantCashPlaceConverter {
+
+    MerchantCashPlaceConverter INSTANCE = Mappers.getMapper(MerchantCashPlaceConverter.class);
+
+    /**
+     * 实体类转vo
+     * @param merchantCashPlace 实体类信息
+     * @return
+     */
+    MerchantCashPlaceVO entity2VO(MerchantCashPlace merchantCashPlace);
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/converter/MerchantStaffConverter.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/converter/MerchantStaffConverter.java
new file mode 100644
index 0000000..93d93ee
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/converter/MerchantStaffConverter.java
@@ -0,0 +1,25 @@
+package cn.pluss.platform.converter;
+
+import cn.pluss.platform.dto.MerchantStaffDTO;
+import cn.pluss.platform.entity.UserInfo;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.NullValuePropertyMappingStrategy;
+import org.mapstruct.factory.Mappers;
+
+/**
+ * @author DJH
+ */
+@Mapper(nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE)
+public interface MerchantStaffConverter {
+
+    MerchantStaffConverter INSTANCE = Mappers.getMapper(MerchantStaffConverter.class);
+
+    /**
+     * 数据转换
+     * @param merchantStaffDTO
+     * @return
+     */
+    @Mapping(source = "userId", target = "id")
+    UserInfo toUserInfo(MerchantStaffDTO merchantStaffDTO);
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/converter/UserAppConverter.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/converter/UserAppConverter.java
new file mode 100644
index 0000000..27c8d61
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/converter/UserAppConverter.java
@@ -0,0 +1,50 @@
+package cn.pluss.platform.converter;
+
+import cn.pluss.platform.annotation.ToEntity;
+import cn.pluss.platform.entity.MerchantBaseInfo;
+import cn.pluss.platform.entity.MerchantStore;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.entity.UserInfo;
+import org.mapstruct.*;
+import org.mapstruct.factory.Mappers;
+
+/**
+ * @author DJH
+ */
+@Mapper(nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE)
+public interface UserAppConverter {
+    UserAppConverter INSTANCE = Mappers.getMapper(UserAppConverter.class);
+
+    /**
+     * 复制属性
+     *
+     * @param merchantStore 源数据对象
+     * @param userApp       目标对象
+     */
+    @Mapping(source = "id", target = "storeId2")
+    @Mapping(target = "status", ignore = true)
+    @ToEntity
+    void copyProperties(MerchantStore merchantStore, @MappingTarget UserApp userApp);
+
+    /**
+     * 复制属性
+     *
+     * @param merchantBaseInfo 源数据对象
+     * @param userApp          目标对象
+     */
+    @Mapping(source = "alias", target = "merchantName")
+    @Mapping(source = "id", target = "mercId")
+    @Mapping(target = "status", ignore = true)
+    @ToEntity
+    void copyProperties(MerchantBaseInfo merchantBaseInfo, @MappingTarget UserApp userApp);
+
+    /**
+     * 对象属性转换
+     * @param userInfo  用户信息
+     * @return
+     */
+    @Mapping(source = "createTime", target = "createDt")
+    @Mapping(source = "id", target = "userId")
+    @Mapping(target = "id", ignore = true)
+    UserApp toUserApp(UserInfo userInfo);
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/AccountDTO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/AccountDTO.java
new file mode 100644
index 0000000..36bede9
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/AccountDTO.java
@@ -0,0 +1,115 @@
+package cn.pluss.platform.dto;
+
+import cn.pluss.platform.entity.Account;
+import cn.pluss.platform.entity.BankCard;
+import cn.pluss.platform.entity.IdCard;
+import cn.pluss.platform.exception.MsgException;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.apache.commons.lang3.StringUtils;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+import java.util.Objects;
+
+/**
+ * 结算信息
+ * @author DJH
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+public class AccountDTO extends Account {
+
+    /**
+     * 进件状态
+     */
+    private String status;
+
+    /**
+     * 结算人银行卡
+     */
+    @Valid
+    @NotNull(message = "请完善银行卡信息")
+    private BankCard bankCard;
+
+    /**
+     * 结算人身份信息
+     */
+    @Valid
+    private IdCard idcard;
+
+    /**
+     * 商户类型，-1则表示查询现有信息，其他类型则会过滤某些数据
+     */
+    private String merchantType;
+
+    /**
+     * 通过数据获取进件类型
+     */
+    public static void initSettleType(AccountDTO accountDTO) {
+        BankCard bankCard = accountDTO.getBankCard();
+        IdCard idCard = accountDTO.getIdcard();
+
+        // 对公
+        if (BankCard.ACCOUNT_TYPE_CORPORATE.equals(bankCard.getAccountType())) {
+            accountDTO.setSettleType(Account.SETTLE_TYPE_CORPORATE);
+            return;
+        }
+
+        // 法人-对私法人
+        if (BankCard.ACCOUNT_TYPE_PRIVATE.equals(bankCard.getAccountType()) && idCard == null) {
+            accountDTO.setSettleType(Account.LEGAL_PRIVATE_LEGAL);
+            return;
+        }
+
+        MsgException.check(idCard == null, "请传递身份证信息");
+
+        accountDTO.setSettleType(Account.LEGAL_PRIVATE_ILLEGAL);
+    }
+
+    /**
+     * 请求数据校验
+     */
+    public void paramCheck() {
+        if (StringUtils.isBlank(getSettleType())) {
+            // 为空时候，默认为对公
+            setSettleType(Account.SETTLE_TYPE_CORPORATE);
+//            throw new MsgException("缺少结算类型参数");
+        }
+
+        if (Objects.equals(getSettleType(), Account.SETTLE_TYPE_PRIVATE_LEGAL) || Objects.equals(getSettleType(), Account.SETTLE_TYPE_CORPORATE)) {
+            idcard = null;
+        }
+
+        if (idcard != null && !Objects.equals(idcard.getUserId(), getUserId())) {
+            throw new MsgException("用户id应保持一致");
+        }
+
+        if (bankCard != null && !bankCard.getUserId().equals(getUserId())) {
+            throw new MsgException("用户id应保持一致");
+        }
+
+        if (bankCard == null) {
+            throw new MsgException("缺少银行卡信息");
+        }
+
+        if (bankCard.getAccountType() == null) {
+            bankCard.setAccountType(BankCard.ACCOUNT_TYPE_PRIVATE);
+        }
+
+        if (BankCard.ACCOUNT_TYPE_CORPORATE.equals(bankCard.getAccountType()) && StringUtils.isBlank(bankCard.getLicenseUrl())) {
+            throw new MsgException("对公账户需要传入开户许可证");
+        }
+
+        if (BankCard.ACCOUNT_TYPE_CERT.equals(bankCard.getAccountType())) {
+            // 结算信息这里实名认证的类型作为对私账户来识别
+            bankCard.setAccountType(BankCard.ACCOUNT_TYPE_PRIVATE);
+        }
+
+        if (!BankCard.ACCOUNT_TYPE_PRIVATE.equals(bankCard.getAccountType()) && !BankCard.ACCOUNT_TYPE_CORPORATE.equals(bankCard.getAccountType())) {
+            throw new MsgException("请传入正确的银行卡类型");
+        }
+    }
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/AccountInfoDTO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/AccountInfoDTO.java
new file mode 100644
index 0000000..847576f
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/AccountInfoDTO.java
@@ -0,0 +1,38 @@
+package cn.pluss.platform.dto;
+
+import lombok.Data;
+
+/**
+ * @author yuchen
+ * 
+ * @Description 
+ */
+@Data
+public class AccountInfoDTO {
+	
+	/**
+	 * 支付宝账号
+	 */
+	private String account;
+	
+	/**
+	 * 姓名
+	 */
+	private String contactName;
+	
+	/**
+	 * 手机号
+	 */
+	private  String contactMobile;
+	
+	/**
+	 * 邮箱
+	 */
+	private String contactEmail;
+	@Override
+	public String toString() {
+		return "AccountInfoDTO [account=" + account + ", contactName=" + contactName + ", contactMobile="
+				+ contactMobile + ", contactEmail=" + contactEmail + "]";
+	}
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/AliMerchantAuditDTO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/AliMerchantAuditDTO.java
new file mode 100644
index 0000000..1a78d1c
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/AliMerchantAuditDTO.java
@@ -0,0 +1,60 @@
+package cn.pluss.platform.dto;
+
+import java.util.List;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.entity.MerchantBaseInfo;
+import cn.pluss.platform.entity.MerchantImage;
+import cn.pluss.platform.util.StringUtil;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author yuchen
+ *
+ * @Description 
+ * 支付宝进件dto
+ */
+@Data
+public class AliMerchantAuditDTO {
+	
+	@ApiModelProperty(value="当前用户的userId")
+	private Integer userId;
+	
+	public Result<MerchantBaseInfo> convertMerchantBaseInfo(MerchantBaseInfo merchantBaseInfo) {
+		if(StringUtil.isEmpty(merchantBaseInfo.getAliAccount())) {
+			return ResultGenerator.genFailResult("支付宝账号不能为空");
+		}
+		if(StringUtil.isEmpty(merchantBaseInfo.getContactName())||StringUtil.isEmpty(merchantBaseInfo.getContactMobile())||StringUtil.isEmpty(merchantBaseInfo.getEmail())||StringUtil.isEmpty(merchantBaseInfo.getAliMcc())) {
+			return ResultGenerator.genFailResult("请先完善商户基本资料");
+		}
+		if(StringUtil.isEmpty(merchantBaseInfo.getBussAuthNum())){
+			return ResultGenerator.genFailResult("请先上传营业执照");
+		}
+		return ResultGenerator.genSuccessResult(merchantBaseInfo);
+	}
+	
+	public Result<BatchInfoDTO> convertBatchInfoDTO(List<MerchantImage> list, MerchantBaseInfo merchantBaseInfo) {
+		BatchInfoDTO batch = new BatchInfoDTO();
+		batch.setMccCode(merchantBaseInfo.getAliMcc());
+		batch.setBusinessLicenseNo(merchantBaseInfo.getBussAuthNum());
+		for (MerchantImage merchantImage : list) {
+			if("03".equals(merchantImage.getPhotoType())) {
+				batch.setBusinessLicensePic(merchantImage.getPicUrl());
+			}
+			if("06".equals(merchantImage.getPhotoType())) {
+				batch.setShopSignBoardPic(merchantImage.getPicUrl());
+			}
+		}
+		if(StringUtil.isEmpty(batch.getBusinessLicensePic())) {
+			return ResultGenerator.genFailResult("营业执照不能为空不能为空");
+		}
+		if(StringUtil.isEmpty(batch.getShopSignBoardPic())) {
+			return ResultGenerator.genFailResult("门头照不能为空");
+		}
+		return ResultGenerator.genSuccessResult(batch);
+	}
+
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/BankCardDTO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/BankCardDTO.java
new file mode 100644
index 0000000..5a6f5de
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/BankCardDTO.java
@@ -0,0 +1,43 @@
+package cn.pluss.platform.dto;
+
+import cn.pluss.platform.constants.CommonError;
+import cn.pluss.platform.entity.BankCard;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.Pattern;
+
+/**
+ * @author djh
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class BankCardDTO extends BankCard {
+
+    /**
+     * 到账类型 - receiptType, 目前类型与通道有做映射, 所以暂用channelType
+     * D1、D0
+     */
+    @Pattern(regexp = "(D1)|(D0)", message = CommonError.CHANNEL_TYPE_ILLEGAL, groups = {BankCard.class})
+    private String channelType;
+
+    // public static void paramCheck(BankCardDTO bankCardDTO) {
+    //     if (!Account.CHANNEL_TYPE_D1.equals(bankCardDTO.getChannelType()) && !Account.CHANNEL_TYPE_D0.equals(bankCardDTO.getChannelType())) {
+    //         throw new MsgException("通道类型错误");
+    //     }
+    //
+    //     MsgException.checkNull(bankCardDTO.getBankName(), CommonError.BANK_NAME_EMPTY);
+    //
+    //     MsgException.checkNull(bankCardDTO.getBranchProvince(), CommonError.BANK_BRANCH_PROVINCE_EMPTY);
+    //
+    //     MsgException.checkNull(bankCardDTO.getBranchCity(), CommonError.BANK_BRANCH_CITY_EMPTY);
+    //
+    //     MsgException.checkNull(bankCardDTO.getBranchArea(), CommonError.BANK_BRANCH_AREA_EMPTY);
+    //
+    //     MsgException.checkNull(bankCardDTO.getBranchName(), CommonError.BANK_BRANCH_NAME_EMPTY);
+    //
+    //     MsgException.checkNull(bankCardDTO.getBankCardNo(), CommonError.BANK_BRANCH_CNAPS_EMPTY);
+    //
+    //     MsgException.checkNull(bankCardDTO.getBankCardNo(), CommonError.BANK_BRANCH_CNAPS_EMPTY);
+    // }
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/BankInfoDTO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/BankInfoDTO.java
new file mode 100644
index 0000000..e8c8ffb
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/BankInfoDTO.java
@@ -0,0 +1,81 @@
+package cn.pluss.platform.dto;
+
+import cn.pluss.platform.constants.CommonError;
+import cn.pluss.platform.exception.MsgException;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * @author djh
+ *
+ */
+@Data
+public class BankInfoDTO {
+	
+	@ApiModelProperty(value="当前用户Id")
+	private String userId;
+	
+	@ApiModelProperty(value="开户银行")
+	private String bankName;
+	
+	@ApiModelProperty(value="银行省市区编码")
+	private String bankAddressNo;
+
+	private String branchProvince;
+
+	private String branchCity;
+
+	private String branchArea;
+	
+	@ApiModelProperty(value="开户地区")
+	private String bankAddress;
+	
+	@ApiModelProperty(value="开户支行")
+	private String branchName;
+	
+	@ApiModelProperty(value="联行号")
+	private String contactLine;
+	
+	@ApiModelProperty(value="银行卡号")
+	private String  bankCardNo;
+	
+	@ApiModelProperty(value="银行预留号码")
+	private String phone;
+	
+	@ApiModelProperty(value="银行卡照片")
+	private String bankCardFrontPic;
+
+	private String imgUrl;
+	
+	@ApiModelProperty(value="账户类型。可选值： 1：对私账户（自然人、个体工商户可选）\\r\\n   2：对公账户")
+	private String accountType;
+
+	public void paramCheck() {
+		MsgException.checkBlank(userId, CommonError.NO_USER_ID);
+		MsgException.checkBlank(accountType, "请选择账户类型");
+
+		// 为了维持老接口的稳定性，添加参数转换
+		if ("1".equals(accountType)) {
+			accountType = "01";
+		}
+		if ("2".equals(accountType)) {
+			accountType = "02";
+		}
+
+		MsgException.checkBlank(bankName, "开户银行不能为空");
+		MsgException.checkBlank(branchName, "开户支行不能为空");
+		MsgException.checkBlank(bankCardNo, "银行卡号不能为空");
+		MsgException.checkBlank(phone, "银行预留号码不能为空");
+		MsgException.checkBlank(contactLine, "联行号不能为空");
+		MsgException.checkBlank(userId, "银行卡照片不能为空");
+		MsgException.checkBlank(userId, "缺少userId");
+		MsgException.checkBlank(userId, "缺少userId");
+
+		if(StringUtils.isEmpty(bankCardFrontPic) && StringUtils.isEmpty(imgUrl)) {
+			throw new MsgException("银行卡照片不能为空");
+		}
+	}
+	
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/BatchInfoDTO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/BatchInfoDTO.java
new file mode 100644
index 0000000..3921c6a
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/BatchInfoDTO.java
@@ -0,0 +1,80 @@
+package cn.pluss.platform.dto;
+
+/**
+ * @author yuchen
+ *
+ * @Description 
+ */
+public class BatchInfoDTO {
+	
+	/**
+	 * 代商户操作事务编号 通过alipay.open.agent.create接口进行创建
+	 */
+	private String batchNo;
+	
+	/**
+	 * 所属MCCCode
+	 */
+	private String mccCode;
+	
+	/**
+	 * 营业执照号码
+	 */
+	private String businessLicenseNo;
+	
+	/**
+	 * 营业执照图片。被代创建商户运营主体为个人账户必填，企业账户无需填写，最小5KB，图片格式必须为：png、bmp、gif、jpg、jpeg
+	 */
+	private String businessLicensePic;
+	
+	/**
+	 * 店铺门头照图片，最小5KB，图片格式必须为：png、bmp、gif、jpg、jpeg
+	 */
+	private String shopSignBoardPic;
+
+	public String getBatchNo() {
+		return batchNo;
+	}
+
+	public void setBatchNo(String batchNo) {
+		this.batchNo = batchNo;
+	}
+
+	public String getMccCode() {
+		return mccCode;
+	}
+
+	public void setMccCode(String mccCode) {
+		this.mccCode = mccCode;
+	}
+
+	public String getBusinessLicenseNo() {
+		return businessLicenseNo;
+	}
+
+	public void setBusinessLicenseNo(String businessLicenseNo) {
+		this.businessLicenseNo = businessLicenseNo;
+	}
+
+
+	public String getBusinessLicensePic() {
+		return businessLicensePic;
+	}
+
+	public void setBusinessLicensePic(String businessLicensePic) {
+		this.businessLicensePic = businessLicensePic;
+	}
+
+	public String getShopSignBoardPic() {
+		return shopSignBoardPic;
+	}
+
+	public void setShopSignBoardPic(String shopSignBoardPic) {
+		this.shopSignBoardPic = shopSignBoardPic;
+	}
+	
+	
+	
+
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/BusinessLicenseDTO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/BusinessLicenseDTO.java
new file mode 100644
index 0000000..75904b7
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/BusinessLicenseDTO.java
@@ -0,0 +1,85 @@
+package cn.pluss.platform.dto;
+
+import cn.pluss.platform.entity.MerchantBaseInfo;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.util.StringUtil;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author yuchen
+ * 
+ * @Description 
+ */
+@Data
+public class BusinessLicenseDTO {
+	
+	@ApiModelProperty(value="当前用户的userId")
+	private Long userId;
+	
+//	@ApiModelProperty(value="商户类型")
+//	private String  merchantType;
+	
+	@ApiModelProperty(value="营业执照号码")
+	private String bussAuthNum;
+	
+	@ApiModelProperty(value="营业执照名称/商户名称")
+	private String bussAuthName;
+	
+	@ApiModelProperty(value="营业执照上的名字")
+	private String principalPerson;
+	
+	@ApiModelProperty(value="营业执照上的地址/注册地址")
+	private String bussAuthAddress;
+	
+	@ApiModelProperty(value="营业执照注册开始时间")
+	private String bussAuthStartTime;
+	
+	@ApiModelProperty(value="营业执照有效期结束时间")
+	private String bussAuthEndTime;
+	
+	@ApiModelProperty(value="营业执照地址")
+	private String businessLicensePic;
+
+	@ApiModelProperty(value="营业执照是否长期有效 0短期 1长期")
+	private String type;
+
+	public MerchantBaseInfo convertBusinessLicenseDTO() {
+		MsgException.checkBlank(bussAuthNum, "请输入营业执照号");
+		MsgException.checkBlank(bussAuthName, "请输入营业执照上的名称");
+		MsgException.checkBlank(principalPerson, "请输入营业执照上的名字");
+		MsgException.checkBlank(bussAuthAddress, "请输入注册地址");
+		MsgException.checkBlank(bussAuthStartTime, "请选择营业执照注册开始时间");
+		MsgException.checkBlank(type, "请选择营业执照是否长期");
+		MsgException.checkBlank(businessLicensePic, "请上传营业执照");
+		
+		if("0".equals(type) && StringUtil.isEmpty(bussAuthEndTime)) {
+			throw new MsgException("请选择营业执照有效期结束时间，若长期有效则选择2099-12-30");
+		}
+		
+		MerchantBaseInfo merchantBaseInfo = new MerchantBaseInfo();
+		merchantBaseInfo.setBussAuthNum(bussAuthNum);
+		merchantBaseInfo.setBussAuthName(bussAuthName);
+		merchantBaseInfo.setMerchantName(bussAuthName);
+		merchantBaseInfo.setPrincipalPerson(principalPerson);
+		merchantBaseInfo.setBussAuthAddress(bussAuthAddress);
+		merchantBaseInfo.setBussAuthStartTime(bussAuthStartTime);
+		if("1".equals(type)) {
+			merchantBaseInfo.setBussAuthEndTime("2099-12-30");
+		}else if("0".equals(type)){
+			merchantBaseInfo.setBussAuthEndTime(bussAuthEndTime);
+		}
+		merchantBaseInfo.setUserId(userId + "");
+		merchantBaseInfo.setBuslicType(type);
+		return merchantBaseInfo;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/CertificationDTO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/CertificationDTO.java
new file mode 100644
index 0000000..1ce68fc
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/CertificationDTO.java
@@ -0,0 +1,71 @@
+package cn.pluss.platform.dto;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.entity.MerchantBankCard;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.util.StringUtil;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotEmpty;
+
+/**
+ * @author yuchen
+ *
+ * @Description 
+ * 实名认证dto
+ */
+@Data
+@Accessors(chain = true)
+public class CertificationDTO {
+
+	@NotEmpty(message = "缺少userId")
+	@ApiModelProperty(value="当前用户的userId")
+	private String userId;
+
+	@NotEmpty(message = "缺少身份证号码")
+	@ApiModelProperty(value="身份证号码")
+	private String certnum;
+	
+	@ApiModelProperty(value="真实姓名")
+	private String realName;
+
+	@NotEmpty(message = "身份证起始时间不能为空")
+	@ApiModelProperty(value="身份证有效期开始时间")
+	private String certStartTime;
+
+	@NotEmpty(message = "身份证有效期不能为空")
+	@ApiModelProperty(value="身份证有效期结束时间")
+	private String certPeriod;
+	
+	@ApiModelProperty(value="身份证正面照")
+	private String certFullPhoto;
+	
+	@ApiModelProperty(value="身份证反面照")
+	private String certBacKPhoto;
+
+	public void paramCheck() {
+		if(StringUtil.isEmpty(certnum)) {
+			throw new MsgException("真实姓名不能为空");
+		}
+		if(StringUtil.isEmpty(certnum)) {
+			throw new MsgException("身份证号不能为空");
+		}
+		if(StringUtil.isEmpty(certStartTime)) {
+			throw new MsgException("身份证起始时间不能为空");
+		}
+		if(StringUtil.isEmpty(certPeriod)) {
+			throw new MsgException("身份证号有效日期不能为空");
+		}
+		if(StringUtil.isEmpty(certFullPhoto)) {
+			throw new MsgException("身份证正面照不能为空");
+		}
+		if(StringUtil.isEmpty(certBacKPhoto)) {
+			throw new MsgException("身份证反面照不能为空");
+		}
+	}
+
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/ChangePwdDTO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/ChangePwdDTO.java
new file mode 100644
index 0000000..1aa1462
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/ChangePwdDTO.java
@@ -0,0 +1,31 @@
+package cn.pluss.platform.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+
+/**
+ * @author Djh
+ */
+@Data
+@ApiModel("修改密码DTO")
+public class ChangePwdDTO {
+
+    @ApiModelProperty(value = "新手机号验证码", required = true)
+    @NotEmpty(message = "验证码不能为空！")
+    private String code;
+
+    @ApiModelProperty(value = "密码", required = true)
+    @NotEmpty(message = "密码不能为空！")
+    private String password;
+
+    @ApiModelProperty(value = "原手机号", required = true)
+    @NotEmpty(message = "原手机号不能为空！")
+    private String oldPhone;
+
+    @ApiModelProperty(value = "新手机号", required = true)
+    @NotEmpty(message = "新手机号不能为空！")
+    private String phone;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/DeviceMerchantBuyDTO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/DeviceMerchantBuyDTO.java
new file mode 100644
index 0000000..18d551c
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/DeviceMerchantBuyDTO.java
@@ -0,0 +1,95 @@
+package cn.pluss.platform.dto;
+
+import java.util.Calendar;
+import java.util.HashMap;
+import java.util.Map;
+
+import cn.pluss.platform.entity.DeviceMerchantBuy;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author yuchen
+ * 
+ * @Description
+ */
+@Data
+public class DeviceMerchantBuyDTO {
+
+    @ApiModelProperty(value = "订单金额")
+    private Double orderAmount;
+
+    @ApiModelProperty(value = "购买数量")
+    private Integer quantity;
+
+    @ApiModelProperty(value = "设备code")
+    private String code;
+
+    @ApiModelProperty(value = "设备唯一识别码")
+    private String venderCode;
+
+    @ApiModelProperty(value = "厂家型号")
+    private String venderModel;
+
+    @ApiModelProperty(value = "省市区")
+    private String provinces;
+
+    @ApiModelProperty(value = "支付方式")
+    private String payCode;
+
+    @ApiModelProperty(value = "支付名称")
+    private String payName;
+
+    @ApiModelProperty(value = "详细地址")
+    private String address;
+
+    @ApiModelProperty(value = "联系人姓名")
+    private String linkName;
+
+    @ApiModelProperty(value = "联系人手机号")
+    private String linkPhone;
+
+    @ApiModelProperty(value = "邮箱")
+    private String email;
+
+    /**
+     * 规格类别
+     */
+    private String type;
+
+    /**
+     * 订单类型, 1: 押金购买
+     */
+    private String orderType;
+
+    public Map<String, String> convert(String orderNo) {
+        Map<String, String> result = new HashMap<String, String>(16);
+        result.put("body", "收银呗商品订单支付");
+        result.put("subject", "收银呗商品订单支付");
+        result.put("outTradeNo", orderNo);
+        result.put("totalAmount", orderAmount + "");
+        return result;
+    }
+
+    public DeviceMerchantBuy convertDeviceMerchantBuy() {
+        DeviceMerchantBuy deviceMerchantBuy = new DeviceMerchantBuy();
+        deviceMerchantBuy.setOrderAmount(orderAmount);
+        deviceMerchantBuy.setQuantity(quantity);
+        deviceMerchantBuy.setVenderCode(venderCode);
+        deviceMerchantBuy.setVenderModel(venderModel);
+        deviceMerchantBuy.setProvinces(provinces);
+        deviceMerchantBuy.setPayCode(payCode);
+        deviceMerchantBuy.setPayName(payName);
+        //更改支付时间
+        Calendar calendar = Calendar.getInstance();
+        deviceMerchantBuy.setTransDt(calendar.getTime());
+        deviceMerchantBuy.setAddress(address);
+        deviceMerchantBuy.setLinkName(linkName);
+        deviceMerchantBuy.setLinkPhone(linkPhone);
+        deviceMerchantBuy.setStatus("0");
+        deviceMerchantBuy.setEmail(email);
+        return deviceMerchantBuy;
+    }
+
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/DeviceStockDTO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/DeviceStockDTO.java
new file mode 100644
index 0000000..4048405
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/DeviceStockDTO.java
@@ -0,0 +1,69 @@
+package cn.pluss.platform.dto;
+
+import cn.pluss.platform.entity.DeviceStock;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @author DJH
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+public class DeviceStockDTO extends DeviceStock {
+
+    private String userId;
+
+    private String qrNo;
+
+    /**
+     * 订单 api类型查询字段 1:表示我的设备 2：表示团队设备
+     */
+    private String pType;
+
+    /**
+     * api 绑定状态查询 1:已绑定 -1：表示未绑定
+     */
+    private String bindStatus;
+
+    /**
+     * 设备名称检索
+     */
+    private String deviceName;
+
+    /**
+     * 日期时间检索
+     */
+    private String startDate;
+
+    /**
+     * 日期时间检索
+     */
+    private String endDate;
+
+//    /**
+//     * 开始SN号
+//     */
+//    private String startSnNo;
+//
+//    /**
+//     * 结束SN号
+//     */
+//    private String endSnNo;
+
+    /**
+     * 开始设备号
+     */
+    private String startDeviceNo;
+
+    /**
+     * 结束设备号
+     */
+    private String endDeviceNo;
+
+    /**
+     * 编号类型
+     */
+    private String noType;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/DeviceTransferDTO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/DeviceTransferDTO.java
new file mode 100644
index 0000000..a81b136
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/DeviceTransferDTO.java
@@ -0,0 +1,35 @@
+package cn.pluss.platform.dto;
+
+import cn.pluss.platform.entity.DeviceTransfer;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * TODO
+ * 设备划拨参数封装DTO
+ * @author crystal
+ * @date 2022/4/1 11:52
+ */
+@Data
+public class DeviceTransferDTO extends DeviceTransfer {
+
+    public static final String OUT = "1";
+
+    public static final String GET = "2";
+
+    /**
+     * 设备号集合
+     */
+    private List<String> deviceNoList;
+
+    /**
+     * 划拨记录类型 1：转出设备 2：接收设备
+     */
+    private String type;
+
+    /**
+     * 设备编号
+     */
+    private String snNo;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/ImgDTO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/ImgDTO.java
new file mode 100644
index 0000000..9faa8ac
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/ImgDTO.java
@@ -0,0 +1,60 @@
+package cn.pluss.platform.dto;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.entity.MerchantImage;
+import cn.pluss.platform.util.StringUtil;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @author yuchen
+ * 
+ * @Description 
+ */
+public class ImgDTO {
+	
+	@ApiModelProperty(value="图片路径")
+	 private String imgUrl; 
+	
+	@ApiModelProperty(value="图片类型")
+	 private String phoneType; 
+	 
+	 @ApiModelProperty(value="当前用户userId")
+	 private String userId;
+	 
+	public String getImgUrl() {
+		return imgUrl;
+	}
+	public void setImgUrl(String imgUrl) {
+		this.imgUrl = imgUrl;
+	}
+	public String getPhoneType(){
+		return phoneType;
+	}
+	public void setPhoneType(String phoneType) {
+		this.phoneType = phoneType;
+	}
+	public String getUserId() {
+		return userId;
+	}
+	public void setUserId(String userId) {
+		this.userId = userId;
+	}
+	
+	public Result<MerchantImage> convertImgDTO(){
+		if(StringUtil.isEmpty(imgUrl)) {
+    		return ResultGenerator.genFailResult("照片url不能为空");
+    	}
+    	if(StringUtil.isEmpty(phoneType)) {
+    		return ResultGenerator.genFailResult("照片类型不能为空");
+    	}
+    	MerchantImage merchantImage=new MerchantImage();
+    	merchantImage.setPhotoType(phoneType);
+    	merchantImage.setPicUrl(imgUrl);
+    	merchantImage.setPhotoUrl(StringUtil.genRandomNum(10));
+		return ResultGenerator.genSuccessResult(merchantImage);
+	}
+	 
+
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/LeshuaAccountDTO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/LeshuaAccountDTO.java
new file mode 100644
index 0000000..cfcbc38
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/LeshuaAccountDTO.java
@@ -0,0 +1,41 @@
+package cn.pluss.platform.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@ApiModel("乐刷结算单信息")
+@Data
+public class LeshuaAccountDTO {
+
+    @ApiModelProperty(value = "打款单号", example = "20200730000255337768")
+    private String billId;
+    @ApiModelProperty("被通知的乐刷一代编号, 代理商id")
+    private String topAgentId;
+    @ApiModelProperty(value = "乐刷商户编号", example = "3617315568")
+    private String merchantId;
+    @ApiModelProperty("实付金额(分)")
+    private BigDecimal realSettleAmount;
+    @ApiModelProperty("应付金额(分)")
+    private BigDecimal planSettleAmount;
+    @ApiModelProperty("止付金额(分)")
+    private BigDecimal suspendSettleAmount;
+    @ApiModelProperty("交易日期，由于退票重新生成打款单，则该字段会返回新打款单(精确到天)")
+    private String settleDate;
+    @ApiModelProperty("打款日期(精确到秒)")
+    private String remitDate;
+    @ApiModelProperty("结算类型(T0或T1)")
+    private String settleType;
+    @ApiModelProperty("打款状态, 详请查看 https://www.kancloud.cn/leshuadocs/saas/1147568")
+    private String state;
+    @ApiModelProperty("失败原因(打款失败则返回)")
+    private String failReason;
+    @ApiModelProperty("备注")
+    private String remark;
+    @ApiModelProperty("开户账号")
+    private String bankAccount;
+    @ApiModelProperty("开户名")
+    private String bankHolder;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/LeshuaBillsDTO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/LeshuaBillsDTO.java
new file mode 100644
index 0000000..69343f9
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/LeshuaBillsDTO.java
@@ -0,0 +1,27 @@
+package cn.pluss.platform.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author yuchen
+ *
+ * @Description 
+ * 乐刷账单dto
+ */
+@Data
+public class LeshuaBillsDTO {
+	
+	@ApiModelProperty(value="商户号")
+	private String merchantId;
+	
+	@ApiModelProperty(value="打款单的创建日期 （创建时间是交易时间的下一天）")
+	private String date;
+	
+	@ApiModelProperty(value="打款状态: -1：打款失败; 0:打款中;1:打款成功; 2:打款退票;3:冻结出款;4：全部")
+	private String state;
+	
+	@ApiModelProperty(value="页码(页码超出总页数后返回第一页)，每页默认20条数据")
+	private Integer pageNo;
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/MemberOrderDTO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/MemberOrderDTO.java
new file mode 100644
index 0000000..763bb17
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/MemberOrderDTO.java
@@ -0,0 +1,170 @@
+package cn.pluss.platform.dto;
+
+import cn.pluss.platform.entity.MemberOrder;
+import cn.pluss.platform.entity.MerchantMenber;
+import cn.pluss.platform.entity.MerchantMenberRecharge;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @author yuchen
+ * 
+ * @Description 
+ */
+public class MemberOrderDTO {
+	
+	@ApiModelProperty(value="商家code")
+	private String merchantCode;
+	
+	@ApiModelProperty(value="商家名称")
+	private String merchantName;
+	
+	@ApiModelProperty(value="门店Id")
+	private String storeId;
+	
+	@ApiModelProperty(value="门店名称")
+	private String storeName;
+	
+	@ApiModelProperty(value="订单编号")
+	private String orderNumber;
+	
+	@ApiModelProperty(value="会员code")
+	private String memberCode;
+	
+	@ApiModelProperty(value="昵称")
+	private String nickName;
+	
+	@ApiModelProperty(value="订单金额")
+	private String orderFee;
+	
+	@ApiModelProperty(value="赠送金额")
+	private String giveMoney;
+	
+	@ApiModelProperty(value="收款人code")
+	private String staffCode;
+	
+	@ApiModelProperty(value="收款人姓名")
+	private String staffName;
+	
+	@ApiModelProperty(value="0 支付宝微信 通道  1乐刷")
+	private String aisle;
+	
+	@ApiModelProperty(value="条码")
+	private String authCode;
+	
+	
+	public String getAuthCode() {
+		return authCode;
+	}
+	public void setAuthCode(String authCode) {
+		this.authCode = authCode;
+	}
+	public String getMerchantCode() {
+		return merchantCode;
+	}
+	public void setMerchantCode(String merchantCode) {
+		this.merchantCode = merchantCode;
+	}
+	public String getMerchantName() {
+		return merchantName;
+	}
+	public void setMerchantName(String merchantName) {
+		this.merchantName = merchantName;
+	}
+	public String getStoreId() {
+		return storeId;
+	}
+	public void setStoreId(String storeId) {
+		this.storeId = storeId;
+	}
+	public String getStoreName() {
+		return storeName;
+	}
+	public void setStoreName(String storeName) {
+		this.storeName = storeName;
+	}
+	public String getOrderNumber() {
+		return orderNumber;
+	}
+	public void setOrderNumber(String orderNumber) {
+		this.orderNumber = orderNumber;
+	}
+	public String getMemberCode() {
+		return memberCode;
+	}
+	public void setMemberCode(String memberCode) {
+		this.memberCode = memberCode;
+	}
+	public String getNickName() {
+		return nickName;
+	}
+	public void setNickName(String nickName) {
+		this.nickName = nickName;
+	}
+	public String getOrderFee() {
+		return orderFee;
+	}
+	public void setOrderFee(String orderFee) {
+		this.orderFee = orderFee;
+	}
+	public String getStaffCode() {
+		return staffCode;
+	}
+	public void setStaffCode(String staffCode) {
+		this.staffCode = staffCode;
+	}
+	public String getStaffName() {
+		return staffName;
+	}
+	public void setStaffName(String staffName) {
+		this.staffName = staffName;
+	}
+	public String getAisle() {
+		return aisle;
+	}
+	public void setAisle(String aisle) {
+		this.aisle = aisle;
+	}
+	
+	public String getGiveMoney() {
+		return giveMoney;
+	}
+	public void setGiveMoney(String giveMoney) {
+		this.giveMoney = giveMoney;
+	}
+	public MemberOrder convertMemberOrder() {
+		MemberOrder memberOrder=new MemberOrder();
+		memberOrder.setOrderNumber(orderNumber);
+		memberOrder.setMerchantCode(merchantCode);
+		memberOrder.setMerchantName(merchantName);
+		memberOrder.setStoreId(storeId);
+		memberOrder.setStoreName(storeName);
+		memberOrder.setMemberCode(memberCode);
+		memberOrder.setNickName(nickName);
+		memberOrder.setOrderType("1");
+		memberOrder.setOrderFee(orderFee);
+		memberOrder.setRechargeType("0");
+		memberOrder.setStaffCode(staffCode);
+		memberOrder.setStaffName(staffName);
+		return memberOrder;
+	}
+	
+	public MerchantMenberRecharge convertMerchantMenberRecharge(MerchantMenber menber) {
+		MerchantMenberRecharge merchantMenberRecharge=new MerchantMenberRecharge();
+		if(null!=giveMoney&&!"".equals(giveMoney)) {
+			merchantMenberRecharge.setGiveMoney(Double.valueOf(giveMoney));
+		}
+		merchantMenberRecharge.setLogo(menber.getLogo());
+		merchantMenberRecharge.setMemberCode(memberCode);
+		merchantMenberRecharge.setMerchantCode(merchantCode);
+		merchantMenberRecharge.setMerchantName(merchantName);
+		merchantMenberRecharge.setNickName(nickName);
+		merchantMenberRecharge.setOrderNumber(orderNumber);
+		merchantMenberRecharge.setPhone(menber.getPhone());
+		merchantMenberRecharge.setRechargeMoney(Double.valueOf(orderFee));
+		merchantMenberRecharge.setStoreId(storeId);
+		merchantMenberRecharge.setStoreName(storeName);
+		return merchantMenberRecharge;
+	}
+
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/MemberRechargeDTO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/MemberRechargeDTO.java
new file mode 100644
index 0000000..6502cb0
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/MemberRechargeDTO.java
@@ -0,0 +1,33 @@
+package cn.pluss.platform.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author yuchen
+ *
+ * @Description 
+ */
+@Data
+public class MemberRechargeDTO extends MerChantOrderDTO {
+	
+	@ApiModelProperty(value="0 扫码充值 1现金充值")
+	private String type;
+	
+	@ApiModelProperty(value="充值金额")
+	private String rechargeMoney;
+	
+	@ApiModelProperty(value="当前门店Id")
+	private String storeId;
+	
+	@ApiModelProperty(value="当前会员手机号")
+	private String phone;
+	
+	@ApiModelProperty(value="条码值")
+	private String authCode;
+
+	@ApiModelProperty(value="用户名称")
+	private String userName;
+
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/MemberScanPayDTO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/MemberScanPayDTO.java
new file mode 100644
index 0000000..1e8c10a
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/MemberScanPayDTO.java
@@ -0,0 +1,68 @@
+package cn.pluss.platform.dto;
+
+import cn.pluss.platform.entity.MerchantMenber;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author yuchen
+ *
+ * @Description
+ */
+@Data
+@ApiModel("扫码支付的传入参数")
+@NoArgsConstructor
+public class MemberScanPayDTO {
+
+    @ApiModelProperty(value = "扫码获得的code", required = true)
+    private String memberCode;
+
+    @ApiModelProperty(value = "选中的会员code", required = true)
+    private String authCode;
+
+    @ApiModelProperty(value = "当前商户门店id", required = true)
+    private String storeId;
+
+    @ApiModelProperty(value = "消费金额", required = true)
+    private Double consumeFee;
+
+    @ApiModelProperty(value = "商家Code", required = true)
+    private String merchantCode;
+
+    @ApiModelProperty(value = "当前操作用户的id", required = true)
+    private String userId;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    /**
+     * 通道切换字段 0 支付宝微信官方通道 1乐刷通道 2：随行付通道 3:瑞银信
+     */
+    @ApiModelProperty("通道类型")
+    private String aisleSwitch;
+
+    @ApiModelProperty("店铺名称")
+    private String storeName;
+
+    @ApiModelProperty("商户名称")
+    private String merchantName;
+
+
+    @ApiModelProperty("用户名称")
+    private String userName;
+
+    public MemberScanPayDTO(MerChantOrderDTO dto, MerchantMenber menber) {
+        this.merchantCode = dto.getMerchantCode();
+        this.merchantName = menber.getMerchantName();
+        this.storeId = dto.getStoreId();
+        this.consumeFee = dto.getConsumeFee();
+        this.authCode = menber.getMemberCode();
+        this.storeName = menber.getStoreName();
+        this.memberCode = dto.getAuthCode();
+        this.userId = dto.getUserId();
+        this.userName = dto.getStaffName();
+    }
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/MerChantOrderDTO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/MerChantOrderDTO.java
new file mode 100644
index 0000000..8538c4e
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/MerChantOrderDTO.java
@@ -0,0 +1,89 @@
+package cn.pluss.platform.dto;
+
+import cn.pluss.platform.entity.MerchantBaseInfo;
+import cn.pluss.platform.entity.MerchantChannelStatus;
+import cn.pluss.platform.entity.MerchantMemberCode;
+import cn.pluss.platform.entity.MerchantOrder;
+import lombok.Data;
+
+@Data
+public class MerChantOrderDTO {
+    /**
+     * 0 扫码 1现金 2：会员卡
+     */
+    private String type;
+	//订单编号
+	private String orderNumber;
+	//商家编码
+    private String merchantCode;
+    //商家名称
+    private String merchantName;
+    //交易金额
+    private Double consumeFee;
+    //会员编码
+    private String memberCode;
+    //店铺id
+    private String storeId;
+    //店铺名称
+    private String storeName;
+    //员工编码
+    private String userId;
+    
+    private String staffName;
+    
+    //支付码
+    private String authCode;
+    //备注信息
+    private String remark;
+    //支付方式编码
+    private String payTypeCode;
+    //支付方式名名称
+    private String payTypeName;
+    
+    
+    /**
+     * 通道切换字段 0 支付宝微信官方通道 1乐刷通道 2：随行付通道 3:瑞银信 4：银盛
+     */
+    private String aisleSwitch;
+
+    /**
+     * 上游渠道商户编号 通用
+     */
+    private String channelNo;
+
+    /**
+     * @description:设备号
+     * @date: 2021/12/22 16:01
+     */
+    private String deviceNo;
+
+    /**
+     * @description:
+     * @date: 2021/8/23 18:36
+     */
+    private MerchantBaseInfo merchantBaseInfo;
+
+
+    private MerchantChannelStatus channelStatus;
+
+
+    private MerchantMemberCode mercMenberCode;
+
+    /**
+     * 参数转换
+     * @param memberRechargeDTO
+     * @param merchantOrder
+     * @param channelStatus
+     */
+    public void conver(MemberRechargeDTO memberRechargeDTO, MerchantOrder merchantOrder, MerchantChannelStatus channelStatus) {
+        this.orderNumber = merchantOrder.getOrderNumber();
+        this.merchantCode = merchantOrder.getMerchantCode();
+        this.merchantName = merchantOrder.getMerchantName();
+        this.consumeFee = merchantOrder.getConsumeFee();
+        this.channelNo = channelStatus.getMerchantId();
+        this.storeId = memberRechargeDTO.getStoreId();
+        this.authCode = memberRechargeDTO.getAuthCode();
+        this.aisleSwitch = merchantOrder.getAisleSwitch();
+        this.storeName = merchantOrder.getStoreName();
+    }
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/MercActiveDataDTO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/MercActiveDataDTO.java
new file mode 100644
index 0000000..8ad4e61
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/MercActiveDataDTO.java
@@ -0,0 +1,35 @@
+package cn.pluss.platform.dto;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ *
+ *商户活跃度统计DTO
+ *@author: bzg
+ *@time: 2022/1/7 14:05
+ */
+@Data
+public class MercActiveDataDTO {
+
+
+    private Integer userId;
+
+    private String merchantCode;
+
+    private String alias;
+
+    private BigDecimal transAmt;
+
+    private Integer transNum;
+
+    private Date lastTransTime;
+
+    private String remarks;
+
+    private Integer condition;
+
+    private Integer type;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/MercOrderDataDTO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/MercOrderDataDTO.java
new file mode 100644
index 0000000..2bbc903
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/MercOrderDataDTO.java
@@ -0,0 +1,125 @@
+package cn.pluss.platform.dto;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ *
+ *商户交易数据统计DTO
+ *@author: bzg
+ *@time: 2021/12/30 17:38
+ */
+@Data
+public class MercOrderDataDTO {
+
+
+    private Integer userId;
+
+    private String alias;
+
+    private String merchantCode;
+
+    /**
+     * 总金额
+     * @date: 2021/12/30 17:40
+     */
+    private BigDecimal totalAmt;
+
+    /**
+     * 总成功交易金额
+     * @date: 2021/12/30 17:40
+     */
+    private BigDecimal tradeSucAmt;
+
+    /**
+     * 交易笔数
+     * @date: 2021/12/30 17:41
+     */
+    private Integer tradeNum;
+
+    /**
+     * 交易成功笔数
+     * @date: 2021/12/30 17:41
+     */
+    private Integer tradeSucNum;
+
+    /**
+     * 借记卡或储蓄卡交易成功笔数
+     * @date: 2021/12/30 17:42
+     */
+    private Integer debitSucNum;
+
+    /**
+     * 贷记卡或信用卡交易成功笔数
+     * @date: 2021/12/30 17:43
+     */
+    private Integer creditSucNum;
+
+    /**
+     * 其他支付方式交易成功笔数
+     * @date: 2021/12/30 17:43
+     */
+    private Integer otherSucNum;
+
+    /**
+     * D1交易笔数
+     * @date: 2021/12/30 17:44
+     */
+    private Integer d1Num;
+
+    /**
+     * D0交易笔数
+     * @date: 2021/12/30 17:44
+     */
+    private Integer d0Num;
+
+    /**
+     * 通道状态
+     * @date: 2021/12/30 17:44
+     */
+    private Integer valid;
+
+    /**
+     * 通道ID
+     * @date: 2021/12/30 17:44
+     */
+    private Integer channel;
+
+    /**
+     * D1占比
+     * @date: 2021/12/30 17:45
+     */
+    private BigDecimal d1Scale;
+
+    /**
+     * d0占比
+     * @date: 2021/12/30 17:45
+     */
+    private BigDecimal d0Scale;
+
+    /**
+     * 支付笔数比例
+     * @date: 2021/12/30 17:45
+     */
+    private BigDecimal numScale;
+
+    /**
+     * 信用卡占比:
+     * @date: 2021/12/30 17:45
+     */
+    private BigDecimal creditScale;
+
+    /**
+     * 借记卡占比:
+     * @date: 2021/12/30 17:45
+     */
+    private BigDecimal debitScale;
+
+    /**
+     * 风控备注
+     * @date: 2021/12/31 18:24
+     */
+    private String risk;
+
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/MercOrderDetailDTO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/MercOrderDetailDTO.java
new file mode 100644
index 0000000..4d2b6c3
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/MercOrderDetailDTO.java
@@ -0,0 +1,19 @@
+package cn.pluss.platform.dto;
+
+import cn.pluss.platform.entity.MercOrderDetail;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+/**
+ * TODO
+ * 参数封装
+ * @author crystal
+ * @date 2022/3/30 18:23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class MercOrderDetailDTO extends MercOrderDetail {
+
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/MercOrderNewDTO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/MercOrderNewDTO.java
new file mode 100644
index 0000000..9445bd4
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/MercOrderNewDTO.java
@@ -0,0 +1,45 @@
+package cn.pluss.platform.dto;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @author DJH
+ */
+@Data
+public class MercOrderNewDTO {
+
+    /**
+     * 用户id
+     */
+    private Long userId;
+
+    /**
+     * 购物车项id
+     */
+    private List<Long> itemList;
+
+    /**
+     * 收货地址id
+     */
+    private Long addressId;
+
+    /**
+     * aliPay, 支付宝；wechatPay, 微信支付
+     */
+    private String payType;
+
+    private Long ticketId;
+
+    /**
+     * 邮费
+     */
+    private BigDecimal postage;
+
+    /**
+     * 订单状态
+     */
+    private String orderNo;
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/MercTradeDataDTO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/MercTradeDataDTO.java
new file mode 100644
index 0000000..c49e904
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/MercTradeDataDTO.java
@@ -0,0 +1,78 @@
+package cn.pluss.platform.dto;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ *
+ *@description:
+ *@author: bzg
+ *@time: 2021/12/31 13:37
+ */
+@Data
+public class MercTradeDataDTO {
+
+    private String merchantCode;
+
+    private String phone;
+
+    private Integer userId;
+
+    private String alias;
+
+    /**
+     * 交易金额
+     * @date: 2021/12/31 13:38
+     */
+    private BigDecimal tradeSumAmt;
+
+    /**
+     * 交易笔数
+     * @date: 2021/12/31 13:39
+     */
+    private Integer tradeSumNum;
+
+    private BigDecimal prevTradeSumAmt;
+
+    private Integer prevTradeSumNum;
+
+    /**
+     * 金额环比
+     * @date: 2021/12/31 13:42
+     */
+    private String amtChain;
+
+    /**
+     * 笔数环比
+     * @date: 2021/12/31 13:42
+     */
+    private String numChain;
+
+    /**
+     * @description:排序
+     * @date: 2021/12/31 13:44
+     */
+    private Integer condition;
+
+    private String startTime;
+
+    private String endTime;
+
+    private String field;
+
+    private String order;
+
+    /**
+     * 异地支付状态
+     * @date: 2022/2/15 14:01
+     */
+    private String payEcdemicSwitch;
+
+    /**
+     * 跟进状态
+     */
+    private String followStatus;
+
+    private Long storeId;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/MerchSearchDTO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/MerchSearchDTO.java
new file mode 100644
index 0000000..43f9a8f
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/MerchSearchDTO.java
@@ -0,0 +1,38 @@
+package cn.pluss.platform.dto;
+
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 商户搜索条件
+ *
+ * @author Djh
+ */
+@Data
+public class MerchSearchDTO {
+
+    /**
+     * 商户简称
+     */
+    private String merchantName;
+
+    private String userId;
+
+    /**
+     * 1: 查直推
+     * 2: 查间推
+     * 0: 查全部
+     */
+    private String type;
+
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date startTime;
+
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date endTime;
+
+    private List<String> agentStaffIds;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/MerchantBaseInfoDTO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/MerchantBaseInfoDTO.java
new file mode 100644
index 0000000..b6c3170
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/MerchantBaseInfoDTO.java
@@ -0,0 +1,110 @@
+package cn.pluss.platform.dto;
+
+import cn.pluss.platform.converter.MerchantBaseInfoConverter;
+import cn.pluss.platform.entity.MerchantBaseInfo;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.util.AreaUtils;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author yuchen
+ * 
+ * @Description
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class MerchantBaseInfoDTO {
+
+    private Long id;
+
+    @ApiModelProperty(value = "当前用户的userId")
+    private String userId;
+
+    private String merchantName;
+
+    private String merchantType;
+
+    @ApiModelProperty(value = "商户简称")
+    private String alias;
+
+    @ApiModelProperty(value = "经营类目编码")
+    private String mcc;
+
+    @ApiModelProperty(value = "经营类目名称")
+    private String mccName;
+
+    @ApiModelProperty(value = "支付宝账号")
+    private String aliAccount;
+
+    @ApiModelProperty(value = "经营内容描述")
+    private String productDesc;
+
+    @ApiModelProperty(value = "商家店所在省市区编码")
+    private String addressNo;
+
+    @ApiModelProperty(value = "商户地址")
+    private String merchantAddress;
+
+    @ApiModelProperty(value = "详细地址")
+    private String address;
+
+    @ApiModelProperty(value = "联系人号码")
+    private String contactMobile;
+
+    @ApiModelProperty(value = "联系人姓名")
+    private String contactName;
+
+    @ApiModelProperty(value = "邮箱")
+    private String email;
+
+    @ApiModelProperty(value = "门头照")
+    private String storeHeadPic;
+
+    @ApiModelProperty(value = "门店内照片")
+    private String storeInsidePic;
+
+    @ApiModelProperty(value = "收银台照片")
+    private String cashPic;
+
+    @ApiModelProperty(value = "用户名")
+    private String userPhone;
+
+    @ApiModelProperty(value = "密码")
+    private String userPassWord;
+
+    public MerchantBaseInfo convertMerchantBaseInfoDTO() {
+        MsgException.checkBlank(merchantType, "请选择商户类型");
+        MsgException.checkBlank(alias, "请传入商户简称");
+        MsgException.checkBlank(mcc, "请传入经营类目编码");
+        MsgException.checkBlank(mccName, "请传入经营类目名称");
+        MsgException.checkBlank(merchantAddress, "请传入商户地址");
+        MsgException.checkBlank(address, "请传入详细地址");
+        MsgException.checkBlank(contactMobile, "请传入联系人号码");
+        MsgException.checkBlank(contactName, "请传入联系人姓名");
+        MsgException.checkBlank(storeHeadPic, "请上传门头照");
+        MsgException.checkBlank(storeInsidePic, "请上传门店内照片");
+        MsgException.checkBlank(cashPic, "请上传收银台照片");
+
+        MerchantBaseInfo merchantBaseInfo = MerchantBaseInfoConverter.INSTANCE.dto2Domain(this);
+        // 传的格式是 省市区  用逗号隔开
+        String[] split = merchantAddress.split(",");
+
+        if (split.length == 2) {
+            // 市和省同名的情况下传参可能出现的问题
+            merchantBaseInfo.setProvince(split[0]);
+            merchantBaseInfo.setCity(split[0]);
+            merchantBaseInfo.setDistrict(split[1]);
+        } else {
+            merchantBaseInfo.setProvince(split[0]);
+            merchantBaseInfo.setCity(split[1]);
+            merchantBaseInfo.setDistrict(split[2]);
+        }
+
+        return merchantBaseInfo;
+    }
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/MerchantDTO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/MerchantDTO.java
new file mode 100644
index 0000000..6ec4414
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/MerchantDTO.java
@@ -0,0 +1,9 @@
+package cn.pluss.platform.dto;
+
+import lombok.Data;
+
+@Data
+public class MerchantDTO {
+	private String merchantCode;
+	private Integer userId;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/MerchantFeeDTO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/MerchantFeeDTO.java
new file mode 100644
index 0000000..077edc5
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/MerchantFeeDTO.java
@@ -0,0 +1,33 @@
+package cn.pluss.platform.dto;
+
+import cn.pluss.platform.entity.MerchantBaseInfo;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 商户流水
+ */
+@Data
+public class MerchantFeeDTO {
+
+    /**
+     * 店铺code
+     */
+    private String merchantCode;
+
+    /**
+     * 店铺基本信息
+     */
+    private MerchantBaseInfo merchantBaseInfo;
+
+    /**
+     * 店铺订单流水
+     */
+    private BigDecimal money;
+
+    /**
+     * 店铺产生的分润
+     */
+    private BigDecimal profit;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/MerchantRateNewDTO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/MerchantRateNewDTO.java
new file mode 100644
index 0000000..15e75d5
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/MerchantRateNewDTO.java
@@ -0,0 +1,119 @@
+package cn.pluss.platform.dto;
+
+
+import cn.pluss.platform.entity.MerchantRateNew;
+import cn.pluss.platform.exception.MsgException;
+import lombok.Data;
+import lombok.val;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+@Data
+public class MerchantRateNewDTO {
+
+    /**
+     * 用户id
+     */
+    private String userId;
+
+    /**
+     * 微信D0费率值
+     */
+    private BigDecimal wxRateD0;
+
+
+    /**
+     * 支付宝D0费率
+     */
+    private BigDecimal aliRateD0;
+
+
+    /**
+     * 银联D0费率
+     */
+    private BigDecimal bankRateD0;
+
+
+    /**
+     * 银联大额D0费率，>1000
+     */
+    private BigDecimal bankRateLargeD0;
+
+
+    /**
+     * 微信D1费率
+     */
+    private BigDecimal wxRateD1;
+
+
+    /**
+     * 支付宝D1费率
+     */
+    private BigDecimal aliRateD1;
+
+
+    /**
+     * 银联D1费率
+     */
+    private BigDecimal bankRateD1;
+
+
+    /**
+     * 银联大额D1费率
+     */
+    private BigDecimal bankRateLargeD1;
+
+
+
+    public static Map<String, MerchantRateNew> toMerchantRateNew(MerchantRateNewDTO rateNewDTO) {
+        Map<String, MerchantRateNew> result = new HashMap<>();
+
+        boolean wxRateD0Exist = rateNewDTO.getWxRateD0() == null;
+        boolean aliRateD0Exist = rateNewDTO.getAliRateD0() == null;
+        boolean bankRateD0Exist = rateNewDTO.getBankRateD0() == null;
+        boolean bankRateLargeD0Exist = rateNewDTO.getBankRateLargeD0() == null;
+
+        if (wxRateD0Exist ^ aliRateD0Exist ^ bankRateD0Exist ^ bankRateLargeD0Exist) {
+            throw new MsgException("D0费率参数不全");
+        }
+
+        if (!wxRateD0Exist) {
+            MerchantRateNew d0 = new MerchantRateNew();
+            d0.setWxRate(rateNewDTO.getWxRateD0().multiply(BigDecimal.valueOf(100)).intValue());
+            d0.setAliRate(rateNewDTO.getAliRateD0().multiply(BigDecimal.valueOf(100)).intValue());
+            d0.setBankRate(rateNewDTO.getBankRateD0().multiply(BigDecimal.valueOf(100)).intValue() - 2);
+            d0.setBankRateLarge(rateNewDTO.getBankRateLargeD0().subtract(BigDecimal.valueOf(0.53d)).divide(BigDecimal.valueOf(0.005d), RoundingMode.HALF_UP).intValue() + 21);
+
+            result.put("d0", d0);
+        }
+
+        boolean wxRateD1Exist = rateNewDTO.getWxRateD1() == null;
+        boolean aliRateD1Exist = rateNewDTO.getAliRateD1() == null;
+        boolean bankRateD1Exist = rateNewDTO.getBankRateD1() == null;
+        boolean bankRateLargeD1Exist = rateNewDTO.getBankRateLargeD1() == null;
+
+        if (wxRateD1Exist ^ aliRateD1Exist ^ bankRateD1Exist ^ bankRateLargeD1Exist) {
+            throw new MsgException("D1费率参数不全");
+        }
+
+        if (!wxRateD1Exist) {
+            MerchantRateNew d1 = new MerchantRateNew();
+            d1.setWxRate(rateNewDTO.getWxRateD1().multiply(BigDecimal.valueOf(100)).intValue());
+            d1.setAliRate(rateNewDTO.getAliRateD1().multiply(BigDecimal.valueOf(100)).intValue());
+            d1.setBankRate(rateNewDTO.getBankRateD1().multiply(BigDecimal.valueOf(100)).intValue() - 2);
+            if (rateNewDTO.getBankRateLargeD1() == null || Objects.equals(rateNewDTO.getBankRateLargeD1(), BigDecimal.ZERO)) {
+                d1.setBankRateLarge(-1);
+            } else {
+                d1.setBankRateLarge(rateNewDTO.getBankRateLargeD1().subtract(BigDecimal.valueOf(0.53d)).divide(BigDecimal.valueOf(0.005d), RoundingMode.HALF_UP).intValue() + 21);
+            }
+
+            result.put("d1", d1);
+        }
+
+        return result;
+    }
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/MerchantRateNewRecordDTO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/MerchantRateNewRecordDTO.java
new file mode 100644
index 0000000..ca45438
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/MerchantRateNewRecordDTO.java
@@ -0,0 +1,26 @@
+package cn.pluss.platform.dto;
+
+import cn.pluss.platform.entity.MerchantRateNewRecord;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 商户费率表(新)
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-08-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class MerchantRateNewRecordDTO extends MerchantRateNewRecord {
+
+    private String userId;
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/MerchantStaffDTO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/MerchantStaffDTO.java
new file mode 100644
index 0000000..698882e
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/MerchantStaffDTO.java
@@ -0,0 +1,50 @@
+package cn.pluss.platform.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 添加员工入参
+ * @author DJH
+ */
+@Data
+public class MerchantStaffDTO {
+
+    /**
+     * 用户id
+     */
+    private Long userId;
+
+    /**
+     * 登录账号
+     */
+    private String loginName;
+
+    /**
+     * 姓名
+     */
+    private String userName;
+
+    /**
+     * 手机号
+     */
+    private String phone;
+
+    /**
+     * 密码
+     */
+    private String password;
+
+    /**
+     * 商编
+     */
+    private String merchantCode;
+
+    /**
+     * 查看所有账单权限
+     */
+    private String permissionBill;
+
+    private List<String> merchantCodeList;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/NewAreaDTO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/NewAreaDTO.java
new file mode 100644
index 0000000..9b9b0ae
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/NewAreaDTO.java
@@ -0,0 +1,38 @@
+package cn.pluss.platform.dto;
+
+import java.util.List;
+
+/**
+ * @author yuchen
+ *
+ * @Description 
+ */
+public class NewAreaDTO {
+	
+	private String code;
+	
+	private String name;
+	
+	private List<NewAreaDTO> cityList;
+
+	public String getCode() {
+		return code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+	
+	
+	
+
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/QueryOrderDTO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/QueryOrderDTO.java
new file mode 100644
index 0000000..2bc44bc
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/QueryOrderDTO.java
@@ -0,0 +1,97 @@
+package cn.pluss.platform.dto;
+
+import java.util.Date;
+
+import cn.pluss.platform.entity.MerchantOrder;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author yuchen
+ * 
+ * @Description 
+ */
+@Data
+public class QueryOrderDTO {
+	
+	@ApiModelProperty(value="当前用户Id")
+	private String userId;
+	
+	@ApiModelProperty(value="订单号")
+	private String orderNumber;
+	
+	@ApiModelProperty(value="订单类型")
+	private String 	orderType;
+	
+	@ApiModelProperty(value="商家编码")
+	private String merchantCode;
+	
+	@ApiModelProperty(value="商家名称")
+	private String merchantName;
+	
+	@ApiModelProperty(value="支付方式编码")
+	private String payTypeCode;
+	
+	@ApiModelProperty(value="支付方式名称")
+	private String payTypeName;
+	
+	@ApiModelProperty(value="门店id")
+	private String storeId;
+	
+	@ApiModelProperty(value="门店名称")
+	private String 	storeName;
+	
+	@ApiModelProperty(value="消费金额")
+	private Double consumeFee;
+	
+	@ApiModelProperty(value="分润人的userId")
+	private String promoteruserId;
+	
+	@ApiModelProperty(value="分润金额")
+	private String shareMoney;
+	
+	@ApiModelProperty(value="订单创建时间")
+	private Date createDt;
+	
+	@ApiModelProperty(value="交易人员id")
+	private String staffCode;
+	
+	@ApiModelProperty(value="交易人员名称")
+	private String staffName;
+	
+	@ApiModelProperty(value="到账金额")
+	private Double enterFee;
+	
+	@ApiModelProperty(value="支付通道")
+	private String aisleSwitch;
+	
+	@ApiModelProperty(value="备注")
+	private String remark;
+	
+	@ApiModelProperty(value="乐刷商户Id")
+	private String leshuaMchId;
+
+	public MerchantOrder convertMerchantOrder() {
+		MerchantOrder merchantOrder=new MerchantOrder();
+		merchantOrder.setMerchantCode(merchantCode);
+		merchantOrder.setMerchantName(merchantName);
+		merchantOrder.setAisleSwitch(aisleSwitch);
+		merchantOrder.setCreateDt(createDt);
+		merchantOrder.setUpdateTime(createDt);
+		merchantOrder.setOrderType(orderType);
+		merchantOrder.setPayTypeCode(payTypeCode);
+		merchantOrder.setPayTypeName(payTypeName);
+		merchantOrder.setStoreId(storeId);
+		merchantOrder.setStoreName(storeName);
+		merchantOrder.setConsumeFee(consumeFee);
+		merchantOrder.setEnterFee(enterFee);
+		merchantOrder.setRemark(remark);
+		merchantOrder.setStaffCode(staffCode);
+		merchantOrder.setStoreName(storeName);
+		return merchantOrder;
+	}
+	
+	
+
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/RealFansDTO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/RealFansDTO.java
new file mode 100644
index 0000000..17cc466
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/RealFansDTO.java
@@ -0,0 +1,97 @@
+package cn.pluss.platform.dto;
+
+import cn.pluss.platform.entity.RealFans;
+import cn.pluss.platform.util.StringUtil;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author yuchen
+ * 
+ * @Description  
+ */
+@Data
+public class RealFansDTO {
+	
+	/**
+	 * 唯一识别标识
+	 */
+	private String soleId;
+	
+	/**
+	 * 消费金额
+	 */
+	private String conSumMoney;
+	
+	/**
+	 * 消费方式 0支付宝 1微信 2-0乐刷支付宝 2-1乐刷微信
+	 */
+	private String payWay;
+	
+	/**
+	 * 当前消费的商户
+	 */
+	private String merchantCode;
+	
+	/**
+	 * 订单号
+	 */
+	private String orderNumber;
+	
+	/**
+	 * 通道的订单号
+	 */
+	private String tradeNumber; 
+	
+	/**
+	 * 头像
+	 */
+	private String logo;
+	
+	/**
+	 * 昵称
+	 */
+	private String nickName;
+	
+	/**
+	 * 手机号
+	 */
+	private String phone;
+	
+	/**
+	 * 初始激活时间
+	 */
+	private String enableTime;
+	
+	/**
+	 * 本次消费时间
+	 */
+	private String consumTime;
+
+	/**
+	 * 活动营销转账金额
+	 */
+	private BigDecimal marketAmt;
+
+	/**
+	 * 结算金额
+	 */
+	private BigDecimal settlementAmt;
+	
+	public RealFans convertRealFans(RealFans realFans) {
+		realFans.setSoleId(soleId);
+		realFans.setEnableMerchantCode(merchantCode);
+		if(StringUtil.isNotEmpty(logo) && !"undefined".equals(logo)){
+			realFans.setLogo(logo);
+		}
+		if(StringUtil.isNotEmpty(nickName) && !"undefined".equals(nickName)){
+			realFans.setNickName(nickName);
+		}
+		realFans.setPhone(phone);
+		realFans.setEnableTime(new Date());
+		return realFans;
+	}
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/RegionReflectDTO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/RegionReflectDTO.java
new file mode 100644
index 0000000..e83eb41
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/RegionReflectDTO.java
@@ -0,0 +1,27 @@
+package cn.pluss.platform.dto;
+
+import lombok.Data;
+
+@Data
+public class RegionReflectDTO {
+
+    private String type;
+
+    private Integer channel;
+
+    private Integer regionSrc;
+
+    private Integer regionDes;
+
+    private String province;
+
+    private String provinceCode;
+
+    private String city;
+
+    private String cityCode;
+
+    private String area;
+
+    private String areaCode;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/RiskBlacklistDTO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/RiskBlacklistDTO.java
new file mode 100644
index 0000000..f035ef5
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/RiskBlacklistDTO.java
@@ -0,0 +1,32 @@
+package cn.pluss.platform.dto;
+
+import cn.pluss.platform.entity.RiskBlacklist;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class RiskBlacklistDTO extends RiskBlacklist {
+
+    /**
+     * 计数
+     */
+    private int count = 0;
+
+    /**
+     * 批量添加的id数组
+     */
+    private List<String> userIdArr;
+
+    /**
+     * 子商户标识，1即关闭所有关联子商户相关的商户
+     */
+    private String connectFlag;
+
+    /**
+     * 商户编号
+     */
+    private String merchantCode;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/StaffDTO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/StaffDTO.java
new file mode 100644
index 0000000..1652b7b
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/StaffDTO.java
@@ -0,0 +1,50 @@
+package cn.pluss.platform.dto;
+
+import cn.pluss.platform.entity.UserApp;
+import lombok.Data;
+
+/**
+ * @author yuchen
+ *
+ * @Description 
+ */
+@Data
+public class StaffDTO {
+	
+	private Long id;
+	
+	private String merchantCode;
+	
+	private String merchantName;
+	
+	private String storeId;
+	
+	private String storeName;
+	
+	private String phone;
+	
+	private String loginName;
+	
+	private String userName;
+	
+	private String password;
+	
+	private String verifyPassword;
+
+	public UserApp convert() {
+		UserApp userApp=new UserApp();
+		userApp.setMerchantCode(merchantCode);
+		userApp.setMerchantName(merchantName);
+		userApp.setStoreId(storeId);
+		userApp.setStoreName(storeName);
+		userApp.setPhone(phone);
+		userApp.setLoginName(loginName);
+		userApp.setUserName(userName);
+		userApp.setPassword(password);
+		return userApp;
+		
+	}
+	
+
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/SubMerchantDTO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/SubMerchantDTO.java
new file mode 100644
index 0000000..0605138
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/SubMerchantDTO.java
@@ -0,0 +1,60 @@
+package cn.pluss.platform.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * 子商户信息表
+ * @author DJH
+ */
+@Data
+@Accessors(chain = true)
+public class SubMerchantDTO {
+
+    @TableId
+    private Integer id;
+
+    private String merchantId;
+
+    /**
+     * 接入渠道方号
+     */
+    private String channelId;
+
+    /**
+     * 渠道子商户号，查询微信
+     */
+    private String subMchId;
+
+    /**
+     * 不同渠道可能存储的不同
+     * 随行付：WX 微信， ZFB 支付宝
+     */
+    private String subMchType;
+
+    private String remark;
+
+    /**
+     * 对应自己存储的渠道表的id
+     */
+    private String channelTypeId;
+
+    /**
+     * 渠道报备状态，作用未知
+     */
+    private String status;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private String merchantCode;
+
+    private String userId;
+
+    private String loginName;
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/SummaryOfWaterDTO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/SummaryOfWaterDTO.java
new file mode 100644
index 0000000..2f8bf39
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/SummaryOfWaterDTO.java
@@ -0,0 +1,105 @@
+package cn.pluss.platform.dto;
+
+import java.io.Serializable;
+
+/**
+ * 汇总流水查询条件DTO
+ * @author yuchen
+ *
+ * @Description 
+ *
+ */
+public class SummaryOfWaterDTO implements Serializable{
+
+	/** 
+	* @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么) 
+	*/
+	private static final long serialVersionUID = 1L;
+	
+	private String merchantCode;
+	
+	/**
+	 * 门店集合 请用逗号隔开
+	 */
+	private String storeIdList;
+	
+	/**
+	 * 交易员code集合 请用逗号隔开
+	 */
+	private String staffCodeList;
+	
+	/**
+	 * 支付方式编码集合 请用逗号隔开
+	 */
+	private String payTypeCodeList;
+	
+	/**
+	 * 时间筛选 1今天 2昨天 3七天内 4：30天内 5：90天内
+	 */
+	private String timeStatus;
+	
+	private String orderType;
+
+	public String getStoreIdList() {
+		return storeIdList;
+	}
+
+	public void setStoreIdList(String storeIdList) {
+		this.storeIdList = storeIdList;
+	}
+
+	public String getStaffCodeList() {
+		return staffCodeList;
+	}
+
+	public void setStaffCodeList(String staffCodeList) {
+		this.staffCodeList = staffCodeList;
+	}
+
+	public String getPayTypeCodeList() {
+		return payTypeCodeList;
+	}
+
+	public void setPayTypeCodeList(String payTypeCodeList) {
+		this.payTypeCodeList = payTypeCodeList;
+	}
+
+	public String getTimeStatus() {
+		return timeStatus;
+	}
+
+	public void setTimeStatus(String timeStatus) {
+		this.timeStatus = timeStatus;
+	}
+	
+
+	public String getMerchantCode() {
+		return merchantCode;
+	}
+
+	public void setMerchantCode(String merchantCode) {
+		this.merchantCode = merchantCode;
+	}
+	
+	
+
+	public String getOrderType() {
+		return orderType;
+	}
+
+	public void setOrderType(String orderType) {
+		this.orderType = orderType;
+	}
+
+	@Override
+	public String toString() {
+		return "SummaryOfWaterDTO [merchantCode=" + merchantCode + ", storeIdList=" + storeIdList + ", staffCodeList="
+				+ staffCodeList + ", payTypeCodeList=" + payTypeCodeList + ", timeStatus=" + timeStatus + "]";
+	}
+	
+	
+	
+	
+	
+
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/TradePayDTO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/TradePayDTO.java
new file mode 100644
index 0000000..1c2cfa8
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/TradePayDTO.java
@@ -0,0 +1,75 @@
+package cn.pluss.platform.dto;
+
+/**
+ * @author yuchen
+ * 
+ * @Description 统一收单交易支付接口
+ */
+public class TradePayDTO {
+	
+	/**
+	 * 通过传入的userId查询userApp里面的token
+	 */
+	private String userId;
+	/**
+	 * 商户订单号,64个字符以内、可包含字母、数字、下划线；需保证在商户端不重复
+	 */
+	private String outTradeNo;
+	
+	/**
+	 * 支付授权码，25~30开头的长度为16~24位的数字，实际字符串长度以开发者获取的付款码长度为准
+	 */
+	private String authCode;
+	
+	/**
+	 * 订单标题
+	 */
+	private String subject;
+	
+	private String totalAmount;
+
+	public String getOutTradeNo() {
+		return outTradeNo;
+	}
+
+	public void setOutTradeNo(String outTradeNo) {
+		this.outTradeNo = outTradeNo;
+	}
+
+	public String getAuthCode() {
+		return authCode;
+	}
+
+	public void setAuthCode(String authCode) {
+		this.authCode = authCode;
+	}
+
+	public String getSubject() {
+		return subject;
+	}
+
+	public void setSubject(String subject) {
+		this.subject = subject;
+	}
+
+	public String getTotalAmount() {
+		return totalAmount;
+	}
+
+	public void setTotalAmount(String totalAmount) {
+		this.totalAmount = totalAmount;
+	}
+
+	public String getUserId() {
+		return userId;
+	}
+
+	public void setUserId(String userId) {
+		this.userId = userId;
+	}
+	
+	
+
+	
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/TradeQueryDTO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/TradeQueryDTO.java
new file mode 100644
index 0000000..8e4e700
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/TradeQueryDTO.java
@@ -0,0 +1,39 @@
+package cn.pluss.platform.dto;
+
+/**
+ * 查询支付订单
+ * @author yuchen
+ *
+ * @Description 
+ */
+public class TradeQueryDTO {
+	
+	/**
+	 * 用户id 查询token
+	 */
+	private String userId;
+	
+	/**
+	 * 商家订单号
+	 */
+	private String outTradeNo;
+
+	public String getUserId() {
+		return userId;
+	}
+
+	public void setUserId(String userId) {
+		this.userId = userId;
+	}
+
+	public String getOutTradeNo() {
+		return outTradeNo;
+	}
+
+	public void setOutTradeNo(String outTradeNo) {
+		this.outTradeNo = outTradeNo;
+	}
+	
+	
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/TradeRefundDTO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/TradeRefundDTO.java
new file mode 100644
index 0000000..a4f5d3e
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/TradeRefundDTO.java
@@ -0,0 +1,66 @@
+package cn.pluss.platform.dto;
+
+/**
+ * @author yuchen
+ * 
+ * @Description 
+ */
+public class TradeRefundDTO {
+	
+	/**
+	 * 商户订单号
+	 */
+	private String outTradeNo;
+	
+	/**
+	 * 支付宝交易号
+	 */
+	private String tradeNo;
+	
+	/**
+	 * 需要退款的金额
+	 */
+	private String refundAmount;
+	
+	/**
+	 * 通过userId查询token
+	 */
+	private String userId;
+
+	public String getOutTradeNo() {
+		return outTradeNo;
+	}
+
+	public void setOutTradeNo(String outTradeNo) {
+		this.outTradeNo = outTradeNo;
+	}
+
+	public String getTradeNo() {
+		return tradeNo;
+	}
+
+	public void setTradeNo(String tradeNo) {
+		this.tradeNo = tradeNo;
+	}
+
+	public String getRefundAmount() {
+		return refundAmount;
+	}
+
+	public void setRefundAmount(String refundAmount) {
+		this.refundAmount = refundAmount;
+	}
+
+	public String getUserId() {
+		return userId;
+	}
+
+	public void setUserId(String userId) {
+		this.userId = userId;
+	}
+	
+	
+	
+
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/UpDateBankInfoDTO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/UpDateBankInfoDTO.java
new file mode 100644
index 0000000..c0be374
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/UpDateBankInfoDTO.java
@@ -0,0 +1,104 @@
+package cn.pluss.platform.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @author yuchen
+ * 
+ * @Description 
+ */
+public class UpDateBankInfoDTO {
+	
+	@ApiModelProperty(value="当前用户的userId")
+	private String userId;
+	
+	@ApiModelProperty(value="手机号")
+	private String phone;
+	
+	@ApiModelProperty(value="银行卡照片")
+	private String bankPhoto;
+	
+	@ApiModelProperty(value="银行卡名称")
+	private String bankName;
+	
+	@ApiModelProperty(value="开户地区")
+	private String bankAddress;
+	
+	@ApiModelProperty(value="开户支行")
+	private String bankBranch;
+	
+	@ApiModelProperty(value="银行卡号")
+	private String bankNo;
+	
+	@ApiModelProperty(value="银行所在地区编码")
+	private String bankAddressCode;
+
+	public String getUserId() {
+		return userId;
+	}
+
+	public void setUserId(String userId) {
+		this.userId = userId;
+	}
+
+	public String getPhone() {
+		return phone;
+	}
+
+	public void setPhone(String phone) {
+		this.phone = phone;
+	}
+
+	public String getBankPhoto() {
+		return bankPhoto;
+	}
+
+	public void setBankPhoto(String bankPhoto) {
+		this.bankPhoto = bankPhoto;
+	}
+
+	public String getBankName() {
+		return bankName;
+	}
+
+	public void setBankName(String bankName) {
+		this.bankName = bankName;
+	}
+
+	public String getBankAddress() {
+		return bankAddress;
+	}
+
+	public void setBankAddress(String bankAddress) {
+		this.bankAddress = bankAddress;
+	}
+
+	public String getBankBranch() {
+		return bankBranch;
+	}
+
+	public void setBankBranch(String bankBranch) {
+		this.bankBranch = bankBranch;
+	}
+
+	public String getBankNo() {
+		return bankNo;
+	}
+
+	public void setBankNo(String bankNo) {
+		this.bankNo = bankNo;
+	}
+
+	public String getBankAddressCode() {
+		return bankAddressCode;
+	}
+
+	public void setBankAddressCode(String bankAddressCode) {
+		this.bankAddressCode = bankAddressCode;
+	}
+	
+	
+	
+
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/UserInfoDTO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/UserInfoDTO.java
new file mode 100644
index 0000000..2f1edf5
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/UserInfoDTO.java
@@ -0,0 +1,75 @@
+package cn.pluss.platform.dto;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.groups.Default;
+import java.util.Date;
+
+/**
+ * @author Djh
+ * 用户信息DTO，主要用于登录的信息接收
+ */
+@Data
+public class UserInfoDTO {
+
+    public interface AgentStaffInsert extends Default { }
+
+    public interface AgentStaffUpdate extends Default { }
+
+    /**
+     * 父id，商户注册时与邀请码二选一
+     */
+    @NotBlank(message = "父id不能为空", groups = {AgentStaffInsert.class})
+    private String pId;
+
+    /**
+     * 邀请码，商户注册时与父id二选一
+     */
+    private String inviteCode;
+
+    /**
+     * 用户名
+     */
+    @NotBlank(message = "用户名不能为空")
+    private String userName;
+
+    /**
+     * 手机号
+     */
+    @NotBlank(message = "手机号不能为空")
+    private String phone;
+
+    /**
+     * 用户id
+     */
+    @NotBlank(message = "用户id不能为空", groups = AgentStaffUpdate.class)
+    private String userId;
+
+    /**
+     * 帐号
+     */
+    @NotBlank(message = "注册帐号不能为空")
+    private String loginName;
+
+    /**
+     * 登录密码
+     */
+    @NotBlank(message = "登陆密码不能为空")
+    private String password;
+
+    /**
+     * 验证码
+     */
+    private String checkCode;
+
+    /**
+     * 查询起始时间
+     */
+    private Date startTime;
+
+    /**
+     * 查询截止时间
+     */
+    private Date endTime;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/WechatMerchantAuditDTO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/WechatMerchantAuditDTO.java
new file mode 100644
index 0000000..16bc2b7
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/WechatMerchantAuditDTO.java
@@ -0,0 +1,95 @@
+package cn.pluss.platform.dto;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.entity.MerchantBankCard;
+import cn.pluss.platform.entity.MerchantBaseInfo;
+import cn.pluss.platform.entity.MerchantImage;
+import cn.pluss.platform.util.StringUtil;
+import io.swagger.annotations.ApiModelProperty;
+
+public class WechatMerchantAuditDTO {
+	
+	@ApiModelProperty(value="当前用户userId")
+	private String userId;
+	
+	public String getUserId() {
+		return userId;
+	}
+
+	public void setUserId(String userId) {
+		this.userId = userId;
+	}
+
+
+	public Result<Map<String, Object>> convertMap(MerchantBankCard merchantBankCard, MerchantBaseInfo merchantBaseInfo, List<MerchantImage> list){
+		if(StringUtil.isEmpty(merchantBaseInfo.getProductDesc())) {
+			return ResultGenerator.genFailResult("请选择售卖商品/提供服务描述");
+		}
+		if(StringUtil.isEmpty(merchantBaseInfo.getContactMobile())) {
+			return ResultGenerator.genFailResult("联系人号码不能为空");
+		}
+		if(StringUtil.isEmpty(merchantBaseInfo.getAlias())) {
+			return ResultGenerator.genFailResult("商户简称不能为空");
+		}
+		if(StringUtil.isEmpty(merchantBaseInfo.getAddressNo())) {
+			return ResultGenerator.genFailResult("商户地址不能为空");
+		}
+		if(StringUtil.isEmpty(merchantBaseInfo.getAddress())) {
+			return ResultGenerator.genFailResult("详细地址不能为空");
+		}
+		if(StringUtil.isEmpty(merchantBankCard.getBankName())) {
+			return ResultGenerator.genFailResult("开户银行名称不能为空");
+		}
+		if(StringUtil.isEmpty(merchantBankCard.getBankCertName())) {
+			return ResultGenerator.genFailResult("开户名称（与银行卡身份证一致）不能为空");
+		}
+		if(StringUtil.isEmpty(merchantBankCard.getBankCardNo())) {
+			return ResultGenerator.genFailResult("银行卡号不能为空");
+		}
+		if(StringUtil.isEmpty(merchantBankCard.getBankAddressNo())) {
+			return ResultGenerator.genFailResult("银行所在地区编码不能为空");
+		}
+		Map<String, Object> result=new HashMap<String, Object>(16);
+		boolean isOne=true;boolean isTwo=true;boolean isSix=true;boolean isNine=true;
+		for (MerchantImage merchantImage : list) {
+			if("01".equals(merchantImage.getPhotoType())) {//身份证正面
+				isOne=false;
+				result.put("01", merchantImage.getPicUrl());
+			}
+			if("02".equals(merchantImage.getPhotoType())) {//身份证反面
+				isTwo=false;
+				result.put("02", merchantImage.getPicUrl());
+			}
+			if("06".equals(merchantImage.getPhotoType())) {//门头照
+				isSix=false;
+				result.put("06", merchantImage.getPicUrl());
+			}
+			if("09".equals(merchantImage.getPhotoType())) {//门店内景照片
+				isNine=false;
+				result.put("09", merchantImage.getPicUrl());
+			}
+		}
+		if(isOne) {
+			return ResultGenerator.genFailResult("请上传身份证正面照");
+		}
+		if(isTwo) {
+			return ResultGenerator.genFailResult("请上传身份证反面");
+		}
+		if(isSix) {
+			return ResultGenerator.genFailResult("请上传门头照");
+		}
+		if(isNine) {
+			return ResultGenerator.genFailResult("请上传门店内景照片");
+		}
+		return ResultGenerator.genSuccessResult(result);
+	}
+	
+	
+	
+
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/jft/JftPayDataDTO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/jft/JftPayDataDTO.java
new file mode 100644
index 0000000..fd37769
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/jft/JftPayDataDTO.java
@@ -0,0 +1,63 @@
+package cn.pluss.platform.dto.jft;
+
+import cn.pluss.platform.exception.MsgException;
+import lombok.Data;
+
+/**
+ * TODO
+ * 缴费通发起支付请求参数封装
+ * @author crystal
+ * @date 2022/6/24 19:16
+ */
+@Data
+public class JftPayDataDTO {
+
+    /**
+     * 支付用户ID
+     */
+    private String payUserId;
+
+    private String name;
+
+    private String phone;
+
+    private String goods;
+
+    private String address;
+
+    /**
+     * 收款人名称
+     */
+    private String cName;
+
+    /**
+     * 收款人手机号
+     */
+    private String cPhone;
+
+    /**
+     * tk
+     */
+    private String tk;
+
+    /**
+     * 城市
+     */
+    private String city;
+
+    /**
+     * 省份
+     */
+    private String province;
+
+    /**
+     * 校验参数
+     */
+    public void checkParams() {
+        MsgException.checkBlank(this.getTk(),"缺失tk必要参数!");
+        MsgException.checkBlank(this.getCName(),"收款人名称不能为空!");
+        MsgException.checkBlank(this.getCPhone(),"收款人手机号不能为空!");
+        MsgException.checkBlank(this.getPayUserId(),"支付用户ID不能为空!");
+        MsgException.checkBlank(this.getCity(),"请先授权位置信息!");
+    }
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/jft/JftReceiptOrderDTO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/jft/JftReceiptOrderDTO.java
new file mode 100644
index 0000000..a478363
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/jft/JftReceiptOrderDTO.java
@@ -0,0 +1,60 @@
+package cn.pluss.platform.dto.jft;
+
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.util.StringUtil;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * TODO
+ *
+ * @author crystal
+ * @date 2022/7/1 23:25
+ */
+@Data
+public class JftReceiptOrderDTO {
+
+    private String startDate;
+
+    private String endDate;
+
+    /**
+     * 支付状态 01：未支付 02：已支付
+     */
+    private String status;
+
+    private Long userId;
+
+    private String merchantCode;
+
+    private String subject;
+
+    private String city;
+
+    private String province;
+
+    private String mercOrderNo;
+
+    private String notifyUrl;
+
+    private BigDecimal orderAmt;
+
+    private String payType;
+
+    private String remark;
+
+    private String merchantName;
+
+    public void checkOrderParams() {
+//        MsgException.checkBlank(this.getMerchantCode(),"商户编号不能为空！");
+        MsgException.checkBlank(this.getSubject(),"订单标题不能为空！");
+        MsgException.checkBlank(this.getCity(),"下单用户所属城市不能为空！");
+        MsgException.checkBlank(this.getMercOrderNo(),"商户单号不能为空！");
+        MsgException.check(this.getMercOrderNo().length() < 10 || this.getMercOrderNo().length() > 50 ,"订单号过长，订单号长度应介于10-50位之间");
+        MsgException.checkBlank(this.getNotifyUrl(),"异步通知地址不能为空！");
+        MsgException.checkNull(this.getOrderAmt(),"订单金额不能为空");
+        MsgException.check(!StringUtil.isNumber(this.getOrderAmt().toString()),"订单金额格式有误，金额保留两位小数，单位元");
+        MsgException.checkBlank(this.getPayType(),"支付方式不能为空");
+    }
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/Account.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/Account.java
new file mode 100644
index 0000000..3c921ca
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/Account.java
@@ -0,0 +1,156 @@
+package cn.pluss.platform.entity;
+
+import cn.pluss.platform.config.mybatis.SqlConditionExtra;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 用户结算信息关联表
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-10-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@AllArgsConstructor
+@TableName("tb_pluss_account")
+public class Account implements Serializable {
+
+    public static final String CHANNEL_TYPE_D1 = "D1";
+    public static final String CHANNEL_TYPE_D0 = "D0";
+
+    /** 小微 */
+    public static final String SETTLE_TYPE_MICRO_STORE = "00";
+    /** 对私法人结算 */
+    public static final String SETTLE_TYPE_PRIVATE_LEGAL = "01";
+    /** 我是法人 */
+    public static final String IS_SELF_LEGAL = "1";
+    /** 我不是法人 */
+    public static final String NOT_SELF_LEGAL = "2";
+    /** 对私非法人结算 */
+    public static final String SETTLE_TYPE_PRIVATE_ILLEGAL = "02";
+    /** 对公结算 */
+    public static final String SETTLE_TYPE_CORPORATE = "03";
+
+    /** 对私法人-我是法人 */
+    public static final String LEGAL_PRIVATE_LEGAL = SETTLE_TYPE_PRIVATE_LEGAL + IS_SELF_LEGAL;
+    /** 对私法人-我不是法人*/
+    public static final String ILLEGAL_PRIVATE_LEGAL = SETTLE_TYPE_PRIVATE_LEGAL + NOT_SELF_LEGAL;
+    /** 对私非法人-我是法人*/
+    public static final String LEGAL_PRIVATE_ILLEGAL = SETTLE_TYPE_PRIVATE_ILLEGAL + IS_SELF_LEGAL;
+    /** 对私非法人-我不是法人*/
+    public static final String ILLEGAL_PRIVATE_ILLEGAL = SETTLE_TYPE_PRIVATE_ILLEGAL + NOT_SELF_LEGAL;
+
+    private static final long serialVersionUID = 1L;
+
+    public Account(String userId, String settleType, String idCardId, String bankCardId, String certificateUrl, String channelType) {
+        this.userId = userId;
+        this.settleType = settleType;
+        this.idCardId = idCardId;
+        this.bankCardId = bankCardId;
+        this.certificateUrl = certificateUrl;
+        this.channelType = channelType;
+    }
+
+    public Account() {
+        this.channelType = Account.CHANNEL_TYPE_D1;
+    }
+
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+
+    /**
+     * 用户id
+     */
+    @NotNull(message = "缺少用户id")
+    @TableField("userId")
+    private String userId;
+
+    /**
+     * 非法人授权书
+     */
+    @TableField("certificateUrl")
+    private String certificateUrl;
+
+    /**
+     * 结算类型，01：对私法人；02：对私非法人；03：对公。
+     * 返回给前端显示的则有, 00 小微商户, 011法人对私法人，012非法人对私法人, 021法人对私非法人，022非法人对私非法人，03：对公
+     */
+    @TableField("settleType")
+    private String settleType;
+
+
+    /**
+     * 身份证id
+     */
+    @TableField("idCardId")
+    private String idCardId;
+
+
+    /**
+     * 银行卡id
+     */
+    @TableField("bankCardId")
+    private String bankCardId;
+
+    /**
+     * D0、D1
+     * 默认值D1
+     */
+    @TableField(value = "channelType", fill = FieldFill.INSERT)
+    private String channelType;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT, whereStrategy = FieldStrategy.NEVER)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.GT)
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.LT)
+    private Date createTimeEnd;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "updateTime", fill = FieldFill.INSERT_UPDATE, whereStrategy = FieldStrategy.NEVER)
+    private Date updateTime;
+
+    /**
+     * 更新时间 开始时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.GT)
+    private Date updateTimeStart;
+
+    /**
+     * 更新时间 截止时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.LT)
+    private Date updateTimeEnd;
+
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private JSONObject bak;
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/ActivityActivate.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/ActivityActivate.java
new file mode 100644
index 0000000..4a67e32
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/ActivityActivate.java
@@ -0,0 +1,29 @@
+package cn.pluss.platform.entity;
+
+import  java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+@Data
+public class ActivityActivate {
+
+    @TableId
+    private Integer id;
+    private Integer userId;
+    private String merchantCode;
+    private String merchantName;
+    private Double giveMoney;
+    private String storeId;
+    private String storeName;
+    private String name;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date createDt;
+    private String posterUrl;
+
+    @TableField(exist = false)
+    private  String type;
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/ActivityConsumReturn.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/ActivityConsumReturn.java
new file mode 100644
index 0000000..3b598e3
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/ActivityConsumReturn.java
@@ -0,0 +1,33 @@
+package cn.pluss.platform.entity;
+
+import  java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+@Data
+public class ActivityConsumReturn {
+
+    @TableId
+    private Integer id;
+    private Integer userId;
+    private String merchantCode;
+    private String merchantName;
+    private String storeId;
+    private String storeName;
+    private String name;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date createDt;
+    private Integer type;
+    private Double comsumeMoney;
+    private Double returnMoney;
+    private Double percent;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date startDt;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date endDt;
+    private Integer timeType;
+    private String posterUrl;
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/ActivityEnroll.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/ActivityEnroll.java
new file mode 100644
index 0000000..b1fc383
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/ActivityEnroll.java
@@ -0,0 +1,127 @@
+package cn.pluss.platform.entity;
+
+import cn.pluss.platform.config.mybatis.SqlConditionExtra;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 商户活动报名记录表
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-11-02
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_activity_enroll")
+public class ActivityEnroll implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Integer id;
+
+
+    /**
+     * 商户编号
+     */
+    @TableField(value = "merchantCode",whereStrategy = FieldStrategy.NOT_EMPTY)
+    private String merchantCode;
+
+
+    /**
+     * 商户名称
+     */
+    @TableField(value = "merchantName",whereStrategy = FieldStrategy.NOT_EMPTY,condition = SqlCondition.LIKE)
+    private String merchantName;
+
+
+    /**
+     * 报名活动名称
+     */
+    @TableField("actName")
+    private String actName;
+
+
+    /**
+     * 报名活动id
+     */
+    @TableField("actId")
+    private Integer actId;
+
+
+    /**
+     * 报名状态，0：申请中 1:通过 2：驳回
+     */
+    @TableField("status")
+    private String status;
+
+    /**
+     * 活动类型
+     */
+    @TableField("actType")
+    private String actType;
+
+    /**
+     * 驳回原因
+     */
+    @TableField("remark")
+    private String remark;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 审核时间
+     */
+    @TableField(value = "auditTime")
+    private Date auditTime;
+
+    /**
+     * 设备编号
+     */
+    @TableField(value = "deviceNo",whereStrategy = FieldStrategy.NOT_EMPTY)
+    private String deviceNo;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.GT)
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.LT)
+    private Date createTimeEnd;
+
+    /**
+     * 修改时间
+     */
+    @TableField(value = "updateTime", fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    /**
+     * 修改时间 开始时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.GT)
+    private Date updateTimeStart;
+
+    /**
+     * 修改时间 截止时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.LT)
+    private Date updateTimeEnd;
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/ActivityRecharge.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/ActivityRecharge.java
new file mode 100644
index 0000000..c9f0337
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/ActivityRecharge.java
@@ -0,0 +1,44 @@
+package cn.pluss.platform.entity;
+
+import  java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+@Data
+public class ActivityRecharge {
+
+    @TableId
+    private Integer id;
+    private Integer userId;
+    private String merchantCode;
+    private String merchantName;
+    private Double rechargeMoney;
+    private Double giveMoney;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date startDt;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date endDt;
+    private String name;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date createDt;
+    private Integer timeType;
+    private String storeId;
+    private String storeName;
+    private String posterUrl;
+
+	@Override
+	public String toString() {
+		return "ActivityRecharge [id=" + id + ", userId=" + userId + ", merchantCode=" + merchantCode
+				+ ", merchantName=" + merchantName + ", rechargeMoney=" + rechargeMoney + ", giveMoney=" + giveMoney
+				+ ", startDt=" + startDt + ", endDt=" + endDt + ", name=" + name + ", createDt=" + createDt
+				+ ", timeType=" + timeType + ", storeId=" + storeId + ", storeName=" + storeName + ", posterUrl="
+				+ posterUrl + "]";
+	}
+	
+	
+	
+    
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/ActivityRecommend.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/ActivityRecommend.java
new file mode 100644
index 0000000..4e2d201
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/ActivityRecommend.java
@@ -0,0 +1,24 @@
+package cn.pluss.platform.entity;
+
+import  java.util.Date;
+
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+@Data
+public class ActivityRecommend {
+
+    private Integer id;
+    private Integer userId;
+    private String name;
+    private Double firstMixRechargeMoney;
+    private Double recommendMoney;
+    private String merchantCode;
+    private String merchantName;
+    private String storeId;
+    private String storeName;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date createDt;
+    private String posterUrl;
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/Agreement.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/Agreement.java
new file mode 100644
index 0000000..25f04a6
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/Agreement.java
@@ -0,0 +1,25 @@
+package cn.pluss.platform.entity;
+
+import  java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+@Data
+public class Agreement {
+
+    @TableId
+    private Integer id;
+    private String name;
+    private String content;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date createDt;
+    private String createor;
+    
+    /**
+     * 协议标识
+     */
+    private String discern;
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/AliMcc.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/AliMcc.java
new file mode 100644
index 0000000..c87a6af
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/AliMcc.java
@@ -0,0 +1,17 @@
+package cn.pluss.platform.entity;
+
+import lombok.Data;
+
+/**
+ * @author yuchen
+ *
+ * @Description 
+ */
+@Data
+public class AliMcc {
+	
+	private Integer id;
+	
+	private String mccCode;
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/AppGuide.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/AppGuide.java
new file mode 100644
index 0000000..e45e2f3
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/AppGuide.java
@@ -0,0 +1,92 @@
+package cn.pluss.platform.entity;
+
+import cn.pluss.platform.config.mybatis.SqlConditionExtra;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * app引导页
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-06-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_app_guide")
+public class AppGuide implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Integer id;
+
+
+    /**
+     * 页面code
+     */
+    @TableField("code")
+    private String code;
+
+
+    /**
+     * 页面名称
+     */
+    @TableField("name")
+    private String name;
+
+
+    /**
+     * 内容
+     */
+    @TableField("content")
+    private String content;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.GT)
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.LT)
+    private Date createTimeEnd;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "updateTime", fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    /**
+     * 更新时间 开始时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.GT)
+    private Date updateTimeStart;
+
+    /**
+     * 更新时间 截止时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.LT)
+    private Date updateTimeEnd;
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/AppMenu.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/AppMenu.java
new file mode 100644
index 0000000..bbfeb32
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/AppMenu.java
@@ -0,0 +1,238 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.apache.commons.lang3.StringUtils;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * app页面菜单
+ * </p>
+ *
+ * CREATE TABLE `tb_pluss_app_menu` (
+ *   `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'id',
+ *   `name` varchar(20) DEFAULT NULL COMMENT '菜单名称',
+ *   `code` varchar(20) DEFAULT NULL COMMENT '菜单code',
+ *   `icon` varchar(255) DEFAULT NULL COMMENT '图标链接',
+ *   `menu_group` varchar(11) DEFAULT NULL COMMENT '分组id',
+ *   `nav_code` varchar(10) DEFAULT NULL COMMENT '导航code',
+ *   `nav_name` varchar(255) DEFAULT NULL COMMENT '导航名称',
+ *   `url` varchar(150) DEFAULT NULL COMMENT 'url链接，分组即不存在',
+ *   `sort` tinyint(4) DEFAULT NULL COMMENT '排序',
+ *   `visible` varchar(1) DEFAULT '1' COMMENT '是否展示，0：不展示；1：展示',
+ *   `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+ *   `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+ *   PRIMARY KEY (`id`)
+ * ) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8 COMMENT='app页面菜单';
+ *
+ * @author Djh
+ * @since 2020-09-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_app_menu")
+public class AppMenu implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 菜单类型
+     */
+    @TableField(exist = false)
+    private String menuType;
+
+    public static void wrapper(AppMenu entity) {
+        if ("1".equals(entity.getIsApplets())) {
+            entity.setMenuType("2");
+            return;
+        }
+
+        if ("1".equals(entity.isUniapp)) {
+            entity.setMenuType("3");
+            return;
+        }
+
+        if (!StringUtils.isEmpty(entity.getUrl()) && entity.getUrl().startsWith("http")) {
+            entity.setMenuType("1");
+            return;
+        }
+
+        entity.setMenuType("0");
+    }
+
+
+    public static void setByMenuType(AppMenu entity) {
+        switch (entity.getMenuType()) {
+            case "0":
+                entity.setIsApplets("0");
+                entity.setIsUniapp("0");
+                entity.setUrl("");
+                break;
+            case "1":
+                entity.setIsApplets("0");
+                entity.setIsUniapp("0");
+                break;
+            case "2":
+                entity.setUrl("");
+                entity.setIsApplets("1");
+                entity.setIsUniapp("0");
+                break;
+            case "3":
+                entity.setUrl("");
+                entity.setIsApplets("0");
+                entity.setIsUniapp("1");
+                break;
+            default:
+                break;
+        }
+    }
+
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 分组
+     */
+    @TableField(value = "menu_group", whereStrategy = FieldStrategy.NOT_EMPTY)
+    private String menuGroup;
+
+    /**
+     * 分组名称
+     */
+    @TableField(exist = false)
+    private String menuGroupDesc;
+
+    /**
+     * 菜单名称
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 菜单code
+     */
+    @NotEmpty(message = "菜单code不能为空")
+    @TableField("code")
+    private String code;
+
+    /**
+     * 图标链接
+     */
+    @NotEmpty(message = "图标链接不能为空")
+    @TableField("icon")
+    private String icon;
+
+    /**
+     * 导航code
+     */
+    @NotEmpty(message = "导航code不能为空")
+    @TableField(value = "nav_code", whereStrategy = FieldStrategy.NOT_EMPTY)
+    private String navCode;
+
+    /**
+     * 导航名称
+     */
+    @TableField("nav_name")
+    private String navName;
+
+    /**
+     * url链接
+     */
+    @TableField("url")
+    private String url;
+
+    /**
+     * 是否是uniapp
+     */
+    @TableField("isUniapp")
+    private String isUniapp;
+
+    /**
+     * 排序
+     */
+    @TableField("sort")
+    private Integer sort;
+
+    /**
+     * 是否展示，0：不展示；1：展示
+     */
+    @NotEmpty(message = "是否展示必填")
+    @TableField("visible")
+    private String visible;
+
+    /**
+     * 是否小程序 0否 1是
+     */
+    @TableField("isApplets")
+    private String isApplets;
+
+    /**
+     * 小程序原始id 类似gh_xxxxx
+     */
+    @TableField("userName")
+    private String userName;
+
+    /**
+     * 跳转小程序路径, 或者uniapp链接
+     */
+    @TableField("path")
+    private String path;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    @TableField(exist = false, condition = "create_time &gt; #{%s}")
+    private Date createTimeStart;
+
+    @TableField(exist = false, condition = "create_time &lt; #{%s}")
+    private Date createTimeEnd;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    @TableField(exist = false, condition = "update_time &gt; #{%s}")
+    private Date updateTimeStart;
+
+    @TableField(exist = false, condition = "update_time &lt; #{%s}")
+    private Date updateTimeEnd;
+
+    @TableField(exist = false)
+    private AppMenuUserType appMenuUserType;
+
+
+    /**
+     * 安卓是否显示
+     */
+    private String isAndroidEnabled;
+
+    /**
+     * ios 是否显示
+     */
+    private String isIphoneEnabled;
+
+    /**
+     * 安卓最低适用版本
+     */
+    private String androidMinVersionName;
+
+    /**
+     * ios适用最低版本
+     */
+    private String iosMinVersionName;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/AppMenuUserType.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/AppMenuUserType.java
new file mode 100644
index 0000000..b8107bb
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/AppMenuUserType.java
@@ -0,0 +1,24 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Data
+public class AppMenuUserType {
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+    @TableField("nav_code")
+    private String navCode;
+    private String dictValue;
+    private String name;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/AppVersionInfo.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/AppVersionInfo.java
new file mode 100644
index 0000000..bc48429
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/AppVersionInfo.java
@@ -0,0 +1,46 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+@Data
+@ApiModel("app版本信息")
+@Accessors(chain = true)
+public class AppVersionInfo {
+
+    @TableId
+    @ApiModelProperty("id")
+    private int id;
+
+    @ApiModelProperty("平台-0: android; 1: iOS")
+    private int platformCode;
+
+    @ApiModelProperty("android或iOS")
+    private String platformName;
+
+    @ApiModelProperty("版本code")
+    private int versionCode;
+
+    @ApiModelProperty("版本名称，也称版本号")
+    private String versionName;
+
+    @ApiModelProperty("下载链接，iOS可以无视")
+    private String url;
+
+    @ApiModelProperty("更新信息")
+    private String updateInfo;
+
+    @ApiModelProperty("是否强制更新")
+    private int forceUpdate;
+
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/AppletInfo.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/AppletInfo.java
new file mode 100644
index 0000000..c521737
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/AppletInfo.java
@@ -0,0 +1,81 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 小程序配置信息
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-04-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_applet_info")
+public class AppletInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId("id")
+    private Integer id;
+
+
+    /**
+     * 小程序APPID
+     */
+    @TableField("appid")
+    private String appid;
+
+    /**
+     * 小程序原始ID
+     */
+    @TableField("ghId")
+    private String ghId;
+
+    /**
+     * 小程序密钥
+     */
+    @TableField("secret")
+    private String secret;
+
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(exist = false, condition = "createTime &gt; #{%s}")
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(exist = false, condition = "createTime &lt; #{%s}")
+    private Date createTimeEnd;
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/Area.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/Area.java
new file mode 100644
index 0000000..dbe7002
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/Area.java
@@ -0,0 +1,18 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+@Data
+public class Area {
+
+    @TableId
+    private Integer f_area_no;
+    private String f_area_name;
+    private String f_aliasa;
+    private Integer f_area_cups_no;
+    private Integer f_city_no;
+    private String f_x;
+    private String f_y;
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/AreaCity.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/AreaCity.java
new file mode 100644
index 0000000..758f291
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/AreaCity.java
@@ -0,0 +1,35 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+@Data
+@ApiModel("城市区域信息")
+@Accessors(chain = true)
+public class AreaCity {
+
+    @TableId
+    @ApiModelProperty("id")
+    private Integer id;
+
+    @ApiModelProperty("type")
+    private String type;
+
+    @ApiModelProperty("areaName")
+    private String areaName;
+
+    @ApiModelProperty("parentAreaCode")
+    private String parentAreaCode;
+
+    @ApiModelProperty("areaCode")
+    private String areaCode;
+
+    @TableField(exist =  false)
+    private List<AreaCity> areaCityList;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/Bank4Cache.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/Bank4Cache.java
new file mode 100644
index 0000000..790426f
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/Bank4Cache.java
@@ -0,0 +1,98 @@
+package cn.pluss.platform.entity;
+
+import cn.pluss.platform.config.mybatis.SqlConditionExtra;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 银行卡四要素缓存信息
+ */
+@TableName("tb_pluss_bank4_cache")
+@Data
+public class Bank4Cache {
+
+    public static final String STATUS_FAIL = "00";
+
+    public static final String STATUS_PASS = "01";
+
+    /**
+     * id
+     */
+    @TableId
+    private Integer id;
+
+    /**
+     * 姓名
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 手机号
+     */
+    @TableField("phone")
+    private String phone;
+
+    /**
+     * 身份证号
+     */
+    @TableField("idCardNo")
+    private String idCardNo;
+
+    /**
+     * 银行卡号
+     */
+    @TableField("bankCardNo")
+    private String bankCardNo;
+
+    /**
+     * 状态
+     */
+    @TableField("status")
+    private String status;
+
+    /**
+     * 备注信息
+     */
+    @TableField("remark")
+    private String remark;
+
+    @TableField("createTime")
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.GT,
+            insertStrategy = FieldStrategy.NEVER, updateStrategy = FieldStrategy.NEVER)
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.LT,
+            insertStrategy = FieldStrategy.NEVER, updateStrategy = FieldStrategy.NEVER)
+    private Date createTimeEnd;
+
+    @TableField("updateTime")
+    private Date updateTime;
+
+    /**
+     * 更新时间 开始时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.GT,
+            insertStrategy = FieldStrategy.NEVER, updateStrategy = FieldStrategy.NEVER)
+    private Date updateTimeStart;
+
+    /**
+     * 更新时间 截止时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.LT,
+            insertStrategy = FieldStrategy.NEVER, updateStrategy = FieldStrategy.NEVER)
+    private Date updateTimeEnd;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/BankCard.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/BankCard.java
new file mode 100644
index 0000000..b7346fc
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/BankCard.java
@@ -0,0 +1,202 @@
+package cn.pluss.platform.entity;
+
+import cn.hutool.core.util.DesensitizedUtil;
+import cn.pluss.platform.config.mybatis.SqlConditionExtra;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 银行卡信息
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-10-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_bank_card")
+public class BankCard implements Serializable, Cloneable {
+
+    /**
+     * 对私账户
+     */
+    public static final String ACCOUNT_TYPE_PRIVATE = "01";
+
+    /**
+     * 对公账户
+     */
+    public static final String ACCOUNT_TYPE_CORPORATE = "02";
+
+    /**
+     * 实名认证
+     */
+    public static final String ACCOUNT_TYPE_CERT = "03";
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 用户id
+     */
+    @NotEmpty(message = "缺少userId", groups = {BankCard.class})
+    @TableField("userId")
+    private String userId;
+
+    /**
+     * 银行卡持有人/开户名
+     */
+    @TableField("bankHolder")
+    private String bankHolder;
+
+    /**
+     * 银行卡号
+     */
+    @NotEmpty(message = "请输入银行卡", groups = {BankCard.class})
+    @TableField("bankCardNo")
+    private String bankCardNo;
+
+
+    /**
+     * 开户行
+     */
+    @NotEmpty(message = "请输入开户行", groups = {BankCard.class})
+    @TableField("bankName")
+    private String bankName;
+
+
+    /**
+     * 开户支行名称
+     */
+    @NotEmpty(message = "请输入开户支行名称", groups = {BankCard.class})
+    @TableField("branchName")
+    private String branchName;
+
+
+    /**
+     * 01：对私账户（自然人只对私、个体工商户可选）; 02：对公账户; 03 实名认证
+     */
+    @NotEmpty(message = "请选择账户类型", groups = {BankCard.class})
+    @TableField("accountType")
+    private String accountType;
+
+
+    /**
+     * 联行号
+     */
+    @NotEmpty(message = "请输入开户支行联行号", groups = {BankCard.class})
+    @TableField("contactLine")
+    private String contactLine;
+
+
+    /**
+     * 开户支行所在省
+     */
+    @NotEmpty(message = "请选择开户省", groups = {BankCard.class})
+    @TableField("branchProvince")
+    private String branchProvince;
+
+
+    /**
+     * 开户支行所在市
+     */
+    @NotEmpty(message = "请选择开户市", groups = {BankCard.class})
+    @TableField("branchCity")
+    private String branchCity;
+
+
+    /**
+     * 开户支行所在区
+     */
+    @NotEmpty(message = "请选择开户区", groups = {BankCard.class})
+    @TableField("branchArea")
+    private String branchArea;
+
+    /**
+     * 开户省市区编码
+     */
+    @TableField("bankAddressNo")
+    private String bankAddressNo;
+
+
+    /**
+     * 银行卡预留手机号，企业名称
+     */
+    @NotEmpty(message = "银行卡预留手机号", groups = {BankCard.class})
+    @TableField("phone")
+    private String phone;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.GT)
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.LT)
+    private Date createTimeEnd;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "updateTime", fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    /**
+     * 更新时间 开始时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.GT)
+    private Date updateTimeStart;
+
+    /**
+     * 更新时间 截止时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.LT)
+    private Date updateTimeEnd;
+
+    /**
+     * 银行卡卡号面图片url
+     */
+    @NotEmpty(message = "银行卡卡号面图片", groups = {BankCard.class})
+    @TableField(value = "imgUrl", insertStrategy = FieldStrategy.NOT_EMPTY, updateStrategy = FieldStrategy.NOT_EMPTY)
+    private String imgUrl;
+
+    /**
+     * 开户许可证图片url
+     */
+    @TableField(value = "licenseUrl", insertStrategy = FieldStrategy.NOT_EMPTY, updateStrategy = FieldStrategy.NOT_EMPTY)
+    private String licenseUrl;
+
+    public static BankCard desensitized(BankCard bankCard) {
+        try {
+            BankCard newBankCard = (BankCard) bankCard.clone();
+            newBankCard.setPhone(DesensitizedUtil.mobilePhone(newBankCard.getPhone()));
+            newBankCard.setBankCardNo(DesensitizedUtil.bankCard(newBankCard.getBankCardNo()));
+            newBankCard.setBankHolder(DesensitizedUtil.chineseName(newBankCard.getBankHolder()));
+
+            return newBankCard;
+        } catch (CloneNotSupportedException ignored) {
+            return null;
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/BankCodeSxf.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/BankCodeSxf.java
new file mode 100644
index 0000000..a1fc998
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/BankCodeSxf.java
@@ -0,0 +1,41 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+public class BankCodeSxf {
+
+    @TableId
+    private Integer id;
+
+    @TableField("bank_code")
+    private String bankCode;
+
+    @TableField("cnaps_code")
+    private String cnapsCode;
+
+    @TableField("cnaps_name")
+    private String cnapsName;
+
+    @TableField("bank_name")
+    private String bankName;
+
+    @TableField("org_code")
+    private String orgCode;
+
+    @TableField("province_code")
+    private String provinceCode;
+
+    @TableField("province_name")
+    private String provinceName;
+
+    @TableField("city_code")
+    private String cityCode;
+
+    @TableField("city_name")
+    private String cityName;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/BankCodeYs.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/BankCodeYs.java
new file mode 100644
index 0000000..eb9a55f
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/BankCodeYs.java
@@ -0,0 +1,47 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-07-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_bank_code_ys")
+public class BankCodeYs implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableField("contactLine")
+    private String contactLine;
+
+
+    @TableField("branchName")
+    private String branchName;
+
+
+    @TableField("bankType")
+    private String bankType;
+
+
+    @TableField("bankName")
+    private String bankName;
+
+
+    @TableField("cityCode")
+    private String cityCode;
+
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/BankUnionpayCode.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/BankUnionpayCode.java
new file mode 100644
index 0000000..b51646f
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/BankUnionpayCode.java
@@ -0,0 +1,20 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+@Data
+public class BankUnionpayCode {
+
+    private String f_bank_area;
+    private String f_bank_city;
+    private String f_cft_area_code;
+    private String f_cft_city_code;
+    @TableId
+    private String f_unionpay_code;
+    private String f_branch_name;
+    private String f_bank_name;
+    private String f_x;
+    private String f_y;
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/Banner.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/Banner.java
new file mode 100644
index 0000000..ae53b59
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/Banner.java
@@ -0,0 +1,17 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+@Data
+public class Banner {
+
+    @TableId
+    private Integer id;
+    private String picUrl;
+    private Integer seq;
+    private String jumpUrl;
+    private String type;
+    private String status;
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/BestNewActivity.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/BestNewActivity.java
new file mode 100644
index 0000000..7374aea
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/BestNewActivity.java
@@ -0,0 +1,69 @@
+package cn.pluss.platform.entity;
+
+import  java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * @author djh
+ */
+@Data
+public class BestNewActivity {
+
+    @TableId
+    private Integer id;
+    private Integer seq;
+    private String title;
+    /**
+     * 标题配图
+     */
+    @TableField("`imgs`")
+    private String imgs;
+
+    /**
+     * 内容链接
+     */
+    private String url;
+
+    /**
+     * 简介，限制长度为50字
+     */
+    @TableField("`desc`")
+    private String desc;
+
+    /**
+     * 活动类别，1、(原推荐/攻略) 商户; 2、资讯; 3、活动；4、服务商(攻略)
+     */
+    private String type;
+
+    @TableField(exist = false)
+    private String[] typeArray;
+
+    /**
+     * 内容
+     */
+    private String content;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    private String updateor;
+
+    @TableField("`status`")
+    private String status;
+
+    /**
+     * 已读未读标识
+     */
+    @TableField(exist = false)
+    private Integer readStatus;
+
+    /**
+     * 是否推全部 1.推送 0不推送
+     */
+    @TableField(exist = false)
+    private String pushType;
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/BillSendRecord.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/BillSendRecord.java
new file mode 100644
index 0000000..d22a317
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/BillSendRecord.java
@@ -0,0 +1,135 @@
+package cn.pluss.platform.entity;
+
+import cn.pluss.platform.config.mybatis.SqlConditionExtra;
+import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-05-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_bill_send_record")
+public class BillSendRecord implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 用户
+     */
+    @TableField("userId")
+    private Long userId;
+
+
+    /**
+     * 开始时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    @TableField("startTime")
+    private Date startTime;
+
+    /**
+     * 开始时间 开始时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField(exist = false, condition = "startTime &gt; #{%s}")
+    private Date startTimeStart;
+
+    /**
+     * 开始时间 截止时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField(exist = false, condition = "startTime &lt; #{%s}")
+    private Date startTimeEnd;
+
+    /**
+     * 截止时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField("endTime")
+    private Date endTime;
+
+    /**
+     * 截止时间 开始时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField(exist = false, condition = "endTime &gt; #{%s}")
+    private Date endTimeStart;
+
+    /**
+     * 截止时间 截止时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField(exist = false, condition = "endTime &lt; #{%s}")
+    private Date endTimeEnd;
+
+    /**
+     * 目标邮箱，最多指定三个
+     */
+    @TableField("email")
+    private String email;
+
+
+    /**
+     * 状态。0：生成中; 1：生成成功、已发送; 2: 生成失败
+     */
+    @TableField("status")
+    private String status;
+
+    /**
+     * 创建时间
+     */
+    @TableField("createTime")
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.GT)
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.LT)
+    private Date createTimeEnd;
+
+    /**
+     * 更新时间
+     */
+    @TableField("updateTime")
+    private Date updateTime;
+
+    /**
+     * 更新时间 开始时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.GT)
+    private Date updateTimeStart;
+
+    /**
+     * 更新时间 截止时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.LT)
+    private Date updateTimeEnd;
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/CacheInfo.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/CacheInfo.java
new file mode 100644
index 0000000..ce7c88f
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/CacheInfo.java
@@ -0,0 +1,154 @@
+package cn.pluss.platform.entity;
+
+import cn.pluss.platform.wx.*;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 缓存信息表
+ * </p>
+ *
+ * @author bzg
+ * @since 2021-09-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_cache_info")
+public class CacheInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 缓存最大差值
+     * @date: 2021/11/30 16:27
+     */
+    public static final Long MAX_CRITICAL_VALUE = 200L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 特殊规则字符串组成，用与获取token
+     */
+    @TableField("keyCode")
+    private String keyCode;
+
+
+    /**
+     * appid
+     */
+    @TableField("appId")
+    private String appId;
+
+
+    /**
+     * appsercet
+     */
+    @TableField("appSercet")
+    private String appSercet;
+
+
+    /**
+     * accessToken
+     */
+    @TableField("accessToken")
+    private String accessToken;
+
+
+    /**
+     * 刷新token
+     */
+    @TableField("refreshToken")
+    private String refreshToken;
+
+
+    /**
+     * 过期时间
+     */
+    @TableField("expires_in")
+    private Long expiresIn;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(exist = false, condition = "createTime &gt; #{%s}")
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(exist = false, condition = "createTime &lt; #{%s}")
+    private Date createTimeEnd;
+
+    public CacheInfo(String appId, String appSercet, String keyCode,String token,Long expiresIn){
+        this.appId = appId;
+        this.appSercet = appSercet;
+        this.keyCode = keyCode;
+        this.accessToken = token;
+        this.expiresIn = expiresIn;
+    }
+
+    public CacheInfo(WxAccessTokenResponse response, WxAccessTokenRequest request, String keyCode){
+        this.appId = request.getAppid();
+        this.appSercet = request.getSecret();
+        this.keyCode = keyCode;
+        this.accessToken = response.getAccess_token();
+        this.expiresIn = (System.currentTimeMillis() / 1000) + response.getExpires_in();
+    }
+
+    public CacheInfo(WxOauth2AccessTokenResponse response, WxAccessTokenRequest request, String keyCode){
+        this.appId = request.getAppid();
+        this.appSercet = request.getSecret();
+        this.keyCode = keyCode;
+        this.accessToken = response.getAccess_token();
+        this.expiresIn = (System.currentTimeMillis() / 1000) + response.getExpires_in();
+        this.refreshToken = response.getRefresh_token();
+    }
+
+    public CacheInfo() {
+
+    }
+
+    public CacheInfo(WxOpenidResponse response, WxAccessTokenRequest request, String keyCode) {
+        this.appId = request.getAppid();
+        this.appSercet = request.getSecret();
+        this.keyCode = keyCode;
+        this.accessToken = response.getAccess_token();
+        this.expiresIn = (System.currentTimeMillis() / 1000) + response.getExpires_in();
+        this.refreshToken = response.getRefresh_token();
+    }
+    public CacheInfo(WxAccessTokenRequest request, String keyCode,String accessToken,Long expiresIn,String refreshToken) {
+        this.appId = request.getAppid();
+        this.appSercet = request.getSecret();
+        this.keyCode = keyCode;
+        this.accessToken = accessToken;
+        this.expiresIn = expiresIn;
+        this.refreshToken = refreshToken;
+    }
+
+    public CacheInfo(WxJsApiTicketResponse response, WxAccessTokenRequest request, String keyCode) {
+        this.appId = request.getAppid();
+        this.appSercet = request.getSecret();
+        this.keyCode = keyCode;
+        this.accessToken = response.getTicket();
+        this.expiresIn = (System.currentTimeMillis() / 1000) + response.getExpires_in();
+    }
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/CallbackData.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/CallbackData.java
new file mode 100644
index 0000000..f0af5e7
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/CallbackData.java
@@ -0,0 +1,40 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 表原始数据记录，用于不明确的回调数据的统计
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-09-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_callback_data")
+public class CallbackData implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Integer id;
+
+    /**
+     * 表名
+     */
+    @TableField("`table`")
+    private String table;
+
+    /**
+     * 原始数据
+     */
+    private String origin;
+
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/Cash.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/Cash.java
new file mode 100644
index 0000000..41c3cd1
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/Cash.java
@@ -0,0 +1,157 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author DJH
+ */
+@Data
+public class Cash {
+
+    /**
+     * 提现成功
+     */
+    public static final int STATUS_SUCCESS = 1;
+
+    /**
+     * 提现失败
+     */
+    public static final int STATUS_FAIL = 2;
+
+    /**
+     * 提现审核中
+     */
+    public static final int STATUS_CHECKING = 0;
+
+    /**
+     * 最小提现额度
+     */
+    public static final int MINIMUM_CASH = 10;
+
+    @TableId
+    private Long id;
+    private Long userId;
+    private String userName;
+    private String merchantCode;
+    private String merchantName;
+
+    /**
+     * 本次提现记录的支付宝账号名称
+     */
+    private String accountName;
+
+    /**
+     * 本次提现记录的支付宝账号
+     */
+    private String accountNo;
+
+    private BigDecimal cashAmt;
+    private Integer status;
+    private String reason;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date createDt;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date updateDt;
+    private String logo;
+    private String cashNumber;
+    private String backNo;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date backDt;
+    private String updator;
+    private Integer type;
+
+    /**
+     * 备注
+     */
+    @TableField(exist = false)
+    private String remark;
+
+    @TableField(exist = false)
+    private String phone;
+
+    /**
+     * 全部推广分润
+     */
+    @TableField(exist = false)
+    private BigDecimal totalProfit;
+
+    /**
+     * 全部粉丝分润
+     */
+    @TableField(exist = false)
+    private BigDecimal totalShareMoney;
+
+    /**
+     * 已提现金额
+     */
+    @TableField(exist = false)
+    private BigDecimal cashTotalAmt;
+
+    /**
+     * 用来接收搜索条件的起始时间
+     */
+    @TableField(exist = false)
+    private String beginTime;
+    @TableField(exist = false)
+    private String endTime;
+
+    /**
+     * 商户简称
+     */
+    @TableField(exist = false)
+    private String alias;
+    /**
+     * 支付宝账号
+     */
+    @TableField(exist = false)
+    private String aliAccount;
+    /**
+     * 银行卡号
+     */
+    @TableField(exist = false)
+    private String bankCardNo;
+
+    /**
+     * 支付密码
+     */
+    @TableField(exist = false)
+    private String payPassword;
+
+    /**
+     * 基本提现手续费
+     */
+    @TableField
+    private BigDecimal baseServiceCharge;
+
+    /**
+     * 比例提现手续费
+     */
+    @TableField
+    private BigDecimal ratioCharge;
+
+    /**
+     * 提现手续费比例(%)
+     */
+    @TableField(exist = false)
+    private int rate;
+
+    /**
+     * 总手续费
+     */
+    @TableField(insertStrategy = FieldStrategy.NEVER, updateStrategy = FieldStrategy.NEVER)
+    private BigDecimal virTotalCharge;
+
+    /**
+     * 实际到账金额
+     */
+    @TableField(insertStrategy = FieldStrategy.NEVER, updateStrategy = FieldStrategy.NEVER)
+    private BigDecimal virRealCashAmt;
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/CashAccount.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/CashAccount.java
new file mode 100644
index 0000000..7e0c1b4
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/CashAccount.java
@@ -0,0 +1,85 @@
+package cn.pluss.platform.entity;
+
+import cn.pluss.platform.config.mybatis.SqlConditionExtra;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author bzg
+ * @since 2021-07-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_cash_account")
+public class CashAccount implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 用户id
+     */
+    @NotNull(message = "缺少用户id")
+    @TableField(" userId")
+    private Integer userId;
+
+
+    /**
+     * 收款账号
+     */
+    @NotNull(message = "缺少收款账号")
+    @TableField(value = "accountNo",whereStrategy = FieldStrategy.NOT_EMPTY,condition = SqlCondition.LIKE)
+    private String accountNo;
+
+
+    /**
+     * 收款人名称
+     */
+    @NotNull(message = "缺少收款人名称")
+    @TableField(value = "accountName",whereStrategy = FieldStrategy.NOT_EMPTY,condition = SqlCondition.LIKE)
+    private String accountName;
+
+
+    /**
+     * 状态 1：正常 0：禁用
+     */
+    @TableField("status")
+    private Integer status;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.GT)
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.LT)
+    private Date createTimeEnd;
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/CommonRemark.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/CommonRemark.java
new file mode 100644
index 0000000..9d73a06
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/CommonRemark.java
@@ -0,0 +1,96 @@
+package cn.pluss.platform.entity;
+
+import cn.pluss.platform.config.mybatis.SqlConditionExtra;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 通用备注表，存储一些通用备注
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-06-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_common_remark")
+public class CommonRemark implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 用户id
+     */
+    @TableField("userId")
+    private Integer userId;
+
+
+    /**
+     * 备注内容
+     */
+    @TableField("remark")
+    private String remark;
+
+
+    /**
+     * 关联表数据id
+     */
+    @TableField("dataId")
+    private Integer dataId;
+
+
+    /**
+     * 关联表code
+     */
+    @TableField("code")
+    private String code;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.GT)
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.LT)
+    private Date createTimeEnd;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "updateTime", fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    /**
+     * 更新时间 开始时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.GT)
+    private Date updateTimeStart;
+
+    /**
+     * 更新时间 截止时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.LT)
+    private Date updateTimeEnd;
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/CommonSwitch.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/CommonSwitch.java
new file mode 100644
index 0000000..b1e1088
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/CommonSwitch.java
@@ -0,0 +1,50 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 通用开关表
+ * CREATE TABLE `tb_pluss_common_switch` (
+ *   `id` int(11) NOT NULL AUTO_INCREMENT,
+ *   `code` varchar(50) DEFAULT NULL COMMENT '对应字典表的code',
+ *   `name` varchar(50) DEFAULT NULL COMMENT '名称',
+ *   `value` varchar(50) DEFAULT NULL COMMENT '对应字典表子项的值',
+ *   `sort` int(11) DEFAULT NULL COMMENT '排序',
+ *   `createTime` datetime DEFAULT NULL COMMENT '创建时间',
+ *   `updateTime` datetime DEFAULT NULL COMMENT '更新时间',
+ *   PRIMARY KEY (`id`),
+ *   UNIQUE KEY `idx_code` (`code`)
+ * ) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8 COMMENT='开关表';
+ */
+@Data
+@Accessors(chain = true)
+public class CommonSwitch {
+
+    private Integer id;
+
+    private String name;
+
+    private String code;
+
+    private String value;
+
+    private Integer sort;
+
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    /**
+     * 可选项
+     */
+    @TableField(exist = false)
+    private List<Dict> alterList;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/Device.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/Device.java
new file mode 100644
index 0000000..4a38355
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/Device.java
@@ -0,0 +1,33 @@
+package cn.pluss.platform.entity;
+
+import  java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+@Data
+public class Device {
+
+    @TableId
+    private Integer id;
+    private String name;
+    private String matNo;
+    private String deviceLogo;
+    private String type;
+    private String introDesc;
+    private Integer seq;
+    private Integer status;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date createDt;
+    private String venderName;
+    private String venderCode;
+    private String venderModel;
+    private String aisleModel;
+    private Integer inventory;
+    private Double unitPrice;
+    private String detail;
+    private Date startTime;
+    private Date endTime;
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/DeviceBsj.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/DeviceBsj.java
new file mode 100644
index 0000000..ed47716
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/DeviceBsj.java
@@ -0,0 +1,57 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-05-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_device_bsj")
+public class DeviceBsj implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableField(value = "deviceNo")
+    private String deviceNo;
+
+
+    @TableField(value = "imei")
+    private String imei;
+
+
+    @TableField(value = "iccid")
+    private String iccid;
+
+
+    /**
+     * sim卡号
+     */
+    @TableField(value = "sim")
+    private String sim;
+
+
+    @TableField("snNo")
+    private String snNo;
+
+
+    /**
+     * 流量卡过期时间
+     */
+    @TableField("simExpireTime")
+    private Date simExpireTime;
+
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/DeviceDetail.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/DeviceDetail.java
new file mode 100644
index 0000000..4a73416
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/DeviceDetail.java
@@ -0,0 +1,163 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * [设备展示表]
+ * </p>
+ *
+ * @author bzg
+ * @since 2020-11-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_device_detail")
+public class DeviceDetail implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 对应商品表的code
+     */
+    @TableField(value = "code",whereStrategy = FieldStrategy.NOT_EMPTY)
+    private String code;
+
+    @TableField(exist = false)
+    private String codeDesc;
+
+
+    /**
+     * 设备唯一识别码
+     */
+    @TableField(value = "venderCode",whereStrategy = FieldStrategy.NOT_EMPTY)
+    private String venderCode;
+
+
+    @TableField("deviceLogo")
+    private String deviceLogo;
+
+
+    /**
+     * 厂家名称
+     */
+    @TableField(value = "venderName",whereStrategy = FieldStrategy.NOT_EMPTY,condition = SqlCondition.LIKE)
+    private String venderName;
+
+
+    /**
+     * 厂家型号
+     */
+    @TableField(value = "venderModel",whereStrategy = FieldStrategy.NOT_EMPTY)
+    private String venderModel;
+
+
+    /**
+     * 通道机器型号
+     */
+    @TableField(value = "aisleModel",whereStrategy = FieldStrategy.NOT_EMPTY)
+    private String aisleModel;
+
+
+    /**
+     * 设备类型
+     */
+    @TableField(value = "type",whereStrategy = FieldStrategy.NOT_EMPTY)
+    private String type;
+
+    /**
+     * 编码名称, 保存新的版本时候需要传名称
+     */
+    @TableField(exist = false)
+    private String typeDesc;
+
+    /**
+     * 库存分组
+     */
+    @TableField(value = "groupNo",whereStrategy = FieldStrategy.NOT_EMPTY)
+    private String groupNo;
+
+    /**
+     * 库存分组名称
+     */
+    @TableField(exist = false)
+    private String groupNoDesc;
+
+    /**
+     * 简介
+     */
+    @TableField("introDesc")
+    private String introDesc;
+
+    /**
+     * 排序
+     */
+    @TableField("seq")
+    private Integer seq;
+
+
+    /**
+     * 状态   是否显示  0 不显示  1 显示
+     */
+    @TableField(value = "status",whereStrategy = FieldStrategy.NOT_EMPTY)
+    private Integer status;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField("createDt")
+    private Date createDt;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(exist = false, condition = "createDt &gt; #{%s}")
+    private Date createDtStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(exist = false, condition = "createDt &lt; #{%s}")
+    private Date createDtEnd;
+
+    /**
+     * 单组数量
+     */
+    @TableField("size")
+    private Integer size;
+
+    /**
+     * 单价
+     */
+    @TableField("unitPrice")
+    private BigDecimal unitPrice;
+
+    /**
+     * 批发价
+     */
+    private BigDecimal wholesalePrice;
+
+    /**
+     * 批发价最低数量
+     */
+    private Integer wholesaleMinNum;
+
+    @TableField("detail")
+    private String detail;
+
+    @TableField(exist = false)
+    private BigDecimal weight;
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/DeviceGoodTag.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/DeviceGoodTag.java
new file mode 100644
index 0000000..f7853a3
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/DeviceGoodTag.java
@@ -0,0 +1,91 @@
+package cn.pluss.platform.entity;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 商品标签表
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-04-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_device_good_tag")
+public class DeviceGoodTag implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Integer id;
+
+
+    /**
+     * 标签编码
+     */
+    @TableField("tag")
+    private String tag;
+
+
+    /**
+     * 序号
+     */
+    @TableField("sort")
+    private Integer sort;
+
+
+    /**
+     * 创建时间
+     */
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @JSONField(serialize = false)
+    @TableField(exist = false, condition = "createTime &gt; #{%s}")
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @JSONField(serialize = false)
+    @TableField(exist = false, condition = "createTime &lt; #{%s}")
+    private Date createTimeEnd;
+
+    /**
+     * 更新时间
+     */
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    @TableField(value = "updateTime", fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    /**
+     * 更新时间 开始时间
+     */
+    @JSONField(serialize = false)
+    @TableField(exist = false, condition = "updateTime &gt; #{%s}")
+    private Date updateTimeStart;
+
+    /**
+     * 更新时间 截止时间
+     */
+    @JSONField(serialize = false)
+    @TableField(exist = false, condition = "updateTime &lt; #{%s}")
+    private Date updateTimeEnd;
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/DeviceGoods.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/DeviceGoods.java
new file mode 100644
index 0000000..80f2ab0
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/DeviceGoods.java
@@ -0,0 +1,134 @@
+package cn.pluss.platform.entity;
+
+import cn.pluss.platform.config.mybatis.SqlConditionExtra;
+import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 设备商品展示表
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-11-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_device_goods")
+public class DeviceGoods implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+
+    /**
+     * 设备商品code
+     */
+    @TableField("code")
+    private String code;
+
+    @TableField(exist = false)
+    private String codeName;
+
+    /**
+     * 设备商品名称
+     */
+    @TableField(value = "name",whereStrategy = FieldStrategy.NOT_EMPTY,condition = SqlCondition.LIKE)
+    private String name;
+
+
+    @TableField("deviceLogo")
+    private String deviceLogo;
+
+
+    /**
+     * 简介
+     */
+    @TableField("introDesc")
+    private String introDesc;
+
+
+    /**
+     * 排序
+     */
+    @TableField("sort")
+    private Integer sort;
+
+    /**
+     * 详情
+     */
+    @TableField("detail")
+    private String detail;
+
+
+    @TableField("tagId")
+    private Integer tagId;
+
+    @TableField(exist = false)
+    private String tag;
+
+    /**
+     * 状态   是否显示  0 不显示  1 显示
+     */
+    @TableField(value = "status",whereStrategy = FieldStrategy.NOT_EMPTY)
+    private Integer status;
+
+
+    /**
+     * 押金购买标识，1：可以押金购买
+     */
+    @TableField(value = "depositFlag")
+    private String depositFlag;
+
+
+    /**
+     * 创建时间
+     */
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JSONField(format = "yyyy-MM-dd hh:mm:ss")
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.GT)
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.LT)
+    private Date createTimeEnd;
+
+    /**
+     * 更新时间
+     */
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JSONField(format = "yyyy-MM-dd hh:mm:ss")
+    @TableField(value = "updateTime", fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    /**
+     * 更新时间 开始时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.GT)
+    private Date updateTimeStart;
+
+    /**
+     * 更新时间 截止时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.LT)
+    private Date updateTimeEnd;
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/DeviceMerchantBuy.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/DeviceMerchantBuy.java
new file mode 100644
index 0000000..e301dbe
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/DeviceMerchantBuy.java
@@ -0,0 +1,79 @@
+package cn.pluss.platform.entity;
+
+import  java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+@Data
+public class DeviceMerchantBuy {
+
+    @TableId
+    private Integer id;
+    private String orderNo;
+    private String transNo;
+    private Double orderAmount;
+    private String merchantCode;
+    private String merchantName;
+    private String venderCode;
+    private String venderModel;
+    private String status;
+    private String payCode;
+    private String payName;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date createDt;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date transDt;
+    private String refundNo;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date refundDt;
+    private String expressNo;
+    private String provinces;
+    private String address;
+    private Integer quantity;
+    private String linkName;
+    private String linkPhone;
+    private String email;
+    //激活状态
+    private String actStatus;
+    @TableField(exist = false)
+    private String alias;
+    @TableField(exist = false)
+    private String userId;
+
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @TableField(exist = false)
+    private Date startTime;
+
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @TableField(exist = false)
+    private Date endTime;
+    private String snNo;
+
+    /**
+     * 上送物流单号
+     * @date: 2022/2/25 15:18
+     */
+    private String logistNo;
+
+    /**
+     * 商品名称
+     */
+    @TableField(exist = false)
+    private String name;
+
+    /**
+     * 商品code
+     */
+    @TableField(exist = false)
+    private String code;
+
+    /**
+     * 设备类型
+     */
+    @TableField(exist = false)
+    private String deviceType;
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/DeviceMerchantBuyDetail.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/DeviceMerchantBuyDetail.java
new file mode 100644
index 0000000..4d8826e
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/DeviceMerchantBuyDetail.java
@@ -0,0 +1,14 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+@Data
+public class DeviceMerchantBuyDetail {
+
+    @TableId
+    private Integer id;
+    private String orderNo;
+    private String soleCode;
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/DeviceOperateInfo.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/DeviceOperateInfo.java
new file mode 100644
index 0000000..5fb4c57
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/DeviceOperateInfo.java
@@ -0,0 +1,88 @@
+package cn.pluss.platform.entity;
+
+import cn.pluss.platform.enums.DeviceOperateType;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 设备信息流转表
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-04-02
+ */
+@Data
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_device_operate_info")
+public class DeviceOperateInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 设备号
+     */
+    @TableField("deviceNo")
+    private String deviceNo;
+
+
+    /**
+     * 操作类型 00 ：入库 01：划拨 02：接收 03：绑定 04：解绑 05：购买
+     */
+    @TableField("type")
+    private String type;
+
+
+    /**
+     * 操作用户ID
+     */
+    @TableField("userId")
+    private Long userId;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(exist = false, condition = "createTime &gt; #{%s}")
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(exist = false, condition = "createTime &lt; #{%s}")
+    private Date createTimeEnd;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    protected String remark;
+
+
+    public DeviceOperateInfo(UserApp userApp, String type,String deviceNo,String remark) {
+        this.deviceNo = deviceNo;
+        this.remark = remark;
+        this.type = type;
+        if(userApp != null){
+            this.userId = userApp.getUserId();
+        }
+    }
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/DeviceOrderInfo.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/DeviceOrderInfo.java
new file mode 100644
index 0000000..422ed79
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/DeviceOrderInfo.java
@@ -0,0 +1,142 @@
+package cn.pluss.platform.entity;
+
+import cn.pluss.platform.config.mybatis.SqlConditionExtra;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 设备商城，订单记录表
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-11-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_device_order_info")
+public class DeviceOrderInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId("id")
+    private Integer id;
+
+
+    /**
+     * 订单号
+     */
+    @TableField("orderNo")
+    private String orderNo;
+
+
+    /**
+     * 交易单号，来自服务商的订单号
+     */
+    @TableField("transNo")
+    private String transNo;
+
+
+    /**
+     * 用户id
+     */
+    @TableField("userId")
+    private String userId;
+
+
+    /**
+     * 设备code
+     */
+    @TableField("code")
+    private String code;
+
+    /**
+     * 订单状态
+     */
+    @TableField("`status`")
+    private String status;
+
+
+    /**
+     * 设备类型
+     */
+    @TableField("deviceType")
+    private String deviceType;
+
+    /**
+     * 订单类型，1：正常购买；2：押金购买
+     */
+    @TableField("orderType")
+    private String orderType;
+
+    /**
+     * 库存分组
+     */
+    @TableField("groupNo")
+    private String groupNo;
+
+
+    /**
+     * 购买数量
+     */
+    @TableField("num")
+    private Integer num;
+
+
+    /**
+     * 付款金额
+     */
+    @TableField("sumPrice")
+    private BigDecimal sumPrice;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.GT)
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.LT)
+    private Date createTimeEnd;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "updateTime", fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    /**
+     * 更新时间 开始时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.GT)
+    private Date updateTimeStart;
+
+    /**
+     * 更新时间 截止时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.LT)
+    private Date updateTimeEnd;
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/DeviceSignUnbind.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/DeviceSignUnbind.java
new file mode 100644
index 0000000..d9ee7d3
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/DeviceSignUnbind.java
@@ -0,0 +1,31 @@
+package cn.pluss.platform.entity;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+@Data
+public class DeviceSignUnbind {
+
+    @TableId
+    private Integer id;
+    private String orderNo;
+    private String soleCode;
+    private String venderCode;
+    private String venderModel;
+    private String sn;
+    private String merchantCode;
+    private String merchantName;
+    private String mchId;
+    private String status;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date createDt;
+    private String reason;
+
+    @TableField(exist = false)
+    private Integer userId;
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/DeviceSpec.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/DeviceSpec.java
new file mode 100644
index 0000000..de0a583
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/DeviceSpec.java
@@ -0,0 +1,132 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+/**
+ * <p>
+ * 设备规格表
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-03-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_device_spec")
+public class DeviceSpec implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    public static final String POSTAGE_NO = "01";
+
+    public static final String POSTAGE_YES = "00";
+
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 类型code，同步关联device_type同名字段
+     */
+    @TableField("code")
+    private String code;
+
+
+    /**
+     * 规格code
+     */
+    @TableField("spec")
+    private String spec;
+
+    /**
+     * 设备类型
+     * 1、主扫设备（商户扫顾客）；2、被扫设备（顾客扫商户）；3、其他
+     */
+    private String type;
+
+
+    /**
+     * 规格名称
+     */
+    @TableField("specName")
+    private String specName;
+
+
+    /**
+     * 规格描述
+     */
+    @TableField("specDesc")
+    private String specDesc;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(exist = false, condition = "createTime &gt; #{%s}")
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(exist = false, condition = "createTime &lt; #{%s}")
+    private Date createTimeEnd;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "updateTime", fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    /**
+     * 更新时间 开始时间
+     */
+    @TableField(exist = false, condition = "updateTime &gt; #{%s}")
+    private Date updateTimeStart;
+
+    /**
+     * 更新时间 截止时间
+     */
+    @TableField(exist = false, condition = "updateTime &lt; #{%s}")
+    private Date updateTimeEnd;
+
+    /**
+     * 创建人id
+     */
+    @TableField("creator")
+    private Integer creator;
+
+
+    /**
+     * 更新人id
+     */
+    @TableField("updater")
+    private Integer updater;
+
+    /**
+     * 是否包邮 00:包邮 01不包邮
+     */
+    @TableField(value = "postageFlag")
+    private String postageFlag;
+
+    /**
+     * 重量/kg
+     */
+    @TableField("`weight`")
+    private BigDecimal weight;
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/DeviceStock.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/DeviceStock.java
new file mode 100644
index 0000000..b5a761c
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/DeviceStock.java
@@ -0,0 +1,221 @@
+package cn.pluss.platform.entity;
+
+import cn.pluss.platform.config.mybatis.SqlConditionExtra;
+import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author bzg
+ * @since 2020-11-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_device_stock")
+public class DeviceStock implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 设备唯一编码，码牌即为二维码编号
+     */
+    @TableField(value = "snNo",whereStrategy = FieldStrategy.NOT_EMPTY)
+    private String snNo;
+
+    /**
+     * 厂家设备编号，音箱播报需要
+     */
+    @TableField(value = "deviceNo")
+    private String deviceNo;
+
+    /**
+     * code
+     */
+    @TableField(value = "code", whereStrategy = FieldStrategy.NOT_EMPTY)
+    private String code;
+
+
+    /**
+     * 设备购买单号
+     */
+    @TableField(value = "orderNo",whereStrategy = FieldStrategy.NOT_EMPTY)
+    private String orderNo;
+
+
+    /**
+     * 设备购买价格
+     */
+    @TableField("price")
+    private BigDecimal price;
+
+
+    /**
+     * 设备版本
+     */
+    @TableField(value = "type",whereStrategy = FieldStrategy.NOT_EMPTY)
+    private String type;
+
+    /**
+     * 库存分组
+     */
+    @TableField(value = "groupNo",whereStrategy = FieldStrategy.NOT_EMPTY)
+    private String groupNo;
+
+    /**
+     * 购买商家名称
+     */
+    @TableField(value = "buyMercName",whereStrategy = FieldStrategy.NOT_EMPTY,condition = SqlCondition.LIKE)
+    private String buyMercName;
+
+
+    /**
+     * 购买商家ID
+     */
+    @TableField(value = "buyMercId",whereStrategy = FieldStrategy.NOT_EMPTY)
+    private String buyMercId;
+
+
+    /**
+     * 激活商家名称
+     */
+    @TableField(value = "actMercName",whereStrategy = FieldStrategy.NOT_EMPTY,condition = SqlCondition.LIKE)
+    private String actMercName;
+
+
+    /**
+     * 激活商家ID
+     */
+    @TableField(value = "actMercId",whereStrategy = FieldStrategy.NOT_EMPTY)
+    private String actMercId;
+
+    @TableField(exist = false)
+    private String actUserId;
+
+    @TableField(exist = false)
+    private String buyUserId;
+
+
+    /**
+     * 二维码状态1：未出售，2：已出售 3:已激活
+     */
+    @TableField(value = "status",whereStrategy = FieldStrategy.NOT_EMPTY)
+    private String status;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "updateTime", fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.GT)
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.LT)
+    private Date createTimeEnd;
+
+    /**
+     * 创建人
+     */
+    @TableField("createBy")
+    private String createBy;
+
+
+    /**
+     * 删除标记1：正常2：删除
+     */
+    @TableField("delFlag")
+    private String delFlag;
+
+
+    /**
+     * 备注
+     */
+    @TableField("remarks")
+    private String remarks;
+
+    /**
+     *开始设备编号
+     */
+    @TableField(exist = false)
+    private String startSnNo;
+
+    /**
+     *结束设备编号
+     */
+    @TableField(exist = false)
+    private String endSnNo;
+
+    /**
+     * 归属用户ID 如果是商户直接从设备商城购买的问题
+     * 就显示当前使用用户ID
+     * 如果是直营团队那边的 就归属于上级ID
+     */
+    @TableField("belongUserId")
+    private Long belongUserId;
+
+    /**
+     * 提货人用户ID
+     */
+    @TableField("extractUserId")
+    private Long extractUserId;
+
+    /**
+     * 所属角色
+     */
+    @TableField("roleCode")
+    private String roleCode;
+
+    /**
+     * 入库时间
+     */
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    @TableField("inStockTime")
+    private Date inStockTime;
+
+
+    /**
+     * 划拨状态 划拨状态 01：待接收 其他表示已接收
+     */
+    @TableField("transferStatus")
+    private String transferStatus;
+
+    /**
+     * 绑定时间
+     */
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private Date bindTime;
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/DeviceStockGroup.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/DeviceStockGroup.java
new file mode 100644
index 0000000..98987f6
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/DeviceStockGroup.java
@@ -0,0 +1,67 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 库存分组表
+ */
+@Data
+@TableName("tb_pluss_device_stock_group")
+public class DeviceStockGroup {
+
+    @TableId
+    private Integer id;
+
+    @TableField("`groupCode`")
+    private String groupCode;
+
+    @TableField("`groupName`")
+    private String groupName;
+
+    @TableField("`desc`")
+    private String desc;
+
+    @TableField("`sort`")
+    private Integer sort;
+
+    @TableField("`createTime`")
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(exist = false, condition = "createTime &gt; #{%s}")
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(exist = false, condition = "createTime &lt; #{%s}")
+    private Date createTimeEnd;
+
+    @TableField("`updateTime`")
+    private Date updateTime;
+
+    /**
+     * 更新时间 开始时间
+     */
+    @TableField(exist = false, condition = "updateTime &gt; #{%s}")
+    private Date updateTimeStart;
+
+    /**
+     * 更新时间 截止时间
+     */
+    @TableField(exist = false, condition = "updateTime &lt; #{%s}")
+    private Date updateTimeEnd;
+
+    @TableField("`creator`")
+    private Integer creator;
+
+    @TableField("`updater`")
+    private Integer updater;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/DeviceTransfer.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/DeviceTransfer.java
new file mode 100644
index 0000000..ec7a482
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/DeviceTransfer.java
@@ -0,0 +1,124 @@
+package cn.pluss.platform.entity;
+
+import cn.pluss.platform.util.DateUtils;
+import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 设备划拨记录表
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-03-31
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_device_transfer")
+@NoArgsConstructor
+public class DeviceTransfer implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    public static final String STAY_ACCEPT = "00";
+
+    public static final String ALREADY_ACCEPT = "01";
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+
+    /**
+     * 划拨人用户Id
+     */
+    @TableField("userId")
+    private Long userId;
+
+
+    /**
+     * 接收人用户ID
+     */
+    @TableField("acceptUserId")
+    private Long acceptUserId;
+
+
+    /**
+     * 状态00:待接收 01：已接收
+     */
+    @TableField("status")
+    private String status;
+
+
+    /**
+     * 划拨时间
+     */
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    @TableField("transferTime")
+    private Date transferTime;
+
+    /**
+     * 划拨时间 开始时间
+     */
+    @TableField(exist = false, condition = "transferTime &gt; #{%s}")
+    private Date transferTimeStart;
+
+    /**
+     * 划拨时间 截止时间
+     */
+    @TableField(exist = false, condition = "transferTime &lt; #{%s}")
+    private Date transferTimeEnd;
+
+    /**
+     * 接收时间
+     */
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    @TableField("acceptTime")
+    private Date acceptTime;
+
+    /**
+     * 接收时间 开始时间
+     */
+    @TableField(exist = false, condition = "acceptTime &gt; #{%s}")
+    private Date acceptTimeStart;
+
+    /**
+     * 接收时间 截止时间
+     */
+    @TableField(exist = false, condition = "acceptTime &lt; #{%s}")
+    private Date acceptTimeEnd;
+
+    /**
+     * 划拨批次号
+     */
+    @TableField("batchNo")
+    private String batchNo;
+
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+
+    public DeviceTransfer(Long userId, Long acceptUserId,String batchNo,String status,Date accpetTime,String remark) {
+        this.userId = userId;
+        this.acceptUserId = acceptUserId;
+        this.transferTime = DateUtils.currentDate();
+        this.acceptTime = accpetTime;
+        this.batchNo = batchNo;
+        this.remark = remark;
+        this.status = status;
+    }
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/DeviceTransferDetail.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/DeviceTransferDetail.java
new file mode 100644
index 0000000..5af38e5
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/DeviceTransferDetail.java
@@ -0,0 +1,79 @@
+package cn.pluss.platform.entity;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 划拨详情表
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-03-31
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_device_transfer_detail")
+@NoArgsConstructor
+public class DeviceTransferDetail implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+
+    /**
+     * 划拨信息表ID
+     */
+    @TableField("tid")
+    private Long tid;
+
+
+    /**
+     * 设备SN号
+     */
+    @TableField("deviceNo")
+    private String deviceNo;
+
+
+    /**
+     * 创建时间
+     */
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(exist = false, condition = "createTime &gt; #{%s}")
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(exist = false, condition = "createTime &lt; #{%s}")
+    private Date createTimeEnd;
+
+    /**
+     * 划拨批次号
+     */
+    @TableField("batchNo")
+    private String batchNo;
+
+
+    public DeviceTransferDetail(DeviceTransfer transfer, String deviceNo) {
+        this.tid = transfer.getId();
+        this.batchNo = transfer.getBatchNo();
+        this.deviceNo = deviceNo;
+    }
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/DeviceType.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/DeviceType.java
new file mode 100644
index 0000000..53aa396
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/DeviceType.java
@@ -0,0 +1,113 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+/**
+ * <p>
+ * 设备类型表
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-03-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_device_type")
+public class DeviceType implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 类型code
+     */
+    @TableField("`code`")
+    private String code;
+
+
+    /**
+     * 名称、简称
+     */
+    @TableField("`name`")
+    private String name;
+
+
+    /**
+     * 描述
+     */
+    @TableField("`desc`")
+    private String desc;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "`createTime`", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(exist = false, condition = "createTime &gt; #{%s}")
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(exist = false, condition = "createTime &lt; #{%s}")
+    private Date createTimeEnd;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "`updateTime`", fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    /**
+     * 更新时间 开始时间
+     */
+    @TableField(exist = false, condition = "updateTime &gt; #{%s}")
+    private Date updateTimeStart;
+
+    /**
+     * 更新时间 截止时间
+     */
+    @TableField(exist = false, condition = "updateTime &lt; #{%s}")
+    private Date updateTimeEnd;
+
+    /**
+     * 创建人id
+     */
+    @TableField("`creator`")
+    private Integer creator;
+
+
+    /**
+     * 更新人id
+     */
+    @TableField("`updater`")
+    private Integer updater;
+
+    /**
+     * 设备商城划拨是否显示 显示设置1：显示 2：不显示
+     */
+    @TableField("showFlag")
+    private String showFlag;
+
+    /**
+     * 设备logo
+     */
+    @TableField("deviceLogo")
+    private String deviceLogo;
+
+    @TableField("payCodeFlag")
+    private String payCodeFlag;
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/DeviceVoiceBox.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/DeviceVoiceBox.java
new file mode 100644
index 0000000..3f3ef7e
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/DeviceVoiceBox.java
@@ -0,0 +1,130 @@
+package cn.pluss.platform.entity;
+
+import cn.pluss.platform.config.mybatis.SqlConditionExtra;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 智能音箱设备信息表
+ * </p>
+ *
+ * @author bzg
+ * @since 2020-11-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_device_voice_box")
+public class DeviceVoiceBox implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 音箱名称
+     */
+    @TableField(value = "boxName",whereStrategy = FieldStrategy.NOT_EMPTY,condition = SqlCondition.LIKE)
+    private String boxName;
+
+
+    /**
+     * 音箱编号
+     */
+    @TableField(value = "boxNo",whereStrategy = FieldStrategy.NOT_EMPTY)
+    private String boxNo;
+
+
+    /**
+     * 购买商家名称
+     */
+    @TableField(value = "buyMercName",whereStrategy = FieldStrategy.NOT_EMPTY,condition = SqlCondition.LIKE)
+    private String buyMercName;
+
+
+    /**
+     * 购买商家ID
+     */
+    @TableField(value = "buyMercId",updateStrategy = FieldStrategy.IGNORED)
+    private Integer buyMercId;
+
+
+    /**
+     * 购买设备订单号
+     */
+    @TableField(value = "orderNo",whereStrategy = FieldStrategy.NOT_EMPTY)
+    private String orderNo;
+
+
+    /**
+     * 激活商家名称
+     */
+    @TableField(value = "actMercName",whereStrategy = FieldStrategy.NOT_EMPTY,condition = SqlCondition.LIKE)
+    private String actMercName;
+
+
+    /**
+     * 激活商家Id
+     */
+    @TableField(value = "actMercId",updateStrategy = FieldStrategy.IGNORED)
+    private Integer actMercId;
+
+
+    /**
+     * 状态1:未出售 2：已出售3：已激活
+     */
+    @TableField(value = "status",whereStrategy = FieldStrategy.NOT_EMPTY)
+    private String status;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.GT)
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.LT)
+    private Date createTimeEnd;
+
+    /**
+     * 修改时间
+     */
+    @TableField(value = "updateTime", fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    /**
+     * 修改时间 开始时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.GT)
+    private Date updateTimeStart;
+
+    /**
+     * 修改时间 截止时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.LT)
+    private Date updateTimeEnd;
+
+    @TableField(exist = false)
+    private String startBoxNo;
+
+    @TableField(exist = false)
+    private String endBoxNo;
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/DeviceVoiceBoxMsg.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/DeviceVoiceBoxMsg.java
new file mode 100644
index 0000000..99a5ce2
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/DeviceVoiceBoxMsg.java
@@ -0,0 +1,97 @@
+package cn.pluss.platform.entity;
+
+import cn.pluss.platform.config.mybatis.SqlConditionExtra;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 设备消息推送记录表
+ * </p>
+ *
+ * @author bzg
+ * @since 2020-11-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_device_voice_box_msg")
+public class DeviceVoiceBoxMsg implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 请求ID
+     */
+    @TableField("requestId")
+    private String requestId;
+
+
+    /**
+     * 消息ID
+     */
+    @TableField("msgId")
+    private String msgId;
+
+
+    /**
+     * 消息推送内容体
+     */
+    @TableField("body")
+    private String body;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.GT)
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.LT)
+    private Date createTimeEnd;
+
+    /**
+     * 推送设备编号
+     */
+    @TableField(value = "deviceNo",whereStrategy = FieldStrategy.NOT_EMPTY)
+    private String deviceNo;
+
+
+    /**
+     * 订单号
+     */
+    @TableField(value = "orderNumber",whereStrategy = FieldStrategy.NOT_EMPTY)
+    private String orderNumber;
+
+    /**
+     * @description:响应内容
+     * @date: 2021/9/1 11:22
+     */
+    @TableField("respBody")
+    private String respBody;
+
+    /**
+     * @description:类型1：支付 2取消支付 3其他
+     * @date: 2021/9/1 11:35
+     */
+    @TableField("type")
+    private String type;
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/Dict.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/Dict.java
new file mode 100644
index 0000000..82dd71f
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/Dict.java
@@ -0,0 +1,67 @@
+package cn.pluss.platform.entity;
+
+import cn.pluss.platform.config.mybatis.SqlConditionExtra;
+import cn.pluss.platform.util.tree.BaseNode;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * @author djh
+ * create sql:
+ * CREATE TABLE `tb_pluss_dict` (
+ *   `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'id',
+ *   `pid` int(11) DEFAULT NULL COMMENT '父级id',
+ *   `sort` int(11) DEFAULT NULL COMMENT '排序',
+ *   `code` varchar(50) DEFAULT NULL COMMENT '字典code',
+ *   `name` varchar(20) DEFAULT NULL COMMENT '名称',
+ *   `desc` varchar(50) DEFAULT NULL COMMENT '描述',
+ *   `createTime` datetime DEFAULT NULL COMMENT '创建时间',
+ *   `updateTime` datetime DEFAULT NULL COMMENT '更新时间',
+ *   PRIMARY KEY (`id`),
+ *   UNIQUE KEY `idx_code` (`code`) COMMENT 'code唯一'
+ * ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='通用字典表';
+ */
+@Data
+@Accessors(chain = true)
+public class Dict extends BaseNode<Dict> {
+
+    @TableField("`code`")
+    private String code;
+
+    @TableField(exist = false)
+    private String pCode;
+
+    @TableField("`name`")
+    private String name;
+
+    @TableField("`desc`")
+    private String desc;
+
+    @TableField("`value`")
+    private String value;
+
+    @TableField(exist = false)
+    private String title;
+
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.GT)
+    private Date createTimeStart;
+
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.LT)
+    private Date createTimeEnd;
+
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.GT)
+    private Date updateTimeStart;
+
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.LT)
+    private Date updateTimeEnd;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/EncryptKey.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/EncryptKey.java
new file mode 100644
index 0000000..48c6e90
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/EncryptKey.java
@@ -0,0 +1,123 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 商务密钥存储表
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-10-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_encrypt_key")
+public class EncryptKey implements Serializable {
+
+    public static final String STATUS_ENABLE = "1";
+
+    public static final String STATUS_DISABLE = "0";
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Long id;
+
+
+    /**
+     * 名称
+     */
+    @TableField("'name'")
+    private String name;
+
+
+    /**
+     * 唯一标识
+     */
+    @TableField("'code'")
+    private String code;
+
+
+    /**
+     * 描述
+     */
+    @TableField("'desc'")
+    private String desc;
+
+
+    /**
+     * 私钥
+     */
+    @TableField("'priKey'")
+    private String priKey;
+
+
+    /**
+     * 公钥
+     */
+    @TableField("'pubKey'")
+    private String pubKey;
+
+
+    /**
+     * 版本号
+     */
+    @TableField("'version'")
+    private String version;
+
+
+    /**
+     * 0，失效；1，生效
+     */
+    @TableField("'status'")
+    private String status;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(exist = false, condition = "createTime &gt; #{%s}")
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(exist = false, condition = "createTime &lt; #{%s}")
+    private Date createTimeEnd;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "updateTime", fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    /**
+     * 更新时间 开始时间
+     */
+    @TableField(exist = false, condition = "updateTime &gt; #{%s}")
+    private Date updateTimeStart;
+
+    /**
+     * 更新时间 截止时间
+     */
+    @TableField(exist = false, condition = "updateTime &lt; #{%s}")
+    private Date updateTimeEnd;
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/ExtraLevelBenefit.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/ExtraLevelBenefit.java
new file mode 100644
index 0000000..091967c
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/ExtraLevelBenefit.java
@@ -0,0 +1,110 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 用户变更下级等级数据表
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-02-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("tb_pluss_extra_level_benefit")
+public class ExtraLevelBenefit implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Integer id;
+
+
+    /**
+     * 用户id
+     */
+    @TableField("userId")
+    private Integer userId;
+
+
+    /**
+     * 最大可使用个数
+     */
+    @TableField("maxCount")
+    private Integer maxCount;
+
+
+    /**
+     * 已使用个数
+     */
+    @TableField("useCount")
+    private Integer useCount;
+
+    public Integer getUseCount() {
+        if (useCount == null) {
+            return 0;
+        }
+
+        return useCount;
+    }
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(exist = false, condition = "createTime &gt; #{%s}")
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(exist = false, condition = "createTime &lt; #{%s}")
+    private Date createTimeEnd;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "updateTime", fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    /**
+     * 更新时间 开始时间
+     */
+    @TableField(exist = false, condition = "updateTime &gt; #{%s}")
+    private Date updateTimeStart;
+
+    /**
+     * 更新时间 截止时间
+     */
+    @TableField(exist = false, condition = "updateTime &lt; #{%s}")
+    private Date updateTimeEnd;
+
+    public ExtraLevelBenefit(Integer userId, Integer maxCount, Integer useCount) {
+        this.userId = userId;
+        this.maxCount = maxCount;
+        this.useCount = useCount;
+    }
+
+    public ExtraLevelBenefit(Integer userId, Integer maxCount) {
+        this.userId = userId;
+        this.maxCount = maxCount;
+    }
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/Fans.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/Fans.java
new file mode 100644
index 0000000..bda4da8
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/Fans.java
@@ -0,0 +1,96 @@
+package cn.pluss.platform.entity;
+
+import java.math.BigDecimal;
+import  java.util.Date;
+
+import cn.pluss.platform.constants.Constant;
+import cn.pluss.platform.util.ParametersUtil;
+import cn.pluss.platform.util.StringUtil;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+@Data
+public class Fans {
+
+    @TableId
+    private Integer id;
+    private String userId;
+    private String logo;
+    private String nickName;
+    private Double consumMoney;
+    private String merchantCode;
+    private String merchantName;
+    private String consumAddress;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date consumTime;
+    private String orderNumber;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date createDt;
+    
+    private String lastMerchantCode;
+    private String shareMoney;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date lastconsumTime;
+    private String lastOrderNumber;
+    private String payWay;
+    private String isUse;
+
+    @TableField(exist = false)
+    private String alias;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @TableField(exist = false)
+    private Date stTime;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @TableField(exist = false)
+    private Date endTime;
+
+    /**
+     * 这里的支付类型只分两种
+     */
+    @TableField(exist = false)
+    private String orderTypeDesc;
+
+    public static void updateOrderTypeDesc(Fans fans) {
+        if (fans == null) {
+            return;
+        }
+
+        String payWay = fans.getPayWay();
+        switch (payWay.substring(payWay.length() - 1)) {
+            case "0":
+                fans.setOrderTypeDesc("支付宝");
+                break;
+            case "1":
+                fans.setOrderTypeDesc("微信");
+                break;
+        }
+    }
+
+    //初始化粉丝
+    public void convert(MerchantOrder order) {
+        this.setLogo(order.getLogo());
+        this.setNickName(order.getNickName());
+        this.setConsumMoney(order.getConsumeFee());
+        if(StringUtil.isEmpty(this.getShareMoney())){
+            BigDecimal shareMoney = new BigDecimal(order.getConsumeFee()).multiply(new BigDecimal(ParametersUtil.fans_profit));
+            this.setShareMoney(shareMoney.setScale(4,BigDecimal.ROUND_HALF_DOWN).toString());
+        }
+        this.setConsumTime(order.getCreateDt());
+        this.setOrderNumber(order.getOrderNumber());
+        this.setUserId(order.getMercUserId());
+        this.setMerchantCode(order.getMerchantCode());
+        this.setMerchantName(order.getMerchantName());
+        if(Constant.PAY_TYPE_ALIPAY.equals(order.getPayTypeCode()) || "sxfPay0".equals(order.getPayTypeCode())){
+            this.setPayWay("0");
+        }else if(Constant.PAY_TYPE_WECHAT.equals(order.getPayTypeCode()) || "sxfPay1".equals(order.getPayTypeCode())){
+            this.setPayWay("1");
+        }else if(Constant.PAY_TYPE_YSFPAY.equals(order.getPayTypeCode()) || "sxfPay2".equals(order.getPayTypeCode())){
+            this.setPayWay("2");
+        }else{
+            this.setPayWay("3");
+        }
+    }
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/FansConsumReturn.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/FansConsumReturn.java
new file mode 100644
index 0000000..57e21a3
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/FansConsumReturn.java
@@ -0,0 +1,26 @@
+package cn.pluss.platform.entity;
+
+import  java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+@Data
+public class FansConsumReturn {
+
+    @TableId
+    private Integer id;
+    private String logo;
+    private String nickName;
+    private Double consumMony;
+    private String merchantCode;
+    private String merchantName;
+    private Double returnMoney;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date consumTime;
+    private String orderNumber;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date createDt;
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/GuideLabel.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/GuideLabel.java
new file mode 100644
index 0000000..aa6d92b
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/GuideLabel.java
@@ -0,0 +1,82 @@
+package cn.pluss.platform.entity;
+
+import cn.pluss.platform.config.mybatis.SqlConditionExtra;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-10-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_guide_label")
+public class GuideLabel implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 话术名称
+     */
+    @TableField(value = "name",whereStrategy = FieldStrategy.NOT_EMPTY,condition = SqlCondition.LIKE)
+    private String name;
+
+
+    /**
+     * 话术状态0：未选中1：选中
+     */
+    @TableField("status")
+    private String status;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.GT)
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.LT)
+    private Date createTimeEnd;
+
+    /**
+     * 修改时间
+     */
+    @TableField(value = "updateTime", fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    /**
+     * 修改时间 开始时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.GT)
+    private Date updateTimeStart;
+
+    /**
+     * 修改时间 截止时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.LT)
+    private Date updateTimeEnd;
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/HelpVideo.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/HelpVideo.java
new file mode 100644
index 0000000..b8d7ce9
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/HelpVideo.java
@@ -0,0 +1,23 @@
+package cn.pluss.platform.entity;
+
+import  java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+@Data
+public class HelpVideo {
+
+    @TableId
+    private Integer id;
+    private String name;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date createDt;
+    private String content;
+    private String videoUrl;
+    private String type;
+
+    private int sort;
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/IdCard.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/IdCard.java
new file mode 100644
index 0000000..5341a37
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/IdCard.java
@@ -0,0 +1,158 @@
+package cn.pluss.platform.entity;
+
+import cn.pluss.platform.config.mybatis.SqlConditionExtra;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 身份证信息表, 图片信息在tb_pluss_merchant_image表中
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-10-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_id_card")
+public class IdCard implements Serializable {
+
+    public interface Common {}
+
+    /** 实名人 */
+    public static final String TYPE_CERT = "01";
+
+    /** 结算人 */
+    public static final String TYPE_ACCOUNT = "02";
+
+    /** 法人 */
+    public static final String TYPE_LEGAL = "03";
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    @TableField("userId")
+    private String userId;
+
+
+    /**
+     * 00身份证
+     * 03军人证
+     * 04警察证
+     * 05港澳居民往来内地通行证
+     * 06台湾居民来往大陆通行证
+     * 07护照
+     */
+    @TableField("certType")
+    private String certType;
+
+
+    /**
+     * 01 实名人; 02结算人; 03 法人
+     */
+    @NotEmpty(message = "缺少用户类型", groups = {IdCard.Common.class})
+    @TableField("userType")
+    private String userType;
+
+
+    /**
+     * 证件号
+     */
+    @NotEmpty(message = "请输入证件号", groups = {IdCard.Common.class})
+    @TableField("certNo")
+    private String certNo;
+
+
+    /**
+     * 证件姓名
+     */
+    @NotEmpty(message = "请输入证件人名称", groups = {IdCard.Common.class})
+    @TableField("certName")
+    private String certName;
+
+
+    /**
+     * 身份证有效期开始时间, yyyy-MM-dd
+     */
+    @NotEmpty(message = "请输入证件有效期开始时间", groups = {IdCard.Common.class})
+    @TableField("certStartTime")
+    private String certStartTime;
+
+
+    /**
+     * 身份证有效期结束时间, yyyy-MM-dd 或 长期
+     */
+    @NotEmpty(message = "请输入证件有效期结束时间", groups = {IdCard.Common.class})
+    @TableField("certEndTime")
+    private String certEndTime;
+
+
+    /**
+     * 身份证地址(暂无需求)
+     */
+    @TableField("certAddress")
+    private String certAddress;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.GT)
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.LT)
+    private Date createTimeEnd;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "updateTime", fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    /**
+     * 更新时间 开始时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.GT)
+    private Date updateTimeStart;
+
+    /**
+     * 更新时间 截止时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.LT)
+    private Date updateTimeEnd;
+
+    /**
+     * 身份证正面照片url
+     */
+    @NotEmpty(message = "缺少身份证正面照片", groups = {IdCard.Common.class})
+    @TableField(value = "imgPositive", insertStrategy = FieldStrategy.NOT_EMPTY, updateStrategy = FieldStrategy.NOT_EMPTY)
+    private String imgPositive;
+
+    /**
+     * 身份证反面照片url
+     */
+    @NotEmpty(message = "缺少身份证反面照片", groups = {IdCard.Common.class})
+    @TableField(value = "imgNegative", insertStrategy = FieldStrategy.NOT_EMPTY, updateStrategy = FieldStrategy.NOT_EMPTY)
+    private String imgNegative;
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/IdCardCache.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/IdCardCache.java
new file mode 100644
index 0000000..f7a59ed
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/IdCardCache.java
@@ -0,0 +1,24 @@
+package cn.pluss.platform.entity;
+
+import lombok.Data;
+
+/**
+ * @author djh
+ */
+@Data
+public class IdCardCache {
+
+    private Long id;
+
+    private String name;
+
+    private String certNo;
+
+    private String certStartTime;
+
+    private String certEndTime;
+
+    private String imgPositive;
+
+    private String address;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/ImgReflect.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/ImgReflect.java
new file mode 100644
index 0000000..9371756
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/ImgReflect.java
@@ -0,0 +1,86 @@
+package cn.pluss.platform.entity;
+
+import cn.pluss.platform.config.mybatis.SqlConditionExtra;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 服务器本地文件与OSS服务器数据关联表
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-12-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_img_reflect")
+public class ImgReflect implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Integer id;
+
+
+    /**
+     * 服务器本地链接
+     */
+    @TableField("localUrl")
+    private String localUrl;
+
+
+    @TableField("ossUrl")
+    private String ossUrl;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.GT)
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.LT)
+    private Date createTimeEnd;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "updateTime", fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    /**
+     * 更新时间 开始时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.GT)
+    private Date updateTimeStart;
+
+    /**
+     * 更新时间 截止时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.LT)
+    private Date updateTimeEnd;
+
+    /**
+     * 状态，0，本地图片未删除；1，本地图片已删除
+     */
+    private String status;
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/InviteRate.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/InviteRate.java
new file mode 100644
index 0000000..ca86581
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/InviteRate.java
@@ -0,0 +1,156 @@
+package cn.pluss.platform.entity;
+
+import cn.pluss.platform.config.mybatis.SqlConditionExtra;
+import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 邀请商户费率阶梯表
+ * </p>
+ *
+ * @author bzg
+ * @since 2020-11-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_invite_rate")
+public class InviteRate implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 邀请数量
+     */
+    @TableField("number")
+    private Integer number;
+
+
+    /**
+     * 费率
+     */
+    @TableField("rate")
+    private BigDecimal rate;
+
+    /**
+     * 活动id
+     */
+    @TableField("actId")
+    private Integer actId;
+
+    /**
+     * 类型
+     */
+    @TableField("type")
+    private String type;
+
+    /**
+     * 关联活动名称
+     */
+    @TableField("actName")
+    private String actName;
+
+    /**
+     * 开始时间
+     */
+    @TableField("startTime")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private Date startTime;
+
+    @TableField(exist = false)
+    private String startTimeStr;
+
+    /**
+     * 开始时间 开始时间
+     */
+    @TableField(exist = false, condition = "startTime &gt; #{%s}")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String startTimeStart;
+
+    /**
+     * 开始时间 截止时间
+     */
+    @TableField(exist = false, condition = "startTime &lt; #{%s}")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String startTimeEnd;
+
+    /**
+     * 结束时间
+     */
+    @TableField("endTime")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private Date endTime;
+
+    @TableField(exist = false)
+    private String endTimeStr;
+
+    /**
+     * 结束时间 开始时间
+     */
+    @TableField(exist = false, condition = "endTime &gt; #{%s}")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String endTimeStart;
+
+    /**
+     * 结束时间 截止时间
+     */
+    @TableField(exist = false, condition = "endTime &lt; #{%s}")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String endTimeEnd;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.GT)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.LT)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String createTimeEnd;
+
+    /**
+     * 修改时间
+     */
+    @TableField(value = "updateTime", fill = FieldFill.INSERT_UPDATE)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String updateTime;
+
+    /**
+     * 修改时间 开始时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.GT)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String updateTimeStart;
+
+    /**
+     * 修改时间 截止时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.LT)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String updateTimeEnd;
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/IpLocationCache.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/IpLocationCache.java
new file mode 100644
index 0000000..20a53a0
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/IpLocationCache.java
@@ -0,0 +1,112 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-12-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_ip_location_cache")
+public class IpLocationCache implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Integer id;
+
+
+    /**
+     * ip
+     */
+    @TableField("ip")
+    private String ip;
+
+
+    /**
+     * 运营商
+     */
+    @TableField("isp")
+    private String isp;
+
+
+    /**
+     * 国家
+     */
+    @TableField("country")
+    private String country;
+
+
+    /**
+     * 省
+     */
+    @TableField("province")
+    private String province;
+
+
+    /**
+     * 市
+     */
+    @TableField("city")
+    private String city;
+
+
+    /**
+     * 县区
+     */
+    @TableField("county")
+    private String county;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(exist = false, condition = "createTime &gt; #{%s}")
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(exist = false, condition = "createTime &lt; #{%s}")
+    private Date createTimeEnd;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "updateTime", fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    /**
+     * 更新时间 开始时间
+     */
+    @TableField(exist = false, condition = "updateTime &gt; #{%s}")
+    private Date updateTimeStart;
+
+    /**
+     * 更新时间 截止时间
+     */
+    @TableField(exist = false, condition = "updateTime &lt; #{%s}")
+    private Date updateTimeEnd;
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/JftBankCard.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/JftBankCard.java
new file mode 100644
index 0000000..f9fd42e
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/JftBankCard.java
@@ -0,0 +1,99 @@
+package cn.pluss.platform.entity;
+
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotEmpty;
+import java.util.Date;
+
+/**
+ * @author DJH
+ */
+@Data
+@Accessors(chain = true)
+@TableName("tb_pluss_jft_bank_card")
+public class JftBankCard {
+
+    public interface Common {}
+
+    public static final String STATUS_NORMAL = "1";
+
+    public static final String STATUS_IN_CHANGE = "2";
+
+    @TableId
+    @JSONField(serialize = false)
+    private Long id;
+
+
+    private Long userId;
+
+    private String bankHolder;
+
+    @NotEmpty(message = "银行卡号不能为空", groups = {JftBankCard.Common.class})
+    private String bankCardNo;
+
+    @NotEmpty(message = "银行名称不能为空", groups = {JftBankCard.Common.class})
+    private String bankName;
+
+    @NotEmpty(message = "支行名称不能为空", groups = {JftBankCard.Common.class})
+    private String branchName;
+
+    @NotEmpty(message = "支行联行号不能为空", groups = {JftBankCard.Common.class})
+    private String contactLine;
+
+    @NotEmpty(message = "银行所属省不能为空", groups = {JftBankCard.Common.class})
+    private String branchProvince;
+
+    @NotEmpty(message = "银行所属市不能为空", groups = {JftBankCard.Common.class})
+    private String branchCity;
+
+    @NotEmpty(message = "银行所属区不能为空", groups = {JftBankCard.Common.class})
+    private String branchArea;
+
+    @NotEmpty(message = "银行卡预留手机号不能为空", groups = {JftBankCard.Common.class})
+    private String phone;
+
+    @NotEmpty(message = "银行卡卡面图片不能为空", groups = {JftBankCard.Common.class})
+    private String imgUrl;
+
+    /**
+     * 1：正常；2：变更中
+     */
+    private String status;
+
+    @TableField(exist = false)
+    private String statusDesc;
+
+    public String getStatusDesc() {
+        if (status == null) {
+            return null;
+        }
+
+        switch (status) {
+            case "1":
+                statusDesc = "生效中";
+                break;
+            case "2":
+                statusDesc = "结算卡变更中";
+                break;
+            default:
+                break;
+        }
+        return statusDesc;
+    }
+
+    private JSONObject bak;
+
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/JftMercBaseInfo.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/JftMercBaseInfo.java
new file mode 100644
index 0000000..cea3454
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/JftMercBaseInfo.java
@@ -0,0 +1,248 @@
+package cn.pluss.platform.entity;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 缴费通详情表
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-06-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_jft_merc_base_info")
+public class JftMercBaseInfo implements Serializable {
+
+    public interface Common {}
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+//    @JSONField(serialize = false)
+    private Long id;
+
+    /**
+     * 自动进件标识
+     */
+    @TableField(exist = false)
+    private String autoFlag;
+
+    /**
+     * 与用户关联
+     */
+    @TableField("userId")
+//    @JSONField(serialize = false)
+    private Long userId;
+
+
+    @TableField("merchantCode")
+    private String merchantCode;
+
+
+    /**
+     * 商户名称。有营业执照的，要求与营业执照上的名称一致。
+     */
+    @NotEmpty(message = "商户名称不能为空", groups = {JftMercBaseInfo.Common.class})
+    @TableField("merchantName")
+    private String merchantName;
+
+
+    /**
+     * 商户类型/营业执照类型 可选值：
+     * 1:小微
+     * 2:个体3:企业
+     */
+    @NotEmpty(message = "商户类型不能为空", groups = {JftMercBaseInfo.Common.class})
+    @TableField("merchantType")
+    private String merchantType;
+
+
+    /**
+     * 经营类目编码
+     */
+    @NotEmpty(message = "经营类目mcc编码不能为空", groups = {JftMercBaseInfo.Common.class})
+    @TableField("mcc")
+    private String mcc;
+
+
+    /**
+     * 经营类目名称
+     */
+    @NotEmpty(message = "经营类目编码不能为空", groups = {JftMercBaseInfo.Common.class})
+    @TableField("mccName")
+    private String mccName;
+
+
+    /**
+     * 商户简称
+     */
+    @NotEmpty(message = "商户简称不能为空", groups = {JftMercBaseInfo.Common.class})
+    @TableField("alias")
+    private String alias;
+
+
+    /**
+     * 商家省市区编码（微信需要的）用横杠隔开-
+     */
+    @TableField("addressNo")
+    private String addressNo;
+
+
+    /**
+     * 省份
+     */
+    @NotEmpty(message = "省份不能为空", groups = {JftMercBaseInfo.Common.class})
+    @TableField("province")
+    private String province;
+
+
+    /**
+     * 城市
+     */
+    @NotEmpty(message = "市不能为空", groups = {JftMercBaseInfo.Common.class})
+    @TableField("city")
+    private String city;
+
+
+    /**
+     * 区
+     */
+    @NotEmpty(message = "区/县不能为空", groups = {JftMercBaseInfo.Common.class})
+    @TableField("district")
+    private String district;
+
+
+    /**
+     * 店铺地址
+     */
+    @NotEmpty(message = "店铺地址不能为空", groups = {JftMercBaseInfo.Common.class})
+    @TableField("address")
+    private String address;
+
+
+    /**
+     * 负责人名称或企业法人代表姓名（营业执照上的姓名）
+     */
+    @TableField("principalPerson")
+    private String principalPerson;
+
+
+    /**
+     * 营业执照名称
+     */
+    @TableField("bussAuthName")
+    private String bussAuthName;
+
+
+    /**
+     * 营业执照工商注册号/营业执照号
+     */
+    @TableField("bussAuthNum")
+    private String bussAuthNum;
+
+
+    /**
+     * 营业执照上的地址/营业执照注册地址
+     */
+    @TableField("bussAuthAddress")
+    private String bussAuthAddress;
+
+
+    /**
+     * 营业执照注册开始时间
+     */
+    @TableField("bussAuthStartTime")
+    private String bussAuthStartTime;
+
+
+    /**
+     * 营业执照有效期结束时间
+     */
+    @TableField("bussAuthEndTime")
+    private String bussAuthEndTime;
+
+
+    /**
+     * 创建日期
+     */
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建日期 开始时间
+     */
+    @JSONField(serialize = false)
+    @TableField(exist = false, condition = "createTime &gt; #{%s}")
+    private Date createTimeStart;
+
+    /**
+     * 创建日期 截止时间
+     */
+    @JSONField(serialize = false)
+    @TableField(exist = false, condition = "createTime &lt; #{%s}")
+    private Date createTimeEnd;
+
+    /**
+     * 修改日期
+     */
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    @TableField(value = "updateTime", fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    /**
+     * 修改日期 开始时间
+     */
+    @JSONField(serialize = false)
+    @TableField(exist = false, condition = "updateTime &gt; #{%s}")
+    private Date updateTimeStart;
+
+    /**
+     * 修改日期 截止时间
+     */
+    @JSONField(serialize = false)
+    @TableField(exist = false, condition = "updateTime &lt; #{%s}")
+    private Date updateTimeEnd;
+
+    /**
+     * 0短期有效 1长期有效
+     */
+    @TableField("buslicType")
+    private String buslicType;
+
+    /**
+     * 门头照
+     */
+    @NotEmpty(message = "门头照不能为空", groups = {JftMercBaseInfo.Common.class})
+    @TableField("frontPic")
+    private String frontPic;
+
+    /**
+     * 收银台照
+     */
+    @NotEmpty(message = "收银台照不能为空", groups = {JftMercBaseInfo.Common.class})
+    @TableField("cashDesk")
+    private String cashDesk;
+
+    /**
+     * 门店内景照
+     */
+    @NotEmpty(message = "门店内景照不能为空", groups = {JftMercBaseInfo.Common.class})
+    @TableField("interior")
+    private String interior;
+
+    @JSONField(serialize = false)
+    @TableField("notifyUrl")
+    private String notifyUrl;
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/JftMercPaymentChannel.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/JftMercPaymentChannel.java
new file mode 100644
index 0000000..f2b410c
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/JftMercPaymentChannel.java
@@ -0,0 +1,178 @@
+package cn.pluss.platform.entity;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 银盛一码多户的商户进件记录
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-06-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_jft_merc_payment_channel")
+public class JftMercPaymentChannel implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+
+    /**
+     * 用户id
+     */
+    @TableField("userId")
+    private Long userId;
+
+
+    /**
+     * M800商编
+     */
+    @TableField("merchantCode")
+    private String merchantCode;
+
+
+    /**
+     * 通道商编
+     */
+    @TableField("merchantId")
+    private String merchantId;
+
+
+    /**
+     * 进件状态。0或无、待审核，1、审核中 2、审核失败 3、审核通过
+     */
+    @TableField("status")
+    private String status;
+
+    @TableField(exist = false)
+    private String statusDesc;
+
+    public String getStatusDesc() {
+        switch (status) {
+            case "0":
+                statusDesc = "未提交";
+                break;
+            case "1":
+                statusDesc = "审核中";
+                break;
+            case "2":
+                statusDesc = "审核不通过";
+                break;
+            case "3":
+                statusDesc = "已开通";
+                break;
+            default:
+                break;
+        }
+
+        return statusDesc;
+    }
+
+    /**
+     * 第三方进件状态，与具体code与对应通道相关
+     */
+    @TableField("thirdStatus")
+    private String thirdStatus;
+
+
+    /**
+     * 驳回理由
+     */
+    @TableField("remark")
+    private String remark;
+
+
+    /**
+     * 创建时间，即第一次请求开通时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间，即第一次请求开通时间 开始时间
+     */
+    @TableField(exist = false, condition = "createTime &gt; #{%s}")
+    private Date createTimeStart;
+
+    /**
+     * 创建时间，即第一次请求开通时间 截止时间
+     */
+    @TableField(exist = false, condition = "createTime &lt; #{%s}")
+    private Date createTimeEnd;
+
+    /**
+     * 通过时间
+     */
+    @TableField("passTime")
+    private Date passTime;
+
+    /**
+     * 通过时间 开始时间
+     */
+    @TableField(exist = false, condition = "passTime &gt; #{%s}")
+    private Date passTimeStart;
+
+    /**
+     * 通过时间 截止时间
+     */
+    @TableField(exist = false, condition = "passTime &lt; #{%s}")
+    private Date passTimeEnd;
+
+    /**
+     * 数据最后更新时间
+     */
+    @TableField(value = "updateTime", fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    /**
+     * 数据最后更新时间 开始时间
+     */
+    @TableField(exist = false, condition = "updateTime &gt; #{%s}")
+    private Date updateTimeStart;
+
+    /**
+     * 数据最后更新时间 截止时间
+     */
+    @TableField(exist = false, condition = "updateTime &lt; #{%s}")
+    private Date updateTimeEnd;
+
+    /**
+     * 业务id
+     */
+    @TableField("applicationId")
+    private String applicationId;
+
+
+    /**
+     * json参数
+     */
+    @TableField("extra")
+    private JSONObject extra;
+
+
+    /**
+     * 通道商户名称
+     */
+    @TableField(value = "mercName", insertStrategy = FieldStrategy.NEVER, updateStrategy = FieldStrategy.NEVER)
+    private String mercName;
+
+    public boolean isPayment() {
+        boolean flag = false;
+        if ("3".equals(this.getStatus()) || "4".equals(this.getStatus()) || "6".equals(this.getStatus())) {
+            flag = true;
+        }
+        return flag;
+    }
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/JftMerchantRate.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/JftMerchantRate.java
new file mode 100644
index 0000000..da6cea8
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/JftMerchantRate.java
@@ -0,0 +1,122 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 缴费通商户费率表(新)
+ * </p>
+ *
+ * <p>
+ *     缴费通费率设置为0级，即1-10级，费率值为0.38-0.56
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-06-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_jft_merchant_rate")
+public class JftMerchantRate implements Serializable {
+
+    public interface Common{}
+
+    public static final int ZERO_LEVEL_VALUE = 58;
+
+    public static final int MAX_RATE_VALUE = 56;
+
+    public static final int MIN_RATE_VALUE = 38;
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    @TableField("userId")
+    private Long userId;
+
+    /**
+     * 通道id
+     */
+    @TableField("channel")
+    private Integer channel;
+
+
+    /**
+     * 用户id
+     */
+    @TableField("merchantId")
+    private String merchantId;
+
+
+    /**
+     * 支付宝费率等级，缴费通费率值与常规进件不同
+     */
+    @NotNull(message = "费率不能为空")
+    @Min(message = "最低费率不能低于28(0.28%)", value = 28)
+    @TableField("aliRate")
+    private BigDecimal aliRate;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(exist = false, condition = "createTime &gt; #{%s}")
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(exist = false, condition = "createTime &lt; #{%s}")
+    private Date createTimeEnd;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "updateTime", fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    /**
+     * 更新时间 开始时间
+     */
+    @TableField(exist = false, condition = "updateTime &gt; #{%s}")
+    private Date updateTimeStart;
+
+    /**
+     * 更新时间 截止时间
+     */
+    @TableField(exist = false, condition = "updateTime &lt; #{%s}")
+    private Date updateTimeEnd;
+
+    /**
+     * 用户等级
+     */
+    @TableField(exist = false)
+    private String levelCode;
+
+    /**
+     * 参考费率
+     */
+    @TableField(exist = false)
+    private BigDecimal consultRate;
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/JftMerchantRateRecord.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/JftMerchantRateRecord.java
new file mode 100644
index 0000000..cd2a534
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/JftMerchantRateRecord.java
@@ -0,0 +1,138 @@
+package cn.pluss.platform.entity;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 缴费通商户费率表(新)
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-06-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_jft_merchant_rate_record")
+public class JftMerchantRateRecord implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 通道id
+     */
+    @TableField("channel")
+    private Integer channel;
+
+
+    /**
+     * 商户编码
+     */
+    @TableField("merchantId")
+    private String merchantId;
+
+
+    /**
+     * 支付宝费率等级，费率参考字典表ali_rate
+     */
+    @TableField("aliRate")
+    private Integer aliRate;
+
+
+    /**
+     * 状态，0：费率变更未完成，1：费率变更成功，2：费率变更失败 
+     */
+    @TableField("status")
+    private String status;
+
+    @TableField(exist = false)
+    private String statusDesc;
+
+    public String getStatusDesc() {
+        switch (status) {
+            case "0":
+                statusDesc = "审核中";
+                break;
+            case "1":
+                statusDesc = "变更成功";
+                break;
+            case "2":
+                statusDesc = "变更失败";
+                break;
+            default:
+                break;
+        }
+
+        return statusDesc;
+    }
+
+    /**
+     * 备注信息
+     */
+    @TableField("remark")
+    private String remark;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(exist = false, condition = "createTime &gt; #{%s}")
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(exist = false, condition = "createTime &lt; #{%s}")
+    private Date createTimeEnd;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "updateTime", fill = FieldFill.INSERT_UPDATE)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /**
+     * 更新时间 开始时间
+     */
+    @TableField(exist = false, condition = "updateTime &gt; #{%s}")
+    private Date updateTimeStart;
+
+    /**
+     * 更新时间 截止时间
+     */
+    @TableField(exist = false, condition = "updateTime &lt; #{%s}")
+    private Date updateTimeEnd;
+
+    /**
+     * 操作日期
+     */
+    @TableField(value = "operationDate", insertStrategy = FieldStrategy.NEVER, updateStrategy = FieldStrategy.NEVER)
+    private String operationDate;
+
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/JftPaymentInfo.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/JftPaymentInfo.java
new file mode 100644
index 0000000..3900a58
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/JftPaymentInfo.java
@@ -0,0 +1,47 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 缴费通付款基础信息
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-06-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_jft_payment_info")
+public class JftPaymentInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * code
+     */
+    @TableField("code")
+    private String code;
+
+
+    /**
+     * name
+     */
+    @TableField("name")
+    private String name;
+
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/JftReceiptInfo.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/JftReceiptInfo.java
new file mode 100644
index 0000000..0fb4245
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/JftReceiptInfo.java
@@ -0,0 +1,200 @@
+package cn.pluss.platform.entity;
+
+import cn.pluss.platform.constants.jft.JftConstant;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.util.DateUtils;
+import cn.pluss.platform.util.StringUtil;
+import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
+/**
+ * <p>
+ * 收银呗缴费通收款单
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-06-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_jft_receipt_info")
+public class JftReceiptInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    public static final Integer NORMAL = 1;
+
+    public static final Integer CLOSE = -1;
+
+
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+
+    /**
+     * 项目名称
+     */
+    @TableField("projectName")
+    private String projectName;
+
+
+    /**
+     * 金额
+     */
+    @TableField("amount")
+    private BigDecimal amount;
+
+
+    /**
+     * 用户ID
+     */
+    @TableField("userId")
+    private Long userId;
+
+    /**
+     * 状态 1:正常 -1：关闭
+     */
+    @TableField("status")
+    private Integer status;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(exist = false, condition = "createTime &gt; #{%s}")
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(exist = false, condition = "createTime &lt; #{%s}")
+    private Date createTimeEnd;
+
+    /**
+     * 截止时间
+     */
+    @TableField("endTime")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private Date endTime;
+
+    /**
+     * 截止时间 开始时间
+     */
+    @TableField(exist = false, condition = "endTime &gt; #{%s}")
+    private Date endTimeStart;
+
+    /**
+     * 截止时间 截止时间
+     */
+    @TableField(exist = false, condition = "endTime &lt; #{%s}")
+    private Date endTimeEnd;
+
+    /**
+     * 收款单token
+     */
+    @TableField("token")
+    private String token;
+
+    /**
+     * 付款时必填参数id集合
+     */
+    @TableField(exist = false)
+    private List<Long> paymentIds;
+
+    /**
+     * 开始时间 日期查询
+     */
+    @TableField(exist = false)
+    private String startDate;
+
+    /**
+     * 结束日期
+     */
+    @TableField(exist = false)
+    private String endDate;
+
+    /**
+     * 收款单qrCodeUrl
+     */
+    @TableField("qrCodeUrl")
+    private String qrCodeUrl;
+
+    /**
+     * 收款单imageUrl
+     */
+    @TableField("imageUrl")
+    private String imageUrl;
+
+    /**
+     * 付款ip
+     */
+    @TableField("ip")
+    private String ip;
+
+    /**
+     * 跳转信息
+     */
+    @TableField(exist = false)
+    private String jumpUrl;
+
+
+    @TableField(exist = false)
+    private JftMerchantRate jftRate;
+
+    @TableField(exist = false)
+    private JftMercBaseInfo jftMerc;
+
+    @TableField(exist = false)
+    private JftMercPaymentChannel jftChannel;
+
+    /**
+     * 检查参数
+     */
+    public void checkParams(UserApp userApp) {
+        MsgException.checkBlank(this.getProjectName(),"项目名称不能为空！");
+        MsgException.checkNull(this.getAmount(),"收款单金额不能为空！");
+        MsgException.check(this.getAmount().compareTo(JftConstant.JFT_MIN_PAY_AMT) < 0,"收款单最少金额为"+JftConstant.JFT_MIN_PAY_AMT.toPlainString()+"元");
+        this.setUserId(userApp.getUserId());
+        Date date = DateUtils.currentDate();
+        //过期时间一天
+        Date endDate = DateUtils.add(Calendar.MINUTE,date,5);
+        this.setEndTime(endDate);
+        this.setToken(StringUtil.random6V2());
+        this.setQrCodeUrl(createUrl());
+    }
+
+    public String createUrl() {
+        return JftConstant.JUMP_JFT_APPLET_URL.replace("TOKEN",this.getToken());
+    }
+
+    public void checkDate() {
+        Date now = DateUtils.currentDate();
+        boolean flag = now.compareTo(this.getCreateTime()) < 0 || now.compareTo(this.getEndTime()) > 0;
+        MsgException.check(flag,"当前收款单已过期");
+    }
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/JftReceiptOrder.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/JftReceiptOrder.java
new file mode 100644
index 0000000..09a230a
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/JftReceiptOrder.java
@@ -0,0 +1,351 @@
+package cn.pluss.platform.entity;
+
+import cn.pluss.platform.constants.Constant;
+import cn.pluss.platform.dto.jft.JftPayDataDTO;
+import cn.pluss.platform.dto.jft.JftReceiptOrderDTO;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.util.DateUtils;
+import cn.pluss.platform.util.StringUtil;
+import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.Date;
+
+/**
+ * <p>
+ * 收款单订单详情
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-06-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_jft_receipt_order")
+@NoArgsConstructor
+public class JftReceiptOrder implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    public static String DEFAULT_PAY_STATUS = "01";
+
+    public static String PAY_STATUS_YES = "02";
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 收款单ID
+     */
+    @TableField("rid")
+    private Long rid;
+
+
+    /**
+     * 金额
+     */
+    @TableField("amount")
+    private BigDecimal amount;
+
+
+    /**
+     * 状态01：未支付 02 已支付
+     */
+    @TableField("status")
+    private String status;
+
+
+    /**
+     * 支付方式 aliPay：支付宝 wechatPay：微信 bank：云闪付
+     */
+    @TableField("payType")
+    private String payType;
+
+
+    /**
+     * 订单号
+     */
+    @TableField("orderNumber")
+    private String orderNumber;
+
+
+    /**
+     * 用户ID
+     */
+    @TableField("userId")
+    private Long userId;
+
+
+    /**
+     * 商户编号
+     */
+    @TableField("merchantCode")
+    private String merchantCode;
+
+
+    /**
+     * 商户名称
+     */
+    @TableField("merchantName")
+    private String merchantName;
+
+
+    /**
+     * 付款用户ID
+     */
+    @TableField("payUserId")
+    private String payUserId;
+
+    /**
+     * 付款用户所属城市
+     */
+    @TableField("payUserCity")
+    private String payUserCity;
+
+    /**
+     * 真实名称
+     */
+    @TableField("name")
+    private String name;
+
+
+    /**
+     * 手机号
+     */
+    @TableField("phone")
+    private String phone;
+
+
+    /**
+     * 物品信息
+     */
+    @TableField("goods")
+    private String goods;
+
+
+    /**
+     * 地址信息
+     */
+    @TableField("address")
+    private String address;
+
+
+    /**
+     * 平台订单号
+     */
+    @TableField("transNo")
+    private String transNo;
+
+
+    /**
+     * 渠道订单号
+     */
+    @TableField("channelTransNo")
+    private String channelTransNo;
+
+
+    /**
+     * 支付时间
+     */
+    @TableField("transTime")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private Date transTime;
+
+    /**
+     * 支付时间 开始时间
+     */
+    @TableField(exist = false, condition = "transTime &gt; #{%s}")
+    private Date transTimeStart;
+
+    /**
+     * 支付时间 截止时间
+     */
+    @TableField(exist = false, condition = "transTime &lt; #{%s}")
+    private Date transTimeEnd;
+
+    /**
+     * 费率
+     */
+    @TableField("rate")
+    private Integer rate;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(exist = false, condition = "createTime &gt; #{%s}")
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(exist = false, condition = "createTime &lt; #{%s}")
+    private Date createTimeEnd;
+
+    /**
+     * 渠道手续费
+     */
+    @TableField("channelFee")
+    private BigDecimal channelFee;
+
+
+    /**
+     * 商户手续费
+     */
+    @TableField("mercFee")
+    private BigDecimal mercFee;
+
+
+    /**
+     * 提现手续费
+     */
+    @TableField("cashFee")
+    private BigDecimal cashFee;
+
+
+    /**
+     * 支付数据
+     */
+    @TableField("payData")
+    private String payData;
+
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 收益金额
+     */
+    @TableField("profitFee")
+    private BigDecimal profitFee;
+
+    @TableField("subject")
+    private String subject;
+
+    @TableField("mercOrderNo")
+    private String mercOrderNo;
+
+    @TableField("mercNotifyUrl")
+    private String mercNotifyUrl;
+
+
+
+    @TableField("createDate")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JSONField(format = "yyyy-MM-dd")
+    private Date createDate;
+
+
+    @TableField(exist = false)
+    private String token;
+
+    @TableField(exist = false)
+    private JftMercBaseInfo jftMerc;
+
+    @TableField(exist = false)
+    private JftMercPaymentChannel jftChannel;
+
+
+    public JftReceiptOrder(JftPayDataDTO dto,String payType) {
+        this.setName(dto.getName());
+        this.setPhone(dto.getPhone());
+        this.setGoods(dto.getGoods());
+        this.setAddress(dto.getAddress());
+        this.setPayUserId(dto.getPayUserId());
+        this.setPayType(payType);
+    }
+
+    public JftReceiptOrder(JftPayDataDTO dto, JftReceiptInfo info, String payType,JftMercBaseInfo merc,JftMerchantRate jftRate) {
+        this(dto,payType);
+        this.setOrderNumber("YS_JFT_"+ StringUtil.getBillno());
+        this.setRid(info.getId());
+        this.setAmount(info.getAmount());
+        this.setStatus(DEFAULT_PAY_STATUS);
+        this.setUserId(info.getUserId());
+        this.setMerchantName(merc.getMerchantName());
+        this.setRate(jftRate.getAliRate().intValue());
+        this.setCreateTime(DateUtils.currentDate());
+        BigDecimal channelFee = Constant.DEFAULT_JFT_COST_RATE.divide(BigDecimal.valueOf(10000)).multiply(info.getAmount()).setScale(2,BigDecimal.ROUND_UP);
+        this.setChannelFee(channelFee);
+        BigDecimal cashFee = Constant.DEFAULT_JFT_CASH_RATE.multiply(info.getAmount()).setScale(2,BigDecimal.ROUND_UP);
+        if(cashFee.compareTo(BigDecimal.ZERO) == 0){
+            cashFee = Constant.DEFAULT_JFT_CASH_FEE;
+        }
+        BigDecimal mercFee = info.getAmount().multiply(jftRate.getAliRate().divide(BigDecimal.valueOf(10000))).setScale(2,BigDecimal.ROUND_UP);
+        this.setMercFee(mercFee);
+        this.setCashFee(cashFee);
+        this.setPayUserCity(dto.getCity());
+        BigDecimal profitFee = mercFee.multiply(channelFee).add(cashFee.multiply(BigDecimal.valueOf(0.0008))).setScale(2,BigDecimal.ROUND_HALF_DOWN);
+        this.setProfitFee(profitFee);
+        this.setMerchantCode(merc.getMerchantCode());
+    }
+
+    public JftReceiptOrder(JftReceiptOrderDTO order,JftMerchantRate rate,String payType,String prefix) {
+        this.setAmount(order.getOrderAmt());
+        this.setPayType(payType);
+        this.setOrderNumber(prefix + StringUtil.getBillno());
+        this.setUserId(order.getUserId());
+        this.setMerchantCode(order.getMerchantCode());
+        this.setMerchantName(order.getMerchantName());
+        this.setRate(rate.getAliRate().intValue());
+        this.setRemark(order.getRemark());
+        this.setPayUserCity(order.getCity());
+        this.setSubject(order.getSubject());
+        this.setMercOrderNo(order.getMercOrderNo());
+        this.setMercNotifyUrl(order.getNotifyUrl());
+    }
+
+    /**
+     * 校验参数
+     */
+    public void checkParams() {
+        MsgException.checkBlank(this.getPayUserId(),"付款用户ID不能为空");
+        MsgException.checkBlank(this.getToken(),"token参数为空");
+    }
+
+    /**
+     * 获取支付类型描述
+     * @return
+     */
+    public String getPayTypeDesc() {
+        String payType = this.getPayType();
+        String payTypeDesc = "未知";
+        if(StringUtil.isEmpty(payType)){
+            return payTypeDesc;
+        }
+        switch (payType){
+            case Constant.PAY_TYPE_ALIPAY:
+                payTypeDesc = Constant.PAY_TYPE_NAME_ALIPAY;
+                break;
+            case Constant.PAY_TYPE_WECHAT:
+                payTypeDesc = Constant.PAY_TYPE_NAME_WECHAT;
+                break;
+            case Constant.PAY_TYPE_YSFPAY:
+                payTypeDesc = Constant.PAY_TYPE_NAME_YSFPAY;
+                break;
+        }
+        return payTypeDesc;
+    }
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/JftReceiptPayment.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/JftReceiptPayment.java
new file mode 100644
index 0000000..dd956db
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/JftReceiptPayment.java
@@ -0,0 +1,56 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 收款单和付款信息关联表
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-06-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@NoArgsConstructor
+@TableName("tb_pluss_jft_receipt_payment")
+public class JftReceiptPayment implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+
+    /**
+     * 收款单id
+     */
+    @TableField("rid")
+    private Long rid;
+
+
+    /**
+     * 支付信息id
+     */
+    @TableField("pid")
+    private Long pid;
+
+
+    public JftReceiptPayment(Long rid, Long pid) {
+        this.setRid(rid);
+        this.setPid(pid);
+    }
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/JftSmallClass.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/JftSmallClass.java
new file mode 100644
index 0000000..a9fceb8
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/JftSmallClass.java
@@ -0,0 +1,99 @@
+package cn.pluss.platform.entity;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 缴费通小课堂信息表
+ * </p>
+ *
+ * @author bzg
+ * @since 2022-07-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_jft_small_class")
+public class JftSmallClass implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    public static Integer DEUAULT_STATUS = 1;
+
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+
+    /**
+     * 标题
+     */
+    @TableField("title")
+    private String title;
+
+
+    /**
+     * 描述
+     */
+    @TableField("`describe`")
+    private String describe;
+
+
+    /**
+     * 内容
+     */
+    @TableField("content")
+    private String content;
+
+
+    /**
+     * 图片
+     */
+    @TableField("photo")
+    private String photo;
+
+
+    /**
+     * url
+     */
+    @TableField("url")
+    private String url;
+
+
+    /**
+     * 状态 1：显示 -1：不显示
+     */
+    @TableField("status")
+    private Integer status;
+
+
+    /**
+     * 排序
+     */
+    @TableField("sort")
+    private Integer sort;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+
+    @TableField(exist = false)
+    private String photoBaseStr;
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/LeshuaMakeMoney.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/LeshuaMakeMoney.java
new file mode 100644
index 0000000..7c5a887
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/LeshuaMakeMoney.java
@@ -0,0 +1,37 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class LeshuaMakeMoney {
+
+    @TableId
+    private Long id;
+    private String billId;
+    private String createTime;
+    private String merchantId;
+    private Double planAmount;
+    private Double suspendAmount;
+    private Double realAmount;
+    private String state;
+    private String failReason;
+    private String remark;
+    private String recreateFlag;
+    private String settType;
+    private String settDate;
+    private String tag;
+    private String bankretTime;
+    private String bankAccount;
+    private String bankHolder;
+
+    /**
+     * 总流水
+     */
+    @TableField(exist = false)
+    private BigDecimal consumeFeeSum;
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/Level.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/Level.java
new file mode 100644
index 0000000..ca6e162
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/Level.java
@@ -0,0 +1,31 @@
+package cn.pluss.platform.entity;
+
+import  java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class Level {
+
+    @TableId
+    private Long id;
+    private Integer level;
+    private Double tradeMoney;
+    private Integer authCount;
+    private String levelName;
+    private Double rate;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date createDt;
+    private String logo;
+
+    @TableField(exist = false)
+    private String CreateDtSTR;
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/LevelOperateRecord.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/LevelOperateRecord.java
new file mode 100644
index 0000000..f8a4cfd
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/LevelOperateRecord.java
@@ -0,0 +1,94 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 等级变更记录表
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-02-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_level_operate_record")
+public class LevelOperateRecord implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Integer id;
+
+
+    /**
+     * 用户id
+     */
+    @TableField("userId")
+    private Long userId;
+
+
+    /**
+     * 操作用户id
+     */
+    @TableField("operator")
+    private Long operator;
+
+
+    /**
+     * 变更等级code
+     */
+    @TableField("levelCode")
+    private String levelCode;
+
+    @TableField("flag")
+    private String flag;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(exist = false, condition = "createTime &gt; #{%s}")
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(exist = false, condition = "createTime &lt; #{%s}")
+    private Date createTimeEnd;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "updateTime", fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    /**
+     * 更新时间 开始时间
+     */
+    @TableField(exist = false, condition = "updateTime &gt; #{%s}")
+    private Date updateTimeStart;
+
+    /**
+     * 更新时间 截止时间
+     */
+    @TableField(exist = false, condition = "updateTime &lt; #{%s}")
+    private Date updateTimeEnd;
+
+    @TableField(value = "createMonth", insertStrategy = FieldStrategy.NEVER, updateStrategy = FieldStrategy.NEVER)
+    private String createMonth;
+
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MakeMoney.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MakeMoney.java
new file mode 100644
index 0000000..90e1d74
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MakeMoney.java
@@ -0,0 +1,172 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-09-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_make_money")
+public class MakeMoney implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 单号
+     */
+    @TableField("billId")
+    private String billId;
+
+    /**
+     * 创建时间
+     */
+    @TableField("createTime")
+    private String createTime;
+
+    /**
+     * 商户号
+     */
+    @TableField("merchantId")
+    private String merchantId;
+
+    /**
+     * 应付金额（单位：0.01元）
+     */
+    @TableField("planAmount")
+    private Double planAmount;
+
+    /**
+     * 止付金额（单位：0.01元）
+     */
+    @TableField("suspendAmount")
+    private Double suspendAmount;
+
+    /**
+     * 实付金额（单位：0.01元）
+     */
+    @TableField("realAmount")
+    private Double realAmount;
+
+    /**
+     * 状态： -1：打款失败； 0：打款中； 1：打款成功； 2：打款退票； 3：冻结出款；
+     */
+    private String state;
+
+    /**
+     * failReason
+     */
+    @TableField("failReason")
+    private String failReason;
+
+    /**
+     * 备注： D1打款退票会重新生成一条打款单，财务会根据新生成打款单打款，此时通知时则通过remark字段来关联上次的打款单号，如果再次发生退票，则再重新打款，remark每次只关联上一笔打款单号
+     */
+    private String remark;
+
+    /**
+     * 打款单是否是重新生成的；0：否 1：是 （D0无该字段）
+     */
+    @TableField("recreateFlag")
+    private String recreateFlag;
+
+    /**
+     * 结算类型（D1,D0）
+     */
+    @TableField("settType")
+    private String settType;
+
+    /**
+     * 结算日期
+     */
+    @TableField("settDate")
+    private String settDate;
+
+    /**
+     * 非终态：“此类打款单打款成功仅代表转出成功，不等于最终到账成功。”终态：“此类打款单打款成功，即最终到账成功
+     */
+    private String tag;
+
+    /**
+     * 打款单更新时间
+     */
+    @TableField("bankretTime")
+    private String bankretTime;
+
+    /**
+     * 开户账号
+     */
+    @TableField("bankAccount")
+    private String bankAccount;
+
+    /**
+     * 账户名
+     */
+    @TableField("bankHolder")
+    private String bankHolder;
+
+    /**
+     * 通道id
+     */
+    @TableField("channelId")
+    private String channelId;
+
+
+    @TableField(exist = false)
+    private String channelName;
+
+    /**
+     * 通道打款状态
+     */
+    @TableField("thirdStatus")
+    private String thirdStatus;
+
+    /**
+     * 商户提现手续费
+     */
+    @TableField("mercFee")
+    private Double mercFee;
+
+    /**
+     * 更新时间
+     */
+    @TableField("updateTime")
+    private Date updateTime;
+
+    /**
+     * 通道提现流水号
+     */
+    @TableField("channelNo")
+    private String channelNo;
+
+    /**
+     * 总流水
+     */
+    @TableField(exist = false)
+    private BigDecimal consumeFeeSum;
+
+    /**
+     * 已读状态
+     */
+    @TableField(exist = false)
+    private int readStatus;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MccInfoSort.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MccInfoSort.java
new file mode 100644
index 0000000..76ef4f6
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MccInfoSort.java
@@ -0,0 +1,102 @@
+package cn.pluss.platform.entity;
+
+import cn.pluss.platform.config.mybatis.SqlConditionExtra;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * mcc行业分类对应表，此处的mcc主要还是以随行付的为主，不同通道有差异的通过mcc_reflect表做映射
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-06-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_mcc_info_sort")
+public class MccInfoSort implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 职业code, 银盛通道会用到
+     */
+    @TableField("`code`")
+    private String code;
+
+
+    /**
+     * mcc
+     */
+    @TableField("mccCode")
+    private String mccCode;
+
+
+    /**
+     * mcc对应的中文名称
+     */
+    @TableField("mccName")
+    private String mccName;
+
+
+    /**
+     * 分组名称
+     */
+    @TableField("`group`")
+    private String group;
+
+
+    /**
+     * 排序字段
+     */
+    @TableField("sort")
+    private int sort;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.GT)
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.LT)
+    private Date createTimeEnd;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "updateTime", fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    /**
+     * 更新时间 开始时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.GT)
+    private Date updateTimeStart;
+
+    /**
+     * 更新时间 截止时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.LT)
+    private Date updateTimeEnd;
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MccInfoYs.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MccInfoYs.java
new file mode 100644
index 0000000..df42011
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MccInfoYs.java
@@ -0,0 +1,111 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-07-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_mcc_info_ys")
+public class MccInfoYs implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Long id;
+
+    /**
+     * mcc编码
+     */
+    @TableField("mccCode")
+    private String mccCode;
+
+
+    /**
+     * mcc信息描述
+     */
+    @TableField("mccDesc")
+    private String mccDesc;
+
+    /**
+     * 企业，是否支持
+     */
+    @TableField("compan")
+    private String compan;
+
+    /**
+     * 个体户是否支持
+     */
+    @TableField("individual")
+    private String individual;
+
+
+    /**
+     * 小微是否支持
+     */
+    @TableField("micro")
+    private String micro;
+
+    /**
+     * 银盛商户类型
+     */
+    @TableField("type")
+    private String type;
+
+    /**
+     * 行业类别
+     */
+    @TableField("mchType")
+    private String mchType;
+
+
+    /**
+     * 行业类别描述
+     */
+    @TableField("mchTypeDesc")
+    private String mchTypeDesc;
+
+    /**
+     * 行业类别
+     */
+    @TableField("industry")
+    private String industry;
+
+
+    /**
+     * 行业类别描述
+     */
+    @TableField("industryDesc")
+    private String industryDesc;
+
+
+    /**
+     * 创建人
+     */
+    @TableField("creator")
+    private String creator;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private String createTime;
+
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MccReflect.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MccReflect.java
new file mode 100644
index 0000000..ff9fd33
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MccReflect.java
@@ -0,0 +1,91 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 主通道(随行付)与其他通道之间mcc的关联表
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-02-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_mcc_reflect")
+public class MccReflect implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 参考mcc编码，此处的参考mcc编码主要来自于new_mcc_info表，即随行付的mcc表
+     */
+    @TableField("standard_mcc_code")
+    private String standardMccCode;
+
+
+    /**
+     * 对应通道放的mcc编码
+     */
+    @TableField("mcc_code")
+    private String mccCode;
+
+
+    /**
+     * 通道id
+     */
+    @TableField("channel_id")
+    private Integer channelId;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(exist = false, condition = "create_time &gt; #{%s}")
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(exist = false, condition = "create_time &lt; #{%s}")
+    private Date createTimeEnd;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private Date updateTime;
+
+    /**
+     * 更新时间 开始时间
+     */
+    @TableField(exist = false, condition = "update_time &gt; #{%s}")
+    private Date updateTimeStart;
+
+    /**
+     * 更新时间 截止时间
+     */
+    @TableField(exist = false, condition = "update_time &lt; #{%s}")
+    private Date updateTimeEnd;
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MemberOrder.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MemberOrder.java
new file mode 100644
index 0000000..e874f82
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MemberOrder.java
@@ -0,0 +1,132 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Data
+@ApiModel("会员订单实体类")
+public class MemberOrder {
+
+	@TableId
+	@ApiModelProperty("id")
+	private Integer id;
+	@ApiModelProperty("商户code")
+	private String merchantCode;
+	@ApiModelProperty("商户名称")
+	private String merchantName;
+	@ApiModelProperty("店铺id")
+	private String storeId;
+	@ApiModelProperty("店铺名称")
+	private String storeName;
+	@ApiModelProperty("订单编码")
+	private String orderNumber;
+	@ApiModelProperty("会员code，会员id")
+	private String memberCode;
+	@ApiModelProperty("会员昵称")
+	private String nickName;
+	@ApiModelProperty("创建时间")
+	@DateTimeFormat(pattern = "yyyy-MM-dd hh:mm:ss")
+	private Date createDt;
+	@ApiModelProperty("订单类型 ： 0：会员消费，1：会员充值")
+	private String orderType;
+	@ApiModelProperty("订单金额")
+	private String orderFee;
+	@ApiModelProperty("订单状态： 0：交易失败，1：交易成功")
+	private String orderStatus;
+	@ApiModelProperty("充值类型： 0：会员线上充值，1：现金充值 2：APP扫码会员充值")
+	private String rechargeType;
+	@ApiModelProperty("员工id")
+	private String staffCode;
+	@ApiModelProperty("员工名称")
+	private String staffName;
+	@ApiModelProperty("支付宝交易流水号")
+	private String aliPayTransNo;
+	@ApiModelProperty("微信支付交易流水号")
+	private String weChatTransNo;
+	@ApiModelProperty("乐刷交易流水号")
+	private String leshuaTransNo;
+	@ApiModelProperty("备注")
+	private String remark;
+	@ApiModelProperty("通道流水号")
+	private String channelNo;
+
+	@TableField(exist = false)
+	private String orderTypeDesc;
+
+	@TableField(exist = false)
+	@ApiModelProperty("顾客头像url")
+	private String logo;
+
+	@TableField(exist = false)
+	@ApiModelProperty("赠送金额，消费返或者充值送")
+	private String giveMoney;
+
+	@TableField(exist = false)
+	@ApiModelProperty("别名。")
+	private String alias;
+
+	/**
+	 * 查询添加数据
+	 */
+	@TableField(exist = false)
+	private String startTime;
+	@TableField(exist = false)
+	private String endTime;
+	@TableField(exist = false)
+	private Integer size;
+	@TableField(exist = false)
+	private Integer page;
+
+	@Override
+	public String toString() {
+		return "MemberOrder [id=" + id + ", merchantCode=" + merchantCode + ", merchantName=" + merchantName
+				+ ", storeId=" + storeId + ", storeName=" + storeName + ", orderNumber=" + orderNumber + ", memberCode="
+				+ memberCode + ", nickName=" + nickName + ", createDt=" + createDt + ", orderType=" + orderType
+				+ ", orderFee=" + orderFee + ", orderStatus=" + orderStatus + ", rechargeType=" + rechargeType
+				+ ", staffCode=" + staffCode + ", staffName=" + staffName + ", aliPayTransNo=" + aliPayTransNo
+				+ ", weChatTransNo=" + weChatTransNo + ", startTime=" + startTime + ", endTime=" + endTime + ", size="
+				+ size + ", page=" + page + "]";
+	}
+
+	public static void updateOrderTypeDesc(MemberOrder order) {
+		if ("0".equals(order.getOrderType())) {
+			order.setOrderTypeDesc("会员消费");
+			return;
+		}
+
+		if (order.getRechargeType() == null) {
+			return;
+		}
+
+		switch (order.getRechargeType()) {
+			case "0":
+				order.setOrderTypeDesc("H5-会员充值");
+				break;
+			case "1":
+				order.setOrderTypeDesc("现金充值");
+				break;
+			case "2":
+				order.setOrderTypeDesc("APP扫码-会员充值");
+				break;
+			case "3":
+				order.setOrderTypeDesc("小程序-会员充值");
+				break;
+			default:
+				order.setOrderTypeDesc("未知订单类型");
+				break;
+		}
+	}
+
+	public static void updateStaffName(MemberOrder order, UserApp userApp) {
+		// 充值的收银员都为老板
+		if (!"0".equals(order.getOrderType())) {
+			order.setStaffName(userApp.getUserName());
+		}
+	}
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MemberSetting.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MemberSetting.java
new file mode 100644
index 0000000..6bb2fa3
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MemberSetting.java
@@ -0,0 +1,28 @@
+package cn.pluss.platform.entity;
+
+import  java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+@Data
+public class MemberSetting {
+
+    @TableId
+    private Integer id;
+    private String merchantCode;
+    private String merchantName;
+    private String storeId;
+    private String storeName;
+    private String servicePhone;
+    private String cardNum;
+    private String cardContent;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date createDt;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date payDt;
+    private Integer status;
+    private String staffName;
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MemberTransStatistics.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MemberTransStatistics.java
new file mode 100644
index 0000000..5485ba3
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MemberTransStatistics.java
@@ -0,0 +1,152 @@
+package cn.pluss.platform.entity;
+
+import cn.pluss.platform.config.mybatis.SqlConditionExtra;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.Date;
+
+/**
+ * <p>
+ * 会员消费日记录
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-03-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_member_trans_statistics")
+public class MemberTransStatistics implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 用户id
+     */
+    @TableField("userId")
+    private Integer userId;
+
+
+    /**
+     * 开始日期
+     */
+    @TableField("startDate")
+    private LocalDate startDate;
+
+    /**
+     * 开始时间的查询开始时间
+     */
+    @TableField(exist = false, condition = "startDate &gt;= #{%s}")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate startDateStart;
+
+    /**
+     * 开始时间的查询截止时间
+     */
+    @TableField(exist = false, condition = "startDate &lt; #{%s}")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate startDateEnd;
+
+    /**
+     * 截止日期, 包含
+     */
+    @TableField("endDate")
+    private LocalDate endDate;
+
+    /**
+     * 截止时间的查询开始时间
+     */
+    @TableField(exist = false, condition = "endDate &gt;= #{%s}")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate endDateStart;
+
+    /**
+     * 截止时间的查询截止时间
+     */
+    @TableField(exist = false, condition = "endDate &lt; #{%s}")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate endDateEnd;
+
+    /**
+     * 账单类型，1：日；2：周；3：月；4：年
+     */
+    @TableField("type")
+    private Integer type;
+
+    /**
+     * 充值总额
+     */
+    @TableField("rechargeAmount")
+    private BigDecimal rechargeAmount;
+
+
+    /**
+     * 消费总额
+     */
+    @TableField("consumeAmount")
+    private BigDecimal consumeAmount;
+
+
+    /**
+     * 赠送总额
+     */
+    @TableField("giveAmount")
+    private BigDecimal giveAmount;
+
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.GT)
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.LT)
+    private Date createTimeEnd;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "updateTime", fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    /**
+     * 更新时间 开始时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.GT)
+    private Date updateTimeStart;
+
+    /**
+     * 更新时间 截止时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.LT)
+    private Date updateTimeEnd;
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MenuInfo.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MenuInfo.java
new file mode 100644
index 0000000..ed7d7f8
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MenuInfo.java
@@ -0,0 +1,34 @@
+package cn.pluss.platform.entity;
+
+import cn.pluss.platform.util.tree.BaseNode;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class MenuInfo extends BaseNode<MenuInfo> {
+
+    @TableField(exist = false)
+    private String title;
+
+    @TableField(exist = false)
+    private Integer checked;
+
+    private String name;
+    private Integer menuType;
+    private String link;
+    private Integer parentId;
+    private Integer menuOrder;
+    private String iconUrl;
+    private Integer visible;
+    private String creator;
+    private String version;
+    private String description;
+    private Integer seq;
+
+    @TableField(exist = false)
+    private String isVisible;
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MercDeviceRefundImage.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MercDeviceRefundImage.java
new file mode 100644
index 0000000..8c4db37
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MercDeviceRefundImage.java
@@ -0,0 +1,88 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 商户设备订单退款图片表
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-03-31
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@NoArgsConstructor
+@TableName("tb_pluss_merc_device_refund_image")
+public class MercDeviceRefundImage implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+
+    /**
+     * 用户ID
+     */
+    @TableField("userId")
+    private Long userId;
+
+
+    /**
+     * 图片url
+     */
+    @TableField("picUrl")
+    private String picUrl;
+
+
+    /**
+     * 设备详情表ID
+     */
+    @TableField("detailId")
+    private Long detailId;
+
+
+    /**
+     * 订单号
+     */
+    @TableField("orderNo")
+    private String orderNo;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(exist = false, condition = "createTime &gt; #{%s}")
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(exist = false, condition = "createTime &lt; #{%s}")
+    private Date createTimeEnd;
+
+    public MercDeviceRefundImage(MercOrderDetail detail, String picUrl) {
+        this.userId = detail.getUserId();
+        this.picUrl = picUrl;
+        this.detailId = detail.getId();
+        this.orderNo = detail.getOrderNo();
+    }
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MercMemberSet.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MercMemberSet.java
new file mode 100644
index 0000000..89568a4
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MercMemberSet.java
@@ -0,0 +1,61 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 商户会员功能基本设置表
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-07-12
+ */
+@Getter
+@Setter
+@TableName("tb_pluss_merc_member_set")
+public class MercMemberSet implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 开启状态。0：关闭；1：开启
+     */
+    private String status;
+
+    public static final String STATUS_OFF = "0";
+
+    public static final String STATUS_ON = "1";
+
+    /**
+     * 会员卡作用范围。1：线下扫码；2：外卖和扫码点单；3：全部
+     */
+    private String scope;
+
+    public static final String SCOPE_OFFLINE = "1";
+
+    public static final String SCOPE_ONLINE = "2";
+
+    public static final String SCOPE_ALL = "3";
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MercOrderDetail.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MercOrderDetail.java
new file mode 100644
index 0000000..a834a40
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MercOrderDetail.java
@@ -0,0 +1,317 @@
+package cn.pluss.platform.entity;
+
+import cn.pluss.platform.util.StringUtil;
+import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 订单详情表
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-03-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_merc_order_detail")
+public class MercOrderDetail implements Serializable {
+
+    /** 待付款 */
+    public static final String STATUS_NO_PAY = "00";
+
+    /** 已付款 */
+    public static final String STATUS_PAYED = "01";
+
+    /** 退款中 */
+    public static final String STATUS_REFUND_REQ = "02";
+
+    /** 同意退款，需填写退货订单号 */
+    public static final String STATUS_REFUNDING = "12";
+
+    /** 退款申请中，已填写快递单号 */
+    public static final String STATUS_REFUND_AGREE = "13";
+
+    /** 已退款 */
+    public static final String STATUS_REFUND_SUCCESS = "03";
+
+    /** 退款失败 */
+    public static final String STATUS_REFUND_FAIL = "04";
+
+    /** 待收货 */
+    public static final String STATUS_UN_RECEIVED = "05";
+
+    /** 已完成 */
+    public static final String STATUS_COMPLETE = "06";
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @TableField("shopTrolleyId")
+    private Long shopTrolleyId;
+
+    /**
+     * 订单号
+     */
+    @TableField("orderNo")
+    private String orderNo;
+
+
+    /**
+     * 设备商品code
+     */
+    @TableField("code")
+    private String code;
+
+
+    /**
+     * 设备商品名称
+     */
+    @TableField("name")
+    private String name;
+
+
+    @TableField("`desc`")
+    private String desc;
+
+
+    @TableField("deviceLogo")
+    private String deviceLogo;
+
+
+    /**
+     * 设备类型
+     */
+    @TableField("type")
+    private String type;
+
+    /**
+     * 价格
+     */
+    private BigDecimal price;
+
+    /**
+     * 个数
+     */
+    @TableField("num")
+    private Long num;
+
+
+    /**
+     * 用户id
+     */
+    @TableField("userId")
+    private Long userId;
+
+    /**
+     * 上送物流单号
+     */
+    @TableField("logistNo")
+    private String logistNo;
+
+    /**
+     * 订单状态00：待支付 01：已支付 02：退款中 03：退款成功 04：退款失败  05：待收货 06：已完成
+     */
+    @TableField("status")
+    private String status;
+
+    /**
+     * 退款原因
+     */
+    @TableField("refundReason")
+    private String refundReason;
+
+    /**
+     * 退款驳回备注
+     */
+    @TableField("rejectRemark")
+    private String rejectRemark;
+
+    /**
+     * 退款方式
+     */
+    @TableField("refundType")
+    private String refundType;
+
+    /**
+     * 物流单号
+     */
+    @TableField("expressNo")
+    private String expressNo;
+
+    /**
+     * 退款物流单号
+     */
+    @TableField("refundExpressNo")
+    private String refundExpressNo;
+
+    /**
+     * 退款金额
+     */
+    @TableField("refundAmt")
+    private BigDecimal refundAmt;
+
+    /**
+     * 退款单号
+     */
+    @TableField("refundNo")
+    private String refundNo;
+
+    /**
+     * 退款时间
+     */
+    @TableField("refundTime")
+    private Date refundTime;
+
+    /**
+     * 退款备注
+     */
+    @TableField("refundRemark")
+    private String refundRemark;
+
+    /**
+     * 单件邮费
+     */
+    @TableField("postage")
+    private BigDecimal postage;
+
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+
+    @TableField(exist = false)
+    private String statusDesc;
+
+    @TableField(exist = false)
+    private String phone;
+
+    @TableField(exist = false)
+    private String verifyCode;
+
+    @TableField(exist = false)
+    private List<String> picList;
+
+    /**
+     * 物流状态
+     */
+    @TableField(exist = false)
+    private String expressStatus;
+
+    @TableField(exist = false)
+    private String expressStatusDesc;
+
+    @TableField(exist = false)
+    private MercOrderNew order;
+
+    @TableField(exist = false)
+    private MerchantBaseInfo merchant;
+
+    @TableField(exist = false)
+    private String roleCode;
+
+    /**
+     * 规格名称
+     */
+    @TableField(exist = false)
+    private String specName;
+
+    public String getExpressStatusDesc() {
+        String expressStatus = this.getExpressStatus();
+        if(StringUtil.isEmpty(expressStatus)){
+            this.expressStatusDesc = "待发货";
+        }else{
+            switch (expressStatus){
+                case "00":
+                    this.expressStatusDesc = "待发货";
+                    break;
+                case "01":
+                    this.expressStatusDesc = "已发货";
+                    break;
+                case "02":
+                    this.expressStatusDesc = "已揽收";
+                    break;
+                case "03":
+                    this.expressStatusDesc = "已收入";
+                    break;
+                case "04":
+                    this.expressStatusDesc = "已发出";
+                    break;
+                case "05":
+                    this.expressStatusDesc = "已发出";
+                    break;
+                case "06":
+                    this.expressStatusDesc = "派件中";
+                    break;
+                case "07":
+                    this.expressStatusDesc = "自提柜入库";
+                    break;
+                case "08":
+                    this.expressStatusDesc = "已签收";
+                    break;
+                case "90":
+                    this.expressStatusDesc = "揽收失败";
+                    break;
+                case "99":
+                    this.expressStatusDesc = "签收失败";
+                    break;
+                default:
+                    this.expressStatusDesc = "未知";
+                    break;
+            }
+        }
+        return expressStatusDesc;
+    }
+
+    public String getStatusDesc() {
+        switch (this.getStatus()){
+            case "00":
+                this.statusDesc = "待支付";
+                break;
+            case "01":
+                this.statusDesc = "已支付";
+                break;
+            case "02":
+                this.statusDesc = "发起退款中";
+                break;
+            case "03":
+                this.statusDesc = "退款成功";
+                break;
+            case "04":
+                this.statusDesc = "退款失败";
+                break;
+            case "05":
+                this.statusDesc = "待收货";
+                break;
+            case "06":
+                this.statusDesc = "已完成";
+                break;
+            case "12":
+                statusDesc = "已同意退货";
+                break;
+            case "13":
+                statusDesc = "退款中";
+                break;
+            default:
+                this.statusDesc = "未知";
+                break;
+        }
+        return statusDesc;
+    }
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MercOrderExpress.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MercOrderExpress.java
new file mode 100644
index 0000000..0b15e4d
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MercOrderExpress.java
@@ -0,0 +1,79 @@
+package cn.pluss.platform.entity;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_merc_order_express")
+public class MercOrderExpress {
+
+    public final static String EXPRESS_TYPE_HAIR = "01";
+
+    public final static String EXPRESS_TYPE_COLLECT = "02";
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @TableField("orderNo")
+    private String orderNo;
+
+    @TableField("logistNo")
+    private String logistNo;
+
+    @TableField("expressNo")
+    private String expressNo;
+
+    @TableField("type")
+    private String type;
+
+    /**
+     * 物流状态 00:待发货 01:已接单 02：已揽收 03：已收入  04：已发出 05：已打包 06：派件中 07：自提柜入库 08：已签收 90：揽收失败 99：签收失败
+     */
+    @TableField("status")
+    private String status;
+
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(exist = false, condition = "createTime &gt; #{%s}")
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(exist = false, condition = "createTime &lt; #{%s}")
+    private Date createTimeEnd;
+
+
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /**
+     * 更新时间 开始时间
+     */
+    @TableField(exist = false, condition = "updateTime &gt; #{%s}")
+    private Date updateTimeStart;
+
+    /**
+     * 更新时间 截止时间
+     */
+    @TableField(exist = false, condition = "updateTime &lt; #{%s}")
+    private Date updateTimeEnd;
+
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MercOrderExpressDetail.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MercOrderExpressDetail.java
new file mode 100644
index 0000000..00c4b1e
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MercOrderExpressDetail.java
@@ -0,0 +1,212 @@
+package cn.pluss.platform.entity;
+
+import cn.pluss.platform.util.DateUtils;
+import cn.pluss.platform.util.StringUtil;
+import cn.pluss.platform.yt.YtStatusEnum;
+import cn.pluss.platform.yt.YtUpdateInfo;
+import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 商户订单物流详情
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-03-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@NoArgsConstructor
+@TableName("tb_pluss_merc_order_express_detail")
+public class MercOrderExpressDetail implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    @TableField("orderNo")
+    private String orderNo;
+
+
+    /**
+     * 物流供应商 YTO：圆通
+     */
+    @TableField("logisticProvider")
+    private String logisticProvider;
+
+
+    /**
+     * 物流单号
+     */
+    @TableField("expressNo")
+    private String expressNo;
+
+    /**
+     * 上送物流单号
+     */
+    @TableField("logistNo")
+    private String logistNo;
+
+
+    /**
+     * 城市
+     */
+    @TableField("city")
+    private String city;
+
+
+    /**
+     * 区域(县)
+     */
+    @TableField("district")
+    private String district;
+
+
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    @TableField("acceptTime")
+    private Date acceptTime;
+
+    /**
+     *  开始时间
+     */
+    @TableField(exist = false, condition = "acceptTime &gt; #{%s}")
+    private Date acceptTimeStart;
+
+    /**
+     *  截止时间
+     */
+    @TableField(exist = false, condition = "acceptTime &lt; #{%s}")
+    private Date acceptTimeEnd;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+
+    /**
+     * empCode
+     */
+    @TableField("empCode")
+    private String empCode;
+
+
+    /**
+     * empName
+     */
+    @TableField("empName")
+    private String empName;
+
+
+    /**
+     * 信息
+     */
+    @TableField("info")
+    private String info;
+
+
+    /**
+     * 重量(kg)
+     */
+    @TableField("weight")
+    private BigDecimal weight;
+
+
+    @TableField("contactInfo")
+    private String contactInfo;
+
+
+    /**
+     * 失败原因
+     */
+    @TableField("questionCause")
+    private String questionCause;
+
+
+    /**
+     * 派件员姓名
+     */
+    @TableField("deliveryName")
+    private String deliveryName;
+
+
+    @TableField("orgName")
+    private String orgName;
+
+
+    @TableField("orgCode")
+    private String orgCode;
+
+
+    @TableField("orgPhone")
+    private String orgPhone;
+
+
+    /**
+     * 创建时间
+     */
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(exist = false, condition = "createTime &gt; #{%s}")
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(exist = false, condition = "createTime &lt; #{%s}")
+    private Date createTimeEnd;
+
+    public MercOrderExpressDetail(YtUpdateInfo data,MercOrderExpress express) {
+        this.orderNo = express.getOrderNo();
+        this.logisticProvider = data.getLogisticProviderID();
+        this.expressNo = express.getExpressNo();
+        this.city = data.getCity();
+        this.district = data.getDistrict();
+        if(StringUtil.isNotEmpty(data.getAcceptTime())){
+            if(data.getAcceptTime().contains("CST")){
+                String acceptTime = data.getAcceptTime().replace("CST","");
+                this.acceptTime = DateUtils.parse(acceptTime,"yyyy-MM-ddHH:mm:ss");
+            }else{
+                this.acceptTime = DateUtils.parse(data.getAcceptTime(),"yyyy-MM-ddHH:mm:ss");
+            }
+        }else{
+            this.acceptTime = DateUtils.currentDate();
+        }
+        this.remark = data.getRemark();
+        this.empCode = data.getEmpCode();
+        this.empName = data.getEmpName();
+//        String infoType = StringUtil.isNotEmpty(data.getInfoType()) ? data.getInfoType() : "";
+//        String infoDesc = StringUtil.isNotEmpty(data.getInfoContent()) ? data.getInfoContent() : "";
+        this.info = YtStatusEnum.getDescByCode(data.getInfoContent());
+        this.weight = data.getWeight();
+        this.contactInfo = data.getContactInfo();
+        this.questionCause = data.getQuestionCause();
+        this.deliveryName = data.getDeliveryName();
+        this.orgName = data.getOrgName();
+        this.orgCode = data.getOrgCode();
+        this.orgPhone = data.getOrgPhone();
+        this.logistNo = data.getTxLogisticID();
+    }
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MercOrderNew.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MercOrderNew.java
new file mode 100644
index 0000000..211b0ef
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MercOrderNew.java
@@ -0,0 +1,271 @@
+package cn.pluss.platform.entity;
+
+import cn.pluss.platform.enums.ExtendParam;
+import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+/**
+ * <p>
+ * 新的订单表
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-03-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_merc_order_new")
+public class MercOrderNew implements Serializable {
+
+    /** 待付款 */
+    public static final String STATUS_NO_PAY = "00";
+
+    /** 已付款 */
+    public static final String STATUS_PAYED = "01";
+
+    /** 退款审核中 */
+    public static final String STATUS_REFUNDED = "02";
+
+    /** 已退款 */
+    public static final String STATUS_REFUND_CHECKING = "03";
+
+    /** 订单已完成 */
+    public static final String STATUS_COMPLETE = "04";
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 订单号
+     */
+    @TableField("orderNo")
+    private String orderNo;
+
+
+    /**
+     * 用户id
+     */
+    @TableField("userId")
+    private Long userId;
+
+
+    /**
+     * 支付订单号
+     */
+    @TableField("transNo")
+    private String transNo;
+
+
+    /**
+     * 支付订单号
+     */
+    @TableField("thirdTransNo")
+    private String thirdTransNo;
+
+    /**
+     * 收货人姓名
+     */
+    @TableField("receiver")
+    private String receiver;
+
+
+    /**
+     * 收货人手机号
+     */
+    @TableField("phone")
+    private String phone;
+
+
+    /**
+     * 省
+     */
+    @TableField("province")
+    private String province;
+
+
+    /**
+     * 市
+     */
+    @TableField("city")
+    private String city;
+
+
+    /**
+     * 区
+     */
+    @TableField("district")
+    private String district;
+
+    private String areaName;
+
+
+    /**
+     * 详细地址
+     */
+    @TableField("address")
+    private String address;
+
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+
+    /**
+     * 订单状态。00：待付款；01：已付款；02：退款审核中；03：已退款；04:已完成
+     */
+    @TableField("status")
+    private String status;
+
+
+    /**
+     * 创建时间
+     */
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(exist = false, condition = "createTime &gt; #{%s}")
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(exist = false, condition = "createTime &lt; #{%s}")
+    private Date createTimeEnd;
+
+    /**
+     * 创建人id
+     */
+    @TableField("creator")
+    private Long creator;
+
+
+    /**
+     * 更新时间
+     */
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    @TableField(value = "updateTime", fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    /**
+     * 更新时间 开始时间
+     */
+    @TableField(exist = false, condition = "updateTime &gt; #{%s}")
+    private Date updateTimeStart;
+
+    /**
+     * 更新时间 截止时间
+     */
+    @TableField(exist = false, condition = "updateTime &lt; #{%s}")
+    private Date updateTimeEnd;
+
+    /**
+     * 更新操作人id
+     */
+    @TableField("updater")
+    private Integer updater;
+
+    /**
+     * 支付方式
+     */
+    @TableField("payType")
+    private String payType;
+
+    /**
+     * 支付时间
+     */
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    @TableField("transDt")
+    private Date transDt;
+
+    /**
+     * 订单金额
+     */
+    @TableField("orderAmt")
+    private BigDecimal orderAmt;
+
+    /**
+     * 优惠金额
+     */
+    @TableField("discountAmt")
+    private BigDecimal discountAmt;
+
+    /**
+     * 实付金额
+     */
+    @TableField("actualAmt")
+    private BigDecimal actualAmt;
+
+    /**
+     * 邮费 针对偏远地区
+     */
+    @TableField("postage")
+    private BigDecimal  postage;
+
+    /**
+     * 收款商户号
+     */
+    @TableField("merchantCode")
+    private String merchantCode;
+
+    /**
+     * 收款商户名称
+     */
+    @TableField("merchantName")
+    private String merchantName;
+
+    /**
+     * 所属通道1：随行付 2：乐刷 3：瑞银信 4银盛 5:原生
+     */
+    @TableField("channel")
+    private Integer channel;
+
+    /**
+     * 支付参数
+     */
+    @TableField("payData")
+    private String payData;
+
+    /**
+     * 支付用户ID
+     */
+    @TableField("payUserId")
+    private String payUserId;
+
+    public void convert(MerchantOrder order,MerchantBaseInfo merchant) {
+        order.setConsumeFee(this.getActualAmt().doubleValue());
+        //小程序
+        order.setOrderType("9");
+        order.setOrderNumber(this.getOrderNo());
+        order.setMerchantName(this.getMerchantName());
+        order.setMerchantCode(this.getMerchantCode());
+        if(merchant != null){
+            order.setAlias(merchant.getMerchantName());
+        }
+        order.setPayTypeCode(this.getPayType());
+        order.setPayData(this.getPayData());
+        order.setCreateDt(this.getCreateTime());
+        order.setAisleSwitch(this.getChannel().toString());
+        order.setExtendParam(ExtendParam.DEVICE.getKeyCode());
+    }
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MercOrderToken.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MercOrderToken.java
new file mode 100644
index 0000000..bc1d6ac
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MercOrderToken.java
@@ -0,0 +1,234 @@
+package cn.pluss.platform.entity;
+
+import cn.pluss.platform.constants.Constant;
+import cn.pluss.platform.util.DateUtils;
+import cn.pluss.platform.util.StringUtil;
+import cn.pluss.platform.yinsheng.YsOldSrcMerchantNo;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.UUID;
+
+/**
+ * <p>
+ * 设备订单token表
+ * </p>
+ *
+ * @author bzg
+ * @since 2022-03-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@NoArgsConstructor
+@TableName("tb_pluss_merc_order_token")
+public class MercOrderToken implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    public static final int EXPIRE_MINUTE_NUM = 5;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * token
+     */
+    @TableField("token")
+    private String token;
+
+
+    @TableField("merchantName")
+    private String merchantName;
+
+
+    /**
+     * 商户编号
+     */
+    @TableField("merchantCode")
+    private String merchantCode;
+
+
+    /**
+     * 用户ID
+     */
+    @TableField("userId")
+    private Integer userId;
+
+
+    /**
+     * 订单金额
+     */
+    @TableField("orderAmt")
+    private BigDecimal orderAmt;
+
+
+    /**
+     * 订单号
+     */
+    @TableField("orderNumber")
+    private String orderNumber;
+
+
+    /**
+     * 类型：1：扫码王 2:表示其他
+     */
+    @TableField("type")
+    private String type;
+
+
+    /**
+     * 设备号
+     */
+    @TableField("snNo")
+    private String snNo;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(exist = false, condition = "createTime &gt; #{%s}")
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(exist = false, condition = "createTime &lt; #{%s}")
+    private Date createTimeEnd;
+
+    /**
+     * 过期时间
+     */
+    @TableField("expireTime")
+    private Date expireTime;
+
+    /**
+     * 商户订单号
+     */
+    @TableField("mercOrderNo")
+    private String mercOrderNo;
+
+    /**
+     * 商户异步通知地址
+     */
+    @TableField("mercNotifyUrl")
+    private String mercNotifyUrl;
+
+    /**
+     * 商户同步返回地址
+     */
+    @TableField("mercRefundUrl")
+    private String mercRefundUrl;
+
+    /**
+     * 订单标题
+     */
+    @TableField("subject")
+    private String subject;
+
+    /**
+     * 支付方式
+     */
+    @TableField("payTypeCode")
+    private String payTypeCode;
+
+
+    /**
+     * 支付方式名称
+     */
+    @TableField("payTypeName")
+    private String payTypeName;
+
+
+    /**
+     * 商户简称
+     */
+    @TableField("alias")
+    private String alias;
+
+    /**
+     * 渠道
+     */
+    @TableField("channel")
+    private Integer channel;
+
+    /**
+     * 过期时间 开始时间
+     */
+    @TableField(exist = false, condition = "expireTime &gt; #{%s}")
+    private Date expireTimeStart;
+
+    /**
+     * 过期时间 截止时间
+     */
+    @TableField(exist = false, condition = "expireTime &lt; #{%s}")
+    private Date expireTimeEnd;
+
+
+    public MercOrderToken(MerchantBaseInfo baseInfo, Double fee, String snNo, String orderNumber) {
+        Date now = DateUtils.currentDate();
+        this.token = StringUtil.genRandomNum(32);
+        this.merchantName = baseInfo.getAlias();
+        this.merchantCode = baseInfo.getMerchantCode();
+        this.userId = Integer.parseInt(baseInfo.getUserId());
+        this.orderAmt = BigDecimal.valueOf(fee);
+        this.orderNumber = orderNumber;
+        this.snNo = snNo;
+        this.createTime = now;
+        this.expireTime = DateUtils.add(Calendar.MINUTE,now,EXPIRE_MINUTE_NUM);
+    }
+
+    public MercOrderToken(MerchantBaseInfo merchant, String payAmt, MerchantChannelStatus channel,String mercOrderNo,JSONObject params) {
+        Date now = DateUtils.currentDate();
+        String orderNumber = StringUtil.getBillno();
+        Integer detaultExpreTime = 5;
+        this.token = StringUtil.genRandomNum(32);
+        this.merchantName = merchant.getAlias();
+        this.merchantCode = merchant.getMerchantCode();
+        this.alias = merchant.getMerchantName();
+        this.userId = Integer.parseInt(merchant.getUserId());
+        this.orderAmt = new BigDecimal(payAmt);
+        if(channel.getChannel() == 1){
+            this.channel = 2;
+            orderNumber = "SXF_MERC_" + orderNumber;
+        }else if(channel.getChannel() == 3){
+            this.channel = 3;
+            orderNumber = "RYX_MERC_" + orderNumber;
+        }else if(channel.getChannel() == 4){
+            this.channel = 4;
+            orderNumber = "YS_MERC_" + orderNumber;
+        }
+        if("WXZF".equals(params.getString("payWay"))){
+            this.payTypeCode = Constant.PAY_TYPE_WECHAT;
+            this.payTypeName = Constant.PAY_TYPE_NAME_WECHAT;
+        }else if("ZFBZF".equals(params.getString("payWay"))){
+            this.payTypeCode = Constant.PAY_TYPE_ALIPAY;
+            this.payTypeName = Constant.PAY_TYPE_NAME_ALIPAY;
+        }else{
+            this.payTypeCode = Constant.PAY_TYPE_YSFPAY;
+            this.payTypeName = Constant.PAY_TYPE_NAME_YSFPAY;
+        }
+        this.orderNumber = orderNumber;
+        this.createTime = now;
+        this.expireTime = DateUtils.add(Calendar.MINUTE,now,detaultExpreTime);
+        this.mercOrderNo = mercOrderNo;
+        this.mercNotifyUrl = params.getString("notifyUrl");
+        this.mercRefundUrl = params.getString("returnUrl");
+        this.subject = params.getString("subject");
+    }
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MercReceiveAddress.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MercReceiveAddress.java
new file mode 100644
index 0000000..1c51a2e
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MercReceiveAddress.java
@@ -0,0 +1,123 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 设备商城用户地址表
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-03-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_merc_receive_address")
+public class MercReceiveAddress implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 用户id
+     */
+    @TableField("userId")
+    private Integer userId;
+
+
+    /**
+     * 收件人姓名
+     */
+    @TableField("name")
+    private String name;
+
+
+    /**
+     * 收件人手机号
+     */
+    @TableField("phone")
+    private String phone;
+
+
+    /**
+     * 省
+     */
+    @TableField("province")
+    private String province;
+
+
+    /**
+     * 市
+     */
+    @TableField("city")
+    private String city;
+
+
+    /**
+     * 区/县
+     */
+    @TableField("district")
+    private String district;
+
+
+    /**
+     * 详细地址
+     */
+    @TableField("address")
+    private String address;
+
+
+    /**
+     * 是否默认地址, 1: 默认
+     */
+    @TableField("defFlag")
+    private String defFlag;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(exist = false, condition = "createTime &gt; #{%s}")
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(exist = false, condition = "createTime &lt; #{%s}")
+    private Date createTimeEnd;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "updateTime", fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    /**
+     * 更新时间 开始时间
+     */
+    @TableField(exist = false, condition = "updateTime &gt; #{%s}")
+    private Date updateTimeStart;
+
+    /**
+     * 更新时间 截止时间
+     */
+    @TableField(exist = false, condition = "updateTime &lt; #{%s}")
+    private Date updateTimeEnd;
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MercShopTrolley.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MercShopTrolley.java
new file mode 100644
index 0000000..e116c82
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MercShopTrolley.java
@@ -0,0 +1,113 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 购物车表
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-03-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_merc_shop_trolley")
+public class MercShopTrolley implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+
+    /**
+     * 设备商品code
+     */
+    @TableField("code")
+    private String code;
+
+
+    /**
+     * 设备商品名称
+     */
+    @TableField("name")
+    private String name;
+
+
+    @TableField("deviceLogo")
+    private String deviceLogo;
+
+
+    /**
+     * 设备类型
+     */
+    @TableField("type")
+    private String type;
+
+
+    /**
+     * 个数
+     */
+    @TableField("num")
+    private Long num;
+
+
+    /**
+     * 用户id
+     */
+    @TableField("userId")
+    private Long userId;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(exist = false, condition = "createTime &gt; #{%s}")
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(exist = false, condition = "createTime &lt; #{%s}")
+    private Date createTimeEnd;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "updateTime", fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    /**
+     * 更新时间 开始时间
+     */
+    @TableField(exist = false, condition = "updateTime &gt; #{%s}")
+    private Date updateTimeStart;
+
+    /**
+     * 更新时间 截止时间
+     */
+    @TableField(exist = false, condition = "updateTime &lt; #{%s}")
+    private Date updateTimeEnd;
+
+    /**
+     * 01, 正常；02，已删除；03，已购买
+     */
+    @TableField("status")
+    private String status;
+
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantAddress.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantAddress.java
new file mode 100644
index 0000000..0802385
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantAddress.java
@@ -0,0 +1,24 @@
+package cn.pluss.platform.entity;
+
+import  java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+@Data
+public class MerchantAddress {
+
+    @TableId
+    private Integer id;
+    private String userId;
+    private String merchantCode;
+    private String provinces;
+    private String address;
+    private String linkPhone;
+    private String linkName;
+    private String isDefault;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date createDt;
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantAuditRecord.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantAuditRecord.java
new file mode 100644
index 0000000..cb712b9
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantAuditRecord.java
@@ -0,0 +1,119 @@
+package cn.pluss.platform.entity;
+
+import cn.pluss.platform.config.mybatis.SqlConditionExtra;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-11-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_merchant_audit_record")
+public class MerchantAuditRecord implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId("id")
+    private Integer id;
+
+
+    /**
+     * 商户code
+     */
+    @TableField("merchantCode")
+    private String merchantCode;
+
+
+    /**
+     * 通道商商户id
+     */
+    @TableField("merchantId")
+    private String merchantId;
+
+
+    /**
+     * 参考merchant_status表
+     */
+    @TableField("status")
+    private String status;
+
+
+    /**
+     * 服务商返回状态
+     */
+    @TableField("thirdStatus")
+    private String thirdStatus;
+
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.GT)
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.LT)
+    private Date createTimeEnd;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "updateTime", fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    /**
+     * 更新时间 开始时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.GT)
+    private Date updateTimeStart;
+
+    /**
+     * 更新时间 截止时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.LT)
+    private Date updateTimeEnd;
+
+    /**
+     * 业务ID
+     */
+    private String applicationId;
+
+    /**
+     * 通道ID
+     */
+    private Integer channel;
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantBankCard.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantBankCard.java
new file mode 100644
index 0000000..49c8a8b
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantBankCard.java
@@ -0,0 +1,76 @@
+package cn.pluss.platform.entity;
+
+import  java.util.Date;
+
+import cn.pluss.platform.util.StringUtil;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+@Data
+@Accessors(chain = true)
+public class MerchantBankCard {
+
+    @TableId
+    private Integer id;
+    private String merchantCode;
+    private String storeId;
+    private String bankCardNo;
+    private String bankAddressNo;
+    private String bankCertName;
+    private String bankName;
+    private String branchName;
+    private String accountType;
+    private String contactLine;
+    private String branchProvince;
+    private String branchCity;
+    private String branchArea;
+    private String certType;
+    private String certNo;
+    private String certStartTime;
+    private String certEndTime;
+    private String cardHolderAddress;
+    private String orderNo;
+    private String merchantId;
+    private String registerStatus;
+    private String failReason;
+    private String accountNo;
+    private String wechatChannelList;
+    private String phone;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date createDt;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date updateDt;
+    private String aisleSwitch;
+    /**
+     * 身份证正面
+     */
+    private String certFullPhoto;
+    /**
+     * 身份证反面
+     */
+    private String certBacKPhoto;
+    /**
+     * 银行卡照片
+     */
+    private String bankCardFrontPic;
+    private String userId;
+
+    public String getBankCardNo() {
+        if (StringUtil.isEmpty(bankCardNo)) {
+            return bankCardNo;
+        }
+
+        return bankCardNo.replaceAll("[ 　]", "");
+    }
+
+    public String certTypeTransform() {
+        if ("01".equals(certType)) {
+            return "00";
+        }
+
+        return certType;
+    }
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantBaseInfo.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantBaseInfo.java
new file mode 100644
index 0000000..b1864b4
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantBaseInfo.java
@@ -0,0 +1,331 @@
+package cn.pluss.platform.entity;
+
+import cn.pluss.platform.constants.Constant;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.util.MD5Util;
+import cn.pluss.platform.util.SignUtils;
+import cn.pluss.platform.util.StringUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.Objects;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+public class MerchantBaseInfo implements Serializable {
+
+    /** 商户类型-小微 */
+    public static final String MERCH_TYPE_MICRO = "1";
+
+    /** 商户类型-个体户 */
+    public static final String MERCH_TYPE_INDIVIDUAL = "2";
+
+    /** 商户类型-企业 */
+    public static final String MERCH_TYPE_COMPANY = "3";
+
+    /** 不支持信用卡交易 **/
+    public static final String LIMIT_PAY_TYPE_NO_CREDIT = "1";
+
+    /** 不限制信用卡交易 **/
+    public static final String LIMIT_PAY_TYPE_ALL = "0";
+
+    /** 不分账 **/
+    public static final Integer SPLIT_FLAG_NO = 1;
+
+    /** 分账 **/
+    public static final Integer SPLIT_FLAG_YES = 2;
+
+    @TableId
+    private Long id;
+    private String bindingCode;
+    private String userId;
+    private String aliAccount;
+    private String merchantCode;
+    private String merchantName;
+    private String merchantType;
+    private String productDesc;
+    private String aliMcc;
+    private String mcc;
+    private String mccName;
+    private String alias;
+    private String contactMobile;
+    private String contactName;
+    private String addressNo;
+    private String province;
+    private String city;
+    private String district;
+    private String address;
+    private String email;
+    /**
+     * 营业执照法人信息
+     */
+    private String principalMobile;
+    private String principalCertType;
+    private String principalCertNo;
+    private String principalPerson;
+    /**
+     * 营业执照信息
+     */
+    private String bussAuthName;
+    private String bussAuthNum;
+    private String bussAuthAddress;
+    private String bussAuthStartTime;
+    private String bussAuthEndTime;
+
+    /**
+     * 是否支持银联单笔1000以上的交易
+     * 0：不支持；1支持
+     */
+    private String allowBankLarge;
+
+
+    /**
+     * 是否已经完成微信认证
+     * 0：未完成；1：已完成
+     */
+    private String wxCertStatus;
+
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd hh:mm:ss")
+    private Date createDt;
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd hh:mm:ss")
+    private Date updateDt;
+
+    private String buslicType;
+    private String isVoice;
+
+    /**
+     * 是否推送微信消息0：不推送 1：推送
+     */
+    @TableField("isPushWxMessage")
+    private String isPushWxMessage;
+
+    /**
+     * 是否开启银联支付0：不开启 1：开启
+     */
+    @TableField("isUnionPay")
+    private String isUnionPay;
+
+    /**
+     * @description:Md5Key
+     * @date: 2021/10/28 12:53
+     */
+    @TableField("md5Key")
+    private String md5Key;
+
+    /**
+     * 是否限制信用卡0：不限制 1：限制
+     * @date: 2022/1/5 10:09
+     */
+    @TableField("limitPay")
+    private String limitPay;
+
+    @TableField("subAppId")
+    private String subAppId;
+
+    @TableField("appid")
+    private String appid;
+
+    @TableField(exist = false)
+    private String status;
+    @TableField(exist = false)
+    private String merchantAddress;
+    //门头照
+    @TableField(exist = false)
+    private String storeHeadPic;
+    //门店内景照
+    @TableField(exist = false)
+    private String storeInsidePic;
+    //收银台照
+    @TableField(exist = false)
+    private String cashPic;
+    //结算人与收银台合照
+    @TableField(exist = false)
+    private String literalPic;
+    //非法人授权函
+    @TableField(exist = false)
+    private String warrantyPic;
+    //商户协议
+    @TableField(exist = false)
+    private String dealPic;
+    //商户附属协议
+    @TableField(exist = false)
+    private String affilatePic;
+    //结算人手持身份证照
+    @TableField(exist = false)
+    private String handPic;
+
+    @TableField(exist = false)
+    private String merchantAuditStatus;
+
+    @TableField(exist = false)
+    private String startTime;
+    @TableField(exist = false)
+    private String endTime;
+    @TableField(exist = false)
+    private String imgUrl;
+    @TableField(exist = false)
+    private String loginName;
+    @TableField(exist = false)
+    private String password;
+
+    /**
+     * logo
+     */
+    @TableField(exist = false)
+    private String logo;
+
+    /**
+     * 推广者的手机号
+     */
+    @TableField(exist = false)
+    private String userPhone;
+
+    /**
+     * 推广者的名称
+     */
+    @TableField(exist = false)
+    private String userName;
+
+    /**
+     * 营业执照图片地址
+     */
+    @TableField(exist = false)
+    private String businessLicensePic;
+
+    @TableField(exist = false)
+    private String location;
+
+    @TableField("firstTradeTime")
+    private Date firstTradeTime;
+
+    @TableField("lastTradeTime")
+    private Date lastTradeTime;
+
+    /**
+     * 是否分账 1：不分账 2：分账
+     */
+    @TableField("splitFlag")
+    private Integer splitFlag;
+
+    /**
+     * 有效商户标识 1：有效 -1 其他
+     */
+    @TableField("validFlag")
+    private Integer validFlag;
+
+
+
+    public static void setFirstAndLastTradeTime(MerchantBaseInfo mbi, Date date) {
+        if (mbi.getFirstTradeTime() == null) {
+            mbi.setFirstTradeTime(date);
+        }
+
+        mbi.setLastTradeTime(date);
+    }
+
+    public static void cpImgUrl(MerchantBaseInfo mbi, MerchantImage mi) {
+        if (mi.getPhotoType().equals(MerchantImage.ImageType.SHOP_FRONT_DOOR)) {
+            // 门头照
+            mbi.setStoreHeadPic(mi.getPicUrl());
+        }
+
+        if (mi.getPhotoType().equals(MerchantImage.ImageType.CASH_DESK_PHOTO)) {
+            // 收银台
+            mbi.setCashPic(mi.getPicUrl());
+        }
+
+        if (mi.getPhotoType().equals(MerchantImage.ImageType.STORE_INTERIOR_PHOTO)) {
+            // 门店内景
+            mbi.setStoreInsidePic(mi.getPicUrl());
+        }
+
+        if (mi.getPhotoType().equals(MerchantImage.ImageType.CASH_DESK_WITH_PERSON)) {
+            //商户负责人与收银台合照
+            mbi.setLiteralPic(mi.getPicUrl());
+        }
+
+        if (mi.getPhotoType().equals(MerchantImage.ImageType.BUSINESS_LICENSE)) {
+            // 营业执照
+            mbi.setBusinessLicensePic(mi.getPicUrl());
+        }
+
+        if (mi.getPhotoType().equals(MerchantImage.ImageType.NON_LEG_SETTLE_AUTH)) {
+            //非法人授权函
+            mbi.setWarrantyPic(mi.getPicUrl());
+        }
+
+        if (mi.getPhotoType().equals(MerchantImage.ImageType.MERCHANT_PROTOCOL)) {
+            //商户协议
+            mbi.setDealPic(mi.getPicUrl());
+        }
+
+        if (mi.getPhotoType().equals(MerchantImage.ImageType.MERCHANT_SUB_PROTOCOL)) {
+            //商户附属协议
+            mbi.setAffilatePic(mi.getPicUrl());
+        }
+
+        if (mi.getPhotoType().equals(MerchantImage.ImageType.HAND_IDCARD_PHOTO)) {
+            //结算人手持身份证照
+            mbi.setHandPic(mi.getPicUrl());
+        }
+    }
+    /**
+     * 设置通道交易卡范围
+     * @date: 2022/1/5 10:38
+     * @param reqData:
+     * @param channel:
+     */
+    public void setChannelLimitPay(JSONObject reqData, Integer channel) {
+        switch (channel){
+            case 1:
+                //随行付
+                if(LIMIT_PAY_TYPE_NO_CREDIT.equals(this.getLimitPay())){
+                    //不支持信用卡支付
+                    reqData.put("limitPay","01");
+                }else{
+                    reqData.put("limitPay","00");
+                }
+                break;
+            case 3:
+                //瑞银信
+                reqData.put("limitPay",this.getLimitPay());
+            case 4:
+                reqData.put("limit_credit_pay",this.getLimitPay());
+        }
+    }
+
+    /**
+     * 校验签名
+     * @param req
+     */
+    public void chekSign(Object req) {
+        String md5Key = StringUtil.isEmpty(this.getMd5Key()) ? Constant.DEFAULT_MD5_KEY : this.getMd5Key();
+        JSONObject reqData = JSON.parseObject(JSONObject.toJSONString(req));
+        String sign = reqData.getString("sign");
+        String checkSign = SignUtils.wapGetSign(reqData,md5Key);
+        MsgException.check(!checkSign.equals(sign),"签名校验失败");
+    }
+
+    public String getPlatformSign(Object req) {
+        String md5Key = StringUtil.isEmpty(this.getMd5Key()) ? Constant.DEFAULT_MD5_KEY : this.getMd5Key();
+        JSONObject reqData = JSON.parseObject(JSONObject.toJSONString(req));
+        return SignUtils.wapGetSign(reqData,md5Key);
+    }
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantBillStatistics.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantBillStatistics.java
new file mode 100644
index 0000000..cfaccc2
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantBillStatistics.java
@@ -0,0 +1,159 @@
+package cn.pluss.platform.entity;
+
+import cn.pluss.platform.config.mybatis.SqlConditionExtra;
+import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.Date;
+
+/**
+ * <p>
+ * 按日统计商户的账单
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-03-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_merchant_bill_statistics")
+public class MerchantBillStatistics implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 用户id
+     */
+    @TableField("userId")
+    private Integer userId;
+
+
+    /**
+     * 开始日期
+     */
+    @TableField("startDate")
+    private LocalDate startDate;
+
+    @TableField(value = "lastStartDate", insertStrategy = FieldStrategy.NEVER, updateStrategy = FieldStrategy.NEVER)
+    private LocalDate lastStartDate;
+
+    @TableField(value = "lastEndDate", insertStrategy = FieldStrategy.NEVER, updateStrategy = FieldStrategy.NEVER)
+    private LocalDate lastEndDate;
+
+    /**
+     * 开始时间的查询开始时间
+     */
+    @TableField(exist = false, condition = "startDate &gt;= #{%s}")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate startDateStart;
+
+    /**
+     * 开始时间的查询截止时间
+     */
+    @TableField(exist = false, condition = "startDate &lt; #{%s}")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate startDateEnd;
+
+    /**
+     * 截止日期, 包含
+     */
+    @TableField("endDate")
+    private LocalDate endDate;
+
+    /**
+     * 截止时间的查询开始时间
+     */
+    @TableField(exist = false, condition = "endDate &gt;= #{%s}")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate endDateStart;
+
+    /**
+     * 截止时间的查询截止时间
+     */
+    @TableField(exist = false, condition = "endDate &lt; #{%s}")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate endDateEnd;
+
+
+    /**
+     * 账单类型，1：日；2：周；3：月；4：年
+     */
+    @TableField("type")
+    private Integer type;
+
+
+    /**
+     * 金额总计
+     */
+    @TableField("amount")
+    private BigDecimal amount;
+
+
+    /**
+     * 笔数
+     */
+    @TableField("count")
+    private Integer count;
+
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+
+    /**
+     * 创建时间
+     */
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.GT)
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.LT)
+    private Date createTimeEnd;
+
+    /**
+     * 更新时间
+     */
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    @TableField(value = "updateTime", fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    /**
+     * 更新时间 开始时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.GT)
+    private Date updateTimeStart;
+
+    /**
+     * 更新时间 截止时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.LT)
+    private Date updateTimeEnd;
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantCashPayCode.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantCashPayCode.java
new file mode 100644
index 0000000..4fc4b4a
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantCashPayCode.java
@@ -0,0 +1,85 @@
+package cn.pluss.platform.entity;
+
+import cn.pluss.platform.config.mybatis.SqlConditionExtra;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 收银点和码牌关联记录表
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-03-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_merchant_cash_pay_code")
+public class MerchantCashPayCode implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 收银点id
+     */
+    @TableField("cashPlaceId")
+    private Integer cashPlaceId;
+
+
+    /**
+     * 付款码牌
+     */
+    @TableField("payCode")
+    private String payCode;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.GT)
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.LT)
+    private Date createTimeEnd;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "updateTime", fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    /**
+     * 更新时间 开始时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.GT)
+    private Date updateTimeStart;
+
+    /**
+     * 更新时间 截止时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.LT)
+    private Date updateTimeEnd;
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantCashPlace.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantCashPlace.java
new file mode 100644
index 0000000..956f318
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantCashPlace.java
@@ -0,0 +1,112 @@
+package cn.pluss.platform.entity;
+
+import cn.pluss.platform.config.mybatis.SqlConditionExtra;
+import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 商户收银点表
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-03-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_merchant_cash_place")
+public class MerchantCashPlace implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @TableField("logo")
+    private String logo;
+
+    /**
+     * 用户id
+     */
+    @TableField("userId")
+    private Long userId;
+
+    /**
+     * 多商户的关联code
+     */
+    private String bindingCode;
+
+    /**
+     * 收银点名称
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 收银点code
+     */
+    private String code;
+
+    /**
+     * 收银点地址
+     */
+    @TableField("address")
+    private String address;
+
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.GT)
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.LT)
+    private Date createTimeEnd;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "updateTime", fill = FieldFill.INSERT_UPDATE)
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /**
+     * 更新时间 开始时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.GT)
+    private Date updateTimeStart;
+
+    /**
+     * 更新时间 截止时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.LT)
+    private Date updateTimeEnd;
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantCashPlaceStaff.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantCashPlaceStaff.java
new file mode 100644
index 0000000..3df4e08
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantCashPlaceStaff.java
@@ -0,0 +1,104 @@
+package cn.pluss.platform.entity;
+
+import cn.pluss.platform.config.mybatis.SqlConditionExtra;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 收银点和员工关联记录表
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-03-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_merchant_cash_place_staff")
+public class MerchantCashPlaceStaff implements Serializable {
+
+    public static final String STATUS_NONE = "0";
+
+    public static final String STATUS_ONLINE = "1";
+
+    public static final String STATUS_LEAVE = "2";
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 用户id
+     */
+    @TableField("userId")
+    private Long userId;
+
+
+    /**
+     * 收银点id
+     */
+    @TableField("cashPlaceId")
+    private Integer cashPlaceId;
+
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 状态
+     * <p>
+     *     0： 未打卡；1：已打卡；2：已下卡
+     * </p>
+     */
+    private String status;
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.GT)
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.LT)
+    private Date createTimeEnd;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "updateTime", fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    /**
+     * 更新时间 开始时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.GT)
+    private Date updateTimeStart;
+
+    /**
+     * 更新时间 截止时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.LT)
+    private Date updateTimeEnd;
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantChannel.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantChannel.java
new file mode 100644
index 0000000..f03971c
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantChannel.java
@@ -0,0 +1,30 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+public class MerchantChannel {
+
+    @TableId
+    private Integer id;
+
+    /** 通道名称 */
+    private String channelName;
+
+    /** 通道code */
+    private String channelCode;
+
+    /** 通道状态，0: 无效；1、有效 */
+    private String status;
+
+    /** 微信认证码图片链接 */
+    private String wxCertImg;
+
+    @TableField(exist = false)
+    private Boolean useFlag;
+
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantChannelImg.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantChannelImg.java
new file mode 100644
index 0000000..0bf09f8
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantChannelImg.java
@@ -0,0 +1,30 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+@Data
+@Accessors(chain = true)
+public class MerchantChannelImg {
+
+    @TableId
+    private Integer id;
+
+    /** 关联merchant_image表的id */
+    private Integer merImgId;
+
+    /** 通道类型，关联merchant_channel表的id */
+    private Integer channelType;
+
+    /** 图片存储在通道商服务器的url*/
+    private String channelImgUrl;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private String srcUrl;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantChannelStatus.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantChannelStatus.java
new file mode 100644
index 0000000..ab1209c
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantChannelStatus.java
@@ -0,0 +1,304 @@
+package cn.pluss.platform.entity;
+
+import cn.pluss.platform.exception.MsgException;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+import java.util.Objects;
+
+/**
+ * @author DJH
+ */
+@Data
+@Accessors(chain = true)
+public class MerchantChannelStatus {
+
+    public static final int VALID_STATUS_BAN = -1;
+
+    public static final int VALID_STATUS_NORMAL = 0;
+
+    /**
+     * 微信认证授权状态 - 未授权
+     */
+    public static final String AUTHORIZATION_STATUS_UNAUTHORIZED = "0";
+
+    /**
+     * 微信认证授权状态 - 已授权
+     */
+    public static final String AUTHORIZATION_STATUS_AUTHORIZED = "1";
+
+    /**
+     * 后台审核驳回
+     */
+    public static final String AUDIT_STATUS_RESET = "0";
+    /**
+     * 审核中
+     */
+    public static final String AUDIT_STATUS_EXAMINING = "1";
+
+    /**
+     * 通道人工审核中
+     */
+    public static final String AUDIT_STATUS_ARTIFICIAL_EXAMINING = "11";
+
+    /**
+     * 审核不通过
+     */
+    public static final String AUDIT_STATUS_REJECT = "2";
+    /**
+     * 审核通过
+     */
+    public static final String AUDIT_STATUS_SUCCESS = "3";
+    /**
+     * 秒审通过
+     */
+    public static final String AUDIT_STATUS_FIRST_TRIAL_SUCCESS = "4";
+    /**
+     * 复审不通过
+     */
+    public static final String AUDIT_STATUS_REVIEW_REJECT = "5";
+
+    public static final String AUDIT_STATUS_DATA_EDIT = "6";
+
+    /**
+     * D0未开通状态
+     */
+    public static final String AUDIT_STATUS_QUICK_CASH = "7";
+
+    /**
+     * 待签约状态
+     */
+    public static final String AUDIT_STATUS_WAITING_SIGN = "8";
+
+    /**
+     * 已签约
+     */
+    public static final String AUDIT_STATUS_SIGNED = "9";
+
+    /**
+     * 自定义第三方待审核状态
+     */
+    public static final String AUDIT_THIRD_STATUS_WAITING = "-100";
+
+    /**
+     * 进件中
+     */
+    public static final String AUDIT_THIRD_STATUS_AUDITING = "-999";
+
+
+    @TableId
+    private Integer id;
+
+    private Integer channel;
+
+    private String merchantCode;
+
+    private String merchantId;
+
+    /**
+     * 1、审核中。2、审核不通过。3、审核通过(最终状态)。4、秒审通过。5、秒审通过复审不通过
+     */
+    private String status;
+
+
+    /**
+     * 微信认证状态，0：未认证；1：已认证
+     */
+    private String authorizationStatus;
+
+    /**
+     * app需要的状态表
+     *
+     * @return 简化的状态
+     */
+    public String getAppStatus() {
+        if (Objects.equals(status, MerchantChannelStatus.AUDIT_STATUS_RESET)
+                && Objects.equals(thirdStatus, MerchantChannelStatus.AUDIT_THIRD_STATUS_WAITING)) {
+            return MerchantChannelStatus.AUDIT_STATUS_REJECT;
+        }
+
+        if (MerchantChannelStatus.AUDIT_STATUS_DATA_EDIT.equals(status)) {
+            return MerchantChannelStatus.AUDIT_STATUS_SUCCESS;
+        }
+
+        if (MerchantChannelStatus.AUDIT_STATUS_QUICK_CASH.equals(status)) {
+            return MerchantChannelStatus.AUDIT_STATUS_EXAMINING;
+        }
+
+        if (MerchantChannelStatus.AUDIT_STATUS_WAITING_SIGN.equals(status)) {
+            return MerchantChannelStatus.AUDIT_STATUS_EXAMINING;
+        }
+
+        if (MerchantChannelStatus.AUDIT_STATUS_SIGNED.equals(status)) {
+            return MerchantChannelStatus.AUDIT_STATUS_EXAMINING;
+        }
+
+        return status;
+    }
+
+     public String getStatus() {
+         if (MerchantChannelStatus.AUDIT_STATUS_ARTIFICIAL_EXAMINING.equals(status)) {
+             return MerchantChannelStatus.AUDIT_STATUS_EXAMINING;
+         }
+
+         return status;
+     }
+
+    private String thirdStatus;
+
+    private String remark;
+
+    /**
+     * 两个时间由数据库自动进行更新。
+     */
+    @TableField(insertStrategy = FieldStrategy.NEVER, updateStrategy = FieldStrategy.NEVER)
+    private Date createTime;
+
+    @TableField(insertStrategy = FieldStrategy.NEVER, updateStrategy = FieldStrategy.NEVER)
+    private Date updateTime;
+
+    /**
+     * 业务id，部分通道进件结果查询需要用到
+     */
+    private String applicationId;
+
+    /**
+     * 回调处理状态
+     */
+    private String callbackStatus;
+
+    /**
+     * @description:结算类型：D0、D1、T1
+     * @date: 2021/11/2 15:20
+     */
+    private String settlementType;
+
+    /**
+     * 发起方商户号
+     */
+    private String srcMerchantNo;
+
+    /**
+     * 通道标识，默认，1为待进件数据，"D0"为通道4的标识, "D1"为其他通道的标识
+     */
+    @TableField(insertStrategy = FieldStrategy.NEVER, updateStrategy = FieldStrategy.NEVER)
+    private String virChannelFlag;
+
+    @TableField(exist = false)
+    private Long userId;
+
+    /**
+     * 其他数据
+     */
+    private JSONObject extra;
+
+    private Integer valid;
+
+    /**
+     * 通道商户名称，虚拟列
+     */
+    @TableField(insertStrategy = FieldStrategy.NEVER, updateStrategy = FieldStrategy.NEVER)
+    private String mercName;
+
+    /**
+     * 是否能付款
+     *
+     * @return
+     */
+    public boolean isPayment() {
+        boolean flag = false;
+        if ("3".equals(this.getStatus()) || "4".equals(this.getStatus()) || "6".equals(this.getStatus())) {
+            flag = true;
+        }
+        return flag;
+    }
+
+    /**
+     * 判断商户是否可以申请进件
+     *
+     * @param merchantChannelStatus 进件状态信息
+     * @return ignored
+     */
+    public static void checkReqAudit(MerchantChannelStatus merchantChannelStatus) {
+        if (merchantChannelStatus == null) {
+            return;
+        }
+
+        String status = merchantChannelStatus.getStatus();
+        if (status == null) {
+            return;
+        }
+
+        if (AUDIT_STATUS_EXAMINING.equals(status)) {
+            MsgException.throwException("进件审核中，请勿重复进件");
+        }
+    }
+
+    /**
+     * 商户申请进件后，客服进行初次进件校验后
+     * 判断商户是否可以进行过审进件
+     *
+     * @param merchantChannelStatus 进件状态信息
+     * @return ignored
+     */
+    public static void checkCanAudit(MerchantChannelStatus merchantChannelStatus) {
+        if (merchantChannelStatus == null) {
+            MsgException.throwException("商户未提交审核");
+            return;
+        }
+
+        String status = merchantChannelStatus.getStatus();
+        String thirdStatus = merchantChannelStatus.getThirdStatus();
+
+        if (!MerchantChannelStatus.AUDIT_STATUS_EXAMINING.equals(status) || !AUDIT_THIRD_STATUS_WAITING.equals(thirdStatus)) {
+            MsgException.throwException("不符合商户审核条件");
+        }
+    }
+
+    /**
+     * 是否已进件
+     * @param mcs
+     * @return
+     */
+    public static boolean isAudited(MerchantChannelStatus mcs) {
+        if (mcs == null) {
+            return false;
+        }
+
+        return MerchantChannelStatus.AUDIT_STATUS_SUCCESS.equals(mcs.getStatus()) ||
+                MerchantChannelStatus.AUDIT_STATUS_DATA_EDIT.equals(mcs.getStatus()) ||
+                MerchantChannelStatus.AUDIT_STATUS_FIRST_TRIAL_SUCCESS.equals(mcs.getStatus());
+    }
+
+    /**
+     * (已进件的)商户当前是否可编辑
+     * @param mcs   进件记录信息
+     * @return
+     */
+    public static boolean isAuditedEditable(MerchantChannelStatus mcs) {
+        if (mcs == null) {
+            return false;
+        }
+
+        return mcs.getStatus().equals(MerchantChannelStatus.AUDIT_STATUS_SUCCESS);
+    }
+
+    /**
+     * (未进件的)商户当前是否可编辑
+     * @param mcs   进件记录信息
+     * @return
+     */
+    public static boolean isUnauditedEditable(MerchantChannelStatus mcs) {
+        if (mcs == null) {
+            return true;
+        }
+
+        return MerchantChannelStatus.AUDIT_STATUS_REJECT.equals(mcs.getStatus()) ||
+                MerchantChannelStatus.AUDIT_STATUS_RESET.equals(mcs.getStatus());
+    }
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantComplaintImage.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantComplaintImage.java
new file mode 100644
index 0000000..07a42b8
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantComplaintImage.java
@@ -0,0 +1,66 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 投诉图片信息表
+ * </p>
+ *
+ * @author bzg
+ * @since 2021-09-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_merchant_complaint_image")
+public class MerchantComplaintImage implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 投诉记录表id
+     */
+    @TableField("complaintId")
+    private Integer complaintId;
+
+
+    /**
+     * 图片地址
+     */
+    @TableField("picUrl")
+    private String picUrl;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(exist = false, condition = "createTime &gt; #{%s}")
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(exist = false, condition = "createTime &lt; #{%s}")
+    private Date createTimeEnd;
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantComplaintRecord.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantComplaintRecord.java
new file mode 100644
index 0000000..78bf802
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantComplaintRecord.java
@@ -0,0 +1,131 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author bzg
+ * @since 2021-09-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_merchant_complaint_record")
+public class MerchantComplaintRecord implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 商户编号
+     */
+    @NotEmpty(message = "缺少商户编号")
+    @TableField("merchantCode")
+    private String merchantCode;
+
+
+    @TableField("merchantName")
+    private String merchantName;
+
+    /**
+     * 订单金额
+     */
+    @NotNull(message = "缺少订单金额")
+    @TableField("orderAmt")
+    private BigDecimal orderAmt;
+
+
+    /**
+     * 交易时间
+     */
+    @NotNull(message = "缺少交易时间")
+    @TableField("payTime")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    private Date payTime;
+
+    /**
+     * 交易时间 开始时间
+     */
+    @TableField(exist = false, condition = "payTime &gt; #{%s}")
+    private Date payTimeStart;
+
+    /**
+     * 交易时间 截止时间
+     */
+    @TableField(exist = false, condition = "payTime &lt; #{%s}")
+    private Date payTimeEnd;
+
+    /**
+     * 投诉人联系方式
+     */
+    @NotEmpty(message = "缺少投诉人联系方式")
+    @TableField("complaintPhone")
+    private String complaintPhone;
+
+
+    /**
+     * 投诉内容
+     */
+    @NotEmpty(message = "缺少投诉内容")
+    @TableField("remark")
+    private String remark;
+
+
+    /**
+     * 投诉订单号
+     */
+    @TableField("orderNumber")
+    private String orderNumber;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(exist = false, condition = "createTime &gt; #{%s}")
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(exist = false, condition = "createTime &lt; #{%s}")
+    private Date createTimeEnd;
+
+    /**
+     * 1:未处理，2：已处理
+     */
+    @TableField("status")
+    private String status;
+
+    @TableField(exist = false)
+    private List<String> imageList;
+
+    @TableField(exist = false)
+    private UserInfo userInfo;
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantDevice.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantDevice.java
new file mode 100644
index 0000000..dafd10e
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantDevice.java
@@ -0,0 +1,40 @@
+package cn.pluss.platform.entity;
+
+import  java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+@Data
+public class MerchantDevice {
+
+    @TableId
+    private Long id;
+    private String name;
+    private String type;
+    private String introDesc;
+    private Integer status;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date createDt;
+    private String merchantCode;
+    private String merchantName;
+    private Long userId;
+    private String sn;
+    private String venderModel;
+    private String venderCode;
+    private String orderNo;
+
+    @TableField(exist = false)
+    private String alias;
+    @TableField(exist = false)
+    private String deviceLogo;
+    @TableField(exist = false)
+    private String venderName;
+    @TableField(exist = false)
+    private String aisleModel;
+    @TableField(exist = false)
+    private String soleCode;
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantGuide.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantGuide.java
new file mode 100644
index 0000000..ede69d8
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantGuide.java
@@ -0,0 +1,100 @@
+package cn.pluss.platform.entity;
+
+import cn.pluss.platform.config.mybatis.SqlConditionExtra;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-10-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_merchant_guide")
+public class MerchantGuide implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+
+    /**
+     * 商户编号
+     */
+    @TableField(value = "merchantCode",whereStrategy = FieldStrategy.NOT_EMPTY)
+    private String merchantCode;
+
+
+    /**
+     * 商户名称
+     */
+    @TableField(value = "merchantName",whereStrategy = FieldStrategy.NOT_EMPTY,condition = SqlCondition.LIKE)
+    private String merchantName;
+
+
+    /**
+     * 引导话术语
+     */
+    @TableField(value = "name",whereStrategy = FieldStrategy.NOT_EMPTY,condition = SqlCondition.LIKE)
+    private String name;
+
+
+    /**
+     * 是否选中 0否 1：是
+     */
+    @TableField("status")
+    private String status;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.GT)
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.LT)
+    private Date createTimeEnd;
+
+    /**
+     * 修改时间
+     */
+    @TableField(value = "updateTime", fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    /**
+     * 修改时间 开始时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.GT)
+    private Date updateTimeStart;
+
+    /**
+     * 修改时间 截止时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.LT)
+    private Date updateTimeEnd;
+
+    @TableField("guideId")
+    private Integer guideId;
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantImage.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantImage.java
new file mode 100644
index 0000000..929c6cb
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantImage.java
@@ -0,0 +1,184 @@
+package cn.pluss.platform.entity;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * @author Djh
+ */
+@Data
+@Accessors(chain = true)
+@NoArgsConstructor
+public class MerchantImage {
+
+    public static class ImageType {
+
+        /**
+         * 商户负责人与收银台合照
+         */
+        public static final String CASH_DESK_WITH_PERSON = "999";
+
+        /**
+         * 身份证正面
+         */
+        public static final String IDCARD_FRONT = "01";
+        /**
+         * 身份证反面
+         */
+        public static final String IDCARD_BACK = "02";
+        /**
+         * 营业执照
+         */
+        public static final String BUSINESS_LICENSE = "03";
+        /**
+         * 组织机构代码证
+         */
+        public static final String ORGANIZATION_CARD = "04";
+        /**
+         * 开户许可证
+         */
+        public static final String ACCOUNT_PERMITS = "05";
+        /**
+         * 门头照
+         */
+        public static final String SHOP_FRONT_DOOR = "06";
+        /**
+         * 非法人结算授权书
+         */
+        public static final String NON_LEG_SETTLE_AUTH = "07";
+        /**
+         * 法人/非法人手持结算授权书
+         */
+        public static final String HAND_NON_LEG_SETTLE_AUTH = "B004";
+        /**
+         * 其他
+         */
+        public static final String OTHER = "08";
+        /**
+         * 收银台照片
+         */
+        public static final String CASH_DESK_PHOTO = "08";
+        /**
+         * 门店内景照片
+         */
+        public static final String STORE_INTERIOR_PHOTO = "09";
+        /**
+         * 各大餐饮平台入驻
+         */
+        public static final String MERCHANT_PLATFORM = "10";
+        /**
+         * 手持身份证
+         */
+        public static final String HAND_IDCARD_PHOTO = "11";
+        /**
+         * 租赁合同
+         */
+        public static final String TENANCY_AGREEMENTS = "12";
+        /**
+         * 结算人身份证正面
+         */
+        public static final String SETTLE_IDCARD_FRONT = "96";
+        /**
+         * 结算人身份证反面
+         */
+        public static final String SETTLE_IDCARD_BACK = "97";
+        /**
+         * 银行卡正面
+         */
+        public static final String BANK_CARD_FRONT = "98";
+        /**
+         * 银行卡反面
+         */
+        public static final String BANK_CARD_BACK = "99";
+
+        /**
+         * 商户协议
+         */
+        public static final String MERCHANT_PROTOCOL = "101";
+        /**
+         * 商户附属协议
+         */
+        public static final String MERCHANT_SUB_PROTOCOL = "102";
+
+        private ImageType() {
+        }
+    }
+
+    public MerchantImage(String merchantCode, String photoType) {
+        this.merchantCode = merchantCode;
+        this.photoType = photoType;
+    }
+
+    public static MerchantImage from(String picUrl, String photoType) {
+        MerchantImage mi = new MerchantImage();
+        mi.setPhotoType(photoType).setPicUrl(picUrl);
+
+        return mi;
+    }
+
+    @TableId
+    private Integer id;
+
+    @TableField
+    private String merchantCode;
+
+    /**
+     * 01 身份证正面
+     * ,02 身份证反面
+     * ,03 营业执照
+     * ,04 组织机构代码证
+     * ,05 开户许可证
+     * ,06 门头照
+     * ,07 非法人结算授权书
+     * ,08 其他
+     * ,08 收银台照片
+     * ,09 门店内景照片
+     * ,10 各大餐饮平台入驻
+     * ,11 手持身份证合照
+     * ,12 租赁合同
+     * ,98  银行卡正面
+     * ,99，银行卡反面
+     */
+    @TableField
+    private String photoType;
+    private String photoUrl;
+    private String picUrl;
+    @TableField(exist = false)
+    private String picUrl1;
+    @TableField(exist = false)
+    private String picUrl2;
+    @TableField(exist = false)
+    private String picUrl3;
+    @TableField(exist = false)
+    private String picUrl6;
+    @TableField(exist = false)
+    private String picUrl7;
+    @TableField(exist = false)
+    private String picUrl8;
+    @TableField(exist = false)
+    private String picUrl9;
+    @TableField(exist = false)
+    private String picUrl999;
+    @TableField(exist = false)
+    private String picUrl101;
+    @TableField(exist = false)
+    private String picUrl102;
+    @TableField(exist = false)
+    private String picUrl11;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd hh:mm:ss")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createDt;
+    @DateTimeFormat(pattern = "yyyy-MM-dd hh:mm:ss")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateDt;
+    private String aisleSwitch;
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantIncome.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantIncome.java
new file mode 100644
index 0000000..2c4c2ac
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantIncome.java
@@ -0,0 +1,38 @@
+package cn.pluss.platform.entity;
+
+import  java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+@Data
+public class MerchantIncome {
+
+    @TableId
+    private Integer id;
+    private Integer userId;
+    private String merchantCode;
+    private String merchantName;
+    private String storeId;
+    private String storeName;
+    private Integer dealType;
+    private Double dealFee;
+    private Double incomeFee;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+    /**
+     * 参考MerchantOrder的payTypeCode，
+     */
+    private String payTypeCode;
+    private String payTypeName;
+    private String memberCode;
+    private String memberName;
+    private String memberPic;
+    private String incomeType;
+    private Double plateformProfit;
+    private Double promoterProfit;
+    private Integer dealStatus;
+    private String dealCode;
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantMarket.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantMarket.java
new file mode 100644
index 0000000..8e53cd0
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantMarket.java
@@ -0,0 +1,96 @@
+package cn.pluss.platform.entity;
+
+import cn.pluss.platform.config.mybatis.SqlConditionExtra;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 商户奖励金记录表
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-11-02
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_merchant_market")
+public class MerchantMarket implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 用户名称
+     */
+    @TableField(value = "userName",whereStrategy = FieldStrategy.NOT_EMPTY,condition = SqlCondition.LIKE)
+    private String userName;
+
+
+    /**
+     * 获得奖励金金额
+     */
+    @TableField("marketAmt")
+    private BigDecimal marketAmt;
+
+
+    /**
+     * 奖励金获得方式 1：扫码王返利 2：云音箱返利 3：插件激励 4：其他返利 5：4G音箱返利
+     */
+    @TableField("source")
+    private String source;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 用户Id
+     */
+    @TableField(value = "userId",whereStrategy = FieldStrategy.NOT_EMPTY)
+    private Long userId;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.GT)
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.LT)
+    private Date createTimeEnd;
+
+    /**
+     * 修改时间
+     */
+    @TableField(value = "updateTime", fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    /**
+     * 修改时间 开始时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.GT)
+    private Date updateTimeStart;
+
+    /**
+     * 修改时间 截止时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.LT)
+    private Date updateTimeEnd;
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantMemberCode.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantMemberCode.java
new file mode 100644
index 0000000..d3fff47
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantMemberCode.java
@@ -0,0 +1,136 @@
+package cn.pluss.platform.entity;
+
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.util.DateUtils;
+import cn.pluss.platform.util.StringUtil;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Calendar;
+import java.util.Date;
+
+/**
+ * <p>
+ * 动态商户会员卡生成记录
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-06-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_merchant_member_code")
+public class MerchantMemberCode implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId("id")
+    private Long id;
+
+
+    /**
+     * 会员码code
+     */
+    @TableField("code")
+    private String code;
+
+
+    /**
+     * 商户code
+     */
+    @TableField("merchantCode")
+    private String merchantCode;
+
+
+    /**
+     * 会员卡号
+     */
+    @TableField("cardNo")
+    private String cardNo;
+
+
+    /**
+     * 过期开始时间
+     */
+    @TableField("startTime")
+    private Date startTime;
+
+    /**
+     * 收银呗门店ID
+     */
+    @TableField(exist = false)
+    private Long storeId;
+
+    /**
+     * 过期开始时间 开始时间
+     */
+    @TableField(exist = false, condition = "startTime &gt; #{%s}")
+    private Date startTimeStart;
+
+    /**
+     * 过期开始时间 截止时间
+     */
+    @TableField(exist = false, condition = "startTime &lt; #{%s}")
+    private Date startTimeEnd;
+
+    /**
+     * 过期结束时间
+     */
+    @TableField("endTime")
+    private Date endTime;
+
+    /**
+     * 过期结束时间 开始时间
+     */
+    @TableField(exist = false, condition = "endTime &gt; #{%s}")
+    private Date endTimeStart;
+
+    /**
+     * 过期结束时间 截止时间
+     */
+    @TableField(exist = false, condition = "endTime &lt; #{%s}")
+    private Date endTimeEnd;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(exist = false, condition = "createTime &gt; #{%s}")
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(exist = false, condition = "createTime &lt; #{%s}")
+    private Date createTimeEnd;
+
+    public void check() {
+        MsgException.checkNull(this.getStoreId(),"缺失门店ID");
+        MsgException.checkBlank(this.getCardNo(),"缺失会员卡号");
+    }
+
+    public void conver(MerchantMenber menber,Integer value) {
+        Date now = DateUtils.currentDate();
+        String code = DateUtils.toString(now,"yyyyMMddHHmmssSSS");
+        this.code =  "70" + Long.valueOf(code) / 2 +""+ StringUtil.random(1);
+        this.merchantCode = menber.getMerchantCode();
+        this.cardNo = menber.getCardNo();
+        this.startTime = now;
+        this.endTime = DateUtils.add(Calendar.MINUTE,now,value);
+    }
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantMenber.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantMenber.java
new file mode 100644
index 0000000..144b045
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantMenber.java
@@ -0,0 +1,128 @@
+package cn.pluss.platform.entity;
+
+import java.math.BigDecimal;
+import  java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+@Data
+public class MerchantMenber {
+
+    @TableId
+    private Integer id;
+    private String merchantCode;
+    private String merchantName;
+    private String storeId;
+    private String storeName;
+    private Integer status;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date createDt;
+    private String logo;
+    private String memberCode;
+    private String memberName;
+    private String provinces;
+    private String sex;
+    private String nickName;
+    private String phone;
+    private String openid;
+    private String alipayUserId;
+    private Double comsumeMoney;
+    private Double profitMoney;
+    private String orderNumber;
+
+    private Double totalRechargeFee;
+    private Double usableRechargeFee;
+    private Double totalGiveFee;
+    private Double usableGiveFee;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private String birthdayDt;
+    /**
+     * 会员卡号
+     */
+    private String cardNo;
+    private String bindingUrl;
+
+    /**
+     * 小程序OpenId
+     */
+    private String appOpenId;
+
+    private String unionId;
+
+    @TableField(exist = false)
+    private String checkCode;
+    @TableField(exist = false)
+    private String alias;
+    @TableField(exist = false)
+    private Integer page;
+    @TableField(exist = false)
+    private Integer size;
+    @TableField(exist = false)
+    private Integer userId;
+
+    
+    //商家会员信息统计显示字段
+	/** 今日充值 */
+    @TableField(exist = false)
+    private Double todayRecharg;
+    /** 今日消费 */
+    @TableField(exist = false)
+    private Double todayConsume;
+    /** 今日注册会员数 */
+    @TableField(exist = false)
+    private Double todayRegistNum;
+    /** 线上充值 */
+    @TableField(exist = false)
+    private Double onlineRecharg;
+    /** 扫码充值 */
+    @TableField(exist = false)
+    private Double scanRecharge;
+    /** 赠送返现 */
+    @TableField(exist = false)
+    private Double giveReturn;
+    /** 现金充值 */
+    @TableField(exist = false)
+    private Double cashRecharg;
+    /** 会员充值总额 */
+    @TableField(exist = false)
+    private Double totalRecharg;
+    /** 会员充值总余额 */
+    @TableField(exist = false)
+    private Double totalRemainRecharg;
+    /** 会员消费总额 */
+    @TableField(exist = false)
+    private Double totalConsume;
+    /** 会员总人数 */
+    @TableField(exist = false)
+    private Double totalMemberNum;
+    /** 可使用余额 */
+    @TableField(exist = false)
+    private BigDecimal useAmt;
+    /** 门店照片 */
+    @TableField(exist = false)
+    private String storeLogo;
+
+
+	@Override
+	public String toString() {
+		return "MerchantMenber [id=" + id + ", merchantCode=" + merchantCode + ", merchantName=" + merchantName
+				+ ", storeId=" + storeId + ", storeName=" + storeName + ", status=" + status + ", createDt=" + createDt
+				+ ", logo=" + logo + ", memberCode=" + memberCode + ", nickName=" + nickName + ", phone=" + phone
+				+ ", openid=" + openid + ", alipayUserId=" + alipayUserId + ", comsumeMoney=" + comsumeMoney
+				+ ", profitMoney=" + profitMoney + ", orderNumber=" + orderNumber + ", page=" + page + ", size=" + size
+				+ ", totalRechargeFee=" + totalRechargeFee + ", usableRechargeFee=" + usableRechargeFee
+				+ ", totalGiveFee=" + totalGiveFee + ", usableGiveFee=" + usableGiveFee + ", checkCode=" + checkCode
+				+ ", birthdayDt=" + birthdayDt + ", cardNo=" + cardNo + ", todayRecharg=" + todayRecharg
+				+ ", todayConsume=" + todayConsume + ", todayRegistNum=" + todayRegistNum + ", onlineRecharg="
+				+ onlineRecharg + ", giveReturn=" + giveReturn + ", cashRecharg=" + cashRecharg + ", totalRecharg="
+				+ totalRecharg + ", totalRemainRecharg=" + totalRemainRecharg + ", totalConsume=" + totalConsume
+				+ ", totalMemberNum=" + totalMemberNum + "]";
+	}
+	
+	
+    
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantMenberComsume.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantMenberComsume.java
new file mode 100644
index 0000000..05ed616
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantMenberComsume.java
@@ -0,0 +1,90 @@
+package cn.pluss.platform.entity;
+
+import  java.util.Date;
+
+import cn.pluss.platform.dto.MemberScanPayDTO;
+import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import cn.pluss.platform.util.StringUtil;
+
+@Data
+public class MerchantMenberComsume {
+
+    @TableId
+    private Integer id;
+    private String merchantCode;
+    private String merchantName;
+    private String storeId;
+    private String storeName;
+    private String  orderNumber;
+
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+	@JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private Date createDt;
+    private String logo;
+    private String memberCode;
+    private String nickName;
+    private String phone;
+    private Double comsumeMoney;
+    private Double giveMoney;
+    private Integer payType;
+
+    @TableField(exist = false)
+    private String alias;
+	/**
+	 * 返现金额
+	 */
+	@TableField(exist = false)
+    private Double returnMoney;
+
+
+	public MerchantMenberComsume eval(String orderNumber, Double giveMoney, MemberScanPayDTO memberScanPayDTO, MerchantMenber merchantMenber) {
+		MerchantMenberComsume m=new MerchantMenberComsume();
+		m.setCreateDt(new Date());
+		m.setGiveMoney(giveMoney);
+		m.setComsumeMoney(memberScanPayDTO.getConsumeFee());
+		m.setMemberCode(memberScanPayDTO.getAuthCode());
+		m.setMerchantCode(memberScanPayDTO.getMerchantCode());
+		m.setMerchantName(memberScanPayDTO.getMerchantName());
+		m.setNickName(merchantMenber.getNickName());
+		m.setPhone(merchantMenber.getPhone());
+		m.setStoreId(memberScanPayDTO.getStoreId());
+		m.setStoreName(memberScanPayDTO.getStoreName());
+		m.setLogo(merchantMenber.getLogo());
+		m.setOrderNumber(orderNumber);
+		return m;
+	}
+	
+	public MerchantMenberComsume convert(String orderNumber,Double giveMoney,MerchantMenber merchantMenber,MerchantStore merchantStore,Double comsumeFee,String merchantCode) {
+		MerchantMenberComsume m=new MerchantMenberComsume();
+		m.setCreateDt(new Date());
+		m.setGiveMoney(giveMoney);
+		m.setComsumeMoney(comsumeFee);
+		m.setMemberCode(merchantMenber.getMemberCode());
+		m.setMerchantCode(merchantCode);
+		if(StringUtil.isNotEmpty(merchantStore.getMerchantName())) {
+			m.setMerchantName(merchantStore.getMerchantName());
+		}
+		if(StringUtil.isNotEmpty(merchantMenber.getNickName())) {
+			m.setNickName(merchantMenber.getNickName());
+		}
+		m.setPhone(merchantMenber.getPhone());
+		m.setStoreId(merchantStore.getStoreId());
+		if(StringUtil.isNotEmpty(merchantStore.getStoreName())) {
+			m.setStoreName(merchantStore.getStoreName());
+		}
+		if(StringUtil.isNotEmpty(merchantMenber.getLogo())) {
+			m.setLogo(merchantMenber.getLogo());
+		}
+	 m.setOrderNumber(orderNumber);
+		return m;
+	}
+    
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantMenberRecharge.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantMenberRecharge.java
new file mode 100644
index 0000000..2f6d2f4
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantMenberRecharge.java
@@ -0,0 +1,39 @@
+package cn.pluss.platform.entity;
+
+import  java.util.Date;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+@Data
+public class MerchantMenberRecharge {
+
+    private Integer id;
+    private String merchantCode;
+    private String merchantName;
+    private String storeId;
+    private String storeName;
+    /**
+     * 订单编码
+     */
+    private String orderNumber;
+
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date createDt;
+    private String logo;
+    private String memberCode;
+    private String nickName;
+    private String phone;
+    private Double rechargeMoney;
+    private Double giveMoney;
+    private Integer payType;
+
+    @TableField(exist = false)
+	private String alias;
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantMoveRecords.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantMoveRecords.java
new file mode 100644
index 0000000..258e068
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantMoveRecords.java
@@ -0,0 +1,141 @@
+package cn.pluss.platform.entity;
+
+import cn.pluss.platform.config.mybatis.SqlConditionExtra;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 商户动态码生成记录
+ * </p>
+ *
+ * @author bzg
+ * @since 2021-07-30
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_merchant_move_records")
+public class MerchantMoveRecords implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Integer id;
+
+
+    /**
+     * 商户编号
+     */
+    @TableField("merchantCode")
+    private String merchantCode;
+
+
+    /**
+     * 商户名称
+     */
+    @TableField(value = "merchantName",whereStrategy = FieldStrategy.NOT_EMPTY,condition = SqlCondition.LIKE)
+    private String merchantName;
+
+
+    /**
+     * 有效开始时间
+     */
+    @TableField("startTime")
+    private Date startTime;
+
+    /**
+     * 有效开始时间 开始时间
+     */
+    @TableField(exist = false, condition = "startTime &gt; #{%s}")
+    private Date startTimeStart;
+
+    /**
+     * 有效开始时间 截止时间
+     */
+    @TableField(exist = false, condition = "startTime &lt; #{%s}")
+    private Date startTimeEnd;
+
+    /**
+     * 有效结束时间
+     */
+    @TableField("endTime")
+    private Date endTime;
+
+    /**
+     * 有效结束时间 开始时间
+     */
+    @TableField(exist = false, condition = "endTime &gt; #{%s}")
+    private Date endTimeStart;
+
+    /**
+     * 有效结束时间 截止时间
+     */
+    @TableField(exist = false, condition = "endTime &lt; #{%s}")
+    private Date endTimeEnd;
+
+    /**
+     * token
+     */
+    @TableField("token")
+    private String token;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.GT)
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.LT)
+    private Date createTimeEnd;
+
+    /**
+     * 支付用户ip
+     */
+    @TableField("ip")
+    private String ip;
+
+
+    /**
+     * 支付用户id
+     */
+    @TableField("payUserId")
+    private String payUserId;
+
+
+    /**
+     * 当前时间段支付成功次数
+     */
+    @TableField("payNum")
+    private Integer payNum;
+
+
+    /**
+     * 来源 1:微信 2：支付宝 3：银联 4：其他
+     */
+    @TableField("paySource")
+    private Integer paySource;
+
+
+    /**
+     * 支付订单号 用作更新支付状态
+     */
+    @TableField("orderNumber")
+    private String orderNumber;
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantMoveSetting.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantMoveSetting.java
new file mode 100644
index 0000000..abd48ab
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantMoveSetting.java
@@ -0,0 +1,84 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 商户动态码基本配置
+ * </p>
+ *
+ * @author bzg
+ * @since 2021-07-30
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_merchant_move_setting")
+public class MerchantMoveSetting implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Integer id;
+
+
+    /**
+     * 商户编号
+     */
+    @TableField("merchantCode")
+    private String merchantCode;
+
+
+    /**
+     * 商户名称
+     */
+    @TableField(value = "merchantName",whereStrategy = FieldStrategy.NOT_EMPTY,condition = SqlCondition.LIKE)
+    private String merchantName;
+
+
+    /**
+     * 每日生成动态码次数
+     */
+    @TableField("qr_num")
+    private Integer qrNum;
+
+
+    /**
+     * 每日支付成功次数
+     */
+    @TableField("pay_num")
+    private Integer payNum;
+
+
+    /**
+     * 加密key
+     */
+    @TableField("aesKey")
+    private String aesKey;
+
+
+    /**
+     * 状态1：正常 0：禁用
+     */
+    @TableField("status")
+    private Integer status;
+
+    /**
+     * 扫码后可支付的时间 默认5分钟
+     */
+    @TableField("payOverTime")
+    private Integer payOverTime;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantOrder.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantOrder.java
new file mode 100644
index 0000000..603b0ce
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantOrder.java
@@ -0,0 +1,539 @@
+package cn.pluss.platform.entity;
+
+import cn.jiguang.common.utils.StringUtils;
+import cn.pluss.platform.constants.Constant;
+import cn.pluss.platform.entitiy.SettleTypeEnum;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.util.StringUtil;
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.time.LocalDate;
+import java.util.Date;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ *
+ * ALTER TABLE `shouyinbei`.`tb_pluss_merchant_order`
+ * ADD COLUMN `rate` int(11) NULL COMMENT '商户费率，无则代表0.38%' AFTER `updateTime`;
+ */
+@Data
+@TableName
+@Accessors(chain = true)
+public class MerchantOrder {
+
+    public static final String UPGRADE_ORDER_PREFIX = "SJ000";
+
+
+    public static final Double MARKET_MAX_TRANS_AMT= 1000.0d;
+
+    /**
+     * @description:小微单笔最大交易额度
+     * @date: 2021/8/23 18:07
+     */
+    public static final Double MICRO_MAX_TRANS_AMT = 10000.0d;
+
+    /**
+     * @description:银联大额
+     * @date: 2021/8/23 18:12
+     */
+    public static final Double BANK_LARGE_AMT = 1000.0d;
+
+    @TableId(type = IdType.AUTO)
+    private Long id;
+    private String orderNumber;
+    private String userImg;
+    private String nickName;
+
+    /**
+     * 2、3、9、10，属于要输入密码的
+     * 1、反扫收款；2、收款码；3、会员充值；4、POS；5、反扫会员充值；6、扫码王、QR68机具收款 7：H5 8：升级收费 9小程序 10表示小程序线上店订单 11:表示缴费通 99 插件
+     * 20、会员消费，这里只做标记，数据库不存储会员消费记录
+     */
+    private String orderType;
+
+    private String merchantCode;
+    private String merchantName;
+    private String payTypeCode;
+    private String payTypeName;
+
+    private String storeId;
+    private String storeName;
+    private Double consumeFee;
+
+    /**
+     * @description:
+     * @date: 2021/8/5 粉丝分润
+     */
+    private Double fansShareMoney;
+    /**
+     * @description:
+     * @date: 2021/8/5 推广分润
+     */
+    private Double profitShareMoney;
+
+    private String transNo;
+    private String memberCode;
+    @DateTimeFormat(pattern = "yyyy-MM-dd hh:mm:ss")
+    private Date createDt;
+    @JsonFormat(shape=JsonFormat.Shape.STRING,pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd hh:mm:ss")
+    private Date transDt;
+    private String staffCode;
+    private String staffName;
+    /**
+     * 交易状态 0:交易失败 1:交易成功 2：退款成功 3：退款失败 4：退款中 5:待付款  6部分退款 7:待确认
+     */
+    private String status;
+
+    public void setCreateDt(Date date) {
+        this.createDt = date;
+        this.updateTime = date;
+    }
+
+    public void setTransDt(Date date) {
+        this.transDt = date;
+        this.updateTime = date;
+    }
+
+
+
+    /**
+     * 支付方的订单号，支付宝/微信/银联等
+     */
+    private String thirdTransNo;
+
+    private Double enterFee;
+    /**
+     * 支付通道 0 支付宝微信官方通道 1乐刷通道
+     */
+    private String aisleSwitch;
+
+    private String remark;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    private BigDecimal rate;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @TableField(insertStrategy = FieldStrategy.NEVER, updateStrategy = FieldStrategy.NEVER)
+    private LocalDate createDate;
+
+    /**
+     * 老板名称
+     */
+    @TableField(exist = false)
+    private String userName;
+    /**
+     * 老板手机号
+     */
+    @TableField(exist = false)
+    private String phone;
+    /**
+     * 查询条件
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField(exist = false, condition = "createTime &gt;= #{%s}")
+    private Date startTime;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField(exist = false, condition = "createTime &lt;= #{%s}")
+    private Date endTime;
+    @TableField(exist = false)
+    private Integer size;
+    @TableField(exist = false)
+    private Integer page;
+    @TableField(exist = false)
+    private String logo;
+
+    /**
+     * 订单类型，文字说明
+     */
+    @TableField(exist = false)
+    private String orderTypeDesc;
+
+    /**
+     * 商家简称
+     */
+    @TableField(exist = false)
+    private String alias;
+    /**
+     * 营销活动补贴金额
+     */
+    private BigDecimal marketAmt;
+
+    @TableField(exist = false)
+    private Integer userId;
+
+    private String mercOrderNo;
+
+    private String mercNotifyUrl;
+
+    private String mercUserId;
+
+    private String mercNotifyStatus;
+
+    private String mercRemark;
+
+    /**
+     * 是否会员充值订单
+     */
+    private String isRecharge;
+
+    /**
+     * 关联马牌编号
+     */
+    private String snNo;
+
+    /**
+     * 关联的收银点id
+     */
+    private String cashPlaceId;
+
+    /**
+     * 0：D0结算 1：D1结算 参考枚举值
+     * {@link cn.pluss.platform.entitiy.SettleTypeEnum}
+     */
+    private Integer settlementType;
+
+    /**
+     * 借贷标识
+     * 1: 借记卡 2：贷记卡 3：其他
+     */
+    private String drType;
+
+    /**
+     * @description:通道成本费率
+     * @date: 2021/8/25 11:03
+     */
+    private BigDecimal channelRate;
+
+    /**
+     * @description:通道手续费
+     * @date: 2021/8/25 11:04
+     */
+    private BigDecimal channelFee;
+
+    /**
+     * @description:商户手续费
+     * @date: 2021/8/25 11:04
+     */
+    private BigDecimal mercFee;
+
+    /**
+     * 节约金额
+     */
+    @TableField(exist = false)
+    private BigDecimal saveAmt;
+
+    /**
+     * @description:退款金额
+     * @date: 2021/11/22 14:16
+     */
+    private BigDecimal refundAmt;
+
+    /**
+     * @description:退款类型 1：全额退款 2：部分退款
+     * @date: 2021/11/22 14:19
+     */
+    @TableField(exist = false)
+    private Integer refundType;
+
+    /**
+     * @description:已退款金额
+     * @date: 2021/11/22 14:16
+     */
+    @TableField(exist = false)
+    private BigDecimal useRefundAmt;
+
+    @TableField(exist = false)
+    private String token;
+
+    /**
+     * 订单备注
+     */
+    @TableField(exist = false)
+    private String subject;
+
+    @TableField(exist = false)
+    private String province;
+
+    @TableField(exist = false)
+    private String city;
+
+    /**
+     * 自定义查询条件
+     */
+    @TableField(exist = false)
+    private Map<String,Object> params;
+
+    /**
+     * @description:ip
+     * @date: 2021/9/30 10:34
+     */
+    private String ip;
+
+    /**
+     * @description:ip对应的地址
+     * @date: 2021/9/30 10:34
+     */
+    private String ipAddress;
+
+    /**
+     * @description:返回地址
+     * @date: 2021/9/30 18:11
+     */
+    private String mercReturnUrl;
+
+    /**
+     * @description:预授权订单状态 1：预授权中 2:预授权撤销 3：预授权完成 4：预授权完成撤销 5：冲正 6：退货
+     * @date: 2021/10/28 16:39
+     */
+    private String preAuthStatus;
+
+    /**
+     * 渠道返回支付数据
+     * @date: 2021/12/29 15:27
+     */
+    private String payData;
+
+    /**
+     * 提现手续费
+     */
+    private BigDecimal cashFee;
+
+    /**
+     * 扫码类型 01：扫码 2：其他
+     * @date: 2021/12/22 17:00
+     */
+    @TableField(exist = false)
+    private String scanType;
+
+    /**
+     * 优惠金额
+     */
+    @TableField(exist = false)
+    private Double discount;
+
+    /**
+     * 扩展参数
+     */
+    @TableField(exist = false)
+    private String extendParam;
+
+
+    public static void updateOrderTypeDesc(MerchantOrder order) {
+        if (order == null) {
+            return;
+        }
+
+        if ("2".equals(order.getStatus())) {
+            order.setOrderTypeDesc("退款");
+        }
+
+        switch (order.getOrderType()) {
+            case "1":
+                order.setOrderTypeDesc("反扫收款");
+                break;
+            case "2":
+                order.setOrderTypeDesc("收款码");
+                break;
+            case "3":
+                order.setOrderTypeDesc("会员充值");
+                break;
+            case "4":
+                order.setOrderTypeDesc("POS刷卡");
+                break;
+            case "5":
+                order.setOrderTypeDesc("反扫会员充值");
+                break;
+            case "6":
+                order.setOrderTypeDesc("扫码王");
+                break;
+            case "7":
+                order.setOrderTypeDesc("H5");
+                break;
+            case "9":
+                order.setOrderTypeDesc("收款码");
+                break;
+            case "10":
+                order.setOrderTypeDesc("线上店");
+                break;
+            default:
+                order.setOrderTypeDesc("未知订单类型");
+                break;
+        }
+    }
+
+    public static void updateStaffName(MerchantOrder merchantOrder, String merchantCode, IdCard idCard) {
+        if (!merchantOrder.getMerchantCode().equals(merchantCode)) {
+            return;
+        }
+
+        switch (merchantOrder.getOrderType()) {
+            case "1":
+                if (idCard != null && Objects.equals(merchantOrder.getStaffCode(), idCard.getUserId() + "")) {
+                    // 说明是主商户的主扫
+                    merchantOrder.setStaffName(idCard.getCertName());
+                }
+                break;
+            case "10":
+                merchantOrder.setStaffName("线上店");
+                break;
+            default:
+                if (StringUtils.isEmpty(merchantOrder.getStaffName())) {
+                    merchantOrder.setStaffName("收款码");
+                }
+
+                break;
+        }
+    }
+
+    public static boolean isVipRecharge(MerchantOrder merchantOrder) {
+        return "3".equals(merchantOrder.getOrderType()) || "5".equals(merchantOrder.getOrderType());
+    }
+
+    public RealFans convertRealFans(){
+        RealFans realFans = new RealFans();
+        realFans.setSoleId(mercUserId);
+        realFans.setEnableMerchantCode(merchantCode);
+        realFans.setLogo(logo);
+        realFans.setNickName(nickName);
+        realFans.setPhone(phone);
+        realFans.setEnableTime(new Date());
+        return realFans;
+    }
+    /**
+     * @description:
+     * @date: 2021/8/24 10:37 
+ * @param merchant:
+     */
+    public void isAllowBankLarge(MerchantBaseInfo merchant) {
+        if(this.getConsumeFee() > MICRO_MAX_TRANS_AMT && "1".equals(merchant.getMerchantType())){
+            MsgException.throwException("单笔金额超限！");
+        }
+        if(Constant.PAY_TYPE_YSFPAY.equals(this.getPayTypeCode()) || "sxfPay2".equals(this.getPayTypeCode())){
+
+            if(!"1".equals(merchant.getIsUnionPay())){
+                if("4".equals(this.getAisleSwitch())){
+                    MsgException.throwException("实时到账通道暂不支持银联支付，请修改次日到账交易");
+                }else{
+                    MsgException.throwException("当前商户银联支付未开启,请联系客服");
+                }
+            }
+            if(this.getConsumeFee() > BANK_LARGE_AMT){
+                if(this.getOrderNumber().startsWith("SXF")){
+                    MsgException.throwException("当前通道不支持"+BANK_LARGE_AMT+"以上的银联云闪付付款，请在APP中切换通道或跟换支付方式交易！");
+                }
+                //TODO 关闭银联1000以上的付款
+                MsgException.throwException("暂不支持银联云闪付"+BANK_LARGE_AMT+"以上的交易！");
+                if(!"1".equals(merchant.getAllowBankLarge())){
+                    MsgException.throwException("未开启银联云闪付"+BANK_LARGE_AMT+"以上的交易，如需要请手动在APP中开启！");
+                }
+            }
+        }
+    }
+
+    /**
+     * @description:计算当前订单手续费以及实际到账金额
+     * @date: 2021/8/25 13:45
+     */
+    public void calcRateAndFee(BigDecimal rate) {
+        BigDecimal calcRate = rate.divide(new BigDecimal(10000));
+        BigDecimal mercFee = new BigDecimal(this.getConsumeFee()).multiply(calcRate).setScale(2, RoundingMode.HALF_UP);
+        BigDecimal fee = BigDecimal.ZERO;
+        if(this.getOrderNumber().startsWith("YS") && fee.doubleValue() <= 0.1d
+                && SettleTypeEnum.D0.getValue().equals(this.getSettlementType())){
+            fee = fee.add(new BigDecimal("0.1"));
+        }
+        this.setMercFee(mercFee);
+        this.setEnterFee(StringUtil.bigDecimal(this.getConsumeFee() - mercFee.doubleValue() - fee.doubleValue()));
+        this.setRate(rate);
+    }
+
+    /**
+     * 参数转换
+     * @param orderNew
+     * @param refundAmt
+     */
+    public void convert(MercOrderNew orderNew, BigDecimal refundAmt,Integer settlementType,String refundReason) {
+        if(refundAmt == null){
+            this.consumeFee = orderNew.getOrderAmt().doubleValue();
+        }else{
+            this.consumeFee = refundAmt.doubleValue();
+        }
+        this.orderNumber = orderNew.getOrderNo();
+        this.settlementType = settlementType;
+        this.transNo = orderNew.getTransNo();
+        this.remark = refundReason;
+    }
+
+    /**
+     * 新版设备订单表参数转换
+     * @param order
+     */
+    public void convert(MercOrderNew order,MerchantStore store) {
+        this.setOrderNumber(order.getOrderNo());
+        this.setOrderType("9");
+        this.setMerchantCode(order.getMerchantCode());
+        this.setMerchantName(order.getMerchantName());
+        this.setPayTypeCode(order.getPayType());
+        this.setPayTypeName(Constant.PAY_TYPE_ALIPAY.equals(order.getPayType()) ? Constant.PAY_TYPE_NAME_ALIPAY :
+                Constant.PAY_TYPE_WECHAT.equals(order.getPayType()) ?
+                        Constant.PAY_TYPE_NAME_WECHAT : Constant.PAY_TYPE_NAME_YSFPAY);
+        this.setThirdTransNo(order.getThirdTransNo());
+        if(store != null){
+            this.setStoreId(store.getStoreId());
+            this.setStoreName(store.getStoreName());
+        }
+        this.setConsumeFee(order.getActualAmt().doubleValue());
+        this.setTransNo(order.getTransNo());
+        this.setCreateDt(order.getCreateTime());
+        this.setTransDt(order.getTransDt());
+        this.setStatus("1");
+        BigDecimal mercFee = Constant.MIX_SETTLE_RATE.divide(BigDecimal.valueOf(10000)).multiply(order.getActualAmt()).setScale(2,BigDecimal.ROUND_HALF_DOWN);
+        this.setEnterFee(order.getActualAmt().subtract(mercFee).doubleValue());
+        this.setMercFee(mercFee);
+        this.setChannelRate(Constant.MIX_SETTLE_RATE);
+        this.setChannelFee(mercFee);
+        this.setMercUserId(order.getPayUserId());
+        this.setRate(Constant.MIX_SETTLE_RATE);
+        this.setSettlementType(SettleTypeEnum.D1.getValue());
+    }
+
+    /**
+     * 缴费通订单表转化成订单表数据
+     * @param order
+     */
+    public void convert(JftReceiptOrder order) {
+        this.setOrderNumber(order.getOrderNumber());
+        this.setOrderType("11");
+        this.setMerchantCode(order.getMerchantCode());
+        this.setMerchantName(order.getMerchantName());
+        this.setPayTypeCode(order.getPayType());
+        this.setPayTypeName(Constant.PAY_TYPE_ALIPAY.equals(order.getPayType()) ? Constant.PAY_TYPE_NAME_ALIPAY :
+                Constant.PAY_TYPE_WECHAT.equals(order.getPayType()) ?
+                        Constant.PAY_TYPE_NAME_WECHAT : Constant.PAY_TYPE_NAME_YSFPAY);
+        this.setThirdTransNo(order.getChannelTransNo());
+        this.setConsumeFee(order.getAmount().doubleValue());
+        this.setTransNo(order.getTransNo());
+        this.setCreateDt(order.getCreateTime());
+        this.setTransDt(order.getTransTime());
+        this.setStatus("1");
+        this.setEnterFee(order.getAmount().subtract(order.getMercFee()).doubleValue());
+        this.setMercFee(order.getMercFee());
+        this.setChannelRate(Constant.DEFAULT_JFT_COST_RATE);
+        this.setChannelFee(order.getChannelFee());
+        this.setMercUserId(order.getPayUserId());
+        this.setRate(BigDecimal.valueOf(order.getRate()));
+        this.setSettlementType(SettleTypeEnum.D0.getValue());
+        this.setUserId(Integer.valueOf(order.getUserId().toString()));
+        this.setMercNotifyUrl(order.getMercNotifyUrl());
+        this.setMercOrderNo(order.getMercOrderNo());
+    }
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantOrderRisk.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantOrderRisk.java
new file mode 100644
index 0000000..87eb20e
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantOrderRisk.java
@@ -0,0 +1,34 @@
+package cn.pluss.platform.entity;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * 支付订单风险信息
+ */
+@Data
+@Accessors(chain = true)
+public class MerchantOrderRisk {
+
+    private int id;
+
+    private String orderNumber;
+
+    private String province;
+
+    private String city;
+
+    /** 区 */
+    private String distinct;
+
+    private String ip;
+
+    /** 是否为异地支付，0：否； 1： 是 */
+    private int remote;
+
+    private Date createTime;
+
+    private Date updateTime;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantOrderSplit.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantOrderSplit.java
new file mode 100644
index 0000000..8541e18
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantOrderSplit.java
@@ -0,0 +1,195 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 订单分账信息表
+ * </p>
+ *
+ * @author bzg
+ * @since 2021-11-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_merchant_order_split")
+@NoArgsConstructor
+public class MerchantOrderSplit implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    public static final String DEFAULT_IS_DIVISTION = "01";
+
+    public static final String DEFAULT_IS_AGAIN_DIVISION = "Y";
+
+    public static final Integer SUCCESS_DIV_STATUS = 1;
+
+    public static final Integer FAIL_DIV_STATUS = 2;
+
+    public static final Integer PROGRESS_DIV_STATUS = 3;
+
+    @TableId("id")
+    private Long id;
+
+
+    /**
+     * 订单号
+     */
+    @TableField("orderNumber")
+    private String orderNumber;
+
+
+    /**
+     * 订单金额
+     */
+    @TableField("orderAmt")
+    private BigDecimal orderAmt;
+
+
+    /**
+     * 支付时间
+     */
+    @TableField("payTime")
+    private Date payTime;
+
+    /**
+     * 支付时间 开始时间
+     */
+    @TableField(exist = false, condition = "payTime &gt; #{%s}")
+    private Date payTimeStart;
+
+    /**
+     * 支付时间 截止时间
+     */
+    @TableField(exist = false, condition = "payTime &lt; #{%s}")
+    private Date payTimeEnd;
+
+    /**
+     * 支付状态 0:待支付 1:支付成功 2:退款中 3:退款成功 4：退款失败
+     */
+    @TableField("status")
+    private Integer status;
+
+
+    /**
+     * 商户单号
+     */
+    @TableField("mercOrderNo")
+    private String mercOrderNo;
+
+    /**
+     * 收款商户号
+     */
+    @TableField("merchantCode")
+    private String merchantCode;
+
+    /**
+     * 商户名称
+     */
+    @TableField("merchantName")
+    private String merchantName;
+
+
+    /**
+     * 分账模式
+     */
+    @TableField("divisionMode")
+    private String divisionMode;
+
+
+    /**
+     * 分账状态1：受理成功（登记成功） 2：分账成功 -1：分账失败 3：预分账成功(已拆分，待结算) 4：无需分账
+     */
+    @TableField("divStatus")
+    private Integer divStatus;
+
+
+    /**
+     * 分账手续费
+     */
+    @TableField("fee")
+    private BigDecimal fee;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(exist = false, condition = "createTime &gt; #{%s}")
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(exist = false, condition = "createTime &lt; #{%s}")
+    private Date createTimeEnd;
+
+    /**
+     * 手机费承担方
+     */
+    @TableField("feePayer")
+    private String feePayer;
+
+
+    /**
+     * 分账状态码
+     */
+    @TableField("divStatusCode")
+    private String divStatusCode;
+
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 退款金额
+     */
+    @TableField("refundAmt")
+    private BigDecimal refundAmt;
+
+    /**
+     * 异步通知地址
+     */
+    @TableField("notifyUrl")
+    private String notifyUrl;
+
+    @TableField(exist = false)
+    private List<MerchantOrderSplitDetail> detailList;
+
+    @TableField("merchantId")
+    private String merchantId;
+
+    public MerchantOrderSplit(MerchantOrder order,MerchantChannelStatus channel,String divisionMode,String notifyUrl) {
+        this.setOrderNumber(order.getOrderNumber());
+        this.setOrderAmt(BigDecimal.valueOf(order.getConsumeFee()));
+        this.setMercOrderNo(order.getMercOrderNo());
+        this.setMerchantCode(order.getMerchantCode());
+        this.setMerchantName(order.getMerchantName());
+        this.setPayTime(order.getTransDt());
+        this.setStatus(1);
+        this.setMerchantId(channel.getMerchantId());
+        this.setDivisionMode(divisionMode);
+        this.setNotifyUrl(notifyUrl);
+    }
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantOrderSplitDetail.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantOrderSplitDetail.java
new file mode 100644
index 0000000..7e77ba9
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantOrderSplitDetail.java
@@ -0,0 +1,143 @@
+package cn.pluss.platform.entity;
+
+import cn.pluss.platform.api.MercSubSplitAccount;
+import cn.pluss.platform.api.SplitReq;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 分账明细详情表
+ * </p>
+ *
+ * @author bzg
+ * @since 2022-07-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@NoArgsConstructor
+@TableName("tb_pluss_merchant_order_split_detail")
+public class MerchantOrderSplitDetail implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+
+    /**
+     * 商户编号
+     */
+    @TableField("merchantCode")
+    private String merchantCode;
+
+    /**
+     * 通道商编
+     */
+    @TableField("merchantId")
+    private String merchantId;
+
+    /**
+     * 商户名称
+     */
+    @TableField("merchantName")
+    private String merchantName;
+
+
+    /**
+     * 订单号
+     */
+    @TableField("orderNumber")
+    private String orderNumber;
+
+    /**
+     * 分账比例
+     */
+    @TableField("divRatio")
+    private BigDecimal divRatio;
+
+
+    /**
+     * 分账金额
+     */
+    @TableField("divAmt")
+    private BigDecimal divAmt;
+
+    /**
+     * 最终分账结果
+     */
+    @TableField("finalAmt")
+    private BigDecimal finalAmt;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+
+    @TableField("isChargeFee")
+    private String isChargeFee;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(exist = false, condition = "createTime &gt; #{%s}")
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(exist = false, condition = "createTime &lt; #{%s}")
+    private Date createTimeEnd;
+
+    /**
+     * 状态 1：已分账 -1：已退款
+     */
+    @TableField("status")
+    private Integer status;
+
+    /**
+     * 退款金额
+     */
+    @TableField("refundAmt")
+    private BigDecimal refundAmt;
+
+    @TableField("state")
+    private String state;
+
+    @TableField("channelSendSn")
+    private String channelSendSn;
+
+    @TableField("channelRecvSn")
+    private String channelRecvSn;
+
+    public MerchantOrderSplitDetail(MercSubSplitAccount account,MerchantBaseInfo merchant,MerchantChannelStatus channel,MerchantOrderSplit order) {
+        this.merchantCode = account.getMerchantCode();
+        this.merchantId = channel.getMerchantId();
+        this.merchantName = merchant.getAlias();
+        this.orderNumber = order.getOrderNumber();
+        if(SplitReq.DivisionMode.SCALE.getValue().equals(order.getDivisionMode())){
+            this.divRatio = new BigDecimal(account.getDivRatio());
+            this.setFinalAmt(order.getOrderAmt().multiply(this.getDivRatio()).setScale(2,BigDecimal.ROUND_HALF_UP));
+        }
+        if (SplitReq.DivisionMode.AMT.getValue().equals(order.getDivisionMode())) {
+            this.divAmt = new BigDecimal(account.getDivAmount());
+        }
+        this.setIsChargeFee(account.getIsChargeFee());
+    }
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantOrderSplitRefund.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantOrderSplitRefund.java
new file mode 100644
index 0000000..774e170
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantOrderSplitRefund.java
@@ -0,0 +1,217 @@
+package cn.pluss.platform.entity;
+
+import cn.pluss.platform.api.SplitRefund;
+import cn.pluss.platform.api.SplitReq;
+import cn.pluss.platform.util.StringUtil;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 分账订单退款详情表
+ * </p>
+ *
+ * @author bzg
+ * @since 2022-07-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_merchant_order_split_refund")
+@NoArgsConstructor
+public class MerchantOrderSplitRefund implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId("id")
+    private Long id;
+
+
+    /**
+     * 订单号
+     */
+    @TableField("orderNumber")
+    private String orderNumber;
+
+
+    /**
+     * 商户订单号
+     */
+    @TableField("mercOrderNo")
+    private String mercOrderNo;
+
+
+    /**
+     * 状态 0：退款中 1：退款成功 2.退款失败
+     */
+    @TableField("status")
+    private Integer status;
+
+
+    /**
+     * 订单金额
+     */
+    @TableField("orderAmt")
+    private BigDecimal orderAmt;
+
+    /**
+     * 下单时间
+     */
+    @TableField("orderTime")
+    private Date orderTime;
+
+    /**
+     * 退款单号
+     */
+    @TableField("refundNo")
+    private String refundNo;
+
+
+    /**
+     * 商户退款单号
+     */
+    @TableField("mercRefundNo")
+    private String mercRefundNo;
+
+
+    /**
+     * 退款时间
+     */
+    @TableField("refundTime")
+    private Date refundTime;
+
+    /**
+     * 退款时间 开始时间
+     */
+    @TableField(exist = false, condition = "refundTime &gt; #{%s}")
+    private Date refundTimeStart;
+
+    /**
+     * 退款时间 截止时间
+     */
+    @TableField(exist = false, condition = "refundTime &lt; #{%s}")
+    private Date refundTimeEnd;
+
+    /**
+     * 退款通知地址
+     */
+    @TableField("notifyUrl")
+    private String notifyUrl;
+
+
+    /**
+     * 退款金额
+     */
+    @TableField("refundAmt")
+    private BigDecimal refundAmt;
+
+    @TableField("refundReason")
+    private String refundReason;
+
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 通道退款状态值
+     */
+    @TableField("channelRefundState")
+    private String channelRefundState;
+
+    /**
+     * 退款资金状态
+     */
+    @TableField("channelFundsState")
+    private String channelFundsState;
+
+    /**
+     * 退款资金装填描述
+     */
+    @TableField("channelFundsDesc")
+    private String channelFundsDesc;
+
+    /**
+     * 通道退款流水号
+     */
+    @TableField("channelRefundNo")
+    private String channelRefundNo;
+
+    /**
+     *
+     */
+    @TableField(exist = false)
+    private String divisionMode;
+
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     *  开始时间
+     */
+    @TableField(exist = false, condition = "createTime &gt; #{%s}")
+    private Date createTimeStart;
+
+    /**
+     *  截止时间
+     */
+    @TableField(exist = false, condition = "createTime &lt; #{%s}")
+    private Date createTimeEnd;
+
+
+    @TableField(exist = false)
+    private JSONArray orderDivList;
+
+    @TableField(exist = false)
+    private JSONArray refundDivList;
+
+    public MerchantOrderSplitRefund(MerchantOrderSplit orderSplit, SplitReq req) {
+        this.setOrderNumber(orderSplit.getOrderNumber());
+        this.setMercOrderNo(orderSplit.getMercOrderNo());
+        this.setOrderAmt(orderSplit.getOrderAmt());
+        this.setRefundNo("YS_MERC_R_"+ StringUtil.getBillno());
+        this.setMercRefundNo(req.getMercRefundNo());
+        this.setNotifyUrl(req.getNotifyUrl());
+        this.setRefundAmt(new BigDecimal(req.getRefundAmt()));
+        this.setRefundReason(req.getRefundReason());
+        this.setOrderTime(orderSplit.getCreateTime());
+        this.setDivisionMode(orderSplit.getDivisionMode());
+        List<MerchantOrderSplitDetail> detailList = orderSplit.getDetailList();
+        JSONArray divList = new JSONArray(16);
+        if(!detailList.isEmpty()){
+            for (MerchantOrderSplitDetail detail:detailList) {
+                JSONObject result = new JSONObject(16);
+                result.put("division_mer_id",detail.getMerchantId());
+                result.put("division_amount",detail.getDivAmt());
+                result.put("division_ratio",detail.getDivRatio());
+                result.put("is_charge_fee",detail.getIsChargeFee());
+                divList.add(result);
+            }
+        }
+        this.setOrderDivList(divList);
+        List<SplitRefund> refundList = req.getRefundList();
+        JSONArray refundDivList = new JSONArray(16);
+        for (SplitRefund refund:refundList) {
+            JSONObject refObj = new JSONObject(3);
+            refObj.put("refund_mer_id",refund.getMerchantId());
+            refObj.put("refund_amount",refund.getRefundAmt());
+            refObj.put("ori_division_mode",orderSplit.getDivisionMode());
+            refundDivList.add(refObj);
+        }
+        this.setRefundDivList(refundDivList);
+    }
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantOrderStatistics.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantOrderStatistics.java
new file mode 100644
index 0000000..97da430
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantOrderStatistics.java
@@ -0,0 +1,100 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.Date;
+
+/**
+ * <p>
+ * 商户订单统计表
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-12-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_merchant_order_statistics")
+public class MerchantOrderStatistics implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 商户编号
+     */
+    @TableField("merchantCode")
+    private String merchantCode;
+
+
+    /**
+     * 交易总金额
+     */
+    @TableField("totalFee")
+    private BigDecimal totalFee;
+
+
+    /**
+     * 订单笔数
+     */
+    @TableField("count")
+    private Integer count;
+
+
+    /**
+     * 退款总金额
+     */
+    @TableField("retFee")
+    private BigDecimal retFee;
+
+
+    /**
+     * 退款总笔数
+     */
+    @TableField("retCount")
+    private Integer retCount;
+
+
+    /**
+     * 开始日期
+     */
+    @TableField("startDate")
+    private LocalDate startDate;
+
+
+    /**
+     * 截止时间
+     */
+    @TableField("endDate")
+    private LocalDate endDate;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(exist = false, condition = "createTime &gt; #{%s}")
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(exist = false, condition = "createTime &lt; #{%s}")
+    private Date createTimeEnd;
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantPlugin.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantPlugin.java
new file mode 100644
index 0000000..e6e0445
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantPlugin.java
@@ -0,0 +1,150 @@
+package cn.pluss.platform.entity;
+
+import cn.pluss.platform.config.mybatis.SqlConditionExtra;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 商户插件表
+ * CREATE TABLE `tb_pluss_merchant_plugin` (
+ *   `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
+ *   `channel` int(11) DEFAULT NULL COMMENT '通道id',
+ *   `userId` int(11) DEFAULT NULL COMMENT '用户id',
+ *   `pluginId` int(11) DEFAULT NULL COMMENT '插件id',
+ *   `status` varchar(4) DEFAULT NULL COMMENT '插件进件状态，参考merchant_channel_status表',
+ *   `thirdStatus` varchar(4) DEFAULT NULL COMMENT '通道返回状态',
+ *   `applicationId` varchar(50) DEFAULT NULL COMMENT '业务id',
+ *   `remark` varchar(255) DEFAULT NULL COMMENT '驳回原因',
+ *   `createTime` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+ *   `updateTime` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+ *   `extra` json DEFAULT NULL COMMENT '附加信息',
+ *   PRIMARY KEY (`id`),
+ *   UNIQUE KEY `idx1` (`channel`,`userId`) USING BTREE
+ * ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='商户插件表';
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-01-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_merchant_plugin")
+public class MerchantPlugin implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 通道id
+     */
+    @TableField("channel")
+    private Integer channel;
+
+
+    /**
+     * 用户id
+     */
+    @TableField("userId")
+    private Integer userId;
+
+
+    /**
+     * 插件id
+     */
+    @TableField("pluginId")
+    private String pluginId;
+
+
+    /**
+     * 插件进件状态，参考merchant_channel_status表
+     */
+    @TableField("status")
+    private String status;
+
+
+    /**
+     * 通道返回状态
+     */
+    @TableField("thirdStatus")
+    private String thirdStatus;
+
+    /**
+     * 业务id
+     */
+    @TableField("applicationId")
+    private String applicationId;
+
+    /**
+     * 驳回原因
+     */
+    @TableField("remark")
+    private String remark;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.GT)
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.LT)
+    private Date createTimeEnd;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "updateTime", fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    /**
+     * 更新时间 开始时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.GT)
+    private Date updateTimeStart;
+
+    /**
+     * 更新时间 截止时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.LT)
+    private Date updateTimeEnd;
+
+    /**
+     * 附加信息
+     */
+    @TableField("extra")
+    private JSONObject extra;
+
+    /**
+     * pos商编
+     */
+    private String posMerId;
+
+    /**
+     * 终端编号
+     */
+    @TableField(exist = false)
+    private String termList;
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantProfit.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantProfit.java
new file mode 100644
index 0000000..1bcf973
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantProfit.java
@@ -0,0 +1,184 @@
+package cn.pluss.platform.entity;
+
+import cn.pluss.platform.constants.Constant;
+import cn.pluss.platform.util.StringUtil;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * ALTER TABLE `shouyinbei`.`tb_pluss_merchant_profit`
+ * ADD COLUMN `profitRate` int(11) NULL COMMENT '上级收益费率' AFTER `merchantParentPhone`;
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+public class MerchantProfit {
+
+    /**
+     * 状态, 有效
+     */
+    public static final String STATUS_VALID = "1";
+
+    /**
+     * 状态, 无效, 对应订单可能已经退款
+     */
+    public static final String STATUS_INVALID = "0";
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+    private Long userId;
+    private String type;
+    private Double price;
+    private String orderNumber;
+    private String merchantCode;
+    private String merchantName;
+    private Double consumeFee;
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createDt;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date orderDt;
+    private String status;
+
+    private String payTypeCode;
+    private String payTypeName;
+    private String merchantLogo;
+    /**
+     * 当前获取受益人，也就是userId对应的商户或者代理商对应的等级
+     */
+    private Integer level;
+    private Long merchantParentId;
+    private String merchantParentName;
+    private String merchantParentLogo;
+    private String phone;
+    private String userName;
+    /**
+     * 商户的直属上级等级
+     */
+    private String merchantParentLevel;
+    private String merchantParentPhone;
+
+    /**
+     * 超级服务商业务员id
+     */
+    private String agentStaffId;
+
+    @TableField(exist = false)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date startTime;
+    @TableField(exist = false)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date endTime;
+
+     @DateTimeFormat(pattern = "yyyy-MM-dd")
+     @TableField(select = false, insertStrategy = FieldStrategy.NEVER, updateStrategy = FieldStrategy.NEVER)
+     private String recordDate;
+    //
+    // @TableField(select = false, value = "recordDate", insertStrategy = FieldStrategy.NEVER, updateStrategy = FieldStrategy.NEVER, condition = SqlConditionExtra.GE)
+    // private Date recordDateStart;
+    //
+    // @TableField(select = false, value = "recordDate", insertStrategy = FieldStrategy.NEVER, updateStrategy = FieldStrategy.NEVER, condition = SqlConditionExtra.LE)
+    // private Date recordDateEnd;
+    //
+    // @TableField(select = false, insertStrategy = FieldStrategy.NEVER, updateStrategy = FieldStrategy.NEVER)
+    // private String recordMonth;
+    //
+    // @TableField(select = false, value = "recordMonth", insertStrategy = FieldStrategy.NEVER, updateStrategy = FieldStrategy.NEVER, condition = SqlConditionExtra.GE)
+    // private String recordMonthStart;
+    //
+    // @TableField(select = false, value = "recordMonth", insertStrategy = FieldStrategy.NEVER, updateStrategy = FieldStrategy.NEVER, condition = SqlConditionExtra.LE)
+    // private String recordMonthEnd;
+
+    /**
+     * 上级收益费率，只有超级服务商下的一级直推才有这个值
+     */
+    private Integer profitRate;
+
+    @TableField(exist = false)
+    private BigDecimal rate;
+
+    /**
+     * 用户类型
+     */
+    @TableField(exist = false)
+    private String userType;
+
+    public MerchantProfit(UserApp userApp, UserApp profitUserApp, MerchantOrder order,BigDecimal profitAmt,BigDecimal profitRate,String type,String orderType) {
+        this.userId = profitUserApp.getUserId();
+        //V2.0模式
+        this.type = type;
+        this.price = profitAmt.doubleValue();
+        this.orderNumber = order.getOrderNumber();
+        this.merchantCode = order.getMerchantCode();
+        String merchantName = order.getMerchantName();
+        if("2".equals(merchantName)){
+            merchantName = merchantName + "【缴费通】";
+        }
+        this.merchantName = merchantName;
+        this.consumeFee = order.getConsumeFee();
+        this.createDt = order.getTransDt() == null ? new Date() : order.getTransDt();
+        this.orderDt = order.getCreateDt();
+        this.status = "1";
+        this.payTypeCode = order.getPayTypeCode();
+        this.payTypeName = order.getPayTypeName();
+
+        this.merchantLogo = userApp.getLogo();
+        this.level = userApp.getLevel();
+        if(StringUtil.isNotEmpty(userApp.getPhone())){
+            this.phone = StringUtil.isHideMobile(userApp.getPhone());
+        }
+        if(StringUtil.isNotEmpty(userApp.getUserName())){
+            this.userName = StringUtil.hideSecret(userApp.getUserName());
+        }
+        this.merchantParentId = userApp.getParentId();
+        this.profitRate = profitRate.intValue();
+        if(StringUtil.isNotEmpty(userApp.getAgentStaffId()) && !"general".equals(type)){
+            this.setAgentStaffId(String.valueOf(userApp.getAgentStaffId()));
+        }
+    }
+
+    public MerchantProfit(UserApp userApp, UserApp profitUserApp, JftReceiptOrder order,BigDecimal profitAmt,BigDecimal profitRate,String type,String orderType) {
+        this.userId = profitUserApp.getUserId();
+        this.type = type;
+        this.price = profitAmt.doubleValue();
+        this.orderNumber = order.getOrderNumber();
+        this.merchantCode = order.getMerchantCode();
+        String merchantName = order.getMerchantName();
+        if("2".equals(merchantName)){
+            merchantName = merchantName + "【缴费通】";
+        }
+        this.merchantName = merchantName;
+        this.consumeFee = order.getAmount().doubleValue();
+        this.createDt = order.getTransTime() == null ? new Date() : order.getTransTime();
+        this.orderDt = order.getCreateTime();
+        this.status = "1";
+        this.payTypeCode = order.getPayType();
+        this.payTypeName = Constant.PAY_TYPE_ALIPAY.equals(order.getPayType()) ? Constant.PAY_TYPE_NAME_ALIPAY : Constant.PAY_TYPE_WECHAT.equals(order.getPayType()) ? Constant.PAY_TYPE_NAME_WECHAT : Constant.PAY_TYPE_NAME_YSFPAY ;
+        if(StringUtil.isNotEmpty(userApp.getPhone())){
+            this.phone = StringUtil.isHideMobile(userApp.getPhone());
+        }
+        if(StringUtil.isNotEmpty(userApp.getUserName())){
+            this.userName = StringUtil.hideSecret(userApp.getUserName());
+        }
+        this.merchantLogo = userApp.getLogo();
+        this.level = userApp.getLevel();
+        this.merchantParentId = userApp.getParentId();
+        this.profitRate = profitRate.intValue();
+        if(StringUtil.isNotEmpty(userApp.getAgentStaffId()) && !"general".equals(type)){
+            this.setAgentStaffId(String.valueOf(userApp.getAgentStaffId()));
+        }
+    }
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantQrcode.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantQrcode.java
new file mode 100644
index 0000000..7c82821
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantQrcode.java
@@ -0,0 +1,107 @@
+package cn.pluss.platform.entity;
+
+import cn.pluss.platform.config.mybatis.SqlConditionExtra;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-10-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_merchant_qrcode")
+public class MerchantQrcode implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @TableField(exist = false)
+    private String userId;
+
+    @TableField(exist = false)
+    private String name;
+
+    //是否选中
+    @TableField(exist = false)
+    private String status;
+
+    /**
+     * 商户编号
+     */
+    @TableField(value = "merchantCode",whereStrategy = FieldStrategy.NOT_EMPTY,condition = SqlCondition.LIKE)
+    private String merchantCode;
+
+
+
+
+
+    /**
+     * 商户名称
+     */
+    @TableField(value = "merchantName",whereStrategy = FieldStrategy.NOT_EMPTY)
+    private String merchantName;
+
+    /**
+     * 微信号
+     */
+    @TableField(value = "wechat",whereStrategy = FieldStrategy.NOT_EMPTY)
+    private String wechat;
+
+
+    /**
+     * 二维码图片地址
+     */
+    @TableField("qrCodeUrl")
+    private String qrCodeUrl;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.GT)
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.LT)
+    private Date createTimeEnd;
+
+    /**
+     * 修改时间
+     */
+    @TableField(value = "updateTime", fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    /**
+     * 修改时间 开始时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.GT)
+    private Date updateTimeStart;
+
+    /**
+     * 修改时间 截止时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.LT)
+    private Date updateTimeEnd;
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantRate.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantRate.java
new file mode 100644
index 0000000..6837ab5
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantRate.java
@@ -0,0 +1,60 @@
+package cn.pluss.platform.entity;
+
+import cn.pluss.platform.util.DateUtils;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * CREATE TABLE `tb_pluss_merchant_rate` (
+ *   ` id` int(11) NOT NULL AUTO_INCREMENT,
+ *   `userId` int(11) DEFAULT NULL COMMENT '商户id',
+ *   `rate` int(11) DEFAULT NULL COMMENT '费率',
+ *   `updateTime` datetime DEFAULT NULL COMMENT '更新时间',
+ *   `previousRate` int(11) DEFAULT NULL COMMENT '修改前的费率',
+ *   PRIMARY KEY (`id`),
+ *   UNIQUE KEY `idx_userId` (`userId`) USING BTREE
+ * ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='商户费率表，用于代理服务商推广的商户';
+ */
+@Data
+@Accessors(chain = true)
+public class MerchantRate {
+
+    public static int MAX_RATE = 25;
+
+    public static int MIN_RATE = 21;
+
+    private Integer id;
+
+    private String userId;
+
+    private Integer previousRate;
+
+    private Integer rate;
+
+    private Date updateTime;
+
+    public Integer getCurrentRate() {
+        Date updateTime = getUpdateTime();
+        Date now = new Date();
+        if (DateUtils.formatDateDefault(updateTime, "yyyy-MM-dd").compareTo(DateUtils.formatDateDefault(now, "yyyy-MM-dd")) >= 0) {
+            rate = getPreviousRate();
+            if (rate == null || rate == 0) {
+                rate = 38;
+            }
+        }
+        return rate;
+    }
+
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String isFixedRate;
+
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private Date startTime;
+
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private Date endTime;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantRateNew.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantRateNew.java
new file mode 100644
index 0000000..2b6bd46
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantRateNew.java
@@ -0,0 +1,157 @@
+package cn.pluss.platform.entity;
+
+import cn.pluss.platform.config.mybatis.SqlConditionExtra;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.Date;
+
+/**
+ * <p>
+ * 商户费率表(新)
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-08-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_merchant_rate_new")
+public class MerchantRateNew implements Serializable {
+
+    public static final int MIN_LEVEL = 21;
+
+    public static final int MAX_LEVEL = 38;
+
+    private static final long serialVersionUID = 1L;
+
+    @TableField(exist = false)
+    private String userId;
+
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 通道id
+     */
+    @TableField("channel")
+    private Integer channel;
+
+
+    /**
+     * 用户id
+     */
+    @TableField("merchantId")
+    private String merchantId;
+
+
+    /**
+     * 微信费率等级，费率参考字典表wx_rate
+     */
+    @TableField("wxRate")
+    private Integer wxRate;
+
+
+    /**
+     * 支付宝费率等级，费率参考字典表ali_rate
+     */
+    @TableField("aliRate")
+    private Integer aliRate;
+
+
+    /**
+     * 银联费率等级，费率参考字典表bank_rate
+     */
+    @TableField("bankRate")
+    private Integer bankRate;
+
+
+    /**
+     * 银联1000+费率等级，费率参考字典表bank_rate_1000+, 目前随行付不支持1000+的支付
+     */
+    @TableField("bankRateLarge")
+    private Integer bankRateLarge;
+
+
+    /**
+     * 微信费率等级，费率参考字典表wx_rate
+     */
+    @TableField(exist = false)
+    private BigDecimal wxRateValue;
+
+
+    /**
+     * 支付宝费率等级，费率参考字典表ali_rate
+     */
+    @TableField(exist = false)
+    private BigDecimal aliRateValue;
+
+
+    /**
+     * 银联费率等级，费率参考字典表bank_rate
+     */
+    @TableField(exist = false)
+    private BigDecimal bankRateValue;
+
+
+    /**
+     * 银联1000+费率等级，费率参考字典表bank_rate_1000+, 目前随行付不支持1000+的支付
+     */
+    @TableField(exist = false)
+    private BigDecimal bankRateLargeValue;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.GT)
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.LT)
+    private Date createTimeEnd;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "updateTime", fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    /**
+     * 更新时间 开始时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.GT)
+    private Date updateTimeStart;
+
+    /**
+     * 更新时间 截止时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.LT)
+    private Date updateTimeEnd;
+
+    public static void setRateValue(MerchantRateNew entity) {
+        entity.setWxRateValue(BigDecimal.valueOf(entity.wxRate).setScale(3, RoundingMode.HALF_UP));
+        entity.setAliRateValue(BigDecimal.valueOf(entity.aliRate).setScale(3, RoundingMode.HALF_UP));
+        entity.setBankRateValue(BigDecimal.valueOf(entity.bankRate + 2).setScale(3, RoundingMode.HALF_UP));
+        entity.setBankRateLargeValue(BigDecimal.valueOf((entity.bankRateLarge - 21) / 2.0f + 53).setScale(3, RoundingMode.HALF_UP));
+    }
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantRateNewRecord.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantRateNewRecord.java
new file mode 100644
index 0000000..f96d360
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantRateNewRecord.java
@@ -0,0 +1,143 @@
+package cn.pluss.platform.entity;
+
+import cn.pluss.platform.config.mybatis.SqlConditionExtra;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 商户费率表(新)
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-08-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_merchant_rate_new_record")
+public class MerchantRateNewRecord implements Serializable {
+
+    /**
+     * 审核中
+     */
+    public static final String STATUS_IN_REVIEW = "0";
+
+    /**
+     * 修改成功，已生效
+     */
+    public static final String STATUS_SUCCESS = "1";
+
+    /**
+     * 修改失败
+     */
+    public static final String STATUS_FAIL = "2";
+
+    /**
+     * 修改成功，待生效
+     */
+    public static final String STATUS_SUCCESS_NOT_EFFECT = "3";
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 通道id
+     */
+    @TableField("channel")
+    private Integer channel;
+
+
+    /**
+     * 用户id
+     */
+    @TableField("merchantId")
+    private String merchantId;
+
+
+    /**
+     * 微信费率等级，费率参考字典表wx_rate
+     */
+    @TableField("wxRate")
+    private Integer wxRate;
+
+
+    /**
+     * 支付宝费率等级，费率参考字典表ali_rate
+     */
+    @TableField("aliRate")
+    private Integer aliRate;
+
+
+    /**
+     * 银联费率等级，费率参考字典表bank_rate
+     */
+    @TableField("bankRate")
+    private Integer bankRate;
+
+
+    /**
+     * 银联1000+费率等级，费率参考字典表bank_rate_1000+, 目前随行付不支持1000+的支付
+     */
+    @TableField("bankRateLarge")
+    private Integer bankRateLarge;
+
+    /**
+     * 存一些备注信息
+     */
+    private String remark;
+
+    /**
+     * 费率变更状态, 0, 审核中；1、已修改成功；2、修改失败；3、修改成功，未生效
+     */
+    @TableField("status")
+    private String status;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.GT)
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.LT)
+    private Date createTimeEnd;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "updateTime", fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    /**
+     * 更新时间 开始时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.GT)
+    private Date updateTimeStart;
+
+    /**
+     * 更新时间 截止时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.LT)
+    private Date updateTimeEnd;
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantRateRecord.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantRateRecord.java
new file mode 100644
index 0000000..3e7bb66
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantRateRecord.java
@@ -0,0 +1,49 @@
+package cn.pluss.platform.entity;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 费率修改记录表
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-09-02
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_merchant_rate_record")
+public class MerchantRateRecord implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Integer id;
+
+    /**
+     * 用户id
+     */
+    @TableField("userId")
+    private String userId;
+
+    /**
+     * 费率
+     */
+    private Integer rate;
+
+    /**
+     * 创建时间
+     */
+    @TableField("createTime")
+//    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantRefundOrder.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantRefundOrder.java
new file mode 100644
index 0000000..5798f48
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantRefundOrder.java
@@ -0,0 +1,171 @@
+package cn.pluss.platform.entity;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.leshua.MerchantRegisterDTO;
+import cn.pluss.platform.vo.MerchantOrderVO;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 商户退款订单表实体类
+ */
+@Data
+@Accessors(chain = true)
+public class MerchantRefundOrder {
+
+    @TableField
+    private Integer id;
+
+    /**
+     * 商户编号
+     */
+    private String merchantCode;
+
+    /**
+     * 商户简称
+     */
+    private String alias;
+
+    /**
+     * 交易单号
+     */
+    private String orderNumber;
+
+    /**
+     * 退款单号
+     */
+    private String refundNo;
+
+    /**
+     * 通道订单号
+     */
+    private String channelNo;
+
+    /**
+     * 支付时间
+     */
+    private Date payTime;
+
+    /**
+     * 退款时间
+     */
+    private Date refundTime;
+
+    /**
+     * 退款状态 1：退款成功 2：退款中3：退款失败
+     */
+    private String status;
+
+    /**
+     * 订单类型
+     */
+    private String orderType;
+
+    /**
+     * 支付类型code
+     */
+    private String payTypeCode;
+
+    /**
+     * 支付类型名称
+     */
+    private String payTypeName;
+
+    /**
+     * 支付金额
+     */
+    private BigDecimal payAmt;
+
+    /**
+     * 订单来源1：乐刷2：随行付3：其他
+     */
+    private String aisleSwitch;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 通道商户号
+     */
+    private String channelMercNo;
+
+    /**
+     * 退款金额
+     */
+    private BigDecimal refundAmt;
+
+    /**
+     * 商户退款单号
+     */
+    private String mercRefundNo;
+
+    /**
+     * 商户退款异步通知地址
+     */
+    private String notifyUrl;
+
+    /**
+     * 退款失败原因
+     */
+    private String failMsg;
+
+    @TableField(exist = false)
+    private BigDecimal refundAmtCount;
+    @TableField(exist = false)
+    private Integer refunCount;
+    @TableField(exist = false)
+    private Integer transferAmtCount;
+
+    @TableField(exist = false)
+    private List<String> payTypeCodeList;
+
+    public void convert(MerchantOrderVO order, Map<String,Object> params, String mchNo) {
+        this.merchantCode = order.getMerchantCode();
+        this.alias = order.getAlias();
+        this.orderNumber = order.getOrderNumber();
+        this.refundNo = params.get("refundNo") == null ? "" : params.get("refundNo").toString();
+        this.channelNo = order.getTransNo();
+        this.payTime = order.getTransDt();
+        this.refundTime = new Date();
+        this.status = params.get("status") == null ? "" : params.get("status").toString();
+        this.orderType = order.getOrderType();
+        this.payTypeCode = order.getPayTypeCode();
+        this.payTypeName = order.getPayTypeName();
+        this.payAmt = new BigDecimal(String.valueOf(order.getConsumeFee()));
+        this.aisleSwitch = order.getAisleSwitch();
+        this.createTime = new Date();
+        this.channelMercNo = mchNo;
+        this.failMsg = params.get("msg") == null ? "" : params.get("msg").toString();
+        this.refundAmt = BigDecimal.valueOf(order.getConsumeFee().doubleValue());
+    }
+
+    public void convert(MerchantOrder order, Map<String,Object> result, String mchNo, BigDecimal refundAmt, JSONObject object) {
+        this.merchantCode = order.getMerchantCode();
+        this.alias = order.getMerchantName();
+        this.orderNumber = order.getOrderNumber();
+        this.refundNo = (String)result.get("refundNo");
+        this.channelNo = order.getTransNo();
+        this.payTime = order.getTransDt();
+        this.refundTime = new Date();
+        this.status = (String)result.get("status");
+        this.orderType = order.getOrderType();
+        this.payTypeCode = order.getPayTypeCode();
+        this.payTypeName = order.getPayTypeName();
+        this.payAmt = BigDecimal.valueOf(order.getConsumeFee());
+        this.refundAmt = refundAmt;
+        this.aisleSwitch = order.getAisleSwitch();
+        this.createTime = new Date();
+        this.channelMercNo = mchNo;
+        this.failMsg = (String)result.get("msg");
+        this.mercRefundNo = object.getString("mercRefundNo");
+        this.notifyUrl = object.getString("notifyUrl");
+    }
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantRegistAuditRecord.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantRegistAuditRecord.java
new file mode 100644
index 0000000..527747b
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantRegistAuditRecord.java
@@ -0,0 +1,27 @@
+package cn.pluss.platform.entity;
+
+import  java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+@Data
+public class MerchantRegistAuditRecord {
+
+    @TableId
+    private Integer id;
+    private String merchantCode;
+    private String merchantName;
+    private String agentCode;
+    private String agentName;
+    private String creator;
+    private String message;
+    private String type;
+    private String status;
+    private String failReason;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date creatDt;
+    private String modifyStatus;
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantRegistLog.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantRegistLog.java
new file mode 100644
index 0000000..95e0afd
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantRegistLog.java
@@ -0,0 +1,25 @@
+package cn.pluss.platform.entity;
+
+import  java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+@Data
+public class MerchantRegistLog {
+
+    @TableId
+    private Integer id;
+    private String merchantCode;
+    private String storeId;
+    private String applyStatus;
+    private String message;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date createDt;
+    private String merchantName;
+    private String merchantId;
+    private String parentCode;
+    private String creator;
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantRejectDesc.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantRejectDesc.java
new file mode 100644
index 0000000..8b4a28c
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantRejectDesc.java
@@ -0,0 +1,82 @@
+package cn.pluss.platform.entity;
+
+import cn.pluss.platform.config.mybatis.SqlConditionExtra;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author bzg
+ * @since 2021-01-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_merchant_reject_desc")
+public class MerchantRejectDesc implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 驳回原因
+     */
+    @TableField(value = "rejectName",whereStrategy = FieldStrategy.NOT_EMPTY,condition = SqlCondition.LIKE)
+    private String rejectName;
+
+
+    /**
+     * 排序
+     */
+    @TableField("sort")
+    private Integer sort;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.GT)
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.LT)
+    private Date createTimeEnd;
+
+    /**
+     * 修改时间
+     */
+    @TableField(value = "updateTime", fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    /**
+     * 修改时间 开始时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.GT)
+    private Date updateTimeStart;
+
+    /**
+     * 修改时间 截止时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.LT)
+    private Date updateTimeEnd;
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantSplitSetting.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantSplitSetting.java
new file mode 100644
index 0000000..e3a9faa
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantSplitSetting.java
@@ -0,0 +1,147 @@
+package cn.pluss.platform.entity;
+
+import cn.pluss.platform.api.SplitReq;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 商户分账配置表
+ * </p>
+ *
+ * @author bzg
+ * @since 2021-11-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_merchant_split_setting")
+@NoArgsConstructor
+public class MerchantSplitSetting implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    public static String DEFAULT_IS_DIVISTION = "01";
+
+    public static BigDecimal MAX_DIV_RATIO = BigDecimal.ONE;
+
+    public static String DEFAULT_IS_CHARGEFEE = "02";
+
+    public static String YES_IS_CHARGEFEE = "01";
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 主商户编号
+     */
+    @TableField("chieMerchantCode")
+    private String chieMerchantCode;
+
+
+    /**
+     * 主商户id
+     */
+    @TableField("chieMerchantId")
+    private String chieMerchantId;
+
+
+    /**
+     * 原订单是否参与分账01：是 02：否
+     */
+    @TableField("isDivistion")
+    private String isDivistion;
+
+
+    /**
+     * 分账模式01：比例 02：金额
+     */
+    @TableField("divisionMode")
+    private String divisionMode;
+
+
+    /**
+     * 分账商户号
+     */
+    @TableField("diviMerchantCode")
+    private String diviMerchantCode;
+
+
+    /**
+     * 分账商户ID 对应channelStatus id
+     */
+    @TableField("diviMerchantId")
+    private String diviMerchantId;
+
+
+    /**
+     * 分账金额
+     */
+    @TableField("divAmt")
+    private BigDecimal divAmt;
+
+
+    /**
+     * 分账比例 最大4位小数 分账比例之和为1
+     */
+    @TableField("divRatio")
+    private BigDecimal divRatio;
+
+
+    /**
+     * 是否收取手续费，若配置手续费收支分离，该参数配置的手续费承担方不生效
+     */
+    @TableField("isChargeFee")
+    private String isChargeFee;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(exist = false, condition = "createTime &gt; #{%s}")
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(exist = false, condition = "createTime &lt; #{%s}")
+    private Date createTimeEnd;
+
+    /**
+     * 状态 1：正常 0 关闭
+     */
+    @TableField("status")
+    private Integer status;
+
+    /**
+     * 异步通知地址
+     */
+    @TableField("notifyUrl")
+    private String notifyUrl;
+
+
+    public MerchantSplitSetting(MerchantChannelStatus channel) {
+        this.setChieMerchantCode(channel.getMerchantCode());
+        this.setChieMerchantId(channel.getMerchantId());
+        this.setDiviMerchantCode(channel.getMerchantCode());
+        this.setDiviMerchantId(channel.getMerchantId());
+        this.setDivisionMode(SplitReq.DivisionMode.SCALE.getValue());
+        this.setDivRatio(MAX_DIV_RATIO);
+        this.setIsChargeFee(DEFAULT_IS_CHARGEFEE);
+        this.setIsDivistion(DEFAULT_IS_DIVISTION);
+    }
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantStaffConn.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantStaffConn.java
new file mode 100644
index 0000000..01f0eec
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantStaffConn.java
@@ -0,0 +1,99 @@
+package cn.pluss.platform.entity;
+
+import cn.pluss.platform.config.mybatis.SqlConditionExtra;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 员工商户关联表
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-03-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_merchant_staff_conn")
+public class MerchantStaffConn implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 员工id
+     */
+    @TableField("userId")
+    private Long userId;
+
+
+    /**
+     * 商户code
+     */
+    @TableField("merchantCode")
+    private String merchantCode;
+
+    /**
+     * 是否推送微信消息0：不推送 1：推送
+     */
+    @TableField("isPushWxMessage")
+    private String isPushWxMessage;
+
+    /**
+     * 员工角色
+     * 收银员 cashier,
+     * 合伙人 partner,
+     * 一般员工 staff,
+     */
+    @TableField("roleCode")
+    private String roleCode;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.GT)
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.LT)
+    private Date createTimeEnd;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "updateTime", fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    /**
+     * 更新时间 开始时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.GT)
+    private Date updateTimeStart;
+
+    /**
+     * 更新时间 截止时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.LT)
+    private Date updateTimeEnd;
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantStore.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantStore.java
new file mode 100644
index 0000000..2359b7e
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantStore.java
@@ -0,0 +1,77 @@
+package cn.pluss.platform.entity;
+
+import  java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * @author DJH 修改
+ */
+@Data
+@Accessors(chain = true)
+public class MerchantStore {
+
+    @TableId
+    private Integer id;
+    private String merchantCode;
+    private String merchantName;
+    private String storeId;
+    private String storeName;
+    private String creator;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date createDt;
+    private String openingTime;
+    /**
+     * 1, 营业中；2, 禁用
+     */
+    private String status;
+    private String email;
+
+    //新增 2019-09-30 lq
+    private String storeHeadPic;
+    private String storeInsidePic;
+    private String cashPic;
+    private String productDesc;
+    private String payEcdemicSwitch;
+
+    /**
+     * 是否是活动商户 0：否 1：是
+     */
+    private String isMarket;
+
+    @TableField(exist = false)
+    private String merchantType;
+
+    /**
+     * 查询条件
+     */
+    @TableField(exist = false)
+    private String startTime;
+    @TableField(exist = false)
+    private String endTime;
+    @TableField(exist = false)
+    private Integer page;
+    @TableField(exist = false)
+    private Integer size;
+    @TableField(exist = false)
+    private String proName;
+    @TableField(exist = false)
+    private String cityName;
+    @TableField(exist = false)
+    private String alias;
+    @TableField(exist = false)
+    private String mcsStatus;
+
+    /**
+     * 是否允许异地支付
+     * @return
+     */
+    public boolean allowEcdemicPay() {
+        return "1".equals(payEcdemicSwitch);
+    }
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantTransfer.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantTransfer.java
new file mode 100644
index 0000000..810b25a
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantTransfer.java
@@ -0,0 +1,96 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-09-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_merchant_transfer")
+public class MerchantTransfer implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 转账商户编号
+     */
+    @TableField("merchantCode")
+    private String merchantCode;
+
+    /**
+     * 转账商户简称
+     */
+    private String alias;
+
+    /**
+     * 转账通道商户编号
+     */
+    @TableField("channelNo")
+    private String channelNo;
+
+    /**
+     * 转账通道id
+     */
+    @TableField("channelId")
+    private Integer channelId;
+
+    /**
+     * 转账金额
+     */
+    private BigDecimal amount;
+
+    /**
+     * 创建时间(打款发起时间)
+     */
+    @TableField("createDt")
+    private Date createDt;
+
+    /**
+     * 打款订单号
+     */
+    @TableField("orderNo")
+    private String orderNo;
+
+    /**
+     * 备注
+     */
+    private String content;
+
+    /**
+     * 转账时间
+     */
+    @TableField("transTime")
+    private Date transTime;
+
+    /**
+     * 转账通道单号
+     */
+    @TableField("transNo")
+    private String transNo;
+
+    /**
+     * 描述
+     */
+    private String remark;
+
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantTransferCash.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantTransferCash.java
new file mode 100644
index 0000000..7cec443
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantTransferCash.java
@@ -0,0 +1,83 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-09-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_merchant_transfer_cash")
+public class MerchantTransferCash implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 提现金额
+     */
+    @TableField("cashAmt")
+    private BigDecimal cashAmt;
+
+    /**
+     * 提现用户Id
+     */
+    @TableField("userId")
+    private Long userId;
+
+    /**
+     * 提现用户名称
+     */
+    @TableField("userName")
+    private String userName;
+
+    /**
+     * 提现状态1：提现中 2:提现成功，3：提现失败
+     */
+    private String status;
+
+    /**
+     * 提现时间
+     */
+    @TableField("cashTime")
+    private Date cashTime;
+
+    /**
+     * 提现单号
+     */
+    @TableField("cashNo")
+    private String cashNo;
+
+    /**
+     * 创建时间
+     */
+    @TableField("createTime")
+    private Date createTime;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    @TableField(exist = false)
+    private Date dateStr;
+
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/NewArea.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/NewArea.java
new file mode 100644
index 0000000..0bbedca
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/NewArea.java
@@ -0,0 +1,21 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+@Data
+public class NewArea {
+
+    @TableId
+    private Integer id;
+    private Integer parentId;
+    private String name;
+    private String shortName;
+    private Float longitude;
+    private Float latitude;
+    private Integer level;
+    private Integer sort;
+    private Integer status;
+    private Integer open;
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/Notice.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/Notice.java
new file mode 100644
index 0000000..f11b83b
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/Notice.java
@@ -0,0 +1,176 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+import java.util.UUID;
+
+@Data
+@NoArgsConstructor
+public class Notice {
+
+    /**
+     * 系统通知 - 身份证认证
+     */
+    public static final int TYPE_ID_CARD_AUTH = 0;
+
+    /**
+     * 系统通知 - 商户认证
+     */
+    public static final int TYPE_MERCHANT_AUTH = 1;
+
+    /**
+     * 系统通知 - 员工退款申请
+     */
+    public static final int TYPE_STAFF_REFUND = 2;
+
+    /**
+     * 系统通知 - 银行卡认证
+     */
+    public static final int TYPE_BANK_AUTH = 5;
+
+    /**
+     * 系统通知 - 商户资料修改
+     */
+    public static final int TYPE_MER_DATA_CHANGE = 8;
+
+    /**
+     * 系统通知 - 结算卡修改
+     */
+    public static final int TYPE_MER_BANK_CHANGE = 9;
+
+    /**
+     * 系统通知 - 商户违规
+     */
+    public static final int TYPE_MER_OUT_LINE = 10;
+
+    /**
+     * 系统通知 - 商户异常
+     */
+    public static final int TYPE_MER_EXCEPTION = 11;
+
+    /**
+     * 系统通知 - 商户冻结
+     */
+    public static final int TYPE_MER_FREEZE = 12;
+
+    /**
+     * 分润通知 - 商户分润
+     */
+    public static final int TYPE_MER_PROFIT = 6;
+
+    /**
+     * 分润通知 - 商户升级分润
+     */
+    public static final int TYPE_MER_UPDATE_PROFIT = 7;
+
+    @TableId
+    private Integer id;
+
+    @TableField(value = "userId")
+    private String userId;
+    private String userName;
+
+    /**
+     * 0 分润通知; 1 系统通知; 2到账通知
+     */
+    private Integer typeFirst;
+
+    /**
+     * -1 自定义
+     * 0身份证认证    1商家认证  2店员退款通知   4邀请注册通知  5银行卡认证  6 商户分润通知 98到账通知  99 其他    7升级收益通知
+     */
+    private Integer typeSecond;
+    private String conrtent;
+
+    @TableField(value = "createDt", fill = FieldFill.INSERT)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createDt;
+    private String noticeCode;
+    private String orderNumber;
+    private Integer isDeal;
+    private Integer isApply;
+
+    private String title;
+
+    @TableField(value = "`desc`")
+    private String desc;
+
+    /**
+     * 内容外链url
+     */
+    private String url;
+
+    /**
+     * 唯一标识
+     */
+    private String uniqueKey;
+
+    @TableField(exist = false)
+    private String createUserId;
+
+    /**
+     * 已读标识，1为已读
+     */
+    @TableField(exist = false)
+    private Integer readStatus;
+
+    /**
+     * 推送表示，0，不推送，1，推送， 2，推送并推送上级
+     */
+    @TableField(exist = false)
+    private String pushFlag;
+
+    /**
+     * @description:指定推送的ids
+     * @date: 2021/8/27 14:51
+     */
+    @TableField(exist = false)
+    private String userIds;
+
+    @TableField(exist = false)
+    private String aliass;
+
+    @TableField(exist = false)
+    private String parentIds;
+
+    @TableField(exist = false)
+    private String parentName;
+
+    @TableField(exist = false)
+    private String scheduleFlag;
+
+    public Notice(Integer firstType, Integer secondType, UserApp userApp) {
+        this.setUserId(userApp.getUserId().toString());
+        this.setNoticeCode(UUID.randomUUID().toString().replace("-", ""));
+        this.setCreateDt(new Date());
+        this.setUserName(userApp.getUserName());
+        this.setTypeFirst(firstType);
+        this.setTypeSecond(secondType);
+        this.setIsDeal(0);
+    }
+
+    public Notice(Integer firstType, Integer secondType, String userId) {
+        this.setUserId(userId);
+        this.setNoticeCode(UUID.randomUUID().toString().replace("-", ""));
+        this.setCreateDt(new Date());
+        this.setTypeFirst(firstType);
+        this.setTypeSecond(secondType);
+        this.setIsDeal(0);
+    }
+
+    public Notice(Integer firstType, Integer secondType, String userId, String userName) {
+        this.setUserId(userId);
+        this.setNoticeCode(UUID.randomUUID().toString().replace("-", ""));
+        this.setCreateDt(new Date());
+        this.setUserName(userName);
+        this.setTypeFirst(firstType);
+        this.setTypeSecond(secondType);
+        this.setIsDeal(0);
+    }
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/NoticeReadRecord.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/NoticeReadRecord.java
new file mode 100644
index 0000000..7714e8c
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/NoticeReadRecord.java
@@ -0,0 +1,77 @@
+package cn.pluss.platform.entity;
+
+import cn.pluss.platform.config.mybatis.SqlConditionExtra;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-04-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_notice_read_record")
+public class NoticeReadRecord implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId("id")
+    private Integer id;
+
+
+    /**
+     * 用户id
+     */
+    @TableField("userId")
+    private Integer userId;
+
+
+    /**
+     * 类型。1、到账通知；2、其他通知；3、活动资讯
+     */
+    @TableField("type")
+    private String type;
+
+
+    /**
+     * 通知消息id
+     */
+    @TableField("noticeId")
+    private Integer noticeId;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.GT)
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.LT)
+    private Date createTimeEnd;
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/NoticeTemplate.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/NoticeTemplate.java
new file mode 100644
index 0000000..fdd7949
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/NoticeTemplate.java
@@ -0,0 +1,74 @@
+package cn.pluss.platform.entity;
+
+import cn.pluss.platform.config.mybatis.SqlConditionExtra;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 自定义消息通知模板表
+ * </p>
+ *
+ * @author bzg
+ * @since 2021-08-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_notice_template")
+public class NoticeTemplate implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Integer id;
+
+
+    /**
+     * 模板类型
+     */
+    @TableField("type")
+    private String type;
+
+
+    /**
+     * 模板变量
+     */
+    @TableField("variable")
+    private String variable;
+
+
+    /**
+     * 通知内容模板
+     */
+    @TableField("content")
+    private String content;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.GT)
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.LT)
+    private Date createTimeEnd;
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/Notification.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/Notification.java
new file mode 100644
index 0000000..a6c588b
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/Notification.java
@@ -0,0 +1,19 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class Notification {
+
+    private Integer id;
+    private String title;
+    private String content;
+    private String status;
+
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/OfficialActivity.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/OfficialActivity.java
new file mode 100644
index 0000000..baefaac
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/OfficialActivity.java
@@ -0,0 +1,142 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 官方活动表
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-09-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_official_activity")
+public class OfficialActivity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 活动名称
+     */
+    @TableField(value = "officName", condition = SqlCondition.LIKE)
+    private String officName;
+
+    /**
+     * 活动标题
+     */
+    @TableField("officTitle")
+    private String officTitle;
+
+    /**
+     * 活动内容
+     */
+    @TableField("officContent")
+    private String officContent;
+
+    /**
+     * 所属分组
+     */
+    @TableField("groupBy")
+    private String groupBy;
+
+    /**
+     * 活动图片地址
+     */
+    @TableField("officImgUrl")
+    private String officImgUrl;
+
+    /**
+     * 活动图片跳转地址
+     */
+    @TableField("toImgUrl")
+    private String toImgUrl;
+
+    /**
+     * 活动开始时间
+     */
+    @TableField("startTime")
+    private Date startTime;
+
+    /**
+     * 活动结束时间
+     */
+    @TableField("endTime")
+    private Date endTime;
+
+    /**
+     * 活动状态1：未发布 2：进行中 3：已过期，4：已下架
+     */
+    private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    @TableField("createTime")
+    private Date createTime;
+
+    /**
+     * 创建人
+     */
+    @TableField("createBy")
+    private String createBy;
+
+    /**
+     * 修改时间
+     */
+    @TableField("updateTime")
+    private Date updateTime;
+
+    /**
+     * 活动规则
+     */
+    @TableField("officRule")
+    private String officRule;
+
+    /**
+     * 活动详情图片
+     */
+    @TableField("officDetailImgUrl")
+    private String officDetailImgUrl;
+
+    /**
+     * 活动分组No
+     */
+    @TableField("activityGroupNo")
+    private String activityGroupNo;
+
+    /**
+     * 活动类型 对应字典表
+     */
+    @TableField("actType")
+    private String actType;
+
+    /**
+     * 活动归属角色 common公共，SV2，ZY_BST
+     * @date: 2022/2/18 10:28
+     */
+    @TableField("roleType")
+    private String roleType;
+
+    @TableField(exist = false)
+    private String commonType;
+
+    @TableField(exist = false)
+    private String value;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/OfficialGoods.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/OfficialGoods.java
new file mode 100644
index 0000000..e69d431
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/OfficialGoods.java
@@ -0,0 +1,103 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 商品活动表
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-09-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_official_goods")
+public class OfficialGoods implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 商品名称
+     */
+    @TableField("goodName")
+    private String goodName;
+
+    /**
+     * 商品描述
+     */
+    @TableField("goodDesc")
+    private String goodDesc;
+
+    /**
+     * 商品价格
+     */
+    @TableField("goodPrice")
+    private BigDecimal goodPrice;
+
+    /**
+     * 商品状态1：未上架 2：上架中3：已下架
+     */
+    private String status;
+
+    /**
+     * 商品图片跳转地址
+     */
+    @TableField("toImgUrl")
+    private String toImgUrl;
+
+    /**
+     * 商品图片地址
+     */
+    @TableField("imgUrl")
+    private String imgUrl;
+
+    /**
+     * 创建时间
+     */
+    @TableField("createTime")
+    private Date createTime;
+
+    @TableField(exist = false)
+    private String address;
+
+    /**
+     * 是否包邮
+     */
+    @TableField("isPostage")
+    private Integer isPostage;
+
+    /**
+     * 邮费
+     */
+    @TableField("postageFee")
+    private BigDecimal postageFee;
+
+    /**
+     * 抵扣规则
+     */
+    @TableField("deductRule")
+    private Integer deductRule;
+
+    /**
+     * 抵扣规则
+     */
+    @TableField("deductValue")
+    private BigDecimal deductValue;
+
+
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/OfficialGoodsExchange.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/OfficialGoodsExchange.java
new file mode 100644
index 0000000..c78cd7b
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/OfficialGoodsExchange.java
@@ -0,0 +1,101 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-10-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_official_goods_exchange")
+public class OfficialGoodsExchange implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 用户ID
+     */
+    @TableField("userId")
+    private Long userId;
+
+
+    /**
+     * 兑换商品id
+     */
+    @TableField("goodId")
+    private Integer goodId;
+
+    /**
+     * 创建时间
+     */
+    @TableField("createTime")
+    private Date createTime;
+
+    /**
+     * 商户详细地址
+     */
+    @TableField(value = "address",whereStrategy = FieldStrategy.NOT_EMPTY,condition = SqlCondition.LIKE)
+    private String address;
+
+    /**
+     * 商户联系手机号
+     */
+    private String phone;
+
+    /**
+     * 商户真实名字
+     */
+    @TableField(value = "userName",whereStrategy = FieldStrategy.NOT_EMPTY,condition = SqlCondition.LIKE)
+    private String userName;
+
+    private BigDecimal price;
+
+    @TableField(value = "name",whereStrategy = FieldStrategy.NOT_EMPTY,condition = SqlCondition.LIKE)
+    private String name;
+    /**
+     * @description:支付状态 0：未支付 1：已支付
+     * @date: 2021/11/23 15:09
+     */
+    private Integer status;
+
+    /**
+     * @description:订单号
+     * @date: 2021/11/23 15:10
+     */
+    private String orderNumber;
+
+    /**
+     * @description:快递单号
+     * @date: 2021/11/23 15:13
+     */
+    private String expressNo;
+
+    /**
+     * @description:物流状态0：待发货 1：已发货
+     * @date: 2021/11/23 15:14
+     */
+    private Integer deliveryStatus;
+
+    /**
+     * 发货时间
+     * @date: 2021/11/23 15:14
+     */
+    private Date deliveryTime;
+
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/OpenAccountConfig.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/OpenAccountConfig.java
new file mode 100644
index 0000000..e329b5d
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/OpenAccountConfig.java
@@ -0,0 +1,135 @@
+package cn.pluss.platform.entity;
+
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.util.StringUtil;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 开户奖配置表
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-06-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_open_account_config")
+public class OpenAccountConfig implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    public static final String DEFAULT_TYPE = "01";
+
+    public static final String AREA_TYPE = "02";
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 所属角色
+     */
+    @TableField("roleCode")
+    private String roleCode;
+
+
+    /**
+     * 类型 01：表示默认类型 如果没有查询到符合条件的。就按照默认的开户奖进行发放 02：区域 如果匹配到对应的区域 则按照该区域配置的开户奖进行发放
+     */
+    @TableField("type")
+    private String type;
+
+
+    /**
+     * 省
+     */
+    @TableField("provinceCode")
+    private String provinceCode;
+
+
+    /**
+     * 市
+     */
+    @TableField("cityCode")
+    private String cityCode;
+
+
+    /**
+     * 区域(市/县)
+     */
+    @TableField("areaCode")
+    private String areaCode;
+
+
+    /**
+     * 省份名称
+     */
+    @TableField("provinceName")
+    private String provinceName;
+
+
+    /**
+     * 市名称
+     */
+    @TableField("cityName")
+    private String cityName;
+
+
+    /**
+     * 区域名称
+     */
+    @TableField("areaName")
+    private String areaName;
+
+
+    /**
+     * 等级(等级越高优先级越高)
+     */
+    @TableField("level")
+    private Integer level;
+
+
+    /**
+     * 奖励金额
+     */
+    @TableField("rewardAmt")
+    private BigDecimal rewardAmt;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(exist = false, condition = "createTime &gt; #{%s}")
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(exist = false, condition = "createTime &lt; #{%s}")
+    private Date createTimeEnd;
+
+    public void checkParams() {
+        MsgException.checkBlank(this.getRoleCode(),"角色类型不能为空");
+        MsgException.checkBlank(this.getType(),"类型不能为空");
+        MsgException.checkNull(this.getRewardAmt(),"金额不能为空");
+        if(this.getType().equals(OpenAccountConfig.AREA_TYPE)){
+            MsgException.checkNull(this.getProvinceCode(),"省不能为空");
+        }
+    }
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/OpenAccountRecord.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/OpenAccountRecord.java
new file mode 100644
index 0000000..140d059
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/OpenAccountRecord.java
@@ -0,0 +1,214 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 用户开户奖励明细
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-06-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@NoArgsConstructor
+@TableName("tb_pluss_open_account_record")
+public class OpenAccountRecord implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    public static final String  TYPE_PAY = "01";
+
+    public static final String  REFUND_PAY = "02";
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+
+    /**
+     * 用户ID(付款用户ID)
+     */
+    @TableField("userId")
+    private Long userId;
+
+
+    /**
+     * 商户名称
+     */
+    @TableField("merchantName")
+    private String merchantName;
+
+
+    /**
+     * 订单号
+     */
+    @TableField("orderNumber")
+    private String orderNumber;
+
+
+    /**
+     * 订单金额
+     */
+    @TableField("orderAmt")
+    private BigDecimal orderAmt;
+
+
+    /**
+     * 商品code
+     */
+    @TableField("goodCode")
+    private String goodCode;
+
+    /**
+     * 商品名称
+     */
+    @TableField("goodName")
+    private String goodName;
+
+    /**
+     * 类型 01: 表示设备下单 02：设备退款
+     */
+    @TableField("type")
+    private String type;
+
+
+    /**
+     * 奖励金额 可以为正数 也可以为负数
+     */
+    @TableField("rewardAmt")
+    private BigDecimal rewardAmt;
+
+
+    /**
+     * 状态 01：正常 02：禁用
+     */
+    @TableField("status")
+    private String status;
+
+
+    /**
+     * 奖励对应的用户ID(表示收益人)
+     */
+    @TableField("rewardUserId")
+    private Long rewardUserId;
+
+
+    /**
+     * 区域code
+     */
+    @TableField("areaCode")
+    private String areaCode;
+
+
+    /**
+     * 区域名称
+     */
+    @TableField("areaName")
+    private String areaName;
+
+    /**
+     * 角色code
+     */
+    @TableField("roleCode")
+    private String roleCode;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+
+    /**
+     * 创建日期
+     */
+    @TableField(insertStrategy = FieldStrategy.NEVER, updateStrategy = FieldStrategy.NEVER)
+    private Date createDate;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(exist = false, condition = "createTime &gt; #{%s}")
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(exist = false, condition = "createTime &lt; #{%s}")
+    private Date createTimeEnd;
+
+    /**
+     * 开始日期
+     */
+    @TableField(exist = false)
+    private String startTime;
+
+    /**
+     * 结束日期
+     */
+    @TableField(exist = false)
+    private String endTime;
+
+    /**
+     * 金额分界线
+     */
+    public static BigDecimal DEFAULT_AMT = BigDecimal.valueOf(100);
+
+    public static BigDecimal LIBAO_1_AMT = BigDecimal.valueOf(169);
+
+    public static BigDecimal LIBAO_2_AMT = BigDecimal.valueOf(299);
+
+    public static BigDecimal DEFAULT_ADD_LIBAO_AMT = BigDecimal.valueOf(30);
+    /**
+     *
+     * @param order
+     * @param rewardAmt
+     * @param merchant
+     */
+    public OpenAccountRecord(Object order, BigDecimal rewardAmt, MerchantBaseInfo merchant,UserApp userApp) {
+        if(order instanceof MercOrderDetail){
+            MercOrderDetail o = (MercOrderDetail)order;
+            this.setOrderNumber(o.getOrderNo());
+            this.setOrderAmt(o.getPrice());
+            this.setGoodCode(o.getCode());
+            this.setGoodName(o.getName());
+        }else if(order instanceof DeviceMerchantBuy){
+            DeviceMerchantBuy o = (DeviceMerchantBuy)order;
+            this.setOrderNumber(o.getOrderNo());
+            this.setOrderAmt(BigDecimal.valueOf(o.getOrderAmount()));
+            this.setGoodCode(o.getCode());
+            this.setGoodName(o.getName());
+        }
+        this.setUserId(Long.valueOf(merchant.getUserId()));
+        this.setMerchantName(merchant.getAlias());
+        if(rewardAmt.compareTo(DEFAULT_AMT) >= 0){
+            this.setRewardAmt(rewardAmt);
+        }else{
+            if(this.getOrderAmt().compareTo(LIBAO_2_AMT) == 0){
+                this.setRewardAmt(rewardAmt.add(DEFAULT_ADD_LIBAO_AMT));
+            }else{
+                this.setRewardAmt(rewardAmt);
+            }
+        }
+        this.setRewardUserId(userApp.getUserId());
+        this.setAreaCode(merchant.getAddressNo());
+        this.setRoleCode(userApp.getRoleCode());
+        this.setAreaName(merchant.getProvince() + "-" + merchant.getCity() + "-" + merchant.getDistrict());
+    }
+
+    public static OpenAccountRecord build(Object order, BigDecimal rewardAmt, MerchantBaseInfo merchant, UserApp userApp) {
+        OpenAccountRecord record = new OpenAccountRecord(order,rewardAmt,merchant,userApp);
+        return record;
+    }
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/OperationRecord.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/OperationRecord.java
new file mode 100644
index 0000000..79400b3
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/OperationRecord.java
@@ -0,0 +1,78 @@
+package cn.pluss.platform.entity;
+
+import cn.pluss.platform.config.mybatis.SqlConditionExtra;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Data
+@Accessors(chain = true)
+@TableName(value = "tb_pluss_operation_record")
+public class OperationRecord {
+    private Integer id;
+    //来自tb_pluss_dict
+    @TableField(exist = false)
+    private String dictName;
+    //来自tb_pluss_role_info
+
+    private String operator;
+    private String dictValue;
+    private String userId;
+
+    @TableField(condition = SqlCondition.LIKE_RIGHT)
+    private String remark;
+
+    @TableField("extension")
+    private JSONObject extension;
+
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.GT)
+    private Date createTimeStart;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.LT)
+    private Date createTimeEnd;
+
+    @TableField(exist = false)
+    private String status;
+
+    @TableField(exist = false)
+    private String merchantName;
+
+    @TableField(exist = false)
+    private String loginName;
+
+    /**
+     * 不需要插入或更新
+     */
+    @TableField(insertStrategy = FieldStrategy.NEVER, updateStrategy = FieldStrategy.NEVER
+            , value = "ip")
+    private String ip;
+
+    @TableField(insertStrategy = FieldStrategy.NEVER, updateStrategy = FieldStrategy.NEVER
+            , value = "extension ->> '$.isp'")
+    private String isp;
+
+    @TableField(insertStrategy = FieldStrategy.NEVER, updateStrategy = FieldStrategy.NEVER
+            , value = "extension ->> '$.city'")
+    private String city;
+
+    @TableField(insertStrategy = FieldStrategy.NEVER, updateStrategy = FieldStrategy.NEVER
+            , value = "extension ->> '$.province'")
+    private String province;
+
+    @TableField(insertStrategy = FieldStrategy.NEVER, updateStrategy = FieldStrategy.NEVER
+            , value = "extension ->> '$.country'")
+    private String country;
+
+    @TableField(insertStrategy = FieldStrategy.NEVER, updateStrategy = FieldStrategy.NEVER
+            , value = "extension ->> '$.county'")
+    private String county;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/PayAreaRyx.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/PayAreaRyx.java
new file mode 100644
index 0000000..dec7114
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/PayAreaRyx.java
@@ -0,0 +1,57 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author bzg
+ * @since 2022-02-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_pay_area_ryx")
+public class PayAreaRyx implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    @TableField("provinceCode")
+    private String provinceCode;
+
+
+    @TableField("province")
+    private String province;
+
+
+    @TableField("cityCode")
+    private String cityCode;
+
+
+    @TableField("city")
+    private String city;
+
+
+    @TableField("areaCode")
+    private String areaCode;
+
+
+    @TableField("area")
+    private String area;
+
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/PhoneConfig.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/PhoneConfig.java
new file mode 100644
index 0000000..79b4325
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/PhoneConfig.java
@@ -0,0 +1,66 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 手机号配置表
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-04-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_phone_config")
+public class PhoneConfig implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 手机号
+     */
+    @TableField("phone")
+    private String phone;
+
+
+    /**
+     * 名称
+     */
+    @TableField("name")
+    private String name;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(exist = false, condition = "createTime &gt; #{%s}")
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(exist = false, condition = "createTime &lt; #{%s}")
+    private Date createTimeEnd;
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/PhoneValidateCode.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/PhoneValidateCode.java
new file mode 100644
index 0000000..c5c9a42
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/PhoneValidateCode.java
@@ -0,0 +1,47 @@
+package cn.pluss.platform.entity;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Data
+public class PhoneValidateCode {
+
+    @TableId
+    private Integer id;
+    private String phone;
+    private String code;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date sendDt;
+
+    /**
+     * 状态
+     */
+    private String status;
+
+    /**
+     * 试错次数
+     */
+    private Integer attempt;
+    private String remark;
+
+    /**
+     * forget 忘记密码
+     */
+    @TableField(exist = false)
+    private String type;
+
+    /**
+     * 有效时间
+     */
+    @JsonIgnore
+    @JSONField(serialize = false)
+    @TableField(exist = false)
+    private Long limitTime;
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/PlatformData.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/PlatformData.java
new file mode 100644
index 0000000..dc0f3be
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/PlatformData.java
@@ -0,0 +1,193 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 首页数据统计表
+ * </p>
+ *
+ * @author bzg
+ * @since 2021-10-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_platform_data")
+public class PlatformData implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 交易金额
+     */
+    @TableField("transAmt")
+    private BigDecimal transAmt;
+
+
+    /**
+     * 支付宝交易金额
+     */
+    @TableField("aliAmt")
+    private BigDecimal aliAmt;
+
+
+    /**
+     * 微信交易金额
+     */
+    @TableField("wxAmt")
+    private BigDecimal wxAmt;
+
+
+    /**
+     * 云闪付交易金额
+     */
+    @TableField("ysfAmt")
+    private BigDecimal ysfAmt;
+
+
+    /**
+     * 交易笔数
+     */
+    @TableField("transNum")
+    private Integer transNum;
+
+
+    /**
+     * 支付宝笔数
+     */
+    @TableField("aliNum")
+    private Integer aliNum;
+
+
+    /**
+     * 微信交易笔数
+     */
+    @TableField("wxNum")
+    private Integer wxNum;
+
+
+    /**
+     * 云闪付交易笔数
+     */
+    @TableField("ysfNum")
+    private Integer ysfNum;
+
+
+    /**
+     * 退款金额
+     */
+    @TableField("refundAmt")
+    private BigDecimal refundAmt;
+
+
+    /**
+     * 支付宝退款金额
+     */
+    @TableField("aliRefundAmt")
+    private BigDecimal aliRefundAmt;
+
+
+    /**
+     * 微信退款金额
+     */
+    @TableField("wxRefundAmt")
+    private BigDecimal wxRefundAmt;
+
+
+    /**
+     * 云闪付退款金额
+     */
+    @TableField("ysfRefundAmt")
+    private BigDecimal ysfRefundAmt;
+
+
+    /**
+     * 门店新增数量
+     */
+    @TableField("storeNum")
+    private Integer storeNum;
+
+
+    /**
+     * 会员新增数量
+     */
+    @TableField("memberNum")
+    private Integer memberNum;
+
+
+    /**
+     * 推广员新增数量
+     */
+    @TableField("promoterNum")
+    private Integer promoterNum;
+
+
+    /**
+     * 收益金额
+     */
+    @TableField("profitAmt")
+    private BigDecimal profitAmt;
+
+
+    /**
+     * 推广分润金额
+     */
+    @TableField("shareAmt")
+    private BigDecimal shareAmt;
+
+
+    /**
+     * 粉丝分润金额
+     */
+    @TableField("fansAmt")
+    private BigDecimal fansAmt;
+
+
+    /**
+     * 实际收益金额
+     */
+    @TableField("actualAmt")
+    private BigDecimal actualAmt;
+
+
+    /**
+     * 统计日期
+     */
+    @TableField("operatDate")
+    private String operatDate;
+
+
+    @TableField(value = "operateMonth", insertStrategy = FieldStrategy.NEVER, updateStrategy = FieldStrategy.NEVER)
+    private String operateMonth;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(exist = false, condition = "createTime &gt; #{%s}")
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(exist = false, condition = "createTime &lt; #{%s}")
+    private Date createTimeEnd;
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/PostageConfig.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/PostageConfig.java
new file mode 100644
index 0000000..9b73295
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/PostageConfig.java
@@ -0,0 +1,99 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 邮费信息配置表
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-03-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_postage_config")
+public class PostageConfig implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    public static final BigDecimal WEIGHT_UNIT = BigDecimal.ONE;
+
+    public static final String STATUS_NO = "0";
+
+    public static final String STATUS_YES = "1";
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 区域Code
+     */
+    @TableField("areaCode")
+    private String areaCode;
+
+    /**
+     * 区域名称
+     */
+    @TableField(value = "areaName",whereStrategy = FieldStrategy.NOT_EMPTY,condition = SqlCondition.LIKE)
+    private String areaName;
+
+
+    @TableField("areaLevel")
+    private String areaLevel;
+
+
+    /**
+     * 首重 xx/1kg
+     */
+    @TableField("firstWeight")
+    private BigDecimal firstWeight;
+
+
+    /**
+     * 续重 xx/1kg
+     */
+    @TableField("nextWeight")
+    private BigDecimal nextWeight;
+
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(exist = false, condition = "createTime &gt; #{%s}")
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(exist = false, condition = "createTime &lt; #{%s}")
+    private Date createTimeEnd;
+
+    /**
+     * 启用 状态1：启用 0：不启用
+     */
+    private String status;
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/Province.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/Province.java
new file mode 100644
index 0000000..77ee59d
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/Province.java
@@ -0,0 +1,15 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+@Data
+public class Province {
+
+    @TableId
+    private Integer f_province_no;
+    private String f_province_name;
+    private String f_aliasp;
+    private Integer f_province_cups_no;
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/PushAll.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/PushAll.java
new file mode 100644
index 0000000..3698a18
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/PushAll.java
@@ -0,0 +1,41 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author djh
+ */
+@Data
+@TableName("tb_pluss_push_all")
+public class PushAll {
+
+    /**
+     * 主键
+     */
+    @TableId
+    private Integer id;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 内容
+     */
+    private String content;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/QrCode.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/QrCode.java
new file mode 100644
index 0000000..efa1aca
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/QrCode.java
@@ -0,0 +1,44 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * 二维码实体类
+ */
+@Data
+@Accessors(chain = true)
+public class QrCode {
+    @TableId
+    private Integer id;
+    /** 设备编号 */
+    private String qrNo;
+    /** 设备编号 */
+    @TableField(exist = false)
+    private String snNo;
+    /** 设备订单编号 */
+    private String orderNo;
+    /** 购买商家名称 */
+    private String buyMercName;
+    /** 购买商家ID */
+    private String buyMercId;
+    /** 激活商家名称 */
+    private String actMercName;
+    /** 激活商家ID */
+    private String actMercId;
+    /** 二维码状态1：未出售，2：已出售3:已激活 */
+    private String status;
+    /** 创建时间 */
+    private Date createTime;
+    /** 创建人 */
+    private String createBy;
+    /** 删除标记1：正常2：删除 */
+    private String delFlag;
+    /**  */
+    private String remarks;
+
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/QuestionsAnswers.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/QuestionsAnswers.java
new file mode 100644
index 0000000..aa19871
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/QuestionsAnswers.java
@@ -0,0 +1,21 @@
+package cn.pluss.platform.entity;
+
+import  java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+@Data
+public class QuestionsAnswers {
+
+    @TableId
+    private Integer id;
+    private String question;
+    private String answer;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date createDt;
+    private Integer seq;
+    private Integer status;
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/QueueData.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/QueueData.java
new file mode 100644
index 0000000..4bc2ad3
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/QueueData.java
@@ -0,0 +1,32 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-04-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_queue_data")
+public class QueueData implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(type = IdType.INPUT)
+    private String id;
+
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/RateOperationTemp.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/RateOperationTemp.java
new file mode 100644
index 0000000..d07c964
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/RateOperationTemp.java
@@ -0,0 +1,85 @@
+package cn.pluss.platform.entity;
+
+import cn.pluss.platform.config.mybatis.SqlConditionExtra;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-08-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_rate_operation_temp")
+public class RateOperationTemp implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Integer id;
+
+
+    /**
+     * 通道id
+     */
+    @TableField("channel")
+    private Integer channel;
+
+
+    /**
+     * 通道商编
+     */
+    @TableField("merchantId")
+    private String merchantId;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.GT)
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.LT)
+    private Date createTimeEnd;
+
+    /**
+     * 修改时间
+     */
+    @TableField(value = "updateTime", fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    /**
+     * 修改时间 开始时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.GT)
+    private Date updateTimeStart;
+
+    /**
+     * 修改时间 截止时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.LT)
+    private Date updateTimeEnd;
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/RealFans.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/RealFans.java
new file mode 100644
index 0000000..aaa1d4d
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/RealFans.java
@@ -0,0 +1,53 @@
+package cn.pluss.platform.entity;
+
+import  java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_real_fans")
+public class RealFans {
+
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    @TableField(value = "nickName",whereStrategy = FieldStrategy.NOT_EMPTY,condition = SqlCondition.LIKE)
+    private String nickName;
+
+    @TableField(value = "logo")
+    private String logo;
+
+    @TableField(value = "phone")
+    private String phone;
+
+    @TableField(value = "soleId",whereStrategy = FieldStrategy.NOT_EMPTY)
+    private String soleId;
+
+    @TableField(value = "aliConsum")
+    private String aliConsum;
+
+    @TableField(value = "wechatConsum")
+    private String wechatConsum;
+
+    @TableField(value = "enableMerchantCode",whereStrategy = FieldStrategy.NOT_EMPTY)
+    private String enableMerchantCode;
+
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date enableTime;
+
+    @TableField(exist = false)
+    private String alias;
+
+    @TableField(exist = false)
+    private Date startTime;
+
+    @TableField(exist = false)
+    private Date endTime;
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/RegionCodeLs.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/RegionCodeLs.java
new file mode 100644
index 0000000..6e30126
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/RegionCodeLs.java
@@ -0,0 +1,75 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 乐刷地区表
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-07-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_region_code_sxf")
+public class RegionCodeLs implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 省级名称
+     */
+    @TableField("province")
+    private String province;
+
+
+    /**
+     * 省级名称编码
+     */
+    @TableField("provinceCode")
+    private String provinceCode;
+
+
+    /**
+     * 市级名称
+     */
+    @TableField("city")
+    private String city;
+
+
+    /**
+     * 市级名称编码
+     */
+    @TableField("cityCode")
+    private String cityCode;
+
+
+    /**
+     * 县区级别名称
+     */
+    @TableField("area")
+    private String area;
+
+
+    /**
+     * 县区级别名称编码
+     */
+    @TableField("areaCode")
+    private String areaCode;
+
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/RegionCodeRyx.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/RegionCodeRyx.java
new file mode 100644
index 0000000..1ae530b
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/RegionCodeRyx.java
@@ -0,0 +1,95 @@
+package cn.pluss.platform.entity;
+
+import cn.pluss.platform.config.mybatis.SqlConditionExtra;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 瑞银信进件，地区编码
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-01-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_region_code_ryx")
+public class RegionCodeRyx implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 省名称
+     */
+    @TableField("province")
+    private String province;
+
+
+    /**
+     * 省编码
+     */
+    @TableField("provinceCode")
+    private String provinceCode;
+
+
+    /**
+     * 市名称
+     */
+    @TableField("city")
+    private String city;
+
+
+    /**
+     * 市编码
+     */
+    @TableField("cityCode")
+    private String cityCode;
+
+
+    /**
+     * 县/区名称
+     */
+    @TableField("area")
+    private String area;
+
+
+    /**
+     * 县/区编码
+     */
+    @TableField("areaCode")
+    private String areaCode;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.GT)
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.LT)
+    private Date createTimeEnd;
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/RegionCodeSxf.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/RegionCodeSxf.java
new file mode 100644
index 0000000..26c22f4
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/RegionCodeSxf.java
@@ -0,0 +1,75 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 银盛地区表
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-07-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_region_code_sxf")
+public class RegionCodeSxf implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 省级名称
+     */
+    @TableField("province")
+    private String province;
+
+
+    /**
+     * 省级名称编码
+     */
+    @TableField("provinceCode")
+    private String provinceCode;
+
+
+    /**
+     * 市级名称
+     */
+    @TableField("city")
+    private String city;
+
+
+    /**
+     * 市级名称编码
+     */
+    @TableField("cityCode")
+    private String cityCode;
+
+
+    /**
+     * 县区级别名称
+     */
+    @TableField("area")
+    private String area;
+
+
+    /**
+     * 县区级别名称编码
+     */
+    @TableField("areaCode")
+    private String areaCode;
+
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/RegionCodeYs.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/RegionCodeYs.java
new file mode 100644
index 0000000..8340237
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/RegionCodeYs.java
@@ -0,0 +1,75 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 银盛地区表
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-07-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_region_code_ys")
+public class RegionCodeYs implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 省级名称
+     */
+    @TableField("province")
+    private String province;
+
+
+    /**
+     * 省级名称编码
+     */
+    @TableField("provinceCode")
+    private String provinceCode;
+
+
+    /**
+     * 市级名称
+     */
+    @TableField("city")
+    private String city;
+
+
+    /**
+     * 市级名称编码
+     */
+    @TableField("cityCode")
+    private String cityCode;
+
+
+    /**
+     * 县区级别名称
+     */
+    @TableField("area")
+    private String area;
+
+
+    /**
+     * 县区级别名称编码
+     */
+    @TableField("areaCode")
+    private String areaCode;
+
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/RegionReflect.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/RegionReflect.java
new file mode 100644
index 0000000..8ea1a40
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/RegionReflect.java
@@ -0,0 +1,54 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 不同通道的地区表映射表
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-07-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_region_reflect")
+public class RegionReflect implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 通道id
+     */
+    @TableField("channel")
+    private Integer channel;
+
+
+    /**
+     * 使用的地区表id，目前app使用的是乐刷的地区数据
+     */
+    @TableField("regionSrc")
+    private Integer regionSrc;
+
+
+    /**
+     * 目标通道的地区表id
+     */
+    @TableField("regionDes")
+    private Integer regionDes;
+
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/RewardConfig.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/RewardConfig.java
new file mode 100644
index 0000000..d71f77c
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/RewardConfig.java
@@ -0,0 +1,83 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 用户奖励配置
+ * </p>
+ *
+ * @author bzg
+ * @since 2022-02-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_reward_config")
+public class RewardConfig implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    public static final String DEFAULT_TYPE = "areaPartner";
+
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 奖励名称
+     */
+    @TableField("name")
+    private String name;
+
+
+    /**
+     * 所属角色
+     */
+    @TableField("roleCode")
+    private String roleCode;
+
+
+    /**
+     * 奖励类型
+     */
+    @TableField("type")
+    private String type;
+
+
+    /**
+     * 比例
+     */
+    @TableField("scale")
+    private BigDecimal scale;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(exist = false, condition = "createTime &gt; #{%s}")
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(exist = false, condition = "createTime &lt; #{%s}")
+    private Date createTimeEnd;
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/RiskBlacklist.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/RiskBlacklist.java
new file mode 100644
index 0000000..8304f6f
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/RiskBlacklist.java
@@ -0,0 +1,117 @@
+package cn.pluss.platform.entity;
+
+import cn.pluss.platform.config.mybatis.SqlConditionExtra;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 风控黑名单表
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-09-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_risk_blacklist")
+public class RiskBlacklist implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 身份证号
+     */
+    @TableField("idcardNo")
+    private String idcardNo;
+
+
+    /**
+     * 姓名
+     */
+    @TableField("certName")
+    private String certName;
+
+
+    /**
+     * 关联用户id
+     */
+    @TableField("userId")
+    private Integer userId;
+
+
+    /**
+     * 违规商户id
+     */
+    @TableField("causeUserId")
+    private Integer causeUserId;
+
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+
+    /**
+     * 违规通道
+     */
+    @TableField("channel")
+    private Integer channel;
+
+
+    /**
+     * 支付方式, 01：微信； 02：支付宝；03：银联
+     */
+    @TableField("payWay")
+    private String payWay;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.GT)
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.LT)
+    private Date createTimeEnd;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "updateTime", fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    /**
+     * 更新时间 开始时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.GT)
+    private Date updateTimeStart;
+
+    /**
+     * 更新时间 截止时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.LT)
+    private Date updateTimeEnd;
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/RoleInfo.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/RoleInfo.java
new file mode 100644
index 0000000..31cfc46
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/RoleInfo.java
@@ -0,0 +1,25 @@
+package cn.pluss.platform.entity;
+
+import  java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+@Data
+public class RoleInfo {
+
+    private Long id;
+    private String name;
+    private String creator;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+    private String updator;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+    private String version;
+
+    @TableField(exist = false)
+    private String menuIds;
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/RoleMenuInfo.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/RoleMenuInfo.java
new file mode 100644
index 0000000..d50bdcd
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/RoleMenuInfo.java
@@ -0,0 +1,14 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+@Data
+public class RoleMenuInfo {
+
+    @TableId
+    private Long id;
+    private Long roleId;
+    private Long menuId;
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/RoleUserInfo.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/RoleUserInfo.java
new file mode 100644
index 0000000..18f4a92
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/RoleUserInfo.java
@@ -0,0 +1,15 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+@Data
+public class RoleUserInfo {
+
+    @TableId
+    private Long id;
+    private Long roleId;
+    private Long userId;
+    private String version;
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/RyxAccessModel.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/RyxAccessModel.java
new file mode 100644
index 0000000..0fd363f
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/RyxAccessModel.java
@@ -0,0 +1,90 @@
+package cn.pluss.platform.entity;
+
+import com.alibaba.fastjson.JSONObject;
+import lombok.Data;
+import org.springframework.core.io.ByteArrayResource;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @author DJH
+ * 瑞银信商户入网相关接口数据参数
+ */
+@Data
+public class RyxAccessModel {
+
+
+
+    private String accessId;
+
+    /**
+     * 订单号，每次传不同值
+     */
+    private String accessMerchId;
+
+    /**
+     * 请求时间，时间格式为yyyyMMddHHmmss
+     */
+    private String reqTime;
+
+    /**
+     * 加密数据，此数据由AES(AES/CBC/PKCS5Padding)进行加密
+     */
+    private String info;
+
+    /**
+     * 签名信息，对info原始数据进行签名，签名使用我们的私钥
+     */
+    private String sign;
+
+    /**
+     * AES密钥进行加密
+     */
+    private String encryptKey;
+
+    /**
+     * 其他参数，可为空
+     */
+    private Object otherParam;
+
+    /**
+     * 商户资料图片
+     */
+    private List<ByteArrayResource> files;
+
+//    private List<File> files;
+
+    public static MultiValueMap<String, Object> toMap(RyxAccessModel model) {
+        MultiValueMap<String, Object> map = new LinkedMultiValueMap<>();
+        map.put("accessId", Collections.singletonList(model.getAccessId()));
+        map.put("accessMerchId", Collections.singletonList(model.getAccessMerchId()));
+        map.put("reqTime", Collections.singletonList(model.getReqTime()));
+        map.put("info", Collections.singletonList(model.getInfo()));
+        map.put("sign", Collections.singletonList(model.getSign()));
+        map.put("encryptKey", Collections.singletonList(model.getEncryptKey()));
+
+        if (model.getOtherParam() != null) {
+            map.put("otherParam", Collections.singletonList(model.getOtherParam()));
+        }
+
+        if (model.getFiles() != null) {
+            List<Object> files = new ArrayList<>(model.getFiles());
+            map.put("files", files);
+        }
+
+        return map;
+    }
+
+    public void addFile(ByteArrayResource file) {
+        if (files == null) {
+            files = new ArrayList<>();
+        }
+        files.add(file);
+    }
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/RyxAccessResp.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/RyxAccessResp.java
new file mode 100644
index 0000000..0f9cdfb
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/RyxAccessResp.java
@@ -0,0 +1,21 @@
+package cn.pluss.platform.entity;
+
+import com.alibaba.fastjson.JSONObject;
+import lombok.Data;
+
+@Data
+public class RyxAccessResp {
+
+    /** 请求成功码 */
+    public static final String RESULT_OK = "0000";
+
+    /** 请求失败码 */
+    public static final String RESULT_ERROR = "0001";
+
+    private String code;
+
+    private String msg;
+
+    /** 请求结果 */
+    private JSONObject result;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/RyxPayRequest.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/RyxPayRequest.java
new file mode 100644
index 0000000..7bfe242
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/RyxPayRequest.java
@@ -0,0 +1,66 @@
+package cn.pluss.platform.entity;
+
+import cn.pluss.platform.util.RyxConfig;
+import lombok.Data;
+import org.apache.http.message.BasicNameValuePair;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * 瑞银信商户交易请求实体封装
+ */
+@Data
+public class RyxPayRequest {
+
+    /**
+     *不知道是啥参数
+     */
+    private String cooperator;
+
+    /**
+     * 加密数据
+     */
+    private String encryptData;
+
+    /**
+     * 加密秘钥
+     */
+    private String encrtptKey;
+
+    /**
+     * 交易类型
+     */
+    private String tranCode;
+
+    /**
+     * 请求唯一表示，代表订单号 长度不能超过12
+     */
+    private String reqMsgId;
+
+    /**
+     * 请求回调地址
+     */
+    private String callBack;
+
+    /**
+     * 签名
+     */
+    private String signData;
+
+
+    public MultiValueMap<String, Object> toMap() {
+        MultiValueMap<String, Object> map = new LinkedMultiValueMap<>();
+        map.put("encryptData",Collections.singletonList(this.getEncryptData()));
+        map.put("encryptKey",Collections.singletonList(this.getEncrtptKey()));
+        map.put("cooperator",Collections.singletonList(this.getCooperator()));
+        map.put("signData",Collections.singletonList(this.getSignData()));
+        map.put("tranCode",Collections.singletonList(this.getTranCode()));
+        map.put("callBack",Collections.singletonList(this.getCallBack()));
+        map.put("reqMsgId",Collections.singletonList(this.getReqMsgId()));
+        return map;
+    }
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/Shop.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/Shop.java
new file mode 100644
index 0000000..9ffe0a6
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/Shop.java
@@ -0,0 +1,35 @@
+package cn.pluss.platform.entity;
+
+import lombok.Data;
+
+@Data
+public class Shop {
+    //用户id
+    private String userId;
+    //商家编码
+    private String merchantCode;
+    //商户简称
+    private String alias;
+    //店铺名称
+    private String storeName;
+    //所属商户
+    private String merchantName;
+    //行业类型
+    private String productDesc;
+    //详细地址
+    private String address;
+    //交易状态
+    private String status;
+    //门店类型
+    private String merchantType;
+    //用户手机号
+    private String phone;
+    //交易总流水
+    private String earnings;
+    //已有会员
+    private String 	menber;
+    //粉丝奖励
+    private String fansMoney;
+    //推广分润
+    private String price;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/StaffPermission.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/StaffPermission.java
new file mode 100644
index 0000000..580bab8
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/StaffPermission.java
@@ -0,0 +1,88 @@
+package cn.pluss.platform.entity;
+
+import cn.pluss.platform.config.mybatis.SqlConditionExtra;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 员工权限表
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-06-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_staff_permission")
+public class StaffPermission implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 用户id
+     */
+    @TableField("userId")
+    private Long userId;
+
+    /**
+     * 商户编号
+     */
+    @TableField("merchantCode")
+    private String merchantCode;
+
+
+    /**
+     * 读取所有账单的权限，0：无；1：有
+     */
+    @TableField("permissionBill")
+    private String permissionBill;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.GT)
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.LT)
+    private Date createTimeEnd;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "updateTime", fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    /**
+     * 更新时间 开始时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.GT)
+    private Date updateTimeStart;
+
+    /**
+     * 更新时间 截止时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.LT)
+    private Date updateTimeEnd;
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/SubMercCodeYs.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/SubMercCodeYs.java
new file mode 100644
index 0000000..956dc61
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/SubMercCodeYs.java
@@ -0,0 +1,68 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 银盛二级商户省市区code
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-06-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_sub_merc_code_ys")
+public class SubMercCodeYs implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 编码
+     */
+    @TableField("code")
+    private String code;
+
+
+    /**
+     * 名称
+     */
+    @TableField("name")
+    private String name;
+
+
+    /**
+     * 上级code
+     */
+    @TableField("pCode")
+    private String pCode;
+
+
+    /**
+     * 等级名称
+     */
+    @TableField("leveName")
+    private String leveName;
+
+
+    @TableField("remark")
+    private String remark;
+
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/SubMerchant.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/SubMerchant.java
new file mode 100644
index 0000000..8b94627
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/SubMerchant.java
@@ -0,0 +1,57 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * 子商户信息表
+ * @author DJH
+ */
+@Data
+@Accessors(chain = true)
+public class SubMerchant {
+
+    @TableId
+    private Integer id;
+
+    private String merchantId;
+
+    /**
+     * 接入渠道方号
+     */
+    private String channelId;
+
+    /**
+     * 渠道子商户号，查询微信
+     */
+    private String subMchId;
+
+    /**
+     * 不同渠道可能存储的不同
+     * 随行付：WX 微信， ZFB 支付宝
+     */
+    private String subMchType;
+
+    private String remark;
+
+    /**
+     * 对应自己存储的渠道表的id
+     */
+    private String channelTypeId;
+
+    /**
+     * 渠道报备状态，作用未知
+     */
+    private String status;
+
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/SubMerchantApplyOrder.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/SubMerchantApplyOrder.java
new file mode 100644
index 0000000..728be73
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/SubMerchantApplyOrder.java
@@ -0,0 +1,126 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 子渠道工单信息表, 微信商户认证信息表(目前只有微信需要认证)
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-08-31
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_sub_merchant_apply_order")
+public class SubMerchantApplyOrder implements Serializable {
+
+    /**
+     * 商户未进件成功
+     */
+    public static final String STATUS_NO_AUDIT = "-2";
+
+    /**
+     * 商户暂未发起微信认证
+     */
+    public static final String STATUS_NO_WX_AUDIT = "-1";
+
+    /**
+     * 审核中
+     */
+    public static final String RES_STATUS_REVIEW = "0";
+
+    /**
+     * 待授权
+     */
+    public static final String RES_STATUS_SUCCESS = "1";
+
+    /**
+     * 认证失败
+     */
+    public static final String RES_STATUS_FAILED = "2";
+
+    /**
+     * 认证完成
+     */
+    public static final String RES_STATUS_COMPLETE = "3";
+
+    /**
+     * 发起认证报错的状态
+     */
+    public static final String RES_STATUS_COMMIT_ERROR = "4";
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 商户code
+     */
+    @TableField("merchantCode")
+    private String merchantCode;
+
+    @TableField(exist = false)
+    private String merchantId;
+
+    /**
+     * 通道渠道id， merchant_channel表的id
+     */
+    @TableField("channelId")
+    private Integer channelId;
+
+    /**
+     * 子渠道类别
+     */
+    @TableField("subMchType")
+    private String subMchType;
+
+    /**
+     * 子渠道申请工单
+     */
+    @TableField("applyNo")
+    private String applyNo;
+
+    /**
+     * 状态，0：未处理；1，已处理；2，已取消； 3, 错误
+     */
+    private String status;
+
+    /**
+     * 激活二维码链接
+     */
+    @TableField("infoQrcode")
+    private String infoQrcode;
+
+    /**
+     * 工单处理结果
+     */
+    @TableField("resultStatus")
+    private String resultStatus;
+
+    /**
+     * 驳回原因等
+     */
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "updateTime", fill = FieldFill.INSERT_UPDATE, update = "now()")
+    private Date updateTime;
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/Suggest.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/Suggest.java
new file mode 100644
index 0000000..85b4357
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/Suggest.java
@@ -0,0 +1,30 @@
+package cn.pluss.platform.entity;
+
+import  java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+@Data
+public class Suggest {
+
+    @TableId
+    private Integer id;
+    private Integer userId;
+    private String logo;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date createDt;
+    private String content;
+    private String picUrls;
+    private String status;
+    private String phone;
+    @TableField(exist = false)
+    private String userPhone;
+    @TableField(exist = false)
+    private Date startTime;
+    @TableField(exist = false)
+    private Date endTime;
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/SxfMccInfo.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/SxfMccInfo.java
new file mode 100644
index 0000000..24c4dd8
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/SxfMccInfo.java
@@ -0,0 +1,65 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 随行付的原始mcc数据
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-09-22
+ *
+ * 最新mcc使用请看
+ * {@link cn.pluss.platform.entity.MccInfoSort}
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_sxf_mcc_info")
+public class SxfMccInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "F_ID", type = IdType.AUTO)
+    private Integer fId;
+
+    /**
+     * mcc代码
+     */
+    @TableField("F_mcc_code")
+    private String fMccCode;
+
+    /**
+     * mcc一级类目名称
+     */
+    @TableField("F_grandpa_txt")
+    private String fGrandpaTxt;
+
+    /**
+     * mcc二级类目名称
+     */
+    @TableField("F_father_txt")
+    private String fFatherTxt;
+
+    /**
+     * mcc三级类目名称
+     */
+    @TableField("F_mcc_txt")
+    private String fMccTxt;
+
+    /**
+     * 经营类型
+     */
+    @TableField("F_mcc_type")
+    private String fMccType;
+
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/SysSql.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/SysSql.java
new file mode 100644
index 0000000..f05015b
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/SysSql.java
@@ -0,0 +1,41 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author SSS
+ */
+@Data
+@TableName("tb_pluss_sys_sql")
+public class SysSql implements Serializable {
+
+    public static final String INSERT = "insert";
+
+    public static final String UPDATE = "update";
+
+    public static final String QUERY = "query";
+
+    public static final String DELETE = "delete";
+
+    @TableId
+    @TableField("`id`")
+    private long id;
+
+    @TableField("`type`")
+    private String type;
+
+    @TableField("`mapperName`")
+    private String mapperName;
+
+    @TableField("`sql`")
+    private String sql;
+
+    @TableField("`createTime`")
+    private Date createTime;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/SystemConfig.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/SystemConfig.java
new file mode 100644
index 0000000..a29928a
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/SystemConfig.java
@@ -0,0 +1,18 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@Data
+@TableName("tb_pluss_systemconfig")
+public class SystemConfig {
+
+	@TableId
+	private Integer id;
+	private String propertyKey;
+	private String propertyValue;
+	private String propertyDesc;
+	private String propertyIndex;
+	private String systemId;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/SystemInfo.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/SystemInfo.java
new file mode 100644
index 0000000..8e63187
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/SystemInfo.java
@@ -0,0 +1,26 @@
+package cn.pluss.platform.entity;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+@Data
+public class SystemInfo {
+
+    @TableId
+    private Integer id;
+    private String title;
+    private String content;
+    private String remark;
+    private String seq;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date createDt;
+    @TableField(exist = false)
+    private String  startTime;
+    @TableField(exist = false)
+    private String  endTime;
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/TaskSort.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/TaskSort.java
new file mode 100644
index 0000000..834cae3
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/TaskSort.java
@@ -0,0 +1,56 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-05-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_task_sort")
+public class TaskSort implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId("id")
+    private Integer id;
+
+
+    /**
+     * 编码
+     */
+    @TableField("`code`")
+    private String code;
+
+
+    /**
+     * 名称
+     */
+    @TableField("`name`")
+    private String name;
+
+
+    /**
+     * 任务描述
+     */
+    @TableField("`desc`")
+    private String desc;
+
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserAddress.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserAddress.java
new file mode 100644
index 0000000..c05b5e8
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserAddress.java
@@ -0,0 +1,118 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 用户地址信息表
+ * </p>
+ *
+ * @author bzg
+ * @since 2021-11-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_user_address")
+public class UserAddress implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    public static String DEFAULT_FLAG = "1";
+
+    /**
+     * 收货地址
+     */
+    public static int ADDRESS_TYPE_COLLECT = 1;
+
+    /**
+     * 发货地址
+     */
+    public static int ADDRESS_TYPE_HAIR = 2;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 联系人姓名
+     */
+    @TableField("name")
+    private String name;
+
+
+    /**
+     * 手机号
+     */
+    @TableField("phone")
+    private String phone;
+
+
+    /**
+     * 详细地址
+     */
+    @TableField("address")
+    private String address;
+
+
+    /**
+     * 省市区Code
+     */
+    @TableField("areaCode")
+    private String areaCode;
+
+
+    /**
+     * 省市区名称
+     */
+    @TableField("areaName")
+    private String areaName;
+
+
+    /**
+     * 是否默认地址0：默认 1：默认
+     */
+    @TableField("defFlag")
+    private String defFlag;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(exist = false, condition = "createTime &gt; #{%s}")
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(exist = false, condition = "createTime &lt; #{%s}")
+    private Date createTimeEnd;
+
+    /**
+     * 用户Id
+     */
+    @TableField("userId")
+    private Integer userId;
+
+
+    /**
+     * 地址类型：1：收货地址2：发货地址3：其他
+     */
+    @TableField("type")
+    private Integer type;
+
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserApp.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserApp.java
new file mode 100644
index 0000000..a60ea8b
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserApp.java
@@ -0,0 +1,410 @@
+package cn.pluss.platform.entity;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+@Data
+@Accessors(chain = true)
+public class UserApp {
+    @TableId
+    @ApiModelProperty("id")
+    private Long id;
+    @ApiModelProperty(value = "登陆账号")
+    private String loginName;
+    @ApiModelProperty(value = "用户id")
+    private Long userId;
+    @ApiModelProperty(value = "用户名称")
+    private String userName;
+    @ApiModelProperty(value = "用户类型   promoter：推广人 ，staff：员工")
+    private String userType;
+    @ApiModelProperty(value = "员工类型   0 店长  1 收银员  2 店员")
+    private Integer staffType;
+    @ApiModelProperty(value = "头像")
+    private String logo;
+    @ApiModelProperty(value = "推广等级")
+    private Integer level;
+    @ApiModelProperty(value = "创建时间")
+
+    @JsonFormat(shape=JsonFormat.Shape.STRING,pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createDt;
+
+    @JSONField(format="yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField(value = "updateDt", fill = FieldFill.INSERT_UPDATE, update = "now()")
+    private Date updateDt;
+
+    @ApiModelProperty(value = "推广分润")
+    private Double extendProfit;
+    @ApiModelProperty(value = "是否实名认证 0未实名  1 审核中 2 审核失败 3 已审核")
+    private Integer status;
+    @ApiModelProperty(value = "粉丝分润")
+    private Double fansProfit;
+    @ApiModelProperty(value = "已提现分润")
+    private Double cashProfit;
+    @ApiModelProperty(value = "上级编码")
+    private Long parentId;
+    @ApiModelProperty(value = "超级服务商业务员id")
+    private Long agentStaffId;
+    @ApiModelProperty(value = "我的邀请码")
+    private String inviteNum;
+    @ApiModelProperty(value = "交易额")
+    private Double tradeMoney;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "身份证号")
+    private String certnum;
+
+    @ApiModelProperty(value = "实名认证审核失败原因")
+    private String certReason;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "开户支行")
+    private String bankBranch;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "银行名称")
+    private String bankName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "银行卡号")
+    private String bankNo;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "银行卡绑定手机号")
+    private String phone;
+
+    @ApiModelProperty(value = "是否添加银行卡 0未添加 1 审核中 2 审核失败 3 已审核")
+    private Integer bankStatus;
+
+    @ApiModelProperty(value = "银行卡认证审核失败原因")
+    private String bankReason;
+
+    @ApiModelProperty(value = "商家编码")
+    private String merchantCode;
+
+    /**
+     * 层级
+     */
+    private Integer sort;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "商户简称")
+    private String merchantName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "门店名称")
+    private String storeName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "门店id")
+    private String storeId;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "联系人姓名")
+    private String contactName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "经营内容描述")
+    private String productDesc;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "营业执照号")
+    private String bussAuthNum;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "通道切换字段 0 支付宝微信官方通道 1乐刷通道")
+    private Integer aisleSwitch;
+
+    @ApiModelProperty(value = "token")
+    private String token;
+
+    @ApiModelProperty(value = "是否播报  0不播报  1播报")
+    private String isVoice;
+    /**
+     * eg. 664，868
+     * 664为上级节点userId, 868为664上级节点userId
+     */
+    @ApiModelProperty(value = "父节点id数组")
+    private String pIdArr;
+
+    @TableField(exist = false)
+    private String auditReason;
+
+    /**
+     * 1:固定费率
+     * 0:不固定费率
+     */
+    @ApiModelProperty(value = "是否固定费率")
+    private String isFixedRate;
+
+    /**
+     * 自动审核标识，标识为自动审核的服务商，推广的商户自动审核，不需要等待后台操作
+     */
+    @TableField("autoAudit")
+    private String autoAudit;
+
+    /**
+     * 异地支付开关，为1时允许
+     */
+    @TableField("payEcdemicSwitch")
+    private String payEcdemicSwitch;
+
+    /**
+     * 是否活动商户0：否1：是，推广的商户默认同步该状态
+     */
+    @TableField("isMarket")
+    private String isMarket;
+
+    /**
+     * 是否开启银联支付0：不开启 1：开启，推广的商户默认同步该状态
+     */
+    @TableField("isUnionPay")
+    private String isUnionPay;
+
+    /**
+     * 角色编码
+     */
+    @TableField("roleCode")
+    private String roleCode;
+
+    /**
+     * 角色等级编码
+     */
+    @TableField("levelCode")
+    private String levelCode;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "企业类填写：营业执照名称，执照如无名称，可填“个体户XXX”（执照上姓名）；小微商户填“商户_XXX”（身份证姓名）仅传参需要 无需添加字段")
+    private String licenseFullName;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "")
+    private List<MerchantImage> merchantImagesList;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "")
+    private String registUrl;
+
+    @ApiModelProperty(value = "")
+    @TableField(exist = false)
+    private String password;
+    @ApiModelProperty(value = "")
+    @TableField(exist = false)
+    private Integer merchantStatus;
+    @ApiModelProperty(value = "")
+    @TableField(exist = false)
+    private String merchantReason;
+    @TableField(exist = false)
+    private String merchantType;
+    @TableField(exist = false)
+    private String bankCertName;
+
+    @TableField(exist = false)
+    private List<String> parentIdList;
+    @TableField(exist = false)
+    private String alias;
+    @TableField(exist = false)
+    private Double totalMoney;
+    @TableField(exist = false)
+    private String type;
+
+    /**  费率，只有服务商推广的商户有这个字段 */
+    @TableField(exist = false)
+    private BigDecimal rate;
+    //查询数据
+    @TableField(exist = false)
+    private Integer size;
+    @TableField(exist = false)
+    private Integer page;
+    /** 商户id */
+    @TableField(exist = false)
+    private Long mercId;
+
+    @TableField(exist = false)
+    private String merchantId;
+
+    /** 当前渠道下商户的进件状态 */
+    @TableField(exist = false)
+    private String merchantAuditStatus;
+
+    /**
+     * 商户信息
+     */
+    @TableField(exist = false)
+    private MerchantBaseInfo merchantBaseInfo;
+    /**
+     * 结算信息
+     */
+    @TableField(exist = false)
+    private MerchantBankCard merchantBankCard;
+
+    /**
+     * 银行卡信息
+     */
+    @TableField(exist = false)
+    private BankCard bankCard;
+
+    /**
+     * 证件信息
+     */
+    @TableField(exist = false)
+    private IdCard idCard;
+
+    @TableField(exist = false)
+    private Date startDate;
+
+    @TableField(exist = false)
+    private Date endDate;
+
+    @TableField(exist = false)
+    private String thirdStatus;
+
+    @TableField(exist = false)
+    private String storeId2;
+
+    @TableField(exist = false)
+    private String mcsStatus;
+    @TableField(exist = false)
+    private String remark;
+    @TableField(exist = false)
+    private String updateTime;
+    @TableField(exist = false)
+    private String ppStatus;
+    @TableField(exist = false)
+    private String ppThirdStatus;
+    @TableField(exist = false)
+    private String pluginRemark;
+    @TableField(exist = false)
+    private List<MerchantChannelStatus> channelStatusList;
+
+    @TableField(exist = false)
+    private String payPassword;
+
+    @TableField(exist = false)
+    private String permissionBill;
+
+    @TableField(exist = false)
+    private String faceCert;
+
+    @TableField(exist = false)
+    private String faceCompare;
+
+    /**
+     * 推广权限标识， 1可以推广
+     */
+    private String spreadFlag;
+
+    /**
+     * 用户编号
+     * @date: 2022/2/16 18:32  
+     */
+    @TableField("userNo")
+    private String userNo;
+
+    /**
+     * 用户类型标识 主要用于直营团队这边区分代理商和商户 0：表示商户1：表示代理商
+     * @date: 2022/2/16 18:32
+     */
+    @TableField("typeMark")
+    private Integer typeMark;
+
+    /**
+     * 区域合伙人标识 1：区域合伙人 0：非区域合伙人
+     * @date: 2022/2/22 10:34
+     */
+    @TableField("areaMark")
+    private Integer areaMark;
+
+    /**
+     * 登录后会生成一串密文 用于积分商城那边确认登录用户的身份
+     */
+    @TableField("jfShopKey")
+    private String jfShopKey;
+
+//    /**
+//     * 有效状态 1：有效 -1：无效
+//     */
+//    @TableField("validStatus")
+//    private Integer validStatus;
+//
+//    /**
+//     * 考核到期时间
+//     */
+//    @TableField("validEndTime")
+//    private Date validEndTime;
+
+
+    /**
+     * 生成一个新的用户对象
+     * @return
+     */
+    public static UserApp newInstance() {
+        UserApp userApp = new UserApp();
+        Date date = new Date();
+        userApp.setCreateDt(date);
+        userApp.setStatus(0);
+        userApp.setMerchantAuditStatus("0");
+        userApp.setBankStatus(0);
+        return userApp;
+    }
+
+    public static void setSort(UserApp source, UserApp target) {
+        if (source == null) {
+            return;
+        }
+
+        if (target == null) {
+            return;
+        }
+
+        if (source.getSort() == null) {
+            target.setSort(1);
+        } else {
+            target.setSort(source.getSort() + 1);
+        }
+    }
+
+
+    public static void setRoleInfo(UserApp source, UserApp target,Integer typeMark) {
+        if (source == null) {
+            return;
+        }
+
+        if (target == null) {
+            return;
+        }
+
+        if (source.getRoleCode() == null) {
+            target.setRoleCode("SV2");
+            target.setLevelCode("LV1");
+            return;
+        }
+
+        switch (source.getRoleCode()) {
+            case "ZY_BST":
+                target.setRoleCode("ZY_BST");
+                target.setLevelCode("T1");
+                break;
+            case "SV2":
+                target.setRoleCode("SV2");
+                target.setLevelCode("LV1");
+                break;
+            default:
+                break;
+        }
+        if(typeMark != null){
+            target.setTypeMark(typeMark);
+        }
+    }
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserAreaRewardFlow.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserAreaRewardFlow.java
new file mode 100644
index 0000000..cfe383a
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserAreaRewardFlow.java
@@ -0,0 +1,107 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 用户区域流水
+ * </p>
+ *
+ * @author bzg
+ * @since 2022-03-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@NoArgsConstructor
+@TableName("tb_pluss_user_area_reward_flow")
+public class UserAreaRewardFlow implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 用户ID
+     */
+    @TableField("userId")
+    private Long userId;
+
+
+    /**
+     * 角色类型
+     */
+    @TableField("roleCode")
+    private String roleCode;
+
+
+    /**
+     * 区域流水
+     */
+    @TableField("areaFlow")
+    private BigDecimal areaFlow;
+
+
+    /**
+     * 区域奖励
+     */
+    @TableField("rewardAmt")
+    private BigDecimal rewardAmt;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(exist = false, condition = "createTime &gt; #{%s}")
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(exist = false, condition = "createTime &lt; #{%s}")
+    private Date createTimeEnd;
+
+    @TableField("createDate")
+    private Date createDate;
+
+    @TableField("profitDate")
+    private Date profitDate;
+
+    /**
+     *  开始时间
+     */
+    @TableField(exist = false, condition = "createDate &gt; #{%s}")
+    private Date createDateStart;
+
+    /**
+     *  截止时间
+     */
+    @TableField(exist = false, condition = "createDate &lt; #{%s}")
+    private Date createDateEnd;
+
+    public UserAreaRewardFlow(UserApp app, BigDecimal flow,BigDecimal rewardAmt) {
+        this.areaFlow = flow;
+        this.userId = app.getUserId();
+        this.roleCode = app.getRoleCode();
+        this.rewardAmt = rewardAmt;
+    }
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserAssess.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserAssess.java
new file mode 100644
index 0000000..d7a31f9
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserAssess.java
@@ -0,0 +1,135 @@
+package cn.pluss.platform.entity;
+
+import cn.pluss.platform.util.DateUtils;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.Calendar;
+import java.util.Date;
+
+/**
+ * <p>
+ * 用户考核表
+ * </p>
+ *
+ * @author bzg
+ * @since 2022-07-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_user_assess")
+@NoArgsConstructor
+public class UserAssess implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    public static int DEFAULT_IS_WHITE_YES = 1;
+
+    public static int DEFAULT_IS_WHITE_NO = -1;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 用户ID
+     */
+    @TableField("userId")
+    private Long userId;
+
+
+    /**
+     * 用户角色
+     */
+    @TableField("roleCode")
+    private String roleCode;
+
+
+    /**
+     * 直推商户数
+     */
+    @TableField("directMercNum")
+    private Integer directMercNum;
+
+
+    /**
+     * 有效商户数
+     */
+    @TableField("validMercNum")
+    private Integer validMercNum;
+
+
+    /**
+     * 过期时间
+     */
+    @TableField("expireTime")
+    private Date expireTime;
+
+    /**
+     * 过期时间 开始时间
+     */
+    @TableField(exist = false, condition = "expireTime &gt; #{%s}")
+    private Date expireTimeStart;
+
+    /**
+     * 过期时间 截止时间
+     */
+    @TableField(exist = false, condition = "expireTime &lt; #{%s}")
+    private Date expireTimeEnd;
+
+    /**
+     * 是否白名单 -1不是 1：是
+     */
+    @TableField("isWhite")
+    private Integer isWhite;
+
+
+    /**
+     * 原因
+     */
+    @TableField("reason")
+    private String reason;
+
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(exist = false, condition = "createTime &gt; #{%s}")
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(exist = false, condition = "createTime &lt; #{%s}")
+    private Date createTimeEnd;
+
+    public UserAssess(UserApp user, UserRole role) {
+        this.userId = user.getUserId();
+        this.roleCode = user.getRoleCode();
+        Date date = DateUtils.currentDate();
+        date = DateUtils.add(Calendar.DAY_OF_MONTH,date,role.getProtectDayNum());
+        this.expireTime = date;
+        this.directMercNum = BigInteger.ZERO.intValue();
+        this.validMercNum = BigInteger.ZERO.intValue();
+    }
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserExtra.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserExtra.java
new file mode 100644
index 0000000..ec240c0
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserExtra.java
@@ -0,0 +1,88 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 用户额外字段关联表信息
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-05-31
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_user_extra")
+public class UserExtra implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 用户id
+     */
+    @TableField("`userId`")
+    private Long userId;
+
+
+    /**
+     * 状态key
+     */
+    @TableField("`key`")
+    private String key;
+
+
+    /**
+     * 状态值
+     */
+    @TableField("`value`")
+    private String value;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(exist = false, condition = "createTime &gt; #{%s}")
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(exist = false, condition = "createTime &lt; #{%s}")
+    private Date createTimeEnd;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "updateTime", fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    /**
+     * 更新时间 开始时间
+     */
+    @TableField(exist = false, condition = "updateTime &gt; #{%s}")
+    private Date updateTimeStart;
+
+    /**
+     * 更新时间 截止时间
+     */
+    @TableField(exist = false, condition = "updateTime &lt; #{%s}")
+    private Date updateTimeEnd;
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserInfo.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserInfo.java
new file mode 100644
index 0000000..c5475b1
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserInfo.java
@@ -0,0 +1,109 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Data
+@Accessors(chain = true)
+public class UserInfo {
+
+    /**
+     * 删除状态
+     */
+    public static final int STATUS_DEL = -1;
+
+    /**
+     * 有效状态
+     */
+    public static final int STATUS_VALID = 1;
+
+    /**
+     * 关闭推广权限
+     */
+    public static final int STATUS_NO_SPREAD = -2;
+
+    @TableId
+    private Long id;
+    private String loginName;
+    private String trueName;
+    private String provinceCode;
+    private String cityCode;
+    private String sex;
+    private String phone;
+    private String email;
+    private Integer status;
+    private String password;
+    private String creator;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+    private String updator;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+    private String version;
+    private Integer parentId;
+    private Integer areaId;
+    private String areaCode;
+    private String source;
+    private String merchantCode;
+    private String storeId;
+
+    /**
+     * 老的支付密码
+     */
+    @TableField(exist = false)
+    private String oldPayPassword;
+
+    /**
+     * 提现退款密码
+     */
+    private String payPassword;
+
+    /**
+     * 人脸认证标识，1为已通过人脸识别
+     */
+    private String faceCert;
+
+    private String faceCompare;
+
+    /**
+     * @description:openid 用户发送订单通知
+     * @date: 2021/9/23 14:52
+     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String openId;
+
+    /** 渠道编码 */
+    private String channelCode;
+
+    @TableField(exist = false)
+    private String checkCode;
+    @TableField(exist = false)
+    private String oldPassword;
+    @TableField(exist = false)
+    private String inviteCode;
+    @TableField(exist = false)
+    private String oldPhone;
+    @TableField(exist = false)
+    private String roleIds;
+
+    /**
+     * 生成一个新的用户对象
+     * @return
+     */
+    public static UserInfo newInstance() {
+        UserInfo userInfo = new UserInfo();
+        Date date = new Date();
+        userInfo.setCreateTime(date);
+        userInfo.setUpdateTime(date);
+        userInfo.setStatus(1);
+
+        return userInfo;
+    }
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserIntegral.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserIntegral.java
new file mode 100644
index 0000000..b3a028b
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserIntegral.java
@@ -0,0 +1,156 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 用户积分详情表
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-05-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_user_integral")
+@NoArgsConstructor
+public class UserIntegral implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 用户ID
+     */
+    @TableField("userId")
+    private Long userId;
+
+
+    /**
+     * 订单号
+     */
+    @TableField("orderNumber")
+    private String orderNumber;
+
+
+    /**
+     * 积分数额
+     */
+    @TableField("integral")
+    private BigDecimal integral;
+
+
+    /**
+     * 交易金额
+     */
+    @TableField("orderAmt")
+    private BigDecimal orderAmt;
+
+
+    /**
+     * 类型 1交易积分 2：机具活动积分 3：任务积分 4：签到积分
+     */
+    @TableField("type")
+    private String type;
+
+
+    /**
+     * 来源 1：交易订单 2：云音箱 3：完成任务 4 签到打卡 5:扫码王
+     */
+    @TableField("source")
+    private String source;
+
+    /**
+     * 积分状态 1：正常 -1：过期
+     */
+    private Integer status;
+
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    @JsonFormat(locale = "zh",timezone = "GMT+8",pattern="yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(exist = false, condition = "createTime &gt; #{%s}")
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(exist = false, condition = "createTime &lt; #{%s}")
+    private Date createTimeEnd;
+
+    /**
+     * 日期条件
+     */
+    @TableField(exist = false)
+    private String queryDate;
+
+
+    @TableField(exist = false)
+    private String name;
+
+    public UserIntegral(String orderNumber,BigDecimal orderAmt, Long userId, String type,String source, BigDecimal integral) {
+        this.userId = userId;
+        this.orderNumber = orderNumber;
+        this.integral = integral;
+        this.orderAmt = orderAmt;
+        this.type = type;
+        this.source = source;
+    }
+
+    public UserIntegral(Long userId, BigDecimal integral, String type,String source, String remark) {
+        this.userId = userId;
+        this.integral = integral;
+        this.type = type;
+        this.remark = remark;
+        this.source = source;
+    }
+
+    public String getName() {
+        String name = "";
+        switch (this.type){
+            case "1":
+                name = "交易积分";
+                break;
+            case "2":
+                name = "活动积分";
+                break;
+            case "3":
+                name = "任务积分";
+                break;
+            case "4":
+                name = "签到积分";
+                break;
+            default:
+                name = "其他积分";
+                break;
+        }
+        return name;
+    }
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserIntegralUse.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserIntegralUse.java
new file mode 100644
index 0000000..dc974cf
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserIntegralUse.java
@@ -0,0 +1,126 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 用户积分使用详情
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-05-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_user_integral_use")
+@NoArgsConstructor
+public class UserIntegralUse implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 名称
+     */
+    @TableField("name")
+    private String name;
+
+
+    /**
+     * 用户ID
+     */
+    @TableField("userId")
+    private Long userId;
+
+
+    /**
+     * 积分数
+     */
+    @TableField("integral")
+    private BigDecimal integral;
+
+
+    /**
+     * 兑换状态1：待支付 2:兑换成功，3：兑换失败
+     */
+    @TableField("status")
+    private String status;
+
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+
+    /**
+     * 订单号
+     */
+    @TableField("orderNumber")
+    private String orderNumber;
+
+
+    /**
+     * 兑换时间
+     */
+    @TableField("handleTime")
+    @JsonFormat(shape=JsonFormat.Shape.STRING,pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date handleTime;
+
+    /**
+     * 兑换时间 开始时间
+     */
+    @TableField(exist = false, condition = "handleTime &gt; #{%s}")
+    private Date handleTimeStart;
+
+    /**
+     * 兑换时间 截止时间
+     */
+    @TableField(exist = false, condition = "handleTime &lt; #{%s}")
+    private Date handleTimeEnd;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    @JsonFormat(shape=JsonFormat.Shape.STRING,pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(exist = false, condition = "createTime &gt; #{%s}")
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(exist = false, condition = "createTime &lt; #{%s}")
+    private Date createTimeEnd;
+
+    public UserIntegralUse(String name, Long userId, BigDecimal integral,String orderNumber, String remark) {
+        this.name = name;
+        this.userId = userId;
+        this.integral = integral;
+        this.remark = remark;
+        this.orderNumber = orderNumber;
+        this.status = "2";
+        Date date = new Date();
+        this.handleTime = date;
+        this.createTime = date;
+    }
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserIpRecord.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserIpRecord.java
new file mode 100644
index 0000000..62f56ec
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserIpRecord.java
@@ -0,0 +1,125 @@
+package cn.pluss.platform.entity;
+
+import cn.pluss.platform.config.mybatis.SqlConditionExtra;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 用户操作IP记录表
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-09-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_user_ip_record")
+public class UserIpRecord implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 用户ID
+     */
+    @TableField("userId")
+    private Integer userId;
+
+
+    /**
+     * 注册IP
+     */
+    @TableField("regIp")
+    private String regIp;
+
+
+    /**
+     * 注册时间
+     */
+    @TableField("regTime")
+    private Date regTime;
+
+    /**
+     * 注册时间 开始时间
+     */
+    @TableField(exist = false, condition = "regTime &gt; #{%s}")
+    private Date regTimeStart;
+
+    /**
+     * 注册时间 截止时间
+     */
+    @TableField(exist = false, condition = "regTime &lt; #{%s}")
+    private Date regTimeEnd;
+
+    /**
+     * 发起进件的IP
+     */
+    @TableField("auditIp")
+    private String auditIp;
+
+
+    /**
+     * 发起进件的时间
+     */
+    @TableField("auditTime")
+    private Date auditTime;
+
+    /**
+     * 发起进件的时间 开始时间
+     */
+    @TableField(exist = false, condition = "auditTime &gt; #{%s}")
+    private Date auditTimeStart;
+
+    /**
+     * 发起进件的时间 截止时间
+     */
+    @TableField(exist = false, condition = "auditTime &lt; #{%s}")
+    private Date auditTimeEnd;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.GT)
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(select = false, value = "createTime", condition = SqlConditionExtra.LT)
+    private Date createTimeEnd;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "updateTime", fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    /**
+     * 更新时间 开始时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.GT)
+    private Date updateTimeStart;
+
+    /**
+     * 更新时间 截止时间
+     */
+    @TableField(select = false, value = "updateTime", condition = SqlConditionExtra.LT)
+    private Date updateTimeEnd;
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserLevel.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserLevel.java
new file mode 100644
index 0000000..9cd3b7e
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserLevel.java
@@ -0,0 +1,136 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 用户等级表
+ * </p>
+ *
+ * @author bzg
+ * @since 2022-01-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_user_level")
+public class UserLevel implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    public static final String LEVEL_CODE_PREFIX = "LV";
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 所属角色CODE
+     */
+    @TableField("roleCode")
+    private String roleCode;
+
+
+    /**
+     * 等级名称
+     */
+    @TableField(value = "levelName",whereStrategy = FieldStrategy.NOT_EMPTY,condition = SqlCondition.LIKE)
+    private String levelName;
+
+
+    /**
+     * 等级code
+     */
+    @TableField("levelCode")
+    private String levelCode;
+
+
+    /**
+     * 当前等级结算费率
+     */
+    @TableField("rate")
+    private BigDecimal rate;
+
+
+    /**
+     * 当前等级所需要的交易额
+     */
+    @TableField("quota")
+    private BigDecimal quota;
+
+
+    /**
+     * 直推收益比例 需要除以10000使用
+     */
+    @TableField("directRate")
+    private BigDecimal directRate;
+
+
+    /**
+     * 间推收益比例 需要除以10000使用
+     */
+    @TableField("indirectRate")
+    private BigDecimal indirectRate;
+
+
+    /**
+     * T2 级别管理奖 即:间开收益比例
+     */
+    @TableField("t2Scale")
+    private BigDecimal t2Scale;
+
+
+    /**
+     * T3 级别管理奖 即:T3管理奖收益比例
+     */
+    @TableField("t3Scale")
+    private BigDecimal t3Scale;
+
+
+    /**
+     * 分红奖励 万2.5 值需要除以10000
+     */
+    @TableField("dividScale")
+    private BigDecimal dividScale;
+
+
+    /**
+     * 区域合伙人奖励 值需要除以10000使用
+     */
+    @TableField("areaScale")
+    private BigDecimal areaScale;
+
+
+    /**
+     * 缴费通
+     */
+    @TableField("jftRate")
+    private BigDecimal jftRate;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(exist = false, condition = "createTime &gt; #{%s}")
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(exist = false, condition = "createTime &lt; #{%s}")
+    private Date createTimeEnd;
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserManageProfit.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserManageProfit.java
new file mode 100644
index 0000000..a71868e
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserManageProfit.java
@@ -0,0 +1,125 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.Date;
+
+/**
+ * <p>
+ * 用户管理奖统计表
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-05-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_user_manage_profit")
+public class UserManageProfit implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 用户ID
+     */
+    @TableField("userId")
+    private Integer userId;
+
+
+    /**
+     * 父级用户ID
+     */
+    @TableField("parentId")
+    private Integer parentId;
+
+
+    /**
+     * 用户角色
+     */
+    @TableField("roleCode")
+    private String roleCode;
+
+
+    /**
+     * 用户等级
+     */
+    @TableField("levelCode")
+    private String levelCode;
+
+
+    /**
+     * t2流水
+     */
+    @TableField("t2Flow")
+    private BigDecimal t2Flow;
+
+
+    /**
+     * t3流水
+     */
+    @TableField("t3Flow")
+    private BigDecimal t3Flow;
+
+
+    /**
+     * t2收益
+     */
+    @TableField("t2Profit")
+    private BigDecimal t2Profit;
+
+
+    /**
+     * t3收益
+     */
+    @TableField("t3Profit")
+    private BigDecimal t3Profit;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(exist = false, condition = "createTime &gt; #{%s}")
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(exist = false, condition = "createTime &lt; #{%s}")
+    private Date createTimeEnd;
+
+    /**
+     * 收益日期
+     */
+    @TableField("profitDate")
+    private LocalDate profitDate;
+
+
+    @TableField("profitMonth")
+    private String profitMonth;
+
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserMultipleRemark.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserMultipleRemark.java
new file mode 100644
index 0000000..251599f
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserMultipleRemark.java
@@ -0,0 +1,70 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-05-31
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_user_multiple_remark")
+public class UserMultipleRemark implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Long id;
+
+
+    @TableField("userId")
+    private Long userId;
+
+
+    /**
+     * 备注类型code
+     */
+    @TableField("code")
+    private String code;
+
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(exist = false, condition = "createTime &gt; #{%s}")
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(exist = false, condition = "createTime &lt; #{%s}")
+    private Date createTimeEnd;
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserOrgan.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserOrgan.java
new file mode 100644
index 0000000..32572f2
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserOrgan.java
@@ -0,0 +1,17 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+@Data
+public class UserOrgan {
+
+    @TableId
+    private Integer id;
+    private Integer userId;
+    private String organCode;
+    private String organName;
+    private String organTypeCode;
+    private String organTypeName;
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserProfit.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserProfit.java
new file mode 100644
index 0000000..9fbe4a6
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserProfit.java
@@ -0,0 +1,223 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author bzg
+ * @since 2022-01-14
+ */
+@Data
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_user_profit")
+public class UserProfit implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 用户ID
+     */
+    @TableField("userId")
+    private Long userId;
+
+    /**
+     * 上级ID
+     */
+    @TableField("parentId")
+    private Long parentId;
+
+
+    /**
+     * 用户角色
+     */
+    @TableField("roleCode")
+    private String roleCode;
+
+
+    /**
+     * 总交易金额(即团队流水)
+     */
+    @TableField("teamTransFlow")
+    private BigDecimal teamTransFlow;
+
+    /**
+     * 自己交易金额
+     */
+    @TableField("ownTransFlow")
+    private BigDecimal ownTransFlow;
+
+    /**
+     * 直推交易流水
+     */
+    @TableField("directTransFlow")
+    private BigDecimal directTransFlow;
+
+
+    /**
+     * 直推交易流水
+     */
+    @TableField("indirectTransFlow")
+    private BigDecimal indirectTransFlow;
+
+    /**
+     * 总分润金额
+     */
+    @TableField("totalProfitAmt")
+    private BigDecimal totalProfitAmt;
+
+
+    /**
+     * 直推分润
+     */
+    @TableField("directProfitAmt")
+    private BigDecimal directProfitAmt;
+
+    /**
+     * 间推分润
+     * @date: 2022/1/15 19:14
+     */
+    @TableField("indirectProfitAmt")
+    private BigDecimal indirectProfitAmt;
+
+    @TableField("otherProfitAmt")
+    private BigDecimal otherProfitAmt;
+
+
+    /**
+     * t2收益
+     */
+    @TableField("t2ProfitAmt")
+    private BigDecimal t2ProfitAmt;
+
+
+    /**
+     * t3收益
+     */
+    @TableField("t3ProfitAmt")
+    private BigDecimal t3ProfitAmt;
+
+
+    /**
+     * 分红奖励
+     */
+    @TableField("dividProfitAmt")
+    private BigDecimal dividProfitAmt;
+
+
+    /**
+     * 区域合伙人流水
+     */
+    @TableField("areaFlow")
+    private BigDecimal areaFlow;
+
+    /**
+     * 区域合伙人奖励
+     */
+    @TableField("areaProfitAmt")
+    private BigDecimal areaProfitAmt;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(exist = false, condition = "createTime &gt; #{%s}")
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(exist = false, condition = "createTime &lt; #{%s}")
+    private Date createTimeEnd;
+
+    /**
+     * 分润时间
+     */
+    @TableField("profitDate")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
+    private Date profitDate;
+
+    /**
+     * 分润归属月份
+     * @date: 2022/1/20 10:22
+     */
+    @TableField("profitMonth")
+    private String profitMonth;
+
+    /**
+     * 备注
+     */
+    @TableField("remarks")
+    private String remarks;
+
+    /**
+     * 等级Code
+     */
+    @TableField("levelCode")
+    private String levelCode;
+
+    /**
+     * 交易笔数
+     * @date: 2022/1/22 16:12
+     */
+    @TableField("transNum")
+    private Integer transNum;
+
+    /**
+     * 自己的交易笔数(当自己有流水和团队有流水的时候会冲突)
+     * @date: 2022/3/14 15:06
+     */
+    @TableField("ownTransNum")
+    private Integer ownTransNum;
+
+    @TableField(exist = false)
+    private BigDecimal directRate;
+
+    @TableField(exist = false)
+    private BigDecimal indirectRate;
+
+    @TableField(exist = false)
+    private BigDecimal t2Scale;
+
+    @TableField(exist = false)
+    private BigDecimal t3Scale;
+
+    @TableField(exist = false)
+    private BigDecimal dividScale;
+
+    @TableField(exist = false)
+    private BigDecimal areaScale;
+
+
+    /**
+     * 用户名称
+     */
+    @TableField(exist = false)
+    private String userName;
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserPushId.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserPushId.java
new file mode 100644
index 0000000..b01916d
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserPushId.java
@@ -0,0 +1,65 @@
+package cn.pluss.platform.entity;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author djh
+ */
+@Data
+@TableName("tb_pluss_user_push_id")
+public class UserPushId {
+
+    @TableId
+    private Long id;
+
+    @TableField("userId")
+    private Long userId;
+
+    /**
+     * 个推的cid
+     */
+    @TableField("getuiClientId")
+    private String getuiClientId;
+
+    /**
+     * 创建时间
+     */
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(exist = false, condition = "createTime &gt; #{%s}")
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(exist = false, condition = "createTime &lt; #{%s}")
+    private Date createTimeEnd;
+
+    /**
+     * 更新时间
+     */
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(exist = false, condition = "updateTime &gt; #{%s}")
+    private Date updateTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(exist = false, condition = "updateTime &lt; #{%s}")
+    private Date updateTimeEnd;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserRewardFlow.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserRewardFlow.java
new file mode 100644
index 0000000..86d8888
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserRewardFlow.java
@@ -0,0 +1,131 @@
+package cn.pluss.platform.entity;
+
+import cn.pluss.platform.enums.BstLevelCode;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.Date;
+
+/**
+ * <p>
+ * 直营贝斯特管理奖流水表
+ * </p>
+ *
+ * @author bzg
+ * @since 2022-01-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("tb_pluss_user_reward_flow")
+public class UserRewardFlow implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    public static final int TYPE_DIRE = 1;
+
+    public static final int TYPE_INRE = 2;
+    /**
+     * ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 用户Id
+     */
+    @TableField("userId")
+    private Long userId;
+
+
+    /**
+     * 父级ID
+     */
+    @TableField("parentId")
+    private Long parentId;
+
+
+    /**
+     * T2流水
+     */
+    @TableField("t2Flow")
+    private BigDecimal t2Flow;
+
+
+    /**
+     * T3流水
+     */
+    @TableField("t3Flow")
+    private BigDecimal t3Flow;
+
+
+    /**
+     * 分红流水
+     */
+    @TableField("dividFlow")
+    private BigDecimal dividFlow;
+
+
+    /**
+     * 区域流水
+     */
+    @TableField("areaFlow")
+    private BigDecimal areaFlow;
+
+
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     *  开始时间
+     */
+    @TableField(exist = false, condition = "createTime &gt; #{%s}")
+    private Date createTimeStart;
+
+    /**
+     *  截止时间
+     */
+    @TableField(exist = false, condition = "createTime &lt; #{%s}")
+    private Date createTimeEnd;
+
+    @TableField("createDate")
+    private LocalDate createDate;
+
+
+    /**
+     * 订单号
+     */
+    @TableField("orderNumber")
+    private String orderNumber;
+
+    /**
+     * 状态1：已支付，2：已退款
+     */
+    @TableField("status")
+    private Integer status;
+
+
+
+    public UserRewardFlow(UserApp userApp, MerchantOrder order,int type) {
+        this.userId = userApp.getUserId();
+        this.parentId = userApp.getParentId();
+        if(type == TYPE_DIRE){
+            this.t2Flow = BigDecimal.valueOf(order.getConsumeFee());
+        }
+        if(type == TYPE_INRE){
+            this.t3Flow = BigDecimal.valueOf(order.getConsumeFee());
+        }
+        this.dividFlow = BigDecimal.ZERO;
+        this.areaFlow = BigDecimal.ZERO;
+        this.orderNumber = order.getOrderNumber();
+    }
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserRewardInfo.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserRewardInfo.java
new file mode 100644
index 0000000..dcd4ee1
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserRewardInfo.java
@@ -0,0 +1,106 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 用户奖励信息表
+ * </p>
+ *
+ * @author bzg
+ * @since 2022-02-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_user_reward_info")
+public class UserRewardInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 用户ID
+     */
+    @TableField("userId")
+    private Integer userId;
+
+
+    /**
+     * 区域等级1：表示省 2：市 3：区域（县）
+     */
+    @TableField("areaLevel")
+    private Integer areaLevel;
+
+
+    /**
+     * 区域code
+     */
+    @TableField("areaNo")
+    private String areaNo;
+
+
+    /**
+     * 区域名称
+     */
+    @TableField("areaName")
+    private String areaName;
+
+
+    /**
+     * 状态1：正常 -1禁用
+     */
+    @TableField("status")
+    private Integer status;
+
+
+    /**
+     * rId
+     */
+    @TableField("reId")
+    private Integer reId;
+
+
+    @TableField("rName")
+    private String rName;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(exist = false, condition = "createTime &gt; #{%s}")
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(exist = false, condition = "createTime &lt; #{%s}")
+    private Date createTimeEnd;
+
+    @TableField(exist = false)
+    private BigDecimal scale;
+
+    private String phone;
+
+    /**
+     * 登录账号
+     */
+    @TableField(exist = false)
+    private String loginName;
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserRole.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserRole.java
new file mode 100644
index 0000000..2811fe1
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserRole.java
@@ -0,0 +1,107 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 用户角色表
+ * </p>
+ *
+ * @author bzg
+ * @since 2022-01-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_user_role")
+public class UserRole implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    public static int DEFAULT_VALID_OPEN = 1;
+
+    public static int DEFAULT_VALID_CLOSE = -1;
+
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 角色名称
+     */
+    @TableField(value = "roleName",whereStrategy = FieldStrategy.NOT_EMPTY,condition = SqlCondition.LIKE)
+    private String roleName;
+
+
+    /**
+     * 角色Code
+     */
+    @TableField("roleCode")
+    private String roleCode;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(exist = false, condition = "createTime &gt; #{%s}")
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(exist = false, condition = "createTime &lt; #{%s}")
+    private Date createTimeEnd;
+
+    /**
+     * 有效商户开关配置 1：开启 -1：关闭
+     */
+    @TableField("validFlag")
+    private Integer validFlag;
+
+    /**
+     * 有效交易金额
+     */
+    @TableField("validTransAmt")
+    private BigDecimal validTransAmt;
+
+    /**
+     * 有效交易笔数
+     */
+    @TableField("validTransNum")
+    private Integer validTransNum;
+
+    /**
+     * 最少数量
+     */
+    @TableField("minNum")
+    private Integer minNum;
+
+    /**
+     * 开启时间
+     */
+    @TableField("openTime")
+    private Date openTime;
+
+    /**
+     * 保护天数 新进商户默认保护天数
+     */
+    @TableField("protectDayNum")
+    private Integer protectDayNum;
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserTask.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserTask.java
new file mode 100644
index 0000000..cce1602
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserTask.java
@@ -0,0 +1,227 @@
+package cn.pluss.platform.entity;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * <p>
+ *  任务配置数据，循环任务执行具体时间取决于定时任务触发时间
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-05-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_user_task")
+public class UserTask implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 生效中
+     */
+    public static final String STATUS_ENABLED = "1";
+
+    /**
+     * 已取消
+     */
+    public static final String STATUS_CANCELED = "2";
+
+    /**
+     * 已过期
+     */
+    public static final String STATUS_EXPIRED = "3";
+
+    /** 只执行一次 */
+    public static final String TYPE_ONCE = "1";
+
+    /** 每天执行一次 */
+    public static final String TYPE_DAY = "2";
+
+    /** 每周执行一次 */
+    public static final String TYPE_WEEK = "3";
+
+    /** 每月执行一次 */
+    public static final String TYPE_MONTH = "4";
+
+    /**
+     * id
+     */
+    @TableId("id")
+    private Integer id;
+
+
+    /**
+     * 用户id
+     */
+    @TableField("userId")
+    private Integer userId;
+
+
+    /**
+     * 任务编码
+     */
+    @TableField("taskCode")
+    private String taskCode;
+
+
+    /**
+     * 任务编码类型
+     */
+    @TableField(exist = false)
+    private String taskCodeDesc;
+
+
+    /**
+     * 状态，1：生效中；2：已取消；3：已过期
+     */
+    @TableField("status")
+    private String status;
+
+
+    @TableField(exist = false)
+    private String statusDesc;
+
+
+    /**
+     * 任务类型，1：第二天执行一次；2：每天执行一次；3：每周一次；4：每月执行一次
+     */
+    @TableField("type")
+    private String type;
+
+    @TableField(exist = false)
+    private String typeDesc;
+
+    /**
+     * 参数一， 具体参数使用规则根据任务逻辑来定
+     */
+    @TableField("arg0")
+    private String arg0;
+
+
+    /**
+     * 参数二
+     */
+    @TableField("arg1")
+    private String arg1;
+
+
+    /**
+     * 参数二
+     */
+    @TableField("arg2")
+    private String arg2;
+
+
+    /**
+     * 参数二
+     */
+    @TableField("arg3")
+    private String arg3;
+
+
+    /**
+     * 参数过多直接存json
+     */
+    private JSONObject extension;
+
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 创建时间 开始时间
+     */
+    @TableField(exist = false, condition = "createTime &gt; #{%s}")
+    private Date createTimeStart;
+
+    /**
+     * 创建时间 截止时间
+     */
+    @TableField(exist = false, condition = "createTime &lt; #{%s}")
+    private Date createTimeEnd;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "updateTime", fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    /**
+     * 更新时间 开始时间
+     */
+    @TableField(exist = false, condition = "updateTime &gt; #{%s}")
+    private Date updateTimeStart;
+
+    /**
+     * 更新时间 截止时间
+     */
+    @TableField(exist = false, condition = "updateTime &lt; #{%s}")
+    private Date updateTimeEnd;
+
+
+    public static void wrapper(UserTask src, List<TaskSort> taskSortList) {
+        if (src == null) {
+            return;
+        }
+
+        switch (src.getType()) {
+            case "1":
+                src.setTypeDesc("第二天执行一次");
+                break;
+            case "2":
+                src.setTypeDesc("每日一次");
+                break;
+            case "3":
+                src.setTypeDesc("每周一次");
+                break;
+            case "4":
+                src.setTypeDesc("每月一次");
+                break;
+            default:
+                src.setTypeDesc("未知类型");
+                break;
+        }
+
+        switch (src.getStatus()) {
+            case "1":
+                src.setStatusDesc("生效中");
+                break;
+            case "2":
+                src.setStatusDesc("已取消");
+                break;
+            case "3":
+                src.setStatusDesc("已过期");
+                break;
+            default:
+                break;
+        }
+
+        if (taskSortList == null || taskSortList.isEmpty()) {
+            return;
+        }
+
+        for (TaskSort taskSort : taskSortList) {
+            if (Objects.equals(taskSort.getCode(), src.getTaskCode())) {
+                src.setTaskCodeDesc(taskSort.getCode());
+                return;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserVoice.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserVoice.java
new file mode 100644
index 0000000..f2fe1a5
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserVoice.java
@@ -0,0 +1,96 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 用户播报配置表
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-04-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_user_voice")
+public class UserVoice implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    public static final String ENABLE = "1";
+
+    public static final String DISABLE = "0";
+
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 用户id
+     */
+    @TableField("userId")
+    private Long userId;
+
+
+    /**
+     * 付款播报，0：不播报；1：播报
+     */
+    @TableField("paySuccess")
+    private String paySuccess;
+
+
+    /**
+     * 取消付款播报
+     */
+    @TableField("payCancel")
+    private String payCancel;
+
+
+    /**
+     * 会员充值播报
+     */
+    @TableField("memberCharge")
+    private String memberCharge;
+
+
+    /**
+     * 会员消费播报
+     */
+    @TableField("memberConsume")
+    private String memberConsume;
+
+
+    /**
+     * 外卖下单播报
+     */
+    @TableField("deliveryOrder")
+    private String deliveryOrder;
+
+
+    /**
+     * 店内下单播报
+     */
+    @TableField("storeOrder")
+    private String storeOrder;
+
+
+    /**
+     * 催单播报
+     */
+    @TableField("urge")
+    private String urge;
+
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/WxBankCode.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/WxBankCode.java
new file mode 100644
index 0000000..493f4c1
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/WxBankCode.java
@@ -0,0 +1,15 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+@Data
+public class WxBankCode {
+
+    @TableId
+    private Integer id;
+    private String bankName;
+    private String bankCode;
+    private String remark;
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/WxCityInfo.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/WxCityInfo.java
new file mode 100644
index 0000000..1f743f0
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/WxCityInfo.java
@@ -0,0 +1,14 @@
+package cn.pluss.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+@Data
+public class WxCityInfo {
+
+    @TableId
+    private Integer id;
+    private String cityCode;
+    private String cityName;
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/enums/BstLevelCode.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/enums/BstLevelCode.java
new file mode 100644
index 0000000..4420cc1
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/enums/BstLevelCode.java
@@ -0,0 +1,22 @@
+package cn.pluss.platform.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 用户角色枚举
+ * @author: Administrator
+ * @DATE: 2022/1/14 15:57
+ */
+@Getter
+@AllArgsConstructor
+public enum BstLevelCode {
+
+    T1("T1","T1级别"),
+    T2("T2","T2级别"),
+    T3("T3","T3级别"),
+    T4("T4","BOOS");
+    private String code;
+
+    private String name;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/enums/DeviceOperateType.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/enums/DeviceOperateType.java
new file mode 100644
index 0000000..e94562c
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/enums/DeviceOperateType.java
@@ -0,0 +1,47 @@
+package cn.pluss.platform.enums;
+
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.util.StringUtil;
+import cn.pluss.platform.yt.YtStatusEnum;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 设备操作类型枚举
+ *
+ * @author crystal
+ * @date 2022/4/2 16:27
+ */
+@Getter
+@AllArgsConstructor
+public enum DeviceOperateType {
+
+    IN("00","设备入库"),
+    TRANSFER("01","设备划拨"),
+    RECEIVE("02","设备接收"),
+    BIND("03","设备绑定"),
+    UNBIND("04","设备解绑"),
+    BUY("05","设备购买");
+
+    private String code;
+
+    private String name;
+
+    /**
+     * code转换
+     * @param code
+     * @return
+     */
+    public static String getNameByCode(String code) {
+        if(StringUtil.isEmpty(code)){
+            MsgException.throwException("code为空,状态转换失败");
+        }
+        DeviceOperateType[] operateTypes = values();
+        for (DeviceOperateType ot : operateTypes) {
+            if (ot.code.equals(code)) {
+                return ot.getName();
+            }
+        }
+        return "";
+    }
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/enums/DeviceOrderStatus.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/enums/DeviceOrderStatus.java
new file mode 100644
index 0000000..71e4c3e
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/enums/DeviceOrderStatus.java
@@ -0,0 +1,26 @@
+package cn.pluss.platform.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * TODO
+ * 订单状态枚举值
+ * @author crystal
+ * @date 2022/3/28 14:27
+ */
+@Getter
+@AllArgsConstructor
+public enum DeviceOrderStatus {
+
+    WAIT_PAY("00","待支付"),
+    SUCC_PAY("01","已支付"),
+    REFUND_ING("02","退款中"),
+    REFUND_SUCC("03","退款成功"),
+    REFUND_FAIL("04","退款失败"),
+    RECEIV_ING("05","待收货"),
+    COMPLETED("06","已完成");
+
+    private String status;
+    private String desc;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/enums/ExtendParam.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/enums/ExtendParam.java
new file mode 100644
index 0000000..278c0b4
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/enums/ExtendParam.java
@@ -0,0 +1,25 @@
+package cn.pluss.platform.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * TODO
+ * 交易接口扩展回传参数枚举
+ * @author crystal
+ * @date 2022/6/21 18:40
+ */
+@Getter
+@AllArgsConstructor
+public enum ExtendParam {
+
+    BASICS("basics","基础"),
+
+    DEVICE("device","设备"),
+
+    JFT("jft","缴费通");
+
+    private String keyCode;
+
+    private String desc;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/enums/LogisticProvider.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/enums/LogisticProvider.java
new file mode 100644
index 0000000..a7ab600
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/enums/LogisticProvider.java
@@ -0,0 +1,23 @@
+package cn.pluss.platform.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * TODO
+ *  快递类型枚举
+ * @author crystal
+ * @date 2022/3/28 14:48
+ */
+@Getter
+@AllArgsConstructor
+public enum LogisticProvider {
+
+    YTO("YTO","圆通快递");
+
+    private String code;
+
+    private String desc;
+
+
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/enums/PayMessageType.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/enums/PayMessageType.java
new file mode 100644
index 0000000..4cf5ade
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/enums/PayMessageType.java
@@ -0,0 +1,25 @@
+package cn.pluss.platform.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * TODO
+ *
+ * @author crystal
+ * @date 2022/5/1 11:04
+ */
+@Getter
+@AllArgsConstructor
+public enum PayMessageType {
+
+    PLAIN_PAY(1,"收银呗到账"),
+
+    MEMBER_CONSUME(2,"会员卡消费"),
+
+    MEMBER_RECHARGE(3,"会员卡充值");
+
+    private int value;
+
+    private String desc;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/enums/SubAppLetInfo.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/enums/SubAppLetInfo.java
new file mode 100644
index 0000000..288636f
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/enums/SubAppLetInfo.java
@@ -0,0 +1,41 @@
+package cn.pluss.platform.enums;
+
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.util.StringUtil;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * TODO
+ * 下游渠道小程序配置相关信息
+ * @author crystal
+ * @date 2022/4/12 10:30
+ */
+@Getter
+@AllArgsConstructor
+public enum SubAppLetInfo {
+
+    CSY("wx79b08abe2c635a78","f885694fa1cb93656b72db34f3dae211","仓鼠云收银台小程序"),
+    MIMA("wx4dce83e9d6d42a6c","09d0ec30f8da544e396ad0b716f120f6","密码收银台小程序"),
+    TR("wx6639bea0f0c6d648","d060a877a09b48a8dc42f2eb66e08b25","天润收银小程序"),
+    SYB("wxaa8c9e6857a265e1","2ca82f68f5fa680bc6fc924fd22bd52d","收银呗智慧收银小程序");
+
+    private String appid;
+
+    private String secret;
+
+    private String desc;
+
+    public static String getSecretByAppid(String appid) {
+        if(StringUtil.isEmpty(appid)){
+            MsgException.throwException("appid为空,获取异常");
+        }
+        SubAppLetInfo[] appLetInfos = values();
+        for (SubAppLetInfo sl : appLetInfos) {
+            if (sl.appid.equals(appid)) {
+                return sl.getSecret();
+            }
+        }
+        return "";
+    }
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/enums/UserRoleEnum.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/enums/UserRoleEnum.java
new file mode 100644
index 0000000..370081a
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/enums/UserRoleEnum.java
@@ -0,0 +1,22 @@
+package cn.pluss.platform.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 用户角色枚举
+ * @author: Administrator
+ * @DATE: 2022/1/14 15:57
+ */
+@Getter
+@AllArgsConstructor
+public enum UserRoleEnum {
+
+    SV2("SV2","2.0模式"),
+    ZY_BST("ZY_BST","直营倍斯特"),
+    COMMON("common","公共角色");
+
+    private String code;
+
+    private String name;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/enums/WxApplyStatus.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/enums/WxApplyStatus.java
new file mode 100644
index 0000000..f06236d
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/enums/WxApplyStatus.java
@@ -0,0 +1,68 @@
+package cn.pluss.platform.enums;
+
+import lombok.Getter;
+
+/**
+ * @author SSS
+ */
+
+public enum WxApplyStatus {
+
+    /**
+     * 审核中
+     */
+    EXAMINING("APPLYMENT_STATE_WAITTING_FOR_AUDIT", "请耐心等待 1~2 个工作日，微信支付将会完成审核。")
+    ,
+    /**
+     * 编辑中
+     */
+    EDITING("APPLYMENT_STATE_EDITTING", "可能提交申请发生了错误导致，可用同一个业务申请编号重新提交")
+    ,
+    /**
+     * 待确认联系信息
+     */
+    CONFIRM_CONTACT("APPLYMENT_STATE_WAITTING_FOR_CONFIRM_CONTACT", "请扫描微信支付返回的小程序码确认联系信息")
+    ,
+    /**
+     * 待账户验证
+     */
+    CONFIRM_LEGALPERSON("APPLYMENT_STATE_WAITTING_FOR_CONFIRM_LEGALPERSON", "请扫描微信支付返回的小程序码在小程序端完成账户验证")
+    ,
+    /**
+     * 审核通过
+     */
+    PASSED("APPLYMENT_STATE_PASSED", "请扫描微信支付返回的小程序码在小程序端完成授权流程")
+    ,
+    /**
+     * 审核驳回
+     */
+    REJECTED("APPLYMENT_STATE_REJECTED", "请扫描微信支付返回的小程序码在小程序端完成账户验证")
+    ,
+    /**
+     * 已冻结
+     */
+    FREEZED("APPLYMENT_STATE_REJECTED", "可能是该主体已完成过入驻，请查看驳回原因，并通知驳回原因中指定的联系人扫描微信支付返回的小程序码在小程序端完成授权流程")
+    ,
+    /**
+     * 已作废
+     */
+    CANCELED("APPLYMENT_STATE_CANCELED", "表示申请单已被撤销，无需再对其进行操作")
+    ;
+
+    /**
+     * 状态值
+     */
+    @Getter
+    String statusName;
+
+    /**
+     * 状态描述
+     */
+    @Getter
+    String statusMsg;
+
+    WxApplyStatus(String statusName, String statusMsg) {
+        this.statusName = statusName;
+        this.statusMsg = statusMsg;
+    }
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/enums/WxAuthStatus.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/enums/WxAuthStatus.java
new file mode 100644
index 0000000..501ce1b
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/enums/WxAuthStatus.java
@@ -0,0 +1,28 @@
+package cn.pluss.platform.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 微信认证状态
+ * @author djh
+ */
+@AllArgsConstructor
+public enum WxAuthStatus {
+
+    /**
+     * 已授权
+     */
+    AUTHORIZED("AUTHORIZE_STATE_AUTHORIZED", "已授权")
+    ,
+    /**
+     * 未授权
+     */
+    UNAUTHORIZED("AUTHORIZE_STATE_UNAUTHORIZED", "未授权");
+
+    @Getter
+    private String name;
+
+    @Getter
+    private String desc;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/AccountInfo.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/AccountInfo.java
new file mode 100644
index 0000000..c0467ec
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/AccountInfo.java
@@ -0,0 +1,75 @@
+package cn.pluss.platform.leshua;
+
+import cn.pluss.platform.util.StringUtil;
+import lombok.Data;
+
+/**
+ * @author yuchen
+ * 
+ * @Description 
+ * 结算信息
+ */
+@Data
+public class AccountInfo {
+	
+	/**
+	 * 0：非法人结算1：法人结算
+	 */
+	private String legalFlag;
+	
+	/**
+	 * 1：个人账户；2：公司账户
+	 */
+	private String type;
+	
+	/**
+	 * 无
+	 * 开户行网点(与联行号二选一必传)
+	 */
+	private String branch;
+	
+	/**
+	 * 无
+	 * 开户支行联行号(企业必传)
+	 */
+	private String unionpay;
+	
+	/**
+	 * 无
+	 * 开户名；法人结算：与法人姓名一致；企业账户：与营业执照注册名称一致
+	 */
+	private String holder;
+	
+	/**
+	 * 无
+	 * 结算人身份证号码(个人账户必传)
+	 */
+	private String idCardNo;
+	
+	/**
+	 * 无
+	 * 银行卡号
+	 */
+	private String bankCardNo;
+	
+	/**
+	 * 无
+	 * 银行卡正面（如是对公账户，开户许可证）
+	 */
+	private String bankCardFrontPic;
+
+	public String getBankCardNo() {
+		if (StringUtil.isEmpty(bankCardNo)) {
+			return bankCardNo;
+		}
+		return bankCardNo.replaceAll("[ 　]", "");
+	}
+
+	public String getIdCardNo() {
+		if (StringUtil.isEmpty(idCardNo)) {
+			return idCardNo;
+		}
+		return idCardNo.replaceAll("[ 　]", "");
+	}
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/AddressInfo.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/AddressInfo.java
new file mode 100644
index 0000000..bffe618
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/AddressInfo.java
@@ -0,0 +1,101 @@
+package cn.pluss.platform.leshua;
+
+/**
+ * @author yuchen
+ * 
+ * @Description 
+ * 店铺地址信息
+ */
+public class AddressInfo {
+	
+	private String provinceCode;
+	
+	private String cityCode;
+	
+	private String areaCode;
+		
+//	/**
+//	 * 
+//	 * 省
+//	 */
+//	private String province;
+//	
+//	/**
+//	 * 
+//	 * 市
+//	 */
+//	private String city;
+//	
+//	/**
+//	 * 
+//	 * 区县
+//	 */
+//	private String area;
+	
+	/**
+	 * 有
+	 * 商户详细地址 长度5-40
+	 */
+	private String address;
+
+//	public String getProvince() {
+//		return province;
+//	}
+//
+//	public void setProvince(String province) {
+//		this.province = province;
+//	}
+//
+//	public String getCity() {
+//		return city;
+//	}
+//
+//	public void setCity(String city) {
+//		this.city = city;
+//	}
+//
+//	public String getArea() {
+//		return area;
+//	}
+//
+//	public void setArea(String area) {
+//		this.area = area;
+//	}
+
+	public String getAddress() {
+		return address;
+	}
+
+	public void setAddress(String address) {
+		this.address = address;
+	}
+
+	public String getProvinceCode() {
+		return provinceCode;
+	}
+
+	public void setProvinceCode(String provinceCode) {
+		this.provinceCode = provinceCode;
+	}
+
+	public String getCityCode() {
+		return cityCode;
+	}
+
+	public void setCityCode(String cityCode) {
+		this.cityCode = cityCode;
+	}
+
+	public String getAreaCode() {
+		return areaCode;
+	}
+
+	public void setAreaCode(String areaCode) {
+		this.areaCode = areaCode;
+	}
+	
+	
+	
+	
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/BankAndProvinceVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/BankAndProvinceVO.java
new file mode 100644
index 0000000..d3a72d4
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/BankAndProvinceVO.java
@@ -0,0 +1,37 @@
+package cn.pluss.platform.leshua;
+
+import java.util.List;
+
+/**
+ * @author yuchen
+ * 
+ * @Description 
+ */
+public class BankAndProvinceVO {
+	
+	private List<String> bankNameList;
+	
+	private List<ProvinceVO> provinceList;
+
+	public List<String> getBankNameList() {
+		return bankNameList;
+	}
+
+	public void setBankNameList(List<String> bankNameList) {
+		this.bankNameList = bankNameList;
+	}
+
+	public List<ProvinceVO> getProvinceList() {
+		return provinceList;
+	}
+
+	public void setProvinceList(List<ProvinceVO> provinceList) {
+		this.provinceList = provinceList;
+	}
+
+	
+	
+	
+
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/BankNameVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/BankNameVO.java
new file mode 100644
index 0000000..a800c13
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/BankNameVO.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.leshua;
+
+import lombok.Data;
+
+/**
+ * @author yuchen
+ * 
+ * @Description 
+ */
+@Data
+public class BankNameVO {
+	private String branchName;
+	
+	private String unionpayCode;
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/BaseInfo.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/BaseInfo.java
new file mode 100644
index 0000000..da3d9c5
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/BaseInfo.java
@@ -0,0 +1,30 @@
+package cn.pluss.platform.leshua;
+
+import lombok.Data;
+
+/**
+ * @author yuchen
+ * 
+ * @Description 
+ * 商户基本信息
+ */
+@Data
+public class BaseInfo {
+	
+	private Integer merchantType;
+	
+	/**
+	 * 有
+	 * 商户简称
+	 */
+	private String merchantName;
+	
+	private String merchantShortName;
+	
+	/**
+	 * 无
+	 * MCC码商户行业编号(按银联标准)
+	 */
+	private String mccCode;
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/BizConstants.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/BizConstants.java
new file mode 100644
index 0000000..d28c5f8
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/BizConstants.java
@@ -0,0 +1,156 @@
+package cn.pluss.platform.leshua;
+
+import java.math.BigDecimal;
+
+/**
+ * @author yuchen
+ * 
+ * @Description
+ */
+public class BizConstants {
+
+	public static final BigDecimal RATE = BigDecimal.valueOf(0.0038d);
+
+    public static final String CHARSET_UTF8 = "UTF-8";
+
+    public static final String SIGN_TYPE_MD5 = "MD5";
+
+    public static final String SUCCESS_CODE = "000000";
+
+    /**
+     * 初始版本,值为1
+     **/
+    public static final Integer VERSION_INITIAL = Integer.valueOf("1");
+
+    /**
+     * 无效模型ID，更新时使用
+     **/
+    public static final Long MODEL_ID_INVALID_UPDATE = Long.valueOf(-1);
+
+    /**
+     * 无效模型ID，前端搜索时使用
+     **/
+    public static final Long MODEL_ID_INVALID_QUERY = Long.valueOf(-2);
+
+    /**
+     * 缓存值Y
+     **/
+    public static final String CACHE_VAL_Y = "Y";
+
+    //D0提现开关
+    public final static String D0SETTLE_SWITCH = "d0settle.switch";
+
+    /**
+     * 开关打开
+     **/
+    public static final String SWITCH_ON = "ON";
+    /**
+     * 开关关闭
+     **/
+    public static final String SWITCH_OFF = "OFF";
+
+    /**
+     * 清算日期格式
+     **/
+    public static final String SETTLE_DATE_FORMAT = "yyyyMMdd";
+
+    /**
+     * 提现订单号前缀
+     **/
+    public static final String WITHDRAW_ORDER_PREFIX = "W";
+
+    /**
+     * 快捷支付支付订单号前缀
+     **/
+    public static final String FAST_PAY_ORDER_PREFIX = "FP";
+
+    /**
+     * 快捷支付提现订单号前缀
+     **/
+    public static final String FAST_WITHDRAW_ORDER_PREFIX = "FW";
+
+    /**
+     * 快捷支付鉴权订单号前缀
+     **/
+    public static final String FAST_AUTH_ORDER_PREFIX = "AU";
+
+    /**
+     * 民生提现前缀
+     **/
+    public static final String WITHDRAW_MSBANK_ORDER_PREFIX = "WMS";
+
+    /**
+     * 华夏提现前缀
+     **/
+    public static final String WITHDRAW_HXBANK_ORDER_PREFIX = "WHX";
+
+    public static final String ONLINE_ORDER_PREFIX_ALI = "ALI";
+    public static final String ONLINE_ORDER_PREFIX_WX = "WX";
+
+    /**
+     * 结算流水号前缀
+     **/
+    public static final String SETT_TRX_NO_PREFIX = "SETT";
+    /**
+     * 结算批次号
+     **/
+    public static final String SETT_BATCH_NO_PREFIX = "SB";
+
+    /**
+     * 民生银行标识
+     */
+
+    public static final String EMPTY_STR = "";
+
+    public static final String DECOLLATOR = ",";
+    /**
+     * 民生T单笔提现费
+     */
+    public static final String MSBANK_DEFAULT_T1DRAW_FEE = "msbank.deafult.t1draw.fee";
+
+    /**
+     * 对账文件路径存取
+     */
+    public static final String SYJ_RECONFILE_PATH = "syj.reconfile.path";
+
+    /**
+     * 民生主动查询商户缓存标识
+     */
+    public static final String QUERY_MERCHANT_APPROVE_STATUS_SUBMIT_FLAG = "query_merchant_approve_status_re_submit_flag";
+
+    /**
+     * 新增或者修改的操作类型
+     **/
+    public static final String INSERT_OPERATION_TYPE = "INSERT";
+    public static final String MODIFY_OPERATION_TYPE = "MODIFY";
+
+    public static final String SIGN_METHOD_MD5 = "MD5";
+    public static final String SIGN_TYPE_KEY = "signType";
+    public static final String SIGN_KEY = "sign";
+    public static final String RANDOM_STR_KEY = "randomStr";
+
+    /**
+     * 合利宝1579生产环境商户号(同人进出)
+     **/
+    public static final String HLB_MERCHANT_NO_1579_SP = "C1800001579";
+
+    /**
+     * 合利宝1579生产环境商户号(渔果同人进出)
+     **/
+    public static final String HLB_MERCHANT_NO_5851_SP = "C1800195851";
+
+    /**
+     * 合利宝1450生产环境商户号(非同人进出)
+     **/
+    public static final String HLB_MERCHANT_NO_1450_DP = "C1800001450";
+    /**
+     * 腾付通生产环境商户号
+     **/
+    public static final String TFT_MERCHANT_NO = "846584048162206";
+    /**
+     * 临时资质文件保存目录路径
+     */
+    public static final String MERCH_PIC_TMP = "merch_pic_tmp";
+
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/BizException.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/BizException.java
new file mode 100644
index 0000000..0ec6eea
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/BizException.java
@@ -0,0 +1,76 @@
+package cn.pluss.platform.leshua;
+
+/**
+ * @author yuchen
+ *
+ * @Description 
+ */
+public class BizException extends Exception {
+	
+	/** 
+	 * serialVersionUID:TODO(用一句话描述这个变量表示什么). 
+	 *
+	 * @since JDK 1.8 
+	 */
+	
+	private static final long serialVersionUID = 1L;
+
+	/** 通用错误码 **/
+	public static final String GENERIC_ERR = "10000";
+	
+	/** 错误代码 **/
+	private String errorCode;
+
+	/**
+	 * 构造方法，使用通用的错误码
+	 * @param message
+	 */
+	public BizException(String message) {
+		super(message);
+		this.errorCode = GENERIC_ERR;
+	}
+
+	/**
+	 * 构造方法，使用指定的错误码
+	 * @param errorCode
+	 * @param message
+	 */
+	public BizException(String errorCode, String message) {
+		super(message);
+		if (errorCode == null) {
+			errorCode = GENERIC_ERR;
+		}
+		this.errorCode = errorCode;
+	}
+
+	/**
+	 * 构造方法，且打印异常原因
+	 * @param errorCode
+	 * @param message
+	 * @param cause
+	 */
+	public BizException(String errorCode, String message, Throwable cause) {
+		super(message, cause);
+		this.errorCode = errorCode;
+	}
+
+	/**
+	 * 构造方法，且打印异常原因，但不输出提示文本
+	 * @param errorCode
+	 * @param cause
+	 */
+	public BizException(String errorCode, Throwable cause) {
+		super(cause);
+		this.errorCode = errorCode;
+	}
+
+	/**
+	 * 得到异常码
+	 * @return
+	 */
+	public String getErrorCode() {
+		return errorCode;
+	}
+
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/BizRuntimeException.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/BizRuntimeException.java
new file mode 100644
index 0000000..c150e64
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/BizRuntimeException.java
@@ -0,0 +1,84 @@
+package cn.pluss.platform.leshua;
+
+/**
+ * @author yuchen
+ *
+ * @Description 
+ */
+public class BizRuntimeException extends Exception {
+	
+	/** 
+	 * serialVersionUID:TODO(用一句话描述这个变量表示什么). 
+	 *
+	 * @since JDK 1.8 
+	 */
+	
+	private static final long serialVersionUID = 1L;
+
+	/** 通用错误码 **/
+	public static final String GENERIC_ERR = "50000";
+	
+	/** 错误代码 **/
+	private String errorCode;
+
+	/**
+	 * 构造方法，使用通用的错误码
+	 * @param message
+	 */
+	public BizRuntimeException(String message) {
+		super(message);
+		this.errorCode = GENERIC_ERR;
+	}
+
+	/**
+	 * 构造方法，使用指定的错误码
+	 * @param errorCode
+	 * @param message
+	 */
+	public BizRuntimeException(String errorCode, String message) {
+		super(message);
+		if (errorCode == null) {
+			errorCode = GENERIC_ERR;
+		}
+		this.errorCode = errorCode;
+	}
+	
+	/**
+	 * 构造方法，使用枚举的错误码
+	 * @param errCodeEnum
+	 */
+	public BizRuntimeException(ErrorCodeEnum errCodeEnum) {
+		this(errCodeEnum.getErrCode(), errCodeEnum.getErrMsg());
+	}
+
+	/**
+	 * 构造方法，且打印异常原因
+	 * @param errorCode
+	 * @param message
+	 * @param cause
+	 */
+	public BizRuntimeException(String errorCode, String message, Throwable cause) {
+		super(message, cause);
+		this.errorCode = errorCode;
+	}
+
+	/**
+	 * 构造方法，且打印异常原因，但不输出提示文本
+	 * @param errorCode
+	 * @param cause
+	 */
+	public BizRuntimeException(String errorCode, Throwable cause) {
+		super(cause);
+		this.errorCode = errorCode;
+	}
+
+	/**
+	 * 得到异常码
+	 * @return
+	 */
+	public String getErrorCode() {
+		return errorCode;
+	}
+
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/CityVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/CityVO.java
new file mode 100644
index 0000000..3667796
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/CityVO.java
@@ -0,0 +1,32 @@
+package cn.pluss.platform.leshua;
+
+/**
+ * @author yuchen
+ * 
+ * @Description 
+ */
+public class CityVO {
+	
+	private String cityCode;
+	
+	private String cityName;
+	
+
+	public String getCityName() {
+		return cityName;
+	}
+
+	public void setCityName(String cityName) {
+		this.cityName = cityName;
+	}
+
+	public String getCityCode() {
+		return cityCode;
+	}
+
+	public void setCityCode(String cityCode) {
+		this.cityCode = cityCode;
+	}
+	
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/ContactInfo.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/ContactInfo.java
new file mode 100644
index 0000000..905912e
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/ContactInfo.java
@@ -0,0 +1,41 @@
+package cn.pluss.platform.leshua;
+
+/**
+ * @author yuchen
+ *
+ * @Description 
+ * 联系人信息
+ */
+public class ContactInfo {
+		
+	/**
+	 * 有
+	 * 联系人姓名
+	 */
+	private String name;
+	
+	/**
+	 * 有
+	 * 手机号码
+	 */
+	private String mobile;
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getMobile() {
+		return mobile;
+	}
+
+	public void setMobile(String mobile) {
+		this.mobile = mobile;
+	}
+	
+	
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/ErrorCodeEnum.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/ErrorCodeEnum.java
new file mode 100644
index 0000000..72dc864
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/ErrorCodeEnum.java
@@ -0,0 +1,93 @@
+package cn.pluss.platform.leshua;
+
+/**
+ * @author yuchen
+ * 
+ * @Description 
+ */
+public enum ErrorCodeEnum {
+	
+	SYSTEM_ERR("10001", "系统异常"),
+	PARAM_ERR("10002", "请求参数有误"),
+	VERIFY_SIGNATURE_ERR("10003", "验证签名失败"),
+	NO_PRIVILEGE("10004", "您没有权限进行此项操作"),
+	PROCESS_ERR("10005", "处理失败"),
+	REQUEST_INVALID_JSON("10006", "JSON格式错误"),
+	REQUEST_BAD("10007", "错误的请求"),
+	REQUEST_DUPLICATED("10008", "重复的请求"),
+	DATA_NOT_FOUND("10009", "数据不存在"),
+	SERVICE_DISABLE("10010", "服务未开通"),
+	AMOUNT_LIMIT("10011", "交易金额限制"),
+	AMOUNT_TOO_SMALL("10012", "交易金额太小"),
+	PAY_ERR("10013", "支付失败"),
+	REFUND_ERR("10014", "退款失败"),
+	CONFIG_ERR("10015", "配置错误"),
+	
+	MERCHANT_NOT_EXIST("10101", "商户不存在"),
+	MERCHANT_NOT_ACTIVED("10102", "商户未激活或已冻结"),
+	MERCHANT_KEYS_NOT_EXISTS("10103", "商户密钥未配置"),
+	MERCHANT_NOT_OPEN_WXPAY("10106", "商户未开通微信支付"),
+	MERCHANT_NOT_OPEN_ALIPAY("10107", "商户未开通支付宝支付"),
+	MERCHANT_NOT_OPEN_JDPAY("10108", "商户未开通京东钱包"),
+	MERCHANT_NOT_AUDIT("10109", "商户未审核"),
+	MERCHANT_NOT_OPEN_D0("10110", "商户未开通D0提现" ),
+	MERCHANT_NOT_OPEN_T1("10111", "商户未开通T1提现" ),
+	
+	MERCHANT_TRADE_RATE_ERR("10120", "商户费率不正确,不能交易"),
+	MERCHANT_BALANCE_NOT_ENOUGH("10121", "商户余额不足,不能退款"),
+	
+	AGENT_NOT_EXIST("10201", "代理商不存在"),
+	AGENT_NOT_ACTIVED("10202", "代理商未激活或已冻结"),
+	AGENT_KEYS_NOT_EXISTS("10203", "代理商密钥未配置"),
+	
+	ORDER_NOT_EXISTS("10301", "订单号不存在"),
+	ORDER_IS_EXISTS("10302", "订单号重复"),
+	ORDER_CREATE_ERROR("10303","订单创建失败"),
+	ORDER_NOT_PAY_ERROR("10304","订单未成功支付"),
+	ORDER_NOT_CAL_ERROR("10305","订单未计费"),
+	ORDER_IS_ERROR_FORMAT("10306", "订单号有非法字符"),
+	
+	PAYMENT_ERROR("10401", "代付失败"),
+	WITHDRAW_OFF("10402", "D0提现关闭,请稍后再试"),
+	PUBLIC_ACCOUNT_NOT_D0SETT("10403", "结算帐户为对公帐户,不能进行D0提现"),
+
+	MERCHANT_WITHDRAW_NOT_ALLOW("10404", "商户不允许进行提现"),
+	WITHDRAW_FAIL("10405", "商户提现失败"),
+	WITHDRAW_RECON_FILE_DOWNLOAD_SWITCH_OFF("10407", "提现对帐文件暂时未生成,请稍后再试."),
+	WITHDRAW_TIME_LIMIT("10409", "该时间段不能进行提现."),
+	WITHDRWA_ORDER_NOT_EXISTS("10410", "提现订单号不存在"),
+	WITHDRWA_ORDER_IS_EXISTS("10411", "提现订单号重复"),
+	MERCHANT_DEBIT_BALANCE_NOT_ENOUGH("10420", "商户借记账户余额不足"),
+	MERCHANT_CREDIT_BALANCE_NOT_ENOUGH("10421", "商户贷记账户余额不足"),
+	NET_AMOUNT_TOO_SMALL("10422", "扣除手续费后，实际到账金额小于0"),
+	WITHDRAW_BIZ_ERR("300001", "提现业务失败,需要回滚事务."),
+	
+	TRADE_CARD_UNBOUND("20001", "交易卡未绑定或已解绑"),
+	SETTLE_CARD_UNBOUND("20110", "结算卡未绑定"),
+	SETTLE_CARD_BINDING_NOT_ACTIVED("20111", "结算卡绑定已禁用"),
+	FASTPAY_SMS_CREATE_ERROR("20112","绑卡短信记录创建失败"),
+	FASTPAY_CREATE_ERROR("20113","订单创建失败"),
+	PHONE_INCONSISTENT("20114", "传入手机号码与绑卡手机号码不一致"),
+	WITHDRAW_REPEAT("20115", "正在处理您的提现请求，请稍后."),
+	INFO_MISMATCHING("20116", "信息不匹配"),
+	BANK_ACCOUNT_NO_NAME_MISMATCHING("20117", "银行账号与账户名不匹配"),
+	;
+	
+	private String errCode;
+	private String errMsg;
+	
+	private ErrorCodeEnum(String errCode, String errMsg) {
+		this.errCode = errCode;
+		this.errMsg = errMsg;
+	}
+
+	public String getErrCode() {
+		return errCode;
+	}
+
+	public String getErrMsg() {
+		return errMsg;
+	}
+
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/ExpandDto.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/ExpandDto.java
new file mode 100644
index 0000000..4e4d925
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/ExpandDto.java
@@ -0,0 +1,42 @@
+package cn.pluss.platform.leshua;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ExpandDto {
+    /**
+     * 类型 不传为全部  1未实名  2 已实名  3 已认证商户
+     */
+    private String type;
+    /**
+     * 不传为全部 1直接推荐  2 间接推荐  3 二级间接推荐
+     */
+    private String recommend;
+    /**
+     * 不传为全部  1 v1   2 v2   3 v3
+     */
+    private String level;
+    private String userId;
+    /**
+     * 业务员id
+     */
+    private List<String> agentStaffIds;
+    private String agentStaffId;
+
+    /**
+     * 商户简称
+     */
+    private String alias;
+    private Integer page;
+    private Integer size;
+
+    private String status;
+    private String userName;
+    private String loginName;
+    private String phone;
+    private String startTime;
+    private String endTime;
+    private String merchantName;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/HttpClientHelper.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/HttpClientHelper.java
new file mode 100644
index 0000000..8fa7ce4
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/HttpClientHelper.java
@@ -0,0 +1,549 @@
+package cn.pluss.platform.leshua;
+
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.nio.charset.Charset;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.HttpEntity;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.BasicHttpEntity;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.mime.HttpMultipartMode;
+import org.apache.http.entity.mime.MultipartEntityBuilder;
+import org.apache.http.entity.mime.content.FileBody;
+import org.apache.http.entity.mime.content.StringBody;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.util.EntityUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * @author yuchen
+ *
+ * @Description 
+ */
+public class HttpClientHelper {
+	
+	private static Logger log = LoggerFactory.getLogger(HttpClientHelper.class);
+
+	public static final String ACCEPT_TYPE_JSON = "application/json";
+	public static final String ACCEPT_TYPE_HTML = "text/html";
+	public static final String ACCEPT_TYPE_XML = "application/xml";
+	public static final String ACCEPT_TYPE_X_WWW = "application/x-www-form-urlencoded";
+	public static final int DEFAULT_SO_TIMEOUT = 30000;
+	public static final int DEFAULT_CONN_TIMEOUT = 6000;
+	public static final int DEFAULT_CONN_REQ_TIMEOUT = 5000;
+
+	private static PoolingHttpClientConnectionManager cm;
+
+	private RequestConfig requestConfig;
+	
+	static {
+		cm = new PoolingHttpClientConnectionManager();
+		cm.setMaxTotal(10000);
+		cm.setDefaultMaxPerRoute(500);
+	}
+
+	@PostConstruct
+	public void init() {
+		// 设置默认http状态参数
+		requestConfig = RequestConfig.custom().setSocketTimeout(DEFAULT_SO_TIMEOUT).setConnectTimeout(DEFAULT_CONN_TIMEOUT)
+				.setConnectionRequestTimeout(DEFAULT_CONN_REQ_TIMEOUT).build();
+	}
+	
+	/**
+	 * 关闭HttpClient连接池
+	 */
+	@PreDestroy
+	public void destory() {
+		if (cm != null) {
+			log.info("关闭HttpClient线程池");
+			cm.shutdown();
+		}
+	}
+
+	/**
+	 * get请求默认格式为html，编码为utf-8
+	 * @param url
+	 * @return
+	 * @throws BizRuntimeException 
+	 */
+	public String get(String url) throws BizRuntimeException {
+		return this.get(url, "text/html", null, BizConstants.CHARSET_UTF8);
+	}
+
+	/**
+	 * get请求,指定格式，编码为utf-8
+	 * @param url
+	 * @param acceptType
+	 * @return
+	 * @throws BizRuntimeException 
+	 */
+	public String get(String url, String acceptType) throws BizRuntimeException {
+		return this.get(url, acceptType, null, BizConstants.CHARSET_UTF8);
+	}
+	
+	/**
+	 * get请求,指定格式，编码为utf-8
+	 * @param url
+	 * @param acceptType
+	 * @return
+	 * @throws BizRuntimeException 
+	 */
+	public String get(String url, Map<String, String> params, String acceptType) throws BizRuntimeException {
+		StringBuilder paramSB = new StringBuilder();
+		if(params != null){
+			for (Entry<String, String> entry : params.entrySet()) {
+				paramSB.append("&").append(entry.getKey()).append("=").append(entry.getValue());
+			}
+		}
+		if (paramSB.length() > 0) {
+			url = url + "?" + paramSB.substring(1);
+		}
+		return this.get(url, acceptType);
+	}
+
+	/**
+	 * get请求,指定格式，编码为utf-8，需要授权
+	 * @param url
+	 * @param acceptType
+	 * @return
+	 * @throws BizRuntimeException 
+	 */
+	public String get(String url, String acceptType, String auth) throws BizRuntimeException {
+		return this.get(url, acceptType, auth, BizConstants.CHARSET_UTF8);
+	}
+
+	/**
+	 * get请求,指定格式，指定编码，需要授权
+	 * @param url
+	 * @param acceptType
+	 * @return
+	 * @throws BizRuntimeException 
+	 */
+	public String get(String url, String acceptType, String auth, String charset) throws BizRuntimeException {
+		String result = null;
+		CloseableHttpClient httpClient = null;
+		CloseableHttpResponse response = null;
+		HttpEntity entity = null;
+		try {
+			httpClient = HttpClients.custom().setConnectionManager(cm).setConnectionManagerShared(true).build();
+			HttpGet httpGet = new HttpGet(url);
+			httpGet.setConfig(requestConfig);
+			httpGet.setHeader("Accept", acceptType);
+			httpGet.setHeader("Content-Type", acceptType + ";charset=" + charset);
+			if (auth != null) {
+				httpGet.setHeader("Authorization", auth);
+			}
+			// 执行客户端请求
+			response = httpClient.execute(httpGet);
+			entity = response.getEntity();
+			if (entity != null) {
+				result = EntityUtils.toString(entity, charset);
+			}
+		} catch (Exception e) {
+			throw new BizRuntimeException(null, e);
+		} finally {
+			// 关闭连接
+			if (entity != null) {
+				EntityUtils.consumeQuietly(entity);
+			}
+			if (response != null) {
+				try {
+					response.close();
+				} catch (IOException e) {
+					log.error("关闭HttpResponse出错，错误信息：" + e.getMessage(), e);
+				}
+			}
+			if (httpClient != null) {
+				try {
+					httpClient.close();
+				} catch (IOException e) {
+					log.error("关闭HttpClient出错，错误信息：" + e.getMessage(), e);
+				}
+			}
+		}
+		return result;
+	}
+
+	/**
+	 * post请求，默认utf-8编码，期望接收text/html
+	 * @param url
+	 * @param params
+	 * @param acceptType
+	 * @return
+	 * @throws BizRuntimeException 
+	 */
+	public String post(String url, String params) throws BizRuntimeException {
+		return this.post(url, params, ACCEPT_TYPE_HTML, null, BizConstants.CHARSET_UTF8);
+	}
+	
+	/**
+	 * post请求，默认utf-8编码，指定格式
+	 * @param url
+	 * @param params
+	 * @param acceptType
+	 * @return
+	 * @throws BizRuntimeException 
+	 */
+	public String post(String url, String params, String acceptType) throws BizRuntimeException {
+		return this.post(url, params, acceptType, null, BizConstants.CHARSET_UTF8);
+	}
+
+	/**
+	 * post请求，默认utf-8编码，指定格式
+	 * @param url
+	 * @param params
+	 * @param acceptType
+	 * @return
+	 * @throws BizRuntimeException 
+	 */
+	public String post(String url, String params, String acceptType, int socketTimeOut , int connectTimeOut) throws BizRuntimeException {
+		requestConfig = RequestConfig.custom().setSocketTimeout(socketTimeOut).setConnectTimeout(connectTimeOut)
+				.setConnectionRequestTimeout(DEFAULT_CONN_REQ_TIMEOUT).build();
+		return this.post(url, params, acceptType, null, BizConstants.CHARSET_UTF8);
+	}
+
+	/**
+	 * post请求，默认utf-8编码，指定格式，需要授权
+	 * @param url
+	 * @param params
+	 * @param acceptType
+	 * @param auth
+	 * @return
+	 * @throws BizRuntimeException 
+	 */
+	public String post(String url, String params, String acceptType, String auth) throws BizRuntimeException {
+		return this.post(url, params, acceptType, auth, BizConstants.CHARSET_UTF8);
+	}
+
+	/**
+	 *  post请求，指定编码，指定格式，需要授权
+	 * @param url
+	 * @param params
+	 * @param acceptType
+	 * @param auth
+	 * @param charset
+	 * @return
+	 * @throws BizRuntimeException 
+	 */
+	public String post(String url, String params, String acceptType, String auth, String charset) throws BizRuntimeException {
+		String result = null;
+		CloseableHttpClient httpClient = null;
+		CloseableHttpResponse response = null;
+		HttpEntity entity = null;
+		try {
+			httpClient = HttpClients.custom().setConnectionManager(cm).setConnectionManagerShared(true).build();
+			HttpPost httpPost = new HttpPost(url);
+			httpPost.setConfig(requestConfig);
+			httpPost.setHeader("Accept", acceptType);
+			httpPost.setHeader("Content-Type", acceptType + ";charset=" + charset);
+			if (auth != null) {
+				httpPost.setHeader("Authorization", auth);
+			}
+			BasicHttpEntity requestBody = new BasicHttpEntity();
+			byte[] content = params.getBytes(charset);
+			requestBody.setContent(new ByteArrayInputStream(content));
+			requestBody.setContentLength(content.length);
+			httpPost.setEntity(requestBody);
+			if (StringUtils.startsWithIgnoreCase(url, "https")) {
+				trustAllHosts();
+			}
+			// 执行客户端请求
+			response = httpClient.execute(httpPost);
+			entity = response.getEntity();
+			if (entity != null) {
+				result = EntityUtils.toString(entity, charset);
+			}
+		} catch (Exception e) {
+			throw new BizRuntimeException(null, e);
+		} finally {
+			// 关闭连接
+			if (entity != null) {
+				EntityUtils.consumeQuietly(entity);
+			}
+			if (response != null) {
+				try {
+					response.close();
+				} catch (IOException e) {
+					log.error("关闭HttpResponse出错，错误信息：" + e.getMessage(), e);
+				}
+			}
+			if (httpClient != null) {
+				try {
+					httpClient.close();
+				} catch (IOException e) {
+					log.error("关闭HttpClient出错，错误信息：" + e.getMessage(), e);
+				}
+			}
+		}
+		return result;
+	}
+	
+	/**
+	 * post请求，默认utf-8编码，期望接收text/html
+	 * @param url
+	 * @param params
+	 * @return
+	 * @throws BizRuntimeException 
+	 */
+	public String postForm(String url, Map<String, String> formParams) throws BizRuntimeException {
+		return this.postForm(url, formParams, ACCEPT_TYPE_HTML, null, BizConstants.CHARSET_UTF8);
+	}
+	
+	/**
+	 * post请求，默认utf-8编码，期望接收text/html
+	 * @param url
+	 * @param formParams
+	 * @param socketTimeOut
+	 * @param connectTimeOut
+	 * @return
+	 * @throws BizRuntimeException 
+	 */
+	public String postForm(String url, Map<String, String> formParams, int socketTimeOut , int connectTimeOut) throws BizRuntimeException {
+		requestConfig = RequestConfig.custom().setSocketTimeout(socketTimeOut).setConnectTimeout(connectTimeOut)
+				.setConnectionRequestTimeout(DEFAULT_CONN_REQ_TIMEOUT).build();
+		return this.postForm(url, formParams, ACCEPT_TYPE_HTML, null, BizConstants.CHARSET_UTF8);
+	}
+	
+	/**
+	 * post请求，默认utf-8编码，指定格式
+	 * @param url
+	 * @param params
+	 * @param acceptType
+	 * @return
+	 * @throws BizRuntimeException 
+	 */
+	public String postForm(String url, Map<String, String> formParams, String acceptType) throws BizRuntimeException {
+		return this.postForm(url, formParams, acceptType, null, BizConstants.CHARSET_UTF8);
+	}
+
+	/**
+	 * post请求，默认utf-8编码，指定格式，需要授权
+	 * @param url
+	 * @param params
+	 * @param acceptType
+	 * @param auth
+	 * @return
+	 * @throws BizRuntimeException 
+	 */
+	public String postForm(String url, Map<String, String> formParams, String acceptType, String auth) throws BizRuntimeException {
+		return this.postForm(url, formParams, acceptType, auth, BizConstants.CHARSET_UTF8);
+	}
+	
+	/**
+	 * post请求，指定编码，指定格式，需要授权
+	 * @param url
+	 * @param formParams
+	 * @param acceptType
+	 * @param auth
+	 * @param charset
+	 * @return
+	 * @throws BizRuntimeException 
+	 */
+	public String postForm(String url, Map<String, String> formParams, String acceptType, String auth, String charset) throws BizRuntimeException {
+		List<NameValuePair> urlParameters = new ArrayList<NameValuePair>();
+		if (formParams != null) {
+			for (Entry<String, String> entry : formParams.entrySet()) {
+				urlParameters.add(new BasicNameValuePair(entry.getKey(), entry.getValue()));
+			}
+		}
+		boolean isSucc = false;
+		HttpEntity requestEntity = null;
+		try {
+			requestEntity = new UrlEncodedFormEntity(urlParameters, charset);
+			isSucc = true;
+		} catch (UnsupportedEncodingException e) {
+			log.error(e.getMessage(), e);
+		}
+		return isSucc ? this.postForm(url, requestEntity, acceptType, auth, charset) : null;
+	}
+
+	/**
+	 * Trust every server - dont check for any certificate
+	 */
+	public static void trustAllHosts() {
+		// Create a trust manager that does not validate certificate chains
+		TrustManager[] trustAllCerts = new TrustManager[] { new X509TrustManager() {
+			public java.security.cert.X509Certificate[] getAcceptedIssuers() {
+				return new java.security.cert.X509Certificate[] {};
+			}
+
+			public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+			}
+
+			public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+			}
+		} };
+
+		try {
+			SSLContext sc = SSLContext.getInstance("TLS");
+			sc.init(null, trustAllCerts, new java.security.SecureRandom());
+			HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory());
+		} catch (Exception e) {
+			log.error(e.getMessage(), e);
+		}
+	}
+	
+	/**
+	 * post请求，指定编码，指定格式，需要授权
+	 * @param url
+	 * @param requestEntity
+	 * @param acceptType
+	 * @param auth
+	 * @param charset
+	 * @return
+	 * @throws BizRuntimeException 
+	 */
+	private String postForm(String url, HttpEntity requestEntity, String acceptType, String auth, String charset) throws BizRuntimeException {
+		String result = null;
+		CloseableHttpClient httpClient = null;
+		CloseableHttpResponse response = null;
+		HttpEntity entity = null;
+		try {
+			httpClient = HttpClients.custom().setConnectionManager(cm).setConnectionManagerShared(true).build();
+			HttpPost httpPost = new HttpPost(url);
+			httpPost.setConfig(requestConfig);
+			httpPost.setHeader("Accept", acceptType);
+			httpPost.setHeader("Content-Type","application/x-www-form-urlencoded;charset=" + charset);
+			if (auth != null) {
+				httpPost.setHeader("Authorization", auth);
+			}
+			httpPost.setEntity(requestEntity);
+			if (StringUtils.startsWithIgnoreCase(url, "https")) {
+				trustAllHosts();
+			}
+			// 执行客户端请求
+			response = httpClient.execute(httpPost);
+			entity = response.getEntity();
+			if (entity != null) {
+				result = EntityUtils.toString(entity, charset);
+			}
+		} catch (Exception e) {
+			throw new BizRuntimeException(null, e);
+		} finally {
+			// 关闭连接
+			if (entity != null) {
+				EntityUtils.consumeQuietly(entity);
+			}
+			if (response != null) {
+				try {
+					response.close();
+				} catch (IOException e) {
+					log.error("关闭HttpResponse出错，错误信息：" + e.getMessage(), e);
+				}
+			}
+			if (httpClient != null) {
+				try {
+					httpClient.close();
+				} catch (IOException e) {
+					log.error("关闭HttpClient出错，错误信息：" + e.getMessage(), e);
+				}
+			}
+		}
+		return result;
+	}
+	
+	/**
+	 * 
+	 * @param url
+	 * @param acceptType
+	 * @param paramMap
+	 * @param fileMap
+	 * @param charset
+	 * @return
+	 * @throws BizRuntimeException 
+	 */
+	public String postWithMultipartEntity(String url, String acceptType, Map<String, String> paramMap, Map<String, File> fileMap,
+			String charset) throws BizRuntimeException {
+		String result = null;
+		CloseableHttpClient httpClient = null;
+		CloseableHttpResponse response = null;
+		HttpEntity entity = null;
+		try {
+			httpClient = HttpClients.custom().setConnectionManager(cm).setConnectionManagerShared(true).build();
+			HttpPost httpPost = new HttpPost(url);
+			httpPost.setConfig(requestConfig);
+			httpPost.setHeader("Accept", acceptType);
+
+			MultipartEntityBuilder multipartEntityBuilder = MultipartEntityBuilder.create();
+			multipartEntityBuilder.setMode(HttpMultipartMode.BROWSER_COMPATIBLE);
+			multipartEntityBuilder.setCharset(Charset.forName(charset));
+			// 字符串参数
+			if (paramMap != null) {
+				for (Entry<String, String> entry : paramMap.entrySet()) {
+					StringBody strBody = new StringBody(entry.getValue(), ContentType.APPLICATION_JSON);
+					multipartEntityBuilder = multipartEntityBuilder.addPart(entry.getKey(), strBody);
+				}
+			}
+			// 文件参数
+			if (fileMap != null) {
+				for (Entry<String, File> entry : fileMap.entrySet()) {
+					FileBody fileBody = new FileBody(entry.getValue());
+					multipartEntityBuilder = multipartEntityBuilder.addPart(entry.getKey(), fileBody);
+				}
+			}
+			HttpEntity reqEntity = multipartEntityBuilder.build();
+			httpPost.setEntity(reqEntity);
+
+			if (StringUtils.startsWithIgnoreCase(url, "https")) {
+				trustAllHosts();
+			}
+			// 执行客户端请求
+			response = httpClient.execute(httpPost);
+			entity = response.getEntity();
+			if (entity != null) {
+				result = EntityUtils.toString(entity, charset);
+			}
+		} catch (Exception e) {
+			throw new BizRuntimeException(null, e);
+		} finally {
+			// 关闭连接
+			if (entity != null) {
+				EntityUtils.consumeQuietly(entity);
+			}
+			if (response != null) {
+				try {
+					response.close();
+				} catch (IOException e) {
+					log.error("关闭HttpResponse出错，错误信息：" + e.getMessage(), e);
+				}
+			}
+			if (httpClient != null) {
+				try {
+					httpClient.close();
+				} catch (IOException e) {
+					log.error("关闭HttpClient出错，错误信息：" + e.getMessage(), e);
+				}
+			}
+		}
+		return result;
+	}
+
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/LeShuaPayDTO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/LeShuaPayDTO.java
new file mode 100644
index 0000000..c2f9cef
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/LeShuaPayDTO.java
@@ -0,0 +1,11 @@
+package cn.pluss.platform.leshua;
+
+/**
+ * @author yuchen
+ * 
+ * @Description 
+ */
+public class LeShuaPayDTO {
+
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/LegalPerson.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/LegalPerson.java
new file mode 100644
index 0000000..6c32d0d
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/LegalPerson.java
@@ -0,0 +1,108 @@
+package cn.pluss.platform.leshua;
+
+/**
+ * @author yuchen
+ *
+ * @Description 
+ * 法人信息，个人类型填联系人信息
+ */
+public class LegalPerson {
+
+	/**
+	 * 有
+	 * 法人姓名
+	 */
+	private String legalName;
+	
+	private Integer credentialType; 
+	
+	/**
+	 * 有
+	 * 证件号码
+	 */
+	private String idCardNo;
+	
+	/**
+	 * 有
+	 * 法人身份证正面
+	 */
+	private String idcardFrontPic;
+	
+	/**
+	 * 有
+	 * 法人身份证反面
+	 */
+	private String idcardBackPic;
+	
+	/**
+	 * 有
+	 * 证件有效期开始日期
+	 */
+	private String idCardStart;
+	
+	/**
+	 * 有
+	 * 证件有效期结束格式： 2015-09-22，永久有效:2099-12-30
+	 */
+	private String idCardEnd;
+
+	public String getLegalName() {
+		return legalName;
+	}
+
+	public void setLegalName(String legalName) {
+		this.legalName = legalName;
+	}
+
+	public String getIdCardNo() {
+		return idCardNo;
+	}
+
+	public void setIdCardNo(String idCardNo) {
+		this.idCardNo = idCardNo;
+	}
+
+	public String getIdcardFrontPic() {
+		return idcardFrontPic;
+	}
+
+	public void setIdcardFrontPic(String idcardFrontPic) {
+		this.idcardFrontPic = idcardFrontPic;
+	}
+
+	public String getIdcardBackPic() {
+		return idcardBackPic;
+	}
+
+	public void setIdcardBackPic(String idcardBackPic) {
+		this.idcardBackPic = idcardBackPic;
+	}
+
+	public String getIdCardStart() {
+		return idCardStart;
+	}
+
+	public void setIdCardStart(String idCardStart) {
+		this.idCardStart = idCardStart;
+	}
+
+	public String getIdCardEnd() {
+		return idCardEnd;
+	}
+
+	public void setIdCardEnd(String idCardEnd) {
+		this.idCardEnd = idCardEnd;
+	}
+
+	public Integer getCredentialType() {
+		return credentialType;
+	}
+
+	public void setCredentialType(Integer credentialType) {
+		this.credentialType = credentialType;
+	}
+	
+	
+	
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/LeshuaArea.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/LeshuaArea.java
new file mode 100644
index 0000000..62d0aa3
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/LeshuaArea.java
@@ -0,0 +1,33 @@
+package cn.pluss.platform.leshua;
+
+/**
+ * @author yuchen
+ *
+ * @Description 
+ */
+public class LeshuaArea {
+	
+	private String code;
+	
+	private String name;
+
+	public String getCode() {
+		return code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+	
+	
+
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/LeshuaBaseReq.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/LeshuaBaseReq.java
new file mode 100644
index 0000000..b979062
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/LeshuaBaseReq.java
@@ -0,0 +1,74 @@
+package cn.pluss.platform.leshua;
+
+/**
+ * @author yuchen
+ * 
+ * @Description 
+ */
+public class LeshuaBaseReq {
+	
+	/** 接口名 **/
+	public String service;
+	
+	/** 乐刷分配的商户号 **/
+	public String merchant_id;
+	
+	/** 商户订单号 **/
+	public String third_order_id;
+	
+	/** 随机字符串 **/
+	public String nonce_str;
+	
+	/** MD5签名 **/
+	public String sign;
+	
+	public String getService() {
+		return service;
+	}
+
+	public void setService(String service) {
+		this.service = service;
+	}
+
+	public String getMerchant_id() {
+		return merchant_id;
+	}
+
+	public void setMerchant_id(String merchant_id) {
+		this.merchant_id = merchant_id;
+	}
+
+	public String getThird_order_id() {
+		return third_order_id;
+	}
+
+	public void setThird_order_id(String third_order_id) {
+		this.third_order_id = third_order_id;
+	}
+
+	public String getNonce_str() {
+		return nonce_str;
+	}
+
+	public void setNonce_str(String nonce_str) {
+		this.nonce_str = nonce_str;
+	}
+
+	public String getSign() {
+		return sign;
+	}
+
+	public void setSign(String sign) {
+		this.sign = sign;
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder builder = new StringBuilder();
+		builder.append("BasePayReq [service=").append(service).append(", merchant_id=").append(merchant_id).append(", third_order_id=")
+				.append(third_order_id).append(", nonce_str=").append(nonce_str).append(", sign=").append(sign).append("]");
+		return builder.toString();
+	}
+
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/LeshuaBaseRes.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/LeshuaBaseRes.java
new file mode 100644
index 0000000..b126134
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/LeshuaBaseRes.java
@@ -0,0 +1,98 @@
+package cn.pluss.platform.leshua;
+
+/**
+ * @author yuchen
+ * 
+ * @Description 
+ * 乐刷返回
+ */
+public class LeshuaBaseRes {
+	
+	/** 响应状态码，0代表成功，非0代表成功 **/
+	protected String resp_code;
+	
+	/** 错误信息，resp_code非0时返回 **/
+	protected String resp_msg;
+	
+	/** 业务结果，0成功，非0失败 **/
+	public String result_code;
+
+	/** 错误码 **/
+	public String error_code;
+
+	/** 错误描述 **/
+	public String error_msg;
+
+	/** 随机字符串 **/
+	public String nonce_str;
+
+	/** MD5签名 **/
+	public String sign;
+
+	public String getResp_code() {
+		return resp_code;
+	}
+
+	public void setResp_code(String resp_code) {
+		this.resp_code = resp_code;
+	}
+
+	public String getResp_msg() {
+		return resp_msg;
+	}
+
+	public void setResp_msg(String resp_msg) {
+		this.resp_msg = resp_msg;
+	}
+
+	public String getResult_code() {
+		return result_code;
+	}
+
+	public void setResult_code(String result_code) {
+		this.result_code = result_code;
+	}
+
+	public String getError_code() {
+		return error_code;
+	}
+
+	public void setError_code(String error_code) {
+		this.error_code = error_code;
+	}
+
+	public String getError_msg() {
+		return error_msg;
+	}
+
+	public void setError_msg(String error_msg) {
+		this.error_msg = error_msg;
+	}
+
+	public String getNonce_str() {
+		return nonce_str;
+	}
+
+	public void setNonce_str(String nonce_str) {
+		this.nonce_str = nonce_str;
+	}
+
+	public String getSign() {
+		return sign;
+	}
+
+	public void setSign(String sign) {
+		this.sign = sign;
+	}
+
+	@Override
+	public String toString() {
+		return "LeshuaBaseRes [resp_code=" + resp_code + ", resp_msg=" + resp_msg + ", result_code=" + result_code
+				+ ", error_code=" + error_code + ", error_msg=" + error_msg + ", nonce_str=" + nonce_str + ", sign="
+				+ sign + "]";
+	}
+	
+	
+
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/LeshuaCity.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/LeshuaCity.java
new file mode 100644
index 0000000..2278480
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/LeshuaCity.java
@@ -0,0 +1,45 @@
+package cn.pluss.platform.leshua;
+
+import java.util.List;
+
+/**
+ * @author yuchen
+ * 
+ * @Description 
+ */
+public class LeshuaCity {
+	
+	private String code;
+	
+	private String name;
+	
+	private List<LeshuaArea> areaList;
+
+	public String getCode() {
+		return code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public List<LeshuaArea> getAreaList() {
+		return areaList;
+	}
+
+	public void setAreaList(List<LeshuaArea> areaList) {
+		this.areaList = areaList;
+	}
+	
+	
+
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/LeshuaMerchantAuditDTO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/LeshuaMerchantAuditDTO.java
new file mode 100644
index 0000000..a4c21fa
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/LeshuaMerchantAuditDTO.java
@@ -0,0 +1,263 @@
+package cn.pluss.platform.leshua;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.util.StringUtil;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+ * @author yuchen
+ *
+ * @Description
+ */
+@Data
+@Accessors(chain = true)
+public class LeshuaMerchantAuditDTO {
+
+    @ApiModelProperty(value = "当前用户userId")
+    private String userId;
+
+//	@ApiModelProperty(value="所属商户经营类目编码")
+//	private String mccCode;
+//	
+//	@ApiModelProperty(value="所属商户经营类目名称")
+//	private String mccName;
+//	
+//	@ApiModelProperty(value="商户简称")
+//	private String merchantName;
+//	
+//	@ApiModelProperty(value="联系人号码")
+//	private String contactPhone;
+//	
+//	@ApiModelProperty(value="联系人名称")
+//	private String contactName;
+//	
+//	@ApiModelProperty(value="乐刷商户地址")
+//	private String leshuaMerchantAddress;
+//	
+//	@ApiModelProperty(value="商户具体地址")
+//	private String merchantDetailAddress;
+//	
+//	@ApiModelProperty(value="营业执照号")
+//	private String bussAuthNum;
+//	
+//	@ApiModelProperty(value="营业执照有效期")
+//	private String bussAuthPeriod;
+//	
+//	@ApiModelProperty(value="营业执照名称")
+//	private String leshuaLicenseName;
+//	
+//	@ApiModelProperty(value="营业执照开始时间")
+//	private String licenseStart;
+//	
+//	@ApiModelProperty(value="银行卡照片")
+//	private String bankPhoto;
+//	
+//	@ApiModelProperty(value="银行名称")
+//	private String bankName;
+//	
+//	@ApiModelProperty(value="银行卡号")
+//	private String bankNo;
+//	
+//	@ApiModelProperty(value="开户地区")
+//	private String bankAddress;
+//	
+//	@ApiModelProperty(value="开户支行")
+//	private String bankBranch;
+//	
+//	@ApiModelProperty(value="联行号")
+//	private String unionpay;
+//	
+//	@ApiModelProperty(value="营业执照图片")
+//	private String  businessLicensePic;
+//	
+//	@ApiModelProperty(value="店铺门头照图片")
+//	private String shopSignBoardPic;
+//	
+//	@ApiModelProperty(value="店内环境照片")
+//	private String indoorPic;
+//	
+//	@ApiModelProperty(value="收银台照片")
+//	private String cashierDeskPic;
+
+
+    public MerchantRegisterDTO convert(IdCard idCard, BankCard bankCard, MerchantBaseInfo merchantBaseInfo, List<MerchantImage> list) {
+        MerchantRegisterDTO merchantRegisterDTO = new MerchantRegisterDTO();
+        //商户基本信息
+        BaseInfo baseInfo = new BaseInfo();
+        baseInfo.setMerchantType(Integer.valueOf(merchantBaseInfo.getMerchantType()));
+        baseInfo.setMccCode(merchantBaseInfo.getMcc());
+        baseInfo.setMerchantName(merchantBaseInfo.getMerchantName());
+        baseInfo.setMerchantShortName(merchantBaseInfo.getAlias());
+        //法人信息，个人类型填联系人信息
+        LegalPerson legalPerson = new LegalPerson();
+        legalPerson.setCredentialType(1);
+        legalPerson.setIdCardEnd(idCard.getCertEndTime());
+        legalPerson.setIdCardNo(idCard.getCertNo());
+        legalPerson.setIdCardStart(idCard.getCertStartTime());
+        legalPerson.setLegalName(idCard.getCertName());
+        //联系人信息
+        ContactInfo contactInfo = new ContactInfo();
+        contactInfo.setMobile(merchantBaseInfo.getContactMobile().replaceAll(" ", ""));
+        contactInfo.setName(merchantBaseInfo.getContactName());
+        //店铺地址信息
+        AddressInfo addressInfo = new AddressInfo();
+        addressInfo.setAddress(merchantBaseInfo.getAddress());
+        //默认用英文逗号隔开
+//		String[] split = merchantBaseInfo.getLeshuaMerchantAddress().split("-");
+//		addressInfo.setArea(split[2]);
+//		addressInfo.setCity(split[1]);
+//		addressInfo.setProvince(split[0]);
+        String addressNo = merchantBaseInfo.getAddressNo();
+        if (StringUtil.isNotEmpty(addressNo)) {
+            String[] split = addressNo.split("-");
+            addressInfo.setProvinceCode(split[0]);
+            if (split[0].equals(split[1])) {
+                addressInfo.setCityCode(split[1].substring(0, 2) + "0100");
+            } else {
+                addressInfo.setCityCode(split[1]);
+            }
+            addressInfo.setAreaCode(split[2]);
+        }
+        //营业资质信息
+        LicenseInfo licenseInfo = new LicenseInfo();
+        if (StringUtil.isNotEmpty(merchantBaseInfo.getMerchantType())) {
+            if ("1".equals(merchantBaseInfo.getMerchantType())) {
+                licenseInfo.setLicenseFullName(merchantBaseInfo.getMerchantName());
+            } else {
+                licenseInfo.setLicenseFullName(merchantBaseInfo.getBussAuthName());
+            }
+        }
+        if (StringUtil.isNotEmpty(merchantBaseInfo.getBussAuthNum())) {
+            licenseInfo.setLicense(merchantBaseInfo.getBussAuthNum());
+        }
+        licenseInfo.setLicenseAddress(merchantBaseInfo.getBussAuthAddress());
+        licenseInfo.setLicenseStart(merchantBaseInfo.getBussAuthStartTime());
+        licenseInfo.setLicenseEnd(merchantBaseInfo.getBussAuthEndTime());
+        //licenseInfo.setLicense(queryUserApp.getBussAuthNum());
+        //	licenseInfo.setLicenseAddress(queryUserApp.getMerchantDetailAddress());
+        //营业执照结束时间
+        //licenseInfo.setLicenseEnd(queryUserApp.getBussAuthPeriod());
+        //licenseInfo.setLicenseStart(queryUserApp.getLicenseStart());
+        //licenseInfo.setLicensePic(businessLicensePic);
+        //结算信息
+        AccountInfo accountInfo = new AccountInfo();
+        if (StringUtil.isEmpty(bankCard.getAccountType())) {
+            accountInfo.setType("1");
+        } else {
+            accountInfo.setType(bankCard.getAccountType());
+        }
+        accountInfo.setLegalFlag("1");
+        accountInfo.setBankCardNo(bankCard.getBankCardNo());
+//		accountInfo.setBranch(merchantBankCard.getBranchName());
+        accountInfo.setHolder(bankCard.getBankHolder());
+        accountInfo.setUnionpay(bankCard.getContactLine());
+        accountInfo.setIdCardNo(idCard.getCertNo());
+        //accountInfo.setUnionpay(unionpay);
+        //门店信息
+        ShopInfo shopInfo = new ShopInfo();
+        merchantRegisterDTO.setAccountInfo(accountInfo);
+        merchantRegisterDTO.setAddressInfo(addressInfo);
+        merchantRegisterDTO.setBaseInfo(baseInfo);
+        merchantRegisterDTO.setContactInfo(contactInfo);
+        merchantRegisterDTO.setLegalPerson(legalPerson);
+        if (!"1".equals(merchantBaseInfo.getMerchantType())) {
+            // 小微商户不能传营业执照信息
+            merchantRegisterDTO.setLicenseInfo(licenseInfo);
+        }
+        merchantRegisterDTO.setShopInfo(shopInfo);
+//		 if(StringUtil.isEmpty(businessLicensePic)) {
+//			 return ResultGenerator.genFailResult("请上传营业执照");
+//		 }
+        for (MerchantImage merchantImage : list) {
+            if ("01".equals(merchantImage.getPhotoType())) {//身份证正面
+                legalPerson.setIdcardFrontPic(merchantImage.getPicUrl());
+            }
+            if ("02".equals(merchantImage.getPhotoType())) {//身份证反面
+                legalPerson.setIdcardBackPic(merchantImage.getPicUrl());
+            }
+            if ("03".equals(merchantImage.getPhotoType())) {//营业执照
+				if (!"1".equals(merchantBaseInfo.getMerchantType())) {
+					licenseInfo.setLicensePic(merchantImage.getPicUrl());
+				}
+			}
+            if ("06".equals(merchantImage.getPhotoType())) {//门头照
+                shopInfo.setDoorPic(merchantImage.getPicUrl());
+            }
+            if ("08".equals(merchantImage.getPhotoType())) {//收银台照片
+                shopInfo.setCashierDeskPic(merchantImage.getPicUrl());
+            }
+            if ("09".equals(merchantImage.getPhotoType())) {//门店内景照片
+                shopInfo.setInsidePic(merchantImage.getPicUrl());
+            }
+            if ("98".equals(merchantImage.getPhotoType())) {//银行卡正面
+                accountInfo.setBankCardFrontPic(merchantImage.getPicUrl());
+            }
+        }
+        if (StringUtil.isEmpty(accountInfo.getBankCardFrontPic())) {
+            throw new MsgException("请上传银行卡照片");
+        }
+        if (StringUtil.isEmpty(shopInfo.getCashierDeskPic())) {
+            throw new MsgException("请上传收银台照片");
+        }
+        if (StringUtil.isEmpty(shopInfo.getDoorPic())) {
+            throw new MsgException("请上传店铺门头照图片");
+        }
+        if (StringUtil.isEmpty(shopInfo.getInsidePic())) {
+            throw new MsgException("请上传店内环境照片");
+        }
+
+         if(StringUtil.isEmpty(licenseInfo.getLicensePic()) && !"1".equals(merchantBaseInfo.getMerchantType())) {
+        	 throw new  MsgException("请上传营业执照");
+         }
+
+        if (StringUtil.isEmpty(baseInfo.getMccCode())) {
+            throw new MsgException("请选择商户行业类别");
+        }
+        if (StringUtil.isEmpty(baseInfo.getMerchantName())) {
+            throw new MsgException("请传入商户名称");
+        }
+        if (StringUtil.isEmpty(legalPerson.getIdcardBackPic()) || StringUtil.isEmpty(legalPerson.getIdCardEnd()) || StringUtil.isEmpty(legalPerson.getIdcardFrontPic())
+                || StringUtil.isEmpty(legalPerson.getIdCardNo()) || StringUtil.isEmpty(legalPerson.getIdCardStart())) {
+            throw new MsgException("请先进行身份认证");
+        }
+        if (StringUtil.isEmpty(legalPerson.getLegalName())) {
+            throw new MsgException("请传入法人姓名");
+        }
+        if (StringUtil.isEmpty(contactInfo.getMobile())) {
+            throw new MsgException("请传入手机号码");
+        }
+        if (StringUtil.isEmpty(contactInfo.getName())) {
+            throw new MsgException("请传入联系人姓名");
+        }
+        if (StringUtil.isEmpty(addressInfo.getAddress())) {
+            throw new MsgException("请输入店铺详细地址");
+        }
+
+        if (StringUtil.isEmpty(licenseInfo.getLicenseFullName())) {
+            throw new MsgException("请输入营业执照名称，执照如无名称，可填“个体户XXX”（执照上姓名）；小微商户填“商户_XXX”（身份证姓名）");
+        }
+
+        if (StringUtil.isEmpty(accountInfo.getBankCardFrontPic())) {
+            throw new MsgException("请输入银行卡正面");
+        }
+        if (StringUtil.isEmpty(accountInfo.getBankCardNo())) {
+            throw new MsgException("请输入银行卡号");
+        }
+
+        if (StringUtil.isEmpty(accountInfo.getHolder())) {
+            throw new MsgException("请输入开户名；法人结算：与法人姓名姓名一致；企业账户：与营业执照注册名称一致");
+        }
+        if (StringUtil.isEmpty(accountInfo.getIdCardNo())) {
+            throw new MsgException("请输入结算人身份证号码");
+        }
+
+        return merchantRegisterDTO;
+    }
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/LeshuaParam.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/LeshuaParam.java
new file mode 100644
index 0000000..dffe935
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/LeshuaParam.java
@@ -0,0 +1,77 @@
+package cn.pluss.platform.leshua;
+
+/**
+ * @author yuchen
+ * 
+ * @Description 
+ * 乐刷公用参数
+ */
+public class LeshuaParam {
+	
+	/**
+	 * 交易域名
+	 */
+	private static String PAYURL="https://paygate.leshuazf.com/cgi-bin/lepos_pay_gateway.cgi";
+	
+	/**
+	 * 进件域名
+	 */
+	private static String REGISTERURL="https://saas-mch.leshuazf.com/apiv2";
+	
+	/**
+	 * 打款查询接口域名
+	 */
+	private static String PAYQUERYURL="https://saas-combine.leshuazf.com/open-api";
+	
+	/**
+	 * 测试进件域名
+	 */
+	private static String TESTREGISTERURL="http://t-saas-mch.lepass.cn/api";
+	
+	/**
+	 * 测试交易域名
+	 */
+	private static String TESTPAYURL="https://t-paygate.lepass.cn/cgi-bin/lepos_pay_gateway.cgi";
+
+	public static String getPAYURL() {
+		return PAYURL;
+	}
+
+	public static void setPAYURL(String pAYURL) {
+		PAYURL = pAYURL;
+	}
+
+	public static String getREGISTERURL() {
+		return REGISTERURL;
+	}
+
+	public static void setREGISTERURL(String rEGISTERURL) {
+		REGISTERURL = rEGISTERURL;
+	}
+
+	public static String getPAYQUERYURL() {
+		return PAYQUERYURL;
+	}
+
+	public static void setPAYQUERYURL(String pAYQUERYURL) {
+		PAYQUERYURL = pAYQUERYURL;
+	}
+
+	public static String getTESTREGISTERURL() {
+		return TESTREGISTERURL;
+	}
+
+	public static void setTESTREGISTERURL(String tESTREGISTERURL) {
+		TESTREGISTERURL = tESTREGISTERURL;
+	}
+
+	public static String getTESTPAYURL() {
+		return TESTPAYURL;
+	}
+
+	public static void setTESTPAYURL(String tESTPAYURL) {
+		TESTPAYURL = tESTPAYURL;
+	}
+	
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/LeshuaProvince.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/LeshuaProvince.java
new file mode 100644
index 0000000..4c489b5
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/LeshuaProvince.java
@@ -0,0 +1,45 @@
+package cn.pluss.platform.leshua;
+
+import java.util.List;
+
+/**
+ * @author yuchen
+ * 
+ * @Description 
+ */
+public class LeshuaProvince {
+	
+	private String code;
+	
+	private String name;
+	
+	private List<LeshuaCity> citylist;
+
+	public String getCode() {
+		return code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public List<LeshuaCity> getCitylist() {
+		return citylist;
+	}
+
+	public void setCitylist(List<LeshuaCity> citylist) {
+		this.citylist = citylist;
+	}
+
+	
+	
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/LeshuaSignature.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/LeshuaSignature.java
new file mode 100644
index 0000000..0fedc12
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/LeshuaSignature.java
@@ -0,0 +1,225 @@
+package cn.pluss.platform.leshua;
+
+
+import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.dom4j.DocumentException;
+import org.dom4j.DocumentHelper;
+import org.dom4j.Element;
+import org.xml.sax.SAXException;
+
+import javax.xml.parsers.ParserConfigurationException;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.*;
+
+/**
+ * @author yuchen
+ * 
+ * @Description 
+ */
+@Slf4j
+public class LeshuaSignature {
+
+    private static final String SECRET_KEY = "key";
+	
+	/**
+	 * 计算签名
+	 * @param paramMap
+	 * @param exludedSignParams 计算签名排除的参数
+	 * @param key
+	 * @return
+	 */
+    public static String getMD5Sign(Map<String,String> paramMap, Set<String> exludedSignParams, String key){
+		if (paramMap == null || paramMap.isEmpty()) {
+			log.warn("待签名参数map为空!");
+			return null;
+		}
+		String str2Sign = buildParam4Sign(paramMap, exludedSignParams, key);
+		String result = DigestUtils.md5Hex(str2Sign).toUpperCase();
+		log.info("MD5签名原始串：{}，签名结果：{}", new Object[] { str2Sign, result });
+		return result;
+    }
+    
+    /**
+	 * 计算签名(做encode处理)
+	 * @param paramMap
+	 * @param exludedSignParams 计算签名排除的参数
+	 * @param key
+	 * @return
+     * @throws UnsupportedEncodingException 
+	 */
+    public static String getRequestMD5Sign(Map<String,String> paramMap, Set<String> exludedSignParams, String key) throws UnsupportedEncodingException{
+		if (paramMap == null || paramMap.isEmpty()) {
+			log.warn("待签名参数map为空!");
+			return null;
+		}
+		String str2Sign = buildRequestParam4Sign(paramMap, exludedSignParams, key);
+		String result = DigestUtils.md5Hex(str2Sign).toUpperCase();
+		log.info("MD5签名原始串：{}，签名结果：{}", new Object[] { str2Sign, result });
+		return result;
+    }
+
+    /**
+     * 从API返回的XML数据里面重新计算一次签名
+     * @param responseString
+     * @param exludedSignParams
+     * @param key
+     * @return
+     * @throws DocumentException
+     */
+    public static String getSignFromResponseString(String responseString, Set<String> exludedSignParams, String key) throws DocumentException {
+        Map<String,String> map = getMapFromXML(responseString);
+        //将API返回的数据根据用签名算法进行计算新的签名，用来跟API返回的签名进行比较
+        return LeshuaSignature.getMD5Sign(map, exludedSignParams, key);
+    }
+    /**
+     * 检查api返回数据的签名
+     * @param responseString
+     * @param exludedSignParams
+     * @param key
+     * @return
+     * @throws DocumentException 
+     * @throws UnsupportedEncodingException 
+     */
+	public static boolean checkIsSignValidFromResponseString(String responseString, Set<String> exludedSignParams, String key)
+			throws DocumentException, UnsupportedEncodingException {
+		Map<String, String> map = getMapFromXML(responseString);
+		String signFromAPIResponse = map.get("sign");
+		if (StringUtils.isEmpty(signFromAPIResponse)) {
+			log.error("API返回的数据签名数据不存在，有可能被第三方篡改!!!");
+			return false;
+		}
+		log.info("服务器回包里面的签名是：{}", signFromAPIResponse);
+		// 将API返回的数据根据用签名算法进行计算新的签名，用来跟API返回的签名进行比较
+		String signForAPIResponse = LeshuaSignature.getMD5Sign(map, exludedSignParams, key);
+
+		if (!signForAPIResponse.equalsIgnoreCase(signFromAPIResponse)) {
+			// 签名验不过，表示这个API返回的数据有可能已经被篡改了
+			log.error("API返回的数据签名验证不通过，有可能被第三方篡改!!!");
+			return false;
+		}
+		log.info("恭喜，API返回的数据签名验证通过!");
+		return true;
+	}
+	
+	private static String buildRequestParam4Sign(Map<String, String> paramMap, Set<String> exludedSignParams, String md5Key) throws UnsupportedEncodingException {
+		Set<String> keySet = paramMap.keySet();
+		StringBuilder param = new StringBuilder(20 * keySet.size());
+		String[] keys = keySet.toArray(new String[keySet.size()]);
+		Arrays.sort(keys);
+		for (String key : keys) {
+			if (exludedSignParams != null && exludedSignParams.contains(key)) {
+				continue;
+			}
+			Object value = paramMap.get(key);
+			// 排除值为null的情况
+			if (value != null) {
+				param.append(URLEncoder.encode(key,"UTF-8")).append("=").append(URLEncoder.encode(String.valueOf(value),"UTF-8")).append("&");
+			}
+		}
+		param.append(URLEncoder.encode(SECRET_KEY,"UTF-8")).append("=").append(URLEncoder.encode(md5Key,"UTF-8"));
+		return param.toString();
+	}
+    
+    /**
+     * 拼接用于签名的参数
+     * @param paramMap
+     * @param exludedSignParams
+     * @param md5Key
+     * @return
+     */
+	private static String buildParam4Sign(Map<String, String> paramMap, Set<String> exludedSignParams, String md5Key) {
+		Set<String> keySet = paramMap.keySet();
+		StringBuilder param = new StringBuilder(20 * keySet.size());
+		String[] keys = keySet.toArray(new String[keySet.size()]);
+		Arrays.sort(keys);
+		for (String key : keys) {
+			if (exludedSignParams != null && exludedSignParams.contains(key)) {
+				continue;
+			}
+			Object value = paramMap.get(key);
+			// 排除值为null的情况
+			if (value != null) {
+				param.append(key).append("=").append(value).append("&");
+			}
+		}
+		param.append(SECRET_KEY).append("=").append(md5Key);
+		return param.toString();
+	}
+	
+	/**
+	 * 将XML字符串转换成map
+	 * @param xmlString
+	 * @return
+	 * @throws DocumentException 
+	 * @throws ParserConfigurationException
+	 * @throws IOException
+	 * @throws SAXException
+	 */
+	public static Map<String, String> getMapFromXML(String xmlString) throws DocumentException  {
+		// 这里用dom的方式解析回包的最主要目的是防止API新增回包字段
+		org.dom4j.Document document = DocumentHelper.parseText(xmlString);
+		org.dom4j.Element root = document.getRootElement();
+		List<?> eleList = root.elements();
+		if (eleList != null) {
+			Map<String, String> map = new HashMap<String, String>(eleList.size());
+			for (Object obj : eleList) {
+				if (!(obj instanceof Element)) {
+					log.warn("节点[{}]不是Element，忽略！", obj);
+					continue;
+				}
+				Element ele = (Element) obj;
+				map.put(ele.getName(), ele.getText());
+			}
+			return map;
+		}
+		return Collections.emptyMap();
+		
+	}
+	
+	
+	/**
+	 * 计算base64签名，用于商户进件等
+	 * @param agentKey
+	 * @param data
+	 * @return
+	 * @throws UnsupportedEncodingException
+	 */
+	public static String getBase64Sign(String agentKey, JSONObject data) throws UnsupportedEncodingException {
+		StringBuilder sb = new StringBuilder();
+		sb.append("lepos").append(agentKey).append(data);
+		return Base64.encodeBase64String(DigestUtils.md5Hex(sb.toString()).getBytes("utf-8"));
+	}
+
+	/**
+	 *
+	 * 响应结果不参与计算签名的参数
+	 * @return
+	 */
+	public static Set<String> resExcludedSignParams() {
+		Set<String> exludedSignParams = new HashSet<String>(2);
+		exludedSignParams.add("sign");
+		exludedSignParams.add("resp_code");
+		return exludedSignParams;
+	}
+
+
+	/**
+	 *
+	 * 响应结果不参与计算签名的参数
+	 * @return
+	 */
+	public static Set<String> notifyExcludedSignParams() {
+		Set<String> exludedSignParams = new HashSet<String>(2);
+		exludedSignParams.add("sign");
+		exludedSignParams.add("error_code");
+		return exludedSignParams;
+	}
+
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/LeshuaUtils.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/LeshuaUtils.java
new file mode 100644
index 0000000..cdb0ddc
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/LeshuaUtils.java
@@ -0,0 +1,162 @@
+package cn.pluss.platform.leshua;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.thoughtworks.xstream.XStream;
+
+/**
+ * @author yuchen
+ *
+ * @Description 
+ */
+public class LeshuaUtils {
+	
+	 //打log用
+    private static Logger logger = LoggerFactory.getLogger(LeshuaUtils.class);
+    
+	public static byte[] readInput(InputStream in) throws IOException {
+		ByteArrayOutputStream out = new ByteArrayOutputStream();
+		int len = 0;
+		byte[] buffer = new byte[1024];
+		try {
+			while ((len = in.read(buffer)) > 0) {
+				out.write(buffer, 0, len);
+			}
+		} finally {
+			out.close();
+			in.close();
+		}
+		return out.toByteArray();
+	}
+
+    public static String inputStreamToString(InputStream is) throws IOException {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        int i;
+        while ((i = is.read()) != -1) {
+            baos.write(i);
+        }
+        return baos.toString("UTF-8");
+    }
+
+
+    public static InputStream getStringStream(String sInputString) throws UnsupportedEncodingException {
+        ByteArrayInputStream tInputStringStream = null;
+        if (sInputString != null && !sInputString.trim().equals("")) {
+            tInputStringStream = new ByteArrayInputStream(sInputString.getBytes("UTF-8"));
+        }
+        return tInputStringStream;
+    }
+
+    public static Object getObjectFromXML(String xml, Class<?> tClass) {
+       return getObjectFromXML(xml, tClass, "xml");
+    }
+    
+    public static Object getObjectFromXML(String xml, Class<?> tClass, String alias) {
+        //将从API返回的XML数据映射到Java对象
+        XStream xStreamForResponseData = new XStream();
+        XStream.setupDefaultSecurity(xStreamForResponseData);  
+        xStreamForResponseData.alias(alias, tClass);
+        xStreamForResponseData.allowTypes(new Class[]{tClass});
+        xStreamForResponseData.ignoreUnknownElements();//暂时忽略掉一些新增的字段
+        return xStreamForResponseData.fromXML(xml);
+    }
+    
+    /**
+     * 将对象转换成map，key为属性名，value为属性值，值为null的属性排除
+     * @param obj
+     * @return
+     * @throws SecurityException 
+     * @throws NoSuchMethodException 
+     * @throws InvocationTargetException 
+     */
+	public static Map<String, String> toMap(Object obj) throws InvocationTargetException, NoSuchMethodException, SecurityException {
+		Map<String, String> map = new HashMap<String,String>();
+
+		Field[] fields = obj.getClass().getDeclaredFields(); //获取当前类的所有属性值（不包括继承的属性）
+		for (Field field : fields) {
+			try {
+				Object val = queryFieldValue(obj,field);
+				if (val != null) {
+					map.put(field.getName(), String.valueOf(val));
+				}
+			} catch (IllegalArgumentException e) {
+				logger.error(e.getMessage(), e);
+			} catch (IllegalAccessException e) {
+				logger.error(e.getMessage(), e);
+			}
+		}
+		Field[] parentFields = obj.getClass().getFields();//获取类的所有public属性（包括继承的属性，这里的用处就是获取到所有父类的属性值）
+		for (Field field : parentFields) {
+			try {
+				Object val = field.get(obj);
+				if (val != null) {
+					map.put(field.getName(), String.valueOf(val));
+				}
+			} catch (IllegalArgumentException e) {
+				logger.error(e.getMessage(), e);
+			} catch (IllegalAccessException e) {
+				logger.error(e.getMessage(), e);
+			}
+		}
+		return map;
+	}
+	
+	/**
+	 * 获取属性值
+	 * @param object
+	 * @param field
+	 * @return
+	 * @throws IllegalAccessException
+	 * @throws IllegalArgumentException
+	 * @throws InvocationTargetException
+	 * @throws NoSuchMethodException
+	 * @throws SecurityException
+	 */
+	public static Object queryFieldValue(Object object,Field field) throws IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException{
+		String xString="get" + field.getName().substring(0, 1).toUpperCase()+ field.getName().substring(1);
+		System.out.println(xString);
+		 xString="get" + field.getName().substring(0, 1).toUpperCase()+ field.getName().substring(2);
+		 System.out.println(xString);
+		 xString="get" + field.getName().substring(0, 2).toUpperCase()+ field.getName().substring(1);
+		System.out.println(xString);
+		xString="get" + field.getName().substring(1, 2).toUpperCase()+ field.getName().substring(1);
+		System.out.println(xString);
+		xString="get" + field.getName().substring(1, 2).toUpperCase()+ field.getName().substring(1);
+		System.out.println(xString);
+		Method method = object.getClass().getMethod(
+				"get" + field.getName().substring(0, 1).toUpperCase()
+						+ field.getName().substring(1));
+		if (method != null) {
+			Object value = method.invoke(object);
+			return value;
+		} 			
+		return null;
+	}
+	
+	/**
+	 * 计算失效时间
+	 * @param now
+	 * @param expireInMinutes
+	 * @param dateFormat
+	 * @return
+	 */
+	public static String calcExpireTime(Date now, String expireInMinutes, SimpleDateFormat dateFormat) {
+		return dateFormat.format(now.getTime() + Long.parseLong(expireInMinutes) * 60 * 1000);
+	}
+
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/LicenseInfo.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/LicenseInfo.java
new file mode 100644
index 0000000..a8d81fe
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/LicenseInfo.java
@@ -0,0 +1,96 @@
+package cn.pluss.platform.leshua;
+
+/**
+ * @author yuchen
+ *
+ * @Description 
+ * 营业资质信息
+ */
+public class LicenseInfo {
+	
+	/**
+	 * 有
+	 * 营业执照注册号(企业必填)
+	 */
+	private String license;
+	
+	/**
+	 * 有
+	 * 企业类填写：营业执照名称，执照如无名称，可填“个体户XXX”（执照上姓名）；小微商户填“商户_XXX”（身份证姓名）
+	 */
+	private String licenseFullName;
+	
+	/**
+	 * 有
+	 * 营业执照注册地址(企业必填)
+	 */
+	private String licenseAddress;
+	
+	/**
+	 * 有
+	 * 营业执照注册号开始日期(企业和个体有营业执照必填)格式：2015-09-22
+	 */
+	private String licenseStart;
+	
+	/**
+	 * 有
+	 * 营业执照注册结束日期(企业和个体有营业执照必填)格式：2015-09-22，永久有效:2099-12-30
+	 */
+	private String licenseEnd;
+	
+	/**
+	 * 有
+	 * 营业执照照片
+	 */
+	private String licensePic;
+
+	public String getLicense() {
+		return license;
+	}
+
+	public void setLicense(String license) {
+		this.license = license;
+	}
+
+	public String getLicenseFullName() {
+		return licenseFullName;
+	}
+
+	public void setLicenseFullName(String licenseFullName) {
+		this.licenseFullName = licenseFullName;
+	}
+
+	public String getLicenseAddress() {
+		return licenseAddress;
+	}
+
+	public void setLicenseAddress(String licenseAddress) {
+		this.licenseAddress = licenseAddress;
+	}
+
+	public String getLicenseStart() {
+		return licenseStart;
+	}
+
+	public void setLicenseStart(String licenseStart) {
+		this.licenseStart = licenseStart;
+	}
+
+	public String getLicenseEnd() {
+		return licenseEnd;
+	}
+
+	public void setLicenseEnd(String licenseEnd) {
+		this.licenseEnd = licenseEnd;
+	}
+
+	public String getLicensePic() {
+		return licensePic;
+	}
+
+	public void setLicensePic(String licensePic) {
+		this.licensePic = licensePic;
+	}
+	
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/MccListVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/MccListVO.java
new file mode 100644
index 0000000..5549890
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/MccListVO.java
@@ -0,0 +1,49 @@
+package cn.pluss.platform.leshua;
+
+import java.util.List;
+
+import cn.pluss.platform.vo.MccGrandpaVO;
+
+/**
+ * @author yuchen
+ * 
+ * @Description 
+ */
+public class MccListVO {
+	
+	private String mccType;
+	
+	private String mccTypeName;
+	
+	private List<MccGrandpaVO> mccGrandpaList;
+
+	public String getMccType() {
+		return mccType;
+	}
+
+	public void setMccType(String mccType) {
+		this.mccType = mccType;
+	}
+
+	public List<MccGrandpaVO> getMccGrandpaList() {
+		return mccGrandpaList;
+	}
+
+	public void setMccGrandpaList(List<MccGrandpaVO> mccGrandpaList) {
+		this.mccGrandpaList = mccGrandpaList;
+	}
+
+	public String getMccTypeName() {
+		return mccTypeName;
+	}
+
+	public void setMccTypeName(String mccTypeName) {
+		this.mccTypeName = mccTypeName;
+	}
+	
+	
+	
+	
+
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/MerchantRegisterDTO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/MerchantRegisterDTO.java
new file mode 100644
index 0000000..fb200f8
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/MerchantRegisterDTO.java
@@ -0,0 +1,103 @@
+package cn.pluss.platform.leshua;
+
+/**
+ * @author yuchen
+ * 
+ * @Description 
+ *  乐刷商户进件dto
+ */
+public class MerchantRegisterDTO {
+	
+	/**
+	 * 商户基本信息
+	 */
+	private BaseInfo baseInfo;
+	
+	/**
+	 * 法人信息，个人类型填联系人信息
+	 */
+	private LegalPerson legalPerson;
+	
+	/**
+	 * 联系人信息
+	 */
+	private ContactInfo contactInfo;
+	
+	/**
+	 * 店铺地址信息
+	 */
+	private AddressInfo addressInfo;
+	
+	/**
+	 * 营业资质信息
+	 */
+	private LicenseInfo licenseInfo;
+	
+	/**
+	 * 结算信息
+	 */
+	private AccountInfo accountInfo;
+	
+	/**
+	 * 门店信息
+	 */
+	private ShopInfo shopInfo;
+
+	public BaseInfo getBaseInfo() {
+		return baseInfo;
+	}
+
+	public void setBaseInfo(BaseInfo baseInfo) {
+		this.baseInfo = baseInfo;
+	}
+
+	public LegalPerson getLegalPerson() {
+		return legalPerson;
+	}
+
+	public void setLegalPerson(LegalPerson legalPerson) {
+		this.legalPerson = legalPerson;
+	}
+
+	public ContactInfo getContactInfo() {
+		return contactInfo;
+	}
+
+	public void setContactInfo(ContactInfo contactInfo) {
+		this.contactInfo = contactInfo;
+	}
+
+	public AddressInfo getAddressInfo() {
+		return addressInfo;
+	}
+
+	public void setAddressInfo(AddressInfo addressInfo) {
+		this.addressInfo = addressInfo;
+	}
+
+	public LicenseInfo getLicenseInfo() {
+		return licenseInfo;
+	}
+
+	public void setLicenseInfo(LicenseInfo licenseInfo) {
+		this.licenseInfo = licenseInfo;
+	}
+
+	public AccountInfo getAccountInfo() {
+		return accountInfo;
+	}
+
+	public void setAccountInfo(AccountInfo accountInfo) {
+		this.accountInfo = accountInfo;
+	}
+
+	public ShopInfo getShopInfo() {
+		return shopInfo;
+	}
+
+	public void setShopInfo(ShopInfo shopInfo) {
+		this.shopInfo = shopInfo;
+	}
+	
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/MerchantUpdateDTO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/MerchantUpdateDTO.java
new file mode 100644
index 0000000..f07b8a6
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/MerchantUpdateDTO.java
@@ -0,0 +1,168 @@
+package cn.pluss.platform.leshua;
+
+import cn.pluss.platform.entity.MerchantBankCard;
+
+/**
+ * @author yuchen
+ *
+ * @Description 乐刷商户信息修改dto
+ */
+public class MerchantUpdateDTO {
+
+	private String merchantId;
+	
+	private String userId;
+	
+	
+	private String branchProvince;
+	
+	private String branchCity;
+
+	/**
+	 * 商户基本信息
+	 */
+	private BaseInfo baseInfo;
+
+	/**
+	 * 法人信息，个人类型填联系人信息
+	 */
+	private LegalPerson legalPerson;
+
+	/**
+	 * 联系人信息
+	 */
+	private ContactInfo contactInfo;
+
+	/**
+	 * 店铺地址信息
+	 */
+	private AddressInfo addressInfo;
+
+	/**
+	 * 营业资质信息
+	 */
+	private LicenseInfo licenseInfo;
+
+	/**
+	 * 结算信息
+	 */
+	private AccountInfo accountInfo;
+
+	/**
+	 * 门店信息
+	 */
+	private ShopInfo shopInfo;
+
+	public String getMerchantId() {
+		return merchantId;
+	}
+	
+	public String getBranchProvince() {
+		return branchProvince;
+	}
+
+
+	public void setBranchProvince(String branchProvince) {
+		this.branchProvince = branchProvince;
+	}
+
+
+	public String getBranchCity() {
+		return branchCity;
+	}
+
+
+	public void setBranchCity(String branchCity) {
+		this.branchCity = branchCity;
+	}
+
+
+	public String getUserId() {
+		return userId;
+	}
+
+	public void setUserId(String userId) {
+		this.userId = userId;
+	}
+
+	public void setMerchantId(String merchantId) {
+		this.merchantId = merchantId;
+	}
+
+	public BaseInfo getBaseInfo() {
+		return baseInfo;
+	}
+
+	public void setBaseInfo(BaseInfo baseInfo) {
+		this.baseInfo = baseInfo;
+	}
+
+	public LegalPerson getLegalPerson() {
+		return legalPerson;
+	}
+
+	public void setLegalPerson(LegalPerson legalPerson) {
+		this.legalPerson = legalPerson;
+	}
+
+	public ContactInfo getContactInfo() {
+		return contactInfo;
+	}
+
+	public void setContactInfo(ContactInfo contactInfo) {
+		this.contactInfo = contactInfo;
+	}
+
+	public AddressInfo getAddressInfo() {
+		return addressInfo;
+	}
+
+	public void setAddressInfo(AddressInfo addressInfo) {
+		this.addressInfo = addressInfo;
+	}
+
+	public LicenseInfo getLicenseInfo() {
+		return licenseInfo;
+	}
+
+	public void setLicenseInfo(LicenseInfo licenseInfo) {
+		this.licenseInfo = licenseInfo;
+	}
+
+	public AccountInfo getAccountInfo() {
+		return accountInfo;
+	}
+
+	public void setAccountInfo(AccountInfo accountInfo) {
+		this.accountInfo = accountInfo;
+	}
+
+	public ShopInfo getShopInfo() {
+		return shopInfo;
+	}
+
+	public void setShopInfo(ShopInfo shopInfo) {
+		this.shopInfo = shopInfo;
+	}
+
+	public MerchantBankCard convert(MerchantUpdateDTO merchantUpdateDTO) {
+		MerchantBankCard merchantBankCard=new MerchantBankCard();
+		AccountInfo accountInfo = merchantUpdateDTO.getAccountInfo();
+		String bankCardFrontPic = accountInfo.getBankCardFrontPic();
+		String bankCardNo = accountInfo.getBankCardNo();
+		String branch = accountInfo.getBranch();
+		String holder = accountInfo.getHolder();
+		String idCardNo = accountInfo.getIdCardNo();
+		String unionpay = accountInfo.getUnionpay();
+		merchantBankCard.setBankCardNo(bankCardNo);
+		merchantBankCard.setBankCertName(holder);
+		merchantBankCard.setBranchName(branch);
+		merchantBankCard.setBankCardFrontPic(bankCardFrontPic);
+		merchantBankCard.setCertNo(idCardNo);
+		merchantBankCard.setContactLine(unionpay);
+		merchantBankCard.setBranchProvince(merchantUpdateDTO.getBranchProvince());
+		merchantBankCard.setBranchCity(merchantUpdateDTO.getBranchCity());
+		return merchantBankCard;
+	}
+
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/ProvinceVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/ProvinceVO.java
new file mode 100644
index 0000000..82066a5
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/ProvinceVO.java
@@ -0,0 +1,31 @@
+package cn.pluss.platform.leshua;
+
+/**
+ * @author yuchen
+ *
+ * @Description 
+ */
+public class ProvinceVO {
+	
+	private String provinceCode;
+	
+	private String provinceName;
+	
+	public String getProvinceCode() {
+		return provinceCode;
+	}
+
+	public void setProvinceCode(String provinceCode) {
+		this.provinceCode = provinceCode;
+	}
+
+	public String getProvinceName() {
+		return provinceName;
+	}
+
+	public void setProvinceName(String provinceName) {
+		this.provinceName = provinceName;
+	}
+	
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/ShopInfo.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/ShopInfo.java
new file mode 100644
index 0000000..c07907e
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/ShopInfo.java
@@ -0,0 +1,32 @@
+package cn.pluss.platform.leshua;
+
+import lombok.Data;
+
+/**
+ * @author yuchen
+ *
+ * @Description 
+ * 门店信息
+ */
+@Data
+public class ShopInfo {
+	
+	/**
+	 * 有
+	 * 经营场所内设照片
+	 */
+	private String insidePic;
+	
+	/**
+	 * 有
+	 * 门头照
+	 */
+	private String doorPic;
+	
+	/**
+	 * 有
+	 * 收银台照片
+	 */
+	private String cashierDeskPic;
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/WxpayconfigDTO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/WxpayconfigDTO.java
new file mode 100644
index 0000000..676a661
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/leshua/WxpayconfigDTO.java
@@ -0,0 +1,89 @@
+package cn.pluss.platform.leshua;
+
+/**
+ * @author yuchen
+ *
+ * @Description 
+ */
+public class WxpayconfigDTO {
+	
+	/**
+	 * 商户编号
+	 */
+	private String merchantId;
+	
+	/**
+	 * 配置类型：1：绑定APPID（支付）；2：推荐关注APPID；3：授权目录；
+	 */
+	private Integer configType;
+	
+	/**
+	 * 绑定APPID，configType为1、2时必填
+	 */
+	private String sub_appid;
+	
+	/**
+	 * 推荐关注APPID，configType为2时二选一必填
+	 */
+	private String subscribe_appid;
+	
+	/**
+	 * 推荐关注小程序APPID，configType为2时二选一必填
+	 */
+	private String receipt_appid;
+	
+	/**
+	 * 授权目录，configType为3时必填
+	 */
+	private String jsapi_path;
+
+	public String getMerchantId() {
+		return merchantId;
+	}
+
+	public void setMerchantId(String merchantId) {
+		this.merchantId = merchantId;
+	}
+
+	public Integer getConfigType() {
+		return configType;
+	}
+
+	public void setConfigType(Integer configType) {
+		this.configType = configType;
+	}
+
+	public String getSub_appid() {
+		return sub_appid;
+	}
+
+	public void setSub_appid(String sub_appid) {
+		this.sub_appid = sub_appid;
+	}
+
+	public String getSubscribe_appid() {
+		return subscribe_appid;
+	}
+
+	public void setSubscribe_appid(String subscribe_appid) {
+		this.subscribe_appid = subscribe_appid;
+	}
+
+	public String getReceipt_appid() {
+		return receipt_appid;
+	}
+
+	public void setReceipt_appid(String receipt_appid) {
+		this.receipt_appid = receipt_appid;
+	}
+
+	public String getJsapi_path() {
+		return jsapi_path;
+	}
+
+	public void setJsapi_path(String jsapi_path) {
+		this.jsapi_path = jsapi_path;
+	}
+
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/life/LifeParam.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/life/LifeParam.java
new file mode 100644
index 0000000..0d206c0
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/life/LifeParam.java
@@ -0,0 +1,23 @@
+package cn.pluss.platform.life;
+
+import cn.pluss.platform.exception.MsgException;
+import lombok.Data;
+
+/**
+ * TODO
+ * 生活圈参数封装
+ * @author crystal
+ * @date 2022/6/13 9:49
+ */
+@Data
+public class LifeParam {
+
+    /**
+     * 生活圈门店id 对应的是merchant_store 的id字段
+     */
+    private Long syb_m_id;
+
+    public void check() {
+        MsgException.checkNull(syb_m_id,"缺失门店ID参数");
+    }
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/other/JfShopAccount.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/other/JfShopAccount.java
new file mode 100644
index 0000000..cf65cf1
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/other/JfShopAccount.java
@@ -0,0 +1,37 @@
+package cn.pluss.platform.other;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * TODO
+ * 积分账户余额实体类封装
+ * @author crystal
+ * @date 2022/5/16 14:56
+ */
+@Data
+public class JfShopAccount {
+
+    /**
+     * 总积分数量
+     */
+    private BigDecimal total;
+
+    /**
+     * 已使用的数量
+     */
+    private BigDecimal use;
+
+    /**
+     * 可用积分数
+     */
+    private BigDecimal surplus;
+
+
+    public JfShopAccount(BigDecimal total, BigDecimal use, BigDecimal surplus) {
+        this.total = total;
+        this.use = use;
+        this.surplus = surplus;
+    }
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/other/JfShopCommon.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/other/JfShopCommon.java
new file mode 100644
index 0000000..da155e5
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/other/JfShopCommon.java
@@ -0,0 +1,36 @@
+package cn.pluss.platform.other;
+
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.util.StringUtil;
+import lombok.Data;
+
+/**
+ * TODO
+ * 积分商城公共请求参数
+ * @author crystal
+ * @date 2022/5/24 23:13
+ */
+@Data
+public class JfShopCommon {
+
+    /**
+     * 请求ID
+     */
+    protected String reqId;
+
+    /**
+     * 请求时间戳
+     */
+    protected Long timestamp;
+
+    /**
+     * 用户ID
+     */
+    protected String userId;
+
+    public void check() {
+        MsgException.checkBlank(this.getReqId(),"reqId为空！");
+        MsgException.checkNull(this.getTimestamp(),"timestamp为空！");
+        MsgException.checkBlank(this.getUserId(),"请求用户ID为空！");
+    }
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/other/JfShopIntegral.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/other/JfShopIntegral.java
new file mode 100644
index 0000000..caacd1c
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/other/JfShopIntegral.java
@@ -0,0 +1,49 @@
+package cn.pluss.platform.other;
+
+import cn.pluss.platform.util.StringUtil;
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * TODO
+ * 获取积分兑换详情
+ * @author crystal
+ * @date 2022/5/16 18:08
+ *
+ */
+@Data
+public class JfShopIntegral {
+
+    /**
+     * 订单号
+     */
+    private String orderNumber;
+
+    /**
+     * 积分
+     */
+    private BigDecimal integral;
+
+    /**
+     * 发放时间
+     */
+    @JsonFormat(locale = "zh",timezone = "GMT+8",pattern="yyyy-MM-dd HH:mm:ss")
+    private Date grantDate;
+
+    /**
+     * 1表示交易积分 2：机具活动积分 3：其他积分
+     */
+    private String type;
+
+    public String getOrderNumber() {
+        if(StringUtil.isEmpty(this.orderNumber)){
+            return "";
+        }
+        return orderNumber;
+    }
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/other/JfShopParam.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/other/JfShopParam.java
new file mode 100644
index 0000000..641c0ef
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/other/JfShopParam.java
@@ -0,0 +1,122 @@
+package cn.pluss.platform.other;
+
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.util.StringUtil;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * TODO
+ * 积分商城通用请求参数
+ * @author crystal
+ * @date 2022/5/16 14:49
+ */
+@Data
+public class JfShopParam {
+
+    public static final String OPERATE_ADD = "addIntegral";
+
+    public static final String OPERATE_USE = "useIntegral";
+
+    public static final String LIST_TYPE_ADD = "1";
+
+    public static final String LIST_TUPE_USE = "2";
+
+    /**
+     * 请求ID
+     */
+    protected String reqId;
+
+    /**
+     * 请求时间戳
+     */
+    protected Long timestamp;
+
+    /**
+     * 用户ID
+     */
+    protected String userId;
+
+    /**
+     * 列表类型 1：增加积分明细 2：消耗积分明细
+     */
+    protected String listType;
+
+    /**
+     * 1交易积分 2：机具活动积分 3：任务积分 4：签到积分
+     */
+    protected String type;
+
+    /**
+     * 当前页
+     */
+    protected Long current;
+
+    /**
+     * 每页显示的条数
+     */
+    protected Long size;
+
+    /**
+     * 备注
+     */
+    protected String remark;
+
+    /**
+     * 积分数量
+     */
+    protected BigDecimal integral;
+
+    /**
+     * 订单号
+     */
+    protected String orderNumber;
+
+
+    protected String name;
+
+
+    protected BigDecimal orderAmt;
+
+    /**
+     * 通用密钥 用于积分商城接口相关加密使用 请勿随意更改
+     */
+    public static String pubKey = "92532a95e7434e88bb058e9cf785b181";
+
+    public void check(String option) {
+        MsgException.checkBlank(this.getReqId(),"reqId为空！");
+        MsgException.checkNull(this.getTimestamp(),"timestamp为空！");
+        MsgException.checkBlank(this.getUserId(),"请求用户ID为空！");
+        if(StringUtil.isNotEmpty(option)){
+            MsgException.checkBlank(this.getType(),"积分类型不能为空！");
+            MsgException.checkNull(this.getIntegral(),"积分数值不能为空！");
+            if(OPERATE_ADD.equals(option) && "1".equals(this.getType())){
+                MsgException.checkBlank(this.getOrderNumber(),"交易积分类型的操作需要填写订单号参数！");
+                MsgException.checkNull(this.getOrderAmt(),"交易积分类型的操作需要填写订单金额参数");
+            }
+            if(OPERATE_USE.equals(option)){
+                MsgException.checkBlank(this.getName(),"商品名称name参数不能为空！");
+                MsgException.checkBlank(this.getOrderNumber(),"订单不能为空");
+            }
+        }
+        if(this.getCurrent() == null){
+            this.setCurrent(1L);
+        }
+        if(this.getSize() == null){
+            this.setSize(10L);
+        }
+        if(StringUtil.isEmpty(this.getListType())){
+            this.setListType(LIST_TYPE_ADD);
+        }
+        if(StringUtil.isNotEmpty(this.getListType())){
+            if(!LIST_TYPE_ADD.equals(this.getListType()) && !LIST_TUPE_USE.equals(this.getListType())){
+                MsgException.throwException("未知列表类型");
+            }
+        }
+    }
+
+    public void check() {
+        this.check(null);
+    }
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/other/JfShopSyncUser.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/other/JfShopSyncUser.java
new file mode 100644
index 0000000..ca1deef
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/other/JfShopSyncUser.java
@@ -0,0 +1,73 @@
+package cn.pluss.platform.other;
+
+/**
+ * TODO
+ *
+ * @author crystal
+ * @date 2022/5/13 16:55
+ */
+
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.entity.UserInfo;
+import cn.pluss.platform.util.AESEncrypt;
+import com.alibaba.fastjson.JSON;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.nio.charset.StandardCharsets;
+
+/**
+ * 积分商城同步用户信息参数实体类
+ */
+@Data
+@NoArgsConstructor
+public class JfShopSyncUser {
+
+    /**
+     * 登录账号
+     */
+    private String account;
+
+    /**
+     * 用户名称
+     */
+    private String nickname;
+
+    /**
+     * 商户code
+     */
+    private String syb_merchant_code;
+
+    /**
+     * 用户Id
+     */
+    private String syb_merchant_id;
+
+    /**
+     * 手机号
+     */
+    private String mobile;
+
+    /**
+     * 构造方法
+     * @param info
+     * @param userApp
+     */
+    public JfShopSyncUser(UserInfo info, UserApp userApp) {
+        this.account = info.getLoginName();
+        this.mobile = info.getPhone();
+        this.syb_merchant_id = userApp.getUserId().toString();
+        this.nickname = userApp.getUserName();
+        this.syb_merchant_code = userApp.getMerchantCode();
+    }
+
+    public String createAesData(String pubKey) {
+        String content = JSON.toJSONString(this);
+        try {
+            return AESEncrypt.encryptEcbToString(content.getBytes(StandardCharsets.UTF_8), pubKey.getBytes(StandardCharsets.UTF_8), null);
+        }catch (Exception e){
+            e.printStackTrace();
+            return null;
+        }
+    }
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/other/JfShopValidTask.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/other/JfShopValidTask.java
new file mode 100644
index 0000000..6046d3d
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/other/JfShopValidTask.java
@@ -0,0 +1,39 @@
+package cn.pluss.platform.other;
+
+import cn.pluss.platform.util.StringUtil;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * TODO
+ *
+ * @author crystal
+ * @date 2022/5/24 23:11
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class JfShopValidTask extends JfShopCommon {
+
+
+    /**
+     * 任务类型
+     * 00 全部
+     * 01：支付即好友
+     * 02：订单微信推送
+     * 03：使用一次帮助中心
+     * 04：查看一次产品手册
+     * 05：本月使用收银呗收款3天
+     * 06：本月使用收银呗收款7天
+     * 07：本月使用收银呗收款15天
+     */
+    private String taskType;
+
+
+    @Override
+    public void check() {
+        super.check();
+        if(StringUtil.isEmpty(this.getTaskType())){
+            this.taskType = "00";
+        }
+    }
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/other/enums/JfShopTaskType.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/other/enums/JfShopTaskType.java
new file mode 100644
index 0000000..417e828
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/other/enums/JfShopTaskType.java
@@ -0,0 +1,41 @@
+package cn.pluss.platform.other.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * TODO
+ * 积分商城任务类型枚举类
+ * @author crystal
+ * @date 2022/5/25 10:18
+ */
+@Getter
+@AllArgsConstructor
+public enum JfShopTaskType {
+
+    ALL("00","all",0,"全部"),
+    PAY_FRIENDS("01","payAsFriends",0,"支付即好友"),
+    BIND_ORDER_PUSH("02","bindOrderPush",0,"绑定订单推送"),
+    USE_HELP_CENTER("03","useHelpCenter",0,"使用帮助中心"),
+    USE_PRODUCT_MANUAL("04","useProductManual",0,"使用产品手册"),
+    MONTH_COLLECT_3("05","monthCollect3",3,"本月收款3天"),
+    MONTH_COLLECT_7("06","monthCollect7",7,"本月收款7天"),
+    MONTH_COLLECT_15("07","monthCollect15",15,"本月收款15天");
+
+    private String status;
+
+    private String code;
+
+    private Integer value;
+
+    private String desc;
+
+    public static JfShopTaskType matchStatus(String status) {
+        for (JfShopTaskType taskType : JfShopTaskType.values()) {
+            if (taskType.getStatus().equalsIgnoreCase(status)) {
+                return taskType;
+            }
+        }
+        return null;
+    }
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/row/DeviceBsjRowGetter.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/row/DeviceBsjRowGetter.java
new file mode 100644
index 0000000..ddd55a7
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/row/DeviceBsjRowGetter.java
@@ -0,0 +1,42 @@
+package cn.pluss.platform.row;
+
+import cn.pluss.platform.entity.DeviceBsj;
+import cn.pluss.platform.util.excel.ExcelImportUtil;
+import cn.pluss.platform.util.excel.RowInfoGetter;
+import cn.pluss.platform.util.excel.model.RowInfo;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Locale;
+
+/**
+ * 导入数据的数据转换类
+ *
+ * @author DJH
+ */
+public class DeviceBsjRowGetter implements RowInfoGetter<DeviceBsj> {
+
+    private final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault());
+
+    @Override
+    public DeviceBsj getEntity(RowInfo rowInfo, int lineNum) {
+        Row row = rowInfo.sheet.getRow(rowInfo.startRow);
+
+        DeviceBsj entity = new DeviceBsj();
+        entity.setSim(ExcelImportUtil.readCell(row.getCell(0)).toString());
+        entity.setIccid(ExcelImportUtil.readCell(row.getCell(1)).toString());
+
+        String expireTimeString = ExcelImportUtil.readCell(row.getCell(4)).toString();
+        try {
+            entity.setSimExpireTime(dateFormat.parse(expireTimeString));
+        } catch (ParseException ignored) {
+        }
+
+
+        return entity;
+    }
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/suixingfu/SxfConstants.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/suixingfu/SxfConstants.java
new file mode 100644
index 0000000..e18828f
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/suixingfu/SxfConstants.java
@@ -0,0 +1,61 @@
+package cn.pluss.platform.suixingfu;
+
+import java.math.BigDecimal;
+
+/**
+ * @author DJH
+ * 随行付的一些常量
+ */
+public class SxfConstants {
+
+    /** 进件终审通过 */
+    public static String AUDIT_TASK_STATUS_SUCCESS = "1";
+
+    /** 进件初审通过 */
+    public static String AUDIT_TASK_STATUS_FIRST_TRIAL_SUCCESS = "0";
+
+    /** 进件驳回 */
+    public static String AUDIT_TASK_STATUS_REJECT = "2";
+
+    /** 复审驳回，入驻图片驳回 */
+    public static String AUDIT_TASK_STATUS_IMAGE_REJECT = "3";
+
+    /** 进件修改通过 */
+    public static String AUDIT_TASK_STATUS_EDIT_SUCCESS = "5";
+
+    /** 进件修改驳回 */
+    public static String AUDIT_TASK_STATUS_EDIT_FAIL = "6";
+
+    /**
+     * @description:随行付微信支付宝成本银联1000以下费率0.21%
+     * 不支持1000以上的银联交易
+     * @date: 2021/8/24 14:33
+     */
+    public static final BigDecimal CHANNEL_WECHAT_ALIPAY_BANK_COST_RATE = BigDecimal.valueOf(0.0021);
+
+    /**
+     * @description:随行付银联云闪付贷记卡大于1000成本费率0.535%
+     * @date: 2021/8/24 14:33
+     */
+    public static final BigDecimal CREDIT_CARD_BANK_RATE_LARGE = BigDecimal.valueOf(0.00535);
+
+    /**
+     * @description:随行付银联云闪付借记卡大于1000成本费率0.435%
+     * @date: 2021/8/24 14:33
+     */
+    public static final BigDecimal DEBIT_CARD_BANK_RATE_LARGE = BigDecimal.valueOf(0.00435);
+
+    /**
+     * @description:随行付银联云闪付借记卡封顶手续费18.75元
+     * @date: 2021/8/24 14:33
+     */
+    public static final BigDecimal DEBIT_CARD_BANK_RATE_LARGE_MAX_FEE = BigDecimal.valueOf(18.75);
+
+
+
+    /**
+     * @description:随行付pos推送
+     * @date: 2021/10/28 10:23
+     */
+    public static final String  SXF_POS_OPERATION = "sxfPosOperation";
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/AccountVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/AccountVO.java
new file mode 100644
index 0000000..5d8a7cd
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/AccountVO.java
@@ -0,0 +1,48 @@
+package cn.pluss.platform.vo;
+
+import cn.pluss.platform.dto.AccountDTO;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author DJH
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AllArgsConstructor
+@NoArgsConstructor
+public class AccountVO extends AccountDTO {
+
+    /** 结算方式名称 */
+    private String settleTypeName;
+
+    /**
+     * 商编
+     */
+    private String merchantId;
+
+    public static String getSettleTypeName(String settleType) {
+        switch (settleType) {
+            case "011":
+                return "对私法人";
+            case "012":
+                return "非法人对私法人";
+            case "01":
+                return "对私法人";
+            case "021":
+                return "法人对私非法人";
+            case "022":
+                return "非法人对私非法人";
+            case "02":
+                return "对私非法人";
+            case "03":
+                return "对公";
+            case "00":
+                return "小微";
+            default:
+                return null;
+        }
+    }
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/AgentInfo.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/AgentInfo.java
new file mode 100644
index 0000000..fb54795
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/AgentInfo.java
@@ -0,0 +1,116 @@
+package cn.pluss.platform.vo;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@Accessors(chain = true)
+public class AgentInfo {
+    private Long userId;
+
+    private Long parentId;
+
+    /**
+     * {@link cn.pluss.platform.entity.UserApp}
+     */
+    private String autoAudit;
+
+    /**
+     * {@link cn.pluss.platform.entity.UserApp}
+     */
+    private String payEcdemicSwitch;
+
+    /**
+     * {@link cn.pluss.platform.entity.UserApp}
+     */
+    private String isMarket;
+
+    /**
+     * {@link cn.pluss.platform.entity.UserApp}
+     */
+    private String isUnionPay;
+
+    /**
+     * 来自表user_info
+     * 总收益
+     */
+    private BigDecimal sumPrice;
+    /**
+     * 上月收益
+     */
+    private BigDecimal beforeMonthPrice;
+    /**
+     * 本月收益
+     */
+    private BigDecimal nowMonthPrice;
+    /**
+     * 提现金额
+     */
+    private BigDecimal cashAmt;
+    /**
+     * 余额
+     */
+    private BigDecimal surplusPrice;
+    @NotNull(message = "登录账号不能为空")
+    private String loginName;
+
+    /**
+     * 来自user_info
+     */
+    @NotNull(message = "手机号不能为空")
+    private String phone;
+    /**
+     * 来自表 user_app
+     */
+    private String userName;
+
+    /**
+     * 状态：1是有效，0是无效，-1是删除
+     */
+    private Integer status;
+
+    /**
+     * 密码
+     */
+    private String password;
+
+    /**
+     * 备注信息
+     */
+    private String remark;
+
+    /**
+     * 浮动费率
+     */
+    private BigDecimal rate;
+
+    /**
+     * 是否为浮动费率
+     */
+    private String isFixedRate;
+
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTimeStart;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTimeEnd;
+
+
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTimeStart;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTimeEnd;
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/AgentStaffVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/AgentStaffVO.java
new file mode 100644
index 0000000..0083dfa
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/AgentStaffVO.java
@@ -0,0 +1,33 @@
+package cn.pluss.platform.vo;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author Djh
+ */
+@Data
+public class AgentStaffVO {
+    /** 用户id */
+    private String userId;
+
+    /** 代理商/服务商 id */
+    private String parentId;
+
+    /** 代理商/服务商 名称 */
+    private String agentName;
+
+    /** 代理商/服务商 手机号 */
+    private String agentPhone;
+
+    private String loginName;
+
+    private String phone;
+
+    private String logo;
+
+    private String userName;
+
+    private Date createTime;
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/AliMerchantInfoVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/AliMerchantInfoVO.java
new file mode 100644
index 0000000..ed02762
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/AliMerchantInfoVO.java
@@ -0,0 +1,50 @@
+package cn.pluss.platform.vo;
+
+import cn.pluss.platform.entity.UserApp;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author yuchen
+ * 
+ * @Description 
+ * 支付宝进件信息回显vo
+ */
+@Data
+public class AliMerchantInfoVO {
+	
+	@ApiModelProperty(value="当前用户userId")
+	private Long userId;
+	
+	@ApiModelProperty(value="商家名称")
+	private String merchantName;
+	
+	@ApiModelProperty(value="支付宝账号")
+	private String account;
+	
+	@ApiModelProperty(value="联系人名称")
+	private String contactName;
+	
+	@ApiModelProperty(value="联系人手机号码")
+	private String contactMobile;
+	
+	@ApiModelProperty(value="联系人邮箱")
+	private String contactEmail;
+	
+	@ApiModelProperty(value="所属MCCCode")
+	private String mccCode;
+	
+	@ApiModelProperty(value="所属MccName")
+	private String mccName;
+	
+	@ApiModelProperty(value="营业执照号码")
+	private String businessLicenseNo;
+	
+	@ApiModelProperty(value="营业执照图片")
+	private String  businessLicensePic;
+	
+	@ApiModelProperty(value="店铺门头照图片")
+	private String shopSignBoardPic;
+
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/AuditResult.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/AuditResult.java
new file mode 100644
index 0000000..14e2ed8
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/AuditResult.java
@@ -0,0 +1,29 @@
+package cn.pluss.platform.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author djh
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class AuditResult {
+
+    /**
+     * 进件接口
+     */
+    private String msg;
+
+    /**
+     * 下一个接口请求
+     */
+    private String nextUri;
+
+    /**
+     * 下一个接口请求提示
+     */
+    private String nextReqTip;
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/BankCardInfoVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/BankCardInfoVO.java
new file mode 100644
index 0000000..f9a5487
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/BankCardInfoVO.java
@@ -0,0 +1,21 @@
+package cn.pluss.platform.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class BankCardInfoVO {
+	
+	@ApiModelProperty(value="银行卡卡号")
+	private String bank_card_number;
+	
+	@ApiModelProperty(value="银行名，不能识别时为空")
+	private String bank_name;
+	
+	@ApiModelProperty(value="银行卡有效期")
+	private String valid_date;
+	
+	@ApiModelProperty(value="银行卡类型，0:不能识别; 1: 借记卡; 2: 信用卡")
+	private String bank_card_type;
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/BankCardRecordVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/BankCardRecordVO.java
new file mode 100644
index 0000000..c212739
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/BankCardRecordVO.java
@@ -0,0 +1,22 @@
+package cn.pluss.platform.vo;
+
+import cn.pluss.platform.entity.BankCard;
+import lombok.Data;
+
+/**
+ * 结算卡修改记录
+ * @author djh
+ */
+@Data
+public class BankCardRecordVO {
+
+    /**
+     * 原结算卡
+     */
+    private BankCard currentCard;
+
+    /**
+     * 新结算卡
+     */
+    private BankCard newCard;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/BankCardVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/BankCardVO.java
new file mode 100644
index 0000000..d8120c5
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/BankCardVO.java
@@ -0,0 +1,57 @@
+package cn.pluss.platform.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author djh
+ * @Description
+ */
+@Data
+public class BankCardVO {
+
+    @ApiModelProperty(value = "开户银行")
+    private String bankName;
+
+    @ApiModelProperty(value = "银行省市区编码")
+    private String bankAddressNo;
+
+    @ApiModelProperty(value = "开户地区")
+    private String bankAddress;
+
+    /**
+     * 开户支行所在省
+     */
+    private String branchProvince;
+
+
+    /**
+     * 开户支行所在市
+     */
+    private String branchCity;
+
+
+    /**
+     * 开户支行所在区
+     */
+    private String branchArea;
+
+    @ApiModelProperty(value = "开户支行")
+    private String branchName;
+
+    @ApiModelProperty(value = "联行号")
+    private String contactLine;
+
+    @ApiModelProperty(value = "银行卡号")
+    private String bankCardNo;
+
+    @ApiModelProperty(value = "银行预留号码")
+    private String phone;
+
+    @ApiModelProperty(value = "银行卡照片")
+    private String bankCardFrontPic;
+
+    @ApiModelProperty(value = "账户类型。可选值： 1：对私账户（自然人、个体工商户可选）\\r\\n 2：对公账户")
+    private String accountType;
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/BaseUser.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/BaseUser.java
new file mode 100644
index 0000000..3db4e7a
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/BaseUser.java
@@ -0,0 +1,8 @@
+package cn.pluss.platform.vo;
+
+
+import java.io.Serializable;
+
+public class BaseUser implements Serializable{
+	
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/BillStatisticsVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/BillStatisticsVO.java
new file mode 100644
index 0000000..489a4fb
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/BillStatisticsVO.java
@@ -0,0 +1,193 @@
+package cn.pluss.platform.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author Djh
+ */
+@Data
+public class BillStatisticsVO {
+
+    /**
+     * 结算通道描述
+     */
+    private String merchantChannelType;
+
+    /**
+     * 订单笔数
+     */
+    private Integer allOrderCount;
+
+    /**
+     * 微信订单笔数
+     */
+    private Integer wxOrderCount;
+
+    /**
+     * 支付宝订单笔数
+     */
+    private Integer aliOrderCount;
+
+    /**
+     * 银联订单笔数
+     */
+    private Integer bankOrderCount;
+
+    /**
+     * 现金订单笔数
+     */
+    private Integer inCashOrderCount;
+
+    /**
+     * 订单退款笔数
+     */
+    private Integer allRefundOrderCount;
+
+    /**
+     * 微信订单退款笔数
+     */
+    private Integer wxRefundOrderCount;
+
+    /**
+     * 支付宝订单退款笔数
+     */
+    private Integer aliRefundOrderCount;
+
+    /**
+     * 银联订单退款笔数
+     */
+    private Integer bankRefundOrderCount;
+
+    /**
+     * 到账总额
+     */
+    private BigDecimal allInMoney;
+
+    /**
+     * 微信到账总额
+     */
+    private BigDecimal wxInMoney;
+
+    /**
+     * 支付宝到账总额
+     */
+    private BigDecimal aliInMoney;
+
+    /**
+     * 银联到账总额
+     */
+    private BigDecimal bankInMoney;
+
+    /**
+     * 现金到账总额
+     */
+    private BigDecimal inCashInMoney;
+
+    /**
+     * 优惠金额
+     */
+    private BigDecimal allDiscounts;
+
+    /**
+     * 微信优惠金额
+     */
+    private BigDecimal wxDiscounts;
+
+    /**
+     * 支付宝优惠金额
+     */
+    private BigDecimal aliDiscounts;
+
+    /**
+     * 银联优惠金额
+     */
+    private BigDecimal bankDiscounts;
+
+    /**
+     * 活动补贴
+     */
+    private BigDecimal allSubsidy;
+
+    /**
+     * 微信活动补贴
+     */
+    private BigDecimal wxSubsidy;
+
+    /**
+     * 支付宝活动补贴
+     */
+    private BigDecimal aliSubsidy;
+
+    /**
+     * 银联活动补贴
+     */
+    private BigDecimal bankSubsidy;
+
+    /**
+     * 实际到账
+     */
+    private BigDecimal allInAccount;
+
+    /**
+     * 微信实际到账
+     */
+    private BigDecimal wxInAccount;
+
+    /**
+     * 支付宝实际到账
+     */
+    private BigDecimal aliInAccount;
+
+    /**
+     * 银联实际到账
+     */
+    private BigDecimal bankInAccount;
+
+    /**
+     * 现金实际到账
+     */
+    private BigDecimal inCashInAccount;
+
+    /**
+     * 手续费
+     */
+    private BigDecimal allServiceCharge;
+
+    /**
+     * 微信手续费
+     */
+    private BigDecimal wxServiceCharge;
+
+    /**
+     * 支付宝手续费
+     */
+    private BigDecimal aliServiceCharge;
+
+    /**
+     * 银联手续费
+     */
+    private BigDecimal bankServiceCharge;
+
+    /**
+     * 账单名称
+     */
+    private String billName;
+
+    /**
+     * 起始时间
+     */
+    private Date startDate;
+
+    /**
+     * 截止时间
+     */
+    private Date endDate;
+
+    /**
+     * 员工名称
+     */
+    private String staffName;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/BusinessInfoVo.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/BusinessInfoVo.java
new file mode 100644
index 0000000..4fb3e50
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/BusinessInfoVo.java
@@ -0,0 +1,53 @@
+package cn.pluss.platform.vo;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+@Data
+@Accessors(chain = true)
+public class BusinessInfoVo {
+
+    private Integer userId;
+
+    /**
+     * 来自表user_info
+     */
+    @NotNull(message = "登录账号不能为空")
+    private String loginName;
+
+    /**
+     * 来自user_info
+     */
+    @NotNull(message = "手机号不能为空")
+    private String phone;
+    /**
+     * 来自表 user_app
+     */
+    private String userName;
+
+    /**
+     * 状态：1是有效，0是无效，-1是删除
+     */
+    private Integer status;
+
+    /** 密码*/
+    private String password;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private String userType;
+    /**
+     * 归属超级代理商名称
+     */
+    private String agentName;
+    /**
+     * 归属超级代理商ID
+     */
+    private Integer agentId;
+
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/BusinessLicenseVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/BusinessLicenseVO.java
new file mode 100644
index 0000000..9aca24b
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/BusinessLicenseVO.java
@@ -0,0 +1,63 @@
+package cn.pluss.platform.vo;
+
+import java.util.List;
+
+import cn.pluss.platform.entity.MerchantBaseInfo;
+import cn.pluss.platform.entity.MerchantImage;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author yuchen
+ *
+ * @Description
+ */
+@Data
+public class BusinessLicenseVO {
+
+    @ApiModelProperty(value = "营业执照号码")
+    private String bussAuthNum;
+
+    @ApiModelProperty(value = "营业执照名称/商户名称")
+    private String bussAuthName;
+
+    @ApiModelProperty(value = "营业执照上的名字")
+    private String principalPerson;
+
+    @ApiModelProperty(value = "营业执照上的地址/注册地址")
+    private String bussAuthAddress;
+
+    @ApiModelProperty(value = "营业执照注册开始时间")
+    private String bussAuthStartTime;
+
+    @ApiModelProperty(value = "营业执照有效期结束时间")
+    private String bussAuthEndTime;
+
+    @ApiModelProperty(value = "营业执照地址")
+    private String businessLicensePic;
+
+    private String type;
+
+    private String typeCode;
+
+    private String typeDesc;
+
+
+    public static BusinessLicenseVO convertMerchantBaseInfo(MerchantBaseInfo merchantBaseInfo, List<MerchantImage> list) {
+        BusinessLicenseVO vo = new BusinessLicenseVO();
+        vo.setBussAuthAddress(merchantBaseInfo.getBussAuthAddress());
+        vo.setBussAuthStartTime(merchantBaseInfo.getBussAuthStartTime());
+        vo.setBussAuthEndTime(merchantBaseInfo.getBussAuthEndTime());
+        vo.setBussAuthNum(merchantBaseInfo.getBussAuthNum());
+        vo.setBussAuthName(merchantBaseInfo.getBussAuthName());
+        vo.setPrincipalPerson(merchantBaseInfo.getPrincipalPerson());
+        vo.setType(merchantBaseInfo.getBuslicType());
+        for (MerchantImage merchantImage : list) {
+            if ("03".equals(merchantImage.getPhotoType())) {
+                vo.setBusinessLicensePic(merchantImage.getPicUrl());
+            }
+        }
+        return vo;
+    }
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/ChannelStatusVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/ChannelStatusVO.java
new file mode 100644
index 0000000..26cfda8
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/ChannelStatusVO.java
@@ -0,0 +1,41 @@
+package cn.pluss.platform.vo;
+
+import cn.pluss.platform.entity.MerchantChannelStatus;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 进件记录vo
+ * @author djh
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ChannelStatusVO extends MerchantChannelStatus {
+
+    /**
+     * 是否具备快速到账的权限
+     */
+    @TableField(exist = false)
+    private Boolean hasQuickCash;
+
+    /**
+     * 签约链接
+     */
+    @TableField(exist = false)
+    private String signUrl;
+
+    public String getSignUrl() {
+        JSONObject extra = getExtra();
+        if (signUrl != null) {
+            return signUrl;
+        }
+
+        if (extra != null) {
+            signUrl = extra.getString("signUrl");
+        }
+
+        return signUrl;
+    }
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/DeviceDetailVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/DeviceDetailVO.java
new file mode 100644
index 0000000..bc2f34a
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/DeviceDetailVO.java
@@ -0,0 +1,59 @@
+package cn.pluss.platform.vo;
+
+import cn.pluss.platform.entity.DeviceDetail;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+
+/**
+ * @author SSS
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class DeviceDetailVO extends DeviceDetail {
+
+    /**
+     * 该字段与unitPrice等价，app接口使用的字段为price
+     */
+    private BigDecimal price;
+
+    private String name;
+
+    private String value;
+
+    /**
+     * 全部库存，暂未用到
+     */
+    private Long totalCount;
+
+    /**
+     * 已售总数
+     */
+    private Long totalSold;
+
+    /**
+     * 剩余库存
+     */
+    private Long stockNum;
+
+    @Override
+    public DeviceDetail setUnitPrice(BigDecimal unitPrice) {
+        setPrice(unitPrice);
+        return super.setUnitPrice(unitPrice);
+    }
+
+    @Override
+    public DeviceDetail setTypeDesc(String typeDesc) {
+        setName(typeDesc);
+        return super.setTypeDesc(typeDesc);
+    }
+
+    @Override
+    public DeviceDetail setType(String type) {
+        setValue(type);
+        return super.setType(type);
+    }
+
+
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/DeviceGoodsVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/DeviceGoodsVO.java
new file mode 100644
index 0000000..2b2c245
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/DeviceGoodsVO.java
@@ -0,0 +1,27 @@
+package cn.pluss.platform.vo;
+
+import cn.pluss.platform.entity.DeviceGoods;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author DJH
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class DeviceGoodsVO extends DeviceGoods {
+
+    private List<DeviceDetailVO> typeList = new ArrayList<>();
+
+    private DeviceDetailVO currentType;
+
+    private BigDecimal unitPrice;
+
+    private Long userId;
+
+    private Long num;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/DeviceMerchantBuyDetailVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/DeviceMerchantBuyDetailVO.java
new file mode 100644
index 0000000..88688bc
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/DeviceMerchantBuyDetailVO.java
@@ -0,0 +1,50 @@
+package cn.pluss.platform.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @author yuchen
+ * 
+ * @Description 
+ */
+public class DeviceMerchantBuyDetailVO {
+	
+	@ApiModelProperty(value="订单号")
+	private String orderNo;
+	
+	@ApiModelProperty(value="唯一识别码")
+	private String soleCode;
+	
+	@ApiModelProperty(value="激活状态")
+	private String status;
+
+	public String getOrderNo() {
+		return orderNo;
+	}
+
+	public void setOrderNo(String orderNo) {
+		this.orderNo = orderNo;
+	}
+
+	public String getSoleCode() {
+		return soleCode;
+	}
+
+	public void setSoleCode(String soleCode) {
+		this.soleCode = soleCode;
+	}
+
+	public String getStatus() {
+		return status;
+	}
+
+	public void setStatus(String status) {
+		this.status = status;
+	}
+
+	
+	
+	
+
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/DeviceMerchantBuyVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/DeviceMerchantBuyVO.java
new file mode 100644
index 0000000..2c097d6
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/DeviceMerchantBuyVO.java
@@ -0,0 +1,93 @@
+package cn.pluss.platform.vo;
+
+import java.util.Date;
+import java.util.List;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * @author yuchen
+ * 
+ * @Description 
+ */
+@Data
+public class DeviceMerchantBuyVO {
+	
+	@ApiModelProperty(value="订单号")
+	private String orderNo;
+	
+	@ApiModelProperty(value="单价")
+	private Double unitPrice;
+	
+	@ApiModelProperty(value="soleCode集合")
+	private List<DeviceMerchantBuyDetailVO> soleCodeList;
+	
+	@ApiModelProperty(value="商户订单号")
+	private String transNo;
+	
+	@ApiModelProperty(value="订单金额")
+	private Double orderAmount;
+	
+	@ApiModelProperty(value="数量")
+	private Integer quantity;
+	
+	@ApiModelProperty(value="商户名称")
+	private String merchantName;
+	
+	@ApiModelProperty(value="厂家型号")
+	private String venderModel;
+	
+	@ApiModelProperty(value="支付方式Code")
+	private String payCode;
+	
+	@ApiModelProperty(value="支付方式名称")
+	private String payName;
+	
+	@ApiModelProperty(value="订单创建时间")
+	@JSONField(format = "yyyy-MM-dd HH:mm:ss")
+	private Date createDt;
+	
+	@ApiModelProperty(value="订单支付完成时间")
+	@JSONField(format = "yyyy-MM-dd HH:mm:ss")
+	private Date transDt;
+	
+	@ApiModelProperty(value="省市区")
+	private String provinces;
+	
+	@ApiModelProperty(value="详细地址")
+	private String address;
+	
+	@ApiModelProperty(value="联系人姓名")
+	private String linkName;
+	
+	@ApiModelProperty(value="联系人手机号")
+	private String linkPhone;
+	
+	@ApiModelProperty(value="快递单号")
+	private String expressNo;
+	
+	@ApiModelProperty(value="设备名称")
+	private String name;
+	
+	@ApiModelProperty(value="设备图片")
+	private String deviceLogo;
+	
+	@ApiModelProperty(value="厂家名称")
+	private String venderName;
+	
+	@ApiModelProperty(value="通道机器型号")
+	private String aisleModel;
+	
+	@ApiModelProperty(value="设备简介")
+	private String introDesc;
+
+	/** 激活状态 */
+	private String status;
+
+	/** 订单类型，1：为押金购买；2：普通购买 */
+	private String orderType;
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/DeviceNumVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/DeviceNumVO.java
new file mode 100644
index 0000000..92b2a43
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/DeviceNumVO.java
@@ -0,0 +1,35 @@
+package cn.pluss.platform.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * TODO
+ * 设备数量VO
+ * @author crystal
+ * @date 2022/4/1 16:43
+ */
+@Data
+public class DeviceNumVO {
+
+    /**
+     * 总设备数
+     */
+    private Integer totalDeviceNum;
+
+    /**
+     * 已绑定数量
+     */
+    private Integer totalBindNum;
+
+    /**
+     * 未绑定设备数量
+     */
+    private Integer totalUnbindNum;
+
+    /**
+     * 详情
+     */
+    private List<DeviceStockVO> list;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/DeviceOperateInfoVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/DeviceOperateInfoVO.java
new file mode 100644
index 0000000..d28f3b8
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/DeviceOperateInfoVO.java
@@ -0,0 +1,55 @@
+package cn.pluss.platform.vo;
+
+import cn.pluss.platform.entity.DeviceOperateInfo;
+import cn.pluss.platform.enums.DeviceOperateType;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * TODO
+ * 设备流转状态VO封装
+ * @author crystal
+ * @date 2022/4/2 16:35
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class DeviceOperateInfoVO extends DeviceOperateInfo {
+
+    private String userName;
+
+    private String merchantName;
+
+    private String phone;
+
+    private String desc;
+
+    private String typeDesc;
+
+    public String getTypeDesc() {
+        return DeviceOperateType.getNameByCode(this.getType());
+    }
+
+    public String getDesc() {
+        String type = this.getType();
+        if(DeviceOperateType.IN.getCode().equals(type)){
+            this.desc = "收银呗设备入库";
+        }
+        if(DeviceOperateType.TRANSFER.getCode().equals(type)){
+            this.desc = this.getRemark();
+        }
+        if(DeviceOperateType.RECEIVE.getCode().equals(type)){
+            this.desc = this.getUserName() + "(<span style='color:#1296DB'>"+this.getPhone()+"</span>)已接收";
+        }
+        if(DeviceOperateType.BIND.getCode().equals(type)){
+            this.desc = this.getUserName()+"绑定此设备至" + "【"+this.getMerchantName()+"】店铺";
+        }
+        if(DeviceOperateType.UNBIND.getCode().equals(type)){
+            this.desc = this.getUserName()+"从" + "【"+this.getMerchantName()+"】店铺解绑";
+        }
+        if(DeviceOperateType.BUY.getCode().equals(type)){
+            this.desc = this.getUserName()+"(<span style='color:#1296DB'>"+this.getPhone()+"</span>)" + "从设备商城中购买此设备";
+        }
+        return "<span style='color:#E79731'>" + getTypeDesc() + ": " + "</span>" + this.desc;
+    }
+
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/DeviceStockVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/DeviceStockVO.java
new file mode 100644
index 0000000..5a9689a
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/DeviceStockVO.java
@@ -0,0 +1,98 @@
+package cn.pluss.platform.vo;
+
+import cn.pluss.platform.entity.DeviceStock;
+import cn.pluss.platform.util.StringUtil;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class DeviceStockVO extends DeviceStock {
+
+    private String groupNoDesc;
+
+    private String codeDesc;
+
+    private String typeDesc;
+
+    private String statusDesc;
+
+    /**
+     * 总数量
+     */
+    private Integer totalNum;
+
+    /**
+     * 绑定数量
+     */
+    private Integer bindNum;
+
+    /**
+     * 未绑定数量
+     */
+    private Integer unbindNum;
+
+    private String deviceName;
+
+    private String deviceLogo;
+
+    /**
+     * 划拨状态描述01:表示待接收
+     */
+    private String transferStatusDesc;
+
+    /**
+     * 提货人
+     */
+    private String extractName;
+
+    /**
+     * 提货人手机号
+     */
+    private String extractPhone;
+
+    /**
+     * 持有人
+     */
+    private String belongName;
+
+    /**
+     * 持有人手机号
+     */
+    private String belongPhone;
+
+    /**
+     * 商户手机号
+     */
+    private String mercPhone;
+
+    private String cashPlaceName;
+
+    /**
+     * 付款码标签
+     */
+    private Boolean payCodeFlag;
+
+    public String getStatusDesc() {
+        String status = this.getStatus();
+        if("3".equals(status)){
+            this.statusDesc = this.getActMercName();
+        }else{
+            this.statusDesc = "未绑定";
+        }
+        return statusDesc;
+    }
+
+    public String getTransferStatusDesc() {
+        String tStatus = StringUtil.isEmpty(this.getTransferStatus()) ? "" : this.getTransferStatus();
+        switch (tStatus){
+            case "01":
+                this.transferStatusDesc = "待接收";
+                break;
+            default:
+                this.transferStatusDesc = "";
+        }
+        return transferStatusDesc;
+    }
+
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/DeviceTransferDetailVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/DeviceTransferDetailVO.java
new file mode 100644
index 0000000..378e277
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/DeviceTransferDetailVO.java
@@ -0,0 +1,41 @@
+package cn.pluss.platform.vo;
+
+import cn.pluss.platform.entity.DeviceTransferDetail;
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * TODO
+ * 设备划拨详情参数封装
+ * @author crystal
+ * @date 2022/4/1 15:28
+ */
+@Data
+public class DeviceTransferDetailVO extends DeviceTransferDetail {
+
+    /**
+     * 设备编号
+     */
+    private String snNo;
+
+    /**
+     * 绑定状态描述 如果未绑定 显示未绑定 如果绑定 显示绑定商户名称
+     */
+    private String bindDesc;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 入库时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private Date inStockTime;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/DeviceTransferVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/DeviceTransferVO.java
new file mode 100644
index 0000000..2c3f347
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/DeviceTransferVO.java
@@ -0,0 +1,64 @@
+package cn.pluss.platform.vo;
+
+import cn.pluss.platform.entity.DeviceTransfer;
+import cn.pluss.platform.util.StringUtil;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+/**
+ * TODO
+ * 设备划拨记录返回参数封装
+ * @author crystal
+ * @date 2022/4/1 15:02
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class DeviceTransferVO extends DeviceTransfer {
+
+    /**
+     * 划拨人名称
+     */
+    private String acceptName;
+
+    /**
+     * 接受人手机号
+     */
+    private String acceptPhone;
+
+    /**
+     * 绑定描述
+     */
+    private String bindDesc;
+
+    /**
+     * 划出用户名称
+     */
+    private String userName;
+
+    /**
+     * 划出用户手机号
+     */
+    private String phone;
+
+    /**
+     * 设备划拨详情
+     */
+    private List<DeviceTransferDetailVO> detailList;
+
+
+    public String getUserName() {
+        if(StringUtil.isEmpty(this.userName)){
+            this.userName = "收银呗";
+        }
+        return userName;
+    }
+
+    public String getPhone() {
+        if(StringUtil.isEmpty(this.phone)){
+            this.phone = "4006752070";
+        }
+        return phone;
+    }
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/DeviceVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/DeviceVO.java
new file mode 100644
index 0000000..f378797
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/DeviceVO.java
@@ -0,0 +1,48 @@
+package cn.pluss.platform.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author yuchen
+ *
+ * @Description 
+ */
+@Data
+public class DeviceVO {
+		
+	private Integer id;
+
+	@ApiModelProperty(value="设备名称")
+	private String name;
+
+	@ApiModelProperty(value="设备图片")
+	private String deviceLogo;
+
+	@ApiModelProperty(value="商家名称")
+	private String merchantName;
+
+	@ApiModelProperty(value="简介")
+	private String introDesc;
+
+	@ApiModelProperty(value="厂家型号")
+	private String venderModel;
+
+	@ApiModelProperty(value="状态")
+	private String status;
+
+	private String soleCode;
+
+	@ApiModelProperty(value="订单号")
+	private String  orderNo;
+
+	@ApiModelProperty(value="创建时间")
+	private Date createDt;
+
+	private String alias;
+
+	private Long userId;
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/FansConsumVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/FansConsumVO.java
new file mode 100644
index 0000000..2cca2a0
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/FansConsumVO.java
@@ -0,0 +1,124 @@
+package cn.pluss.platform.vo;
+
+import java.util.Date;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * @author yuchen
+ *
+ * @Description
+ */
+public class FansConsumVO {
+
+	private Integer id;
+	private String logo;
+	private String nickName;
+	private Double consumMoney;
+	private String merchantCode;
+	private String merchantName;
+	@DateTimeFormat(pattern = "yyyy-MM-dd hh:mm:ss")
+	private Date consumTime;
+	private String orderNumber;
+	private String lastMerchantName;
+	private String shareMoney;
+	@DateTimeFormat(pattern = "yyyy-MM-dd hh:mm:ss")
+	private Date lastconsumTime;
+	private String lastOrderNumber;
+	private String payWay;
+	private Double aliConsum;
+	private Double wechatConsum;
+	public Integer getId() {
+		return id;
+	}
+	public void setId(Integer id) {
+		this.id = id;
+	}
+	public String getLogo() {
+		return logo;
+	}
+	public void setLogo(String logo) {
+		this.logo = logo;
+	}
+	public String getNickName() {
+		return nickName;
+	}
+	public void setNickName(String nickName) {
+		this.nickName = nickName;
+	}
+	public Double getConsumMoney() {
+		return consumMoney;
+	}
+	public void setConsumMoney(Double consumMoney) {
+		this.consumMoney = consumMoney;
+	}
+	public String getMerchantCode() {
+		return merchantCode;
+	}
+	public void setMerchantCode(String merchantCode) {
+		this.merchantCode = merchantCode;
+	}
+	public String getMerchantName() {
+		return merchantName;
+	}
+	public void setMerchantName(String merchantName) {
+		this.merchantName = merchantName;
+	}
+	public Date getConsumTime() {
+		return consumTime;
+	}
+	public void setConsumTime(Date consumTime) {
+		this.consumTime = consumTime;
+	}
+	public String getOrderNumber() {
+		return orderNumber;
+	}
+	public void setOrderNumber(String orderNumber) {
+		this.orderNumber = orderNumber;
+	}
+	public String getLastMerchantName() {
+		return lastMerchantName;
+	}
+	public void setLastMerchantName(String lastMerchantName) {
+		this.lastMerchantName = lastMerchantName;
+	}
+	public String getShareMoney() {
+		return shareMoney;
+	}
+	public void setShareMoney(String shareMoney) {
+		this.shareMoney = shareMoney;
+	}
+	public Date getLastconsumTime() {
+		return lastconsumTime;
+	}
+	public void setLastconsumTime(Date lastconsumTime) {
+		this.lastconsumTime = lastconsumTime;
+	}
+	public String getLastOrderNumber() {
+		return lastOrderNumber;
+	}
+	public void setLastOrderNumber(String lastOrderNumber) {
+		this.lastOrderNumber = lastOrderNumber;
+	}
+	public String getPayWay() {
+		return payWay;
+	}
+	public void setPayWay(String payWay) {
+		this.payWay = payWay;
+	}
+	public Double getAliConsum() {
+		return aliConsum;
+	}
+	public void setAliConsum(Double aliConsum) {
+		this.aliConsum = aliConsum;
+	}
+	public Double getWechatConsum() {
+		return wechatConsum;
+	}
+	public void setWechatConsum(Double wechatConsum) {
+		this.wechatConsum = wechatConsum;
+	}
+	
+	
+
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/FansInfoCountVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/FansInfoCountVO.java
new file mode 100644
index 0000000..bc37c45
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/FansInfoCountVO.java
@@ -0,0 +1,43 @@
+package cn.pluss.platform.vo;
+
+import java.io.Serializable;
+
+public class FansInfoCountVO  implements Serializable{
+
+	/** 
+	* @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么) 
+	*/
+	private static final long serialVersionUID = 1L;
+	
+	/**
+	 * 粉丝消费今日返现总额
+	 */
+	private Double fansReturnMoneyNowDayCount;
+	
+	/**
+	 * 粉丝今日消费总额
+	 */
+	private Double fansConsumMonyNowDayCount;
+
+	public Double getFansReturnMoneyNowDayCount() {
+		return fansReturnMoneyNowDayCount;
+	}
+
+	public void setFansReturnMoneyNowDayCount(Double fansReturnMoneyNowDayCount) {
+		this.fansReturnMoneyNowDayCount = fansReturnMoneyNowDayCount;
+	}
+
+	public Double getFansConsumMonyNowDayCount() {
+		return fansConsumMonyNowDayCount;
+	}
+
+	public void setFansConsumMonyNowDayCount(Double fansConsumMonyNowDayCount) {
+		this.fansConsumMonyNowDayCount = fansConsumMonyNowDayCount;
+	}
+
+	
+
+
+	
+
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/FansSumRewardsInfoVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/FansSumRewardsInfoVO.java
new file mode 100644
index 0000000..e9c2d41
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/FansSumRewardsInfoVO.java
@@ -0,0 +1,54 @@
+package cn.pluss.platform.vo;
+
+import java.io.Serializable;
+
+public class FansSumRewardsInfoVO implements Serializable {
+
+	/** 
+	* @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么) 
+	*/
+	private static final long serialVersionUID = 1L;
+	//今日分润
+	private Double sumNowDayShareMoney;
+	//累计分润
+	private Double sumAllShareMoney;
+	//可提现金额
+	private Double allowCashMoney;
+	//已经提现金额
+	private Double sumAreadlyCash;
+	//不可提现金额
+	private Double noCashMoney;
+	public Double getSumNowDayShareMoney() {
+		return sumNowDayShareMoney;
+	}
+	public void setSumNowDayShareMoney(Double sumNowDayShareMoney) {
+		this.sumNowDayShareMoney = sumNowDayShareMoney;
+	}
+	public Double getSumAllShareMoney() {
+		return sumAllShareMoney;
+	}
+	public void setSumAllShareMoney(Double sumAllShareMoney) {
+		this.sumAllShareMoney = sumAllShareMoney;
+	}
+	public Double getAllowCashMoney() {
+		return allowCashMoney;
+	}
+	public void setAllowCashMoney(Double allowCashMoney) {
+		this.allowCashMoney = allowCashMoney;
+	}
+	public Double getSumAreadlyCash() {
+		return sumAreadlyCash;
+	}
+	public void setSumAreadlyCash(Double sumAreadlyCash) {
+		this.sumAreadlyCash = sumAreadlyCash;
+	}
+	public Double getNoCashMoney() {
+		return noCashMoney;
+	}
+	public void setNoCashMoney(Double noCashMoney) {
+		this.noCashMoney = noCashMoney;
+	}
+	
+	
+
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/IdCardFrontInfoVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/IdCardFrontInfoVO.java
new file mode 100644
index 0000000..4ec1b58
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/IdCardFrontInfoVO.java
@@ -0,0 +1,21 @@
+package cn.pluss.platform.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @author yuchen
+ *
+ * @Description 
+ */
+public class IdCardFrontInfoVO {
+	
+	@ApiModelProperty(value="姓名")
+	private String name;
+	
+	@ApiModelProperty(value="民族")
+	private String nation;
+	
+	
+
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/IdCardVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/IdCardVO.java
new file mode 100644
index 0000000..58906f0
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/IdCardVO.java
@@ -0,0 +1,38 @@
+package cn.pluss.platform.vo;
+
+import java.util.List;
+
+import cn.pluss.platform.entity.BankCard;
+import cn.pluss.platform.entity.IdCard;
+import cn.pluss.platform.entity.MerchantBankCard;
+import cn.pluss.platform.entity.MerchantImage;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author yuchen
+ * 
+ * @Description 
+ */
+@Data
+public class IdCardVO {
+	
+	@ApiModelProperty(value="身份证号码")
+	private String certnum;
+	
+	@ApiModelProperty(value="真实姓名")
+	private String realName;
+	
+	@ApiModelProperty(value="身份证有效期开始时间")
+	private String certStartTime;
+	
+	@ApiModelProperty(value="身份证有效期结束时间")
+	private String certPeriod;
+	
+	@ApiModelProperty(value="身份证正面照")
+	private String certFullPhoto;
+	
+	@ApiModelProperty(value="身份证反面照")
+	private String certBacKPhoto;
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/Image.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/Image.java
new file mode 100644
index 0000000..7b69676
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/Image.java
@@ -0,0 +1,10 @@
+package cn.pluss.platform.vo;
+
+import lombok.Data;
+
+@Data
+public class Image {
+	private String base64;
+	private String visitUrl;
+	private String press;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/Images.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/Images.java
new file mode 100644
index 0000000..9341ddb
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/Images.java
@@ -0,0 +1,10 @@
+package cn.pluss.platform.vo;
+
+import lombok.Data;
+
+@Data
+public class Images {
+	private String base64;
+	private String visitUrl;
+	private String press;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/JftMercBaseInfoVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/JftMercBaseInfoVO.java
new file mode 100644
index 0000000..3d44eb9
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/JftMercBaseInfoVO.java
@@ -0,0 +1,12 @@
+package cn.pluss.platform.vo;
+
+import cn.pluss.platform.entity.JftMercBaseInfo;
+import com.alibaba.fastjson.annotation.JSONType;
+import lombok.Getter;
+import lombok.Setter;
+
+@Setter
+@Getter
+@JSONType(ignores = {"id", "userId", "addressNo"})
+public class JftMercBaseInfoVO extends JftMercBaseInfo {
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/JftMercPaymentChannelVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/JftMercPaymentChannelVO.java
new file mode 100644
index 0000000..1eb35c0
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/JftMercPaymentChannelVO.java
@@ -0,0 +1,25 @@
+package cn.pluss.platform.vo;
+
+import cn.pluss.platform.entity.JftMercPaymentChannel;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.annotation.JSONType;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 银盛一码多户的商户进件记录
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-06-15
+ */
+@JSONType(ignores = {"id", "userId", "merchantId", "thirdStatus", "extra", "mercName"})
+public class JftMercPaymentChannelVO extends JftMercPaymentChannel {
+
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/JftReceiptInfoVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/JftReceiptInfoVO.java
new file mode 100644
index 0000000..c983c8b
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/JftReceiptInfoVO.java
@@ -0,0 +1,46 @@
+package cn.pluss.platform.vo;
+
+import cn.pluss.platform.entity.JftReceiptInfo;
+import cn.pluss.platform.entity.JftReceiptOrder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * TODO
+ * 缴费通收款单返回参数封装
+ * @author crystal
+ * @date 2022/6/16 16:15
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class JftReceiptInfoVO extends JftReceiptInfo {
+
+    /**
+     * 支付人数
+     */
+    private Integer payNum;
+
+    /**
+     * 收款总额
+     */
+    private BigDecimal totalAmount;
+    /**
+     * 支付状态描述
+     */
+    private String payStatusDesc;
+
+
+    /**
+     * 缴费通集合
+     */
+    private List<JftReceiptOrder> orderList;
+
+    /**
+     * 必填配置项code
+     */
+    private List<String> paymentCodeList;
+
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/JftReceiptOrderVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/JftReceiptOrderVO.java
new file mode 100644
index 0000000..5bb6bc2
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/JftReceiptOrderVO.java
@@ -0,0 +1,31 @@
+package cn.pluss.platform.vo;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * TODO
+ * 缴费通VO参数封装类
+ * @author crystal
+ * @date 2022/7/1 23:15
+ */
+@Data
+public class JftReceiptOrderVO {
+
+    private String projectName;
+
+    private BigDecimal orderAmt;
+
+    private String payStatusDesc;
+
+    private String orderNumber;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/LeshuaBillDetailsVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/LeshuaBillDetailsVO.java
new file mode 100644
index 0000000..5e76d01
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/LeshuaBillDetailsVO.java
@@ -0,0 +1,191 @@
+package cn.pluss.platform.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @author yuchen
+ * 
+ * @Description 
+ */
+public class LeshuaBillDetailsVO {
+	
+	@ApiModelProperty(value="单号")
+	private String billId;
+	
+	@ApiModelProperty(value="创建时间")
+	private String createTime;
+	
+	@ApiModelProperty(value="商户号")
+	private String merchantId;
+	
+	@ApiModelProperty(value="应付金额（单位：0.01元）")
+	private Double planAmount;
+	
+	@ApiModelProperty(value="止付金额（单位：0.01元）")
+	private Double suspendAmount;
+	
+	@ApiModelProperty(value="实付金额（单位：0.01元）")
+	private Double realAmount;
+	
+	@ApiModelProperty(value="状态： -1：打款失败； 0：打款中； 1：打款成功； 2：打款退票； 3：冻结出款；")
+	private String state;
+	
+	@ApiModelProperty(value="失败原因")
+	private String failReason;
+	
+	@ApiModelProperty(value="备注： D1打款退票会重新生成一条打款单，财务会根据新生成打款单打款，此时通知时则通过remark字段来关联上次的打款单号，如果再次发生退票，则再重新打款，remark每次只关联上一笔打款单号")
+	private String remark;
+	
+	@ApiModelProperty(value="打款单是否是重新生成的；0：否 1：是 （D0无该字段）")
+	private String recreateFlag;
+	
+	@ApiModelProperty(value="结算类型（D1,D0）")
+	private String settType;
+	
+	@ApiModelProperty(value="结算日期")
+	private String settDate;
+	
+	@ApiModelProperty(value="非终态：“此类打款单打款成功仅代表转出成功，不等于最终到账成功。”终态：“此类打款单打款成功，即最终到账成功")
+	private String tag;
+	
+	@ApiModelProperty(value="打款单更新时间")
+	private String bankretTime;
+	
+	@ApiModelProperty(value="开户账号")
+	private String bankAccount;
+	
+	@ApiModelProperty(value="开户名")
+	private String bankHolder;
+
+	public String getBillId() {
+		return billId;
+	}
+
+	public void setBillId(String billId) {
+		this.billId = billId;
+	}
+
+	public String getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(String createTime) {
+		this.createTime = createTime;
+	}
+
+	public String getMerchantId() {
+		return merchantId;
+	}
+
+	public void setMerchantId(String merchantId) {
+		this.merchantId = merchantId;
+	}
+
+	public Double getSuspendAmount() {
+		return suspendAmount;
+	}
+
+	public void setSuspendAmount(Double suspendAmount) {
+		this.suspendAmount = suspendAmount;
+	}
+
+	public Double getRealAmount() {
+		return realAmount;
+	}
+
+	public void setRealAmount(Double realAmount) {
+		this.realAmount = realAmount;
+	}
+
+	public String getState() {
+		return state;
+	}
+
+	public void setState(String state) {
+		this.state = state;
+	}
+
+	public String getFailReason() {
+		return failReason;
+	}
+
+	public void setFailReason(String failReason) {
+		this.failReason = failReason;
+	}
+
+	public String getRecreateFlag() {
+		return recreateFlag;
+	}
+
+	public void setRecreateFlag(String recreateFlag) {
+		this.recreateFlag = recreateFlag;
+	}
+
+	public String getSettType() {
+		return settType;
+	}
+
+	public void setSettType(String settType) {
+		this.settType = settType;
+	}
+
+	public String getTag() {
+		return tag;
+	}
+
+	public void setTag(String tag) {
+		this.tag = tag;
+	}
+
+	public String getSettDate() {
+		return settDate;
+	}
+
+	public void setSettDate(String settDate) {
+		this.settDate = settDate;
+	}
+
+	public String getBankretTime() {
+		return bankretTime;
+	}
+
+	public void setBankretTime(String bankretTime) {
+		this.bankretTime = bankretTime;
+	}
+
+	public String getBankAccount() {
+		return bankAccount;
+	}
+
+	public void setBankAccount(String bankAccount) {
+		this.bankAccount = bankAccount;
+	}
+
+	public Double getPlanAmount() {
+		return planAmount;
+	}
+
+	public void setPlanAmount(Double planAmount) {
+		this.planAmount = planAmount;
+	}
+
+	public String getRemark() {
+		return remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
+	public String getBankHolder() {
+		return bankHolder;
+	}
+
+	public void setBankHolder(String bankHolder) {
+		this.bankHolder = bankHolder;
+	}
+	
+	
+
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/LeshuaBillsVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/LeshuaBillsVO.java
new file mode 100644
index 0000000..f14dffd
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/LeshuaBillsVO.java
@@ -0,0 +1,62 @@
+package cn.pluss.platform.vo;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @author yuchen
+ *
+ * @Description 
+ * 乐刷账单返回vo
+ */
+public class LeshuaBillsVO {
+	
+	@ApiModelProperty(value="当前页")
+	private Integer pageNo;
+	
+	@ApiModelProperty(value="每一页的条数")
+	private Integer pageSize;
+	
+	@ApiModelProperty(value="详情")
+	private List<LeshuaBillDetailsVO> leshuaBillDetailsVOList;
+	
+	@ApiModelProperty(value="总页数")
+	private Integer totalCount;
+
+	public Integer getPageNo() {
+		return pageNo;
+	}
+
+	public void setPageNo(Integer pageNo) {
+		this.pageNo = pageNo;
+	}
+
+	public Integer getPageSize() {
+		return pageSize;
+	}
+
+	public Integer getTotalCount() {
+		return totalCount;
+	}
+
+	public void setTotalCount(Integer totalCount) {
+		this.totalCount = totalCount;
+	}
+
+	public void setPageSize(Integer pageSize) {
+		this.pageSize = pageSize;
+	}
+
+	public List<LeshuaBillDetailsVO> getLeshuaBillDetailsVOList() {
+		return leshuaBillDetailsVOList;
+	}
+
+	public void setLeshuaBillDetailsVOList(List<LeshuaBillDetailsVO> leshuaBillDetailsVOList) {
+		this.leshuaBillDetailsVOList = leshuaBillDetailsVOList;
+	}
+	
+	
+
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/LeshuaMerchantInfoVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/LeshuaMerchantInfoVO.java
new file mode 100644
index 0000000..fb8475a
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/LeshuaMerchantInfoVO.java
@@ -0,0 +1,82 @@
+package cn.pluss.platform.vo;
+
+import cn.pluss.platform.entity.UserApp;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author yuchen
+ *
+ * @Description 
+ */
+@Data
+public class LeshuaMerchantInfoVO {
+	
+	@ApiModelProperty(value="当前用户userId")
+	private Long userId;
+	
+	@ApiModelProperty(value="所属商户经营类目编码")
+	private String mccCode;
+	
+	@ApiModelProperty(value="所属商户经营类目名称")
+	private String mccName;
+	
+	@ApiModelProperty(value="商户简称")
+	private String merchantName;
+	
+	@ApiModelProperty(value="联系人号码")
+	private String contactPhone;
+	
+	@ApiModelProperty(value="联系人名称")
+	private String contactName;
+	
+	@ApiModelProperty(value="乐刷商户地址")
+	private String leshuaMerchantAddress;
+	
+	@ApiModelProperty(value="商户具体地址")
+	private String merchantDetailAddress;
+	
+	@ApiModelProperty(value="营业执照号")
+	private String bussAuthNum;
+	
+	@ApiModelProperty(value="营业执照有效期")
+	private String bussAuthPeriod;
+	
+	@ApiModelProperty(value="营业执照名称")
+	private String leshuaLicenseName;
+	
+	@ApiModelProperty(value="营业执照开始时间")
+	private String licenseStart;
+	
+	@ApiModelProperty(value="银行卡照片")
+	private String bankPhoto;
+	
+	@ApiModelProperty(value="银行名称")
+	private String bankName;
+	
+	@ApiModelProperty(value="银行卡号")
+	private String bankNo;
+	
+	@ApiModelProperty(value="开户地区")
+	private String bankAddress;
+	
+	@ApiModelProperty(value="开户支行")
+	private String bankBranch;
+	
+	@ApiModelProperty(value="联行号")
+	private String unionpay;
+	
+	@ApiModelProperty(value="营业执照图片")
+	private String  businessLicensePic;
+	
+	@ApiModelProperty(value="店铺门头照图片")
+	private String shopSignBoardPic;
+	
+	@ApiModelProperty(value="店内环境照片")
+	private String indoorPic;
+	
+	@ApiModelProperty(value="收银台照片")
+	private String cashierDeskPic;
+
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MccFatherVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MccFatherVO.java
new file mode 100644
index 0000000..c459bb0
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MccFatherVO.java
@@ -0,0 +1,54 @@
+package cn.pluss.platform.vo;
+
+import cn.pluss.platform.vo.MccVO;
+
+import java.util.List;
+
+/**
+ * @author yuchen
+ * 
+ * @Description 
+ * 
+ */
+public class MccFatherVO {
+	
+	/**
+	 * 对应数据库字段F_father_code
+	 */
+	private String fatherCode;
+	
+	/**
+	 * 对应数据库字段F_father_txt
+	 */
+	private String fatherName;
+	
+	private List<MccVO> mccList;
+
+	public String getFatherCode() {
+		return fatherCode;
+	}
+
+	public void setFatherCode(String fatherCode) {
+		this.fatherCode = fatherCode;
+	}
+
+	public String getFatherName() {
+		return fatherName;
+	}
+
+	public void setFatherName(String fatherName) {
+		this.fatherName = fatherName;
+	}
+
+	public List<MccVO> getMccList() {
+		return mccList;
+	}
+
+	public void setMccList(List<MccVO> mccList) {
+		this.mccList = mccList;
+	}
+	
+	
+
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MccGrandpaVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MccGrandpaVO.java
new file mode 100644
index 0000000..9cfdfa2
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MccGrandpaVO.java
@@ -0,0 +1,50 @@
+package cn.pluss.platform.vo;
+
+import java.util.List;
+
+/**
+ * @author yuchen
+ *
+ * @Description 
+ * 表mcc_info
+ */
+public class MccGrandpaVO {
+	
+	/**
+	 * 对应数据库字段F_grandpa_code
+	 */
+	private String grandpaCode;
+	
+	/**
+	 * 对应数据库字段F_grandpa_txt
+	 */
+	private String grandpaName;
+	
+	private List<MccFatherVO>  mccFatherList;
+
+	public String getGrandpaCode() {
+		return grandpaCode;
+	}
+
+	public void setGrandpaCode(String grandpaCode) {
+		this.grandpaCode = grandpaCode;
+	}
+
+	public String getGrandpaName() {
+		return grandpaName;
+	}
+
+	public void setGrandpaName(String grandpaName) {
+		this.grandpaName = grandpaName;
+	}
+
+	public List<MccFatherVO> getMccFatherList() {
+		return mccFatherList;
+	}
+
+	public void setMccFatherList(List<MccFatherVO> mccFatherList) {
+		this.mccFatherList = mccFatherList;
+	}
+
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MccReflectVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MccReflectVO.java
new file mode 100644
index 0000000..8ca5b37
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MccReflectVO.java
@@ -0,0 +1,38 @@
+package cn.pluss.platform.vo;
+
+import cn.pluss.platform.entity.MccReflect;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * @author SSS
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class MccReflectVO extends MccReflect {
+
+    /**
+     * 随行付mcc描述
+     */
+    private String sxfMccDesc;
+
+    /**
+     * 瑞银信mcc编码
+     */
+    private String ryxMcc;
+
+    /**
+     * 瑞银信mcc描述
+     */
+    private String ryxMccDesc;
+
+    /**
+     * 银盛mcc编码
+     */
+    private String ysMcc;
+
+    /**
+     * 银盛mcc描述
+     */
+    private String ysMccDesc;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MccVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MccVO.java
new file mode 100644
index 0000000..43c0a99
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MccVO.java
@@ -0,0 +1,33 @@
+package cn.pluss.platform.vo;
+
+/**
+ * @author yuchen
+ *
+ * @Description 
+ */
+public class MccVO {
+	
+	private String mccCode;
+	
+	private String mccName;
+
+	public String getMccCode() {
+		return mccCode;
+	}
+
+	public void setMccCode(String mccCode) {
+		this.mccCode = mccCode;
+	}
+
+	public String getMccName() {
+		return mccName;
+	}
+
+	public void setMccName(String mccName) {
+		this.mccName = mccName;
+	}
+	
+	
+
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MemberOrderNumberVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MemberOrderNumberVO.java
new file mode 100644
index 0000000..47d6398
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MemberOrderNumberVO.java
@@ -0,0 +1,36 @@
+package cn.pluss.platform.vo;
+
+import java.util.List;
+
+import cn.pluss.platform.entity.MemberOrder;
+import lombok.Data;
+
+/**
+ * @author DJH
+ */
+@Data
+public class MemberOrderNumberVO {
+	
+	private List<MemberOrder> memberOrderList;
+
+	/**
+	 * 消费总金额
+	 */
+	private String orderCount;
+
+	/**
+	 * 充值3笔数
+	 */
+	private String chargeCount;
+
+	/**
+	 * 消费笔数
+	 */
+	private String consumeCount;
+
+	/**
+	 * 充值总金额
+	 */
+	private String totalOrderFee;
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MemberOrderStatisticsVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MemberOrderStatisticsVO.java
new file mode 100644
index 0000000..16fb627
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MemberOrderStatisticsVO.java
@@ -0,0 +1,128 @@
+package cn.pluss.platform.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author Djh
+ */
+@Data
+public class MemberOrderStatisticsVO {
+
+    /**
+     * 结算通道描述
+     */
+    private String merchantChannelType;
+
+    /**
+     * 微信订单数
+     */
+    private Integer wxOrderCount;
+
+    /**
+     * 支付宝订单数
+     */
+    private Integer aliOrderCount;
+
+    /**
+     * 充值总金额
+     */
+    private BigDecimal rechargeSum;
+
+    /**
+     * 截止时间
+     */
+    private Date endDate;
+
+    /**
+     * 会员卡总余额
+     */
+    private BigDecimal memberBalance;
+
+    /**
+     * 银联充值总额
+     */
+    private BigDecimal bankRechargeSum;
+
+    /**
+     * 消费总笔数
+     */
+    private Integer consumeOrderCount;
+
+    /**
+     * 充值送总金额
+     */
+    private BigDecimal rechargeGiveMoney;
+
+    /**
+     * 银联充值订单总笔数
+     */
+    private Integer bankOrderCount;
+
+    /**
+     * 现金充值金额总额
+     */
+    private BigDecimal inCashRechargeSum;
+
+    /**
+     * 现金充值送金额总额
+     */
+    private BigDecimal inCashRechargeGiveMoney;
+
+    /**
+     * 现金充值总笔数
+     */
+    private Integer inCashRechargeOrderCount;
+
+    /**
+     * 消费返总金额
+     */
+    private BigDecimal consumeGiveMoney;
+
+    /**
+     * 充值订单总笔数
+     */
+    private Integer rechargeOrderCount;
+
+    /**
+     * 账单名称, 特定日期或 汇总
+     */
+    private String billName;
+
+    /**
+     * 微信充值送金额
+     */
+    private BigDecimal wxGiveMoney;
+
+    /**
+     * 消费总金额
+     */
+    private BigDecimal consumeSum;
+
+    /**
+     * 微信充值总金额
+     */
+    private BigDecimal wxRechargeSum;
+
+    /**
+     * 支付宝充值送总金额
+     */
+    private BigDecimal aliGiveMoney;
+
+    /**
+     * 银联充值送金额
+     */
+    private BigDecimal bankGiveMoney;
+
+    /**
+     * 支付宝充值总额
+     */
+    private BigDecimal aliRechargeSum;
+
+    /**
+     * 起始时间
+     */
+    private Date startDate;
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MemberOrderVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MemberOrderVO.java
new file mode 100644
index 0000000..c9d2f58
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MemberOrderVO.java
@@ -0,0 +1,99 @@
+package cn.pluss.platform.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 会员账单导出统计的数据
+ * @author Djh
+ */
+@Data
+public class MemberOrderVO {
+
+    /**
+     * 订单类型
+     */
+    private String orderType;
+
+    /**
+     * 赠送/消费返金额
+     */
+    private BigDecimal giveMoney;
+
+    /**
+     * 订单号
+     */
+    private String orderNumber;
+
+    /**
+     * 第三方订单号
+     */
+    private String thirdOrderNo;
+
+    /**
+     * 现金收款金额
+     */
+    private BigDecimal inCashMoney;
+
+    /**
+     * 会员卡当时余额
+     */
+    private BigDecimal memberBalance;
+
+    /**
+     * 订单金额, 充值或消费
+     */
+    private BigDecimal orderFee;
+
+    /**
+     * 创建时间
+     */
+    private Date createDt;
+
+    /**
+     * 交易时间
+     */
+    private Date transDt;
+
+    /**
+     * 手续费
+     */
+    private BigDecimal serviceRecharge;
+
+    /**
+     * 银行卡到账
+     */
+    private BigDecimal cardMoney;
+
+    /**
+     * 支付方式
+     */
+    private String payType;
+
+    /**
+     * 员工名称
+     */
+    private String staffName;
+
+    /**
+     * 消费金额
+     */
+    private BigDecimal consumeFee;
+
+    /**
+     * 会员名称
+     */
+    private String nickName;
+
+    /**
+     * 会员手机号
+     */
+    private String phone;
+
+    /**
+     * 备注
+     */
+    private String remark;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MemberScanVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MemberScanVO.java
new file mode 100644
index 0000000..97ebbbc
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MemberScanVO.java
@@ -0,0 +1,34 @@
+package cn.pluss.platform.vo;
+
+import java.util.Date;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author yuchen
+ * 
+ * @Description 
+ */
+@Data
+public class MemberScanVO {
+	
+	@ApiModelProperty(value="门店名称")
+	private String storeName;
+	
+	@ApiModelProperty(value="操作人名称")
+	private String loginName;
+	
+	@ApiModelProperty(value="消费时间")
+	private Date createDt;
+	
+	@ApiModelProperty(value="消费金额")
+	private String consumeFee;
+
+	@ApiModelProperty("备注")
+	private String remark;
+
+	@ApiModelProperty("订单号")
+	private String orderNumber;
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MercInfoVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MercInfoVO.java
new file mode 100644
index 0000000..55d2caf
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MercInfoVO.java
@@ -0,0 +1,39 @@
+package cn.pluss.platform.vo;
+
+import cn.pluss.platform.entity.JftBankCard;
+import cn.pluss.platform.entity.JftMercBaseInfo;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+/*
+data class MercInfoVO(
+        */
+/** 基本信息 *//*
+
+        var mercBaseInfo: JftMercBaseInfo? = null,
+        */
+/** 银行卡信息 *//*
+
+        var bankCard: JftBankCard? = null,
+        */
+/** 等级 *//*
+
+        var level: String? = null,
+        */
+/** 费率 *//*
+
+        var rate: String? = null,
+)*/
+
+@Data
+@AllArgsConstructor
+public class MercInfoVO {
+
+        private JftMercBaseInfo mercBaseInfo;
+
+        private JftBankCard bankCard;
+
+        private String level;
+
+        private String rate;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MercMemberSetVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MercMemberSetVO.java
new file mode 100644
index 0000000..95112f4
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MercMemberSetVO.java
@@ -0,0 +1,42 @@
+package cn.pluss.platform.vo;
+
+import cn.pluss.platform.converter.Converter;
+import cn.pluss.platform.entity.MercMemberSet;
+import lombok.Getter;
+import lombok.Setter;
+
+@Setter
+@Getter
+public class MercMemberSetVO extends MercMemberSet {
+
+    private String scopeDesc;
+
+    public static MercMemberSetVO toVO(MercMemberSet entity) {
+        MercMemberSetVO vo = Converter.INSTANCE.toVO(entity);
+
+        // 如果没有记录，则标记为老商户的通用配置
+        if (vo == null) {
+            vo = new MercMemberSetVO();
+            vo.setStatus(STATUS_ON);
+            vo.setScope(SCOPE_ALL);
+        }
+
+        if (vo.getScope() == null) {
+            return vo;
+        }
+
+        switch (vo.getScope()) {
+            case SCOPE_OFFLINE:
+                vo.setScopeDesc("线下扫码");
+                break;
+            case SCOPE_ONLINE:
+                vo.setScopeDesc("外卖和扫码点单");
+                break;
+            case SCOPE_ALL:
+                vo.setScopeDesc("全部");
+                break;
+        }
+
+        return vo;
+    }
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MercOrderExpressVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MercOrderExpressVO.java
new file mode 100644
index 0000000..f710f0a
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MercOrderExpressVO.java
@@ -0,0 +1,90 @@
+package cn.pluss.platform.vo;
+
+import cn.pluss.platform.entity.MercOrderExpress;
+import cn.pluss.platform.entity.MercOrderExpressDetail;
+import cn.pluss.platform.enums.LogisticProvider;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+/**
+ * TODO
+ * 物流信息返回实体类封装
+ * @author crystal
+ * @date 2022/3/28 10:59
+ */
+@Data
+@ApiModel("订单物流信息VO")
+@EqualsAndHashCode(callSuper = true)
+public class MercOrderExpressVO extends MercOrderExpress {
+
+    /**
+     * 物流详情
+     */
+    private List<MercOrderExpressDetail> expressDetailList;
+
+    private String statusDesc;
+
+    private String logisticProvider;
+
+    /**
+     * 服务热线
+     */
+    private String serviceTelephone;
+
+
+    /**
+     * 快递物流渠道
+     */
+    private String logisticProviderDesc;
+
+    public String getStatusDesc() {
+        switch (this.getStatus()){
+            case "00":
+                this.statusDesc = "待发货";
+                break;
+            case "01":
+                this.statusDesc = "已接单";
+                break;
+            case "02":
+                this.statusDesc = "已揽收";
+                break;
+            case "03":
+                this.statusDesc = "已收入";
+                break;
+            case "05":
+                this.statusDesc = "已打包";
+                break;
+            case "06":
+                this.statusDesc = "派件中";
+                break;
+            case "07":
+                this.statusDesc = "自提柜入库";
+                break;
+            case "08":
+                this.statusDesc = "已签收";
+                break;
+            case "90":
+                this.statusDesc = "揽收失败";
+                break;
+            case "99":
+                this.statusDesc = "签收失败";
+                break;
+            default:
+                this.statusDesc = "未知";
+                break;
+        }
+        return statusDesc;
+    }
+
+    public String getLogisticProviderDesc() {
+        if (getLogisticProvider() == null) {
+            return "";
+        }
+
+        LogisticProvider values = LogisticProvider.valueOf(this.getLogisticProvider());
+        return values.getDesc();
+    }
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MercOrderNewVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MercOrderNewVO.java
new file mode 100644
index 0000000..bf1e3c8
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MercOrderNewVO.java
@@ -0,0 +1,113 @@
+package cn.pluss.platform.vo;
+
+import cn.pluss.platform.constants.Constant;
+import cn.pluss.platform.entity.MercOrderDetail;
+import cn.pluss.platform.entity.MercOrderNew;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+@Data
+@ApiModel("设备订单信息VO")
+@EqualsAndHashCode(callSuper = true)
+public class MercOrderNewVO extends MercOrderNew {
+
+    /**
+     * 取自订单物流信息表的状态
+     * 物流状态。物流状态 00:待发货 01:已接单 02：已揽收 03：已收入  04：已发出 05：已打包 06：派件中 07：自提柜入库 08：已签收 90：揽收失败 99：签收失败
+     */
+    private String expressStatus;
+
+    private String statusDesc;
+
+    private String expressStatusDesc;
+
+    private String payTypeDesc;
+
+    private String pStatus;
+
+    private List<MercOrderDetail> detailList;
+
+    public String getStatusDesc() {
+        switch (this.getStatus()){
+            case "00":
+                this.statusDesc = "待付款";
+                break;
+            case "01":
+                this.statusDesc = "已付款";
+                break;
+            case "02":
+                this.statusDesc = "已退款";
+                break;
+            case "03":
+                this.statusDesc = "发起退款中";
+                break;
+            case "04":
+                this.statusDesc = "已完成";
+                break;
+            default:
+                this.statusDesc = "未知";
+                break;
+        }
+        return statusDesc;
+    }
+
+//    public String getExpressStatusDesc() {
+//        switch (this.getExpressStatus()){
+//            case "00":
+//                this.expressStatusDesc = "待发货";
+//                break;
+//            case "01":
+//                this.expressStatusDesc = "已接单";
+//                break;
+//            case "02":
+//                this.expressStatusDesc = "已揽收";
+//                break;
+//            case "03":
+//                this.expressStatusDesc = "已收入";
+//                break;
+//            case "05":
+//                this.expressStatusDesc = "已打包";
+//                break;
+//            case "06":
+//                this.expressStatusDesc = "派件中";
+//                break;
+//            case "07":
+//                this.expressStatusDesc = "自提柜入库";
+//                break;
+//            case "08":
+//                this.expressStatusDesc = "已签收";
+//                break;
+//            case "90":
+//                this.expressStatusDesc = "揽收失败";
+//                break;
+//            case "99":
+//                this.expressStatusDesc = "签收失败";
+//                break;
+//            default:
+//                this.expressStatusDesc = "未知";
+//                break;
+//        }
+//        return expressStatusDesc;
+//    }
+
+    public String getPayTypeDesc() {
+        switch (this.getPayType()){
+            case Constant.PAY_TYPE_ALIPAY:
+                this.payTypeDesc = Constant.PAY_TYPE_NAME_ALIPAY;
+                break;
+            case Constant.PAY_TYPE_WECHAT:
+                this.payTypeDesc = Constant.PAY_TYPE_NAME_WECHAT;
+                break;
+            case Constant.PAY_TYPE_YSFPAY:
+                this.payTypeDesc = Constant.PAY_TYPE_NAME_YSFPAY;
+                break;
+            default:
+                this.payTypeDesc = "未知";
+                break;
+        }
+        return payTypeDesc;
+    }
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchSummaryVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchSummaryVO.java
new file mode 100644
index 0000000..1151328
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchSummaryVO.java
@@ -0,0 +1,257 @@
+package cn.pluss.platform.vo;
+
+import cn.pluss.platform.entity.MerchantChannelStatus;
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.Objects;
+
+/**
+ * 商户概要信息
+ *
+ * @author Djh
+ */
+@Data
+public class MerchSummaryVO {
+
+    /**
+     * 用户id
+     */
+    private String userId;
+
+    /**
+     * 商户编号
+     */
+    private String merchantCode;
+
+    /**
+     * 商户简称
+     */
+    private String alias;
+
+    /**
+     * 创建时间
+     */
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /**
+     * 交易笔数
+     */
+    private Integer count;
+
+    /**
+     * 交易总金额
+     */
+    private BigDecimal totalFee;
+
+    /**
+     * 退款总金额
+     */
+    private BigDecimal retFee;
+
+    /**
+     * 退款总笔数
+     */
+    private Integer retCount;
+
+    /**
+     * d1进件状态
+     */
+    private String d1Status;
+
+    /**
+     * d1第三方进件状态值
+     */
+    private String d1ThirdStatus;
+
+    /**
+     * d1进件状态描述
+     */
+    private String d1StatusDesc;
+
+    /**
+     * d1进件备注，一般是驳回信息
+     */
+    private String d1Remark;
+
+    /**
+     * 微信认证状态
+     */
+    private String d1WxCertStatus;
+
+    /**
+     * 微信认证状态
+     */
+    private String d1WxCertStatusDesc;
+
+    /**
+     * d0进件状态
+     */
+    private String d0Status;
+
+    /**
+     * d0第三方进件状态值
+     */
+    private String d0ThirdStatus;
+
+    /**
+     * d0进件状态描述
+     */
+    private String d0StatusDesc;
+
+    /**
+     * d0进件备注，一般是驳回信息
+     */
+    private String d0Remark;
+
+    /**
+     * 0:商家打烊 ,1:营业中,2:系统禁用
+     */
+    private String d1StoreStatus;
+
+    /**
+     * 0:商家打烊 ,1:营业中,2:系统禁用
+     */
+    private String d0StoreStatus;
+
+    /**
+     * 微信认证状态
+     */
+    private String d0WxCertStatus;
+
+    /**
+     * 微信认证状态
+     */
+    private String d0WxCertStatusDesc;
+
+    /**
+     * 直推标记
+     */
+    private String directFlag;
+
+    public static void wrapper(MerchSummaryVO merchSummaryVO) {
+        String d0Remark = merchSummaryVO.getD0Remark();
+        merchSummaryVO.setD0Remark(null);
+        switch (merchSummaryVO.getD0Status()) {
+            case "-1":
+                merchSummaryVO.setD0StoreStatus("-1");
+                merchSummaryVO.setD0WxCertStatus("-1");
+                merchSummaryVO.setD0StatusDesc("未开通");
+                break;
+            case "1":
+                merchSummaryVO.setD0StatusDesc("审核中");
+                break;
+            case "2":
+                merchSummaryVO.setD0StatusDesc("已驳回");
+                merchSummaryVO.setD0Remark(d0Remark);
+                break;
+            case "3":
+            case "6":
+                merchSummaryVO.setD0Status("3");
+                merchSummaryVO.setD0StatusDesc("已开通");
+                break;
+            case "8":
+                merchSummaryVO.setD0StatusDesc("待签约");
+                break;
+            case "0":
+                if (Objects.equals(MerchantChannelStatus.AUDIT_THIRD_STATUS_WAITING, merchSummaryVO.getD0ThirdStatus())) {
+                    merchSummaryVO.setD0Status("2");
+                    merchSummaryVO.setD0StatusDesc("已驳回");
+                    merchSummaryVO.setD0Remark(d0Remark);
+                }
+                break;
+            default:
+                merchSummaryVO.setD0Status("-1");
+                merchSummaryVO.setD0StoreStatus("-1");
+                merchSummaryVO.setD0WxCertStatus("-1");
+                merchSummaryVO.setD0StatusDesc("未开通");
+                break;
+        }
+
+        String d1Remark = merchSummaryVO.getD1StatusDesc();
+        merchSummaryVO.setD1Remark(null);
+        switch (merchSummaryVO.getD1Status()) {
+            case "-1":
+                merchSummaryVO.setD1StoreStatus("-1");
+                merchSummaryVO.setD1WxCertStatus("-1");
+                merchSummaryVO.setD1StatusDesc("未开通");
+                break;
+            case "1":
+                merchSummaryVO.setD1StatusDesc("审核中");
+                break;
+            case "2":
+                merchSummaryVO.setD1StatusDesc("已驳回");
+                merchSummaryVO.setD1Remark(d1Remark);
+                break;
+            case "3":
+            case "6":
+                merchSummaryVO.setD1Status("3");
+                merchSummaryVO.setD1StatusDesc("已开通");
+                break;
+            case "8":
+                merchSummaryVO.setD1StatusDesc("待签约");
+            case "0":
+                if (Objects.equals(MerchantChannelStatus.AUDIT_THIRD_STATUS_WAITING, merchSummaryVO.getD1ThirdStatus())) {
+                    merchSummaryVO.setD1Status("2");
+                    merchSummaryVO.setD1StatusDesc("已驳回");
+                    merchSummaryVO.setD1Remark(d1Remark);
+                }
+                break;
+            default:
+                merchSummaryVO.setD1Status("-1");
+                merchSummaryVO.setD1StoreStatus("-1");
+                merchSummaryVO.setD1WxCertStatus("-1");
+                merchSummaryVO.setD1StatusDesc("未开通");
+                break;
+        }
+
+        if (merchSummaryVO.getD1StoreStatus() == null) {
+            merchSummaryVO.setD1StoreStatus("1");
+        }
+
+        if (merchSummaryVO.getD0StoreStatus() == null) {
+            merchSummaryVO.setD0StoreStatus("1");
+        }
+
+        if ("2".equals(merchSummaryVO.getD0StoreStatus())) {
+            merchSummaryVO.setD0Status("4");
+            merchSummaryVO.setD0StatusDesc("已禁用");
+        }
+
+        if ("2".equals(merchSummaryVO.getD1StoreStatus())) {
+            merchSummaryVO.setD1Status("4");
+            merchSummaryVO.setD1StatusDesc("已禁用");
+        }
+
+        switch (merchSummaryVO.getD1WxCertStatus()) {
+            case "-1":
+                merchSummaryVO.setD1WxCertStatusDesc("未开通");
+                break;
+            case "1":
+                merchSummaryVO.setD1WxCertStatusDesc("微信已授权");
+                break;
+            case "0":
+                merchSummaryVO.setD1WxCertStatusDesc("微信未授权");
+                break;
+            default:
+                break;
+        }
+
+        switch (merchSummaryVO.getD0WxCertStatus()) {
+            case "-1":
+                merchSummaryVO.setD0WxCertStatusDesc("未开通");
+                break;
+            case "1":
+                merchSummaryVO.setD0WxCertStatusDesc("微信已授权");
+                break;
+            case "0":
+                merchSummaryVO.setD0WxCertStatusDesc("微信未授权");
+                break;
+            default:
+                break;
+        }
+    }
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantBaseInfoVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantBaseInfoVO.java
new file mode 100644
index 0000000..5c6687d
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantBaseInfoVO.java
@@ -0,0 +1,103 @@
+package cn.pluss.platform.vo;
+
+
+import cn.pluss.platform.entity.MerchantBankCard;
+import cn.pluss.platform.entity.MerchantBaseInfo;
+import cn.pluss.platform.entity.MerchantImage;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+/**
+ * @author yuchen
+ * @Description
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class MerchantBaseInfoVO extends MerchantBaseInfo {
+
+    /**
+     * 结算人与收银台合照
+     */
+    private String cashDeskWithPerson;
+
+    /**
+     * 结算人手持身份证
+     */
+    private String handIdCard;
+
+    /**
+     * 上级名称
+     */
+    private String parentContactName;
+
+    /**
+     * 上级手机号
+     */
+    private String parentContactMobile;
+
+    /**
+     * 今日交易笔数
+     */
+    private String dayBillCount;
+
+    /**
+     * 今日交易额
+     */
+    private String dayBillSum;
+
+    /** 上月笔数 */
+    private String lastMonthBillCount;
+
+    /** 上月交易额 */
+    private String lastMonthBillSum;
+
+    /** 今年笔数 */
+    private String yearBillCount;
+
+    /** 今年交易额 */
+    private String yearBillSum;
+
+    /** 全部交易笔数 */
+    private String allBillCount;
+
+    /** 全部交易额 */
+    private String allBillSum;
+
+    private String bankCertName;
+
+    public static MerchantBaseInfoVO convertMerchantBaseInfo(MerchantBaseInfo merchantBaseInfo, MerchantBankCard merchantBankCard, List<MerchantImage> list) {
+        MerchantBaseInfoVO vo = new MerchantBaseInfoVO();
+        vo.setAddress(merchantBaseInfo.getAddress());
+        vo.setMerchantName(merchantBaseInfo.getMerchantName());
+        vo.setMerchantType(merchantBaseInfo.getMerchantType());
+        vo.setAddressNo(merchantBaseInfo.getAddressNo());
+        vo.setAlias(merchantBaseInfo.getAlias());
+        vo.setContactMobile(merchantBaseInfo.getContactMobile());
+        vo.setContactName(merchantBaseInfo.getContactName());
+        vo.setEmail(merchantBaseInfo.getEmail());
+        if (null != merchantBankCard) {
+            vo.setBankCertName(merchantBankCard.getBankCertName());
+        }
+        vo.setMcc(merchantBaseInfo.getMcc());
+        vo.setProductDesc(merchantBaseInfo.getProductDesc());
+        vo.setMccName(merchantBaseInfo.getMccName());
+        vo.setAliAccount(merchantBaseInfo.getAliAccount());
+        vo.setMerchantAddress(merchantBaseInfo.getProvince() + "," + merchantBaseInfo.getCity() + "," + merchantBaseInfo.getDistrict());
+        for (MerchantImage merchantImage : list) {
+            if ("06".equals(merchantImage.getPhotoType())) {
+                vo.setStoreHeadPic(merchantImage.getPicUrl());
+            }
+            if ("08".equals(merchantImage.getPhotoType())) {
+                vo.setCashPic(merchantImage.getPicUrl());
+            }
+            if ("09".equals(merchantImage.getPhotoType())) {
+                vo.setStoreInsidePic(merchantImage.getPicUrl());
+            }
+        }
+        return vo;
+    }
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantBaseNewVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantBaseNewVO.java
new file mode 100644
index 0000000..fc8e3a9
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantBaseNewVO.java
@@ -0,0 +1,128 @@
+package cn.pluss.platform.vo;
+
+import java.util.List;
+
+import cn.pluss.platform.entity.MerchantStore;
+import lombok.Data;
+
+/**
+ *
+ */
+@Data
+public class MerchantBaseNewVO {
+	
+	private Integer id;
+	
+	private String userId;
+	
+	/**
+	 * 用户名称
+	 */
+	private String userName;
+	
+	/**
+	 * 用户手机号
+	 */
+	private String phone;
+
+	/**
+	 * 直属上级
+	 */
+	private String parentId;
+
+	/**
+	 * 直属上级手机号
+	 */
+	private String parentIdPhone;
+
+	/**
+	 * 商户Code
+	 */
+	private String merchantCode;
+
+	/**
+	 * 订单总笔数
+	 */
+	private Integer orderCount;
+
+	/**
+	 * 昨日笔数
+	 */
+	private Integer yesterdayOrderCount;
+
+	/**
+	 * 昨日推广
+	 */
+	private Integer yesterdaySpreadCount;
+
+	private List<MerchantStore> storeNameList;
+	
+	/**
+	 * 交易总流水
+	 */
+	private String earnings;
+	
+	/**
+	 * 今日流水
+	 */
+	private String 	toDayEarnings;
+	/**
+	 * 昨日流水
+	 */
+	private String yestDayEarnings;
+	/**
+	 * 已有会员
+	 */
+	private String 	menber;
+	
+	/**
+	 * 今日新增会员
+	 */
+	private String toDayMenber;
+	/**
+	 * 昨日新增会员
+	 */
+	private String yestDayMenber;
+	/**
+	 * 今日粉丝
+	 */
+	private String toDayFansCount;
+	/**
+	 * 昨日粉丝
+	 */
+	private String yesterDayFansCount;
+	/**
+	 * 粉丝奖励
+	 */
+	private String fansMoney;
+	/**
+	 * 余额
+	 */
+	private String shareMoney;
+	
+	private String createDt;
+
+	/**
+	 * 商户简称
+	 */
+	private String alias;
+
+	private String status;
+	/**
+	 * 可用充值余额
+	 */
+	private String usableRechargeFee;
+	/**
+	 * 可用赠送余额
+	 */
+	private String usableGiveFee;
+	/**
+	 * 可用充值余额 + 可用赠送余额
+	 */
+	private String sumDifference;
+	/**
+	 * 交易总数
+	 */
+	private String sumNumber;
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantCashPlaceStaffVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantCashPlaceStaffVO.java
new file mode 100644
index 0000000..0fd7806
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantCashPlaceStaffVO.java
@@ -0,0 +1,42 @@
+package cn.pluss.platform.vo;
+
+import cn.pluss.platform.entity.MerchantCashPlace;
+import cn.pluss.platform.entity.MerchantCashPlaceStaff;
+import cn.pluss.platform.entity.UserApp;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 收银点和员工关联记录表
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-03-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class MerchantCashPlaceStaffVO extends MerchantCashPlaceStaff {
+
+    /**
+     * 收银点信息
+     */
+    @TableField(exist = false)
+    private MerchantCashPlace merchantCashPlace;
+
+    @TableField(exist = false)
+    private List<String> payCodeList;
+
+    private String merchantCode;
+
+    private String alias;
+
+    /**
+     * 签到中的收银员信息
+     */
+    @TableField(exist = false)
+    private UserApp staff;
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantCashPlaceVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantCashPlaceVO.java
new file mode 100644
index 0000000..08eaaac
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantCashPlaceVO.java
@@ -0,0 +1,73 @@
+package cn.pluss.platform.vo;
+
+import cn.pluss.platform.entity.MerchantBaseInfo;
+import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class MerchantCashPlaceVO implements Serializable {
+
+    /**
+     * id
+     */
+    private Integer id;
+
+
+    /**
+     * 用户id
+     */
+    private Long userId;
+
+
+    /**
+     * 收银点名称
+     */
+    private String name;
+
+    /**
+     * 收银点code
+     */
+    private String code;
+
+    /**
+     * 收银点地址
+     */
+    private String address;
+
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+    /**
+     * 创建时间
+     */
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /**
+     * 绑定的收款码
+     */
+    private List<String> payCodeList;
+
+    /**
+     * 店铺基本信息
+     */
+    private MerchantBaseInfo merchantBaseInfo;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantChannelStatusVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantChannelStatusVO.java
new file mode 100644
index 0000000..35c7dc6
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantChannelStatusVO.java
@@ -0,0 +1,23 @@
+package cn.pluss.platform.vo;
+
+import cn.pluss.platform.entity.MerchantChannelStatus;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * @author DJH
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class MerchantChannelStatusVO extends MerchantChannelStatus {
+
+    /**
+     * 微信子商户号
+     */
+    private String wxMercNo;
+
+    /**
+     * 支付宝商编
+     */
+    private String zfbMercNo;
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantMangeOrderVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantMangeOrderVO.java
new file mode 100644
index 0000000..b55ed3b
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantMangeOrderVO.java
@@ -0,0 +1,147 @@
+package cn.pluss.platform.vo;
+
+/**
+ * @author yuchen
+ *
+ * @Description 
+ */
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author yuchen
+ * (这里用一句话描述这个类的作用). 
+ *
+ * @Description 
+ *
+ */
+@Data
+public class MerchantMangeOrderVO {
+	
+	
+	private Integer id;
+	/**
+	 *订单号 
+	 */
+	private String orderNumber;
+	
+	/**
+	 * 商户名称
+	 */
+	private String merchantName;
+	
+	/**
+	 * 门店名称
+	 */
+	private String storeName;
+	
+	/**
+	 * 支付方式
+	 */
+	private String payTypeName;
+
+
+	private String payTypeCode;
+	
+	/**
+	 * 订单金额
+	 */
+	private Double consumeFee;
+	
+	/**
+	 * 粉丝分润
+	 */
+	private Double fansShareMoney;
+
+	/**
+	 * 推广分润
+	 */
+	private Double profitShareMoney;
+	
+	/**
+	 * 商家实际到账
+	 */
+	private Double enterFee;
+	
+	/**
+	 * 推广分润
+	 */
+	private Double shareMoney;
+	
+	/**
+	 * 创建时间
+	 */
+	private String createDt;
+	
+	/**
+	 * 商家费率
+	 */
+	private String mercRate;
+	
+	/**
+	 * 通道费率
+	 */
+	private String aisleRate;
+	
+	/**
+	 * 平台总收益
+	 */
+	private Double platformRevenue;
+	
+	/**
+	 * 平台实际收益
+	 */
+	private Double practical;
+	
+	/**
+	 * 通道扣款金额
+	 */
+	private Double aisleHold;
+	
+	private String status;
+	
+	private String orderType;
+	
+	private String leshuaTransNo;
+
+	private String alias;
+	
+	private String merchantCode;
+
+	private String transNo;
+
+	private BigDecimal marketAmt;
+
+	private Integer userId;
+
+	private String weChatTransNo;
+
+	private String aliPayTransNo;
+
+	/**
+	 * 提现手续费
+	 */
+	private Double cashFee;
+
+	private String thirdTransNo;
+
+	@JSONField(format = "yyyy-MM-dd HH:mm:ss")
+	private Date transDt;
+
+	private String ip;
+
+	private String ipAddress;
+
+	/**商户手续费**/
+	private Double mercFee;
+
+	private String mercOrderNo;
+
+	private String drType;
+
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantOrderDVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantOrderDVO.java
new file mode 100644
index 0000000..cc44e60
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantOrderDVO.java
@@ -0,0 +1,60 @@
+package cn.pluss.platform.vo;
+
+import java.text.SimpleDateFormat;
+
+import cn.pluss.platform.entity.MerchantOrder;
+import cn.pluss.platform.util.StringUtil;
+import lombok.Data;
+
+/**
+ * @author yuchen 交易查询VO
+ *
+ * @Description 
+ */
+@Data
+public class MerchantOrderDVO {
+	
+	
+		private String orderNumber;
+	    private String merchantName;
+	    private String storeName;
+	    private String payTypeName;
+	    private String consumeFee;
+	   // private String transNo;
+	    private String createDt;
+	    private String status;
+
+		@Override
+		public String toString() {
+			return "MerchantOrderVO [orderNumber=" + orderNumber + ", merchantName=" + merchantName + ", storeName="
+					+ storeName + ", payTypeName=" + payTypeName + ", consumeFee=" + consumeFee +", createDt=" + createDt + ", status=" + status + "]";
+		}
+		
+		public MerchantOrderDVO(MerchantOrder merchantOrder) {
+			SimpleDateFormat sim=new SimpleDateFormat("yyyy/MM/dd");
+			this.consumeFee=merchantOrder.getConsumeFee()+"";
+			if(StringUtil.isNotEmpty(merchantOrder.getCreateDt())) {
+				String format = sim.format(merchantOrder.getCreateDt());
+				this.createDt=format;
+			}
+			this.merchantName=merchantOrder.getMerchantName();
+			this.orderNumber=merchantOrder.getOrderNumber();
+			this.payTypeName=merchantOrder.getPayTypeName();
+			if("0".equals(merchantOrder.getStatus())) {
+				this.status="交易失败";
+			}else if("1".equals(merchantOrder.getStatus())) {
+				this.status="交易成功";
+			}else if("2".equals(merchantOrder.getStatus())) {
+				this.status="退款成功";
+			}else if("3".equals(merchantOrder.getStatus())) {
+				this.status="退款失败";
+			}else if("4".equals(merchantOrder.getStatus())) {
+				this.status="退款中";
+			}else if("5".equals(merchantOrder.getStatus())) {
+				this.status="待付款";
+			}
+			this.storeName=merchantOrder.getStoreName();
+			//this.transNo=merchantOrder.getTransNo();
+		}
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantOrderExportVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantOrderExportVO.java
new file mode 100644
index 0000000..f3a08fd
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantOrderExportVO.java
@@ -0,0 +1,84 @@
+package cn.pluss.platform.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 账单导出
+ * @author Djh
+ */
+@Data
+public class MerchantOrderExportVO {
+
+    /**
+     * 退款金额
+     */
+    private BigDecimal refundFee;
+
+    /**
+     * 订单号
+     */
+    private String orderNumber;
+
+    /**
+     * 补贴
+     */
+    private BigDecimal subsidy;
+
+    /**
+     * 创建时间
+     */
+    private Date createDt;
+
+    /**
+     * 订单类型
+     */
+    private String orderTypeDesc;
+
+    /**
+     * 手续费
+     */
+    private BigDecimal serviceCharge;
+
+    /**
+     * 第三方订单号
+     */
+    private String thirdOrderNo;
+
+    /**
+     * 支付方式
+     */
+    private String payType;
+
+    /**
+     * 退款订单号
+     */
+    private String refundNo;
+
+    /**
+     * 实际到账
+     */
+    private BigDecimal enterFee;
+
+    /**
+     * 员工名称
+     */
+    private String staffName;
+
+    /**
+     * 实收金额
+     */
+    private BigDecimal consumeFee;
+
+    /**
+     * 交易时间
+     */
+    private Date transDt;
+
+    /**
+     * 备注
+     */
+    private String remark;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantOrderProfitVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantOrderProfitVO.java
new file mode 100644
index 0000000..a855795
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantOrderProfitVO.java
@@ -0,0 +1,89 @@
+package cn.pluss.platform.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class MerchantOrderProfitVO {
+
+    private Integer userId;
+    private String orderNumber;
+    private String merchantName;
+    private String orderType;
+    private String payType;
+    private BigDecimal consumeFee;
+    private Integer mercRate;
+    private BigDecimal mercFee;
+    /**
+     * 分润总金额
+     */
+    private BigDecimal shareMoney;
+
+    /**
+     * 直推收益
+     */
+    private BigDecimal oneFee;
+    /**
+     * 直推收益人手机号
+     */
+    private String onePhone;
+    /**
+     * 直推收益人名称
+     */
+    private String oneName;
+
+    /**
+     * 间推收益
+     */
+    private BigDecimal twoFee;
+
+    /**
+     * 间推收益人手机号
+     */
+    private String twoPhone;
+
+    /**
+     * 间推收益人Name
+     */
+    private String twoName;
+
+    /**
+     * 二级间推收益
+     */
+    private BigDecimal threeFee;
+
+    /**
+     * 二级间推收益人手机号
+     */
+    private String threePhone;
+
+    /**
+     * 二级间推收益人名称
+     */
+    private String threeName;
+
+    /**
+     * 升级收益
+     */
+    private BigDecimal toUpFee;
+
+    /**
+     * 升级收益收益人Phone
+     */
+    private String toUpPhone;
+
+    /**
+     * 升级收益收益人Name
+     */
+    private String toUpName;
+    /**
+     * 收益人名称
+     */
+    private String profitName;
+
+    /**
+     * 多级代理分润总和
+     */
+    private BigDecimal toAgentFeeCount;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantOrderStatisticsVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantOrderStatisticsVO.java
new file mode 100644
index 0000000..7276506
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantOrderStatisticsVO.java
@@ -0,0 +1,129 @@
+package cn.pluss.platform.vo;
+
+import cn.pluss.platform.entity.MerchantOrderStatistics;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+
+/**
+ * @author djh
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class MerchantOrderStatisticsVO extends MerchantOrderStatistics {
+
+    /**
+     * 万
+     */
+    public static final BigDecimal TEN_THOUSAND = BigDecimal.valueOf(10000L);
+
+    /**
+     * 千万
+     */
+    public static final BigDecimal HUNDRED_THOUSAND = BigDecimal.valueOf(10000000L);
+
+    /**
+     * 百万
+     */
+    public static final BigDecimal MILLION = BigDecimal.valueOf(1000000L);
+
+    /**
+     * 百亿
+     */
+    public static final BigDecimal HUNDRED_BILLION = BigDecimal.valueOf(10000000000L);
+
+    /**
+     * 直推月交易总量
+     */
+    private String directMonthTotalFee;
+
+    public void setDirectMonthTotalFee(BigDecimal directMonthTotalFee) {
+        // 过百亿，用百万做单位
+        if (directMonthTotalFee.compareTo(HUNDRED_BILLION) > 0) {
+            this.directMonthTotalFee = directMonthTotalFee.divide(MILLION, RoundingMode.HALF_UP).setScale(3, RoundingMode.HALF_UP).toPlainString() + " 百万";
+            return;
+        }
+
+        // 过千万，用万做单位
+        if (directMonthTotalFee.compareTo(HUNDRED_THOUSAND) > 0) {
+            this.directMonthTotalFee = directMonthTotalFee.divide(TEN_THOUSAND, RoundingMode.HALF_UP).setScale(3, RoundingMode.HALF_UP).toPlainString() + " 万";
+            return;
+        }
+
+
+        this.directMonthTotalFee = directMonthTotalFee.setScale(2, RoundingMode.HALF_UP).toPlainString();
+    }
+
+    /**
+     * 团队月交易总量
+     */
+    private String teamMonthTotalFee;
+
+    public void setTeamMonthTotalFee(BigDecimal teamMonthTotalFee) {
+        // 过百亿，用百万做单位
+        if (teamMonthTotalFee.compareTo(HUNDRED_BILLION) > 0) {
+            this.teamMonthTotalFee = teamMonthTotalFee.divide(MILLION, RoundingMode.HALF_UP).setScale(3, RoundingMode.HALF_UP).toPlainString() + " 百万";
+            return;
+        }
+
+        // 过千万，用万做单位
+        if (teamMonthTotalFee.compareTo(HUNDRED_THOUSAND) > 0) {
+            this.teamMonthTotalFee = teamMonthTotalFee.divide(TEN_THOUSAND, RoundingMode.HALF_UP).setScale(3, RoundingMode.HALF_UP).toPlainString() + " 万";
+            return;
+        }
+
+
+        this.teamMonthTotalFee = teamMonthTotalFee.setScale(2, RoundingMode.HALF_UP).toPlainString();
+    }
+
+    /**
+     * 直推交易总量
+     */
+    private String directTotalFee;
+
+    public void setDirectTotalFee(BigDecimal directTotalFee) {
+        // 过百亿，用百万做单位
+        if (directTotalFee.compareTo(HUNDRED_BILLION) > 0) {
+            this.directTotalFee = directTotalFee.divide(MILLION, RoundingMode.HALF_UP).setScale(3, RoundingMode.HALF_UP).toPlainString() + " 百万";
+            return;
+        }
+
+        // 过千万，用万做单位
+        if (directTotalFee.compareTo(HUNDRED_THOUSAND) > 0) {
+            this.directTotalFee = directTotalFee.divide(TEN_THOUSAND, RoundingMode.HALF_UP).setScale(3, RoundingMode.HALF_UP).toPlainString() + " 万";
+            return;
+        }
+
+
+        this.directTotalFee = directTotalFee.setScale(2, RoundingMode.HALF_UP).toPlainString();
+    }
+
+    /**
+     * 团队交易总量
+     */
+    private String teamTotalFee;
+
+    public void setTeamTotalFee(BigDecimal teamTotalFee) {
+        // 过百亿，用百万做单位
+        if (teamTotalFee.compareTo(HUNDRED_BILLION) > 0) {
+            this.teamTotalFee = teamTotalFee.divide(MILLION, RoundingMode.HALF_UP).setScale(3, RoundingMode.HALF_UP).toPlainString() + " 百万";
+            return;
+        }
+
+        // 过千万，用万做单位
+        if (teamTotalFee.compareTo(HUNDRED_THOUSAND) > 0) {
+            this.teamTotalFee = teamTotalFee.divide(TEN_THOUSAND, RoundingMode.HALF_UP).setScale(3, RoundingMode.HALF_UP).toPlainString() + " 万";
+            return;
+        }
+
+
+        this.teamTotalFee = teamTotalFee.setScale(2, RoundingMode.HALF_UP).toPlainString();
+    }
+
+    /**
+     * (直推 + 团队) 月总交易笔数
+     */
+    private String monthCount;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantOrderVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantOrderVO.java
new file mode 100644
index 0000000..1ee9a51
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantOrderVO.java
@@ -0,0 +1,104 @@
+package cn.pluss.platform.vo;
+
+import cn.pluss.platform.entity.MerchantOrder;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.Date;
+
+/**
+ * @author DJH , 此类只用于查询，因refundTime在表中不存在
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("(\n" +
+        "            SELECT t1.*, t2.updateTime refundTime, IFNULL(wo.total_fee - wo.final_fee, IFNULL(wpo.total_fee - wpo.final_fee, 0)) coupon FROM tb_pluss_merchant_order t1\n" +
+        "                LEFT JOIN tb_pluss_merchant_order t2 ON t1.orderNumber = t2.orderNumber AND t1.status = 1 AND t2.status = 2\n" +
+        "               LEFT JOIN `syblife`.ims_tiny_wmall_order wo ON t1.orderNumber = wo.transaction_id AND t1.orderType = 10\n" +
+        "               LEFT JOIN `syblife`.ims_tiny_wmall_paybill_order wpo ON t1.orderNumber = wpo.transaction_id AND t1.orderType != 10" +
+        "        ) t")
+@Accessors(chain = true)
+public class MerchantOrderVO extends MerchantOrder {
+
+    /**
+     * 结算手续费
+     */
+    @TableField(exist = false)
+    private BigDecimal settlementFee;
+
+    /**
+     * 结算手续费描述
+     */
+    @TableField(exist = false)
+    private String settlementFeeDesc;
+
+    /**
+     * 提现手续费
+     */
+    @TableField(exist = false)
+    private BigDecimal withdrawFee;
+
+    /**
+     * 提现手续费描述
+     */
+    @TableField(exist = false)
+    private String withdrawFeeDesc;
+
+    private Date refundTime;
+
+    /**
+     * 优惠金额
+     */
+    private BigDecimal coupon;
+
+    public static void setD0Fee(MerchantOrderVO item) {
+
+        Double consumeFee = item.getConsumeFee();
+        Double enterFee = item.getEnterFee();
+        if (consumeFee == null) {
+            return;
+        }
+
+        if (enterFee == null) {
+            return;
+        }
+
+        // 交易手续费
+        BigDecimal settlementFee = BigDecimal.valueOf(item.getConsumeFee()).multiply(item.getRate()).divide(BigDecimal.valueOf(10000), RoundingMode.HALF_EVEN);
+        item.setSettlementFee(settlementFee.setScale(2, RoundingMode.HALF_EVEN));
+        String settlementFeeDesc = item.getConsumeFee() + " × " + item.getRate().divide(BigDecimal.valueOf(100), RoundingMode.HALF_EVEN)+ "%";
+        item.setSettlementFeeDesc(settlementFeeDesc);
+
+        if (item.getSettlementType() != 0) {
+            return;
+        }
+
+        item.setWithdrawFee(new BigDecimal(consumeFee - enterFee).subtract(item.getSettlementFee()).setScale(2, RoundingMode.HALF_UP));
+
+        // 付款金额低于100，但是提现费用达到1毛，则表明当前最低提现费0.1
+        if (consumeFee < 100d) {
+            if (item.getWithdrawFee().compareTo(new BigDecimal("0.1")) >= 0) {
+                item.setWithdrawFeeDesc("最低提现费0.1(以银行卡到账为准)");
+                return;
+            } else {
+                item.setWithdrawFeeDesc(item.getConsumeFee() + " × 0.1%");
+            }
+        } else {
+            item.setWithdrawFeeDesc(item.getConsumeFee() + " × 0.1%");
+        }
+
+        if (consumeFee < 10d) {
+            if (item.getWithdrawFee().compareTo(new BigDecimal("0.01")) >= 0) {
+                item.setWithdrawFeeDesc("最低提现费0.01(以银行卡到账为准)");
+            }
+        } else {
+            item.setWithdrawFeeDesc(item.getConsumeFee() + " × 0.1%");
+        }
+
+    }
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantRateNewRecordVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantRateNewRecordVO.java
new file mode 100644
index 0000000..360b9d9
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantRateNewRecordVO.java
@@ -0,0 +1,62 @@
+package cn.pluss.platform.vo;
+
+import cn.pluss.platform.entity.MerchantRateNew;
+import cn.pluss.platform.entity.MerchantRateNewRecord;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+
+/**
+ * <p>
+ * 商户费率表(新)
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-08-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class MerchantRateNewRecordVO extends MerchantRateNewRecord {
+
+    private String userId;
+
+    /**
+     * 通道类型
+     */
+    private String channelType;
+
+    /**
+     * 微信费率等级，费率参考字典表wx_rate
+     */
+    private BigDecimal wxRateValue;
+
+
+    /**
+     * 支付宝费率等级，费率参考字典表ali_rate
+     */
+    private BigDecimal aliRateValue;
+
+
+    /**
+     * 银联费率等级，费率参考字典表bank_rate
+     */
+    private BigDecimal bankRateValue;
+
+
+    /**
+     * 银联1000+费率等级，费率参考字典表bank_rate_1000+, 目前随行付不支持1000+的支付
+     */
+    private BigDecimal bankRateLargeValue;
+
+    public static void setRateValue(MerchantRateNewRecordVO entity) {
+        entity.setWxRateValue(BigDecimal.valueOf(entity.getWxRate()).setScale(3, RoundingMode.HALF_UP));
+        entity.setAliRateValue(BigDecimal.valueOf(entity.getAliRate()).setScale(3, RoundingMode.HALF_UP));
+        entity.setBankRateValue(BigDecimal.valueOf(entity.getBankRate() + 2).setScale(3, RoundingMode.HALF_UP));
+        entity.setBankRateLargeValue(BigDecimal.valueOf((entity.getBankRateLarge() - 21) / 2f + 53).setScale(3, RoundingMode.HALF_UP));
+    }
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantRateNewVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantRateNewVO.java
new file mode 100644
index 0000000..fd3ab9b
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantRateNewVO.java
@@ -0,0 +1,41 @@
+package cn.pluss.platform.vo;
+
+import cn.pluss.platform.entity.MerchantRateNew;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class MerchantRateNewVO extends MerchantRateNew {
+
+    /**
+     * 状态值
+     * 0，审核中； 1，已通过
+     */
+    private String status;
+
+    /**
+     * 新的费率，微信费率等级
+     */
+    private BigDecimal wxRateNewValue;
+
+
+    /**
+     * 新的费率，支付宝费率等级
+     */
+    private BigDecimal aliRateNewValue;
+
+
+    /**
+     * 新的费率，银联1000以内
+     */
+    private BigDecimal bankRateNewValue;
+
+
+    /**
+     * 新的费率，银联大额
+     */
+    private BigDecimal bankRateLargeNewValue;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantSplitSettingVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantSplitSettingVO.java
new file mode 100644
index 0000000..0ea9712
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantSplitSettingVO.java
@@ -0,0 +1,21 @@
+package cn.pluss.platform.vo;
+
+import cn.pluss.platform.entity.MerchantSplitSetting;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ *
+ *@description:
+ *@author: bzg
+ *@time: 2021/11/26 15:26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class MerchantSplitSettingVO  extends MerchantSplitSetting {
+
+    private String chieMerchantName;
+
+    private String diviMerchantName;
+
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantStaffConnVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantStaffConnVO.java
new file mode 100644
index 0000000..b07050e
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantStaffConnVO.java
@@ -0,0 +1,67 @@
+package cn.pluss.platform.vo;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author DJH
+ */
+@Data
+@Accessors(chain = true)
+public class MerchantStaffConnVO  implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    private Integer id;
+
+
+    /**
+     * 员工id
+     */
+    private Long userId;
+
+
+    /**
+     * 商户code
+     */
+    private String merchantCode;
+
+    /**
+     * 店铺logo
+     */
+    private String imgUrl;
+
+    /**
+     * 店铺地址
+     */
+    private String address;
+
+    /**
+     * 创建时间
+     */
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /**
+     * 别名
+     */
+    private String alias;
+
+    /**
+     * 查询全部账单权限
+     */
+    private String permissionBill;
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantStaffVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantStaffVO.java
new file mode 100644
index 0000000..753d76b
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantStaffVO.java
@@ -0,0 +1,17 @@
+package cn.pluss.platform.vo;
+
+import cn.pluss.platform.entity.UserApp;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author DJH
+ */
+@Data
+public class MerchantStaffVO {
+
+    private UserApp userApp;
+
+    private List<MerchantStaffConnVO> connList;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/OperationRecordVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/OperationRecordVO.java
new file mode 100644
index 0000000..c366cff
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/OperationRecordVO.java
@@ -0,0 +1,42 @@
+package cn.pluss.platform.vo;
+
+import cn.pluss.platform.entity.OperationRecord;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@TableName("( SELECT opr.*, ua.userName, mbi.address, t.count, IF(opr.extension ->> '$.country' IS NULL, -1, IF(opr.extension ->> '$.country' = '中国', '1', '0')) isChina FROM tb_pluss_operation_record opr " +
+        "LEFT JOIN tb_pluss_user_app ua ON opr.userId = ua.userId " +
+        "LEFT JOIN tb_pluss_merchant_base_info mbi ON mbi.userId = opr.userId " +
+        "LEFT JOIN (" +
+        "    SELECT extension ->> '$.ip' ip , COUNT(DISTINCT opr.userId) count FROM tb_pluss_operation_record  opr" +
+        "        LEFT JOIN tb_pluss_user_app ua ON ua.userId = opr.userId WHERE ua.userType != 'staff' GROUP BY extension ->> '$.ip'" +
+        ") t ON t.ip = opr.extension ->> '$.ip' WHERE ua.userType != 'staff') t1")
+@EqualsAndHashCode(callSuper = true)
+public class OperationRecordVO extends OperationRecord {
+
+    /**
+     * 实名姓名
+     */
+    @TableField()
+    private String userName;
+
+    /**
+     * 店铺详细
+     */
+    private String address;
+
+    /**
+     * 同IP下累计用户数量
+     */
+    private Integer count;
+
+    /**
+     * 是否为在中国
+     */
+    @TableField(select = false)
+    private String isChina;
+
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/OrderRefundVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/OrderRefundVO.java
new file mode 100644
index 0000000..25c1eba
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/OrderRefundVO.java
@@ -0,0 +1,105 @@
+package cn.pluss.platform.vo;
+
+import java.text.SimpleDateFormat;
+
+import cn.pluss.platform.entity.MerchantOrder;
+import cn.pluss.platform.util.StringUtil;
+
+/**
+ * @author yuchen 
+ * 
+ * @Description 订单退款VO
+ */
+public class OrderRefundVO {
+
+	    private String orderNumber;
+	    private String merchantName;
+	    private String storeName;
+	    private String payTypeName;
+	    private String consumeFee;
+	    private String transNo;
+	    private String createDt;
+	    private String status;
+		public String getOrderNumber() {
+			return orderNumber;
+		}
+		public void setOrderNumber(String orderNumber) {
+			this.orderNumber = orderNumber;
+		}
+		public String getMerchantName() {
+			return merchantName;
+		}
+		public void setMerchantName(String merchantName) {
+			this.merchantName = merchantName;
+		}
+		public String getStoreName() {
+			return storeName;
+		}
+		public void setStoreName(String storeName) {
+			this.storeName = storeName;
+		}
+		public String getPayTypeName() {
+			return payTypeName;
+		}
+		public void setPayTypeName(String payTypeName) {
+			this.payTypeName = payTypeName;
+		}
+		public String getConsumeFee() {
+			return consumeFee;
+		}
+		public void setConsumeFee(String consumeFee) {
+			this.consumeFee = consumeFee;
+		}
+		public String getTransNo() {
+			return transNo;
+		}
+		public void setTransNo(String transNo) {
+			this.transNo = transNo;
+		}
+		public String getCreateDt() {
+			return createDt;
+		}
+		public void setCreateDt(String createDt) {
+			this.createDt = createDt;
+		}
+		public String getStatus() {
+			return status;
+		}
+		public void setStatus(String status) {
+			this.status = status;
+		}
+		@Override
+		public String toString() {
+			return "OrderRefundVO [orderNumber=" + orderNumber + ", merchantName=" + merchantName + ", storeName="
+					+ storeName + ", payTypeName=" + payTypeName + ", consumeFee=" + consumeFee + ", transNo=" + transNo
+					+ ", createDt=" + createDt + ", status=" + status + "]";
+		}
+		
+		public OrderRefundVO(MerchantOrder merchantOrder) {
+			SimpleDateFormat sim=new SimpleDateFormat("yyyy/MM/dd");
+			this.consumeFee=merchantOrder.getConsumeFee()+"";
+			if(StringUtil.isNotEmpty(merchantOrder.getCreateDt())) {
+				String format = sim.format(merchantOrder.getCreateDt());
+				this.createDt=format;
+			}
+			this.merchantName=merchantOrder.getMerchantName();
+			this.orderNumber=merchantOrder.getOrderNumber();
+			this.payTypeName=merchantOrder.getPayTypeName();
+			if("0".equals(merchantOrder.getStatus())) {
+				this.status="交易成功";
+			}else if("1".equals(merchantOrder.getStatus())) {
+				this.status="交易失败";
+			}else if("2".equals(merchantOrder.getStatus())) {
+				this.status="退款成功";
+			}else if("3".equals(merchantOrder.getStatus())) {
+				this.status="退款失败";
+			}else if("4".equals(merchantOrder.getStatus())) {
+				this.status="退款中";
+			}else if("5".equals(merchantOrder.getStatus())) {
+				this.status="待付款";
+			}
+			this.storeName=merchantOrder.getStoreName();
+			this.transNo=merchantOrder.getTransNo();
+		}
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/OrderStatisticsVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/OrderStatisticsVO.java
new file mode 100644
index 0000000..b99eacf
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/OrderStatisticsVO.java
@@ -0,0 +1,30 @@
+package cn.pluss.platform.vo;
+public class OrderStatisticsVO {
+	
+//统计时间	
+private String orderDate;
+//交易笔数
+private String orderCount;
+//交易金额
+private String  orderFee;
+public String getOrderDate() {
+	return orderDate;
+}
+public void setOrderDate(String orderDate) {
+	this.orderDate = orderDate;
+}
+public String getOrderCount() {
+	return orderCount;
+}
+public void setOrderCount(String orderCount) {
+	this.orderCount = orderCount;
+}
+public String getOrderFee() {
+	return orderFee;
+}
+public void setOrderFee(String orderFee) {
+	this.orderFee = orderFee;
+}
+
+
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/PageExpandVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/PageExpandVO.java
new file mode 100644
index 0000000..bf48cb0
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/PageExpandVO.java
@@ -0,0 +1,35 @@
+package cn.pluss.platform.vo;
+
+import cn.pluss.platform.api.PageInfo;
+
+public class PageExpandVO{
+	
+	private PageInfo<UserExpandVO> pager;
+	
+	/**
+	 * 总人数
+	 */
+	private Integer count;
+
+	public PageInfo<UserExpandVO> getPager() {
+		return pager;
+	}
+
+	public void setPager(PageInfo<UserExpandVO> pager) {
+		this.pager = pager;
+	}
+
+	public Integer getCount() {
+		return count;
+	}
+
+	public void setCount(Integer count) {
+		this.count = count;
+	}
+
+	@Override
+	public String toString() {
+		return "PageExpandVO [pager=" + pager + ", count=" + count + "]";
+	}
+	
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/PageFansConsumReturnVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/PageFansConsumReturnVO.java
new file mode 100644
index 0000000..d5aef96
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/PageFansConsumReturnVO.java
@@ -0,0 +1,55 @@
+package cn.pluss.platform.vo;
+
+import java.io.Serializable;
+
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.entity.Fans;
+public class PageFansConsumReturnVO implements Serializable {
+
+	/** 
+	* @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么) 
+	*/
+	private static final long serialVersionUID = 1L;
+	
+	private PageInfo<Fans> pageInfo;
+	
+	/**
+	 * 粉丝消费返现总额
+	 */
+	private Double fansReturnMoneyNowDayCount;
+	
+	/**
+	 * 粉丝消费总额
+	 */
+	private Double fansConsumMonyNowDayCount;
+
+	public PageInfo<Fans> getPageInfo() {
+		return pageInfo;
+	}
+
+	public void setPageInfo(PageInfo<Fans> pageInfo) {
+		this.pageInfo = pageInfo;
+	}
+
+	public Double getFansReturnMoneyNowDayCount() {
+		return fansReturnMoneyNowDayCount;
+	}
+
+	public void setFansReturnMoneyNowDayCount(Double fansReturnMoneyNowDayCount) {
+		this.fansReturnMoneyNowDayCount = fansReturnMoneyNowDayCount;
+	}
+
+	public Double getFansConsumMonyNowDayCount() {
+		return fansConsumMonyNowDayCount;
+	}
+
+	public void setFansConsumMonyNowDayCount(Double fansConsumMonyNowDayCount) {
+		this.fansConsumMonyNowDayCount = fansConsumMonyNowDayCount;
+	}
+
+	
+	
+	
+	
+
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/PageFansVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/PageFansVO.java
new file mode 100644
index 0000000..ad1b169
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/PageFansVO.java
@@ -0,0 +1,56 @@
+package cn.pluss.platform.vo;
+
+import java.io.Serializable;
+
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.entity.Fans;
+public class PageFansVO implements Serializable{
+	
+	/** 
+	* @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么) 
+	*/
+	private static final long serialVersionUID = 1L;
+
+	PageInfo<Fans> pageInfo;
+	
+	//粉丝交易金额
+	Double fansDealMoney;
+	
+	//粉丝数量
+	Integer fansCount;
+
+	public PageInfo<Fans> getPageInfo() {
+		return pageInfo;
+	}
+
+	public void setPageInfo(PageInfo<Fans> pageInfo) {
+		this.pageInfo = pageInfo;
+	}
+
+	
+
+	public Double getFansDealMoney() {
+		return fansDealMoney;
+	}
+
+	public void setFansDealMoney(Double fansDealMoney) {
+		this.fansDealMoney = fansDealMoney;
+	}
+
+	public Integer getFansCount() {
+		return fansCount;
+	}
+
+	public void setFansCount(Integer fansCount) {
+		this.fansCount = fansCount;
+	}
+
+	@Override
+	public String toString() {
+		return "PageFansVO [pageInfo=" + pageInfo + ", fansDealMoney=" + fansDealMoney + ", fansCount=" + fansCount
+				+ "]";
+	}
+	
+	
+
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/PayTypeStatisticsVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/PayTypeStatisticsVO.java
new file mode 100644
index 0000000..82554cb
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/PayTypeStatisticsVO.java
@@ -0,0 +1,31 @@
+package cn.pluss.platform.vo;
+public class PayTypeStatisticsVO {
+	
+//支付类型
+private String payTypeName;
+//交易笔数
+private String orderCount;
+//交易金额
+private String orderFee;
+
+public String getOrderCount() {
+	return orderCount;
+}
+public void setOrderCount(String orderCount) {
+	this.orderCount = orderCount;
+}
+public String getOrderFee() {
+	return orderFee;
+}
+public void setOrderFee(String orderFee) {
+	this.orderFee = orderFee;
+}
+public String getPayTypeName() {
+	return payTypeName;
+}
+public void setPayTypeName(String payTypeName) {
+	this.payTypeName = payTypeName;
+}
+
+
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/PlatformSumVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/PlatformSumVO.java
new file mode 100644
index 0000000..273a7e8
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/PlatformSumVO.java
@@ -0,0 +1,197 @@
+package cn.pluss.platform.vo;
+
+/**
+ * @author yuchen
+ *
+ * @Description 
+ */
+public class PlatformSumVO {
+	
+	/**
+	 * 门店数量
+	 */
+	private Integer storeCount;
+	
+	/**
+	 * 商户数量
+	 */
+	private Integer merchantCount;
+	
+	/**
+	 * 交易总额
+	 */
+	private Double transSum;
+	
+	/**
+	 * 交易笔数
+	 */
+	private Integer transCount;
+	
+	/**
+	 * 退款总额
+	 */
+	private Double refundSum;
+	
+	/**
+	 * 退款笔数
+	 */
+	private Integer refundCount;
+	
+	
+	/**
+	 * 会员数量
+	 */
+	private Integer memberCount;
+	
+	/**
+	 * 推广员数量
+	 */
+	private Integer promoterCount;
+	
+	/**
+	 * 推广分润总额
+	 */
+	private Double sharemoneySum;
+	
+	/**
+	 * 粉丝分润总额
+	 */
+	private Double fansShareMoneySum;
+	
+	/**
+	 * 支付宝收益统计
+	 */
+	private Double aliSum;
+	
+	/**
+	 * 微信收益统计
+	 */
+	private Double wechatSum;
+	
+	/**
+	 * 乐刷收益统计
+	 */
+	private Double leshuaSum;
+	
+	/**
+	 * 收益  = 支付宝收益统计+微信收益统计+乐刷收益统计
+	 */
+	private Double earnings;
+
+	public Integer getStoreCount() {
+		return storeCount;
+	}
+
+	public void setStoreCount(Integer storeCount) {
+		this.storeCount = storeCount;
+	}
+
+	public Integer getMerchantCount() {
+		return merchantCount;
+	}
+
+	public void setMerchantCount(Integer merchantCount) {
+		this.merchantCount = merchantCount;
+	}
+
+	public Double getTransSum() {
+		return transSum;
+	}
+
+	public void setTransSum(Double transSum) {
+		this.transSum = transSum;
+	}
+
+	public Integer getTransCount() {
+		return transCount;
+	}
+
+	public void setTransCount(Integer transCount) {
+		this.transCount = transCount;
+	}
+
+	public Integer getMemberCount() {
+		return memberCount;
+	}
+
+	public void setMemberCount(Integer memberCount) {
+		this.memberCount = memberCount;
+	}
+
+	public Integer getPromoterCount() {
+		return promoterCount;
+	}
+
+	public void setPromoterCount(Integer promoterCount) {
+		this.promoterCount = promoterCount;
+	}
+
+	
+
+	public Double getSharemoneySum() {
+		return sharemoneySum;
+	}
+
+	public void setSharemoneySum(Double sharemoneySum) {
+		this.sharemoneySum = sharemoneySum;
+	}
+
+	public Double getFansShareMoneySum() {
+		return fansShareMoneySum;
+	}
+
+	public void setFansShareMoneySum(Double fansShareMoneySum) {
+		this.fansShareMoneySum = fansShareMoneySum;
+	}
+
+	public Double getAliSum() {
+		return aliSum;
+	}
+
+	public void setAliSum(Double aliSum) {
+		this.aliSum = aliSum;
+	}
+
+	public Double getWechatSum() {
+		return wechatSum;
+	}
+
+	public void setWechatSum(Double wechatSum) {
+		this.wechatSum = wechatSum;
+	}
+
+	public Double getLeshuaSum() {
+		return leshuaSum;
+	}
+
+	public void setLeshuaSum(Double leshuaSum) {
+		this.leshuaSum = leshuaSum;
+	}
+
+	public Double getRefundSum() {
+		return refundSum;
+	}
+
+	public void setRefundSum(Double refundSum) {
+		this.refundSum = refundSum;
+	}
+
+	public Integer getRefundCount() {
+		return refundCount;
+	}
+
+	public void setRefundCount(Integer refundCount) {
+		this.refundCount = refundCount;
+	}
+
+	public Double getEarnings() {
+		return earnings;
+	}
+
+	public void setEarnings(Double earnings) {
+		this.earnings = earnings;
+	}
+	
+	
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/PromoteFenRunVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/PromoteFenRunVO.java
new file mode 100644
index 0000000..d606530
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/PromoteFenRunVO.java
@@ -0,0 +1,102 @@
+package cn.pluss.platform.vo;
+
+import java.io.Serializable;
+/**
+ * 推广分润vo
+ * @author yuchen
+ * 
+ * @Description 
+ *
+ */
+public class PromoteFenRunVO implements Serializable {
+
+	/** 
+	* @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么) 
+	*/
+	private static final long serialVersionUID = 1L;
+	
+	       //不可提现总金额
+			private Double sumMerchantNotAllowCashMoney;
+			//已经成功提现
+			private Double sumMerChantAreadlyCash;
+			//已经被提现的金额
+			private Double sumMerChantSuccessCash;
+			//可提现金额
+			private Double allowCashMoney;
+			//今日分润
+			private Double sumNowDayShareMoney;
+			//累计分润
+			private Double sumAllShareMoney;
+			//你的下级作为商户的 今日分润
+			private Double sumMerChantNowDayShareMoney;
+			//你的下级作为商户的 累计分润
+			private Double sumMerChantAllShareMoney;
+			//升级之后的今日利润
+			private Double sumNowDayShareMoneyLevel;
+			//升级之后的累计分润
+			private Double sumAllShareMoneyLevel;
+			public Double getSumMerchantNotAllowCashMoney() {
+				return sumMerchantNotAllowCashMoney;
+			}
+			public void setSumMerchantNotAllowCashMoney(Double sumMerchantNotAllowCashMoney) {
+				this.sumMerchantNotAllowCashMoney = sumMerchantNotAllowCashMoney;
+			}
+			public Double getSumMerChantAreadlyCash() {
+				return sumMerChantAreadlyCash;
+			}
+			public void setSumMerChantAreadlyCash(Double sumMerChantAreadlyCash) {
+				this.sumMerChantAreadlyCash = sumMerChantAreadlyCash;
+			}
+			public Double getSumMerChantSuccessCash() {
+				return sumMerChantSuccessCash;
+			}
+			public void setSumMerChantSuccessCash(Double sumMerChantSuccessCash) {
+				this.sumMerChantSuccessCash = sumMerChantSuccessCash;
+			}
+			public Double getAllowCashMoney() {
+				return allowCashMoney;
+			}
+			public void setAllowCashMoney(Double allowCashMoney) {
+				this.allowCashMoney = allowCashMoney;
+			}
+			public Double getSumNowDayShareMoney() {
+				return sumNowDayShareMoney;
+			}
+			public void setSumNowDayShareMoney(Double sumNowDayShareMoney) {
+				this.sumNowDayShareMoney = sumNowDayShareMoney;
+			}
+			public Double getSumAllShareMoney() {
+				return sumAllShareMoney;
+			}
+			public void setSumAllShareMoney(Double sumAllShareMoney) {
+				this.sumAllShareMoney = sumAllShareMoney;
+			}
+			public Double getSumMerChantNowDayShareMoney() {
+				return sumMerChantNowDayShareMoney;
+			}
+			public void setSumMerChantNowDayShareMoney(Double sumMerChantNowDayShareMoney) {
+				this.sumMerChantNowDayShareMoney = sumMerChantNowDayShareMoney;
+			}
+			public Double getSumMerChantAllShareMoney() {
+				return sumMerChantAllShareMoney;
+			}
+			public void setSumMerChantAllShareMoney(Double sumMerChantAllShareMoney) {
+				this.sumMerChantAllShareMoney = sumMerChantAllShareMoney;
+			}
+			public Double getSumNowDayShareMoneyLevel() {
+				return sumNowDayShareMoneyLevel;
+			}
+			public void setSumNowDayShareMoneyLevel(Double sumNowDayShareMoneyLevel) {
+				this.sumNowDayShareMoneyLevel = sumNowDayShareMoneyLevel;
+			}
+			public Double getSumAllShareMoneyLevel() {
+				return sumAllShareMoneyLevel;
+			}
+			public void setSumAllShareMoneyLevel(Double sumAllShareMoneyLevel) {
+				this.sumAllShareMoneyLevel = sumAllShareMoneyLevel;
+			}
+			
+			
+	
+
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/PromoterSumVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/PromoterSumVO.java
new file mode 100644
index 0000000..0e7ffeb
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/PromoterSumVO.java
@@ -0,0 +1,66 @@
+package cn.pluss.platform.vo;
+
+/**
+ * @author yuchen
+ * 
+ * @Description 
+ */
+public class PromoterSumVO {
+	
+	/**
+	 * 推广员名称
+	 */
+	private String userName;
+	
+	/**
+	 * 推广员获得的推广分润
+	 */
+	private Double shareMoney;
+	
+	/**
+	 * 推广员已经提现的推广分润
+	 */
+	private Double cashMoney;
+	
+	/**
+	 * 可提现金额
+	 */
+	private Double allowCashMoney;
+
+	public Double getShareMoney() {
+		return shareMoney;
+	}
+
+	public void setShareMoney(Double shareMoney) {
+		this.shareMoney = shareMoney;
+	}
+
+	public Double getCashMoney() {
+		return cashMoney;
+	}
+
+	public void setCashMoney(Double cashMoney) {
+		this.cashMoney = cashMoney;
+	}
+
+	public Double getAllowCashMoney() {
+		return allowCashMoney;
+	}
+
+	public void setAllowCashMoney(Double allowCashMoney) {
+		this.allowCashMoney = allowCashMoney;
+	}
+
+	public String getUserName() {
+		return userName;
+	}
+
+	public void setUserName(String userName) {
+		this.userName = userName;
+	}
+	
+	
+	
+
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/RealFansVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/RealFansVO.java
new file mode 100644
index 0000000..988ad9a
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/RealFansVO.java
@@ -0,0 +1,89 @@
+package cn.pluss.platform.vo;
+
+import java.util.Date;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * @author yuchen
+ *
+ * @Description 
+ */
+public class RealFansVO {
+	
+	 private Integer id;
+	    private String nickName;
+	    private String logo;
+	    private String phone;
+	    private String soleId;
+	    private String aliConsum;
+	    private String wechatConsum;
+	    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	    private Date enableTime;
+	    private String merchantName;
+	    private String alias;
+		public Integer getId() {
+			return id;
+		}
+		public void setId(Integer id) {
+			this.id = id;
+		}
+		public String getNickName() {
+			return nickName;
+		}
+		public void setNickName(String nickName) {
+			this.nickName = nickName;
+		}
+		public String getLogo() {
+			return logo;
+		}
+		public void setLogo(String logo) {
+			this.logo = logo;
+		}
+		public String getPhone() {
+			return phone;
+		}
+		public void setPhone(String phone) {
+			this.phone = phone;
+		}
+		public String getSoleId() {
+			return soleId;
+		}
+		public void setSoleId(String soleId) {
+			this.soleId = soleId;
+		}
+		public String getAliConsum() {
+			return aliConsum;
+		}
+		public void setAliConsum(String aliConsum) {
+			this.aliConsum = aliConsum;
+		}
+		public String getWechatConsum() {
+			return wechatConsum;
+		}
+		public void setWechatConsum(String wechatConsum) {
+			this.wechatConsum = wechatConsum;
+		}
+		public Date getEnableTime() {
+			return enableTime;
+		}
+		public void setEnableTime(Date enableTime) {
+			this.enableTime = enableTime;
+		}
+		public String getMerchantName() {
+			return merchantName;
+		}
+		public void setMerchantName(String merchantName) {
+			this.merchantName = merchantName;
+		}
+		public String getAlias() {
+			return alias;
+		}
+		public void setAlias(String alias) {
+			this.alias = alias;
+		}
+	    
+	    
+
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/RegionReflectVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/RegionReflectVO.java
new file mode 100644
index 0000000..1bb8ea9
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/RegionReflectVO.java
@@ -0,0 +1,81 @@
+package cn.pluss.platform.vo;
+
+import cn.pluss.platform.entity.RegionCodeLs;
+import cn.pluss.platform.entity.RegionCodeRyx;
+import cn.pluss.platform.entity.RegionCodeSxf;
+import cn.pluss.platform.entity.RegionCodeYs;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.swing.plaf.synth.Region;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 不同通道的地区表映射表
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-07-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_region_reflect")
+public class RegionReflectVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 通道id
+     */
+    @TableField("channel")
+    private Integer channel;
+
+
+    /**
+     * 使用的地区表id，目前app使用的是乐刷的地区数据
+     */
+    @TableField("regionSrc")
+    private Integer regionSrc;
+
+
+    /**
+     * 目标通道的地区表id
+     */
+    @TableField("regionDes")
+    private Integer regionDes;
+
+    /**
+     * 乐刷地区信息
+     */
+    @TableField(exist = false)
+    private RegionCodeLs src;
+
+    /**
+     * 对应的随行付地区信息
+     */
+    @TableField(exist = false)
+    private RegionCodeSxf sxf;
+
+    /**
+     * 对应的瑞银信地区信息
+     */
+    @TableField(exist = false)
+    private RegionCodeRyx ryx;
+
+    /**
+     * 对应的银盛地区信息
+     */
+    @TableField(exist = false)
+    private RegionCodeYs ys;
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/RiskBlacklistVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/RiskBlacklistVO.java
new file mode 100644
index 0000000..e7c2308
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/RiskBlacklistVO.java
@@ -0,0 +1,55 @@
+package cn.pluss.platform.vo;
+
+import cn.pluss.platform.entity.RiskBlacklist;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class RiskBlacklistVO extends RiskBlacklist {
+
+    /**
+     * 实名姓名
+     */
+    private String userName;
+
+    /**
+     * 商户别名
+     */
+    private String alias;
+
+    /**
+     * 注册手机号
+     */
+    private String regPhone;
+
+    /**
+     * 结算手机号
+     */
+    private String accountPhone;
+
+    /**
+     * 结算卡姓名
+     */
+    private String accountName;
+
+    /**
+     * 上级用户id
+     */
+    private Integer parentId;
+
+    /**
+     * 上级实名姓名
+     */
+    private String parentName;
+
+    /**
+     * 上上级用户id
+     */
+    private Integer grandParentId;
+
+    /**
+     * 上上级实名姓名
+     */
+    private String grandParentName;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/SplitOrderDetailVo.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/SplitOrderDetailVo.java
new file mode 100644
index 0000000..bfb8583
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/SplitOrderDetailVo.java
@@ -0,0 +1,30 @@
+package cn.pluss.platform.vo;
+
+import cn.pluss.platform.entity.MerchantOrderSplitDetail;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * TODO
+ * 分账详情参数封装
+ * @author crystal
+ * @date 2022/7/14 10:10
+ */
+@Data
+@NoArgsConstructor
+public class SplitOrderDetailVo implements Serializable {
+
+    private String merchantCode;
+
+    private String merchantName;
+
+    private String finalAmt;
+
+    public SplitOrderDetailVo(MerchantOrderSplitDetail detail) {
+        this.setMerchantCode(detail.getMerchantCode());
+        this.setMerchantName(detail.getMerchantName());
+        this.setFinalAmt(detail.getFinalAmt().toString());
+    }
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/SplitOrderVo.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/SplitOrderVo.java
new file mode 100644
index 0000000..fdae8fe
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/SplitOrderVo.java
@@ -0,0 +1,61 @@
+package cn.pluss.platform.vo;
+
+import cn.pluss.platform.entity.MerchantOrderSplit;
+import cn.pluss.platform.entity.MerchantOrderSplitDetail;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * TODO
+ * 分账返回参数封装
+ * @author crystal
+ * @date 2022/7/14 10:03
+ */
+@Data
+@NoArgsConstructor
+public class SplitOrderVo  implements Serializable {
+
+    private String merchantCode;
+
+    private String merchantName;
+
+    private String divisionMode;
+
+    private String orderNumber;
+
+    private String mercOrderNo;
+    
+    private Integer divStatus;
+
+    private String orderAmt;
+
+    private String remark;
+
+    private String sign;
+
+    private List<SplitOrderDetailVo> detailList;
+
+    public SplitOrderVo(MerchantOrderSplit order, List<MerchantOrderSplitDetail> splitDetailList) {
+        this.setMerchantCode(order.getMerchantCode());
+        this.setMerchantName(order.getMerchantName());
+        this.setDivisionMode(order.getDivisionMode());
+        this.setOrderNumber(order.getOrderNumber());
+        this.setMercOrderNo(order.getMercOrderNo());
+        this.setDivStatus(order.getDivStatus());
+        this.setOrderAmt(order.getOrderAmt().toString());
+        this.setRemark(order.getRemark());
+        if(!splitDetailList.isEmpty()){
+            List<SplitOrderDetailVo> list = new ArrayList<>(splitDetailList.size());
+            for (MerchantOrderSplitDetail detail:splitDetailList) {
+                SplitOrderDetailVo vo = new SplitOrderDetailVo(detail);
+                list.add(vo);
+            }
+            this.setDetailList(list);
+        }
+    }
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/SpreadData.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/SpreadData.java
new file mode 100644
index 0000000..c0f4011
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/SpreadData.java
@@ -0,0 +1,117 @@
+package cn.pluss.platform.vo;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+/**
+ * @author djh
+ */
+@Data
+public class SpreadData {
+
+    private static final String TYPE_DAY = "1";
+
+    private static final String TYPE_MONTH = "2";
+
+    private static final String TYPE_YEAR = "3";
+
+    /**
+     * 用户id
+     */
+    private String userId;
+
+    /**
+     * 直属商户交易额
+     */
+    private BigDecimal ownAmt;
+
+    /**
+     * 直属与昨日占比
+     */
+    private BigDecimal ownAmtPreCompare;
+
+    /**
+     * 直属商户交易笔数
+     */
+    private Long ownBillCount;
+
+    /**
+     * 直属与昨日占比
+     */
+    private BigDecimal ownBillCountPreCompare;
+
+    /**
+     * 直属新增商户数
+     */
+    private Long ownNewCount;
+
+    private BigDecimal ownNewCountPreCompare;
+
+    /**
+     * 直属活跃商户数
+     */
+    private Long ownActiveCount;
+
+    private BigDecimal ownActiveCountPreCompare;
+
+    /**
+     * 团队商户交易额
+     */
+    private BigDecimal teamAmt;
+
+    private BigDecimal teamAmtPreCompare;
+
+    /**
+     * 团队商户交易笔数
+     */
+    private Long teamBillCount;
+
+    private BigDecimal teamBillCountPreCompare;
+
+    /**
+     * 团队新增商户
+     */
+    private Long teamNewCount;
+
+    private BigDecimal teamNewCountPreCompare;
+
+    /**
+     * 团队活跃商户数
+     */
+    private Long teamActiveCount;
+
+    private BigDecimal teamActiveCountPreCompare;
+
+    /**
+     * 日期
+     */
+    @JSONField(format = "yyyy-MM-dd")
+    private LocalDate startDate;
+
+    /**
+     * 日期
+     */
+    @JSONField(format = "yyyy-MM-dd")
+    private LocalDate endDate;
+
+    @JSONField(format = "yyyy-MM-dd")
+    private LocalDate date;
+
+    /**
+     * 月份  yyyy-MM
+     */
+    private String month;
+
+    /**
+     * 年    yyyy
+     */
+    private String year;
+
+    /**
+     * 类型
+     */
+    private String type;
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/StoreInfoVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/StoreInfoVO.java
new file mode 100644
index 0000000..1118f46
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/StoreInfoVO.java
@@ -0,0 +1,153 @@
+package cn.pluss.platform.vo;
+
+import cn.pluss.platform.entity.MerchantChannelStatus;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author yuchen
+ * 
+ * @Description 
+ */
+@Data
+public class StoreInfoVO {
+	
+	private Integer id;
+	
+	/**
+	 * 门店编码
+	 */
+	private String storeId;
+	
+	/**
+	 * 门店名称
+	 */
+	private String storeName;
+	
+	/**
+	 * 门店logo
+	 */
+	private String logo;
+	
+	/**
+	 * 所属商户
+	 */
+	private String merchantName;
+
+
+
+
+	private String merchantCode;
+	/**
+	 * 行业类型
+	 */
+	private String productDesc;
+	
+	/**
+	 * 详细地址
+	 */
+	private String address;
+	
+	/**
+	 * 门店状态
+	 */
+	private String status;
+	
+	/**
+	 * 门店类型
+	 */
+	private String storeType;
+	
+	/**
+	 * 费率
+	 */
+	private int rate;
+
+	private Date updateTime;
+
+	private int previousRate;
+	
+	private String alias;
+
+	private String userType;
+
+	private String merchantType;
+
+	private String payEcdemicSwitch;
+
+	private String isMarket;
+
+	/**
+	 * 用户id
+	 */
+	private Integer userId;
+
+	/**
+	 * 商户ID
+	 */
+	private Integer mercId;
+
+	private String mcsStatus;
+
+	private String remark;
+
+	private String province;
+
+	private String city;
+
+	private String district;
+
+	private String location;
+
+	/**
+	 * 通道结算类型 D0 D1
+	 */
+	private String settleType;
+	/**
+	 * channelStatusId
+	 */
+	private Integer csId;
+
+	private String operatRemark;
+
+	/**
+	 * @description:是否开启银联支付0：不开启 1：开启
+	 * @date: 2021/10/18 17:54
+	 */
+	private String isUnionPay;
+	
+	/**
+	 * @description:
+	 * @date: 2021/8/4 进件时间
+	 */
+	private Date incomTime;
+
+
+	private Integer channel;
+
+	private String merchantId;
+
+	private String md5Key;
+
+	/**
+	 * 通道有效状态
+	 */
+	private Integer validStatus;
+
+	/**
+	 * 小程序appid
+	 */
+	private String subAppId;
+
+	/**
+	 * 公众号appid
+	 */
+	private String appid;
+
+	@TableField(exist = false)
+	private List<MerchantChannelStatus> channelStatusList;
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/StoreSignVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/StoreSignVO.java
new file mode 100644
index 0000000..7960d39
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/StoreSignVO.java
@@ -0,0 +1,150 @@
+package cn.pluss.platform.vo;
+
+/**
+ * @author yuchen
+ *
+ * @Description 
+ */
+public class StoreSignVO {
+	
+	private Integer id;
+	
+	private String mbcId;
+	
+	private String storeId;
+	
+	private String storeName;
+	
+	private String merchantName;
+	
+	private String aliStatus;
+	
+	private String wechatStatus;
+	
+	private String leshuaStatus;
+	
+	private String aliRate;
+	
+	private String wechatRate;
+	
+	private String leshuaRate;
+	
+	private String linkPhone;
+	
+	private String alias;
+
+	private Integer userId;
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public String getStoreId() {
+		return storeId;
+	}
+
+	public void setStoreId(String storeId) {
+		this.storeId = storeId;
+	}
+
+	public String getStoreName() {
+		return storeName;
+	}
+
+	public void setStoreName(String storeName) {
+		this.storeName = storeName;
+	}
+
+	public String getAliStatus() {
+		return aliStatus;
+	}
+
+	public void setAliStatus(String aliStatus) {
+		this.aliStatus = aliStatus;
+	}
+
+	public String getWechatStatus() {
+		return wechatStatus;
+	}
+
+	public void setWechatStatus(String wechatStatus) {
+		this.wechatStatus = wechatStatus;
+	}
+
+	public String getLeshuaStatus() {
+		return leshuaStatus;
+	}
+
+	public void setLeshuaStatus(String leshuaStatus) {
+		this.leshuaStatus = leshuaStatus;
+	}
+
+	public String getAliRate() {
+		return aliRate;
+	}
+
+	public void setAliRate(String aliRate) {
+		this.aliRate = aliRate;
+	}
+
+	public String getWechatRate() {
+		return wechatRate;
+	}
+
+	public void setWechatRate(String wechatRate) {
+		this.wechatRate = wechatRate;
+	}
+
+	public String getLeshuaRate() {
+		return leshuaRate;
+	}
+
+	public void setLeshuaRate(String leshuaRate) {
+		this.leshuaRate = leshuaRate;
+	}
+
+	public String getMbcId() {
+		return mbcId;
+	}
+
+	public void setMbcId(String mbcId) {
+		this.mbcId = mbcId;
+	}
+
+	public String getLinkPhone() {
+		return linkPhone;
+	}
+
+	public void setLinkPhone(String linkPhone) {
+		this.linkPhone = linkPhone;
+	}
+
+	public String getMerchantName() {
+		return merchantName;
+	}
+
+	public void setMerchantName(String merchantName) {
+		this.merchantName = merchantName;
+	}
+
+	public String getAlias() {
+		return alias;
+	}
+
+	public void setAlias(String alias) {
+		this.alias = alias;
+	}
+
+	public Integer getUserId() {
+		return userId;
+	}
+
+	public void setUserId(Integer userId) {
+		this.userId = userId;
+	}
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/StoreSummaryVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/StoreSummaryVO.java
new file mode 100644
index 0000000..39d5776
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/StoreSummaryVO.java
@@ -0,0 +1,156 @@
+package cn.pluss.platform.vo;
+
+import cn.pluss.platform.dto.AccountDTO;
+import cn.pluss.platform.entity.BankCard;
+import cn.pluss.platform.entity.IdCard;
+import cn.pluss.platform.entity.MerchantBaseInfo;
+import lombok.Data;
+
+/**
+ * @author DJH
+ * 认证信息实体类
+ */
+@Data
+public class StoreSummaryVO {
+
+    public StoreSummaryVO() {
+        this.setMerchantBaseInfoStatus(StoreSummaryVO.NO_DATA);
+        this.setReckonerInfoStatus(StoreSummaryVO.NO_DATA);
+        this.setReckonerBankInfoStatus(StoreSummaryVO.NO_DATA);
+        this.setLegalPersonInfoStatus(StoreSummaryVO.NO_DATA);
+        this.setBusinessLicenseStatus(StoreSummaryVO.NO_DATA);
+        this.setCertInfoStatus(StoreSummaryVO.NO_DATA);
+        this.setD0Status(StoreSummaryVO.NO_DATA);
+        this.setD1Status(StoreSummaryVO.NO_DATA);
+    }
+
+    /** 未填写 */
+    public static final String NO_DATA = "0";
+    /** 已录入 */
+    public static final String HAS_DATA = "1";
+
+    /** 经营信息录入状态 */
+    private String merchantBaseInfoStatus;
+
+    /** 结算人身份信息状态 */
+    private String reckonerInfoStatus;
+
+    /** 结算人银行卡信息 */
+    private String reckonerBankInfoStatus;
+
+    /** 法人信息状态 */
+    private String legalPersonInfoStatus;
+
+    /** 营业执照状态 */
+    private String businessLicenseStatus;
+
+    /** 认证信息状态 */
+    private String certInfoStatus;
+
+    /** 结算类型 */
+    private String settleType;
+
+    /** 进件状态 */
+    private String merchantAuditStatus;
+
+    /** 签约状态。 -1: 审核中, 0：待签约; 1：已签约 */
+    private String signStatus;
+
+    /** 签约链接 */
+    private String signUrl;
+
+    /** 驳回原因 */
+    private String auditReason;
+
+    /** 店铺基本信息 */
+    private MerchantBaseInfo merchantBaseInfo;
+
+    public void setMerchantBaseInfo(MerchantBaseInfo merchantBaseInfo) {
+        this.merchantBaseInfo = merchantBaseInfo;
+        if (merchantBaseInfo != null) {
+            this.merchantBaseInfoStatus = HAS_DATA;
+        }
+    }
+
+    /** 店铺营业执照信息 */
+    private BusinessLicenseVO businessLicense;
+
+    public void setBusinessLicense(BusinessLicenseVO businessLicense) {
+        this.businessLicense = businessLicense;
+        if (businessLicense != null) {
+            this.businessLicenseStatus = HAS_DATA;
+        }
+    }
+
+    /** 结算人身份证信息 */
+    private IdCard reckonerInfo;
+
+    public void setReckonerInfo(IdCard reckonerInfo) {
+        this.reckonerInfo = reckonerInfo;
+        if (reckonerInfo != null) {
+            setReckonerInfoStatus(HAS_DATA);
+        }
+    }
+
+    /** 结算人银行卡 */
+    private BankCard reckonerBankInfo;
+
+    public void setReckonerBankInfo(BankCard reckonerBankInfo) {
+        this.reckonerBankInfo = reckonerBankInfo;
+        if (reckonerBankInfo != null) {
+            setReckonerBankInfoStatus(HAS_DATA);
+        }
+    }
+
+    /** 法人身份证信息 */
+    private IdCard legalPersonInfo;
+
+    public void setLegalPersonInfo(IdCard legalPersonInfo) {
+        this.legalPersonInfo = legalPersonInfo;
+        if (legalPersonInfo != null) {
+            this.legalPersonInfoStatus = HAS_DATA;
+        }
+    }
+
+    /**
+     * 结算信息，D1
+     */
+    private AccountDTO d1;
+
+    public void setD1(AccountDTO d1) {
+        this.d1 = d1;
+        if (d1 != null && d1.getIdcard() != null) {
+            this.d1Status = HAS_DATA;
+            if (HAS_DATA.equals(this.d0Status)) {
+                this.reckonerBankInfoStatus = HAS_DATA;
+                this.reckonerInfoStatus = HAS_DATA;
+            }
+        }
+    }
+
+    /**
+     * 结算信息，D0填写状态
+     */
+    private String d1Status;
+
+    /**
+     * 结算信息，D1
+     */
+    private AccountDTO d0;
+
+    public void setD0(AccountDTO d0) {
+        this.d0 = d0;
+        if (d0 != null && d0.getIdcard() != null) {
+            this.d0Status = HAS_DATA;
+            if (HAS_DATA.equals(this.d1Status)) {
+                this.reckonerBankInfoStatus = HAS_DATA;
+                this.reckonerInfoStatus = HAS_DATA;
+            }
+        }
+    }
+
+    /**
+     * 结算信息，D1填写状态
+     */
+    private String d0Status;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/StoreVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/StoreVO.java
new file mode 100644
index 0000000..773ecca
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/StoreVO.java
@@ -0,0 +1,45 @@
+package cn.pluss.platform.vo;
+
+/**
+ * @author yuchen
+ *
+ * @Description 
+ */
+public class StoreVO {
+	
+	private String storeName;
+	
+	private Double nowDayConsumeFee;
+	
+	private Double sumConsumeFee;
+
+	public String getStoreName() {
+		return storeName;
+	}
+
+	public void setStoreName(String storeName) {
+		this.storeName = storeName;
+	}
+
+	public Double getNowDayConsumeFee() {
+		return nowDayConsumeFee;
+	}
+
+	public void setNowDayConsumeFee(Double nowDayConsumeFee) {
+		this.nowDayConsumeFee = nowDayConsumeFee;
+	}
+
+	public Double getSumConsumeFee() {
+		return sumConsumeFee;
+	}
+
+	public void setSumConsumeFee(Double sumConsumeFee) {
+		this.sumConsumeFee = sumConsumeFee;
+	}
+
+	
+	
+	
+
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/SubMerchantVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/SubMerchantVO.java
new file mode 100644
index 0000000..785c73f
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/SubMerchantVO.java
@@ -0,0 +1,63 @@
+package cn.pluss.platform.vo;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * 子商户信息表
+ * @author DJH
+ */
+@Data
+@Accessors(chain = true)
+public class SubMerchantVO {
+
+    @TableId
+    private Integer id;
+
+    private String merchantId;
+
+    /**
+     * 接入渠道方号
+     */
+    private String channelId;
+
+    /**
+     * 渠道子商户号，查询微信
+     */
+    private String subMchId;
+
+    /**
+     * 不同渠道可能存储的不同
+     * 随行付：WX 微信， ZFB 支付宝
+     */
+    private String subMchType;
+
+    private String remark;
+
+    /**
+     * 对应自己存储的渠道表的id
+     */
+    private String channelTypeId;
+
+    /**
+     * 渠道报备状态，作用未知
+     */
+    private String status;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private String merchantCode;
+
+    private String userId;
+
+    private String loginName;
+
+    private String userName;
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/SummaryOfWaterVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/SummaryOfWaterVO.java
new file mode 100644
index 0000000..272d5ca
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/SummaryOfWaterVO.java
@@ -0,0 +1,165 @@
+package cn.pluss.platform.vo;
+
+/**
+ * 汇总流水
+ * @author yuchen
+ * 
+ * @Description 
+ *
+ */
+public class SummaryOfWaterVO{
+	
+	/**
+	 * 交易总额
+	 */
+	private String dealSum;
+	
+	/**
+	 * 手续费
+	 */
+	private String rate;
+	
+	/**
+	 * 交易笔数
+	 */
+	private String dealCount;
+	
+	/**
+	 * 退款笔数
+	 */
+	private String refundCount;
+	
+	/**
+	 * 实际收款
+	 */
+	private String actualPayment;
+	
+	/**
+	 * 实际到账
+	 */
+	private String actualAccount;
+	
+	/**
+	 * 实退金额
+	 */
+	private String actualMoney;
+	
+	/**
+	 * 商家净收入
+	 */
+	private String  merchantNetIncome;
+	
+	/**
+	 * 净退款
+	 */
+	private String netRefund;
+	
+	/**
+	 * 商家优惠
+	 */
+	private String merchantDiscounts;
+	
+	/**
+	 * 推广分润总额
+	 */
+	private String shareMoney;
+
+	public String getDealSum() {
+		return dealSum;
+	}
+
+	public void setDealSum(String dealSum) {
+		this.dealSum = dealSum;
+	}
+
+	public String getRate() {
+		return rate;
+	}
+
+	public void setRate(String rate) {
+		this.rate = rate;
+	}
+
+	public String getDealCount() {
+		return dealCount;
+	}
+
+	public void setDealCount(String dealCount) {
+		this.dealCount = dealCount;
+	}
+
+	public String getRefundCount() {
+		return refundCount;
+	}
+
+	public void setRefundCount(String refundCount) {
+		this.refundCount = refundCount;
+	}
+
+	public String getActualPayment() {
+		return actualPayment;
+	}
+
+	public void setActualPayment(String actualPayment) {
+		this.actualPayment = actualPayment;
+	}
+
+	public String getActualAccount() {
+		return actualAccount;
+	}
+
+	public void setActualAccount(String actualAccount) {
+		this.actualAccount = actualAccount;
+	}
+
+	public String getActualMoney() {
+		return actualMoney;
+	}
+
+	public void setActualMoney(String actualMoney) {
+		this.actualMoney = actualMoney;
+	}
+
+	public String getMerchantNetIncome() {
+		return merchantNetIncome;
+	}
+
+	public void setMerchantNetIncome(String merchantNetIncome) {
+		this.merchantNetIncome = merchantNetIncome;
+	}
+
+	public String getNetRefund() {
+		return netRefund;
+	}
+
+	public void setNetRefund(String netRefund) {
+		this.netRefund = netRefund;
+	}
+
+	public String getMerchantDiscounts() {
+		return merchantDiscounts;
+	}
+
+	public void setMerchantDiscounts(String merchantDiscounts) {
+		this.merchantDiscounts = merchantDiscounts;
+	}
+
+	@Override
+	public String toString() {
+		return "SummaryOfWaterVO [dealSum=" + dealSum + ", rate=" + rate + ", dealCount=" + dealCount + ", refundCount="
+				+ refundCount + ", actualPayment=" + actualPayment + ", actualAccount=" + actualAccount
+				+ ", actualMoney=" + actualMoney + ", merchantNetIncome=" + merchantNetIncome + ", netRefund="
+				+ netRefund + ", merchantDiscounts=" + merchantDiscounts + "]";
+	}
+
+	public String getShareMoney() {
+		return shareMoney;
+	}
+
+	public void setShareMoney(String shareMoney) {
+		this.shareMoney = shareMoney;
+	}
+	
+	
+
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/UserAppVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/UserAppVO.java
new file mode 100644
index 0000000..8fdbefb
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/UserAppVO.java
@@ -0,0 +1,60 @@
+package cn.pluss.platform.vo;
+
+import cn.pluss.platform.entity.MerchantChannelStatus;
+import cn.pluss.platform.entity.UserApp;
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDateTime;
+
+import java.util.List;
+
+/**
+ * 用户基本信息vo
+ * @author djh
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class UserAppVO extends UserApp {
+
+    /**
+     * 创建时间
+     */
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createTime;
+
+    /**
+     * 当月交易额，直推+团队
+     */
+    private String monthTransFee;
+
+    /**
+     * 上月交易额，直推+团队
+     */
+    private String lastMonthTransFee;
+
+    /**
+     * 比率标志，1：即为上升，显示为红色；2或其他：即为下降，显示为绿色
+     */
+    private String rateFlag;
+
+    /**
+     * 实时到账进件状态
+     */
+    private String merchAuditStatusD0;
+
+    /**
+     * 次日到账进件状态
+     */
+    private String merchAuditStatusD1;
+
+    public UserAppVO() {
+        this.setMerchAuditStatusD0(MerchantChannelStatus.AUDIT_STATUS_RESET);
+        this.setMerchAuditStatusD1(MerchantChannelStatus.AUDIT_STATUS_RESET);
+    }
+
+    private String levelName;
+
+    private List<UserLevelVO> levelVoList;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/UserExpandVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/UserExpandVO.java
new file mode 100644
index 0000000..2daa430
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/UserExpandVO.java
@@ -0,0 +1,74 @@
+package cn.pluss.platform.vo;
+
+/**
+ * @author yuchen
+ *
+ * @Description 
+ */
+public class UserExpandVO {
+	private String id;
+	
+	private String userId;
+	
+	private String logo;
+	
+	private String userName;
+	
+	private String phone;
+	
+	private String createDt;
+
+	public String getLogo() {
+		return logo;
+	}
+
+	public void setLogo(String logo) {
+		this.logo = logo;
+	}
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getUserName() {
+		return userName;
+	}
+
+	public void setUserName(String userName) {
+		this.userName = userName;
+	}
+
+	public String getPhone() {
+		return phone;
+	}
+
+	public void setPhone(String phone) {
+		this.phone = phone;
+	}
+
+	public String getCreateDt() {
+		return createDt;
+	}
+
+	public void setCreateDt(String createDt) {
+		this.createDt = createDt;
+	}
+
+	public String getUserId() {
+		return userId;
+	}
+
+	public void setUserId(String userId) {
+		this.userId = userId;
+	}
+	
+	
+	
+	
+
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/UserInfoVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/UserInfoVO.java
new file mode 100644
index 0000000..d30460a
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/UserInfoVO.java
@@ -0,0 +1,153 @@
+package cn.pluss.platform.vo;
+
+import cn.pluss.platform.entity.MerchantChannelStatus;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+import java.util.List;
+/**
+ * 会员信息/员工信息
+ *
+ * @author Administrator
+ */
+
+/**
+ * @author Administrator
+ *
+ */
+@Data
+public class UserInfoVO {
+
+    private Integer id;
+    private String storeId;
+    private String storeName;
+
+    private String userName;
+    private String loginName;
+    private String trueName;
+    private String provinceCode;
+    private String cityCode;
+    private String sex;
+    private String phone;
+    private String email;
+    private Integer status;
+
+    private Integer uiStatus;
+
+    private String roleCode;
+
+    private String parentUserType;
+    private Integer parentUserId;
+    private String parentUserName;
+    private String aliReason;
+    private String wechatReason;
+    private String password;
+    private String creator;
+    @DateTimeFormat(pattern = "yyyy-MM-dd hh:mm:ss")
+    private Date createDt;
+    @DateTimeFormat(pattern = "yyyy-MM-dd hh:mm:ss")
+    private Date createTime;
+    private String updator;
+    @DateTimeFormat(pattern = "yyyy-MM-dd hh:mm:ss")
+    private Date updateTime;
+    private String version;
+    private Integer parentId;
+    private Integer areaId;
+    private String areaCode;
+    private String source;
+    private String roleIds;
+    private String organCode;
+    private String organName;
+    private String organTypeCode;
+    private String organTypeName;
+    private String userType;
+    private String staffType;
+    //推广员等级
+    private String level;
+
+    private Date startTime;
+    private Date endTime;
+    private String merchantCode;
+    private String merchantName;
+    private String merchantType;
+
+    private String certnum;
+
+    private String parentLoginName;
+
+    private String parentPhone;
+
+    private String inviteNum;
+
+    private String spreadFlag;
+
+    private Integer userId;
+
+    private String contactMobile;
+
+    private String alias;
+
+    private String channel;
+
+    /**
+     * 1 代表要查询同ip
+     */
+    private String sameIp;
+
+    @TableField(exist = false)
+    private Integer condition;
+    /**
+     * 该参数为没有指定进件通道的
+     */
+    private String thirdStatus;
+
+    /**
+     * @description:openid
+     * @date: 2021/9/23 16:20
+     */
+    private String openId;
+    /**
+     * 随行付的通道进件状态
+     */
+    @TableField(exist = false)
+    private String mcsStatus;
+    @TableField(exist = false)
+    private String ppStatus;
+    @TableField(exist = false)
+    private String ppThirdStatus;
+    @TableField(exist = false)
+    private Integer nextRegisterCount;
+    @TableField(exist = false)
+    private Integer nextCertCount;
+    @TableField(exist = false)
+    private Integer nextIncomingCount;
+    @TableField(exist = false)
+    private List<MerchantChannelStatus> channelStatusList;
+    /**
+     * 是否推送微信消息0：不推送 1：推送
+     */
+    private String isPushWxMessage;
+
+    /**
+     * 是否在黑名单中
+     */
+    private Boolean isBlack;
+
+    private String merchantId;
+
+    private String wxMercNo;
+
+    private String zfbMercNo;
+
+    private String wxMercNoD1;
+
+    private String wxMercNoD0;
+
+    private String zfbMercNoD1;
+
+    private String zfbMercNoD0;
+
+    private String levelName;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/UserLevelVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/UserLevelVO.java
new file mode 100644
index 0000000..be438fd
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/UserLevelVO.java
@@ -0,0 +1,25 @@
+package cn.pluss.platform.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ *
+ * 用户2.0等级VO
+ *@author: bzg
+ *@time: 2022/1/25 15:02
+ */
+@Data
+public class UserLevelVO {
+
+    private String roleCode;
+
+    private String levelName;
+
+    private BigDecimal quota;
+
+    private BigDecimal rate;
+
+    private String levelCode;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/UserNumVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/UserNumVO.java
new file mode 100644
index 0000000..a1d3f53
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/UserNumVO.java
@@ -0,0 +1,49 @@
+package cn.pluss.platform.vo;
+
+import lombok.Data;
+
+/**
+ *
+ *用户通用数量VO
+ *@author: bzg
+ *@time: 2022/1/24 22:54
+ */
+@Data
+public class UserNumVO {
+
+    public final static int DATE_TYPE_DAY = 1;
+
+    public final static int DATE_TYPE_MONTH = 2;
+
+    public final static int DATE_TYPE_YEARS = 3;
+
+    /** 类型 1：商户 **/
+    public final static int DATA_TYPE_MERCHANT = 1;
+    /** 类型 2：成员 **/
+    public final static int DATE_TYPE_MEMBER = 2;
+
+    /** 类型 1：直推 **/
+    public final static int DATA_TYPE_DIRET = 1;
+    /** 类型 2：团队 **/
+    public final static int DATE_TYPE_TEAM = 2;
+
+    /** 总数 **/
+    protected Integer totalNum;
+
+    /** 新增数 **/
+    protected Integer addNum;
+
+    /***
+     * 1：按日统计 2：按月统计 3：按年统计
+     */
+    protected Integer dateType;
+
+    /** 日期 **/
+    protected String date;
+
+    protected Long userId;
+
+    /** 数据类型 1：直推 2：团队 **/
+    protected Integer dataType;
+
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/UserTeamAchieVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/UserTeamAchieVO.java
new file mode 100644
index 0000000..13cff37
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/UserTeamAchieVO.java
@@ -0,0 +1,24 @@
+package cn.pluss.platform.vo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+
+/**
+ *
+ *用户团队业绩VO
+ *@author: bzg
+ *@time: 2022/1/24 14:13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class UserTeamAchieVO extends UserNumVO{
+
+    /** 交易金额 **/
+    private BigDecimal tradeAmt;
+
+    /** 交易笔数 **/
+    private Integer tradeNum;
+
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/Video.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/Video.java
new file mode 100644
index 0000000..bda4475
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/Video.java
@@ -0,0 +1,27 @@
+package cn.pluss.platform.vo;
+public class Video {
+	
+private String userCode;//userId
+private String userSig;//签名
+private Integer room;//房间号
+public String getUserCode() {
+	return userCode;
+}
+public void setUserCode(String userCode) {
+	this.userCode = userCode;
+}
+public String getUserSig() {
+	return userSig;
+}
+public void setUserSig(String userSig) {
+	this.userSig = userSig;
+}
+public Integer getRoom() {
+	return room;
+}
+public void setRoom(Integer room) {
+	this.room = room;
+}
+
+	
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/WechatMerchantInfoVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/WechatMerchantInfoVO.java
new file mode 100644
index 0000000..1ed6423
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/WechatMerchantInfoVO.java
@@ -0,0 +1,38 @@
+package cn.pluss.platform.vo;
+
+import cn.pluss.platform.entity.UserApp;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author yuchen
+ *
+ * @Description 
+ * 微信进件信息回显
+ */
+@Data
+public class WechatMerchantInfoVO {
+	
+	@ApiModelProperty(value="当前用户UserId")
+	private Long userId;
+	
+	@ApiModelProperty(value="地址")
+	private String merchantAddress;
+	
+	@ApiModelProperty(value="门头照")
+	private String storeEntrancePic;
+	
+	@ApiModelProperty(value="店内环境照片")
+	private String indoorPic;
+	
+	@ApiModelProperty(value="商户简称")
+	private String merchantName;
+	
+	@ApiModelProperty(value="商户详细地址")
+	private String merchantDetailAddress;
+	
+	@ApiModelProperty(value="联系人号码(超级管理员号码)")
+	private String contactPhone;
+
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/WechatPayParamVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/WechatPayParamVO.java
new file mode 100644
index 0000000..777f799
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/WechatPayParamVO.java
@@ -0,0 +1,93 @@
+package cn.pluss.platform.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @author yuchen
+ *
+ * @Description 
+ */
+public class WechatPayParamVO {
+	
+	@ApiModelProperty(value="应用ID")
+	private String appId;
+	
+	@ApiModelProperty(value="商户号")
+	private String partnerid;
+	
+	@ApiModelProperty(value="预支付交易会话ID")
+	private String prepayid;
+	
+	@ApiModelProperty(value="扩展字段")
+	private String SignPackage;
+	
+	@ApiModelProperty(value="随机字符串")
+	private String noncestr;
+	
+	@ApiModelProperty(value="时间戳")
+	private String timestamp;
+	
+	@ApiModelProperty(value="签名")
+	private String sign;
+
+	public String getAppId() {
+		return appId;
+	}
+
+	public void setAppId(String appId) {
+		this.appId = appId;
+	}
+
+	public String getPartnerid() {
+		return partnerid;
+	}
+
+	public void setPartnerid(String partnerid) {
+		this.partnerid = partnerid;
+	}
+
+	public String getPrepayid() {
+		return prepayid;
+	}
+
+	public void setPrepayid(String prepayid) {
+		this.prepayid = prepayid;
+	}
+
+	public String getSignPackage() {
+		return SignPackage;
+	}
+
+	public void setSignPackage(String signPackage) {
+		SignPackage = signPackage;
+	}
+
+	public String getNoncestr() {
+		return noncestr;
+	}
+
+	public void setNoncestr(String noncestr) {
+		this.noncestr = noncestr;
+	}
+
+	public String getTimestamp() {
+		return timestamp;
+	}
+
+	public void setTimestamp(String timestamp) {
+		this.timestamp = timestamp;
+	}
+
+	public String getSign() {
+		return sign;
+	}
+
+	public void setSign(String sign) {
+		this.sign = sign;
+	}
+	
+	
+	
+
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/WishlevelInfoVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/WishlevelInfoVO.java
new file mode 100644
index 0000000..9514896
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/WishlevelInfoVO.java
@@ -0,0 +1,84 @@
+package cn.pluss.platform.vo;
+
+import lombok.Data;
+
+/**
+ * @author yuchen
+ *
+ * @Description 等级升级信息VO
+ */
+@Data
+public class WishlevelInfoVO {
+	
+	/**
+	 * 当前等级
+	 */
+	private Integer nowLevel;
+	
+	/**
+	 * 当前等级名称
+	 */
+	private String nowLevelName;
+	
+	/**
+	 * 当前等级费率
+	 */
+	private String nowLevelRate;
+	
+	/**
+	 * 当前等级图片
+	 */
+	private String nowLevelLogo;
+	
+	/**
+	 * 当前等级累计交易金额
+	 */
+	private Double nowLevelAccumulatedTradeMoney;
+	
+	/**
+	 * 当前等级目标交易金额
+	 */
+	private Double nowLevelTargetTradeMoney;
+	
+	/**
+	 * 当前等级累计实名认证数
+	 */
+	private Double nowLevelAccumulatedAuthCount;
+	
+	/**
+	 * 当前等级目标实名认证数
+	 */
+	private Integer nowLevelTargetAuthCount;
+	
+	
+	/**
+	 * 下一等级名称
+	 */
+	private String nextLevelName;
+	
+	/**
+	 * 下一等级费率
+	 */
+	private String nextLevelRate;
+	
+	/**
+	 * 下一等级图片
+	 */
+	private String nextLevelLogo;
+
+	/**
+	 * 付费升下一等级展示图片
+	 */
+	private String nextLevelImg;
+	
+	/**
+	 * 是否显示 0隐藏 1显示
+	 */
+	private String isShow;
+	
+	
+	private String userName;
+	private String userLogo;
+
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/WxCertInfoVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/WxCertInfoVO.java
new file mode 100644
index 0000000..52f9df5
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/WxCertInfoVO.java
@@ -0,0 +1,123 @@
+package cn.pluss.platform.vo;
+
+import cn.pluss.platform.entity.Account;
+import cn.pluss.platform.entity.SubMerchantApplyOrder;
+import lombok.Data;
+
+/**
+ * 微信认证信息VO
+ *
+ * @author djh
+ */
+@Data
+public class WxCertInfoVO {
+
+    /**
+     * M800商编
+     */
+    private String merchantCode;
+
+    /**
+     * 通道商编
+     */
+    private String merchantId;
+
+    /**
+     * 通道id
+     */
+    private String channelId;
+
+    /**
+     * 通道名称
+     */
+    private String channelName;
+
+    /**
+     * 通道类型
+     */
+    private String channelType;
+
+    public void setChannelType(String channelType) {
+        this.channelType = channelType;
+        if (channelType.equals(Account.CHANNEL_TYPE_D0)) {
+            channelTypeDesc = "实时到账";
+        }
+
+        if (channelType.equals(Account.CHANNEL_TYPE_D1)) {
+            channelTypeDesc = "次日到账";
+        }
+    }
+
+    /**
+     * 通道类型描述
+     */
+    private String channelTypeDesc;
+
+    /**
+     * 状态
+     */
+    private String status;
+
+    public void setStatus(String status) {
+        this.status = status;
+
+        if (status == null) {
+            return;
+        }
+
+        switch (status) {
+            case SubMerchantApplyOrder.STATUS_NO_AUDIT:
+                statusDesc = "暂未进件";
+                break;
+            case SubMerchantApplyOrder.RES_STATUS_REVIEW:
+                statusDesc = "认证中";
+                break;
+            case SubMerchantApplyOrder.RES_STATUS_SUCCESS:
+                statusDesc = "待授权";
+                break;
+            case SubMerchantApplyOrder.RES_STATUS_COMPLETE:
+                statusDesc = "认证完成";
+                break;
+            case SubMerchantApplyOrder.RES_STATUS_COMMIT_ERROR:
+                statusDesc = "认证异常";
+                break;
+            default:
+                this.status = SubMerchantApplyOrder.STATUS_NO_WX_AUDIT;
+                statusDesc = "未认证";
+                break;
+        }
+    }
+
+    /**
+     * 状态描述
+     */
+    private String statusDesc;
+
+    /**
+     * 微信子商户号
+     */
+    private String wxSubMerchantId;
+
+    /**
+     * 微信认证状态备注
+     */
+    private String remark;
+
+    /**
+     * 认证码图片链接
+     */
+    private String infoQrcode;
+
+    /**
+     * 手动认证码连接
+     */
+    private String altImgUrl;
+
+    public static WxCertInfoVO empty(String channelType) {
+        WxCertInfoVO wxCertInfoVO = new WxCertInfoVO();
+        wxCertInfoVO.setChannelType(channelType);
+        wxCertInfoVO.setStatus(SubMerchantApplyOrder.STATUS_NO_AUDIT);
+
+        return wxCertInfoVO;
+    }
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/wap/AliUserInfoVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/wap/AliUserInfoVO.java
new file mode 100644
index 0000000..bccee9e
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/wap/AliUserInfoVO.java
@@ -0,0 +1,82 @@
+package cn.pluss.platform.wap;
+
+import com.alipay.api.response.AlipayUserInfoShareResponse;
+
+/**
+ * @author yuchen
+ *
+ * @Description 
+ */
+public class AliUserInfoVO {
+	
+	private String userId;
+	private String avatar;
+	private String province;
+	private String city;
+	private String nickName ;
+	private String area;
+	private String gender;
+	public String getUserId() {
+		return userId;
+	}
+	public void setUserId(String userId) {
+		this.userId = userId;
+	}
+	public String getAvatar() {
+		return avatar;
+	}
+	public void setAvatar(String avatar) {
+		this.avatar = avatar;
+	}
+	public String getProvince() {
+		return province;
+	}
+	public void setProvince(String province) {
+		this.province = province;
+	}
+	public String getCity() {
+		return city;
+	}
+	public void setCity(String city) {
+		this.city = city;
+	}
+	public String getNickName() {
+		return nickName;
+	}
+	public void setNickName(String nickName) {
+		this.nickName = nickName;
+	}
+	public String getArea() {
+		return area;
+	}
+	public void setArea(String area) {
+		this.area = area;
+	}
+	public String getGender() {
+		return gender;
+	}
+	public void setGender(String gender) {
+		this.gender = gender;
+	}
+	
+	public static AliUserInfoVO convertAlipayUserInfoShareResponse(AlipayUserInfoShareResponse response) {
+		AliUserInfoVO vo=new AliUserInfoVO();
+		String avatar = response.getAvatar();
+		String province = response.getProvince();
+		String city = response.getCity();
+		String nickName = response.getNickName();
+		String area = response.getArea();
+		String gender = response.getGender();
+		vo.setUserId(response.getUserId());
+		vo.setAvatar(avatar);
+		vo.setCity(city);
+		vo.setGender(gender);
+		vo.setNickName(nickName);
+		vo.setProvince(province);
+		vo.setArea(area);
+		return vo;
+	}
+	
+
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/wap/CheckObjectIsNullUtils.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/wap/CheckObjectIsNullUtils.java
new file mode 100644
index 0000000..a57fdbb
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/wap/CheckObjectIsNullUtils.java
@@ -0,0 +1,46 @@
+package cn.pluss.platform.wap;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Type;
+
+/**
+ * @author yuchen
+ *
+ * @Description 
+ * 判断对象是否为null
+ */
+public class CheckObjectIsNullUtils {
+	/**
+     * 判断对象是否为空，且对象的所有属性都为空
+     * ps: boolean类型会有默认值false 判断结果不会为null 会影响判断结果
+     *     序列化的默认值也会影响判断结果
+     * @param object
+     * @return
+     */
+    public  boolean objCheckIsNull(Object object){
+        Class clazz = (Class)object.getClass(); // 得到类对象
+        Field fields[] = clazz.getDeclaredFields(); // 得到所有属性
+        boolean flag = true; //定义返回结果，默认为true
+        for(Field field : fields){
+            field.setAccessible(true);
+            Object fieldValue = null;
+            try {
+                fieldValue = field.get(object); //得到属性值
+                Type fieldType =field.getGenericType();//得到属性类型
+                String fieldName = field.getName(); // 得到属性名
+                System.out.println("属性类型："+fieldType+",属性名："+fieldName+",属性值："+fieldValue);
+            } catch (IllegalArgumentException e) {
+                e.printStackTrace();
+            } catch (IllegalAccessException e) {
+                e.printStackTrace();
+            }
+            if(fieldValue != null){  //只要有一个属性值不为null 就返回false 表示对象不为null
+                flag = false;
+                break;
+            }
+        }
+        return flag;
+    }
+
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/wap/HttpUrlConnection.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/wap/HttpUrlConnection.java
new file mode 100644
index 0000000..9c0f2ed
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/wap/HttpUrlConnection.java
@@ -0,0 +1,112 @@
+package cn.pluss.platform.wap;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+/**
+ * @author yuchen
+ * 
+ * @Description 
+ */
+public class HttpUrlConnection {
+			
+	/**
+	 * 
+	 * httpXML:(向微信发起统一下单请求  得到对应的返回值 ). <br/> 
+	 * 
+	 * @author Administrator 
+	 * @param url
+	 * @param xml
+	 * @return 
+	 * @since JDK 1.8
+	 */
+	public static String httpXML(String url, String xml) {
+		String result = null;
+		try {
+			InputStream is = httpPostXML(url, xml);
+			BufferedReader in = new BufferedReader(new InputStreamReader(is,
+					"UTF-8"));
+			StringBuffer buffer = new StringBuffer();
+			String line = "";
+			while ((line = in.readLine()) != null) {
+				buffer.append(line);
+			}
+			result = buffer.toString();
+		} catch (Exception e) {
+			e.printStackTrace();
+			return null;
+		}
+		return result;
+	}
+ 
+	private static InputStream httpPostXML(String url, String xml) {
+		InputStream is = null;
+		PrintWriter out = null;
+		try {
+			URL u;
+			u = new URL(url);
+			HttpURLConnection conn = (HttpURLConnection) u.openConnection();
+			
+			conn.setRequestProperty("Content-Type",
+					"application/x-www-form-urlencoded");
+			conn.setConnectTimeout(20000);
+			conn.setReadTimeout(50000);
+			conn.setDoOutput(true);
+			conn.setDoInput(true);
+			conn.setUseCaches(false);
+			conn.setRequestMethod("POST");
+			OutputStreamWriter outWriter = new OutputStreamWriter(
+					conn.getOutputStream(), "UTF-8");
+			out = new PrintWriter(outWriter);
+			out.print(xml);
+			out.flush();
+			out.close();
+			is = conn.getInputStream();
+		} catch (Exception e) {
+ 
+			e.printStackTrace();
+		}
+		return is;
+	}
+	
+	/**
+	 * 
+	 * convertRequestParamsToMap:(将request中的参数转换成Map 已测试 可用). <br/> 
+	 * 
+	 * @author Administrator 
+	 * @param request
+	 * @return 
+	 * @since JDK 1.8
+	 */
+    public static Map<String, Object> convertRequestParamsToMap(HttpServletRequest request) {
+        Map<String, Object> retMap = new HashMap<>();
+        Set<Entry<String, String[]>> entrySet = request.getParameterMap().entrySet();
+        for (Entry<String, String[]> entry : entrySet) {
+            String name = entry.getKey();
+            String[] values = entry.getValue();
+            int valLen = values.length;
+
+            if (valLen == 1) {
+                retMap.put(name, values[0]);
+            } else if (valLen > 1) {
+                StringBuilder sb = new StringBuilder();
+                for (String val : values) {
+                    sb.append(",").append(val);
+                }
+                retMap.put(name, sb.substring(1));
+            } else {
+                retMap.put(name, "");
+            }
+        }
+        return retMap;
+    }
+	
+	
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/wap/LevelDTO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/wap/LevelDTO.java
new file mode 100644
index 0000000..5a6d377
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/wap/LevelDTO.java
@@ -0,0 +1,60 @@
+package cn.pluss.platform.wap;
+
+/**
+ * @author yuchen
+ * 
+ * @Description 
+ */
+public class LevelDTO {
+	
+	private String userAppId;
+	
+	private String money;
+	
+	private String payWay;
+
+	private String userid;
+
+	private String openid;
+
+	public String getUserAppId() {
+		return userAppId;
+	}
+
+	public void setUserAppId(String userAppId) {
+		this.userAppId = userAppId;
+	}
+
+	public String getMoney() {
+		return money;
+	}
+
+	public void setMoney(String money) {
+		this.money = money;
+	}
+
+	public String getPayWay() {
+		return payWay;
+	}
+
+	public void setPayWay(String payWay) {
+		this.payWay = payWay;
+	}
+
+	public String getUserid() {
+		return userid;
+	}
+
+	public void setUserid(String userid) {
+		this.userid = userid;
+	}
+
+	public String getOpenid() {
+		return openid;
+	}
+
+	public void setOpenid(String openid) {
+		this.openid = openid;
+	}
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/wap/MD5Util.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/wap/MD5Util.java
new file mode 100644
index 0000000..a41957d
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/wap/MD5Util.java
@@ -0,0 +1,42 @@
+package cn.pluss.platform.wap;
+
+import java.security.MessageDigest;
+
+/**
+ * @author yuchen
+ *
+ * @Description 
+ */
+public class MD5Util {
+	
+	private static final String hexDigits[] = {"0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C", "D", "E", "F"};
+
+	private static String byteArrayToHexString(byte b[]) {
+		StringBuffer resultSb = new StringBuffer();
+		for (int i = 0; i < b.length; i++)
+			resultSb.append(byteToHexString(b[i]));
+		return resultSb.toString();
+	}
+
+	private static String byteToHexString(byte b) {
+		int n = b;
+		if (n < 0)
+			n += 256;
+		int d1 = n / 16;
+		int d2 = n % 16;
+		return hexDigits[d1] + hexDigits[d2];
+	}
+
+	public static String MD5Encode(String origin) {
+		String result = null;
+		try {
+			result = new String(origin);
+			MessageDigest md = MessageDigest.getInstance("MD5");
+			result = byteArrayToHexString(md.digest(result.getBytes("UTF-8")));
+		} catch (Exception exception) {
+		}
+		return result;
+	}
+
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/wap/MerchantAliPayDTO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/wap/MerchantAliPayDTO.java
new file mode 100644
index 0000000..46945bf
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/wap/MerchantAliPayDTO.java
@@ -0,0 +1,78 @@
+package cn.pluss.platform.wap;
+
+import cn.pluss.platform.entity.MerchantOrder;
+import cn.pluss.platform.util.StringUtil;
+import lombok.Data;
+
+/**
+ * @author yuchen
+ * 
+ * @Description 
+ * (wap端支付宝支付)
+ */
+@Data
+public class MerchantAliPayDTO {
+	
+	/**
+	 * 支付宝 商户token(在创建支付宝订单的时候需要)
+	 */
+	private String appAuthToken;
+	
+	private String userAppId;
+	
+	/**
+	 * 用户的支付宝userid
+	 */
+	private String userid;
+	
+	/**
+	 * 支付金额
+	 */
+	private String comsumeMoney;
+	
+	/**
+	 * 商家编码
+	 */
+	private String merchantCode;
+	
+	private String storeId;
+	
+	private String orderNumber="Z"+StringUtil.getBillno();
+	
+	/**
+	 * 用户头像
+	 */
+	private String userImg;
+	
+	/**
+	 * 用户昵称
+	 */
+	private String nickName;
+	
+	private String remark;
+
+	/**
+	 * 支付宝支付订单流水号
+	 */
+	private String aliPayTransNo;
+
+	public MerchantOrder getMerchantOrder() {
+		MerchantOrder merchantOrder=new MerchantOrder();
+		merchantOrder.setConsumeFee(this.comsumeMoney==""?0.0d:Double.valueOf(this.comsumeMoney));
+		merchantOrder.setMerchantCode(this.merchantCode);
+		merchantOrder.setStoreId(this.storeId);
+		merchantOrder.setPayTypeCode("aliPay");
+		merchantOrder.setPayTypeName("支付宝");
+		merchantOrder.setStatus("5");
+		merchantOrder.setOrderType("2");
+		merchantOrder.setUserImg(userImg);
+		merchantOrder.setNickName(nickName);
+		merchantOrder.setOrderNumber(this.orderNumber);
+		merchantOrder.setThirdTransNo(this.aliPayTransNo);
+		return merchantOrder;
+	}
+	
+	
+
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/wap/MerchantLeshuaDTO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/wap/MerchantLeshuaDTO.java
new file mode 100644
index 0000000..0f7b20e
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/wap/MerchantLeshuaDTO.java
@@ -0,0 +1,156 @@
+package cn.pluss.platform.wap;
+
+/**
+ * @author yuchen
+ *
+ * @Description 
+ * wap端 乐刷支付dto
+ */
+public class MerchantLeshuaDTO {
+	
+	/**
+	 * 是否是会员（微信的时候才有） 1是会员
+	 */
+	private String isMember;
+	
+	/**
+	 * 微信 weixinPay 会员卡支付memberPay
+	 */
+	private String radioPay;
+	
+	
+	/**
+	 * 消费金额
+	 */
+	private  Double comsumeMoney;
+	
+	/**
+	 * 乐刷商户id
+	 */
+	private String leshuaMchId;
+	
+	/**
+	 * 当前商户code
+	 */
+	private String merchantCode;
+	
+	/**
+	 * 当前门店id
+	 */
+	private String storeId;
+	
+	/**
+	 * 支付方式 ZFBZF 支付宝支付  WXZF 微信支付
+	 */
+	private String payWay;
+	
+	private String userImg;
+	
+	private String nickName;
+	
+	private String remark;
+	
+	private String openId;
+
+	private String ip;
+
+	
+	
+	
+	public String getOpenId() {
+		return openId;
+	}
+
+	public void setOpenId(String openId) {
+		this.openId = openId;
+	}
+
+	public String getRemark() {
+		return remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
+	public Double getComsumeMoney() {
+		return comsumeMoney;
+	}
+
+	public void setComsumeMoney(Double comsumeMoney) {
+		this.comsumeMoney = comsumeMoney;
+	}
+
+	public String getLeshuaMchId() {
+		return leshuaMchId;
+	}
+
+	public void setLeshuaMchId(String leshuaMchId) {
+		this.leshuaMchId = leshuaMchId;
+	}
+
+	public String getMerchantCode() {
+		return merchantCode;
+	}
+
+	public void setMerchantCode(String merchantCode) {
+		this.merchantCode = merchantCode;
+	}
+
+	public String getStoreId() {
+		return storeId;
+	}
+
+	public void setStoreId(String storeId) {
+		this.storeId = storeId;
+	}
+
+	public String getPayWay() {
+		return payWay;
+	}
+
+	public void setPayWay(String payWay) {
+		this.payWay = payWay;
+	}
+
+	public String getUserImg() {
+		return userImg;
+	}
+
+	public void setUserImg(String userImg) {
+		this.userImg = userImg;
+	}
+
+	public String getNickName() {
+		return nickName;
+	}
+
+	public void setNickName(String nickName) {
+		this.nickName = nickName;
+	}
+
+	public String getIsMember() {
+		return isMember;
+	}
+
+	public void setIsMember(String isMember) {
+		this.isMember = isMember;
+	}
+
+	public String getRadioPay() {
+		return radioPay;
+	}
+
+	public void setRadioPay(String radioPay) {
+		this.radioPay = radioPay;
+	}
+
+	public String getIp() {
+		return ip;
+	}
+
+	public void setIp(String ip) {
+		this.ip = ip;
+	}
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/wap/MerchantWechatPayDTO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/wap/MerchantWechatPayDTO.java
new file mode 100644
index 0000000..23f6093
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/wap/MerchantWechatPayDTO.java
@@ -0,0 +1,276 @@
+package cn.pluss.platform.wap;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import cn.pluss.platform.entity.MerchantOrder;
+import cn.pluss.platform.util.StringUtil;
+
+/**
+ * @author yuchen
+ *
+ * @Description 
+ * (wap端微信支付)
+ */
+public class MerchantWechatPayDTO {
+    
+	/**
+	 * 支付金额
+	 */
+	private String comsumeMoney;
+	
+	/**
+	 * 支付宝用户openid
+	 */
+	private String openid;
+	
+	/**
+	 * 自己的数据库的商户code
+	 */
+	private String merchantCode;
+	
+	private String storeId;
+	
+	
+	/**
+	 * 随机字符串
+	 */
+	private String nonceStr;
+	
+	/**
+	 * 商品描述
+	 */
+	private String body="payment";
+	
+	/**
+	 * 商户平台id
+	 */
+	private String mchId;
+	
+	private String subMchId;
+	
+	
+	/**
+	 * 公众号id
+	 */
+	private String appid;
+	
+	/**
+	 * 异步回调api
+	 */
+	private String notifyUrl;
+	
+	/**
+	 * 用户支付ip
+	 */
+	private String ip;
+	
+	/**
+	 * 商品订单号
+	 */
+	private String orderSn;
+	
+	private String userAppId;
+	
+	private String userImg;
+	
+	private String nickName;
+	private String remark;
+	
+	
+	public String getUserImg() {
+		return userImg;
+	}
+
+	public void setUserImg(String userImg) {
+		this.userImg = userImg;
+	}
+
+	public String getNickName() {
+		return nickName;
+	}
+
+	public void setNickName(String nickName) {
+		this.nickName = nickName;
+	}
+
+	public String getBody() {
+		return body;
+	}
+
+	public void setBody(String body) {
+		this.body = body;
+	}
+
+	public String getMchId() {
+		return mchId;
+	}
+
+	public void setMchId(String mchId) {
+		this.mchId = mchId;
+	}
+
+	public String getAppid() {
+		return appid;
+	}
+
+	public void setAppid(String appid) {
+		this.appid = appid;
+	}
+
+	public String getNotifyUrl() {
+		return notifyUrl;
+	}
+
+	public void setNotifyUrl(String notifyUrl) {
+		this.notifyUrl = notifyUrl;
+	}
+
+	public String getIp() {
+		return ip;
+	}
+
+	public void setIp(String ip) {
+		this.ip = ip;
+	}
+
+	public String getOrderSn() {
+		return orderSn;
+	}
+
+	public void setOrderSn(String orderSn) {
+		this.orderSn = orderSn;
+	}
+
+	public String getNonceStr() {
+		return nonceStr;
+	}
+
+	public void setNonceStr(String nonceStr) {
+		this.nonceStr = nonceStr;
+	}
+
+	public String getMerchantCode() {
+		return merchantCode;
+	}
+
+	public void setMerchantCode(String merchantCode) {
+		this.merchantCode = merchantCode;
+	}
+
+	public String getComsumeMoney() {
+		return comsumeMoney;
+	}
+
+	public void setComsumeMoney(String comsumeMoney) {
+		this.comsumeMoney = comsumeMoney;
+	}
+
+	public String getOpenid() {
+		return openid;
+	}
+
+	public void setOpenid(String openid) {
+		this.openid = openid;
+	}
+	
+	
+	
+	public String getUserAppId() {
+		return userAppId;
+	}
+
+	public void setUserAppId(String userAppId) {
+		this.userAppId = userAppId;
+	}
+	
+	public String getStoreId() {
+		return storeId;
+	}
+
+	public void setStoreId(String storeId) {
+		this.storeId = storeId;
+	}
+
+	public String getSubMchId() {
+		return subMchId;
+	}
+
+	public void setSubMchId(String subMchId) {
+		this.subMchId = subMchId;
+	}
+
+	
+
+	public String getRemark() {
+		return remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
+	@Override
+	public String toString() {
+		return "MerchantWechatPayDTO [comsumeMoney=" + comsumeMoney + ", openid=" + openid + ", merchantCode="
+				+ merchantCode + ", nonceStr=" + nonceStr + ", body=" + body + ", mchId=" + mchId + ", subMchId="
+				+ subMchId + ", appid=" + appid + ", notifyUrl=" + notifyUrl + ", ip=" + ip + ", orderSn=" + orderSn
+				+ ", userAppId=" + userAppId + "]";
+	}
+
+	public MerchantOrder getMerchantOrder() {
+		MerchantOrder merchantOrder=new MerchantOrder();
+		merchantOrder.setConsumeFee(this.comsumeMoney==""?0.0d:Double.valueOf(this.comsumeMoney));
+		merchantOrder.setMerchantCode(this.merchantCode);
+		merchantOrder.setPayTypeCode("wechat");
+		merchantOrder.setPayTypeName("1");
+		merchantOrder.setStatus("5");
+		merchantOrder.setOrderType("2");
+		merchantOrder.setUserImg(userImg);
+		merchantOrder.setNickName(nickName);
+		merchantOrder.setOrderNumber(this.orderSn);
+		merchantOrder.setRemark(remark);
+		return merchantOrder;
+	}
+	
+	
+	public Map<String, String> getMap(MerchantWechatPayDTO merchantWechatPayDTO,String WX_PAY_KEY){
+		String nonceStr = StringUtil.generateMixStr(10);
+		String orderSn="W"+StringUtil.getBillno();
+		String comsumeMoney = merchantWechatPayDTO.getComsumeMoney();
+		Double money = Double.valueOf(comsumeMoney);
+		int i=(int) (money*100);
+		Map<String, String> map=new HashMap<String, String>(16);
+		map.put("body", merchantWechatPayDTO.getBody());//商品描述
+		map.put("mch_id", merchantWechatPayDTO.getMchId());//商户平台id
+		map.put("sub_mchid", merchantWechatPayDTO.getSubMchId());
+		map.put("appid", merchantWechatPayDTO.getAppid());//公众号id
+		map.put("nonce_str", nonceStr);//随机字符串
+		map.put("notify_url", merchantWechatPayDTO.getNotifyUrl());//异步回调api
+		map.put("spbill_create_ip", merchantWechatPayDTO.getIp());//支付ip
+		map.put("out_trade_no", orderSn);//商品订单号
+		map.put("total_fee", i+"");//真实金额
+		map.put("trade_type", "JSAPI");//JSAPI、h5调用
+		map.put("openid", merchantWechatPayDTO.getOpenid());
+		String sign = WxPaySignatureUtils.signature(map, WX_PAY_KEY);
+		StringBuffer xml=new StringBuffer();
+		xml.append("<xml>");
+		xml.append("<appid>"+ merchantWechatPayDTO.getAppid() +"</appid>");
+		xml.append("<body>"+ merchantWechatPayDTO.getBody() +"</body>");
+		xml.append("<mch_id>"+ merchantWechatPayDTO.getMchId() +"</mch_id>");
+		xml.append("<sub_mch_id>"+ merchantWechatPayDTO.getSubMchId() +"</sub_mch_id>");
+		xml.append("<nonce_str>"+ nonceStr +"</nonce_str>");
+		xml.append( "<notify_url>"+ merchantWechatPayDTO.getNotifyUrl() +"</notify_url>");
+		xml.append("<openid>"+ merchantWechatPayDTO.getOpenid() +"</openid>");
+		xml.append("<out_trade_no>"+ orderSn +"</out_trade_no>");
+		xml.append("<spbill_create_ip>"+ merchantWechatPayDTO.getIp() +"</spbill_create_ip>");
+		xml.append("<total_fee>"+ i +"</total_fee>");
+		xml.append("<trade_type>JSAPI</trade_type>");
+		xml.append("<sign>"+ sign +"</sign>");
+		xml.append("</xml>");
+		map.put("xml", xml.toString());
+		return map;
+	}
+	
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/wap/PayUnitedRequest.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/wap/PayUnitedRequest.java
new file mode 100644
index 0000000..1b787e9
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/wap/PayUnitedRequest.java
@@ -0,0 +1,212 @@
+/* 
+ * Copyrights 尚果科技平台研发项目组 @ 2015，尚果科技 SEOCOO Computer Co., Ltd.<br>
+ * 项目名称：尚果科技-平台开发组 <br>
+ * 文件名称：PayUnitedRequest.java <br>
+ * 创建时间：2015-6-15-下午03:58:22 <br>
+ * Description： 
+ * History：<br> [ Author Date Version Content ]<br>
+ *  
+ */
+package cn.pluss.platform.wap;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import cn.pluss.platform.util.StringUtil;
+import cn.pluss.platform.wechat.PayInfo;
+public class PayUnitedRequest {
+	
+	 private static final Logger logger = LoggerFactory.getLogger( PayUnitedRequest.class);
+
+	private String appid;
+	private String mch_id;
+	private String device_info;
+	private String nonce_str;
+	private String body;
+	private String out_trade_no;
+	private String total_fee;
+	private String spbill_create_ip;
+	private String notify_url;
+	private String trade_type;
+	private String openid;
+
+	public String getAppid() {
+		return appid;
+	}
+
+	public void setAppid(String appid) {
+		this.appid = appid;
+	}
+
+	public String getMch_id() {
+		return mch_id;
+	}
+
+	public void setMch_id(String mch_id) {
+		this.mch_id = mch_id;
+	}
+
+	public String getNonce_str() {
+		return nonce_str;
+	}
+
+	public void setNonce_str(String nonce_str) {
+		this.nonce_str = nonce_str;
+	}
+
+	public String getBody() {
+		return body;
+	}
+
+	public void setBody(String body) {
+		this.body = body;
+	}
+
+	public String getOut_trade_no() {
+		return out_trade_no;
+	}
+
+	public void setOut_trade_no(String out_trade_no) {
+		this.out_trade_no = out_trade_no;
+	}
+
+	public String getTotal_fee() {
+		return total_fee;
+	}
+
+	public void setTotal_fee(String total_fee) {
+		this.total_fee = total_fee;
+	}
+
+	public String getSpbill_create_ip() {
+		return spbill_create_ip;
+	}
+
+	public void setSpbill_create_ip(String spbill_create_ip) {
+		this.spbill_create_ip = spbill_create_ip;
+	}
+
+	public String getNotify_url() {
+		return notify_url;
+	}
+
+	public void setNotify_url(String notify_url) {
+		this.notify_url = notify_url;
+	}
+
+	public String getTrade_type() {
+		return trade_type;
+	}
+
+	public String getOpenid() {
+		return openid;
+	}
+
+	public void setOpenid(String openid) {
+		this.openid = openid;
+	}
+
+	public void setTrade_type(String trade_type) {
+		this.trade_type = trade_type;
+	}
+
+	public String getDevice_info() {
+		return device_info;
+	}
+
+	public void setDevice_info(String device_info) {
+		this.device_info = device_info;
+	}
+
+	@Override
+	public String toString() {
+		return "PayUnitedRequest [appid=" + appid + ", mch_id=" + mch_id + ", device_info=" + device_info
+				+ ", nonce_str=" + nonce_str + ", body=" + body + ", out_trade_no=" + out_trade_no + ", total_fee="
+				+ total_fee + ", spbill_create_ip=" + spbill_create_ip + ", notify_url=" + notify_url + ", trade_type="
+				+ trade_type + ", openid=" + openid + "]";
+	}
+
+	public Map<String, String> getMap(PayInfo payInfo, String notify_url, String ip) {
+		Double orderPrice = payInfo.getOrderPrice();
+		int price=(int) (orderPrice*100);
+		String billno = StringUtil.getBillno();
+		Map<String, String> map = new HashMap<String, String>(16);
+		map.put("body", payInfo.getGoodsName());// 商品描述
+		map.put("sub_mch_id", payInfo.getSubMchId());
+		map.put("mch_id", payInfo.getPid());// 商户平台id
+		map.put("appid", payInfo.getAppId());// 公众号id
+		map.put("nonce_str", billno);// 随机字符串
+		map.put("notify_url", notify_url);// 异步回调api
+		map.put("spbill_create_ip", ip);// 支付ip
+		map.put("out_trade_no", payInfo.getOrderNumber());// 商品订单号
+		map.put("total_fee", price+"");// 真实金额
+		map.put("trade_type", "JSAPI");// JSAPI、h5调用
+		map.put("openid", payInfo.getOpenId());
+		System.out.println(map);
+		String sign = WxPaySignatureUtils.signature(map, payInfo.getPkey());
+		System.out.println(sign);
+		StringBuffer xml = new StringBuffer();
+		xml.append("<xml>");
+		xml.append("<appid>" + payInfo.getAppId() + "</appid>");
+		xml.append("<body>" + payInfo.getGoodsName() + "</body>");
+		xml.append("<sub_mch_id>"+payInfo.getSubMchId()+"</sub_mch_id>");
+		xml.append("<mch_id>" + payInfo.getPid() + "</mch_id>");
+		xml.append("<nonce_str>" + billno + "</nonce_str>");
+		xml.append("<notify_url>" + notify_url + "</notify_url>");
+		xml.append("<openid>" + payInfo.getOpenId() + "</openid>");
+		xml.append("<out_trade_no>"+payInfo.getOrderNumber()+"</out_trade_no>");
+		xml.append("<spbill_create_ip>" + ip + "</spbill_create_ip>");
+		xml.append("<total_fee>" + price + "</total_fee>");
+		xml.append("<trade_type>JSAPI</trade_type>");
+		xml.append("<sign>" + sign + "</sign>");
+		xml.append("</xml>");
+		map.put("xml", xml.toString());
+		return map;
+	}
+	
+	
+	public Map<String, String> getMerchantMap(MerchantWechatPayDTO merchantWechatPayDTO,String storeName,String pkey) {
+		String orderPrice = merchantWechatPayDTO.getComsumeMoney();
+		int price=(int) (Double.valueOf(orderPrice)*100);
+		String billno = StringUtil.getBillno();
+		Map<String, String> map = new HashMap<String, String>(16);
+		map.put("body",storeName);//商品描述
+		map.put("detail",storeName);//商品详情
+		map.put("sub_mch_id", merchantWechatPayDTO.getSubMchId());
+		map.put("mch_id",merchantWechatPayDTO.getMchId());// 商户平台id
+		map.put("appid", merchantWechatPayDTO.getAppid());// 公众号id
+		map.put("nonce_str", billno);// 随机字符串
+		map.put("notify_url", merchantWechatPayDTO.getNotifyUrl());// 异步回调api
+		map.put("spbill_create_ip", merchantWechatPayDTO.getIp());// 支付ip
+		map.put("out_trade_no", merchantWechatPayDTO.getOrderSn());// 商品订单号
+		map.put("total_fee", price+"");// 真实金额
+		map.put("trade_type", "JSAPI");// JSAPI、h5调用
+		map.put("openid", merchantWechatPayDTO.getOpenid());
+		System.out.println(map);
+		String sign = WxPaySignatureUtils.signature(map, pkey);
+		System.out.println(sign);
+		StringBuffer xml = new StringBuffer();
+		xml.append("<xml>");
+		xml.append("<appid>" + merchantWechatPayDTO.getAppid() + "</appid>");
+		xml.append("<body>"+storeName+"</body>");
+		xml.append("<detail>"+storeName+"</detail>");
+		xml.append("<sub_mch_id>"+merchantWechatPayDTO.getSubMchId()+"</sub_mch_id>");
+		xml.append("<mch_id>" + merchantWechatPayDTO.getMchId() + "</mch_id>");
+		xml.append("<nonce_str>" + billno + "</nonce_str>");
+		xml.append("<notify_url>" + merchantWechatPayDTO.getNotifyUrl() + "</notify_url>");
+		xml.append("<openid>" + merchantWechatPayDTO.getOpenid() + "</openid>");
+		xml.append("<out_trade_no>"+merchantWechatPayDTO.getOrderSn()+"</out_trade_no>");
+		xml.append("<spbill_create_ip>" + merchantWechatPayDTO.getIp() + "</spbill_create_ip>");
+		xml.append("<total_fee>" + price + "</total_fee>");
+		xml.append("<trade_type>JSAPI</trade_type>");
+		xml.append("<sign>" + sign + "</sign>");
+		xml.append("</xml>");
+		map.put("xml", xml.toString());
+		return map;
+	}
+	
+
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/wap/WechantInfoVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/wap/WechantInfoVO.java
new file mode 100644
index 0000000..0b873f3
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/wap/WechantInfoVO.java
@@ -0,0 +1,107 @@
+package cn.pluss.platform.wap;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+
+/**
+ * @author yuchen
+ * 
+ * @Description 
+ */
+public class WechantInfoVO {
+	
+	private String nickName;
+	
+	private String sex;
+	
+	private String province;
+	
+	private String city;
+	
+	private String country;
+	
+	private String  headimgurl;
+
+	private String unionId;
+
+	public String getNickName() {
+		return nickName;
+	}
+
+	public void setNickName(String nickName) {
+		this.nickName = nickName;
+	}
+
+	public String getSex() {
+		return sex;
+	}
+
+	public void setSex(String sex) {
+		this.sex =sex;
+	}
+
+	public String getProvince() {
+		return province;
+	}
+
+	public void setProvince(String province) {
+		this.province = province;
+	}
+
+	public String getCity() {
+		return city;
+	}
+
+	public void setCity(String city) {
+		this.city = city;
+	}
+
+	public String getCountry() {
+		return country;
+	}
+
+	public void setCountry(String country) {
+		this.country = country;
+	}
+
+	public String getHeadimgurl() {
+		return headimgurl;
+	}
+
+	public void setHeadimgurl(String headimgurl) {
+		this.headimgurl = headimgurl;
+	}
+
+	public String getUnionId() {
+		return unionId;
+	}
+
+	public void setUnionId(String unionId) {
+		this.unionId = unionId;
+	}
+
+	public static WechantInfoVO convert(String userInfo) {
+		WechantInfoVO vo=new WechantInfoVO();
+		JSONObject jsonObject = JSON.parseObject(userInfo);
+        String headimgurl = jsonObject.getString("headimgurl");
+        String province = jsonObject.getString("province");
+        String city = jsonObject.getString("city");
+        String country = jsonObject.getString("country");
+        String sex = jsonObject.getString("sex");
+        String nickname = jsonObject.getString("nickname");
+		String unionid = jsonObject.getString("unionid");
+        vo.setHeadimgurl(headimgurl);
+        vo.setProvince(province);
+        vo.setCity(city);
+        vo.setCountry(country);
+        vo.setSex(sex);
+        vo.setNickName(nickname);
+        vo.setUnionId(unionid);
+		return vo;
+		
+	}
+	
+	
+
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/wap/WxPaySignatureUtils.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/wap/WxPaySignatureUtils.java
new file mode 100644
index 0000000..7359efa
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/wap/WxPaySignatureUtils.java
@@ -0,0 +1,170 @@
+package cn.pluss.platform.wap;
+
+import java.io.StringWriter;
+import java.security.MessageDigest;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.Set;
+
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+
+import cn.pluss.platform.util.WXPayXmlUtil;
+
+
+/**
+ * @author yuchen
+ *
+ * @Description 
+ */
+public class WxPaySignatureUtils {
+  
+	/**
+	 * 微信支付加密工具
+	 */
+	public static String signature(Map<String, String> map, String key) {
+		Set<String> keySet = map.keySet();
+		String[] str = new String[map.size()];
+		StringBuilder tmp = new StringBuilder();
+		// 进行字典排序
+		str = keySet.toArray(str);
+		Arrays.sort(str);
+		for (int i = 0; i < str.length; i++) {
+			String t = str[i] + "=" + map.get(str[i]) + "&";
+			tmp.append(t);
+		}
+		if (null != key) {
+			tmp.append("key=" + key);
+		}
+		return MD5Util.MD5Encode(tmp.toString()).toUpperCase();
+	}
+
+	/**
+	 * 微信支付加密工具
+	 */
+	public static String signatureSHA1(Map<String, String> map) {
+		Set<String> keySet = map.keySet();
+		String[] str = new String[map.size()];
+		StringBuilder tmp = new StringBuilder();
+		// 进行字典排序
+		str = keySet.toArray(str);
+		Arrays.sort(str);
+		for (int i = 0; i < str.length; i++) {
+			String t = str[i] + "=" + map.get(str[i]) + "&";
+			tmp.append(t);
+		}
+
+		String tosend = tmp.toString().substring(0, tmp.length() - 1);
+		MessageDigest md = null;
+		byte[] bytes = null;
+		try {
+
+			md = MessageDigest.getInstance("SHA-1");
+			bytes = md.digest(tosend.getBytes("utf-8"));
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
+		String singe = byteToStr(bytes);
+		return singe.toLowerCase();
+
+	}
+
+	public static String sha1Check(String[] str) {
+
+		StringBuilder tmp = new StringBuilder();
+		Arrays.sort(str);
+		for (int i = 0; i < str.length; i++) {
+			String t = str[i];
+			tmp.append(t);
+		}
+		String tosend = tmp.toString();
+		MessageDigest md = null;
+		byte[] bytes = null;
+		try {
+
+			md = MessageDigest.getInstance("SHA-1");
+			bytes = md.digest(tosend.getBytes("utf-8"));
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
+		String singe = byteToStr(bytes);
+		return singe.toUpperCase();
+	}
+
+	/**
+	 * 字节数组转换为字符串
+	 * 
+	 * @param byteArray
+	 * @return
+	 */
+	public static String byteToStr(byte[] byteArray) {
+		String strDigest = "";
+		for (int i = 0; i < byteArray.length; i++) {
+			strDigest += byteToHexStr(byteArray[i]);
+		}
+		return strDigest;
+	}
+
+	/**
+	 * 字节转换为字符串
+	 * 
+	 * @param mByte
+	 * @return
+	 */
+	public static String byteToHexStr(byte mByte) {
+		char[] Digit = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A',
+				'B', 'C', 'D', 'E', 'F' };
+		char[] tempArr = new char[2];
+		tempArr[0] = Digit[(mByte >>> 4) & 0X0F];
+		tempArr[1] = Digit[mByte & 0X0F];
+
+		String s = new String(tempArr);
+		return s;
+	}
+	
+	 /**
+     * 将Map转换为XML格式的字符串
+     *
+     * @param data Map类型数据
+     * @return XML格式的字符串
+     * @throws Exception
+     */
+    public static String mapToXml(Map<String, String> data) throws Exception {
+        org.w3c.dom.Document document = WXPayXmlUtil.newDocument();
+        org.w3c.dom.Element root = document.createElement("xml");
+        document.appendChild(root);
+        for (String key: data.keySet()) {
+            String value = data.get(key);
+            if (value == null) {
+                value = "";
+            }
+            value = value.trim();
+            org.w3c.dom.Element filed = document.createElement(key);
+            filed.appendChild(document.createTextNode(value));
+            root.appendChild(filed);
+        }
+        TransformerFactory tf = TransformerFactory.newInstance();
+        Transformer transformer = tf.newTransformer();
+        DOMSource source = new DOMSource(document);
+        transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
+        transformer.setOutputProperty(OutputKeys.INDENT, "yes");
+        StringWriter writer = new StringWriter();
+        StreamResult result = new StreamResult(writer);
+        transformer.transform(source, result);
+        String output = writer.getBuffer().toString(); //.replaceAll("\n|\r", "");
+        try {
+            writer.close();
+        }
+        catch (Exception ex) {
+        }
+        return output;
+    }
+	
+	
+}
+
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/wap/XmlUtil.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/wap/XmlUtil.java
new file mode 100644
index 0000000..7f6c626
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/wap/XmlUtil.java
@@ -0,0 +1,119 @@
+package cn.pluss.platform.wap;
+
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.StringReader;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.input.SAXBuilder;
+import org.xml.sax.InputSource;
+
+/**
+ * @author yuchen
+ * 
+ * @Description
+ */
+public class XmlUtil {
+
+	/**
+	 * 
+	 * toMap:(xml字符串转map集合,测试无误 可用). <br/>
+	 * 
+	 * 
+	 * @author Administrator
+	 * @param xml
+	 * @return
+	 * @since JDK 1.8
+	 */
+	public static Map<String, Object> toMap(String xml) {
+		Map<String, Object> result = new HashMap<>(16);
+		if ("".equals(xml)) {
+			return result;
+		}
+		try {
+			StringReader read = new StringReader(xml);
+			InputSource source = new InputSource(read);
+			SAXBuilder sb = new SAXBuilder();
+
+			Document doc = sb.build(source);
+			Element root = doc.getRootElement();
+			result.put(root.getName(), root.getText());
+			parse(root, result);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		result.remove("xml");
+		return result;
+	}
+	
+	public static Map<String, Object> toMapLeshua(String xml) {
+		Map<String, Object> result = new HashMap<>(16);
+		if ("".equals(xml)) {
+			return result;
+		}
+		try {
+			StringReader read = new StringReader(xml);
+			InputSource source = new InputSource(read);
+			SAXBuilder sb = new SAXBuilder();
+
+			Document doc = sb.build(source);
+			Element root = doc.getRootElement();
+			result.put(root.getName(), root.getText());
+			parse(root, result);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		result.remove("leshua");
+		return result;
+	}
+	
+
+	private static Map<String, Object> parse(Element root, Map<String, Object> result) {
+		List<Element> nodes = root.getChildren();
+		int len = nodes.size();
+		if (len == 0) {
+			result.put(root.getName(), root.getText());
+		} else {
+			for (int i = 0; i < len; i++) {
+				// 循环依次得到子元素
+				Element element = nodes.get(i);
+				result.put(element.getName(), element.getText());
+				// parse(element,result);
+			}
+		}
+		return result;
+	}
+
+	/**
+	 * 
+	 * toUTF8:(将微信支付成功的回调 request.InputStream转 UTF-8). <br/>
+	 * 
+	 * 
+	 * @author Administrator
+	 * @param is
+	 * @return
+	 * @since JDK 1.8
+	 */
+	public static String toUTF8(InputStream is) {
+		String result = null;
+		try {
+			BufferedReader in = new BufferedReader(new InputStreamReader(is, "UTF-8"));
+			StringBuffer buffer = new StringBuffer();
+			String line = "";
+			while ((line = in.readLine()) != null) {
+				buffer.append(line);
+			}
+			result = buffer.toString();
+		} catch (Exception e) {
+			e.printStackTrace();
+			return null;
+		}
+		return result;
+	}
+
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/wx/WxAccessTokenRequest.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/wx/WxAccessTokenRequest.java
new file mode 100644
index 0000000..33d5135
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/wx/WxAccessTokenRequest.java
@@ -0,0 +1,51 @@
+package cn.pluss.platform.wx;
+
+import lombok.Data;
+
+/**
+ *
+ *微信请求参数封装
+ *@author: bzg
+ *@time: 2021/11/29 15:23
+ */
+@Data
+public class WxAccessTokenRequest {
+
+    /**
+     * 类型 普通
+     * @date: 2021/11/30 11:31
+     */
+    public static final Integer WX_ACCESS_TOKEN_TYPE = 1;
+
+    /**
+     * 类型对应下方的类型 网页授权
+     * @date: 2021/11/30 11:31
+     */
+    public static final Integer WX_OAUTH2_ACCESS_TOKEN_TYPE = 2;
+
+    private String appid;
+
+    private String secret;
+
+    private String code;
+
+    private String url;
+
+
+    public static WxAccessTokenRequest buidWxToken(String appid,String secret,String code,String url){
+        WxAccessTokenRequest request = new WxAccessTokenRequest();
+        request.setAppid(appid);
+        request.setSecret(secret);
+        request.setCode(code);
+        request.setUrl(url);
+        return request;
+    }
+
+    public static WxAccessTokenRequest buidWxToken(String appid,String secret){
+        WxAccessTokenRequest request = new WxAccessTokenRequest();
+        request.setAppid(appid);
+        request.setSecret(secret);
+        return request;
+    }
+
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/wx/WxAccessTokenResponse.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/wx/WxAccessTokenResponse.java
new file mode 100644
index 0000000..f33865f
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/wx/WxAccessTokenResponse.java
@@ -0,0 +1,26 @@
+package cn.pluss.platform.wx;
+
+import lombok.Data;
+
+
+/**
+ *
+ *微信token响应参数封装
+ *@author: bzg
+ *@time: 2021/11/29 15:23
+ */
+@Data
+public class WxAccessTokenResponse {
+
+    /**
+     * access_token
+     * @date: 2021/11/29 15:27
+     */
+    protected String access_token;
+
+    /**
+     * 过期时间
+     * @date: 2021/11/29 15:27
+     */
+    protected Long expires_in;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/wx/WxCommonResponse.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/wx/WxCommonResponse.java
new file mode 100644
index 0000000..cd06539
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/wx/WxCommonResponse.java
@@ -0,0 +1,17 @@
+package cn.pluss.platform.wx;
+
+import lombok.Data;
+
+/**
+ * TODO
+ * 微信公告响应参数封装
+ * @author crystal
+ * @date 2022/4/11 18:00
+ */
+@Data
+public class WxCommonResponse {
+
+    private int errcode;
+
+    private String errmsg;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/wx/WxCreateQrCodeRequest.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/wx/WxCreateQrCodeRequest.java
new file mode 100644
index 0000000..8e23294
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/wx/WxCreateQrCodeRequest.java
@@ -0,0 +1,58 @@
+package cn.pluss.platform.wx;
+
+import cn.pluss.platform.entitiy.ActionInfo;
+import lombok.Data;
+
+/**
+ *
+ *微信生成带参数的二维码请求参数封装
+ *@author: bzg
+ *@time: 2021/12/9 11:02
+ */
+@Data
+public class WxCreateQrCodeRequest {
+
+    /**
+     * 该二维码有效时间，以秒为单位。 最大不超过2592000（即30天），此字段如果不填，则默认有效期为60秒。
+     * @date: 2021/12/9 11:03
+     */
+    private Integer expire_seconds;
+
+    /**
+     * 二维码类型，QR_SCENE为临时的整型参数值，QR_STR_SCENE为临时的字符串参数值，QR_LIMIT_SCENE为永久的整型参数值，QR_LIMIT_STR_SCENE为永久的字符串参数值
+     * @date: 2021/12/9 11:05
+     */
+    private String action_name;
+
+
+    /**
+     * 二维码详细信息:
+     * @date: 2021/12/9 11:05
+     */
+    private ActionInfo action_info;
+
+    /**
+     * 场景值ID，临时二维码时为32位非0整型，永久二维码时最大值为100000（目前参数只支持1--100000）
+     * @date: 2021/12/9 11:06
+     */
+    private String scene_id;
+
+    /**
+     * （字符串形式的ID），字符串类型，长度限制为1到64
+     * @date: 2021/12/9 11:06
+     */
+    private String scene_str;
+
+
+    public WxCreateQrCodeRequest(Integer expire_seconds, String action_name,ActionInfo action_info, String scene_id, String scene_str){
+        this.expire_seconds = expire_seconds;
+        this.action_name = action_name;
+        this.scene_id = scene_id;
+        this.scene_str = scene_str;
+        this.action_info = action_info;
+    }
+
+    public WxCreateQrCodeRequest() {
+
+    }
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/wx/WxCreateQrCodeResponse.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/wx/WxCreateQrCodeResponse.java
new file mode 100644
index 0000000..326e64c
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/wx/WxCreateQrCodeResponse.java
@@ -0,0 +1,31 @@
+package cn.pluss.platform.wx;
+
+import lombok.Data;
+
+/**
+ *
+ *微信生成带参数的二维码返回参数封装
+ *@author: bzg
+ *@time: 2021/12/9 11:01
+ */
+@Data
+public class WxCreateQrCodeResponse {
+
+    /**
+     * 获取的二维码ticket，凭借此ticket可以在有效时间内换取二维码。
+     * @date: 2021/12/9 11:08
+     */
+    private String ticket;
+
+    /**
+     * 该二维码有效时间，以秒为单位。 最大不超过2592000（即30天）。
+     * @date: 2021/12/9 11:08
+     */
+    private Long expire_seconds;
+
+    /**
+     * 二维码图片解析后的地址，开发者可根据该地址自行生成需要的二维码图片
+     * @date: 2021/12/9 11:08
+     */
+    private String url;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/wx/WxJsApiTicketResponse.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/wx/WxJsApiTicketResponse.java
new file mode 100644
index 0000000..efc92a4
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/wx/WxJsApiTicketResponse.java
@@ -0,0 +1,21 @@
+package cn.pluss.platform.wx;
+
+import lombok.Data;
+
+/**
+ *
+ *微信jsapiticke返回参数封装
+ *@author: bzg
+ *@time: 2022/1/19 14:03
+ */
+@Data
+public class WxJsApiTicketResponse {
+
+    private Integer errcode;
+
+    private String errmsg;
+
+    private String ticket;
+
+    private Integer expires_in;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/wx/WxJumpWxa.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/wx/WxJumpWxa.java
new file mode 100644
index 0000000..7102c88
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/wx/WxJumpWxa.java
@@ -0,0 +1,49 @@
+package cn.pluss.platform.wx;
+
+import cn.pluss.platform.constants.Constant;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * TODO
+ * 微信jump_wxa
+ * @author crystal
+ * @date 2022/4/11 17:41
+ */
+@Data
+@NoArgsConstructor
+public class WxJumpWxa {
+
+    /**
+     * 正式版
+     */
+    public static String ENV_VERSION_RELEASE = "release";
+
+    /**
+     * 体验版
+     */
+    public static String ENV_VERSION_TRIAL = "trial";
+
+    /**
+     * 开发版
+     */
+    public static String ENV_VERSION_DEVELOP = "develop";
+
+    private String path;
+
+    private String query;
+
+    private String env_version;
+
+    public WxJumpWxa(String path, String query, String env_version) {
+        this.path = path;
+        this.query = query;
+        this.env_version = env_version;
+    }
+
+    public WxJumpWxa(String orderNumber,String env_version) {
+        this.path = Constant.DEFAULT_APPLET_PATH;
+        this.query = Constant.DEFAULT_APPLET_PARAM_NAME_PREFIX + orderNumber;
+        this.env_version = env_version;
+    }
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/wx/WxOauth2AccessTokenResponse.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/wx/WxOauth2AccessTokenResponse.java
new file mode 100644
index 0000000..82b28eb
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/wx/WxOauth2AccessTokenResponse.java
@@ -0,0 +1,23 @@
+package cn.pluss.platform.wx;
+
+import lombok.Data;
+
+/**
+ *
+ *微信网页授权返回参数
+ *@author: bzg
+ *@time: 2021/11/30 10:14
+ */
+@Data
+public class WxOauth2AccessTokenResponse extends WxAccessTokenResponse{
+
+
+    private String refresh_token;
+
+    private String openid;
+
+    private String scope;
+
+    private String unionid;
+
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/wx/WxOpenidResponse.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/wx/WxOpenidResponse.java
new file mode 100644
index 0000000..03477e8
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/wx/WxOpenidResponse.java
@@ -0,0 +1,29 @@
+package cn.pluss.platform.wx;
+
+import lombok.Data;
+
+/**
+ *
+ *获取openid返回响应参数
+ *@author: bzg
+ *@time: 2021/11/29 17:52
+ */
+@Data
+public class WxOpenidResponse extends WxAccessTokenResponse {
+
+    private String openid;
+
+    private String session_key;
+
+    private String unionid;
+
+    private String errcode;
+
+    private String errmsg;
+
+
+    private String refresh_token;
+
+    private String scope;
+
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/wx/WxTemolateRequest.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/wx/WxTemolateRequest.java
new file mode 100644
index 0000000..9bceaeb
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/wx/WxTemolateRequest.java
@@ -0,0 +1,85 @@
+package cn.pluss.platform.wx;
+
+import com.alibaba.fastjson.JSONObject;
+import lombok.Data;
+
+/**
+ *
+ *封装微信模板消息
+ *@author: bzg
+ *@time: 2021/11/29 18:05
+ */
+@Data
+public class WxTemolateRequest {
+
+
+
+    public static String color = "#1E4FF5";
+    /**
+     * 用户openid
+     * @date: 2021/11/29 18:16
+     */
+    private String touser;
+
+    /**
+     * 模板id
+     * @date: 2021/11/29 18:16
+     */
+    private String template_id;
+
+    /**
+     * url
+     * @date: 2021/11/29 18:16
+     */
+    private String url;
+
+    /**
+     * miniprogram 小程序参数
+     * @date: 2021/11/29 18:16
+     */
+    private JSONObject miniprogram;
+
+    /**
+     * 数据体
+     * @date: 2021/11/29 18:17
+     */
+    private JSONObject data;
+
+
+    public WxTemolateRequest(String touser, String template_id, String url, JSONObject miniprogram) {
+        this.touser = touser;
+        this.template_id = template_id;
+        this.url = url;
+        this.miniprogram = miniprogram;
+    }
+
+    /**
+     * @description:组装template参数
+     * @date: 2021/12/9 14:39
+     * @param first:
+     * @param remark:
+     * @param array:
+     * @return cn.pluss.platform.wx.WxTemolateRequest
+     */
+    public WxTemolateRequest buildData(String first,String remark,String[] array){
+        JSONObject data = new JSONObject(10);
+        JSONObject firstData = new JSONObject(2);
+        firstData.put("value",first);
+        firstData.put("color",color);
+        JSONObject remarkData = new JSONObject(2);
+        remarkData.put("value",remark);
+        remarkData.put("color",color);
+
+        data.put("first",firstData);
+        data.put("remark",remarkData);
+
+        for (int i = 0; i < array.length; i++) {
+            JSONObject keyword = new JSONObject(2);
+            keyword.put("value",array[i]);
+            keyword.put("color",color);
+            data.put("keyword"+(i+1),keyword);
+        }
+        this.data = data;
+        return this;
+    }
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/wx/WxUrlschemeRequest.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/wx/WxUrlschemeRequest.java
new file mode 100644
index 0000000..d46e0c5
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/wx/WxUrlschemeRequest.java
@@ -0,0 +1,56 @@
+package cn.pluss.platform.wx;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * TODO
+ * 微信urlscheme封装类
+ * @author crystal
+ * @date 2022/4/11 17:45
+ */
+@Data
+@NoArgsConstructor
+public class WxUrlschemeRequest {
+
+    /**
+     * 跳转到的目标小程序信息。
+     */
+    private WxJumpWxa jump_wxa;
+
+    /**
+     * 生成的 scheme 码类型，
+     * 到期失效：true，
+     * 永久有效：false。
+     * 注意，永久有效 scheme 和有效时间超过180天的到期失效 scheme 的总数上限为10万个，详见获取 URL scheme，生成 scheme 码前请仔细确认。
+     */
+    private Boolean is_expire;
+
+    /**
+     * 到期失效的 scheme 码的失效时间，为 Unix 时间戳。
+     * 生成的到期失效 scheme 码在该时间前有效。
+     * 最长有效期为1年。is_expire 为 true 且 expire_type 为 0 时必填
+     */
+    private Long expire_time;
+
+    /**
+     * 到期失效的 scheme 码失效类型，失效时间：0，失效间隔天数：1
+     */
+    private Integer expire_type;
+
+    /**
+     * 到期失效的 scheme 码的失效间隔天数。
+     * 生成的到期失效 scheme 码在该间隔时间到达前有效。
+     * 最长间隔天数为365天。is_expire 为 true 且 expire_type 为 1 时必填
+     */
+    private Integer expire_interval;
+
+    public WxUrlschemeRequest(WxJumpWxa jump_wxa, Integer expireValue) {
+        Long time = System.currentTimeMillis() / 1000;
+        Long expire_time = expireValue * 60 + time;
+        this.jump_wxa = jump_wxa;
+        this.is_expire = true;
+        this.expire_time = expire_time;
+        this.expire_type = 0;
+    }
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/wx/WxUrlschemeResponse.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/wx/WxUrlschemeResponse.java
new file mode 100644
index 0000000..cd5272b
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/wx/WxUrlschemeResponse.java
@@ -0,0 +1,18 @@
+package cn.pluss.platform.wx;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * TODO
+ * 微信urlscheme返回参数封装
+ * @author crystal
+ * @date 2022/4/11 18:01
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class WxUrlschemeResponse extends WxCommonResponse{
+
+    private String openlink;
+
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/wx/WxUserInfoResponse.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/wx/WxUserInfoResponse.java
new file mode 100644
index 0000000..07cf56e
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/wx/WxUserInfoResponse.java
@@ -0,0 +1,122 @@
+package cn.pluss.platform.wx;
+
+import cn.pluss.platform.entity.MerchantMenber;
+import cn.pluss.platform.util.StringUtil;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ *
+ *用户信息封装
+ *@author: bzg
+ *@time: 2021/11/30 13:34
+ */
+@Data
+public class WxUserInfoResponse {
+
+    /**
+     * 用户是否订阅该公众号标识，值为0时，代表此用户没有关注该公众号，拉取不到其余信息。
+     * @date: 2021/11/30 13:41
+     */
+    private Integer subscribe;
+
+    /**
+     * 用户的标识，对当前公众号唯一
+     * @date: 2021/11/30 13:41
+     */
+    private String openid;
+
+    /**
+     * 用户的昵称
+     * @date: 2021/11/30 13:41
+     */
+    private String nickname;
+
+    /**
+     * 用户的语言，简体中文为zh_CN
+     * @date: 2021/11/30 13:41
+     */
+    private String language;
+
+    /**
+     * 用户头像
+     * @date: 2021/11/30 13:42
+     */
+    private String headimgurl;
+
+    /**
+     * 用户关注时间，为时间戳。如果用户曾多次关注，则取最后关注时间
+     * @date: 2021/11/30 13:42
+     */
+    private Long subscribe_time;
+
+    /**
+     * 只有在用户将公众号绑定到微信开放平台帐号后，才会出现该字段。
+     * @date: 2021/11/30 13:42
+     */
+    private String unionid;
+
+    /**
+     * 公众号运营者对粉丝的备注，公众号运营者可在微信公众平台用户管理界面对粉丝添加备注
+     * @date: 2021/11/30 13:42
+     */
+    private String remark;
+
+    /**
+     * 用户所在的分组ID（兼容旧的用户分组接口）
+     * @date: 2021/11/30 13:42
+     */
+    private Integer groupid;
+
+    /**
+     * 用户被打上的标签ID列表
+     * @date: 2021/11/30 13:42
+     */
+    private List<Integer> tagid_list;
+
+    /**
+     * 返回用户关注的渠道来源，
+     * ADD_SCENE_SEARCH 公众号搜索，
+     * ADD_SCENE_ACCOUNT_MIGRATION 公众号迁移，
+     * ADD_SCENE_PROFILE_CARD 名片分享，
+     * ADD_SCENE_QR_CODE 扫描二维码，
+     * ADD_SCENE_PROFILE_LINK 图文页内名称点击，
+     * ADD_SCENE_PROFILE_ITEM 图文页右上角菜单，
+     * ADD_SCENE_PAID 支付后关注，
+     * ADD_SCENE_WECHAT_ADVERTISEMENT 微信广告，
+     * ADD_SCENE_OTHERS 其他
+     * @date: 2021/11/30 13:43
+     */
+    private String subscribe_scene;
+
+    /**
+     * 二维码扫码场景（开发者自定义）
+     * @date: 2021/11/30 13:43
+     */
+    private Integer qr_scene;
+
+    /**
+     * 二维码扫码场景描述（开发者自定义）
+     * @date: 2021/11/30 13:43  
+     */
+    private String qr_scene_str;
+
+
+    /**
+     * 构建会员信息
+     * @date: 2021/11/30 13:45
+     * @return cn.pluss.platform.entity.MerchantMenber
+     */
+    public MerchantMenber buildMember(MerchantMenber member,String appOpenid){
+//        member.setNickName(this.nickname);
+        member.setUnionId(this.unionid);
+        member.setAppOpenId(appOpenid);
+        member.setLogo(this.headimgurl);
+        if(StringUtil.isNotEmpty(this.nickname)){
+            member.setMemberName(this.nickname);
+        }
+        member.setOpenid(this.openid);
+        return member;
+    }
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/yinsheng/AuditOldEntity.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/yinsheng/AuditOldEntity.java
new file mode 100644
index 0000000..a6c4174
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/yinsheng/AuditOldEntity.java
@@ -0,0 +1,40 @@
+package cn.pluss.platform.yinsheng;
+
+import lombok.Data;
+import lombok.val;
+
+/**
+ * 旧版进件请求模板
+ * @author djh
+ */
+@Data
+public class AuditOldEntity {
+
+    private AuditOldEntity(){}
+
+    public static AuditOldEntity newInstance() {
+        val entity = new AuditOldEntity();
+        entity.ver = "1.0";
+        entity.charset = "UTF-8";
+        entity.signType = "RSA";
+        return entity;
+    }
+
+    private String ver;
+
+    private String src;
+
+    private String msgCode;
+
+    private String method;
+
+    private String signType;
+
+    private String signValue;
+
+    private String charset;
+
+    private String reqFlowId;
+
+    private String data;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/yinsheng/ImageType.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/yinsheng/ImageType.java
new file mode 100644
index 0000000..a7b6408
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/yinsheng/ImageType.java
@@ -0,0 +1,80 @@
+package cn.pluss.platform.yinsheng;
+
+import cn.pluss.platform.entity.MerchantImage;
+import lombok.Data;
+
+/**
+ * 图片类别
+ * @author djh
+ */
+@Data
+public class ImageType {
+
+    /** 身份证正面 */
+    public static final String IDCARD_FRONT = "A002";
+    /** 身份证反面 */
+    public static final String IDCARD_BACK= "A003";
+    /** 营业执照 */
+    public static final String BUSINESS_LICENSE = "A001";
+    /** 开户许可证 */
+    public static final String ACCOUNT_PERMITS = "A011";
+    /** 门头照 */
+    public static final String SHOP_FRONT_DOOR = "A006";
+    /** 非法人结算授权书 */
+    public static final String NON_LEG_SETTLE_AUTH = "B005";
+    /** 收银台照片 */
+    public static final String CASH_DESK_PHOTO = "A008";
+    /** 门店内景照片*/
+    public static final String STORE_INTERIOR_PHOTO = "A007";
+    /** 手持身份证 */
+    public static final String HAND_IDCARD_PHOTO = "A009";
+    /** 银行卡正面 */
+    public static final String BANK_CARD_FRONT = "A004";
+    /** 银行卡反面 */
+    public static final String BANK_CARD_BACK = "A005";
+    /** 商户协议 */
+    public static final String MERCHANT_PROTOCOL = "A010";
+
+    public static String getType(String localType) {
+        switch (localType) {
+            case MerchantImage
+                    .ImageType.IDCARD_FRONT:
+                return IDCARD_FRONT;
+            case MerchantImage
+                    .ImageType.IDCARD_BACK:
+                return IDCARD_BACK;
+            case MerchantImage
+                    .ImageType.BUSINESS_LICENSE:
+                return BUSINESS_LICENSE;
+            case MerchantImage
+                    .ImageType.ACCOUNT_PERMITS:
+                return ACCOUNT_PERMITS;
+            case MerchantImage
+                    .ImageType.SHOP_FRONT_DOOR:
+                return SHOP_FRONT_DOOR;
+            case MerchantImage
+                    .ImageType.NON_LEG_SETTLE_AUTH:
+                return NON_LEG_SETTLE_AUTH;
+            case MerchantImage
+                    .ImageType.CASH_DESK_PHOTO:
+                return CASH_DESK_PHOTO;
+            case MerchantImage
+                    .ImageType.STORE_INTERIOR_PHOTO:
+                return STORE_INTERIOR_PHOTO;
+            case MerchantImage
+                    .ImageType.HAND_IDCARD_PHOTO:
+                return HAND_IDCARD_PHOTO;
+            case MerchantImage
+                    .ImageType.BANK_CARD_FRONT:
+                return BANK_CARD_FRONT;
+            case MerchantImage
+                    .ImageType.BANK_CARD_BACK:
+                return BANK_CARD_BACK;
+            case MerchantImage
+                    .ImageType.MERCHANT_PROTOCOL:
+                return MERCHANT_PROTOCOL;
+            default:
+                return null;
+        }
+    }
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/yinsheng/ReqEntity.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/yinsheng/ReqEntity.java
new file mode 100644
index 0000000..56e884e
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/yinsheng/ReqEntity.java
@@ -0,0 +1,60 @@
+package cn.pluss.platform.yinsheng;
+
+import lombok.Data;
+
+import java.util.UUID;
+
+/**
+ * @author djh
+ */
+@Data
+public class ReqEntity {
+
+
+    /**
+     * 请求流水标识，用于日志查询使用
+     */
+    private String requestId;
+
+    /**
+     * 代理商编号
+     */
+    private String agentNo;
+
+    /**
+     * 接口版本V100
+     */
+    private String version;
+
+    /**
+     * 编码格式
+     */
+    private String charset;
+
+    /**
+     * 签名方式
+     */
+    private String signType;
+
+    /**
+     * RSA签名字符串，再用Base64编码
+     */
+    private String sign;
+
+    /**
+     * 请求参数
+     */
+    private String bizReqJson;
+
+    public ReqEntity() {
+        this.requestId = UUID.randomUUID().toString().replace("-","");
+        this.version = "V100";
+        this.charset = "UTF-8";
+        this.signType = "RSA";
+    }
+
+    /**
+     * 商户号
+     */
+    private String srcMerchantNo;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/yinsheng/ReqOldEntity.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/yinsheng/ReqOldEntity.java
new file mode 100644
index 0000000..1834fa5
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/yinsheng/ReqOldEntity.java
@@ -0,0 +1,92 @@
+package cn.pluss.platform.yinsheng;
+
+import cn.pluss.platform.util.DateUtils;
+import cn.pluss.platform.util.StringUtil;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.UUID;
+
+/**
+ * 老板银盛接口请求参数封装
+ */
+@Data
+public class ReqOldEntity {
+
+    /**
+     * 接口名称
+     */
+    private String method;
+
+    /**
+     * 商户在银盛支付平台开设的用户号[商户号]
+     */
+    private String partner_id;
+
+    /**
+     * 发送请求的时间，格式"yyyy-MM-dd HH:mm:ss"
+     */
+    private String timestamp;
+
+    /**
+     * 商户网站使用的编码格式
+     */
+    private String charset;
+
+    /**
+     * RSA签名字符串
+     */
+    private String sign_type;
+
+    /**
+     * RSA签名字符串，再用Base64编码
+     */
+    private String sign;
+
+    /**
+     * 接口版本
+     */
+    private String version;
+
+    /**
+     * json格式对象，请求业务参数
+     */
+    private String biz_content;
+
+    /**
+     * 银盛支付服务器主动通知商户网站里指定的页面http路径，支持多个url进行异步通知，多个url用分隔符“,”分开，格式如：url1,url2,url3
+     */
+    private String notify_url;
+
+    /**
+     * 银盛支付服务器主动通知商户网站里指定的页面http路径，支持多个url进行异步通知，多个url用分隔符“,”分开，格式如：url1,url2,url3
+     */
+    private String return_url;
+
+
+    /**
+     * 交易类型，说明：1或者空：即时到账，2：担保交易
+     */
+    private String tran_type;
+
+    public static final String VERSION_3_1 = "3.1";
+
+    public static final String DEFAULT_VERSION = "3.0";
+
+    public static final String VERSION_NAME = "version";
+
+
+    public ReqOldEntity() {
+        this.timestamp = DateUtils.formatDateDefault(new Date(),"yyyy-MM-dd HH:mm:ss");
+        this.version = DEFAULT_VERSION;
+        this.charset = "UTF-8";
+        this.sign_type = "RSA";
+    }
+
+    public ReqOldEntity(String version) {
+        this.timestamp = DateUtils.formatDateDefault(new Date(),"yyyy-MM-dd HH:mm:ss");
+        this.version = StringUtil.isNotEmpty(version) ? version : DEFAULT_VERSION;
+        this.charset = "UTF-8";
+        this.sign_type = "RSA";
+    }
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/yinsheng/ReqUploadImg.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/yinsheng/ReqUploadImg.java
new file mode 100644
index 0000000..c644300
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/yinsheng/ReqUploadImg.java
@@ -0,0 +1,71 @@
+package cn.pluss.platform.yinsheng;
+
+import cn.pluss.platform.util.RSAUtils;
+import cn.pluss.platform.util.SignUtils;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import lombok.val;
+import org.springframework.core.io.ByteArrayResource;
+
+import java.util.UUID;
+
+/**
+ * @author djh
+ * 上传图片的请求参数实体类
+ */
+@Data
+@Slf4j
+public class ReqUploadImg {
+
+    private ReqUploadImg() {}
+
+    public static ReqUploadImg newInstance(String picType) {
+        val entity = new ReqUploadImg();
+        entity.reqFlowId = (System.currentTimeMillis() + "").substring(0, 12);
+        entity.sysFlowId = "12201908021735339318742";
+        entity.picType = picType;
+
+        return entity;
+    }
+
+    public static void sign(ReqUploadImg entity, String priKey) {
+        entity.picFile = null;
+        val json = (JSONObject) JSON.toJSON(entity);
+        json.remove("reqFlowId");
+        json.remove("picFile");
+        val signContent = SignUtils.getYSSignContent(json);
+        try {
+            entity.signValue = RSAUtils.sign(priKey, signContent);
+        } catch (Exception e) {
+            log.warn("签名异常");
+        }
+    }
+
+    /**
+     * 流水号
+     */
+    private String reqFlowId;
+
+    /**
+     * 图片文件
+     */
+    private ByteArrayResource picFile;
+
+    /**
+     * 图片类型
+     * {@link cn.pluss.platform.yinsheng.ImageType}
+     */
+    private String picType;
+
+    /**
+     * 流水号
+     */
+    private String sysFlowId;
+
+    /**
+     * 校验值
+     */
+    private String signValue;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/yinsheng/RespEntity.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/yinsheng/RespEntity.java
new file mode 100644
index 0000000..a122958
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/yinsheng/RespEntity.java
@@ -0,0 +1,24 @@
+package cn.pluss.platform.yinsheng;
+
+import com.alibaba.fastjson.JSONObject;
+import lombok.Data;
+
+/**
+ * 参数返回json
+ * @author djh
+ */
+@Data
+public class RespEntity {
+
+    public static final String SUCCESS = "success";
+
+    public static final String FAIL = "fail";
+
+    private String sign;
+
+    private String responseCode;
+
+    private String responseMeg;
+
+    private String bizResponseJson;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/yinsheng/YsOldSrcMerchantNo.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/yinsheng/YsOldSrcMerchantNo.java
new file mode 100644
index 0000000..a06320a
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/yinsheng/YsOldSrcMerchantNo.java
@@ -0,0 +1,54 @@
+package cn.pluss.platform.yinsheng;
+
+import cn.pluss.platform.util.StringUtil;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * TODO
+ * 银盛发起方主题下对应的默认付款小程序appid参数
+ * @author crystal
+ * @date 2022/7/12 18:52
+ */
+@Getter
+@AllArgsConstructor
+public enum YsOldSrcMerchantNo {
+
+    RSCY("826521773920170","wxaa8c9e6857a265e1","gh_5a1aa6143567","融商创赢(发起方)"),
+
+    SYB("826521673920090","wxc2ecf9662691832e","gh_d0571a5c903e","收银呗(发起方)");
+
+    private String value;
+
+    private String defSubAppid;
+
+    private String defGhId;
+
+    private String desc;
+
+    public static String getGhIdByValue(String value) {
+        if(StringUtil.isEmpty(value)){
+            return YsOldSrcMerchantNo.RSCY.getDefGhId();
+        }
+        YsOldSrcMerchantNo[] srcMerchantNoEnums = values();
+        for (YsOldSrcMerchantNo ysOldSrcMerchantNo : srcMerchantNoEnums) {
+            if (ysOldSrcMerchantNo.getValue().equals(value)) {
+                return ysOldSrcMerchantNo.getDefGhId();
+            }
+        }
+        return YsOldSrcMerchantNo.RSCY.getDefGhId();
+    }
+
+    public static String getSubAppIdByValue(String value) {
+        if(StringUtil.isEmpty(value)){
+            return YsOldSrcMerchantNo.RSCY.getDefSubAppid();
+        }
+        YsOldSrcMerchantNo[] srcMerchantNoEnums = values();
+        for (YsOldSrcMerchantNo ysOldSrcMerchantNo : srcMerchantNoEnums) {
+            if (ysOldSrcMerchantNo.getValue().equals(value)) {
+                return ysOldSrcMerchantNo.getDefSubAppid();
+            }
+        }
+        return YsOldSrcMerchantNo.RSCY.getDefSubAppid();
+    }
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/yinsheng/v20210929/AuditCallbackInfo.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/yinsheng/v20210929/AuditCallbackInfo.java
new file mode 100644
index 0000000..c5d6dcd
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/yinsheng/v20210929/AuditCallbackInfo.java
@@ -0,0 +1,60 @@
+package cn.pluss.platform.yinsheng.v20210929;
+
+import com.alibaba.fastjson.JSONArray;
+import lombok.Data;
+
+/**
+ * @author SSS
+ */
+@Data
+public class AuditCallbackInfo {
+
+    /**
+     * 合作方系统流水号
+     */
+    private String sysFlowId;
+
+    /**
+     * 业务商户号
+     */
+    private String mercId;
+
+    /**
+     * 客户编号
+     */
+    private String custId;
+
+    /**
+     * 商户名称
+     */
+    private String mercCnm;
+
+    /**
+     * 商户简称
+     */
+    private String mercAbbr;
+
+    /**
+     * 合作商编号
+     */
+    private String coOperatorNo;
+
+    /**
+     * 通知类型
+     */
+    private String noticeType;
+
+    /**
+     * 拒绝说明
+     */
+    private String nogoRemark;
+
+    /**
+     * 代理商编号
+     */
+    private String agtMercId;
+
+    // private JSONArray thridMercList;
+
+    private String thridMercList;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/yinsheng/v20210929/MerchInfo.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/yinsheng/v20210929/MerchInfo.java
new file mode 100644
index 0000000..a6f4772
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/yinsheng/v20210929/MerchInfo.java
@@ -0,0 +1,75 @@
+package cn.pluss.platform.yinsheng.v20210929;
+
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+@Data
+public class MerchInfo {
+
+    /**
+     * 合作方系统流水号
+     */
+    private String sysFlowId;
+
+    /**
+     * 业务商户号
+     */
+    private String mercId;
+
+    /**
+     * 客户编号
+     */
+    private String custId;
+
+    /**
+     * 商户名称
+     */
+    private String mercCnm;
+
+    /**
+     * 商户简称
+     */
+    private String mercAbbr;
+
+    /**
+     * 合作商编号
+     */
+    private String coOperatorNo;
+
+    /**
+     * 进件状态
+     * 03、待审核;
+     * 04、初审完成;
+     * 05、开户完成;
+     * 90、初审拒绝
+     */
+    private String status;
+
+    /**
+     * 状态说明
+     */
+    private String note1;
+
+    /**
+     * 返回码
+     * 00-成功;
+     * 50-超时;
+     * 99-失败
+     */
+    private String code;
+
+    /**
+     * 返回码说明
+     */
+    private String note;
+
+    /**
+     * 第三方商户号对象
+     * type: 银联网联标识
+     * flag: 微信支付宝标识, wx-微信; alipay-支付宝
+     * thirdMercId: 第三方商户号
+     */
+    private List<Map<String, Object>> thridMercList;
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/yinsheng/v20210929/ReqEntity.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/yinsheng/v20210929/ReqEntity.java
new file mode 100644
index 0000000..40277fc
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/yinsheng/v20210929/ReqEntity.java
@@ -0,0 +1,65 @@
+package cn.pluss.platform.yinsheng.v20210929;
+
+import lombok.Data;
+
+/**
+ * @author djh
+ */
+@Data
+public class ReqEntity {
+
+    /**
+     * 接口代码
+     */
+    private String msgCode;
+
+    /**
+     * 接口代码
+     */
+    private String method;
+
+    /**
+     * 请求流水标识，用于日志查询使用, 最大长度12
+     */
+    private String reqFlowId;
+
+    /**
+     * 代理商编号
+     */
+    private String src;
+
+    /**
+     * 接口版本 1.0
+     */
+    private String ver;
+
+    /**
+     * 编码格式
+     */
+    private String charset;
+
+    /**
+     * 签名方式
+     */
+    private String signType;
+
+    /**
+     * RSA签名字符串，再用Base64编码
+     */
+    private String signValue;
+
+    /**
+     * 请求参数
+     */
+    private String data;
+
+    public ReqEntity(ReqMethod reqMethod) {
+        // 流水号后面再设置
+//        this.reqFlowId = "YS" + System.currentTimeMillis() / 1000;
+        this.ver = "1.0";
+        this.charset = "UTF-8";
+        this.signType = "RSA";
+        this.msgCode = reqMethod.getMsgCode();
+        this.method = reqMethod.getMethod();
+    }
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/yinsheng/v20210929/ReqMethod.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/yinsheng/v20210929/ReqMethod.java
new file mode 100644
index 0000000..b7ed0b6
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/yinsheng/v20210929/ReqMethod.java
@@ -0,0 +1,35 @@
+package cn.pluss.platform.yinsheng.v20210929;
+
+import lombok.Getter;
+
+public enum ReqMethod {
+
+    /**
+     * 银盛进件接口，部分参数常量
+     */
+    MERCHANT_ADD("Merchant", "addScanMerchant"),
+    MERCHANT_EDIT("Merchant", "updateScanMerchant"),
+    MERCHANT_APPLY("Merchant", "autoAuditTerm"),
+    MERCHANT_QUERY("Merchant", "queryMerchant"),
+    MERCHANT_PROTOCOL_STATUS("Merchant", "querySignSts"),
+    MERCHANT_SEND_MSG("Merchant", "sendScanSmsCode"),
+    MERCHANT_ONLINE_TRADING("Merchant", "onlineTrading"),
+    MERCHANT_OPT_ONLINE_D0("Merchant", "optOnlineD0"),
+
+    MERCHANT_BASE_INFO_CHANGE("Merchant", "changeMerInfo"),
+    MERCHANT_ACCOUNT_CHANGE("Merchant", "changeMerAccInfo"),
+    MERCHANT_EDIT_RESULT("Merchant", "queryModifyStatus"),
+    MERCHANT_CHANGE_ONLINE_FEE("Merchant", "changeMerOnlineFee");
+
+    @Getter
+    private final String msgCode;
+
+    @Getter
+    private final String method;
+
+
+    ReqMethod(String msgCode, String method) {
+        this.msgCode = msgCode;
+        this.method = method;
+    }
+}
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/yinsheng/v20210929/RespEntity.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/yinsheng/v20210929/RespEntity.java
new file mode 100644
index 0000000..329a597
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/yinsheng/v20210929/RespEntity.java
@@ -0,0 +1,47 @@
+package cn.pluss.platform.yinsheng.v20210929;
+
+import lombok.Data;
+
+@Data
+public class RespEntity {
+
+    /**
+     * 业务信息反馈
+     */
+    private String note;
+
+    /**
+     * 业务信息返回码
+     */
+    private String code;
+
+    /**
+     * 合作方业务流水号
+     */
+    private String sysFlowId;
+
+    /**
+     * 签约请求流水号
+     */
+    private String sysSignFlowId;
+
+    /**
+     * 签约状态码
+     */
+    private String signSts;
+
+    /**
+     * 签约
+     */
+    private String signUrl;
+
+    /**
+     * 进件状态
+     */
+    private String status;
+
+    /**
+     * 备注信息
+     */
+    private String note1;
+}
\ No newline at end of file
diff --git a/pluss-model-bundle/src/main/java/order/OrderQueryVO.java b/pluss-model-bundle/src/main/java/order/OrderQueryVO.java
new file mode 100644
index 0000000..074ee37
--- /dev/null
+++ b/pluss-model-bundle/src/main/java/order/OrderQueryVO.java
@@ -0,0 +1,76 @@
+package order;
+
+/**
+ * @author yuchen
+ * 
+ * @Description 
+ */
+public class OrderQueryVO {
+	
+	/**
+	 * 支付宝商户入驻申请单状态申请单状态包括：
+	MERCHANT_INFO_HOLD=暂存，提交事务出现业务校验异常时，会暂存申请单信息，可以调用业务接口修正参数，并重新提交
+	MERCHANT_AUDITING=审核中，申请信息正在人工审核中
+	MERCHANT_CONFIRM=待商户确认，申请信息审核通过，等待联系人确认签约或授权
+	MERCHANT_CONFIRM_SUCCESS=商户确认成功，商户同意签约或授权
+	MERCHANT_CONFIRM_TIME_OUT=商户超时未确认，如果商户受到确认信息15天内未确认，则需要重新提交申请信息
+	MERCHANT_APPLY_ORDER_CANCELED=审核失败或商户拒绝，申请信息审核被驳回，或者商户选择拒绝签约或授权
+	 */
+	private String  orderStatus;
+	
+	/**
+	 * 只有申请单状态在MERCHANT_CONFIRM状态下，才会返回商户确认签约链接
+	 */
+	private String   confirmUrl;
+	
+	/**
+	 * 代理创建的应用ID，如果有代理商户创建应用，商户确认成功后，才返回应用ID，否则不返回。
+	 */
+	private String   agentAppId;
+	
+	/**
+	 * 审核失败的拒绝原因，只有审核失败才会返回该值
+	 */
+	private String   rejectReason;
+	
+	/**
+	 * 
+	 */
+	private String   merchantPid;
+	
+	
+	public String getOrderStatus() {
+		return orderStatus;
+	}
+	public void setOrderStatus(String orderStatus) {
+		this.orderStatus = orderStatus;
+	}
+	public String getConfirmUrl() {
+		return confirmUrl;
+	}
+	public void setConfirmUrl(String confirmUrl) {
+		this.confirmUrl = confirmUrl;
+	}
+	public String getAgentAppId() {
+		return agentAppId;
+	}
+	public void setAgentAppId(String agentAppId) {
+		this.agentAppId = agentAppId;
+	}
+	public String getRejectReason() {
+		return rejectReason;
+	}
+	public void setRejectReason(String rejectReason) {
+		this.rejectReason = rejectReason;
+	}
+	public String getMerchantPid() {
+		return merchantPid;
+	}
+	public void setMerchantPid(String merchantPid) {
+		this.merchantPid = merchantPid;
+	}
+	
+	
+
+}
+
diff --git a/pluss-service-bundle/pom.xml b/pluss-service-bundle/pom.xml
new file mode 100644
index 0000000..458ecdf
--- /dev/null
+++ b/pluss-service-bundle/pom.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>pluss-parent</artifactId>
+        <groupId>cn.pluss.platform</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>pluss-service-bundle</artifactId>
+    <packaging>jar</packaging>
+    <version>1.0.0</version>
+
+    <dependencies>
+        <dependency>
+            <groupId>cn.pluss.platform</groupId>
+            <artifactId>pluss-dao-bundle</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+
+<!--        <dependency>-->
+<!--            <groupId>com.aliyun</groupId>-->
+<!--            <artifactId>aliyun-java-sdk-core</artifactId>-->
+<!--            <version>4.4.9</version>-->
+<!--        </dependency>-->
+
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>aliyun-java-sdk-geoip</artifactId>
+            <version>1.0.3</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>aliyun-java-sdk-sts</artifactId>
+            <version>3.0.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-amqp</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>spring-boot-starter-logging</artifactId>
+                    <groupId>org.springframework.boot</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+
+        <dependency>
+            <groupId>org.springframework.amqp</groupId>
+            <artifactId>spring-rabbit-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>aliyun-java-sdk-core</artifactId>
+            <version>4.5.7</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.retry</groupId>
+            <artifactId>spring-retry</artifactId>
+            <version>1.1.2.RELEASE</version>
+        </dependency>
+
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/AppMenuService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/AppMenuService.java
new file mode 100644
index 0000000..df76db5
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/AppMenuService.java
@@ -0,0 +1,23 @@
+package cn.pluss.platform;
+
+import cn.pluss.platform.entity.AppMenu;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * app页面菜单 服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-09-27
+ */
+public interface AppMenuService extends IService<AppMenu> {
+
+    List<Map<String, Object>> getHomeMenu(HttpServletRequest request);
+
+    List<Map<String, Object>> getSpreadPageMenu(HttpServletRequest request);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/BankCardService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/BankCardService.java
new file mode 100644
index 0000000..bdfb8b2
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/BankCardService.java
@@ -0,0 +1,61 @@
+package cn.pluss.platform;
+
+import cn.pluss.platform.entity.BankCard;
+import cn.pluss.platform.mapper.BankCardMapper;
+import cn.pluss.platform.vo.BankCardRecordVO;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 银行卡信息 服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-10-16
+ */
+public interface BankCardService extends IService<BankCard> {
+
+    /**
+     * 获取商户的结算银行卡信息
+     *
+     * @param userId 用户id
+     * @return 商户结算银行卡信息
+     */
+    List<Map<String, Object>> getAccBankCardList(String userId);
+
+    /**
+     * 保存实名银行卡信息
+     * @param entity    银行卡信息
+     * @return
+     */
+    boolean saveCertBankCard(BankCard entity);
+
+    /**
+     * 保存结算银行卡信息
+     * @param entity    银行卡信息
+     * @return
+     */
+    boolean saveAccountBankCard(BankCard entity);
+    /**
+     * 校验银行卡信息是否合法
+     *
+     * @param bankCard 银行卡信息
+     */
+    void checkBankInfo(BankCard bankCard);
+
+    /**
+     * 获取未关联结算信息的对私结算银行卡信息
+     *
+     * @param userId 用户id
+     * @return 银行卡信息
+     */
+    default BankCard getUnusedBankCard(String userId) {
+        return ((BankCardMapper) getBaseMapper()).getUnusedBankCard(userId);
+    }
+
+    Page<BankCardRecordVO> pageBankCardRecord(Page<BankCardRecordVO> page, Long userId);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/CallbackDataService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/CallbackDataService.java
new file mode 100644
index 0000000..de20c2e
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/CallbackDataService.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform;
+
+import cn.pluss.platform.entity.CallbackData;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 表原始数据记录，用于不明确的回调数据的统计 服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-09-10
+ */
+public interface CallbackDataService extends IService<CallbackData> {
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/DeviceGoodsService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/DeviceGoodsService.java
new file mode 100644
index 0000000..b372181
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/DeviceGoodsService.java
@@ -0,0 +1,54 @@
+package cn.pluss.platform;
+
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.entity.DeviceGoods;
+import cn.pluss.platform.mapper.DeviceGoodsMapper;
+import cn.pluss.platform.vo.DeviceGoodsVO;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 设备商品展示表 服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-11-11
+ */
+public interface DeviceGoodsService extends IService<DeviceGoods> {
+
+    /**
+     * 获取商品列表
+     * 使用范围：app设备商城
+     * @param pageNum
+     * @param size
+     * @return
+     */
+    PageInfo<DeviceGoodsVO> goodList(Integer pageNum, Integer size, DeviceGoods condition);
+
+    /**
+     * 获取商品列表
+     * 使用范围：app设备商城
+     * @param pageNum
+     * @param size
+     * @return
+     */
+    PageInfo<DeviceGoodsVO> goodListSimple(Integer pageNum, Integer size, DeviceGoods condition);
+
+    /**
+     * 根据sn码获取对应商品信息
+     * @param snNo sn码
+     * @return
+     */
+    default DeviceGoods getBySn(String snNo) {
+        return ((DeviceGoodsMapper) getBaseMapper()).selectBySn(snNo);
+    }
+
+    /**
+     * 根据code 查询商品信息
+     * @param code
+     * @return
+     */
+    default DeviceGoods getByCode(String code){
+        return ((DeviceGoodsMapper) getBaseMapper()).getByCode(code);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/IdCardCacheService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/IdCardCacheService.java
new file mode 100644
index 0000000..0742b7c
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/IdCardCacheService.java
@@ -0,0 +1,12 @@
+package cn.pluss.platform;
+
+import cn.pluss.platform.entity.IdCardCache;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @author DJH
+ */
+public interface IdCardCacheService extends IService<IdCardCache> {
+
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/IdCardService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/IdCardService.java
new file mode 100644
index 0000000..0797642
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/IdCardService.java
@@ -0,0 +1,106 @@
+package cn.pluss.platform;
+
+import cn.pluss.platform.entity.IdCard;
+import cn.pluss.platform.mapper.IdCardMapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 身份证信息表, 图片信息在tb_pluss_merchant_image表中 服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-10-16
+ */
+public interface IdCardService extends IService<IdCard> {
+
+    default int getAgentCount(String certNo, String userId) {
+        return ((IdCardMapper) getBaseMapper()).selectAgentCount(certNo, userId);
+    }
+
+    /**
+     * 获取实名的身份证信息
+     * @param userId 用户id
+     * @return  身份证信息
+     */
+    IdCard getCertIdCard(Object userId);
+
+    /**
+     * 获取进件法人的身份证信息
+     * @param userId 用户id
+     * @return  身份证信息
+     */
+    IdCard getLegalIdCard(String userId);
+
+    /**
+     * 保存法人身份证信息
+     * @param entity    身份证信息
+     */
+    boolean apiSaveLegalIdCard(IdCard entity);
+
+    /**
+     * 保存实名身份证信息
+     * @param entity    身份证信息
+     * @return
+     */
+    boolean apiSaveCertIdCard(IdCard entity);
+
+    /**
+     * 获取结算人身份证信息
+     * @param userId
+     * @param merchantType  商户类型
+     * @return
+     */
+    IdCard getReckonerIdCard(String userId, String merchantType);
+
+    /**
+     * 法人信息为空的时候，将实名身份信息作为法人身份信息存储
+     * 法人身份部位空时，则检验身份与实名身份是否是同一身份，若不匹配，则将实名身份作为法人身份替换保存
+     * @param userId        用户id
+     * @return              保存的法人身份信息
+     */
+    IdCard createLegalIdCard(String userId);
+
+    /**
+     * 获取结算人信息
+     * @param userId    用户id
+     * @return  结算身份证
+     */
+    default IdCard getBalanceIdCard(String userId) {
+        IdCard idCard = new IdCard();
+        idCard.setUserType(IdCard.TYPE_ACCOUNT);
+        idCard.setUserId(userId);
+
+        return getOne(new QueryWrapper<>(idCard).last("limit 1"));
+    }
+
+    /**
+     * 获取结算身份证
+     * @return
+     */
+    default List<IdCard> getAccountIdCard(String userId) {
+        return ((IdCardMapper) getBaseMapper()).getAccountIdCard(userId);
+    }
+
+    /**
+     * 获取结算身份证
+     * @return
+     */
+    default IdCard getAccountIdCard(String userId, String channelType) {
+        return ((IdCardMapper) getBaseMapper()).getAccountIdCard(userId, channelType);
+    }
+
+    /**
+     * 获取未关联结算信息的对私结算身份证信息
+     * @param userId    用户id
+     * @return  身份证信息
+     */
+    default IdCard getUnusedIdCard(String userId) {
+        return ((IdCardMapper) getBaseMapper()).getUnusedIdCard(userId);
+    }
+
+    IdCard apiGetFaceCertInfo();
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/MerchantAuditRecordService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/MerchantAuditRecordService.java
new file mode 100644
index 0000000..7308e04
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/MerchantAuditRecordService.java
@@ -0,0 +1,64 @@
+package cn.pluss.platform;
+
+import cn.pluss.platform.entity.MerchantAuditRecord;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.MerchantAuditRecordMapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-11-27
+ */
+public interface MerchantAuditRecordService extends IService<MerchantAuditRecord> {
+
+    /**
+     * 最大进件失败次数限制
+     */
+    int MAX_FAIL_COUNT = 3;
+
+    /**
+     * 获取商户进件失败次数
+     * @param userId        用户id
+     * @return              进件失败次数
+     */
+    Integer getFailCountByUserId(String userId);
+    /**
+     * 获取商户进件失败次数
+     * @param merchantCode          商户code
+     * @return                      进件失败次数
+     */
+    default Integer getFailCount(String merchantCode) {
+        MerchantAuditRecordMapper mapper = (MerchantAuditRecordMapper) getBaseMapper();
+        MerchantAuditRecord merchantAuditRecord = new MerchantAuditRecord();
+        merchantAuditRecord.setMerchantCode(merchantCode);
+
+        QueryWrapper<MerchantAuditRecord> queryWrapper = new QueryWrapper<>(merchantAuditRecord);
+        queryWrapper.in("status", "5", "2");
+
+        return mapper.selectCount(queryWrapper);
+    }
+
+    /**
+     * 商户进件失败次数校验
+     * @param merchantCode
+     * @param msg
+     */
+    default void checkFailCount(String merchantCode, String msg) {
+        Integer failCount = getFailCount(merchantCode);
+        MsgException.check(failCount >= MAX_FAIL_COUNT, msg);
+    }
+
+    default MerchantAuditRecord getLastRecord(String merchantCode) {
+        QueryWrapper<MerchantAuditRecord> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("merchantCode", merchantCode);
+        queryWrapper.orderByDesc("createTime");
+        queryWrapper.last("limit 1");
+
+        return getBaseMapper().selectOne(queryWrapper);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/MerchantRateRecordService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/MerchantRateRecordService.java
new file mode 100644
index 0000000..95c534f
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/MerchantRateRecordService.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform;
+
+import cn.pluss.platform.entity.MerchantRateRecord;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 费率修改记录表 服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-09-02
+ */
+public interface MerchantRateRecordService extends IService<MerchantRateRecord> {
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/PushService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/PushService.java
new file mode 100644
index 0000000..6c8b072
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/PushService.java
@@ -0,0 +1,52 @@
+package cn.pluss.platform;
+
+import cn.pluss.platform.entity.PushAll;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 发送推送的服务类
+ * @author DJH
+ */
+public interface PushService extends IService<PushAll> {
+
+    /**
+     * 下单
+     */
+    String MAKE_ORDER = "1";
+
+    /**
+     * 催单
+     */
+    String URGE_ORDER = "2";
+
+    /**
+     * 请求服务
+     */
+    String REQUEST_SERVICE = "3";
+
+    /**
+     * 退款
+     */
+    String REFUND_ORDER = "4";
+
+    /**
+     * 推送数据给商户app上
+     * @param userId
+     * @param type
+     */
+    void pushMsg(String userId, String type);
+
+    /**
+     * 根据店铺的id发送推送或通知
+     * @param storeId   store表的id
+     * @param type      通知或推送类别
+     */
+    void pushMsg(Integer storeId, String type);
+
+    /**
+     * 发送广播推送
+     * @param title     标题
+     * @param msg       内容
+     */
+    void pushAll(String title, String msg);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/SubMerchantApplyOrderService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/SubMerchantApplyOrderService.java
new file mode 100644
index 0000000..569f652
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/SubMerchantApplyOrderService.java
@@ -0,0 +1,37 @@
+package cn.pluss.platform;
+
+import cn.pluss.platform.entity.SubMerchantApplyOrder;
+import cn.pluss.platform.entity.UserApp;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 子渠道工单信息表 服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-08-31
+ */
+public interface SubMerchantApplyOrderService extends IService<SubMerchantApplyOrder> {
+
+    List<SubMerchantApplyOrder> listNoCertData();
+
+    Page<Map<String, Object>> pageMoreDetail(Page<Map<String, Object>> page, Map<String, String> condition);
+
+    /**
+     * 获取商户微信认证信息
+     * @param userApp 商户信息
+     * @return 微信认证结果信息
+     */
+    SubMerchantApplyOrder apiGetWxAuditInfo(UserApp userApp);
+
+    /**
+     * 商户认证信息标识为完成
+     * @param userApp 商户信息
+     */
+    void complete(UserApp userApp);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/SxfMccInfoService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/SxfMccInfoService.java
new file mode 100644
index 0000000..2e8bd7a
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/SxfMccInfoService.java
@@ -0,0 +1,31 @@
+package cn.pluss.platform;
+
+import cn.pluss.platform.entity.SxfMccInfo;
+import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-09-22
+ *
+ * 常规mcc使用请看
+ * {@link cn.pluss.platform.entity.MccInfoSort}
+ * {@link cn.pluss.platform.mcc.MccInfoSortService}
+ */
+public interface SxfMccInfoService extends IService<SxfMccInfo> {
+
+    Page<SxfMccInfo> pageData(Page<SxfMccInfo> page, String keyWord);
+
+    /**
+     * mcc表信息转换为树形
+     * @return 树形mcc信息
+     */
+    JSONArray treeData();
+
+    SxfMccInfo getByMccCode(String mccCode);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/activityActivate/ActivityActivateService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/activityActivate/ActivityActivateService.java
new file mode 100644
index 0000000..fa88b8f
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/activityActivate/ActivityActivateService.java
@@ -0,0 +1,61 @@
+package cn.pluss.platform.activityActivate;
+
+import java.util.List;
+import java.util.Map;
+
+import cn.pluss.platform.entity.ActivityActivate;
+import cn.pluss.platform.mapper.ActivityActivateMapper;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+public interface ActivityActivateService extends IService<ActivityActivate> {
+
+    default ActivityActivate queryActivityActivate(ActivityActivate activityActivate) {
+        return ((ActivityActivateMapper) getBaseMapper()).queryActivityActivate(activityActivate);
+    }
+
+    default List<ActivityActivate> queryActivityActivateList(ActivityActivate activityActivate) {
+        return ((ActivityActivateMapper) getBaseMapper()).queryActivityActivateList(activityActivate);
+    }
+
+    default void saveActivityActivate(ActivityActivate activityActivate) {
+        getBaseMapper().insert(activityActivate);
+    }
+
+    default void updateActivityActivate(ActivityActivate activityActivate) {
+        getBaseMapper().updateById(activityActivate);
+    }
+
+    default void deleteActivityActivate(ActivityActivate activityActivate) {
+        getBaseMapper().deleteById(activityActivate.getId());
+    }
+
+    default List<ActivityActivate> queryActivityActivatePage(Map<String, Object> map) {
+        return ((ActivityActivateMapper) getBaseMapper()).queryActivityActivatePage(map);
+    }
+
+    default List<ActivityActivate> queryNoActivityActivatePage(Map<String, Object> map) {
+        return ((ActivityActivateMapper) getBaseMapper()).queryNoActivityActivatePage(map);
+    }
+
+    default Integer queryActivityActivatePageCount(Map<String, Object> map) {
+        return ((ActivityActivateMapper) getBaseMapper()).queryActivityActivatePageCount(map);
+    }
+
+    default Integer queryNoActivityActivatePageCount(Map<String, Object> map) {
+        return ((ActivityActivateMapper) getBaseMapper()).queryNoActivityActivatePageCount(map);
+    }
+
+    default List<Map<String, Object>> getNewestActivityJoin(String storeId) {
+        return ((ActivityActivateMapper) getBaseMapper()).getNewestActivityJoin(storeId);
+    }
+
+    /**
+     * 通过type删除活动
+     *
+     * @param activityActivate
+     */
+    void delActByType(ActivityActivate activityActivate);
+
+    void delByUserId(Integer userId);
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/activityActivate/impl/ActivityActivateServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/activityActivate/impl/ActivityActivateServiceImpl.java
new file mode 100644
index 0000000..f201a89
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/activityActivate/impl/ActivityActivateServiceImpl.java
@@ -0,0 +1,56 @@
+package cn.pluss.platform.activityActivate.impl;
+
+import cn.pluss.platform.activityActivate.ActivityActivateService;
+import cn.pluss.platform.activityConsumReturn.ActivityConsumReturnService;
+import cn.pluss.platform.activityRecharge.ActivityRechargeService;
+import cn.pluss.platform.entity.ActivityActivate;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.ActivityActivateMapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.Setter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author DJH
+ */
+@Service("activityActivateService")
+public class ActivityActivateServiceImpl extends ServiceImpl<ActivityActivateMapper, ActivityActivate> implements ActivityActivateService {
+
+    @Setter(onMethod_ = {@Autowired})
+    private ActivityRechargeService activityRechargeService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private ActivityConsumReturnService activityConsumReturnService;
+
+    @Override
+    public void delActByType(ActivityActivate activityActivate) {
+        switch (activityActivate.getType()) {
+            case "0":
+                activityRechargeService.delByUserId(activityActivate.getUserId());
+                break;
+            case "1":
+                activityConsumReturnService.delByUserId(activityActivate.getUserId());
+                break;
+            case "2":
+                delByUserId(activityActivate.getUserId());
+                break;
+            default:
+                throw new MsgException("未知的活动类型");
+        }
+    }
+
+    @Override
+    public void delByUserId(Integer userId) {
+        if (userId == null) {
+            throw new MsgException("缺少用户id");
+        }
+
+        ActivityActivate entity = new ActivityActivate();
+        entity.setUserId(userId);
+
+        baseMapper.delete(new QueryWrapper<>(entity));
+    }
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/activityConsumReturn/ActivityConsumReturnService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/activityConsumReturn/ActivityConsumReturnService.java
new file mode 100644
index 0000000..a4625ba
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/activityConsumReturn/ActivityConsumReturnService.java
@@ -0,0 +1,45 @@
+package cn.pluss.platform.activityConsumReturn;
+
+import java.util.List;
+import java.util.Map;
+
+import cn.pluss.platform.entity.ActivityConsumReturn;
+import cn.pluss.platform.entity.MerchantMenberComsume;
+import cn.pluss.platform.mapper.ActivityConsumReturnMapper;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+public interface ActivityConsumReturnService extends IService<ActivityConsumReturn> {
+
+    ActivityConsumReturn queryActivityConsumReturn(ActivityConsumReturn activityConsumReturn);
+
+    List<ActivityConsumReturn> queryActivityConsumReturnList(ActivityConsumReturn activityConsumReturn);
+
+    void saveActivityConsumReturn(ActivityConsumReturn activityConsumReturn);
+
+    void updateActivityConsumReturn(ActivityConsumReturn activityConsumReturn);
+
+    void deleteActivityConsumReturn(ActivityConsumReturn activityConsumReturn);
+
+    List<ActivityConsumReturn> queryActivityConsumReturnPage(Map map);
+
+    List<ActivityConsumReturn> queryActivityNoConsumReturnPage(Map map);
+
+    Integer queryActivityConsumReturnPageCount(Map map);
+
+    Integer queryActivityNoConsumReturnPageCount(Map map);
+
+    void saveActivityConsumReturnBatch(List<ActivityConsumReturn> activityConsumReturnList);
+
+    /**
+     * 获取消费返现参数
+     */
+    MerchantMenberComsume getActivityReturnParams(String merchantCode, String storeId, Double consumeAmt);
+
+    /**
+     * 根据用户id删除所有“充值返”活动
+     *
+     * @param userId
+     */
+    void delByUserId(Integer userId);
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/activityConsumReturn/impl/ActivityConsumReturnServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/activityConsumReturn/impl/ActivityConsumReturnServiceImpl.java
new file mode 100644
index 0000000..4f86af6
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/activityConsumReturn/impl/ActivityConsumReturnServiceImpl.java
@@ -0,0 +1,179 @@
+package cn.pluss.platform.activityConsumReturn.impl;
+
+import cn.pluss.platform.activityConsumReturn.ActivityConsumReturnService;
+import cn.pluss.platform.entity.ActivityConsumReturn;
+import cn.pluss.platform.entity.MerchantMenberComsume;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.ActivityConsumReturnMapper;
+import cn.pluss.platform.util.StringUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+
+@Service("activityConsumReturnService")
+public class ActivityConsumReturnServiceImpl extends ServiceImpl<ActivityConsumReturnMapper, ActivityConsumReturn> implements ActivityConsumReturnService {
+
+    @Override
+    public ActivityConsumReturn queryActivityConsumReturn(ActivityConsumReturn activityConsumReturn) {
+        return baseMapper.queryActivityConsumReturn(activityConsumReturn);
+    }
+
+    @Override
+    public List<ActivityConsumReturn> queryActivityConsumReturnList(ActivityConsumReturn activityConsumReturn) {
+        return baseMapper.queryActivityConsumReturnList(activityConsumReturn);
+    }
+
+    @Override
+    public void saveActivityConsumReturn(ActivityConsumReturn activityConsumReturn) {
+        activityConsumReturn.setStoreName(activityConsumReturn.getMerchantName());
+        baseMapper.saveActivityConsumReturn(activityConsumReturn);
+    }
+
+    @Override
+    public void updateActivityConsumReturn(ActivityConsumReturn activityConsumReturn) {
+        baseMapper.updateActivityConsumReturn(activityConsumReturn);
+    }
+
+    @Override
+    public void deleteActivityConsumReturn(ActivityConsumReturn activityConsumReturn) {
+        baseMapper.deleteActivityConsumReturn(activityConsumReturn);
+    }
+
+    @Override
+    public List<ActivityConsumReturn> queryActivityConsumReturnPage(Map map) {
+        return baseMapper.queryActivityConsumReturnPage(map);
+    }
+
+    @Override
+    public List<ActivityConsumReturn> queryActivityNoConsumReturnPage(Map map) {
+        return baseMapper.queryActivityNoConsumReturnPage(map);
+    }
+
+    @Override
+    public Integer queryActivityNoConsumReturnPageCount(Map map) {
+        return baseMapper.queryActivityNoConsumReturnPageCount(map);
+    }
+
+    @Override
+    public Integer queryActivityConsumReturnPageCount(Map map) {
+        return baseMapper.queryActivityConsumReturnPageCount(map);
+    }
+
+    @Override
+    public void saveActivityConsumReturnBatch(List<ActivityConsumReturn> activityConsumReturnList) {
+        baseMapper.saveActivityConsumReturnBatch(activityConsumReturnList);
+    }
+
+    /**
+     * 获取充值金额对应的活动返现金额
+     *
+     * @param merchantCode
+     * @param storeId
+     * @param consumeAmt
+     * @return
+     */
+    @Override
+    public MerchantMenberComsume getActivityReturnParams(String merchantCode, String storeId, Double consumeAmt) {
+        /*
+         * 查询所有消费返活动，选择其中最大的反额为消费返的金额
+         */
+        ActivityConsumReturn activityConsumReturn = new ActivityConsumReturn();
+        activityConsumReturn.setMerchantCode(merchantCode);
+        activityConsumReturn.setStoreId(storeId);
+        List<ActivityConsumReturn> queryActivityConsumReturnList = baseMapper.queryActivityConsumReturnList(activityConsumReturn);
+        Double consumeFee = StringUtil.bigDecimal(consumeAmt);// 消费金额
+        Double returnMoney = 0d;
+        MerchantMenberComsume merchantMenberComsume = new MerchantMenberComsume();
+        merchantMenberComsume.setReturnMoney(returnMoney);
+        merchantMenberComsume.setGiveMoney(0d);
+        if (queryActivityConsumReturnList != null && queryActivityConsumReturnList.size() > 0) {
+            queryActivityConsumReturnList = comsumeMoneyByDesc(queryActivityConsumReturnList);
+            for (ActivityConsumReturn a : queryActivityConsumReturnList) {
+                if (1 == a.getTimeType()) {
+                    if (a.getStartDt() == null || a.getEndDt() == null) {
+                        continue;
+                    }
+                    boolean bol = isBoolean(a.getStartDt(), a.getEndDt());
+                    if (!bol) {
+                        // 删除过期的消费返活动
+                        baseMapper.deleteActivityConsumReturn(a);
+                        continue;
+                    }
+                }
+                if (null != a.getComsumeMoney()) {
+                    //分等级返现
+                    if (a.getType() == 0) {
+                        if (consumeFee >= StringUtil.bigDecimal(a.getComsumeMoney())) {
+                            merchantMenberComsume.setGiveMoney(StringUtil.bigDecimal(a.getReturnMoney()));// 返现金额
+                            merchantMenberComsume.setReturnMoney(a.getReturnMoney());
+                            break;
+                        }
+                    } else if (a.getType() == 1) {
+                        if (consumeFee >= StringUtil.bigDecimal(a.getComsumeMoney())) {
+                            Double d = a.getReturnMoney();
+                            Double countD = consumeFee / a.getComsumeMoney();
+                            Integer count = countD.intValue();
+                            Double returnAmt = d * count;
+                            merchantMenberComsume.setGiveMoney(StringUtil.bigDecimal(returnAmt));// 返现金额
+                            returnMoney = StringUtil.bigDecimal(returnAmt);
+                            merchantMenberComsume.setReturnMoney(returnMoney);
+                            break;
+                        }
+                    }
+                }
+                if (a.getType() == 2) {
+                    Double percentRate = a.getPercent() / 100;
+                    Double d = consumeFee * percentRate;
+                    Double returnAmt = StringUtil.bigDecimal(d);
+                    merchantMenberComsume.setGiveMoney(returnAmt);
+                    merchantMenberComsume.setReturnMoney(returnAmt);
+                    break;
+                }
+            }
+        }
+        return merchantMenberComsume;
+    }
+
+    @Override
+    public void delByUserId(Integer userId) {
+        if (userId == null) {
+            throw new MsgException("缺少用户id");
+        }
+
+        ActivityConsumReturn entity = new ActivityConsumReturn();
+        entity.setUserId(userId);
+
+        baseMapper.delete(new QueryWrapper<>(entity));
+    }
+
+
+    public List<ActivityConsumReturn> comsumeMoneyByDesc(List<ActivityConsumReturn> list) {
+        Collections.sort(list, (o1, o2) -> {
+            int desc = (int) (Optional.ofNullable(o2.getComsumeMoney()).orElse(0d) - Optional.ofNullable(o1.getComsumeMoney()).orElse(0d));
+            return desc;
+        });
+        return list;
+    }
+
+    /**
+     * isBoolean:(当前时间大于活动开始时间，并且当前时间小于活动结束时间). <br/>
+     *
+     * @return
+     * 
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    public boolean isBoolean(Date startTime, Date endTime) {
+        boolean flag = false;
+        long current = System.currentTimeMillis();
+        boolean start = current >= startTime.getTime();
+        boolean end = current <= endTime.getTime();
+        if (start && end) {
+            flag = true;
+        }
+        return flag;
+    }
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/activityEnroll/ActivityEnrollService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/activityEnroll/ActivityEnrollService.java
new file mode 100644
index 0000000..fddcf6e
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/activityEnroll/ActivityEnrollService.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.activityEnroll;
+
+import cn.pluss.platform.entity.ActivityEnroll;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 商户活动报名记录表 服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-11-02
+ */
+public interface ActivityEnrollService extends IService<ActivityEnroll> {
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/activityEnroll/impl/ActivityEnrollServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/activityEnroll/impl/ActivityEnrollServiceImpl.java
new file mode 100644
index 0000000..db8a851
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/activityEnroll/impl/ActivityEnrollServiceImpl.java
@@ -0,0 +1,20 @@
+package cn.pluss.platform.activityEnroll.impl;
+
+import cn.pluss.platform.activityEnroll.ActivityEnrollService;
+import cn.pluss.platform.entity.ActivityEnroll;
+import cn.pluss.platform.mapper.ActivityEnrollMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 商户活动报名记录表 服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-11-02
+ */
+@Service
+public class ActivityEnrollServiceImpl extends ServiceImpl<ActivityEnrollMapper, ActivityEnroll> implements ActivityEnrollService {
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/activityRecharge/ActivityRechargeService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/activityRecharge/ActivityRechargeService.java
new file mode 100644
index 0000000..4ad08bd
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/activityRecharge/ActivityRechargeService.java
@@ -0,0 +1,53 @@
+package cn.pluss.platform.activityRecharge;
+
+import java.util.List;
+import java.util.Map;
+import cn.pluss.platform.entity.ActivityRecharge;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @author DJH
+ */
+public interface ActivityRechargeService extends IService<ActivityRecharge> {
+
+    ActivityRecharge queryActivityRecharge(ActivityRecharge activityRecharge);
+
+    List<ActivityRecharge> queryActivityRechargeList(ActivityRecharge activityRecharge);
+
+    void saveActivityRecharge(ActivityRecharge activityRecharge);
+
+    void updateActivityRecharge(ActivityRecharge activityRecharge);
+
+    void deleteActivityRecharge(ActivityRecharge activityRecharge);
+
+    /**
+     * 一次删除所有的充值活动
+     * @param userId
+     */
+    void delByUserId(Integer userId);
+
+    List<ActivityRecharge> queryActivityRechargePage(Map<String, Object> map);
+
+    List<ActivityRecharge> queryActivityNoRechargePage(Map<String, Object> map);
+
+    Integer queryActivityRechargePageCount(Map<String, Object> map);
+
+    Integer queryActivityNoRechargePageCount(Map<String, Object> map);
+
+    /**
+     * 获取充值赠送金额
+     * @param merchantCode
+     * @param storeId
+     * @param rechargeMoney
+     * @return
+     */
+    double getRechargeReturnAmt(String merchantCode, String storeId, double rechargeMoney);
+
+    /**
+     * 查询进行中的活动
+     * @param activityRecharge
+     * @return
+     */
+    List<ActivityRecharge> queryUsableActivityRechageList(ActivityRecharge activityRecharge);
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/activityRecharge/impl/ActivityRechargeServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/activityRecharge/impl/ActivityRechargeServiceImpl.java
new file mode 100644
index 0000000..d95e00c
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/activityRecharge/impl/ActivityRechargeServiceImpl.java
@@ -0,0 +1,152 @@
+package cn.pluss.platform.activityRecharge.impl;
+
+import cn.pluss.platform.activityRecharge.ActivityRechargeService;
+import cn.pluss.platform.entity.ActivityRecharge;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.ActivityRechargeMapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@Service("activityRechargeService")
+public class ActivityRechargeServiceImpl extends ServiceImpl<ActivityRechargeMapper, ActivityRecharge> implements ActivityRechargeService {
+
+    @Override
+    public ActivityRecharge queryActivityRecharge(ActivityRecharge activityRecharge) {
+        return baseMapper.selectOne(new QueryWrapper<>(activityRecharge));
+    }
+
+    @Override
+    public List<ActivityRecharge> queryActivityRechargeList(ActivityRecharge activityRecharge) {
+        return baseMapper.queryActivityRechargeList(activityRecharge);
+    }
+
+    @Override
+    public void saveActivityRecharge(ActivityRecharge activityRecharge) {
+        baseMapper.insert(activityRecharge);
+    }
+
+    @Override
+    public void updateActivityRecharge(ActivityRecharge activityRecharge) {
+        baseMapper.updateById(activityRecharge);
+    }
+
+    @Override
+    public void deleteActivityRecharge(ActivityRecharge activityRecharge) {
+        baseMapper.deleteById(activityRecharge.getId());
+    }
+
+    @Override
+    public void delByUserId(Integer userId) {
+        if (userId == null) {
+            throw new MsgException("缺少用户id");
+        }
+
+        ActivityRecharge entity = new ActivityRecharge();
+        entity.setUserId(userId);
+
+        baseMapper.delete(new QueryWrapper<>(entity));
+    }
+
+    @Override
+    public List<ActivityRecharge> queryActivityRechargePage(Map<String, Object> map) {
+        return baseMapper.queryActivityRechargePage(map);
+    }
+
+    @Override
+    public List<ActivityRecharge> queryActivityNoRechargePage(Map<String, Object> map) {
+        return baseMapper.queryActivityNoRechargePage(map);
+    }
+
+    @Override
+    public Integer queryActivityRechargePageCount(Map<String, Object> map) {
+        return baseMapper.queryActivityRechargePageCount(map);
+    }
+
+    @Override
+    public Integer queryActivityNoRechargePageCount(Map<String, Object> map) {
+        return baseMapper.queryActivityNoRechargePageCount(map);
+    }
+
+    @Override
+    public double getRechargeReturnAmt(String merchantCode, String storeId, double rechargeMoney) {
+        ActivityRecharge activityRecharge = new ActivityRecharge();
+        activityRecharge.setMerchantCode(merchantCode);
+        activityRecharge.setStoreId(storeId);
+        double giveMoney = 0.0d;
+        List<ActivityRecharge> queryActivityRechargeList = queryActivityRechargeList(activityRecharge);
+        if (queryActivityRechargeList != null && queryActivityRechargeList.size() > 0) {
+            queryActivityRechargeList = rechargeMoneyDesc(queryActivityRechargeList);
+            for (ActivityRecharge a : queryActivityRechargeList) {
+                if (1 == a.getTimeType()) {
+                    if (a.getStartDt() == null || a.getEndDt() == null) {
+                        continue;
+                    }
+                    boolean bol = isBoolean(a.getStartDt(), a.getEndDt());
+                    if (!bol) {
+                        deleteActivityRecharge(a);
+                        continue;
+                    }
+                }
+                if (null != a.getRechargeMoney()) {
+                    if (BigDecimal.valueOf(rechargeMoney).compareTo(BigDecimal.valueOf(a.getRechargeMoney())) > -1) {
+                        // 返现金额
+                        giveMoney = a.getGiveMoney() == null ? 0d : a.getGiveMoney();
+                        break;
+                    }
+                }
+            }
+        }
+        return giveMoney;
+    }
+
+    /**
+     * rechargeMoneyDesc:(充值金额从大到小). <br/>
+     *
+     * @param list
+     * @return
+     *
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    public List<ActivityRecharge> rechargeMoneyDesc(List<ActivityRecharge> list) {
+        list.sort((o1, o2) -> (int) (o2.getRechargeMoney() - o1.getRechargeMoney()));
+        return list;
+
+    }
+
+    /**
+     * isBoolean:(当前时间大于活动开始时间，并且当前时间小于活动结束时间). <br/>
+     *
+     * @return
+     *
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    public boolean isBoolean(Date startTime, Date endTime) {
+        boolean flag = false;
+        long current = System.currentTimeMillis();
+        boolean start = current >= startTime.getTime();
+        boolean end = current <= endTime.getTime();
+        if (start && end) {
+            flag = true;
+        }
+        return flag;
+    }
+
+    /**
+     * 查询进行中的活动
+     * @param activityRecharge
+     * @return
+     */
+    @Override
+    public List<ActivityRecharge> queryUsableActivityRechageList(ActivityRecharge activityRecharge) {
+        return baseMapper.queryUsableActivityRechageList(activityRecharge);
+    }
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/activityRecommend/ActivityRecommendService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/activityRecommend/ActivityRecommendService.java
new file mode 100644
index 0000000..826d18f
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/activityRecommend/ActivityRecommendService.java
@@ -0,0 +1,25 @@
+package cn.pluss.platform.activityRecommend;
+
+import java.util.List;
+import java.util.Map;
+import cn.pluss.platform.entity.ActivityRecommend;
+
+public interface ActivityRecommendService {
+
+    public ActivityRecommend queryActivityRecommend(ActivityRecommend activityRecommend);
+
+    public List<ActivityRecommend> queryActivityRecommendList(ActivityRecommend activityRecommend);
+
+    public void saveActivityRecommend(ActivityRecommend activityRecommend);
+
+    public void updateActivityRecommend(ActivityRecommend activityRecommend);
+
+    public void deleteActivityRecommend(ActivityRecommend activityRecommend);
+
+    public List<ActivityRecommend> queryActivityRecommendPage(Map map);
+
+    public Integer queryActivityRecommendPageCount(Map map);
+
+    public void saveActivityRecommendBatch(List<ActivityRecommend> activityRecommendList);
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/activityRecommend/impl/ActivityRecommendServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/activityRecommend/impl/ActivityRecommendServiceImpl.java
new file mode 100644
index 0000000..55b685b
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/activityRecommend/impl/ActivityRecommendServiceImpl.java
@@ -0,0 +1,58 @@
+package cn.pluss.platform.activityRecommend.impl;
+
+import java.util.List;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import cn.pluss.platform.activityRecommend.ActivityRecommendService;
+import cn.pluss.platform.entity.ActivityRecommend;
+import cn.pluss.platform.mapper.ActivityRecommendMapper;
+@Service("activityRecommendService")
+public class ActivityRecommendServiceImpl  implements ActivityRecommendService{
+
+	 private static final Logger logger = LoggerFactory.getLogger( ActivityRecommendServiceImpl.class);
+
+
+    @Autowired
+	  private ActivityRecommendMapper activityRecommendMapper;
+
+    @Override
+    public ActivityRecommend queryActivityRecommend(ActivityRecommend activityRecommend){
+        return activityRecommendMapper.queryActivityRecommend(activityRecommend);
+    }
+
+    @Override
+    public List<ActivityRecommend> queryActivityRecommendList(ActivityRecommend activityRecommend){
+        return activityRecommendMapper.queryActivityRecommendList(activityRecommend);
+    }
+    
+    @Override
+    public void saveActivityRecommend(ActivityRecommend activityRecommend) {
+          activityRecommendMapper.saveActivityRecommend(activityRecommend);
+    }
+    @Override
+    public void updateActivityRecommend(ActivityRecommend activityRecommend){
+        activityRecommendMapper.updateActivityRecommend(activityRecommend);
+    }
+    @Override
+    public void deleteActivityRecommend(ActivityRecommend activityRecommend){
+        activityRecommendMapper.deleteActivityRecommend(activityRecommend);
+    }
+    @Override
+    public List<ActivityRecommend> queryActivityRecommendPage(Map map){
+        return activityRecommendMapper.queryActivityRecommendPage(map);
+    }
+    @Override
+    public Integer queryActivityRecommendPageCount(Map map){
+        return activityRecommendMapper.queryActivityRecommendPageCount(map);
+    }
+    @Override
+    public void saveActivityRecommendBatch(List<ActivityRecommend> activityRecommendList) {
+         activityRecommendMapper.saveActivityRecommendBatch(activityRecommendList);
+    }
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/agent/AgentService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/agent/AgentService.java
new file mode 100644
index 0000000..6dd2453
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/agent/AgentService.java
@@ -0,0 +1,40 @@
+package cn.pluss.platform.agent;
+
+import cn.pluss.platform.entity.MerchantRateNew;
+import cn.pluss.platform.vo.AgentInfo;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+/**
+ * 超级代理商相关处理逻辑
+ * @author DJH
+ */
+public interface AgentService {
+
+    /**
+     * 开通或修改下级代理商
+     * @param agentInfo 代理商信息
+     */
+    void save(AgentInfo agentInfo);
+
+    /**
+     * 获取下级代理商，分页数据
+     * @param page      分页参数
+     * @param agentInfo 查询参数
+     * @param orderItem 排序参数
+     * @return 分页数据
+     */
+    Page<AgentInfo> page(Page<AgentInfo> page, AgentInfo agentInfo, OrderItem orderItem);
+
+    /**
+     * 获取设置下级代理商的最低费率
+     * @return  最低费率
+     */
+    Integer getMinSettingRate();
+
+    /**
+     * 获取设置下级商户的最低费率
+     * @return
+     */
+    MerchantRateNew getMinSettingRateNew();
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/agent/impl/AgentServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/agent/impl/AgentServiceImpl.java
new file mode 100644
index 0000000..491f0cd
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/agent/impl/AgentServiceImpl.java
@@ -0,0 +1,226 @@
+package cn.pluss.platform.agent.impl;
+
+import cn.pluss.platform.agent.AgentService;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.AgentMapper;
+import cn.pluss.platform.mapper.MerchantRateMapper;
+import cn.pluss.platform.user.UserLevelService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.userInfo.UserInfoService;
+import cn.pluss.platform.util.MD5Util;
+import cn.pluss.platform.util.StringUtil;
+import cn.pluss.platform.vo.AgentInfo;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * @author DJH
+ */
+@Service
+@Slf4j
+public class AgentServiceImpl implements AgentService {
+
+    private static final String NOT_ALL_NUM = "^[0-9]*$";
+
+    /**
+     * \u3000是全角空格
+     */
+    private static final String NO_SPECIAL_CHAR = "[ \u3000`~!@#$%^&*()+=|{}':;,\\[\\].<>/?！￥…（）—【】‘；：”“’。，、？]";
+
+    private final Pattern compile = Pattern.compile(NOT_ALL_NUM);
+
+    private final Pattern compile2 = Pattern.compile(NO_SPECIAL_CHAR);
+
+    @Setter(onMethod_ = {@Autowired})
+    private AgentMapper agentMapper;
+    @Setter(onMethod_ = {@Autowired})
+    private UserAppService userAppService;
+    @Setter(onMethod_ = {@Autowired})
+    private UserInfoService userInfoService;
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantRateMapper rateMapper;
+
+    @Autowired
+    private UserLevelService ulService;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(AgentInfo agentInfo) {
+        UserApp userApp = userAppService.queryUserAppByToken();
+        if (!userApp.getUserId().equals(agentInfo.getParentId())) {
+            throw new MsgException("拒绝访问");
+        }
+
+        Matcher matcher = compile.matcher(agentInfo.getLoginName());
+        if (matcher.matches()) {
+            throw new MsgException("账号不能使用纯数字");
+        }
+
+        Matcher matcher2 = compile2.matcher(agentInfo.getLoginName());
+        if (matcher2.find()) {
+            throw new MsgException("账号不能使用包含特殊符号");
+        }
+
+        MsgException.throwException("代理账户和普通账户即将合并，暂无法开通代理商，请使用推广海报拓展团队");
+
+        saveAgentInfo(agentInfo);
+    }
+
+    @Override
+    public Page<AgentInfo> page(Page<AgentInfo> page, AgentInfo agentInfo, OrderItem orderItem) {
+        if (agentInfo.getParentId() == null) {
+            throw new MsgException("缺少parentId");
+        }
+
+        UserApp userApp = userAppService.queryUserAppByToken();
+        if (!userApp.getUserId().equals(agentInfo.getParentId())) {
+            throw new MsgException("拒绝访问");
+        }
+
+        page.getOrders().clear();
+        if (orderItem != null && StringUtils.isNotBlank(orderItem.getColumn())) {
+            page.addOrder(orderItem);
+        }
+
+        if (page.getOrders().isEmpty()) {
+            page.addOrder(OrderItem.desc("createTime"));
+        }
+
+        return agentMapper.selectPage(page, agentInfo);
+    }
+
+    @Override
+    public Integer getMinSettingRate() {
+        UserApp userApp = userAppService.queryUserAppByToken();
+
+        // if (!"agent".equals(userApp.getUserType())) {
+        //     throw new MsgException("拒绝访问");
+        // }
+
+        MerchantRate userRate = new MerchantRate().setUserId(userApp.getUserId() + "");
+        userRate = rateMapper.selectOne(new QueryWrapper<>(userRate));
+
+        int min = 0;
+        // 非固定费率的服务商，下级服务商费率必须大于25
+        if (!"1".equals(userApp.getIsFixedRate())) {
+            min = 25;
+        }
+
+        return Math.max(userRate.getCurrentRate(), min);
+    }
+
+    @Override
+    public MerchantRateNew getMinSettingRateNew() {
+        UserApp userApp = userAppService.queryUserAppByToken();
+
+        UserLevel entity = ulService.getLevelInfoByRoleLevel(userApp.getRoleCode(), userApp.getLevelCode());
+
+        MerchantRateNew rateNew = new MerchantRateNew();
+        rateNew.setWxRate(entity.getRate().intValue() + 1);
+        rateNew.setAliRate(entity.getRate().intValue() + 1);
+        rateNew.setBankRate(entity.getRate().intValue() + 1);
+        rateNew.setBankRateLarge(entity.getRate().intValue() + 1);
+
+        MerchantRateNew.setRateValue(rateNew);
+
+        return rateNew;
+    }
+
+    private void saveAgentInfo(AgentInfo agentInfo) {
+        AgentInfo exist = new AgentInfo().setLoginName(agentInfo.getLoginName());
+        exist = agentMapper.selectOne(exist);
+        MsgException.check(exist != null, "该账号已存在");
+
+        exist = new AgentInfo().setPhone(agentInfo.getPhone());
+        exist = agentMapper.selectOne(exist);
+        MsgException.check(exist != null, "该手机号已存在关联代理商");
+
+        Date date = new Date();
+        UserInfo userInfo = new UserInfo()
+                .setPassword(MD5Util.MD5Encode(agentInfo.getPassword(), "UTF-8"))
+                .setLoginName(agentInfo.getLoginName())
+                .setPhone(agentInfo.getPhone())
+                .setUpdateTime(date)
+                .setCreateTime(date);
+        userInfoService.saveUserInfo(userInfo);
+        MsgException.check(userInfo.getId() == null, "插入数据失败");
+
+        UserApp userApp = userAppService.queryUserAppByToken();
+        if (!(userApp.getStatus() == 3) || !(userApp.getBankStatus() == 3)) {
+            throw new MsgException("当前服务商账号暂未实名，无法添加下级代理");
+        }
+
+        MerchantRate userRate = new MerchantRate().setUserId(userApp.getUserId() + "");
+        userRate = rateMapper.selectOne(new QueryWrapper<>(userRate));
+
+        log.info("自身费率: {}", userRate.getRate());
+        log.info("设置下级费率: {}", agentInfo.getRate().intValue());
+
+        // 非固定费率的服务商，下级服务商费率必须大于25
+        if (!"1".equals(userApp.getIsFixedRate()) && agentInfo.getRate().intValue() <= MerchantRate.MAX_RATE) {
+            throw new MsgException("下级代理商费率必须大于" + MerchantRate.MAX_RATE);
+        }
+
+        if (userRate.getRate() >= agentInfo.getRate().intValue()) {
+            throw new MsgException("下级代理商费率必须大于自身费率");
+        }
+
+        agentInfo.setUserId(userInfo.getId());
+
+        String pIdArr = userApp.getUserId() + "";
+        if (StringUtils.isNotBlank(userApp.getPIdArr())) {
+            pIdArr += "," + userApp.getPIdArr();
+        }
+
+        UserApp subUserApp = new UserApp();
+        subUserApp.setUserType("agent")
+                .setUserId(userInfo.getId())
+                .setLoginName(agentInfo.getPhone())
+                .setInviteNum(getRandomNum())
+                .setParentId(userApp.getUserId())
+                .setLevel(3)
+                // 默认身份认证状态
+                .setStatus(0)
+                .setIsFixedRate("1")
+                .setCreateDt(date)
+                .setPIdArr(pIdArr);
+
+        UserApp.setSort(userApp, subUserApp);
+        UserApp.setRoleInfo(userApp, subUserApp,null);
+
+        userAppService.save(subUserApp);
+
+        MerchantRate merchantRate = new MerchantRate()
+                .setUserId(userInfo.getId() + "")
+                .setRate(agentInfo.getRate().intValue())
+                .setPreviousRate(agentInfo.getRate().intValue())
+                .setUpdateTime(new Date());
+        rateMapper.insert(merchantRate);
+    }
+
+    private String getRandomNum() {
+        String inviteNum;
+        UserApp condition = new UserApp();
+
+        do {
+            inviteNum = StringUtil.genRandomNum(5);
+            condition.setInviteNum(inviteNum);
+            UserApp userApp = userAppService.queryUserApp(condition);
+            if (userApp == null) {
+                return inviteNum;
+            }
+        } while (true);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/agentInfo/AgentInfoService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/agentInfo/AgentInfoService.java
new file mode 100644
index 0000000..2dc618c
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/agentInfo/AgentInfoService.java
@@ -0,0 +1,34 @@
+package cn.pluss.platform.agentInfo;
+
+import cn.pluss.platform.dto.UserInfoDTO;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.vo.AgentInfo;
+import cn.pluss.platform.vo.AgentStaffVO;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 代理商相关查询接口
+ */
+public interface AgentInfoService {
+
+    Page<AgentInfo> pageData(Page<AgentInfo> page, AgentInfo agentInfo);
+
+    Page<AgentInfo> pagePermissionData(Page<AgentInfo> page, AgentInfo agentInfo);
+
+    Page<AgentInfo> pageSubData(Page<AgentInfo> page, AgentInfo agentInfo);
+
+    AgentInfo getOne(AgentInfo agentInfo);
+
+    void saveOrUpdate(AgentInfo agentInfo);
+
+    void delete(AgentInfo agentInfo);
+
+    /**
+     * 业务员列表分页查询
+     */
+    Page<AgentStaffVO> staffPage(Page<AgentStaffVO> page, AgentStaffVO agentStaffVO, OrderItem orderItem);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/agentInfo/impl/AgentInfoServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/agentInfo/impl/AgentInfoServiceImpl.java
new file mode 100644
index 0000000..b4d038d
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/agentInfo/impl/AgentInfoServiceImpl.java
@@ -0,0 +1,257 @@
+package cn.pluss.platform.agentInfo.impl;
+
+import cn.pluss.platform.MerchantRateRecordService;
+import cn.pluss.platform.agentInfo.AgentInfoService;
+import cn.pluss.platform.cash.CashService;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.AgentInfoMapper;
+import cn.pluss.platform.mapper.MerchantRateMapper;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.userInfo.UserInfoService;
+import cn.pluss.platform.util.MD5Util;
+import cn.pluss.platform.util.StringUtil;
+import cn.pluss.platform.vo.AgentInfo;
+import cn.pluss.platform.vo.AgentStaffVO;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * @author SSS
+ */
+@RequiredArgsConstructor
+@Service
+public class AgentInfoServiceImpl implements AgentInfoService {
+
+    @Autowired
+    private UserAppService userAppService;
+    @Resource
+    private AgentInfoMapper agentInfoMapper;
+    @Autowired
+    private UserInfoService userInfoService;
+    @Autowired
+    private MerchantRateMapper merchantRateMapper;
+    @Autowired
+    private CashService cashService;
+    @Autowired
+    private MerchantRateRecordService merchantRateRecordService;
+
+    @Override
+    public Page<AgentInfo> pageData(Page<AgentInfo> page, AgentInfo agentInfo) {
+        page.addOrder(OrderItem.desc("ui.createTime"));
+        JSONObject pageData = (JSONObject) JSON.toJSON(page);
+        List<List<?>> queryData = agentInfoMapper.selectPage(agentInfo, pageData);
+        List<AgentInfo> records = (List<AgentInfo>) queryData.get(0);
+        page.setRecords(records);
+        long total = ((Long) queryData.get(1).get(0));
+        page.setTotal(total);
+        return page;
+    }
+
+    @Override
+    public Page<AgentInfo> pagePermissionData(Page<AgentInfo> page, AgentInfo agentInfo) {
+        page.addOrder(OrderItem.desc("ui.createTime"));
+        JSONObject pageData = (JSONObject) JSON.toJSON(page);
+        List<List<?>> queryData = agentInfoMapper.selectPermissionPage(agentInfo, pageData);
+        List<AgentInfo> records = (List<AgentInfo>) queryData.get(0);
+        page.setRecords(records);
+        long total = ((Long) queryData.get(1).get(0));
+        page.setTotal(total);
+        return page;
+    }
+
+    @Override
+    public Page<AgentInfo> pageSubData(Page<AgentInfo> page, AgentInfo agentInfo) {
+        page.addOrder(OrderItem.desc("ui.createTime"));
+        JSONObject pageData = (JSONObject) JSON.toJSON(page);
+        List<List<?>> queryData = agentInfoMapper.selectSubAgentPage(agentInfo, pageData);
+        List<AgentInfo> records = (List<AgentInfo>) queryData.get(0);
+        page.setRecords(records);
+        long total = ((Long) queryData.get(1).get(0));
+        page.setTotal(total);
+
+        return page;
+    }
+
+    @Override
+    public AgentInfo getOne(AgentInfo agentInfo) {
+        return agentInfoMapper.selectOne(agentInfo);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void saveOrUpdate(AgentInfo agentInfo) {
+        if (StringUtils.isEmpty(agentInfo.getLoginName())) {
+            throw new MsgException("请输入登录账号");
+        }
+
+        if (StringUtils.isEmpty(agentInfo.getPhone())) {
+            throw new MsgException("请输入关联手机号");
+        }
+
+        if (agentInfo.getUserId() == null) {
+            saveAgentInfo(agentInfo);
+        } else {
+            updateAgentInfo(agentInfo);
+        }
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void delete(AgentInfo agentInfo) {
+        userInfoService.removeById(agentInfo.getUserId());
+        QueryWrapper<UserApp> queryWrapperUserApp = new QueryWrapper<UserApp>().eq("userId", agentInfo.getUserId());
+        userAppService.remove(queryWrapperUserApp);
+        QueryWrapper<MerchantRate> queryWrapperMerchantRate = new QueryWrapper<MerchantRate>().eq("userId", agentInfo.getUserId());
+        merchantRateMapper.delete(queryWrapperMerchantRate);
+        Cash cash = new Cash();
+        cash.setUserId(agentInfo.getUserId());
+        cashService.deleteUserIdCash(cash);
+    }
+
+    @Override
+    public Page<AgentStaffVO> staffPage(Page<AgentStaffVO> page, AgentStaffVO agentStaffVO, OrderItem orderItem) {
+        page.getOrders().clear();
+        page.addOrder(orderItem);
+        page = agentInfoMapper.selectStaffPage(page, agentStaffVO);
+        return page;
+    }
+
+    /**
+     * 查询出相关信息并更新
+     *
+     * @param agentInfo 超级代理商信息
+     */
+    private void updateAgentInfo(AgentInfo agentInfo) {
+        UserInfo userInfo = userInfoService.getById(agentInfo.getUserId());
+        userInfo.setUpdateTime(new Date());
+        userInfo.setLoginName(agentInfo.getLoginName());
+        userInfo.setPhone(agentInfo.getPhone());
+
+        QueryWrapper<UserApp> queryWrapperUserApp = new QueryWrapper<UserApp>()
+                .eq("userId", agentInfo.getUserId());
+        UserApp userApp = userAppService.getOne(queryWrapperUserApp);
+        userApp.setLevel(3)
+                .setIsFixedRate(agentInfo.getIsFixedRate())
+                .setLoginName(agentInfo.getLoginName());
+
+        userInfoService.updateUserInfo(userInfo);
+        userAppService.updateById(userApp);
+
+        // Cash cash = new Cash();
+        // cash.setUserId(agentInfo.getUserId());
+        // cash.setUpdateDt(new Date());
+        // cash.setUserName(agentInfo.getUserName());
+        // cash.setCashAmt(agentInfo.getCashAmt());
+        // cashService.updateUserIdCash(cash);
+
+        MerchantRate merchantRate = new MerchantRate().setUserId(agentInfo.getUserId() + "");
+        merchantRate = merchantRateMapper.selectOne(new QueryWrapper<>(merchantRate));
+        // 补充数据
+        if (merchantRate == null) {
+            merchantRate = new MerchantRate()
+                    .setUserId(userInfo.getId() + "")
+                    .setRate(agentInfo.getRate().intValue())
+                    .setPreviousRate(agentInfo.getRate().intValue())
+                    .setUpdateTime(new Date());
+            merchantRateMapper.insert(merchantRate);
+        } else {
+            merchantRate.setRate(agentInfo.getRate().intValue()).setUpdateTime(new Date()).setPreviousRate(agentInfo.getRate().intValue());
+            merchantRateMapper.updateById(merchantRate);
+            // 保存修改费率记录
+            MerchantRateRecord merchantRateRecord = new MerchantRateRecord();
+            merchantRateRecord.setCreateTime(new Date());
+            merchantRateRecord.setRate(merchantRate.getRate());
+            merchantRateRecord.setUserId(merchantRate.getUserId());
+            merchantRateRecordService.save(merchantRateRecord);
+        }
+    }
+
+
+    private void saveAgentInfo(AgentInfo agentInfo) {
+        Date date = new Date();
+        UserInfo userInfo = new UserInfo()
+                .setPassword(MD5Util.MD5Encode("123456", "UTF-8"))
+                .setLoginName(agentInfo.getLoginName()).setPhone(agentInfo.getPhone())
+                .setUpdateTime(date)
+                .setCreateTime(date);
+
+        AgentInfo exist = new AgentInfo().setLoginName(agentInfo.getLoginName());
+        exist = agentInfoMapper.selectOne(exist);
+        if (exist != null) {
+            throw new MsgException("该账号已存在");
+        }
+
+        exist = new AgentInfo().setPhone(agentInfo.getPhone());
+        exist = agentInfoMapper.selectOne(exist);
+        if (exist != null) {
+            throw new MsgException("该手机号已存在关联代理商");
+        }
+
+        userInfoService.saveUserInfo(userInfo);
+
+        if (userInfo.getId() == null) {
+            throw new MsgException("插入数据失败！");
+        }
+
+        agentInfo.setUserId(userInfo.getId());
+
+        UserApp userApp = new UserApp();
+        userApp.setUserType("agent")
+                .setUserId(userInfo.getId())
+                .setLoginName(agentInfo.getPhone())
+                .setInviteNum(getRandomNum())
+                .setLevel(3)
+                .setSort(1)
+                .setIsFixedRate(agentInfo.getIsFixedRate())
+                // 默认身份认证状态
+                .setStatus(0)
+                .setCreateDt(date);
+        userAppService.save(userApp);
+
+        if (agentInfo.getCashAmt() != null && !Objects.equals(agentInfo.getCashAmt(), BigDecimal.ZERO)) {
+            Cash cash = new Cash();
+            cash.setUserId(userInfo.getId());
+            cash.setCreateDt(new Date());
+            cash.setUpdateDt(new Date());
+            cash.setUserName(agentInfo.getUserName());
+            cash.setCashAmt(agentInfo.getCashAmt());
+            cashService.save(cash);
+        }
+
+        MerchantRate merchantRate = new MerchantRate()
+                .setUserId(userInfo.getId() + "")
+                .setRate(agentInfo.getRate().intValue())
+                .setPreviousRate(agentInfo.getRate().intValue())
+                .setUpdateTime(new Date());
+        merchantRateMapper.insert(merchantRate);
+    }
+
+    private String getRandomNum() {
+        String inviteNum;
+        UserApp condition = new UserApp();
+
+        do {
+            inviteNum = StringUtil.genRandomNum(5);
+            condition.setInviteNum(inviteNum);
+            UserApp userApp = userAppService.queryUserApp(condition);
+            if (userApp == null) {
+                return inviteNum;
+            }
+        } while (true);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/agreement/AgreementService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/agreement/AgreementService.java
new file mode 100644
index 0000000..4f22045
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/agreement/AgreementService.java
@@ -0,0 +1,25 @@
+package cn.pluss.platform.agreement;
+
+import java.util.List;
+import java.util.Map;
+import cn.pluss.platform.entity.Agreement;
+
+public interface AgreementService {
+
+    public Agreement queryAgreement(Agreement agreement);
+
+    public List<Agreement> queryAgreementList(Agreement agreement);
+
+    public void saveAgreement(Agreement agreement);
+
+    public void updateAgreement(Agreement agreement);
+
+    public void deleteAgreement(Agreement agreement);
+
+    public List<Agreement> queryAgreementPage(Map map);
+
+    public Integer queryAgreementPageCount(Map map);
+
+    public void saveAgreementBatch(List<Agreement> agreementList);
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/agreement/impl/AgreementServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/agreement/impl/AgreementServiceImpl.java
new file mode 100644
index 0000000..2973a4f
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/agreement/impl/AgreementServiceImpl.java
@@ -0,0 +1,58 @@
+package cn.pluss.platform.agreement.impl;
+
+import java.util.List;
+import java.util.Map;
+import org.springframework.transaction.annotation.Transactional;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import cn.pluss.platform.entity.Agreement;
+import cn.pluss.platform.agreement.AgreementService;
+import cn.pluss.platform.mapper.AgreementMapper;
+
+@Transactional
+@Service("agreementService")
+public class AgreementServiceImpl  implements AgreementService{
+
+	 private static final Logger logger = LoggerFactory.getLogger( AgreementServiceImpl.class);
+
+
+    @Autowired
+	  private AgreementMapper agreementMapper;
+
+    @Override
+    public Agreement queryAgreement(Agreement agreement){
+        return agreementMapper.queryAgreement(agreement);
+    }
+
+    @Override
+    public List<Agreement> queryAgreementList(Agreement agreement){
+        return agreementMapper.queryAgreementList(agreement);
+    }
+    @Override
+    public void saveAgreement(Agreement agreement){
+          agreementMapper.saveAgreement(agreement);
+    }
+    @Override
+    public void updateAgreement(Agreement agreement){
+        agreementMapper.updateAgreement(agreement);
+    }
+    @Override
+    public void deleteAgreement(Agreement agreement){
+        agreementMapper.deleteAgreement(agreement);
+    }
+    @Override
+    public List<Agreement> queryAgreementPage(Map map){
+        return agreementMapper.queryAgreementPage(map);
+    }
+    @Override
+    public Integer queryAgreementPageCount(Map map){
+        return agreementMapper.queryAgreementPageCount(map);
+    }
+    @Override
+    public void saveAgreementBatch(List<Agreement> agreementList) {
+         agreementMapper.saveAgreementBatch(agreementList);
+    }
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ali/AliPayNotifyService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ali/AliPayNotifyService.java
new file mode 100644
index 0000000..0bebb0e
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ali/AliPayNotifyService.java
@@ -0,0 +1,28 @@
+package cn.pluss.platform.ali;
+
+import java.util.Map;
+
+/**
+ * 阿里原生支付的一些回调逻辑
+ * @author DJH
+ */
+public interface AliPayNotifyService {
+
+    /**
+     * 通用回调处理方法
+     * @param param 回调参数
+     */
+    void commonPayNotify(Map<String, Object> param);
+
+    /**
+     * 设备购买回调处理方法
+     * @param param 回调参数
+     */
+    void devicePayNotify(Map<String, Object> param);
+
+    /**
+     * 推广升级回调处理方法
+     * @param param 回调参数
+     */
+    void spreadUpgradePayNotify(Map<String, Object> param);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ali/AliService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ali/AliService.java
new file mode 100644
index 0000000..1226824
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ali/AliService.java
@@ -0,0 +1,102 @@
+package cn.pluss.platform.ali;
+
+import java.util.Map;
+
+import cn.pluss.platform.entity.MercOrderDetail;
+import com.alipay.api.AlipayApiException;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.dto.BatchInfoDTO;
+import cn.pluss.platform.entity.DeviceMerchantBuy;
+import cn.pluss.platform.dto.DeviceMerchantBuyDTO;
+import cn.pluss.platform.entity.MerchantBaseInfo;
+
+/**
+ * @author yuchen
+ *
+ * @Description 
+ * 支付宝进件service
+ */
+public interface AliService {
+	
+	/**
+	 * 
+	 * getBatchNo:(开启事务). <br/> 
+	 *
+	 * @author Administrator 
+	 * @param dto
+	 * @return
+	 * @throws AlipayApiException 
+	 * @since JDK 1.8
+	 */
+	Result<String> getBatchNo(MerchantBaseInfo merchantBaseInfo);
+	
+	/**
+	 * 
+	 * facetofaceSign:(是否当面付产品提交信息成功). <br/> 
+	 *
+	 * @author Administrator 
+	 * @param dto
+	 * @return 
+	 * @since JDK 1.8
+	 */
+	Boolean facetofaceSign(BatchInfoDTO dto);
+	
+	/**
+	 * 
+	 * agentConfirm:(提交事务). <br/> 
+	 *
+	 * @author Administrator 
+	 * @param batchNo
+	 * @return
+	 * @throws AlipayApiException 
+	 * @since JDK 1.8
+	 */
+	Boolean agentConfirm(String batchNo);
+	
+	/**
+	 * 
+	 * AppPayParam:(app支付统一下单). <br/> 
+	 *
+	 * @author Administrator 
+	 * @return 
+	 * @since JDK 1.8
+	 */
+	Result<Map<String, Object>> appPayParam(Map<String, String> map, DeviceMerchantBuyDTO deviceMerchantBuyDTO);
+
+	/**
+	 *
+	 * AppPayParam:(app支付统一下单). <br/>
+	 *
+	 * @author Administrator
+	 * @return
+	 * @since JDK 1.8
+	 */
+	Result<Map<String, Object>> appPayParamV2(Map<String, String> map, DeviceMerchantBuyDTO deviceMerchantBuyDTO);
+
+	/**
+	 * app统一支付下单，非商城
+	 * @param map
+	 * @return
+	 */
+	Map<String, Object> appPayParam(Map<String, String> map);
+
+	/**
+	 * 
+	 * AppRefund:(app支付退款). <br/> 
+	 *
+	 * @author Administrator 
+	 * @param deviceMerchantBuy
+	 * @return 
+	 * @since JDK 1.8
+	 */
+	Result<Map<String, Object>> appRefund(DeviceMerchantBuy deviceMerchantBuy);
+
+	/**
+	 * 退款V2
+	 * @param orderDetail
+	 * @return
+	 */
+	Map<String, Object> refundV2(MercOrderDetail orderDetail);
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ali/AlipayService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ali/AlipayService.java
new file mode 100644
index 0000000..5109ca8
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ali/AlipayService.java
@@ -0,0 +1,6 @@
+package cn.pluss.platform.ali;
+
+public interface AlipayService {
+
+    void remit(String account, String realName, String money);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ali/device/AliDeviceService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ali/device/AliDeviceService.java
new file mode 100644
index 0000000..e5ad6b5
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ali/device/AliDeviceService.java
@@ -0,0 +1,55 @@
+package cn.pluss.platform.ali.device;
+
+import cn.pluss.platform.alidevice.AliScanCodeDevicePayEntity;
+import cn.pluss.platform.alidevice.AliScanCodeDeviceStatus;
+import cn.pluss.platform.alidevice.RespDeviceEntity;
+import cn.pluss.platform.api.Result;
+
+/**
+ * 阿里云设备接口服务类
+ * @author: Administrator
+ * @DATE: 2021/12/22 11:31
+ */
+public interface AliDeviceService {
+
+    /**
+     * 获取设备状态V1
+     * @date: 2021/12/22 11:43
+     * @return cn.pluss.platform.api.Result<java.lang.Object>
+     */
+    RespDeviceEntity getDeviceStatusV1(String deivceNo);
+
+    /**
+     * 获取设备状态V2
+     * @date: 2021/12/22 11:44
+     * @param deivceNo:
+     * @return cn.pluss.platform.api.Result<java.lang.Object>
+     */
+    RespDeviceEntity getDeviceStatusV2(String deivceNo);
+
+    /**
+     * 绑定设备
+     * @date: 2021/12/22 14:06
+     * @param deivceNo:厂商设备号
+     * @param userId :用户ID
+     * @return
+     */
+    Result<Object> bindDevice(String deivceNo, String userId);
+
+    /**
+     * 设备支付
+     * @date: 2021/12/22 14:42
+     * @param entity:
+     * @param payCode:
+     * @return RespDeviceEntity
+     */
+    RespDeviceEntity orderPay(AliScanCodeDevicePayEntity entity, String payCode);
+
+    /**
+     * 订单查询
+     * @date: 2021/12/22 18:35
+     * @param orderNumber:
+     * @return RespDeviceEntity
+     */
+    RespDeviceEntity orderQuery(String orderNumber);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ali/device/impl/AliScanCodeDeviceServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ali/device/impl/AliScanCodeDeviceServiceImpl.java
new file mode 100644
index 0000000..2ccc1ca
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ali/device/impl/AliScanCodeDeviceServiceImpl.java
@@ -0,0 +1,216 @@
+package cn.pluss.platform.ali.device.impl;
+
+import cn.pluss.platform.ali.device.AliDeviceService;
+import cn.pluss.platform.alidevice.AliScanCodeDevicePayEntity;
+import cn.pluss.platform.alidevice.AliScanCodeDevicePayEnum;
+import cn.pluss.platform.alidevice.AliScanCodeDeviceStatus;
+import cn.pluss.platform.alidevice.RespDeviceEntity;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultCode;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.deviceStock.DeviceStockService;
+import cn.pluss.platform.dto.MerChantOrderDTO;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mercOrderToken.MercOrderTokenService;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.merchantOrder.MerchantOrderService;
+import cn.pluss.platform.pay.PayService;
+import cn.pluss.platform.ryx.pay.RyxPayService;
+import cn.pluss.platform.sxf.pay.SxfPayService;
+import cn.pluss.platform.util.ParametersUtil;
+import cn.pluss.platform.util.StringUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ *
+ *阿里云扫码王服务实现类
+ *@author: bzg
+ *@time: 2021/12/22 11:34
+ */
+@Service("aliScanCodeDeviceService")
+@Slf4j
+public class AliScanCodeDeviceServiceImpl implements AliDeviceService {
+
+    @Resource
+    private DeviceStockService deviceStockService;
+    @Resource
+    private MerchantBaseInfoService baseInfoService;
+    @Resource
+    private MerchantOrderService merchantOrderService;
+    @Resource
+    private MercOrderTokenService mercOrderTokenService;
+
+    @Setter(onMethod_ = {@Autowired, @Qualifier("ysPayOldService")})
+    private PayService ysPayOldService;
+
+    @Resource
+    private RyxPayService ryxPayService;
+
+    @Resource
+    private SxfPayService sxfPayService;
+
+    @Resource
+    private MerchantChannelStatusService channelService;
+
+    @Override
+    public RespDeviceEntity getDeviceStatusV1(String deviceNo) {
+        if(StringUtil.isEmpty(deviceNo)){
+            return RespDeviceEntity.fail("无效的设备号!");
+        }
+        DeviceStock deviceStock = deviceStockService.getDevicebyNo(deviceNo);
+        return AliScanCodeDeviceStatus.getAliDeviceStatusV1(deviceStock);
+    }
+
+    @Override
+    public RespDeviceEntity getDeviceStatusV2(String deviceNo) {
+        if(StringUtil.isEmpty(deviceNo)){
+            return RespDeviceEntity.fail("无效的设备号!");
+        }
+        DeviceStock deviceStock = deviceStockService.getDevicebyNo(deviceNo);
+        return AliScanCodeDeviceStatus.getAliDeviceStatusV2(deviceStock);
+    }
+
+    @Override
+    public Result<Object> bindDevice(String deivceNo, String userId) {
+        DeviceStock deviceStock = deviceStockService.getDevicebyNo(deivceNo);
+        MsgException.checkNull(deviceStock,"无效的设备号");
+        MsgException.check("3".equals(deviceStock.getStatus()),"当前设备已被其他商户绑定");
+        MerchantBaseInfo baseInfo = baseInfoService.getMerchantBaseInfoByUserId(userId);
+        MsgException.checkNull(baseInfo,"无效用户");
+        deviceStock.setActMercId(baseInfo.getId().toString());
+        deviceStock.setActMercName(baseInfo.getAlias());
+        deviceStockService.updateById(deviceStock);
+        return ResultGenerator.genSuccessResult("绑定成功",null);
+    }
+
+
+    @Override
+    public RespDeviceEntity orderPay(AliScanCodeDevicePayEntity entity, String payCode) {
+        log.info("【阿里云扫码王】主扫请求参数：{}", JSON.toJSONString(entity));
+        if(StringUtil.isEmpty(entity.getCode()) && StringUtil.isEmpty(entity.getSn())){
+            return RespDeviceEntity.fail("缺失设备SN号");
+        }
+        String deviceNo = StringUtil.isEmpty(entity.getCode()) ? entity.getSn() : entity.getCode();
+        entity.setCode(deviceNo);
+        entity.setSn(deviceNo);
+        if(StringUtil.isEmpty(entity.getFee())){
+            return RespDeviceEntity.fail("缺少支付金额");
+        }
+        if (!StringUtil.isNumber(entity.getFee().toString())) {
+            return RespDeviceEntity.fail("金额格式不正确,保留两位小数，单位(元)!");
+        }
+        RespDeviceEntity rde = this.getDeviceStatusV2(entity.getCode());
+        if(rde.getCode() != 0 || rde.getData() == null){
+            return rde;
+        }
+        AliScanCodeDeviceStatus deviceStatus = (AliScanCodeDeviceStatus)rde.getData();
+        if(StringUtil.isEmpty(deviceStatus.getMercId())){
+            return RespDeviceEntity.fail("该设备还未激活，请激活后再使用");
+        }
+        MerchantBaseInfo baseInfo = baseInfoService.getById(deviceStatus.getMercId());
+        if(baseInfo == null){
+            return RespDeviceEntity.fail("商户异常，暂时无法交易！");
+        }
+        try {
+            if(AliScanCodeDevicePayEnum.BARCODE.getCode().equals(payCode)){
+                if(StringUtil.isEmpty(entity.getAuth())){
+                    return RespDeviceEntity.fail("未获取到付款码信息");
+                }
+                MerChantOrderDTO dto = new MerChantOrderDTO();
+                dto.setType("0");
+                dto.setMerchantCode(baseInfo.getMerchantCode());
+                dto.setMerchantName(baseInfo.getAlias());
+                dto.setConsumeFee(entity.getFee());
+                dto.setAuthCode(entity.getAuth());
+                dto.setMerchantBaseInfo(baseInfo);
+                dto.setDeviceNo(entity.getCode());
+                dto.setRemark(entity.getRemark());
+                try {
+                    Result<Object> mapResult = merchantOrderService.toActivePay(dto);
+                    Object data = mapResult.getData();
+                    if (ResultCode.TRANSUNKNOW.code() == mapResult.getCode()) {
+                        return RespDeviceEntity.await(mapResult.getMessage(),((Map)data).get("orderNumber"));
+                    }else if (ResultCode.SUCCESS.code() == mapResult.getCode()) {
+                        return RespDeviceEntity.success(mapResult.getMessage(),((Map)data).get("orderNumber"));
+                    }else{
+                        return RespDeviceEntity.fail(mapResult.getMessage());
+                    }
+                }catch (Exception e){
+                    return RespDeviceEntity.fail(e.getMessage());
+                }
+            }else if(AliScanCodeDevicePayEnum.QRCODE.getCode().equals(payCode)){
+                String orderNumber = "AS_"+StringUtil.getBillno();
+                MercOrderToken token = new MercOrderToken(baseInfo,entity.getFee(),entity.getCode(),orderNumber);
+                mercOrderTokenService.save(token);
+                String payUrl = ParametersUtil.domain + "/wap/merchant/scanPayAuth?tk="+token.getToken();
+                Map<String, Object> result = new HashMap<>(2);
+                result.put("trace",orderNumber);
+                result.put("qr_code",payUrl);
+                return RespDeviceEntity.success("获取成功",result);
+            }else{
+                return RespDeviceEntity.fail("未知操作");
+            }
+        }catch (MsgException e){
+            e.printStackTrace();
+            return RespDeviceEntity.fail(e.getMessage());
+        }
+    }
+
+    @Override
+    public RespDeviceEntity orderQuery(String orderNumber) {
+        if(StringUtil.isEmpty(orderNumber)){
+            return RespDeviceEntity.fail("缺少订单号");
+        }
+        QueryWrapper<MerchantOrder> queryWrapper = new QueryWrapper<MerchantOrder>().eq("orderNumber",orderNumber);
+        MerchantOrder order = merchantOrderService.getOne(queryWrapper);
+        if(order == null){
+            return RespDeviceEntity.await("等待支付中...",orderNumber);
+        }
+        Map<String,Object> result = new HashMap<>(2);
+        if("1".equals(order.getStatus())){
+            result.put("amount",order.getConsumeFee().toString());
+            return RespDeviceEntity.success("支付成功",result);
+        }else if("5".equals(order.getStatus()) || "7".equals(order.getStatus())){
+            try {
+                Integer chnnelId = "2".equals(order.getAisleSwitch()) ? 1 : Integer.valueOf(order.getAisleSwitch());
+                MerchantChannelStatus channel = channelService.getByMerchantCode(order.getMerchantCode(), chnnelId);
+                JSONObject res = null;
+                switch (channel.getChannel()){
+                    case 1:
+                        res = sxfPayService.tradeQuery(order,channel.getMerchantId());
+                        break;
+                    case 3:
+                        res = ryxPayService.tradeQuery(order,channel.getMerchantId());
+                        break;
+                    case 4:
+                        res = ysPayOldService.tradeQuery(order,channel.getMerchantId());
+                        break;
+                }
+                if(res != null){
+                    String payStatus = res.getString("payStatus");
+                    if("0".equals(payStatus)){
+                        return RespDeviceEntity.fail("支付失败",order.getOrderNumber());
+                    }
+                }
+                return RespDeviceEntity.await("支付状态未知",order.getOrderNumber());
+            }catch (Exception e){
+                return RespDeviceEntity.await("支付状态未知",order.getOrderNumber());
+            }
+        }else{
+            return RespDeviceEntity.fail("支付失败",order.getOrderNumber());
+        }
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ali/impl/AliPayNotifyServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ali/impl/AliPayNotifyServiceImpl.java
new file mode 100644
index 0000000..31210b8
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ali/impl/AliPayNotifyServiceImpl.java
@@ -0,0 +1,240 @@
+package cn.pluss.platform.ali.impl;
+
+import cn.pluss.platform.ali.AliPayNotifyService;
+import cn.pluss.platform.device.MercOrderNewService;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.merchantIncome.MerchantIncomeService;
+import cn.pluss.platform.merchantOrder.MerchantOrderService;
+import cn.pluss.platform.merchantProfit.MerchantProfitService;
+import cn.pluss.platform.notice.NoticeService;
+import cn.pluss.platform.pay.PayCallbackService;
+import cn.pluss.platform.pay.impl.BaseCallbackService;
+import cn.pluss.platform.systemConfig.SystemConfigService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.userInfo.UserInfoService;
+import cn.pluss.platform.util.DateUtils;
+import cn.pluss.platform.user.impl.GeneralPushUtil;
+import cn.pluss.platform.util.ParametersUtil;
+import cn.pluss.platform.util.StringUtil;
+import com.alipay.api.AlipayApiException;
+import com.alipay.api.internal.util.AlipaySignature;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author DJH
+ */
+@Slf4j
+@Service
+public class AliPayNotifyServiceImpl extends BaseCallbackService implements AliPayNotifyService, PayCallbackService {
+
+    @Autowired
+    private GeneralPushUtil generalPushUtil;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantOrderService merchantOrderService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantIncomeService merchantIncomeService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private UserAppService userAppService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private UserInfoService userInfoService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantProfitService merchantProfitService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private SystemConfigService systemConfigService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private NoticeService noticeService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MercOrderNewService mercOrderNewService;
+
+    @Override
+    public void commonPayNotify(Map<String, Object> param) {
+        // 商家订单号
+        String orderNumber = (String) param.get("out_trade_no");
+
+        if (orderNumber != null && orderNumber.startsWith(MerchantOrder.UPGRADE_ORDER_PREFIX)) {
+            spreadUpgradePayNotify(param);
+            return;
+        }
+
+        devicePayNotify(param);
+    }
+
+    private void checkSign(Map<String, String> params) throws AlipayApiException {
+        boolean signVerified = AlipaySignature.rsaCheckV1(params, ParametersUtil.ZY_PUB, "UTF-8", "RSA2");
+        if (!signVerified) {
+            throw new MsgException("支付宝回调验签失败");
+        }
+    }
+
+    @Override
+    public void devicePayNotify(Map<String, Object> param) {
+        String tradeNumber = (String) param.get("trade_no");
+        // 商家订单号
+        String orderNumber = (String) param.get("out_trade_no");
+        // 交易付款时间
+        String consumeTime = (String) param.get("gmt_payment");
+        Date transDt = DateUtils.parse(consumeTime, "yyyy-MM-dd HH:mm:ss");
+
+        devicePaySuccessNotify(orderNumber, tradeNumber, tradeNumber, transDt, param);
+        mercOrderNewService.devicePaySuccessNotifyV2(orderNumber, tradeNumber,tradeNumber, transDt, null);
+    }
+
+    @Override
+    public void spreadUpgradePayNotify(Map<String, Object> param) {
+        String orderNumber = (String) param.get("out_trade_no");// 微信交易流水号
+        String tradeNo = (String) param.get("trade_no");
+
+        String consumeTime = (String) param.get("gmt_payment");
+        Date transDt = DateUtils.parse(consumeTime, "yyyy-MM-dd HH:mm:ss");
+
+        upgradeSuccessNotify(orderNumber, tradeNo, tradeNo, transDt, param);
+
+        // 计算分润 profitAmt
+        try {
+            merchantIncome(param);
+        }catch (Exception e){
+            log.error("升级回调更新分润异常，订单号:{},异常信息:{}",param.get("out_trade_no"),e.getMessage());
+            e.printStackTrace();
+        }
+        // 更新订单信息
+        updateOrderStatus(param);
+
+    }
+
+    /**
+     * 更新订单信息和状态
+     *
+     * @param param 订单回调信息
+     */
+    private void updateOrderStatus(Map<String, Object> param) {
+        // 商户订单号
+        String orderNumber = (String) param.get("out_trade_no");
+        // 支付宝交易号
+        String tradeNo = (String) param.get("trade_no");
+        MerchantOrder mOrder = new MerchantOrder().setOrderNumber(orderNumber);
+        mOrder = merchantOrderService.getOne(new QueryWrapper<>(mOrder));
+
+        mOrder.setThirdTransNo(tradeNo);
+        // 交易付款时间
+        String consumeTime = (String) param.get("gmt_payment");
+        mOrder.setStatus("1");
+        mOrder.setTransDt(DateUtils.parse(consumeTime, "yyyy-MM-dd HH:mm:ss"));
+        mOrder.setTransNo(tradeNo);
+        String profitAmt = (String) param.get("profitAmt");
+        if(StringUtil.isNotEmpty(profitAmt)){
+            mOrder.setProfitShareMoney(Double.valueOf(profitAmt));
+        }
+        merchantOrderService.updateById(mOrder);
+    }
+
+    private void merchantIncome(Map<String, Object> param) {
+        String ordersSn = (String) param.get("out_trade_no");
+        MerchantIncome merchantIncome = new MerchantIncome();
+        merchantIncome.setDealCode(ordersSn);
+        merchantIncome = merchantIncomeService.queryMerchantIncome(merchantIncome);
+        merchantIncome.setDealStatus(1);
+        merchantIncomeService.updateMerchantIncome(merchantIncome);
+
+        UserApp userApp = new UserApp();
+        userApp.setUserId(merchantIncome.getUserId().longValue());
+        userApp = userAppService.queryUserApp(userApp);
+
+        String content = "";
+
+        if (userApp == null || userApp.getParentId() == null) {
+            return;
+        }
+
+
+        UserApp userApp2 = new UserApp();
+        userApp2.setUserId(userApp.getParentId());
+        userApp2 = userAppService.queryUserApp(userApp2);
+
+        String userName = "";
+
+        UserInfo userInfo = new UserInfo();
+        userInfo.setId(userApp.getUserId());
+        userInfo = userInfoService.queryUserInfo(userInfo);
+        String twoConfigValue = systemConfigService.querySystemConfigValue("twoUpVipAmount");
+        String threeConfigValue = systemConfigService.querySystemConfigValue("threeUpVipAmount");
+        userName = userInfo.getLoginName().substring(0, 11);
+
+        userName = StringUtil.isHideMobile(userName);
+
+        MerchantProfit profit = new MerchantProfit();
+        profit.setUserId(userApp.getParentId());
+        profit.setMerchantCode("M800202008254990744");
+        profit.setMerchantName("安象科技公司");
+        profit.setConsumeFee(merchantIncome.getDealFee());
+        Double twoVipAmountD = 999.00;
+        Double twoVipShapeAmtD = 500.00;
+        Double threeVipAmountD = 9999.00;
+        Double threeVipShapeAmtD = 5000.00;
+        if (StringUtil.isNotEmpty(twoConfigValue)) {
+            String twoVipAmount = twoConfigValue.split("-")[0];
+            String twoVipShapeAmount = twoConfigValue.split("-")[1];
+            twoVipAmountD = Double.valueOf(twoVipAmount);
+            twoVipShapeAmtD = Double.valueOf(twoVipShapeAmount);
+        }
+        if (StringUtil.isNotEmpty(threeConfigValue)) {
+            String threeVipAmount = threeConfigValue.split("-")[0];
+            String threeVipShapeAmount = threeConfigValue.split("-")[1];
+            threeVipAmountD = Double.valueOf(threeVipAmount);
+            threeVipShapeAmtD = Double.valueOf(threeVipShapeAmount);
+        }
+        if (twoVipAmountD.equals(merchantIncome.getDealFee())) {
+            profit.setPrice(twoVipShapeAmtD);
+            userApp.setLevel(2);
+            content = "您的直接推荐 " + userName + "付费升级v2,收益" + twoVipShapeAmtD + "元";
+        }
+        if (threeVipAmountD.equals(merchantIncome.getDealFee())) {
+            profit.setPrice(threeVipShapeAmtD);
+            userApp.setLevel(3);
+            content = "您的直接推荐 " + userName + "付费升级v3,收益" + threeVipShapeAmtD + "元";
+        }
+
+        profit.setType("4");
+        profit.setCreateDt(new Date());
+        profit.setOrderDt(merchantIncome.getCreateTime());
+        profit.setStatus("1");
+        profit.setOrderNumber(ordersSn);
+        merchantProfitService.saveMerchantProfit(profit);
+        userAppService.updateById(userApp);
+        param.put("profitAmt",profit.getPrice().toString());
+
+        List<String> alias = new ArrayList<>();
+        log.info("=========推送人userId======" + profit.getUserId() + "=========金额=======" + profit.getPrice());
+        alias.add(profit.getUserId() + "");
+
+        if (userApp2 != null) {
+            Notice notice = new Notice(0, 7, userApp2);
+            notice.setConrtent(content);
+
+            noticeService.saveNotice(notice);
+            generalPushUtil.sendAllPlatByAlias(alias, "升级分润通知", content, "0");
+        }
+    }
+
+    @Override
+    public void orderCallback(Map<String, Object> callbackData) {
+
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ali/impl/AliServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ali/impl/AliServiceImpl.java
new file mode 100644
index 0000000..21001c6
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ali/impl/AliServiceImpl.java
@@ -0,0 +1,323 @@
+package cn.pluss.platform.ali.impl;
+
+import cn.pluss.platform.ali.AliService;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultCode;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.device.DeviceOrderInfoService;
+import cn.pluss.platform.deviceMerchantBuy.DeviceMerchantBuyService;
+import cn.pluss.platform.deviceMerchantBuyDetail.DeviceMerchantBuyDetailService;
+import cn.pluss.platform.dto.BatchInfoDTO;
+import cn.pluss.platform.dto.DeviceMerchantBuyDTO;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.MerchantBaseInfoMapper;
+import cn.pluss.platform.mapper.SystemConfigMapper;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.util.AliPayParam;
+import cn.pluss.platform.util.ParametersUtil;
+import cn.pluss.platform.util.StringUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.alipay.api.AlipayApiException;
+import com.alipay.api.AlipayClient;
+import com.alipay.api.DefaultAlipayClient;
+import com.alipay.api.FileItem;
+import com.alipay.api.domain.AlipayTradeAppPayModel;
+import com.alipay.api.request.*;
+import com.alipay.api.response.*;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author yuchen
+ * 
+ * @Description
+ */
+@Transactional
+@Slf4j
+@RequiredArgsConstructor
+@Service("aliService")
+public class AliServiceImpl implements AliService {
+
+    public static AlipayClient alipayClients = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do",
+            AliPayParam.getAppId(), AliPayParam.getPri(), "json", "GBK", AliPayParam.getPub(), "RSA2");
+
+    private final SystemConfigMapper systemConfigMapper;
+
+    private final UserAppService userAppService;
+
+    private final MerchantBaseInfoMapper merchantBaseInfoMapper;
+
+    private final DeviceMerchantBuyService deviceMerchantBuyService;
+
+    private final DeviceMerchantBuyDetailService deviceMerchantBuyDetailService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private DeviceOrderInfoService deviceOrderInfoService;
+
+    @Setter
+    @Lazy
+    private HttpServletRequest request;
+
+    @Override
+    public Result<String> getBatchNo(MerchantBaseInfo merchantBaseInfo) {
+        AlipayClient alipayClient = alipayClients;
+        AlipayOpenAgentCreateRequest request = new AlipayOpenAgentCreateRequest();
+        request.setBizContent("{" + "\"account\":\"" + merchantBaseInfo.getAliAccount() + "\"," + "\"contact_info\":{"
+                + "\"contact_name\":\"" + merchantBaseInfo.getContactName() + "\"," + "\"contact_mobile\":\""
+                + merchantBaseInfo.getContactMobile() + "\"," + "\"contact_email\":\"" + merchantBaseInfo.getEmail() + "\"" + "}," + "}");
+        try {
+            AlipayOpenAgentCreateResponse response = alipayClient.execute(request);
+            if (response.isSuccess()) {
+                if ("10000".equals(response.getCode())) {
+                    return ResultGenerator.genSuccessResult(response.getBatchNo());
+                } else {
+                    return ResultGenerator.genFailResult(response.getSubMsg());
+                }
+            } else {
+                return ResultGenerator.genFailResult(response.getSubMsg());
+            }
+        } catch (AlipayApiException e) {
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return ResultGenerator.genFailResult("系统繁忙,请稍后再试");
+        }
+
+    }
+
+    @Override
+    public Boolean facetofaceSign(BatchInfoDTO dto) {
+        log.info("=========BatchInfoDTO=======" + JSONObject.toJSONString(dto));
+        AlipayClient alipayClient = alipayClients;
+        String businessLicensePic = dto.getBusinessLicensePic();
+        try {
+            SystemConfig systemConfig = new SystemConfig();
+            systemConfig.setPropertyKey("REPLACE");
+            SystemConfig querySystemConfig = systemConfigMapper.querySystemConfig(systemConfig);
+            businessLicensePic = businessLicensePic.replace("https://www.shouyinbei.net",
+                    querySystemConfig.getPropertyValue());
+            log.info(businessLicensePic);
+            FileItem BusinessLicensePic = new FileItem(businessLicensePic);
+            String shopSignBoardPic = dto.getShopSignBoardPic();
+            shopSignBoardPic = shopSignBoardPic.replace("https://www.shouyinbei.net",
+                    querySystemConfig.getPropertyValue());
+            log.info(shopSignBoardPic);
+            FileItem ShopSignBoardPic = new FileItem(shopSignBoardPic);
+            AlipayOpenAgentFacetofaceSignRequest request = new AlipayOpenAgentFacetofaceSignRequest();
+            request.setBatchNo(dto.getBatchNo());
+            request.setMccCode(dto.getMccCode());
+            request.setBusinessLicenseNo(dto.getBusinessLicenseNo());
+            request.setBusinessLicensePic(BusinessLicensePic);
+            request.setShopSignBoardPic(ShopSignBoardPic);
+            AlipayOpenAgentFacetofaceSignResponse response = alipayClient.execute(request);
+            log.info("=====代签约当面付=====" + response);
+            if (response.isSuccess()) {
+                if ("10000".equals(response.getCode())) {
+                    return true;
+                } else {
+                    return false;
+                }
+            }
+        } catch (AlipayApiException e) {
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return false;
+        }
+        return false;
+    }
+
+    @Override
+    public Boolean agentConfirm(String batchNo) {
+        log.info("=agentConfirm提交事务=" + batchNo);
+        AlipayClient alipayClient = alipayClients;
+        AlipayOpenAgentConfirmRequest request = new AlipayOpenAgentConfirmRequest();
+        request.setBizContent("{" + "\"batch_no\":\"" + batchNo + "\"" + "  }");
+
+        try {
+            AlipayOpenAgentConfirmResponse response = alipayClient.execute(request);
+            log.info("=agentConfirm提交事务=" + response);
+            if (response.isSuccess()) {
+                if ("10000".equals(response.getCode())) {
+                    return true;
+                } else {
+                    return false;
+                }
+            }
+        } catch (AlipayApiException e) {
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return false;
+        }
+        return false;
+    }
+
+    @Override
+    public Result<Map<String, Object>> appPayParam(Map<String, String> map, DeviceMerchantBuyDTO deviceMerchantBuyDTO) {
+        AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do", ParametersUtil.ZY_ALI_APP_ID, ParametersUtil.ZY_PRI, "json", "UTF-8", ParametersUtil.ZY_PUB, "RSA2");
+        AlipayTradeAppPayRequest appPayRequest = getPayRequest(map);
+        appPayRequest.setNotifyUrl(ParametersUtil.domain + "/wap/aliPay/aliCallBack");
+        try {
+            AlipayTradeAppPayResponse response = alipayClient.sdkExecute(appPayRequest);//这里和普通的接口调用不同，使用的是sdkExecute
+            // System.out.println(response.getBody());//就是orderString 可以直接给客户端请求，无需再做处理。
+            boolean createOrder = createOrder(map.get("outTradeNo") + "", deviceMerchantBuyDTO, request);
+            if (createOrder) {
+                Map<String, Object> resultMap = new HashMap<>(16);
+                resultMap.put("aliCode", response.getBody());
+                return ResultGenerator.genSuccessResult(resultMap);
+            } else {
+                return ResultGenerator.genFailResult("系统繁忙，请稍后再试");
+            }
+        } catch (AlipayApiException e) {
+            e.printStackTrace();
+            return ResultGenerator.genFailResult("请求失败，请稍后再试");
+        }
+    }
+
+    @Override
+    public Result<Map<String, Object>> appPayParamV2(Map<String, String> map, DeviceMerchantBuyDTO deviceMerchantBuyDTO) {
+        Map<String, Object> result = appPayParam(map);
+        boolean createOrder = createOrder(map.get("outTradeNo") + "", deviceMerchantBuyDTO, request);
+        if (createOrder) {
+            deviceOrderInfoService.createOrder(map.get("outTradeNo") + "", deviceMerchantBuyDTO);
+            return ResultGenerator.genSuccessResult(result);
+        } else {
+            return ResultGenerator.genFailResult("系统繁忙，请稍后再试");
+        }
+    }
+
+    private AlipayTradeAppPayRequest getPayRequest(Map<String, String> map) {
+        //实例化具体API对应的request类,类名称和接口名称对应,当前调用接口名称：alipay.trade.app.pay
+        AlipayTradeAppPayRequest appPayRequest = new AlipayTradeAppPayRequest();
+        //SDK已经封装掉了公共参数，这里只需要传入业务参数。以下方法为sdk的model入参方式(model和biz_content同时存在的情况下取biz_content)。
+        AlipayTradeAppPayModel model = new AlipayTradeAppPayModel();
+        model.setBody(map.get("body"));
+        model.setSubject(map.get("subject"));
+        model.setOutTradeNo(map.get("outTradeNo"));
+        model.setTotalAmount(map.get("totalAmount"));
+        appPayRequest.setBizModel(model);
+        appPayRequest.setNotifyUrl(ParametersUtil.domain + "/wap/aliPay/aliCallBackV2");
+
+        return appPayRequest;
+    }
+
+    @Override
+    public Map<String, Object> appPayParam(Map<String, String> map) {
+        AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do", ParametersUtil.ZY_ALI_APP_ID, ParametersUtil.ZY_PRI, "json", "UTF-8", ParametersUtil.ZY_PUB, "RSA2");
+        AlipayTradeAppPayRequest appPayRequest = getPayRequest(map);
+        try {
+            AlipayTradeAppPayResponse response = alipayClient.sdkExecute(appPayRequest);
+            Map<String, Object> resultMap = new HashMap<>(16);
+            resultMap.put("aliCode", response.getBody());
+            return resultMap;
+        } catch (AlipayApiException e) {
+            e.printStackTrace();
+            throw new MsgException("请求失败，请稍后再试");
+        }
+    }
+
+    /**
+     * createOrder:(创建订单). <br/>
+     *
+     * @param deviceMerchantBuyDTO
+     * @return
+     * 
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    public boolean createOrder(String orderNo, DeviceMerchantBuyDTO deviceMerchantBuyDTO, HttpServletRequest request) {
+        DeviceMerchantBuy deviceMerchantBuy = deviceMerchantBuyDTO.convertDeviceMerchantBuy();
+        try {
+            UserApp userApp = userAppService.queryUserAppByToken();
+            Long userId = userApp.getUserId();
+            MerchantBaseInfo merchantBaseInfo;
+            List<MerchantBaseInfo> queryMerchantBaseInfoList = merchantBaseInfoMapper.selectListByUserId(userId);
+            if (queryMerchantBaseInfoList != null && queryMerchantBaseInfoList.size() > 0) {
+                merchantBaseInfo = queryMerchantBaseInfoList.get(0);
+                deviceMerchantBuy.setMerchantCode(merchantBaseInfo.getMerchantCode());
+                deviceMerchantBuy.setMerchantName(merchantBaseInfo.getMerchantName());
+            }
+            deviceMerchantBuy.setOrderNo(orderNo);
+            deviceMerchantBuyService.saveDeviceMerchantBuy(deviceMerchantBuy);
+            for (int i = 0; i < deviceMerchantBuyDTO.getQuantity(); i++) {
+                DeviceMerchantBuyDetail deviceMerchantBuyDetail = new DeviceMerchantBuyDetail();
+                deviceMerchantBuyDetail.setOrderNo(orderNo);
+                deviceMerchantBuyDetail.setSoleCode(StringUtil.genRandomNum(3) + StringUtil.getBillno());
+                deviceMerchantBuyDetailService.saveDeviceMerchantBuyDetail(deviceMerchantBuyDetail);
+            }
+            return true;
+        } catch (Exception e) {
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            e.printStackTrace();
+            return false;
+        }
+
+    }
+
+    @Override
+    public Result<Map<String, Object>> appRefund(DeviceMerchantBuy deviceMerchantBuy) {
+        AlipayTradeRefundRequest request = new AlipayTradeRefundRequest();
+        request.setBizContent("{" + "\"out_trade_no\":\"" + deviceMerchantBuy.getOrderNo() + "\"," + "\"refund_amount\":" + deviceMerchantBuy.getOrderAmount() + "" + "}");
+        AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do", AliPayParam.getAppId(), AliPayParam.getPri(), "json", "UTF-8", AliPayParam.getPub(), "RSA2");
+        try {
+            AlipayTradeRefundResponse response = alipayClient.execute(request);
+            if (response.isSuccess()) {
+                deviceMerchantBuy.setStatus("2");
+                deviceMerchantBuyService.updateDeviceMerchantBuy(deviceMerchantBuy);
+                Map<String, Object> result = new HashMap<String, Object>(16);
+                result.put("aliCode", "退款成功");
+                return ResultGenerator.genSuccessResult(result);
+            } else {
+                return ResultGenerator.genFailResult("退款失败");
+            }
+        } catch (AlipayApiException e) {
+            e.printStackTrace();
+            return ResultGenerator.genFailResult("退款失败");
+        }
+
+    }
+
+    /**
+     * 退款V2
+     * @param orderDetail
+     * @return
+     */
+    @Override
+    public Map<String, Object> refundV2(MercOrderDetail orderDetail) {
+        Map<String, Object> result = new HashMap<>(4);
+        result.put("code", ResultCode.SUCCESS.code());
+        result.put("msg","退款成功！");
+        AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do", ParametersUtil.ZY_ALI_APP_ID, ParametersUtil.ZY_PRI, "json", "UTF-8", ParametersUtil.ZY_PUB, "RSA2");
+        AlipayTradeRefundRequest request = new AlipayTradeRefundRequest();
+        String refundNo = "ALIR" + StringUtil.getBillno();
+        result.put("refundNo",refundNo);
+        JSONObject bizContent = new JSONObject();
+        bizContent.put("out_trade_no", orderDetail.getOrderNo());
+        bizContent.put("refund_amount", orderDetail.getRefundAmt());
+        bizContent.put("out_request_no", refundNo);
+        bizContent.put("refund_reason",orderDetail.getRefundReason());
+        request.setBizContent(bizContent.toString());
+        try {
+            AlipayTradeRefundResponse response = alipayClient.execute(request);
+            if(!response.isSuccess()){
+                result.put("code",ResultCode.FAIL.code());
+                result.put("msg",response.getSubMsg());
+            }
+        } catch (AlipayApiException e) {
+            e.printStackTrace();
+            result.put("code",ResultCode.FAIL.code());
+            result.put("msg","退款失败");
+        }
+        return result;
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ali/impl/AlipayServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ali/impl/AlipayServiceImpl.java
new file mode 100644
index 0000000..6b792d6
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ali/impl/AlipayServiceImpl.java
@@ -0,0 +1,89 @@
+package cn.pluss.platform.ali.impl;
+
+import cn.pluss.platform.ali.AlipayService;
+import cn.pluss.platform.exception.MsgException;
+import com.alibaba.fastjson.JSONObject;
+import com.alipay.api.CertAlipayRequest;
+import com.alipay.api.DefaultAlipayClient;
+import com.alipay.api.request.AlipayFundTransUniTransferRequest;
+import com.alipay.api.response.AlipayFundTransUniTransferResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.UUID;
+
+@Slf4j
+@Service
+public class AlipayServiceImpl implements AlipayService {
+    @Override
+    public void remit(String account, String realName, String money) {
+        try {
+            CertAlipayRequest certAlipayRequest = new CertAlipayRequest();
+            certAlipayRequest.setServerUrl("https://openapi.alipay.com/gateway.do");
+//            certAlipayRequest.setAppId("2021001189650608");
+//            certAlipayRequest.setPrivateKey("MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDWIvHm57tQURFF+UKIxNnnZcxnBPZ5oXwQlJjmUzv3qInD/I9TBBBvlRsY1ugRioH7KGwpUI0vjBuSzZYKx8ckktAIb03j75nSHOFD0Mn23y73bjVznj2NVLeVvDKPP8vfFO+7VYM2vBNHrXlvBSjfb/0gP0wZa1H2uqwKVdRHnTJgllzINKcO8ttosRqUZlj8oysCbV8BXDQ5B8QPKsvbtbva9v8giwp3Utk490Ufqh/cX0IL28PMBBp0SL7ptrbN9mT7FA02+T9Me1BevXBHBsqykgZfbuptEIg/tn93lBCM4cP70nXMz4hTYSPHp9f1QZjsdMxtOEhiWNoJeO6jAgMBAAECggEAaTr3AW/zfv63rFlXtvp10t8V2bJ4pUEURNmhYd6ZY5UxTly42iTvJsZxcH17wdL9GT2+GXd6Sllh23yoNVgDpxd2oA6CinbecoC6uqbJ+UWoQPOp1M14lhGBvlWjyv2g5FnXjYnyV12JY/n96O7yLQtNqyEv9nXk64jErreLAD17u8mQKDWx0E3s6j3JewCS/gpCoiPVGr4Aoh5pZQqZPvdirFtnLhPbphQAe/xRxMXn3SCTh/I+ggAlPf4pi20nYSJH/yV3RnPMg5GmwQm8Yr46ducbUyeQWjN2Gktaixz3ZGKX9RDabahHU5S4/RiCVF0/Mt6qun3j+AXC/NfkMQKBgQDqOPhRC1mzZE86KlfWpIW48hvjEY3UQW89OGpLfsGrh5JU4xhI+7ahFQZ212xIH3Ee4lqzLcfQIGZUZOAytQtSVOQ54FvQQYO1DlAr8RdFoNQAua9Z08If9LGNg7+b+dWDcnfAf07oV+zqBMy3+3+oQAupv/0v2C4szNxqQOBl7wKBgQDqC+GsyGXt0PRhWXr8jN3LoKv/z1+GLrk5EnW7DW4NYdI3OshY4F284QV57PFvS93HKh7hHinGlSniwR39yCmU6SsF+NSERsBQnm1y6Nof7i2Ywoz3yYKBzcplwlwN/3D7hH/SjlxKFAf0REcXIMSv/rmN8VQ6BfzIJ1ln9QXWjQKBgQDbRPQqou6Zw3lsIYHT3neVeYpj2+Yj5BIohOz1ujfCxgtWzrbIdGU3jcBcdzXWmyDCYfO5NE2P6RUDQuCkd9qee/ygtgod/4c2c6zYRj6cH4D5INwowtZEJkYmDkXN1mhtQzcajdQoLVAMkOu5/Yc30qVYh/SV2tL3e92I1y18HwKBgCzj3oMfZL16aIULfpVWB2x5AsRr5+x6pbgWnFImP0d9za4eLjMtxYzmtAAwvBYWvRDoOUgAWw7lqUT+uVvlumP/XOsmUMyWLWjJGkEB/GRHcKNuHU+hbNCswfdGkhV1Oxxiy4l9GKJ0uRnWxrPe6xq+hqR89ySx5UwWkAVqb5Y5AoGAPEc//P14ppYSx/G3f2rFML/G2pc6OgSABtbbKSgziX11AbVEzaqmmQI39TMkaLSdBAzqzmaLg3ZYnHsvBLg1il/7xE/d7nYlkaCwbEC+M1MzPGzXODt+5jusUVzO4Uk4bX9asBQJsWVhC851eoi/G4o7VZ4tal2fz17pyiuZq40=");
+//            certAlipayRequest.setFormat("json");
+//            certAlipayRequest.setCharset("UTF-8");
+//            certAlipayRequest.setSignType("RSA2");
+//            certAlipayRequest.setCertPath ( "/home/syb/cert/appCertPublicKey_2021001189650608.crt" );
+//            certAlipayRequest.setAlipayPublicCertPath (  "/home/syb/cert/alipayCertPublicKey_RSA2 (2).crt"  );
+//            certAlipayRequest.setRootCertPath ( "/home/syb/cert/alipayRootCert (2).crt" );
+
+            certAlipayRequest.setAppId("2021003133649094");
+            String privateKey = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDP0ky+6wTP7mTiyuA3rfUXW9kibwU3q4V8R/zWE5zGOIaMv/bQ3La/0WWUGHd9K/bsgQ6GLBE+i74QU/3RzfdrbTvrL6GrLupMxxgdiikmvkhPRwkWVPghjNmbJhG6+gva1K8BfE0QtbP3oghnBc78TSyp02aoKFIjo98+21fXUQZs8yagoZBojoQ8zcSr09TsCB4BCm+nSEhD7yEa7HyPcX+FkMtRFXt0XsxnBwV/9T95vaBNGKQoNdvY5evIVRnSInc4E4k8MU3sm+YxrPHWMKWZJn2SP/1kPXIGc/IZkf6AZGeZXMNL36kz8k6Z/1f/TsOKioHX5J498ueuc1HvAgMBAAECggEARDtKoUAuQ0qE6wUq2n0NxA6O2sRSlTWGTQihlXO4/EegvWNlWKuugInybM4fpQQjPQEeUKT1QHDHBTteUVzrR+UEUDJCRR7RJEYVv9UVr7e3q/epnyBkmzdQVqUIGzhvXfiIQNebwcm2fa5ATfrVO3bnHBbhVIJwfW0XJd8EFxfWonUDjtPfk8wTEjmNqz6vXhpk3ncV7MMY07ehbYaMA4NbbysABKRP0S9515JUX0NkBtxnhVm2ojcoc1Wjy3//TN8RXpC17E1Tyd/9pQIxmosLjS1gcX1WzphMZU0Y/74yHiE0WQCKP3J6PkdBTQDIqubyRdErJ9TYSe9+u3OZyQKBgQDrtap3LItv8IjH6O5Lg4xMU9r9dFW8QVc3dD1yn+wWq5x54mnUo5d6cTa7HqZ9SgS7gxWQZG/km9R2cJLQsATlQjdHyEoNKtqdgl3vB8MGK+Lwh6vNhE2z2svRJqQpzZfs1dKwI74mASDzwu/HjdkOFO2BVzjG3IPmrDRmN+7w8wKBgQDhthAKdbkhb7vjlgckGqDyy28QVb1YfZ4YzwW5aZiAhBmQhfZZEB5/KAYKRkToFg6Nqz6cBHwb1rH1YtOua8Dgr5XsqPQz9+MCCrUKxVt/1ziWhkpaNxEobT7QYtJiaGvuLxGP7uqpJGDpePCLHQTxmocsj8UgEE49HDj4qlO6FQKBgFGip5mC2gA5BIaITA/nTa4Z1Ny3cAI1dymDnsyWSsRHR3iHTDQTPKFxmI0SPoNiIWV4Lv3Fa2N3/QvQTWjtraRhXJgF7G/HCdRHlJT20TrP9FduBbi2O9swyip0AaNgy1+BZukOWAr9lRYXy8gHfsd7xA5p0QY+1YgM2FEWyjC1AoGBAKaSAsKFYGuRltp9BKYbVL35bexjKgodIkhyt2m+yQHG+0rR4hyWLbtvYQ3CD+YrKPBZ+SmQkbrFta0/ErL86Gmoiv8NLLMRdCE0n6jkPwNYZHWJg2OSkgIApUOKOnLPVx9+8voCuoC6zR5f1z0C3Hwkqy8ypqpj/ilRI6Y3pPSFAoGAaxBlqCUBFEhs/FnYf9neoPzx9WYDmJY7PgNgZ/s0H9vaGqyWPLWyF95/dTZ5yrBsABQyuIfDa2/m8y1YJaIJ/qU29FDq/GMv6IX4zDgm2iaWNZFnMoW7qSEkpVISSLoVxat4D556YI6FrQeoUAS+L1iEFgS33ln1tTyqb7mSe00=";
+            certAlipayRequest.setPrivateKey(privateKey);
+            certAlipayRequest.setFormat("json");
+            certAlipayRequest.setCharset("UTF-8");
+            certAlipayRequest.setSignType("RSA2");
+            certAlipayRequest.setCertPath ( "/home/syb/cert/20220622/appCertPublicKey_2021003133649094.crt" );
+            certAlipayRequest.setAlipayPublicCertPath (  "/home/syb/cert/20220622/alipayCertPublicKey_RSA2.crt"  );
+            certAlipayRequest.setRootCertPath ( "/home/syb/cert/20220622/alipayRootCert.crt" );
+
+//            certAlipayRequest.setAppId("2021003133649094");
+//            String privateKey = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDP0ky+6wTP7mTiyuA3rfUXW9kibwU3q4V8R/zWE5zGOIaMv/bQ3La/0WWUGHd9K/bsgQ6GLBE+i74QU/3RzfdrbTvrL6GrLupMxxgdiikmvkhPRwkWVPghjNmbJhG6+gva1K8BfE0QtbP3oghnBc78TSyp02aoKFIjo98+21fXUQZs8yagoZBojoQ8zcSr09TsCB4BCm+nSEhD7yEa7HyPcX+FkMtRFXt0XsxnBwV/9T95vaBNGKQoNdvY5evIVRnSInc4E4k8MU3sm+YxrPHWMKWZJn2SP/1kPXIGc/IZkf6AZGeZXMNL36kz8k6Z/1f/TsOKioHX5J498ueuc1HvAgMBAAECggEARDtKoUAuQ0qE6wUq2n0NxA6O2sRSlTWGTQihlXO4/EegvWNlWKuugInybM4fpQQjPQEeUKT1QHDHBTteUVzrR+UEUDJCRR7RJEYVv9UVr7e3q/epnyBkmzdQVqUIGzhvXfiIQNebwcm2fa5ATfrVO3bnHBbhVIJwfW0XJd8EFxfWonUDjtPfk8wTEjmNqz6vXhpk3ncV7MMY07ehbYaMA4NbbysABKRP0S9515JUX0NkBtxnhVm2ojcoc1Wjy3//TN8RXpC17E1Tyd/9pQIxmosLjS1gcX1WzphMZU0Y/74yHiE0WQCKP3J6PkdBTQDIqubyRdErJ9TYSe9+u3OZyQKBgQDrtap3LItv8IjH6O5Lg4xMU9r9dFW8QVc3dD1yn+wWq5x54mnUo5d6cTa7HqZ9SgS7gxWQZG/km9R2cJLQsATlQjdHyEoNKtqdgl3vB8MGK+Lwh6vNhE2z2svRJqQpzZfs1dKwI74mASDzwu/HjdkOFO2BVzjG3IPmrDRmN+7w8wKBgQDhthAKdbkhb7vjlgckGqDyy28QVb1YfZ4YzwW5aZiAhBmQhfZZEB5/KAYKRkToFg6Nqz6cBHwb1rH1YtOua8Dgr5XsqPQz9+MCCrUKxVt/1ziWhkpaNxEobT7QYtJiaGvuLxGP7uqpJGDpePCLHQTxmocsj8UgEE49HDj4qlO6FQKBgFGip5mC2gA5BIaITA/nTa4Z1Ny3cAI1dymDnsyWSsRHR3iHTDQTPKFxmI0SPoNiIWV4Lv3Fa2N3/QvQTWjtraRhXJgF7G/HCdRHlJT20TrP9FduBbi2O9swyip0AaNgy1+BZukOWAr9lRYXy8gHfsd7xA5p0QY+1YgM2FEWyjC1AoGBAKaSAsKFYGuRltp9BKYbVL35bexjKgodIkhyt2m+yQHG+0rR4hyWLbtvYQ3CD+YrKPBZ+SmQkbrFta0/ErL86Gmoiv8NLLMRdCE0n6jkPwNYZHWJg2OSkgIApUOKOnLPVx9+8voCuoC6zR5f1z0C3Hwkqy8ypqpj/ilRI6Y3pPSFAoGAaxBlqCUBFEhs/FnYf9neoPzx9WYDmJY7PgNgZ/s0H9vaGqyWPLWyF95/dTZ5yrBsABQyuIfDa2/m8y1YJaIJ/qU29FDq/GMv6IX4zDgm2iaWNZFnMoW7qSEkpVISSLoVxat4D556YI6FrQeoUAS+L1iEFgS33ln1tTyqb7mSe00=";
+//            certAlipayRequest.setPrivateKey(privateKey);
+//            certAlipayRequest.setFormat("json");
+//            certAlipayRequest.setCharset("UTF-8");
+//            certAlipayRequest.setSignType("RSA2");
+//            certAlipayRequest.setCertPath ( "C:\\Users\\DJH\\Downloads\\appCertPublicKey_2021003133649094.crt" );
+//            certAlipayRequest.setAlipayPublicCertPath (  "C:\\Users\\DJH\\Downloads\\alipayCertPublicKey_RSA2.crt"  );
+//            certAlipayRequest.setRootCertPath ( "C:\\Users\\DJH\\Downloads\\alipayRootCert.crt" );
+            DefaultAlipayClient alipayClient = new DefaultAlipayClient(certAlipayRequest);
+            // 构建request内容
+            AlipayFundTransUniTransferRequest request = new AlipayFundTransUniTransferRequest();
+            JSONObject bizJson = new JSONObject();
+            JSONObject payeeInfo = new JSONObject();
+            // 身份信息设置为帐号
+            payeeInfo.put("identity_type", "ALIPAY_LOGON_ID");
+            payeeInfo.put("identity", account);
+            payeeInfo.put("name", realName);
+
+            bizJson.put("out_biz_no", UUID.randomUUID().toString().replace("-", ""));
+            bizJson.put("trans_amount", money);
+            bizJson.put("product_code", "TRANS_ACCOUNT_NO_PWD");
+            bizJson.put("biz_scene", "DIRECT_TRANSFER");
+            bizJson.put("payee_info", payeeInfo);
+            bizJson.put("order_title", "收银呗分润");
+            bizJson.put("remark", "收银呗分润");
+
+            JSONObject bizParam = new JSONObject();
+            bizParam.put("payer_show_name", "收银呗");
+
+            bizJson.put("business_params", bizParam);
+
+            request.setBizContent(bizJson.toString());
+
+            AlipayFundTransUniTransferResponse response = alipayClient.certificateExecute(request);
+            if (response.isSuccess()) {
+                log.info("调用成功");
+            } else {
+                log.error(response.getSubMsg());
+                throw new MsgException(response.getSubMsg());
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new MsgException(e.getMessage());
+        }
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/aliMcc/AliMccService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/aliMcc/AliMccService.java
new file mode 100644
index 0000000..036c044
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/aliMcc/AliMccService.java
@@ -0,0 +1,36 @@
+package cn.pluss.platform.aliMcc;
+
+import java.util.List;
+import java.util.Map;
+import cn.pluss.platform.entity.AliMcc;
+
+public interface AliMccService {
+
+    public AliMcc queryAliMcc(AliMcc aliMcc);
+
+    public List<AliMcc> queryAliMccList(AliMcc aliMcc);
+
+    public void saveAliMcc(AliMcc aliMcc);
+
+    public void updateAliMcc(AliMcc aliMcc);
+
+    public void deleteAliMcc(AliMcc aliMcc);
+
+    public List<AliMcc> queryAliMccPage(Map map);
+
+    public Integer queryAliMccPageCount(Map map);
+
+    public void saveAliMccBatch(List<AliMcc> aliMccList);
+    
+    /**
+	 * 
+	 * queryMcc:(查询支付宝mccCode). <br/> 
+	 *
+	 * @author Administrator 
+	 * @param mccCode
+	 * @return 
+	 * @since JDK 1.8
+	 */
+	public  String queryMccCode(String mccCode);
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/aliMcc/impl/AliMccServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/aliMcc/impl/AliMccServiceImpl.java
new file mode 100644
index 0000000..432fc09
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/aliMcc/impl/AliMccServiceImpl.java
@@ -0,0 +1,65 @@
+package cn.pluss.platform.aliMcc.impl;
+
+import java.util.List;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import cn.pluss.platform.aliMcc.AliMccService;
+import cn.pluss.platform.entity.AliMcc;
+import cn.pluss.platform.mapper.AliMccMapper;
+
+@Transactional
+@Service("aliMccService")
+public class AliMccServiceImpl  implements AliMccService{
+
+	 private static final Logger logger = LoggerFactory.getLogger( AliMccServiceImpl.class);
+
+
+    @Autowired
+	  private AliMccMapper aliMccMapper;
+
+    @Override
+    public AliMcc queryAliMcc(AliMcc aliMcc){
+        return aliMccMapper.queryAliMcc(aliMcc);
+    }
+
+    @Override
+    public List<AliMcc> queryAliMccList(AliMcc aliMcc){
+        return aliMccMapper.queryAliMccList(aliMcc);
+    }
+    @Override
+    public void saveAliMcc(AliMcc aliMcc){
+          aliMccMapper.saveAliMcc(aliMcc);
+    }
+    @Override
+    public void updateAliMcc(AliMcc aliMcc){
+        aliMccMapper.updateAliMcc(aliMcc);
+    }
+    @Override
+    public void deleteAliMcc(AliMcc aliMcc){
+        aliMccMapper.deleteAliMcc(aliMcc);
+    }
+    @Override
+    public List<AliMcc> queryAliMccPage(Map map){
+        return aliMccMapper.queryAliMccPage(map);
+    }
+    @Override
+    public Integer queryAliMccPageCount(Map map){
+        return aliMccMapper.queryAliMccPageCount(map);
+    }
+    @Override
+    public void saveAliMccBatch(List<AliMcc> aliMccList) {
+         aliMccMapper.saveAliMccBatch(aliMccList);
+    }
+
+	@Override
+	public String queryMccCode(String mccCode) {
+		return aliMccMapper.queryMccCode(mccCode);
+	}
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/api/ApiMercSplitService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/api/ApiMercSplitService.java
new file mode 100644
index 0000000..5af4ca7
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/api/ApiMercSplitService.java
@@ -0,0 +1,17 @@
+package cn.pluss.platform.api;
+
+/**
+ * TODO
+ *
+ * @author crystal
+ * @date 2022/6/29 16:13
+ */
+public interface ApiMercSplitService {
+
+    /**
+     * 商户分账配置操作
+     * @param req
+     * @return
+     */
+    Result<Object> splitOperat(SplitReq req);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/api/impl/ApiMercSplitServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/api/impl/ApiMercSplitServiceImpl.java
new file mode 100644
index 0000000..01b56f3
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/api/impl/ApiMercSplitServiceImpl.java
@@ -0,0 +1,237 @@
+package cn.pluss.platform.api.impl;
+
+import cn.pluss.platform.api.*;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.MerchantOrderMapper;
+import cn.pluss.platform.mercSplitSetting.MerchantSplitSettingService;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.merchantOrder.BaseMercSplitService;
+import cn.pluss.platform.merchantOrderSplit.MerchantOrderSplitDetailService;
+import cn.pluss.platform.merchantOrderSplit.MerchantOrderSplitRefundService;
+import cn.pluss.platform.merchantOrderSplit.MerchantOrderSplitService;
+import cn.pluss.platform.util.StringUtil;
+import cn.pluss.platform.vo.SplitOrderVo;
+import com.alibaba.fastjson.JSON;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * TODO
+ * 分账业务处理Service实现类
+ * @author crystal
+ * @date 2022/6/29 16:14
+ */
+@Service
+@Slf4j
+public class ApiMercSplitServiceImpl implements ApiMercSplitService {
+
+    @Resource
+    private MerchantChannelStatusService channelStatusService;
+
+    @Resource
+    private MerchantBaseInfoService merchantBaseInfoService;
+
+    @Resource
+    private MerchantSplitSettingService merchantSplitSettingService;
+
+    @Resource
+    private MerchantOrderSplitService merchantOrderSplitService;
+
+    @Resource
+    private MerchantOrderSplitDetailService merchantOrderSplitDetailService;
+
+    @Setter(onMethod_ = {@Autowired, @Qualifier("ysMercSplitService")})
+    private BaseMercSplitService ysMercSplitService;
+
+    @Resource
+    private MerchantOrderSplitRefundService merchantOrderSplitRefundService;
+
+    @Resource
+    private MerchantOrderMapper merchantOrderMapper;
+
+    @Override
+    public Result<Object> splitOperat(SplitReq req) {
+        log.info("【订单分账接口】请求参数：{}", JSON.toJSONString(req));
+        SplitReq.Method method = req.checkParams();
+        Object obj = split(req,method);
+        return ResultGenerator.genSuccessResult("操作成功",obj);
+    }
+    /**
+     * 分账
+     * @param req
+     */
+    private Object split(SplitReq req,SplitReq.Method method) {
+        int size = req.getDivList() == null ? 16 : req.getDivList().size();
+        MerchantBaseInfo merchant = merchantBaseInfoService.getMerchantBaseInfoByMerchantCode(req.getMerchantCode());
+        MsgException.checkNull(merchant,"收款方商户号有误！");
+        merchant.chekSign(req);
+        MerchantChannelStatus channel = channelStatusService.getByMerchantCode(req.getMerchantCode(), 4);
+        MsgException.checkNull(channel,"商户入网数据异常！");
+        MsgException.check(!channel.isPayment(),"商户状态不可用！");
+        List<MercSubSplitAccount> divList = req.getDivList();
+        switch (method){
+            case ORDER_ACCEPT:
+                MerchantOrder mOrder = merchantOrderMapper.getByMercOrderNo(req.getMercOrderNo());
+                MsgException.checkNull(mOrder,"原商户订单号有误！");
+                MsgException.check(!"1".equals(mOrder.getStatus()),"当前订单状态不支持！");
+                MerchantOrderSplit byMercOrderNo = merchantOrderSplitService.getByMercOrderNo(req.getMercOrderNo());
+                if(byMercOrderNo != null && byMercOrderNo.getDivStatus() != -1){
+                    MsgException.throwException("原订单已登记过分账，请勿重复发起分账");
+                }
+                MerchantOrderSplit sOrder = new MerchantOrderSplit(mOrder,channel,req.getDivisionMode(),req.getNotifyUrl());
+                ArrayList<MerchantOrderSplitDetail> details = new ArrayList<>(16);
+                checkDivListParams(req,divList,channel,merchant,sOrder.getOrderAmt(),null,details,sOrder);
+                Boolean resFlag = ysMercSplitService.split(sOrder, details,channel);
+                MsgException.check(!resFlag,sOrder.getRemark());
+                merchantOrderSplitService.save(sOrder);
+                merchantOrderSplitDetailService.saveBatch(details);
+                SplitOrderVo result = merchantOrderSplitService.resultChannelParam(sOrder,details);
+                return result;
+            case MERC_ACCEPT:
+                List<MerchantSplitSetting> list = new ArrayList<>(size);
+                checkDivListParams(req,divList,channel,merchant,BigDecimal.ZERO,list,null,null);
+                List<MerchantSplitSetting> oldList = merchantSplitSettingService.listChieMerchantCode(req.getMerchantCode());
+                if(!oldList.isEmpty()){
+                    merchantSplitSettingService.removeList(oldList);
+                }
+                merchantSplitSettingService.saveBatch(list);
+                MerchantBaseInfo update = new MerchantBaseInfo();
+                update.setId(merchant.getId());
+                update.setSplitFlag(MerchantBaseInfo.SPLIT_FLAG_YES);
+                merchantBaseInfoService.updateById(update);
+                break;
+            case MERC_REFUND:
+                MerchantOrderSplit orderSplit = merchantOrderSplitService.getByMercOrderNo(req.getMercOrderNo());
+                MsgException.checkNull(orderSplit,"原商户订单号有误！");
+                MsgException.check(orderSplit.getStatus() == 0,"原订单未支付，无法发起退款");
+                BigDecimal orderAmt = orderSplit.getOrderAmt();
+                boolean flag = orderAmt.compareTo(orderSplit.getRefundAmt().add(new BigDecimal(req.getRefundAmt()))) < 0;
+                MsgException.check(flag,"超出可退款的最大金额");
+                List<MerchantOrderSplitDetail> detailList = merchantOrderSplitDetailService.listByOrderNumber(orderSplit.getOrderNumber());
+                MsgException.check(detailList.isEmpty(),"分账详情异常，发起退款失败");
+                orderSplit.setDetailList(detailList);
+                List<SplitRefund> refundList = req.getRefundList();
+                BigDecimal countRefundAmt = BigDecimal.ZERO;
+                for (SplitRefund refund:refundList) {
+                    MsgException.checkBlank(refund.getMerchantCode(),"退款信息商户号不能为空");
+                    MerchantChannelStatus divChannel = channelStatusService.getByMerchantCode(refund.getMerchantCode(), 4);
+                    MsgException.checkNull(divChannel,"退款商户信息商户号有误");
+                    MsgException.checkNull(refund.getRefundAmt(),"退款明细中的退款金额不能为空");
+                    MerchantOrderSplitDetail detail = merchantOrderSplitDetailService.getByOrderNumberAndMerchantCode(orderSplit.getOrderNumber(),refund.getMerchantCode());
+                    MsgException.check(new BigDecimal(refund.getRefundAmt()).compareTo(detail.getFinalAmt()) > 0,"退款明细的退款超出分账商户的实际分账金额");
+                    refund.setMerchantId(divChannel.getMerchantId());
+                    countRefundAmt = countRefundAmt.add(new BigDecimal(refund.getRefundAmt()));
+                }
+                BigDecimal tRefundAmt = new BigDecimal(req.getRefundAmt());
+                if(tRefundAmt.compareTo(countRefundAmt) != 0){
+                    MsgException.throwException("退款明细中的退款总额必须等于退款金额");
+                }
+                MerchantOrderSplitRefund refund = new MerchantOrderSplitRefund(orderSplit,req);
+//                ysMercSplitService.withdraw(orderSplit,channel);
+
+                boolean resp = ysMercSplitService.generalRefund(refund);
+                MsgException.check(!resp,refund.getRemark());
+                merchantOrderSplitRefundService.save(refund);
+                return refund;
+            case SPLIT_QUERY:
+                MerchantOrderSplit order = merchantOrderSplitService.getByMercOrderNo(req.getMercOrderNo());
+                MsgException.checkNull(order,"原商户订单号有误！");
+                List<MerchantOrderSplitDetail> splitDetailList = merchantOrderSplitDetailService.listByOrderNumber(order.getOrderNumber());
+                List<MerchantOrderSplitDetail> dList = ysMercSplitService.splitQuery(order, splitDetailList);
+                if(dList != null){
+                    merchantOrderSplitDetailService.updateBatchById(splitDetailList);
+                    merchantOrderSplitService.updateById(order);
+                }
+                return merchantOrderSplitService.resultChannelParam(order,splitDetailList);
+            case REFUND_QUERY:
+                MerchantOrderSplit qOrder = merchantOrderSplitService.getByMercOrderNo(req.getMercOrderNo());
+                MsgException.checkNull(qOrder,"原商户订单号有误！");
+                MerchantOrderSplitRefund qRefund = merchantOrderSplitRefundService.getByMercRefunNo(req.getMercRefundNo());
+                MsgException.checkNull(qRefund,"原商户退款单号有误！");
+                List<MerchantOrderSplitDetail> srList = merchantOrderSplitDetailService.listByOrderNumber(req.getMercOrderNo());
+                MsgException.check(srList.isEmpty(),"订单分账详情数据异常！");
+                List<MerchantOrderSplitDetail> rList = ysMercSplitService.refundQuery(qRefund,srList);
+                merchantOrderSplitRefundService.updateById(qRefund);
+                merchantOrderSplitDetailService.updateBatchById(rList);
+                return rList;
+        }
+        return null;
+    }
+
+    private void checkDivListParams(SplitReq req,List<MercSubSplitAccount> divList,MerchantChannelStatus channel,
+                                    MerchantBaseInfo merchant,
+                                    BigDecimal orderAmt,
+                                    List<MerchantSplitSetting> settingList,
+                                    List<MerchantOrderSplitDetail> detailList,
+                                    MerchantOrderSplit orderSplit) {
+        BigDecimal ratioCount = BigDecimal.ZERO;
+        BigDecimal amtCount = BigDecimal.ZERO;
+        for (MercSubSplitAccount account:divList) {
+            MerchantBaseInfo subMerchant = merchantBaseInfoService.getMerchantBaseInfoByMerchantCode(account.getMerchantCode());
+            MsgException.checkNull(subMerchant,"分账方商户编号"+account.getMerchantCode()+"有误！");
+            MerchantChannelStatus subChannel = channelStatusService.getByMerchantCode(subMerchant.getMerchantCode(), 4);
+            if(!channel.getSrcMerchantNo().equals(subChannel.getSrcMerchantNo())){
+                MsgException.throwException("商户进件主体不一致！");
+            }
+            MsgException.checkNull(subChannel,"分账商户入网数据异常！");
+            MsgException.check(!subChannel.isPayment(),"分账方商户状态不可用！");
+            if(SplitReq.DivisionMode.SCALE.getValue().equals(req.getDivisionMode())){
+                if(account.getDivRatio() == null){
+                    MsgException.throwException("当分账类型为比例时，分账divRatio参数不能为空！");
+                }
+                boolean divRatioFlag = new BigDecimal(account.getDivRatio()).compareTo(BigDecimal.ZERO) <= 0 ||  new BigDecimal(account.getDivRatio()).compareTo(BigDecimal.ONE) >= 0;
+                MsgException.check(divRatioFlag,"分账比例应该介于0-1之间");
+                ratioCount = ratioCount.add(new BigDecimal(account.getDivRatio()));
+            }
+            if(SplitReq.DivisionMode.AMT.getValue().equals(req.getDivisionMode())){
+                if(account.getDivAmount() == null){
+                    MsgException.throwException("当分账类型为金额时，分账divAmount参数不能为空！");
+                }
+                MsgException.check(!StringUtil.isNumber(account.getDivAmount()),"分账金额数据格式不正确。单位元");
+                amtCount = amtCount.add(new BigDecimal(account.getDivAmount()));
+            }
+            if(settingList != null){
+                MerchantSplitSetting setting = new MerchantSplitSetting();
+                setting.setChieMerchantCode(merchant.getMerchantCode());
+                setting.setChieMerchantId(channel.getMerchantId());
+                setting.setIsDivistion(MerchantSplitSetting.DEFAULT_IS_DIVISTION);
+                setting.setDivisionMode(req.getDivisionMode());
+                setting.setDiviMerchantCode(subMerchant.getMerchantCode());
+                setting.setDiviMerchantId(subChannel.getMerchantId());
+                if(StringUtil.isNotEmpty(account.getDivRatio())){
+                    setting.setDivRatio(new BigDecimal(account.getDivRatio()));
+                }
+                if(StringUtil.isNotEmpty(account.getDivAmount())){
+                    setting.setDivAmt(new BigDecimal(account.getDivAmount()));
+                }
+                if(StringUtil.isNotEmpty(account.getIsChargeFee())){
+                    setting.setIsChargeFee(account.getIsChargeFee());
+                }else{
+                    setting.setIsChargeFee(MerchantSplitSetting.DEFAULT_IS_CHARGEFEE);
+                }
+                setting.setNotifyUrl(req.getNotifyUrl());
+                settingList.add(setting);
+            }
+            if(detailList != null){
+                MerchantOrderSplitDetail detail = new MerchantOrderSplitDetail(account,subMerchant,subChannel,orderSplit);
+                detailList.add(detail);
+            }
+        }
+        if(SplitReq.DivisionMode.SCALE.getValue().equals(req.getDivisionMode())){
+            MsgException.check(ratioCount.compareTo(BigDecimal.ONE) != 0,"所有分账比例之和必须为1");
+        }
+        if(SplitReq.DivisionMode.AMT.getValue().equals(req.getDivisionMode())){
+            MsgException.check(amtCount.compareTo(orderAmt) != 0,"所有分账金额之后应该和订单金额一致");
+        }
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/app/AccountBalanceService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/app/AccountBalanceService.java
new file mode 100644
index 0000000..7669f95
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/app/AccountBalanceService.java
@@ -0,0 +1,14 @@
+package cn.pluss.platform.app;
+
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.entity.MakeMoney;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+/**
+ * app余额界面
+ * @author  Djh
+ */
+public interface AccountBalanceService {
+
+    PageInfo<MakeMoney> queryBills(Page<MakeMoney> pageInfo);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/app/HomePageService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/app/HomePageService.java
new file mode 100644
index 0000000..12930d3
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/app/HomePageService.java
@@ -0,0 +1,4 @@
+package cn.pluss.platform.app;
+
+public interface HomePageService {
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/app/MainPageService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/app/MainPageService.java
new file mode 100644
index 0000000..af903a4
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/app/MainPageService.java
@@ -0,0 +1,24 @@
+package cn.pluss.platform.app;
+
+import java.util.Map;
+
+/**
+ * app主页面接口服务实现类
+ * @author  Djh
+ */
+public interface MainPageService {
+
+    /**
+     * app主页
+     * @param userId    用户id
+     * @return  数据
+     */
+    Map<String, Object> getHomeData(String userId);
+
+    /**
+     * 推广数据， 包含今日收款笔数，新增商户数(当日), 推广总收益(推广者/超级服务商), 本月交易额(超级服务商下的业务员)
+     * @param userId    用户id
+     * @return 推广数据
+     */
+    Map<String, Object> getSpreadData(String userId);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/app/impl/AccountBalanceServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/app/impl/AccountBalanceServiceImpl.java
new file mode 100644
index 0000000..7800a5d
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/app/impl/AccountBalanceServiceImpl.java
@@ -0,0 +1,110 @@
+package cn.pluss.platform.app.impl;
+
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.app.AccountBalanceService;
+import cn.pluss.platform.channel.MakeMoneyService;
+import cn.pluss.platform.entity.MakeMoney;
+import cn.pluss.platform.entity.MerchantChannelStatus;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.MerchantOrderMapper;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.util.PageUtils;
+import cn.pluss.platform.util.StringUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.time.DateUtils;
+import org.apache.commons.lang3.time.FastDateFormat;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+@Service
+@RequiredArgsConstructor
+public class AccountBalanceServiceImpl implements AccountBalanceService {
+
+    private final MerchantOrderMapper merchantOrderMapper;
+    private final MakeMoneyService sxfMakeMoneyService;
+
+    private final UserAppService userAppService;
+    private final MerchantChannelStatusService merchantChannelStatusService;
+
+    @Override
+    public PageInfo<MakeMoney> queryBills(Page<MakeMoney> pageInfo) {
+        UserApp userApp = userAppService.queryUserAppByToken();
+        if (StringUtils.isEmpty(userApp.getMerchantCode())) {
+            throw new MsgException("请先进行商户认证");
+        }
+
+        QueryWrapper<MerchantChannelStatus> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("userId", userApp.getMerchantCode());
+        MerchantChannelStatus merchantChannelStatus = merchantChannelStatusService.getOne(queryWrapper);
+        if (!(merchantChannelStatus.getStatus().equals("3") || merchantChannelStatus.getStatus().equals("4"))) {
+            throw new MsgException("请先进行商户认证");
+        }
+
+        QueryWrapper<MakeMoney> qw2 = new QueryWrapper<>();
+        qw2.eq("merchantId", merchantChannelStatus.getMerchantId());
+        qw2.orderByDesc("createTime");
+        Page<MakeMoney> page = sxfMakeMoneyService.page(pageInfo, qw2);
+        for (MakeMoney l : page.getRecords()) {
+            l.setRealAmount(StringUtil.bigDecimal(l.getRealAmount() * 0.01));
+            l.setSuspendAmount(StringUtil.bigDecimal(l.getSuspendAmount() * 0.01));
+            l.setPlanAmount(StringUtil.bigDecimal(l.getPlanAmount() * 0.01));
+        }
+
+        if (page.getRecords().size() == 0) {
+            return PageUtils.page(page);
+        }
+        String start = page.getRecords().get(page.getRecords().size() - 1).getCreateTime();
+        String end = page.getRecords().get(0).getCreateTime();
+
+        try {
+            FastDateFormat dateFormat = FastDateFormat.getInstance("yyyy-MM-dd", Locale.CHINA);
+            Date startTime = dateFormat.parse(start);
+            startTime = DateUtils.addDays(startTime, -1);
+            Date endTime = dateFormat.parse(end);
+            setDailyCount(startTime, endTime, userApp.getMerchantCode(), page.getRecords());
+        } catch (Exception e) {
+            return PageUtils.page(page);
+        }
+        return PageUtils.page(page);
+    }
+
+    /**
+     * 查询每日的总流水，并放入结果集中
+     *
+     * @param start        开始时间
+     * @param end          截止时间
+     * @param merchantCode 店铺code
+     * @param targetList   结算信息
+     */
+    private void setDailyCount(Date start, Date end, String merchantCode, List<MakeMoney> targetList) {
+        List<Map<String, Object>> dailyCountList = merchantOrderMapper.queryDailyCount(merchantCode, start, end);
+
+        for (MakeMoney makeMoney : targetList) {
+            for (Map<String, Object> dailyCount : dailyCountList) {
+                java.lang.String billDate = makeMoney.getCreateTime().substring(0, 10);
+                String dailyDate;
+                if (dailyCount.get("date") instanceof byte[]) {
+                    dailyDate = new String((byte[]) dailyCount.get("date"));
+                } else {
+                    dailyDate = dailyCount.get("date").toString();
+                }
+
+                if (billDate.equals(dailyDate)) {
+                    makeMoney.setConsumeFeeSum(BigDecimal.valueOf((double) dailyCount.get("consumeFeeSum")));
+                    dailyCountList.remove(dailyCount);
+                    break;
+                }
+            }
+        }
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/app/impl/AgentStaffMainPageServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/app/impl/AgentStaffMainPageServiceImpl.java
new file mode 100644
index 0000000..eb9296f
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/app/impl/AgentStaffMainPageServiceImpl.java
@@ -0,0 +1,100 @@
+package cn.pluss.platform.app.impl;
+
+import cn.hutool.core.date.DateUtil;
+import cn.jiguang.common.utils.StringUtils;
+import cn.pluss.platform.app.MainPageService;
+import cn.pluss.platform.entity.MerchantOrderStatistics;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.merchantOrder.MerchantOrderService;
+import cn.pluss.platform.merchantOrder.MerchantOrderStatisticsService;
+import cn.pluss.platform.merchantProfit.MerchantProfitService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.util.DateUtils;
+import cn.pluss.platform.vo.MerchantOrderStatisticsVO;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 业务员主页数据查询实现类
+ */
+@RequiredArgsConstructor
+@Service("agentStaffMainPageService")
+public class AgentStaffMainPageServiceImpl implements MainPageService {
+
+    private final UserAppService userAppService;
+
+    private final MerchantProfitService merchantProfitService;
+
+    @Autowired @Lazy
+    private MerchantOrderService moService;
+
+    @Autowired @Lazy
+    private UserAppService uaService;
+
+    @Override
+    public Map<String, Object> getSpreadData(String userId) {
+        Map<String, Object> resultMap = new HashMap<>();
+
+        if (StringUtils.isEmpty(userId)) {
+            throw new MsgException("无用户Id！");
+        }
+
+        // 获取当前的用户信息
+        UserApp queryUserApp = new UserApp();
+        queryUserApp.setUserId(Long.parseLong(userId));
+        List<UserApp> queryUserAppList2 = userAppService.queryUserAppList(queryUserApp);
+        if (queryUserAppList2 == null || queryUserAppList2.size() == 0) {
+            throw new MsgException("无用户信息！");
+        } else {
+            queryUserApp = queryUserAppList2.get(0);
+        }
+
+        Double promoteConsumeFee;
+        Integer totalOrderCount;
+
+        //分润
+        Map<String, Object> queryMap = new HashMap<>();
+        queryMap.put("userId", queryUserApp.getParentId());
+        queryMap.put("agentStaffId", userId);
+        queryMap.put("startTime", DateUtils.getBeginMonth(0));
+        queryMap.put("endTime", DateUtils.getBeginMonth(1));
+        queryMap.put("status", 1);
+        // 本月交易额
+        promoteConsumeFee = merchantProfitService.queryMerchantProfitSumConsumeFee(queryMap);
+        if (promoteConsumeFee == null) {
+            promoteConsumeFee = 0d;
+        }
+
+        //今日收款笔数
+        queryMap.put("recordDate", DateUtils.getDayBegin());
+        queryMap.put("retype", "1");
+        totalOrderCount = merchantProfitService.queryMerchantProfitPageCount(queryMap);
+
+        //今日新增商户数
+        QueryWrapper<UserApp> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("agentStaffId", queryUserApp.getUserId());
+        queryWrapper.eq("parentId", queryUserApp.getParentId());
+
+        queryWrapper.in("merchantAuditStatus", 3, 4);
+        Integer newMerchantCount = userAppService.getUserAppWithChannelStatus(queryWrapper);
+        resultMap.put("promoteFee", promoteConsumeFee + "");
+        resultMap.put("totalOrderCount", totalOrderCount + "");
+        resultMap.put("newMerchantCount", newMerchantCount + "");
+
+        return resultMap;
+    }
+
+    @Override
+    public Map<String, Object> getHomeData(String userId) {
+        return null;
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/app/impl/HomePageServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/app/impl/HomePageServiceImpl.java
new file mode 100644
index 0000000..70b3b5f
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/app/impl/HomePageServiceImpl.java
@@ -0,0 +1,10 @@
+package cn.pluss.platform.app.impl;
+
+import cn.pluss.platform.app.HomePageService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class HomePageServiceImpl implements HomePageService {
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/app/impl/PromoterMainPageServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/app/impl/PromoterMainPageServiceImpl.java
new file mode 100644
index 0000000..a6889fa
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/app/impl/PromoterMainPageServiceImpl.java
@@ -0,0 +1,114 @@
+package cn.pluss.platform.app.impl;
+
+import cn.hutool.core.date.DateUtil;
+import cn.pluss.platform.app.MainPageService;
+import cn.pluss.platform.entity.MerchantOrderStatistics;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.merchantOrder.MerchantOrderStatisticsService;
+import cn.pluss.platform.merchantProfit.MerchantProfitService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.util.DateUtils;
+import cn.pluss.platform.util.StringUtil;
+import cn.pluss.platform.vo.MerchantOrderStatisticsVO;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 推广者的主页面信息查询实现类
+ */
+@RequiredArgsConstructor
+@Service("promoterMainPageService")
+public class PromoterMainPageServiceImpl implements MainPageService {
+
+    private final UserAppService userAppService;
+
+    private final MerchantProfitService merchantProfitService;
+
+    @Autowired
+    @Lazy
+    private MerchantOrderStatisticsService mosService;
+
+    @Override
+    public Map<String, Object> getSpreadData(String userId) {
+        Map<String, Object> resultMap = new HashMap<>();
+
+        if (StringUtil.isEmpty(userId)) {
+            throw new MsgException("无用户Id！");
+        }
+
+        // 获取当前的用户信息
+        UserApp queryUserApp = new UserApp();
+        queryUserApp.setUserId(Long.parseLong(userId));
+        List<UserApp> queryUserAppList2 = userAppService.queryUserAppList(queryUserApp);
+        if (queryUserAppList2 == null || queryUserAppList2.size() == 0) {
+            throw new MsgException("无用户信息！");
+        } else {
+            queryUserApp = queryUserAppList2.get(0);
+        }
+
+        Double promoteFee;
+        Double todayProfit;
+        Integer totalOrderCount;
+
+        //分润
+        Map<String, Object> queryMap = new HashMap<>();
+        queryMap.put("userId", userId);
+        queryMap.put("status", 1);
+        // 累计总分润
+        promoteFee = merchantProfitService.queryMerchantProfitSumPrice(queryMap);
+        if (promoteFee == null) {
+            promoteFee = 0d;
+        }
+
+        //今日收款笔数
+        queryMap.put("recordDate", DateUtils.getDayBegin());
+        queryMap.put("retype", "1");
+        totalOrderCount = merchantProfitService.queryMerchantProfitPageCount(queryMap);
+        todayProfit = merchantProfitService.queryMerchantProfitSumPrice(queryMap);
+
+        //今日新增商户数
+        QueryWrapper<UserApp> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("parentId", queryUserApp.getUserId());
+        queryWrapper.in("merchantAuditStatus", 3, 4);
+        queryWrapper.between("createDt", DateUtils.getDayBegin(), DateUtils.getDayEnd());
+        Integer newMerchantCount = userAppService.getUserAppWithChannelStatus(queryWrapper);
+        resultMap.put("promoteFee", promoteFee + "");
+        resultMap.put("totalOrderCount", totalOrderCount + "");
+        resultMap.put("newMerchantCount", newMerchantCount + "");
+        resultMap.put("todayProfit", todayProfit == null? "0.00": todayProfit + "");
+
+        String currentMonth = DateUtil.format(new Date(), "yyyy-MM");
+
+        MerchantOrderStatistics directTotalCurrentMonth = mosService.getDirectTotal(queryUserApp.getUserId() + "", currentMonth);
+        MerchantOrderStatistics teamTotalCurrentMonth = mosService.getIndirectTotal(queryUserApp.getUserId() + "", currentMonth);
+
+        MerchantOrderStatisticsVO mosVO = new MerchantOrderStatisticsVO();
+        mosVO.setMonthCount((directTotalCurrentMonth.getCount() + teamTotalCurrentMonth.getCount()) + "");
+        mosVO.setDirectMonthTotalFee(directTotalCurrentMonth.getTotalFee());
+        mosVO.setTeamMonthTotalFee(teamTotalCurrentMonth.getTotalFee());
+
+        MerchantOrderStatistics directTotal = mosService.getDirectTotal(queryUserApp.getUserId() + "", null);
+        MerchantOrderStatistics teamTotal = mosService.getIndirectTotal(queryUserApp.getUserId() + "", null);
+        mosVO.setCount(directTotal.getCount() + teamTotal.getCount());
+        mosVO.setDirectTotalFee(directTotal.getTotalFee());
+        mosVO.setTeamTotalFee(teamTotal.getTotalFee());
+
+        resultMap.put("merchStatistics", mosVO);
+
+        return resultMap;
+    }
+
+    @Override
+    public Map<String, Object> getHomeData(String userId) {
+        return null;
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/appGuide/AppGuideService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/appGuide/AppGuideService.java
new file mode 100644
index 0000000..92986d2
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/appGuide/AppGuideService.java
@@ -0,0 +1,28 @@
+package cn.pluss.platform.appGuide;
+
+import cn.pluss.platform.entity.AppGuide;
+import cn.pluss.platform.mapper.AppGuideMapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * app引导页 服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-06-03
+ */
+public interface AppGuideService extends IService<AppGuide> {
+
+    /**
+     * 根据code获取内容
+     * @param code  页面code
+     * @return      数据
+     */
+    default AppGuide getByCode(String code) {
+        QueryWrapper<AppGuide> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("code", code);
+        return getBaseMapper().selectOne(queryWrapper);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/appGuide/impl/AppGuideServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/appGuide/impl/AppGuideServiceImpl.java
new file mode 100644
index 0000000..8a238a1
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/appGuide/impl/AppGuideServiceImpl.java
@@ -0,0 +1,20 @@
+package cn.pluss.platform.appGuide.impl;
+
+import cn.pluss.platform.appGuide.AppGuideService;
+import cn.pluss.platform.entity.AppGuide;
+import cn.pluss.platform.mapper.AppGuideMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * app引导页 服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-06-03
+ */
+@Service
+public class AppGuideServiceImpl extends ServiceImpl<AppGuideMapper, AppGuide> implements AppGuideService {
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/appMenuUserType/AppMenuUserTypeService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/appMenuUserType/AppMenuUserTypeService.java
new file mode 100644
index 0000000..5b27db6
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/appMenuUserType/AppMenuUserTypeService.java
@@ -0,0 +1,7 @@
+package cn.pluss.platform.appMenuUserType;
+
+import cn.pluss.platform.entity.AppMenuUserType;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+public interface AppMenuUserTypeService extends IService<AppMenuUserType> {
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/appMenuUserType/impl/AppMenuUserTypeServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/appMenuUserType/impl/AppMenuUserTypeServiceImpl.java
new file mode 100644
index 0000000..169416d
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/appMenuUserType/impl/AppMenuUserTypeServiceImpl.java
@@ -0,0 +1,11 @@
+package cn.pluss.platform.appMenuUserType.impl;
+
+import cn.pluss.platform.appMenuUserType.AppMenuUserTypeService;
+import cn.pluss.platform.entity.AppMenuUserType;
+import cn.pluss.platform.mapper.AppMenuUserTypeMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service
+public class AppMenuUserTypeServiceImpl extends ServiceImpl<AppMenuUserTypeMapper, AppMenuUserType> implements AppMenuUserTypeService {
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/appVersionInfo/AppVersionInfoService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/appVersionInfo/AppVersionInfoService.java
new file mode 100644
index 0000000..930ceab
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/appVersionInfo/AppVersionInfoService.java
@@ -0,0 +1,9 @@
+package cn.pluss.platform.appVersionInfo;
+
+import cn.pluss.platform.entity.AppVersionInfo;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+public interface AppVersionInfoService extends IService<AppVersionInfo> {
+    Page<AppVersionInfo> pageData(Page<AppVersionInfo> page, AppVersionInfo appVersionInfo);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/appVersionInfo/impl/AppVersionInfoServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/appVersionInfo/impl/AppVersionInfoServiceImpl.java
new file mode 100644
index 0000000..fb9ac2d
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/appVersionInfo/impl/AppVersionInfoServiceImpl.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.appVersionInfo.impl;
+
+import cn.pluss.platform.appVersionInfo.AppVersionInfoService;
+import cn.pluss.platform.entity.AppVersionInfo;
+import cn.pluss.platform.mapper.AppVersionInfoMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service
+public class AppVersionInfoServiceImpl extends ServiceImpl<AppVersionInfoMapper, AppVersionInfo> implements AppVersionInfoService {
+    @Override
+    public Page<AppVersionInfo> pageData(Page<AppVersionInfo> page, AppVersionInfo appVersionInfo) {
+        return baseMapper.pageData(page,appVersionInfo);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/appletInfo/AppletInfoService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/appletInfo/AppletInfoService.java
new file mode 100644
index 0000000..da5dbe0
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/appletInfo/AppletInfoService.java
@@ -0,0 +1,22 @@
+package cn.pluss.platform.appletInfo;
+
+import cn.pluss.platform.entity.AppletInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 小程序配置信息 服务类
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-04-20
+ */
+public interface AppletInfoService extends IService<AppletInfo> {
+
+    /**
+     * 根据appid 获取小程序配置信息
+     * @param appid
+     * @return
+     */
+    AppletInfo getAppletInfoByAppId(String appid);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/appletInfo/impl/AppletInfoServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/appletInfo/impl/AppletInfoServiceImpl.java
new file mode 100644
index 0000000..06008a8
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/appletInfo/impl/AppletInfoServiceImpl.java
@@ -0,0 +1,29 @@
+package cn.pluss.platform.appletInfo.impl;
+
+import cn.pluss.platform.appletInfo.AppletInfoService;
+import cn.pluss.platform.entity.AppletInfo;
+import cn.pluss.platform.mapper.AppletInfoMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 小程序配置信息 服务实现类
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-04-20
+ */
+@Service
+public class AppletInfoServiceImpl extends ServiceImpl<AppletInfoMapper, AppletInfo> implements AppletInfoService {
+
+    /**
+     * 获取小程序配置信息
+     * @param appid
+     * @return
+     */
+    @Override
+    public AppletInfo getAppletInfoByAppId(String appid) {
+        return baseMapper.getAppletInfoByAppId(appid);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/area/AreaService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/area/AreaService.java
new file mode 100644
index 0000000..6e5f5e7
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/area/AreaService.java
@@ -0,0 +1,27 @@
+package cn.pluss.platform.area;
+
+import java.util.List;
+import java.util.Map;
+
+import cn.pluss.platform.entity.Area;
+import cn.pluss.platform.leshua.LeshuaArea;
+
+public interface AreaService {
+
+    public LeshuaArea queryArea(Area area);
+
+    public List<LeshuaArea> queryAreaList(Area area);
+
+    public void saveArea(Area area);
+
+    public void updateArea(Area area);
+
+    public void deleteArea(Area area);
+
+    public List<LeshuaArea> queryAreaPage(Map map);
+
+    public Integer queryAreaPageCount(Map map);
+
+    public void saveAreaBatch(List<Area> areaList);
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/area/impl/AreaServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/area/impl/AreaServiceImpl.java
new file mode 100644
index 0000000..661f333
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/area/impl/AreaServiceImpl.java
@@ -0,0 +1,60 @@
+package cn.pluss.platform.area.impl;
+
+import java.util.List;
+import java.util.Map;
+import org.springframework.transaction.annotation.Transactional;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import cn.pluss.platform.entity.Area;
+import cn.pluss.platform.leshua.LeshuaArea;
+import cn.pluss.platform.area.AreaService;
+import cn.pluss.platform.mapper.AreaMapper;
+
+@Transactional
+@Service("areaService")
+public class AreaServiceImpl  implements AreaService{
+
+	 private static final Logger logger = LoggerFactory.getLogger( AreaServiceImpl.class);
+
+
+    @Autowired
+	  private AreaMapper areaMapper;
+
+    @Override
+    public LeshuaArea queryArea(Area area){
+        return areaMapper.queryArea(area);
+    }
+
+    @Override
+    public List<LeshuaArea> queryAreaList(Area area){
+        return areaMapper.queryAreaList(area);
+    }
+    @Override
+    public void saveArea(Area area){
+          areaMapper.saveArea(area);
+    }
+    @Override
+    public void updateArea(Area area){
+        areaMapper.updateArea(area);
+    }
+    @Override
+    public void deleteArea(Area area){
+        areaMapper.deleteArea(area);
+    }
+    @Override
+    public List<LeshuaArea> queryAreaPage(Map map){
+        return areaMapper.queryAreaPage(map);
+    }
+    @Override
+    public Integer queryAreaPageCount(Map map){
+        return areaMapper.queryAreaPageCount(map);
+    }
+    @Override
+    public void saveAreaBatch(List<Area> areaList) {
+         areaMapper.saveAreaBatch(areaList);
+    }
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/areaCity/AreaCityService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/areaCity/AreaCityService.java
new file mode 100644
index 0000000..2ae59ac
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/areaCity/AreaCityService.java
@@ -0,0 +1,49 @@
+package cn.pluss.platform.areaCity;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.entity.AreaCity;
+import com.alibaba.fastjson.JSONObject;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: bzg
+ * @time: 2021/7/16 10:59
+ *
+ * @deprecated 请使用 tb_pluss_region_code_ls 表中的数据
+ */
+@Deprecated
+public interface AreaCityService {
+    /**
+     * 条件查询
+     *
+     * @return cn.pluss.platform.api.Result<org.json.JSONObject>
+     * @date: 2021/7/16 9:57
+     */
+    Result<JSONObject> getAreaCodeByName(JSONObject params);
+
+    /**
+     * 递归查询所有省市区数据
+     *
+     * @return java.util.List<cn.pluss.platform.entity.AreaCity>
+     * @date: 2022/2/25 10:31
+     */
+    List<AreaCity> queryProvince();
+
+    /**
+     * 查询所省份
+     *
+     * @date: 2022/2/25 10:32
+     */
+    List<AreaCity> queryOnlyProvince();
+
+    /**
+     * 查询下级区域信息
+     *
+     * @param areaCode:
+     * @return java.util.List<cn.pluss.platform.entity.AreaCity>
+     * @date: 2022/2/25 11:04
+     */
+    List<AreaCity> queryParentCode(String areaCode);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/areaCity/impl/AreaCityServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/areaCity/impl/AreaCityServiceImpl.java
new file mode 100644
index 0000000..367eaa4
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/areaCity/impl/AreaCityServiceImpl.java
@@ -0,0 +1,82 @@
+package cn.pluss.platform.areaCity.impl;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.areaCity.AreaCityService;
+import cn.pluss.platform.entity.AreaCity;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.AreaCityMapper;
+import cn.pluss.platform.util.StringUtil;
+import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+/**
+ *
+ * @description:
+ * @author: Administrator
+ * @DATE: 2021/7/16 11:03
+ *
+ */
+@Service
+@Slf4j
+public class AreaCityServiceImpl implements AreaCityService {
+
+    @Resource
+    private AreaCityMapper areaCityMapper;
+
+    /**
+     *  String provinceName, String cityName, String areaName,String type
+     * @date: 2021/7/23 15:03
+     * @return cn.pluss.platform.api.Result<com.alibaba.fastjson.JSONObject>
+     */
+    @Override
+    public Result<JSONObject> getAreaCodeByName(JSONObject params) {
+        MsgException.checkBlank(params.getString("provinceName"),"缺失参数provinceName");
+        MsgException.checkBlank(params.getString("cityName"),"缺失参数cityName");
+        String type = StringUtil.isEmpty(params.getString("type")) ? "1" : params.getString("type");
+        Map<String, String> areaCodeMap = areaCityMapper.getAreaCodeByName(params.getString("provinceName"),
+                params.getString("cityName"), params.getString("areaName"),type);
+        if(areaCodeMap != null){
+            JSONObject result = new JSONObject(3);
+            result.putAll(areaCodeMap);
+            return ResultGenerator.genSuccessResult("获取成功",result);
+        }
+        return ResultGenerator.genSuccessResult("获取成功",null);
+    }
+
+    /**
+     * 递归查询所有省市区数据
+     * @date: 2022/2/25 10:33
+     * @return java.util.List<cn.pluss.platform.entity.AreaCity>
+     */
+    @Override
+    public List<AreaCity> queryProvince() {
+        return areaCityMapper.queryProvince();
+    }
+    
+    /**
+     * 查询所省份
+     * @date: 2022/2/25 10:33
+     * @return java.util.List<cn.pluss.platform.entity.AreaCity>
+     */
+    @Override
+    public List<AreaCity> queryOnlyProvince() {
+        return areaCityMapper.queryOnlyProvince();
+    }
+
+    /**
+     * queryParentCode
+     * @date: 2022/2/25 11:04
+     * @param areaCode:
+     * @return java.util.List<cn.pluss.platform.entity.AreaCity>
+     */
+    @Override
+    public List<AreaCity> queryParentCode(String areaCode) {
+        return areaCityMapper.queryParentCode(areaCode);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/baidu/BaiduFaceDetectService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/baidu/BaiduFaceDetectService.java
new file mode 100644
index 0000000..427f2c5
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/baidu/BaiduFaceDetectService.java
@@ -0,0 +1,32 @@
+package cn.pluss.platform.baidu;
+
+/**
+ * @author DJH
+ */
+public interface BaiduFaceDetectService {
+
+    /**
+     *
+     * 人脸识别获取accessToken
+     *
+     * @author Administrator
+     * @return
+     * @since JDK 1.8
+     */
+    String getAuth();
+
+    String apiGetAuth();
+
+    /**
+     * 目标图片与源图片做图片对比
+     * @param src 源图片，这里指进件身份证图片，base64
+     * @param dist 目标图片, 这里指待对比的图片，base64
+     */
+    void checkFaceMatch(String src, String dist);
+
+    /**
+     *
+     * @param dist base64图片
+     */
+    void apiCheckFaceMatch(String dist);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/baidu/BaiduOCRService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/baidu/BaiduOCRService.java
new file mode 100644
index 0000000..f7e300f
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/baidu/BaiduOCRService.java
@@ -0,0 +1,35 @@
+package cn.pluss.platform.baidu;
+
+/**
+ * @author yuchen
+ * 
+ * @Description 
+ */
+public interface BaiduOCRService {
+	
+	/**
+	 * 
+	 * OCR识别获取accessToken
+	 * 
+	 * @author Administrator
+	 * @return 
+	 * @since JDK 1.8
+	 */
+	String  getAuth();
+	
+	/**
+	 * 
+	 * getInfo:(获取身份证或银行卡信息). <br/> 
+	 * 
+	 * @author Administrator 
+	 * @param url
+	 * @param accessToken
+	 * @param param
+	 * @return 
+	 * @since JDK 1.8
+	 */
+	String getInfo(String url,String accessToken,String param);
+	
+
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/baidu/impl/BaiduFaceDetectServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/baidu/impl/BaiduFaceDetectServiceImpl.java
new file mode 100644
index 0000000..23ae67c
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/baidu/impl/BaiduFaceDetectServiceImpl.java
@@ -0,0 +1,162 @@
+package cn.pluss.platform.baidu.impl;
+
+import cn.pluss.platform.IdCardService;
+import cn.pluss.platform.baidu.BaiduFaceDetectService;
+import cn.pluss.platform.entity.IdCard;
+import cn.pluss.platform.entity.OperationRecord;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.entity.UserInfo;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.merchant.AccountService;
+import cn.pluss.platform.operationRecord.OperationRecordService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.userInfo.UserInfoService;
+import cn.pluss.platform.util.DateUtils;
+import cn.pluss.platform.util.FileUtil;
+import cn.pluss.platform.util.HttpUtil;
+import cn.pluss.platform.util.ParametersUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.alipay.api.java_websocket.util.Base64;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.extern.slf4j.Slf4j;
+import net.coobird.thumbnailator.Thumbnails;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
+
+import javax.xml.bind.DatatypeConverter;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.math.BigDecimal;
+
+/**
+ *
+ * @author DJH
+ */
+@Slf4j
+@Service
+public class BaiduFaceDetectServiceImpl implements BaiduFaceDetectService {
+
+    @Autowired
+    private RestTemplate restTemplate;
+    
+    @Autowired
+    private UserAppService uaService;
+
+    @Autowired
+    private UserInfoService uiService;
+
+    @Autowired
+    private IdCardService idCardService;
+
+    @Autowired
+    private OperationRecordService opService;
+
+    @Override
+    public String getAuth() {
+        String baiduApiKey = ParametersUtil.baiduAK2;
+        String baiduSecretKey = ParametersUtil.baiduSK2;
+        String authHost = "https://aip.baidubce.com/oauth/2.0/token?";
+        String getAccessTokenUrl = authHost + "grant_type=client_credentials" + "&client_id=" + baiduApiKey + "&client_secret=" + baiduSecretKey;
+        return HttpUtil.baiduGET(getAccessTokenUrl);
+    }
+
+    @Override
+    public String apiGetAuth() {
+        final UserApp tokenUa = uaService.queryUserAppByToken();
+        faceCertCheck(tokenUa);
+
+        return getAuth();
+    }
+
+    /**
+     * 人脸识别请求前的校验
+     * @return
+     */
+    private void faceCertCheck(UserApp tokenUa) {
+        LambdaQueryWrapper<OperationRecord> qWrapper2 = Wrappers.lambdaQuery();
+        qWrapper2.eq(OperationRecord::getUserId, tokenUa.getUserId());
+        qWrapper2.in(OperationRecord::getDictValue, "APP_FACE_CERT");
+        qWrapper2.between(OperationRecord::getCreateTime, DateUtils.getDayBegin(), DateUtils.getDayEnd());
+        final int faceCertCount = opService.count(qWrapper2);
+        if (faceCertCount >= 3) {
+            throw new MsgException("人脸认证次数超限，请明天再试");
+        }
+
+        LambdaQueryWrapper<OperationRecord> qWrapper = Wrappers.lambdaQuery();
+        qWrapper.eq(OperationRecord::getUserId, tokenUa.getUserId());
+        qWrapper.in(OperationRecord::getDictValue, "BAIDU_ACCESS_TOKEN");
+        qWrapper.between(OperationRecord::getCreateTime, DateUtils.getDayBegin(), DateUtils.getDayEnd());
+        final int reqAccessTokenCount = opService.count(qWrapper);
+        if (reqAccessTokenCount >= 10) {
+            throw new MsgException("人脸认证次数超限，请明天再试");
+        }
+    }
+
+    @Override
+    public void checkFaceMatch(String src, String dist) {
+        String url = "https://aip.baidubce.com/rest/2.0/face/v4/mingjing/match";
+        final String accessToken = getAuth();
+        url += "?access_token=" + accessToken;
+
+        JSONObject param = new JSONObject();
+        param.put("image", src);
+        param.put("image_type", "URL");
+        param.put("face_type", "CERT");
+        param.put("register_image", dist);
+        param.put("register_face_type", "LIVE");
+        param.put("register_liveness_control", "NONE");
+
+
+        final JSONObject result = restTemplate.postForObject(url, param, JSONObject.class);
+        if (result == null) {
+            throw new MsgException("人脸对比不通过");
+        }
+
+        log.info("result : " + result);
+
+        final JSONObject result1 = result.getJSONObject("result");
+        if (result1 == null) {
+            throw new MsgException("人脸对比不通过");
+        }
+
+        final BigDecimal score = result1.getBigDecimal("score");
+
+        if (score.compareTo(BigDecimal.valueOf(80L)) <= 0) {
+            throw new MsgException("人脸对比不通过");
+        }
+    }
+
+    @Override
+    public void apiCheckFaceMatch(String dist) {
+        final UserApp tokenUa = uaService.queryUserAppByToken();
+        faceCertCheck(tokenUa);
+        final IdCard certIdCard = idCardService.getCertIdCard(tokenUa.getUserId());
+        final String imgPositive = certIdCard.getImgPositive();
+
+        byte[] bytes = DatatypeConverter.parseBase64Binary(dist);
+        ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
+
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        try {
+            Thumbnails.of(bais).size(1920, 1080).toOutputStream(baos);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+
+        dist = DatatypeConverter.printBase64Binary(baos.toByteArray());
+
+        checkFaceMatch(imgPositive, dist);
+
+        UserInfo userInfo = new UserInfo();
+        userInfo.setId(tokenUa.getUserId());
+        userInfo.setFaceCert("1");
+        userInfo.setFaceCompare("1");
+
+        uiService.updateById(userInfo);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/baidu/impl/BaiduOCRServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/baidu/impl/BaiduOCRServiceImpl.java
new file mode 100644
index 0000000..db18d12
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/baidu/impl/BaiduOCRServiceImpl.java
@@ -0,0 +1,43 @@
+package cn.pluss.platform.baidu.impl;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+
+import cn.pluss.platform.baidu.BaiduOCRService;
+import cn.pluss.platform.util.HttpUtil;
+import cn.pluss.platform.util.ParametersUtil;
+
+/**
+ * @author yuchen
+ * @Description
+ */
+@Transactional
+@Service("baiduOCRService")
+public class BaiduOCRServiceImpl implements BaiduOCRService {
+    //https://ai.baidu.com/docs#/OCR-API-Idcard/top 此文档地址
+
+    @Override
+    public String getInfo(String url, String accessToken, String params) {
+        try {
+            String baiduPOST = HttpUtil.baiduPOST(url, accessToken, params);
+            return baiduPOST;
+        } catch (Exception e) {
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return null;
+        }
+    }
+
+    @Override
+    public String getAuth() {
+        String baiduApiKey = ParametersUtil.baiduAK;
+        String baiduSecretKey = ParametersUtil.baiduSK;
+        String authHost = "https://aip.baidubce.com/oauth/2.0/token?";
+        //固定值               //2. 官网获取的 API Key   // 3. 官网获取的 Secret Key
+        String getAccessTokenUrl = authHost + "grant_type=client_credentials" + "&client_id=" + baiduApiKey + "&client_secret=" + baiduSecretKey;
+        return HttpUtil.baiduGET(getAccessTokenUrl);
+    }
+
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/bankUnionpayCode/BankUnionpayCodeService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/bankUnionpayCode/BankUnionpayCodeService.java
new file mode 100644
index 0000000..e8aafdb
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/bankUnionpayCode/BankUnionpayCodeService.java
@@ -0,0 +1,25 @@
+package cn.pluss.platform.bankUnionpayCode;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
+import cn.pluss.platform.leshua.BankNameVO;
+
+public interface BankUnionpayCodeService {
+    
+    /**
+     * 
+     * getBranchName:(根据省市 银行名称 查询支行). <br/> 
+     * 
+     * @author Administrator 
+     * @param areaCode
+     * @param provinceCode
+     * @param bankName
+     * @return 
+     * @since JDK 1.8
+     */
+    List<BankNameVO> getBranchName(@Param(value = "areaCode") String areaCode, @Param(value = "provinceCode") String provinceCode, @Param(value = "bankName") String bankName, @Param(value = "brankName") String brankName);
+    
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/bankUnionpayCode/impl/BankUnionpayCodeServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/bankUnionpayCode/impl/BankUnionpayCodeServiceImpl.java
new file mode 100644
index 0000000..acae309
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/bankUnionpayCode/impl/BankUnionpayCodeServiceImpl.java
@@ -0,0 +1,24 @@
+package cn.pluss.platform.bankUnionpayCode.impl;
+
+import cn.pluss.platform.bankUnionpayCode.BankUnionpayCodeService;
+import cn.pluss.platform.leshua.BankNameVO;
+import cn.pluss.platform.mapper.BankCodeSxfMapper;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Transactional
+@RequiredArgsConstructor
+@Service("bankUnionpayCodeService")
+public class BankUnionpayCodeServiceImpl implements BankUnionpayCodeService {
+
+    private final BankCodeSxfMapper bankCodeSxfMapper;
+
+    @Override
+    public List<BankNameVO> getBranchName(String areaCode, String provinceCode, String bankName, String branchName) {
+        return bankCodeSxfMapper.getBranchName(areaCode, provinceCode, bankName, branchName);
+    }
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/banner/BannerService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/banner/BannerService.java
new file mode 100644
index 0000000..59d9b50
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/banner/BannerService.java
@@ -0,0 +1,26 @@
+package cn.pluss.platform.banner;
+
+import java.util.List;
+import java.util.Map;
+import cn.pluss.platform.entity.Banner;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+public interface BannerService extends IService<Banner> {
+
+    Banner queryBanner(Banner banner);
+
+    List<Banner> queryBannerList(Banner banner);
+
+    void saveBanner(Banner banner);
+
+    void updateBanner(Banner banner);
+
+    void deleteBanner(Banner banner);
+
+    List<Banner> queryBannerPage(Map map);
+
+    Integer queryBannerPageCount(Map map);
+
+    void saveBannerBatch(List<Banner> bannerList);
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/banner/impl/BannerServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/banner/impl/BannerServiceImpl.java
new file mode 100644
index 0000000..4e4ee01
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/banner/impl/BannerServiceImpl.java
@@ -0,0 +1,54 @@
+package cn.pluss.platform.banner.impl;
+
+import java.util.List;
+import java.util.Map;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import cn.pluss.platform.entity.Banner;
+import cn.pluss.platform.banner.BannerService;
+import cn.pluss.platform.mapper.BannerMapper;
+
+@Transactional
+@Service("bannerService")
+public class BannerServiceImpl extends ServiceImpl<BannerMapper, Banner> implements BannerService {
+
+    @Override
+    public Banner queryBanner(Banner banner){
+        return baseMapper.queryBanner(banner);
+    }
+
+    @Override
+    public List<Banner> queryBannerList(Banner banner){
+        return baseMapper.queryBannerList(banner);
+    }
+    @Override
+    public void saveBanner(Banner banner){
+        baseMapper.saveBanner(banner);
+    }
+    @Override
+    public void updateBanner(Banner banner){
+        baseMapper.updateBanner(banner);
+    }
+    @Override
+    public void deleteBanner(Banner banner){
+        baseMapper.deleteBanner(banner);
+    }
+    @Override
+    public List<Banner> queryBannerPage(Map map){
+        return baseMapper.queryBannerPage(map);
+    }
+    @Override
+    public Integer queryBannerPageCount(Map map){
+        return baseMapper.queryBannerPageCount(map);
+    }
+    @Override
+    public void saveBannerBatch(List<Banner> bannerList) {
+        baseMapper.saveBannerBatch(bannerList);
+    }
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/bestNewActivity/BestNewActivityService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/bestNewActivity/BestNewActivityService.java
new file mode 100644
index 0000000..3813502
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/bestNewActivity/BestNewActivityService.java
@@ -0,0 +1,25 @@
+package cn.pluss.platform.bestNewActivity;
+
+import java.util.List;
+import java.util.Map;
+import cn.pluss.platform.entity.BestNewActivity;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+public interface BestNewActivityService extends IService<BestNewActivity> {
+
+    BestNewActivity queryBestNewActivity(BestNewActivity bestNewActivity);
+
+    List<BestNewActivity> queryBestNewActivityList(BestNewActivity bestNewActivity);
+
+    void saveBestNewActivity(BestNewActivity bestNewActivity);
+
+    void updateBestNewActivity(BestNewActivity bestNewActivity);
+
+    void deleteBestNewActivity(BestNewActivity bestNewActivity);
+
+    List<BestNewActivity> queryBestNewActivityPage(Map map);
+
+    Integer queryBestNewActivityPageCount(Map map);
+
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/bestNewActivity/impl/BestNewActivityServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/bestNewActivity/impl/BestNewActivityServiceImpl.java
new file mode 100644
index 0000000..5bd7a5e
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/bestNewActivity/impl/BestNewActivityServiceImpl.java
@@ -0,0 +1,67 @@
+package cn.pluss.platform.bestNewActivity.impl;
+
+import java.util.List;
+import java.util.Map;
+
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.userApp.UserAppService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import cn.pluss.platform.entity.BestNewActivity;
+import cn.pluss.platform.bestNewActivity.BestNewActivityService;
+import cn.pluss.platform.mapper.BestNewActivityMapper;
+
+@Transactional
+@Service("bestNewActivityService")
+public class BestNewActivityServiceImpl extends ServiceImpl<BestNewActivityMapper, BestNewActivity> implements BestNewActivityService {
+
+    @Autowired
+    private UserAppService userAppService;
+
+    @Autowired
+    private BestNewActivityMapper bestNewActivityMapper;
+
+    @Override
+    public BestNewActivity queryBestNewActivity(BestNewActivity bestNewActivity) {
+        return bestNewActivityMapper.queryBestNewActivity(bestNewActivity);
+    }
+
+    @Override
+    public List<BestNewActivity> queryBestNewActivityList(BestNewActivity bestNewActivity) {
+        return bestNewActivityMapper.queryBestNewActivityList(bestNewActivity);
+    }
+
+    @Override
+    public void saveBestNewActivity(BestNewActivity bestNewActivity) {
+        bestNewActivityMapper.saveBestNewActivity(bestNewActivity);
+    }
+
+    @Override
+    public void updateBestNewActivity(BestNewActivity bestNewActivity) {
+        bestNewActivityMapper.updateBestNewActivity(bestNewActivity);
+    }
+
+    @Override
+    public void deleteBestNewActivity(BestNewActivity bestNewActivity) {
+        bestNewActivityMapper.deleteBestNewActivity(bestNewActivity);
+    }
+
+    @Override
+    public List<BestNewActivity> queryBestNewActivityPage(Map map) {
+        try {
+            UserApp userApp = userAppService.queryUserAppByToken();
+            map.put("userId", userApp.getUserId());
+        } catch (Exception ignored) {
+        }
+        return bestNewActivityMapper.queryBestNewActivityPage(map);
+    }
+
+    @Override
+    public Integer queryBestNewActivityPageCount(Map map) {
+        return bestNewActivityMapper.queryBestNewActivityPageCount(map);
+    }
+
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/bill/BillSendRecordService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/bill/BillSendRecordService.java
new file mode 100644
index 0000000..5b06fdd
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/bill/BillSendRecordService.java
@@ -0,0 +1,39 @@
+package cn.pluss.platform.bill;
+
+import cn.pluss.platform.entity.BillSendRecord;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-05-10
+ */
+public interface BillSendRecordService extends IService<BillSendRecord> {
+
+
+    /**
+     * 请求生成账单并发送邮件
+     * @param entity
+     */
+    void reqBill(BillSendRecord entity);
+
+
+
+    /**
+     * 生成账单excel
+     * @param entity
+     * @return  账单workBook对象
+     */
+    XSSFWorkbook createBill(BillSendRecord entity);
+
+    /**
+     * 将账单发送到指定邮箱
+     * @param entity
+     * @param workbook
+     */
+    void sendBill(BillSendRecord entity, XSSFWorkbook workbook);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/bill/MemberTransStatisticsService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/bill/MemberTransStatisticsService.java
new file mode 100644
index 0000000..6eca429
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/bill/MemberTransStatisticsService.java
@@ -0,0 +1,92 @@
+package cn.pluss.platform.bill;
+
+import cn.hutool.core.date.DateUtil;
+import cn.pluss.platform.entity.MemberTransStatistics;
+import cn.pluss.platform.mapper.MemberTransStatisticsMapper;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * <p>
+ * 会员消费日记录 服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-03-17
+ */
+public interface MemberTransStatisticsService extends IService<MemberTransStatistics> {
+
+    /**
+     * 保存指定日期的账单总计统计
+     * @param day   日期格式为 yyyy-MM-dd
+     */
+    default void saveDaysBill(String day) {
+        ((MemberTransStatisticsMapper) getBaseMapper()).insertDuringBill(day, day);
+    }
+
+    /**
+     * 查询当日/当周/当月的账单
+     * @param condition
+     * @return
+     */
+    default MemberTransStatistics currentDuringBill(MemberTransStatistics condition) {
+        Date currentDate = new Date();
+        Date startDate;
+        Date endDate;
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+
+        switch (condition.getType()) {
+            case 2:
+                // 当周周一
+                startDate = DateUtil.beginOfWeek(currentDate).toJdkDate();
+                endDate = DateUtil.endOfWeek(currentDate);
+                break;
+            case 3:
+                // 当月一号
+                startDate = DateUtil.beginOfMonth(currentDate).toJdkDate();
+                endDate = DateUtil.endOfMonth(currentDate);
+                break;
+            case 4:
+                // 当年一号
+                startDate = DateUtil.beginOfYear(currentDate).toJdkDate();
+                endDate = DateUtil.endOfYear(currentDate);
+                break;
+            default:
+                // 当天开始时间
+                startDate = DateUtil.beginOfDay(currentDate).toJdkDate();
+                endDate = startDate;
+                break;
+        }
+
+        MemberTransStatistics result = ((MemberTransStatisticsMapper) getBaseMapper()).selectOneDuringBill(sdf.format(startDate), sdf.format(endDate), condition.getUserId().toString());
+
+        if (result == null) {
+            result = new MemberTransStatistics();
+        }
+
+        if (result.getConsumeAmount() == null) {
+            result.setConsumeAmount(BigDecimal.ZERO);
+        } else {
+            result.setConsumeAmount(result.getConsumeAmount().setScale(2, RoundingMode.HALF_UP));
+        }
+
+        if (result.getGiveAmount() == null) {
+            result.setGiveAmount(BigDecimal.ZERO);
+        } else {
+            result.setGiveAmount(result.getGiveAmount().setScale(2, RoundingMode.HALF_UP));
+        }
+
+        if (result.getRechargeAmount() == null) {
+            result.setRechargeAmount(BigDecimal.ZERO);
+        } else {
+            result.setRechargeAmount(result.getRechargeAmount().setScale(2, RoundingMode.HALF_UP));
+        }
+
+        return result;
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/bill/MerchantBillStatisticsService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/bill/MerchantBillStatisticsService.java
new file mode 100644
index 0000000..7154465
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/bill/MerchantBillStatisticsService.java
@@ -0,0 +1,25 @@
+package cn.pluss.platform.bill;
+
+import cn.pluss.platform.entity.MerchantBillStatistics;
+import cn.pluss.platform.mapper.MerchantBillStatisticsMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 按日统计商户的账单 服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-03-11
+ */
+public interface MerchantBillStatisticsService extends IService<MerchantBillStatistics> {
+
+    /**
+     * 保存指定日期的账单总计统计
+     * @param day   日期格式为 yyyy-MM-dd
+     */
+    default void saveDaysBill(String day) {
+        ((MerchantBillStatisticsMapper) getBaseMapper()).insertDuringBill(day, day);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/bill/impl/BillSendRecordServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/bill/impl/BillSendRecordServiceImpl.java
new file mode 100644
index 0000000..a82bcbd
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/bill/impl/BillSendRecordServiceImpl.java
@@ -0,0 +1,205 @@
+package cn.pluss.platform.bill.impl;
+
+import cn.pluss.platform.bill.BillSendRecordService;
+import cn.pluss.platform.entity.BillSendRecord;
+import cn.pluss.platform.entity.MerchantBaseInfo;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.export.BillStatisticsService;
+import cn.pluss.platform.mapper.BillSendRecordMapper;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.service.EmailService;
+import cn.pluss.platform.task.BillStatisticsHandler;
+import cn.pluss.platform.userApp.UserAppService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.Setter;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-05-10
+ */
+@Service
+public class BillSendRecordServiceImpl extends ServiceImpl<BillSendRecordMapper, BillSendRecord> implements BillSendRecordService {
+
+
+    /**
+     * 电子邮箱格式校验正则
+     */
+    public final static String EMAIL_REG = "^([a-z0-9A-Z]+[-|\\.]?)+[a-z0-9A-Z]@([a-z0-9A-Z]+(-[a-z0-9A-Z]+)?\\.)+[a-zA-Z]{2,}$";
+
+    /**
+     * 最大目标邮箱个数
+     */
+    public final static int MAX_EMAIL_TARGET = 3;
+
+    /**
+     * 一天最大生成报表次数
+     */
+    public final static int MAX_EMAIL_DAY_COUNT = 3;
+
+    /**
+     * 报表生成最低间隔时间
+     */
+    public final static Long MIN_DURING = 60 * 1000L;
+
+    @Setter(onMethod_ = {@Autowired})
+    private BillStatisticsService billStatisticsService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private EmailService emailService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private UserAppService userAppService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantBaseInfoService merchantBaseInfoService;
+
+    @Setter(onMethod_ = {@Autowired, @Lazy})
+    private BillStatisticsHandler billStatisticsHandler;
+
+    @Override
+    public void reqBill(BillSendRecord entity) {
+        if (entity.getUserId() == null) {
+            throw new MsgException("缺少用户id");
+        }
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        Date currentDate = new Date();
+        String currentDateStr = sdf.format(currentDate);
+
+        if (entity.getStartTime() == null) {
+            throw new MsgException("缺少开始时间");
+        }
+
+        String startDate = sdf.format(entity.getEndTime());
+
+        if (startDate.compareTo(currentDateStr) > 0) {
+            throw new MsgException("非法的开始时间");
+        }
+
+        // 将起始时间设置为一天的开始
+        Calendar instance = Calendar.getInstance();
+        instance.setTime(entity.getStartTime());
+        instance.set(Calendar.HOUR_OF_DAY, 0);
+        instance.set(Calendar.MINUTE, 0);
+        instance.set(Calendar.SECOND, 0);
+        instance.set(Calendar.MILLISECOND, 0);
+        entity.setStartTime(instance.getTime());
+
+        if (entity.getEndTime() == null) {
+            throw new MsgException("缺少截止时间");
+        }
+
+
+        String endDate = sdf.format(entity.getEndTime());
+
+        if (endDate.compareTo(currentDateStr) >= 0) {
+            entity.setEndTime(currentDate);
+        }
+
+        if (entity.getEmail() == null) {
+            throw new MsgException("缺少目标邮箱");
+        }
+
+        Pattern p = Pattern.compile(EMAIL_REG);
+
+        String[] split = entity.getEmail().split(",");
+        if (split.length > MAX_EMAIL_TARGET) {
+            throw new MsgException("最多指定三个邮箱");
+        }
+
+        for (String email: split) {
+            Matcher matcher = p.matcher(email);
+            if (!matcher.matches()) {
+                throw new MsgException("存在不合法邮箱，请检查邮箱格式是否正确");
+            }
+        }
+
+
+        UserApp userApp = userAppService.queryUserAppByToken();
+        if (!entity.getUserId().equals(userApp.getUserId())) {
+            throw new MsgException("拒绝访问");
+        }
+
+        String date = sdf.format(currentDate);
+
+        // 报表次数限制
+        QueryWrapper<BillSendRecord> queryWrapper1 = new QueryWrapper<>();
+        queryWrapper1.eq("userId", entity.getUserId());
+        queryWrapper1.likeRight("createTime", date);
+        Integer todayCount = baseMapper.selectCount(queryWrapper1);
+        if (todayCount >= MAX_EMAIL_DAY_COUNT) {
+            throw new MsgException("账单报表一天只能生成3次");
+        }
+
+        // 报表时间间隔
+        QueryWrapper<BillSendRecord> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("userId", entity.getUserId());
+        queryWrapper.orderByDesc("createTime");
+        queryWrapper.last("limit 1");
+        BillSendRecord one = getOne(queryWrapper);
+        if (one != null) {
+            long during = System.currentTimeMillis() - one.getCreateTime().getTime();
+            if (during < MIN_DURING) {
+                throw new MsgException("操作过于频繁, 请于一分钟后再操作");
+            }
+        }
+
+        entity.setStatus("0");
+        save(entity);
+
+        billStatisticsHandler.execute(entity);
+    }
+
+    @Override
+    public XSSFWorkbook createBill(BillSendRecord entity) {
+        UserApp userApp = new UserApp();
+        userApp.setUserId(entity.getUserId());
+        userApp = userAppService.queryUserApp(userApp);
+
+        String merchantCode = userApp.getMerchantCode();
+        Date startTime = entity.getStartTime();
+        Date endTime= entity.getEndTime();
+
+        XSSFWorkbook workBook = billStatisticsService.createBillStatisticsSheet(null, merchantCode, startTime, endTime);
+        workBook = billStatisticsService.createBillListSheet(workBook, merchantCode, startTime, endTime);
+        workBook = billStatisticsService.createMemberBillStatisticsSheet(workBook, merchantCode, startTime, endTime);
+        workBook = billStatisticsService.createMemberBillListSheet(workBook, merchantCode, startTime, endTime);
+        workBook = billStatisticsService.createStaffBillStatisticsSheet(workBook, merchantCode, startTime, endTime);
+
+        return workBook;
+    }
+
+    @Override
+    public void sendBill(BillSendRecord entity, XSSFWorkbook workbook) {
+        MerchantBaseInfo merchantBaseInfo = new MerchantBaseInfo();
+        merchantBaseInfo.setUserId(entity.getUserId() + "");
+        merchantBaseInfo = merchantBaseInfoService.queryMerchantBaseInfo(merchantBaseInfo);
+
+        String[] tos = entity.getEmail().split(",");
+        // 抄送邮件设置为自己
+        String[] ccs = new String[]{"caiwu@shouyinbei.com"};
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+
+        String title = merchantBaseInfo.getAlias() + "_" + sdf.format(entity.getStartTime()) + "~" + sdf.format(entity.getEndTime()) + "账单报表";
+        String content = "账单明细，请查看附件";
+
+        emailService.sendEmail(tos, ccs, title, content, workbook, title + ".xlsx");
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/bill/impl/MemberTransStatisticsServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/bill/impl/MemberTransStatisticsServiceImpl.java
new file mode 100644
index 0000000..0b5723d
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/bill/impl/MemberTransStatisticsServiceImpl.java
@@ -0,0 +1,50 @@
+package cn.pluss.platform.bill.impl;
+
+import cn.pluss.platform.bill.MemberTransStatisticsService;
+import cn.pluss.platform.entity.MemberTransStatistics;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.MemberTransStatisticsMapper;
+import cn.pluss.platform.userApp.UserAppService;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.Setter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * <p>
+ * 会员消费日记录 服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-03-17
+ */
+@Service
+public class MemberTransStatisticsServiceImpl extends ServiceImpl<MemberTransStatisticsMapper, MemberTransStatistics> implements MemberTransStatisticsService {
+
+    @Setter(onMethod_ = {@Autowired})
+    private UserAppService userAppService;
+
+    @Resource
+    private HttpServletRequest request;
+
+    @Override
+    public <E extends IPage<MemberTransStatistics>> E page(E page, Wrapper<MemberTransStatistics> queryWrapper) {
+        MemberTransStatistics entity = queryWrapper.getEntity();
+        if (entity.getUserId() == null) {
+            throw new MsgException("缺少userId");
+        }
+
+        UserApp uaBoss = userAppService.getBossUserApp(entity.getUserId(), request.getHeader("merchantCode"));
+        if (uaBoss != null) {
+            entity.setUserId(uaBoss.getUserId().intValue());
+        }
+
+        return super.page(page, queryWrapper);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/bill/impl/MerchantBillStatisticsServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/bill/impl/MerchantBillStatisticsServiceImpl.java
new file mode 100644
index 0000000..abaeb94
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/bill/impl/MerchantBillStatisticsServiceImpl.java
@@ -0,0 +1,52 @@
+package cn.pluss.platform.bill.impl;
+
+import cn.pluss.platform.entity.MerchantBillStatistics;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.MerchantBillStatisticsMapper;
+import cn.pluss.platform.bill.MerchantBillStatisticsService;
+import cn.pluss.platform.userApp.UserAppService;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.Setter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * <p>
+ * 按日统计商户的账单 服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-03-11
+ */
+@Service
+public class MerchantBillStatisticsServiceImpl extends ServiceImpl<MerchantBillStatisticsMapper, MerchantBillStatistics> implements MerchantBillStatisticsService {
+
+    @Setter(onMethod_ = {@Autowired,@Lazy})
+    private UserAppService userAppService;
+
+    @Resource
+    private HttpServletRequest request;
+
+    @Override
+    public <E extends IPage<MerchantBillStatistics>> E page(E page, Wrapper<MerchantBillStatistics> queryWrapper) {
+        MerchantBillStatistics entity = queryWrapper.getEntity();
+        if (entity.getUserId() == null) {
+            throw new MsgException("缺少userId");
+        }
+
+        UserApp uaBoss = userAppService.getBossUserApp(entity.getUserId(), request.getHeader("merchantCode"));
+        if (uaBoss != null) {
+            entity.setUserId(uaBoss.getUserId().intValue());
+        }
+
+        return super.page(page, queryWrapper);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/business/BusinessInfoService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/business/BusinessInfoService.java
new file mode 100644
index 0000000..89cf22d
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/business/BusinessInfoService.java
@@ -0,0 +1,12 @@
+package cn.pluss.platform.business;
+
+import cn.pluss.platform.vo.BusinessInfoVo;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+/**
+ * 业务员相关查询接口
+ */
+public interface BusinessInfoService {
+
+    Page<BusinessInfoVo> pageData(Page<BusinessInfoVo> page, BusinessInfoVo businessInfoVo);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/business/impl/BusinessInfoServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/business/impl/BusinessInfoServiceImpl.java
new file mode 100644
index 0000000..cbdf771
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/business/impl/BusinessInfoServiceImpl.java
@@ -0,0 +1,22 @@
+package cn.pluss.platform.business.impl;
+
+import cn.pluss.platform.business.BusinessInfoService;
+import cn.pluss.platform.mapper.BusinessInfoMapper;
+import cn.pluss.platform.vo.BusinessInfoVo;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@RequiredArgsConstructor
+@Service
+public class BusinessInfoServiceImpl implements BusinessInfoService {
+
+    @Autowired
+    private BusinessInfoMapper businessInfoMapper;
+
+    @Override
+    public Page<BusinessInfoVo> pageData(Page<BusinessInfoVo> page, BusinessInfoVo businessInfoVo) {
+        return businessInfoMapper.selectPage(page, businessInfoVo);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/cacheInfo/CacheInfoService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/cacheInfo/CacheInfoService.java
new file mode 100644
index 0000000..a3bf43b
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/cacheInfo/CacheInfoService.java
@@ -0,0 +1,31 @@
+package cn.pluss.platform.cacheInfo;
+
+import cn.pluss.platform.entity.CacheInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 缓存信息表 服务类
+ * </p>
+ *
+ * @author bzg
+ * @since 2021-09-24
+ */
+public interface CacheInfoService extends IService<CacheInfo> {
+
+    /**
+     * @description:根据keyCode获取信息
+     * @date: 2021/9/24 17:19
+     * @param keyCode:
+     * @return cn.pluss.platform.entity.CacheInfo
+     */
+    CacheInfo getCacheInfoByKeyCode(String keyCode);
+
+    /**
+     * 获取生活圈缓存的数据
+     * @date: 2021/12/7 17:01
+     * @param keyCode:
+     * @return java.lang.String
+     */
+    String getShqCacheInfoByKeyCode(String keyCode);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/cacheInfo/impl/CacheInfoServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/cacheInfo/impl/CacheInfoServiceImpl.java
new file mode 100644
index 0000000..d39a5ab
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/cacheInfo/impl/CacheInfoServiceImpl.java
@@ -0,0 +1,30 @@
+package cn.pluss.platform.cacheInfo.impl;
+
+import cn.pluss.platform.cacheInfo.CacheInfoService;
+import cn.pluss.platform.entity.CacheInfo;
+import cn.pluss.platform.mapper.CacheInfoMapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 缓存信息表 服务实现类
+ * </p>
+ *
+ * @author bzg
+ * @since 2021-09-24
+ */
+@Service
+public class CacheInfoServiceImpl extends ServiceImpl<CacheInfoMapper, CacheInfo> implements CacheInfoService {
+
+    @Override
+    public CacheInfo getCacheInfoByKeyCode(String keyCode) {
+        return baseMapper.selectOne(new QueryWrapper<CacheInfo>().eq("keyCode",keyCode));
+    }
+
+    @Override
+    public String getShqCacheInfoByKeyCode(String keyCode) {
+        return baseMapper.getShqCacheInfoByKeyCode(keyCode);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/cash/CashService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/cash/CashService.java
new file mode 100644
index 0000000..d385e60
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/cash/CashService.java
@@ -0,0 +1,129 @@
+package cn.pluss.platform.cash;
+
+import cn.pluss.platform.entity.Cash;
+import cn.pluss.platform.mapper.CashMapper;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.apache.ibatis.annotations.Param;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+public interface CashService extends IService<Cash> {
+
+    /**
+     * api后台专用方法, 保存提现申请信息
+     *
+     * @param cash
+     */
+    void apiSaveCash(Cash cash);
+
+    /**
+     * api后台专用方法, 保存提现申请信息, v2
+     *
+     * @param cash
+     */
+    void apiSaveCashV2(Cash cash);
+
+    /**
+     * 提现详情
+     * @param cash 提现信息
+     * @return 提现详情
+     */
+    Cash cashDetail(Cash cash);
+
+    /**
+     * api后台专用方法, 保存提现申请信息, v2
+     *
+     * @param cash
+     */
+    void apiSaveCashV3(Cash cash);
+
+    Cash queryCash(Cash cash);
+
+    void updateCash(Cash cash);
+
+    void deleteUserIdCash(Cash cash);
+
+    List<Cash> queryCashPage(Map<String, Object> map);
+
+    Integer queryCashPageCount(Map<String, Object> map);
+
+    /**
+     * 已经成功提现的金额/申请提现中的金额（粉丝分润）
+     *
+     * @param map
+     * @return
+     */
+    Double sumFansSuccessCash(Map<String, Object> map);
+
+    /**
+     * 已经成功提现（粉丝分润）
+     *
+     * @param map 参数
+     * @return
+     */
+    Double sumFansAlreadyCash(Map<String, Object> map);
+
+    /**
+     * 已经成功提现的金额/申请提现中的金额(推广分润)
+     *
+     * @param userId
+     * @return
+     */
+    Double sumMerchantSuccessCash(@Param(value = "userId") Long userId);
+
+
+    /**
+     * 通过并打款
+     *
+     * @param cash 提现记录相关信息
+     */
+    void passAndRemit(Cash cash);
+
+    /**
+     * 批量通过并打款
+     *
+     * @param idList id列表
+     */
+    void batchPassAndRemit(List<String> idList);
+
+    /**
+     * @param params:
+     * @return java.util.Map<java.lang.String, java.lang.Object>
+     * @description:统计提现信息记录
+     * @date: 2021/10/15 16:38
+     */
+    Map<String, Object> getCashCountData(Map<String, Object> params);
+
+    /**
+     * 查询有效的提现金额, 金额数量
+     *
+     * @param userId 用户id
+     * @return
+     */
+    default BigDecimal getSumValidCashAmtTotal(@Param("userId") String userId) {
+        return ((CashMapper) getBaseMapper()).selectCashAmtTotal(userId, Cash.STATUS_SUCCESS, Cash.STATUS_CHECKING);
+    }
+
+    /**
+     * 查询已经提现的金额总数
+     *
+     * @param userId 用户id
+     * @return
+     */
+    default BigDecimal getSumCashedAmtTotal(@Param("userId") String userId) {
+        return ((CashMapper) getBaseMapper()).selectCashAmtTotal(userId, Cash.STATUS_SUCCESS);
+    }
+
+    /**
+     * 查询审核中的提现金额
+     *
+     * @param userId 用户id
+     * @return
+     */
+    default BigDecimal getSumCheckingCashAmtTotal(@Param("userId") String userId) {
+        return ((CashMapper) getBaseMapper()).selectCashAmtTotal(userId, Cash.STATUS_CHECKING);
+    }
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/cash/impl/CashServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/cash/impl/CashServiceImpl.java
new file mode 100644
index 0000000..b48c690
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/cash/impl/CashServiceImpl.java
@@ -0,0 +1,579 @@
+package cn.pluss.platform.cash.impl;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.DesensitizedUtil;
+import cn.hutool.crypto.SecureUtil;
+import cn.pluss.platform.ali.AlipayService;
+import cn.pluss.platform.cash.CashService;
+import cn.pluss.platform.cashAccount.CashAccountService;
+import cn.pluss.platform.common.CommonRemarkService;
+import cn.pluss.platform.common.RiskBlacklistService;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.fans.FansService;
+import cn.pluss.platform.mapper.CashMapper;
+import cn.pluss.platform.mapper.FansMapper;
+import cn.pluss.platform.mapper.MerchantProfitMapper;
+import cn.pluss.platform.merchantProfit.MerchantProfitService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.userInfo.UserInfoService;
+import cn.pluss.platform.user.impl.GeneralPushUtil;
+import cn.pluss.platform.util.StringUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.time.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.text.ParseException;
+import java.util.*;
+
+@Slf4j
+@Service("cashService")
+public class CashServiceImpl extends ServiceImpl<CashMapper, Cash> implements CashService {
+
+    @Setter(onMethod_ = {@Autowired, @Lazy})
+    private CashService self;
+
+    @Setter(onMethod_ = {@Autowired, @Lazy})
+    private UserAppService userAppService;
+
+    @Setter(onMethod_ = {@Autowired, @Lazy})
+    private UserInfoService userInfoService;
+
+    @Setter(onMethod_ = {@Autowired, @Lazy})
+    private CashAccountService cashAccountService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private CommonRemarkService remarkService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private AlipayService alipayService;
+
+    @Autowired @Lazy
+    private MerchantProfitService mpService;
+
+    @Autowired
+    private FansService fansService;
+
+    @Autowired
+    private HttpServletRequest request;
+
+    @Autowired
+    private GeneralPushUtil generalPushUtil;
+
+    @Autowired
+    private RiskBlacklistService rbService;
+
+    @Resource
+    private FansMapper fansMapper;
+
+    @Resource
+    private MerchantProfitMapper mpMapper;
+
+    private void checkStatus(Integer userId) {
+        RiskBlacklist condition = new RiskBlacklist();
+        condition.setUserId(userId);
+        RiskBlacklist entity = rbService.getOne(new QueryWrapper<>(condition));
+
+        if (entity != null) {
+            throw new MsgException("该账户存在重大违规行为，暂不支持提现，请联系收银呗客服申诉");
+        }
+    }
+
+    private void checkPayPwd(Cash cash) {
+        MsgException.checkNull(cash.getPayPassword(), "缺少支付密码");
+
+        UserApp userApp = userAppService.queryUserAppByToken();
+        cash.setUserId(userApp.getUserId());
+        UserInfo userInfo = new UserInfo().setId(userApp.getUserId());
+        userInfo = userInfoService.getOne(new QueryWrapper<>(userInfo));
+
+        String psdMd5 = SecureUtil.md5(cash.getPayPassword());
+        MsgException.checkUnequals(psdMd5, userInfo.getPayPassword(), "支付密码错误");
+    }
+
+    @Override
+    public void apiSaveCash(Cash cash) {
+        if(cash.getCashAmt().compareTo(BigDecimal.valueOf(Cash.MINIMUM_CASH)) < 0) {
+            throw new MsgException("提现金额必须大于" + Cash.MINIMUM_CASH + "元");
+        }
+
+        UserApp userApp = userAppService.queryUserAppByToken();
+
+        Cash existData = new Cash();
+        existData.setUserId(cash.getUserId());
+        QueryWrapper<Cash> qWrapper = new QueryWrapper<>(existData);
+        qWrapper.orderByDesc("createDt");
+        qWrapper.last("limit 1");
+        existData = getOne(qWrapper);
+
+        if (existData != null && DateUtil.isSameDay(new Date(), existData.getCreateDt())) {
+            throw new MsgException("一天只能提现一次");
+        }
+
+        cash.setCashNumber(StringUtil.getBillno());
+        cash.setCreateDt(new Date());
+        cash.setStatus(0);
+        cash.setUserName(userApp.getUserName());
+        cash.setMerchantName(userApp.getMerchantName());
+        cash.setMerchantCode(userApp.getMerchantCode());
+
+        LambdaQueryWrapper<CashAccount> qWrapper2 = new LambdaQueryWrapper<CashAccount>()
+                .eq(CashAccount::getUserId, cash.getUserId())
+                .last("limit 1");
+        CashAccount cashAccount = cashAccountService.getOne(qWrapper2);
+        if (cashAccount != null) {
+            cash.setAccountName(cashAccount.getAccountName());
+            cash.setAccountNo(cashAccount.getAccountNo());
+        } else {
+            throw new MsgException("请先完善提现账户信息");
+        }
+
+        if (StringUtil.isNotEmpty(userApp.getLogo())) {
+            cash.setLogo(userApp.getLogo());
+        }
+
+        save(cash);
+    }
+
+    @Override
+    public void apiSaveCashV2(Cash cash) {
+        Date limitDate = null;
+        try {
+            limitDate = DateUtils.parseDate("2022-01-01 00:00:00", "yyyy-MM-dd HH:mm:ss");
+        } catch (ParseException ignored) {
+        }
+
+        if (limitDate != null && System.currentTimeMillis() > limitDate.getTime()) {
+            throw new MsgException("提现功能维护中");
+        }
+
+        checkPayPwd(cash);
+
+        apiSaveCash(cash);
+
+        UserApp userApp = userAppService.queryUserAppByToken();
+
+        Cash existData = new Cash();
+        existData.setUserId(cash.getUserId());
+        QueryWrapper<Cash> qWrapper = new QueryWrapper<>(existData);
+        qWrapper.orderByDesc("createDt");
+        qWrapper.last("limit 1");
+        existData = getOne(qWrapper);
+
+        if (existData != null && DateUtil.isSameDay(new Date(), existData.getCreateDt())) {
+            throw new MsgException("一天只能提现一次");
+        }
+
+        cash.setCashNumber(StringUtil.getBillno());
+        cash.setCreateDt(new Date());
+        cash.setStatus(0);
+        cash.setUserName(userApp.getUserName());
+        cash.setMerchantName(userApp.getMerchantName());
+        cash.setMerchantCode(userApp.getMerchantCode());
+
+        LambdaQueryWrapper<CashAccount> qWrapper2 = new LambdaQueryWrapper<CashAccount>()
+                .eq(CashAccount::getUserId, cash.getUserId())
+                .last("limit 1");
+        CashAccount cashAccount = cashAccountService.getOne(qWrapper2);
+        if (cashAccount != null) {
+            cash.setAccountName(cashAccount.getAccountName());
+            cash.setAccountNo(cashAccount.getAccountNo());
+        }
+
+        if (StringUtil.isNotEmpty(userApp.getLogo())) {
+            cash.setLogo(userApp.getLogo());
+        }
+
+        save(cash);
+    }
+
+    @Override
+    public Cash cashDetail(Cash cash) {
+        UserApp tokenUa = userAppService.queryUserAppByToken();
+        cash.setUserId(tokenUa.getUserId());
+
+        checkStatus(tokenUa.getUserId().intValue());
+
+        if(cash.getCashAmt().compareTo(BigDecimal.valueOf(Cash.MINIMUM_CASH)) < 0) {
+            throw new MsgException("提现金额必须大于" + Cash.MINIMUM_CASH + "元");
+        }
+
+        LambdaQueryWrapper<Cash> qWrapper = Wrappers.lambdaQuery();
+        qWrapper.eq(Cash::getUserId, cash.getUserId())
+                .orderByDesc(Cash::getCreateDt)
+                .last("limit 1");
+        Cash existData = getOne(qWrapper);
+
+        if (existData != null && DateUtil.isSameDay(new Date(), existData.getCreateDt())) {
+            throw new MsgException("一天只能提现一次");
+        }
+
+        LambdaQueryWrapper<CashAccount> qWrapper2 = Wrappers.lambdaQuery();
+        qWrapper2.eq(CashAccount::getUserId, cash.getUserId())
+                .last("limit 1");
+        CashAccount cashAccount = cashAccountService.getOne(qWrapper2);
+        if (cashAccount != null) {
+            cash.setAccountName(DesensitizedUtil.chineseName(cashAccount.getAccountName()));
+            if (cashAccount.getAccountNo().contains("@")) {
+                cash.setAccountNo(DesensitizedUtil.email(cashAccount.getAccountNo()));
+            } else {
+                cash.setAccountNo(DesensitizedUtil.mobilePhone(cashAccount.getAccountNo()));
+            }
+        } else {
+            throw new MsgException("请先补充提现账户信息");
+        }
+
+        // ======查询可提现金额
+        // 查询商户所有分润
+        BigDecimal totalProfit = mpService.getSumValidProfit(cash.getUserId() + "");
+        if (totalProfit == null) {
+            totalProfit = BigDecimal.ZERO;
+        }
+
+        if (!StringUtils.isEmpty(tokenUa.getMerchantCode())) {
+            Map<String, Object> map = new HashMap<>();
+            map.put("lastMerchantCode", tokenUa.getMerchantCode());
+            // 查询可提现粉丝分润
+            Double sum = fansService.queryFansSumShareMoney(map);
+            if (sum != null) {
+                BigDecimal fansProfit = BigDecimal.valueOf(sum);
+                totalProfit = totalProfit.add(fansProfit);
+            }
+        }
+
+        // 查询商户已提现总数
+        BigDecimal totalCashAmt = getSumValidCashAmtTotal(cash.getUserId() + "");
+        if (totalCashAmt == null) {
+            totalCashAmt = BigDecimal.ZERO;
+        }
+        // 校验提现金额是否充足
+        int flag = cash.getCashAmt().compareTo(totalProfit.subtract(totalCashAmt));
+        if (flag > 0) {
+            throw new MsgException("可提现金额不足！");
+        }
+
+        cash.setRate(8);
+        cash.setBaseServiceCharge(BigDecimal.valueOf(3));
+        cash.setRatioCharge(cash.getCashAmt().multiply(BigDecimal.valueOf(0.08)).setScale(2, RoundingMode.HALF_EVEN));
+        cash.setVirTotalCharge(cash.getBaseServiceCharge().add(cash.getRatioCharge()));
+        cash.setVirRealCashAmt(cash.getCashAmt().subtract(cash.getVirTotalCharge()).setScale(2, RoundingMode.HALF_EVEN));
+        return cash;
+    }
+
+    @Override
+    public void apiSaveCashV3(Cash cash) {
+        UserApp tokenUa = userAppService.queryUserAppByToken();
+        cash.setUserId(tokenUa.getUserId());
+
+        checkStatus(tokenUa.getUserId().intValue());
+
+        if(cash.getCashAmt().compareTo(BigDecimal.valueOf(Cash.MINIMUM_CASH)) < 0) {
+            throw new MsgException("提现金额必须大于" + Cash.MINIMUM_CASH + "元");
+        }
+
+        LambdaQueryWrapper<Cash> qWrapper = Wrappers.lambdaQuery();
+        qWrapper.eq(Cash::getUserId, cash.getUserId())
+                .orderByDesc(Cash::getCreateDt)
+                .last("limit 1");
+        Cash existData = getOne(qWrapper);
+
+        if (existData != null && DateUtil.isSameDay(new Date(), existData.getCreateDt())) {
+            throw new MsgException("一天只能提现一次");
+        }
+
+        // ======查询可提现金额
+        // 查询商户所有分润
+        BigDecimal totalProfit = mpService.getSumValidProfit(cash.getUserId() + "");
+        totalProfit = totalProfit == null? BigDecimal.ZERO: totalProfit;
+
+        if (!StringUtils.isEmpty(tokenUa.getMerchantCode())) {
+            Map<String, Object> map = new HashMap<>();
+            map.put("lastMerchantCode", tokenUa.getMerchantCode());
+            // 查询可提现粉丝分润
+            Double sum = fansService.queryFansSumShareMoney(map);
+            if (sum != null) {
+                BigDecimal fansProfit = BigDecimal.valueOf(sum);
+                totalProfit = totalProfit.add(fansProfit);
+            }
+        }
+
+        // 查询商户已提现总数
+        BigDecimal totalCashAmt = getSumValidCashAmtTotal(cash.getUserId() + "");
+        totalCashAmt = totalCashAmt == null? BigDecimal.ZERO: totalCashAmt;
+
+        // 校验提现金额是否充足
+        int flag = cash.getCashAmt().compareTo(totalProfit.subtract(totalCashAmt));
+        if (flag > 0) {
+            throw new MsgException("可提现金额不足！");
+        }
+
+        cash.setCashNumber(StringUtil.getBillno());
+        cash.setCreateDt(new Date());
+        cash.setStatus(Cash.STATUS_CHECKING);
+        cash.setUserName(tokenUa.getUserName());
+        cash.setMerchantName(tokenUa.getMerchantName());
+        cash.setMerchantCode(tokenUa.getMerchantCode());
+        cash.setRate(8);
+        cash.setBaseServiceCharge(BigDecimal.valueOf(3));
+        cash.setRatioCharge(cash.getCashAmt().multiply(BigDecimal.valueOf(0.08)));
+
+        LambdaQueryWrapper<CashAccount> qWrapper2 = Wrappers.lambdaQuery();
+        qWrapper2.eq(CashAccount::getUserId, cash.getUserId())
+                .last("limit 1");
+        CashAccount cashAccount = cashAccountService.getOne(qWrapper2);
+        log.info("申请提现的帐号信息：{}", JSONObject.toJSONString(cashAccount));
+        if (cashAccount != null) {
+            cash.setAccountName(cashAccount.getAccountName());
+            cash.setAccountNo(cashAccount.getAccountNo());
+        } else {
+            throw new MsgException("请先补充提现账户信息");
+        }
+
+        if (StringUtil.isNotEmpty(tokenUa.getLogo())) {
+            cash.setLogo(tokenUa.getLogo());
+        }
+
+        save(cash);
+    }
+
+    @Override
+    public Cash queryCash(Cash cash) {
+        return baseMapper.selectOne(new QueryWrapper<>(cash));
+    }
+
+    @Override
+    public void updateCash(Cash cash) {
+        baseMapper.updateById(cash);
+    }
+
+    public void updateUserIdCash(Cash cash) {
+        UpdateWrapper<Cash> uWrapper = new UpdateWrapper<>();
+        uWrapper.eq("userId", cash.getUserId());
+        baseMapper.update(cash, uWrapper);
+    }
+
+    @Override
+    public void deleteUserIdCash(Cash cash) {
+        QueryWrapper<Cash> qWrapper = new QueryWrapper<>();
+        qWrapper.eq("userId", cash.getUserId());
+        baseMapper.delete(qWrapper);
+    }
+
+    @Override
+    public <E extends IPage<Cash>> E page(E page, Wrapper<Cash> queryWrapper) {
+        Cash cash = queryWrapper.getEntity();
+        ((QueryWrapper<Cash>) queryWrapper).eq(StringUtil.isNotEmpty(cash.getType()), "tpc.type", cash.getType());
+
+        ((QueryWrapper<Cash>) queryWrapper).like(StringUtil.isNotEmpty(cash.getUserName()), "tpc.userName", cash.getUserName());
+
+        ((QueryWrapper<Cash>) queryWrapper).eq(StringUtil.isNotEmpty(cash.getMerchantCode()), "tpc.merchantCode", cash.getMerchantCode());
+
+        ((QueryWrapper<Cash>) queryWrapper).like(StringUtil.isNotEmpty(cash.getMerchantName()), "tpc.merchantName", cash.getMerchantName());
+
+        ((QueryWrapper<Cash>) queryWrapper).eq(StringUtil.isNotEmpty(cash.getStatus()), "tpc.status", cash.getStatus());
+
+        ((QueryWrapper<Cash>) queryWrapper).eq(StringUtil.isNotEmpty(cash.getPhone()), "ui.phone", cash.getPhone());
+
+        ((QueryWrapper<Cash>) queryWrapper).eq(StringUtil.isNotEmpty(cash.getId()), "tpc.id", cash.getId());
+
+        ((QueryWrapper<Cash>) queryWrapper).eq(StringUtil.isNotEmpty(cash.getUserId()), "tpc.userId", cash.getUserId());
+
+        ((QueryWrapper<Cash>) queryWrapper).ge(StringUtil.isNotEmpty(cash.getBeginTime()), "tpc.createDt", cash.getBeginTime());
+
+        ((QueryWrapper<Cash>) queryWrapper).le(StringUtil.isNotEmpty(cash.getEndTime()), "tpc.createDt", cash.getEndTime());
+
+        final E result = (E) baseMapper.queryCashPage2(page, queryWrapper);
+
+        List<Long> userIdList = new ArrayList<>();
+        List<String> merchantCodeList = new ArrayList<>();
+        for (Cash record : result.getRecords()) {
+            userIdList.add(record.getUserId());
+            merchantCodeList.add(record.getMerchantCode());
+        }
+
+        final List<Fans> fansList = fansMapper.selectGroupData(merchantCodeList);
+        final List<MerchantProfit> merchantProfitList = mpMapper.selectGroupMercProfit(userIdList);
+
+        for (Cash record : result.getRecords()) {
+            final Iterator<Fans> fansIterator = fansList.iterator();
+
+            while (fansIterator.hasNext()) {
+                final Fans next = fansIterator.next();
+                if (next.getLastMerchantCode().equals(record.getMerchantCode())) {
+                    record.setTotalShareMoney(new BigDecimal(next.getShareMoney()));
+                    fansIterator.remove();
+                    break;
+                }
+            }
+
+            final Iterator<MerchantProfit> profitIterator = merchantProfitList.iterator();
+            while (profitIterator.hasNext()) {
+                final MerchantProfit next = profitIterator.next();
+                if (next.getUserId().equals(record.getUserId())) {
+                    record.setTotalProfit(BigDecimal.valueOf(next.getPrice()));
+                    profitIterator.remove();
+                    break;
+                }
+            }
+        }
+
+        return result;
+    }
+
+    @Override
+    public List<Cash> queryCashPage(Map<String, Object> map) {
+        return baseMapper.queryCashPage(map);
+    }
+
+    @Override
+    public Integer queryCashPageCount(Map<String, Object> map) {
+        return baseMapper.queryCashPageCount(map);
+    }
+
+    @Override
+    public Double sumFansSuccessCash(Map<String, Object> map) {
+        Double aDouble = baseMapper.sumFansSuccessCash(map);
+        return aDouble == null ? new Double(0) : aDouble;
+    }
+
+    @Override
+    public Double sumFansAlreadyCash(Map<String, Object> map) {
+        Double aDouble = baseMapper.sumFansAreadlyCash(map);
+        return aDouble == null ? new Double(0) : aDouble;
+    }
+
+    @Override
+    public Double sumMerchantSuccessCash(Long userId) {
+        Double aDouble = baseMapper.sumMerChantSuccessCash(userId);
+        return aDouble == null ? new Double(0) : aDouble;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void passAndRemit(Cash cash) {
+        String remark = cash.getRemark();
+        cash = baseMapper.selectLockById(cash.getId());
+        if (cash.getStatus() == 1) {
+            throw new MsgException("当前打款记录已被处理");
+        }
+
+        cash.setStatus(1);
+
+        // String token = request.getHeader("token");
+        // cash.setUpdator(JwtUtils.get("userId", token).toString());
+        cash.setUpdateDt(new Date());
+        updateById(cash);
+
+        if (!StringUtils.isEmpty(remark)) {
+            QueryWrapper<CommonRemark> qWrapper = new QueryWrapper<CommonRemark>()
+                    .eq("userId", cash.getUserId())
+                    .eq("code", "CASH");
+            remarkService.remove(qWrapper);
+            CommonRemark existData = new CommonRemark();
+            existData.setUserId(cash.getUserId().intValue());
+            existData.setCode("CASH");
+            existData.setRemark(remark);
+            remarkService.saveOrUpdate(existData);
+        }
+
+        String accountName = cash.getAccountName();
+        String accountNo = cash.getAccountNo();
+        if (StringUtils.isEmpty(accountName)) {
+            LambdaQueryWrapper<CashAccount> qWrapper2 = new LambdaQueryWrapper<CashAccount>()
+                    .eq(CashAccount::getUserId, cash.getUserId().intValue());
+            CashAccount one = cashAccountService.getOne(qWrapper2);
+
+            if (one == null) {
+                throw new MsgException("缺少打款账号");
+            } else {
+                accountName = one.getAccountName();
+                accountNo = one.getAccountNo();
+
+                cash.setAccountNo(accountNo);
+                cash.setAccountName(accountName);
+                updateById(cash);
+            }
+        }
+
+        alipayService.remit(accountNo, accountName, cash.getVirRealCashAmt().toString());
+        // 发送分润打款通知
+        generalPushUtil.sendAllPlatByAlias(Collections.singletonList(cash.getUserId() + ""), "收银呗分润到账通知", "您的分润已结算至支付宝，快去查看哦！", "1");
+    }
+
+    @Override
+    public void batchPassAndRemit(List<String> idList) {
+        // 获取要操作的提现记录
+        LambdaQueryWrapper<Cash> qWrapper1 = new LambdaQueryWrapper<Cash>()
+                .in(Cash::getId, idList);
+        List<Cash> cashList = list(qWrapper1);
+
+        // 获取所有要操作的提现记录的提现账号信息
+        List<String> noAccountUserIdList = new ArrayList<String>();
+        for (Cash cash : cashList) {
+            if (StringUtils.isEmpty(cash.getAccountName())) {
+                noAccountUserIdList.add(cash.getUserId() + "");
+            }
+        }
+
+        if (!noAccountUserIdList.isEmpty()) {
+            LambdaQueryWrapper<CashAccount> qWrapper2 = new LambdaQueryWrapper<CashAccount>()
+                    .in(CashAccount::getUserId, noAccountUserIdList);
+            List<CashAccount> cashAccountList = cashAccountService.list(qWrapper2);
+
+            for (Cash cash : cashList) {
+                if (cash.getAccountName() != null) {
+                    continue;
+                }
+
+                for (CashAccount cashAccount : cashAccountList) {
+                    if (cashAccount.getUserId().equals(cash.getUserId().intValue())) {
+                        cash.setAccountName(cashAccount.getAccountName());
+                        cash.setAccountNo(cashAccount.getAccountNo());
+                        updateById(cash);
+                    }
+                }
+            }
+
+            if (cashAccountList.size() != noAccountUserIdList.size()) {
+                throw new MsgException("存在没有提供提现账户的记录");
+            }
+        }
+
+        for (Cash cash : cashList) {
+            if (cash.getStatus() == 1) {
+                continue;
+            }
+
+            self.passAndRemit(cash);
+        }
+    }
+
+    /**
+     * @description:统计提现信息记录
+     * @date: 2021/10/15 16:39
+     * @param params:
+     * @return java.util.Map<java.lang.String,java.lang.Object>
+     */
+    @Override
+    public Map<String, Object> getCashCountData(Map<String, Object> params) {
+        return baseMapper.getCashCountData(params);
+    }
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/cashAccount/CashAccountService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/cashAccount/CashAccountService.java
new file mode 100644
index 0000000..b67f1e0
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/cashAccount/CashAccountService.java
@@ -0,0 +1,17 @@
+package cn.pluss.platform.cashAccount;
+
+import cn.pluss.platform.entity.CashAccount;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author bzg
+ * @since 2021-07-23
+ */
+public interface CashAccountService extends IService<CashAccount> {
+
+    boolean apiSave(CashAccount entity);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/cashAccount/impl/CashAccountServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/cashAccount/impl/CashAccountServiceImpl.java
new file mode 100644
index 0000000..34c8daf
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/cashAccount/impl/CashAccountServiceImpl.java
@@ -0,0 +1,48 @@
+package cn.pluss.platform.cashAccount.impl;
+
+import cn.pluss.platform.IdCardService;
+import cn.pluss.platform.cashAccount.CashAccountService;
+import cn.pluss.platform.entity.CashAccount;
+import cn.pluss.platform.entity.IdCard;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.CashAccountMapper;
+import cn.pluss.platform.userApp.UserAppService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author bzg
+ * @since 2021-07-23
+ */
+@Service
+public class CashAccountServiceImpl extends ServiceImpl<CashAccountMapper, CashAccount> implements CashAccountService {
+
+    @Autowired @Lazy
+    private UserAppService uaService;
+
+    @Autowired @Lazy
+    private IdCardService idCardService;
+
+    @Override
+    public boolean apiSave(CashAccount entity) {
+        MsgException.checkNull(entity.getAccountName(), "缺少支付宝账户名");
+        MsgException.checkNull(entity.getAccountNo(), "缺少支付号账号");
+
+        UserApp userApp = uaService.queryUserAppByToken();
+
+        IdCard certIdCard = idCardService.getCertIdCard(userApp.getUserId() + "");
+
+        MsgException.checkNull(certIdCard, "请先进行实名认证");
+
+        MsgException.checkUnequals(certIdCard.getCertName(), entity.getAccountName(), "支付宝账户名需与实名信息保持一致");
+
+        return save(entity);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/BaseMakeMoneyService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/BaseMakeMoneyService.java
new file mode 100644
index 0000000..70b0e99
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/BaseMakeMoneyService.java
@@ -0,0 +1,8 @@
+package cn.pluss.platform.channel;
+
+import cn.pluss.platform.entity.MakeMoney;
+import cn.pluss.platform.mapper.MakeMoneyMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+public abstract class BaseMakeMoneyService extends ServiceImpl<MakeMoneyMapper, MakeMoney> implements MakeMoneyService  {
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/BaseMchChannelRateNewService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/BaseMchChannelRateNewService.java
new file mode 100644
index 0000000..2674223
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/BaseMchChannelRateNewService.java
@@ -0,0 +1,136 @@
+package cn.pluss.platform.channel;
+
+import cn.hutool.core.date.DateUtil;
+import cn.pluss.platform.converter.Converter;
+import cn.pluss.platform.entity.MerchantRateNew;
+import cn.pluss.platform.entity.MerchantRateNewRecord;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.entity.UserLevel;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.exception.RateNoChangeException;
+import cn.pluss.platform.mapper.MerchantRateMapper;
+import cn.pluss.platform.merchant.MerchantRateNewRecordService;
+import cn.pluss.platform.merchant.MerchantRateNewService;
+import cn.pluss.platform.user.UserLevelService;
+import cn.pluss.platform.userApp.UserAppService;
+import lombok.Data;
+import lombok.Setter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+
+import javax.annotation.Resource;
+import java.util.Date;
+
+/**
+ * @author djh
+ */
+@Data
+public abstract class BaseMchChannelRateNewService implements MchChannelRateNewService {
+
+    @Autowired
+    protected MerchantRateNewService rateNewService;
+
+    @Resource
+    protected MerchantRateMapper merchantRateMapper;
+
+    @Autowired
+    protected UserLevelService ulService;
+
+    @Autowired
+    protected MerchantRateNewRecordService rateNewRecordService;
+
+    @Setter(onMethod_ = {@Autowired, @Lazy})
+    protected UserAppService userAppService;
+
+    @Override
+    public void before(String userId, MerchantRateNew rate) {
+
+        if (userId == null) {
+            throw new MsgException("用户id不能为空");
+        }
+
+        UserApp userApp = userAppService.queryUserAppByToken();
+        if (userApp == null) {
+            throw new MsgException("拒绝访问");
+        }
+
+        if (!"SV2".equals(userApp.getRoleCode())) {
+            throw new MsgException("暂无权限");
+        }
+
+        UserLevel userLevel = ulService.getLevelInfoByRoleLevel(userApp.getRoleCode(), userApp.getLevelCode());
+
+        MsgException.checkNull(userLevel, "数据异常");
+
+        //费率校验
+        rateValueCheck(rate.getWxRate(), userLevel.getRate().intValue());
+        rateValueCheck(rate.getAliRate(), userLevel.getRate().intValue());
+        rateValueCheckBank(rate.getBankRate(), userLevel.getRate().intValue());
+        rateValueCheckBankLarge(rate.getBankRateLarge(), userLevel.getRate().intValue());
+
+        UserApp optedUserApp = userAppService.getUserAppByUserId(userId);
+
+        MerchantRateNewRecord validRecord = rateNewRecordService.getValidRecordByMerchantCode(optedUserApp.getMerchantCode(), getChannelId());
+        if (validRecord != null) {
+            if (validRecord.getStatus().equals(MerchantRateNewRecord.STATUS_IN_REVIEW) ||
+                    validRecord.getStatus().equals(MerchantRateNewRecord.STATUS_SUCCESS_NOT_EFFECT) ) {
+                MsgException.throwException("当前费率修改正在审核中");
+            }
+
+            if (DateUtil.isSameDay(validRecord.getCreateTime(), new Date())) {
+                throw new MsgException("请于一天之后再修改费率");
+            }
+        }
+
+        MerchantRateNew merchantRate = rateNewService.getByUserId(userId, getChannelId());
+
+        if (merchantRate == null) {
+            merchantRate = getDefaultRate();
+        } else {
+            rate.setId(merchantRate.getId());
+        }
+
+        boolean flagWx = rate.getWxRate().equals(merchantRate.getWxRate());
+        boolean flagAli = rate.getAliRate().equals(merchantRate.getAliRate());
+        boolean flagBank = rate.getBankRate().equals(merchantRate.getBankRate());
+        // boolean flagBankLarge = ("1".equals(getChannelId()) || "3".equals(getChannelId()) || rate.getBankRateLarge().equals(merchantRate.getBankRateLarge()));
+        boolean flagBankLarge = true;
+        if (flagWx && flagAli && flagBank && flagBankLarge) {
+            throw new RateNoChangeException();
+        }
+    }
+
+    @Override
+    public void after(String userId, MerchantRateNew merchantRate) {
+        // 更新本地数据库保存的费率
+//        rateNewService.saveOrUpdate(merchantRate);
+
+        // 保存费率修改记录
+        MerchantRateNewRecord merchantRateRecord = Converter.INSTANCE.trans(merchantRate);
+        merchantRateRecord.setCreateTime(new Date());
+        merchantRateRecord.setUpdateTime(new Date());
+        rateNewRecordService.save(merchantRateRecord);
+    }
+
+    private void rateValueCheck(int rateValue, int minRate) {
+        if (rateValue < minRate || rateValue > 38) {
+            throw new MsgException("商户支付宝或微信费率应在0." + minRate + "%到0.38%之间");
+        }
+    }
+
+    private void rateValueCheckBank(int rateValue, int minRate) {
+        if (rateValue < minRate || rateValue > 38) {
+            throw new MsgException("商户费率应在0." + (minRate + 2) + "%到0.40%之间");
+        }
+    }
+
+    private void rateValueCheckBankLarge(int rateValue, int minRate) {
+        if ("1".equals(getChannelId())) {
+            return;
+        }
+
+        if (rateValue < minRate || rateValue > 38) {
+            throw new MsgException("商户费率应在0." + ((minRate - 53) * 2 + 21) + "%到0.60%之间");
+        }
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/BaseMchChannelRateService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/BaseMchChannelRateService.java
new file mode 100644
index 0000000..70a2c56
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/BaseMchChannelRateService.java
@@ -0,0 +1,77 @@
+package cn.pluss.platform.channel;
+
+import cn.pluss.platform.MerchantRateRecordService;
+import cn.pluss.platform.entity.MerchantRate;
+import cn.pluss.platform.entity.MerchantRateRecord;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.exception.RateNoChangeException;
+import cn.pluss.platform.mapper.MerchantRateMapper;
+import cn.pluss.platform.userApp.UserAppService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.Data;
+import lombok.Setter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+
+import javax.annotation.Resource;
+import java.util.Date;
+
+@Data
+public abstract class BaseMchChannelRateService implements MchChannelRateService {
+
+    @Resource
+    protected MerchantRateMapper merchantRateMapper;
+
+    @Autowired
+    protected MerchantRateRecordService merchantRateRecordService;
+
+    @Setter(onMethod_ = {@Autowired, @Lazy})
+    protected UserAppService userAppService;
+
+    @Override
+    public MerchantRate before(String userId, Integer rate) {
+        if (userId == null) {
+            throw new MsgException("用户id不能为空");
+        }
+
+        MerchantRate merchantRate;
+        QueryWrapper<MerchantRate> merchantRateQueryWrapper = new QueryWrapper<MerchantRate>().eq("userId", userId);
+        merchantRate = merchantRateMapper.selectOne(merchantRateQueryWrapper);
+        if (merchantRate != null && System.currentTimeMillis() - merchantRate.getUpdateTime().getTime() < 3600 * 24 * 1000L) {
+            throw new MsgException("请于一天之后再修改费率");
+        }
+
+        boolean noChangeFlag = (merchantRate == null && rate.equals(38)) || (merchantRate != null && rate.equals(merchantRate.getRate()));
+        if (noChangeFlag) {
+            throw new RateNoChangeException();
+        }
+
+        QueryWrapper<MerchantRate> queryWrapper = new QueryWrapper<MerchantRate>().eq("userId", userId);
+        return merchantRateMapper.selectOne(queryWrapper);
+    }
+
+    @Override
+    public void after(String userId, Integer rate, MerchantRate merchantRate) {
+        // 更新本地数据库保存的费率
+        if (merchantRate == null) {
+            merchantRate = new MerchantRate().setUserId(userId);
+            merchantRate.setRate(rate);
+            merchantRate.setUpdateTime(new Date());
+            merchantRate.setPreviousRate(38);
+            merchantRateMapper.insert(merchantRate);
+        } else {
+            // 保存前一天的费率
+            merchantRate.setPreviousRate(merchantRate.getRate());
+            merchantRate.setRate(rate);
+            merchantRate.setUpdateTime(new Date());
+            merchantRateMapper.updateById(merchantRate);
+        }
+
+        // 保存费率修改记录
+        MerchantRateRecord merchantRateRecord = new MerchantRateRecord();
+        merchantRateRecord.setRate(rate);
+        merchantRateRecord.setUserId(userId);
+        merchantRateRecord.setCreateTime(new Date());
+        merchantRateRecordService.save(merchantRateRecord);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/BaseMerchantAuditService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/BaseMerchantAuditService.java
new file mode 100644
index 0000000..7eab583
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/BaseMerchantAuditService.java
@@ -0,0 +1,78 @@
+package cn.pluss.platform.channel;
+
+import cn.pluss.platform.IdCardService;
+import cn.pluss.platform.MerchantAuditRecordService;
+import cn.pluss.platform.entity.IdCard;
+import cn.pluss.platform.entity.MerchantBaseInfo;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.merchant.AccountService;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.mswitch.CommonSwitchService;
+import cn.pluss.platform.region.RegionReflectService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+
+/**
+ * @author DJH
+ * 进件通用方法放到这里
+ */
+public abstract class BaseMerchantAuditService implements MerchantAuditService {
+
+    @Autowired
+    protected RegionReflectService regionReflectService;
+
+    @Autowired
+    protected CommonSwitchService commonSwitchService;
+
+    @Autowired
+    protected AccountService accountService;
+
+    @Lazy
+    @Autowired
+    protected MerchantBaseInfoService merchantBaseInfoService;
+
+    @Autowired
+    protected IdCardService idCardService;
+
+    @Autowired
+    protected MerchantChannelStatusService mcsService;
+
+    @Autowired
+    protected MerchantAuditRecordService merchAuditRecService;
+
+    /**
+     * 结算卡修改申请通知模板
+     */
+    public static String editApplyNoticeTemplate = "尊敬的商户“$1”，您的$2结算卡修改申请已提交，结算卡修改较为敏感，需要支付通道人工审核，一般三个工作日内修改完毕，修改结果会通过APP推送通知。修改通过后先小额支付一笔，确认到账新卡后再恢复使用，请知悉。";
+
+    /**
+     * 结算卡修改成功通知模板
+     */
+    public static String editApplyResultNoticeTemplate = "尊敬的商户“$1”，您的$2结算卡已修改完毕，为保险起见可以先交易一笔小额的， 比如一块钱 ，看是否到账新卡，如到新卡您再正常使用。请知悉！";
+
+    @Override
+    public void merchantAuditCheck(String userId, boolean isFailCheck) {
+        if (!commonSwitchService.allowMerchantRegister()) {
+            MsgException.throwException("当前不允许进件！");
+        }
+
+        MerchantBaseInfo merchantBaseInfo = merchantBaseInfoService.getMerchantBaseInfoByUserId(userId);
+        MsgException.checkNull(merchantBaseInfo, "请完善经营信息");
+
+        String merchantType = merchantBaseInfo.getMerchantType();
+        String principalPerson = merchantBaseInfo.getPrincipalPerson();
+        if (!"1".equals(merchantType)) {
+            MsgException.checkBlank(principalPerson, "请完善营业执照信息");
+
+            IdCard legalIdCard = idCardService.getLegalIdCard(userId);
+            MsgException.checkNull(legalIdCard, "请完善法人信息");
+        }
+
+        accountService.checkCert(merchantBaseInfo.getUserId(), "同一证件只能注册三个小微商户, 如有增加需求请联系客服");
+
+        if (isFailCheck) {
+            merchAuditRecService.checkFailCount(merchantBaseInfo.getMerchantCode(), "连续三次复审驳回，请联系客服进件");
+        }
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/MakeMoneyService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/MakeMoneyService.java
new file mode 100644
index 0000000..b55659f
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/MakeMoneyService.java
@@ -0,0 +1,20 @@
+package cn.pluss.platform.channel;
+
+import cn.pluss.platform.entity.MakeMoney;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-09-10
+ */
+public interface MakeMoneyService extends IService<MakeMoney> {
+
+    void dealCallbackData(JSONObject data);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/MchChannelRateNewService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/MchChannelRateNewService.java
new file mode 100644
index 0000000..0b7698b
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/MchChannelRateNewService.java
@@ -0,0 +1,49 @@
+package cn.pluss.platform.channel;
+
+import cn.pluss.platform.api.ResultCode;
+import cn.pluss.platform.entity.MerchantRateNew;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.exception.RateNoChangeException;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * 多种支付方式费率分开
+ */
+public interface MchChannelRateNewService {
+
+    /**
+     * 修改商户的费率
+     */
+    void before(String userId, MerchantRateNew merchantRate);
+
+    /**
+     * 渠道操作
+     *
+     * @param userId
+     */
+    void process(String userId, MerchantRateNew merchantRate);
+
+    void after(String userId, MerchantRateNew merchantRate);
+
+    @Transactional(rollbackFor = Exception.class)
+    default void changeRate(String userId, MerchantRateNew rate, boolean checkFlag) {
+        if (checkFlag) {
+            try {
+                before(userId, rate);
+            } catch (RateNoChangeException e) {
+                return;
+            } catch (Exception e) {
+                e.printStackTrace();
+                throw new MsgException(ResultCode.SERVICE_UNAVAILABLE, e.getMessage(), null);
+            }
+        }
+
+        process(userId, rate);
+
+        after(userId, rate);
+    }
+
+    String getChannelId();
+
+    MerchantRateNew getDefaultRate();
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/MchChannelRateService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/MchChannelRateService.java
new file mode 100644
index 0000000..7cf3330
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/MchChannelRateService.java
@@ -0,0 +1,28 @@
+package cn.pluss.platform.channel;
+
+import cn.pluss.platform.entity.MerchantRate;
+import org.springframework.transaction.annotation.Transactional;
+
+public interface MchChannelRateService {
+
+    /**
+     * 修改商户的费率
+     */
+    MerchantRate before(String userId, Integer rate);
+
+    /**
+     * 渠道操作
+     * @param userId
+     * @param rate
+     */
+    void process(String userId, Integer rate, MerchantRate merchantRate);
+
+    void after(String userId, Integer rate, MerchantRate merchantRate);
+
+    @Transactional(rollbackFor = Exception.class)
+    default void changeRate(String userId, Integer rate) {
+        MerchantRate merchantRate = before(userId, rate);
+        process(userId, rate, merchantRate);
+        after(userId, rate, merchantRate);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/MchMachineCallbackService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/MchMachineCallbackService.java
new file mode 100644
index 0000000..2d98f13
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/MchMachineCallbackService.java
@@ -0,0 +1,73 @@
+package cn.pluss.platform.channel;
+
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.suixingfu.SxfConstants;
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.scheduling.annotation.Async;
+
+/**
+ * 机具操作回调数据处理
+ * @author DJH
+ */
+public interface MchMachineCallbackService {
+
+    String OPERATION_PAY = "operationPay";
+    String OPERATION_REFUND = "operationRefund";
+
+
+
+    /**
+     * 机具操作回调数据处理
+     * @param param 回调参数
+     */
+    @Async
+    default void orderCallback(JSONObject param) {
+        if (param.getString("ordNo") != null && param.getString("ordNo").startsWith("SXF")) {
+            // SXF开头的订单，并不是机具回调的订单
+            return;
+        }
+
+        String operationType = getOperationType(param);
+        if (operationType == null) {
+            throw new MsgException("未知操作");
+        }
+
+        switch (operationType) {
+            case OPERATION_PAY:
+                payCallback(param);
+                break;
+            case OPERATION_REFUND:
+                refundCallback(param);
+                break;
+            case SxfConstants.SXF_POS_OPERATION:
+                posCallback(param);
+            default:
+                break;
+        }
+    }
+    /**
+     * @description:pos 机相关操作
+     * @date: 2021/10/28 10:24
+     * @param param:
+     */
+    void posCallback(JSONObject param);
+
+    /**
+     * 操作类型判断
+     * @param param 参数
+     * @return  参数类型，OPERATION_PAY 或者 OPERATION_REFUND
+     */
+    String getOperationType(JSONObject param);
+
+    /**
+     * 支付回调操作
+     * @param param 参数
+     */
+    void payCallback(JSONObject param);
+
+    /**
+     * 退款回调操作
+     * @param param 参数
+     */
+    void refundCallback(JSONObject param);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/MerchProtocolService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/MerchProtocolService.java
new file mode 100644
index 0000000..1d75dd4
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/MerchProtocolService.java
@@ -0,0 +1,49 @@
+package cn.pluss.platform.channel;
+
+import cn.pluss.platform.entity.JftMercPaymentChannel;
+import cn.pluss.platform.entity.MerchantChannelStatus;
+import com.alibaba.fastjson.JSONObject;
+
+/**
+ * 商户协议相关功能
+ * @author djh
+ */
+public interface MerchProtocolService {
+
+    /**
+     * 请求签约状态，若未发起签约，则发起签约
+     * @param mcs   商户通道信息
+     * @return  预留返回值，根据具体的业务需求，选择使用
+     */
+    default JSONObject reqMerProtocolStatus(MerchantChannelStatus mcs) {
+        return null;
+    }
+
+    /**
+     * 请求发起签约
+     * @param mcs   商户通道信息
+     * @return  预留返回值，根据具体的业务需求，选择使用
+     */
+    default JSONObject sendProtocolMsg(MerchantChannelStatus mcs) {
+        return null;
+    }
+
+    /**
+     * 请求签约状态，若未发起签约，则发起签约
+     * @param jpc   商户通道信息
+     * @return  预留返回值，根据具体的业务需求，选择使用
+     */
+    default JSONObject reqMerProtocolStatus(JftMercPaymentChannel jpc) {
+        return null;
+    }
+
+    /**
+     * 请求发起签约
+     * @param jpc   商户通道信息
+     * @return  预留返回值，根据具体的业务需求，选择使用
+     */
+    default JSONObject sendProtocolMsg(JftMercPaymentChannel jpc) {
+        return null;
+    }
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/MerchantAuditService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/MerchantAuditService.java
new file mode 100644
index 0000000..276b4f1
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/MerchantAuditService.java
@@ -0,0 +1,78 @@
+package cn.pluss.platform.channel;
+
+import cn.pluss.platform.entity.MerchantImage;
+import com.alibaba.fastjson.JSONObject;
+
+import java.util.Map;
+
+/**
+ * 进件接口定义
+ * @author DJH
+ */
+public interface MerchantAuditService {
+
+    /**
+     * 图片上传, 并将上传的图片code保存到传入的实体类中
+     * @param merchantImage 图片信息
+     */
+    void imageUpload(MerchantImage merchantImage);
+
+    /**
+     * @param url       图片url，本地存储或OSS
+     * @param picType   图片类型
+     */
+    void imageUpload(String url, String picType);
+
+    /**
+     * 进件
+     * @param userId 用户id
+     */
+    void merchantAudit(String userId, boolean isFailCheck);
+
+    void merchantAuditCheck(String userId, boolean isFailCheck);
+
+    /**
+     * 修改进件信息，当前特指修改结算信息
+     * @param userId
+     * @return
+     */
+    void editMerchantAudit(String userId);
+
+    /**
+     * 手动查询进件结果
+     * @param result 查询进件信息参数
+     */
+    JSONObject merchantAuditResult(Map<String, Object> result) throws Exception ;
+
+    /**
+     * 进件回调
+     * @param auditResult 进件回调的数据
+     */
+    JSONObject merchantAuditCallback(JSONObject auditResult) throws Exception;
+
+    /**
+     * 修改进件
+     * @param auditResult   回调信息
+     * @return  返回信息
+     * @throws Exception    可能存在得异常信息
+     */
+    JSONObject editMerchantCallback(JSONObject auditResult) throws Exception;
+
+    /**
+     * 图片类型转换，源照片类型主要为乐刷定义的图片类型，参考MerchantImage
+     *
+     * @param imageType 图片类型
+     * @return 对应通道的图片定义类型
+     */
+    String imgTypeTransform(String imageType);
+
+    void checkSign(JSONObject receiveData) throws Exception;
+
+    default void step1(String userId) {}
+
+    default void step2(String userId) {}
+
+    default void step3(String userId) {}
+
+    default void step4(String userId) {}
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/MerchantCertService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/MerchantCertService.java
new file mode 100644
index 0000000..59d472a
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/MerchantCertService.java
@@ -0,0 +1,49 @@
+package cn.pluss.platform.channel;
+
+import cn.pluss.platform.entity.SubMerchantApplyOrder;
+import com.alibaba.fastjson.JSONObject;
+
+/**
+ * 商户认证接口定义
+ */
+public interface MerchantCertService {
+
+    /**
+     * 商户微信实名认证
+     * @param merchantId    商户渠道编号
+     * @param merchantCode 商户code
+     */
+    void wxCert(String merchantId, String merchantCode);
+
+    /**
+     * 商户微信二次实名认证，失败后认证
+     * @param merchantId    商户渠道编号
+     * @param merchantCode 商户code
+     */
+    void wxReCert(String merchantId, String merchantCode);
+
+    /**
+     * 商户微信实名认证结果查询
+     * @param merchantId    商户编号
+     * @param wxApplyNo
+     */
+    JSONObject wxCertResult(String merchantId, String wxApplyNo);
+
+    /**
+     * 商户微信实名申请回调
+     */
+    JSONObject wxCertCallback(JSONObject certResult);
+
+    /**
+     * 商户微信认证申请撤销
+     * 认证信息
+     */
+    void wxCertCancel(String merchantId, SubMerchantApplyOrder subMerchantApplyOrder);
+
+    /**
+     * 微信认证授权状态
+     * @param merchantId    通道商编
+     */
+    default void wxCertAuthStatus(String merchantId) {}
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/PluginService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/PluginService.java
new file mode 100644
index 0000000..22202f8
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/PluginService.java
@@ -0,0 +1,28 @@
+package cn.pluss.platform.channel;
+
+import com.alibaba.fastjson.JSONObject;
+
+/**
+ * @author DJH
+ * 支付插件服务接口类
+ */
+//public interface PluginService {
+//
+//    /**
+//     * 插件进件请求
+//     * @param userId    用户id
+//     */
+//    void audit(String userId);
+//
+//    /**
+//     * 插件进件回调
+//     * @param jsonObject    回调参数
+//     */
+//    void auditCallback(JSONObject jsonObject);
+//
+//    /**
+//     * 获取终端列表
+//     * @param posMerId pos机商编
+//     */
+//    JSONObject termList(String posMerId);
+//}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/ys/YsExtensionService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/ys/YsExtensionService.java
new file mode 100644
index 0000000..305c42d
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/ys/YsExtensionService.java
@@ -0,0 +1,21 @@
+package cn.pluss.platform.channel.ys;
+
+/**
+ * 银盛通道额外的功能
+ * @author DJH
+ */
+public interface YsExtensionService {
+
+    /**
+     * 报备，进件自动报备失败时使用
+     * @param userId    用户id
+     */
+    void report(Long userId);
+
+    /**
+     * 重新报备，
+     * 报备过的的商户重新报备
+     * @param userId    用户id
+     */
+    void reportAgain(Long userId);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/common/AliyunService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/common/AliyunService.java
new file mode 100644
index 0000000..44b1a9e
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/common/AliyunService.java
@@ -0,0 +1,33 @@
+package cn.pluss.platform.common;
+
+import cn.pluss.platform.ipLocation.IpLocationService;
+import com.aliyuncs.auth.sts.AssumeRoleResponse;
+
+/**
+ * @author djh
+ * 提供阿里云服务部分功能接口调用
+ */
+public interface AliyunService extends IpLocationService {
+
+    /**
+     * 银行卡四要素
+     * @param phone         手机号
+     * @param bankCardNo    银行卡号
+     * @param certNo        身份证号
+     * @param realName      姓名
+     * @return  校验结果
+     */
+    void checkBankCorrect(String phone, String bankCardNo, String certNo, String realName);
+
+    /**
+     * 银行卡四要素
+     * @param phone         手机号
+     * @param bankCardNo    银行卡号
+     * @param certNo        身份证号
+     * @param realName      姓名
+     * @return  校验结果
+     */
+    void checkBankCorrect(String phone, String bankCardNo, String certNo, String realName, String errorMsg);
+
+    AssumeRoleResponse.Credentials stsToken(String userId);
+}
\ No newline at end of file
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/common/CommonRemarkService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/common/CommonRemarkService.java
new file mode 100644
index 0000000..fdd7948
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/common/CommonRemarkService.java
@@ -0,0 +1,17 @@
+package cn.pluss.platform.common;
+
+import cn.pluss.platform.entity.CommonRemark;
+import com.baomidou.mybatisplus.extension.service.IService;
+import lombok.val;
+
+/**
+ * <p>
+ * 通用备注表，存储一些通用备注 服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-06-24
+ */
+public interface CommonRemarkService extends IService<CommonRemark> {
+
+}
\ No newline at end of file
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/common/RiskBlacklistService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/common/RiskBlacklistService.java
new file mode 100644
index 0000000..b7c7f71
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/common/RiskBlacklistService.java
@@ -0,0 +1,47 @@
+package cn.pluss.platform.common;
+
+import cn.pluss.platform.dto.RiskBlacklistDTO;
+import cn.pluss.platform.entity.RiskBlacklist;
+import cn.pluss.platform.vo.RiskBlacklistVO;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 风控黑名单表 服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-09-07
+ */
+public interface RiskBlacklistService extends IService<RiskBlacklist> {
+
+    /**
+     * 添加黑名单数据并关闭商户交易权限
+     * @param riskBlacklistDTO 黑名单数据
+     */
+    void addData(RiskBlacklistDTO riskBlacklistDTO);
+
+    /**
+     * 拉黑单商户，并拉黑结算信息相关的账号信息
+     * @param riskBlacklistDTO 黑名单数据
+     */
+    void closeMerch(RiskBlacklistDTO riskBlacklistDTO);
+
+    Page<RiskBlacklistVO> page(Page<RiskBlacklistVO> page, Map<String, Object> condition);
+
+    /**
+     * 批量拉黑
+     * @param riskBlacklistDTO  黑名单数据
+     */
+    void batchAddData(RiskBlacklistDTO riskBlacklistDTO);
+
+    /**
+     * 解除拉黑
+     * @param opUserId  操作人用户id
+     * @param userId    用户id
+     */
+    void relieve(Long opUserId, Long userId);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/common/impl/AliyunServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/common/impl/AliyunServiceImpl.java
new file mode 100644
index 0000000..456ca0b
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/common/impl/AliyunServiceImpl.java
@@ -0,0 +1,197 @@
+package cn.pluss.platform.common.impl;
+
+import cn.pluss.platform.common.AliyunService;
+import cn.pluss.platform.config.OssConfig;
+import cn.pluss.platform.config.StsConfig;
+import cn.pluss.platform.dict.Bank4CacheService;
+import cn.pluss.platform.entity.Bank4Cache;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.util.HttpResult;
+import cn.pluss.platform.util.HttpUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.aliyuncs.DefaultAcsClient;
+import com.aliyuncs.IAcsClient;
+import com.aliyuncs.auth.sts.AssumeRoleRequest;
+import com.aliyuncs.auth.sts.AssumeRoleResponse;
+import com.aliyuncs.exceptions.ClientException;
+import com.aliyuncs.exceptions.ServerException;
+import com.aliyuncs.geoip.model.v20200101.DescribeIpv4LocationRequest;
+import com.aliyuncs.geoip.model.v20200101.DescribeIpv4LocationResponse;
+import com.aliyuncs.http.MethodType;
+import com.aliyuncs.profile.DefaultProfile;
+import com.aliyuncs.profile.IClientProfile;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.google.gson.Gson;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+
+import java.util.*;
+
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class AliyunServiceImpl implements AliyunService {
+
+    @Autowired
+    private Bank4CacheService bank4CacheService;
+
+    private final OssConfig ossConfig;
+
+    private final StsConfig stsConfig;
+
+    @Value("${aliyun.bankcard.app-code}")
+    private String appCode;
+
+    @Value("${aliyun.bankcard.bank-url}")
+    private String bankCheckUrl;
+
+    /**
+     * 不好用
+     * @param ip    ip
+     * @return
+     */
+    @Override
+    public DescribeIpv4LocationResponse getLocation(String ip) {
+        log.info("顾客 remote ip: {}", ip);
+        //
+        //
+        DefaultProfile profile = DefaultProfile.getProfile(ossConfig.getRegionId(), ossConfig.getKeyid(), ossConfig.getKeysecret());
+        IAcsClient client = new DefaultAcsClient(profile);
+
+        DescribeIpv4LocationRequest request = new DescribeIpv4LocationRequest();
+        request.setIp(ip);
+
+        try {
+            DescribeIpv4LocationResponse response = client.getAcsResponse(request);
+            log.info(new Gson().toJson(response));
+            return response;
+        } catch (ServerException e) {
+            e.printStackTrace();
+        } catch (ClientException e) {
+            log.error("ErrCode:" + e.getErrCode());
+            log.error("ErrMsg:" + e.getErrMsg());
+            log.error("RequestId:" + e.getRequestId());
+        }
+
+        return null;
+    }
+
+    @Override
+    public void checkBankCorrect(String phone, String bankCardNo, String certNo, String realName) {
+        Bank4Cache bank4Cache = new Bank4Cache();
+        bank4Cache.setPhone(phone);
+        bank4Cache.setBankCardNo(bankCardNo);
+        bank4Cache.setIdCardNo(certNo);
+        bank4Cache.setName(realName);
+        Calendar instance = Calendar.getInstance();
+        instance.add(Calendar.DAY_OF_MONTH, -1);
+        bank4Cache.setCreateTimeStart(instance.getTime());
+
+        Bank4Cache one = bank4CacheService.getOne(new QueryWrapper<>(bank4Cache).orderByDesc("createTime").last("limit 1"));
+        if (one != null) {
+            if (one.getStatus().equals(Bank4Cache.STATUS_PASS)) {
+                return;
+            } else {
+                log.error("银行卡四要素检查：" + one.getRemark());
+                throw new MsgException("身份证、银行卡或预留手机号信息不正确");
+            }
+        }
+
+        // 调用阿里云银行卡认证接口
+        Map<String, String> headers = new HashMap<>();
+        headers.put("Authorization", "APPCODE " + appCode);
+        Map<String, Object> querys = new HashMap<>();
+        querys.put("Mobile", phone);
+        querys.put("bankcard", bankCardNo);
+        querys.put("cardNo", certNo);
+        querys.put("realName", realName);
+        HttpResult response = null;
+        try {
+            response = HttpUtil.doGet(bankCheckUrl, headers, querys);
+            log.info(response.toString());
+        } catch (Exception e) {
+            e.printStackTrace();
+            try {
+                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            } catch (Exception ignored) {
+            }
+        }
+
+        JSONObject jsonObject = JSON.parseObject(response.getBody());
+
+        if (200 != response.getCode()) {
+            if (403 == response.getCode()) {
+                throw new MsgException("银行卡认证接口已欠费，请联系平台");
+            } else {
+                throw new MsgException("银行卡认证失败");
+            }
+        }
+        if (!"0".equalsIgnoreCase(jsonObject.getString("error_code"))) {
+            log.error("银行卡四要素检查：" + jsonObject.getString("reason"));
+            bank4Cache.setRemark(jsonObject.getString("reason"));
+            bank4Cache.setStatus(Bank4Cache.STATUS_FAIL);
+            bank4CacheService.save(bank4Cache);
+            throw new MsgException("身份证、银行卡或预留手机号信息不正确");
+        } else {
+            bank4Cache.setStatus(Bank4Cache.STATUS_PASS);
+            bank4CacheService.save(bank4Cache);
+        }
+    }
+
+    @Override
+    public void checkBankCorrect(String phone, String bankCardNo, String certNo, String realName, String errorMsg) {
+        try {
+            checkBankCorrect(phone, bankCardNo, certNo, realName);
+        } catch (Exception e) {
+            throw new MsgException(errorMsg);
+        }
+    }
+
+    @Override
+    public AssumeRoleResponse.Credentials stsToken(String userId) {
+        String endpoint = stsConfig.getEndpoint().replace("https://", "");
+        String accessKeyId = stsConfig.getKeyid();
+        String accessKeySecret = stsConfig.getKeysecret();
+        String roleArn = stsConfig.getRoleArn();
+        String roleSessionName = "-" + userId;
+
+        // 允许所有目录权限
+        JSONObject policyMap  = new JSONObject();
+        List<JSONObject> statementList= new LinkedList<>();
+        policyMap.put("Version", "1");
+        JSONObject statementMap = new JSONObject();
+        statementMap.put("Action", new String[] {"oss:*"});
+        statementMap.put("Resource", new String[] {"acs:oss:*:*:*"});
+        statementMap.put("Effect", "Allow");
+        statementList.add(statementMap);
+        policyMap.put("Statement", statementList);
+
+        try {
+            // 添加endpoint（直接使用STS endpoint，前两个参数留空，无需添加region ID）
+            DefaultProfile.addEndpoint( "", "Sts", endpoint);
+            // 构造default profile（参数留空，无需添加region ID）
+            IClientProfile profile = DefaultProfile.getProfile("", accessKeyId, accessKeySecret);
+            // 用profile构造client
+            DefaultAcsClient client = new DefaultAcsClient(profile);
+            final AssumeRoleRequest request = new AssumeRoleRequest();
+            request.setSysMethod(MethodType.POST);
+            request.setRoleArn(roleArn);
+            request.setRoleSessionName(roleSessionName);
+            // 若policy为空，则用户将获得该角色下所有权限
+            request.setPolicy(policyMap.toJSONString());
+            // 设置凭证有效时间
+            request.setDurationSeconds(3600L);
+            final AssumeRoleResponse response = client.getAcsResponse(request);
+            return response.getCredentials();
+        } catch (ClientException e) {
+            e.printStackTrace();
+            log.error("无法获取oss上传token");
+            throw new MsgException("无法获取oss上传凭证");
+        }
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/common/impl/CommonRemarkServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/common/impl/CommonRemarkServiceImpl.java
new file mode 100644
index 0000000..e383454
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/common/impl/CommonRemarkServiceImpl.java
@@ -0,0 +1,20 @@
+package cn.pluss.platform.common.impl;
+
+import cn.pluss.platform.common.CommonRemarkService;
+import cn.pluss.platform.entity.CommonRemark;
+import cn.pluss.platform.mapper.CommonRemarkMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 通用备注表，存储一些通用备注 服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-06-24
+ */
+@Service
+public class CommonRemarkServiceImpl extends ServiceImpl<CommonRemarkMapper, CommonRemark> implements CommonRemarkService {
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/common/impl/RiskBlacklistServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/common/impl/RiskBlacklistServiceImpl.java
new file mode 100644
index 0000000..664a650
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/common/impl/RiskBlacklistServiceImpl.java
@@ -0,0 +1,223 @@
+package cn.pluss.platform.common.impl;
+
+import cn.pluss.platform.common.RiskBlacklistService;
+import cn.pluss.platform.dto.AccountDTO;
+import cn.pluss.platform.dto.RiskBlacklistDTO;
+import cn.pluss.platform.entitiy.ShiroUser;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.RiskBlacklistMapper;
+import cn.pluss.platform.merchant.AccountService;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantStore.MerchantStoreService;
+import cn.pluss.platform.operationRecord.OperationRecordService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.userInfo.UserInfoService;
+import cn.pluss.platform.vo.RiskBlacklistVO;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 风控黑名单表 服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-09-07
+ */
+@Slf4j
+@Service
+public class RiskBlacklistServiceImpl extends ServiceImpl<RiskBlacklistMapper, RiskBlacklist> implements RiskBlacklistService {
+
+    @Autowired
+    private AccountService accountService;
+
+    @Autowired
+    private UserAppService uaService;
+
+    @Autowired
+    private UserInfoService uiService;
+
+    @Lazy
+    @Autowired
+    private RiskBlacklistService self;
+
+    @Autowired
+    private MerchantBaseInfoService mbiService;
+
+    @Autowired
+    private OperationRecordService opRecordService;
+
+    @Autowired
+    private MerchantStoreService msService;
+
+    @Override
+    public void addData(RiskBlacklistDTO riskBlacklistDTO) {
+        riskBlacklistDTO.setCauseUserId(riskBlacklistDTO.getUserId());
+        if (riskBlacklistDTO.getUserId() == null) {
+            throw new MsgException("缺少用户id");
+        }
+
+        if (riskBlacklistDTO.getPayWay() == null) {
+            throw new MsgException("缺少付款方式");
+        }
+
+        if (riskBlacklistDTO.getChannel() == null) {
+            throw new MsgException("缺少进件渠道");
+        }
+
+        if ("1".equals(riskBlacklistDTO.getConnectFlag() + "")) {
+            List<MerchantBaseInfo> mbiList = mbiService.getAllByUserId(riskBlacklistDTO.getUserId() + "");
+
+            for (MerchantBaseInfo mbi : mbiList) {
+                riskBlacklistDTO.setUserId(Integer.parseInt(mbi.getUserId()));
+                riskBlacklistDTO.setMerchantCode(mbi.getMerchantCode());
+
+                try {
+                    self.closeMerch(riskBlacklistDTO);
+                } catch (Exception e) {
+                    log.warn("关闭商户【{}】交易权限失败, 错误信息：{}", riskBlacklistDTO.getUserId(), e.getMessage());
+                }
+            }
+        } else {
+            MerchantBaseInfo mbi = mbiService.getMerchantBaseInfoByUserId(riskBlacklistDTO.getUserId() + "");
+            riskBlacklistDTO.setUserId(Integer.parseInt(mbi.getUserId()));
+            riskBlacklistDTO.setMerchantCode(mbi.getMerchantCode());
+            try {
+                self.closeMerch(riskBlacklistDTO);
+            } catch (Exception e) {
+                log.warn("关闭商户【{}】交易权限失败", riskBlacklistDTO.getUserId());
+            }
+        }
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void closeMerch(RiskBlacklistDTO riskBlacklistDTO) {
+
+//        MerchantChannelStatus mcs = channelStatusMapper.getByMerchantCode(riskBlacklistDTO.getMerchantCode(), riskBlacklistDTO.getChannel());
+//
+//        if (mcs == null || !MerchantChannelStatus.AUDIT_STATUS_SUCCESS.equals(mcs.getStatus())) {
+//            throw new MsgException("所选商户所选通道下未进件");
+//        }
+
+        AccountDTO accountDTO = accountService.getRealAccount(riskBlacklistDTO.getUserId() + "");
+        if (accountDTO == null || accountDTO.getIdcard() == null) {
+            throw new MsgException("未查询到结算身份信息");
+        }
+        riskBlacklistDTO.setCertName(accountDTO.getIdcard().getCertName());
+        riskBlacklistDTO.setIdcardNo(accountDTO.getIdcard().getCertNo());
+
+        LambdaQueryWrapper<RiskBlacklist> qWrapperRiskBlacklist = Wrappers.lambdaQuery();
+        qWrapperRiskBlacklist.eq(RiskBlacklist::getCertName, riskBlacklistDTO.getCertName())
+                .eq(RiskBlacklist::getIdcardNo, riskBlacklistDTO.getIdcardNo())
+                .last("limit 1");
+        RiskBlacklist existData = getOne(qWrapperRiskBlacklist);
+        if (existData != null) {
+            return;
+        }
+
+        // 只包含userId和merchantCode
+        List<MerchantBaseInfo> mbiList = accountService.getMbiListCertNo(riskBlacklistDTO.getIdcardNo());
+
+        // 要插入的数据
+        List<RiskBlacklist> addList = new ArrayList<>();
+        // 要关闭交易权限的商编列表
+        List<String> merchCodeList = new ArrayList<>();
+        // 关闭交易权限的备注信息
+        List<OperationRecord> opRecordList = new ArrayList<>();
+
+        for (MerchantBaseInfo mbi : mbiList) {
+            RiskBlacklist entity = new RiskBlacklist();
+            entity.setChannel(riskBlacklistDTO.getChannel());
+            entity.setRemark(riskBlacklistDTO.getRemark());
+            entity.setUserId(Integer.parseInt(mbi.getUserId()));
+            entity.setIdcardNo(riskBlacklistDTO.getIdcardNo());
+            entity.setCertName(riskBlacklistDTO.getCertName());
+            entity.setPayWay(riskBlacklistDTO.getPayWay());
+            entity.setCauseUserId(riskBlacklistDTO.getCauseUserId());
+
+            OperationRecord opRecord = new OperationRecord();
+            opRecord.setUserId(mbi.getUserId());
+            opRecord.setRemark(riskBlacklistDTO.getRemark());
+            opRecord.setDictValue("GBSHJYGN");
+            opRecordList.add(opRecord);
+
+            addList.add(entity);
+            merchCodeList.add(mbi.getMerchantCode());
+        }
+
+        LambdaUpdateWrapper<MerchantStore> uWrapper = Wrappers.lambdaUpdate();
+        uWrapper.set(MerchantStore::getStatus, "2")
+                .in(MerchantStore::getMerchantCode, merchCodeList);
+        // 保存黑名单信息
+        saveBatch(addList);
+        // 变更店铺状态
+        riskBlacklistDTO.setCount(riskBlacklistDTO.getCount() + (addList.size()));
+        msService.update(uWrapper);
+        // 保存商户拉黑的备注
+        opRecordService.saveBatch(opRecordList);
+
+        // 修改后台可操控的推广权限字段, 关闭推广权限
+        UserInfo ui = uiService.getById(riskBlacklistDTO.getUserId());
+        ui.setStatus(UserInfo.STATUS_NO_SPREAD);
+        uiService.updateById(ui);
+
+        LambdaUpdateWrapper<UserInfo> uWrapper3 = Wrappers.lambdaUpdate();
+        uWrapper3.set(UserInfo::getStatus, UserInfo.STATUS_NO_SPREAD)
+                .eq(UserInfo::getId, riskBlacklistDTO.getUserId());
+        uiService.update(uWrapper3);
+    }
+
+    @Override
+    public Page<RiskBlacklistVO> page(Page<RiskBlacklistVO> page, Map<String, Object> condition) {
+        return getBaseMapper().selectPageVO(page, condition);
+    }
+
+    @Override
+    public void batchAddData(RiskBlacklistDTO riskBlacklistDTO) {
+        if (riskBlacklistDTO.getUserIdArr().isEmpty()) {
+            throw new MsgException("缺少id信息");
+        }
+
+        for (String userId : riskBlacklistDTO.getUserIdArr()) {
+            riskBlacklistDTO.setUserId(Integer.parseInt(userId));
+            addData(riskBlacklistDTO);
+        }
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void relieve(Long opUserId, Long userId) {
+        RiskBlacklist exist = new RiskBlacklist();
+        exist.setUserId(userId.intValue());
+
+        exist = getOne(new QueryWrapper<>(exist));
+
+        if (exist == null) {
+            return;
+        }
+
+        // 先移除黑名单的数据
+        removeById(exist.getId());
+        // 如果是商户，则把商户禁用解除
+        msService.enableMerchantStore(opUserId, userId, "解除拉黑");
+        // 修改后台可操控的推广权限字段, 打开推广权限
+        UserInfo ui = uiService.getById(userId);
+        ui.setStatus(UserInfo.STATUS_VALID);
+        uiService.updateById(ui);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/config/RabbitConfig.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/config/RabbitConfig.java
new file mode 100644
index 0000000..2f2994b
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/config/RabbitConfig.java
@@ -0,0 +1,19 @@
+package cn.pluss.platform.config;
+
+import org.springframework.amqp.core.Queue;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author SSS
+ */
+@Configuration
+@ConditionalOnProperty(prefix = "rabbitmq", name = "enabled", havingValue = "true")
+public class RabbitConfig {
+
+    @Bean
+    public Queue queue() {
+        return new Queue("payCallback");
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/device/DeviceBsjService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/DeviceBsjService.java
new file mode 100644
index 0000000..b58aa00
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/DeviceBsjService.java
@@ -0,0 +1,31 @@
+package cn.pluss.platform.device;
+
+import cn.pluss.platform.entity.DeviceBsj;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+
+/**
+ * <p>
+ * 服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-05-09
+ */
+public interface DeviceBsjService extends IService<DeviceBsj> {
+
+    /**
+     * 导入博实结流量卡过期数据
+     *
+     * @param file 过期文件数据
+     * @throws IOException ignored
+     */
+    void importExpiredTime(MultipartFile file) throws IOException;
+
+    /**
+     * 给一个月内即将到期的流量卡所属商户，发送流量充值的通知
+     */
+    void sendBatchExpiredNotice();
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/device/DeviceGoodTagService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/DeviceGoodTagService.java
new file mode 100644
index 0000000..dd4ecbe
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/DeviceGoodTagService.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.device;
+
+import cn.pluss.platform.entity.DeviceGoodTag;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 商品标签表 服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-04-21
+ */
+public interface DeviceGoodTagService extends IService<DeviceGoodTag> {
+    
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/device/DeviceOperateInfoService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/DeviceOperateInfoService.java
new file mode 100644
index 0000000..93a3645
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/DeviceOperateInfoService.java
@@ -0,0 +1,41 @@
+package cn.pluss.platform.device;
+
+import cn.pluss.platform.entity.DeviceOperateInfo;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.enums.DeviceOperateType;
+import cn.pluss.platform.vo.DeviceOperateInfoVO;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 设备信息流转表 服务类
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-04-02
+ */
+public interface DeviceOperateInfoService extends IService<DeviceOperateInfo> {
+
+    /**
+     * 保存设备操作信息
+     * @param userApp
+     * @param type
+     * @param deviceNo
+     * @param remark
+     */
+    void saveDeviceOperateInfo(UserApp userApp, DeviceOperateType type,String deviceNo,String remark);
+
+    void saveDeviceOperateListInfo(UserApp userApp, DeviceOperateType type,List<String> deviceNoList,String remark);
+
+    /**
+     * 查询设备号查询指定设备流转详情
+     * @param snNo
+     * @return
+     */
+    List<DeviceOperateInfoVO> selectListVoByDeviceNo(String snNo);
+
+    Page<DeviceOperateInfoVO> pageInfo(Page<DeviceOperateInfoVO> page, DeviceOperateInfo condition);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/device/DeviceOrderInfoService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/DeviceOrderInfoService.java
new file mode 100644
index 0000000..32938ec
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/DeviceOrderInfoService.java
@@ -0,0 +1,29 @@
+package cn.pluss.platform.device;
+
+import cn.pluss.platform.dto.DeviceMerchantBuyDTO;
+import cn.pluss.platform.entity.DeviceOrderInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 设备商城，订单记录表 服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-11-13
+ */
+public interface DeviceOrderInfoService extends IService<DeviceOrderInfo> {
+
+    /**
+     * 根据设备商城下单信息新建订单
+     * @param deviceMerchantBuyDTO
+     */
+    void createOrder(String orderNo, DeviceMerchantBuyDTO deviceMerchantBuyDTO);
+
+    /**
+     * 根据订单号查询设备订单信息
+     * @param orderNo
+     * @return
+     */
+    DeviceOrderInfo getDeviceInfoByOrderNo(String orderNo);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/device/DeviceService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/DeviceService.java
new file mode 100644
index 0000000..f01ee18
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/DeviceService.java
@@ -0,0 +1,31 @@
+package cn.pluss.platform.device;
+
+import java.util.List;
+import java.util.Map;
+import cn.pluss.platform.entity.Device;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+public interface DeviceService  extends IService<Device> {
+
+    public Device queryDevice(Device device);
+
+    public List<Device> queryDeviceList(Device device);
+
+    public void saveDevice(Device device);
+
+    public void updateDevice(Device device);
+
+    public void deleteDevice(Device device);
+
+    public List<Device> queryDevicePage(Map map);
+
+    public Integer queryDevicePageCount(Map map);
+
+    public void saveDeviceBatch(List<Device> deviceList);
+
+    Page<Device> pageDate(Page<Device> page, Device device);
+
+    Device getDeviceId(Integer id);
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/device/DeviceSpecService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/DeviceSpecService.java
new file mode 100644
index 0000000..1fe5cb2
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/DeviceSpecService.java
@@ -0,0 +1,34 @@
+package cn.pluss.platform.device;
+
+import cn.pluss.platform.entity.DeviceSpec;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 设备规格表 服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-03-04
+ */
+public interface DeviceSpecService extends IService<DeviceSpec> {
+
+    default DeviceSpec getByCodeAndSpec(String code, String spec) {
+        LambdaQueryWrapper<DeviceSpec> qWrapper = Wrappers.lambdaQuery();
+        qWrapper.eq(DeviceSpec::getCode, code);
+        qWrapper.eq(DeviceSpec::getSpec, spec);
+
+        return getOne(qWrapper);
+    }
+
+    default List<DeviceSpec> listByCode(String code) {
+        LambdaQueryWrapper<DeviceSpec> qWrapper = Wrappers.lambdaQuery();
+        qWrapper.eq(DeviceSpec::getCode, code);
+
+        return list(qWrapper);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/device/DeviceStockGroupService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/DeviceStockGroupService.java
new file mode 100644
index 0000000..7640fec
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/DeviceStockGroupService.java
@@ -0,0 +1,7 @@
+package cn.pluss.platform.device;
+
+import cn.pluss.platform.entity.DeviceStockGroup;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+public interface DeviceStockGroupService extends IService<DeviceStockGroup> {
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/device/DeviceTransferDetailService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/DeviceTransferDetailService.java
new file mode 100644
index 0000000..8d74e97
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/DeviceTransferDetailService.java
@@ -0,0 +1,25 @@
+package cn.pluss.platform.device;
+
+import cn.pluss.platform.entity.DeviceTransferDetail;
+import cn.pluss.platform.vo.DeviceTransferDetailVO;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 划拨详情表 服务类
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-03-31
+ */
+public interface DeviceTransferDetailService extends IService<DeviceTransferDetail> {
+
+    /**
+     * 根据tid查询划拨明细
+     * @param tid
+     * @return
+     */
+    List<DeviceTransferDetailVO> selectListByTid(Long tid);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/device/DeviceTransferService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/DeviceTransferService.java
new file mode 100644
index 0000000..7fdb351
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/DeviceTransferService.java
@@ -0,0 +1,44 @@
+package cn.pluss.platform.device;
+
+import cn.pluss.platform.dto.DeviceTransferDTO;
+import cn.pluss.platform.entity.DeviceTransfer;
+import cn.pluss.platform.vo.DeviceTransferVO;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 设备划拨记录表 服务类
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-03-31
+ */
+public interface DeviceTransferService extends IService<DeviceTransfer> {
+    /**
+     * 设备划拨操作
+     * @param dto
+     */
+    void transfer(DeviceTransferDTO dto);
+
+    /**
+     * 划拨记录分页查询
+     * @param page
+     * @param dto
+     * @return
+     */
+    Page<DeviceTransferVO> pageInfo(Page<DeviceTransferVO> page, DeviceTransferDTO dto);
+
+    /**
+     * 查询划拨明细
+     * @param dto
+     * @return
+     */
+    DeviceTransferVO getDetail(DeviceTransferDTO dto);
+
+    /**
+     * 设备接收操作
+     * @param dto
+     */
+    void accept(DeviceTransferDTO dto);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/device/DeviceTypeService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/DeviceTypeService.java
new file mode 100644
index 0000000..e8d2534
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/DeviceTypeService.java
@@ -0,0 +1,24 @@
+package cn.pluss.platform.device;
+
+import cn.pluss.platform.entity.DeviceType;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 设备类型表 服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-03-04
+ */
+public interface DeviceTypeService extends IService<DeviceType> {
+
+    default DeviceType getByCode(String code) {
+        LambdaQueryWrapper<DeviceType> qWrapper = Wrappers.lambdaQuery();
+        qWrapper.eq(DeviceType::getCode, code);
+
+        return getOne(qWrapper);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/device/MercDeviceRefundImageService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/MercDeviceRefundImageService.java
new file mode 100644
index 0000000..d39711f
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/MercDeviceRefundImageService.java
@@ -0,0 +1,25 @@
+package cn.pluss.platform.device;
+
+import cn.pluss.platform.entity.MercDeviceRefundImage;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * <p>
+ * 商户设备订单退款图片表 服务类
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-03-31
+ */
+public interface MercDeviceRefundImageService extends IService<MercDeviceRefundImage> {
+
+    /**
+     * 根据detailId获取图片列表
+     * @param id
+     * @return
+     */
+    List<String> selectListByDetailId(Serializable id);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/device/MercOrderDetailService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/MercOrderDetailService.java
new file mode 100644
index 0000000..f3b1401
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/MercOrderDetailService.java
@@ -0,0 +1,108 @@
+package cn.pluss.platform.device;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.dto.MercOrderDetailDTO;
+import cn.pluss.platform.entity.MercOrderDetail;
+import cn.pluss.platform.entity.PhoneValidateCode;
+import cn.pluss.platform.vo.MercOrderExpressVO;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 订单详情表 服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-03-17
+ */
+public interface MercOrderDetailService extends IService<MercOrderDetail> {
+
+    void receiving(Long id);
+
+    /**
+     * 查看物流信息
+     * @param id
+     * @return
+     */
+    MercOrderExpressVO getOrderExpressInfo(Long id);
+
+    /**
+     * 根据订单号查询订单详情
+     * @param orderNo
+     * @param status
+     * @return
+     */
+    List<MercOrderDetail> getDetailByOrderNo(String orderNo,String status);
+
+    /**
+     * 设备订单退款
+     * @param dto
+     */
+    void refund(MercOrderDetailDTO dto);
+
+    /**
+     * 设置退款物流单号
+     * @param dto
+     */
+    void setRefundExpressNo(MercOrderDetailDTO dto);
+
+    /**
+     * 审核退款
+     * @param orderDetail
+     * @return
+     */
+    Result<Object> auditRefund(MercOrderDetail orderDetail);
+
+    /**
+     * 获取手机验证码
+     * @param phoneValidateCode
+     * @return
+     */
+    Result<Object> getVerifyCode(PhoneValidateCode phoneValidateCode);
+
+    /**
+     * 推送物流信息
+     * @param ids
+     * @return
+     */
+    Result<Object> printLogistInfo(List<Long> ids);
+
+    /**
+     * 分页查询
+     * @param page
+     * @param condition
+     * @return
+     */
+    Page<MercOrderDetail> pageInfo(Page<MercOrderDetail> page, MercOrderDetail condition);
+
+    /**
+     * 拒绝退货，退款申请
+     * @param orderDetail
+     */
+    void refundReject(MercOrderDetail orderDetail);
+
+    /**
+     * 同意退货
+     * @param id
+     */
+    void refundAgree(Long id);
+
+    /**
+     * 填写快递单号
+     * @param id
+     * @param expressNo
+     * @return
+     */
+    Result<Object> inputExpressNo(Long id, String expressNo);
+
+    /**
+     * 根据订单查询和类型查询订单详情
+     * @param orderNo
+     * @param code
+     * @return
+     */
+    List<MercOrderDetail> listByOrderNoAndCode(String orderNo, String code);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/device/MercOrderExpressDetailService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/MercOrderExpressDetailService.java
new file mode 100644
index 0000000..bd3cc12
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/MercOrderExpressDetailService.java
@@ -0,0 +1,19 @@
+package cn.pluss.platform.device;
+
+import cn.pluss.platform.entity.MercOrderExpressDetail;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 商户订单物流详情 服务类
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-03-24
+ */
+public interface MercOrderExpressDetailService extends IService<MercOrderExpressDetail> {
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/device/MercOrderExpressService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/MercOrderExpressService.java
new file mode 100644
index 0000000..f575bc8
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/MercOrderExpressService.java
@@ -0,0 +1,11 @@
+package cn.pluss.platform.device;
+
+import cn.pluss.platform.entity.MercOrderExpress;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+public interface MercOrderExpressService extends IService<MercOrderExpress> {
+
+    MercOrderExpress getByLogistNo(String logistNo);
+
+    MercOrderExpress getByExpressNo(String expressNo);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/device/MercOrderNewService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/MercOrderNewService.java
new file mode 100644
index 0000000..00016b3
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/MercOrderNewService.java
@@ -0,0 +1,77 @@
+package cn.pluss.platform.device;
+
+import cn.pluss.platform.dto.MercOrderNewDTO;
+import cn.pluss.platform.entity.MercOrderNew;
+import cn.pluss.platform.vo.MercOrderExpressVO;
+import cn.pluss.platform.vo.MercOrderNewVO;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 新的订单表 服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-03-17
+ */
+public interface MercOrderNewService extends IService<MercOrderNew> {
+
+    /**
+     * 设备订单分页查询
+     * @param page
+     * @param condition
+     * @return
+     */
+    Page<MercOrderNewVO> pageInfo(Page<MercOrderNewVO> page, MercOrderNewVO condition);
+
+    /**
+     * 确认收货
+     * @param id
+     */
+    void receiving(Long id);
+
+    /**
+     * 获取订单物流信息
+     * @param id
+     * @return
+     */
+    MercOrderExpressVO getOrderExpressInfo(Long id);
+
+    Object apiCreateOrder(MercOrderNewDTO orderNewDTO);
+
+    Object createOrder(MercOrderNewDTO orderNewDTO);
+
+    /**
+     * 获取订单邮费信息
+     * @param orderNewDTO
+     * @return
+     */
+    Object getOrderPostageInfo(MercOrderNewDTO orderNewDTO);
+
+    MercOrderNew getOrderByNo(String orderNumber);
+
+    /**
+     * 设备订单支付回调
+     * @param newOrder
+     */
+    void proPayCallback(MercOrderNew newOrder, Date transDt,String transNo,String thirdTransNo);
+
+    /**
+     * 设备回调V2
+     * @param orderNo
+     * @param tradeNo
+     * @param thridTradeNo
+     * @param transDt
+     */
+    void devicePaySuccessNotifyV2(String orderNo, String tradeNo, String thridTradeNo, Date transDt,MercOrderNew newOrder);
+
+    /**
+     * 查询订单支付状态
+     * @param orderNewDTO
+     * @return
+     */
+    Object getOrderStatusInfo(MercOrderNewDTO orderNewDTO);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/device/MercReceiveAddressService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/MercReceiveAddressService.java
new file mode 100644
index 0000000..a13bf42
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/MercReceiveAddressService.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.device;
+
+import cn.pluss.platform.entity.MercReceiveAddress;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 设备商城用户地址表 服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-03-21
+ */
+public interface MercReceiveAddressService extends IService<MercReceiveAddress> {
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/device/MercShopTrolleyService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/MercShopTrolleyService.java
new file mode 100644
index 0000000..e08d2b7
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/MercShopTrolleyService.java
@@ -0,0 +1,34 @@
+package cn.pluss.platform.device;
+
+import cn.pluss.platform.entity.MercShopTrolley;
+import cn.pluss.platform.vo.DeviceGoodsVO;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 购物车表 服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-03-16
+ */
+public interface MercShopTrolleyService extends IService<MercShopTrolley> {
+
+    void apiAdd(MercShopTrolley entity);
+
+    void add(MercShopTrolley entity);
+
+    void apiUpdate(MercShopTrolley entity);
+
+    void update(MercShopTrolley entity);
+
+    List<MercShopTrolley> listByUserId(Long userId);
+
+    List<MercShopTrolley> apiList();
+
+    List<DeviceGoodsVO> shopTrolleyListByUserId(Long userId);
+
+    List<DeviceGoodsVO> apiShopTrolleyList();
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/DeviceBsjServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/DeviceBsjServiceImpl.java
new file mode 100644
index 0000000..300155c
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/DeviceBsjServiceImpl.java
@@ -0,0 +1,102 @@
+package cn.pluss.platform.device.impl;
+
+import cn.pluss.platform.device.DeviceBsjService;
+import cn.pluss.platform.deviceStock.DeviceStockService;
+import cn.pluss.platform.dict.DictService;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.mapper.DeviceBsjMapper;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.notice.NoticeService;
+import cn.pluss.platform.notice.template.NoticeTemplateService;
+import cn.pluss.platform.row.DeviceBsjRowGetter;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.util.excel.ExcelImportUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-05-09
+ */
+@Service
+public class DeviceBsjServiceImpl extends ServiceImpl<DeviceBsjMapper, DeviceBsj> implements DeviceBsjService {
+
+    @Autowired
+    private DeviceStockService deviceStockService;
+
+    @Autowired
+    private MerchantBaseInfoService mbiService;
+
+    @Autowired
+    private UserAppService uaService;
+
+    @Autowired
+    private DictService dictService;
+
+    @Autowired
+    private NoticeService noticeService;
+
+    @Autowired
+    private NoticeTemplateService templateService;
+
+    @Override
+    public void importExpiredTime(MultipartFile file) throws IOException {
+        final List<DeviceBsj> dataList = ExcelImportUtil.readExcel(file, new DeviceBsjRowGetter(), 1);
+
+        if (dataList.isEmpty()) {
+            return;
+        }
+
+        LambdaQueryWrapper<DeviceBsj> qWrapper = Wrappers.lambdaQuery();
+
+        for (DeviceBsj item : dataList) {
+            qWrapper.clear();
+            qWrapper.eq(DeviceBsj::getIccid, item.getIccid());
+            DeviceBsj existData = getOne(qWrapper);
+            if (existData == null) {
+                continue;
+            }
+
+            existData.setSim(item.getSim());
+            existData.setSimExpireTime(item.getSimExpireTime());
+
+            LambdaUpdateWrapper<DeviceBsj> uWrapper = Wrappers.lambdaUpdate();
+            uWrapper.eq(DeviceBsj::getIccid, existData.getIccid());
+            update(existData, uWrapper);
+        }
+    }
+
+    @Override
+    public void sendBatchExpiredNotice() {
+        List<Map<String, Object>> deviceInfoList = baseMapper.selectLastMonthExpiredData();
+        final NoticeTemplate noticeTemplate = templateService.getNoticeTemplateByType("33");
+
+        Dict dict = new Dict();
+        dict.setValue("33");
+        dict = dictService.getByCode("notice_template_type", dict);
+
+        String url = "https://www.shouyinbei.net/wap/merchantDevice/simChargeIndex";
+
+        // 根据模版发送通知
+        for (Map<String, Object> deviceInfo : deviceInfoList) {
+            noticeService.sendTempNotice(dict.getName(), noticeTemplate.getContent(), noticeTemplate.getContent(), url,
+                    deviceInfo.get("userId").toString(), deviceInfo.get("alias"), deviceInfo.get("snNo"));
+        }
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/DeviceGoodTagServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/DeviceGoodTagServiceImpl.java
new file mode 100644
index 0000000..c973faa
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/DeviceGoodTagServiceImpl.java
@@ -0,0 +1,62 @@
+package cn.pluss.platform.device.impl;
+
+import cn.pluss.platform.DeviceGoodsService;
+import cn.pluss.platform.device.DeviceGoodTagService;
+import cn.pluss.platform.entity.DeviceGoodTag;
+import cn.pluss.platform.entity.DeviceGoods;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.DeviceGoodTagMapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.io.Serializable;
+import java.util.Objects;
+
+/**
+ * <p>
+ * 商品标签表 服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-04-21
+ */
+@Service
+public class DeviceGoodTagServiceImpl extends ServiceImpl<DeviceGoodTagMapper, DeviceGoodTag> implements DeviceGoodTagService {
+
+    @Autowired
+    private DeviceGoodsService goodsService;
+
+    @Override
+    public boolean saveOrUpdate(DeviceGoodTag entity) {
+        LambdaQueryWrapper<DeviceGoodTag> qWrapper = Wrappers.lambdaQuery();
+        qWrapper.eq(DeviceGoodTag::getTag, entity.getTag());
+        DeviceGoodTag exist = baseMapper.selectOne(qWrapper);
+
+        if (exist == null) {
+            baseMapper.insert(entity);
+        } else {
+            if (Objects.equals(exist.getId(), entity.getId())) {
+                baseMapper.updateById(entity);
+            } else {
+                throw new MsgException("存在重复的标签，请勿重复添加");
+            }
+        }
+
+        return super.saveOrUpdate(entity);
+    }
+
+    @Override
+    public boolean removeById(Serializable id) {
+        LambdaQueryWrapper<DeviceGoods> qWrapper = Wrappers.lambdaQuery();
+        qWrapper.eq(DeviceGoods::getTagId, id);
+        int count = goodsService.count(qWrapper);
+        if (count > 0) {
+            throw new MsgException("当前标签分类已存在商品，请修改商品标签分类后再执行该操作");
+        }
+
+        return super.removeById(id);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/DeviceOperateInfoServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/DeviceOperateInfoServiceImpl.java
new file mode 100644
index 0000000..0d4e534
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/DeviceOperateInfoServiceImpl.java
@@ -0,0 +1,77 @@
+package cn.pluss.platform.device.impl;
+
+import cn.pluss.platform.device.DeviceOperateInfoService;
+import cn.pluss.platform.entity.DeviceOperateInfo;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.enums.DeviceOperateType;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.DeviceOperateInfoMapper;
+import cn.pluss.platform.vo.DeviceOperateInfoVO;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ * 设备信息流转表 服务实现类
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-04-02
+ */
+@Service
+public class DeviceOperateInfoServiceImpl extends ServiceImpl<DeviceOperateInfoMapper, DeviceOperateInfo> implements DeviceOperateInfoService {
+
+    /**
+     * 保存设备操作信息
+     * @param userApp
+     * @param type
+     * @param deviceNo
+     * @param remark
+     */
+    @Override
+    public void saveDeviceOperateInfo(UserApp userApp, DeviceOperateType type,String deviceNo,String remark) {
+        MsgException.checkNull(type,"设备操作类型不能为空");
+        MsgException.checkBlank(deviceNo,"设备号不能为空");
+        DeviceOperateInfo info = new DeviceOperateInfo(userApp,type.getCode(),deviceNo,remark);
+        baseMapper.insert(info);
+    }
+
+    /**
+     * 批量操作
+     * @param userApp
+     * @param type
+     * @param deviceNoList
+     * @param remark
+     */
+    @Override
+    public void saveDeviceOperateListInfo(UserApp userApp, DeviceOperateType type, List<String> deviceNoList, String remark) {
+        MsgException.checkNull(type,"设备操作类型不能为空");
+        MsgException.check(deviceNoList.size() == 0,"设备号集合不能为空");
+        List<DeviceOperateInfo> list = new ArrayList<>(deviceNoList.size());
+        for (String deviceNo:deviceNoList) {
+            DeviceOperateInfo info = new DeviceOperateInfo(userApp,type.getCode(),deviceNo,remark);
+            list.add(info);
+        }
+        saveBatch(list);
+    }
+
+    /**
+     * 查询设备号查询指定设备流转详情
+     * @param snNo
+     * @return
+     */
+    @Override
+    public List<DeviceOperateInfoVO> selectListVoByDeviceNo(String snNo) {
+        MsgException.checkBlank(snNo,"缺失设备号！");
+        return baseMapper.selectListVo(snNo);
+    }
+
+    @Override
+    public Page<DeviceOperateInfoVO> pageInfo(Page<DeviceOperateInfoVO> page, DeviceOperateInfo condition) {
+        return baseMapper.pageInfo(page,condition);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/DeviceOrderInfoServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/DeviceOrderInfoServiceImpl.java
new file mode 100644
index 0000000..e745a99
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/DeviceOrderInfoServiceImpl.java
@@ -0,0 +1,86 @@
+package cn.pluss.platform.device.impl;
+
+import cn.pluss.platform.device.DeviceOrderInfoService;
+import cn.pluss.platform.deviceDetail.DeviceDetailService;
+import cn.pluss.platform.dto.DeviceMerchantBuyDTO;
+import cn.pluss.platform.entity.DeviceDetail;
+import cn.pluss.platform.entity.DeviceOrderInfo;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.DeviceOrderInfoMapper;
+import cn.pluss.platform.userApp.UserAppService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 设备商城，订单记录表 服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-11-13
+ */
+@Slf4j
+@Service
+public class DeviceOrderInfoServiceImpl extends ServiceImpl<DeviceOrderInfoMapper, DeviceOrderInfo> implements DeviceOrderInfoService {
+
+    @Setter(onMethod_ = {@Autowired})
+    private DeviceDetailService deviceDetailService;
+    @Setter(onMethod_ = {@Autowired})
+    private UserAppService userAppService;
+
+    @Override
+    public void createOrder(String orderNo, DeviceMerchantBuyDTO deviceMerchantBuyDTO) {
+        DeviceDetail deviceDetail = new DeviceDetail();
+        deviceDetail.setVenderModel(deviceMerchantBuyDTO.getVenderModel());
+        deviceDetail.setCode(deviceMerchantBuyDTO.getCode());
+        deviceDetail.setType(deviceMerchantBuyDTO.getType());
+
+        List<DeviceDetail> list = deviceDetailService.list(new QueryWrapper<>(deviceDetail));
+
+        if (list.size() == 0) {
+            throw new MsgException("无法找到对应的设备信息");
+        }
+
+        if (list.size() > 1) {
+            throw new MsgException("无法确认唯一设备");
+        }
+
+        deviceDetail = list.get(0);
+
+        UserApp userApp = userAppService.queryUserAppByToken();
+
+        DeviceOrderInfo deviceOrderInfo = new DeviceOrderInfo();
+        BeanUtils.copyProperties(deviceDetail, deviceOrderInfo);
+        deviceOrderInfo.setSumPrice(BigDecimal.valueOf(deviceMerchantBuyDTO.getOrderAmount()));
+        deviceOrderInfo.setNum(deviceMerchantBuyDTO.getQuantity());
+        deviceOrderInfo.setDeviceType(deviceDetail.getType());
+        deviceOrderInfo.setStatus("0");
+        deviceOrderInfo.setUserId(userApp.getUserId().toString());
+        deviceOrderInfo.setOrderNo(orderNo);
+        deviceOrderInfo.setOrderType(deviceMerchantBuyDTO.getOrderType());
+        deviceOrderInfo.setCreateTime(new Date());
+        deviceOrderInfo.setUpdateTime(new Date());
+
+        save(deviceOrderInfo);
+    }
+
+    /**
+     * 根据订单号查询设备订单信息
+     * @param orderNo
+     * @return
+     */
+    @Override
+    public DeviceOrderInfo getDeviceInfoByOrderNo(String orderNo) {
+        return baseMapper.getDeviceInfoByOrderNo(orderNo);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/DeviceServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/DeviceServiceImpl.java
new file mode 100644
index 0000000..141824d
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/DeviceServiceImpl.java
@@ -0,0 +1,71 @@
+package cn.pluss.platform.device.impl;
+
+import java.util.List;
+import java.util.Map;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import cn.pluss.platform.entity.Device;
+import cn.pluss.platform.device.DeviceService;
+import cn.pluss.platform.mapper.DeviceMapper;
+
+@Transactional
+@Service("deviceService")
+public class DeviceServiceImpl extends ServiceImpl<DeviceMapper,Device> implements DeviceService{
+
+	 private static final Logger logger = LoggerFactory.getLogger( DeviceServiceImpl.class);
+
+
+    @Autowired
+	  private DeviceMapper deviceMapper;
+
+    @Override
+    public Device queryDevice(Device device){
+        return deviceMapper.queryDevice(device);
+    }
+
+    @Override
+    public List<Device> queryDeviceList(Device device){
+        return deviceMapper.queryDeviceList(device);
+    }
+    @Override
+    public void saveDevice(Device device){
+          deviceMapper.saveDevice(device);
+    }
+    @Override
+    public void updateDevice(Device device){
+        deviceMapper.updateDevice(device);
+    }
+    @Override
+    public void deleteDevice(Device device){
+        deviceMapper.deleteDevice(device);
+    }
+    @Override
+    public List<Device> queryDevicePage(Map map){
+        return deviceMapper.queryDevicePage(map);
+    }
+    @Override
+    public Integer queryDevicePageCount(Map map){
+        return deviceMapper.queryDevicePageCount(map);
+    }
+    @Override
+    public void saveDeviceBatch(List<Device> deviceList) {
+         deviceMapper.saveDeviceBatch(deviceList);
+    }
+
+    @Override
+    public Page<Device> pageDate(Page<Device> page, Device device) {
+        return baseMapper.pageDate(page,device);
+    }
+
+    @Override
+    public Device getDeviceId(Integer id) {
+        return baseMapper.getDeviceId(id);
+    }
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/DeviceSpecServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/DeviceSpecServiceImpl.java
new file mode 100644
index 0000000..b1ae99e
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/DeviceSpecServiceImpl.java
@@ -0,0 +1,20 @@
+package cn.pluss.platform.device.impl;
+
+import cn.pluss.platform.device.DeviceSpecService;
+import cn.pluss.platform.entity.DeviceSpec;
+import cn.pluss.platform.mapper.DeviceSpecMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 设备规格表 服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-03-04
+ */
+@Service
+public class DeviceSpecServiceImpl extends ServiceImpl<DeviceSpecMapper, DeviceSpec> implements DeviceSpecService {
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/DeviceStockGroupServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/DeviceStockGroupServiceImpl.java
new file mode 100644
index 0000000..042668a
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/DeviceStockGroupServiceImpl.java
@@ -0,0 +1,11 @@
+package cn.pluss.platform.device.impl;
+
+import cn.pluss.platform.device.DeviceStockGroupService;
+import cn.pluss.platform.entity.DeviceStockGroup;
+import cn.pluss.platform.mapper.DeviceStockGroupMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service
+public class DeviceStockGroupServiceImpl extends ServiceImpl<DeviceStockGroupMapper, DeviceStockGroup> implements DeviceStockGroupService {
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/DeviceTransferDetailServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/DeviceTransferDetailServiceImpl.java
new file mode 100644
index 0000000..12f036e
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/DeviceTransferDetailServiceImpl.java
@@ -0,0 +1,32 @@
+package cn.pluss.platform.device.impl;
+
+import cn.pluss.platform.device.DeviceTransferDetailService;
+import cn.pluss.platform.entity.DeviceTransferDetail;
+import cn.pluss.platform.mapper.DeviceTransferDetailMapper;
+import cn.pluss.platform.vo.DeviceTransferDetailVO;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 划拨详情表 服务实现类
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-03-31
+ */
+@Service
+public class DeviceTransferDetailServiceImpl extends ServiceImpl<DeviceTransferDetailMapper, DeviceTransferDetail> implements DeviceTransferDetailService {
+
+    /**
+     * 根据tid查询划拨明细
+     * @param tid
+     * @return
+     */
+    @Override
+    public List<DeviceTransferDetailVO> selectListByTid(Long tid) {
+        return baseMapper.selectListByTid(tid);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/DeviceTransferServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/DeviceTransferServiceImpl.java
new file mode 100644
index 0000000..39a550e
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/DeviceTransferServiceImpl.java
@@ -0,0 +1,163 @@
+package cn.pluss.platform.device.impl;
+
+import cn.pluss.platform.device.DeviceOperateInfoService;
+import cn.pluss.platform.device.DeviceTransferDetailService;
+import cn.pluss.platform.device.DeviceTransferService;
+import cn.pluss.platform.deviceStock.DeviceStockService;
+import cn.pluss.platform.dto.DeviceTransferDTO;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.enums.DeviceOperateType;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.DeviceTransferMapper;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.util.DateUtils;
+import cn.pluss.platform.util.StringUtil;
+import cn.pluss.platform.vo.DeviceTransferDetailVO;
+import cn.pluss.platform.vo.DeviceTransferVO;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 设备划拨记录表 服务实现类
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-03-31
+ */
+@Service
+public class DeviceTransferServiceImpl extends ServiceImpl<DeviceTransferMapper, DeviceTransfer> implements DeviceTransferService {
+
+    @Resource
+    private DeviceTransferDetailService mtdService;
+
+    @Resource
+    private DeviceStockService deviceStockService;
+
+    @Resource
+    private DeviceOperateInfoService doiService;
+
+    @Resource
+    private UserAppService userAppService;
+
+    /**
+     * 设备划拨操作
+     * @param dto
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void transfer(DeviceTransferDTO dto) {
+        UserApp userApp = userAppService.checkApiToken();
+        MsgException.checkEquals(userApp.getUserId(), dto.getAcceptUserId(), "不能划拨给自己");
+
+        dto.setUserId(userApp.getUserId());
+        MsgException.checkNull(dto.getAcceptUserId(),"缺失划拨用户ID");
+        UserApp acceptUser = userAppService.selectInfoJoinByUserId(dto.getAcceptUserId());
+        MsgException.checkNull(acceptUser,"划拨用户异常");
+        List<String> list = dto.getDeviceNoList();
+        if(list == null || list.size() == 0){
+            MsgException.throwException("划拨的设备编号不能为空");
+        }
+        QueryWrapper<DeviceStock> queryWrapper = new QueryWrapper<DeviceStock>()
+                .in("deviceNo", dto.getDeviceNoList()).eq("transferStatus","01");
+        List<DeviceStock> dList = deviceStockService.list(queryWrapper);
+        MsgException.check(!dList.isEmpty(),"所选设备中包含等待接收的已划拨设备");
+        String batchNo = StringUtil.generateMixStr(3) + DateUtils.toString(DateUtils.currentDate(),"yyyyMMddHHmmss");
+        DeviceTransfer transfer = new DeviceTransfer(dto.getUserId(),dto.getAcceptUserId(),batchNo,"00",null,null);
+        List<DeviceTransferDetail> detailList = new ArrayList<>();
+        List<DeviceOperateInfo> operateInfoList = new ArrayList<>();
+        List<String> deviceNoList = new ArrayList<>();
+
+        baseMapper.insert(transfer);
+        UpdateWrapper<DeviceStock> updateStock = new UpdateWrapper<>();
+        for (String deviceNo:list) {
+            DeviceTransferDetail detail = new DeviceTransferDetail(transfer,deviceNo);
+            detail.setTid(transfer.getId());
+            detailList.add(detail);
+            String remark = acceptUser.getPhone();
+            String userName = acceptUser.getUserName();
+            if(StringUtil.isNotEmpty(userName)){
+                remark = "划拨给" + userName + "(" + acceptUser.getPhone() + "), 待接收";
+            }
+            DeviceOperateInfo operateInfo = new DeviceOperateInfo(userApp, DeviceOperateType.TRANSFER.getCode(),deviceNo,remark);
+            operateInfoList.add(operateInfo);
+            deviceNoList.add(deviceNo);
+        }
+        updateStock.in("snNo",deviceNoList);
+        updateStock.set("transferStatus","01");
+        deviceStockService.update(updateStock);
+        mtdService.saveBatch(detailList);
+        doiService.saveBatch(operateInfoList);
+    }
+
+    /**
+     * 划拨记录分页查询
+     * @param page
+     * @param dto
+     * @return
+     */
+    @Override
+    public Page<DeviceTransferVO> pageInfo(Page<DeviceTransferVO> page, DeviceTransferDTO dto) {
+        return baseMapper.pageInfo(page,dto);
+    }
+
+    /**
+     * 查询划拨明细
+     * @param dto
+     * @return
+     */
+    @Override
+    public DeviceTransferVO getDetail(DeviceTransferDTO dto) {
+        MsgException.checkNull(dto.getId(),"划拨ID不能为空");
+        DeviceTransferVO transfer = baseMapper.selectByIdVo(dto.getId());
+        MsgException.checkNull(transfer,"划拨ID数据有误！");
+        List<DeviceTransferDetailVO> detailList =  mtdService.selectListByTid(transfer.getId());
+        transfer.setDetailList(detailList);
+        return transfer;
+    }
+
+    /**
+     * 接收设备
+     * @param dto
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void accept(DeviceTransferDTO dto) {
+        UserApp userApp = userAppService.checkApiToken();
+        dto.setUserId(userApp.getUserId());
+        MsgException.checkNull(dto.getId(),"划拨ID不能为空");
+        DeviceTransfer transfer = baseMapper.selectById(dto.getId());
+        MsgException.checkNull(transfer,"划拨ID数据有误！");
+        MsgException.check(!transfer.getAcceptUserId().equals(dto.getUserId()),"只能接收划拨给自己的设备");
+        transfer.setAcceptTime(new Date());
+        transfer.setStatus(DeviceTransfer.ALREADY_ACCEPT);
+        List<DeviceTransferDetailVO> detailList =  mtdService.selectListByTid(transfer.getId());
+        if(detailList.isEmpty()){
+            MsgException.throwException("设备划拨详情异常");
+        }
+        List<String> deviceNoList = new ArrayList<>();
+        List<DeviceOperateInfo> operateInfoList = new ArrayList<>();
+        for (DeviceTransferDetailVO detail:detailList) {
+            deviceNoList.add(detail.getDeviceNo());
+            DeviceOperateInfo operateInfo = new DeviceOperateInfo(userApp, DeviceOperateType.RECEIVE.getCode(),detail.getSnNo(),null);
+            operateInfoList.add(operateInfo);
+        }
+        UpdateWrapper<DeviceStock> updateWrapper = new UpdateWrapper<DeviceStock>()
+                .set("belongUserId",transfer.getAcceptUserId())
+                .set("transferStatus","00")
+                .set("inStockTime",transfer.getAcceptTime()).in("snNo",deviceNoList);
+        deviceStockService.update(updateWrapper);
+        baseMapper.updateById(transfer);
+        doiService.saveBatch(operateInfoList);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/DeviceTypeServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/DeviceTypeServiceImpl.java
new file mode 100644
index 0000000..d451307
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/DeviceTypeServiceImpl.java
@@ -0,0 +1,20 @@
+package cn.pluss.platform.device.impl;
+
+import cn.pluss.platform.device.DeviceTypeService;
+import cn.pluss.platform.entity.DeviceType;
+import cn.pluss.platform.mapper.DeviceTypeMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 设备类型表 服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-03-04
+ */
+@Service
+public class DeviceTypeServiceImpl extends ServiceImpl<DeviceTypeMapper, DeviceType> implements DeviceTypeService {
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/MercDeviceRefundImageServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/MercDeviceRefundImageServiceImpl.java
new file mode 100644
index 0000000..d9bec88
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/MercDeviceRefundImageServiceImpl.java
@@ -0,0 +1,32 @@
+package cn.pluss.platform.device.impl;
+
+import cn.pluss.platform.device.MercDeviceRefundImageService;
+import cn.pluss.platform.entity.MercDeviceRefundImage;
+import cn.pluss.platform.mapper.MercDeviceRefundImageMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * <p>
+ * 商户设备订单退款图片表 服务实现类
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-03-31
+ */
+@Service
+public class MercDeviceRefundImageServiceImpl extends ServiceImpl<MercDeviceRefundImageMapper, MercDeviceRefundImage> implements MercDeviceRefundImageService {
+
+    /**
+     * 根据detailId获取图片列表
+     * @param id
+     * @return
+     */
+    @Override
+    public List<String> selectListByDetailId(Serializable id) {
+        return baseMapper.selectListByDetailId(id);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/MercOrderDetailServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/MercOrderDetailServiceImpl.java
new file mode 100644
index 0000000..2975b28
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/MercOrderDetailServiceImpl.java
@@ -0,0 +1,405 @@
+package cn.pluss.platform.device.impl;
+
+import cn.pluss.platform.ali.AliService;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultCode;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.constants.Constant;
+import cn.pluss.platform.device.MercDeviceRefundImageService;
+import cn.pluss.platform.device.MercOrderDetailService;
+import cn.pluss.platform.device.MercOrderExpressService;
+import cn.pluss.platform.dto.MercOrderDetailDTO;
+import cn.pluss.platform.entitiy.SettleTypeEnum;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.enums.DeviceOrderStatus;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.*;
+import cn.pluss.platform.openAccount.OpenAccountRecordService;
+import cn.pluss.platform.pay.PayService;
+import cn.pluss.platform.phoneValidateCode.PhoneValidateCodeService;
+import cn.pluss.platform.util.DateUtils;
+import cn.pluss.platform.util.StringUtil;
+import cn.pluss.platform.util.ValidateCodeUtil;
+import cn.pluss.platform.vo.MercOrderExpressVO;
+import cn.pluss.platform.yt.YtLogistHandler;
+import cn.pluss.platform.yt.YtStatusEnum;
+import cn.pluss.platform.yt.constant.YtConstant;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.Setter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 订单详情表 服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-03-17
+ */
+@Service
+public class MercOrderDetailServiceImpl extends ServiceImpl<MercOrderDetailMapper, MercOrderDetail> implements MercOrderDetailService {
+
+    @Resource
+    private MercOrderExpressMapper moeMapper;
+
+    @Resource
+    private MercOrderExpressDetailMapper moedMapper;
+
+    @Resource
+    private MercDeviceRefundImageService mdriService;
+
+    @Resource
+    private MercOrderNewMapper mercOrderNewMapper;
+
+    @Resource
+    private MerchantChannelStatusMapper merchantChannelStatusMapper;
+
+    @Resource
+    private PhoneValidateCodeService phoneValidateCodeService;
+
+    @Setter(onMethod_ = {@Autowired, @Qualifier("ysPayOldService")})
+    private PayService ysPayOldService;
+
+    @Resource
+    private AliService aliService;
+
+    @Resource
+    private ValidateCodeUtil validateCodeUtil;
+
+    @Resource
+    private YtLogistHandler ytLogistHandler;
+
+    @Resource
+    private MercOrderExpressService mercOrderExpressService;
+
+    @Resource
+    private OpenAccountRecordService openAccountRecordService;
+
+    @Override
+    public void receiving(Long id) {
+        MercOrderDetail detail = baseMapper.selectById(id);
+        MsgException.checkNull(detail,"订单数据异常");
+        detail.setStatus(DeviceOrderStatus.COMPLETED.getStatus());
+        baseMapper.updateById(detail);
+    }
+
+    /**
+     * 查看物流信息
+     * @param id
+     * @return
+     */
+    @Override
+    public MercOrderExpressVO getOrderExpressInfo(Long id) {
+        MercOrderDetail detail = baseMapper.selectById(id);
+        MsgException.checkNull(detail,"订单详情数据异常");
+        MercOrderExpressVO vo = moeMapper.getByExpressNo(detail.getExpressNo());
+
+        if(vo != null){
+            vo.setServiceTelephone(YtConstant.YT_CUSTOMER_TELEPHONE);
+            List<MercOrderExpressDetail> list = moedMapper.getByExpressNo(detail.getExpressNo());
+            vo.setExpressDetailList(list);
+            if(!list.isEmpty()){
+                vo.setLogisticProvider(list.get(0).getLogisticProvider());
+            }
+        }
+        return vo;
+    }
+
+    /**
+     * 根据订单号查询订单详情
+     * @param orderNo
+     * @return
+     */
+    @Override
+    public List<MercOrderDetail> getDetailByOrderNo(String orderNo,String status) {
+        QueryWrapper<MercOrderDetail> queryWrapper = new QueryWrapper<MercOrderDetail>()
+                .eq("orderNo",orderNo).orderByDesc("id");
+        if(StringUtil.isNotEmpty(status) && !"-1".equals(status)){
+            switch (status){
+                case "1":
+                    queryWrapper.eq("status",DeviceOrderStatus.COMPLETED.getStatus());
+                    break;
+                case "2":
+                    queryWrapper.eq("status",DeviceOrderStatus.RECEIV_ING.getStatus());
+                    break;
+                case "3":
+                    queryWrapper.in("status",DeviceOrderStatus.REFUND_ING.getStatus(),DeviceOrderStatus.REFUND_SUCC.getStatus(),DeviceOrderStatus.REFUND_FAIL.getStatus());
+                    break;
+            }
+        }
+        return baseMapper.selectList(queryWrapper);
+    }
+
+    /**
+     * 设备订单退款
+     * @param dto
+     */
+    @Override
+    public void refund(MercOrderDetailDTO dto) {
+        MsgException.checkNull(dto.getId(),"退款详情订单ID为空");
+        MsgException.checkNull(dto.getRefundAmt(),"退款金额不能为空");
+        MsgException.checkBlank(dto.getRefundReason(),"退款原因不能为空");
+        if(dto.getPicList() == null || dto.getPicList().size() == 0){
+            MsgException.throwException("请先上传图片");
+        }
+        MercOrderDetail detail = baseMapper.selectById(dto.getId());
+        MsgException.checkNull(detail,"订单数据异常");
+        //暂无物流信息 可以直接退款
+        BigDecimal totalAmt = detail.getPrice().multiply(BigDecimal.valueOf(detail.getNum()));
+        if(StringUtil.isEmpty(detail.getExpressNo())){
+            totalAmt = totalAmt.add(detail.getPostage());
+        }else{
+            MercOrderExpressVO express = moeMapper.getByExpressNo(detail.getExpressNo());
+            if(express == null){
+                totalAmt = totalAmt.add(detail.getPostage());
+            }else{
+                if(YtStatusEnum.ACCEPT.getValue().equals(express.getStatus()) || YtStatusEnum.WAIT.getValue().equals(express.getStatus())){
+                    totalAmt = totalAmt.add(detail.getPostage());
+                }
+            }
+        }
+        MsgException.check(dto.getRefundAmt().compareTo(totalAmt) > 0,"退款金额超出商品金额");
+        if(DeviceOrderStatus.SUCC_PAY.getStatus().equals(detail.getStatus())
+                || DeviceOrderStatus.RECEIV_ING.getStatus().equals(detail.getStatus())
+                || DeviceOrderStatus.REFUND_FAIL.getStatus().equals(detail.getStatus())
+                || DeviceOrderStatus.COMPLETED.getStatus().equals(detail.getStatus())){
+            List<MercDeviceRefundImage> list = new ArrayList<>(16);
+            for (String picUrl:dto.getPicList()) {
+                MercDeviceRefundImage image = new MercDeviceRefundImage(detail,picUrl);
+                list.add(image);
+            }
+            mdriService.saveBatch(list);
+            detail.setRefundAmt(dto.getRefundAmt());
+            detail.setRefundTime(DateUtils.currentDate());
+            detail.setRefundReason(dto.getRefundReason());
+            detail.setRefundType(detail.getType());
+            detail.setStatus(DeviceOrderStatus.REFUND_ING.getStatus());
+            baseMapper.updateById(detail);
+            return;
+        }
+        MsgException.throwException("只有“已支付”或“待收货”的订单才能发起退款申请！");
+    }
+
+    /**
+     * 设置退款单号
+     * @param dto
+     */
+    @Override
+    public void setRefundExpressNo(MercOrderDetailDTO dto) {
+        MsgException.checkNull(dto.getId(),"退款详情订单ID为空");
+        MsgException.checkBlank(dto.getRefundExpressNo(),"退款物流单号不能为空");
+        dto.setStatus(MercOrderDetail.STATUS_REFUND_AGREE);
+        baseMapper.updateById(dto);
+    }
+
+    /**
+     * 审核退款
+     * @param orderDetail
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Result<Object> auditRefund(MercOrderDetail orderDetail) {
+        MsgException.checkNull(orderDetail.getId(),"退款详情订单ID为空");
+        MsgException.checkBlank(orderDetail.getStatus(),"状态不能为空");
+        MsgException.checkNull(orderDetail.getRefundAmt(),"退款金额不能为空");
+        if(MercOrderDetail.STATUS_REFUND_FAIL.equals(orderDetail.getStatus())){
+            MsgException.checkBlank(orderDetail.getRejectRemark(),"退款驳回，驳回原因不能为空！");
+        }
+        MercOrderDetail detail = baseMapper.selectById(orderDetail.getId());
+        MsgException.checkNull(detail,"退款详情ID有误！");
+//        MsgException.check(!MercOrderDetail.STATUS_REFUND_AGREE.equals(detail.getStatus()),"只能处理退货退款中的订单！");
+        BigDecimal useRefundAmt = baseMapper.getUseRefundAmtByOrderNo(detail.getOrderNo());
+        BigDecimal totalOrderAmt = detail.getPrice().multiply(BigDecimal.valueOf(detail.getNum())).add(detail.getPostage());
+        if(orderDetail.getRefundAmt().add(useRefundAmt).compareTo(totalOrderAmt) > 0){
+            MsgException.throwException("退款金额超出当前订单可退款总额");
+        }
+        if(MercOrderDetail.STATUS_REFUND_SUCCESS.equals(orderDetail.getStatus())){
+            phoneValidateCodeService.checkSmsVerifyCode(orderDetail.getPhone(),orderDetail.getVerifyCode());
+            MercOrderNew orderByNo = mercOrderNewMapper.getOrderByNo(detail.getOrderNo());
+            MsgException.checkNull(orderByNo,"订单有误！");
+            Integer channel = orderByNo.getChannel();
+            MsgException.checkNull(channel,"通道未知，退款失败");
+            Map<String, Object> result = null;
+            MerchantOrder order = new MerchantOrder();
+            order.convert(orderByNo,orderDetail.getRefundAmt(), SettleTypeEnum.D1.getValue(), detail.getRefundReason());
+            switch (channel){
+                case 1:
+                case 2:
+                case 3:
+                    MsgException.throwException("当前订单所属通道不支持退款");
+                    break;
+                case 4:
+                    //银盛退款
+                    MerchantChannelStatus channelInfo = merchantChannelStatusMapper.getByMerchantCode(orderByNo.getMerchantCode(), 4);
+                    MsgException.checkNull(channelInfo,"收款商户通道信息异常！");
+                    result = ysPayOldService.refundPay(order, channelInfo.getMerchantId());
+                    break;
+                case 5:
+                    //原生通道退款 TODO 不支持微信支付 因为微信支付走对公账户 所以这里加一个验证
+                    MsgException.check(!Constant.PAY_TYPE_ALIPAY.equals(orderByNo.getPayType()),"当前订单支付方式不支持退款！");
+                    result = aliService.refundV2(detail);
+                    break;
+                default:
+                    MsgException.throwException("未知通道");
+                    break;
+            }
+            int code = (int)result.get("code");
+            String msg = (String) result.get("msg");
+            String refundNo = (String) result.get("refundNo");
+            if(code != ResultCode.SUCCESS.code()){
+                return ResultGenerator.genFailResult(msg);
+            }
+            detail.setRefundTime(DateUtils.currentDate());
+            detail.setRefundRemark(msg);
+            detail.setRefundNo(refundNo);
+
+            //开户奖扣除
+            openAccountRecordService.removeOpenAccount(detail.getOrderNo());
+        }
+        detail.setRefundAmt(orderDetail.getRefundAmt());
+        detail.setStatus(orderDetail.getStatus());
+        detail.setRejectRemark(orderDetail.getRejectRemark());
+        baseMapper.updateById(detail);
+        return ResultGenerator.genSuccessResult("处理成功",null);
+    }
+
+    @Override
+    public Result<Object> getVerifyCode(PhoneValidateCode phoneValidateCode) {
+        MsgException.checkBlank(phoneValidateCode.getPhone(),"获取失败，手机号为空");
+        String checkCode = StringUtil.random(4);
+        phoneValidateCode.setCode(checkCode);
+        JSONObject result = validateCodeUtil.requestManageValidateCode(phoneValidateCode.getPhone(),checkCode);
+        if(result.getIntValue("code") != ResultCode.SUCCESS.code()){
+            return ResultGenerator.genFailResult(result.getString("msg"));
+        }
+        phoneValidateCode.setSendDt(DateUtils.currentDate());
+        phoneValidateCode.setStatus("1");
+        phoneValidateCodeService.savePhoneValidateCode(phoneValidateCode);
+        return ResultGenerator.genSuccessResult("获取成功",null);
+    }
+
+    /**
+     * 推送物流信息
+     * @param ids
+     * @return
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public Result<Object> printLogistInfo(List<Long> ids) {
+        MsgException.check(ids.isEmpty(),"未选中订单数据!");
+        List<MercOrderDetail> list = baseMapper.selectBatchIds(ids);
+        MsgException.check(list.isEmpty(),"订单数据异常!");
+        boolean flag = false;
+        for (MercOrderDetail detail:list) {
+            if(!MercOrderDetail.STATUS_PAYED.equals(detail.getStatus())){
+                flag = true;
+                break;
+            }
+        }
+        MsgException.check(flag,"只能处理已支付的订单!");
+        MercOrderDetail detail = list.get(0);
+        MercOrderNew order = mercOrderNewMapper.getOrderByNo(detail.getOrderNo());
+        MsgException.checkNull(order,"订单数据异常!");
+        JSONObject result = ytLogistHandler.createYtOrderV2(list,order);
+        if(result.getIntValue("code") != ResultCode.SUCCESS.code()){
+            MsgException.throwException(result.getString("message"));
+        }
+        JSONObject data = result.getJSONObject("data");
+        UpdateWrapper<MercOrderDetail> updateWrapper = new UpdateWrapper<MercOrderDetail>().in("id",ids)
+                .set("logistNo",data.getString("logistNo")).set("expressNo",data.getString("expressNo"))
+                .set("status",MercOrderDetail.STATUS_UN_RECEIVED);
+        update(updateWrapper);
+        MercOrderExpress  orderExpress = new MercOrderExpress();
+        orderExpress.setOrderNo(order.getOrderNo());
+        orderExpress.setLogistNo(data.getString("logistNo"));
+        orderExpress.setExpressNo(data.getString("expressNo"));
+        orderExpress.setType(MercOrderExpress.EXPRESS_TYPE_HAIR);
+        orderExpress.setStatus(YtStatusEnum.ACCEPT.getValue());
+        mercOrderExpressService.save(orderExpress);
+        return ResultGenerator.genSuccessResult("处理成功",null);
+    }
+
+    /**
+     * 分页查询
+     * @param page
+     * @param condition
+     * @return
+     */
+    @Override
+    public Page<MercOrderDetail> pageInfo(Page<MercOrderDetail> page, MercOrderDetail condition) {
+        return baseMapper.pageInfo(page,condition);
+    }
+
+    @Override
+    public void refundReject(MercOrderDetail orderDetail) {
+        final MercOrderDetail exist = baseMapper.selectById(orderDetail.getId());
+        exist.setStatus(MercOrderDetail.STATUS_REFUND_FAIL);
+        exist.setRejectRemark(orderDetail.getRejectRemark());
+        baseMapper.updateById(exist);
+    }
+
+    @Override
+    public void refundAgree(Long id) {
+        final MercOrderDetail exist = baseMapper.selectById(id);
+        exist.setStatus(MercOrderDetail.STATUS_REFUNDING);
+        baseMapper.updateById(exist);
+    }
+
+    /**
+     * 填写快递单号
+     * @param id
+     * @param expressNo
+     * @return
+     */
+    @Override
+    public Result<Object> inputExpressNo(Long id, String expressNo) {
+        MsgException.checkNull(id,"订单ID不能为空!");
+        MsgException.checkBlank(expressNo,"快递单号不能为空!");
+        MercOrderDetail detail = baseMapper.selectById(id);
+        MsgException.checkNull(detail,"订单数据异常!");
+        MsgException.check(!MercOrderDetail.STATUS_PAYED.equals(detail.getStatus()),"只能处理已支付的订单数据");
+        MsgException.check(StringUtil.isNotEmpty(detail.getExpressNo()),"当前订单已存在物流单号,请勿重复填写");
+        detail.setStatus(MercOrderDetail.STATUS_UN_RECEIVED);
+        detail.setExpressNo(expressNo);
+        MercOrderExpress express = mercOrderExpressService.getByExpressNo(expressNo);
+        if(express == null){
+            express = new MercOrderExpress();
+            express.setLogistNo(detail.getLogistNo());
+            express.setOrderNo(detail.getOrderNo());
+            express.setExpressNo(expressNo);
+            express.setType(MercOrderExpress.EXPRESS_TYPE_HAIR);
+            express.setStatus(YtStatusEnum.ACCEPT.getValue());
+            mercOrderExpressService.save(express);
+        }
+        baseMapper.updateById(detail);
+        return ResultGenerator.genSuccessResult("操作成功",null);
+    }
+
+    /**
+     * 根据订单号和code查询订单信息
+     * @param orderNo
+     * @param code
+     * @return
+     */
+    @Override
+    public List<MercOrderDetail> listByOrderNoAndCode(String orderNo, String code) {
+        return baseMapper.listByOrderNoAndCode(orderNo,code);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/MercOrderExpressDetailServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/MercOrderExpressDetailServiceImpl.java
new file mode 100644
index 0000000..94b88ae
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/MercOrderExpressDetailServiceImpl.java
@@ -0,0 +1,20 @@
+package cn.pluss.platform.device.impl;
+
+import cn.pluss.platform.device.MercOrderExpressDetailService;
+import cn.pluss.platform.entity.MercOrderExpressDetail;
+import cn.pluss.platform.mapper.MercOrderExpressDetailMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 商户订单物流详情 服务实现类
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-03-24
+ */
+@Service
+public class MercOrderExpressDetailServiceImpl extends ServiceImpl<MercOrderExpressDetailMapper, MercOrderExpressDetail> implements MercOrderExpressDetailService {
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/MercOrderExpressServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/MercOrderExpressServiceImpl.java
new file mode 100644
index 0000000..b016b0b
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/MercOrderExpressServiceImpl.java
@@ -0,0 +1,27 @@
+package cn.pluss.platform.device.impl;
+
+import cn.pluss.platform.device.MercOrderExpressService;
+import cn.pluss.platform.entity.MercOrderExpress;
+import cn.pluss.platform.mapper.MercOrderExpressMapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service
+public class MercOrderExpressServiceImpl extends ServiceImpl<MercOrderExpressMapper, MercOrderExpress> implements MercOrderExpressService {
+
+    /**
+     * 根据上送物流单号查询商户单号
+     * @param logistNo
+     * @return
+     */
+    @Override
+    public MercOrderExpress getByLogistNo(String logistNo) {
+        return baseMapper.getByLogistNo(logistNo);
+    }
+
+    @Override
+    public MercOrderExpress getByExpressNo(String expressNo) {
+        return baseMapper.getByExpressNo(expressNo);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/MercOrderNewServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/MercOrderNewServiceImpl.java
new file mode 100644
index 0000000..c910aa5
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/MercOrderNewServiceImpl.java
@@ -0,0 +1,474 @@
+package cn.pluss.platform.device.impl;
+
+import cn.pluss.platform.ali.AliService;
+import cn.pluss.platform.api.ResultCode;
+import cn.pluss.platform.constants.Constant;
+import cn.pluss.platform.device.DeviceSpecService;
+import cn.pluss.platform.device.MercOrderDetailService;
+import cn.pluss.platform.device.MercOrderNewService;
+import cn.pluss.platform.device.MercShopTrolleyService;
+import cn.pluss.platform.deviceDetail.DeviceDetailService;
+import cn.pluss.platform.dto.MercOrderNewDTO;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.enums.DeviceOrderStatus;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.*;
+import cn.pluss.platform.openAccount.OpenAccountRecordService;
+import cn.pluss.platform.pay.PayService;
+import cn.pluss.platform.postageConfig.PostageConfigService;
+import cn.pluss.platform.systemConfig.SystemConfigService;
+import cn.pluss.platform.userAddress.UserAddressService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.util.ParametersUtil;
+import cn.pluss.platform.util.StringUtil;
+import cn.pluss.platform.vo.MercOrderExpressVO;
+import cn.pluss.platform.vo.MercOrderNewVO;
+import cn.pluss.platform.yinsheng.YsOldSrcMerchantNo;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.Setter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
+import java.net.URLDecoder;
+import java.util.*;
+
+/**
+ * <p>
+ * 新的订单表 服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-03-17
+ */
+@Service
+public class MercOrderNewServiceImpl extends ServiceImpl<MercOrderNewMapper, MercOrderNew> implements MercOrderNewService {
+
+    @Resource
+    private UserAppService userAppService;
+
+    @Autowired
+    private UserAddressService userAddressService;
+
+    @Autowired
+    private MercShopTrolleyService mercShopTrolleyService;
+
+    @Autowired
+    private DeviceSpecService deviceSpecService;
+
+    @Autowired
+    private DeviceDetailService deviceDetailService;
+
+    @Autowired
+    private MercOrderDetailService mercOrderDetailService;
+
+    @Resource
+    private MercOrderExpressDetailMapper mercOrderExpressDetailMapper;
+
+    @Resource
+    private MercOrderExpressMapper mercOrderExpressMapper;
+
+    @Resource
+    private PostageConfigService postageConfigService;
+
+    @Resource
+    private SystemConfigService systemConfigService;
+
+    @Resource
+    private MerchantBaseInfoMapper mbiMapper;
+
+    @Setter(onMethod_ = {@Autowired, @Lazy})
+    private AliService aliService;
+
+    @Resource
+    private MerchantOrderMapper merchantOrderMapper;
+
+    @Autowired
+    private MerchantChannelStatusMapper mcsMapper;
+
+    @Setter(onMethod_ = {@Autowired, @Qualifier("ysPayOldService")})
+    private PayService ysPayOldService;
+
+    @Resource
+    private OpenAccountRecordService openAccountRecordService;
+
+    @Resource
+    private MerchantBaseInfoMapper merchantBaseInfoMapper;
+
+    @Resource
+    private MerchantStoreMapper merchantStoreMapper;
+
+    /**
+     * 设备订单分页查询
+     *
+     * @param page
+     * @param condition
+     * @return
+     */
+    @Override
+    public Page<MercOrderNewVO> pageInfo(Page<MercOrderNewVO> page, MercOrderNewVO condition) {
+        return baseMapper.pageInfo(page, condition);
+    }
+
+    /**
+     * 确认收货
+     *
+     * @param id
+     */
+    @Override
+    public void receiving(Long id) {
+        UserApp userApp = userAppService.queryUserAppByToken();
+        MsgException.checkNull(userApp, "登录用户异常");
+        MercOrderNew order = baseMapper.selectById(id);
+        MsgException.checkNull(order, "订单数据异常");
+        order.setStatus("04");
+        baseMapper.updateById(order);
+    }
+
+    /**
+     * 获取订单的物流信息
+     *
+     * @param id
+     * @return
+     */
+    @Override
+    public MercOrderExpressVO getOrderExpressInfo(Long id) {
+        MercOrderDetail detail = mercOrderDetailService.getById(id);
+        MsgException.checkNull(detail, "订单详情数据异常");
+        MsgException.checkBlank(detail.getExpressNo(), "暂无物流信息");
+        MercOrderExpressVO vo = mercOrderExpressMapper.getByExpressNo(detail.getExpressNo());
+        if (vo != null) {
+            List<MercOrderExpressDetail> list = mercOrderExpressDetailMapper.getByExpressNo(detail.getExpressNo());
+            vo.setExpressDetailList(list);
+        }
+        return vo;
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public Object apiCreateOrder(MercOrderNewDTO orderNewDTO) {
+        UserApp userApp = userAppService.queryUserAppByToken();
+        orderNewDTO.setUserId(userApp.getUserId());
+        return createOrder(orderNewDTO);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public Object createOrder(MercOrderNewDTO orderNewDTO) {
+
+        // 生成订单数据
+        MercOrderNew mercOrderNew = new MercOrderNew();
+        mercOrderNew.setStatus(MercOrderNew.STATUS_NO_PAY);
+        mercOrderNew.setUserId(orderNewDTO.getUserId());
+        mercOrderNew.setOrderNo(UUID.randomUUID().toString().replace("-", ""));
+        mercOrderNew.setPayType(orderNewDTO.getPayType());
+
+        UserAddress address = userAddressService.getById(orderNewDTO.getAddressId());
+        mercOrderNew.setReceiver(address.getName());
+        mercOrderNew.setPhone(address.getPhone());
+        mercOrderNew.setAreaName(address.getAreaName());
+        mercOrderNew.setAddress(address.getAddress());
+
+        if (orderNewDTO.getItemList() == null || orderNewDTO.getItemList().isEmpty()) {
+            throw new MsgException("缺少商品信息");
+        }
+
+        // 计算价格
+        LambdaQueryWrapper<MercShopTrolley> qWrapper = Wrappers.lambdaQuery();
+        qWrapper.in(MercShopTrolley::getId, orderNewDTO.getItemList());
+
+        List<MercShopTrolley> mercShopTrolleyList = mercShopTrolleyService.list(qWrapper);
+
+        BigDecimal priceAmt = BigDecimal.ZERO;
+        BigDecimal postage = BigDecimal.ZERO;
+        for (MercShopTrolley item : mercShopTrolleyList) {
+            MercOrderDetail mercOrderDetail = new MercOrderDetail();
+            mercOrderDetail.setStatus(MercOrderDetail.STATUS_NO_PAY);
+            mercOrderDetail.setCode(item.getCode());
+            mercOrderDetail.setUserId(item.getUserId());
+            mercOrderDetail.setShopTrolleyId(item.getId());
+            mercOrderDetail.setDeviceLogo(item.getDeviceLogo());
+            mercOrderDetail.setName(item.getName());
+            mercOrderDetail.setNum(item.getNum());
+            mercOrderDetail.setOrderNo(mercOrderNew.getOrderNo());
+            mercOrderDetail.setType(item.getType());
+
+            DeviceDetail deviceDetail = deviceDetailService.getByCodeAndSpec(item.getCode(), item.getType());
+            if (item.getNum() >= deviceDetail.getWholesaleMinNum()) {
+                mercOrderDetail.setPrice(deviceDetail.getWholesalePrice());
+                priceAmt = priceAmt.add(deviceDetail.getWholesalePrice().multiply(BigDecimal.valueOf(item.getNum())));
+            } else {
+                mercOrderDetail.setPrice(deviceDetail.getUnitPrice());
+                priceAmt = priceAmt.add(deviceDetail.getUnitPrice().multiply(BigDecimal.valueOf(item.getNum())));
+            }
+            DeviceSpec spec = deviceSpecService.getByCodeAndSpec(item.getCode(), item.getType());
+            MsgException.checkNull(spec, "商品规格异常");
+            BigDecimal ownFee = BigDecimal.ZERO;
+            if (!DeviceSpec.POSTAGE_YES.equals(spec.getPostageFlag())) {
+                ownFee = postageConfigService.getGoodPostageInfo(address, spec.getWeight());
+                postage = postage.add(ownFee);
+            }
+            mercOrderDetail.setPostage(ownFee);
+            // 同时保存商品详情的价格
+            mercOrderDetailService.save(mercOrderDetail);
+        }
+        if (orderNewDTO.getPostage() == null) {
+            mercOrderNew.setPostage(postage);
+        }
+        mercOrderNew.setOrderAmt(priceAmt.add(postage));
+        if (orderNewDTO.getTicketId() != null) {
+            // 优惠券
+        } else {
+            mercOrderNew.setDiscountAmt(BigDecimal.ZERO);
+            mercOrderNew.setActualAmt(priceAmt.add(postage));
+        }
+
+        mercOrderNew.setCreateTime(new Date());
+        mercOrderNew.setCreator(orderNewDTO.getUserId());
+        mercOrderNew.setUpdateTime(new Date());
+
+        String type = systemConfigService.querySystemConfigValue(Constant.PAYMENT_CHANNEL_TYPE);
+        Integer channel = Constant.DEFAULT_CHANNEL;
+        if ("1".equals(type)) {
+            //原生通道类型
+            channel = Constant.PRIMORDIAL_CHANNEL;
+            if (!Constant.PAY_TYPE_ALIPAY.equals(orderNewDTO.getPayType())) {
+                MsgException.throwException("暂不支持微信支付，请使用支付宝支付");
+            }
+        }
+        //获取收款账号
+        String merchantCode = systemConfigService.querySystemConfigValue(Constant.SYSTEM_MERCHANT_KEY);
+        if (StringUtil.isEmpty(merchantCode)) {
+            merchantCode = Constant.DEFUALT_CASHIER_MERCHANT;
+        }
+        MerchantBaseInfo merchant = mbiMapper.queryByMerchantCode(merchantCode);
+        MsgException.checkNull(merchant, "收款商户信息异常");
+
+        mercOrderNew.setMerchantName(merchant.getAlias());
+        mercOrderNew.setMerchantCode(merchant.getMerchantCode());
+        //默认是银盛通道
+        mercOrderNew.setChannel(channel);
+
+        save(mercOrderNew);
+
+        JSONObject result = new JSONObject(3);
+        result.put("orderNo", mercOrderNew.getOrderNo());
+        //类型 type 1：H5 2:为小程序 3：走原生通道
+        if (Constant.PRIMORDIAL_CHANNEL.equals(mercOrderNew.getChannel())) {
+            result.put("type", "3");
+            Map<String, String> map = new HashMap<>(16);
+            map.put("body", "收银呗商城");
+            map.put("subject", "收银呗商城");
+            map.put("outTradeNo", mercOrderNew.getOrderNo());
+            map.put("totalAmount", mercOrderNew.getActualAmt().toPlainString());
+            Map<String, Object> payParam = aliService.appPayParam(map);
+            if (payParam == null || StringUtil.isEmpty(payParam.get("aliCode"))) {
+                MsgException.throwException("支付宝下单异常！");
+            }
+            result.put("aliCode", payParam.get("aliCode"));
+            return result;
+        }
+        result.put("type", "1");
+        if (Constant.PAY_TYPE_ALIPAY.equals(orderNewDTO.getPayType())) {
+            // TODO 生成支付宝订单数据，并返回给APP
+            String payUrl = ParametersUtil.domain + "/wap/aliPay/returnUrl?orderNumber=" + mercOrderNew.getOrderNo();
+            try {
+                String pUrl = URLDecoder.decode(payUrl, "UTF-8");
+                result.put("payUrl", Constant.ALIPAY_H5_PAY_URL_PRIFIX + pUrl);
+            } catch (UnsupportedEncodingException e) {
+                e.printStackTrace();
+            }
+        } else {
+            result.put("type", "2");
+            // TODO 生成微信支付订单数据，并将小程序付款路径返回到APP中
+            MerchantChannelStatus channelStatus = mcsMapper.getByMerchantCode(merchantCode, channel);
+            String ghId = YsOldSrcMerchantNo.RSCY.getDefGhId();
+            if(channelStatus != null){
+                ghId = YsOldSrcMerchantNo.getGhIdByValue(channelStatus.getSrcMerchantNo());
+            }
+            result.put("ghId", ghId);
+            result.put("path", "pages/pay/index?orderId=" + mercOrderNew.getOrderNo());
+        }
+        return result;
+    }
+
+    /**
+     * 获取邮费信息
+     *
+     * @param orderNewDTO
+     * @return
+     */
+    @Override
+    public Object getOrderPostageInfo(MercOrderNewDTO orderNewDTO) {
+        List<Long> itemList = orderNewDTO.getItemList();
+        if (itemList == null || itemList.size() <= 0) {
+            MsgException.throwException("缺少商品信息");
+        }
+        MsgException.checkNull(orderNewDTO.getAddressId(), "请先选择地址");
+        Long addressId = orderNewDTO.getAddressId();
+        UserAddress address = userAddressService.getById(addressId);
+        MsgException.checkNull(address, "地址信息异常");
+        List<MercShopTrolley> list = mercShopTrolleyService.listByIds(itemList);
+        if (list == null || list.size() <= 0) {
+            MsgException.throwException("购物车数据异常");
+        }
+        return calcPostage(address, list);
+    }
+
+    /**
+     * 获取订单邮费
+     *
+     * @param address
+     * @param list
+     * @return
+     */
+    public BigDecimal calcPostage(UserAddress address, List<MercShopTrolley> list) {
+        BigDecimal postage = BigDecimal.ZERO;
+        for (MercShopTrolley mst : list) {
+            DeviceSpec item = deviceSpecService.getByCodeAndSpec(mst.getCode(), mst.getType());
+            MsgException.checkNull(item, "商品规格异常");
+            if (!DeviceSpec.POSTAGE_YES.equals(item.getPostageFlag())) {
+                BigDecimal fee = postageConfigService.getGoodPostageInfo(address, item.getWeight().multiply(BigDecimal.valueOf(mst.getNum())));
+                postage = postage.add(fee);
+            }
+        }
+        return postage;
+    }
+
+    /**
+     * 根据订单号查询订单信息
+     *
+     * @param orderNumber
+     * @return
+     */
+    @Override
+    public MercOrderNew getOrderByNo(String orderNumber) {
+        return baseMapper.getOrderByNo(orderNumber);
+    }
+
+    @Override
+    public void proPayCallback(MercOrderNew newOrder, Date transDt, String transNo, String thirdTransNo) {
+        if (!DeviceOrderStatus.WAIT_PAY.getStatus().equals(newOrder.getStatus())) {
+            return;
+        }
+        newOrder.setThirdTransNo(thirdTransNo);
+        newOrder.setTransNo(transNo);
+        newOrder.setTransDt(transDt);
+
+    }
+
+    /**
+     * 设备商城支付回调V2
+     *
+     * @param orderNo
+     * @param tradeNo
+     * @param thridTradeNo
+     * @param transDt
+     */
+    @Override
+    public void devicePaySuccessNotifyV2(String orderNo, String tradeNo, String thridTradeNo, Date transDt, MercOrderNew order) {
+        if (order == null) {
+            order = baseMapper.getOrderByNo(orderNo);
+        }
+        if (order == null || !DeviceOrderStatus.WAIT_PAY.getStatus().equals(order.getStatus())) {
+            return;
+        }
+        order.setTransNo(tradeNo);
+        order.setThirdTransNo(thridTradeNo);
+        order.setTransDt(transDt);
+        order.setStatus(DeviceOrderStatus.SUCC_PAY.getStatus());
+        baseMapper.updateById(order);
+
+        UpdateWrapper<MercOrderDetail> updateWrapper = new UpdateWrapper<MercOrderDetail>()
+                .eq("orderNo", order.getOrderNo()).set("status", DeviceOrderStatus.SUCC_PAY.getStatus());
+        mercOrderDetailService.update(updateWrapper);
+
+        // 清除购物车的数据
+        LambdaQueryWrapper<MercOrderDetail> qWrapper = Wrappers.lambdaQuery();
+        qWrapper.eq(MercOrderDetail::getOrderNo, orderNo);
+        List<MercOrderDetail> orderDetailList = mercOrderDetailService.list(qWrapper);
+
+        List<Long> shopTrolleyIdList = new ArrayList<>();
+        for (MercOrderDetail item : orderDetailList) {
+            shopTrolleyIdList.add(item.getShopTrolleyId());
+        }
+
+        LambdaQueryWrapper<MercShopTrolley> qWrapper2 = Wrappers.lambdaQuery();
+        qWrapper2.in(MercShopTrolley::getId, shopTrolleyIdList);
+        mercShopTrolleyService.remove(qWrapper2);
+
+        if(StringUtil.isNotEmpty(order.getMerchantCode())){
+            //插入订单表数据
+            MerchantStore store = merchantStoreMapper.getStoreByMerchantCode(order.getMerchantCode());
+            MerchantOrder mOrder = new MerchantOrder();
+            mOrder.convert(order,store);
+            merchantOrderMapper.insert(mOrder);
+        }
+
+        //设备商城 判断商户符合开户奖
+        List<MerchantBaseInfo> merchantList = merchantBaseInfoMapper.selectListByUserId(order.getUserId());
+        if(merchantList.isEmpty()){
+            return;
+        }
+        List<MercOrderDetail> odList =  mercOrderDetailService.listByOrderNoAndCode(order.getOrderNo(),"libao");
+        if(odList.isEmpty()){
+            return;
+        }
+        openAccountRecordService.operatAccountOpen(odList.get(0),merchantList.get(0));
+    }
+
+    /**
+     * 查询订单支付状态
+     *
+     * @param orderNewDTO
+     * @return
+     */
+    @Override
+    public Object getOrderStatusInfo(MercOrderNewDTO orderNewDTO) {
+        MsgException.checkNull(orderNewDTO.getOrderNo(), "订单号为空，查询失败");
+        MercOrderNew order = baseMapper.getOrderByNo(orderNewDTO.getOrderNo());
+        JSONObject result = new JSONObject(2);
+        result.put("status", DeviceOrderStatus.SUCC_PAY.getStatus());
+        result.put("orderNo", orderNewDTO.getOrderNo());
+        if (DeviceOrderStatus.SUCC_PAY.getStatus().equals(order.getStatus())) {
+            return result;
+        }
+        Integer channel = order.getChannel();
+        MsgException.checkNull(channel, "未知通道");
+        switch (channel) {
+            case 4:
+                //银盛通道
+                MerchantChannelStatus channelStatus = mcsMapper.getByMerchantCode(order.getMerchantCode(), channel);
+                MsgException.checkNull(channelStatus, "当前通道信息异常！");
+                MerchantOrder mo = new MerchantOrder();
+                order.convert(mo, null);
+                JSONObject resp = ysPayOldService.tradeQuery(mo, channelStatus.getMerchantId());
+                if (ResultCode.FAIL.code() == resp.getIntValue("code")) {
+                    MsgException.throwException("查询失败：失败原因:" + resp.getString("msg"));
+                }
+                String payStatus = resp.getString("payStatus");
+                if (!"1".equals(payStatus)) {
+                    result.put("status", DeviceOrderStatus.WAIT_PAY.getStatus());
+                }
+                break;
+            case 5:
+                //官方通道
+                MsgException.throwException("官方通道订单状态，自行确认");
+                break;
+            default:
+                MsgException.throwException("通道类型异常！");
+                break;
+        }
+        return result;
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/MercReceiveAddressServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/MercReceiveAddressServiceImpl.java
new file mode 100644
index 0000000..3fe5bb2
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/MercReceiveAddressServiceImpl.java
@@ -0,0 +1,20 @@
+package cn.pluss.platform.device.impl;
+
+import cn.pluss.platform.device.MercReceiveAddressService;
+import cn.pluss.platform.entity.MercReceiveAddress;
+import cn.pluss.platform.mapper.MercReceiveAddressMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 设备商城用户地址表 服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-03-21
+ */
+@Service
+public class MercReceiveAddressServiceImpl extends ServiceImpl<MercReceiveAddressMapper, MercReceiveAddress> implements MercReceiveAddressService {
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/MercShopTrolleyServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/MercShopTrolleyServiceImpl.java
new file mode 100644
index 0000000..ab5b263
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/MercShopTrolleyServiceImpl.java
@@ -0,0 +1,230 @@
+package cn.pluss.platform.device.impl;
+
+import cn.pluss.platform.DeviceGoodsService;
+import cn.pluss.platform.device.DeviceOrderInfoService;
+import cn.pluss.platform.device.MercOrderDetailService;
+import cn.pluss.platform.device.MercShopTrolleyService;
+import cn.pluss.platform.deviceDetail.DeviceDetailService;
+import cn.pluss.platform.deviceMerchantBuy.DeviceMerchantBuyService;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.MercShopTrolleyMapper;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.vo.DeviceDetailVO;
+import cn.pluss.platform.vo.DeviceGoodsVO;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * <p>
+ * 购物车表 服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-03-16
+ */
+@Service
+public class MercShopTrolleyServiceImpl extends ServiceImpl<MercShopTrolleyMapper, MercShopTrolley> implements MercShopTrolleyService {
+
+    @Autowired
+    private UserAppService uaService;
+
+    @Autowired
+    private DeviceDetailService ddService;
+
+    @Autowired
+    private DeviceGoodsService deviceGoodsService;
+
+    @Autowired
+    private DeviceOrderInfoService doiService;
+
+    @Autowired
+    private MerchantChannelStatusService mcsService;
+
+    @Autowired
+    private DeviceMerchantBuyService dmbService;
+
+    @Autowired
+    private MercOrderDetailService orderDetailService;
+
+    @Override
+    public void apiAdd(MercShopTrolley entity) {
+        UserApp tokenUa = uaService.queryUserAppByToken();
+
+        add(entity);
+
+        if (!tokenUa.getUserId().equals(entity.getUserId())) {
+            throw new MsgException("加入购物车失败！");
+        }
+
+        if ("MP_NEW".equals(entity.getCode())) {
+            final MerchantChannelStatus mcs = mcsService.getValidData(tokenUa.getMerchantCode());
+            if (mcs == null) {
+                throw new MsgException("非商户不允许购买新商户礼包");
+            }
+
+            if (!Objects.equals(mcs.getStatus(), MerchantChannelStatus.AUDIT_STATUS_SUCCESS) && !Objects.equals(mcs.getStatus(), MerchantChannelStatus.AUDIT_STATUS_SUCCESS)) {
+                throw new MsgException("非商户不允许购买新商户礼包");
+            }
+
+            if (!Objects.equals(entity.getNum(), 1L)) {
+                throw new MsgException("新商户礼包只能下单一个");
+            }
+
+            QueryWrapper<DeviceOrderInfo> qWrapper = new QueryWrapper<DeviceOrderInfo>()
+                    .eq("userId", tokenUa.getUserId())
+                    .eq("code", "MP_NEW");
+            List<DeviceOrderInfo> data = doiService.list(qWrapper);
+            for (DeviceOrderInfo datum : data) {
+                QueryWrapper<DeviceMerchantBuy> qWrapper2 = new QueryWrapper<>();
+                qWrapper2.eq("orderNo", datum.getOrderNo());
+                DeviceMerchantBuy one = dmbService.getOne(qWrapper2);
+                if (one != null && "1".equals(one.getStatus())) {
+                    throw new MsgException("新商户礼包只能下单一次");
+                }
+            }
+
+            LambdaQueryWrapper<MercOrderDetail> qWrapper2= Wrappers.lambdaQuery();
+            qWrapper2.eq(MercOrderDetail::getCode, "MP_NEW");
+            qWrapper2.ne(MercOrderDetail::getStatus, MercOrderDetail.STATUS_NO_PAY);
+            final int count = orderDetailService.count(qWrapper2);
+            if (count > 0) {
+                throw new MsgException("新商户礼包只能下单一次");
+            }
+        }
+    }
+
+    @Override
+    public void add(MercShopTrolley entity) {
+        DeviceGoods deviceGoods = new DeviceGoods();
+        deviceGoods.setCode(entity.getCode());
+        deviceGoods = deviceGoodsService.getOne(new QueryWrapper<>(deviceGoods));
+        entity.setName(deviceGoods.getName());
+
+        MercShopTrolley exist = new MercShopTrolley();
+        exist.setCode(entity.getCode());
+        exist.setUserId(entity.getUserId());
+        exist.setType(entity.getType());
+        exist = getOne(new QueryWrapper<>(exist));
+
+        if (exist == null) {
+            baseMapper.insert(entity);
+        } else {
+            long total = exist.getNum() + entity.getNum();
+            exist.setNum(total > 10? 10: total);
+            entity.setNum(exist.getNum());
+            baseMapper.updateById(exist);
+        }
+    }
+
+    @Override
+    public void apiUpdate(MercShopTrolley entity) {
+        UserApp tokenUa = uaService.queryUserAppByToken();
+
+        if (!tokenUa.getUserId().equals(entity.getUserId())) {
+            throw new MsgException("操作失败！");
+        }
+
+        update(entity);
+    }
+
+    @Override
+    public void update(MercShopTrolley entity) {
+        MercShopTrolley exist = new MercShopTrolley();
+        exist.setCode(entity.getCode());
+        exist.setUserId(entity.getUserId());
+        exist.setType(entity.getType());
+        exist = getOne(new QueryWrapper<>(exist));
+
+        if (exist != null && !exist.getId().equals(entity.getId())) {
+            exist.setNum(exist.getNum() + entity.getNum());
+            baseMapper.updateById(exist);
+            baseMapper.deleteById(entity.getId());
+        } else {
+            baseMapper.updateById(entity);
+        }
+
+    }
+
+    @Override
+    public List<MercShopTrolley> listByUserId(Long userId) {
+        LambdaQueryWrapper<MercShopTrolley> qWrapper = Wrappers.lambdaQuery();
+        qWrapper.eq(MercShopTrolley::getUserId, userId);
+
+        return baseMapper.selectList(qWrapper);
+    }
+
+    @Override
+    public List<MercShopTrolley> apiList() {
+        UserApp tokenUa = uaService.queryUserAppByToken();
+        return listByUserId(tokenUa.getUserId());
+    }
+
+    @Override
+    public List<DeviceGoodsVO> shopTrolleyListByUserId(Long userId) {
+        List<MercShopTrolley> mercShopTrolleys = listByUserId(userId);
+
+        List<DeviceGoodsVO> result = new ArrayList<>();
+
+        List<String> codeList = new ArrayList<>();
+
+        for (MercShopTrolley item : mercShopTrolleys) {
+            codeList.add(item.getCode());
+        }
+
+        List<DeviceDetailVO> deviceDetailVOList = ddService.listByCode(codeList);
+
+        for (MercShopTrolley item : mercShopTrolleys) {
+            DeviceGoodsVO resultItem = new DeviceGoodsVO();
+
+            DeviceGoods dgCondition = new DeviceGoods();
+            dgCondition.setCode(item.getCode());
+
+            DeviceGoods dg = deviceGoodsService.getOne(new QueryWrapper<>(dgCondition));
+
+            resultItem.setId(item.getId());
+            resultItem.setName(dg.getName());
+            resultItem.setCode(dg.getCode());
+            resultItem.setCodeName(dg.getCodeName());
+            resultItem.setDetail(dg.getDetail());
+            resultItem.setIntroDesc(dg.getIntroDesc());
+            resultItem.setDeviceLogo(dg.getDeviceLogo());
+            resultItem.setUserId(userId);
+
+            if (resultItem.getTypeList() == null) {
+                resultItem.setTypeList(new ArrayList<>());
+            }
+
+            for (DeviceDetailVO deviceDetailVO : deviceDetailVOList) {
+                if (resultItem.getCode().equals(deviceDetailVO.getCode())) {
+                    resultItem.getTypeList().add(deviceDetailVO);
+
+                    if (item.getType().equals(deviceDetailVO.getType())) {
+                        resultItem.setCurrentType(deviceDetailVO);
+                    }
+                }
+            }
+
+            resultItem.setNum(item.getNum());
+
+            result.add(resultItem);
+        }
+
+        return result;
+    }
+
+    @Override
+    public List<DeviceGoodsVO> apiShopTrolleyList() {
+        UserApp tokenUa = uaService.queryUserAppByToken();
+        return shopTrolleyListByUserId(tokenUa.getUserId());
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/deviceDetail/DeviceDetailService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/deviceDetail/DeviceDetailService.java
new file mode 100644
index 0000000..5b4db8d
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/deviceDetail/DeviceDetailService.java
@@ -0,0 +1,46 @@
+package cn.pluss.platform.deviceDetail;
+
+import cn.pluss.platform.entity.DeviceDetail;
+import cn.pluss.platform.mapper.DeviceDetailMapper;
+import cn.pluss.platform.vo.DeviceDetailVO;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * [设备展示表] 服务类
+ * </p>
+ *
+ * @author bzg
+ * @since 2020-11-12
+ */
+public interface DeviceDetailService extends IService<DeviceDetail> {
+
+    /**
+     * 根据code获取有效的商品列表
+     * @param codeList
+     * @return
+     */
+    List<DeviceDetailVO> listByCode(List<String> codeList);
+
+    /**
+     * 根据code获取有效的商品列表
+     * @param codeList
+     * @return
+     */
+    List<DeviceDetailVO> listByCodeSimple(List<String> codeList);
+
+    default DeviceDetail getByCodeAndSpec(String code, String spec) {
+        QueryWrapper<DeviceDetail> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("dd.code", code);
+        queryWrapper.eq("ds.spec", spec);
+        queryWrapper.eq("status", 1);
+        queryWrapper.orderByAsc("seq");
+
+        List<DeviceDetail> deviceDetailList = ((DeviceDetailMapper) getBaseMapper()).selectListWithStock(queryWrapper);
+
+        return deviceDetailList.get(0);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/deviceDetail/impl/DeviceDetailServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/deviceDetail/impl/DeviceDetailServiceImpl.java
new file mode 100644
index 0000000..9159a19
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/deviceDetail/impl/DeviceDetailServiceImpl.java
@@ -0,0 +1,198 @@
+package cn.pluss.platform.deviceDetail.impl;
+
+import cn.pluss.platform.converter.Converter;
+import cn.pluss.platform.device.DeviceSpecService;
+import cn.pluss.platform.device.DeviceStockGroupService;
+import cn.pluss.platform.deviceDetail.DeviceDetailService;
+import cn.pluss.platform.deviceStock.DeviceStockService;
+import cn.pluss.platform.dict.DictService;
+import cn.pluss.platform.entity.DeviceDetail;
+import cn.pluss.platform.entity.DeviceSpec;
+import cn.pluss.platform.entity.DeviceStockGroup;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.DeviceDetailMapper;
+import cn.pluss.platform.vo.DeviceDetailVO;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.Setter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * [设备展示表] 服务实现类
+ * </p>
+ *
+ * @author bzg
+ * @since 2020-11-12
+ */
+@Service
+public class DeviceDetailServiceImpl extends ServiceImpl<DeviceDetailMapper, DeviceDetail> implements DeviceDetailService {
+
+    @Setter(onMethod_ = {@Autowired})
+    private DeviceStockService deviceStockService;
+
+    @Autowired
+    private DeviceSpecService deviceSpecService;
+
+    @Autowired
+    private DeviceStockGroupService deviceStockGroupService;
+
+    @Override
+    public List<DeviceDetailVO> listByCode(List<String> codeList) {
+        if (codeList == null || codeList.isEmpty()) {
+            return new ArrayList<>();
+        }
+
+        List<DeviceDetailVO> result = new ArrayList<>();
+
+        QueryWrapper<DeviceDetail> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in("dd.code", codeList);
+        queryWrapper.eq("status", 1);
+        queryWrapper.orderByAsc("seq");
+        List<DeviceDetail> deviceDetails = baseMapper.selectListWithStock(queryWrapper);
+
+        List<String> groupNoList = new ArrayList<>();
+        deviceDetails.forEach( it -> groupNoList.add(it.getGroupNo()));
+
+        List<Map<String, Object>> stockList = deviceStockService.getStockInfoMaps(groupNoList);
+
+        // 查询已下单数量
+        List<Map<String, Object>> soldList = deviceStockService.getSoldStockMaps(groupNoList);
+
+        for (DeviceDetail deviceDetail : deviceDetails) {
+
+            DeviceDetailVO ddVO = Converter.INSTANCE.toVO(deviceDetail);
+
+//            for (Map<String, Object> stockMap : stockList) {
+//                if (stockMap.get("groupNo").equals(deviceDetail.getGroupNo())) {
+//                    ddVO.setTotalCount(((Long) stockMap.get("count")));
+//                    // map.put("totalCount", new BigDecimal(stockMap.get("count").toString()));
+//                    break;
+//                }
+//            }
+            if (ddVO.getTotalCount() != null) {
+                ddVO.setTotalCount(0L);
+            }
+
+            // map.putIfAbsent("totalCount", BigDecimal.ZERO);
+
+            for (Map<String, Object> soldMap : soldList) {
+                if (soldMap.get("groupNo").equals(deviceDetail.getGroupNo())) {
+                    ddVO.setTotalSold((Long.parseLong(soldMap.get("soldCount").toString())));
+                    // map.put("totalSold", );
+                    break;
+                }
+            }
+
+            if (ddVO.getTotalSold() != null) {
+                ddVO.setTotalSold(0L);
+            }
+
+            result.add(ddVO);
+        }
+
+        return result;
+    }
+
+    @Override
+    public List<DeviceDetailVO> listByCodeSimple(List<String> codeList) {
+        if (codeList == null || codeList.isEmpty()) {
+            return new ArrayList<>();
+        }
+
+        List<DeviceDetailVO> result = new ArrayList<>();
+
+        QueryWrapper<DeviceDetail> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in("dd.code", codeList);
+        queryWrapper.eq("status", 1);
+        queryWrapper.orderByAsc("seq");
+        List<DeviceDetail> deviceDetails = baseMapper.selectListWithStockWithNoDetail(queryWrapper);
+
+        List<String> groupNoList = new ArrayList<>();
+        deviceDetails.forEach( it -> groupNoList.add(it.getGroupNo()));
+
+//        List<Map<String, Object>> stockList = deviceStockService.getStockInfoMaps(groupNoList);
+
+        // 查询已下单数量
+        List<Map<String, Object>> soldList = deviceStockService.getSoldStockMaps(groupNoList);
+
+        for (DeviceDetail deviceDetail : deviceDetails) {
+
+            DeviceDetailVO ddVO = Converter.INSTANCE.toVO(deviceDetail);
+
+//            for (Map<String, Object> stockMap : stockList) {
+//                if (stockMap.get("groupNo").equals(deviceDetail.getGroupNo())) {
+//                    ddVO.setTotalCount(((Long) stockMap.get("count")));
+//                    // map.put("totalCount", new BigDecimal(stockMap.get("count").toString()));
+//                    break;
+//                }
+//            }
+            if (ddVO.getTotalCount() != null) {
+                ddVO.setTotalCount(0L);
+            }
+
+            // map.putIfAbsent("totalCount", BigDecimal.ZERO);
+
+            for (Map<String, Object> soldMap : soldList) {
+                if (soldMap.get("groupNo").equals(deviceDetail.getGroupNo())) {
+                    ddVO.setTotalSold((Long.parseLong(soldMap.get("soldCount").toString())));
+                    // map.put("totalSold", );
+                    break;
+                }
+            }
+
+            if (ddVO.getTotalSold() != null) {
+                ddVO.setTotalSold(0L);
+            }
+
+            result.add(ddVO);
+        }
+
+        return result;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean saveOrUpdate(DeviceDetail entity) {
+        // 保存新的版本
+        DeviceSpec deviceSpec = new DeviceSpec();
+        deviceSpec.setSpecName(entity.getTypeDesc());
+        deviceSpec.setSpecDesc(entity.getTypeDesc());
+
+        deviceSpec.setCode(entity.getCode()).setSpec(entity.getType());
+        DeviceSpec existType = deviceSpecService.getByCodeAndSpec(entity.getCode(), entity.getType());
+        if (existType == null) {
+            // 默认序号为999
+            deviceSpec.setWeight(entity.getWeight());
+            deviceSpecService.save(deviceSpec);
+        } else {
+            if (!existType.getSpecName().equals(deviceSpec.getSpecName())) {
+                throw new MsgException("存在相同的版本编码，如需添加新的版本请使用不一样的版本编码");
+            }
+        }
+
+        // 保存新的设备分组
+        DeviceStockGroup deviceStockGroup = new DeviceStockGroup();
+        deviceStockGroup.setGroupCode(entity.getGroupNo());
+        DeviceStockGroup exist = deviceStockGroupService.getOne(new QueryWrapper<>(deviceStockGroup));
+
+        if (exist == null) {
+            deviceStockGroup.setSort(999);
+            deviceStockGroup.setGroupName(entity.getGroupNoDesc());
+            deviceStockGroup.setDesc(entity.getGroupNoDesc());
+            deviceStockGroupService.save(deviceStockGroup);
+        } else {
+            if (!exist.getGroupName().equals(entity.getGroupNoDesc())) {
+                throw new MsgException("存在相同的分组编码，如需添加新的分组请使用不一样的版本编码");
+            }
+        }
+
+        return super.saveOrUpdate(entity);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/deviceMerchantBuy/DeviceMerchantBuyService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/deviceMerchantBuy/DeviceMerchantBuyService.java
new file mode 100644
index 0000000..40730ef
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/deviceMerchantBuy/DeviceMerchantBuyService.java
@@ -0,0 +1,56 @@
+package cn.pluss.platform.deviceMerchantBuy;
+
+import java.util.List;
+import java.util.Map;
+
+import cn.pluss.platform.entity.DeviceMerchantBuy;
+import cn.pluss.platform.mapper.DeviceMerchantBuyMapper;
+import cn.pluss.platform.vo.DeviceMerchantBuyVO;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+public interface DeviceMerchantBuyService extends IService<DeviceMerchantBuy> {
+
+    DeviceMerchantBuy queryDeviceMerchantBuy(DeviceMerchantBuy deviceMerchantBuy);
+
+    List<DeviceMerchantBuy> queryDeviceMerchantBuyList(DeviceMerchantBuy deviceMerchantBuy);
+
+    void saveDeviceMerchantBuy(DeviceMerchantBuy deviceMerchantBuy);
+
+    void updateDeviceMerchantBuy(DeviceMerchantBuy deviceMerchantBuy);
+
+    void deleteDeviceMerchantBuy(DeviceMerchantBuy deviceMerchantBuy);
+
+    List<DeviceMerchantBuy> queryDeviceMerchantBuyPage(Map map);
+
+    default Page<DeviceMerchantBuy> pageDeviceMerchantBuy(Page<DeviceMerchantBuy> page, QueryWrapper<DeviceMerchantBuy> queryWrapper) {
+        return ((DeviceMerchantBuyMapper) getBaseMapper()).selectDeviceMerchantBuyPage(page, queryWrapper);
+    }
+
+    Integer queryDeviceMerchantBuyPageCount(Map map);
+
+
+    /**
+     * 
+     * deviceOrderShowPage:(订单回显). <br/> 
+     *
+     * @author Administrator 
+     * @param map
+     * @return 
+     * @since JDK 1.8
+     */
+    List<DeviceMerchantBuyVO> deviceOrderShowPage(Map<String, Object> map);
+    
+    /**
+     * 
+     * deviceOrderShowPageCount:(订单回显条数统计). <br/> 
+     *
+     * @author Administrator 
+     * @param map
+     * @return 
+     * @since JDK 1.8
+     */
+    Integer deviceOrderShowPageCount(Map<String, Object> map);
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/deviceMerchantBuy/impl/DeviceMerchantBuyServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/deviceMerchantBuy/impl/DeviceMerchantBuyServiceImpl.java
new file mode 100644
index 0000000..8e7eefa
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/deviceMerchantBuy/impl/DeviceMerchantBuyServiceImpl.java
@@ -0,0 +1,97 @@
+package cn.pluss.platform.deviceMerchantBuy.impl;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import cn.pluss.platform.openAccount.OpenAccountRecordService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.Setter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import cn.pluss.platform.deviceMerchantBuy.DeviceMerchantBuyService;
+import cn.pluss.platform.deviceMerchantBuyDetail.DeviceMerchantBuyDetailService;
+import cn.pluss.platform.entity.DeviceMerchantBuy;
+import cn.pluss.platform.vo.DeviceMerchantBuyDetailVO;
+import cn.pluss.platform.vo.DeviceMerchantBuyVO;
+import cn.pluss.platform.mapper.DeviceMerchantBuyMapper;
+
+import javax.annotation.Resource;
+
+@Transactional
+@Service("deviceMerchantBuyService")
+public class DeviceMerchantBuyServiceImpl extends ServiceImpl<DeviceMerchantBuyMapper,DeviceMerchantBuy> implements DeviceMerchantBuyService {
+
+    private static final Logger logger = LoggerFactory.getLogger(DeviceMerchantBuyServiceImpl.class);
+
+
+    @Setter(onMethod_ = {@Autowired})
+    private DeviceMerchantBuyMapper deviceMerchantBuyMapper;
+
+    @Setter(onMethod_ = {@Autowired})
+    private DeviceMerchantBuyDetailService deviceMerchantBuyDetailService;
+
+    @Resource
+    private OpenAccountRecordService openAccountRecordService;
+
+    @Override
+    public DeviceMerchantBuy queryDeviceMerchantBuy(DeviceMerchantBuy deviceMerchantBuy) {
+        return deviceMerchantBuyMapper.queryDeviceMerchantBuy(deviceMerchantBuy);
+    }
+
+    @Override
+    public List<DeviceMerchantBuy> queryDeviceMerchantBuyList(DeviceMerchantBuy deviceMerchantBuy) {
+        return deviceMerchantBuyMapper.queryDeviceMerchantBuyList(deviceMerchantBuy);
+    }
+
+    @Override
+    public void saveDeviceMerchantBuy(DeviceMerchantBuy deviceMerchantBuy) {
+        deviceMerchantBuyMapper.saveDeviceMerchantBuy(deviceMerchantBuy);
+    }
+
+    @Override
+    public void updateDeviceMerchantBuy(DeviceMerchantBuy deviceMerchantBuy) {
+        deviceMerchantBuyMapper.updateDeviceMerchantBuy(deviceMerchantBuy);
+    }
+
+    @Override
+    public void deleteDeviceMerchantBuy(DeviceMerchantBuy deviceMerchantBuy) {
+        deviceMerchantBuyMapper.deleteDeviceMerchantBuy(deviceMerchantBuy);
+    }
+
+    @Override
+    public List<DeviceMerchantBuy> queryDeviceMerchantBuyPage(Map map) {
+        return deviceMerchantBuyMapper.queryDeviceMerchantBuyPage(map);
+    }
+
+    @Override
+    public Integer queryDeviceMerchantBuyPageCount(Map map) {
+        return deviceMerchantBuyMapper.queryDeviceMerchantBuyPageCount(map);
+    }
+
+    @Override
+    public List<DeviceMerchantBuyVO> deviceOrderShowPage(Map<String, Object> map) {
+        List<DeviceMerchantBuyVO> deviceOrderShowPage = deviceMerchantBuyMapper.deviceOrderShowPage(map);
+        //TODO 以下代码，下次版本删除
+        for (DeviceMerchantBuyVO deviceMerchantBuyVO : deviceOrderShowPage) {
+            String status = deviceMerchantBuyVO.getStatus();
+            // 同步app订单设备状态
+            status = "2".equals(status) ? "2" : "0";
+            DeviceMerchantBuyDetailVO detailVO = new DeviceMerchantBuyDetailVO();
+            detailVO.setStatus(status);
+            deviceMerchantBuyVO.setSoleCodeList(Collections.singletonList(detailVO));
+        }
+
+        return deviceOrderShowPage;
+    }
+
+    @Override
+    public Integer deviceOrderShowPageCount(Map<String, Object> map) {
+        return deviceMerchantBuyMapper.deviceOrderShowPageCount(map);
+    }
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/deviceMerchantBuyDetail/DeviceMerchantBuyDetailService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/deviceMerchantBuyDetail/DeviceMerchantBuyDetailService.java
new file mode 100644
index 0000000..71e006b
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/deviceMerchantBuyDetail/DeviceMerchantBuyDetailService.java
@@ -0,0 +1,40 @@
+package cn.pluss.platform.deviceMerchantBuyDetail;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Param;
+
+import cn.pluss.platform.entity.DeviceMerchantBuyDetail;
+import cn.pluss.platform.vo.DeviceMerchantBuyDetailVO;
+
+public interface DeviceMerchantBuyDetailService {
+
+    public DeviceMerchantBuyDetail queryDeviceMerchantBuyDetail(DeviceMerchantBuyDetail deviceMerchantBuyDetail);
+
+    public List<DeviceMerchantBuyDetail> queryDeviceMerchantBuyDetailList(DeviceMerchantBuyDetail deviceMerchantBuyDetail);
+
+    public void saveDeviceMerchantBuyDetail(DeviceMerchantBuyDetail deviceMerchantBuyDetail);
+
+    public void updateDeviceMerchantBuyDetail(DeviceMerchantBuyDetail deviceMerchantBuyDetail);
+
+    public void deleteDeviceMerchantBuyDetail(DeviceMerchantBuyDetail deviceMerchantBuyDetail);
+
+    public List<DeviceMerchantBuyDetail> queryDeviceMerchantBuyDetailPage(Map map);
+
+    public Integer queryDeviceMerchantBuyDetailPageCount(Map map);
+
+    public void saveDeviceMerchantBuyDetailBatch(List<DeviceMerchantBuyDetail> deviceMerchantBuyDetailList);
+    
+    /**
+     * 
+     * queryDeviceMerchantBuyDetailVO:(是否绑定激活). <br/> 
+     * 
+     * @author Administrator 
+     * @param orderNo
+     * @return 
+     * @since JDK 1.8
+     */
+    public List<DeviceMerchantBuyDetailVO> queryDeviceMerchantBuyDetailVO(@Param(value="orderNo")String orderNo);
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/deviceMerchantBuyDetail/impl/DeviceMerchantBuyDetailServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/deviceMerchantBuyDetail/impl/DeviceMerchantBuyDetailServiceImpl.java
new file mode 100644
index 0000000..11251e9
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/deviceMerchantBuyDetail/impl/DeviceMerchantBuyDetailServiceImpl.java
@@ -0,0 +1,64 @@
+package cn.pluss.platform.deviceMerchantBuyDetail.impl;
+
+import java.util.List;
+import java.util.Map;
+import org.springframework.transaction.annotation.Transactional;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import cn.pluss.platform.entity.DeviceMerchantBuyDetail;
+import cn.pluss.platform.vo.DeviceMerchantBuyDetailVO;
+import cn.pluss.platform.deviceMerchantBuyDetail.DeviceMerchantBuyDetailService;
+import cn.pluss.platform.mapper.DeviceMerchantBuyDetailMapper;
+
+@Transactional
+@Service("deviceMerchantBuyDetailService")
+public class DeviceMerchantBuyDetailServiceImpl  implements DeviceMerchantBuyDetailService{
+
+	 private static final Logger logger = LoggerFactory.getLogger( DeviceMerchantBuyDetailServiceImpl.class);
+
+
+    @Autowired
+	  private DeviceMerchantBuyDetailMapper deviceMerchantBuyDetailMapper;
+
+    @Override
+    public DeviceMerchantBuyDetail queryDeviceMerchantBuyDetail(DeviceMerchantBuyDetail deviceMerchantBuyDetail){
+        return deviceMerchantBuyDetailMapper.queryDeviceMerchantBuyDetail(deviceMerchantBuyDetail);
+    }
+
+    @Override
+    public List<DeviceMerchantBuyDetail> queryDeviceMerchantBuyDetailList(DeviceMerchantBuyDetail deviceMerchantBuyDetail){
+        return deviceMerchantBuyDetailMapper.queryDeviceMerchantBuyDetailList(deviceMerchantBuyDetail);
+    }
+    @Override
+    public void saveDeviceMerchantBuyDetail(DeviceMerchantBuyDetail deviceMerchantBuyDetail){
+          deviceMerchantBuyDetailMapper.saveDeviceMerchantBuyDetail(deviceMerchantBuyDetail);
+    }
+    @Override
+    public void updateDeviceMerchantBuyDetail(DeviceMerchantBuyDetail deviceMerchantBuyDetail){
+        deviceMerchantBuyDetailMapper.updateDeviceMerchantBuyDetail(deviceMerchantBuyDetail);
+    }
+    @Override
+    public void deleteDeviceMerchantBuyDetail(DeviceMerchantBuyDetail deviceMerchantBuyDetail){
+        deviceMerchantBuyDetailMapper.deleteDeviceMerchantBuyDetail(deviceMerchantBuyDetail);
+    }
+    @Override
+    public List<DeviceMerchantBuyDetail> queryDeviceMerchantBuyDetailPage(Map map){
+        return deviceMerchantBuyDetailMapper.queryDeviceMerchantBuyDetailPage(map);
+    }
+    @Override
+    public Integer queryDeviceMerchantBuyDetailPageCount(Map map){
+        return deviceMerchantBuyDetailMapper.queryDeviceMerchantBuyDetailPageCount(map);
+    }
+    @Override
+    public void saveDeviceMerchantBuyDetailBatch(List<DeviceMerchantBuyDetail> deviceMerchantBuyDetailList) {
+         deviceMerchantBuyDetailMapper.saveDeviceMerchantBuyDetailBatch(deviceMerchantBuyDetailList);
+    }
+
+	@Override
+	public List<DeviceMerchantBuyDetailVO> queryDeviceMerchantBuyDetailVO(String orderNo) {
+		return deviceMerchantBuyDetailMapper.queryDeviceMerchantBuyDetailVO(orderNo);
+	}
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/deviceSignUnbind/DeviceSignUnbindService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/deviceSignUnbind/DeviceSignUnbindService.java
new file mode 100644
index 0000000..48812bc
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/deviceSignUnbind/DeviceSignUnbindService.java
@@ -0,0 +1,36 @@
+package cn.pluss.platform.deviceSignUnbind;
+
+import java.util.List;
+import java.util.Map;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.entity.DeviceSignUnbind;
+import cn.pluss.platform.mapper.DeviceSignUnbindMapper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+public interface DeviceSignUnbindService extends IService<DeviceSignUnbind> {
+
+    DeviceSignUnbind queryDeviceSignUnbind(DeviceSignUnbind deviceSignUnbind);
+
+    default Page<DeviceSignUnbind> pageWithMerchantInfo(Page<DeviceSignUnbind> page, Wrapper<Object> queryWrapper) {
+        return ((DeviceSignUnbindMapper) getBaseMapper()).selectPageWithMerchantInfo(page, queryWrapper);
+    }
+
+    List<DeviceSignUnbind> queryDeviceSignUnbindPage(Map map);
+
+    Integer queryDeviceSignUnbindPageCount(Map map);
+
+    /**
+     * applyDeviceSignUnbind:(激活/解绑接口). <br/>
+     *
+     * @param orderNo
+     * @param soleCode
+     * @return
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    Result<String> applyDeviceSignUnbind(String orderNo, String soleCode, String sn);
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/deviceSignUnbind/impl/DeviceSignUnbindServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/deviceSignUnbind/impl/DeviceSignUnbindServiceImpl.java
new file mode 100644
index 0000000..c8c6bd2
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/deviceSignUnbind/impl/DeviceSignUnbindServiceImpl.java
@@ -0,0 +1,150 @@
+package cn.pluss.platform.deviceSignUnbind.impl;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.alibaba.fastjson.JSONObject;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.device.DeviceService;
+import cn.pluss.platform.deviceMerchantBuy.DeviceMerchantBuyService;
+import cn.pluss.platform.deviceSignUnbind.DeviceSignUnbindService;
+import cn.pluss.platform.entity.Device;
+import cn.pluss.platform.entity.DeviceMerchantBuy;
+import cn.pluss.platform.entity.DeviceSignUnbind;
+import cn.pluss.platform.entity.MerchantBaseInfo;
+import cn.pluss.platform.entity.MerchantDevice;
+import cn.pluss.platform.mapper.DeviceSignUnbindMapper;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantDevice.MerchantDeviceService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.util.StringUtil;
+
+@Transactional
+@RequiredArgsConstructor
+@Slf4j
+@Service("deviceSignUnbindService")
+public class DeviceSignUnbindServiceImpl extends ServiceImpl<DeviceSignUnbindMapper, DeviceSignUnbind> implements DeviceSignUnbindService {
+
+
+    private final DeviceMerchantBuyService deviceMerchantBuyService;
+
+    private final DeviceService deviceService;
+
+    private final UserAppService userAppService;
+
+    private final MerchantDeviceService merchantDeviceService;
+
+    private final MerchantBaseInfoService merchantBaseInfoService;
+
+    @Override
+    public DeviceSignUnbind queryDeviceSignUnbind(DeviceSignUnbind deviceSignUnbind) {
+        return baseMapper.queryDeviceSignUnbind(deviceSignUnbind);
+    }
+
+    @Override
+    public List<DeviceSignUnbind> queryDeviceSignUnbindPage(Map map) {
+        return baseMapper.queryDeviceSignUnbindPage(map);
+    }
+
+    @Override
+    public Integer queryDeviceSignUnbindPageCount(Map map) {
+        return baseMapper.queryDeviceSignUnbindPageCount(map);
+    }
+
+    @Override
+    public Result<String> applyDeviceSignUnbind(String orderNo, String soleCode, String sn) {
+        DeviceMerchantBuy deviceMerchantBuy = new DeviceMerchantBuy();
+        deviceMerchantBuy.setOrderNo(orderNo);
+        deviceMerchantBuy.setStatus("1");
+        List<DeviceMerchantBuy> queryDeviceMerchantBuyList = deviceMerchantBuyService.queryDeviceMerchantBuyList(deviceMerchantBuy);
+        if (queryDeviceMerchantBuyList == null || queryDeviceMerchantBuyList.size() == 0) {
+            return ResultGenerator.genFailResult("该订单未付款");
+        }
+        deviceMerchantBuy = queryDeviceMerchantBuyList.get(0);
+        Device device = new Device();
+        device.setVenderModel(deviceMerchantBuy.getVenderModel());
+        List<Device> queryDeviceList = deviceService.queryDeviceList(device);
+        if (queryDeviceList != null && queryDeviceList.size() > 0) {
+            device = queryDeviceList.get(0);
+        }
+        DeviceSignUnbind deviceSignUnbind = new DeviceSignUnbind();
+        deviceSignUnbind.setOrderNo(orderNo);
+        deviceSignUnbind.setSoleCode(soleCode);
+        List<DeviceSignUnbind> queryDeviceSignUnbindList = baseMapper.queryDeviceSignUnbindList(deviceSignUnbind);
+        if (StringUtil.isEmpty(soleCode)) {
+            return ResultGenerator.genFailResult("soleCode不能为空");
+        }
+        if (StringUtil.isEmpty(orderNo)) {
+            return ResultGenerator.genFailResult("订单号不能为空");
+        }
+        if (queryDeviceSignUnbindList != null && queryDeviceSignUnbindList.size() > 0) {
+            deviceSignUnbind = queryDeviceSignUnbindList.get(0);
+            if ("2".equals(deviceSignUnbind.getStatus()) || "6".equals(deviceSignUnbind.getStatus())) {
+                deviceSignUnbind.setStatus("3");
+                baseMapper.updateDeviceSignUnbind(deviceSignUnbind);
+                return ResultGenerator.genSuccessResult("申请解绑中，请耐心等待");
+            } else if ("1".equals(deviceSignUnbind.getStatus()) || "4".equals(deviceSignUnbind.getStatus())) {
+                deviceSignUnbind.setStatus("1");
+                baseMapper.updateDeviceSignUnbind(deviceSignUnbind);
+                return ResultGenerator.genFailResult("申请激活中，请耐心等待");
+            } else if ("5".equals(deviceSignUnbind.getStatus())) {
+                if (StringUtil.isEmpty(sn)) {
+                    return ResultGenerator.genFailResult("请输入sn码");
+                }
+                deviceSignUnbind.setStatus("1");
+                baseMapper.updateDeviceSignUnbind(deviceSignUnbind);
+                return ResultGenerator.genSuccessResult("申请激活中，请耐心等待");
+            } else {
+                return ResultGenerator.genFailResult("申请解绑失败");
+            }
+        } else {
+            if (StringUtil.isEmpty(sn)) {
+                return ResultGenerator.genFailResult("请输入sn码");
+            }
+//            UserApp userApp = userAppService.queryUserAppByToken();
+//            if (StringUtil.isEmpty(userApp.getLeshuaMchId())) {
+//                return ResultGenerator.genFailResult("未开通乐刷支付");
+//            }
+//            deviceSignUnbind.setMchId(userApp.getLeshuaMchId());
+            deviceSignUnbind.setSn(sn);
+            deviceSignUnbind.setVenderCode(device.getVenderCode());
+            deviceSignUnbind.setStatus("1");
+            deviceSignUnbind.setVenderModel(device.getVenderModel());
+            deviceSignUnbind.setMerchantName(deviceMerchantBuy.getMerchantName());
+            deviceSignUnbind.setMerchantCode(deviceMerchantBuy.getMerchantCode());
+            log.error(JSONObject.toJSONString(deviceSignUnbind));
+            baseMapper.insert(deviceSignUnbind);
+            MerchantBaseInfo merchantBaseInfo = new MerchantBaseInfo();
+            merchantBaseInfo.setMerchantCode(deviceMerchantBuy.getMerchantCode());
+            List<MerchantBaseInfo> queryMerchantBaseInfoList = merchantBaseInfoService.queryMerchantBaseInfoList(merchantBaseInfo);
+            if (queryMerchantBaseInfoList != null && queryMerchantBaseInfoList.size() > 0) {
+                merchantBaseInfo = queryMerchantBaseInfoList.get(0);
+                MerchantDevice merchantDevice = new MerchantDevice();
+                merchantDevice.setOrderNo(orderNo);
+                merchantDevice.setSn(sn);
+                merchantDevice.setVenderCode(device.getVenderCode());
+                merchantDevice.setMerchantCode(deviceMerchantBuy.getMerchantCode());
+                merchantDevice.setMerchantName(deviceMerchantBuy.getMerchantName());
+                merchantDevice.setUserId(Long.parseLong(merchantBaseInfo.getUserId()));
+                merchantDevice.setStatus(0);
+                merchantDevice.setCreateDt(new Date());
+                merchantDevice.setVenderModel(device.getVenderModel());
+                //添加商家设备
+                merchantDeviceService.save(merchantDevice);
+            }
+            return ResultGenerator.genSuccessResult("申请激活中,请耐心等待");
+        }
+    }
+
+
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/deviceStock/DeviceStockService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/deviceStock/DeviceStockService.java
new file mode 100644
index 0000000..ec4b9b5
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/deviceStock/DeviceStockService.java
@@ -0,0 +1,102 @@
+package cn.pluss.platform.deviceStock;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.dto.DeviceStockDTO;
+import cn.pluss.platform.entity.DeviceStock;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.mapper.DeviceStockMapper;
+import cn.pluss.platform.vo.DeviceNumVO;
+import cn.pluss.platform.vo.DeviceStockVO;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author bzg
+ * @since 2020-11-11
+ */
+public interface DeviceStockService extends IService<DeviceStock> {
+
+    /**
+     * 获取库存信息，总组数
+     * @param groupNoList  商品code
+     * @return
+     */
+    default List<Map<String, Object>> getStockInfoMaps(List<String> groupNoList) {
+        return ((DeviceStockMapper) getBaseMapper()).selectStockInfoList(groupNoList);
+    }
+
+    default List<Map<String, Object>> getSoldStockMaps(List<String> groupNoList) {
+        return ((DeviceStockMapper) getBaseMapper()).selectSoldStockList(groupNoList);
+    }
+
+    /**
+     * 商户绑定付款码，付款码包含码牌和音箱
+     * @param payCode   付款码code
+     */
+    void bindPayCode(String payCode);
+
+    /**
+     * 商户绑定付款码，付款码包含码牌和音箱
+     * @param payCode   付款码code
+     */
+    void bindPayCode(String payCode, UserApp userApp);
+
+    void unbind(Long id);
+
+    DeviceStock getDevicebyNo(String deviceNo);
+
+    /**
+     * 获取设备统计详情
+     * @param dto
+     * @return
+     */
+    DeviceNumVO getStockTypeNumList(DeviceStockDTO dto);
+
+    /**
+     * 分页查询指定设备类型设备信息
+     * @param page
+     * @param dto
+     * @return
+     */
+    Page<DeviceStockVO> pageInfo(Page<DeviceStockVO> page, DeviceStockDTO dto);
+
+    /**
+     * 后台设备出库
+     * @param ids
+     * @param accpetUserId
+     * @param orderNo
+     * @return
+     */
+    Result<String> manageTransfer(List<Long> ids, Long accpetUserId,String orderNo);
+
+    /**
+     * 获取设备详情
+     * @param dto
+     * @return
+     */
+    DeviceStockVO detail(DeviceStockDTO dto);
+
+    /**
+     * 获取商户信息
+     * @param dto
+     * @return
+     */
+    DeviceStockVO getMercInfo(DeviceStockDTO dto);
+
+    Page<DeviceStockVO> pageMercDevice(Page<DeviceStockVO> page, Long userId, Long cashPlaceId);
+
+    Page<DeviceStockVO> apiPageMercDevice(Page<DeviceStockVO> page, Long cashPlaceId);
+
+    /**
+     * 绑定设备V2
+     * @param dto
+     */
+    void bindDevcieV2(DeviceStockDTO dto);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/deviceStock/impl/DeviceStockServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/deviceStock/impl/DeviceStockServiceImpl.java
new file mode 100644
index 0000000..b3a63d9
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/deviceStock/impl/DeviceStockServiceImpl.java
@@ -0,0 +1,406 @@
+package cn.pluss.platform.deviceStock.impl;
+
+import cn.pluss.platform.DeviceGoodsService;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.device.DeviceOperateInfoService;
+import cn.pluss.platform.device.DeviceTransferDetailService;
+import cn.pluss.platform.device.DeviceTransferService;
+import cn.pluss.platform.device.MercOrderNewService;
+import cn.pluss.platform.deviceDetail.DeviceDetailService;
+import cn.pluss.platform.deviceMerchantBuy.DeviceMerchantBuyService;
+import cn.pluss.platform.deviceStock.DeviceStockService;
+import cn.pluss.platform.dto.DeviceStockDTO;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.enums.DeviceOperateType;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.DeviceStockMapper;
+import cn.pluss.platform.mapper.DeviceTypeMapper;
+import cn.pluss.platform.merchant.MerchantCashPayCodeService;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantDevice.MerchantDeviceService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.util.DateUtils;
+import cn.pluss.platform.util.StringUtil;
+import cn.pluss.platform.vo.DeviceNumVO;
+import cn.pluss.platform.vo.DeviceStockVO;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.Setter;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.*;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author bzg
+ * @since 2020-11-11
+ */
+@Service
+public class DeviceStockServiceImpl extends ServiceImpl<DeviceStockMapper, DeviceStock> implements DeviceStockService {
+
+    @Setter(onMethod_ = {@Autowired})
+    private UserAppService userAppService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantBaseInfoService merchantBaseInfoService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private DeviceMerchantBuyService deviceMerchantBuyService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private DeviceDetailService deviceDetailService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private DeviceGoodsService deviceGoodsService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantDeviceService merchantDeviceService;
+
+    @Autowired
+    private MerchantCashPayCodeService cashPayCodeService;
+
+    @Resource
+    private DeviceTypeMapper deviceTypeMapper;
+
+    @Setter(onMethod_ = {@Autowired, @Lazy})
+    private DeviceTransferService deviceTransferService;
+
+    @Setter(onMethod_ = {@Autowired, @Lazy})
+    private DeviceTransferDetailService deviceTransferDetailService;
+
+    @Resource
+    private DeviceOperateInfoService deviceOperateInfoService;
+
+    @Resource
+    private MercOrderNewService mercOrderNewService;
+
+
+    @Override
+    public void bindPayCode(String payCode) {
+        UserApp userApp = userAppService.queryUserAppByToken();
+        bindPayCode(payCode, userApp);
+    }
+
+    @Override
+    public void bindPayCode(String payCode, UserApp userApp) {
+        MsgException.check(userApp == null, "当前登录用户信息为空！");
+
+        DeviceStock deviceStock = new DeviceStock();
+        deviceStock.setSnNo(payCode);
+        deviceStock = getOne(new QueryWrapper<>(deviceStock));
+        MsgException.check(deviceStock == null, "设备编号不存在！");
+
+
+        MerchantBaseInfo info = new MerchantBaseInfo();
+        info.setMerchantCode(userApp.getMerchantCode());
+        MerchantBaseInfo baseInfo = merchantBaseInfoService.queryMerchantBaseInfo(info);
+        MsgException.check(baseInfo == null, "当前商户异常或不存在！");
+
+        MsgException.check("3".equals(deviceStock.getStatus()), "当前设备已绑定，请勿重复绑定！");
+
+        deviceStock.setActMercName(baseInfo.getAlias());
+        deviceStock.setActMercId(String.valueOf(baseInfo.getId()));
+        deviceStock.setStatus("3");
+        updateById(deviceStock);
+        MerchantDevice merchantDevice = new MerchantDevice();
+        if (StringUtils.isNotEmpty(deviceStock.getOrderNo())) {
+            DeviceMerchantBuy buy = new DeviceMerchantBuy();
+            buy.setOrderNo(deviceStock.getOrderNo());
+            DeviceMerchantBuy buyInfo = deviceMerchantBuyService.queryDeviceMerchantBuy(buy);
+            MsgException.check(buyInfo == null, "订单号不存在！");
+            //已激活
+            buyInfo.setActStatus("2");
+            deviceMerchantBuyService.updateDeviceMerchantBuy(buyInfo);
+            merchantDevice.setMerchantCode(baseInfo.getMerchantCode());
+            merchantDevice.setMerchantName(baseInfo.getAlias());
+            merchantDevice.setStatus(0);
+            merchantDevice.setSn(payCode);
+            merchantDevice.setCreateDt(new Date());
+            merchantDevice.setUserId(userApp.getUserId());
+            merchantDevice.setVenderCode(buyInfo.getVenderCode());
+            merchantDevice.setVenderModel(buyInfo.getVenderModel());
+            merchantDevice.setOrderNo(buyInfo.getOrderNo());
+        } else {
+            DeviceDetail deviceDetail = new DeviceDetail();
+            deviceDetail.setCode(deviceStock.getCode());
+            deviceDetail.setType(deviceStock.getType());
+            deviceDetail = deviceDetailService.getOne(new QueryWrapper<>(deviceDetail));
+
+            DeviceGoods deviceGoods = deviceGoodsService.getBySn(payCode);
+            merchantDevice.setMerchantCode(baseInfo.getMerchantCode());
+            merchantDevice.setMerchantName(baseInfo.getAlias());
+            merchantDevice.setStatus(0);
+            merchantDevice.setCreateDt(new Date());
+            merchantDevice.setUserId(userApp.getUserId());
+            merchantDevice.setSn(deviceStock.getSnNo());
+            merchantDevice.setVenderModel(deviceDetail.getVenderModel());
+            merchantDevice.setName(deviceGoods.getName());
+            merchantDevice.setIntroDesc("NO." + deviceStock.getSnNo());
+        }
+        merchantDeviceService.save(merchantDevice);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void unbind(Long id) {
+        if (id == null) {
+            throw new MsgException("解绑出错");
+        }
+
+        LambdaUpdateWrapper<DeviceStock> uWrapper = Wrappers.lambdaUpdate();
+        uWrapper.eq(DeviceStock::getId, id)
+                .set(DeviceStock::getStatus, "2")
+                .set(DeviceStock::getActMercId, null)
+                .set(DeviceStock::getActMercName, null);
+        update(uWrapper);
+
+        DeviceStock device = getById(id);
+
+        // 删除设备收银点关联的信息
+        MerchantCashPayCode cashPayCode = cashPayCodeService.getByPayCode(device.getSnNo());
+        if (cashPayCode != null) {
+            cashPayCodeService.unbindPayCode(cashPayCode.getPayCode());
+        }
+
+        // 删除相关merchantDevice信息
+        MerchantDevice merchantDevice = new MerchantDevice();
+        merchantDevice.setSn(device.getSnNo());
+        merchantDeviceService.remove(new QueryWrapper<>(merchantDevice));
+    }
+
+    @Override
+    public DeviceStock getDevicebyNo(String deviceNo) {
+        QueryWrapper<DeviceStock> queryWrapper = new QueryWrapper<DeviceStock>().eq("deviceNo", deviceNo);
+        return baseMapper.selectOne(queryWrapper);
+    }
+
+    /**
+     * 获取用户设备统计信息
+     *
+     * @param dto
+     * @return
+     */
+    @Override
+    public DeviceNumVO getStockTypeNumList(DeviceStockDTO dto) {
+        UserApp userApp = userAppService.checkApiToken();
+        dto.setUserId(String.valueOf(userApp.getUserId()));
+        List<DeviceStockVO> list = baseMapper.getStockTypeNumList(dto);
+        int totalDeviceNum = BigDecimal.ZERO.intValue();
+        int totalBindNum = BigDecimal.ZERO.intValue();
+        int totalUnBindNum = BigDecimal.ZERO.intValue();
+        if (!list.isEmpty()) {
+            for (DeviceStockVO o : list) {
+                totalDeviceNum = totalDeviceNum + o.getTotalNum();
+                totalBindNum = totalBindNum + o.getBindNum();
+                totalUnBindNum = totalUnBindNum + o.getUnbindNum();
+            }
+        }
+        DeviceNumVO countVo = new DeviceNumVO();
+        countVo.setTotalDeviceNum(totalDeviceNum);
+        countVo.setTotalBindNum(totalBindNum);
+        countVo.setTotalUnbindNum(totalUnBindNum);
+        countVo.setList(list);
+        return countVo;
+    }
+
+    /**
+     * 分页查询指定设备类型设备信息
+     *
+     * @param page
+     * @param dto
+     * @return
+     */
+    @Override
+    public Page<DeviceStockVO> pageInfo(Page<DeviceStockVO> page, DeviceStockDTO dto) {
+        return baseMapper.pageInfo(page, dto);
+    }
+
+    /**
+     * 后台设备出库
+     *
+     * @param ids
+     * @param accpetUserId
+     * @param orderNo
+     * @return
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public Result<String> manageTransfer(List<Long> ids, Long accpetUserId, String orderNo) {
+        List<DeviceStock> list = baseMapper.selectBatchIds(ids);
+        MsgException.check(list.isEmpty(), "出库设备数据异常");
+        UserApp userApp = userAppService.getUserAppByUserId(accpetUserId);
+        MsgException.checkNull(userApp, "出库用户信息异常");
+        MerchantBaseInfo merchant = null;
+        if (StringUtils.isNotEmpty(orderNo)) {
+            MercOrderNew mercOrder = mercOrderNewService.getOrderByNo(orderNo);
+            MsgException.checkNull(mercOrder, "订单号输入有误！");
+            MsgException.check(!MercOrderNew.STATUS_PAYED.equals(mercOrder.getStatus()), "订单不是已支付的订单");
+            merchant = merchantBaseInfoService.getMerchantBaseInfoByUserId(mercOrder.getUserId().toString());
+        }
+        Set<String> codeList = new TreeSet<>();
+        List<String> snNoList = new ArrayList<>(list.size());
+        for (DeviceStock ds : list) {
+            if ("01".equals(ds.getTransferStatus())) {
+                MsgException.throwException("所选设备中包含待接收的设备，设备号为：" + ds.getSnNo());
+            }
+            codeList.add(ds.getCode());
+            snNoList.add(ds.getSnNo());
+        }
+        List<String> codeShowFlagList = deviceTypeMapper.selectListCodeByShowFlag();
+        boolean flag = false;
+        String resCode = null;
+        for (String code : codeList) {
+            if (!codeShowFlagList.contains(code)) {
+                flag = true;
+                resCode = code;
+            }
+        }
+        MsgException.check(flag, "所选设备中包含不能出库的设备类型，设备类型code为:" + resCode);
+        UpdateWrapper<DeviceStock> updateWrapper = new UpdateWrapper<DeviceStock>().in("id", ids)
+                .set("inStockTime", new Date()).set("belongUserId", userApp.getUserId()).set("extractUserId", userApp.getUserId());
+        if (StringUtil.isNotEmpty(orderNo)) {
+            updateWrapper.set("orderNo", orderNo);
+            if (merchant != null) {
+                updateWrapper.set("buyMercName", merchant.getAlias()).set("buyMercId", merchant.getId());
+            }
+        }
+        update(updateWrapper);
+        String batchNo = StringUtil.generateMixStr(3) + DateUtils.toString(DateUtils.currentDate(), "yyyyMMddHHmmss");
+        DeviceTransfer transfer = new DeviceTransfer(null, userApp.getUserId(), batchNo, "01", DateUtils.currentDate(), "设备出库");
+        deviceTransferService.save(transfer);
+        List<DeviceTransferDetail> detailList = new ArrayList<>(list.size());
+        for (String snNo : snNoList) {
+            DeviceTransferDetail detail = new DeviceTransferDetail(transfer, snNo);
+            detailList.add(detail);
+        }
+        deviceOperateInfoService.saveDeviceOperateListInfo(null, DeviceOperateType.IN, snNoList, "设备入库");
+        deviceTransferDetailService.saveBatch(detailList);
+        return ResultGenerator.genSuccessResult("出库成功", null);
+    }
+
+    /**
+     * 获取设备详情
+     *
+     * @param dto
+     * @return
+     */
+    @Override
+    public DeviceStockVO detail(DeviceStockDTO dto) {
+        MsgException.checkBlank(dto.getSnNo(), "缺失设备SN号");
+        return baseMapper.detail(dto);
+    }
+
+    /**
+     * 获取商户信息
+     *
+     * @param dto
+     * @return
+     */
+    @Override
+    public DeviceStockVO getMercInfo(DeviceStockDTO dto) {
+        MsgException.checkBlank(dto.getSnNo(), "缺失设备SN号");
+        DeviceStock stock = baseMapper.getDeviceBySnNo(dto.getSnNo());
+        MsgException.checkNull(stock, "设备编号有误！");
+        MsgException.check(!"3".equals(stock.getStatus()), "设备还未绑定，暂无商户信息！");
+        return baseMapper.getMercInfo(dto);
+    }
+
+    @Override
+    public Page<DeviceStockVO> pageMercDevice(Page<DeviceStockVO> page, Long userId, Long cashPlaceId) {
+        return baseMapper.pageDeviceStock(page, userId, cashPlaceId);
+    }
+
+    @Override
+    public Page<DeviceStockVO> apiPageMercDevice(Page<DeviceStockVO> page, Long cashPlaceId) {
+        UserApp userApp = userAppService.queryUserAppByToken();
+        return pageMercDevice(page, userApp.getUserId(), cashPlaceId);
+    }
+
+    /**
+     * 绑定设备V2
+     *
+     * @param dto
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void bindDevcieV2(DeviceStockDTO dto) {
+        UserApp userApp = userAppService.checkApiToken();
+        dto.setSnNo(dto.getQrNo());
+        String snNo = dto.getSnNo();
+        String deviceNo = dto.getDeviceNo();
+        MsgException.check(StringUtil.isEmpty(snNo) && StringUtil.isEmpty(deviceNo), "设备编号和设备SN号至少需要填写一个");
+        DeviceStock stock = null;
+        if (StringUtil.isNotEmpty(snNo)) {
+            snNo = snNo.replace("ALI_", "");
+            stock = baseMapper.getDeviceBySnNo(snNo);
+        } else {
+            stock = baseMapper.getDeviceByDeviceNo(deviceNo);
+        }
+        MsgException.checkNull(stock, "设备号或SN号有误！");
+
+        MerchantBaseInfo merchant = merchantBaseInfoService.getMerchantBaseInfoByUserId(userApp.getUserId().toString());
+        // 被别人绑定的设备直接抛出异常
+        if ("3".equals(stock.getStatus())) {
+            if (Objects.equals(stock.getActMercId(), merchant.getId().toString())) {
+                return;
+            } else {
+                throw new MsgException("该设备已被绑定，请勿重复绑定！");
+            }
+        }
+
+        List<String> showFlag = deviceTypeMapper.selectListCodeByShowFlag();
+        if(!showFlag.isEmpty() && showFlag.contains(stock.getCode())){
+            boolean flag = userApp.getUserId().equals(stock.getBelongUserId());
+            if (userApp.getParentId() != null) {
+                boolean f1 = userApp.getParentId().equals(stock.getBelongUserId());
+                flag = flag || f1;
+                if(!flag){
+                    UserApp parentApp = userAppService.getUserAppByUserId(userApp.getParentId());
+                    if(parentApp != null && parentApp.getParentId() != null){
+                        boolean f2 = parentApp.getParentId().equals(stock.getBelongUserId());
+                        flag = flag || f2;
+                    }
+                }
+            }
+            MsgException.check(!flag, "绑定失败，当前设备不属于您或您的推广服务商团队，请联系客服或您的推广服务商处理！");
+        }
+
+        MsgException.checkNull(merchant, "当前商户还未认证成商户，暂时无法进行绑定操作");
+        stock.setActMercName(merchant.getAlias());
+        stock.setActMercId(String.valueOf(merchant.getId()));
+        stock.setStatus("3");
+        stock.setBindTime(DateUtils.currentDate());
+        updateById(stock);
+        DeviceOperateInfo operateInfo = new DeviceOperateInfo(userApp, DeviceOperateType.BIND.getCode(), stock.getSnNo(), null);
+        deviceOperateInfoService.save(operateInfo);
+    }
+
+    @Override
+    public <E extends IPage<DeviceStock>> E page(E page, Wrapper<DeviceStock> queryWrapper) {
+        DeviceStock deviceStock = queryWrapper.getEntity();
+        QueryWrapper<DeviceStock> qW = new QueryWrapper<>(deviceStock);
+        if (StringUtil.isNotEmpty(deviceStock.getStartSnNo())) {
+            qW.ge("snNo", deviceStock.getStartSnNo());
+        }
+        if (StringUtil.isNotEmpty(deviceStock.getEndSnNo())) {
+            qW.le("snNo", deviceStock.getEndSnNo());
+        }
+        return super.page(page, qW);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/deviceVoiceBox/DeviceVoiceBoxMsgService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/deviceVoiceBox/DeviceVoiceBoxMsgService.java
new file mode 100644
index 0000000..7467158
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/deviceVoiceBox/DeviceVoiceBoxMsgService.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.deviceVoiceBox;
+
+import cn.pluss.platform.entity.DeviceVoiceBoxMsg;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 设备消息推送记录表 服务类
+ * </p>
+ *
+ * @author bzg
+ * @since 2020-11-04
+ */
+public interface DeviceVoiceBoxMsgService extends IService<DeviceVoiceBoxMsg> {
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/deviceVoiceBox/DeviceVoiceBoxService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/deviceVoiceBox/DeviceVoiceBoxService.java
new file mode 100644
index 0000000..aeea8ce
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/deviceVoiceBox/DeviceVoiceBoxService.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.deviceVoiceBox;
+
+import cn.pluss.platform.entity.DeviceVoiceBox;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 智能音箱设备信息表 服务类
+ * </p>
+ *
+ * @author bzg
+ * @since 2020-11-04
+ */
+public interface DeviceVoiceBoxService extends IService<DeviceVoiceBox> {
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/deviceVoiceBox/impl/DeviceVoiceBoxMsgServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/deviceVoiceBox/impl/DeviceVoiceBoxMsgServiceImpl.java
new file mode 100644
index 0000000..b5764a4
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/deviceVoiceBox/impl/DeviceVoiceBoxMsgServiceImpl.java
@@ -0,0 +1,20 @@
+package cn.pluss.platform.deviceVoiceBox.impl;
+
+import cn.pluss.platform.deviceVoiceBox.DeviceVoiceBoxMsgService;
+import cn.pluss.platform.entity.DeviceVoiceBoxMsg;
+import cn.pluss.platform.mapper.DeviceVoiceBoxMsgMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 设备消息推送记录表 服务实现类
+ * </p>
+ *
+ * @author bzg
+ * @since 2020-11-04
+ */
+@Service
+public class DeviceVoiceBoxMsgServiceImpl extends ServiceImpl<DeviceVoiceBoxMsgMapper, DeviceVoiceBoxMsg> implements DeviceVoiceBoxMsgService {
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/deviceVoiceBox/impl/DeviceVoiceBoxServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/deviceVoiceBox/impl/DeviceVoiceBoxServiceImpl.java
new file mode 100644
index 0000000..5c7dc60
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/deviceVoiceBox/impl/DeviceVoiceBoxServiceImpl.java
@@ -0,0 +1,20 @@
+package cn.pluss.platform.deviceVoiceBox.impl;
+
+import cn.pluss.platform.deviceVoiceBox.DeviceVoiceBoxService;
+import cn.pluss.platform.entity.DeviceVoiceBox;
+import cn.pluss.platform.mapper.DeviceVoiceBoxMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 智能音箱设备信息表 服务实现类
+ * </p>
+ *
+ * @author bzg
+ * @since 2020-11-04
+ */
+@Service
+public class DeviceVoiceBoxServiceImpl extends ServiceImpl<DeviceVoiceBoxMapper, DeviceVoiceBox> implements DeviceVoiceBoxService {
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/dict/Bank4CacheService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/dict/Bank4CacheService.java
new file mode 100644
index 0000000..c69e440
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/dict/Bank4CacheService.java
@@ -0,0 +1,10 @@
+package cn.pluss.platform.dict;
+
+import cn.pluss.platform.entity.Bank4Cache;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @author djh
+ */
+public interface Bank4CacheService extends IService<Bank4Cache> {
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/dict/DictService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/dict/DictService.java
new file mode 100644
index 0000000..f0d402e
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/dict/DictService.java
@@ -0,0 +1,61 @@
+package cn.pluss.platform.dict;
+
+import cn.pluss.platform.entity.Dict;
+import cn.pluss.platform.mapper.DictMapper;
+import cn.pluss.platform.util.tree.TreeUtils;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public interface DictService extends IService<Dict> {
+
+    /**
+     * 通过字典code查询所有子项
+     * @return 字典列表
+     */
+    default List<Dict> getByCode(List<String> codeList) {
+        if (codeList == null || codeList.size() == 0) {
+            return new ArrayList<>();
+        }
+
+        return ((DictMapper)getBaseMapper()).getDictByCode(codeList);
+    }
+
+    /**
+     * 通过字典code和其他信息查询对应的字典项
+     * @param code  父级编码
+     * @param dict  字典项对象，其中包含部分查询条件
+     * @return  字典项
+     */
+    default Dict getByCode(String code, Dict dict) {
+        Dict parent = new Dict().setCode(code);
+        parent = getOne(new QueryWrapper<>(parent));
+
+        dict.setPId(parent.getId());
+        return getOne(new QueryWrapper<>(dict));
+    }
+
+    /**
+     * 获取树形结构
+     * @return
+     */
+    default List<Dict> tree() {
+        List<Dict> list = list();
+        for (Dict dict : list) {
+            dict.setTitle(dict.getName());
+        }
+
+        return TreeUtils.getSortTree(list);
+    }
+
+    /**
+     * 获取一个字典组中的最大序号
+     * @param code  字典编码
+     * @return  ignored
+     */
+    default Dict getMaxSortElem(String code) {
+        return ((DictMapper) getBaseMapper()).selectMaxSortElem(code);
+    }
+}
\ No newline at end of file
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/dict/impl/Bank4CacheImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/dict/impl/Bank4CacheImpl.java
new file mode 100644
index 0000000..99d29e6
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/dict/impl/Bank4CacheImpl.java
@@ -0,0 +1,19 @@
+package cn.pluss.platform.dict.impl;
+
+import cn.pluss.platform.dict.Bank4CacheService;
+import cn.pluss.platform.entity.Bank4Cache;
+import cn.pluss.platform.mapper.Bank4CacheMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+public class Bank4CacheImpl extends ServiceImpl<Bank4CacheMapper, Bank4Cache> implements Bank4CacheService {
+
+    @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class)
+    @Override
+    public boolean save(Bank4Cache entity) {
+        return super.save(entity);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/dict/impl/DictServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/dict/impl/DictServiceImpl.java
new file mode 100644
index 0000000..0f5e360
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/dict/impl/DictServiceImpl.java
@@ -0,0 +1,102 @@
+package cn.pluss.platform.dict.impl;
+
+import cn.jiguang.common.utils.StringUtils;
+import cn.pluss.platform.dict.DictService;
+import cn.pluss.platform.entity.Dict;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.DictMapper;
+import cn.pluss.platform.util.tree.TreeUtils;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class DictServiceImpl extends ServiceImpl<DictMapper, Dict> implements DictService {
+
+    @Override
+    public boolean saveOrUpdate(Dict entity) {
+        checkInsert(entity);
+        checkUpdate(entity);
+
+        return super.saveOrUpdate(entity);
+    }
+
+    /** 插入前检查 */
+    private void checkInsert(Dict entity) {
+        if (StringUtils.isEmpty(entity.getDesc())) {
+            throw new MsgException("请输入字典描述信息");
+        }
+
+        if (!StringUtils.isEmpty(entity.getId())) {
+            return;
+        }
+
+        if (StringUtils.isEmpty(entity.getPId())) {
+            if (StringUtils.isEmpty(entity.getCode())) {
+                throw new MsgException("字典编码不能为空!");
+            }
+
+            // 新添加字典组
+            Dict queryEty = new Dict().setCode(entity.getCode());
+            QueryWrapper<Dict> queryWrapper = new QueryWrapper<>(queryEty);
+            queryEty = getOne(queryWrapper);
+
+            if (queryEty != null) {
+                throw new MsgException("已存在相同编码的字典组!");
+            }
+        } else {
+            // 新添加字典项
+            if (StringUtils.isEmpty(entity.getValue())) {
+                throw new MsgException("字典值不能为空!");
+            }
+
+            Dict queryEty = new Dict().setCode(entity.getValue());
+            queryEty.setPId(entity.getPId());
+            QueryWrapper<Dict> queryWrapper = new QueryWrapper<>(queryEty);
+            queryEty = getOne(queryWrapper);
+
+            if (queryEty != null) {
+                throw new MsgException("同字典组中已存在相同子项值!");
+            }
+        }
+    }
+
+    /** 更新前检查 */
+    private void checkUpdate(Dict entity) {
+        if (StringUtils.isEmpty(entity.getDesc())) {
+            throw new MsgException("请输入字典描述信息");
+        }
+
+        if (StringUtils.isEmpty(entity.getId())) {
+            return;
+        }
+
+        if (StringUtils.isEmpty(entity.getPId())) {
+            if (StringUtils.isEmpty(entity.getCode())) {
+                throw new MsgException("字典编码不能为空!");
+            }
+
+            // 修改时若修改code发现相同的code已经存在
+            Dict queryEty = new Dict().setCode(entity.getCode());
+            QueryWrapper<Dict> queryWrapper = new QueryWrapper<>(queryEty);
+            queryEty = getOne(queryWrapper);
+
+            if (queryEty != null && !queryEty.getId().equals(entity.getId())) {
+                throw new MsgException("已存在相同编码的字典组!");
+            }
+        } else {
+            Dict queryEty = new Dict().setCode(entity.getValue());
+            queryEty.setPId(entity.getPId());
+            QueryWrapper<Dict> queryWrapper = new QueryWrapper<>(queryEty);
+            queryEty = getOne(queryWrapper);
+
+            if (queryEty != null && !queryEty.getId().equals(entity.getId())) {
+                throw new MsgException("该字典组中已存在相同子项值!");
+            }
+        }
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/encrypt/EncryptKeyService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/encrypt/EncryptKeyService.java
new file mode 100644
index 0000000..dda00c6
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/encrypt/EncryptKeyService.java
@@ -0,0 +1,21 @@
+package cn.pluss.platform.encrypt;
+
+import cn.pluss.platform.entity.EncryptKey;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 商务密钥存储表 服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-10-28
+ */
+public interface EncryptKeyService extends IService<EncryptKey> {
+
+    /**
+     * 秘钥生效
+     * @param id    记录id
+     */
+    void enable(String id);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/encrypt/impl/EncryptKeyServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/encrypt/impl/EncryptKeyServiceImpl.java
new file mode 100644
index 0000000..3027432
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/encrypt/impl/EncryptKeyServiceImpl.java
@@ -0,0 +1,53 @@
+package cn.pluss.platform.encrypt.impl;
+
+import cn.pluss.platform.encrypt.EncryptKeyService;
+import cn.pluss.platform.entity.EncryptKey;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.EncryptKeyMapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 商务密钥存储表 服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-10-28
+ */
+@Service
+public class EncryptKeyServiceImpl extends ServiceImpl<EncryptKeyMapper, EncryptKey> implements EncryptKeyService {
+
+    @Override
+    public boolean save(EncryptKey entity) {
+        return super.save(entity);
+    }
+
+    @Override
+    public void enable(String id) {
+        long longId;
+        try {
+            longId = Long.parseLong(id);
+        } catch (NumberFormatException e) {
+            throw new MsgException("非法的ID");
+        }
+
+        EncryptKey encryptKey = getById(longId);
+
+        if (encryptKey == null) {
+            throw new MsgException("该记录不存在");
+        }
+
+        // 先全部置为无效
+        LambdaUpdateWrapper<EncryptKey> uWrapper = Wrappers.lambdaUpdate(EncryptKey.class);
+        uWrapper.set(EncryptKey::getStatus, EncryptKey.STATUS_DISABLE);
+        update(uWrapper);
+
+        // 使选择的记录生效
+        encryptKey.setStatus(EncryptKey.STATUS_ENABLE);
+        updateById(encryptKey);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/export/BillStatisticsService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/export/BillStatisticsService.java
new file mode 100644
index 0000000..32a87f4
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/export/BillStatisticsService.java
@@ -0,0 +1,41 @@
+package cn.pluss.platform.export;
+
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+
+import java.util.Date;
+
+/**
+ * @author Djh
+ */
+public interface BillStatisticsService {
+
+    /**
+     * 创建账单统计的sheet
+     * @return  sheet对象
+     */
+    XSSFWorkbook createBillStatisticsSheet(XSSFWorkbook workbook, String merchantCode, Date startDate, Date endDate);
+
+    /**
+     * 创建账单明细的sheet
+     * @return  sheet对象
+     */
+    XSSFWorkbook createBillListSheet(XSSFWorkbook workbook, String merchantCode, Date startDate, Date endDate);
+
+    /**
+     * 创建会员账单统计的sheet
+     * @return  sheet对象
+     */
+    XSSFWorkbook createMemberBillStatisticsSheet(XSSFWorkbook workbook, String merchantCode, Date startDate, Date endDate);
+
+    /**
+     * 创建会员账单明细的sheet
+     * @return  sheet对象
+     */
+    XSSFWorkbook createMemberBillListSheet(XSSFWorkbook workbook, String merchantCode, Date startDate, Date endDate);
+
+    /**
+     * 创建员工账单统计的sheet
+     * @return  sheet对象
+     */
+    XSSFWorkbook createStaffBillStatisticsSheet(XSSFWorkbook workbook, String merchantCode, Date startDate, Date endDate);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/export/BillStatisticsServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/export/BillStatisticsServiceImpl.java
new file mode 100644
index 0000000..5aa1437
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/export/BillStatisticsServiceImpl.java
@@ -0,0 +1,910 @@
+package cn.pluss.platform.export;
+
+import cn.pluss.platform.mapper.BillStatisticsMapper;
+import cn.pluss.platform.util.excel.ComplexExcelUtil;
+import cn.pluss.platform.util.excel.model.Cell;
+import cn.pluss.platform.util.excel.model.Row;
+import cn.pluss.platform.vo.*;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author Djh
+ */
+@Service
+public class BillStatisticsServiceImpl implements BillStatisticsService {
+
+    @Resource
+    private BillStatisticsMapper billStatisticsMapper;
+
+    @Override
+    public XSSFWorkbook createBillStatisticsSheet(XSSFWorkbook workbook, String merchantCode, Date startDate, Date endDate) {
+        if (workbook == null) {
+            workbook = new XSSFWorkbook();
+        }
+
+        List<BillStatisticsVO> data = billStatisticsMapper.selectBillStatistics(merchantCode, startDate, endDate);
+        ComplexExcelUtil.addData(workbook, "交易账单统计", data, new ComplexExcelUtil.Transformer<BillStatisticsVO>() {
+            @Override
+            public Row getHeader(XSSFWorkbook workbook, List<BillStatisticsVO> dataList) {
+                List<Cell> cellList = new ArrayList<>();
+                Cell cell = new Cell("账单名称", 0, 0);
+                cellList.add(cell);
+                cell = new Cell("起始时间", 1, 0);
+                cellList.add(cell);
+                cell = new Cell("截止时间", 2, 0);
+                cellList.add(cell);
+                cell = new Cell("结算类型", 3, 0);
+                cellList.add(cell);
+                cell = new Cell("收款方式", 4, 0);
+                cellList.add(cell);
+                cell = new Cell("订单笔数", 5, 0);
+                cellList.add(cell);
+                cell = new Cell("退款笔数", 6, 0);
+                cellList.add(cell);
+                cell = new Cell("实收金额", 7, 0);
+                cellList.add(cell);
+                cell = new Cell("优惠金额", 8, 0);
+                cellList.add(cell);
+                cell = new Cell("活动补贴", 9, 0);
+                cellList.add(cell);
+                cell = new Cell("手续费", 10, 0);
+                cellList.add(cell);
+                cell = new Cell("实际到账", 11, 0);
+                cellList.add(cell);
+
+                return new Row(cellList, 0, 0);
+            }
+
+            @Override
+            public Row getRow(XSSFWorkbook workbook, BillStatisticsVO billStatisticsVO, int scaleCol, int scaleRow, int position) {
+                int moveX = 0, moveY = 0;
+                List<Cell> cellList = new ArrayList<>();
+                // 账单名称
+                Cell cell = new Cell(billStatisticsVO.getBillName(), moveX, moveY, 1, 4);
+                moveX++;
+                cellList.add(cell);
+                // 起始时间
+                cell = new Cell(billStatisticsVO.getStartDate(), moveX, moveY, 1, 4);
+                moveX++;
+                cellList.add(cell);
+                // 截止时间
+                cell = new Cell(billStatisticsVO.getEndDate(), moveX, moveY, 1, 4);
+                moveX++;
+                cellList.add(cell);
+                // 结算类型
+                cell = new Cell(billStatisticsVO.getMerchantChannelType(), moveX, moveY, 1, 4);
+                moveX++;
+                cellList.add(cell);
+                // 收款方式
+                // 微信
+                cell = new Cell("微信", moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 支付宝
+                cell = new Cell("支付宝", moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 银联
+                cell = new Cell("银联", moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 总计
+                cell = new Cell("总计", moveX, moveY, 1, 1);
+                cellList.add(cell);
+                moveX++;
+
+                // 订单笔数
+                // 微信
+                moveY = 0;
+                cell = new Cell(billStatisticsVO.getWxOrderCount(), moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 支付宝
+                cell = new Cell(billStatisticsVO.getAliOrderCount(), moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 银联
+                cell = new Cell(billStatisticsVO.getBankOrderCount(), moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 总计
+                cell = new Cell(billStatisticsVO.getAllOrderCount(), moveX, moveY, 1, 1);
+                cellList.add(cell);
+                moveX++;
+
+                // 退款笔数
+                // 微信
+                moveY = 0;
+                cell = new Cell(billStatisticsVO.getWxRefundOrderCount(), moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 支付宝
+                cell = new Cell(billStatisticsVO.getAliRefundOrderCount(), moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 银联
+                cell = new Cell(billStatisticsVO.getBankRefundOrderCount(), moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 总计
+                cell = new Cell(billStatisticsVO.getAllRefundOrderCount(), moveX, moveY, 1, 1);
+                cellList.add(cell);
+                moveX++;
+
+                // 实收金额
+                // 微信
+                moveY = 0;
+                cell = new Cell(billStatisticsVO.getWxInMoney(), moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 支付宝
+                cell = new Cell(billStatisticsVO.getAliInMoney(), moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 银联
+                cell = new Cell(billStatisticsVO.getBankInMoney(), moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+
+                // 总计
+                cell = new Cell(billStatisticsVO.getAllInMoney(), moveX, moveY, 1, 1);
+                cellList.add(cell);
+                moveX++;
+
+                // 优惠金额
+                // 微信
+                moveY = 0;
+                cell = new Cell(BigDecimal.ZERO, moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 支付宝
+                cell = new Cell(BigDecimal.ZERO, moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 银联
+                cell = new Cell(BigDecimal.ZERO, moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 总计
+                cell = new Cell(BigDecimal.ZERO, moveX, moveY, 1, 1);
+                cellList.add(cell);
+                moveX++;
+
+                // 活动补贴
+                // 微信
+                moveY = 0;
+                cell = new Cell(billStatisticsVO.getWxSubsidy(), moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 支付宝
+                cell = new Cell(billStatisticsVO.getAliSubsidy(), moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 银联
+                cell = new Cell(billStatisticsVO.getBankSubsidy(), moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 总计
+                cell = new Cell(billStatisticsVO.getAllSubsidy(), moveX, moveY, 1, 1);
+                cellList.add(cell);
+                moveX++;
+
+                // 手续费
+                // 微信
+                moveY = 0;
+                billStatisticsVO.setWxServiceCharge(billStatisticsVO.getWxInMoney().subtract(billStatisticsVO.getWxInAccount()));
+                cell = new Cell(billStatisticsVO.getWxServiceCharge(), moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 支付宝
+                billStatisticsVO.setAliServiceCharge(billStatisticsVO.getAliInMoney().subtract(billStatisticsVO.getAliInAccount()));
+                cell = new Cell(billStatisticsVO.getAliServiceCharge(), moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 银联
+                billStatisticsVO.setBankServiceCharge(billStatisticsVO.getBankInMoney().subtract(billStatisticsVO.getBankInAccount()));
+                cell = new Cell(billStatisticsVO.getBankServiceCharge(), moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 总计
+                billStatisticsVO.setAllServiceCharge(billStatisticsVO.getAllInMoney().subtract(billStatisticsVO.getAllInAccount()));
+                cell = new Cell(billStatisticsVO.getAllServiceCharge(), moveX, moveY, 1, 1);
+                cellList.add(cell);
+                moveX++;
+
+                // 实际到账
+                // 微信
+                moveY = 0;
+                cell = new Cell(billStatisticsVO.getWxInAccount(), moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 支付宝
+                cell = new Cell(billStatisticsVO.getAliInAccount(), moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 银联
+                cell = new Cell(billStatisticsVO.getBankInAccount(), moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 总计
+                cell = new Cell(billStatisticsVO.getAllInAccount(), moveX, moveY, 1, 1);
+                cellList.add(cell);
+
+                return new Row(cellList, scaleCol, scaleRow);
+            }
+        });
+
+        return workbook;
+    }
+
+    @Override
+    public XSSFWorkbook createBillListSheet(XSSFWorkbook workbook, String merchantCode, Date startDate, Date endDate) {
+        if (workbook == null) {
+            workbook = new XSSFWorkbook();
+        }
+
+        List<MerchantOrderExportVO> data = billStatisticsMapper.selectBillList(merchantCode, startDate, endDate);
+        ComplexExcelUtil.addData(workbook, "交易账单明细", data, new ComplexExcelUtil.Transformer<MerchantOrderExportVO>() {
+            @Override
+            public Row getHeader(XSSFWorkbook workbook, List<MerchantOrderExportVO> dataList) {
+                List<Cell> cellList = new ArrayList<>();
+                Cell cell = new Cell("订单号", 0, 0);
+                cellList.add(cell);
+                cell = new Cell("第三方订单号", 1, 0);
+                cellList.add(cell);
+                cell = new Cell("退款订单号", 2, 0);
+                cellList.add(cell);
+                cell = new Cell("收款方式", 3, 0);
+                cellList.add(cell);
+                cell = new Cell("交易类型", 4, 0);
+                cellList.add(cell);
+                cell = new Cell("实收金额", 5, 0);
+                cellList.add(cell);
+                cell = new Cell("退款金额", 6, 0);
+                cellList.add(cell);
+                cell = new Cell("优惠金额", 7, 0);
+                cellList.add(cell);
+                cell = new Cell("活动补贴", 8, 0);
+                cellList.add(cell);
+                cell = new Cell("手续费", 9, 0);
+                cellList.add(cell);
+                cell = new Cell("实际到账", 10, 0);
+                cellList.add(cell);
+                cell = new Cell("收银员", 11, 0);
+                cellList.add(cell);
+                cell = new Cell("备注", 12, 0);
+                cellList.add(cell);
+                cell = new Cell("创建时间", 13, 0);
+                cellList.add(cell);
+                cell = new Cell("付款时间", 14, 0);
+                cellList.add(cell);
+
+                return new Row(cellList, 0, 0);
+            }
+
+            @Override
+            public Row getRow(XSSFWorkbook workbook, MerchantOrderExportVO item, int scaleCol, int scaleRow, int position) {
+                List<Cell> cellList = new ArrayList<>();
+                cellList.add(new Cell(item.getOrderNumber(), 0, 0));
+                cellList.add(new Cell(item.getThirdOrderNo(), 1, 0));
+                cellList.add(new Cell(item.getRefundNo(), 2, 0));
+                cellList.add(new Cell(item.getPayType(), 3, 0));
+                cellList.add(new Cell(item.getOrderTypeDesc(), 4, 0));
+                cellList.add(new Cell(item.getConsumeFee(), 5, 0));
+                cellList.add(new Cell(item.getRefundFee(), 6, 0));
+                cellList.add(new Cell(BigDecimal.ZERO, 7, 0));
+                cellList.add(new Cell(item.getSubsidy(), 8, 0));
+                cellList.add(new Cell(item.getServiceCharge(), 9, 0));
+                cellList.add(new Cell(item.getEnterFee(), 10, 0));
+                cellList.add(new Cell(item.getStaffName(), 11, 0));
+                cellList.add(new Cell(item.getRemark(), 12, 0));
+                cellList.add(new Cell(item.getCreateDt(), 13, 0));
+                cellList.add(new Cell(item.getTransDt(), 14, 0));
+
+                return new Row(cellList, scaleCol, scaleRow);
+            }
+        });
+
+        return workbook;
+    }
+
+    @Override
+    public XSSFWorkbook createMemberBillStatisticsSheet(XSSFWorkbook workbook, String merchantCode, Date startDate, Date endDate) {
+        if (workbook == null) {
+            workbook = new XSSFWorkbook();
+        }
+
+        List<MemberOrderStatisticsVO> data = billStatisticsMapper.selectMemberBillStatistics(merchantCode, startDate, endDate);
+        // 此处对没有会员卡余额的记录进行处理
+        for (int i = data.size() - 1; i >= 0; i--) {
+            MemberOrderStatisticsVO item = data.get(i);
+            if (i == data.size() - 1) {
+                continue;
+            }
+
+            MemberOrderStatisticsVO itemNext = data.get(i + 1);
+            if (item.getMemberBalance() == null) {
+                item.setMemberBalance(itemNext.getMemberBalance());
+            }
+        }
+
+        ComplexExcelUtil.addData(workbook, "会员账单统计", data, new ComplexExcelUtil.Transformer<MemberOrderStatisticsVO>() {
+            @Override
+            public Row getHeader(XSSFWorkbook workbook, List<MemberOrderStatisticsVO> dataList) {
+                List<Cell> cellList = new ArrayList<>();
+                Cell cell = new Cell("账单名称", 0, 0);
+                cellList.add(cell);
+                cell = new Cell("起始时间", 1, 0);
+                cellList.add(cell);
+                cell = new Cell("截止时间", 2, 0);
+                cellList.add(cell);
+                cell = new Cell("交易类型", 3, 0);
+                cellList.add(cell);
+                cell = new Cell("交易方式", 4, 0);
+                cellList.add(cell);
+                cell = new Cell("结算类型", 5, 0);
+                cellList.add(cell);
+                cell = new Cell("笔数", 6, 0);
+                cellList.add(cell);
+                cell = new Cell("充值/消费金额", 7, 0);
+                cellList.add(cell);
+                cell = new Cell("赠送/消费返金额", 8, 0);
+                cellList.add(cell);
+                cell = new Cell("会员卡总余额", 9, 0);
+                cellList.add(cell);
+
+                return new Row(cellList, 0, 0);
+            }
+
+            @Override
+            public Row getRow(XSSFWorkbook workbook, MemberOrderStatisticsVO item, int scaleCol, int scaleRow, int position) {
+                int moveX = 0, moveY = 0;
+                List<Cell> cellList = new ArrayList<>();
+                // 账单名称
+                Cell cell = new Cell(item.getBillName(), moveX, moveY, 1, 6);
+                moveX++;
+                cellList.add(cell);
+                // 起始时间
+                cell = new Cell(item.getStartDate(), moveX, moveY, 1, 6);
+                moveX++;
+                cellList.add(cell);
+                // 截止时间
+                cell = new Cell(item.getEndDate(), moveX, moveY, 1, 6);
+                moveX++;
+                cellList.add(cell);
+                // 交易类型
+                // 充值
+                cell = new Cell("充值", moveX, moveY, 1, 5);
+                moveY += 5;
+                cellList.add(cell);
+                // 消费
+                cell = new Cell("消费", moveX, moveY, 1, 1);
+                moveX++;
+                cellList.add(cell);
+
+                moveY = 0;
+                // 交易方式
+                // 微信
+                cell = new Cell("微信", moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 支付宝
+                cell = new Cell("支付宝", moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 银联
+                cell = new Cell("银联", moveX, moveY, 1, 1);
+                cellList.add(cell);
+                moveY++;
+                // 现金
+                cell = new Cell("现金", moveX, moveY, 1, 1);
+                cellList.add(cell);
+                moveY++;
+                // 总计
+                cell = new Cell("总计", moveX, moveY, 1, 1);
+                cellList.add(cell);
+                moveY++;
+                // 会员卡
+                cell = new Cell("会员卡", moveX, moveY, 1, 1);
+                cellList.add(cell);
+                moveX++;
+
+                moveY = 0;
+                // 结算类型
+                // 备付金
+                cell = new Cell(item.getMerchantChannelType(), moveX, moveY, 1, 3);
+                cellList.add(cell);
+                moveY += 3;
+
+                cell = new Cell("现金", moveX, moveY, 1, 3);
+                cellList.add(cell);
+                moveX++;
+
+
+                // 订单笔数
+                // 微信
+                moveY = 0;
+                cell = new Cell(item.getWxOrderCount(), moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 支付宝
+                cell = new Cell(item.getAliOrderCount(), moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 银联
+                cell = new Cell(item.getBankOrderCount(), moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 现金
+                cell = new Cell(item.getInCashRechargeOrderCount(), moveX, moveY, 1, 1);
+                cellList.add(cell);
+                moveY++;
+                // 总计
+                cell = new Cell(item.getRechargeOrderCount(), moveX, moveY, 1, 1);
+                cellList.add(cell);
+                moveY++;
+                // 会员卡
+                cell = new Cell(item.getConsumeOrderCount(), moveX, moveY, 1, 1);
+                cellList.add(cell);
+                moveX++;
+
+                // 充值/消费金额
+                // 微信
+                moveY = 0;
+                cell = new Cell(item.getWxRechargeSum(), moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 支付宝
+                cell = new Cell(item.getAliRechargeSum(), moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 银联
+                cell = new Cell(item.getBankRechargeSum(), moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 现金
+                cell = new Cell(item.getInCashRechargeSum(), moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 总计
+                cell = new Cell(item.getRechargeSum(), moveX, moveY, 1, 1);
+                cellList.add(cell);
+                moveY++;
+                // 会员卡
+                cell = new Cell(item.getConsumeSum(), moveX, moveY);
+                cellList.add(cell);
+                moveX++;
+
+                // 赠送/消费返金额
+                // 微信
+                moveY = 0;
+                cell = new Cell(item.getWxGiveMoney(), moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 支付宝
+                cell = new Cell(item.getAliGiveMoney(), moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 银联
+                cell = new Cell(item.getBankGiveMoney(), moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 现金
+                cell = new Cell(item.getInCashRechargeGiveMoney(), moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 现金
+                cell = new Cell(item.getRechargeGiveMoney(), moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 总计
+                cell = new Cell(item.getConsumeGiveMoney(), moveX, moveY, 1, 1);
+                cellList.add(cell);
+                moveX++;
+
+                // 会员卡总余额
+                // 微信
+                moveY = 0;
+                cell = new Cell(item.getMemberBalance() == null? "-": item.getMemberBalance(), moveX, moveY, 1, 6);
+                cellList.add(cell);
+
+                return new Row(cellList, scaleCol, scaleRow);
+            }
+        });
+
+        return workbook;
+    }
+
+    @Override
+    public XSSFWorkbook createMemberBillListSheet(XSSFWorkbook workbook, String merchantCode, Date startDate, Date endDate) {
+        if (workbook == null) {
+            workbook = new XSSFWorkbook();
+        }
+
+        List<MemberOrderVO> data = billStatisticsMapper.selectMemberBillList(merchantCode, startDate, endDate);
+        ComplexExcelUtil.addData(workbook, "会员账单明细", data, new ComplexExcelUtil.Transformer<MemberOrderVO>() {
+            @Override
+            public Row getHeader(XSSFWorkbook workbook, List<MemberOrderVO> dataList) {
+                List<Cell> cellList = new ArrayList<>();
+                Cell cell = new Cell("订单号", 0, 0);
+                cellList.add(cell);
+                cell = new Cell("第三方订单号", 1, 0);
+                cellList.add(cell);
+                cell = new Cell("会员名称", 2, 0);
+                cellList.add(cell);
+                cell = new Cell("会员手机号", 3, 0);
+                cellList.add(cell);
+                cell = new Cell("收款方式", 4, 0);
+                cellList.add(cell);
+                cell = new Cell("交易类型", 5, 0);
+                cellList.add(cell);
+                cell = new Cell("充值/消费金额", 6, 0);
+                cellList.add(cell);
+                cell = new Cell("手续费", 7, 0);
+                cellList.add(cell);
+                cell = new Cell("现金到账", 8, 0);
+                cellList.add(cell);
+                cell = new Cell("银行卡到账", 9, 0);
+                cellList.add(cell);
+                cell = new Cell("赠送金额", 10, 0);
+                cellList.add(cell);
+                cell = new Cell("剩余金额", 11, 0);
+                cellList.add(cell);
+                cell = new Cell("收银员", 12, 0);
+                cellList.add(cell);
+                cell = new Cell("备注", 13, 0);
+                cellList.add(cell);
+                cell = new Cell("创建时间", 14, 0);
+                cellList.add(cell);
+                cell = new Cell("付款时间", 15, 0);
+                cellList.add(cell);
+
+                return new Row(cellList, 0, 0);
+            }
+
+            @Override
+            public Row getRow(XSSFWorkbook workbook, MemberOrderVO item, int scaleCol, int scaleRow, int position) {
+                int moveX = 0, moveY = 0;
+                List<Cell> cellList = new ArrayList<>();
+                // 订单号
+                Cell cell = new Cell(item.getOrderNumber(), moveX, moveY, 1, 1);
+                moveX++;
+                cellList.add(cell);
+                // 第三方订单号
+                cell = new Cell(item.getThirdOrderNo(), moveX, moveY, 1, 1);
+                moveX++;
+                cellList.add(cell);
+                // 会员名称
+                cell = new Cell(item.getNickName(), moveX, moveY, 1, 1);
+                moveX++;
+                cellList.add(cell);
+                // 会员手机号
+                cell = new Cell(item.getPhone(), moveX, moveY, 1, 1);
+                moveX++;
+                cellList.add(cell);
+                // 收款方式
+                cell = new Cell(item.getPayType(), moveX, moveY, 1, 1);
+                moveX++;
+                cellList.add(cell);
+                // 交易类型
+                cell = new Cell(item.getOrderType(), moveX, moveY, 1, 1);
+                moveX++;
+                cellList.add(cell);
+                // 充值金额
+                cell = new Cell(item.getOrderFee(), moveX, moveY, 1, 1);
+                moveX++;
+                cellList.add(cell);
+                // 手续费
+                cell = new Cell(item.getServiceRecharge(), moveX, moveY, 1, 1);
+                moveX++;
+                cellList.add(cell);
+                // 现金到账
+                cell = new Cell(item.getInCashMoney(), moveX, moveY, 1, 1);
+                moveX++;
+                cellList.add(cell);
+                // 银行卡到账
+                cell = new Cell(item.getCardMoney(), moveX, moveY, 1, 1);
+                moveX++;
+                cellList.add(cell);
+//                // 消费金额
+//                cell = new Cell(item.getConsumeFee(), moveX, moveY, 1, 1);
+//                moveX++;
+//                cellList.add(cell);
+                // 赠送金额
+                cell = new Cell(item.getGiveMoney(), moveX, moveY, 1, 1);
+                moveX++;
+                cellList.add(cell);
+                // 剩余金额
+                cell = new Cell(item.getMemberBalance(), moveX, moveY, 1, 1);
+                moveX++;
+                cellList.add(cell);
+                // 收银员
+                cell = new Cell(item.getStaffName(), moveX, moveY, 1, 1);
+                moveX++;
+                cellList.add(cell);
+                // 备注
+                cell = new Cell(item.getRemark(), moveX, moveY, 1, 1);
+                moveX++;
+                cellList.add(cell);
+                // 生成时间
+                cell = new Cell(item.getCreateDt(), moveX, moveY, 1, 1);
+                moveX++;
+                cellList.add(cell);
+                // 付款时间
+                cell = new Cell(item.getTransDt(), moveX, moveY, 1, 1);
+                cellList.add(cell);
+
+                return new Row(cellList, scaleCol, scaleRow);
+            }
+        });
+
+        return workbook;
+    }
+
+    @Override
+    public XSSFWorkbook createStaffBillStatisticsSheet(XSSFWorkbook workbook, String merchantCode, Date startDate, Date endDate) {
+        if (workbook == null) {
+            workbook = new XSSFWorkbook();
+        }
+
+        List<BillStatisticsVO> data = billStatisticsMapper.selectStaffBillStatistics(merchantCode, startDate, endDate);
+        ComplexExcelUtil.addData(workbook, "员工账单统计", data, new ComplexExcelUtil.Transformer<BillStatisticsVO>() {
+            @Override
+            public Row getHeader(XSSFWorkbook workbook, List<BillStatisticsVO> dataList) {
+                List<Cell> cellList = new ArrayList<>();
+                Cell cell = new Cell("账单名称", 0, 0);
+                cellList.add(cell);
+                cell = new Cell("起始时间", 1, 0);
+                cellList.add(cell);
+                cell = new Cell("截止时间", 2, 0);
+                cellList.add(cell);
+                cell = new Cell("结算类型", 3, 0);
+                cellList.add(cell);
+                cell = new Cell("收款方式", 4, 0);
+                cellList.add(cell);
+                cell = new Cell("订单笔数", 5, 0);
+                cellList.add(cell);
+                cell = new Cell("退款笔数", 6, 0);
+                cellList.add(cell);
+                cell = new Cell("实收金额", 7, 0);
+                cellList.add(cell);
+                cell = new Cell("优惠金额", 8, 0);
+                cellList.add(cell);
+                cell = new Cell("活动补贴", 9, 0);
+                cellList.add(cell);
+                cell = new Cell("手续费", 10, 0);
+                cellList.add(cell);
+                cell = new Cell("实际到账", 11, 0);
+                cellList.add(cell);
+
+                return new Row(cellList, 0, 0);
+            }
+
+            @Override
+            public Row getRow(XSSFWorkbook workbook, BillStatisticsVO billStatisticsVO, int scaleCol, int scaleRow, int position) {
+                int moveX = 0, moveY = 0;
+                List<Cell> cellList = new ArrayList<>();
+                // 账单名称
+                Cell cell = new Cell(billStatisticsVO.getBillName(), moveX, moveY, 1, 5);
+                moveX++;
+                cellList.add(cell);
+                // 起始时间
+                cell = new Cell(billStatisticsVO.getStartDate(), moveX, moveY, 1, 5);
+                moveX++;
+                cellList.add(cell);
+                // 截止时间
+                cell = new Cell(billStatisticsVO.getEndDate(), moveX, moveY, 1, 5);
+                moveX++;
+                cellList.add(cell);
+                // 结算类型
+                // 备付金
+                cell = new Cell(billStatisticsVO.getMerchantChannelType(), moveX, moveY, 1, 3);
+                moveY += 3;
+                cellList.add(cell);
+                // 空
+                cell = new Cell("", moveX, moveY, 1, 2);
+                moveX++;
+                cellList.add(cell);
+
+
+                // 收款方式
+                moveY = 0;
+                // 微信
+                cell = new Cell("微信", moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 支付宝
+                cell = new Cell("支付宝", moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 银联
+                cell = new Cell("银联", moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 现金
+                cell = new Cell("现金", moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 总计
+                cell = new Cell("总计", moveX, moveY, 1, 1);
+                cellList.add(cell);
+                moveX++;
+
+                // 订单笔数
+                // 微信
+                moveY = 0;
+                cell = new Cell(billStatisticsVO.getWxOrderCount(), moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 支付宝
+                cell = new Cell(billStatisticsVO.getAliOrderCount(), moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 银联
+                cell = new Cell(billStatisticsVO.getBankOrderCount(), moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 现金
+                cell = new Cell(billStatisticsVO.getInCashOrderCount(), moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 总计
+                cell = new Cell(billStatisticsVO.getAllOrderCount(), moveX, moveY, 1, 1);
+                cellList.add(cell);
+                moveX++;
+
+                // 退款笔数
+                // 微信
+                moveY = 0;
+                cell = new Cell(billStatisticsVO.getWxRefundOrderCount(), moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 支付宝
+                cell = new Cell(billStatisticsVO.getAliRefundOrderCount(), moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 银联
+                cell = new Cell(billStatisticsVO.getBankRefundOrderCount(), moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 现金
+                cell = new Cell(0, moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 总计
+                cell = new Cell(billStatisticsVO.getAllRefundOrderCount(), moveX, moveY, 1, 1);
+                cellList.add(cell);
+                moveX++;
+
+                // 实收金额
+                // 微信
+                moveY = 0;
+                cell = new Cell(billStatisticsVO.getWxInMoney(), moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 支付宝
+                cell = new Cell(billStatisticsVO.getAliInMoney(), moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 银联
+                cell = new Cell(billStatisticsVO.getBankInMoney(), moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 现金
+                cell = new Cell(billStatisticsVO.getInCashInMoney(), moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 总计
+                cell = new Cell(billStatisticsVO.getAllInMoney(), moveX, moveY, 1, 1);
+                cellList.add(cell);
+                moveX++;
+
+                // 优惠金额
+                // 微信
+                moveY = 0;
+                cell = new Cell(BigDecimal.ZERO, moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 支付宝
+                cell = new Cell(BigDecimal.ZERO, moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 银联
+                cell = new Cell(BigDecimal.ZERO, moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 现金
+                cell = new Cell(BigDecimal.ZERO, moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 总计
+                cell = new Cell(BigDecimal.ZERO, moveX, moveY, 1, 1);
+                cellList.add(cell);
+                moveX++;
+
+                // 活动补贴
+                // 微信
+                moveY = 0;
+                cell = new Cell(billStatisticsVO.getWxSubsidy(), moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 支付宝
+                cell = new Cell(billStatisticsVO.getAliSubsidy(), moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 银联
+                cell = new Cell(billStatisticsVO.getBankSubsidy(), moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 现金
+                cell = new Cell(BigDecimal.ZERO, moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 总计
+                cell = new Cell(billStatisticsVO.getAllSubsidy(), moveX, moveY, 1, 1);
+                cellList.add(cell);
+                moveX++;
+
+                // 手续费
+                // 微信
+                moveY = 0;
+                billStatisticsVO.setWxServiceCharge(billStatisticsVO.getWxInMoney().subtract(billStatisticsVO.getWxInAccount()));
+                cell = new Cell(billStatisticsVO.getWxServiceCharge(), moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 支付宝
+                billStatisticsVO.setAliServiceCharge(billStatisticsVO.getAliInMoney().subtract(billStatisticsVO.getAliInAccount()));
+                cell = new Cell(billStatisticsVO.getAliServiceCharge(), moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 银联
+                billStatisticsVO.setBankServiceCharge(billStatisticsVO.getBankInMoney().subtract(billStatisticsVO.getBankInAccount()));
+                cell = new Cell(billStatisticsVO.getBankServiceCharge(), moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 现金
+                cell = new Cell(BigDecimal.ZERO, moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 总计
+                billStatisticsVO.setAllServiceCharge(billStatisticsVO.getAllInMoney().subtract(billStatisticsVO.getAllInAccount()));
+                cell = new Cell(billStatisticsVO.getAllServiceCharge(), moveX, moveY, 1, 1);
+                cellList.add(cell);
+                moveX++;
+
+                // 实际到账
+                // 微信
+                moveY = 0;
+                cell = new Cell(billStatisticsVO.getWxInAccount(), moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 支付宝
+                cell = new Cell(billStatisticsVO.getAliInAccount(), moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 银联
+                cell = new Cell(billStatisticsVO.getBankInAccount(), moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 现金
+                cell = new Cell(billStatisticsVO.getInCashInAccount(), moveX, moveY, 1, 1);
+                moveY++;
+                cellList.add(cell);
+                // 总计
+                cell = new Cell(billStatisticsVO.getAllInAccount(), moveX, moveY, 1, 1);
+                cellList.add(cell);
+
+                return new Row(cellList, scaleCol, scaleRow);
+            }
+        });
+
+        return workbook;
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/fans/FansService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/fans/FansService.java
new file mode 100644
index 0000000..4166c92
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/fans/FansService.java
@@ -0,0 +1,108 @@
+package cn.pluss.platform.fans;
+
+import cn.pluss.platform.entity.Fans;
+import cn.pluss.platform.vo.FansConsumVO;
+
+import java.util.List;
+import java.util.Map;
+
+public interface FansService {
+
+    public Fans queryFans(Fans fans);
+
+    public List<Fans> queryFansList(Fans fans);
+
+    public void saveFans(Fans fans);
+
+    public void updateFans(Fans fans);
+
+    public void deleteFans(Fans fans);
+
+    public List<Fans> queryFansPage(Map map);
+
+    public Integer queryFansPageCount(Map map);
+
+    public Integer queryFansNoPageCount(Map map);
+
+    public void saveFansBatch(List<Fans> fansList);
+    
+    /**
+                  * 统计商户粉丝的交易总额
+     * @param map
+     * @return
+     */
+    public Double sumConsumMoneyByMerchantCode(Map<String, Object> map);
+    
+    /**
+     * 
+     * queryNowDateFansList:(获取当天粉丝的集合). <br/> 
+     * 
+     * @author Administrator 
+     * @param map 
+     * @return 
+     * @since JDK 1.8
+     */
+    public List<Fans> queryNowDateFansList(Map map);
+    
+  public List<Fans> queryFansPageManage(Map map);
+    
+    public Integer queryFansPageCountManage(Map map);
+    
+    /**
+     * 
+     * queryLastFansByUserId:(查询某一粉丝最后一次消费的时间). <br/> 
+     * 
+     * @author Administrator 
+     * @param userId
+     * @return 
+     * @since JDK 1.8
+     */
+    Fans queryLastFansByUserId(String userId);
+    
+    /**
+     * 
+     * queryFansConsumPage:(最新粉丝分润记录查询). <br/> 
+     * 
+     * @author Administrator 
+     * @param map
+     * @return 
+     * @since JDK 1.8
+     */
+    public List<FansConsumVO> queryFansConsumPage(Map<String, Object> map);
+
+    public List<FansConsumVO> queryFansNoConsumPage(Map<String, Object> map);
+    
+    /**
+     * 
+     * queryFansConsumPageCount:(最新粉丝分润记录统计). <br/> 
+     * 
+     * @author Administrator 
+     * @param map
+     * @return 
+     * @since JDK 1.8
+     */
+    public Integer queryFansConsumPageCount(Map<String, Object> map);
+
+    Integer queryFansNoConsumPageCount(Map<String, Object> map);
+    
+    Double queryFansSumConsumMoney(Map<String, Object> map);
+    
+    Double queryFansSumShareMoney(Map<String, Object> map);
+    
+    
+    /**
+     * 返回粉丝奖励总数
+     * @param fans
+     * @return
+     */
+    Double queryFansTodayCount(Fans fans);
+
+	/**
+	 * @description:根据订单号查询粉丝消费记录
+	 * @date: 2021/9/1 13:32
+	 * @param orderNumber:
+	 * @return cn.pluss.platform.entity.Fans
+	 */
+    Fans getByLockOrderNumber(String orderNumber);
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/fans/impl/FansServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/fans/impl/FansServiceImpl.java
new file mode 100644
index 0000000..f9f9177
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/fans/impl/FansServiceImpl.java
@@ -0,0 +1,133 @@
+package cn.pluss.platform.fans.impl;
+
+import java.util.List;
+import java.util.Map;
+import org.springframework.transaction.annotation.Transactional;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import cn.pluss.platform.entity.Fans;
+import cn.pluss.platform.vo.FansConsumVO;
+import cn.pluss.platform.fans.FansService;
+import cn.pluss.platform.mapper.FansMapper;
+
+@Transactional
+@Service("fansService")
+public class FansServiceImpl  implements FansService{
+
+	 private static final Logger logger = LoggerFactory.getLogger( FansServiceImpl.class);
+
+
+    @Autowired
+	  private FansMapper fansMapper;
+
+    @Override
+    public Fans queryFans(Fans fans){
+        return fansMapper.queryFans(fans);
+    }
+
+    @Override
+    public List<Fans> queryFansList(Fans fans){
+        return fansMapper.queryFansList(fans);
+    }
+    @Override
+    public void saveFans(Fans fans){
+          fansMapper.saveFans(fans);
+    }
+    @Override
+    public void updateFans(Fans fans){
+        fansMapper.updateFans(fans);
+    }
+    @Override
+    public void deleteFans(Fans fans){
+        fansMapper.deleteFans(fans);
+    }
+    @Override
+    public List<Fans> queryFansPage(Map map){
+        return fansMapper.queryFansPage(map);
+    }
+    @Override
+    public Integer queryFansPageCount(Map map){
+        return fansMapper.queryFansPageCount(map);
+    }
+	@Override
+	public Integer queryFansNoPageCount(Map map){
+		return fansMapper.queryFansNoPageCount(map);
+	}
+    @Override
+    public void saveFansBatch(List<Fans> fansList) {
+         fansMapper.saveFansBatch(fansList);
+    }
+
+	@Override
+	public Double sumConsumMoneyByMerchantCode(Map map) {
+		return fansMapper.sumConsumMoneyByMerchantCode(map);
+	}
+
+	@Override
+	public List<Fans> queryNowDateFansList(Map map) {
+		return fansMapper.queryNowDateFansList(map);
+	}
+
+	@Override
+	public List<Fans> queryFansPageManage(Map map) {
+		return fansMapper.queryFansPageManage(map);
+	}
+
+	@Override
+	public Integer queryFansPageCountManage(Map map) {
+		return fansMapper.queryFansPageCountManage(map);
+	}
+
+	@Override
+	public Fans queryLastFansByUserId(String userId) {
+		return fansMapper.queryLastFansByUserId(userId);
+	}
+
+	@Override
+	public List<FansConsumVO> queryFansConsumPage(Map<String, Object> map) {
+		return fansMapper.queryFansConsumPage(map);
+	}
+
+	@Override
+	public List<FansConsumVO> queryFansNoConsumPage(Map<String, Object> map) {
+		return fansMapper.queryFansNoConsumPage(map);
+	}
+
+	@Override
+	public Integer queryFansConsumPageCount(Map<String, Object> map) {
+		return fansMapper.queryFansConsumPageCount(map);
+	}
+	@Override
+	public Integer queryFansNoConsumPageCount(Map<String, Object> map) {
+		return fansMapper.queryFansNoConsumPageCount(map);
+	}
+
+	@Override
+	public Double queryFansSumConsumMoney(Map<String, Object> map) {
+		return fansMapper.queryFansSumConsumMoney(map);
+	}
+
+	@Override
+	public Double queryFansSumShareMoney(Map<String, Object> map) {
+		return fansMapper.queryFansSumShareMoney(map);
+	}
+
+	@Override
+	public Double queryFansTodayCount(Fans fans) {
+		return fansMapper.queryFansTodayCount(fans);
+	}
+
+	/**
+	 * @description:根据订单号查询粉丝消费记录
+	 * @date: 2021/9/1 13:33
+	 * @param orderNumber:
+	 * @return cn.pluss.platform.entity.Fans
+	 */
+	@Override
+	public Fans getByLockOrderNumber(String orderNumber) {
+		return fansMapper.getByLockOrderNumber(orderNumber);
+	}
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/fansConsumReturn/FansConsumReturnService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/fansConsumReturn/FansConsumReturnService.java
new file mode 100644
index 0000000..baff0d5
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/fansConsumReturn/FansConsumReturnService.java
@@ -0,0 +1,80 @@
+package cn.pluss.platform.fansConsumReturn;
+
+import java.util.List;
+import java.util.Map;
+
+import cn.pluss.platform.entity.FansConsumReturn;
+import cn.pluss.platform.vo.FansInfoCountVO;
+
+public interface FansConsumReturnService {
+
+    public FansConsumReturn queryFansConsumReturn(FansConsumReturn fansConsumReturn);
+
+    public List<FansConsumReturn> queryFansConsumReturnList(FansConsumReturn fansConsumReturn);
+
+    public void saveFansConsumReturn(FansConsumReturn fansConsumReturn);
+
+    public void updateFansConsumReturn(FansConsumReturn fansConsumReturn);
+
+    public void deleteFansConsumReturn(FansConsumReturn fansConsumReturn);
+
+    public List<FansConsumReturn> queryFansConsumReturnPage(Map map);
+
+    public Integer queryFansConsumReturnPageCount(Map map);
+
+    public void saveFansConsumReturnBatch(List<FansConsumReturn> fansConsumReturnList);
+    
+    /**
+     * 统计粉丝消费金额  统计粉丝消费奖励金额
+     * @param merchantCode
+     * @return
+     */
+    public FansInfoCountVO sumFansConsumReturnInfo(String merchantCode);
+    
+    /**
+     * 可提现总金额（提现规则  超过一个月的时间）
+     * @param map
+     * @return
+     */
+    public Double sumFansAllowCashMoney(Map map);
+    
+
+    /**
+     * 不可提现总金额（提现规则 不超过一个月）
+     * @param map
+     * @return
+     */
+    public Double sumFansNotAllowCashMoney( Map map);
+    
+    /**
+     * 今日分润
+     * @param map
+     * @return
+     */
+    public Double sumNowDayShareMoney(Map map);
+    
+    /**
+     * 累计总分润
+     * @param map
+     * @return
+     */
+    public Double sumAllShareMoney(Map map);
+    
+    /**
+     * 累计总分润
+     * @param merchantCode
+     * @return
+     */
+    public Double sumShareMoney();
+    
+    /**
+     * 今日奖励
+     * @param merchantCode
+     * @return
+     */
+    public Double sumNowReturnMoney();
+    
+    
+    public Double sumReturnMoneyByTime(Map map);
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/fansConsumReturn/impl/FansConsumReturnServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/fansConsumReturn/impl/FansConsumReturnServiceImpl.java
new file mode 100644
index 0000000..7bebd8a
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/fansConsumReturn/impl/FansConsumReturnServiceImpl.java
@@ -0,0 +1,99 @@
+package cn.pluss.platform.fansConsumReturn.impl;
+
+import java.util.List;
+import java.util.Map;
+import org.springframework.transaction.annotation.Transactional;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import cn.pluss.platform.entity.FansConsumReturn;
+import cn.pluss.platform.vo.FansInfoCountVO;
+import cn.pluss.platform.fansConsumReturn.FansConsumReturnService;
+import cn.pluss.platform.mapper.FansConsumReturnMapper;
+
+@Transactional
+@Service("fansConsumReturnService")
+public class FansConsumReturnServiceImpl  implements FansConsumReturnService{
+
+	 private static final Logger logger = LoggerFactory.getLogger( FansConsumReturnServiceImpl.class);
+
+
+    @Autowired
+	  private FansConsumReturnMapper fansConsumReturnMapper;
+
+    @Override
+    public FansConsumReturn queryFansConsumReturn(FansConsumReturn fansConsumReturn){
+        return fansConsumReturnMapper.queryFansConsumReturn(fansConsumReturn);
+    }
+
+    @Override
+    public List<FansConsumReturn> queryFansConsumReturnList(FansConsumReturn fansConsumReturn){
+        return fansConsumReturnMapper.queryFansConsumReturnList(fansConsumReturn);
+    }
+    @Override
+    public void saveFansConsumReturn(FansConsumReturn fansConsumReturn){
+          fansConsumReturnMapper.saveFansConsumReturn(fansConsumReturn);
+    }
+    @Override
+    public void updateFansConsumReturn(FansConsumReturn fansConsumReturn){
+        fansConsumReturnMapper.updateFansConsumReturn(fansConsumReturn);
+    }
+    @Override
+    public void deleteFansConsumReturn(FansConsumReturn fansConsumReturn){
+        fansConsumReturnMapper.deleteFansConsumReturn(fansConsumReturn);
+    }
+    @Override
+    public List<FansConsumReturn> queryFansConsumReturnPage(Map map){
+        return fansConsumReturnMapper.queryFansConsumReturnPage(map);
+    }
+    @Override
+    public Integer queryFansConsumReturnPageCount(Map map){
+        return fansConsumReturnMapper.queryFansConsumReturnPageCount(map);
+    }
+    @Override
+    public void saveFansConsumReturnBatch(List<FansConsumReturn> fansConsumReturnList) {
+         fansConsumReturnMapper.saveFansConsumReturnBatch(fansConsumReturnList);
+    }
+
+	@Override
+	public FansInfoCountVO sumFansConsumReturnInfo(String merchantCode) {
+		return fansConsumReturnMapper.sumFansConsumReturnInfo(merchantCode);
+	}
+
+	@Override
+	public Double sumFansAllowCashMoney(Map map) {
+		return fansConsumReturnMapper.sumFansAllowCashMoney(map)==null?0d:fansConsumReturnMapper.sumFansAllowCashMoney(map);
+	}
+
+	@Override
+	public Double sumNowDayShareMoney(Map map) {
+		return fansConsumReturnMapper.sumNowDayShareMoney(map)==null ?0d:fansConsumReturnMapper.sumNowDayShareMoney(map);
+	}
+
+	@Override
+	public Double sumAllShareMoney(Map map) {
+		return fansConsumReturnMapper.sumAllShareMoney(map)==null ?0d:fansConsumReturnMapper.sumAllShareMoney(map);
+	}
+
+	@Override
+	public Double sumFansNotAllowCashMoney(Map map) {
+		return fansConsumReturnMapper.sumFansNotAllowCashMoney(map)==null ?0d:fansConsumReturnMapper.sumFansNotAllowCashMoney(map);
+	}
+
+	@Override
+	public Double sumShareMoney() {
+		return fansConsumReturnMapper.sumShareMoney();
+	}
+	
+	@Override
+	public Double sumNowReturnMoney() {
+		return fansConsumReturnMapper.sumNowReturnMoney();
+	}
+
+	@Override
+	public Double sumReturnMoneyByTime(Map map) {
+		return fansConsumReturnMapper.sumReturnMoneyByTime(map)==null ? 0d : fansConsumReturnMapper.sumReturnMoneyByTime(map);
+	}
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/guideLabel/GuideLabelService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/guideLabel/GuideLabelService.java
new file mode 100644
index 0000000..20b60e3
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/guideLabel/GuideLabelService.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.guideLabel;
+
+import cn.pluss.platform.entity.GuideLabel;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-10-23
+ */
+public interface GuideLabelService extends IService<GuideLabel> {
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/guideLabel/impl/GuideLabelServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/guideLabel/impl/GuideLabelServiceImpl.java
new file mode 100644
index 0000000..bbdbc86
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/guideLabel/impl/GuideLabelServiceImpl.java
@@ -0,0 +1,20 @@
+package cn.pluss.platform.guideLabel.impl;
+
+import cn.pluss.platform.entity.GuideLabel;
+import cn.pluss.platform.guideLabel.GuideLabelService;
+import cn.pluss.platform.mapper.GuideLabelMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-10-23
+ */
+@Service
+public class GuideLabelServiceImpl extends ServiceImpl<GuideLabelMapper, GuideLabel> implements GuideLabelService {
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/helpVideo/HelpVideoService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/helpVideo/HelpVideoService.java
new file mode 100644
index 0000000..3d6306c
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/helpVideo/HelpVideoService.java
@@ -0,0 +1,26 @@
+package cn.pluss.platform.helpVideo;
+
+import java.util.List;
+import java.util.Map;
+import cn.pluss.platform.entity.HelpVideo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+public interface HelpVideoService extends IService<HelpVideo> {
+
+    public HelpVideo queryHelpVideo(HelpVideo helpVideo);
+
+    public List<HelpVideo> queryHelpVideoList(HelpVideo helpVideo);
+
+    public void saveHelpVideo(HelpVideo helpVideo);
+
+    public void updateHelpVideo(HelpVideo helpVideo);
+
+    public void deleteHelpVideo(HelpVideo helpVideo);
+
+    public List<HelpVideo> queryHelpVideoPage(Map map);
+
+    public Integer queryHelpVideoPageCount(Map map);
+
+    public void saveHelpVideoBatch(List<HelpVideo> helpVideoList);
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/helpVideo/impl/HelpVideoServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/helpVideo/impl/HelpVideoServiceImpl.java
new file mode 100644
index 0000000..2b9bfb3
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/helpVideo/impl/HelpVideoServiceImpl.java
@@ -0,0 +1,63 @@
+package cn.pluss.platform.helpVideo.impl;
+
+import java.util.List;
+import java.util.Map;
+
+import cn.pluss.platform.appVersionInfo.AppVersionInfoService;
+import cn.pluss.platform.entity.AppVersionInfo;
+import cn.pluss.platform.mapper.AppVersionInfoMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import cn.pluss.platform.entity.HelpVideo;
+import cn.pluss.platform.helpVideo.HelpVideoService;
+import cn.pluss.platform.mapper.HelpVideoMapper;
+
+@Transactional
+@Service("helpVideoService")
+public class HelpVideoServiceImpl  extends ServiceImpl<HelpVideoMapper, HelpVideo> implements HelpVideoService {
+
+    private static final Logger logger = LoggerFactory.getLogger( HelpVideoServiceImpl.class);
+
+
+    @Autowired
+    private HelpVideoMapper helpVideoMapper;
+
+    @Override
+    public HelpVideo queryHelpVideo(HelpVideo helpVideo){
+        return helpVideoMapper.queryHelpVideo(helpVideo);
+    }
+
+    @Override
+    public List<HelpVideo> queryHelpVideoList(HelpVideo helpVideo){
+        return helpVideoMapper.queryHelpVideoList(helpVideo);
+    }
+    @Override
+    public void saveHelpVideo(HelpVideo helpVideo){
+        helpVideoMapper.saveHelpVideo(helpVideo);
+    }
+    @Override
+    public void updateHelpVideo(HelpVideo helpVideo){
+        helpVideoMapper.updateHelpVideo(helpVideo);
+    }
+    @Override
+    public void deleteHelpVideo(HelpVideo helpVideo){
+        helpVideoMapper.deleteHelpVideo(helpVideo);
+    }
+    @Override
+    public List<HelpVideo> queryHelpVideoPage(Map map){
+        return helpVideoMapper.queryHelpVideoPage(map);
+    }
+    @Override
+    public Integer queryHelpVideoPageCount(Map map){
+        return helpVideoMapper.queryHelpVideoPageCount(map);
+    }
+    @Override
+    public void saveHelpVideoBatch(List<HelpVideo> helpVideoList) {
+        helpVideoMapper.saveHelpVideoBatch(helpVideoList);
+    }
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/home/HomeService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/home/HomeService.java
new file mode 100644
index 0000000..070a22e
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/home/HomeService.java
@@ -0,0 +1,54 @@
+package cn.pluss.platform.home;
+
+import cn.pluss.platform.entity.Fans;
+import cn.pluss.platform.entity.MerchantOrder;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+public interface HomeService {
+
+    //商户数量
+    Integer queryMerchantBaseInfoPageCount(Map map);
+    //商户的粉丝总数量
+    Integer queryMerchantFansCount(Map map);
+    //商户的粉丝今日数量
+    Integer queryTodayFanCount(Map<String, Object> fansMap);
+    //交易总额
+    Double getOrderFeeSum1(Map<String, Object> orderMap);
+    //总交易笔数
+    Integer queryMerchantOrderPageCount(Map map);
+    //会员总数量
+    Integer manageQueryMerchantMenberPageCount(Map map);
+    //会员总余额
+    Double manageMerchantMenberSum(Map<String, Object> newMemberMap);
+    //粉丝分润总额
+    List<Fans> queryFansList(Fans fans);
+    //日交易额，今日/昨日
+    Double getToDayTransSum1(Map<String, Object> orderMap);
+    //日支付宝交易额，今日/昨日
+    Double toDayTransZfbSum(Map<String, Object> orderMap);
+    //日微信交易额，今日/昨日
+    Double toDayTransWxSum(Map<String, Object> orderMap);
+    //云闪付交易额，今日/昨日
+    Double toDayTransYsfSum(Map<String, Object> orderMap);
+    //日支付宝交易笔数，今日/昨日
+    Integer toDayTransZfbCount(Map<String, Object> orderMap);
+    //日微信交易笔数，今日/昨日
+    Integer toDayTransWxCount(Map<String, Object> orderMap);
+    //日云闪付交易笔数，今日/昨日
+    Integer toDayTransYsfCount(Map<String, Object> orderMap);
+    //日退款金额，今日/昨日
+    List<MerchantOrder> queryMerchantOrderPage(Map map);
+    //粉丝奖励总数
+    public Double queryFansTodayCount(Fans fans);
+    //新增会员数
+    Integer queryMerchantMenberPageCount(Map map);
+    //推广分润总额
+    Double queryMerchantProfitSumPrice(Map<String, Object> merchantCodeMap);
+    //推广员数量
+    Integer queryUserAppPageCount(Map<String, Object> appMap);
+    //推广商户数量
+    Integer queryMerchantCount(Map<String, Object> merchantMap);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/home/impl/HomeServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/home/impl/HomeServiceImpl.java
new file mode 100644
index 0000000..b536c6c
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/home/impl/HomeServiceImpl.java
@@ -0,0 +1,103 @@
+package cn.pluss.platform.home.impl;
+
+import cn.pluss.platform.entity.Fans;
+import cn.pluss.platform.entity.MerchantOrder;
+import cn.pluss.platform.home.HomeService;
+import cn.pluss.platform.mapper.HomeMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class HomeServiceImpl implements HomeService {
+
+    @Autowired
+    private HomeMapper homeMapper;
+    @Override
+    public Integer queryMerchantBaseInfoPageCount(Map map){
+        return homeMapper.queryMerchantBaseInfoPageCount(map);
+    }
+    @Override
+    public Integer queryMerchantFansCount(Map map) {
+        return homeMapper.queryMerchantFansCount(map);
+    }
+    @Override
+    public Integer queryTodayFanCount(Map<String, Object> fansMap) {
+        // TODO Auto-generated method stub
+        return homeMapper.queryTodayFanCount(fansMap);
+    }
+    @Override
+    public Double getOrderFeeSum1(Map<String, Object> orderMap) {
+        return homeMapper.getOrderFeeSum1(orderMap);
+    }
+    @Override
+    public Integer queryMerchantOrderPageCount(Map map) {
+        return homeMapper.queryMerchantOrderPageCount(map);
+    }
+    @Override
+    public Integer manageQueryMerchantMenberPageCount(Map map) {
+        return homeMapper.manageQueryMerchantMenberPageCount(map);
+    }
+    @Override
+    public Double manageMerchantMenberSum(Map<String, Object> newMemberMap) {
+        return homeMapper.manageMerchantMenberSum(newMemberMap);
+    }
+    @Override
+    public List<Fans> queryFansList(Fans fans) {
+        return homeMapper.queryFansList(fans);
+    }
+    @Override
+    public Double getToDayTransSum1(Map<String, Object> orderMap) {
+        return homeMapper.getToDayTransSum1(orderMap);
+    }
+    @Override
+    public Double toDayTransZfbSum(Map<String, Object> orderMap) {
+        return homeMapper.toDayTransZfbSum(orderMap);
+    }
+    @Override
+    public Double toDayTransWxSum(Map<String, Object> orderMap) {
+        return homeMapper.toDayTransWxSum(orderMap);
+    }
+    @Override
+    public Double toDayTransYsfSum(Map<String, Object> orderMap) {
+        return homeMapper.toDayTransYsfSum(orderMap);
+    }
+    @Override
+    public Integer toDayTransZfbCount(Map<String, Object> orderMap) {
+        return homeMapper.toDayTransZfbCount(orderMap);
+    }
+    @Override
+    public Integer toDayTransWxCount(Map<String, Object> orderMap) {
+        return homeMapper.toDayTransWxCount(orderMap);
+    }
+    @Override
+    public Integer toDayTransYsfCount(Map<String, Object> orderMap) {
+        return homeMapper.toDayTransYsfCount(orderMap);
+    }
+    @Override
+    public List<MerchantOrder> queryMerchantOrderPage(Map map) {
+        return homeMapper.queryMerchantOrderPage(map);
+    }
+    @Override
+    public Double queryFansTodayCount(Fans fans) {
+        return homeMapper.queryFansTodayCount(fans);
+    }
+    @Override
+    public Integer queryMerchantMenberPageCount(Map map) {
+        return homeMapper.queryMerchantMenberPageCount(map);
+    }
+    @Override
+    public Double queryMerchantProfitSumPrice(Map<String, Object> merchantCodeMap) {
+        return homeMapper.queryMerchantProfitSumPrice(merchantCodeMap);
+    }
+    @Override
+    public Integer queryUserAppPageCount(Map<String, Object> appMap) {
+        return homeMapper.queryUserAppPageCount(appMap);
+    }
+    @Override
+    public Integer queryMerchantCount(Map<String, Object> merchantMap) {
+        return homeMapper.queryMerchantCount(merchantMap);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/impl/AppMenuServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/impl/AppMenuServiceImpl.java
new file mode 100644
index 0000000..2da96bb
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/impl/AppMenuServiceImpl.java
@@ -0,0 +1,160 @@
+package cn.pluss.platform.impl;
+
+import cn.pluss.platform.AppMenuService;
+import cn.pluss.platform.dict.DictService;
+import cn.pluss.platform.entity.AppMenu;
+import cn.pluss.platform.entity.Dict;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.AppMenuMapper;
+import cn.pluss.platform.mapper.AppMenuUserTypeMapper;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.util.HttpUtils;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.*;
+
+/**
+ * <p>
+ * app页面菜单 服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-09-27
+ */
+@Service
+@RequiredArgsConstructor
+public class AppMenuServiceImpl extends ServiceImpl<AppMenuMapper, AppMenu> implements AppMenuService {
+
+    private final DictService dictService;
+
+    private final AppMenuUserTypeMapper appMenuUserTypeMapper;
+
+    private final UserAppService userAppService;
+
+    @Override
+    public AppMenu getOne(Wrapper<AppMenu> queryWrapper) {
+        final AppMenu one = super.getOne(queryWrapper);
+        AppMenu.wrapper(one);
+        return one;
+    }
+
+    @Override
+    public List<Map<String, Object>> getHomeMenu(HttpServletRequest request) {
+        // 1、安卓; 2、iOS
+        int clientType = HttpUtils.isIOS(request)? 2: 1;
+
+        final String demoFlag = request.getHeader("demo");
+
+        List<Map<String, Object>> result = new ArrayList<>();
+        UserApp userApp = userAppService.queryUserAppByToken();
+        String userType = userApp.getUserType();
+        Dict dict = new Dict().setName("首页");
+        List<Dict> list = dictService.list(new QueryWrapper<>(dict));
+        dict = list.get(0);
+        List<AppMenu> appMenuList;
+        if ("1".equals(demoFlag)) {
+            appMenuList = baseMapper.getByNavCodeAll(dict.getId(),userType);
+        } else {
+            appMenuList = baseMapper.getByNavCode(dict.getId(),userType, clientType);
+        }
+
+        Map<String, Object> map = null;
+        for (AppMenu appMenu : appMenuList) {
+            AppMenu.wrapper(appMenu);
+            menuPathConvert(appMenu, request);
+            if (map == null || !map.get("type").equals(appMenu.getMenuGroupDesc())) {
+                map = new HashMap<>();
+                map.put("type", appMenu.getMenuGroupDesc());
+                map.put("data", new ArrayList<AppMenu>());
+                result.add(map);
+            }
+            ArrayList<AppMenu> data = (ArrayList<AppMenu>) map.get("data");
+            data.add(appMenu);
+        }
+
+        return result;
+    }
+
+    @Override
+    public List<Map<String, Object>> getSpreadPageMenu(HttpServletRequest request) {
+        // 1、安卓; 2、iOS
+        int clientType = HttpUtils.isIOS(request)? 2: 1;
+
+        List<Map<String, Object>> result = new ArrayList<>();
+        UserApp userApp = userAppService.queryUserAppByToken();
+        Dict dict = new Dict().setName("推广");
+        List<Dict> list = dictService.list(new QueryWrapper<>(dict));
+        dict = list.get(0);
+        String userType = userApp.getUserType();
+        List<AppMenu> appMenuList = baseMapper.getByNavCode(dict.getId(),userType, clientType);
+
+        Map<String, Object> map = null;
+        for (AppMenu appMenu : appMenuList) {
+            AppMenu.wrapper(appMenu);
+            menuPathConvert(appMenu, request);
+            if ("agent".equals(userApp.getUserType()) && "升级".equals(appMenu.getName())) {
+                appMenu.setName("费率");
+            }
+
+            // TODO 只有服务商才会有的菜单，后期写活
+            if ("promoter".equals(userApp.getUserType()) && "业务员".equals(appMenu.getName())) {
+                continue;
+            }
+
+            // TODO 只有服务商才会有的菜单，后期写活
+            if ("promoter".equals(userApp.getUserType()) && "代理商".equals(appMenu.getName())) {
+                continue;
+            }
+
+            if (map == null || !map.get("type").equals(appMenu.getMenuGroupDesc())) {
+                map = new HashMap<>();
+                map.put("type", appMenu.getMenuGroupDesc());
+                map.put("data", new ArrayList<AppMenu>());
+                result.add(map);
+            }
+
+            if (StringUtils.equals(appMenu.getName(), "开代理") && !"ZY_BST".equals(userApp.getRoleCode())) {
+                continue;
+            }
+
+            ArrayList<AppMenu> data = (ArrayList<AppMenu>) map.get("data");
+            data.add(appMenu);
+        }
+
+        return result;
+    }
+
+    @Override
+    public boolean saveOrUpdate(AppMenu entity) {
+        entity.setUpdateTime(new Date());
+
+        AppMenu appMenu = new AppMenu().setCode(entity.getCode());
+        appMenu = baseMapper.selectOne(new QueryWrapper<>(appMenu));
+
+        if (appMenu != null && !Objects.equals(entity.getId(), appMenu.getId())) {
+            throw new MsgException("菜单code不能重复");
+        }
+
+        AppMenu.setByMenuType(entity);
+
+        return super.saveOrUpdate(entity);
+    }
+
+    private void menuPathConvert(AppMenu menu, HttpServletRequest request) {
+        if (!HttpUtils.isIOS(request)) {
+            return;
+        }
+
+        if (StringUtils.isNotBlank(menu.getPath())) {
+            menu.setPath(menu.getPath().replace("?u=${u}&p=${p}", ""));
+        }
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/impl/BankCardServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/impl/BankCardServiceImpl.java
new file mode 100644
index 0000000..9b04c5b
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/impl/BankCardServiceImpl.java
@@ -0,0 +1,202 @@
+package cn.pluss.platform.impl;
+
+import cn.pluss.platform.BankCardService;
+import cn.pluss.platform.channel.MerchantAuditService;
+import cn.pluss.platform.dto.AccountDTO;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.BankCardMapper;
+import cn.pluss.platform.mapper.BankCodeSxfMapper;
+import cn.pluss.platform.merchant.AccountService;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.merchantImage.MerchantImageService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.vo.BankCardRecordVO;
+import cn.pluss.platform.wxCityInfo.WxCityInfoService;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.Setter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+
+/**
+ * <p>
+ * 银行卡信息 服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-10-16
+ */
+@Service
+public class BankCardServiceImpl extends ServiceImpl<BankCardMapper, BankCard> implements BankCardService {
+
+    @Setter(onMethod_ = {@Lazy, @Autowired})
+    private MerchantAuditService sxfMerchantAuditService;
+    @Setter(onMethod_ = {@Lazy, @Autowired})
+    private UserAppService userAppService;
+    @Setter(onMethod_ = {@Lazy, @Autowired})
+    private WxCityInfoService wxCityInfoService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private BankCodeSxfMapper bankCodeSxfMapper;
+
+    @Autowired
+    private MerchantImageService imgService;
+
+    @Autowired @Lazy
+    private AccountService accountService;
+
+    @Autowired @Lazy
+    private MerchantChannelStatusService mcsService;
+
+    @Override
+    public List<Map<String, Object>> getAccBankCardList(String userId) {
+        List<Map<String, Object>> result = new ArrayList<>();
+        LambdaQueryWrapper<UserApp> qWrapper = new LambdaQueryWrapper<>();
+        qWrapper.eq(UserApp::getUserId, userId);
+        UserApp ua = userAppService.getOne(qWrapper);
+        AccountDTO d1 = accountService.getRealAccount(userId, Account.CHANNEL_TYPE_D1);
+        if (d1 == null) {
+            return result;
+        }
+
+        LambdaQueryWrapper<MerchantChannelStatus> mcsQueryWrapper = Wrappers.lambdaQuery();
+        mcsQueryWrapper.eq(MerchantChannelStatus::getMerchantCode, ua.getMerchantCode());
+        mcsQueryWrapper.eq(MerchantChannelStatus::getVirChannelFlag, Account.CHANNEL_TYPE_D1);
+        mcsQueryWrapper.in(MerchantChannelStatus::getStatus,
+                MerchantChannelStatus.AUDIT_STATUS_SUCCESS,
+                MerchantChannelStatus.AUDIT_STATUS_DATA_EDIT);
+        MerchantChannelStatus mcs = mcsService.getOne(mcsQueryWrapper);
+        if (mcs != null) {
+            Map<String, Object> d1Data = new HashMap<>(4);
+            d1Data.put("type", Account.CHANNEL_TYPE_D1);
+            d1Data.put("data", BankCard.desensitized(d1.getBankCard()));
+            if (MerchantChannelStatus.AUDIT_STATUS_DATA_EDIT.equals(mcs.getStatus())) {
+                BankCard edit = d1.getBak().toJavaObject(BankCard.class);
+                d1Data.put("editData", BankCard.desensitized(edit));
+            }
+
+            result.add(d1Data);
+        }
+
+        AccountDTO d0 = accountService.getRealAccount(userId, Account.CHANNEL_TYPE_D0);
+        if (d0 == null) {
+            return result;
+        }
+
+        mcsQueryWrapper.clear();
+        mcsQueryWrapper.eq(MerchantChannelStatus::getMerchantCode, ua.getMerchantCode());
+        mcsQueryWrapper.eq(MerchantChannelStatus::getVirChannelFlag, Account.CHANNEL_TYPE_D0);
+        mcsQueryWrapper.in(MerchantChannelStatus::getStatus,
+                MerchantChannelStatus.AUDIT_STATUS_SUCCESS,
+                MerchantChannelStatus.AUDIT_STATUS_DATA_EDIT);
+        mcs = mcsService.getOne(mcsQueryWrapper);
+        if (mcs != null) {
+            Map<String, Object> d0Data = new HashMap<>(4);
+            d0Data.put("type", Account.CHANNEL_TYPE_D0);
+            d0Data.put("data", BankCard.desensitized(d0.getBankCard()));
+            if (MerchantChannelStatus.AUDIT_STATUS_DATA_EDIT.equals(mcs.getStatus())) {
+                BankCard edit = d0.getBak().toJavaObject(BankCard.class);
+                d0Data.put("editData", BankCard.desensitized(edit));
+            }
+
+            result.add(d0Data);
+        }
+
+        return result;
+    }
+
+    /**
+     * 保存实名信息的时候，默认将实名信息保存为
+     *
+     * @param entity
+     * @return
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public boolean saveOrUpdate(BankCard entity) {
+        WxCityInfo wxCityInfo = new WxCityInfo();
+
+        if (entity.getBranchProvince() != null && entity.getBranchCity() != null && entity.getBranchArea() != null) {
+            wxCityInfo.setCityName("中国," + entity.getBranchProvince() + "," + entity.getBranchCity() + "," + entity.getBranchArea());
+            wxCityInfo = wxCityInfoService.queryWxCityInfo(wxCityInfo);
+
+            if (wxCityInfo != null) {
+                entity.setBankAddressNo(wxCityInfo.getCityCode());
+            }
+        }
+
+        if (entity.getAccountType().equals(BankCard.ACCOUNT_TYPE_CERT)) {
+            return saveCertBankCard(entity);
+        } else {
+            return saveAccountBankCard(entity);
+        }
+    }
+
+    @Override
+    public boolean saveCertBankCard(BankCard entity) {
+        if (!BankCard.ACCOUNT_TYPE_CERT.equals(entity.getAccountType())) {
+            return false;
+        }
+
+        UserApp ua = new UserApp().setUserId(Long.parseLong(entity.getUserId()));
+        ua = userAppService.getOne(new QueryWrapper<>(ua));
+
+        if (Objects.equals(3, ua.getStatus())) {
+            throw new MsgException("当前状态不能修改实名银行卡信息");
+        }
+
+        BankCard exist = new BankCard()
+                .setUserId(entity.getUserId())
+                .setAccountType(BankCard.ACCOUNT_TYPE_CERT);
+
+        exist = getOne(new QueryWrapper<>(exist));
+
+        if (exist != null) {
+            entity.setId(exist.getId());
+            return updateById(entity);
+        } else {
+            return save(entity);
+        }
+    }
+
+    @Override
+    public boolean saveAccountBankCard(BankCard entity) {
+        if (BankCard.ACCOUNT_TYPE_CERT.equals(entity.getAccountType())) {
+            return false;
+        }
+
+        
+
+        return false;
+    }
+
+    @Override
+    public void checkBankInfo(BankCard bankCard) {
+        BankCodeSxf bankCodeSxf = new BankCodeSxf();
+        bankCodeSxf.setCnapsCode(bankCard.getContactLine());
+        bankCodeSxf = bankCodeSxfMapper.selectOne(new QueryWrapper<>(bankCodeSxf));
+
+        String bankName = bankCard.getBankName().replace("银行", "");
+
+        if ("浦发".equals(bankName)) {
+            bankName = "浦东发展";
+        }
+
+        if (!bankCodeSxf.getBankName().contains(bankName) && !"其他".equals(bankName)) {
+            MsgException.throwException("开户行与支行信息不匹配，请检查银行卡信息");
+        }
+    }
+
+    @Override
+    public Page<BankCardRecordVO> pageBankCardRecord(Page<BankCardRecordVO> page, Long userId) {
+        return null;
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/impl/CallbackDataServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/impl/CallbackDataServiceImpl.java
new file mode 100644
index 0000000..5989878
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/impl/CallbackDataServiceImpl.java
@@ -0,0 +1,20 @@
+package cn.pluss.platform.impl;
+
+import cn.pluss.platform.CallbackDataService;
+import cn.pluss.platform.entity.CallbackData;
+import cn.pluss.platform.mapper.CallbackDataMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 表原始数据记录，用于不明确的回调数据的统计 服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-09-10
+ */
+@Service
+public class CallbackDataServiceImpl extends ServiceImpl<CallbackDataMapper, CallbackData> implements CallbackDataService {
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/impl/DeviceGoodsServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/impl/DeviceGoodsServiceImpl.java
new file mode 100644
index 0000000..7c7b154
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/impl/DeviceGoodsServiceImpl.java
@@ -0,0 +1,183 @@
+package cn.pluss.platform.impl;
+
+import cn.pluss.platform.DeviceGoodsService;
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.deviceDetail.DeviceDetailService;
+import cn.pluss.platform.dict.DictService;
+import cn.pluss.platform.entity.Device;
+import cn.pluss.platform.entity.DeviceGoods;
+import cn.pluss.platform.entity.Dict;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.DeviceGoodsMapper;
+import cn.pluss.platform.vo.DeviceDetailVO;
+import cn.pluss.platform.vo.DeviceGoodsVO;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.core.metadata.TableFieldInfo;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.Setter;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Predicate;
+
+/**
+ * <p>
+ * 设备商品展示表 服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-11-11
+ */
+@Service
+public class DeviceGoodsServiceImpl extends ServiceImpl<DeviceGoodsMapper, DeviceGoods> implements DeviceGoodsService {
+
+    @Setter(onMethod_ = {@Autowired})
+    private DeviceDetailService deviceDetailService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private DictService dictService;
+
+    @Override
+    public PageInfo<DeviceGoodsVO> goodList(Integer pageNum, Integer size, DeviceGoods condition) {
+        OrderItem orderItem = new OrderItem().setAsc(true).setColumn("sort");
+        Page<DeviceGoods> pageInfo = new Page<>();
+        pageInfo.addOrder(orderItem);
+        pageInfo.setCurrent(pageNum);
+
+        condition.setStatus(1);
+        List<DeviceGoodsVO> result = new ArrayList<>();
+
+        Page<DeviceGoods> devList = baseMapper.selectPage(pageInfo, new QueryWrapper<>(condition));
+
+        // 获取商品规格信息
+        List<String> devCodeList = new ArrayList<>();
+        for (DeviceGoods item : devList.getRecords()) {
+            devCodeList.add(item.getCode());
+        }
+
+        List<DeviceDetailVO> deviceDetailsList = deviceDetailService.listByCode(devCodeList);
+
+        for (DeviceGoods devItem : devList.getRecords()) {
+            DeviceGoodsVO deviceGoodsVO = new DeviceGoodsVO();
+            BeanUtils.copyProperties(devItem, deviceGoodsVO);
+            result.add(deviceGoodsVO);
+
+            for (DeviceDetailVO item : deviceDetailsList) {
+                if (devItem.getCode().equals(item.getCode())) {
+                    item.setStockNum(10L);
+                    deviceGoodsVO.getTypeList().add(item);
+
+                    if (deviceGoodsVO.getUnitPrice() == null) {
+                        deviceGoodsVO.setUnitPrice(item.getUnitPrice());
+                    } else {
+                        if (item.getUnitPrice().compareTo(deviceGoodsVO.getUnitPrice()) < 0) {
+                            deviceGoodsVO.setUnitPrice(item.getUnitPrice());
+                        }
+                    }
+                }
+            }
+        }
+
+        return new PageInfo<>(devList.getTotal(), devList.getPages(), devList.getCurrent(), devList.getSize(), result);
+    }
+
+    @Override
+    public PageInfo<DeviceGoodsVO> goodListSimple(Integer pageNum, Integer size, DeviceGoods condition) {
+        OrderItem orderItem = new OrderItem().setAsc(true).setColumn("sort");
+        Page<DeviceGoods> pageInfo = new Page<>();
+        pageInfo.addOrder(orderItem);
+        pageInfo.setCurrent(pageNum);
+
+        condition.setStatus(1);
+        List<DeviceGoodsVO> result = new ArrayList<>();
+
+        QueryWrapper<DeviceGoods> qWrapper = new QueryWrapper<>(condition);
+        qWrapper.select(DeviceGoods.class, i -> !"detail".equals(i.getColumn()));
+        Page<DeviceGoods> devList = baseMapper.selectPage(pageInfo, qWrapper);
+
+        // 获取商品规格信息
+        List<String> devCodeList = new ArrayList<>();
+        for (DeviceGoods item : devList.getRecords()) {
+            devCodeList.add(item.getCode());
+        }
+
+        List<DeviceDetailVO> deviceDetailsList = deviceDetailService.listByCodeSimple(devCodeList);
+
+        for (DeviceGoods devItem : devList.getRecords()) {
+            DeviceGoodsVO deviceGoodsVO = new DeviceGoodsVO();
+            BeanUtils.copyProperties(devItem, deviceGoodsVO);
+            result.add(deviceGoodsVO);
+
+            for (DeviceDetailVO item : deviceDetailsList) {
+                if (devItem.getCode().equals(item.getCode())) {
+                    item.setStockNum(10L);
+                    deviceGoodsVO.getTypeList().add(item);
+
+                    if (deviceGoodsVO.getUnitPrice() == null) {
+                        deviceGoodsVO.setUnitPrice(item.getUnitPrice());
+                    } else {
+                        if (item.getUnitPrice().compareTo(deviceGoodsVO.getUnitPrice()) < 0) {
+                            deviceGoodsVO.setUnitPrice(item.getUnitPrice());
+                        }
+                    }
+                }
+            }
+        }
+
+        return new PageInfo<>(devList.getTotal(), devList.getPages(), devList.getCurrent(), devList.getSize(), result);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean saveOrUpdate(DeviceGoods entity) {
+
+        Dict pDict = new Dict();
+        pDict.setCode("DEVICE_TYPE");
+        pDict = dictService.getOne(new QueryWrapper<>(pDict));
+
+        final String code = entity.getCode();
+        final Dict dict = new Dict();
+        dict.setPId(pDict.getId());
+        dict.setValue(entity.getCode());
+
+        final Dict exist = dictService.getOne(new QueryWrapper<>(dict));
+
+        if (exist != null && !entity.getCodeName().equals(exist.getName())) {
+            // 已经存在的商品类型，名称不同，不能添加
+            throw new MsgException("已经存在的商品编码，编码名称必须和现有名称保持一致");
+        }
+
+        if (exist == null) {
+            Dict maxSort = dictService.getMaxSortElem("DEVICE_TYPE");
+
+            dict.setName(entity.getCodeName());
+            dict.setDesc(entity.getCodeName());
+            dict.setSort(maxSort.getSort() + 1);
+            dict.setPId(maxSort.getId());
+            dictService.save(dict);
+        }
+
+        if (entity.getId() == null) {
+            DeviceGoods existData = new DeviceGoods();
+            existData.setCode(code);
+            existData = getOne(new QueryWrapper<>(existData));
+
+            // 本质上商品code是唯一编码，商品名称只是一个别名
+            if (existData != null) {
+                throw new MsgException("已存在相同类型的商品数据");
+            }
+        }
+
+        if (entity.getSort() == null) {
+            entity.setSort(-1);
+        }
+
+        return super.saveOrUpdate(entity);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/impl/IdCardCacheServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/impl/IdCardCacheServiceImpl.java
new file mode 100644
index 0000000..a9b2ed8
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/impl/IdCardCacheServiceImpl.java
@@ -0,0 +1,14 @@
+package cn.pluss.platform.impl;
+
+import cn.pluss.platform.IdCardCacheService;
+import cn.pluss.platform.entity.IdCardCache;
+import cn.pluss.platform.mapper.IdCardCacheMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author DJH
+ */
+@Service
+public class IdCardCacheServiceImpl extends ServiceImpl<IdCardCacheMapper, IdCardCache> implements IdCardCacheService {
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/impl/IdCardServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/impl/IdCardServiceImpl.java
new file mode 100644
index 0000000..b5824b6
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/impl/IdCardServiceImpl.java
@@ -0,0 +1,205 @@
+package cn.pluss.platform.impl;
+
+import cn.pluss.platform.IdCardService;
+import cn.pluss.platform.dto.AccountDTO;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.IdCardMapper;
+import cn.pluss.platform.merchant.AccountService;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.userApp.UserAppService;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Objects;
+
+/**
+ * <p>
+ * 身份证信息表, 图片信息在tb_pluss_merchant_image表中 服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-10-16
+ */
+@RequiredArgsConstructor
+@Service
+public class IdCardServiceImpl extends ServiceImpl<IdCardMapper, IdCard> implements IdCardService {
+
+    @Setter(onMethod_ = {@Lazy, @Autowired})
+    private MerchantBaseInfoService mbiService;
+
+    @Setter(onMethod_ = {@Lazy, @Autowired})
+    private UserAppService userAppService;
+
+    @Setter(onMethod_ = {@Lazy, @Autowired})
+    private AccountService accountService;
+
+    @Setter(onMethod_ = {@Lazy, @Autowired})
+    private MerchantChannelStatusService mcsService;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean saveOrUpdate(IdCard entity) {
+        if (entity.getUserId() == null) {
+            throw new MsgException("缺少用户id");
+        }
+
+        if (IdCard.TYPE_CERT.equals(entity.getUserType())) {
+            return apiSaveCertIdCard(entity);
+        }
+
+        if (IdCard.TYPE_LEGAL.equals(entity.getUserType())) {
+            return apiSaveLegalIdCard(entity);
+        }
+
+        Account account = new Account().setUserId(entity.getUserId()).setChannelType(Account.CHANNEL_TYPE_D1);
+        account = accountService.getOne(new QueryWrapper<>(account));
+        if (account != null) {
+            entity.setId(Integer.parseInt(account.getIdCardId()));
+        } else {
+            // 清理所有残留数据
+            IdCard exist = new IdCard()
+                    .setUserId(entity.getUserId())
+                    .setUserType(entity.getUserType());
+            remove(new QueryWrapper<>(exist));
+        }
+
+        return super.saveOrUpdate(entity);
+    }
+
+    @Override
+    public boolean apiSaveCertIdCard(IdCard entity) {
+        UserApp userApp = new UserApp().setUserId(Long.parseLong(entity.getUserId()));
+        userApp = userAppService.queryUserApp(userApp);
+        if (IdCard.TYPE_CERT.equals(entity.getUserType())) {
+            // 实名身份app只能提交一次
+            String certNo = entity.getCertNo();
+            IdCard exist = new IdCard().setCertNo(certNo);
+            exist.setUserId(entity.getUserId());
+            exist.setUserType(IdCard.TYPE_CERT);
+            exist = getOne(new QueryWrapper<>(exist));
+            Integer status = userApp.getStatus();
+            boolean editFlag = status == null || (status != 3 && status != 1) || exist == null;
+
+            MsgException.check(!editFlag, "修改实名身份证信息请联系客服");
+        }
+
+        return super.saveOrUpdate(entity);
+    }
+
+    @Override
+    public boolean apiSaveLegalIdCard(IdCard entity) {
+        // 法人身份证需要校验名称与营业执照上的名称是否一直
+        MerchantBaseInfo mbi = mbiService.getMerchantBaseInfoByUserId(entity.getUserId());
+        MsgException.checkUnequals(mbi.getPrincipalPerson(), entity.getCertName(), "【法人身份】与【营业执照所属人】不一致, 请核对信息后重新提交");
+
+        UserApp tokenUa = userAppService.queryUserAppByToken();
+
+        final IdCard certIdCard = getCertIdCard(entity.getUserId());
+        if (!Objects.equals(certIdCard.getCertNo(), entity.getCertNo())
+                || !Objects.equals(certIdCard.getCertName(), entity.getCertName()) ) {
+            throw new MsgException("【法人信息】应与【实名身份信息】保持一致");
+        }
+
+        LambdaQueryWrapper<MerchantChannelStatus> qMcsWrapper = Wrappers.lambdaQuery();
+        qMcsWrapper.eq(MerchantChannelStatus::getMerchantCode, tokenUa.getMerchantCode());
+        qMcsWrapper.in(MerchantChannelStatus::getStatus,
+                MerchantChannelStatus.AUDIT_STATUS_EXAMINING,
+                MerchantChannelStatus.AUDIT_STATUS_SUCCESS,
+                MerchantChannelStatus.AUDIT_STATUS_WAITING_SIGN,
+                MerchantChannelStatus.AUDIT_STATUS_SIGNED);
+        MerchantChannelStatus mcs = mcsService.getOne(qMcsWrapper.last("limit 1"));
+
+        MsgException.checkNonNull(mcs, "当前状态暂不支持修改商户信息");
+
+        IdCard exist = getLegalIdCard(entity.getUserId());
+        if (exist != null) {
+            entity.setId(exist.getId());
+        }
+
+        return super.saveOrUpdate(entity);
+    }
+
+    @Override
+    public IdCard getCertIdCard(Object userId) {
+        LambdaQueryWrapper<IdCard> qWrapper = Wrappers.lambdaQuery();
+        qWrapper.eq(IdCard::getUserType, IdCard.TYPE_CERT)
+                .eq(IdCard::getUserId, userId);
+        return baseMapper.selectOne(qWrapper);
+    }
+
+    @Override
+    public IdCard getLegalIdCard(String userId) {
+        IdCard idCard = new IdCard();
+        idCard.setUserId(userId);
+        idCard.setUserType(IdCard.TYPE_LEGAL);
+        idCard = getOne(new QueryWrapper<>(idCard));
+
+        return idCard;
+    }
+
+    @Override
+    public IdCard getReckonerIdCard(String userId, String merchantType) {
+        if ("1".equals(merchantType)) {
+            IdCard idCard = new IdCard();
+            idCard.setUserId(userId);
+            idCard.setUserType(IdCard.TYPE_ACCOUNT);
+            idCard = getOne(new QueryWrapper<>(idCard));
+
+            return idCard;
+        }
+        AccountDTO realAccount = accountService.getRealAccount(userId);
+        if (realAccount != null) {
+            return realAccount.getIdcard();
+        }
+
+        return null;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public IdCard createLegalIdCard(String userId) {
+        IdCard legalIdCard = getLegalIdCard(userId);
+        IdCard certIdCard = getCertIdCard(userId);
+        if (legalIdCard != null && certIdCard.getCertNo().equals(legalIdCard.getCertNo())) {
+            return legalIdCard;
+        }
+
+        MerchantBaseInfo merchantBaseInfo = new MerchantBaseInfo().setUserId(userId);
+        merchantBaseInfo = mbiService.queryMerchantBaseInfo(merchantBaseInfo);
+
+        if (merchantBaseInfo == null || "1".equals(merchantBaseInfo.getMerchantType())) {
+            throw new MsgException("只有个体或企业商户具备法人信息");
+        }
+
+        if (!merchantBaseInfo.getPrincipalPerson().equals(certIdCard.getCertName())) {
+            throw new MsgException("法人应与营业执照上的负责人相同");
+        }
+
+        legalIdCard = certIdCard;
+
+
+        legalIdCard.setId(null);
+        legalIdCard.setUserType(IdCard.TYPE_LEGAL);
+
+        saveOrUpdate(legalIdCard);
+
+        return legalIdCard;
+    }
+
+    @Override
+    public IdCard apiGetFaceCertInfo() {
+        final UserApp ua = userAppService.queryUserAppByToken();
+        return getCertIdCard(ua.getUserId());
+    }
+
+}
\ No newline at end of file
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/impl/MerchantAuditRecordServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/impl/MerchantAuditRecordServiceImpl.java
new file mode 100644
index 0000000..46df2e7
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/impl/MerchantAuditRecordServiceImpl.java
@@ -0,0 +1,40 @@
+package cn.pluss.platform.impl;
+
+import cn.pluss.platform.entity.MerchantAuditRecord;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.MerchantAuditRecordMapper;
+import cn.pluss.platform.MerchantAuditRecordService;
+import cn.pluss.platform.userApp.UserAppService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.Setter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-11-27
+ */
+@Service
+public class MerchantAuditRecordServiceImpl extends ServiceImpl<MerchantAuditRecordMapper, MerchantAuditRecord> implements MerchantAuditRecordService {
+
+    @Setter(onMethod_ = {@Lazy, @Autowired})
+    private UserAppService userAppService;
+
+    @Override
+    public Integer getFailCountByUserId(String userId) {
+        UserApp userApp = new UserApp().setUserId(Long.parseLong(userId));
+        userApp = userAppService.getOne(new QueryWrapper<>(userApp));
+        if (userApp == null) {
+            throw new MsgException("无效的userId");
+        }
+
+        return getFailCount(userApp.getMerchantCode());
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/impl/MerchantRateRecordServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/impl/MerchantRateRecordServiceImpl.java
new file mode 100644
index 0000000..f42aa36
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/impl/MerchantRateRecordServiceImpl.java
@@ -0,0 +1,20 @@
+package cn.pluss.platform.impl;
+
+import cn.pluss.platform.MerchantRateRecordService;
+import cn.pluss.platform.entity.MerchantRateRecord;
+import cn.pluss.platform.mapper.MerchantRateRecordMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 费率修改记录表 服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-09-02
+ */
+@Service
+public class MerchantRateRecordServiceImpl extends ServiceImpl<MerchantRateRecordMapper, MerchantRateRecord> implements MerchantRateRecordService {
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/impl/PushServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/impl/PushServiceImpl.java
new file mode 100644
index 0000000..3002718
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/impl/PushServiceImpl.java
@@ -0,0 +1,100 @@
+package cn.pluss.platform.impl;
+
+import cn.pluss.platform.PushService;
+import cn.pluss.platform.entity.MerchantStore;
+import cn.pluss.platform.entity.PushAll;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.PushAllMapper;
+import cn.pluss.platform.merchantStore.MerchantStoreService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.user.impl.GeneralPushUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.Setter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 发送推送的服务实现类
+ * @author DJH
+ */
+@Service
+public class PushServiceImpl extends ServiceImpl<PushAllMapper, PushAll> implements PushService {
+
+    public static final int MAX_BROADCAST_COUNT = 5;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantStoreService merchantStoreService;
+
+    @Setter(onMethod_ = {@Autowired,@Lazy})
+    private UserAppService userAppService;
+
+    @Autowired
+    private GeneralPushUtil generalPushUtil;
+
+    @Override
+    public void pushMsg(String userId, String type) {
+        List<String> alias = new ArrayList<>();
+        alias.add(userId);
+
+        switch (type) {
+            case MAKE_ORDER:
+                generalPushUtil.sendAllPlatByAlias(alias, "收银呗", "收银呗线上店订单来了请及时处理", "3");
+                break;
+            case URGE_ORDER:
+                generalPushUtil.sendAllPlatByAlias(alias, "收银呗", "您有一笔催单请及时处理", "3");
+                break;
+            case REQUEST_SERVICE:
+                generalPushUtil.sendAllPlatByAlias(alias, "收银呗", "您有一个新的呼叫服务请及时处理", "3");
+                break;
+            case REFUND_ORDER:
+                generalPushUtil.sendAllPlatByAlias(alias, "收银呗", "您有一笔未接单的线上店订单，客户已申请退款。", "2");
+                break;
+            default:
+        }
+    }
+
+    @Override
+    public void pushMsg(Integer storeId, String type) {
+        MerchantStore merchantStore = new MerchantStore();
+        merchantStore.setId(storeId);
+        merchantStore = merchantStoreService.queryMerchantStore(merchantStore);
+
+        if (merchantStore == null) {
+            throw new MsgException("未找到对应店铺");
+        }
+
+        UserApp userApp = new UserApp().setMerchantCode(merchantStore.getMerchantCode());
+        userApp.setUserType("promoter");
+        userApp = userAppService.queryUserApp(userApp);
+
+        pushMsg(userApp.getUserId() + "", type);
+    }
+
+    @Override
+    public void pushAll(String title, String msg) {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        String currentDate = sdf.format(new Date());
+        QueryWrapper<PushAll> qWrapper = new QueryWrapper<>();
+        qWrapper.likeRight("createTime", currentDate);
+
+        Integer count = baseMapper.selectCount(qWrapper);
+        if (count >= MAX_BROADCAST_COUNT) {
+            throw new MsgException("当天发送广播次数已经达到最大次数" + MAX_BROADCAST_COUNT + "次");
+        }
+
+        PushAll entity = new PushAll();
+        entity.setTitle(title);
+        entity.setContent(msg);
+        save(entity);
+
+        generalPushUtil.sendAllPlatAll(title, msg, "1");
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/impl/SubMerchantApplyOrderServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/impl/SubMerchantApplyOrderServiceImpl.java
new file mode 100644
index 0000000..9ab63fe
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/impl/SubMerchantApplyOrderServiceImpl.java
@@ -0,0 +1,95 @@
+package cn.pluss.platform.impl;
+
+import cn.pluss.platform.SubMerchantApplyOrderService;
+import cn.pluss.platform.entity.MerchantChannelStatus;
+import cn.pluss.platform.entity.SubMerchantApplyOrder;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.SubMerchantApplyOrderMapper;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.vo.WxCertInfoVO;
+import cn.pluss.platform.wx.WxCertService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 子渠道工单信息表 服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-08-31
+ */
+@Service
+public class SubMerchantApplyOrderServiceImpl extends ServiceImpl<SubMerchantApplyOrderMapper, SubMerchantApplyOrder> implements SubMerchantApplyOrderService {
+
+    @Autowired
+    private MerchantChannelStatusService mcsService;
+
+    @Autowired
+    private MerchantBaseInfoService mbiService;
+
+    @Autowired @Lazy
+    private WxCertService wxCertService;
+
+    @Override
+    public List<SubMerchantApplyOrder> listNoCertData() {
+        return baseMapper.selectListNoCert();
+    }
+
+    @Override
+    public Page<Map<String, Object>> pageMoreDetail(Page<Map<String, Object>> page, Map<String, String> condition) {
+        page.getOrders().clear();
+        return baseMapper.selectPageMoreDetail(page, condition);
+    }
+
+    @Override
+    public SubMerchantApplyOrder apiGetWxAuditInfo(UserApp userApp) {
+        MerchantChannelStatus validData = mcsService.getValidData(userApp.getMerchantCode());
+        MsgException.checkNull(validData, "暂未进件");
+
+
+        WxCertInfoVO wxCertInfoVO = wxCertService.wxCertInfo(userApp.getUserId() + "", validData.getVirChannelFlag());
+
+        SubMerchantApplyOrder smApyOrder = new SubMerchantApplyOrder();
+        smApyOrder.setMerchantCode(wxCertInfoVO.getMerchantCode());
+        smApyOrder.setMerchantId(wxCertInfoVO.getMerchantId());
+        smApyOrder.setSubMchType("WX");
+        smApyOrder.setChannelId(validData.getChannel());
+        smApyOrder.setRemark(wxCertInfoVO.getRemark());
+        smApyOrder.setInfoQrcode(wxCertInfoVO.getInfoQrcode());
+        smApyOrder.setResultStatus(wxCertInfoVO.getStatus());
+        smApyOrder.setStatus(wxCertInfoVO.getStatus());
+
+        return smApyOrder;
+    }
+
+    @Override
+    public void complete(UserApp userApp) {
+        final SubMerchantApplyOrder applyOrder = new SubMerchantApplyOrder();
+        applyOrder.setMerchantCode(userApp.getMerchantCode());
+        applyOrder.setStatus("1");
+        applyOrder.setSubMchType("WX");
+        final SubMerchantApplyOrder exist = getOne(new QueryWrapper<>(applyOrder));
+        if (exist == null || exist.getInfoQrcode() == null ||exist.getInfoQrcode().isEmpty()) {
+            throw new MsgException("当前还未获取到商户微信认证数据");
+        }
+
+        MerchantChannelStatus mcs = mcsService.getValidData(userApp.getMerchantCode());
+        if (!MerchantChannelStatus.AUTHORIZATION_STATUS_AUTHORIZED.equals(mcs.getAuthorizationStatus())) {
+            mcs.setAuthorizationStatus(MerchantChannelStatus.AUTHORIZATION_STATUS_AUTHORIZED);
+            mcsService.updateById(mcs);
+        }
+
+        exist.setResultStatus(SubMerchantApplyOrder.RES_STATUS_COMPLETE);
+        updateById(exist);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/impl/SxfMccInfoServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/impl/SxfMccInfoServiceImpl.java
new file mode 100644
index 0000000..35c30eb
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/impl/SxfMccInfoServiceImpl.java
@@ -0,0 +1,114 @@
+package cn.pluss.platform.impl;
+
+import cn.jiguang.common.utils.StringUtils;
+import cn.pluss.platform.SxfMccInfoService;
+import cn.pluss.platform.entity.SxfMccInfo;
+import cn.pluss.platform.mapper.SxfMccInfoMapper;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-09-22
+ */
+@Service
+public class SxfMccInfoServiceImpl extends ServiceImpl<SxfMccInfoMapper, SxfMccInfo> implements SxfMccInfoService {
+
+    @Override
+    public Page<SxfMccInfo> pageData(Page<SxfMccInfo> page, String keyWord) {
+        QueryWrapper<SxfMccInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.ne("F_mcc_type", "线上");
+        queryWrapper.and(StringUtils.isNotEmpty(keyWord), wrapper -> wrapper.like(StringUtils.isNotEmpty(keyWord), "F_grandpa_txt", keyWord)
+                .or()
+                .like(StringUtils.isNotEmpty(keyWord), "F_mcc_txt", keyWord)
+                .or()
+                .like(StringUtils.isNotEmpty(keyWord), "F_father_txt", keyWord));
+
+        return baseMapper.selectPage(page, queryWrapper);
+    }
+
+    @Override
+    public JSONArray treeData() {
+        List<SxfMccInfo> sxfMccInfos = baseMapper.selectList(new QueryWrapper<>());
+
+        JSONArray root = new JSONArray();
+        Map<String, JSONObject> nodeMap = new HashMap<>();
+
+        // 获取一级结点
+        for (SxfMccInfo item : sxfMccInfos) {
+            String key = item.getFGrandpaTxt();
+            if (nodeMap.get(key) != null) {
+                continue;
+            }
+
+            JSONObject jsonObj = new JSONObject();
+            jsonObj.put("mccName", item.getFGrandpaTxt());
+            jsonObj.put("mccFatherList", new JSONArray());
+            root.add(jsonObj);
+            nodeMap.put(key, jsonObj);
+        }
+
+        // 获取二级结点
+        for (SxfMccInfo item : sxfMccInfos) {
+            String key = item.getFGrandpaTxt() + "_" + item.getFFatherTxt();
+            if (nodeMap.get(key) != null) {
+                continue;
+            }
+
+            JSONObject jsonObj = new JSONObject();
+            jsonObj.put("mccName", item.getFFatherTxt());
+            jsonObj.put("mccList", new JSONArray());
+
+            JSONObject jsonObj2 = nodeMap.get(item.getFGrandpaTxt());
+            JSONArray jsonArray = jsonObj2.getJSONArray("mccFatherList");
+            jsonArray.add(jsonObj);
+
+            nodeMap.put(key, jsonObj);
+        }
+
+        // 获取三级结点
+        for (SxfMccInfo item : sxfMccInfos) {
+            String key = item.getFGrandpaTxt() + "_" + item.getFFatherTxt() + "_" + item.getFMccTxt();
+            if (nodeMap.get(key) != null) {
+                continue;
+            }
+
+            JSONObject jsonObj = new JSONObject();
+            jsonObj.put("mccName", item.getFMccTxt());
+            jsonObj.put("mccCode", item.getFMccCode());
+
+            JSONObject jsonObj2 = nodeMap.get(item.getFGrandpaTxt() + "_" + item.getFFatherTxt());
+            JSONArray jsonArray = jsonObj2.getJSONArray("mccList");
+            jsonArray.add(jsonObj);
+
+            nodeMap.put(key, jsonObj);
+        }
+
+
+        return root;
+    }
+
+    @Override
+    public SxfMccInfo getByMccCode(String mccCode) {
+        QueryWrapper<SxfMccInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("F_mcc_code", mccCode);
+
+        List<SxfMccInfo> sxfMccInfos = baseMapper.selectList(queryWrapper);
+
+        if (sxfMccInfos == null || sxfMccInfos.size() == 0) {
+            return null;
+        }
+
+        return sxfMccInfos.get(0);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/inviteRate/InviteRateService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/inviteRate/InviteRateService.java
new file mode 100644
index 0000000..cb4123f
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/inviteRate/InviteRateService.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.inviteRate;
+
+import cn.pluss.platform.entity.InviteRate;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 邀请商户费率阶梯表 服务类
+ * </p>
+ *
+ * @author bzg
+ * @since 2020-11-20
+ */
+public interface InviteRateService extends IService<InviteRate> {
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/inviteRate/impl/InviteRateServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/inviteRate/impl/InviteRateServiceImpl.java
new file mode 100644
index 0000000..f7f1d8f
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/inviteRate/impl/InviteRateServiceImpl.java
@@ -0,0 +1,20 @@
+package cn.pluss.platform.inviteRate.impl;
+
+import cn.pluss.platform.entity.InviteRate;
+import cn.pluss.platform.inviteRate.InviteRateService;
+import cn.pluss.platform.mapper.InviteRateMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 邀请商户费率阶梯表 服务实现类
+ * </p>
+ *
+ * @author bzg
+ * @since 2020-11-20
+ */
+@Service
+public class InviteRateServiceImpl extends ServiceImpl<InviteRateMapper, InviteRate> implements InviteRateService {
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ipLocation/IpLocationCacheService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ipLocation/IpLocationCacheService.java
new file mode 100644
index 0000000..dac7f41
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ipLocation/IpLocationCacheService.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.ipLocation;
+
+import cn.pluss.platform.entity.IpLocationCache;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-12-14
+ */
+public interface IpLocationCacheService extends IService<IpLocationCache> {
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ipLocation/IpLocationService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ipLocation/IpLocationService.java
new file mode 100644
index 0000000..a1d35ba
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ipLocation/IpLocationService.java
@@ -0,0 +1,27 @@
+package cn.pluss.platform.ipLocation;
+
+import com.aliyuncs.geoip.model.v20200101.DescribeIpv4LocationResponse;
+
+public interface IpLocationService {
+    /**
+     * 根据ip获取位置信息
+     * @param ip    ip
+     * @return example:
+     * {
+     * 	"ProvinceEn": "Hubei",
+     * 	"RequestId": "DFEE8016-852E-4877-B67C-05C3766CAD8B",
+     * 	"CityEn": "Wuhan",
+     * 	"Ip": "171.113.244.142",
+     * 	"Isp": "中国电信",
+     * 	"Latitude": "30.504259",
+     * 	"City": "武汉市",
+     * 	"County": "洪山区",
+     * 	"Longitude": "114.400718",
+     * 	"Province": "湖北省",
+     * 	"CountryEn": "China",
+     * 	"Country": "中国",
+     * 	"CountryCode": "CN"
+     * }
+     */
+    DescribeIpv4LocationResponse getLocation(String ip);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ipLocation/impl/IpLocationCacheServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ipLocation/impl/IpLocationCacheServiceImpl.java
new file mode 100644
index 0000000..e14c7b4
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ipLocation/impl/IpLocationCacheServiceImpl.java
@@ -0,0 +1,20 @@
+package cn.pluss.platform.ipLocation.impl;
+
+import cn.pluss.platform.entity.IpLocationCache;
+import cn.pluss.platform.ipLocation.IpLocationCacheService;
+import cn.pluss.platform.mapper.IpLocationCacheMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-12-14
+ */
+@Service
+public class IpLocationCacheServiceImpl extends ServiceImpl<IpLocationCacheMapper, IpLocationCache> implements IpLocationCacheService {
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ipLocation/impl/IpLocationServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ipLocation/impl/IpLocationServiceImpl.java
new file mode 100644
index 0000000..5bd9bd0
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ipLocation/impl/IpLocationServiceImpl.java
@@ -0,0 +1,103 @@
+package cn.pluss.platform.ipLocation.impl;
+
+import cn.pluss.platform.converter.Converter;
+import cn.pluss.platform.entity.IpLocationCache;
+import cn.pluss.platform.ipLocation.IpLocationCacheService;
+import cn.pluss.platform.ipLocation.IpLocationService;
+import com.aliyuncs.geoip.model.v20200101.DescribeIpv4LocationResponse;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Map;
+
+/**
+ * ip138的接口
+ */
+@Service("ipLocationService")
+@Slf4j
+public class IpLocationServiceImpl implements IpLocationService {
+
+    @Value("${ip138.url}")
+    private String IP138_URL;
+
+    @Value("${ip138.token}")
+    private String IP138_TOKEN;
+
+    @Autowired
+    private RestTemplate restTemplate;
+
+    @Autowired
+    private IpLocationCacheService ilcService;
+
+    @Override
+    public DescribeIpv4LocationResponse getLocation(String ip) {
+        // 先从缓存里面获取
+        IpLocationCache ipLocationCache = new IpLocationCache();
+        ipLocationCache.setIp(ip);
+        Calendar calendar = Calendar.getInstance();
+        calendar.add(Calendar.HOUR, -2);
+        ipLocationCache.setCreateTimeStart(calendar.getTime());
+        LambdaQueryWrapper<IpLocationCache> qWrapper = Wrappers.lambdaQuery(ipLocationCache);
+        qWrapper.orderByDesc(IpLocationCache::getCreateTime);
+        qWrapper.last("limit 1");
+        IpLocationCache one = ilcService.getOne(qWrapper);
+        if (one != null) {
+            DescribeIpv4LocationResponse response = new DescribeIpv4LocationResponse();
+            response.setIp(ip);
+            response.setCountry(one.getCountry());
+            response.setProvince(one.getProvince());
+            response.setCity(one.getCity());
+            response.setCounty(one.getCounty());
+            response.setIsp(one.getIsp());
+            return response;
+        }
+
+        Map reqResult;
+        try {
+            reqResult = restTemplate.getForObject(IP138_URL + "?ip=" + ip + "&token=" + IP138_TOKEN, Map.class);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("IP138接口异常");
+            return null;
+        }
+
+        if (reqResult == null) {
+            log.error("IP138接口数据异常");
+            DescribeIpv4LocationResponse result = new DescribeIpv4LocationResponse();
+            result.setIp(ip);
+
+            return null;
+        }
+
+        if (!"ok".equals(reqResult.get("ret"))) {
+            log.error(reqResult.get("msg").toString());
+
+            DescribeIpv4LocationResponse result = new DescribeIpv4LocationResponse();
+            result.setIp(ip);
+            return result;
+        }
+
+        ArrayList<String> data = (ArrayList<String>) reqResult.get("data");
+
+        DescribeIpv4LocationResponse response = new DescribeIpv4LocationResponse();
+        response.setIp(ip);
+        response.setCountry(data.get(0));
+        response.setProvince(data.get(1));
+        response.setCity(data.get(2));
+        response.setCounty(data.get(3));
+        response.setIsp(data.get(4));
+
+        IpLocationCache cache = new IpLocationCache();
+        Converter.INSTANCE.cp(response, cache);
+        ilcService.save(cache);
+
+        return response;
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/jfShop/JfShopHandler.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/jfShop/JfShopHandler.java
new file mode 100644
index 0000000..1ff39ec
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/jfShop/JfShopHandler.java
@@ -0,0 +1,306 @@
+package cn.pluss.platform.jfShop;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.constants.Constant;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.MerchantQrcodeMapper;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantOrder.MerchantOrderService;
+import cn.pluss.platform.merchantQrcode.MerchantQrcodeService;
+import cn.pluss.platform.other.JfShopParam;
+import cn.pluss.platform.other.JfShopSyncUser;
+import cn.pluss.platform.other.JfShopAccount;
+import cn.pluss.platform.other.JfShopValidTask;
+import cn.pluss.platform.other.enums.JfShopTaskType;
+import cn.pluss.platform.transferCash.MerchantTransferCashService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.userInfo.UserInfoService;
+import cn.pluss.platform.userIntegral.UserIntegralService;
+import cn.pluss.platform.userIntegralUse.UserIntegralUseService;
+import cn.pluss.platform.util.DateUtils;
+import cn.pluss.platform.util.StringUtil;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Component;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestTemplate;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static cn.pluss.platform.other.enums.JfShopTaskType.*;
+
+/**
+ * TODO
+ * 新版积分商城相关处理handler
+ * @author crystal
+ * @date 2022/5/13 17:02
+ */
+@Slf4j
+@Component
+public class JfShopHandler {
+
+    @Resource
+    private RestTemplate restTemplate;
+
+    @Resource
+    private UserInfoService userInfoService;
+
+    @Resource
+    private UserAppService userAppService;
+
+    @Resource
+    private UserIntegralUseService userIntegralUseService;
+
+    @Resource
+    private UserIntegralService userIntegralService;
+
+    @Resource
+    private MerchantQrcodeMapper merchantQrcodeMapper;
+
+    @Resource
+    private MerchantOrderService merchantOrderService;
+    /**
+     * 同步积分商城用户
+     * @param userApp
+     * @return
+     */
+    public String syncJfShopUser(UserApp userApp,UserInfo userInfo){
+        try {
+            if(userInfo == null){
+                userInfo = userInfoService.getById(userApp.getUserId());
+            }
+            if(userInfo == null){
+                MsgException.throwException("用户信息异常，同步失败");
+            }
+            JfShopSyncUser jfUser = new JfShopSyncUser(userInfo,userApp);
+            String reqUrl = Constant.JF_SHOP_USER_SYNC_URL;
+            HttpHeaders headers = new HttpHeaders();
+            headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
+            Map<String, Object> params = JSON.parseObject(JSON.toJSONString(jfUser),Map.class);
+            MultiValueMap<String, String> map = new LinkedMultiValueMap();
+            for (Map.Entry m:params.entrySet()) {
+                map.add(m.getKey().toString(),m.getValue().toString());
+            }
+            HttpEntity<MultiValueMap<String, String>> request =
+                    new HttpEntity<>(map, headers);
+            String result = restTemplate.postForObject(reqUrl, request, String.class);
+            log.info("【新版积分商城】同步用户请求成功，返回信息:{}",result);
+            return result;
+        }catch (Exception e){
+            e.printStackTrace();
+            log.info("【新版积分商城】同步用户失败，异常信息:{}",e.getMessage());
+            return null;
+        }
+    }
+
+    /**
+     * 积分商城接口
+     * @param param
+     * @return
+     */
+    public Result<JfShopAccount> getAccount(JfShopParam param) {
+        log.info("【新版积分商城】获取账户积分详情请求,请求参数:{}", JSON.toJSONString(param));
+        param.check();
+        String userId = param.getUserId();
+        BigDecimal totalIntegral = userIntegralService.getCountIntegral(Long.valueOf(userId));
+        BigDecimal useInteral = userIntegralUseService.getUseIntegral(Long.valueOf(userId));
+        BigDecimal useAmt = totalIntegral.add(useInteral);
+        JfShopAccount resp = new JfShopAccount(totalIntegral,useInteral,useAmt);
+        return ResultGenerator.genSuccessResult("获取成功",resp);
+    }
+
+    /**
+     * 接口分页查询
+     * @param param
+     * @return
+     */
+    public Object page(JfShopParam param) {
+        param.check();
+        Page page = new Page();
+        page.setCurrent(param.getCurrent());
+        page.setSize(param.getSize());
+        if(JfShopParam.LIST_TYPE_ADD.equals(param.getListType())){
+            UserIntegral query = new UserIntegral();
+            query.setUserId(Long.valueOf(param.getUserId()));
+            query.setType(param.getType());
+            query.setOrderNumber(param.getOrderNumber());
+            page = userIntegralService.pageInfo(page,query);
+        }else{
+            UserIntegralUse query = new UserIntegralUse();
+            query.setUserId(Long.valueOf(param.getUserId()));
+            page = userIntegralUseService.pageInfo(page,query);
+        }
+        return ResultGenerator.genSuccessResult("获取成功",page);
+    }
+
+    /**
+     * 增加积分接口
+     * @param param
+     * @return
+     */
+//    public Result<Object> addIntegral(JfShopParam param) {
+//        param.check(JfShopParam.OPTION_ADD);
+//        UserInfo info = userInfoService.getById(param.getUserId());
+//        MsgException.checkNull(info,"用户信息不存在或用户ID有误！");
+//        UserIntegral integral = new UserIntegral(Long.valueOf(param.getUserId()),param.getIntegral(),param.getType(),param.getType(),param.getRemark());
+//        userIntegralService.save(integral);
+//        return ResultGenerator.genSuccessResult("操作成功",null);
+//    }
+
+    /**
+     * 积分操作接口
+     * @param param
+     * @return
+     */
+    public Result<Object> operate(JfShopParam param) {
+        UserIntegral integral = null;
+        UserIntegralUse userIntegralUse = null;
+        switch (param.getListType()){
+            case JfShopParam.LIST_TYPE_ADD:
+                param.check(JfShopParam.OPERATE_ADD);
+                integral = new UserIntegral(Long.valueOf(param.getUserId()),param.getIntegral(),param.getType(),param.getType(),param.getRemark());
+                break;
+            case JfShopParam.LIST_TUPE_USE:
+                param.check(JfShopParam.OPERATE_USE);
+                userIntegralUse = new UserIntegralUse(param.getName(),Long.valueOf(param.getUserId()),param.getIntegral(),param.getOrderNumber(),param.getRemark());
+                break;
+            default:
+                MsgException.throwException("未知类型");
+        }
+        UserInfo info = userInfoService.getById(param.getUserId());
+        MsgException.checkNull(info,"用户信息不存在或用户ID有误！");
+        if(integral != null){
+            userIntegralService.save(integral);
+        }
+        if(userIntegralUse != null){
+            userIntegralUseService.save(userIntegralUse);
+        }
+        return ResultGenerator.genSuccessResult("操作成功",null);
+    }
+
+    /**
+     * 获取积分商城任务完成进度
+     * @param param
+     * @return
+     */
+    public Result<Object> getTaskStatus(JfShopValidTask param) {
+        param.check();
+        UserApp userApp = checkUserInfo(param.getUserId());
+        Boolean flag = false;
+        List<Map<String, Object>> list = new ArrayList<>(10);
+        Map<String, Object> map = new HashMap<>();
+        int num = 0;
+        String dateMonth = DateUtils.toString(DateUtils.currentDate(), "yyyy-MM");
+        if(StringUtil.isNotEmpty(userApp.getMerchantCode())){
+            String sql = " WHERE merchantCode = '"+userApp.getMerchantCode()+"' AND `status` = 1 AND DATE_FORMAT( createDate, '%Y-%m' ) = '"+dateMonth+"' GROUP BY DATE_FORMAT(createDate,'%Y-%m')";
+            QueryWrapper<MerchantOrder> queryWrapper = new QueryWrapper<MerchantOrder>().last(sql);
+            num = merchantOrderService.count(queryWrapper);
+        }
+        switch (JfShopTaskType.matchStatus(param.getTaskType())){
+            case ALL:
+                getAllTask(num,userApp.getMerchantCode(),list,flag);
+                break;
+            case PAY_FRIENDS:
+                setPayFriends(userApp.getMerchantCode(),flag,map,list);
+                break;
+            case BIND_ORDER_PUSH:
+                setOrderPush(userApp.getMerchantCode(),flag,map,list);
+                break;
+            case USE_HELP_CENTER:
+                setNoGetStatus(USE_HELP_CENTER.getCode(),map,flag,list);
+                break;
+            case USE_PRODUCT_MANUAL:
+                setNoGetStatus(USE_PRODUCT_MANUAL.getCode(),map,flag,list);
+                break;
+            case MONTH_COLLECT_3:
+                setMonthCollect(num,flag,MONTH_COLLECT_3,map,list);
+                break;
+            case MONTH_COLLECT_7:
+                setMonthCollect(num,flag,MONTH_COLLECT_7,map,list);
+                break;
+            case MONTH_COLLECT_15:
+                setMonthCollect(num,flag,MONTH_COLLECT_15,map,list);
+                break;
+            default:
+                MsgException.throwException("未知任务类型");
+        }
+        return ResultGenerator.genSuccessResult("获取成功",list);
+    }
+
+    private void setMonthCollect(int num,Boolean flag,JfShopTaskType taskType,Map<String, Object> map,List<Map<String, Object>> list) {
+        if(num >= taskType.getValue()){
+            flag = true;
+        }
+        map.put(taskType.getCode(),flag);
+        map.put("num",num);
+        list.add(map);
+    }
+
+
+    private void setNoGetStatus(String code,Map<String, Object> map,Boolean flag,List<Map<String, Object>> list) {
+        map.put(code,flag);
+        list.add(map);
+    }
+
+    private void setPayFriends(String merchantCode,Boolean flag,Map<String, Object> map,List<Map<String, Object>> list) {
+        MerchantQrcode qrcode = merchantQrcodeMapper.getByMerchantCode(merchantCode);
+        if(qrcode != null){
+            flag = true;
+        }
+        map.put(PAY_FRIENDS.getCode(),flag);
+        list.add(map);
+    }
+
+    /**
+     * 获取所有权限
+     * @param num
+     * @param merchantCode
+     */
+    private void getAllTask(int num, String merchantCode,List<Map<String, Object>> list,Boolean flag) {
+        for (JfShopTaskType taskType : JfShopTaskType.values()) {
+            if(taskType.getCode().equals(ALL.getCode())){
+                continue;
+            }
+            Map<String, Object> map = new HashMap<>(2);
+            if(taskType.getCode().equals(PAY_FRIENDS.getCode())){
+                setPayFriends(merchantCode,flag,map,list);
+            }else if(taskType.getCode().equals(BIND_ORDER_PUSH.getCode())){
+                setOrderPush(merchantCode,flag,map,list);
+            }else if(taskType.getCode().equals(USE_HELP_CENTER.getCode()) || taskType.getCode().equals(USE_PRODUCT_MANUAL.getCode())){
+                setNoGetStatus(taskType.getCode(),map,flag,list);
+            }else if(
+                    taskType.getCode().equals(MONTH_COLLECT_3.getCode()) ||
+                    taskType.getCode().equals(MONTH_COLLECT_7.getCode()) ||
+                    taskType.getCode().equals(MONTH_COLLECT_15.getCode())){
+                setMonthCollect(num,flag,taskType,map,list);
+            }
+        }
+    }
+
+    private void setOrderPush(String merchantCode, Boolean flag, Map<String, Object> map, List<Map<String, Object>> list) {
+        MerchantQrcode qrcode = merchantQrcodeMapper.getByMerchantCode(merchantCode);
+        if(qrcode != null){
+            flag = true;
+        }
+        map.put(BIND_ORDER_PUSH.getCode(),flag);
+        list.add(map);
+    }
+    private UserApp checkUserInfo(String userId) {
+        UserApp userApp = userAppService.getUserAppByUserId(userId);
+        MsgException.checkNull(userApp,"用户信息异常");
+        return userApp;
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/JftAuditService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/JftAuditService.java
new file mode 100644
index 0000000..2b0d66d
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/JftAuditService.java
@@ -0,0 +1,50 @@
+package cn.pluss.platform.jft;
+
+import cn.pluss.platform.entity.JftMercBaseInfo;
+import cn.pluss.platform.entity.MerchantImage;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @author DJH
+ */
+public interface JftAuditService {
+
+    /**
+     * 获取商户基本信息
+     *
+     * @param userId 用户id
+     * @return
+     */
+    JftMercBaseInfo getMercBaseInfo(Long userId);
+
+    /**
+     * 缴费通进件图片信息
+     *
+     * @param userId 用户id
+     * @return
+     */
+    List<MerchantImage> listMerchImage(Long userId);
+
+    /**
+     * 开通功能
+     *
+     * @param userId 用户id
+     */
+    void audit(Long userId);
+
+    void apiAudit();
+
+    /**
+     * 开通功能后，变更结算卡
+     *
+     * @param userId 用户id
+     */
+    void editBankCard(Long userId);
+
+    /**
+     *
+     */
+    void changeRate(Long userId, BigDecimal rate);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/JftBankCardService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/JftBankCardService.java
new file mode 100644
index 0000000..fb3e284
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/JftBankCardService.java
@@ -0,0 +1,76 @@
+package cn.pluss.platform.jft;
+
+import cn.pluss.platform.entity.JftBankCard;
+import cn.pluss.platform.entity.JftMercPaymentChannel;
+import cn.pluss.platform.entity.JftMerchantRate;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Map;
+
+/**
+ * @author DJH
+ */
+public interface JftBankCardService extends IService<JftBankCard> {
+
+    /**
+     * 返回结算信息
+     * ｛
+     *      "idCard": {
+     *          ...
+     *      },
+     *      "bankCard": {
+     *          ...
+     *      }
+     * ｝
+     * @return
+     */
+    Map<String, Object> apiGetAccount();
+
+    /**
+     * 根据用户id获取缴费通
+     *
+     * @param userId 用户id
+     * @return
+     */
+    JftBankCard getByUserId(Long userId);
+
+    /**
+     * 保存缴费通银行卡信息
+     *
+     * @param jftBankCard 数据
+     */
+    void apiSaveBankCard(JftBankCard jftBankCard);
+
+    void saveBankCard(JftBankCard jftBankCard);
+
+    /**
+     * 修改缴费通银行卡信息, 若已经进件则需要进入修改结算卡的流程
+     *
+     * @param jftBankCard 数据
+     */
+    void apiChangeBankCard(JftBankCard jftBankCard);
+
+    /**
+     * 调整费率，此处费率与用户等级绑定
+     *
+     * @param userId
+     */
+    void changeRate(Long userId);
+
+    /**
+     * 缴费通结算卡变更成功
+     *
+     * @param entity
+     */
+    void editSuccess(JftMercPaymentChannel entity);
+
+    /**
+     * 缴费通结算卡变更失败
+     *
+     * @param entity
+     * @param failReason 失败原因
+     */
+    void editFail(JftMercPaymentChannel entity, String failReason);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/JftMercBaseInfoService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/JftMercBaseInfoService.java
new file mode 100644
index 0000000..35e1de3
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/JftMercBaseInfoService.java
@@ -0,0 +1,39 @@
+package cn.pluss.platform.jft;
+
+import cn.pluss.platform.entity.JftMercBaseInfo;
+import cn.pluss.platform.vo.MercInfoVO;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 缴费通详情表 服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-06-22
+ */
+public interface JftMercBaseInfoService extends IService<JftMercBaseInfo> {
+
+
+    MercInfoVO apiGetMercInfo();
+
+
+    /**
+     * 保存进件基本信息
+     * @param entity
+     */
+    void apiSaveMercBaseInfo(JftMercBaseInfo entity);
+
+    /**
+     * 获取进件基本信息
+     * @param userId
+     */
+    default JftMercBaseInfo getMercBaseInfo(Long userId) {
+        LambdaQueryWrapper<JftMercBaseInfo> qWrapper = Wrappers.lambdaQuery();
+        qWrapper.eq(JftMercBaseInfo::getUserId, userId);
+
+        return getBaseMapper().selectOne(qWrapper);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/JftMerchantRateRecordService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/JftMerchantRateRecordService.java
new file mode 100644
index 0000000..eeb1e75
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/JftMerchantRateRecordService.java
@@ -0,0 +1,27 @@
+package cn.pluss.platform.jft;
+
+import cn.pluss.platform.entity.JftMerchantRateRecord;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 缴费通商户费率表(新) 服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-06-21
+ */
+public interface JftMerchantRateRecordService extends IService<JftMerchantRateRecord> {
+
+    /**
+     * 费率变更成功
+     * @param entity    费率变更记录
+     */
+    void onSuccess(JftMerchantRateRecord entity);
+
+    /**
+     * 费率变更失败
+     * @param entity    费率变更记录
+     */
+    void onFail(JftMerchantRateRecord entity);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/JftMerchantRateService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/JftMerchantRateService.java
new file mode 100644
index 0000000..d653b6f
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/JftMerchantRateService.java
@@ -0,0 +1,54 @@
+package cn.pluss.platform.jft;
+
+import cn.pluss.platform.entity.JftMerchantRate;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 缴费通商户费率表(新) 服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-06-21
+ */
+public interface JftMerchantRateService extends IService<JftMerchantRate> {
+
+    /**
+     * 设置缴费通费率，此处存在两种情况，
+     * 1、缴费通开通前保存费率，
+     * <p>功能开通前保存费率，不做任何变更，进件时按照所保存的费率进件即可</p>
+     * 2、缴费通开通后修改费率
+     * <p>缴费通开通后，保存费率便需要向通道方发起费率变更</p>
+     */
+    int apiSaveRate(JftMerchantRate jftMerchantRate);
+
+    JftMerchantRate getAuditRate(Long userId);
+
+    /**
+     * 根据用户id获取费率
+     *
+     * @param merchantId 商户id
+     * @return
+     */
+    default JftMerchantRate getRate(String merchantId) {
+        LambdaQueryWrapper<JftMerchantRate> qWrapper = Wrappers.lambdaQuery();
+        qWrapper.eq(JftMerchantRate::getMerchantId, merchantId);
+        return getBaseMapper().selectOne(qWrapper);
+    }
+
+    /**
+     * 根据用户id获取费率
+     *
+     * @param userId 用户id
+     * @return
+     */
+    default JftMerchantRate getRateByUserId(Serializable userId) {
+        LambdaQueryWrapper<JftMerchantRate> qWrapper = Wrappers.lambdaQuery();
+        qWrapper.eq(JftMerchantRate::getUserId, userId);
+        return getBaseMapper().selectOne(qWrapper);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/JftPaymentInfoService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/JftPaymentInfoService.java
new file mode 100644
index 0000000..4fad046
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/JftPaymentInfoService.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.jft;
+
+import cn.pluss.platform.entity.JftPaymentInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 缴费通付款基础信息 服务类
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-06-16
+ */
+public interface JftPaymentInfoService extends IService<JftPaymentInfo> {
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/JftReceiptInfoService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/JftReceiptInfoService.java
new file mode 100644
index 0000000..fa264ff
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/JftReceiptInfoService.java
@@ -0,0 +1,75 @@
+package cn.pluss.platform.jft;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.entity.JftReceiptInfo;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.vo.JftReceiptInfoVO;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * <p>
+ * 收银呗缴费通收款单 服务类
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-06-16
+ */
+public interface JftReceiptInfoService extends IService<JftReceiptInfo> {
+    /**
+     * 创建收款单
+     * @param userApp
+     * @param info
+     */
+    String createReceipt(UserApp userApp,JftReceiptInfo info);
+
+    /**
+     * 分页查询
+     * @param page
+     * @param condition
+     * @return
+     */
+    Page<JftReceiptInfoVO> pageInfo(Page<JftReceiptInfoVO> page, JftReceiptInfo condition);
+
+    /**
+     * 关闭收款单
+     * @param info
+     * @param info
+     */
+    void closeReceipt(JftReceiptInfo info);
+
+    /**
+     * 查看缴费通详情
+     * @param info
+     * @return
+     */
+    JftReceiptInfoVO receiptDetail(JftReceiptInfo info);
+
+    /**
+     * 获取收款单对应付款信息配置项接口
+     * @param info
+     * @return
+     */
+    JftReceiptInfoVO getReceipt(JftReceiptInfo info);
+
+    /**
+     * 校验tk参数
+     * @param tk
+     * @param request
+     */
+    JftReceiptInfo wapCheckTk(String tk, HttpServletRequest request);
+
+    /**
+     * 获取支付宝支付参数信息
+     * @param request
+     * @param response
+     * @param tk
+     * @param auth_code
+     * @param userId
+     */
+    void getPayInfo(HttpServletRequest request, HttpServletResponse response, String tk, String auth_code, String userId);
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/JftReceiptOrderService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/JftReceiptOrderService.java
new file mode 100644
index 0000000..a0ebb1b
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/JftReceiptOrderService.java
@@ -0,0 +1,66 @@
+package cn.pluss.platform.jft;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.dto.jft.JftPayDataDTO;
+import cn.pluss.platform.dto.jft.JftReceiptOrderDTO;
+import cn.pluss.platform.entity.JftReceiptOrder;
+import cn.pluss.platform.vo.JftReceiptOrderVO;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * <p>
+ * 收款单订单详情 服务类
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-06-16
+ */
+public interface JftReceiptOrderService extends IService<JftReceiptOrder> {
+
+    /**
+     * 根据收款单id盒状态查询收款单详情
+     * @param id
+     * @return
+     */
+    List<JftReceiptOrder> listByReceiptId(Long id,String status);
+
+    /**
+     * 创建订单信息
+     * @param order
+     * @return
+     */
+    JSONObject createOrder(JftReceiptOrderDTO order);
+
+    /**
+     * 根据订单号查询订单信息
+     * @param ordNo
+     * @return
+     */
+    JftReceiptOrder getOrderByNo(String ordNo);
+
+    /**
+     * 处理支付成功异步回调通知业务逻辑
+     * @param receiptOrder
+     */
+    void updatePaySuccessNotify(JftReceiptOrder receiptOrder);
+
+    /**
+     *
+     * @param dto
+     * @return
+     */
+    Result<Object> tradePay(JftPayDataDTO dto,HttpServletRequest request);
+
+    /**
+     * 订单分页查询
+     * @param page
+     * @param order
+     * @return
+     */
+    Page<JftReceiptOrderVO> pageData(Page<JftReceiptOrderVO> page, JftReceiptOrderDTO order);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/JftReceiptPaymentService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/JftReceiptPaymentService.java
new file mode 100644
index 0000000..ef563bf
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/JftReceiptPaymentService.java
@@ -0,0 +1,24 @@
+package cn.pluss.platform.jft;
+
+import cn.pluss.platform.entity.JftReceiptPayment;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 收款单和付款信息关联表 服务类
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-06-16
+ */
+public interface JftReceiptPaymentService extends IService<JftReceiptPayment> {
+
+    /**
+     * 根据rId查询
+     * @param receiptid
+     * @return
+     */
+    List<Long> listByReceiptId(Long receiptid);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/JftSmallClassService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/JftSmallClassService.java
new file mode 100644
index 0000000..b2b8bf2
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/JftSmallClassService.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.jft;
+
+import cn.pluss.platform.entity.JftSmallClass;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 缴费通小课堂信息表 服务类
+ * </p>
+ *
+ * @author bzg
+ * @since 2022-07-06
+ */
+public interface JftSmallClassService extends IService<JftSmallClass> {
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/impl/JftAuditServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/impl/JftAuditServiceImpl.java
new file mode 100644
index 0000000..38d361a
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/impl/JftAuditServiceImpl.java
@@ -0,0 +1,158 @@
+package cn.pluss.platform.jft.impl;
+
+import cn.pluss.platform.IdCardService;
+import cn.pluss.platform.converter.Converter;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.jft.*;
+import cn.pluss.platform.merchant.JftMercPaymentChannelService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.yinsheng.v20210929.ReqMethod;
+import cn.pluss.platform.ys.impl.v20210929.YsServiceV2;
+import cn.pluss.platform.ysExtension.v20220615.YsAuditServiceImpl;
+import cn.pluss.platform.ysExtension.v20220615.YsConfigExtensionV2;
+import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author DJH
+ */
+@Slf4j
+@Service
+public class JftAuditServiceImpl implements JftAuditService {
+
+    @Autowired
+    private UserAppService uaService;
+
+    @Autowired
+    private IdCardService idCardService;
+
+    @Resource
+    private JftBankCardService jftBankCardService;
+
+    @Autowired
+    private JftMerchantRateRecordService jftMerchantRateRecordService;
+
+    @Autowired
+    private JftMerchantRateService jftMerchantRateService;
+
+    @Autowired
+    @Lazy
+    private YsAuditServiceImpl ysAuditServiceExtensionV2;
+
+    @Autowired @Lazy
+    private JftMercPaymentChannelService jpcService;
+
+    @Autowired
+    private JftMercBaseInfoService jbiService;
+
+    @Autowired
+    private YsServiceV2 ysServiceV2;
+
+    @Override
+    public JftMercBaseInfo getMercBaseInfo(Long userId) {
+
+        return jbiService.getMercBaseInfo(userId);
+    }
+
+    @Override
+    public List<MerchantImage> listMerchImage(Long userId) {
+        JftMercBaseInfo jbi = getMercBaseInfo(userId);
+
+        List<MerchantImage> miList = new ArrayList<>();
+        miList.add(MerchantImage.from(jbi.getFrontPic(), MerchantImage.ImageType.SHOP_FRONT_DOOR));
+        miList.add(MerchantImage.from(jbi.getCashDesk(), MerchantImage.ImageType.CASH_DESK_PHOTO));
+        miList.add(MerchantImage.from(jbi.getInterior(), MerchantImage.ImageType.STORE_INTERIOR_PHOTO));
+
+        final IdCard certIdCard = idCardService.getCertIdCard(userId);
+
+        final JftBankCard jftBankCard = jftBankCardService.getByUserId(userId);
+
+        miList.add(MerchantImage.from(certIdCard.getImgPositive(), MerchantImage.ImageType.SETTLE_IDCARD_FRONT));
+
+        miList.add(MerchantImage.from(certIdCard.getImgNegative(), MerchantImage.ImageType.SETTLE_IDCARD_BACK));
+
+        miList.add(MerchantImage.from(jftBankCard.getImgUrl(), MerchantImage.ImageType.BANK_CARD_FRONT));
+
+        return miList;
+    }
+
+    @Override
+    public void audit(Long userId) {
+        ysAuditServiceExtensionV2.merchantAudit(userId.toString(), false);
+    }
+
+    @Override
+    public void apiAudit() {
+        Calendar calendar = Calendar.getInstance();
+        int i = calendar.get(Calendar.HOUR_OF_DAY);
+
+        if (i < 8 || i > 21) {
+            throw new MsgException("当前时段暂不支持入网，请于8:00-21:00提交");
+        }
+
+        final UserApp tokenUa = uaService.queryUserAppByToken();
+        audit(tokenUa.getUserId());
+    }
+
+    @Override
+    public void editBankCard(Long userId) {
+        ysAuditServiceExtensionV2.editMerchantAudit(userId.toString());
+    }
+
+    @Override
+    public void changeRate(Long userId, BigDecimal rate) {
+        JftMercPaymentChannel jpc = jpcService.getByUserId(userId);
+
+        if (jpc == null || !jpc.getStatus().equals(MerchantChannelStatus.AUDIT_STATUS_SUCCESS)) {
+            return;
+        }
+
+        JftMerchantRate jftMerchantRate = new JftMerchantRate();
+        jftMerchantRate.setMerchantId(jpc.getMerchantId());
+        jftMerchantRate.setAliRate(rate);
+
+        // 获取新的费率并保存一条修改记录
+        final JftMerchantRateRecord rateRecord = Converter.INSTANCE.toRecord(jftMerchantRate);
+        rateRecord.setStatus("0");
+
+        jftMerchantRateRecordService.save(rateRecord);
+
+        JSONObject reqParam = new JSONObject();
+
+        JSONObject wxAliFee = new JSONObject();
+        wxAliFee.put("wechatSignRate", rateRecord.getAliRate() / 100f + "");
+        wxAliFee.put("wechatSignMin", "1");
+        wxAliFee.put("alipaySignRate", rateRecord.getAliRate() / 100f + "");
+        wxAliFee.put("alipaySignMin", "1");
+
+        reqParam.put("mercId", jpc.getMerchantId());
+//        reqParam.put("bankFee1", bankFee1);
+//        reqParam.put("bankFee2", bankFee2);
+        reqParam.put("wxAliFee", wxAliFee);
+
+        // 发起修改费率请求
+        JSONObject respData = ysServiceV2.req(YsConfigExtensionV2.MER_RATE_CHANGE, ReqMethod.MERCHANT_CHANGE_ONLINE_FEE, reqParam);
+        log.info("请求结果：{}", respData);
+        String changeFlowId = respData.getString("changeFlowId");
+        jpc.getExtra().put("changeFlowId", changeFlowId);
+
+        rateRecord.setCreateTime(new Date());
+        rateRecord.setUpdateTime(new Date());
+        rateRecord.setRemark(changeFlowId);
+        jftMerchantRateRecordService.save(rateRecord);
+
+        // 上传一张空白图作为结算信息修改申请表
+        ysAuditServiceExtensionV2.imageUploadEdit("https://www.shouyinbei.net/resources/images/upload/blank.png", "B008", changeFlowId);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/impl/JftBankCardServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/impl/JftBankCardServiceImpl.java
new file mode 100644
index 0000000..21450e4
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/impl/JftBankCardServiceImpl.java
@@ -0,0 +1,243 @@
+package cn.pluss.platform.jft.impl;
+
+import cn.hutool.core.util.DesensitizedUtil;
+import cn.jiguang.common.utils.StringUtils;
+import cn.pluss.platform.BankCardService;
+import cn.pluss.platform.IdCardService;
+import cn.pluss.platform.common.AliyunService;
+import cn.pluss.platform.converter.Converter;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.jft.JftAuditService;
+import cn.pluss.platform.jft.JftBankCardService;
+import cn.pluss.platform.jft.JftMercBaseInfoService;
+import cn.pluss.platform.jft.JftMerchantRateService;
+import cn.pluss.platform.mapper.JftBankCardMapper;
+import cn.pluss.platform.merchant.JftMercPaymentChannelService;
+import cn.pluss.platform.notice.NoticeService;
+import cn.pluss.platform.user.impl.GeneralPushUtil;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.userInfo.UserInfoService;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.formula.functions.T;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.TransactionStatus;
+import org.springframework.transaction.support.TransactionCallbackWithoutResult;
+import org.springframework.transaction.support.TransactionTemplate;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.*;
+
+/**
+ * @author DJH
+ */
+@Slf4j
+@Service
+public class JftBankCardServiceImpl extends ServiceImpl<JftBankCardMapper, JftBankCard> implements JftBankCardService {
+
+    @Autowired
+    private BankCardService bankCardService;
+
+    @Autowired
+    private JftMercPaymentChannelService jftMercPaymentChannelService;
+
+    @Autowired
+    private UserAppService uaService;
+
+    @Autowired
+    private JftAuditService jftAuditService;
+
+    @Autowired
+    private JftMercBaseInfoService jmbiSerivce;
+
+    @Autowired
+    private JftMerchantRateService jftMerchantRateService;
+
+    @Autowired
+    private TransactionTemplate transactionTemplate;
+
+    @Autowired
+    private GeneralPushUtil generalPushUtil;
+
+    @Autowired
+    private NoticeService noticeService;
+
+    @Autowired
+    private IdCardService idCardService;
+
+    @Autowired
+    private AliyunService aliyunService;
+
+    @Autowired
+    private UserInfoService uiService;
+
+    @Autowired
+    private RestTemplate restTemplate;
+
+    @Override
+    public Map<String, Object> apiGetAccount() {
+        final UserApp uaToken = uaService.queryUserAppByToken();
+
+        final IdCard idCard = idCardService.getCertIdCard(uaToken.getUserId());
+
+        final JftBankCard bankCard = getByUserId(uaToken.getUserId());
+
+        final Map<String, Object> result = new HashMap<>();
+        result.put("idCard", idCard);
+        result.put("bankCard", bankCard);
+
+        return result;
+    }
+
+    @Override
+    public JftBankCard getByUserId(Long userId) {
+        LambdaQueryWrapper<JftBankCard> qWrapper = Wrappers.lambdaQuery();
+        qWrapper.eq(JftBankCard::getUserId, userId);
+
+        JftBankCard result = getBaseMapper().selectOne(qWrapper);
+
+        // 没有存，默认取商户实名认证的银行卡信息
+        if (result == null) {
+            LambdaQueryWrapper<BankCard> qWrapper2 = Wrappers.lambdaQuery();
+            qWrapper2.eq(BankCard::getUserId, userId);
+            qWrapper2.eq(BankCard::getAccountType, BankCard.ACCOUNT_TYPE_CERT);
+            final BankCard certBankCard = bankCardService.getOne(qWrapper2);
+
+            if (certBankCard != null) {
+                result = Converter.INSTANCE.toJftData(certBankCard);
+                result.setStatus("1");
+            }
+        }
+
+        return result;
+    }
+
+    @Override
+    public void apiSaveBankCard(JftBankCard jftBankCard) {
+        final UserApp tokenUa = uaService.queryUserAppByToken();
+
+        final JftMercPaymentChannel jpc = jftMercPaymentChannelService.getByUserId(tokenUa.getUserId());
+
+        if (jpc != null && !"1".equals(jpc.getStatus())) {
+            throw new MsgException("当前状态不允许执行该操作");
+        }
+
+        jftBankCard.setUserId(tokenUa.getUserId());
+
+        final IdCard certIdCard = idCardService.getCertIdCard(tokenUa.getUserId());
+
+        aliyunService.checkBankCorrect(jftBankCard.getPhone(), jftBankCard.getBankCardNo(), certIdCard.getCertNo(), certIdCard.getCertName());
+
+        jftBankCard.setBankHolder(certIdCard.getCertName());
+        saveBankCard(jftBankCard);
+    }
+
+    @Override
+    public void saveBankCard(JftBankCard jftBankCard) {
+        LambdaQueryWrapper<JftBankCard> qWrapper = Wrappers.lambdaQuery();
+        qWrapper.eq(JftBankCard::getUserId, jftBankCard.getUserId());
+        baseMapper.delete(qWrapper);
+        baseMapper.insert(jftBankCard);
+    }
+
+    @Override
+    public void apiChangeBankCard(JftBankCard jftBankCard) {
+        final UserApp tokenUa = uaService.queryUserAppByToken();
+        jftBankCard.setUserId(tokenUa.getUserId());
+
+        final IdCard certIdCard = idCardService.getCertIdCard(tokenUa.getUserId());
+        aliyunService.checkBankCorrect(jftBankCard.getPhone(), jftBankCard.getBankCardNo(), certIdCard.getCertNo(), certIdCard.getCertName());
+
+        final JftMercPaymentChannel auditInfo = jftMercPaymentChannelService.getByUserId(tokenUa.getUserId());
+        if (auditInfo != null && auditInfo.getStatus().equals(MerchantChannelStatus.AUDIT_STATUS_SUCCESS)) {
+            LambdaQueryWrapper<JftBankCard> qWrapper = Wrappers.lambdaQuery();
+            qWrapper.eq(JftBankCard::getUserId, jftBankCard.getUserId());
+            JftBankCard exist = baseMapper.selectOne(qWrapper);
+
+
+            if (Objects.equals(jftBankCard.getBankCardNo(), exist.getBankCardNo())) {
+                throw new MsgException("结算卡未发生变更!");
+            }
+
+            exist.setBak((JSONObject) JSON.toJSON(jftBankCard));
+            exist.setStatus("2");
+            updateById(exist);
+
+            jftAuditService.editBankCard(jftBankCard.getUserId());
+
+            return;
+        }
+
+        saveBankCard(jftBankCard);
+    }
+
+    @Override
+    public void changeRate(Long userId) {
+        final JftMerchantRate auditRate = jftMerchantRateService.getAuditRate(userId);
+        final JftMerchantRate current = jftMerchantRateService.getRateByUserId(userId);
+
+        if (Objects.equals(auditRate.getAliRate(), current.getAliRate())) {
+            log.info("费率无须修改");
+            return;
+        }
+
+        jftAuditService.editBankCard(userId);
+    }
+
+    @Override
+    public void editSuccess(JftMercPaymentChannel entity) {
+        transactionTemplate.execute(new TransactionCallbackWithoutResult() {
+            @Override
+            protected void doInTransactionWithoutResult(TransactionStatus status) {
+                final JftBankCard jftBankCard = getByUserId(entity.getUserId());
+
+                JSONObject bak = jftBankCard.getBak();
+                JftBankCard newBankCard = JSONObject.toJavaObject(bak, JftBankCard.class);
+                newBankCard.setId(jftBankCard.getId());
+                updateById(newBankCard);
+
+                List<String> idList = new ArrayList<>();
+                idList.add(entity.getUserId() + "");
+
+                Notice notice = new Notice();
+                notice.setUserId(entity.getUserId() + "");
+                notice.setTitle("缴费通结算卡变更通知");
+                notice.setNoticeCode(UUID.randomUUID().toString().replace("-", ""));
+                notice.setConrtent("缴费通结算卡变更成功, 新的结算卡为" + DesensitizedUtil.bankCard(newBankCard.getBankCardNo()));
+                noticeService.saveSystemNotice(notice);
+
+                generalPushUtil.sendAllPlatByAlias(idList, "缴费通结算卡变更通知", "缴费通结算卡变更成功", "1");
+
+            }
+        });
+    }
+
+    @Override
+    public void editFail(JftMercPaymentChannel entity, String failReason) {
+        transactionTemplate.execute(new TransactionCallbackWithoutResult() {
+            @Override
+            protected void doInTransactionWithoutResult(TransactionStatus status) {
+                final JftBankCard jftBankCard = getByUserId(entity.getUserId());
+                jftBankCard.setBak(null);
+                jftBankCard.setStatus("1");
+                updateById(jftBankCard);
+
+                Notice notice = new Notice();
+                notice.setUserId(entity.getUserId() + "");
+                notice.setTitle("缴费通结算卡变更通知");
+                notice.setNoticeCode(UUID.randomUUID().toString().replace("-", ""));
+                notice.setConrtent("缴费通结算卡变更失败: " + failReason);
+                noticeService.saveSystemNotice(notice);
+
+                generalPushUtil.sendAllPlatByAlias(Collections.singletonList(entity.getUserId() + ""), "缴费通结算卡变更通知", "缴费通结算卡变更失败", "1");
+
+            }
+        });
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/impl/JftMercBaseInfoServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/impl/JftMercBaseInfoServiceImpl.java
new file mode 100644
index 0000000..91c8d19
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/impl/JftMercBaseInfoServiceImpl.java
@@ -0,0 +1,87 @@
+package cn.pluss.platform.jft.impl;
+
+import cn.pluss.platform.converter.Converter;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.jft.JftBankCardService;
+import cn.pluss.platform.jft.JftMercBaseInfoService;
+import cn.pluss.platform.jft.JftMerchantRateService;
+import cn.pluss.platform.mapper.JftMercBaseInfoMapper;
+import cn.pluss.platform.merchant.JftMercPaymentChannelService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.vo.MercInfoVO;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Objects;
+
+/**
+ * <p>
+ * 缴费通详情表 服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-06-22
+ */
+@Service
+public class JftMercBaseInfoServiceImpl extends ServiceImpl<JftMercBaseInfoMapper, JftMercBaseInfo> implements JftMercBaseInfoService {
+
+    @Autowired
+    private UserAppService uaService;
+
+    @Autowired
+    private JftMercPaymentChannelService jpcService;
+
+    @Autowired
+    private JftBankCardService jftBankCardService;
+
+    @Autowired
+    private JftMerchantRateService jbrService;
+
+    @Override
+    public MercInfoVO apiGetMercInfo() {
+        UserApp tokenUa = uaService.queryUserAppByToken();
+        Long userId = tokenUa.getUserId();
+
+        JftMercBaseInfo jftMercBaseInfo = getMercBaseInfo(userId);
+        jftMercBaseInfo = Converter.INSTANCE.toVO(jftMercBaseInfo);
+        JftBankCard jftBankCard = jftBankCardService.getByUserId(userId);
+
+        JftMerchantRate jftMerchantRate = jbrService.getRateByUserId(userId);
+        if (jftMerchantRate == null) {
+            return new MercInfoVO(jftMercBaseInfo, jftBankCard, tokenUa.getLevelCode(), "暂未进件");
+        }
+
+        return new MercInfoVO(jftMercBaseInfo, jftBankCard, tokenUa.getLevelCode(), (jftMerchantRate.getAliRate().intValue() / 100f) + "%");
+    }
+
+    @Override
+    public void apiSaveMercBaseInfo(JftMercBaseInfo entity) {
+        final UserApp tokenUa = uaService.queryUserAppByToken();
+
+        entity.setUserId(tokenUa.getUserId());
+
+        final JftMercPaymentChannel jpc = jpcService.getByUserId(tokenUa.getUserId());
+
+        if (jpc != null) {
+            boolean statusFlag = Objects.equals(jpc.getStatus(), MerchantChannelStatus.AUDIT_STATUS_SUCCESS)
+                    || Objects.equals(jpc.getStatus(), MerchantChannelStatus.AUDIT_STATUS_EXAMINING);
+
+            if (statusFlag) {
+                throw new MsgException("缴费通开通中或已开通，暂不支持该操作");
+            }
+        }
+
+        entity.setMerchantCode("M800" + System.currentTimeMillis());
+
+        LambdaQueryWrapper<JftMercBaseInfo> qWrapper = Wrappers.lambdaQuery();
+        qWrapper.eq(JftMercBaseInfo::getUserId, tokenUa.getUserId());
+        baseMapper.delete(qWrapper);
+
+        // 暂不做校验
+        save(entity);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/impl/JftMerchantRateRecordServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/impl/JftMerchantRateRecordServiceImpl.java
new file mode 100644
index 0000000..bf3963a
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/impl/JftMerchantRateRecordServiceImpl.java
@@ -0,0 +1,188 @@
+package cn.pluss.platform.jft.impl;
+
+import cn.pluss.platform.converter.Converter;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.jft.JftMercBaseInfoService;
+import cn.pluss.platform.jft.JftMerchantRateRecordService;
+import cn.pluss.platform.jft.JftMerchantRateService;
+import cn.pluss.platform.mapper.JftMerchantRateRecordMapper;
+import cn.pluss.platform.merchant.JftMercPaymentChannelService;
+import cn.pluss.platform.notice.NoticeService;
+import cn.pluss.platform.notice.template.NoticeTemplateService;
+import cn.pluss.platform.user.impl.GeneralPushUtil;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.userInfo.UserInfoService;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.TransactionStatus;
+import org.springframework.transaction.support.TransactionCallbackWithoutResult;
+import org.springframework.transaction.support.TransactionTemplate;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 缴费通商户费率表(新) 服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-06-21
+ */
+@Slf4j
+@Service
+public class JftMerchantRateRecordServiceImpl extends ServiceImpl<JftMerchantRateRecordMapper, JftMerchantRateRecord> implements JftMerchantRateRecordService {
+
+    @Autowired
+    private TransactionTemplate transactionTemplate;
+
+    @Autowired
+    private JftMerchantRateService jmrService;
+
+    @Autowired
+    private UserAppService userAppService;
+
+    @Autowired
+    private UserInfoService uiService;
+
+    @Autowired
+    private JftMercPaymentChannelService jpcService;
+
+    @Autowired
+    private JftMercBaseInfoService jbiService;
+
+    @Autowired
+    private NoticeTemplateService nTempService;
+
+    @Autowired
+    private NoticeService noticeService;
+
+    @Autowired
+    private GeneralPushUtil generalPushUtil;
+
+    @Autowired
+    private RestTemplate restTemplate;
+
+    @Override
+    public void onSuccess(JftMerchantRateRecord entity) {
+        transactionTemplate.execute(new TransactionCallbackWithoutResult() {
+            @Override
+            protected void doInTransactionWithoutResult(TransactionStatus status) {
+                LambdaQueryWrapper<JftMerchantRate> qWrapper = Wrappers.lambdaQuery();
+                qWrapper.eq(JftMerchantRate::getMerchantId, entity.getMerchantId());
+
+                JftMerchantRate rateNewExist = jmrService.getOne(qWrapper);
+
+                final JftMercPaymentChannel jpc = jpcService.getByMerchantId(entity.getMerchantId());
+
+                Converter.INSTANCE.cp(entity, rateNewExist);
+
+                entity.setStatus("1");
+                entity.setUpdateTime(new Date());
+                jmrService.saveOrUpdate(rateNewExist);
+                saveOrUpdate(entity);
+
+                UserApp ua = userAppService.getUserAppByUserId(jpc.getUserId());
+
+                UserInfo ui = uiService.getById(ua.getUserId());
+                // 获取用户id
+                List<String> aliasList = new ArrayList<>();
+                aliasList.add(ua.getUserId() + "");
+
+                // 获取上级用户id
+//                UserApp uaParent = null;
+//                if (ua.getParentId() != null) {
+//                    LambdaQueryWrapper<UserApp> qWrapper4 = Wrappers.lambdaQuery();
+//                    qWrapper4.eq(UserApp::getUserId, ua.getParentId());
+//                    uaParent = userAppService.getOne(qWrapper4);
+//                    aliasList.add(uaParent.getUserId() + "");
+//                }
+
+                // 获取通知模板
+                NoticeTemplate template = nTempService.getNoticeTemplateByType("14");
+                String templateContent;
+                if (template == null) {
+                    templateContent = "尊敬的商户“$1”，您的缴费通交易费率调整审核已通过，如有疑问请咨询您的业务员。";
+                } else {
+                    templateContent = template.getContent();
+                }
+                templateContent = templateContent.replace("$1", ua.getUserName());
+
+                List<Notice> noticeList = new ArrayList<>();
+
+                Notice notice = new Notice(1, -1, ua.getUserId() + "", ua.getUserName());
+                notice.setConrtent(templateContent);
+                notice.setDesc(templateContent);
+                notice.setTitle("缴费通费率修改通知");
+                noticeList.add(notice);
+
+//                if (uaParent != null) {
+//                    Notice notice2 = new Notice(1, -1, uaParent.getUserId() + "", uaParent.getUserName());
+//                    notice2.setConrtent(templateContent);
+//                    notice2.setDesc(templateContent);
+//                    notice2.setTitle("费率修改通知");
+//                    noticeList.add(notice2);
+//                }
+
+                noticeService.saveBatch(noticeList);
+                generalPushUtil.sendAllPlatByAlias(aliasList, "费率修改通知", templateContent, "1");
+
+            }
+        });
+    }
+
+    @Override
+    public void onFail(JftMerchantRateRecord entity) {
+        transactionTemplate.execute(new TransactionCallbackWithoutResult() {
+            @Override
+            protected void doInTransactionWithoutResult(TransactionStatus status) {
+                JftMercPaymentChannel jpc = jpcService.getByMerchantId(entity.getMerchantId());
+                UserApp ua = userAppService.getUserAppByUserId(jpc.getUserId() + "");
+
+                List<String> aliasList = new ArrayList<>();
+                aliasList.add(ua.getUserId() + "");
+
+                // 获取上级用户id
+//                UserApp uaParent = null;
+//                if (ua.getParentId() != null) {
+//                    LambdaQueryWrapper<UserApp> qWrapper4 = Wrappers.lambdaQuery();
+//                    qWrapper4.eq(UserApp::getUserId, ua.getParentId());
+//                    uaParent = userAppService.getOne(qWrapper4);
+//                    aliasList.add(uaParent.getUserId() + "");
+//                }
+
+                // 失败
+                entity.setStatus("2");
+                saveOrUpdate(entity);
+
+                List<Notice> noticeList = new ArrayList<>();
+
+                Notice notice = new Notice(1, -1, ua.getUserId() + "", ua.getUserName());
+                notice.setConrtent("缴费通费率修改失败");
+                notice.setDesc("缴费通费率修改失败");
+                notice.setTitle("缴费通费率修改通知");
+                noticeList.add(notice);
+
+//                if (uaParent != null) {
+//                    Notice notice2 = new Notice(1, -1, uaParent.getUserId() + "", uaParent.getUserName());
+//                    notice.setConrtent("费率修改失败");
+//                    notice.setDesc("费率修改失败");
+//                    notice.setTitle("费率修改通知");
+//                    noticeList.add(notice2);
+//                }
+
+                noticeService.saveBatch(noticeList);
+                generalPushUtil.sendAllPlatByAlias(aliasList, "费率修改通知", "缴费通费率修改失败", "1");
+
+            }
+        });
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/impl/JftMerchantRateServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/impl/JftMerchantRateServiceImpl.java
new file mode 100644
index 0000000..73f20f0
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/impl/JftMerchantRateServiceImpl.java
@@ -0,0 +1,94 @@
+package cn.pluss.platform.jft.impl;
+
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.jft.JftAuditService;
+import cn.pluss.platform.jft.JftMerchantRateRecordService;
+import cn.pluss.platform.jft.JftMerchantRateService;
+import cn.pluss.platform.mapper.JftMerchantRateMapper;
+import cn.pluss.platform.merchant.JftMercPaymentChannelService;
+import cn.pluss.platform.user.UserLevelService;
+import cn.pluss.platform.userApp.UserAppService;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 缴费通商户费率表(新) 服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-06-21
+ */
+@Service
+public class JftMerchantRateServiceImpl extends ServiceImpl<JftMerchantRateMapper, JftMerchantRate> implements JftMerchantRateService {
+
+    @Autowired
+    private UserAppService uaService;
+
+    @Autowired
+    private UserLevelService userLevelService;
+
+    @Autowired
+    private JftMercPaymentChannelService jpcService;
+
+    @Autowired
+    private JftAuditService jftAuditService;
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public int apiSaveRate(JftMerchantRate jftMerchantRate) {
+        UserApp tokenUa = uaService.queryUserAppByToken();
+        jftMerchantRate.setUserId(tokenUa.getUserId());
+        JftMercPaymentChannel jpc = jpcService.getByUserId(tokenUa.getUserId());
+        // TODO 此处存在一些特殊情况，比如费率修改时候，发起进件，完成进件，费率将会不一致，暂不考虑
+        if (jpc == null || MerchantChannelStatus.AUDIT_STATUS_REJECT.equals(jpc.getStatus())) {
+            // 先删除、后保存
+            LambdaQueryWrapper<JftMerchantRate> dWrapper = Wrappers.lambdaQuery();
+            dWrapper.eq(JftMerchantRate::getUserId, tokenUa.getUserId());
+            remove(dWrapper);
+
+            save(jftMerchantRate);
+
+            return 0;
+        }
+
+        if (MerchantChannelStatus.AUDIT_STATUS_SUCCESS.equals(jpc.getStatus())) {
+            jftAuditService.changeRate(tokenUa.getUserId(), jftMerchantRate.getAliRate());
+
+            return 1;
+        }
+
+        throw new MsgException("当前状态不允许设置或变更费率");
+    }
+
+    @Override
+    public JftMerchantRate getAuditRate(Long userId) {
+        final UserApp userApp = uaService.getUserAppByUserId(userId);
+
+        if ("LL".equals(userApp.getRoleCode())) {
+            //
+            JftMerchantRate jftMerchantRate = new JftMerchantRate();
+            jftMerchantRate.setAliRate(new BigDecimal("28"));
+            jftMerchantRate.setUserId(userId);
+            jftMerchantRate.setChannel(4);
+
+            return jftMerchantRate;
+        }
+
+        final UserLevel userLevel = userLevelService.getLevelInfoByRoleLevel(userApp.getRoleCode(), userApp.getLevelCode());
+
+        JftMerchantRate jftMerchantRate = new JftMerchantRate();
+        jftMerchantRate.setAliRate(userLevel.getJftRate());
+        jftMerchantRate.setUserId(userId);
+        jftMerchantRate.setChannel(4);
+
+        return jftMerchantRate;
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/impl/JftPaymentInfoServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/impl/JftPaymentInfoServiceImpl.java
new file mode 100644
index 0000000..e5d80a1
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/impl/JftPaymentInfoServiceImpl.java
@@ -0,0 +1,20 @@
+package cn.pluss.platform.jft.impl;
+
+import cn.pluss.platform.entity.JftPaymentInfo;
+import cn.pluss.platform.jft.JftPaymentInfoService;
+import cn.pluss.platform.mapper.JftPaymentInfoMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 缴费通付款基础信息 服务实现类
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-06-16
+ */
+@Service
+public class JftPaymentInfoServiceImpl extends ServiceImpl<JftPaymentInfoMapper, JftPaymentInfo> implements JftPaymentInfoService {
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/impl/JftReceiptInfoServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/impl/JftReceiptInfoServiceImpl.java
new file mode 100644
index 0000000..51fe5dd
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/impl/JftReceiptInfoServiceImpl.java
@@ -0,0 +1,289 @@
+package cn.pluss.platform.jft.impl;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultCode;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.common.RiskBlacklistService;
+import cn.pluss.platform.converter.Converter;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.ForbiddenException;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.jft.JftBankCardService;
+import cn.pluss.platform.jft.JftMercBaseInfoService;
+import cn.pluss.platform.jft.JftReceiptInfoService;
+import cn.pluss.platform.jft.JftReceiptPaymentService;
+import cn.pluss.platform.mapper.*;
+import cn.pluss.platform.merchant.JftMercPaymentChannelService;
+import cn.pluss.platform.userInfo.UserInfoService;
+import cn.pluss.platform.util.*;
+import cn.pluss.platform.vo.JftReceiptInfoVO;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alipay.api.response.AlipaySystemOauthTokenResponse;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 收银呗缴费通收款单 服务实现类
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-06-16
+ */
+@Service
+@Slf4j
+public class JftReceiptInfoServiceImpl extends ServiceImpl<JftReceiptInfoMapper, JftReceiptInfo> implements JftReceiptInfoService {
+
+    @Resource
+    private JftReceiptPaymentService jftReceiptPaymentService;
+
+    @Resource
+    private JftReceiptOrderMapper jftReceiptOrderMapper;
+
+    @Resource
+    private JftPaymentInfoMapper jftPaymentInfoMapper;
+
+    @Resource
+    private RiskBlacklistService riskBlacklistService;
+
+    @Resource
+    private JftMercBaseInfoService jftMercBaseInfoService;
+
+    @Resource
+    private JftMercPaymentChannelService jftMercPaymentChannelService;
+
+    @Resource
+    private JftBankCardService jftBankCardService;
+
+    @Autowired
+    private UserInfoService uiService;
+
+
+    /**
+     * 创建收款单
+     * @param userApp
+     * @param info
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public String createReceipt(UserApp userApp,JftReceiptInfo info) {
+        UserInfo ui = uiService.getById(userApp.getUserId());
+
+        if (!ui.getFaceCert().equals("1")) {
+            throw new ForbiddenException("当前账号存在安全问题，需要进行人脸认证");
+        }
+
+        info.checkParams(userApp);
+        try {
+            String savePath = ParametersUtil.upload_save_path;
+//            String savePath = "D:\\Pictures\\";
+            File file = QRCodeMaxUtil.createQrCode(info.getQrCodeUrl(), savePath, "jpg", 300, 300);
+            String imageUrl = OssOperatUtil.upload(file,"jpg");
+            file.delete();
+            info.setImageUrl(imageUrl);
+            save(info);
+            List<Long> paymentIds = info.getPaymentIds();
+            if(paymentIds != null && paymentIds.size() > 0){
+                List<JftReceiptPayment> list = new ArrayList<>(paymentIds.size());
+                for (Long id:paymentIds) {
+                    JftReceiptPayment receiptPayment = new JftReceiptPayment(info.getId(),id);
+                    list.add(receiptPayment);
+                }
+                jftReceiptPaymentService.saveBatch(list);
+            }
+            return imageUrl;
+        }catch (Exception e){
+            MsgException.throwException("服务器异常！");
+        }
+        return null;
+    }
+
+    /**
+     * 缴费账单分页查询
+     * @param page
+     * @param condition
+     * @return
+     */
+    @Override
+    public Page<JftReceiptInfoVO> pageInfo(Page<JftReceiptInfoVO> page, JftReceiptInfo condition) {
+        return baseMapper.pageInfo(page,condition);
+    }
+
+    /**
+     * 关闭收款单
+     * @param info
+     */
+    @Override
+    public void closeReceipt(JftReceiptInfo info) {
+        MsgException.checkNull(info.getId(),"收款单数据有误");
+        info.setStatus(JftReceiptInfo.CLOSE);
+        baseMapper.updateById(info);
+    }
+
+    /**
+     * 查看缴费通收款详情
+     * @param info
+     * @return
+     */
+    @Override
+    public JftReceiptInfoVO receiptDetail(JftReceiptInfo info) {
+        MsgException.checkNull(info.getId(),"收款单数据有误");
+        JftReceiptInfo jftInfo = baseMapper.selectById(info.getId());
+        MsgException.checkNull(jftInfo,"收款单数据异常");
+        JftReceiptInfoVO vo = Converter.INSTANCE.toVO(jftInfo);
+        List<JftReceiptOrder> list = jftReceiptOrderMapper.listByReceiptId(vo.getId(),JftReceiptOrder.PAY_STATUS_YES);
+        BigInteger num = BigInteger.ZERO;
+        BigDecimal totalAmount = BigDecimal.ZERO;
+        if(!list.isEmpty()){
+            for (JftReceiptOrder order : list) {
+                num = num.add(BigInteger.ONE);
+                totalAmount = totalAmount.add(order.getAmount());
+            }
+            vo.setPayNum(num.intValue());
+            vo.setTotalAmount(totalAmount);
+            vo.setOrderList(list);
+        }
+        return vo;
+    }
+
+    /**
+     * 获取收款单对应付款信息配置项接口
+     * @param info
+     * @return
+     */
+    @Override
+    public JftReceiptInfoVO getReceipt(JftReceiptInfo info) {
+        MsgException.checkBlank(info.getToken(),"token参数为空");
+        JftReceiptInfo entity = baseMapper.getByToken(info.getToken());
+        MsgException.checkNull(info,"token参数有误");
+        entity.checkDate();
+        JftReceiptInfoVO vo = Converter.INSTANCE.toVO(entity);
+        List<Long> pids = jftReceiptPaymentService.listByReceiptId(vo.getId());
+        if(!pids.isEmpty()){
+            List<JftPaymentInfo> list = jftPaymentInfoMapper.selectBatchIds(pids);
+            if(!list.isEmpty()){
+                List<String> codeList = new ArrayList<>(list.size());
+                for (JftPaymentInfo pl:list) {
+                    codeList.add(pl.getCode());
+                }
+                vo.setPaymentCodeList(codeList);
+            }
+        }
+        return vo;
+    }
+
+    /**
+     * 缴费通校验tk参数
+     * @param tk
+     * @param request
+     * @return
+     */
+    @Override
+    public JftReceiptInfo wapCheckTk(String tk, HttpServletRequest request) {
+        String ua = request.getHeader("user-agent").toLowerCase();
+        if (!ua.contains("alipay")) {
+            MsgException.throwException("请使用支付宝扫码！");
+        }
+        JftReceiptInfo byToken = baseMapper.getByToken(tk);
+        MsgException.checkNull(byToken, "无效tk参数");
+        String ipAddr = IpUtils.getIpAddr(request);
+        if(StringUtil.isNotEmpty(byToken.getIp()) && !ipAddr.equals(byToken.getIp())){
+            MsgException.throwException("当前付款码已被其他用户使用，请重新生成");
+        }
+        byToken.setIp(ipAddr);
+        baseMapper.updateById(byToken);
+        QueryWrapper<RiskBlacklist> queryWrapper = new QueryWrapper<RiskBlacklist>().eq("userId",byToken.getUserId());
+        List<RiskBlacklist> list = riskBlacklistService.list(queryWrapper);
+        MsgException.check(!list.isEmpty(),"黑名单用户，不允许使用该功能");
+        Date now = DateUtils.currentDate();
+        MsgException.check(JftReceiptInfo.CLOSE.equals(byToken.getStatus()), "当前收款单已关闭");
+        MsgException.check(now.before(byToken.getCreateTime()) || now.after(byToken.getEndTime()), "当前收款单已过期");
+        String urlString = ParametersUtil.domain + "/wap/jft/pay?tk="+tk;
+        String ali_appid = ParametersUtil.ZY_ALI_APP_ID;
+        String cookieValue = CookieUtils.getCookieValue(request, byToken.getUserId().toString(), true);
+        if(StringUtil.isNotEmpty(cookieValue)){
+            urlString +=  "&userId=" + cookieValue;
+        }
+        try {
+            String rurl  = java.net.URLEncoder.encode(urlString, "utf-8");
+            if(StringUtil.isEmpty(cookieValue)){
+                String jmpUrl = "https://openauth.alipay.com/oauth2/publicAppAuthorize.htm?app_id=" + ali_appid + "&scope=auth_base&redirect_uri=" + rurl;
+                return byToken.setJumpUrl(jmpUrl);
+            }else{
+                log.info("url:{}",urlString);
+                return byToken.setJumpUrl(urlString);
+            }
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+            MsgException.throwException("url转码异常");
+        }
+        return null;
+    }
+
+    /**
+     * 获取支付宝支付参数信息
+     * @param request
+     * @param tk
+     * @param auth_code
+     * @param userId
+     */
+    @Override
+    public void getPayInfo(HttpServletRequest request, HttpServletResponse response, String tk, String auth_code, String userId) {
+        request.setAttribute("token",tk);
+        JftReceiptInfo info = wapCheckTk(tk,request);
+        List<JftReceiptOrder> list = jftReceiptOrderMapper.listByReceiptId(info.getId(), JftReceiptOrder.PAY_STATUS_YES);
+        MsgException.check(!list.isEmpty(),"当前付款码已支付，请重新生成！");
+        JftMercBaseInfo baseInfo = jftMercBaseInfoService.getMercBaseInfo(info.getUserId());
+        MsgException.checkNull(baseInfo,"商户信息异常");
+        request.setAttribute("merchantName",baseInfo.getMerchantName());
+        request.setAttribute("amount",info.getAmount());
+        request.setAttribute("tk",tk);
+        JftMercPaymentChannel channel = jftMercPaymentChannelService.getByUserId(info.getUserId());
+        MsgException.checkNull(channel,"商户进件信息异常");
+        MsgException.check(!"3".equals(channel.getStatus()),"商户状态不可用，请联系客服处理");
+        JftBankCard bankCardInfo = jftBankCardService.getByUserId(baseInfo.getUserId());
+        MsgException.checkNull(bankCardInfo,"结算卡信息异常");
+        if(StringUtil.isNotEmpty(auth_code)){
+            log.info("【缴费通】支付宝授权,tk:{},授权code:{}",info.getToken(),auth_code);
+            try {
+                AlipaySystemOauthTokenResponse tokenResponse = AliUtil.getAliUserIdV2(auth_code, ParametersUtil.ZY_PRI, ParametersUtil.ZY_PUB, ParametersUtil.ZY_ALI_APP_ID);
+                userId = tokenResponse.getUserId();
+                log.info("【缴费通】支付宝授权,tk:{},授权回调结果:{}",info.getToken(), JSON.toJSONString(tokenResponse));
+                CookieUtils.setCookie(response,baseInfo.getUserId().toString(),userId,true);
+            }catch (Exception e){
+                e.printStackTrace();
+                log.info("【缴费通】支付宝授权异常,tk:{},异常信息:{}",info.getToken(), e.getMessage());
+                MsgException.throwException(e.getMessage());
+            }
+        }
+        List<Long> ids = jftReceiptPaymentService.listByReceiptId(info.getId());
+        if(ids.size() > 0){
+            List<JftPaymentInfo> paymentList = jftPaymentInfoMapper.selectBatchIds(ids);
+            request.setAttribute("paymentList", JSONArray.toJSON(paymentList));
+        }
+        request.setAttribute("pName",info.getProjectName());
+        request.setAttribute("userId",userId);
+        request.setAttribute("cpName",StringUtil.hideSecret(bankCardInfo.getBankHolder()));
+        request.setAttribute("cpPhone",StringUtil.isHideMobile(bankCardInfo.getPhone()));
+
+    }
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/impl/JftReceiptOrderServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/impl/JftReceiptOrderServiceImpl.java
new file mode 100644
index 0000000..58f129a
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/impl/JftReceiptOrderServiceImpl.java
@@ -0,0 +1,241 @@
+package cn.pluss.platform.jft.impl;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.constants.Constant;
+import cn.pluss.platform.dto.jft.JftPayDataDTO;
+import cn.pluss.platform.dto.jft.JftReceiptOrderDTO;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.jft.JftBankCardService;
+import cn.pluss.platform.jft.JftMercBaseInfoService;
+import cn.pluss.platform.jft.JftMerchantRateService;
+import cn.pluss.platform.jft.JftReceiptOrderService;
+import cn.pluss.platform.mapper.JftReceiptInfoMapper;
+import cn.pluss.platform.mapper.JftReceiptOrderMapper;
+import cn.pluss.platform.mapper.RiskBlacklistMapper;
+import cn.pluss.platform.merchant.JftMercPaymentChannelService;
+import cn.pluss.platform.merchantOrder.MerchantOrderService;
+import cn.pluss.platform.merchantProfit.MerchantProfitService;
+import cn.pluss.platform.notify.NotifyMessageService;
+import cn.pluss.platform.pay.PayService;
+import cn.pluss.platform.sys.QueueDataService;
+import cn.pluss.platform.util.ParametersUtil;
+import cn.pluss.platform.util.StringUtil;
+import cn.pluss.platform.vo.JftReceiptOrderVO;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
+import java.net.URLDecoder;
+import java.util.List;
+
+/**
+ * <p>
+ * 收款单订单详情 服务实现类
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-06-16
+ */
+@Service
+@Slf4j
+public class JftReceiptOrderServiceImpl extends ServiceImpl<JftReceiptOrderMapper, JftReceiptOrder> implements JftReceiptOrderService {
+
+    @Resource
+    private MerchantOrderService merchantOrderService;
+
+    @Resource
+    private QueueDataService queueDataService;
+
+    @Resource
+    private JftBankCardService jftBankCardService;
+
+    @Resource
+    private JftReceiptInfoMapper jriMapper;
+
+    @Resource
+    private JftMerchantRateService jftMerchantRateService;
+
+    @Resource
+    private JftMercBaseInfoService jftMercBaseInfoService;
+
+    @Resource
+    private JftMercPaymentChannelService jftMercPaymentChannelService;
+
+    @Setter(onMethod_ = {@Autowired, @Qualifier("ysPayOldService")})
+    private PayService ysPayOldService;
+
+    @Resource
+    private MerchantProfitService merchantProfitService;
+
+    @Resource
+    private RiskBlacklistMapper riskBlacklistMapper;
+
+    @Setter(onMethod_ = {@Lazy, @Autowired})
+    private NotifyMessageService notifyMessageService;
+
+    public static final String API_MERC_JFT_ORDER_PREFIX = "YS_JFT_";
+    /**
+     * 根据收款单id盒状态查询收款单详情
+     * @param id
+     * @return
+     */
+    @Override
+    public List<JftReceiptOrder> listByReceiptId(Long id,String status) {
+        return baseMapper.listByReceiptId(id,status);
+    }
+
+    /**
+     * 创建订单信息
+     * @param entity
+     * @return
+     */
+    @Override
+    public JSONObject createOrder(JftReceiptOrderDTO entity) {
+        JSONObject res = new JSONObject(16);
+        entity.checkOrderParams();
+        JftReceiptOrder order =  checkOrderMercInfo(entity);
+        baseMapper.insert(order);
+        try {
+            String payUrl = ParametersUtil.domain + "/wap/aliPay/returnUrl?orderNumber="+order.getOrderNumber();
+            String pUrl = URLDecoder.decode(payUrl, "UTF-8");
+            res.put("payUrl",Constant.ALIPAY_H5_PAY_URL_PRIFIX + pUrl);
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+            MsgException.throwException("转码异常！");
+        }
+        res.put("mercOrderNo",order.getMercOrderNo());
+        res.put("orderAmt",order.getAmount());
+        res.put("orderNumber",order.getOrderNumber());
+        return res;
+    }
+
+    private JftReceiptOrder checkOrderMercInfo(JftReceiptOrderDTO order) {
+        JftReceiptOrder orderByNo = baseMapper.getMercOrderByNo(order.getMercOrderNo());
+        MsgException.check(orderByNo != null,"订单号重复");
+        String merchantCode = order.getMerchantCode();
+        JftMercBaseInfo mercBaseInfo = jftMercBaseInfoService.getMercBaseInfo(order.getUserId());
+        MsgException.checkNull(mercBaseInfo,"商户信息异常");
+        if(StringUtil.isNotEmpty(merchantCode)){
+            MsgException.check(!merchantCode.equals(mercBaseInfo.getMerchantCode()),"商户号和用户不匹配！");
+        }
+        JftMerchantRate mercRate = jftMerchantRateService.getRateByUserId(order.getUserId());
+        MsgException.checkNull(mercRate,"商户费率异常");
+        JftMercPaymentChannel channel = jftMercPaymentChannelService.getByUserId(order.getUserId());
+        MsgException.checkNull(channel,"进件信息异常");
+        MsgException.check(!channel.isPayment(),"商户状态不可用");
+        List<RiskBlacklist> list = riskBlacklistMapper.getByUserId(order.getUserId());
+        MsgException.check(!list.isEmpty(),"黑名单用户，不允许使用该功能");
+        order.setMerchantName(mercBaseInfo.getMerchantName());
+        order.setMerchantCode(mercBaseInfo.getMerchantCode());
+        orderByNo = new JftReceiptOrder(order,mercRate,Constant.PAY_TYPE_ALIPAY,API_MERC_JFT_ORDER_PREFIX);
+        orderByNo.setJftMerc(mercBaseInfo);
+        orderByNo.setJftChannel(channel);
+        calcOrderFee(orderByNo);
+        return orderByNo;
+    }
+
+    /**
+     * 根据订单号查询订单信息
+     * @param ordNo
+     * @return
+     */
+    @Override
+    public JftReceiptOrder getOrderByNo(String ordNo) {
+        return baseMapper.getOrderByNo(ordNo);
+    }
+
+    /**
+     * 缴费通支付回调处理
+     * @param receiptOrder
+     */
+    @Override
+    public void updatePaySuccessNotify(JftReceiptOrder receiptOrder) {
+        Integer row = queueDataService.newQueueData(receiptOrder.getOrderNumber());
+        if(row > 0){
+            //订单已支付 无需处理
+            if(JftReceiptOrder.PAY_STATUS_YES.equals(receiptOrder.getStatus())){
+                return;
+            }
+            receiptOrder.setStatus(JftReceiptOrder.PAY_STATUS_YES);
+            //计算订单手续费
+            calcOrderFee(receiptOrder);
+            //修改订单状态
+            receiptOrder.setCreateDate(null);
+            updateById(receiptOrder);
+            //插入订单表数据
+            MerchantOrder order = new MerchantOrder();
+            order.convert(receiptOrder);
+            merchantProfitService.createOrderProfitV2(order,"2");
+            merchantOrderService.save(order);
+            //推送下游订单通知
+            notifyMessageService.sendLowerPayNotifyCallback(order);
+        }
+    }
+
+    @Override
+    public Result<Object> tradePay(JftPayDataDTO dto, HttpServletRequest request) {
+        dto.checkParams();
+        JftReceiptInfo info = checkMercInfo(dto);
+        JftReceiptOrder order = new JftReceiptOrder(dto,info,Constant.PAY_TYPE_ALIPAY,info.getJftMerc(),info.getJftRate());
+        JSONObject result = ysPayOldService.jftPay(order, info.getJftMerc(), info.getJftChannel());
+        order.setPayData(result.getString("payData"));
+        baseMapper.insert(order);
+        JSONObject payData = result.getJSONObject("payData");
+        payData.put("orderNumber",order.getOrderNumber());
+        return ResultGenerator.genSuccessResult("操作成功",payData);
+    }
+
+    /**
+     * 校验结算人信息
+     */
+    private JftReceiptInfo checkMercInfo(JftPayDataDTO dto) {
+        JftReceiptInfo info = jriMapper.getByToken(dto.getTk());
+        JftBankCard bankCard = jftBankCardService.getByUserId(info.getUserId());
+        boolean flag = !dto.getCName().equals(bankCard.getBankHolder()) || !dto.getCPhone().equals(bankCard.getPhone());
+        MsgException.check(flag,"收款人名称或手机号信息不匹配，请核对！");
+        JftMerchantRate jftRate = jftMerchantRateService.getRateByUserId(info.getUserId());
+        MsgException.checkNull(jftRate,"商户费率配置异常");
+        JftMercBaseInfo jfrMerc = jftMercBaseInfoService.getMercBaseInfo(info.getUserId());
+        MsgException.checkNull(jfrMerc,"商户信息异常");
+        JftMercPaymentChannel jftChannel = jftMercPaymentChannelService.getByUserId(info.getUserId());
+        MsgException.checkNull(jftChannel,"进件信息异常");
+        List<RiskBlacklist> list = riskBlacklistMapper.getByUserId(info.getUserId());
+        MsgException.check(!list.isEmpty(),"黑名单用户，不允许使用该功能");
+        info.setJftRate(jftRate);
+        info.setJftMerc(jfrMerc);
+        info.setJftChannel(jftChannel);
+        return info;
+    }
+
+    /**
+     * 计算手续费
+     * @param receiptOrder
+     */
+    private void calcOrderFee(JftReceiptOrder receiptOrder) {
+        BigDecimal channelRate = Constant.DEFAULT_JFT_COST_RATE.divide(BigDecimal.valueOf(10000));
+        BigDecimal mercRate = BigDecimal.valueOf(receiptOrder.getRate()).divide(BigDecimal.valueOf(10000));
+        BigDecimal channelFee = channelRate.multiply(receiptOrder.getAmount()).setScale(2,BigDecimal.ROUND_HALF_UP);
+        BigDecimal mercFee = mercRate.multiply(receiptOrder.getAmount()).setScale(2,BigDecimal.ROUND_HALF_UP);
+        BigDecimal profitFee = mercRate.subtract(channelRate).multiply(receiptOrder.getAmount()).setScale(2,BigDecimal.ROUND_DOWN);
+        receiptOrder.setChannelFee(channelFee);
+        receiptOrder.setMercFee(mercFee);
+        receiptOrder.setProfitFee(profitFee);
+    }
+
+    @Override
+    public Page<JftReceiptOrderVO> pageData(Page<JftReceiptOrderVO> page, JftReceiptOrderDTO order) {
+        return baseMapper.pageData(page,order);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/impl/JftReceiptPaymentServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/impl/JftReceiptPaymentServiceImpl.java
new file mode 100644
index 0000000..63325b5
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/impl/JftReceiptPaymentServiceImpl.java
@@ -0,0 +1,32 @@
+package cn.pluss.platform.jft.impl;
+
+import cn.pluss.platform.entity.JftReceiptPayment;
+import cn.pluss.platform.jft.JftReceiptPaymentService;
+import cn.pluss.platform.mapper.JftReceiptPaymentMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 收款单和付款信息关联表 服务实现类
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-06-16
+ */
+@Service
+public class JftReceiptPaymentServiceImpl extends ServiceImpl<JftReceiptPaymentMapper, JftReceiptPayment> implements JftReceiptPaymentService {
+
+    /**
+     * 根据rId查询
+     * @param receiptid
+     * @return
+     */
+    @Override
+    public List<Long> listByReceiptId(Long receiptid) {
+        return baseMapper.listByReceiptId(receiptid);
+    }
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/impl/JftSmallClassServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/impl/JftSmallClassServiceImpl.java
new file mode 100644
index 0000000..84f901b
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/jft/impl/JftSmallClassServiceImpl.java
@@ -0,0 +1,59 @@
+package cn.pluss.platform.jft.impl;
+
+import cn.pluss.platform.entity.JftSmallClass;
+import cn.pluss.platform.jft.JftSmallClassService;
+import cn.pluss.platform.mapper.JftSmallClassMapper;
+import cn.pluss.platform.util.Base64Util;
+import cn.pluss.platform.util.OssOperatUtil;
+import cn.pluss.platform.util.StringUtil;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.io.InputStream;
+import java.io.Serializable;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+
+/**
+ * <p>
+ * 缴费通小课堂信息表 服务实现类
+ * </p>
+ *
+ * @author bzg
+ * @since 2022-07-06
+ */
+@Service
+public class JftSmallClassServiceImpl extends ServiceImpl<JftSmallClassMapper, JftSmallClass> implements JftSmallClassService {
+
+    @Override
+    public boolean saveOrUpdate(JftSmallClass entity) {
+        if(StringUtil.isNotEmpty(entity.getPhotoBaseStr())){
+            String photoBaseStr = entity.getPhotoBaseStr();
+            if(photoBaseStr.contains(",")){
+                photoBaseStr = photoBaseStr.substring( photoBaseStr.indexOf( "," ) + 1 );
+            }
+            InputStream is = Base64Util.base64ToInputStream(photoBaseStr);
+            String url = OssOperatUtil.upload(is, StringUtil.genUuid(), "jpg");
+            entity.setPhoto(url);
+        }
+        if(entity.getId() != null && StringUtil.isNotEmpty(entity.getPhotoBaseStr())){
+            JftSmallClass smallClass = baseMapper.selectById(entity.getId());
+            if(smallClass != null && StringUtil.isNotEmpty(smallClass.getPhoto())){
+                OssOperatUtil.deleteUrlFile(smallClass.getPhoto());
+            }
+        }
+        return super.saveOrUpdate(entity);
+    }
+
+    @Override
+    public boolean removeById(Serializable id) {
+        JftSmallClass jftSmallClass = baseMapper.selectById(id);
+        if(jftSmallClass != null && StringUtil.isNotEmpty(jftSmallClass.getPhoto())){
+            OssOperatUtil.deleteUrlFile(jftSmallClass.getPhoto());
+        }
+        return super.removeById(id);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/jty/JtyDeviceHandler.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/jty/JtyDeviceHandler.java
new file mode 100644
index 0000000..c70e55b
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/jty/JtyDeviceHandler.java
@@ -0,0 +1,106 @@
+package cn.pluss.platform.jty;
+
+import cn.pluss.platform.cacheInfo.CacheInfoService;
+import cn.pluss.platform.entity.CacheInfo;
+import cn.pluss.platform.entity.DeviceStock;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.jty.constant.JtyConstant;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.stereotype.Component;
+import org.springframework.web.client.RestTemplate;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.Map;
+
+/**
+ * TODO
+ * 佳天亿设备业务处理handler
+ * @author crystal
+ * @date 2022/3/17 15:37
+ */
+@Slf4j
+@Component
+public class JtyDeviceHandler {
+
+    @Resource
+    private RestTemplate restTemplate;
+
+    @Resource
+    private CacheInfoService cacheInfoService;
+
+    /**
+     * 发送设备消息
+     * @param orderAmt
+     * @param type
+     * @param deviceStock
+     * @return
+     */
+    public String sendNotice(Double orderAmt,String type,DeviceStock deviceStock){
+        String url = JtyConstant.API_TEST_DOMAIN + JtyConstant.PAY_NOTICE_METHOD;
+        JtyYxApiAuth auth = new JtyYxApiAuth();
+        String authSign = getAuthSign(auth);
+        JtyYxPayNotice notice = new JtyYxPayNotice(deviceStock.getDeviceNo(),type,BigDecimal.valueOf(orderAmt));
+        HttpHeaders headers = new HttpHeaders();
+        headers.add("FB_OP_SIGNATURE",authSign);
+        headers.add("FB_OP_API_VERSION",JtyConstant.VERSION);
+        HttpEntity<JtyYxPayNotice>  httpEntity = new HttpEntity<>(notice,headers);
+        try {
+            JtyResponse response = restTemplate.postForObject(url, httpEntity, JtyResponse.class);
+            log.info("【佳天亿】接口返回：{}",JSON.toJSONString(response));
+            if(!JtyConstant.SUCCESS_CODE.equals(response.getCode())){
+                MsgException.throwException(response.getMessage());
+            }
+            return ((Map<String, String>)response.getResult()).get("requestNum");
+        }catch (Exception e){
+            MsgException.throwException(e.getMessage());
+        }
+        return null;
+    }
+
+    public String getAuthSign(JtyYxApiAuth auth) {
+        CacheInfo cacheInfo = cacheInfoService.getCacheInfoByKeyCode(JtyConstant.CACHE_KEY_CODE_PRIFIX + auth.getAppId());
+        if(cacheInfo == null){
+            Long time = System.currentTimeMillis();
+            JtyResponse response = getReqAuthSign(auth);
+            Object result = response.getResult();
+            JtyResult jtyResult = JSONObject.parseObject(JSON.toJSONString(result), JtyResult.class);
+            Long exprieTime = jtyResult.getExpirationTime();
+            Long expiresIn = (time + exprieTime) / 1000;
+            CacheInfo cache = new CacheInfo(auth.getAppId(),auth.getAppSecret(),JtyConstant.CACHE_KEY_CODE_PRIFIX + auth.getAppId(),jtyResult.getAuthSign(),expiresIn);
+            cacheInfoService.save(cache);
+            return jtyResult.getAuthSign();
+        }else{
+            long time = System.currentTimeMillis();
+            long expiresIn = cacheInfo.getExpiresIn();
+            if(time / 1000  >= expiresIn - 200){
+                JtyResponse response = getReqAuthSign(auth);
+                Object result = response.getResult();
+                JtyResult jtyResult = JSONObject.parseObject(JSON.toJSONString(result), JtyResult.class);
+                Long nextExpiresIn = (time + jtyResult.getExpirationTime()) / 1000;
+                cacheInfo.setExpiresIn(nextExpiresIn);
+                cacheInfo.setAccessToken(jtyResult.getAuthSign());
+                cacheInfoService.updateById(cacheInfo);
+                return jtyResult.getAuthSign();
+            }else{
+                return cacheInfo.getAccessToken();
+            }
+        }
+    }
+
+    private JtyResponse getReqAuthSign(JtyYxApiAuth auth) {
+        String authUrl = JtyConstant.API_TEST_DOMAIN + JtyConstant.API_AUTH_METHOD;
+        JtyResponse response = restTemplate.postForObject(authUrl, auth, JtyResponse.class);
+        if(response == null){
+            MsgException.throwException("获取佳天亿授权sign异常");
+        }
+        if(!JtyConstant.SUCCESS_CODE.equals(response.getCode())){
+            MsgException.throwException(response.getMessage());
+        }
+        return response;
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/leshua/LeshuaService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/leshua/LeshuaService.java
new file mode 100644
index 0000000..ef4a61e
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/leshua/LeshuaService.java
@@ -0,0 +1,98 @@
+package cn.pluss.platform.leshua;
+
+import java.io.File;
+import java.util.Map;
+
+import cn.pluss.platform.entity.MerchantOrder;
+import cn.pluss.platform.entity.MerchantStore;
+import cn.pluss.platform.vo.MerchantOrderVO;
+import cn.pluss.platform.wap.MerchantLeshuaDTO;
+import com.alibaba.fastjson.JSONObject;
+
+import cn.pluss.platform.api.Result;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @author yuchen
+ * 
+ * @Description 
+ */
+public interface LeshuaService {
+	
+	/**
+	 * 
+	 * requestSaasApi:(调用进件接口). <br/> 
+	 * 
+	 * @author Administrator 
+	 * @param url
+	 * @param data
+	 * @return 
+	 * @since JDK 1.8
+	 */
+	public  Result<Object> requestApi(String url, JSONObject data);
+	
+	/**
+	 * 
+	 * requestApi:(调用进件上传图片接口). <br/> 
+	 * 
+	 * @author Administrator 
+	 * @param url
+	 * @param data
+	 * @param pictures
+	 * @return 
+	 * @since JDK 1.8
+	 */
+	 public Result<Object> requestApi(String url,JSONObject data,Map<String,File> pictures);
+	 
+	 /**
+		 * 调用乐刷交易接口
+		 * @param reqMap
+		 * @param apiKey
+		 * @param isCheckRespSign 是否对返回参数进行验签
+		 * @return
+		 * @throws Exception
+		 */
+	 public  String requestPay(Map<String,String> reqMap, String apiKey, boolean isCheckRespSign)throws Exception;
+	 
+	 /**
+	  * 
+	  * leshuaImgUpload:(图片url). <br/> 
+	  * 
+	  * @author Administrator 
+	  * @param path
+	  * @return
+	  * @throws Exception 
+	  * @since JDK 1.8
+	  */
+	 public String leshuaImgUpload(String path) throws Exception;
+	 
+	 /**
+	  * 
+	  * openMerchantService:(乐刷商家费率修改). <br/> 
+	  * 
+	  * @author Administrator 
+	  * @param map 
+	  * @since JDK 1.8
+	  */
+	 public Result<Map<String, Object>> openMerchantService(Map<String, Object> map) throws Exception;
+	/**
+	 * 乐刷交易结果查询
+	 * @param order
+	 * @param mchId
+	 * @return
+	 */
+	Map<String, Object> requestTransQuery(MerchantOrder order,String mchId) throws Exception;
+
+
+	Map<String,Object> tradePay(Map<String,String> params, HttpServletRequest request,MerchantStore store,String orderNumber) throws Exception;;
+
+	/**
+	 * 退款
+	 * @param queryMerchantOrder
+	 * @param leshuaMchId
+	 * @return
+	 */
+	Map<String, Object> leshuaReturn(MerchantOrderVO queryMerchantOrder, String leshuaMchId);
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/leshua/impl/LeshuaMerchantAuditService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/leshua/impl/LeshuaMerchantAuditService.java
new file mode 100644
index 0000000..278b5f8
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/leshua/impl/LeshuaMerchantAuditService.java
@@ -0,0 +1,307 @@
+package cn.pluss.platform.leshua.impl;
+
+import cn.pluss.platform.BankCardService;
+import cn.pluss.platform.IdCardService;
+import cn.pluss.platform.MerchantAuditRecordService;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.leshua.*;
+import cn.pluss.platform.mapper.MerchantBankCardMapper;
+import cn.pluss.platform.mapper.MerchantBaseInfoMapper;
+import cn.pluss.platform.mapper.MerchantStoreMapper;
+import cn.pluss.platform.mapper.UserAppMapper;
+import cn.pluss.platform.channel.MerchantAuditService;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantImage.MerchantImageService;
+import cn.pluss.platform.mswitch.CommonSwitchService;
+import cn.pluss.platform.util.StringUtil;
+import com.alibaba.fastjson.JSONObject;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+
+@Slf4j
+@RequiredArgsConstructor
+@Service("leshuaMerchantAuditService")
+public class LeshuaMerchantAuditService implements MerchantAuditService {
+
+    private final CommonSwitchService commonSwitchService;
+    private final LeshuaService leshuaService;
+    private final MerchantImageService merchantImageService;
+    private final BankCardService bankCardService;
+    private final IdCardService idCardService;
+
+    private final MerchantBankCardMapper merchantBankCardMapper;
+    private final MerchantBaseInfoMapper merchantBaseInfoMapper;
+    private final MerchantStoreMapper merchantStoreMapper;
+    private final UserAppMapper userAppMapper;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantAuditRecordService merchantAuditRecordService;
+
+    @Setter(onMethod_ = {@Lazy, @Autowired})
+    private MerchantBaseInfoService merchantBaseInfoService;
+
+    @Override
+    public void imageUpload(MerchantImage merchantImage) {
+
+    }
+
+    @Override
+    public void imageUpload(String url, String picType) {
+
+    }
+
+    @Override
+    public void merchantAudit(String userId, boolean isFailCheck) {
+        throw new MsgException("暂不支持乐刷进件");
+
+//        MsgException.check(!commonSwitchService.allowMerchantRegister(), "当前不允许进件！");
+//
+//        LeshuaMerchantAuditDTO leshuaMerchantAuditDTO = new LeshuaMerchantAuditDTO().setUserId(userId);
+//
+//        MsgException.checkBlank(userId, "userId参数不存在！");
+//
+//        if (isFailCheck) {
+//            MerchantBaseInfo merchantBaseInfo = merchantBaseInfoService.getMerchantBaseInfoByUserId(userId);
+//            merchantAuditRecordService.checkFailCount(merchantBaseInfo.getMerchantCode(), "连续三次复审驳回，请联系客服进件");
+//        }
+//
+//        UserApp userApp = new UserApp();
+//        userApp.setUserId(Long.valueOf(userId));
+//        List<UserApp> queryUserAppList = userAppMapper.queryUserAppList(userApp);
+//        if (queryUserAppList != null && queryUserAppList.size() > 0) {
+//            // 当前用户信息
+//            userApp = queryUserAppList.get(0);
+//            if ("3".equals(userApp.getLeshuaStatus())) {
+//                throw new MsgException("当前商户已进件成功！");
+//            }
+//
+//            BankCard bankCard = new BankCard().setUserId(userId).setAccountType(BankCard.ACCOUNT_TYPE_PRIVATE);
+//            bankCard = bankCardService.getOne(new QueryWrapper<>(bankCard));
+//            if (bankCard == null) {
+//                throw new MsgException("请先进行认证绑卡操作");
+//            }
+//
+//            IdCard legalIdCard = idCardService.getCertIdCard(userId);
+//
+//            MerchantBaseInfo merchant = new MerchantBaseInfo();
+//            merchant.setUserId(userId);
+//            List<MerchantBaseInfo> queryMerchantBaseInfoList = merchantBaseInfoMapper.queryMerchantBaseInfoList(merchant);
+//            if (queryMerchantBaseInfoList == null || queryMerchantBaseInfoList.size() == 0) {
+//                throw new MsgException("请先填写商户基本资料");
+//            }
+//            merchant = queryMerchantBaseInfoList.get(0);
+//            if (merchant.getMerchantType() == null) {
+//                throw new MsgException("请先填写商户基本资料");
+//            }
+//
+//            MerchantImage mImage = new MerchantImage();
+//            mImage.setMerchantCode(merchant.getMerchantCode());
+//            List<MerchantImage> queryMerchantImageList = merchantImageService.queryMerchantImageList(mImage);
+//            if (queryMerchantImageList == null || queryMerchantImageList.size() == 0) {
+//                throw new MsgException("请先上传相应进件的图片");
+//            }
+//
+//            MerchantRegisterDTO convert = leshuaMerchantAuditDTO.convert(legalIdCard, bankCard, merchant, queryMerchantImageList);
+//            MerchantRegisterDTO merchantRegisterDTO = convert;
+//            String jsonString2 = JSONObject.toJSONString(merchantRegisterDTO);
+//            log.info("===进件信息拼接结果====" + jsonString2);
+//            ShopInfo shopInfo = merchantRegisterDTO.getShopInfo();
+//            LicenseInfo licenseInfo = merchantRegisterDTO.getLicenseInfo();
+//
+//            String apply;
+//            try {
+//                apply = LeshuajinjianImgUploadApply(merchantRegisterDTO);
+//            } catch (Exception e) {
+//                throw new MsgException("上传错误");
+//            }
+//
+//
+//            JSONObject data = new JSONObject();
+//            String targetUrl = ParametersUtil.LESHUA_API + "/merchant/register";
+//            if(StringUtils.isNotEmpty(userApp.getLeshuaMchId())) {
+//                targetUrl = ParametersUtil.LESHUA_API + "/merchant/update";
+//                data.put("merchantId", userApp.getLeshuaMchId());
+//            }
+//            data.put("baseInfo", merchantRegisterDTO.getBaseInfo());
+//            data.put("legalPerson", merchantRegisterDTO.getLegalPerson());
+//            data.put("contactInfo", merchantRegisterDTO.getContactInfo());
+//            data.put("addressInfo", merchantRegisterDTO.getAddressInfo());
+//            data.put("licenseInfo", licenseInfo);
+//            data.put("accountInfo", merchantRegisterDTO.getAccountInfo());
+//            data.put("shopInfo", shopInfo);
+//            Result<Object> result = leshuaService.requestApi(targetUrl, data);
+//            String respCode = result.getRespCode();
+//            try {
+//                if ("000000".equals(respCode)) {
+//                    JSONObject data2 = (JSONObject) result.getData();
+//
+//                    if (StringUtils.isNotEmpty(userApp.getLeshuaMchId())) {
+//                        updateResultHandle(data2, userApp);
+//                    } else {
+//                        registerResultHandle(data2, userApp, merchant);
+//                    }
+//                } else {
+//                    String respMsg = result.getRespMsg();
+//                    throw new MsgException(respMsg);
+//                }
+//            } catch (Exception e) {
+//                e.printStackTrace();
+//                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+//                userApp.setLeshuaStatus("2");
+//                throw e;
+//            } finally {
+//                userAppMapper.updateUserApp(userApp);
+//            }
+//        } else {
+//            throw new MsgException("当前用户不存在");
+//        }
+    }
+
+    @Override
+    public void merchantAuditCheck(String userId, boolean isFailCheck) {
+
+    }
+
+    @Override
+    public void editMerchantAudit(String userId) {
+        // 暂未接通
+    }
+
+    @Override
+    public JSONObject merchantAuditResult(Map<String, Object> result)throws Exception {
+        return null;
+    }
+
+    @Override
+    public JSONObject merchantAuditCallback(JSONObject auditResult) throws Exception {
+        return null;
+    }
+
+    @Override
+    public JSONObject editMerchantCallback(JSONObject auditResult) throws Exception {
+        return null;
+    }
+
+    @Override
+    public String imgTypeTransform(String imageType) {
+        return null;
+    }
+
+    @Override
+    public void checkSign(JSONObject receiveData) throws Exception {
+
+    }
+
+    /**
+     * LeshuajinjianParamApply:(图片). <br/>
+     *
+     * @param merchantRegisterDTO
+     * @return
+     * 
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    private String LeshuajinjianImgUploadApply(MerchantRegisterDTO merchantRegisterDTO) throws Exception {
+        LegalPerson legalPerson = merchantRegisterDTO.getLegalPerson();
+        String idcardBackPic = legalPerson.getIdcardBackPic();
+        String idcardFrontPic = legalPerson.getIdcardFrontPic();
+        idcardBackPic = leshuaService.leshuaImgUpload(idcardBackPic);
+        idcardFrontPic = leshuaService.leshuaImgUpload(idcardFrontPic);
+        legalPerson.setIdcardBackPic(idcardBackPic);
+        legalPerson.setIdcardFrontPic(idcardFrontPic);
+        LicenseInfo licenseInfo = merchantRegisterDTO.getLicenseInfo();
+        if (licenseInfo != null && StringUtil.isNotEmpty(licenseInfo.getLicensePic())) {
+            String licensePic = licenseInfo.getLicensePic();
+            licensePic = leshuaService.leshuaImgUpload(licensePic);
+            licenseInfo.setLicensePic(licensePic);
+        }
+
+        ShopInfo shopInfo = merchantRegisterDTO.getShopInfo();
+        String insidePic = shopInfo.getInsidePic();
+        String doorPic = shopInfo.getDoorPic();
+        String cashierDeskPic = shopInfo.getCashierDeskPic();
+        insidePic = leshuaService.leshuaImgUpload(insidePic);
+        doorPic = leshuaService.leshuaImgUpload(doorPic);
+        cashierDeskPic = leshuaService.leshuaImgUpload(cashierDeskPic);
+        shopInfo.setInsidePic(insidePic);
+        shopInfo.setDoorPic(doorPic);
+        shopInfo.setCashierDeskPic(cashierDeskPic);
+        AccountInfo accountInfo = merchantRegisterDTO.getAccountInfo();
+        String bankCardFrontPic = accountInfo.getBankCardFrontPic();
+        bankCardFrontPic = leshuaService.leshuaImgUpload(bankCardFrontPic);
+        accountInfo.setBankCardFrontPic(bankCardFrontPic);
+        log.info("idcardBackPic" + idcardBackPic);
+        // log.info("licensePic"+licensePic);
+        log.info("insidePic" + insidePic);
+        log.info("doorPic" + doorPic);
+        log.info("cashierDeskPic" + cashierDeskPic);
+        log.info("bankCardFrontPic" + bankCardFrontPic);
+        if (StringUtil.isEmpty(idcardBackPic)) {
+            throw new MsgException("身份证反面照错误,请重新上传");
+        }
+
+        if (StringUtil.isEmpty(insidePic)) {
+            throw new MsgException("经营场所内设照错误,请重新上传");
+        }
+
+        if (StringUtil.isEmpty(doorPic)) {
+            throw new MsgException("门头照错误,请重新上传");
+        }
+        if (StringUtil.isEmpty(cashierDeskPic)) {
+            throw new MsgException("收银台照片错误,请重新上传");
+        }
+        if (StringUtil.isEmpty(bankCardFrontPic)) {
+            throw new MsgException("银行卡正面照错误,请重新上传");
+        }
+
+        return "";
+    }
+
+    private void registerResultHandle(JSONObject result, UserApp userApp, MerchantBaseInfo merchant) {
+        // 乐刷分配的商户ID
+//        String leshuaMerchantId = result.getString("merchantId");
+//        userApp.setLeshuaMchId(leshuaMerchantId);
+//        // 乐刷分配的商户账号
+//        String leshuaUserName = result.getString("username");
+//        userApp.setLeshuaUserName(leshuaUserName);
+//        userApp.setLeshuaStatus("1");
+//        merchant.setLeshuaRate(ParametersUtil.leshuarate);
+//        merchant.setUpdateDt(new Date());
+//        merchantBaseInfoMapper.updateMerchantBaseInfo(merchant);
+//
+//        MerchantStore merchantStore = new MerchantStore();
+//        merchantStore.setMerchantCode(merchant.getMerchantCode());
+//        List<MerchantStore> queryMerchantStoreList = merchantStoreMapper.queryMerchantStoreList(merchantStore);
+//        if (queryMerchantStoreList == null || queryMerchantStoreList.size() == 0) {
+//            merchantStore.setMerchantName(merchant.getAlias());
+//            merchantStore.setStoreId(StringUtil.genRandomNum(6));
+//            merchantStore.setStoreName(merchant.getAlias());
+//            merchantStoreMapper.insert(merchantStore);
+//        }
+//        if (StringUtil.isNotEmpty(userApp.getParentId())) {
+//            // 更新上级推广人的认证商户数量 //更新上级推广人的认证商户数量
+//            UserApp parentApp = new UserApp();
+//            parentApp.setUserId(userApp.getParentId());
+//            List<UserApp> queryUserAppList2 = userAppMapper.queryUserAppList(parentApp);
+//            if (StringUtil.isNotEmpty(userApp.getParentId()) && queryUserAppList2 != null && queryUserAppList2.size() > 0) {
+//                parentApp = queryUserAppList2.get(0);
+//                UserApp updateParentApp = new UserApp();
+//                updateParentApp.setId(parentApp.getId());
+//                updateParentApp.setAuthCount(parentApp.getAuthCount() == null ? 1 : parentApp.getAuthCount() + 1);
+//                userAppMapper.updateUserApp(updateParentApp);
+//            }
+//        }
+    }
+
+    private void updateResultHandle(JSONObject result, UserApp userApp) {
+//        userApp.setLeshuaStatus("1");
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/leshua/impl/LeshuaServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/leshua/impl/LeshuaServiceImpl.java
new file mode 100644
index 0000000..a378334
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/leshua/impl/LeshuaServiceImpl.java
@@ -0,0 +1,551 @@
+package cn.pluss.platform.leshua.impl;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
+import java.net.URL;
+import java.net.URLEncoder;
+import java.nio.charset.Charset;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+import cn.pluss.platform.dto.RealFansDTO;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.leshua.*;
+import cn.pluss.platform.mapper.MerchantOrderMapper;
+import cn.pluss.platform.mapper.UserAppMapper;
+import cn.pluss.platform.systemConfig.SystemConfigService;
+import cn.pluss.platform.util.*;
+import cn.pluss.platform.vo.MerchantOrderVO;
+import cn.pluss.platform.wap.MerchantLeshuaDTO;
+import cn.pluss.platform.wap.XmlUtil;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.mime.HttpMultipartMode;
+import org.apache.http.entity.mime.MultipartEntityBuilder;
+import org.apache.http.entity.mime.content.FileBody;
+import org.apache.http.entity.mime.content.StringBody;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.mapper.SystemConfigMapper;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @author yuchen
+ * 
+ * @Description
+ */
+@RequiredArgsConstructor
+@Service("leshuaService")
+public class LeshuaServiceImpl implements LeshuaService {
+
+    private static final Logger logger = LoggerFactory.getLogger(LeshuaServiceImpl.class);
+
+    /**
+     *
+     */
+    private CloseableHttpClient httpclient = HttpClients.createDefault();
+
+    HttpClientHelper httpClientHelper = new HttpClientHelper();
+
+
+    private final SystemConfigMapper systemConfigMapper;
+
+    private final MerchantBaseInfoService merchantBaseInfoService;
+
+    private final UserAppMapper userAppMapper;
+
+
+    private final SystemConfigService systemConfigService;
+
+    private final MerchantOrderMapper merchantOrderMapper;
+
+
+    /**
+     * 进件调用请求(不上传图片)
+     *
+     * @param url  地址
+     * @param data 数据
+     * @return
+     */
+    @Override
+    public Result<Object> requestApi(String url, JSONObject data) {
+        return requestApi(url, data, null);
+    }
+
+
+    /**
+     * 进件调用请求调用请求上传图片
+     *
+     * @param url      地址
+     * @param data     数据
+     * @param pictures 图片
+     * @return
+     */
+    @Override
+    public Result<Object> requestApi(String url, JSONObject data, Map<String, File> pictures) {
+        logger.info("请求地址:{}" + url);
+        logger.info("请求参数:{}" + data);
+        String sign = getSign(data);// 获取签名值
+        String result = "";
+        HttpPost httppost = new HttpPost(url);
+        MultipartEntityBuilder multipartEntityBuilder = MultipartEntityBuilder.create();
+        multipartEntityBuilder.setMode(HttpMultipartMode.BROWSER_COMPATIBLE);
+        multipartEntityBuilder.setCharset(Charset.forName("UTF-8"));
+        multipartEntityBuilder.addPart("agentId", new StringBody("7389852", ContentType.APPLICATION_JSON));// 代理商编号
+        multipartEntityBuilder.addPart("version", new StringBody("2.0", ContentType.APPLICATION_JSON));// 版本
+        SimpleDateFormat dateFm = new SimpleDateFormat("yyyyMMddHHmmssSSS");
+        String reqSerialNo = dateFm.format(new Date()) + StringUtil.genRandomNum(5);
+        multipartEntityBuilder.addPart("reqSerialNo", new StringBody(reqSerialNo, ContentType.APPLICATION_JSON));// 请求流水号
+        multipartEntityBuilder.addPart("data", new StringBody(data.toJSONString(), ContentType.APPLICATION_JSON));// 数据内容
+        multipartEntityBuilder.addPart("sign", new StringBody(sign, ContentType.APPLICATION_JSON));// 签名值
+        if (pictures != null) {// 图片文件
+            for (String picName : pictures.keySet()) {
+                multipartEntityBuilder.addPart(picName, new FileBody(pictures.get(picName)));
+            }
+        }
+        HttpEntity reqEntity = multipartEntityBuilder.build();
+        httppost.setEntity(reqEntity);
+        try {
+            CloseableHttpResponse response = httpclient.execute(httppost);
+            logger.info(response + "");
+            HttpEntity resEntity = response.getEntity();
+            if (resEntity != null) {
+                result = EntityUtils.toString(resEntity, "UTF-8");
+            }
+        } catch (IOException e) {
+            logger.error("Exception:{}", e);
+        }
+        logger.info("返回参数:{}" + result);
+        Result<Object> r = JSONObject.parseObject(result, new TypeReference<Result<Object>>() {
+        });
+        return r;
+    }
+
+    /**
+     * 进件获取签名值
+     *
+     * @param data
+     * @return
+     */
+    private String getSign(JSONObject data) {
+        String sign = "";
+        String jsonData = data.toJSONString();
+        StringBuffer sb = new StringBuffer("lepos");
+        sb.append("60E3F31EDEC8061C33721737B36FA86D").append(jsonData);// key每个渠道商不一样
+        try {
+            String md5 = DigestUtils.md5Hex(sb.toString().getBytes("UTF-8"));
+            sign = Base64.encodeBase64String(md5.getBytes("UTF-8"));
+        } catch (UnsupportedEncodingException e) {
+            logger.error("Exception:{}", e);
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+        }
+        logger.info("待签参数:{}" + sb);
+        logger.info("签名值:{}" + sign);
+        return sign;
+    }
+
+    @Override
+    public String requestPay(Map<String, String> reqMap, String apiKey, boolean isCheckRespSign) throws Exception {
+        return this.request(LeshuaParam.getPAYURL(), reqMap, apiKey, true);
+    }
+
+    public String request(String serviceUrl, Map<String, String> reqMap, String apiKey, boolean isCheckRespSign)
+            throws Exception {
+        long costTimeStart = System.currentTimeMillis();
+        // 根据API给的签名规则进行签名
+        String sign = LeshuaSignature.getMD5Sign(reqMap, reqExcludedSignParams(), apiKey);
+        reqMap.put("sign", sign);
+
+        String respStr = httpClientHelper.postForm(serviceUrl, reqMap, HttpClientHelper.ACCEPT_TYPE_XML);
+        long totalTimeCost = System.currentTimeMillis() - costTimeStart;
+        // 打印回包数据
+        logger.info("接口：{}，请求耗时：{}ms，请求参数：{}，\n乐刷返回的数据如下：{}", totalTimeCost, reqMap, respStr);
+
+        if (isCheckRespSign) {
+            if (respStr.contains("<sign>") && !LeshuaSignature.checkIsSignValidFromResponseString(respStr, resExcludedSignParams(), apiKey)) {
+                logger.error("接口：{}，订单号：{}，验签失败，数据可能被篡改了！！！", reqMap.get("third_order_id"));
+                throw new Exception("验签失败");
+            }
+        }
+        return respStr;
+    }
+
+    /**
+     * 请求参数不参与计算签名的参数
+     *
+     * @return
+     */
+    protected Set<String> reqExcludedSignParams() {
+        Set<String> exludedSignParams = new HashSet<String>(1);
+        exludedSignParams.add("sign");
+        return exludedSignParams;
+    }
+
+    /**
+     * 响应结果不参与计算签名的参数
+     *
+     * @return
+     */
+    protected Set<String> resExcludedSignParams() {
+        Set<String> exludedSignParams = new HashSet<String>(2);
+        exludedSignParams.add("sign");
+        exludedSignParams.add("resp_code");
+        return exludedSignParams;
+    }
+
+    @Override
+    public String leshuaImgUpload(String path) throws Exception {
+        Map<String, File> reqMap = new HashMap<String, File>(16);
+        JSONObject data = new JSONObject(1);
+        Properties prop = System.getProperties();
+        String os = prop.getProperty("os.name");
+        if (os.startsWith("win") || os.startsWith("Win")) {
+            if (path.contains("https") || path.contains("http") || path.contains("www.")) {
+                // windows目录
+                int lastIndexOf = path.lastIndexOf(".");
+                File img = File.createTempFile(StringUtil.getBillno(), "." + path.substring(lastIndexOf + 1),
+                        new File("C:\\"));
+                URL url2 = new URL(path);
+                InputStream inputStream = url2.openStream();
+                OutputStream oss = new FileOutputStream(img);
+                int bytesRead = 0;
+                byte[] buffer = new byte[8192];
+                while ((bytesRead = inputStream.read(buffer, 0, 8192)) != -1) {
+                    oss.write(buffer, 0, bytesRead);
+                }
+                oss.close();
+                inputStream.close();
+                String fileMD5 = DigestUtils.md5Hex(FileUtil.fileToByte(path));
+                reqMap.put("media", img);
+                data.put("fileMD5", fileMD5);
+            } else {
+                File file = new File(path);
+                String fileMD5 = DigestUtils.md5Hex(FileUtil.File2byte2(path));
+                reqMap.put("media", file);
+                data.put("fileMD5", fileMD5);
+            }
+        } else {
+            SystemConfig systemConfig = new SystemConfig();
+            systemConfig.setPropertyKey("upload_save_path");
+            SystemConfig querySystemConfig = systemConfigMapper.querySystemConfig(systemConfig);
+            String propertyValue = querySystemConfig.getPropertyValue();
+            System.out.println("======== shangchuan tupian =图片liunx服务器保存地址 =========" + JSONObject.toJSONString(querySystemConfig));
+            System.out.println("======== shangchuan tupian =图片liunx服务器保存地址 =========" + propertyValue);
+            String[] split = path.split("/");
+            path = split[split.length - 1];
+            path = propertyValue + "/" + path;
+            System.out.println("======== shangchuan tupian =图片liunx服务器保存地址 =========" + path);
+            File file = new File(path);
+            String fileMD5 = DigestUtils.md5Hex(FileUtil.File2byte2(path));
+            reqMap.put("media", file);
+            data.put("fileMD5", fileMD5);
+        }
+//        Result<Object> result = this.requestApi(ParametersUtil.LESHUA_API + "/picture/upload", data, reqMap);
+//        if ("000000".equals(result.getRespCode())) {
+//            JSONObject data2 = (JSONObject) result.getData();
+//            String url = data2.getString("photoUrl");
+//            logger.info("======== shangchuan tupian =fanhui jieguo =========" + JSONObject.toJSONString(result));
+//            return url;
+//        } else {
+//            throw new MsgException(result);
+//        }
+
+        return null;
+    }
+
+    @Override
+    public Result<Map<String, Object>> openMerchantService(Map<String, Object> map) {
+//        try {
+//            String id = (String) map.get("id");//merchantBaseInfo.id
+//            MerchantBaseInfo merchantBaseInfo = new MerchantBaseInfo();
+//            merchantBaseInfo.setId(Long.valueOf(id));
+//            merchantBaseInfo = merchantBaseInfoService.queryMerchantBaseInfo(merchantBaseInfo);
+//            String userId = merchantBaseInfo.getUserId();
+//            UserApp userApp = new UserApp();
+//            userApp.setUserId(Long.parseLong(userId));
+//            userApp = userAppMapper.queryUserApp(userApp);
+//            if (!"3".equals(userApp.getLeshuaStatus())) {
+//                return ResultGenerator.genFailResult("该商户尚未开通乐刷支付");
+//            }
+//            String rate = (String) map.get("rate");//例如 0.0038
+//            Double leshuaRate = Double.parseDouble(rate) * 10000;
+//            JSONObject dat = new JSONObject(4);
+//            dat.put("merchantId", userApp.getLeshuaMchId());
+//            JSONObject fee = new JSONObject();// 费率参数对象
+//            fee.put("openType", 1);
+//            JSONObject weixin = new JSONObject(4);// 微信支付费率
+//            JSONObject wxt1 = new JSONObject(4);// 微信支付T1费率
+//            wxt1.put("rate", leshuaRate);
+//            weixin.put("t1", wxt1);
+//            fee.put("weixin", weixin);
+//            JSONObject alipay = new JSONObject(4);// 支付宝支付费率
+//            JSONObject alipayt1 = new JSONObject(4);// 支付宝支付T1费率
+//            alipayt1.put("rate", leshuaRate);
+//            alipay.put("t1", alipayt1);
+//            fee.put("alipay", alipay);
+//            dat.put("fee", fee);
+//            Result<Object> res = requestApi(LeshuaParam.getREGISTERURL() + "/merchant/open", dat);
+//            if ("000000".equals(res.getRespCode())) {
+////				 NumberFormat nf=NumberFormat.getPercentInstance();
+////				 Number m=nf.parse(rate);
+//                merchantBaseInfo.setLeshuaRate(Double.valueOf(rate));
+//                merchantBaseInfoService.updateMerchantBaseInfo(merchantBaseInfo);
+//                return ResultGenerator.genSuccessResult();
+//            }
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//            return ResultGenerator.genFailResult("修改错误");
+//        }
+        return ResultGenerator.genFailResult("修改失败");
+    }
+
+    /**
+     * 乐刷交易结果查询
+     * @param
+     * @param mchId
+     * @return
+     */
+    @Override
+    public Map<String, Object> requestTransQuery(MerchantOrder orderInfo,String mchId) throws Exception{
+        Map<String, Object> result = new HashMap<>(2);
+        String nonceStr = StringUtil.genRandomNum(32);
+        Map<String,String> params = new HashMap<>(4);
+        params.put("service","query_status");
+        params.put("merchant_id",mchId);
+        params.put("third_order_id",orderInfo.getOrderNumber());
+        params.put("nonce_str",nonceStr);
+        String sign = LeshuaSignature.getMD5Sign(params, new HashSet<>(1), ParametersUtil.leshuapaykey);
+        params.put("sign",sign);
+        logger.info("请求地址:{}" + LeshuaParam.getPAYURL());
+        logger.info("请求参数:{}" + params);
+        long costTimeStart = System.currentTimeMillis();
+        String respStr = httpClientHelper.postForm(LeshuaParam.getPAYURL(), params, HttpClientHelper.ACCEPT_TYPE_XML);
+        long totalTimeCost = System.currentTimeMillis() - costTimeStart;
+        // 打印回包数据
+        logger.info("乐刷交易查询接口，请求耗时：{}ms，请求参数：{}，\n乐刷返回的数据如下：{}", totalTimeCost, params, respStr);
+        if(StringUtil.isEmpty(respStr)){
+            result.put("code", "0");
+            result.put("msg", "乐刷接口请求异常！");
+            return result;
+        }
+        Map<String, Object> resultMap = XmlUtil.toMapLeshua(respStr);
+        String resp_code = (String)resultMap.get("resp_code");
+        if(!"0".equals(resp_code)){
+            result.put("code", "0");
+            result.put("msg", "乐刷"+resultMap.get("resp_msg"));
+            return result;
+        }
+        String result_code = (String)resultMap.get("result_code");
+        if(!"0".equals(result_code)){
+            result.put("code", "0");
+            result.put("msg", "乐刷"+resultMap.get("error_msg"));
+            return result;
+        }
+        RealFansDTO realFansDTO = new RealFansDTO();
+        String status = (String)resultMap.get("status");
+        //支付成功
+        if("2".equals(status)){
+            String leshuaOrderId = (String)resultMap.get("leshua_order_id");
+            String payTime = (String)resultMap.get("pay_time");
+            SimpleDateFormat sFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            String openid = (String) resultMap.get("openid");// 微信openid
+            String sub_openid = (String) resultMap.get("sub_openid");//支付宝
+            String amountpaid = (String) resultMap.get("amount");// 订单金额
+            String pay_way = (String) resultMap.get("pay_way");// 支付类型
+            //主扫 会员充值
+            if("1".equals(orderInfo.getOrderType()) || "3".equals(orderInfo.getOrderType())){
+                orderInfo.setStatus("1");
+                orderInfo.setTransDt(sFormat.parse(payTime));
+                orderInfo.setThirdTransNo(leshuaOrderId);
+                merchantOrderMapper.updateById(orderInfo);
+                //被扫
+            }else if("2".equals(orderInfo.getOrderType())){
+                Map<String, Object> map = new HashMap<>(16);
+                BigDecimal amountPay = (new BigDecimal(amountpaid).divide(new BigDecimal("100"))).setScale(2);// 将分转换成元-实际支付金额:元
+                realFansDTO.setConSumMoney(String.valueOf(amountPay));
+                realFansDTO.setConsumTime(payTime);
+                realFansDTO.setLogo(orderInfo.getUserImg());
+                realFansDTO.setNickName(orderInfo.getNickName());
+                realFansDTO.setMerchantCode(orderInfo.getMerchantCode());
+                realFansDTO.setOrderNumber(orderInfo.getOrderNumber());
+                realFansDTO.setTradeNumber(leshuaOrderId);
+                if ("ZFBZF".equals(pay_way)) {
+                    realFansDTO.setPayWay("2-0");
+                    realFansDTO.setSoleId(sub_openid);
+                } else if ("WXZF".equals(pay_way)) {
+                    realFansDTO.setPayWay("2-1");
+                    realFansDTO.setSoleId(openid);
+                }
+                map.put("realFansDTO", realFansDTO);
+                logger.info("=============乐刷补单realFansDTO================" + JSONObject.toJSONString(realFansDTO));
+                //realFansService.saveRealFansAndFansConsSumRecords(map);
+                result.put("data",map);
+            }
+            result.put("code", "1");
+            result.put("msg", "补单成功！");
+            return result;
+        }else if("6".equals(status) ||"0".equals(status)){
+            result.put("code", "2");
+            result.put("msg", "乐刷订单与我方订单状态一致，无需补单！");
+            return result;
+        }
+        result.put("code", "1");
+        result.put("msg", "无需补单！");
+        return  result;
+    }
+
+    /**
+     * 参数转换
+     */
+    private MerchantLeshuaDTO converParameter(Map<String,String> params,HttpServletRequest request) {
+        //乐刷参数转换
+        MerchantLeshuaDTO lsDto = new MerchantLeshuaDTO();
+        lsDto.setComsumeMoney(Double.parseDouble(params.get("comsumeMoney")));
+        lsDto.setLeshuaMchId(params.get("leshuaMchId"));
+        lsDto.setMerchantCode(params.get("merchantCode"));
+        lsDto.setStoreId(params.get("storeId"));
+        lsDto.setPayWay(params.get("payWay"));
+        lsDto.setUserImg(params.get("userImg"));
+        lsDto.setNickName(params.get("nickName"));
+        lsDto.setRemark(params.get("remark"));
+        lsDto.setOpenId(params.get("openid"));
+        lsDto.setIsMember(params.get("isMember"));
+        lsDto.setRadioPay(params.get("radioPay"));
+        lsDto.setIp(IpUtils.getIpAddr(request));
+        return lsDto;
+    }
+
+    @Override
+    public Map<String,Object> tradePay(Map<String,String> params, HttpServletRequest request,MerchantStore store, String orderNumber) throws Exception {
+        MerchantLeshuaDTO merchantLeshuaDTO = converParameter(params, request);
+        Map<String, String> reqMap = new HashMap<>(16);
+        reqMap.put("service", "get_tdcode");
+        reqMap.put("pay_way", merchantLeshuaDTO.getPayWay());
+        reqMap.put("amount", merchantLeshuaDTO.getComsumeMoney() * 100 + "");
+        reqMap.put("merchant_id", merchantLeshuaDTO.getLeshuaMchId());
+        reqMap.put("third_order_id", orderNumber);
+        Map<String, Object> result = new HashMap<>();
+        reqMap.put("jspay_flag", "2");
+        reqMap.put("notify_url", URLEncoder.encode(ParametersUtil.domain + "/wap/notify/leshuaCallBack", "utf-8"));
+        reqMap.put("jump_url", URLEncoder.encode(ParametersUtil.domain + "/wap/merchant/jumpUrl?leshuaMchId="
+                + merchantLeshuaDTO.getLeshuaMchId() + "&orderNumber=" + orderNumber, "utf-8"));
+        reqMap.put("client_ip", merchantLeshuaDTO.getIp());
+        reqMap.put("body", StringUtil.isNotEmpty(store.getStoreName()) ? store.getStoreName():"leshuaPay");
+        reqMap.put("nonce_str", StringUtil.genRandomNum(32));
+        try {
+            String apKey = "60E3F31EDEC8061C33721737B36FA86D";
+            System.out.println("reqMap===========================" + JSONObject.toJSONString(reqMap));
+            String requestPay = requestPay(reqMap, apKey, true);
+            System.out.println("requestPay===========================" + requestPay);
+            Map<String, Object> mapLeshua = XmlUtil.toMapLeshua(requestPay);
+            // 判断商户被冻结等情况
+            if (mapLeshua.get("result_code") != null && !"0".equals(mapLeshua.get("result_code").toString())) {
+                result.put("code", "0");
+                result.put("msg", mapLeshua.get("error_msg"));
+                return result;
+            }
+            result.put("code","1");
+            result.put("msg","下单成功");
+            result.put("data",mapLeshua);
+            return result;
+        } catch (Exception e) {
+            e.printStackTrace();
+            result.put("code", "0");
+            result.put("msg", "系统繁忙，请稍后再试");
+            return result;
+        }
+    }
+
+    public List<ActivityConsumReturn> comsumeMoneyByDesc(List<ActivityConsumReturn> list) {
+        list.sort((o1, o2) -> (int) (o2.getComsumeMoney() - o1.getComsumeMoney()));
+        return list;
+    }
+
+
+    @Override
+    public Map<String, Object> leshuaReturn(MerchantOrderVO queryMerchantOrder, String leshuaMchId) {
+        Map<String,Object> result = new HashMap<>(6);
+        Map<String, String> reqMap = new HashMap<>(16);
+        String merchant_refund_id = StringUtil.getBillno();
+        reqMap.put("service", "unified_refund");
+        reqMap.put("merchant_id", leshuaMchId);
+        reqMap.put("third_order_id", queryMerchantOrder.getOrderNumber());
+        reqMap.put("refund_amount", queryMerchantOrder.getConsumeFee() * 100 + "");
+        reqMap.put("merchant_refund_id", merchant_refund_id);// 退款随机字符 在查询退款的时候需要用到
+        reqMap.put("nonce_str", StringUtil.genRandomNum(32));
+        reqMap.put("notify_url", systemConfigService.querySystemConfigValue("LeshuaRefundBack"));
+
+        String requestPay;
+        try {
+            requestPay = requestPay(reqMap, "60E3F31EDEC8061C33721737B36FA86D", true);
+            Map<String, Object> map = XmlUtil.toMapLeshua(requestPay);
+            String resp_code = (String) map.get("resp_code");
+            if ("0".equals(resp_code)) {
+                // 0表示通信成功
+                String result_code = (String) map.get("result_code");
+                if ("0".equals(result_code)) {
+                    // 0表示业务成功
+                    Date refundTime = DateUtils.parse(map.get("refund_time").toString(), "yyyy-MM-dd HH:mm:ss");
+                    result.put("code","1");
+                    result.put("refundTime",refundTime);
+                    result.put("status","2");
+                    result.put("msg","退款成功");
+                    result.put("refundNo",merchant_refund_id);
+                    return result;
+//                    merchantOrderService.getProfit(queryMerchantOrder);
+//                    Date refundTime = DateUtils.parse(map.get("refund_time").toString(), "yyyy-MM-dd HH:mm:ss");
+//                    queryMerchantOrder.setUpdateTime(refundTime);
+//                    queryMerchantOrder.setStatus("2");
+//                    return ResultGenerator.genSuccessResult("退款成功");
+                } else {
+                    result.put("code","0");
+                    result.put("status","3");
+                    result.put("msg",(String) map.get("error_msg"));
+                    return result;
+                }
+            } else {
+                // 0表示业务成功
+                result.put("code","0");
+                result.put("status","3");
+                result.put("msg","退款失败");
+                return result;
+            }
+        } catch (Exception e) {
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            result.put("code","0");
+            result.put("status","3");
+            result.put("msg","退款失败");
+            return result;
+        }
+//        finally {
+////            queryMerchantOrder.setId(null);
+////            queryMerchantOrder.setLeshuaMerchantRefundId(merchant_refund_id);
+////            queryMerchantOrder.setUpdateTime(new Date());
+////            merchantOrderService.saveMerchantOrder(queryMerchantOrder);
+//        }
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/leshuaMakeMoney/LeshuaMakeMoneyService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/leshuaMakeMoney/LeshuaMakeMoneyService.java
new file mode 100644
index 0000000..8f1b26d
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/leshuaMakeMoney/LeshuaMakeMoneyService.java
@@ -0,0 +1,23 @@
+package cn.pluss.platform.leshuaMakeMoney;
+
+import java.util.List;
+import java.util.Map;
+import cn.pluss.platform.entity.LeshuaMakeMoney;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+public interface LeshuaMakeMoneyService extends IService<LeshuaMakeMoney> {
+
+    LeshuaMakeMoney queryLeshuaMakeMoney(LeshuaMakeMoney leshuaMakeMoney);
+
+    void saveLeshuaMakeMoney(LeshuaMakeMoney leshuaMakeMoney);
+
+    void updateLeshuaMakeMoney(LeshuaMakeMoney leshuaMakeMoney);
+
+    void deleteLeshuaMakeMoney(LeshuaMakeMoney leshuaMakeMoney);
+
+    List<LeshuaMakeMoney> queryLeshuaMakeMoneyPage(Map map);
+
+    Integer queryLeshuaMakeMoneyPageCount(Map map);
+
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/leshuaMakeMoney/impl/LeshuaMakeMoneyServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/leshuaMakeMoney/impl/LeshuaMakeMoneyServiceImpl.java
new file mode 100644
index 0000000..4a31ee8
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/leshuaMakeMoney/impl/LeshuaMakeMoneyServiceImpl.java
@@ -0,0 +1,49 @@
+package cn.pluss.platform.leshuaMakeMoney.impl;
+
+import cn.pluss.platform.entity.LeshuaMakeMoney;
+import cn.pluss.platform.leshuaMakeMoney.LeshuaMakeMoneyService;
+import cn.pluss.platform.mapper.LeshuaMakeMoneyMapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Map;
+
+@Transactional
+@Service("leshuaMakeMoneyService")
+public class LeshuaMakeMoneyServiceImpl extends ServiceImpl<LeshuaMakeMoneyMapper, LeshuaMakeMoney> implements LeshuaMakeMoneyService {
+
+    @Override
+    public LeshuaMakeMoney queryLeshuaMakeMoney(LeshuaMakeMoney leshuaMakeMoney) {
+        return baseMapper.selectOne(new QueryWrapper<>(leshuaMakeMoney));
+    }
+
+    @Override
+    public void saveLeshuaMakeMoney(LeshuaMakeMoney leshuaMakeMoney) {
+        baseMapper.insert(leshuaMakeMoney);
+    }
+
+    @Override
+    public void updateLeshuaMakeMoney(LeshuaMakeMoney leshuaMakeMoney) {
+        baseMapper.updateById(leshuaMakeMoney);
+    }
+
+    @Override
+    public void deleteLeshuaMakeMoney(LeshuaMakeMoney leshuaMakeMoney) {
+        baseMapper.deleteById(leshuaMakeMoney.getId());
+    }
+
+    @Override
+    public List<LeshuaMakeMoney> queryLeshuaMakeMoneyPage(Map map) {
+        return baseMapper.queryLeshuaMakeMoneyPage(map);
+    }
+
+    @Override
+    public Integer queryLeshuaMakeMoneyPageCount(Map map) {
+        return baseMapper.queryLeshuaMakeMoneyPageCount(map);
+    }
+
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/level/ExtraLevelBenefitService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/level/ExtraLevelBenefitService.java
new file mode 100644
index 0000000..4077678
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/level/ExtraLevelBenefitService.java
@@ -0,0 +1,22 @@
+package cn.pluss.platform.level;
+
+import cn.pluss.platform.entity.ExtraLevelBenefit;
+import cn.pluss.platform.mapper.ExtraLevelBenefitMapper;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 用户变更下级等级数据表 服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-02-08
+ */
+public interface ExtraLevelBenefitService extends IService<ExtraLevelBenefit> {
+
+    default ExtraLevelBenefit getByUserId(Serializable userId){
+        return ((ExtraLevelBenefitMapper)getBaseMapper()).getByUserId(userId);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/level/LevelOperateRecordService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/level/LevelOperateRecordService.java
new file mode 100644
index 0000000..6d226fa
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/level/LevelOperateRecordService.java
@@ -0,0 +1,52 @@
+package cn.pluss.platform.level;
+
+import cn.pluss.platform.entity.LevelOperateRecord;
+import cn.pluss.platform.entity.UserApp;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 等级变更记录表 服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-02-08
+ */
+public interface LevelOperateRecordService extends IService<LevelOperateRecord> {
+
+    /**
+     * 获取等级调整边界
+     * @param userId 用户id
+     * @return  maxLevel, minLevel
+     */
+    Map<String, Object> apiLevelBound(String userId);
+
+    /**
+     * 用户操作下级等级权益的数据
+     */
+    Map<String, Object> apiLevelBenefitData();
+
+    /**
+     * 用户操作下级等级权益的数据
+     * @param ua    用户id
+     */
+    Map<String, Object> levelData(UserApp ua);
+
+    /**
+     * 设置
+     * @param userId    被修改的用户id
+     * @param level     设置等级
+     */
+    void apiChangeLevel(long userId, String level);
+
+    /**
+     * 设置等级
+     * @param operator  操作人用户id
+     * @param userId    被修改的用户id
+     * @param level     设置等级
+     * @param flag      消耗名额标识
+     */
+    void changeLevel(long operator, long userId, String level, String flag);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/level/LevelService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/level/LevelService.java
new file mode 100644
index 0000000..ebfdd22
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/level/LevelService.java
@@ -0,0 +1,25 @@
+package cn.pluss.platform.level;
+
+import java.util.List;
+import java.util.Map;
+import cn.pluss.platform.entity.Level;
+import cn.pluss.platform.mapper.LevelMapper;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+public interface LevelService extends IService<Level> {
+
+    Level queryLevel(Level level);
+
+    List<Level> queryLevelList(Level level);
+
+    void saveLevel(Level level);
+
+    void updateLevel(Level level);
+
+    void deleteLevel(Level level);
+
+    List<Level> queryLevelPage(Map map);
+
+    Integer queryLevelPageCount(Map map);
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/level/impl/ExtraLevelBenefitServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/level/impl/ExtraLevelBenefitServiceImpl.java
new file mode 100644
index 0000000..2ee9981
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/level/impl/ExtraLevelBenefitServiceImpl.java
@@ -0,0 +1,20 @@
+package cn.pluss.platform.level.impl;
+
+import cn.pluss.platform.entity.ExtraLevelBenefit;
+import cn.pluss.platform.level.ExtraLevelBenefitService;
+import cn.pluss.platform.mapper.ExtraLevelBenefitMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 用户变更下级等级数据表 服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-02-08
+ */
+@Service
+public class ExtraLevelBenefitServiceImpl extends ServiceImpl<ExtraLevelBenefitMapper, ExtraLevelBenefit> implements ExtraLevelBenefitService {
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/level/impl/LevelOperateRecordServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/level/impl/LevelOperateRecordServiceImpl.java
new file mode 100644
index 0000000..c3b430a
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/level/impl/LevelOperateRecordServiceImpl.java
@@ -0,0 +1,234 @@
+package cn.pluss.platform.level.impl;
+
+import cn.hutool.core.date.DateUtil;
+import cn.pluss.platform.dict.DictService;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.jft.JftAuditService;
+import cn.pluss.platform.level.ExtraLevelBenefitService;
+import cn.pluss.platform.level.LevelOperateRecordService;
+import cn.pluss.platform.mapper.LevelOperateRecordMapper;
+import cn.pluss.platform.user.UserLevelService;
+import cn.pluss.platform.userApp.UserAppService;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * <p>
+ * 等级变更记录表 服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-02-08
+ */
+@Service
+public class LevelOperateRecordServiceImpl extends ServiceImpl<LevelOperateRecordMapper, LevelOperateRecord> implements LevelOperateRecordService {
+
+    @Autowired
+    private DictService dictService;
+
+    @Autowired
+    private UserAppService uaService;
+
+    @Autowired
+    private ExtraLevelBenefitService extraLevelBenefitService;
+
+    @Autowired
+    private JftAuditService jftAuditService;
+
+    @Autowired
+    private UserLevelService ulService;
+
+    @Override
+    public Map<String, Object> apiLevelBound(String userId) {
+        LambdaQueryWrapper<UserApp> qWrapper = Wrappers.lambdaQuery();
+        qWrapper.eq(UserApp::getUserId, userId);
+        UserApp chosenUa = uaService.getOne(qWrapper);
+        UserApp tokenUa = uaService.queryUserAppByToken();
+
+        String minLevel = (Integer.parseInt(chosenUa.getLevelCode().replace("LV", "")) + 1) + "";
+        int maxLevelInt = Integer.parseInt(tokenUa.getLevelCode().replace("LV", "")) - 1;
+        if (maxLevelInt == 9) {
+            maxLevelInt = 8;
+        }
+
+        String maxLevel = maxLevelInt + "";
+
+        Map<String, Object> result = new HashMap<>(4);
+        result.put("minLevel", minLevel);
+        result.put("maxLevel", maxLevel);
+
+        return result;
+    }
+
+    @Override
+    public Map<String, Object> apiLevelBenefitData() {
+        UserApp tokenUa = uaService.queryUserAppByToken();
+        return levelData(tokenUa);
+    }
+
+    @Override
+    public Map<String, Object> levelData(UserApp ua) {
+        Dict dictCondition = new Dict();
+        dictCondition.setName(ua.getLevelCode());
+        Dict levelDict = dictService.getByCode("TEAM_LEVEL_COUNT", dictCondition);
+
+        Map<String, Object> result = new HashMap<>();
+        if (levelDict == null) {
+            result.put("levelMax", "0");
+            result.put("levelLeft", "0");
+            result.put("extraMax", "0");
+            result.put("extraLeft", "0");
+
+            return result;
+        }
+
+        result.put("levelMax", levelDict.getValue());
+
+        // 查询当月已经修改等级的个数
+        String currentMonth = DateUtil.format(new Date(), "yyyy-MM");
+        QueryWrapper<LevelOperateRecord> qWrapper3 = new QueryWrapper<>();
+        qWrapper3.eq("operator", ua.getUserId());
+        qWrapper3.eq("createMonth", currentMonth);
+        qWrapper3.select("DISTINCT userId");
+        Integer count = baseMapper.selectCount(qWrapper3);
+
+        if (count > Integer.parseInt(levelDict.getValue())) {
+            result.put("levelLeft", "0");
+        } else {
+            result.put("levelLeft", (Integer.parseInt(levelDict.getValue()) - count) + "");
+        }
+
+        LambdaQueryWrapper<ExtraLevelBenefit> qWrapper2 = new LambdaQueryWrapper<>();
+        qWrapper2.eq(ExtraLevelBenefit::getUserId, ua.getUserId());
+        ExtraLevelBenefit one = extraLevelBenefitService.getOne(qWrapper2);
+
+        if (one == null) {
+            result.put("extraMax", "0");
+            result.put("extraLeft", "0");
+        } else {
+            result.put("extraMax", one.getMaxCount() + "");
+            result.put("extraLeft", (one.getMaxCount() - one.getUseCount()) + "");
+        }
+
+        return result;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void apiChangeLevel(long userId, String level) {
+        UserApp tokenUa = uaService.queryUserAppByToken();
+        LambdaQueryWrapper<UserApp> qWrapper = new LambdaQueryWrapper<>();
+        qWrapper.eq(UserApp::getUserId, userId);
+        UserApp ua = uaService.getOne(qWrapper);
+
+        if (!Objects.equals(ua.getParentId(), tokenUa.getUserId())) {
+            throw new MsgException("拒绝访问");
+        }
+
+        if (!Objects.equals(ua.getStatus(), 3) || !Objects.equals(ua.getBankStatus(), 3)) {
+            throw new MsgException("请该用户实名再进行操作");
+        }
+
+        if (level == null || (!level.startsWith("LV") && !level.startsWith("VIP"))) {
+            throw new MsgException("等级参数格式错误");
+        }
+
+        String minLevelStr = (Integer.parseInt(ua.getLevelCode().replace("LV", "")) + 1) + "";
+        int maxLevelInt = Integer.parseInt(tokenUa.getLevelCode().replace("LV", "")) - 1;
+        if (maxLevelInt == 9) {
+            maxLevelInt = 8;
+        }
+
+        String maxLevelStr = maxLevelInt + "";
+        String newLevelStr = level.replaceAll("LV|VIP", "");
+
+        if (Integer.parseInt(maxLevelStr) < Integer.parseInt(newLevelStr)
+                || Integer.parseInt(newLevelStr) < Integer.parseInt(minLevelStr)) {
+            throw new MsgException("等级应设置在VIP" + minLevelStr + "到VIP" + maxLevelStr + "之间");
+        }
+
+        LambdaQueryWrapper<LevelOperateRecord> qWrapper4 = new LambdaQueryWrapper<>();
+        qWrapper4.eq(LevelOperateRecord::getUserId, userId).eq(LevelOperateRecord::getOperator, tokenUa.getUserId());
+        qWrapper4.eq(LevelOperateRecord::getFlag, "1");
+        LevelOperateRecord currentHistoryOperateRecord = baseMapper.selectOne(qWrapper4);
+
+        // 如果当月没有修改过，需要检查是否有剩余名额
+        if (currentHistoryOperateRecord == null) {
+            // 查询当月已经修改等级的个数
+            String currentMonth = DateUtil.format(new Date(), "yyyy-MM");
+            LambdaQueryWrapper<LevelOperateRecord> qWrapper3 = new LambdaQueryWrapper<>();
+            qWrapper3.eq(LevelOperateRecord::getOperator, tokenUa.getUserId());
+            qWrapper3.eq(LevelOperateRecord::getCreateMonth, currentMonth);
+            qWrapper3.eq(LevelOperateRecord::getFlag, "1");
+            Integer count = baseMapper.selectCount(qWrapper3);
+
+            Dict dictCondition = new Dict();
+            dictCondition.setName(tokenUa.getLevelCode().replace("VIP", "LV"));
+            Dict levelDict = dictService.getByCode("TEAM_LEVEL_COUNT", dictCondition);
+
+            int monthCount = Integer.parseInt(levelDict.getValue());
+
+            // 如果月免费个数已经消耗完毕
+            if (monthCount < count) {
+                LambdaQueryWrapper<ExtraLevelBenefit> qWrapper2 = new LambdaQueryWrapper<>();
+                qWrapper2.eq(ExtraLevelBenefit::getUserId, tokenUa.getUserId());
+                ExtraLevelBenefit one = extraLevelBenefitService.getOne(qWrapper2);
+
+                if (one == null) {
+                    throw new MsgException("当前没有修改下级等级额度");
+                } else {
+                    if (one.getMaxCount() <= one.getUseCount()) {
+                        throw new MsgException("当前没有修改下级等级额度");
+                    }
+                }
+
+                one.setUseCount(one.getUseCount() + 1);
+                extraLevelBenefitService.updateById(one);
+            }
+
+            changeLevel(tokenUa.getUserId(), ua.getUserId(), level, "1");
+        } else {
+            changeLevel(tokenUa.getUserId(), ua.getUserId(), level, "0");
+        }
+
+
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void changeLevel(long operator, long userId, String level, String flag) {
+        LevelOperateRecord levelOperateRecord = new LevelOperateRecord();
+        levelOperateRecord.setLevelCode(level);
+        levelOperateRecord.setOperator(operator);
+        levelOperateRecord.setUserId(userId);
+        levelOperateRecord.setFlag(flag);
+        baseMapper.insert(levelOperateRecord);
+
+        LambdaQueryWrapper<UserApp> qWrapper = Wrappers.lambdaQuery();
+        qWrapper.eq(UserApp::getUserId, userId);
+        UserApp one = uaService.getOne(qWrapper);
+        if ("LL".equals(one.getUserType())) {
+            throw new MsgException("该商户类型禁止该操作");
+        }
+
+        String newLevel = level.replace("VIP", "LV");
+        one.setLevelCode(newLevel);
+        uaService.updateById(one);
+
+        UserLevel userLevel = ulService.getLevelInfoByRoleLevel(one.getUserType(), newLevel);
+        if (userLevel != null) {
+            jftAuditService.changeRate(userId, userLevel.getJftRate());
+        }
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/level/impl/LevelServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/level/impl/LevelServiceImpl.java
new file mode 100644
index 0000000..2d560b2
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/level/impl/LevelServiceImpl.java
@@ -0,0 +1,59 @@
+package cn.pluss.platform.level.impl;
+
+import java.util.List;
+import java.util.Map;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.transaction.annotation.Transactional;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import cn.pluss.platform.entity.Level;
+import cn.pluss.platform.level.LevelService;
+import cn.pluss.platform.mapper.LevelMapper;
+
+@Transactional
+@RequiredArgsConstructor
+@Slf4j
+@Service("levelService")
+public class LevelServiceImpl extends ServiceImpl<LevelMapper, Level> implements LevelService {
+
+    @Override
+    public Level queryLevel(Level level) {
+        return baseMapper.queryLevel(level);
+    }
+
+    @Override
+    public List<Level> queryLevelList(Level level) {
+        return baseMapper.queryLevelList(level);
+    }
+
+    @Override
+    public void saveLevel(Level level) {
+        baseMapper.saveLevel(level);
+    }
+
+    @Override
+    public void updateLevel(Level level) {
+        baseMapper.updateLevel(level);
+    }
+
+    @Override
+    public void deleteLevel(Level level) {
+        baseMapper.deleteLevel(level);
+    }
+
+    @Override
+    public List<Level> queryLevelPage(Map map) {
+        return baseMapper.queryLevelPage(map);
+    }
+
+    @Override
+    public Integer queryLevelPageCount(Map map) {
+        return baseMapper.queryLevelPageCount(map);
+    }
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/life/LifeApiHandler.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/life/LifeApiHandler.java
new file mode 100644
index 0000000..0e05738
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/life/LifeApiHandler.java
@@ -0,0 +1,89 @@
+package cn.pluss.platform.life;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.constants.Constant;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantMemberCode.MerchantMemberCodeService;
+import cn.pluss.platform.merchantMenber.MerchantMenberService;
+import cn.pluss.platform.merchantStore.MerchantStoreService;
+import cn.pluss.platform.systemConfig.SystemConfigService;
+import cn.pluss.platform.util.StringUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+/**
+ * TODO
+ * 生活圈接口相关处理handler
+ * @author crystal
+ * @date 2022/5/13 17:02
+ */
+@Slf4j
+@Component
+public class LifeApiHandler {
+
+    @Resource
+    private SystemConfigService systemConfigService;
+
+    @Resource
+    private MerchantStoreService merchantStoreService;
+
+    @Resource
+    private MerchantMenberService merchantMenberService;
+
+    @Resource
+    private MerchantMemberCodeService merchantMemberCodeService;
+
+    @Resource
+    private MerchantBaseInfoService merchantBaseInfoService;
+
+    private static String LIFE_MEMBER_CARD_SYSTEM_KEY = "life_member_card_refresh_time";
+
+    /**
+     * 获取会员卡默认的过期时间
+     * @return
+     */
+    public String getCardExpire() {
+        String value = systemConfigService.querySystemConfigValue(LIFE_MEMBER_CARD_SYSTEM_KEY);
+        if(StringUtil.isEmpty(value)){
+            value = Constant.DEFAULT_LIFE_MEMBER_CARD_REFRESH_TIME.toString();
+        }
+        return value;
+    }
+
+    /**
+     * 刷新会员卡code
+     * @param code
+     * @return
+     */
+    public Result<Object> refreshCardCode(MerchantMemberCode code) {
+        code.check();
+        MerchantStore store = merchantStoreService.getById(code.getStoreId());
+        MsgException.checkNull(store,"门店信息有误！");
+        MerchantMenber menber = merchantMenberService.getByCardNo(code.getCardNo());
+        MsgException.checkNull(menber,"会员卡号异常！");
+        MsgException.check(!menber.getMerchantCode().equals(store.getMerchantCode()),"当前会员卡不属于该门店的会员！");
+        merchantMemberCodeService.removeByCardNo(code.getCardNo());
+        String cardExpire = getCardExpire();
+        code.conver(menber,Integer.valueOf(cardExpire));
+        merchantMemberCodeService.save(code);
+        return ResultGenerator.genSuccessResult("刷新成功",code);
+    }
+
+    /**
+     * 获取商户信息
+     * @param param
+     * @return
+     */
+    public Result<Object> getMerchantInfo(LifeParam param) {
+        param.check();
+        MerchantStore store = merchantStoreService.getById(param.getSyb_m_id());
+        MsgException.checkNull(store,"门店信息异常");
+        MerchantBaseInfo merchant = merchantBaseInfoService.getMerchantBaseInfoByMerchantCode(store.getMerchantCode());
+        return ResultGenerator.genSuccessResult("获取成功",merchant);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/logist/LogistCallbackHandler.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/logist/LogistCallbackHandler.java
new file mode 100644
index 0000000..272a9a3
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/logist/LogistCallbackHandler.java
@@ -0,0 +1,68 @@
+package cn.pluss.platform.logist;
+
+import cn.pluss.platform.constants.Constant;
+import cn.pluss.platform.device.MercOrderExpressDetailService;
+import cn.pluss.platform.device.MercOrderExpressService;
+import cn.pluss.platform.entity.MercOrderExpress;
+import cn.pluss.platform.entity.MercOrderExpressDetail;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.util.XmlUtil;
+import cn.pluss.platform.yt.*;
+import cn.pluss.platform.yt.constant.YtConstant;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
+
+/**
+ * TODO
+ * 物流快递回调处理业务类
+ * @author crystal
+ * @date 2022/3/24 14:39
+ */
+@Slf4j
+@Component
+public class LogistCallbackHandler {
+
+    @Resource
+    private YtLogistHandler ytLogistHandler;
+
+    @Resource
+    private MercOrderExpressService mercOrderExpressService;
+
+    @Resource
+    private MercOrderExpressDetailService mercOrderExpressDetailService;
+    /**
+     * 物流回调处理
+     * @param entity
+     * @return
+     */
+    public String execute(YtLogisticsEntity entity) {
+        log.info("【圆通物流回调】回调参数:{}", JSON.toJSONString(entity));
+        String reqData = entity.getLogistics_interface();
+        YtUpdateInfo data = ytLogistHandler.resolvXml(reqData);
+        try {
+            log.info("[圆通物流回调]解析业务参数为:{}",JSON.toJSONString(data));
+            String logistNo = data.getTxLogisticID();
+            MsgException.checkBlank(logistNo,"上送物流单号为空！");
+            MercOrderExpress express = mercOrderExpressService.getByLogistNo(logistNo);
+            MsgException.checkNull(express,"该物流单号未匹配到对应的订单！");
+            MercOrderExpressDetail detail = new MercOrderExpressDetail(data,express);
+            mercOrderExpressDetailService.save(detail);
+            String status = YtStatusEnum.getValueByCode(data.getInfoContent());
+            if(!express.getStatus().equals(status)){
+                express.setStatus(status);
+                mercOrderExpressService.updateById(express);
+            }
+            YtLogisticsResponse resp = YtLogisticsResponse.build(data.getLogisticProviderID(), data.getTxLogisticID(), true, null);
+            return XmlUtil.createXml(YtConstant.YT_RESPONSE_XML_ELEMENT, JSONObject.parseObject(JSON.toJSONString(resp), Map.class),StandardCharsets.UTF_8.toString());
+        }catch (Exception e){
+            YtLogisticsResponse resp = YtLogisticsResponse.build(data.getLogisticProviderID(), data.getTxLogisticID(), false, e.getMessage());
+            return XmlUtil.createXml(YtConstant.YT_RESPONSE_XML_ELEMENT, JSONObject.parseObject(JSON.toJSONString(resp), Map.class),StandardCharsets.UTF_8.toString());
+        }
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/mcc/MccInfoSortService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/mcc/MccInfoSortService.java
new file mode 100644
index 0000000..589956d
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/mcc/MccInfoSortService.java
@@ -0,0 +1,31 @@
+package cn.pluss.platform.mcc;
+
+import cn.pluss.platform.entity.MccInfoSort;
+import cn.pluss.platform.exception.MsgException;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * mcc行业对应表，此处的mcc主要还是以随行付的为主，不同通道有差异的通过mcc_reflect表做映射 服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-06-23
+ */
+public interface MccInfoSortService extends IService<MccInfoSort> {
+
+    /**
+     * 根据mccCode获取对应的信息
+     * @param mccCode   mccCode
+     * @return  记录信息
+     */
+    default MccInfoSort getByMcc(String mccCode) {
+        MccInfoSort entity = getOne(new QueryWrapper<MccInfoSort>().eq("mccCode", mccCode).last("limit 1"));
+        if (entity == null) {
+            throw new MsgException("该MCC不存在，请修改MCC");
+        }
+
+        return entity;
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/mcc/MccInfoYsService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/mcc/MccInfoYsService.java
new file mode 100644
index 0000000..11fec60
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/mcc/MccInfoYsService.java
@@ -0,0 +1,22 @@
+package cn.pluss.platform.mcc;
+
+import cn.pluss.platform.entity.MccInfoYs;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-07-20
+ */
+public interface MccInfoYsService extends IService<MccInfoYs> {
+
+    /**
+     * 校验银盛的mcc
+     * @param mccCode       mcc编码
+     * @param merchantType  商户类型
+     */
+    void checkMcc(String mccCode, String merchantType);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/mcc/MccReflectService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/mcc/MccReflectService.java
new file mode 100644
index 0000000..64351b4
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/mcc/MccReflectService.java
@@ -0,0 +1,41 @@
+package cn.pluss.platform.mcc;
+
+import cn.pluss.platform.entity.MccReflect;
+import cn.pluss.platform.vo.MccReflectVO;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 主通道(随行付)与其他通道之间mcc的关联表 服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-02-23
+ */
+public interface MccReflectService extends IService<MccReflect> {
+
+    /**
+     * 获取瑞银信的mcc
+     * @param mcc 随行付的mcc，目前以随行付的mcc为主
+     * @return 瑞银信mcc关联信息
+     */
+    MccReflect getRyxMccReflect(String mcc);
+
+    /**
+     * 获取瑞银信的mcc
+     * @param mcc 随行付的mcc，目前以随行付的mcc为主
+     * @return 瑞银信mcc关联信息
+     */
+    MccReflect getYsMccReflect(String mcc);
+
+    /**
+     *
+     * @param page      分页数据
+     * @param entity  查询参数
+     * @return
+     */
+    IPage<MccReflectVO> pageMccReflectVO(IPage<MccReflectVO> page, @Param(Constants.WRAPPER) MccReflect entity);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/mcc/impl/MccInfoSortServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/mcc/impl/MccInfoSortServiceImpl.java
new file mode 100644
index 0000000..852b5d6
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/mcc/impl/MccInfoSortServiceImpl.java
@@ -0,0 +1,19 @@
+package cn.pluss.platform.mcc.impl;
+
+import cn.pluss.platform.entity.MccInfoSort;
+import cn.pluss.platform.mapper.MccInfoSortMapper;
+import cn.pluss.platform.mcc.MccInfoSortService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * mcc行业对应表，此处的mcc主要还是以随行付的为主，不同通道有差异的通过mcc_reflect表做映射 服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-06-23
+ */
+@Service
+public class MccInfoSortServiceImpl extends ServiceImpl<MccInfoSortMapper, MccInfoSort> implements MccInfoSortService {
+}
\ No newline at end of file
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/mcc/impl/MccInfoYsServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/mcc/impl/MccInfoYsServiceImpl.java
new file mode 100644
index 0000000..05aa7b7
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/mcc/impl/MccInfoYsServiceImpl.java
@@ -0,0 +1,27 @@
+package cn.pluss.platform.mcc.impl;
+
+import cn.pluss.platform.entity.MccInfoYs;
+import cn.pluss.platform.mapper.MccInfoYsMapper;
+import cn.pluss.platform.mcc.MccInfoYsService;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.val;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-07-20
+ */
+@Service
+public class MccInfoYsServiceImpl extends ServiceImpl<MccInfoYsMapper, MccInfoYs> implements MccInfoYsService {
+
+    @Override
+    public void checkMcc(String mccCode, String merchantType) {
+        val qWrapper = new LambdaQueryWrapper<MccInfoYs>()
+                .eq(MccInfoYs::getMccCode, mccCode);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/mcc/impl/MccReflectServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/mcc/impl/MccReflectServiceImpl.java
new file mode 100644
index 0000000..7d5860d
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/mcc/impl/MccReflectServiceImpl.java
@@ -0,0 +1,75 @@
+package cn.pluss.platform.mcc.impl;
+
+import cn.pluss.platform.entity.MccReflect;
+import cn.pluss.platform.entity.MerchantChannel;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.MccReflectMapper;
+import cn.pluss.platform.mcc.MccReflectService;
+import cn.pluss.platform.merchantChannel.MerchantChannelService;
+import cn.pluss.platform.vo.MccReflectVO;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.Setter;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 主通道(随行付)与其他通道之间mcc的关联表 服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-02-23
+ */
+@Service
+public class MccReflectServiceImpl extends ServiceImpl<MccReflectMapper, MccReflect> implements MccReflectService {
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantChannelService channelService;
+
+    @Override
+    public MccReflect getRyxMccReflect(String mcc) {
+        MerchantChannel merchantChannel = new MerchantChannel();
+        merchantChannel.setChannelCode("RYX");
+        merchantChannel = channelService.getOne(new QueryWrapper<>(merchantChannel));
+
+        MsgException.checkNull(merchantChannel, "通道信息缺失");
+
+        MccReflect mccReflect = new MccReflect();
+        mccReflect.setChannelId(merchantChannel.getId());
+        mccReflect.setStandardMccCode(mcc);
+        mccReflect = getOne(new QueryWrapper<>(mccReflect));
+
+        if (mccReflect == null || StringUtils.isEmpty(mccReflect.getMccCode())) {
+            MsgException.throwException("通道MCC映射信息缺失");
+        }
+        return mccReflect;
+    }
+
+    @Override
+    public MccReflect getYsMccReflect(String mcc) {
+        MerchantChannel merchantChannel = new MerchantChannel();
+        merchantChannel.setChannelCode("YS");
+        merchantChannel = channelService.getOne(new QueryWrapper<>(merchantChannel));
+
+        MsgException.checkNull(merchantChannel, "通道信息缺失");
+
+        MccReflect mccReflect = new MccReflect();
+        mccReflect.setChannelId(merchantChannel.getId());
+        mccReflect.setStandardMccCode(mcc);
+        mccReflect = getOne(new QueryWrapper<>(mccReflect));
+
+        if (mccReflect == null || StringUtils.isEmpty(mccReflect.getMccCode())) {
+            MsgException.throwException("通道MCC映射信息缺失");
+        }
+
+        return mccReflect;
+    }
+
+    @Override
+    public IPage<MccReflectVO> pageMccReflectVO(IPage<MccReflectVO> page, MccReflect entity) {
+        return baseMapper.selectPageMccReflectVO(page, entity);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/memberOrder/MemberOrderService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/memberOrder/MemberOrderService.java
new file mode 100644
index 0000000..2776ff1
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/memberOrder/MemberOrderService.java
@@ -0,0 +1,50 @@
+package cn.pluss.platform.memberOrder;
+
+import java.util.List;
+import java.util.Map;
+
+import cn.pluss.platform.entity.MemberOrder;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+public interface MemberOrderService extends IService<MemberOrder> {
+
+    MemberOrder queryMemberOrder(MemberOrder memberOrder);
+
+    List<MemberOrder> queryMemberOrderList(MemberOrder memberOrder);
+
+    void saveMemberOrder(MemberOrder memberOrder);
+
+    void updateMemberOrder(MemberOrder memberOrder);
+
+    void deleteMemberOrder(MemberOrder memberOrder);
+
+    List<MemberOrder> queryMemberOrderPage(Map map);
+
+    Integer queryMemberOrderPageCount(Map map);
+
+    Double queryMemberOrderTotalOrderFeeByTime(Map map);
+
+    Integer queryMemberOrderPageCountByTime(Map map);
+
+    /**
+     * 根据订单类型统计订单数量
+     * @param map
+     * @return
+     */
+    Map<String, Map<String, Object>> queryMemberOrderCountByTimeGroupData(Map map);
+
+    List<MemberOrder> queryMemberOrderPageByTime(Map<String, Object> queryMap);
+
+    /**
+     * sumMemberOrderMoney:(统计商家的会员消费金额  充值金额). <br/>
+     *
+     * @param merchantCode 商家code
+     * @param orderType    0会员消费  1会员充值
+     * @return
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    Double sumMemberOrderMoney(Map<String, Object> map);
+
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/memberOrder/impl/MemberOrderServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/memberOrder/impl/MemberOrderServiceImpl.java
new file mode 100644
index 0000000..68d1b4c
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/memberOrder/impl/MemberOrderServiceImpl.java
@@ -0,0 +1,77 @@
+package cn.pluss.platform.memberOrder.impl;
+
+import cn.pluss.platform.entity.MemberOrder;
+import cn.pluss.platform.mapper.MemberOrderMapper;
+import cn.pluss.platform.memberOrder.MemberOrderService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+@Service("memberOrderService")
+public class MemberOrderServiceImpl extends ServiceImpl<MemberOrderMapper, MemberOrder> implements MemberOrderService {
+
+    @Override
+    public MemberOrder queryMemberOrder(MemberOrder memberOrder) {
+        return baseMapper.queryMemberOrder(memberOrder);
+    }
+
+    @Override
+    public List<MemberOrder> queryMemberOrderList(MemberOrder memberOrder) {
+        return baseMapper.queryMemberOrderList(memberOrder);
+    }
+
+    @Override
+    public void saveMemberOrder(MemberOrder memberOrder) {
+        baseMapper.insert(memberOrder);
+    }
+
+    @Override
+    public void updateMemberOrder(MemberOrder memberOrder) {
+        baseMapper.updateById(memberOrder);
+    }
+
+    @Override
+    public void deleteMemberOrder(MemberOrder memberOrder) {
+        baseMapper.deleteMemberOrder(memberOrder);
+    }
+
+    @Override
+    public List<MemberOrder> queryMemberOrderPage(Map map) {
+        return baseMapper.queryMemberOrderPage(map);
+    }
+
+    @Override
+    public Integer queryMemberOrderPageCount(Map map) {
+        return baseMapper.queryMemberOrderPageCount(map);
+    }
+
+    @Override
+    public Double queryMemberOrderTotalOrderFeeByTime(Map map) {
+        Double sum = baseMapper.queryMemberOrderTotalOrderFeeByTime(map);
+        return sum == null ? 0 : sum;
+    }
+
+    @Override
+    public Integer queryMemberOrderPageCountByTime(Map map) {
+        return baseMapper.queryMemberOrderPageCountByTime(map);
+    }
+
+    @Override
+    public Map<String, Map<String, Object>> queryMemberOrderCountByTimeGroupData(Map map) {
+        return baseMapper.queryMemberOrderCountByTimeGroupData(map);
+    }
+
+    @Override
+    public List<MemberOrder> queryMemberOrderPageByTime(Map map) {
+        return baseMapper.queryMemberOrderPageByTime(map);
+    }
+
+    @Override
+    public Double sumMemberOrderMoney(Map<String, Object> map) {
+        return baseMapper.sumMemberOrderMoney(map);
+    }
+
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/memberSetting/MemberSettingService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/memberSetting/MemberSettingService.java
new file mode 100644
index 0000000..bc1c29a
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/memberSetting/MemberSettingService.java
@@ -0,0 +1,25 @@
+package cn.pluss.platform.memberSetting;
+
+import java.util.List;
+import java.util.Map;
+import cn.pluss.platform.entity.MemberSetting;
+
+public interface MemberSettingService {
+
+    public MemberSetting queryMemberSetting(MemberSetting memberSetting);
+
+    public List<MemberSetting> queryMemberSettingList(MemberSetting memberSetting);
+
+    public void saveMemberSetting(MemberSetting memberSetting);
+
+    public void updateMemberSetting(MemberSetting memberSetting);
+
+    public void deleteMemberSetting(MemberSetting memberSetting);
+
+    public List<MemberSetting> queryMemberSettingPage(Map map);
+
+    public Integer queryMemberSettingPageCount(Map map);
+
+    public void saveMemberSettingBatch(List<MemberSetting> memberSettingList);
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/memberSetting/impl/MemberSettingServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/memberSetting/impl/MemberSettingServiceImpl.java
new file mode 100644
index 0000000..20535ac
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/memberSetting/impl/MemberSettingServiceImpl.java
@@ -0,0 +1,58 @@
+package cn.pluss.platform.memberSetting.impl;
+
+import java.util.List;
+import java.util.Map;
+import org.springframework.transaction.annotation.Transactional;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import cn.pluss.platform.entity.MemberSetting;
+import cn.pluss.platform.memberSetting.MemberSettingService;
+import cn.pluss.platform.mapper.MemberSettingMapper;
+
+@Transactional
+@Service("memberSettingService")
+public class MemberSettingServiceImpl  implements MemberSettingService{
+
+	 private static final Logger logger = LoggerFactory.getLogger( MemberSettingServiceImpl.class);
+
+
+    @Autowired
+	  private MemberSettingMapper memberSettingMapper;
+
+    @Override
+    public MemberSetting queryMemberSetting(MemberSetting memberSetting){
+        return memberSettingMapper.queryMemberSetting(memberSetting);
+    }
+
+    @Override
+    public List<MemberSetting> queryMemberSettingList(MemberSetting memberSetting){
+        return memberSettingMapper.queryMemberSettingList(memberSetting);
+    }
+    @Override
+    public void saveMemberSetting(MemberSetting memberSetting){
+          memberSettingMapper.saveMemberSetting(memberSetting);
+    }
+    @Override
+    public void updateMemberSetting(MemberSetting memberSetting){
+        memberSettingMapper.updateMemberSetting(memberSetting);
+    }
+    @Override
+    public void deleteMemberSetting(MemberSetting memberSetting){
+        memberSettingMapper.deleteMemberSetting(memberSetting);
+    }
+    @Override
+    public List<MemberSetting> queryMemberSettingPage(Map map){
+        return memberSettingMapper.queryMemberSettingPage(map);
+    }
+    @Override
+    public Integer queryMemberSettingPageCount(Map map){
+        return memberSettingMapper.queryMemberSettingPageCount(map);
+    }
+    @Override
+    public void saveMemberSettingBatch(List<MemberSetting> memberSettingList) {
+         memberSettingMapper.saveMemberSettingBatch(memberSettingList);
+    }
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/menuInfo/MenuInfoService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/menuInfo/MenuInfoService.java
new file mode 100644
index 0000000..7994f1d
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/menuInfo/MenuInfoService.java
@@ -0,0 +1,61 @@
+package cn.pluss.platform.menuInfo;
+
+import cn.pluss.platform.entity.MenuInfo;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.MenuInfoMapper;
+import cn.pluss.platform.shiro.UserService;
+import cn.pluss.platform.util.tree.TreeUtils;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+import java.util.Map;
+
+public interface MenuInfoService extends IService<MenuInfo> {
+
+    List<MenuInfo> getMenuTree(MenuInfo menuInfo);
+
+    List<MenuInfo> getRoleConfigMenuTree(MenuInfo menuInfo, String roleId);
+
+    /**
+     * 清理父节点的check状态
+     * @param result    结果树
+     */
+    default void clear(List<MenuInfo> result) {
+        for (MenuInfo menuInfo : result) {
+            List<MenuInfo> children = menuInfo.getChildren();
+            if (children != null && children.size() > 0) {
+                menuInfo.setChecked(0);
+                clear(children);
+            }
+        }
+    }
+
+    MenuInfo queryMenuInfo(MenuInfo menuInfo);
+
+    default List<MenuInfo> queryMenuInfoList(MenuInfo menuInfo) {
+        return ((MenuInfoMapper) getBaseMapper()).queryMenuInfoList(menuInfo);
+    }
+
+    default List<MenuInfo> queryRoleMenuInfoList(MenuInfo menuInfo, String roleId) {
+        return ((MenuInfoMapper) getBaseMapper()).queryRoleMenuInfoList(menuInfo, roleId);
+    }
+
+    Integer saveMenuInfo(MenuInfo menuInfo);
+
+    void updateMenuInfo(MenuInfo menuInfo);
+
+    void deleteMenuInfo(MenuInfo menuInfo);
+
+    List<MenuInfo> queryMenuInfoPage(Map map);
+
+    Integer queryMenuInfoPageCount(Map map);
+
+    List<MenuInfo> getPermissionNames(String loginName);
+	
+	List<MenuInfo> queryPermitMenuInfoById(Map map);
+	
+	List<MenuInfo> queryMenuInfoListOrderById(MenuInfo menuInfo);
+	
+	List<MenuInfo> queryMenuInfoByRoleId(Map map);
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/menuInfo/impl/MenuInfoServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/menuInfo/impl/MenuInfoServiceImpl.java
new file mode 100644
index 0000000..7940caf
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/menuInfo/impl/MenuInfoServiceImpl.java
@@ -0,0 +1,124 @@
+package cn.pluss.platform.menuInfo.impl;
+
+import cn.pluss.platform.entity.MenuInfo;
+import cn.pluss.platform.entity.UserInfo;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.MenuInfoMapper;
+import cn.pluss.platform.menuInfo.MenuInfoService;
+import cn.pluss.platform.userInfo.UserInfoService;
+import cn.pluss.platform.util.tree.TreeUtils;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.Map;
+
+@Transactional
+@Service("menuInfoService")
+public class MenuInfoServiceImpl extends ServiceImpl<MenuInfoMapper, MenuInfo> implements MenuInfoService {
+
+    @Autowired
+    private MenuInfoMapper menuInfoMapper;
+
+    @Autowired
+    private HttpServletRequest request;
+
+    @Autowired
+    private UserInfoService uiService;
+
+    @Override
+    public List<MenuInfo> getMenuTree(MenuInfo menuInfo) {
+        String userId = request.getHeader("userId");
+        UserInfo userInfo = uiService.getById(userId);
+        if (!"admin".equals(userInfo.getLoginName())) {
+            throw new MsgException("拒绝访问");
+        }
+
+        List<MenuInfo> menuInfos = queryMenuInfoList(menuInfo);
+        for (MenuInfo info : menuInfos) {
+            info.setSort(info.getMenuOrder());
+            info.setTitle(info.getName());
+            if (info.getParentId() != null) {
+                info.setPId(info.getParentId() + "");
+            }
+        }
+        return TreeUtils.getSortTree(menuInfos);
+    }
+
+    @Override
+    public List<MenuInfo> getRoleConfigMenuTree(MenuInfo menuInfo, String roleId) {
+        String userId = request.getHeader("userId");
+        UserInfo userInfo = uiService.getById(userId);
+        if (!"admin".equals(userInfo.getLoginName())) {
+            throw new MsgException("拒绝访问");
+        }
+
+        List<MenuInfo> menuInfos = queryRoleMenuInfoList(menuInfo, roleId);
+        for (MenuInfo info : menuInfos) {
+            info.setSort(info.getMenuOrder());
+            info.setTitle(info.getName());
+            if (info.getParentId() != null) {
+                info.setPId(info.getParentId() + "");
+            }
+        }
+
+        List<MenuInfo> result = TreeUtils.getSortTree(menuInfos);
+        clear(result);
+        return result;
+    }
+
+
+    @Override
+    public MenuInfo queryMenuInfo(MenuInfo menuInfo) {
+        return menuInfoMapper.queryMenuInfo(menuInfo);
+    }
+
+    @Override
+    public Integer saveMenuInfo(MenuInfo menuInfo) {
+        return menuInfoMapper.saveMenuInfo(menuInfo);
+    }
+
+    @Override
+    public void updateMenuInfo(MenuInfo menuInfo) {
+        menuInfoMapper.updateMenuInfo(menuInfo);
+    }
+
+    @Override
+    public void deleteMenuInfo(MenuInfo menuInfo) {
+        menuInfoMapper.deleteMenuInfo(menuInfo);
+    }
+
+    @Override
+    public List<MenuInfo> queryMenuInfoPage(Map map) {
+        return menuInfoMapper.queryMenuInfoPage(map);
+    }
+
+    @Override
+    public Integer queryMenuInfoPageCount(Map map) {
+        return menuInfoMapper.queryMenuInfoPageCount(map);
+    }
+
+    @Override
+    public List<MenuInfo> getPermissionNames(String loginName) {
+        return menuInfoMapper.getPermissionNames(loginName);
+    }
+
+    @Override
+    public List<MenuInfo> queryPermitMenuInfoById(Map map) {
+        return menuInfoMapper.queryPermitMenuInfoById(map);
+    }
+
+    @Override
+    public List<MenuInfo> queryMenuInfoListOrderById(MenuInfo menuInfo) {
+        return menuInfoMapper.queryMenuInfoListOrderById(menuInfo);
+    }
+
+    @Override
+    public List<MenuInfo> queryMenuInfoByRoleId(Map map) {
+        return menuInfoMapper.queryMenuInfoByRoleId(map);
+    }
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/mercOrderToken/MercOrderTokenService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/mercOrderToken/MercOrderTokenService.java
new file mode 100644
index 0000000..977c8e0
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/mercOrderToken/MercOrderTokenService.java
@@ -0,0 +1,17 @@
+package cn.pluss.platform.mercOrderToken;
+
+import cn.pluss.platform.entity.MercOrderToken;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 设备订单token表 服务类
+ * </p>
+ *
+ * @author bzg
+ * @since 2022-03-23
+ */
+public interface MercOrderTokenService extends IService<MercOrderToken> {
+
+    MercOrderToken getByToken(String tk);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/mercOrderToken/impl/MercOrderTokenServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/mercOrderToken/impl/MercOrderTokenServiceImpl.java
new file mode 100644
index 0000000..63ab9aa
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/mercOrderToken/impl/MercOrderTokenServiceImpl.java
@@ -0,0 +1,26 @@
+package cn.pluss.platform.mercOrderToken.impl;
+
+import cn.pluss.platform.entity.MercOrderToken;
+import cn.pluss.platform.mapper.MercOrderTokenMapper;
+import cn.pluss.platform.mercOrderToken.MercOrderTokenService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 设备订单token表 服务实现类
+ * </p>
+ *
+ * @author bzg
+ * @since 2022-03-23
+ */
+@Service
+public class MercOrderTokenServiceImpl extends ServiceImpl<MercOrderTokenMapper, MercOrderToken> implements MercOrderTokenService {
+
+    @Override
+    public MercOrderToken getByToken(String tk) {
+        QueryWrapper<MercOrderToken> queryWrapper = new QueryWrapper<MercOrderToken>().eq("token",tk);
+        return baseMapper.selectOne(queryWrapper);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/mercSplitSetting/MerchantSplitSettingService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/mercSplitSetting/MerchantSplitSettingService.java
new file mode 100644
index 0000000..b6967cd
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/mercSplitSetting/MerchantSplitSettingService.java
@@ -0,0 +1,25 @@
+package cn.pluss.platform.mercSplitSetting;
+
+import cn.pluss.platform.entity.MerchantSplitSetting;
+import cn.pluss.platform.vo.MerchantSplitSettingVO;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 商户分账配置表 服务类
+ * </p>
+ *
+ * @author bzg
+ * @since 2021-11-26
+ */
+public interface MerchantSplitSettingService extends IService<MerchantSplitSetting> {
+
+    Page<MerchantSplitSettingVO> pageData(Page<MerchantSplitSettingVO> page, MerchantSplitSettingVO vo);
+
+    List<MerchantSplitSetting> listChieMerchantCode(String merchantCode);
+
+    void removeList(List<MerchantSplitSetting> oldList);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/mercSplitSetting/impl/MerchantSplitSettingServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/mercSplitSetting/impl/MerchantSplitSettingServiceImpl.java
new file mode 100644
index 0000000..1ac532c
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/mercSplitSetting/impl/MerchantSplitSettingServiceImpl.java
@@ -0,0 +1,46 @@
+package cn.pluss.platform.mercSplitSetting.impl;
+
+import cn.pluss.platform.entity.MerchantSplitSetting;
+import cn.pluss.platform.mapper.MerchantSplitSettingMapper;
+import cn.pluss.platform.mercSplitSetting.MerchantSplitSettingService;
+import cn.pluss.platform.vo.MerchantSplitSettingVO;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 商户分账配置表 服务实现类
+ * </p>
+ *
+ * @author bzg
+ * @since 2021-11-26
+ */
+@Service
+public class MerchantSplitSettingServiceImpl extends ServiceImpl<MerchantSplitSettingMapper, MerchantSplitSetting> implements MerchantSplitSettingService {
+
+    @Override
+    public Page<MerchantSplitSettingVO> pageData(Page<MerchantSplitSettingVO> page, MerchantSplitSettingVO vo) {
+        return baseMapper.pageInfo(page,vo);
+    }
+
+    @Override
+    public List<MerchantSplitSetting> listChieMerchantCode(String merchantCode) {
+        QueryWrapper<MerchantSplitSetting> queryWrapper = new QueryWrapper<MerchantSplitSetting>()
+                .eq("chieMerchantCode",merchantCode);
+        return baseMapper.selectList(queryWrapper);
+    }
+
+    @Override
+    public void removeList(List<MerchantSplitSetting> oldList) {
+        if(oldList.isEmpty()){
+            return;
+        }
+        oldList.forEach(e->{
+            baseMapper.deleteById(e.getId());
+        });
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/AccountService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/AccountService.java
new file mode 100644
index 0000000..54b73cd
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/AccountService.java
@@ -0,0 +1,226 @@
+package cn.pluss.platform.merchant;
+
+import cn.pluss.platform.dto.AccountDTO;
+import cn.pluss.platform.dto.BankCardDTO;
+import cn.pluss.platform.dto.BankInfoDTO;
+import cn.pluss.platform.dto.CertificationDTO;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.mapper.AccountMapper;
+import cn.pluss.platform.vo.AccountVO;
+import cn.pluss.platform.vo.BankCardVO;
+import cn.pluss.platform.vo.IdCardVO;
+import cn.pluss.platform.vo.StoreSummaryVO;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 商户进件结算信息
+ *
+ * @author Djh
+ */
+public interface AccountService extends IService<Account> {
+
+    /**
+     * 修改成功
+     *
+     * @param mcs 商户进件信息
+     */
+    void editSuccess(MerchantChannelStatus mcs, String accountType);
+
+    /**
+     * 结算信息修改失败
+     * @param mcs       商户进件信息
+     * @param uniqueKey     唯一值
+     * @param failReason    失败原因
+     * @param accountType   结算类型。D0，D1
+     */
+    void editFail(MerchantChannelStatus mcs, String uniqueKey, String failReason, String accountType);
+
+    /**
+     * 分页数据
+     * @param page      分页信息
+     * @param account   查询条件
+     * @param orderItem 排序
+     * @return 分页数据
+     */
+    Page<AccountVO> page(Page<Account> page, Account account, OrderItem orderItem);
+
+    default List<MerchantBaseInfo> getMbiListCertNo(String certNo) {
+        return ((AccountMapper) getBaseMapper()).selectMbiListByCertNo(certNo);
+    }
+
+    /**
+     * 保存或变更结算信息
+     *
+     * @param accountDTO 结算信息参数
+     *                   <p>
+     *                   根据settleType来判断结算类型<br/>
+     *                   对公则，只处理一个bankCard参数
+     *                   其余则需要对idCard和bankCard都要处理
+     *                   </p>
+     */
+    void saveOrUpdate(AccountDTO accountDTO);
+
+    /**
+     * 保存或变更结算信息v4
+     *
+     * @param accountDTO 结算信息参数
+     *                   <p>
+     *                   根据settleType来判断结算类型<br/>
+     *                   对公则，只处理一个bankCard参数
+     *                   其余则需要对idCard和bankCard都要处理
+     *                   </p>
+     * @param checkFlag  是否进行4要素
+     */
+    void saveV4(AccountDTO accountDTO, boolean checkFlag);
+
+    /**
+     * 保存或变更结算信息v4
+     *
+     * @param accountDTO 结算信息参数
+     *                   <p>
+     *                   根据settleType来判断结算类型<br/>
+     *                   对公则，只处理一个bankCard参数
+     *                   其余则需要对idCard和bankCard都要处理
+     *                   </p>
+     */
+    default void saveV4(AccountDTO accountDTO) {
+        saveV4(accountDTO, true);
+    }
+
+    /**
+     * 获取结算信息(app回显时候使用，账户信息与法人信息可能并未对应)
+     *
+     * @param userId
+     * @return
+     */
+    AccountDTO getAccount(String userId);
+
+    /**
+     * 获取全部结算信息
+     * @param userId    用户id
+     * @return
+     */
+    Map<String, AccountDTO> getAccounts(String userId);
+
+    /**
+     * 清理指定用户的结算信息
+     *
+     * @param userId      用户id
+     * @param channelType 通道类型
+     */
+    void delAccount(String userId, String channelType);
+
+    /**
+     * 获取结算信息，进件时候使用，结算账户与法人信息对应
+     *
+     * @param userId
+     * @return
+     */
+    AccountDTO getRealAccount(String userId);
+
+    /**
+     * 获取用户指定结算通道类型下的结算信息
+     *
+     * @param userId      用户id
+     * @param channelType 通道类型、D1、D0
+     * @return
+     */
+    AccountDTO getRealAccount(String userId, String channelType);
+
+    AccountDTO getRealAccount(Account account);
+
+    /**
+     * 用户实名认证-身份证信息
+     *
+     * @param certificationDTO
+     */
+    void realNameAudit(CertificationDTO certificationDTO);
+
+
+    /**
+     * 用户实名认证-银行卡信息
+     *
+     * @param bankInfoDTO
+     */
+    void bankcardAudit(BankInfoDTO bankInfoDTO);
+
+    /**
+     * 用户实名身份证信息回显
+     *
+     * @param userId 用户id
+     * @return
+     */
+    IdCardVO idCardDetail(String userId);
+
+    /**
+     * 用户实名银行卡信息回显
+     *
+     * @param userId
+     * @return
+     */
+    BankCardVO bankcardDetail(String userId);
+
+    /**
+     * 进件小微结算身份证号校验
+     *
+     * @param certNo   身份证号
+     * @param checkMsg 校验不通过提示信息
+     */
+    void checkCert(String certNo, String checkMsg);
+
+    /**
+     * 获取进件相关信息
+     *
+     * @param userId       用户id
+     * @param merchantType 商户类型，-1则表示查询现有信息，其他类型则会过滤某些数据
+     * @return 进件相关信息
+     */
+    StoreSummaryVO getReckoner(String userId, String merchantType);
+
+    /**
+     * 获取进件相关信息v2
+     *
+     * @param userId       用户id
+     * @param merchantType 商户类型，-1则表示查询现有信息，其他类型则会过滤某些数据
+     * @return 进件相关信息
+     */
+    StoreSummaryVO getReckonerV2(String userId, String merchantType);
+
+    /**
+     * 保存图片数据
+     *
+     * @param merchantCode     商户code
+     * @param bankCard         银行卡信息
+     * @param legalIdCard      法人/商户负责人身份证信息
+     * @param accountIdcIdCard 结算人身份证信息
+     * @param certificateUrl   非法人授权函
+     */
+    void saveImage(String merchantCode, BankCard bankCard, IdCard legalIdCard, IdCard accountIdcIdCard, String certificateUrl);
+
+    /**
+     * 修改结算银行卡
+     *
+     * @param bankCard 银行卡信息
+     */
+    void editAccountBankCard(BankCard bankCard);
+
+    /**
+     * 修改结算银行卡
+     *
+     * @param bankCardDTO 银行卡信息
+     */
+    void editAccountBankCardV2(BankCardDTO bankCardDTO);
+
+    /**
+     * 是否可以修改银行卡
+     *
+     * @param merchantCode 商户code
+     * @return 是，即代表可以执行修改操作
+     */
+    boolean canEditBankCard(String merchantCode);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/JftMercPaymentChannelService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/JftMercPaymentChannelService.java
new file mode 100644
index 0000000..14cb78e
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/JftMercPaymentChannelService.java
@@ -0,0 +1,65 @@
+package cn.pluss.platform.merchant;
+
+import cn.pluss.platform.entity.JftMercPaymentChannel;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 银盛一码多户的商户进件记录 服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-06-15
+ */
+public interface JftMercPaymentChannelService extends IService<JftMercPaymentChannel> {
+
+    /**
+     * 根据用户id获得实体类
+     *
+     * @param userId 用户id
+     * @return 数据
+     */
+    default JftMercPaymentChannel getByUserId(Object userId) {
+        LambdaQueryWrapper<JftMercPaymentChannel> qWrapper = Wrappers.lambdaQuery();
+        qWrapper.eq(JftMercPaymentChannel::getUserId, userId);
+        return getBaseMapper().selectOne(qWrapper);
+    }
+
+    /**
+     * 根据用户id获得实体类
+     *
+     * @param merchantCode 商户编号
+     * @return 数据
+     */
+    default JftMercPaymentChannel getByMerchantCode(String merchantCode) {
+        LambdaQueryWrapper<JftMercPaymentChannel> qWrapper = Wrappers.lambdaQuery();
+        qWrapper.eq(JftMercPaymentChannel::getMerchantCode, merchantCode);
+        return getBaseMapper().selectOne(qWrapper);
+    }
+
+    /**
+     * 根据用户id获得实体类
+     *
+     * @param merchantId 通道商编，这里特指银盛商编
+     * @return 数据
+     */
+    default JftMercPaymentChannel getByMerchantId(String merchantId) {
+        LambdaQueryWrapper<JftMercPaymentChannel> qWrapper = Wrappers.lambdaQuery();
+        qWrapper.eq(JftMercPaymentChannel::getMerchantId, merchantId);
+        return getBaseMapper().selectOne(qWrapper);
+    }
+
+    /**
+     * 根据用户id获得实体类
+     *
+     * @param applicationId 发起进件的事务id
+     * @return 数据
+     */
+    default JftMercPaymentChannel getByApplicationId(String applicationId) {
+        LambdaQueryWrapper<JftMercPaymentChannel> qWrapper = Wrappers.lambdaQuery();
+        qWrapper.eq(JftMercPaymentChannel::getApplicationId, applicationId);
+        return getBaseMapper().selectOne(qWrapper);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/MercMemberSetService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/MercMemberSetService.java
new file mode 100644
index 0000000..9f5f0b3
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/MercMemberSetService.java
@@ -0,0 +1,24 @@
+package cn.pluss.platform.merchant;
+
+import cn.pluss.platform.entity.MercMemberSet;
+import cn.pluss.platform.vo.MercMemberSetVO;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 商户会员功能基本设置表 服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-07-12
+ */
+public interface MercMemberSetService extends IService<MercMemberSet> {
+
+    /**
+     * app获取用户会员配置
+     * @return  会员配置
+     */
+    MercMemberSetVO apiSet();
+
+    MercMemberSetVO getSetByUserId(Long userId);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/MerchantBaseInfoService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/MerchantBaseInfoService.java
new file mode 100644
index 0000000..10d643d
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/MerchantBaseInfoService.java
@@ -0,0 +1,146 @@
+package cn.pluss.platform.merchant;
+
+import cn.pluss.platform.dto.*;
+import cn.pluss.platform.entity.MerchantBaseInfo;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.vo.MerchantBaseInfoVO;
+import cn.pluss.platform.vo.MerchantBaseNewVO;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+public interface MerchantBaseInfoService extends IService<MerchantBaseInfo> {
+
+    /**
+     * 上级查看商户基本信息，最多能看两级
+     * @param userId  用户id
+     * @return
+     */
+    MerchantBaseInfoVO apiGetMchDetail(String userId);
+
+
+    /**
+     * 获取所有的多商户列表
+     * @param userId    用户id
+     */
+    List<MerchantBaseInfo> getAllByUserId(String userId);
+
+    /**
+     * 保存商户信息
+     * @param merchantBaseInfoDTO
+     */
+    void saveMerchantBaseInfo(MerchantBaseInfoDTO merchantBaseInfoDTO);
+
+    /**
+     * 保存营业执照信息
+     * @param businessLicenseDTO    营业执照信息参数
+     */
+    void saveBusinessLicense(BusinessLicenseDTO businessLicenseDTO);
+
+    MerchantBaseInfo getMerchantBaseInfoByUserId(String userId);
+
+    MerchantBaseInfo getMerchantBaseInfoByMerchantCode(String merchantCode);
+
+    MerchantBaseInfo queryMerchantBaseInfo(MerchantBaseInfo merchantBaseInfo);
+
+    List<MerchantBaseInfo> queryMerchantBaseInfoList(MerchantBaseInfo merchantBaseInfo);
+
+    void saveMerchantBaseInfo(MerchantBaseInfo merchantBaseInfo);
+
+    void updateMerchantBaseInfo(MerchantBaseInfo merchantBaseInfo);
+
+    void deleteMerchantBaseInfo(MerchantBaseInfo merchantBaseInfo);
+
+    List<MerchantBaseInfo> queryMerchantBaseInfoPage(Map map);
+
+    Integer queryMerchantBaseInfoPageCount(Map map);
+
+    /**
+     * 查询商户管理列表的，admin
+     * @param map
+     * @return
+     */
+    List<MerchantBaseNewVO> queryMerchantBaseNewPage(Map<String, Object> map);
+
+    /**
+     * 统计商户列表个数
+     * @param map
+     * @return
+     */
+    Integer queryMerchantBaseNewPageCount(Map<String, Object> map);
+
+    /**
+     * 添加子商户
+     * @param merchantBaseInfoDTO   子商户基本信息
+     */
+    void saveMerchantUser(MerchantBaseInfoDTO merchantBaseInfoDTO);
+
+    /**
+     * 商户活动奖励金发放
+     * @param merchantCode
+     * @param consumeFee
+     */
+    void grantMerchantMarket(String merchantCode, Double consumeFee);
+
+    /**
+     * 关联分页查询商户信息
+     * @param merchantPage
+     * @param userApp
+     * @return
+     */
+    Page<MerchantBaseInfo> pageJoinData(Page<MerchantBaseInfo> merchantPage,
+                                        UserApp userApp);
+
+    Map<String,Object> listMerchantBaseInfoPage(Integer currPage, Integer size, String column, Boolean asc, MerchantBaseNewVO merchantBaseNewVO);
+
+    void apiSwitchBankLargePermission();
+
+    void apiWxCertPass();
+
+    /**
+     * 统计商户交易数据详情
+     * @date: 2021/12/30 17:51
+     * @param page:
+     * @param dto:
+     * @return com.baomidou.mybatisplus.extension.plugins.pagination.Page<cn.pluss.platform.dto.MercOrderDataDTO>
+     */
+    Page<MercOrderDataDTO> pageData(Page<MercOrderDataDTO> page, MercOrderDataDTO dto);
+
+    /**
+     * 商户交易数据环比统计
+     * @date: 2021/12/31 13:46
+     * @param page:
+     * @param dto:
+     * @return com.baomidou.mybatisplus.extension.plugins.pagination.Page<cn.pluss.platform.dto.MercTradeDataDTO>
+     */
+    Page<MercTradeDataDTO> pageTradeData(Page<MercTradeDataDTO> page, MercTradeDataDTO dto);
+
+    /**
+     * 商户活跃度分析统计
+     * @date: 2022/1/7 14:11
+     * @param page:
+     * @param dto:
+     * @return com.baomidou.mybatisplus.extension.plugins.pagination.Page<cn.pluss.platform.dto.MercActiveDataDTO>
+     */
+    Page<MercActiveDataDTO> pageActiveData(Page<MercActiveDataDTO> page, MercActiveDataDTO dto);
+
+    /**
+     * 根据区域和角色查询商户信息
+     * @date: 2022/3/1 16:33
+     * @param areaList:
+     * @param roleCode:
+     * @return java.util.List<cn.pluss.platform.entity.MerchantBaseInfo>
+     */
+    List<String> getAreaAndRoleList(List<String> areaList, String roleCode);
+
+    /**
+     * 查询当前用户直推商户Code
+     * @param userId
+     * @return
+     */
+    List<String> queryNextMercCodeByUserId(Serializable userId);
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/MerchantCashPayCodeService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/MerchantCashPayCodeService.java
new file mode 100644
index 0000000..a72b050
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/MerchantCashPayCodeService.java
@@ -0,0 +1,42 @@
+package cn.pluss.platform.merchant;
+
+import cn.pluss.platform.entity.MerchantCashPayCode;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 收银点和码牌关联记录表 服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-03-24
+ */
+public interface MerchantCashPayCodeService extends IService<MerchantCashPayCode> {
+
+    /**
+     * 根据收款码获取收银点
+     * @param payCode   收款码号
+     */
+    MerchantCashPayCode getByPayCode(String payCode);
+
+    /**
+     * 收银点绑定收款码
+     * @param merchantCashPayCode
+     */
+    void bindPayCode(MerchantCashPayCode merchantCashPayCode);
+
+    /**
+     * 根据收银台id列表获取所有绑定的收款码
+     * @param cashPlaceIdList   收银台id列表
+     * @return
+     */
+    List<MerchantCashPayCode> getByCashPlaceIdList(List<Integer> cashPlaceIdList);
+
+    /**
+     * 收银台解绑收款码
+     * @param payCode   收款码
+     */
+    void unbindPayCode(String payCode);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/MerchantCashPlaceService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/MerchantCashPlaceService.java
new file mode 100644
index 0000000..323b775
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/MerchantCashPlaceService.java
@@ -0,0 +1,84 @@
+package cn.pluss.platform.merchant;
+
+import cn.pluss.platform.entity.MerchantCashPayCode;
+import cn.pluss.platform.entity.MerchantCashPlace;
+import cn.pluss.platform.entity.MerchantOrder;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.vo.MerchantCashPlaceStaffVO;
+import cn.pluss.platform.vo.MerchantCashPlaceVO;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 商户收银点表 服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-03-23
+ */
+public interface MerchantCashPlaceService extends IService<MerchantCashPlace> {
+
+    /**
+     * 通过用户id生成默认的收银点，并绑定电子码
+     * @param userId 用户id
+     */
+    void createDefaultCashPlace(Long userId);
+
+    /**
+     * 通过收银点编码删除
+     * @param code  收银台编码code
+     */
+    void delByCodeForApp(String code);
+
+    /**
+     * 查看收银点列表
+     * @param merchantCashPlace 收银点查询条件
+     * @return  收银点列表
+     */
+    List<MerchantCashPlaceVO> getListForApp(Page<MerchantCashPlace> page, MerchantCashPlace merchantCashPlace);
+
+    /**
+     * 收银点绑定收款码
+     * @param merchantCashPayCode
+     */
+    void bindPayCode(MerchantCashPayCode merchantCashPayCode);
+
+    /**
+     * 收款码解绑
+     * @param payCode 收款码牌号
+     */
+    void unbindPayCode(String payCode);
+
+    /**
+     * 根据收银台编码获得签到员工列表
+     * @param code  收银台编码
+     * @return  员工信息
+     */
+    List<UserApp> getStaffByCode(String code);
+
+    /**
+     * 根据收银台id获得签到员工列表
+     * @param id  收银台编码
+     * @return  员工信息
+     */
+    List<UserApp> getStaffByCashPlaceId(Long id);
+
+    MerchantCashPlaceStaffVO getStatusByStaffId(String userId);
+
+    /**
+     * 根据收款码排获取收银点状态
+     * @return
+     */
+    MerchantCashPlaceStaffVO getStatusByPayCode(String payCode);
+
+    /**
+     * 设置收银点信息
+     * @date: 2021/11/29 10:51
+     * @param order: 订单信息
+     * @param snNo:  设备号
+     */
+    void setOrderPlaceInfo(MerchantOrder order,String snNo);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/MerchantCashPlaceStaffService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/MerchantCashPlaceStaffService.java
new file mode 100644
index 0000000..6aaf6a5
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/MerchantCashPlaceStaffService.java
@@ -0,0 +1,68 @@
+package cn.pluss.platform.merchant;
+
+import cn.pluss.platform.entity.MerchantCashPlace;
+import cn.pluss.platform.entity.MerchantCashPlaceStaff;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.vo.MerchantCashPlaceStaffVO;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 收银点和员工关联记录表 服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-03-23
+ */
+public interface MerchantCashPlaceStaffService extends IService<MerchantCashPlaceStaff> {
+
+    /**
+     * 员工绑定收银点
+     * @param userId        用户id
+     * @param cashPlace     收银点
+     */
+    void bindCashPlace(Long userId, MerchantCashPlace cashPlace);
+
+    /**
+     * 员工收银点签到
+     * @param userId        用户id
+     * @param cashPlaceCode 收银台code
+     */
+    void bindCashPlace(Long userId, String cashPlaceCode);
+
+    /**
+     * 员工收银点签退
+     * @param userId
+     */
+    void offLine(Long userId);
+
+    /**
+     * 员工收银点签退
+     * @param cashPlace
+     */
+    void offLineCashPlace(MerchantCashPlace cashPlace);
+
+    /**
+     * 员工收银点签退
+     * @param cashPlaceCode
+     */
+    void offLineCashPlace(String cashPlaceCode);
+
+    /**
+     * 获取收银台上正在值班的员工,
+     * @param cashPlace 收银台信息
+     * @return 正在打卡的员工信息，若为空则说明无
+     */
+    UserApp getCurStaffFromCashPlace(MerchantCashPlace cashPlace);
+
+    /**
+     * 获取分页打卡信息
+     * @param page      分页信息
+     * @param condition 查询条件
+     * @param orderItem 排序字段
+     * @return  打卡信息
+     */
+    Page<MerchantCashPlaceStaffVO> getRecord(Page<MerchantCashPlaceStaff> page, MerchantCashPlaceStaff condition, OrderItem orderItem);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/MerchantPluginService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/MerchantPluginService.java
new file mode 100644
index 0000000..77bad8a
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/MerchantPluginService.java
@@ -0,0 +1,49 @@
+package cn.pluss.platform.merchant;
+
+import cn.pluss.platform.entity.MerchantPlugin;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 商户插件表 服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-01-29
+ */
+public interface MerchantPluginService extends IService<MerchantPlugin> {
+
+    /**
+     * 获取进件信息
+     * @param userId    用户id
+     */
+    default MerchantPlugin getPluginInfo(String userId) {
+        MerchantPlugin merchantPlugin = new MerchantPlugin();
+        merchantPlugin.setUserId(Integer.parseInt(userId));
+        return getBaseMapper().selectOne(new QueryWrapper<>(merchantPlugin));
+    }
+
+    /**
+     * 发起插件进件请求
+     * @param userId    用户id
+     */
+    void reqAudit(String userId);
+
+    /**
+     * 插件进件请求
+     * @param userId
+     */
+    void audit(String userId);
+
+    void refuse(String userId, String msg);
+
+    /**
+     * 获取插件相关信息
+     * @param userId
+     * @return
+     */
+    Map<String, Object> getInfo(String userId);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/MerchantRateNewRecordService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/MerchantRateNewRecordService.java
new file mode 100644
index 0000000..5428789
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/MerchantRateNewRecordService.java
@@ -0,0 +1,47 @@
+package cn.pluss.platform.merchant;
+
+import cn.pluss.platform.dto.MerchantRateNewRecordDTO;
+import cn.pluss.platform.entity.MerchantRateNewRecord;
+import cn.pluss.platform.mapper.MerchantRateNewRecordMapper;
+import cn.pluss.platform.vo.MerchantRateNewRecordVO;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 商户费率表(新) 服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-08-09
+ */
+public interface MerchantRateNewRecordService extends IService<MerchantRateNewRecord> {
+
+    default MerchantRateNewRecord getExaminedDataByUserId(String userId, String channel) {
+        return ((MerchantRateNewRecordMapper) getBaseMapper()).selectLastExaminedDataByUserId(userId, channel);
+    }
+
+    default MerchantRateNewRecord getExaminedDataByMerchantCode(String merchantCode, String channel) {
+        return ((MerchantRateNewRecordMapper) getBaseMapper()).selectLastExaminedDataByMerchantCode(merchantCode, channel);
+    }
+
+    default MerchantRateNewRecord getValidRecordByMerchantCode(String merchantCode, String channel) {
+        return ((MerchantRateNewRecordMapper) getBaseMapper()).selectValidDataByMerchantCode(merchantCode, channel);
+    }
+
+    Page<MerchantRateNewRecordVO> apiPage(Page<MerchantRateNewRecord> page, MerchantRateNewRecordDTO entity);
+
+    /**
+     * 修改费率成功
+     *
+     * @param rateNewRecord 费率修改记录
+     */
+    void onSuccess(MerchantRateNewRecord rateNewRecord);
+
+    /**
+     * 修改费率失败
+     *
+     * @param rateNewRecord 费率修改记录
+     */
+    void onFail(MerchantRateNewRecord rateNewRecord);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/MerchantRateNewService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/MerchantRateNewService.java
new file mode 100644
index 0000000..b07432b
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/MerchantRateNewService.java
@@ -0,0 +1,123 @@
+package cn.pluss.platform.merchant;
+
+import cn.pluss.platform.dto.MerchantRateNewDTO;
+import cn.pluss.platform.entity.MerchantChannelStatus;
+import cn.pluss.platform.entity.MerchantRateNew;
+import cn.pluss.platform.vo.MerchantRateNewVO;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 商户费率表(新) 服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-08-09
+ */
+public interface MerchantRateNewService extends IService<MerchantRateNew> {
+
+    void passD0(String merchantId);
+
+    void passD0(List<String> merchantIdList);
+
+    /**
+     * @description:获取商户的费率
+     * @date: 2021/8/20 14:18
+     * @param merchantCode: 商户编号
+     * @param payWay: 支付方式
+     * @param orderAmt:  订单金额
+     * @return java.math.BigDecimal
+     */
+    BigDecimal getMchRate(String merchantCode,String payWay,Double orderAmt);
+
+    /**
+     * 调用的方法，获取商户的费率信息
+     * @param userId 商户的id
+     *
+     * @return  费率信息
+     */
+    Map<String, Object> apiGetRate(String userId);
+
+    Page<Map<String, Object>> pageData(Page<Object> page, Map<String, Object> condition);
+
+    /**
+     * app修改费率或提交费率修改申请
+     * @param param
+     */
+    void apiChangeMerchantRateNew(MerchantRateNewDTO param);
+
+    /**
+     * 修改费率或提交费率修改申请
+     * @param param     费率参数
+     * @param d1        d1进件信息
+     * @param d0        d0进件信息
+     */
+    void changeMerchantRateNew(MerchantRateNewDTO param, MerchantChannelStatus d1, MerchantChannelStatus d0);
+
+    MerchantRateNewVO getChannelRate(String channel, String merchantCode);
+
+    /**
+     * 根据用户id获取费率信息
+     * @param userId    用户id
+     * @return 费率信息
+     */
+    MerchantRateNew getByUserId(String userId, String channel);
+
+    /**
+     * 根据商编获取费率信息
+     * @param merchantCode  商编
+     * @return 费率信息
+     */
+    MerchantRateNew getByMerchantCode(String merchantCode, String channel);
+
+    /**
+     * 获取对应支付方式下，费率等级对应的费率值
+     * @param rateLevel 费率等级
+     * @param payWay    支付方式
+     * @return  费率值
+     */
+    double getRate(String rateLevel, String payWay,Double orderAmt);
+
+    /**
+     * 获取微信支付，费率等级对应的费率值
+     * @param rateLevel 费率等级
+     * @return  费率值
+     */
+    double getWxRate(String rateLevel,Double orderAmt);
+
+    /**
+     * 获取支付宝支付，费率等级对应的费率值
+     * @param rateLevel 费率等级
+     * @return  费率值
+     */
+    double getAliRate(String rateLevel,Double orderAmt);
+
+    /**
+     * 获取银联支付，费率等级对应的费率值
+     * @param rateLevel 费率等级
+     * @return  费率值
+     */
+    double getBankRate(String rateLevel,Double orderAmt);
+
+    /**
+     * 获取银联支付(大于 1000)，费率等级对应的费率值
+     * @param rateLevel 费率等级
+     * @return  费率值
+     */
+    double getBankRateLarge(String rateLevel,Double orderAmt);
+
+    /**
+     * @description:根据订单以及费率等级获取商户费率
+     * @date: 2021/8/19 16:48
+     * @param payTypeCode: 支付方式code
+     * @param orderAmt: 订单金额
+     * @param userId:  用户ID
+     * @return double
+     */
+//    BigDecimal getMercOrderRate(String payTypeCode,Double orderAmt,String userId);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/MerchantService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/MerchantService.java
new file mode 100644
index 0000000..1a7a0ee
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/MerchantService.java
@@ -0,0 +1,92 @@
+package cn.pluss.platform.merchant;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.entity.MerchantBaseInfo;
+import cn.pluss.platform.exception.PayRiskException;
+import cn.pluss.platform.wap.LevelDTO;
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Map;
+
+/**
+ * @author DJH
+ * 商户的部分业务逻辑
+ */
+public interface MerchantService {
+
+    /**
+     * app退款回调
+     */
+    String appRefundCallback(HttpServletRequest request);
+
+    /**
+     * 检查支付地点
+     */
+    void checkPayLocation(HttpServletRequest request, MerchantBaseInfo merchantBaseInfo ) throws PayRiskException;
+
+    /**
+     * 检查付款人ip地址
+     * @param ip
+     * @param merchantBaseInfo
+     * @param province
+     * @throws PayRiskException
+     */
+    void checkPayLocation(String ip, MerchantBaseInfo merchantBaseInfo,String province) throws PayRiskException;
+
+    /**
+     * 统一支付入口
+     * @param params
+     * @return
+     */
+    Result<Map<String,Object>> tradePay(Map<String, Object> params);
+
+    /**
+     * 会员升级充值入口
+     * @param levelDTO
+     * @return
+     */
+    Map<String, Object> tradePay(LevelDTO levelDTO,HttpServletRequest request) throws Exception;
+
+    /**
+     * 被扫小程序会员充值
+     * @param json
+     * @return
+     */
+    Result<JSONObject> memberRecharge(JSONObject json);
+
+    /**
+     * @description:临时码支付
+     * @date: 2021/8/2 11:01
+     * @param params:
+     * @return cn.pluss.platform.api.Result<java.util.Map<java.lang.String,java.lang.Object>>
+     */
+    Result<Object> moveTradePay(Map<String, Object> params);
+
+    /**
+     * 阿里云设备授权支付页面
+     * @date: 2021/12/28 13:56
+     * @param request:
+     * @param response
+     * @param orderNumber:
+     * @return
+     */
+    ModelAndView scanPayAuth(HttpServletRequest request, HttpServletResponse response , String orderNumber);
+
+    /**
+     * 扫码订单支付
+     * @date: 2021/12/28 17:36
+     * @param request:
+     * @param response:
+     * @param tk:
+     * @param code:
+     * @param auth_code:
+     * @param userAuthCode:
+     * @param userId:
+     * @param payType:
+     * @return org.springframework.web.servlet.ModelAndView
+     */
+    ModelAndView scanPay(HttpServletRequest request, HttpServletResponse response , String tk, String code, String auth_code, String userAuthCode,String userId,String payType);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/MerchantStaffConnService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/MerchantStaffConnService.java
new file mode 100644
index 0000000..cb08a30
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/MerchantStaffConnService.java
@@ -0,0 +1,87 @@
+package cn.pluss.platform.merchant;
+
+import cn.pluss.platform.dto.MerchantStaffDTO;
+import cn.pluss.platform.entity.MerchantBaseInfo;
+import cn.pluss.platform.entity.MerchantStaffConn;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.vo.MerchantStaffConnVO;
+import cn.pluss.platform.vo.MerchantStaffVO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 员工商户关联表 服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-03-24
+ */
+public interface MerchantStaffConnService extends IService<MerchantStaffConn> {
+
+    /**
+     * 创建或修改
+     * @param staffDTO
+     * @return
+     */
+    UserApp createOrEditStaff(MerchantStaffDTO staffDTO);
+
+
+
+    /**
+     * 创建员工
+     *
+     * @return
+     */
+    UserApp createStaff(MerchantStaffDTO staffDTO);
+
+    UserApp editStaff(MerchantStaffDTO staffDTO);
+
+    /**
+     * 绑定员工
+     *
+     * @param userId       用户id
+     * @param merchantCode 商户code
+     */
+    void bindStaff(Long userId, String merchantCode);
+
+    /**
+     * 删除所有关联信息
+     * @param userId    用户id
+     */
+    void delAllStaff(Long userId);
+
+    /**
+     * 员工
+     * @param userId            用户id
+     * @param merchantCodeList  商户编码列表
+     */
+    void delStaff(Long userId, List<String> merchantCodeList);
+
+    /**
+     * 获取员工信息，并且获得相关联的所有商户
+     * @return  员工信息
+     */
+    MerchantStaffVO getOneForApp(String userId);
+
+    List<MerchantStaffConnVO> getListByUserId(String userId);
+
+    /**
+     * @description:根据员工userAppid获取所绑定门店信息
+     * @date: 2021/9/23 17:58
+     * @param userAppId:
+     * @return java.util.List<cn.pluss.platform.entity.MerchantBaseInfo>
+     */
+    List<MerchantBaseInfo> getMercInfoByStaffId(String userAppId);
+
+    /**
+     * @description:根据userId和merchantcode 获取员工绑定的信息
+     * @date: 2021/9/24 14:13
+     * @param userId:
+     * @param merchantCode:
+     * @return cn.pluss.platform.entity.MerchantStaffConn
+     */
+    MerchantStaffConn getStaffConnInfoByCodeAndId(String userId, String merchantCode);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/StaffPermissionService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/StaffPermissionService.java
new file mode 100644
index 0000000..89377c8
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/StaffPermissionService.java
@@ -0,0 +1,43 @@
+package cn.pluss.platform.merchant;
+
+import cn.pluss.platform.entity.StaffPermission;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 员工权限表 服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-06-11
+ */
+public interface StaffPermissionService extends IService<StaffPermission> {
+
+    /**
+     * 获取一个员工权限信息
+     * @param userId            用户id
+     * @param merchantCode      商户编号
+     * @return  组装好的信息
+     */
+    default StaffPermission getEntity(Long userId, String merchantCode) {
+        StaffPermission staffPermission = new StaffPermission();
+        staffPermission.setUserId(userId);
+        staffPermission.setMerchantCode(merchantCode);
+
+        StaffPermission existData = getOne(new QueryWrapper<>(staffPermission));
+        return existData == null? staffPermission : existData;
+    }
+
+    /**
+     * 移除指定员工权限信息
+     * @param userId        员工账号id
+     * @param merchantCode  商户编码
+     */
+    default void remove(Long userId, String merchantCode) {
+        QueryWrapper<StaffPermission> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("userId", userId);
+        queryWrapper.eq("merchantCode", merchantCode);
+        remove(queryWrapper);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/JftMercPaymentChannelServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/JftMercPaymentChannelServiceImpl.java
new file mode 100644
index 0000000..1717c32
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/JftMercPaymentChannelServiceImpl.java
@@ -0,0 +1,20 @@
+package cn.pluss.platform.merchant.impl;
+
+import cn.pluss.platform.entity.JftMercPaymentChannel;
+import cn.pluss.platform.mapper.JftMercPaymentChannelMapper;
+import cn.pluss.platform.merchant.JftMercPaymentChannelService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 银盛一码多户的商户进件记录 服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-06-15
+ */
+@Service
+public class JftMercPaymentChannelServiceImpl extends ServiceImpl<JftMercPaymentChannelMapper, JftMercPaymentChannel> implements JftMercPaymentChannelService {
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/MercMemberSetServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/MercMemberSetServiceImpl.java
new file mode 100644
index 0000000..b3b25ae
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/MercMemberSetServiceImpl.java
@@ -0,0 +1,43 @@
+package cn.pluss.platform.merchant.impl;
+
+import cn.pluss.platform.entity.MercMemberSet;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.mapper.MercMemberSetMapper;
+import cn.pluss.platform.merchant.MercMemberSetService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.vo.MercMemberSetVO;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 商户会员功能基本设置表 服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-07-12
+ */
+@Service
+public class MercMemberSetServiceImpl extends ServiceImpl<MercMemberSetMapper, MercMemberSet> implements MercMemberSetService {
+
+    @Autowired
+    private UserAppService uaService;
+
+    @Override
+    public MercMemberSetVO apiSet() {
+        UserApp tokenUa = uaService.queryUserAppByToken();
+        return getSetByUserId(tokenUa.getUserId());
+    }
+
+    @Override
+    public MercMemberSetVO getSetByUserId(Long userId) {
+        LambdaQueryWrapper<MercMemberSet> qWrapper = Wrappers.lambdaQuery();
+        qWrapper.eq(MercMemberSet::getUserId, userId);
+        MercMemberSet result = baseMapper.selectOne(qWrapper);
+
+        return MercMemberSetVO.toVO(result);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/MerchantBaseInfoServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/MerchantBaseInfoServiceImpl.java
new file mode 100644
index 0000000..c7907a8
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/MerchantBaseInfoServiceImpl.java
@@ -0,0 +1,1065 @@
+package cn.pluss.platform.merchant.impl;
+
+import cn.hutool.core.date.DateField;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import cn.pluss.platform.BankCardService;
+import cn.pluss.platform.IdCardService;
+import cn.pluss.platform.aliMcc.AliMccService;
+import cn.pluss.platform.bill.MerchantBillStatisticsService;
+import cn.pluss.platform.constants.CommonError;
+import cn.pluss.platform.converter.Converter;
+import cn.pluss.platform.converter.MerchantBaseInfoConverter;
+import cn.pluss.platform.dict.DictService;
+import cn.pluss.platform.dto.*;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.enums.UserRoleEnum;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.ActivityEnrollMapper;
+import cn.pluss.platform.mapper.MerchantBaseInfoMapper;
+import cn.pluss.platform.mapper.MerchantMarketMapper;
+import cn.pluss.platform.mapper.MerchantOrderMapper;
+import cn.pluss.platform.merchant.AccountService;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.merchantImage.MerchantImageService;
+import cn.pluss.platform.merchantOrder.MerchantOrderStatisticsService;
+import cn.pluss.platform.merchantStore.MerchantStoreService;
+import cn.pluss.platform.region.RegionReflectService;
+import cn.pluss.platform.roleUserInfo.RoleUserInfoService;
+import cn.pluss.platform.systemConfig.SystemConfigService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.userInfo.UserInfoService;
+import cn.pluss.platform.util.MD5Util;
+import cn.pluss.platform.util.RegexUtils;
+import cn.pluss.platform.util.StringUtil;
+import cn.pluss.platform.vo.MerchantBaseInfoVO;
+import cn.pluss.platform.vo.MerchantBaseNewVO;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.Setter;
+import lombok.val;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.util.*;
+
+import static cn.pluss.platform.constants.ProjectConstant.PAGE_SIZE;
+
+/**
+ * @author SSS
+ */
+@Service("merchantBaseInfoService")
+public class MerchantBaseInfoServiceImpl extends ServiceImpl<MerchantBaseInfoMapper, MerchantBaseInfo> implements MerchantBaseInfoService {
+
+    @Setter(onMethod_ = {@Autowired, @Lazy})
+    private MerchantStoreService merchantStoreService;
+
+    @Setter(onMethod_ = {@Autowired, @Lazy})
+    private UserAppService userAppService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private AliMccService aliMccService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantImageService imageService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private IdCardService idCardService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private BankCardService bankCardService;
+
+    @Setter(onMethod_ = {@Autowired, @Lazy})
+    private UserInfoService userInfoService;
+
+    @Setter(onMethod_ = {@Autowired, @Lazy})
+    private MerchantBillStatisticsService mbsService;
+
+    @Autowired
+    @Lazy
+    private MerchantChannelStatusService mcsService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private SystemConfigService systemConfigService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private RoleUserInfoService roleUserInfoService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private ActivityEnrollMapper activityEnrollMapper;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantOrderMapper merchantOrderMapper;
+
+    @Setter(onMethod_ = {@Autowired, @Lazy})
+    private MerchantOrderStatisticsService mosService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantMarketMapper merchantMarketMapper;
+
+    @Setter(onMethod_ = {@Autowired, @Lazy})
+    private AccountService accountService;
+
+    @Autowired
+    private RegionReflectService reflectService;
+
+    @Autowired
+    private DictService dictService;
+
+    @Override
+    public MerchantBaseInfoVO apiGetMchDetail(String userId) {
+        // 先判断是不是直推或间推
+        UserApp userApp = userAppService.queryUserAppByToken();
+        UserApp mchUserApp = userAppService.getOne(new QueryWrapper<UserApp>().eq("userId", userId));
+
+        if (mchUserApp == null) {
+            throw new MsgException("拒绝访问");
+        }
+
+        UserApp parent = userAppService.getOne(new QueryWrapper<UserApp>().eq("userId", mchUserApp.getParentId()));
+
+        UserInfo ui = userInfoService.getById(mchUserApp.getUserId());
+
+        boolean directFlag = false;
+
+        if (!userApp.getUserId().equals(mchUserApp.getParentId())) {
+            if (parent == null || !Objects.equals(parent.getParentId(), userApp.getUserId())) {
+                throw new MsgException("拒绝访问");
+            }
+        } else {
+            directFlag = true;
+        }
+        UserInfo pui = userInfoService.getById(parent.getUserId());
+
+        MerchantBaseInfo mbi = getMerchantBaseInfoByUserId(userId);
+
+        MerchantBaseInfoVO result = MerchantBaseInfoConverter.INSTANCE.domain2VO(mbi);
+        result.setCreateDt(mchUserApp.getCreateDt());
+        result.setContactName(mchUserApp.getUserName());
+        result.setContactMobile(ui.getPhone().substring(0, 11));
+        result.setParentContactName(parent.getUserName());
+        result.setParentContactMobile(pui.getPhone().substring(0, 11));
+
+        MerchantChannelStatus mcs = mcsService.getValidData(mbi.getMerchantCode());
+
+        LambdaQueryWrapper<MerchantImage> qWrapperImg = Wrappers.lambdaQuery();
+        qWrapperImg.eq(MerchantImage::getMerchantCode, mbi.getMerchantCode());
+        qWrapperImg.in(MerchantImage::getPhotoType, MerchantImage.ImageType.SHOP_FRONT_DOOR,
+                MerchantImage.ImageType.STORE_INTERIOR_PHOTO, MerchantImage.ImageType.CASH_DESK_PHOTO,
+                MerchantImage.ImageType.CASH_DESK_WITH_PERSON);
+
+        List<MerchantImage> miList = imageService.list(qWrapperImg);
+        for (MerchantImage mi : miList) {
+            switch (mi.getPhotoType()) {
+                case MerchantImage.ImageType.SHOP_FRONT_DOOR:
+                    result.setStoreHeadPic(mi.getPicUrl());
+                    break;
+                case MerchantImage.ImageType.STORE_INTERIOR_PHOTO:
+                    result.setStoreInsidePic(mi.getPicUrl());
+                    break;
+                case MerchantImage.ImageType.CASH_DESK_PHOTO:
+                    result.setCashPic(mi.getPicUrl());
+                    break;
+                case MerchantImage.ImageType.CASH_DESK_WITH_PERSON:
+                    result.setCashDeskWithPerson(mi.getPicUrl());
+                    break;
+                case MerchantImage.ImageType.HAND_IDCARD_PHOTO:
+                    result.setHandIdCard(mi.getPicUrl());
+                    break;
+                default:
+                    break;
+            }
+        }
+
+        if (mcs == null || Objects.equals(MerchantChannelStatus.AUDIT_STATUS_REJECT, mcs.getStatus())) {
+            return result;
+        }
+
+        if (directFlag || Objects.equals(MerchantChannelStatus.AUDIT_STATUS_SUCCESS, mcs.getStatus())) {
+            String currentDate = DateUtil.format(new Date(), "yyyy-MM-dd");
+
+            // 计算商户交易信息
+            Map<String, Object> dayBillMap = merchantOrderMapper.getConsumeFee(mbi.getMerchantCode(), currentDate);
+            if (dayBillMap != null) {
+                result.setDayBillCount(dayBillMap.get("count").toString());
+                result.setDayBillSum(dayBillMap.get("fee").toString());
+            } else {
+                result.setDayBillCount("0");
+                result.setDayBillSum("0.00");
+            }
+
+            // 计算商户上月交易信息
+            DateTime date = DateUtil.lastMonth();
+            date.setField(DateField.DAY_OF_MONTH, 1);
+            MerchantOrderStatistics mos = new MerchantOrderStatistics();
+            mos.setMerchantCode(mcs.getMerchantCode());
+            mos.setStartDate(LocalDate.of(date.year(), date.month() + 1, date.dayOfMonth()));
+            mos = mosService.getOne(new QueryWrapper<>(mos));
+
+            if (mos == null) {
+                result.setLastMonthBillCount("0");
+                result.setLastMonthBillSum("0.00");
+            } else {
+                result.setLastMonthBillCount((mos.getCount() - mos.getRetCount()) + "");
+                result.setLastMonthBillSum(mos.getTotalFee().subtract(mos.getRetFee()).setScale(2, RoundingMode.HALF_EVEN).toPlainString());
+            }
+
+            // 计算商户今年的交易信息
+            QueryWrapper<MerchantOrderStatistics> qWrapper = new QueryWrapper<>();
+            qWrapper.eq("merchantCode", mcs.getMerchantCode());
+            qWrapper.likeRight("startDate", new DateTime().year());
+            qWrapper.select("SUM(totalFee) totalFee, SUM(count) count, SUM(retFee) retFee, SUM(retCount) retCount");
+            qWrapper.groupBy("merchantCode");
+            mos = mosService.getOne(qWrapper);
+            if (mos == null) {
+                result.setYearBillCount("0");
+                result.setYearBillSum("0.00");
+            } else {
+                result.setYearBillCount((mos.getCount() - mos.getRetCount()) + "");
+                result.setYearBillSum(mos.getTotalFee().subtract(mos.getRetFee()).setScale(2, RoundingMode.HALF_EVEN).toPlainString());
+            }
+
+            // 计算商户总的交易信息
+            LambdaQueryWrapper<MerchantOrderStatistics> qWrapper2 = Wrappers.lambdaQuery();
+            qWrapper2.eq(MerchantOrderStatistics::getMerchantCode, mcs.getMerchantCode());
+            qWrapper2.likeRight(MerchantOrderStatistics::getStartDate, "1970-01-01");
+            mos = mosService.getOne(qWrapper2);
+            if (mos == null) {
+                result.setAllBillCount("0");
+                result.setAllBillSum("0.00");
+            } else {
+                result.setAllBillCount((mos.getCount() - mos.getRetCount()) + "");
+                result.setAllBillSum(mos.getTotalFee().subtract(mos.getRetFee()).setScale(2, RoundingMode.HALF_EVEN).toPlainString());
+            }
+        }
+
+        return result;
+    }
+
+    @Override
+    public List<MerchantBaseInfo> getAllByUserId(String userId) {
+        MerchantBaseInfo merchantBaseInfo = getMerchantBaseInfoByUserId(userId);
+        if (merchantBaseInfo == null) {
+            return new ArrayList<>();
+        }
+
+        if (StringUtils.isEmpty(merchantBaseInfo.getBindingCode())) {
+            return Collections.singletonList(merchantBaseInfo);
+        }
+
+        MerchantBaseInfo condition = new MerchantBaseInfo().setBindingCode(merchantBaseInfo.getBindingCode());
+        return list(new QueryWrapper<>(condition));
+    }
+
+    @Override
+    public void saveMerchantBaseInfo(MerchantBaseInfoDTO merchantBaseInfoDTO) {
+        Dict condition = new Dict().setValue(merchantBaseInfoDTO.getAlias());
+        Dict banAlias = dictService.getByCode("BAN_ALIAS", condition);
+        if (banAlias != null) {
+            throw new MsgException("商户简称不合规，请不要使用行业泛词或敏感词汇");
+        }
+
+        UserApp userAppToken = userAppService.queryUserAppByToken();
+        merchantBaseInfoDTO.setUserId(userAppToken.getUserId() + "");
+        UserInfo userInfo = userInfoService.getById(userAppToken.getUserId());
+        merchantBaseInfoDTO.setContactMobile(userInfo.getPhone().substring(0, 11));
+
+        UserApp pUserApp = null;
+        if (userAppToken.getParentId() != null) {
+            pUserApp = userAppService.getOne(new QueryWrapper<UserApp>().eq("userId", userAppToken.getParentId()));
+        }
+
+        IdCard idCard = idCardService.getCertIdCard(userAppToken.getUserId() + "");
+        merchantBaseInfoDTO.setContactName(idCard.getCertName());
+
+        // 商户全称先按照小微的格式来填写，若有营业执照，在填写营业执照的时候会将商户全称修改为营业执照名称
+        if ("1".equals(merchantBaseInfoDTO.getMerchantType())) {
+            merchantBaseInfoDTO.setMerchantName("商户_" + idCard.getCertName());
+        }
+
+        // 商家名称 //经营范围 //联系人姓名 //联系人电话 //联系人邮箱 //店铺所在地区 //详细地址
+        MerchantBaseInfo mbi = merchantBaseInfoDTO.convertMerchantBaseInfoDTO();
+        if (pUserApp != null && UserRoleEnum.ZY_BST.getCode().equals(pUserApp.getRoleCode())) {
+            mbi.setIsUnionPay(pUserApp.getIsUnionPay());
+        } else {
+            mbi.setIsUnionPay("1");
+        }
+
+        RegionCodeLs regionCode = reflectService.getLsRegionCode(mbi.getProvince(), mbi.getCity(), mbi.getDistrict());
+        if (regionCode != null) {
+            mbi.setAddressNo(regionCode.getProvinceCode() + "-" + regionCode.getCityCode() + "-" + regionCode.getAreaCode());
+        }
+
+        // 支付宝官方mccCode
+        String aliMcc = aliMccService.queryMccCode(mbi.getMcc());
+        mbi.setAliMcc(aliMcc);
+        String merchantCode = userAppToken.getMerchantCode();
+        if (StringUtils.isEmpty(merchantCode)) {
+            // 不存在商户Code
+            merchantCode = "M800" + DateUtil.format(new Date(), "yyyyMMdd") + StringUtil.random6V2();
+            mbi.setBindingCode(UUID.randomUUID().toString().replace("-", ""));
+            userAppToken.setMerchantCode(merchantCode);
+            userAppToken.setMerchantName(merchantBaseInfoDTO.getMerchantName());
+            userAppService.updateById(userAppToken);
+        }
+
+        mbi.setMerchantCode(merchantCode);
+        saveMerchantBaseInfo(mbi);
+
+        imageService.saveMerchantImageUpload(merchantCode, merchantBaseInfoDTO.getStoreHeadPic(), MerchantImage.ImageType.SHOP_FRONT_DOOR);
+        imageService.saveMerchantImageUpload(merchantCode, merchantBaseInfoDTO.getCashPic(), MerchantImage.ImageType.CASH_DESK_PHOTO);
+        imageService.saveMerchantImageUpload(merchantCode, merchantBaseInfoDTO.getStoreInsidePic(), MerchantImage.ImageType.STORE_INTERIOR_PHOTO);
+
+        // 咸鱼字段极多，待清理
+        MerchantStore merchantStore = new MerchantStore().setMerchantCode(mbi.getMerchantCode());
+        merchantStore = merchantStoreService.queryMerchantStore(merchantStore);
+        if (merchantStore == null) {
+            merchantStore = MerchantBaseInfoConverter.INSTANCE.baseInfo2StoreInfo(mbi);
+            if (pUserApp != null) {
+                merchantStore.setIsMarket(pUserApp.getIsMarket());
+                merchantStore.setPayEcdemicSwitch(pUserApp.getPayEcdemicSwitch());
+            }
+            merchantStore.setStoreId(StringUtil.genRandomNum(6));
+            merchantStore.setStatus("1");
+            merchantStore.setCreateDt(new Date());
+            merchantStoreService.saveMerchantStore(merchantStore);
+        } else {
+            merchantStore.setStoreName(mbi.getAlias());
+            merchantStore.setMerchantName(mbi.getAlias());
+            merchantStoreService.updateMerchantStore(merchantStore);
+        }
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void saveBusinessLicense(BusinessLicenseDTO businessLicenseDTO) {
+        // if (!USCCUtil.checkUSCC(businessLicenseDTO.getBussAuthNum())) {
+        //     throw new MsgException("营业执照号校验不通过，请仔细核对修改后再提交");
+        // }
+
+        UserApp tokenUa = userAppService.queryUserAppByToken();
+
+        LambdaQueryWrapper<MerchantChannelStatus> qMcsWrapper = Wrappers.lambdaQuery();
+        qMcsWrapper.eq(MerchantChannelStatus::getMerchantCode, tokenUa.getMerchantCode());
+        qMcsWrapper.in(MerchantChannelStatus::getStatus,
+                MerchantChannelStatus.AUDIT_STATUS_EXAMINING,
+                MerchantChannelStatus.AUDIT_STATUS_SUCCESS,
+                MerchantChannelStatus.AUDIT_STATUS_WAITING_SIGN,
+                MerchantChannelStatus.AUDIT_STATUS_SIGNED);
+        MerchantChannelStatus mcs = mcsService.getOne(qMcsWrapper.last("limit 1"));
+
+        MsgException.checkNonNull(mcs, "当前状态暂不支持修改商户信息");
+
+        final IdCard certIdCard = idCardService.getCertIdCard(tokenUa.getUserId());
+
+        if (!Objects.equals(certIdCard.getCertName(), businessLicenseDTO.getPrincipalPerson())) {
+            throw new MsgException("【营业执照所属人】必须与【实名身份信息】保持一致");
+        }
+
+        String bussAuthAddress = businessLicenseDTO.getBussAuthAddress();
+        businessLicenseDTO.setBussAuthAddress(StringUtil.replaceNonLegalChar(bussAuthAddress));
+
+        String bussAuthName = businessLicenseDTO.getBussAuthName();
+        businessLicenseDTO.setBussAuthName(StringUtil.replaceNonLegalChar(bussAuthName));
+
+        MerchantBaseInfo existMbi = getMerchantBaseInfoByUserId(businessLicenseDTO.getUserId() + "");
+        MsgException.checkEquals("1", existMbi.getMerchantType(), "小微商户不需要营业执照");
+        existMbi.setMerchantName(businessLicenseDTO.getBussAuthName());
+
+        // 营业执照类型 //营业执照号码 //营业执照图片 //营业执照名称 //经营者姓名 //注册地址 //有效开始期 //有效结束期
+        Long userId = businessLicenseDTO.getUserId();
+        MsgException.checkNull(userId, CommonError.NO_LOGIN);
+
+        UserApp userApp = new UserApp();
+        userApp.setUserId(userId);
+        userApp = userAppService.queryUserApp(userApp);
+
+        MsgException.checkNull(userApp, CommonError.NO_EXIST_ACCOUNT);
+
+        // 营业执照所属人发生变化，则将现有的法人信息清理掉
+        if (!Objects.equals(existMbi.getPrincipalPerson(), businessLicenseDTO.getPrincipalPerson())) {
+            LambdaQueryWrapper<IdCard> qWrapper = Wrappers.lambdaQuery();
+            qWrapper.eq(IdCard::getUserId, userApp.getUserId()).eq(IdCard::getUserType, IdCard.TYPE_LEGAL);
+            idCardService.remove(qWrapper);
+        }
+
+        existMbi = businessLicenseDTO.convertBusinessLicenseDTO();
+
+        String merchantCode = userApp.getMerchantCode();
+        // 不存在商户Code
+        if (StringUtils.isEmpty(merchantCode)) {
+            merchantCode = "M800" + DateUtil.format(new Date(), "yyyyMMdd") + StringUtil.random6V2();
+            existMbi.setMerchantCode(merchantCode);
+            existMbi.setBindingCode(UUID.randomUUID().toString().replace("-", ""));
+            saveMerchantBaseInfo(existMbi);
+            userApp.setMerchantCode(merchantCode);
+            userAppService.updateById(userApp);
+        } else {
+            existMbi.setMerchantCode(merchantCode);
+        }
+
+        saveMerchantBaseInfo(existMbi);
+
+        MerchantImage merchantImage = new MerchantImage();
+        merchantImage.setPhotoType(MerchantImage.ImageType.BUSINESS_LICENSE).setMerchantCode(existMbi.getMerchantCode());
+        merchantImage.setPicUrl(businessLicenseDTO.getBusinessLicensePic());
+
+        imageService.saveMerchantImageUpload(merchantImage.getMerchantCode(), merchantImage.getPicUrl(), merchantImage.getPhotoType());
+    }
+
+    @Override
+    public MerchantBaseInfo getMerchantBaseInfoByUserId(String userId) {
+        LambdaQueryWrapper<MerchantBaseInfo> qWrapper = new LambdaQueryWrapper<MerchantBaseInfo>().eq(MerchantBaseInfo::getUserId, userId);
+        return baseMapper.selectOne(qWrapper);
+    }
+
+    @Override
+    public MerchantBaseInfo getMerchantBaseInfoByMerchantCode(String merchantCode) {
+        LambdaQueryWrapper<MerchantBaseInfo> qWrapper = new LambdaQueryWrapper<MerchantBaseInfo>().eq(MerchantBaseInfo::getMerchantCode, merchantCode);
+        return baseMapper.selectOne(qWrapper);
+    }
+
+    @Override
+    public MerchantBaseInfo queryMerchantBaseInfo(MerchantBaseInfo merchantBaseInfo) {
+        return baseMapper.queryMerchantBaseInfo(merchantBaseInfo);
+    }
+
+    @Override
+    public List<MerchantBaseInfo> queryMerchantBaseInfoList(MerchantBaseInfo merchantBaseInfo) {
+        return baseMapper.queryMerchantBaseInfoList(merchantBaseInfo);
+    }
+
+    // @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void saveMerchantBaseInfo(MerchantBaseInfo mbi) {
+        String address = mbi.getAddress();
+        mbi.setAddress(StringUtil.replaceNonLegalChar(address));
+
+        String merchantName = mbi.getMerchantName();
+        mbi.setMerchantName(StringUtil.replaceNonLegalChar(merchantName));
+
+        MerchantBaseInfo existData = getMerchantBaseInfoByUserId(mbi.getUserId());
+
+        if (existData != null) {
+            String existDataMerchantType = existData.getMerchantType();
+            String newMerchantType = mbi.getMerchantType();
+            // 商户类型为空则表明是更新营业执照
+            if (StringUtils.isNotEmpty(newMerchantType) && !newMerchantType.equals(existDataMerchantType)) {
+                LambdaQueryWrapper<IdCard> qWrapper = Wrappers.lambdaQuery();
+                qWrapper.eq(IdCard::getUserId, mbi.getUserId()).eq(IdCard::getUserType, IdCard.TYPE_LEGAL);
+                idCardService.remove(qWrapper);
+                accountService.delAccount(mbi.getUserId(), Account.CHANNEL_TYPE_D1);
+                accountService.delAccount(mbi.getUserId(), Account.CHANNEL_TYPE_D0);
+            }
+
+            mbi.setId(existData.getId());
+            baseMapper.updateById(mbi);
+        } else {
+            baseMapper.insert(mbi);
+        }
+    }
+
+    @Override
+    public void updateMerchantBaseInfo(MerchantBaseInfo merchantBaseInfo) {
+        merchantBaseInfo.setUpdateDt(new Date());
+        baseMapper.updateMerchantBaseInfo(merchantBaseInfo);
+    }
+
+    @Override
+    public void deleteMerchantBaseInfo(MerchantBaseInfo merchantBaseInfo) {
+        baseMapper.deleteMerchantBaseInfo(merchantBaseInfo);
+    }
+
+    @Override
+    public List<MerchantBaseInfo> queryMerchantBaseInfoPage(Map map) {
+        return baseMapper.queryMerchantBaseInfoPage(map);
+    }
+
+    @Override
+    public Integer queryMerchantBaseInfoPageCount(Map map) {
+        return baseMapper.queryMerchantBaseInfoPageCount(map);
+    }
+
+    @Override
+    public List<MerchantBaseNewVO> queryMerchantBaseNewPage(Map<String, Object> map) {
+        List<MerchantBaseNewVO> queryMerchantBaseNewPage = baseMapper.queryMerchantBaseNewPage(map);
+        for (MerchantBaseNewVO merchantBaseNewVO : queryMerchantBaseNewPage) {
+            MerchantStore merchantStore = new MerchantStore();
+            merchantStore.setMerchantCode(merchantBaseNewVO.getMerchantCode());
+            List<MerchantStore> queryMerchantStoreList = merchantStoreService.queryMerchantStoreList(merchantStore);
+            merchantBaseNewVO.setStoreNameList(queryMerchantStoreList);
+        }
+        return queryMerchantBaseNewPage;
+    }
+
+    public List<MerchantBaseNewVO> queryMerchantNoBaseNewPage(Map<String, Object> map) {
+        List<MerchantBaseNewVO> queryMerchantNoBaseNewPage = baseMapper.queryMerchantNoBaseNewPage(map);
+        for (MerchantBaseNewVO merchantBaseNewVO : queryMerchantNoBaseNewPage) {
+            MerchantStore merchantStore = new MerchantStore();
+            merchantStore.setMerchantCode(merchantBaseNewVO.getMerchantCode());
+            List<MerchantStore> queryMerchantStoreList = merchantStoreService.queryMerchantNoStoreList(merchantStore);
+            merchantBaseNewVO.setStoreNameList(queryMerchantStoreList);
+        }
+        return queryMerchantNoBaseNewPage;
+    }
+
+    @Override
+    public Integer queryMerchantBaseNewPageCount(Map<String, Object> map) {
+        return baseMapper.queryMerchantBaseNewPageCount(map);
+    }
+
+    public Integer queryMerchantNoBaseNewPageCount(Map<String, Object> map) {
+        return baseMapper.queryMerchantNoBaseNewPageCount(map);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void saveMerchantUser(MerchantBaseInfoDTO merchantBaseInfoDTO) {
+
+        UserApp tokenUa = userAppService.checkApiToken();
+        merchantBaseInfoDTO.setUserId(tokenUa.getUserId() + "");
+        // 当前userId
+        String userId = merchantBaseInfoDTO.getUserId();
+
+        UserInfo tokenUserInfo = userInfoService.getById(userId);
+
+        final MerchantStore tokenMs = merchantStoreService.getStoreByMerchantCode(tokenUa.getMerchantCode());
+        final MerchantBaseInfo tokenMbi = getMerchantBaseInfoByUserId(userId);
+
+        String userPhone = merchantBaseInfoDTO.getUserPhone();
+        String suffix = userPhone.substring(userPhone.length() - 6);
+        merchantBaseInfoDTO.setUserPhone(tokenUserInfo.getLoginName() + "@" + suffix);
+        String merchantName = merchantBaseInfoDTO.getMerchantName();
+        merchantName = StringUtil.replaceNonLegalChar(merchantName);
+        merchantBaseInfoDTO.setMerchantName(merchantName);
+
+        merchantBaseInfoDTO.setContactMobile(tokenUserInfo.getPhone().substring(0, 11));
+
+        IdCard idCard = idCardService.getCertIdCard(userId);
+        merchantBaseInfoDTO.setContactName(idCard.getCertName());
+
+        UserApp userApp = new UserApp();
+        userApp.setUserId(Long.valueOf(userId));
+        List<UserApp> queryUserAppList = userAppService.queryUserAppList(userApp);
+
+        MsgException.checkBlank(queryUserAppList, "无当前账号");
+        userApp = queryUserAppList.get(0);
+
+        MerchantBaseInfo merchantBaseInfo = new MerchantBaseInfo();
+        merchantBaseInfo.setUserId(userId);
+        merchantBaseInfo = queryMerchantBaseInfo(merchantBaseInfo);
+        MsgException.checkNull(merchantBaseInfo, "添加失败");
+
+        // 多商户关联码
+        String bindingCode = merchantBaseInfo.getBindingCode();
+        if (bindingCode == null) {
+            bindingCode = UUID.randomUUID().toString().replace("-", "");
+            merchantBaseInfo.setBindingCode(bindingCode);
+            updateById(merchantBaseInfo);
+        }
+
+        MsgException.checkBlank(bindingCode, "添加失败");
+
+        MerchantBaseInfo merchantBaseInfo2 = new MerchantBaseInfo();
+        merchantBaseInfo2.setBindingCode(bindingCode);
+        List<MerchantBaseInfo> queryMerchantBaseInfoList2 = queryMerchantBaseInfoList(merchantBaseInfo2);
+        if (queryMerchantBaseInfoList2 != null && queryMerchantBaseInfoList2.size() > 10) {
+            throw new MsgException("最多添加十个门店");
+        }
+
+        MerchantBaseInfo baseInfo = merchantBaseInfoDTO.convertMerchantBaseInfoDTO();
+        val regionCode = reflectService.getLsRegionCode(baseInfo.getProvince(), baseInfo.getCity(), baseInfo.getDistrict());
+        if (regionCode != null) {
+            baseInfo.setAddressNo(regionCode.getProvinceCode() + "-" + regionCode.getCityCode() + "-" + regionCode.getAreaCode());
+        }
+        baseInfo.setBindingCode(bindingCode);
+        UserInfo userInfo = new UserInfo();
+        userInfo.setPhone(merchantBaseInfoDTO.getUserPhone());
+        List<UserInfo> queryUserInfoList = userInfoService.queryUserInfoList(userInfo);
+
+        MsgException.checkNonBlank(queryUserInfoList, CommonError.PHONE_HAS_REGISTER);
+
+        userInfo.setLoginName(merchantBaseInfoDTO.getUserPhone());
+        userInfo.setPassword(MD5Util.MD5Encode(merchantBaseInfoDTO.getUserPassWord(), "utf-8"));
+        userInfoService.saveUserInfo(userInfo);
+        String roleType = "promoter_role_id";
+        Long roleId = null;
+        // 获取全部的角色信息
+        List<SystemConfig> systemConfigs = systemConfigService.querySystemConfigList(new SystemConfig());
+        for (SystemConfig systemConfig : systemConfigs) {
+            if (systemConfig.getPropertyKey().equalsIgnoreCase(roleType)) {
+                roleId = Long.parseLong(systemConfig.getPropertyValue());
+                break;
+            }
+        }
+
+        MsgException.checkNull(roleId, "获取角色信息错误！");
+
+        RoleUserInfo role = new RoleUserInfo();
+        role.setRoleId(roleId);
+        role.setUserId(userInfo.getId());
+        roleUserInfoService.saveRoleUserInfo(role);
+        UserApp userApp2 = new UserApp();
+        userApp2.setUserId(userInfo.getId());
+        userApp2.setLevel(1);// 默认一级推广员
+        userApp2.setCreateDt(new Date());
+        userApp2.setStatus(0);
+        String merchantCode = "M800" + DateUtil.format(new Date(), "yyyyMMdd") + StringUtil.random6V2();
+        userApp2.setMerchantCode(merchantCode);
+        userApp2.setMerchantName(merchantBaseInfoDTO.getAlias());
+        userApp2.setUserType("promoter");
+        userApp2.setInviteNum(StringUtil.genRandomNum(5));
+        userApp2.setParentId(userApp.getParentId());
+        userApp2.setUserName(userApp.getUserName());
+        userApp2.setSort(userApp.getSort());
+        userApp2.setRoleCode(userApp.getRoleCode());
+        userApp2.setLevelCode(userApp.getLevelCode());
+        userApp2.setSpreadFlag("0");
+        userAppService.save(userApp2);// 新添加的账号
+        String aliMcc = aliMccService.queryMccCode(merchantBaseInfo.getMcc());// 支付宝官方mccCode
+        baseInfo.setAliMcc(aliMcc);
+        baseInfo.setMerchantCode(merchantCode);
+        baseInfo.setIsUnionPay(tokenMbi.getIsUnionPay());
+        baseInfo.setBindingCode(bindingCode);
+        baseInfo.setUserId(userApp2.getUserId() + "");
+        baseInfo.setAlias(merchantBaseInfoDTO.getAlias());
+        saveMerchantBaseInfo(baseInfo);
+
+        // 新建子商户的时候需要同时创建merchant_store
+        MerchantStore merchantStore = MerchantBaseInfoConverter.INSTANCE.baseInfo2StoreInfo(baseInfo);
+        merchantStore.setStoreId(StringUtil.genRandomNum(6));
+        merchantStore.setStatus("1");
+        merchantStore.setIsMarket(tokenMs.getIsMarket());
+        merchantStore.setPayEcdemicSwitch(tokenMs.getPayEcdemicSwitch());
+        merchantStore.setCreateDt(new Date());
+        merchantStoreService.saveMerchantStore(merchantStore);
+
+        userApp2.setMerchantName(merchantBaseInfoDTO.getMerchantName());
+
+        BankCard bankCard = new BankCard().setUserId(userId).setAccountType(BankCard.ACCOUNT_TYPE_CERT);
+        bankCard = bankCardService.getOne(new QueryWrapper<>(bankCard));
+
+        if (bankCard != null) {
+            idCard.setUserId(userInfo.getId() + "");
+            idCard.setId(null);
+            idCard.setCreateTime(new Date());
+            idCard.setUpdateTime(new Date());
+            idCardService.save(idCard);
+
+            bankCard.setUserId(userInfo.getId() + "");
+            bankCard.setId(null);
+            bankCard.setCreateTime(new Date());
+            bankCard.setUpdateTime(new Date());
+            bankCardService.save(bankCard);
+
+            userApp2.setStatus(3);
+            userApp2.setBankStatus(3);
+            userAppService.updateById(userApp2);
+        }
+
+        // 门头照
+        imageService.saveMerchantImageUpload(merchantCode, merchantBaseInfoDTO.getStoreHeadPic(), MerchantImage.ImageType.SHOP_FRONT_DOOR);
+        imageService.saveMerchantImageUpload(merchantCode, merchantBaseInfoDTO.getCashPic(), MerchantImage.ImageType.CASH_DESK_PHOTO);
+        imageService.saveMerchantImageUpload(merchantCode, merchantBaseInfoDTO.getStoreInsidePic(), MerchantImage.ImageType.STORE_INTERIOR_PHOTO);
+    }
+
+    /**
+     * 商户活动奖励金发放
+     *
+     * @param merchantCode 商编
+     * @param consumeFee   消费金额
+     */
+    @Async
+    @Override
+    public void grantMerchantMarket(String merchantCode, Double consumeFee) {
+        log.debug("===================>奖励金发放操作开始,商户编号:" + merchantCode + "<=====================");
+        QueryWrapper<ActivityEnroll> queryWrapper = new QueryWrapper<ActivityEnroll>().eq("merchantCode", merchantCode)
+                .eq("status", "1").isNotNull("actType");
+        List<ActivityEnroll> actEnrollList = activityEnrollMapper.selectList(queryWrapper);
+        if (actEnrollList.isEmpty()) {
+            log.debug("===================>奖励金发放操作结束,商户编号:" + merchantCode + "未参加活动<=====================");
+            return;
+        }
+        QueryWrapper<UserApp> baseQuery = new QueryWrapper<UserApp>().eq("merchantCode", merchantCode)
+                .eq("userType", "promoter");
+        UserApp app = userAppService.getOne(baseQuery);
+        if (app == null) {
+            log.debug("===================>奖励金发放操作结束,商户编号:" + merchantCode + "的商户用户信息不存在<=====================");
+            return;
+        }
+        for (ActivityEnroll enroll : actEnrollList) {
+            Date auditTime = enroll.getAuditTime();
+            if (auditTime == null) {
+                auditTime = enroll.getUpdateTime();
+            }
+            QueryWrapper<MerchantMarket> ketQuery = new QueryWrapper<MerchantMarket>().eq("userId", app.getUserId()).in("source", 1, 2, 5);
+            List<MerchantMarket> lists = merchantMarketMapper.selectList(ketQuery);
+            BigDecimal marketCount = BigDecimal.ZERO;
+            if (!lists.isEmpty()) {
+                for (MerchantMarket mm : lists) {
+                    marketCount = marketCount.add(mm.getMarketAmt());
+                }
+            }
+            String dateStr = new SimpleDateFormat("yyyy-MM-dd").format(auditTime);
+            BigDecimal tradeAmt = merchantOrderMapper.getCountMaketAmtAndDate(merchantCode, dateStr);
+            BigDecimal countTradeAmt = tradeAmt.add(new BigDecimal(String.valueOf(consumeFee)));
+            if ("1".equals(enroll.getActType())) {
+                BigDecimal marketQuota = new BigDecimal("500000");
+                BigDecimal addMarket = new BigDecimal("199");
+                String value = systemConfigService.querySystemConfigValue("activityTransMarketQuota");
+                if (StringUtils.isNotEmpty(value)) {
+                    marketQuota = new BigDecimal(value.split("-")[0]);
+                    addMarket = new BigDecimal(value.split("-")[1]);
+                }
+                if (countTradeAmt.compareTo(marketQuota) >= 0 && lists.size() == 0) {
+                    MerchantMarket market = new MerchantMarket();
+                    market.setCreateTime(new Date());
+                    market.setSource(enroll.getActType());
+                    market.setMarketAmt(addMarket);
+                    market.setUserId(app.getUserId());
+                    market.setUserName(app.getUserName());
+                    merchantMarketMapper.insert(market);
+                    log.debug("===================>奖励金发放操作结束,商户编号:" + merchantCode + ",成功发放扫码王返利奖励金，发放奖励金数量为:" + addMarket + "元<=====================");
+                } else if (countTradeAmt.compareTo(marketQuota) >= 0 && lists.size() != 0) {
+                    if (addMarket.compareTo(marketCount) > 0) {
+                        MerchantMarket m = new MerchantMarket();
+                        m.setCreateTime(new Date());
+                        m.setSource(enroll.getActType());
+                        m.setMarketAmt(addMarket.subtract(marketCount).setScale(2, BigDecimal.ROUND_HALF_UP));
+                        m.setUserId(app.getUserId());
+                        m.setUserName(app.getUserName());
+                        merchantMarketMapper.insert(m);
+                    }
+                    log.debug("===================>奖励金发放操作结束,商户编号:" + merchantCode + ",补发奖励金差价：" + addMarket.subtract(marketCount) + "<=====================");
+                } else {
+                    log.debug("===================>奖励金发放操作结束,商户编号:" + merchantCode + ",不符合发放扫码王返利奖励金条件<=====================");
+                }
+            } else if ("2".equals(enroll.getActType())) {
+                BigDecimal marketQuota = new BigDecimal("250000");
+                BigDecimal addMarket = new BigDecimal("99");
+                String value = systemConfigService.querySystemConfigValue("activityTransP117Quota");
+                if (StringUtil.isNotEmpty(value)) {
+                    marketQuota = new BigDecimal(value.split("-")[0]);
+                    addMarket = new BigDecimal(value.split("-")[1]);
+                }
+                if (countTradeAmt.compareTo(marketQuota) >= 0 && lists.isEmpty()) {
+                    MerchantMarket market = new MerchantMarket();
+                    market.setCreateTime(new Date());
+                    market.setSource(enroll.getActType());
+                    market.setMarketAmt(addMarket);
+                    market.setUserId(app.getUserId());
+                    market.setUserName(app.getUserName());
+                    merchantMarketMapper.insert(market);
+                    log.debug("===================>奖励金发放操作结束,商户编号:" + merchantCode + ",成功发放云音箱返利奖励金，发放奖励金数量为:" + addMarket + "元<=====================");
+                } else if (countTradeAmt.compareTo(marketQuota) >= 0 && !lists.isEmpty()) {
+                    if (addMarket.compareTo(marketCount) > 0) {
+                        MerchantMarket m = new MerchantMarket();
+                        m.setCreateTime(new Date());
+                        m.setSource(enroll.getActType());
+                        m.setMarketAmt(addMarket.subtract(marketCount).setScale(2, RoundingMode.HALF_UP));
+                        m.setUserId(app.getUserId());
+                        m.setUserName(app.getUserName());
+                        merchantMarketMapper.insert(m);
+                    }
+                    log.debug("===================>奖励金发放操作结束,商户编号:" + merchantCode + ",补发奖励金差价：" + addMarket.subtract(marketCount) + "<=====================");
+                } else {
+                    log.debug("===================>奖励金发放操作结束,商户编号:" + merchantCode + ",不符合发放扫码王返利奖励金条件<=====================");
+                }
+            } else if ("5".equals(enroll.getActType())) {
+                BigDecimal marketQuota = new BigDecimal("500000");
+                BigDecimal addMarket = new BigDecimal("169");
+                String value = systemConfigService.querySystemConfigValue("activityTransCG02Quota");
+                if (StringUtils.isNotEmpty(value)) {
+                    marketQuota = new BigDecimal(value.split("-")[0]);
+                    addMarket = new BigDecimal(value.split("-")[1]);
+                }
+                if (countTradeAmt.compareTo(marketQuota) >= 0 && lists.isEmpty()) {
+                    MerchantMarket market = new MerchantMarket();
+                    market.setCreateTime(new Date());
+                    market.setSource(enroll.getActType());
+                    market.setMarketAmt(addMarket);
+                    market.setUserId(app.getUserId());
+                    market.setUserName(app.getUserName());
+                    merchantMarketMapper.insert(market);
+                    log.debug("===================>奖励金发放操作结束,商户编号:" + merchantCode + ",成功发放4G音箱返利奖励金，发放奖励金数量为:" + addMarket + "元<=====================");
+                } else if (countTradeAmt.compareTo(marketQuota) >= 0 && !lists.isEmpty()) {
+                    if (addMarket.compareTo(marketCount) > 0) {
+                        MerchantMarket m = new MerchantMarket();
+                        m.setCreateTime(new Date());
+                        m.setSource(enroll.getActType());
+                        m.setMarketAmt(addMarket.subtract(marketCount).setScale(2, RoundingMode.HALF_UP));
+                        m.setUserId(app.getUserId());
+                        m.setUserName(app.getUserName());
+                        merchantMarketMapper.insert(m);
+                    }
+                    log.debug("===================>奖励金发放操作结束,商户编号:" + merchantCode + ",补发奖励金差价：" + addMarket.subtract(marketCount) + "<=====================");
+                } else {
+                    log.debug("===================>奖励金发放操作结束,商户编号:" + merchantCode + ",不符合发放扫码王返利奖励金条件<=====================");
+                }
+            }
+        }
+        log.debug("===================>商户编号:" + merchantCode + ",奖励金发放操作结束<=====================");
+    }
+
+    /**
+     * 关联分页查询商户信息
+     *
+     * @param merchantPage
+     * @param userApp
+     * @return
+     */
+    @Override
+    public Page<MerchantBaseInfo> pageJoinData(Page<MerchantBaseInfo> merchantPage, UserApp userApp) {
+        return this.baseMapper.pageJoinData(merchantPage, userApp);
+    }
+
+    /**
+     * 商户详情分页查询
+     *
+     * @param currPage
+     * @param size
+     * @param merchantBaseNewVO
+     * @return 分页数据
+     */
+    @Override
+    public Map<String, Object> listMerchantBaseInfoPage(Integer currPage, Integer size, String column, Boolean asc, MerchantBaseNewVO merchantBaseNewVO) {
+        Map<String, Object> result = new HashMap<>(16);
+        Map<String, Object> map = new HashMap<>(16);
+        map.put("column", column);
+        map.put("asc", asc);
+        if (StringUtils.isNotEmpty(merchantBaseNewVO.getUserId())) {
+            map.put("userId", merchantBaseNewVO.getUserId());
+        }
+        if (StringUtils.isNotEmpty(merchantBaseNewVO.getPhone())) {
+            map.put("phone", merchantBaseNewVO.getPhone());
+        }
+        if (StringUtils.isNotEmpty(merchantBaseNewVO.getParentIdPhone())) {
+            map.put("parentIdPhone", merchantBaseNewVO.getParentIdPhone());
+        }
+        map.put("pageSize", size);
+        map.put("offset", (currPage - 1) * size);
+        if (StringUtils.isNotEmpty(merchantBaseNewVO.getUserName())) {
+            map.put("userName", merchantBaseNewVO.getUserName());
+        }
+        if (StringUtils.isNotEmpty(merchantBaseNewVO.getAlias())) {
+            map.put("alias", merchantBaseNewVO.getAlias());
+        }
+        List<MerchantBaseNewVO> merchantBaseInfoList;
+        Integer count = 0;
+        merchantBaseInfoList = queryMerchantBaseNewPage(map);
+        count = queryMerchantBaseNewPageCount(map);
+        result.put("merchantBaseInfoList", merchantBaseInfoList);
+        result.put("count", count);
+        result.put("pageCount", StringUtil.getPageCount(count, PAGE_SIZE));
+        result.put("currPage", currPage);
+        result.put("code", 200);
+        return result;
+    }
+
+    @Override
+    public void apiSwitchBankLargePermission() {
+        UserApp userApp = userAppService.queryUserAppByToken();
+        MerchantBaseInfo mbi = getMerchantBaseInfoByUserId(userApp.getUserId() + "");
+        if (mbi == null) {
+            throw new MsgException("请先进件");
+        }
+
+        if ("0".equals(mbi.getAllowBankLarge())) {
+            mbi.setAllowBankLarge("1");
+        } else {
+            mbi.setAllowBankLarge("0");
+        }
+
+        updateById(mbi);
+    }
+
+    @Override
+    public void apiWxCertPass() {
+        UserApp userApp = userAppService.queryUserAppByToken();
+        MerchantChannelStatus mcs = mcsService.getValidData(userApp.getMerchantCode());
+
+        if (mcs == null) {
+            throw new MsgException("当前商户还未进件");
+        }
+
+        if (!MerchantChannelStatus.AUDIT_STATUS_SUCCESS.equals(mcs.getStatus())) {
+            throw new MsgException("当前商户还通过进件");
+        }
+
+        if (!Objects.equals(mcs.getAuthorizationStatus(), MerchantChannelStatus.AUTHORIZATION_STATUS_AUTHORIZED)) {
+            mcs.setAuthorizationStatus(MerchantChannelStatus.AUTHORIZATION_STATUS_AUTHORIZED);
+            mcsService.updateById(mcs);
+        }
+
+        MerchantBaseInfo mbi = getMerchantBaseInfoByUserId(userApp.getUserId() + "");
+        mbi.setWxCertStatus("1");
+        updateById(mbi);
+    }
+
+    @Override
+    public Page<MercOrderDataDTO> pageData(Page<MercOrderDataDTO> page, MercOrderDataDTO dto) {
+        return this.baseMapper.pageData(page, dto);
+    }
+
+    /**
+     * pageTradeData
+     *
+     * @param page:
+     * @param dto:
+     * @return com.baomidou.mybatisplus.extension.plugins.pagination.Page<cn.pluss.platform.dto.MercTradeDataDTO>
+     * @date: 2021/12/31 13:47
+     */
+    @Override
+    public Page<MercTradeDataDTO> pageTradeData(Page<MercTradeDataDTO> page, MercTradeDataDTO dto) {
+        if (!Objects.equals(dto.getCondition(), -1)) {
+            return baseMapper.pageTradeData(page, dto);
+        } else {
+            return pageTradeDataAll(page, dto);
+        }
+    }
+
+
+    private Page<MercTradeDataDTO> pageTradeDataAll(Page<MercTradeDataDTO> page, MercTradeDataDTO dto) {
+
+        MerchantBaseInfo mbi = null;
+        if (dto.getUserId() != null) {
+            mbi = getMerchantBaseInfoByUserId(dto.getUserId().toString());
+        }
+
+        Page<MercTradeDataDTO> result = new Page<>(page.getCurrent(), page.getSize());
+        result.setRecords(new ArrayList<>());
+
+        Page<MerchantOrderStatistics> page2 = new Page<>(page.getCurrent(), page.getSize());
+        if ("tradeSumAmt".equals(dto.getField())) {
+            if ("desc".equals(dto.getOrder())) {
+                page2.addOrder(OrderItem.desc("totalFee"));
+            } else {
+                page2.addOrder(OrderItem.asc("totalFee"));
+            }
+        } else if ("tradeSumNum".equals(dto.getField())) {
+            if ("desc".equals(dto.getOrder())) {
+                page2.addOrder(OrderItem.desc("count"));
+            } else {
+                page2.addOrder(OrderItem.asc("count"));
+            }
+        }
+
+        final QueryWrapper<MerchantOrderStatistics> qWrapper = new QueryWrapper<>();
+        qWrapper.eq("startDate", "1970-01-01");
+        if (dto.getUserId() != null) {
+            qWrapper.eq("merchantCode", mbi.getMerchantCode());
+        }
+
+        page2 = mosService.page(page2, qWrapper);
+
+        result.setTotal(page2.getTotal());
+
+        if (page2.getRecords().size() == 0) {
+            return result;
+        }
+
+        List<String> merchantCodeList = new ArrayList<>();
+        for (MerchantOrderStatistics record : page2.getRecords()) {
+            MercTradeDataDTO item = new MercTradeDataDTO();
+            item.setAmtChain("-");
+            item.setNumChain("-");
+            item.setMerchantCode(record.getMerchantCode());
+            item.setTradeSumAmt(record.getTotalFee());
+            item.setTradeSumNum(record.getCount());
+            item.setPrevTradeSumNum(0);
+            item.setPrevTradeSumAmt(BigDecimal.ZERO);
+
+            result.getRecords().add(item);
+
+            merchantCodeList.add(record.getMerchantCode());
+        }
+
+        Long userId = null;
+        if (dto.getUserId() != null) {
+            userId = dto.getUserId().longValue();
+        }
+        final List<MercTradeDataDTO> dataList = baseMapper.listMercData(userId, merchantCodeList);
+
+        Set<Long> userIdList = new HashSet<>();
+
+        for (MercTradeDataDTO item : dataList) {
+            userIdList.add(item.getUserId().longValue());
+            for (MercTradeDataDTO record : result.getRecords()) {
+                if (item.getMerchantCode().equals(record.getMerchantCode())) {
+                    Converter.INSTANCE.cp(item, record);
+                    break;
+                }
+            }
+        }
+
+        final Calendar cal = Calendar.getInstance();
+        cal.add(Calendar.DAY_OF_MONTH, -1);
+        LambdaQueryWrapper<MerchantBillStatistics> qWrapper3 = Wrappers.lambdaQuery();
+        qWrapper3.in(MerchantBillStatistics::getUserId, userIdList);
+        qWrapper3.eq(MerchantBillStatistics::getStartDate, DateUtil.format(cal.getTime(), "yyyy-MM-dd"));
+        qWrapper3.eq(MerchantBillStatistics::getType,1);
+        final List<MerchantBillStatistics> yesterdayData = mbsService.list(qWrapper3);
+
+        for (MerchantBillStatistics item : yesterdayData) {
+            for (MercTradeDataDTO record : result.getRecords()) {
+                if (item.getUserId().equals(record.getUserId())) {
+                    record.setPrevTradeSumAmt(item.getAmount());
+                    record.setPrevTradeSumNum(item.getCount());
+                    break;
+                }
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * 商户活跃度统计
+     *
+     * @param page:
+     * @param dto:
+     * @return com.baomidou.mybatisplus.extension.plugins.pagination.Page<cn.pluss.platform.dto.MercActiveDataDTO>
+     * @date: 2022/1/7 14:12
+     */
+    @Override
+    public Page<MercActiveDataDTO> pageActiveData(Page<MercActiveDataDTO> page, MercActiveDataDTO dto) {
+        return this.baseMapper.pageActiveData(page, dto);
+    }
+
+    /**
+     * 根据区域和角色查询商户信息
+     *
+     * @param areaList:
+     * @param roleCode:
+     * @date: 2022/3/1 16:33
+     */
+    @Override
+    public List<String> getAreaAndRoleList(List<String> areaList, String roleCode) {
+        return baseMapper.getAreaAndRoleList(areaList, roleCode);
+    }
+
+    /**
+     * 查询当前用户直推商户
+     * @param userId
+     * @return
+     */
+    @Override
+    public List<String> queryNextMercCodeByUserId(Serializable userId) {
+        return baseMapper.queryNextMercCodeByUserId(userId);
+    }
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/MerchantCashPayCodeServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/MerchantCashPayCodeServiceImpl.java
new file mode 100644
index 0000000..b924584
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/MerchantCashPayCodeServiceImpl.java
@@ -0,0 +1,75 @@
+package cn.pluss.platform.merchant.impl;
+
+import cn.pluss.platform.entity.MerchantCashPayCode;
+import cn.pluss.platform.entity.MerchantCashPlaceStaff;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.MerchantCashPayCodeMapper;
+import cn.pluss.platform.merchant.MerchantCashPayCodeService;
+import cn.pluss.platform.merchant.MerchantCashPlaceStaffService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 收银点和码牌关联记录表 服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-03-24
+ */
+@Service
+public class MerchantCashPayCodeServiceImpl extends ServiceImpl<MerchantCashPayCodeMapper, MerchantCashPayCode> implements MerchantCashPayCodeService {
+
+    @Autowired
+    private MerchantCashPlaceStaffService mcpsService;
+
+    @Override
+    public MerchantCashPayCode getByPayCode(String payCode) {
+        MerchantCashPayCode cashPayCode = new MerchantCashPayCode();
+        cashPayCode.setPayCode(payCode);
+        return getOne(new QueryWrapper<>(cashPayCode));
+    }
+
+    @Override
+    public void bindPayCode(MerchantCashPayCode merchantCashPayCode) {
+        MerchantCashPayCode existData = new MerchantCashPayCode();
+        existData.setCashPlaceId(merchantCashPayCode.getCashPlaceId());
+        existData = getOne(new QueryWrapper<>(existData));
+
+        if (existData != null) {
+            throw new MsgException("请先解绑已有收款码");
+        }
+
+        save(merchantCashPayCode);
+    }
+
+    @Override
+    public List<MerchantCashPayCode> getByCashPlaceIdList(List<Integer> cashPlaceIdList) {
+        QueryWrapper<MerchantCashPayCode> qWrapper = new QueryWrapper<>();
+        qWrapper.in("cashPlaceId", cashPlaceIdList);
+        return list(qWrapper);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void unbindPayCode(String payCode) {
+        QueryWrapper<MerchantCashPayCode> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("payCode", payCode);
+
+        MerchantCashPayCode connectInfo = new MerchantCashPayCode();
+        remove(queryWrapper);
+
+        LambdaUpdateWrapper<MerchantCashPlaceStaff> uWrapper = Wrappers.lambdaUpdate();
+        uWrapper.eq(MerchantCashPlaceStaff::getCashPlaceId, connectInfo.getCashPlaceId())
+                .set(MerchantCashPlaceStaff::getStatus, MerchantCashPlaceStaff.STATUS_LEAVE)
+                .set(MerchantCashPlaceStaff::getRemark, "码牌被解绑，强制下卡");
+        mcpsService.update(uWrapper);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/MerchantCashPlaceServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/MerchantCashPlaceServiceImpl.java
new file mode 100644
index 0000000..ef7df76
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/MerchantCashPlaceServiceImpl.java
@@ -0,0 +1,537 @@
+package cn.pluss.platform.merchant.impl;
+
+import cn.jiguang.common.utils.StringUtils;
+import cn.pluss.platform.converter.Converter;
+import cn.pluss.platform.converter.MerchantCashPlaceConverter;
+import cn.pluss.platform.deviceStock.DeviceStockService;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.MerchantCashPayCodeMapper;
+import cn.pluss.platform.mapper.MerchantCashPlaceMapper;
+import cn.pluss.platform.mapper.MerchantCashPlaceStaffMapper;
+import cn.pluss.platform.mapper.UserAppMapper;
+import cn.pluss.platform.merchant.MerchantCashPayCodeService;
+import cn.pluss.platform.merchant.MerchantCashPlaceService;
+import cn.pluss.platform.merchant.MerchantCashPlaceStaffService;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.util.StringUtil;
+import cn.pluss.platform.vo.MerchantCashPlaceStaffVO;
+import cn.pluss.platform.vo.MerchantCashPlaceVO;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.Setter;
+import lombok.val;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * <p>
+ * 商户收银点表 服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-03-23
+ */
+@Service
+public class MerchantCashPlaceServiceImpl extends ServiceImpl<MerchantCashPlaceMapper, MerchantCashPlace> implements MerchantCashPlaceService {
+
+    @Setter(onMethod_ = {@Autowired})
+    private UserAppService userAppService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantChannelStatusService channelStatusService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantCashPlaceStaffService cashPlaceStaffService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantBaseInfoService merchantBaseInfoService;
+
+    @Setter(onMethod_ = {@Autowired, @Lazy})
+    private MerchantCashPayCodeService cashPayCodeService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private DeviceStockService deviceStockService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantCashPayCodeMapper merchantCashPayCodeMapper;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantCashPlaceStaffMapper merchantCashPlaceStaffMapper;
+
+    @Setter(onMethod_ = {@Autowired})
+    private UserAppMapper userAppMapper;
+
+
+    @Override
+    public boolean saveOrUpdate(MerchantCashPlace entity) {
+
+        if (entity.getUserId() == null) {
+            throw new MsgException("缺少用户id");
+        }
+
+        UserApp userApp = new UserApp().setUserId(entity.getUserId());
+
+        MerchantBaseInfo mbi = merchantBaseInfoService.getMerchantBaseInfoByUserId(userApp.getUserId() + "");
+
+        checkAvailable(userApp.getUserId() + "", entity.getUserId() + "");
+
+        if (mbi.getMerchantCode() == null) {
+            throw new MsgException("请先完成商户进件");
+        }
+
+        // MerchantChannelStatus channelStatus = channelStatusService.getValidData(mbi.getMerchantCode());
+        // if (channelStatus == null) {
+        //     throw new MsgException("请先完成商户进件");
+        // }
+        //
+        // if (!MerchantChannelStatus.isAudited(channelStatus)) {
+        //     throw new MsgException("请先完成商户进件");
+        // }
+
+        if (StringUtils.isEmpty(entity.getName())) {
+            throw new MsgException("缺少收银台名称");
+        }
+
+        if (StringUtils.isNotEmpty(entity.getCode())) {
+            MerchantCashPlace existData = new MerchantCashPlace()
+                    .setCode(entity.getCode());
+            existData = getOne(new QueryWrapper<>(existData));
+
+            if (existData == null) {
+                throw new MsgException("收银台编号不存在或编号对应的商户不存在");
+            } else {
+                MerchantCashPayCode cashPayCode = new MerchantCashPayCode();
+                cashPayCode.setCashPlaceId(existData.getId());
+                cashPayCode = cashPayCodeService.getOne(new QueryWrapper<>(cashPayCode));
+                boolean flag = cashPayCode != null && cashPayCode.getPayCode().equals(userApp.getUserId() + "") && !entity.getUserId().equals(userApp.getUserId());
+                if (flag) {
+                    throw new MsgException("默认收银点无法修改归属商户");
+                }
+
+                entity.setId(existData.getId());
+            }
+        } else {
+            MerchantCashPlace existData = getOne(new QueryWrapper<>(entity));
+            if (existData != null) {
+                throw new MsgException("收银台名称不能重复");
+            }
+
+            String code;
+            while (true) {
+                code = StringUtil.genRandomNum(7);
+                MerchantCashPlace existData2 = new MerchantCashPlace().setCode(code);
+                existData2 = getOne(new QueryWrapper<>(existData2));
+                if (existData2 == null) {
+                    break;
+                }
+            }
+            entity.setCode(code);
+        }
+
+
+        entity.setBindingCode(mbi.getBindingCode());
+
+        // 查看对应的收银台是否已经存在
+        MerchantCashPlace existData = new MerchantCashPlace();
+        existData.setUserId(entity.getUserId());
+        existData.setName(entity.getName());
+
+        existData = getOne(new QueryWrapper<>(existData));
+        if (existData != null && !existData.getId().equals(entity.getId())) {
+            throw new MsgException("该收银点已存在");
+        }
+
+        return super.saveOrUpdate(entity);
+    }
+
+    /**
+     * 判断userId的多商户列表中是否包含selectUserId
+     * @param userId        用户id
+     * @param selectUserId  多商户列表校验用户id
+     */
+    private void checkAvailable(String userId, String selectUserId) {
+        if (userId.equals(selectUserId)) {
+            return;
+        }
+
+        List<MerchantBaseInfo> mbiList = merchantBaseInfoService.getAllByUserId(userId);
+        boolean flag = false;
+        for (MerchantBaseInfo merchantBaseInfo : mbiList) {
+            if (selectUserId.equals(merchantBaseInfo.getUserId())) {
+                flag = true;
+                break;
+            }
+        }
+
+        if (!flag) {
+            throw new MsgException("拒绝访问");
+        }
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRES_NEW)
+    public void createDefaultCashPlace(Long userId) {
+        // 新建收银点
+        MerchantCashPlace cashPlace = new MerchantCashPlace();
+        cashPlace.setName("收银点一");
+        cashPlace.setUserId(userId);
+        MerchantCashPlace existData = getOne(new QueryWrapper<>(cashPlace));
+        if (existData != null) {
+            // 如果初始的收银点已存在
+            return;
+        }
+
+        saveOrUpdate(cashPlace);
+
+        // 绑定线上码
+        MerchantCashPayCode cashPayCode = new MerchantCashPayCode();
+        cashPayCode.setCashPlaceId(cashPlace.getId());
+        cashPayCode.setPayCode(userId.toString());
+        cashPayCodeService.save(cashPayCode);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delByCodeForApp(String code) {
+        UserApp userApp = userAppService.queryUserAppByToken();
+        MerchantBaseInfo mbi = merchantBaseInfoService.getMerchantBaseInfoByUserId(userApp.getUserId() + "");
+
+        MerchantCashPlace cashPlace = new MerchantCashPlace().setCode(code);
+        cashPlace = getOne(new QueryWrapper<>(cashPlace));
+        if (cashPlace == null) {
+            throw new MsgException("该收银台不存在");
+        }
+
+        if (!Objects.equals(mbi.getUserId(), cashPlace.getUserId() + "") && !Objects.equals(mbi.getBindingCode(), cashPlace.getBindingCode())) {
+            throw new MsgException("拒绝访问");
+        }
+
+        MerchantCashPayCode cashPayCode = new MerchantCashPayCode();
+        cashPayCode.setCashPlaceId(cashPlace.getId());
+        cashPayCode = cashPayCodeService.getOne(new QueryWrapper<>(cashPayCode));
+        if (cashPayCode != null && cashPayCode.getPayCode().equals(userApp.getUserId() + "")) {
+            throw new MsgException("默认收银点不能删除");
+        }
+
+        cashPlace.setCode(code);
+        removeById(cashPlace.getId());
+
+        // 同时删除绑定的码牌关系记录
+
+        if (cashPayCode != null) {
+            cashPayCodeService.removeById(cashPayCode.getCashPlaceId());
+        }
+    }
+
+    @Override
+    public List<MerchantCashPlaceVO> getListForApp(Page<MerchantCashPlace> page, MerchantCashPlace merchantCashPlace) {
+        UserApp userApp = userAppService.queryUserAppByToken();
+        QueryWrapper<MerchantCashPlace> qW = new QueryWrapper<>();
+        qW.orderByDesc("createTime");
+
+        List<MerchantBaseInfo> all = merchantBaseInfoService.getAllByUserId(userApp.getUserId() + "");
+        // 如果没有指定商户id，则查询所有关联商户(主商户以及子商户)下的收银点
+        if (merchantCashPlace.getUserId() == null) {
+            List<String> userIdList = new ArrayList<>();
+            for (MerchantBaseInfo merchantBaseInfo : all) {
+                userIdList.add(merchantBaseInfo.getUserId());
+            }
+
+            qW.in(!userIdList.isEmpty(), "userId", userIdList);
+        } else {
+            // 校验查询的userId 是否合法
+            boolean flag = true;
+            for (MerchantBaseInfo merchantBaseInfo : all) {
+                if (merchantBaseInfo.getUserId().equals(merchantCashPlace.getUserId() + "")) {
+                    flag = false;
+                    break;
+                }
+            }
+
+            if (flag) {
+                throw new MsgException("拒绝访问");
+            }
+
+            qW.eq("userId", merchantCashPlace.getUserId());
+        }
+
+        qW.eq(merchantCashPlace.getCode() != null, "code", merchantCashPlace.getCode());
+        qW.like(StringUtils.isNotEmpty(merchantCashPlace.getName()), "name", merchantCashPlace.getName());
+
+        page = page(page, qW);
+
+        List<MerchantCashPlaceVO> result = new ArrayList<>();
+
+        MerchantCashPlaceConverter converter = MerchantCashPlaceConverter.INSTANCE;
+
+        List<Integer> cashPlaceIdList = new ArrayList<>();
+
+        for (MerchantCashPlace cashPlace : page.getRecords()) {
+            cashPlaceIdList.add(cashPlace.getId());
+            for (MerchantBaseInfo merchantBaseInfo : all) {
+                MerchantCashPlaceVO vo = converter.entity2VO(cashPlace);
+                if ((vo.getUserId() + "").equals(merchantBaseInfo.getUserId())) {
+                    vo.setMerchantBaseInfo(merchantBaseInfo);
+                    result.add(vo);
+                    break;
+                }
+            }
+        }
+
+        if (cashPlaceIdList.size() == 0) {
+            return result;
+        }
+
+        List<MerchantCashPayCode> cashPayCodeList = cashPayCodeService.getByCashPlaceIdList(cashPlaceIdList);
+        for (MerchantCashPayCode cashPayCode : cashPayCodeList) {
+            for (MerchantCashPlaceVO cashPlaceVO : result) {
+                if (cashPayCode.getCashPlaceId().equals(cashPlaceVO.getId())) {
+                    List<String> payCodeList = cashPlaceVO.getPayCodeList();
+                    if (payCodeList == null) {
+                        payCodeList = new ArrayList<>();
+                        cashPlaceVO.setPayCodeList(payCodeList);
+                    }
+
+                    payCodeList.add(cashPayCode.getPayCode());
+                    break;
+                }
+            }
+        }
+
+        return result;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void bindPayCode(MerchantCashPayCode merchantCashPayCode) {
+        // 参数校验
+        UserApp userApp = userAppService.queryUserAppByToken();
+        List<MerchantBaseInfo> merchList = merchantBaseInfoService.getAllByUserId(userApp.getUserId() + "");
+
+        MerchantCashPayCode existData = new MerchantCashPayCode().setPayCode(merchantCashPayCode.getPayCode());
+        existData = cashPayCodeService.getOne(new QueryWrapper<>(existData));
+        if (existData != null) {
+            throw new MsgException("该收款码已绑定收银点");
+        }
+
+        Integer cashPlaceId = merchantCashPayCode.getCashPlaceId();
+        if (cashPlaceId == null) {
+            throw new MsgException("缺少收银点id");
+        }
+
+        MerchantCashPlace merchantCashPlace = new MerchantCashPlace().setId(cashPlaceId);
+        merchantCashPlace = getOne(new QueryWrapper<>(merchantCashPlace));
+
+        if (merchantCashPlace == null)  {
+            throw new MsgException("收银点不存在");
+        }
+
+        MerchantBaseInfo cashPlaceBaseInfo = new MerchantBaseInfo().setUserId(merchantCashPlace.getUserId() + "");
+        cashPlaceBaseInfo = merchantBaseInfoService.getOne(new QueryWrapper<>(cashPlaceBaseInfo));
+
+        boolean flag = true;
+        for (MerchantBaseInfo merchantBaseInfo : merchList) {
+            if (merchantBaseInfo.getUserId().equals(merchantCashPlace.getUserId() + "")) {
+                flag = false;
+                break;
+            }
+        }
+
+        if (flag) {
+            throw new MsgException("拒绝访问");
+        }
+
+        if (merchantCashPayCode.getPayCode().equals(userApp.getUserId() + "")) {
+            // 绑定默认的付款码，非码牌
+            cashPayCodeService.bindPayCode(merchantCashPayCode);
+            return;
+        }
+
+        DeviceStock deviceStock = new DeviceStock();
+        deviceStock.setSnNo(merchantCashPayCode.getPayCode());
+        deviceStock = deviceStockService.getOne(new QueryWrapper<>(deviceStock));
+        if (deviceStock == null) {
+            throw new MsgException("不存在的码牌");
+        }
+
+        String actMercId = deviceStock.getActMercId();
+        if (!"3".equals(deviceStock.getStatus())) {
+            deviceStockService.bindPayCode(merchantCashPayCode.getPayCode());
+        }
+
+        if (StringUtils.isNotEmpty(actMercId) && !(cashPlaceBaseInfo.getId() + "").equals(actMercId)) {
+            throw new MsgException("收银点和收款码牌的所属商户不一致");
+        }
+
+        // 绑定
+        cashPayCodeService.bindPayCode(merchantCashPayCode);
+    }
+
+    @Override
+    public void unbindPayCode(String payCode) {
+        MerchantCashPayCode cashPayCode = new MerchantCashPayCode();
+        cashPayCode.setPayCode(payCode);
+        cashPayCode = cashPayCodeService.getOne(new QueryWrapper<>(cashPayCode));
+
+        if (cashPayCode == null) {
+            throw new MsgException("该码牌未绑定");
+        }
+
+        MerchantCashPlace cashPlace = new MerchantCashPlace().setId(cashPayCode.getCashPlaceId());
+        cashPlace = getOne(new QueryWrapper<>(cashPlace));
+
+        // 参数校验
+        UserApp userApp = userAppService.queryUserAppByToken();
+
+        if (payCode.equals(userApp.getUserId() + "")) {
+            throw new MsgException("默认收银点不允许解绑");
+        }
+
+        boolean flag = true;
+        List<MerchantBaseInfo> merchList = merchantBaseInfoService.getAllByUserId(userApp.getUserId() + "");
+        for (MerchantBaseInfo merchantBaseInfo : merchList) {
+            if (merchantBaseInfo.getUserId().equals(cashPlace.getUserId() + "")) {
+                flag = false;
+                break;
+            }
+        }
+
+        if (flag) {
+            throw new MsgException("拒绝访问");
+        }
+
+        cashPayCodeService.unbindPayCode(payCode);
+    }
+
+    @Override
+    public List<UserApp> getStaffByCode(String code) {
+        return null;
+    }
+
+    @Override
+    public List<UserApp> getStaffByCashPlaceId(Long id) {
+        return null;
+    }
+
+    @Override
+    public MerchantCashPlaceStaffVO getStatusByStaffId(String userId) {
+        MerchantCashPlaceStaffVO cashPlaceStaffVO = new MerchantCashPlaceStaffVO();
+        cashPlaceStaffVO.setUserId(Long.parseLong(userId));
+        cashPlaceStaffVO.setStatus(MerchantCashPlaceStaff.STATUS_ONLINE);
+        QueryWrapper<MerchantCashPlaceStaff> qWrapper = new QueryWrapper<>(cashPlaceStaffVO);
+        qWrapper.orderByDesc("updateTime")
+                .last("limit 1");
+        MerchantCashPlaceStaff one = cashPlaceStaffService.getOne(qWrapper);
+        cashPlaceStaffVO = Converter.INSTANCE.toVO(one);
+
+        if (cashPlaceStaffVO != null && MerchantCashPlaceStaff.STATUS_ONLINE.equals(cashPlaceStaffVO.getStatus())) {
+            MerchantCashPlace cashPlace = new MerchantCashPlace();
+            cashPlace.setId(cashPlaceStaffVO.getCashPlaceId());
+            cashPlace = getOne(new QueryWrapper<>(cashPlace));
+            cashPlaceStaffVO.setMerchantCashPlace(cashPlace);
+
+            val payCodeEntityList = cashPayCodeService.getByCashPlaceIdList(Collections.singletonList(cashPlace.getId()));
+
+            val payCodeList = new ArrayList<String>();
+            for (MerchantCashPayCode merchantCashPayCode : payCodeEntityList) {
+                payCodeList.add(merchantCashPayCode.getPayCode());
+            }
+            cashPlaceStaffVO.setPayCodeList(payCodeList);
+
+            val qWrapper2 = new QueryWrapper<MerchantBaseInfo>().eq("userId", cashPlace.getUserId());
+            val mbi = merchantBaseInfoService.getOne(qWrapper2);
+            cashPlaceStaffVO.setMerchantCode(mbi.getMerchantCode());
+            cashPlaceStaffVO.setAlias(mbi.getAlias());
+        }
+
+        return cashPlaceStaffVO;
+    }
+
+    @Override
+    public MerchantCashPlaceStaffVO getStatusByPayCode(String payCode) {
+        UserApp userAppToken = userAppService.queryUserAppByToken();
+        UserApp userAppBoss = new UserApp().setMerchantCode(userAppToken.getMerchantCode());
+        userAppBoss.setUserType("promoter");
+
+        userAppBoss = userAppService.getOne(new QueryWrapper<>(userAppBoss));
+
+        MerchantCashPayCode cashPayCode = cashPayCodeService.getByPayCode(payCode);
+        if (cashPayCode == null) {
+            throw new MsgException("该收款码无相关收银台信息");
+        }
+
+        MerchantCashPlaceStaffVO cashPlaceStaff = new MerchantCashPlaceStaffVO();
+        cashPlaceStaff.setCashPlaceId(cashPayCode.getCashPlaceId());
+        QueryWrapper<MerchantCashPlaceStaff> qWrapper = new QueryWrapper<>(cashPlaceStaff);
+        qWrapper.orderByDesc("updateTime").last("limit 1");
+
+        MerchantCashPlaceStaff one = cashPlaceStaffService.getOne(qWrapper);
+        cashPlaceStaff = Converter.INSTANCE.toVO(one);
+        if (cashPlaceStaff == null) {
+            cashPlaceStaff = new MerchantCashPlaceStaffVO();
+            cashPlaceStaff.setStatus(MerchantCashPlaceStaff.STATUS_NONE);
+            cashPlaceStaff.setCashPlaceId(cashPayCode.getCashPlaceId());
+        } else {
+            if (MerchantCashPlaceStaff.STATUS_ONLINE.equals(cashPlaceStaff.getStatus())) {
+                UserApp userApp = new UserApp();
+                userApp.setUserId(cashPlaceStaff.getUserId());
+                userApp = userAppService.getOne(new QueryWrapper<>(userApp));
+                cashPlaceStaff.setStaff(userApp);
+            }
+        }
+
+        MerchantCashPlace cashPlace = new MerchantCashPlace();
+        cashPlace.setId(cashPayCode.getCashPlaceId());
+        cashPlace = getOne(new QueryWrapper<>(cashPlace));
+
+        if (!cashPlace.getUserId().equals(userAppBoss.getUserId())) {
+            throw new MsgException("拒绝访问");
+        }
+
+        cashPlaceStaff.setMerchantCashPlace(cashPlace);
+
+        return cashPlaceStaff;
+    }
+
+    /**
+     * 设置收银点信息
+     * @date: 2021/11/29 10:57
+     * @param order: 订单信息
+     * @param snNo:  设别号
+     */
+    @Override
+    public void setOrderPlaceInfo(MerchantOrder order,String snNo) {
+        if(StringUtil.isNotEmpty(snNo)){
+            order.setSnNo(snNo);
+            QueryWrapper<MerchantCashPayCode> cashCodeQueryWrapper = new QueryWrapper<MerchantCashPayCode>().eq("payCode",snNo);
+            List<MerchantCashPayCode> merchantCashPayCodes = merchantCashPayCodeMapper.selectList(cashCodeQueryWrapper);
+            if(!merchantCashPayCodes.isEmpty()){
+                MerchantCashPayCode cashPayCode = merchantCashPayCodes.get(0);
+                order.setCashPlaceId(String.valueOf(cashPayCode.getCashPlaceId()));
+                QueryWrapper<MerchantCashPlaceStaff> queryWrapper = new QueryWrapper<MerchantCashPlaceStaff>().eq("cashPlaceId",cashPayCode.getCashPlaceId())
+                        .eq("status",MerchantCashPlaceStaff.STATUS_ONLINE);
+                List<MerchantCashPlaceStaff> placeStaffList = merchantCashPlaceStaffMapper.selectList(queryWrapper);
+                if(!placeStaffList.isEmpty()){
+                    MerchantCashPlaceStaff placeStaff = placeStaffList.get(0);
+                    order.setStaffCode(String.valueOf(placeStaff.getUserId()));
+                    UserApp app = userAppMapper.selectByUserId(placeStaff.getUserId());
+                    if(app != null){
+                        order.setStaffName(app.getUserName());
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/MerchantCashPlaceStaffServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/MerchantCashPlaceStaffServiceImpl.java
new file mode 100644
index 0000000..5b3076d
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/MerchantCashPlaceStaffServiceImpl.java
@@ -0,0 +1,212 @@
+package cn.pluss.platform.merchant.impl;
+
+import cn.pluss.platform.entity.MerchantCashPlace;
+import cn.pluss.platform.entity.MerchantCashPlaceStaff;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.MerchantCashPlaceStaffMapper;
+import cn.pluss.platform.merchant.MerchantCashPlaceService;
+import cn.pluss.platform.merchant.MerchantCashPlaceStaffService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.vo.MerchantCashPlaceStaffVO;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.Setter;
+import lombok.val;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * <p>
+ * 收银点和员工关联记录表 服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-03-23
+ */
+@Service
+public class MerchantCashPlaceStaffServiceImpl extends ServiceImpl<MerchantCashPlaceStaffMapper, MerchantCashPlaceStaff> implements MerchantCashPlaceStaffService {
+
+    @Setter(onMethod_ = {@Autowired})
+    private UserAppService userAppService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantCashPlaceService cashPlaceService;
+
+    @Override
+    public void bindCashPlace(Long userId, MerchantCashPlace cashPlace) {
+
+        UserApp tokenUserApp = userAppService.queryUserAppByToken();
+        if (cashPlace == null || cashPlace.getId() == null) {
+            throw new MsgException("缺少收银台信息");
+        }
+
+        UserApp userApp = new UserApp().setUserId(userId);
+        userApp = userAppService.getOne(new QueryWrapper<>(userApp));
+
+        if (userApp == null) {
+            throw new MsgException("未找到用户信息");
+        }
+
+        if (!"staff".equals(userApp.getUserType())) {
+            throw new MsgException("当前用户不是员工");
+        }
+
+        UserApp userAppBoss = new UserApp()
+                .setMerchantCode(tokenUserApp.getMerchantCode())
+                .setUserType("promoter");
+        userAppBoss = userAppService.getOne(new QueryWrapper<>(userAppBoss));
+
+        if (userAppBoss == null) {
+            throw new MsgException("当前店主信息不存在");
+        }
+
+        if (cashPlace.getUserId() == null) {
+            cashPlace = cashPlaceService.getOne(new QueryWrapper<>(cashPlace));
+
+            if (cashPlace == null) {
+                throw new MsgException("收银点不存在");
+            }
+        }
+
+        MerchantCashPlaceStaff cashPlaceStaff = new MerchantCashPlaceStaff();
+        cashPlaceStaff.setCashPlaceId(cashPlace.getId());
+        cashPlaceStaff.setUserId(userApp.getUserId());
+        cashPlaceStaff.setStatus(MerchantCashPlaceStaff.STATUS_ONLINE);
+
+        save(cashPlaceStaff);
+    }
+
+    @Override
+    public void bindCashPlace(Long userId, String cashPlaceCode) {
+        MerchantCashPlace merchantCashPlace = new MerchantCashPlace().setCode(cashPlaceCode);
+        merchantCashPlace = cashPlaceService.getOne(new QueryWrapper<>(merchantCashPlace));
+
+        if (merchantCashPlace == null) {
+            throw new MsgException("收银点不存在");
+        }
+
+        MerchantCashPlaceStaff cashPlaceStaff = new MerchantCashPlaceStaff();
+        cashPlaceStaff.setCashPlaceId(merchantCashPlace.getId());
+        cashPlaceStaff.setStatus(MerchantCashPlaceStaff.STATUS_ONLINE);
+        QueryWrapper<MerchantCashPlaceStaff> qW = new QueryWrapper<>(cashPlaceStaff);
+        cashPlaceStaff = getOne(qW);
+
+        if (cashPlaceStaff != null) {
+            UserApp userApp = new UserApp().setUserId(cashPlaceStaff.getUserId());
+            userApp = userAppService.getOne(new QueryWrapper<>(userApp));
+
+            if (userApp != null) {
+                throw new MsgException("请联系 “" + userApp.getUserName() + "” 签退");
+            } else {
+                // 员工被删除后就直接将记录在线记录清除
+                offLineCashPlace(merchantCashPlace);
+            }
+        }
+
+        bindCashPlace(userId, merchantCashPlace);
+    }
+
+    @Override
+    public void offLine(Long userId) {
+        MerchantCashPlaceStaff cashPlaceStaff = new MerchantCashPlaceStaff();
+        cashPlaceStaff.setUserId(userId);
+        cashPlaceStaff.setStatus(MerchantCashPlaceStaff.STATUS_LEAVE);
+        UpdateWrapper<MerchantCashPlaceStaff> uW = new UpdateWrapper<>();
+        uW.eq("userId", userId);
+        uW.eq("status", MerchantCashPlaceStaff.STATUS_ONLINE);
+        update(cashPlaceStaff, uW);
+    }
+
+    @Override
+    public void offLineCashPlace(MerchantCashPlace cashPlace) {
+        if (cashPlace.getId() == null) {
+            throw new MsgException("收银点id为空");
+        }
+
+        MerchantCashPlaceStaff cashPlaceStaff = new MerchantCashPlaceStaff();
+        cashPlaceStaff.setCashPlaceId(cashPlace.getId());
+        cashPlaceStaff.setStatus(MerchantCashPlaceStaff.STATUS_LEAVE);
+        UpdateWrapper<MerchantCashPlaceStaff> uW = new UpdateWrapper<>();
+        uW.eq("cashPlaceId", cashPlace.getId());
+        uW.eq("status", MerchantCashPlaceStaff.STATUS_ONLINE);
+        update(cashPlaceStaff, uW);
+    }
+
+    @Override
+    public void offLineCashPlace(String cashPlaceCode) {
+        MerchantCashPlace merchantCashPlace = new MerchantCashPlace().setCode(cashPlaceCode);
+        merchantCashPlace = cashPlaceService.getOne(new QueryWrapper<>(merchantCashPlace));
+        offLineCashPlace(merchantCashPlace);
+    }
+
+    @Override
+    public UserApp getCurStaffFromCashPlace(MerchantCashPlace cashPlace) {
+        if (cashPlace.getId() == null) {
+            throw new MsgException("缺少收银台id");
+        }
+
+        MerchantCashPlaceStaff cashPlaceStaff = new MerchantCashPlaceStaff();
+        cashPlaceStaff.setCashPlaceId(cashPlace.getId());
+        QueryWrapper<MerchantCashPlaceStaff> qW = new QueryWrapper<>(cashPlaceStaff);
+        qW.last("limit 1");
+        qW.orderByDesc("updateTime");
+
+        cashPlaceStaff = getOne(qW);
+        if (cashPlaceStaff == null || !MerchantCashPlaceStaff.STATUS_ONLINE.equals(cashPlaceStaff.getStatus())) {
+            return null;
+        }
+
+        UserApp userApp = new UserApp().setUserId(cashPlaceStaff.getUserId());
+        userApp = userAppService.getOne(new QueryWrapper<>(userApp));
+
+        return userApp;
+    }
+
+    @Override
+    public Page<MerchantCashPlaceStaffVO> getRecord(Page<MerchantCashPlaceStaff> page, MerchantCashPlaceStaff condition, OrderItem orderItem) {
+        if (condition.getCashPlaceId() == null && condition.getUserId() == null) {
+            throw new MsgException("需要传员工id或收银点id");
+        }
+        page.getOrders().clear();
+        page.getOrders().add(orderItem);
+
+        val qWrapper = new QueryWrapper<>();
+        qWrapper.eq(condition.getUserId() != null, "mcps.userId", condition.getUserId());
+        qWrapper.eq(condition.getCashPlaceId() != null, "mcps.cashPlaceId", condition.getCashPlaceId());
+        qWrapper.eq(StringUtils.isNotBlank(condition.getStatus()), "mcps.status", condition.getStatus());
+        Page<MerchantCashPlaceStaffVO> pageData = baseMapper.selectCustom(page, qWrapper);
+
+        if (pageData.getRecords().isEmpty()) {
+            return pageData;
+        }
+
+        Set<Integer> cashPlaceIdSet = new HashSet<>();
+        for (MerchantCashPlaceStaff record : pageData.getRecords()) {
+            cashPlaceIdSet.add(record.getCashPlaceId());
+        }
+
+        QueryWrapper<MerchantCashPlace> qWrapper2 = new QueryWrapper<>();
+        qWrapper2.in("id", cashPlaceIdSet);
+        List<MerchantCashPlace> cashPlaceList = cashPlaceService.list(qWrapper2);
+
+        for (MerchantCashPlaceStaffVO record : pageData.getRecords()) {
+            for (MerchantCashPlace cashPlace : cashPlaceList) {
+                if (record.getCashPlaceId().equals(cashPlace.getId())) {
+                    record.setMerchantCashPlace(cashPlace);
+                    break;
+                }
+            }
+        }
+
+        return pageData;
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/MerchantPluginServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/MerchantPluginServiceImpl.java
new file mode 100644
index 0000000..b1aff88
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/MerchantPluginServiceImpl.java
@@ -0,0 +1,188 @@
+package cn.pluss.platform.merchant.impl;
+
+import cn.jiguang.common.utils.StringUtils;
+import cn.pluss.platform.api.ResultCode;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.MerchantPluginMapper;
+import cn.pluss.platform.merchant.MerchantPluginService;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.merchantImage.MerchantImageService;
+import cn.pluss.platform.notice.NoticeService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.user.impl.GeneralPushUtil;
+import cn.pluss.platform.wx.WxTalkService;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.Setter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+
+/**
+ * <p>
+ * 商户插件表 服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-01-29
+ */
+@Service
+public class MerchantPluginServiceImpl extends ServiceImpl<MerchantPluginMapper, MerchantPlugin> implements MerchantPluginService {
+
+    @Setter(onMethod_ = {@Autowired})
+    private UserAppService userAppService;
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantChannelStatusService channelStatusService;
+    @Setter(onMethod_ = {@Autowired})
+    private NoticeService noticeService;
+//    @Setter(onMethod_ = {@Autowired})
+//    private PluginService ryxSfbMerchantPluginService;
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantImageService merchantImageService;
+    @Setter(onMethod_ = {@Autowired})
+    private WxTalkService wxTalkService;
+
+    @Autowired
+    private GeneralPushUtil generalPushUtil;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void reqAudit(String userId) {
+        UserApp userApp = new UserApp();
+        userApp.setUserId(Long.parseLong(userId));
+        userApp = userAppService.queryUserApp(userApp);
+        MsgException.checkBlank(userApp.getMerchantCode(), "请完善经营信息");
+
+        QueryWrapper<MerchantImage> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("merchantCode", userApp.getMerchantCode());
+        queryWrapper.in("photoType", MerchantImage.ImageType.HAND_IDCARD_PHOTO);
+        List<MerchantImage> list = merchantImageService.list(queryWrapper);
+        if (list.isEmpty()) {
+            throw new MsgException(ResultCode.FORBIDDEN, "缺少手持身份证图片", null);
+        }
+
+        MerchantChannelStatus merchantChannelStatus = channelStatusService.getValidData(userApp.getMerchantCode());
+        MsgException.checkNull(merchantChannelStatus, "请先注册为商户之后再进行该操作");
+
+        MerchantPlugin merchantPlugin = new MerchantPlugin();
+        merchantPlugin.setUserId(Integer.parseInt(userId));
+        MerchantPlugin existData = getOne(new QueryWrapper<>(merchantPlugin));
+        if (existData != null) {
+            switch (existData.getStatus()) {
+                case MerchantChannelStatus.AUDIT_STATUS_EXAMINING:
+                    throw new MsgException("该商户插件正在审核中，请勿重复操作");
+                case MerchantChannelStatus.AUDIT_STATUS_SUCCESS:
+                    throw new MsgException("插件已激活，请勿重复操作");
+                case MerchantChannelStatus.AUDIT_STATUS_REJECT:
+                case MerchantChannelStatus.AUDIT_STATUS_RESET:
+                    merchantPlugin = existData;
+                    break;
+                default:
+                    break;
+            }
+        }
+
+        merchantPlugin.setStatus(MerchantChannelStatus.AUDIT_STATUS_EXAMINING);
+        merchantPlugin.setThirdStatus(MerchantChannelStatus.AUDIT_THIRD_STATUS_WAITING);
+        merchantPlugin.setRemark("待后台审核");
+
+        saveOrUpdate(merchantPlugin);
+
+        String pushMsg = "商家插件审核已提交，将会在一个工作日内给出审核结果";
+        Notice notice = new Notice(1, 1, userApp);
+        String uniqueKey = "auditReq" + System.currentTimeMillis();
+        notice.setNoticeCode(uniqueKey);
+        notice.setUniqueKey(uniqueKey);
+        notice.setCreateDt(new Date());
+        notice.setConrtent(pushMsg);
+        noticeService.saveNotice(notice);
+        generalPushUtil.sendAllPlatByAlias(Collections.singletonList(userApp.getUserId() + ""), "商家审核通知", pushMsg, "1");
+
+        wxTalkService.sendPluginAuditAlert(userApp.getUserId() + "");
+    }
+
+    @Override
+    public void audit(String userId) {
+//        ryxSfbMerchantPluginService.audit(userId);
+    }
+
+    @Override
+    public void refuse(String userId, String errMsg) {
+        MsgException.checkBlank(errMsg, "请补充驳回原因");
+
+        MerchantPlugin merchantPlugin = new MerchantPlugin();
+        merchantPlugin.setUserId(Integer.parseInt(userId));
+        merchantPlugin = getOne(new QueryWrapper<>(merchantPlugin));
+        MsgException.checkNull(merchantPlugin, "暂无商户进件申请记录");
+
+        //TODO 暂定为0，app下次更新时候改为 2
+        merchantPlugin.setStatus(MerchantChannelStatus.AUDIT_STATUS_RESET);
+        merchantPlugin.setUpdateTime(new Date());
+        merchantPlugin.setRemark(errMsg);
+
+        updateById(merchantPlugin);
+
+        UserApp userApp = new UserApp().setUserId(Long.parseLong(userId));
+        userApp = userAppService.queryUserApp(userApp);
+
+        Notice notice = new Notice(1, 1, userApp);
+        notice.setNoticeCode(System.currentTimeMillis() + "");
+        notice.setUniqueKey(System.currentTimeMillis() + "");
+        notice.setCreateDt(new Date());
+        notice.setConrtent("商户插件进件驳回, " + errMsg);
+        noticeService.saveNotice(notice);
+
+        generalPushUtil.sendAllPlatByAlias(Collections.singletonList(userApp.getUserId() + ""), "收银呗审核通知", errMsg, "1");
+
+        // 机器人发送已处理的信息到群组
+        wxTalkService.sendPluginAuditResultAlert(userApp.getUserId() + "");
+    }
+
+    @Override
+    public Map<String, Object> getInfo(String userId) {
+        Map<String, Object> map = new HashMap<>();
+        MerchantPlugin pluginInfo = getPluginInfo(userId);
+
+        UserApp userApp = new UserApp().setUserId(Long.parseLong(userId));
+        userApp = userAppService.queryUserApp(userApp);
+
+        if (StringUtils.isEmpty(userApp.getMerchantCode())) {
+            throw new MsgException("缺少商户信息");
+        }
+
+        MerchantChannelStatus channelStatus = channelStatusService.getByMerchantCode(userApp.getMerchantCode(), 3);
+
+        map.put("pluginInfo", pluginInfo);
+        // 瑞银信进件状态， true即为已经在瑞银信通道进件进件
+        boolean status = channelStatus != null && new Integer(3).equals(channelStatus.getChannel());
+
+        QueryWrapper<MerchantImage> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("merchantCode", userApp.getMerchantCode());
+        queryWrapper.in("photoType", MerchantImage.ImageType.HAND_IDCARD_PHOTO, MerchantImage.ImageType.MERCHANT_PROTOCOL, MerchantImage.ImageType.MERCHANT_SUB_PROTOCOL);
+        List<MerchantImage> list = merchantImageService.list(queryWrapper);
+
+        // 缺那三张图也需要进入补交页面
+        map.put("ryxStatus", status && (list.size() < 3));
+
+        if (pluginInfo != null) {
+            JSONObject extra = pluginInfo.getExtra();
+            if (extra != null) {
+                String posMerId = extra.getString("posMerId");
+                String termCodeList = extra.getString("termList");
+                if (termCodeList != null) {
+                    // 只取一条
+                    String[] split = termCodeList.split(",");
+                    map.put("activationCode", posMerId + split[0]);
+                }
+
+                map.put("rate", "30");
+            }
+        }
+
+        return map;
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/MerchantRateNewRecordServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/MerchantRateNewRecordServiceImpl.java
new file mode 100644
index 0000000..d474b9f
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/MerchantRateNewRecordServiceImpl.java
@@ -0,0 +1,259 @@
+package cn.pluss.platform.merchant.impl;
+
+import cn.pluss.platform.channel.MchChannelRateNewService;
+import cn.pluss.platform.converter.Converter;
+import cn.pluss.platform.dto.MerchantRateNewRecordDTO;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.MerchantRateNewRecordMapper;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchant.MerchantRateNewRecordService;
+import cn.pluss.platform.merchant.MerchantRateNewService;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.notice.NoticeService;
+import cn.pluss.platform.notice.template.NoticeTemplateService;
+import cn.pluss.platform.user.impl.GeneralPushUtil;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.vo.MerchantRateNewRecordVO;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.Setter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.TransactionStatus;
+import org.springframework.transaction.support.TransactionCallbackWithoutResult;
+import org.springframework.transaction.support.TransactionTemplate;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * <p>
+ * 商户费率表(新) 服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-08-09
+ */
+@Service
+public class MerchantRateNewRecordServiceImpl extends ServiceImpl<MerchantRateNewRecordMapper, MerchantRateNewRecord> implements MerchantRateNewRecordService {
+
+    @Autowired
+    private UserAppService userAppService;
+
+    @Autowired
+    private MerchantChannelStatusService mcsService;
+
+    @Autowired
+    private MerchantRateNewService rateNewService;
+
+    @Autowired @Lazy
+    private NoticeService noticeService;
+
+    @Autowired
+    private MerchantBaseInfoService mbiService;
+
+    @Autowired
+    private GeneralPushUtil generalPushUtil;
+
+    @Autowired @Lazy
+    private NoticeTemplateService nTempService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MchChannelRateNewService ryxChangeRateNewService;
+
+    @Autowired
+    private TransactionTemplate transactionTemplate;
+
+    @Override
+    public Page<MerchantRateNewRecordVO> apiPage(Page<MerchantRateNewRecord> page, MerchantRateNewRecordDTO entity) {
+        UserApp tokenUserApp = userAppService.queryUserAppByToken();
+
+        LambdaQueryWrapper<UserApp> qWrapperSearchUserApp = new LambdaQueryWrapper<>();
+        qWrapperSearchUserApp.eq(UserApp::getUserId, entity.getUserId());
+        UserApp searchUserApp = userAppService.getOne(qWrapperSearchUserApp);
+
+        if (!Objects.equals(entity.getUserId(), tokenUserApp.getUserId() + "")) {
+            if (searchUserApp == null || !Objects.equals(searchUserApp.getParentId(), tokenUserApp.getUserId())) {
+                throw new MsgException("拒绝访问");
+            }
+        }
+
+        if (searchUserApp.getMerchantCode() == null) {
+            throw new MsgException("暂未进件");
+        }
+
+        LambdaQueryWrapper<MerchantChannelStatus> qWrapperMcs = new LambdaQueryWrapper<MerchantChannelStatus>()
+                .eq(MerchantChannelStatus::getMerchantCode, searchUserApp.getMerchantCode())
+                .eq(MerchantChannelStatus::getStatus, "3");
+        List<MerchantChannelStatus> mcsList = mcsService.list(qWrapperMcs);
+
+        List<String> merchantIdList = new ArrayList<String>();
+        for (MerchantChannelStatus mcs : mcsList) {
+            merchantIdList.add(mcs.getMerchantId());
+        }
+
+        if (merchantIdList.isEmpty()) {
+            Page<MerchantRateNewRecordVO> resultPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal());
+            resultPage.setRecords(new ArrayList<>());
+            return resultPage;
+        }
+
+        LambdaQueryWrapper<MerchantRateNewRecord> qWrapper = new LambdaQueryWrapper<MerchantRateNewRecord>()
+                .in(MerchantRateNewRecord::getMerchantId, merchantIdList)
+                .orderByDesc(MerchantRateNewRecord::getCreateTime);
+
+        Page<MerchantRateNewRecord> queryData = page(page, qWrapper);
+
+        List<MerchantRateNewRecordVO> resultList = new ArrayList<>();
+        
+        for (MerchantRateNewRecord queryDatum : queryData.getRecords()) {
+            MerchantRateNewRecordVO vo = Converter.INSTANCE.toVO(queryDatum);
+            if (Objects.equals(vo.getChannel(), 4)) {
+                vo.setChannelType("D0");
+            } else {
+                vo.setChannelType("D1");
+            }
+            MerchantRateNewRecordVO.setRateValue(vo);
+            resultList.add(vo);
+        }
+
+        Page<MerchantRateNewRecordVO> resultPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal());
+        resultPage.setRecords(resultList);
+
+        return resultPage;
+    }
+
+    @Override
+    public void onSuccess(MerchantRateNewRecord rateNewRecord) {
+        transactionTemplate.execute(new TransactionCallbackWithoutResult() {
+            @Override
+            protected void doInTransactionWithoutResult(TransactionStatus status) {
+                LambdaQueryWrapper<MerchantRateNew> qWrapper = new LambdaQueryWrapper<MerchantRateNew>()
+                        .eq(MerchantRateNew::getMerchantId, rateNewRecord.getMerchantId())
+                        .eq(MerchantRateNew::getChannel, rateNewRecord.getChannel());
+
+                MerchantRateNew rateNewExist = rateNewService.getOne(qWrapper);
+                if (rateNewExist == null) {
+                    rateNewExist = ryxChangeRateNewService.getDefaultRate();
+                }
+
+                LambdaQueryWrapper<MerchantChannelStatus> qWrapper2 = new LambdaQueryWrapper<MerchantChannelStatus>()
+                        .eq(MerchantChannelStatus::getMerchantId, rateNewRecord.getMerchantId())
+                        .eq(MerchantChannelStatus::getChannel, rateNewRecord.getChannel());
+                MerchantChannelStatus mcs = mcsService.getOne(qWrapper2);
+
+                Converter.INSTANCE.cp(rateNewRecord, rateNewExist);
+
+                rateNewRecord.setStatus("1");
+                rateNewRecord.setUpdateTime(new Date());
+                rateNewService.saveOrUpdate(rateNewExist);
+                saveOrUpdate(rateNewRecord);
+
+                // 获取用户id
+                List<String> aliasList = new ArrayList<>();
+
+                LambdaQueryWrapper<UserApp> qWrapper3 = Wrappers.lambdaQuery();
+                qWrapper3.eq(UserApp::getMerchantCode, mcs.getMerchantCode());
+                qWrapper3.eq(UserApp::getUserType, "promoter");
+                UserApp ua = userAppService.getOne(qWrapper3);
+                aliasList.add(ua.getUserId() + "");
+
+                LambdaQueryWrapper<MerchantBaseInfo> qWrapper6 = Wrappers.lambdaQuery();
+                qWrapper6.eq(MerchantBaseInfo::getMerchantCode, mcs.getMerchantCode());
+                MerchantBaseInfo mbi = mbiService.getOne(qWrapper6);
+
+                // 获取上级用户id
+                UserApp uaParent = null;
+                if (ua.getParentId() != null) {
+                    LambdaQueryWrapper<UserApp> qWrapper4 = Wrappers.lambdaQuery();
+                    qWrapper4.eq(UserApp::getUserId, ua.getParentId());
+                    uaParent = userAppService.getOne(qWrapper4);
+                    aliasList.add(uaParent.getUserId() + "");
+                }
+
+                // 获取通知模板
+                NoticeTemplate template = nTempService.getNoticeTemplateByType("14");
+                String templateContent;
+                if (template == null) {
+                    templateContent = "尊敬的商户“$1”，您的交易费率调整审核已通过，费率修改记录在个人页面【商户认证】-【商户费率】-右上角【变更记录】中查看，如有疑问请咨询您的业务员。";
+                } else {
+                    templateContent = template.getContent();
+                }
+                templateContent = templateContent.replace("$1", mbi.getAlias());
+
+                List<Notice> noticeList = new ArrayList<>();
+
+                Notice notice = new Notice(1, -1, ua.getUserId() + "", ua.getUserName());
+                notice.setConrtent(templateContent);
+                notice.setDesc(templateContent);
+                notice.setTitle("费率修改通知");
+                noticeList.add(notice);
+
+                if (uaParent != null) {
+                    Notice notice2 = new Notice(1, -1, uaParent.getUserId() + "", uaParent.getUserName());
+                    notice2.setConrtent(templateContent);
+                    notice2.setDesc(templateContent);
+                    notice2.setTitle("费率修改通知");
+                    noticeList.add(notice2);
+                }
+
+                noticeService.saveBatch(noticeList);
+                generalPushUtil.sendAllPlatByAlias(aliasList, "费率修改通知", templateContent, "1");
+            }
+        });
+
+    }
+
+    @Override
+    public void onFail(MerchantRateNewRecord rateNewRecord) {
+        transactionTemplate.execute(new TransactionCallbackWithoutResult() {
+            @Override
+            protected void doInTransactionWithoutResult(TransactionStatus status) {
+                MerchantChannelStatus mcs = mcsService.getByMerchantId(rateNewRecord.getMerchantId());
+                UserApp userApp = new UserApp().setMerchantCode(mcs.getMerchantCode()).setUserType("promoter");
+                UserApp ua = userAppService.getOne(new QueryWrapper<>(userApp));
+
+                List<String> aliasList = new ArrayList<>();
+
+                // 获取上级用户id
+                UserApp uaParent = null;
+                if (ua.getParentId() != null) {
+                    LambdaQueryWrapper<UserApp> qWrapper4 = Wrappers.lambdaQuery();
+                    qWrapper4.eq(UserApp::getUserId, ua.getParentId());
+                    uaParent = userAppService.getOne(qWrapper4);
+                    aliasList.add(uaParent.getUserId() + "");
+                }
+
+                // 失败
+                rateNewRecord.setStatus("2");
+                saveOrUpdate(rateNewRecord);
+
+                List<Notice> noticeList = new ArrayList<>();
+
+                Notice notice = new Notice(1, -1, ua.getUserId() + "", ua.getUserName());
+                notice.setConrtent("费率修改失败");
+                notice.setDesc("费率修改失败");
+                notice.setTitle("费率修改通知");
+                noticeList.add(notice);
+
+                if (uaParent != null) {
+                    Notice notice2 = new Notice(1, -1, uaParent.getUserId() + "", uaParent.getUserName());
+                    notice.setConrtent("费率修改失败");
+                    notice.setDesc("费率修改失败");
+                    notice.setTitle("费率修改通知");
+                    noticeList.add(notice2);
+                }
+
+                noticeService.saveBatch(noticeList);
+                generalPushUtil.sendAllPlatByAlias(aliasList, "费率修改通知", "费率修改失败", "1");
+            }
+        });
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/MerchantRateNewServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/MerchantRateNewServiceImpl.java
new file mode 100644
index 0000000..f32fb54
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/MerchantRateNewServiceImpl.java
@@ -0,0 +1,637 @@
+package cn.pluss.platform.merchant.impl;
+
+import cn.jiguang.common.utils.StringUtils;
+import cn.pluss.platform.agent.AgentService;
+import cn.pluss.platform.api.ResultCode;
+import cn.pluss.platform.channel.MchChannelRateNewService;
+import cn.pluss.platform.constants.Constant;
+import cn.pluss.platform.converter.Converter;
+import cn.pluss.platform.dto.MerchantRateNewDTO;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.exception.RateNoChangeException;
+import cn.pluss.platform.mapper.DictMapper;
+import cn.pluss.platform.mapper.MerchantRateMapper;
+import cn.pluss.platform.mapper.MerchantRateNewMapper;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchant.MerchantRateNewRecordService;
+import cn.pluss.platform.merchant.MerchantRateNewService;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.notice.NoticeService;
+import cn.pluss.platform.notice.template.NoticeTemplateService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.util.CheckUtils;
+import cn.pluss.platform.user.impl.GeneralPushUtil;
+import cn.pluss.platform.vo.MerchantRateNewVO;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.Setter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.*;
+
+/**
+ * <p>
+ * 商户费率表(新) 服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-08-09
+ */
+@Service
+public class MerchantRateNewServiceImpl extends ServiceImpl<MerchantRateNewMapper, MerchantRateNew> implements MerchantRateNewService {
+
+    @Setter(onMethod_ = {@Lazy, @Autowired})
+    private UserAppService userAppService;
+
+    @Autowired
+    private MerchantChannelStatusService mcsService;
+
+    @Autowired
+    private MerchantBaseInfoService mbiService;
+
+    @Autowired
+    private MerchantRateNewRecordService rateNewRecordService;
+
+    @Resource
+    private MerchantRateNewMapper rateNewMapper;
+
+    @Autowired @Lazy
+    private MchChannelRateNewService sxfChangeRateNewService;
+
+    @Autowired @Lazy
+    private MchChannelRateNewService ryxChangeRateNewService;
+
+    @Autowired @Lazy
+    private MchChannelRateNewService ysChangeRateService;
+
+    @Autowired @Lazy
+    private MchChannelRateNewService ysChangeRateNewService;
+
+    @Autowired
+    private AgentService agentInfoService;
+
+    @Resource
+    private DictMapper dictMapper;
+
+    @Resource
+    private MerchantRateMapper merchantRateMapper;
+
+    @Autowired
+    private NoticeTemplateService nTempService;
+
+    @Autowired
+    private NoticeService noticeService;
+
+    @Autowired
+    private GeneralPushUtil generalPushUtil;
+
+    @Autowired
+    @Lazy
+    private MerchantRateNewService self;
+
+    public static final String WX_RATE = "WX_RATE";
+
+    public static final String ALI_RATE = "ALI_RATE";
+
+    public static final String BANK_RATE = "BANK_RATE_1000";
+
+    public static final String BANK_RATE_LARGE = "BANK_RATE_1000+";
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void passD0(String merchantId) {
+        LambdaQueryWrapper<MerchantRateNewRecord> queryWrapper = new LambdaQueryWrapper<MerchantRateNewRecord>()
+                .eq(MerchantRateNewRecord::getMerchantId, merchantId)
+                .eq(MerchantRateNewRecord::getStatus, "0");
+
+        LambdaQueryWrapper<MerchantRateNew> queryWrapper2 = new LambdaQueryWrapper<MerchantRateNew>()
+                .eq(MerchantRateNew::getMerchantId, merchantId)
+                .eq(MerchantRateNew::getChannel, 4);
+
+        MerchantRateNewRecord one = rateNewRecordService.getOne(queryWrapper);
+        if (one == null) {
+            throw new MsgException("没有找到费率修改记录");
+        }
+
+        MerchantRateNew current = getOne(queryWrapper2);
+        if (current == null) {
+            current = new MerchantRateNew();
+            current.setChannel(4);
+            current.setMerchantId(merchantId);
+        }
+        one.setStatus("1");
+        rateNewRecordService.updateById(one);
+
+        current.setAliRate(one.getAliRate());
+        current.setWxRate(one.getWxRate());
+        current.setBankRate(one.getBankRate());
+        current.setBankRateLarge(one.getBankRateLarge());
+        saveOrUpdate(current);
+
+        // 获取用户id
+        LambdaQueryWrapper<MerchantChannelStatus> qWrapper2 = Wrappers.lambdaQuery();
+        qWrapper2.eq(MerchantChannelStatus::getMerchantId, merchantId)
+                .eq(MerchantChannelStatus::getChannel, 4);
+        MerchantChannelStatus mcs = mcsService.getOne(qWrapper2);
+
+        List<String> aliasList = new ArrayList<>();
+
+        LambdaQueryWrapper<UserApp> qWrapper3 = Wrappers.lambdaQuery();
+        qWrapper3.eq(UserApp::getMerchantCode, mcs.getMerchantCode());
+        qWrapper3.eq(UserApp::getUserType, "promoter");
+        UserApp ua = userAppService.getOne(qWrapper3);
+        aliasList.add(ua.getUserId() + "");
+
+        LambdaQueryWrapper<MerchantBaseInfo> qWrapper6 = Wrappers.lambdaQuery();
+        qWrapper6.eq(MerchantBaseInfo::getMerchantCode, mcs.getMerchantCode());
+        MerchantBaseInfo mbi = mbiService.getOne(qWrapper6);
+
+        // 获取上级用户id
+        UserApp uaParent = null;
+        if (ua.getParentId() != null) {
+            LambdaQueryWrapper<UserApp> qWrapper4 = Wrappers.lambdaQuery();
+            qWrapper4.eq(UserApp::getUserId, ua.getParentId());
+            uaParent = userAppService.getOne(qWrapper4);
+            aliasList.add(uaParent.getUserId() + "");
+        }
+
+        // 获取通知模板
+        NoticeTemplate template = nTempService.getNoticeTemplateByType("14");
+        String templateContent;
+        if (template == null) {
+            templateContent = "尊敬的商户“$1”，您的交易费率调整审核已通过，费率修改记录在个人页面【商户认证】-【商户费率】-右上角【变更记录】中查看，如有疑问请咨询您的业务员。";
+        } else {
+            templateContent = template.getContent();
+        }
+        templateContent = templateContent.replace("$1", mbi.getAlias());
+
+        List<Notice> noticeList = new ArrayList<>();
+
+        Notice notice = new Notice(1, -1, ua.getUserId() + "", ua.getUserName());
+        notice.setConrtent(templateContent);
+        notice.setDesc(templateContent);
+        notice.setTitle("费率修改通知");
+        noticeList.add(notice);
+
+        if (uaParent != null) {
+            Notice notice2 = new Notice(1, -1, uaParent.getUserId() + "", uaParent.getUserName());
+            notice2.setConrtent(templateContent);
+            notice2.setDesc(templateContent);
+            notice2.setTitle("费率修改通知");
+            noticeList.add(notice2);
+        }
+
+        noticeService.saveBatch(noticeList);
+
+        generalPushUtil.sendAllPlatByAlias(aliasList, "费率修改通知", templateContent, "1");
+    }
+
+    @Override
+    public void passD0(List<String> merchantIdList) {
+        for (String merchantId : merchantIdList) {
+            self.passD0(merchantId);
+        }
+    }
+
+    @Override
+    public BigDecimal getMchRate(String merchantCode,String payWay,Double orderAmt) {
+        MerchantChannelStatus validData = mcsService.getValidData(merchantCode);
+        MerchantRateNew result = getByMerchantCode(merchantCode, validData.getChannel() + "");
+        if (result == null) {
+            switch (validData.getChannel()) {
+                case 1:
+                    result = sxfChangeRateNewService.getDefaultRate();
+                    break;
+                case 3:
+                    result = ryxChangeRateNewService.getDefaultRate();
+                    break;
+                case 4:
+                    result = ysChangeRateService.getDefaultRate();
+                    break;
+                default:
+                    MsgException.throwException("通道异常！");
+            }
+        }
+        MerchantRateNew.setRateValue(result);
+        if(Constant.PAY_TYPE_ALIPAY.equals(payWay) || "sxfPay0".equals(payWay)){
+            return result.getAliRateValue();
+        }else if(Constant.PAY_TYPE_WECHAT.equals(payWay) || "sxfPay1".equals(payWay)){
+            return result.getWxRateValue();
+        }else if(Constant.PAY_TYPE_YSFPAY.equals(payWay) || "sxfPay2".equals(payWay)){
+            if(orderAmt > BANK_RATE_CRITICAL_VALUE){
+                return result.getBankRateLargeValue().compareTo(new BigDecimal(-1)) == 0 ? new BigDecimal(60) : result.getBankRateLargeValue();
+            }else{
+                return result.getBankRateValue();
+            }
+        }else{
+            MsgException.throwException("费率获取失败，未知交易类型");
+        }
+        return null;
+    }
+
+    public static final double BANK_RATE_CRITICAL_VALUE = 1000.0d;
+
+
+    @Override
+    public Map<String, Object> apiGetRate(String userId) {
+        LambdaQueryWrapper<UserApp> qWrapperMerch = new LambdaQueryWrapper<UserApp>().eq(UserApp::getUserId, userId);
+        UserApp merchUserApp = userAppService.getOne(qWrapperMerch);
+
+        HashMap<String, Object> result = new HashMap<>();
+
+        UserApp userApp = userAppService.queryUserAppByToken();
+
+        boolean isParentOrSelf = Objects.equals(userId, userApp.getUserId() + "");
+        boolean isSelf = isParentOrSelf;
+        if (!isParentOrSelf) {
+            isParentOrSelf = Objects.equals(merchUserApp.getParentId(), userApp.getUserId());
+        }
+        if (!isParentOrSelf) {
+            // 查间推
+            LambdaQueryWrapper<UserApp> qWrapperMerch2 = new LambdaQueryWrapper<UserApp>().eq(UserApp::getUserId, merchUserApp.getParentId());
+            UserApp merchParentUserApp = userAppService.getOne(qWrapperMerch2);
+            if (merchParentUserApp != null) {
+                isParentOrSelf = Objects.equals(merchParentUserApp.getParentId(), userApp.getUserId());
+
+                if (!isParentOrSelf) {
+                    // 查二间
+                    LambdaQueryWrapper<UserApp> qWrapperMerch3 = new LambdaQueryWrapper<UserApp>().eq(UserApp::getUserId, merchParentUserApp.getParentId());
+                    UserApp merchGrantParentUserApp = userAppService.getOne(qWrapperMerch3);
+
+                    if (merchGrantParentUserApp != null) {
+                        isParentOrSelf = Objects.equals(merchGrantParentUserApp.getParentId(), userApp.getUserId());
+                    }
+                }
+            }
+        }
+
+        // 只有自己或这上级才能查看商户的费率
+        if (!isParentOrSelf) {
+            throw new MsgException("拒绝访问");
+        }
+
+        if (StringUtils.isEmpty(merchUserApp.getMerchantCode())) {
+            throw new MsgException("非商户没有商户费率信息");
+        }
+
+        MerchantBaseInfo mbiMerchant = mbiService.getMerchantBaseInfoByMerchantCode(merchUserApp.getMerchantCode());
+
+        LambdaQueryWrapper<MerchantChannelStatus> qWrapper = new LambdaQueryWrapper<>();
+        qWrapper.in(MerchantChannelStatus::getStatus, MerchantChannelStatus.AUDIT_STATUS_SUCCESS, MerchantChannelStatus.AUDIT_STATUS_DATA_EDIT);
+        qWrapper.eq(MerchantChannelStatus::getMerchantCode, merchUserApp.getMerchantCode());
+        List<MerchantChannelStatus> mcsList = mcsService.list(qWrapper);
+
+        for (MerchantChannelStatus mcs : mcsList) {
+            if (!MerchantChannelStatus.isAudited(mcs)) {
+                continue;
+            }
+
+            MerchantRateNewVO mrnVO = getChannelRate(mcs.getChannel() + "", merchUserApp.getMerchantCode());
+            if (isSelf && Objects.equals(mbiMerchant.getAllowBankLarge(), "0")) {
+                mrnVO.setBankRateLarge(-1);
+            }
+            switch (mcs.getChannel()) {
+                case 1:
+                case 3:
+                    result.put("d1", mrnVO);
+                    break;
+                case 4:
+                    result.put("d0", mrnVO);
+                    break;
+                default:
+                    throw new MsgException("未知的进件通道");
+            }
+        }
+
+        MerchantRateNewVO emptyMrnVO = null;
+        if (result.get("d1") == null) {
+            emptyMrnVO = new MerchantRateNewVO();
+            emptyMrnVO.setWxRate(-1);
+            emptyMrnVO.setAliRate(-1);
+            emptyMrnVO.setBankRate(-1);
+            emptyMrnVO.setBankRateLarge(-1);
+            emptyMrnVO.setStatus("-1");
+            result.put("d1", emptyMrnVO);
+        }
+
+        if (result.get("d0") == null) {
+            if (emptyMrnVO == null) {
+                emptyMrnVO = new MerchantRateNewVO();
+                emptyMrnVO.setWxRate(-1);
+                emptyMrnVO.setAliRate(-1);
+                emptyMrnVO.setBankRate(-1);
+                emptyMrnVO.setBankRateLarge(-1);
+                emptyMrnVO.setStatus("-1");
+            }
+            result.put("d0", emptyMrnVO);
+        }
+
+        result.put("allowBankLarge", mbiMerchant.getAllowBankLarge());
+
+        return result;
+    }
+
+    @Override
+    public Page<Map<String, Object>> pageData(Page<Object> page, Map<String, Object> condition) {
+        return baseMapper.pageData(page, condition);
+    }
+
+
+    @Override
+    public void apiChangeMerchantRateNew(MerchantRateNewDTO param) {
+        // =========修改费率校验
+        MsgException.checkNull(param.getUserId(), "缺少用户id");
+        // 校验超级服务商
+        UserApp userAppToken = userAppService.queryUserAppByToken();
+
+        MsgException.checkEquals("staff", userAppToken.getUserType(), "拒绝访问");
+        MsgException.checkEquals("agent_staff", userAppToken.getUserType(), "拒绝访问");
+        MsgException.checkEquals("ZY_BST", userAppToken.getRoleCode(), "活动商户不允许修改费率");
+
+        String levelCodeNum = userAppToken.getLevelCode().replace("LV", "");
+        if (Integer.parseInt(levelCodeNum) < 4) {
+            throw new MsgException("暂无权限");
+        }
+
+        // 一天只能修改一次
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(Calendar.HOUR_OF_DAY, 0);
+        calendar.set(Calendar.MINUTE, 0);
+        calendar.set(Calendar.SECOND, 0);
+        calendar.set(Calendar.MILLISECOND, 0);
+        
+        LambdaQueryWrapper<UserApp> qWrapper = new LambdaQueryWrapper<UserApp>()
+                .eq(UserApp::getUserId, param.getUserId());
+        UserApp operateUserApp = userAppService.getOne(qWrapper);
+
+        // 校验当前服务商是否为操作的商户的直接上级
+        MsgException.checkUnequals(operateUserApp.getParentId(), userAppToken.getUserId(), "拒绝访问");
+
+        MerchantRateNew minSettingRateNew = agentInfoService.getMinSettingRateNew();
+
+        LambdaQueryWrapper<MerchantChannelStatus> mcsWrapper = new LambdaQueryWrapper<MerchantChannelStatus>()
+                .eq(MerchantChannelStatus::getMerchantCode, operateUserApp.getMerchantCode())
+                .in(MerchantChannelStatus::getStatus, "3", MerchantChannelStatus.AUDIT_STATUS_DATA_EDIT);
+        List<MerchantChannelStatus> mcsList = mcsService.list(mcsWrapper);
+
+        Map<String, MerchantRateNew> rateNewMap = MerchantRateNewDTO.toMerchantRateNew(param);
+
+        MerchantChannelStatus d1 = null;
+        MerchantChannelStatus d0 = null;
+        for (MerchantChannelStatus mcs : mcsList) {
+            switch (mcs.getChannel()) {
+                case 1:
+                case 3:
+                    MerchantRateNew rateNewD1 = rateNewMap.get("d1");
+                    if (rateNewD1 == null) {
+                        break;
+                    }
+                    MerchantRateNew.setRateValue(rateNewD1);
+                    CheckUtils.limit(rateNewD1.getWxRate(), minSettingRateNew.getWxRate(), MerchantRateNew.MAX_LEVEL,
+                            "微信费率必须设置在" + minSettingRateNew.getWxRateValue().divide(BigDecimal.valueOf(100)) + "到0.38之间");
+                    CheckUtils.limit(rateNewD1.getAliRate(), minSettingRateNew.getAliRate(), MerchantRateNew.MAX_LEVEL,
+                            "支付宝费率必须设置在" + minSettingRateNew.getAliRateValue().divide(BigDecimal.valueOf(100)) + "到0.38之间");
+                    CheckUtils.limit(rateNewD1.getBankRate(), minSettingRateNew.getBankRate(), MerchantRateNew.MAX_LEVEL,
+                            "银联≤1000费率必须设置在" + minSettingRateNew.getBankRateValue().divide(BigDecimal.valueOf(100)) + "到0.40之间");
+                    d1 = mcs;
+                    break;
+                case 4:
+                    MerchantRateNew rateNewD0 = rateNewMap.get("d0");
+                    if (rateNewD0 == null) {
+                        break;
+                    }
+                    MerchantRateNew.setRateValue(rateNewD0);
+                    CheckUtils.limit(rateNewD0.getWxRate(), minSettingRateNew.getWxRate(), MerchantRateNew.MAX_LEVEL,
+                            "微信费率必须设置在" + minSettingRateNew.getWxRateValue().divide(BigDecimal.valueOf(100)) + "到0.38之间");
+                    CheckUtils.limit(rateNewD0.getAliRate(), minSettingRateNew.getAliRate(), MerchantRateNew.MAX_LEVEL,
+                            "支付宝费率必须设置在" + minSettingRateNew.getAliRateValue().divide(BigDecimal.valueOf(100)) + "到0.38之间");
+                    CheckUtils.limit(rateNewD0.getBankRate(), minSettingRateNew.getBankRate(), MerchantRateNew.MAX_LEVEL,
+                            "银联≤1000费率必须设置在" + minSettingRateNew.getBankRateValue().divide(BigDecimal.valueOf(100)) + "到0.40之间");
+                    CheckUtils.limit(rateNewD0.getBankRateLarge(), minSettingRateNew.getBankRateLarge(), MerchantRateNew.MAX_LEVEL,
+                            "微信>1000费率必须设置在" + minSettingRateNew.getBankRateLargeValue().divide(BigDecimal.valueOf(100)) + "到0.615之间");
+                    d0 = mcs;
+                    break;
+                default:
+                    break;
+            }
+        }
+
+        // =========修改费率校验
+        changeMerchantRateNew(param, d1, d0);
+    }
+
+    @Override
+    public void changeMerchantRateNew(MerchantRateNewDTO param, MerchantChannelStatus d1, MerchantChannelStatus d0) {
+        StringBuilder result = new StringBuilder();
+
+        LambdaQueryWrapper<UserApp> qWrapper = new LambdaQueryWrapper<UserApp>()
+                .eq(UserApp::getUserId, param.getUserId());
+        UserApp operateUserApp = userAppService.getOne(qWrapper);
+
+        // 参数转换，将费率值转换为费率等级
+        Map<String, MerchantRateNew> rateNewMap = MerchantRateNewDTO.toMerchantRateNew(param);
+
+        MerchantRateNew rateNewD1 = rateNewMap.get("d1");
+        MerchantRateNew rateNewD0 = rateNewMap.get("d0");
+
+        MchChannelRateNewService d1Service;
+
+        if (d1 != null && rateNewD1 != null) {
+            rateNewD1.setMerchantId(d1.getMerchantId());
+            rateNewD1.setChannel(d1.getChannel());
+            if (d1.getChannel() == 1) {
+                d1Service = sxfChangeRateNewService;
+            } else {
+                d1Service = ryxChangeRateNewService;
+            }
+
+            try {
+                d1Service.changeRate(operateUserApp.getUserId() + "", rateNewD1, true);
+            } catch (RateNoChangeException e) {
+                log.error(e.getMessage());
+            } catch (MsgException e) {
+                log.error(e.getMessage());
+                if (e.getCode().equals(ResultCode.SERVICE_UNAVAILABLE)) {
+                    throw new MsgException(e.getMessage());
+                } else {
+                    result.append("D1修改费率失败,").append(e.getMessage());
+                }
+            } catch (Exception e) {
+                log.error(e.getMessage());
+                result.append("D1修改费率失败,").append(e.getMessage());
+            }
+        }
+
+        if (d0 != null && rateNewD0 != null) {
+            rateNewD0.setMerchantId(d0.getMerchantId());
+            rateNewD0.setChannel(d0.getChannel());
+            try {
+                if (StringUtils.isEmpty(d0.getApplicationId())) {
+                    ysChangeRateNewService.changeRate(operateUserApp.getUserId() + "", rateNewD0, true);
+                } else {
+                    ysChangeRateService.changeRate(operateUserApp.getUserId() + "", rateNewD0, true);
+                }
+            } catch (RateNoChangeException e) {
+                log.error(e.getMessage());
+            } catch (MsgException e) {
+                log.error(e.getMessage());
+                if (e.getCode().equals(ResultCode.SERVICE_UNAVAILABLE)) {
+                    throw new MsgException(e.getMessage());
+                } else {
+                    result.append("D0修改费率失败,").append(e.getMessage());
+                }
+            } catch (Exception e) {
+                log.error(e.getMessage());
+                result.append("D0修改费率失败, ").append(e.getMessage());
+            }
+        }
+
+        if (result.length() > 0) {
+            throw new MsgException(ResultCode.SUCCESS, result.toString(), null);
+        }
+    }
+
+    @Override
+    public MerchantRateNewVO getChannelRate(String channel, String merchantCode) {
+
+        MerchantRateNew currentRate = getByMerchantCode(merchantCode, channel);
+        if (currentRate == null) {
+            MerchantRateNewVO defResult = new MerchantRateNewVO();
+            defResult.setStatus("1");
+            defResult.setWxRateValue(BigDecimal.valueOf(38).setScale(2, RoundingMode.HALF_UP));
+            defResult.setAliRateValue(BigDecimal.valueOf(38).setScale(2, RoundingMode.HALF_UP));
+            switch (channel) {
+                case "1":
+                case "3":
+                case "4":
+                    defResult.setBankRateValue(BigDecimal.valueOf(40).setScale(2, RoundingMode.HALF_UP));
+                    defResult.setBankRateLargeValue(BigDecimal.valueOf(61.5).setScale(1, RoundingMode.HALF_UP));
+                    break;
+                default:
+                    throw new MsgException("未知的进件通道");
+            }
+
+            currentRate = defResult;
+        } else {
+            MerchantRateNewVO.setRateValue(currentRate);
+        }
+        MerchantRateNewVO result = Converter.INSTANCE.toVO(currentRate);
+        MerchantRateNewRecord rateNewRecord = rateNewRecordService.getExaminedDataByMerchantCode(merchantCode, channel);
+
+        if (rateNewRecord != null) {
+            MerchantRateNew record = Converter.INSTANCE.trans(rateNewRecord);
+            MerchantRateNewVO.setRateValue(record);
+
+            result.setAliRateNewValue(record.getAliRateValue());
+            result.setWxRateNewValue(record.getWxRateValue());
+            result.setBankRateNewValue(record.getBankRateValue());
+            result.setBankRateLargeNewValue(record.getBankRateLargeValue());
+            result.setStatus("0");
+        } else {
+            result.setStatus("1");
+        }
+
+        return result;
+    }
+
+    @Override
+    public MerchantRateNew getByUserId(String userId, String channel) {
+        return rateNewMapper.selectByUserId(userId, channel);
+    }
+
+    @Override
+    public MerchantRateNew getByMerchantCode(String merchantCode, String channel) {
+        return rateNewMapper.selectByMerchantCode(merchantCode, channel);
+    }
+
+    @Override
+    public double getRate(String userId, String payWay,Double orderAmt) {
+        List<MerchantRate> myRateList = merchantRateMapper.selectList(new QueryWrapper<MerchantRate>().eq("userId", userId));
+        if (myRateList.isEmpty()) {
+           return 0;
+        }
+        String rateLevel = myRateList.get(0).getCurrentRate().toString();
+        if(Constant.PAY_TYPE_WECHAT.equals(payWay) || "sxfPay1".equals(payWay)){
+            payWay = WX_RATE;
+        }else if(Constant.PAY_TYPE_ALIPAY.equals(payWay) || "sxfPay0".equals(payWay)){
+            payWay = ALI_RATE;
+        }else if(Constant.PAY_TYPE_YSFPAY.equals(payWay) || "sxfPay2".equals(payWay)){
+            if(orderAmt > BANK_RATE_CRITICAL_VALUE){
+                payWay = BANK_RATE_LARGE;
+            }else{
+                payWay = BANK_RATE;
+            }
+        }
+        Dict dict = dictMapper.selectByNameAndPCode(payWay, rateLevel);
+        if (dict == null) {
+            throw new MsgException("未查询到费率信息");
+        }
+
+        return Double.parseDouble(dict.getValue());
+    }
+
+    @Override
+    public double getWxRate(String rateLevel,Double orderAmt) {
+        return getRate(rateLevel, WX_RATE, orderAmt);
+    }
+
+    @Override
+    public double getAliRate(String rateLevel,Double orderAmt) {
+        return getRate(rateLevel, ALI_RATE,orderAmt);
+    }
+
+    @Override
+    public double getBankRate(String rateLevel,Double orderAmt) {
+        return getRate(rateLevel, BANK_RATE,orderAmt);
+    }
+
+    @Override
+    public double getBankRateLarge(String rateLevel,Double orderAmt) {
+        return getRate(rateLevel, BANK_RATE_LARGE,orderAmt);
+    }
+
+    /**
+     * @description:根据订单以及费率等级获取商户费率
+     * @date: 2021/8/19 15:32
+     * @param payWay: 支付方式
+     * @param orderAmt:订单金额
+     * @param userId:用户id
+     * @return java.math.BigDecimal
+     */
+//    @Override
+//    public BigDecimal getMercOrderRate(String payWay, Double orderAmt,String userId) {
+//        BigDecimal rateLevel = DEFAULT_RATE_LEVEL;
+//        Double rate = null;
+//        List<MerchantRate> myRateList = merchantRateMapper.selectList(new QueryWrapper<MerchantRate>().eq("userId", userId));
+//        if (!myRateList.isEmpty()) {
+//            rateLevel = new BigDecimal(myRateList.get(0).getCurrentRate());
+//        }
+//        if(Constant.PAY_TYPE_WECHAT.equals(payWay) || "sxfPay1".equals(payWay)){
+//            rate = getWxRate(rateLevel.toString());
+//        }
+//        if(Constant.PAY_TYPE_ALIPAY.equals(payWay) || "sxfPay0".equals(payWay)){
+//            rate = getAliRate(rateLevel.toString());
+//        }
+//        if(Constant.PAY_TYPE_YSFPAY.equals(payWay) || "sxfPay2".equals(payWay)){
+//            if(orderAmt > BANK_RATE_CRITICAL_VALUE){
+//                rate = getBankRateLarge(rateLevel.toString());
+//            }else{
+//                rate = getBankRate(rateLevel.toString());
+//            }
+//        }
+//        if(rate == null){
+//            MsgException.throwException("费率获取失败！");
+//        }
+//        return new BigDecimal(String.valueOf(rate));
+//    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/MerchantServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/MerchantServiceImpl.java
new file mode 100644
index 0000000..46fe18e
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/MerchantServiceImpl.java
@@ -0,0 +1,1452 @@
+package cn.pluss.platform.merchant.impl;
+
+import cn.pluss.platform.activityConsumReturn.ActivityConsumReturnService;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultCode;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.constants.Constant;
+import cn.pluss.platform.dto.AccountDTO;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.enums.PayMessageType;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.exception.PayRiskException;
+import cn.pluss.platform.fans.FansService;
+import cn.pluss.platform.ipLocation.IpLocationService;
+import cn.pluss.platform.leshua.LeshuaSignature;
+import cn.pluss.platform.mapper.*;
+import cn.pluss.platform.memberOrder.MemberOrderService;
+import cn.pluss.platform.mercOrderToken.MercOrderTokenService;
+import cn.pluss.platform.merchant.AccountService;
+import cn.pluss.platform.merchant.MerchantCashPlaceService;
+import cn.pluss.platform.merchant.MerchantRateNewService;
+import cn.pluss.platform.merchant.MerchantService;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.merchantMenber.MerchantMenberService;
+import cn.pluss.platform.merchantMenberComsume.MerchantMenberComsumeService;
+import cn.pluss.platform.merchantMenberRecharge.MerchantMenberRechargeService;
+import cn.pluss.platform.merchantOrder.MerchantOrderService;
+import cn.pluss.platform.merchantProfit.MerchantProfitService;
+import cn.pluss.platform.merchantStore.MerchantStoreService;
+import cn.pluss.platform.mswitch.CommonSwitchService;
+import cn.pluss.platform.notify.NotifyMessageService;
+import cn.pluss.platform.pay.PayService;
+import cn.pluss.platform.ryx.pay.RyxPayService;
+import cn.pluss.platform.sxf.pay.SxfPayService;
+import cn.pluss.platform.user.UserVoiceService;
+import cn.pluss.platform.user.impl.GeneralPushUtil;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.util.*;
+import cn.pluss.platform.wap.LevelDTO;
+import cn.pluss.platform.wap.XmlUtil;
+import cn.pluss.platform.wechat.WxConstants;
+import cn.pluss.platform.wx.WxAccessTokenRequest;
+import cn.pluss.platform.wx.WxCommonService;
+import cn.pluss.platform.wx.WxOauth2AccessTokenResponse;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.alipay.api.response.AlipaySystemOauthTokenResponse;
+import com.aliyuncs.geoip.model.v20200101.DescribeIpv4LocationResponse;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.time.FastDateFormat;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
+import java.util.*;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class MerchantServiceImpl implements MerchantService {
+
+    @Autowired
+    private GeneralPushUtil generalPushUtil;
+
+    private final MerchantOrderMapper merchantOrderMapper;
+
+    private final MerchantBaseInfoService merchantBaseInfoService;
+
+    private final FansService fansService;
+
+    private final MerchantProfitService merchantProfitService;
+
+    private final MemberOrderService memberOrderService;
+
+    private final MerchantMenberRechargeService merchantMenberRechargeService;
+
+    private final MerchantMenberService merchantMenberService;
+
+    private final ActivityConsumReturnService activityConsumReturnService;
+
+    private final MerchantStoreService merchantStoreService;
+
+    private final MerchantMenberComsumeService merchantMenberComsumeService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private UserAppService userAppService;
+
+    private final MerchantOrderService merchantOrderService;
+
+    private final SxfPayService sxfPayService;
+
+    @Setter(onMethod_ = {@Autowired, @Lazy})
+    private MerchantChannelStatusService merchantChannelStatusService;
+
+    @Setter(onMethod_ = {@Autowired, @Lazy})
+    private AccountService accountService;
+
+    private final NotifyMessageService notifyMessageService;
+
+    @Qualifier("ipLocationService")
+    private final IpLocationService ipLocationService;
+
+    private final RyxPayService ryxPayService;
+
+    private final MerchantMoveSettingMapper merchantMoveSettingMapper;
+
+    private final MerchantMoveRecordsMapper merchantMoveRecordsMapper;
+
+    @Setter(onMethod_ = {@Autowired, @Qualifier("ysPayOldService")})
+    private PayService ysPayOldService;
+
+    @Setter(onMethod_ = {@Autowired, @Lazy})
+    private MerchantRateNewService merchantRateNewService;
+
+    @Setter(onMethod_ = {@Autowired, @Lazy})
+    private MerchantCashPlaceService merchantCashPlaceService;
+
+    @Setter(onMethod_ = {@Autowired, @Lazy})
+    private WxCommonService wxCommonService;
+
+    @Setter(onMethod_ = {@Autowired, @Lazy})
+    private CommonSwitchService commonSwitchService;
+
+    @Setter(onMethod_ = {@Autowired, @Lazy})
+    private MercOrderTokenService mercOrderTokenService;
+
+    @Setter(onMethod_ = {@Autowired, @Lazy})
+    private UserVoiceService userVoiceService;
+
+
+    @Override
+    public String appRefundCallback(HttpServletRequest request) {
+        log.info("=========================jinruleshua huidiao =====================");
+        String respString = "";
+        InputStream is;
+        Map<String, Object> notifyMap;
+        try {
+            is = request.getInputStream();
+            String xml = XmlUtil.toUTF8(is);
+            log.info("=========fanhui     canshu=============" + xml);
+            notifyMap = XmlUtil.toMapLeshua(xml);
+            log.info("==================fanhuicanshu    Map   jihe=====" + notifyMap + "");
+            if (notifyMap.containsKey("sign")) {
+                if (!LeshuaSignature.checkIsSignValidFromResponseString(xml, resExcludedSignParams(), "75C27ABB12F78A747DCB4368EEBCB542")) {
+                    log.info("============================qianming butongguo======================");
+                    respString = "error";
+                } else {
+                    String status = (String) notifyMap.get("status");
+                    String refundMoney = notifyMap.get("refund_amount").toString();
+                    log.info("============订单状态 status============" + status);
+                    respString = "000000";
+                    String orderNumber = (String) notifyMap.get("third_order_id");// 商户订单号
+
+                    /* 此处查询的是已退款订单，故无需获取取消时间 */
+                    MerchantOrder merchantOrder = new MerchantOrder().setOrderNumber(orderNumber).setStatus("2");
+                    List<MerchantOrder> queryMerchantOrderList = merchantOrderMapper.selectList(new QueryWrapper<>(merchantOrder));
+                    MerchantBaseInfo merchantBaseInfo = new MerchantBaseInfo();
+                    System.out.println("======查询订单=====order=" + JSONObject.toJSONString(queryMerchantOrderList));
+
+
+                    if (StringUtils.isNotEmpty(orderNumber) && queryMerchantOrderList != null && queryMerchantOrderList.size() > 0) {
+
+                        System.out.println("======订单状态=====order=" + JSONObject.toJSONString(queryMerchantOrderList));
+                        merchantOrder = queryMerchantOrderList.get(0);
+                        merchantOrder.setUpdateTime(DateUtils.parse(notifyMap.get("refund_time").toString(), "yyyy-MM-dd HH:mm:ss"));
+                        merchantBaseInfo.setMerchantCode(merchantOrder.getMerchantCode());
+                        merchantBaseInfo = merchantBaseInfoService.queryMerchantBaseInfo(merchantBaseInfo);
+
+                        List<String> alias = new ArrayList<>();
+                        alias.add(merchantBaseInfo.getUserId());
+
+                        String message = String.format("订单%s成功退款%s元", orderNumber, refundMoney);
+
+                        if ("10".equals(status)) {
+                            //退款中
+                            merchantOrder.setStatus("4");
+                        } else if ("11".equals(status)) {
+                            merchantOrder.setStatus("2");
+                        } else if ("12".equals(status)) {
+                            generalPushUtil.sendAllPlatByAlias(alias, "支付宝进件通知", "退款失败", "1");
+//                            JpushClientUtil.sendToRegistrationId2(alias, "退款通知", "退款通知", "退款失败", "1", new Date().toString());
+                            merchantOrder.setStatus("3");
+                        }
+                        // 保存记录时间
+                        if (notifyMap.get("refund_time") != null) {
+                            Date date = FastDateFormat.getInstance("yyyy-MM-dd HH:mm:ss", Locale.CHINA).parse(notifyMap.get("refund_time").toString());
+                            merchantOrder.setUpdateTime(date);
+                        } else {
+                            merchantOrder.setUpdateTime(new Date());
+                        }
+                        merchantOrderMapper.updateById(merchantOrder);
+
+                        System.out.println("===========开始删除粉丝消费");
+                        Fans fans = new Fans();
+                        fans.setOrderNumber(orderNumber);
+                        List<Fans> fansList = fansService.queryFansList(fans);
+                        System.out.println("===========查询粉丝消费==" + JSONObject.toJSONString(fansList));
+                        for (Fans f : fansList) {
+                            String userId = f.getUserId();
+                            fansService.deleteFans(f);
+                            System.out.println("===========删除粉丝消费==");
+                            Fans queryLastFansByUserId = fansService.queryLastFansByUserId(userId);
+                            if (queryLastFansByUserId != null) {
+                                queryLastFansByUserId.setConsumTime(DateUtils.getEndDayOfYesterDay());
+                                fansService.updateFans(queryLastFansByUserId);
+                            }
+                        }
+
+
+                        System.out.println("===========开始删除分润记录==000000");
+                        MerchantProfit merchantProfit = new MerchantProfit();
+                        merchantProfit.setOrderNumber(orderNumber);
+                        List<MerchantProfit> profitList = merchantProfitService.queryMerchantProfitList(merchantProfit);
+                        System.out.println("===========润记录条数==000000===========size====" + profitList.size());
+                        for (MerchantProfit profit : profitList) {
+                            System.out.println("===========删除分润记录==000000======" + JSONObject.toJSONString(profit));
+                            merchantProfitService.deleteMerchantProfit(profit);
+
+                        }
+                        System.out.println("===========成功删除分润记录==000000");
+
+
+                        MemberOrder memberOrder = new MemberOrder();
+                        memberOrder.setOrderNumber(orderNumber);
+                        List<MemberOrder> memberOrderList = memberOrderService.queryMemberOrderList(memberOrder);
+                        if (memberOrderList != null && memberOrderList.size() > 0) {
+
+                            memberOrder = memberOrderList.get(0);
+                            memberOrderService.deleteMemberOrder(memberOrder);//删除充值订单
+
+
+                            MerchantMenberRecharge recharge = new MerchantMenberRecharge();
+                            recharge.setOrderNumber(orderNumber);
+                            List<MerchantMenberRecharge> rechargeList = merchantMenberRechargeService.queryMerchantMenberRechargeList(recharge);
+                            for (MerchantMenberRecharge m : rechargeList) {
+                                merchantMenberRechargeService.deleteMerchantMenberRecharge(m);
+                            }
+                            MerchantMenber memebr = new MerchantMenber();
+                            memebr.setMemberCode(memberOrder.getMemberCode());
+                            memebr = merchantMenberService.queryMerchantMenber(memebr);
+                            memebr.setUsableRechargeFee(StringUtil.bigDecimal(memebr.getUsableRechargeFee() - Double.parseDouble(memberOrderList.get(0).getOrderFee())));
+                            memebr.setTotalRechargeFee(StringUtil.bigDecimal(memebr.getTotalRechargeFee() - Double.parseDouble(memberOrderList.get(0).getOrderFee())));
+                            merchantMenberService.updateMerchantMenber(memebr);
+                        }
+                        System.out.println("===========成功删除粉丝消费==000000");
+                        respString = "000000";
+                        return respString;
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return respString;
+    }
+
+    @Override
+    public void checkPayLocation(HttpServletRequest request, MerchantBaseInfo merchantBaseInfo) throws PayRiskException {
+        // step 1、通过支付人的位置
+        String ipAddr = IpUtils.getIpAddr(request);
+        log.info("【获取用户请求IP地址】ip参数为:{}", ipAddr);
+        DescribeIpv4LocationResponse clientLocation = ipLocationService.getLocation(ipAddr);
+        log.info("【根据ip获取地理位置请求】返回参数:{}", JSON.toJSONString(clientLocation));
+        // step 2、与商户所在位置进行对比
+        if (merchantBaseInfo.getCity() == null) {
+            throw new PayRiskException("商户信息不全");
+        }
+
+        if (clientLocation == null) {
+            // 接口异常的情况下，暂不做这些记录
+            return;
+        }
+//        // 付款人市信息存在，即比较市
+//        if (StringUtils.isNotEmpty(clientLocation.getCity()) && !merchantBaseInfo.getCity().substring(0, 2).equals(clientLocation.getCity().substring(0, 2))) {
+//            throw new PayRiskException("您当前付款距离与收款店铺过远，请当面付款！");
+//        }
+
+        //直辖市可能存在省份为空得情况
+        if(StringUtil.isEmpty(merchantBaseInfo.getProvince())){
+            merchantBaseInfo.setProvince(merchantBaseInfo.getCity());
+        }
+
+        // 省份未知
+        if (StringUtils.isEmpty(clientLocation.getProvince())) {
+            throw new PayRiskException("您当前付款距离与收款店铺过远，请当面付款！");
+        }
+
+        // 比较省份
+        if (!merchantBaseInfo.getProvince().substring(0, 2).equals(clientLocation.getProvince().substring(0, 2))) {
+            throw new PayRiskException("您当前付款距离与收款店铺过远，请当面付款！");
+        }
+    }
+
+
+    @Override
+    public void checkPayLocation(String ip, MerchantBaseInfo merchantBaseInfo, String province) throws PayRiskException {
+        // step 1、通过支付人的位置
+        log.info("【获取用户请求IP地址】ip参数为:{}", ip);
+        DescribeIpv4LocationResponse clientLocation = ipLocationService.getLocation(ip);
+        log.info("【根据ip获取地理位置请求】返回参数:{}", JSON.toJSONString(clientLocation));
+        // step 2、与商户所在位置进行对比
+        if (merchantBaseInfo.getCity() == null) {
+            throw new PayRiskException("商户信息不全");
+        }
+
+        if (clientLocation == null) {
+            // 接口异常的情况下，暂不做这些记录
+            return;
+        }
+
+//        // 付款人市信息存在，即比较市
+//        if (StringUtils.isNotEmpty(clientLocation.getCity()) && !merchantBaseInfo.getCity().substring(0, 2).equals(clientLocation.getCity().substring(0, 2))) {
+//            throw new PayRiskException("您当前付款距离与收款店铺过远，请当面付款！");
+//        }
+        //直辖市可能存在省份为空得情况
+        if(StringUtil.isEmpty(merchantBaseInfo.getProvince())){
+            merchantBaseInfo.setProvince(merchantBaseInfo.getCity());
+        }
+        // 省份未知
+        if (StringUtils.isEmpty(clientLocation.getProvince())) {
+            if (StringUtils.isNotEmpty(province)) {
+                if (!merchantBaseInfo.getProvince().substring(0, 2).equals(province.substring(0, 2))) {
+                    throw new PayRiskException("您当前付款距离与收款店铺过远，请当面付款！");
+                }
+            } else {
+                throw new PayRiskException("您当前付款距离与收款店铺过远，请当面付款！");
+            }
+        } else {
+            // 比较省份
+            if (!merchantBaseInfo.getProvince().substring(0, 2).equals(clientLocation.getProvince().substring(0, 2))) {
+                if (StringUtils.isNotEmpty(province)) {
+                    if (!merchantBaseInfo.getProvince().substring(0, 2).equals(province.substring(0, 2))) {
+                        throw new PayRiskException("您当前付款距离与收款店铺过远，请当面付款！");
+                    }
+                } else {
+                    throw new PayRiskException("您当前付款距离与收款店铺过远，请当面付款！");
+                }
+            }
+        }
+    }
+
+    public static Set<String> resExcludedSignParams() {
+        Set<String> exludedSignParams = new HashSet<>(2);
+        exludedSignParams.add("sign");
+        exludedSignParams.add("error_code");
+        return exludedSignParams;
+    }
+
+    /**
+     * 统一支付入口
+     *
+     * @param params
+     * @return
+     */
+    @Override
+    public Result<Map<String, Object>> tradePay(Map<String, Object> params) {
+        log.info("==============>统一扫码支付下单入口，请求参数:{}<=================", params);
+        //校验参数
+        checkPayParams(params);
+        //组装订单参数
+        MerchantChannelStatus channel = (MerchantChannelStatus) params.get("channel");
+        MerchantBaseInfo merchant = (MerchantBaseInfo) params.get("merchant");
+        if ("1".equals(params.get("isMember")) && "memberPay".equals(params.get("radioPay"))) {
+            Map<String, Object> map = toVipPay(params);
+            return ResultGenerator.genSuccessResult("支付成功", map);
+        }
+        MerchantOrder  order = null;
+        if(StringUtil.isNotEmpty(params.get("orderNumber"))){
+            QueryWrapper<MerchantOrder> queryWrapper = new QueryWrapper<MerchantOrder>()
+                    .eq("orderNumber",params.get("orderNumber").toString()).in("status","1","5","7");
+            order = merchantOrderService.getOne(queryWrapper);
+            if(order == null){
+                order = getMerchantOrder(params);
+            }else{
+                MsgException.check("1".equals(order.getStatus()),"订单已支付，请重新生成订单支付");
+                if(StringUtil.isNotEmpty(order.getMercUserId()) && StringUtil.isNotEmpty(params.get("userId"))){
+                    if(!order.getMercUserId().equals(params.get("userId").toString())){
+                        MsgException.throwException("当前订单已被其他付款用户绑定，请重新生成订单支付");
+                    }
+                }
+                order.setMerchantName(merchant.getAlias());
+                order.setAlias(merchant.getMerchantName());
+            }
+        }else{
+            order = getMerchantOrder(params);
+        }
+       /* if("preOrder".equals(order.getDSource())){
+            JSONObject resultData = new JSONObject(1);
+            resultData.put("orderNumber",order.getOrderNumber());
+            return ResultGenerator.genSuccessResult("处理成功", resultData);
+        }*/
+        JSONObject payData = null;
+        if(StringUtil.isNotEmpty(order.getPayData())){
+            payData = JSON.parseObject(order.getPayData());
+        }else{
+            JSONObject result = null;
+            if (channel.getChannel() == 1) {
+                result = sxfPayService.tradePay(order, channel,merchant);
+            } else if (channel.getChannel() == 2) {
+                MsgException.throwException("当前通道已关闭");
+            } else if (channel.getChannel() == 3) {
+                result = ryxPayService.tradePay(order, channel,merchant);
+            } else if (channel.getChannel() == 4) {
+                result = ysPayOldService.tradePay(order, channel,merchant);
+            } else {
+                MsgException.throwException("未知通道");
+            }
+            if (ResultCode.SUCCESS.code() != result.getInteger("code")) {
+                return ResultGenerator.genFailResult(result.getString("msg"));
+            }
+            String transNo = result.getString("transNo");
+            payData = result.getJSONObject("payData");
+            if (StringUtils.isNotEmpty(transNo)) {
+                order.setTransNo(transNo);
+            }
+        }
+        order.setPayData(payData.toJSONString());
+        if(order.getId() != null){
+            merchantOrderService.updateById(order);
+        }else{
+            merchantOrderService.save(order);
+        }
+        payData.put("orderNumber", order.getOrderNumber());
+        log.info("===============>组装支付参数:{}<==================", payData);
+        return ResultGenerator.genSuccessResult("处理成功", payData);
+    }
+
+    /**
+     * @param params:
+     * @return cn.pluss.platform.api.Result<java.util.Map < java.lang.String, java.lang.Object>>
+     * @description:临时码支付
+     * @date: 2021/8/2 11:03
+     */
+    @Override
+    public Result<Object> moveTradePay(Map<String, Object> params) {
+        Object p = params.get("p");
+        MsgException.checkNull(p, "缺失参数！");
+        Object merchantCode = params.get("merchantCode");
+        MsgException.checkNull(merchantCode, "缺失参数！");
+        Object token = params.get("token");
+        MsgException.checkNull(token, "缺失token参数！");
+
+        Object accountName = params.get("accountName");
+        MsgException.checkNull(accountName, "请输入收款方姓名！");
+        Object accountPhone = params.get("accountPhone");
+        MsgException.checkNull(accountPhone, "请输入收款方手机号！");
+
+        MerchantMoveSetting setting = merchantMoveSettingMapper.selectOne(new QueryWrapper<MerchantMoveSetting>().eq("merchantCode", merchantCode));
+        MsgException.checkNull(setting, "商户暂未开启动态码配置！");
+        MsgException.checkNull(!"1".equals(setting.getStatus()), "商户动态码功能已关闭，请联系客服！");
+        MerchantMoveRecords record = merchantMoveRecordsMapper.selectOne(new QueryWrapper<MerchantMoveRecords>().eq("merchantCode", merchantCode).eq("token", token));
+        MsgException.checkNull(record, "商编和token不匹配！");
+        String ip = params.get("ip").toString();
+        MsgException.check(!ip.equals(record.getIp()), "当前付款用户ip不匹配！");
+
+        //查询今天该商户支付成功次数
+        String nowDate = DateUtils.formatDateDefault(new Date(), "yyyyMMdd");
+        QueryWrapper<MerchantMoveRecords> queryWrapper = new QueryWrapper<MerchantMoveRecords>().eq("merchantCode", merchantCode)
+                .apply("date_format(createTime, '%Y%m%d') = {0}", nowDate);
+        Integer toDayCount = merchantMoveRecordsMapper.getPaySuccessCount(queryWrapper);
+        if (toDayCount >= setting.getPayNum()) {
+            MsgException.throwException("当天超出支付笔数上限制！");
+        }
+        String pStr = "";
+        try {
+            String pk = new String(Base64.getDecoder().decode(p.toString()), "UTF-8");
+            pStr = AESEncrypt.decryptEcb(pk, setting.getAesKey());
+            log.info("解析后的参数为：{}", pStr);
+            if (StringUtil.isEmpty(pStr)) {
+                MsgException.throwException("参数解析出错！");
+            }
+        } catch (RuntimeException e) {
+            e.printStackTrace();
+            MsgException.throwException("参数解析出错！");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+            MsgException.throwException("参数解析出错！");
+        }
+        String time = pStr.substring(pStr.indexOf("time=") + 5);
+        if (StringUtil.isEmpty(time)) {
+            MsgException.throwException("缺失time参数！");
+        }
+        long now = System.currentTimeMillis();
+        if (now > Long.valueOf(time).longValue()) {
+            MsgException.throwException("支付时间已过期，请更换二维码扫码支付！");
+        }
+        checkPayParams(params);
+        //组装订单参数
+        if (pStr.indexOf("payType=") > -1) {
+            int before = pStr.indexOf("payType=");
+            int i = pStr.indexOf("&", before);
+            String payWay = pStr.substring(before + 8, i);
+            params.put("payWay", payWay);
+        }
+        if (pStr.indexOf("cokus=") > -1) {
+            int before = pStr.indexOf("cokus=");
+            int i = pStr.indexOf("&", before);
+            String userId = pStr.substring(before + 6, i);
+            params.put("userId", userId);
+        }
+        MerchantOrder order = getMerchantOrder(params);
+        MerchantBaseInfo merchant = (MerchantBaseInfo) params.get("merchant");
+        MerchantChannelStatus channel = (MerchantChannelStatus) params.get("channel");
+        JSONObject result = null;
+        if (channel.getChannel() == 1) {
+            result = sxfPayService.tradePay(order, channel,merchant);
+        } else if (channel.getChannel() == 2) {
+            MsgException.throwException("当前通道已关闭");
+        } else if (channel.getChannel() == 3) {
+            result = ryxPayService.tradePay(order, channel,merchant);
+        } else if (channel.getChannel() == 4) {
+            result = ysPayOldService.tradePay(order, channel,merchant);
+        } else {
+            MsgException.throwException("未知通道");
+        }
+        if (ResultCode.SUCCESS.code() != result.getInteger("code")) {
+            return ResultGenerator.genFailResult(result.getString("msg"));
+        }
+        //插入订单
+        log.info("================>【支付】下单组装返回参数结果为:{}<==================", result);
+        String transNo = result.getString("transNo");
+        if (StringUtils.isNotEmpty(transNo)) {
+            order.setTransNo(transNo);
+        }
+        merchantOrderService.save(order);
+
+        record.setOrderNumber(order.getOrderNumber());
+        record.setPayUserId(order.getMercUserId());
+        if (Constant.PAY_TYPE_WECHAT.equals(order.getPayTypeCode()) || "sxfPay1".equals(order.getPayTypeCode())) {
+            record.setPaySource(1);
+        } else if (Constant.PAY_TYPE_ALIPAY.equals(order.getPayTypeCode()) || "sxfPay0".equals(order.getPayTypeCode())) {
+            record.setPaySource(2);
+        } else if (Constant.PAY_TYPE_YSFPAY.equals(order.getPayTypeCode()) || "sxfPay2".equals(order.getPayTypeCode())) {
+            record.setPaySource(3);
+        } else {
+            record.setPaySource(4);
+        }
+        merchantMoveRecordsMapper.updateById(record);
+        JSONObject payData = result.getJSONObject("payData");
+        payData.put("orderNumber", order.getOrderNumber());
+        payData.put("payType", params.get("payWay"));
+        log.info("===============>组装支付参数:{}<==================", payData);
+        return ResultGenerator.genSuccessResult("处理成功", payData);
+    }
+
+    /*Map<String,Object> result = new HashMap<>(2);
+        String orderNumber = null;
+        Double consumeFee = Double.parseDouble(params.get("comsumeMoney"));//消费金额
+        String merchantCode = params.get("merchantCode");
+        String storeId = params.get("storeId");
+        //选择了会员卡支付
+        if ("1".equals(params.get("isMember")) && "memberPay".equals(params.get("radioPay"))) {
+            return toVipPay(params);
+        }
+        log.info("==============>选择直接支付，请求参数:{}<=================",params);
+        MerchantStore store = merchantStoreService.getMerchantInfo(merchantCode,storeId);
+        if(store == null){
+            result.put("code", "0");
+            result.put("msg", "店铺信息状态异常或不存在！");
+            return result;
+        }
+        Map<String,Object> reqResult = null;
+        String payTypeCode = "";
+        String payTypeName = "";
+        String payWay = params.get("payWay");
+        if("1".equals(aisleSwitch)){
+            orderNumber = "L" + StringUtil.getBillno();
+            if ("ZFBZF".equals(payWay)) {
+                payTypeCode = "leshuaPay0";
+                payTypeName = "乐刷支付宝支付";
+            } else if ("WXZF".equals(payWay)) {
+                payTypeCode = "leshuaPay1";
+                payTypeName = "乐刷微信支付";
+            }
+            //JSONObject jsonObject = converParameter(aisleSwitch,params,request,orderNumber);
+            reqResult = leshuaService.tradePay(params,request,store,orderNumber);
+        }else if("2".equals(aisleSwitch)){
+            orderNumber = "SXF" + StringUtil.getBillno();
+            if ("ZFBZF".equals(payWay)) {
+                payTypeCode = "sxfPay0";
+                payTypeName = "随行支付宝支付";
+            } else if ("WXZF".equals(payWay)) {
+                payTypeCode = "sxfPay1";
+                payTypeName = "随行微信支付";
+            }else{
+                payTypeCode = "sxfPay2";
+                payTypeName = "随行云闪付支付";
+            }
+            QueryWrapper<MerchantChannel> channelWrapper = new QueryWrapper<MerchantChannel>();
+            channelWrapper.eq("channelCode","SXF");
+            MerchantChannel channel = merchantChannelMapper.selectOne(channelWrapper);
+            if(channel == null){
+                result.put("code","0");
+                result.put("msg","未配置随行付通道！");
+                return result;
+            }
+            QueryWrapper<MerchantChannelStatus> channelStatusWrapper = new QueryWrapper<MerchantChannelStatus>();
+            channelStatusWrapper.eq("channel",channel.getId());
+            channelStatusWrapper.eq("merchantCode",merchantCode);
+            MerchantChannelStatus channelStatus = merchantChannelStatusMapper.selectOne(channelStatusWrapper);
+            if(channelStatus == null){
+                result.put("code","0");
+                result.put("msg","当前商户未查询到通道信息！");
+                return result;
+            }
+            if(!channelStatus.isPayment()){
+                result.put("code","0");
+                result.put("msg","当前商户还未进件成功！");
+                return result;
+            }
+            //reqResult = sxfPayService.tradePay(params, request,store,orderNumber,channelStatus);
+        }else{
+            result.put("code","0");
+            result.put("msg","暂不支持其他支付通道！");
+            return result;
+        }
+        if("0".equals(reqResult.get("code"))){
+            return reqResult;
+        }
+        reqResult = (Map<String, Object>) reqResult.get("data");
+        MerchantOrder merchantOrder = new MerchantOrder();
+        merchantOrder.setMerchantCode(merchantCode);
+        merchantOrder.setStoreId(store.getStoreId());
+        merchantOrder.setStoreName(store.getStoreName());
+        merchantOrder.setMerchantName(store.getMerchantName());
+        merchantOrder.setOrderNumber(orderNumber);
+        merchantOrder.setStaffCode(store.getStoreId());
+        merchantOrder.setStaffName(store.getStoreName());
+        merchantOrder.setPayTypeCode(payTypeCode);
+        merchantOrder.setPayTypeName(payTypeName);
+        merchantOrder.setConsumeFee(consumeFee);
+        MerchantBaseInfo merchantBaseInfo = new MerchantBaseInfo();
+        merchantBaseInfo.setMerchantCode(merchantCode);
+        merchantBaseInfo = merchantBaseInfoService.queryMerchantBaseInfo(merchantBaseInfo);
+        Double rate = merchantBaseInfo.getLeshuaRate() == null ? 0.0038d : merchantBaseInfo.getLeshuaRate();
+        List<MerchantRate> myRateList = merchantRateMapper.selectList(new QueryWrapper<MerchantRate>().eq("userId", merchantBaseInfo.getUserId()));
+        if(!myRateList.isEmpty()){
+            rate = new BigDecimal(myRateList.get(0).getCurrentRate()).divide(new BigDecimal(10000)).doubleValue();
+        }
+        *//*QueryWrapper<UserApp> query = new QueryWrapper<UserApp>().eq("userId",merchantBaseInfo.getUserId());
+        UserApp userApp = userAppService.getOne(query);
+        if(userApp != null){
+            rate = merchantOrderService.getCurrentFee(userApp,"current",rate,userApp.getUserId());
+        }*//*
+        BigDecimal fee = new BigDecimal(String.valueOf(consumeFee)).multiply(new BigDecimal(String.valueOf(rate))).setScale(2, BigDecimal.ROUND_HALF_UP);
+        merchantOrder.setEnterFee(new BigDecimal(String.valueOf(consumeFee)).subtract(fee).doubleValue());
+        Date date = new Date();
+        merchantOrder.setCreateDt(date);
+        merchantOrder.setUpdateTime(date);
+        merchantOrder.setStatus("5");
+        merchantOrder.setRemark(params.get("remark"));
+        merchantOrder.setAisleSwitch(aisleSwitch);
+        merchantOrder.setOrderType("2");
+        merchantOrder.setUserImg(params.get("userImg"));
+        merchantOrder.setNickName(URLEncoder.encode(params.get("nickName"), "UTF-8"));
+        log.info("============zu zhuang dingdan xinxi======================" + JSONObject.toJSONString(merchantOrder));
+        merchantOrder.setRate(new BigDecimal(String.valueOf(rate)).multiply(new BigDecimal(10000)).intValue());
+
+        //-------------------
+        if("WXZF".equalsIgnoreCase(params.get("payWay"))){
+            merchantOrder.setMercUserId(params.get("openid"));
+        }else if("ZFBZF".equalsIgnoreCase(params.get("payWay"))){
+            merchantOrder.setMercUserId(params.get("userId"));
+        }else if("UNIONPAY".equalsIgnoreCase(params.get("payWay"))){
+            merchantOrder.setMercUserId(params.get("userId"));
+        }
+
+        //-------------------
+        merchantOrderService.saveMerchantOrder(merchantOrder);
+        result.put("aisleSwitch",aisleSwitch);
+        result.put("code","1");
+        result.put("msg","下单成功");
+        result.put("data",reqResult);*/
+
+
+    /**
+     * 组装订单参数
+     *
+     * @param params
+     * @return
+     */
+    private MerchantOrder getMerchantOrder(Map<String, Object> params) {
+
+        String merchantCode = (String) params.get("merchantCode");
+        String comsumeMoney = (String) params.get("comsumeMoney");
+        MerchantStore store = (MerchantStore) params.get("store");
+        MerchantChannelStatus channel = (MerchantChannelStatus) params.get("channel");
+
+        MerchantBaseInfo merchant = (MerchantBaseInfo) params.get("merchant");
+
+        MerchantOrder order = new MerchantOrder();
+        order.setMerchantCode(merchantCode);
+        order.setStoreId(store.getStoreId());
+        order.setStoreName(store.getStoreName());
+        order.setMerchantName(merchant.getAlias());
+        order.setAlias(merchant.getMerchantName());
+        order.setStaffCode(store.getStoreId());
+        order.setStaffName(store.getStoreName());
+        order.setConsumeFee(Double.valueOf(comsumeMoney));
+        if (StringUtils.isNotEmpty((String) params.get("userId"))) {
+            order.setMercUserId((String) params.get("userId"));
+        } else {
+            order.setMercUserId((String) params.get("openid"));
+        }
+        if(StringUtil.isNotEmpty(order.getMercUserId())){
+            order.setMercUserId(order.getMercUserId().replace(" ", "+"));
+        }
+        if(params.get("mercOrderNo") != null){
+            order.setMercOrderNo(params.get("mercOrderNo").toString());
+        }
+        if(params.get("mercNotifyUrl") != null){
+            order.setMercNotifyUrl(params.get("mercNotifyUrl").toString());
+        }
+        if(params.get("mercRefundUrl") != null){
+            order.setMercReturnUrl(params.get("mercRefundUrl").toString());
+        }
+        if(params.get("subject") != null){
+            order.setSubject(params.get("subject").toString());
+        }
+        Date date = new Date();
+        order.setCreateDt(date);
+        order.setUpdateTime(date);
+        order.setStatus("5");
+        order.setRemark((String) params.get("remark"));
+        String orderType = "2";
+        if (StringUtils.isNotEmpty((String) params.get("payType")) && "03".equals(params.get("payType"))) {
+            orderType = "3";
+            order.setIsRecharge("1");
+        }
+        order.setOrderType(orderType);
+        order.setMemberCode(params.get("memberCode") != null ? params.get("memberCode").toString() : "");
+        order.setUserImg(params.get("userImg") != null ? (String) params.get("userImg") : "");
+        if (params.get("nickName") != null) {
+            try {
+                order.setNickName(URLDecoder.decode((String) params.get("nickName"), "UTF-8"));
+            } catch (UnsupportedEncodingException e) {
+                e.printStackTrace();
+                log.info("==================>解析会员名称失败");
+            }
+        }
+        log.info("============组装订单信息======================" + JSONObject.toJSONString(order));
+        //会员充值查询收银点信息
+        String snNo = (String) params.get("snNo");
+        //设置当前支持是否支持信用卡
+        merchantCashPlaceService.setOrderPlaceInfo(order,snNo);
+//        order.setDSource(params.get("dSource") == null ? "": params.get("dSource").toString());
+        merchantOrderService.constOrderPayCodeAndName(order, params, channel);
+        order.isAllowBankLarge(merchant);
+        BigDecimal rate = merchantRateNewService.getMchRate(merchant.getMerchantCode(), order.getPayTypeCode(), order.getConsumeFee());
+        order.calcRateAndFee(rate);
+        if (StringUtils.isNotEmpty((String) params.get("ip"))) {
+            String ip = params.get("ip").toString();
+            order.setIp(ip);
+            String ipAddress = IpUtils.getIpLoactionAddress(ipLocationService.getLocation(ip));
+            order.setIpAddress(ipAddress);
+        }
+        return order;
+    }
+
+    /**
+     * @param params
+     */
+    private void checkPayParams(Map<String, Object> params) {
+        Object tk = params.get("tk");
+        if(StringUtil.isNotEmpty(tk)){
+            MercOrderToken byToken = mercOrderTokenService.getByToken(tk.toString());
+            MsgException.checkNull(byToken, "tk参数有误");
+            params.put("comsumeMoney",byToken.getOrderAmt().toString());
+            params.put("merchantCode",byToken.getMerchantCode());
+            Date now = DateUtils.currentDate();
+            if(now.compareTo(byToken.getExpireTime()) > 0){
+                MsgException.throwException("订单超时，请重新生成订单");
+            }
+            params.put("orderNumber",byToken.getOrderNumber());
+            params.put("snNo",byToken.getSnNo());
+            params.put("mercOrderNo",byToken.getMercOrderNo());
+            params.put("mercNotifyUrl",byToken.getMercNotifyUrl());
+            params.put("mercRefundUrl",byToken.getMercRefundUrl());
+            params.put("subject",byToken.getSubject());
+        }
+        //检查交易参数
+        MsgException.checkNull(params.get("comsumeMoney"), "无消费金额");
+        MsgException.checkNull(params.get("merchantCode"), "无商户编号");
+        MerchantStore store = null;
+
+        if (params.get("storeId") != null) {
+            store = merchantStoreService.getMerchantInfo((String) params.get("merchantCode"), (String) params.get("storeId"));
+        } else {
+            store = merchantStoreService.queryMerchantStore(new MerchantStore().setMerchantCode((String) params.get("merchantCode")));
+        }
+        MsgException.checkNull(store, "店铺信息状态异常或不存在！");
+        MerchantChannelStatus channel = null;
+        Object channelVal = params.get("channelVal");
+        if (channelVal != null) {
+            channel = merchantChannelStatusService.getByMerchantCode((String) params.get("merchantCode"), Integer.valueOf(channelVal.toString()));
+        } else {
+            channel = merchantChannelStatusService.getValidData((String) params.get("merchantCode"));
+        }
+        MsgException.checkNull(channel, "无进件信息，请先提交商户信息进行审核");
+
+        MsgException.check("7".equals(channel.getStatus()), "实时到账审核中");
+
+        MsgException.check("2".equals(store.getStatus()), "商户已被禁用");
+
+        MsgException.check(!channel.isPayment(), "进件未通过请耐心等待或联系客服");
+
+        QueryWrapper<MerchantBaseInfo> info = new QueryWrapper<MerchantBaseInfo>().
+                eq("merchantCode", store.getMerchantCode());
+        MerchantBaseInfo baseInfo = merchantBaseInfoService.getOne(info);
+        MsgException.checkNull(baseInfo, "商户信息异常！");
+
+        String accountName = (String) params.get("accountName");
+        String accountPhone = (String) params.get("accountPhone");
+        if (StringUtils.isNotEmpty(accountName) && StringUtils.isNotEmpty(accountPhone)) {
+            AccountDTO realAccount = accountService.getRealAccount(baseInfo.getUserId());
+            String checkName = realAccount.getBankCard().getBankHolder();
+            String checkPhone = realAccount.getBankCard().getPhone();
+            if (!accountName.equals(checkName) || !accountPhone.equals(checkPhone)) {
+                MsgException.throwException("收款人姓名或手机号不正确，请与商户核实!");
+            }
+        }
+        params.put("store", store);
+        params.put("channel", channel);
+        params.put("merchant", baseInfo);
+    }
+
+
+    private Map<String, Object> toVipPay(Map<String, Object> params) {
+        Map<String, Object> result = new HashMap<>();
+        log.info("==============>选择会员卡支付，请求参数:{}<=================", params);
+        Double consumeFee = Double.parseDouble(params.get("comsumeMoney").toString());//消费金额
+        String merchantCode = (String) params.get("merchantCode");
+        String storeId = (String) params.get("storeId");
+
+        MerchantMenber m = new MerchantMenber();
+        m.setMerchantCode((String) params.get("merchantCode"));
+        m.setStoreId((String) params.get("storeId"));
+        if (StringUtils.isNotEmpty((String) params.get("appOpenId"))) {
+            m.setAppOpenId((String) params.get("appOpenId"));
+        } else {
+            m.setOpenid((String) params.get("openid"));
+        }
+        //
+        List<MerchantMenber> queryMerchantMenberList = merchantMenberService.queryMerchantMenberList(m);
+        if (queryMerchantMenberList != null && queryMerchantMenberList.size() > 0) {
+            ActivityConsumReturn activityConsumReturn = new ActivityConsumReturn();
+            activityConsumReturn.setMerchantCode((String) params.get("merchantCode"));
+            activityConsumReturn.setStoreId((String) params.get("storeId"));
+            List<ActivityConsumReturn> queryActivityConsumReturnList = activityConsumReturnService.queryActivityConsumReturnList(activityConsumReturn);
+            Double returnMoney = 0d;
+            MerchantMenberComsume merchantMenberComsume = new MerchantMenberComsume();
+            if (queryActivityConsumReturnList != null && queryActivityConsumReturnList.size() > 0) {
+                queryActivityConsumReturnList = comsumeMoneyByDesc(queryActivityConsumReturnList);
+                for (ActivityConsumReturn a : queryActivityConsumReturnList) {
+                    if (1 == a.getTimeType()) {
+                        if (a.getStartDt() == null || a.getEndDt() == null) {
+                            continue;
+                        }
+                        boolean bol = DateUtils.isBoolean(a.getStartDt(), a.getEndDt());
+                        if (!bol) {
+                            activityConsumReturnService.deleteActivityConsumReturn(a);
+                            continue;
+                        }
+                    }
+                    if (null != a.getComsumeMoney()) {
+                        //分等级返现
+                        if (a.getType() == 0) {
+                            if (consumeFee >= StringUtil.bigDecimal(a.getComsumeMoney())) {
+                                merchantMenberComsume.setGiveMoney(StringUtil.bigDecimal(a.getReturnMoney()));// 返现金额
+                                returnMoney = a.getReturnMoney();
+                                break;
+                            }
+                        } else if (a.getType() == 1) {
+                            if (consumeFee >= StringUtil.bigDecimal(a.getComsumeMoney())) {
+                                Double d = a.getReturnMoney();
+                                Double countD = consumeFee / a.getComsumeMoney();
+                                Integer count = countD.intValue();
+                                Double returnAmt = d * count;
+                                merchantMenberComsume.setGiveMoney(StringUtil.bigDecimal(returnAmt));// 返现金额
+                                returnMoney = StringUtil.bigDecimal(returnAmt);
+                                break;
+                            }
+                        }
+                    }
+                    if (a.getType() == 2) {
+                        Double percentRate = a.getPercent() / 100;
+                        Double d = consumeFee * percentRate;
+                        merchantMenberComsume.setGiveMoney(StringUtil.bigDecimal(d));// 返现金额
+                        returnMoney = StringUtil.bigDecimal(d);
+                        break;
+                    }
+                }
+            }
+            m = queryMerchantMenberList.get(0);
+            Double usableRechargeFee = m.getUsableRechargeFee() == null ? 0d : m.getUsableRechargeFee();// 可用充值金额
+            usableRechargeFee = StringUtil.bigDecimal(usableRechargeFee);
+            Double usableGiveFee = m.getUsableGiveFee() == null ? 0d : m.getUsableGiveFee();// 可用的赠送金额
+            usableGiveFee = StringUtil.bigDecimal(usableGiveFee);
+            Double count = usableGiveFee + usableRechargeFee;
+            if (consumeFee > count) {
+                log.info("===============>会员卡充值，余额不足，会员卡消费金额:{},会员卡余额:{}<============", consumeFee, count);
+                result.put("code", "0");
+                result.put("msg", "会员卡余额不足");
+                return result;
+            } else {
+                if (usableGiveFee >= consumeFee) {// 可用的赠送余额大于等于消费金额
+                    usableGiveFee = usableGiveFee - consumeFee;// 扣款之后的赠送金额
+                } else {// 可用的赠送余额小于消费金额
+                    usableGiveFee = 0d;
+                    usableRechargeFee = count - consumeFee;
+                }
+                MerchantMenber menber = new MerchantMenber();
+                menber.setUsableGiveFee(usableGiveFee);
+                menber.setUsableRechargeFee(usableRechargeFee);
+                Double comsumeMoney = m.getComsumeMoney() == null ? 0d : m.getComsumeMoney();// 之前会员的消费金额
+                menber.setComsumeMoney(StringUtil.bigDecimal(consumeFee + comsumeMoney));// 现在的会员消费金额
+                Double totalGiveFee = m.getTotalGiveFee() == null ? 0d : m.getTotalGiveFee();
+                totalGiveFee = totalGiveFee + returnMoney;// 赠送总余额
+                menber.setTotalGiveFee(totalGiveFee);
+                menber.setUsableGiveFee(usableGiveFee + returnMoney);// 赠送总可用余额
+                menber.setId(m.getId());
+                merchantMenberService.updateMerchantMenber(menber);// 修改会员表余额
+                MerchantStore merchantStore = new MerchantStore();
+                merchantStore.setStoreId((String) params.get("storeId"));
+                merchantStore.setMerchantCode((String) params.get("merchantCode"));
+                merchantStore = merchantStoreService.queryMerchantStore(merchantStore);
+                String orderNo = "XF700" + StringUtil.getBillno();
+                merchantMenberComsume = merchantMenberComsume.convert(orderNo, merchantMenberComsume.getGiveMoney(), m, merchantStore, consumeFee, merchantCode);
+                merchantMenberComsumeService.saveMerchantMenberComsume(merchantMenberComsume);
+                MemberOrder memberOrder = new MemberOrder();
+                // 订单号
+                try {
+                    memberOrder.setMerchantCode(merchantCode);
+                    memberOrder.setMerchantName(merchantStore.getMerchantName());
+                    memberOrder.setStoreId(storeId);
+                    memberOrder.setStoreName(merchantStore.getStoreName());
+                    memberOrder.setOrderNumber(orderNo);
+                    memberOrder.setMemberCode(m.getMemberCode());
+                    Date date = new Date();
+                    memberOrder.setCreateDt(date);
+                    memberOrder.setOrderFee(consumeFee + "");// 订单金额
+                    memberOrder.setNickName(m.getNickName());
+                    memberOrder.setOrderType("0");
+                    memberOrder.setOrderStatus("1");
+                    memberOrder.setStaffCode(storeId);
+                    memberOrder.setStaffName(merchantStore.getStoreName());
+                    memberOrderService.saveMemberOrder(memberOrder);
+                    result.put("isMember", "1");
+                    MerchantBaseInfo merchantBaseInfo = new MerchantBaseInfo();
+                    merchantBaseInfo.setMerchantCode(memberOrder.getMerchantCode());
+                    List<MerchantBaseInfo> queryMerchantBaseInfoList = merchantBaseInfoService.queryMerchantBaseInfoList(merchantBaseInfo);
+                    if (queryMerchantBaseInfoList != null && queryMerchantBaseInfoList.size() > 0) {
+                        merchantBaseInfo = queryMerchantBaseInfoList.get(0);
+                        if (StringUtils.isNotEmpty(merchantBaseInfo.getUserId())) {
+                            UserVoice voice = userVoiceService.getByUserId(Long.valueOf(merchantBaseInfo.getUserId()));
+                            if(UserVoice.ENABLE.equals(voice.getMemberConsume())){
+                                List<String> alias = userAppService.storeMemberList(merchantCode);
+                                generalPushUtil.sendAllPlatByUserIdConsumeWithCoupon(alias,BigDecimal.valueOf(consumeFee),BigDecimal.valueOf(returnMoney));
+                            }
+                        }
+                    }
+                    result.put("code", "1");
+                    result.put("msg", "会员卡支付成功！");
+                    //TODO 调用语音播报
+                    try {
+                        MerchantOrder order = new MerchantOrder();
+                        order.setConsumeFee(consumeFee);
+                        order.setMerchantCode((String) params.get("merchantCode"));
+                        order.setOrderNumber(orderNo);
+                        order.setDiscount(returnMoney);
+                        notifyMessageService.sendMqttMessage(order, date, "pay", null, null, PayMessageType.MEMBER_CONSUME.getValue());
+
+                        menber.setCardNo(m.getCardNo());
+                        menber.setMerchantCode(m.getMerchantCode());
+                        menber.setOpenid(m.getOpenid());
+                        merchantMenberService.sendMenberBalanceChangeNotice(menber,consumeFee,"2");
+                    } catch (Exception e) {
+                        log.info("===========>会员卡支付，其他操作失败，失败原因:{}，<==============", e.getMessage());
+                    }
+                    return result;
+                } catch (NumberFormatException e) {
+                    e.printStackTrace();
+                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                    result.put("code", "0");
+                    result.put("msg", "会员卡支付失败！");
+                    result.put("isMember", "0");
+                    return result;
+                }
+            }
+        } else {
+            result.put("code", "0");
+            result.put("msg", "会员卡支付失败！");
+            result.put("isMember", "0");
+            return result;
+        }
+    }
+
+    public List<ActivityConsumReturn> comsumeMoneyByDesc(List<ActivityConsumReturn> list) {
+        list.sort((o1, o2) -> (int) (Optional.ofNullable(o2.getComsumeMoney()).orElse(0d) - Optional.ofNullable(o1.getComsumeMoney()).orElse(0d)));
+        return list;
+    }
+
+    /**
+     * 会员升级付费
+     *
+     * @param levelDTO
+     * @return
+     */
+    @Deprecated
+    @Override
+    public Map<String, Object> tradePay(LevelDTO levelDTO, HttpServletRequest request) throws Exception {
+        MsgException.throwException("改方法已过时");
+//        Map<String,Object> result = new HashMap<>(2);
+//        String aisleSwitch = systemConfigService.querySystemConfigValue("aisleSwitch");
+//        if(StringUtil.isEmpty(aisleSwitch)){
+//            result.put("code","0");
+//            result.put("msg","未配置支付通道！");
+//            return result;
+//        }
+//        String orderNumber = "SJ000"+StringUtil.getBillno();
+//        Map<String,String> params = new HashMap<>();
+//        params.put("payWay",levelDTO.getPayWay());
+//        params.put("comsumeMoney",levelDTO.getMoney());
+//        params.put("openid",levelDTO.getOpenid());
+//        params.put("userId",levelDTO.getUserid());
+//
+//        String merchantCode = "M800202008254990744";
+//
+//        //创建用户升级订单//
+//        MerchantIncome income=new MerchantIncome();
+//        income.setUserId(Integer.parseInt(levelDTO.getUserAppId()));
+//        income.setDealCode(orderNumber);
+//        income.setCreateTime(new Date());
+//        income.setDealFee(Double.valueOf(levelDTO.getMoney()));
+//        income.setPayTypeCode("3");
+//        income.setPayTypeName("推广员升级充值");
+//        income.setMerchantCode(merchantCode);
+//        QueryWrapper<MerchantBaseInfo> queryWrapper = new QueryWrapper<MerchantBaseInfo>().eq("merchantCode",merchantCode);
+//        MerchantBaseInfo one = merchantBaseInfoService.getOne(queryWrapper);
+//        if(one == null){
+//            log.error("======================>升级金额打款的商户编号数据不存在，商编为：{}<=====================",merchantCode);
+//            result.put("code","0");
+//            result.put("msg","支付失败！");
+//            return result;
+//        }
+//        income.setMerchantName(one.getAlias());
+//        income.setDealStatus(0);
+//        merchantIncomeMapper.saveMerchantIncome(income);
+//        MerchantStore store = new MerchantStore();
+//        store.setMerchantName(one.getMerchantName());
+//        store.setAlias(one.getAlias());
+//
+//        QueryWrapper<MerchantChannel> channelWrapper = new QueryWrapper<MerchantChannel>();
+//        channelWrapper.eq("channelCode","SXF");
+//        MerchantChannel channel = merchantChannelMapper.selectOne(channelWrapper);
+//        if(channel == null){
+//            result.put("code","0");
+//            result.put("msg","未配置随行付通道！");
+//            return result;
+//        }
+//        MerchantChannelStatus channelStatus = merchantChannelStatusService.getByMerchantCode(merchantCode,channel.getId());
+//        if(channelStatus == null){
+//            result.put("code","0");
+//            result.put("msg","当前商户未查询到通道信息！");
+//            return result;
+//        }
+//        if(!channelStatus.isPayment()){
+//            result.put("code","0");
+//            result.put("msg","当前商户还未进件成功！");
+//            return result;
+//        }
+//
+//        String payTypeCode = null;
+//        String payTypeName = null;
+//        if ("ZFBZF".equals(levelDTO.getPayWay())) {
+//            payTypeCode = "sxfPay0";
+//            payTypeName = "随行支付宝支付";
+//        } else if ("WXZF".equals(levelDTO.getPayWay())) {
+//            payTypeCode = "sxfPay1";
+//            payTypeName = "随行微信支付";
+//        }else{
+//            payTypeCode = "sxfPay2";
+//            payTypeName = "随行云闪付支付";
+//        }
+//        MerchantOrder merchantOrder = new MerchantOrder();
+//        merchantOrder.setMerchantCode(merchantCode);
+//        merchantOrder.setStoreId(store.getStoreId());
+//        merchantOrder.setStoreName(store.getStoreName());
+//        merchantOrder.setMerchantName(store.getMerchantName());
+//        merchantOrder.setOrderNumber(orderNumber);
+//        merchantOrder.setStaffCode(store.getStoreId());
+//        merchantOrder.setStaffName(store.getStoreName());
+//        merchantOrder.setPayTypeCode(payTypeCode);
+//        merchantOrder.setPayTypeName(payTypeName);
+//        merchantOrder.setConsumeFee(Double.valueOf(levelDTO.getMoney()));
+//        Date date = new Date();
+//        merchantOrder.setCreateDt(date);
+//        merchantOrder.setUpdateTime(date);
+//        merchantOrder.setStatus("5");
+//        merchantOrder.setRemark(params.get("remark"));
+//        merchantOrder.setAisleSwitch(aisleSwitch);
+//        merchantOrder.setOrderType("8");
+//
+//        BigDecimal rate = merchantRateNewService.getMchRate(one.getMerchantCode(),payTypeCode, merchantOrder.getConsumeFee());
+//        merchantOrder.calcRateAndFee(rate);
+//
+//        merchantOrderService.save(merchantOrder);
+        //return sxfPayService.tradePay(params, request, store, orderNumber, channelStatus);
+        return null;
+    }
+
+    /**
+     * 被扫小程序会员卡充值接口
+     *
+     * @param json
+     * @return
+     */
+    @Override
+    public Result<JSONObject> memberRecharge(JSONObject json) {
+
+        // 校验会员充值参数
+        checkRechargeParams(json);
+        //组装订单参数
+        MerchantChannelStatus channel = json.getObject("channel", MerchantChannelStatus.class);
+        MerchantStore store = json.getObject("store", MerchantStore.class);
+        MerchantMenber menber = json.getObject("menber", MerchantMenber.class);
+
+        MerchantBaseInfo merchant = json.getObject("merchant", MerchantBaseInfo.class);
+
+        Map<String, Object> params = new HashMap<>(16);
+        params.put("payWay", json.getString("payWay"));
+        params.put("merchantCode", channel.getMerchantCode());
+        params.put("comsumeMoney", json.get("rechargeAmt"));
+
+        params.put("channel", channel);
+        params.put("merchant", merchant);
+        params.put("store", store);
+        params.put("userImg", menber.getLogo());
+        params.put("nickName", menber.getNickName() == null ? menber.getMemberName() : menber.getNickName());
+        params.put("orderNum", "HYCZ");
+        params.put("userId", json.getString("appOpenId"));
+        params.put("payType", json.getString("payType"));
+
+        params.put("ip", json.getString("ip"));
+        params.put("memberCode", menber.getMemberCode());
+        MerchantOrder order = getMerchantOrder(params);
+        /**
+         * 组装会员充值订单
+         */
+        MemberOrder menberOrder = getMenberOrder(order);
+
+        JSONObject result = null;
+        //随行付
+        if (channel.getChannel() == 1) {
+            result = sxfPayService.tradePay(order, channel,merchant);
+            //乐刷
+        } else if (channel.getChannel() == 2) {
+            MsgException.throwException("当前通道已关闭");
+        } else if (channel.getChannel() == 3) {
+            //瑞银信
+            result = ryxPayService.tradePay(order, channel,merchant);
+        } else if (channel.getChannel() == 4) {
+            //银盛
+            result = ysPayOldService.tradePay(order, channel,merchant);
+        } else {
+            MsgException.throwException("未知通道");
+        }
+        if (ResultCode.SUCCESS.code() != result.getInteger("code")) {
+            return ResultGenerator.genFailResult(result.getString("msg"));
+        }
+        merchantOrderService.save(order);
+        memberOrderService.saveMemberOrder(menberOrder);
+        JSONObject payData = result.getJSONObject("payData");
+        return ResultGenerator.genSuccessResult("处理成功", payData);
+    }
+
+    /**
+     * 组装会员充值订单
+     */
+    private MemberOrder getMenberOrder(MerchantOrder merchantOrder) {
+        MemberOrder memberOrder = new MemberOrder();
+        memberOrder.setOrderFee(String.valueOf(merchantOrder.getConsumeFee()));
+        memberOrder.setMemberCode(merchantOrder.getMemberCode());
+        memberOrder.setMerchantCode(merchantOrder.getMerchantCode());
+        memberOrder.setMerchantName(merchantOrder.getMerchantName());
+        memberOrder.setStoreId(merchantOrder.getStoreId());
+        memberOrder.setStoreName(merchantOrder.getStoreName());
+        memberOrder.setCreateDt(new Date());
+        memberOrder.setNickName(merchantOrder.getNickName());
+        memberOrder.setLogo(merchantOrder.getUserImg());
+        memberOrder.setOrderStatus("2");
+        memberOrder.setOrderType("1");
+        memberOrder.setRechargeType("3");
+        memberOrder.setOrderNumber(merchantOrder.getOrderNumber());
+        memberOrder.setMemberCode(merchantOrder.getMemberCode());
+        log.info("=======wechatPay:fangfa" + JSONObject.toJSONString(memberOrder) + "");
+//        memberOrderService.saveMemberOrder(memberOrder);
+        return memberOrder;
+    }
+
+    /**
+     * 校验小程序会员充值参数
+     *
+     * @param json
+     */
+    private void checkRechargeParams(JSONObject json) {
+        MsgException.checkNull(json.getInteger("storeId"), "店铺ID为空！");
+        MsgException.checkBlank(json.getString("appOpenId"), "充值用户为空！");
+        MsgException.checkNull(json.getBigDecimal("rechargeAmt"), "充值金额为空！");
+        MsgException.check(!StringUtil.isNumber(json.getBigDecimal("rechargeAmt").toString()), "充值金额格式不正确！");
+        MsgException.check(json.getBigDecimal("rechargeAmt").doubleValue() < 0.01d, "充值金额最少为0.01！");
+
+        MsgException.checkBlank(json.getString("payWay"), "支付渠道为空！");
+        MsgException.checkBlank(json.getString("payType"), "支付方式为空！");
+
+        MerchantStore mStore = new MerchantStore();
+        mStore.setId(json.getInteger("storeId"));
+        MerchantStore store = merchantStoreService.queryMerchantStore(mStore);
+        MsgException.checkNull(store, "店铺数据异常！");
+        MsgException.check("2".equals(store.getStatus()), "店铺已被禁用！");
+
+        QueryWrapper<MerchantBaseInfo> info = new QueryWrapper<MerchantBaseInfo>().
+                eq("merchantCode", store.getMerchantCode());
+        MerchantBaseInfo baseInfo = merchantBaseInfoService.getOne(info);
+        MsgException.checkNull(baseInfo, "商户信息异常！");
+
+        QueryWrapper<MerchantMenber> queryWrapper = new QueryWrapper<MerchantMenber>().eq("storeId", store.getStoreId())
+                .eq("appOpenId", json.getString("appOpenId"));
+        MerchantMenber menber = merchantMenberService.getOne(queryWrapper);
+        MsgException.checkNull(menber, "会员数据异常！");
+
+        MerchantChannelStatus channel = merchantChannelStatusService.getValidData(baseInfo.getMerchantCode());
+        MsgException.checkNull(channel, "未获取到商户进件信息，请先提交商户信息");
+        MsgException.check("7".equals(channel.getStatus()), "实时到账审核中，请耐心等待或者联系客服！");
+        MsgException.check(!channel.isPayment(), "当前进件状态未通过，请耐心等待或联系客服！");
+
+        // 全局电子围栏和单商户电子围栏判定
+        if (!commonSwitchService.allowEcdemicPay() && !store.allowEcdemicPay()) {
+            // 不允许异地支付的时候需要校验ip和商户所在城市
+            try {
+                String ip = json.getString("ip");
+                String province = json.getString("province");
+                checkPayLocation(ip, baseInfo,province);
+            } catch (PayRiskException e) {
+                MsgException.throwException(e.getMessage());
+            }
+        }
+        json.put("store", store);
+        json.put("merchant", baseInfo);
+        json.put("channel", channel);
+        json.put("menber", menber);
+        json.put("alias", baseInfo.getAlias());
+    }
+
+
+    @Override
+    public ModelAndView scanPayAuth(HttpServletRequest request, HttpServletResponse response, String tk) {
+        ModelAndView modelAndView = new ModelAndView("merchant/errorInfo2");
+        if (StringUtil.isEmpty(tk)) {
+            modelAndView.addObject("error", "缺失参数！");
+            return modelAndView;
+        }
+        String APP_ID = ParametersUtil.APPID;
+        String ali_appid = ParametersUtil.ZY_ALI_APP_ID;
+        String domain_wap = ParametersUtil.domain + "/wap";
+        String url = "/merchant/scanPay?tk=" + tk;
+        String ua = request.getHeader("user-agent").toLowerCase();
+        String payType = "";
+        String jump = "";
+        try {
+            if(ua.contains("micromessenger")){
+                payType = "WXZF";
+                jump = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=" + APP_ID
+                        + "&redirect_uri=" + java.net.URLEncoder.encode(domain_wap + url, "utf-8")
+                        + "&response_type=code&scope=snsapi_base&state=123#wechat_redirect";
+            }else if(ua.contains("alipay")){
+                payType = "ZFBZF";
+                String toUrl = domain_wap + url;
+                String rurl = java.net.URLEncoder.encode(toUrl, "utf-8");
+                jump = "https://openauth.alipay.com/oauth2/publicAppAuthorize.htm?app_id=" + ali_appid + "&scope=auth_base&redirect_uri=" + rurl;
+            }else{
+                payType = "UNIONPAY";
+                String toUrl = domain_wap + url;
+                String rurl = java.net.URLEncoder.encode(toUrl, "utf-8");
+                jump = "https://qr.95516.com/qrcGtwWeb-web/api/userAuth?version=1.0.0&redirectUrl=" + rurl;
+            }
+            String cokusName = "cokus_"+payType;
+            Cookie[] cookies = request.getCookies();
+            String cokus = "";
+            if(cookies != null && cookies.length > 0){
+                for (Cookie c:cookies) {
+                    if(cokusName.equals(c.getName())){
+                        String cValue = c.getValue();
+                        if(StringUtil.isNotEmpty(cValue)){
+                            //TODO 解决银联用户标识转码后特殊字符异常
+                            if("UNIONPAY".equals(payType)){
+                                cValue = cValue.replace(" ", "+");
+                            }
+                            byte[] decode = Base64.getDecoder().decode(cValue.getBytes(StandardCharsets.UTF_8));
+                            cokus = new String(decode,0,0,decode.length);
+                            break;
+                        }
+                    }
+                }
+            }
+            if(StringUtil.isNotEmpty(cokus)){
+                url = url+ "&userId="+cokus+"&payType="+payType;
+                response.sendRedirect(domain_wap + url);
+                return null;
+            }else{
+                response.sendRedirect(jump);
+                return null;
+            }
+        }catch (Exception e){
+            return null;
+        }
+    }
+    /**
+     * 扫码订单支付
+     * @date: 2021/12/28 14:10
+     * @param request:
+     * @param tk:
+     * @param code:
+     * @param auth_code:
+     * @param userAuthCode:
+     * @return org.springframework.web.servlet.ModelAndView
+     */
+    @Override
+    public ModelAndView scanPay(HttpServletRequest request,HttpServletResponse response,String tk, String code, String auth_code, String userAuthCode,String cokus,String payType) {
+        ModelAndView view = new ModelAndView("merchant/errorInfo2");
+        if(StringUtil.isEmpty(tk)){
+            view.addObject("error", "缺失参数！");
+            return view;
+        }
+        try {
+            MercOrderToken orderToken = mercOrderTokenService.getByToken(tk);
+            String orderAmt = orderToken.getOrderAmt().toString();
+            String merchantCode = orderToken.getMerchantCode();
+            String merchantName = orderToken.getMerchantName();
+            view.addObject("tk",orderToken.getToken());
+            if(StringUtil.isNotEmpty(cokus)){
+                view.addObject("userId",cokus);
+                view.addObject("payWay",payType);
+            }else{
+                if(StringUtil.isEmpty(code) && StringUtil.isEmpty(auth_code) && StringUtil.isEmpty(userAuthCode)){
+                    view.addObject("error", "请使用支付宝微信或云闪付扫码！");
+                    return view;
+                }
+                if(StringUtil.isNotEmpty(code)){
+                    view.addObject("payWay","WXZF");
+                    WxAccessTokenRequest tokenRequest = WxAccessTokenRequest.buidWxToken(ParametersUtil.APPID,ParametersUtil.APPSECRET,code, WxConstants.OAUTH2_ACCESS_TOKEN_URL);
+                    WxOauth2AccessTokenResponse params = wxCommonService.getOauth2Info(tokenRequest);
+                    view.addObject("userId", params.getOpenid());
+                    view.addObject("unionId", params.getUnionid());
+                }else if(StringUtil.isNotEmpty(auth_code)){
+                    //支付宝取消主动授权 采用静默授权方式，无法获取用户信息
+                    view.addObject("payWay","ZFBZF");
+                    AlipaySystemOauthTokenResponse tokenResponse = AliUtil.getAliUserIdV2(auth_code, ParametersUtil.ZY_PRI, ParametersUtil.ZY_PUB, ParametersUtil.ZY_ALI_APP_ID);
+                    view.addObject("userId", tokenResponse.getUserId());
+                }else{
+                    view.addObject("payWay","UNIONPAY");
+                    try {
+                        String ua = request.getHeader("User-Agent");
+                        int begin = ua.indexOf("UnionPay");
+                        String payMentApp = ua.substring(begin);
+                        if(payMentApp.length() > 30){
+                            payMentApp = payMentApp.substring(0,30);
+                        }
+                        MerchantChannelStatus channel = merchantChannelStatusService.getValidData(merchantCode);
+                        Map<String, Object> unionInfo = new HashMap<>(3);
+                        if(channel.getChannel() == 1){
+                            unionInfo = sxfPayService.getUnionInfo(userAuthCode, payMentApp,null);
+                        }else if(channel.getChannel() == 2){
+                            view.addObject("error", "当前通道已关闭！");
+                            return view;
+                        }else if(channel.getChannel() == 3){
+                            unionInfo = ryxPayService.getUnionInfo(userAuthCode,payMentApp,channel.getMerchantId());
+                        }else if(channel.getChannel() == 4){
+                            unionInfo = ysPayOldService.getUnionInfo(userAuthCode, payMentApp,null);
+                        }else {
+                            view.addObject("error", "未知通道类型");
+                            return view;
+                        }
+                        log.info("===================>【银联】获取用户标识结果参数:{}==============", unionInfo);
+                        if ("1".equals(unionInfo.get("code"))) {
+                            Object userIdData = unionInfo.get("data");
+                            String userId = "";
+                            if(userIdData instanceof Map){
+                                Map<String, String> data = (Map<String, String>) userIdData;
+                                userId = data.get("data");
+                            }else{
+                                userId = userIdData.toString();
+                            }
+                            view.addObject("userId", userId);
+                        }
+                    }catch (Exception e){
+                        e.printStackTrace();
+                        view.addObject("error", "获取银联标识报错");
+                        return view;
+                    }
+                }
+                if(StringUtil.isNotEmpty(view.getModel().get("userId"))){
+                    String cokusName = "cokus_"+view.getModel().get("payWay").toString();
+                    String cokusId = Base64.getEncoder().encodeToString(view.getModel().get("userId").toString().getBytes(StandardCharsets.UTF_8));
+                    Cookie cookie = new Cookie(cokusName,cokusId);
+                    cookie.setMaxAge(-1);
+                    response.addCookie(cookie);
+                }
+            }
+            Date endTime = orderToken.getExpireTime();
+            Date now = new Date();
+            if(endTime.compareTo(now) < 0){
+                view.addObject("error", "当前订单已过期！");
+                return view;
+            }else{
+                long times = endTime.getTime() - now.getTime();
+                long day = times / (24 * 60 * 60 * 1000);
+                long hour = (times / (60 * 60 * 1000) - day * 24);
+                long min = ((times / (60 * 1000)) - day * 24 * 60 - hour * 60);
+                long sec = (times / 1000 - day * 24 * 60 * 60 - hour * 60 * 60 - min * 60);
+                view.addObject("min",min == 0L ? "00" : min < 10 ? "0" + min: min);
+                view.addObject("sec",sec == 0L ? "00" : sec < 10 ? "0" + sec: sec);
+            }
+//            view.addObject("merchantCode",merchantCode);
+            view.addObject("storeName",merchantName);
+            view.addObject("payAmt",orderAmt);
+            view.setViewName("th_device_pay");
+            return view;
+        }catch (Exception e){
+            e.printStackTrace();
+            view.addObject("error", "参数解析异常！");
+            return view;
+        }
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/MerchantStaffConnServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/MerchantStaffConnServiceImpl.java
new file mode 100644
index 0000000..8b83194
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/MerchantStaffConnServiceImpl.java
@@ -0,0 +1,264 @@
+package cn.pluss.platform.merchant.impl;
+
+import cn.jiguang.common.utils.StringUtils;
+import cn.pluss.platform.converter.MerchantStaffConverter;
+import cn.pluss.platform.converter.UserAppConverter;
+import cn.pluss.platform.dto.MerchantStaffDTO;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.MerchantStaffConnMapper;
+import cn.pluss.platform.merchant.MerchantStaffConnService;
+import cn.pluss.platform.merchant.StaffPermissionService;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.userInfo.UserInfoService;
+import cn.pluss.platform.util.MD5Util;
+import cn.pluss.platform.vo.MerchantStaffConnVO;
+import cn.pluss.platform.vo.MerchantStaffVO;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.Setter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 员工商户关联表 服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-03-24
+ */
+@Service
+public class MerchantStaffConnServiceImpl extends ServiceImpl<MerchantStaffConnMapper, MerchantStaffConn> implements MerchantStaffConnService {
+
+    @Setter(onMethod_ = {@Autowired})
+    private UserAppService userAppService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private UserInfoService userInfoService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantBaseInfoService merchantBaseInfoService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private StaffPermissionService staffPermissionService;
+
+    @Override
+    public UserApp createOrEditStaff(MerchantStaffDTO staffDTO) {
+        UserApp userApp = userAppService.queryUserAppByToken();
+
+        staffDTO.setMerchantCode(userApp.getMerchantCode());
+        List<MerchantBaseInfo> merchList = merchantBaseInfoService.getAllByUserId(userApp.getUserId() + "");
+        for (String merchantCode : staffDTO.getMerchantCodeList()) {
+            boolean flag = true;
+            for (MerchantBaseInfo merchantBaseInfo : merchList) {
+                if (merchantBaseInfo.getMerchantCode().equals(merchantCode)) {
+                    flag = false;
+                    break;
+                }
+            }
+
+            if (flag) {
+                throw new MsgException("参数非法");
+            }
+        }
+
+        if (staffDTO.getUserId() == null) {
+            return createStaff(staffDTO);
+        } else {
+            return editStaff(staffDTO);
+        }
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public UserApp createStaff(MerchantStaffDTO staffDTO) {
+        String loginName = staffDTO.getLoginName().replace("@shouyin", "");
+        if (loginName.contains("@")) {
+            throw new MsgException("员工账号请不要带@");
+        }
+        staffDTO.setLoginName(loginName + "@shouyin");
+        UserInfo existUserInfo = new UserInfo().setLoginName(staffDTO.getLoginName());
+        existUserInfo = userInfoService.getOne(new QueryWrapper<>(existUserInfo));
+        if (existUserInfo != null) {
+            throw new MsgException("账号已存在");
+        }
+
+        if (staffDTO.getMerchantCodeList() == null || staffDTO.getMerchantCodeList().isEmpty()) {
+            throw new MsgException("请选择关联店铺");
+        }
+
+        MerchantStaffConverter merchantStaffConverter = MerchantStaffConverter.INSTANCE;
+        UserAppConverter userAppConverter = UserAppConverter.INSTANCE;
+
+        UserInfo userInfo = merchantStaffConverter.toUserInfo(staffDTO);
+        userInfo.setStatus(1);
+        String pwd = MD5Util.MD5Encode(userInfo.getPassword(), "utf-8");
+        userInfo.setPassword(pwd);
+        Date date = new Date();
+        userInfo.setCreateTime(date);
+        userInfo.setUpdateTime(date);
+
+        userInfoService.save(userInfo);
+
+        UserApp userApp = userAppConverter.toUserApp(userInfo);
+        userApp.setUserType("staff");
+        userApp.setUserName(staffDTO.getUserName());
+        userApp.setStaffType(1);
+        userAppService.save(userApp);
+
+        for (String merchantCode : staffDTO.getMerchantCodeList()) {
+            bindStaff(userApp.getUserId(), merchantCode);
+            StaffPermission staffPermission = staffPermissionService.getEntity(userApp.getUserId(), merchantCode);
+            staffPermission.setPermissionBill(staffDTO.getPermissionBill());
+            staffPermissionService.save(staffPermission);
+        }
+
+        return userApp;
+    }
+
+    @Override
+    public UserApp editStaff(MerchantStaffDTO staffDTO) {
+        if (staffDTO.getUserId() == null) {
+            throw new MsgException("用户id不能为空");
+        }
+
+        MerchantStaffConverter merchantStaffConverter = MerchantStaffConverter.INSTANCE;
+        UserAppConverter userAppConverter = UserAppConverter.INSTANCE;
+
+        UserInfo userInfo = merchantStaffConverter.toUserInfo(staffDTO);
+        if (StringUtils.isNotEmpty(staffDTO.getPassword())) {
+            String pwd = MD5Util.MD5Encode(userInfo.getPassword(), "utf-8");
+            userInfo.setPassword(pwd);
+            Date date = new Date();
+            userInfo.setUpdateTime(date);
+
+            UpdateWrapper<UserInfo> uW = new UpdateWrapper<>();
+            uW.eq("id", staffDTO.getUserId());
+            userInfoService.update(userInfo, uW);
+        } else {
+            Date date = new Date();
+            userInfo.setUpdateTime(date);
+
+            UpdateWrapper<UserInfo> uW = new UpdateWrapper<>();
+            uW.eq("id", staffDTO.getUserId());
+            userInfoService.update(userInfo, uW);
+        }
+
+        UserApp userApp = userAppConverter.toUserApp(userInfo);
+        userApp.setUserName(staffDTO.getUserName());
+        UpdateWrapper<UserApp> uW2 = new UpdateWrapper<>();
+        uW2.eq("userId", staffDTO.getUserId());
+        userAppService.update(userApp, uW2);
+
+        delAllStaff(userApp.getUserId());
+        for (String merchantCode : staffDTO.getMerchantCodeList()) {
+            bindStaff(userApp.getUserId(), merchantCode);
+
+            // 编辑员工的时候只能修改当前门店下的员工权限
+            if (!staffDTO.getMerchantCode().equals(merchantCode)) {
+                continue;
+            }
+
+            StaffPermission staffPermission = staffPermissionService.getEntity(userApp.getUserId(), merchantCode);
+            staffPermission.setPermissionBill(staffDTO.getPermissionBill());
+            staffPermissionService.saveOrUpdate(staffPermission);
+        }
+
+        return userApp;
+    }
+
+    @Override
+    public void bindStaff(Long userId, String merchantCode) {
+        MerchantStaffConn merchantStaffConn = new MerchantStaffConn();
+        merchantStaffConn.setUserId(userId);
+        merchantStaffConn.setMerchantCode(merchantCode);
+        save(merchantStaffConn);
+    }
+
+    @Override
+    public void delAllStaff(Long userId) {
+        MerchantStaffConn staffConn = new MerchantStaffConn();
+        staffConn.setUserId(userId);
+        
+        QueryWrapper<MerchantStaffConn> qW = new QueryWrapper<>(staffConn);
+        remove(qW);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delStaff(Long userId, List<String> merchantCodeList) {
+
+        for (String merchantCode : merchantCodeList) {
+            MerchantStaffConn staffConn = new MerchantStaffConn();
+            staffConn.setMerchantCode(merchantCode);
+            staffConn.setUserId(userId);
+            remove(new QueryWrapper<>(staffConn));
+
+            staffPermissionService.remove(userId, merchantCode);
+        }
+
+        MerchantStaffConn staffConn = new MerchantStaffConn().setUserId(userId);
+        List<MerchantStaffConn> resultList = list(new QueryWrapper<>(staffConn));
+        if (resultList.size() > 0) {
+            return;
+        }
+
+
+
+        // 如果已解绑的所有的店铺，那么就删除所选账号
+        userInfoService.removeById(userId);
+        QueryWrapper<UserApp> qW = new QueryWrapper<>();
+        qW.eq("userId", userId);
+        userAppService.remove(qW);
+    }
+
+    @Override
+    public MerchantStaffVO getOneForApp(String userId) {
+        UserApp staffUa = userAppService.getOne(new QueryWrapper<>(new UserApp().setUserId(Long.parseLong(userId))));
+        UserApp userApp = userAppService.queryUserAppByToken();
+
+        MerchantStaffConn staffConn = new MerchantStaffConn();
+        staffConn.setUserId(staffUa.getUserId());
+        staffConn.setMerchantCode(userApp.getMerchantCode());
+        staffConn = getOne(new QueryWrapper<>(staffConn));
+
+        StaffPermission staffPermission = staffPermissionService.getEntity(Long.parseLong(userId), userApp.getMerchantCode());
+        String permissionBill = staffPermission.getPermissionBill();
+        staffUa.setPermissionBill(permissionBill == null? "1" : permissionBill);
+
+//        if (staffConn == null) {
+//            throw new MsgException("拒绝访问");
+//        }
+        
+        MerchantStaffVO merchantStaffVO = new MerchantStaffVO();
+        merchantStaffVO.setUserApp(staffUa);
+
+        List<MerchantStaffConnVO> connList = baseMapper.selectByUserId(userId);
+        merchantStaffVO.setConnList(connList);
+
+        return merchantStaffVO;
+    }
+
+    @Override
+    public List<MerchantStaffConnVO> getListByUserId(String userId) {
+        return baseMapper.selectByUserId(userId);
+    }
+
+    @Override
+    public List<MerchantBaseInfo> getMercInfoByStaffId(String userAppId) {
+        return baseMapper.getMercInfoByStaffId(userAppId);
+    }
+
+    @Override
+    public MerchantStaffConn getStaffConnInfoByCodeAndId(String userId, String merchantCode) {
+        List<MerchantStaffConn> list = baseMapper.selectList(new QueryWrapper<MerchantStaffConn>(new MerchantStaffConn().setMerchantCode(merchantCode).setUserId(Long.parseLong(userId))));
+        return list.isEmpty() ? null : list.get(0);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/StaffPermissionServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/StaffPermissionServiceImpl.java
new file mode 100644
index 0000000..f0c8657
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/StaffPermissionServiceImpl.java
@@ -0,0 +1,20 @@
+package cn.pluss.platform.merchant.impl;
+
+import cn.pluss.platform.entity.StaffPermission;
+import cn.pluss.platform.mapper.StaffPermissionMapper;
+import cn.pluss.platform.merchant.StaffPermissionService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 员工权限表 服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-06-11
+ */
+@Service
+public class StaffPermissionServiceImpl extends ServiceImpl<StaffPermissionMapper, StaffPermission> implements StaffPermissionService {
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/account/AccountServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/account/AccountServiceImpl.java
new file mode 100644
index 0000000..ec44c26
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/account/AccountServiceImpl.java
@@ -0,0 +1,1342 @@
+package cn.pluss.platform.merchant.impl.account;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.DesensitizedUtil;
+import cn.pluss.platform.BankCardService;
+import cn.pluss.platform.IdCardService;
+import cn.pluss.platform.channel.MerchantAuditService;
+import cn.pluss.platform.common.AliyunService;
+import cn.pluss.platform.constants.CommonError;
+import cn.pluss.platform.converter.BankCardConverter;
+import cn.pluss.platform.converter.Converter;
+import cn.pluss.platform.dto.AccountDTO;
+import cn.pluss.platform.dto.BankCardDTO;
+import cn.pluss.platform.dto.BankInfoDTO;
+import cn.pluss.platform.dto.CertificationDTO;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.AccountMapper;
+import cn.pluss.platform.mapper.BankCodeSxfMapper;
+import cn.pluss.platform.mapper.RiskBlacklistMapper;
+import cn.pluss.platform.merchant.AccountService;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.merchantImage.MerchantImageService;
+import cn.pluss.platform.notice.NoticeService;
+import cn.pluss.platform.task.RyxMerAuditHandler;
+import cn.pluss.platform.task.SxfMerAuditHandler;
+import cn.pluss.platform.user.impl.GeneralPushUtil;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.util.StringUtil;
+import cn.pluss.platform.vo.*;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.Setter;
+import lombok.val;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.context.annotation.Primary;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.TransactionStatus;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionCallbackWithoutResult;
+import org.springframework.transaction.support.TransactionTemplate;
+
+import javax.annotation.Resource;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.*;
+
+/**
+ * @author Djh
+ */
+@Service("accountService")
+@Primary
+public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> implements AccountService {
+
+    private static final int MAX_MIRCO_MERCHANT_NUM = 3;
+
+    @Lazy
+    @Autowired
+    private UserAppService uaService;
+
+    @Resource
+    private BankCodeSxfMapper bankCodeSxfMapper;
+
+    @Lazy
+    @Autowired
+    private IdCardService idCardService;
+
+    @Lazy
+    @Autowired
+    private MerchantBaseInfoService mbiService;
+
+    @Lazy
+    @Autowired
+    private MerchantImageService merchantImageService;
+
+    @Lazy
+    @Autowired
+    private MerchantChannelStatusService mcsService;
+
+    @Autowired
+    private BankCardService bankCardService;
+
+    @Autowired
+    private MerchantImageService imgService;
+
+    @Autowired
+    private NoticeService noticeService;
+
+    @Autowired
+    private AliyunService aliyunService;
+
+    @Resource
+    private RiskBlacklistMapper riskBlacklistMapper;
+
+    @Setter(onMethod_ = {@Autowired, @Qualifier("sxfMerchantAuditService")})
+    private MerchantAuditService sxfMerchantAuditService;
+
+    @Setter(onMethod_ = {@Autowired, @Qualifier("leshuaMerchantAuditService")})
+    private MerchantAuditService leshuaMerchantAuditService;
+
+    @Setter(onMethod_ = {@Autowired, @Qualifier("ryxMerchantAuditService")})
+    private MerchantAuditService ryxMerchantAuditService;
+
+    @Setter(onMethod_ = {@Autowired, @Qualifier("ysAuditServiceV2")})
+    private MerchantAuditService ysAuditServiceV2;
+
+    @Autowired @Lazy
+    private RyxMerAuditHandler ryxMerAuditHandler;
+
+    @Autowired
+    private GeneralPushUtil generalPushUtil;
+
+    @Autowired
+    private TransactionTemplate transactionTemplate;
+
+    @Autowired
+    @Lazy
+    private SxfMerAuditHandler sxfMerAuditHandler;
+
+    @Override
+    public void editSuccess(MerchantChannelStatus mcs, String accountType) {
+        transactionTemplate.execute(new TransactionCallbackWithoutResult() {
+            @Override
+            protected void doInTransactionWithoutResult(TransactionStatus status) {
+                MerchantBaseInfo mbi = mbiService.getMerchantBaseInfoByMerchantCode(mcs.getMerchantCode());
+                Account account = getRealAccount(mbi.getUserId(), accountType);
+
+                JSONObject bak = account.getBak();
+                BankCard newBankCard = JSONObject.toJavaObject(bak, BankCard.class);
+                newBankCard.setAccountType(BankCard.ACCOUNT_TYPE_PRIVATE);
+                account.setBak(null);
+                int count = count(new QueryWrapper<Account>().eq("bankCardId", account.getBankCardId()));
+                if (count == 1) {
+                    newBankCard.setId(Integer.parseInt(account.getBankCardId()));
+                    bankCardService.updateById(newBankCard);
+                } else {
+                    bankCardService.save(newBankCard);
+                    account.setBankCardId(newBankCard.getId() + "");
+                }
+                updateById(account);
+                mcs.setStatus(MerchantChannelStatus.AUDIT_STATUS_SUCCESS);
+                mcsService.updateById(mcs);
+
+                String settleName = accountType.equals(Account.CHANNEL_TYPE_D1)? "次日到账": "实时到账";
+                noticeService.sendEditApplySuccessNotice(mbi.getUserId() + "", mbi.getAlias(), settleName);
+//                sxfMerAuditHandler.sendNotice(mbi.getUserId(), "结算账户修改通知", "结算账户修改成功", uniqueKey);
+            }
+        });
+    }
+
+    @Override
+    public void editFail(MerchantChannelStatus mcs, String uniqueKey, String failReason, String accountType) {
+        transactionTemplate.execute(new TransactionCallbackWithoutResult() {
+            @Override
+            protected void doInTransactionWithoutResult(TransactionStatus status) {
+                MerchantBaseInfo mbi = mbiService.getMerchantBaseInfoByMerchantCode(mcs.getMerchantCode());
+                // 结算银行卡变更失败
+                Account account = new Account().setUserId(mbi.getUserId()).setChannelType(accountType);
+                account = getOne(new QueryWrapper<>(account));
+                account.setBak(null);
+                updateById(account);
+
+                Notice notice = new Notice();
+                notice.setUserId(mbi.getUserId());
+                notice.setNoticeCode(UUID.randomUUID().toString().replace("-", ""));
+                notice.setConrtent("D0-结算卡修改失败");
+                noticeService.saveMerBankChangeNotice(notice);
+
+                mcs.setStatus(MerchantChannelStatus.AUDIT_STATUS_SUCCESS);
+                mcsService.updateById(mcs);
+
+                sxfMerAuditHandler.sendNotice(mbi.getUserId(), "结算账户修改通知", "结算账户修改失败: " + failReason, uniqueKey);
+            }
+        });
+    }
+
+    @Override
+    public Page<AccountVO> page(Page<Account> page, Account account, OrderItem orderItem) {
+        if (orderItem == null) {
+            orderItem = OrderItem.desc("createTime");
+        }
+
+        page.getOrders().clear();
+        page.getOrders().add(orderItem);
+
+        page = page(page, new QueryWrapper<>(account));
+
+        Page<AccountVO> result = new Page<>();
+
+        result.setTotal(page.getTotal());
+        result.setSize(page.getSize());
+        result.setPages(page.getPages());
+        result.setCurrent(page.getCurrent());
+
+        for (Account record : page.getRecords()) {
+            // List<>
+        }
+
+        return result;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void saveOrUpdate(AccountDTO accountDTO) {
+        accountDTO.paramCheck();
+
+        bankCardService.checkBankInfo(accountDTO.getBankCard());
+
+        IdCard accIdCard = accountDTO.getIdcard();
+        if (accountDTO.getIdcard() != null) {
+            // 没有身份证信息说明是法人进件
+            accIdCard = idCardService.getLegalIdCard(accountDTO.getUserId());
+        }
+
+        // 原则上这里不需要再做空判断
+        if (accIdCard != null) {
+            RiskBlacklist riskBlacklist = new RiskBlacklist();
+            riskBlacklist.setIdcardNo(accIdCard.getCertNo());
+            Integer count = riskBlacklistMapper.selectCount(Wrappers.query(riskBlacklist));
+            if (count > 0) {
+                throw new MsgException("当前结算人已在风控黑名单中，请更换结算信息");
+            }
+        }
+
+        // 判断是否已经进件
+        UserApp userApp = new UserApp().setUserId(Long.parseLong(accountDTO.getUserId()));
+        userApp = uaService.queryUserApp(userApp);
+
+        MerchantChannelStatus merchantChannelStatus = new MerchantChannelStatus();
+        merchantChannelStatus.setMerchantCode(userApp.getMerchantCode());
+        QueryWrapper<MerchantChannelStatus> qWrapper = new QueryWrapper<>(merchantChannelStatus).orderByAsc("createTime").last("limit 1");
+        qWrapper.in("virChannelFlag", merchantChannelStatus.getVirChannelFlag(), "1");
+        merchantChannelStatus = mcsService.getOne(qWrapper);
+
+        if (merchantChannelStatus == null) {
+            saveV4(accountDTO);
+            return;
+        }
+
+        // 进件通过/进件审核/商户信息变更时，不允许再用此接口变更结算信息
+        if (MerchantChannelStatus.isAudited(merchantChannelStatus)) {
+            throw new MsgException("当前商户状态不允许提交结算信息");
+        } else {
+            saveV4(accountDTO);
+        }
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void saveV4(AccountDTO accountDTO, boolean checkFlag) {
+        MerchantBaseInfo mbi = mbiService.getMerchantBaseInfoByUserId(accountDTO.getUserId());
+        if (StringUtils.isEmpty(accountDTO.getChannelType())) {
+            MerchantChannelStatus mcsD1 = mcsService.getByMerchantCodeAndChannelType(mbi.getMerchantCode(), Account.CHANNEL_TYPE_D1);
+            mcsD1 = Optional.ofNullable(mcsD1).orElse(new MerchantChannelStatus());
+            if (Objects.equals(mcsD1.getStatus(), MerchantChannelStatus.AUDIT_STATUS_SUCCESS)
+                || Objects.equals(mcsD1.getStatus(), MerchantChannelStatus.AUDIT_STATUS_EXAMINING)
+                || Objects.equals(mcsD1.getStatus(), MerchantChannelStatus.AUDIT_STATUS_DATA_EDIT)) {
+                accountDTO.setChannelType(Account.CHANNEL_TYPE_D0);
+            } else {
+                accountDTO.setChannelType(Account.CHANNEL_TYPE_D1);
+            }
+        }
+
+        if (checkFlag) {
+            MerchantChannelStatus mcs = mcsService.getByMerchantCodeAndChannelType(mbi.getMerchantCode(), accountDTO.getSettleType());
+            mcs = Optional.ofNullable(mcs).orElse(new MerchantChannelStatus());
+            if (Objects.equals(mcs.getStatus(), MerchantChannelStatus.AUDIT_STATUS_SUCCESS)
+                    || Objects.equals(mcs.getStatus(), MerchantChannelStatus.AUDIT_STATUS_EXAMINING)
+                    || Objects.equals(mcs.getStatus(), MerchantChannelStatus.AUDIT_STATUS_DATA_EDIT)) {
+                throw new MsgException("当前状态不允许修改结算卡信息");
+            }
+        }
+
+        List<String> channelTypeList = new ArrayList<>();
+        channelTypeList.add(Account.CHANNEL_TYPE_D0);
+        channelTypeList.add(Account.CHANNEL_TYPE_D1);
+
+        if (!channelTypeList.contains(accountDTO.getChannelType())) {
+            throw new MsgException("通道类型错误");
+        }
+
+        if (Account.SETTLE_TYPE_PRIVATE_ILLEGAL.equals(accountDTO.getSettleType())) {
+            MsgException.checkNull(accountDTO.getIdcard(), CommonError.NO_ACC_ID_CARD_INFO);
+        } else {
+            // 小微，如果未传身份证信息，则获取对私身份信息
+            if (accountDTO.getIdcard() == null && Account.SETTLE_TYPE_MICRO_STORE.equals(accountDTO.getSettleType())) {
+                Account account = new Account();
+                account.setChannelType(accountDTO.getChannelType()).setUserId(accountDTO.getUserId());
+                account = getOne(new QueryWrapper<>(account));
+
+                if (account != null) {
+                    IdCard accIdCard = idCardService.getById(account.getIdCardId());
+                    MsgException.checkNull(accIdCard, "缺少结算人身份信息");
+                    accountDTO.setIdcard(accIdCard);
+                } else {
+                    LambdaQueryWrapper<IdCard> idCardQueryWrapper = Wrappers.lambdaQuery();
+                    idCardQueryWrapper.eq(IdCard::getUserId, accountDTO.getUserId())
+                            .eq(IdCard::getUserType, IdCard.TYPE_ACCOUNT);
+                    IdCard accIdCard = idCardService.getOne(idCardQueryWrapper);
+                    MsgException.checkNull(accIdCard, "缺少结算人身份信息");
+                    accountDTO.setIdcard(accIdCard);
+                }
+            }
+        }
+
+        accountDTO.paramCheck();
+
+        bankCardService.checkBankInfo(accountDTO.getBankCard());
+
+        IdCard accIdCard = Optional.ofNullable(accountDTO.getIdcard()).orElseGet(() -> {
+            // 没有身份证信息说明是法人进件
+            return idCardService.getLegalIdCard(accountDTO.getUserId());
+        });
+
+        // 原则上这里不需要再做空判断
+        if (accIdCard != null) {
+            RiskBlacklist riskBlacklist = new RiskBlacklist();
+            riskBlacklist.setIdcardNo(accIdCard.getCertNo());
+            Integer count = riskBlacklistMapper.selectCount(Wrappers.query(riskBlacklist));
+            if (count > 0) {
+                throw new MsgException("当前结算人已在风控黑名单中，请更换结算信息");
+            }
+        }
+
+        delAccount(accountDTO.getUserId(), accountDTO.getChannelType());
+
+        Account account = Converter.INSTANCE.toEntity(accountDTO);
+
+        if (Account.SETTLE_TYPE_CORPORATE.equals(accountDTO.getSettleType())) {
+            IdCard legalIdCard = idCardService.getLegalIdCard(account.getUserId());
+            MsgException.checkNull(legalIdCard, CommonError.NO_LEGAL_ID_CARD_INFO);
+            accountDTO.setIdcard(legalIdCard);
+            account.setIdCardId(legalIdCard.getId() + "");
+            accountDTO.getBankCard().setBankHolder(mbi.getBussAuthName());
+        } else if (accountDTO.getSettleType().startsWith(Account.SETTLE_TYPE_PRIVATE_LEGAL)) {
+            IdCard legalIdCard = idCardService.getLegalIdCard(account.getUserId());
+            if (legalIdCard == null) {
+                throw new MsgException(CommonError.NO_LEGAL_ID_CARD_INFO);
+            }
+
+            if (accIdCard == null) {
+                accIdCard = legalIdCard;
+                idCardService.save(accIdCard);
+            } else {
+                accIdCard.setId(legalIdCard.getId());
+                idCardService.updateById(accIdCard);
+            }
+            account.setIdCardId(accIdCard.getId() + "");
+            accountDTO.setIdcard(accIdCard);
+            accountDTO.getBankCard().setBankHolder(accIdCard.getCertName());
+        } else {
+            idCardService.save(accountDTO.getIdcard());
+            accountDTO.getBankCard().setBankHolder(accountDTO.getIdcard().getCertName());
+            account.setIdCardId(accountDTO.getIdcard().getId() + "");
+        }
+
+        IdCard certIdCard = idCardService.getCertIdCard(accountDTO.getUserId());
+
+        if (mbi.getMerchantType().equals(MerchantBaseInfo.MERCH_TYPE_MICRO)) {
+            // 小微需要结算人与实名人是同一个人
+            IdCard idcard = accountDTO.getIdcard();
+            if (idcard != null) {
+                if (!idcard.getCertNo().equals(certIdCard.getCertNo())) {
+                    throw new MsgException("小微商户结算人必须是自己");
+                }
+            }
+        }
+
+        boolean settleTypeFlag = Account.SETTLE_TYPE_CORPORATE.equals(accountDTO.getSettleType());
+
+        if (checkFlag && !(settleTypeFlag)) {
+            // 执行银行卡四要素校验
+            aliyunService.checkBankCorrect(accountDTO.getBankCard().getPhone(), accountDTO.getBankCard().getBankCardNo()
+                    , accountDTO.getIdcard().getCertNo()
+                    , accountDTO.getBankCard().getBankHolder(), "结算人与结算银行卡不匹配，请核对结算信息");
+        }
+
+        bankCardService.save(accountDTO.getBankCard());
+        account.setBankCardId(accountDTO.getBankCard().getId() + "");
+        save(account);
+
+        if (!accountDTO.getChannelType().equals(Account.CHANNEL_TYPE_D1)) {
+            return;
+        }
+
+        // 如果不存在D0的结算信息，则直接将D1的结算信息带过来
+        LambdaQueryWrapper<Account> qWrapperAccountD1 = Wrappers.lambdaQuery();
+        qWrapperAccountD1.eq(Account::getUserId, accountDTO.getUserId()).eq(Account::getChannelType, Account.CHANNEL_TYPE_D0);
+        int count = baseMapper.selectCount(qWrapperAccountD1);
+        if (count == 0) {
+            account.setChannelType(Account.CHANNEL_TYPE_D0);
+            save(account);
+        }
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void realNameAudit(CertificationDTO certificationDTO) {
+        UserApp tokenUa = uaService.queryUserAppByToken();
+        if ("agent".equals(tokenUa.getUserType()) && "ZY_BST".equals(tokenUa.getRoleCode())) {
+            IdCard condition = new IdCard().setCertNo(certificationDTO.getCertnum());
+            List<IdCard> idCardList = idCardService.list(new QueryWrapper<>(condition).select(" DISTINCT userId"));
+            for (IdCard idCard : idCardList) {
+                UserApp userApp = uaService.getUserAppByUserId(idCard.getUserId());
+                userApp.setSpreadFlag("0");
+                uaService.updateById(userApp);
+            }
+        }
+
+        // 查询当前用户是否存在
+        UserApp userApp = new UserApp();
+        userApp.setUserId(Long.valueOf(certificationDTO.getUserId()));
+        List<UserApp> queryUserAppList = uaService.queryUserAppList(userApp);
+        if (queryUserAppList == null || queryUserAppList.isEmpty()) {
+            throw new MsgException("查无此人！");
+        } else {
+            userApp = queryUserAppList.get(0);
+            // 暂不修改用户名称，完成银行卡实名认证之后，再将姓名填充进去
+        }
+
+        certificationDTO.paramCheck();
+        // 保存userApp数据
+        if (StringUtils.isEmpty(userApp.getMerchantCode())) {
+            String merchantCode = "M800" + DateUtil.format(new Date(), "yyyyMMdd") + StringUtil.random6V2();
+            userApp.setMerchantCode(merchantCode);
+            uaService.updateById(userApp);
+        }
+
+        if (Objects.equals(userApp.getStatus(), 1) || Objects.equals(userApp.getStatus(), 3)) {
+            throw new MsgException("当前状态不允许修改实名认证信息");
+        }
+
+        // 保存身份证信息
+        IdCard idCard = new IdCard();
+        idCard.setUserId(certificationDTO.getUserId());
+        idCard.setCertType("00");
+        idCard.setUserType(IdCard.TYPE_CERT);
+        IdCard existIdCard = idCardService.getOne(new QueryWrapper<>(idCard));
+        if (existIdCard != null) {
+            idCard.setId(existIdCard.getId());
+        }
+
+        idCard.setCertName(certificationDTO.getRealName());
+        idCard.setCertNo(certificationDTO.getCertnum());
+        idCard.setCertStartTime(certificationDTO.getCertStartTime());
+        idCard.setCertEndTime(certificationDTO.getCertPeriod());
+        idCard.setCertType("00");
+        idCard.setUserType(IdCard.TYPE_CERT);
+        idCard.setUserId(certificationDTO.getUserId());
+        idCard.setImgPositive(certificationDTO.getCertFullPhoto());
+        idCard.setImgNegative(certificationDTO.getCertBacKPhoto());
+        idCardService.saveOrUpdate(idCard);
+
+        userApp.setStatus(1);
+        uaService.updateById(userApp);
+    }
+
+    @Override
+    public IdCardVO idCardDetail(String userId) {
+        IdCard legalIdCard = idCardService.getCertIdCard(userId);
+
+        IdCardVO idCardVO = new IdCardVO();
+        idCardVO.setCertBacKPhoto(legalIdCard.getImgNegative());
+        idCardVO.setCertFullPhoto(legalIdCard.getImgPositive());
+        idCardVO.setCertnum(legalIdCard.getCertNo());
+        idCardVO.setCertStartTime(legalIdCard.getCertStartTime());
+        idCardVO.setCertPeriod(legalIdCard.getCertEndTime());
+        idCardVO.setRealName(legalIdCard.getCertName());
+        return idCardVO;
+    }
+
+    @Override
+    public void checkCert(String certNo, String checkMsg) {
+        Integer num = 0;
+        try {
+            num = baseMapper.selectMicroMbiAccountNum(certNo);
+        } catch (Exception e) {
+            log.error(e.toString());
+        }
+
+        if (num >= MAX_MIRCO_MERCHANT_NUM) {
+            throw new MsgException(checkMsg);
+        }
+    }
+
+    @Override
+    public StoreSummaryVO getReckoner(String userId, String merchantType) {
+        StoreSummaryVO storeSummaryVO = new StoreSummaryVO();
+        // 获取店铺基本信息
+        MerchantBaseInfo mbi = getMerchantBaseInfo(userId);
+
+        // 是否存在同商户类型的数据
+        boolean hasSameMerType = mbi != null && merchantType.equals(mbi.getMerchantType());
+
+        boolean hasRejectData = "-1".equals(merchantType) && mbi != null;
+        if (hasSameMerType || hasRejectData) {
+            inputExistData(storeSummaryVO, mbi);
+        }
+
+        inputMerchantStatus(storeSummaryVO, mbi);
+
+        return storeSummaryVO;
+    }
+
+    @Override
+    public StoreSummaryVO getReckonerV2(String userId, String merchantType) {
+        // 获取店铺基本信息
+        StoreSummaryVO storeSummaryVO = new StoreSummaryVO();
+        // 获取店铺基本信息
+        MerchantBaseInfo mbi = getMerchantBaseInfo(userId);
+
+        // 是否存在同商户类型的数据
+        boolean hasSameMerType = mbi != null && merchantType.equals(mbi.getMerchantType());
+
+        boolean hasRejectData = "-1".equals(merchantType) && mbi != null;
+        if (hasSameMerType || hasRejectData) {
+            storeSummaryVO.setMerchantBaseInfo(mbi);
+            if (!"1".equals(mbi.getMerchantType())) {
+                IdCard legalIdCard = idCardService.getLegalIdCard(userId);
+                if (legalIdCard != null) {
+                    storeSummaryVO.setLegalPersonInfo(legalIdCard);
+                }
+
+                BusinessLicenseVO businessLicense = getBusinessLicense(mbi);
+                storeSummaryVO.setBusinessLicense(businessLicense);
+            }
+
+            MerchantImage merchantImage = new MerchantImage(mbi.getMerchantCode(), MerchantImage.ImageType.CASH_DESK_WITH_PERSON);
+            merchantImage = merchantImageService.getOne(new QueryWrapper<>(merchantImage));
+            storeSummaryVO.setCertInfoStatus(merchantImage == null ? StoreSummaryVO.NO_DATA : StoreSummaryVO.HAS_DATA);
+
+            AccountDTO d1 = getRealAccount(userId, Account.CHANNEL_TYPE_D1);
+            storeSummaryVO.setD1(d1);
+            AccountDTO d0 = getRealAccount(userId, Account.CHANNEL_TYPE_D0);
+            storeSummaryVO.setD0(d0);
+            
+            MerchantChannelStatus mcsCurrent = mcsService.getValidData(mbi.getMerchantCode());
+            if (mcsCurrent == null || mcsCurrent.getVirChannelFlag().equals(Account.CHANNEL_TYPE_D1)) {
+                if (d1 != null) {
+                    storeSummaryVO.setSettleType(d1.getSettleType());
+                }
+            } else {
+                if (d0 != null) {
+                    storeSummaryVO.setSettleType(d0.getSettleType());
+                }
+            }
+        }
+
+        inputMerchantStatus(storeSummaryVO, mbi);
+
+        return storeSummaryVO;
+    }
+
+    private void inputMerchantStatus(StoreSummaryVO storeSummaryVO, MerchantBaseInfo mbi) {
+        if (mbi == null) {
+            return;
+        }
+
+        MerchantChannelStatus mcs = mcsService.getValidData(mbi.getMerchantCode());
+
+        if (mcs != null && MerchantChannelStatus.AUDIT_STATUS_WAITING_SIGN.equals(mcs.getStatus())) {
+            switch (mcs.getChannel()) {
+                case 1:
+                    break;
+                case 3:
+                    // 拼接成真正的orderId
+                    String applicationId = mcs.getApplicationId();
+                    String orderId = applicationId.substring(0, 8) + "-" +
+                            applicationId.substring(8, 12) + "-" +
+                            applicationId.substring(12, 16) + "-" +
+                            applicationId.substring(16, 20) + "-" +
+                            applicationId.substring(20);
+
+                    Map<String, Object> param = new HashMap<>();
+                    param.put("orderId", orderId);
+                    try {
+                        JSONObject jsonObject = ryxMerchantAuditService.merchantAuditResult(param);
+                        ryxMerAuditHandler.auditCallback(jsonObject);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+
+                    break;
+                case 4:
+                    try {
+                        JSONObject params = new JSONObject();
+                        if (mcs.getApplicationId() == null) {
+                            break;
+                        }
+                        params.put("sysFlowId", mcs.getApplicationId());
+                        ysAuditServiceV2.merchantAuditResult(params);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+
+                    break;
+                default:
+                    break;
+            }
+
+            mcs = mcsService.getValidData(mbi.getMerchantCode());
+        }
+
+        String merchantAuditStatus;
+        if (mcs == null) {
+            merchantAuditStatus = "0";
+            storeSummaryVO.setMerchantAuditStatus(merchantAuditStatus);
+            return;
+        }
+
+        merchantAuditStatus = mcs.getAppStatus();
+        storeSummaryVO.setMerchantAuditStatus(merchantAuditStatus);
+        String auditReason = mcs.getRemark();
+        storeSummaryVO.setAuditReason(auditReason);
+
+        if (MerchantChannelStatus.AUDIT_STATUS_WAITING_SIGN.equals(mcs.getStatus())) {
+            storeSummaryVO.setSignStatus("0");
+            String signUrl = getSignUrl(mbi, mcs);
+            storeSummaryVO.setSignUrl(signUrl);
+            storeSummaryVO.setAuditReason("签约状态会在签约完成后5分钟内刷新");
+        } else if (MerchantChannelStatus.AUDIT_STATUS_SIGNED.equals(mcs.getStatus())) {
+            storeSummaryVO.setSignStatus("1");
+        } else {
+            storeSummaryVO.setSignStatus("-1");
+        }
+
+        if (MerchantChannelStatus.AUDIT_STATUS_EXAMINING.equals(mcs.getStatus()) && "5".equals(mcs.getThirdStatus())) {
+            storeSummaryVO.setSignStatus("0");
+            String signUrl = getSignUrl(mbi, mcs);
+            storeSummaryVO.setSignUrl(signUrl);
+            storeSummaryVO.setAuditReason("签约状态会在签约完成后5分钟内刷新");
+        }
+
+        storeSummaryVO.setMerchantAuditStatus(merchantAuditStatus);
+    }
+
+    private String getSignUrl(MerchantBaseInfo mbi, MerchantChannelStatus mcs) {
+        String merName;
+
+        if (mcs.getChannel() == 3) {
+            if ("1".equals(mbi.getMerchantType())) {
+                AccountDTO account = getRealAccount(mbi.getUserId());
+                merName = "商户" + account.getIdcard().getCertName();
+            } else {
+                merName = mbi.getBussAuthName();
+            }
+
+            try {
+                merName = URLEncoder.encode(merName, "UTF-8");
+            } catch (UnsupportedEncodingException ignored) {
+                // ignored
+            }
+
+            String urlTemplate = "https://rjp.ruiyinxin.com/mims2/ruijiaSign/index.html?merInId=%s&merName=%s";
+
+            return String.format(urlTemplate, mcs.getExtra().getString("merInId"), merName);
+        }
+
+        if (mcs.getChannel() == 4) {
+            return mcs.getExtra().getString("signUrl");
+        }
+
+        return null;
+    }
+
+    /**
+     * 获取现有结算数据
+     *
+     * @param storeSummaryVO 结果实体类
+     * @param existData      商户信息
+     */
+    private void inputExistData(StoreSummaryVO storeSummaryVO, MerchantBaseInfo existData) {
+
+        storeSummaryVO.setMerchantBaseInfo(existData);
+        storeSummaryVO.setMerchantBaseInfoStatus(StoreSummaryVO.HAS_DATA);
+
+        if ("1".equals(existData.getMerchantType())) {
+            inputMicroExistData(storeSummaryVO, existData);
+        } else {
+            inputMerchantExistData(storeSummaryVO, existData);
+        }
+
+        MerchantImage merchantImage = new MerchantImage(existData.getMerchantCode(), MerchantImage.ImageType.CASH_DESK_WITH_PERSON);
+        merchantImage = merchantImageService.getOne(new QueryWrapper<>(merchantImage));
+        storeSummaryVO.setCertInfoStatus(merchantImage == null ? StoreSummaryVO.NO_DATA : StoreSummaryVO.HAS_DATA);
+    }
+
+    /**
+     * 拼装小微商户的结算信息
+     */
+    private void inputMicroExistData(StoreSummaryVO storeSummaryVO, MerchantBaseInfo existData) {
+        MerchantChannelStatus mcs = mcsService.getValidData(existData.getMerchantCode());
+        Account account = new Account().setUserId(existData.getUserId());
+        if (mcs != null && Objects.equals(mcs.getChannel(), 4)) {
+            account.setChannelType(Account.CHANNEL_TYPE_D0);
+        } else {
+            account.setChannelType(Account.CHANNEL_TYPE_D1);
+        }
+
+        account = getOne(new QueryWrapper<>(account));
+
+        if (account != null && !account.getSettleType().equals(Account.SETTLE_TYPE_MICRO_STORE)) {
+            return;
+        }
+        
+        AccountDTO realAccount;
+        if (account != null) {
+            realAccount = Converter.INSTANCE.toDTO(account);
+            IdCard idCard = idCardService.getById(account.getIdCardId());
+            realAccount.setIdcard(idCard);
+            BankCard bankCard = bankCardService.getById(account.getBankCardId());
+            realAccount.setBankCard(bankCard);
+        } else {
+            realAccount = new AccountDTO();
+            LambdaQueryWrapper<IdCard> qWrapper = Wrappers.lambdaQuery();
+            qWrapper.eq(IdCard::getUserId, existData.getUserId()).eq(IdCard::getUserType, IdCard.TYPE_ACCOUNT);
+            IdCard idCard = idCardService.getOne(qWrapper);
+            realAccount.setIdcard(idCard);
+        }
+
+        storeSummaryVO.setReckonerInfo(realAccount.getIdcard());
+        storeSummaryVO.setReckonerBankInfo(realAccount.getBankCard());
+        storeSummaryVO.setSettleType(realAccount.getSettleType());
+    }
+
+    /**
+     * 拼装个体/企业商户的结算信息和法人信息
+     */
+    private void inputMerchantExistData(StoreSummaryVO storeSummaryVO, MerchantBaseInfo existData) {
+        BusinessLicenseVO businessLicense = getBusinessLicense(existData);
+        if (businessLicense != null) {
+            storeSummaryVO.setBusinessLicenseStatus(StoreSummaryVO.HAS_DATA);
+            storeSummaryVO.setBusinessLicense(businessLicense);
+        } else {
+            storeSummaryVO.setBusinessLicenseStatus(StoreSummaryVO.NO_DATA);
+            // 个体/企业商户，没有营业执照就不存在法人和结算信息
+            return;
+        }
+
+        AccountDTO realAccount = getRealAccount(existData.getUserId());
+
+        if (realAccount != null && !realAccount.getSettleType().equals(Account.SETTLE_TYPE_MICRO_STORE)) {
+            storeSummaryVO.setReckonerInfo(realAccount.getIdcard());
+            storeSummaryVO.setReckonerInfoStatus(StoreSummaryVO.HAS_DATA);
+            storeSummaryVO.setReckonerBankInfo(realAccount.getBankCard());
+            storeSummaryVO.setReckonerBankInfoStatus(StoreSummaryVO.HAS_DATA);
+            storeSummaryVO.setSettleType(realAccount.getSettleType());
+        }
+
+        IdCard legalIdCard = idCardService.getLegalIdCard(existData.getUserId());
+        if (legalIdCard != null) {
+            storeSummaryVO.setLegalPersonInfo(legalIdCard);
+            storeSummaryVO.setLegalPersonInfoStatus(StoreSummaryVO.HAS_DATA);
+        }
+    }
+
+    /**
+     * 获取经营信息/店铺基本信息
+     */
+    private MerchantBaseInfo getMerchantBaseInfo(String userId) {
+        QueryWrapper<MerchantBaseInfo> merchantBaseInfoQueryWrapper = new QueryWrapper<MerchantBaseInfo>().eq("userId", userId);
+        MerchantBaseInfo mbi = mbiService.getOne(merchantBaseInfoQueryWrapper);
+
+        if (mbi == null) {
+            return null;
+        }
+
+        //获取图片信息
+        MerchantImage merchantImage = new MerchantImage();
+        merchantImage.setMerchantCode(mbi.getMerchantCode());
+        List<MerchantImage> imageList = merchantImageService.queryMerchantImageList(merchantImage);
+
+        for (MerchantImage item : imageList) {
+            MerchantBaseInfo.cpImgUrl(mbi, item);
+        }
+
+        return mbi;
+    }
+
+    @Override
+    public boolean saveOrUpdate(Account entity) {
+        if (entity.getUserId() != null) {
+            Account exist = new Account().setUserId(entity.getUserId()).setChannelType(Account.CHANNEL_TYPE_D1);
+            exist = getOne(new QueryWrapper<>(exist));
+
+            if (exist != null) {
+                entity.setId(exist.getId());
+            }
+        }
+
+        if (entity.getId() != null) {
+            updateById(entity);
+            // 没有D0信息就创建
+            Account accountD0 = getRealAccount(entity.getUserId(), Account.CHANNEL_TYPE_D0);
+            if (accountD0 == null) {
+                entity.setChannelType(Account.CHANNEL_TYPE_D0);
+                save(entity);
+            } else {
+                entity.setId(accountD0.getId());
+                updateById(entity);
+            }
+        } else {
+            save(entity);
+            // 没有D0信息就创建
+            Account accountD0 = getRealAccount(entity.getUserId(), Account.CHANNEL_TYPE_D0);
+            if (accountD0 == null) {
+                entity.setChannelType(Account.CHANNEL_TYPE_D0);
+                save(entity);
+            }
+        }
+
+        return super.saveOrUpdate(entity);
+    }
+
+    /**
+     * 保存图片数据
+     *
+     * @param merchantCode     商户code
+     * @param bankCard         银行卡信息
+     * @param legalIdCard      法人/商户负责人身份证信息
+     * @param accountIdcIdCard 结算人身份证信息
+     * @param certificateUrl   非法人授权函
+     */
+    @Override
+    public void saveImage(String merchantCode, BankCard bankCard, IdCard legalIdCard, IdCard accountIdcIdCard, String certificateUrl) {
+        // 法人身份证正面
+        imgService.saveMerchantImageUpload(merchantCode, legalIdCard.getImgPositive(), MerchantImage.ImageType.IDCARD_FRONT);
+        // 法人身份证反面
+        imgService.saveMerchantImageUpload(merchantCode, legalIdCard.getImgNegative(), MerchantImage.ImageType.IDCARD_BACK);
+
+        // 对公结算不需要传结算身份信息
+        if (accountIdcIdCard == null) {
+            imgService.saveMerchantImageUpload(merchantCode, bankCard.getLicenseUrl(), MerchantImage.ImageType.ACCOUNT_PERMITS);
+            return;
+        }
+
+        // 银行卡正面
+        imgService.saveMerchantImageUpload(merchantCode, bankCard.getImgUrl(), MerchantImage.ImageType.BANK_CARD_FRONT);
+
+        // 结算人身份证正面
+        imgService.saveMerchantImageUpload(merchantCode, accountIdcIdCard.getImgPositive(), MerchantImage.ImageType.SETTLE_IDCARD_FRONT);
+        // 结算人身份证反面
+        imgService.saveMerchantImageUpload(merchantCode, accountIdcIdCard.getImgNegative(), MerchantImage.ImageType.SETTLE_IDCARD_BACK);
+
+        // 非法人结算的话，需要非法人授权函
+        if (!accountIdcIdCard.getCertNo().equals(legalIdCard.getCertNo())) {
+            imgService.saveMerchantImageUpload(merchantCode, certificateUrl, MerchantImage.ImageType.NON_LEG_SETTLE_AUTH);
+        }
+    }
+
+    private BusinessLicenseVO getBusinessLicense(MerchantBaseInfo existData) {
+        boolean hasBusinessLicense = StringUtils.isNotEmpty(existData.getPrincipalPerson());
+
+        if (!hasBusinessLicense) {
+            return null;
+        }
+
+        // 组装营业执照信息
+        BusinessLicenseVO businessLicenseVO = new BusinessLicenseVO();
+        businessLicenseVO.setPrincipalPerson(existData.getPrincipalPerson());
+        businessLicenseVO.setBusinessLicensePic(existData.getBusinessLicensePic());
+        businessLicenseVO.setBussAuthName(existData.getBussAuthName());
+        businessLicenseVO.setBussAuthNum(existData.getBussAuthNum());
+        businessLicenseVO.setBussAuthAddress(existData.getBussAuthAddress());
+        businessLicenseVO.setBussAuthStartTime(existData.getBussAuthStartTime());
+        String bussAuthEndTime = existData.getBussAuthEndTime();
+        businessLicenseVO.setBussAuthEndTime(bussAuthEndTime);
+
+        boolean isLongAuthTime = bussAuthEndTime != null && (bussAuthEndTime.startsWith("2099") || bussAuthEndTime.startsWith("2999"));
+        // 判断长期
+        if (isLongAuthTime) {
+            businessLicenseVO.setTypeCode("1");
+            businessLicenseVO.setTypeDesc("长期");
+        } else {
+            businessLicenseVO.setTypeCode("0");
+            businessLicenseVO.setTypeDesc("短期");
+        }
+
+        return businessLicenseVO;
+    }
+
+    @Override
+    public BankCardVO bankcardDetail(String userId) {
+        QueryWrapper<BankCard> bankCardQueryWrapper = new QueryWrapper<>();
+        bankCardQueryWrapper.eq("userId", userId);
+        bankCardQueryWrapper.eq("accountType", BankCard.ACCOUNT_TYPE_CERT);
+        BankCard bankCard = bankCardService.getOne(bankCardQueryWrapper);
+
+        if (bankCard == null) {
+            throw new MsgException("暂无银行卡信息");
+        }
+
+        BankCardVO bankCardVO = new BankCardVO();
+        bankCardVO.setAccountType(bankCard.getAccountType());
+        bankCardVO.setBranchProvince(bankCard.getBranchProvince());
+        bankCardVO.setBranchCity(bankCard.getBranchCity());
+        bankCardVO.setBranchArea(bankCard.getBranchArea());
+        bankCardVO.setBankAddress(bankCard.getBranchProvince() + "," + bankCard.getBranchCity() + "," + bankCard.getBranchArea());
+        bankCardVO.setBankAddressNo(bankCard.getBankAddressNo());
+        bankCardVO.setBankCardFrontPic(bankCard.getImgUrl());
+        bankCardVO.setBankCardNo(bankCard.getBankCardNo());
+        bankCardVO.setBankName(bankCard.getBankName());
+        bankCardVO.setContactLine(bankCard.getContactLine());
+        bankCardVO.setPhone(bankCard.getPhone());
+        bankCardVO.setBranchName(bankCard.getBranchName());
+
+        return bankCardVO;
+    }
+
+    @Override
+    public AccountDTO getAccount(String userId) {
+        MerchantBaseInfo mbi = mbiService.getMerchantBaseInfoByUserId(userId);
+        if (mbi == null) {
+            return getRealAccount(userId, Account.CHANNEL_TYPE_D1);
+        }
+
+        MerchantChannelStatus mcs = mcsService.getValidData(mbi.getMerchantCode());
+        if (mcs == null || !Objects.equals(mcs.getChannel(), 4)) {
+            return getRealAccount(userId, Account.CHANNEL_TYPE_D1);
+        } else {
+            return getRealAccount(userId, Account.CHANNEL_TYPE_D0);
+        }
+    }
+
+    @Override
+    public Map<String, AccountDTO> getAccounts(String userId) {
+        AccountDTO accountD1 = getRealAccount(userId, Account.CHANNEL_TYPE_D1);
+        AccountDTO accountD0 = getRealAccount(userId, Account.CHANNEL_TYPE_D0);
+
+        Map<String, AccountDTO> result = new HashMap<>();
+        if (accountD1 != null && accountD1.getIdcard() != null) {
+            result.put(Account.CHANNEL_TYPE_D1, accountD1);
+        }
+
+        if (accountD0 != null && accountD0.getIdcard() != null) {
+            result.put(Account.CHANNEL_TYPE_D0, accountD0);
+        }
+
+        return result;
+    }
+
+    @Override
+    public AccountDTO getRealAccount(Account account) {
+        String userId = account.getUserId();
+        if (account.getChannelType() == null) {
+            throw new MsgException("缺少结算通道类型");
+        }
+
+        List<String> bloomFilter = new ArrayList<>(2);
+        bloomFilter.add(Account.CHANNEL_TYPE_D0);
+        bloomFilter.add(Account.CHANNEL_TYPE_D1);
+        if (!bloomFilter.contains(account.getChannelType())) {
+            throw new MsgException("未知的结算类型");
+        }
+
+        account = getOne(new QueryWrapper<>(account));
+        AccountDTO accountDTO = Converter.INSTANCE.toDTO(account);
+        MerchantBaseInfo mbi = new MerchantBaseInfo().setUserId(userId);
+        mbi = mbiService.queryMerchantBaseInfo(mbi);
+
+        if (mbi == null) {
+            return null;
+        }
+
+        // 用户不存在结算信息
+        String merchantType = mbi.getMerchantType();
+
+        if (account == null && "1".equals(merchantType)) {
+            AccountDTO result = new AccountDTO();
+            result.setUserId(mbi.getUserId()).setSettleType(Account.SETTLE_TYPE_MICRO_STORE);
+            return result;
+        }
+
+        // 异或，小微但结算信息不是小微，非小微但结算信息是小微
+        if (account == null || "1".equals(merchantType) ^ account.getSettleType().equals(Account.SETTLE_TYPE_MICRO_STORE)) {
+            return null;
+        }
+
+        // 获取身份证信息
+        IdCard idCard = idCardService.getById(account.getIdCardId());
+        accountDTO.setIdcard(idCard);
+
+        // 获取银行卡信息
+        BankCard bankCard = bankCardService.getById(account.getBankCardId());
+        accountDTO.setBankCard(bankCard);
+
+        if (account.getSettleType() == null) {
+            throw new MsgException("未知结算类型");
+        }
+
+        Optional.ofNullable(account.getSettleType()).ifPresent(s -> {
+            if (s.startsWith(Account.SETTLE_TYPE_PRIVATE_ILLEGAL)) {
+                UserApp userApp = new UserApp().setUserId(Long.parseLong(userId));
+                userApp = uaService.queryUserApp(userApp);
+
+                MerchantImage merchantImage = new MerchantImage()
+                        .setMerchantCode(userApp.getMerchantCode())
+                        .setPhotoType(MerchantImage.ImageType.NON_LEG_SETTLE_AUTH);
+
+                merchantImage = merchantImageService.queryMerchantImage(merchantImage);
+                Optional.ofNullable(merchantImage).ifPresent(v -> accountDTO.setCertificateUrl(v.getPicUrl()));
+            }
+        });
+
+
+        MerchantChannelStatus mcs = mcsService.getByMerchantCodeAndChannelType(mbi.getMerchantCode(), account.getChannelType());
+        if (mcs == null || !MerchantChannelStatus.AUDIT_STATUS_DATA_EDIT.equals(mcs.getStatus())) {
+            account.setBak(null);
+        }
+
+        return accountDTO;
+    }
+
+    @Override
+    public AccountDTO getRealAccount(String userId, String channelType) {
+        if (!Account.CHANNEL_TYPE_D1.equals(channelType) && !Account.CHANNEL_TYPE_D0.equals(channelType)) {
+            throw new MsgException("未知的通道类型");
+        }
+
+        Account account = new Account();
+        account.setUserId(userId);
+        account.setChannelType(channelType);
+
+        return getRealAccount(account);
+    }
+
+    @Override
+    public AccountDTO getRealAccount(String userId) {
+        return getRealAccount(userId, Account.CHANNEL_TYPE_D1);
+    }
+
+    @Override
+    public void delAccount(String userId, String channelType) {
+        LambdaQueryWrapper<Account> qWrapper = Wrappers.lambdaQuery();
+        qWrapper.eq(Account::getUserId, userId).eq(Account::getChannelType, channelType);
+        Account account = baseMapper.selectOne(qWrapper);
+        if (account == null) {
+            return;
+        }
+        removeById(account.getId());
+
+        if (!account.getSettleType().equals(Account.SETTLE_TYPE_CORPORATE)
+            && !account.getSettleType().startsWith(Account.SETTLE_TYPE_PRIVATE_LEGAL)) {
+            LambdaQueryWrapper<Account> queryWrapper2 = Wrappers.lambdaQuery();
+            queryWrapper2.eq(Account::getUserId, userId)
+                    .eq(Account::getIdCardId, account.getIdCardId());
+            Integer countIdCardUsedAccount = baseMapper.selectCount(queryWrapper2);
+            if (countIdCardUsedAccount == null || countIdCardUsedAccount == 0) {
+                // idCard如果没有再被使用
+                idCardService.removeById(account.getIdCardId());
+            }
+        }
+
+        LambdaQueryWrapper<Account> queryWrapper2 = Wrappers.lambdaQuery();
+        queryWrapper2.eq(Account::getUserId, userId).eq(Account::getBankCardId, account.getBankCardId());
+        Integer countBankCardUsedAccount = baseMapper.selectCount(queryWrapper2);
+        if (countBankCardUsedAccount == null || countBankCardUsedAccount == 0) {
+            // bankCard如果没有再被使用
+            bankCardService.removeById(account.getBankCardId());
+        }
+
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void editAccountBankCard(BankCard bankCard) {
+        UserApp userApp = new UserApp();
+        userApp.setUserId(Long.parseLong(bankCard.getUserId()));
+        userApp.setUserType("promoter");
+        userApp = uaService.getOne(new QueryWrapper<>(userApp));
+
+        MerchantChannelStatus mcs = mcsService.getValidData(userApp.getMerchantCode());
+
+        MsgException.checkNull(mcs, "商户还未进件");
+
+        MsgException.checkEquals(mcs.getStatus(), MerchantChannelStatus.AUDIT_STATUS_DATA_EDIT, "结算银行卡正在修改审核中，暂不允许修改结算银行卡");
+
+        // 老接口进件的无法通过接口修改结算信息
+        if (mcs.getChannel().equals(4) && StringUtils.isEmpty(mcs.getApplicationId())) {
+            throw new MsgException("暂不支持更换银行卡, 请联系客服进行银行卡信息变更");
+        }
+
+        AccountDTO accountDTO;
+        if (mcs.getChannel() == 4) {
+            accountDTO = getRealAccount(bankCard.getUserId(), Account.CHANNEL_TYPE_D0);
+        } else {
+            accountDTO = getRealAccount(bankCard.getUserId(), Account.CHANNEL_TYPE_D1);
+        }
+
+        if (Objects.equals(accountDTO.getSettleType(), Account.SETTLE_TYPE_CORPORATE)) {
+            throw new MsgException("对公结算, 请联系客服修改");
+        }
+
+        if (accountDTO.getBankCard() != null && accountDTO.getBankCard().getBankCardNo().equals(bankCard.getBankCardNo())) {
+            throw new MsgException("相同结算银行卡信息，勿需修改");
+        }
+
+        IdCard accountIdCard = idCardService.getAccountIdCard(bankCard.getUserId(), mcs.getVirChannelFlag());
+        // 作银行卡四要素校验
+        String certName = accountIdCard.getCertName();
+        try {
+            aliyunService.checkBankCorrect(bankCard.getPhone(), bankCard.getBankCardNo(), accountIdCard.getCertNo(), certName);
+        } catch (MsgException e) {
+            throw new MsgException("银行卡信息校验不通过，请填写结算人【" + DesensitizedUtil.chineseName(certName) + "】的银行卡");
+        }
+
+        bankCard.setBankHolder(certName);
+        Account account = new Account().setChannelType(accountDTO.getChannelType());
+        account.setUserId(bankCard.getUserId());
+        account = getOne(new QueryWrapper<>(account));
+        account.setBak((JSONObject) JSON.toJSON(bankCard));
+        updateById(account);
+
+        uaService.editMerchantAudit(bankCard.getUserId() + "");
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void editAccountBankCardV2(BankCardDTO bankCardDTO) {
+        // 判断状态
+        Account account = getRealAccount(bankCardDTO.getUserId(), bankCardDTO.getChannelType());
+
+        MsgException.checkEquals(account.getSettleType(), Account.SETTLE_TYPE_CORPORATE, "对公结算, 不支持修改结算卡");
+
+        UserApp ua = uaService.getOne(new LambdaQueryWrapper<UserApp>().eq(UserApp::getUserId, bankCardDTO.getUserId()));
+
+        MerchantChannelStatus mcs = mcsService.getByMerchantCodeAndChannelType(ua.getMerchantCode(), bankCardDTO.getChannelType());
+
+        MsgException.checkNull(mcs, "商户还未进件");
+
+        MsgException.checkEquals(mcs.getStatus(), MerchantChannelStatus.AUDIT_STATUS_DATA_EDIT, "结算银行卡正在修改审核中，暂不允许修改结算银行卡");
+
+        BankCard currentData = bankCardService.getById(account.getBankCardId());
+        if (currentData != null && bankCardDTO.getBankCardNo().equals(currentData.getBankCardNo())) {
+            throw new MsgException("相同结算银行卡信息，勿需修改");
+        }
+
+        IdCard accountIdCard = idCardService.getById(account.getIdCardId());
+        // 作银行卡四要素校验
+        String certName = accountIdCard.getCertName();
+
+        bankCardDTO.setBankHolder(certName);
+        try {
+            aliyunService.checkBankCorrect(bankCardDTO.getPhone(), bankCardDTO.getBankCardNo(), accountIdCard.getCertNo(), certName);
+        } catch (MsgException e) {
+            throw new MsgException("银行卡信息校验不通过，请填写结算人【" + DesensitizedUtil.chineseName(certName) + "】的银行卡");
+        }
+
+        BankCard bankCard = Converter.INSTANCE.toEntity(bankCardDTO);
+        account.setBak((JSONObject) JSON.toJSON(bankCard));
+        updateById(account);
+        mcs.setStatus(MerchantChannelStatus.AUDIT_STATUS_DATA_EDIT);
+        mcsService.updateById(mcs);
+
+        // 执行深入操作
+        switch (mcs.getChannel().toString()) {
+            case "1":
+                // 随行付
+                sxfMerchantAuditService.editMerchantAudit(bankCardDTO.getUserId());
+                break;
+            case "2":
+                // 乐刷，暂不支持
+                leshuaMerchantAuditService.editMerchantAudit(bankCardDTO.getUserId());
+                break;
+            case "3":
+                // 瑞银信
+                ryxMerchantAuditService.editMerchantAudit(bankCardDTO.getUserId());
+                break;
+            case "4":
+                // 银盛
+                // MsgException.throwException("修改商户信息请联系客服");
+                // 老接口进件的无法通过接口修改结算信息
+                if (StringUtils.isEmpty(mcs.getApplicationId())) {
+                    MsgException.throwException("修改商户银行卡, 请联系客服");
+                    return;
+                }
+                // 银盛
+                ysAuditServiceV2.editMerchantAudit(bankCardDTO.getUserId());
+                break;
+            default:
+                throw new MsgException("未知的进件通道");
+        }
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void bankcardAudit(BankInfoDTO bankInfoDTO) {
+        if (bankInfoDTO.getPhone().length() > 11) {
+            throw new MsgException("手机号格式不正确");
+        }
+
+        // 校验参数是否完整
+        bankInfoDTO.setBankCardNo(bankInfoDTO.getBankCardNo().replaceAll("[ \u3000]", ""));
+        bankInfoDTO.paramCheck();
+
+        BankCard bankCard1 = BankCardConverter.INSTANCE.dto2Domain(bankInfoDTO);
+        bankCardService.checkBankInfo(bankCard1);
+
+        // 查询当前用户是否存在
+        UserApp userApp = uaService.queryUserAppByToken();
+        IdCard idCard = idCardService.getCertIdCard(bankInfoDTO.getUserId());
+        MsgException.checkNull(idCard, "请先进行身份实名认证");
+
+        BankCard bankCard = new BankCard();
+        bankCard.setUserId(bankInfoDTO.getUserId());
+        bankCard.setAccountType(BankCard.ACCOUNT_TYPE_CERT);
+        BankCard existBankCard = bankCardService.getOne(new QueryWrapper<>(bankCard));
+
+        if (existBankCard != null) {
+            bankCard = existBankCard;
+        }
+
+        Converter.INSTANCE.cp(bankInfoDTO, bankCard);
+        BeanUtils.copyProperties(bankInfoDTO, bankCard);
+        bankCard.setAccountType(BankCard.ACCOUNT_TYPE_CERT);
+
+        if (bankInfoDTO.getBankAddress() != null) {
+            String[] split = bankInfoDTO.getBankAddress().split(",");
+            bankCard.setBranchProvince(split[0]);
+            if (split.length < 3) {
+                bankCard.setBranchCity(split[0]);
+                bankCard.setBranchArea(split[1]);
+            } else {
+                bankCard.setBranchCity(split[1]);
+                bankCard.setBranchArea(split[2]);
+            }
+        } else {
+            MsgException.checkNull(bankInfoDTO.getBranchProvince(), "缺少开户省");
+            MsgException.checkNull(bankInfoDTO.getBranchCity(), "缺少开户市");
+            MsgException.checkNull(bankInfoDTO.getBranchArea(), "缺少开户区");
+
+            bankCard.setBranchProvince(bankInfoDTO.getBranchProvince());
+            bankCard.setBranchCity(bankInfoDTO.getBranchCity());
+            bankCard.setBranchArea(bankInfoDTO.getBranchArea());
+        }
+
+        bankCard.setImgUrl(bankInfoDTO.getBankCardFrontPic());
+        if (bankInfoDTO.getBankCardFrontPic() == null) {
+            bankCard.setImgUrl(bankInfoDTO.getImgUrl());
+        }
+
+        Notice notice = new Notice(1, 5, userApp);
+        try {
+            aliyunService.checkBankCorrect(bankInfoDTO.getPhone(), bankInfoDTO.getBankCardNo(), idCard.getCertNo(), idCard.getCertName());
+        } catch (MsgException e) {
+            notice = new Notice(1, 5, userApp);
+            notice.setConrtent("很遗憾你的银行卡认证未通过，请您核对信息后重新提交审核！");
+            // 审核失败
+            userApp.setBankStatus(2);
+            // 审核失败原因
+            userApp.setBankReason(e.getMessage());
+            noticeService.saveNotice(notice);
+            uaService.updateById(userApp);
+            List<String> alias = new ArrayList<>();
+            alias.add(userApp.getUserId().toString());
+            String notificationContent = "很遗憾你的银行卡认证未通过，请您核对信息后重新提交审核！";
+            generalPushUtil.sendAllPlatByAlias(alias, "银行卡认证通知", notificationContent, "1");
+            throw e;
+        }
+
+        bankCard.setBankHolder(idCard.getCertName());
+        bankCardService.saveCertBankCard(bankCard);
+
+        String spreadFlag = "1";
+        if ("agent".equals(userApp.getUserType()) && "ZY_BST".equals(userApp.getRoleCode())) {
+            IdCard condition = new IdCard().setCertNo(idCard.getCertNo()).setUserType(IdCard.TYPE_CERT);
+            List<IdCard> idCardList = idCardService.list(new QueryWrapper<>(condition).select(" DISTINCT userId"));
+            for (IdCard item : idCardList) {
+                UserApp otherUa = uaService.getUserAppByUserId(item.getUserId());
+                otherUa.setSpreadFlag("0");
+                uaService.updateById(otherUa);
+            }
+        } else {
+            int agentCount = idCardService.getAgentCount(idCard.getCertNo(), userApp.getUserId() + "");
+            if (agentCount > 0) {
+                spreadFlag = "0";
+            }
+        }
+
+        userApp.setSpreadFlag(spreadFlag);
+        // 删除审核失败原因
+        userApp.setBankReason("");
+        // 审核通过
+        userApp.setBankStatus(3);
+        // 实名认证通过
+        userApp.setStatus(3);
+        userApp.setUserName(idCard.getCertName());
+
+        notice.setConrtent("审核通过！");
+
+        noticeService.saveNotice(notice);
+        uaService.updateById(userApp);
+
+        // 调用极光通知推送
+        List<String> alias = new ArrayList<>();
+        alias.add(userApp.getUserId().toString());
+        generalPushUtil.sendAllPlatByAlias(alias, "银行卡认证通知", "审核通过", "1");
+    }
+
+    @Override
+    public boolean canEditBankCard(String merchantCode) {
+        MerchantChannelStatus merchantChannelStatus = new MerchantChannelStatus();
+        merchantChannelStatus.setMerchantCode(merchantCode);
+        val qWrapper = new QueryWrapper<>(merchantChannelStatus);
+        qWrapper.orderByDesc("valid")
+                .orderByAsc("createTime")
+                .last("limit 1");
+        merchantChannelStatus = mcsService.getOne(qWrapper);
+
+        UserApp userApp = new UserApp();
+        userApp.setMerchantCode(merchantCode).setUserType("promoter");
+        userApp = uaService.queryUserApp(userApp);
+
+        Account account = new Account();
+        account.setUserId(userApp.getUserId() + "");
+
+        account = getOne(new QueryWrapper<>(account));
+
+        if (account == null) {
+            throw new MsgException("未获取到结算信息");
+        }
+
+        // 只有小微商户和对私法人结算才可以通过app修改结算账户
+        String settleType = account.getSettleType();
+        boolean flag = settleType.equals(Account.SETTLE_TYPE_MICRO_STORE) || settleType.startsWith(Account.SETTLE_TYPE_PRIVATE_LEGAL);
+        // 修改审核中的商户不能操作
+        boolean statusFlag = MerchantChannelStatus.AUDIT_STATUS_SUCCESS.equals(merchantChannelStatus.getStatus());
+
+        return statusFlag && flag;
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/account/BaseAccountService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/account/BaseAccountService.java
new file mode 100644
index 0000000..e69de29
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/move/MerchantMoveRecordsService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/move/MerchantMoveRecordsService.java
new file mode 100644
index 0000000..5b24c60
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/move/MerchantMoveRecordsService.java
@@ -0,0 +1,22 @@
+package cn.pluss.platform.merchant.move;
+
+import cn.pluss.platform.entity.MerchantMoveRecords;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 商户动态码生成记录 服务类
+ * </p>
+ *
+ * @author bzg
+ * @since 2021-07-30
+ */
+public interface MerchantMoveRecordsService extends IService<MerchantMoveRecords> {
+
+    MerchantMoveRecords createToken();
+
+    /**
+     * 生成验证码次数校验
+     */
+    void checkCount(String merchantCode);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/move/MerchantMoveSettingService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/move/MerchantMoveSettingService.java
new file mode 100644
index 0000000..b0b367f
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/move/MerchantMoveSettingService.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.merchant.move;
+
+import cn.pluss.platform.entity.MerchantMoveSetting;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 商户动态码基本配置 服务类
+ * </p>
+ *
+ * @author bzg
+ * @since 2021-07-30
+ */
+public interface MerchantMoveSettingService extends IService<MerchantMoveSetting> {
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/move/impl/MerchantMoveRecordsServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/move/impl/MerchantMoveRecordsServiceImpl.java
new file mode 100644
index 0000000..1820a1b
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/move/impl/MerchantMoveRecordsServiceImpl.java
@@ -0,0 +1,140 @@
+package cn.pluss.platform.merchant.move.impl;
+
+import cn.hutool.core.date.DateUtil;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.MerchantMoveRecordsMapper;
+import cn.pluss.platform.merchant.move.MerchantMoveRecordsService;
+import cn.pluss.platform.merchant.move.MerchantMoveSettingService;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.userApp.UserAppService;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.var;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.Objects;
+import java.util.UUID;
+
+/**
+ * <p>
+ * 商户动态码生成记录 服务实现类
+ * </p>
+ *
+ * @author bzg
+ * @since 2021-07-30
+ */
+@Service
+public class MerchantMoveRecordsServiceImpl extends ServiceImpl<MerchantMoveRecordsMapper, MerchantMoveRecords> implements MerchantMoveRecordsService {
+
+    @Autowired
+    private UserAppService userAppService;
+
+    @Autowired
+    private MerchantBaseInfoService mbiService;
+
+    @Autowired
+    private MerchantChannelStatusService channelStatusService;
+
+    @Autowired
+    private MerchantMoveSettingService merchMoveSettingService;
+
+    @Override
+    public MerchantMoveRecords createToken() {
+        UserApp tokenUserApp = userAppService.queryUserAppByToken();
+
+        MerchantChannelStatus channelStatus = channelStatusService.getByMerchantCode(tokenUserApp.getMerchantCode(), 4);
+        if (channelStatus == null || !Objects.equals(channelStatus.getChannel(), 4)) {
+            throw new MsgException("D0通道暂未开通，请开通D0后再试");
+        }
+
+        if (Objects.equals(channelStatus.getChannel(), 4) && !MerchantChannelStatus.AUDIT_STATUS_SUCCESS.equals(channelStatus.getStatus())) {
+            throw new MsgException("D0通道暂未通过，请稍后再试");
+        }
+
+        String uuid = UUID.randomUUID().toString().replace("-", "");
+
+        Date startTime = new Date();
+        long endTimestamp = startTime.getTime() + 5 * 60 * 1000;
+        Date endTime = new Date(endTimestamp);
+
+        MerchantBaseInfo mbi = mbiService.getMerchantBaseInfoByMerchantCode(tokenUserApp.getMerchantCode());
+        MerchantMoveRecords merchMoveRecord = new MerchantMoveRecords();
+        merchMoveRecord.setMerchantCode(mbi.getMerchantCode());
+        MerchantMoveRecords exist = getOne(new QueryWrapper<>(merchMoveRecord).orderByDesc("createTime").last("limit 1"));
+
+        // 过期或无效标识
+        var flag = false;
+        checkCount(tokenUserApp.getMerchantCode());
+
+        if (exist == null) {
+            merchMoveRecord.setMerchantName(mbi.getAlias());
+            merchMoveRecord.setStartTime(startTime);
+            merchMoveRecord.setEndTime(endTime);
+            merchMoveRecord.setCreateTime(startTime);
+            merchMoveRecord.setToken(uuid);
+            save(merchMoveRecord);
+
+            return merchMoveRecord;
+        }
+
+        if (exist.getPayNum() > 0) {
+            flag = true;
+        }
+
+        if (DateUtil.compare(exist.getEndTime(), new Date()) < 0) {
+            flag = true;
+        }
+
+        // 已经过期
+        if (flag) {
+            merchMoveRecord.setMerchantName(mbi.getAlias());
+            merchMoveRecord.setStartTime(startTime);
+            merchMoveRecord.setEndTime(endTime);
+            merchMoveRecord.setCreateTime(startTime);
+            merchMoveRecord.setToken(uuid);
+            save(merchMoveRecord);
+        } else {
+            merchMoveRecord = exist;
+        }
+
+        return merchMoveRecord;
+    }
+
+    @Override
+    public void checkCount(String merchantCode) {
+        Date date = new Date();
+        Date startTime = DateUtil.beginOfDay(date).toJdkDate();
+        Date endTime = DateUtil.endOfDay(date).toJdkDate();
+
+        LambdaQueryWrapper<MerchantMoveRecords> qWrapper = new LambdaQueryWrapper<MerchantMoveRecords>()
+                .eq(MerchantMoveRecords::getMerchantCode, merchantCode)
+                .between(MerchantMoveRecords::getCreateTime, startTime, endTime);
+
+        // 当日已经生成码的次数
+        int count = baseMapper.selectCount(qWrapper);
+
+        LambdaQueryWrapper<MerchantMoveSetting> qWrapperLimit = new LambdaQueryWrapper<MerchantMoveSetting>()
+                .eq(MerchantMoveSetting::getMerchantCode, merchantCode);
+
+        MerchantMoveSetting setting = merchMoveSettingService.getOne(qWrapperLimit);
+        if (setting == null) {
+            setting = new MerchantMoveSetting();
+            setting.setMerchantCode(merchantCode);
+            setting.setPayNum(20);
+            setting.setQrNum(50);
+            setting.setAesKey(UUID.randomUUID().toString().replace("-", ""));
+            merchMoveSettingService.save(setting);
+        }
+        int maxQrNum = setting.getQrNum();
+
+        if (count > maxQrNum) {
+            throw new MsgException("动态码生成次数当日已达上限");
+        }
+    }
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/move/impl/MerchantMoveSettingServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/move/impl/MerchantMoveSettingServiceImpl.java
new file mode 100644
index 0000000..f1c1dcd
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/move/impl/MerchantMoveSettingServiceImpl.java
@@ -0,0 +1,20 @@
+package cn.pluss.platform.merchant.move.impl;
+
+import cn.pluss.platform.entity.MerchantMoveSetting;
+import cn.pluss.platform.mapper.MerchantMoveSettingMapper;
+import cn.pluss.platform.merchant.move.MerchantMoveSettingService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 商户动态码基本配置 服务实现类
+ * </p>
+ *
+ * @author bzg
+ * @since 2021-07-30
+ */
+@Service
+public class MerchantMoveSettingServiceImpl extends ServiceImpl<MerchantMoveSettingMapper, MerchantMoveSetting> implements MerchantMoveSettingService {
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantAddress/MerchantAddressService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantAddress/MerchantAddressService.java
new file mode 100644
index 0000000..0ecdc55
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantAddress/MerchantAddressService.java
@@ -0,0 +1,25 @@
+package cn.pluss.platform.merchantAddress;
+
+import java.util.List;
+import java.util.Map;
+import cn.pluss.platform.entity.MerchantAddress;
+
+public interface MerchantAddressService {
+
+    public MerchantAddress queryMerchantAddress(MerchantAddress merchantAddress);
+
+    public List<MerchantAddress> queryMerchantAddressList(MerchantAddress merchantAddress);
+
+    public void saveMerchantAddress(MerchantAddress merchantAddress);
+
+    public void updateMerchantAddress(MerchantAddress merchantAddress);
+
+    public void deleteMerchantAddress(MerchantAddress merchantAddress);
+
+    public List<MerchantAddress> queryMerchantAddressPage(Map map);
+
+    public Integer queryMerchantAddressPageCount(Map map);
+
+    public void saveMerchantAddressBatch(List<MerchantAddress> merchantAddressList);
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantAddress/impl/MerchantAddressServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantAddress/impl/MerchantAddressServiceImpl.java
new file mode 100644
index 0000000..e4ee40d
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantAddress/impl/MerchantAddressServiceImpl.java
@@ -0,0 +1,58 @@
+package cn.pluss.platform.merchantAddress.impl;
+
+import java.util.List;
+import java.util.Map;
+import org.springframework.transaction.annotation.Transactional;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import cn.pluss.platform.entity.MerchantAddress;
+import cn.pluss.platform.merchantAddress.MerchantAddressService;
+import cn.pluss.platform.mapper.MerchantAddressMapper;
+
+@Transactional
+@Service("merchantAddressService")
+public class MerchantAddressServiceImpl  implements MerchantAddressService{
+
+	 private static final Logger logger = LoggerFactory.getLogger( MerchantAddressServiceImpl.class);
+
+
+    @Autowired
+	  private MerchantAddressMapper merchantAddressMapper;
+
+    @Override
+    public MerchantAddress queryMerchantAddress(MerchantAddress merchantAddress){
+        return merchantAddressMapper.queryMerchantAddress(merchantAddress);
+    }
+
+    @Override
+    public List<MerchantAddress> queryMerchantAddressList(MerchantAddress merchantAddress){
+        return merchantAddressMapper.queryMerchantAddressList(merchantAddress);
+    }
+    @Override
+    public void saveMerchantAddress(MerchantAddress merchantAddress){
+          merchantAddressMapper.saveMerchantAddress(merchantAddress);
+    }
+    @Override
+    public void updateMerchantAddress(MerchantAddress merchantAddress){
+        merchantAddressMapper.updateMerchantAddress(merchantAddress);
+    }
+    @Override
+    public void deleteMerchantAddress(MerchantAddress merchantAddress){
+        merchantAddressMapper.deleteMerchantAddress(merchantAddress);
+    }
+    @Override
+    public List<MerchantAddress> queryMerchantAddressPage(Map map){
+        return merchantAddressMapper.queryMerchantAddressPage(map);
+    }
+    @Override
+    public Integer queryMerchantAddressPageCount(Map map){
+        return merchantAddressMapper.queryMerchantAddressPageCount(map);
+    }
+    @Override
+    public void saveMerchantAddressBatch(List<MerchantAddress> merchantAddressList) {
+         merchantAddressMapper.saveMerchantAddressBatch(merchantAddressList);
+    }
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantBankCard/MerchantBankCardService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantBankCard/MerchantBankCardService.java
new file mode 100644
index 0000000..8262f32
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantBankCard/MerchantBankCardService.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.merchantBankCard;
+
+import cn.pluss.platform.entity.MerchantBankCard;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+public interface MerchantBankCardService extends IService<MerchantBankCard> {
+
+    MerchantBankCard queryMerchantBankCard(String userId);
+
+    void updateMerchantBankCard(MerchantBankCard merchantBankCard);
+
+    void deleteMerchantBankCard(MerchantBankCard merchantBankCard);
+
+    void updateMerchantBankCardUserId(MerchantBankCard merchantBankCard);
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantBankCard/impl/MerchantBankCardServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantBankCard/impl/MerchantBankCardServiceImpl.java
new file mode 100644
index 0000000..db779b2
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantBankCard/impl/MerchantBankCardServiceImpl.java
@@ -0,0 +1,88 @@
+package cn.pluss.platform.merchantBankCard.impl;
+
+import cn.pluss.platform.BankCardService;
+import cn.pluss.platform.IdCardService;
+import cn.pluss.platform.entity.BankCard;
+import cn.pluss.platform.entity.IdCard;
+import cn.pluss.platform.entity.MerchantBankCard;
+import cn.pluss.platform.mapper.MerchantBankCardMapper;
+import cn.pluss.platform.merchantBankCard.MerchantBankCardService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Transactional
+@Service("merchantBankCardService")
+public class MerchantBankCardServiceImpl extends ServiceImpl<MerchantBankCardMapper, MerchantBankCard> implements MerchantBankCardService {
+
+    @Autowired
+    private IdCardService idCardService;
+    @Autowired
+    private BankCardService bankCardService;
+
+    @Override
+    public MerchantBankCard queryMerchantBankCard(String userId) {
+        MerchantBankCard result = new MerchantBankCard();
+
+        IdCard legalIdCard = idCardService.getCertIdCard(userId);
+        BankCard bankCard = new BankCard().setUserId(userId).setAccountType(BankCard.ACCOUNT_TYPE_CERT);
+        bankCard = bankCardService.getOne(new QueryWrapper<>(bankCard));
+
+        if (legalIdCard != null) {
+            result.setId(legalIdCard.getId());
+            result.setBankCertName(legalIdCard.getCertName());
+            result.setUserId(userId);
+            result.setCertNo(legalIdCard.getCertNo());
+            result.setCertType(legalIdCard.getCertType());
+            result.setCertStartTime(legalIdCard.getCertStartTime());
+            result.setCertEndTime(legalIdCard.getCertEndTime());
+            result.setCertBacKPhoto(legalIdCard.getImgNegative());
+            result.setCertFullPhoto(legalIdCard.getImgPositive());
+        }
+
+        if (bankCard != null) {
+            result.setBankName(bankCard.getBankName());
+            result.setBankCertName(bankCard.getBankHolder());
+            result.setBankCardFrontPic(bankCard.getImgUrl());
+            result.setBankCardNo(bankCard.getBankCardNo());
+            result.setBankAddressNo(bankCard.getBankAddressNo());
+        }
+
+        return result;
+    }
+
+    @Override
+    public void updateMerchantBankCard(MerchantBankCard merchantBankCard) {
+        baseMapper.updateMerchantBankCard(merchantBankCard);
+    }
+
+    @Override
+    public void updateMerchantBankCardUserId(MerchantBankCard merchantBankCard) {
+        IdCard legalIdCard = idCardService.getCertIdCard(merchantBankCard.getUserId());
+        if (legalIdCard != null) {
+            legalIdCard.setCertNo(merchantBankCard.getCertNo());
+            legalIdCard.setCertName(merchantBankCard.getBankCertName());
+            idCardService.updateById(legalIdCard);
+        }
+
+        BankCard bankCard = new BankCard().setUserId(legalIdCard.getUserId()).setAccountType(BankCard.ACCOUNT_TYPE_PRIVATE);
+        bankCard = bankCardService.getOne(new QueryWrapper<>(bankCard));
+        if (bankCard != null) {
+            bankCard.setBankName(merchantBankCard.getBankName());
+            bankCard.setBankHolder(merchantBankCard.getBankCertName());
+            bankCard.setBankCardNo(merchantBankCard.getBankCardNo());
+            bankCardService.updateById(bankCard);
+        }
+
+        baseMapper.updateMerchantBankCardUserId(merchantBankCard);
+    }
+
+    @Override
+    public void deleteMerchantBankCard(MerchantBankCard merchantBankCard) {
+        baseMapper.deleteMerchantBankCard(merchantBankCard);
+    }
+
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantChannel/MerchantChannelService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantChannel/MerchantChannelService.java
new file mode 100644
index 0000000..450300e
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantChannel/MerchantChannelService.java
@@ -0,0 +1,44 @@
+package cn.pluss.platform.merchantChannel;
+
+import cn.pluss.platform.entity.MerchantChannel;
+import cn.pluss.platform.entity.MerchantChannelStatus;
+import cn.pluss.platform.mapper.MerchantChannelMapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.IService;
+import lombok.val;
+
+import java.util.List;
+
+/**
+ * @author DJH
+ */
+public interface MerchantChannelService extends IService<MerchantChannel> {
+
+    /**
+     * 获取有效的通道记录，
+     * @param channelId 通道id
+     * @return      通道记录
+     */
+    default MerchantChannel getValidChannel(String channelId) {
+        MerchantChannel merchantChannel = new MerchantChannel().setId(Integer.parseInt(channelId));
+        return getBaseMapper().selectOne(new QueryWrapper<>(merchantChannel));
+    }
+
+    /**
+     * 获取所有有效的通道
+     * @return 通道记录
+     */
+    default List<MerchantChannel> getValidChannelList() {
+        MerchantChannel merchantChannel = new MerchantChannel().setStatus("1");
+        return getBaseMapper().selectList(new QueryWrapper<>(merchantChannel));
+    }
+
+    /**
+     * 获取所有有效的通道id
+     * @return 通道记录
+     */
+    default List<Integer> getValidChannelIdList() {
+        return ((MerchantChannelMapper) getBaseMapper()).selectValidIdList();
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantChannel/impl/MerchantChannelServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantChannel/impl/MerchantChannelServiceImpl.java
new file mode 100644
index 0000000..1e3bc22
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantChannel/impl/MerchantChannelServiceImpl.java
@@ -0,0 +1,11 @@
+package cn.pluss.platform.merchantChannel.impl;
+
+import cn.pluss.platform.entity.MerchantChannel;
+import cn.pluss.platform.mapper.MerchantChannelMapper;
+import cn.pluss.platform.merchantChannel.MerchantChannelService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service
+public class MerchantChannelServiceImpl extends ServiceImpl<MerchantChannelMapper, MerchantChannel> implements MerchantChannelService {
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantChannelImg/MerchantChannelImgService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantChannelImg/MerchantChannelImgService.java
new file mode 100644
index 0000000..24315b6
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantChannelImg/MerchantChannelImgService.java
@@ -0,0 +1,28 @@
+package cn.pluss.platform.merchantChannelImg;
+
+import cn.pluss.platform.entity.MerchantChannelImg;
+import cn.pluss.platform.entity.MerchantImage;
+import cn.pluss.platform.mapper.MerchantChannelImgMapper;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+public interface MerchantChannelImgService extends IService<MerchantChannelImg> {
+
+    MerchantChannelImg get(String srcUrl, Integer channelType);
+
+    /**
+     * 获取对应通道下进件的图片，
+     * 如果因切换通道导致需要重新进件的，则会获取存在与服务器上的图片信息，对应的通道路径置为null
+     * @return  进件图片列表
+     */
+    List<MerchantImage> getAuditImg(String userId, String channelId);
+
+    /**
+     * 删除商户再对应通道下的图片上传记录
+     * @return  删除条数
+     */
+    default Integer removeThirdImgRecord(String merchantCode, String channelId) {
+        return ((MerchantChannelImgMapper) getBaseMapper()).removeByMerchantCode(merchantCode, channelId);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantChannelImg/impl/MerchantChannelImgServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantChannelImg/impl/MerchantChannelImgServiceImpl.java
new file mode 100644
index 0000000..d59491e
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantChannelImg/impl/MerchantChannelImgServiceImpl.java
@@ -0,0 +1,65 @@
+package cn.pluss.platform.merchantChannelImg.impl;
+
+import cn.pluss.platform.entity.MerchantChannelImg;
+import cn.pluss.platform.entity.MerchantImage;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.mapper.MerchantChannelImgMapper;
+import cn.pluss.platform.mapper.MerchantImageMapper;
+import cn.pluss.platform.mapper.UserAppMapper;
+import cn.pluss.platform.merchantChannelImg.MerchantChannelImgService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.Iterator;
+import java.util.List;
+
+@Service
+@RequiredArgsConstructor
+public class MerchantChannelImgServiceImpl extends ServiceImpl<MerchantChannelImgMapper, MerchantChannelImg> implements MerchantChannelImgService {
+
+    private final MerchantChannelImgMapper merchantChannelImgMapper;
+
+    private final UserAppMapper userAppMapper;
+
+    private final MerchantImageMapper merchantImageMapper;
+
+    @Override
+    public MerchantChannelImg get(String srcUrl, Integer channelType) {
+        MerchantChannelImg condition = new MerchantChannelImg();
+        condition.setSrcUrl(srcUrl).setChannelType(channelType);
+
+        return baseMapper.selectOne(new QueryWrapper<>(condition));
+    }
+
+    @Override
+    public List<MerchantImage> getAuditImg(String userId, String channelId) {
+        List<MerchantImage> uploadedImgList = merchantChannelImgMapper.selectListByUserId(userId, channelId);
+        UserApp userApp = new UserApp().setUserId(Long.parseLong(userId));
+        userApp = userAppMapper.selectOne(new QueryWrapper<>(userApp));
+        QueryWrapper<MerchantImage> queryWrapper = new QueryWrapper<MerchantImage>().eq("merchantCode", userApp.getMerchantCode());
+        List<MerchantImage> merchantImageList = merchantImageMapper.selectList(queryWrapper);
+
+        // 将没有上传的图片挑出来
+        Iterator<MerchantImage> iterator = merchantImageList.iterator();
+        while (iterator.hasNext()) {
+            MerchantImage next = iterator.next();
+            boolean exist = false;
+            for (MerchantImage uploadImg : uploadedImgList) {
+                if (uploadImg.getId().equals(next.getId())) {
+                    exist = true;
+                    break;
+                }
+            }
+
+            if (!exist) {
+                next.setPhotoUrl(null);
+                uploadedImgList.add(next);
+                iterator.remove();
+            }
+        }
+
+        return uploadedImgList;
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantChannelStatus/MerchantChannelStatusService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantChannelStatus/MerchantChannelStatusService.java
new file mode 100644
index 0000000..726cd33
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantChannelStatus/MerchantChannelStatusService.java
@@ -0,0 +1,217 @@
+package cn.pluss.platform.merchantChannelStatus;
+
+import cn.pluss.platform.entity.MerchantChannelStatus;
+import cn.pluss.platform.mapper.MerchantChannelStatusMapper;
+import cn.pluss.platform.vo.ChannelStatusVO;
+import cn.pluss.platform.vo.MerchantChannelStatusVO;
+import cn.pluss.platform.vo.UserNumVO;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author DJH
+ */
+public interface MerchantChannelStatusService extends IService<MerchantChannelStatus> {
+
+    default MerchantChannelStatus getByIdLock(Integer id) {
+        return ((MerchantChannelStatusMapper) getBaseMapper()).getByIdLock(id);
+    }
+
+    default List<MerchantChannelStatusVO> listByMerchantCodeList(List<String> merchantCodeList) {
+        return ((MerchantChannelStatusMapper) getBaseMapper()).selectListByMerchantCode(merchantCodeList);
+    }
+
+    default MerchantChannelStatus getByMerchantCodeAndChannelType(String merchantCode, String channelType) {
+        LambdaQueryWrapper<MerchantChannelStatus> qWrapper = Wrappers.lambdaQuery();
+        qWrapper.eq(MerchantChannelStatus::getVirChannelFlag, channelType);
+        qWrapper.eq(MerchantChannelStatus::getMerchantCode, merchantCode);
+
+        return getOne(qWrapper);
+    }
+
+    /**
+     * 进件请求前参数校验
+     * @param merchantCode 商户编码
+     *
+     * @return  返回一个驳回的进件记录（若有）
+     */
+    MerchantChannelStatus auditCheck(String merchantCode);
+
+    default MerchantChannelStatus getByMerchantCodeWithChannel(String merchantCode, String channelType) {
+        QueryWrapper<MerchantChannelStatus> qWrapper = new QueryWrapper<>();
+        qWrapper.eq("merchantCode", merchantCode)
+                .eq("channel", channelType);
+        return getBaseMapper().selectOne(qWrapper);
+    }
+
+
+    /**
+     * 获取当前启用的渠道下商户的渠道信息
+     * @param merchantCode
+     * @return
+     */
+    default MerchantChannelStatus getByMerchantCode(String merchantCode) {
+        if (StringUtils.isEmpty(merchantCode)) {
+            return null;
+        }
+
+        return ((MerchantChannelStatusMapper) getBaseMapper()).getByMerchantCode(merchantCode);
+    }
+
+    default MerchantChannelStatus getValidData(String merchantCode) {
+        if (StringUtils.isEmpty(merchantCode)) {
+            return null;
+        }
+
+        // 先查询进件通过了的进件信息
+        LambdaQueryWrapper<MerchantChannelStatus> qWrapper2 = Wrappers.lambdaQuery();
+        qWrapper2.eq(MerchantChannelStatus::getMerchantCode, merchantCode)
+                .in(MerchantChannelStatus::getStatus,
+                        MerchantChannelStatus.AUDIT_STATUS_SUCCESS,
+                        MerchantChannelStatus.AUDIT_STATUS_DATA_EDIT)
+                .orderByDesc(MerchantChannelStatus::getValid)
+                .orderByAsc(MerchantChannelStatus::getId)
+                .last("limit 1");
+        MerchantChannelStatus mcs = getBaseMapper().selectOne(qWrapper2);
+        if (mcs != null) {
+            return mcs;
+        }
+
+        LambdaQueryWrapper<MerchantChannelStatus> qWrapper = new LambdaQueryWrapper<MerchantChannelStatus>()
+                .eq(MerchantChannelStatus::getMerchantCode, merchantCode)
+                .orderByDesc(MerchantChannelStatus::getValid)
+                .orderByAsc(MerchantChannelStatus::getId)
+                .last("limit 1");
+
+        return getBaseMapper().selectOne(qWrapper);
+    }
+
+    /**
+     * 获取没有通道信息的进件记录信息
+     * @param merchantCode  商户编号
+     * @return  进件记录信息
+     */
+    default MerchantChannelStatus getByMerchantCodeNoChannel(String merchantCode) {
+        LambdaQueryWrapper<MerchantChannelStatus> qWrapper = new LambdaQueryWrapper<MerchantChannelStatus>()
+                .eq(MerchantChannelStatus::getMerchantCode, merchantCode)
+                .isNull(MerchantChannelStatus::getChannel);
+
+        return getOne(qWrapper);
+    }
+
+    /**
+     * 获取当前启用的渠道下商户的渠道信息
+     * @param merchantCode
+     * @return
+     */
+    default MerchantChannelStatus getByMerchantCode(String merchantCode, Integer channel) {
+        if (StringUtils.isEmpty(merchantCode)) {
+            return null;
+        }
+
+        MerchantChannelStatus result = ((MerchantChannelStatusMapper) getBaseMapper()).getByMerchantCode(merchantCode, channel);
+
+        if (result == null) {
+            result = getByMerchantCodeNoChannel(merchantCode);
+        }
+
+        return result;
+    }
+
+    MerchantChannelStatus getSxfMerchantStatusInfo(String merchantCode);
+
+    /**
+     * 商户申请进件（未提交给随行付）
+     * @param merchantCode  商户code
+     */
+    void reqAudit(String merchantCode);
+
+    /**
+     * 驳回商户进件申请
+     * @param merchantCode  商户code
+     * @param errMsg        驳回原因
+     */
+    void rejectAudit(String merchantCode, String errMsg);
+
+    default List<MerchantChannelStatus> listWithUserId(QueryWrapper<MerchantChannelStatus> queryWrapper) {
+        return ((MerchantChannelStatusMapper)getBaseMapper()).selectListWithUserId(queryWrapper);
+    }
+
+    /**
+     * app获取快速到账的通道，当前快速到账通道为银盛
+     * @return  银盛通道的进件记录
+     */
+    ChannelStatusVO appQuickCash();
+
+    /**
+     * 快速到账通道和常规通道切换
+     * @param flag 通道标识，目前是0：常规通道， 1： 快速到账通道
+     * @return  切换后的通道记录
+     */
+    ChannelStatusVO appSwitchChannel(int flag);
+
+    /**
+     * 查询用户当前的通道信息
+     * @return  通道进件信息
+     */
+    ChannelStatusVO appCurrent();
+
+    /**
+     * 清理驳回的信息中的通道相关数据
+     * @param merchantCode  商户编号
+     */
+    default void clearRejectedChannel(String merchantCode) {
+        // 只能清理审核驳回，以及待后台审核状态下的进件记录通道信息
+        LambdaUpdateWrapper<MerchantChannelStatus> uWrapper = new LambdaUpdateWrapper<MerchantChannelStatus>()
+                .eq(MerchantChannelStatus::getMerchantCode, merchantCode)
+                .and(wrapper -> wrapper.in(MerchantChannelStatus::getStatus, 2, 0)
+                        .or(wrapper2 -> wrapper2.eq(MerchantChannelStatus::getStatus, 1)
+                                .eq(MerchantChannelStatus::getThirdStatus, -999)));
+
+        uWrapper.set(MerchantChannelStatus::getChannel, null)
+                .set(MerchantChannelStatus::getStatus, "1")
+                .set(MerchantChannelStatus::getThirdStatus, "-100")
+                .set(MerchantChannelStatus::getMerchantId, null)
+                .set(MerchantChannelStatus::getApplicationId, null);
+
+        getBaseMapper().update(null, uWrapper);
+    }
+
+    default MerchantChannelStatus getByMerchantIdLock(String merchantId) {
+        return ((MerchantChannelStatusMapper) getBaseMapper()).getByMerchantIdLock(merchantId);
+    }
+
+    MerchantChannelStatus getChannelByMerchantId(String uid);
+
+    /**
+     * 确认微信认证的状态
+     * @param mcs  商户信息
+     */
+    void verifyWxAuthStatus(MerchantChannelStatus mcs);
+
+    /**
+     * @description:根据通道商编查询数据
+     * @date: 2021/10/28 10:48
+     * @param mno:
+     * @return cn.pluss.platform.entity.MerchantChannelStatus
+     */
+    MerchantChannelStatus getByMerchantId(String mno);
+
+    /**
+     * 发送签约短信
+     * @param merchantCode
+     */
+    void sendSignMsg(String merchantCode);
+
+    /**
+     * 当前用户指定时间段 进件商户数量
+     */
+    UserNumVO getUserNumInfo(Long userId, String date, Integer dateType);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantChannelStatus/impl/MerchantChannelStatusServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantChannelStatus/impl/MerchantChannelStatusServiceImpl.java
new file mode 100644
index 0000000..0a75f3d
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantChannelStatus/impl/MerchantChannelStatusServiceImpl.java
@@ -0,0 +1,448 @@
+package cn.pluss.platform.merchantChannelStatus.impl;
+
+import cn.pluss.platform.SubMerchantApplyOrderService;
+import cn.pluss.platform.channel.MerchProtocolService;
+import cn.pluss.platform.channel.MerchantAuditService;
+import cn.pluss.platform.channel.MerchantCertService;
+import cn.pluss.platform.converter.Converter;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.AccountMapper;
+import cn.pluss.platform.mapper.MerchantChannelStatusMapper;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantChannel.MerchantChannelService;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.notice.NoticeService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.user.impl.GeneralPushUtil;
+import cn.pluss.platform.vo.ChannelStatusVO;
+import cn.pluss.platform.vo.UserNumVO;
+import cn.pluss.platform.wx.WxTalkService;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.Setter;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.context.annotation.Primary;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.*;
+
+/**
+ * @author DJH
+ */
+@Service
+@Primary
+public class MerchantChannelStatusServiceImpl extends ServiceImpl<MerchantChannelStatusMapper, MerchantChannelStatus> implements MerchantChannelStatusService {
+
+    @Setter(onMethod_ = {@Autowired, @Lazy})
+    private MerchantCertService ysCertV2Service;
+
+    @Autowired
+    private MerchantCertService sxfCertService;
+
+    @Setter(onMethod_ = {@Autowired, @Lazy})
+    private MerchantCertService ryxCertService;
+
+    @Autowired @Lazy
+    private MerchantAuditService ysAuditServiceV2;
+
+    @Autowired
+    @Qualifier("ysAuditServiceV2")
+    @Lazy
+    private MerchProtocolService ysMerchProtocolService;
+
+    @Autowired @Lazy
+    private MerchantChannelService merchantChannelService;
+
+    @Setter(onMethod_ = {@Autowired, @Lazy})
+    private NoticeService noticeService;
+
+    @Setter(onMethod_ = {@Autowired, @Lazy})
+    private SubMerchantApplyOrderService smaoService;
+
+    @Setter(onMethod_ = {@Autowired, @Lazy})
+    private MerchantBaseInfoService mbiService;
+
+    @Autowired
+    private WxTalkService wxTalkService;
+
+    @Setter(onMethod_ = {@Autowired, @Lazy})
+    private UserAppService userAppService;
+
+    @Resource
+    private AccountMapper accountMapper;
+
+    @Autowired
+    private GeneralPushUtil generalPushUtil;
+
+
+    @Override
+    public MerchantChannelStatus auditCheck(String merchantCode) {
+        // 1、获取所有有效通道下
+        LambdaQueryWrapper<MerchantChannel> qWrapper1 = Wrappers.lambdaQuery();
+        qWrapper1.eq(MerchantChannel::getStatus, "1");
+        List<MerchantChannel> validChannelList = merchantChannelService.list(qWrapper1);
+
+        // 2、获取有效通道下该商户的所有进件记录
+        List<Integer> channelList = new ArrayList<>();
+        validChannelList.forEach( item -> channelList.add(item.getId()));
+        LambdaQueryWrapper<MerchantChannelStatus> qWrapper2 = Wrappers.lambdaQuery();
+        qWrapper2.eq(MerchantChannelStatus::getMerchantCode, merchantCode)
+                .and(wrapper -> wrapper.in(MerchantChannelStatus::getChannel, channelList)
+                        .or()
+                        .isNull(MerchantChannelStatus::getChannel)
+                );
+        List<MerchantChannelStatus> channelStatusList = list(qWrapper2);
+
+        int inChannelCount = 0;
+        int auditSucCount = 0;
+        for (MerchantChannelStatus item : channelStatusList) {
+            MerchantChannelStatus.checkReqAudit(item);
+
+            if (item.getChannel() != null) {
+                inChannelCount++;
+            }
+
+            if (item.getStatus().equals(MerchantChannelStatus.AUDIT_STATUS_SUCCESS)) {
+                auditSucCount++;
+                continue;
+            }
+
+            if (item.getStatus().equals(MerchantChannelStatus.AUDIT_STATUS_REJECT)
+                    || item.getStatus().equals(MerchantChannelStatus.AUDIT_STATUS_RESET)) {
+                return item;
+            }
+        }
+
+        // 当前D0、D1各只支持一个
+        if (inChannelCount >= 2) {
+            throw new MsgException("请勿重复进件");
+        }
+
+        if (auditSucCount == channelList.size()) {
+            throw new MsgException("全部通道进件已通过，请勿重复进件");
+        }
+
+        return null;
+    }
+
+    @Override
+    public MerchantChannelStatus getSxfMerchantStatusInfo(String merchantCode) {
+        MerchantChannelStatus merchantChannelStatus = new MerchantChannelStatus().setMerchantCode(merchantCode).setChannel(1);
+        merchantChannelStatus = baseMapper.selectOne(new QueryWrapper<>(merchantChannelStatus));
+        return merchantChannelStatus;
+    }
+
+    @Override
+    public void reqAudit(String merchantCode) {
+        MerchantChannelStatus mcs = auditCheck(merchantCode);
+
+        MerchantBaseInfo mbiEntity = mbiService.getMerchantBaseInfoByMerchantCode(merchantCode);
+
+        if (mcs == null) {
+            mcs = new MerchantChannelStatus();
+            mcs.setMerchantCode(merchantCode);
+        }
+
+        // 小微要做单D0校验
+        if ("1".equals(mbiEntity.getMerchantType())) {
+            MerchantChannelStatus d1Merch = getByMerchantCodeAndChannelType(merchantCode, Account.CHANNEL_TYPE_D1);
+
+            if (d1Merch != null) {
+                switch (d1Merch.getStatus()) {
+                    case MerchantChannelStatus.AUDIT_STATUS_EXAMINING:
+                        throw new MsgException("进件审核中");
+                    case MerchantChannelStatus.AUDIT_STATUS_SUCCESS:
+                        // d1已进件通过, 此时说明需求进件的是银盛
+                        MerchantBaseInfo mbi = mbiService.getMerchantBaseInfoByMerchantCode(merchantCode);
+
+                        int ysCount = accountMapper.selectYSAuditSmallCount(mbi.getUserId());
+                        if (ysCount >= 2) {
+                            throw new MsgException("非营业执照商户同一结算人仅可申请两次实时到账");
+                        }
+                        break;
+                    default:
+                        break;
+                }
+            }
+        }
+
+
+        mcs.setStatus(MerchantChannelStatus.AUDIT_STATUS_EXAMINING);
+        mcs.setThirdStatus(MerchantChannelStatus.AUDIT_THIRD_STATUS_WAITING);
+
+        String remark = mcs.getRemark();
+        if (StringUtils.isBlank(remark)) {
+            mcs.setRemark("待后台审核");
+        }
+
+        saveOrUpdate(mcs);
+
+        UserApp userApp = new UserApp().setMerchantCode(merchantCode).setUserType("promoter");
+        userApp = userAppService.queryUserApp(userApp);
+
+        wxTalkService.sendAuditAlert(userApp.getUserId() + "");
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void rejectAudit(String merchantCode, String errMsg) {
+        MsgException.checkBlank(errMsg, "请补充驳回原因");
+
+        List<Integer> validChannelIdList = merchantChannelService.getValidChannelIdList();
+        LambdaQueryWrapper<MerchantChannelStatus> qWrapper = new LambdaQueryWrapper<MerchantChannelStatus>()
+                .eq(MerchantChannelStatus::getMerchantCode, merchantCode)
+                .and(wrapper -> wrapper.in(MerchantChannelStatus::getChannel, validChannelIdList)
+                        .or()
+                        .isNull(MerchantChannelStatus::getChannel))
+                .eq(MerchantChannelStatus::getStatus, "1")
+                .eq(MerchantChannelStatus::getThirdStatus, "-100");
+
+        MerchantChannelStatus merchantChannelStatus = getOne(qWrapper);
+
+        MerchantChannelStatus.checkCanAudit(merchantChannelStatus);
+
+        // 添加行数据锁
+        merchantChannelStatus = baseMapper.getByIdLock(merchantChannelStatus.getId());
+
+        //
+        merchantChannelStatus.setStatus(MerchantChannelStatus.AUDIT_STATUS_RESET);
+        merchantChannelStatus.setRemark(errMsg);
+        merchantChannelStatus.setCallbackStatus("1");
+        merchantChannelStatus.setUpdateTime(new Date());
+        updateById(merchantChannelStatus);
+
+        UserApp userApp = new UserApp().setMerchantCode(merchantCode).setUserType("promoter");
+        userApp = userAppService.queryUserApp(userApp);
+
+        Notice notice = new Notice(1, 1, userApp);
+        notice.setNoticeCode(System.currentTimeMillis() + "");
+        notice.setUniqueKey(System.currentTimeMillis() + "");
+        notice.setCreateDt(new Date());
+        notice.setConrtent("商户进件驳回, " + errMsg);
+        noticeService.saveNotice(notice);
+
+        generalPushUtil.sendAllPlatByAlias(Collections.singletonList(userApp.getUserId() + ""), "收银呗审核通知", errMsg, "1");
+
+        // 机器人发送已处理的信息到群组
+        wxTalkService.sendAuditResultAlert(userApp.getUserId() + "");
+    }
+
+    @Override
+    public ChannelStatusVO appQuickCash() {
+        UserApp userApp = userAppService.queryUserAppByToken();
+
+        MerchantChannelStatus one = getByMerchantCode(userApp.getMerchantCode(), 4);
+        if (one != null && one.getStatus().equals(MerchantChannelStatus.AUDIT_STATUS_WAITING_SIGN)) {
+            try {
+                Map<String, Object> map = new HashMap<>();
+                map.put("sysFlowId", one.getApplicationId());
+                ysAuditServiceV2.merchantAuditResult(map);
+                one = getByMerchantCode(userApp.getMerchantCode(), 4);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+
+        ChannelStatusVO result = Converter.INSTANCE.toVO(one);
+        if (result == null) {
+            result = new ChannelStatusVO();
+            result.setChannel(4);
+            result.setHasQuickCash(true);
+            result.setStatus(MerchantChannelStatus.AUDIT_STATUS_RESET);
+        } else {
+            result.setHasQuickCash(true);
+        }
+
+        /*
+         * 操作
+         */
+        if (MerchantChannelStatus.AUDIT_STATUS_QUICK_CASH.equals(result.getStatus())) {
+            result.setStatus(MerchantChannelStatus.AUDIT_STATUS_EXAMINING);
+        }
+
+        return result;
+    }
+
+    @Override
+    public ChannelStatusVO appSwitchChannel(int flag) {
+        UserApp userApp = userAppService.queryUserAppByToken();
+
+        // 将所有通道的优先级设为0
+        LambdaUpdateWrapper<MerchantChannelStatus> uWrapper = Wrappers.lambdaUpdate();
+        uWrapper.eq(MerchantChannelStatus::getMerchantCode, userApp.getMerchantCode())
+                .ne(MerchantChannelStatus::getValid, MerchantChannelStatus.VALID_STATUS_BAN)
+                .set(MerchantChannelStatus::getValid, 0);
+        update(uWrapper);
+
+        LambdaQueryWrapper<MerchantChannelStatus> qWrapper = Wrappers.lambdaQuery();
+
+        if (flag == 1) {
+            qWrapper.eq(MerchantChannelStatus::getVirChannelFlag, Account.CHANNEL_TYPE_D0)
+                    .eq(MerchantChannelStatus::getMerchantCode, userApp.getMerchantCode());
+
+            MerchantChannelStatus quickChannel = getOne(qWrapper);
+
+            MsgException.checkNull(quickChannel, "暂未开通快速通道");
+
+            MsgException.checkEquals(quickChannel.getValid(), MerchantChannelStatus.VALID_STATUS_BAN, quickChannel.getRemark());
+
+            if (!MerchantChannelStatus.isAudited(quickChannel)) {
+                throw new MsgException("当前状态暂不允许切换通道");
+            }
+
+            quickChannel.setValid(1);
+            updateById(quickChannel);
+
+            LambdaQueryWrapper<SubMerchantApplyOrder> qWrapper2 = Wrappers.lambdaQuery();
+            qWrapper2.eq(SubMerchantApplyOrder::getMerchantCode, quickChannel.getMerchantCode())
+                    .eq(SubMerchantApplyOrder::getChannelId, quickChannel.getChannel())
+                    .orderByDesc(SubMerchantApplyOrder::getId)
+                    .last("limit 1");
+            SubMerchantApplyOrder smao = smaoService.getOne(qWrapper2);
+            if (smao == null || !SubMerchantApplyOrder.RES_STATUS_COMPLETE.equals(smao.getResultStatus())) {
+                LambdaUpdateWrapper<MerchantBaseInfo> uWrapper2 = Wrappers.lambdaUpdate();
+                uWrapper2.eq(MerchantBaseInfo::getUserId, userApp.getUserId())
+                        .set(MerchantBaseInfo::getWxCertStatus, "0");
+                mbiService.update(uWrapper2);
+            }
+
+            return Converter.INSTANCE.toVO(quickChannel);
+
+        } else {
+            qWrapper.eq(MerchantChannelStatus::getVirChannelFlag, Account.CHANNEL_TYPE_D1)
+                    .eq(MerchantChannelStatus::getMerchantCode, userApp.getMerchantCode());
+
+            MerchantChannelStatus channelStatus = getOne(qWrapper);
+
+            MsgException.checkNull(channelStatus, "暂未进件");
+
+            String status = channelStatus.getStatus();
+
+            MsgException.checkEquals(channelStatus.getValid(), MerchantChannelStatus.VALID_STATUS_BAN, channelStatus.getRemark());
+
+            if (!MerchantChannelStatus.AUDIT_STATUS_SUCCESS.equals(status) && !MerchantChannelStatus.AUDIT_STATUS_DATA_EDIT.equals(status)) {
+                throw new MsgException("进件暂未通过");
+            }
+
+            channelStatus.setValid(1);
+            updateById(channelStatus);
+
+            LambdaQueryWrapper<SubMerchantApplyOrder> qWrapper2 = Wrappers.lambdaQuery();
+            qWrapper2.eq(SubMerchantApplyOrder::getMerchantCode, channelStatus.getMerchantCode())
+                    .eq(SubMerchantApplyOrder::getChannelId, channelStatus.getChannel())
+                    .orderByDesc(SubMerchantApplyOrder::getStatus)
+                    .orderByDesc(SubMerchantApplyOrder::getUpdateTime)
+                    .last("limit 1");
+            SubMerchantApplyOrder smao = smaoService.getOne(qWrapper2);
+            if (smao == null || !SubMerchantApplyOrder.RES_STATUS_COMPLETE.equals(smao.getResultStatus())) {
+                LambdaUpdateWrapper<MerchantBaseInfo> uWrapper2 = Wrappers.lambdaUpdate();
+                uWrapper2.eq(MerchantBaseInfo::getUserId, userApp.getUserId())
+                        .set(MerchantBaseInfo::getWxCertStatus, "0");
+                mbiService.update(uWrapper2);
+            }
+
+            return Converter.INSTANCE.toVO(channelStatus);
+        }
+    }
+
+    @Override
+    public ChannelStatusVO appCurrent() {
+        UserApp userApp = userAppService.queryUserAppByToken();
+        MerchantChannelStatus entity = getValidData(userApp.getMerchantCode());
+
+        ChannelStatusVO channelStatusVO = Converter.INSTANCE.toVO(entity);
+
+        if (channelStatusVO == null) {
+            channelStatusVO = new ChannelStatusVO();
+            channelStatusVO.setStatus(MerchantChannelStatus.AUDIT_STATUS_REJECT);
+            channelStatusVO.setHasQuickCash(false);
+        } else {
+            channelStatusVO.setHasQuickCash(Objects.equals(channelStatusVO.getChannel(), 4));
+        }
+
+        return channelStatusVO;
+    }
+
+
+    @Override
+    public MerchantChannelStatus getChannelByMerchantId(String merchantId) {
+        QueryWrapper<MerchantChannelStatus> queryWrapper = new QueryWrapper<MerchantChannelStatus>().eq("merchantId",merchantId);
+        return this.baseMapper.selectOne(queryWrapper);
+    }
+
+    @Override
+//    @Async
+    public void verifyWxAuthStatus(MerchantChannelStatus mcs) {
+        if (mcs == null) {
+            return;
+        }
+
+        if (!MerchantChannelStatus.isAudited(mcs)) {
+            return;
+        }
+
+        if (mcs.getChannel() == null) {
+            return;
+        }
+
+        if (StringUtils.isBlank(mcs.getMerchantId())) {
+            return;
+        }
+
+        if (Objects.equals(mcs.getAuthorizationStatus(), MerchantChannelStatus.AUTHORIZATION_STATUS_AUTHORIZED)) {
+            return;
+        }
+
+        switch (mcs.getChannel()) {
+            case 1:
+                sxfCertService.wxCertAuthStatus(mcs.getMerchantId());
+                break;
+            case 3:
+            case 31:
+                ryxCertService.wxCertAuthStatus(mcs.getMerchantId());
+                break;
+            case 4:
+                ysCertV2Service.wxCertAuthStatus(mcs.getMerchantId());
+                break;
+            default:
+                break;
+        }
+    }
+
+    @Override
+    public MerchantChannelStatus getByMerchantId(String mno) {
+        QueryWrapper<MerchantChannelStatus> queryWrapper = new QueryWrapper<MerchantChannelStatus>().eq("merchantId", mno);
+        return baseMapper.selectOne(queryWrapper);
+    }
+
+    @Override
+    public void sendSignMsg(String merchantCode) {
+        MerchantChannelStatus mcs = getByMerchantCode(merchantCode, 4);
+        if (mcs == null) {
+            throw new MsgException("商户信息不存在");
+        }
+
+        if (!MerchantChannelStatus.AUDIT_STATUS_WAITING_SIGN.equals(mcs.getStatus())) {
+            throw new MsgException("非待签约商户禁止该请求");
+        }
+
+        ysMerchProtocolService.sendProtocolMsg(mcs);
+    }
+
+    /**
+     * 当前用户指定时间段 进件商户数量
+     */
+    @Override
+    public UserNumVO getUserNumInfo(Long userId, String date, Integer dateType) {
+        return baseMapper.getUserNumInfo(userId,date,dateType);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantComplaintImage/MerchantComplaintImageService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantComplaintImage/MerchantComplaintImageService.java
new file mode 100644
index 0000000..939e958
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantComplaintImage/MerchantComplaintImageService.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.merchantComplaintImage;
+
+import cn.pluss.platform.entity.MerchantComplaintImage;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 投诉图片信息表 服务类
+ * </p>
+ *
+ * @author bzg
+ * @since 2021-09-14
+ */
+public interface MerchantComplaintImageService extends IService<MerchantComplaintImage> {
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantComplaintImage/impl/MerchantComplaintImageServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantComplaintImage/impl/MerchantComplaintImageServiceImpl.java
new file mode 100644
index 0000000..456b354
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantComplaintImage/impl/MerchantComplaintImageServiceImpl.java
@@ -0,0 +1,20 @@
+package cn.pluss.platform.merchantComplaintImage.impl;
+
+import cn.pluss.platform.entity.MerchantComplaintImage;
+import cn.pluss.platform.mapper.MerchantComplaintImageMapper;
+import cn.pluss.platform.merchantComplaintImage.MerchantComplaintImageService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 投诉图片信息表 服务实现类
+ * </p>
+ *
+ * @author bzg
+ * @since 2021-09-14
+ */
+@Service
+public class MerchantComplaintImageServiceImpl extends ServiceImpl<MerchantComplaintImageMapper, MerchantComplaintImage> implements MerchantComplaintImageService {
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantComplaintRecord/MerchantComplaintRecordService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantComplaintRecord/MerchantComplaintRecordService.java
new file mode 100644
index 0000000..e3ccfc6
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantComplaintRecord/MerchantComplaintRecordService.java
@@ -0,0 +1,25 @@
+package cn.pluss.platform.merchantComplaintRecord;
+
+import cn.pluss.platform.entity.MerchantComplaintRecord;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author bzg
+ * @since 2021-09-14
+ */
+public interface MerchantComplaintRecordService extends IService<MerchantComplaintRecord> {
+
+    /**
+     * @description:分页查询
+     * @date: 2021/9/15 13:41
+     * @param page:
+     * @param record:
+     * @return com.baomidou.mybatisplus.extension.plugins.pagination.Page<cn.pluss.platform.entity.MerchantComplaintRecord>
+     */
+    Page<MerchantComplaintRecord> pageData(Page<MerchantComplaintRecord> page, MerchantComplaintRecord record);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantComplaintRecord/impl/MerchantComplaintRecordServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantComplaintRecord/impl/MerchantComplaintRecordServiceImpl.java
new file mode 100644
index 0000000..273ac1c
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantComplaintRecord/impl/MerchantComplaintRecordServiceImpl.java
@@ -0,0 +1,32 @@
+package cn.pluss.platform.merchantComplaintRecord.impl;
+
+import cn.pluss.platform.entity.MerchantComplaintRecord;
+import cn.pluss.platform.mapper.MerchantComplaintRecordMapper;
+import cn.pluss.platform.merchantComplaintRecord.MerchantComplaintRecordService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author bzg
+ * @since 2021-09-14
+ */
+@Service
+public class MerchantComplaintRecordServiceImpl extends ServiceImpl<MerchantComplaintRecordMapper, MerchantComplaintRecord> implements MerchantComplaintRecordService {
+
+    /**
+     * @description:分页查询
+     * @date: 2021/9/15 13:42
+     * @param page:
+     * @param mcRecord:
+     * @return com.baomidou.mybatisplus.extension.plugins.pagination.Page<cn.pluss.platform.entity.MerchantComplaintRecord>
+     */
+    @Override
+    public Page<MerchantComplaintRecord> pageData(Page<MerchantComplaintRecord> page, MerchantComplaintRecord mcRecord) {
+        return baseMapper.pageData(page,mcRecord);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantDevice/MerchantDeviceService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantDevice/MerchantDeviceService.java
new file mode 100644
index 0000000..75897ae
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantDevice/MerchantDeviceService.java
@@ -0,0 +1,45 @@
+package cn.pluss.platform.merchantDevice;
+
+import java.util.List;
+import java.util.Map;
+
+import cn.pluss.platform.entity.MerchantDevice;
+import cn.pluss.platform.mapper.MerchantDeviceMapper;
+import cn.pluss.platform.vo.DeviceVO;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+public interface MerchantDeviceService extends IService<MerchantDevice> {
+
+    List<MerchantDevice> queryMerchantDevicePage(Map map);
+
+    Integer queryMerchantDevicePageCount(Map map);
+
+    default Page<DeviceVO> pageMerchantDevice(Page<DeviceVO> page, QueryWrapper<Object> queryWrapper) {
+        return ((MerchantDeviceMapper) getBaseMapper()).selectMerchantDevicePage(page, queryWrapper);
+    }
+
+    /**
+     * 
+     * showMerchantDevicePage:(商家设备列表). <br/> 
+     *
+     * @author Administrator 
+     * @param map
+     * @return 
+     * @since JDK 1.8
+     */
+    List<DeviceVO>  showMerchantDevicePage(Map<String,Object> map);
+    
+    /**
+     * 
+     * showMerchantDevicePageCount:(商家设备数量). <br/> 
+     *
+     * @author Administrator 
+     * @param map
+     * @return 
+     * @since JDK 1.8
+     */
+    Integer showMerchantDevicePageCount(Map<String,Object> map);
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantDevice/impl/MerchantDeviceServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantDevice/impl/MerchantDeviceServiceImpl.java
new file mode 100644
index 0000000..0d16f5e
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantDevice/impl/MerchantDeviceServiceImpl.java
@@ -0,0 +1,37 @@
+package cn.pluss.platform.merchantDevice.impl;
+
+import java.util.List;
+import java.util.Map;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import cn.pluss.platform.entity.MerchantDevice;
+import cn.pluss.platform.vo.DeviceVO;
+import cn.pluss.platform.mapper.MerchantDeviceMapper;
+import cn.pluss.platform.merchantDevice.MerchantDeviceService;
+
+@Service("merchantDeviceService")
+public class MerchantDeviceServiceImpl extends ServiceImpl<MerchantDeviceMapper, MerchantDevice> implements MerchantDeviceService {
+
+    @Override
+    public List<MerchantDevice> queryMerchantDevicePage(Map map) {
+        return baseMapper.queryMerchantDevicePage(map);
+    }
+
+    @Override
+    public Integer queryMerchantDevicePageCount(Map map) {
+        return baseMapper.queryMerchantDevicePageCount(map);
+    }
+
+    @Override
+    public List<DeviceVO> showMerchantDevicePage(Map<String, Object> map) {
+        return baseMapper.showMerchantDevicePage(map);
+    }
+
+    @Override
+    public Integer showMerchantDevicePageCount(Map<String, Object> map) {
+        return baseMapper.showMerchantDevicePageCount(map);
+    }
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantGuide/MerchantGuideService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantGuide/MerchantGuideService.java
new file mode 100644
index 0000000..5e083a3
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantGuide/MerchantGuideService.java
@@ -0,0 +1,40 @@
+package cn.pluss.platform.merchantGuide;
+
+import cn.pluss.platform.entity.MerchantGuide;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-10-23
+ */
+public interface MerchantGuideService extends IService<MerchantGuide> {
+
+    /**
+     * 获取话术列表，app接口专用
+     * @return  话术列表
+     */
+    List<MerchantGuide> appList();
+
+    /**
+     * 添加话术列表，app接口专用
+     * @param entity 话术信息
+     */
+    void appSave(MerchantGuide entity);
+
+    /**
+     * 删除自己的话术
+     */
+    void appDel(Integer id);
+
+    /**
+     * 选中话术
+     * @param entity 参数实体类
+     */
+    void appChoose(MerchantGuide entity);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantGuide/impl/MerchantGuideServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantGuide/impl/MerchantGuideServiceImpl.java
new file mode 100644
index 0000000..37fc0d1
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantGuide/impl/MerchantGuideServiceImpl.java
@@ -0,0 +1,142 @@
+package cn.pluss.platform.merchantGuide.impl;
+
+import cn.pluss.platform.entity.MerchantBaseInfo;
+import cn.pluss.platform.entity.MerchantGuide;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.MerchantGuideMapper;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantGuide.MerchantGuideService;
+import cn.pluss.platform.userApp.UserAppService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.Setter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-10-23
+ */
+@Service
+public class MerchantGuideServiceImpl extends ServiceImpl<MerchantGuideMapper, MerchantGuide> implements MerchantGuideService {
+
+    @Setter(onMethod_ = {@Autowired})
+    private UserAppService userAppService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantBaseInfoService merchantBaseInfoService;
+
+    @Override
+    public List<MerchantGuide> appList() {
+        UserApp userApp = userAppService.queryUserAppByToken();
+        return baseMapper.userMerchantGuide(userApp.getMerchantCode(), userApp.getMerchantName());
+    }
+
+    @Override
+    public void appSave(MerchantGuide entity) {
+        UserApp userApp = userAppService.queryUserAppByToken();
+        MerchantBaseInfo merchantBaseInfo = merchantBaseInfoService.getMerchantBaseInfoByUserId(userApp.getUserId() + "");
+
+        entity.setMerchantCode(merchantBaseInfo.getMerchantCode());
+        entity.setMerchantName(merchantBaseInfo.getMerchantName());
+
+        if (entity.getId() != null) {
+            MerchantGuide existData = baseMapper.selectById(entity.getId());
+            entity.setStatus(existData.getStatus());
+            entity.setGuideId(existData.getGuideId());
+        } else {
+            entity.setStatus("0");
+        }
+
+
+        saveOrUpdate(entity);
+    }
+
+    @Override
+    public void appDel(Integer id) {
+        MerchantGuide existData = baseMapper.selectById(id);
+
+        UserApp userApp = userAppService.queryUserAppByToken();
+
+        if (existData == null) {
+            return;
+        }
+
+        if (!existData.getMerchantCode().equals(userApp.getMerchantCode())) {
+            throw new MsgException("拒绝访问");
+        }
+
+        baseMapper.deleteById(id);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void appChoose(MerchantGuide entity) {
+        UserApp userApp = userAppService.queryUserAppByToken();
+        MerchantBaseInfo merchantBaseInfo = merchantBaseInfoService.getMerchantBaseInfoByUserId(userApp.getUserId() + "");
+
+        if (entity.getId() != null) {
+            MerchantGuide existData = baseMapper.selectById(entity.getId());
+
+            if (existData == null) {
+                return;
+            }
+
+            if (!existData.getMerchantCode().equals(userApp.getMerchantCode())) {
+                throw new MsgException("拒绝访问");
+            }
+
+            if ("1".equals(existData.getStatus())) {
+                return;
+            }
+
+            UpdateWrapper<MerchantGuide> updateWrapper = new UpdateWrapper<>();
+            updateWrapper.eq("status", "1");
+            updateWrapper.set("status", "0");
+            updateWrapper.eq("merchantCode", merchantBaseInfo.getMerchantCode());
+            update(updateWrapper);
+
+            existData.setStatus("1");
+            updateById(existData);
+
+        } else {
+            if (entity.getGuideId() == null ) {
+                throw new MsgException("缺少必要参数");
+            }
+
+            UpdateWrapper<MerchantGuide> updateWrapper = new UpdateWrapper<>();
+            updateWrapper.eq("status", "1");
+            updateWrapper.eq("merchantCode", merchantBaseInfo.getMerchantCode());
+            updateWrapper.set("status", "0");
+            update(updateWrapper);
+
+            MerchantGuide existData = new MerchantGuide()
+                    .setGuideId(entity.getGuideId())
+                    .setMerchantCode(merchantBaseInfo.getMerchantCode());
+            existData = getOne(new QueryWrapper<>(existData));
+
+            if (existData != null) {
+                existData.setStatus("1");
+                updateById(existData);
+            } else {
+                existData = new MerchantGuide();
+                existData.setStatus("1");
+                existData.setMerchantName(merchantBaseInfo.getAlias());
+                existData.setMerchantCode(merchantBaseInfo.getMerchantCode());
+                existData.setGuideId(entity.getGuideId());
+                save(existData);
+            }
+        }
+    }
+
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantImage/MerchantImageService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantImage/MerchantImageService.java
new file mode 100644
index 0000000..9c4d95f
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantImage/MerchantImageService.java
@@ -0,0 +1,122 @@
+package cn.pluss.platform.merchantImage;
+
+import cn.pluss.platform.entity.Account;
+import cn.pluss.platform.entity.MerchantImage;
+import cn.pluss.platform.exception.MsgException;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author SSS
+ */
+public interface MerchantImageService extends IService<MerchantImage> {
+
+    /**
+     * 根据用户id获取进件图片信息, 包含结算信息等.
+     * 鉴于某些原因，结算信息相关的图片不再实时保存到当前表中.
+     * 此方法就是用于获取进件需要的所有图片信息
+     *
+     * @param userId 用户id
+     * @return 进件图片资料
+     */
+    default List<MerchantImage> getListOfMerch(String userId) {
+        return getListOfMerch(userId, Account.CHANNEL_TYPE_D1);
+    }
+
+    /**
+     * 根据用户id获取进件图片信息, 包含结算信息等.
+     * 鉴于某些原因，结算信息相关的图片不再实时保存到当前表中.
+     * 此方法就是用于获取进件需要的所有图片信息
+     *
+     * @param userId      用户id
+     * @param channelType 通道类型
+     * @return 进件图片资料
+     */
+    List<MerchantImage> getListOfMerch(String userId, String channelType);
+
+    /**
+     * 保存图片并上传到服务商服务器
+     *
+     * @param merchantCode 商户code
+     * @param url          图片链接
+     * @param type         图片类型
+     */
+    void saveMerchantImageUpload(String merchantCode, String url, String type);
+
+    /**
+     * 根据实体类条件查询记录
+     *
+     * @param merchantImage 实体类条件
+     * @return 记录
+     */
+    default MerchantImage queryMerchantImage(MerchantImage merchantImage) {
+        return getBaseMapper().selectOne(new QueryWrapper<>(merchantImage));
+    }
+
+    /**
+     * 根据实体类条件查询记录
+     *
+     * @param merchantImage 实体类条件
+     * @return 记录
+     */
+    default List<MerchantImage> queryMerchantImageList(MerchantImage merchantImage) {
+        return getBaseMapper().selectList(new QueryWrapper<>(merchantImage));
+    }
+
+    /**
+     * 根据条件查询记录
+     *
+     * @param map 实体类条件
+     * @return 记录
+     */
+    default List<MerchantImage> queryMerchantImagePage(Map<String, Object> map) {
+        QueryWrapper<MerchantImage> qWrapper = new QueryWrapper<>();
+        qWrapper.allEq(map);
+        return getBaseMapper().selectList(qWrapper);
+    }
+
+    /**
+     * 根据条件查询条数
+     *
+     * @param map 实体类条件
+     * @return 记录
+     */
+    default Integer queryMerchantImagePageCount(Map<String, Object> map) {
+        QueryWrapper<MerchantImage> qWrapper = new QueryWrapper<>();
+        qWrapper.allEq(map);
+        return getBaseMapper().selectCount(qWrapper);
+    }
+
+    /**
+     * 保存多个实例
+     *
+     * @param merchantImageList 图片列表
+     */
+    default void saveMerchantImageBatch(List<MerchantImage> merchantImageList) {
+        for (MerchantImage merchantImage : merchantImageList) {
+            MsgException.checkBlank(merchantImage.getPhotoType(), "缺少图片类型");
+            MsgException.checkBlank(merchantImage.getPicUrl(), "缺少图片链接");
+        }
+
+        for (MerchantImage merchantImage : merchantImageList) {
+            String merchantCode = merchantImage.getMerchantCode();
+            String type = merchantImage.getPhotoType();
+
+            MerchantImage existImage = new MerchantImage();
+            existImage.setMerchantCode(merchantCode);
+            existImage.setPhotoType(type);
+
+            existImage = getOne(new QueryWrapper<>(existImage));
+
+            if (existImage != null) {
+                merchantImage.setId(existImage.getId());
+            }
+
+            saveOrUpdate(merchantImage);
+        }
+    }
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantImage/impl/MerchantImageServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantImage/impl/MerchantImageServiceImpl.java
new file mode 100644
index 0000000..546bb11
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantImage/impl/MerchantImageServiceImpl.java
@@ -0,0 +1,170 @@
+package cn.pluss.platform.merchantImage.impl;
+
+import cn.pluss.platform.IdCardService;
+import cn.pluss.platform.channel.MerchantAuditService;
+import cn.pluss.platform.constants.CommonError;
+import cn.pluss.platform.converter.ImgConverter;
+import cn.pluss.platform.dto.AccountDTO;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.MerchantImageMapper;
+import cn.pluss.platform.merchant.AccountService;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantImage.MerchantImageService;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * @author SSS
+ */
+@Slf4j
+@Service("merchantImageService")
+public class MerchantImageServiceImpl extends ServiceImpl<MerchantImageMapper, MerchantImage> implements MerchantImageService {
+
+    @Lazy
+    @Autowired
+    private MerchantBaseInfoService mbiService;
+
+    @Lazy
+    @Autowired
+    private AccountService accountService;
+
+    @Autowired @Lazy
+    private IdCardService idCardService;
+
+    @Lazy
+    @Autowired
+    private MerchantAuditService sxfMerchantAuditService;
+
+    @Override
+    public List<MerchantImage> getListOfMerch(String userId, String channelType) {
+        MerchantBaseInfo mbi = mbiService.getMerchantBaseInfoByUserId(userId);
+        LambdaQueryWrapper<MerchantImage> qWrapper = Wrappers.lambdaQuery();
+        qWrapper.eq(MerchantImage::getMerchantCode, mbi.getMerchantCode())
+                .notIn(MerchantImage::getPhotoType, MerchantImage.ImageType.SETTLE_IDCARD_FRONT
+                        , MerchantImage.ImageType.SETTLE_IDCARD_BACK
+                        , MerchantImage.ImageType.ACCOUNT_PERMITS
+                        , MerchantImage.ImageType.NON_LEG_SETTLE_AUTH
+                        , MerchantImage.ImageType.BANK_CARD_FRONT
+                        , MerchantImage.ImageType.IDCARD_FRONT
+                        , MerchantImage.ImageType.IDCARD_BACK);
+        List<MerchantImage> miList = list(qWrapper);
+
+        AccountDTO accountDTO = accountService.getRealAccount(userId, channelType);
+
+        MsgException.checkNull(accountDTO.getIdcard(), CommonError.NO_ACCOUNT_ID_CARD);
+        MsgException.checkBlank(accountDTO.getIdcard().getImgPositive(), CommonError.NO_PART_ACCOUNT_ID_CARD_HEAD);
+        MsgException.checkBlank(accountDTO.getIdcard().getImgNegative(), CommonError.NO_PART_ACCOUNT_ID_CARD_EMBLEM);
+
+        MsgException.checkNull(accountDTO.getBankCard(), CommonError.NO_ACCOUNT_BANK_CARD);
+        if (accountDTO.getBankCard().getAccountType().equals(BankCard.ACCOUNT_TYPE_CORPORATE)) {
+            // 对公
+            MsgException.checkBlank(accountDTO.getBankCard().getLicenseUrl(), CommonError.NO_ACCOUNT_BANK_CARD_LICENSE);
+        } else {
+            // 对私
+            MsgException.checkBlank(accountDTO.getBankCard().getImgUrl(), CommonError.NO_ACCOUNT_BANK_CARD_IMG);
+        }
+
+        if (accountDTO.getSettleType().startsWith(Account.SETTLE_TYPE_PRIVATE_ILLEGAL)) {
+            // 非法人结算需要非法人授权函
+            MsgException.checkBlank(accountDTO.getCertificateUrl(), CommonError.NO_ILLEGAL_ACCOUNT_CERTIFICATE_URL);
+
+            MerchantImage mi = new MerchantImage();
+            mi.setPicUrl(accountDTO.getCertificateUrl());
+            mi.setPhotoType(MerchantImage.ImageType.NON_LEG_SETTLE_AUTH);
+            miList.add(mi);
+        }
+
+        MerchantImage mi = new MerchantImage();
+        mi.setPicUrl(accountDTO.getIdcard().getImgPositive());
+        mi.setPhotoType(MerchantImage.ImageType.SETTLE_IDCARD_FRONT);
+        miList.add(mi);
+
+        mi = new MerchantImage();
+        mi.setPicUrl(accountDTO.getIdcard().getImgNegative());
+        mi.setPhotoType(MerchantImage.ImageType.SETTLE_IDCARD_BACK);
+        miList.add(mi);
+
+        mi = new MerchantImage();
+        if (accountDTO.getBankCard().getAccountType().equals(BankCard.ACCOUNT_TYPE_CORPORATE)) {
+            mi.setPicUrl(accountDTO.getBankCard().getLicenseUrl());
+            mi.setPhotoType(MerchantImage.ImageType.ACCOUNT_PERMITS);
+        } else {
+            mi.setPicUrl(accountDTO.getBankCard().getImgUrl());
+            mi.setPhotoType(MerchantImage.ImageType.BANK_CARD_FRONT);
+        }
+        miList.add(mi);
+
+        IdCard legalIdCard = idCardService.getLegalIdCard(userId);
+        if (legalIdCard == null) {
+            legalIdCard = accountDTO.getIdcard();
+        }
+        mi = new MerchantImage();
+        mi.setPicUrl(legalIdCard.getImgPositive());
+        mi.setPhotoType(MerchantImage.ImageType.IDCARD_FRONT);
+        miList.add(mi);
+
+        mi = new MerchantImage();
+        mi.setPicUrl(legalIdCard.getImgNegative());
+        mi.setPhotoType(MerchantImage.ImageType.IDCARD_BACK);
+        miList.add(mi);
+
+        return miList;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void saveMerchantImageUpload(String merchantCode, String url, String type) {
+
+        // 保存图片信息
+        MerchantImage merchantImage;
+
+        MerchantImage existImage = new MerchantImage().setMerchantCode(merchantCode)
+                .setPhotoType(type);
+
+        existImage = getOne(new QueryWrapper<>(existImage));
+
+        if (existImage != null) {
+            merchantImage = existImage;
+        } else {
+            merchantImage = new MerchantImage();
+            merchantImage.setMerchantCode(merchantCode);
+            merchantImage.setPhotoType(type);
+            merchantImage.setCreateDt(new Date());
+        }
+
+        merchantImage.setPicUrl(url);
+        merchantImage.setUpdateDt(new Date());
+        saveOrUpdate(merchantImage);
+        // 上传图片到通道商服务器
+//        sxfMerchantAuditService.imageUpload(merchantImage);
+    }
+
+    @Override
+    public boolean saveOrUpdate(MerchantImage entity) {
+        MsgException.checkBlank(entity.getMerchantCode(), "缺少商户code");
+        MsgException.checkBlank(entity.getPhotoType(), "缺少图片类型");
+        MsgException.checkBlank(entity.getPicUrl(), "缺少图片链接");
+
+        // 获取已经存在的数据
+        MerchantImage existData = ImgConverter.INSTANCE.imgCopy(entity);
+        existData.setPicUrl(null);
+        existData = getOne(new QueryWrapper<>(existData));
+
+        Optional.ofNullable(existData).ifPresent(merchantImage -> entity.setId(merchantImage.getId()));
+
+        return super.saveOrUpdate(entity);
+    }
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantIncome/MerchantIncomeService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantIncome/MerchantIncomeService.java
new file mode 100644
index 0000000..e34dafb
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantIncome/MerchantIncomeService.java
@@ -0,0 +1,66 @@
+package cn.pluss.platform.merchantIncome;
+
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.dto.LeshuaBillsDTO;
+import cn.pluss.platform.entity.MakeMoney;
+import cn.pluss.platform.entity.MerchantIncome;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.mapper.MerchantIncomeMapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.text.ParseException;
+import java.util.List;
+import java.util.Map;
+
+public interface MerchantIncomeService extends IService<MerchantIncome> {
+
+    default MerchantIncome queryMerchantIncome(MerchantIncome merchantIncome) {
+        return getBaseMapper().selectOne(new QueryWrapper<>(merchantIncome));
+    }
+
+    default void saveMerchantIncome(MerchantIncome merchantIncome) {
+        getBaseMapper().insert(merchantIncome);
+    }
+
+    default void updateMerchantIncome(MerchantIncome merchantIncome) {
+        getBaseMapper().updateById(merchantIncome);
+    }
+
+    default void deleteMerchantIncome(MerchantIncome merchantIncome) {
+        getBaseMapper().deleteById(merchantIncome.getId());
+    }
+
+    default List<MerchantIncome> queryMerchantIncomePage(Map map) {
+        return ((MerchantIncomeMapper)getBaseMapper()).queryMerchantIncomePage(map);
+    }
+
+    default Integer queryMerchantIncomePageCount(Map map) {
+        return ((MerchantIncomeMapper)getBaseMapper()).queryMerchantIncomePageCount(map);
+    }
+
+    /**
+     * 查询乐刷打款账单
+     *
+     * @param leshuaBillsDTO
+     * @return
+     */
+    PageInfo<MakeMoney> queryLeshuaBills(LeshuaBillsDTO leshuaBillsDTO) throws ParseException;
+
+    /**
+     * 查询余额, 按天获取
+     *
+     * @param merchantCode 商户code
+     * @param startTime    开始时间，年月日
+     * @param endTime      结束时间，年月日
+     */
+    Map<String, Object> queryTotalEnterFee(String merchantCode, String startTime, String endTime);
+
+
+    /**
+     * 查询商家最后的五条收入记录
+     * @return
+     */
+    List<MerchantIncome> queryLastFiveMerchantIncome2(UserApp userApp);
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantIncome/impl/MerchantIncomeServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantIncome/impl/MerchantIncomeServiceImpl.java
new file mode 100644
index 0000000..8ea6fd3
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantIncome/impl/MerchantIncomeServiceImpl.java
@@ -0,0 +1,261 @@
+package cn.pluss.platform.merchantIncome.impl;
+
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.dto.LeshuaBillsDTO;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.*;
+import cn.pluss.platform.merchant.StaffPermissionService;
+import cn.pluss.platform.merchantChannel.MerchantChannelService;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.merchantIncome.MerchantIncomeService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.util.PageUtils;
+import cn.pluss.platform.util.StringUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import org.apache.commons.lang3.time.DateUtils;
+import org.apache.commons.lang3.time.FastDateFormat;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.text.ParseException;
+import java.util.*;
+
+@RequiredArgsConstructor
+@Service
+public class MerchantIncomeServiceImpl extends ServiceImpl<MerchantIncomeMapper, MerchantIncome> implements MerchantIncomeService {
+
+    private final MakeMoneyMapper makeMoneyMapper;
+
+    private final UserAppMapper userAppMapper;
+    private final MerchantBaseInfoMapper merchantBaseInfoMapper;
+    private final MerchantOrderMapper merchantOrderMapper;
+
+    @Setter(onMethod_ = {@Lazy, @Autowired})
+    private UserAppService userAppService;
+
+    private final MerchantChannelStatusService mcsService;
+
+    private final MerchantChannelService merchantChannelService;
+
+    @Autowired
+    private StaffPermissionService staffPermissionService;
+
+    @Override
+    public PageInfo<MakeMoney> queryLeshuaBills(LeshuaBillsDTO leshuaBillsDTO) throws ParseException {
+        int size = 20;
+
+        if (leshuaBillsDTO.getPageNo() == null || leshuaBillsDTO.getPageNo() == 0) {
+            leshuaBillsDTO.setPageNo(1);
+        }
+
+        UserApp uaToken = userAppService.queryUserAppByToken();
+        if ("staff".equals(uaToken.getUserType()) && !"1".equals(uaToken.getPermissionBill()))  {
+            return new PageInfo<>(0L, 1L, 1L, 10L, new ArrayList<>());
+        }
+
+        LambdaQueryWrapper<MerchantChannelStatus> qW = Wrappers.lambdaQuery();
+        qW.select(MerchantChannelStatus::getMerchantId);
+        qW.eq(MerchantChannelStatus::getMerchantCode, uaToken.getMerchantCode())
+                .in(MerchantChannelStatus::getStatus, MerchantChannelStatus.AUDIT_STATUS_SUCCESS, MerchantChannelStatus.AUDIT_STATUS_DATA_EDIT);
+
+        List<Map<String, Object>> merchantIdListMap = mcsService.listMaps(qW);
+        if (merchantIdListMap.size() == 0) {
+            Page<MakeMoney> page = new Page<>(leshuaBillsDTO.getPageNo(), size);
+            return PageUtils.page(page);
+        }
+
+        List<String> merchantIdList = new ArrayList<>();
+        for (Map<String, Object> merchantId : merchantIdListMap) {
+            if (merchantId != null && merchantId.get("merchantId") != null) {
+                merchantIdList.add((String) merchantId.get("merchantId"));
+            }
+        }
+
+        Page<MakeMoney> page = new Page<>(leshuaBillsDTO.getPageNo(), size);
+        QueryWrapper<MakeMoney> queryWrapper = new QueryWrapper<>();
+        List<MerchantChannel> list;
+        if (!"staff".equals(uaToken.getUserType())) {
+            queryWrapper.and(wrapper ->
+                    wrapper.eq("nrr.userId", uaToken.getUserId())
+                    .or().isNull("nrr.userId"));
+        }
+
+        queryWrapper.in("mm.merchantId", merchantIdList);
+        queryWrapper.orderByDesc("mm.createTime");
+        page = makeMoneyMapper.selectPage(page, queryWrapper);
+        list = merchantChannelService.list();
+
+        LambdaQueryWrapper<MerchantChannelStatus> lambdaQueryWrapper = Wrappers.lambdaQuery();
+        lambdaQueryWrapper.eq(MerchantChannelStatus::getMerchantCode, uaToken.getMerchantCode());
+        lambdaQueryWrapper.eq(MerchantChannelStatus::getMerchantId, leshuaBillsDTO.getMerchantId());
+        MerchantChannelStatus merchantChannelStatus = mcsService.getOne(lambdaQueryWrapper);
+
+        if (merchantChannelStatus == null) {
+            throw new MsgException("商编异常");
+        }
+
+        for (MakeMoney l : page.getRecords()) {
+            l.setRealAmount(StringUtil.bigDecimal(l.getRealAmount() * 0.01));
+            l.setSuspendAmount(StringUtil.bigDecimal(l.getSuspendAmount() * 0.01));
+            l.setPlanAmount(StringUtil.bigDecimal(l.getPlanAmount() * 0.01));
+
+            for (MerchantChannel merchantChannel: list) {
+                if (merchantChannelStatus.getChannel().equals(merchantChannel.getId())) {
+                    l.setChannelName(merchantChannel.getChannelName());
+                }
+            }
+
+            if ("staff".equals(uaToken.getUserType())) {
+                l.setReadStatus(1);
+            }
+        }
+
+        LambdaQueryWrapper<UserApp> lambdaQueryWrapper2 = Wrappers.lambdaQuery();
+        lambdaQueryWrapper2.eq(UserApp::getMerchantCode, merchantChannelStatus.getMerchantCode());
+        lambdaQueryWrapper2.eq(UserApp::getUserType, "promoter");
+        UserApp userApp = userAppMapper.selectOne(lambdaQueryWrapper2);
+
+        if (page.getRecords().size() == 0) {
+            return PageUtils.page(page);
+        }
+
+        String start = page.getRecords().get(page.getRecords().size() - 1).getCreateTime();
+        String end = page.getRecords().get(0).getCreateTime();
+
+        FastDateFormat dateFormat = FastDateFormat.getInstance("yyyy-MM-dd", Locale.CHINA);
+        Date startTime = dateFormat.parse(start);
+        startTime = DateUtils.addDays(startTime, -1);
+        Date endTime = dateFormat.parse(end);
+
+        setDailyCount(startTime, endTime, userApp.getMerchantCode(), page.getRecords());
+
+        return PageUtils.page(page);
+    }
+
+    @Override
+    public Map<String, Object> queryTotalEnterFee(String merchantCode, String startTime, String endTime) {
+        if (merchantCode == null || StringUtil.isEmpty(merchantCode)) {
+            UserApp tokenUa = userAppService.queryUserAppByToken();
+            merchantCode = tokenUa.getMerchantCode();
+        }
+        MerchantBaseInfo queryMerchantBaseInfo = new MerchantBaseInfo();
+        queryMerchantBaseInfo.setMerchantCode(merchantCode);
+        queryMerchantBaseInfo = merchantBaseInfoMapper.queryMerchantBaseInfo(queryMerchantBaseInfo);
+        if (queryMerchantBaseInfo == null) {
+            throw new MsgException("该商家不存在！");
+        }
+        //校验日期格式是否正确
+        if (!cn.pluss.platform.util.DateUtils.isDate(startTime, "yyyy-MM-dd")) {
+            throw new MsgException("开始时间格式不正确！");
+        }
+        if (!cn.pluss.platform.util.DateUtils.isDate(endTime, "yyyy-MM-dd")) {
+            throw new MsgException("结束时间格式不正确！");
+        }
+
+        QueryWrapper<MerchantOrder> queryWrapper = new QueryWrapper<MerchantOrder>()
+                .between("updateTime", startTime + " 00:00:00", endTime + " 23:59:59")
+                .eq("merchantCode", merchantCode)
+                .ne("settlementType", 0)
+                .in("status", "1", "2");
+
+        Map<String, Object> sumMap = merchantOrderMapper.getSumEnterFee(queryWrapper);
+
+        BigDecimal totalIncomeFee = new BigDecimal(sumMap.get("fee").toString());
+
+        // 返回参数
+        Map<String, Object> returnMap = new HashMap<>();
+        returnMap.put("totalIncomeFee", totalIncomeFee);
+
+        return returnMap;
+    }
+
+    @Override
+    public List<MerchantIncome> queryLastFiveMerchantIncome2(UserApp userApp) {
+        UserApp tokenUa = userAppService.queryUserAppByToken();
+
+        // step 1. 查出最后五条收款记录
+        MerchantOrder merchantOrder = new MerchantOrder()
+                .setMerchantCode(userApp.getMerchantCode())
+                .setStatus("1");
+        LambdaQueryWrapper<MerchantOrder> queryWrapper = Wrappers.lambdaQuery(merchantOrder);
+        queryWrapper.orderByDesc(MerchantOrder::getCreateDt)
+                .last("limit 5");
+
+        if ("staff".equals(tokenUa.getUserType())) {
+            StaffPermission entity = staffPermissionService.getEntity(tokenUa.getUserId(), userApp.getMerchantCode());
+            if ("0".equals(entity.getPermissionBill())) {
+                queryWrapper.eq(MerchantOrder::getStaffCode, tokenUa.getUserId());
+            }
+        }
+
+        List<MerchantOrder> merchantOrderList = merchantOrderMapper.selectList(queryWrapper);
+
+        // step 2. 将merchantOrder信息转换成merchantIncome
+        List<MerchantIncome> result = new ArrayList<>();
+        for (MerchantOrder item : merchantOrderList) {
+            MerchantIncome merchantIncome = new MerchantIncome();
+            merchantIncome.setMerchantCode(item.getMerchantCode());
+            merchantIncome.setMerchantName(item.getMerchantName());
+            merchantIncome.setStoreName(item.getStoreName());
+            merchantIncome.setStoreId(item.getStoreId());
+            merchantIncome.setDealFee(item.getConsumeFee());
+            // TODO 这里暂定为交易金额，因为已存在数据库的消息记录里面都是这样的数据
+            merchantIncome.setIncomeFee(item.getConsumeFee());
+            merchantIncome.setCreateTime(item.getUpdateTime());
+            merchantIncome.setPayTypeCode(item.getPayTypeCode());
+            merchantIncome.setDealCode(item.getOrderNumber());
+
+            if (MerchantOrder.isVipRecharge(item)) {
+                merchantIncome.setPayTypeName("会员充值");
+            } else {
+                String payTypeName = item.getPayTypeName();
+                payTypeName = payTypeName.replaceAll("随行付|随行|乐刷|支付$", "");
+                merchantIncome.setPayTypeName(payTypeName);
+            }
+
+            result.add(merchantIncome);
+        }
+
+        return result;
+    }
+
+    /**
+     * 查询每日的总流水，并放入结果集中
+     *
+     * @param start        开始时间
+     * @param end          截止时间
+     * @param merchantCode 店铺code
+     * @param targetList   结算信息
+     */
+    private void setDailyCount(Date start, Date end, String merchantCode, List<MakeMoney> targetList) {
+        List<Map<String, Object>> dailyCountList = merchantOrderMapper.queryDailyCount(merchantCode, start, end);
+
+        for (MakeMoney makeMoney : targetList) {
+            for (Map<String, Object> dailyCount : dailyCountList) {
+                java.lang.String billDate = makeMoney.getCreateTime().substring(0, 10);
+                String dailyDate;
+                if (dailyCount.get("date") instanceof byte[]) {
+                    dailyDate = new String((byte[]) dailyCount.get("date"));
+                } else {
+                    dailyDate = dailyCount.get("date").toString();
+                }
+
+                if (billDate.equals(dailyDate)) {
+                    makeMoney.setConsumeFeeSum(BigDecimal.valueOf((double) dailyCount.get("consumeFeeSum")));
+                    dailyCountList.remove(dailyCount);
+                    break;
+                }
+            }
+        }
+    }
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantMarket/MerchantMarketService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantMarket/MerchantMarketService.java
new file mode 100644
index 0000000..882c2cd
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantMarket/MerchantMarketService.java
@@ -0,0 +1,32 @@
+package cn.pluss.platform.merchantMarket;
+
+import cn.pluss.platform.entity.MerchantMarket;
+import cn.pluss.platform.entity.MerchantOrder;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 商户奖励金记录表 服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-11-02
+ */
+public interface MerchantMarketService extends IService<MerchantMarket> {
+
+    /**
+     * 获取奖励金额度
+     * @param userId
+     * @return
+     */
+    BigDecimal getCountMarketAmt(Long userId);
+//
+//    /**
+//     * bst积分返惭怍
+//     * @date: 2022/2/14 10:56
+//     * @param order:
+//     */
+//    void bstOrderIntegralReward(MerchantOrder order);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantMarket/impl/MerchantMarketServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantMarket/impl/MerchantMarketServiceImpl.java
new file mode 100644
index 0000000..37dab16
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantMarket/impl/MerchantMarketServiceImpl.java
@@ -0,0 +1,105 @@
+package cn.pluss.platform.merchantMarket.impl;
+
+import cn.pluss.platform.deviceMerchantBuy.DeviceMerchantBuyService;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.enums.UserRoleEnum;
+import cn.pluss.platform.mapper.MerchantMarketMapper;
+import cn.pluss.platform.mapper.UserAppMapper;
+import cn.pluss.platform.merchantMarket.MerchantMarketService;
+import cn.pluss.platform.merchantOrder.MerchantOrderService;
+import cn.pluss.platform.merchantStore.MerchantStoreService;
+import cn.pluss.platform.util.StringUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 商户积分记录表 服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-11-02
+ */
+@Service
+@Slf4j
+public class MerchantMarketServiceImpl extends ServiceImpl<MerchantMarketMapper, MerchantMarket> implements MerchantMarketService {
+
+    /**
+     * 获取奖励金额度
+     * @param userId
+     * @return
+     */
+    @Override
+    public BigDecimal getCountMarketAmt(Long userId) {
+        return this.baseMapper.getCountMarketAmt(userId);
+    }
+
+    /**
+     * bst自动返机具积分
+     * @date: 2022/2/14 10:56
+     * @param order:
+     */
+//    @Override
+//    public void bstOrderIntegralReward(MerchantOrder order) {
+//        log.info("【倍斯特】积分返操作开始，订单号:{}",order.getOrderNumber());
+//        try {
+//            String merchantCode = order.getMerchantCode();
+//            if(StringUtil.isEmpty(merchantCode)){
+//                return;
+//            }
+//            UserApp userApp = userAppMapper.selectByMerchantCode(merchantCode);
+//            if(userApp == null || !UserRoleEnum.ZY_BST.getCode().equals(userApp.getRoleCode())){
+//                return;
+//            }
+//            MerchantStore store = merchantStoreService.getStoreByMerchantCode(merchantCode);
+//            if(store == null || !"1".equals(store.getIsMarket())){
+//                return;
+//            }
+//            QueryWrapper<DeviceMerchantBuy> queryDeviceWrapper = new QueryWrapper<DeviceMerchantBuy>()
+//                    .eq("merchantCode",merchantCode).eq("status","1").in("orderAmount",BST_LI_BAO_AMT1,BST_LI_BAO_AMT2);
+//            List<DeviceMerchantBuy> list = deviceMerchantBuyService.list(queryDeviceWrapper);
+//            if(list.isEmpty()){
+//                return;
+//            }
+//            DeviceMerchantBuy deviceMerchantBuy = list.get(0);
+//            QueryWrapper<MerchantMarket> queryWrapper = new QueryWrapper<MerchantMarket>()
+//                    .eq("userId",userApp.getUserId()).eq("source",2);
+//            MerchantMarket merchantMarket = baseMapper.selectOne(queryWrapper);
+//            if(merchantMarket != null){
+//                return;
+//            }
+//            QueryWrapper<MerchantOrder> orderQuery = new QueryWrapper<MerchantOrder>()
+//                    .eq("merchantCode",userApp.getMerchantCode())
+//                    .eq("status","1").select("count(1) as transNum,IFNULL(SUM(consumeFee),0) as transAmt");
+//            Map<String, Object> map = merchantOrderService.getMap(orderQuery);
+//            if(map == null || map.size() == 0){
+//                return;
+//            }
+//            long transNum = (long)map.get("transNum");
+//            double transAmt = (double) map.get("transAmt");
+//            log.info("【倍斯特】积分返操作成功，订单号:{},交易笔数：{}，交易总额：{}",order.getOrderNumber(),transNum,transAmt);
+//            if(transNum >= BST_INTEGRAL_TRANS_NUM || transAmt >= BST_INTEGRAL_TRANS_AMOUNT){
+//                //满足发放积分条件
+//
+//
+////                MerchantMarket market = new MerchantMarket();
+////                market.setUserName(userApp.getUserName());
+////                market.setUserId(userApp.getUserId());
+////                market.setMarketAmt(BigDecimal.valueOf(deviceMerchantBuy.getOrderAmount()));
+////                market.setSource("2");
+////                baseMapper.insert(market);
+////                log.info("【倍斯特】积分返操作成功，订单号:{},用户ID：{}，积分数值：{}",order.getOrderNumber(),userApp.getUserId(),deviceMerchantBuy.getOrderAmount());
+//            }
+//        }catch (Exception e){
+//            e.printStackTrace();
+//            log.error("【倍斯特】积分返异常,异常信息:{}",e.getMessage());
+//        }
+//    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantMemberCode/MerchantMemberCodeService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantMemberCode/MerchantMemberCodeService.java
new file mode 100644
index 0000000..45e3255
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantMemberCode/MerchantMemberCodeService.java
@@ -0,0 +1,28 @@
+package cn.pluss.platform.merchantMemberCode;
+
+import cn.pluss.platform.entity.MerchantMemberCode;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 动态商户会员卡生成记录 服务类
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-06-07
+ */
+public interface MerchantMemberCodeService extends IService<MerchantMemberCode> {
+
+    /**
+     * 根据code查询信息
+     * @param code
+     * @return
+     */
+    MerchantMemberCode getByCode(String code);
+
+    /**
+     * 根据卡号删除会员卡生成记录
+     * @param cardNo
+     */
+    void removeByCardNo(String cardNo);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantMemberCode/impl/MerchantMemberCodeServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantMemberCode/impl/MerchantMemberCodeServiceImpl.java
new file mode 100644
index 0000000..7ba2083
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantMemberCode/impl/MerchantMemberCodeServiceImpl.java
@@ -0,0 +1,30 @@
+package cn.pluss.platform.merchantMemberCode.impl;
+
+import cn.pluss.platform.entity.MerchantMemberCode;
+import cn.pluss.platform.mapper.MerchantMemberCodeMapper;
+import cn.pluss.platform.merchantMemberCode.MerchantMemberCodeService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 动态商户会员卡生成记录 服务实现类
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-06-07
+ */
+@Service
+public class MerchantMemberCodeServiceImpl extends ServiceImpl<MerchantMemberCodeMapper, MerchantMemberCode> implements MerchantMemberCodeService {
+
+
+    @Override
+    public MerchantMemberCode getByCode(String code) {
+        return baseMapper.getByCode(code);
+    }
+
+    @Override
+    public void removeByCardNo(String cardNo) {
+         baseMapper.removeByCardNo(cardNo);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantMenber/MerchantMenberService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantMenber/MerchantMenberService.java
new file mode 100644
index 0000000..af85922
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantMenber/MerchantMenberService.java
@@ -0,0 +1,185 @@
+package cn.pluss.platform.merchantMenber;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.entity.Fans;
+import cn.pluss.platform.entity.MerchantMenber;
+import cn.pluss.platform.mapper.MerchantMenberMapper;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+import java.util.Map;
+
+public interface MerchantMenberService extends IService<MerchantMenber> {
+
+    default MerchantMenber queryMerchantMenber(MerchantMenber merchantMenber) {
+        return ((MerchantMenberMapper) getBaseMapper()).queryMerchantMenber(merchantMenber);
+    }
+
+    default List<MerchantMenber> queryMerchantMenberList(MerchantMenber merchantMenber) {
+        return ((MerchantMenberMapper) getBaseMapper()).queryMerchantMenberList(merchantMenber);
+    }
+
+    default void saveMerchantMenber(MerchantMenber merchantMenber) {
+        ((MerchantMenberMapper) getBaseMapper()).saveMerchantMenber(merchantMenber);
+    }
+
+    default void updateMerchantMenber(MerchantMenber merchantMenber) {
+        ((MerchantMenberMapper) getBaseMapper()).updateMerchantMenber(merchantMenber);
+    }
+
+    default void deleteMerchantMenber(MerchantMenber merchantMenber) {
+        ((MerchantMenberMapper) getBaseMapper()).deleteMerchantMenber(merchantMenber);
+    }
+
+    default List<MerchantMenber> queryMerchantMenberPage(Map map) {
+        return ((MerchantMenberMapper) getBaseMapper()).queryMerchantMenberPage(map);
+    }
+
+    default Integer queryMerchantMenberPageCount(Map map) {
+        return ((MerchantMenberMapper) getBaseMapper()).queryMerchantMenberPageCount(map);
+    }
+
+
+    default Double queryMerchantMenberUsableRechargeFee(Map map) {
+        return ((MerchantMenberMapper) getBaseMapper()).queryMerchantMenberUsableRechargeFee(map) == null ? 0.0 : ((MerchantMenberMapper) getBaseMapper()).queryMerchantMenberUsableRechargeFee(map);
+    }
+
+    default Integer queryMerchantMenberNumByTime(Map map) {
+        return ((MerchantMenberMapper) getBaseMapper()).queryMerchantMenberNumByTime(map);
+    }
+
+    /**
+     * queryMerchantRecharge:(查询商户的账单). <br/>
+     *
+     * @param merchantCode
+     * @param startTime    开始时间
+     * @param endTime      结束时间
+     * @param orderType    0：会员消费，1：会员充值'
+     * @return
+     *
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    default Double queryMerchantMemberBill(String rechargeType, String orderType, String merchantCode, String startTime, String endTime) {
+        return ((MerchantMenberMapper) getBaseMapper()).queryMerchantMemberBill(rechargeType, orderType, merchantCode, startTime, endTime) == null ? 0d : ((MerchantMenberMapper) getBaseMapper()).queryMerchantMemberBill(rechargeType, orderType, merchantCode, startTime, endTime);
+    }
+
+    /**
+     * queryMerchantGiveMoney:(赠送返现金额). <br/>
+     *
+     * @param merchantCode
+     * @return
+     *
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    default Double queryMerchantGiveMoney(String merchantCode) {
+        return ((MerchantMenberMapper) getBaseMapper()).queryMerchantGiveMoney(merchantCode) == null ? 0d : ((MerchantMenberMapper) getBaseMapper()).queryMerchantGiveMoney(merchantCode);
+    }
+
+    /**
+     * manageQueryMerchantMenberPage:(manage). <br/>
+     * 所有粉丝
+     * @param map
+     * @return
+     *
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    default List<MerchantMenber> manageQueryMerchantMenberPage(Map map) {
+        return ((MerchantMenberMapper) getBaseMapper()).manageQueryMerchantMenberPage(map);
+    }
+    //商户粉丝
+    default List<MerchantMenber> manageQueryMerchantNoMenberPage(Map map) {
+        return ((MerchantMenberMapper) getBaseMapper()).manageQueryMerchantNoMenberPage(map);
+    }
+
+    /**
+     * manageQueryMerchantMenberPageCount:(这里用一句话描述这个方法的作用). <br/>
+     *
+     * @param map
+     * @return
+     *
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    default Integer manageQueryMerchantMenberPageCount(Map map) {
+        return ((MerchantMenberMapper) getBaseMapper()).manageQueryMerchantMenberPageCount(map);
+    }
+
+    default Integer manageQueryMerchantNoMenberPageCount(Map map) {
+        return ((MerchantMenberMapper) getBaseMapper()).manageQueryMerchantNoMenberPageCount(map);
+    }
+
+    /**
+     * 返回二维码数据, 图片链接
+     *
+     * @param merchantCode 商户code
+     * @param storeId      店铺id
+     * @param phone        手机号
+     * @param checkCode    验证码
+     * @param nickName     昵称
+     * @param birthday     生日
+     * @return 二维码数据
+     */
+    String queryMemberIsExist(String merchantCode, String storeId, String phone, String checkCode, String nickName, String birthday);
+
+    /**
+     * 返回二维码数据, 链接数据, 需要app上将链接转为二维码
+     *
+     * @param merchantCode 商户code
+     * @param storeId      店铺id
+     * @param phone        手机号
+     * @param checkCode    验证码
+     * @param nickName     昵称
+     * @param birthday     生日
+     * @return 二维码数据
+     */
+    String queryMemberIsExistV2(String merchantCode, String storeId, String phone, String checkCode, String nickName, String birthday);
+
+    /**
+     * 小程序会员开卡
+     * @return
+     */
+    Result<JSONObject> vipOpenCard(JSONObject json);
+
+    List<MerchantMenber> manageMerchantMenberSum(Map<String, Object> newMemberMap);
+
+    List<String> getTitleTips(List<Map<String, Object>> lists);
+
+    /**
+     * 关联查询会员卡列表
+     * @param page
+     * @param menber
+     * @return
+     */
+    Page<MerchantMenber> pageJoinData(Page<MerchantMenber> page, MerchantMenber menber);
+
+    /**
+     * 根据unionId 修改openid
+     * @date: 2021/12/9 17:59
+     * @param openid
+     * @param unionId
+     */
+    void updateByUnionId(String openid,String unionId);
+
+    /**
+     * 发送会员余额变动通知
+     * @date: 2021/12/9 18:44
+     * @param menber:
+     * @param consumeFee:
+     * @param type: 1：会员充值 2：消费 3：现金充值
+     */
+    void sendMenberBalanceChangeNotice(MerchantMenber menber, Double consumeFee, String type);
+
+    /**
+     * 根据会员卡号获取会员信息
+     * @param cardNo
+     * @return
+     */
+    MerchantMenber getByCardNo(String cardNo);
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantMenber/impl/MerchantMenberServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantMenber/impl/MerchantMenberServiceImpl.java
new file mode 100644
index 0000000..ceff722
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantMenber/impl/MerchantMenberServiceImpl.java
@@ -0,0 +1,395 @@
+package cn.pluss.platform.merchantMenber.impl;
+
+import cn.pluss.platform.activityActivate.ActivityActivateService;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.MerchantMenberMapper;
+import cn.pluss.platform.mapper.PhoneValidateCodeMapper;
+import cn.pluss.platform.merchantMenber.MerchantMenberService;
+import cn.pluss.platform.merchantStore.MerchantStoreService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.util.DateUtils;
+import cn.pluss.platform.util.ParametersUtil;
+import cn.pluss.platform.util.StringUtil;
+import cn.pluss.platform.wechat.WechatService;
+import cn.pluss.platform.wechat.WxConstants;
+import cn.pluss.platform.wx.WxAccessTokenRequest;
+import cn.pluss.platform.wx.WxCommonService;
+import cn.pluss.platform.wx.WxTemolateRequest;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@RequiredArgsConstructor
+@Service("merchantMenberService")
+@Slf4j
+public class MerchantMenberServiceImpl extends ServiceImpl<MerchantMenberMapper, MerchantMenber> implements MerchantMenberService{
+
+    private final PhoneValidateCodeMapper phoneValidateCodeMapper;
+    private final MerchantStoreService merchantStoreService;
+    private final ActivityActivateService activityActivateService;
+    private final WechatService wechatService;
+
+    @Autowired
+    private UserAppService userAppService;
+
+    @Resource
+    private WxCommonService wxCommonService;
+
+    private final String default_avatar = "https://syb-resource.oss-cn-hangzhou.aliyuncs.com/微信图片_20210408103257.png?versionId=CAEQKxiBgMCllMC9xRciIDMyZDA3Y2IzNGU5YjQ5ODk5NTlhOGI5MWJjZGNhNTYw";
+
+    @Override
+    public String queryMemberIsExist(String merchantCode, String storeId, String phone, String checkCode, String nickName, String birthday) {
+        PhoneValidateCode queryPhoneValidateCode = new PhoneValidateCode();
+
+        if (StringUtils.isEmpty(checkCode)) {
+            throw new MsgException("请输入验证码！");
+        }
+
+        queryPhoneValidateCode.setPhone(phone);
+        List<PhoneValidateCode> phoneValidateCodes = phoneValidateCodeMapper.queryPhoneValidateCodeList(queryPhoneValidateCode);
+        if (phoneValidateCodes == null || phoneValidateCodes.size() == 0) {
+            throw new MsgException("请先获取验证码！");
+        }
+
+        PhoneValidateCode existValidateCode = phoneValidateCodes.get(0);
+        if (!checkCode.equals(existValidateCode.getCode())) {
+            throw new MsgException("验证码错误！");
+        }
+        // 使用验证码之后删除验证码
+        phoneValidateCodeMapper.deletePhoneValidateCode(existValidateCode);
+
+        MerchantStore ms = new MerchantStore();
+        ms.setMerchantCode(merchantCode);
+        MerchantStore one = merchantStoreService.getOne(new QueryWrapper<>(ms));
+
+        String sceneStr = merchantCode + "," + one.getStoreId() + "," + phone;
+        log.error(sceneStr);
+        Result<String> rQcode = wechatService.getRQcode(sceneStr);
+
+        MerchantStore merchantStore = new MerchantStore().setMerchantCode(merchantCode);
+        merchantStore = merchantStoreService.getOne(new QueryWrapper<>(merchantStore).last("limit 1"));
+
+        storeId = merchantStore.getStoreId();
+
+        if (rQcode.getCode() == 200) {
+            MerchantMenber merchantMemberExist = new MerchantMenber();
+            merchantMemberExist.setStoreId(merchantStore.getStoreId());
+            merchantMemberExist.setMerchantCode(merchantCode);
+            merchantMemberExist.setPhone(phone);
+            List<MerchantMenber> queryMerchantMenberList = queryMerchantMenberList(merchantMemberExist);
+            if (queryMerchantMenberList != null && queryMerchantMenberList.size() > 0) {
+                throw new MsgException("该手机号已经是会员");
+            }
+
+            MerchantMenber merchantMenber = new MerchantMenber();
+            merchantMenber.setPhone(phone);
+            merchantMenber.setNickName(nickName);
+            merchantMenber.setStoreId(merchantStore.getStoreId());
+            merchantMenber.setBirthdayDt(birthday);
+
+            merchantMenber.setBindingUrl(rQcode.getData());
+            ActivityActivate activityActivate = new ActivityActivate();
+            merchantMenber.setMerchantCode(merchantStore.getMerchantCode());
+            merchantMenber.setMerchantName(merchantStore.getMerchantName());
+            merchantMenber.setStoreName(merchantStore.getStoreName());
+            activityActivate.setStoreId(merchantStore.getStoreId());
+            activityActivate.setMerchantCode(merchantStore.getMerchantCode());
+            // 查询门店的激活送
+            List<ActivityActivate> queryActivityActivateList = activityActivateService.queryActivityActivateList(activityActivate);
+            if (queryActivityActivateList != null && queryActivityActivateList.size() > 0) {
+                activityActivate = queryActivityActivateList.get(0);
+                // 赠送金额
+                Double giveMoney = activityActivate.getGiveMoney();
+                merchantMenber.setUsableGiveFee(giveMoney);
+                merchantMenber.setTotalGiveFee(giveMoney);
+            }
+            merchantMenber.setMemberCode("VIP" + StringUtil.getBillno());
+            merchantMenber.setCardNo("VIP" + StringUtil.getBillno());
+            saveMerchantMenber(merchantMenber);
+        }
+        return rQcode.getData();
+    }
+
+    @Override
+    public String queryMemberIsExistV2(String merchantCode, String storeId, String phone, String checkCode, String nickName, String birthday) {
+        UserApp tokenUa = userAppService.queryUserAppByToken();
+        merchantCode = tokenUa.getMerchantCode();
+
+        PhoneValidateCode queryPhoneValidateCode = new PhoneValidateCode();
+
+        if (StringUtils.isEmpty(checkCode)) {
+            throw new MsgException("请输入验证码！");
+        }
+
+        queryPhoneValidateCode.setPhone(phone);
+        List<PhoneValidateCode> phoneValidateCodes = phoneValidateCodeMapper.queryPhoneValidateCodeList(queryPhoneValidateCode);
+        if (phoneValidateCodes == null || phoneValidateCodes.size() == 0) {
+            throw new MsgException("请先获取验证码！");
+        }
+
+        PhoneValidateCode existValidateCode = phoneValidateCodes.get(0);
+        if (!checkCode.equals(existValidateCode.getCode())) {
+            throw new MsgException("验证码错误！");
+        }
+        // 使用验证码之后删除验证码
+        phoneValidateCodeMapper.deletePhoneValidateCode(existValidateCode);
+
+        MerchantStore ms = new MerchantStore();
+        ms.setMerchantCode(merchantCode);
+        MerchantStore merchantStore = merchantStoreService.getOne(new QueryWrapper<>(ms));
+
+        storeId = merchantStore.getStoreId();
+
+        String sceneStr = merchantCode + "," + merchantStore.getStoreId() + "," + phone;
+        log.error(sceneStr);
+        Result<String> rQcode = wechatService.getNewRQcode(sceneStr);
+        if (rQcode.getCode() == 200) {
+            MerchantMenber merchantMenber1 = new MerchantMenber();
+            merchantMenber1.setStoreId(storeId);
+            merchantMenber1.setMerchantCode(merchantCode);
+            merchantMenber1.setPhone(phone);
+            List<MerchantMenber> queryMerchantMenberList = queryMerchantMenberList(merchantMenber1);
+            if (queryMerchantMenberList != null && queryMerchantMenberList.size() > 0) {
+                throw new MsgException("该手机号已经是会员");
+            }
+            MerchantMenber merchantMenber = new MerchantMenber();
+            merchantMenber.setPhone(phone);
+            merchantMenber.setNickName(nickName);
+            merchantMenber.setStoreId(storeId);
+            merchantMenber.setBirthdayDt(birthday);
+            merchantMenber.setBindingUrl(rQcode.getData());
+            ActivityActivate activityActivate = new ActivityActivate();
+            merchantStore.setStoreId(merchantMenber.getStoreId());
+            merchantMenber.setMerchantCode(merchantStore.getMerchantCode());
+            merchantMenber.setMerchantName(merchantStore.getMerchantName());
+            merchantMenber.setStoreName(merchantStore.getStoreName());
+            activityActivate.setStoreId(merchantStore.getStoreId());
+            activityActivate.setMerchantCode(merchantStore.getMerchantCode());
+            // 查询门店的激活送
+            List<ActivityActivate> queryActivityActivateList = activityActivateService.queryActivityActivateList(activityActivate);
+            if (queryActivityActivateList != null && queryActivityActivateList.size() > 0) {
+                activityActivate = queryActivityActivateList.get(0);
+                Double giveMoney = activityActivate.getGiveMoney();// 赠送金额
+                merchantMenber.setUsableGiveFee(giveMoney);
+                merchantMenber.setTotalGiveFee(giveMoney);
+            }
+            merchantMenber.setMemberCode("VIP" + StringUtil.getBillno());
+            merchantMenber.setCardNo("VIP" + StringUtil.getBillno());
+            saveMerchantMenber(merchantMenber);
+        }
+        return rQcode.getData();
+    }
+
+    @Override
+    public List<MerchantMenber> manageMerchantMenberSum(Map<String, Object> newMemberMap) {
+        return baseMapper.manageMerchantMenberSum(newMemberMap);
+    }
+
+
+    /**
+     * 小程序会员开卡
+     * @return
+     */
+    @Override
+    public Result<JSONObject> vipOpenCard(JSONObject jsonObject) {
+        JSONObject result = new JSONObject();
+        Integer storeId = jsonObject.getInteger("storeId");
+        if (storeId == null) {
+            return ResultGenerator.genFailResult("店铺ID不能为空");
+        }
+        String phone = jsonObject.getString("phone");
+        if (StringUtil.isEmpty(phone)) {
+            return ResultGenerator.genFailResult("手机号不能为空！");
+        }
+        String appOpenId = jsonObject.getString("appOpenId");
+        if (StringUtil.isEmpty(appOpenId)) {
+            return ResultGenerator.genFailResult("appId不能为空！");
+        }
+        String memberName = jsonObject.getString("memberName");
+        String unionid = jsonObject.getString("unionid");
+        String avatar = jsonObject.getString("avatar");
+        if(StringUtil.isEmpty(memberName) || memberName == "undefined"){
+            memberName = "收银呗会员"+StringUtil.genRandomNum(6);
+        }
+        if(StringUtil.isEmpty(avatar) || avatar == "undefined"){
+            avatar = default_avatar;
+        }
+        MerchantStore store = new MerchantStore();
+        store.setId(storeId);
+        MerchantStore storeInfo = merchantStoreService.queryMerchantStore(store);
+        if(storeInfo == null){
+            return ResultGenerator.genFailResult("店铺数据不存在！");
+        }
+        if("2".equals(storeInfo.getStatus())){
+            return ResultGenerator.genFailResult("店铺已被禁用！");
+        }
+        List<Map<String,Object>> lists = activityActivateService.getNewestActivityJoin(storeInfo.getStoreId());
+        List<String> titleList = getTitleTips(lists);
+        QueryWrapper<MerchantMenber> queryWrapper = new QueryWrapper<MerchantMenber>()
+                .eq("storeId",storeInfo.getStoreId()).eq("phone",phone);
+//                .eq("phone",phone);
+        MerchantMenber merchantMenber = this.baseMapper.selectOne(queryWrapper);
+        if(merchantMenber != null){
+            return ResultGenerator.genFailResult("当前手机号在该门店已是会员，请勿重复领取",null);
+        }else{
+            MerchantMenber menber = new MerchantMenber();
+            menber.setNickName(memberName);
+            menber.setMemberName(memberName);
+            menber.setStoreId(storeInfo.getStoreId());
+            menber.setMerchantCode(storeInfo.getMerchantCode());
+            menber.setAppOpenId(appOpenId);
+            menber.setLogo(avatar);
+            menber.setPhone(phone);
+            menber.setStatus(1);
+            menber.setUnionId(unionid);
+            //merchantMenber.setBirthdayDt(birthday);
+            /*MerchantStore merchantStore = new MerchantStore();
+            merchantStore.setStoreId(storeId);
+            merchantStore.setMerchantCode(merchantCode);
+            List<MerchantStore> queryMerchantStoreList = merchantStoreService.queryMerchantStoreList(merchantStore);*/
+            menber.setMerchantName(storeInfo.getMerchantName());
+            menber.setStoreName(storeInfo.getStoreName());
+            //merchantMenber.setBindingUrl(rQcode.getData());
+            ActivityActivate activityActivate = new ActivityActivate();
+            //storeInfo.setStoreId(merchantMenber.getStoreId());
+            menber.setMerchantCode(storeInfo.getMerchantCode());
+            menber.setMerchantName(storeInfo.getMerchantName());
+            menber.setStoreName(storeInfo.getStoreName());
+            activityActivate.setStoreId(storeInfo.getStoreId());
+            activityActivate.setMerchantCode(storeInfo.getMerchantCode());
+            List<ActivityActivate> queryActivityActivateList = activityActivateService.queryActivityActivateList(activityActivate);// 查询门店的激活送
+            if (queryActivityActivateList != null && queryActivityActivateList.size() > 0) {
+                activityActivate = queryActivityActivateList.get(0);
+                Double giveMoney = activityActivate.getGiveMoney();// 赠送金额
+                menber.setUsableGiveFee(giveMoney);
+                menber.setTotalGiveFee(giveMoney);
+            }else{
+                menber.setUsableGiveFee(0.00);
+                menber.setTotalGiveFee(0.00);
+            }
+            menber.setMemberCode("VIP" + StringUtil.getBillno());
+            menber.setCardNo("VIP" + StringUtil.getBillno());
+            saveMerchantMenber(menber);
+            result.put("title",titleList);
+            Double useRechFee = menber.getUsableRechargeFee() == null ? 0.00 : menber.getUsableRechargeFee();
+            Double useGiveFee = menber.getUsableGiveFee() == null ? 0.00 : menber.getUsableGiveFee();
+            BigDecimal useAmt = new BigDecimal(String.valueOf(useRechFee)).add(new BigDecimal(String.valueOf(useGiveFee)));
+            result.put("useAmt",useAmt);
+            result.put("cardNo",menber.getCardNo());
+            return ResultGenerator.genSuccessResult("开卡成功",result);
+        }
+    }
+    @Override
+    public List<String> getTitleTips(List<Map<String, Object>> lists) {
+        List<String> titleList = new ArrayList<>();
+        Date nowDate = new Date();
+        String title = "推荐充值再支付，立享更多优惠";
+        if(lists.isEmpty()){
+            titleList.add(title);
+        }else{
+            for (Map<String,Object> map:lists) {
+                Long type = (Long)map.get("type");
+                if(type == 1){
+                    title = "激活送"+map.get("giveMoney")+"元";
+                }else if(type == 2){
+                    Long timeType = (Long) map.get("timeType");
+                    if(timeType == 1){
+                        Date startDt = (Date) map.get("startDt");
+                        Date endDt = (Date) map.get("endDt");
+                        if(nowDate.compareTo(startDt) < 0 || nowDate.compareTo(endDt) > 0){
+                            continue;
+                        }
+                    }
+                    Long reType = (Long)map.get("reType");
+                    if(reType == 2){
+                        Double percent = (Double)map.get("percent");
+                        title = "会员消费返任意金额的"+percent+"%";
+                    }else{
+                        title = "消费满"+map.get("rechargeMoney")+"元返"+map.get("giveMoney")+"元";
+                    }
+                }else if(type == 3){
+                    title = "充值满"+map.get("rechargeMoney")+"元送"+map.get("giveMoney")+"元";
+                }
+                titleList.add(title);
+            }
+        }
+        return titleList;
+    }
+
+    /**
+     * 关联分页查询
+     * @param page
+     * @param menber
+     * @return
+     */
+    @Override
+    public Page<MerchantMenber> pageJoinData(Page<MerchantMenber> page, MerchantMenber menber) {
+        return baseMapper.pageJoinData(page,menber);
+    }
+
+    /**
+     * 根据unionId 修改openid
+     * @date: 2021/12/9 17:59
+     * @param openid
+     * @param unionId
+     */
+    @Override
+    public void updateByUnionId(String openid,String unionId) {
+        baseMapper.updateByUnionId(openid,unionId);
+    }
+
+    /**
+     * 发送会员余额变动通知
+     * @date: 2021/12/9 18:44
+     * @param menber:
+     * @param amt:
+     * @param type: 1：充值 2：消费
+     */
+    @Override
+    public void sendMenberBalanceChangeNotice(MerchantMenber menber, Double amt, String type) {
+        MerchantStore store = merchantStoreService.getStoreByMerchantCode(menber.getMerchantCode());
+        if(store != null && StringUtil.isNotEmpty(menber.getOpenid())){
+            JSONObject miniprogram = new JSONObject();
+            miniprogram.put("appid", ParametersUtil.APPLETS_APPID);
+            miniprogram.put("pagepath","pages/card/index?storeId="+store.getId()+"&phone="+menber.getPhone());
+
+            String first = "您的【"+store.getStoreName()+"】会员卡："+menber.getCardNo()+"资金有变动啦，请注意查收!";
+            String remark = "如对此会员卡余额变动有疑问，可以点此进入小程序中查看！";
+            String transTitle = "1".equals(type) ? "会员充值" :  "2".equals(type) ? "会员消费" :"现金充值";
+            String useFee = BigDecimal.valueOf(menber.getUsableRechargeFee() + menber.getUsableGiveFee()).setScale(2,BigDecimal.ROUND_HALF_DOWN).toString();
+            String[] array = {transTitle,amt.toString(), DateUtils.toString(new Date(),"yyyy-MM-dd HH:mm:ss"),useFee};
+            WxAccessTokenRequest request = WxAccessTokenRequest.buidWxToken(ParametersUtil.APPID, ParametersUtil.APPSECRET, null, WxConstants.ACCESS_TOKEN_URL);
+            WxTemolateRequest temolateRequest = new WxTemolateRequest(menber.getOpenid(),WxConstants.VIP_BALANCE_CHANGE_TEMPLATE_ID,null,miniprogram)
+                    .buildData(first,remark,array);
+            wxCommonService.sendTemplateMsg(temolateRequest,request);
+        }
+    }
+
+    /**
+     * 根据会员卡号获取会员信息
+     * @param cardNo
+     * @return
+     */
+    @Override
+    public MerchantMenber getByCardNo(String cardNo) {
+        return baseMapper.getByCardNo(cardNo);
+    }
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantMenberComsume/MerchantMenberComsumeService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantMenberComsume/MerchantMenberComsumeService.java
new file mode 100644
index 0000000..8697737
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantMenberComsume/MerchantMenberComsumeService.java
@@ -0,0 +1,27 @@
+package cn.pluss.platform.merchantMenberComsume;
+
+import java.util.List;
+import java.util.Map;
+import cn.pluss.platform.entity.MerchantMenberComsume;
+
+public interface MerchantMenberComsumeService {
+
+    public MerchantMenberComsume queryMerchantMenberComsume(MerchantMenberComsume merchantMenberComsume);
+
+    public List<MerchantMenberComsume> queryMerchantMenberComsumeList(MerchantMenberComsume merchantMenberComsume);
+
+    public void saveMerchantMenberComsume(MerchantMenberComsume merchantMenberComsume);
+
+    public void updateMerchantMenberComsume(MerchantMenberComsume merchantMenberComsume);
+
+    public void deleteMerchantMenberComsume(MerchantMenberComsume merchantMenberComsume);
+
+    public List<MerchantMenberComsume> queryMerchantMenberComsumePage(Map map);
+
+    public Integer queryMerchantMenberComsumePageCount(Map map);
+
+    public void saveMerchantMenberComsumeBatch(List<MerchantMenberComsume> merchantMenberComsumeList);
+    
+    public Double queryMerchantMenberComsumeByTime(Map map);
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantMenberComsume/impl/MerchantMenberComsumeServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantMenberComsume/impl/MerchantMenberComsumeServiceImpl.java
new file mode 100644
index 0000000..41854ba
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantMenberComsume/impl/MerchantMenberComsumeServiceImpl.java
@@ -0,0 +1,63 @@
+package cn.pluss.platform.merchantMenberComsume.impl;
+
+import java.util.List;
+import java.util.Map;
+import org.springframework.transaction.annotation.Transactional;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import cn.pluss.platform.entity.MerchantMenberComsume;
+import cn.pluss.platform.merchantMenberComsume.MerchantMenberComsumeService;
+import cn.pluss.platform.mapper.MerchantMenberComsumeMapper;
+
+@Transactional
+@Service("merchantMenberComsumeService")
+public class MerchantMenberComsumeServiceImpl  implements MerchantMenberComsumeService{
+
+	 private static final Logger logger = LoggerFactory.getLogger( MerchantMenberComsumeServiceImpl.class);
+
+
+    @Autowired
+	  private MerchantMenberComsumeMapper merchantMenberComsumeMapper;
+
+    @Override
+    public MerchantMenberComsume queryMerchantMenberComsume(MerchantMenberComsume merchantMenberComsume){
+        return merchantMenberComsumeMapper.queryMerchantMenberComsume(merchantMenberComsume);
+    }
+
+    @Override
+    public List<MerchantMenberComsume> queryMerchantMenberComsumeList(MerchantMenberComsume merchantMenberComsume){
+        return merchantMenberComsumeMapper.queryMerchantMenberComsumeList(merchantMenberComsume);
+    }
+    @Override
+    public void saveMerchantMenberComsume(MerchantMenberComsume merchantMenberComsume){
+          merchantMenberComsumeMapper.saveMerchantMenberComsume(merchantMenberComsume);
+    }
+    @Override
+    public void updateMerchantMenberComsume(MerchantMenberComsume merchantMenberComsume){
+        merchantMenberComsumeMapper.updateMerchantMenberComsume(merchantMenberComsume);
+    }
+    @Override
+    public void deleteMerchantMenberComsume(MerchantMenberComsume merchantMenberComsume){
+        merchantMenberComsumeMapper.deleteMerchantMenberComsume(merchantMenberComsume);
+    }
+    @Override
+    public List<MerchantMenberComsume> queryMerchantMenberComsumePage(Map map){
+        return merchantMenberComsumeMapper.queryMerchantMenberComsumePage(map);
+    }
+    @Override
+    public Integer queryMerchantMenberComsumePageCount(Map map){
+        return merchantMenberComsumeMapper.queryMerchantMenberComsumePageCount(map);
+    }
+    @Override
+    public void saveMerchantMenberComsumeBatch(List<MerchantMenberComsume> merchantMenberComsumeList) {
+         merchantMenberComsumeMapper.saveMerchantMenberComsumeBatch(merchantMenberComsumeList);
+    }
+    
+    @Override
+    public Double queryMerchantMenberComsumeByTime(Map map){
+        return merchantMenberComsumeMapper.queryMerchantMenberComsumeByTime(map)==null ? 0.0 : merchantMenberComsumeMapper.queryMerchantMenberComsumeByTime(map);
+    }
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantMenberRecharge/MerchantMenberRechargeService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantMenberRecharge/MerchantMenberRechargeService.java
new file mode 100644
index 0000000..ca85639
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantMenberRecharge/MerchantMenberRechargeService.java
@@ -0,0 +1,28 @@
+package cn.pluss.platform.merchantMenberRecharge;
+
+import cn.pluss.platform.entity.MerchantMenberRecharge;
+
+import java.util.List;
+import java.util.Map;
+
+public interface MerchantMenberRechargeService {
+
+    MerchantMenberRecharge queryMerchantMenberRecharge(MerchantMenberRecharge merchantMenberRecharge);
+
+    List<MerchantMenberRecharge> queryMerchantMenberRechargeList(MerchantMenberRecharge merchantMenberRecharge);
+
+    void saveMerchantMenberRecharge(MerchantMenberRecharge merchantMenberRecharge);
+
+    void updateMerchantMenberRecharge(MerchantMenberRecharge merchantMenberRecharge);
+
+    void deleteMerchantMenberRecharge(MerchantMenberRecharge merchantMenberRecharge);
+
+    List<MerchantMenberRecharge> queryMerchantMenberRechargePage(Map map);
+
+    Integer queryMerchantMenberRechargePageCount(Map map);
+
+    void saveMerchantMenberRechargeBatch(List<MerchantMenberRecharge> merchantMenberRechargeList);
+
+    List<MerchantMenberRecharge> queryMerchantMenberRechargeListByTime(Map map);
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantMenberRecharge/impl/MerchantMenberRechargeServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantMenberRecharge/impl/MerchantMenberRechargeServiceImpl.java
new file mode 100644
index 0000000..23460f5
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantMenberRecharge/impl/MerchantMenberRechargeServiceImpl.java
@@ -0,0 +1,62 @@
+package cn.pluss.platform.merchantMenberRecharge.impl;
+
+import java.util.List;
+import java.util.Map;
+import org.springframework.transaction.annotation.Transactional;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import cn.pluss.platform.entity.MerchantMenberRecharge;
+import cn.pluss.platform.merchantMenberRecharge.MerchantMenberRechargeService;
+import cn.pluss.platform.mapper.MerchantMenberRechargeMapper;
+
+@Transactional
+@Service("merchantMenberRechargeService")
+public class MerchantMenberRechargeServiceImpl  implements MerchantMenberRechargeService{
+
+	 private static final Logger logger = LoggerFactory.getLogger( MerchantMenberRechargeServiceImpl.class);
+
+
+    @Autowired
+	  private MerchantMenberRechargeMapper merchantMenberRechargeMapper;
+
+    @Override
+    public MerchantMenberRecharge queryMerchantMenberRecharge(MerchantMenberRecharge merchantMenberRecharge){
+        return merchantMenberRechargeMapper.queryMerchantMenberRecharge(merchantMenberRecharge);
+    }
+
+    @Override
+    public List<MerchantMenberRecharge> queryMerchantMenberRechargeList(MerchantMenberRecharge merchantMenberRecharge){
+        return merchantMenberRechargeMapper.queryMerchantMenberRechargeList(merchantMenberRecharge);
+    }
+    @Override
+    public void saveMerchantMenberRecharge(MerchantMenberRecharge merchantMenberRecharge){
+          merchantMenberRechargeMapper.saveMerchantMenberRecharge(merchantMenberRecharge);
+    }
+    @Override
+    public void updateMerchantMenberRecharge(MerchantMenberRecharge merchantMenberRecharge){
+        merchantMenberRechargeMapper.updateMerchantMenberRecharge(merchantMenberRecharge);
+    }
+    @Override
+    public void deleteMerchantMenberRecharge(MerchantMenberRecharge merchantMenberRecharge){
+        merchantMenberRechargeMapper.deleteMerchantMenberRecharge(merchantMenberRecharge);
+    }
+    @Override
+    public List<MerchantMenberRecharge> queryMerchantMenberRechargePage(Map map){
+        return merchantMenberRechargeMapper.queryMerchantMenberRechargePage(map);
+    }
+    @Override
+    public Integer queryMerchantMenberRechargePageCount(Map map){
+        return merchantMenberRechargeMapper.queryMerchantMenberRechargePageCount(map);
+    }
+    @Override
+    public void saveMerchantMenberRechargeBatch(List<MerchantMenberRecharge> merchantMenberRechargeList) {
+         merchantMenberRechargeMapper.saveMerchantMenberRechargeBatch(merchantMenberRechargeList);
+    }
+    @Override
+    public List<MerchantMenberRecharge> queryMerchantMenberRechargeListByTime(Map map){
+        return merchantMenberRechargeMapper.queryMerchantMenberRechargeListByTime(map);
+    }
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrder/BaseMercSplitService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrder/BaseMercSplitService.java
new file mode 100644
index 0000000..9a4dfc7
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrder/BaseMercSplitService.java
@@ -0,0 +1,66 @@
+package cn.pluss.platform.merchantOrder;
+
+import cn.pluss.platform.entity.*;
+
+import java.util.List;
+
+/**
+ * TODO
+ * 商户订单分账接口类
+ * @author crystal
+ * @date 2022/7/1 11:45
+ */
+public interface BaseMercSplitService {
+
+    /**
+     * 分账登记
+     * @param order
+     * @param list
+     * @param flag
+     * @return
+     */
+    MerchantOrderSplit split(MerchantOrder order, List<MerchantSplitSetting> list,boolean flag);
+
+    /**
+     * 分账登记
+     * @param order
+     * @param detailList
+     * @return
+     */
+    boolean split(MerchantOrderSplit order, List<MerchantOrderSplitDetail> detailList,MerchantChannelStatus channel);
+
+    /**
+     * 分账退款接口
+     * @param refund
+     * @return
+     */
+    boolean refund(MerchantOrderSplitRefund refund);
+
+    /**
+     * 一般消费户退款接口
+     * @param refund
+     * @return
+     */
+    boolean generalRefund(MerchantOrderSplitRefund refund);
+
+    /**
+     * 分账订单查询
+     * @param order
+     * @param detailList
+     */
+    List<MerchantOrderSplitDetail> splitQuery(MerchantOrderSplit order,List<MerchantOrderSplitDetail> detailList);
+
+    /**
+     * 分账退款查询
+     * @param qRefund
+     * @param srList
+     * @return
+     */
+    List<MerchantOrderSplitDetail> refundQuery(MerchantOrderSplitRefund qRefund, List<MerchantOrderSplitDetail> srList);
+
+    /**
+     * 商户提现
+     * @return
+     */
+    void withdraw(MerchantOrderSplit order, MerchantChannelStatus channel);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrder/MerchantOrderService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrder/MerchantOrderService.java
new file mode 100644
index 0000000..c22318b
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrder/MerchantOrderService.java
@@ -0,0 +1,429 @@
+package cn.pluss.platform.merchantOrder;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.dto.MemberRechargeDTO;
+import cn.pluss.platform.dto.MemberScanPayDTO;
+import cn.pluss.platform.dto.MerChantOrderDTO;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.mapper.MerchantOrderMapper;
+import cn.pluss.platform.vo.*;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author admin
+ */
+public interface MerchantOrderService extends IService<MerchantOrder> {
+
+    default MerchantOrder queryMerchantOrder(MerchantOrder merchantOrder) {
+        return getBaseMapper().selectOne(new QueryWrapper<>(merchantOrder));
+    }
+
+    /**
+     * 统计账单信息，其中包含账单记录，账单笔数，以及账单总额
+     *
+     * @return 账单信息
+     */
+    Map<String, Object> billCollect(MerchantOrder merchantOrder);
+
+    default List<MerchantOrder> queryMerchantOrderPage(Map<String, Object> map) {
+        return ((MerchantOrderMapper) getBaseMapper()).queryMerchantOrderPage(map);
+    }
+
+    default Integer queryMerchantOrderPageCount(Map<String, Object> map) {
+        return ((MerchantOrderMapper) getBaseMapper()).queryMerchantOrderPageCount(map);
+    }
+
+    default Integer queryMerchantOrderPageCountByTime(Map<String, Object> map) {
+        Integer count = ((MerchantOrderMapper) getBaseMapper()).queryMerchantOrderPageCountByTime(map);
+        return count == null ? 0 : count;
+    }
+
+    default Double queryMerchantOrderFeeByTime(Map<String, Object> map) {
+        return ((MerchantOrderMapper) getBaseMapper()).queryMerchantOrdeFeeByTime(map) == null ? 0
+                : ((MerchantOrderMapper) getBaseMapper()).queryMerchantOrdeFeeByTime(map);
+    }
+
+    default List<MerchantOrder> queryMerchantOrderPageByTime(Map<String, Object> map) {
+        return ((MerchantOrderMapper) getBaseMapper()).queryMerchantOrderPageByTime(map);
+    }
+
+    /**
+     * 供 商户推广- 交易明细 接口使用
+     *
+     * @param map 参数
+     * @return  结果
+     */
+    default List<MerchantOrder> queryMerchantOrderPageApp(Map<String, Object> map) {
+        return ((MerchantOrderMapper) getBaseMapper()).queryMerchantOrderPageApp(map);
+    }
+
+    /**
+     * 供 商户推广- 交易明细 接口使用
+     *
+     * @param map 参数
+     * @return 结果
+     */
+    Integer queryMerchantOrderPageCountApp(Map<String, Object> map);
+
+    /**
+     * 汇总流水（manage）
+     */
+    SummaryOfWaterVO querySummaryOfWater(Map<String, Object> map);
+
+    /**
+     * 订单退款信息
+     *
+     * @param map ignored
+     * @return ignored
+     */
+    List<MerchantOrder> queryMerchantOrderRefundPage(Map<String, Object> map);
+
+    /**
+     * 订单退款统计
+     *
+     * @param map ignored
+     * @return ignored
+     */
+    Integer queryMerchantOrderRefundPageCount(Map<String, Object> map);
+
+    /**
+     * 7日交易数统计
+     *
+     * @param s ignored
+     */
+    List<OrderStatisticsVO> queryOrderStatistics(MerchantOrder s);
+
+    /**
+     * 支付通道统计
+     *
+     * @param s ignored
+     */
+    List<PayTypeStatisticsVO> queryPayTypeStatistics(MerchantOrder s);
+
+
+    /**
+     * queryMerchantOrderPageShuju:(最新统计订单方法). <br/>
+     *
+     * @param map ignored
+     * @return ignored
+     *
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    List<MerchantMangeOrderVO> queryMerchantOrderPageShuju(Map<String, Object> map);
+
+//    /**
+//     * 最新统计订单方法，商户
+//     * @param map ignored
+//     * @return ignored
+//     */
+//    default List<MerchantMangeOrderVO> queryMerchantOrderNoPageShuju(Map<String, Object> map) {
+//        return ((MerchantOrderMapper)getBaseMapper()).queryMerchantOrderNoPageShuju(map);
+//    }
+
+    /**
+     * queryMerchantOrderPageCountShuju:(最新统计订单方法). <br/>
+     *
+     * @param map ignored
+     * @return ignored
+     *
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    Integer queryMerchantOrderPageCountShuju(Map<String, Object> map);
+
+//    default Integer queryMerchantOrderNoPageCountShuju(Map<String, Object> map) {
+//        return ((MerchantOrderMapper)getBaseMapper()).queryMerchantOrderNoPageCountShuju(map);
+//    }
+
+    /**
+     * PlatformSum:(统计平台大屏的门店数量 商户数量 交易总额 交易笔数 会员数量 推广员数量 推广分润总额 粉丝奖励总额 收益总计). <br/>
+     *
+     * @return ignored
+     *
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    Map<String, Object> platformSum();
+
+
+    /**
+     * app 首页数据
+     *
+     * @param userApp ignored
+     * @return ignored
+     */
+    Map<String, Object> queryHomePageData(UserApp userApp);
+
+    /**
+     * app对账页面
+     *
+     * @param merchantOrder ignored
+     * @return ignored
+     */
+    Map<String, Object> queryCheckOrderData(MerchantOrder merchantOrder);
+
+    /**
+     * 查询订单页面统计数据
+     *
+     * @param params ignored
+     * @return ignored
+     */
+    Map<String, Object> querySumCount(Map<String, Object> params);
+
+    /**
+     * 获取真实的营业额，收款 - 退款
+     *
+     * @return ignored
+     */
+    default BigDecimal getRealConsume(List<Map<String, Object>> sumList) {
+        BigDecimal result = BigDecimal.ZERO;
+        for (Map<String, Object> consumeSum : sumList) {
+			Object status = consumeSum.get("status");
+			if (status != null && "1".equals(status.toString())) {
+				result = result.add(new BigDecimal(consumeSum.get("fee").toString()));
+			}
+
+			if (status != null && "2".equals(status.toString())) {
+				result = result.subtract(new BigDecimal(consumeSum.get("fee").toString()));
+			}
+        }
+
+		return result;
+    }
+
+    /**
+     * //查询自己和子属下级商户成功订单金额
+     * @param merchantNoList ignored
+     * @return ignored
+     */
+    Double queryNextMercTransAmtCount(List<String> merchantNoList);
+
+
+    MerchantOrder saveMerchantOrderStatus(String outTradeNo, MerchantOrder merchantOrder);
+
+    /**
+     * 获取超级代理商下级商户当月交易额
+     * @param params ignored
+     * @return ignored
+     */
+    List<Map<String, Object>> getSuperMerchantToDayTradeMoneyCount(Map<String, Object> params);
+
+    /**
+     * 订单分润明细分页查询
+     * @param map ignored
+     * @return ignored
+     */
+    List<MerchantOrderProfitVO> pageData(Map<String,Object> map);
+
+    Integer pageDataCount(Map<String, Object> map);
+
+
+    /**
+     * 统计营销活动奖励金
+     * @return ignored
+     */
+//    Map<String, BigDecimal> getCountMaketAmt(Long userId,String date,String auditDate);
+
+    /**
+     * 获取商户当前已经积累的交易额度
+     * @param merchantCode ignored
+     * @return ignored
+     */
+    Map<String,Double> getCountTradeAmt(String merchantCode,String date,String startDate,String endDate);
+
+
+    /**
+     * 分页查询
+     * @param page ignored
+     * @param order ignored
+     * @return ignored
+     */
+    Page<MerchantOrder> pageWapInfo(Page<MerchantOrder> page, MerchantOrder order);
+
+    /**
+     * 计算累计省钱金额和今日省钱金额
+     * @param merchantCode ignored
+     * @param nowDate ignored
+     * @return ignored
+     */
+    Map<String, BigDecimal> getSaveMoneyCount(String merchantCode, String nowDate,String startDate,String endDate);
+
+    /**
+     * 扫用户二维码支付
+     * @param merchantOrderDTO ignored
+     * @return ignored
+     */
+    Result<Object> toActivePay(MerChantOrderDTO merchantOrderDTO);
+
+    /**
+     * 主扫会员卡支付
+     * @param memberScanPayDTO ignored
+     * @return ignored
+     */
+    Result<MemberScanVO> toMemberScanPay(MemberScanPayDTO memberScanPayDTO);
+
+    /**
+     * 主扫会员卡充值
+     * @param memberRechargeDTO ignored
+     * @return ignored
+     */
+    Result<Map<String, Object>> toMemberRecharge(MemberRechargeDTO memberRechargeDTO);
+
+    /**
+     * 退款
+     * @param orderNumber 退款单号
+     * @param refundReason 退款原因
+     * @param type 退款类型
+     * @param noticeCode 通知code值
+     */
+    void returnOrder(String orderNumber,String refundReason,String type, String noticeCode);
+
+    /**
+     * 退款
+     * @param orderNumber 退款单号
+     * @param refundReason 退款原因
+     * @param type 退款类型
+     * @param noticeCode 通知code值
+     */
+    void apiReturnOrderV2(String orderNumber,String refundReason,String type, String noticeCode, String payPassword);
+
+
+    void setMemberRechargeOrder(MemberRechargeDTO dto, MerchantMenber menber, MemberOrder memberOrder,MerchantMenberRecharge recharge,MerchantOrder order);
+
+    /**
+     * 订单补单操作
+     * @param id ignored
+     * @return ignored
+     */
+    Result<Object> suppleOrder(Integer id);
+
+    /**
+     * 分页查询订单信息
+     * @param page ignored
+     * @param query ignored
+     * @return ignored
+     */
+    Page<MerchantOrder> pageInfo(Page<MerchantOrder> page, MerchantOrder query);
+
+
+    /**
+     * 解析CSV文件
+     * @param path 文件路径
+     */
+    void readCSV(String path);
+
+    List<Map<String, Object>> getCouponList(String orderNumber);
+
+
+    Result updateOrderStatus(JSONObject result,MerchantOrder order);
+
+    /**
+     * @description:订单列表根据查询条件统计数据
+     * @date: 2021/8/5 16:49
+     * @param map:
+     * @return java.util.Map<java.lang.String,java.lang.Object>
+     */
+    Map<String, Object> getOrderCountData(Map<String, Object> map);
+
+    /**
+     * @description:更改订单支付状态以及创建分润
+     * @date: 2021/8/19 18:49
+     * @param order:
+     */
+    void updateOrderAndCreateProfit(MerchantOrder order);
+
+
+    /**
+     * @description:更新支付失败的订单
+     * @date: 2021/8/20 10:57
+     * @param order:
+     * @param channelStatus:
+     * @param channelMsg:
+     */
+    void updateFailOrder(MerchantOrder order,String channelStatus,String channelMsg);
+
+    /**
+     * @description:设置订单相关参数
+     * @date: 2021/8/25 11:16
+     * @param order:
+     * @param params:
+     * @param channel:
+     */
+    void constOrderPayCodeAndName(MerchantOrder order, Map<String, Object> params, MerchantChannelStatus channel);
+
+    /**
+     * @description:获取获取订单信息
+     * @date: 2021/8/31 14:53
+     * @param orderNumber:
+     * @return cn.pluss.platform.entity.MerchantOrder
+     */
+    MerchantOrder getLockByOrderNumber(String orderNumber);
+
+    /**
+     * @description:获取订单首页数据
+     * @date: 2021/10/19 14:54
+     * @return java.util.Map<java.lang.String,java.lang.Object>
+     */
+    Map<String, Object> getPlatformOrderData();
+
+    /**
+     * @description:统计累计金额数据
+     * @date: 2021/10/19 17:52
+     * @return java.util.Map<java.lang.String,java.lang.Object>
+     */
+    Map<String, Object> getPlatformAmtData();
+
+    /**
+     * 设置活动积分
+     * @date: 2021/11/29 10:40
+     * @param order:  当前订单
+     */
+    void setActivityMarketAmt(MerchantOrder order,MerchantStore store);
+
+    List<UserProfit> getOrderFlow(String date,Integer sort);
+
+    Integer getOrderMaxSort(String date);
+
+    Map<String, String> getPlatformTransData();
+
+    /**
+     * 根据商户号和时间获取流水
+     * @date: 2022/3/1 16:59
+     * @param mercList:
+     * @param date:
+     * @param flag:
+     * @return java.math.BigDecimal
+     */
+    BigDecimal getAreaOrderCount(List<String> mercList, String date, Integer flag);
+
+    /**
+     * 获取通道对账文件地址
+     * @param accountDate
+     * @param channel
+     * @param type
+     * @return
+     */
+    Result<Object> getChannelFileUrl(String accountDate, Integer channel, Integer type);
+
+    BigDecimal getPlatformAmtYestNowData(String date,String yestStartDate, String yestEndDate);
+
+    void sendPayCallBackArrival(MerchantOrder order);
+
+    /**
+     * 获取有效交易笔数
+     * @param merchantCode
+     * @return
+     */
+    Integer getValidNumByMerchantCode(String merchantCode);
+
+//    void sendPayCallBackArrival(String userId,String orderNumber,Double consumeFee);
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrder/MerchantOrderStatisticsService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrder/MerchantOrderStatisticsService.java
new file mode 100644
index 0000000..8ba86d5
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrder/MerchantOrderStatisticsService.java
@@ -0,0 +1,144 @@
+package cn.pluss.platform.merchantOrder;
+
+import cn.pluss.platform.entity.MerchantOrderStatistics;
+import cn.pluss.platform.mapper.MerchantOrderStatisticsMapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.apache.ibatis.annotations.Param;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.util.Calendar;
+import java.util.Date;
+
+/**
+ * <p>
+ * 商户订单统计表 服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-12-21
+ */
+public interface MerchantOrderStatisticsService extends IService<MerchantOrderStatistics> {
+
+    LocalDate INIT_START_DATE = LocalDate.of(2020, 1, 1);
+
+    /**
+     * 统计上个月的数据
+     */
+    default void untilLastMonth() {
+        BaseMapper<MerchantOrderStatistics> baseMapper = getBaseMapper();
+        LambdaQueryWrapper<MerchantOrderStatistics> qWrapper = new LambdaQueryWrapper<>();
+        qWrapper.ne(MerchantOrderStatistics::getStartDate, "1970-01-01");
+        qWrapper.orderByDesc(MerchantOrderStatistics::getCreateTime).last("limit 1");
+
+        MerchantOrderStatistics entity = baseMapper.selectOne(qWrapper);
+
+        Calendar calendar = Calendar.getInstance();
+        Date from;
+
+        if (entity != null) {
+            from = Date.from(entity.getStartDate().atStartOfDay(ZoneId.systemDefault()).toInstant());
+        } else {
+            from = Date.from(INIT_START_DATE.atStartOfDay(ZoneId.systemDefault()).toInstant());
+        }
+
+        calendar.setTime(from);
+        Date startDate = calendar.getTime();
+        Date nextStartDate;
+
+        Date now = new Date();
+        while (startDate.compareTo(now) < 1) {
+
+            calendar.add(Calendar.MONTH, 1);
+            nextStartDate = calendar.getTime();
+
+            calendar.add(Calendar.DAY_OF_MONTH, -1);
+            Date endDate = calendar.getTime();
+
+            LambdaQueryWrapper<MerchantOrderStatistics> removeWrapper = Wrappers.lambdaQuery();
+            removeWrapper.eq(MerchantOrderStatistics::getStartDate, startDate);
+            baseMapper.delete(removeWrapper);
+
+            try {
+                ((MerchantOrderStatisticsMapper) baseMapper).insertStatistics(startDate, endDate);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+
+            startDate = nextStartDate;
+            calendar.setTime(nextStartDate);
+        }
+
+        // 先清除全量统计数据
+        LambdaQueryWrapper<MerchantOrderStatistics> dWrapper = Wrappers.lambdaQuery();
+        dWrapper.eq(MerchantOrderStatistics::getStartDate, "1970-01-01");
+        dWrapper.eq(MerchantOrderStatistics::getEndDate, "2099-12-31");
+        baseMapper.delete(dWrapper);
+
+        ((MerchantOrderStatisticsMapper) baseMapper).insertAllStatics();
+    }
+
+    /**
+     * 获取直推总交易钱数, 以及交易笔数
+     * @param pId       上级id
+     * @param month     月份，传则当月，不传全部
+     * @return
+     */
+    default MerchantOrderStatistics getDirectTotal(@Param("pId") String pId, @Param("month") String month) {
+        MerchantOrderStatistics res = ((MerchantOrderStatisticsMapper) getBaseMapper()).selectDirectTotal(pId, month);
+        if (res == null) {
+            res = new MerchantOrderStatistics();
+            res.setTotalFee(BigDecimal.ZERO);
+            res.setCount(0);
+
+            return res;
+        }
+
+        if (res.getTotalFee() == null) {
+            res.setTotalFee(BigDecimal.ZERO);
+        }
+
+        if (res.getCount() == null) {
+            res.setCount(0);
+        }
+
+        return res;
+    }
+
+    /**
+     * 获取非直推总交易钱数, 以及交易笔数
+     * @param pId       上级id
+     * @param month     月份，传则当月，不传全部
+     * @return
+     */
+    default MerchantOrderStatistics getIndirectTotal(@Param("pId") String pId, @Param("month") String month) {
+        MerchantOrderStatistics res = ((MerchantOrderStatisticsMapper) getBaseMapper()).selectIndirectTotal(pId, month);
+        if (res == null) {
+            res = new MerchantOrderStatistics();
+            res.setTotalFee(BigDecimal.ZERO);
+            res.setCount(0);
+
+            return res;
+        }
+
+        if (res.getTotalFee() == null) {
+            res.setTotalFee(BigDecimal.ZERO);
+        }
+
+        if (res.getRetFee() == null) {
+            res.setRetFee(BigDecimal.ZERO);
+        }
+
+        if (res.getCount() == null) {
+            res.setCount(0);
+        }
+
+        res.setTotalFee(res.getTotalFee().subtract(res.getRetFee()));
+
+        return res;
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrder/impl/MerchantOrderServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrder/impl/MerchantOrderServiceImpl.java
new file mode 100644
index 0000000..f07514b
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrder/impl/MerchantOrderServiceImpl.java
@@ -0,0 +1,2421 @@
+package cn.pluss.platform.merchantOrder.impl;
+
+import cn.hutool.crypto.SecureUtil;
+import cn.pluss.platform.IdCardService;
+import cn.pluss.platform.PushService;
+import cn.pluss.platform.activityConsumReturn.ActivityConsumReturnService;
+import cn.pluss.platform.activityRecharge.ActivityRechargeService;
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultCode;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.constants.Constant;
+import cn.pluss.platform.constants.ProjectConstant;
+import cn.pluss.platform.dto.MemberRechargeDTO;
+import cn.pluss.platform.dto.MemberScanPayDTO;
+import cn.pluss.platform.dto.MerChantOrderDTO;
+import cn.pluss.platform.entitiy.SettleTypeEnum;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.enums.UserRoleEnum;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.*;
+import cn.pluss.platform.memberOrder.MemberOrderService;
+import cn.pluss.platform.merchant.MerchantCashPlaceService;
+import cn.pluss.platform.merchant.MerchantCashPlaceStaffService;
+import cn.pluss.platform.merchant.MerchantRateNewService;
+import cn.pluss.platform.merchant.move.MerchantMoveRecordsService;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.merchantMemberCode.MerchantMemberCodeService;
+import cn.pluss.platform.merchantMenber.MerchantMenberService;
+import cn.pluss.platform.merchantMenberRecharge.MerchantMenberRechargeService;
+import cn.pluss.platform.merchantOrder.MerchantOrderService;
+import cn.pluss.platform.merchantOrderSplit.MerchantOrderSplitService;
+import cn.pluss.platform.merchantProfit.MerchantProfitService;
+import cn.pluss.platform.merchantStore.MerchantStoreService;
+import cn.pluss.platform.notice.NoticeService;
+import cn.pluss.platform.notify.NotifyMessageService;
+import cn.pluss.platform.officialGoods.exchange.OfficialGoodsExchangeService;
+import cn.pluss.platform.pay.PayService;
+import cn.pluss.platform.realFans.RealFansService;
+import cn.pluss.platform.ryx.RyxConstants;
+import cn.pluss.platform.ryx.pay.RyxPayService;
+import cn.pluss.platform.suixingfu.SxfConstants;
+import cn.pluss.platform.sxf.pay.SxfPayService;
+import cn.pluss.platform.sys.QueueDataService;
+import cn.pluss.platform.user.UserVoiceService;
+import cn.pluss.platform.user.impl.GeneralPushUtil;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.userAssess.UserAssessService;
+import cn.pluss.platform.userInfo.UserInfoService;
+import cn.pluss.platform.userIntegral.UserIntegralService;
+import cn.pluss.platform.userIntegralUse.UserIntegralUseService;
+import cn.pluss.platform.util.*;
+import cn.pluss.platform.vo.*;
+import cn.pluss.platform.ys.YsBusinessCodeEnum;
+import cn.pluss.platform.ys.YsOldConstants;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.opencsv.CSVReader;
+import com.opencsv.CSVReaderBuilder;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import lombok.val;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.io.*;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.concurrent.ExecutorService;
+
+/**
+ * @author admin
+ */
+@Transactional
+@Slf4j
+@Service("merchantOrderService")
+public class MerchantOrderServiceImpl extends ServiceImpl<MerchantOrderMapper, MerchantOrder> implements MerchantOrderService {
+
+    @Autowired
+    private GeneralPushUtil generalPushUtil;
+
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantOrderVOMapper merchantOrderVOMapper;
+    @Setter(onMethod_ = {@Autowired})
+    private UserAppMapper userAppMapper;
+    @Setter(onMethod_ = {@Autowired})
+    private MemberOrderService memberOrderService;
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantBaseInfoService merchantBaseInfoService;
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantOrderMapper merchantOrderMapper;
+    @Setter(onMethod_ = {@Autowired,@Lazy})
+    private MerchantChannelStatusService merchantChannelStatusService;
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantStoreMapper merchantStoreMapper;
+    @Setter(onMethod_ = {@Autowired})
+    private ActivityRechargeService activityRechargeService;
+    @Setter(onMethod_ = {@Autowired})
+    private NoticeService noticeService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantMenberMapper merchantMenberMapper;
+
+    @Setter(onMethod_ = {@Lazy, @Autowired})
+    private IdCardService idCardService;
+    @Setter(onMethod_ = {@Autowired, @Lazy})
+    private SxfPayService sxfPayService;
+    @Setter(onMethod_ = {@Autowired})
+    private RyxPayService ryxPayService;
+
+    @Setter(onMethod_ = {@Autowired, @Qualifier("ysPayOldService")})
+    private PayService ysPayOldService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private UserAppService userAppService;
+
+    @Setter(onMethod_ = {@Lazy, @Autowired})
+    private RealFansService realFansService;
+    @Setter(onMethod_ = {@Lazy, @Autowired})
+    private MerchantIncomeMapper merchantIncomeMapper;
+
+    @Setter(onMethod_ = {@Lazy, @Autowired})
+    private ActivityConsumReturnService activityConsumReturnService;
+    @Setter(onMethod_ = {@Lazy, @Autowired})
+    private MerchantMenberComsumeMapper merchantMenberComsumeMapper;
+    @Setter(onMethod_ = {@Lazy, @Autowired})
+    private MerchantMenberRechargeMapper merchantMenberRechargeMapper;
+    @Setter(onMethod_ = {@Lazy, @Autowired})
+    private MerchantRefundOrderMapper merchantRefundOrderMapper;
+    @Setter(onMethod_ = {@Lazy, @Autowired})
+    private ActivityEnrollMapper activityEnrollMapper;
+    @Setter(onMethod_ = {@Lazy, @Autowired})
+    private OfficialActivityMapper officialActivityMapper;
+    @Setter(onMethod_ = {@Lazy, @Autowired})
+    private MerchantMarketMapper merchantMarketMapper;
+    @Setter(onMethod_ = {@Lazy, @Autowired})
+    private MerchantPluginMapper merchantPluginMapper;
+    @Setter(onMethod_ = {@Lazy, @Autowired})
+    private MerchantCashPlaceStaffService cashPlaceStaffService;
+    @Setter(onMethod_ = {@Lazy, @Autowired})
+    private PushService pushService;
+    @Setter(onMethod_ = {@Lazy, @Autowired})
+    private UserInfoService userInfoService;
+
+    @Setter(onMethod_ = {@Lazy, @Autowired})
+    private NotifyMessageService notifyMessageService;
+
+    @Setter(onMethod_ = {@Lazy, @Autowired})
+    private MerchantRateNewService merchantRateNewService;
+
+    @Setter(onMethod_ = {@Lazy, @Autowired})
+    private MerchantMoveRecordsService merchantMoveRecordsService;
+
+    @Setter(onMethod_ = {@Lazy, @Autowired})
+    private MerchantStoreService merchantStoreService;
+
+    @Setter(onMethod_ = {@Lazy, @Autowired})
+    private MerchantMenberRechargeService menberRechargeService;
+
+    @Setter(onMethod_ = {@Lazy, @Autowired})
+    private MerchantMenberService merchantMenberService;
+
+    @Setter(onMethod_ = {@Lazy, @Autowired})
+    private MerchantProfitService merchantProfitService;
+
+    @Setter(onMethod_ = {@Lazy, @Autowired})
+    private MerchantCashPlaceService merchantCashPlaceService;
+
+    @Resource
+    private OfficialGoodsExchangeService officialGoodsExchangeService;
+
+    @Autowired
+    private ExecutorService executorService;
+
+    @Resource
+    private QueueDataService queueDataService;
+
+    @Autowired
+    private RabbitTemplate rabbitTemplate;
+
+    @Setter(onMethod_ = {@Lazy, @Autowired})
+    private UserVoiceService userVoiceService;
+
+    @Resource
+    private UserIntegralService userIntegralService;
+
+    @Resource
+    private UserIntegralUseService userIntegralUseService;
+
+    @Resource
+    private MerchantMemberCodeService merchantMemberCodeService;
+
+    @Resource
+    private UserAssessService userAssessService;
+
+    @Resource
+    private MerchantOrderSplitService merchantOrderSplitService;
+
+
+    @Override
+    public Map<String, Object> billCollect(MerchantOrder merchantOrder) {
+        UserApp tokenUserApp = userAppService.queryUserAppByToken();
+        if (!"1".equals(tokenUserApp.getPermissionBill())) {
+            merchantOrder.setStaffCode(tokenUserApp.getUserId() + "");
+        }
+
+        QueryWrapper<Object> queryWrapper2 = new QueryWrapper<>();
+        queryWrapper2.eq("ua.userId", tokenUserApp.getUserId());
+        tokenUserApp = userAppService.appGetOne(queryWrapper2);
+
+        if ("staff".equals(tokenUserApp.getUserType()) && "0".equals(tokenUserApp.getPermissionBill())) {
+            merchantOrder.setStaffCode(tokenUserApp.getUserId() + "");
+        }
+
+        if (merchantOrder.getStartTime() == null) {
+            merchantOrder.setStartTime(DateUtils.getDayBegin());
+        }
+
+        if (merchantOrder.getEndTime() == null) {
+            merchantOrder.setEndTime(DateUtils.getDayEnd());
+        }
+
+        if (merchantOrder.getSize() == null || merchantOrder.getSize() == 0) {
+            merchantOrder.setSize(ProjectConstant.PAGE_SIZE);
+        }
+
+        if (merchantOrder.getPage() == null || merchantOrder.getPage() == 0) {
+            merchantOrder.setPage(1);
+        }
+
+        // 初始化支付方式条件
+        String payTypeCode = merchantOrder.getPayTypeCode();
+        if (payTypeCode != null) {
+            payTypeCode = payTypeCode.replace("wechatPay", "wechatPay,leshuaPay1,leshuaPay-1,leshuaPay,sxfPay1");
+            payTypeCode = payTypeCode.replace("aliPay", "aliPay,leshuaPay0,leshuaPay-0,leshuaPay,sxfPay0");
+            payTypeCode = payTypeCode.replace("bank", "leshuaPay2,bank,sxfPay2");
+            merchantOrder.setPayTypeCode(payTypeCode);
+        }
+
+        // 获取通用查询条件
+        LambdaQueryWrapper<MerchantOrderVO> queryWrapper = getConditionWrapper(merchantOrder);
+
+        // 计算总数
+        LambdaQueryWrapper<MerchantOrderVO> countQueryWrapper = queryWrapper.clone();
+        if (StringUtils.isEmpty(merchantOrder.getStatus())) {
+            countQueryWrapper.in(MerchantOrder::getStatus, "1");
+        }
+        Integer orderCount = merchantOrderVOMapper.selectCount(countQueryWrapper);
+
+        // 计算总和
+        LambdaQueryWrapper<MerchantOrderVO> queryWrapperTotal = queryWrapper.clone();
+        queryWrapperTotal.groupBy(MerchantOrder::getStatus);
+        List<Map<String, Object>> feeList = baseMapper.getSumConsumeFee(queryWrapperTotal);
+        BigDecimal totalOrderFee = BigDecimal.ZERO;
+        for (Map<String, Object> fee : feeList) {
+            if ("1".equals(fee.get("status"))) {
+                totalOrderFee = totalOrderFee.add(new BigDecimal(fee.get("fee").toString()));
+            } else {
+                totalOrderFee = totalOrderFee.subtract(new BigDecimal(fee.get("fee").toString()));
+            }
+        }
+        // 添加分页条件后获取订单列表
+        LambdaQueryWrapper<MerchantOrderVO> pageQuery = queryWrapper.clone();
+        pageQuery.orderByDesc(MerchantOrder::getCreateDt);
+
+        Page<MerchantOrderVO> page = new Page<>(merchantOrder.getPage(), merchantOrder.getSize());
+        IPage<MerchantOrderVO> pageMerchantOrder = merchantOrderVOMapper.selectPage(page, pageQuery);
+
+        Integer userId = merchantOrder.getUserId();
+        IdCard idCard = new IdCard().setUserId(userId + "").setUserType("01");
+        idCard = idCardService.getOne(new QueryWrapper<>(idCard));
+
+        for (MerchantOrderVO item : pageMerchantOrder.getRecords()) {
+            if ("2".equals(item.getStatus())) {
+                item.setEnterFee(item.getConsumeFee());
+            }
+
+            item.setAlias(item.getStoreName());
+            MerchantOrder.updateStaffName(item, item.getMerchantCode(), idCard);
+            MerchantOrder.updateOrderTypeDesc(item);
+
+            MerchantOrderVO.setD0Fee(item);
+        }
+
+        Map<String, Object> resultMap = new HashMap<>();
+        PageInfo<MerchantOrderVO> pager = PageUtils.page(pageMerchantOrder);
+        resultMap.put("pager", pager);
+        resultMap.put("orderCount", orderCount);
+        resultMap.put("totalOrderFee", totalOrderFee);
+
+        return resultMap;
+    }
+
+    /**
+     * 根据实体类信息，包装的查询条件
+     *
+     * @param merchantOrder
+     * @return
+     */
+    private <E extends MerchantOrder> LambdaQueryWrapper<E> getConditionWrapper(MerchantOrder merchantOrder) {
+        LambdaQueryWrapper<E> queryWrapper = Wrappers.lambdaQuery();
+
+        if (StringUtils.isNotEmpty(merchantOrder.getPayTypeCode())) {
+            queryWrapper.in(MerchantOrder::getPayTypeCode, merchantOrder.getPayTypeCode().split(","));
+        }
+
+        queryWrapper.ge(MerchantOrder::getUpdateTime, merchantOrder.getStartTime());
+        queryWrapper.lt(MerchantOrder::getUpdateTime, merchantOrder.getEndTime());
+        queryWrapper.eq(merchantOrder.getSettlementType() != null, MerchantOrder::getSettlementType, merchantOrder.getSettlementType());
+
+        if (StringUtils.isEmpty(merchantOrder.getStatus())) {
+            queryWrapper.in(MerchantOrder::getStatus, "1", "2");
+        } else {
+            queryWrapper.in(MerchantOrder::getStatus, merchantOrder.getStatus());
+        }
+
+        if (StringUtils.isNotEmpty(merchantOrder.getStaffCode())) {
+            queryWrapper.in(MerchantOrder::getStaffCode, merchantOrder.getStaffCode().split(","));
+        }
+
+        if (StringUtils.isNotEmpty(merchantOrder.getCashPlaceId())) {
+            queryWrapper.in(MerchantOrder::getCashPlaceId, merchantOrder.getCashPlaceId().split(","));
+        }
+
+        if (StringUtils.isNotEmpty(merchantOrder.getMerchantCode())) {
+            queryWrapper.in(MerchantOrder::getMerchantCode, merchantOrder.getMerchantCode().split(","));
+        }
+
+        return queryWrapper;
+    }
+
+    @Override
+    public Integer queryMerchantOrderPageCountApp(Map map) {
+        return baseMapper.queryMerchantOrderPageCountApp(map);
+    }
+
+    @Override
+    public SummaryOfWaterVO querySummaryOfWater(Map map) {
+        return baseMapper.querySummaryOfWater(map);
+    }
+
+    @Override
+    public List<MerchantOrder> queryMerchantOrderRefundPage(Map map) {
+        return baseMapper.queryMerchantOrderRefundPage(map);
+    }
+
+    @Override
+    public Integer queryMerchantOrderRefundPageCount(Map map) {
+        return baseMapper.queryMerchantOrderRefundPageCount(map);
+    }
+
+    @Override
+    public List<OrderStatisticsVO> queryOrderStatistics(MerchantOrder s) {
+        return baseMapper.queryOrderStatistics(s);
+    }
+
+    @Override
+    public List<PayTypeStatisticsVO> queryPayTypeStatistics(MerchantOrder s) {
+        return baseMapper.queryPayTypeStatistics(s);
+    }
+
+    @Override
+    public List<MerchantMangeOrderVO> queryMerchantOrderPageShuju(Map<String, Object> map) {
+        return baseMapper.queryMerchantOrderPageShuju(map);
+    }
+
+    @Override
+    public Integer queryMerchantOrderPageCountShuju(Map<String, Object> map) {
+        return baseMapper.queryMerchantOrderPageCountShuju(map);
+    }
+
+    @Override
+    public Map<String, Object> platformSum() {
+        Map<String, Object> result = new HashMap<>(16);
+        // 总的统计
+        PlatformSumVO platformSum = baseMapper.PlatformSum(null);
+        // 今日数据统计
+        PlatformSumVO platformSum2 = baseMapper.PlatformSum("1");
+        // 昨日数据统计
+        PlatformSumVO platformSum3 = baseMapper.PlatformSum("2");
+        Double aliSumPlatformSum = Optional.ofNullable(platformSum.getAliSum()).orElse(0d);
+        Double wechatSumPlatformSum = Optional.ofNullable(platformSum.getWechatSum()).orElse(0d);
+        Double leshuaSumPlatformSum = Optional.ofNullable(platformSum.getLeshuaSum()).orElse(0d);
+        platformSum.setEarnings(aliSumPlatformSum + wechatSumPlatformSum + leshuaSumPlatformSum);
+        result.put("platformSum", platformSum);
+
+        Double aliSumPlatformSum2 = Optional.ofNullable(platformSum2.getAliSum()).orElse(0d);
+        Double wechatSumPlatformSum2 = Optional.ofNullable(platformSum2.getWechatSum()).orElse(0d);
+        Double leshuaSumPlatformSum2 = Optional.ofNullable(platformSum2.getLeshuaSum()).orElse(0d);
+
+        platformSum2.setEarnings(aliSumPlatformSum2 + wechatSumPlatformSum2 + leshuaSumPlatformSum2);
+        result.put("platformSumToDay", platformSum2);
+        Double aliSumPlatformSum3 = Optional.ofNullable(platformSum3.getAliSum()).orElse(0d);
+        Double wechatSumPlatformSum3 = Optional.ofNullable(platformSum3.getWechatSum()).orElse(0d);
+        Double leshuaSumPlatformSum3 = Optional.ofNullable(platformSum3.getLeshuaSum()).orElse(0d);
+        platformSum3.setEarnings(aliSumPlatformSum3 + wechatSumPlatformSum3 + leshuaSumPlatformSum3);
+        result.put("platformSumYesterDay", platformSum3);
+        return result;
+    }
+
+    @Override
+    public Map<String, Object> queryHomePageData(UserApp userApp) {
+        UserApp tokenApp = userAppService.queryUserAppByToken();
+        Map<String, Object> resultMap = new HashMap<>(16);
+
+        val hasPermission= "1".equals(tokenApp.getPermissionBill()) || "promoter".equals(tokenApp.getUserType());
+
+        if (StringUtils.isEmpty(tokenApp.getMerchantCode())) {
+            resultMap.put("todayConsumeFee", 0.00);
+            resultMap.put("orderCount", 0);
+            resultMap.put("fanCount", 0);
+
+            return resultMap;
+        }
+
+        MsgException.checkNull(userApp.getUserId(), "无用户id");
+
+        // 今日订单总金额
+        BigDecimal todayConsumeFee = BigDecimal.ZERO;
+        int orderCount = 0;// 今日订单数量
+        Integer fanCount = 0;// 今日粉丝数量
+        
+
+        LambdaQueryWrapper<MerchantOrder> queryWrapperTotal = Wrappers.lambdaQuery();
+        Date dayBegin = DateUtils.getDayBegin();
+        Date dayEnd = DateUtils.getDayEnd();
+        queryWrapperTotal.between(MerchantOrder::getCreateDt, dayBegin, dayEnd)
+                .eq(MerchantOrder::getMerchantCode, tokenApp.getMerchantCode())
+                .in(MerchantOrder::getStatus, "1")
+                .groupBy(MerchantOrder::getStatus);
+        if (!hasPermission) {
+            queryWrapperTotal.eq(MerchantOrder::getStaffCode, tokenApp.getUserId());
+        }
+
+        List<Map<String, Object>> feeList = baseMapper.getSumConsumeFee(queryWrapperTotal);
+        for (Map<String, Object> fee : feeList) {
+            if ("1".equals(fee.get("status"))) {
+                todayConsumeFee = todayConsumeFee.add(new BigDecimal(fee.get("fee").toString()));
+            } else {
+                todayConsumeFee = todayConsumeFee.subtract(new BigDecimal(fee.get("fee").toString()));
+            }
+        }
+
+        // 先获取普通订单的笔数
+        LambdaQueryWrapper<MerchantOrder> orderCountWrapper = Wrappers.lambdaQuery();
+        orderCountWrapper.between(MerchantOrder::getCreateDt, dayBegin, dayEnd)
+                .eq(MerchantOrder::getMerchantCode, tokenApp.getMerchantCode())
+                .eq(MerchantOrder::getStatus, "1")
+                .notIn(MerchantOrder::getOrderType, "3", "5");
+        if (!hasPermission) {
+            orderCountWrapper.eq(MerchantOrder::getStaffCode, tokenApp.getUserId());
+        }
+
+        int merchantOrderCount = baseMapper.selectCount(orderCountWrapper);
+
+        LambdaQueryWrapper<MemberOrder> memberCountWrapper = Wrappers.lambdaQuery();
+        memberCountWrapper.between(MemberOrder::getCreateDt, dayBegin, dayEnd)
+                .eq(MemberOrder::getMerchantCode, tokenApp.getMerchantCode())
+                .eq(MemberOrder::getOrderStatus, "1");
+        if (!hasPermission) {
+            memberCountWrapper.eq(MemberOrder::getStaffCode, tokenApp.getUserId());
+        }
+
+        int memberOrderCount = memberOrderService.count(memberCountWrapper);
+
+        val qWrapperNewMemberCount = new QueryWrapper<MerchantMenber>();
+        qWrapperNewMemberCount.between("createDt", dayBegin, dayEnd).eq("merchantCode", tokenApp.getMerchantCode());
+
+        orderCount = merchantOrderCount + memberOrderCount;
+        Map<String, Object> queryMap2 = new HashMap<>(16);
+        queryMap2.put("merchantCode", tokenApp.getMerchantCode());
+        queryMap2.put("startTime", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(dayBegin));
+        queryMap2.put("endTime", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(dayEnd));
+        // 今日粉丝数量
+//        fanCount = fansService.queryFansPageCount(queryMap2);
+
+        if ("staff".equals(tokenApp.getUserType())) {
+            fanCount = 0;
+        } else {
+            fanCount = merchantMenberMapper.selectCount(qWrapperNewMemberCount);
+        }
+
+        resultMap.put("todayConsumeFee", todayConsumeFee + "");
+        resultMap.put("memberOrderCount", memberOrderCount + "");
+        resultMap.put("orderCount", orderCount + "");
+        resultMap.put("fanCount", fanCount + "");
+
+        return resultMap;
+    }
+
+    @Override
+    public Map<String, Object> queryCheckOrderData(MerchantOrder merchantOrder) {
+        UserApp tokenUa = userAppService.queryUserAppByToken();
+        merchantOrder.setMerchantCode(tokenUa.getMerchantCode());
+
+        if (StringUtil.isEmpty(merchantOrder.getMerchantCode())) {
+            throw new MsgException("无商家编码");
+        }
+        MerchantBaseInfo queryMerchantBaseInfo = new MerchantBaseInfo();
+        queryMerchantBaseInfo.setMerchantCode(merchantOrder.getMerchantCode());
+        // 查询当前的商家信息
+        List<MerchantBaseInfo> queryMerchantBaseInfoList = merchantBaseInfoService.queryMerchantBaseInfoList(queryMerchantBaseInfo);
+        if (queryMerchantBaseInfoList == null || queryMerchantBaseInfoList.size() == 0) {
+            throw new MsgException("商家信息不存在");
+        }
+//        Map<String, Object> queryMap = new HashMap<>(16);
+//        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//        if (StringUtil.isNotEmpty(merchantOrder.getStartTime())) {
+//            queryMap.put("startTime", merchantOrder.getStartTime());
+//        } else {
+//            queryMap.put("startTime", sdf.format(DateUtils.getDayBegin()));
+//        }
+//        if (StringUtil.isNotEmpty(merchantOrder.getEndTime())) {
+//            queryMap.put("endTime", merchantOrder.getEndTime());
+//        } else {
+//            queryMap.put("endTime", sdf.format(DateUtils.getDayEnd()));
+//        }
+//        queryMap.put("merchantCode", merchantOrder.getMerchantCode());
+//        if (merchantOrder.getStaffCode() != null && !StringUtil.isEmpty(merchantOrder.getStaffCode())) {
+//            String[] staffCode = merchantOrder.getStaffCode().split(",");
+//            List<String> staffCodeList = new ArrayList<>(Arrays.asList(staffCode));
+//            queryMap.put("staffCode", staffCodeList);
+//        }
+//        queryMap.put("status", 1);// 查询交易成功的交易费用
+
+        Integer consumeCount = getConsumeCount(merchantOrder);
+        Integer refundCount = getRefundCount(merchantOrder);
+        BigDecimal[] arr = getTotalConsumeAndRefund(merchantOrder);
+        // 实付金额（订单的交易额）（交易金额）
+        BigDecimal totalConsumeFee = arr[0] == null ? BigDecimal.ZERO : arr[0];
+        // 净退款
+        BigDecimal totalRefundConsumeFee = arr[1] == null ? BigDecimal.ZERO : arr[1];
+        // 实收金额
+        BigDecimal totalEnterFee = getTotalEnterFee(merchantOrder);
+        // 手续费
+        BigDecimal totalCommission = getTotalCommission(totalConsumeFee, totalRefundConsumeFee, totalEnterFee);
+
+        Map<String, Object> resultMap = new HashMap<>();
+        resultMap.put("orderNum", consumeCount == null ? 0 : consumeCount);
+        resultMap.put("returnOrderNum", refundCount == null ? 0 : refundCount);
+        resultMap.put("enterFee", totalEnterFee);
+        resultMap.put("totalConsumFee", totalConsumeFee);
+        resultMap.put("totalReceiveFee", totalConsumeFee);
+        resultMap.put("commission", totalCommission);
+        resultMap.put("returnMoney", totalRefundConsumeFee);
+
+        return resultMap;
+    }
+
+    private LambdaQueryWrapper<MerchantOrder> getMerchantQueryWrapper(MerchantOrder merchantOrder) {
+        return getMerchantQueryWrapper(merchantOrder, true);
+    }
+
+    private LambdaQueryWrapper<MerchantOrder> getMerchantQueryWrapper(MerchantOrder merchantOrder, boolean groupFlag) {
+        Date start = merchantOrder.getStartTime() == null ? DateUtils.getDayBegin() : merchantOrder.getStartTime();
+        Date end = merchantOrder.getEndTime() == null ? DateUtils.getDayEnd() : merchantOrder.getEndTime();
+        LambdaQueryWrapper<MerchantOrder> lambdaQueryWrapper = Wrappers.lambdaQuery();
+        lambdaQueryWrapper.between(MerchantOrder::getCreateDt, start, end)
+                .eq(MerchantOrder::getMerchantCode, merchantOrder.getMerchantCode())
+                .in(MerchantOrder::getStatus, "1", "2")
+                .groupBy(groupFlag, MerchantOrder::getStatus);
+
+        if (StringUtils.isNotEmpty(merchantOrder.getStaffCode())) {
+            lambdaQueryWrapper.in(MerchantOrder::getStaffCode, merchantOrder.getStaffCode().split(","));
+        }
+
+        return lambdaQueryWrapper;
+    }
+
+    /**
+     * 获取付款单数
+     *
+     * @return
+     */
+    public Integer getConsumeCount(MerchantOrder merchantOrder) {
+        LambdaQueryWrapper<MerchantOrder> merchantQueryWrapper = getMerchantQueryWrapper(merchantOrder);
+        merchantQueryWrapper.in(MerchantOrder::getStatus, "1");
+        return baseMapper.selectCount(merchantQueryWrapper);
+    }
+
+    /**
+     * 获取退款单数
+     *
+     * @return
+     */
+    public Integer getRefundCount(MerchantOrder merchantOrder) {
+        LambdaQueryWrapper<MerchantOrder> merchantQueryWrapper = getMerchantQueryWrapper(merchantOrder);
+        merchantQueryWrapper.in(MerchantOrder::getStatus, "2");
+        return baseMapper.selectCount(merchantQueryWrapper);
+    }
+
+    /**
+     * 获取实付金额和净退款
+     *
+     * @return
+     */
+    public BigDecimal[] getTotalConsumeAndRefund(MerchantOrder merchantOrder) {
+        BigDecimal[] result = new BigDecimal[2];
+        LambdaQueryWrapper<MerchantOrder> merchantQueryWrapper = getMerchantQueryWrapper(merchantOrder);
+        List<Map<String, Object>> data = baseMapper.getSumConsumeFee(merchantQueryWrapper);
+        for (Map<String, Object> map : data) {
+            if ("1".equals(map.get("status"))) {
+                result[0] = new BigDecimal(map.get("fee").toString());
+            } else {
+                result[1] = new BigDecimal(map.get("fee").toString());
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * 获取实收金额, 即除开退款和手续费
+     *
+     * @param merchantOrder
+     * @return
+     */
+    private BigDecimal getTotalEnterFee(MerchantOrder merchantOrder) {
+        LambdaQueryWrapper<MerchantOrder> merchantQueryWrapper = getMerchantQueryWrapper(merchantOrder, false);
+        merchantQueryWrapper.in(MerchantOrder::getStatus, "1", "2");
+        Map<String, Object> sumMap = baseMapper.getSumEnterFee(merchantQueryWrapper);
+
+        BigDecimal result = new BigDecimal(sumMap.get("fee").toString());
+
+        return result;
+    }
+
+    /**
+     * 获取手续费信息
+     *
+     * @param totalConsumeFee       实付金额
+     * @param totalRefundConsumeFee 净退款
+     * @param totalEnterFee         实收金额
+     * @return
+     */
+    private BigDecimal getTotalCommission(BigDecimal totalConsumeFee, BigDecimal totalRefundConsumeFee, BigDecimal totalEnterFee) {
+        return totalConsumeFee.subtract(totalRefundConsumeFee).subtract(totalEnterFee);
+    }
+
+    /**
+     * 查询订单页面统计
+     *
+     * @param params
+     * @return
+     */
+    @Override
+    public Map<String, Object> querySumCount(Map<String, Object> params) {
+        return baseMapper.querySumCount(params);
+    }
+
+    /**
+     * queryNextMercTransAmtCount
+     *
+     * @param merchantNoList
+     * @return
+     */
+    @Override
+    public Double queryNextMercTransAmtCount(List<String> merchantNoList) {
+        return baseMapper.queryNextMercTransAmtCount(merchantNoList);
+    }
+
+    /**
+     * updateMerchantOrderStatus:(添加订单). <br/>
+     *
+     * @param
+     * @return
+     * 
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    @Override
+    public MerchantOrder saveMerchantOrderStatus(String outTradeNo, MerchantOrder merchantOrder) {
+        merchantOrder.setTransNo(outTradeNo);
+        merchantOrder.setStatus("1");
+        this.baseMapper.updateById(merchantOrder);
+        return merchantOrder;
+    }
+
+    /**
+     * 获取超级代理商下级商户当月交易额
+     *
+     * @param params
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getSuperMerchantToDayTradeMoneyCount(Map<String, Object> params) {
+        return baseMapper.getSuperMerchantToDayTradeMoneyCount(params);
+    }
+
+    /**
+     * 订单分润明细分页查询
+     *
+     * @param map
+     * @return
+     */
+    @Override
+    public List<MerchantOrderProfitVO> pageData(Map<String, Object> map) {
+        List<MerchantOrderProfitVO> profitInfoPage = merchantOrderMapper.selectProfitPage(map);
+        return profitInfoPage;
+    }
+
+    @Override
+    public Integer pageDataCount(Map<String, Object> map) {
+        return merchantOrderMapper.selectProfitPageCount(map);
+    }
+
+//    /**
+//     * 统计营销活动奖励金
+//     *
+//     * @return
+//     */
+//    @Override
+//    public Map<String, BigDecimal> getCountMaketAmt(Long userId, String date, String auditDate) {
+//        return merchantOrderMapper.getCountMaketAmt(userId, date, auditDate);
+//    }
+
+    /**
+     * 获取商户当前已经积累的交易额度
+     *
+     * @param merchantCode
+     * @return
+     */
+    @Override
+    public Map<String, Double> getCountTradeAmt(String merchantCode, String date, String startDate, String endDate) {
+        return baseMapper.getCountTradeAmt(merchantCode, date, startDate, endDate);
+    }
+
+    /**
+     * wap 分页查询
+     *
+     * @param page
+     * @param order
+     * @return
+     */
+    @Override
+    public Page<MerchantOrder> pageWapInfo(Page<MerchantOrder> page, MerchantOrder order) {
+        return this.baseMapper.pageWapInfo(page, order);
+    }
+
+    /**
+     * 计算累计省钱金额和今日省钱金额
+     *
+     * @param merchantCode
+     * @param nowDate
+     * @return
+     */
+    @Override
+    public Map<String, BigDecimal> getSaveMoneyCount(String merchantCode, String nowDate, String startDate, String endDate) {
+        return this.baseMapper.getSaveMoneyCount(merchantCode, nowDate, startDate, endDate);
+    }
+
+
+    @Override
+    public Result<Object> toActivePay(MerChantOrderDTO dto) {
+        //校验参数
+        checkActivePayParamsMap(dto);
+        //组装订单参数
+        if(StringUtils.isNotEmpty(dto.getType()) && "3".equals(dto.getType())){
+            MerchantMemberCode menberCode = dto.getMercMenberCode();
+            MerchantMenber menber = merchantMenberMapper.getByCardNo(menberCode.getCardNo());
+            MemberScanPayDTO memberScanPayDTO = new MemberScanPayDTO(dto,menber);
+            MemberScanVO vo = getMemberPayOrder(memberScanPayDTO, menber);
+            Map<String, Object> result = new HashMap<>();
+            result.put("data",vo);
+            result.put("orderNumber",vo.getOrderNumber());
+            result.put("message", "交易成功");
+            return ResultGenerator.genSuccessResult("支付成功", result);
+        }else{
+            MerchantOrder order = getMerchantOrder(dto, dto.getConsumeFee(), "1","1");
+            return activePay(order, dto);
+        }
+    }
+
+    /**
+     * 主扫会员卡支付
+     *
+     * @param memberScanPayDTO
+     * @return
+     */
+    @Override
+    public Result<MemberScanVO> toMemberScanPay(MemberScanPayDTO memberScanPayDTO) {
+        // 校验参数
+        MerchantMenber menber = checkMemberScanPayParamsMap(memberScanPayDTO);
+        //组装会员订单支付参数
+        MemberScanVO vo = getMemberPayOrder(memberScanPayDTO, menber);
+        return ResultGenerator.genSuccessResult(vo);
+    }
+
+    /**
+     * 主扫会员卡充值
+     *
+     * @param dto
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class,propagation = Propagation.NOT_SUPPORTED)
+    public Result<Map<String, Object>> toMemberRecharge(MemberRechargeDTO dto) {
+        // 校验参数
+        checkActivePayParamsMap(dto);
+
+        MerchantOrder order = getMerchantOrder(dto, Double.parseDouble(dto.getRechargeMoney()), "1","5");
+
+        QueryWrapper<MerchantMenber> menberWrapper = new QueryWrapper<MerchantMenber>()
+                .eq("phone", dto.getPhone()).eq("merchantCode", dto.getMerchantCode()).eq("storeId", dto.getStoreId());
+
+        MerchantMenber menber = merchantMenberMapper.selectOne(menberWrapper);
+        MsgException.checkNull(menber, "会员信息有误！");
+
+        MemberOrder memberOrder = new MemberOrder();
+        MerchantMenberRecharge recharge = new MerchantMenberRecharge();
+        //扫码充值
+        Result<Object> mapResult = null;
+        if ("0".equals(dto.getType())) {
+            mapResult = activePay(order, dto);
+            recharge.setPayType(1);
+            memberOrder.setRechargeType("2");
+        } else if ("1".equals(dto.getType())) {
+            // 现金充值
+            recharge.setPayType(3);
+            memberOrder.setRechargeType("1");
+            memberOrder.setOrderStatus("1");
+            setMemberRechargeOrder(dto, menber, memberOrder, recharge, order);
+            try {
+                merchantMenberService.sendMenberBalanceChangeNotice(menber,recharge.getRechargeMoney(),"3");
+            }catch (Exception e){
+                e.printStackTrace();
+            }
+            merchantIncome(memberOrder);
+            return ResultGenerator.genSuccessResult("充值成功", null);
+        }
+        if(mapResult.getCode() == ResultCode.SUCCESS.code()){
+            memberOrder.setOrderStatus("1");
+            setMemberRechargeOrder(dto, menber, memberOrder, recharge, order);
+            try {
+                merchantMenberService.sendMenberBalanceChangeNotice(menber,recharge.getRechargeMoney(),"1");
+            }catch (Exception e){
+                e.printStackTrace();
+            }
+            return ResultGenerator.genSuccessResult("充值成功", null);
+        }else if(mapResult.getCode() == ResultCode.TRANSUNKNOW.code()){
+            memberOrder.setOrderStatus("2");
+            setMemberRechargeOrder(dto, menber, memberOrder, recharge, order);
+            return ResultGenerator.genTransunKonwResult("等待支付中...", null);
+        }else{
+            return ResultGenerator.genFailResult("充值失败！");
+        }
+    }
+
+    /**
+     * @param order
+     * @param dto
+     * @return
+     */
+    private Result<Object>  activePay(MerchantOrder order, MerChantOrderDTO dto) {
+        log.info("【反扫支付】请求参数：{}", JSON.toJSONString(dto));
+        if ("2".equals(order.getAisleSwitch())) {
+            JSONObject object = sxfPayService.tradePay(dto, order);
+            return scanPay(object, order);
+        } else if ("3".equals(order.getAisleSwitch())) {
+            JSONObject object = ryxPayService.tradePay(dto, order);
+            return scanPay(object, order);
+        } else if("4".equals(order.getAisleSwitch())){
+            JSONObject object = ysPayOldService.tradePay(dto, order);
+            return scanPay(object, order);
+        }else{
+            throw new MsgException("未知通道！");
+        }
+    }
+
+
+    /**
+     * 会员充值收益
+     *
+     * @param memberOrder
+     */
+    private void merchantIncome(MemberOrder memberOrder) {
+        MerchantIncome merchantIncome = new MerchantIncome();
+        merchantIncome.setMerchantCode(memberOrder.getMerchantCode());
+        merchantIncome.setMerchantName(memberOrder.getMerchantName());
+        merchantIncome.setStoreId(memberOrder.getStoreId());
+        merchantIncome.setStoreName(memberOrder.getStoreName());
+        merchantIncome.setDealFee(Double.valueOf(memberOrder.getOrderFee()));
+        merchantIncome.setIncomeFee(Double.valueOf(memberOrder.getOrderFee()));
+        merchantIncome.setPayTypeCode("2");
+        merchantIncome.setPayTypeName("会员充值");
+        merchantIncome.setCreateTime(memberOrder.getCreateDt());
+        merchantIncomeMapper.saveMerchantIncome(merchantIncome);
+    }
+
+    /**
+     * 组装会员充值订单
+     *
+     * @return
+     */
+    @Override
+    public void setMemberRechargeOrder(MemberRechargeDTO dto, MerchantMenber menber, MemberOrder memberOrder, MerchantMenberRecharge recharge, MerchantOrder order) {
+
+        double totalRechargeFee = menber.getTotalRechargeFee() == null ? 0d : menber.getTotalRechargeFee();// 当前充值总额；
+        double usableRechargeFee = menber.getUsableRechargeFee() == null ? 0d : menber.getUsableRechargeFee();// 当前可用充值金额；
+        double totalGiveFee = menber.getTotalGiveFee() == null ? 0d : menber.getTotalGiveFee();// 总的赠送金额
+        double usableGiveFee = menber.getUsableGiveFee() == null ? 0d : menber.getUsableGiveFee();// 可用的赠送金额
+        double rechargeMoney = dto.getRechargeMoney() == null ? 0d : Double.parseDouble(dto.getRechargeMoney());// 本次充值金额；
+        totalRechargeFee = totalRechargeFee + rechargeMoney;
+        usableRechargeFee = usableRechargeFee + rechargeMoney;
+        //获取赠送金额
+        double giveMoney = activityRechargeService.getRechargeReturnAmt(dto.getMerchantCode(), dto.getStoreId(), Double.valueOf(dto.getRechargeMoney()));
+
+        totalGiveFee = totalGiveFee + giveMoney;
+        usableGiveFee = usableGiveFee + giveMoney;
+        menber.setTotalRechargeFee(totalRechargeFee);
+        menber.setUsableRechargeFee(usableRechargeFee);
+        menber.setTotalGiveFee(totalGiveFee);
+        menber.setUsableGiveFee(usableGiveFee);
+
+        memberOrder.setMerchantCode(dto.getMerchantCode());
+        memberOrder.setStoreId(dto.getStoreId());
+        memberOrder.setStaffCode(String.valueOf(dto.getUserId()));
+        memberOrder.setStaffName(dto.getUserName());
+        memberOrder.setNickName(menber.getNickName());
+        memberOrder.setMemberCode(menber.getMemberCode());
+        memberOrder.setOrderType("1");
+        Date date = new Date();
+        memberOrder.setCreateDt(date);
+        memberOrder.setOrderFee(dto.getRechargeMoney());
+        memberOrder.setMerchantName(menber.getMerchantName());
+        memberOrder.setStoreName(menber.getStoreName());
+        memberOrder.setOrderNumber(order.getOrderNumber());
+        recharge.setMerchantCode(menber.getMerchantCode());
+        recharge.setMerchantName(menber.getMerchantName());
+        recharge.setStoreId(menber.getStoreId());
+        recharge.setStoreName(menber.getStoreName());
+        recharge.setOrderNumber(order.getOrderNumber());
+        recharge.setCreateDt(date);
+        recharge.setLogo(menber.getLogo());
+        recharge.setMemberCode(menber.getMemberCode());
+        recharge.setNickName(menber.getNickName());
+        recharge.setPhone(menber.getPhone());
+        recharge.setRechargeMoney(Double.valueOf(dto.getRechargeMoney()));
+        recharge.setGiveMoney(giveMoney);
+        if("1".equals(memberOrder.getOrderStatus())){
+            merchantMenberMapper.updateMerchantMenber(menber);
+            merchantMenberRechargeMapper.saveMerchantMenberRecharge(recharge);
+        }
+        memberOrderService.saveMemberOrder(memberOrder);
+    }
+
+    /**
+     * 主扫会员卡充值
+     *
+     * @param dto
+     * @return
+     */
+    private JSONObject checkMemberRechargeParamsMap(MemberRechargeDTO dto) {
+        Optional.ofNullable(dto.getAuthCode()).orElseThrow(() -> new MsgException("无授权码"));
+        Optional.ofNullable(dto.getPhone()).orElseThrow(() -> new MsgException("无手机号"));
+        Optional.ofNullable(dto.getRechargeMoney()).orElseThrow(() -> new MsgException("无充值金额"));
+        Optional.ofNullable(dto.getStoreId()).orElseThrow(() -> new MsgException("无店铺ID"));
+        MerchantStore queryStore = new MerchantStore();
+        queryStore.setMerchantCode(dto.getMerchantCode());
+        queryStore.setStoreId(dto.getStoreId());
+        MerchantStore store = merchantStoreMapper.selectOne(new QueryWrapper<>(queryStore));
+        Optional.ofNullable(store).orElseThrow(() -> new MsgException("无店铺信息"));
+        MsgException.check("2".equals(store.getStatus()), "店铺已被禁用");
+        QueryWrapper<MerchantMenber> queryWrapper = new QueryWrapper<MerchantMenber>()
+                .eq("phone", dto.getPhone()).eq("merchantCode", dto.getMerchantCode()).eq("storeId", dto.getStoreId());
+        MerchantMenber member = merchantMenberMapper.selectOne(queryWrapper);
+        MsgException.check(member == null, "不属于当前门店会员");
+
+        MerchantChannelStatus channel = merchantChannelStatusService.getValidData(dto.getMerchantCode());
+        MsgException.checkNull(channel,"未获取到商户进件信息，请先提交商户信息");
+        MsgException.check("7".equals(channel.getStatus()),"实时到账审核中，请耐心等待或者联系客服！");
+        MsgException.check(!channel.isPayment(),"当前进件状态未通过，请耐心等待或联系客服！");
+
+        JSONObject result = new JSONObject(3);
+        result.put("channel", channel);
+        result.put("member", member);
+        result.put("store", store);
+        return result;
+    }
+
+
+    /**
+     * 组装会员订单参数
+     *
+     * @param memberScanPayDTO
+     * @return
+     */
+    private MemberScanVO getMemberPayOrder(MemberScanPayDTO memberScanPayDTO, MerchantMenber merchantMenber) {
+
+        MemberScanVO vo = new MemberScanVO();
+        vo.setRemark(memberScanPayDTO.getRemark());
+        /**
+         * 获取充值金额活动对应的返现金额
+         */
+        MerchantMenberComsume merchantMenberComsume = activityConsumReturnService.getActivityReturnParams(memberScanPayDTO.getMerchantCode(), memberScanPayDTO.getStoreId(), memberScanPayDTO.getConsumeFee());
+
+        Double usableRechargeFee = merchantMenber.getUsableRechargeFee() == null ? 0d : merchantMenber.getUsableRechargeFee();// 可用充值金额
+        usableRechargeFee = StringUtil.bigDecimal(usableRechargeFee);
+        Double usableGiveFee = merchantMenber.getUsableGiveFee() == null ? 0d : merchantMenber.getUsableGiveFee();// 可用的赠送金额
+        usableGiveFee = StringUtil.bigDecimal(usableGiveFee);
+        Double count = usableGiveFee + usableRechargeFee;
+        if (usableGiveFee >= memberScanPayDTO.getConsumeFee()) {// 可用的赠送余额大于等于消费金额
+            usableGiveFee = usableGiveFee - memberScanPayDTO.getConsumeFee();// 扣款之后的赠送金额
+        } else {// 可用的赠送余额小于消费金额
+            usableGiveFee = 0d;
+            usableRechargeFee = count - memberScanPayDTO.getConsumeFee();
+        }
+        MerchantMenber menber = new MerchantMenber();
+        menber.setUsableGiveFee(usableGiveFee);
+        menber.setUsableRechargeFee(usableRechargeFee);
+        Double comsumeMoney = merchantMenber.getComsumeMoney() == null ? 0d : merchantMenber.getComsumeMoney();// 之前会员的消费金额
+        menber.setComsumeMoney(StringUtil.bigDecimal(memberScanPayDTO.getConsumeFee() + comsumeMoney));// 现在的会员消费金额
+        Double totalGiveFee = merchantMenber.getTotalGiveFee() == null ? 0d : merchantMenber.getTotalGiveFee();
+        totalGiveFee = totalGiveFee + merchantMenberComsume.getReturnMoney();// 赠送总余额
+        menber.setTotalGiveFee(totalGiveFee);
+        // 赠送总可用余额
+        menber.setUsableGiveFee(usableGiveFee + merchantMenberComsume.getReturnMoney());
+        menber.setId(merchantMenber.getId());
+        // 修改会员表余额
+        merchantMenberMapper.updateMerchantMenber(menber);
+        String orderNumber = "XF700" + StringUtil.getBillno();
+        merchantMenberComsume = merchantMenberComsume.eval(orderNumber, merchantMenberComsume.getGiveMoney(), memberScanPayDTO, merchantMenber);
+
+        merchantMenberComsumeMapper.saveMerchantMenberComsume(merchantMenberComsume);
+
+        MemberOrder memberOrder = new MemberOrder();
+        memberOrder.setRemark(memberScanPayDTO.getRemark());
+        // 订单号
+        memberOrder.setMerchantCode(memberScanPayDTO.getMerchantCode());
+        memberOrder.setMerchantName(merchantMenber.getMerchantName());
+        memberOrder.setStoreId(memberScanPayDTO.getStoreId());
+        memberOrder.setStoreName(merchantMenber.getStoreName());
+        memberOrder.setOrderNumber(orderNumber);
+        memberOrder.setMemberCode(memberScanPayDTO.getAuthCode());
+        Date date = new Date();
+        memberOrder.setCreateDt(date);
+        memberOrder.setOrderFee(memberScanPayDTO.getConsumeFee() + "");// 订单金额
+        memberOrder.setNickName(merchantMenber.getNickName());
+        memberOrder.setOrderType("0");
+        memberOrder.setOrderStatus("1");
+        memberOrder.setStaffCode(memberScanPayDTO.getUserId());
+        memberOrder.setStaffName(memberScanPayDTO.getUserName());
+        memberOrderService.saveMemberOrder(memberOrder);
+        vo.setConsumeFee(memberScanPayDTO.getConsumeFee() + "");
+        vo.setStoreName(memberScanPayDTO.getStoreName());
+        vo.setCreateDt(date);
+        vo.setLoginName(memberScanPayDTO.getUserName());
+        try {
+            menber.setCardNo(merchantMenber.getCardNo());
+            menber.setMerchantCode(merchantMenber.getMerchantCode());
+            menber.setOpenid(merchantMenber.getOpenid());
+            merchantMenberService.sendMenberBalanceChangeNotice(menber,Double.valueOf(vo.getConsumeFee()),"2");
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        vo.setOrderNumber(orderNumber);
+        return vo;
+    }
+
+
+    /**
+     * 主扫会员充值参数校验
+     *
+     * @param memberScanPayDTO
+     */
+    private MerchantMenber checkMemberScanPayParamsMap(MemberScanPayDTO memberScanPayDTO) {
+        Optional.ofNullable(memberScanPayDTO.getMemberCode()).orElseThrow(() -> new MsgException("无授权码"));
+        Optional.ofNullable(memberScanPayDTO.getUserId()).orElseThrow(() -> new MsgException("无用户ID"));
+        Optional.ofNullable(memberScanPayDTO.getMerchantCode()).orElseThrow(() -> new MsgException("无商户编码"));
+        Optional.ofNullable(memberScanPayDTO.getStoreId()).orElseThrow(() -> new MsgException("无店铺ID"));
+        Optional.ofNullable(memberScanPayDTO.getConsumeFee()).orElseThrow(() -> new MsgException("无消费金额"));
+        Optional.ofNullable(memberScanPayDTO.getAuthCode()).orElseThrow(() -> new MsgException("无会员编码"));
+        UserApp userApp = new UserApp();
+        userApp.setUserId(Long.valueOf(memberScanPayDTO.getUserId()));
+        userApp = userAppMapper.selectOne(new QueryWrapper<>(userApp));
+        memberScanPayDTO.setUserName(userApp.getUserName());
+        QueryWrapper<MerchantMenber> menberWrapper = new QueryWrapper<MerchantMenber>()
+                .eq("memberCode", memberScanPayDTO.getAuthCode()).eq("storeId", memberScanPayDTO.getStoreId());
+        MerchantMenber m = merchantMenberMapper.selectOne(menberWrapper);
+        Optional.ofNullable(m).orElseThrow(() -> new MsgException("不属于当前门店会员"));
+        MerchantStore merchantStore = new MerchantStore();
+        merchantStore.setStoreId(memberScanPayDTO.getStoreId());
+        merchantStore.setMerchantCode(memberScanPayDTO.getMerchantCode());
+        merchantStore = merchantStoreMapper.selectOne(new QueryWrapper<>(merchantStore));
+        if ("2".equals(merchantStore.getStatus())) {
+            MsgException.throwException("当前店铺被禁用");
+        }
+        if (!"VIP".equalsIgnoreCase(memberScanPayDTO.getAuthCode().substring(0, 3))) {
+            MsgException.throwException("会员码不匹配");
+        }
+        memberScanPayDTO.setStoreName(merchantStore.getStoreName());
+        QueryWrapper<MerchantBaseInfo> infoWrapper = new QueryWrapper<MerchantBaseInfo>()
+                .eq("merchantCode", memberScanPayDTO.getMerchantCode());
+        MerchantBaseInfo merchant = merchantBaseInfoService.getOne(infoWrapper);
+        Optional.ofNullable(merchant).orElseThrow(() -> new MsgException("无商家信息"));
+        memberScanPayDTO.setMerchantName(merchant.getAlias());
+        MerchantChannelStatus channelStatus = merchantChannelStatusService.getValidData(memberScanPayDTO.getMerchantCode());
+        if (channelStatus == null) {
+            MsgException.throwException("无进件信息");
+        }
+        if (!channelStatus.isPayment()) {
+            MsgException.throwException("当前商家进件状态无法付款");
+        }
+        memberScanPayDTO.setAisleSwitch(String.valueOf(channelStatus.getChannel()));
+        checkCardBalance(m,memberScanPayDTO.getConsumeFee());
+        return m;
+    }
+
+    private void checkCardBalance(MerchantMenber m,Double consumeFee) {
+        Double usableRechargeFee = m.getUsableRechargeFee() == null ? 0d : m.getUsableRechargeFee();// 可用充值金额
+        usableRechargeFee = StringUtil.bigDecimal(usableRechargeFee);
+        Double usableGiveFee = m.getUsableGiveFee() == null ? 0d : m.getUsableGiveFee();// 可用的赠送金额
+        usableGiveFee = StringUtil.bigDecimal(usableGiveFee);
+        Double count = usableGiveFee + usableRechargeFee;
+        if (consumeFee > count) {
+            MsgException.throwException("会员余额不足，请充值");
+        }
+    }
+
+
+    private Result<Object> scanPay(JSONObject params, MerchantOrder order) {
+        log.info("======================>请求返回参数，解析成功后返回：{}", params);
+        Map<String, Object> result = new HashMap<>();
+        if (ResultCode.FAIL.code() == params.getInteger("code")) {
+            return ResultGenerator.genFailResult(params.getString("msg"), result);
+        }
+        result.put("data", order);
+        if (ResultCode.TRANSUNKNOW.code() == params.getInteger("code")) {
+            String payStatus = StringUtil.isNotEmpty(params.getString("payStatus")) ? params.getString("payStatus") : "7";
+            order.setStatus(payStatus);
+            this.baseMapper.updateById(order);
+            result.put("orderNumber", order.getOrderNumber());
+            return ResultGenerator.genTransunKonwResult("等待支付中...", result);
+        }
+        order.setStatus(params.getString("payStatus"));
+        String mercUserId = params.getString("mercUserId");
+        if (ResultCode.SUCCESS.code() == params.getInteger("code")) {
+            String channelOrderNo = params.getString("channelOrderNo");
+            String transNo = params.getString("transNo");
+            Date payTime = params.getDate("payTime");
+            order.setMercUserId(mercUserId);
+            order.setTransDt(payTime);
+            order.setThirdTransNo(channelOrderNo);
+            order.setTransNo(transNo);
+            order.setStatus("1");
+
+            try {
+                MerchantBaseInfo merchantBaseInfo = merchantBaseInfoService.getMerchantBaseInfoByMerchantCode(order.getMerchantCode());
+                //校验该商户是否有效
+//                userAssessService.checkUserValid(merchantBaseInfo);
+                MerchantBaseInfo.setFirstAndLastTradeTime(merchantBaseInfo,payTime);
+                merchantBaseInfoService.updateById(merchantBaseInfo);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+
+            // 添加分润记录 主扫
+            try {
+                merchantProfitService.createOrderProfitV2(order,"1");
+                log.info("【主扫支付】插入分润成功，订单号:{}",order.getOrderNumber());
+            }catch (Exception e){
+                log.error("【主扫支付】插入分润异常，订单号:{}，异常信息:{}",order.getOrderNumber(),e.getMessage());
+            }
+            this.baseMapper.updateById(order);
+            //添加积分记录
+            //TODO 添加判断是否满足条件返积分
+            executorService.execute(()->{
+                setActivityMarketAmt(order,null);
+                userIntegralService.bstOrderIntegralReward(order);
+                userInfoService.sendPayWxTemplateMessage(order);
+            });
+            result.put("data", order);
+            result.put("orderNumber", order.getOrderNumber());
+            result.put("message", "交易成功");
+            return ResultGenerator.genSuccessResult("支付成功", result);
+        } else {
+            return ResultGenerator.genFailResult("未知异常", result);
+        }
+    }
+
+    /**
+     * merchantIncome:(添加收益记录). <br/>
+     *
+     * 
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    private void merchantIncome(MerchantOrder merchantOrder) {
+        MerchantIncome merchantIncome = new MerchantIncome();
+        merchantIncome.setMerchantCode(merchantOrder.getMerchantCode());
+        merchantIncome.setMerchantName(merchantOrder.getMerchantName());
+        merchantIncome.setStoreId(merchantOrder.getStoreId());
+        merchantIncome.setStoreName(merchantOrder.getStoreName());
+        merchantIncome.setDealFee(merchantOrder.getConsumeFee());
+        merchantIncome.setIncomeFee(merchantOrder.getEnterFee());
+        merchantIncome.setPayTypeCode(merchantOrder.getPayTypeCode());
+        merchantIncome.setPayTypeName(merchantOrder.getPayTypeName());
+        merchantIncome.setCreateTime(merchantOrder.getTransDt());
+        merchantIncomeMapper.saveMerchantIncome(merchantIncome);
+    }
+
+    /**
+     *
+     * @param dto
+     * @param amt
+     * @param type
+     * @param orderType 订单类型 5 APP扫码充值
+     * @return
+     */
+    private MerchantOrder getMerchantOrder(MerChantOrderDTO dto, Double amt, String type,String orderType) {
+
+        MerchantOrder merchantOrder = new MerchantOrder();
+        MerchantCashPlaceStaff cashPlaceStaff = new MerchantCashPlaceStaff();
+        cashPlaceStaff.setStatus(MerchantCashPlaceStaff.STATUS_ONLINE);
+        if(StringUtil.isNotEmpty(dto.getUserId())){
+            cashPlaceStaff.setUserId(Long.parseLong(dto.getUserId()));
+            cashPlaceStaff = cashPlaceStaffService.getOne(new QueryWrapper<>(cashPlaceStaff));
+        }
+        merchantOrder.setStaffCode(dto.getUserId());
+        merchantOrder.setStaffName(dto.getStaffName());
+
+        if(StringUtil.isNotEmpty(dto.getDeviceNo())){
+            merchantOrder.setSnNo(dto.getDeviceNo());
+            merchantCashPlaceService.setOrderPlaceInfo(merchantOrder,dto.getDeviceNo());
+        }
+        if (cashPlaceStaff != null && StringUtil.isNotEmpty(cashPlaceStaff.getCashPlaceId())) {
+            merchantOrder.setCashPlaceId(cashPlaceStaff.getCashPlaceId() + "");
+        }
+        merchantOrder.setOrderType(StringUtil.isNotEmpty(orderType) ? orderType : "1");
+        merchantOrder.setMerchantCode(dto.getMerchantCode());
+        merchantOrder.setOrderNumber(dto.getOrderNumber());
+        merchantOrder.setConsumeFee(amt);
+        merchantOrder.setMemberCode(dto.getMemberCode());
+        merchantOrder.setMerchantName(dto.getMerchantName());
+        if(dto.getChannelStatus() != null && StringUtil.isNotEmpty(dto.getChannelStatus().getMercName())){
+            merchantOrder.setAlias(dto.getChannelStatus().getMercName());
+        }else if(dto.getMerchantBaseInfo() != null && StringUtil.isNotEmpty(dto.getMerchantBaseInfo().getMerchantName())){
+            merchantOrder.setAlias(dto.getMerchantBaseInfo().getMerchantName());
+        }else{
+            merchantOrder.setAlias(dto.getMerchantName());
+        }
+        merchantOrder.setStoreId(dto.getStoreId());
+        merchantOrder.setStoreName(dto.getStoreName());
+        merchantOrder.setRemark(dto.getRemark());
+        merchantOrder.setAisleSwitch(dto.getAisleSwitch());
+        merchantOrder.setPayTypeName(dto.getPayTypeName());
+        merchantOrder.setPayTypeCode(dto.getPayTypeCode());
+        merchantOrder.setRemark(dto.getRemark());
+        Date date = new Date();
+        merchantOrder.setStatus("5");// 待付款
+        merchantOrder.setCreateDt(date);
+        merchantOrder.setUpdateTime(merchantOrder.getCreateDt());
+        if(!"1".equals(dto.getType())){
+            BigDecimal rate = merchantRateNewService.getMchRate(dto.getMerchantCode(),dto.getPayTypeCode(), amt);
+            merchantOrder.calcRateAndFee(rate);
+        }
+        if (StringUtil.isNotEmpty(type) && !"1".equals(dto.getType())) {
+            merchantOrder.isAllowBankLarge(dto.getMerchantBaseInfo());
+            merchantOrderMapper.insert(merchantOrder);
+        }
+        if("4".equals(dto.getAisleSwitch())){
+            MerchantChannelStatus channelStatus = dto.getChannelStatus();
+            if(StringUtil.isEmpty(channelStatus.getSettlementType()) || YsBusinessCodeEnum.D0.getName().equals(channelStatus.getSettlementType())){
+                merchantOrder.setSettlementType(SettleTypeEnum.D0.getValue());
+            }else{
+                merchantOrder.setSettlementType(SettleTypeEnum.D1.getValue());
+            }
+        }else{
+            merchantOrder.setSettlementType(SettleTypeEnum.D1.getValue());
+        }
+        return merchantOrder;
+    }
+
+    /**
+     * 校验参数
+     *
+     * @param merchantOrderDTO
+     */
+    private void checkActivePayParamsMap(MerChantOrderDTO merchantOrderDTO) {
+        Optional.ofNullable(merchantOrderDTO.getMerchantCode()).orElseThrow(() -> new MsgException("无商家编码"));
+        QueryWrapper<UserApp> appWrapper = new QueryWrapper<UserApp>()
+                .eq("merchantCode", merchantOrderDTO.getMerchantCode()).eq("userType", "promoter");
+        UserApp userApp = userAppMapper.selectOne(appWrapper);
+        Optional.ofNullable(userApp).orElseThrow(() -> new MsgException("无用户信息"));
+        if ("0".equals(merchantOrderDTO.getType())) {
+            Optional.ofNullable(merchantOrderDTO.getAuthCode()).orElseThrow(() -> new MsgException("无支付码信息"));
+            String authCode = merchantOrderDTO.getAuthCode();
+            if(authCode.contains(":")){
+                authCode = authCode.substring(0,authCode.indexOf(":"));
+                merchantOrderDTO.setAuthCode(authCode);
+            }
+            if(StringUtil.isNotEmpty(merchantOrderDTO.getMemberCode()) && merchantOrderDTO.getMemberCode().contains(":")){
+                String memberCode  = merchantOrderDTO.getMemberCode().substring(0,merchantOrderDTO.getMemberCode().indexOf(":"));
+                merchantOrderDTO.setMemberCode(memberCode);
+            }
+        }else{
+            String authCode = merchantOrderDTO.getAuthCode();
+            if(StringUtil.isNotEmpty(authCode) && "7".equals(authCode.substring(0,1))){
+                //会员卡支付
+                merchantOrderDTO.setType("3");
+                MerchantMemberCode code = merchantMemberCodeService.getByCode(authCode);
+                MsgException.checkNull(code,"会员码有误！");
+                Date now = DateUtils.currentDate();
+                Date startTime = code.getStartTime();
+                Date endTime = code.getEndTime();
+                if(now.compareTo(startTime) < 0 || now.compareTo(endTime) > 0){
+                    MsgException.throwException("该会员码已过期，请重新生成！");
+                }
+                if(!code.getMerchantCode().equals(userApp.getMerchantCode())){
+                    MsgException.throwException("当前会员码不属于该门店！");
+                }
+                merchantOrderDTO.setMercMenberCode(code);
+            }
+        }
+        // Optional.ofNullable(merchantOrderDTO.getConsumeFee()).orElseThrow(()-> new MsgException("无交易金额"));
+        MerchantChannelStatus channel = merchantChannelStatusService.getValidData(merchantOrderDTO.getMerchantCode());
+        Optional.ofNullable(channel).orElseThrow(() -> new MsgException("未获取到商户进件信息，请先提交商户信息"));
+
+        MsgException.check("7".equals(channel.getStatus()),"实时到账审核中，请耐心等待或者联系客服！");
+        MsgException.check(!channel.isPayment(),"当前进件状态未通过，请耐心等待或联系客服！");
+
+        merchantOrderDTO.setChannelNo(channel.getMerchantId());
+
+        merchantOrderDTO.setChannelStatus(channel);
+
+        Optional.ofNullable(merchantOrderDTO.getChannelNo()).orElseThrow(() -> new MsgException("无商户编号"));
+        MerchantBaseInfo merchant = merchantOrderDTO.getMerchantBaseInfo();
+        if(merchant == null){
+            QueryWrapper<MerchantBaseInfo> infoWrapper = new QueryWrapper<MerchantBaseInfo>()
+                    .eq("merchantCode", merchantOrderDTO.getMerchantCode());
+            merchant = merchantBaseInfoService.getOne(infoWrapper);
+        }
+
+        Optional.ofNullable(merchant).orElseThrow(() -> new MsgException("无商户信息"));
+        merchantOrderDTO.setMerchantName(merchant.getAlias());
+
+        if(StringUtil.isEmpty(merchantOrderDTO.getUserId())){
+            if ((userApp.getUserId() + "").equals(merchantOrderDTO.getUserId())) {
+                merchantOrderDTO.setStaffName(userApp.getUserName());
+            }
+        }
+        MerchantStore queryStore = new MerchantStore();
+        queryStore.setMerchantCode(merchantOrderDTO.getMerchantCode());
+        List<MerchantStore> queryMerchantStoreList = merchantStoreMapper.queryMerchantStoreList(queryStore);// 查询店铺信息
+        if (queryMerchantStoreList.isEmpty()) {
+            throw new MsgException("无店铺信息");
+        }
+        MerchantStore store = queryMerchantStoreList.get(0);
+        if ("2".equals(store.getStatus())) {
+            throw new MsgException("当前店铺被禁用");
+        }
+        merchantOrderDTO.setStoreName(store.getStoreName());
+        merchantOrderDTO.setStoreId(store.getStoreId());
+        if(!"3".equals(merchantOrderDTO.getType())){
+            setPayTypeCodeOrderNumber(merchantOrderDTO, channel);
+        }
+        merchantOrderDTO.setMerchantBaseInfo(merchant);
+    }
+
+    private void setPayTypeCodeOrderNumber(MerChantOrderDTO merchantOrderDTO, MerchantChannelStatus channelStatus) {
+
+        if (StringUtil.isNotEmpty(merchantOrderDTO.getAuthCode())) {
+            String payType = merchantOrderDTO.getAuthCode().substring(0, 1);// 判断收款码
+            String orderPrefix = "";
+            switch (payType) {
+                case "1":
+                    //随行付微信
+                    if (channelStatus.getChannel() == 1) {
+                        orderPrefix = "SXF_W_";
+                        merchantOrderDTO.setAisleSwitch("2");
+                        merchantOrderDTO.setPayTypeCode("sxfPay1");
+                        merchantOrderDTO.setPayTypeName("随行微信支付");
+                    } else if (channelStatus.getChannel() == 3) {
+                        orderPrefix = "RYX_W_";
+                        merchantOrderDTO.setAisleSwitch("3");
+                        merchantOrderDTO.setPayTypeCode(Constant.PAY_TYPE_WECHAT);
+                        merchantOrderDTO.setPayTypeName(Constant.PAY_TYPE_NAME_WECHAT);
+                    } else if (channelStatus.getChannel() == 4) {
+                        orderPrefix = "YS_W_";
+                        merchantOrderDTO.setAisleSwitch("4");
+                        merchantOrderDTO.setPayTypeCode(Constant.PAY_TYPE_WECHAT);
+                        merchantOrderDTO.setPayTypeName(Constant.PAY_TYPE_NAME_WECHAT);
+                    }
+                    break;
+                case "2":
+                    //随行付支付宝
+                    if (channelStatus.getChannel() == 1) {
+                        orderPrefix = "SXF_Z_";
+                        merchantOrderDTO.setAisleSwitch("2");
+                        merchantOrderDTO.setPayTypeCode("sxfPay0");
+                        merchantOrderDTO.setPayTypeName("随行支付宝支付");
+                    } else if (channelStatus.getChannel() == 3) {
+                        orderPrefix = "RYX_Z_";
+                        merchantOrderDTO.setAisleSwitch("3");
+                        merchantOrderDTO.setPayTypeCode(Constant.PAY_TYPE_ALIPAY);
+                        merchantOrderDTO.setPayTypeName(Constant.PAY_TYPE_NAME_ALIPAY);
+                    } else if (channelStatus.getChannel() == 4) {
+                        orderPrefix = "YS_Z_";
+                        merchantOrderDTO.setAisleSwitch("4");
+                        merchantOrderDTO.setPayTypeCode(Constant.PAY_TYPE_ALIPAY);
+                        merchantOrderDTO.setPayTypeName(Constant.PAY_TYPE_NAME_ALIPAY);
+                    }
+                    break;
+                case "6":
+                    if (channelStatus.getChannel() == 1) {
+                        orderPrefix = "SXF_Y_";
+                        merchantOrderDTO.setAisleSwitch("2");
+                        merchantOrderDTO.setPayTypeCode("sxfPay2");
+                        merchantOrderDTO.setPayTypeName("随行云闪付支付");
+                    } else if (channelStatus.getChannel() == 3) {
+                        orderPrefix = "RYX_Y_";
+                        merchantOrderDTO.setAisleSwitch("3");
+                        merchantOrderDTO.setPayTypeCode(Constant.PAY_TYPE_YSFPAY);
+                        merchantOrderDTO.setPayTypeName(Constant.PAY_TYPE_NAME_YSFPAY);
+                    } else if (channelStatus.getChannel() == 4) {
+                        orderPrefix = "YS_Y_";
+                        merchantOrderDTO.setAisleSwitch("4");
+                        merchantOrderDTO.setPayTypeCode(Constant.PAY_TYPE_YSFPAY);
+                        merchantOrderDTO.setPayTypeName(Constant.PAY_TYPE_NAME_YSFPAY);
+                    }
+                    break;
+                default:
+                    throw new MsgException("请扫微信、支付宝或云闪付的付款码！");
+            }
+            String orderNumber = orderPrefix + StringUtil.getBillno();
+            merchantOrderDTO.setOrderNumber(orderNumber);
+        } else {
+            String orderNumber = "HYCZ_" + StringUtil.getBillno();
+            merchantOrderDTO.setOrderNumber(orderNumber);
+        }
+    }
+
+    /**
+     * 订单退款
+     *
+     * @param orderNumber 退款订单号
+     * @param refundReason 退款原因
+     * @param type 退款类型
+     * @return
+     */
+    @Override
+    public void returnOrder(String orderNumber,String refundReason,String type, String noticeCode) {
+
+        // 更新通知的处理状态
+        if (StringUtil.isNotEmpty(noticeCode)) {
+            Notice queryNotice = new Notice();
+            queryNotice.setNoticeCode(noticeCode);
+            List<Notice> queryNoticeList = noticeService.queryNoticeList(queryNotice);
+            if (queryNoticeList != null && queryNoticeList.size() > 0) {
+                queryNotice = queryNoticeList.get(0);
+                queryNotice.setIsDeal(1);
+                queryNotice.setIsApply(1);
+                noticeService.updateNotice(queryNotice);
+            }
+        }
+
+        MerchantOrderVO order = checkRefundOrderParams(orderNumber);
+        order.setRemark(refundReason);
+        MerchantChannelStatus channel = null;
+        if("2".equals(order.getAisleSwitch())){
+            channel = merchantChannelStatusService.getByMerchantCode(order.getMerchantCode(), 1);
+        }else{
+            channel = merchantChannelStatusService.getByMerchantCode(order.getMerchantCode(), Integer.valueOf(order.getAisleSwitch()));
+        }
+        MsgException.checkNull(channel,"订单通道获取异常");
+        MsgException.check("7".equals(channel.getStatus()),"实时到账审核中，请耐心等待或者联系客服！");
+        MsgException.check(!channel.isPayment(),"当前进件状态未通过，请耐心等待或联系客服！");
+
+        Map<String, Object> resultMap = new HashMap<>();
+        MerchantRefundOrder refundOrder = new MerchantRefundOrder();
+        if (channel.getChannel() == 1) {
+            resultMap = sxfPayService.refundPay(order, channel.getMerchantId());
+        } else if (channel.getChannel() == 2) {
+            MsgException.throwException("通道已关闭！");
+        } else if (channel.getChannel() == 3) {
+            resultMap = ryxPayService.refundPay(order, channel.getMerchantId());
+        } else if (channel.getChannel() == 4) {
+            resultMap = ysPayOldService.refundPay(order, channel.getMerchantId());
+        }else {
+            MsgException.throwException("未知通道！");
+        }
+        if (ResultCode.SUCCESS.code() != (Integer) resultMap.get("code")) {
+            throw new MsgException(resultMap.get("msg") + "");
+        }
+        MerchantOrder update = new MerchantOrder();
+        if(StringUtil.isNotEmpty(order.getMarketAmt()) && order.getMarketAmt().doubleValue() > 0){
+            update.setId(order.getId());
+            update.setMarketAmt(BigDecimal.ZERO);
+        }
+        update.setRefundAmt(BigDecimal.valueOf(order.getConsumeFee()));
+        merchantOrderMapper.updateById(update);
+        refundOrder.convert(order, resultMap, channel.getMerchantId());
+        order.setId(null);
+        order.setUpdateTime(new Date());
+        order.setStatus("2");
+        order.setMarketAmt(BigDecimal.ZERO);
+        order.setRefundAmt(BigDecimal.valueOf(order.getConsumeFee()));
+        merchantOrderMapper.insert(order);
+        realFansService.removeProfit(order.getOrderNumber());
+        merchantRefundOrderMapper.insert(refundOrder);
+        if("app".equals(type)){
+            //向小程序后台推送退款消息
+            String url = "https://shop.shouyinbei.net/addons/we7_wmall/payment/refund/notify.php";
+            JSONObject params = new JSONObject();
+            params.put("orderNumber",orderNumber);
+            try {
+                String result = HttpUtil.doPostJson(url, params.toJSONString());
+                log.info("================>【app退款】消息通知结果:{}<================",result);
+            } catch (Exception e) {
+                e.printStackTrace();
+                log.info("================>【app退款】消息通知异常，异常信息:{}<================",e.getMessage());
+            }
+        }else{
+            pushService.pushMsg(String.valueOf(order.getUserId()), PushService.REFUND_ORDER);
+        }
+    }
+
+    @Override
+    public void apiReturnOrderV2(String orderNumber, String refundReason, String type, String noticeCode, String payPassword) {
+        if (StringUtils.isEmpty(payPassword)) {
+            throw new MsgException("缺少支付密码");
+        }
+
+        UserApp userApp = userAppService.queryUserAppByToken();
+        UserInfo userInfo = new UserInfo().setId(userApp.getUserId());
+        userInfo = userInfoService.getOne(new QueryWrapper<>(userInfo));
+
+        String psdMd5 = SecureUtil.md5(payPassword);
+        if (!psdMd5.equals(userInfo.getPayPassword())) {
+            throw new MsgException("支付密码错误");
+        }
+
+        returnOrder(orderNumber, refundReason, type, noticeCode);
+    }
+
+    /**
+     * 检查退款订单参数
+     *
+     * @param orderNumber
+     * @return
+     */
+    private MerchantOrderVO checkRefundOrderParams(String orderNumber) {
+        MerchantOrderVO queryMerchantOrder = (MerchantOrderVO) new MerchantOrderVO().setOrderNumber(orderNumber);
+        List<MerchantOrderVO> queryMerchantOrderList = merchantOrderVOMapper.selectList(new QueryWrapper<>(queryMerchantOrder));
+        if (queryMerchantOrderList.isEmpty()) {
+            MsgException.throwException("该订单不存在");
+        }
+        queryMerchantOrder = queryMerchantOrderList.get(0);
+
+        UserApp queryUserApp = new UserApp();
+        queryUserApp.setMerchantCode(queryMerchantOrder.getMerchantCode());
+        queryUserApp.setUserType("promoter");
+        List<UserApp> queryUserAppList = userAppMapper.queryUserAppList(queryUserApp);
+        if (queryUserAppList.isEmpty()) {
+            MsgException.throwException("无商户信息");
+        }
+        queryUserApp = queryUserAppList.get(0);
+
+        QueryWrapper<MerchantBaseInfo> merchantQuery = new QueryWrapper<MerchantBaseInfo>().eq("merchantCode", queryMerchantOrder.getMerchantCode());
+        MerchantBaseInfo merchantInfo = merchantBaseInfoService.getOne(merchantQuery);
+        if (merchantInfo != null) {
+            queryMerchantOrder.setAlias(merchantInfo.getAlias());
+        }
+
+        QueryWrapper<MerchantRefundOrder> queryWrapper = new QueryWrapper<MerchantRefundOrder>()
+                .eq("orderNumber", orderNumber);
+        MerchantRefundOrder one = merchantRefundOrderMapper.selectOne(queryWrapper);
+        MsgException.check(one != null, "订单已退款，请勿重复操作！");
+        queryMerchantOrder.setUserId(queryUserApp.getUserId().intValue());
+        return queryMerchantOrder;
+    }
+
+    /**
+     * 订单补单操作
+     *
+     * @param id
+     * @return
+     */
+    @Override
+    public Result suppleOrder(Integer id) {
+        JSONObject object = checkSupperOrderParams(id);
+        MerchantOrder order = object.getObject("order", MerchantOrder.class);
+        MerchantChannelStatus channel = object.getObject("channel", MerchantChannelStatus.class);
+        //随行付
+        if (channel.getChannel() == 1) {
+            JSONObject result = sxfPayService.tradeQuery(order, channel.getMerchantId());
+            return updateOrderStatus(result, order);
+            //乐刷
+        } else if (channel.getChannel() == 2) {
+            MsgException.throwException("当前通道已关闭");
+            //瑞银信
+        } else if (channel.getChannel() == 3) {
+            JSONObject result = ryxPayService.tradeQuery(order, channel.getMerchantId());
+            return updateOrderStatus(result, order);
+        } else if (channel.getChannel() == 4) {
+            JSONObject result = ysPayOldService.tradeQuery(order, channel.getMerchantId());
+            return updateOrderStatus(result, order);
+        }
+        return ResultGenerator.genSuccessResult("补单成功", null);
+    }
+
+    /**
+     * 解析返回参数修改状态
+     *
+     * @param result
+     * @param order
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class,propagation = Propagation.NOT_SUPPORTED)
+    public Result updateOrderStatus(JSONObject result, MerchantOrder order) {
+        log.info("【订单状态更新】订单号：{},上游返回的支付结果：{}",order.getOrderNumber(),result.toString());
+        Integer code = result.getInteger("code");
+        if (ResultCode.SUCCESS.code() != code) {
+            return ResultGenerator.genFailResult(result.getString("msg"));
+        }
+        if (order.getStatus().equals(result.getString("payStatus"))) {
+            return ResultGenerator.genFailResult("订单状态一致,无需补单",null);
+        }
+        String status = result.getString("payStatus");
+        order.setStatus(status);
+        if ("1".equals(result.getString("payStatus"))) {
+            String channelOrderNo = result.getString("channelOrderNo");
+            Date payTime = result.getDate("payTime");
+            String transNo = result.getString("transNo");
+            order.setTransNo(transNo);
+            order.setTransDt(payTime);
+            order.setThirdTransNo(channelOrderNo);
+            BigDecimal enterFee = new BigDecimal(String.valueOf(order.getEnterFee()));
+            if(order.getOrderNumber().contains("YS")){
+                BigDecimal tradeAmt = new BigDecimal(String.valueOf(order.getConsumeFee()));
+                String payee_fee = StringUtil.isEmpty(result.getString("fee")) ? "0" : result.getString("fee");  //收款方手续费
+                enterFee = tradeAmt.subtract(new BigDecimal(payee_fee)).setScale(2,BigDecimal.ROUND_DOWN);
+                //提现手续费
+                BigDecimal wFee = tradeAmt.multiply(new BigDecimal("0.001"));
+                //提现手续费不足0.1元 按照0.1元扣
+                if(wFee.doubleValue() < 0.1d ){
+                    enterFee = enterFee.subtract(new BigDecimal("0.1"));
+                }else{
+                    enterFee = enterFee.subtract(wFee).setScale(2,BigDecimal.ROUND_DOWN);
+                }
+            }
+            order.setEnterFee(enterFee.doubleValue());
+            order.setThirdTransNo(channelOrderNo);
+            updateOrderAndCreateProfit(order);
+            return ResultGenerator.genSuccessResult("补单成功！", null);
+        }
+        return ResultGenerator.genFailResult("通道返回订单已关闭或支付失败，无需补单！");
+    }
+
+    /**
+     * 检查订单补单参数
+     *
+     * @param id
+     */
+    private JSONObject checkSupperOrderParams(Integer id) {
+        JSONObject params = new JSONObject(2);
+        MsgException.checkNull(id, "无订单ID");
+        MerchantOrder order = this.getById(id);
+        MsgException.checkNull(order, "无订单数据");
+        MsgException.check(!"5".equals(order.getStatus()) && !"7".equals(order.getStatus()), "只能操作“待付款”的订单");
+        String aisleSwitch = order.getAisleSwitch();
+        MerchantChannelStatus channel;
+        switch (aisleSwitch){
+            case "2":
+                channel = merchantChannelStatusService.getByMerchantCode(order.getMerchantCode(),1);
+                break;
+            default:
+                channel = merchantChannelStatusService.getByMerchantCode(order.getMerchantCode(),Integer.valueOf(aisleSwitch));
+                break;
+        }
+        MsgException.checkNull(channel, "未获取商户进件信息，请先提交商户信息");
+        MsgException.check(!channel.isPayment(), "当前通道状态异常");
+        params.put("order", order);
+        params.put("channel", channel);
+        return params;
+    }
+
+
+    @Override
+    public Page<MerchantOrder> pageInfo(Page<MerchantOrder> page, MerchantOrder query) {
+        return baseMapper.pageInfo(page, query);
+    }
+
+    @Override
+    public void readCSV(String srcPath) {
+        log.info("====================>【瑞银信】读取csv文件信息开始<====================");
+        try (CSVReader csvReader = new CSVReaderBuilder(new BufferedReader(new InputStreamReader(new FileInputStream(new File(srcPath)), "GBK"))).build()) {
+            csvReader.readNext();
+            List<String[]> list = csvReader.readAll(); //此时读取的已经是第二行了
+            for (String[] s : list) {
+                //过滤不需要的数据
+                if ("总交易笔数".equals(s[0]) || StringUtil.isEmpty(s[0])) {
+                    break;
+                }
+                String merchantNo = s[1];
+                String mercOrderNo = s[3];
+                if(!mercOrderNo.contains("RYX")){
+                    MerchantOrder order = new MerchantOrder();
+                    MerchantPlugin pluginQuery = new MerchantPlugin().setPluginId(merchantNo);
+                    MerchantPlugin plugin = merchantPluginMapper.selectOne(new QueryWrapper<>(pluginQuery));
+                    if (plugin == null) {
+                        continue;
+                    }
+                    MerchantBaseInfo baseInfo = new MerchantBaseInfo().setUserId(String.valueOf(plugin.getUserId()));
+                    MerchantBaseInfo merchant = merchantBaseInfoService.getOne(new QueryWrapper<>(baseInfo));
+                    if (merchant == null) {
+                        continue;
+                    }
+                    MerchantStore storeQuery = new MerchantStore().setMerchantCode(merchant.getMerchantCode());
+                    MerchantStore store = merchantStoreMapper.selectOne(new QueryWrapper<>(storeQuery));
+                    if (store == null) {
+                        continue;
+                    }
+                    QueryWrapper<UserApp> queryWrapper = new QueryWrapper<UserApp>().eq("userId", merchant.getUserId());
+                    UserApp app = userAppMapper.selectOne(queryWrapper);
+                    if (app == null) {
+                        continue;
+                    }
+
+                    order.setOrderNumber(s[3]);
+                    order.setOrderType("99");
+                    order.setMerchantCode(merchant.getMerchantCode());
+                    order.setMerchantName(merchant.getAlias());
+                    String payTypeCode = "";
+                    String payTypeName = "";
+                    if ("WXZF".equals(s[5])) {
+                        payTypeCode = "wechatPay";
+                        payTypeName = "微信支付";
+                    } else if ("ZFBZF".equals(s[5])) {
+                        payTypeCode = "aliPay";
+                        payTypeName = "支付宝支付";
+                    } else if ("UPZF".equals(s[5])) {
+                        payTypeCode = "bank";
+                        payTypeName = "银联支付";
+                    } else {
+                        payTypeCode = "未知";
+                        payTypeName = "未知";
+                    }
+                    order.setPayTypeCode(payTypeCode);
+                    order.setPayTypeName(payTypeName);
+                    order.setStoreId(store.getStoreId());
+                    order.setStoreName(store.getStoreName());
+                    BigDecimal consumeFee = new BigDecimal(s[10]).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP);
+                    order.setConsumeFee(consumeFee.doubleValue());
+                    order.setTransNo(s[4]);
+                    order.setCreateDt(new Date());
+                    String payTime = s[8] + s[9];
+                    order.setTransDt(DateUtils.parse(payTime, "yyyyMMddHHmmss"));
+                    order.setStatus("1");
+                    order.setEnterFee(new BigDecimal(s[12]).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP).doubleValue());
+                    order.setAisleSwitch("3");
+                    BigDecimal mercRate = new BigDecimal(s[13]).multiply(new BigDecimal(10000));
+                    order.setRate(mercRate);
+
+                    order.setMarketAmt(BigDecimal.ZERO);
+                    //判断交易金额是否超出限制
+                    if (consumeFee.compareTo(new BigDecimal(300)) <= 0) {
+                        //判断当前商户是否报名插件活动
+                        log.info("====================>【瑞银信】判断商户是否参加了插件活动<======================");
+                        QueryWrapper<ActivityEnroll> query = new QueryWrapper<ActivityEnroll>()
+                                .eq("merchantCode", merchant.getMerchantCode()).eq("actType", "3").eq("status", "1")
+                                .orderByDesc("createTime").last("limit 1");
+                        List<ActivityEnroll> enrollList = activityEnrollMapper.selectList(query);
+                        if (!enrollList.isEmpty()) {
+                            log.info("====================>【瑞银信】userId为：{}的商户参加了插件活动,当前订单的交易金额：{}<======================", app.getUserId(), consumeFee);
+                            //判断活动时间是否过期
+                            OfficialActivity byId = officialActivityMapper.selectById(enrollList.get(0).getActId());
+                            if (byId != null) {
+                                if ("2".equals(byId.getStatus())) {
+                                    Integer startTimeValue = Integer.parseInt(DateUtils.formatDateDefault(byId.getStartTime(), "yyyyMMdd"));
+                                    Integer endTimeValue = Integer.parseInt(DateUtils.formatDateDefault(byId.getEndTime(), "yyyyMMdd"));
+                                    Integer nowDate = Integer.parseInt(DateUtils.formatDateDefault(new Date(), "yyyyMMdd"));
+                                    if (nowDate >= startTimeValue && nowDate <= endTimeValue) {
+                                        Integer mercFee = mercRate.intValue() - 25;
+                                        if (mercFee > 0) {
+                                            BigDecimal divide = new BigDecimal(mercFee).divide(new BigDecimal(10000));
+                                            order.setMarketAmt(divide.multiply(consumeFee));
+
+                                            MerchantMarket market = new MerchantMarket();
+                                            market.setUserId(app.getParentId());
+                                            market.setUserName(app.getUserName());
+                                            //上级获得奖励金个数
+                                            BigDecimal decimal = consumeFee.multiply(new BigDecimal("0.0025")).setScale(4, BigDecimal.ROUND_HALF_UP);
+                                            market.setMarketAmt(decimal);
+                                            market.setSource("3");
+                                            market.setCreateTime(new Date());
+                                            merchantMarketMapper.insert(market);
+                                        }
+                                    } else {
+                                        log.info("====================>【瑞银信】当前插件活动适用时间不在活动范围内，活动开始时间：{}，结束时间：{}，当前时间：{}<======================", startTimeValue, endTimeValue, nowDate);
+                                    }
+                                } else {
+                                    log.info("====================>【瑞银信】当前插件活动已过期或下架<======================");
+                                }
+                            } else {
+                                log.info("=====================>【瑞银信】插件活动配置出错<==================");
+                            }
+                        }
+                    } else {
+                        log.info("=====================>【瑞银信】当前订单金额：{}超出300元限制，取消商户和服务商的返利<==================", consumeFee);
+                    }
+                    merchantOrderMapper.insert(order);
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public List<Map<String, Object>> getCouponList(String orderNumber) {
+        MerchantOrder merchantOrder = new MerchantOrder().setOrderNumber(orderNumber).setStatus("1");
+        MerchantOrder one = getOne(new QueryWrapper<>(merchantOrder));
+        if (one == null) {
+            throw new MsgException("订单不存在");
+        }
+
+        if ("10".equals(one.getOrderType())) {
+            return merchantOrderVOMapper.getOnlineCouponList(orderNumber);
+        } else {
+            return merchantOrderVOMapper.getOfflineCouponList(orderNumber);
+        }
+    }
+
+    /**
+     * @description:订单列表根据查询条件统计数据
+     * @date: 2021/8/5 16:58
+     * @param map:
+     * @return java.util.Map<java.lang.String,java.lang.Object>
+     */
+    @Override
+    public Map<String, Object> getOrderCountData(Map<String, Object> map) {
+        return baseMapper.getOrderCountData(map);
+    }
+
+    /**
+     * @description:更改订单支付状态
+     * @date: 2021/8/19 18:50
+     * @param order:
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class,propagation = Propagation.NOT_SUPPORTED)
+    public void updateOrderAndCreateProfit(MerchantOrder order) {
+        Integer row = queueDataService.newQueueData(order.getOrderNumber());
+        if(row > 0){
+            // 活动营销反积分
+            setActivityMarketAmt(order,null);
+            // 更新订单状态
+            updateMerchantOrder(order);
+            // 推送消息
+            executorService.execute(() -> notifyMessageService.sendPayMessage(order,"pay",null,null));
+            // 到账通知和微信订单推送
+            sendPayCallBackArrival(order);
+            // 更新临时码支付状态
+            updateMerchantMoveRecords(order);
+            // 发送mqtt消息
+            rabbitTemplate.convertAndSend("payCallback",JSON.toJSONString(order));
+            // 更新商品兑换状态
+            updateGoodExchange(order);
+            //订单分账
+            merchantOrderSplitService.checkMerchantOrderSplit(order);
+            // 添加判断BST是否满足条件返积分
+            userIntegralService.bstOrderIntegralReward(order);
+
+            try {
+                MerchantBaseInfo mbi = merchantBaseInfoService.getMerchantBaseInfoByMerchantCode(order.getMerchantCode());
+                //校验该商户是否有效
+//                userAssessService.checkUserValid(mbi);
+                MerchantBaseInfo.setFirstAndLastTradeTime(mbi, order.getTransDt());
+                merchantBaseInfoService.updateById(mbi);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    /**
+     * 获取订单分润数据
+     * @param order
+     * @return
+     */
+//    @Override
+//    public JSONObject getOrderProfitData(MerchantOrder order) {
+//        JSONObject result = new JSONObject(2);
+//        if(!"1".equals(order.getOrderType())){
+//            Fans fans = realFansService.getFansProfit(order);
+//            if(fans != null){
+//                result.put("fansProfitData",fans);
+//            }
+//        }
+//        List<MerchantProfit> shareProfitList = merchantProfitService.getOrderShareProfit(order);
+//        if(shareProfitList != null && !shareProfitList.isEmpty()){
+//            result.put("shareProfitData",shareProfitList);
+//        }
+//        return result;
+//    }
+    /**
+     * @description:更新商品状态
+     * @date: 2021/11/23 18:35
+     * @param order:
+     */
+    private void updateGoodExchange(MerchantOrder order) {
+        UpdateWrapper<OfficialGoodsExchange> goodsWrapper = new UpdateWrapper<>();
+        goodsWrapper.eq("orderNumber",order.getOrderNumber()).set("status","1");
+        officialGoodsExchangeService.update(goodsWrapper);
+
+        UpdateWrapper<UserIntegralUse> integralWrapper = new UpdateWrapper<>();
+        integralWrapper.eq("orderNumber",order.getOrderNumber()).set("status","2").set("handleTime",new Date());
+        userIntegralUseService.update(integralWrapper);
+    }
+
+//    @Override
+//    public void sendPayCallBackArrival(Long userId, String orderNumber, Double consumeFee) {
+//        UserApp userApp = userAppService.getUserAppByUserId(userId);
+//        String isVoice = "1";
+//        if (!StringUtil.isEmpty(userApp.getIsVoice())) {
+//            isVoice = userApp.getIsVoice();
+//        }
+//        String extrasparam = "3";
+//        if ("0".equals(isVoice)) {
+//            extrasparam = "4";
+//        }
+//        Notice notice = new Notice(2,98,userApp);
+//        notice.setUniqueKey(orderNumber+userApp.getUserId());
+//        String content = "收银呗到账" + consumeFee + "元";
+//        notice.setConrtent(content);
+//        noticeService.saveOrUpdate(notice);
+//        // 会员充值播报
+//        generalPushUtil.sendAllPlatByAlias(Lists.asList(userId), "收银呗到账通知", content, extrasparam);
+//    }
+
+    @Override
+    public void sendPayCallBackArrival(MerchantOrder order) {
+        MerchantBaseInfo baseInfo = merchantBaseInfoService.getMerchantBaseInfoByMerchantCode(order.getMerchantCode());
+        UserApp userApp = new UserApp().setUserId(Long.valueOf(baseInfo.getUserId()));
+        userApp = userAppService.queryUserApp(userApp);
+        List<String> alias = userAppService.storeMemberList(order.getMerchantCode());
+        String isVoice = "1";
+        if (!StringUtil.isEmpty(userApp.getIsVoice())) {
+            isVoice = userApp.getIsVoice();
+        }
+        String extrasparam = "3";
+        if ("0".equals(isVoice)) {
+            extrasparam = "4";
+        }
+        try {
+            Notice notice = new Notice(2,98,userApp);
+            notice.setUniqueKey(order.getOrderNumber()+userApp.getUserId());
+            String content = "收银呗到账" + order.getConsumeFee() + "元";
+            notice.setConrtent(content);
+            noticeService.saveOrUpdate(notice);
+            // 会员充值播报
+            UserVoice voice = userVoiceService.getByUserId(Long.valueOf(baseInfo.getUserId()));
+            if("3".equals(order.getOrderType()) || "5".equals(order.getOrderType())){
+                if(UserVoice.ENABLE.equals(voice.getMemberCharge())){
+                    BigDecimal coupon = order.getDiscount() == null ? BigDecimal.ZERO : BigDecimal.valueOf(order.getDiscount());
+                    generalPushUtil.sendAllPlatByUserIdChargeWithCoupon(alias,BigDecimal.valueOf(order.getConsumeFee()),coupon);
+                }
+            }else{
+                if(UserVoice.ENABLE.equals(voice.getPaySuccess())){
+                    generalPushUtil.sendAllPlatByAlias(alias, "收银呗到账通知", content, extrasparam);
+                }
+            }
+            //发送模板消息
+            executorService.execute(() -> {
+                try {
+                    userInfoService.sendPayWxTemplateMessage(order);
+                } catch (Exception e) {
+                    log.error("发送模板消息失败: {}", e.getMessage());
+                    e.printStackTrace();
+                }
+            });
+            log.info("【订单到账推送】订单到账推送成功，订单号：{},订单金额:{}",order.getOrderNumber(),order.getConsumeFee());
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+    }
+
+//    private void sendLowerPayNotifyCallback(MerchantOrder order) {
+//        log.info("====================>进入下游订单支付成功推送操作<====================");
+//        JSONObject notifyMap = new JSONObject();
+//        notifyMap.put("msgType","01");
+//        notifyMap.put("channelTradeNo",order.getThirdTransNo());
+//        notifyMap.put("mercOrderNo",order.getMercOrderNo());
+//        notifyMap.put("mercUserId",order.getMercUserId());
+//        notifyMap.put("payAmt",order.getConsumeFee().toString());
+//        notifyMap.put("payTime",new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(order.getTransDt()));
+//        notifyMap.put("payWay",order.getPayTypeCode().contains("0") || "aliPay".equals(order.getPayTypeCode()) ? "ZFBZF" : "WXZF");
+//        notifyMap.put("orderNumber",order.getOrderNumber());
+//        notifyMap.put("status","1");
+//        String key = "4c8d277b0f274604af68e590cc0b3e6b";
+//        MerchantBaseInfo merchant = merchantBaseInfoService.getMerchantBaseInfoByMerchantCode(order.getMerchantCode());
+//        if(merchant != null && StringUtil.isNotEmpty(merchant.getMd5Key())){
+//            key = merchant.getMd5Key();
+//        }
+//        String signStr = SignUtils.getSignContent(notifyMap) + "&key="+key;
+//        log.info("下游通知签名字符串：{}",signStr);
+//        String nSign = MD5Util.MD5Encode(signStr, "UTF-8");
+//        notifyMap.put("sign",nSign);
+//        try {
+//            notifyMessageService.sendNotifyMessage(order,notifyMap);
+//        } catch (Exception e) {
+//            log.info("====================>进入下游推送异步通知异常，异常信息:{}<====================",e);
+//        }
+//    }
+
+    /**
+     *
+     * @param order
+     */
+//    private void createOrderProfitAndFansProfit(MerchantOrder order) {
+//        if(!"1".equals(order.getOrderType())){
+//            realFansService.createFansProfit(order);
+//        }
+//        merchantProfitService.createOrderProfitV2(order);
+//    }
+    /**
+     * @description:修改会员卡订单操作
+     * @date: 2021/9/6 15:36
+     * @param order:
+     */
+    private void updateMemberOrder(MerchantOrder order) {
+        log.error("【会员充值回调】开始，订单号:{},充值金额:{}",order.getOrderNumber(),order.getConsumeFee());
+        QueryWrapper<MemberOrder> queryWrapper = new QueryWrapper<MemberOrder>().eq("orderNumber",order.getOrderNumber());
+        MemberOrder mOrder = memberOrderService.getOne(queryWrapper);
+        if(mOrder == null){
+            log.error("【会员充值回调】未获取到订单号为：{}的充值记录，回调结束",order.getOrderNumber());
+            return;
+        }
+        if("1".equals(mOrder.getOrderStatus())){
+            log.error("【会员充值回调】订单号：{}的会员充值订单不是待支付状态，回调结束",order.getOrderNumber());
+            return;
+        }
+        mOrder.setOrderStatus("1");
+        mOrder.setChannelNo(order.getTransNo());
+        memberOrderService.updateById(mOrder);
+        QueryWrapper<MerchantMenber> memberWrapper = new QueryWrapper<MerchantMenber>().eq("memberCode",mOrder.getMemberCode());
+        MerchantMenber member = merchantMenberService.getOne(memberWrapper);
+        if(member == null){
+            log.error("【会员充值回调】查询会员编号：{}的会员不存在，回调结束",mOrder.getMemberCode());
+            return;
+        }
+        MerchantMenberRecharge recharge = new MerchantMenberRecharge();
+        double rechargeReturnAmt = activityRechargeService.getRechargeReturnAmt(order.getMerchantCode(), member.getStoreId(), order.getConsumeFee());
+        order.setDiscount(rechargeReturnAmt);
+        recharge.setGiveMoney(rechargeReturnAmt);
+        recharge.setRechargeMoney(order.getConsumeFee());
+        recharge.setMemberCode(member.getMemberCode());
+        recharge.setMerchantCode(order.getMerchantCode());
+        recharge.setMerchantName(order.getMerchantName());
+        recharge.setStoreId(member.getStoreId());
+        recharge.setStoreName(member.getStoreName());
+        recharge.setCreateDt(new Date());
+        recharge.setLogo(member.getLogo());
+        recharge.setNickName(member.getNickName());
+        recharge.setPhone(member.getPhone());
+        recharge.setPayType(1);
+        recharge.setOrderNumber(order.getOrderNumber());
+        try {
+            menberRechargeService.saveMerchantMenberRecharge(recharge);
+            Double usableRechargeFee = member.getUsableRechargeFee() == null ? 0d : member.getUsableRechargeFee();
+            member.setUsableRechargeFee(StringUtil.bigDecimal(usableRechargeFee + Double.parseDouble(mOrder.getOrderFee())));
+            //当前充值总额
+            Double totalGiveFee = member.getTotalGiveFee() == null ? 0d : member.getTotalGiveFee();
+            member.setTotalGiveFee(StringUtil.bigDecimal(totalGiveFee + recharge.getGiveMoney()));
+            Double usableGiveFee = member.getUsableGiveFee() == null ? 0d : member.getUsableGiveFee();
+            member.setUsableGiveFee(StringUtil.bigDecimal(usableGiveFee + recharge.getGiveMoney()));
+
+            Double totalRechargeFee = member.getTotalRechargeFee() == null ? 0d : member.getTotalRechargeFee();
+            member.setTotalRechargeFee(StringUtil.bigDecimal(totalRechargeFee + Double.parseDouble(mOrder.getOrderFee())));
+            merchantMenberService.updateMerchantMenber(member);
+
+            try {
+                //发送会员充值通知余额变动通知
+                merchantMenberService.sendMenberBalanceChangeNotice(member,order.getConsumeFee(),"1");
+            }catch (Exception e){
+                e.printStackTrace();
+            }
+//            List<String> alias = userAppService.storeMemberList(order.getMerchantCode());
+            // 此处的推送属于重复
+//            generalPushUtil.sendAllPlatByAlias(alias, "会员充值通知", "会员充值" + order.getConsumeFee() + "元", "3");
+        }catch (Exception e){
+            e.printStackTrace();
+            log.error("【会员充值回调】回调重复通知,订单号：{}",order.getOrderNumber());
+        }
+    }
+
+    /**
+     * 设置营销活动
+     * @param
+     */
+    @Override
+    public void setActivityMarketAmt(MerchantOrder order,MerchantStore store) {
+        try {
+            if(store == null){
+                store = merchantStoreService.getStoreByMerchantCode(order.getMerchantCode());
+            }
+            if(store != null){
+                if("1".equals(store.getIsMarket())){
+                    Double consumeFee = order.getConsumeFee();
+                    Double enterFee = order.getEnterFee();
+                    BigDecimal fee = new BigDecimal(String.valueOf(consumeFee))
+                            .subtract(new BigDecimal(String.valueOf(enterFee))).setScale(2,BigDecimal.ROUND_HALF_DOWN);
+                    order.setMarketAmt(fee);
+                    if(fee.doubleValue() >= 0.01){
+                        MerchantBaseInfo merchant = merchantBaseInfoService.getMerchantBaseInfoByMerchantCode(order.getMerchantCode());
+                        if(merchant != null){
+                            userIntegralService.saveUserIntegral(order.getOrderNumber(),
+                                    BigDecimal.valueOf(order.getConsumeFee()),
+                                    Long.parseLong(merchant.getUserId()),"1","1",fee);
+                        }
+                    }
+                }
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * @description:更新支付状态
+     * @date: 2021/8/2 17:41
+     * @param order:
+     */
+    private void updateMerchantMoveRecords(MerchantOrder order) {
+        UpdateWrapper<MerchantMoveRecords> updateWrapper = new UpdateWrapper<MerchantMoveRecords>()
+                .set("payNum","1")
+                .eq("orderNumber",order.getOrderNumber())
+                .eq("merchantCode",order.getMerchantCode());
+        merchantMoveRecordsService.update(updateWrapper);
+    }
+
+    private void updateMerchantOrder(MerchantOrder order){
+        if(!"0".equals(order.getStatus())){
+            order.setStatus("1");
+        }
+        this.baseMapper.updateById(order);
+        if("3".equals(order.getOrderType()) || "5".equals(order.getOrderType())){
+            log.info("====================>进入会员充值回调操作，订单类型：{}<====================",order.getOrderType());
+            updateMemberOrder(order);
+        }
+    }
+    /**
+     * @description:更新交易失败的订单
+     * @date: 2021/8/20 10:58
+     * @param order:
+     * @param channelStatus:
+     * @param channelMsg:
+     */
+    @Override
+    public void updateFailOrder(MerchantOrder order, String channelStatus, String channelMsg) {
+        MerchantOrder update = new MerchantOrder();
+        update.setId(order.getId());
+        update.setStatus("0");
+        String remark = "上游支付状态:"+channelStatus + ",失败描述："+ channelMsg;
+        update.setRemark(remark);
+        this.baseMapper.updateById(update);
+    }
+
+    /**
+     * @description:设置订单相关参数
+     * @date: 2021/8/25 11:17
+     * @param order:
+     * @param params:
+     * @param channel:
+     */
+    @Override
+    public void constOrderPayCodeAndName(MerchantOrder order, Map<String, Object> params, MerchantChannelStatus channel) {
+        if(channel == null && params.get("payWay") != null){
+            if("WXZF".equalsIgnoreCase((String) params.get("payWay"))){
+                if("2".equals(order.getAisleSwitch())){
+                    order.setPayTypeCode("sxfPay1");
+                    order.setPayTypeName("随行微信支付");
+                }else{
+                    order.setPayTypeCode(Constant.PAY_TYPE_WECHAT);
+                    order.setPayTypeName(Constant.PAY_TYPE_NAME_WECHAT);
+                }
+            }else if("ZFBZF".equalsIgnoreCase((String)params.get("payWay"))){
+                if("2".equals(order.getAisleSwitch())){
+                    order.setPayTypeCode("sxfPay0");
+                    order.setPayTypeName("随行支付宝支付");
+                }else{
+                    order.setPayTypeCode(Constant.PAY_TYPE_ALIPAY);
+                    order.setPayTypeName(Constant.PAY_TYPE_NAME_ALIPAY);
+                }
+            }else if("UNIONPAY".equalsIgnoreCase((String)params.get("payWay"))){
+                if("2".equals(order.getAisleSwitch())){
+                    order.setPayTypeCode("sxfPay2");
+                    order.setPayTypeName("随行云闪付支付");
+                }else{
+                    order.setPayTypeCode(Constant.PAY_TYPE_YSFPAY);
+                    order.setPayTypeName(Constant.PAY_TYPE_NAME_YSFPAY);
+                }
+            }
+            return;
+        }
+        order.setSettlementType(SettleTypeEnum.D1.getValue());
+        String orderPrefix = "";
+        switch (channel.getChannel()){
+            case 1:
+                order.setAisleSwitch("2");
+                order.setChannelRate(SxfConstants.CHANNEL_WECHAT_ALIPAY_BANK_COST_RATE.multiply(new BigDecimal(10000)));
+                BigDecimal channelFee = new BigDecimal(order.getConsumeFee().toString()).multiply(SxfConstants.CHANNEL_WECHAT_ALIPAY_BANK_COST_RATE).setScale(2,BigDecimal.ROUND_HALF_UP);
+                order.setChannelFee(channelFee);
+                if(params.get("payWay") == null){
+                    orderPrefix = "SXF_";
+                }else{
+                    if("WXZF".equalsIgnoreCase((String) params.get("payWay"))){
+                        orderPrefix = "SXF_W_";
+                        order.setPayTypeCode("sxfPay1");
+                        order.setPayTypeName("随行微信支付");
+                    }else if("ZFBZF".equalsIgnoreCase((String)params.get("payWay"))){
+                        orderPrefix = "SXF_Z_";
+                        order.setPayTypeCode("sxfPay0");
+                        order.setPayTypeName("随行支付宝支付");
+                    }else if("UNIONPAY".equalsIgnoreCase((String)params.get("payWay"))){
+                        orderPrefix = "SXF_Y_";
+                        order.setPayTypeCode("sxfPay2");
+                        order.setPayTypeName("随行云闪付支付");
+                    }
+                }
+                break;
+            case 2:
+                //乐刷通道
+                MsgException.throwException("当前通道已关闭");
+                break;
+            case 3:
+                order.setAisleSwitch("3");
+                order.setChannelRate(RyxConstants.CHANNEL_WECHAT_ALIPAY_COST_RATE.multiply(new BigDecimal(10000)));
+                order.setChannelFee(new BigDecimal(order.getConsumeFee().toString()).multiply(RyxConstants.CHANNEL_WECHAT_ALIPAY_COST_RATE).setScale(2,BigDecimal.ROUND_HALF_UP));
+                if(params.get("payWay") == null){
+                    orderPrefix = "RYX_";
+                }else{
+                    if("WXZF".equalsIgnoreCase((String) params.get("payWay"))){
+                        orderPrefix = "RYX_W_";
+                        order.setPayTypeCode(Constant.PAY_TYPE_WECHAT);
+                        order.setPayTypeName(Constant.PAY_TYPE_NAME_WECHAT);
+                    }else if("ZFBZF".equalsIgnoreCase((String)params.get("payWay"))){
+                        orderPrefix = "RYX_Z_";
+                        order.setPayTypeCode(Constant.PAY_TYPE_ALIPAY);
+                        order.setPayTypeName(Constant.PAY_TYPE_NAME_ALIPAY);
+                    }else if("UNIONPAY".equalsIgnoreCase((String)params.get("payWay"))){
+                        if(order.getConsumeFee() <= 1000.0d){
+                            order.setChannelRate(RyxConstants.CHANNEL_BANK_COST_RATE.multiply(new BigDecimal(10000)));
+                            order.setChannelFee(new BigDecimal(order.getConsumeFee().toString()).multiply(RyxConstants.CHANNEL_BANK_COST_RATE).setScale(2,BigDecimal.ROUND_HALF_UP));
+                        }else{
+                            order.setChannelRate(null);
+                            order.setChannelFee(null);
+                        }
+                        orderPrefix = "RYX_Y_";
+                        order.setPayTypeCode(Constant.PAY_TYPE_YSFPAY);
+                        order.setPayTypeName(Constant.PAY_TYPE_NAME_YSFPAY);
+                    }
+                }
+                break;
+            case 4:
+                order.setAisleSwitch("4");
+                if(StringUtil.isEmpty(channel.getSettlementType()) || YsBusinessCodeEnum.D0.getName().equals(channel.getSettlementType())){
+                    order.setSettlementType(SettleTypeEnum.D0.getValue());
+                }else{
+                    order.setSettlementType(SettleTypeEnum.D1.getValue());
+                }
+                order.setChannelRate(YsOldConstants.CHANNEL_WECHAT_ALIPAY_BANK_COST_RATE.multiply(new BigDecimal(10000)));
+                order.setChannelFee(new BigDecimal(order.getConsumeFee().toString()).multiply(YsOldConstants.CHANNEL_WECHAT_ALIPAY_BANK_COST_RATE).setScale(2,BigDecimal.ROUND_HALF_UP));
+                if(params.get("payWay") == null){
+                    orderPrefix = "YS_";
+                }else{
+                    if("WXZF".equalsIgnoreCase((String) params.get("payWay"))){
+                        orderPrefix = "YS_W_";
+                        order.setPayTypeCode(Constant.PAY_TYPE_WECHAT);
+                        order.setPayTypeName(Constant.PAY_TYPE_NAME_WECHAT);
+                    }else if("ZFBZF".equalsIgnoreCase((String)params.get("payWay"))){
+                        orderPrefix = "YS_Z_";
+                        order.setPayTypeCode(Constant.PAY_TYPE_ALIPAY);
+                        order.setPayTypeName(Constant.PAY_TYPE_NAME_ALIPAY);
+                    }else if("UNIONPAY".equalsIgnoreCase((String)params.get("payWay"))){
+                        if(order.getConsumeFee() > 1000.0d){
+                            order.setChannelRate(YsOldConstants.CREDIT_DEBIT_CARD_BANK_RATE_LARGE.multiply(new BigDecimal(10000)));
+                            order.setChannelFee(new BigDecimal(order.getConsumeFee().toString()).multiply(YsOldConstants.CREDIT_DEBIT_CARD_BANK_RATE_LARGE).setScale(2,BigDecimal.ROUND_HALF_UP));
+                        }
+                        orderPrefix = "YS_Y_";
+                        order.setPayTypeCode(Constant.PAY_TYPE_YSFPAY);
+                        order.setPayTypeName(Constant.PAY_TYPE_NAME_YSFPAY);
+                    }
+                }
+                break;
+            default:
+                throw new MsgException("无效的通道");
+        }
+        Object orderNum = params.get("orderNum");
+        if(StringUtil.isNotEmpty(orderNum)){
+            orderPrefix = orderPrefix + orderNum + "_";
+        }
+        if(StringUtils.isEmpty(order.getOrderNumber())){
+            if(StringUtil.isNotEmpty(params.get("orderNumber"))){
+                order.setOrderNumber(params.get("orderNumber").toString());
+            }else{
+                String orderNumber = orderPrefix + StringUtil.getBillno();
+                order.setOrderNumber(orderNumber);
+            }
+        }
+    }
+
+    /**
+     * @description:获取获取订单信息
+     * @date: 2021/8/31 14:54
+     * @param orderNumber:
+     * @return cn.pluss.platform.entity.MerchantOrder
+     */
+    @Override
+    public MerchantOrder getLockByOrderNumber(String orderNumber) {
+        return this.baseMapper.getLockByOrderNumber(orderNumber);
+    }
+
+    /**
+     * @description:获取订单首页数据
+     * @date: 2021/10/19 14:55
+     * @return java.util.Map<java.lang.String,java.lang.Object>
+     */
+    @Override
+    public Map<String, Object> getPlatformOrderData() {
+        return this.baseMapper.getPlatformOrderData();
+    }
+
+    /**
+     * @description:统计累计金额数据
+     * @date: 2021/10/19 17:53
+     * @return java.util.Map<java.lang.String,java.lang.Object>
+     */
+    @Override
+    public Map<String, Object> getPlatformAmtData() {
+        return this.baseMapper.getPlatformAmtData();
+    }
+
+    /**
+     * 统计用户订单流水
+     * @date: 2022/1/15 11:33
+     * @param date:
+     * @return
+     */
+    @Override
+    public List<UserProfit> getOrderFlow(String date,Integer sort) {
+        return this.baseMapper.getOrderFlow(date,sort);
+    }
+
+    @Override
+    public Integer getOrderMaxSort(String date) {
+        return this.baseMapper.getOrderMaxSort(date);
+    }
+
+    @Override
+    public Map<String, String> getPlatformTransData() {
+        return this.baseMapper.getPlatformTransData();
+    }
+
+    /**
+     * 根据商户号和时间获取流水
+     * @date: 2022/3/1 17:00
+     * @param mercList:
+     * @param date:
+     * @param flag:
+     * @return java.math.BigDecimal
+     */
+    @Override
+    public BigDecimal getAreaOrderCount(List<String> mercList, String date, Integer flag) {
+        return this.baseMapper.getAreaOrderCount(mercList,date,flag);
+    }
+
+    /**
+     * 获取通道对账文件地址
+     * @param accountDate
+     * @param channel
+     * @param type
+     * @return
+     */
+    @Override
+    public Result<Object> getChannelFileUrl(String accountDate, Integer channel, Integer type) {
+        MsgException.checkBlank(accountDate,"日期不能为空");
+        MsgException.checkNull(channel,"通道不能为空");
+        MsgException.checkNull(type,"类型不能为空");
+        JSONObject reqData = new JSONObject(4);
+        reqData.put("account_date",accountDate);
+        reqData.put("file_type",type == 1 ? "28" : "29");
+        JSONObject result = ysPayOldService.getUnionAccountUrl(reqData);
+        return ResultGenerator.genSuccessResult("获取成功",result.getString("url"));
+    }
+
+    @Override
+    public BigDecimal getPlatformAmtYestNowData(String date,String yestStartDate, String yestEndDate) {
+        return baseMapper.getPlatformAmtYestNowData(date,yestStartDate,yestEndDate);
+    }
+
+    /**
+     * 获取有效交易笔数
+     * @param merchantCode
+     * @return
+     */
+    @Override
+    public Integer getValidNumByMerchantCode(String merchantCode) {
+        return baseMapper.getValidNumByMerchantCode(merchantCode);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrder/impl/MerchantOrderStatisticsServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrder/impl/MerchantOrderStatisticsServiceImpl.java
new file mode 100644
index 0000000..f19fd22
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrder/impl/MerchantOrderStatisticsServiceImpl.java
@@ -0,0 +1,20 @@
+package cn.pluss.platform.merchantOrder.impl;
+
+import cn.pluss.platform.entity.MerchantOrderStatistics;
+import cn.pluss.platform.mapper.MerchantOrderStatisticsMapper;
+import cn.pluss.platform.merchantOrder.MerchantOrderStatisticsService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 商户订单统计表 服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-12-21
+ */
+@Service
+public class MerchantOrderStatisticsServiceImpl extends ServiceImpl<MerchantOrderStatisticsMapper, MerchantOrderStatistics> implements MerchantOrderStatisticsService {
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrderSplit/MerchantOrderSplitDetailService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrderSplit/MerchantOrderSplitDetailService.java
new file mode 100644
index 0000000..645961b
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrderSplit/MerchantOrderSplitDetailService.java
@@ -0,0 +1,32 @@
+package cn.pluss.platform.merchantOrderSplit;
+
+import cn.pluss.platform.entity.MerchantOrderSplitDetail;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 分账明细详情表 服务类
+ * </p>
+ *
+ * @author bzg
+ * @since 2022-07-01
+ */
+public interface MerchantOrderSplitDetailService extends IService<MerchantOrderSplitDetail> {
+
+    /**
+     * 根据订单号查询订单详情
+     * @param orderNumber
+     * @return
+     */
+    List<MerchantOrderSplitDetail> listByOrderNumber(String orderNumber);
+
+    /**
+     * 根据订单号和商户编号code查询分账详情订单信息
+     * @param orderNumber
+     * @param merchantCode
+     * @return
+     */
+    MerchantOrderSplitDetail getByOrderNumberAndMerchantCode(String orderNumber, String merchantCode);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrderSplit/MerchantOrderSplitRefundService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrderSplit/MerchantOrderSplitRefundService.java
new file mode 100644
index 0000000..73d0006
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrderSplit/MerchantOrderSplitRefundService.java
@@ -0,0 +1,21 @@
+package cn.pluss.platform.merchantOrderSplit;
+
+import cn.pluss.platform.entity.MerchantOrderSplitRefund;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 分账订单退款详情表 服务类
+ * </p>
+ *
+ * @author bzg
+ * @since 2022-07-04
+ */
+public interface MerchantOrderSplitRefundService extends IService<MerchantOrderSplitRefund> {
+    /**
+     * 根据商户退款单号查询
+     * @param mercRefundNo
+     * @return
+     */
+    MerchantOrderSplitRefund getByMercRefunNo(String mercRefundNo);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrderSplit/MerchantOrderSplitService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrderSplit/MerchantOrderSplitService.java
new file mode 100644
index 0000000..10269c4
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrderSplit/MerchantOrderSplitService.java
@@ -0,0 +1,39 @@
+package cn.pluss.platform.merchantOrderSplit;
+
+import cn.pluss.platform.entity.MerchantOrder;
+import cn.pluss.platform.entity.MerchantOrderSplit;
+import cn.pluss.platform.entity.MerchantOrderSplitDetail;
+import cn.pluss.platform.vo.SplitOrderVo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 订单分账信息表 服务类
+ * </p>
+ *
+ * @author bzg
+ * @since 2021-11-26
+ */
+public interface MerchantOrderSplitService extends IService<MerchantOrderSplit> {
+
+    void checkMerchantOrderSplit(MerchantOrder order);
+
+    MerchantOrderSplit getByMercOrderNo(String mercOrderNo);
+
+    /**
+     * 根据订单号查询分账订单
+     * @param ordNo
+     * @return
+     */
+    MerchantOrderSplit getByOrderNumber(String ordNo);
+
+    /**
+     * 组装返回参数
+     * @param order
+     * @param splitDetailList
+     * @return
+     */
+    SplitOrderVo resultChannelParam(MerchantOrderSplit order, List<MerchantOrderSplitDetail> splitDetailList);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrderSplit/impl/MerchantOrderSplitDetailServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrderSplit/impl/MerchantOrderSplitDetailServiceImpl.java
new file mode 100644
index 0000000..a3df8ae
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrderSplit/impl/MerchantOrderSplitDetailServiceImpl.java
@@ -0,0 +1,40 @@
+package cn.pluss.platform.merchantOrderSplit.impl;
+
+import cn.pluss.platform.entity.MerchantOrderSplitDetail;
+import cn.pluss.platform.mapper.MerchantOrderSplitDetailMapper;
+import cn.pluss.platform.merchantOrderSplit.MerchantOrderSplitDetailService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 分账明细详情表 服务实现类
+ * </p>
+ *
+ * @author bzg
+ * @since 2022-07-01
+ */
+@Service
+public class MerchantOrderSplitDetailServiceImpl extends ServiceImpl<MerchantOrderSplitDetailMapper, MerchantOrderSplitDetail> implements MerchantOrderSplitDetailService {
+
+    @Override
+    public List<MerchantOrderSplitDetail> listByOrderNumber(String orderNumber) {
+        QueryWrapper<MerchantOrderSplitDetail> queryWrapper = new QueryWrapper<MerchantOrderSplitDetail>()
+                .eq("orderNumber",orderNumber);
+        return baseMapper.selectList(queryWrapper);
+    }
+
+    /**
+     * 根据订单号和商户编号code查询分账详情订单信息
+     * @param orderNumber
+     * @param merchantCode
+     * @return
+     */
+    @Override
+    public MerchantOrderSplitDetail getByOrderNumberAndMerchantCode(String orderNumber, String merchantCode) {
+        return baseMapper.getByOrderNumberAndMerchantCode(orderNumber,merchantCode);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrderSplit/impl/MerchantOrderSplitRefundServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrderSplit/impl/MerchantOrderSplitRefundServiceImpl.java
new file mode 100644
index 0000000..e38def2
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrderSplit/impl/MerchantOrderSplitRefundServiceImpl.java
@@ -0,0 +1,27 @@
+package cn.pluss.platform.merchantOrderSplit.impl;
+
+import cn.pluss.platform.entity.MerchantOrderSplitRefund;
+import cn.pluss.platform.mapper.MerchantOrderSplitRefundMapper;
+import cn.pluss.platform.merchantOrderSplit.MerchantOrderSplitRefundService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 分账订单退款详情表 服务实现类
+ * </p>
+ *
+ * @author bzg
+ * @since 2022-07-04
+ */
+@Service
+public class MerchantOrderSplitRefundServiceImpl extends ServiceImpl<MerchantOrderSplitRefundMapper, MerchantOrderSplitRefund> implements MerchantOrderSplitRefundService {
+
+    @Override
+    public MerchantOrderSplitRefund getByMercRefunNo(String mercRefundNo) {
+        QueryWrapper<MerchantOrderSplitRefund> queryWrapper = new QueryWrapper<MerchantOrderSplitRefund>()
+                .eq("mercRefundNo",mercRefundNo);
+        return baseMapper.selectOne(queryWrapper);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrderSplit/impl/MerchantOrderSplitServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrderSplit/impl/MerchantOrderSplitServiceImpl.java
new file mode 100644
index 0000000..946a275
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrderSplit/impl/MerchantOrderSplitServiceImpl.java
@@ -0,0 +1,128 @@
+package cn.pluss.platform.merchantOrderSplit.impl;
+
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.MerchantOrderSplitMapper;
+import cn.pluss.platform.mercSplitSetting.MerchantSplitSettingService;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.merchantOrder.BaseMercSplitService;
+import cn.pluss.platform.merchantOrderSplit.MerchantOrderSplitDetailService;
+import cn.pluss.platform.merchantOrderSplit.MerchantOrderSplitService;
+import cn.pluss.platform.notify.NotifyMessageService;
+import cn.pluss.platform.vo.SplitOrderVo;
+import cn.pluss.platform.yinsheng.YsOldSrcMerchantNo;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ * 订单分账信息表 服务实现类
+ * </p>
+ *
+ * @author bzg
+ * @since 2021-11-26
+ */
+@Service
+@Slf4j
+public class MerchantOrderSplitServiceImpl extends ServiceImpl<MerchantOrderSplitMapper, MerchantOrderSplit> implements MerchantOrderSplitService {
+
+    @Setter(onMethod_ = {@Autowired, @Qualifier("ysMercSplitService")})
+    private BaseMercSplitService ysMercSplitService;
+
+    @Resource
+    private MerchantSplitSettingService merchantSplitSettingService;
+
+    @Resource
+    private MerchantOrderSplitDetailService merchantOrderSplitDetailService;
+
+    @Resource
+    private MerchantChannelStatusService channelStatusService;
+
+    @Resource
+    private MerchantBaseInfoService merchantBaseInfoService;
+
+    @Resource
+    private NotifyMessageService notifyMessageService;
+    @Override
+    public void checkMerchantOrderSplit(MerchantOrder order) {
+        log.info("银盛订单分账开始，待分账的订单号：{}",order.getOrderNumber());
+        if(order.getOrderNumber().startsWith("YS") || "4".equals(order.getAisleSwitch())){
+            String merchantCode = order.getMerchantCode();
+            MerchantBaseInfo merchant = merchantBaseInfoService.getMerchantBaseInfoByMerchantCode(merchantCode);
+            MerchantChannelStatus channel = channelStatusService.getByMerchantCode(order.getMerchantCode(), 4);
+            //TODO 收银呗主体都需要走分账体系 判断是否自定义分账接口
+            if(YsOldSrcMerchantNo.SYB.getValue().equals(channel.getSrcMerchantNo()) && merchant.getSplitFlag() == 1){
+                QueryWrapper<MerchantSplitSetting> queryWrapper = new QueryWrapper<MerchantSplitSetting>()
+                        .eq("chieMerchantCode",merchantCode);
+                List<MerchantSplitSetting> list = merchantSplitSettingService.list(queryWrapper);
+                try {
+                    MerchantOrderSplit split = null;
+                    if(list.isEmpty()){
+                        if(channel != null){
+                            List<MerchantSplitSetting> newList = new ArrayList<>(1);
+                            MerchantSplitSetting setting = new MerchantSplitSetting(channel);
+                            newList.add(setting);
+                            split = ysMercSplitService.split(order, newList,false);
+                        }
+                    }else{
+                        split = ysMercSplitService.split(order, list,true);
+                    }
+                    if(split != null){
+                        split.setMerchantName(order.getMerchantName());
+                        split.setMerchantId(channel.getMerchantId());
+                        if(!list.isEmpty()){
+                            split.setNotifyUrl(list.get(0).getNotifyUrl());
+                        }
+                        save(split);
+                        List<MerchantOrderSplitDetail> detailList = split.getDetailList();
+                        if(detailList != null && detailList.size() > 0){
+                            for (MerchantOrderSplitDetail detail:detailList) {
+                                MerchantBaseInfo divMerchant = merchantBaseInfoService.getMerchantBaseInfoByMerchantCode(detail.getMerchantCode());
+                                if(divMerchant != null){
+                                    detail.setMerchantName(divMerchant.getAlias());
+                                }
+                                if(split.getDivStatus() == -1){
+                                    detail.setStatus(2);
+                                }else{
+                                    detail.setStatus(1);
+                                }
+                            }
+                            merchantOrderSplitDetailService.saveBatch(detailList);
+                            notifyMessageService.sendLowerSplitNotify(split);
+                        }
+                    }
+                }catch (Exception e){
+                    MsgException.throwException(e.getMessage());
+                }
+            }
+        }
+    }
+
+    @Override
+    public MerchantOrderSplit getByMercOrderNo(String mercOrderNo) {
+        return baseMapper.getByMercOrderNo(mercOrderNo);
+    }
+
+    @Override
+    public MerchantOrderSplit getByOrderNumber(String ordNo) {
+        return baseMapper.getByOrderNumber(ordNo);
+    }
+
+    @Override
+    public SplitOrderVo resultChannelParam(MerchantOrderSplit order, List<MerchantOrderSplitDetail> splitDetailList) {
+        MerchantBaseInfo merchant = merchantBaseInfoService.getMerchantBaseInfoByMerchantCode(order.getMerchantCode());
+        SplitOrderVo vo = new SplitOrderVo(order,splitDetailList);
+        vo.setSign(merchant.getPlatformSign(vo));
+        return vo;
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantProfit/MerchantProfitService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantProfit/MerchantProfitService.java
new file mode 100644
index 0000000..c7dff51
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantProfit/MerchantProfitService.java
@@ -0,0 +1,93 @@
+package cn.pluss.platform.merchantProfit;
+
+import cn.pluss.platform.entity.MerchantOrder;
+import cn.pluss.platform.entity.MerchantProfit;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.mapper.MerchantProfitMapper;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+import java.util.Vector;
+
+/**
+ * 直接调用dao层能完成的直接用
+ */
+public interface MerchantProfitService extends IService<MerchantProfit> {
+
+    default BigDecimal getSumValidProfit(String userId) {
+        return ((MerchantProfitMapper) getBaseMapper()).selectSumValidProfit(userId);
+    }
+
+    default MerchantProfit queryMerchantProfit(MerchantProfit merchantProfit) {
+        return ((MerchantProfitMapper) getBaseMapper()).queryMerchantProfit(merchantProfit);
+    }
+
+    default List<MerchantProfit> queryMerchantProfitList(MerchantProfit merchantProfit) {
+        return ((MerchantProfitMapper) getBaseMapper()).queryMerchantProfitList(merchantProfit);
+    }
+
+    default void saveMerchantProfit(MerchantProfit merchantProfit) {
+        getBaseMapper().insert(merchantProfit);
+    }
+
+    default void updateMerchantProfit(MerchantProfit merchantProfit) {
+        getBaseMapper().updateById(merchantProfit);
+    }
+
+    default void deleteMerchantProfit(MerchantProfit merchantProfit) {
+        getBaseMapper().deleteById(merchantProfit.getId());
+    }
+
+    default List<MerchantProfit> queryMerchantProfitPage(Map map) {
+        return ((MerchantProfitMapper) getBaseMapper()).queryMerchantProfitPage(map);
+    }
+
+    default Integer queryMerchantProfitPageCount(Map map) {
+        return ((MerchantProfitMapper) getBaseMapper()).queryMerchantProfitPageCount(map);
+    }
+
+    default Double queryMerchantProfitSumConsumeFee(Map map) {
+        return  ((MerchantProfitMapper) getBaseMapper()).queryMerchantProfitSumConsumeFee(map);
+    }
+
+    default Double queryMerchantProfitSumPrice(Map map) {
+        return  ((MerchantProfitMapper) getBaseMapper()).queryMerchantProfitSumPrice(map);
+    }
+
+    default Map<String, Object> getProfitCount(Map<String,Object> map){
+        return ((MerchantProfitMapper) getBaseMapper()).getProfitCount(map);
+    }
+
+    /**
+     * 批量插入
+     * @param profitList
+     */
+    void batchInsert(Vector<MerchantProfit> profitList);
+
+    /**
+     * 创建分润V2.0模式
+     * @date: 2022/1/21 15:14
+     * @param order:
+     * @param type
+     */
+    void createOrderProfitV2(MerchantOrder order,String type);
+
+    /**
+     * 统计按条件分润信息
+     * @date: 2022/2/9 19:38
+     * @param condition:
+     * @return java.util.Map<java.lang.String,java.math.BigDecimal>
+     */
+    Map<String, BigDecimal> getProfitAmtCount(MerchantProfit condition);
+
+    /**
+     * 推送收益消息
+     * @param userApp
+     * @param profitMoney
+     * @param orderNumber
+     */
+    void sendProfitMessage(UserApp userApp, BigDecimal profitMoney, String orderNumber);
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantProfit/impl/MerchantProfitServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantProfit/impl/MerchantProfitServiceImpl.java
new file mode 100644
index 0000000..4c31c57
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantProfit/impl/MerchantProfitServiceImpl.java
@@ -0,0 +1,299 @@
+package cn.pluss.platform.merchantProfit.impl;
+
+import cn.pluss.platform.constants.Constant;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.enums.BstLevelCode;
+import cn.pluss.platform.enums.UserRoleEnum;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.LevelMapper;
+import cn.pluss.platform.mapper.MerchantBaseInfoMapper;
+import cn.pluss.platform.mapper.MerchantProfitMapper;
+import cn.pluss.platform.mapper.UserAppMapper;
+import cn.pluss.platform.merchant.MerchantRateNewService;
+import cn.pluss.platform.merchantProfit.MerchantProfitService;
+import cn.pluss.platform.notice.NoticeService;
+import cn.pluss.platform.user.UserLevelService;
+import cn.pluss.platform.user.impl.GeneralPushUtil;
+import cn.pluss.platform.userAssess.UserAssessService;
+import cn.pluss.platform.userRewardFlow.UserRewardFlowService;
+import cn.pluss.platform.util.DateUtils;
+import cn.pluss.platform.util.StringUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DuplicateKeyException;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.*;
+
+
+@Service
+@Slf4j
+public class MerchantProfitServiceImpl extends ServiceImpl<MerchantProfitMapper, MerchantProfit> implements MerchantProfitService {
+
+
+    @Resource
+    private UserAppMapper userAppMapper;
+    @Resource
+    private NoticeService noticeService;
+
+    @Resource
+    private UserLevelService userLevelService;
+
+    @Resource
+    private UserRewardFlowService userRewardFlowService;
+
+    @Autowired
+    private GeneralPushUtil generalPushUtil;
+
+    @Autowired
+    private UserAssessService userAssessService;
+
+    @Override
+    @Transactional(rollbackFor = RuntimeException.class,propagation = Propagation.NESTED)
+    public void batchInsert(Vector<MerchantProfit> profitList) {
+        saveBatch(profitList);
+    }
+
+
+    @Override
+    public void sendProfitMessage(UserApp userApp, BigDecimal profitMoney, String orderNumber) {
+        if (profitMoney.doubleValue() <= 0.0001d) {
+            return;
+        }
+        boolean flag = true;
+        String amt = "0.0";
+        try {
+            //解决通知分润带有科学计数法
+            amt = profitMoney.stripTrailingZeros().toPlainString();
+            Notice notice = new Notice(0, 6, userApp);
+            notice.setConrtent("您有一笔" + amt + "元的推广分润");
+            notice.setUniqueKey(userApp.getUserId() + orderNumber + "profit");
+            noticeService.saveNotice(notice);
+        }catch (RuntimeException e){
+            flag = false;
+            e.printStackTrace();
+        }
+        List<String> alias = new ArrayList<>();
+        log.info("=========推送人userId======" + userApp.getUserId() + "=========金额=======" + profitMoney);
+        alias.add(userApp.getUserId() + "");
+        try {
+            if(flag){
+                String content = "本次分润金额：" + amt + "元";
+                generalPushUtil.sendAllPlatByAlias(alias, "推广分润通知", content, "0");
+                log.debug("========================================分润人USERID：{}分润金额：{}推送成功",userApp.getUserId(),amt);
+            }else{
+                log.debug("========================================分润人USERID：{}分润金额：{}重复推送",userApp.getUserId(),amt);
+            }
+        } catch (MsgException e) {
+            log.debug(e.getMessage());
+        }
+    }
+    /**
+     * 分润创建2.0模式
+     * @date: 2022/1/21 15:16
+     * @param order:
+     * @param type:
+     */
+    @Override
+    public void createOrderProfitV2(MerchantOrder order,String type) {
+        log.info("【分润V2.0】分润计算开始====================>");
+        UserApp userApp = userAppMapper.selectByMerchantCode(order.getMerchantCode());
+        if(userApp == null){
+            userApp = userAppMapper.selectByUserId(order.getUserId());
+        }
+        MsgException.checkNull(userApp,"用户信息为空，分润创建失败");
+        log.info("【分润V2.0】当前交易用户ID:{}，交易单号：{},交易用户角色：{}，用户等级：{}",userApp.getUserId(),order.getOrderNumber(),userApp.getRoleCode(),userApp.getLevelCode());
+        if(StringUtil.isEmpty(userApp.getRoleCode()) || StringUtil.isEmpty(userApp.getLevelCode())){
+            log.info("【分润V2.0】订单号为：{}当前交易角色为空 创建分润结束",order.getOrderNumber());
+            return;
+        }
+        calcUserProfitV2(userApp,order,type);
+    }
+    /**
+     * 计算分润开始
+     * @date: 2022/1/21 15:29
+     * @param userApp:
+     * @param orderType:
+     */
+    private void calcUserProfitV2(UserApp userApp,MerchantOrder order,String orderType) {
+        //2.0
+        Vector<MerchantProfit> profitList = new Vector<MerchantProfit>();
+        if(UserRoleEnum.SV2.getCode().equals(userApp.getRoleCode())){
+            createUserSV2Profit(userApp,order,null,userApp,profitList,1,orderType);
+        }else if(UserRoleEnum.ZY_BST.getCode().equals(userApp.getRoleCode())){
+            createUserBstProfit(userApp,userApp,order,profitList,1,BigDecimal.ZERO,orderType);
+        }else {
+            log.info("【分润V2.0】交易用户类型位置 创建分润结束",order.getOrderNumber());
+            return;
+        }
+        if(!profitList.isEmpty()){
+            log.info("【分润计算完成】开始批量插入分润数据,生成分润的订单编号：{}，分润条数：{}",order.getOrderNumber(),profitList.size());
+            try {
+                batchInsert(profitList);
+                log.info("【分润插入】插入分润成功！");
+            }catch (Exception e){
+                e.printStackTrace();
+                log.info("【分润插入】插入分润异常，异常信息:{}",e.getMessage());
+            }
+            //累计生成分润的总额
+            BigDecimal sumProfitMoney = BigDecimal.ZERO;
+            for (MerchantProfit  p:profitList) {
+                sumProfitMoney = sumProfitMoney.add(new BigDecimal(String.valueOf(p.getPrice())));
+            }
+            order.setProfitShareMoney(sumProfitMoney.setScale(4,BigDecimal.ROUND_DOWN).doubleValue());
+            log.info("【分润结算结束】订单号：{}产生的分润总额：{}",order.getOrderNumber(),sumProfitMoney);
+        }
+    }
+    /**
+     * 创建2.0分润
+     * @date: 2022/1/21 15:48
+     * @param nowUserApp:
+     * @param order:
+     */
+    private void createUserSV2Profit(UserApp userApp, MerchantOrder order,BigDecimal nowRate,
+                                     UserApp nowUserApp,Vector<MerchantProfit> profitList,Integer type,String orderType) {
+        Long parentId = userApp.getParentId();
+        if(parentId == null){
+            log.info("【分润V2.0】订单号：{}，分润计算结束,获取分润的条数为：{}",order.getOrderNumber(),profitList.size());
+            return;
+        }
+        if(nowRate == null){
+            nowRate = order.getRate();
+        }
+        UserApp pUserApp = userAppMapper.selectByUserId(parentId);
+        if(pUserApp == null){
+            log.info("【分润V2.0】上级用户Id为空，分润创建结束");
+            return;
+        }
+        UserLevel userLevel = userLevelService.getLevelInfoByRoleLevel(pUserApp.getRoleCode(), pUserApp.getLevelCode());
+        if(userLevel == null){
+            log.info("【分润V2.0】用户角色配置异常，分润创建结束");
+            return;
+        }
+        BigDecimal profitRate = BigDecimal.ZERO;
+        //缴费通
+        if("2".equals(orderType)){
+            if(nowRate.compareTo(userLevel.getJftRate()) >= 0){
+                profitRate = nowRate.subtract(userLevel.getJftRate());
+                nowRate = userLevel.getJftRate();
+            }
+        }else{
+            if(nowRate.compareTo(userLevel.getRate()) >= 0){
+                profitRate = nowRate.subtract(userLevel.getRate());
+                nowRate = userLevel.getRate();
+            }
+        }
+
+        BigDecimal profitAmt = profitRate.divide(BigDecimal.valueOf(10000)).multiply(BigDecimal.valueOf(order.getConsumeFee())).setScale(4,BigDecimal.ROUND_DOWN);
+        MerchantProfit profit = new MerchantProfit(nowUserApp,pUserApp,order,profitAmt,profitRate,type.toString(),orderType);
+        profitList.add(profit);
+        sendProfitMessage(pUserApp,profitAmt,order.getOrderNumber());
+        if(type < 2){
+            type = type + 1;
+        }else{
+            type = 6;
+        }
+        createUserSV2Profit(pUserApp,order,nowRate,nowUserApp,profitList,type,orderType);
+    }
+    /**
+     * 创建直营倍斯特分润
+     * @date: 2022/1/21 15:48
+     * @param userApp:
+     * @param order:
+     */
+    private void createUserBstProfit(UserApp userApp,UserApp nowUserApp, MerchantOrder order,Vector<MerchantProfit> profitList,
+                                     Integer type,BigDecimal useRate,String orderType) {
+        Long parentId = userApp.getParentId();
+        if(type >= 3){
+            if(parentId != null){
+                UserApp pUser = userAppMapper.selectByUserId(parentId);
+                if(pUser != null){
+                    if(UserRoleEnum.ZY_BST.getCode().equals(pUser.getRoleCode())){
+                        if(BstLevelCode.T2.getCode().equals(pUser.getLevelCode()) || BstLevelCode.T3.getCode().equals(pUser.getLevelCode())){
+                            UserRewardFlow rewardFlow = new UserRewardFlow(pUser,order,UserRewardFlow.TYPE_DIRE);
+                            userRewardFlowService.save(rewardFlow);
+                        }
+                        Long p2Parent = pUser.getParentId();
+                        if(p2Parent != null){
+                            UserApp p2User = userAppMapper.selectByUserId(p2Parent);
+                            if(p2User != null && BstLevelCode.T3.getCode().equals(p2User.getLevelCode())){
+                                UserRewardFlow rewardFlow = new UserRewardFlow(p2User,order,UserRewardFlow.TYPE_INRE);
+                                userRewardFlowService.save(rewardFlow);
+                            }
+                        }
+                    }
+                }
+            }
+            //获取倍斯特顶级分润
+            String roleCode = userApp.getRoleCode() == null ? UserRoleEnum.ZY_BST.getCode() : userApp.getRoleCode();
+            UserApp boosApp = userAppMapper.getRoleCodeAndLevelCode(roleCode,BstLevelCode.T4.getCode());
+            if(userApp == null){
+                log.info("【倍斯特分润计算】订单号：{}，分润计算结束,未配置boss账号无法获取顶级分润：{}",order.getOrderNumber(),profitList.size());
+            }
+            BigDecimal pRate = boosApp.getRate() == null ? Constant.MIX_SETTLE_RATE : boosApp.getRate();
+            if("2".equals(orderType)){
+                pRate = Constant.JFT_MIX_SETTLE_RATE;
+            }
+            BigDecimal profitRate = order.getRate().subtract(pRate).subtract(useRate);
+            BigDecimal profitAmt = profitRate.divide(BigDecimal.valueOf(10000)).multiply(BigDecimal.valueOf(order.getConsumeFee())).setScale(4,BigDecimal.ROUND_DOWN);
+            MerchantProfit profit = new MerchantProfit(nowUserApp,boosApp,order,profitAmt,profitRate,type+"",orderType);
+            sendProfitMessage(boosApp,profitAmt,order.getOrderNumber());
+            profitList.add(profit);
+            log.info("【倍斯特分润计算】订单号：{}，分润计算结束,获取分润的条数为：{}",order.getOrderNumber(),profitList.size());
+            return;
+        }
+        UserApp pUserApp = userAppMapper.selectByUserId(parentId);
+        if(pUserApp == null || !UserRoleEnum.ZY_BST.getCode().equals(pUserApp.getRoleCode())){
+            log.info("【倍斯特分润计算】上级用户Id为空或者当前用户上级角色异常，分润创建结束");
+            return;
+        }
+        UserLevel userLevel = userLevelService.getLevelInfoByRoleLevel(pUserApp.getRoleCode(), pUserApp.getLevelCode());
+        if(userLevel == null){
+            log.info("【倍斯特分润计算】用户角色配置异常，分润创建结束");
+            return;
+        }
+        //判断用户是否在考核期间之内
+//        boolean flag = userAssessService.getUserValid(parentId,pUserApp);
+//        if(flag){
+            if(BstLevelCode.T4.getCode().equals(userLevel.getLevelCode())){
+                BigDecimal t4Rate = userLevel.getRate() == null ? Constant.MIX_SETTLE_RATE : userLevel.getRate();
+                if("2".equals(orderType)){
+                    t4Rate = userLevel.getJftRate() == null ? Constant.JFT_MIX_SETTLE_RATE : userLevel.getJftRate();
+                }
+                BigDecimal profitRate = order.getRate().subtract(t4Rate).subtract(useRate);
+                if(profitRate.compareTo(BigDecimal.ZERO) <= 0){
+                    profitRate = BigDecimal.ZERO;
+                }
+                BigDecimal profitAmt = profitRate.divide(BigDecimal.valueOf(10000)).multiply(BigDecimal.valueOf(order.getConsumeFee())).setScale(4,BigDecimal.ROUND_DOWN);
+                MerchantProfit profit = new MerchantProfit(nowUserApp,pUserApp,order,profitAmt,profitRate,type.toString(),orderType);
+                profitList.add(profit);
+                sendProfitMessage(pUserApp,profitAmt,order.getOrderNumber());
+                return;
+            }else{
+                BigDecimal profitRate = type == 1 ? userLevel.getDirectRate() : userLevel.getIndirectRate() ;
+                BigDecimal profitAmt = profitRate.divide(BigDecimal.valueOf(10000)).multiply(BigDecimal.valueOf(order.getConsumeFee())).setScale(4,BigDecimal.ROUND_DOWN);
+                MerchantProfit profit = new MerchantProfit(nowUserApp,pUserApp,order,profitAmt,profitRate,type.toString(),orderType);
+                profitList.add(profit);
+                type = type + 1;
+                useRate = useRate.add(profitRate);
+                sendProfitMessage(pUserApp,profitAmt,order.getOrderNumber());
+                createUserBstProfit(pUserApp,nowUserApp,order,profitList,type,useRate,orderType);
+            }
+//        }else{
+//
+//        }
+    }
+
+    @Override
+    public Map<String, BigDecimal> getProfitAmtCount(MerchantProfit condition) {
+        return baseMapper.getProfitAmtCount(condition);
+    }
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantQrcode/MerchantQrcodeService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantQrcode/MerchantQrcodeService.java
new file mode 100644
index 0000000..85b23da
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantQrcode/MerchantQrcodeService.java
@@ -0,0 +1,27 @@
+package cn.pluss.platform.merchantQrcode;
+
+import cn.pluss.platform.entity.MerchantQrcode;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-10-23
+ */
+public interface MerchantQrcodeService extends IService<MerchantQrcode> {
+
+    List<MerchantQrcode> listPage(Map<String, Object> map);
+
+    Integer countMerchantQrcode(Map<String, Object> map);
+
+    void saveMerQrcode(MerchantQrcode merchantQrcode);
+
+    void removeByUserId(String userId);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantQrcode/impl/MerchantQrcodeServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantQrcode/impl/MerchantQrcodeServiceImpl.java
new file mode 100644
index 0000000..2e29a17
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantQrcode/impl/MerchantQrcodeServiceImpl.java
@@ -0,0 +1,77 @@
+package cn.pluss.platform.merchantQrcode.impl;
+
+import cn.pluss.platform.entity.MerchantBaseInfo;
+import cn.pluss.platform.entity.MerchantQrcode;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.MerchantQrcodeMapper;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantQrcode.MerchantQrcodeService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.Setter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-10-23
+ */
+@Service
+public class MerchantQrcodeServiceImpl extends ServiceImpl<MerchantQrcodeMapper, MerchantQrcode> implements MerchantQrcodeService {
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantBaseInfoService merchantBaseInfoService;
+
+    @Override
+    public List<MerchantQrcode> listPage(Map<String, Object> map) {
+        return baseMapper.listPage(map);
+    }
+
+    @Override
+    public Integer countMerchantQrcode(Map<String, Object> map) {
+        return baseMapper.countMerchantQrcode(map);
+    }
+
+    @Override
+    public void saveMerQrcode(MerchantQrcode merchantQrcode) {
+        String userId = merchantQrcode.getUserId();
+
+        if (merchantQrcode == null || merchantQrcode.getQrCodeUrl() == null || "".equals(merchantQrcode.getQrCodeUrl())) {
+            throw new MsgException("请先上传微信二维码!");
+        }
+
+        MerchantBaseInfo merchantBaseInfo1 = merchantBaseInfoService.getMerchantBaseInfoByUserId(userId);
+
+        MerchantQrcode existData = new MerchantQrcode();
+        existData.setMerchantCode(merchantBaseInfo1.getMerchantCode());
+        existData = getOne(new QueryWrapper<>(existData));
+
+        if (existData != null) {
+            existData.setQrCodeUrl(merchantQrcode.getQrCodeUrl());
+            existData.setWechat(merchantQrcode.getWechat());
+            updateById(existData);
+        } else {
+            MerchantBaseInfo merchantBaseInfo = merchantBaseInfoService.getMerchantBaseInfoByUserId(merchantQrcode.getUserId());
+            merchantQrcode.setMerchantCode(merchantBaseInfo.getMerchantCode());
+            merchantQrcode.setMerchantName(merchantBaseInfo.getAlias());
+
+            save(merchantQrcode);
+        }
+    }
+
+    @Override
+    public void removeByUserId(String userId) {
+        MerchantBaseInfo merchantBaseInfo1 = merchantBaseInfoService.getMerchantBaseInfoByUserId(userId);
+
+        QueryWrapper<MerchantQrcode> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("merchantCode", merchantBaseInfo1.getMerchantCode());
+        remove(queryWrapper);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantRegistAuditRecord/MerchantRegistAuditRecordService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantRegistAuditRecord/MerchantRegistAuditRecordService.java
new file mode 100644
index 0000000..6e1eb60
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantRegistAuditRecord/MerchantRegistAuditRecordService.java
@@ -0,0 +1,25 @@
+package cn.pluss.platform.merchantRegistAuditRecord;
+
+import java.util.List;
+import java.util.Map;
+import cn.pluss.platform.entity.MerchantRegistAuditRecord;
+
+public interface MerchantRegistAuditRecordService {
+
+    public MerchantRegistAuditRecord queryMerchantRegistAuditRecord(MerchantRegistAuditRecord merchantRegistAuditRecord);
+
+    public List<MerchantRegistAuditRecord> queryMerchantRegistAuditRecordList(MerchantRegistAuditRecord merchantRegistAuditRecord);
+
+    public void saveMerchantRegistAuditRecord(MerchantRegistAuditRecord merchantRegistAuditRecord);
+
+    public void updateMerchantRegistAuditRecord(MerchantRegistAuditRecord merchantRegistAuditRecord);
+
+    public void deleteMerchantRegistAuditRecord(MerchantRegistAuditRecord merchantRegistAuditRecord);
+
+    public List<MerchantRegistAuditRecord> queryMerchantRegistAuditRecordPage(Map map);
+
+    public Integer queryMerchantRegistAuditRecordPageCount(Map map);
+
+    public void saveMerchantRegistAuditRecordBatch(List<MerchantRegistAuditRecord> merchantRegistAuditRecordList);
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantRegistAuditRecord/impl/MerchantRegistAuditRecordServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantRegistAuditRecord/impl/MerchantRegistAuditRecordServiceImpl.java
new file mode 100644
index 0000000..4f67d4b
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantRegistAuditRecord/impl/MerchantRegistAuditRecordServiceImpl.java
@@ -0,0 +1,58 @@
+package cn.pluss.platform.merchantRegistAuditRecord.impl;
+
+import java.util.List;
+import java.util.Map;
+import org.springframework.transaction.annotation.Transactional;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import cn.pluss.platform.entity.MerchantRegistAuditRecord;
+import cn.pluss.platform.merchantRegistAuditRecord.MerchantRegistAuditRecordService;
+import cn.pluss.platform.mapper.MerchantRegistAuditRecordMapper;
+
+@Transactional
+@Service("merchantRegistAuditRecordService")
+public class MerchantRegistAuditRecordServiceImpl  implements MerchantRegistAuditRecordService{
+
+	 private static final Logger logger = LoggerFactory.getLogger( MerchantRegistAuditRecordServiceImpl.class);
+
+
+    @Autowired
+	  private MerchantRegistAuditRecordMapper merchantRegistAuditRecordMapper;
+
+    @Override
+    public MerchantRegistAuditRecord queryMerchantRegistAuditRecord(MerchantRegistAuditRecord merchantRegistAuditRecord){
+        return merchantRegistAuditRecordMapper.queryMerchantRegistAuditRecord(merchantRegistAuditRecord);
+    }
+
+    @Override
+    public List<MerchantRegistAuditRecord> queryMerchantRegistAuditRecordList(MerchantRegistAuditRecord merchantRegistAuditRecord){
+        return merchantRegistAuditRecordMapper.queryMerchantRegistAuditRecordList(merchantRegistAuditRecord);
+    }
+    @Override
+    public void saveMerchantRegistAuditRecord(MerchantRegistAuditRecord merchantRegistAuditRecord){
+          merchantRegistAuditRecordMapper.saveMerchantRegistAuditRecord(merchantRegistAuditRecord);
+    }
+    @Override
+    public void updateMerchantRegistAuditRecord(MerchantRegistAuditRecord merchantRegistAuditRecord){
+        merchantRegistAuditRecordMapper.updateMerchantRegistAuditRecord(merchantRegistAuditRecord);
+    }
+    @Override
+    public void deleteMerchantRegistAuditRecord(MerchantRegistAuditRecord merchantRegistAuditRecord){
+        merchantRegistAuditRecordMapper.deleteMerchantRegistAuditRecord(merchantRegistAuditRecord);
+    }
+    @Override
+    public List<MerchantRegistAuditRecord> queryMerchantRegistAuditRecordPage(Map map){
+        return merchantRegistAuditRecordMapper.queryMerchantRegistAuditRecordPage(map);
+    }
+    @Override
+    public Integer queryMerchantRegistAuditRecordPageCount(Map map){
+        return merchantRegistAuditRecordMapper.queryMerchantRegistAuditRecordPageCount(map);
+    }
+    @Override
+    public void saveMerchantRegistAuditRecordBatch(List<MerchantRegistAuditRecord> merchantRegistAuditRecordList) {
+         merchantRegistAuditRecordMapper.saveMerchantRegistAuditRecordBatch(merchantRegistAuditRecordList);
+    }
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantRegistLog/MerchantRegistLogService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantRegistLog/MerchantRegistLogService.java
new file mode 100644
index 0000000..0c04366
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantRegistLog/MerchantRegistLogService.java
@@ -0,0 +1,25 @@
+package cn.pluss.platform.merchantRegistLog;
+
+import java.util.List;
+import java.util.Map;
+import cn.pluss.platform.entity.MerchantRegistLog;
+
+public interface MerchantRegistLogService {
+
+    public MerchantRegistLog queryMerchantRegistLog(MerchantRegistLog merchantRegistLog);
+
+    public List<MerchantRegistLog> queryMerchantRegistLogList(MerchantRegistLog merchantRegistLog);
+
+    public void saveMerchantRegistLog(MerchantRegistLog merchantRegistLog);
+
+    public void updateMerchantRegistLog(MerchantRegistLog merchantRegistLog);
+
+    public void deleteMerchantRegistLog(MerchantRegistLog merchantRegistLog);
+
+    public List<MerchantRegistLog> queryMerchantRegistLogPage(Map map);
+
+    public Integer queryMerchantRegistLogPageCount(Map map);
+
+    public void saveMerchantRegistLogBatch(List<MerchantRegistLog> merchantRegistLogList);
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantRegistLog/impl/MerchantRegistLogServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantRegistLog/impl/MerchantRegistLogServiceImpl.java
new file mode 100644
index 0000000..174e462
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantRegistLog/impl/MerchantRegistLogServiceImpl.java
@@ -0,0 +1,58 @@
+package cn.pluss.platform.merchantRegistLog.impl;
+
+import java.util.List;
+import java.util.Map;
+import org.springframework.transaction.annotation.Transactional;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import cn.pluss.platform.entity.MerchantRegistLog;
+import cn.pluss.platform.merchantRegistLog.MerchantRegistLogService;
+import cn.pluss.platform.mapper.MerchantRegistLogMapper;
+
+@Transactional
+@Service("merchantRegistLogService")
+public class MerchantRegistLogServiceImpl  implements MerchantRegistLogService{
+
+	 private static final Logger logger = LoggerFactory.getLogger( MerchantRegistLogServiceImpl.class);
+
+
+    @Autowired
+	  private MerchantRegistLogMapper merchantRegistLogMapper;
+
+    @Override
+    public MerchantRegistLog queryMerchantRegistLog(MerchantRegistLog merchantRegistLog){
+        return merchantRegistLogMapper.queryMerchantRegistLog(merchantRegistLog);
+    }
+
+    @Override
+    public List<MerchantRegistLog> queryMerchantRegistLogList(MerchantRegistLog merchantRegistLog){
+        return merchantRegistLogMapper.queryMerchantRegistLogList(merchantRegistLog);
+    }
+    @Override
+    public void saveMerchantRegistLog(MerchantRegistLog merchantRegistLog){
+          merchantRegistLogMapper.saveMerchantRegistLog(merchantRegistLog);
+    }
+    @Override
+    public void updateMerchantRegistLog(MerchantRegistLog merchantRegistLog){
+        merchantRegistLogMapper.updateMerchantRegistLog(merchantRegistLog);
+    }
+    @Override
+    public void deleteMerchantRegistLog(MerchantRegistLog merchantRegistLog){
+        merchantRegistLogMapper.deleteMerchantRegistLog(merchantRegistLog);
+    }
+    @Override
+    public List<MerchantRegistLog> queryMerchantRegistLogPage(Map map){
+        return merchantRegistLogMapper.queryMerchantRegistLogPage(map);
+    }
+    @Override
+    public Integer queryMerchantRegistLogPageCount(Map map){
+        return merchantRegistLogMapper.queryMerchantRegistLogPageCount(map);
+    }
+    @Override
+    public void saveMerchantRegistLogBatch(List<MerchantRegistLog> merchantRegistLogList) {
+         merchantRegistLogMapper.saveMerchantRegistLogBatch(merchantRegistLogList);
+    }
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantRejectDesc/MerchantRejectDescService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantRejectDesc/MerchantRejectDescService.java
new file mode 100644
index 0000000..2ece6cf
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantRejectDesc/MerchantRejectDescService.java
@@ -0,0 +1,21 @@
+package cn.pluss.platform.merchantRejectDesc;
+
+import cn.pluss.platform.entity.MerchantRejectDesc;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author bzg
+ * @since 2021-01-11
+ */
+public interface MerchantRejectDescService extends IService<MerchantRejectDesc> {
+
+    /**
+     * 获取最大排序值
+     * @return
+     */
+    Integer getMaxSort();
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantRejectDesc/impl/MerchantRejectDescServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantRejectDesc/impl/MerchantRejectDescServiceImpl.java
new file mode 100644
index 0000000..06f4c1e
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantRejectDesc/impl/MerchantRejectDescServiceImpl.java
@@ -0,0 +1,24 @@
+package cn.pluss.platform.merchantRejectDesc.impl;
+
+import cn.pluss.platform.entity.MerchantRejectDesc;
+import cn.pluss.platform.mapper.MerchantRejectDescMapper;
+import cn.pluss.platform.merchantRejectDesc.MerchantRejectDescService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author bzg
+ * @since 2021-01-11
+ */
+@Service
+public class MerchantRejectDescServiceImpl extends ServiceImpl<MerchantRejectDescMapper, MerchantRejectDesc> implements MerchantRejectDescService {
+
+    @Override
+    public Integer getMaxSort() {
+        return this.baseMapper.getMaxSort();
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantStore/MerchantStoreService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantStore/MerchantStoreService.java
new file mode 100644
index 0000000..1fa5557
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantStore/MerchantStoreService.java
@@ -0,0 +1,107 @@
+package cn.pluss.platform.merchantStore;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.entity.MerchantBaseInfo;
+import cn.pluss.platform.entity.MerchantChannelStatus;
+import cn.pluss.platform.entity.MerchantStore;
+import cn.pluss.platform.vo.StoreInfoVO;
+import cn.pluss.platform.vo.StoreSignVO;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+import java.util.Map;
+
+public interface MerchantStoreService extends IService<MerchantStore> {
+
+    /**
+     * 禁用商户
+     * @param opUserId      操作人用户id
+     * @param userId        用户id
+     * @param remark        备注信息
+     */
+    void disableMerchantStore(Long opUserId, Long userId, String remark);
+
+    /**
+     * 商户解禁
+     * @param opUserId      操作人用户id
+     * @param userId        用户id
+     * @param remark        备注信息
+     */
+    void enableMerchantStore(Long opUserId, Long userId, String remark);
+
+    MerchantStore queryMerchantStore(MerchantStore merchantStore);
+
+    List<MerchantStore> queryMerchantStoreList(MerchantStore merchantStore);
+
+    void saveMerchantStore(MerchantStore merchantStore);
+
+    void updateMerchantStore(MerchantStore merchantStore);
+
+    void deleteMerchantStore(MerchantStore merchantStore);
+
+    List<MerchantStore> queryMerchantStorePage(Map map);
+
+    Integer queryMerchantStorePageCount(Map map);
+
+    /**
+     * 
+     * queryNewStoreListPage:(查询后台门店信息展示列表). <br/> 
+     *
+     * @author Administrator 
+     * @param map
+     * @return 
+     * @since JDK 1.8
+     */
+    Page<StoreInfoVO> queryNewStoreListPage(Map<String, Object> map);
+
+    void disableMerchantStore(Map<String,Object> params);
+
+    void pesUpdateMerchantStore(Map<String,Object> params);
+
+    MerchantStore getMerchantInfo(String merchantCode, String storeId);
+
+    StoreInfoVO selectStatus(Map<String, Object> params);
+
+    void operatMarketMerchantStore(Map<String, Object> params);
+
+    StoreInfoVO showMerchantStoreReceipt(Integer userId);
+
+    @Async
+    void manualMerchantIncom();
+
+    StoreInfoVO selectParticulars(Integer id);
+
+    List<MerchantStore> queryMerchantNoStoreList(MerchantStore merchantStore);
+
+    Map<String, Object> queryMerchantStoreByPage(Integer currPage, Integer size, MerchantStore merchantStore, MerchantBaseInfo merchantBaseInfo, String merchantType, String userId);
+
+    /**
+     * 获取实名认证信息，
+     * @param userId
+     * @return
+     */
+    Map<String, Object> getCertInfo(String userId);
+
+    /**
+     * @description:
+     * @date: 2021/8/4 修改通道d0状态并且发送微信认证通知
+ * @param channelStatus:
+ * @param status:
+     */
+    Result<?> updateChannelStatusAndWxCert(MerchantChannelStatus channelStatus, String status);
+
+    /**
+     * @description:批量导入d0excel开通文件
+     * @date: 2021/8/4 11:37
+     * @param file:
+     * @return cn.pluss.platform.api.Result<?>
+     */
+    Result<?> exportD0Excel(MultipartFile file);
+
+
+    MerchantStore getStoreByMerchantCode(String merchantCode);
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantStore/impl/MerchantStoreServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantStore/impl/MerchantStoreServiceImpl.java
new file mode 100644
index 0000000..32ef6c2
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantStore/impl/MerchantStoreServiceImpl.java
@@ -0,0 +1,462 @@
+package cn.pluss.platform.merchantStore.impl;
+
+import cn.pluss.platform.SubMerchantApplyOrderService;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.channel.MerchantAuditService;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.MerchantBaseInfoMapper;
+import cn.pluss.platform.mapper.MerchantChannelStatusMapper;
+import cn.pluss.platform.mapper.MerchantStoreMapper;
+import cn.pluss.platform.mapper.NoticeMapper;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.merchantImage.MerchantImageService;
+import cn.pluss.platform.merchantStore.MerchantStoreService;
+import cn.pluss.platform.operationRecord.OperationRecordService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.util.ExcelUtil;
+import cn.pluss.platform.user.impl.GeneralPushUtil;
+import cn.pluss.platform.util.SendMsgUtil;
+import cn.pluss.platform.util.StringUtil;
+import cn.pluss.platform.vo.StoreInfoVO;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.common.collect.Maps;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import lombok.val;
+import lombok.var;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.util.*;
+
+@Slf4j
+@Service("merchantStoreService")
+@RequiredArgsConstructor
+public class MerchantStoreServiceImpl extends ServiceImpl<MerchantStoreMapper, MerchantStore> implements MerchantStoreService {
+
+    @Setter(onMethod_ = {@Autowired, @Lazy})
+    private MerchantBaseInfoMapper merchantBaseInfoMapper;
+
+    @Setter(onMethod_ = {@Autowired, @Lazy, @Qualifier("sxfMerchantAuditService")})
+    private MerchantAuditService sxfMerchantAuditService;
+
+    @Setter(onMethod_ = {@Autowired, @Lazy})
+    private MerchantChannelStatusMapper merchantChannelStatusMapper;
+
+    @Setter(onMethod_ = {@Autowired, @Lazy})
+    private MerchantImageService merchantImageService;
+
+    @Setter(onMethod_ = {@Autowired, @Lazy})
+    private MerchantChannelStatusService merchantChannelStatusService;
+
+    @Setter(onMethod_ = {@Autowired,@Lazy})
+    private SubMerchantApplyOrderService merchantApplyOrderService;
+
+    @Setter(onMethod_ = {@Autowired,@Lazy})
+    private UserAppService userAppService;
+
+    @Setter(onMethod_ = {@Autowired,@Lazy})
+    private MerchantBaseInfoService merchantBaseInfoService;
+
+    @Resource
+    private NoticeMapper noticeMapper;
+
+    @Setter(onMethod_ = {@Autowired,@Lazy})
+    private SendMsgUtil sendMsgUtil;
+
+    @Autowired
+    private GeneralPushUtil generalPushUtil;
+
+    @Autowired
+    private OperationRecordService opService;
+
+    @Override
+    public void disableMerchantStore(Long opUserId, Long userId, String remark) {
+        MerchantBaseInfo mbi = merchantBaseInfoService.getMerchantBaseInfoByUserId(userId.toString());
+        if (mbi == null) { return; }
+
+        Map<String, Object> params = new HashMap<>(2);
+
+        OperationRecord operationRecord = new OperationRecord();
+        operationRecord.setOperator(opUserId.toString())
+                .setUserId(userId.toString())
+                .setCreateTime(new Date())
+                .setRemark(remark)
+                .setDictValue("GBSHJYGN");
+        opService.save(operationRecord);
+        params.put("status", "2");
+        params.put("id", mbi.getUserId());
+        disableMerchantStore(params);
+    }
+
+    @Override
+    public void enableMerchantStore(Long opUserId, Long userId, String remark) {
+        MerchantBaseInfo mbi = merchantBaseInfoService.getMerchantBaseInfoByUserId(userId.toString());
+        if (mbi == null) { return; }
+
+        Map<String, Object> params = new HashMap<>(2);
+
+        OperationRecord operationRecord = new OperationRecord();
+        operationRecord.setOperator(opUserId.toString())
+                .setUserId(userId.toString())
+                .setCreateTime(new Date())
+                .setRemark(remark)
+                .setDictValue("KTSHJYGN");
+        opService.save(operationRecord);
+        params.put("status", "1");
+        params.put("id", userId);
+        disableMerchantStore(params);
+    }
+
+    @Override
+    public MerchantStore queryMerchantStore(MerchantStore merchantStore){
+        return baseMapper.selectOne(new QueryWrapper<>(merchantStore));
+    }
+
+    @Override
+    public List<MerchantStore> queryMerchantStoreList(MerchantStore merchantStore){
+        return baseMapper.selectList(new QueryWrapper<>(merchantStore));
+    }
+    @Override
+    public List<MerchantStore> queryMerchantNoStoreList(MerchantStore merchantStore){
+        return baseMapper.queryMerchantNoStoreList(merchantStore);
+    }
+
+    @Override
+    public Map<String, Object> queryMerchantStoreByPage(Integer currPage, Integer size, MerchantStore merchantStore, MerchantBaseInfo merchantBaseInfo, String merchantType, String userId) {
+        Map<String, Object> map = new HashMap<>(16);
+        Map<String, Object> result = new HashMap<>(16);
+        map.put("pageSize", size);
+        map.put("offset", (currPage - 1) * size);
+
+        map.put("status", merchantStore.getStatus());
+        map.put("storeName", merchantStore.getStoreName());
+        map.put("location",merchantBaseInfo.getLocation());
+        map.put("productDesc", merchantStore.getProductDesc());
+        map.put("merchantName", merchantBaseInfo.getMerchantName());
+        map.put("payEcdemicSwitch", merchantStore.getPayEcdemicSwitch());
+        map.put("isMarket", merchantStore.getIsMarket());
+
+//        map.put("merchantType", merchantStore.getMerchantType());
+        map.put("address", merchantStore.getProName());
+        map.put("merchantCode", merchantStore.getMerchantCode());
+        map.put("userId", userId);
+        map.put("merchantType", merchantType);
+        map.put("alias", merchantStore.getAlias());
+        map.put("mcsStatus", merchantStore.getMcsStatus());
+        map.put("startTime", merchantStore.getStartTime());
+        map.put("endTime", merchantStore.getEndTime());
+
+        List<StoreInfoVO> merchantStoreList;
+        Page<StoreInfoVO> pageData = queryNewStoreListPage(map);
+        merchantStoreList = pageData.getRecords();
+        long count = pageData.getTotal();
+
+        result.put("merchantStoreList", merchantStoreList);
+        result.put("count", count);
+        result.put("pageCount", StringUtil.getPageCount(count, size));
+        result.put("currPage", currPage);
+        result.put("code", 200);
+        return result;
+    }
+
+    @Override
+    public Map<String, Object> getCertInfo(String userId) {
+        Map<String, Object> result = Maps.newHashMap();
+
+        MerchantBaseInfo merchantBaseInfo = new MerchantBaseInfo();
+        merchantBaseInfo.setUserId(userId);
+        merchantBaseInfo = merchantBaseInfoMapper.queryMerchantBaseInfo(merchantBaseInfo);
+        MsgException.checkNull(merchantBaseInfo, "缺少商户基本信息");
+
+        MerchantImage merchantImage = new MerchantImage();
+        merchantImage.setMerchantCode(merchantBaseInfo.getMerchantCode());
+
+        QueryWrapper<MerchantImage> queryWrapper = new QueryWrapper<>(merchantImage);
+
+        List<String> photoTypeList = Arrays.asList(
+                MerchantImage.ImageType.CASH_DESK_WITH_PERSON
+                , MerchantImage.ImageType.HAND_IDCARD_PHOTO
+                , MerchantImage.ImageType.MERCHANT_PROTOCOL
+                , MerchantImage.ImageType.MERCHANT_SUB_PROTOCOL
+        );
+        queryWrapper.in("photoType", photoTypeList);
+        List<MerchantImage> merchantImageList = merchantImageService.list(queryWrapper);
+
+        for (MerchantImage item : merchantImageList) {
+            switch (item.getPhotoType()) {
+                case MerchantImage.ImageType.CASH_DESK_WITH_PERSON:
+                    result.put("cashDeskWithPerson", item);
+                    break;
+                case MerchantImage.ImageType.HAND_IDCARD_PHOTO:
+                    result.put("handCard", item);
+                    break;
+                case MerchantImage.ImageType.MERCHANT_PROTOCOL:
+                    result.put("merchantProtocol", item);
+                    break;
+                case MerchantImage.ImageType.MERCHANT_SUB_PROTOCOL:
+                    result.put("merchantSubProtocol", item);
+                    break;
+                default:
+                    break;
+            }
+
+        }
+
+        return result;
+    }
+
+    @Override
+    public void saveMerchantStore(MerchantStore merchantStore){
+        baseMapper.insert(merchantStore);
+    }
+    @Override
+    public void updateMerchantStore(MerchantStore merchantStore){
+        baseMapper.updateById(merchantStore);
+    }
+    @Override
+    public void deleteMerchantStore(MerchantStore merchantStore){
+        baseMapper.deleteById(merchantStore.getId());
+    }
+    @Override
+    public List<MerchantStore> queryMerchantStorePage(Map map){
+        return baseMapper.queryMerchantStorePage(map);
+    }
+    @Override
+    public Integer queryMerchantStorePageCount(Map map){
+        return baseMapper.queryMerchantStorePageCount(map);
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+	public Page<StoreInfoVO> queryNewStoreListPage(Map<String, Object> map) {
+        List<List<?>> queryData = baseMapper.queryNewStoreListPage(map);
+        List<StoreInfoVO> record = (List<StoreInfoVO>) queryData.get(0);
+        Page<StoreInfoVO> page = new Page<>();
+        page.setRecords(record);
+        long total = ((Long) queryData.get(1).get(0));
+        page.setTotal(total);
+        return page;
+	}
+
+    @Override
+    public <E extends IPage<MerchantStore>> E page(E page, Wrapper<MerchantStore> queryWrapper) {
+
+
+        return super.page(page, queryWrapper);
+    }
+
+    @Override
+    public void disableMerchantStore(Map<String,Object> params) {
+        baseMapper.disableMerchantStore(params);
+    }
+
+    @Override
+    public void pesUpdateMerchantStore(Map<String,Object> params) {
+        baseMapper.pesUpdateMerchantStore(params);
+    }
+
+    /**
+     * getMerchantInfo:(得到商户名称，门店名称). <br/>
+     *
+     * @param merchantCode
+     * @param storeId
+     * @return
+     * 
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    @Override
+    public MerchantStore getMerchantInfo(String merchantCode, String storeId) {
+        // 因害怕表数据有误 分别根据merchantCode 查商家表 storeId查门店表
+        MerchantStore merchantStore = new MerchantStore();
+        merchantStore.setStoreId(storeId);
+        MerchantBaseInfo merchantBaseInfo = new MerchantBaseInfo();
+        merchantBaseInfo.setMerchantCode(merchantCode);
+        List<MerchantBaseInfo> queryMerchantBaseInfoList = merchantBaseInfoMapper
+                .queryMerchantBaseInfoList(merchantBaseInfo);
+        if (queryMerchantBaseInfoList != null && !queryMerchantBaseInfoList.isEmpty()) {
+            merchantBaseInfo = queryMerchantBaseInfoList.get(0);
+            merchantStore.setMerchantCode(merchantCode);
+        } else {
+            return null;
+        }
+        List<MerchantStore> queryMerchantStoreList = baseMapper.queryMerchantStoreList(merchantStore);
+        if (queryMerchantStoreList != null && !queryMerchantStoreList.isEmpty()) {
+            merchantStore = queryMerchantStoreList.get(0);
+            merchantStore.setMerchantName(merchantBaseInfo.getMerchantName());
+        } else {
+            return null;
+        }
+        return merchantStore;
+    }
+
+    @Override
+    public StoreInfoVO selectStatus(Map<String, Object> params) {
+        return baseMapper.selectStatus(params);
+    }
+
+    @Override
+    public void operatMarketMerchantStore(Map<String, Object> params) {
+        baseMapper.operatMarketMerchantStore(params);
+    }
+
+    @Override
+    public StoreInfoVO showMerchantStoreReceipt(Integer userId) {
+        return baseMapper.showMerchantStoreReceipt(userId);
+    }
+
+    @Override
+    public void manualMerchantIncom() {
+        QueryWrapper<MerchantBaseInfo> queryWrapper = new QueryWrapper<>();
+        List<MerchantBaseInfo> list = merchantBaseInfoMapper.selectList(queryWrapper);
+        for (MerchantBaseInfo m:list) {
+            if(StringUtil.isEmpty(m.getMerchantCode())){
+                continue;
+            }
+            if(StringUtil.isEmpty(m.getUserId())){
+                continue;
+            }
+            QueryWrapper<MerchantChannelStatus> channelStatusQueryWrapper = new QueryWrapper<MerchantChannelStatus>()
+                    .eq("merchantCode",m.getMerchantCode());
+            MerchantChannelStatus channel = merchantChannelStatusMapper.selectOne(channelStatusQueryWrapper);
+            if(channel == null){
+                try {
+                    sxfMerchantAuditService.merchantAudit(m.getUserId()+"", false);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+    @Override
+    public StoreInfoVO selectParticulars(Integer id) {
+        return merchantBaseInfoMapper.selectParticulars(id);
+    }
+
+
+    /**
+     * @description: 更新d0状态以及发送微信认证通知
+     * @date: 2021/8/4 11:22
+     * @param channelStatus:
+     * @param status:
+     * @return cn.pluss.platform.api.Result<?>
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Result<?> updateChannelStatusAndWxCert(MerchantChannelStatus channelStatus, String status) {
+        if (channelStatus == null || !MerchantChannelStatus.AUDIT_STATUS_QUICK_CASH.equals(channelStatus.getStatus())) {
+            throw new MsgException("当前进件状态不允许执行该操作");
+        }
+        channelStatus.setStatus(status);
+        merchantChannelStatusService.updateById(channelStatus);
+
+        // 检查银盛微信认证通知状态
+        val merchantCode = channelStatus.getMerchantCode();
+        val qWrapper = new LambdaQueryWrapper<SubMerchantApplyOrder>()
+                .eq(SubMerchantApplyOrder::getChannelId, 4)
+                .eq(SubMerchantApplyOrder::getMerchantCode, merchantCode)
+                .orderByDesc(SubMerchantApplyOrder::getCreateTime)
+                .last("limit 1");
+
+        val subMerchApplyOrder = merchantApplyOrderService.getOne(qWrapper);
+        if (subMerchApplyOrder == null) {
+            return ResultGenerator.genSuccessResult("操作成功",null);
+        }
+
+        val mbi = merchantBaseInfoService.getMerchantBaseInfoByMerchantCode(merchantCode);
+        var userApp = new UserApp().setMerchantCode(merchantCode).setUserType("promoter");
+        userApp = userAppService.getOne(new QueryWrapper<>(userApp));
+
+        String content2 = "D0支付已开通，请悉知";
+        generalPushUtil.sendAllPlatByAlias(Collections.singletonList(userApp.getUserId() + ""), "商户D0开通通知", content2, "1");
+
+        Notice notice2 = new Notice(1, 1, userApp);
+        notice2.setConrtent(content2);
+        noticeMapper.saveNotice(notice2);
+
+        val certStatus = subMerchApplyOrder.getStatus();
+        if ("confirmcontact".equals(certStatus) || "confirmlegalperson".equals(certStatus) || "passed".equals(certStatus)) {
+            String content = "请商户进行微信实名认证，短信将发送至商户联系人手机号，已认证可忽略";
+            generalPushUtil.sendAllPlatByAlias(Collections.singletonList(userApp.getUserId() + ""), "商户微信认证通知", content, "1");
+
+            Notice notice = new Notice(1, 1, userApp);
+            notice.setConrtent(content);
+            noticeMapper.saveNotice(notice);
+            try {
+                sendMsgUtil.verifyMsg(mbi.getContactMobile(), userApp.getMerchantCode() + "?i=4");
+            } catch (MsgException e) {
+                log.error(e.getMessage());
+            }
+        } else if ("rejected".equals(certStatus) || "freezed".equals(certStatus) || "canceled".equals(certStatus) || "unknow".equals(certStatus)) {
+            // 驳回或者未知状态标位已处理
+            Notice notice = new Notice(1, 1, userApp);
+            String pushMsg = "您好！您的商户微信认证因“##”被驳回，请联系收银呗客服修改资料并重新审核";
+            pushMsg = pushMsg.replace("##", subMerchApplyOrder.getRemark());
+            notice.setConrtent(pushMsg);
+            noticeMapper.saveNotice(notice);
+            generalPushUtil.sendAllPlatByAlias(Collections.singletonList(userApp.getUserId() + ""), "商户微信认证通知", pushMsg, "1");
+        }
+        return ResultGenerator.genSuccessResult("操作成功",null);
+    }
+
+    /**
+     * @description:批量导入d0excel开通文件
+     * @date: 2021/8/4 11:37
+     * @param file:
+     * @return cn.pluss.platform.api.Result<?>
+     */
+    @Override
+    public Result<?> exportD0Excel(MultipartFile file) {
+        if(file.isEmpty()){
+            return ResultGenerator.genFailResult("请选择文件");
+        }
+        try {
+            List<String[]> excelData = ExcelUtil.getExcelData(file, 1);
+            if(excelData.isEmpty()){
+                return ResultGenerator.genFailResult("文件解析出错");
+            }
+            for (String[] s:excelData) {
+                if(StringUtil.isEmpty(s[0])){
+                    continue;
+                }
+                if(!s[0].startsWith("826")){
+                    continue;
+                }
+                MerchantChannelStatus channelStatus = merchantChannelStatusService.getByMerchantIdLock(s[0]);
+                try {
+                    updateChannelStatusAndWxCert(channelStatus,"3");
+                }catch (RuntimeException e){
+                    e.printStackTrace();
+                    continue;
+                }
+            }
+            return ResultGenerator.genSuccessResult("操作成功！",null);
+        } catch (IOException e) {
+            e.printStackTrace();
+            return ResultGenerator.genFailResult(e.getMessage());
+        }
+    }
+
+    @Override
+    public MerchantStore getStoreByMerchantCode(String merchantCode) {
+        QueryWrapper<MerchantStore> queryWrapper = new QueryWrapper<MerchantStore>().eq("merchantCode",merchantCode);
+        return baseMapper.selectOne(queryWrapper);
+    }
+}
\ No newline at end of file
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/mswitch/CommonSwitchService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/mswitch/CommonSwitchService.java
new file mode 100644
index 0000000..4564c32
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/mswitch/CommonSwitchService.java
@@ -0,0 +1,43 @@
+package cn.pluss.platform.mswitch;
+
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.entity.CommonSwitch;
+import cn.pluss.platform.mapper.CommonSwitchMapper;
+import cn.pluss.platform.util.PageUtils;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @author djh 通用
+ */
+public interface CommonSwitchService extends IService<CommonSwitch> {
+
+    /**
+     * 是否允许异地支付
+     * @return
+     */
+   default boolean allowEcdemicPay() {
+        CommonSwitch commonSwitch = new CommonSwitch().setCode("PAY_ECDEMIC_SWITCH");
+        CommonSwitch switchIns = getBaseMapper().selectOne(new QueryWrapper<>(commonSwitch));
+        return "1".equals(switchIns.getValue());
+    }
+
+    /**
+     * 是否允许商户进件
+     * @return
+     */
+    default boolean allowMerchantRegister() {
+        CommonSwitch commonSwitch = new CommonSwitch().setCode("MER_REG_SWITCH");
+        CommonSwitch switchIns = getBaseMapper().selectOne(new QueryWrapper<>(commonSwitch));
+        return "1".equals(switchIns.getValue());
+    }
+
+    default PageInfo<CommonSwitch> pageData(Page<CommonSwitch> page , CommonSwitch commonSwitch) {
+        QueryWrapper<CommonSwitch> queryWrapper = new QueryWrapper<>(commonSwitch).orderByAsc("sort");
+        IPage<CommonSwitch> pageData = getBaseMapper().selectPage(page, queryWrapper);
+        return PageUtils.page(pageData);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/mswitch/impl/CommonSwitchServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/mswitch/impl/CommonSwitchServiceImpl.java
new file mode 100644
index 0000000..5b31476
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/mswitch/impl/CommonSwitchServiceImpl.java
@@ -0,0 +1,61 @@
+package cn.pluss.platform.mswitch.impl;
+
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.dict.DictService;
+import cn.pluss.platform.entity.CommonSwitch;
+import cn.pluss.platform.entity.Dict;
+import cn.pluss.platform.mapper.CommonSwitchMapper;
+import cn.pluss.platform.mapper.DictMapper;
+import cn.pluss.platform.mswitch.CommonSwitchService;
+import cn.pluss.platform.util.PageUtils;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+@RequiredArgsConstructor
+@Service
+public class CommonSwitchServiceImpl extends ServiceImpl<CommonSwitchMapper, CommonSwitch> implements CommonSwitchService {
+
+    private final DictService dictService;
+
+    @Override
+    public PageInfo<CommonSwitch> pageData(Page<CommonSwitch> page, CommonSwitch commonSwitch) {
+        QueryWrapper<CommonSwitch> queryWrapper = new QueryWrapper<>(commonSwitch).orderByAsc("sort");
+        IPage<CommonSwitch> pageData = getBaseMapper().selectPage(page, queryWrapper);
+
+        List<String> codeList = new ArrayList<>();
+        for (CommonSwitch item: pageData.getRecords()) {
+            codeList.add(item.getCode());
+        }
+
+        List<Dict> dictList = dictService.getByCode(codeList);
+
+        // dict 分组塞入开关选项
+        for (CommonSwitch item: pageData.getRecords()) {
+            Iterator<Dict> iterator = dictList.iterator();
+
+            while (iterator.hasNext()) {
+                Dict next = iterator.next();
+                if (item.getCode().equals(next.getCode())) {
+                    List<Dict> alterList = item.getAlterList();
+                    if (alterList == null) {
+                        alterList = new ArrayList<>();
+                        item.setAlterList(alterList);
+                    }
+
+                    alterList.add(next);
+                    iterator.remove();
+                }
+            }
+        }
+
+        return PageUtils.page(pageData);
+    }
+}
\ No newline at end of file
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/newArea/NewAreaService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/newArea/NewAreaService.java
new file mode 100644
index 0000000..10b1110
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/newArea/NewAreaService.java
@@ -0,0 +1,25 @@
+package cn.pluss.platform.newArea;
+
+import java.util.List;
+import java.util.Map;
+import cn.pluss.platform.entity.NewArea;
+
+public interface NewAreaService {
+
+    public NewArea queryNewArea(NewArea newArea);
+
+    public List<NewArea> queryNewAreaList(NewArea newArea);
+
+    public void saveNewArea(NewArea newArea);
+
+    public void updateNewArea(NewArea newArea);
+
+    public void deleteNewArea(NewArea newArea);
+
+    public List<NewArea> queryNewAreaPage(Map map);
+
+    public Integer queryNewAreaPageCount(Map map);
+
+    public void saveNewAreaBatch(List<NewArea> newAreaList);
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/newArea/impl/NewAreaServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/newArea/impl/NewAreaServiceImpl.java
new file mode 100644
index 0000000..e453b79
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/newArea/impl/NewAreaServiceImpl.java
@@ -0,0 +1,58 @@
+package cn.pluss.platform.newArea.impl;
+
+import java.util.List;
+import java.util.Map;
+import org.springframework.transaction.annotation.Transactional;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import cn.pluss.platform.entity.NewArea;
+import cn.pluss.platform.newArea.NewAreaService;
+import cn.pluss.platform.mapper.NewAreaMapper;
+
+@Transactional
+@Service("newAreaService")
+public class NewAreaServiceImpl  implements NewAreaService{
+
+	 private static final Logger logger = LoggerFactory.getLogger( NewAreaServiceImpl.class);
+
+
+    @Autowired
+	  private NewAreaMapper newAreaMapper;
+
+    @Override
+    public NewArea queryNewArea(NewArea newArea){
+        return newAreaMapper.queryNewArea(newArea);
+    }
+
+    @Override
+    public List<NewArea> queryNewAreaList(NewArea newArea){
+        return newAreaMapper.queryNewAreaList(newArea);
+    }
+    @Override
+    public void saveNewArea(NewArea newArea){
+          newAreaMapper.saveNewArea(newArea);
+    }
+    @Override
+    public void updateNewArea(NewArea newArea){
+        newAreaMapper.updateNewArea(newArea);
+    }
+    @Override
+    public void deleteNewArea(NewArea newArea){
+        newAreaMapper.deleteNewArea(newArea);
+    }
+    @Override
+    public List<NewArea> queryNewAreaPage(Map map){
+        return newAreaMapper.queryNewAreaPage(map);
+    }
+    @Override
+    public Integer queryNewAreaPageCount(Map map){
+        return newAreaMapper.queryNewAreaPageCount(map);
+    }
+    @Override
+    public void saveNewAreaBatch(List<NewArea> newAreaList) {
+         newAreaMapper.saveNewAreaBatch(newAreaList);
+    }
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/notice/NoticeReadRecordService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/notice/NoticeReadRecordService.java
new file mode 100644
index 0000000..240bc9f
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/notice/NoticeReadRecordService.java
@@ -0,0 +1,39 @@
+package cn.pluss.platform.notice;
+
+import cn.pluss.platform.entity.NoticeReadRecord;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-04-19
+ */
+public interface NoticeReadRecordService extends IService<NoticeReadRecord> {
+
+    /**
+     * 返回未读通知条数
+     * @return
+     */
+    Map<String, Object> getAppNoReadNoticeCount();
+
+    /**
+     * 查询未读资讯文章条数
+     * @return
+     */
+    Map<String, Object> getAppNoReadArticleCount();
+
+    /**
+     * 清楚未读标记
+     * @param typeFirst     类别一
+     *        1、到账通知、2、其他通知; 3、消息资讯
+     * @param typeSecond    类别二
+     *        typeFirst = 2 时, 0、分润通知; 1、系统通知;
+     *        typeFirst = 3 时, 1、攻略; 2、资讯; 3、活动
+     */
+    void clearReadFlag(String typeFirst, String typeSecond);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/notice/NoticeService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/notice/NoticeService.java
new file mode 100644
index 0000000..9eb34d8
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/notice/NoticeService.java
@@ -0,0 +1,192 @@
+package cn.pluss.platform.notice;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.entity.Notice;
+import cn.pluss.platform.mapper.NoticeMapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author nb2020
+ */
+public interface NoticeService extends IService<Notice> {
+
+    default Notice queryNotice(Notice notice) {
+        return ((NoticeMapper) getBaseMapper()).queryNotice(notice);
+    }
+
+    default List<Notice> queryNoticeList(Notice notice) {
+        return ((NoticeMapper) getBaseMapper()).queryNoticeList(notice);
+    }
+
+    void saveNotice(Notice notice);
+
+    default void updateNotice(Notice notice) {
+        ((NoticeMapper) getBaseMapper()).updateNotice(notice);
+    }
+
+    default void deleteNotice(Notice notice) {
+        ((NoticeMapper) getBaseMapper()).deleteNotice(notice);
+    }
+
+    default List<Notice> queryNoticePage(Map<String, Object> map) {
+        return ((NoticeMapper) getBaseMapper()).queryNoticePage(map);
+    }
+
+    default Integer queryNoticePageCount(Map<String, Object> map) {
+        return ((NoticeMapper) getBaseMapper()).queryNoticePageCount(map);
+    }
+
+    /**
+     * 保存身份证认证的通知
+     */
+    default Integer saveIdCardAuthNotice(Notice notice) {
+        notice.setTypeFirst(1);
+        notice.setTypeSecond(Notice.TYPE_ID_CARD_AUTH);
+        return (getBaseMapper()).insert(notice);
+    }
+
+    /**
+     * 保存商家认证的通知
+     */
+    default Integer saveMerAuthNotice(Notice notice) {
+        notice.setTypeFirst(1);
+        notice.setTypeSecond(Notice.TYPE_MERCHANT_AUTH);
+        return (getBaseMapper()).insert(notice);
+    }
+
+    /**
+     * 保存员工退款申请的通知
+     */
+    default Integer saveMerStaffRefundNotice(Notice notice) {
+        notice.setTypeFirst(1);
+        notice.setTypeSecond(Notice.TYPE_STAFF_REFUND);
+        return (getBaseMapper()).insert(notice);
+    }
+
+    /**
+     * 保存银行卡认证的通知
+     */
+    default Integer saveBankAuthNotice(Notice notice) {
+        notice.setTypeFirst(1);
+        notice.setTypeSecond(Notice.TYPE_BANK_AUTH);
+        return (getBaseMapper()).insert(notice);
+    }
+
+    /**
+     * 保存商户进件修改信息的通知
+     */
+    default Integer saveMerChangeDataNotice(Notice notice) {
+        notice.setTypeFirst(1);
+        notice.setTypeSecond(Notice.TYPE_MER_DATA_CHANGE);
+        return (getBaseMapper()).insert(notice);
+    }
+
+    /**
+     * 保存商户银行卡变更结果的通知
+     * @param notice 通知内容
+     */
+    default Integer saveMerBankChangeNotice(Notice notice) {
+        notice.setTypeFirst(1);
+        notice.setTypeSecond(Notice.TYPE_MER_BANK_CHANGE);
+        return (getBaseMapper()).insert(notice);
+    }
+
+    /**
+     * 保存系统通知
+     * @param notice
+     * @return
+     */
+    default Integer saveSystemNotice(Notice notice) {
+        notice.setTypeFirst(1);
+        notice.setTypeSecond(-1);
+        return (getBaseMapper()).insert(notice);
+    }
+
+    /**
+     * 保存商户违规的通知
+     */
+    default Integer saveMerOutLineNotice(Notice notice) {
+        notice.setTypeFirst(1);
+        notice.setTypeSecond(Notice.TYPE_MER_OUT_LINE);
+        return (getBaseMapper()).insert(notice);
+    }
+
+    /**
+     * 保存商户异常的通知
+     */
+    default Integer saveMerExceptionNotice(Notice notice) {
+        notice.setTypeFirst(1);
+        notice.setTypeSecond(Notice.TYPE_MER_EXCEPTION);
+        return (getBaseMapper()).insert(notice);
+    }
+
+    /**
+     * 保存商户冻结的通知
+     */
+    default Integer saveMerFreezeNotice(Notice notice) {
+        notice.setTypeFirst(1);
+        notice.setTypeSecond(Notice.TYPE_MER_FREEZE);
+        return (getBaseMapper()).insert(notice);
+    }
+
+    /**
+     * 保存商户分润的通知
+     * @param notice    通知内容
+     */
+    default Integer saveMerProfitNotice(Notice notice) {
+        notice.setTypeFirst(0);
+        notice.setTypeSecond(Notice.TYPE_MER_PROFIT);
+        return (getBaseMapper()).insert(notice);
+    }
+
+    /**
+     * 保存商户升级分润的通知
+     * @param notice    通知内容
+     */
+    default Integer saveMerUpdateProfitNotice(Notice notice) {
+        notice.setTypeFirst(0);
+        notice.setTypeSecond(Notice.TYPE_MER_UPDATE_PROFIT);
+        return (getBaseMapper()).insert(notice);
+    }
+
+    /**
+     * @description:
+     * @date: 2021/8/31 16:50
+     * @param notice:
+     * @return cn.pluss.platform.api.Result<?>
+     */
+    void sendTempNotice(Notice notice);
+
+    /**
+     * 保存定时的通知
+     * @param notice            通知信息
+     * @param scheduleFlag      定时参数
+     */
+    void sendTempNotice(Notice notice, String scheduleFlag);
+
+    /**
+     * 给单个用户发送模板通知
+     */
+    void sendTempNotice(String templateTitle, String templateDesc, String content, String url, String userId, Object... args);
+
+    /**
+     * 给单个用户发送模板通知
+     */
+    void sendTempNotice(String templateTitle, String templateDesc, String content, String url, String userId, Map<String, Object> mapArgs);
+
+    /**
+     * 给单个用户发送模板通知
+     */
+    void sendTempNotice(String templateTitle, String templateDesc, String content, String url, String userId, Map<String, Object> mapArgs, boolean pushFlag);
+
+    void sendEditApplyNotice(String userId, String alias, String settleName);
+
+    void sendEditApplySuccessNotice(String userId, String alias, String settleName);
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/notice/impl/NoticeReadRecordServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/notice/impl/NoticeReadRecordServiceImpl.java
new file mode 100644
index 0000000..8e70839
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/notice/impl/NoticeReadRecordServiceImpl.java
@@ -0,0 +1,116 @@
+package cn.pluss.platform.notice.impl;
+
+import cn.pluss.platform.entity.NoticeReadRecord;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.mapper.NoticeReadRecordMapper;
+import cn.pluss.platform.notice.NoticeReadRecordService;
+import cn.pluss.platform.userApp.UserAppService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.Setter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-04-19
+ */
+@Service
+public class NoticeReadRecordServiceImpl extends ServiceImpl<NoticeReadRecordMapper, NoticeReadRecord> implements NoticeReadRecordService {
+
+    @Setter(onMethod_ = {@Autowired})
+    private UserAppService userAppService;
+
+    @Override
+    public Map<String, Object> getAppNoReadNoticeCount() {
+        String billCountStr = "billCount";
+        String profitCountStr = "profitCount";
+        String systemCountStr = "systemCount";
+        String countStr = "count";
+        String typeStr = "type";
+
+        UserApp userApp = userAppService.queryUserAppByToken();
+        Integer billCount = baseMapper.selectBillCount(userApp.getUserId() + "");
+        List<Map<String, Object>> noticeCountList = baseMapper.selectNoticeCount(userApp.getUserId() + "");
+
+        Map<String, Object> resultMap = new HashMap<>();
+        resultMap.put(billCountStr, billCount);
+
+        for (Map<String, Object> map : noticeCountList) {
+            if ("0".equals(map.get(typeStr) + "")) {
+                resultMap.put(profitCountStr, Integer.parseInt(map.get(countStr) + ""));
+            }
+
+            if ("1".equals(map.get(typeStr) + "")) {
+                resultMap.put(systemCountStr, Integer.parseInt(map.get(countStr) + ""));
+            }
+        }
+
+        resultMap.putIfAbsent(profitCountStr, 0);
+        resultMap.putIfAbsent(systemCountStr, 0);
+
+        return resultMap;
+    }
+
+    @Override
+    public Map<String, Object> getAppNoReadArticleCount() {
+        String typeStr = "type";
+        String countStr = "count";
+        String recommendCount = "recommendCount";
+        String recommendCount2 = "recommendCount2";
+        String informationCount = "informationCount";
+        String activityCount = "activityCount";
+
+        UserApp userApp = userAppService.queryUserAppByToken();
+        List<Map<String, Object>> articleCountList = baseMapper.selectArticleCount(userApp.getUserId() + "");
+
+        Map<String, Object> resultMap = new HashMap<>();
+        for (Map<String, Object> map : articleCountList) {
+            if (recommendCount.equals(map.get(typeStr) + "")) {
+                resultMap.put(recommendCount, Integer.parseInt(map.get(countStr) + ""));
+            }
+
+            if (recommendCount2.equals(map.get(typeStr) + "")) {
+                resultMap.put(recommendCount2, Integer.parseInt(map.get(countStr) + ""));
+            }
+
+            if (informationCount.equals(map.get(typeStr) + "")) {
+                resultMap.put(informationCount, Integer.parseInt(map.get(countStr) + ""));
+            }
+
+            if (activityCount.equals(map.get(typeStr) + "")) {
+                resultMap.put(activityCount, Integer.parseInt(map.get(countStr) + ""));
+            }
+        }
+
+        resultMap.putIfAbsent(recommendCount, 0);
+        resultMap.putIfAbsent(informationCount, 0);
+        resultMap.putIfAbsent(activityCount, 0);
+
+        return resultMap;
+    }
+
+    @Override
+    public void clearReadFlag(String typeFirst, String typeSecond) {
+        UserApp userApp = userAppService.queryUserAppByToken();
+        switch (typeFirst) {
+            case "1":
+                baseMapper.updateBillNoticeRead(userApp.getUserId().toString());
+                break;
+            case "2":
+                baseMapper.updateNoticeRead(userApp.getUserId().toString(), typeSecond);
+                break;
+            case "3":
+                baseMapper.updateEventInfoRead(userApp.getUserId().toString(), typeSecond);
+                break;
+            default:
+        }
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/notice/impl/NoticeServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/notice/impl/NoticeServiceImpl.java
new file mode 100644
index 0000000..2870229
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/notice/impl/NoticeServiceImpl.java
@@ -0,0 +1,313 @@
+package cn.pluss.platform.notice.impl;
+
+import cn.pluss.platform.PushService;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.channel.BaseMerchantAuditService;
+import cn.pluss.platform.entity.Notice;
+import cn.pluss.platform.entity.NoticeTemplate;
+import cn.pluss.platform.entity.UserTask;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.NoticeMapper;
+import cn.pluss.platform.notice.NoticeService;
+import cn.pluss.platform.notice.template.NoticeTemplateService;
+import cn.pluss.platform.schedule.UserTaskService;
+import cn.pluss.platform.user.impl.GeneralPushUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.Setter;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+
+/**
+ * @author nb2020
+ */
+@Service("noticeService")
+public class NoticeServiceImpl extends ServiceImpl<NoticeMapper, Notice> implements NoticeService {
+
+    @Setter(onMethod_ = {@Autowired, @Lazy})
+    private PushService pushService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private NoticeTemplateService noticeTemplateService;
+
+    @Autowired
+    private UserTaskService userTaskService;
+
+    @Autowired
+    private GeneralPushUtil generalPushUtil;
+
+    @Override
+    public boolean saveOrUpdate(Notice entity) {
+        if (entity.getTypeFirst() == null) {
+            entity.setTypeFirst(1);
+        }
+
+        if (entity.getTypeSecond() == null) {
+            entity.setTypeSecond(-1);
+        }
+
+        if (StringUtils.isNotBlank(entity.getUrl())) {
+            entity.setConrtent(null);
+        }
+
+        if (StringUtils.isBlank(entity.getNoticeCode())) {
+            entity.setNoticeCode(UUID.randomUUID().toString().replace("-", ""));
+        }
+
+        entity.setCreateDt(new Date());
+        entity.setIsDeal(0);
+
+        return super.saveOrUpdate(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class, propagation = Propagation.NESTED)
+    public boolean save(Notice notice) {
+        // 发推送给个人，如果没有指定用户id，则推送到所有人
+//        if ("1".equals(notice.getPushFlag())) {
+//            if ("-1".equals(notice.getUserId())) {
+//                pushService.pushAll(notice.getTitle(), notice.getDesc());
+//            } else {
+//                List<String> userIdList = Collections.singletonList(notice.getUserId());
+//                GeneralPushUtil.sendAllPlatByAlias(userIdList, notice.getTitle(), notice.getDesc(), "1");
+//            }
+//        }
+//        if ("2".equals(notice.getPushFlag())) {
+//            if ("-1".equals(notice.getUserId())) {
+//                pushService.pushAll(notice.getTitle(), notice.getDesc());
+//            } else {
+//                List<String> userIdList = new ArrayList<String>() {{
+//                    add(notice.getUserId());
+//                }};
+//                UserApp userApp = new UserApp().setUserId(Long.parseLong(notice.getUserId()));
+//                userApp = userAppService.queryUserApp(userApp);
+//                if (userApp != null && userApp.getParentId() != null) {
+//                    userIdList.add(userApp.getParentId().toString());
+//                }
+//                GeneralPushUtil.sendAllPlatByAlias(userIdList, notice.getTitle(), notice.getDesc(), "1");
+//            }
+//        }
+        Integer result;
+        switch (notice.getTypeSecond()) {
+            case Notice.TYPE_MER_OUT_LINE:
+                result = saveMerOutLineNotice(notice);
+                break;
+            case Notice.TYPE_MER_EXCEPTION:
+                result = saveMerExceptionNotice(notice);
+                break;
+            case Notice.TYPE_MER_FREEZE:
+                result = saveMerFreezeNotice(notice);
+                break;
+            default:
+                result = baseMapper.insert(notice);
+                break;
+        }
+        return result != null && result >= 1;
+    }
+
+    private Integer saveSwitchNotice(String userId, Notice notice, NoticeTemplate noticeTemplate, String regContent, String userName) {
+        Integer result = 0;
+        notice.setUserId(userId);
+        notice.setUserName(userName);
+        notice.setDesc(noticeTemplate.getContent().replace(noticeTemplate.getVariable(), regContent));
+        switch (notice.getTypeSecond()) {
+            case Notice.TYPE_MER_OUT_LINE:
+                result = saveMerOutLineNotice(notice);
+                break;
+            case Notice.TYPE_MER_EXCEPTION:
+                result = saveMerExceptionNotice(notice);
+                break;
+            case Notice.TYPE_MER_FREEZE:
+                result = saveMerFreezeNotice(notice);
+                break;
+            default:
+//                        result = baseMapper.insert(notice);
+                break;
+        }
+        return result;
+    }
+
+    @Override
+    public void saveNotice(Notice notice) {
+        save(notice);
+    }
+
+    /**
+     * @param notice:
+     * @return cn.pluss.platform.api.Result<?>
+     * @description:发送自定义模板消息
+     * @date: 2021/8/31 16:51
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void sendTempNotice(Notice notice) {
+        String pushFlag = notice.getPushFlag();
+        String userId = notice.getUserId();
+        if ("-1".equals(userId)) {
+            // 广播就不做定时任务
+            notice.setCreateDt(new Date());
+            if (notice.getTypeFirst() == null) {
+                notice.setTypeFirst(1);
+            }
+            if (notice.getTypeSecond() == null) {
+                notice.setTypeSecond(-1);
+            }
+            baseMapper.insert(notice);
+            if (!"0".equals(pushFlag)) {
+                pushService.pushAll(notice.getTitle(), notice.getDesc());
+            }
+
+        } else {
+            List<String> userNameList = Arrays.asList(notice.getUserName().split(","));
+            List<String> aliasList = Arrays.asList(notice.getAliass().split(","));
+            NoticeTemplate template = noticeTemplateService.getNoticeTemplateByType(notice.getTypeSecond() + "");
+            MsgException.checkNull(template, "当前类型暂无模板，请在自定义模板中添加！");
+
+            if ("0".equals(pushFlag)) {
+                for (int i = 0; i < userNameList.size(); i++) {
+                    List<String> pushIds = new ArrayList<>();
+                    if (StringUtils.isNotBlank(notice.getUserIds())) {
+                        List<String> uids = Arrays.asList(notice.getUserIds().split(","));
+                        pushIds.add(uids.get(i));
+                    }
+                    if (StringUtils.isNotBlank(notice.getParentIds()) && "2".equals(notice.getPushFlag())) {
+                        List<String> pids = Arrays.asList(notice.getParentIds().split(","));
+                        pushIds.add(pids.get(i));
+                    }
+                    String reDesc = aliasList.get(i);
+                    String desc = template.getContent();
+                    if (StringUtils.isNotBlank(template.getVariable())) {
+                        desc = template.getContent().replace(template.getVariable(), reDesc);
+                    }
+                    generalPushUtil.sendAllPlatByAlias(pushIds, notice.getTitle(), desc, "1");
+                }
+            }
+
+            List<String> uids = Arrays.asList(notice.getUserIds().split(","));
+            List<String> pids = null;
+            for (int i = 0; i < aliasList.size(); i++) {
+                Map<String, Object> mapArgs = new HashMap<>();
+                mapArgs.put(template.getVariable(), aliasList.get(i));
+                sendTempNotice(notice.getTitle(), notice.getDesc(), notice.getConrtent(), notice.getUrl(), uids.get(i), mapArgs);
+                // 同步发到上级
+                if (StringUtils.isNotBlank(notice.getParentIds()) && "2".equals(notice.getPushFlag())) {
+                    if (pids == null) {
+                        pids = Arrays.asList(notice.getParentIds().split(","));
+                    }
+                    sendTempNotice(notice.getTitle(), notice.getDesc(), notice.getConrtent(), notice.getUrl(), pids.get(i), mapArgs);
+                }
+            }
+        }
+    }
+
+    @Override
+    public void sendTempNotice(Notice notice, String scheduleFlag) {
+        String userId = notice.getUserId();
+
+        // 立即发送和全员发送的不直接走发送的逻辑
+        if (Objects.equals(scheduleFlag, "0") || "-1".equals(userId)) {
+            sendTempNotice(notice);
+            return;
+        }
+
+        List<String> aliasList = Arrays.asList(notice.getAliass().split(","));
+        NoticeTemplate template = noticeTemplateService.getNoticeTemplateByType(notice.getTypeSecond() + "");
+        MsgException.checkNull(template, "当前类型暂无模板，请在自定义模板中添加！");
+
+        List<String> uids = Arrays.asList(notice.getUserIds().split(","));
+        List<String> pids = null;
+
+        for (int i = 0; i < aliasList.size(); i++) {
+            UserTask userTask = new UserTask();
+            userTask.setType(scheduleFlag);
+
+            userTask.setArg0(notice.getTitle());
+            String content = notice.getDesc().replace(template.getVariable(), aliasList.get(i));
+            userTask.setArg1(content);
+            userTask.setArg2(notice.getUrl());
+            userTask.setArg3(notice.getConrtent());
+            userTask.setStatus(UserTask.STATUS_ENABLED);
+            userTask.setTaskCode("SCHE_NOTICE");
+            userTask.setUserId(Integer.parseInt(uids.get(i)));
+            userTaskService.save(userTask);
+            // 同步发到上级
+            if (StringUtils.isNotBlank(notice.getParentIds()) && "2".equals(notice.getPushFlag())) {
+                if (pids == null) {
+                    pids = Arrays.asList(notice.getParentIds().split(","));
+                }
+                userTask.setUserId(Integer.parseInt(pids.get(i)));
+                userTask.setCreateTime(null);
+                userTask.setUpdateTime(null);
+                userTaskService.save(userTask);
+            }
+        }
+    }
+
+    @Override
+    public void sendTempNotice(String templateTitle, String templateDesc, String content, String url, String userId, Object... args) {
+        Map<String, Object> mapArgs = new HashMap<>();
+        for (int i = 0; i < args.length; i++) {
+            mapArgs.put("$" + (i + 1), args[i].toString());
+        }
+
+        sendTempNotice(templateTitle, templateDesc, content, url,userId, mapArgs);
+    }
+
+    @Override
+    public void sendTempNotice(String templateTitle, String templateDesc, String content, String url, String userId, Map<String, Object> mapArgs) {
+        sendTempNotice(templateTitle, templateDesc, content, url, userId, mapArgs, true);
+    }
+
+    @Override
+    public void sendTempNotice(String templateTitle, String templateDesc, String content, String url, String userId, Map<String, Object> mapArgs, boolean pushFlag) {
+        String desc = templateDesc;
+
+        for (Map.Entry<String, Object> entry : mapArgs.entrySet()) {
+            if (StringUtils.isNotBlank(entry.getKey())) {
+                desc = desc.replace(entry.getKey(), entry.getValue().toString());
+            }
+        }
+
+        if (content != null) {
+            for (Map.Entry<String, Object> entry : mapArgs.entrySet()) {
+                if (StringUtils.isNotBlank(entry.getKey())) {
+                    content = content.replace(entry.getKey(), entry.getValue().toString());
+                }
+            }
+        }
+
+        Notice notice = new Notice(1, -1, userId, null);
+        notice.setTitle(templateTitle);
+        notice.setUrl(url);
+        notice.setDesc(desc);
+
+        if (content == null) {
+            notice.setConrtent(desc);
+        } else {
+            notice.setConrtent(content);
+        }
+
+        save(notice);
+
+        if (pushFlag) {
+            generalPushUtil.sendAllPlatByAlias(Collections.singletonList(userId), templateTitle, notice.getDesc(), "");
+        }
+    }
+
+    @Override
+    public void sendEditApplyNotice(String userId, String alias, String settleName) {
+        sendTempNotice("结算卡修改申请通知", BaseMerchantAuditService.editApplyNoticeTemplate, null, null, userId, alias, settleName);
+    }
+
+    @Override
+    public void sendEditApplySuccessNotice(String userId, String alias, String settleName) {
+        sendTempNotice("结算卡修改申请通知", BaseMerchantAuditService.editApplyResultNoticeTemplate, null, null, userId, alias, settleName);
+    }
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/notice/template/NoticeTemplateService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/notice/template/NoticeTemplateService.java
new file mode 100644
index 0000000..68ebf38
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/notice/template/NoticeTemplateService.java
@@ -0,0 +1,24 @@
+package cn.pluss.platform.notice.template;
+
+import cn.pluss.platform.entity.NoticeTemplate;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 自定义消息通知模板表 服务类
+ * </p>
+ *
+ * @author bzg
+ * @since 2021-08-26
+ */
+public interface NoticeTemplateService extends IService<NoticeTemplate> {
+
+    /**
+     * @description:根据类型获取模板
+     * @date: 2021/8/27 11:09
+     * @param type:
+     * @return cn.pluss.platform.entity.NoticeTemplate
+     */
+    NoticeTemplate getNoticeTemplateByType(String type);
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/notice/template/impl/NoticeTemplateServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/notice/template/impl/NoticeTemplateServiceImpl.java
new file mode 100644
index 0000000..a959cac
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/notice/template/impl/NoticeTemplateServiceImpl.java
@@ -0,0 +1,34 @@
+package cn.pluss.platform.notice.template.impl;
+
+import cn.pluss.platform.entity.NoticeTemplate;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.NoticeTemplateMapper;
+import cn.pluss.platform.notice.template.NoticeTemplateService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 自定义消息通知模板表 服务实现类
+ * </p>
+ *
+ * @author bzg
+ * @since 2021-08-26
+ */
+@Service
+public class NoticeTemplateServiceImpl extends ServiceImpl<NoticeTemplateMapper, NoticeTemplate> implements NoticeTemplateService {
+
+
+    @Override
+    public NoticeTemplate getNoticeTemplateByType(String type) {
+        QueryWrapper<NoticeTemplate> queryWrapper = new QueryWrapper<NoticeTemplate>().eq("type",type);
+        List<NoticeTemplate> noticeTemplates = this.baseMapper.selectList(queryWrapper);
+        if(noticeTemplates.isEmpty()){
+            MsgException.throwException("暂无可用模板，请先在自定义模板中添加模板");
+        }
+        return noticeTemplates.get(0);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/notification/NotificationService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/notification/NotificationService.java
new file mode 100644
index 0000000..7f8c3c5
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/notification/NotificationService.java
@@ -0,0 +1,17 @@
+package cn.pluss.platform.notification;
+
+import cn.pluss.platform.entity.Notification;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+import java.util.Map;
+
+
+public interface NotificationService extends IService<Notification> {
+
+    Notification selectOne();
+
+    void updateAll(String status);
+
+    List<Notification> queryNotification(Map<String, Object> map);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/notification/impl/NotificationServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/notification/impl/NotificationServiceImpl.java
new file mode 100644
index 0000000..d48b232
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/notification/impl/NotificationServiceImpl.java
@@ -0,0 +1,31 @@
+package cn.pluss.platform.notification.impl;
+
+import cn.pluss.platform.entity.Notification;
+import cn.pluss.platform.mapper.NotificationMapper;
+import cn.pluss.platform.notification.NotificationService;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class NotificationServiceImpl extends ServiceImpl<NotificationMapper, Notification> implements NotificationService {
+    @Override
+    public Notification selectOne() {
+        return baseMapper.selectOneTime();
+    }
+
+    @Override
+    public void updateAll(String status) {
+        baseMapper.updateAll(status);
+    }
+
+    @Override
+    public List<Notification> queryNotification(Map<String, Object> map) {
+        return baseMapper.queryNotification(map);
+    }
+
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/notify/NotifyMessageService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/notify/NotifyMessageService.java
new file mode 100644
index 0000000..a6a26d9
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/notify/NotifyMessageService.java
@@ -0,0 +1,40 @@
+package cn.pluss.platform.notify;
+
+import cn.pluss.platform.entity.MerchantOrder;
+import cn.pluss.platform.entity.MerchantOrderSplit;
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.scheduling.annotation.Async;
+
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * 异步消息推送Service
+ */
+public interface NotifyMessageService {
+
+    void sendNotifyMessage(MerchantOrder order, Map<String,Object> params) throws Exception;
+
+    void sendNotifyMessage(String notifyUrl,Map<String,Object> params) throws Exception;
+
+    void sendMqttMessage(MerchantOrder order, Date payDate, String type ,JSONObject json,String storeId,int payType);
+
+    void sendCancelPayMessage(JSONObject params);
+
+    /**
+     * 发送支付成功消息
+     * @param order
+     * @param pay
+     * @param params
+     * @param mercId
+     */
+    void sendPayMessage(MerchantOrder order, String pay, JSONObject params, String mercId);
+
+    void sendLowerPayNotifyCallback(MerchantOrder order);
+
+    /**
+     * 推送分账通知
+     * @param orderSplit
+     */
+    void sendLowerSplitNotify(MerchantOrderSplit orderSplit);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/notify/impl/NotifyMessageServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/notify/impl/NotifyMessageServiceImpl.java
new file mode 100644
index 0000000..62d1900
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/notify/impl/NotifyMessageServiceImpl.java
@@ -0,0 +1,549 @@
+package cn.pluss.platform.notify.impl;
+
+import cn.pluss.platform.PushService;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.config.MqttSendMessage;
+import cn.pluss.platform.constants.Constant;
+import cn.pluss.platform.deviceStock.DeviceStockService;
+import cn.pluss.platform.deviceVoiceBox.DeviceVoiceBoxMsgService;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.enums.PayMessageType;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantOrder.MerchantOrderService;
+import cn.pluss.platform.merchantOrderSplit.MerchantOrderSplitDetailService;
+import cn.pluss.platform.notify.NotifyMessageService;
+import cn.pluss.platform.ty.Ys4GEnum;
+import cn.pluss.platform.ty.Ys4GTypeEnum;
+import cn.pluss.platform.user.UserVoiceService;
+import cn.pluss.platform.user.impl.GeneralPushUtil;
+import cn.pluss.platform.util.*;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONException;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.retry.annotation.Backoff;
+import org.springframework.retry.annotation.Recover;
+import org.springframework.retry.annotation.Retryable;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
+import org.springframework.web.util.UriComponents;
+import org.springframework.web.util.UriComponentsBuilder;
+
+import javax.annotation.Resource;
+import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
+import java.net.URLEncoder;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+@Slf4j
+@Service
+public class NotifyMessageServiceImpl implements NotifyMessageService {
+
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private MerchantOrderService merchantOrderService;
+
+    @Autowired
+    private MerchantBaseInfoService merchantBaseInfoService;
+
+    @Autowired
+    private DeviceVoiceBoxMsgService deviceVoiceBoxMsgService;
+
+    @Autowired
+    private DeviceStockService deviceStockService;
+
+    @Autowired
+    private MqttSendMessage mqttSendMessage;
+
+    @Autowired
+    private PushService pushService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private RestTemplate restTemplate;
+
+    @Autowired
+    private UserVoiceService userVoiceService;
+
+    @Autowired
+    private GeneralPushUtil generalPushUtil;
+
+    @Resource
+    private MerchantOrderSplitDetailService merchantOrderSplitDetailService;
+
+
+    @Retryable(value = Exception.class, maxAttempts = 5, backoff = @Backoff(delay = 5000, multiplier = 1.5))
+    @Override
+    public void sendNotifyMessage(MerchantOrder order, Map<String, Object> params) throws Exception {
+        logger.info("===============>开始支付成功，向下游推送支付结果通知，通知地址:{},通知参数:{}<=============", order.getMercNotifyUrl(), params);
+        if (StringUtil.isEmpty(order.getMercNotifyUrl())) {
+            logger.info("===============>上送的异步通知地址为空，推送失败<=============");
+            return;
+        }
+        String nofifyUrl = order.getMercNotifyUrl();
+        String json = ResultGenerator.genSuccessJsonResult("成功", params).toJSONString();
+        String result = null;
+        try {
+            result = restTemplate.postForObject(nofifyUrl, json, String.class);
+        }catch (Exception e){
+            e.printStackTrace();
+            throw new Exception();
+        }
+        logger.info("===============>下游返回消息内容为:{}<=============", result);
+        if (StringUtil.isEmpty(result)) {
+            throw new Exception();
+        }
+        JSONObject jsonObject = null;
+        try {
+            if(Constant.RESULT_CODE_SUCCESS.equalsIgnoreCase(result)){
+                if(StringUtil.isEmpty(params.get("msgType")) || "01".equals(params.get("msgType"))){
+                    UpdateWrapper<MerchantOrder> updateOrder = new UpdateWrapper<MerchantOrder>();
+                    updateOrder.eq("id", order.getId());
+                    updateOrder.set("mercNotifyStatus", "1");
+                    updateOrder.set("mercRemark", result);
+                    merchantOrderService.update(updateOrder);
+                }
+                return;
+            }else{
+                jsonObject = JSONObject.parseObject(result);
+                if (Constant.RESULT_CODE_SUCCESS.equalsIgnoreCase(jsonObject.getString("code"))) {
+                    if(StringUtil.isEmpty(params.get("msgType")) || "01".equals(params.get("msgType"))){
+                        UpdateWrapper<MerchantOrder> updateOrder = new UpdateWrapper<MerchantOrder>();
+                        updateOrder.eq("id", order.getId());
+                        updateOrder.set("mercNotifyStatus", "1");
+                        updateOrder.set("mercRemark", jsonObject.getString("msg"));
+                        merchantOrderService.update(updateOrder);
+                    }
+                    return;
+                } else {
+                    order.setMercRemark(jsonObject.getString("msg"));
+                    throw new Exception();
+                }
+            }
+        } catch (JSONException e) {
+            order.setMercRemark(result);
+            logger.info("===============>下游未返回正确的json格式数据:{}<=============", result);
+            throw new Exception();
+        }
+
+    }
+
+    @Retryable(value = Exception.class, maxAttempts = 5, backoff = @Backoff(delay = 5000, multiplier = 1.5))
+    @Override
+    public void sendNotifyMessage(String notifyUrl, Map<String, Object> params) throws Exception{
+        String json = ResultGenerator.genSuccessJsonResult("处理成功", params).toJSONString();
+        String result = null;
+        try {
+            result = restTemplate.postForObject(notifyUrl, json, String.class);
+        }catch (Exception e){
+            e.printStackTrace();
+            throw new Exception();
+        }
+        logger.info("===============>下游返回消息内容为:{}<=============", result);
+        if (StringUtil.isEmpty(result)) {
+            throw new Exception();
+        }
+        JSONObject jsonObject = null;
+        try {
+            if(Constant.RESULT_CODE_SUCCESS.equalsIgnoreCase(result)){
+                return;
+            }else{
+                jsonObject = JSONObject.parseObject(result);
+                if (Constant.RESULT_CODE_SUCCESS.equalsIgnoreCase(jsonObject.getString("code"))) {
+                    return;
+                }
+            }
+        } catch (JSONException e) {
+            logger.info("===============>下游未返回正确的json格式数据:{}<=============", result);
+            throw new Exception();
+        }
+    }
+
+    @Override
+    public void sendMqttMessage(MerchantOrder order, Date payDate, String type, JSONObject object, String mercId,int payType){
+        if ("pay".equals(type)) {
+            sendPayMqttMessage(order, payDate,payType);
+            if ("10".equals(order.getOrderType())) {
+                MerchantBaseInfo merchant = merchantBaseInfoService.getMerchantBaseInfoByMerchantCode(order.getMerchantCode());
+                logger.info("================>【线上店来单消息】推送商户,商户merchantCode参数:{}<===============", order.getMerchantCode());
+                if (merchant != null) {
+                    //实例化Timer类
+                    Timer timer = new Timer();
+                    timer.schedule(new TimerTask() {
+                        public void run() {
+                            pushService.pushMsg(String.valueOf(merchant.getUserId()), pushService.MAKE_ORDER);
+                        }
+                    }, 2000);
+                }
+            }
+        } else if ("cancel".equals(type)) {
+            sendCancelPayMqttMessage(object, mercId,order);
+        }
+    }
+
+    /**
+     * 发送支付消息
+     * @param order
+     * @param type
+     * @param params
+     * @param mercId
+     */
+    @Override
+    public void sendPayMessage(MerchantOrder order, String type, JSONObject params, String mercId) {
+        sendLowerPayNotifyCallback(order);
+        String orderType = order.getOrderType();
+        int val = PayMessageType.PLAIN_PAY.getValue();
+        //会员充值
+        if("3".equals(orderType) || "5".equals(orderType)){
+            val = PayMessageType.MEMBER_RECHARGE.getValue();
+        }
+        sendMqttMessage(order,order.getTransDt(),type,params,mercId,val);
+
+    }
+
+    /**
+     * 推送消息
+     * @param order
+     */
+    @Override
+    public void sendLowerPayNotifyCallback(MerchantOrder order) {
+        log.info("====================>进入下游订单支付成功推送操作<====================");
+        JSONObject notifyMap = new JSONObject();
+        notifyMap.put("msgType","01");
+        notifyMap.put("channelTradeNo",order.getThirdTransNo());
+        notifyMap.put("mercOrderNo",order.getMercOrderNo());
+        notifyMap.put("mercUserId",order.getMercUserId());
+        notifyMap.put("payAmt",order.getConsumeFee().toString());
+        notifyMap.put("payTime",new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(order.getTransDt()));
+        notifyMap.put("payWay",order.getPayTypeCode().contains("0") || "aliPay".equals(order.getPayTypeCode()) ? "ZFBZF" : "WXZF");
+        notifyMap.put("orderNumber",order.getOrderNumber());
+        notifyMap.put("status","1");
+        String key = "4c8d277b0f274604af68e590cc0b3e6b";
+        MerchantBaseInfo merchant = merchantBaseInfoService.getMerchantBaseInfoByMerchantCode(order.getMerchantCode());
+        if(merchant != null && StringUtil.isNotEmpty(merchant.getMd5Key())){
+            key = merchant.getMd5Key();
+        }
+        String signStr = SignUtils.getSignContent(notifyMap) + "&key="+key;
+        log.info("下游通知签名字符串：{}",signStr);
+        String nSign = MD5Util.MD5Encode(signStr, "UTF-8");
+        notifyMap.put("sign",nSign);
+        try {
+            sendNotifyMessage(order,notifyMap);
+        } catch (Exception e) {
+            log.info("====================>进入下游推送异步通知异常，异常信息:{}<====================",e);
+        }
+    }
+
+    @Override
+    public void sendLowerSplitNotify(MerchantOrderSplit orderSplit) {
+        if(StringUtil.isNotEmpty(orderSplit.getNotifyUrl())){
+            log.info("【分账通知推送】订单号：{}",orderSplit.getOrderNumber());
+            JSONObject notify = new JSONObject();
+            notify.put("msgType","03");
+            notify.put("orderNumber",orderSplit.getOrderNumber());
+            notify.put("mercOrderNo",orderSplit.getMercOrderNo());
+            notify.put("divStatus",orderSplit.getDivStatus());
+            notify.put("divisionMode",orderSplit.getDivisionMode());
+            notify.put("merchantCode",orderSplit.getMerchantCode());
+            notify.put("merchantName",orderSplit.getMerchantName());
+            notify.put("orderAmt",orderSplit.getOrderAmt().toString());
+            notify.put("remark",orderSplit.getRemark());
+            Integer divStatus = orderSplit.getDivStatus();
+            if(divStatus == 1 || divStatus == 2){
+                JSONArray divList = new JSONArray(16);
+                List<MerchantOrderSplitDetail> detailList = orderSplit.getDetailList();
+                if(detailList == null){
+                    detailList = merchantOrderSplitDetailService.listByOrderNumber(orderSplit.getOrderNumber());
+                }
+                if(!detailList.isEmpty()){
+                    for (MerchantOrderSplitDetail detail:detailList) {
+                        JSONObject divObj = new JSONObject(16);
+                        divObj.put("merchantCode",detail.getMerchantCode());
+                        divObj.put("merchantName",detail.getMerchantName());
+                        divObj.put("finalAmt",detail.getFinalAmt().toString());
+                        divList.add(divObj);
+                    }
+                    notify.put("divList",divList);
+                }
+            }
+            String key = "4c8d277b0f274604af68e590cc0b3e6b";
+            MerchantBaseInfo merchant = merchantBaseInfoService.getMerchantBaseInfoByMerchantCode(orderSplit.getMerchantCode());
+            if(merchant != null && StringUtil.isNotEmpty(merchant.getMd5Key())){
+                key = merchant.getMd5Key();
+            }
+            String signStr = SignUtils.getSignContent(notify) + "&key="+key;
+            log.info("下游通知签名字符串：{}",signStr);
+            String nSign = MD5Util.MD5Encode(signStr, "UTF-8");
+            notify.put("sign",nSign);
+            try {
+                sendNotifyMessage(orderSplit.getNotifyUrl(),notify);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    @Override
+    public void sendCancelPayMessage(JSONObject params) {
+        logger.info("===============>【取消支付】,推送mqtt取消支付通知开始,请求参数:{}<===============", params);
+        String mercId = params.getString("mercId");
+        String userId = params.getString("userId");
+        UserVoice voice = userVoiceService.getByUserId(Long.valueOf(userId));
+        if(UserVoice.ENABLE.equals(voice.getPayCancel())){
+            generalPushUtil.sendAllPlatByUserIdCancel(Arrays.asList(userId),null,null);
+        }
+        MerchantOrder order = params.getObject("order",MerchantOrder.class);
+        if(order == null){
+            order = new MerchantOrder();
+            String money = StringUtil.isEmpty(params.getString("money")) ? "100.00" : params.getString("money");
+            order.setConsumeFee(Double.valueOf(money));
+            order.setOrderNumber(StringUtil.getBillno());
+        }
+        JSONObject object = new JSONObject();
+        object.put("type", "trans_cancel");
+        object.put("orderId", order.getOrderNumber());
+        object.put("cancelTime", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+        try {
+            sendMqttMessage(order, null, "cancel", object, mercId, PayMessageType.PLAIN_PAY.getValue());
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.info("===============>【取消支付】,推送mqtt取消支付通知异常,异常信息:{}<===============", e.getMessage());
+        }
+    }
+
+    private void sendCancelPayMqttMessage(JSONObject object, String storeId,MerchantOrder order) {
+        QueryWrapper<DeviceStock> boxQueryWrapper = new QueryWrapper<DeviceStock>()
+                .eq("actMercId", storeId).eq("status", "3").likeRight("code", "YYX");
+        List<DeviceStock> list = deviceStockService.list(boxQueryWrapper);
+        for (DeviceStock stock : list) {
+            DeviceVoiceBoxMsg deviceMsg = new DeviceVoiceBoxMsg();
+            try {
+                sendDeviceMessage(stock,deviceMsg,"2",null,order.getOrderNumber(),order.getConsumeFee()+"",
+                        object,PayMessageType.PLAIN_PAY.getValue(), null);
+            }catch (Exception e){
+                logger.error("【音箱消息】推送异常，设备编号：{}，异常信息：{}",stock.getDeviceNo(),e.getMessage());
+            }
+        }
+    }
+
+    private void saveBoxMessage(JSONObject object, DeviceStock stock,String type,String orderNumber,DeviceVoiceBoxMsg deviceMsg) {
+        deviceMsg.setBody(object.toJSONString());
+        deviceMsg.setCreateTime(new Date());
+        deviceMsg.setType(type);
+        deviceMsg.setOrderNumber(orderNumber);
+        deviceMsg.setRequestId(UUID.randomUUID().toString().replace("-","").toUpperCase());
+        deviceMsg.setDeviceNo(stock.getSnNo());
+        deviceVoiceBoxMsgService.save(deviceMsg);
+    }
+
+    private void sendPayMqttMessage(MerchantOrder order, Date payDate,int payType) {
+        QueryWrapper<MerchantBaseInfo> merchantQuery = new QueryWrapper<MerchantBaseInfo>()
+                .eq("merchantCode", order.getMerchantCode());
+        MerchantBaseInfo merchant = merchantBaseInfoService.getOne(merchantQuery);
+        if (merchant != null) {
+            QueryWrapper<DeviceStock> boxQueryWrapper = new QueryWrapper<DeviceStock>()
+                    .eq("actMercId", merchant.getId()).eq("status", "3").likeRight("code", "YYX");
+            List<DeviceStock> list = deviceStockService.list(boxQueryWrapper);
+            if (!list.isEmpty()) {
+                String amount = new BigDecimal(String.valueOf(order.getConsumeFee())).multiply(new BigDecimal(100)).intValue() + "";
+                String discount = order.getDiscount() == null ? BigDecimal.ZERO.toString() : BigDecimal.valueOf(order.getDiscount()).stripTrailingZeros().toPlainString();
+                for (DeviceStock stock : list) {
+                    DeviceVoiceBoxMsg deviceMsg = new DeviceVoiceBoxMsg();
+                    try {
+                        sendDeviceMessage(stock,deviceMsg,"1",payDate,order.getOrderNumber(),amount,null,payType,discount);
+                    }catch (Exception e){
+                        logger.error("【音箱消息】推送异常，设备编号：{}，异常信息：{}",stock.getDeviceNo(),e.getMessage());
+                    }
+                }
+            }
+        }
+    }
+    /**
+     * @description:发送设备消息
+     * @date: 2021/9/1 13:53
+     * @param stock: 设备信息
+     * @param deviceMsg: 设备信息记录
+     * @param msgType:消息类型
+     * @param payDate:支付时间
+     * @param orderNumber:订单号
+     * @param amount:金额
+     * @param amount:金额
+     */
+    private void sendDeviceMessage(DeviceStock stock, DeviceVoiceBoxMsg deviceMsg, String msgType
+            , Date payDate, String orderNumber,String amount,JSONObject reqData,int payType,String discount) {
+        //支付消息播报
+        logger.info("【音箱消息】推送开始,设备编号:{},设备类型:{},消息类型：{}",stock.getDeviceNo(),stock.getType(),msgType);
+        if ("WIFI".equalsIgnoreCase(stock.getType())) {
+            JSONObject body = new JSONObject();
+            if("1".equals(msgType)){
+                body.put("type", "transOrder");
+                body.put("amount", amount);
+                body.put("orderId", StringUtil.getBillno());
+                body.put("paymentChannel", "SYBZF");
+                body.put("transTime", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(payDate));
+            }else{
+                body = reqData;
+            }
+            logger.info("【WIFI音箱消息】推送开始,设备编号:{},消息内容:{}",stock.getDeviceNo(),body.toString());
+            try {
+                saveBoxMessage(body, stock,msgType,orderNumber,deviceMsg);
+                Map<String, String> respMap = mqttSendMessage.sendMqttMessage(stock.getDeviceNo(), body);
+                if(respMap != null && respMap.size() > 0){
+                    logger.info("【WIFI音箱】消息推送成功,设备编号：{}，响应信息：{}",stock.getDeviceNo(),JSONObject.toJSONString(respMap));
+                    deviceMsg.setRespBody(JSONObject.toJSONString(respMap));
+                    deviceVoiceBoxMsgService.updateById(deviceMsg);
+                }else{
+                    logger.error("【WIFI音箱】消息推送失败,设备编号：{}",stock.getDeviceNo());
+                }
+            }catch (Exception e){
+                logger.error("【WIFI音箱】推送异常,设备编号:{},异常信息:{}",stock.getDeviceNo(),e.getMessage());
+                e.printStackTrace();
+            }
+        }else if("4G".equalsIgnoreCase(stock.getType())){
+            JSONObject body = get4GCommonMessageParams();
+            String amt = new BigDecimal(amount).divide(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP).toString();
+            body.put("devName", stock.getDeviceNo());
+            body.put("money", amt);
+            if("1".equals(msgType)){
+                body.put("biz_type", "1");
+                // 1为收款成功
+                String type = "1";
+                if(payType != PayMessageType.PLAIN_PAY.getValue()){
+                    JSONObject money = new JSONObject(2);
+                    money.put("amount",amt);
+                    money.put("discount",discount);
+                    if(payType == PayMessageType.MEMBER_CONSUME.getValue()){
+                        type = "46";
+                    }else if(payType == PayMessageType.MEMBER_RECHARGE.getValue()){
+                        type = "44";
+                    }
+                    body.put("money",money);
+                }
+                body.put("broadCastType", type);
+            }else{
+                body.put("broadCastType", "24");
+            }
+            try {
+                saveBoxMessage(body, stock,msgType,orderNumber,deviceMsg);
+                String response = send4GMessage(body,Ys4GEnum.BSJ_4G_YYS.getDomain(),Ys4GTypeEnum.BSJ.getCode());
+                if(StringUtil.isNotEmpty(response)){
+                    logger.info("【4G音箱】推送成功,设备编号：{}，响应信息：{}",stock.getDeviceNo(),response);
+                    deviceMsg.setRespBody(response);
+                    deviceVoiceBoxMsgService.updateById(deviceMsg);
+                }else{
+                    logger.error("【4G音箱】推送失败,设备编号：{}",stock.getDeviceNo());
+                }
+            }catch (Exception e){
+                logger.error("【4G音箱】推送异常,设备编号：{}，异常信息:{}",stock.getDeviceNo(),e.getMessage());
+                e.printStackTrace();
+            }
+        }else if("4G_TY".equalsIgnoreCase(stock.getType())){
+            JSONObject body = get4GTyParams(amount,stock,msgType);
+            saveBoxMessage(body, stock,msgType,orderNumber,deviceMsg);
+            String response = send4GMessage(body,Ys4GEnum.TY_4G_YYS.getDomain(), Ys4GTypeEnum.TY.getCode());
+            if(StringUtil.isNotEmpty(response)){
+                logger.info("【天喻4G音箱】推送成功,设备编号：{}，响应信息：{}",stock.getDeviceNo(),response);
+                deviceMsg.setRespBody(response);
+                deviceVoiceBoxMsgService.updateById(deviceMsg);
+            }else{
+                logger.error("【天喻4G音箱】推送失败,设备编号：{}",stock.getDeviceNo());
+            }
+        }
+    }
+    /**
+     * 推送4G音箱消息
+     * @date: 2021/12/10 11:41
+     * @param body:
+     * @param domain:
+     * @param code:
+     * @return java.lang.String
+     */
+    private String send4GMessage(JSONObject body, String domain, String code) {
+        if(Ys4GTypeEnum.TY.getCode().equals(code)){
+            String response = restTemplate.postForObject(domain, body, String.class);
+            logger.info("【天喻4G云音箱消息推送】返回参数：{}<======================", response);
+            return response;
+        }else if(Ys4GTypeEnum.BSJ.getCode().equals(code)){
+            UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(domain);
+            body.forEach((s, o) -> {
+                try {
+                    builder.queryParam(s, URLEncoder.encode(o.toString(), "UTF-8"));
+                } catch (UnsupportedEncodingException e) {
+                    e.printStackTrace();
+                }
+            });
+            UriComponents uriComponents = builder.build(true);
+            String response = restTemplate.getForObject(uriComponents.toUri(), String.class);
+//            UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(domain);
+//            body.entrySet().stream().forEach(o -> builder.queryParam(o.getKey(),o.getValue()));
+//            String requestUrl = builder.build().encode().toString();
+//            String response = restTemplate.getForObject(requestUrl, String.class);
+            logger.info("【博实结4G云音箱消息推送】返回参数：{}<======================", response);
+            return response;
+        }
+        return null;
+    }
+
+    /**
+     * @description:组装天喻4G音箱公共参数
+     * @date: 2021/12/6 18:16
+     * @param amount:
+     * @return com.alibaba.fastjson.JSONObject
+     */
+    private JSONObject get4GTyParams(String amount,DeviceStock deviceStock,String msgType) {
+        JSONObject params = new JSONObject();
+        params.put("accessKeyId",Ys4GEnum.TY_4G_YYS.getAppId());
+        params.put("requestId", UUID.randomUUID().toString());
+        params.put("timestamp",String.valueOf(System.currentTimeMillis()));
+        params.put("deviceId",deviceStock.getDeviceNo());
+        if("1".equals(msgType)){
+            params.put("requestData",new BigDecimal(amount).divide(BigDecimal.valueOf(100)).setScale(2,BigDecimal.ROUND_HALF_UP).toString());
+            params.put("payType","08");
+        }else{
+            params.put("payType","16");
+            params.put("requestData",amount);
+        }
+        String sign = SignUtils.getSignSha256(params,Ys4GEnum.TY_4G_YYS.getSecret());
+        params.put("sign",sign);
+        return params;
+    }
+
+    /**
+     * 获取公共请求参数
+     *
+     * @return
+     */
+    private JSONObject get4GCommonMessageParams() {
+        JSONObject params = new JSONObject();
+        params.put("appId", Ys4GEnum.BSJ_4G_YYS.getAppId());
+        params.put("timestamp", System.currentTimeMillis());
+        String requestId = UUID.randomUUID().toString();
+        params.put("requestId", requestId);
+        params.put("userCode", Ys4GEnum.BSJ_4G_YYS.getAppId());
+        String signContent = SignUtils.getSignContent1(params, Ys4GEnum.BSJ_4G_YYS.getSecret());
+        String token = MD5Util.MD5Encode(signContent, "UTF-8").toUpperCase();
+        params.put("token", token);
+        return params;
+    }
+
+    @Recover
+    public void recover(Exception e, MerchantOrder order) {
+        logger.info("===========>推送完成，未接收到有效返回，捕获的异常为:{}<==============", e);
+        if (StringUtil.isNotEmpty(order.getId())) {
+            UpdateWrapper<MerchantOrder> updateOrder = new UpdateWrapper<MerchantOrder>();
+            updateOrder.eq("id", order.getId());
+            updateOrder.set("mercNotifyStatus", "2");
+            if (StringUtil.isNotEmpty(order.getMercRemark())) {
+                updateOrder.set("mercRemark", order.getMercRemark());
+            }
+            merchantOrderService.update(updateOrder);
+        }
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/officialActivity/OfficialActivityService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/officialActivity/OfficialActivityService.java
new file mode 100644
index 0000000..9a18dda
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/officialActivity/OfficialActivityService.java
@@ -0,0 +1,27 @@
+package cn.pluss.platform.officialActivity;
+
+import cn.pluss.platform.entity.OfficialActivity;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 官方活动表 服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-09-24
+ */
+public interface OfficialActivityService extends IService<OfficialActivity> {
+
+    void updateActivicyStatus(Date dateTime);
+    /**
+     * 根据角色查询当前角色活动
+     * @date: 2022/2/18 15:07
+     * @param condition:
+     * @return java.util.List<cn.pluss.platform.entity.OfficialActivity>
+     */
+    List<OfficialActivity> getListByRole(OfficialActivity condition);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/officialActivity/impl/OfficialActivityServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/officialActivity/impl/OfficialActivityServiceImpl.java
new file mode 100644
index 0000000..537999d
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/officialActivity/impl/OfficialActivityServiceImpl.java
@@ -0,0 +1,40 @@
+package cn.pluss.platform.officialActivity.impl;
+
+import cn.pluss.platform.entity.OfficialActivity;
+import cn.pluss.platform.enums.UserRoleEnum;
+import cn.pluss.platform.mapper.OfficialActivityMapper;
+import cn.pluss.platform.officialActivity.OfficialActivityService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 官方活动表 服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-09-24
+ */
+@Service
+public class OfficialActivityServiceImpl extends ServiceImpl<OfficialActivityMapper, OfficialActivity> implements OfficialActivityService {
+
+    @Override
+    public void updateActivicyStatus(Date dateTime) {
+        baseMapper.updateActivityStatus(dateTime);
+    }
+
+    /**
+     * 根据角色查询当前角色活动
+     * @date: 2022/2/18 15:10
+     * @param condition:
+     * @return java.util.List<cn.pluss.platform.entity.OfficialActivity>
+     */
+    @Override
+    public List<OfficialActivity> getListByRole(OfficialActivity condition) {
+        condition.setCommonType(UserRoleEnum.COMMON.getCode());
+        return baseMapper.getListByRole(condition);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/officialGoods/OfficialGoodsService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/officialGoods/OfficialGoodsService.java
new file mode 100644
index 0000000..97a0049
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/officialGoods/OfficialGoodsService.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.officialGoods;
+
+import cn.pluss.platform.entity.OfficialGoods;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 商品活动表 服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-09-29
+ */
+public interface OfficialGoodsService extends IService<OfficialGoods> {
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/officialGoods/exchange/OfficialGoodsExchangeService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/officialGoods/exchange/OfficialGoodsExchangeService.java
new file mode 100644
index 0000000..ed78401
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/officialGoods/exchange/OfficialGoodsExchangeService.java
@@ -0,0 +1,33 @@
+package cn.pluss.platform.officialGoods.exchange;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.entity.OfficialGoods;
+import cn.pluss.platform.entity.OfficialGoodsExchange;
+import cn.pluss.platform.entity.UserApp;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-10-09
+ */
+public interface OfficialGoodsExchangeService extends IService<OfficialGoodsExchange> {
+    /**
+     * 兑换商品
+     * @param goods
+     * @param app
+     * @return
+     */
+    Result exchange(OfficialGoods goods, UserApp app,Integer aid);
+
+    /**
+     * 虚拟商品
+     * @param goods
+     * @param userApp
+     * @return
+     */
+    Result<Object> exchange(OfficialGoods goods, UserApp userApp);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/officialGoods/exchange/impl/OfficialGoodsExchangeServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/officialGoods/exchange/impl/OfficialGoodsExchangeServiceImpl.java
new file mode 100644
index 0000000..af83749
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/officialGoods/exchange/impl/OfficialGoodsExchangeServiceImpl.java
@@ -0,0 +1,229 @@
+package cn.pluss.platform.officialGoods.exchange.impl;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.constants.Constant;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.*;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchant.MerchantRateNewService;
+import cn.pluss.platform.merchantStore.MerchantStoreService;
+import cn.pluss.platform.officialGoods.exchange.OfficialGoodsExchangeService;
+import cn.pluss.platform.pay.PayService;
+import cn.pluss.platform.systemConfig.SystemConfigService;
+import cn.pluss.platform.systemInfo.SystemInfoService;
+import cn.pluss.platform.userIntegralUse.UserIntegralUseService;
+import cn.pluss.platform.util.StringUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.Setter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-10-09
+ */
+@Service
+@Transactional
+public class OfficialGoodsExchangeServiceImpl extends ServiceImpl<OfficialGoodsExchangeMapper, OfficialGoodsExchange> implements OfficialGoodsExchangeService {
+
+    @Resource
+    private UserAddressMapper userAddressMapper;
+
+    @Resource
+    private MerchantTransferCashMapper merchantTransferCashMapper;
+
+    @Setter(onMethod_ = {@Autowired, @Qualifier("ysPayOldService")})
+    private PayService ysPayOldService;
+
+    @Resource
+    private MerchantRateNewService merchantRateNewService;
+
+    @Resource
+    private MerchantOrderMapper merchantOrderMapper;
+
+    @Resource
+    private MerchantChannelStatusMapper merchantChannelStatusMapper;
+
+    @Resource
+    private MerchantBaseInfoService merchantBaseInfoService;
+
+    @Resource
+    private MerchantStoreService merchantStoreService;
+
+    @Autowired
+    private SystemConfigService systemConfigService;
+
+    @Autowired
+    private UserIntegralUseService userIntegralUseService;
+
+
+    /**
+     * 兑换记录
+     *
+     * @param goods
+     * @param userApp
+     * @return
+     */
+    @Override
+    public Result exchange(OfficialGoods goods, UserApp userApp, Integer aid) {
+
+        JSONObject result = new JSONObject();
+        UserAddress userAddress = userAddressMapper.selectById(aid);
+        if (userAddress == null) {
+            return ResultGenerator.genFailResult("收货地址信息异常！");
+        }
+        String orderNumber = "YS_" + StringUtil.getBillno();
+        Integer isPostage = goods.getIsPostage();
+        Integer deductRule = goods.getDeductRule();
+        OfficialGoodsExchange goodsExchange = new OfficialGoodsExchange();
+        goodsExchange.setGoodId(goods.getId());
+        goodsExchange.setUserId(userApp.getUserId());
+        goodsExchange.setCreateTime(new Date());
+        goodsExchange.setAddress(userAddress.getAreaName() + userAddress.getAddress());
+        goodsExchange.setPhone(userAddress.getPhone());
+        goodsExchange.setUserName(userAddress.getName());
+        goodsExchange.setPrice(goods.getGoodPrice());
+        goodsExchange.setName(goods.getGoodName());
+        goodsExchange.setOrderNumber(orderNumber);
+
+        UserIntegralUse integralUse = new UserIntegralUse();
+        integralUse.setName(goods.getGoodName());
+        integralUse.setUserId(userApp.getUserId());
+        integralUse.setIntegral(goods.getGoodPrice());
+        integralUse.setHandleTime(new Date());
+        integralUse.setCreateTime(new Date());
+        integralUse.setOrderNumber(orderNumber);
+        if (isPostage == 1 && deductRule == 0) {
+            goodsExchange.setStatus(1);
+            integralUse.setStatus("2");
+        } else {
+            goodsExchange.setStatus(0);
+            String merchantCode = systemConfigService.querySystemConfigValue(Constant.SYSTEM_MERCHANT_KEY);
+            if (StringUtil.isEmpty(merchantCode)) {
+                merchantCode = Constant.DEFUALT_CASHIER_MERCHANT;
+            }
+            MerchantBaseInfo merchant = merchantBaseInfoService.getMerchantBaseInfoByMerchantCode(merchantCode);
+            MsgException.checkNull(merchant, "商户数据异常！");
+            MerchantStore store = merchantStoreService.getStoreByMerchantCode(merchantCode);
+            MsgException.checkNull(store, "门店信息异常！");
+            MerchantChannelStatus channel = merchantChannelStatusMapper.getByMerchantCode(merchantCode, 4);
+            MsgException.checkNull(channel, "通道信息异常！");
+            MerchantOrder order = new MerchantOrder();
+            order.setOrderNumber(orderNumber);
+            order.setOrderType("7");
+            order.setMerchantCode(merchantCode);
+            order.setMerchantName(merchant.getAlias());
+            order.setPayTypeCode(Constant.PAY_TYPE_ALIPAY);
+            order.setPayTypeName(Constant.PAY_TYPE_NAME_ALIPAY);
+            order.setStoreId(store.getStoreId());
+            order.setStoreName(store.getStoreName());
+            order.setAlias(merchant.getMerchantName());
+            order.setConsumeFee(goods.getPostageFee().add(goods.getDeductValue()).doubleValue());
+            order.setToken(userApp.getToken());
+            order.setCreateDt(new Date());
+            order.setStatus("5");
+            BigDecimal rate = merchantRateNewService.getMchRate(merchantCode, Constant.PAY_TYPE_ALIPAY, goods.getPostageFee().doubleValue());
+            order.calcRateAndFee(rate);
+            order.setAisleSwitch(channel.getChannel() + "");
+            try {
+                merchantOrderMapper.insert(order);
+                String respones = ysPayOldService.tradePayWap(order, channel);
+                System.out.printf("respones=============" + respones);
+                result.put("result", respones);
+            } catch (Exception e) {
+                e.printStackTrace();
+                MsgException.throwException("系统异常！");
+            }
+            integralUse.setStatus("1");
+        }
+        userIntegralUseService.save(integralUse);
+        this.baseMapper.insert(goodsExchange);
+        return ResultGenerator.genSuccessResult("操作成功！", result);
+    }
+
+    @Override
+    public Result<Object> exchange(OfficialGoods goods, UserApp userApp) {
+        JSONObject result = new JSONObject();
+        String orderNumber = "YS_" + StringUtil.getBillno();
+        Integer isPostage = goods.getIsPostage();
+        Integer deductRule = goods.getDeductRule();
+        OfficialGoodsExchange goodsExchange = new OfficialGoodsExchange();
+        goodsExchange.setGoodId(goods.getId());
+        goodsExchange.setUserId(userApp.getUserId());
+        goodsExchange.setAddress(goods.getAddress());
+        goodsExchange.setCreateTime(new Date());
+        goodsExchange.setPhone("");
+        goodsExchange.setUserName("");
+        goodsExchange.setPrice(goods.getGoodPrice());
+        goodsExchange.setName(goods.getGoodName());
+        goodsExchange.setOrderNumber(orderNumber);
+
+        UserIntegralUse integralUse = new UserIntegralUse();
+        integralUse.setName(goods.getGoodName());
+        integralUse.setUserId(userApp.getUserId());
+        integralUse.setIntegral(goods.getGoodPrice());
+        integralUse.setHandleTime(new Date());
+        integralUse.setCreateTime(new Date());
+        integralUse.setOrderNumber(orderNumber);
+
+        if (isPostage == 1 && deductRule == 0) {
+            goodsExchange.setStatus(1);
+            integralUse.setStatus("2");
+        } else {
+            goodsExchange.setStatus(0);
+            String merchantCode = systemConfigService.querySystemConfigValue(Constant.SYSTEM_MERCHANT_KEY);
+            if (StringUtil.isEmpty(merchantCode)) {
+                merchantCode = Constant.DEFUALT_CASHIER_MERCHANT;
+            }
+
+            MerchantBaseInfo merchant = merchantBaseInfoService.getMerchantBaseInfoByMerchantCode(merchantCode);
+            MsgException.checkNull(merchant, "商户数据异常！");
+            MerchantStore store = merchantStoreService.getStoreByMerchantCode(merchantCode);
+            MsgException.checkNull(store, "门店信息异常！");
+            MerchantChannelStatus channel = merchantChannelStatusMapper.getByMerchantCode(merchantCode, 4);
+            MsgException.checkNull(channel, "通道信息异常！");
+            MerchantOrder order = new MerchantOrder();
+            order.setOrderNumber(orderNumber);
+            order.setOrderType("7");
+            order.setMerchantCode(merchantCode);
+            order.setMerchantName(merchant.getAlias());
+            order.setPayTypeCode(Constant.PAY_TYPE_ALIPAY);
+            order.setPayTypeName(Constant.PAY_TYPE_NAME_ALIPAY);
+            order.setStoreId(store.getStoreId());
+            order.setStoreName(store.getStoreName());
+            order.setAlias(merchant.getMerchantName());
+            order.setConsumeFee(goods.getPostageFee().add(goods.getDeductValue()).doubleValue());
+            order.setToken(userApp.getToken());
+            order.setCreateDt(new Date());
+            order.setStatus("5");
+            BigDecimal rate = merchantRateNewService.getMchRate(merchantCode, Constant.PAY_TYPE_ALIPAY, goods.getPostageFee().doubleValue());
+            order.calcRateAndFee(rate);
+            order.setAisleSwitch(channel.getChannel() + "");
+            try {
+                merchantOrderMapper.insert(order);
+                String response = ysPayOldService.tradePayWap(order, channel);
+                result.put("result", response);
+            } catch (Exception e) {
+                e.printStackTrace();
+                MsgException.throwException("系统异常！");
+            }
+            integralUse.setStatus("1");
+        }
+        userIntegralUseService.save(integralUse);
+        this.baseMapper.insert(goodsExchange);
+        return ResultGenerator.genSuccessResult("操作成功！", result);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/officialGoods/impl/OfficialGoodsServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/officialGoods/impl/OfficialGoodsServiceImpl.java
new file mode 100644
index 0000000..948c7ff
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/officialGoods/impl/OfficialGoodsServiceImpl.java
@@ -0,0 +1,20 @@
+package cn.pluss.platform.officialGoods.impl;
+
+import cn.pluss.platform.entity.OfficialGoods;
+import cn.pluss.platform.mapper.OfficialGoodsMapper;
+import cn.pluss.platform.officialGoods.OfficialGoodsService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 商品活动表 服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-09-29
+ */
+@Service
+public class OfficialGoodsServiceImpl extends ServiceImpl<OfficialGoodsMapper, OfficialGoods> implements OfficialGoodsService {
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/openAccount/OpenAccountConfigService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/openAccount/OpenAccountConfigService.java
new file mode 100644
index 0000000..b791f76
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/openAccount/OpenAccountConfigService.java
@@ -0,0 +1,26 @@
+package cn.pluss.platform.openAccount;
+
+import cn.pluss.platform.entity.MerchantBaseInfo;
+import cn.pluss.platform.entity.OpenAccountConfig;
+import cn.pluss.platform.entity.UserApp;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 开户奖配置表 服务类
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-06-14
+ */
+public interface OpenAccountConfigService extends IService<OpenAccountConfig> {
+    /**
+     * 获取开户奖励配置
+     * @param merchant
+     * @param userApp
+     * @return
+     */
+    BigDecimal getOpendAccountReward(MerchantBaseInfo merchant, UserApp userApp);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/openAccount/OpenAccountRecordService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/openAccount/OpenAccountRecordService.java
new file mode 100644
index 0000000..7044006
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/openAccount/OpenAccountRecordService.java
@@ -0,0 +1,47 @@
+package cn.pluss.platform.openAccount;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.entity.*;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 用户开户奖励明细 服务类
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-06-14
+ */
+public interface OpenAccountRecordService extends IService<OpenAccountRecord> {
+
+    /**
+     * 旧版设备订单开户奖操作
+     * TODO 苹果更新后 旧版的将会弃用
+     * @param order
+     * @param merchant
+     * @param info
+     * @return
+     */
+    void operatAccountOpen(DeviceMerchantBuy order, MerchantBaseInfo merchant, DeviceOrderInfo info);
+
+    /**
+     * 新版订单开户奖操作
+     * @param order
+     * @param merchant
+     */
+    void operatAccountOpen(MercOrderDetail order, MerchantBaseInfo merchant);
+
+    /**
+     * 处理退款
+     * @param orderNumber
+     */
+    Result refund(String orderNumber);
+
+    /**
+     * 删除开户奖
+     * @param orderNumber
+     */
+    void removeOpenAccount(String orderNumber);
+
+    Result countData(OpenAccountRecord condition);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/openAccount/impl/OpenAccountConfigServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/openAccount/impl/OpenAccountConfigServiceImpl.java
new file mode 100644
index 0000000..002aee2
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/openAccount/impl/OpenAccountConfigServiceImpl.java
@@ -0,0 +1,103 @@
+package cn.pluss.platform.openAccount.impl;
+
+import cn.pluss.platform.entity.MerchantBaseInfo;
+import cn.pluss.platform.entity.OpenAccountConfig;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.OpenAccountConfigMapper;
+import cn.pluss.platform.openAccount.OpenAccountConfigService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * <p>
+ * 开户奖配置表 服务实现类
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-06-14
+ */
+@Service
+@Slf4j
+public class OpenAccountConfigServiceImpl extends ServiceImpl<OpenAccountConfigMapper, OpenAccountConfig> implements OpenAccountConfigService {
+
+
+    @Override
+    public BigDecimal getOpendAccountReward(MerchantBaseInfo merchant, UserApp userApp) {
+        BigDecimal rewardAmt = BigDecimal.ZERO;
+        String addressNo = merchant.getAddressNo();
+        List<OpenAccountConfig> list = baseMapper.listByRoleCode(userApp.getRoleCode());
+        if(list.isEmpty()){
+            return BigDecimal.ZERO;
+        }
+        try {
+            String[] areaCodeInfo = addressNo.split("-");
+            for (OpenAccountConfig config :list) {
+                if(OpenAccountConfig.DEFAULT_TYPE.equals(config.getType())){
+                    return config.getRewardAmt();
+                }else{
+                    if(config.getProvinceCode().equals(areaCodeInfo[0]) &&
+                            config.getCityCode().equals(areaCodeInfo[1]) && config.getAreaCode().equals(areaCodeInfo[2])){
+                        rewardAmt = config.getRewardAmt();
+                    }else if(config.getProvinceCode().equals(areaCodeInfo[0]) &&
+                            config.getCityCode().equals(areaCodeInfo[1])){
+                        rewardAmt = config.getRewardAmt();
+                    }else if(config.getProvinceCode().equals(areaCodeInfo[0])){
+                        rewardAmt = config.getRewardAmt();
+                    }
+                }
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            log.error("【开户奖励配置】数据获取异常，异常信息：{}",e.getMessage());
+        }
+        return rewardAmt;
+    }
+
+    /**
+     *
+     * @param entity
+     * @return
+     */
+    @Override
+    public boolean save(OpenAccountConfig entity) {
+        entity.checkParams();
+        QueryWrapper<OpenAccountConfig> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("roleCode",entity.getRoleCode()).eq("type",OpenAccountConfig.DEFAULT_TYPE);
+        List<OpenAccountConfig> list = baseMapper.selectList(queryWrapper);
+        if(list.isEmpty() && !entity.getType().equals(OpenAccountConfig.DEFAULT_TYPE)){
+            MsgException.throwException("请先添加一个类型为默认的开户奖配置，当未匹配到该地区的开户奖时，会选取默认配置的开户奖进行发放");
+        }
+        if(!list.isEmpty() && entity.getType().equals(OpenAccountConfig.DEFAULT_TYPE)){
+            MsgException.throwException("默认的类型的开户奖配置有且只能配置一个");
+        }
+        if(entity.getType().equals(OpenAccountConfig.AREA_TYPE)){
+            QueryWrapper<OpenAccountConfig> checkWapper = new QueryWrapper<>();
+            checkWapper.eq("type",entity.getType());
+            int level = entity.getLevel();
+            if(level == 1){
+                checkWapper.eq("provinceCode",entity.getProvinceCode());
+            }else if(level == 2){
+                checkWapper.eq("provinceCode",entity.getProvinceCode());
+                checkWapper.eq("cityCode",entity.getCityCode());
+            }else if(level == 3){
+                checkWapper.eq("provinceCode",entity.getProvinceCode());
+                checkWapper.eq("cityCode",entity.getCityCode());
+                checkWapper.eq("areaCode",entity.getAreaCode());
+            }else{
+                MsgException.throwException("等级level参数异常");
+            }
+            List<OpenAccountConfig> checklist = baseMapper.selectList(checkWapper);
+            if(!checklist.isEmpty()){
+                MsgException.throwException("已存在一个当前区域的配置");
+            }
+        }
+        baseMapper.insert(entity);
+        return true;
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/openAccount/impl/OpenAccountRecordServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/openAccount/impl/OpenAccountRecordServiceImpl.java
new file mode 100644
index 0000000..47d419a
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/openAccount/impl/OpenAccountRecordServiceImpl.java
@@ -0,0 +1,151 @@
+package cn.pluss.platform.openAccount.impl;
+
+import cn.pluss.platform.DeviceGoodsService;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.device.DeviceOrderInfoService;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.OpenAccountRecordMapper;
+import cn.pluss.platform.openAccount.OpenAccountConfigService;
+import cn.pluss.platform.openAccount.OpenAccountRecordService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.util.DateUtils;
+import cn.pluss.platform.util.StringUtil;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.Map;
+
+/**
+ * <p>
+ * 用户开户奖励明细 服务实现类
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-06-14
+ */
+@Service
+@Slf4j
+public class OpenAccountRecordServiceImpl extends ServiceImpl<OpenAccountRecordMapper, OpenAccountRecord> implements OpenAccountRecordService {
+
+    @Resource
+    private OpenAccountConfigService openAccountConfigService;
+    
+    @Resource
+    private UserAppService userAppService;
+
+    @Resource
+    private DeviceGoodsService deviceGoodsService;
+
+    /**
+     * 兼容旧版设备订单开户奖操作
+     * @param order
+     * @param merchant
+     */
+    @Override
+    public void operatAccountOpen(DeviceMerchantBuy order, MerchantBaseInfo merchant,DeviceOrderInfo info) {
+        DeviceGoods goods =  deviceGoodsService.getByCode(info.getCode());
+        if(goods != null){
+            order.setName(goods.getName());
+        }
+        order.setCode(info.getCode());
+        execute(order,merchant);
+    }
+
+    /**
+     * 新版设备订单开户奖操作
+     * @param order
+     * @param merchant
+     */
+    @Override
+    public void operatAccountOpen(MercOrderDetail order, MerchantBaseInfo merchant) {
+        execute(order,merchant);
+    }
+
+    /**
+     * 通用方法
+     * @param order
+     * @param merchant
+     */
+    private void execute(Object order, MerchantBaseInfo merchant) {
+        UserApp userApp = userAppService.getUserAppByUserId(merchant.getUserId());
+        if(userApp == null){
+            log.error("【创建开户奖励】失败，用户信息异常");
+            return;
+        }
+        if(userApp.getParentId() == null){
+            log.error("【创建开户奖励】当前交易商户上级为空，开户奖创建失败");
+            return;
+        }
+        UserApp pUserApp = userAppService.getUserAppByUserId(userApp.getParentId());
+        if(pUserApp == null){
+            log.error("【创建开户奖励】当前交易商户上级用户信息为空，开户奖创建失败");
+            return;
+        }
+        BigDecimal rewardAmt = openAccountConfigService.getOpendAccountReward(merchant,pUserApp);
+        if(rewardAmt.compareTo(BigDecimal.ZERO) == 0){
+            log.info("【创建开户奖励】未获取到配置奖励参数信息");
+            return;
+        }
+        OpenAccountRecord record = OpenAccountRecord.build(order,rewardAmt,merchant,pUserApp);
+        save(record);
+    }
+
+    @Override
+    public <E extends IPage<OpenAccountRecord>> E page(E page, Wrapper<OpenAccountRecord> queryWrapper) {
+        OpenAccountRecord entity = queryWrapper.getEntity();
+        if(StringUtil.isNotEmpty(entity.getStartTime())){
+            ((QueryWrapper)queryWrapper).ge("createDate",entity.getStartTime());
+        }
+        if(StringUtil.isNotEmpty(entity.getEndTime())){
+            ((QueryWrapper)queryWrapper).le("createDate",entity.getEndTime());
+        }
+        return super.page(page, queryWrapper);
+    }
+
+    /**
+     * 删除开户奖励
+     * @param orderNo
+     */
+    @Override
+    public void removeOpenAccount(String orderNo) {
+        OpenAccountRecord record = baseMapper.getByOrderNumberAndType(orderNo,OpenAccountRecord.TYPE_PAY);
+        if(record == null){
+            return;
+        }
+        record.setId(null);
+        record.setCreateTime(DateUtils.currentDate());
+        record.setRewardAmt(record.getRewardAmt().negate());
+        record.setType(OpenAccountRecord.REFUND_PAY);
+        record.setCreateDate(null);
+        save(record);
+    }
+
+    @Override
+    public Result refund(String orderNumber) {
+        OpenAccountRecord record = baseMapper.getByOrderNumberAndType(orderNumber,OpenAccountRecord.REFUND_PAY);
+        if(record != null){
+            return ResultGenerator.genFailResult("存在一笔已经标记退款的数据，请勿重复操作！");
+        }
+        removeOpenAccount(orderNumber);
+        return ResultGenerator.genSuccessResult("处理成功！",null);
+    }
+
+    /**
+     * 数据统计
+     * @param condition
+     * @return
+     */
+    @Override
+    public Result countData(OpenAccountRecord condition) {
+        Map<String, BigDecimal> result = baseMapper.countData(condition);
+        return ResultGenerator.genSuccessResult("获取成功",result);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/operationRecord/OperationRecordService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/operationRecord/OperationRecordService.java
new file mode 100644
index 0000000..acd53de
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/operationRecord/OperationRecordService.java
@@ -0,0 +1,19 @@
+package cn.pluss.platform.operationRecord;
+
+
+import cn.pluss.platform.entity.OperationRecord;
+import cn.pluss.platform.vo.OperationRecordVO;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+import java.util.Map;
+
+public interface OperationRecordService extends IService<OperationRecord> {
+
+    List<OperationRecord> selectOne(Map map);
+
+    Integer selectParticularsCount(Map map);
+
+    Page<OperationRecordVO> pageVO(Page<OperationRecordVO> page, OperationRecordVO condition);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/operationRecord/impl/OperationRecordServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/operationRecord/impl/OperationRecordServiceImpl.java
new file mode 100644
index 0000000..c6fe055
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/operationRecord/impl/OperationRecordServiceImpl.java
@@ -0,0 +1,108 @@
+package cn.pluss.platform.operationRecord.impl;
+
+import cn.pluss.platform.entity.OperationRecord;
+import cn.pluss.platform.ipLocation.IpLocationService;
+import cn.pluss.platform.mapper.OperationRecordMapper;
+import cn.pluss.platform.operationRecord.OperationRecordService;
+import cn.pluss.platform.util.IpUtils;
+import cn.pluss.platform.vo.OperationRecordVO;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.aliyuncs.geoip.model.v20200101.DescribeIpv4LocationResponse;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+@Service
+public class OperationRecordServiceImpl extends ServiceImpl<OperationRecordMapper, OperationRecord> implements OperationRecordService {
+
+    @Autowired
+    private IpLocationService ipLocationService;
+
+    @Override
+    public List<OperationRecord> selectOne(Map map) {
+        return baseMapper.selectOperationRecordOne(map);
+    }
+
+    @Override
+    public Integer selectParticularsCount(Map map) {
+        return baseMapper.selectParticularsCount(map);
+    }
+
+    @Override
+    public Page<OperationRecordVO> pageVO(Page<OperationRecordVO> page, OperationRecordVO condition) {
+        QueryWrapper<OperationRecordVO> qWrapper = Wrappers.query();
+        qWrapper.ne("ua.userType", "staff");
+
+        qWrapper.eq(StringUtils.isNotBlank(condition.getUserId()), "opr.userId", condition.getUserId());
+
+        qWrapper.eq(StringUtils.isNotBlank(condition.getIp()), "opr.ip", condition.getIp());
+
+        qWrapper.likeRight(StringUtils.isNotBlank(condition.getUserName()), "ua.userName ->> '$.county'", condition.getCounty());
+
+        qWrapper.likeRight(StringUtils.isNotBlank(condition.getRemark()), "opr.remark", condition.getRemark());
+
+        qWrapper.gt(condition.getCreateTimeStart() != null, "opr.createTime", condition.getCreateTimeStart());
+
+        qWrapper.lt(condition.getCreateTimeEnd() != null, "opr.createTime", condition.getCreateTimeEnd());
+
+        qWrapper.eq(StringUtils.isNotBlank(condition.getIsp()), "opr.extension ->> '$.isp'", condition.getIsp());
+
+        qWrapper.eq(StringUtils.isNotBlank(condition.getCity()), "opr.extension ->> '$.city'", condition.getCity());
+
+        qWrapper.eq(StringUtils.isNotBlank(condition.getProvince()), "opr.extension ->> '$.province'", condition.getProvince());
+
+        qWrapper.eq(StringUtils.isNotBlank(condition.getCountry()), "opr.extension ->> '$.country'", condition.getCountry());
+
+        qWrapper.eq(StringUtils.isNotBlank(condition.getCounty()), "opr.extension ->> '$.county'", condition.getCounty());
+
+        qWrapper.eq(condition.getCount() != null, "t.count", condition.getCount());
+
+        qWrapper.eq(Objects.equals(condition.getIsChina(), "1"), "opr.extension ->> '$.country'", "中国");
+
+        qWrapper.and(Objects.equals(condition.getIsChina(), "0"), wrapper -> {
+            wrapper.ne("opr.extension ->> '$.country'", "中国")
+                    .isNotNull("opr.extension ->> '$.country'")
+            ;
+        });
+
+        return baseMapper.selectVOPage(page, qWrapper);
+    }
+
+    @Override
+    public boolean save(OperationRecord entity) {
+        ServletRequestAttributes requestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+
+        if (requestAttributes != null) {
+            HttpServletRequest request = requestAttributes.getRequest();
+            String ipAddr = IpUtils.getIpAddr(request);
+            DescribeIpv4LocationResponse location = ipLocationService.getLocation(ipAddr);
+
+            JSONObject extra;
+            if (location == null) {
+                extra = new JSONObject();
+            } else {
+                extra = (JSONObject) JSON.toJSON(location);
+            }
+
+            if (entity.getExtension() != null) {
+                extra.putAll(entity.getExtension());
+            }
+
+            entity.setExtension(extra);
+        }
+
+        return super.save(entity);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/pay/ApiPayService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/pay/ApiPayService.java
new file mode 100644
index 0000000..c94b3fb
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/pay/ApiPayService.java
@@ -0,0 +1,47 @@
+package cn.pluss.platform.pay;
+
+
+import cn.pluss.platform.api.Result;
+import com.alibaba.fastjson.JSONObject;
+
+
+/**
+ * 下游通道统一支付接口入口
+ */
+public interface ApiPayService {
+
+    JSONObject pay(String json,String ip);
+
+    Result<Object> orderPay(String userId, String orderNumber);
+
+    /**
+     * @description:退款
+     * @date: 2021/11/22 10:00
+     * @param params:
+     * @return cn.pluss.platform.api.Result<com.alibaba.fastjson.JSONObject>
+     */
+    Result<JSONObject> refund(JSONObject params);
+    /**
+     * @description:退款订单查询
+     * @date: 2021/11/22 10:03
+     * @param params:
+     * @return cn.pluss.platform.api.Result<java.lang.Object>
+     */
+    Result<Object> refundQuery(JSONObject params);
+
+    /**
+     * @description:api退款
+     * @date: 2021/11/22 10:48
+     * @param params:
+     * @return cn.pluss.platform.api.Result<com.alibaba.fastjson.JSONObject>
+     */
+    Result<JSONObject> apiRefund(JSONObject params);
+
+    /**
+     * 内部微信小程序支付
+     * @date: 2021/12/24 13:34
+     * @param params:
+     * @return com.alibaba.fastjson.JSONObject
+     */
+    JSONObject wxappPay(JSONObject params);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/pay/PayCallbackService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/pay/PayCallbackService.java
new file mode 100644
index 0000000..f3ed033
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/pay/PayCallbackService.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.pay;
+
+import java.util.Map;
+
+/**
+ * 订单请求回调
+ * @author djh
+ */
+public interface PayCallbackService {
+
+    /**
+     * 订单请求回调
+     * @param callbackData 回调数据
+     */
+    void orderCallback(Map<String, Object> callbackData);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/pay/PayService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/pay/PayService.java
new file mode 100644
index 0000000..c25009b
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/pay/PayService.java
@@ -0,0 +1,123 @@
+package cn.pluss.platform.pay;
+
+
+import cn.pluss.platform.dto.MemberScanPayDTO;
+import cn.pluss.platform.dto.MerChantOrderDTO;
+import cn.pluss.platform.entity.*;
+import com.alibaba.fastjson.JSONObject;
+
+import java.util.Map;
+
+/**
+ * 交易接口
+ */
+public interface PayService {
+
+
+    /**
+     * 统一被扫下单数据接口
+     * @return
+     */
+    JSONObject tradePay(MerchantOrder order,MerchantChannelStatus channel,MerchantBaseInfo merchant);
+
+    /**
+     * 统一主扫下单数据接口
+     * @param merchantOrderDTO
+     * @param order
+     * @param
+     * @return
+     */
+    JSONObject tradePay(MerChantOrderDTO merchantOrderDTO, MerchantOrder order);
+
+    /**
+     * 统一退款数据接口
+     * @param order
+     * @return
+     */
+    Map<String,Object> refundPay(MerchantOrder order,String mchNo);
+
+    /**
+     * 统一交易订单查询接口
+     * @param
+     * @return
+     */
+    JSONObject tradeQuery(MerchantOrder order,String mchId);
+
+    /**
+     * 统一退款订单查询接口
+     * @param refundOrder
+     * @param
+     * @return
+     */
+    JSONObject refundQuery(MerchantRefundOrder refundOrder);
+
+
+    /**
+     * 撤单接口通用
+     * @param
+     * @param
+     * @return
+     */
+    Map<String,Object> closeOrder(String orderNumber,String channelNo);
+
+    /**
+     * 通用辅助接口 获取微信用户openId
+     * @param memberScanPayDTO
+     * @return
+     */
+    Map<String,Object> getWxOpenId(MemberScanPayDTO memberScanPayDTO,MerchantChannelStatus channel) throws Exception;
+
+
+    /**
+     * 通用辅助接口 获取银联用户标识
+     * @param userAuthCode
+     * @param paymentApp
+     * @param merchantId
+     * @return
+     */
+    Map<String,Object> getUnionInfo(String userAuthCode,String paymentApp,String merchantId) throws Exception;
+
+
+
+//    /**
+//     * 通用转账接口
+//     * @param transfer
+//     * @return
+//     */
+//    Map<String,Object> orgTransfer(MerchantTransfer transfer) throws Exception;
+
+    /**
+     * @description:支付异步回调
+     * @date: 2021/8/23 9:57
+     * @param params:
+     * @return java.lang.Object
+     */
+    Object payNotifyCallBack(Map<String,String> params);
+
+
+    /**
+     * @description:银盛wap支付
+     * @date: 2021/11/26 18:21
+     * @param order:
+     * @param channel:
+     * @return java.lang.String
+     */
+    String tradePayWap(MerchantOrder order, MerchantChannelStatus channel);
+
+
+    /**
+     * 获取对账文件地址
+     * @param reqData
+     * @return
+     */
+    JSONObject getUnionAccountUrl(JSONObject reqData);
+
+    /**
+     * 缴费通支付
+     * @param order
+     * @param jftMerc
+     * @param jftChannel
+     * @return
+     */
+    JSONObject jftPay(JftReceiptOrder order, JftMercBaseInfo jftMerc, JftMercPaymentChannel jftChannel);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/pay/impl/ApiPayServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/pay/impl/ApiPayServiceImpl.java
new file mode 100644
index 0000000..27a206d
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/pay/impl/ApiPayServiceImpl.java
@@ -0,0 +1,1024 @@
+package cn.pluss.platform.pay.impl;
+
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultCode;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.appletInfo.AppletInfoService;
+import cn.pluss.platform.constants.Constant;
+import cn.pluss.platform.device.MercOrderNewService;
+import cn.pluss.platform.entitiy.SettleTypeEnum;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.enums.DeviceOrderStatus;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.exception.PayRiskException;
+import cn.pluss.platform.ipLocation.IpLocationService;
+import cn.pluss.platform.jft.JftMercBaseInfoService;
+import cn.pluss.platform.jft.JftReceiptOrderService;
+import cn.pluss.platform.mapper.*;
+import cn.pluss.platform.mercOrderToken.MercOrderTokenService;
+import cn.pluss.platform.merchant.JftMercPaymentChannelService;
+import cn.pluss.platform.merchant.MerchantCashPlaceService;
+import cn.pluss.platform.merchant.MerchantRateNewService;
+import cn.pluss.platform.merchant.MerchantService;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.merchantOrder.MerchantOrderService;
+import cn.pluss.platform.mswitch.CommonSwitchService;
+import cn.pluss.platform.pay.ApiPayService;
+import cn.pluss.platform.pay.PayService;
+import cn.pluss.platform.refundOrder.MerchantRefundOrderService;
+import cn.pluss.platform.ryx.pay.RyxPayService;
+import cn.pluss.platform.sxf.pay.SxfPayService;
+import cn.pluss.platform.util.*;
+import cn.pluss.platform.wx.WxAccessTokenRequest;
+import cn.pluss.platform.wx.WxCommonService;
+import cn.pluss.platform.wx.WxJumpWxa;
+import cn.pluss.platform.wx.WxUrlschemeResponse;
+import cn.pluss.platform.yinsheng.YsOldSrcMerchantNo;
+import com.alibaba.fastjson.JSONException;
+import com.alibaba.fastjson.JSONObject;
+import com.aliyuncs.geoip.model.v20200101.DescribeIpv4LocationResponse;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.net.URLDecoder;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+/**
+ * 下游统一支付接口impl
+ */
+@Service
+@Slf4j
+public class ApiPayServiceImpl implements ApiPayService {
+
+    /**
+     * 先这么做吧 只有一个 以后再换成安商户生成
+     */
+    private static final String KEY = "4c8d277b0f274604af68e590cc0b3e6b";
+
+    @Resource
+    private MerchantStoreMapper merchantStoreMapper;
+
+    @Setter(onMethod_ = {@Autowired,@Lazy})
+    private MerchantOrderService merchantOrderService;
+
+    @Resource
+    private MerchantBaseInfoMapper merchantBaseInfoMapper;
+
+    @Resource
+    private CommonSwitchService commonSwitchService;
+
+    @Resource
+    private MerchantService merchantService;
+
+    @Resource
+    private MerchantChannelStatusService merchantChannelStatusService;
+
+    @Resource
+    private MerchantMenberMapper merchantMenberMapper;
+
+    @Resource
+    private RyxPayService ryxPayService;
+
+    @Resource
+    private SxfPayService sxfPayService;
+
+    @Setter(onMethod_ = {@Autowired, @Qualifier("ysPayOldService")})
+    private PayService ysPayOldService;
+
+    @Resource
+    private MerchantRateNewService merchantRateNewService;
+
+    @Autowired
+    @Qualifier("ipLocationService")
+    private IpLocationService ipLocationService;
+
+    @Resource
+    private UserInfoMapper userInfoMapper;
+
+    @Setter(onMethod_ = {@Autowired,@Lazy})
+    private MerchantRefundOrderService merchantRefundOrderService;
+
+    @Setter(onMethod_ = {@Autowired,@Lazy})
+    private MerchantCashPlaceService merchantCashPlaceService;
+
+    @Setter(onMethod_ = {@Autowired,@Lazy})
+    private MercOrderNewService mercOrderNewService;
+
+    @Resource
+    private WxCommonService wxCommonService;
+
+    @Resource
+    private AppletInfoService appletInfoService;
+
+    @Resource
+    private MercOrderTokenService mercOrderTokenService;
+
+    @Resource
+    private SubMercCodeYsMapper subMercCodeYsMapper;
+
+    @Resource
+    private JftReceiptOrderService jftReceiptOrderService;
+
+    @Resource
+    private JftMercBaseInfoService jftMercBaseInfoService;
+
+    @Resource
+    private JftMercPaymentChannelService jftMercPaymentChannelService;
+
+    private String currencyParamsCheck(JSONObject jsonObject) {
+        Optional.ofNullable(jsonObject.getString("method")).orElseThrow(() -> new MsgException("接口方法参数不能为空"));
+        String mercOrderNo = jsonObject.getString("mercOrderNo");
+        Optional.ofNullable(mercOrderNo).orElseThrow(() -> new MsgException("商户订单号不能为空"));
+        if (mercOrderNo.length() < 10 || mercOrderNo.length() > 50) {
+            throw new MsgException("商户订单号长度格式有误，长度介于10到50之间!");
+        }
+        Optional.ofNullable(jsonObject.getString("sign")).orElseThrow(() -> new MsgException("缺失签名sign参数！"));
+        if("trans_pay".equals(jsonObject.getString("method")) ||
+                "trans_wap_pay".equals(jsonObject.getString("method")) ||
+                "trans_scan_pay".equals(jsonObject.getString("method"))){
+            MerchantStore store = null;
+            if("trans_pay".equals(jsonObject.getString("method"))){
+                checSign(jsonObject,jsonObject.getString("merchantCode"));
+                store = checkTransPayParams(jsonObject,jsonObject.getString("merchantCode"));
+            }else{
+                Optional.ofNullable(jsonObject.getString("merchantCode")).orElseThrow(() -> new MsgException("商户编号不能为空！"));
+                checSign(jsonObject,jsonObject.getString("merchantCode"));
+                store = checkTransPayParams(jsonObject,jsonObject.getString("merchantCode"));
+            }
+            String payData = checkMercOrder(store,jsonObject);
+            if(StringUtil.isNotEmpty(payData)){
+                return payData;
+            }
+            QueryWrapper<MerchantBaseInfo> queryWrapper = new QueryWrapper<MerchantBaseInfo>().eq("merchantCode", store.getMerchantCode());
+            MerchantBaseInfo baseInfo = merchantBaseInfoMapper.selectOne(queryWrapper);
+            Optional.ofNullable(baseInfo).orElseThrow(() -> new MsgException("当前商户暂未完成商户认证功能！"));
+            // 全局电子围栏和单商户电子围栏判定
+            if (!commonSwitchService.allowEcdemicPay() && !store.allowEcdemicPay()) {
+                // 不允许异地支付的时候需要校验ip和商户所在城市
+                try {
+                    merchantService.checkPayLocation(jsonObject.getString("ip"), baseInfo, jsonObject.getString("province"));
+                } catch (PayRiskException e) {
+                    throw new MsgException(e.getMessage());
+                }
+            }
+            MerchantChannelStatus channel = null;
+            if("trans_wap_pay".equals(jsonObject.getString("method"))){
+                channel = merchantChannelStatusService.getByMerchantCode(baseInfo.getMerchantCode(),4);
+            }else{
+                channel = merchantChannelStatusService.getValidData(baseInfo.getMerchantCode());
+            }
+            MsgException.checkNull(channel,"无进件信息，请先提交商户信息进行审核");
+            if("4".equals(channel.getChannel()) && StringUtil.isNotEmpty(jsonObject.getString("settleType"))){
+                SettleTypeEnum.checkValues(jsonObject.getString("settleType"));
+                channel.setSettlementType(jsonObject.getString("settleType"));
+            }
+            MsgException.check("7".equals(channel.getStatus()),"快付审核中");
+            MsgException.check(!channel.isPayment(),"进件未通过请耐心等待或联系客服");
+            jsonObject.put("channel", channel);
+            jsonObject.put("merchant", baseInfo);
+            jsonObject.put("store", store);
+        }
+        return null;
+    }
+
+    private void checSign(JSONObject jsonObject,String merchantCode) {
+        String sign = jsonObject.getString("sign");
+        jsonObject.remove("sign");
+        String md5Key = KEY;
+        Integer storeId = jsonObject.getInteger("storeId");
+        if(StringUtil.isNotEmpty(storeId)){
+            MerchantStore store = merchantStoreMapper.selectById(storeId);
+            MsgException.checkNull(store,"门店信息异常");
+            merchantCode = store.getMerchantCode();
+        }
+        String phone = jsonObject.getString("phone");
+        Integer sId = null;
+        if(StringUtil.isNotEmpty(merchantCode)){
+            MerchantBaseInfo baseInfo = merchantBaseInfoMapper.queryByMerchantCode(merchantCode);
+            MsgException.checkNull(baseInfo,"商户号不存在");
+            if(baseInfo != null && StringUtil.isNotEmpty(baseInfo.getMd5Key())){
+                md5Key = baseInfo.getMd5Key();
+            }
+        }else if(StringUtil.isNotEmpty(phone)){
+            UserInfo userInfo = userInfoMapper.selectOne(new QueryWrapper<UserInfo>().eq("loginName", phone));
+            MsgException.checkNull(userInfo,"手机号有误！");
+            List<MerchantBaseInfo> lists = merchantBaseInfoMapper.selectListByUserId(userInfo.getId());
+            if(lists.isEmpty()){
+                MsgException.throwException("商户信息异常！");
+            }
+            merchantCode = lists.get(0).getMerchantCode();
+            MerchantStore store = merchantStoreMapper.getStoreByMerchantCode(merchantCode);
+            MsgException.checkNull(store,"门店信息异常！");
+            sId = store.getId();
+        }
+        String signContent = SignUtils.getSignContent(jsonObject) + "&key=" + md5Key;
+        log.info("============>签名源串:{}<==============", signContent);
+        String ckeckSign = MD5Util.MD5Encode(signContent, "UTF-8");
+        if (!sign.equalsIgnoreCase(ckeckSign)) {
+            log.info("============>签名校验失败,我方生成签名串:{}，下游签名串：{}", ckeckSign, sign);
+            throw new MsgException("签名校验失败!");
+        }
+        if(StringUtil.isNotEmpty(sId)){
+            jsonObject.put("storeId",sId);
+        }
+    }
+
+    private String checkMercOrder(MerchantStore store,JSONObject jsonObject) {
+        QueryWrapper<MerchantOrder> queryMercWrapper = new QueryWrapper<MerchantOrder>().eq("mercOrderNo", jsonObject.getString("mercOrderNo"));
+        List<MerchantOrder> list = merchantOrderService.list(queryMercWrapper);
+        if (!list.isEmpty()) {
+            MerchantOrder order = list.get(0);
+            if(StringUtil.isNotEmpty(order.getPayData())){
+                return order.getPayData();
+            }
+            throw new MsgException("订单号重复!");
+        }
+        if ("0".equals(store.getStatus())) {
+            throw new MsgException("店铺已经打烊!");
+        }
+        if ("2".equals(store.getStatus())) {
+            throw new MsgException("店铺已被禁用!");
+        }
+        return null;
+    }
+
+    private MerchantStore checkTransPayParams(JSONObject jsonObject,String merchantCode) {
+        Integer id = jsonObject.getInteger("storeId");
+        MerchantStore store = new MerchantStore();
+        if(StringUtil.isNotEmpty(merchantCode)){
+            store.setMerchantCode(merchantCode);
+        }else{
+            store.setId(id);
+        }
+        if(StringUtil.isEmpty(merchantCode) && id == null){
+            MsgException.throwException("缺失商户编号[merchantCode]参数！");
+        }
+        MerchantStore storeInfo = merchantStoreMapper.selectOne(new QueryWrapper<>(store));
+        Optional.ofNullable(storeInfo).orElseThrow(() -> new MsgException("店铺数据异常！"));
+        String payAmt = jsonObject.getString("payAmt");
+        Optional.ofNullable(payAmt).orElseThrow(() -> new MsgException("付款金额不能为空！"));
+        if(StringUtil.isEmpty(storeInfo.getPayEcdemicSwitch()) || "0".equals(storeInfo.getPayEcdemicSwitch())){
+            String ip = jsonObject.getString("ip");
+            Optional.ofNullable(ip).orElseThrow(() -> new MsgException("付款人ip地址不能为空!"));
+        }
+        if (!StringUtil.isNumber(payAmt)) {
+            throw new MsgException("交易金额格式不正确，单位(元)!");
+        }
+        if (Double.parseDouble(payAmt) < 0.01d) {
+            throw new MsgException("交易金额最少为0.01!");
+        }
+        Optional.ofNullable(jsonObject.getString("notifyUrl"))
+                .orElseThrow(() -> new MsgException("异步通知地址不能为空！"));
+        String method = jsonObject.getString("method");
+        if(!"trans_scan_pay".equals(method)){
+            Optional.ofNullable(jsonObject.getString("payWay"))
+                    .orElseThrow(() -> new MsgException("支付渠道不能为空！"));
+        }
+        if(StringUtil.isEmpty(merchantCode)){
+            Optional.ofNullable(jsonObject.getString("payType"))
+                    .orElseThrow(() -> new MsgException("支付方式不能为空！"));
+            Optional.ofNullable(jsonObject.getString("userId"))
+                    .orElseThrow(() -> new MsgException("付款用户不能为空！"));
+        }
+        Optional.ofNullable(jsonObject.getString("subject"))
+                .orElseThrow(() -> new MsgException("订单标题不能为空！"));
+
+        return storeInfo;
+    }
+
+
+    @Override
+    public JSONObject pay(String json,String cip) {
+        Optional.ofNullable(json).orElseThrow(() -> new MsgException("请求参数为空"));
+        JSONObject jsonObject;
+        try {
+            jsonObject = JSONObject.parseObject(json);
+        } catch (JSONException e) {
+            throw new MsgException("JSON字符串有误，请检查!");
+        }
+        String res = currencyParamsCheck(jsonObject);
+        if(StringUtil.isNotEmpty(res)){
+            return ResultGenerator.genSuccessJsonResult("处理成功",JSONObject.parseObject(res));
+        }
+        String ip = jsonObject.getString("ip");
+        if(StringUtil.isEmpty(ip)){
+            ip = cip;
+        }
+        jsonObject.put("ip",ip);
+        String cityName = jsonObject.getString("cityName");
+        String provinceName = jsonObject.getString("provinceName");
+        if(StringUtil.isNotEmpty(cityName)){
+            jsonObject.put("ipAddress",provinceName + "-" + cityName);
+            SubMercCodeYs ysCode = subMercCodeYsMapper.getSubMercCodeYsByCity(cityName);
+            if(ysCode != null){
+                jsonObject.put("pCode",ysCode.getPCode());
+                jsonObject.put("cCode",ysCode.getCode());
+            }
+        }else{
+            if(StringUtil.isNotEmpty(ip)){
+                DescribeIpv4LocationResponse location = ipLocationService.getLocation(ip);
+                if(location != null && StringUtil.isNotEmpty(location.getCity())){
+                    SubMercCodeYs ysCode = subMercCodeYsMapper.getSubMercCodeYsByCity(location.getCity());
+                    if(ysCode != null){
+                        jsonObject.put("pCode",ysCode.getPCode());
+                        jsonObject.put("cCode",ysCode.getCode());
+                    }
+                    jsonObject.put("ipAddress",location.getProvince() + "-" + location.getCity());
+                }else{
+                    String ipAddress = IpUtils.getIpLoactionAddress(location);
+                    jsonObject.put("ipAddress",ipAddress);
+                }
+            }
+        }
+        switch (jsonObject.getString("method")) {
+            case "trans_query":
+                return tradeQuery(jsonObject);
+            default:
+                return tradePay(jsonObject);
+        }
+
+    }
+
+    public JSONObject tradePay(JSONObject jsonObject) {
+        MerchantStore store = jsonObject.getObject("store", MerchantStore.class);
+        MerchantChannelStatus channel = jsonObject.getObject("channel", MerchantChannelStatus.class);
+        String isMember = jsonObject.getString("isMember");
+        if (StringUtil.isNotEmpty(isMember) && "1".equals(isMember)) {
+            return vipTradePay(jsonObject, store);
+        } else {
+            try {
+                JSONObject result = new JSONObject(10);
+                //构建订单
+                MerchantBaseInfo merchant = jsonObject.getObject("merchant", MerchantBaseInfo.class);
+                if("trans_scan_pay".equals(jsonObject.getString("method")) && StringUtil.isEmpty(jsonObject.get("payWay"))){
+                    String payAmt = jsonObject.getString("payAmt");
+                    String mercOrderNo = jsonObject.getString("mercOrderNo");
+                    MercOrderToken token = new MercOrderToken(merchant,payAmt,channel,mercOrderNo,jsonObject);
+                    mercOrderTokenService.save(token);
+                    String payUrl = ParametersUtil.domain + "/wap/merchant/scanPayAuth?tk="+token.getToken();
+                    result.put("payUrl",payUrl);
+                    result.put("mercOrderNo",mercOrderNo);
+                    result.put("orderNumber",token.getOrderNumber());
+                    result.put("channel",channel.getChannel());
+                    result.put("payAmt",token.getOrderAmt());
+                    return ResultGenerator.genSuccessJsonResult("下单成功", result);
+                }
+                MerchantOrder order = getMerchantOrder(jsonObject);
+                if("trans_wap_pay".equals(jsonObject.getString("method"))){
+                    if(Constant.PAY_TYPE_ALIPAY.equals(order.getPayTypeCode())){
+                        String paySource = jsonObject.getString("paySource");
+                        //小程序付款方式
+                        if(StringUtil.isNotEmpty(paySource) && paySource.equals("01")){
+                            String payUrl = "alipays://platformapi/startapp?appId=2021003101623191&page=pages/pay/index?orderNumber="+order.getOrderNumber();
+                            result.put("payUrl",payUrl);
+                        }else{
+                            String payUrl = ParametersUtil.domain + "/wap/aliPay/returnUrl?orderNumber="+order.getOrderNumber();
+                            String pUrl = URLDecoder.decode(payUrl, "UTF-8");
+                            result.put("payUrl",Constant.ALIPAY_H5_PAY_URL_PRIFIX + pUrl);
+                        }
+                    }else if (Constant.PAY_TYPE_WECHAT.equals(order.getPayTypeCode())){
+                        String subAppId = YsOldSrcMerchantNo.getSubAppIdByValue(channel.getSrcMerchantNo());
+                        AppletInfo applet = appletInfoService.getAppletInfoByAppId(subAppId);
+                        if(applet == null){
+                            return ResultGenerator.genFailJsonResult("商户subAppid信息配置异常,下单失败！");
+                        }
+                        WxAccessTokenRequest request = WxAccessTokenRequest.buidWxToken(subAppId, applet.getSecret());
+                        WxJumpWxa wxJumpWxa = new WxJumpWxa(order.getOrderNumber(),WxJumpWxa.ENV_VERSION_RELEASE);
+                        WxUrlschemeResponse urlecheme = wxCommonService.getUrlecheme(request, wxJumpWxa);
+                        result.put("payUrl",urlecheme.getOpenlink());
+                    }
+                    return ResultGenerator.genSuccessJsonResult("下单成功", result);
+                }
+                if("trans_pay".equals(jsonObject.getString("method"))
+                        && StringUtil.isEmpty(jsonObject.get("userId"))
+                        && Constant.PAY_TYPE_WECHAT.equals(order.getPayTypeCode())){
+                    String ghId = YsOldSrcMerchantNo.getGhIdByValue(channel.getSrcMerchantNo());
+                    result.put("gh_Id",ghId);
+                    result.put("path","pages/pay/index?orderId="+order.getOrderNumber());
+                    result.put("mercOrderNo",order.getMercOrderNo());
+                    result.put("orderNumber",order.getOrderNumber());
+                    result.put("payAmt",order.getConsumeFee().toString());
+                    return ResultGenerator.genSuccessJsonResult("下单成功", result);
+                }
+                if (channel.getChannel() == 1) {
+                    JSONObject res = sxfPayService.tradePay(order, channel,merchant);
+                    return assemblePayRresultParam(res, order);
+                } else if (channel.getChannel() == 2) {
+                    MsgException.throwException("当前通道已关闭");
+                } else if (channel.getChannel() == 3) {
+                    JSONObject res = ryxPayService.tradePay(order, channel,merchant);
+                    return assemblePayRresultParam(res, order);
+                }else if (channel.getChannel() == 4) {
+                    JSONObject res = ysPayOldService.tradePay(order, channel,merchant);
+                    return assemblePayRresultParam(res, order);
+                }
+                return ResultGenerator.genFailJsonResult("未知的通道！");
+            } catch (Exception e) {
+                e.printStackTrace();
+                return ResultGenerator.genFailJsonResult(e.getMessage());
+            }
+        }
+
+    }
+
+    private JSONObject assemblePayRresultParam(JSONObject result, MerchantOrder order) {
+
+        if (ResultCode.SUCCESS.code() != result.getInteger("code")) {
+            return ResultGenerator.genFailJsonResult(result.getString("msg"));
+        }
+        JSONObject payData = result.getJSONObject("payData");
+        order.setPayData(payData.toJSONString());
+        merchantOrderService.save(order);
+        payData.put("payAmt",order.getConsumeFee().toString());
+        return ResultGenerator.genSuccessJsonResult("处理成功", payData);
+    }
+
+    /**
+     * 构建订单
+     *
+     * @param jsonObject
+     * @return
+     */
+    private MerchantOrder getMerchantOrder(JSONObject jsonObject) {
+
+        String payAmt = jsonObject.getString("payAmt");
+        String nickName = jsonObject.getString("nickName");
+        String avatar = jsonObject.getString("avatar");
+
+        MerchantBaseInfo baseInfo = jsonObject.getObject("merchant", MerchantBaseInfo.class);
+        MerchantStore storeInfo = jsonObject.getObject("store", MerchantStore.class);
+        MerchantChannelStatus channel = jsonObject.getObject("channel", MerchantChannelStatus.class);
+
+
+        MerchantOrder merchantOrder = new MerchantOrder();
+        merchantOrder.setMercOrderNo(jsonObject.getString("mercOrderNo"));
+        merchantOrder.setMercNotifyUrl(jsonObject.getString("notifyUrl"));
+        merchantOrder.setMercReturnUrl(jsonObject.getString("returnUrl"));
+        merchantOrder.setMercUserId(jsonObject.getString("userId"));
+        merchantOrder.setMercNotifyStatus("0");
+
+        merchantOrder.setIp(jsonObject.getString("ip"));
+        merchantOrder.setIpAddress(jsonObject.getString("ipAddress"));
+
+        merchantOrder.setSnNo(jsonObject.getString("snNo"));
+        merchantOrder.setMerchantCode(baseInfo.getMerchantCode());
+        merchantOrder.setStoreId(storeInfo.getStoreId());
+        merchantOrder.setStoreName(storeInfo.getStoreName());
+        merchantOrder.setMerchantName(baseInfo.getAlias());
+
+        merchantOrder.setAlias(baseInfo.getMerchantName());
+
+        merchantOrder.setRemark(jsonObject.getString("remark"));
+
+        merchantOrder.setMercRemark(jsonObject.getString("subject"));
+        if (StringUtil.isNotEmpty(nickName)) {
+            merchantOrder.setNickName(EmojiUtil.emojiConvert1(nickName));
+        }
+        if (StringUtil.isNotEmpty(avatar)) {
+            merchantOrder.setUserImg(avatar);
+        }
+        merchantOrder.setConsumeFee(Double.valueOf(payAmt));
+        Date date = new Date();
+        merchantOrder.setCreateDt(date);
+        merchantOrder.setUpdateTime(date);
+        merchantOrder.setStatus("5");
+        if(StringUtil.isNotEmpty(jsonObject.getString("subject"))){
+            merchantOrder.setSubject(jsonObject.getString("subject"));
+            merchantOrder.setMercRemark(jsonObject.getString("subject"));
+        }
+        if(StringUtil.isNotEmpty(jsonObject.getString("pCode"))){
+            merchantOrder.setProvince(jsonObject.getString("pCode"));
+        }
+        if(StringUtil.isNotEmpty(jsonObject.getString("cCode"))){
+            merchantOrder.setCity(jsonObject.getString("cCode"));
+        }
+
+        String orderSource = jsonObject.getString("orderSource");
+        if("trans_scan_pay".equals(jsonObject.getString("method"))){
+            merchantOrder.setOrderType("2");
+            merchantOrder.setScanType("01");
+        }else{
+            if("02".equals(jsonObject.getString("payType"))){
+                merchantOrder.setOrderType("2");
+            }else{
+                if(StringUtil.isNotEmpty(orderSource) && !"undefined".equals(orderSource)){
+                    merchantOrder.setOrderType(orderSource);
+                }else{
+                    merchantOrder.setOrderType("9");
+                }
+            }
+        }
+//        log.info("============插入订单数据为======================" + JSONObject.toJSONString(merchantOrder));
+        Map<String, Object> params = new HashMap<>(2);
+        params.put("payWay", jsonObject.getString("payWay"));
+        params.put("orderNum", "MERC");
+        if("trans_wap_pay".equals(jsonObject.getString("method"))){
+            params.put("orderNum", "MERC_WAP");
+        }
+        if("trans_pay".equals(jsonObject.getString("method")) && StringUtil.isEmpty(merchantOrder.getMercUserId())){
+            params.put("orderNum", "MERC_APP");
+        }
+//        if("trans_wap_pay".equals(jsonObject.getString("method"))){
+//            merchantOrder.setApiOrderType("wap");
+//        }
+//        if("trans_pay".equals(jsonObject.getString("method")) && StringUtil.isEmpty(merchantOrder.getMercUserId())){
+//            merchantOrder.setApiOrderType("app");
+//        }
+        //获取设备绑定的收银点信息
+        String snNo = jsonObject.getString("snNo");
+        merchantCashPlaceService.setOrderPlaceInfo(merchantOrder,snNo);
+        merchantOrderService.constOrderPayCodeAndName(merchantOrder,params,channel);
+        merchantOrder.isAllowBankLarge(baseInfo);
+        //获取商户费率
+        BigDecimal rate = merchantRateNewService.getMchRate(baseInfo.getMerchantCode(),merchantOrder.getPayTypeCode(), merchantOrder.getConsumeFee());
+        merchantOrder.calcRateAndFee(rate);
+        if("trans_wap_pay".equals(jsonObject.getString("method"))){
+            merchantOrderService.save(merchantOrder);
+        }
+        if("trans_pay".equals(jsonObject.getString("method"))
+                && StringUtil.isEmpty(merchantOrder.getMercUserId())){
+            merchantOrderService.save(merchantOrder);
+        }
+        return merchantOrder;
+    }
+
+    private JSONObject vipTradePay(JSONObject jsonObject, MerchantStore store) {
+        log.info("===========>会员卡支付<=================");
+        JSONObject params = new JSONObject(10);
+        QueryWrapper<MerchantMenber> menberQueryWrapper = new QueryWrapper<MerchantMenber>()
+                .eq("merchantCode", store.getMerchantCode()).eq("storeId", store.getStoreId())
+                .eq("appOpenId", jsonObject.getString("userId"));
+        MerchantMenber menber = merchantMenberMapper.selectOne(menberQueryWrapper);
+        Optional.ofNullable(menber).orElseThrow(() -> new MsgException("会员信息异常！"));
+        params.put("comsumeMoney", jsonObject.getString("payAmt"));
+        params.put("merchantCode", store.getMerchantCode());
+        params.put("storeId", store.getStoreId());
+        params.put("isMember", "1");
+        params.put("radioPay", "memberPay");
+        params.put("appOpenId", jsonObject.getString("userId"));
+        params.put("nickName", StringUtil.isNotEmpty(menber.getNickName()) ? menber.getNickName() : menber.getMemberName());
+        params.put("userImg", menber.getLogo());
+        params.put("ip", jsonObject.getString("ip"));
+        params.put("snNo", jsonObject.getString("snNo"));
+
+        try {
+            Result<Map<String, Object>> mapResult = merchantService.tradePay(params);
+            if (mapResult.getCode() != ResultCode.SUCCESS.code()) {
+                return ResultGenerator.genFailJsonResult(mapResult.getMessage());
+            } else {
+                return ResultGenerator.genSuccessJsonResult(mapResult.getMessage(), mapResult.getData());
+            }
+        } catch (Exception e) {
+            log.info("=============>会员卡支付失败，异常信息为:{}<===============", e);
+            return ResultGenerator.genFailJsonResult("支付失败！");
+        }
+    }
+
+    public JSONObject tradeQuery(JSONObject jsonObject) {
+        log.info("==============>调用交易查询接口<====================");
+        String mercOrderNo = jsonObject.getString("mercOrderNo");
+        QueryWrapper<MerchantOrder> orderQuery = new QueryWrapper<MerchantOrder>().eq("mercOrderNo", mercOrderNo);
+        MerchantOrder order = merchantOrderService.getOne(orderQuery);
+        Optional.ofNullable(order).orElseThrow(() -> new MsgException("未找到该商户订单号的付款信息！"));
+        JSONObject result = new JSONObject(10);
+        result.put("mercOrderNo", mercOrderNo);
+        result.put("payAmt", order.getConsumeFee());
+        if (StringUtil.isNotEmpty(order.getTransDt())) {
+            result.put("payTime", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(order.getTransDt()));
+        }
+        result.put("payWay", order.getPayTypeCode().contains("0") ? "ZFBZF" : "WXZF");
+        result.put("orderNumber", order.getOrderNumber());
+        result.put("mercUserId",order.getMercUserId());
+        switch (order.getStatus()) {
+            case "0":
+            case "1":
+                result.put("status", order.getStatus());
+                break;
+            case "5":
+                result.put("status", "2");
+                break;
+            default:
+                result.put("status", "3");
+                break;
+        }
+        String key = KEY;
+        if(StringUtil.isNotEmpty(jsonObject.getString("md5Key"))){
+            key = jsonObject.getString("md5Key");
+        }
+        String signStr = SignUtils.getSignContent(result) + "&key=" + key;
+        String nSign = MD5Util.MD5Encode(signStr, "UTF-8");
+        result.put("sign", nSign);
+        return result;
+    }
+
+    @Override
+    public Result<Object> orderPay(String userId, String orderNumber) {
+        if(StringUtil.isEmpty(userId)){
+            return ResultGenerator.genFailResult("缺失参数！");
+        }
+        if(StringUtil.isEmpty(orderNumber)){
+            return ResultGenerator.genFailResult("缺失订单号参数！");
+        }
+        //缴费通订单
+        if(orderNumber.contains("JFT")){
+            JftReceiptOrder order = jftReceiptOrderService.getOrderByNo(orderNumber);
+            if(order == null){
+                return ResultGenerator.genFailResult("当前订单号有误！");
+            }
+            if(JftReceiptOrder.PAY_STATUS_YES.equals(order.getStatus())){
+                return ResultGenerator.genFailResult("当前订单已支付，请勿重复支付！");
+            }
+            if(StringUtil.isNotEmpty(order.getPayData())){
+                return ResultGenerator.genSuccessResult("获取成功",JSONObject.parseObject(order.getPayData()));
+            }
+            Long cTime = order.getCreateTime().getTime();
+            Long nowTime = System.currentTimeMillis();
+            if(nowTime - cTime >= 1000 * 60 * 10){
+                return ResultGenerator.genFailResult("订单已超时，请重新下单！");
+            }
+            order.setPayUserId(userId);
+            JftMercBaseInfo jfrMerc = jftMercBaseInfoService.getMercBaseInfo(order.getUserId());
+            JftMercPaymentChannel jftChannel = jftMercPaymentChannelService.getByUserId(order.getUserId());
+            JSONObject result = ysPayOldService.jftPay(order, jfrMerc, jftChannel);
+            if(ResultCode.SUCCESS.code() != result.getInteger("code")){
+                return ResultGenerator.genFailResult(result.getString("msg"));
+            }
+            JSONObject payData = result.getJSONObject("payData");
+            order.setPayData(payData.toJSONString());
+            order.setTransNo(order.getTransNo());
+            order.setPayData(payData.toJSONString());
+            order.setCreateDate(null);
+            jftReceiptOrderService.updateById(order);
+            return ResultGenerator.genSuccessResult("获取成功",payData);
+        }else{
+            MerchantOrder order = new MerchantOrder();
+            MercOrderNew mercOrderNew = null;
+            try {
+                mercOrderNew = devicePay(userId, orderNumber, order);
+                if(mercOrderNew == null){
+                    order = oldPay(userId,orderNumber,order);
+                }
+                Long cTime = order.getCreateDt().getTime();
+                Long nowTime = System.currentTimeMillis();
+                if(nowTime - cTime >= 1000 * 60 * 10){
+                    return ResultGenerator.genFailResult("订单已超时，请重新下单！");
+                }
+                if(StringUtil.isNotEmpty(order.getPayData())){
+                    return ResultGenerator.genSuccessResult("获取成功",JSONObject.parseObject(order.getPayData()));
+                }
+                MerchantBaseInfo merchant = merchantBaseInfoMapper.queryByMerchantCode(order.getMerchantCode());
+                if(merchant == null){
+                    return ResultGenerator.genFailResult("商户信息异常！");
+                }
+                MerchantStore store = merchantStoreMapper.getStoreByMerchantCode(order.getMerchantCode());
+                if(store == null){
+                    return ResultGenerator.genFailResult("门店信息异常！");
+                }
+                if("2".equals(store.getStatus())){
+                    return ResultGenerator.genFailResult("商户已被禁用！");
+                }
+                MerchantChannelStatus channel = merchantChannelStatusService.getByMerchantCode(order.getMerchantCode(), Integer.valueOf(order.getAisleSwitch()));
+                if(channel == null){
+                    return ResultGenerator.genFailResult("当前商户暂未进件通过！");
+                }
+                if(!channel.isPayment()){
+                    return ResultGenerator.genFailResult("进件未通过请耐心等待或联系客服！");
+                }
+                order.setMercUserId(userId);
+                order.setAlias(merchant.getMerchantName());
+                try {
+                    JSONObject result = ysPayOldService.tradePay(order, channel,merchant);
+                    if(ResultCode.SUCCESS.code() != result.getInteger("code")){
+                        return ResultGenerator.genFailResult(result.getString("msg"));
+                    }
+                    JSONObject payData = result.getJSONObject("payData");
+                    order.setPayData(payData.toJSONString());
+                    if(mercOrderNew == null){
+                        merchantOrderService.updateById(order);
+                    }else{
+                        MercOrderNew update = new MercOrderNew();
+                        update.setId(mercOrderNew.getId());
+                        update.setTransNo(order.getTransNo());
+                        update.setPayData(payData.toJSONString());
+                        mercOrderNewService.updateById(update);
+                    }
+                    return ResultGenerator.genSuccessResult("获取成功",payData);
+                }catch (Exception e){
+                    e.printStackTrace();
+                    return ResultGenerator.genFailResult(e.getMessage());
+                }
+            }catch (Exception e){
+                return ResultGenerator.genFailResult(e.getMessage());
+            }
+        }
+    }
+
+    private MercOrderNew devicePay(String userId, String orderNumber, MerchantOrder order) {
+        MercOrderNew newOrder = mercOrderNewService.getOrderByNo(orderNumber);
+        if(newOrder == null){
+            return null;
+        }
+        MsgException.check(!DeviceOrderStatus.WAIT_PAY.getStatus().equals(newOrder.getStatus()),"当前订单状态有误!");
+        newOrder.setPayUserId(userId);
+        newOrder.convert(order,null);
+        return newOrder;
+    }
+    private MerchantOrder oldPay(String userId, String orderNumber,MerchantOrder order) {
+        QueryWrapper<MerchantOrder> queryWrapper = new QueryWrapper<MerchantOrder>().eq("orderNumber",orderNumber).eq("status","5");
+        MerchantOrder qOrder = merchantOrderService.getOne(queryWrapper);
+        if(qOrder == null){
+            return order;
+        }
+        order = qOrder;
+        MsgException.check(!"4".equals(order.getAisleSwitch()),"当前订单不是实时到账的订单!");
+        order.setMercUserId(userId);
+        return order;
+    }
+
+    /**
+     * @description:退款
+     * @date: 2021/11/22 10:00
+     * @param params:
+     * @return cn.pluss.platform.api.Result<com.alibaba.fastjson.JSONObject>
+     */
+    @Override
+    public Result<JSONObject> refund(JSONObject params) {
+        String refundReason = params.getString("refundReason");
+        String orderNumber = Optional.ofNullable(params.getString("orderNumber")).orElseThrow(() -> new MsgException("订单编号不能为空"));
+        QueryWrapper<MerchantOrder> orderQueryWrapper = new QueryWrapper<MerchantOrder>().eq("orderNumber",orderNumber)
+                .eq("status","1");
+        List<MerchantOrder> list = merchantOrderService.list(orderQueryWrapper);
+        if(list.isEmpty()){
+            return ResultGenerator.genFailResult("订单号异常！");
+        }
+        MerchantOrder merchantOrder = list.get(0);
+        QueryWrapper<MerchantRefundOrder> queryWrapper = new QueryWrapper<MerchantRefundOrder>()
+                .eq("orderNumber",merchantOrder.getOrderNumber()).in("status","1","2");
+        MerchantRefundOrder refundOrder = merchantRefundOrderService.getOne(queryWrapper);
+        if(refundOrder != null){
+            return ResultGenerator.genFailResult("订单已退款，请勿重复操作！");
+        }
+        merchantOrderService.returnOrder(merchantOrder.getOrderNumber(),refundReason,"wxapp", null);
+        return ResultGenerator.genSuccessResult("退款成功",null);
+    }
+
+    /**
+     * @description:退款订单查询
+     * @date: 2021/11/22 10:03
+     * @param params:
+     * @return cn.pluss.platform.api.Result<java.lang.Object>
+     */
+    @Override
+    public Result<Object> refundQuery(JSONObject params) {
+        String orderNumber = Optional.ofNullable(params.getString("orderNumber")).orElseThrow(() -> new MsgException("订单编号不能为空"));
+        QueryWrapper<MerchantRefundOrder> queryWrapper = new QueryWrapper<MerchantRefundOrder>()
+                .eq("orderNumber",orderNumber);
+        MerchantRefundOrder refundOrder = merchantRefundOrderService.getOne(queryWrapper);
+        if(refundOrder != null){
+            return ResultGenerator.genSuccessResult("订单获取成功",refundOrder);
+        }
+        return ResultGenerator.genFailResult("订单号有误，退款订单不存在！");
+    }
+    
+    /**
+     * @description:api退款功能
+     * @date: 2021/11/22 10:49
+     * @param params:  
+     * @return cn.pluss.platform.api.Result<com.alibaba.fastjson.JSONObject>
+     */
+    @Override
+    public Result<JSONObject> apiRefund(JSONObject params) {
+        checkRefundCommonParam(params);
+        String method = params.getString("method");
+        JSONObject result = new JSONObject();
+        switch (method){
+            case "syb.refund.pay":
+                MsgException.checkBlank(params.getString("mercOrderNo"),"原交易商户交易订单号不能为空！");
+                MsgException.checkBlank(params.getString("notifyUrl"),"异步通知地址不能为空！");
+                MsgException.checkBlank(params.getString("refundAmt"),"退款金额不能为空");
+                MsgException.check(!StringUtil.isNumber(params.getString("refundAmt")),"退款金额格式有误，小数点保留后两位");
+                result = apiRefundPay(params);
+                break;
+            case "syb.refund.query":
+                result = apiRefundQuery(params);
+                break;
+            default:
+                MsgException.throwException("未知操作");
+                break;
+        }
+        return ResultGenerator.genSuccessResult("操作成功",result);
+    }
+
+    /**
+     * @description:退款订单查询
+     * @date: 2021/11/22 16:29
+     * @param params:
+     * @return com.alibaba.fastjson.JSONObject
+     */
+    private JSONObject apiRefundQuery(JSONObject params) {
+        MerchantBaseInfo merchant = params.getObject("merchant", MerchantBaseInfo.class);
+        MerchantRefundOrder refund = merchantRefundOrderService.apiRefundQuery(params);
+        return setChannelParam(refund,merchant);
+    }
+
+    //退款操作
+    private JSONObject apiRefundPay(JSONObject params) {
+        MerchantBaseInfo merchant = params.getObject("merchant", MerchantBaseInfo.class);
+        String refundReason = StringUtil.isEmpty(params.getString("refundReason")) ? "订单退款" : params.getString("refundReason");
+        String mercOrderNo = params.getString("mercOrderNo");
+        BigDecimal refundAmt = params.getBigDecimal("refundAmt");
+        QueryWrapper<MerchantOrder> queryWrapper = new QueryWrapper<MerchantOrder>().eq("mercOrderNo",mercOrderNo).eq("status","1");
+        MerchantOrder order = merchantOrderService.getOne(queryWrapper);
+        MsgException.checkNull(order,"原交易单号有误！");
+        MsgException.check(!"1".equals(order.getStatus()),"原交易订单未支付或订单状态有误！");
+        Double consumeFee = order.getConsumeFee();
+        if(refundAmt.compareTo(BigDecimal.valueOf(consumeFee)) > 0){
+            MsgException.throwException("退款金额超过原订单交易金额！");
+        }
+        order.setRefundAmt(refundAmt);
+        String mercRefundNo = params.getString("mercRefundNo");
+        QueryWrapper<MerchantRefundOrder> refundWrapper = new QueryWrapper<MerchantRefundOrder>().eq("mercRefundNo",mercRefundNo);
+        MerchantRefundOrder refundOrder = merchantRefundOrderService.getOne(refundWrapper);
+        MsgException.check(refundOrder != null ,"退款单号不可重复");
+        QueryWrapper<MerchantRefundOrder> refundOrderNumberWrapper = new QueryWrapper<MerchantRefundOrder>()
+                .eq("orderNumber",order.getOrderNumber());
+        List<MerchantRefundOrder> list = merchantRefundOrderService.list(refundOrderNumberWrapper);
+        order.setUseRefundAmt(BigDecimal.ZERO);
+        try {
+            if(list.isEmpty()){
+                if(refundAmt.compareTo(BigDecimal.valueOf(consumeFee)) == 0){
+                    //全额退款
+                    order.setRefundType(1);
+                }else{
+                    //部分退款
+                    order.setRefundType(2);
+                }
+            }else{
+                //已退款了一部分
+                BigDecimal useRefundAmt = BigDecimal.ZERO;
+                for (MerchantRefundOrder r:list) {
+                    BigDecimal useAmt = StringUtil.isEmpty(r.getRefundAmt()) ? BigDecimal.ZERO : r.getRefundAmt();
+                    useRefundAmt = useRefundAmt.add(useAmt);
+                }
+                if(refundAmt.compareTo(BigDecimal.valueOf(order.getConsumeFee()).subtract(useRefundAmt)) > 0){
+                    //超出退款的金额
+                    MsgException.throwException("超出剩余可退款金额！");
+                }
+                order.setRefundType(2);
+                order.setUseRefundAmt(useRefundAmt);
+            }
+            order.setRemark(refundReason);
+            MerchantRefundOrder refund = merchantRefundOrderService.apiRefundOrder(params,order);
+            return setChannelParam(refund,merchant);
+        }catch (Exception e){
+            log.error("api退款失败,退款原单号：{}，失败描述：{}",order.getOrderNumber(),e.getMessage());
+            MsgException.throwException(e.getMessage());
+        }
+        return null;
+    }
+
+    private JSONObject setChannelParam(MerchantRefundOrder refund,MerchantBaseInfo merchant) {
+        JSONObject result = new JSONObject();
+        result.put("refundNo",refund.getRefundNo());
+        result.put("orderNumber",refund.getOrderNumber());
+        result.put("mercRefundNo",refund.getMercRefundNo());
+        result.put("oPayAmt",refund.getPayAmt().toString());
+        result.put("refundAmt",refund.getRefundAmt().toString());
+        result.put("status",refund.getStatus());
+        if(StringUtil.isNotEmpty(refund.getRefundTime())){
+            result.put("refundTime",DateUtils.formatDateDefault(refund.getRefundTime(),"yyyy-MM-dd HH:mm:ss"));
+        }
+        String key = KEY;
+        if(StringUtil.isNotEmpty(merchant.getMd5Key())){
+            key = merchant.getMd5Key();
+        }
+        String signStr = SignUtils.getSignContent(result) + "&key=" + key;
+        String sign = MD5Util.MD5Encode(signStr, "UTF-8");
+        result.put("sign",sign);
+        return result;
+    }
+
+    /**
+     * @description:检查通用退款参数
+     * @date: 2021/11/22 10:52
+     * @param params:
+     */
+    private void checkRefundCommonParam(JSONObject params) {
+
+        String phone = params.getString("phone");
+        String merchantCode = params.getString("merchantCode");
+        if(StringUtil.isBlank(merchantCode) && StringUtil.isBlank(phone)){
+            MsgException.throwException("缺失手机号或商编");
+        }
+        String sign = Optional.ofNullable(params.getString("sign")).orElseThrow(() -> new MsgException("缺失sign！"));
+        Optional.ofNullable(params.getString("method")).orElseThrow(() -> new MsgException("请求接口名称method不能为空！"));
+        String mercRefundNo = Optional.ofNullable(params.getString("mercRefundNo")).orElseThrow(() -> new MsgException("商户退款单号不能为空！"));
+        if(mercRefundNo.length() < 10 || mercRefundNo.length() > 50){
+            MsgException.throwException("退款单号长度为10~50位之间！");
+        }
+        MerchantBaseInfo baseInfo = null;
+        if(StringUtil.isNotEmpty(phone)){
+            QueryWrapper<UserInfo> queryUser = new QueryWrapper<UserInfo>().eq("loginName",phone);
+            UserInfo userInfo = userInfoMapper.selectOne(queryUser);
+            MsgException.checkNull(userInfo,"用户信息异常！");
+            List<MerchantBaseInfo> merchantList = merchantBaseInfoMapper.selectListByUserId(userInfo.getId());
+            MsgException.check(merchantList.isEmpty(),"商户信息异常！");
+            baseInfo = merchantList.get(0);
+        }else{
+            baseInfo = merchantBaseInfoMapper.queryByMerchantCode(merchantCode);
+        }
+        MsgException.checkNull(baseInfo,"商户信息异常!");
+        MerchantStore store = merchantStoreMapper.getStoreByMerchantCode(baseInfo.getMerchantCode());
+        MsgException.checkNull(store,"门店信息异常！");
+        MsgException.check("2".equals(store.getStatus()),"商户已被禁用！");
+        String key = KEY;
+        if(StringUtil.isNotEmpty(baseInfo.getMd5Key())){
+            key = baseInfo.getMd5Key();
+        }
+        String signContent = SignUtils.getSignContent(params) + "&key=" + key;
+        log.info("============>签名源串:{}<==============", signContent);
+        String ckeckSign = MD5Util.MD5Encode(signContent, "UTF-8");
+        if (!sign.equalsIgnoreCase(ckeckSign)) {
+           MsgException.throwException("签名校验失败!");
+        }
+        params.put("merchant",baseInfo);
+        params.put("store",store);
+    }
+
+    /**
+     * 内部微信小程序支付
+     * @date: 2021/12/24 13:35
+     * @param params:
+     * @return com.alibaba.fastjson.JSONObject
+     */
+    @Override
+    public JSONObject wxappPay(JSONObject params) {
+        Integer storeId = params.getInteger("storeId");
+        MsgException.checkNull(storeId,"缺少店铺ID");
+        MerchantStore store = merchantStoreMapper.selectById(storeId);
+        MsgException.checkNull(store,"店铺信息异常");
+        MsgException.check("2".equals(store.getStatus()),"店铺已被禁用");
+        MerchantBaseInfo merchant = merchantBaseInfoMapper.queryByMerchantCode(store.getMerchantCode());
+        MsgException.checkNull(merchant,"商户信息异常");
+        MerchantChannelStatus channel = merchantChannelStatusService.getValidData(store.getMerchantCode());
+        MsgException.checkNull(channel,"进件信息异常");
+        String isMember = params.getString("isMember");
+        if (StringUtil.isNotEmpty(isMember) && "1".equals(isMember)) {
+            return vipTradePay(params, store);
+        }
+         MerchantOrder order = getWxAppOrder(store,merchant,channel,params);
+        if (channel.getChannel() == 1) {
+            JSONObject result = sxfPayService.tradePay(order, channel,merchant);
+            return assemblePayRresultParam(result, order);
+        } else if (channel.getChannel() == 2) {
+            MsgException.throwException("当前通道已关闭");
+        } else if (channel.getChannel() == 3) {
+            JSONObject result = ryxPayService.tradePay(order, channel,merchant);
+            return assemblePayRresultParam(result, order);
+        }else if (channel.getChannel() == 4) {
+            JSONObject result = ysPayOldService.tradePay(order, channel,merchant);
+            return assemblePayRresultParam(result, order);
+        }else{
+            MsgException.throwException("未知通道");
+        }
+        return null;
+    }
+
+    private MerchantOrder getWxAppOrder(MerchantStore store, MerchantBaseInfo merchant,MerchantChannelStatus channel,JSONObject params) {
+
+        MerchantOrder order = new MerchantOrder();
+        order.setUserImg(params.getString("avatar"));
+        order.setNickName(params.getString("nickName"));
+        order.setOrderType("9");
+        order.setMerchantCode(merchant.getMerchantCode());
+        order.setMerchantName(merchant.getAlias());
+        order.setStoreId(store.getStoreId());
+        order.setStoreName(store.getStoreName());
+        order.setConsumeFee(params.getDouble("payAmt"));
+        order.setCreateDt(new Date());
+        order.setStatus("5");
+        order.setRemark(params.getString("remark"));
+        order.setUpdateTime(new Date());
+        order.setAlias(merchant.getMerchantName());
+        order.setMercOrderNo("ME100"+StringUtil.getBillno());
+        order.setMercUserId(params.getString("userId"));
+        order.setIp("127.0.0.1");
+        String snNo = params.getString("snNo");
+        order.setSnNo(snNo);
+        merchantOrderService.constOrderPayCodeAndName(order,params,channel);
+        merchantCashPlaceService.setOrderPlaceInfo(order,snNo);
+        order.isAllowBankLarge(merchant);
+        BigDecimal rate = merchantRateNewService.getMchRate(merchant.getMerchantCode(), order.getPayTypeCode(), params.getDouble("payAmt"));
+        order.calcRateAndFee(rate);
+        return order;
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/pay/impl/BaseCallbackService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/pay/impl/BaseCallbackService.java
new file mode 100644
index 0000000..a0bf510
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/pay/impl/BaseCallbackService.java
@@ -0,0 +1,307 @@
+package cn.pluss.platform.pay.impl;
+
+
+import cn.pluss.platform.device.DeviceOrderInfoService;
+import cn.pluss.platform.device.MercOrderDetailService;
+import cn.pluss.platform.device.MercOrderNewService;
+import cn.pluss.platform.deviceMerchantBuy.DeviceMerchantBuyService;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.mapper.MerchantBaseInfoMapper;
+import cn.pluss.platform.merchantIncome.MerchantIncomeService;
+import cn.pluss.platform.merchantOrder.MerchantOrderService;
+import cn.pluss.platform.merchantProfit.MerchantProfitService;
+import cn.pluss.platform.notice.NoticeService;
+import cn.pluss.platform.openAccount.OpenAccountRecordService;
+import cn.pluss.platform.pay.PayCallbackService;
+import cn.pluss.platform.systemConfig.SystemConfigService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.userInfo.UserInfoService;
+import cn.pluss.platform.user.impl.GeneralPushUtil;
+import cn.pluss.platform.util.StringUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 聚合一些基本操作
+ * @author SSS
+ */
+@Slf4j
+public abstract class BaseCallbackService implements PayCallbackService {
+
+    @Autowired
+    protected MerchantOrderService moService;
+
+    @Autowired
+    protected MerchantProfitService merchantProfitService;
+
+    @Autowired
+    protected SystemConfigService systemConfigService;
+
+    @Autowired
+    protected MerchantIncomeService merchantIncomeService;
+
+    @Autowired
+    protected UserAppService userAppService;
+
+    @Autowired
+    protected NoticeService noticeService;
+
+    @Autowired
+    protected UserInfoService uiService;
+
+    @Autowired
+    protected DeviceMerchantBuyService deviceMerchantBuyService;
+
+    @Autowired
+    protected DeviceOrderInfoService deviceOrderInfoService;
+
+    @Autowired
+    protected MercOrderNewService monService;
+
+    @Autowired
+    protected MercOrderDetailService modService;
+
+    @Autowired
+    private GeneralPushUtil generalPushUtil;
+
+    @Autowired
+    private OpenAccountRecordService openAccountRecordService;
+
+    @Autowired
+    private MerchantBaseInfoMapper merchantBaseInfoMapper;
+    /**
+     * 升级支付成功回调
+     * @param orderNumber 订单号
+     * @param thirdOrderNumber 通道订单号, 通道方订单号, 随行付、瑞银信、银盛等
+     * @param transNo 支付方订单流水号，通常是、支付宝、微信、云闪付等
+     * @param transDt 交易完成时间
+     * @param allParams 其他
+     */
+    public void upgradeSuccessNotify(String orderNumber, String thirdOrderNumber, String transNo, Date transDt, Map<String, Object> allParams) {
+
+        // MerchantIncome merchantIncome = new MerchantIncome();
+        // merchantIncome.setDealCode(orderNumber);
+        // merchantIncome = merchantIncomeService.queryMerchantIncome(merchantIncome);
+        // merchantIncome.setDealStatus(1);
+        // merchantIncomeService.updateMerchantIncome(merchantIncome);
+        //
+        // UserApp userApp = new UserApp();
+        // userApp.setUserId(merchantIncome.getUserId().longValue());
+        // userApp = userAppService.queryUserApp(userApp);
+        //
+        // String content = "";
+        //
+        // if (userApp == null || userApp.getParentId() == null) {
+        //     return;
+        // }
+        //
+        // UserApp userApp2 = new UserApp();
+        // userApp2.setUserId(userApp.getParentId());
+        // userApp2 = userAppService.queryUserApp(userApp2);
+        //
+        // String userName;
+        //
+        // UserInfo userInfo = new UserInfo();
+        // userInfo.setId(userApp.getUserId());
+        // userInfo = uiService.queryUserInfo(userInfo);
+        // String twoConfigValue = systemConfigService.querySystemConfigValue("twoUpVipAmount");
+        // String threeConfigValue = systemConfigService.querySystemConfigValue("threeUpVipAmount");
+        // userName = userInfo.getLoginName().substring(0, 11);
+        //
+        // userName = StringUtil.isHideMobile(userName);
+        //
+        // MerchantProfit profit = new MerchantProfit();
+        // profit.setUserId(userApp.getParentId());
+        // profit.setMerchantCode("M800202008254990744");
+        // profit.setMerchantName("安象科技公司");
+        // profit.setConsumeFee(merchantIncome.getDealFee());
+        // Double twoVipAmountD = 999.00;
+        // Double twoVipShapeAmtD = 500.00;
+        // Double threeVipAmountD = 9999.00;
+        // Double threeVipShapeAmtD = 5000.00;
+        // if (StringUtil.isNotEmpty(twoConfigValue)) {
+        //     String twoVipAmount = twoConfigValue.split("-")[0];
+        //     String twoVipShapeAmount = twoConfigValue.split("-")[1];
+        //     twoVipAmountD = Double.valueOf(twoVipAmount);
+        //     twoVipShapeAmtD = Double.valueOf(twoVipShapeAmount);
+        // }
+        // if (StringUtil.isNotEmpty(threeConfigValue)) {
+        //     String threeVipAmount = threeConfigValue.split("-")[0];
+        //     String threeVipShapeAmount = threeConfigValue.split("-")[1];
+        //     threeVipAmountD = Double.valueOf(threeVipAmount);
+        //     threeVipShapeAmtD = Double.valueOf(threeVipShapeAmount);
+        // }
+        // if (twoVipAmountD.equals(merchantIncome.getDealFee())) {
+        //     profit.setPrice(twoVipShapeAmtD);
+        //     userApp.setLevel(2);
+        //     content = "您的直接推荐 " + userName + "付费升级v2,收益" + twoVipShapeAmtD + "元";
+        // }
+        // if (threeVipAmountD.equals(merchantIncome.getDealFee())) {
+        //     profit.setPrice(threeVipShapeAmtD);
+        //     userApp.setLevel(3);
+        //     content = "您的直接推荐 " + userName + "付费升级v3,收益" + threeVipShapeAmtD + "元";
+        // }
+        //
+        // profit.setType("4");
+        // profit.setCreateDt(new Date());
+        // profit.setOrderDt(merchantIncome.getCreateTime());
+        // profit.setStatus("1");
+        // profit.setOrderNumber(orderNumber);
+        // merchantProfitService.saveMerchantProfit(profit);
+        // userAppService.updateById(userApp);
+        // List<String> alias = new ArrayList<>();
+        // log.info("=========推送人userId======" + profit.getUserId() + "=========金额=======" + profit.getPrice());
+        // alias.add(profit.getUserId() + "");
+        //
+        // if (userApp2 != null) {
+        //     Notice notice = new Notice(0, 7, userApp2);
+        //     notice.setConrtent(content);
+        //
+        //     noticeService.saveNotice(notice);
+        //     GeneralPushUtil.sendAllPlatByAlias(alias, "升级分润通知", content, "0");
+        // }
+        //
+        // MerchantOrder mOrder = new MerchantOrder().setOrderNumber(orderNumber);
+        // mOrder = moService.getOne(new QueryWrapper<>(mOrder));
+        //
+        // mOrder.setThirdTransNo(thirdOrderNumber);
+        // // 交易付款时间
+        // mOrder.setStatus("1");
+        // mOrder.setTransDt(transDt);
+        // mOrder.setTransNo(transNo);
+        // Object profitAmt = profit.getPrice();
+        // if(StringUtil.isNotEmpty(profitAmt)){
+        //     mOrder.setProfitShareMoney(Double.valueOf(profitAmt.toString()));
+        // }
+        // moService.updateById(mOrder);
+
+        // ================== 以上是老的升级逻辑 ================
+        MerchantOrder mo = moService.getLockByOrderNumber(orderNumber);
+        MerchantIncome merchantIncome = new MerchantIncome();
+        merchantIncome.setDealCode(orderNumber);
+        merchantIncome = merchantIncomeService.queryMerchantIncome(merchantIncome);
+        merchantIncome.setDealStatus(1);
+        merchantIncomeService.updateMerchantIncome(merchantIncome);
+
+        UserApp userApp = new UserApp();
+        userApp.setUserId(merchantIncome.getUserId().longValue());
+        userApp = userAppService.queryUserApp(userApp);
+
+        String content = "";
+
+        if (userApp == null || userApp.getParentId() == null) {
+            return;
+        }
+
+        UserApp userApp2 = new UserApp();
+        userApp2.setUserId(userApp.getParentId());
+        userApp2 = userAppService.queryUserApp(userApp2);
+
+        String userName;
+
+        UserInfo userInfo = new UserInfo();
+        userInfo.setId(userApp.getUserId());
+        userInfo = uiService.queryUserInfo(userInfo);
+        userName = userInfo.getLoginName().substring(0, 11);
+
+        userName = StringUtil.isHideMobile(userName);
+
+        MerchantProfit profit = new MerchantProfit();
+        profit.setUserId(userApp.getParentId());
+        profit.setMerchantCode("M800202008254990744");
+        profit.setMerchantName("安象科技公司");
+        profit.setConsumeFee(merchantIncome.getDealFee());
+
+        // "分润金额合计为-" + targetProfit.toPlainString() + "-" + "从-" + currentLevelNum + "-升到-" + targetLevelNum
+        String[] split = mo.getRemark().split("-");
+        double profitData = Double.parseDouble(split[1]);
+        profit.setPrice(profitData);
+        userApp.setLevelCode("LV" + split[5]);
+        content = "您的直接推荐 " + userName + "付费升级到VIP" + split[5] + ", 收益" + profitData + "元";
+
+        profit.setType("4");
+        profit.setCreateDt(new Date());
+        profit.setOrderDt(merchantIncome.getCreateTime());
+        profit.setStatus("1");
+        profit.setOrderNumber(orderNumber);
+        merchantProfitService.saveMerchantProfit(profit);
+        userAppService.updateById(userApp);
+        List<String> alias = new ArrayList<>();
+        log.info("=========推送人userId======" + profit.getUserId() + "=========金额=======" + profit.getPrice());
+        alias.add(profit.getUserId() + "");
+
+        if (userApp2 != null) {
+            Notice notice = new Notice(0, 7, userApp2);
+            notice.setConrtent(content);
+
+            noticeService.saveNotice(notice);
+            generalPushUtil.sendAllPlatByAlias(alias, "升级分润通知", content, "0");
+        }
+
+        MerchantOrder mOrder = new MerchantOrder().setOrderNumber(orderNumber);
+        mOrder = moService.getOne(new QueryWrapper<>(mOrder));
+
+        mOrder.setThirdTransNo(thirdOrderNumber);
+        // 交易付款时间
+        mOrder.setStatus("1");
+        mOrder.setTransDt(transDt);
+        mOrder.setTransNo(transNo);
+        Object profitAmt = profit.getPrice();
+        if(StringUtil.isNotEmpty(profitAmt)){
+            mOrder.setProfitShareMoney(Double.valueOf(profitAmt.toString()));
+        }
+        moService.updateById(mOrder);
+    }
+
+    /**
+     * 升级支付成功回调
+     * @param orderNumber 订单号
+     * @param thirdOrderNumber 通道订单号, 通道方订单号, 随行付、瑞银信、银盛等
+     * @param transNo 支付方订单流水号，通常是、支付宝、微信、云闪付等
+     * @param transDt 交易完成时间
+     * @param allParams 其他
+     */
+    public void devicePaySuccessNotify(String orderNumber, String thirdOrderNumber, String transNo, Date transDt, Map<String, Object> allParams) {
+        DeviceMerchantBuy deviceMerchantBuy = new DeviceMerchantBuy();
+        deviceMerchantBuy.setOrderNo(orderNumber);
+        deviceMerchantBuy = deviceMerchantBuyService.queryDeviceMerchantBuy(deviceMerchantBuy);
+
+        if (deviceMerchantBuy == null) {
+            return;
+        }
+
+        if ("1".equals(deviceMerchantBuy.getStatus())) {
+            return;
+        }
+
+        deviceMerchantBuy.setStatus("1");
+        deviceMerchantBuy.setTransNo(transNo);
+        deviceMerchantBuy.setTransDt(transDt);
+        deviceMerchantBuyService.updateDeviceMerchantBuy(deviceMerchantBuy);
+
+        DeviceOrderInfo deviceOrderInfo = new DeviceOrderInfo();
+        deviceOrderInfo.setOrderNo(orderNumber);
+        deviceOrderInfo = deviceOrderInfoService.getOne(new QueryWrapper<>(deviceOrderInfo));
+        deviceOrderInfo.setTransNo(transNo);
+        deviceOrderInfo.setUpdateTime(new Date());
+        deviceOrderInfo.setStatus("1");
+        deviceOrderInfoService.updateById(deviceOrderInfo);
+
+        
+        //TODO 兼容ios版本落后 iso版本更新后删除该代码
+        String merchantCode = deviceMerchantBuy.getMerchantCode();
+        if(StringUtil.isNotEmpty(merchantCode)){
+            MerchantBaseInfo merchant = merchantBaseInfoMapper.queryByMerchantCode(merchantCode);
+            if(merchant != null){
+                openAccountRecordService.operatAccountOpen(deviceMerchantBuy,merchant,deviceOrderInfo);
+            }
+        }
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/payAreaRyx/PayAreaRyxService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/payAreaRyx/PayAreaRyxService.java
new file mode 100644
index 0000000..725f5dc
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/payAreaRyx/PayAreaRyxService.java
@@ -0,0 +1,25 @@
+package cn.pluss.platform.payAreaRyx;
+
+import cn.pluss.platform.entity.PayAreaRyx;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author bzg
+ * @since 2022-02-23
+ */
+public interface PayAreaRyxService extends IService<PayAreaRyx> {
+
+    /**
+     * 转换区域信息
+     * @date: 2022/2/23 16:17
+     * @param province:
+     * @param city:
+     * @param area:
+     * @return cn.pluss.platform.entity.PayAreaRyx
+     */
+    PayAreaRyx getByArea(String province, String city, String area);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/payAreaRyx/impl/PayAreaRyxServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/payAreaRyx/impl/PayAreaRyxServiceImpl.java
new file mode 100644
index 0000000..2136f60
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/payAreaRyx/impl/PayAreaRyxServiceImpl.java
@@ -0,0 +1,28 @@
+package cn.pluss.platform.payAreaRyx.impl;
+
+import cn.pluss.platform.entity.PayAreaRyx;
+import cn.pluss.platform.mapper.PayAreaRyxMapper;
+import cn.pluss.platform.payAreaRyx.PayAreaRyxService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author bzg
+ * @since 2022-02-23
+ */
+@Service
+public class PayAreaRyxServiceImpl extends ServiceImpl<PayAreaRyxMapper, PayAreaRyx> implements PayAreaRyxService {
+
+
+    @Override
+    public PayAreaRyx getByArea(String province, String city, String area) {
+        QueryWrapper<PayAreaRyx> queryWrapper = new QueryWrapper<PayAreaRyx>()
+                .eq("province",province).eq("city",city).eq("area",area).last(" limit 1 ");
+        return baseMapper.selectOne(queryWrapper);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/phoneValidateCode/PhoneValidateCodeService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/phoneValidateCode/PhoneValidateCodeService.java
new file mode 100644
index 0000000..91dd782
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/phoneValidateCode/PhoneValidateCodeService.java
@@ -0,0 +1,38 @@
+package cn.pluss.platform.phoneValidateCode;
+
+import cn.pluss.platform.entity.PhoneValidateCode;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+import java.util.Map;
+
+public interface PhoneValidateCodeService extends IService<PhoneValidateCode> {
+
+    PhoneValidateCode queryPhoneValidateCode(PhoneValidateCode phoneValidateCode);
+
+    List<PhoneValidateCode> queryPhoneValidateCodeList(PhoneValidateCode phoneValidateCode);
+
+    void savePhoneValidateCode(PhoneValidateCode phoneValidateCode);
+
+    void updatePhoneValidateCode(PhoneValidateCode phoneValidateCode);
+
+    void deletePhoneValidateCode(PhoneValidateCode phoneValidateCode);
+
+    List<PhoneValidateCode> queryPhoneValidateCodePage(Map map);
+
+    Integer queryPhoneValidateCodePageCount(Map map);
+
+    /**
+     * 保存验证码，若已存在验证码，则更新对应的验证码信息
+     * @param phoneValidateCode 前端传过来的验证码信息
+     */
+    void saveOrReplaceIfExist(PhoneValidateCode phoneValidateCode);
+
+    /**
+     * 校验短信验证码
+     * @param phone
+     * @param verifyCode
+     */
+    void checkSmsVerifyCode(String phone, String verifyCode);
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/phoneValidateCode/impl/PhoneValidateCodeServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/phoneValidateCode/impl/PhoneValidateCodeServiceImpl.java
new file mode 100644
index 0000000..965bf63
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/phoneValidateCode/impl/PhoneValidateCodeServiceImpl.java
@@ -0,0 +1,90 @@
+package cn.pluss.platform.phoneValidateCode.impl;
+
+import cn.pluss.platform.entity.PhoneValidateCode;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.PhoneValidateCodeMapper;
+import cn.pluss.platform.phoneValidateCode.PhoneValidateCodeService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@Transactional
+@Service("phoneValidateCodeService")
+public class PhoneValidateCodeServiceImpl extends ServiceImpl<PhoneValidateCodeMapper, PhoneValidateCode> implements PhoneValidateCodeService {
+
+    @Resource
+    private PhoneValidateCodeMapper phoneValidateCodeMapper;
+
+    @Override
+    public PhoneValidateCode queryPhoneValidateCode(PhoneValidateCode phoneValidateCode) {
+        return phoneValidateCodeMapper.queryPhoneValidateCode(phoneValidateCode);
+    }
+
+    @Override
+    public List<PhoneValidateCode> queryPhoneValidateCodeList(PhoneValidateCode phoneValidateCode) {
+        return phoneValidateCodeMapper.queryPhoneValidateCodeList(phoneValidateCode);
+    }
+
+    @Override
+    public void savePhoneValidateCode(PhoneValidateCode phoneValidateCode) {
+        phoneValidateCodeMapper.savePhoneValidateCode(phoneValidateCode);
+    }
+
+    @Override
+    public void updatePhoneValidateCode(PhoneValidateCode phoneValidateCode) {
+        phoneValidateCodeMapper.updatePhoneValidateCode(phoneValidateCode);
+    }
+
+    @Override
+    public void deletePhoneValidateCode(PhoneValidateCode phoneValidateCode) {
+        phoneValidateCodeMapper.deletePhoneValidateCode(phoneValidateCode);
+    }
+
+    @Override
+    public List<PhoneValidateCode> queryPhoneValidateCodePage(Map map) {
+        return phoneValidateCodeMapper.queryPhoneValidateCodePage(map);
+    }
+
+    @Override
+    public Integer queryPhoneValidateCodePageCount(Map map) {
+        return phoneValidateCodeMapper.queryPhoneValidateCodePageCount(map);
+    }
+
+    @Override
+    public void saveOrReplaceIfExist(PhoneValidateCode phoneValidateCode) {
+        //根据当前手机号查询当前手机号是否有验证码信息
+        PhoneValidateCode queryPhoneValidateCode = new PhoneValidateCode();
+        queryPhoneValidateCode.setPhone(phoneValidateCode.getPhone());
+        List<PhoneValidateCode> queryPhoneValidateCodes = queryPhoneValidateCodeList(queryPhoneValidateCode);
+        if (queryPhoneValidateCodes.size() > 0) {
+            phoneValidateCode.setId(queryPhoneValidateCodes.get(0).getId());
+            phoneValidateCode.setSendDt(new Date());
+            updatePhoneValidateCode(phoneValidateCode);
+        } else {
+            phoneValidateCode.setSendDt(new Date());
+            savePhoneValidateCode(phoneValidateCode);
+        }
+    }
+
+    @Override
+    public void checkSmsVerifyCode(String phone, String verifyCode) {
+        MsgException.checkNull(phone,"手机号不能为空");
+        MsgException.checkNull(verifyCode,"验证码不能为空");
+        PhoneValidateCode validateCode = new PhoneValidateCode();
+        validateCode.setPhone(phone);
+        PhoneValidateCode querResult = queryPhoneValidateCode(validateCode);
+        if(querResult == null){
+            MsgException.throwException("手机号有误或验证码已过期！");
+        }
+        if(!querResult.getCode().equals(verifyCode)){
+            MsgException.throwException("短信验证码有误！");
+        }
+        deletePhoneValidateCode(validateCode);
+    }
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/platformData/PlatformDataService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/platformData/PlatformDataService.java
new file mode 100644
index 0000000..88317b7
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/platformData/PlatformDataService.java
@@ -0,0 +1,44 @@
+package cn.pluss.platform.platformData;
+
+import cn.pluss.platform.entity.PlatformData;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 首页数据统计表 服务类
+ * </p>
+ *
+ * @author bzg
+ * @since 2021-10-20
+ */
+public interface PlatformDataService extends IService<PlatformData> {
+    /**
+     * @description:统计首页数据
+     * @date: 2021/10/20 15:34
+     * @return PlatformData
+     */
+    PlatformData getYestDayPlatformData();
+    /**
+     * @description:获得昨日退款数据
+     * @date: 2021/10/20 15:49
+     * @return cn.pluss.platform.entity.PlatformData
+     */
+    PlatformData getYestDayPlatformRefundData();
+
+    /**
+     * @description:获取昨日新增数据
+     * @date: 2021/10/20 15:54
+     * @return cn.pluss.platform.entity.PlatformData
+     */
+    PlatformData getYestDayPlatformAddData();
+
+
+    PlatformData censusPlatformData();
+
+    List<Map<String, Object>> getChartTransCountData();
+
+    List<Map<String, Object>> getChartChannelCountData();
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/platformData/impl/PlatformDataServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/platformData/impl/PlatformDataServiceImpl.java
new file mode 100644
index 0000000..df3ecfb
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/platformData/impl/PlatformDataServiceImpl.java
@@ -0,0 +1,95 @@
+package cn.pluss.platform.platformData.impl;
+
+import cn.pluss.platform.entity.PlatformData;
+import cn.pluss.platform.mapper.PlatformDataMapper;
+import cn.pluss.platform.platformData.PlatformDataService;
+import cn.pluss.platform.util.DateUtils;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 首页数据统计表 服务实现类
+ * </p>
+ *
+ * @author bzg
+ * @since 2021-10-20
+ */
+@Service
+public class PlatformDataServiceImpl extends ServiceImpl<PlatformDataMapper, PlatformData> implements PlatformDataService {
+
+
+    /**
+     * @description:统计首页数据
+     * @date: 2021/10/20 15:36
+     * @return PlatformData
+     */
+    @Override
+    public PlatformData getYestDayPlatformData() {
+        return baseMapper.getYestDayPlatformData();
+    }
+
+    /**
+     * @description:获得昨日退款数据
+     * @date: 2021/10/20 15:49
+     * @return cn.pluss.platform.entity.PlatformData
+     */
+    @Override
+    public PlatformData getYestDayPlatformRefundData() {
+        return baseMapper.getYestDayPlatformRefundData();
+    }
+
+    /**
+     * @description:获取昨日新增数据
+     * @date: 2021/10/20 15:54
+     * @return cn.pluss.platform.entity.PlatformData
+     */
+    @Override
+    public PlatformData getYestDayPlatformAddData() {
+        return baseMapper.getYestDayPlatformAddData();
+    }
+
+    @Override
+    public PlatformData censusPlatformData() {
+        Date frontDate = DateUtils.add(Calendar.DAY_OF_MONTH, DateUtils.currentDate(), -1);
+        String frontStr = DateUtils.toString(frontDate);
+        QueryWrapper<PlatformData> queryWrapper = new QueryWrapper<PlatformData>().eq("operatDate",frontStr);
+        PlatformData data = baseMapper.selectOne(queryWrapper);
+        if(data != null){
+            return data;
+        }
+        PlatformData oData = baseMapper.getYestDayPlatformData();
+        PlatformData rData = baseMapper.getYestDayPlatformRefundData();
+        PlatformData aData = baseMapper.getYestDayPlatformAddData();
+        BigDecimal actualAmt = oData.getProfitAmt().subtract(oData.getShareAmt()).subtract(oData.getFansAmt()).setScale(2, RoundingMode.HALF_UP);
+        oData.setActualAmt(actualAmt);
+        oData.setRefundAmt(rData.getRefundAmt());
+        oData.setAliRefundAmt(rData.getAliRefundAmt());
+        oData.setWxRefundAmt(rData.getWxRefundAmt());
+        oData.setYsfRefundAmt(rData.getYsfRefundAmt());
+        oData.setPromoterNum(aData.getPromoterNum());
+        oData.setMemberNum(aData.getMemberNum());
+        oData.setStoreNum(aData.getStoreNum());
+        oData.setOperatDate(frontStr);
+        baseMapper.insert(oData);
+        return oData;
+    }
+
+    @Override
+    public List<Map<String, Object>> getChartTransCountData() {
+        return baseMapper.getChartTransCountData();
+    }
+
+    @Override
+    public List<Map<String, Object>> getChartChannelCountData() {
+        return baseMapper.getChartChannelCountData();
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/postageConfig/PostageConfigService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/postageConfig/PostageConfigService.java
new file mode 100644
index 0000000..c78b244
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/postageConfig/PostageConfigService.java
@@ -0,0 +1,26 @@
+package cn.pluss.platform.postageConfig;
+
+import cn.pluss.platform.entity.PostageConfig;
+import cn.pluss.platform.entity.UserAddress;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 邮费信息配置表 服务类
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-03-29
+ */
+public interface PostageConfigService extends IService<PostageConfig> {
+
+    /**
+     * 根据地址id获取
+     * @param address
+     * @param weight
+     * @return
+     */
+    BigDecimal getGoodPostageInfo(UserAddress address, BigDecimal weight);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/postageConfig/impl/PostageConfigServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/postageConfig/impl/PostageConfigServiceImpl.java
new file mode 100644
index 0000000..f0c0d23
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/postageConfig/impl/PostageConfigServiceImpl.java
@@ -0,0 +1,52 @@
+package cn.pluss.platform.postageConfig.impl;
+
+import cn.pluss.platform.entity.PostageConfig;
+import cn.pluss.platform.entity.UserAddress;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.PostageConfigMapper;
+import cn.pluss.platform.postageConfig.PostageConfigService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 邮费信息配置表 服务实现类
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-03-29
+ */
+@Service
+public class PostageConfigServiceImpl extends ServiceImpl<PostageConfigMapper, PostageConfig> implements PostageConfigService {
+
+    /**
+     * 根据地址和总量获取商品邮费
+     * @param address
+     * @param weight
+     * @return
+     */
+    @Override
+    public BigDecimal getGoodPostageInfo(UserAddress address, BigDecimal weight) {
+        MsgException.checkNull(weight,"重量信息异常");
+        BigDecimal postage = BigDecimal.ZERO;
+        //省
+        String areaCode = address.getAreaCode().split("-")[0];
+        PostageConfig config = baseMapper.getPostageByArea(areaCode,PostageConfig.STATUS_YES);
+        if(config == null){
+            return postage;
+        }
+        postage = postage.add(config.getFirstWeight());
+        if(weight.compareTo(PostageConfig.WEIGHT_UNIT) <= 0){
+            return postage;
+        }else{
+            weight = weight.subtract(PostageConfig.WEIGHT_UNIT);
+            //向上取整
+            Integer nextW = weight.setScale( 0, BigDecimal.ROUND_UP).intValue();
+            BigDecimal nextPostage = config.getNextWeight().multiply(BigDecimal.valueOf(nextW));
+            postage = postage.add(nextPostage).setScale(2,BigDecimal.ROUND_HALF_UP);
+        }
+        return postage;
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/province/ProvinceService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/province/ProvinceService.java
new file mode 100644
index 0000000..f3598a4
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/province/ProvinceService.java
@@ -0,0 +1,27 @@
+package cn.pluss.platform.province;
+
+import java.util.List;
+import java.util.Map;
+
+import cn.pluss.platform.entity.Province;
+import cn.pluss.platform.leshua.LeshuaProvince;
+
+public interface ProvinceService {
+
+    public LeshuaProvince queryProvince(Province province);
+
+    public List<LeshuaProvince> queryProvinceList(Province province);
+
+    public void saveProvince(Province province);
+
+    public void updateProvince(Province province);
+
+    public void deleteProvince(Province province);
+
+    public List<LeshuaProvince> queryProvincePage(Map map);
+
+    public Integer queryProvincePageCount(Map map);
+
+    public void saveProvinceBatch(List<Province> provinceList);
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/province/impl/ProvinceServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/province/impl/ProvinceServiceImpl.java
new file mode 100644
index 0000000..d753d51
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/province/impl/ProvinceServiceImpl.java
@@ -0,0 +1,60 @@
+package cn.pluss.platform.province.impl;
+
+import java.util.List;
+import java.util.Map;
+import org.springframework.transaction.annotation.Transactional;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import cn.pluss.platform.entity.Province;
+import cn.pluss.platform.leshua.LeshuaProvince;
+import cn.pluss.platform.province.ProvinceService;
+import cn.pluss.platform.mapper.ProvinceMapper;
+
+@Transactional
+@Service("provinceService")
+public class ProvinceServiceImpl  implements ProvinceService{
+
+	 private static final Logger logger = LoggerFactory.getLogger( ProvinceServiceImpl.class);
+
+
+    @Autowired
+	  private ProvinceMapper provinceMapper;
+
+    @Override
+    public LeshuaProvince queryProvince(Province province){
+        return provinceMapper.queryProvince(province);
+    }
+
+    @Override
+    public List<LeshuaProvince> queryProvinceList(Province province){
+        return provinceMapper.queryProvinceList(province);
+    }
+    @Override
+    public void saveProvince(Province province){
+          provinceMapper.saveProvince(province);
+    }
+    @Override
+    public void updateProvince(Province province){
+        provinceMapper.updateProvince(province);
+    }
+    @Override
+    public void deleteProvince(Province province){
+        provinceMapper.deleteProvince(province);
+    }
+    @Override
+    public List<LeshuaProvince> queryProvincePage(Map map){
+        return provinceMapper.queryProvincePage(map);
+    }
+    @Override
+    public Integer queryProvincePageCount(Map map){
+        return provinceMapper.queryProvincePageCount(map);
+    }
+    @Override
+    public void saveProvinceBatch(List<Province> provinceList) {
+         provinceMapper.saveProvinceBatch(provinceList);
+    }
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/qrCode/QrCodeService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/qrCode/QrCodeService.java
new file mode 100644
index 0000000..57679c4
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/qrCode/QrCodeService.java
@@ -0,0 +1,27 @@
+package cn.pluss.platform.qrCode;
+
+import cn.pluss.platform.entity.QrCode;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+import java.util.Map;
+
+
+public interface QrCodeService extends IService<QrCode> {
+
+    void saveQrCode(QrCode qrCode);
+
+    void batchSaveQrCode(List<QrCode> qrCode);
+
+    void updateQrCode(QrCode qrCode);
+
+    List<QrCode> queryQrCodePage(Map map);
+
+    Integer queryQrCodePageCount(Map map);
+
+    QrCode getQrCodeByQrNo(String qrNo);
+
+    void deleteQrCodeByIds(String[] ids);
+
+    Integer checkQrNo(List<String> checkQrNo);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/qrCode/impl/QrCodeServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/qrCode/impl/QrCodeServiceImpl.java
new file mode 100644
index 0000000..6b9512b
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/qrCode/impl/QrCodeServiceImpl.java
@@ -0,0 +1,54 @@
+package cn.pluss.platform.qrCode.impl;
+
+import cn.pluss.platform.entity.QrCode;
+import cn.pluss.platform.mapper.QrCodeMapper;
+import cn.pluss.platform.qrCode.QrCodeService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+@Service("qrcodeService")
+public class QrCodeServiceImpl extends ServiceImpl<QrCodeMapper, QrCode> implements QrCodeService {
+
+    @Override
+    public void saveQrCode(QrCode qrCode) {
+        baseMapper.saveQrCode(qrCode);
+    }
+
+    @Override
+    public void batchSaveQrCode(List<QrCode> qrCode) {
+        baseMapper.batchSaveQrCode(qrCode);
+    }
+
+    @Override
+    public void updateQrCode(QrCode qrCode) {
+        baseMapper.updateQrCode(qrCode);
+    }
+
+    @Override
+    public List<QrCode> queryQrCodePage(Map map) {
+        return baseMapper.queryQrCodePage(map);
+    }
+
+    @Override
+    public Integer queryQrCodePageCount(Map map) {
+        return baseMapper.queryQrCodePageCount(map);
+    }
+
+    @Override
+    public QrCode getQrCodeByQrNo(String qrNo) {
+        return baseMapper.getQrCodeByQrNo(qrNo);
+    }
+
+    @Override
+    public void deleteQrCodeByIds(String[] ids) {
+        baseMapper.deleteQrCodeByIds(ids);
+    }
+
+    @Override
+    public Integer checkQrNo(List<String> checkQrNo) {
+        return baseMapper.checkQrNo(checkQrNo);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/questionsAnswers/QuestionsAnswersService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/questionsAnswers/QuestionsAnswersService.java
new file mode 100644
index 0000000..517d4ac
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/questionsAnswers/QuestionsAnswersService.java
@@ -0,0 +1,28 @@
+package cn.pluss.platform.questionsAnswers;
+
+import java.util.List;
+import java.util.Map;
+import cn.pluss.platform.entity.QuestionsAnswers;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+public interface QuestionsAnswersService extends IService<QuestionsAnswers> {
+
+    public QuestionsAnswers queryQuestionsAnswers(QuestionsAnswers questionsAnswers);
+
+    public List<QuestionsAnswers> queryQuestionsAnswersList(QuestionsAnswers questionsAnswers);
+
+    public void saveQuestionsAnswers(QuestionsAnswers questionsAnswers);
+
+    public void updateQuestionsAnswers(QuestionsAnswers questionsAnswers);
+
+    public void deleteQuestionsAnswers(QuestionsAnswers questionsAnswers);
+
+    public List<QuestionsAnswers> queryQuestionsAnswersPage(Map map);
+    
+    public List<QuestionsAnswers> queryQuestionsAnswersOrderByIDPage(Map map);
+
+    public Integer queryQuestionsAnswersPageCount(Map map);
+
+    public void saveQuestionsAnswersBatch(List<QuestionsAnswers> questionsAnswersList);
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/questionsAnswers/impl/QuestionsAnswersServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/questionsAnswers/impl/QuestionsAnswersServiceImpl.java
new file mode 100644
index 0000000..4fe66c6
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/questionsAnswers/impl/QuestionsAnswersServiceImpl.java
@@ -0,0 +1,65 @@
+package cn.pluss.platform.questionsAnswers.impl;
+
+import java.util.List;
+import java.util.Map;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import cn.pluss.platform.entity.QuestionsAnswers;
+import cn.pluss.platform.questionsAnswers.QuestionsAnswersService;
+import cn.pluss.platform.mapper.QuestionsAnswersMapper;
+
+@Transactional
+@Service("questionsAnswersService")
+public class QuestionsAnswersServiceImpl extends ServiceImpl<QuestionsAnswersMapper,QuestionsAnswers> implements QuestionsAnswersService{
+
+	 private static final Logger logger = LoggerFactory.getLogger( QuestionsAnswersServiceImpl.class);
+
+
+    @Autowired
+	  private QuestionsAnswersMapper questionsAnswersMapper;
+
+    @Override
+    public QuestionsAnswers queryQuestionsAnswers(QuestionsAnswers questionsAnswers){
+        return questionsAnswersMapper.queryQuestionsAnswers(questionsAnswers);
+    }
+
+    @Override
+    public List<QuestionsAnswers> queryQuestionsAnswersList(QuestionsAnswers questionsAnswers){
+        return questionsAnswersMapper.queryQuestionsAnswersList(questionsAnswers);
+    }
+    @Override
+    public void saveQuestionsAnswers(QuestionsAnswers questionsAnswers){
+          questionsAnswersMapper.saveQuestionsAnswers(questionsAnswers);
+    }
+    @Override
+    public void updateQuestionsAnswers(QuestionsAnswers questionsAnswers){
+        questionsAnswersMapper.updateQuestionsAnswers(questionsAnswers);
+    }
+    @Override
+    public void deleteQuestionsAnswers(QuestionsAnswers questionsAnswers){
+        questionsAnswersMapper.deleteQuestionsAnswers(questionsAnswers);
+    }
+    @Override
+    public List<QuestionsAnswers> queryQuestionsAnswersPage(Map map){
+        return questionsAnswersMapper.queryQuestionsAnswersPage(map);
+    }
+    @Override
+    public Integer queryQuestionsAnswersPageCount(Map map){
+        return questionsAnswersMapper.queryQuestionsAnswersPageCount(map);
+    }
+    @Override
+    public void saveQuestionsAnswersBatch(List<QuestionsAnswers> questionsAnswersList) {
+         questionsAnswersMapper.saveQuestionsAnswersBatch(questionsAnswersList);
+    }
+
+	@Override
+	public List<QuestionsAnswers> queryQuestionsAnswersOrderByIDPage(Map map) {
+		return questionsAnswersMapper.queryQuestionsAnswersOrderByIDPage(map);
+	}
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/realFans/RealFansService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/realFans/RealFansService.java
new file mode 100644
index 0000000..b1d845f
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/realFans/RealFansService.java
@@ -0,0 +1,52 @@
+package cn.pluss.platform.realFans;
+
+
+import cn.pluss.platform.entity.MerchantOrder;
+import cn.pluss.platform.entity.RealFans;
+import cn.pluss.platform.vo.MerchantOrderVO;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.math.BigDecimal;
+
+public interface RealFansService extends IService<RealFans> {
+
+//    void saveRealFansAndFansConsSumRecords(Map<String, Object> map);
+
+//    /**
+//     * 创建分润
+//     * @param order
+//     */
+//    void  createProfit(MerchantOrder order);
+
+    /**
+     * 去除分润
+     * @param
+     */
+    void removeProfit(String orderNumber);
+
+    /**
+     * @description:去除分润
+     * @date: 2021/11/22 15:36
+     * @param order:
+     *
+     */
+    void removeProfit(MerchantOrder order, BigDecimal refundAmt,BigDecimal useRefundAmt);
+
+    /**
+     * 分页查询
+     * @param page
+     * @param realFans
+     * @return
+     */
+    Page<RealFans> pageData(Page<RealFans> page, RealFans realFans);
+
+
+    /**
+     * @description:创建粉丝分润
+     * @date: 2021/8/19 17:23
+     * @param order:
+     */
+    void createFansProfit(MerchantOrder order);
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/realFans/impl/RealFansServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/realFans/impl/RealFansServiceImpl.java
new file mode 100644
index 0000000..9426862
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/realFans/impl/RealFansServiceImpl.java
@@ -0,0 +1,175 @@
+package cn.pluss.platform.realFans.impl;
+
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.fans.FansService;
+import cn.pluss.platform.mapper.*;
+import cn.pluss.platform.merchantOrder.MerchantOrderService;
+import cn.pluss.platform.merchantProfit.MerchantProfitService;
+import cn.pluss.platform.notice.NoticeService;
+import cn.pluss.platform.realFans.RealFansService;
+import cn.pluss.platform.user.impl.GeneralPushUtil;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.userIntegral.UserIntegralService;
+import cn.pluss.platform.util.*;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.*;
+
+@RequiredArgsConstructor
+@Slf4j
+@Service
+public class RealFansServiceImpl extends ServiceImpl<RealFansMapper, RealFans> implements RealFansService {
+
+    private final FansService fansService;
+    private final MerchantBaseInfoMapper merchantBaseInfoMapper;
+    private final UserAppService userAppService;
+    private final NoticeService noticeService;
+    private final MerchantOrderService merchantOrderService;
+    private final MerchantProfitService merchantProfitService;
+    private final UserIntegralService userIntegralService;
+
+    @Autowired
+    private GeneralPushUtil generalPushUtil;
+
+    @Override
+    public void removeProfit(String orderNumber) {
+        log.info("去除分润开始,订单编号：{}<==========================",orderNumber);
+        //TODO 去除推广分润
+        QueryWrapper<MerchantProfit> queryWrapper = new QueryWrapper<MerchantProfit>();
+        queryWrapper.eq("orderNumber",orderNumber);
+        merchantProfitService.remove(queryWrapper);
+        //TODO 去除粉丝分润
+        Fans fans = new Fans();
+        fans.setOrderNumber(orderNumber);
+        List<Fans> fansList = fansService.queryFansList(fans);
+        if(!fansList.isEmpty()){
+            Fans fansInfo = fansList.get(0);
+            fansInfo.setShareMoney("0.00");
+            fansService.updateFans(fansInfo);
+        }
+        UpdateWrapper<MerchantOrder> updateWrapper = new UpdateWrapper<MerchantOrder>()
+                .set("fansShareMoney",0)
+                .set("profitShareMoney",0)
+                .eq("orderNumber",orderNumber);
+        merchantOrderService.update(updateWrapper);
+        //删除积分
+        QueryWrapper<UserIntegral> integralWrapper = new QueryWrapper<UserIntegral>();
+        integralWrapper.eq("orderNumber",orderNumber);
+        userIntegralService.remove(integralWrapper);
+        log.info("======================>去除分润分润结束<==========================");
+    }
+
+    @Override
+    public void removeProfit(MerchantOrder order, BigDecimal refundAmt,BigDecimal useRefundAmt) {
+        BigDecimal consumeFee = BigDecimal.valueOf(order.getConsumeFee());
+        if(refundAmt.compareTo(consumeFee) == 0){
+            removeProfit(order.getOrderNumber());
+        }else{
+            QueryWrapper<MerchantProfit> queryWrapper = new QueryWrapper<MerchantProfit>();
+            queryWrapper.eq("orderNumber",order.getOrderNumber());
+            merchantProfitService.remove(queryWrapper);
+            BigDecimal fee = consumeFee.subtract(refundAmt).subtract(useRefundAmt);
+            order.setConsumeFee(fee.doubleValue());
+            merchantProfitService.createOrderProfitV2(order,"1");
+        }
+    }
+
+    @Override
+    public Page<RealFans> pageData(Page<RealFans> page, RealFans realFans) {
+        return baseMapper.pageData(page,realFans);
+    }
+
+    /**
+     * @description:创建粉丝分润
+     * @date: 2021/8/19 17:24
+     * @param order:
+     */
+    @Override
+    public void createFansProfit(MerchantOrder order) {
+        log.info("【粉丝分润计算】创建粉丝分润开始，待创建粉丝分润的订单号为:{},订单类型为：{}",order.getOrderNumber(),order.getOrderType());
+        if(StringUtil.isNotEmpty(order.getMercUserId())){
+            if("2".equals(order.getOrderType()) || "7".equals(order.getOrderType()) || "9".equals(order.getOrderType()) || "10".equals(order.getOrderType())){
+                //插入粉丝和消费记录
+                insertRealFansAndFans(order);
+            }
+            log.info("【粉丝分润计算】创建粉丝分润结束，订单号为:{}的订单分润创建成功！",order.getOrderNumber());
+        }else{
+            log.info("【粉丝分润计算】创建粉丝分润结束，订单号为:{}的订单mercUserId为空创建失败！",order.getOrderNumber());
+        }
+    }
+    /**
+     * @description:插入粉丝分润
+     * @date: 2021/8/23 14:08
+     * @param order:
+     */
+    private void insertRealFansAndFans(MerchantOrder order) {
+        List<RealFans> realFansList = baseMapper.queryBySoleId(order.getMercUserId());
+        if (realFansList.isEmpty()) {
+            RealFans realFans = order.convertRealFans();
+            baseMapper.insert(realFans);
+            insertFans(order);
+        }else{
+            Fans f = fansService.getByLockOrderNumber(order.getOrderNumber());
+            if(f == null){
+                Fans lastFans = fansService.queryLastFansByUserId(order.getMercUserId());
+                Fans fans = new Fans();
+                fans.convert(order);
+                if (lastFans!= null && StringUtil.isNotEmpty(lastFans.getConsumTime())
+                        && DateUtils.differentDaysByHours(lastFans.getConsumTime(),DateUtils.currentDate()) < 24
+                        && !order.getMerchantCode().equals(lastFans.getMerchantCode())) {
+                    // 说明有上次的记录并且上次消费时间跟本次消费是在同一天 本次消费给上一次消费的商家分润
+                    fans.setLastconsumTime(lastFans.getConsumTime());
+                    if (StringUtil.isNotEmpty(lastFans.getMerchantCode())) {
+                        fans.setLastMerchantCode(lastFans.getMerchantCode());
+                    }
+                    if (StringUtil.isNotEmpty(lastFans.getOrderNumber())) {
+                        fans.setLastOrderNumber(lastFans.getOrderNumber());
+                    }
+                    String lastMerchantCode = fans.getLastMerchantCode();
+                    MerchantBaseInfo merchantBaseInfo = merchantBaseInfoMapper.queryByMerchantCode(lastMerchantCode);
+                    if (StringUtil.isNotEmpty(lastMerchantCode)) {
+                        String userId = merchantBaseInfo.getUserId();// 当前商户的userId
+                        UserApp userApp = new UserApp();
+                        userApp.setUserId(Long.parseLong(userId));
+                        if (StringUtil.isNotEmpty(userId)) {
+                            userApp = userAppService.queryUserApp(userApp);// 当前商户的信息
+                            if (Double.parseDouble(fans.getShareMoney()) >= 0.0001d ) {
+                                List<String> alias = new ArrayList<String>();
+                                alias.add(userApp.getUserId() + "");
+                                try {
+                                    String notificationContent = "本次分润金额：" + fans.getShareMoney() + "元";
+                                    generalPushUtil.sendAllPlatByAlias(alias, "粉丝分润通知", notificationContent, "0");
+                                } catch (Exception e) {
+                                    e.printStackTrace();
+                                }
+                                Notice notice = new Notice(0, 6, userApp);
+                                notice.setConrtent("您有一笔" + fans.getShareMoney() + "元的粉丝分润");
+                                notice.setUniqueKey(order.getMercUserId() + order.getOrderNumber() + "fansProft");
+                                noticeService.saveNotice(notice);
+                            }
+                        }
+                    }
+                }else{
+                    fans.setShareMoney("0");
+                }
+                order.setFansShareMoney(Double.parseDouble(fans.getShareMoney()));
+                fansService.saveFans(fans);
+            }
+        }
+    }
+
+    private void insertFans(MerchantOrder order) {
+        Fans fans = new Fans();
+        fans.setShareMoney("0");
+        fans.convert(order);
+        fansService.saveFans(fans);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/refundOrder/MerchantRefundOrderService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/refundOrder/MerchantRefundOrderService.java
new file mode 100644
index 0000000..77ecccb
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/refundOrder/MerchantRefundOrderService.java
@@ -0,0 +1,50 @@
+package cn.pluss.platform.refundOrder;
+
+import cn.pluss.platform.entity.MerchantOrder;
+import cn.pluss.platform.entity.MerchantRefundOrder;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author Administrator
+ *
+ */
+public interface MerchantRefundOrderService extends IService<MerchantRefundOrder> {
+
+    List<MerchantRefundOrder> queryRefundOrderJoinPage(Map<String, Object> map);
+
+    Integer queryRefundOrderJoinPageCount(Map<String, Object> map);
+
+    Page<MerchantRefundOrder> pageDate(Page<MerchantRefundOrder> page, MerchantRefundOrder refundOrder);
+    /**
+     * @description:统计首页退款数据
+     * @date: 2021/10/19 15:11
+     * @return java.util.Map<java.lang.String,java.lang.Object>
+     */
+    Map<String, Object> getPlatformRefundData();
+
+    /**
+     * @description:api订单退款
+     * @date: 2021/11/22 14:08
+     * @param params:
+     * @param order:
+     */
+    MerchantRefundOrder apiRefundOrder(JSONObject params, MerchantOrder order);
+
+
+    /**
+     * @description:退款订单查询
+     * @date: 2021/11/22 16:33
+     * @param params:
+     * @return com.alibaba.fastjson.JSONObject
+     */
+    MerchantRefundOrder apiRefundQuery(JSONObject params);
+
+
+    void updateOrderAndSendNotify(MerchantRefundOrder refundOrder);
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/refundOrder/impl/MerchantRefundOrderServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/refundOrder/impl/MerchantRefundOrderServiceImpl.java
new file mode 100644
index 0000000..c0f8fcf
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/refundOrder/impl/MerchantRefundOrderServiceImpl.java
@@ -0,0 +1,229 @@
+package cn.pluss.platform.refundOrder.impl;
+
+
+import cn.pluss.platform.api.ResultCode;
+import cn.pluss.platform.entity.MerchantBaseInfo;
+import cn.pluss.platform.entity.MerchantChannelStatus;
+import cn.pluss.platform.entity.MerchantOrder;
+import cn.pluss.platform.entity.MerchantRefundOrder;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.MerchantOrderMapper;
+import cn.pluss.platform.mapper.MerchantRefundOrderMapper;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.notify.NotifyMessageService;
+import cn.pluss.platform.pay.PayService;
+import cn.pluss.platform.realFans.RealFansService;
+import cn.pluss.platform.refundOrder.MerchantRefundOrderService;
+import cn.pluss.platform.ryx.pay.RyxPayService;
+import cn.pluss.platform.sxf.pay.SxfPayService;
+import cn.pluss.platform.util.MD5Util;
+import cn.pluss.platform.util.SignUtils;
+import cn.pluss.platform.util.StringUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+
+@Service
+@Transactional
+@Slf4j
+public class MerchantRefundOrderServiceImpl extends ServiceImpl<MerchantRefundOrderMapper, MerchantRefundOrder> implements MerchantRefundOrderService {
+
+
+    @Autowired
+    private MerchantRefundOrderMapper merchantRefundOrderMapper;
+
+    @Setter(onMethod_ = {@Autowired,@Lazy})
+    private MerchantChannelStatusService merchantChannelStatusService;
+
+    @Setter(onMethod_ = {@Autowired,@Lazy})
+    private MerchantBaseInfoService merchantBaseInfoService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private SxfPayService sxfPayService;
+    @Setter(onMethod_ = {@Autowired})
+    private RyxPayService ryxPayService;
+
+    @Setter(onMethod_ = {@Autowired, @Qualifier("ysPayOldService")})
+    private PayService ysPayOldService;
+
+    @Setter(onMethod_ = {@Autowired,@Lazy})
+    private RealFansService realFansService;
+
+    @Setter(onMethod_ = {@Lazy, @Autowired})
+    private NotifyMessageService notifyMessageService;
+
+    @Resource
+    private MerchantOrderMapper merchantOrderMapper;
+
+
+
+
+    @Override
+    public List<MerchantRefundOrder> queryRefundOrderJoinPage(Map<String, Object> map) {
+        return merchantRefundOrderMapper.queryRefundOrderJoinPage(map);
+    }
+
+    @Override
+    public Integer queryRefundOrderJoinPageCount(Map<String, Object> map) {
+        return merchantRefundOrderMapper.queryRefundOrderJoinPageCount(map);
+    }
+
+    @Override
+    public Page<MerchantRefundOrder> pageDate(Page<MerchantRefundOrder> page, MerchantRefundOrder refundOrder) {
+        return merchantRefundOrderMapper.pageDate(page,refundOrder);
+    }
+    /**
+     * @description:统计首页退款数据
+     * @date: 2021/10/19 15:11
+     * @return java.util.Map<java.lang.String,java.lang.Object>
+     */
+    @Override
+    public Map<String, Object> getPlatformRefundData() {
+        return merchantRefundOrderMapper.getPlatformRefundData();
+    }
+
+    /**
+     * @description:订单退款
+     * @date: 2021/11/22 14:09
+     * @param params:
+     * @param order:
+     */
+    @Override
+    public MerchantRefundOrder apiRefundOrder(JSONObject params, MerchantOrder order) {
+        MerchantChannelStatus channel = null;
+        if("2".equals(order.getAisleSwitch())){
+            channel = merchantChannelStatusService.getByMerchantCode(order.getMerchantCode(), 1);
+        }else{
+            channel = merchantChannelStatusService.getByMerchantCode(order.getMerchantCode(), Integer.valueOf(order.getAisleSwitch()));
+        }
+        MsgException.checkNull(channel,"通道信息异常");
+
+        Map<String,Object> result = null;
+        if (channel.getChannel() == 1) {
+            result = sxfPayService.refundPay(order, channel.getMerchantId());
+        } else if (channel.getChannel() == 2) {
+            MsgException.throwException("通道已关闭！");
+        } else if (channel.getChannel() == 3) {
+            result = ryxPayService.refundPay(order, channel.getMerchantId());
+        } else if (channel.getChannel() == 4) {
+            result = ysPayOldService.refundPay(order, channel.getMerchantId());
+        }else {
+            MsgException.throwException("未知通道！");
+        }
+        if (ResultCode.SUCCESS.code() != (Integer) result.get("code")) {
+            throw new MsgException((String) result.get("msg"));
+        }
+        MerchantRefundOrder refundOrder = new MerchantRefundOrder();
+        if(StringUtil.isNotEmpty(order.getMarketAmt()) && order.getMarketAmt().doubleValue() > 0
+                && ("1".equals(order.getRefundType()) || StringUtil.isEmpty(order.getRefundType()))){
+            MerchantOrder update = new MerchantOrder();
+            update.setId(order.getId());
+            update.setMarketAmt(new BigDecimal("0.00"));
+            merchantOrderMapper.updateById(update);
+        }else if(StringUtil.isNotEmpty(order.getMarketAmt()) && order.getMarketAmt().doubleValue() > 0 && "2".equals(order.getRefundType())){
+            MerchantOrder update = new MerchantOrder();
+            update.setId(order.getId());
+            BigDecimal uesAmt = BigDecimal.valueOf(order.getConsumeFee()).subtract(order.getRefundAmt());
+            BigDecimal market = uesAmt.multiply(order.getRate().divide(BigDecimal.valueOf(10000))).setScale(2,BigDecimal.ROUND_HALF_DOWN);
+            update.setMarketAmt(market);
+            merchantOrderMapper.updateById(update);
+        }
+        refundOrder.convert(order, result,channel.getMerchantId(),order.getRefundAmt(),params);
+        order.setId(null);
+        order.setUpdateTime(new Date());
+        order.setStatus("2");
+        order.setMarketAmt(BigDecimal.ZERO);
+        realFansService.removeProfit(order,order.getRefundAmt(),order.getUseRefundAmt());
+        order.setOrderNumber(order.getOrderNumber() + "_" + StringUtil.genRandomNum(5));
+        merchantOrderMapper.insert(order);
+        merchantRefundOrderMapper.insert(refundOrder);
+        return refundOrder;
+    }
+
+
+    @Override
+    public MerchantRefundOrder apiRefundQuery(JSONObject params) {
+        String mercRefundNo = params.getString("mercRefundNo");
+        QueryWrapper<MerchantRefundOrder> queryWrapper = new QueryWrapper<MerchantRefundOrder>().eq("mercRefundNo",mercRefundNo);
+        MerchantRefundOrder refundOrder = baseMapper.selectOne(queryWrapper);
+        MsgException.checkNull(refundOrder,"退款单号有误！");
+        if(!"1".equals(refundOrder.getStatus())){
+            MerchantChannelStatus channel = null;
+            if("2".equals(refundOrder.getAisleSwitch())){
+                channel = merchantChannelStatusService.getByMerchantCode(refundOrder.getMerchantCode(), 1);
+            }else{
+                channel = merchantChannelStatusService.getByMerchantCode(refundOrder.getMerchantCode(), Integer.valueOf(refundOrder.getAisleSwitch()));
+            }
+            MsgException.checkNull(channel,"通道信息异常");
+            JSONObject result = null;
+            if (channel.getChannel() == 1) {
+                result = sxfPayService.refundQuery(refundOrder);
+            } else if (channel.getChannel() == 2) {
+                MsgException.throwException("通道已关闭！");
+            } else if (channel.getChannel() == 3) {
+                result = ryxPayService.refundQuery(refundOrder);
+            } else if (channel.getChannel() == 4) {
+                result = ysPayOldService.refundQuery(refundOrder);
+            }else {
+                MsgException.throwException("未知通道！");
+            }
+            if(result != null && StringUtil.isNotEmpty(result.getString("status"))){
+                refundOrder.setStatus(result.getString("status"));
+            }
+            return refundOrder;
+        }else{
+            return refundOrder;
+        }
+    }
+
+    @Override
+    public void updateOrderAndSendNotify(MerchantRefundOrder refundOrder) {
+        this.updateById(refundOrder);
+        if(StringUtil.isNotEmpty(refundOrder.getNotifyUrl())){
+            sendLowerRefundNotifyCallback(refundOrder);
+        }
+    }
+
+    private void sendLowerRefundNotifyCallback(MerchantRefundOrder refundOrder) {
+        JSONObject notifyMap = new JSONObject();
+        notifyMap.put("msgType","02");
+        notifyMap.put("mercRefundNo",refundOrder.getMercRefundNo());
+        notifyMap.put("refundNo",refundOrder.getRefundNo());
+        notifyMap.put("orderNumber",refundOrder.getOrderNumber());
+        notifyMap.put("oPayAmt",refundOrder.getPayAmt());
+        notifyMap.put("refundAmt",refundOrder.getRefundAmt());
+        notifyMap.put("refundTime",new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(refundOrder.getCreateTime()));
+        notifyMap.put("status",refundOrder.getStatus());
+        String key = "4c8d277b0f274604af68e590cc0b3e6b";
+        MerchantBaseInfo merchant = merchantBaseInfoService.getMerchantBaseInfoByMerchantCode(refundOrder.getMerchantCode());
+        if(merchant != null && StringUtil.isNotEmpty(merchant.getMd5Key())){
+            key = merchant.getMd5Key();
+        }
+        String signStr = SignUtils.getSignContent(notifyMap) + "&key="+key;
+        String nSign = MD5Util.MD5Encode(signStr, "UTF-8");
+        notifyMap.put("sign",nSign);
+        try {
+            MerchantOrder order = new MerchantOrder().setMercNotifyUrl(refundOrder.getNotifyUrl());
+            notifyMessageService.sendNotifyMessage(order,notifyMap);
+        } catch (Exception e) {
+            log.info("====================>进入下游推送异步通知异常，异常信息:{}<====================",e);
+        }
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/region/RegionReflectService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/region/RegionReflectService.java
new file mode 100644
index 0000000..e6fc3ec
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/region/RegionReflectService.java
@@ -0,0 +1,140 @@
+package cn.pluss.platform.region;
+
+import cn.pluss.platform.dto.RegionReflectDTO;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.mapper.RegionReflectMapper;
+import cn.pluss.platform.vo.RegionReflectVO;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 不同通道的地区表映射表 服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-07-24
+ */
+public interface RegionReflectService extends IService<RegionReflect> {
+
+    /**
+     * 获取乐刷地区code信息
+     *
+     * @param province 省
+     * @param city     市
+     * @param area     区/县
+     * @return 地区信息
+     */
+    RegionCodeLs getLsRegionCode(String province, String city, String area);
+
+    /**
+     * 获取随行付地区code信息
+     *
+     * @param province 省
+     * @param city     市
+     * @param area     区/县
+     * @return 地区信息
+     */
+    RegionCodeSxf getSxfRegionCode(String province, String city, String area);
+
+    /**
+     * 获取瑞银信地区code信息
+     *
+     * @param province 省
+     * @param city     市
+     * @param area     区/县
+     * @return 地区信息
+     */
+    RegionCodeRyx getRyxRegionCode(String province, String city, String area);
+
+    /**
+     * 获取银盛地区code信息
+     *
+     * @param province 省
+     * @param city     市
+     * @param area     区/县
+     * @return 地区信息
+     */
+    RegionCodeYs getYsRegionCode(String province, String city, String area);
+
+    /**
+     * 获取乐刷地区code信息
+     *
+     * @param bankCard 银行卡信息
+     * @return 地区信息
+     */
+    default RegionCodeLs getLsRegionCode(BankCard bankCard) {
+        return getLsRegionCode(bankCard.getBranchProvince(), bankCard.getBranchCity(), bankCard.getBranchArea());
+    }
+
+    /**
+     * 获取随行付地区code信息
+     *
+     * @param bankCard 银行卡信息
+     * @return 地区信息
+     */
+    default RegionCodeSxf getSxfRegionCode(BankCard bankCard) {
+        return getSxfRegionCode(bankCard.getBranchProvince(), bankCard.getBranchCity(), bankCard.getBranchArea());
+    }
+
+    /**
+     * 获取瑞银信地区code信息
+     *
+     * @param bankCard 银行卡信息
+     * @return 地区信息
+     */
+    default RegionCodeRyx getRyxRegionCode(BankCard bankCard) {
+        return getRyxRegionCode(bankCard.getBranchProvince(), bankCard.getBranchCity(), bankCard.getBranchArea());
+    }
+
+    /**
+     * 获取银盛地区code信息
+     *
+     * @param bankCard 银行卡信息
+     * @return 地区信息
+     */
+    default RegionCodeYs getYsRegionCode(BankCard bankCard) {
+        return getYsRegionCode(bankCard.getBranchProvince(), bankCard.getBranchCity(), bankCard.getBranchArea());
+    }
+
+    default Page<RegionReflectVO> pageRegionReflect(Page<RegionReflectVO> page, String province, String city, String area) {
+        return ((RegionReflectMapper) getBaseMapper()).selectRegionReflectList(page, province, city, area);
+    }
+
+
+    /**
+     * 获取省份列表
+     *
+     * @param type 类型。sxf、ryx、ys
+     * @return 省列表
+     */
+    List<String> listProvince(String type);
+
+    /**
+     * 获取城市列表
+     *
+     * @param type     类型。sxf、ryx、ys
+     * @param province 省
+     * @return 市列表
+     */
+    List<String> listCity(String type, String province);
+
+    /**
+     * 获取县/区
+     *
+     * @param type     类型。sxf、ryx、ys
+     * @param city     市
+     * @param province 省
+     * @return 区列表
+     */
+    List<String> listArea(String type, String city, String province);
+
+    /**
+     * 保存地区映射信息
+     *
+     * @param reflectDTO 地区映射信息
+     */
+    void saveReflect(RegionReflectDTO reflectDTO);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/region/impl/RegionReflectServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/region/impl/RegionReflectServiceImpl.java
new file mode 100644
index 0000000..6e279d1
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/region/impl/RegionReflectServiceImpl.java
@@ -0,0 +1,194 @@
+package cn.pluss.platform.region.impl;
+
+import cn.pluss.platform.converter.Converter;
+import cn.pluss.platform.dto.RegionReflectDTO;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.*;
+import cn.pluss.platform.region.RegionReflectService;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import lombok.val;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * <p>
+ * 不同通道的地区表映射表 服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-07-24
+ */
+@Slf4j
+@Service
+public class RegionReflectServiceImpl extends ServiceImpl<RegionReflectMapper, RegionReflect> implements RegionReflectService {
+
+    @Resource
+    private RegionCodeLsMapper regionCodeLsMapper;
+
+    @Resource
+    private RegionCodeSxfMapper regionCodeSxfMapper;
+
+    @Resource
+    private RegionCodeRyxMapper regionCodeRyxMapper;
+
+    @Resource
+    private RegionCodeYsMapper regionCodeYsMapper;
+
+    @Override
+    public RegionCodeLs getLsRegionCode(String province, String city, String area) {
+        try {
+            RegionCodeLs regionCodeLs = regionCodeLsMapper.selectRegionCode(province, city, area);
+            if (regionCodeLs == null) {
+                throw new MsgException("获取地区信息异常");
+            }
+            return regionCodeLs;
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("===获取地区信息异常===");
+            throw new MsgException("获取地区信息异常");
+        }
+    }
+
+    @Override
+    public RegionCodeSxf getSxfRegionCode(String province, String city, String area) {
+        try {
+            RegionCodeSxf regionCodeYs = regionCodeSxfMapper.selectRegionCode(province, city, area);
+            if (regionCodeYs == null) {
+                throw new MsgException("随行付获取地区信息异常");
+            }
+            return regionCodeYs;
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("===随行付获取地区信息异常===");
+            throw new MsgException("随行付获取地区信息异常");
+        }
+    }
+
+    @Override
+    public RegionCodeRyx getRyxRegionCode(String province, String city, String area) {
+        try {
+            RegionCodeRyx regionCodeRyx = regionCodeRyxMapper.selectRegionCode(province, city, area);
+            if (regionCodeRyx == null) {
+                throw new MsgException("瑞银信获取地区信息异常");
+            }
+            return regionCodeRyx;
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("===瑞银信获取地区信息异常===");
+            throw new MsgException("瑞银信获取地区信息异常");
+        }
+    }
+
+    @Override
+    public RegionCodeYs getYsRegionCode(String province, String city, String area) {
+        try {
+            RegionCodeYs regionCodeYs = regionCodeYsMapper.selectRegionCode(province, city, area);
+            if (regionCodeYs == null) {
+                throw new MsgException("银盛获取地区信息异常");
+            }
+
+            return regionCodeYs;
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("===银盛获取地区信息异常===");
+            throw new MsgException("银盛获取地区信息异常");
+        }
+    }
+
+    @Override
+    public List<String> listProvince(String type) {
+
+        switch (type) {
+            case "sxf":
+                return regionCodeSxfMapper.selectProvince();
+            case "ryx":
+                return regionCodeRyxMapper.selectProvince();
+            default:
+                return regionCodeYsMapper.selectProvince();
+        }
+    }
+
+    @Override
+    public List<String> listCity(String type, String province) {
+        switch (type) {
+            case "sxf":
+                return regionCodeSxfMapper.selectCity(province);
+            case "ryx":
+                return regionCodeRyxMapper.selectCity(province);
+            default:
+                return regionCodeYsMapper.selectCity(province);
+        }
+    }
+
+    @Override
+    public List<String> listArea(String type, String city, String province) {
+        switch (type) {
+            case "sxf":
+                return regionCodeSxfMapper.selectArea(province, city);
+            case "ryx":
+                return regionCodeRyxMapper.selectArea(province, city);
+            default:
+                return regionCodeYsMapper.selectArea(province, city);
+        }
+    }
+
+    @Override
+    public void saveReflect(RegionReflectDTO reflectDTO) {
+
+        switch (reflectDTO.getType()) {
+            case "sxf":
+                val qWrapperSxf = new LambdaQueryWrapper<RegionCodeSxf>().eq(RegionCodeSxf::getProvince, reflectDTO.getProvince())
+                        .eq(RegionCodeSxf::getCity, reflectDTO.getCity())
+                        .eq(RegionCodeSxf::getArea, reflectDTO.getArea());
+                val regionCodeSxf = regionCodeSxfMapper.selectOne(qWrapperSxf);
+                reflectDTO.setRegionDes(regionCodeSxf.getId());
+                reflectDTO.setChannel(1);
+                break;
+            case "ryx":
+                val qWrapperRyx = new LambdaQueryWrapper<RegionCodeRyx>().eq(RegionCodeRyx::getProvince, reflectDTO.getProvince())
+                        .eq(RegionCodeRyx::getCity, reflectDTO.getCity())
+                        .eq(RegionCodeRyx::getArea, reflectDTO.getArea());
+                val regionCodeRyx = regionCodeRyxMapper.selectOne(qWrapperRyx);
+                reflectDTO.setRegionDes(regionCodeRyx.getId());
+                reflectDTO.setChannel(3);
+                break;
+            default:
+                val qWrapperYs = new LambdaQueryWrapper<RegionCodeYs>().eq(RegionCodeYs::getProvince, reflectDTO.getProvince())
+                        .eq(RegionCodeYs::getCity, reflectDTO.getCity())
+                        .eq(RegionCodeYs::getArea, reflectDTO.getArea());
+                val regionCodeYs = regionCodeYsMapper.selectOne(qWrapperYs);
+                reflectDTO.setRegionDes(regionCodeYs.getId());
+                reflectDTO.setChannel(4);
+                break;
+        }
+
+        val regionReflect = Converter.INSTANCE.toEntity(reflectDTO);
+        val uWrapper = new LambdaUpdateWrapper<RegionReflect>();
+        uWrapper.eq(RegionReflect::getRegionSrc, regionReflect.getRegionSrc())
+                .set(RegionReflect::getRegionDes, regionReflect.getRegionDes());
+
+        switch (reflectDTO.getType()) {
+            case "sxf":
+                uWrapper.eq(RegionReflect::getChannel, 1);
+                break;
+            case "ryx":
+                uWrapper.eq(RegionReflect::getChannel, 3);
+                break;
+            default:
+                uWrapper.eq(RegionReflect::getChannel, 4);
+                break;
+        }
+
+
+        val updateCount = baseMapper.update(null, uWrapper);
+        if (updateCount == 0) {
+            baseMapper.insert(regionReflect);
+        }
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/rewardConfig/RewardConfigService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/rewardConfig/RewardConfigService.java
new file mode 100644
index 0000000..c8d142a
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/rewardConfig/RewardConfigService.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.rewardConfig;
+
+import cn.pluss.platform.entity.RewardConfig;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 用户奖励配置 服务类
+ * </p>
+ *
+ * @author bzg
+ * @since 2022-02-22
+ */
+public interface RewardConfigService extends IService<RewardConfig> {
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/rewardConfig/impl/RewardConfigServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/rewardConfig/impl/RewardConfigServiceImpl.java
new file mode 100644
index 0000000..bab8006
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/rewardConfig/impl/RewardConfigServiceImpl.java
@@ -0,0 +1,20 @@
+package cn.pluss.platform.rewardConfig.impl;
+
+import cn.pluss.platform.entity.RewardConfig;
+import cn.pluss.platform.mapper.RewardConfigMapper;
+import cn.pluss.platform.rewardConfig.RewardConfigService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 用户奖励配置 服务实现类
+ * </p>
+ *
+ * @author bzg
+ * @since 2022-02-22
+ */
+@Service
+public class RewardConfigServiceImpl extends ServiceImpl<RewardConfigMapper, RewardConfig> implements RewardConfigService {
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/roleInfo/RoleInfoService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/roleInfo/RoleInfoService.java
new file mode 100644
index 0000000..01e37fb
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/roleInfo/RoleInfoService.java
@@ -0,0 +1,31 @@
+package cn.pluss.platform.roleInfo;
+
+import java.util.List;
+import java.util.Map;
+import cn.pluss.platform.entity.RoleInfo;
+import cn.pluss.platform.entity.UserInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+public interface RoleInfoService extends IService<RoleInfo> {
+
+    RoleInfo queryRoleInfo(RoleInfo roleInfo);
+
+    List<RoleInfo> queryRoleInfoList(RoleInfo roleInfo);
+
+    void saveRoleInfo(RoleInfo roleInfo);
+
+    void updateRoleInfo(RoleInfo roleInfo);
+
+    void deleteRoleInfo(RoleInfo roleInfo);
+
+    List<RoleInfo> queryRoleInfoPage(Map map);
+
+    Integer queryRoleInfoPageCount(Map map);
+
+    void saveRoleInfoBatch(List<RoleInfo> roleInfoList);
+
+     List<RoleInfo> getRoleNames(String loginName);
+
+    List<RoleInfo> getRolesByUser(UserInfo userInfo);
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/roleInfo/impl/RoleInfoServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/roleInfo/impl/RoleInfoServiceImpl.java
new file mode 100644
index 0000000..c7187de
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/roleInfo/impl/RoleInfoServiceImpl.java
@@ -0,0 +1,74 @@
+package cn.pluss.platform.roleInfo.impl;
+
+import java.util.List;
+import java.util.Map;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import cn.pluss.platform.entity.RoleInfo;
+import cn.pluss.platform.entity.UserInfo;
+import cn.pluss.platform.roleInfo.RoleInfoService;
+import cn.pluss.platform.mapper.RoleInfoMapper;
+
+@Transactional
+@Service("roleInfoService")
+public class RoleInfoServiceImpl extends ServiceImpl<RoleInfoMapper, RoleInfo> implements RoleInfoService{
+
+	 private static final Logger logger = LoggerFactory.getLogger( RoleInfoServiceImpl.class);
+
+
+    @Autowired
+	  private RoleInfoMapper roleInfoMapper;
+
+    @Override
+    public RoleInfo queryRoleInfo(RoleInfo roleInfo){
+        return roleInfoMapper.queryRoleInfo(roleInfo);
+    }
+
+    @Override
+    public List<RoleInfo> queryRoleInfoList(RoleInfo roleInfo){
+        return roleInfoMapper.queryRoleInfoList(roleInfo);
+    }
+    @Override
+    public void saveRoleInfo(RoleInfo roleInfo){
+          roleInfoMapper.saveRoleInfo(roleInfo);
+    }
+    @Override
+    public void updateRoleInfo(RoleInfo roleInfo){
+        roleInfoMapper.updateRoleInfo(roleInfo);
+    }
+    @Override
+    public void deleteRoleInfo(RoleInfo roleInfo){
+        roleInfoMapper.deleteRoleInfo(roleInfo);
+    }
+    @Override
+    public List<RoleInfo> queryRoleInfoPage(Map map){
+        return roleInfoMapper.queryRoleInfoPage(map);
+    }
+    @Override
+    public Integer queryRoleInfoPageCount(Map map){
+        return roleInfoMapper.queryRoleInfoPageCount(map);
+    }
+    @Override
+    public void saveRoleInfoBatch(List<RoleInfo> roleInfoList) {
+         roleInfoMapper.saveRoleInfoBatch(roleInfoList);
+    }
+
+	@Override
+	public List<RoleInfo> getRoleNames(String loginName) {
+		// TODO Auto-generated method stub
+		return roleInfoMapper.getRoleNames(loginName);
+	}
+
+	@Override
+	public List<RoleInfo> getRolesByUser(UserInfo userInfo) {
+		// TODO Auto-generated method stub
+		return roleInfoMapper.getRoleNames(userInfo);
+	}
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/roleMenuInfo/RoleMenuInfoService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/roleMenuInfo/RoleMenuInfoService.java
new file mode 100644
index 0000000..07a7fd4
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/roleMenuInfo/RoleMenuInfoService.java
@@ -0,0 +1,17 @@
+package cn.pluss.platform.roleMenuInfo;
+
+import cn.pluss.platform.entity.RoleMenuInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+public interface RoleMenuInfoService extends IService<RoleMenuInfo> {
+
+    void saveRoleMenuInfo(RoleMenuInfo roleMenuInfo);
+
+    void deleteRoleMenuInfo(RoleMenuInfo roleMenuInfo);
+
+    /**
+     * 保存角色菜单关联信息
+     */
+    void saveRoleMenuList(String roleId, String[] menuIdArr);
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/roleMenuInfo/impl/RoleMenuInfoServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/roleMenuInfo/impl/RoleMenuInfoServiceImpl.java
new file mode 100644
index 0000000..0d00e2a
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/roleMenuInfo/impl/RoleMenuInfoServiceImpl.java
@@ -0,0 +1,54 @@
+package cn.pluss.platform.roleMenuInfo.impl;
+
+import cn.pluss.platform.entity.RoleMenuInfo;
+import cn.pluss.platform.mapper.RoleMenuInfoMapper;
+import cn.pluss.platform.roleMenuInfo.RoleMenuInfoService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author nb2020
+ */
+@Service("roleMenuInfoService")
+public class RoleMenuInfoServiceImpl extends ServiceImpl<RoleMenuInfoMapper, RoleMenuInfo> implements RoleMenuInfoService {
+
+    @Override
+    public void saveRoleMenuInfo(RoleMenuInfo roleMenuInfo) {
+        baseMapper.saveRoleMenuInfo(roleMenuInfo);
+    }
+
+    @Override
+    public void deleteRoleMenuInfo(RoleMenuInfo roleMenuInfo) {
+        baseMapper.deleteRoleMenuInfo(roleMenuInfo);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void saveRoleMenuList(String roleId, String[] menuIdArr) {
+        // 删除已存在的关联信息
+        RoleMenuInfo entity = new RoleMenuInfo();
+        entity.setRoleId(Long.parseLong(roleId));
+        baseMapper.delete(new QueryWrapper<>(entity));
+
+        if (menuIdArr == null || menuIdArr.length == 0) {
+            return;
+        }
+
+        List<RoleMenuInfo> roleMenuInfoList = new ArrayList<>();
+        for (String menuId : menuIdArr) {
+            RoleMenuInfo menuInfo = new RoleMenuInfo();
+            menuInfo.setRoleId(Long.parseLong(roleId));
+            menuInfo.setMenuId(Long.parseLong(menuId));
+            roleMenuInfoList.add(menuInfo);
+        }
+
+        saveBatch(roleMenuInfoList);
+    }
+
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/roleUserInfo/RoleUserInfoService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/roleUserInfo/RoleUserInfoService.java
new file mode 100644
index 0000000..685ce01
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/roleUserInfo/RoleUserInfoService.java
@@ -0,0 +1,17 @@
+package cn.pluss.platform.roleUserInfo;
+
+import cn.pluss.platform.entity.RoleUserInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+public interface RoleUserInfoService extends IService<RoleUserInfo> {
+
+    List<RoleUserInfo> queryRoleUserInfoList(RoleUserInfo roleUserInfo);
+
+    void saveRoleUserInfo(RoleUserInfo roleUserInfo);
+
+    void deleteRoleUserInfo(RoleUserInfo roleUserInfo);
+
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/roleUserInfo/impl/RoleUserInfoServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/roleUserInfo/impl/RoleUserInfoServiceImpl.java
new file mode 100644
index 0000000..d061656
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/roleUserInfo/impl/RoleUserInfoServiceImpl.java
@@ -0,0 +1,35 @@
+package cn.pluss.platform.roleUserInfo.impl;
+
+import cn.pluss.platform.entity.RoleUserInfo;
+import cn.pluss.platform.mapper.RoleUserInfoMapper;
+import cn.pluss.platform.roleUserInfo.RoleUserInfoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Transactional
+@Service("roleUserInfoService")
+public class RoleUserInfoServiceImpl extends ServiceImpl<RoleUserInfoMapper, RoleUserInfo> implements RoleUserInfoService {
+
+    @Override
+    public List<RoleUserInfo> queryRoleUserInfoList(RoleUserInfo roleUserInfo) {
+        return baseMapper.queryRoleUserInfoList(roleUserInfo);
+    }
+
+    @Override
+    public void saveRoleUserInfo(RoleUserInfo roleUserInfo) {
+        baseMapper.saveRoleUserInfo(roleUserInfo);
+    }
+
+    @Override
+    public void deleteRoleUserInfo(RoleUserInfo roleUserInfo) {
+        baseMapper.deleteRoleUserInfo(roleUserInfo);
+    }
+
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ryx/RegionCodeRyxService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ryx/RegionCodeRyxService.java
new file mode 100644
index 0000000..1026ee8
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ryx/RegionCodeRyxService.java
@@ -0,0 +1,111 @@
+package cn.pluss.platform.ryx;
+
+import cn.pluss.platform.entity.RegionCodeRyx;
+import cn.pluss.platform.exception.MsgException;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 瑞银信进件，地区编码 服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-01-15
+ */
+public interface RegionCodeRyxService extends IService<RegionCodeRyx> {
+
+    /**
+     * 根据地区名称获取对应的地区编码信息
+     * @param areaName 地区名称
+     * @return 地区编码信息
+     */
+    default RegionCodeRyx get(String provinceName, String cityName, String areaName) {
+        RegionCodeRyx regionCodeRyx = new RegionCodeRyx();
+        regionCodeRyx.setArea(areaName);
+        regionCodeRyx.setProvince(provinceName);
+        regionCodeRyx.setCity(cityName);
+
+        if ("潜江市".equals(cityName)) {
+            regionCodeRyx.setCity("荆州市");
+            regionCodeRyx.setArea("潜江市(省直辖)");
+        } else if ("仙桃市".equals(cityName)) {
+            regionCodeRyx.setCity("荆州市");
+            regionCodeRyx.setArea("仙桃市(省直辖)");
+        } else if ("天门市".equals(cityName)) {
+            regionCodeRyx.setCity("荆州市");
+            regionCodeRyx.setArea("天门市(省直辖)");
+        }
+
+        // 地区划分略有区别
+        if ("海南省".equals(provinceName) && cityName.equals("儋州市")) {
+            regionCodeRyx.setProvince("省直辖县级行政区划");
+            regionCodeRyx.setAreaCode("儋州市");
+        }
+
+        RegionCodeRyx result = (getBaseMapper()).selectOne(new QueryWrapper<>(regionCodeRyx));
+        if (result == null) {
+            // 部分城市没有下级区，例如广东省的城市, 或没有对应分区，则直接用城市名当区名查
+            regionCodeRyx.setArea(cityName);
+        }
+
+        result = (getBaseMapper()).selectOne(new QueryWrapper<>(regionCodeRyx));
+
+        if (result == null) {
+            throw new MsgException("没有找到对应的城市地区编码");
+        }
+
+        return result;
+    }
+
+    /**
+     * 根据地区编码获取对应的地区编码信息
+     * @param areaCode 地区编码
+     * @return 地区编码信息
+     */
+    default RegionCodeRyx getByAreaCode(String areaCode) {
+        RegionCodeRyx regionCodeRyx = new RegionCodeRyx();
+        regionCodeRyx.setAreaCode(areaCode);
+
+        return (getBaseMapper()).selectOne(new QueryWrapper<>(regionCodeRyx));
+    }
+
+
+    /**
+     * 根据城市名称获取对应的地区编码信息，模糊匹配
+     * @param areaName 县/区名称
+     * @return 地区编码信息
+     */
+    default List<RegionCodeRyx> listByAreaName(String areaName) {
+        QueryWrapper<RegionCodeRyx> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like("area", areaName);
+
+        return (getBaseMapper()).selectList(queryWrapper);
+    }
+
+    /**
+     * 根据城市名称获取对应的地区编码信息，模糊匹配
+     * @param cityName 市名称
+     * @return 地区编码信息
+     */
+    default List<RegionCodeRyx> listByCityName(String cityName) {
+        QueryWrapper<RegionCodeRyx> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like("city", cityName);
+
+        return (getBaseMapper()).selectList(queryWrapper);
+    }
+
+    /**
+     * 根据省份名称获取对应的地区编码信息，模糊匹配
+     * @param provinceName 省编码
+     * @return 地区编码信息
+     */
+    default List<RegionCodeRyx> listByProvinceName(String provinceName) {
+        QueryWrapper<RegionCodeRyx> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like("province", provinceName);
+
+        return (getBaseMapper()).selectList(queryWrapper);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ryx/RyxConstants.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ryx/RyxConstants.java
new file mode 100644
index 0000000..05d6a28
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ryx/RyxConstants.java
@@ -0,0 +1,325 @@
+package cn.pluss.platform.ryx;
+
+import java.math.BigDecimal;
+
+/**
+ * @author DJH
+ * 瑞银信通道相关常量
+ */
+public class RyxConstants {
+
+    /**
+     * 瑞银信下的机构号
+     */
+    public static final String ACCESS_ID = "accessId";
+
+    /**
+     * 商户编号
+     */
+    public static final String MER_IN_ID = "merInId";
+
+    /**
+     * 进件类型
+     * 1：个体，
+     * 2：企业，
+     * 3：市场，
+     * 5：连锁，
+     * 6:其他，
+     * 7:小微商户
+     */
+    public static final String MER_PROP = "merProp";
+    /**
+     * 入网方式
+     * 1：普通
+     * 2：先进后审
+     */
+    public static final String ACCESS_MODE = "accessMode";
+
+    /**
+     * 商户全称
+     */
+    public static final String ORG_MER_NAME = "orgMerName";
+
+    /**
+     * 商户简称
+     */
+    public static final String MER_NAME = "merName";
+
+    /**
+     * 经营名称, 店铺名称
+     */
+    public static final String MER_NAME_ABBR = "merNameAbbr";
+    /**
+     * 入网县编码, 相关表 tb_pluss_region_code_ryx
+     */
+    public static final String CITY_AREA = "cityArea";
+    /**
+     * 联系人
+     */
+    public static final String CONTACT_PERSON = "contactPerson";
+    /**
+     * 联系电话
+     */
+    public static final String CONTACT_PHONE = "contactPhone";
+    /**
+     * 银行卡号
+     */
+    public static final String BANK_CARD = "bankCard";
+    /**
+     * 账户性质
+     * 00：对公，
+     * 01：对私
+     */
+    public static final String ACCOUNT_PROP = "accountProp";
+    /**
+     * 结算类型         <br/>
+     * 1： 法人        <br/>
+     * 2： 非法人      <br/>
+     * 3： 对公        <br/>
+     */
+    public static final String SETTLE_TYPE = "settleType";
+    /**
+     * 结算户名
+     */
+    public static final String BANK_CARD_NAME = "bankCardName";
+    /**
+     * 证件类型
+     * 0105： 身份证
+     * 0202： 护照
+     */
+    public static final String SETTLE_CRED_TYPE = "settleCredType";
+    /**
+     * 结算证件号码
+     */
+    public static final String SETTLE_CRED_NO = "settleCredNo";
+    /**
+     * 证件有效开始时间
+     */
+    public static final String SETTLE_CRED_START_TIME = "settleCredStartTime";
+    /**
+     * 证件有效截止时间
+     */
+    public static final String SETTLE_CRED_TIME = "settleCredTime";
+    /**
+     * 经营类别mcc
+     */
+    public static final String MCC = "mcc";
+    /**
+     * 实际经营地址
+     */
+    public static final String OPERATE_ADDR = "operateAddr";
+    /**
+     * 是否启用标准费率
+     * 1：是，
+     * 2：否
+     */
+    public static final String MODEL_TYPE = "modelType";
+    /**
+     * 备注
+     */
+    public static final String REMARK = "remark";
+    /**
+     * 贷记费率（%）, 0.51,
+     * 银联二维码交易额大于1000
+     */
+    public static final String CREDIT_RATE = "creditRate";
+    /**
+     * 借记卡费率
+     * 银联二维码交易额大于1000
+     */
+    public static final String DEBIT_RATE = "debitRate";
+    /**
+     * 借记卡封顶额度
+     */
+    public static final String DEBIT_TOP = "debitTop";
+    /**
+     * 银联云闪付借记费率
+     * 银联二维码交易额小于等于1000
+     */
+    public static final String QR_DEBIT_RATE = "qrDebitRate";
+    /**
+     * 银联云闪付贷记费率，信用卡
+     * 银联二维码交易额度小于等于1000
+     */
+    public static final String QR_CREDIT_RATE = "qrCreditRate";
+    /**
+     * 微信交易费率
+     */
+    public static final String WX_DEBIT_RATE = "wxDebitRate";
+    /**
+     * 支付宝交易费率
+     */
+    public static final String ZFB_DEBIT_RATE = "zfbDebitRate";
+    /**
+     * 银行卡开户省编码
+     */
+    public static final String BANK_PROVINCE = "bankProvince";
+    /**
+     * 银行卡开户市编码
+     */
+    public static final String BANK_CITY = "bankCity";
+    /**
+     * 银行卡开户区编码
+     */
+    public static final String BANK_CITY_AREA = "bankCityArea";
+    /**
+     * 开户行编码
+     */
+    public static final String HEAD_BANK_NO = "headBankNo";
+    /**
+     * 开户支行联行号
+     */
+    public static final String OPEN_BANK_CHILD = "openBankChild";
+    /**
+     * 终端数量
+     * 小微最多20，普通商户最多9
+     */
+    public static final String TERM_NUM = "termNum";
+    /**
+     * 结算业务类型
+     * 01：T1,   第二个工作日 9点到11点
+     * 02: S0,
+     * 03: D1,   第二个自然日 9点到11点
+     * 04：D1+   第二个自然日 8点30左右打款
+     */
+    public static final String SERVICE_TYPE = "serviceType";
+    /**
+     * 是否开通退款
+     * 0：是
+     * 1：否
+     */
+    public static final String TRADE_TYPE_REIMBURSE = "tradeTypeReimburse";
+    /**
+     * 机构id
+     * 进件：O00000000001046
+     */
+    public static final String ORG_ID = "orgId";
+    /**
+     * 支付授权目录, 多个用逗号分割
+     * 非必填
+     */
+    public static final String JSAPI_PATH = "jsapiPath";
+    /**
+     * 子商户id，多个用逗号分割
+     * 非必填
+     */
+    public static final String SUB_APP_ID = "subAppid";
+    /**
+     * 绑定商户号
+     * 非必填
+     */
+    public static final String SUBSCRIBE_APP_ID = "subscribeAppid";
+    /**
+     * 商户协议类型
+     * 0：纸质协议（默认）
+     * 1：电子协议
+     */
+    public static final String PACT_TYPE = "pactType";
+
+    /**
+     * 电子协议短信接收人
+     */
+    public static final String AGREEMENT_NAME = "agreementName";
+
+    /**
+     * 电子协议短信接收人
+     */
+    public static final String AGREEMENT_PHONE = "agreementPhone";
+
+    /**
+     * 是否进行微信实名认证
+     * 1：是
+     * 2：否
+     */
+    public static final String CERTIFICATION_TYPE = "certificationType";
+    /**
+     * 联系人身份证号
+     */
+    public static final String CONTACT_PERSON_CRED = "contactPersonCred";
+    /**
+     * 经营证件类型, 默认选定营业执照
+     * 2388：事业单位法人证书,
+     * 2389: 统一社会信用代码证书(营业执照),
+     * 2393：组织机构代码证
+     * 2397：慈善组织公开募捐资格证书
+     * 2399：宗教活动场所登记证
+     * 2400：其他
+     */
+    public static final String LIC_TYPE = "licType";
+    /**
+     * 经营证件编码(营业执照编码)
+     */
+    public static final String LIC_NUM = "licNum";
+    /**
+     * 经营证件有效期开始时间
+     */
+    public static final String LIC_NUM_START_TIME = "licNumStartTime";
+    /**
+     * 经营证件有效期结束时间
+     */
+    public static final String LIC_NUM_TIME = "licNumTime";
+    /**
+     * 法人姓名
+     */
+    public static final String CRED_PEOPLE = "credPeople";
+    /**
+     * 法人证件类型           <br/>
+     * 0105： 身份证        <br/>
+     * 0202： 护照         <br/>
+     */
+    public static final String CRED_TYPE = "credType";
+    /**
+     * 法人证件号
+     */
+    public static final String CRED_NO = "credNo";
+    /**
+     * 法人证件有效开始时间
+     */
+    public static final String CRED_START_TIME = "credStartTime";
+    /**
+     * 法人证件有效截止时间
+     */
+    public static final String CRED_TIME = "credTime";
+    /**
+     * 经营范围
+     */
+    public static final String MANA_SCOP = "manaScop";
+
+    public static final String CARD_PIC = "cardPic";
+
+
+    /**
+     * @description:瑞银信银联云闪付贷记卡大于1000成本费率0.52%
+     * @date: 2021/8/24 14:33
+     */
+    public static final BigDecimal CREDIT_CARD_BANK_RATE_LARGE = BigDecimal.valueOf(0.0052);
+
+    /**
+     * @description:瑞银信银联云闪付借记卡大于1000成本费率0.42%
+     * @date: 2021/8/24 14:33
+     */
+    public static final BigDecimal DEBIT_CARD_BANK_RATE_LARGE = BigDecimal.valueOf(0.0042);
+
+    /**
+     * @description:瑞银信银联云闪付借记卡封顶手续费18元
+     * @date: 2021/8/24 14:33
+     */
+    public static final BigDecimal DEBIT_CARD_BANK_RATE_LARGE_MAX_FEE = BigDecimal.valueOf(18);
+
+    /**
+     * @description:瑞银信微信支付宝成本费率0.21%
+     * @date: 2021/8/24 14:33
+     */
+    public static final BigDecimal CHANNEL_WECHAT_ALIPAY_COST_RATE = BigDecimal.valueOf(0.0021);
+
+    /**
+     * @description:瑞银信银联1000以下成本费率0.22%
+     * @date: 2021/8/24 14:33
+     */
+    public static final BigDecimal CHANNEL_BANK_COST_RATE = BigDecimal.valueOf(0.0022);
+
+    private RyxConstants() {
+    }
+
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ryx/RyxService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ryx/RyxService.java
new file mode 100644
index 0000000..743969d
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ryx/RyxService.java
@@ -0,0 +1,117 @@
+package cn.pluss.platform.ryx;
+
+import cn.pluss.platform.entity.RyxAccessModel;
+import cn.pluss.platform.entity.RyxAccessResp;
+import cn.pluss.platform.entity.RyxPayRequest;
+import cn.pluss.platform.util.RyxConfig;
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.core.io.ByteArrayResource;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author DJH 
+ * 瑞银信参数
+ */
+public interface RyxService {
+
+    String IV_PARAM = "ivParam";
+    String AES_KEY = "aesKey";
+
+    String prefix = "onlpay/";
+
+    String userName = "rscy";
+
+    String password = "gS4*F&o51KhA";
+
+    Integer port = 22221;
+
+    String hostName = "119.254.93.57";
+
+    String filePrefix = "tran_";
+
+    String suffix = ".csv.gz";
+
+    String unZipSuffix = ".csv";
+
+    /**
+     * 入网接口签名方法, 组合基本参数
+     * @param paramMap          请求数据，需要加密的数据
+     * @param files             上传的文件
+     * @return 返回请求组合的数据
+     * @throws Exception    AES急
+     */
+    RyxAccessModel accessCombineEncrypt(Map<String, Object> paramMap, List<ByteArrayResource> files, String accessId, String pubKey);
+
+    /**
+     * 入网接口请求结果方法, 解密验签处理
+     * @param ryxAccessModel    请求结果
+     * @param <T> 返回参数类型
+     * @param clazz 返回参数类型
+     * @return  返回解密的参数
+     */
+    <T> T accessResultDecrypt(RyxAccessModel ryxAccessModel, Class<T> clazz);
+
+    /**
+     * 进件相关通用接口
+     * @param paramMap  请求参数
+     * @param files     文件
+     * @param accessId  机构号
+     * @param pubKey    解密公钥
+     * @param url       ignored
+     * @return  ignored
+     */
+    RyxAccessResp reqCommon(Map<String, Object> paramMap, List<ByteArrayResource> files, String accessId, String pubKey, String url);
+
+    /**
+     * 进件相关通用接口 - 常规商户
+     * @param paramMap  ignored
+     * @param files     ignored
+     * @param url       ignored
+     * @return  ignored
+     */
+    default RyxAccessResp reqCommon(Map<String, Object> paramMap, List<ByteArrayResource> files, String url) {
+        return reqCommon(paramMap, files, RyxConfig.accessId, RyxConfig.accessPubKey, url);
+    }
+
+    /**
+     * 进件相关通用接口 - 商服宝插件
+     * @param paramMap  ignored
+     * @param files     ignored
+     * @return  ignored
+     */
+    default RyxAccessResp reqSfbCommon(Map<String, Object> paramMap, List<ByteArrayResource> files, String url) {
+        return reqCommon(paramMap, files, RyxConfig.subAccessId, RyxConfig.subAccessPubKey, url);
+    }
+
+    /**
+     * 支付, 组合基本参数
+     * @param params          请求数据，需要加密的数据
+     * @return 返回请求组合的数据
+     * @throws Exception    AES
+     */
+    RyxPayRequest payParamsEncrypt(JSONObject params,String payWay);
+
+
+    /**
+     * 解析支付返回参数
+     * @param respones
+     * @return
+     */
+    JSONObject analysisPayParamsEncrypt(String respones);
+
+    /**
+     * 封装支付通用请求参数
+     * @param reqData
+     * @param payWay
+     * @return
+     */
+    JSONObject analysisCommonPayParams(String url,String payWay,JSONObject reqData);
+
+    /**
+     * 瑞银信下载ftp对账文件
+     * @param  date 日期
+     */
+    JSONObject downloadFtpFile(String date);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ryx/RyxTransService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ryx/RyxTransService.java
new file mode 100644
index 0000000..bf67168
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ryx/RyxTransService.java
@@ -0,0 +1,52 @@
+package cn.pluss.platform.ryx;
+
+import cn.pluss.platform.entity.RyxAccessResp;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 瑞银信结算信息相关接口
+ *
+ * @author DJH
+ */
+public interface RyxTransService {
+
+    /**
+     * 获取指定日期期间瑞银信的账单信息
+     *
+     * @param merInId   瑞银信商户id
+     * @param transDateStart 交易开始日期
+     * @param transDateEnd
+     * @return ignored
+     */
+    RyxAccessResp reqHistoryTransRecord(String merInId, String transDateStart, String transDateEnd);
+
+    /**
+     * 查询当天得结算信息
+     *
+     * @param merInId 瑞银信商户id
+     * @return ignored
+     */
+    RyxAccessResp reqTodayTransRecord(String merInId);
+
+    /**
+     * 查询缺失最近打款记录的用户
+     *
+     * @param lastDate 最后日期
+     * @param page     页码
+     * @param size     页长
+     * @return ignored
+     */
+    List<Map<String, Object>> getNoRecentDayUserPage(String lastDate, int page, int size);
+
+    /**
+     * 拉取打款数据
+     */
+    void pullTransRecord();
+
+    /**
+     * 拉取昨日打款数据
+     */
+    void pullYesterdayTransRecord();
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ryx/impl/RegionCodeRyxServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ryx/impl/RegionCodeRyxServiceImpl.java
new file mode 100644
index 0000000..e6df86d
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ryx/impl/RegionCodeRyxServiceImpl.java
@@ -0,0 +1,19 @@
+package cn.pluss.platform.ryx.impl;
+
+import cn.pluss.platform.entity.RegionCodeRyx;
+import cn.pluss.platform.mapper.RegionCodeRyxMapper;
+import cn.pluss.platform.ryx.RegionCodeRyxService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 瑞银信进件，地区编码 服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-01-15
+ */
+@Service
+public class RegionCodeRyxServiceImpl extends ServiceImpl<RegionCodeRyxMapper, RegionCodeRyx> implements RegionCodeRyxService {
+}
\ No newline at end of file
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ryx/impl/RyxCertServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ryx/impl/RyxCertServiceImpl.java
new file mode 100644
index 0000000..d1dcde1
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ryx/impl/RyxCertServiceImpl.java
@@ -0,0 +1,293 @@
+package cn.pluss.platform.ryx.impl;
+
+import cn.pluss.platform.SubMerchantApplyOrderService;
+import cn.pluss.platform.channel.MerchantCertService;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.merchant.MerchantPluginService;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.notice.NoticeService;
+import cn.pluss.platform.ryx.RyxConstants;
+import cn.pluss.platform.ryx.RyxService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.user.impl.GeneralPushUtil;
+import cn.pluss.platform.util.OssOperatUtil;
+import cn.pluss.platform.util.RyxConfig;
+import cn.pluss.platform.util.SendMsgUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+
+import java.io.ByteArrayInputStream;
+import java.util.*;
+
+/**
+ * @author DJH
+ */
+@Slf4j
+@Service("ryxCertService")
+public class RyxCertServiceImpl implements MerchantCertService {
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantChannelStatusService mcsService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantPluginService merchantPluginService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private SubMerchantApplyOrderService merchantApplyOrderService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private RyxService ryxService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private NoticeService noticeService;
+
+    @Setter(onMethod_ = {@Autowired,@Lazy})
+    private UserAppService userAppService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private SendMsgUtil sendMsgUtil;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantBaseInfoService merchantBaseInfoService;
+
+    @Autowired
+    private GeneralPushUtil generalPushUtil;
+
+    @Override
+    public void wxCert(String merchantId, String merchantCode) {
+        // 不需要进行微信认证
+    }
+
+    @Override
+    public void wxReCert(String merchantId, String merchantCode) {
+        // 不需要进行微信认证
+    }
+
+    /**
+     * 通过商户编码查询商户信息，并获得微信认证结果
+     *
+     * eg. 微信认证json
+     * {
+     * 	 "applymentState": "待确认联系信息",
+     * 	 "rejectReason": "请扫描微信支付返回的小程序码确认联系信息。",
+     * 	 "certificationType": "1",
+     * 	 "docId": "",
+     * 	 "qrcodeData": "data:image/png;base64,/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDABQODxIPDRQSEBIXFRQYHjIhHhwcHj0sLiQySUBMS0dARkVQWnNiUFVtVkVGZIhlbXd7gYKBTmCNl4x9lnN+gXz/2wBDARUXFx4aHjshITt8U0ZTfHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHz/wAARCAEYARgDASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwDs6KKKACiiigAooooAKKKKACiiigAooqrf6hbabAJruTYhO0cZyaALVFRWtzFd26T27h43GVYVLQAUyaaOCJpZnCRoMsx6AU+srxOgfw/eAkjCZ49iKAL1ne299D5trKsqZxlfWp64/wCH8hMN5F2DK355/wAK7CgAooooAKKK5bxX4hudLuobezKBiu9yy578CgDqaKitZGmtYZHXazoGI9CRUtABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRVe+vYdPtXubgkRp1wMmgCxRVPTdTttUt/OtXLKDggjBBq5QAVh+LdPkv8ASCIELyxMHVV6nsa0dVvDp+nT3SpvMa5C+tZ/hvXv7ailEkaxzREZVT1B70AReDIrmDSGjuo3jAkOwOMHHH9a6CsWTxFDHri6WYXLEhd/bJGelM8SxavILf8AshmABO/awB7Y60AbtVNWjMulXaAAloWAz9KngEggjEpBk2jdj1xzTyAwIIyDwaAOF8AOBf3SE8tGCB9D/wDXrqX12yTVBpzO3nkgfd4z6Zo0zQ7LSpZZbVGDScHc2cD0FSNo9i+oi/aEG5HO7J6+uKAF1HVbPTBH9sl8vzD8vBOfyq2jK6K6nKsMg+orivHMFxNqFr5cTOnl4UqpPOf/ANVdhZQ/Z7KCH+5Gq/kKAJ6841I/2t4uMY5UzCMfQcH+tegXk4tbOadukaFvyFcJ4LgN1rj3D8+Uhcn3PH9TQB6CBgADoKCQoJJwB1NYh8T239tDTVicnfs8wEY3VszRiaF42yA6lTj3oA5Cz8QX2oeJ1htXzabyNm0fdHU5rsqxtD8OwaNJLIkjSyOMbmGMCtmgAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACq2o2UeoWUtrL92QYz6Hsag1HW7DTOLqcB/7i8t+VUoPF2kzShPOePJxl0wPzoAyfC2manpmsypLEy2xUhm/hbHQiuzpqOsiB42DKeQQcg06gCOeFLiCSGQZSRSpHsa5zw54cudI1KWeWZGiKlVCk5PPeunooAoX506xzqF3HGrrgebsy1WLO8gvrdZ7aQSRt0Iqj4ksDqOjzRICZFG9AO5HasbwP9qW1vIHR40BBQsCMMc0AddRXBeE764g197W4ldvN3KQzE/MP/wBRrvaAM2212yutRewidjMmQcrwcdcGopPEVnHrA00h/NLBd3G0E9qlg03TbbU3uIlRbuTJPz889eK4u7/5Hc/9fa/zFAHo1Fc/qF/q8XiCC3toC1mxXc2zIIPXntXQUARXVvHd20lvKMpIpU1Q0nQ7fSIZktWctL1dzz7VqVi+JdTvNMtoXsoBKzvhiVJx+VAGX4e8M3VnqrXeoBCEyUw2cse9a1j4js7/AFJrGESbxnDEcNjrVfXNYktfDscrL5d1coFC/wB0kc/lWZ4F0z/WajKP9iPP6n+lAHZ0jMEUsxAUDJJ7Utch401vy0/s62f525mIPQf3aAOhsNXstSkkS0m8xo/vDBHFXq5nwfpJ06ye8ufkkmHRuNqe9WrnxZpVvKYzM0hHUxrkfnQBuUVm6dr2n6k2y3nHmf3HG0n6VpUAFFFFABRRRQAUUUUAFFFFABRRVe+vbfT7cz3T7IwcZxnmgCxWfruof2ZpU1yPvgbU/wB49Knsb+11CLzbSZZF746j6isvxjA82gy+WCdjK5x6DrQBkeHPD0d/EdS1QmYyklVY9fc1rz+HdGv4HS3iiRhwHhblTR4aniv/AA7HAj4ZEMTgdVNP8P6CNDE5Nx5vmY/hwABmgDH8L3M+mavNo10xZcnZ6Ajnj2Irc8RajdabYLNZwiVy4U5UnA9eK5+ykGo+OnuLb5oo85YdMBcZ/Ou2oAqaZcS3enQT3EflyuuWXGMVboooA5STxTPB4jaymiRbYSeXkg7h71o6p4ih0zUIbR4XcyAEsvQZOPxqpr3hc6pqCXUEyREgCQEdcd63XsbaVo3mgjkkjACuygkUAcDriHSvFfnrwpkWYfQ9f616KrB1DKcgjIrE8QeHE1qWGUTeS6DaTtzkVsW8It7eOFSSI1Cgn2FAHn+qyvbeNfMLEkToRj0OOPyrpJfDEcmvjUvPwu8OY9vUj3zXN+MV8nxHvUbSVRs+p9f0r0KNt0asDkEA59aAHUVz+ny623iCdLtGFiC20lRjHbBrU1eZrfSrqVM7kiYjHrigCxHNFKWEciOV4IVgcVk2XiKG81iXTlhdWQsA56HHXisDwDG7Xl3Nk7AgU+hJNdklnbRztPHBGszfecKAT+NAFTV9IttajSOd2UxNkFCMirdnaxWVrHbQAiOMYGax9F8Pz6bqlxdyXQkSQEBQDnk55rbnmjt4XllYLGgyxPYUAMvpZILKeWFd8iRkqvqcVw3hvRp9U1Jry/RvKRtzbwRvb0rb0bxQ+q6u1qtuFhwSrg84HrXS0Ach4uvJrm8t9GtCVMmN+OM56D6d60LTw1pOn2yi6SORzw0kp6n2rJ11vsHjG0vJxiE7TuPT0P5Vu69ow122hVLjywjbgQMggigDH8ReGoILU3+ljyXiG8qp4I9R71t+G9SOp6THLIcyp8kh9SO9R6s8Wk+Gnhkk3Yh8pM9WOMVV8DwPForO4IEkpZfcYA/pQB0dFQXl7b2MJlupViQdz3+lMsNQttSgM1pJvQHaeMYNAFqiiigAooooAKKKKACqeqadDqlm1tPkKTkFeoPrVyigDza7sNT8MXYmhdth6Sp91h6EV1GjeJrTV0+zXSrFOwwVY/K/0/wrcufI8lhcmPyjwfMxg/nXG614QP8Ax86Qd6nkxZ6f7poAlufDOo6ZdNc6FOdrH/V5wQPTngio5LPxVqI+z3L+VE3DHKgY98c1u+GP7QGmbdTDiRWwm/723HetmgDE03TrPwzp0ks0uScGWUjr6ACqHiaZ9V0SO80uZmhicl9uVOP/AK1dFfWUOoWr21wCY364ODVIiw8N6UQQwtw3IPzFiaAKPg3VpdQsnguCWkt8Def4gema6IsF+8QPqazdEuNNuoHk0tI0Un51Vdpz7isnxxZTz2cNzCWKwE71Hoe9AHTvko2372OPrXCeH9Yu7TXmtdRnkZZGMbB2yFbPBrZ8I659vtvslw+bmIcE/wAa/wCNZ3jHRpmvY72yhdzJw+xckMOh/wA+lAHa9Kq2mpWd87pa3CStH94KelFh5smnQfahiVox5gPrjmqOmaLY6HNLNHK2ZBj94w4FAHN+Poiuo20vOHi29PQ//XrsrCQnTLeRlK/uVJHpxVa7udKuNouvKm2nI3LuxUg1axA2iXAA/umldE88e5V0XxDDrE80UcLxmMZyxzkVev76ys0C300cayZAD/xetV7W40qBna28mJnPzELtzTNV0ez10RNLK37vODGw5BouhqSexftbe3t4sWsUcaN83yDAPvVdtYsV1EWBnH2knG3B6+masspt7MrAuTHHhB64HFcZ4Y0e7uNXa/1CORPKbd+8Ugs5/wAKYzua4zxzqE3mRadFkI6h2x/FzwK3tc1630ZE8xTJK/SNTg49as2UsGp2kF55I+ddy71BK0AZfh3Qjp2mSFvkvJ0O5v7noKh0iCTw3BcS6xeqUkYBBuLc8101cP4k0rVtT1wqkTvBwI2z8qjHP60Ab95a2PijTA0UmQCfLkA5U9+Kwo9P8T6VmCzk82AfdIKkfkeldPo2mppOnpbIxcjlm9SetXiQoyxAHqaAOMh8Oarq1ws2t3BVFP3Mgkj2xwK1NX8QWehQraWyiSZF2rGDwn1roK5648JWl1qkl5PLIyyNuMXQZ+vpQBy0Nrqvim8MrklAcF24RB6Cu70fSodIsxbwktk7mY9Satwwx28SxQoscajAVRgCpKACiiigAooooAKKKKACqt3qVnYuiXVwkTSfdDHrVqsrV9AtdXmiluGkVoxj5CORQAniPSX1jThDFIEdW3rnoeOlc/4YTWdP1RbKeKUW3O8MMqOOoNb3iPUbjSdNWa0jVjuCksMhRisnTPG8Um2PUYjG3eROV/KgDqmmiSQRtIiu3RSwyfwrE8Raxf6bc20dnbCVJBliVJ5z04rO8QaJJrEg1TS51nyoGwH09D/SqGm+KL/TJha6lG0qLwQ4w6/40Ad8pJUEjBI6VU1XTotUsXtZSVDchh2PY1m+I7PU75LY6XMYwMlwH2emDWq1xHZW0RvZ40OApZmwC2KAPOf9P8Mar/dYf98yLXf6XqdtrVl5keDkbZI26r7GjVNNtdastjkNkZjlXnafUVj+GvDt3pF/LNPLGYyhUBCeeRQBHa+FJ7LX47q2mRbVH3AEncB6V0N5qMFmPnbc/ZR1rP1LWNpMNqeehf0+lYbEsSWJJPUms5Ttsc9StbSJoXOs3M2RGREv+z1/OqDOznLsWPqTmm0Vk22crk5bhRRRSJCnI7xnKMyn1BxTaKBmnba3cQ4EuJV9+D+dbdpfwXi/u2w3dT1FcjTkdkYMhKsOhFWptGsK0o7lvVvC9zqeuG5knT7K2MjJ3AAdAK3Ly8tNE08M+EijXaiDqfQCq2mawJSsNycP0DdjVPxRoF1rE9u9vJGqopUhyR+NbJpnZGSkro52HVdW1nWozbySLlwRGjEKqg969GrM0bR7fRbTamDIRmSU9/8A61YmveMEi3W+lkO/Qzdh9PWmUddXnl+da1/Unt/LkVEcgJgqijPU1t+D49Ubzrm/klMMgGwSMSSc9cdq0PEp1EacBpYYyl8Ns+9tx2oAiOp2nhzTILa7uPOnjTG1OST/AEH1rHsvFGp6lq8UdtAogLgMgXJC56k1Bp/hKR1N1rM/2eMcspb5j9T2q1ceJtN0mI2+i2yuehfGF/xNAHZVma7q66NZCcxGVmbaqg4GfeuPtode8QXCzmSRIwchySiL9BXezW0NzCIrmNJl9HGefWgDkNF1vWtV1eNgv+i7v3gVPlUfX1rtaZFFHCgSJFRB0VRgCn0AFFFFABRRRQAUVi+JbzUbO2hbTIjIzPhyE3YH0q59uNro63l8hVliDSKo5z6UAXWVXUqwDKeoI61z+p+ELC83Pb5tpT/d5X8q0tI1aDV7Zp7dXUK20huoNXgwJIBBI6jNAGZoGkf2NZNAZvNLPuJxgCrs9la3Lq89vFIy9CygkVPRQAgZc7QRkdqyPEminWbNUjk2SxEsmeh46GoNP8Pz2mvTag90HjcsQmDnn1qW98RQ2esRac0LszlQXHQZ6UAZvhG01axupre7jdLUKcbjkbs9q0da1Erm2hbB/jYdvatDUrsWdqzj754Ue9cmzFmLMck8k1nOVtDnrVLe6hKKKKxOMKKKKACinKjMflUn6Cn/AGebGfJfH+6adh2ZFRSlSpwwIPuKSkIKKKKACuh0bUfOUW8x/eD7pPcVz1OR2jdXQ4ZTkGqi7MuE3B3L/i+DVbowwWMcj27g7wnc57+1JoXhKG02z6gFmm6hOqp/ia37G6W7tlkHXow9DWdH4ihk1xtLELhgSu/tkDPSug9BO6ubDMsaFmOFUZJ9BVTTtVs9TEn2OXzPLPzcEY/OrciLLG0bjKsCCPaqOl6NaaT5n2RWBkxuLNnpQMNb0z+1tPa180xEsGDYz0rP0vwlY2JDzj7VKO7j5R9BXQUUAIAFAAAAHYUtUtW1KLSrJrmZWZQQAq9STXI3Xjm6kyLS2jiHYsdxoA7uiuf8KajqOoRTNqCHYMeW5Tbnrn610FABRRRQAjEhSQMkDpXBt4z1OG5cTQRYB+4VIIruppo4ImlmcJGgyzHoBWSNW0K/cK81tI2cDzFxz+IoAt2upRz6SmoSqYozHvYHnAqOx1Gx161mWIGSIfK6OuKvSQxSW7Quq+Uy7SvQYqrpdjY2ETJYBQrnLYbdk0APs4bKyBtbQRRH7xjU8/WsvRfD8+m6pcXcl0JEkBAUA55OeadF4cEfiBtU+0kgsW8vb3Ix1rdoAKKKKADpVdrS1mmW4aGJ5V+7IVBI/Gm6naNfafPbJJ5bSLgN6VR0TTZND0yWOeYSnJfjoOOn6UAUNbufOvCgPyx8fj3rOpzsXdmPVjk02uZu7PNk+Z3CiinIjSOqKMsxwBSJH29vJcyCOJdx/lW9aaJDEA0/71/TsKt2FmlnAFAy5+83qatVtGFtztp0kldjEiSMYRAo9hTsUtFaG5HJDFKMSIrD3FZd5ocbgtbHY3909DWxVK61S2tsgvvf+6vNS0upnNRa945eWJ4ZCkilWHUGmVp3Dz6s+6K3AVO//wBesw8HBrBqxwyVnoFFFFIk1dBufLuTCx+WQcfWtv7JapcG68mJZu8m0Z/OuShkMUySDqrA10Wt6e+r6WYIZREzEMCeh9q2pvSx2UJXVjQklWOF5WPyKpYkegrjrvx02SLO0AHZpG/oK6XSNPaw0uOzmkExUEE9jk9KSDQ9MtnLxWUQYnOSM4+melaHQcSdU8Q6vlYTOVPGIU2j866/w1a39ppxTUXLSFsqGbcVGOmao+KZNYhaFdKWQQ7fm8pcnOaZ4Wi1tLqRtSMvkFTgStk7uOlAGzqsum+QYdTkhEbc7ZG6+9VdGXQ5dw0yOBmTr8vzD355qnrvhZtW1D7Ut0IwQFZSucY9KuaF4eh0VpJEleWSQAEkYAHsKAKus+LItMuntY7dpZExuJbCjisNvGupSyqIYIQM/cClia6+60TTry48+5tUkl7k55+tWILG1tv+Pe3ij/3UAoAkgdpII3ddrMoJX0OKKkooAgvbSO+tJbabOyQYOOtcx/wgsAmVlvJNgPIKjP5111FAFDV7BtQ0uS0il8pmAAY+xrk7TwjqttexOs8aorAl1c+vpXd0UAZuv217daY0WnyFJiwOQ23I7jNSaNBdW+mQxX0nmTrncc578c1eooAK5+XWb9PEq2C2oNsSBv2nOMdc9K6Ck96AMnxBrf8AYsEUgg84yNtxnAFSXV19o0L7QFK+bGDtPbNXZvszhVn8pgTwHwefxqtrAA0yQLgAY/nSexM/hZy1FFFcx5oVpaFEJL7cf4Fz+NZta3h5gLuRT1ZeKqO5pT+NHRVn3eomzu1SVP3LDhh1FaFZ+sW32izJA+eP5h/Wt3e2h2zva6LiTRyRiRXBQ85zVG61m3gysf71vbp+dc2GfG0FsHsDWlZaNLNh58xp6dzWfM3sY+1lLSKI5b+8v38tMgH+FKvWWhgYe6O4/wBwdPxrUt7WG2TbEgUevc1NVKPcuNLrLUaiKihUUKB0ArldUiEN/Ko6E7h+NdZXLa0wbUZMdgBSnsTXS5ShRRRWJxhXWWs+zSkmIJ2RZwO+BXJ11umf8g6D/drSnudGH3ZQ8Pa9/bfn/wCjmExY/iznOayfEPiDVbPUntbWIIgwFby9xbjtXWQxwxg+QiKCedgA5/Cn4B7Vsdhi+F7zUb2zkfUkKkMAjFNpYVFDFrY8Ss8jt/Z+Tgbht24449c10FFAGF4l0m91MW/2K4EXlk7gWK56c8VswI0cEaO25lUAt6nFSUUAFFFFABRRRQAUUUUAUtXv/wCzNOlu/LMmzHyg4zk4qPRtU/tXTRd+SYzkgrnPT0p19qmnWm6K8uIlOOUbk/lUmnXlleW+6wdGjU4wgxt/CgDjLnxpqTSMsMMUWD02kmpNK17XbvUYQUMkLsAwEWFAzyc123kxBy4jTcerbRk1h+Ib7VbO5tk0yAvGw+YiPdznp7UAWfEkeoyacBpZYS7vm2HBK4PSuQ/sPxFcnMizfP13zfz5r0VSSoLDBxyKAwb7pB+hoA8/i8GapI372SGMA9S5P8q664tWg0L7Ozl2iiALeuKoat4utdPuJLeOF55YzhucKD9auaLqn9u6bJI0PlHJQjOQeP8A69J7CkrqxztFOkQxyMh6qSDTa5jzAqezuDbXKSj+E8/SoKKBp2dztYpFljV0OVYZBpxGRg1zOmak1owjfLRE9PSumByM10RldHfCamitBp9tbyF44xuJ6nnH0q1RRVFpJbBRRUFzdw2qbpXA9B3NAN23Fup0toGkc8AfnXISyGWVpG6scmrOoX73snPyxj7q1TrCcrnFVqczsgoooqDEK6y2hJ0tIQxUtFjPcZFcvbxmaeOMfxMBXRazqQ0fTTcCLzNpChc4rWmjqw63ZV8N6HNo32jzrgS+aRgLnAxmo5rDV28SrcpORYggld/GMcjbUOmeMra8njgngeCRyFBB3Lk101anUFFFcDeeJtbs76VZVVFDEBHj4xn1oA76qWr3/wDZmnS3flmTZj5QcZycU3R799Q0uK7mj8pmByO3B61m/wDCX6RLI0Mhk2Zxlo8qaANHRNT/ALW09bryjESxUrnPStCobVoHt0e12eSwypQYGKekiPnY6tg4ODnFAD6KKKACiiuW8R+KJ9MvTaW0CFgoJd89/QUAS6t4Si1LUGu/tTx78bl257Y4rQ0TSbbR45IbeUyOxBcsRn8q4w3niLWGxGbgq3aMbF/Otfw74a1C01GO9vJFTbnKhtzNkd6ANrWtftdG2LMrySOMqi+nuaqaD4m/ti8ktzbeVtXcCGz6da0tR0ay1R42vIt7JwCGI49Kms7C1sU22sCRDvtHJ/GgCWeMywSRhipdSuR2yKx/DehzaN9o864EvmkYC5wMZrcqhq2rW2kW4muSx3HCqo5Y0ART+HtMuLxrqa2DyMctljgn6Vdj+zWu23j8qLP3YxgfpWHovioatqP2UWpjUglW3Z6etTX/AIcF5rkWo/aSgQqSm309DQBX1y28m78wD5ZBn8azK67ULQXls0Z+91U+hrk3VkcqwIYHBBrCaszhrQ5ZXG0UUVBiS2uz7TH5hwm4Ek1r3muYyloP+Bn+lYdFUpNbFxm4qyNOPXLpPvbH+oqX/hIJsf6lPzNY9FHMx+1n3NGXWruQYVljH+yKoO7yMWdizHuTTaKTbZLk3uFFFFIkKKKfFG0sixoMsxwBQM09Att9w07D5UGB9a3JGt5y1vIYpCRzGxB/Sks7ZbS3WJe3U+prJi8OeX4gbVPtJILFvL29yMda6IqyO+nHljYsJ4c0uO7S5jtQsiHcME4z64rVooqjQKwfEOvJpU8ED2guBKMnJ6DP0reqOSGKUqZI0cryCyg4oAcuGQcYBHSucuvBumzS5jkkgLHO0MCP1rpawNQ8Pz3evQ6gl0EjQqSmDnj0oA0f7NSLR20+3dkXyjGrHqM964v/AIRTWrWcG3ZSc8SJJjHvXoVFAEcCusEaytucKAx9TjmipKKACopLaCV1eWGN3XozKCRUtFACAY6UtISFBJIAHc02OWOZS0TrIBxlTmgB9QC8tmuTbCeMzjrHuG78qx9F8QT6lqlxaSWojSMEhgTng45px0K1tNYfWJblkAJYqxAUEjHWgBmtX+r22q20VjAXt2xuITdk5557cVo6rpFrq8SR3Qb5DlSpwRVuCeK5iEkEiyIejKciiaaO3iaWZ1jjUZLMcAUAVdO0my0xSLSEIxGC55Y/jVDXPE1tpYMUWJ7n+6Dwv1rD1zxdJclrbS9yITgyj7zfT0pdD8ISTMLnVcqpORFnlvrQBd8KanqupXc0l2S1rtODtAAbPQVp6zp3mg3EK/OPvAdxVq9vLTRbDe4WONBhI1GMn0ArJ8PeJZdYvpLeS3WNQhYFTnuOtJq5MoqSszLorodS0cTZltgFk6lexrAdGjYq6lWHUGsHFo4JwcHqNoooqSAooooAKKKKACiinxxvK4SNSzHoBQA0DJwOtdFo+nfZ086YfvWHAP8ACKXTdJW3xLPhpew7LVLxJ4hl0WeCOKBZBIpYljj8K2hC2rOylStqyLxbqGqae0EtkStvg72CgjOe9P0LxVBqG2C7xDc9B/df6elaWmala63Y70AYEYkibnafQ1zuu+D/AL1zpX1MH/xP+FaHQdnWF4l0m91MW/2K4EXlk7gWK56c8Vzui+KbnTXFrqSvJEpxlvvp/jXTa7c376VFNouXZyDlRk7SPegDVgRo4I0dtzKoBb1OKZJeW0dwsEk8azN91CwBP4VHpjXLadAb4YuCvzj3qhe+HYbzWItRaZ1ZCpKDocdKANqiis2w12y1C8ltbd2Mkec5XAODjigDSooooAKKKKACiiigDjfEdprmoam9tAsn2Q42YOE6c5NbPhvRX0a1kSWUSSSsGIXoK2aKAMHVPFGn6bIY0H2ibPzCPGB9TVqSOHxFoYGXijuFDD1XB/8ArVnx+D7CK7e5uJXlTcW2NgKPqe9Sp4n0uO8isLcMykhFaNRsBoA0dH0xNJsRbRyNIAxYs3qayPFej6hqsluLRl8lQdylsDPr710tFAGHofhq20pRK4E1zjlyOF+lblFFAHnOrw6nrOvSQGOQ7XKRgghVXPWuz0bR7fRbTamDIRmSU9//AK1adcj4z1zyozp1s3zuP3rA9B6UATweLPtWupZW8Cvbs+wSZOT7/St67soLtcSrz2YdRWB4O0P7Jbi+uF/fSj5AR9xf8TV7xLHqsltCNJZgwf59pAOO3WgTSejK1zoc8eTCRKvp0NZskMkRxJGyH3GK620MsdjEbxh5qxjzD745qpp2tWGrySxWxLNGMkMuMj1FZumuhhKgnsc1RXWT21gmDOkKZPG7C5pf7Ns/+eCVPs2Z/V33OSqSKCWY4ijZ/oK6iC3sGLCBIWKnnbg4qLU9YstHEQuSV8z7oRc9KaplLD92Z1toUz4M7CNfQcmtu1tIbRNsSAep7mlaQzWZktmBLx5jb6jiuQ8Ma9d/2o1jqUryGQkKX6qw7VaikbRpxjsX9R8VNp+tmzltx9nUgM+TuwR1rV1PTbXW7EJJggjdHIOq+4rN8W6J/aFr9qt1zcwjoP419Kq+BtRmmilsZcssIDIT2HpVGhzv+n+GNV/usP8AvmRa9C0nU4dWsluIcjsynqp9KNU0q21a38m6U8HKsvDL9KrWdpaeHLBo42dwzbvm6saBNpK7H6noOn6m4kuYsSD+NDgn6+tTxXFlZwpbpKipGoVRuzgCsG71Ce6J3NtTsg6f/XqrUORwTxmvuo6tb+1dsLOmfrVgEHpXGgEnABP0qxbXs9m3yMdvdG6UKQ4Yz+ZHV1Rs9HsrG6kubaEJLJncck9alsr2O8i3Jww+8p6irNWd0ZKSugooooGFFFFABRRRQAVV1C/g020a5uWIReOBkk+lWqq6jp8Gp2pt7kEoSDwcEGgDgtR1vUfENwLW1RliY8RJ3/3jW/oXhWLTtt3fssk6fMB/DH7+9benaVZ6XGUtIguerHlj9TVDxfcPb6DN5ZwZCEJ9j1oAzL3xZc3NybbRLYysD/rCu7P0Hp9ahfXPEdhia9s90I5bMeP1HStbwxawafoCXIXLyIZJGHU+1T6LrkOurOqwMgjxkPggg0AT6NrFvrFsZYcq68PGeq1o1xOnR/2V42ktLc7YJcgr7EZH6121ABXLx+Et2tyXt1OssJkMgTByTngGuoooARjtUkDOBwKwfDusX+pXNzHeWwiSMZUhSOc9Oa36KAKGuCdtHu1tlLStGQAOp9cfhWF4I0ya1S4ubmJo2fCKGGDjqTWprniGDRXiSSJpXkGcKcYFakEqzwRzJ92RQw+hoAyfEOg/235H+kGExZ/hznOK1o4hHbpDuJCoFz36YqSigDD0Hw9/Y1xPL9oMvmjAG3GBnNVfGumy3llDPbxtJJCxBVRk7TW+Ly2a5NsJ4zOOse4bvyqZmCKWPQDJoAy/DKXEeh2yXSMkigjDdcZ4pzaDYtqg1Eo3ng7uG4z64qDRvElvq91JbpE8ToNw3HO4VtUAFUNQubfR7Ga78gYGMhFALEnFX6ZLFHPG0cyK6N1VhkGgCno+ppq1iLqNGjGSpVuxFYmo3Rurpmz8i8KPat64jjs9NlS3jWJFU4VRgCuXqJM8/GTekQqa0gNzcJEDjceT6CnQ2NxOu6OIlfU8VY0YFdRAIwQDmpSOSEG5K60ZpS3FrparGqZYjoBz+NEc1pqqMhTDAdCOR9KzdZBOoEDkkDFXtLsGtC087AHb09BVX1sdsZylUcLe6jOjd9N1AgnhThvcV0ykMoI5Brlb+YXF5JIv3ScCt/SnL6fCT2GPyOKI9gw0velBbFyiiirO4KKKKACiiigAooooAKzfEGnnUtJmgT/WY3J7kdq0qKAOP8MeIIIbUabqJELxZVWfgEeh9DWu+qaLpMDvBJbrnnZDglj+FSan4d0/U2LzRlJT1kj4J+vrVGDwXpkUod2mlAP3WYYP5CgDO8NRTatrs+sTKURSdvoSRjH4Ct7xHa393YLHpshSQOC2G2kjHrVfxFqSaFpaw2arHLJlYgowFHc0zwdcX11p8s19I8is/wC7L9cd/wAKANbTIriDToI7x986rh2znJ+tTzzJbwSTSnakalmPsKkrlfHGpCGzSxjPzzfM/so/xNAGdoGpX+peJTL50nkfMzoW+VV7DH5VtaX4oTUtWayS3Kp822TdnOPasiziOjeELi6Ybbi7+VT3APA/TJo8DWbA3V+U3bF2R+56n+lAFHxDIdU8U+QnIDrCP6/zNeiIgjRUUYVQAK4DwnbSXniJ7mZD+73SMT/eP/669BoAxZPEUMeuLpZhcsSF39skZ6UkniW3j1saYYmJLBDJkYDGrUc2lXGqMsZge+j6nHzDHvXFXf8AyO5/6+1/mKAF3tbeOCdxY/asZz2P/wCuvRCMjBrzrxEPs/i1n+4PMjfPT05r0UHIyKAOO0vw/fWHifzkTForMQ+4cqQeMVp634mXSL+O2a3MgKhmbdjAPpW/XH+PbHdDb3qD7h8tz7Hp/WgCt4o1G/staguIZ5Ft2RXjCt8rDvxXZWd1He2kVxEcpIoYVxyRHW/BowN1xZEgepA7fl/KrHgXUg0cmnyHlfnj+ncUAdPqCl7GYLydprnbCEXF5HG33ScmuqIyMVzMyNpmoggfKpyvuKiXc4cVH3ozexo6pftaFYIFAO3r6CqOjEnUATySDWlJDaaqiuHwwHUHkfWiK3tdLVpGfLEdSefwotrcJQlKop391GbrJK6iSDggAiq899cTrtklJX0HFNu5zc3DykY3HgegqGpbOKc25Oz0YV1GkqU06EHrgn8zmudtLdrq4WJe55PoK6xFCKFUYAGAKqCOrBwd3IdRRRVnohRRRQAUUUUAFFFFABRRRQAUUUUAZ+q6Naat5f2tWJjztKtjrVyCGO3hSKJQsaDCgdhUlFABWJq/hq31a+juZZnTaArKoHzAVoanby3enTwW8nlyuuFbOMVT8P2FzpWnPHfTiRtxfO4kKMepoAt3+m22oWf2SdT5QxjacEY6U+wsYNOtVt7ZSsa88nJJrN0jxLb6tfSW0ULoVBZWYj5gK26AEChc4AGeuBS0UhOBk9KAMq08P2lpqsmoRtIZHJO0kYGetchdo3/CcY2nJulOMduK7ew1ey1KSSO0m8xo/vDBFMebShqyo5g+39sj5+nr9KAOQ8cQtHrccoBIkjXH1BxXeQFmgjLDaxUEj0OKJIYpSpkjRyvILKDipKAM3X7G51DTWgtJfKkLA5JIyPSmWWkk6Gun6k/nkghiGPrkYNajEhSVGTjgVg+Hb/Vru5uV1KAxxqPlJTbznp70AX9NsbHSozZ2zAFjuKs+WNU9O8M22nao19FK5znahAwuaSXw4JPEC6p9pIAYN5e3uBjrVvX7G51DTWgtJfKkLA5JIyPSgDSqte2aXkWxuGHKt6GotGtJ7HTIbe6l82VM5bOe9XqBSipKzOTubSe0f51IHZh0NQEknJJP1rsioYYIBHvVR9Ms3OTCB/ukj+VQ4nBPBv7LOXqa2tZrp9sSE+p7CuiTS7NDkQgn3JP86tKqooVQAB2FCgKGDd/eZWsLFLKMgHc7feardFFWd8YqKsgooooKCiiigAooooAKKKKACiiigAooooAKKKKACsTxbffY9ElCn55v3a/j1/Stuqep6ZbarbiG6DFQ24FTgg0Ac34CsdsU9645Y+Wh9up/pXYVBZ2kNjapb267Y0HAzmp6ACkIDAg8g9aWs3xDcNa6JdyoxVtmAR2J4oANM0Oy0uWWW1Vg0nB3NnA9BUcnh+0k1gamWk80ENtyNuQMVk+A5Z5ba782RnQONu4kkHHP9K6ygDG8R6zLo9vDJDAJTI2DuzgVpWU5urOGdk2NIgYr6ZFTFQwwwBHvS0AFYmreJbfSr+O1kidywBZlP3Qa265LxdoV3qF3DcWUfmHbscZAxzwf1oA6wEMAQcg8ilqGzjeGzgjkOXSNVY+4FTUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABUVxbxXUDwTrvjcYZfUUUUARWGn22mwGG0j2ITuPOcmrVFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFAH//2Q==",
+     * 	 "contactPersonCred": "4212**************",
+     * 	 "docPath": ""
+     * }
+     * @param merchantId 商户编号
+     */
+    @Override
+    public JSONObject wxCertResult(String merchantId, String wxApplyNo) {
+        // 查询商户微信认证结果
+        wxCertResultMain(merchantId);
+        // 查询商户插件微信认证结果
+//        wxCertResultPlugin(merchantId);
+
+        return null;
+    }
+
+    @Override
+    public JSONObject wxCertCallback(JSONObject certResult) {
+        // 不存在回调
+        return null;
+    }
+
+    @Override
+    public void wxCertCancel(String merchantId, SubMerchantApplyOrder subMerchantApplyOrder) {
+        // 不需要主动进行微信认证
+    }
+
+    private void wxCertResultMain(String merchantId) {
+        MerchantChannelStatus existData = new MerchantChannelStatus();
+        existData.setChannel(3);
+        existData.setMerchantId(merchantId);
+
+        existData = mcsService.getOne(new QueryWrapper<>(existData));
+        if (existData == null) {
+            return;
+        }
+
+        UserApp userApp = new UserApp();
+        userApp.setMerchantCode(existData.getMerchantCode());
+        userApp.setUserType("promoter");
+        userApp = userAppService.queryUserApp(userApp);
+
+        JSONObject extra = existData.getExtra();
+        // 瑞银信内部进件序号
+        String merInId = extra.getString(RyxConstants.MER_IN_ID);
+
+        Map<String, Object> map = new HashMap<>();
+        map.put("merInId", merInId);
+
+        RyxAccessResp resp = ryxService.reqCommon(map, null, RyxConfig.merchantInfo);
+        log.debug("解密出的商户信息===== \n{}", JSON.toJSONString(resp));
+
+        resultProcess(userApp, 3, resp);
+    }
+
+//    private void wxCertResultPlugin(String merchantId) {
+//        MerchantPlugin merchantPlugin = new MerchantPlugin();
+//        merchantPlugin.setChannel(RyxSfbPluginServiceImpl.SFB_PLUGIN_CHANNEL);
+//        merchantPlugin.setPluginId(merchantId);
+//        merchantPlugin = merchantPluginService.getOne(new QueryWrapper<>(merchantPlugin));
+//
+//        if (merchantPlugin == null) {
+//            return;
+//        }
+//
+//        UserApp userApp = new UserApp();
+//        userApp.setUserId(merchantPlugin.getUserId().longValue());
+//        userApp = userAppService.queryUserApp(userApp);
+//
+//        JSONObject extra = merchantPlugin.getExtra();
+//        // 瑞银信内部进件序号
+//        String merInId = extra.getString(RyxConstants.MER_IN_ID);
+//
+//        Map<String, Object> map = new HashMap<>();
+//        map.put("merInId", merInId);
+//
+//        RyxAccessResp resp = ryxService.reqSfbCommon(map, null, RyxConfig.merchantInfo);
+//        log.debug("解密出的商户信息===== \n{}", JSON.toJSONString(resp));
+//
+//        resultProcess(userApp, RyxSfbPluginServiceImpl.SFB_PLUGIN_CHANNEL, resp);
+//    }
+
+    private void resultProcess(UserApp userApp, int channelId, RyxAccessResp resp) {
+        JSONObject wxCertificationInfo = resp.getResult().getJSONObject("wxCertificationInfo");
+
+        SubMerchantApplyOrder subMerApplyOrder = new SubMerchantApplyOrder();
+        subMerApplyOrder.setChannelId(channelId);
+        subMerApplyOrder.setMerchantCode(userApp.getMerchantCode());
+        QueryWrapper<SubMerchantApplyOrder> qW = new QueryWrapper<>(subMerApplyOrder).orderByDesc("createTime").last("limit 1");
+        SubMerchantApplyOrder existApplyOrder = merchantApplyOrderService.getOne(qW);
+
+        String applymentState = wxCertificationInfo.getString("applymentState");
+        String rejectReason = wxCertificationInfo.getString("rejectReason");
+
+        if (existApplyOrder != null) {
+            subMerApplyOrder = existApplyOrder;
+
+            boolean isSameStatus = StringUtils.isNotBlank(subMerApplyOrder.getResultStatus()) && subMerApplyOrder.getResultStatus().equals(applymentState);
+            boolean isSameReason = StringUtils.isNotBlank(subMerApplyOrder.getRemark()) && subMerApplyOrder.getRemark().equals(rejectReason);
+
+            if (isSameStatus && isSameReason) {
+                // 如果是一个状态，同一个驳回理由，那么不再处理
+                return;
+            }
+        }
+
+        subMerApplyOrder.setRemark(rejectReason);
+        subMerApplyOrder.setSubMchType("WX");
+        subMerApplyOrder.setStatus("1");
+
+        subMerApplyOrder.setResultStatus(applymentState);
+        String qrcodeData = wxCertificationInfo.getString("qrcodeData");
+        String wxAuthorizationStatusName = wxCertificationInfo.getString("wxAuthorizationStatusName");
+        if (Objects.equals("已授权", wxAuthorizationStatusName)) {
+            LambdaUpdateWrapper<MerchantChannelStatus> uWrapper = Wrappers.lambdaUpdate();
+            uWrapper.set(MerchantChannelStatus::getAuthorizationStatus, MerchantChannelStatus.AUTHORIZATION_STATUS_AUTHORIZED);
+            uWrapper.eq(MerchantChannelStatus::getMerchantCode, userApp.getMerchantCode())
+                    .eq(MerchantChannelStatus::getChannel, channelId);
+            mcsService.update(uWrapper);
+        }
+
+
+        Notice notice = new Notice(1, 1, userApp);
+
+        String pushMsg;
+        switch (subMerApplyOrder.getResultStatus()) {
+            case "审核中":
+                pushMsg = subMerApplyOrder.getRemark();
+                generalPushUtil.sendAllPlatByAlias(Collections.singletonList(userApp.getUserId().toString()), "商户微信认证通知", pushMsg, "1");
+                notice.setConrtent(subMerApplyOrder.getRemark());
+                noticeService.saveNotice(notice);
+                break;
+            case "未提交":
+            case "审核驳回":
+                pushMsg = "您好！您的商户微信认证因“##”被驳回，请联系收银呗客服修改资料并重新审核";
+                pushMsg = pushMsg.replace("##", subMerApplyOrder.getRemark());
+                generalPushUtil.sendAllPlatByAlias(Collections.singletonList(userApp.getUserId().toString()), "商户微信认证通知", pushMsg, "1");
+                notice.setConrtent(pushMsg);
+                noticeService.saveNotice(notice);
+                break;
+            case "审核通过":
+            case "待确认联系信息":
+                // 将base64转为inputStream
+                qrcodeData = qrcodeData.replace("data:image/png;base64,", "");
+
+                byte[] decode = Base64.getDecoder().decode(qrcodeData);
+                ByteArrayInputStream bais = new ByteArrayInputStream(decode);
+                String path = OssOperatUtil.upload(bais, UUID.randomUUID().toString(), "png");
+                subMerApplyOrder.setInfoQrcode(path);
+
+                String content = "请商户进行" + (channelId == 3? "": "插件") + "微信实名认证，短信将发送至商户联系人手机号，已认证可忽略";
+                generalPushUtil.sendAllPlatByAlias(Collections.singletonList(userApp.getUserId().toString()), "商户微信认证通知", content, "1");
+
+                notice.setConrtent(content);
+                noticeService.saveNotice(notice);
+
+                QueryWrapper<MerchantBaseInfo> queryWrapper = new QueryWrapper<MerchantBaseInfo>().eq("userId",userApp.getUserId());
+                MerchantBaseInfo merchantBaseInfo = merchantBaseInfoService.getOne(queryWrapper);
+
+                try {
+                    sendMsgUtil.verifyMsg(merchantBaseInfo.getContactMobile(), userApp.getMerchantCode() + "?i=" + channelId);
+                } catch (MsgException e) {
+                    log.error(e.getMessage());
+                }
+                break;
+            default:
+                // 未提交、已作废 等不做处理
+                break;
+        }
+
+        merchantApplyOrderService.saveOrUpdate(subMerApplyOrder);
+    }
+
+    @Override
+    public void wxCertAuthStatus(String merchantId) {
+        MerchantChannelStatus mcs = new MerchantChannelStatus();
+        mcs.setMerchantId(merchantId);
+        mcs = mcsService.getOne(Wrappers.query(mcs).last("limit 1"));
+
+        JSONObject extra = mcs.getExtra();
+        String merInId = extra.getString(RyxConstants.MER_IN_ID);
+
+        Map<String, Object> map = new HashMap<>();
+        map.put("merInId", merInId);
+
+        RyxAccessResp merchantInfo = ryxService.reqCommon(map, null, RyxConfig.merchantInfo);
+        log.debug("解密出的商户信息=====");
+        log.debug(JSON.toJSONString(merchantInfo));
+
+        JSONObject result = merchantInfo.getResult();
+        if (result == null) {
+            return;
+        }
+
+        JSONObject wxCertificationInfo = result.getJSONObject("wxCertificationInfo");
+        if (wxCertificationInfo == null) {
+            return;
+        }
+
+        String wxAuthorizationStatusName = wxCertificationInfo.getString("wxAuthorizationStatusName");
+        if ("已授权".equals(wxAuthorizationStatusName)) {
+            LambdaUpdateWrapper<MerchantChannelStatus> uWrapper = Wrappers.lambdaUpdate();
+            uWrapper.set(MerchantChannelStatus::getAuthorizationStatus, MerchantChannelStatus.AUTHORIZATION_STATUS_AUTHORIZED);
+            uWrapper.eq(MerchantChannelStatus::getId, mcs.getId());
+            mcsService.update(uWrapper);
+        }
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ryx/impl/RyxChangeRateNewServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ryx/impl/RyxChangeRateNewServiceImpl.java
new file mode 100644
index 0000000..7fd6893
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ryx/impl/RyxChangeRateNewServiceImpl.java
@@ -0,0 +1,36 @@
+package cn.pluss.platform.ryx.impl;
+
+import cn.pluss.platform.channel.BaseMchChannelRateNewService;
+import cn.pluss.platform.channel.BaseMchChannelRateService;
+import cn.pluss.platform.entity.MerchantRate;
+import cn.pluss.platform.entity.MerchantRateNew;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author DJH
+ * 瑞银信修改费率接口
+ */
+@Service("ryxChangeRateNewService")
+public class RyxChangeRateNewServiceImpl extends BaseMchChannelRateNewService {
+
+    @Override
+    public void process(String userId, MerchantRateNew merchantRate) {
+        // 此处不做任何变更，费率变更请求在凌晨两点的定时任务中发出
+    }
+
+    @Override
+    public String getChannelId() {
+        return "3";
+    }
+
+    @Override
+    public MerchantRateNew getDefaultRate() {
+        MerchantRateNew rateNew = new MerchantRateNew();
+        rateNew.setChannel(3);
+        rateNew.setWxRate(38);
+        rateNew.setAliRate(38);
+        rateNew.setBankRate(38);
+        rateNew.setBankRateLarge(38);
+        return rateNew;
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ryx/impl/RyxChangeRateService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ryx/impl/RyxChangeRateService.java
new file mode 100644
index 0000000..7394e45
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ryx/impl/RyxChangeRateService.java
@@ -0,0 +1,18 @@
+package cn.pluss.platform.ryx.impl;
+
+import cn.pluss.platform.channel.BaseMchChannelRateService;
+import cn.pluss.platform.entity.MerchantRate;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author DJH
+ * 瑞银信修改费率接口
+ */
+@Service("ryxChangeRateService")
+public class RyxChangeRateService extends BaseMchChannelRateService {
+
+    @Override
+    public void process(String userId, Integer rate, MerchantRate merchantRate) {
+        // 此处不做任何变更，费率变更请求在凌晨两点的定时任务中发出
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ryx/impl/RyxMerchantAuditServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ryx/impl/RyxMerchantAuditServiceImpl.java
new file mode 100644
index 0000000..eab32c1
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ryx/impl/RyxMerchantAuditServiceImpl.java
@@ -0,0 +1,630 @@
+package cn.pluss.platform.ryx.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.jiguang.common.utils.StringUtils;
+import cn.pluss.platform.channel.BaseMerchantAuditService;
+import cn.pluss.platform.dto.AccountDTO;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.BankCodeSxfMapper;
+import cn.pluss.platform.mcc.MccReflectService;
+import cn.pluss.platform.merchantImage.MerchantImageService;
+import cn.pluss.platform.ryx.RyxConstants;
+import cn.pluss.platform.ryx.RyxService;
+import cn.pluss.platform.task.RyxMerAuditHandler;
+import cn.pluss.platform.task.SxfMerAuditHandler;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.util.ByteArrayImg;
+import cn.pluss.platform.util.FileUtil;
+import cn.pluss.platform.util.ParametersUtil;
+import cn.pluss.platform.util.RyxConfig;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.core.io.ByteArrayResource;
+import org.springframework.http.HttpEntity;
+import org.springframework.stereotype.Service;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestTemplate;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.util.*;
+
+/**
+ * @author DJH
+ * 瑞银信进件服务类
+ */
+@Slf4j
+@Service("ryxMerchantAuditService")
+public class RyxMerchantAuditServiceImpl extends BaseMerchantAuditService {
+
+    @Autowired
+    private MccReflectService mccReflectService;
+
+    @Autowired
+    private MerchantImageService miService;
+
+    @Autowired
+    private RyxService ryxService;
+
+    @Autowired
+    private RyxMerAuditHandler ryxMerAuditHandler;
+
+    @Autowired
+    private RestTemplate restTemplate;
+
+    @Autowired @Lazy
+    private UserAppService userAppService;
+
+    @Resource
+    private BankCodeSxfMapper bankCodeSxfMapper;
+
+    @Autowired @Lazy
+    private SxfMerAuditHandler sxfMerAuditHandler;
+
+    private static final List<String> NOT_ALLOWED_INCOMING_PROVINCE = Arrays.asList("西藏自治区", "新疆维吾尔自治区", "内蒙古自治区", "宁夏回族自治区", "安徽省", "上海市");
+    private static final List<String> NOT_ALLOWED_INCOMING_CITY = Arrays.asList("大连市", "宁波市", "临沧市", "德宏州", "西双版纳傣族自治州", "保山市", "文山市");
+    private static final List<String> NOT_ALLOWED_INCOMING_DISTRICT = Arrays.asList("余干县", "宾阳县");
+
+    @Override
+    public void imageUpload(MerchantImage merchantImage) {
+        MsgException.throwException("瑞银行不能单独上传文件");
+    }
+
+    @Override
+    public void imageUpload(String url, String picType) {
+        MsgException.throwException("瑞银行不能单独上传文件");
+    }
+
+    @Override
+    public void merchantAudit(String userId, boolean isFailCheck) {
+        MerchantBaseInfo mbi = merchantBaseInfoService.getMerchantBaseInfoByUserId(userId);
+
+//        checkAuditArea(mbi);
+
+        // 进件参数拼接
+        MerchantChannelStatus channelStatus = mcsService.getByMerchantCode(mbi.getMerchantCode(), 3);
+
+        Map<String, Object> paramMap = getParams(mbi);
+        if (StringUtils.isNotEmpty(channelStatus.getMerchantId())) {
+            String merInId = channelStatus.getExtra().getString(RyxConstants.MER_IN_ID);
+            if (!StringUtils.isEmpty(merInId)) {
+                paramMap.put(RyxConstants.MER_IN_ID, merInId);
+            }
+        }
+
+        log.info("{}瑞银信进件参数{}", userId, JSON.toJSONString(paramMap));
+        RyxAccessResp resp = auditReq(mbi, paramMap);
+
+        Map<String, Object> result = resp.getResult();
+
+        String applicationId = ((String) result.get("orderId")).replace("-", "");
+
+        channelStatus.setApplicationId(applicationId);
+        channelStatus.setStatus(MerchantChannelStatus.AUDIT_STATUS_EXAMINING);
+        channelStatus.setRemark("瑞银信审核中");
+        channelStatus.setMerchantCode(mbi.getMerchantCode());
+        channelStatus.setChannel(3);
+        channelStatus.setThirdStatus("");
+        channelStatus.setCallbackStatus("0");
+        mcsService.saveOrUpdate(channelStatus);
+
+        QueryWrapper<MerchantAuditRecord> queryWrapper = new QueryWrapper<MerchantAuditRecord>().eq("applicationId", applicationId);
+        MerchantAuditRecord maRecord = ObjectUtil.defaultIfNull(
+                merchAuditRecService.getOne(queryWrapper),
+                new MerchantAuditRecord());
+        maRecord.setStatus("1");
+        maRecord.setMerchantCode(mbi.getMerchantCode());
+        maRecord.setChannel(3);
+        maRecord.setThirdStatus("");
+        maRecord.setMerchantId(applicationId);
+        merchAuditRecService.saveOrUpdate(maRecord);
+    }
+
+    /**
+     * @description:检查当前地区是否支持进件
+     * @date: 2021/9/10 18:51
+     */
+    private void checkAuditArea(MerchantBaseInfo merchantBaseInfo) {
+        String province = merchantBaseInfo.getProvince();
+        String city = merchantBaseInfo.getCity();
+        String district = merchantBaseInfo.getDistrict();
+        String template = "瑞银信地区【%s】禁止进件";
+        if (NOT_ALLOWED_INCOMING_PROVINCE.contains(province)) {
+            MsgException.throwException(String.format(template, province));
+        }
+        if (NOT_ALLOWED_INCOMING_CITY.contains(city)) {
+            MsgException.throwException(String.format(template, city));
+        }
+        if (NOT_ALLOWED_INCOMING_DISTRICT.contains(district)) {
+            MsgException.throwException(String.format(template, district));
+        }
+    }
+
+    /**
+     * 进件请求
+     *
+     * @param merchantBaseInfo 商户基本信息
+     * @return
+     */
+    public RyxAccessResp auditReq(MerchantBaseInfo merchantBaseInfo, Map<String, Object> paramMap) {
+        List<ByteArrayResource> files = getFiles(merchantBaseInfo.getUserId(), merchantBaseInfo.getMerchantType(), "1".equals(paramMap.get(RyxConstants.PACT_TYPE)));
+        return ryxService.reqCommon(paramMap, files, RyxConfig.merchantIncome);
+    }
+
+    /**
+     * 商服宝进件请求
+     *
+     * @param merchantBaseInfo 商户基本信息
+     * @return
+     */
+    public RyxAccessResp subAuditReq(MerchantBaseInfo merchantBaseInfo, Map<String, Object> paramMap, MerchantPlugin merchantPlugin) {
+        // 修改机构号为商服宝的机构号
+        paramMap.put(RyxConstants.ORG_ID, "OX0000000002984");
+        // 修改商户id为插件的商户id
+        paramMap.put(RyxConstants.ACCESS_ID, RyxConfig.subAccessId);
+
+        if (merchantPlugin.getExtra() != null) {
+            String merInId = merchantPlugin.getExtra().getString(RyxConstants.MER_IN_ID);
+            if (merInId != null) {
+                paramMap.put(RyxConstants.MER_IN_ID, merInId);
+            } else {
+                paramMap.remove(RyxConstants.MER_IN_ID);
+            }
+        } else {
+            paramMap.remove(RyxConstants.MER_IN_ID);
+        }
+
+        List<ByteArrayResource> files = getFiles(merchantBaseInfo.getUserId(), merchantBaseInfo.getMerchantType(), "1".equals(paramMap.get(RyxConstants.PACT_TYPE)));
+        RyxAccessModel ryxAccessModel = ryxService.accessCombineEncrypt(paramMap, files, RyxConfig.subAccessId, RyxConfig.subAccessPubKey);
+
+        MultiValueMap<String, Object> map = RyxAccessModel.toMap(ryxAccessModel);
+        HttpEntity<MultiValueMap<String, Object>> request = new HttpEntity<>(map);
+
+        RyxAccessModel ryxResult = restTemplate.postForObject(RyxConfig.merchantIncome, request, RyxAccessModel.class);
+        MsgException.checkNull(ryxResult, "未知请求结果");
+        return ryxService.accessResultDecrypt(ryxResult, RyxAccessResp.class);
+    }
+
+    @Override
+    public void editMerchantAudit(String userId) {
+        MerchantBaseInfo merchantBaseInfo = merchantBaseInfoService.getMerchantBaseInfoByUserId(userId);
+        // 进件参数拼接
+        Map<String, Object> paramMap = new HashMap<>();
+
+        MerchantChannelStatus mcs = mcsService.getByMerchantCode(merchantBaseInfo.getMerchantCode(), 3);
+        MsgException.checkUnequals(3, mcs.getChannel(), "修改通道选择错误");
+
+        paramMap.put(RyxConstants.MER_IN_ID, mcs.getExtra().getString(RyxConstants.MER_IN_ID));
+
+        IdCard idCard = idCardService.getAccountIdCard(userId, Account.CHANNEL_TYPE_D1);
+        Account account = new Account().setUserId(userId).setChannelType(Account.CHANNEL_TYPE_D1);
+        account = accountService.getOne(new QueryWrapper<>(account));
+        JSONObject bak = account.getBak();
+
+        paramMap.put(RyxConstants.BANK_CARD, bak.get("bankCardNo"));
+        paramMap.put(RyxConstants.BANK_CARD_NAME, bak.get("bankHolder"));
+        paramMap.put(RyxConstants.SERVICE_TYPE, "04");
+        // 小微的结算方式只有非法人
+        paramMap.put(RyxConstants.SETTLE_TYPE, "2");
+        paramMap.put(RyxConstants.SETTLE_CRED_TYPE, "0105");
+        paramMap.put(RyxConstants.SETTLE_CRED_NO, idCard.getCertNo());
+
+        String branchProvince = (String) bak.get("branchProvince");
+        String branchCity = (String) bak.get("branchCity");
+        String branchArea = (String) bak.get("branchArea");
+
+        RegionCodeRyx regionCodeRyx = regionReflectService.getRyxRegionCode(branchProvince, branchCity, branchArea);
+        paramMap.put(RyxConstants.BANK_CITY_AREA, regionCodeRyx.getAreaCode());
+
+        QueryWrapper<BankCodeSxf> queryWrapper = new QueryWrapper<BankCodeSxf>().eq("cnaps_code", bak.get("contactLine"));
+        BankCodeSxf bankCodeSxf = bankCodeSxfMapper.selectOne(queryWrapper);
+        paramMap.put(RyxConstants.HEAD_BANK_NO, bankCodeSxf.getBankCode());
+        paramMap.put(RyxConstants.OPEN_BANK_CHILD, bak.get("contactLine"));
+
+        byte[] bytes = new byte[0];
+        try {
+            bytes = FileUtil.url2Bytes(bak.getString("imgUrl"));
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        ByteArrayResource pic = new ByteArrayResource(bytes) {
+            @Override
+            public String getFilename() {
+                return "pic.png";
+            }
+        };
+
+        log.info("瑞银信请求参数: {}", JSON.toJSONString(paramMap));
+        RyxAccessModel ryxAccessModel = ryxService.accessCombineEncrypt(paramMap, null, RyxConfig.accessId, RyxConfig.accessPubKey);
+        MultiValueMap<String, Object> params = RyxAccessModel.toMap(ryxAccessModel);
+        params.put(RyxConstants.CARD_PIC, Collections.singletonList(pic));
+        HttpEntity<MultiValueMap<String, Object>> httpEntity = new HttpEntity<>(params);
+        RyxAccessModel respModel = restTemplate.postForObject(RyxConfig.updateSettleCard, httpEntity, RyxAccessModel.class);
+        RyxAccessResp result = ryxService.accessResultDecrypt(respModel, RyxAccessResp.class);
+        if (RyxAccessResp.RESULT_ERROR.equals(result.getCode())) {
+            String errMsg = result.getMsg();
+            log.error(errMsg);
+            MsgException.throwException(errMsg);
+        } else {
+            log.info(result.getMsg());
+
+            // 修改商户状态
+            mcs.setStatus(MerchantChannelStatus.AUDIT_STATUS_DATA_EDIT);
+            mcsService.updateById(mcs);
+        }
+    }
+
+    @Override
+    public JSONObject merchantAuditResult(Map<String, Object> result) throws Exception {
+        RyxAccessResp ryxAccessResp = ryxService.reqCommon(result, null, RyxConfig.auditResult);
+        return ryxAccessResp.getResult();
+    }
+
+    @Override
+    public JSONObject merchantAuditCallback(JSONObject auditResult) throws Exception {
+        // 异步处理回调处理，减少幂等处理次数
+        try {
+            ryxMerAuditHandler.auditHandler(auditResult);
+        } catch (Exception e) {
+            log.error(e.getMessage());
+            e.printStackTrace();
+        }
+
+        return RyxConfig.ok();
+    }
+
+    @Override
+    public JSONObject editMerchantCallback(JSONObject auditResult) throws Exception {
+        // 瑞银信修改结算账户是直接返回结果，暂不需要做回调操作
+        return new JSONObject();
+    }
+
+    @Override
+    public String imgTypeTransform(String imageType) {
+        switch (imageType) {
+            case MerchantImage.ImageType.IDCARD_FRONT:
+                return ImageType.IDCARD_FRONT;
+            case MerchantImage.ImageType.IDCARD_BACK:
+                return ImageType.IDCARD_BACK;
+            case MerchantImage.ImageType.SETTLE_IDCARD_FRONT:
+                return ImageType.SETTLE_IDCARD_FRONT;
+            case MerchantImage.ImageType.SETTLE_IDCARD_BACK:
+                return ImageType.SETTLE_IDCARD_BACK;
+            case MerchantImage.ImageType.BANK_CARD_FRONT:
+                return ImageType.BANK_CARD_FRONT;
+            case MerchantImage.ImageType.BUSINESS_LICENSE:
+                return ImageType.BUSINESS_LICENSE;
+            case MerchantImage.ImageType.ACCOUNT_PERMITS:
+                return ImageType.ACCOUNT_PERMITS;
+            case MerchantImage.ImageType.NON_LEG_SETTLE_AUTH:
+                return ImageType.NON_LEG_SETTLE_AUTH;
+            case MerchantImage.ImageType.SHOP_FRONT_DOOR:
+                return ImageType.SHOP_FRONT_DOOR;
+            case MerchantImage.ImageType.CASH_DESK_PHOTO:
+                return ImageType.CASH_DESK_PHOTO;
+            case MerchantImage.ImageType.STORE_INTERIOR_PHOTO:
+                return ImageType.STORE_INTERIOR_PHOTO;
+            case MerchantImage.ImageType.MERCHANT_PROTOCOL:
+                return ImageType.MERCHANT_PROTOCOL;
+            case MerchantImage.ImageType.MERCHANT_SUB_PROTOCOL:
+                return ImageType.MERCHANT_SUB_PROTOCOL;
+            case MerchantImage.ImageType.HAND_IDCARD_PHOTO:
+                return ImageType.HAND_IDCARD_PHOTO;
+            default:
+                return ImageType.OTHER;
+        }
+    }
+
+    @Override
+    public void checkSign(JSONObject receiveData) throws Exception {
+        MsgException.throwException("校验方法请使用RyxService中的方法");
+    }
+
+    /**
+     * 组装进件参数
+     *
+     * @return 进件参数
+     */
+    public Map<String, Object> getParams(MerchantBaseInfo merchantBaseInfo) {
+        Map<String, Object> param = new HashMap<>(32);
+
+        MerchantChannelStatus mcs = mcsService.getByMerchantCode(merchantBaseInfo.getMerchantCode(), 3);
+
+        param.put(RyxConstants.MER_PROP, getMerchantType(merchantBaseInfo.getMerchantType()));
+        param.put(RyxConstants.ACCESS_MODE, "1");
+
+        AccountDTO account = accountService.getAccount(merchantBaseInfo.getUserId());
+
+        if (MerchantBaseInfo.MERCH_TYPE_MICRO.equals(merchantBaseInfo.getMerchantType())) {
+            param.put(RyxConstants.ORG_MER_NAME, "商户_" + account.getIdcard().getCertName());
+            param.put(RyxConstants.MER_NAME, "商户_" + account.getIdcard().getCertName());
+        } else {
+            param.put(RyxConstants.ORG_MER_NAME, merchantBaseInfo.getBussAuthName());
+            param.put(RyxConstants.MER_NAME, merchantBaseInfo.getBussAuthName());
+        }
+
+        param.put(RyxConstants.MER_NAME_ABBR, merchantBaseInfo.getAlias());
+
+        RegionCodeRyx regionCodeRyx = regionReflectService.getRyxRegionCode(merchantBaseInfo.getProvince(), merchantBaseInfo.getCity(), merchantBaseInfo.getDistrict());
+        param.put(RyxConstants.CITY_AREA, regionCodeRyx.getAreaCode());
+
+        BankCard certBankCard = new BankCard();
+        certBankCard.setUserId(merchantBaseInfo.getUserId());
+        certBankCard.setAccountType(BankCard.ACCOUNT_TYPE_CERT);
+
+        IdCard leaderIdCard = idCardService.getLegalIdCard(merchantBaseInfo.getUserId());
+
+        if (MerchantBaseInfo.MERCH_TYPE_MICRO.equals(merchantBaseInfo.getMerchantType())) {
+            leaderIdCard = account.getIdcard();
+        } else {
+            // 非小微商户需要的信息
+            param.put(RyxConstants.LIC_TYPE, "2389");
+            param.put(RyxConstants.LIC_NUM, merchantBaseInfo.getBussAuthNum());
+            param.put(RyxConstants.LIC_NUM_START_TIME, merchantBaseInfo.getBussAuthStartTime().replace("-", ""));
+            param.put(RyxConstants.LIC_NUM_TIME, merchantBaseInfo.getBussAuthEndTime().replace("-", ""));
+            param.put(RyxConstants.CRED_PEOPLE, leaderIdCard.getCertName());
+            param.put(RyxConstants.CRED_TYPE, "0105");
+            param.put(RyxConstants.CRED_NO, leaderIdCard.getCertNo());
+            param.put(RyxConstants.CRED_START_TIME, leaderIdCard.getCertStartTime().replace("-", ""));
+
+            if (!"长期".equals(leaderIdCard.getCertEndTime())) {
+                param.put(RyxConstants.CRED_TIME, leaderIdCard.getCertEndTime().replace("-", ""));
+            } else {
+                param.put(RyxConstants.CRED_TIME, "");
+            }
+
+            param.put(RyxConstants.MANA_SCOP, merchantBaseInfo.getMccName());
+        }
+
+        // 使用实名信息作为商户实名认证的材料
+        param.put(RyxConstants.CONTACT_PERSON, leaderIdCard.getCertName());
+        param.put(RyxConstants.CONTACT_PHONE, merchantBaseInfo.getContactMobile());
+        // 电子协议短信接收人及手机号
+        param.put(RyxConstants.AGREEMENT_NAME, leaderIdCard.getCertName());
+        param.put(RyxConstants.AGREEMENT_PHONE, merchantBaseInfo.getContactMobile());
+
+        param.put(RyxConstants.SUB_APP_ID, ParametersUtil.APPLETS_APPID);
+
+        IdCard idcard = account.getIdcard();
+        BankCard bankCard = account.getBankCard();
+
+        param.put(RyxConstants.BANK_CARD, bankCard.getBankCardNo());
+        String accountProp = bankCard.getAccountType().equals(BankCard.ACCOUNT_TYPE_PRIVATE) ? "01" : "00";
+        param.put(RyxConstants.ACCOUNT_PROP, accountProp);
+
+        String settleType = getSettleType(account.getSettleType());
+
+        param.put(RyxConstants.SETTLE_TYPE, settleType);
+        param.put(RyxConstants.BANK_CARD_NAME, bankCard.getBankHolder());
+        param.put(RyxConstants.SETTLE_CRED_TYPE, "0105");
+        param.put(RyxConstants.SETTLE_CRED_NO, idcard.getCertNo());
+        param.put(RyxConstants.SETTLE_CRED_START_TIME, idcard.getCertStartTime().replace("-", ""));
+        if (!"长期".equals(idcard.getCertEndTime())) {
+            param.put(RyxConstants.SETTLE_CRED_TIME, idcard.getCertEndTime().replace("-", ""));
+        } else {
+            param.put(RyxConstants.SETTLE_CRED_TIME, "");
+        }
+
+        MccReflect ryxMccReflect = mccReflectService.getRyxMccReflect(merchantBaseInfo.getMcc());
+        param.put(RyxConstants.MCC, ryxMccReflect.getMccCode());
+
+        String address = String.format("%s-%s-%s-%s", merchantBaseInfo.getProvince(), merchantBaseInfo.getCity(), merchantBaseInfo.getDistrict(), merchantBaseInfo.getAddress());
+        param.put(RyxConstants.OPERATE_ADDR, address);
+        param.put(RyxConstants.MODEL_TYPE, "2");
+
+        // ----- 设置费率信息
+        param.put(RyxConstants.CREDIT_RATE, "0.615");
+        param.put(RyxConstants.DEBIT_RATE, "0.615");
+        param.put(RyxConstants.DEBIT_TOP, "20");
+        param.put(RyxConstants.QR_DEBIT_RATE, "0.40");
+        param.put(RyxConstants.QR_CREDIT_RATE, "0.40");
+        param.put(RyxConstants.WX_DEBIT_RATE, "0.38");
+        param.put(RyxConstants.ZFB_DEBIT_RATE, "0.38");
+        // ----- 设置费率信息结束
+        regionCodeRyx = regionReflectService.getRyxRegionCode(bankCard.getBranchProvince(), bankCard.getBranchCity(), bankCard.getBranchArea());
+
+        param.put(RyxConstants.BANK_PROVINCE, regionCodeRyx.getProvinceCode());
+        param.put(RyxConstants.BANK_CITY, regionCodeRyx.getCityCode());
+        param.put(RyxConstants.BANK_CITY_AREA, regionCodeRyx.getAreaCode());
+        param.put(RyxConstants.OPEN_BANK_CHILD, bankCard.getContactLine());
+
+        QueryWrapper<BankCodeSxf> queryWrapper = new QueryWrapper<BankCodeSxf>().eq("cnaps_code", bankCard.getContactLine());
+        BankCodeSxf bankCodeSxf = bankCodeSxfMapper.selectOne(queryWrapper);
+        param.put(RyxConstants.HEAD_BANK_NO, bankCodeSxf.getBankCode());
+        param.put(RyxConstants.TERM_NUM, "1");
+        param.put(RyxConstants.SERVICE_TYPE, "04");
+        param.put(RyxConstants.TRADE_TYPE_REIMBURSE, "0");
+        param.put(RyxConstants.ORG_ID, "OX0000000002983");
+        // 目前只能用纸质协议
+        param.put(RyxConstants.PACT_TYPE, "1");
+        param.put(RyxConstants.CERTIFICATION_TYPE, "1");
+        param.put(RyxConstants.CONTACT_PERSON_CRED, leaderIdCard.getCertNo());
+
+        return param;
+    }
+
+    /**
+     * 获取文件列表
+     *
+     * @param userId       用户id
+     * @param merchantType 商户类型
+     * @return 文件列表
+     */
+    private List<ByteArrayResource> getFiles(String userId, String merchantType, boolean isOnlineProtocol) {
+        ArrayList<ByteArrayResource> result = new ArrayList<>();
+
+        List<MerchantImage> merchantImages = miService.getListOfMerch(userId);
+
+        for (MerchantImage image : merchantImages) {
+            if (image.getPhotoType().equals(MerchantImage.ImageType.BUSINESS_LICENSE) && MerchantBaseInfo.MERCH_TYPE_MICRO.equals(merchantType)) {
+                // 小微商户不能上传营业执照
+                continue;
+            }
+
+            // 获取瑞银信对应的图片类型code
+            String imgTypeCode = imgTypeTransform(image.getPhotoType());
+            String imgUrl = image.getPicUrl();
+
+            if (MerchantBaseInfo.MERCH_TYPE_MICRO.equals(merchantType) && ImageType.STORE_INTERIOR_PHOTO.equals(imgTypeCode)) {
+                // 将营业场景一同样传到营业场景二中
+                addFile(result, imgUrl, "pic" + ImageType.STORE_INTERIOR_PHOTO2 + ".png");
+            }
+
+            addFile(result, imgUrl, "pic" + imgTypeCode + ".png");
+        }
+
+        if (!isOnlineProtocol) {
+            String imgUrl = "https://www.shouyinbei.net/resources/images/upload/blank.png";
+            // 弄一个空白图片作为商户协议上传
+            addFile(result, imgUrl, "pic" + ImageType.MERCHANT_SUB_PROTOCOL + ".png");
+            addFile(result, imgUrl, "pic" + ImageType.MERCHANT_PROTOCOL + ".png");
+        }
+
+        return result;
+    }
+
+    /**
+     * 读取图片内容并添加到列表中
+     *
+     * @param imgBytesList 图片列表
+     * @param url          图片url
+     * @param picName      图片名称
+     */
+    private void addFile(ArrayList<ByteArrayResource> imgBytesList, String url, String picName) {
+        try {
+            byte[] bytes = FileUtil.url2Bytes(url);
+            ByteArrayResource byteArrayResource = new ByteArrayImg(bytes, picName);
+
+            imgBytesList.add(byteArrayResource);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 商户类型转换，将自身的商户类型转换为瑞银信的商户类型
+     *
+     * @param merchantType 商户类型
+     * @return 随行付商户类型
+     */
+    private String getMerchantType(String merchantType) {
+        switch (merchantType) {
+            case "1":
+                return "7";
+            case "2":
+                return "1";
+            case "3":
+                return "2";
+            default:
+                MsgException.throwException("未知的商户类型");
+        }
+
+        return merchantType;
+    }
+
+    /**
+     * 根据账户结算方式获取结算方式
+     *
+     * @param accountType 账户结算方式
+     * @return 瑞银信结算方式
+     */
+    private String getSettleType(String accountType) {
+        switch (accountType) {
+            // 对私法人
+            case Account.SETTLE_TYPE_MICRO_STORE:
+            case Account.SETTLE_TYPE_PRIVATE_LEGAL:
+            case Account.LEGAL_PRIVATE_LEGAL:
+            case Account.ILLEGAL_PRIVATE_LEGAL:
+                accountType = "1";
+                break;
+            // 对私非法人
+            case Account.SETTLE_TYPE_PRIVATE_ILLEGAL:
+            case Account.LEGAL_PRIVATE_ILLEGAL:
+            case Account.ILLEGAL_PRIVATE_ILLEGAL:
+                accountType = "2";
+                break;
+            case Account.SETTLE_TYPE_CORPORATE:
+                accountType = "3";
+                break;
+            default:
+                MsgException.throwException("未知的结算方式");
+        }
+
+        return accountType;
+    }
+
+    public static class ImageType {
+        /**
+         * 商户协议
+         */
+        public static final String MERCHANT_PROTOCOL = "0101";
+        /**
+         * 商户附属协议
+         */
+        public static final String MERCHANT_SUB_PROTOCOL = "0130";
+        /**
+         * 手持身份证，需要与结算人身份信息一致，非法人结算与小微商户需要
+         */
+        public static final String HAND_IDCARD_PHOTO = "0105";
+        /**
+         * 入账人/法人身份证正面
+         */
+        public static final String IDCARD_FRONT = "0111";
+        /**
+         * 入账人/法人身份证反面
+         */
+        public static final String IDCARD_BACK = "0112";
+        /**
+         * 银行卡卡号面
+         */
+        public static final String BANK_CARD_FRONT = "0206";
+        /**
+         * 门头照
+         */
+        public static final String SHOP_FRONT_DOOR = "0211";
+        /**
+         * 门店内景/营业场景图片一
+         */
+        public static final String STORE_INTERIOR_PHOTO = "0117";
+        /**
+         * 营业执照
+         */
+        public static final String BUSINESS_LICENSE = "0103";
+        /**
+         * 开户许可证
+         */
+        public static final String ACCOUNT_PERMITS = "0109";
+        /**
+         * 门店内景二/营业场景图片二
+         */
+        public static final String STORE_INTERIOR_PHOTO2 = "0118";
+        /**
+         * 结算人身份证正面
+         */
+        public static final String SETTLE_IDCARD_FRONT = "0119";
+        /**
+         * 结算人身份证反面
+         */
+        public static final String SETTLE_IDCARD_BACK = "0120";
+        /**
+         * 收银台照片
+         */
+        public static final String CASH_DESK_PHOTO = "0217";
+        /**
+         * 非法人授权函
+         */
+        public static final String NON_LEG_SETTLE_AUTH = "0205";
+        /**
+         * 其他
+         */
+        public static final String OTHER = "0401";
+
+        private ImageType() {
+        }
+    }
+}
\ No newline at end of file
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ryx/impl/RyxServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ryx/impl/RyxServiceImpl.java
new file mode 100644
index 0000000..e79b254
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ryx/impl/RyxServiceImpl.java
@@ -0,0 +1,348 @@
+package cn.pluss.platform.ryx.impl;
+
+import cn.jiguang.common.utils.StringUtils;
+import cn.pluss.platform.entity.RyxAccessModel;
+import cn.pluss.platform.entity.RyxAccessResp;
+import cn.pluss.platform.entity.RyxPayRequest;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.ryx.RyxService;
+import cn.pluss.platform.util.*;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.core.io.ByteArrayResource;
+import org.springframework.http.HttpEntity;
+import org.springframework.stereotype.Service;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestTemplate;
+
+import javax.annotation.Resource;
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.security.interfaces.RSAPrivateKey;
+import java.security.interfaces.RSAPublicKey;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+/**
+ * @author DJH
+ */
+@Slf4j
+@Service
+public class RyxServiceImpl implements RyxService {
+
+    @Resource
+    private RestTemplate restTemplate;
+
+    @Override
+    public RyxAccessModel accessCombineEncrypt(Map<String, Object> paramMap, List<ByteArrayResource> files, String accessId, String pubKey) {
+        RyxAccessModel ryxAccessModel = new RyxAccessModel();
+        ryxAccessModel.setAccessId(accessId);
+        // 接入方订单号
+        ryxAccessModel.setAccessMerchId(UUID.randomUUID().toString());
+        // 发起请求的时间
+        ryxAccessModel.setReqTime(new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()));
+
+        // 保存AES密钥
+        String ivParam = AESEncrypt.getIVParam(16);
+        byte[] aesKey = null;
+        try {
+            aesKey = AESEncrypt.initKey();
+            Map<String, String> keyMap = new HashMap<>();
+            // aesKey使用Base64编码
+            keyMap.put(AES_KEY, Base64.getEncoder().encodeToString(aesKey));
+            keyMap.put(IV_PARAM, ivParam);
+            RSAPublicKey publicKey = (RSAPublicKey) RSAUtils.getPublicKey(pubKey);
+            String encryptKey = RSAUtils.encrypt(publicKey, JSON.toJSONString(keyMap));
+            ryxAccessModel.setEncryptKey(encryptKey);
+        } catch (Exception e) {
+            e.printStackTrace();
+            MsgException.throwException("瑞银信-AES密钥加密异常");
+        }
+        
+
+        // 使用AES加密普通参数
+        try {
+            String info = AESEncrypt.encryptToString(JSON.toJSONString(paramMap).getBytes(StandardCharsets.UTF_8), aesKey, ivParam);
+            ryxAccessModel.setInfo(info);
+        } catch (Exception e) {
+            e.printStackTrace();
+            MsgException.throwException("瑞银信-请求参数加密异常");
+        }
+
+        // 参数加签
+        Object[] sortedKeys = paramMap.keySet().toArray();
+        Arrays.sort(sortedKeys);
+
+        StringBuilder builder = new StringBuilder();
+        builder.append("accessId=").append(ryxAccessModel.getAccessId())
+                .append("&reqTime=").append(ryxAccessModel.getReqTime())
+                .append("&ivParam=").append(ivParam);
+        for (Object key : sortedKeys) {
+            builder.append("&").append(key).append("=").append(paramMap.get(key));
+        }
+
+        log.debug("签名原串：{}", builder);
+        // 客户端使用私钥签名
+        try {
+            RSAPrivateKey accessPrivateKey = (RSAPrivateKey) RSAUtils.getPrivateKey(RyxConfig.cooperatorPriKey);
+            String sign = RSAUtils.signSHA256WithRSA(accessPrivateKey, builder.toString());
+            ryxAccessModel.setSign(sign);
+        } catch (Exception e) {
+            e.printStackTrace();
+            MsgException.throwException("瑞银信-签名异常");
+        }
+
+        // 组合文件信息
+        if (files != null && !files.isEmpty()) {
+            ryxAccessModel.setFiles(files);
+        }
+
+        return ryxAccessModel;
+    }
+
+    @Override
+    public <T> T accessResultDecrypt(RyxAccessModel ryxAccessModel, Class<T> clazz) {
+        log.debug("解密信息");
+        if (ryxAccessModel == null || StringUtils.isEmpty(ryxAccessModel.getInfo())) {
+            throw new MsgException("请求异常");
+        }
+
+        String info = ryxAccessModel.getInfo();
+        String encryptKey = ryxAccessModel.getEncryptKey();
+        String sign = ryxAccessModel.getSign();
+        String reqTime = ryxAccessModel.getReqTime();
+
+        Map<String, Object> aesKeyMap = null;
+        try {
+            RSAPrivateKey rsaPrivateKey = (RSAPrivateKey) RSAUtils.getPrivateKey(RyxConfig.cooperatorPriKey);
+            // 使用客户端RSA密钥解密 AES密钥
+            String aesKeyInfo = RSAUtils.decrypt(rsaPrivateKey, encryptKey);
+            aesKeyMap = JSON.parseObject(aesKeyInfo);
+        } catch (Exception e) {
+            e.printStackTrace();
+            MsgException.throwException("瑞银信-请求结果密钥解密异常");
+        }
+
+        MsgException.checkNull(aesKeyMap, "瑞银信-请求结果密钥解密异常");
+        
+        // AES解密服务器返回的数据
+        String data = null;
+        String ivParam = null;
+        try {
+            Base64.Decoder decoder = Base64.getDecoder();
+            byte[] bytesInfo = decoder.decode(info);
+            byte[] key = decoder.decode(aesKeyMap.get(AES_KEY).toString());
+            ivParam = aesKeyMap.get(IV_PARAM).toString();
+            byte[] decryptData = AESEncrypt.decrypt(bytesInfo, key, ivParam);
+            data = new String(decryptData, StandardCharsets.UTF_8);
+        } catch (Exception e) {
+            e.printStackTrace();
+            MsgException.throwException("瑞银信-请求结果密钥解密异常");
+        }
+
+        log.info(">>>>>>>>返回报文：\n"+data);
+
+        T result = JSON.parseObject(data, clazz);
+
+        StringBuilder builder = new StringBuilder();
+        builder.append("accessId=").append(ryxAccessModel.getAccessId()).append("&reqTime=").append(reqTime)
+                .append("&ivParam=").append(ivParam).append("&result=").append(data);
+
+        try {
+            RSAPublicKey rsaPublicKey = (RSAPublicKey) RSAUtils.getPublicKey(RyxConfig.accessPubKey);
+            // 使用服务端的公钥验证签名
+            boolean flag = RSAUtils.checkSignSHA256WithRSA(rsaPublicKey, builder.toString(), sign);
+            log.debug(flag ?"验签成功":"验签失败");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return result;
+    }
+
+    @Override
+    public RyxAccessResp reqCommon(Map<String, Object> paramMap, List<ByteArrayResource> files, String accessId, String pubKey, String url) {
+        // 组装加密请求参数
+        final RyxAccessModel ryxAccessModel = accessCombineEncrypt(paramMap, files, accessId, pubKey);
+        // 加密的参数转化为通用Map
+        MultiValueMap<String, Object> map = RyxAccessModel.toMap(ryxAccessModel);
+        if (!url.equals(RyxConfig.merchantIncome)) {
+            map.remove("accessMerchId");
+        }
+        HttpEntity<MultiValueMap<String, Object>> request = new HttpEntity<>(map);
+        // 发起请求
+        RyxAccessModel ryxResult = restTemplate.postForObject(url, request, RyxAccessModel.class);
+        // 返回参数校验
+        MsgException.checkNull(ryxResult, "未知请求结果");
+        // 解密并返回请求结果
+        return accessResultDecrypt(ryxResult, RyxAccessResp.class);
+    }
+
+    @Override
+    public RyxPayRequest payParamsEncrypt(JSONObject params,String payWay) {
+
+        RyxPayRequest request = new RyxPayRequest();
+        request.setCooperator(RyxConfig.payCooperator);
+        try {
+            byte[] plainBytes = params.toJSONString().getBytes(StandardCharsets.UTF_8);
+
+            RSAPrivateKey prvKey = (RSAPrivateKey)RSAUtils.getPrivateKey(RyxConfig.cooperatorPriKey);
+            RSAPublicKey publicKey = (RSAPublicKey) RSAUtils.getPublicKey(RyxConfig.smzfPubKey);
+
+            String key = AESEncrypt.getIVParam(16);
+            byte[] keyBytes = key.getBytes(StandardCharsets.UTF_8);
+
+            String encryptData = AESEncrypt.encryptEcbToString(plainBytes, keyBytes,null);
+            String signData = RSAUtils.sign(prvKey, params.toJSONString());
+            String encrtptKey = RSAUtils.encrypt(publicKey, key);
+
+            request.setEncryptData(encryptData);
+            request.setSignData(signData);
+            request.setEncrtptKey(encrtptKey);
+            request.setTranCode(payWay);
+            request.setCallBack(ParametersUtil.domain + "/wap/notify/ryxCallBack");
+            request.setReqMsgId(params.getString("reqMsgId"));
+        } catch (Exception e) {
+            e.printStackTrace();
+            MsgException.throwException("瑞银信-支付请求参数加密异常");
+        }
+        return request;
+    }
+
+    /**
+     * 解析返回参数
+     * @param respones
+     * @return
+     */
+    @Override
+    public JSONObject analysisPayParamsEncrypt(String respones) {
+
+        JSONObject resp = JSONObject.parseObject(respones);
+
+        String resEncryptData = resp.getString("encryptData");
+
+        String resEncryptKey = resp.getString("encryptKey");
+
+        if(resEncryptData == null || resEncryptKey == null){
+            String respMsg = StringUtil.isEmpty(resp.getString("respMsg")) ? "请求异常" : resp.getString("respMsg");
+            MsgException.throwException(respMsg);
+        }
+        try {
+
+            RSAPrivateKey prvKey = (RSAPrivateKey)RSAUtils.getPrivateKey(RyxConfig.cooperatorPriKey);
+
+            byte[] keyBytes = Base64.getDecoder().decode(resEncryptKey.getBytes(StandardCharsets.UTF_8));
+
+            byte[] merchantAESKeyBytes = RSAUtils.decryptEcb(keyBytes,prvKey,2048,11);
+
+            byte[] dataBytes = Base64.getDecoder().decode(resEncryptData.getBytes(StandardCharsets.UTF_8));
+
+            String resXml = AESEncrypt.decryptEcbToString(dataBytes, merchantAESKeyBytes, null);
+
+            log.info("=============>【瑞银信】返回参数解析结果:{}<================",resXml);
+
+            return JSONObject.parseObject(resXml);
+        } catch (Exception e) {
+            e.printStackTrace();
+            MsgException.throwException("【瑞银信】返回参数解析异常");
+        }
+        return null;
+    }
+
+    /**
+     * 瑞银信封装通用支付请求参数
+     * @param reqData
+     * @return
+     */
+    @Override
+    public JSONObject analysisCommonPayParams(String url,String payWay,JSONObject reqData) {
+        JSONObject params = new JSONObject(10);
+        params.put("version","1.0.0");
+        params.put("msgType","01");
+        params.put("reqDate", DateUtils.formatDateDefault(new Date(),"yyyyMMddHHmmss"));
+        params.put("reqMsgId", reqData.getString("reqMsgId") != null ? reqData.getString("reqMsgId") : StringUtil.genRandomNum(16));
+        reqData.remove("reqMsgId");
+        params.put("data",reqData);
+
+        log.info("==============>【瑞银信】接口请求，请求参数：{}<==================",JSONObject.toJSONString(params));
+
+        RyxPayRequest request = payParamsEncrypt(params, payWay);
+
+        MultiValueMap<String, Object> toParamMap = request.toMap();
+
+        HttpEntity<MultiValueMap<String, Object>> entity = new HttpEntity<>(toParamMap);
+
+        log.info("==========>【瑞银信】请求参数：{}<============", JSON.toJSONString(entity));
+
+        byte[] result = restTemplate.postForObject(url, entity, byte[].class);
+
+        String respones = new String(result, StandardCharsets.UTF_8);
+
+        log.info("==========>【瑞银信】响应参数：{}<============", respones);
+
+        MsgException.checkNull(respones, "==========>【瑞银信】未知请求结果<============");
+
+        JSONObject object = analysisPayParamsEncrypt(respones);
+
+        MsgException.checkNull(object, "==============>【瑞银信】请求结果解析异常<============");
+
+        return object;
+    }
+
+    @Override
+    public JSONObject downloadFtpFile(String date) {
+
+        JSONObject object = new JSONObject(2);
+        //瑞银信交易上送的机构号
+        String orgId = RyxConfig.payCooperator;
+        String nowDate = DateUtils.toString(DateUtils.add(Calendar.DATE,new Date(),-1),"yyyyMMdd");
+        if(StringUtil.isNotEmpty(date)){
+            nowDate = date;
+        }
+        String fileName = filePrefix + orgId + "_" +nowDate;
+        String uploadPath =  ParametersUtil.upload_save_path + "/ftp";
+        Properties prop = System.getProperties();
+        String os = prop.getProperty("os.name");
+        if (!(os.startsWith("win") || os.startsWith("Win"))) {
+            try {
+                Runtime.getRuntime().exec("chmod -R 777 /home/syb/resources/");
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }else{
+            uploadPath = "E:/crystal/ftp/file/ftp";
+        }
+        try {
+            File file = new File(uploadPath+"/");
+            if(!file.exists()){
+                log.info("不包含文件目录:{}，需要创建文件目录",uploadPath);
+                file.mkdirs();
+                log.info("创建文件夹:{}成功",uploadPath);
+            }
+
+            log.info("【瑞银信】文件下载参数,下载文件前缀:{},日期:{},文件保存路径:{},hostName:{},port:{},userName:{},password:{}",prefix,nowDate,uploadPath,hostName,port,userName,password);
+            boolean flag = FtpUtils.downloadFiles(prefix, nowDate, uploadPath, hostName, port, userName, password);
+            log.info("文件下载状态:{}",flag);
+            if(!flag){
+                log.info("================>【瑞银信】ftp交易数据文件下载失败<==================");
+                return null;
+            }
+            log.info("【瑞银信】解压文件参数，解压之前文件名：{}，文件路径：{}，解压成功之后的文件名：{}",fileName + suffix,uploadPath,fileName + unZipSuffix);
+            //解压文件
+            FtpUtils.extractFile(fileName + suffix,uploadPath,fileName + unZipSuffix);
+            //文件路径
+            String uFilePath = uploadPath + File.separator + fileName + unZipSuffix;
+            object.put("uploadPath",uploadPath);
+            object.put("filePath",uFilePath);
+            log.info("================>【瑞银信】返回的文件路径参数:{}<==================",object);
+            return object;
+        } catch (IOException e) {
+            e.printStackTrace();
+            log.info("===================>解压ftp文件异常，异常信息:{}<=================",e.getMessage());
+            MsgException.throwException(e.getMessage());
+        }
+        return null;
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ryx/impl/RyxSfbPluginServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ryx/impl/RyxSfbPluginServiceImpl.java
new file mode 100644
index 0000000..d3cdbb3
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ryx/impl/RyxSfbPluginServiceImpl.java
@@ -0,0 +1,186 @@
+package cn.pluss.platform.ryx.impl;
+
+//import cn.hutool.core.util.ObjectUtil;
+//import cn.pluss.platform.MerchantAuditRecordService;
+//import cn.pluss.platform.channel.MerchantAuditService;
+//import cn.pluss.platform.channel.PluginService;
+//import cn.pluss.platform.entity.*;
+//import cn.pluss.platform.exception.MsgException;
+//import cn.pluss.platform.mapper.UserAppMapper;
+//import cn.pluss.platform.merchant.MerchantPluginService;
+//import cn.pluss.platform.merchant.MerchantBaseInfoService;
+//import cn.pluss.platform.ryx.RyxConstants;
+//import cn.pluss.platform.ryx.RyxService;
+//import cn.pluss.platform.task.SxfMerAuditHandler;
+//import cn.pluss.platform.util.RyxConfig;
+//import cn.pluss.platform.wx.WxTalkService;
+//import com.alibaba.fastjson.JSON;
+//import com.alibaba.fastjson.JSONObject;
+//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+//import lombok.Setter;
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.stereotype.Service;
+//import org.springframework.util.MultiValueMap;
+//import org.springframework.web.client.RestTemplate;
+//
+//import java.util.HashMap;
+//import java.util.Map;
+//
+///**
+// * 瑞银信商服宝插件进件操作类
+// * @author DJH
+// */
+//@Slf4j
+//@Service("ryxSfbPluginServiceImpl")
+//public class RyxSfbPluginServiceImpl implements PluginService {
+//
+//    public static final int SFB_PLUGIN_CHANNEL = 31;
+//
+//    @Setter(onMethod_ = {@Autowired})
+//    private MerchantPluginService merchantPluginService;
+//    @Setter(onMethod_ = {@Autowired})
+//    private MerchantBaseInfoService merchantBaseInfoService;
+//    @Setter(onMethod_ = {@Autowired})
+//    private MerchantAuditService ryxMerchantAuditService;
+//    @Setter(onMethod_ = {@Autowired})
+//    private MerchantAuditRecordService auditRecordService;
+//    @Setter(onMethod_ = {@Autowired})
+//    private RyxService ryxService;
+//    @Setter(onMethod_ = {@Autowired})
+//    private RestTemplate restTemplate;
+//    @Setter(onMethod_ = {@Autowired})
+//    private WxTalkService wxTalkService;
+//
+//    @Setter(onMethod_ = {@Autowired})
+//    private UserAppMapper userAppMapper;
+//
+//    @Setter(onMethod_ = {@Autowired})
+//    private SxfMerAuditHandler sxfMerAuditHandler;
+//
+//    @Override
+//    public void audit(String userId) {
+//        MerchantBaseInfo merchantBaseInfo = merchantBaseInfoService.getMerchantBaseInfoByUserId(userId);
+//
+//        MerchantPlugin merchantPlugin = merchantPluginService.getPluginInfo(userId);
+//
+//        if (merchantPlugin == null) {
+//            merchantPlugin = new MerchantPlugin();
+//        } else {
+//            String status = merchantPlugin.getStatus();
+//            String thirdStatus = merchantPlugin.getThirdStatus();
+//
+//            if (!MerchantChannelStatus.AUDIT_STATUS_EXAMINING.equals(status) || !MerchantChannelStatus.AUDIT_THIRD_STATUS_WAITING.equals(thirdStatus)) {
+//                throw new MsgException("状态非法");
+//            }
+//        }
+//
+//        merchantPlugin.setUserId(Integer.parseInt(merchantBaseInfo.getUserId()));
+//        merchantPlugin.setChannel(SFB_PLUGIN_CHANNEL);
+//
+//        // 进件参数拼接
+//        Map<String, Object> paramMap = ((RyxMerchantAuditServiceImpl)ryxMerchantAuditService).getParams(merchantBaseInfo);
+//        paramMap.put(RyxConstants.CREDIT_RATE, "0.6");
+//        paramMap.put(RyxConstants.DEBIT_RATE, "0.6");
+//        paramMap.put(RyxConstants.QR_DEBIT_RATE, "0.30");
+//        paramMap.put(RyxConstants.QR_CREDIT_RATE, "0.30");
+//        paramMap.put(RyxConstants.WX_DEBIT_RATE, "0.30");
+//        paramMap.put(RyxConstants.ZFB_DEBIT_RATE, "0.30");
+//
+////        log.info("请求参数：{}", JSON.toJSONString(paramMap));
+//        RyxAccessResp resp = ((RyxMerchantAuditServiceImpl) ryxMerchantAuditService).subAuditReq(merchantBaseInfo, paramMap, merchantPlugin);
+//        log.info("请求参数：{}", JSON.toJSONString(paramMap));
+//        Map<String, Object> result = resp.getResult();
+//
+//        String applicationId = ((String) result.get("orderId")).replace("-", "");
+//        merchantPlugin.setApplicationId(applicationId);
+//        merchantPlugin.setStatus(MerchantChannelStatus.AUDIT_STATUS_EXAMINING);
+//        merchantPlugin.setThirdStatus("");
+//        merchantPlugin.setRemark("瑞银信审核中");
+//        merchantPluginService.saveOrUpdate(merchantPlugin);
+//
+//        QueryWrapper<MerchantAuditRecord> queryWrapper = new QueryWrapper<MerchantAuditRecord>().eq("applicationId", applicationId);
+//        MerchantAuditRecord record = ObjectUtil.defaultIfNull(
+//                auditRecordService.getOne(queryWrapper),
+//                new MerchantAuditRecord());
+//        record.setStatus("1");
+//        record.setMerchantCode(merchantBaseInfo.getMerchantCode());
+//        record.setChannel(SFB_PLUGIN_CHANNEL);
+//        record.setThirdStatus("");
+//        record.setMerchantId(applicationId);
+//        auditRecordService.saveOrUpdate(record);
+//        wxTalkService.sendPluginAuditResultAlert(merchantBaseInfo.getUserId());
+//    }
+//
+//    @Override
+//    public void auditCallback(JSONObject jsonObject) {
+//        RyxAccessModel ryxAccessModel = JSON.parseObject(jsonObject.toJSONString(), RyxAccessModel.class);
+//
+//        JSONObject result = ryxService.accessResultDecrypt(ryxAccessModel, JSONObject.class);
+//
+//        String applicationId = result.getString("orderId").replace("-", "");
+//
+//        MerchantPlugin merchantPlugin = new MerchantPlugin()
+//                .setChannel(SFB_PLUGIN_CHANNEL)
+//                .setApplicationId(applicationId);
+//        merchantPlugin = merchantPluginService.getOne(new QueryWrapper<>(merchantPlugin));
+//
+//        if (merchantPlugin == null) {
+//            return;
+//        }
+//
+//        if (MerchantChannelStatus.AUDIT_STATUS_SUCCESS.equals(merchantPlugin.getStatus())) {
+//            // 已经进件通过, 不再处理后续
+//            return;
+//        }
+//
+//        String taskStatus = result.getString("status");
+//        String remark = result.getString("memo");
+//        merchantPlugin.setThirdStatus(taskStatus);
+//
+//        UserApp userApp = userAppMapper.selectByUserId(merchantPlugin.getUserId());
+//        // 暂时只处理成功和失败的状态
+//
+//        if ("3".equals(taskStatus)) {
+//            // 进件成功
+//            merchantPlugin.setStatus(MerchantChannelStatus.AUDIT_STATUS_SUCCESS);
+//            merchantPlugin.setPluginId(result.getString("onlMerId"));
+//            merchantPlugin.setExtra(result);
+//            String posMerId = result.getString("posMerId");
+//            merchantPlugin.setPosMerId(posMerId);
+//            merchantPluginService.updateById(merchantPlugin);
+//            sxfMerAuditHandler.sendNotice(userApp, "收银呗审核通知", "商户插件审核通过", applicationId + "_" + ryxAccessModel.getReqTime());
+//        }
+//
+//        if ("4".equals(taskStatus)) {
+//            // 进件失败
+//            merchantPlugin.setStatus(MerchantChannelStatus.AUDIT_STATUS_REJECT);
+//            merchantPlugin.setRemark(remark);
+//            merchantPluginService.updateById(merchantPlugin);
+//            sxfMerAuditHandler.sendNotice(userApp, "收银呗审核通知", remark, applicationId + "_" + ryxAccessModel.getReqTime());
+//        }
+//
+//        MerchantAuditRecord lastRecord = auditRecordService.getLastRecord(userApp.getMerchantCode());
+//        if (lastRecord != null) {
+//            lastRecord.setStatus(merchantPlugin.getStatus());
+//            lastRecord.setThirdStatus(merchantPlugin.getThirdStatus());
+//            lastRecord.setRemark(result.getString("memo"));
+//            auditRecordService.updateById(lastRecord);
+//        }
+//    }
+//
+//    @Override
+//    public JSONObject termList(String posMerId) {
+//        Map<String, Object> paramMap = new HashMap<>();
+//        paramMap.put("s_merId", posMerId);
+//        paramMap.put("page", "1");
+//        paramMap.put("rows", "10");
+//
+//        RyxAccessModel ryxAccessModel = ryxService.accessCombineEncrypt(paramMap, null, RyxConfig.subAccessId, RyxConfig.subAccessPubKey);
+//        MultiValueMap<String, Object> multiValueMap = RyxAccessModel.toMap(ryxAccessModel);
+//        RyxAccessModel result = restTemplate.postForObject(RyxConfig.termList, multiValueMap, RyxAccessModel.class);
+//        RyxAccessResp resp = ryxService.accessResultDecrypt(result, RyxAccessResp.class);
+//
+//        return resp.getResult();
+//    }
+//}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ryx/impl/RyxTransServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ryx/impl/RyxTransServiceImpl.java
new file mode 100644
index 0000000..209c1c6
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ryx/impl/RyxTransServiceImpl.java
@@ -0,0 +1,289 @@
+package cn.pluss.platform.ryx.impl;
+
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import cn.pluss.platform.channel.MakeMoneyService;
+import cn.pluss.platform.entity.MakeMoney;
+import cn.pluss.platform.entity.MerchantBaseInfo;
+import cn.pluss.platform.entity.MerchantChannelStatus;
+import cn.pluss.platform.entity.RyxAccessResp;
+import cn.pluss.platform.mapper.RyxTransMapper;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.ryx.RyxService;
+import cn.pluss.platform.ryx.RyxTransService;
+import cn.pluss.platform.user.impl.GeneralPushUtil;
+import cn.pluss.platform.util.RyxConfig;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.google.common.collect.Maps;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+
+/**
+ * 瑞银信结算相关方法实现类
+ *
+ * @author DJH
+ */
+@Service
+@Slf4j
+public class RyxTransServiceImpl implements RyxTransService {
+
+    @Setter(onMethod_ = {@Autowired})
+    private RyxTransMapper ryxTransMapper;
+
+    @Setter(onMethod_ = {@Autowired})
+    private RyxService ryxService;
+
+    @Setter(onMethod_ = {@Autowired, @Qualifier("sxfMakeMoneyService")})
+    private MakeMoneyService makeMoneyService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantBaseInfoService merchantBaseInfoService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantChannelStatusService channelStatusService;
+
+    @Autowired
+    private GeneralPushUtil generalPushUtil;
+
+    @Override
+    public RyxAccessResp reqHistoryTransRecord(String merInId, String tranDates, String transDateEnd) {
+        log.info("查询记录开始时间：" + tranDates + "； 截止时间：" + transDateEnd);
+        Map<String, Object> paramMap = new HashMap<>(4);
+        paramMap.put("s_tranDates", tranDates);
+        paramMap.put("s_tranDatee", merInId);
+        paramMap.put("s_merInId", merInId);
+
+
+        return ryxService.reqCommon(paramMap, null, RyxConfig.tranSt);
+    }
+
+    @Override
+    public RyxAccessResp reqTodayTransRecord(String merInId) {
+        Map<String, Object> paramMap = new HashMap<>(2);
+        paramMap.put("s_merInId", merInId);
+
+        return ryxService.reqCommon(paramMap, null, RyxConfig.tranStToday);
+    }
+
+    @Override
+    public List<Map<String, Object>> getNoRecentDayUserPage(String lastDate, int page, int size) {
+        return ryxTransMapper.selectRyxTrans(lastDate, page, size);
+    }
+
+    @Override
+    public void pullTransRecord() {
+        Calendar calendar = Calendar.getInstance();
+        Date currentDate = calendar.getTime();
+        String currentDateStr = DateUtil.format(currentDate, "yyyyMMdd");
+        calendar.add(Calendar.DAY_OF_MONTH, -1);
+        Date lastDate = calendar.getTime();
+        String lastDateStr = DateUtil.format(lastDate, "yyyyMMdd");
+
+        int page = 1;
+        int size = 20;
+
+        List<Map<String, String>> cacheList = new ArrayList<>();
+
+        List<Map<String, Object>> data;
+
+        int count = 0;
+        do {
+            int preSize = cacheList.size();
+            count++;
+            log.info("===============开始操作：第{}次, 第{}页==============", count, page);
+            data = getNoRecentDayUserPage(currentDateStr, page, size);
+            for (Map<String, Object> item : data) {
+                String lastSettleDate = (String) item.get("lastSettleDate");
+                String merInId = ((String) item.get("merInId"));
+                String merchantId = ((String) item.get("merchantId"));
+
+                try {
+                    if (!lastSettleDate.equals(lastDateStr)) {
+                        // 遍历发现如果已经保存过对应的商编和最终结果时间，那么就跳过该数据
+                        boolean flag = false;
+                        for (Map<String, String> itemCache : cacheList) {
+                            String itemMerInId = itemCache.get("merInId");
+                            String itemLastSettleDate = itemCache.get("lastSettleDate");
+
+                            if (merInId.equals(itemMerInId) && lastSettleDate.equals(itemLastSettleDate)) {
+                                flag = true;
+                                break;
+                            }
+                        }
+
+                        if (flag) {
+                            continue;
+                        }
+
+                        HashMap<String, String> cache = Maps.newHashMap();
+                        cache.put("merInId", merInId);
+                        cache.put("lastSettleDate", lastSettleDate);
+                        cacheList.add(cache);
+
+                        // 最后一条结算记录不是昨天，那么需要先使用查询历史数据的接口，查询历史的数据
+                        DateTime lastSettleDateTime = DateUtil.parse(lastSettleDate, "yyyyMMdd");
+                        calendar.setTime(lastSettleDateTime.toJdkDate());
+                        calendar.add(Calendar.DAY_OF_MONTH, +1);
+                        Date startTime = calendar.getTime();
+                        String startTimeStr = DateUtil.format(startTime, "yyyyMMdd");
+
+                        RyxAccessResp resp = reqHistoryTransRecord(merInId, startTimeStr, lastDateStr);
+                        JSONObject result = resp.getResult();
+
+                        save(result, merchantId);
+                    }
+
+                    RyxAccessResp resp = reqTodayTransRecord(merInId);
+                    JSONObject result = resp.getResult();
+
+                    save(result, merchantId);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+
+            /*
+             * 长度没有发生变化，则说明当页数据已经被处理过，可能是冗余或者错误数据，可以对下一页数据进行操作
+             */
+            if (preSize == cacheList.size()) {
+                page++;
+            }
+        } while (data.size() == size);
+    }
+
+    @Override
+    public void pullYesterdayTransRecord() {
+        int page = 1;
+        int resolvedCount;
+        Map<String, Integer> resolvedMap = new HashMap<>();
+        while (true) {
+            resolvedCount = 0;
+            List<Map<String, Object>> listMap = ryxTransMapper.selectRyxInfoYesterday(page, 100);
+            if (listMap == null || listMap.isEmpty()) {
+                break;
+            }
+
+            for (Map<String, Object> item : listMap) {
+                if (resolvedMap.containsKey((String) item.get("merchantId"))) {
+                    continue;
+                } else {
+                    resolvedMap.put((String) item.get("merchantId"), 1);
+                }
+
+                try {
+                    String merInId = ((String) item.get("merInId"));
+                    String merchantId = ((String) item.get("merchantId"));
+
+                    RyxAccessResp resp = reqTodayTransRecord(merInId);
+                    JSONObject result = resp.getResult();
+
+                    resolvedCount += save(result, merchantId);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+
+            if (resolvedCount == 0) {
+                // 本轮未操作任何一个，就切换下一页
+                page++;
+            }
+        }
+    }
+
+    /**
+     * @param result  {
+     *                "total": 1,
+     *                "numberPersonalMessages": null,
+     *                "list": [
+     *                {
+     *                "id": null,
+     *                "merId": "390000000437793",
+     *                "settDate": "20210225094700",
+     *                "status": "出款成功",
+     *                "cardName": "郑**",
+     *                "cardNo": "6228*****5079",
+     *                "amt": 2,
+     *                "settFee": 0.01,
+     *                "orgId": "OX0000000002983",
+     *                "orgName": "J.H武汉融商创银科技有限公司",
+     *                "orgMerName": "商户_郑丽端",
+     *                "bankName": "中国农业银行云霄县支行营业部",
+     *                "failReason": null
+     *                }
+     *                ],
+     *                "numberPublicMessages": null
+     * @param merInId 通道商编
+     *                }
+     */
+    public int save(JSONObject result, String merInId) {
+        int resolvedCount = 0;
+        JSONArray list = result.getJSONArray("list");
+        if (list == null) {
+            return resolvedCount;
+        }
+
+        MerchantBaseInfo merchantBaseInfo = null;
+        for (int i = 0; i < list.size(); i++) {
+            try {
+                JSONObject item = list.getJSONObject(i);
+                String settDateTime = item.getString("settDate");
+                String merId = item.getString("merId");
+
+                if ("出款失败".equals(item.getString("status"))) {
+                    continue;
+                }
+
+                if (merchantBaseInfo == null) {
+                    MerchantChannelStatus channelStatus = new MerchantChannelStatus();
+                    channelStatus.setChannel(3);
+                    channelStatus.setMerchantId(merId);
+                    channelStatus = channelStatusService.getOne(new QueryWrapper<>(channelStatus));
+                    merchantBaseInfo = merchantBaseInfoService.getMerchantBaseInfoByMerchantCode(channelStatus.getMerchantCode());
+                }
+
+                String settDate = settDateTime.substring(0, 8);
+
+                MakeMoney makeMoney = new MakeMoney();
+                makeMoney.setRemark("具体到账时间以银行打款时间为准");
+                makeMoney.setBankAccount(item.getString("cardNo"));
+                makeMoney.setBankHolder(item.getString("cardName"));
+                makeMoney.setBillId(merId + settDate);
+                makeMoney.setCreateTime(DateUtil.format(DateUtil.parse(settDateTime, "yyyyMMddHHmmss"), "yyyy-MM-dd HH:mm:ss"));
+                makeMoney.setMerchantId(merInId);
+                // 单位转为分
+                makeMoney.setPlanAmount(item.getBigDecimal("amt").doubleValue() * 100);
+                makeMoney.setSuspendAmount(0d);
+                makeMoney.setRealAmount(makeMoney.getPlanAmount());
+                makeMoney.setState("1");
+                if (item.get("failReason") != null) {
+                    makeMoney.setFailReason(item.getString("failReason"));
+                }
+                makeMoney.setSettType("D1");
+                makeMoney.setSettDate(settDate.substring(0, 4) + "-" + settDate.substring(4, 6) + "-" + settDate.substring(6, 8));
+                makeMoney.setBankretTime(makeMoney.getCreateTime());
+                makeMoney.setChannelId("3");
+                makeMoney.setThirdStatus(item.getString("status"));
+
+                makeMoneyService.save(makeMoney);
+                resolvedCount++;
+
+                List<String> userIds = Collections.singletonList(merchantBaseInfo.getUserId() + "");
+                String title = "自动提现成功";
+                String content = "到账金额" + (makeMoney.getRealAmount() / 100) + "元，提现门店【" + merchantBaseInfo.getAlias() + "】";
+                generalPushUtil.sendAllPlatByAlias(userIds, title, content, "1");
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+
+        return resolvedCount;
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ryx/pay/RyxPayService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ryx/pay/RyxPayService.java
new file mode 100644
index 0000000..79620b1
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ryx/pay/RyxPayService.java
@@ -0,0 +1,13 @@
+package cn.pluss.platform.ryx.pay;
+
+import cn.pluss.platform.pay.PayService;
+
+
+/**
+ * 瑞银信支付接口
+ */
+public interface RyxPayService extends PayService {
+
+
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ryx/pay/impl/RyxPayServiceimpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ryx/pay/impl/RyxPayServiceimpl.java
new file mode 100644
index 0000000..956550c
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ryx/pay/impl/RyxPayServiceimpl.java
@@ -0,0 +1,636 @@
+package cn.pluss.platform.ryx.pay.impl;
+
+
+import cn.pluss.platform.api.ResultCode;
+import cn.pluss.platform.constants.Constant;
+import cn.pluss.platform.dto.MemberScanPayDTO;
+import cn.pluss.platform.dto.MerChantOrderDTO;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.merchantOrder.MerchantOrderService;
+import cn.pluss.platform.payAreaRyx.PayAreaRyxService;
+import cn.pluss.platform.refundOrder.MerchantRefundOrderService;
+import cn.pluss.platform.region.RegionReflectService;
+import cn.pluss.platform.ryx.RyxConstants;
+import cn.pluss.platform.ryx.RyxService;
+import cn.pluss.platform.ryx.pay.RyxPayService;
+import cn.pluss.platform.util.*;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.concurrent.ExecutorService;
+
+
+@Service
+@Slf4j
+public  class RyxPayServiceimpl implements RyxPayService {
+
+
+    @Resource
+    private RyxService ryxService;
+
+    @Setter(onMethod_ = {@Lazy, @Autowired})
+    private MerchantOrderService merchantOrderService;
+
+    @Setter(onMethod_ = {@Lazy, @Autowired})
+    private MerchantRefundOrderService merchantRefundOrderService;
+
+    @Resource
+    private ExecutorService executorService;
+
+    @Resource
+    private RegionReflectService regionReflectService;
+
+    @Resource
+    private PayAreaRyxService payAreaRyxService;
+
+    /**
+     * 瑞银信被扫支付
+     * @param order
+     * @param channel
+     * @return
+     */
+    @Override
+    public JSONObject tradePay(MerchantOrder order, MerchantChannelStatus channel,MerchantBaseInfo merchant) {
+        log.info("==============>【瑞银信】被扫交易下单请求，请求参数：{}<==================",JSONObject.toJSONString(order));
+        JSONObject reqData = new JSONObject();
+        reqData.put("merchantCode",channel.getMerchantId());
+        merchant.setChannelLimitPay(reqData,channel.getChannel());
+        ryxSetAreaInfo(reqData,merchant);
+        String payWay = "WXZF";
+        String barCode = RyxConfig.barCodePayService;
+        if(StringUtil.isNotEmpty(order.getScanType()) && "01".equals(order.getScanType())){
+            barCode = RyxConfig.qrActiveCodePay;
+            payWay = "wechatPay".equals(order.getPayTypeCode()) ? "WXZF" : "aliPay".equals(order.getPayTypeCode()) ? "ZFBZF" : "UPZF";
+        }else{
+            if("wechatPay".equals(order.getPayTypeCode())){
+                barCode = RyxConfig.barCodePayApplets;
+                reqData.put("userId",order.getMercUserId());
+                reqData.put("subAppId",ParametersUtil.APPLETS_APPID);
+            }else if("aliPay".equals(order.getPayTypeCode())){
+                payWay = "ZFBZF";
+                reqData.put("buyerId",order.getMercUserId());
+            }else{
+                barCode = RyxConfig.barCodeUnionJsPay;
+                payWay = "UPZF";
+                reqData.put("userId",order.getMercUserId());
+                reqData.put("customerIp","127.0.0.1");
+                reqData.put("frontUrl", ParametersUtil.domain + "/wap/merchant/jumpUrl?orderNumber=" + order.getOrderNumber());
+                //前台失败通知地址
+                reqData.put("frontFailUrl", ParametersUtil.domain + "/wap/merchant/jumpUrl?orderNumber=" + order.getOrderNumber());
+            }
+        }
+        reqData.put("scene",1);
+        reqData.put("payWay",payWay);
+        reqData.put("totalAmount",order.getConsumeFee());
+        if(StringUtil.isNotEmpty(order.getSubject())){
+            reqData.put("subject",order.getSubject());
+        }else{
+            reqData.put("subject",order.getMerchantName());
+        }
+        reqData.put("desc",order.getRemark());
+        reqData.put("expireTime",15);
+        reqData.put("reqMsgId",order.getOrderNumber());
+        if(StringUtil.isNotEmpty(order.getExtendParam())){
+            reqData.put(Constant.RYX_PAY_ECHO_KEY_NAME,order.getExtendParam());
+        }
+
+        JSONObject respMap = ryxService.analysisCommonPayParams(RyxConfig.payUrl,barCode,reqData);
+
+        log.info("==============>【瑞银信】被扫交易下单请求，返回参数解析成功：{}<==================",JSONObject.toJSONString(respMap));
+
+        String respCode = respMap.getString("respCode");
+
+        String respType = respMap.getString("respType");
+
+        String respMsg = respMap.getString("respMsg");
+
+        JSONObject result = new JSONObject(16);
+
+        result.put("code",ResultCode.SUCCESS.code());
+
+        result.put("msg",respMsg);
+
+        if(!RyxConfig.PAY_SUCCESS_CODE.equals(respCode)){
+            result.put("code",ResultCode.FAIL.code());
+            if(respMsg.contains("商户需补齐相关资料")){
+                result.put("msg","D1次日到账：商户未在收银呗APP-商户认证-微信认证内完成授权，暂时无法微信收款");
+            }
+            return result;
+        }
+        if(!"S".equals(respType)){
+            result.put("code",ResultCode.FAIL.code());
+            return result;
+        }
+        JSONObject data = respMap.getJSONObject("data");
+
+        JSONObject payData = new JSONObject();
+        if(StringUtil.isNotEmpty(order.getScanType()) && "01".equals(order.getScanType())){
+            payData.put("payUrl",data.getString("qrCode"));
+            payData.put("orderNumber",order.getOrderNumber());
+            payData.put("mercOrderNo",order.getMercOrderNo());
+            payData.put("payAmt",order.getConsumeFee().toString());
+        }else{
+            if("wechatPay".equals(order.getPayTypeCode())){
+                JSONObject wxPayParams = data.getJSONObject("wxjsapiStr");
+                payData.put("payAppId",wxPayParams.getString("appId"));
+                payData.put("payTimeStamp",wxPayParams.getString("timeStamp"));
+                payData.put("paynonceStr",wxPayParams.getString("nonceStr"));
+                payData.put("payPackage",wxPayParams.getString("package"));
+                payData.put("paySignType",wxPayParams.getString("signType"));
+                payData.put("paySign",wxPayParams.getString("paySign"));
+            }else if("aliPay".equals(order.getPayTypeCode())){
+                payData.put("source",data.getString("channelTradeNo").substring(2));
+            }else{
+                payData.put("redirectUrl",data.get("redirectUrl"));
+            }
+        }
+        payData.put("channel",channel.getChannel());
+        result.put("transNo",respMap.getString("smzfMsgId"));
+        order.setTransNo(respMap.getString("smzfMsgId"));
+        result.put("payData",payData);
+        return result;
+    }
+
+    /**
+     * 换取瑞银信区域信息
+     * @date: 2022/2/23 16:04
+     * @param reqData:
+     * @param merchant:
+     */
+    private void ryxSetAreaInfo(JSONObject reqData, MerchantBaseInfo merchant) {
+        RegionCodeRyx ryxRegionCode = regionReflectService.getRyxRegionCode(merchant.getProvince(), merchant.getCity(), merchant.getDistrict());
+        if(ryxRegionCode != null){
+            PayAreaRyx payAreaRyx = payAreaRyxService.getByArea(ryxRegionCode.getProvince(),ryxRegionCode.getCity(),ryxRegionCode.getArea());
+            if(payAreaRyx != null){
+                reqData.put("areaInfo",payAreaRyx.getAreaCode());
+            }else {
+                setRyxCommentAreaInfo(reqData,merchant);
+            }
+        }else{
+            setRyxCommentAreaInfo(reqData,merchant);
+        }
+    }
+
+    private void setRyxCommentAreaInfo(JSONObject reqData, MerchantBaseInfo merchant) {
+        String addressNo = merchant.getAddressNo();
+        if(StringUtil.isNotEmpty(addressNo)){
+            String[] areaArr = addressNo.split("-");
+            String areaInfo = areaArr[areaArr.length - 1];
+            reqData.put("areaInfo",areaInfo);
+        }
+    }
+    /**
+     * 瑞银信主扫支付
+     * @param merchantOrderDTO
+     * @param order
+     * @return
+     */
+    @Override
+    public JSONObject tradePay(MerChantOrderDTO merchantOrderDTO, MerchantOrder order) {
+        JSONObject object = new JSONObject();
+        object.put("merchantCode",merchantOrderDTO.getChannelNo());
+        object.put("payWay","aliPay".equals(merchantOrderDTO.getPayTypeCode()) ? "ZFBZF": "wechatPay".equals(merchantOrderDTO.getPayTypeCode()) ? "WXZF" : "UPZF" );
+        object.put("scene","1");
+        object.put("authCode",merchantOrderDTO.getAuthCode());
+        object.put("totalAmount",order.getConsumeFee());
+        object.put("subject",merchantOrderDTO.getMerchantName());
+        object.put("desc",merchantOrderDTO.getRemark());
+        object.put("reqMsgId",order.getOrderNumber());
+        ryxSetAreaInfo(object,merchantOrderDTO.getMerchantBaseInfo());
+        if(merchantOrderDTO.getMerchantBaseInfo() != null){
+            merchantOrderDTO.getMerchantBaseInfo().setChannelLimitPay(object,Integer.valueOf(order.getAisleSwitch()));
+        }
+        JSONObject respMap = ryxService.analysisCommonPayParams(RyxConfig.payUrl,RyxConfig.barCodePayWay,object);
+
+        log.info("==============>【瑞银信】主扫交易下单请求，返回参数解析成功：{}<==================",JSONObject.toJSONString(respMap));
+
+        JSONObject obj = new JSONObject(6);
+
+        obj.put("code", ResultCode.FAIL.code());
+
+        obj.put("msg","处理成功");
+
+        String respCode = respMap.getString("respCode");
+
+        String respMsg = respMap.getString("respMsg");
+        //响应成功
+        if(RyxConfig.PAY_SUCCESS_CODE.equals(respCode) || RyxConfig.PAY_AWAIT_CODE.equals(respCode)){
+            obj.put("code", ResultCode.SUCCESS.code());
+            obj.put("msg","处理成功");
+            String respType = respMap.getString("respType");
+            JSONObject data = respMap.getJSONObject("data");
+            order.setMercUserId(data.getString("buyerId"));
+            obj.put("transNo",respMap.getString("smzfMsgId"));
+            order.setTransNo(respMap.getString("smzfMsgId"));
+            if(StringUtil.isNotEmpty(data.getString("channelTradeNo"))){
+                String channelOrderNo = data.getString("channelTradeNo");
+                if("aliPay".equals(order.getPayTypeCode())){
+                    obj.put("channelOrderNo",channelOrderNo.substring(2));
+                }else{
+                    obj.put("channelOrderNo",channelOrderNo);
+                }
+            }
+            if("S".equals(respType)){
+                String payTime = data.getString("payTime");
+                //通道订单号
+                obj.put("payTime",DateUtils.parse(payTime,"yyyyMMddHHmmss"));
+                obj.put("payStatus","1");
+            }else if("R".equals(respType)){
+                //支付中
+                obj.put("code", ResultCode.TRANSUNKNOW.code());
+                obj.put("msg","等待支付中...");
+                obj.put("payStatus","7");
+            }else{
+                obj.put("payStatus","3");
+            }
+            String drType = data.getString("payType");
+            order.setDrType(drType);
+            if(!Constant.PAY_TYPE_YSFPAY.equals(order.getPayTypeCode())){
+                order.setChannelRate(RyxConstants.CHANNEL_WECHAT_ALIPAY_COST_RATE.multiply(new BigDecimal(10000)));
+                order.setChannelFee(new BigDecimal(String.valueOf(order.getConsumeFee())).multiply(RyxConstants.CHANNEL_WECHAT_ALIPAY_COST_RATE).setScale(2,BigDecimal.ROUND_HALF_UP));
+            }else{
+                if(order.getConsumeFee() <= 1000.0d){
+                    order.setChannelRate(RyxConstants.CHANNEL_BANK_COST_RATE.multiply(new BigDecimal(10000)));
+                    order.setChannelFee(new BigDecimal(String.valueOf(order.getConsumeFee())).multiply(RyxConstants.CHANNEL_BANK_COST_RATE).setScale(2,BigDecimal.ROUND_HALF_UP));
+                }else{
+                    if("1".equals(drType)){
+                        order.setChannelRate(RyxConstants.DEBIT_CARD_BANK_RATE_LARGE.multiply(new BigDecimal(10000)));
+                        BigDecimal fee = new BigDecimal(String.valueOf(order.getConsumeFee())).multiply(RyxConstants.DEBIT_CARD_BANK_RATE_LARGE).setScale(2,BigDecimal.ROUND_HALF_UP);
+                        if(fee.compareTo(RyxConstants.DEBIT_CARD_BANK_RATE_LARGE_MAX_FEE) > -1){
+                            order.setChannelFee(RyxConstants.DEBIT_CARD_BANK_RATE_LARGE_MAX_FEE);
+                        }else{
+                            order.setChannelFee(fee.setScale(2,BigDecimal.ROUND_HALF_UP));
+                        }
+                    }else{
+                        order.setChannelRate(RyxConstants.CREDIT_CARD_BANK_RATE_LARGE.multiply(new BigDecimal(10000)));
+                        BigDecimal fee = new BigDecimal(String.valueOf(order.getConsumeFee())).multiply(RyxConstants.CREDIT_CARD_BANK_RATE_LARGE).setScale(2,BigDecimal.ROUND_HALF_UP);
+                        order.setChannelFee(fee);
+                    }
+                }
+            }
+        }else{
+            obj.put("code", ResultCode.FAIL.code());
+            obj.put("msg",respMsg);
+        }
+        return obj;
+    }
+
+    @Override
+    public Map<String, Object> refundPay(MerchantOrder order, String mchNo) {
+        log.info("==============>【瑞银信】交易订单退款接口，退款订单号：{}<==================",order.getOrderNumber());
+        JSONObject reqData = new JSONObject();
+        reqData.put("merchantCode",mchNo);
+        reqData.put("oriReqDate",DateUtils.formatDateDefault(order.getCreateDt(),"yyyyMMdd"));
+        reqData.put("oriReqMsgId",order.getOrderNumber());
+        reqData.put("refundAmount",StringUtil.isNotEmpty(order.getRefundType()) && order.getRefundType() == 2 ? order.getRefundAmt() : order.getConsumeFee());
+        reqData.put("refundReason",order.getRemark());
+        JSONObject respMap = ryxService.analysisCommonPayParams(RyxConfig.refundUrl,RyxConfig.barCodePayRefund,reqData);
+        log.info("==============>【瑞银信】交易订单退款接口，退款返回参数报文解析成功：{}<==================",respMap);
+
+        String respCode = respMap.getString("respCode");
+
+        String respMsg = respMap.getString("respMsg");
+
+        Map<String,Object> resultMap = new HashMap<>(5);
+
+        resultMap.put("code",ResultCode.SUCCESS.code());
+
+        resultMap.put("msg",respMsg);
+
+        if(!RyxConfig.PAY_SUCCESS_CODE.equals(respCode)){
+            resultMap.put("code",ResultCode.FAIL.code());
+            return resultMap;
+        }
+        String respType = respMap.getString("respType");
+        resultMap.put("refundNo","RYXR_"+StringUtil.getBillno());
+        if("S".equals(respType)){
+            resultMap.put("status","1");
+            return resultMap;
+        }else if("E".equals(respType)){
+            resultMap.put("code",ResultCode.FAIL.code());
+            resultMap.put("status","3");
+            return resultMap;
+        }else if("R".equals(respType)){
+            resultMap.put("status","2");
+            return resultMap;
+        }
+        resultMap.put("status","3");
+        resultMap.put("code",ResultCode.FAIL.code());
+        resultMap.put("msg","退款失败，未知状态");
+        return resultMap;
+    }
+
+    @Override
+    public JSONObject tradeQuery(MerchantOrder order, String mchId) {
+        log.info("==============>【瑞银信】交易订单查询，查询单号：{}<==================",order.getOrderNumber());
+        JSONObject reqData = new JSONObject(6);
+        reqData.put("merchantCode",mchId);
+        reqData.put("oriReqDate",DateUtils.formatDateDefault(order.getCreateDt(),"yyyyMMdd"));
+        reqData.put("oriReqMsgId",order.getOrderNumber());
+
+        JSONObject respMap = ryxService.analysisCommonPayParams(RyxConfig.payUrl,RyxConfig.barCodePayQuery,reqData);
+
+        log.info("==========>【瑞银信】交易查询响应参数，解析成功：参数为：{}<============", respMap);
+
+        String respCode = respMap.getString("respCode");
+
+        String respMsg = respMap.getString("respMsg");
+
+        String smzfMsgId = respMap.getString("smzfMsgId");
+
+        JSONObject result = new JSONObject(6);
+
+        result.put("code",ResultCode.SUCCESS.code());
+
+        if(!RyxConfig.PAY_SUCCESS_CODE.equals(respCode)){
+            result.put("code",ResultCode.FAIL.code());
+            result.put("msg",respMsg);
+            return result;
+        }
+
+        result.put("transNo",smzfMsgId);
+
+        JSONObject data = respMap.getJSONObject("data");
+
+//        String oriRespCode = data.getString("oriRespCode");
+
+        result.put("msg",data.getString("oriRespMsg"));
+
+//        if(!RyxConfig.PAY_SUCCESS_CODE.equals(oriRespCode)){
+//            result.put("code",ResultCode.FAIL.code());
+//            result.put("payStatus","0");
+//            return result;
+//        }
+        String payType = data.getString("payType");
+        setChannelRateAndFee(payType,order);
+
+        String oriRespType = data.getString("oriRespType");
+        if("S".equals(oriRespType)){
+            result.put("channelOrderNo",data.getString("channelTradeNo"));
+            result.put("payTime",DateUtils.parse(data.getString("payTime"),"yyyyMMddHHmmss"));
+            result.put("payStatus","1");
+            result.put("transNo",smzfMsgId);
+            result.put("buyerId",data.getString("buyerId"));
+            return result;
+        }else if("E".equals(oriRespType)){
+            result.put("payStatus","0");
+            return result;
+        } else if("R".equals(oriRespType)){
+            result.put("payStatus","7");
+            return result;
+        }
+        result.put("code",ResultCode.FAIL.code());
+        result.put("msg","未知状态");
+        return result;
+    }
+
+    private void setChannelRateAndFee(String payType, MerchantOrder order) {
+        if(order.getConsumeFee() > 1000.0d && Constant.PAY_TYPE_YSFPAY.equals(order.getPayTypeCode()) && StringUtil.isNotEmpty(payType)){
+            //借记卡费率
+            if("1".equals(payType)){
+                order.setChannelRate(RyxConstants.DEBIT_CARD_BANK_RATE_LARGE.multiply(new BigDecimal(10000)));
+                BigDecimal fee = new BigDecimal(String.valueOf(order.getConsumeFee())).multiply(RyxConstants.DEBIT_CARD_BANK_RATE_LARGE);
+                if(fee.compareTo(RyxConstants.DEBIT_CARD_BANK_RATE_LARGE_MAX_FEE) > -1){
+                    order.setChannelFee(RyxConstants.DEBIT_CARD_BANK_RATE_LARGE_MAX_FEE);
+                }else{
+                    order.setChannelFee(fee.setScale(2,BigDecimal.ROUND_HALF_UP));
+                }
+            }else{
+                order.setChannelRate(RyxConstants.CREDIT_CARD_BANK_RATE_LARGE.multiply(new BigDecimal(10000)));
+                BigDecimal fee = new BigDecimal(String.valueOf(order.getConsumeFee())).multiply(RyxConstants.DEBIT_CARD_BANK_RATE_LARGE);
+                order.setChannelFee(fee.setScale(2,BigDecimal.ROUND_HALF_UP));
+            }
+        }
+        order.setDrType(payType);
+    }
+
+    @Override
+    public JSONObject refundQuery(MerchantRefundOrder refundOrder) {
+//        QueryWrapper<MerchantOrder> queryWrapper = new QueryWrapper<MerchantOrder>()
+//                .eq("orderNumber",refundOrder.getOrderNumber()).eq("status","1");
+//        MerchantOrder order = merchantOrderService.getOne(queryWrapper);
+//        MsgException.checkNull(order,"订单数据异常！");
+//        JSONObject result = this.tradeQuery(order, refundOrder.getChannelMercNo());
+        return null;
+    }
+
+    /**
+     * 关闭订单接口
+     * @param orderNumber
+     * @param channelNo
+     * @return
+     */
+    @Override
+    public Map<String, Object> closeOrder(String orderNumber, String channelNo) {
+        log.info("==============>【瑞银信】请求关闭订单接口，订单号：{}<==================",orderNumber);
+        JSONObject reqData = new JSONObject(2);
+        reqData.put("merchantCode",channelNo);
+        reqData.put("oriReqMsgId",orderNumber);
+
+        JSONObject respMap = ryxService.analysisCommonPayParams(RyxConfig.payUrl, RyxConfig.barCodeCloseOrder, reqData);
+
+        log.info("==========>【瑞银信】请求关闭订单接口响应参数，解析成功，参数为：{}<============", respMap);
+
+        String respCode = respMap.getString("respCode");
+
+        String respMsg = respMap.getString("respMsg");
+
+        Map<String,Object> resultMap = new HashMap<>(2);
+
+        resultMap.put("code",ResultCode.SUCCESS.code());
+
+        resultMap.put("msg",respMsg);
+
+        if(!RyxConfig.PAY_SUCCESS_CODE.equals(respCode)){
+            resultMap.put("code",ResultCode.FAIL.code());
+            resultMap.put("msg",respMsg);
+            return resultMap;
+        }
+        String respType = respMap.getString("respType");
+        if("S".equals(respType)){
+            return resultMap;
+        }
+        resultMap.put("code",ResultCode.FAIL.code());
+        return resultMap;
+    }
+
+    /**
+     * 获取微信openid接口
+     * @param memberScanPayDTO
+     * @param channel
+     * @return
+     */
+    @Override
+    public Map<String, Object> getWxOpenId(MemberScanPayDTO memberScanPayDTO, MerchantChannelStatus channel){
+        log.info("==============>【瑞银信】微信授权码获取 openid接口，请求业务参数：{}<==================",JSONObject.toJSONString(memberScanPayDTO));
+        JSONObject reqData = new JSONObject(3);
+        reqData.put("merchantCode",channel.getMerchantId());
+        reqData.put("authCode",memberScanPayDTO.getMemberCode());
+        JSONObject respMap = ryxService.analysisCommonPayParams(RyxConfig.payUrl,RyxConfig.barCodeGetOpenid,reqData);
+
+        log.info("==============>【瑞银信】微信授权码获取 openid接口，解析参数成功：{}<==================",JSONObject.toJSONString(respMap));
+
+        Map<String,Object> reusltMap = new HashMap<>();
+
+        String respCode = respMap.getString("respCode");
+
+        String respMsg = respMap.getString("respMsg");
+
+        reusltMap.put("code",ResultCode.FAIL.code());
+
+        reusltMap.put("msg",respMsg);
+
+        String respType = respMap.getString("respType");
+
+        if(!RyxConfig.PAY_SUCCESS_CODE.equals(respCode) || !"S".equals(respType)){
+            return respMap;
+        }
+
+        reusltMap.put("code",ResultCode.SUCCESS.code());
+
+        JSONObject data = respMap.getJSONObject("data");
+
+        reusltMap.put("openid",data.getString("openid"));
+
+        reusltMap.put("subOpenid",data.getString("subOpenid"));
+
+        return reusltMap;
+    }
+
+    /**
+     * 获取银联标识接口
+     * @param userAuthCode
+     * @param paymentApp
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public Map<String, Object> getUnionInfo(String userAuthCode, String paymentApp,String merchantId) throws Exception {
+        JSONObject reqData = new JSONObject(3);
+        reqData.put("merchantCode",merchantId);
+        reqData.put("payWay","UPZF");
+        reqData.put("userAuthCode",userAuthCode);
+        reqData.put("appUpIdentifier",paymentApp);
+        JSONObject respMap = ryxService.analysisCommonPayParams(RyxConfig.payUrl,RyxConfig.barCodeUnionPayUserId,reqData);
+        log.info("==============>【瑞银信】获取银联用户标识 userId接口，解析参数成功：{}<==================",JSONObject.toJSONString(respMap));
+
+        Map<String,Object> reusltMap = new HashMap<>(2);
+
+        String respCode = respMap.getString("respCode");
+
+        String respMsg = respMap.getString("respMsg");
+
+        reusltMap.put("code",ResultCode.FAIL.code());
+
+        reusltMap.put("msg",respMsg);
+
+        String respType = respMap.getString("respType");
+
+        if(!RyxConfig.PAY_SUCCESS_CODE.equals(respCode) || !"S".equals(respType)){
+            return respMap;
+        }
+        reusltMap.put("code",ResultCode.SUCCESS.code());
+        JSONObject data = respMap.getJSONObject("data");
+        reusltMap.put("data",data.getString("userId"));
+        reusltMap.put("code","1");
+        return reusltMap;
+    }
+
+    /**
+     * @description:支付异步回调
+     * @date: 2021/8/23 9:58
+     * @param params:
+     * @return java.lang.String
+     */
+    @Override
+    public String payNotifyCallBack(Map<String, String> params) {
+        //解析返回参数
+        JSONObject respMap = ryxService.analysisPayParamsEncrypt(JSON.toJSONString(params));
+        log.info("=========================>【瑞银信】支付异步回调参数解析成功，解析参数为:{}<=====================",respMap);
+        String respCode = respMap.getString("respCode");
+        if(RyxConfig.PAY_SUCCESS_CODE.equals(respCode)){
+            String respType = respMap.getString("respType");
+            if("S".equals(respType)){
+                JSONObject data = respMap.getJSONObject("data");
+                String smzfMsgId = respMap.getString("smzfMsgId");
+                String billType = data.getString("billType");
+                //借贷标识
+                String payType = data.getString("payType");
+                //yyyyMMddHHmmss
+                String payDateStr = data.getString("payTime");
+                String buyerId = data.getString("buyerId");
+                Date payDate = DateUtils.parse(payDateStr, "yyyyMMddHHmmss");
+                QueryWrapper<MerchantOrder> orderQueryWrapper = new QueryWrapper<MerchantOrder>().eq("transNo",smzfMsgId)
+                        .in("status","5","7");
+                MerchantOrder order = merchantOrderService.getOne(orderQueryWrapper);
+                if(order != null){
+                    String channelOrderNo = data.getString("channelTradeNo");
+                    if(StringUtil.isNotEmpty(channelOrderNo)){
+                        if("aliPay".equals(order.getPayTypeCode())){
+                            channelOrderNo = channelOrderNo.substring(2);
+                        }
+                    }
+                    order.setDrType(payType);
+                    String orderNumber = order.getOrderNumber();
+                    //退款
+                    if("01".equals(billType)){
+                        log.info("====================>【瑞银信】退款成功回调，我方原订单号：{}<====================",orderNumber);
+                        QueryWrapper<MerchantRefundOrder> queryWrapper = new QueryWrapper<MerchantRefundOrder>().eq("orderNumber",orderNumber).eq("channelNo",smzfMsgId);
+                        queryWrapper.eq("status","2");
+                        MerchantRefundOrder refundOrder = merchantRefundOrderService.getOne(queryWrapper);
+                        if(refundOrder == null){
+                            log.error("====================>【瑞银信】退款成功回调，我方原订单号：{}，随行付原订单号：{}，查询出的退款订单为空！<====================",orderNumber,smzfMsgId);
+                        }else{
+                            refundOrder.setRefundTime(payDate);
+                            refundOrder.setStatus("1");
+                            refundOrder.setFailMsg("退款成功");
+                            executorService.execute(() -> merchantRefundOrderService.updateOrderAndSendNotify(refundOrder));
+                        }
+                        //收款
+                    }else if("02".equals(billType)){
+                        order.setTransDt(payDate);
+                        order.setTransNo(smzfMsgId);
+                        order.setStatus("1");
+                        setChannelRateAndFee(payType,order);
+                        order.setThirdTransNo(channelOrderNo);
+                        if(StringUtil.isEmpty(order.getMercUserId())){
+                            order.setMercUserId(buyerId);
+                        }
+                        executorService.execute(() -> merchantOrderService.updateOrderAndCreateProfit(order));
+                    }else if("03".equals(billType)){
+                        //TODO 瑞银信撤销交易回调 暂时没接
+                        log.info("===========>【瑞银信】撤销交易回调没接<==============");
+                    }else{
+                        log.info("===========>【瑞银信】未知billType参数值，billType参数为：{}<==============",billType);
+                    }
+                }
+            }
+        }
+        return RyxConfig.PAY_SUCCESS_CODE;
+    }
+
+    @Override
+    public String tradePayWap(MerchantOrder order, MerchantChannelStatus channel) {
+        return null;
+    }
+
+    @Override
+    public JSONObject getUnionAccountUrl(JSONObject reqData) {
+        return null;
+    }
+
+    @Override
+    public JSONObject jftPay(JftReceiptOrder order, JftMercBaseInfo jftMerc, JftMercPaymentChannel jftChannel) {
+        return null;
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/schedule/TaskSortService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/schedule/TaskSortService.java
new file mode 100644
index 0000000..8b4b263
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/schedule/TaskSortService.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.schedule;
+
+import cn.pluss.platform.entity.TaskSort;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-05-27
+ */
+public interface TaskSortService extends IService<TaskSort> {
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/schedule/UserTaskService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/schedule/UserTaskService.java
new file mode 100644
index 0000000..7b75a86
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/schedule/UserTaskService.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.schedule;
+
+import cn.pluss.platform.entity.UserTask;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-05-27
+ */
+public interface UserTaskService extends IService<UserTask> {
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/schedule/impl/TaskSortServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/schedule/impl/TaskSortServiceImpl.java
new file mode 100644
index 0000000..178e9fa
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/schedule/impl/TaskSortServiceImpl.java
@@ -0,0 +1,20 @@
+package cn.pluss.platform.schedule.impl;
+
+import cn.pluss.platform.entity.TaskSort;
+import cn.pluss.platform.mapper.TaskSortMapper;
+import cn.pluss.platform.schedule.TaskSortService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-05-27
+ */
+@Service
+public class TaskSortServiceImpl extends ServiceImpl<TaskSortMapper, TaskSort> implements TaskSortService {
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/schedule/impl/UserTaskServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/schedule/impl/UserTaskServiceImpl.java
new file mode 100644
index 0000000..4c202ab
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/schedule/impl/UserTaskServiceImpl.java
@@ -0,0 +1,52 @@
+package cn.pluss.platform.schedule.impl;
+
+import cn.pluss.platform.entity.TaskSort;
+import cn.pluss.platform.entity.UserTask;
+import cn.pluss.platform.mapper.UserTaskMapper;
+import cn.pluss.platform.schedule.TaskSortService;
+import cn.pluss.platform.schedule.UserTaskService;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-05-27
+ */
+@Service
+public class UserTaskServiceImpl extends ServiceImpl<UserTaskMapper, UserTask> implements UserTaskService {
+
+    @Autowired
+    private TaskSortService taskSortService;
+
+    private <E extends IPage<UserTask>> void wrapper(E result) {
+        final List<TaskSort> taskSortList = taskSortService.list();
+        for (UserTask record : result.getRecords()) {
+            UserTask.wrapper(record, taskSortList);
+        }
+    }
+
+    @Override
+    public <E extends IPage<UserTask>> E page(E page) {
+        final E result = super.page(page);
+        wrapper(result);
+
+        return result;
+    }
+
+    @Override
+    public <E extends IPage<UserTask>> E page(E page, Wrapper<UserTask> queryWrapper) {
+        final E result = super.page(page, queryWrapper);
+        wrapper(result);
+
+        return result;
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/settle/ChannelMakeMoneyService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/settle/ChannelMakeMoneyService.java
new file mode 100644
index 0000000..20815ce
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/settle/ChannelMakeMoneyService.java
@@ -0,0 +1,44 @@
+package cn.pluss.platform.settle;
+
+import lombok.val;
+
+import java.io.File;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 通道账单相关功能的服务类
+ * @author djh
+ */
+public interface ChannelMakeMoneyService {
+
+    /**
+     * 主要功能
+     * @param params    参数，非统一参数，用map接收
+     */
+    default void mainProcess(Map<String, Object> params) {
+        val file = getFile(params);
+        val dataList = readData(file);
+        insertData(dataList);
+    }
+
+    /**
+     * 获取对账文件
+     * @param params    参数，非统一参数，用map接收
+     * @return  对账文件
+     */
+    File getFile(Map<String, Object> params);
+
+    /**
+     * 从对账文件中获取数据
+     * @param file    文件
+     * @return  数据
+     */
+    List<Map<String, Object>> readData(File file);
+
+    /**
+     * 插入数据
+     * @param readData  数据
+     */
+    void insertData(List<Map<String, Object>> readData);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/settle/SettleService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/settle/SettleService.java
new file mode 100644
index 0000000..1a38bb9
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/settle/SettleService.java
@@ -0,0 +1,31 @@
+package cn.pluss.platform.settle;
+
+import cn.pluss.platform.entity.MakeMoney;
+import cn.pluss.platform.entity.MerchantChannelStatus;
+import com.alibaba.fastjson.JSONObject;
+
+/**
+ * 通用结算接口
+ * @DATE 2021/06/23
+ */
+public interface SettleService {
+
+
+    /**
+     * 提现接口
+     * @param makeMoney
+     * @return
+     */
+    MakeMoney withdraw(MakeMoney makeMoney);
+
+
+    /**
+     * 查询接口
+     * @param makeMoney
+     * @return
+     */
+    JSONObject query(MakeMoney makeMoney);
+
+
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/shiro/UserService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/shiro/UserService.java
new file mode 100644
index 0000000..8b37ae3
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/shiro/UserService.java
@@ -0,0 +1,72 @@
+package cn.pluss.platform.shiro;
+
+import cn.pluss.platform.entitiy.ShiroUser;
+import cn.pluss.platform.entity.MenuInfo;
+import cn.pluss.platform.entity.RoleInfo;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.entity.UserInfo;
+import cn.pluss.platform.mapper.UserAppMapper;
+import cn.pluss.platform.menuInfo.MenuInfoService;
+import cn.pluss.platform.roleInfo.RoleInfoService;
+import cn.pluss.platform.userInfo.UserInfoService;
+import cn.pluss.platform.util.StringUtil;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+@RequiredArgsConstructor
+public class UserService {
+
+    private final UserInfoService userInfoService;
+    private final RoleInfoService roleInfoService;
+    private final MenuInfoService menuInfoService;
+    private final UserAppMapper userAppMapper;
+
+    /**
+     * 查询用户拥有的角色
+     */
+    public List<RoleInfo> getRoleNames(String loginName) {
+        return roleInfoService.getRoleNames(loginName);
+    }
+
+    /**
+     * 查询用户可进行的操作
+     */
+    public List<MenuInfo> getPermissionNames(String loginName) {
+        return menuInfoService.getPermissionNames(loginName);
+    }
+
+    /**
+     * 获得当前用户的ShiroUser信息
+     */
+//    public ShiroUser getShiroUser(String loginName, String password) {
+//        UserInfo userInfo = new UserInfo();
+//        userInfo.setLoginName(loginName);
+//        userInfo.setPassword(password);
+//        userInfo = userInfoService.queryUserInfo(userInfo);
+//        ShiroUser shiroUser = new ShiroUser();
+//        if (userInfo != null) {
+//            List<UserApp> queryUserAppList = userAppMapper.selectListByUserId(userInfo.getId());
+//            if (queryUserAppList != null && queryUserAppList.size() > 0) {
+//                shiroUser.setMerchantCode(queryUserAppList.get(0).getMerchantCode());
+//                shiroUser.setUserType(queryUserAppList.get(0).getUserType());
+//                if (StringUtil.isNotEmpty(queryUserAppList.get(0).getStaffType())) {
+//                    shiroUser.setStaffType(String.valueOf(queryUserAppList.get(0).getStaffType()));
+//                }
+//            }
+//            shiroUser.setLoginName(loginName);
+//            shiroUser.setName(userInfo.getTrueName());
+//            shiroUser.setStatus(userInfo.getStatus());
+//            shiroUser.setId(userInfo.getId());
+//            return shiroUser;
+//        }
+//
+//        return null;
+//    }
+
+    public int getNotificationMenuId(String link) {
+        return userAppMapper.getNotificationMenuId(link);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/subMerchant/SubMerchantService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/subMerchant/SubMerchantService.java
new file mode 100644
index 0000000..9802425
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/subMerchant/SubMerchantService.java
@@ -0,0 +1,39 @@
+package cn.pluss.platform.subMerchant;
+
+import cn.pluss.platform.dto.SubMerchantDTO;
+import cn.pluss.platform.entity.MerchantChannelStatus;
+import cn.pluss.platform.entity.SubMerchant;
+import cn.pluss.platform.mapper.SubMerchantMapper;
+import cn.pluss.platform.vo.SubMerchantVO;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @author SSS
+ */
+public interface SubMerchantService extends IService<SubMerchant> {
+
+    /**
+     * 分页数据
+     * @param page
+     * @param wrapper
+     * @return
+     */
+    default Page<SubMerchantVO> pageVO(Page<SubMerchantVO> page, Wrapper<SubMerchantDTO> wrapper) {
+        return ((SubMerchantMapper) getBaseMapper()).pageVO(page, wrapper);
+    }
+
+    /**
+     * 获取子商户号
+     * @param merchantCode  商编
+     * @param channel       通道id
+     */
+    void reqChannelSubMerchant(String merchantCode, int channel);
+
+    /**
+     * 获取子商户号
+     * @param mcs  通道进件信息
+     */
+    void reqChannelSubMerchant(MerchantChannelStatus mcs);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/subMerchant/impl/SubMerchantServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/subMerchant/impl/SubMerchantServiceImpl.java
new file mode 100644
index 0000000..f278ba1
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/subMerchant/impl/SubMerchantServiceImpl.java
@@ -0,0 +1,203 @@
+package cn.pluss.platform.subMerchant.impl;
+
+import cn.pluss.platform.channel.MerchantAuditService;
+import cn.pluss.platform.entity.MerchantChannelStatus;
+import cn.pluss.platform.entity.SubMerchant;
+import cn.pluss.platform.mapper.SubMerchantMapper;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.subMerchant.SubMerchantService;
+import cn.pluss.platform.yinsheng.v20210929.ReqMethod;
+import cn.pluss.platform.ys.impl.v20210929.YsConfigV2;
+import cn.pluss.platform.ys.impl.v20210929.YsConstant;
+import cn.pluss.platform.ys.impl.v20210929.YsServiceV2;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.dao.DuplicateKeyException;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+@Service
+public class SubMerchantServiceImpl extends ServiceImpl<SubMerchantMapper, SubMerchant> implements SubMerchantService {
+
+    @Autowired @Lazy
+    private MerchantAuditService ryxMerchantAuditService;
+
+    @Autowired @Lazy
+    private MerchantAuditService sxfMerchantAuditService;
+
+    @Autowired @Lazy
+    private YsServiceV2 ysServiceV2;
+
+    @Autowired @Lazy
+    private MerchantChannelStatusService mcsService;
+
+    @Override
+    public void reqChannelSubMerchant(String merchantCode, int channel) {
+        MerchantChannelStatus mcs = mcsService.getByMerchantCode(merchantCode, channel);
+        if (mcs == null || !Objects.equals(mcs.getChannel(), channel)) {
+            return;
+        }
+
+        switch (channel) {
+            case 1:
+                reqSxfSubMerchant(mcs);
+                break;
+            case 3:
+                reqRyxSubMerchant(mcs);
+                break;
+            case 4:
+                reqYsSubMerchant(mcs);
+                break;
+            default:
+                break;
+        }
+    }
+
+    @Override
+    public void reqChannelSubMerchant(MerchantChannelStatus mcs) {
+        if (mcs == null || mcs.getChannel() == null) {
+            return;
+        }
+
+        switch (mcs.getChannel()) {
+            case 1:
+                reqSxfSubMerchant(mcs);
+                break;
+            case 3:
+                reqRyxSubMerchant(mcs);
+                break;
+            case 4:
+                reqYsSubMerchant(mcs);
+                break;
+            default:
+                break;
+        }
+    }
+
+    private void reqYsSubMerchant(MerchantChannelStatus mcs) {
+        if (mcs.getApplicationId() == null) {
+            return;
+        }
+
+        JSONObject params = new JSONObject();
+        params.put("sysFlowId", mcs.getApplicationId());
+        JSONObject data = ysServiceV2.req(YsConfigV2.MER_RESULT, ReqMethod.MERCHANT_QUERY, params);
+
+        String status = data.getString("status");
+
+        if (YsConstant.AuditStatus.AUDIT_SUCCESS.getCode().equals(status)) {
+            String mercId = data.getString("mercId");
+
+            // 第三方商户号信息等
+            JSONArray thirdMercIdList = data.getJSONArray("thridMercList");
+            try {
+                if (thirdMercIdList != null) {
+
+                    int size = thirdMercIdList.size();
+                    for (int i = 0; i < size; i++) {
+                        JSONObject thirdMerc = thirdMercIdList.getJSONObject(i);
+                        String flag = thirdMerc.getString("flag");
+                        String thirdMercId = thirdMerc.getString("thirdMercId");
+                        String type = thirdMerc.getString("type");
+
+                        SubMerchant subMerchant = new SubMerchant();
+                        subMerchant.setMerchantId(mercId);
+
+                        if ("wx".equals(flag)) {
+                            flag = "WX";
+                        }
+
+                        if ("alipay".equals(flag)) {
+                            flag = "ZFB";
+                        }
+
+                        if (StringUtils.isEmpty(thirdMercId)) {
+                            continue;
+                        }
+
+                        subMerchant.setSubMchId(thirdMercId + "_" + type);
+                        subMerchant.setSubMchType(flag);
+                        subMerchant.setChannelTypeId("4");
+                        save(subMerchant);
+                    }
+                }
+            } catch (Exception ignored) {
+            }
+        }
+    }
+
+    private void reqRyxSubMerchant(MerchantChannelStatus mcs) {
+        String applicationId = mcs.getApplicationId();
+        // 拼接成真正的orderId
+        String orderId = applicationId.substring(0, 8) + "-" +
+                applicationId.substring(8, 12) + "-" +
+                applicationId.substring(12, 16) + "-" +
+                applicationId.substring(16, 20) + "-" +
+                applicationId.substring(20);
+        Map<String, Object> reqMap = new HashMap<>();
+        reqMap.put("orderId", orderId);
+        try {
+            JSONObject auditResult = ryxMerchantAuditService.merchantAuditResult(reqMap);
+
+            // 进件成功
+            if (auditResult.getString("wxMerId") != null) {
+                try {
+                    // 保存微信子商户信息
+                    SubMerchant subMerchantWx = new SubMerchant();
+                    subMerchantWx.setMerchantId(auditResult.getString("onlMerId"));
+                    subMerchantWx.setSubMchType("WX");
+                    subMerchantWx.setStatus(auditResult.getString("wxStatus"));
+                    subMerchantWx.setChannelTypeId("3");
+                    subMerchantWx.setRemark(auditResult.getString("wxResult"));
+                    subMerchantWx.setSubMchId(auditResult.getString("wxMerId"));
+                    save(subMerchantWx);
+                } catch (DuplicateKeyException e) {
+                    log.warn("相同的微信子商户号, 不需要重复保存");
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    log.warn("保存微信子商户号错误");
+                }
+            }
+
+            if (auditResult.getString("zfbMerId") != null) {
+                try {
+                    // 保存支付宝子商户信息
+                    SubMerchant subMerchantZfb = new SubMerchant();
+                    subMerchantZfb.setMerchantId(auditResult.getString("onlMerId"));
+                    subMerchantZfb.setSubMchType("ZFB");
+                    subMerchantZfb.setStatus(auditResult.getString("zfbStatus"));
+                    subMerchantZfb.setChannelTypeId("3");
+                    subMerchantZfb.setRemark(auditResult.getString("zfbResult"));
+                    subMerchantZfb.setSubMchId(auditResult.getString("zfbMerId"));
+                    save(subMerchantZfb);
+                } catch (DuplicateKeyException e) {
+                    log.warn("相同的支付宝子商户号, 不需要重复保存");
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    log.warn("保存支付宝子商户号错误");
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    private void reqSxfSubMerchant(MerchantChannelStatus mcs) {
+        Map<String, Object> param = new HashMap<>();
+        param.put("merchantId", mcs.getMerchantId());
+        try {
+            sxfMerchantAuditService.merchantAuditResult(param);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/suggest/SuggestService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/suggest/SuggestService.java
new file mode 100644
index 0000000..1efd787
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/suggest/SuggestService.java
@@ -0,0 +1,26 @@
+package cn.pluss.platform.suggest;
+
+import java.util.List;
+import java.util.Map;
+import cn.pluss.platform.entity.Suggest;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+public interface SuggestService extends IService<Suggest> {
+
+    Suggest querySuggest(Suggest suggest);
+
+    List<Suggest> querySuggestList(Suggest suggest);
+
+    void saveSuggest(Suggest suggest);
+
+    void updateSuggest(Suggest suggest);
+
+    void deleteSuggest(Suggest suggest);
+
+    List<Suggest> querySuggestPage(Map map);
+
+    Integer querySuggestPageCount(Map map);
+
+    void saveSuggestBatch(List<Suggest> suggestList);
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/suggest/impl/SuggestServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/suggest/impl/SuggestServiceImpl.java
new file mode 100644
index 0000000..781e1a2
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/suggest/impl/SuggestServiceImpl.java
@@ -0,0 +1,72 @@
+package cn.pluss.platform.suggest.impl;
+
+import java.util.List;
+import java.util.Map;
+
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.util.RegexUtils;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import cn.pluss.platform.entity.Suggest;
+import cn.pluss.platform.suggest.SuggestService;
+import cn.pluss.platform.mapper.SuggestMapper;
+
+@Transactional
+@Service("suggestService")
+public class SuggestServiceImpl extends ServiceImpl<SuggestMapper, Suggest> implements SuggestService {
+
+    private static final Logger logger = LoggerFactory.getLogger(SuggestServiceImpl.class);
+
+
+    @Autowired
+    private SuggestMapper suggestMapper;
+
+    @Override
+    public Suggest querySuggest(Suggest suggest) {
+        return suggestMapper.querySuggest(suggest);
+    }
+
+    @Override
+    public List<Suggest> querySuggestList(Suggest suggest) {
+        return suggestMapper.querySuggestList(suggest);
+    }
+
+    @Override
+    public void saveSuggest(Suggest suggest) {
+        if (suggest.getPhone() != null && !RegexUtils.checkPhone(suggest.getPhone())) {
+            throw new MsgException("手机号有误，请重新填写");
+        }
+
+        suggestMapper.saveSuggest(suggest);
+    }
+
+    @Override
+    public void updateSuggest(Suggest suggest) {
+        suggestMapper.updateSuggest(suggest);
+    }
+
+    @Override
+    public void deleteSuggest(Suggest suggest) {
+        suggestMapper.deleteSuggest(suggest);
+    }
+
+    @Override
+    public List<Suggest> querySuggestPage(Map map) {
+        return suggestMapper.querySuggestPage(map);
+    }
+
+    @Override
+    public Integer querySuggestPageCount(Map map) {
+        return suggestMapper.querySuggestPageCount(map);
+    }
+
+    @Override
+    public void saveSuggestBatch(List<Suggest> suggestList) {
+        suggestMapper.saveSuggestBatch(suggestList);
+    }
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/RegionCodeSxfService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/RegionCodeSxfService.java
new file mode 100644
index 0000000..bc3c793
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/RegionCodeSxfService.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.sxf;
+
+import cn.pluss.platform.entity.RegionCodeSxf;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 银盛地区表 服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-07-24
+ */
+public interface RegionCodeSxfService extends IService<RegionCodeSxf> {
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/SxfMakeMoneyServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/SxfMakeMoneyServiceImpl.java
new file mode 100644
index 0000000..185d21d
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/SxfMakeMoneyServiceImpl.java
@@ -0,0 +1,202 @@
+package cn.pluss.platform.sxf;
+
+import cn.pluss.platform.CallbackDataService;
+import cn.pluss.platform.channel.BaseMakeMoneyService;
+import cn.pluss.platform.dto.AccountDTO;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.BackDataErrorException;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.merchant.AccountService;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.service.UnknownExceptionService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.util.DateUtils;
+import cn.pluss.platform.user.impl.GeneralPushUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+
+
+@RequiredArgsConstructor
+@Service("sxfMakeMoneyService")
+public class SxfMakeMoneyServiceImpl extends BaseMakeMoneyService {
+
+    private final SxfService sxfService;
+
+    private final CallbackDataService callbackDataService;
+
+    private final UserAppService userAppService;
+
+    private final MerchantChannelStatusService merchantChannelStatusService;
+
+    private final AccountService accountService;
+
+    private final UnknownExceptionService unknownExceptionService;
+
+    private final MerchantBaseInfoService merchantBaseInfoService;
+
+    @Autowired
+    private GeneralPushUtil generalPushUtil;
+
+
+    /**
+     * @param data
+     *  http://doc.tianquetech.com/web/#/3?page_id=312
+     *  orgId - 机构编号
+     *  mno - 商户编号
+     *  serialNo - 结算流水
+     *  amount - 结算金额
+     *  settleStatus - 结算状态
+     *  fee - 手续费
+     *  settleAccountType - 结算账户类型
+     *  settleAccountNm - 结算账户名
+     *  settleBankNm - 结算银行
+     *  settleBankNo - 联行号
+     *  settleDt - 结算时间
+     *  settleTime - 结算完成时时间
+     *  refReason - 结算失败理由
+     *  timeStamp - 时间戳
+     *  sign - 签名
+     */
+    @Override
+    public void dealCallbackData(JSONObject data) {
+        boolean sign;
+        try {
+            sign = sxfService.checkSign(data);
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new BackDataErrorException("随行付结算信息验签失败");
+        }
+
+        if (!sign) {
+            throw new BackDataErrorException("随行付结算信息验签失败");
+        }
+
+
+        try {
+            // 暂时保存回调数据
+            CallbackData callbackData = new CallbackData().setOrigin(data.toString());
+            callbackData.setTable("tb_pluss_make_money");
+            callbackDataService.save(callbackData);
+
+            saveData(data);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * {
+     * 	"refReason": "付款成功",
+     * 	"amount": "11243.38",
+     * 	"settleTime": "20200915100626",
+     * 	"settleBnkNo": "622848****1477",
+     * 	"settleStatus": "S",
+     * 	"fee": "0.0",
+     * 	"sign": "AfAjiUE6U4SnZKUJ4N218pEUaZmHKHjaBuARWM/Onk6LeiBPUIJHshUOT7FefX1wPyuU6+5QKaEBAt57ZG50J6YdEkv3xSYH9V5xZefBVHVrcWodYzOtI9jApfbNXjR08qSMIcHl0vKVyAYHvOZAiKEmyuo2NZKYmeJ8kA2EOUJpzAl10By33jGS1VY7n6gqyJ/2Y3wYlxQvM1gEaxYNWUpRUMSqZA8a8lsR5/ZMel+rqBxjrg/1q1gCZTa1PbIhy9kofDfdVLAflUlCok2NA0Lwy4pnVzTwa8KPn2AjWxW2Gf4ccHMf4YoNfpWEisHTBQZGY7qJ1u32HWkIyDrsDA==",
+     * 	"orgId": "56964586",
+     * 	"mno": "399200831263640",
+     * 	"serialNo": "OSX2020091527777098",
+     * 	"timeStamp": "20200915100627",
+     * 	"settleBankNm": "中国农业银行",
+     * 	"settleBankNo": "103541073242",
+     * 	"settleDt": "20200915"
+     * }
+     * @param data
+     */
+    private void saveData(JSONObject data) {
+        MakeMoney makeMoney = new MakeMoney();
+        makeMoney.setChannelId("1");
+        makeMoney.setBillId(data.getString("serialNo"));
+        makeMoney.setMerchantId(data.getString("mno"));
+        makeMoney.setRealAmount(new BigDecimal(data.getString("amount")).multiply(BigDecimal.valueOf(100)).doubleValue());
+        makeMoney.setPlanAmount(makeMoney.getRealAmount());
+        makeMoney.setSuspendAmount(0d);
+        String settleStatus = data.getString("settleStatus");
+        makeMoney.setThirdStatus(settleStatus);
+        makeMoney.setBankHolder(data.getString("settleAccountNm"));
+        makeMoney.setBankAccount(data.getString("settleBnkNo"));
+
+        switch (settleStatus) {
+            case "S":
+                // 打款成功
+                makeMoney.setState("1");
+                // 结算完成时间
+                String settleTimeStr = data.getString("settleTime");
+                Date  settleTime = DateUtils.parse(settleTimeStr, "yyyyMMddHHmmss");
+                makeMoney.setBankretTime(DateUtils.formatDateDefault(settleTime, "yyyy-MM-dd HH:mm:ss"));
+                break;
+            case "P":
+                // 打款中
+                makeMoney.setState("0");
+                break;
+            case "F":
+                makeMoney.setState("-1");
+            case "R":
+                // 打款退票
+                makeMoney.setState("2");
+                break;
+            default:
+                break;
+        }
+
+        MerchantChannelStatus merchantChannelStatus = new MerchantChannelStatus().setMerchantId(makeMoney.getMerchantId());
+        merchantChannelStatus = merchantChannelStatusService.getOne(new QueryWrapper<>(merchantChannelStatus));
+        if (merchantChannelStatus == null) {
+            throw new MsgException("无法找到对应商户");
+        }
+
+        UserApp userApp = new UserApp().setMerchantCode(merchantChannelStatus.getMerchantCode()).setUserType("promoter");
+        userApp = userAppService.queryUserApp(userApp);
+        if (userApp == null) {
+            throw new MsgException("无法找到对应商户");
+        }
+
+        AccountDTO account = accountService.getAccount(userApp.getUserId() + "");
+        BankCard bankCard = account.getBankCard();
+
+        if (bankCard == null) {
+            String msg = "用户【" + userApp.getUserId() + "】未找到结算卡信息";
+            BackDataErrorException backDataErrorException = new BackDataErrorException(msg);
+            unknownExceptionService.save(backDataErrorException);
+            throw new MsgException("未找到商户对应的结算银行卡信息");
+        } else {
+            makeMoney.setBankHolder(hiddenBankCertName(bankCard.getBankHolder()));
+        }
+
+        String settleDt = data.getString("settleDt");
+        Date settleDate = DateUtils.parse(settleDt, "yyyyMMdd");
+        makeMoney.setSettDate(DateUtils.formatDateDefault(settleDate, "yyyy-MM-dd"));
+
+        String timeStamp = data.getString("timeStamp");
+        Date createTime = DateUtils.parse(timeStamp, "yyyyMMddHHmmss");
+        makeMoney.setCreateTime(DateUtils.formatDateDefault(createTime, "yyyy-MM-dd HH:mm:ss"));
+
+        makeMoney.setFailReason(data.getString("refReason"));
+        makeMoney.setSettType("D1");
+
+        save(makeMoney);
+
+        MerchantBaseInfo merchantBaseInfo = merchantBaseInfoService.getMerchantBaseInfoByUserId(userApp.getUserId() + "");
+        List<String> userIds = Collections.singletonList(userApp.getUserId() + "");
+        String title = "自动提现成功";
+        String content = "到账金额" + (makeMoney.getRealAmount() / 100) + "元，提现门店【" + merchantBaseInfo.getAlias() + "】";
+        generalPushUtil.sendAllPlatByAlias(userIds, title, content, "1");
+    }
+
+    private static String hiddenBankCertName(String bankCertName) {
+        if (bankCertName.length() <= 1) {
+            return "*";
+        }
+        return "*" + bankCertName.substring(1);
+    }
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/SxfService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/SxfService.java
new file mode 100644
index 0000000..ba818eb
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/SxfService.java
@@ -0,0 +1,18 @@
+package cn.pluss.platform.sxf;
+
+import com.alibaba.fastjson.JSONObject;
+
+/**
+ * 封装随行付的通用请求
+ */
+public interface SxfService {
+
+    JSONObject requestApi(String url, JSONObject reqData);
+
+    /**
+     * 结果验签
+     * @param responseData
+     * @return
+     */
+    boolean checkSign(JSONObject responseData) throws Exception;
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/audit/SxfCertServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/audit/SxfCertServiceImpl.java
new file mode 100644
index 0000000..a92fb42
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/audit/SxfCertServiceImpl.java
@@ -0,0 +1,540 @@
+package cn.pluss.platform.sxf.audit;
+
+import cn.pluss.platform.IdCardCacheService;
+import cn.pluss.platform.IdCardService;
+import cn.pluss.platform.SubMerchantApplyOrderService;
+import cn.pluss.platform.channel.MerchantAuditService;
+import cn.pluss.platform.channel.MerchantCertService;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.BackDataErrorException;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.MerchantChannelStatusMapper;
+import cn.pluss.platform.mapper.NoticeMapper;
+import cn.pluss.platform.mapper.UserAppMapper;
+import cn.pluss.platform.merchant.AccountService;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantChannelImg.MerchantChannelImgService;
+import cn.pluss.platform.service.UnknownExceptionService;
+import cn.pluss.platform.subMerchant.SubMerchantService;
+import cn.pluss.platform.sxf.SxfService;
+import cn.pluss.platform.user.impl.GeneralPushUtil;
+import cn.pluss.platform.util.*;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * @author DJH
+ */
+@Slf4j
+@Service("sxfCertService")
+@RequiredArgsConstructor
+public class SxfCertServiceImpl implements MerchantCertService {
+
+    private final SendMsgUtil sendMsgUtil;
+    private final NoticeMapper noticeMapper;
+    private final UserAppMapper userAppMapper;
+
+    @Autowired
+    private SubMerchantService subMerchantService;
+
+    @Autowired
+    private MerchantAuditService sxfMerchantAuditService;
+
+    @Setter(onMethod_ = {@Lazy, @Autowired})
+    private MerchantBaseInfoService mbiService;
+    @Resource
+    private MerchantChannelStatusMapper mcsMapper;
+
+    @Autowired
+    private SubMerchantApplyOrderService applyOrderService;
+    @Autowired
+    private SxfService sxfService;
+
+    @Autowired
+    private SubMerchantService smService;
+
+    @Autowired
+    @Lazy
+    private UnknownExceptionService unknownExceptionService;
+
+    @Autowired
+    @Lazy
+    private AccountService accountService;
+
+    @Autowired
+    @Lazy
+    private IdCardService idCardService;
+
+    @Autowired
+    @Lazy
+    private IdCardCacheService idCardCacheService;
+
+    @Autowired
+    private GeneralPushUtil generalPushUtil;
+
+    @Autowired
+    @Lazy
+    private MerchantChannelImgService channelImgService;
+
+    @Override
+    public void wxCert(String merchantId, String merchantCode) {
+        JSONObject reqData = new JSONObject();
+
+        reqData.put("backUrl", ParametersUtil.domain + "/api/wxCertCallback/sxf");
+
+        MerchantChannelStatus merchantChannelStatus = new MerchantChannelStatus().setMerchantCode(merchantCode).setChannel(1);
+        merchantChannelStatus = mcsMapper.selectOne(new QueryWrapper<>(merchantChannelStatus));
+
+        MerchantBaseInfo mbi = mbiService.getMerchantBaseInfoByMerchantCode(merchantCode);
+        Account account = accountService.getRealAccount(mbi.getUserId(), Account.CHANNEL_TYPE_D1);
+
+        if (account.getSettleType().startsWith(Account.SETTLE_TYPE_PRIVATE_ILLEGAL)) {
+
+            // 如果是非法人结算，需要将上送的负责人信息修改为法人
+            final IdCard legalIdcard = idCardService.getLegalIdCard(mbi.getUserId());
+            reqData.put("contactName", legalIdcard.getCertName());
+            reqData.put("contactIdNo", legalIdcard.getCertNo());
+            reqData.put("identityType", "00");
+
+            final MerchantChannelImg mciPositive = channelImgService.get(legalIdcard.getImgPositive(), 1);
+            final MerchantChannelImg mciNegative = channelImgService.get(legalIdcard.getImgNegative(), 1);
+
+            reqData.put("contactPositivePic", mciPositive.getChannelImgUrl());
+            reqData.put("contactOppositePic", mciNegative.getChannelImgUrl());
+            reqData.put("contactPersonLicStt", legalIdcard.getCertStartTime().replace("-", ""));
+            reqData.put("contactPersonLicEnt", legalIdcard.getCertEndTime().replace("-", ""));
+
+            if (MerchantBaseInfo.MERCH_TYPE_COMPANY.equals(mbi.getMerchantType())) {
+                if (StringUtils.isBlank(legalIdcard.getCertAddress())) {
+                    IdCardCache idCardCache = new IdCardCache();
+                    idCardCache.setCertNo(legalIdcard.getCertNo());
+                    final IdCardCache exist = idCardCacheService.getOne(new QueryWrapper<>(idCardCache));
+                    if (exist != null) {
+                        legalIdcard.setCertAddress(exist.getAddress());
+                    }
+                }
+                reqData.put("legalPersonAddress", legalIdcard.getCertAddress());
+            }
+        }
+
+        reqData.put("mno", merchantChannelStatus.getMerchantId());
+
+
+        JSONObject responseData = sxfService.requestApi(SxfConfg.SXF_WX_CERT, reqData);
+
+        String signContent = SignUtils.getSignContent(responseData);
+        boolean checkSign;
+        try {
+            checkSign = RSAUtils.checkSign(SxfConfg.PUBLIC_KEY, signContent, responseData.getString("sign"));
+        } catch (Exception e) {
+            log.error("商户微信认证申请结果验签失败");
+            e.printStackTrace();
+            throw new MsgException("商户微信认证结果验签失败");
+        }
+
+        if (!checkSign) {
+            log.error("商户微信认证结果验签失败");
+            throw new MsgException("商户微信认证结果验签失败");
+        }
+
+        if (!SxfConfg.SXF_SUCCESS_CODE.equals(responseData.getString("code"))) {
+            String msg = responseData.getString("msg");
+            log.error("商户微信认证异常: {}", msg);
+            // 没有微信子商户号的问题，不做记录
+            if (msg.startsWith("商编不存在或无可用微信子商户号") || msg.startsWith("商户已有申请单") || Objects.equals(msg, "未知异常，请稍后重试")) {
+                return;
+            }
+
+            SubMerchantApplyOrder subMerchantApplyOrder = new SubMerchantApplyOrder();
+            subMerchantApplyOrder.setMerchantCode(merchantCode);
+            subMerchantApplyOrder.setChannelId(1);
+            subMerchantApplyOrder.setStatus("0");
+            subMerchantApplyOrder.setResultStatus(SubMerchantApplyOrder.RES_STATUS_COMMIT_ERROR);
+            subMerchantApplyOrder.setRemark(msg);
+            subMerchantApplyOrder.setSubMchType("WX");
+            Date now = new Date();
+            subMerchantApplyOrder.setMerchantCode(merchantChannelStatus.getMerchantCode());
+            // 先更新
+            LambdaUpdateWrapper<SubMerchantApplyOrder> uWrapper = Wrappers.lambdaUpdate();
+            uWrapper.eq(SubMerchantApplyOrder::getMerchantCode, merchantCode);
+            uWrapper.eq(SubMerchantApplyOrder::getChannelId, 1);
+            uWrapper.eq(SubMerchantApplyOrder::getResultStatus, SubMerchantApplyOrder.RES_STATUS_COMMIT_ERROR);
+            uWrapper.set(SubMerchantApplyOrder::getStatus, "0")
+                    .set(SubMerchantApplyOrder::getResultStatus, SubMerchantApplyOrder.RES_STATUS_COMMIT_ERROR)
+                    .set(SubMerchantApplyOrder::getRemark, msg)
+                    .set(SubMerchantApplyOrder::getCreateTime, now)
+                    .set(SubMerchantApplyOrder::getUpdateTime, now);
+            boolean updateFlag = applyOrderService.update(uWrapper);
+            if (!updateFlag) {
+                applyOrderService.save(subMerchantApplyOrder);
+            }
+
+//                throw new MsgException(msg);
+        } else {
+            JSONObject respData = responseData.getJSONObject("respData");
+            if (!SxfConfg.SXF_SUCCESS_CODE.equals(respData.getString("bizCode"))) {
+                String msg = respData.getString("bizMsg");
+                log.error("商户微信认证请求失败: {}", msg);
+
+                // 没有微信子商户号的问题，不做记录
+                if (msg.startsWith("商编不存在或无可用微信子商户号") || msg.startsWith("商户已有申请单") || Objects.equals(msg, "未知异常，请稍后重试")) {
+                    return;
+                }
+
+                SubMerchantApplyOrder subMerchantApplyOrder = new SubMerchantApplyOrder();
+                subMerchantApplyOrder.setMerchantCode(merchantCode);
+                subMerchantApplyOrder.setChannelId(1);
+                subMerchantApplyOrder.setStatus("0");
+                subMerchantApplyOrder.setResultStatus(SubMerchantApplyOrder.RES_STATUS_COMMIT_ERROR);
+                subMerchantApplyOrder.setRemark(msg);
+                subMerchantApplyOrder.setSubMchType("WX");
+                subMerchantApplyOrder.setMerchantCode(merchantChannelStatus.getMerchantCode());
+                // 先更新
+                LambdaUpdateWrapper<SubMerchantApplyOrder> uWrapper = Wrappers.lambdaUpdate();
+                uWrapper.eq(SubMerchantApplyOrder::getMerchantCode, merchantCode);
+                uWrapper.eq(SubMerchantApplyOrder::getChannelId, 1);
+                uWrapper.eq(SubMerchantApplyOrder::getResultStatus, SubMerchantApplyOrder.RES_STATUS_COMMIT_ERROR);
+                uWrapper.set(SubMerchantApplyOrder::getStatus, "0")
+                        .set(SubMerchantApplyOrder::getResultStatus, SubMerchantApplyOrder.RES_STATUS_COMMIT_ERROR)
+                        .set(SubMerchantApplyOrder::getRemark, msg)
+                        .set(SubMerchantApplyOrder::getUpdateTime, new Date());
+                boolean updateFlag = applyOrderService.update(uWrapper);
+                if (!updateFlag) {
+                    applyOrderService.save(subMerchantApplyOrder);
+                }
+            } else {
+                // 将之前微信认证请求发生错误的信息直接全部清理
+                // 将之前微信认证请求发生错误的信息直接全部清理
+                LambdaQueryWrapper<SubMerchantApplyOrder> qWrapper = Wrappers.lambdaQuery();
+                qWrapper.eq(SubMerchantApplyOrder::getMerchantCode, merchantCode)
+                        .eq(SubMerchantApplyOrder::getChannelId, 1);
+
+                applyOrderService.remove(qWrapper);
+
+                SubMerchantApplyOrder subMerchantApplyOrder = new SubMerchantApplyOrder();
+                subMerchantApplyOrder.setMerchantCode(merchantCode);
+                subMerchantApplyOrder.setChannelId(1);
+                subMerchantApplyOrder.setApplyNo(respData.getString("wxApplyNo"));
+                subMerchantApplyOrder.setStatus("0");
+                subMerchantApplyOrder.setSubMchType("WX");
+                subMerchantApplyOrder.setMerchantCode(merchantChannelStatus.getMerchantCode());
+                applyOrderService.save(subMerchantApplyOrder);
+            }
+        }
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void wxReCert(String merchantId, String merchantCode) {
+        SubMerchantApplyOrder subMerchantApplyOrder = new SubMerchantApplyOrder()
+                .setMerchantCode(merchantCode).setStatus("1");
+        subMerchantApplyOrder = applyOrderService.getOne(new QueryWrapper<>(subMerchantApplyOrder));
+
+        try {
+            wxCertCancel(merchantId, subMerchantApplyOrder);
+        } catch (Exception e) {
+            log.error("微信认证取消异常 {}", e.getMessage());
+        }
+        // 取消微信认证不影响再次认证的操作
+        wxCert(merchantId, merchantCode);
+    }
+
+    @Override
+    public JSONObject wxCertResult(String merchantId, String wxApplyNo) {
+        JSONObject reqData = new JSONObject();
+        reqData.put("mno", merchantId);
+        reqData.put("wxApplyNo", wxApplyNo);
+
+        JSONObject result = sxfService.requestApi(SxfConfg.SXF_WX_CERT_RESULT, reqData);
+
+        String signContent = SignUtils.getSignContent(result);
+        try {
+            boolean sign = RSAUtils.checkSign(SxfConfg.PUBLIC_KEY, signContent, result.getString("sign"));
+
+            // 验签不通过，下一个
+            if (!sign) {
+                unknownExceptionService.save(new BackDataErrorException("随行付-获取商户微信实名进度结果-验签异常"));
+                return result;
+            }
+        } catch (Exception e) {
+            unknownExceptionService.save(new BackDataErrorException("随行付-获取商户微信实名进度结果-验签异常"));
+        }
+
+        String code = result.getString("code");
+
+        if (SxfConfg.SXF_NO_PERMIT.equals(code)) {
+            log.warn("随行付-进件相关功能未开通");
+            return result;
+        }
+
+        if (!SxfConfg.SXF_SUCCESS_CODE.equals(code)) {
+            BackDataErrorException dataErrorException = new BackDataErrorException("商户微信实名认证申请结果查询失败");
+            unknownExceptionService.save(dataErrorException);
+
+            return result;
+        }
+
+        JSONObject respData = result.getJSONObject("respData");
+        if (!respData.getString("bizCode").equals(SxfConfg.SXF_SUCCESS_CODE)) {
+            log.info("商户号：" + merchantId + respData.getString("bizMsg"));
+            return result;
+        }
+
+        // 执行微信商户认证申请结果回调
+        try {
+            if (respData.getString("wxApplyNo") == null) {
+                respData.put("wxApplyNo", wxApplyNo);
+            }
+            wxCertCallback(respData);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("查询随行付商户微信认证状态回调报错，报错的商户商户号为 : " + merchantId);
+        }
+
+        return result;
+    }
+
+    @Override
+    public JSONObject wxCertCallback(JSONObject certResult) {
+        log.info("微信认证审核回调数据：\n {}", certResult.toJSONString());
+
+        String idenStatus = certResult.getString("idenStatus");
+        if ("applyment_state_canceled".equalsIgnoreCase(idenStatus)) {
+            log.info(certResult.getString("bizMsg"));
+            if (certResult.getString("wxApplyNo") != null) {
+                LambdaQueryWrapper<SubMerchantApplyOrder> qWrapper = Wrappers.lambdaQuery();
+                qWrapper.eq(SubMerchantApplyOrder::getApplyNo, certResult.getString("wxApplyNo"))
+                        .eq(SubMerchantApplyOrder::getChannelId, 1);
+                SubMerchantApplyOrder one = applyOrderService.getOne(qWrapper);
+                one.setStatus("1");
+                one.setResultStatus("APPLYMENT_STATE_CANCELED");
+                one.setRemark("商户此申请单已作废");
+                applyOrderService.updateById(one);
+            }
+
+            return SxfConfg.ok();
+        }
+
+        if (certResult.getString("wxApplyNo") == null) {
+            return SxfConfg.ok();
+        }
+
+        SubMerchantApplyOrder subMerchantApplyOrder = new SubMerchantApplyOrder().setApplyNo(certResult.getString("wxApplyNo")).setSubMchType("WX");
+        SubMerchantApplyOrder existData = applyOrderService.getOne(new QueryWrapper<>(subMerchantApplyOrder));
+
+        if (existData == null) {
+            log.error("无法获取对应工单信息");
+            return SxfConfg.ok();
+        }
+
+        UserApp userApp = userAppMapper.selectByMerchantCode(existData.getMerchantCode());
+
+        // 默认处理过
+        if ("1".equals(existData.getStatus())) {
+            log.info("该工单已处理过");
+            return SxfConfg.ok();
+        }
+
+        existData.setStatus("1");
+
+        existData.setResultStatus(idenStatus);
+
+        if ("APPLYMENT_STATE_WAITTING_FOR_AUDIT".equals(idenStatus)) {
+            // 工单未处理, 请耐心等待1~2个工作日，微信支付将会完成审核
+            existData.setStatus("0");
+            log.info("认证申请审核中");
+        }
+
+        if ("APPLYMENT_STATE_WAITTING_FOR_CONFIRM_CONTACT".equals(idenStatus)) {
+            log.error("待确认联系信息");
+        }
+
+        if ("APPLYMENT_STATE_WAITTING_FOR_CONFIRM_LEGALPERSON".equals(idenStatus)) {
+            log.info("待商户验证");
+        }
+
+        if ("APPLYMENT_STATE_PASSED".equals(idenStatus)) {
+            log.info("审核通过");
+        }
+
+        if ("APPLYMENT_STATE_REJECTED".equals(idenStatus)) {
+            log.error("审核驳回");
+        }
+
+        if ("APPLYMENT_STATE_FREEZED".equals(idenStatus)) {
+            log.error("审核驳回");
+        }
+
+        if ("APPLYMENT_STATE_CANCELED".equals(idenStatus)) {
+            log.error("审核驳回");
+        }
+
+        if ("APPLYMENT_STATE_OPENACCOUNT".equals(idenStatus)) {
+            log.info("已做过实名认证");
+            return SxfConfg.ok();
+        }
+
+        if ("APPLYMENT_STATE_WAITTING_FOR_AUDIT".equals(idenStatus)) {
+            log.info("等待审核");
+            existData.setRemark("等待微信审核");
+        }
+
+        List<String> alisaList = new ArrayList<>();
+        alisaList.add(userApp.getUserId() + "");
+        if (StringUtils.isNotEmpty(certResult.getString("infoQrcode"))) {
+            existData.setInfoQrcode(certResult.getString("infoQrcode"));
+            existData.setRemark("");
+
+            String content = "请商户进行微信实名认证，短信将发送至商户联系人手机号，已认证可忽略";
+            generalPushUtil.sendAllPlatByAlias(alisaList, "商户微信认证通知", content, "1");
+
+            Notice notice = new Notice(1, 1, userApp);
+            notice.setConrtent(content);
+            noticeMapper.saveNotice(notice);
+
+            QueryWrapper<MerchantBaseInfo> queryWrapper = new QueryWrapper<MerchantBaseInfo>().eq("userId", userApp.getUserId());
+            MerchantBaseInfo merchantBaseInfo = mbiService.getOne(queryWrapper);
+
+            try {
+                sendMsgUtil.verifyMsg(merchantBaseInfo.getContactMobile(), userApp.getMerchantCode() + "?i=1");
+            } catch (MsgException e) {
+                log.error(e.getMessage());
+            }
+        }
+
+        if (StringUtils.isNotEmpty(certResult.getString("rejectCode"))) {
+            existData.setResultStatus(certResult.getString("rejectCode"));
+        }
+
+        if (StringUtils.isEmpty(certResult.getString("infoQrcode")) && StringUtils.isNotEmpty(certResult.getString("rejectInfo"))) {
+            Notice notice = new Notice(1, 1, userApp);
+            String pushMsg = "您好！您的商户微信认证因“##”被驳回，请联系收银呗客服修改资料并重新审核";
+            pushMsg = pushMsg.replace("##", certResult.getString("rejectInfo"));
+            notice.setConrtent(pushMsg);
+            noticeMapper.saveNotice(notice);
+
+            generalPushUtil.sendAllPlatByAlias(alisaList, "商户微信认证通知", pushMsg, "1");
+            existData.setRemark(certResult.getString("rejectInfo"));
+        }
+
+        existData.setUpdateTime(new Date());
+        applyOrderService.updateById(existData);
+
+        return SxfConfg.ok();
+    }
+
+    @Override
+    public void wxCertCancel(String merchantId, SubMerchantApplyOrder subMerchantApplyOrder) {
+        JSONObject reqData = new JSONObject();
+        reqData.put("mno", merchantId);
+        reqData.put("wxApplyNo", subMerchantApplyOrder.getApplyNo());
+
+        JSONObject response = sxfService.requestApi(SxfConfg.SXF_WX_CERT_CANCEL, reqData);
+
+        boolean sign;
+        try {
+            sign = sxfService.checkSign(response);
+        } catch (Exception e) {
+            log.error("商户微信认证申请验签失败, {}", e.getMessage());
+            throw new MsgException("商户微信认证申请验签失败");
+        }
+
+        if (!sign) {
+            throw new MsgException("商户微信认证申请验签失败");
+        }
+
+        if (!SxfConfg.SXF_SUCCESS_CODE.equals(response.getString("code"))) {
+            throw new MsgException(response.getString("msg"));
+        }
+
+        JSONObject respData = response.getJSONObject("respData");
+
+        if (!SxfConfg.SXF_SUCCESS_CODE.equals(respData.get("bizCode"))) {
+            throw new MsgException(respData.getString("bizMsg"));
+        }
+
+        // 取消进件信息后需要修改状态
+        subMerchantApplyOrder.setStatus("2").setUpdateTime(new Date());
+        applyOrderService.updateById(subMerchantApplyOrder);
+    }
+
+    @Override
+    public void wxCertAuthStatus(String merchantId) {
+        SubMerchant condition = new SubMerchant();
+        condition.setMerchantId(merchantId);
+        condition.setChannelTypeId("1");
+        condition.setSubMchType("wx");
+
+        SubMerchant sm = smService.getOne(new QueryWrapper<>(condition).last("LIMIT 1"));
+        if (sm == null) {
+            log.warn("【{}】没有查询到微信子商户信息, 开始查询微信子商户号", merchantId);
+
+            JSONObject param = new JSONObject();
+            param.put("merchantId", merchantId);
+
+            try {
+                sxfMerchantAuditService.merchantAuditResult(param);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+
+        sm = smService.getOne(new QueryWrapper<>(condition).last("LIMIT 1"));
+        if (sm == null) {
+            return;
+        }
+
+        JSONObject param = new JSONObject();
+        param.put("subMchId", sm.getSubMchId());
+
+        JSONObject jsonObject = sxfService.requestApi(SxfConfg.SXF_WX_CERT_STATUS, param);
+
+        String signContent = SignUtils.getSignContent(jsonObject);
+        try {
+            RSAUtils.checkSign(SxfConfg.PUBLIC_KEY, signContent, jsonObject.getString("sign"));
+        } catch (Exception e) {
+            throw new BackDataErrorException("随行付-获取商户微信实名进度结果-验签异常");
+        }
+
+        String code = jsonObject.getString("code");
+        JSONObject respData = jsonObject.getJSONObject("respData");
+        if (!Objects.equals(SxfConfg.SXF_SUCCESS_CODE, code)) {
+            log.warn("【{}】" + jsonObject.getString("msg"), merchantId);
+            return;
+        }
+
+        String bizMsg = respData.getString("bizMsg");
+        String bizCode = respData.getString("bizCode");
+        if (!Objects.equals(SxfConfg.SXF_SUCCESS_CODE, bizCode)) {
+            log.warn("【{}】" + bizMsg, merchantId);
+            return;
+        }
+
+        String authStatus = respData.getString("authStatus");
+        if (Objects.equals(authStatus, "AUTHORIZE_STATE_AUTHORIZED")) {
+            LambdaUpdateWrapper<MerchantChannelStatus> uWrapper = Wrappers.lambdaUpdate();
+            uWrapper.eq(MerchantChannelStatus::getChannel, 1)
+                    .eq(MerchantChannelStatus::getMerchantId, merchantId)
+                    .set(MerchantChannelStatus::getAuthorizationStatus, MerchantChannelStatus.AUTHORIZATION_STATUS_AUTHORIZED)
+                    .set(MerchantChannelStatus::getUpdateTime, new Date());
+            mcsMapper.update(null, uWrapper);
+        }
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/audit/SxfChangeRateNewServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/audit/SxfChangeRateNewServiceImpl.java
new file mode 100644
index 0000000..d883a83
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/audit/SxfChangeRateNewServiceImpl.java
@@ -0,0 +1,148 @@
+package cn.pluss.platform.sxf.audit;
+
+import cn.pluss.platform.channel.BaseMchChannelRateNewService;
+import cn.pluss.platform.converter.Converter;
+import cn.pluss.platform.entity.MerchantBaseInfo;
+import cn.pluss.platform.entity.MerchantChannelStatus;
+import cn.pluss.platform.entity.MerchantRateNew;
+import cn.pluss.platform.entity.MerchantRateNewRecord;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.MerchantBaseInfoMapper;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.sxf.SxfService;
+import cn.pluss.platform.util.RSAUtils;
+import cn.pluss.platform.util.SignUtils;
+import cn.pluss.platform.util.SxfConfg;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.EqualsAndHashCode;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.Date;
+import java.util.List;
+
+/**
+ *
+ * @author djh
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service("sxfChangeRateNewService")
+@EqualsAndHashCode(callSuper = true)
+public class SxfChangeRateNewServiceImpl extends BaseMchChannelRateNewService {
+
+    private final SxfService sxfService;
+    private final MerchantBaseInfoMapper merchantBaseInfoMapper;
+
+    @Setter(onMethod_ = {@Autowired,@Lazy})
+    private MerchantChannelStatusService merchantChannelStatusService;
+
+    @Override
+    public void process(String userId, MerchantRateNew merchantRate) {
+        MerchantRateNew.setRateValue(merchantRate);
+
+        List<MerchantBaseInfo> merchantBaseInfoList = merchantBaseInfoMapper.selectListByUserId(userId);
+        if (merchantBaseInfoList == null || merchantBaseInfoList.size() == 0) {
+            throw new MsgException("无法获取商户信息");
+        }
+
+        MerchantBaseInfo merchantBaseInfo = merchantBaseInfoList.get(0);
+        MerchantChannelStatus merchantChannelStatus = new MerchantChannelStatus().setChannel(1).setMerchantCode(merchantBaseInfo.getMerchantCode());
+        merchantChannelStatus = merchantChannelStatusService.getOne(new QueryWrapper<>(merchantChannelStatus));
+        if (merchantChannelStatus == null) {
+            throw new MsgException("商户还未进件");
+        }
+
+        JSONObject reqParam = new JSONObject();
+        reqParam.put("mno", merchantChannelStatus.getMerchantId());
+        JSONArray qrCodeList = new JSONArray();
+        // 微信
+        JSONObject rate1 = new JSONObject();
+        rate1.put("rate", merchantRate.getWxRateValue().divide(BigDecimal.valueOf(100), RoundingMode.HALF_UP).stripTrailingZeros().toPlainString());
+        rate1.put("rateType", "01");
+        qrCodeList.add(rate1);
+        // 支付宝
+        rate1 = new JSONObject();
+        rate1.put("rate", merchantRate.getAliRateValue().divide(BigDecimal.valueOf(100), RoundingMode.HALF_UP).stripTrailingZeros().toPlainString());
+        rate1.put("rateType", "02");
+        qrCodeList.add(rate1);
+        // 银联，小于1000, 银联费率最低是23
+        rate1 = new JSONObject();
+        rate1.put("rate", merchantRate.getBankRateValue().divide(BigDecimal.valueOf(100), RoundingMode.HALF_UP).stripTrailingZeros().toPlainString());
+        rate1.put("rateType", "06");
+        qrCodeList.add(rate1);
+        // 银联，大于1000
+        rate1 = new JSONObject();
+        rate1.put("rate", "0.60");
+        rate1.put("rateType", "07");
+        qrCodeList.add(rate1);
+        reqParam.put("qrcodeList", qrCodeList);
+        //reqParam.put("mecAuthority", "01");
+        reqParam.put("startSettleAmt", "0.00");
+        reqParam.put("reserveSettleAmt", "0.00");
+        reqParam.put("settleType", "04");
+        String[] channelArr = new String[]{"01", "02", "03"};
+        reqParam.put("supportPayChannels", channelArr);
+
+        String[] tradeType = new String[] {"01", "02", "03", "04"};
+        reqParam.put("supportTradeTypes", tradeType);
+
+        JSONObject result = sxfService.requestApi(SxfConfg.SXF_UPDATE_MERCHANT_RATE, reqParam);
+
+        String signContent = SignUtils.getSignContent(result);
+        boolean sign;
+        try {
+            sign = RSAUtils.checkSign(SxfConfg.PUBLIC_KEY, signContent, result.getString("sign"));
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.info("修改费率结果验签失败");
+            throw new MsgException("修改费率失败");
+        }
+        if (!sign) {
+            throw new MsgException("修改费率失败");
+        }
+
+        if (!SxfConfg.SXF_SUCCESS_CODE.equals(result.getString("code"))) {
+            throw new MsgException(result.getString("msg"));
+        }
+
+        JSONObject respData = result.getJSONObject("respData");
+        if (!SxfConfg.SXF_SUCCESS_CODE.equals(respData.get("bizCode"))) {
+            throw new MsgException(respData.getString("bizMsg"));
+        }
+    }
+
+    @Override
+    public void after(String userId, MerchantRateNew merchantRate) {
+        // 保存费率修改记录
+        MerchantRateNewRecord merchantRateRecord = Converter.INSTANCE.trans(merchantRate);
+        merchantRateRecord.setStatus("3");
+        merchantRateRecord.setCreateTime(new Date());
+        merchantRateRecord.setUpdateTime(new Date());
+        rateNewRecordService.save(merchantRateRecord);
+    }
+
+    @Override
+    public String getChannelId() {
+        return "1";
+    }
+
+    @Override
+    public MerchantRateNew getDefaultRate() {
+        MerchantRateNew merchantRateNew = new MerchantRateNew();
+        merchantRateNew.setChannel(1);
+        merchantRateNew.setWxRate(38);
+        merchantRateNew.setAliRate(38);
+        merchantRateNew.setBankRate(38);
+        merchantRateNew.setBankRateLarge(-1);
+        return merchantRateNew;
+    }
+}
\ No newline at end of file
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/audit/SxfChangeRateServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/audit/SxfChangeRateServiceImpl.java
new file mode 100644
index 0000000..9146f09
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/audit/SxfChangeRateServiceImpl.java
@@ -0,0 +1,106 @@
+package cn.pluss.platform.sxf.audit;
+
+import cn.pluss.platform.channel.BaseMchChannelRateService;
+import cn.pluss.platform.entity.MerchantBaseInfo;
+import cn.pluss.platform.entity.MerchantChannelStatus;
+import cn.pluss.platform.entity.MerchantRate;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.MerchantBaseInfoMapper;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.util.SxfConfg;
+import cn.pluss.platform.sxf.SxfService;
+import cn.pluss.platform.util.RSAUtils;
+import cn.pluss.platform.util.SignUtils;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.EqualsAndHashCode;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Slf4j
+@RequiredArgsConstructor
+@Service("sxfChangeRateService")
+@EqualsAndHashCode(callSuper = true)
+public class SxfChangeRateServiceImpl extends BaseMchChannelRateService {
+
+    private final SxfService sxfService;
+    private final MerchantBaseInfoMapper merchantBaseInfoMapper;
+    private final MerchantChannelStatusService merchantChannelStatusService;
+
+    @Override
+    public void process(String userId, Integer rate, MerchantRate merchantRate) {
+        List<MerchantBaseInfo> merchantBaseInfoList = merchantBaseInfoMapper.selectListByUserId(userId);
+        if (merchantBaseInfoList == null || merchantBaseInfoList.size() == 0) {
+            throw new MsgException("无法获取商户信息");
+        }
+
+        MerchantBaseInfo merchantBaseInfo = merchantBaseInfoList.get(0);
+        MerchantChannelStatus merchantChannelStatus = new MerchantChannelStatus().setChannel(1).setMerchantCode(merchantBaseInfo.getMerchantCode());
+        merchantChannelStatus = merchantChannelStatusService.getOne(new QueryWrapper<>(merchantChannelStatus));
+        if (merchantChannelStatus == null) {
+            throw new MsgException("商户还未进件");
+        }
+
+        JSONObject reqParam = new JSONObject();
+        reqParam.put("mno", merchantChannelStatus.getMerchantId());
+        JSONArray qrCodeList = new JSONArray();
+        // 微信
+        JSONObject rate1 = new JSONObject();
+        rate1.put("rate", String.valueOf((rate / 100d)));
+        rate1.put("rateType", "01");
+        qrCodeList.add(rate1);
+        // 支付宝
+        rate1 = new JSONObject();
+        rate1.put("rate", String.valueOf((rate / 100d)));
+        rate1.put("rateType", "02");
+        qrCodeList.add(rate1);
+        // 银联，小于1000, 银联费率最低是23
+        rate1 = new JSONObject();
+        rate1.put("rate", String.valueOf((Math.max(rate, 23) / 100d)));
+        rate1.put("rateType", "06");
+        qrCodeList.add(rate1);
+        // 银联，大于1000
+        rate1 = new JSONObject();
+        rate1.put("rate", "0.6");
+        rate1.put("rateType", "07");
+        qrCodeList.add(rate1);
+        reqParam.put("qrcodeList", qrCodeList);
+        //reqParam.put("mecAuthority", "01");
+        reqParam.put("startSettleAmt", "0.00");
+        reqParam.put("reserveSettleAmt", "0.00");
+        reqParam.put("settleType", "04");
+        String[] channelArr = new String[]{"01", "02", "03"};
+        reqParam.put("supportPayChannels", channelArr);
+
+        String[] tradeType = new String[] {"01", "02", "03", "04"};
+        reqParam.put("supportTradeTypes", tradeType);
+
+        JSONObject result = sxfService.requestApi(SxfConfg.SXF_UPDATE_MERCHANT_RATE, reqParam);
+
+        String signContent = SignUtils.getSignContent(result);
+        boolean sign;
+        try {
+            sign = RSAUtils.checkSign(SxfConfg.PUBLIC_KEY, signContent, result.getString("sign"));
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.info("修改费率结果验签失败");
+            throw new MsgException("修改费率失败");
+        }
+        if (!sign) {
+            throw new MsgException("修改费率失败");
+        }
+
+        if (!SxfConfg.SXF_SUCCESS_CODE.equals(result.getString("code"))) {
+            throw new MsgException(result.getString("msg"));
+        }
+
+        JSONObject respData = result.getJSONObject("respData");
+        if (!SxfConfg.SXF_SUCCESS_CODE.equals(respData.get("bizCode"))) {
+            throw new MsgException(respData.getString("bizMsg"));
+        }
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/audit/SxfMerchantAuditServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/audit/SxfMerchantAuditServiceImpl.java
new file mode 100644
index 0000000..832430e
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/audit/SxfMerchantAuditServiceImpl.java
@@ -0,0 +1,863 @@
+package cn.pluss.platform.sxf.audit;
+
+import cn.pluss.platform.SxfMccInfoService;
+import cn.pluss.platform.channel.BaseMerchantAuditService;
+import cn.pluss.platform.dto.AccountDTO;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.BankCodeSxfMapper;
+import cn.pluss.platform.mapper.MerchantChannelStatusMapper;
+import cn.pluss.platform.merchantChannelImg.MerchantChannelImgService;
+import cn.pluss.platform.merchantImage.MerchantImageService;
+import cn.pluss.platform.subMerchant.SubMerchantService;
+import cn.pluss.platform.sxf.SxfService;
+import cn.pluss.platform.task.SxfMerAuditHandler;
+import cn.pluss.platform.util.*;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.core.io.ByteArrayResource;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Service;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestTemplate;
+
+import javax.annotation.Resource;
+import java.util.*;
+
+/**
+ * @author DJH
+ */
+@Slf4j
+@Service("sxfMerchantAuditService")
+@RequiredArgsConstructor
+public class SxfMerchantAuditServiceImpl extends BaseMerchantAuditService {
+
+    @Autowired
+    private RestTemplate restTemplate;
+
+    @Resource
+    private BankCodeSxfMapper bankCodeSxfMapper;
+    @Resource
+    private MerchantChannelStatusMapper merchantChannelStatusMapper;
+    @Autowired
+    private MerchantChannelImgService merchantChannelImgService;
+    @Autowired
+    private SubMerchantService subMerchantService;
+
+    @Lazy @Autowired
+    private SxfService sxfService;
+
+    @Autowired
+    private SxfMccInfoService sxfMccInfoService;
+
+    @Lazy @Autowired
+    private SxfMerAuditHandler sxfMerAuditHandler;
+
+    @Lazy @Autowired
+    private MerchantImageService miService;
+
+    /**
+     * @param merchantImage 上传图片信息
+     *                      orgId  - 机构编号;
+     *                      reqId   - 请求id, uuid;
+     *                      pictureType - 照片类型;   具体类型参照随行付文档;
+     *                      file - 图片文件, 文件格式为mutilpartfile, 文件名为file
+     */
+    @Override
+    public void imageUpload(MerchantImage merchantImage) {
+        // MerchantChannelImg merchantChannelImg = new MerchantChannelImg()
+        //         .setSrcUrl(merchantImage.getPicUrl())
+        //         .setChannelType(1);
+        // merchantChannelImg = merchantChannelImgService.getOne(new QueryWrapper<>(merchantChannelImg));
+        // if (merchantChannelImg == null) {
+        //     merchantChannelImg = new MerchantChannelImg().setSrcUrl(merchantImage.getPicUrl());
+        // } else {
+        //     if (merchantImage.getPicUrl().equals(merchantChannelImg.getSrcUrl())) {
+        //         merchantImage.setPhotoUrl(merchantChannelImg.getChannelImgUrl());
+        //         return;
+        //     }
+        // }
+
+        MultiValueMap<String, Object> paramMap = new LinkedMultiValueMap<>();
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.MULTIPART_FORM_DATA);
+        byte[] bytes;
+
+        try {
+            bytes = FileUtil.url2Bytes(merchantImage.getPicUrl());
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new MsgException("图片读取失败");
+        }
+        ByteArrayResource contentsAsResource = new ByteArrayResource(bytes) {
+            @Override
+            public String getFilename() {
+                return UUID.randomUUID().toString().replace("-", "") + ".jpg";
+            }
+        };
+        paramMap.add("file", contentsAsResource);
+        paramMap.add("orgId", SxfConfg.ORG_ID);
+
+        paramMap.add("pictureType", imgTypeTransform(merchantImage.getPhotoType()));
+
+        HttpEntity<MultiValueMap<String, Object>> request = new HttpEntity<>(paramMap, headers);
+        JSONObject responseJson = restTemplate.postForObject(SxfConfg.SXF_MERCHANT_INCOME_PHOTO_UPLOAD, request, JSONObject.class);
+
+        MsgException.checkNull(responseJson, "请求失败");
+        log.info("upload response : {}", responseJson.toJSONString());
+
+        MsgException.checkUnequals(SxfConfg.SXF_SUCCESS_CODE, responseJson.get("code"), "请求失败");
+
+        JSONObject respData = responseJson.getJSONObject("respData");
+
+        MsgException.checkNull(respData, "上传图片失败");
+
+        MsgException.checkUnequals(SxfConfg.SXF_SUCCESS_CODE, respData.get("bizCode"), respData.getString("bizMsg"));
+
+        Date date = new Date();
+
+        // merchantChannelImg.setChannelImgUrl(respData.getString("PhotoUrl"))
+        //         .setSrcUrl(merchantImage.getPicUrl())
+        //         .setMerImgId(merchantImage.getId())
+        //         .setCreateTime(date)
+        //         .setUpdateTime(date)
+        //         .setChannelType(1);
+
+        // 这里将上传结果保存下来，方面外部后续接口调用
+        merchantImage.setPhotoUrl(respData.getString("PhotoUrl"));
+        // merchantChannelImgService.saveOrUpdate(merchantChannelImg);
+    }
+
+    @Override
+    public void imageUpload(String url, String picType) {
+        MerchantChannelImg merchantChannelImg = new MerchantChannelImg().setSrcUrl(url).setChannelType(1);
+        merchantChannelImg = merchantChannelImgService.getOne(new QueryWrapper<>(merchantChannelImg));
+        if (merchantChannelImg == null) {
+            merchantChannelImg = new MerchantChannelImg().setSrcUrl(url);
+        } else {
+            if (url.equals(merchantChannelImg.getSrcUrl())) {
+                return;
+            } else {
+                merchantChannelImg.setSrcUrl(url);
+            }
+        }
+
+        MultiValueMap<String, Object> paramMap = new LinkedMultiValueMap<>();
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.MULTIPART_FORM_DATA);
+        byte[] bytes;
+
+        try {
+            bytes = FileUtil.url2Bytes(url);
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new MsgException("图片读取失败");
+        }
+        ByteArrayResource contentsAsResource = new ByteArrayImg(bytes,
+                UUID.randomUUID().toString().replace("-", "") + ".jpg");
+        paramMap.add("file", contentsAsResource);
+        paramMap.add("orgId", SxfConfg.ORG_ID);
+        paramMap.add("pictureType", imgTypeTransform(picType));
+
+        HttpEntity<MultiValueMap<String, Object>> request = new HttpEntity<>(paramMap, headers);
+        JSONObject responseJson = restTemplate.postForObject(SxfConfg.SXF_MERCHANT_INCOME_PHOTO_UPLOAD, request, JSONObject.class);
+        if (responseJson == null) {
+            throw new MsgException("请求失败");
+        }
+
+        log.info("upload response : {}", responseJson.toJSONString());
+
+        if (!SxfConfg.SXF_SUCCESS_CODE.equals(responseJson.get("code"))) {
+            throw new MsgException("请求失败");
+        }
+
+        JSONObject respData = responseJson.getJSONObject("respData");
+
+        MsgException.checkNull(respData, "上传图片失败");
+
+        MsgException.checkUnequals(SxfConfg.SXF_SUCCESS_CODE, respData.get("bizCode"), respData.getString("bizMsg"));
+
+        Date date = new Date();
+
+        merchantChannelImg.setChannelImgUrl(respData.getString("PhotoUrl"))
+                .setCreateTime(date)
+                .setUpdateTime(date)
+                .setChannelType(1);
+        merchantChannelImgService.saveOrUpdate(merchantChannelImg);
+    }
+
+    @Override
+    public void merchantAudit(String userId, boolean isFailCheck) {
+        merchantAuditCheck(userId, isFailCheck);
+
+        MerchantBaseInfo merchantBaseInfo = merchantBaseInfoService.getMerchantBaseInfoByUserId(userId);
+        MerchantChannelStatus mcs = mcsService.getByMerchantCode(merchantBaseInfo.getMerchantCode(), 1);
+        JSONObject reqData = new JSONObject();
+
+        // 判断是第一次进件是入驻修改，还是第一次进件
+        String targetUrl;
+        MsgException.checkNull(mcs, "商户未提交审核");
+
+        String status = mcs.getStatus();
+        String thirdStatus = mcs.getThirdStatus();
+        String merchantId = mcs.getMerchantId();
+
+        if (status.equals(MerchantChannelStatus.AUDIT_STATUS_EXAMINING) && !thirdStatus.equals(MerchantChannelStatus.AUDIT_THIRD_STATUS_WAITING)) {
+            MsgException.throwException("进件审核中，请等待审核结果");
+        }
+
+        if (MerchantChannelStatus.isAudited(mcs)) {
+            MsgException.throwException("商户已进件成功，请勿重复进件");
+        }
+
+        if (StringUtils.isEmpty(merchantId)) {
+            // 初次进件
+            targetUrl = SxfConfg.SXF_MERCHANT_INCOME;
+        } else {
+            // 进件失败数据修改
+            targetUrl = SxfConfg.SXF_UPADTE_MERCHANT_RZ;
+            reqData.put("mno", merchantId);
+        }
+
+        // step 1、组合请求数据
+        reqData.putAll(getMerchantAuditInfo(userId, merchantBaseInfo, mcs));
+        reqData.put("callbackUrl", ParametersUtil.domain + "/api/auditCallback/sxf");
+
+        log.info("{}随行付进件参数{}", userId, JSON.toJSONString(reqData));
+        // step 2、调取通用请求
+        JSONObject resultMap = sxfService.requestApi(targetUrl, reqData);
+        // 请求成功, 验证签名
+
+        try {
+            checkSign(resultMap);
+        } catch (Exception e) {
+            MsgException.throwException(e.getMessage());
+        }
+
+        MsgException.checkUnequals(SxfConfg.SXF_SUCCESS_CODE, resultMap.get("code"), "进件失败，" + resultMap.get("msg"));
+
+        // 业务成功
+        JSONObject respData = resultMap.getJSONObject("respData");
+        MsgException.checkUnequals(SxfConfg.SXF_SUCCESS_CODE, respData.get("bizCode"), "进件失败，" + respData.get("bizMsg"));
+
+        Date date = new Date();
+
+        String applicationId = respData.getString("applicationId");
+        String mno = respData.getString("mno");
+
+        mcs.setChannel(1);
+        mcs.setUpdateTime(date);
+        mcs.setMerchantCode(merchantBaseInfo.getMerchantCode());
+        mcs.setStatus("1");
+        mcs.setThirdStatus("");
+        mcs.setCallbackStatus("0");
+        mcs.setRemark("随行付审核中");
+        mcs.setApplicationId(applicationId);
+        mcs.setMerchantId(mno);
+
+        MerchantAuditRecord merchantAuditRecord = new MerchantAuditRecord();
+        merchantAuditRecord.setStatus("1");
+        merchantAuditRecord.setMerchantCode(merchantBaseInfo.getMerchantCode());
+        merchantAuditRecord.setChannel(1);
+        merchantAuditRecord.setThirdStatus("");
+        merchantAuditRecord.setMerchantId(mno);
+        merchAuditRecService.save(merchantAuditRecord);
+
+        if (StringUtil.isNotEmpty(mcs.getId())) {
+            merchantChannelStatusMapper.updateById(mcs);
+        } else {
+            // 保存进件信息
+            merchantChannelStatusMapper.insert(mcs);
+        }
+    }
+
+    @Override
+    public void editMerchantAudit(String userId) {
+        MerchantBaseInfo merchantBaseInfo = merchantBaseInfoService.getMerchantBaseInfoByUserId(userId);
+        MerchantChannelStatus merchantChannelStatus = mcsService.getSxfMerchantStatusInfo(merchantBaseInfo.getMerchantCode());
+        // step 1、组合请求数据
+        JSONObject reqData = new JSONObject();
+        Account account = new Account().setUserId(userId).setChannelType(Account.CHANNEL_TYPE_D1);
+        account = accountService.getOne(new QueryWrapper<>(account));
+        IdCard accountIdCard = idCardService.getAccountIdCard(userId, Account.CHANNEL_TYPE_D1);
+        JSONObject bak = account.getBak();
+
+        reqData.put("mno", merchantChannelStatus.getMerchantId());
+        reqData.put("actTyp", "01");
+        reqData.put("stmManIdNo", accountIdCard.getCertNo());
+        reqData.put("actNo", bak.get("bankCardNo"));
+
+        String contactLine = (String) bak.get("contactLine");
+        MsgException.checkBlank(contactLine, "修改的银行卡信息缺少联行号");
+
+        BankCodeSxf bankCodeSxf = new BankCodeSxf();
+        bankCodeSxf.setCnapsCode(contactLine);
+        bankCodeSxf = bankCodeSxfMapper.selectOne(new QueryWrapper<>(bankCodeSxf));
+
+        MsgException.checkNull(bankCodeSxf, "修改的银行卡，无法获取对应的支行信息");
+        reqData.put("depoBank", bankCodeSxf.getBankCode());
+        reqData.put("depoProvCd", bankCodeSxf.getProvinceCode());
+        reqData.put("depoCityCd", bankCodeSxf.getCityCode());
+        reqData.put("lbnkNo", bankCodeSxf.getCnapsCode());
+        reqData.put("lbnkNm", bankCodeSxf.getCnapsName());
+        reqData.put("actNm", bak.get("bankHolder"));
+
+        MerchantImage merchantImage = new MerchantImage();
+        merchantImage.setPicUrl(bak.getString("imgUrl"));
+        merchantImage.setPhotoType(MerchantImage.ImageType.BANK_CARD_FRONT);
+        imageUpload(merchantImage);
+
+        reqData.put("bankCardPositivePic", merchantImage.getPhotoUrl());
+        reqData.put("updateCallBackUrl", ParametersUtil.domain + "/api/auditCallback/sxf/edit");
+        String targetUrl = SxfConfg.SXF_UPDATE_MERCHANT_INFO;
+        // step 2、调取通用请求
+        JSONObject resultMap = sxfService.requestApi(targetUrl, reqData);
+        // 请求成功, 验证签名
+        try {
+            checkSign(resultMap);
+        } catch (Exception e) {
+            throw new MsgException(e.getMessage());
+        }
+
+        MsgException.checkUnequals(SxfConfg.SXF_SUCCESS_CODE, resultMap.get("code"), "进件修改失败，" + resultMap.get("msg"));
+
+        // 业务成功
+        JSONObject respData = resultMap.getJSONObject("respData");
+        MsgException.checkUnequals(SxfConfg.SXF_SUCCESS_CODE, respData.get("bizCode"), "进件修改失败，" + respData.get("bizMsg"));
+
+        // 保存商户进件修改记录
+        MerchantAuditRecord updateRecord = new MerchantAuditRecord();
+        updateRecord.setMerchantId(merchantChannelStatus.getMerchantId());
+        updateRecord.setApplicationId(respData.getString("applicationId"));
+        updateRecord.setChannel(1);
+        updateRecord.setStatus("1");
+        updateRecord.setMerchantCode(merchantBaseInfo.getMerchantCode());
+        // 文档上没有返回状态码
+        merchAuditRecService.save(updateRecord);
+        // 修改商户状态
+        merchantChannelStatus.setStatus(MerchantChannelStatus.AUDIT_STATUS_DATA_EDIT);
+        merchantChannelStatus.setApplicationId(respData.getString("applicationId"));
+        mcsService.updateById(merchantChannelStatus);
+    }
+
+    @Override
+    public JSONObject merchantAuditResult(Map<String, Object> result) throws Exception {
+        MsgException.check(result.isEmpty(), "参数为空！");
+
+        Object merchantId = result.get("merchantId");
+        MsgException.checkNull(merchantId, "商户编号不能为空！");
+        JSONObject reqData = new JSONObject(1);
+        reqData.put("mno", merchantId);
+        log.info("=================>【随行付】商户详情信息获取接口，请求业务参数:{}<====================", reqData);
+        JSONObject resultMap = sxfService.requestApi(SxfConfg.SXF_QUERY_MERCHANT_DETAIL, reqData);
+        checkSign(resultMap);
+
+        MsgException.checkUnequals(SxfConfg.SXF_SUCCESS_CODE, resultMap.get("code"), resultMap.getString("msg"));
+
+        // 业务成功
+        JSONObject respData = resultMap.getJSONObject("respData");
+        MsgException.checkUnequals(SxfConfg.SXF_SUCCESS_CODE, respData.get("bizCode"), respData.getString("bizMsg"));
+
+        JSONArray repoInfo = respData.getJSONArray("repoInfo");
+        if (repoInfo != null && !repoInfo.isEmpty()) {
+            for (Object o : repoInfo) {
+                Map<String, String> item = (Map<String, String>) o;
+                if ("WX".equalsIgnoreCase(item.get("childNoType"))) {
+                    QueryWrapper<SubMerchant> subMerchantQueryWrapper = new QueryWrapper<SubMerchant>()
+                            .eq("merchantId", merchantId).eq("subMchType", "WX");
+                    SubMerchant wxInfo = subMerchantService.getOne(subMerchantQueryWrapper);
+                    String wxStatus = item.get("repoStatus");
+                    String wxCildNo = null;
+                    String wxChannelId = null;
+                    String wxErrorMsg = null;
+
+                    // 接入成功
+                    if ("01".equals(item.get("repoStatus"))) {
+                        wxCildNo = item.get("childNo");
+                        wxChannelId = item.get("channelId");
+                    } else {
+                        wxErrorMsg = item.get("errMessage");
+                    }
+                    resultMap.put("wxCildNo", wxCildNo);
+                    resultMap.put("wxChannelId", wxChannelId);
+                    if (wxInfo == null) {
+                        SubMerchant wxSubMerchant = new SubMerchant();
+                        wxSubMerchant.setMerchantId(merchantId.toString());
+                        wxSubMerchant.setChannelId(wxChannelId);
+                        wxSubMerchant.setSubMchId(wxCildNo);
+                        wxSubMerchant.setSubMchType("WX");
+                        wxSubMerchant.setRemark(wxErrorMsg);
+                        wxSubMerchant.setChannelTypeId("1");
+                        wxSubMerchant.setStatus(wxStatus);
+                        wxSubMerchant.setCreateTime(new Date());
+                        subMerchantService.save(wxSubMerchant);
+                    } else {
+                        wxInfo.setStatus(wxStatus);
+                        wxInfo.setUpdateTime(new Date());
+                        wxInfo.setRemark(wxErrorMsg);
+                        wxInfo.setSubMchId(wxCildNo);
+                        wxInfo.setChannelId(wxChannelId);
+                        subMerchantService.updateById(wxInfo);
+                    }
+                } else if ("ZFB".equalsIgnoreCase(item.get("childNoType"))) {
+                    QueryWrapper<SubMerchant> subMerchantQueryWrapper = new QueryWrapper<SubMerchant>()
+                            .eq("merchantId", merchantId).eq("subMchType", "ZFB");
+                    SubMerchant subZfbInfo = subMerchantService.getOne(subMerchantQueryWrapper);
+                    String zfbStatus = item.get("repoStatus");
+                    String zfbChildNo = null;
+                    String zfbChannelId = null;
+                    String zfbErrorMsg = null;
+                    if ("01".equals(item.get("repoStatus"))) {
+                        zfbChildNo = item.get("childNo");
+                        zfbChannelId = item.get("channelId");
+                    } else {
+                        zfbErrorMsg = item.get("errMessage");
+                    }
+                    resultMap.put("zfbChildNo", zfbChildNo);
+                    resultMap.put("zfbChannelId", zfbChannelId);
+                    if (subZfbInfo == null) {
+                        SubMerchant subMerchant = new SubMerchant();
+                        subMerchant.setMerchantId(merchantId.toString());
+                        subMerchant.setChannelId(zfbChannelId);
+                        subMerchant.setSubMchId(zfbChildNo);
+                        subMerchant.setSubMchType("ZFB");
+                        subMerchant.setRemark(zfbErrorMsg);
+                        subMerchant.setChannelTypeId("1");
+                        subMerchant.setStatus(zfbStatus);
+                        subMerchant.setCreateTime(new Date());
+                        subMerchantService.save(subMerchant);
+                    } else {
+                        subZfbInfo.setStatus(zfbStatus);
+                        subZfbInfo.setUpdateTime(new Date());
+                        subZfbInfo.setRemark(zfbErrorMsg);
+                        subZfbInfo.setSubMchId(zfbChildNo);
+                        subZfbInfo.setChannelId(zfbChannelId);
+                        subMerchantService.updateById(subZfbInfo);
+                    }
+                }
+            }
+        }
+        return resultMap;
+    }
+
+    @Override
+    public JSONObject merchantAuditCallback(JSONObject auditResult) throws Exception {
+        log.info("随行付商户入驻回调, 商户编号为{}， ：\n {}", auditResult.getString("mno"), auditResult.toJSONString());
+        checkSign(auditResult);
+        try {
+            // 异步处理
+            sxfMerAuditHandler.auditHandler(auditResult);
+        } catch (Exception e) {
+            log.error("入驻回调异步任务启动失败!");
+            e.printStackTrace();
+        }
+
+        return SxfConfg.ok();
+    }
+
+    @Override
+    public JSONObject editMerchantCallback(JSONObject auditResult) throws Exception {
+        checkSign(auditResult);
+        try {
+            // 异步处理
+            sxfMerAuditHandler.auditEditHandler(auditResult);
+        } catch (Exception e) {
+            log.error("入驻回调异步任务启动失败!");
+            e.printStackTrace();
+        }
+
+        return SxfConfg.ok();
+    }
+
+    @Override
+    public String imgTypeTransform(String imageType) {
+        switch (imageType) {
+            case MerchantImage.ImageType.IDCARD_FRONT:
+                return ImageType.IDCARD_FRONT;
+            case MerchantImage.ImageType.IDCARD_BACK:
+                return ImageType.IDCARD_BACK;
+            case MerchantImage.ImageType.SETTLE_IDCARD_FRONT:
+                return ImageType.SETTLE_IDCARD_FRONT;
+            case MerchantImage.ImageType.SETTLE_IDCARD_BACK:
+                return ImageType.SETTLE_IDCARD_BACK;
+            case MerchantImage.ImageType.BANK_CARD_BACK:
+                return ImageType.BANK_CARD_BACK;
+            case MerchantImage.ImageType.BANK_CARD_FRONT:
+                return ImageType.BANK_CARD_FRONT;
+            case MerchantImage.ImageType.BUSINESS_LICENSE:
+                return ImageType.BUSINESS_LICENSE;
+            case MerchantImage.ImageType.ACCOUNT_PERMITS:
+                return ImageType.ACCOUNT_PERMITS;
+            case MerchantImage.ImageType.NON_LEG_SETTLE_AUTH:
+                return ImageType.NON_LEG_SETTLE_AUTH;
+            case MerchantImage.ImageType.SHOP_FRONT_DOOR:
+                return ImageType.SHOP_FRONT_DOOR;
+            case MerchantImage.ImageType.CASH_DESK_PHOTO:
+                return ImageType.CASH_DESK_PHOTO;
+            case MerchantImage.ImageType.STORE_INTERIOR_PHOTO:
+                return ImageType.STORE_INTERIOR_PHOTO;
+            default:
+                return ImageType.OTHER;
+        }
+    }
+
+    @Override
+    public void checkSign(JSONObject receiveData) throws Exception {
+        if (receiveData == null || receiveData.getString("sign") == null) {
+            throw new MsgException("未知数据");
+        }
+
+        String srcData = SignUtils.getSignContent(receiveData);
+        boolean sign = RSAUtils.checkSign(SxfConfg.PUBLIC_KEY, srcData, receiveData.getString("sign"));
+        if (!sign) {
+            throw new IllegalArgumentException("商户入驻回调接口验签不通过");
+        }
+    }
+
+    /**
+     * 组合银行卡信息， 必须的在combineMerchantBaseInfo之后调用
+     *
+     * @param paramMap 组合的数据
+     * @param userId   用户id
+     */
+    private void combineBankInfo(Map<String, Object> paramMap, String userId) {
+        // 结算信息
+        AccountDTO accountDTO = accountService.getRealAccount(userId);
+        MsgException.checkNull(accountDTO, "请完善结算信息");
+
+        // 实名信息
+        IdCard certIdCard = idCardService.getCertIdCard(userId);
+
+        IdCard inChargeIdCard;
+
+        if (Account.SETTLE_TYPE_MICRO_STORE.equals(accountDTO.getSettleType())) {
+            // 小微商户 - 结算信息中的身份信息即商户负责人信息
+            inChargeIdCard = accountDTO.getIdcard();
+        } else {
+            // 其他的负责人信息是法人信息
+            inChargeIdCard = idCardService.getLegalIdCard(userId);
+        }
+
+        BankCard bankCard = accountDTO.getBankCard();
+        paramMap.put("identityName", inChargeIdCard.getCertName());
+        paramMap.put("identityTyp", inChargeIdCard.getCertType());
+        paramMap.put("identityNo", inChargeIdCard.getCertNo());
+
+
+        if ("01".equals(paramMap.get("haveLicenseNo"))) {
+            // 小微商户
+            paramMap.put("stmManIdNo", certIdCard.getCertNo());
+            paramMap.put("actTyp", "01");
+        } else {
+            // 非小微商户，可以
+            paramMap.put("actTyp", BankCard.ACCOUNT_TYPE_CORPORATE.equals(bankCard.getAccountType()) ? "00" : "01");
+
+            if (accountDTO.getSettleType() == null) {
+                throw new MsgException("缺少结算信息(若无填写结算信息界面，请更新app)");
+            }
+
+            IdCard idCard = accountDTO.getIdcard();
+            if (idCard == null) {
+                idCard = certIdCard;
+            }
+            // 对私需要传递
+            if ("01".equals(paramMap.get("actTyp"))) {
+                paramMap.put("stmManIdNo", idCard.getCertNo());
+            }
+        }
+
+        paramMap.put("actNm", bankCard.getBankHolder());
+        paramMap.put("actNo", bankCard.getBankCardNo());
+        paramMap.put("accountLicStt", inChargeIdCard.getCertStartTime());
+        paramMap.put("accountLicEnt", inChargeIdCard.getCertEndTime());
+
+        QueryWrapper<BankCodeSxf> queryWrapper = new QueryWrapper<BankCodeSxf>().eq("cnaps_code", bankCard.getContactLine());
+        BankCodeSxf bankCodeSxf = bankCodeSxfMapper.selectOne(queryWrapper);
+        // 银行code
+        paramMap.put("depoBank", bankCodeSxf.getBankCode());
+        // 省份code
+        paramMap.put("depoProvCd", bankCodeSxf.getProvinceCode());
+        // 城市code
+        paramMap.put("depoCityCd", bankCodeSxf.getCityCode());
+        // 联行号
+        paramMap.put("lbnkNo", bankCodeSxf.getCnapsCode());
+    }
+
+    private void combineMerchantBaseInfo(Map<String, Object> map, MerchantBaseInfo merchantBaseInfo) {
+        String mcc = merchantBaseInfo.getMcc();
+        SxfMccInfo sxfMccInfo = sxfMccInfoService.getByMccCode(mcc);
+        map.put("mecDisNm", merchantBaseInfo.getAlias());
+        map.put("mblNo", merchantBaseInfo.getContactMobile());
+
+        if (sxfMccInfo == null) {
+            map.put("operationalType", "01");
+        } else {
+            // 判断经营类型
+            switch (sxfMccInfo.getFMccType()) {
+                case "线上":
+                    map.put("operationalType", "02");
+                    break;
+                case "非盈利":
+                    map.put("operationalType", "03");
+                    break;
+                case "缴费类":
+                    map.put("operationalType", "04");
+                    break;
+                case "保险":
+                    map.put("operationalType", "05");
+                    break;
+                case "私立院校":
+                    map.put("operationalType", "06");
+                    break;
+                default:
+                    map.put("operationalType", "01");
+                    break;
+            }
+        }
+
+        // 商户类型
+        switch (merchantBaseInfo.getMerchantType()) {
+            case "1":
+                map.put("haveLicenseNo", "01");
+                map.put("actTyp", "01");
+                break;
+            case "2":
+                map.put("haveLicenseNo", "02");
+                map.put("registCode", merchantBaseInfo.getBussAuthNum());
+                map.put("cprRegNmCn", merchantBaseInfo.getBussAuthName());
+                break;
+            case "3":
+                map.put("haveLicenseNo", "03");
+                map.put("registCode", merchantBaseInfo.getBussAuthNum());
+                map.put("cprRegNmCn", merchantBaseInfo.getBussAuthName());
+                map.put("licenseMatch", "00");
+                break;
+            default:
+                throw new MsgException("未知商户类型");
+        }
+        map.put("mecTypeFlag", "00");
+
+        map.put("cprRegAddr", merchantBaseInfo.getAddress());
+
+        String province = merchantBaseInfo.getProvince();
+        String city = merchantBaseInfo.getCity();
+        String area = merchantBaseInfo.getDistrict();
+        RegionCodeSxf regionCodeSxf = regionReflectService.getSxfRegionCode(province, city, area);
+
+        map.put("regProvCd", regionCodeSxf.getProvinceCode());
+        map.put("regCityCd", regionCodeSxf.getCityCode());
+        map.put("regDistCd", regionCodeSxf.getAreaCode());
+
+        map.put("mccCd", mcc);
+        map.put("csTelNo", merchantBaseInfo.getContactMobile());
+    }
+
+    private void combineCommon(Map<String, Object> map) {
+        Map<String, Object> rateMap = new HashMap<>();
+        List<Map<String, Object>> qrCodeList = new LinkedList<>();
+        // 微信
+        rateMap.put("rate", "0.38");
+        rateMap.put("rateType", "01");
+        qrCodeList.add(rateMap);
+        // 支付宝
+        rateMap = new HashMap<>();
+        rateMap.put("rate", "0.38");
+        rateMap.put("rateType", "02");
+        qrCodeList.add(rateMap);
+        // 银联小于1000
+        rateMap = new HashMap<>();
+        rateMap.put("rate", "0.40");
+        rateMap.put("rateType", "06");
+        qrCodeList.add(rateMap);
+        // 银联大于1000
+        rateMap = new HashMap<>();
+        rateMap.put("rate", "0.6");
+        rateMap.put("rateType", "07");
+        qrCodeList.add(rateMap);
+
+        map.put("qrcodeList", qrCodeList);
+        // 03 T1  04 D1
+        map.put("settleType", "04");
+    }
+
+    private void combineImage(Map<String, Object> paramMap, List<MerchantImage> merchantImageList, String actTyp, String merchantType) {
+        for (MerchantImage merchantImage : merchantImageList) {
+            combineImage(paramMap, merchantImage, actTyp, merchantType);
+        }
+    }
+
+    private void combineImage(Map<String, Object> paramMap, MerchantImage merchantImage, String actTyp, String merchantType) {
+        // 非小微商户，必须传营业执照
+        switch (merchantImage.getPhotoType()) {
+            case MerchantImage.ImageType.IDCARD_FRONT:
+                // 法人身份证正面
+                paramMap.put("legalPersonidPositivePic", merchantImage.getPhotoUrl());
+                break;
+            case MerchantImage.ImageType.IDCARD_BACK:
+                paramMap.put("legalPersonidOppositePic", merchantImage.getPhotoUrl());
+                break;
+            case MerchantImage.ImageType.SETTLE_IDCARD_FRONT:
+                if (BankCard.ACCOUNT_TYPE_PRIVATE.equals(paramMap.get("actTyp"))) {
+                    // 对私需要传结算人身份证
+                    paramMap.put("settlePersonIdcardPositive", merchantImage.getPhotoUrl());
+                }
+                break;
+            case MerchantImage.ImageType.SETTLE_IDCARD_BACK:
+                if (BankCard.ACCOUNT_TYPE_PRIVATE.equals(paramMap.get("actTyp"))) {
+                    // 对私需要传结算人身份证
+                    paramMap.put("settlePersonIdcardOpposite", merchantImage.getPhotoUrl());
+                }
+                break;
+            case MerchantImage.ImageType.SHOP_FRONT_DOOR:
+                paramMap.put("storePic", merchantImage.getPhotoUrl());
+                break;
+            case MerchantImage.ImageType.STORE_INTERIOR_PHOTO:
+                paramMap.put("insideScenePic", merchantImage.getPhotoUrl());
+                break;
+            case MerchantImage.ImageType.ACCOUNT_PERMITS:
+                if (!"01".equals(actTyp)) {
+                    // 对公结算需传开户许可证
+                    paramMap.put("openingAccountLicensePic", merchantImage.getPhotoUrl());
+                }
+                break;
+            case MerchantImage.ImageType.BANK_CARD_FRONT:
+                if ("01".equals(actTyp)) {
+                    // 对私需要传银行卡
+                    paramMap.put("bankCardPositivePic", merchantImage.getPhotoUrl());
+                }
+                break;
+            case MerchantImage.ImageType.BUSINESS_LICENSE:
+                if (!"1".equals(merchantType)) {
+                    paramMap.put("licensePic", merchantImage.getPhotoUrl());
+                }
+                break;
+            case MerchantImage.ImageType.NON_LEG_SETTLE_AUTH:
+                // 对私 结算人与法人的身份证证件不一致时需要提交
+                if (BankCard.ACCOUNT_TYPE_PRIVATE.equals(paramMap.get("actTyp")) && !paramMap.get("identityNo").equals(paramMap.get("stmManIdNo"))) {
+                    paramMap.put("letterOfAuthPic", merchantImage.getPhotoUrl());
+                }
+                break;
+            default:
+                break;
+        }
+    }
+
+
+    public static class ImageType {
+
+        private ImageType() {}
+
+        /** 身份证正面 */
+        public static final String IDCARD_FRONT = "02";
+        /** 身份证反面 */
+        public static final String IDCARD_BACK = "03";
+        /** 营业执照 */
+        public static final String BUSINESS_LICENSE = "13";
+        /** 开户许可证 */
+        public static final String ACCOUNT_PERMITS = "04";
+        /** 门头照 */
+        public static final String SHOP_FRONT_DOOR = "10";
+        /** 非法人结算授权书 */
+        public static final String NON_LEG_SETTLE_AUTH = "26";
+        /** 其它 */
+        public static final String OTHER = "19";
+        /** 收银台照片 */
+        public static final String CASH_DESK_PHOTO = "12";
+        /** 门店内景照片 */
+        public static final String STORE_INTERIOR_PHOTO = "11";
+        /** 各大餐饮平台入驻 */
+        public static final String MERCHANT_PLATFORM = "10";
+        /** 手持身份证 */
+        public static final String HAND_IDCARD_PHOTO = "15";
+        /** 租赁协议一（封面） */
+        public static final String TENANCY_AGREEMENTS1 = "16";
+        /** 租赁合同二（面积，有效期页面） */
+        public static final String TENANCY_AGREEMENTS2 = "17";
+        /** 租赁合同三（签章页） */
+        public static final String TENANCY_AGREEMENTS3 = "18";
+        /** 银行卡正面 */
+        public static final String BANK_CARD_FRONT = "05";
+        /** 银行卡反面 */
+        public static final String BANK_CARD_BACK = "06";
+        /** 结算身份证正面 */
+        public static final String SETTLE_IDCARD_FRONT = "08";
+        /** 结算身份证反面 */
+        public static final String SETTLE_IDCARD_BACK = "07";
+    }
+
+    private JSONObject getMerchantAuditInfo(String userId, MerchantBaseInfo merchantBaseInfo, MerchantChannelStatus merchantChannelStatus) {
+        // step 1、组合请求数据
+        JSONObject reqData = new JSONObject();
+        MsgException.checkBlank(merchantBaseInfo.getMerchantType(), "请先填写商户资料");
+
+        AccountDTO accountDTO = accountService.getAccount(userId);
+
+        List<MerchantImage> merchantChannelImgList = miService.getListOfMerch(userId);
+
+        for (MerchantImage merchantImage : merchantChannelImgList) {
+            // 兼容老通道用户，切换通道后，没有相关的图片链接
+            if (StringUtils.isEmpty(merchantImage.getPhotoUrl())) {
+                imageUpload(merchantImage);
+            }
+        }
+
+        combineMerchantBaseInfo(reqData, merchantBaseInfo);
+        combineCommon(reqData);
+        combineBankInfo(reqData, userId);
+        // 添加添加账户类型判断，此处可能是图片驳回，故需要自己添加账号类型判断
+        String actTyp = BankCard.ACCOUNT_TYPE_CORPORATE.equals(accountDTO.getBankCard().getAccountType()) ? "00" : "01";
+
+        combineImage(reqData, merchantChannelImgList, actTyp, merchantBaseInfo.getMerchantType());
+
+        //  入驻图片修改，去掉不能传的参数
+        if (merchantChannelStatus != null && MerchantChannelStatus.AUDIT_STATUS_REVIEW_REJECT.equals(merchantChannelStatus.getStatus())) {
+            reqData.remove("operationalType");
+            reqData.remove("haveLicenseNo");
+            reqData.remove("mecTypeFlag");
+            reqData.remove("parentMno");
+            reqData.remove("independentModel");
+            reqData.remove("qrcodeList");
+            reqData.remove("bankCardRates");
+            reqData.remove("settleType");
+            reqData.remove("clearTimeSts");
+            reqData.remove("clearTime");
+            reqData.remove("supportPayChannels");
+            reqData.remove("supportTradeTypes");
+            reqData.remove("activityType");
+            reqData.remove("specifyWechatChannel");
+            reqData.remove("specifyALiPayChannel");
+            reqData.remove("onlineType");
+            reqData.remove("onlineName");
+            reqData.remove("onlineTypeInfo");
+            reqData.remove("cprRegNmCn");
+            reqData.remove("registCode");
+            reqData.remove("licenseMatch");
+            reqData.remove("orgCode");
+            reqData.remove("taxRegNo");
+            reqData.remove("businessLicStt");
+            reqData.remove("businessLicEnt");
+            reqData.remove("identityName");
+            reqData.remove("identityTyp");
+            reqData.remove("identityNo");
+            reqData.remove("legalPersonLicStt");
+            reqData.remove("legalPersonLicEnt");
+            reqData.remove("actNm");
+            reqData.remove("actTyp");
+            reqData.remove("stmManIdNo");
+            reqData.remove("accountLicStt");
+            reqData.remove("accountLicEnt");
+        }
+
+        return reqData;
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/impl/RegionCodeSxfServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/impl/RegionCodeSxfServiceImpl.java
new file mode 100644
index 0000000..f4915e6
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/impl/RegionCodeSxfServiceImpl.java
@@ -0,0 +1,20 @@
+package cn.pluss.platform.sxf.impl;
+
+import cn.pluss.platform.entity.RegionCodeSxf;
+import cn.pluss.platform.mapper.RegionCodeSxfMapper;
+import cn.pluss.platform.sxf.RegionCodeSxfService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 银盛地区表 服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-07-24
+ */
+@Service
+public class RegionCodeSxfServiceImpl extends ServiceImpl<RegionCodeSxfMapper, RegionCodeSxf> implements RegionCodeSxfService {
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/impl/SxfMchMachineCallbackServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/impl/SxfMchMachineCallbackServiceImpl.java
new file mode 100644
index 0000000..a9cbdab
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/impl/SxfMchMachineCallbackServiceImpl.java
@@ -0,0 +1,816 @@
+package cn.pluss.platform.sxf.impl;
+
+import cn.pluss.platform.channel.MchMachineCallbackService;
+import cn.pluss.platform.constants.Constant;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchant.MerchantCashPlaceService;
+import cn.pluss.platform.merchant.MerchantRateNewService;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.merchantOrder.MerchantOrderService;
+import cn.pluss.platform.merchantProfit.MerchantProfitService;
+import cn.pluss.platform.merchantStore.MerchantStoreService;
+import cn.pluss.platform.realFans.RealFansService;
+import cn.pluss.platform.refundOrder.MerchantRefundOrderService;
+import cn.pluss.platform.suixingfu.SxfConstants;
+import cn.pluss.platform.sxf.SxfService;
+import cn.pluss.platform.transfer.MerchantTransferService;
+import cn.pluss.platform.user.impl.GeneralPushUtil;
+import cn.pluss.platform.userAssess.UserAssessService;
+import cn.pluss.platform.util.StringUtil;
+import cn.pluss.platform.util.SxfConfg;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.time.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.math.BigDecimal;
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+@RequiredArgsConstructor
+@Slf4j
+@Service("sxfMchMachineCallbackService")
+public class SxfMchMachineCallbackServiceImpl implements MchMachineCallbackService {
+
+    private final SxfService sxfService;
+
+    private final MerchantChannelStatusService merchantChannelStatusService;
+
+    private final MerchantBaseInfoService mbiService;
+
+    private final MerchantStoreService merchantStoreService;
+
+    private final MerchantProfitService merchantProfitService;
+
+    private final MerchantOrderService merchantOrderService;
+
+    private final MerchantRefundOrderService merchantRefundOrderService;
+
+    private final RealFansService realFansService;
+
+    private final MerchantTransferService merchantTransferService;
+
+    private final MerchantRateNewService merchantRateNewService;
+
+    private final MerchantCashPlaceService merchantCashPlaceService;
+
+    @Autowired
+    private GeneralPushUtil generalPushUtil;
+
+    @Autowired
+    private UserAssessService userAssessService;
+
+
+
+    @Override
+    public String getOperationType(JSONObject param) {
+        boolean sign;
+        try {
+            sign = sxfService.checkSign(param);
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new MsgException("随行付机具回调数据验签不通过");
+        }
+
+        if (!sign) {
+            throw new MsgException("随行付机具回调数据验签不通过");
+        }
+        /** 扫码王回调 **/
+        if(StringUtil.isNotEmpty(param.get("tradeType"))){
+            if ("01".equals(param.get("tradeType"))) {
+                return OPERATION_PAY;
+            }
+            if ("02".equals(param.get("tradeType"))) {
+                return OPERATION_REFUND;
+            }
+        }else{
+            /** 智能pos回调 **/
+            return SxfConstants.SXF_POS_OPERATION;
+        }
+        return null;
+    }
+
+    /**
+     * @param param
+     * {
+     * 	"pointAmount": "0.00",                      // 代金券金额
+     * 	"payTime": "20200904114847",        // 支付时间
+     * 	"openid": "2088912149418434",       // 微信openid
+     * 	"sign": "ROZ2UFvc36Vzqvtofv6Wz0kw5EG73jsEDwI+T5llhjJdTCkQxCTNJlvvIIqAFNoK1KG+YHFk/ouASXYMtSb5KaTRD0JbhscTDvS9fjds25gR/Aop7Ri73YSJ3nHVXbmPIxw4/uaLPgoOde3xT4vGUHOmH3W0izuudyFHnP4GNwiwQfdj0iB9CZI7SELSzIaT6c6ONz8BOkxltV9vZ+ztjcg0Yp6NY9MvdRXGS52oOYxyB5Ju+s3HYTP8SlBnyXGETVXYgycHNkS3vSSO5FmxzS9yWX4cpq5u7E2K4EnUW6n7f4oxSKv8x2D3jQj3vDzVfRsm2ARXFRpuYIFROz5Row==",
+     * 	"payWay": "01",                                     // 	交易方式
+     * 	"amt": "0.10",                                          //  交易金额
+     * 	"terminalId": "000002P61510411183",     //  终端编号
+     * 	"sxfUuid": "836200904394114910",            // 落单号，供退款和退款查询使用
+     * 	"deviceNo": "10017314",                               // 设备号
+     * 	"buyerId": "2088912149418434",                 //  	买家用户号
+     * 	"uuid": "28a6170a70a1433a86b84f8873107371",     // 	流水号
+     * 	"orgId": "56964586",                                                        //  机构号
+     * 	"transactionId": "2020090422001418431453254768",    // 交易流水
+     * 	"scene": "1",                                                                               // 支付场景
+     * 	"mno": "399200827954886",                                                 // 随行付商户id
+     * 	"timeStamp": "20200904114848",                                        // 响应时间
+     * 	"ordNo": "15104111832020090411483384476170",        // 商户订单号
+     * 	"payType": "ALIPAY",                                                                // 交易渠道，支付宝&微信&银联
+     * 	"buyerAccount": "173******68",                                             // 顾客帐号，加密
+     * 	"subMechId": "2088900529374371",                                    // 子商户号
+     * 	"drType": "1",                                                                              //	借贷标识
+     * 	"tradeType": "01",                                                                      // 交易类型
+     * 	"channelId": "2088531229750653"                                        // 渠道商户号
+     * }
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public synchronized void payCallback(JSONObject param) {
+        String mno = param.getString("mno");
+        String buyerId = param.getString("buyerId");
+        QueryWrapper<MerchantChannelStatus> queryWrapper = new QueryWrapper<MerchantChannelStatus>().eq("merchantId", mno);
+        MerchantChannelStatus merchantChannelStatus = merchantChannelStatusService.getOne(queryWrapper);
+        if (merchantChannelStatus == null) {
+            throw new RuntimeException("未知商户");
+        }
+        MerchantBaseInfo merchantBaseInfo = mbiService.getMerchantBaseInfoByMerchantCode(merchantChannelStatus.getMerchantCode());
+        MerchantStore merchantStore = new MerchantStore().setMerchantCode(merchantChannelStatus.getMerchantCode());
+        merchantStore = merchantStoreService.queryMerchantStore(merchantStore);
+
+        MerchantOrder existData = new MerchantOrder();
+        existData.setOrderNumber(param.getString("ordNo"));
+        existData = merchantOrderService.queryMerchantOrder(existData);
+        if (existData != null) {
+            return;
+        }
+
+        MerchantOrder merchantOrder = new MerchantOrder();
+        merchantOrder.setStaffCode(merchantStore.getStoreId());
+        merchantOrder.setStaffName(merchantBaseInfo.getAlias());
+        merchantOrder.setStatus("1");
+
+        String payType = param.getString("payType");
+        if (payType != null) {
+            merchantOrder.setThirdTransNo(param.getString("transactionId"));
+            switch (payType) {
+                case "WECHAT":
+                    merchantOrder.setPayTypeCode("sxfPay1");
+                    merchantOrder.setPayTypeName("随行微信支付");
+                    break;
+                case "ALIPAY":
+                    merchantOrder.setPayTypeCode("sxfPay0");
+                    merchantOrder.setPayTypeName("随行支付宝支付");
+                    break;
+                case "UNIONPAY":
+                    merchantOrder.setPayTypeCode("sxfPay2");
+                    merchantOrder.setPayTypeName("随行云闪付支付");
+                    break;
+                default:
+                    break;
+            }
+        }
+        merchantOrder.setOrderNumber(param.getString("ordNo"));
+        merchantOrder.setOrderType("6");
+        merchantOrder.setMerchantCode(merchantChannelStatus.getMerchantCode());
+        merchantOrder.setMerchantName(merchantBaseInfo.getAlias());
+        merchantOrder.setStoreId(merchantStore.getStoreId());
+        merchantOrder.setStoreName(merchantBaseInfo.getAlias());
+        merchantOrder.setConsumeFee(Double.valueOf(param.getString("amt")));
+        merchantOrder.setTransNo(param.getString("uuid"));
+        //借贷标识
+        merchantOrder.setDrType(param.getString("drType"));
+
+        //插入通道费率 已经通道成本手续费
+        merchantOrder.setChannelRate(SxfConstants.CHANNEL_WECHAT_ALIPAY_BANK_COST_RATE.multiply(new BigDecimal(10000)));
+        BigDecimal channelFee = new BigDecimal(merchantOrder.getConsumeFee().toString()).multiply(SxfConstants.CHANNEL_WECHAT_ALIPAY_BANK_COST_RATE).setScale(2,BigDecimal.ROUND_HALF_UP);
+        merchantOrder.setChannelFee(channelFee);
+
+        try {
+            Date date = DateUtils.parseDate(param.getString("payTime"), "yyyyMMddHHmmss");
+            merchantOrder.setCreateDt(date);
+            merchantOrder.setTransDt(date);
+            merchantOrder.setUpdateTime(date);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+
+        BigDecimal rate = merchantRateNewService.getMchRate(merchantBaseInfo.getMerchantCode(),merchantOrder.getPayTypeCode(), merchantOrder.getConsumeFee());
+        merchantOrder.calcRateAndFee(rate);
+        merchantOrder.setAisleSwitch("2");
+        merchantOrder.setMercUserId(buyerId);
+
+        //获取设备号
+        String deviceNo = param.getString("terminalId");
+        merchantOrder.setSnNo(deviceNo);
+        merchantCashPlaceService.setOrderPlaceInfo(merchantOrder,deviceNo);
+        //设置活动积分
+        merchantOrderService.setActivityMarketAmt(merchantOrder,merchantStore);
+
+        boolean flag = merchantOrderService.save(merchantOrder);
+        //扫码王收款成功 app推送
+        if(flag){
+            List<String> alias = new ArrayList<>();
+            alias.add(merchantBaseInfo.getUserId());
+            String msgCountent = "收银呗到账" + merchantOrder.getConsumeFee().toString() + "元";
+            sendAppNotify(alias,"收银呗到账通知",msgCountent,"3");
+
+            try {
+                MerchantBaseInfo.setFirstAndLastTradeTime(merchantBaseInfo, merchantOrder.getUpdateTime());
+//                userAssessService.checkUserValid(merchantBaseInfo);
+                mbiService.updateById(merchantBaseInfo);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+
+        try {
+            //创建推广分润
+            merchantProfitService.createOrderProfitV2(merchantOrder,"1");
+            MerchantOrder update = new MerchantOrder();
+            if(flag){
+                update.setId(merchantOrder.getId());
+                update.setProfitShareMoney(merchantOrder.getProfitShareMoney());
+                merchantOrderService.updateById(update);
+            }
+        }catch (RuntimeException e){
+            log.info("扫码王收款,创建分润失败,异常信息:{}",e.getMessage());
+        }
+    }
+
+    /**
+     * 扫码王收款成功 app推送
+     * @param alias
+     * @param title
+     * @param msgContent
+     * @param extrasParams
+     */
+    private void sendAppNotify(List<String> alias,String title,String msgContent,String extrasParams) {
+        generalPushUtil.sendAllPlatByAlias(alias, title, msgContent, extrasParams);
+    }
+
+    /**
+     * @param param
+     * {
+     * 	"origOrderNo": "15104111832020090411483384476170",
+     * 	"pointAmount": "",
+     * 	"payTime": "20200904155120",
+     * 	"sign": "afJkmTiOhh5NcznVUB6PWNpjXDhn5BXDnpI3Wzdy9ukbOTl2PictFugusTbACHob+j/n6poNyOqE+mpnIHujUa1gLDX9iiBKIM4uyx+trdgXCXPaAt0RCOkxfAD0hksDdPQ++nvTO8JuvFPIUv3JbSrR1wtp8m06eIzmOi06uDQHrlXRkD+HFbHYJ/2hL2FtUL3GydPJVEV+6ORRWBSr5BfymJv369K6sd6vQTgje2EkuhnzgPjlV+QpzW8y7JU6RyTwA6fYDXqS1Vb8ZJdy4yXLUEKMTzCZEwOkZwtU7DO2ZbxiJf01E3V+Unk4xSeYt7Ssa6dh41qSvrseacyd6g==",
+     * 	"amt": "0.10",
+     * 	"payWay": "05",
+     * 	"terminalId": "000002P61510411183",
+     * 	"deviceNo": "10017314",
+     * 	"uuid": "a04aee5c6e7b47929d0818a61e690aa5",
+     * 	"transactionId": "2020090422001418431453254768",
+     * 	"orgId": "56964586",
+     * 	"mno": "399200827954886",
+     * 	"timeStamp": "20200904155126",
+     * 	"ordNo": "15104111832020090415505766488690",
+     * 	"payType": "ALIPAY",
+     * 	"origOrdNo": "15104111832020090411483384476170",
+     * 	"origAmt": "0.10",
+     * 	"origUuid": "28a6170a70a1433a86b84f8873107371",
+     * 	"totalOffstAmt": "0.10",
+     * 	"recFeeAmt": "0",
+     * 	"drType": "",
+     * 	"realRefundAmount": "0.1",
+     * 	"tradeType": "02"
+     * }
+     */
+    @Override
+    public void refundCallback(JSONObject param) {
+        String origOrderNo = param.getString("origOrderNo");
+        MerchantOrder merchantOrder = new MerchantOrder().setOrderNumber(origOrderNo).setStatus("1");
+        merchantOrder = merchantOrderService.queryMerchantOrder(merchantOrder);
+
+        String mno = param.getString("mno");
+        QueryWrapper<MerchantChannelStatus> queryWrapper = new QueryWrapper<MerchantChannelStatus>().eq("merchantId", mno);
+        MerchantChannelStatus merchantChannelStatus = merchantChannelStatusService.getOne(queryWrapper);
+
+        if (merchantOrder == null) {
+            throw new MsgException("未找到对应订单");
+        }
+
+        MerchantOrder existData = new MerchantOrder();
+        existData.setOrderNumber(param.getString("origOrderNo")).setStatus("2");
+        existData = merchantOrderService.queryMerchantOrder(existData);
+        if (existData != null) {
+            return;
+        }
+
+        MerchantRefundOrder merchantRefundOrder = new MerchantRefundOrder();
+        try {
+            merchantOrder.setUpdateTime(DateUtils.parseDate(param.getString("payTime"), "yyyyMMddHHmmss"));
+            merchantOrder.setStatus("2");
+            merchantOrder.setId(null);
+            String realRefundAmount = StringUtil.isEmpty(param.getString("realRefundAmount")) ? merchantOrder.getConsumeFee().toString() : param.getString("realRefundAmount");
+            merchantOrder.setConsumeFee(new BigDecimal(realRefundAmount).setScale(2,BigDecimal.ROUND_UP).doubleValue());
+            merchantRefundOrder.setPayTime(merchantOrder.getTransDt());
+            merchantOrderService.save(merchantOrder);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        String refundOrderNumber = param.getString("ordNo");
+        merchantRefundOrder.setMerchantCode(merchantOrder.getMerchantCode());
+        merchantRefundOrder.setRefundTime(merchantOrder.getUpdateTime());
+        merchantRefundOrder.setStatus("1");
+        merchantRefundOrder.setAisleSwitch("2");
+        merchantRefundOrder.setAlias(merchantOrder.getMerchantName());
+        merchantRefundOrder.setChannelNo(merchantOrder.getOrderNumber());
+        merchantRefundOrder.setChannelMercNo(param.getString("mno"));
+        merchantRefundOrder.setCreateTime(merchantOrder.getUpdateTime());
+        merchantRefundOrder.setMerchantCode(merchantChannelStatus.getMerchantCode());
+        merchantRefundOrder.setOrderType("6");
+        merchantRefundOrder.setPayTypeCode(merchantOrder.getPayTypeCode());
+        merchantRefundOrder.setPayTypeName(merchantOrder.getPayTypeName());
+        merchantRefundOrder.setPayAmt(new BigDecimal(param.getString("realRefundAmount")));
+        merchantRefundOrder.setOrderNumber(merchantOrder.getOrderNumber());
+        merchantRefundOrder.setRefundNo(refundOrderNumber);
+        merchantRefundOrderService.save(merchantRefundOrder);
+        // 退款去分润操作
+        realFansService.removeProfit(merchantOrder.getOrderNumber());
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public synchronized void posCallback(JSONObject param) {
+        log.info("===========>随行付pos回调操作<============");
+        String bizCode = param.getString("bizCode");
+        MsgException.check(!SxfConfg.SXF_SUCCESS_CODE.equals(bizCode),param.getString("bizMsg"));
+
+        String mno = param.getString("mno");
+        MerchantChannelStatus channelStatus = merchantChannelStatusService.getByMerchantId(mno);
+        MsgException.checkNull(channelStatus,"未知商编");
+        MerchantBaseInfo merchant = mbiService.getMerchantBaseInfoByMerchantCode(channelStatus.getMerchantCode());
+        MsgException.checkNull(merchant,"未知商户");
+
+        MerchantStore store = merchantStoreService.getStoreByMerchantCode(channelStatus.getMerchantCode());
+        MsgException.checkNull(store,"门店信息异常");
+
+        String tranType = param.getString("tranType");
+        //刷卡交易回调
+        if(StringUtil.isNotEmpty(tranType)){
+            posCardCallback(param,merchant,store);
+        }else{
+            posScanPay(param,merchant,store);
+        }
+    }
+
+    /**
+     * @description:POS扫码交易回调
+     * {
+     *     "payTime":"20211027161421",
+     *     "bizCode":"0000",
+     *     "creTm":"161420",
+     *     "sign":"hRPtD6tzlnrqLSCDkxtlR0QqwxdEjYtd+7Lu9k4MEFggc8ARmrwS3SnAq+ly0Hav8PsRQtlhVJC1anCXv1E+OJ3a9xdSkA7StWN9MqWTshfKkTmjZDQk5+8lptDT727cthv3xEbMgM2VtyB8B8RrW35n10jY6NDcZS9OG7sHFGtjyc3TDuXdJMPjJ3JC48FMENmI/2deXFkiVO4LQ3PY8kn9py61fYJcYsMkgfbSZNuwyYk2081NhNKmKw+gpDmRXfFbducxOVqnB7ps7m2EE5tzTX0nZlT8SGt5RH1h09WEYuDDY9qG3qApbR0dLeoigZpnrXzX5qRddiSnBICgMA==",
+     *     "amt":"0.01",
+     *     "payWay":"01",
+     *     "terminalId":"10747825",
+     *     "buyerId":"2088502904759300",
+     *     "batchId":"000001",
+     *     "uuid":"77b5fb07ac96488ea78b7cbde8d13600",
+     *     "orgId":"56964586",
+     *     "tranTime":"20211027161420",
+     *     "ordNo":"2021102710747825000001000054",
+     *     "payType":"ALIPAY",
+     *     "bizMsg":"交易成功",
+     *     "posSeqNo":"000054",
+     *     "tradeSource":"10",
+     *     "finishTime":"20211027161421",
+     *     "orgName":"武汉融商创银科技有限公司",
+     *     "cardType":"1",
+     *     "transactionId":"2021102722001459301413881452",
+     *     "creDt":"20211027",
+     *     "mno":"399200827349050",
+     *     "timeStamp":"20211027161422",
+     *     "buyerAccount":"135******00",
+     *     "drType":"1",
+     *     "businessType":"2"
+     * }
+     */
+    private void posScanPay(JSONObject param, MerchantBaseInfo merchant, MerchantStore store) {
+        String payTime = param.getString("payTime");
+        String amt = param.getString("amt");
+        String buyerId = param.getString("buyerId");
+        String uuid = param.getString("uuid");
+        String payType = param.getString("payType");
+        String transactionId = param.getString("transactionId");
+        String drType = param.getString("drType");
+
+        String ordNo = param.getString("ordNo");
+        MerchantOrder existData = new MerchantOrder();
+        existData.setOrderNumber(ordNo);
+        existData = merchantOrderService.queryMerchantOrder(existData);
+        if (existData != null) {
+            return;
+        }
+        operationOrder(merchant,store,payType,uuid,transactionId,drType,amt,payTime,ordNo,buyerId);
+    }
+
+    private void operationOrder(MerchantBaseInfo merchant,
+                                      MerchantStore store,
+                                      String payType, String uuid,
+                                      String transactionId, String drType,
+                                      String amt, String payTime,String ordNo,String buyerId) {
+        MerchantOrder merchantOrder = new MerchantOrder();
+        merchantOrder.setStaffCode(store.getStoreId());
+        merchantOrder.setStaffName(store.getAlias());
+        merchantOrder.setStatus("1");
+
+        if (payType != null) {
+            merchantOrder.setThirdTransNo(transactionId);
+            switch (payType) {
+                case "WECHAT":
+                    merchantOrder.setPayTypeCode("sxfPay1");
+                    merchantOrder.setPayTypeName("随行微信支付");
+                    break;
+                case "ALIPAY":
+                    merchantOrder.setPayTypeCode("sxfPay0");
+                    merchantOrder.setPayTypeName("随行支付宝支付");
+                    break;
+                case "UNIONPAY":
+                    merchantOrder.setPayTypeCode("sxfPay2");
+                    merchantOrder.setPayTypeName("随行云闪付支付");
+                    break;
+                default:
+                    break;
+            }
+        }
+        merchantOrder.setOrderNumber(ordNo);
+        merchantOrder.setOrderType("4");
+        merchantOrder.setMerchantCode(merchant.getMerchantCode());
+        merchantOrder.setMerchantName(merchant.getAlias());
+        merchantOrder.setStoreId(store.getStoreId());
+        merchantOrder.setStoreName(merchant.getAlias());
+        merchantOrder.setConsumeFee(Double.valueOf(amt));
+        merchantOrder.setTransNo(uuid);
+        //借贷标识
+        merchantOrder.setDrType(drType);
+        //插入通道费率 已经通道成本手续费
+        merchantOrder.setChannelRate(SxfConstants.CHANNEL_WECHAT_ALIPAY_BANK_COST_RATE.multiply(new BigDecimal(10000)));
+        BigDecimal channelFee = new BigDecimal(merchantOrder.getConsumeFee().toString()).multiply(SxfConstants.CHANNEL_WECHAT_ALIPAY_BANK_COST_RATE).setScale(2,BigDecimal.ROUND_HALF_UP);
+        merchantOrder.setChannelFee(channelFee);
+        try {
+            Date date = DateUtils.parseDate(payTime, "yyyyMMddHHmmss");
+            merchantOrder.setCreateDt(date);
+            merchantOrder.setTransDt(date);
+            merchantOrder.setUpdateTime(date);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+
+        BigDecimal rate = merchantRateNewService.getMchRate(merchant.getMerchantCode(),merchantOrder.getPayTypeCode(), merchantOrder.getConsumeFee());
+        merchantOrder.calcRateAndFee(rate);
+        merchantOrder.setAisleSwitch("2");
+        merchantOrder.setMercUserId(buyerId);
+        boolean flag = merchantOrderService.save(merchantOrder);
+        //收款成功 app推送
+//        if(flag){
+//            List<String> alias = new ArrayList<String>();
+//            alias.add(merchant.getUserId());
+//            String msgCountent = "收银呗到账" + merchantOrder.getConsumeFee().toString() + "元";
+//            sendAppNotify(alias,"收银呗到账通知",msgCountent,"3");
+//        }
+        if("1".equals(store.getIsMarket())){
+            merchantOrder.setMarketAmt(merchantOrder.getMercFee());
+            merchantTransferService.saveTransferInfo(merchantOrder, merchantOrder.getMercFee());
+        }
+        try {
+            //创建推广分润
+            merchantProfitService.createOrderProfitV2(merchantOrder,"1");
+            MerchantOrder update = new MerchantOrder();
+            if(flag){
+                update.setId(merchantOrder.getId());
+                update.setProfitShareMoney(merchantOrder.getProfitShareMoney());
+                merchantOrderService.updateById(update);
+            }
+        }catch (RuntimeException e){
+            log.info("创建分润失败,异常信息:{}",e.getMessage());
+        }
+    }
+
+    /**
+     * 刷卡撤销交易
+     * {
+     *     "bizCode":"0000",
+     *     "creTm":"153856",
+     *     "trmNo":"10747825",
+     *     "sign":"BFsL7oT7l9SMGpJcMSM4A71n5i4O1baVs4wDnI8meRnERj0sVi2IhwUDhGbkmAJLahy3vV3ES3mnmcQ5fNO63iVsCo3ML+7xPK+DBgXPlIXkva8K526vgHAaeK8tRfXGwxN3VV9ISxEM14Of800uPpKzhRGRhKsC97UPBFgI7aYkKfEINv4mBM2PN/IEZiXAML/xfCC8Ng/5SuCSGAteB4vuWtaER3UOof2I6rJiyxUxh+w5xpT+RJqiedVaBUMetsK9uPi6VTDJmuVox9fkSGrEfZp3p9YAJLEADA34yRJCweItkXJB6VGyl/ba8qSexeCmtKysjD76zpZo+TWsBg==",
+     *     "isCloudPay":"01",
+     *     "mcc":"7375",
+     *     "uuid":"3b58e7d833014723a249404b3cd23158",
+     *     "cardNo":"625156******6040",
+     *     "orgId":"56964586",
+     *     "tranType":"0002",
+     *     "crdTyp":"01",
+     *     "orgNm":"CUP_Z",
+     *     "sesDate":"20211027",
+     *     "szltFlag":"01",
+     *     "bizMsg":"交易成功",
+     *     "foreignCardFlg":"00",
+     *     "posSeqNo":"000051",
+     *     "specialOffer":"",
+     *     "szltRecfeeAmt":"0.00",
+     *     "sesBatNo":"00",
+     *     "exrateMode":"",
+     *     "tranSts":"S",
+     *     "tranTm":"153855",
+     *     "finishTime":"20211027153855",
+     *     "authCode":"587675",
+     *     "batNo":"000001",
+     *     "mecFeeRate":"0",
+     *     "consumerId":"",
+     *     "inMod":"02",
+     *     "cardType":"0",
+     *     "paySource":"01",
+     *     "payChannals":"",
+     *     "tranSeqNo":"b2c77ee222c7460b9cc3907f84942cc5",
+     *     "feeAmt":"0.01",
+     *     "creDt":"20211027",
+     *     "mno":"399200827349050",
+     *     "inMno":"836521773750011",
+     *     "tranAmt":"1",
+     *     "ouuid":"3266c9f2cb354ceda4fd059c0d824787",
+     *     "businessType":"0",
+     *     "tranDt":"20211027",
+     *     "searchNo":"211027878317"
+     * }
+     */
+    private void posCardRevoke(JSONObject param, MerchantBaseInfo merchant,String preAuthStatus) {
+        String tranSts = param.getString("tranSts");
+        if("S".equals(tranSts)){
+            String ouuid = param.getString("ouuid");
+            MsgException.checkNull(ouuid,"原订单号为空，交易撤消失败");
+            MerchantOrder order = new MerchantOrder().setTransNo(ouuid).setStatus("1");
+            order = merchantOrderService.queryMerchantOrder(order);
+            MsgException.checkNull(order,"未找到对应订单");
+
+            Double tranAmt = param.getDouble("tranAmt");
+            if(BigDecimal.valueOf(tranAmt).compareTo(BigDecimal.valueOf(order.getConsumeFee())) == 0){
+                //全额退款
+                order.setStatus("2");
+            }else{
+                order.setConsumeFee(tranAmt);
+                order.setStatus("6");
+            }
+            order.setId(null);
+            order.setUpdateTime(new Date());
+            if(StringUtil.isNotEmpty(order.setPreAuthStatus(preAuthStatus))){
+                order.setPreAuthStatus(preAuthStatus);
+            }
+            merchantOrderService.save(order);
+            MerchantRefundOrder refundOrder = new MerchantRefundOrder();
+            refundOrder.setMerchantCode(merchant.getMerchantCode());
+            refundOrder.setAlias(merchant.getAlias());
+            refundOrder.setOrderNumber(order.getOrderNumber());
+            refundOrder.setRefundNo("SXFR"+StringUtil.getBillno());
+            refundOrder.setChannelNo(ouuid);
+            refundOrder.setPayTime(order.getTransDt());
+            refundOrder.setRefundTime(new Date());
+            refundOrder.setStatus("1");
+            refundOrder.setOrderType(order.getOrderType());
+            refundOrder.setPayTypeCode(order.getPayTypeCode());
+            refundOrder.setPayTypeName(order.getPayTypeName());
+            refundOrder.setPayAmt(BigDecimal.valueOf(order.getConsumeFee()));
+            refundOrder.setAisleSwitch("2");
+            refundOrder.setCreateTime(new Date());
+            refundOrder.setFailMsg(param.getString("bizMsg"));
+            merchantRefundOrderService.save(refundOrder);
+            //TODO 暂时不加去除分润操作 刷卡费率未完善
+        }
+
+    }
+
+    /**
+     * 随行付pos刷卡交易
+     * {
+     *     "bizCode":"0000", 业务状态
+     *     "creTm":"153705",
+     *     "trmNo":"10747825", 终端编号
+     *     "sign":"EMrrw0npknILFUOsEIAGoQ5wIgIWPxRAsh9dfKVMhXYFOqIP7TQ8dlLLhlvR8cOeIKXHHOvD1hhkXht5r8CJCw/+VtAslsaQGiDmtWt+XWEZSVW63NS2V88ECfvwQTp9i6x8sFnXDKb7tK2R1Yc+TnBNgyZ4oNC7vAvwxWD5t1L7TrltdgITVyLGaVHnTKviIO3cjSE60ECyhaqUd07goBFSNz1b2y9iTJTjPMTk3CJCPQQeo5/9tAHim4Tu+bwyP5jcHk/SVH/DM4xM1dz8/LpaK1X+nJRqKICRDWs4JjpP2FeRxthziqR1kBpXe4CVzNt3TPL5y5ItXmppis16Aw==",
+     *     "isCloudPay":"01",
+     *     "mcc":"7375",
+     *     "uuid":"527466ae56f1410aa0c2c5744012b74d", 随行付订单号
+     *     "cardNo":"625156******6040", 交易卡号 加密
+     *     "orgId":"56964586", 机构号
+     *     "tranType":"0001",交易类型，枚举值
+     *     "crdTyp":"01", 借贷标识
+     *     "orgNm":"CUP_Z", 不知道啥参数
+     *     "sesDate":"20211027", 不知道啥参数
+     *     "szltFlag":"01", 不知道啥参数
+     *     "bizMsg":"交易成功",
+     *     "foreignCardFlg":"00", //不知道啥参数
+     *     "posSeqNo":"000050", //小票流水号
+     *     "specialOffer":"", // 优惠费率标识，枚举值 1 云闪付 说明：手机PAY的支付 1000以下的优惠费率 返回1 云闪付
+     *     "szltRecfeeAmt":"0.00", //不知道啥参数
+     *     "sesBatNo":"00", //不知道啥参数
+     *     "exrateMode":"",
+     *     "tranSts":"S", //交易状态，枚举值 S 成功 F 失败 Q 未支付
+     *     "tranTm":"153703", 交易时间 HHmmss
+     *     "finishTime":"20211027153703", //交易完成时间 大概是 文档没有
+     *     "authCode":"587675", //授权code 不知道有啥用
+     *     "batNo":"000001", 批次号
+     *     "mecFeeRate":"0.6", //费率 0.6%
+     *     "consumerId":"", 消费者id
+     *     "inMod":"02",
+     *     "cardType":"0", //卡类型 应该是 不知道参数是啥意思
+     *     "paySource":"01", // 交易来源，枚举值 01 POS 06 外部接入
+     *     "payChannals":"",//支付渠道
+     *     "tranSeqNo":"3266c9f2cb354ceda4fd059c0d824787", 交易流水号，长度32位
+     *     "feeAmt":"0.01", //手续费
+     *     "creDt":"20211027", //
+     *     "mno":"399200827349050", //商户编号
+     *     "inMno":"836521773750011",//不知道是啥参数
+     *     "tranAmt":"1", //交易金额
+     *     "ouuid":"", //员交易流水号，撤销交易时候用的 应该是 待测试
+     *     "businessType":"0",
+     *     "tranDt":"20211027",//交易日期
+     *     "searchNo":"211027875904" //检索参考号
+     * }
+     */
+    private void posCardCallback(JSONObject param, MerchantBaseInfo merchant, MerchantStore store) {
+
+        String tranType = param.getString("tranType");
+        switch (tranType){
+            case "0001":
+                posCardPay(param,merchant,store,null);
+                break;
+            case "0003":
+                posCardPay(param,merchant,store,"1");
+                break;
+            case "0005":
+                posCardPay(param,merchant,store,"3");
+                break;
+            case "0002":
+                posCardRevoke(param,merchant,null);
+                break;
+            case "0004":
+                posCardRevoke(param,merchant,"2");
+                break;
+            case "0006":
+                posCardRevoke(param,merchant,"4");
+                break;
+            //冲正
+            case "0007":
+                posCardRevoke(param,merchant,"5");
+                break;
+            //退货
+            case "0008":
+                posCardRevoke(param,merchant,"6");
+                break;
+            //现金消费
+            case "0027":
+                log.info("=========>POS机现金没接入==========");
+                break;
+        }
+    }
+
+    /** pos 预授权
+     *
+     * {
+     *     "bizCode":"0000",
+     *     "creTm":"161222",
+     *     "trmNo":"10748949",
+     *     "sign":"StfLz1HyeKP+HMMhehkKYOxcPrm4mg0YtpSO+iWaYm/cet42pTFHQdx2mB8OGt84ESBKbxgif5cvvGCzwPogbChAMzSHBCPHECGAdmOVzWAMvZt875TR9Sl1LQBiPCuH+S3pch3X4wFY/kdfu0ZjyWHFQ+Kmc/93Qp50gSGhZ11MD4WY19PCjb/dhsWKiKC4psiHLbvvQM0DLSwMXsfnt2IGPUVHjwEPBEQNq1ED1DmKwuEbYArrHo27p0CnpiNXRDzYzQIDumUgkM+E8dKWlZQIXKcIuT354GQKPDqStPqrwD/vaMWwPYFAho+M/UMFXPaD+LtclY89i+rl6tZkbg==",
+     *     "isCloudPay":"01",
+     *     "mcc":"7011",
+     *     "uuid":"4d5d66a986a94259a678b0e6c289b30a",
+     *     "cardNo":"625156******6040",
+     *     "orgId":"56964586",
+     *     "tranType":"0003",
+     *     "crdTyp":"01",
+     *     "orgNm":"CUP_Z",
+     *     "sesDate":"20211028",
+     *     "szltFlag":"01",
+     *     "bizMsg":"交易成功",
+     *     "foreignCardFlg":"00",
+     *     "posSeqNo":"000084",
+     *     "specialOffer":"",
+     *     "szltRecfeeAmt":"0.00",
+     *     "sesBatNo":"00",
+     *     "exrateMode":"",
+     *     "tranSts":"S",
+     *     "tranTm":"161221",
+     *     "finishTime":"20211028161221",
+     *     "authCode":"637019",
+     *     "batNo":"000001",
+     *     "mecFeeRate":"0",
+     *     "consumerId":"",
+     *     "inMod":"02",
+     *     "cardType":"0",
+     *     "paySource":"01",
+     *     "payChannals":"",
+     *     "tranSeqNo":"476d9fbafb984712bd28ee7f4cc69d06",
+     *     "feeAmt":"0",
+     *     "creDt":"20211028",
+     *     "mno":"399211027879843",
+     *     "inMno":"836701770110639",
+     *     "tranAmt":"0.1",
+     *     "ouuid":"",
+     *     "businessType":"0",
+     *     "tranDt":"20211028",
+     *     "searchNo":"211028957213"
+     * }
+     *
+     *
+     * **/
+
+    /**
+     * @description:刷卡支付回调
+     *
+     */
+    private void posCardPay(JSONObject param, MerchantBaseInfo merchant, MerchantStore store,String preAuthStatus) {
+        String tranSeqNo = param.getString("tranSeqNo");
+        if("3".equals(preAuthStatus)){
+            String ouuid = param.getString("ouuid");
+            if(StringUtil.isNotEmpty(ouuid)){
+                MerchantOrder existData = new MerchantOrder();
+                existData.setTransNo(ouuid).setStatus("1");
+                existData = merchantOrderService.queryMerchantOrder(existData);
+                if(existData == null){
+                    MsgException.throwException("预授权原订单号：{"+ouuid+"}查询异常");
+                }
+                Double tranAmt = param.getDouble("tranAmt");
+                Double feeAmt = param.getDouble("feeAmt");
+                existData.setEnterFee(StringUtil.bigDecimal(tranAmt-feeAmt));
+                if(StringUtil.isNotEmpty(param.getBigDecimal("mecFeeRate"))){
+                    BigDecimal rate = param.getBigDecimal("mecFeeRate").multiply(BigDecimal.valueOf(100));
+                    existData.setRate(rate);
+                }
+                existData.setTransNo(tranSeqNo);
+                existData.setPreAuthStatus(preAuthStatus);
+                existData.setMercFee(BigDecimal.valueOf(feeAmt));
+                existData.setConsumeFee(tranAmt);
+                merchantOrderService.updateById(existData);
+            }
+        }else{
+            String orderNumber = "SXF_POS_"+StringUtil.getBillno();
+            MerchantOrder order = new MerchantOrder();
+            order.setOrderNumber(orderNumber);
+            order.setOrderType("4");//Pos
+            order.setMerchantCode(merchant.getMerchantCode());
+            order.setMerchantName(merchant.getAlias());
+            order.setPayTypeCode(Constant.PAY_TYPE_YSFPAY);
+            order.setPayTypeName(Constant.PAY_TYPE_NAME_YSFPAY);
+            order.setStoreId(store.getStoreId());
+            order.setStoreName(store.getStoreName());
+            order.setConsumeFee(param.getDouble("tranAmt"));
+            order.setTransNo(tranSeqNo);
+            Date date = new Date();
+            order.setCreateDt(date);
+            order.setTransDt(date);
+            String tranSts = param.getString("tranSts");
+            switch (tranSts){
+                case "S":
+                    order.setStatus("1");
+                    break;
+                case "F":
+                    order.setStatus("0");
+                    break;
+                default:
+                    order.setStatus("5");
+                    break;
+            }
+            Double tranAmt = param.getDouble("tranAmt");
+            Double feeAmt = param.getDouble("feeAmt");
+            order.setEnterFee(StringUtil.bigDecimal(tranAmt-feeAmt));
+            order.setAisleSwitch("2");
+            BigDecimal rate = param.getBigDecimal("mecFeeRate").multiply(BigDecimal.valueOf(100));
+            order.setRate(rate);
+            order.setSettlementType(1);
+            String cardType = param.getString("cardType");
+            //贷记卡
+            BigDecimal channelRate = BigDecimal.ZERO;
+            BigDecimal channelFee = BigDecimal.ZERO;
+            if("0".equals(cardType)){
+                order.setDrType("2");
+                channelRate = SxfConstants.CREDIT_CARD_BANK_RATE_LARGE;
+                channelFee = BigDecimal.valueOf(tranAmt).multiply(channelRate).setScale(2,BigDecimal.ROUND_HALF_UP);
+
+            }else {
+                order.setDrType("1");
+                channelRate = SxfConstants.DEBIT_CARD_BANK_RATE_LARGE;
+                channelFee = BigDecimal.valueOf(tranAmt).multiply(channelRate).setScale(2,BigDecimal.ROUND_HALF_UP);
+                if(channelFee.compareTo(SxfConstants.DEBIT_CARD_BANK_RATE_LARGE_MAX_FEE) >= 0){
+                    channelFee = SxfConstants.DEBIT_CARD_BANK_RATE_LARGE_MAX_FEE;
+                }
+            }
+            order.setChannelFee(channelFee);
+            order.setChannelRate(channelRate.multiply(new BigDecimal(10000)));
+            order.setMercFee(BigDecimal.valueOf(feeAmt));
+            if(StringUtil.isNotEmpty(preAuthStatus)){
+                order.setPreAuthStatus(preAuthStatus);
+            }
+            boolean flag = merchantOrderService.save(order);
+            //pos机收款成功 app推送
+            if(flag && "1".equals(order.getStatus())){
+                List<String> alias = new ArrayList<String>();
+                alias.add(merchant.getUserId());
+                String msgCountent = "收银呗到账" + order.getConsumeFee().toString() + "元";
+                sendAppNotify(alias,"收银呗到账通知",msgCountent,"3");
+            }
+        }
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/impl/SxfServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/impl/SxfServiceImpl.java
new file mode 100644
index 0000000..6740222
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/impl/SxfServiceImpl.java
@@ -0,0 +1,71 @@
+package cn.pluss.platform.sxf.impl;
+
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.util.SxfConfg;
+import cn.pluss.platform.sxf.SxfService;
+import cn.pluss.platform.util.RSAUtils;
+import cn.pluss.platform.util.SignUtils;
+import com.alibaba.fastjson.JSONObject;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.time.DateFormatUtils;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.Date;
+import java.util.UUID;
+
+@Service
+@Slf4j
+@RequiredArgsConstructor
+public class SxfServiceImpl implements SxfService {
+
+    private final RestTemplate restTemplate;
+
+    @Override
+    public JSONObject requestApi(String url, JSONObject reqData) {
+        try {
+            JSONObject paramMap = new JSONObject();
+            paramMap.put("orgId", SxfConfg.ORG_ID);
+            paramMap.put("reqId", UUID.randomUUID().toString().replaceAll("-", ""));
+            paramMap.put("version", "1.0");
+            paramMap.put("timestamp", DateFormatUtils.format(new Date(), "yyyyMMddHHmmss"));
+            paramMap.put("reqData", reqData);
+            paramMap.put("signType", "RSA");
+            String signContent = SignUtils.getSignContent(paramMap);
+            paramMap.put("sign", RSAUtils.sign(SxfConfg.PRIVATE_KEY, signContent));
+            log.info("===================>【随行付】请求参数:{}<================",paramMap);
+
+            ResponseEntity<JSONObject> responseEntity = restTemplate.postForEntity(url, paramMap, JSONObject.class);
+            // 检查网络请求状态
+            if (!HttpStatus.OK.equals(responseEntity.getStatusCode())) {
+                throw new MsgException("请求失败，请求状态异常");
+            }
+
+            log.info("=============return_info============");
+            if (responseEntity.getBody() != null) {
+                log.info(responseEntity.getBody().toJSONString());
+            }
+            return responseEntity.getBody();
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new MsgException("随行付接口异常");
+        }
+    }
+
+    @Override
+    public boolean checkSign(JSONObject responseData) throws Exception {
+        // TODO 暂时先将验签的代码屏蔽
+        String signContent = SignUtils.getSignContent(responseData);
+        String sign = responseData.getString("sign");
+        if (sign == null) {
+            // 没有加签就不校验签名
+            return true;
+        }
+        return RSAUtils.checkSign(SxfConfg.PUBLIC_KEY, signContent, sign);
+
+//        return true;
+    }
+}
\ No newline at end of file
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/pay/SxfPayService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/pay/SxfPayService.java
new file mode 100644
index 0000000..b1f3206
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/pay/SxfPayService.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.sxf.pay;
+
+import cn.pluss.platform.pay.PayService;
+
+import java.util.Map;
+
+public interface SxfPayService extends PayService {
+
+
+    /**
+     * @description:随行付回调处理
+     * @date: 2021/8/19 18:42
+     * @param map:
+     * @return java.util.Map<java.lang.String,java.lang.String>
+     */
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/pay/impl/SxfPayServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/pay/impl/SxfPayServiceImpl.java
new file mode 100644
index 0000000..cfeb8a0
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/pay/impl/SxfPayServiceImpl.java
@@ -0,0 +1,725 @@
+package cn.pluss.platform.sxf.pay.impl;
+
+import cn.pluss.platform.api.ResultCode;
+import cn.pluss.platform.channel.MerchantAuditService;
+import cn.pluss.platform.constants.Constant;
+import cn.pluss.platform.dto.MemberScanPayDTO;
+import cn.pluss.platform.dto.MerChantOrderDTO;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.SubMerchantMapper;
+import cn.pluss.platform.merchantOrder.MerchantOrderService;
+import cn.pluss.platform.refundOrder.MerchantRefundOrderService;
+import cn.pluss.platform.suixingfu.SxfConstants;
+import cn.pluss.platform.sxf.SxfService;
+import cn.pluss.platform.sxf.pay.SxfPayService;
+import cn.pluss.platform.util.*;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ExecutorService;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class SxfPayServiceImpl implements SxfPayService {
+    
+    private final SxfService sxfService;
+
+    @Setter(onMethod_ = {@Lazy, @Autowired})
+    private MerchantRefundOrderService merchantRefundOrderService;
+
+    @Setter(onMethod_ = {@Lazy, @Autowired})
+    private MerchantOrderService merchantOrderService;
+
+    @Qualifier("sxfMerchantAuditService")
+    private final MerchantAuditService sxfMerchantAuditService;
+
+    private final SubMerchantMapper subMerchantMapper;
+
+    @Resource
+    private ExecutorService executorService;
+
+
+    @Override
+    public JSONObject tradePay(MerchantOrder order,MerchantChannelStatus channel,MerchantBaseInfo merchant) {
+        Map<String,Object> resultMap = null;
+        JSONObject reqData = converParameter(order,channel,merchant);
+        log.info("==========>【随行付】支付下单请求，请求参数：{}<==============",reqData);
+        merchant.setChannelLimitPay(reqData,channel.getChannel());
+        String url = SxfConfg.SXF_JSAPI_SCAN_PAY;
+        if(StringUtil.isNotEmpty(order.getScanType()) && "01".equals(order.getScanType())){
+            url = SxfConfg.SXF_ACTIVE_SCAN_PAY;
+        }
+        try {
+            Long startTime = System.currentTimeMillis();
+            resultMap = sxfService.requestApi(url,reqData);
+            Long endTime = System.currentTimeMillis();
+            log.info("==========>【随行付】支付下单请求返回，返回参数：{},请求耗时:{}毫秒<==============",resultMap,endTime-startTime);
+        } catch (Exception e) {
+            log.error("==========>【随行付】支付下单请求异常，异常信息：{}<==============",e.getMessage());
+        }
+        JSONObject object = checkResultParams(resultMap);
+        if(ResultCode.FAIL.code() == object.getInteger("code")){
+            return object;
+        }
+        JSONObject payData = new JSONObject();
+        Map<String,Object> respData = (Map<String,Object>) resultMap.get("respData");
+        if(!(StringUtil.isNotEmpty(order.getScanType()) && "01".equals(order.getScanType()))){
+            if(Constant.PAY_TYPE_ALIPAY.equals(order.getPayTypeCode()) || "sxfPay0".equals(order.getPayTypeCode())){
+                payData.put("source",respData.get("source"));
+            }else if(Constant.PAY_TYPE_WECHAT.equals(order.getPayTypeCode()) || "sxfPay1".equals(order.getPayTypeCode())){
+                payData.put("payAppId",respData.get("payAppId"));
+                payData.put("payTimeStamp",respData.get("payTimeStamp"));
+                payData.put("paynonceStr",respData.get("paynonceStr"));
+                payData.put("payPackage",respData.get("payPackage"));
+                payData.put("paySignType",respData.get("paySignType"));
+                payData.put("paySign",respData.get("paySign"));
+            }else{
+                payData.put("redirectUrl",respData.get("redirectUrl"));
+            }
+        }else{
+            payData.put("payUrl",respData.get("payUrl"));
+            payData.put("orderNumber",order.getOrderNumber());
+            payData.put("mercOrderNo",order.getMercOrderNo());
+        }
+        payData.put("channel",channel.getChannel());
+        order.setTransNo(respData.get("uuid") == null ? "" : respData.get("uuid").toString());
+        object.put("payData",payData);
+        return object;
+    }
+
+    /**
+     * 统一返回参数校验
+     * @param resultMap
+     * @return
+     */
+    private JSONObject checkResultParams(Map<String, Object> resultMap) {
+        JSONObject result = new JSONObject(10);
+        if(resultMap == null){
+            result.put("code", ResultCode.FAIL.code());
+            result.put("msg","参数为空！");
+            return result;
+        }
+        if(!SxfConfg.SXF_SUCCESS_CODE.equalsIgnoreCase((String)resultMap.get("code"))){
+            result.put("code",ResultCode.FAIL.code());
+            result.put("msg",resultMap.get("msg"));
+            return result;
+        }
+        Object sign = resultMap.get("sign");
+        if(StringUtil.isEmpty(sign)){
+            result.put("code",ResultCode.FAIL.code());
+            result.put("msg","签名参数为空！");
+            return result;
+        }
+        //验证签名
+        resultMap.remove("sign");
+        String signStr = SignUtils.getSignContent(JSONObject.parseObject(JSONObject.toJSONString(resultMap)));
+        boolean flag = false;
+        try {
+            flag = RSAUtils.checkSign(SxfConfg.PUBLIC_KEY, signStr, sign.toString());
+        } catch (Exception e) {
+            log.error("==============>【随行付】签名校验异常<===============");
+            e.printStackTrace();
+        }
+        if(!flag){
+            log.info("==============>【随行付】签名校验失败<===============");
+            result.put("code",ResultCode.FAIL.code());
+            result.put("msg","签名校验失败");
+            return result;
+        }
+        Map<String,Object> respData = (Map<String,Object>)resultMap.get("respData");
+        if(!SxfConfg.SXF_SUCCESS_CODE.equalsIgnoreCase((String)respData.get("bizCode")) && !SxfConfg.SXF_REFUND_SUCCESS_CODE.equalsIgnoreCase((String)respData.get("bizCode"))){
+            if("3001".equals(respData.get("bizCode"))){
+                result.put("code",ResultCode.FAIL.code());
+                if(respData.get("bizMsg").toString().contains("使用微信支付")){
+                    result.put("msg","云闪付/京东支付失败：同一支付通道下一张身份证最多注册一个小微商户");
+                }else if(respData.get("bizMsg").toString().contains("商户需补齐相关资料") || respData.get("bizMsg").toString().contains("微信实名认证")){
+                    result.put("msg","D1次日到账：商户未在收银呗APP-商户认证-微信认证内完成授权，暂时无法微信收款");
+                }else{
+                    result.put("msg",respData.get("bizMsg"));
+                }
+                return result;
+            }
+            result.put("code",ResultCode.FAIL.code());
+            result.put("msg",respData.get("bizMsg"));
+            return result;
+        }
+        result.put("code",ResultCode.SUCCESS.code());
+        result.put("msg",respData.get("bizMsg"));
+        return result;
+    }
+
+    /**
+     * 随行付主扫逻辑
+     * @param merchantOrderDTO
+     * @param order
+     * @param
+     * @return
+     */
+    @Override
+    public JSONObject tradePay(MerChantOrderDTO merchantOrderDTO, MerchantOrder order){
+        JSONObject reqData = new JSONObject();
+        reqData.put("mno",merchantOrderDTO.getChannelNo());
+        reqData.put("ordNo",order.getOrderNumber());
+        reqData.put("authCode",merchantOrderDTO.getAuthCode());
+        reqData.put("amt",order.getConsumeFee());
+        if("sxfPay1".equals(order.getPayTypeCode())){
+            reqData.put("payType","WECHAT");
+        }else if("sxfPay0".equals(order.getPayTypeCode())){
+            reqData.put("payType","ALIPAY");
+        }else{
+            reqData.put("payType","UNIONPAY");
+        }
+        if(merchantOrderDTO.getMerchantBaseInfo() != null){
+            merchantOrderDTO.getMerchantBaseInfo().setChannelLimitPay(reqData,1);
+        }
+        reqData.put("subject",merchantOrderDTO.getMerchantName());
+        reqData.put("tradeSource","01");
+        //商家ip
+        reqData.put("trmIp","127.0.0.1");
+        reqData.put("notifyUrl",ParametersUtil.domain+"/wap/notify/sxfCallBack");
+        Map<String,Object> resultMap = null;
+        try {
+            Long startTime = System.currentTimeMillis();
+            log.info("==========>【随行付】主扫支付下单请求参数，返回参数：{},请求耗时:{}毫秒<==============",reqData);
+            resultMap = sxfService.requestApi(SxfConfg.SXF_REVERSE_SCAN_PAY, reqData);
+            Long endTime = System.currentTimeMillis();
+            log.info("==========>【随行付】主扫支付下单请求返回，返回参数：{},请求耗时:{}毫秒<==============",resultMap,endTime-startTime);
+        } catch (Exception e) {
+            log.error("==========>【随行付】主扫支付下单请求异常，异常信息：{}<==============",e.getMessage());
+        }
+        JSONObject object = checkResultParams(resultMap);
+        if(ResultCode.FAIL.code() == object.getInteger("code")){
+            return object;
+        }
+
+        JSONObject result = new JSONObject();
+        Map<String,Object> respData = (Map<String,Object>)resultMap.get("respData");
+        String bizCode = (String)respData.get("bizCode");
+        //通道交易流水号 支付宝或微信交易流水号
+        result.put("channelOrderNo",respData.get("transactionId"));
+        result.put("transNo",respData.get("uuid"));
+
+        order.setThirdTransNo(respData.get("transactionId") == null ? "" : respData.get("transactionId").toString());
+        order.setTransNo(respData.get("uuid") == null ? "" : respData.get("uuid").toString());
+        order.setMercUserId(respData.get("buyerId") == null ? "" : respData.get("buyerId").toString());
+        if(SxfConfg.SXF_REFUND_SUCCESS_CODE.equals(bizCode)){
+            result.put("code",ResultCode.TRANSUNKNOW.code());
+            result.put("msg","等待支付中...");
+            //订单状态待确认
+            result.put("payStatus","7");
+        }else{
+            result.put("code",ResultCode.SUCCESS.code());
+            result.put("payStatus","1");
+            result.put("msg","请求成功！");
+            String payTime = (String)respData.get("payTime");
+            result.put("payTime",DateUtils.parse(payTime,"yyyyMMddHHmmss"));
+        }
+        Object drType = respData.get("drType");
+        order.setDrType(drType == null ? "" : drType.toString());
+        order.setChannelRate(SxfConstants.CHANNEL_WECHAT_ALIPAY_BANK_COST_RATE.multiply(new BigDecimal(10000)));
+        order.setChannelFee(new BigDecimal(String.valueOf(order.getConsumeFee())).multiply(SxfConstants.CHANNEL_WECHAT_ALIPAY_BANK_COST_RATE).setScale(2,BigDecimal.ROUND_HALF_UP));
+        if("sxfPay2".equals(order.getPayTypeCode()) && order.getConsumeFee() > 1000.0d){
+            if("1".equals(drType)){
+                order.setChannelRate(SxfConstants.DEBIT_CARD_BANK_RATE_LARGE.multiply(new BigDecimal(10000)));
+                BigDecimal fee = new BigDecimal(String.valueOf(order.getConsumeFee())).multiply(SxfConstants.DEBIT_CARD_BANK_RATE_LARGE).setScale(2,BigDecimal.ROUND_HALF_UP);
+                if(fee.compareTo(SxfConstants.DEBIT_CARD_BANK_RATE_LARGE_MAX_FEE) > -1){
+                    order.setChannelFee(SxfConstants.DEBIT_CARD_BANK_RATE_LARGE_MAX_FEE);
+                }else{
+                    order.setChannelFee(fee.setScale(2,BigDecimal.ROUND_HALF_UP));
+                }
+            }else if("2".equals(drType)){
+                order.setChannelRate(SxfConstants.CREDIT_CARD_BANK_RATE_LARGE.multiply(new BigDecimal(10000)));
+                BigDecimal fee = new BigDecimal(String.valueOf(order.getConsumeFee())).multiply(SxfConstants.CREDIT_CARD_BANK_RATE_LARGE).setScale(2,BigDecimal.ROUND_HALF_UP);
+                order.setChannelFee(fee);
+            }
+        }
+        return result;
+    }
+
+    /**
+     * 随行付退款
+     * @param order
+     * @return
+     */
+    @Override
+    public Map<String,Object> refundPay(MerchantOrder order,String mchNo) {
+        Map<String,Object> result = new HashMap<>(4);
+        JSONObject reqRefundData = new JSONObject();
+        String refundNo = "SXFR"+StringUtil.getBillno();
+        reqRefundData.put("ordNo",refundNo);
+        reqRefundData.put("mno",mchNo);//随行付测试商户号
+        reqRefundData.put("origOrderNo",order.getOrderNumber());
+        reqRefundData.put("amt",StringUtil.isNotEmpty(order.getRefundType()) && order.getRefundType() == 2 ? order.getRefundAmt() : order.getConsumeFee());
+        reqRefundData.put("notifyUrl",ParametersUtil.domain + "/wap/notify/sxfCallBack");
+        if(StringUtil.isNotEmpty(order.getRemark())){
+            reqRefundData.put("refundReason",order.getRemark());
+        }
+        result.put("refundNo",refundNo);
+        result.put("status","3");
+        result.put("code",ResultCode.FAIL.code());
+        try {
+            Map<String, Object> resultMap = sxfService.requestApi(SxfConfg.SXF_REFUND_PAY, reqRefundData);
+            if(resultMap == null){
+                result.put("msg","退款失败！");
+                return result;
+            }
+            if(!SxfConfg.SXF_SUCCESS_CODE.equals(resultMap.get("code"))){
+                result.put("msg",resultMap.get("msg"));
+                return result;
+            }
+            Map<String,Object> respData = (Map<String,Object>)resultMap.get("respData");
+            //0000 和 2002 都表示退款中
+            if(SxfConfg.SXF_SUCCESS_CODE.equals(respData.get("bizCode")) || SxfConfg.SXF_REFUND_SUCCESS_CODE.equals(respData.get("bizCode"))){
+                result.put("msg","退款成功！");
+                result.put("data",respData);
+                result.put("status","1");
+                result.put("code",ResultCode.SUCCESS.code());
+                return result;
+            }
+            result.put("msg",respData.get("bizMsg"));
+            return result;
+        } catch (Exception e) {
+            log.error("==============>【随行付】退款异常，异常信息:{}<==================",e.getMessage());
+            result.put("msg","退款异常");
+            return result;
+        }
+    }
+
+    @Override
+    public JSONObject tradeQuery(MerchantOrder order,String mchId) {
+
+        JSONObject result = new JSONObject(6);
+        log.info("==============>【随行付】交易订单查询，查询单号：{}<==================",order.getOrderNumber());
+        JSONObject reqData = new JSONObject();
+        reqData.put("mno",mchId);//随行付测试商户号
+        reqData.put("ordNo",order.getOrderNumber());
+        try {
+            log.info("==============>【随行付】交易订单查询，请求业务参数reqData：{}<==================",reqData);
+            Map<String, Object> resultMap = sxfService.requestApi(SxfConfg.SXF_TRADE_QUERY_PAY, reqData);
+            log.info("==============>【随行付】交易订单查询，返回参数：{}<==================",resultMap);
+            if(resultMap == null){
+                log.error("==============>【随行付】交易订单查询失败<==================");
+                result.put("code",ResultCode.FAIL.code());
+                result.put("msg","订单查询异常");
+                return result;
+            }
+            if(!SxfConfg.SXF_SUCCESS_CODE.equals(resultMap.get("code"))){
+                result.put("code",ResultCode.FAIL.code());
+                result.put("msg",resultMap.get("msg"));
+                return result;
+            }
+            String sign = (String)resultMap.get("sign");
+            resultMap.remove(sign);
+            String signContent = SignUtils.getSignContent(JSONObject.parseObject(JSON.toJSONString(resultMap)));
+            boolean flag = RSAUtils.checkSign(SxfConfg.PUBLIC_KEY, signContent, sign);
+            if(!flag){
+                log.error("==============>【随行付】交易订单查询签名校验失败：{}<==================");
+                result.put("code",ResultCode.FAIL.code());
+                result.put("msg","签名校验失败");
+                return result;
+            }
+            Map<String,String> respData = (Map<String,String>)resultMap.get("respData");
+            if(!SxfConfg.SXF_SUCCESS_CODE.equals(respData.get("bizCode"))){
+                result.put("code",ResultCode.FAIL.code());
+                result.put("msg","查询失败");
+                return result;
+            }
+            String tranSts = respData.get("tranSts");
+            if("SUCCESS".equalsIgnoreCase(tranSts)){
+                //交易成功
+                String uuid = respData.get("uuid");
+                String payTime = respData.get("payTime");
+                String transactionId = respData.get("transactionId");//支付渠道单号
+                String buyerId = respData.get("buyerId");
+                result.put("channelOrderNo",transactionId);
+                result.put("payTime",DateUtils.parse(payTime,"yyyyMMddHHmmss"));
+                result.put("transNo",uuid);
+                result.put("code", ResultCode.SUCCESS.code());
+                result.put("payStatus", "1");
+                result.put("msg", "查询成功！");
+                result.put("buyerId", buyerId);
+                return result;
+            }else if("FAIL".equalsIgnoreCase(tranSts) || "CLOSED".equalsIgnoreCase(tranSts) || "CANCELED".equalsIgnoreCase(tranSts)){
+                result.put("code", ResultCode.SUCCESS.code());
+                result.put("payStatus", "0");
+                result.put("msg", "查询成功");
+                result.put("remark",tranSts);
+                return result;
+            }
+            result.put("code", ResultCode.SUCCESS.code());
+            result.put("payStatus", "5");
+            result.put("msg", "查询成功");
+            return result;
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("==============>【随行付】交易订单查询异常，异常信息：{}<==================",e.getMessage());
+            result.put("code",ResultCode.FAIL.code());
+            result.put("msg","查询异常！");
+            return result;
+        }
+    }
+
+    @Override
+    public JSONObject refundQuery(MerchantRefundOrder order) {
+       JSONObject result = new JSONObject(3);
+        log.info("==============>【随行付】退款订单查询，查询单号：{}<==================",order.getRefundNo());
+        JSONObject reqData = new JSONObject();
+        reqData.put("mno",order.getChannelMercNo());
+        reqData.put("ordNo",order.getRefundNo());
+        try {
+            Map<String, Object> resultMap = sxfService.requestApi(SxfConfg.SXF_TRADE_QUERY_PAY, reqData);
+            log.info("==============>【随行付】退款订单查询，返回参数：{}<==================",resultMap);
+            if(resultMap == null){
+                log.error("==============>【随行付】退款订单查询失败<==================");
+                result.put("code","0");
+                result.put("msg","退款查询异常");
+                return result;
+            }
+            if(!SxfConfg.SXF_SUCCESS_CODE.equals(resultMap.get("code"))){
+                result.put("code","0");
+                result.put("msg",resultMap.get("msg"));
+                return result;
+            }
+            String sign = (String)resultMap.get("sign");
+            resultMap.remove(sign);
+            String signContent = SignUtils.getSignContent(JSONObject.parseObject(JSON.toJSONString(resultMap)));
+            boolean flag = RSAUtils.checkSign(SxfConfg.PUBLIC_KEY, signContent, sign);
+            if(!flag){
+                log.error("==============>【随行付】退款订单查询签名校验失败：{}<==================");
+                result.put("code","0");
+                result.put("msg","签名校验失败");
+                return result;
+            }
+            result.put("code","1");
+            result.put("msg","查询成功！");
+            result.put("data",resultMap.get("respData"));
+            return result;
+        } catch (Exception e) {
+            log.error("==============>【随行付】退款订单查询异常，异常信息：{}<==================",e.getMessage());
+            result.put("code","0");
+            result.put("msg","查询异常！");
+            return result;
+        }
+
+    }
+
+    @Override
+    public Map<String, Object> closeOrder(String orderNumber, String channelNo) {
+        Map<String,Object> result = new HashMap<>(3);
+        JSONObject reqData = new JSONObject();
+        reqData.put("origOrderNo",orderNumber);
+        reqData.put("mno",channelNo);
+        log.info("==============>【随行付】订单关闭接口调用，调用请求业务参数：{}<==================",reqData);
+        Map<String, Object> resultMap = sxfService.requestApi(SxfConfg.SXF_CANCEL_ORDER, reqData);
+        log.info("==============>【随行付】订单关闭接口调用，返回参数：{}<==================",resultMap);
+        if(resultMap == null){
+            log.error("==============>【随行付】订单关闭接口调用失败<==================");
+            result.put("code",ResultCode.FAIL.code());
+            result.put("msg","订单关闭失败");
+            return result;
+        }
+        if(!SxfConfg.SXF_SUCCESS_CODE.equals(resultMap.get("code"))){
+            result.put("code",ResultCode.FAIL.code());
+            result.put("msg",resultMap.get("msg"));
+            return result;
+        }
+        String sign = (String)resultMap.get("sign");
+        resultMap.remove(sign);
+        String signContent = SignUtils.getSignContent(JSONObject.parseObject(JSON.toJSONString(resultMap)));
+        boolean flag = false;
+        try {
+            flag = RSAUtils.checkSign(SxfConfg.PUBLIC_KEY, signContent, sign);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        if(!flag){
+            log.error("==============>【随行付】退款订单查询签名校验失败：{}<==================");
+            result.put("code",ResultCode.FAIL.code());
+            result.put("msg","签名校验失败");
+            return result;
+        }
+        Map<String,String> respData = (Map<String,String>)resultMap.get("respData");
+        if(!SxfConfg.SXF_SUCCESS_CODE.equals(respData.get("bizCode"))){
+            result.put("code",ResultCode.FAIL.code());
+            result.put("msg",respData.get("bizMsg"));
+            return result;
+        }
+        result.put("code",ResultCode.SUCCESS.code());
+        result.put("msg","关单成功！");
+        return result;
+    }
+
+    private JSONObject converParameter(MerchantOrder order,MerchantChannelStatus channel,MerchantBaseInfo merchant) {
+        JSONObject reqData = new JSONObject();
+        reqData.put("ordNo",order.getOrderNumber());
+        reqData.put("mno",channel.getMerchantId());
+        reqData.put("amt",order.getConsumeFee());
+        if("wechatPay".equalsIgnoreCase(order.getPayTypeCode()) || "sxfPay1".equalsIgnoreCase(order.getPayTypeCode())){
+            reqData.put("payType","WECHAT");
+        }else if("aliPay".equalsIgnoreCase(order.getPayTypeCode()) || "sxfPay0".equalsIgnoreCase(order.getPayTypeCode())){
+            reqData.put("payType","ALIPAY");
+        }else if("bank".equalsIgnoreCase(order.getPayTypeCode()) || "sxfPay2".equalsIgnoreCase(order.getPayTypeCode())){
+            reqData.put("payType","UNIONPAY");
+            reqData.put("customerIp","127.0.0.1");
+        }
+        if(StringUtil.isNotEmpty(order.getSubject())){
+            reqData.put("subject",order.getSubject());
+        }else{
+            reqData.put("subject",order.getMerchantName());
+        }
+        if(!(StringUtil.isNotEmpty(order.getScanType()) && "01".equals(order.getScanType()))){
+            if(("9".equals(order.getOrderType()) ||  "3".equals(order.getOrderType()) || "10".equals(order.getOrderType())) &&
+                    "WECHAT".equals(reqData.getString("payType"))){
+                String defaultSupAppId = ParametersUtil.APPLETS_APPID;
+                if(StringUtil.isNotEmpty(merchant.getSubAppId())){
+                    defaultSupAppId = merchant.getSubAppId();
+                }
+                reqData.put("subAppid",defaultSupAppId);
+                reqData.put("payWay","03");
+            }else{
+                reqData.put("payWay","02");
+            }
+            reqData.put("userId",order.getMercUserId());
+        }
+        reqData.put("trmIp","127.0.0.1");
+        reqData.put("timeExpire",15);
+        reqData.put("tradeSource","01");
+        //前台通知地址
+        reqData.put("outFrontUrl", ParametersUtil.domain + "/wap/merchant/jumpUrl?orderNumber=" + order.getOrderNumber());
+        //前台失败通知地址
+        reqData.put("outFrontFailUrl", ParametersUtil.domain + "/wap/merchant/jumpUrl?orderNumber=" + order.getOrderNumber());
+        //支付成功回调接口
+        reqData.put("notifyUrl", ParametersUtil.domain + "/wap/notify/sxfCallBack");
+        if(StringUtil.isNotEmpty(order.getExtendParam())){
+            reqData.put(Constant.SXF_PAY_ECHO_KEY_NAME,order.getExtendParam());
+        }
+        return reqData;
+    }
+
+    /**
+     * 辅助接口获取用户WXOpenID
+     * @param memberScanPayDTO
+     * @return
+     */
+    @Override
+    public Map<String, Object> getWxOpenId(MemberScanPayDTO memberScanPayDTO,MerchantChannelStatus channel) throws Exception{
+
+        QueryWrapper<SubMerchant> subQueryMrapper = new QueryWrapper<SubMerchant>().eq("merchantId",channel.getMerchantId())
+                .eq("subMchType","WX").eq("status","01");
+        SubMerchant subMerchant = subMerchantMapper.selectOne(subQueryMrapper);
+        String wxCildNo = null;
+        if(subMerchant == null){
+            Map<String,Object> map = new HashMap<String,Object>(1);
+            map.put("merchantId",channel.getMerchantId());
+            JSONObject object = sxfMerchantAuditService.merchantAuditResult(map);
+            wxCildNo = object.getString("wxCildNo");
+        }else{
+            wxCildNo = subMerchant.getSubMchId();
+        }
+        JSONObject reqData = new JSONObject();
+        reqData.put("mno",channel.getMerchantId());
+        reqData.put("subMchId",wxCildNo);
+        reqData.put("subAppId",ParametersUtil.APPID);
+        reqData.put("authCode",memberScanPayDTO.getMemberCode());
+
+        log.info("==============>【随行付】辅助接口获取微信openId，调用请求业务参数：{}<==================",reqData);
+        long startTime = System.currentTimeMillis();
+        Map<String, Object> resultMap = sxfService.requestApi(SxfConfg.SXF_GET_WX_OPENID, reqData);
+        long endTime = System.currentTimeMillis();
+        log.info("==============>【随行付】辅助接口获取微信openId，返回参数：{},请求耗时：{}<==================",resultMap,endTime-startTime);
+        JSONObject object = checkResultParams(resultMap);
+        if(ResultCode.FAIL.code() == object.getInteger("code")){
+            return object;
+        }
+        Map<String,Object> respData = (Map<String,Object>)resultMap.get("respData");
+        Map<String,Object> result = new HashMap<>(2);
+        result.put("data",respData);
+        result.put("code","1");
+        result.put("msg","获取成功");
+        return result;
+    }
+
+    /**
+     *
+     * @param userAuthCode
+     * @param paymentApp
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public Map<String, Object> getUnionInfo(String userAuthCode, String paymentApp,String merchantId) throws Exception {
+        if(StringUtil.isEmpty(userAuthCode)){
+            throw new MsgException("授权码不能为空！");
+        }
+        if(StringUtil.isEmpty(paymentApp)){
+            throw new MsgException("银联标识不能为空！");
+        }
+        JSONObject reqData = new JSONObject(2);
+        reqData.put("userAuthCode",userAuthCode);
+        reqData.put("paymentApp",paymentApp);
+        Map<String,Object> resultMap  = sxfService.requestApi(SxfConfg.SXF_GET_UNION_USERID, reqData);
+
+        JSONObject object = checkResultParams(resultMap);
+        if(ResultCode.FAIL.code() == object.getInteger("code")){
+            return object;
+        }
+        Map<String,Object> respData = (Map<String,Object>)resultMap.get("respData");
+        Map<String,Object> result = new HashMap<>(2);
+        result.put("data",respData);
+        result.put("code","1");
+        result.put("msg","获取成功");
+        return result;
+    }
+
+    /**
+     *
+     * @param transfer
+     * @param
+     * @return
+     * @throws Exception
+     */
+//    @Override
+//    public Map<String, Object> orgTransfer(MerchantTransfer transfer) throws Exception {
+//        JSONObject reqData = new JSONObject(5);
+//        reqData.put("mno",transfer.getChannelNo());
+//        reqData.put("investor","01");//服务商出资
+//        reqData.put("orderNo",transfer.getOrderNo());
+//        reqData.put("amount",transfer.getAmount());
+//        reqData.put("content",transfer.getContent());
+//        Map<String,Object> resultMap  = sxfService.requestApi(SxfConfg.SXF_ORG_TRANS_FER, reqData);
+//        return checkResultParams(resultMap);
+//    }
+
+    /**
+     * @description:随行付支付回调处理
+     * @date: 2021/8/19 18:41
+     * @param map:
+     * @return java.util.Map<java.lang.String,java.lang.String>
+     */
+
+    @Override
+    public Map<String, String> payNotifyCallBack(Map<String, String> map) {
+        Map<String,String> result = new HashMap<>(2);
+        result.put("code","fail");
+        result.put("msg","失败");
+        if(!checkSign(map))return result;
+        //随行付交易流水号，32位
+        String uuid = map.get("uuid");
+        //商户编号
+        //String mno = map.get("mno");
+        //商户订单号
+        String ordNo = map.get("ordNo");
+        //交易金额
+        //String amt = map.get("amt");
+        //交易时间 yyyyMMddHHmmss
+        String payTime = map.get("payTime");
+        //支付渠道 WECHAT:微信,ALIPAY:支付宝,UNIONPAY:银联
+        //String payType =  map.get("payType");
+        String bizCode =  map.get("bizCode");
+        String buyerId = map.get("buyerId");
+        String origOrdNo = map.get("origOrdNo");
+        String origUuid = map.get("origUuid");
+        String drType = map.get("drType");
+        //渠道订单号
+        String channelOrderNo = map.get("transactionId");
+        //支付成功
+        if(SxfConfg.SXF_SUCCESS_CODE.equals(bizCode)){
+            //退款通知
+            Date payDate = new Date();
+            try {
+                payDate = new SimpleDateFormat("yyyyMMddHHmmss").parse(payTime);
+            } catch (ParseException e) {
+                log.info("====================>【随行付】回调时间格式化异常，待转换的时间格式:{}<====================",payTime);
+            }
+            if(StringUtil.isNotEmpty(origOrdNo) && StringUtil.isNotEmpty(origUuid)){
+                log.info("====================>【随行付】退款成功回调，我方原订单号：{}，随行付原订单号：{}<====================",origOrdNo,origUuid);
+                QueryWrapper<MerchantRefundOrder> queryWrapper = new QueryWrapper<MerchantRefundOrder>().eq("orderNumber",origOrdNo).eq("channelNo",origUuid);
+                queryWrapper.eq("status","2");
+                MerchantRefundOrder refundOrder = merchantRefundOrderService.getOne(queryWrapper);
+                if(refundOrder == null){
+                    log.error("====================>【随行付】退款成功回调，我方原订单号：{}，随行付原订单号：{}，查询出的退款订单为空！<====================",origOrdNo,origUuid);
+                }else{
+                    refundOrder.setRefundTime(payDate);
+                    refundOrder.setStatus("1");
+                    refundOrder.setFailMsg(map.get("bizMsg"));
+                    executorService.execute(() -> merchantRefundOrderService.updateOrderAndSendNotify(refundOrder));
+                }
+            }else{
+                QueryWrapper<MerchantOrder> queryWrapper = new QueryWrapper<MerchantOrder>().eq("orderNumber",ordNo);
+                MerchantOrder order = merchantOrderService.getOne(queryWrapper);
+                if(order == null){
+                    log.error("====================>【随行付】支付成功回调订单号查询，查询的订单为空：订单号：{}<====================",ordNo);
+                    result.put("code","success");
+                    result.put("msg","成功");
+                    return result;
+                }
+                order.setTransNo(uuid);
+                order.setTransDt(payDate);
+                order.setStatus("1");
+                order.setDrType(drType);
+                order.setThirdTransNo(channelOrderNo);
+                if(StringUtil.isEmpty(order.getMercUserId())){
+                    order.setMercUserId(buyerId);
+                }
+                executorService.execute(() -> merchantOrderService.updateOrderAndCreateProfit(order));
+            }
+        }
+        result.put("code","success");
+        result.put("msg","成功");
+        return result;
+    }
+
+    /**
+     * @description:校验签名
+     * @date: 2021/8/23 10:00
+     * @return java.lang.Boolean
+     */
+    private Boolean checkSign(Map<String,String> map) {
+        String sign = map.get("sign");
+        map.remove("sign");
+        JSONObject params = JSONObject.parseObject(JSONObject.toJSONString(map));
+        String signContent = SignUtils.getSignContent(params);
+        boolean flag = false;
+        try {
+            flag = RSAUtils.checkSign(SxfConfg.PUBLIC_KEY,signContent,sign);
+        } catch (Exception e) {
+            log.info("=========================>【随行付】校验签名异常，异常信息:{}<=====================",e.getMessage());
+            e.printStackTrace();
+        }
+        return flag;
+    }
+
+    @Override
+    public String tradePayWap(MerchantOrder order, MerchantChannelStatus channel) {
+        return null;
+    }
+
+    @Override
+    public JSONObject getUnionAccountUrl(JSONObject reqData) {
+        return null;
+    }
+
+    @Override
+    public JSONObject jftPay(JftReceiptOrder order, JftMercBaseInfo jftMerc, JftMercPaymentChannel jftChannel) {
+        return null;
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/sys/QueueDataService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/sys/QueueDataService.java
new file mode 100644
index 0000000..565d320
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/sys/QueueDataService.java
@@ -0,0 +1,17 @@
+package cn.pluss.platform.sys;
+
+import cn.pluss.platform.entity.QueueData;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-04-20
+ */
+public interface QueueDataService extends IService<QueueData> {
+
+    Integer newQueueData(String id);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/sys/impl/QueueDataServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/sys/impl/QueueDataServiceImpl.java
new file mode 100644
index 0000000..81eaaa2
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/sys/impl/QueueDataServiceImpl.java
@@ -0,0 +1,43 @@
+package cn.pluss.platform.sys.impl;
+
+import cn.pluss.platform.entity.QueueData;
+import cn.pluss.platform.mapper.QueueDataMapper;
+import cn.pluss.platform.sys.QueueDataService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-04-20
+ */
+@Service
+public class QueueDataServiceImpl extends ServiceImpl<QueueDataMapper, QueueData> implements QueueDataService {
+
+    /**
+     * 无事务执行
+     * @param id
+     * @return
+     */
+    @Override
+    @Transactional(propagation = Propagation.NOT_SUPPORTED)
+    public Integer newQueueData(String id) {
+        QueueData entity = new QueueData();
+        entity.setId(id);
+
+        int count;
+        try {
+            count = baseMapper.insert(entity);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return -1;
+        }
+
+        return count;
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/systemConfig/SysSqlService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/systemConfig/SysSqlService.java
new file mode 100644
index 0000000..30aa149
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/systemConfig/SysSqlService.java
@@ -0,0 +1,10 @@
+package cn.pluss.platform.systemConfig;
+
+import cn.pluss.platform.entity.SysSql;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @author SSS
+ */
+public interface SysSqlService extends IService<SysSql> {
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/systemConfig/SystemConfigService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/systemConfig/SystemConfigService.java
new file mode 100644
index 0000000..b726d77
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/systemConfig/SystemConfigService.java
@@ -0,0 +1,49 @@
+package cn.pluss.platform.systemConfig;
+
+import java.util.List;
+import java.util.Map;
+
+import cn.pluss.platform.entity.SystemConfig;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+public interface SystemConfigService extends IService<SystemConfig> {
+
+    SystemConfig querySystemConfig(SystemConfig systemConfig);
+
+    List<SystemConfig> querySystemConfigList(SystemConfig systemConfig);
+
+    void saveSystemConfig(SystemConfig systemConfig);
+
+    void updateSystemConfig(SystemConfig systemConfig);
+
+    void deleteSystemConfig(SystemConfig systemConfig);
+
+    List<SystemConfig> querySystemConfigPage(Map map);
+
+    Integer querySystemConfigPageCount(Map map);
+
+    void saveSystemConfigBatch(List<SystemConfig> systemConfigList);
+
+    String querySystemConfigValue(String string);
+
+    /**
+     * getdoMain:(获取域名). <br/>
+     *
+     * @return
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    String getdoMain();
+
+    /**
+     * getaisleSwitch:(获取当前支付通道). <br/>
+     *
+     * @return
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    String getaisleSwitch();
+
+
+    Object updateSystemVersion(int platformCode);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/systemConfig/impl/SysSqlServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/systemConfig/impl/SysSqlServiceImpl.java
new file mode 100644
index 0000000..04fb711
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/systemConfig/impl/SysSqlServiceImpl.java
@@ -0,0 +1,14 @@
+package cn.pluss.platform.systemConfig.impl;
+
+import cn.pluss.platform.entity.SysSql;
+import cn.pluss.platform.mapper.SysSqlMapper;
+import cn.pluss.platform.systemConfig.SysSqlService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author SSS
+ */
+@Service("sysSqlService")
+public class SysSqlServiceImpl extends ServiceImpl<SysSqlMapper, SysSql> implements SysSqlService {
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/systemConfig/impl/SystemConfigServiceImp.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/systemConfig/impl/SystemConfigServiceImp.java
new file mode 100644
index 0000000..4cd3c1a
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/systemConfig/impl/SystemConfigServiceImp.java
@@ -0,0 +1,155 @@
+package cn.pluss.platform.systemConfig.impl;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.entity.AppVersionInfo;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.AppVersionInfoMapper;
+import cn.pluss.platform.util.ParametersUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import cn.pluss.platform.entity.SystemConfig;
+import cn.pluss.platform.mapper.SystemConfigMapper;
+import cn.pluss.platform.systemConfig.SystemConfigService;
+
+@Transactional
+@RequiredArgsConstructor
+@Service("systemConfigService")
+public class SystemConfigServiceImp extends ServiceImpl<SystemConfigMapper, SystemConfig> implements SystemConfigService {
+
+    private final SystemConfigMapper systemConfigMapper;
+
+    private final AppVersionInfoMapper appVersionInfoMapper;
+
+    @Override
+    public SystemConfig querySystemConfig(SystemConfig systemConfig) {
+        return systemConfigMapper.querySystemConfig(systemConfig);
+    }
+
+    @Override
+    public List<SystemConfig> querySystemConfigList(SystemConfig systemConfig) {
+        return systemConfigMapper.querySystemConfigList(systemConfig);
+    }
+
+    @Override
+    public void saveSystemConfig(SystemConfig systemConfig) {
+
+        systemConfigMapper.saveSystemConfig(systemConfig);
+    }
+
+    @Override
+    public void updateSystemConfig(SystemConfig systemConfig) {
+
+        systemConfigMapper.updateSystemConfig(systemConfig);
+    }
+
+    @Override
+    public void deleteSystemConfig(SystemConfig systemConfig) {
+
+        systemConfigMapper.deleteSystemConfig(systemConfig);
+    }
+
+    @Override
+    public List<SystemConfig> querySystemConfigPage(Map map) {
+
+        return systemConfigMapper.querySystemConfigPage(map);
+    }
+
+    @Override
+    public Integer querySystemConfigPageCount(Map map) {
+
+        return systemConfigMapper.querySystemConfigPageCount(map);
+    }
+
+    @Override
+    public void saveSystemConfigBatch(List<SystemConfig> systemConfigList) {
+
+        systemConfigMapper.saveSystemConfigBatch(systemConfigList);
+    }
+
+    @Override
+    public String querySystemConfigValue(String key) {
+        SystemConfig systemConfig = new SystemConfig();
+        systemConfig.setPropertyKey(key);
+        systemConfig = systemConfigMapper.querySystemConfig(systemConfig);
+        if (systemConfig == null) {
+            return null;
+        }
+
+        return systemConfig.getPropertyValue();
+    }
+
+    @Override
+    public String getdoMain() {
+        String domain = "";
+        Properties prop = System.getProperties();
+        String os = prop.getProperty("os.name");
+        if (os.startsWith("win") || os.startsWith("Win")) {
+            //windows目录
+            domain = "http://192.168.0.187:8084";
+        } else {
+            domain = querySystemConfigValue("domain");
+        }
+        return domain;
+    }
+
+    @Override
+    public String getaisleSwitch() {
+        SystemConfig systemConfig = new SystemConfig();
+        systemConfig.setPropertyKey("aisleSwitch");
+        systemConfig = systemConfigMapper.querySystemConfig(systemConfig);
+        return systemConfig.getPropertyValue();
+    }
+
+    @Override
+    public Object updateSystemVersion(int platformCode) {
+        if (platformCode == -1) {
+            // 老版本安卓更新
+            QueryWrapper<AppVersionInfo> queryWrapper = new QueryWrapper<AppVersionInfo>()
+                    .eq("platformCode", 0)
+                    .orderByDesc("versionCode")
+                    .last("limit 1");
+
+            SystemConfig systemConfig2 = new SystemConfig();
+            systemConfig2.setPropertyKey("versions");
+            systemConfig2 = querySystemConfig(systemConfig2);
+
+            Map<String, Object> result = new HashMap<>(16);
+            List<AppVersionInfo> appVersionInfoList = appVersionInfoMapper.selectList(queryWrapper);
+            if (appVersionInfoList != null && appVersionInfoList.size() > 0) {
+                AppVersionInfo appVersionInfo = appVersionInfoList.get(0);
+                result.put("apk_dowload_url", appVersionInfo.getUrl());
+            } else {
+                result.put("apk_dowload_url", ParametersUtil.apk_dowload_url);
+            }
+
+            result.put("versions", systemConfig2.getPropertyValue());
+            result.put("propertyIndex", systemConfig2.getPropertyIndex());
+            return result;
+        }
+
+        QueryWrapper<AppVersionInfo> queryWrapper = new QueryWrapper<AppVersionInfo>()
+                .eq("platformCode", platformCode)
+                .orderByDesc("versionCode")
+                .last("limit 1");
+
+        List<AppVersionInfo> appVersionInfoList = appVersionInfoMapper.selectList(queryWrapper);
+        if (appVersionInfoList == null || appVersionInfoList.size() == 0) {
+            throw new MsgException("无法获取版本信息");
+        }
+
+        return appVersionInfoList.get(0);
+    }
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/systemInfo/SystemInfoService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/systemInfo/SystemInfoService.java
new file mode 100644
index 0000000..aa8aba6
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/systemInfo/SystemInfoService.java
@@ -0,0 +1,29 @@
+package cn.pluss.platform.systemInfo;
+
+import java.util.List;
+import java.util.Map;
+import cn.pluss.platform.entity.SystemInfo;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+public interface SystemInfoService extends IService<SystemInfo> {
+
+    public SystemInfo querySystemInfo(SystemInfo systemInfo);
+
+    public List<SystemInfo> querySystemInfoList(SystemInfo systemInfo);
+
+    public void saveSystemInfo(SystemInfo systemInfo);
+
+    public void updateSystemInfo(SystemInfo systemInfo);
+
+    public void deleteSystemInfo(SystemInfo systemInfo);
+
+    public List<SystemInfo> querySystemInfoPage(Map map);
+
+    public Integer querySystemInfoPageCount(Map map);
+
+    public void saveSystemInfoBatch(List<SystemInfo> systemInfoList);
+
+    Page<SystemInfo> PageData(Page<SystemInfo> page, SystemInfo systemInfo);
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/systemInfo/impl/SystemInfoServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/systemInfo/impl/SystemInfoServiceImpl.java
new file mode 100644
index 0000000..c76c3b1
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/systemInfo/impl/SystemInfoServiceImpl.java
@@ -0,0 +1,60 @@
+package cn.pluss.platform.systemInfo.impl;
+
+import java.util.List;
+import java.util.Map;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import cn.pluss.platform.entity.SystemInfo;
+import cn.pluss.platform.systemInfo.SystemInfoService;
+import cn.pluss.platform.mapper.SystemInfoMapper;
+
+@Transactional
+@Service("systemInfoService")
+public class SystemInfoServiceImpl extends ServiceImpl<SystemInfoMapper,SystemInfo> implements SystemInfoService{
+
+    @Override
+    public SystemInfo querySystemInfo(SystemInfo systemInfo){
+        return baseMapper.querySystemInfo(systemInfo);
+    }
+
+    @Override
+    public List<SystemInfo> querySystemInfoList(SystemInfo systemInfo){
+        return baseMapper.querySystemInfoList(systemInfo);
+    }
+    @Override
+    public void saveSystemInfo(SystemInfo systemInfo){
+        baseMapper.saveSystemInfo(systemInfo);
+    }
+    @Override
+    public void updateSystemInfo(SystemInfo systemInfo){
+        baseMapper.updateSystemInfo(systemInfo);
+    }
+    @Override
+    public void deleteSystemInfo(SystemInfo systemInfo){
+        baseMapper.deleteSystemInfo(systemInfo);
+    }
+    @Override
+    public List<SystemInfo> querySystemInfoPage(Map map){
+        return baseMapper.querySystemInfoPage(map);
+    }
+    @Override
+    public Integer querySystemInfoPageCount(Map map){
+        return baseMapper.querySystemInfoPageCount(map);
+    }
+    @Override
+    public void saveSystemInfoBatch(List<SystemInfo> systemInfoList) {
+        baseMapper.saveSystemInfoBatch(systemInfoList);
+    }
+
+    @Override
+    public Page<SystemInfo> PageData(Page<SystemInfo> page, SystemInfo systemInfo) {
+        return baseMapper.PageData(page,systemInfo);
+    }
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/task/BaseMerAuditHandler.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/task/BaseMerAuditHandler.java
new file mode 100644
index 0000000..9e0087f
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/task/BaseMerAuditHandler.java
@@ -0,0 +1,153 @@
+package cn.pluss.platform.task;
+
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.mapper.MerchantImageMapper;
+import cn.pluss.platform.mapper.MerchantStoreMapper;
+import cn.pluss.platform.mapper.UserAppMapper;
+import cn.pluss.platform.mapper.UserInfoMapper;
+import cn.pluss.platform.merchant.MerchantCashPlaceService;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.util.IpUtils;
+import cn.pluss.platform.util.LogExceptionUtils;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.web.client.RestTemplate;
+
+import javax.annotation.Resource;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.Map;
+
+/**
+ * @author djh
+ */
+@Slf4j
+public abstract class BaseMerAuditHandler<T extends IMerAuditHandler> implements IMerAuditHandler {
+
+    @Autowired
+    @Lazy
+    protected T self;
+
+    @Autowired
+    protected RestTemplate restTemplate;
+
+    @Autowired
+    protected MerchantBaseInfoService merchantBaseInfoService;
+
+    @Autowired
+    protected MerchantCashPlaceService cashPlaceService;
+
+    @Resource
+    protected UserAppMapper userAppMapper;
+
+    @Resource
+    protected UserInfoMapper userInfoMapper;
+
+    @Resource
+    protected MerchantStoreMapper merchantStoreMapper;
+
+    @Resource
+    protected MerchantImageMapper merchantImageMapper;
+
+    @Autowired
+    @Lazy
+    protected MerchantChannelStatusService mcsService;
+
+    @Override
+    @Async
+    public void auditHandler(JSONObject auditResult) {
+        execute(auditResult);
+
+        try {
+            self.afterAudit(auditResult);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void execute(JSONObject auditResult) {
+        // 进件结果处理
+        MerchantChannelStatus mcs = self.auditCallback(auditResult);
+
+        if (mcs == null) {
+            return;
+        }
+
+        mcs = mcsService.getById(mcs.getId());
+
+        if (!mcs.getStatus().equals(MerchantChannelStatus.AUDIT_STATUS_SUCCESS)) {
+            return;
+        }
+
+        // 以下代码为进件结果处理后的操作
+        // 创建线上店铺
+        try {
+            log.info("===================>进件回调，创建店铺开始,商户编号mno为:{}<=====================", auditResult.getString("mno"));
+            self.createStore(mcs);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.info("创建店铺信息异常,异常信息:{}", e.getMessage());
+        }
+
+        try {
+            MerchantBaseInfo merchantBaseInfo = merchantBaseInfoService.getMerchantBaseInfoByMerchantCode(mcs.getMerchantCode());
+            if (StringUtils.isNotBlank(merchantBaseInfo.getUserId())) {
+                cashPlaceService.createDefaultCashPlace(Long.parseLong(merchantBaseInfo.getUserId()));
+            }
+        } catch (Exception e) {
+            LogExceptionUtils.printStack(log, e, "创建默认收银点失败,异常信息:{}");
+        }
+    }
+
+    @Override
+    public void createStore(MerchantChannelStatus merchantChannelStatus) {
+//        if (!"4".equals(merchantChannelStatus.getStatus()) && !"3".equals(merchantChannelStatus.getStatus())) {
+//            return;
+//        }
+        UserApp userApp = userAppMapper.selectByMerchantCode(merchantChannelStatus.getMerchantCode());
+        UserInfo userInfo = userInfoMapper.selectById(userApp.getUserId());
+        log.info("==============>当前需要同步的用户进件数据为：:{}<===================", JSONObject.toJSONString(merchantChannelStatus));
+        if (userInfo != null) {
+            MerchantStore merchantStore = new MerchantStore().setMerchantCode(merchantChannelStatus.getMerchantCode());
+            merchantStore = merchantStoreMapper.selectOne(new QueryWrapper<>(merchantStore));
+            MerchantBaseInfo merchantBaseInfo = merchantBaseInfoService.getMerchantBaseInfoByMerchantCode(merchantChannelStatus.getMerchantCode());
+            QueryWrapper<MerchantImage> queryWrapper = new QueryWrapper<MerchantImage>()
+                    .eq("merchantCode", merchantChannelStatus.getMerchantCode()).eq("photoType", "06");
+            MerchantImage merchantImage = merchantImageMapper.selectOne(queryWrapper);
+            String baseUrl = "https://shop.shouyinbei.net/web/wmerchant.php?c=site&a=entry&ctrl=store&ac=oauth&op=add_merchan&do=web&m=we7_wmall&i=1";
+            StringBuffer sb = new StringBuffer(baseUrl);
+            sb.append("&title=").append(merchantBaseInfo.getAlias());
+            sb.append("&password=").append(userInfo.getPassword().toLowerCase());
+            sb.append("&mobile=").append(userInfo.getLoginName());
+            sb.append("&syb_m_id=").append(merchantStore.getId());
+            sb.append("&addressNo=").append(merchantBaseInfo.getAddressNo());
+            String address = merchantBaseInfo.getProvince() + merchantBaseInfo.getCity() + merchantBaseInfo.getDistrict() + merchantBaseInfo.getAddress();
+            String area = merchantBaseInfo.getProvince() +"-"+ merchantBaseInfo.getCity() +"-"+ merchantBaseInfo.getDistrict();
+            try {
+                String decodeAddress = URLEncoder.encode(address, "UTF-8");
+                sb.append("&address=").append(decodeAddress);
+                String decodeArea = URLEncoder.encode(area, "UTF-8");
+                sb.append("&area=").append(decodeArea);
+                String logo = URLEncoder.encode(merchantImage.getPicUrl(), "GBK");
+                sb.append("&logo=").append(logo);
+            } catch (UnsupportedEncodingException e) {
+                e.printStackTrace();
+                log.error("=============>请求生成店铺logo门头照转码异常,异常信息:{}<===============", e.getMessage());
+            }
+            Map<String, String> lnxMap = IpUtils.getLocationByAddress(address);
+            if (lnxMap != null) {
+                sb.append("&location_x=").append(lnxMap.get("x"));
+                sb.append("&location_y=").append(lnxMap.get("y"));
+            }
+            // 请求生成店铺j
+            String result = restTemplate.getForObject(sb.toString(), String.class);
+            log.info("=============>请求生成店铺URL：{}，请求响应返回的参数为:{}<===============", sb.toString(), result);
+        }
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/task/BillStatisticsHandler.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/task/BillStatisticsHandler.java
new file mode 100644
index 0000000..bf4e333
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/task/BillStatisticsHandler.java
@@ -0,0 +1,47 @@
+package cn.pluss.platform.task;
+
+import cn.pluss.platform.bill.BillSendRecordService;
+import cn.pluss.platform.entity.BillSendRecord;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author nb2020
+ */
+@Slf4j
+@Component
+public class BillStatisticsHandler {
+
+    @Setter(onMethod_ = {@Lazy, @Autowired})
+    public BillSendRecordService billSendRecordService;
+
+    @Async
+    public void execute(BillSendRecord entity) {
+        if (entity == null) {
+            return;
+        }
+
+        if ("1".equals(entity.getStatus())) {
+            log.info("账单已处理，无须再操作");
+            return;
+        }
+        XSSFWorkbook workbook = billSendRecordService.createBill(entity);
+
+        try {
+            billSendRecordService.sendBill(entity, workbook);
+            entity.setStatus("1");
+            billSendRecordService.updateById(entity);
+        } catch (Exception e) {
+            log.error("账单生成失败");
+            e.printStackTrace();
+            entity.setStatus("2");
+            billSendRecordService.updateById(entity);
+        }
+
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/task/IJftMercAuditHandler.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/task/IJftMercAuditHandler.java
new file mode 100644
index 0000000..a6202ce
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/task/IJftMercAuditHandler.java
@@ -0,0 +1,17 @@
+package cn.pluss.platform.task;
+
+import cn.pluss.platform.entity.JftMercPaymentChannel;
+import com.alibaba.fastjson.JSONObject;
+
+/**
+ * @author DJH
+ */
+public interface IJftMercAuditHandler {
+
+    /**
+     * 进件状态处理
+     * @param auditResult 回调数据
+     * @return
+     */
+    void auditCallback(JSONObject auditResult);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/task/IMerAuditHandler.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/task/IMerAuditHandler.java
new file mode 100644
index 0000000..55efeaa
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/task/IMerAuditHandler.java
@@ -0,0 +1,28 @@
+package cn.pluss.platform.task;
+
+import cn.pluss.platform.entity.MerchantChannelStatus;
+import com.alibaba.fastjson.JSONObject;
+
+/**
+ * @author djh
+ * 代码规划还是略显混乱
+ */
+public interface IMerAuditHandler {
+
+    /**
+     * 回调请求结果异步处理
+     * @param auditResult 回调数据
+     */
+    void auditHandler(JSONObject auditResult);
+
+    /**
+     * 进件状态处理
+     * @param auditResult 回调数据
+     * @return
+     */
+    MerchantChannelStatus auditCallback(JSONObject auditResult);
+
+    void createStore(MerchantChannelStatus merchantChannelStatus);
+
+    void afterAudit(JSONObject auditResult);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/task/MercIncomSetRateHandler.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/task/MercIncomSetRateHandler.java
new file mode 100644
index 0000000..99fe27b
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/task/MercIncomSetRateHandler.java
@@ -0,0 +1,162 @@
+package cn.pluss.platform.task;
+
+
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.enums.UserRoleEnum;
+import cn.pluss.platform.mapper.InviteRateMapper;
+import cn.pluss.platform.mapper.UserAppMapper;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.officialActivity.OfficialActivityService;
+import cn.pluss.platform.userInfo.UserInfoService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class MercIncomSetRateHandler {
+
+
+    private final UserAppMapper userAppMapper;
+
+    private final InviteRateMapper inviteRateMapper;
+
+    @Setter(onMethod_ = {@Lazy, @Autowired})
+    private MerchantBaseInfoService merchantBaseInfoService;
+
+    @Setter(onMethod_ = {@Lazy, @Autowired})
+    private UserInfoService userInfoService;
+
+    private final OfficialActivityService officialActivityService;
+
+    @Transactional(rollbackFor = Exception.class, propagation = Propagation.NESTED)
+    public void installSuperMerchantRate(UserApp userApp){
+        log.info("==============>统计当前进件商户上级要求人数是否达标，开始,进件商户:{}<=================",userApp);
+         QueryWrapper<UserApp> queryWrapper = new QueryWrapper<UserApp>().eq("userId",userApp.getParentId());
+         UserApp parentApp = null;
+         try {
+             parentApp = userAppMapper.selectOne(queryWrapper);
+         }catch (RuntimeException e){
+             e.printStackTrace();
+         }
+         if(parentApp == null){
+             log.info("==============当前进件商户的上级用户信息为空！<=================");
+             return;
+         }
+         if(!"promoter".equals(parentApp.getUserType())){
+             log.info("==============当前进件商户的上级不为服务商！<=================");
+             return;
+         }
+        if(UserRoleEnum.ZY_BST.getCode().equals(parentApp.getRoleCode())){
+            log.info("==============直营团队用户暂不支持该活动！<=================");
+            return;
+        }
+         QueryWrapper<InviteRate> queryRate = new QueryWrapper<InviteRate>().eq("type","merchant").orderByAsc("number");
+         List<InviteRate> inviteRateList = inviteRateMapper.selectList(queryRate);
+         if(inviteRateList.isEmpty()){
+             log.info("==============未获取到邀请好友费率阶梯设置表记录<=================");
+             return;
+         }
+         InviteRate rate = inviteRateList.get(0);
+         OfficialActivity act = officialActivityService.getById(rate.getActId());
+         if(act == null){
+             log.info("==============未获取到当前活动信息<=================");
+             return;
+         }
+         if(!"2".equalsIgnoreCase(act.getStatus())){
+             log.info("==============活动已过期或还未开始！<=================");
+             return;
+         }
+         Page<MerchantBaseInfo> merchantPage = new Page<MerchantBaseInfo>();
+         merchantPage.setCurrent(1);
+         merchantPage.setSize(10);
+         parentApp.setStartDate(act.getStartTime());
+         parentApp.setEndDate(act.getEndTime());
+         merchantPage = merchantBaseInfoService.pageJoinData(merchantPage,parentApp);
+         long total = merchantPage.getTotal();
+         try {
+             log.info("==============当前进件商户上级拥有推广商户总数为:{},阶梯费率修改所需要的进件商户数量为：{}<=================",total,rate.getNumber());
+             if(total < rate.getNumber()){
+                 log.info("==============当前进件商户上级商户邀请人数为:{},不满足设置的人数:{},无需修改费率<=================",total,rate.getNumber());
+                 return;
+             }else if(total >= rate.getNumber()){
+                 log.info("==============当前商户进件上级满足第一梯队，上级推广商户数量为：{}，费率阶梯第一梯队需要进件商户数量为：{}<=================",total,rate.getNumber());
+                 InviteRate nextRate = inviteRateList.get(1);
+                 if(total < nextRate.getNumber()){
+                     log.info("==============当前商户进件上级满足第一梯队不满足第二梯队，上级推广商户数量为：{}，费率阶梯第二梯队需要进件商户数量为：{}<=================",total,nextRate.getNumber());
+                     userInfoService.changeRate(parentApp.getUserId()+"",rate.getRate().multiply(new BigDecimal(100)).intValue());
+                 }else if(total >= nextRate.getNumber()){
+                     log.info("==============当前商户进件上级满足第一梯队,满足第二梯队，上级推广商户数量为：{}，费率阶梯第二梯队需要进件商户数量为：{}<=================",total,nextRate.getNumber());
+                     userInfoService.changeRate(parentApp.getUserId()+"",nextRate.getRate().multiply(new BigDecimal(100)).intValue());
+                 }
+             }else{
+                 log.info("============>未知判断，当前商户上级拥有商户总数为:{},费率阶梯需要商户进件的数量为：{}====================",total,rate.getNumber());
+             }
+         }catch (RuntimeException e){
+             e.printStackTrace();
+             log.info("修改费率异常，异常：{}",e.getMessage());
+         }
+    }
+
+    /**
+     * 修改商户费率
+     * @param userApp
+     * @param rate
+     */
+//    public void setUpMerchantRate(UserApp userApp, BigDecimal rate,Date startTime,Date endTime) {
+//        log.info("设置商户:{}，费率为:{}===============>",userApp,rate);
+//        MerchantRateRecord rateRecord = new MerchantRateRecord();
+//        QueryWrapper<MerchantRate> queryWrapper = new QueryWrapper<MerchantRate>().eq("userId",userApp.getUserId());
+//        List<MerchantRate> merchantRateList = merchantRateMapper.selectList(queryWrapper);
+//        Integer rateValue = rate.multiply(new BigDecimal("100")).intValue();
+//        rateRecord.setRate(rateValue);
+//        rateRecord.setUserId(String.valueOf(userApp.getUserId()));
+//        rateRecord.setCreateTime(new Date());
+//        if(merchantRateList.isEmpty()){
+//            // 该商户没有设置过费率
+//            userInfoService.changeRate(String.valueOf(userApp.getUserId()),
+//                    rateValue);
+////            sxfChangeRateService.process(String.valueOf(userApp.getUserId()),rateValue,null);
+//            MerchantRate merchantRate = new MerchantRate();
+//            merchantRate.setUserId(String.valueOf(userApp.getUserId()));
+//            merchantRate.setRate(rateValue);
+//            merchantRate.setPreviousRate(38);
+//            merchantRate.setStartTime(startTime);
+//            merchantRate.setEndTime(endTime);
+//            merchantRate.setIsFixedRate("0");
+//            merchantRateMapper.insert(merchantRate);
+//            rateRecord.setRate(rateValue);
+//            merchantRateRecordMapper.insert(rateRecord);
+//            log.info("设置商户:{}费率，费率为:{},设置成功！===============>",userApp,rate);
+//        }else{
+//            MerchantRate merchantRate = merchantRateList.get(0);
+//            if(merchantRate.getRate() > rateValue){
+//                userInfoService.changeRate(String.valueOf(userApp.getUserId()),
+//                        rateValue);
+//                merchantRate.setPreviousRate(merchantRate.getRate());
+//                merchantRate.setRate(rateValue);
+//                merchantRate.setUpdateTime(new Date());
+//                merchantRate.setIsFixedRate("0");
+//                merchantRate.setStartTime(startTime);
+//                merchantRate.setEndTime(endTime);
+//                merchantRateMapper.updateById(merchantRate);
+//                merchantRateRecordMapper.insert(rateRecord);
+//                log.info("设置商户:{}费率，原始费率:{},更新后的费率为:{},设置成功！===============>",userApp,merchantRate.getRate(),rateValue);
+//            }else{
+//                log.info("设置商户:{}费率，商户原始费率:{},需更新的费率:{},当前商户费率低于需要更新的费率,无需更新===============>",userApp,merchantRate.getRate(),rateValue);
+//            }
+//        }
+//        log.info("设置商户费率结束");
+//    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/task/RyxMerAuditHandler.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/task/RyxMerAuditHandler.java
new file mode 100644
index 0000000..44a84a2
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/task/RyxMerAuditHandler.java
@@ -0,0 +1,311 @@
+package cn.pluss.platform.task;
+
+import cn.pluss.platform.MerchantAuditRecordService;
+import cn.pluss.platform.dto.AccountDTO;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.mapper.*;
+import cn.pluss.platform.merchant.AccountService;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchant.MerchantCashPlaceService;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.notice.NoticeService;
+import cn.pluss.platform.ryx.RyxService;
+import cn.pluss.platform.subMerchant.SubMerchantService;
+import cn.pluss.platform.user.impl.GeneralPushUtil;
+import cn.pluss.platform.util.IpUtils;
+import cn.pluss.platform.util.LogExceptionUtils;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.dao.DuplicateKeyException;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.client.RestTemplate;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.Collections;
+import java.util.Map;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class RyxMerAuditHandler {
+
+    private final RestTemplate restTemplate;
+    private final UserAppMapper userAppMapper;
+    private final UserInfoMapper userInfoMapper;
+    private final MerchantStoreMapper merchantStoreMapper;
+    private final MerchantImageMapper merchantImageMapper;
+    @Setter(onMethod_ = {@Lazy, @Autowired})
+    private MerchantChannelStatusMapper mcsMapper;
+    @Setter(onMethod_ = {@Lazy, @Autowired})
+    private MerchantBaseInfoService merchantBaseInfoService;
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantAuditRecordService merchantAuditRecordService;
+    @Setter(onMethod_ = {@Autowired})
+    private RyxService ryxService;
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantChannelStatusService channelStatusService;
+//    @Setter(onMethod_ = {@Autowired})
+//    private PluginService ryxSfbPluginService;
+
+    @Autowired
+    private NoticeService noticeService;
+
+    private final MerchantCashPlaceService cashPlaceService;
+
+    @Autowired
+    @Lazy
+    private SxfMerAuditHandler sxfMerAuditHandler;
+
+    @Autowired
+    private MercIncomSetRateHandler mercIncomSetRateHandler;
+
+    @Autowired
+    @Lazy
+    private RyxMerAuditHandler self;
+
+    @Autowired
+    private AccountService accountService;
+
+    @Autowired
+    private SubMerchantService subMerchantService;
+
+    @Autowired
+    private GeneralPushUtil generalPushUtil;
+
+
+    @Async
+    public void auditHandler(JSONObject auditResult) {
+        log.info("进件回调数据：{}", auditResult.toJSONString());
+
+        execute(auditResult);
+
+        // 商户插件进件处理
+//        ryxSfbPluginService.auditCallback(auditResult);
+    }
+
+    private void execute(JSONObject auditResult) {
+        // 进件结果处理
+        MerchantChannelStatus mcs = self.auditCallback(auditResult);
+        if (mcs == null) {
+            return;
+        }
+
+        // 以下代码为进件结果处理后的操作
+        // 创建线上店铺
+        try {
+            log.info("===================>进件回调，创建店铺开始,商户编号memo为:{}<=====================", auditResult.getString("memo"));
+            self.createStore(mcs);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.info("创建店铺信息异常,异常信息:{}", e.getMessage());
+        }
+
+        try {
+            MerchantBaseInfo merchantBaseInfo = merchantBaseInfoService.getMerchantBaseInfoByMerchantCode(mcs.getMerchantCode());
+            if (StringUtils.isNotBlank(merchantBaseInfo.getUserId())) {
+                cashPlaceService.createDefaultCashPlace(Long.parseLong(merchantBaseInfo.getUserId()));
+            }
+        } catch (Exception e) {
+            LogExceptionUtils.printStack(log, e, "创建默认收银点失败,异常信息:{}");
+        }
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public MerchantChannelStatus auditCallback(JSONObject auditResult) {
+        String applicationId = auditResult.getString("orderId").replace("-", "");
+
+        MerchantChannelStatus mcs = new MerchantChannelStatus()
+                .setChannel(3)
+                .setApplicationId(applicationId);
+        mcs = mcsMapper.selectOne(new QueryWrapper<>(mcs));
+        if (mcs == null) {
+            // 如果不是商户进件，即为插件进件
+            return null;
+        }
+
+        String currentThirdStatus = mcs.getThirdStatus();
+
+        if (MerchantChannelStatus.AUDIT_STATUS_SUCCESS.equals(mcs.getStatus())) {
+            // 已经进件通过, 不再处理后续
+            return mcs;
+        }
+
+        String taskStatus = auditResult.getString("status");
+        String remark = auditResult.getString("memo");
+
+        mcs.setThirdStatus(taskStatus);
+
+        UserApp userApp = userAppMapper.selectByMerchantCode(mcs.getMerchantCode());
+        // 暂时只处理成功和失败的状态
+
+        if ("3".equals(taskStatus)) {
+            String onlMerId = auditResult.getString("onlMerId");
+            // 进件成功
+            if (auditResult.getString("wxMerId") != null) {
+                try {
+                    // 保存微信子商户信息
+                    SubMerchant subMerchant = new SubMerchant();
+                    subMerchant.setMerchantId(onlMerId);
+                    subMerchant.setSubMchType("WX");
+                    subMerchant.setStatus(auditResult.getString("wxStatus"));
+                    subMerchant.setChannelTypeId("3");
+                    subMerchant.setRemark(auditResult.getString("wxResult"));
+                    subMerchant.setSubMchId(auditResult.getString("wxMerId"));
+                    subMerchantService.save(subMerchant);
+                } catch (DuplicateKeyException e) {
+                    log.warn("相同的微信子商户号, 不需要重复保存");
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    log.warn("保存微信子商户号错误");
+                }
+            }
+
+            if (auditResult.getString("zfbMerId") != null) {
+                try {
+                    // 保存支付宝子商户信息
+                    SubMerchant subMerchant = new SubMerchant();
+                    subMerchant.setMerchantId(onlMerId);
+                    subMerchant.setSubMchType("ZFB");
+                    subMerchant.setStatus(auditResult.getString("zfbStatus"));
+                    subMerchant.setChannelTypeId("3");
+                    subMerchant.setRemark(auditResult.getString("zfbResult"));
+                    subMerchant.setSubMchId(auditResult.getString("zfbMerId"));
+                    subMerchantService.save(subMerchant);
+                } catch (DuplicateKeyException e) {
+                    log.warn("相同的支付宝子商户号, 不需要重复保存");
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    log.warn("保存支付宝子商户号错误");
+                }
+            }
+
+            mcs.setStatus("3");
+            mcs.setCallbackStatus("1");
+            mcs.setMerchantId(onlMerId);
+            mcs.setExtra(auditResult);
+            mcs.setRemark("通过");
+            channelStatusService.updateById(mcs);
+            sxfMerAuditHandler.sendNotice(userApp, "收银呗审核通知", "商家审核通过", applicationId + "_" + System.currentTimeMillis());
+
+            //TODO 统计当前进件商户的上级商户是否满足费率要求
+            try {
+                mercIncomSetRateHandler.installSuperMerchantRate(userApp);
+            } catch (Exception e) {
+                log.info("设置进件商户上级商户费率异常，异常信息:{}", e.getMessage());
+            }
+        }
+
+        if ("4".equals(taskStatus)) {
+            // 进件失败
+            mcs.setStatus("2");
+            mcs.setCallbackStatus("1");
+            mcs.setRemark(remark);
+            channelStatusService.updateById(mcs);
+            sxfMerAuditHandler.sendNotice(userApp, "收银呗审核通知", remark, applicationId + "_" + System.currentTimeMillis());
+        }
+
+        boolean isCurrentSign = mcs.getStatus().equals(MerchantChannelStatus.AUDIT_STATUS_WAITING_SIGN);
+        isCurrentSign = isCurrentSign || ("1".equals(mcs.getStatus()) && "5".equals(currentThirdStatus));
+        if ("5".equals(taskStatus) && !isCurrentSign) {
+            // 待签约状态
+            mcs.setExtra(auditResult);
+            mcs.setStatus(MerchantChannelStatus.AUDIT_STATUS_WAITING_SIGN);
+            channelStatusService.updateById(mcs);
+
+            MerchantBaseInfo mbi = merchantBaseInfoService.getMerchantBaseInfoByMerchantCode(mcs.getMerchantCode());
+            AccountDTO account = accountService.getAccount(userApp.getUserId() + "");
+            String merName;
+            if ("1".equals(mbi.getMerchantType())) {
+                merName = "商户" + account.getIdcard().getCertName();
+            } else {
+                merName = mbi.getBussAuthName();
+            }
+
+            try {
+                merName = URLEncoder.encode(merName, "UTF-8");
+            } catch (UnsupportedEncodingException ignored) {
+
+            }
+
+            Notice notice = new Notice();
+            String uniqueKey = "RYX_QY" + System.currentTimeMillis();
+            String title = "电子协议签约通知";
+            String content = "尊敬的客户您好，请点此通知完成签约意愿授权。请注意，同意授权后，支付通道才会进行商户资料审核，否则会一直等待审核。";
+            String urlTemplate = "https://rjp.ruiyinxin.com/mims2/ruijiaSign/index.html?merInId=%s&merName=%s";
+            String url = String.format(urlTemplate, auditResult.getString("merInId"), merName);
+            notice.setUniqueKey(uniqueKey);
+            notice.setUserId(userApp.getUserId() + "");
+            notice.setNoticeCode(uniqueKey);
+            notice.setTypeFirst(1);
+            notice.setTypeSecond(-1);
+            notice.setTitle(title);
+            notice.setUrl(url);
+            notice.setDesc(content);
+            noticeService.save(notice);
+
+            generalPushUtil.sendAllPlatByAlias(Collections.singletonList(userApp.getUserId() + ""), title, content, "1");
+        }
+
+        MerchantAuditRecord lastRecord = merchantAuditRecordService.getLastRecord(mcs.getMerchantCode());
+        if (lastRecord != null) {
+            lastRecord.setStatus(mcs.getStatus());
+            lastRecord.setThirdStatus(mcs.getThirdStatus());
+            lastRecord.setRemark(auditResult.getString("memo"));
+            merchantAuditRecordService.updateById(lastRecord);
+        }
+
+        return mcs;
+    }
+
+    public void createStore(MerchantChannelStatus merchantChannelStatus) {
+        UserApp userApp = userAppMapper.selectByMerchantCode(merchantChannelStatus.getMerchantCode());
+        UserInfo userInfo = userInfoMapper.selectById(userApp.getUserId());
+        log.info("==============>当前需要同步的用户进件数据为：:{}<===================", JSONObject.toJSONString(merchantChannelStatus));
+        if (userInfo != null) {
+            MerchantStore merchantStore = new MerchantStore().setMerchantCode(merchantChannelStatus.getMerchantCode());
+            merchantStore = merchantStoreMapper.selectOne(new QueryWrapper<>(merchantStore));
+            MerchantBaseInfo merchantBaseInfo = merchantBaseInfoService.getMerchantBaseInfoByMerchantCode(merchantChannelStatus.getMerchantCode());
+            QueryWrapper<MerchantImage> queryWrapper = new QueryWrapper<MerchantImage>()
+                    .eq("merchantCode", merchantChannelStatus.getMerchantCode()).eq("photoType", "06");
+            MerchantImage merchantImage = merchantImageMapper.selectOne(queryWrapper);
+            String baseUrl = "https://shop.shouyinbei.net/web/wmerchant.php?c=site&a=entry&ctrl=store&ac=oauth&op=add_merchan&do=web&m=we7_wmall&i=1";
+            StringBuffer sb = new StringBuffer(baseUrl);
+            sb.append("&title=").append(merchantBaseInfo.getAlias());
+            sb.append("&password=").append(userInfo.getPassword().toLowerCase());
+            sb.append("&mobile=").append(userInfo.getLoginName());
+            sb.append("&syb_m_id=").append(merchantStore.getId());
+            String address = merchantBaseInfo.getProvince() + merchantBaseInfo.getCity() + merchantBaseInfo.getDistrict() + merchantBaseInfo.getAddress();
+            String addressNo = merchantBaseInfo.getAddressNo();
+            sb.append("&addressNo=").append(addressNo);
+            String area = merchantBaseInfo.getProvince() +"-"+ merchantBaseInfo.getCity() +"-"+ merchantBaseInfo.getDistrict();
+            try {
+                String decodeAddress = URLEncoder.encode(address, "UTF-8");
+                sb.append("&address=").append(decodeAddress);
+                String decodeArea = URLEncoder.encode(area, "UTF-8");
+                sb.append("&area=").append(decodeArea);
+                String logo = URLEncoder.encode(merchantImage.getPicUrl(), "GBK");
+                sb.append("&logo=").append(logo);
+            } catch (UnsupportedEncodingException e) {
+                e.printStackTrace();
+                log.error("=============>请求生成店铺logo门头照转码异常,异常信息:{}<===============", e.getMessage());
+            }
+            Map<String, String> lnxMap = IpUtils.getLocationByAddress(address);
+            if (lnxMap != null) {
+                sb.append("&location_x=").append(lnxMap.get("x"));
+                sb.append("&location_y=").append(lnxMap.get("y"));
+            }
+            // 请求生成店铺j
+            String result = restTemplate.getForObject(sb.toString(), String.class);
+            log.info("=============>请求生成店铺URL：{}，请求响应返回的参数为:{}<===============", sb.toString(), result);
+        }
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/task/SxfMerAuditHandler.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/task/SxfMerAuditHandler.java
new file mode 100644
index 0000000..8ab18fd
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/task/SxfMerAuditHandler.java
@@ -0,0 +1,500 @@
+package cn.pluss.platform.task;
+
+import cn.pluss.platform.BankCardService;
+import cn.pluss.platform.MerchantAuditRecordService;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.mapper.*;
+import cn.pluss.platform.merchant.AccountService;
+import cn.pluss.platform.merchant.MerchantCashPlaceService;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.notice.NoticeService;
+import cn.pluss.platform.subMerchant.SubMerchantService;
+import cn.pluss.platform.suixingfu.SxfConstants;
+import cn.pluss.platform.user.impl.GeneralPushUtil;
+import cn.pluss.platform.util.IpUtils;
+import cn.pluss.platform.util.LogExceptionUtils;
+import cn.pluss.platform.wx.WxCertService;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.client.RestTemplate;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.Collections;
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * @author djh
+ */
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class SxfMerAuditHandler {
+
+    @Setter(onMethod_ = {@Lazy, @Autowired})
+    private MerchantChannelStatusMapper mcsMapper;
+    @Setter(onMethod_ = {@Lazy, @Autowired})
+    private WxCertService wxCertService;
+    @Setter(onMethod_ = {@Lazy, @Autowired})
+    private MerchantBaseInfoService merchantBaseInfoService;
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantAuditRecordService merchantAuditRecordService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private BankCardService bankCardService;
+
+    @Autowired
+    private AccountService accountService;
+
+    private final RestTemplate restTemplate;
+
+    @Setter(onMethod_ = {@Autowired})
+    private NoticeService noticeService;
+
+    @Setter(onMethod_ = {@Autowired, @Lazy})
+    private MerchantCashPlaceService cashPlaceService;
+
+    private final NoticeMapper noticeMapper;
+    private final UserAppMapper userAppMapper;
+    private final UserInfoMapper userInfoMapper;
+    private final MerchantStoreMapper merchantStoreMapper;
+    private final MerchantImageMapper merchantImageMapper;
+    private final MercIncomSetRateHandler mercIncomSetRateHandler;
+
+    @Autowired
+    private GeneralPushUtil generalPushUtil;
+
+
+    @Autowired
+    private SubMerchantService subMerchantService;
+
+    @Autowired
+    @Lazy
+    private SxfMerAuditHandler self;
+
+    @Async
+    public void auditHandler(JSONObject auditResult) {
+        execute(auditResult);
+    }
+
+    /**
+     * 操作
+     */
+    public void execute(JSONObject auditResult) {
+        MerchantChannelStatus mcs = self.auditCallback(auditResult);
+
+        try {
+            log.info("===================>进件回调，创建店铺开始,商户编号mno为:{}<=====================", auditResult.getString("mno"));
+            self.createStore(mcs);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.info("创建店铺信息异常,异常信息:{}", e.getMessage());
+        }
+
+        try {
+            MerchantBaseInfo merchantBaseInfo = merchantBaseInfoService.getMerchantBaseInfoByMerchantCode(mcs.getMerchantCode());
+            if (StringUtils.isNotBlank(merchantBaseInfo.getUserId())) {
+                cashPlaceService.createDefaultCashPlace(Long.parseLong(merchantBaseInfo.getUserId()));
+            }
+        } catch (Exception e) {
+            LogExceptionUtils.printStack(log, e, "创建默认收银点失败,异常信息:{}");
+        }
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public MerchantChannelStatus auditCallback(JSONObject auditResult) {
+        MerchantChannelStatus merchantChannelStatus = new MerchantChannelStatus()
+                .setChannel(1)
+                .setApplicationId(auditResult.getString("applicationId"))
+                .setMerchantId(auditResult.getString("mno"));
+        merchantChannelStatus = mcsMapper.selectOne(new QueryWrapper<>(merchantChannelStatus));
+
+        String taskStatus = auditResult.getString("taskStatus");
+
+        merchantChannelStatus.setThirdStatus(taskStatus);
+        // 秒审通过
+        auditFirstTrialSuccess(merchantChannelStatus, auditResult);
+        // 终审通过
+        auditSuccess(merchantChannelStatus, auditResult);
+        // 入驻驳回
+        auditReject(merchantChannelStatus, auditResult);
+        // 入驻图片驳回
+        auditImageReject(merchantChannelStatus, auditResult);
+
+        MerchantAuditRecord lastRecord = merchantAuditRecordService.getLastRecord(merchantChannelStatus.getMerchantCode());
+        if (lastRecord != null) {
+            lastRecord.setStatus(merchantChannelStatus.getStatus());
+            lastRecord.setThirdStatus(merchantChannelStatus.getThirdStatus());
+            lastRecord.setRemark(auditResult.getString("suggestion"));
+            merchantAuditRecordService.updateById(lastRecord);
+        }
+
+        return merchantChannelStatus;
+    }
+
+    /**
+     * 只处理秒审通过
+     */
+    private void auditFirstTrialSuccess(MerchantChannelStatus merchantChannelStatus, JSONObject auditResult) {
+        // 不属于这个状态的不处理
+        String taskStatus = auditResult.getString("taskStatus");
+
+        if (!SxfConstants.AUDIT_TASK_STATUS_FIRST_TRIAL_SUCCESS.equals(taskStatus)) {
+            return;
+        }
+
+        JSONArray repoInfo = auditResult.getJSONArray("repoInfo");
+
+        // 入驻信息可能发生变化，需要监听是否发出微信认证请求
+        wxCert(auditResult.getJSONArray("repoInfo"), merchantChannelStatus);
+
+        // 已秒审通过状态，则不需要改变当前信息状态
+        if (MerchantChannelStatus.AUDIT_STATUS_FIRST_TRIAL_SUCCESS.equals(merchantChannelStatus.getStatus())) {
+            return;
+        }
+
+        merchantChannelStatus.setUpdateTime(new Date());
+
+        merchantChannelStatus.setCallbackStatus("1");
+        merchantChannelStatus.setStatus(MerchantChannelStatus.AUDIT_STATUS_FIRST_TRIAL_SUCCESS);
+        merchantChannelStatus.setRemark(auditResult.getString("suggestion"));
+        mcsMapper.updateById(merchantChannelStatus);
+
+        UserApp userApp = userAppMapper.selectByMerchantCode(merchantChannelStatus.getMerchantCode());
+        String pushMsg = "商家秒审通过，已可使用秒审额度收款！等待人工复审中！";
+        Notice notice = new Notice(1, 1, userApp);
+        notice.setNoticeCode(auditResult.getString("applicationId"));
+        notice.setUniqueKey(auditResult.getString("applicationId") + "_" + auditResult.getString("timeStamp"));
+        notice.setCreateDt(new Date());
+        notice.setConrtent(pushMsg);
+        noticeMapper.insert(notice);
+        generalPushUtil.sendAllPlatByAlias(Collections.singletonList(userApp.getUserId() + ""), "商家审核通知", pushMsg, "1");
+    }
+
+    /**
+     * 终审通过
+     */
+    private void auditSuccess(MerchantChannelStatus merchantChannelStatus, JSONObject auditResult) {
+        // 不属于这个状态的不处理
+        String taskStatus = auditResult.getString("taskStatus");
+        // 校验随行付回调状态
+        if (!SxfConstants.AUDIT_TASK_STATUS_SUCCESS.equals(taskStatus)) {
+            return;
+        }
+
+        wxCert(auditResult.getJSONArray("repoInfo"), merchantChannelStatus);
+
+        // 已终审
+        if (MerchantChannelStatus.AUDIT_STATUS_SUCCESS.equals(merchantChannelStatus.getStatus())
+                || MerchantChannelStatus.AUDIT_STATUS_DATA_EDIT.equals(merchantChannelStatus.getStatus())) {
+            // 变更银行卡后(非常！！！可能)也会走该回调。
+            return;
+        }
+
+        log.info("审核通过");
+        UserApp userApp = userAppMapper.selectByMerchantCode(merchantChannelStatus.getMerchantCode());
+        merchantChannelStatus.setCallbackStatus("1");
+        merchantChannelStatus.setStatus(MerchantChannelStatus.AUDIT_STATUS_SUCCESS);
+        merchantChannelStatus.setUpdateTime(new Date());
+        merchantChannelStatus.setRemark(auditResult.getString("suggestion"));
+        String pushMsg = "商家审核通过";
+
+        String uniqueKey = auditResult.getString("applicationId") + System.currentTimeMillis();
+        sendNotice(userApp, "收银呗审核通知", pushMsg, uniqueKey);
+        mcsMapper.updateById(merchantChannelStatus);
+
+        //TODO 统计当前进件商户的上级商户是否满足费率要求
+        try {
+            mercIncomSetRateHandler.installSuperMerchantRate(userApp);
+        } catch (Exception e) {
+            log.info("设置进件商户上级商户费率异常，异常信息:{}", e.getMessage());
+        }
+    }
+
+    /**
+     * 人工审核-入驻驳回
+     */
+    private void auditReject(MerchantChannelStatus merchantChannelStatus, JSONObject auditResult) {
+        String taskStatus = auditResult.getString("taskStatus");
+        if (!SxfConstants.AUDIT_TASK_STATUS_REJECT.equals(taskStatus)) {
+            return;
+        }
+
+        // 入驻驳回
+        if (MerchantChannelStatus.AUDIT_STATUS_REJECT.equals(merchantChannelStatus.getStatus())) {
+            return;
+        }
+
+        log.info("人工审核-入驻驳回");
+        UserApp userApp = userAppMapper.selectByMerchantCode(merchantChannelStatus.getMerchantCode());
+        merchantChannelStatus.setCallbackStatus("1");
+        merchantChannelStatus.setStatus(MerchantChannelStatus.AUDIT_STATUS_REJECT);
+        merchantChannelStatus.setUpdateTime(new Date());
+        String pushMsg = auditResult.getString("suggestion");
+        merchantChannelStatus.setRemark(auditResult.getString("suggestion"));
+
+        String uniqueKey = auditResult.getString("applicationId") + "_" + auditResult.getString("timeStamp");
+        sendNotice(userApp, "收银呗审核通知", pushMsg, uniqueKey);
+        mcsMapper.updateById(merchantChannelStatus);
+    }
+
+    /**
+     * 复审驳回
+     */
+    private void auditImageReject(MerchantChannelStatus merchantChannelStatus, JSONObject auditResult) {
+        String taskStatus = auditResult.getString("taskStatus");
+        if (!SxfConstants.AUDIT_TASK_STATUS_IMAGE_REJECT.equals(taskStatus)) {
+            return;
+        }
+
+        // 秒审通过-复审驳回
+        if (MerchantChannelStatus.AUDIT_STATUS_REVIEW_REJECT.equals(merchantChannelStatus.getStatus())) {
+            return;
+        }
+
+        log.info("秒审通过-复审驳回");
+        UserApp userApp = userAppMapper.selectByMerchantCode(merchantChannelStatus.getMerchantCode());
+        merchantChannelStatus.setCallbackStatus("1");
+        merchantChannelStatus.setStatus(MerchantChannelStatus.AUDIT_STATUS_REVIEW_REJECT);
+        merchantChannelStatus.setUpdateTime(new Date());
+
+        String pushMsg = auditResult.getString("suggestion");
+        merchantChannelStatus.setRemark(pushMsg);
+        String uniqueKey = auditResult.getString("applicationId") + "_" + auditResult.getString("timeStamp");
+        sendNotice(userApp, "收银呗审核通知", pushMsg, uniqueKey);
+        mcsMapper.updateById(merchantChannelStatus);
+    }
+
+    /**
+     * 微信认证
+     *
+     * @param repoInfo 报备信息
+     *                 [{
+     *                 “repoStatus”: “01”,
+     *                 “childNoType”: “WX”,
+     *                 “childNo”: “225505167”,
+     *                 “channelId”: “211234567”
+     *                 }]
+     */
+    private void wxCert(JSONArray repoInfo, MerchantChannelStatus mcs) {
+        if (repoInfo == null) {
+            return;
+        }
+
+        for (int i = 0; i < repoInfo.size(); i++) {
+            JSONObject o = repoInfo.getJSONObject(i);
+
+            try {
+                SubMerchant subMerchant = new SubMerchant();
+                subMerchant.setSubMchType(o.getString("childNoType"));
+                subMerchant.setMerchantId(mcs.getMerchantId());
+                subMerchant.setStatus(o.getString("repoStatus"));
+                subMerchant.setChannelId(o.getString("channelId"));
+                subMerchant.setChannelTypeId("1");
+                subMerchant.setSubMchId(o.getString("childNo"));
+
+                SubMerchant exist = new SubMerchant();
+                exist.setSubMchType(o.getString("childNoType"));
+                exist.setMerchantId(mcs.getMerchantId());
+                exist.setChannelTypeId("1");
+                exist = subMerchantService.getOne(new QueryWrapper<>(exist).last("limit 1"));
+                if (exist != null) {
+                    subMerchant.setId(exist.getId());
+                    subMerchantService.updateById(subMerchant);
+                } else {
+                    subMerchantService.save(subMerchant);
+                }
+            } catch (Exception e) {
+                log.warn("子商户信息保存失败");
+            }
+
+
+            // 报备成功的微信子商户号才进行微信认证
+            if (!"WX".equals(o.getString("childNoType")) || "02".equals(o.getString("repoStatus"))) {
+                continue;
+            }
+
+            try {
+                wxCertService.wxCert(mcs.getMerchantId(), mcs.getMerchantCode(), 1);
+            } catch (Exception e) {
+                log.info("============>微信实名认证异常,异常商户编号:{},异常信息:{}\n<==================", mcs.getMerchantCode(), e.toString());
+            }
+
+            break;
+        }
+    }
+
+    public void createStore(MerchantChannelStatus merchantChannelStatus) {
+//        if (!"4".equals(merchantChannelStatus.getStatus()) && !"3".equals(merchantChannelStatus.getStatus())) {
+//            return;
+//        }
+        UserApp userApp = userAppMapper.selectByMerchantCode(merchantChannelStatus.getMerchantCode());
+        UserInfo userInfo = userInfoMapper.selectById(userApp.getUserId());
+        log.info("==============>当前需要同步的用户进件数据为：:{}<===================", JSONObject.toJSONString(merchantChannelStatus));
+        if (userInfo != null) {
+            MerchantStore merchantStore = new MerchantStore().setMerchantCode(merchantChannelStatus.getMerchantCode());
+            merchantStore = merchantStoreMapper.selectOne(new QueryWrapper<>(merchantStore));
+            MerchantBaseInfo merchantBaseInfo = merchantBaseInfoService.getMerchantBaseInfoByMerchantCode(merchantChannelStatus.getMerchantCode());
+            QueryWrapper<MerchantImage> queryWrapper = new QueryWrapper<MerchantImage>()
+                    .eq("merchantCode", merchantChannelStatus.getMerchantCode()).eq("photoType", "06");
+            MerchantImage merchantImage = merchantImageMapper.selectOne(queryWrapper);
+            String baseUrl = "https://shop.shouyinbei.net/web/wmerchant.php?c=site&a=entry&ctrl=store&ac=oauth&op=add_merchan&do=web&m=we7_wmall&i=1";
+            StringBuilder sb = new StringBuilder(baseUrl);
+            sb.append("&title=").append(merchantBaseInfo.getAlias());
+            sb.append("&password=").append(userInfo.getPassword().toLowerCase());
+            sb.append("&mobile=").append(userInfo.getLoginName());
+            sb.append("&syb_m_id=").append(merchantStore.getId());
+            sb.append("&addressNo=").append(merchantBaseInfo.getAddressNo());
+            String address = merchantBaseInfo.getProvince() + merchantBaseInfo.getCity() + merchantBaseInfo.getDistrict() + merchantBaseInfo.getAddress();
+            String area = merchantBaseInfo.getProvince() +"-"+ merchantBaseInfo.getCity() +"-"+ merchantBaseInfo.getDistrict();
+            try {
+                String decodeAddress = URLEncoder.encode(address, "UTF-8");
+                sb.append("&address=").append(decodeAddress);
+                String decodeArea = URLEncoder.encode(area, "UTF-8");
+                sb.append("&area=").append(decodeArea);
+                String logo = URLEncoder.encode(merchantImage.getPicUrl(), "GBK");
+                sb.append("&logo=").append(logo);
+            } catch (UnsupportedEncodingException e) {
+                e.printStackTrace();
+                log.error("=============>请求生成店铺logo门头照转码异常,异常信息:{}<===============", e.getMessage());
+            }
+            Map<String, String> lnxMap = IpUtils.getLocationByAddress(address);
+            if (lnxMap != null) {
+                sb.append("&location_x=").append(lnxMap.get("x"));
+                sb.append("&location_y=").append(lnxMap.get("y"));
+            }
+            // 请求生成店铺j
+            String result = restTemplate.getForObject(sb.toString(), String.class);
+            log.info("=============>请求生成店铺URL：{}，请求响应返回的参数为:{}<===============", sb.toString(), result);
+        }
+    }
+
+    /**
+     * 商户信息修改回调
+     *
+     * @param auditResult
+     */
+    @Async
+    @Transactional(rollbackFor = Exception.class)
+    public void auditEditHandler(JSONObject auditResult) {
+        // 商户信息修改结果状态
+        String taskStatus = auditResult.getString("taskStatus");
+        // 商户信息修改工单号
+        String applicationId = auditResult.getString("applicationId");
+
+        String timeStamp = auditResult.getString("timeStamp");
+
+        String remark = auditResult.getString("suggestion");
+
+        MerchantAuditRecord auditRecord = new MerchantAuditRecord();
+        auditRecord.setChannel(1);
+        auditRecord.setApplicationId(applicationId);
+        auditRecord = merchantAuditRecordService.getOne(new QueryWrapper<>(auditRecord));
+        if (auditRecord == null) {
+            log.error("未查询到对应的工单信息");
+            return;
+        }
+
+        auditRecord.setRemark(remark);
+        auditRecord.setThirdStatus(taskStatus);
+        UpdateWrapper<MerchantAuditRecord> wrapper = new UpdateWrapper<>();
+        wrapper.eq("applicationId", applicationId);
+        merchantAuditRecordService.update(auditRecord, wrapper);
+
+        MerchantChannelStatus channelStatus = new MerchantChannelStatus();
+        channelStatus.setStatus("3");
+        UpdateWrapper<MerchantChannelStatus> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("merchantCode", auditRecord.getMerchantCode())
+                .eq("channel", 1);
+
+        String merchantCode = auditRecord.getMerchantCode();
+        UserApp userApp = new UserApp().setMerchantCode(merchantCode).setUserType("promoter");
+        userApp = userAppMapper.selectOne(new QueryWrapper<>(userApp));
+
+        Account account = new Account().setUserId(userApp.getUserId() + "");
+        account = accountService.getOne(new QueryWrapper<>(account));
+
+
+        if (SxfConstants.AUDIT_TASK_STATUS_EDIT_SUCCESS.equals(taskStatus)) {
+            // 修改后的银行卡信息
+            JSONObject bak = account.getBak();
+            BankCard newBankCard = JSONObject.toJavaObject(bak, BankCard.class);
+            newBankCard.setAccountType(BankCard.ACCOUNT_TYPE_PRIVATE);
+            account.setBak(null);
+            int count = accountService.count(new QueryWrapper<Account>().eq("bankCardId", account.getBankCardId()));
+            if (count == 1) {
+                newBankCard.setId(Integer.parseInt(account.getBankCardId()));
+                bankCardService.updateById(newBankCard);
+            } else {
+                bankCardService.save(newBankCard);
+                account.setBankCardId(newBankCard.getId() + "");
+                accountService.updateById(account);
+            }
+
+            // 商户修改通过后，修改为最新的业务id
+            channelStatus.setApplicationId(applicationId);
+
+            mcsMapper.update(channelStatus, updateWrapper);
+
+            MerchantBaseInfo mbi = merchantBaseInfoService.getMerchantBaseInfoByMerchantCode(merchantCode);
+
+            noticeService.sendEditApplySuccessNotice(userApp.getUserId() + "", mbi.getAlias(), "次日到账");
+
+//            sendNotice(userApp, "结算账户修改通知", "结算账户修改成功", applicationId + "_" + timeStamp);
+        }
+
+        if (SxfConstants.AUDIT_TASK_STATUS_EDIT_FAIL.equals(taskStatus)) {
+            // 修改失败
+            channelStatus.setStatus(MerchantChannelStatus.AUDIT_STATUS_SUCCESS);
+            mcsMapper.updateById(channelStatus);
+
+            sendNotice(userApp, "结算账户修改通知", "结算账户修改失败: " + auditResult.getString("suggestion"), applicationId + "_" + timeStamp);
+        }
+
+    }
+
+    /**
+     * 发送通知及推送
+     * @param userApp    用户id
+     * @param title     标题
+     * @param msg       内容
+     * @param uniqueKey 唯一key
+     */
+    public void sendNotice(UserApp userApp, String title, String msg, String uniqueKey) {
+        Notice notice = new Notice(1, 1, userApp);
+        notice.setNoticeCode(uniqueKey);
+        notice.setConrtent(msg);
+        noticeService.saveMerAuthNotice(notice);
+
+        generalPushUtil.sendAllPlatByAlias(Collections.singletonList(userApp.getUserId() + ""), title, msg, "1");
+    }
+
+    /**
+     * 发送通知及推送
+     * @param userId    用户id
+     * @param title     标题
+     * @param msg       内容
+     * @param uniqueKey 唯一key
+     */
+    public void sendNotice(String userId, String title, String msg, String uniqueKey) {
+        Notice notice = new Notice(1, 1, userId);
+        notice.setNoticeCode(uniqueKey);
+        notice.setConrtent(msg);
+        noticeService.saveMerAuthNotice(notice);
+
+        generalPushUtil.sendAllPlatByAlias(Collections.singletonList(userId + ""), title, msg, "1");
+    }
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/task/YsMerAuditExtensionV2Handler.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/task/YsMerAuditExtensionV2Handler.java
new file mode 100644
index 0000000..de59678
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/task/YsMerAuditExtensionV2Handler.java
@@ -0,0 +1,145 @@
+package cn.pluss.platform.task;
+
+import cn.pluss.platform.channel.MerchantAuditService;
+import cn.pluss.platform.entity.Account;
+import cn.pluss.platform.entity.JftMercPaymentChannel;
+import cn.pluss.platform.entity.JftMerchantRateRecord;
+import cn.pluss.platform.entity.MerchantRateNewRecord;
+import cn.pluss.platform.jft.JftBankCardService;
+import cn.pluss.platform.jft.JftMerchantRateRecordService;
+import cn.pluss.platform.mapper.JftMercPaymentChannelMapper;
+import cn.pluss.platform.mapper.UserAppMapper;
+import cn.pluss.platform.merchant.JftMercPaymentChannelService;
+import cn.pluss.platform.ysExtension.v20220615.AbstractYsResultService;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+
+/**
+ * @author djh
+ */
+@Slf4j
+@Component("ysMerAuditExtensionV2Handler")
+public class YsMerAuditExtensionV2Handler implements IJftMercAuditHandler {
+
+    @Autowired
+    private MerchantAuditService ysAuditServiceExtensionV2;
+
+    @Autowired
+    private JftMerchantRateRecordService jmrrService;
+
+    @Autowired
+    private JftMercPaymentChannelService jpcService;
+
+    @Resource
+    private JftMercPaymentChannelMapper jpcMapper;
+
+    @Autowired
+    private SxfMerAuditHandler sxfMerAuditHandler;
+
+    @Autowired
+    private UserAppMapper userAppMapper;
+
+    @Autowired
+    private JftBankCardService jbcService;
+
+    @Override
+    @Async
+    @Transactional(rollbackFor = Exception.class)
+    public void auditCallback(JSONObject auditResult) {
+        if (auditResult == null) {
+            return;
+        }
+
+        String notifyType = auditResult.getString("notifyType");
+
+        switch (notifyType) {
+            case "00":
+                // 进件通知
+                handleAudit(auditResult);
+                break;
+            case "01":
+                // 报备通知
+                handleReport(auditResult);
+                break;
+            case "02":
+                // 变更通知
+                handleChange(auditResult);
+                break;
+            default:
+                break;
+        }
+    }
+
+    private void handleAudit(JSONObject auditResult) {
+        String status = auditResult.getString("status");
+
+        // 进件成功
+        JSONObject urm = auditResult.getJSONObject("urm");
+        if ("00".equals(status)) {
+            // 进件成功
+            ((AbstractYsResultService) ysAuditServiceExtensionV2).success(urm);
+        }
+
+        if ("20".equals(status)) {
+            // 进件成功
+            ((AbstractYsResultService) ysAuditServiceExtensionV2).remainSigned(urm);
+        }
+
+        if ("90".equals(status)) {
+            ((AbstractYsResultService) ysAuditServiceExtensionV2).fail(urm);
+        }
+    }
+
+    private void handleReport(JSONObject auditResult) {
+        // 此处不做报备处理
+    }
+
+    private void handleChange(JSONObject auditResult) {
+        String status = auditResult.getString("status");
+
+        // 变更
+        JSONObject change = auditResult.getJSONObject("change");
+        String changeFlowId = change.getString("changeFlowId");
+        String nogoRemark = change.getString("nogoRemark");
+
+        LambdaQueryWrapper<JftMerchantRateRecord> qWrapper = Wrappers.lambdaQuery();
+        qWrapper.eq(JftMerchantRateRecord::getRemark, changeFlowId);
+        JftMerchantRateRecord jmrr = jmrrService.getOne(qWrapper);
+        if (jmrr != null) {
+            // 费率变更
+            if ("00".equals(status)) {
+                //费率变更成功
+                jmrrService.onSuccess(jmrr);
+            } else {
+                // 费率变更失败
+                jmrrService.onFail(jmrr);
+            }
+
+            return;
+        }
+
+        // 变更通知
+        JftMercPaymentChannel jpc = jpcMapper.selectByChangeFlowId(changeFlowId);
+
+        if (jpc != null) {
+            // 结算卡变更
+            if ("00".equals(status)) {
+                // 结算卡变更成功
+                jbcService.editSuccess(jpc);
+            } else {
+                // 结算卡变更失败
+                jbcService.editFail(jpc, nogoRemark);
+            }
+
+            return;
+        }
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/task/YsMerAuditHandler.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/task/YsMerAuditHandler.java
new file mode 100644
index 0000000..0053354
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/task/YsMerAuditHandler.java
@@ -0,0 +1,148 @@
+package cn.pluss.platform.task;
+
+import cn.pluss.platform.channel.MerchantAuditService;
+import cn.pluss.platform.channel.MerchantCertService;
+import cn.pluss.platform.entity.MerchantChannelStatus;
+import cn.pluss.platform.entity.Notice;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.notice.NoticeService;
+import cn.pluss.platform.user.impl.GeneralPushUtil;
+import cn.pluss.platform.ys.YSConstants;
+import cn.pluss.platform.ys.YsService;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Collections;
+import java.util.Date;
+
+/**
+ * @author djh
+ */
+@Slf4j
+@Component("ysMerAuditHandler")
+public class YsMerAuditHandler extends BaseMerAuditHandler<YsMerAuditHandler> {
+
+    @Autowired
+    private GeneralPushUtil generalPushUtil;
+
+    @Autowired
+    @Lazy
+    protected MerchantCertService ysCertService;
+
+    @Autowired
+    @Lazy
+    protected MerchantAuditService ysAuditService;
+
+    @Autowired
+    @Lazy
+    private YsService ysService;
+
+    @Autowired
+    @Lazy
+    private NoticeService noticeService;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public MerchantChannelStatus auditCallback(JSONObject auditResult) {
+        log.info("=============回调参数=============");
+        log.info(auditResult.toJSONString());
+        try {
+            ysService.checkSign(auditResult);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.info("=============进件回调参数验签异常=============");
+        }
+
+        String bizRespStr = auditResult.getString(YSConstants.BIZ_RESPONSE_JSON);
+        JSONObject bizResp = JSONObject.parseObject(bizRespStr);
+        String status = bizResp.getString("status");
+        String statusMsg = bizResp.getString("statusMeg");
+        String outMerchantCode = bizResp.getString(YSConstants.MER_CODE);
+        String merchantId = bizResp.getString("merchantNo");
+        if (StringUtils.isEmpty(outMerchantCode)) {
+            log.info("查询进件信息异常, {}", statusMsg);
+
+            return null;
+        }
+
+        String merchantCode = outMerchantCode.substring(0, 19);
+
+        MerchantChannelStatus channelStatus = mcsService.getByMerchantCodeWithChannel(merchantCode, "4");
+        if (channelStatus == null) {
+            channelStatus = new MerchantChannelStatus();
+            channelStatus.setMerchantCode(merchantCode);
+        } else {
+            if (channelStatus.getStatus().equals(MerchantChannelStatus.AUDIT_STATUS_QUICK_CASH)) {
+                return channelStatus;
+            }
+
+            if (channelStatus.getStatus().equals(MerchantChannelStatus.AUDIT_STATUS_SUCCESS)) {
+                return channelStatus;
+            }
+        }
+
+        channelStatus.setThirdStatus(status);
+        if ("wait".equals(status)) {
+            return null;
+        }
+
+        // 通过有没有商编来判断是否进件初审状态, 避开待审核状态
+        if (StringUtils.isNotBlank(merchantId)) {
+            channelStatus.setMerchantId(merchantId);
+            channelStatus.setStatus(MerchantChannelStatus.AUDIT_STATUS_QUICK_CASH);
+            // 微信认证
+            try {
+                ysCertService.wxCert(merchantId, merchantCode);
+            } catch (Exception e) {
+                log.debug("微信认证异常");
+                e.printStackTrace();
+            }
+
+            mcsService.saveOrUpdate(channelStatus);
+
+            JSONObject param = new JSONObject();
+            param.put("merchantCode", merchantCode);
+            try {
+                ysAuditService.merchantAuditResult(param);
+            } catch (Exception e) {
+                e.printStackTrace();
+                log.error("查询银盛进件信息异常: {}", merchantCode);
+            }
+
+            return channelStatus;
+        } else {
+            channelStatus.setStatus(MerchantChannelStatus.AUDIT_STATUS_REJECT);
+            channelStatus.setRemark(statusMsg);
+
+            String pushMsg = "实时到账申请失败";
+            if (StringUtils.isNotEmpty(statusMsg)) {
+                // 有原因则写，没有则不拼接
+                pushMsg += ", 原因：" + statusMsg;
+            }
+
+            LambdaQueryWrapper<UserApp> qWrapper = new LambdaQueryWrapper<UserApp>().eq(UserApp::getMerchantCode, merchantCode).eq(UserApp::getUserType, "promoter");
+            UserApp userApp = userAppMapper.selectOne(qWrapper);
+            Notice notice = new Notice();
+            String uniqueKey = "auditReq" + System.currentTimeMillis();
+            notice.setNoticeCode(uniqueKey);
+            notice.setUniqueKey(uniqueKey);
+            notice.setCreateDt(new Date());
+            notice.setConrtent(pushMsg);
+            notice.setUserId(userApp.getUserId() + "");
+            noticeService.saveMerAuthNotice(notice);
+            generalPushUtil.sendAllPlatByAlias(Collections.singletonList(userApp.getUserId() + ""), "商家审核通知", pushMsg, "1");
+
+            mcsService.saveOrUpdate(channelStatus);
+            return null;
+        }
+    }
+
+    @Override
+    public void afterAudit(JSONObject auditResult) { }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/task/YsMerAuditV2Handler.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/task/YsMerAuditV2Handler.java
new file mode 100644
index 0000000..bde673e
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/task/YsMerAuditV2Handler.java
@@ -0,0 +1,157 @@
+package cn.pluss.platform.task;
+
+import cn.pluss.platform.channel.MerchProtocolService;
+import cn.pluss.platform.channel.MerchantAuditService;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.mapper.MerchantChannelStatusMapper;
+import cn.pluss.platform.merchant.AccountService;
+import cn.pluss.platform.merchant.MerchantRateNewRecordService;
+import cn.pluss.platform.merchant.MerchantRateNewService;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.yinsheng.v20210929.AuditCallbackInfo;
+import cn.pluss.platform.ys.impl.v20210929.AbstractYsResultService;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.Objects;
+
+/**
+ * @author djh
+ */
+@Slf4j
+@Component("ysMerAuditV2Handler")
+public class YsMerAuditV2Handler extends BaseMerAuditHandler<YsMerAuditV2Handler> {
+
+    @Autowired
+    private MerchantAuditService ysAuditServiceV2;
+
+    @Autowired
+    private MerchantChannelStatusService mcsService;
+
+    @Autowired
+    private SxfMerAuditHandler sxfMerAuditHandler;
+
+    @Resource
+    private MerchantChannelStatusMapper mcsMapper;
+
+    @Autowired
+    private MerchantRateNewRecordService mrnrService;
+
+    @Autowired
+    private AccountService accountService;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public MerchantChannelStatus auditCallback(JSONObject auditResult) {
+        if (auditResult == null) {
+            return null;
+        }
+
+        String notifyType = auditResult.getString("notifyType");
+        String status = auditResult.getString("status");
+
+        MerchantChannelStatus mcs = null;
+        if (Objects.equals(notifyType, "00")) {
+
+            JSONObject urm = auditResult.getJSONObject("urm");
+            // 进件通知
+            AuditCallbackInfo callbackInfo = JSONObject.parseObject(urm.toString(), AuditCallbackInfo.class);
+            LambdaQueryWrapper<MerchantChannelStatus> qWrapper = Wrappers.lambdaQuery();
+            qWrapper.eq(MerchantChannelStatus::getApplicationId, callbackInfo.getSysFlowId())
+                    .eq(MerchantChannelStatus::getChannel, 4);
+            mcs = mcsService.getOne(qWrapper);
+
+            if ("00".equals(status)) {
+                // 进件成功
+                ((AbstractYsResultService) ysAuditServiceV2).success(urm);
+            } else if ("10".equals(status)){
+                // 转人工审核，待复审
+                mcs.setStatus(MerchantChannelStatus.AUDIT_STATUS_ARTIFICIAL_EXAMINING);
+                mcsService.updateById(mcs);
+            } else if ("20".equals(status)) {
+                // 审核通过，待签约
+                ((MerchProtocolService) ysAuditServiceV2).reqMerProtocolStatus(mcs);
+            } else {
+                // 进件驳回
+                ((AbstractYsResultService) ysAuditServiceV2).fail(urm);
+            }
+        }
+
+        if (Objects.equals(notifyType, "01")) {
+            // 报备通知
+            JSONObject report = auditResult.getJSONObject("report");
+            AuditCallbackInfo callbackInfo = JSONObject.parseObject(report.toString(), AuditCallbackInfo.class);
+            LambdaQueryWrapper<MerchantChannelStatus> qWrapper = Wrappers.lambdaQuery();
+            qWrapper.eq(MerchantChannelStatus::getApplicationId, callbackInfo.getSysFlowId())
+                    .eq(MerchantChannelStatus::getChannel, 4);
+            mcs = mcsService.getOne(qWrapper);
+
+            if ("00".equals(status)) {
+                String thridMercList = callbackInfo.getThridMercList();
+                JSONArray objects = JSON.parseArray(thridMercList);
+                ((AbstractYsResultService) ysAuditServiceV2)
+                        .collectSubMerId(objects, mcs.getMerchantId());
+            } else {
+                LambdaQueryWrapper<UserApp> qWrapper2 = Wrappers.lambdaQuery();
+                qWrapper2.eq(UserApp::getMerchantCode, mcs.getMerchantCode());
+                qWrapper2.eq(UserApp::getUserType, "promoter");
+                UserApp userApp = userAppMapper.selectOne(qWrapper2);
+                String pushMsg = "D0通道报备失败，请联系客服进行处理";
+                sxfMerAuditHandler.sendNotice(userApp, "收银呗审核通知", pushMsg, mcs.getApplicationId());
+            }
+        }
+
+        if (Objects.equals(notifyType, "02")) {
+            JSONObject change = auditResult.getJSONObject("change");
+            String changeFlowId = change.getString("changeFlowId");
+            String nogoRemark = change.getString("nogoRemark");
+
+            LambdaQueryWrapper<MerchantRateNewRecord> qWrapper = Wrappers.lambdaQuery();
+            qWrapper.eq(MerchantRateNewRecord::getRemark, changeFlowId);
+            MerchantRateNewRecord mrnr = mrnrService.getOne(qWrapper);
+            if (mrnr != null) {
+                // 费率变更
+                if ("00".equals(status)) {
+                    //费率变更成功
+                    mrnrService.onSuccess(mrnr);
+                } else {
+                    // 费率变更失败
+                    mrnrService.onFail(mrnr);
+                }
+
+                return null;
+            }
+
+            // 变更通知
+            mcs = mcsMapper.selectByChangeFlowId(changeFlowId);
+
+            if (mcs != null) {
+                // 结算卡变更
+                if ("00".equals(status)) {
+                    // 结算卡变更成功
+                    accountService.editSuccess(mcs, Account.CHANNEL_TYPE_D0);
+                } else {
+                    // 结算卡变更失败
+                    accountService.editFail(mcs, changeFlowId + "_" + System.currentTimeMillis(), nogoRemark, Account.CHANNEL_TYPE_D0);
+                }
+
+                return mcs;
+            }
+        }
+
+        return mcs;
+    }
+
+    @Override
+    public void afterAudit(JSONObject auditResult) {
+
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/task/YsOldMerAuditHandler.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/task/YsOldMerAuditHandler.java
new file mode 100644
index 0000000..46d1475
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/task/YsOldMerAuditHandler.java
@@ -0,0 +1,114 @@
+package cn.pluss.platform.task;
+
+import cn.pluss.platform.entity.MerchantChannelStatus;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.ys.YsService;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.extern.slf4j.Slf4j;
+import lombok.val;
+import lombok.var;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.client.RestTemplate;
+
+/**
+ * @author djh
+ */
+@Slf4j
+@Component("ysOldMerAuditHandler")
+public class YsOldMerAuditHandler extends BaseMerAuditHandler<YsOldMerAuditHandler> {
+
+    @Autowired
+    private YsService ysService;
+
+    @Autowired
+    private RestTemplate restTemplate;
+
+    @Autowired
+    private MerchantChannelStatusService channelStatusService;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public MerchantChannelStatus auditCallback(JSONObject auditResult) {
+        log.info("=============回调参数=============");
+        log.info(auditResult.toJSONString());
+        val qWrapper = new LambdaQueryWrapper<MerchantChannelStatus>()
+                .eq(MerchantChannelStatus::getApplicationId, auditResult.get("sysFlowId"))
+                .eq(MerchantChannelStatus::getChannel, 4);
+        val msc = channelStatusService.getOne(qWrapper);
+        msc.setExtra(auditResult);
+        val status = auditResult.getString("status");
+        val code = auditResult.getString("code");
+        val note = auditResult.getString("note");
+
+        if (!"00".equals(code)) {
+            throw new MsgException("【" + msc.getMerchantCode() + "】商户信息查询失败");
+        }
+
+        if ("03".equals(status)) {
+            return null;
+        }
+
+        msc.setRemark(note);
+        if ("90".equals(status)) {
+            msc.setStatus(MerchantChannelStatus.AUDIT_STATUS_REJECT);
+        }
+
+        msc.setRemark(note);
+        if ("04".equals(status)) {
+            msc.setStatus(MerchantChannelStatus.AUDIT_STATUS_FIRST_TRIAL_SUCCESS);
+        }
+
+        msc.setRemark(note);
+        if ("05".equals(status)) {
+            msc.setStatus(MerchantChannelStatus.AUDIT_STATUS_SUCCESS);
+            String mercId = auditResult.getString("mercId");
+            msc.setMerchantId(mercId);
+        }
+
+        channelStatusService.updateById(msc);
+
+        return msc;
+    }
+
+    @Override
+    public void afterAudit(JSONObject auditResult) {
+        String bizResponseJson = auditResult.getString("bizResponseJson");
+        JSONObject bizResponse = JSON.parseObject(bizResponseJson);
+        MerchantChannelStatus channelStatus = new MerchantChannelStatus()
+                .setMerchantCode(bizResponse.getString("outMerchantNo"))
+                .setChannel(4);
+        channelStatus = channelStatusService.getOne(new QueryWrapper<>(channelStatus));
+
+        // 进件审核通过后，初审或复审通过, 发起电子合同请求
+        if (MerchantChannelStatus.AUDIT_STATUS_FIRST_TRIAL_SUCCESS.equals(channelStatus.getStatus())
+                || MerchantChannelStatus.AUDIT_STATUS_SUCCESS.equals(channelStatus.getStatus())) {
+            reqProtocol(channelStatus);
+        }
+    }
+
+    /**
+     * 发起签约请求
+     */
+    private void reqProtocol(MerchantChannelStatus channelStatus) {
+//        try {
+//            val bizJson = new JSONObject();
+//            bizJson.put("sysFlowId", channelStatus.getApplicationId());
+//
+//            val result = ysService.reqOldVerApiAudit(YsOldConfig.SEND_SMS_CODE, bizJson, "Merchant", "sendSmsCode");
+//            val code = result.getString("code");
+//            val note = result.getString("note");
+//            if (!"00".equals(code)) {
+//                log.warn("发送签约短信请求失败");
+//            }
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//            log.warn("发送签约短信请求失败");
+//        }
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/transQuery/TransQueryService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/transQuery/TransQueryService.java
new file mode 100644
index 0000000..ca781b0
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/transQuery/TransQueryService.java
@@ -0,0 +1,25 @@
+package cn.pluss.platform.transQuery;
+
+import java.util.Map;
+
+import cn.pluss.platform.api.Result;
+
+/**
+ * @author yuchen
+ *
+ * @Description 
+ */
+public interface TransQueryService {
+	
+	/**
+	 * 
+	 * TransQuery:(查询支付宝 微信 乐刷的订单状态). <br/> 
+	 *
+	 * @author Administrator 
+	 * @param map          aisle 0 支付宝 1微信 2 乐刷   orderNumber订单号   
+	 * @since JDK 1.8
+	 */
+	public Result<Map<String, Object>> transQuery(Map<String, Object> map) throws Exception;
+
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/transQuery/impl/TransQueryServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/transQuery/impl/TransQueryServiceImpl.java
new file mode 100644
index 0000000..fc07d89
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/transQuery/impl/TransQueryServiceImpl.java
@@ -0,0 +1,182 @@
+package cn.pluss.platform.transQuery.impl;
+
+import java.util.Map;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.alipay.api.AlipayClient;
+import com.alipay.api.DefaultAlipayClient;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.leshua.LeshuaService;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.transQuery.TransQueryService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.util.AliPayParam;
+
+/**
+ * @author yuchen
+ *
+ * @Description 
+ */
+@Transactional
+@Service("transQueryService")
+public class TransQueryServiceImpl implements TransQueryService {
+	
+	 private static final Logger logger = LoggerFactory.getLogger(TransQueryServiceImpl.class);
+	
+	@Resource
+	private HttpServletRequest request;
+	
+	@Resource
+	private UserAppService userAppService;
+	
+	@Resource
+	private MerchantBaseInfoService merchantBaseInfoService;
+	
+	@Resource
+	private LeshuaService leshuaService;
+	
+	private String[] wechatPayNotSureResult = new String[] {"SYSTEMERROR", "USERPAYING", "BANKERROR"};
+
+	@Override
+	public Result<Map<String, Object>> transQuery(Map<String, Object> map) throws Exception {
+		return null;
+//		Map<String, Object> result=new HashMap<String, Object>(16);
+//		String aisle = (String) map.get("aisle");
+//		String orderNumber = (String) map.get("orderNumber");
+//		String authCode = (String) map.get("authCode");
+//		String token = request.getHeader("token");
+//		UserApp userApp=new UserApp();
+//		userApp.setToken(token);
+//		userApp=userAppService.queryUserApp(userApp);
+//		if("0".equals(aisle)) {//支付宝 微信
+//			authCode = authCode.substring(0,1);
+//			if("2".equals(authCode)) {
+//				String appAuthToken = userApp.getAppAuthToken();//支付宝授权token
+//				AlipayClient alipayClient = getAlipayClient();
+//				AlipayTradeQueryRequest request = new AlipayTradeQueryRequest();
+//				request.putOtherTextParam("app_auth_token",appAuthToken);
+//				request.setBizContent("{" +
+//				"\"out_trade_no\":\""+orderNumber+"\"" +
+//			"  }");
+//				AlipayTradeQueryResponse response = alipayClient.execute(request);
+//				if(response.isSuccess()){
+//					String tradeStatus = response.getTradeStatus();
+//					if("WAIT_BUYER_PAY".equals(tradeStatus)) {
+//						tradeStatus="交易创建，等待买家付款";
+//					return	ResultGenerator.genTransunKonwResult(tradeStatus);
+//					}else if("TRADE_CLOSED".equals(tradeStatus)) {
+//						tradeStatus="未付款交易超时关闭，或支付完成后全额退款";
+//					return	ResultGenerator.genFailResult(tradeStatus);
+//					}else if("TRADE_SUCCESS".equals(tradeStatus)) {
+//						tradeStatus="交易支付成功";
+//						String tradeNo = response.getTradeNo();
+//						Date sendPayDate = response.getSendPayDate();
+//						result.put("tradeNo", tradeNo);
+//						result.put("payTime", sendPayDate);
+//						return ResultGenerator.genSuccessResult(result);
+//					}else if("TRADE_FINISHED".equals(tradeStatus)) {
+//						tradeStatus="交易结束，不可退款";
+//						return ResultGenerator.genFailResult(tradeStatus);
+//					}
+//				} else {
+//					return ResultGenerator.genFailResult("查询失败");
+//				}
+//				return ResultGenerator.genFailResult("查询失败");
+//			}else if("1".equals(authCode)) {
+//				String merchantCode = userApp.getMerchantCode();
+//				MerchantBaseInfo merchantBaseInfo=new MerchantBaseInfo();
+//				merchantBaseInfo.setMerchantCode(merchantCode);
+//				merchantBaseInfo=merchantBaseInfoService.queryMerchantBaseInfo(merchantBaseInfo);
+//				Map<String, String> requestMap = new HashMap<String, String>(16);
+//				requestMap.put("appid", "wxed824282c345b7a0");
+//				requestMap.put("mch_id", "1551169371");
+//				requestMap.put("sub_mch_id", merchantBaseInfo.getSubMchId());
+//				requestMap.put("out_trade_no", orderNumber);
+//				requestMap.put("nonce_str", StringUtil.genRandomNum(10));
+//				requestMap.put("sign_type", "HMAC-SHA256");
+//				requestMap.put("sign", WechatSignUtil.sha256Sign(requestMap, "7F05NZBTJ3XNDK5HLSDC3H25ZXOQKDHT"));
+//				String requestResult = WXPayHttpUtil.WXHttpPostXMLWithoutCert("https://api.mch.weixin.qq.com/pay/orderquery",requestMap);
+//				Map<String, String> wexiMap = WXPayXmlUtil.parseXMLToMap(requestResult);
+//				if ("SUCCESS".equalsIgnoreCase(wexiMap.get("return_code"))) {
+//					if ("SUCCESS".equalsIgnoreCase(wexiMap.get("result_code"))&&"SUCCESS".equalsIgnoreCase(wexiMap.get("trade_state"))) {
+//						String transaction_id = wexiMap.get("transaction_id");
+//						String time_end = (String) map.get("time_end");
+//						SimpleDateFormat sFormat=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//						result.put("tradeNo", transaction_id);
+//						result.put("payTime", sFormat.parse(time_end));
+//						return ResultGenerator.genSuccessResult(result);
+//					} else {
+//						boolean isNeedQuery = Arrays.asList(wechatPayNotSureResult).contains(wexiMap.get("trade_state"));//判断是否需要条用查询接口
+//						if (isNeedQuery) {
+//							return ResultGenerator.genTransunKonwResult("交易未知");
+//						} else {
+//							return ResultGenerator.genFailResult("交易失败");
+//						}
+//					}
+//				}
+//			}
+//
+//		}else if("1".equals(aisle)) {//乐刷
+//			String merchantCode = userApp.getMerchantCode();
+//			MerchantBaseInfo merchantBaseInfo=new MerchantBaseInfo();
+//			merchantBaseInfo.setMerchantCode(merchantCode);
+//			merchantBaseInfo=merchantBaseInfoService.queryMerchantBaseInfo(merchantBaseInfo);
+//			Map<String, String> reqMap = new HashMap<String, String>(16);
+//			reqMap.put("service", "query_status");
+//			reqMap.put("merchant_id", userApp.getLeshuaMchId());
+//			reqMap.put("third_order_id", orderNumber);
+//			reqMap.put("nonce_str", StringUtil.genRandomNum(32));
+//			String requestPay = leshuaService.requestPay(reqMap, "60E3F31EDEC8061C33721737B36FA86D", true);
+//			logger.info("======支付结果====" + requestPay);
+//			Map<String, Object> leshuaMap = XmlUtil.toMapLeshua(requestPay);
+//			String resp_code = (String) leshuaMap.get("resp_code");
+//			if ("0".equals(resp_code)) {//0表示通信成功
+//				String result_code = (String) leshuaMap.get("result_code");
+//				if ("0".equals(result_code)) {
+//					// 0支付中 2支付成功 6订单关闭 8支付失败 10退款中 11退款成功 12退款失败
+//					String status = (String) leshuaMap.get("status");
+//					if ("2".equals(status)) {
+//						String leshua_order_id = (String) leshuaMap.get("leshua_order_id");
+//						String  payTime =(String) map.get("pay_time");
+//						SimpleDateFormat sFormat=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//						result.put("payTime", sFormat.parse(payTime));
+//						result.put("tradeNo", leshua_order_id);
+//						return ResultGenerator.genSuccessResult(result);
+//					} else if ("8".equals(status)) {
+//						return ResultGenerator.genFailResult("交易失败");
+//					} else if ("0".equals(status)) {
+//						return ResultGenerator.genTransunKonwResult("交易中");
+//					} else if ("6".equals(status)) {
+//						return ResultGenerator.genFailResult("订单关闭");
+//					} else if ("10".equals(status)) {
+//						return ResultGenerator.genFailResult("退款中");
+//					} else if ("11".equals(status)) {
+//						return ResultGenerator.genFailResult("退款成功");
+//					} else if ("12".equals(status)) {
+//						return ResultGenerator.genFailResult("退款失败");
+//					}
+//				} else {
+//					return ResultGenerator.genFailResult("查询失败");
+//				}
+//			} else {
+//				return ResultGenerator.genFailResult("查询失败");
+//			}
+//		}
+//		return ResultGenerator.genFailResult("查询失败");
+	}
+
+	public AlipayClient getAlipayClient() {
+		AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do",AliPayParam.getAppId(),AliPayParam.getPri(),"json","GBK",AliPayParam.getPub(),"RSA2");
+		return alipayClient;
+	}
+
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/transfer/MerchantTransferService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/transfer/MerchantTransferService.java
new file mode 100644
index 0000000..2e627be
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/transfer/MerchantTransferService.java
@@ -0,0 +1,27 @@
+package cn.pluss.platform.transfer;
+
+import cn.pluss.platform.entity.MerchantOrder;
+import cn.pluss.platform.entity.MerchantStore;
+import cn.pluss.platform.entity.MerchantTransfer;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-09-04
+ */
+public interface MerchantTransferService extends IService<MerchantTransfer> {
+
+    /**
+     *
+     * @param order
+     * @param alias
+     * @param fee
+     */
+    void saveTransferInfo(MerchantOrder order, BigDecimal fee);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/transfer/impl/MerchantTransferServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/transfer/impl/MerchantTransferServiceImpl.java
new file mode 100644
index 0000000..5c9a6d7
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/transfer/impl/MerchantTransferServiceImpl.java
@@ -0,0 +1,90 @@
+package cn.pluss.platform.transfer.impl;
+
+import cn.pluss.platform.entity.MerchantChannelStatus;
+import cn.pluss.platform.entity.MerchantOrder;
+import cn.pluss.platform.entity.MerchantStore;
+import cn.pluss.platform.entity.MerchantTransfer;
+import cn.pluss.platform.mapper.MerchantTransferMapper;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.merchantOrder.MerchantOrderService;
+import cn.pluss.platform.merchantStore.MerchantStoreService;
+import cn.pluss.platform.transfer.MerchantTransferService;
+import cn.pluss.platform.util.StringUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-09-04
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class MerchantTransferServiceImpl extends ServiceImpl<MerchantTransferMapper, MerchantTransfer> implements MerchantTransferService {
+
+    private final MerchantChannelStatusService merchantChannelStatusService;
+    private final MerchantStoreService merchantStoreService;
+    private final MerchantOrderService merchantOrderService;
+
+    /**
+     * 保存打款记录
+     * @param order
+     * @param fee
+     */
+    @Override
+    public void saveTransferInfo(MerchantOrder order,BigDecimal fee) {
+        log.info("===============>进入保存营销转账打款记录操作，转账商户简称：{}，营销转账金额：{}元<==============", order.getMerchantName(),fee);
+        log.info("===============>备注：营销补贴金额不足0.01元，不支持打款<==============");
+        if(fee.doubleValue() >= 0.01d){
+            String merchantCode = order.getMerchantCode();
+            MerchantStore merchantStore = new MerchantStore().setMerchantCode(merchantCode);
+            merchantStore = merchantStoreService.queryMerchantStore(merchantStore);
+            if(!"1".equals(merchantStore.getIsMarket()) || order.getConsumeFee() > 100d){
+                order.setMarketAmt(new BigDecimal("0.0"));
+                merchantOrderService.saveOrUpdate(order);
+                log.info("=====不符合活动营销的条件=====");
+                return;
+            }
+
+            MerchantChannelStatus channel = merchantChannelStatusService.getByMerchantCode(merchantCode);
+            if(channel != null){
+                String orderNo = "ZZ000"+ StringUtil.getBillno();
+                MerchantTransfer transfer = new MerchantTransfer();
+                transfer.setMerchantCode(merchantCode);
+                transfer.setAlias(order.getMerchantName());
+                transfer.setChannelNo(channel.getMerchantId());
+                transfer.setChannelId(channel.getChannel());
+                transfer.setAmount(fee);
+                transfer.setContent("营销转账");
+                transfer.setCreateDt(new Date());
+                transfer.setOrderNo(orderNo);
+                //Map<String, Object> resultMap = null;
+                /*try {
+                    resultMap  = sxfPayService.orgTransfer(transfer);
+                    if("0".equals(resultMap.get("code"))){
+                        transfer.setRemark(resultMap.get("msg").toString());
+                    }
+                    Map<String,String> data = (Map<String,String>)resultMap.get("data");
+                    transfer.setTransNo(data.get("transactionNo"));
+                    if(data.get("transactionTime") != null){
+                        SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHHmmss");
+                        transfer.setTransTime(format.parse(data.get("transactionTime")));
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    log.error("===================>请求随行付打款接口异常，异常信息:{}",e.getMessage());
+                }*/
+                this.baseMapper.insert(transfer);
+            }
+        }
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/transferCash/MerchantTransferCashService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/transferCash/MerchantTransferCashService.java
new file mode 100644
index 0000000..201b656
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/transferCash/MerchantTransferCashService.java
@@ -0,0 +1,26 @@
+package cn.pluss.platform.transferCash;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.entity.MerchantTransferCash;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.math.BigDecimal;
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-09-26
+ */
+public interface MerchantTransferCashService extends IService<MerchantTransferCash> {
+
+    /**
+     * 获取商户提现金额
+     * @param userId
+     * @return
+     */
+//    BigDecimal getWithdrawAmt(Long userId,String date);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/transferCash/impl/MerchantTransferCashServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/transferCash/impl/MerchantTransferCashServiceImpl.java
new file mode 100644
index 0000000..9d22531
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/transferCash/impl/MerchantTransferCashServiceImpl.java
@@ -0,0 +1,42 @@
+package cn.pluss.platform.transferCash.impl;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.entity.MerchantBaseInfo;
+import cn.pluss.platform.entity.MerchantStore;
+import cn.pluss.platform.entity.MerchantTransferCash;
+import cn.pluss.platform.mapper.MerchantBaseInfoMapper;
+import cn.pluss.platform.mapper.MerchantStoreMapper;
+import cn.pluss.platform.mapper.MerchantTransferCashMapper;
+import cn.pluss.platform.transferCash.MerchantTransferCashService;
+import cn.pluss.platform.util.StringUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2020-09-26
+ */
+@Service
+public class MerchantTransferCashServiceImpl extends ServiceImpl<MerchantTransferCashMapper, MerchantTransferCash> implements MerchantTransferCashService {
+
+
+    @Autowired
+    private MerchantTransferCashMapper merchantTransferCashMapper;
+
+//    @Override
+//    public BigDecimal getWithdrawAmt(Long userId,String date) {
+//        return merchantTransferCashMapper.getWithdrawAmt(userId,date);
+//    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/user/UserExtraService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/user/UserExtraService.java
new file mode 100644
index 0000000..03a769d
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/user/UserExtraService.java
@@ -0,0 +1,39 @@
+package cn.pluss.platform.user;
+
+import cn.pluss.platform.entity.UserExtra;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 用户额外字段关联表信息 服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-05-31
+ */
+public interface UserExtraService extends IService<UserExtra> {
+
+    /**
+     * 跟进标识
+     */
+    String FU = "FOLLOW_UP";
+
+    /**
+     * 标识为已跟进
+     * @param userId    用户id
+     */
+    void followUpStart(Long userId);
+
+    /**
+     * 跟进标识
+     * @param userId    用户id
+     * @param status    状态
+     */
+    void followUp(Long userId, String status);
+
+    /**
+     * 标识为已跟进
+     * @param userId    用户id
+     */
+    void followUpMark(Long userId);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/user/UserIpRecordService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/user/UserIpRecordService.java
new file mode 100644
index 0000000..c15bd6a
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/user/UserIpRecordService.java
@@ -0,0 +1,31 @@
+package cn.pluss.platform.user;
+
+import cn.pluss.platform.entity.UserIpRecord;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * <p>
+ * 用户操作IP记录表 服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-09-13
+ */
+public interface UserIpRecordService extends IService<UserIpRecord> {
+
+
+    /**
+     * 保存用户注册IP
+     * @param userId    用户id
+     * @param operatorUserId  操作人用户id
+     */
+    void saveRegIp(String userId, String operatorUserId);
+
+    /**
+     * 保存用户发起进件ip
+     * @param userId    用户id
+     */
+    void saveAuditIp(String userId);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/user/UserLevelService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/user/UserLevelService.java
new file mode 100644
index 0000000..a1e5c0d
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/user/UserLevelService.java
@@ -0,0 +1,53 @@
+package cn.pluss.platform.user;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.entity.UserLevel;
+import cn.pluss.platform.vo.UserLevelVO;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * <p>
+ * 用户等级表 服务类
+ * </p>
+ *
+ * @author bzg
+ * @since 2022-01-13
+ */
+public interface UserLevelService extends IService<UserLevel> {
+
+    /**
+     * 根据用户角色和等级查询配置信息
+     * @date: 2022/1/25 15:10
+     * @param roleCode:
+     * @param levelCode:
+     * @return cn.pluss.platform.entity.UserLevel
+     */
+    UserLevel getLevelInfoByRoleLevel(String roleCode, String levelCode);
+
+    /**
+     * app接口 获取当前用户等级配置信息
+     * @date: 2022/1/25 15:10
+     * @return cn.pluss.platform.api.Result<java.lang.Object>
+     */
+    Result<Object> getAppLevelInfo();
+
+    /**
+     * 根据角色获取用户等级配置
+     * @date: 2022/1/25 15:12
+     * @param roleCode:
+     * @param type:
+     * @return java.util.List<cn.pluss.platform.entity.UserLevel>
+     */
+    List<UserLevelVO> getLevelInfoByRole(String roleCode,Integer type);
+
+    /**
+     * 获取当前交易额度所在的等级
+     * @date: 2022/1/25 23:41
+     * @param teamTransFlow:
+     * @return cn.pluss.platform.entity.UserLevel
+     */
+    UserLevel getNowQuotaLevel(BigDecimal teamTransFlow);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/user/UserMultipleRemarkService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/user/UserMultipleRemarkService.java
new file mode 100644
index 0000000..5d65564
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/user/UserMultipleRemarkService.java
@@ -0,0 +1,40 @@
+package cn.pluss.platform.user;
+
+import cn.pluss.platform.entity.UserMultipleRemark;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  多备注信息服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-05-31
+ */
+public interface UserMultipleRemarkService extends IService<UserMultipleRemark> {
+
+    /**
+     * 查询跟进记录
+     * @param userId    用户id
+     * @return
+     */
+    Page<UserMultipleRemark> pageFollowDataList(Page<UserMultipleRemark> page, Long userId);
+
+
+    /**
+     * 查询跟进记录
+     * @return
+     */
+    Page<UserMultipleRemark> apiPageFollowDataList(Page<UserMultipleRemark> page);
+
+
+    /**
+     * 添加跟进记录
+     * @param userId    用户id
+     * @param remark    跟进备注
+     */
+    void addFollowUpData(Long userId, String remark);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/user/UserProfitService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/user/UserProfitService.java
new file mode 100644
index 0000000..3608f6b
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/user/UserProfitService.java
@@ -0,0 +1,72 @@
+package cn.pluss.platform.user;
+
+import cn.pluss.platform.entity.UserProfit;
+import cn.pluss.platform.vo.UserAppVO;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ *
+ * V2.0模式 创建用户分润
+ * @author bzg
+ * @since 2022-01-14
+ */
+public interface UserProfitService extends IService<UserProfit> {
+
+    /**
+     * 2.0分润计算
+     * @date: 2022/1/25 22:54
+     * @param date:
+     */
+    void createProfitV2(String date);
+
+    /**
+     * 计算代理流水是否到达进行升级
+     * @date: 2022/1/25 22:55
+     */
+    void calcLevelTask();
+
+    /**
+     * 获取用户月团队流水
+     * @date: 2022/1/25 23:01
+     * @param profitMonth:
+     * @return java.util.List<cn.pluss.platform.entity.UserProfit>
+     */
+    List<UserProfit> selectLevelFlow(String profitMonth);
+
+    /**
+     * 获取团队月流水
+     * @param userId    用户id
+     * @param month     月份 yyyy-MM
+     * @return
+     */
+    BigDecimal getMonthTeamFlow(String userId, String month);
+
+    /**
+     * 获取分页下级数据
+     * @param page      分页信息
+     * @param userName  用户名称
+     * @return
+     */
+    Page<UserAppVO> apiPageMonthSubTeamData(Page<UserAppVO> page, String userName);
+
+    /**
+     * 获取分页下级数据
+     * @param page      分页信息
+     * @param userName  用户名称
+     * @return
+     */
+    Page<UserAppVO> pageMonthSubTeamData(Page<UserAppVO> page, String userId, String userName);
+
+    /**
+     * 分页查询
+     * @date: 2022/3/11 15:54
+     * @param page:
+     * @param condition:
+     * @return com.baomidou.mybatisplus.extension.plugins.pagination.Page<cn.pluss.platform.entity.UserProfit>
+     */
+    Page<UserProfit> pageData(Page<UserProfit> page, UserProfit condition);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/user/UserPushIdService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/user/UserPushIdService.java
new file mode 100644
index 0000000..ca0ffb0
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/user/UserPushIdService.java
@@ -0,0 +1,42 @@
+package cn.pluss.platform.user;
+
+import cn.pluss.platform.entity.UserPushId;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * @author djh
+ */
+public interface UserPushIdService extends IService<UserPushId> {
+
+    void setCid(Long userId, String cid);
+
+    void apiSetCid(String cid);
+
+    default UserPushId getByUserId(Long userId) {
+
+        LambdaQueryWrapper<UserPushId> qWrapper = Wrappers.lambdaQuery();
+        qWrapper.eq(UserPushId::getUserId, userId);
+
+        return getBaseMapper().selectOne(qWrapper);
+    }
+
+    default List<String> getGetuiCidListByUserIds(Long... userId) {
+        LambdaQueryWrapper<UserPushId> qWrapper = Wrappers.lambdaQuery();
+        qWrapper.in(UserPushId::getUserId, Arrays.asList(userId));
+
+        List<UserPushId> items = getBaseMapper().selectList(qWrapper);
+
+        List<String> cidList = new ArrayList<>();
+        for (UserPushId item : items) {
+            cidList.add(item.getGetuiClientId());
+        }
+
+        return cidList;
+    }
+}
\ No newline at end of file
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/user/UserPushService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/user/UserPushService.java
new file mode 100644
index 0000000..e92d954
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/user/UserPushService.java
@@ -0,0 +1,36 @@
+package cn.pluss.platform.user;
+
+import java.util.List;
+
+/**
+ * @author djh
+ */
+public interface UserPushService {
+
+    /**
+     * 发起推送
+     * @param notificationTitle 推送标题
+     * @param msgContent        推送内容
+     * @param extrasParam       穿透参数
+     * @param alias             用户id
+     */
+    void push(String notificationTitle, String msgContent, String extrasParam, Long... alias);
+
+    /**
+     * 发起推送
+     * @param notificationTitle 推送标题
+     * @param msgContent        推送内容
+     * @param extrasParam       穿透参数
+     * @param alias             用户id
+     */
+    void push(String notificationTitle, String msgContent, String extrasParam, List<Long> alias);
+
+    /**
+     * 发起推送
+     * @param notificationTitle 推送标题
+     * @param msgContent        推送内容
+     * @param extrasParam       穿透参数
+     * @param alias             用户id
+     */
+    void push(List<String> alias, String notificationTitle, String msgContent, String extrasParam);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/user/UserRoleService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/user/UserRoleService.java
new file mode 100644
index 0000000..935c8f2
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/user/UserRoleService.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.user;
+
+import cn.pluss.platform.entity.UserRole;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 用户角色表 服务类
+ * </p>
+ *
+ * @author bzg
+ * @since 2022-01-13
+ */
+public interface UserRoleService extends IService<UserRole> {
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/user/UserVoiceService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/user/UserVoiceService.java
new file mode 100644
index 0000000..8d83158
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/user/UserVoiceService.java
@@ -0,0 +1,67 @@
+package cn.pluss.platform.user;
+
+import cn.pluss.platform.entity.UserVoice;
+import cn.pluss.platform.mapper.UserVoiceMapper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 用户播报配置表 服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-04-16
+ */
+public interface UserVoiceService extends IService<UserVoice> {
+
+    /**
+     * app获取播报配置
+     * @return
+     */
+    UserVoice apiGetVoiceSetting();
+
+    /**
+     * app修改播报配置
+     */
+    void apiSetVoiceSetting(UserVoice userVoice);
+
+    /**
+     * 获取用户播报配置信息
+     * @param userId
+     * @return
+     */
+    default UserVoice getByUserId(Long userId) {
+        LambdaQueryWrapper<UserVoice> qWrapper = Wrappers.lambdaQuery();
+        qWrapper.eq(UserVoice::getUserId, userId);
+
+        UserVoice userVoice = getBaseMapper().selectOne(qWrapper);
+
+        if (userVoice == null) {
+            return defValue(userId);
+        } else {
+            return userVoice;
+        }
+    }
+
+    /**
+     * 默认值
+     * @param userId    用户id
+     * @return
+     */
+    default UserVoice defValue(Long userId) {
+        UserVoice userVoice = new UserVoice();
+        userVoice.setUserId(userId);
+        userVoice.setDeliveryOrder(UserVoice.ENABLE);
+        userVoice.setMemberCharge(UserVoice.ENABLE);
+        userVoice.setMemberConsume(UserVoice.ENABLE);
+        userVoice.setPayCancel(UserVoice.ENABLE);
+        userVoice.setPaySuccess(UserVoice.ENABLE);
+        userVoice.setUrge(UserVoice.ENABLE);
+        userVoice.setStoreOrder(UserVoice.ENABLE);
+
+        return userVoice;
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/user/impl/GeneralPushUtil.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/user/impl/GeneralPushUtil.java
new file mode 100644
index 0000000..5c4c4fd
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/user/impl/GeneralPushUtil.java
@@ -0,0 +1,172 @@
+package cn.pluss.platform.user.impl;
+
+
+import cn.pluss.platform.user.UserPushService;
+import cn.pluss.platform.util.GetuiPushUtil;
+import cn.pluss.platform.util.IPush;
+import cn.pluss.platform.util.JGPushUtil;
+import cn.pluss.platform.util.MobPushUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 静态推送方法工具类
+ *
+ * @author Djh
+ */
+@Service
+public class GeneralPushUtil implements IPush {
+
+    /**
+     * 生产环境还是开发环境
+     */
+    public final static int PROD = 1;
+
+    private static JGPushUtil jgPushUtil;
+
+    private static MobPushUtil mobPushUtil;
+
+    private static GetuiPushUtil getuiPushUtil;
+
+    @Autowired
+    private UserPushService userPushService;
+
+    static {
+        jgPushUtil = (JGPushUtil) JGPushUtil.getInstance();
+        mobPushUtil = (MobPushUtil) MobPushUtil.getInstance();
+        getuiPushUtil = (GetuiPushUtil) GetuiPushUtil.getInstance();
+    }
+
+    @Override
+    public void sendAndroidByAlias(List<String> alias, String notificationTitle, String msgContent, String extrasParam) {
+        try {
+            // 安卓暂时用极光
+            jgPushUtil.sendAndroidByAlias(alias, notificationTitle, msgContent, extrasParam);
+            userPushService.push(alias, notificationTitle, msgContent, extrasParam);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public void sendIOSByAlias(List<String> alias, String notificationTitle, String msgContent, String extrasParam) {
+        try {
+            mobPushUtil.sendIOSByAlias(alias, notificationTitle, msgContent, extrasParam);
+            userPushService.push(alias, notificationTitle, msgContent, extrasParam);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public void sendAllPlatByAlias(List<String> alias, String notificationTitle, String msgContent, String extrasParam) {
+        try {
+            jgPushUtil.sendAndroidByAlias(alias, notificationTitle, msgContent, extrasParam);
+            mobPushUtil.sendIOSByAlias(alias, notificationTitle, msgContent, extrasParam);
+            userPushService.push(alias, notificationTitle, msgContent, extrasParam);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public void sendIOSAll(String notificationTitle, String msgContent, String extrasParam) {
+        try {
+            mobPushUtil.sendIOSAll(notificationTitle, msgContent, extrasParam);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public void sendAndroidAll(String notificationTitle, String msgContent, String extrasParam) {
+        try {
+            jgPushUtil.sendAndroidAll(notificationTitle, msgContent, extrasParam);
+            getuiPushUtil.sendIOSAll(notificationTitle, msgContent, extrasParam);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public void sendAllPlatAll(String notificationTitle, String msgContent, String extrasParam) {
+        try {
+            jgPushUtil.sendAndroidAll(notificationTitle, msgContent, extrasParam);
+            mobPushUtil.sendIOSAll(notificationTitle, msgContent, extrasParam);
+            getuiPushUtil.sendIOSAll(notificationTitle, msgContent, extrasParam);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void sendAllPlatByUserIdChargeWithCoupon(List<String> alias, BigDecimal payMoney, BigDecimal coupon) {
+        try {
+            String content = "会员充值" + payMoney.setScale(2, RoundingMode.HALF_UP).stripTrailingZeros().toPlainString() + "元";
+            if (coupon != null && !BigDecimal.ZERO.equals(coupon.stripTrailingZeros())) {
+                content += "，赠送" + coupon.setScale(2, RoundingMode.HALF_UP).stripTrailingZeros().toPlainString() + "元";
+            }
+            sendAllPlatByAlias(alias, "会员充值通知", content, "3");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void sendAllPlatByUserIdConsumeWithCoupon(List<String> alias, BigDecimal payMoney, BigDecimal coupon) {
+        try {
+            String content = "会员消费" + payMoney.setScale(2, RoundingMode.HALF_UP).stripTrailingZeros().toPlainString() + "元";
+            if (coupon != null && !BigDecimal.ZERO.equals(coupon.stripTrailingZeros())) {
+                content += "，返" + coupon.setScale(2, RoundingMode.HALF_UP).stripTrailingZeros().toPlainString() + "元";
+            }
+            sendAllPlatByAlias(alias, "会员消费通知", content, "3");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void sendAllPlatByUserIdCancel(List<String> alias, BigDecimal payMoney, BigDecimal coupon) {
+        try {
+            sendAllPlatByAlias(alias, "订单取消支付", "订单取消支付", "3");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public static void main(String[] args) {
+        List<String> alias = new ArrayList<>();
+//        alias.add("1025");
+//         alias.add("1775");
+//         alias.add("1791");
+//         alias.add("syb_1775");
+//         alias.add("1792");
+        // alias.add("1257");
+        // alias.add("syb_828");
+        // alias.add("syb_23999");
+        // alias.add("syb_1257");
+//        alias.add("7714");
+        alias.add("7714");
+        // alias.add("23999");
+        // alias.add("3891");
+        // alias.add("1791");
+        // alias.add("69668");
+        // alias.add("1775");
+        // alias.add("828");
+        // alias.add("43582");
+        // alias.add("7266");
+        // alias.add("33651");
+
+//        sendAndroidByAlias(alias, "收银呗", "您有一笔催单请及时处理", "3");
+//        sendAndroidByAlias(alias, "收银呗", "您有一个新的呼叫服务请及时处理", "3");
+//        sendAndroidByAlias(alias, "收银呗", "收银呗线上店订单来了请及时处理", "3");
+
+//        new GetuiConfig().init();
+//         sendAllPlatByAlias(alias, "收银呗", "收银呗到账100.00元", "3");
+
+        System.out.println("=========over========");
+//        sendIOSAll("收银呗", "收银呗到账100022.00元", "3");
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/user/impl/UserExtraServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/user/impl/UserExtraServiceImpl.java
new file mode 100644
index 0000000..ef2d489
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/user/impl/UserExtraServiceImpl.java
@@ -0,0 +1,46 @@
+package cn.pluss.platform.user.impl;
+
+import cn.pluss.platform.entity.UserExtra;
+import cn.pluss.platform.mapper.UserExtraMapper;
+import cn.pluss.platform.user.UserExtraService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 用户额外字段关联表信息 服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-05-31
+ */
+@Service
+public class UserExtraServiceImpl extends ServiceImpl<UserExtraMapper, UserExtra> implements UserExtraService {
+
+
+    @Override
+    public void followUpStart(Long userId) {
+        followUp(userId, "2");
+    }
+
+    @Override
+    public void followUp(Long userId, String status) {
+        UserExtra entity = new UserExtra();
+        entity.setUserId(userId);
+        entity.setKey(FU);
+
+        UserExtra existData = getOne(new QueryWrapper<>(entity));
+        if (existData == null) {
+            existData = entity;
+        }
+
+        existData.setValue(status);
+        saveOrUpdate(existData);
+    }
+
+    @Override
+    public void followUpMark(Long userId) {
+        followUp(userId, "1");
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/user/impl/UserIpRecordServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/user/impl/UserIpRecordServiceImpl.java
new file mode 100644
index 0000000..1ceab22
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/user/impl/UserIpRecordServiceImpl.java
@@ -0,0 +1,81 @@
+package cn.pluss.platform.user.impl;
+
+import cn.pluss.platform.entity.OperationRecord;
+import cn.pluss.platform.entity.UserIpRecord;
+import cn.pluss.platform.ipLocation.IpLocationService;
+import cn.pluss.platform.mapper.OperationRecordMapper;
+import cn.pluss.platform.mapper.UserIpRecordMapper;
+import cn.pluss.platform.operationRecord.OperationRecordService;
+import cn.pluss.platform.user.UserIpRecordService;
+import cn.pluss.platform.util.IpUtils;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.aliyuncs.geoip.model.v20200101.DescribeIpv4LocationResponse;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
+
+/**
+ * <p>
+ * 用户操作IP记录表 服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-09-13
+ */
+@Service
+public class UserIpRecordServiceImpl extends ServiceImpl<UserIpRecordMapper, UserIpRecord> implements UserIpRecordService {
+
+    @Resource
+    private OperationRecordMapper opRecordMapper;
+
+    @Autowired
+    private IpLocationService ipLocationService;
+
+    @Override
+    public void saveRegIp(String userId, String operatorUserId) {
+        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+        String ipAddr = IpUtils.getIpAddr(request);
+        UserIpRecord entity = new UserIpRecord();
+        entity.setUserId(Integer.parseInt(userId));
+        entity.setRegIp(ipAddr);
+        entity.setRegTime(new Date());
+        save(entity);
+
+        OperationRecord opRecord = new OperationRecord();
+        opRecord.setOperator(operatorUserId);
+        opRecord.setUserId(userId);
+        opRecord.setDictValue("APP_REG");
+        opRecord.setRemark("用户注册");
+
+        DescribeIpv4LocationResponse location = ipLocationService.getLocation(ipAddr);
+        JSONObject extra = (JSONObject) JSON.toJSON(location);
+        opRecord.setExtension(extra);
+
+        opRecordMapper.insert(opRecord);
+    }
+
+    @Override
+    public void saveAuditIp(String userId) {
+        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+        String ipAddr = IpUtils.getIpAddr(request);
+        UserIpRecord entity = new UserIpRecord();
+        entity.setAuditTime(new Date());
+        entity.setUserId(Integer.parseInt(userId));
+        entity.setAuditIp(ipAddr);
+        LambdaUpdateWrapper<UserIpRecord> uWrapper = Wrappers.lambdaUpdate();
+        uWrapper.eq(UserIpRecord::getUserId, userId);
+        boolean updateFlag = update(entity, uWrapper);
+        if (!updateFlag) {
+            save(entity);
+        }
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/user/impl/UserLevelServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/user/impl/UserLevelServiceImpl.java
new file mode 100644
index 0000000..0a44ae5
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/user/impl/UserLevelServiceImpl.java
@@ -0,0 +1,90 @@
+package cn.pluss.platform.user.impl;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.constants.Constant;
+import cn.pluss.platform.converter.Converter;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.entity.UserLevel;
+import cn.pluss.platform.enums.UserRoleEnum;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.UserLevelMapper;
+import cn.pluss.platform.user.UserLevelService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.util.StringUtil;
+import cn.pluss.platform.vo.UserAppVO;
+import cn.pluss.platform.vo.UserLevelVO;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * <p>
+ * 用户等级表 服务实现类
+ * </p>
+ *
+ * @author bzg
+ * @since 2022-01-13
+ */
+@Service
+public class UserLevelServiceImpl extends ServiceImpl<UserLevelMapper, UserLevel> implements UserLevelService {
+
+    @Resource
+    private UserAppService userAppService;
+
+
+    @Override
+    public UserLevel getLevelInfoByRoleLevel(String roleCode, String levelCode) {
+        QueryWrapper<UserLevel> query = new QueryWrapper<UserLevel>().eq("roleCode",roleCode)
+                .eq("levelCode",levelCode);
+        return this.baseMapper.selectOne(query);
+    }
+
+    /**
+     * app 接口 获取用户等级配偶
+     * @date: 2022/1/25 14:54
+     * @return cn.pluss.platform.api.Result<java.lang.Object>
+     */
+    @Override
+    public Result<Object> getAppLevelInfo() {
+        UserApp userApp = userAppService.queryUserAppByToken();
+        MsgException.checkNull(userApp,"未知请求！");
+        MsgException.check(UserRoleEnum.ZY_BST.getCode().equals(userApp.getRoleCode()),"直营团队用户暂不支持当前请求！");
+        UserAppVO vo = new UserAppVO();
+        Converter.INSTANCE.cp(userApp,vo);
+        if(StringUtil.isNotEmpty(userApp.getLevelCode())){
+            if(!userApp.getLevelCode().equals(Constant.USER_MAX_LEVEL_CODE)){
+                vo.setLevelName(userApp.getLevelCode().replace("LV","VIP"));
+            }else{
+                vo.setLevelName("SVIP");
+            }
+        }
+        Integer status = 1;
+        if(Constant.USER_MAX_LEVEL_CODE.equals(vo.getLevelCode())){
+            status = 2;
+        }
+        List<UserLevelVO> list = getLevelInfoByRole(userApp.getRoleCode(),status);
+        vo.setLevelVoList(list);
+        return ResultGenerator.genSuccessResult("获取成功",vo);
+    }
+
+    @Override
+    public List<UserLevelVO> getLevelInfoByRole(String roleCode,Integer type) {
+        return this.baseMapper.getLevelInfoByRole(roleCode,type);
+    }
+
+    /**
+     * 获取当前交易额度所在的等级
+     * @date: 2022/1/25 23:42
+     * @param teamTransFlow:
+     * @return cn.pluss.platform.entity.UserLevel
+     */
+    @Override
+    public UserLevel getNowQuotaLevel(BigDecimal teamTransFlow) {
+        return baseMapper.getNowQuotaLevel(teamTransFlow);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/user/impl/UserMultipleRemarkServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/user/impl/UserMultipleRemarkServiceImpl.java
new file mode 100644
index 0000000..99bab0d
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/user/impl/UserMultipleRemarkServiceImpl.java
@@ -0,0 +1,56 @@
+package cn.pluss.platform.user.impl;
+
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.entity.UserExtra;
+import cn.pluss.platform.entity.UserMultipleRemark;
+import cn.pluss.platform.mapper.UserMultipleRemarkMapper;
+import cn.pluss.platform.shiro.UserService;
+import cn.pluss.platform.user.UserExtraService;
+import cn.pluss.platform.user.UserMultipleRemarkService;
+import cn.pluss.platform.userApp.UserAppService;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-05-31
+ */
+@Service
+public class UserMultipleRemarkServiceImpl extends ServiceImpl<UserMultipleRemarkMapper, UserMultipleRemark> implements UserMultipleRemarkService {
+
+    @Autowired
+    private UserAppService uaService;
+
+    @Override
+    public Page<UserMultipleRemark> pageFollowDataList(Page<UserMultipleRemark> page, Long userId) {
+        LambdaQueryWrapper<UserMultipleRemark> qWrapper = Wrappers.lambdaQuery();
+        qWrapper.eq(UserMultipleRemark::getUserId, userId);
+        qWrapper.orderByDesc(UserMultipleRemark::getCreateTime);
+
+        return page(page, qWrapper);
+    }
+
+    @Override
+    public Page<UserMultipleRemark> apiPageFollowDataList(Page<UserMultipleRemark> page) {
+        final UserApp tokenUa = uaService.queryUserAppByToken();
+        return pageFollowDataList(page, tokenUa.getUserId());
+    }
+
+    @Override
+    public void addFollowUpData(Long userId, String remark) {
+        UserMultipleRemark entity = new UserMultipleRemark();
+        entity.setUserId(userId)
+                .setRemark(remark)
+                .setCode(UserExtraService.FU);
+
+        save(entity);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/user/impl/UserProfitServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/user/impl/UserProfitServiceImpl.java
new file mode 100644
index 0000000..c1cdae1
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/user/impl/UserProfitServiceImpl.java
@@ -0,0 +1,173 @@
+package cn.pluss.platform.user.impl;
+
+import cn.pluss.platform.entity.ExtraLevelBenefit;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.entity.UserLevel;
+import cn.pluss.platform.entity.UserProfit;
+import cn.pluss.platform.enums.UserRoleEnum;
+import cn.pluss.platform.level.ExtraLevelBenefitService;
+import cn.pluss.platform.mapper.UserAppMapper;
+import cn.pluss.platform.mapper.UserProfitMapper;
+import cn.pluss.platform.merchantOrder.MerchantOrderService;
+import cn.pluss.platform.user.UserLevelService;
+import cn.pluss.platform.user.UserProfitService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.util.DateUtils;
+import cn.pluss.platform.util.StringUtil;
+import cn.pluss.platform.vo.UserAppVO;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author bzg
+ * @since 2022-01-14
+ */
+@Service
+@Slf4j
+public class UserProfitServiceImpl extends ServiceImpl<UserProfitMapper, UserProfit> implements UserProfitService {
+
+    @Resource
+    private UserAppService userAppService;
+
+    @Resource
+    private UserAppMapper userAppMapper;
+
+    @Resource
+    private UserLevelService userLevelService;
+
+    @Resource
+    private MerchantOrderService merchantOrderService;
+
+    @Resource
+    private ExtraLevelBenefitService extraLevelBenefitService;
+
+    public static final int MAX_LEVEL_AMT = 1000000;
+
+    @Override
+    public void createProfitV2(String date) {
+        if(StringUtil.isEmpty(date)){
+            date = DateUtils.formatDateDefault(DateUtils.add(Calendar.DAY_OF_MONTH, new Date(), -1),"yyyy-MM-dd");
+        }
+        Integer maxSort = merchantOrderService.getOrderMaxSort(date);
+        Integer uMaxSort = userAppMapper.getMaxSort();
+        Integer nowSort = maxSort;
+        if(!uMaxSort.equals(maxSort)){
+            nowSort = uMaxSort;
+        }
+        for (int i = nowSort; i > 0; i-- ) {
+            List<UserProfit> list = merchantOrderService.getOrderFlow(date, i);
+            for (UserProfit p:list) {
+                p.setCreateTime(DateUtils.currentDate());
+                BigDecimal teamTransFlow = BigDecimal.ZERO;
+                BigDecimal flow = p.getTeamTransFlow();
+                BigDecimal beforFlow = baseMapper.getBeforeFlowByUserId(p.getUserId());
+                teamTransFlow = teamTransFlow.add(flow).add(beforFlow);
+                if(teamTransFlow.doubleValue() >= MAX_LEVEL_AMT){
+                    int maxCount = teamTransFlow.intValue() / MAX_LEVEL_AMT;
+                    if(maxCount > 0){
+                        ExtraLevelBenefit levelBenefit = extraLevelBenefitService.getByUserId(p.getUserId());
+                        if(levelBenefit == null){
+                            ExtraLevelBenefit benefit = new ExtraLevelBenefit(p.getUserId().intValue(),maxCount);
+                            extraLevelBenefitService.save(benefit);
+                        }else{
+                            levelBenefit.setMaxCount(maxCount);
+                            extraLevelBenefitService.updateById(levelBenefit);
+                        }
+                    }
+                }
+            }
+            if(list.size() < 1000){
+                saveBatch(list);
+            }else{
+                saveBatch(list,list.size());
+            }
+        }
+    }
+
+    @Override
+    public BigDecimal getMonthTeamFlow(String userId, String month) {
+
+
+        return null;
+    }
+
+    @Override
+    public Page<UserAppVO> apiPageMonthSubTeamData(Page<UserAppVO> page, String userName) {
+        UserApp tokenUa = userAppService.queryUserAppByToken();
+        return pageMonthSubTeamData(page, tokenUa.getUserId() + "", userName);
+    }
+
+    @Override
+    public Page<UserAppVO> pageMonthSubTeamData(Page<UserAppVO> page, String userId, String userName) {
+        return baseMapper.selectPageSubTeamData(page, userId, userName);
+    }
+
+    @Override
+    public void calcLevelTask() {
+        String profitMonth = DateUtils.formatDateDefault(DateUtils.add(Calendar.MONTH,new Date(),-1),"yyyy-MM");
+        List<UserProfit> list = selectLevelFlow(profitMonth);
+        if(!list.isEmpty()){
+            for (UserProfit u:list) {
+                if(StringUtil.isEmpty(u.getUserId())){
+                    continue;
+                }
+                UserApp userApp = userAppMapper.selectByUserId(u.getUserId());
+                String oldLevelCode = userApp.getLevelCode();
+                if(userApp == null || userApp.getLevelCode() == null || UserRoleEnum.ZY_BST.getCode().equals(userApp.getRoleCode())){
+                    continue;
+                }
+                UserLevel userLevel = userLevelService.getNowQuotaLevel(u.getTeamTransFlow());
+                if(userLevel == null || userApp.getLevelCode().equals(userLevel.getLevelCode())){
+                    continue;
+                }
+                boolean flag = StringUtil.isNumber(oldLevelCode.replace(UserLevel.LEVEL_CODE_PREFIX, ""));
+                boolean nowFlag = StringUtil.isNumber(userLevel.getLevelCode().replace(UserLevel.LEVEL_CODE_PREFIX, ""));
+                if(!flag || !nowFlag){
+                    continue;
+                }
+                Integer oldLevel = Integer.valueOf(oldLevelCode.replace(UserLevel.LEVEL_CODE_PREFIX, ""));
+                Integer upLevel = Integer.valueOf(userLevel.getLevelCode().replace(UserLevel.LEVEL_CODE_PREFIX, ""));
+                if(oldLevel >= upLevel){
+                    continue;
+                }
+                userApp.setLevelCode(userLevel.getLevelCode());
+                userAppMapper.updateById(userApp);
+                log.info("月统计用户流水是否达标升级，用户ID:{},之前等级:{}，更新后的等级：{}更新成功",userApp.getUserId(),oldLevelCode,userLevel.getLevelCode());
+            }
+        }
+    }
+
+    /**
+     * 获取用户月团队流水
+     * @date: 2022/1/25 22:59
+     * @return java.util.List<cn.pluss.platform.entity.UserProfit>
+     */
+    @Override
+    public List<UserProfit> selectLevelFlow(String profitMonth) {
+        return baseMapper.selectLevelFlow(profitMonth);
+    }
+
+    /**
+     * 分页查询
+     * @date: 2022/3/11 15:55
+     * @param page:
+     * @param condition:
+     * @return com.baomidou.mybatisplus.extension.plugins.pagination.Page<cn.pluss.platform.entity.UserProfit>
+     */
+    @Override
+    public Page<UserProfit> pageData(Page<UserProfit> page, UserProfit condition) {
+        return  baseMapper.pageData(page,condition);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/user/impl/UserPushIdServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/user/impl/UserPushIdServiceImpl.java
new file mode 100644
index 0000000..1530a6a
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/user/impl/UserPushIdServiceImpl.java
@@ -0,0 +1,54 @@
+package cn.pluss.platform.user.impl;
+
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.entity.UserPushId;
+import cn.pluss.platform.mapper.UserPushIdMapper;
+import cn.pluss.platform.user.UserPushIdService;
+import cn.pluss.platform.userApp.UserAppService;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+
+/**
+ * @author djh
+ */
+@Service
+public class UserPushIdServiceImpl extends ServiceImpl<UserPushIdMapper, UserPushId> implements UserPushIdService {
+
+    @Autowired
+    private UserAppService userAppService;
+
+    @Override
+    public void setCid(Long userId, String cid) {
+        LambdaQueryWrapper<UserPushId> qWrapper = Wrappers.lambdaQuery();
+        qWrapper.eq(UserPushId::getUserId, userId);
+        UserPushId entity = baseMapper.selectOne(qWrapper);
+
+        if (entity != null) {
+            baseMapper.deleteById(entity.getId());
+        }
+
+        qWrapper.clear();
+        qWrapper.eq(UserPushId::getGetuiClientId, cid);
+        entity = baseMapper.selectOne(qWrapper);
+        if (entity != null) {
+            baseMapper.deleteById(entity.getId());
+        }
+
+        entity = new UserPushId();
+        entity.setUserId(userId);
+        entity.setGetuiClientId(cid);
+
+        baseMapper.insert(entity);
+    }
+
+    @Override
+    public void apiSetCid(String cid) {
+        UserApp tokenUa = userAppService.checkApiToken();
+        setCid(tokenUa.getUserId(), cid);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/user/impl/UserPushServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/user/impl/UserPushServiceImpl.java
new file mode 100644
index 0000000..55ba3a0
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/user/impl/UserPushServiceImpl.java
@@ -0,0 +1,50 @@
+package cn.pluss.platform.user.impl;
+
+import cn.pluss.platform.user.UserPushIdService;
+import cn.pluss.platform.user.UserPushService;
+import cn.pluss.platform.util.GetuiPushUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 推送服务类，目前只接入个推
+ * @author djh
+ */
+@Service
+public class UserPushServiceImpl implements UserPushService {
+
+    @Autowired
+    private UserPushIdService userPushIdService;
+
+    @Override
+    public void push(String notificationTitle, String msgContent, String extrasParam, Long... alias) {
+        List<String> cidList = userPushIdService.getGetuiCidListByUserIds(alias);
+        GetuiPushUtil.getInstance().sendAllPlatByAlias(cidList, notificationTitle, msgContent, extrasParam);
+    }
+
+    @Override
+    public void push(String notificationTitle, String msgContent, String extrasParam, List<Long> alias) {
+        Long[] aliasArr = new Long[alias.size()];
+        for (int i = 0; i < alias.size(); i++) {
+            aliasArr[i] = alias.get(i);
+        }
+
+        List<String> cidList = userPushIdService.getGetuiCidListByUserIds(aliasArr);
+        GetuiPushUtil.getInstance().sendAllPlatByAlias(cidList, notificationTitle, msgContent, extrasParam);
+    }
+
+    @Override
+    public void push(List<String> alias, String notificationTitle, String msgContent, String extrasParam) {
+        Long[] aliasArr = new Long[alias.size()];
+        for (int i = 0; i < alias.size(); i++) {
+            aliasArr[i] = Long.parseLong(alias.get(i));
+        }
+
+        List<String> cidList = userPushIdService.getGetuiCidListByUserIds(aliasArr);
+        if (!cidList.isEmpty()) {
+            GetuiPushUtil.getInstance().sendAllPlatByAlias(cidList, notificationTitle, msgContent, extrasParam);
+        }
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/user/impl/UserRoleServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/user/impl/UserRoleServiceImpl.java
new file mode 100644
index 0000000..37c4fbc
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/user/impl/UserRoleServiceImpl.java
@@ -0,0 +1,20 @@
+package cn.pluss.platform.user.impl;
+
+import cn.pluss.platform.entity.UserRole;
+import cn.pluss.platform.mapper.UserRoleMapper;
+import cn.pluss.platform.user.UserRoleService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 用户角色表 服务实现类
+ * </p>
+ *
+ * @author bzg
+ * @since 2022-01-13
+ */
+@Service
+public class UserRoleServiceImpl extends ServiceImpl<UserRoleMapper, UserRole> implements UserRoleService {
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/user/impl/UserVoiceServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/user/impl/UserVoiceServiceImpl.java
new file mode 100644
index 0000000..92f4e8f
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/user/impl/UserVoiceServiceImpl.java
@@ -0,0 +1,44 @@
+package cn.pluss.platform.user.impl;
+
+import cn.pluss.platform.converter.Converter;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.entity.UserVoice;
+import cn.pluss.platform.mapper.UserVoiceMapper;
+import cn.pluss.platform.user.UserVoiceService;
+import cn.pluss.platform.userApp.UserAppService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 用户播报配置表 服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2022-04-16
+ */
+@Service
+public class UserVoiceServiceImpl extends ServiceImpl<UserVoiceMapper, UserVoice> implements UserVoiceService {
+
+    @Autowired
+    private UserAppService userAppService;
+
+    @Override
+    public UserVoice apiGetVoiceSetting() {
+        UserApp userApp = userAppService.checkApiToken();
+
+        return getByUserId(userApp.getUserId());
+    }
+
+    @Override
+    public void apiSetVoiceSetting(UserVoice userVoice) {
+        UserApp userApp = userAppService.checkApiToken();
+
+        UserVoice currentData = getByUserId(userApp.getUserId());
+
+        Converter.INSTANCE.cp(userVoice, currentData);
+
+        saveOrUpdate(currentData);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/userAddress/UserAddressService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/userAddress/UserAddressService.java
new file mode 100644
index 0000000..8d46c18
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/userAddress/UserAddressService.java
@@ -0,0 +1,26 @@
+package cn.pluss.platform.userAddress;
+
+import cn.pluss.platform.entity.UserAddress;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 用户地址信息表 服务类
+ * </p>
+ *
+ * @author bzg
+ * @since 2021-11-17
+ */
+public interface UserAddressService extends IService<UserAddress> {
+
+    /**
+     * @description:获取用户设置的地址
+     * @date: 2021/11/17 16:53
+     * @param userId:
+     * @param type:
+     * @param defFlag:
+     */
+    List<UserAddress> getAddressList(Long userId, Integer type,boolean defFlag);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/userAddress/impl/UserAddressServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/userAddress/impl/UserAddressServiceImpl.java
new file mode 100644
index 0000000..33e6a2e
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/userAddress/impl/UserAddressServiceImpl.java
@@ -0,0 +1,57 @@
+package cn.pluss.platform.userAddress.impl;
+
+import cn.pluss.platform.entity.UserAddress;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.UserAddressMapper;
+import cn.pluss.platform.userAddress.UserAddressService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 用户地址信息表 服务实现类
+ * </p>
+ *
+ * @author bzg
+ * @since 2021-11-17
+ */
+@Service
+public class UserAddressServiceImpl extends ServiceImpl<UserAddressMapper, UserAddress> implements UserAddressService {
+
+
+    @Override
+    public List<UserAddress> getAddressList(Long userId, Integer type,boolean defFlag) {
+        return baseMapper.getAddressList(userId,type,defFlag);
+    }
+
+    @Override
+    public boolean saveOrUpdate(UserAddress entity) {
+        checkSaveBefore(entity);
+        if(UserAddress.DEFAULT_FLAG.equals(entity.getDefFlag())){
+            UpdateWrapper<UserAddress> updateWrapper = new UpdateWrapper<>();
+            updateWrapper.set("defFlag","0").eq("userId",entity.getUserId()).eq("type",1);
+            this.update(updateWrapper);
+        }
+        return super.saveOrUpdate(entity);
+    }
+
+    public void checkSaveBefore(UserAddress entity) {
+        MsgException.checkBlank(entity.getName(),"联系人姓名不能为空");
+        MsgException.checkBlank(entity.getPhone(),"联系人手机号为空");
+        MsgException.checkBlank(entity.getAddress(),"详细地址不能为空");
+        MsgException.checkBlank(entity.getAreaCode(),"地区CODE不能为空");
+        MsgException.checkBlank(entity.getAreaName(),"地区Name不能为空");
+        if(entity.getId() == null){
+            MsgException.checkNull(entity.getUserId(),"用户ID不能为空");
+            QueryWrapper<UserAddress> queryWrapper = new QueryWrapper<UserAddress>().eq("userId",entity.getUserId());
+            int count = this.count(queryWrapper);
+            if(count > 10){
+                MsgException.throwException("收货地址添加过多,请删除一些再添加哦");
+            }
+        }
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/userApp/UserAppService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/userApp/UserAppService.java
new file mode 100644
index 0000000..b6f70ad
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/userApp/UserAppService.java
@@ -0,0 +1,402 @@
+package cn.pluss.platform.userApp;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.dto.MerchSearchDTO;
+import cn.pluss.platform.dto.StaffDTO;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.enums.UserRoleEnum;
+import cn.pluss.platform.leshua.ExpandDto;
+import cn.pluss.platform.mapper.UserAppMapper;
+import cn.pluss.platform.vo.*;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+public interface UserAppService extends IService<UserApp> {
+
+    /**
+     * 多个userId拼接成的字符串
+     *
+     * @param userIds 用户id串
+     * @return
+     */
+    Map<String, Object> getUserByUid(String userIds);
+
+    default UserApp appGetOne(Wrapper<Object> queryWrapper) {
+        return ((UserAppMapper) getBaseMapper()).selectUserApp(queryWrapper);
+    }
+
+    default UserApp queryUserApp(UserApp userApp) {
+        return getBaseMapper().selectOne(new QueryWrapper<>(userApp));
+    }
+
+    default List<UserApp> queryUserAppList(UserApp userApp) {
+        return ((UserAppMapper) getBaseMapper()).queryUserAppList(userApp);
+    }
+
+    default void updateUserAppUserId(UserApp userApp) {
+        ((UserAppMapper) getBaseMapper()).updateUserAppUserId(userApp);
+    }
+
+    default Integer queryUserAppPageCount(Map<String, Object> map) {
+        return ((UserAppMapper) getBaseMapper()).queryUserAppPageCount(map);
+    }
+
+    Page<UserInfoVO> queryUserInfoVOPage(Map<String, Object> map);
+
+    /**
+     * 未实名信息
+     *
+     * @return
+     */
+    default List<UserExpandVO> queryUserAppNoRealNamePage(Map<String, Object> map) {
+        return ((UserAppMapper) getBaseMapper()).queryUserAppNoRealNamePage(map);
+    }
+
+    /**
+     * 未实名统计数量
+     *
+     * @param map
+     * @return
+     */
+    default Integer queryUserAppNoRealNamePageCount(Map<String, Object> map) {
+        return ((UserAppMapper) getBaseMapper()).queryUserAppNoRealNamePageCount(map);
+    }
+
+
+    /**
+     * queryUserAppRealNamePage:(已实名认证信息). <br/>
+     *
+     * @param map
+     * @return
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    default List<UserExpandVO> queryUserAppRealNamePage(Map<String, Object> map) {
+        return ((UserAppMapper) getBaseMapper()).queryUserAppRealNamePage(map);
+    }
+
+    /**
+     * queryUserAppRealNamePage:(已实名认证条数). <br/>
+     *
+     * @param map
+     * @return
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    default Integer queryUserAppRealNamePageCount(Map<String, Object> map) {
+        return ((UserAppMapper) getBaseMapper()).queryUserAppRealNamePageCount(map);
+    }
+
+
+    /**
+     * 是商户的信息
+     *
+     * @param map
+     * @return
+     */
+    default List<UserExpandVO> queryUserAppIsMerchantPage(Map<String, Object> map) {
+        return ((UserAppMapper) getBaseMapper()).queryUserAppIsMerchantPage(map);
+    }
+
+    /**
+     * 是商户信息统计数量
+     *
+     * @param map
+     * @return
+     */
+    default Integer queryUserAppIsMerchantPageCount(Map<String, Object> map) {
+        return ((UserAppMapper) getBaseMapper()).queryUserAppIsMerchantPageCount(map);
+    }
+
+
+    /**
+     * saveStaff:(添加员工). <br/>
+     *
+     * @param staffDTO
+     * @return
+     * @throws Exception
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    Result<Map<String, Object>> saveStaff(StaffDTO staffDTO);
+
+    /**
+     * deleteStaff:(删除员工). <br/>
+     *
+     * @param id
+     * @return
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    Result<Map<String, Object>> deleteStaff(Long id);
+
+    UserApp queryUserAppByToken();
+
+    /**
+     * 获取拓展商户列表.
+     * 传递
+     *
+     * @param dto
+     * @return
+     */
+    Map<String, Object> expandMerchantList(ExpandDto dto);
+
+    default List<UserApp> queryUserAppListByPhone(UserApp userApp) {
+        return ((UserAppMapper) getBaseMapper()).queryUserAppListByPhone(userApp);
+    }
+
+    default List<UserApp> queryUserAppPageByPhone(Map<String, Object> map) {
+        return ((UserAppMapper) getBaseMapper()).queryUserAppPageByPhone(map);
+    }
+
+    default Integer queryUserAppPageCountByPhone(Map<String, Object> map) {
+        return ((UserAppMapper) getBaseMapper()).queryUserAppPageCountByPhone(map);
+    }
+
+    default UserApp getUserAppByUserId(Serializable userId) {
+        return ((UserAppMapper) getBaseMapper()).selectByUserId(userId);
+    }
+
+    default UserApp selectInfoJoinByUserId(Serializable userId) {
+        return ((UserAppMapper) getBaseMapper()).selectInfoJoinByUserId(userId);
+    }
+
+    /**
+     * 查询一个用户开的所有店铺的流水信息
+     *
+     * @return
+     */
+    Map<String, Object> queryAllMerchantFee(String userId, String merchantUserId);
+
+    /**
+     * 根据inviteNum查询用户信息
+     *
+     * @param inviteNum inviteNum
+     * @return
+     */
+    default UserApp queryUserAppByInviteNum(String inviteNum) {
+        return ((UserAppMapper) getBaseMapper()).queryUserAppByInviteNum(inviteNum);
+    }
+
+    /**
+     * 获取商户交易信息，以及总和
+     *
+     * @param dto
+     * @return
+     */
+    Map<String, Object> getMerchantListByCondition(ExpandDto dto);
+
+    /**
+     * 获取商户交易信息，以及总和
+     *
+     * @param page           分页参数
+     * @param merchSearchDTO 查询参数
+     * @return
+     */
+    Map<String, Object> getMerchantListByConditionV2(Page<MerchSummaryVO> page, MerchSearchDTO merchSearchDTO);
+
+    /**
+     * 根据推广员id关联查询商户信息，结算信息
+     *
+     * @return
+     */
+    default UserApp queryUserAppJoinById(Long userId) {
+        return ((UserAppMapper) getBaseMapper()).queryUserAppJoinById(userId);
+    }
+
+    /**
+     * 进件接口
+     *
+     * @param jsonObject
+     * @throws Exception
+     */
+    void merchantAudit(JSONObject jsonObject, String channelId);
+
+    /**
+     * 商户进件请求, 待我们审核
+     */
+    void merchantAuditReq();
+
+    /**
+     * 进件修改, 当前特指修改结算信息，只允许修改结算信息
+     */
+    void editMerchantAudit(String userId);
+
+    UserApp queryUserBaseInfoByToken();
+
+    default UserApp queryUserAppJoinByUserId(Long userId) {
+        return ((UserAppMapper) getBaseMapper()).queryUserAppJoinByUserId(userId);
+    }
+
+    /**
+     * 保存员工信息
+     *
+     * @param userApp 员工信息
+     */
+    void appSaveStaffInfo(UserApp userApp);
+
+    Integer getUserAppWithChannelStatus(QueryWrapper<UserApp> queryWrapper);
+
+    Map<String, Object> agentStaffShareInfo();
+
+    /**
+     * 关联查询分页
+     *
+     * @param page    分页
+     * @param userApp 查询参数
+     * @return 分页查询结果
+     */
+    Page<UserApp> pageJoinData(Page<UserApp> page, UserApp userApp);
+
+    List<String> storeMemberList(String merchantCode);
+
+    /**
+     * 获取下级商户数量
+     *
+     * @param userId 用户id
+     * @return 下级商户数量
+     */
+    Integer getSubUserCount(Long userId, String startDate, String endDate);
+
+    /**
+     * 分页查询活动商户详情列表
+     *
+     * @param userInfoVO 查询参数
+     */
+    Page<UserInfoVO> queryActPage(Page<UserInfoVO> page, UserInfoVO userInfoVO);
+
+
+    Integer getParentUserId(Integer parentUserId);
+
+    Integer getUserId(String merchantCode);
+
+    Map<String, Object> getStaffPage(Integer currPage, Integer size, UserInfoVO userInfoVO);
+
+    /**
+     * 拉起支付宝或者微信支付
+     *
+     * @param userApp 用户信息
+     * @param type    付款方式. 1：支付宝; 2: 微信支付
+     * @return 订单信息
+     */
+    Map<String, Object> getLevelUpOrder(UserApp userApp, String type);
+
+    /**
+     * 拉起支付宝或者微信支付
+     *
+     * @param userApp 用户信息
+     * @param level   目标等级
+     * @return 订单信息
+     */
+    Map<String, Object> getLevelUpOrderV2Info(UserApp userApp, String level);
+
+    /**
+     * 拉起支付宝或者微信支付
+     *
+     * @param userApp 用户信息
+     * @param type    付款方式. 1：支付宝; 2: 微信支付
+     * @param level   目标等级
+     * @return 订单信息
+     */
+    Map<String, Object> getLevelUpOrderV2(UserApp userApp, String type, String level);
+
+    /**
+     * 获取老板userApp
+     *
+     * @param userAppStaff 员工userApp
+     * @return 老板userApp
+     */
+    UserApp getBossUserApp(UserApp userAppStaff);
+
+    /**
+     * 获取老板userApp
+     *
+     * @param userId 用户id
+     * @return 老板userApp
+     */
+    UserApp getBossUserApp(Integer userId, String merchantCode);
+
+    Page<UserApp> appPageStaff(UserApp userApp);
+
+    /**
+     * 后台调整用户实名审核状态
+     *
+     * @param userId     用户ID
+     * @param status     状态, 2、不通过;
+     * @param certReason 驳回理由
+     */
+    void userCert(String userId, Integer status, String certReason);
+
+    /**
+     * @return java.util.Map<java.lang.String, java.lang.Object>
+     * @description:首页统计数据
+     * @date: 2021/10/19 17:23
+     */
+    Map<String, Object> getPlatformData();
+
+    Integer getMaxSort();
+
+    /**
+     * 获取直推用户的新增数量和总数
+     *
+     * @param userId:
+     * @param date:
+     * @param dateType:
+     * @return cn.pluss.platform.vo.UserNumVO
+     * @date: 2022/1/24 23:25
+     */
+    UserNumVO getUserNumInfo(Long userId, String date, Integer dateType);
+
+    /**
+     * 检查wap请求token
+     *
+     * @param token:
+     * @param request:
+     * @param roleEnum:
+     * @date: 2022/2/16 14:18
+     */
+    UserApp checkWapToken(String token, HttpServletRequest request, UserRoleEnum roleEnum);
+
+    /**
+     * 根据邀请码获取用户信息
+     *
+     * @param inviteNum:
+     * @param zyBst:
+     * @return cn.pluss.platform.entity.UserApp
+     * @date: 2022/2/16 15:53
+     */
+    UserApp getUserAppByInviteNum(String inviteNum, UserRoleEnum zyBst);
+
+    /**
+     * 保存bst代理账号
+     *
+     * @param params:
+     * @date: 2022/2/16 17:54
+     */
+    void bstSaveAgent(Map<String, Object> params);
+
+    /**
+     * 校验API用户登录TOKEN
+     *
+     * @return
+     */
+    UserApp checkApiToken();
+
+    /**
+     * 根据手机号获取用户信息
+     *
+     * @param phone
+     * @param userApp
+     * @return
+     */
+    UserApp getUserAppByPhone(String phone, UserApp userApp);
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/userApp/impl/UserAppServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/userApp/impl/UserAppServiceImpl.java
new file mode 100644
index 0000000..2f1028b
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/userApp/impl/UserAppServiceImpl.java
@@ -0,0 +1,1889 @@
+package cn.pluss.platform.userApp.impl;
+
+import cn.pluss.platform.IdCardService;
+import cn.pluss.platform.ali.AliService;
+import cn.pluss.platform.api.PageInfo;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.channel.BaseMerchantAuditService;
+import cn.pluss.platform.channel.MerchantAuditService;
+import cn.pluss.platform.common.CommonRemarkService;
+import cn.pluss.platform.common.RiskBlacklistService;
+import cn.pluss.platform.converter.Converter;
+import cn.pluss.platform.converter.UserAppConverter;
+import cn.pluss.platform.dto.AccountDTO;
+import cn.pluss.platform.dto.MerchSearchDTO;
+import cn.pluss.platform.dto.MerchantFeeDTO;
+import cn.pluss.platform.dto.StaffDTO;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.enums.UserRoleEnum;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.jfShop.JfShopHandler;
+import cn.pluss.platform.leshua.BizConstants;
+import cn.pluss.platform.leshua.ExpandDto;
+import cn.pluss.platform.mapper.*;
+import cn.pluss.platform.merchant.AccountService;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchant.MerchantStaffConnService;
+import cn.pluss.platform.merchant.StaffPermissionService;
+import cn.pluss.platform.merchantChannel.MerchantChannelService;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.merchantIncome.MerchantIncomeService;
+import cn.pluss.platform.merchantStore.MerchantStoreService;
+import cn.pluss.platform.notice.NoticeService;
+import cn.pluss.platform.phoneValidateCode.PhoneValidateCodeService;
+import cn.pluss.platform.roleUserInfo.RoleUserInfoService;
+import cn.pluss.platform.systemConfig.SystemConfigService;
+import cn.pluss.platform.user.UserIpRecordService;
+import cn.pluss.platform.user.impl.GeneralPushUtil;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.userInfo.UserInfoService;
+import cn.pluss.platform.util.*;
+import cn.pluss.platform.vo.*;
+import cn.pluss.platform.wechat.WechatService;
+import cn.pluss.platform.wx.WxTalkService;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Isolation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.*;
+
+/**
+ * @author djh
+ */
+@Slf4j
+@Service("userAppService")
+@RequiredArgsConstructor
+public class UserAppServiceImpl extends ServiceImpl<UserAppMapper, UserApp> implements UserAppService {
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantChannelService channelService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantBaseInfoMapper baseInfoMapper;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantIncomeService merchantIncomeService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantProfitMapper profitMapper;
+
+    @Setter(onMethod_ = {@Autowired})
+    private UserInfoService userInfoService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantStoreService merchantStoreService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantOrderMapper merchantOrderMapper;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantBaseInfoService mbiService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantChannelStatusService mcsService;
+
+    @Setter(onMethod_ = {@Autowired, @Lazy})
+    private AliService aliService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private RoleUserInfoService roleUserInfoService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private IdCardService idCardService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private WechatService wechatService;
+
+    @Setter(onMethod_ = {@Autowired, @Qualifier("sxfMerchantAuditService")})
+    private MerchantAuditService sxfMerchantAuditService;
+
+    @Setter(onMethod_ = {@Autowired, @Qualifier("leshuaMerchantAuditService")})
+    private MerchantAuditService leshuaMerchantAuditService;
+
+    @Setter(onMethod_ = {@Autowired, @Qualifier("ryxMerchantAuditService")})
+    private MerchantAuditService ryxMerchantAuditService;
+
+    @Setter(onMethod_ = {@Autowired, @Qualifier("ysAuditServiceV2")})
+    private MerchantAuditService ysAuditServiceV2;
+
+    @Setter(onMethod_ = {@Autowired, @Qualifier("ysAuditService")})
+    private MerchantAuditService ysAuditService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private SystemConfigService systemConfigService;
+
+    @Setter(onMethod_ = {@Autowired, @Lazy})
+    private WxTalkService wxTalkService;
+
+    @Setter(onMethod_ = {@Lazy, @Autowired})
+    private AccountService accountService;
+
+    @Setter(onMethod_ = {@Lazy, @Autowired})
+    private NoticeService noticeService;
+
+    @Setter(onMethod_ = {@Lazy, @Autowired})
+    private PhoneValidateCodeService phoneValidateCodeService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantStaffConnService staffConnService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private StaffPermissionService staffPermissionService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private CommonRemarkService remarkService;
+
+    @Autowired
+    private UserIpRecordService ipRecordService;
+
+    @Setter(onMethod_ = {@Autowired, @Lazy})
+    private RiskBlacklistService blacklistService;
+
+    @Setter(onMethod_ = {@Autowired, @Lazy})
+    private JfShopHandler jfShopHandler;
+
+    @Autowired
+    private GeneralPushUtil generalPushUtil;
+
+    @Autowired
+    private UserAssessMapper userAssessMapper;
+
+    @Autowired
+    private UserRoleMapper userRoleMapper;
+
+
+    @Override
+    public Map<String, Object> getUserByUid(String userIds) {
+        String[] userIdArr = userIds.replace("，", ",").split(",");
+        List<String> userNameList = new ArrayList<>();
+        List<String> parentNameList = new ArrayList<>();
+        List<String> aliasList = new ArrayList<>();
+        List<String> userIdList = new ArrayList<>();
+        List<String> parentIdsList = new ArrayList<>();
+        int i = 1;
+        String fastName = "";
+        for (String uid : userIdArr) {
+            MerchantBaseInfo baseInfo = mbiService.getMerchantBaseInfoByUserId(uid);
+            if (baseInfo == null) {
+                MerchantChannelStatus channel = mcsService.getChannelByMerchantId(uid);
+                if (channel != null) {
+                    baseInfo = mbiService.getMerchantBaseInfoByMerchantCode(channel.getMerchantCode());
+                }
+            }
+
+            if (baseInfo != null) {
+                if (i == 1) {
+                    fastName = baseInfo.getAlias();
+                }
+                aliasList.add(baseInfo.getAlias());
+            }
+
+            UserApp userApp = baseMapper.selectOne(new QueryWrapper<UserApp>().eq("userId", uid));
+            MsgException.checkNull(userApp, "未查询到相关用户信息");
+            UserAppConverter.INSTANCE.copyProperties(baseInfo, userApp);
+            userNameList.add(userApp.getUserName());
+            userIdList.add(uid);
+            parentIdsList.add(userApp.getParentId() + "");
+            if (userApp.getParentId() != null) {
+                UserApp parentUserApp = new UserApp();
+                parentUserApp.setUserId(userApp.getParentId());
+                parentUserApp = queryUserApp(parentUserApp);
+                parentNameList.add(parentUserApp.getUserName());
+            }
+            i++;
+        }
+        Map<String, Object> resultMap = new HashMap<>();
+        resultMap.put("userName", StringUtils.join(userNameList, ","));
+        resultMap.put("parentName", StringUtils.join(parentNameList, ","));
+        resultMap.put("alias", StringUtils.join(aliasList, ","));
+        resultMap.put("fastName", fastName);
+        resultMap.put("userIds", StringUtils.join(userIdList, ","));
+        resultMap.put("parentIds", StringUtils.join(parentIdsList, ","));
+
+        return resultMap;
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public Page<UserInfoVO> queryUserInfoVOPage(Map<String, Object> map) {
+        List<List<?>> queryResult = baseMapper.queryUserInfoVOPage(map);
+        List<UserInfoVO> result = (List<UserInfoVO>) queryResult.get(0);
+
+        long page = ((Integer) map.get("offset")).longValue() + 1L;
+        long pageSize = ((Integer) map.get("pageSize")).longValue();
+        Page<UserInfoVO> pageResult = new Page<>(page, pageSize);
+        pageResult.setRecords(result);
+        Long count = (Long) queryResult.get(1).get(0);
+        pageResult.setTotal(count);
+
+        if (result.isEmpty()) {
+            return pageResult;
+        }
+        List<String> merchantCodeList = new ArrayList<>();
+        for (UserInfoVO userInfoVO : result) {
+            merchantCodeList.add(userInfoVO.getMerchantCode() + "");
+        }
+
+        List<MerchantChannelStatusVO> channelStatusList = mcsService.listByMerchantCodeList(merchantCodeList);
+
+        Map<String, Integer> mapMerchantId = new HashMap<>();
+
+        for (UserInfoVO userInfoVO : result) {
+            List<MerchantChannelStatus> statusList = userInfoVO.getChannelStatusList();
+            if (statusList == null) {
+                statusList = new ArrayList<>();
+                userInfoVO.setChannelStatusList(statusList);
+            }
+
+            Iterator<MerchantChannelStatusVO> iterator = channelStatusList.iterator();
+            while (iterator.hasNext()) {
+                MerchantChannelStatusVO item = iterator.next();
+                if (item.getMerchantCode().equals(userInfoVO.getMerchantCode())) {
+                    if (!mapMerchantId.containsKey(item.getChannel() + item.getMerchantId() + item.getMerchantCode())) {
+                        statusList.add(item);
+                        mapMerchantId.put(item.getChannel() + item.getMerchantId() + item.getMerchantCode(), 1);
+                    }
+
+                    if (Objects.equals(4, item.getChannel())) {
+                        if (userInfoVO.getWxMercNoD0() == null) {
+                            userInfoVO.setWxMercNoD0(item.getWxMercNo());
+                        } else {
+                            userInfoVO.setWxMercNoD0(userInfoVO.getWxMercNoD0() + " / " + item.getWxMercNo());
+                        }
+
+                        if (userInfoVO.getZfbMercNoD0() == null) {
+                            userInfoVO.setZfbMercNoD0(item.getZfbMercNo());
+                        } else {
+                            userInfoVO.setZfbMercNoD0(userInfoVO.getZfbMercNoD0() + " / " + item.getWxMercNo());
+                        }
+                    } else {
+                        userInfoVO.setWxMercNoD1(item.getWxMercNo());
+                        userInfoVO.setZfbMercNoD1(item.getZfbMercNo());
+                    }
+
+                    iterator.remove();
+                }
+            }
+        }
+
+        return pageResult;
+    }
+
+    @Override
+    public Result<Map<String, Object>> saveStaff(StaffDTO staffDTO) {
+        Map<String, Object> result = new HashMap<>(16);
+        try {
+            if (staffDTO.getId() != null && staffDTO.getId() != 0) {
+                UserInfo userInfo = new UserInfo();
+                UserApp userApp = staffDTO.convert();
+                UserApp userAppl = new UserApp();
+                userAppl.setId(staffDTO.getId());
+                UserApp queryUserApp = baseMapper.selectOne(new QueryWrapper<>(userAppl));
+                userInfo.setId(queryUserApp.getUserId());
+                userInfo = userInfoService.queryUserInfo(userInfo);
+                userInfo.setTrueName(userApp.getUserName());
+                userInfo.setPhone(userApp.getPhone());
+                userInfo.setPassword(MD5Util.MD5Encode(userApp.getPassword(), BizConstants.CHARSET_UTF8));
+                userInfoService.updateUserInfo(userInfo);
+                userApp.setId(staffDTO.getId());
+                baseMapper.updateById(userApp);
+                result.put("code", "1");
+                result.put("msg", "修改成功");
+                log.debug("修改员工成功");
+            } else {
+                MerchantStore merchantStore = new MerchantStore();
+                merchantStore.setStoreId(staffDTO.getStoreId());
+                MerchantStore queryMerchantStore = merchantStoreService.queryMerchantStore(merchantStore);
+                staffDTO.setMerchantCode(queryMerchantStore.getMerchantCode());
+                staffDTO.setMerchantName(queryMerchantStore.getMerchantName());
+                staffDTO.setStoreId(queryMerchantStore.getStoreId());
+                staffDTO.setStoreName(queryMerchantStore.getStoreName());
+                staffDTO.setLoginName(staffDTO.getLoginName() + "@shouyin");
+                if (!staffDTO.getPassword().equals(staffDTO.getVerifyPassword())) {
+                    result.put("code", "0");
+                    result.put("msg", "两次输入的密码不一致");
+                    return ResultGenerator.genFailResult("两次输入的密码不一致", result);
+                }
+                UserApp userApp = staffDTO.convert();
+                UserInfo userInfo = new UserInfo();
+                userInfo.setLoginName(userApp.getLoginName());
+                List<UserInfo> queryUserInfoList = userInfoService.queryUserInfoList(userInfo);
+                if (queryUserInfoList != null && !queryUserInfoList.isEmpty()) {
+                    result.put("code", "0");
+                    result.put("msg", "账号已存在");
+                    return ResultGenerator.genFailResult("账号已存在", result);
+                }
+                userInfo.setTrueName(userApp.getUserName());
+                userInfo.setPhone(userApp.getPhone());
+                userInfo.setPassword(MD5Util.MD5Encode(userApp.getPassword(), "utf-8"));
+                userInfoService.saveUserInfo(userInfo);
+                userApp.setUserType("staff");
+                userApp.setUserId(userInfo.getId());
+                userApp.setCreateDt(new Date());
+                baseMapper.insert(userApp);
+                result.put("code", "1");
+                result.put("msg", "添加成功");
+                log.debug("添加员工成功");
+            }
+            return ResultGenerator.genSuccessResult(result);
+        } catch (Exception e) {
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            e.printStackTrace();
+            log.error("添加失败");
+            result.put("code", "0");
+            result.put("msg", "添加失败");
+            return ResultGenerator.genFailResult("添加失败", result);
+        }
+    }
+
+    @Override
+    public Result<Map<String, Object>> deleteStaff(Long id) {
+        Map<String, Object> result = new HashMap<>(16);
+        try {
+            UserApp userApp = new UserApp();
+            userApp.setId(id);
+            UserApp queryUserApp = baseMapper.selectById(id);
+            Long userId = queryUserApp.getUserId();
+            baseMapper.deleteById(id);
+            userInfoService.removeById(userId);
+            result.put("code", "1");
+            result.put("msg", "删除成功");
+            return ResultGenerator.genSuccessResult(result);
+        } catch (Exception e) {
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            e.printStackTrace();
+            result.put("code", "0");
+            result.put("msg", "删除失败");
+            return ResultGenerator.genFailResult("删除失败", result);
+        }
+    }
+
+    @Override
+    public UserApp queryUserAppByToken() {
+        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+        String token = request.getHeader("token");
+        String merchantCode = request.getHeader("merchantCode");
+        UserApp userApp = new UserApp();
+        userApp.setToken(token);
+
+        if (token == null) {
+            throw new MsgException("缺少商户信息");
+        }
+
+        QueryWrapper<Object> queryWrapper = new QueryWrapper<>()
+                .eq("ua.token", token)
+                .and(StringUtils.isNotBlank(merchantCode), i -> i.in("ua.userType", "promoter", "agent").or()
+                        .eq("msc.merchantCode", merchantCode));
+
+        userApp = baseMapper.selectUserApp(queryWrapper);
+
+        if (userApp == null) {
+            throw new MsgException("用户不存在");
+        }
+
+        if ("staff".equals(userApp.getUserType())) {
+            if (StringUtils.isNotBlank(merchantCode)) {
+                MerchantStaffConn staffConn = new MerchantStaffConn();
+                staffConn.setUserId(userApp.getUserId());
+                staffConn.setMerchantCode(merchantCode);
+                staffConn = staffConnService.getOne(new QueryWrapper<>(staffConn));
+                if (staffConn != null) {
+                    userApp.setMerchantCode(merchantCode);
+                }
+            } else {
+                MerchantStaffConn staffConn = new MerchantStaffConn();
+                staffConn.setUserId(userApp.getUserId());
+
+                QueryWrapper<MerchantStaffConn> qWrapper = new QueryWrapper<>(staffConn);
+                qWrapper.last("limit 1");
+                staffConn = staffConnService.getOne(qWrapper);
+                userApp.setMerchantCode(staffConn.getMerchantCode());
+            }
+        }
+
+        return userApp;
+    }
+
+    @Override
+    public Map<String, Object> expandMerchantList(ExpandDto dto) {
+        if (StringUtil.isEmpty(dto.getUserId())) {
+            throw new MsgException("请先登录账号");
+        }
+
+        if (StringUtil.isEmpty(dto.getType())) {
+            throw new MsgException("请传实名类型");
+        }
+
+        UserApp userApp = new UserApp().setUserId(Long.parseLong(dto.getUserId()));
+        userApp = queryUserApp(userApp);
+        if ("agent_staff".equals(userApp.getUserType())) {
+            dto.setAgentStaffId(dto.getUserId());
+            dto.setUserId(userApp.getParentId() + "'");
+            dto.setRecommend("1");
+        }
+
+        if ("agent".equals(userApp.getUserType())) {
+            dto.setRecommend("1");
+        }
+
+        List<String> parentIdList = getParentIdByRecommendType(dto.getRecommend(), dto.getUserId(), null);
+        if (parentIdList.isEmpty()) {
+            parentIdList.add("99999999999999999999999");
+        }
+
+        // 此处需要加通道判断
+        IPage<UserApp> page = new Page<>(dto.getPage(), dto.getSize());
+        IPage<UserApp> pageUserApp = baseMapper.getExPageUserApp(page, dto, parentIdList);
+        // 返回参数
+        Map<String, Object> result = new HashMap<>(16);
+        PageInfo<UserApp> pager = PageUtils.page(pageUserApp);
+        result.put("pager", pager);
+
+        return result;
+    }
+
+    @Override
+    public Map<String, Object> queryAllMerchantFee(String userId, String merchantUserId) {
+        // 商户的下级代理商数量
+        int subClientCount;
+        // 本月流水
+        BigDecimal agentMonthMoney = BigDecimal.ZERO;
+        // 总流水
+        BigDecimal agentTotalMoney = BigDecimal.ZERO;
+        // 本月分润
+        BigDecimal agentMonthProfit = BigDecimal.ZERO;
+        // 总分润
+        BigDecimal agentTotalProfit = BigDecimal.ZERO;
+        // 商户信息列表
+        List<Map<String, Object>> merchantBillList = new ArrayList<>();
+        // 商户信息Map, 用于对商户信息进行查询和收集
+        Map<String, Map<String, Object>> map = new HashMap<>();
+        Map<String, Object> agentMap = new HashMap<>();
+        Map<String, Object> resultMap = new HashMap<>();
+        agentMap.put("parentId", merchantUserId);
+        subClientCount = baseMapper.queryUserAppPageCountByPhone(agentMap);
+
+        // 1、查询所有的店铺
+        List<MerchantBaseInfo> merchantBaseInfos = baseInfoMapper.queryMerchantListByUserId(merchantUserId);
+        if (merchantBaseInfos.isEmpty()) {
+            merchantBaseInfos = baseInfoMapper.selectListByUserId(merchantUserId);
+        }
+        if (!merchantBaseInfos.isEmpty()) {
+            List<String> merchantCodeList = new ArrayList<>();
+            for (MerchantBaseInfo merchantBaseInfo : merchantBaseInfos) {
+                merchantCodeList.add(merchantBaseInfo.getMerchantCode());
+                Map<String, Object> merchantData = new HashMap<>();
+                // 流水默认初始化为0
+                merchantData.put("alias", merchantBaseInfo.getAlias());
+                merchantData.put("merchantCode", merchantBaseInfo.getMerchantCode());
+                merchantData.put("merchantMonthMoney", BigDecimal.ZERO);
+                merchantData.put("merchantTotalMoney", BigDecimal.ZERO);
+                merchantBillList.add(merchantData);
+                map.put(merchantBaseInfo.getMerchantCode(), merchantData);
+            }
+
+            // 2、查询所有店铺当前当月的流水及分润
+            Date startDate = DateUtils.getBeginDayOfMonth();
+            Date endDate = DateUtils.getEndDayOfMonth();
+
+            UserApp userApp = new UserApp().setUserId(Long.parseLong(userId));
+            userApp = queryUserApp(userApp);
+            if (userApp.getUserType().equals("agent_staff")) {
+                userId = userApp.getParentId() + "";
+            }
+            List<MerchantFeeDTO> monthBillInfoList = profitMapper.queryMerchantBillWithProfit(userId, merchantCodeList, startDate, endDate);
+            // 3、查询所有店铺所有流水及分润
+            List<MerchantFeeDTO> totalBillInfoList = profitMapper.queryMerchantBillWithProfit(userId, merchantCodeList, null, null);
+
+            // 对需要的数据进行统计
+            for (MerchantFeeDTO merchantFeeDTO : monthBillInfoList) {
+                // 总计
+                agentMonthMoney = agentMonthMoney.add(merchantFeeDTO.getMoney());
+                agentMonthProfit = agentMonthProfit.add(merchantFeeDTO.getProfit());
+                // 单店统计
+                Map<String, Object> merchantData = map.get(merchantFeeDTO.getMerchantCode());
+                merchantData.put("merchantMonthMoney", merchantFeeDTO.getMoney());
+            }
+
+            for (MerchantFeeDTO merchantFeeDTO : totalBillInfoList) {
+                // 总计
+                agentTotalMoney = agentTotalMoney.add(merchantFeeDTO.getMoney());
+                agentTotalProfit = agentTotalProfit.add(merchantFeeDTO.getProfit());
+                // 单店统计
+                Map<String, Object> merchantData = map.get(merchantFeeDTO.getMerchantCode());
+                merchantData.put("merchantTotalMoney", merchantFeeDTO.getMoney());
+            }
+        }
+
+        //下级代理商数
+        resultMap.put("nextAgentCount", subClientCount + "");
+        //本月流水
+        resultMap.put("agantMonthMoney", agentMonthMoney + "");
+        //总流水
+        resultMap.put("agantTotalMoney", agentTotalMoney + "");
+        //本月分润
+        resultMap.put("agantMonthProfit", agentMonthProfit + "");
+        //总分润
+        resultMap.put("agantTotalProfit", agentTotalProfit + "");
+        resultMap.put("merchantList", merchantBillList);
+
+        return resultMap;
+    }
+
+    /**
+     * 1-直推，2-间推，3-二级间推
+     *
+     * @param type   1，2，3
+     * @param userId 用户id
+     * @return id列表
+     */
+    private List<String> getParentIdByRecommendType(String type, String userId, List<String> secondaryList) {
+        List<String> result = new ArrayList<>();
+        List<String> direct = new ArrayList<>();
+        List<String> indirect;
+        List<String> secondary;
+
+        direct.add(userId);
+        if ("1".equals(type)) {
+            return direct;
+        }
+
+        //查询出直推的集合
+        indirect = getDirectRecommendUserIdList(direct);
+        if ("2".equals(type)) {
+            // 保存间推数据，方便推断查出来的商户是间推还是二级间推
+            if (secondaryList != null) {
+                secondaryList.addAll(indirect);
+            }
+            return indirect;
+        }
+
+        //查询出间推的集合
+        // secondary = getDirectRecommendUserIdList(indirect);
+        // if ("3".equals(type)) {
+        //     return secondary;
+        // }
+
+        result.addAll(direct);
+        result.addAll(indirect);
+        // result.addAll(secondary);
+
+        return result;
+    }
+
+    /**
+     * 获取直接推荐的用户id
+     *
+     * @param userIdList 推荐人userId列表
+     * @return 用户id列表
+     */
+    private List<String> getDirectRecommendUserIdList(List<String> userIdList) {
+        List<String> result = new ArrayList<>();
+        UserApp query = new UserApp();
+        if (userIdList.isEmpty()) {
+            return result;
+        }
+
+        query.setParentIdList(userIdList);
+        query.setLoginName("1");
+        List<UserApp> userAppList = queryUserAppListByPhone(query);
+        for (UserApp userApp : userAppList) {
+            result.add(userApp.getUserId() + "");
+        }
+
+        return result;
+    }
+
+    @Override
+    public Map<String, Object> getMerchantListByConditionV2(Page<MerchSummaryVO> page, MerchSearchDTO merchSearchDTO) {
+        Page<MerchSummaryVO> resultPage = baseMapper.selectMerchantSummaryPage(page, merchSearchDTO);
+        Map<String, Object> result = new HashMap<>(4);
+        result.put("listData", resultPage);
+
+        for (MerchSummaryVO record : resultPage.getRecords()) {
+            MerchSummaryVO.wrapper(record);
+        }
+
+        MerchSummaryVO summaryVO = baseMapper.selectBillCountAndTotalFee(merchSearchDTO);
+        result.put("count", summaryVO.getCount());
+        result.put("totalFee", summaryVO.getTotalFee());
+
+        return result;
+    }
+
+    @Override
+    public Map<String, Object> getMerchantListByCondition(ExpandDto dto) {
+        UserApp userApp = queryUserAppByToken();
+
+        if ("agent_staff".equals(userApp.getUserType())) {
+            dto.setAgentStaffId(dto.getUserId());
+            dto.setUserId(userApp.getParentId() + "'");
+            dto.setRecommend("1");
+        }
+
+        if ("agent".equals(userApp.getUserType())) {
+            dto.setRecommend("1");
+        }
+
+        //间推集合
+        List<String> secondaryList = new ArrayList<>();
+        List<String> parentIdList = getParentIdByRecommendType(dto.getRecommend(), dto.getUserId(), secondaryList);
+
+        QueryWrapper<UserApp> userAppQueryWrapper = new QueryWrapper<>();
+        userAppQueryWrapper.in("parentId", parentIdList)
+                .like(StringUtils.isNotEmpty(dto.getMerchantName()), "alias", dto.getMerchantName())
+                .eq("status", "3");
+
+        if (dto.getAgentStaffIds() != null && !dto.getAgentStaffIds().isEmpty()) {
+            String index = dto.getAgentStaffIds().get(0);
+            if ("-1".equals(index)) {
+                userAppQueryWrapper.isNull("agentStaffId");
+            } else {
+                userAppQueryWrapper.in("agentStaffId", dto.getAgentStaffIds());
+            }
+        }
+
+        userAppQueryWrapper.eq(StringUtils.isNotEmpty(dto.getAgentStaffId()), "agentStaffId", dto.getAgentStaffId())
+                .gt(StringUtils.isNotEmpty(dto.getStartTime()), "createDt", dto.getStartTime())
+                .lt(StringUtils.isNotEmpty(dto.getEndTime()), "createDt", dto.getEndTime())
+                .orderByDesc("createDt");
+
+        // 分页用户数据
+        IPage<UserApp> pageInfo = new Page<>(dto.getPage(), dto.getSize());
+        IPage<UserApp> pageUserAppList = baseMapper.selectCustomList(pageInfo, userAppQueryWrapper);
+        // 全部数据
+        userAppQueryWrapper.last("");
+        // 获取用户总数
+//        Integer count = baseMapper.selectCount(userAppQueryWrapper);
+        userAppQueryWrapper.select("merchantCode");
+
+
+        List<String> merchantCodeList = new ArrayList<>();
+
+        for (UserApp item : pageUserAppList.getRecords()) {
+            merchantCodeList.add(item.getMerchantCode());
+        }
+
+        List<Map<String, Object>> merchantTotalMoneyList = new ArrayList<>();
+        if (!merchantCodeList.isEmpty()) {
+            // 获取查询出来的每个店铺的营业额
+            merchantTotalMoneyList = merchantOrderMapper.selectGroupMerchantTotalConsumeMoney(merchantCodeList);
+        }
+
+        // 将每个店铺的营业额和店铺基本信息填入相应店铺的数据实体类中
+        for (UserApp item : pageUserAppList.getRecords()) {
+            Double totalMoney = item.getTotalMoney();
+            if (totalMoney == null) {
+                totalMoney = 0.00d;
+            }
+            for (Map<String, Object> merchantTotalMoneyMap : merchantTotalMoneyList) {
+                Object merchantCode = merchantTotalMoneyMap.get("merchantCode");
+                if (!item.getMerchantCode().equals(merchantCode)) {
+                    continue;
+                }
+
+                Object totalConsumeFee = merchantTotalMoneyMap.get("totalConsumeFee");
+                if ("1".equals(merchantTotalMoneyMap.get("status"))) {
+                    totalMoney = totalMoney + Double.parseDouble(totalConsumeFee.toString());
+                } else {
+                    totalMoney = totalMoney - Double.parseDouble(totalConsumeFee.toString());
+                }
+            }
+            item.setTotalMoney(totalMoney);
+        }
+
+        // 返回参数
+        Map<String, Object> result = new HashMap<>(16);
+        PageInfo<UserApp> pager = PageUtils.page(pageUserAppList);
+        result.put("pager", pager);
+        result.put("merchantCount", pageUserAppList.getTotal() + "");
+
+        // 如果带店名的筛选条件，即表明不是新增商户和全部商户页面
+        if (StringUtils.isNotEmpty(dto.getMerchantName())) {
+            return result;
+        }
+
+        // 获取总用户数，去分页
+        BigDecimal merchantMoney = BigDecimal.ZERO;
+        result.put("merchantMoney", merchantMoney + "");
+
+        return result;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void merchantAudit(JSONObject jsonObject, String channelId) {
+        MsgException.checkBlank(channelId, "请选择进件通道");
+
+        MerchantChannel validChannel = channelService.getValidChannel(channelId);
+        MsgException.checkNull(validChannel, "不存在的进件通道，或所选通道暂不支持进件");
+
+        String userId = (String) jsonObject.get("userId");
+
+        UserApp userApp = new UserApp().setUserId(Long.parseLong(userId));
+        userApp = getOne(new QueryWrapper<>(userApp));
+
+        if ("1".equals(channelId)) {
+            MerchantChannelStatus ryxAuditData = mcsService.getByMerchantCode(userApp.getMerchantCode(), 3);
+            if (ryxAuditData != null && Objects.equals(ryxAuditData.getChannel(), 3)) {
+                throw new MsgException("已在【瑞银信】进件的商户禁止在【随行付】通道进件");
+            }
+        }
+
+        if ("3".equals(channelId)) {
+            MerchantChannelStatus ryxAuditData = mcsService.getByMerchantCode(userApp.getMerchantCode(), 1);
+            if (ryxAuditData != null && Objects.equals(ryxAuditData.getChannel(), 1)) {
+                throw new MsgException("已在【随行付】进件的商户禁止在【瑞银信】通道进件");
+            }
+        }
+
+        /*
+         * 先查询该通道下是否有记录
+         */
+        MerchantChannelStatus mcs = mcsService.getByMerchantCode(userApp.getMerchantCode(), Integer.parseInt(channelId));
+        if (mcs == null) {
+            throw new MsgException("商户未提交进件请求");
+        } else {
+            if (mcs.getChannel() != null) {
+                if (Integer.parseInt(channelId) == mcs.getChannel()
+                        && MerchantChannelStatus.isAudited(mcs)) {
+                    throw new MsgException("当前通道下已进件，请选择别的进件通道");
+                }
+            }
+        }
+
+        MerchantChannelStatus.checkCanAudit(mcs);
+
+        // 添加行数据锁, 然后重新校验
+        MerchantChannelStatus.checkCanAudit(mcs);
+
+        switch (channelId) {
+            case "1":
+                // 随行付
+                sxfMerchantAuditService.merchantAudit(userId, false);
+                break;
+            case "2":
+                // 乐刷，暂不支持
+                leshuaMerchantAuditService.merchantAudit(userId, false);
+                break;
+            case "3":
+                // 瑞银信
+                ryxMerchantAuditService.merchantAudit(userId, false);
+                break;
+            case "4":
+                // 银盛
+                ysAuditServiceV2.merchantAudit(userId, false);
+                break;
+            default:
+                MsgException.throwException("未知的进件通道");
+        }
+
+        wxTalkService.sendAuditResultAlert(userId);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class, isolation = Isolation.READ_COMMITTED)
+    public void merchantAuditReq() {
+        UserApp userApp = queryUserAppByToken();
+        MsgException.checkBlank(userApp.getMerchantCode(), "请完善经营信息");
+
+        AccountDTO realAccount = accountService.getRealAccount(userApp.getUserId() + "");
+
+        MsgException.checkNull(realAccount, "请完善商户结算信息");
+
+        MsgException.checkBlank(userApp.getInviteNum(), "请先填写邀请码");
+
+        CommonRemark commonRemark = new CommonRemark()
+                .setUserId(userApp.getUserId().intValue())
+                .setCode("CAN_AUDIT");
+        commonRemark = remarkService.getOne(new QueryWrapper<>(commonRemark).last(" limit 1"));
+        if (commonRemark != null && "-1".equals(commonRemark.getRemark())) {
+            throw new MsgException("当前状态不能进件，请联系客服");
+        }
+
+        String certNo = realAccount.getIdcard().getCertNo();
+        RiskBlacklist riskBlacklist = new RiskBlacklist().setIdcardNo(certNo);
+        int count = blacklistService.count(new QueryWrapper<>(riskBlacklist));
+        if (count > 0) {
+            throw new MsgException("风控黑名单，禁止进件");
+        }
+
+        // 保存进件信息之前，先做D0、D1的判断
+        MerchantChannelStatus validData = mcsService.getValidData(userApp.getMerchantCode());
+        String pushMsg;
+        boolean flagD1 = validData == null || validData.getChannel() == null || Objects.equals(4, validData.getChannel());
+        if (flagD1) {
+            pushMsg = "商家审核已提交，将会在下个工作日内给出审核结果";
+        } else {
+            pushMsg = "实时到账申请已提交，将会在三个工作日内给出审核结果";
+        }
+        mcsService.reqAudit(userApp.getMerchantCode());
+
+        Notice notice = new Notice();
+        notice.setUserId(userApp.getUserId() + "");
+        String uniqueKey = "auditReq" + System.currentTimeMillis();
+        notice.setNoticeCode(uniqueKey);
+        notice.setUniqueKey(uniqueKey);
+        notice.setCreateDt(new Date());
+        notice.setConrtent(pushMsg);
+        noticeService.saveMerAuthNotice(notice);
+        ipRecordService.saveAuditIp(userApp.getUserId() + "");
+        generalPushUtil.sendAllPlatByAlias(Collections.singletonList(userApp.getUserId() + ""), "商家审核通知", pushMsg, "1");
+
+        LambdaQueryWrapper<UserApp> qWrapper = Wrappers.lambdaQuery();
+        qWrapper.eq(UserApp::getUserId, userApp.getParentId()).last("limit 1");
+        UserApp one = getOne(qWrapper);
+
+        if (one != null && "1".equals(one.getAutoAudit())) {
+            // 有自动权限先自动审核
+            try {
+                if (flagD1) {
+                    MerchantBaseInfo mbi = mbiService.getMerchantBaseInfoByUserId(userApp.getUserId() + "");
+                    if ("1".equals(mbi.getMerchantType())) {
+                        log.info("小微自动进件");
+                        ryxMerchantAuditService.merchantAudit(userApp.getUserId() + "", false);
+                    } else {
+                        log.info("个体户自动进件");
+                        sxfMerchantAuditService.merchantAudit(userApp.getUserId() + "", false);
+                    }
+                } else {
+                    // mcc问题，暂不设置自动进件
+//                    ysAuditServiceV2.merchantAudit(userApp.getUserId() + "", false);
+                }
+
+            } catch (Exception e) {
+                e.printStackTrace();
+                log.warn("自动审核失败");
+            }
+        }
+    }
+
+    @Override
+    public void editMerchantAudit(String userId) {
+        UserApp userApp = new UserApp().setUserId(Long.parseLong(userId));
+
+        final MerchantBaseInfo mbi = mbiService.getMerchantBaseInfoByMerchantCode(userApp.getMerchantCode());
+
+        userApp = queryUserApp(userApp);
+        MsgException.checkNull(userApp, "无法获取对应的商户信息");
+
+        MerchantChannelStatus channelStatus = mcsService.getValidData(userApp.getMerchantCode());
+
+        switch (channelStatus.getChannel().toString()) {
+            case "1":
+                // 随行付
+                sxfMerchantAuditService.editMerchantAudit(userId);
+                sendEditApplyNotice(userApp.getUserId() + "", mbi.getAlias(), "次日到账");
+                break;
+            case "2":
+                // 乐刷，暂不支持
+                leshuaMerchantAuditService.editMerchantAudit(userId);
+                sendEditApplyNotice(userApp.getUserId() + "", mbi.getAlias(), "次日到账");
+                break;
+            case "3":
+                // 瑞银信
+                ryxMerchantAuditService.editMerchantAudit(userId);
+                sendEditApplyNotice(userApp.getUserId() + "", mbi.getAlias(), "次日到账");
+                break;
+            case "4":
+                // throw new MsgException("暂不支持修改该操作, 请联系客服进行银行卡信息变更");
+                // 银盛
+                ysAuditServiceV2.editMerchantAudit(userId);
+                sendEditApplyNotice(userApp.getUserId() + "", mbi.getAlias(), "实时到账");
+                break;
+            default:
+                throw new MsgException("未知的进件通道");
+        }
+    }
+
+    private void sendEditApplyNotice(String userId, String alias, String settleName) {
+        noticeService.sendTempNotice("结算卡修改申请通知", BaseMerchantAuditService.editApplyNoticeTemplate, null, null, userId, alias, settleName);
+    }
+
+    @Override
+    public UserApp queryUserBaseInfoByToken() {
+        UserAppVO result = new UserAppVO();
+        UserApp userApp = queryUserAppByToken();
+        UserInfo userInfo = userInfoService.getMainUserInfo(userApp.getUserId());
+        UserInfo userInfoThis = userInfoService.getById(userApp.getUserId());
+        userApp.setPayPassword(userInfo.getPayPassword());
+        userApp.setPhone(userInfo.getPhone());
+        userApp.setFaceCert(userInfoThis.getFaceCert());
+
+        String faceCompare = userInfoThis.getFaceCompare() == null ? "0" : userInfoThis.getFaceCompare();
+        userApp.setFaceCompare(faceCompare);
+
+        LambdaQueryWrapper<MerchantChannelStatus> qWrapper = Wrappers.lambdaQuery();
+        qWrapper.eq(MerchantChannelStatus::getMerchantCode, userApp.getMerchantCode());
+        List<MerchantChannelStatus> mcsList = mcsService.list(qWrapper);
+        MerchantChannelStatus validMcs = mcsService.getValidData(userApp.getMerchantCode());
+
+        for (MerchantChannelStatus item : mcsList) {
+            if (Objects.equals(item.getVirChannelFlag(), Account.CHANNEL_TYPE_D1)) {
+                result.setMerchAuditStatusD1(item.getAppStatus());
+            }
+
+            if (Objects.equals(item.getVirChannelFlag(), Account.CHANNEL_TYPE_D0)) {
+                result.setMerchAuditStatusD0(item.getAppStatus());
+            }
+        }
+
+        if (validMcs != null) {
+            userApp.setMerchantAuditStatus(validMcs.getAppStatus());
+            userApp.setMerchantId(validMcs.getMerchantId());
+            userApp.setAuditReason(validMcs.getRemark());
+        } else {
+            userApp.setMerchantId(null);
+            userApp.setMerchantAuditStatus(MerchantChannelStatus.AUDIT_STATUS_RESET);
+        }
+
+        if ("staff".equals(userApp.getUserType())) {
+            UserApp queryUserApp2 = new UserApp();
+            queryUserApp2.setMerchantCode(userApp.getMerchantCode());
+            queryUserApp2.setUserType("promoter");
+            queryUserApp2 = queryUserApp(queryUserApp2);
+        }
+
+        if (!StringUtils.isEmpty(userApp.getMerchantCode())) {
+            Long userId = userApp.getUserId();
+            MerchantStore queryMerchantStore = new MerchantStore();
+            queryMerchantStore.setMerchantCode(userApp.getMerchantCode());
+            MerchantStore merchantStore = merchantStoreService.queryMerchantStore(queryMerchantStore);
+            UserAppConverter.INSTANCE.copyProperties(merchantStore, userApp);
+
+            MerchantBaseInfo merchantBaseInfo = new MerchantBaseInfo();
+            merchantBaseInfo.setMerchantCode(userApp.getMerchantCode());
+            merchantBaseInfo = mbiService.queryMerchantBaseInfo(merchantBaseInfo);
+            UserAppConverter.INSTANCE.copyProperties(merchantBaseInfo, userApp);
+            userApp.setUserId(userId);
+        }
+
+        userApp.setAisleSwitch(Integer.valueOf(systemConfigService.getaisleSwitch()));
+        IdCard legalIdCard;
+        if (StringUtils.isNotEmpty(userApp.getMerchantCode())) {
+            legalIdCard = idCardService.getCertIdCard(userApp.getUserId() + "");
+            if (legalIdCard != null) {
+                userApp.setBankCertName(legalIdCard.getCertName());
+            }
+        }
+
+        Converter.INSTANCE.cp(userApp, result);
+
+        return result;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void appSaveStaffInfo(UserApp userApp) {
+        UserApp tokenUserApp = queryUserAppByToken();
+        userApp.setLoginName(userApp.getLoginName().replaceAll("[ \u3000]", ""));
+
+        if ("promoter".equals(tokenUserApp.getUserType())) {
+            saveStaff(userApp);
+        } else {
+            throw new MsgException("没有权限");
+        }
+    }
+
+    @Override
+    public Integer getUserAppWithChannelStatus(QueryWrapper<UserApp> queryWrapper) {
+        return baseMapper.selectUserAppWithChannelStatusCount(queryWrapper);
+    }
+
+    @Override
+    public Map<String, Object> agentStaffShareInfo() {
+        Map<String, Object> result = new HashMap<>();
+        UserApp userApp = queryUserAppByToken();
+
+        BigDecimal totalConsume = BigDecimal.ZERO;
+        BigDecimal monthConsume = BigDecimal.ZERO;
+        int totalOrderCount = 0;
+        int monthOrderCount = 0;
+        int totalMerchantCount;
+        int monthMerchantCount = 0;
+
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(Calendar.DAY_OF_MONTH, 1);
+        calendar.set(Calendar.HOUR_OF_DAY, 0);
+        calendar.set(Calendar.MINUTE, 0);
+        calendar.set(Calendar.SECOND, 0);
+        calendar.set(Calendar.MILLISECOND, 0);
+
+        Date monthFirst = calendar.getTime();
+
+        // 获取推广的商户
+        QueryWrapper<UserApp> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("agentStaffId", userApp.getUserId());
+        // TODO 暂不确定是否需要添加秒审的商户
+        queryWrapper.in("merchantAuditStatus", "3");
+        List<UserApp> merchantList = baseMapper.selectListWithChannelStatus(queryWrapper);
+
+        List<String> merchantCodeList = new ArrayList<>();
+
+        totalMerchantCount = merchantList.size();
+        for (UserApp item : merchantList) {
+            merchantCodeList.add(item.getMerchantCode());
+
+            if (monthFirst.before(item.getCreateDt())) {
+                monthMerchantCount++;
+            }
+        }
+
+        if (merchantCodeList.isEmpty()) {
+            result.put("totalConsume", totalConsume.setScale(2, RoundingMode.HALF_UP).toString());
+            result.put("monthConsume", monthConsume.setScale(2, RoundingMode.HALF_UP).toString());
+            result.put("totalOrderCount", totalOrderCount);
+            result.put("monthOrderCount", monthOrderCount);
+            result.put("totalMerchantCount", totalMerchantCount);
+            result.put("monthMerchantCount", monthMerchantCount);
+            return result;
+        }
+
+        QueryWrapper<MerchantOrder> merchantOrderQueryWrapper = new QueryWrapper<>();
+        merchantOrderQueryWrapper.in("merchantCode", merchantCodeList);
+        merchantOrderQueryWrapper.in("status", "1", "2");
+        List<MerchantOrder> orderList = merchantOrderMapper.selectList(merchantOrderQueryWrapper);
+
+        for (MerchantOrder item : orderList) {
+            if (item.getStatus().equals("1")) {
+                totalConsume = totalConsume.add(BigDecimal.valueOf(item.getConsumeFee()));
+                totalOrderCount++;
+
+                if (monthFirst.before(item.getCreateDt())) {
+                    monthConsume = monthConsume.add(BigDecimal.valueOf(item.getConsumeFee()));
+                    monthOrderCount++;
+                }
+            } else {
+                totalConsume = totalConsume.subtract(BigDecimal.valueOf(item.getConsumeFee()));
+                totalOrderCount--;
+
+                if (monthFirst.before(item.getCreateDt())) {
+                    monthConsume = monthConsume.subtract(BigDecimal.valueOf(item.getConsumeFee()));
+                    monthOrderCount--;
+                }
+            }
+        }
+
+        result.put("totalConsume", totalConsume.setScale(2, RoundingMode.HALF_UP).toString());
+        result.put("monthConsume", monthConsume.setScale(2, RoundingMode.HALF_UP).toString());
+        result.put("totalOrderCount", totalOrderCount);
+        result.put("monthOrderCount", monthOrderCount);
+        result.put("totalMerchantCount", totalMerchantCount);
+        result.put("monthMerchantCount", monthMerchantCount);
+        return result;
+    }
+
+    @Override
+    public List<String> storeMemberList(String merchantCode) {
+        UserApp userApp = new UserApp().setMerchantCode(merchantCode);
+        QueryWrapper<UserApp> queryWrapper = new QueryWrapper<>(userApp);
+        queryWrapper.select("userId");
+        List<UserApp> userApps = baseMapper.selectList(queryWrapper);
+
+        List<String> result = new ArrayList<>();
+        for (UserApp item : userApps) {
+            result.add(item.getUserId() + "");
+        }
+
+        return result;
+    }
+
+    /**
+     * 保存商户员工
+     */
+    private void saveStaff(UserApp userApp) {
+        if (StringUtil.isEmpty(userApp.getMerchantCode())) {
+            throw new MsgException("无商家编码");
+        }
+
+        if (StringUtil.isEmpty(userApp.getStoreId())) {
+            throw new MsgException("无店铺id");
+        }
+
+        // 判断商家信息
+        MerchantBaseInfo queryBaseInfo = new MerchantBaseInfo();
+        queryBaseInfo.setMerchantCode(userApp.getMerchantCode());
+        List<MerchantBaseInfo> queryMerchantBaseInfoList = mbiService
+                .queryMerchantBaseInfoList(queryBaseInfo);
+
+        MsgException.checkBlank(queryMerchantBaseInfoList, "无商家信息！");
+        queryBaseInfo = queryMerchantBaseInfoList.get(0);
+        userApp.setMerchantName(queryBaseInfo.getMerchantName());
+        // 查询门店信息
+        MerchantStore queryMerchantStore = new MerchantStore();
+        queryMerchantStore.setMerchantCode(userApp.getMerchantCode());
+        queryMerchantStore.setStoreId(userApp.getStoreId());
+        List<MerchantStore> queryMerchantStoreList = merchantStoreService.queryMerchantStoreList(queryMerchantStore);
+
+        MsgException.checkBlank(queryMerchantStoreList, "无店铺信息！");
+        queryMerchantStore = queryMerchantStoreList.get(0);
+
+        userApp.setStoreName(queryMerchantStore.getStoreName());
+        // 判断登陆账号是否存在
+        UserInfo queryUserInfo = new UserInfo();
+        queryUserInfo.setLoginName(userApp.getLoginName());
+        List<UserInfo> queryUserInfoList = userInfoService.queryUserInfoList(queryUserInfo);
+
+        MsgException.checkNonBlank(queryUserInfoList, "登陆账号已存在");
+
+        // 保存后台的登陆信息
+        UserInfo userInfo = new UserInfo();
+        userInfo.setPhone(userApp.getPhone());
+        userInfo.setPassword(MD5Util.MD5Encode(userApp.getPassword(), "utf-8"));
+        userInfo.setLoginName(userApp.getLoginName());
+        userInfo.setTrueName(userApp.getUserName());
+        userInfoService.saveUserInfo(userInfo);
+        // 获取当前用户的userId
+        UserInfo userInfoData = new UserInfo();
+        userInfoData.setLoginName(userApp.getLoginName());
+        List<UserInfo> queryUserInfoList2 = userInfoService.queryUserInfoList(userInfoData);
+        if (queryUserInfoList2 != null && !queryUserInfoList2.isEmpty()) {
+            userInfoData = queryUserInfoList2.get(0);
+            userApp.setUserId(userInfoData.getId());
+        }
+        Long roleId = null;
+        // 获取全部的角色信息
+        List<SystemConfig> systemConfigs = systemConfigService.querySystemConfigList(new SystemConfig());
+        for (SystemConfig systemConfig : systemConfigs) {
+            if (systemConfig.getPropertyKey().equalsIgnoreCase("staff_role_id")) {
+                roleId = Long.parseLong(systemConfig.getPropertyValue());
+            }
+        }
+        if (null == roleId) {
+            throw new MsgException("获取角色信息错误");
+        }
+        // 获取当前用户的角色信息
+        RoleUserInfo role = new RoleUserInfo();
+        role.setRoleId(roleId);
+        role.setUserId(userInfo.getId());
+        roleUserInfoService.saveRoleUserInfo(role);
+        userApp.setUserType("staff");
+        userApp.setCreateDt(new Date());
+        save(userApp);
+
+        MerchantStaffConn staffConn = new MerchantStaffConn();
+        staffConn.setMerchantCode(queryBaseInfo.getMerchantCode());
+        staffConn.setUserId(userApp.getUserId());
+        staffConnService.save(staffConn);
+
+        StaffPermission staffPermission = staffPermissionService.getEntity(userApp.getUserId(), userApp.getMerchantCode());
+        staffPermission.setPermissionBill(userApp.getPermissionBill());
+        staffPermissionService.saveOrUpdate(staffPermission);
+    }
+
+    /**
+     * 关联查询分页
+     */
+    @Override
+    public Page<UserApp> pageJoinData(Page<UserApp> page, UserApp userApp) {
+        return this.baseMapper.pageData(page, userApp);
+    }
+
+    /**
+     * 获取下级商户数量
+     */
+    @Override
+    public Integer getSubUserCount(Long userId, String startDate, String endDate) {
+        return this.baseMapper.getSubUserCount(userId, startDate, endDate);
+    }
+
+    /**
+     * 分页查询活动商户详情列表
+     */
+    @Override
+    public Page<UserInfoVO> queryActPage(Page<UserInfoVO> page, UserInfoVO userInfoVO) {
+        return baseMapper.queryActPage(page, userInfoVO);
+    }
+
+    @Override
+    public Integer getParentUserId(Integer parentUserId) {
+        return baseMapper.getParentUserId(parentUserId);
+    }
+
+    @Override
+    public Integer getUserId(String merchantCode) {
+        return baseMapper.getUserId(merchantCode);
+    }
+
+    @Override
+    public Map<String, Object> getStaffPage(Integer currPage, Integer size, UserInfoVO userInfoVO) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageSize", size);
+        map.put("offset", (currPage - 1) * size);
+        map.put("userType", userInfoVO.getUserType());// 筛选出员工
+        if (StringUtils.isNotEmpty(userInfoVO.getUserName())) {
+            map.put("userName", userInfoVO.getUserName());
+        }
+        if (StringUtils.isNotEmpty(userInfoVO.getPhone())) {
+            map.put("phone", userInfoVO.getPhone());
+        }
+        if (StringUtils.isNotEmpty(userInfoVO.getStoreId())) {
+            map.put("storeId", userInfoVO.getStoreId());
+        }
+        if (StringUtils.isNotEmpty(userInfoVO.getStoreName())) {
+            map.put("storeName", userInfoVO.getStoreName());
+        }
+        if (StringUtils.isNotEmpty(userInfoVO.getPhone())) {
+            map.put("phone", userInfoVO.getPhone());
+        }
+        if (StringUtils.isNotEmpty(userInfoVO.getAlias())) {
+            map.put("alias", userInfoVO.getAlias());
+        }
+        if (StringUtils.isNotEmpty(userInfoVO.getContactMobile())) {
+            map.put("contactMobile", userInfoVO.getContactMobile());
+        }
+        if (userInfoVO.getUserId() != null) {
+            map.put("userId", userInfoVO.getUserId());
+        }
+
+        Page<UserInfoVO> page = queryUserInfoVOPage(map);
+        Map<String, Object> result = new HashMap<>();
+        result.put("userAppList", page.getRecords());
+        result.put("code", 200);
+        result.put("count", page.getTotal());
+        result.put("pageCount", StringUtil.getPageCount(page.getTotal(), size));
+        result.put("currPage", currPage);
+        return result;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Map<String, Object> getLevelUpOrder(UserApp userApp, String type) {
+        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+
+        MsgException.checkBlank(type, "请选择支付方式");
+
+        String merchantCode = "M800202008254990744";
+
+        MerchantBaseInfo merchantBaseInfo = new MerchantBaseInfo().setMerchantCode(merchantCode);
+        merchantBaseInfo = mbiService.getOne(new QueryWrapper<>(merchantBaseInfo));
+
+        MerchantStore merchantStore = new MerchantStore().setMerchantCode(merchantCode);
+        merchantStore = merchantStoreService.queryMerchantStore(merchantStore);
+
+
+        SystemConfig systemConfig = new SystemConfig();
+        if (userApp.getLevel() == 1) {
+            systemConfig.setPropertyKey("twoUpVipAmount");
+            systemConfig = systemConfigService.querySystemConfig(systemConfig);
+        } else if (userApp.getLevel() == 2) {
+            systemConfig.setPropertyKey("threeUpVipAmount");
+            systemConfig = systemConfigService.querySystemConfig(systemConfig);
+        } else {
+            throw new MsgException("已经是最高等级");
+        }
+
+        String propertyValue = systemConfig.getPropertyValue();
+        String[] split = propertyValue.split("-");
+
+        String payTypeCode = null;
+        String payTypeName = null;
+        switch (type) {
+            case "1":
+                payTypeCode = "aliPay";
+                payTypeName = "支付宝支付";
+                break;
+            case "2":
+                payTypeCode = "wechatPay";
+                payTypeName = "微信支付";
+                break;
+            default:
+                MsgException.throwException("未知的支付方式");
+                break;
+        }
+
+        // 生成升级订单信息
+        String orderNumber = "SJ000" + StringUtil.getBillno();
+        MerchantIncome income = new MerchantIncome();
+        income.setUserId(userApp.getUserId().intValue());
+        income.setDealCode(orderNumber);
+        income.setCreateTime(new Date());
+        income.setDealFee(Double.valueOf(split[0]));
+        income.setPayTypeCode("3");
+        income.setPayTypeName("推广员升级充值");
+        income.setMerchantName(merchantBaseInfo.getAlias());
+        income.setMerchantCode(merchantCode);
+        income.setStoreId(merchantStore.getStoreId());
+        income.setStoreName(merchantStore.getStoreName());
+        income.setDealStatus(0);
+        // 生成商户订单信息，并保存
+        String aisleSwitch = systemConfigService.querySystemConfigValue("aisleSwitch");
+        Date date = new Date();
+        MerchantOrder merchantOrder = new MerchantOrder();
+        merchantOrder.setOrderNumber(orderNumber);
+        merchantOrder.setCreateDt(date);
+        merchantOrder.setUpdateTime(date);
+        merchantOrder.setAisleSwitch(aisleSwitch);
+        merchantOrder.setOrderType("8");
+        merchantOrder.setPayTypeCode(payTypeCode);
+        merchantOrder.setPayTypeName(payTypeName);
+        merchantOrder.setMerchantName(merchantBaseInfo.getMerchantName());
+        merchantOrder.setMerchantCode(merchantCode);
+        merchantOrder.setStoreId(merchantStore.getStoreId());
+        merchantOrder.setStoreName(merchantStore.getStoreName());
+        merchantOrder.setConsumeFee(Double.valueOf(split[0]));
+
+        Double rate = 0.0038d;
+        BigDecimal fee = new BigDecimal(split[0]).multiply(new BigDecimal(String.valueOf(rate))).setScale(2, BigDecimal.ROUND_HALF_UP);
+        merchantOrder.setEnterFee(new BigDecimal(split[0]).subtract(fee).doubleValue());
+        merchantOrder.setStatus("5");
+        merchantOrder.setAisleSwitch(aisleSwitch);
+
+        merchantIncomeService.save(income);
+        merchantOrderMapper.insert(merchantOrder);
+
+        Map<String, String> map = new HashMap<>(16);
+        map.put("body", "收银呗商城充值");
+        map.put("subject", "收银呗商城充值");
+        map.put("outTradeNo", orderNumber);
+        map.put("totalAmount", split[0]);
+
+        // 请求支付宝/微信支付的订单信息
+        if ("1".equals(type)) {
+            return aliService.appPayParam(map);
+        } else {
+            Map<String, String> reMap = wechatService.appPayParam(request, map);
+            return new HashMap<>(reMap);
+        }
+    }
+
+    @Override
+    public Map<String, Object> getLevelUpOrderV2Info(UserApp userApp, String level) {
+        if (!"promoter".equals(userApp.getUserType()) && !"agent".equals(userApp.getUserType())) {
+            throw new MsgException("拒绝访问");
+        }
+
+        String currentLevelNum = userApp.getLevelCode().replace("LV", "");
+
+        String levelNum = userApp.getLevelCode().replace("LV", "");
+
+        String targetLevelNum = level.replace("VIP", "");
+
+        if (Integer.parseInt(targetLevelNum) >= 10) {
+            throw new MsgException("等级错误");
+        }
+
+        if (Integer.parseInt(currentLevelNum) >= Integer.parseInt(targetLevelNum)) {
+            throw new MsgException("当前已达到该等级");
+        }
+
+        if ("9".equals(currentLevelNum) || "10".equals(currentLevelNum)) {
+            throw new MsgException("当前已达到最高等级");
+        }
+
+        Map<String, Object> result = new HashMap<>();
+        BigDecimal targetFee = BigDecimal.ZERO;
+
+        result.put("targetLevel", level);
+        result.put("fee", BigDecimal.ZERO);
+
+        LambdaQueryWrapper<SystemConfig> qWrapper = new LambdaQueryWrapper<>();
+        qWrapper.likeRight(SystemConfig::getPropertyKey, "vipUpAmt");
+        qWrapper.orderByAsc(SystemConfig::getPropertyKey);
+        List<SystemConfig> configList = systemConfigService.list(qWrapper);
+
+        for (SystemConfig systemConfig : configList) {
+            String vipUpAmtKeyLevel = systemConfig.getPropertyKey().replace("vipUpAmt", "");
+            int targetCompare = targetLevelNum.compareTo(vipUpAmtKeyLevel);
+            int currentCompare = levelNum.compareTo(vipUpAmtKeyLevel);
+
+            if (targetCompare < 0) {
+                break;
+            }
+
+            targetFee = targetFee.add(new BigDecimal(systemConfig.getPropertyValue().split("-")[0]));
+        }
+
+        MerchantIncome merchantIncome = new MerchantIncome();
+        merchantIncome.setPayTypeCode("3");
+        merchantIncome.setDealStatus(1);
+        merchantIncome.setUserId(userApp.getUserId().intValue());
+        List<MerchantIncome> list = merchantIncomeService.list(new QueryWrapper<>(merchantIncome));
+        for (MerchantIncome income : list) {
+            targetFee = targetFee.subtract(BigDecimal.valueOf(income.getDealFee()));
+        }
+
+        if (targetFee.compareTo(BigDecimal.ZERO) <= 0) {
+            throw new MsgException("已达到最高等级");
+        }
+
+        result.put("fee", targetFee);
+
+        return result;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Map<String, Object> getLevelUpOrderV2(UserApp userApp, String type, String level) {
+        if (!"promoter".equals(userApp.getUserType()) && !"agent".equals(userApp.getUserType())) {
+            throw new MsgException("拒绝访问");
+        }
+
+        String currentLevelNum = userApp.getLevelCode().replace("LV", "");
+
+        String levelNum = userApp.getLevelCode().replace("LV", "");
+
+        String targetLevelNum = level.replace("VIP", "");
+
+        if (Integer.parseInt(targetLevelNum) >= 10) {
+            throw new MsgException("等级错误");
+        }
+
+        if (Integer.parseInt(currentLevelNum) >= Integer.parseInt(targetLevelNum)) {
+            throw new MsgException("当前已达到该等级");
+        }
+
+        if ("9".equals(currentLevelNum) || "10".equals(currentLevelNum)) {
+            throw new MsgException("当前已达到最高等级");
+        }
+
+        Map<String, Object> result = new HashMap<>();
+        BigDecimal targetFee = BigDecimal.ZERO;
+        BigDecimal targetProfit = BigDecimal.ZERO;
+
+        LambdaQueryWrapper<SystemConfig> qWrapper = new LambdaQueryWrapper<>();
+        qWrapper.likeRight(SystemConfig::getPropertyKey, "vipUpAmt");
+        qWrapper.orderByAsc(SystemConfig::getPropertyKey);
+        List<SystemConfig> configList = systemConfigService.list(qWrapper);
+
+        for (SystemConfig systemConfig : configList) {
+            String vipUpAmtKeyLevel = systemConfig.getPropertyKey().replace("vipUpAmt", "");
+            int targetCompare = Integer.parseInt(targetLevelNum) - Integer.parseInt(vipUpAmtKeyLevel);
+            // 目标等级低于当前要升级的等级时，跳出
+            if (targetCompare < 0) {
+                break;
+            }
+
+            // int currentCompare = Integer.parseInt(levelNum) - Integer.parseInt(vipUpAmtKeyLevel);
+            // // 低于目前等级的升级费用，不用跳出
+            // if (currentCompare >= 0) {
+            //     continue;
+            // }
+
+            String[] split = systemConfig.getPropertyValue().split("-");
+            targetFee = targetFee.add(new BigDecimal(split[0]));
+        }
+
+        MerchantIncome merchantIncome = new MerchantIncome();
+        merchantIncome.setPayTypeCode("3");
+        merchantIncome.setDealStatus(1);
+        merchantIncome.setUserId(userApp.getUserId().intValue());
+        List<MerchantIncome> list = merchantIncomeService.list(new QueryWrapper<>(merchantIncome));
+        for (MerchantIncome income : list) {
+            targetFee = targetFee.subtract(BigDecimal.valueOf(income.getDealFee()));
+        }
+
+        targetProfit = targetFee.multiply(new BigDecimal("0.3"));
+
+        if (targetFee.compareTo(BigDecimal.ZERO) <= 0) {
+            throw new MsgException("已达到最高等级");
+        }
+
+        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+
+        MsgException.checkBlank(type, "请选择支付方式");
+
+        String merchantCode = "M800202008254990744";
+
+        MerchantBaseInfo merchantBaseInfo = new MerchantBaseInfo().setMerchantCode(merchantCode);
+        merchantBaseInfo = mbiService.getOne(new QueryWrapper<>(merchantBaseInfo));
+
+        MerchantStore merchantStore = new MerchantStore().setMerchantCode(merchantCode);
+        merchantStore = merchantStoreService.queryMerchantStore(merchantStore);
+
+        String payTypeCode = null;
+        String payTypeName = null;
+        switch (type) {
+            case "1":
+                payTypeCode = "aliPay";
+                payTypeName = "支付宝支付";
+                break;
+            case "2":
+                payTypeCode = "wechatPay";
+                payTypeName = "微信支付";
+                break;
+            default:
+                MsgException.throwException("未知的支付方式");
+                break;
+        }
+
+        // 生成升级订单信息
+        String orderNumber = "SJ000" + StringUtil.getBillno();
+        MerchantIncome income = new MerchantIncome();
+        income.setUserId(userApp.getUserId().intValue());
+        income.setDealCode(orderNumber);
+        income.setCreateTime(new Date());
+        income.setDealFee(targetFee.doubleValue());
+        income.setPayTypeCode("3");
+        income.setPayTypeName("推广员升级充值");
+        income.setMerchantName(merchantBaseInfo.getAlias());
+        income.setMerchantCode(merchantCode);
+        income.setStoreId(merchantStore.getStoreId());
+        income.setStoreName(merchantStore.getStoreName());
+        income.setDealStatus(0);
+        // 生成商户订单信息，并保存
+        String aisleSwitch = systemConfigService.querySystemConfigValue("aisleSwitch");
+        Date date = new Date();
+        MerchantOrder merchantOrder = new MerchantOrder();
+        merchantOrder.setOrderNumber(orderNumber);
+        merchantOrder.setCreateDt(date);
+        merchantOrder.setUpdateTime(date);
+        merchantOrder.setAisleSwitch(aisleSwitch);
+        merchantOrder.setOrderType("8");
+        merchantOrder.setPayTypeCode(payTypeCode);
+        merchantOrder.setPayTypeName(payTypeName);
+        merchantOrder.setMerchantName(merchantBaseInfo.getMerchantName());
+        merchantOrder.setMerchantCode(merchantCode);
+        merchantOrder.setStoreId(merchantStore.getStoreId());
+        merchantOrder.setStoreName(merchantStore.getStoreName());
+        merchantOrder.setConsumeFee(targetFee.doubleValue());
+        merchantOrder.setRemark("分润金额合计为-" + targetProfit.toPlainString() + "-" + "从-" + currentLevelNum + "-升到-" + targetLevelNum);
+
+        int rate = 60;
+        merchantOrder.calcRateAndFee(BigDecimal.valueOf(rate));
+        merchantOrder.setChannelRate(BigDecimal.valueOf(rate));
+        merchantOrder.setChannelFee(targetFee.multiply(BigDecimal.valueOf(rate)).divide(BigDecimal.valueOf(10000), 2, RoundingMode.HALF_EVEN));
+        merchantOrder.setStatus("5");
+        merchantOrder.setAisleSwitch(aisleSwitch);
+
+        merchantIncomeService.save(income);
+        merchantOrderMapper.insert(merchantOrder);
+
+        Map<String, String> map = new HashMap<>(16);
+        map.put("body", "收银呗商城充值");
+        map.put("subject", "收银呗商城充值");
+        map.put("outTradeNo", orderNumber);
+        map.put("totalAmount", targetFee.toPlainString());
+
+        // 请求支付宝/微信支付的订单信息
+        if ("1".equals(type)) {
+            return aliService.appPayParam(map);
+        } else {
+            Map<String, String> reMap = wechatService.appPayParam(request, map);
+            return new HashMap<>(reMap);
+        }
+    }
+
+    @Override
+    public UserApp getBossUserApp(UserApp userAppStaff) {
+        // 如果是员工进行查询，那么查询账单的userId得替换成老板的userId
+        if ("staff".equals(userAppStaff.getUserType())) {
+            UserApp userAppBoss = new UserApp();
+            userAppBoss.setUserType("promoter");
+            userAppBoss.setMerchantCode(userAppStaff.getMerchantCode());
+            userAppBoss = getOne(new QueryWrapper<>(userAppBoss));
+            return userAppBoss;
+        }
+
+        return null;
+    }
+
+    @Override
+    public UserApp getBossUserApp(Integer userId, String merchantCode) {
+        UserApp userApp = new UserApp().setUserId(userId.longValue());
+        userApp = getOne(new QueryWrapper<>(userApp));
+        userApp.setMerchantCode(merchantCode);
+
+        if (merchantCode == null) {
+            MerchantStaffConn staffConn = new MerchantStaffConn().setUserId(userId.longValue());
+            staffConn = staffConnService.getOne(new QueryWrapper<>(staffConn).last("limit 1"));
+            if (staffConn != null) {
+                userApp.setMerchantCode(staffConn.getMerchantCode());
+            }
+        }
+
+        return getBossUserApp(userApp);
+    }
+
+    @Override
+    public Page<UserApp> appPageStaff(UserApp userApp) {
+        UserApp tokenUserApp = queryUserAppByToken();
+        MerchantStore merchantStore = new MerchantStore();
+        merchantStore.setMerchantCode(tokenUserApp.getMerchantCode());
+        merchantStore = merchantStoreService.queryMerchantStore(merchantStore);
+
+        Page<UserApp> page = new Page<>();
+        page.addOrder(new OrderItem().setAsc(false).setColumn("id"));
+
+        QueryWrapper<Object> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("msc.merchantCode", userApp.getMerchantCode());
+        queryWrapper.eq("userType", userApp.getUserType());
+
+//        queryWrapper.like(StringUtils.isNotBlank(userApp.getLoginName()), "ui.loginName", userApp.getLoginName());
+        queryWrapper.like(StringUtils.isNotBlank(userApp.getUserName()), "ua.userName", userApp.getUserName());
+
+        if (userApp.getPage() != null) {
+            page.setCurrent(userApp.getPage());
+        }
+
+        page = baseMapper.selectUserApp(page, queryWrapper);
+
+        for (UserApp app : page.getRecords()) {
+            app.setStoreId(merchantStore.getStoreId());
+            app.setMerchantCode(tokenUserApp.getMerchantCode());
+        }
+        return page;
+    }
+
+    @Override
+    @Transactional
+    public void userCert(String userId, Integer status, String certReason) {
+        UserApp userApp;
+        LambdaQueryWrapper<UserApp> qWua = Wrappers.lambdaQuery();
+        userApp = getOne(qWua.eq(UserApp::getUserId, userId));
+        userApp.setStatus(status);
+        userApp.setCertReason(certReason);
+        updateById(userApp);
+        String statusZh = "审核通过";
+        if (status == 2) {
+            statusZh = certReason;
+        }
+
+        Notice notice = new Notice();
+        notice.setUserId(userApp.getUserId().toString());
+        notice.setUserName(userApp.getUserName());
+        notice.setIsDeal(0);
+        notice.setDesc(statusZh);
+        notice.setConrtent(statusZh);
+        notice.setCreateDt(new Date());
+        notice.setNoticeCode(UUID.randomUUID().toString().replace("-", ""));
+        noticeService.saveIdCardAuthNotice(notice);
+
+        List<String> alias = new ArrayList<>();
+        alias.add(userApp.getUserId().toString());
+        generalPushUtil.sendAllPlatByAlias(alias, "实名认证通知", statusZh, "1");
+    }
+
+    /**
+     * @return java.util.Map<java.lang.String, java.lang.Object>
+     * @description:首页统计数据
+     * @date: 2021/10/19 17:24
+     */
+    @Override
+    public Map<String, Object> getPlatformData() {
+        return baseMapper.getPlatformData();
+    }
+
+    @Override
+    public Integer getMaxSort() {
+        return baseMapper.getMaxSort();
+    }
+
+    /**
+     * 获取直推用户的新增数量和总数
+     *
+     * @param userId:
+     * @param date:
+     * @param dateType:
+     * @return cn.pluss.platform.vo.UserNumVO
+     * @date: 2022/1/24 23:26
+     */
+    @Override
+    public UserNumVO getUserNumInfo(Long userId, String date, Integer dateType) {
+        return baseMapper.getUserNumInfo(userId, date, dateType);
+    }
+
+    /**
+     * 检查wap请求token
+     *
+     * @param token:
+     * @param request:
+     * @param roleEnum:
+     * @date: 2022/2/16 14:18
+     */
+    @Override
+    public UserApp checkWapToken(String token, HttpServletRequest request, UserRoleEnum roleEnum) {
+        if (StringUtil.isEmpty(token)) {
+            MsgException.throwException("登录超时，请重新登录");
+        }
+        Object obj = request.getSession().getAttribute(token);
+        UserApp userApp = null;
+        if ((obj instanceof UserApp)) {
+            userApp = (UserApp) obj;
+        } else {
+            QueryWrapper<UserApp> queryAppWrapper = new QueryWrapper<>();
+            queryAppWrapper.eq("token", token);
+            userApp = baseMapper.selectOne(queryAppWrapper);
+            if (userApp == null) {
+                MsgException.throwException("登录超时，请重新登录");
+            }
+            request.getSession().setAttribute(token, userApp);
+        }
+        if (roleEnum != null && !roleEnum.getCode().equals(userApp.getRoleCode())) {
+            MsgException.throwException("非直营团队角色，无法开通代理！");
+        }
+        return userApp;
+    }
+
+    /**
+     * 根据邀请码获取用户信息
+     *
+     * @param inviteNum:
+     * @param roleEnum:
+     * @return cn.pluss.platform.entity.UserApp
+     * @date: 2022/2/16 15:53
+     */
+    @Override
+    public UserApp getUserAppByInviteNum(String inviteNum, UserRoleEnum roleEnum) {
+        QueryWrapper<UserApp> queryWrapper = new QueryWrapper<UserApp>().eq("inviteNum", inviteNum);
+        if (roleEnum != null) {
+            queryWrapper.eq("roleCode", roleEnum.getCode());
+        }
+        UserApp userApp = baseMapper.selectOne(queryWrapper);
+        if (userApp == null) {
+            MsgException.throwException("无效邀请码！");
+        }
+        if (userApp.getStatus() != 3 && userApp.getBankStatus() != 3) {
+            MsgException.throwException("无效邀请码，当前邀请码还未完成实名认证！");
+        }
+        return userApp;
+    }
+
+    /**
+     * 保存贝斯特代理账号
+     *
+     * @param params:
+     * @date: 2022/2/16 17:54
+     */
+    @Override
+    public void bstSaveAgent(Map<String, Object> params) {
+        MsgException.checkNull(params.get("phone"), "注册手机号不能为空！");
+        MsgException.checkNull(params.get("phoneverify"), "验证码不能为空！");
+        MsgException.checkNull(params.get("password"), "登录密码不能为空！");
+        MsgException.checkNull(params.get("userId"), "推荐人不能为空！");
+        UserApp parentApp = baseMapper.selectByUserId(params.get("userId").toString());
+        if (!Objects.equals(parentApp.getStatus(), 3) || !Objects.equals(parentApp.getBankStatus(), 3)) {
+            throw new MsgException("邀请人无效，当前推广服务商未完成实名");
+        }
+
+        UserInfo ui = userInfoService.getById(parentApp.getUserId());
+        if (Objects.equals(ui.getStatus(), UserInfo.STATUS_NO_SPREAD)) {
+            throw new MsgException("当前推广服务商存在违规行为, 已被关闭推广权限, 请联系收银呗客服申诉");
+        }
+
+        if (!"1".equals(parentApp.getSpreadFlag())) {
+            throw new MsgException("当前用户已经注册多个账户，无法开通代理");
+        }
+
+        UserInfo queryUserInfo = new UserInfo().setLoginName(params.get("phone").toString());
+        List<UserInfo> existUserInfoList = userInfoService.queryUserInfoList(queryUserInfo);
+        if (existUserInfoList != null && !existUserInfoList.isEmpty()) {
+            MsgException.throwException("当前手机号已被注册");
+        }
+        PhoneValidateCode phoneValidateCode = new PhoneValidateCode();
+        phoneValidateCode.setCode(params.get("phoneverify").toString());
+        phoneValidateCode.setPhone(params.get("phone").toString());
+        List<PhoneValidateCode> list = phoneValidateCodeService
+                .queryPhoneValidateCodeList(phoneValidateCode);
+        if (list.isEmpty()) {
+            MsgException.throwException("验证码有误！");
+        }
+        String mdxPassword = MD5Util.MD5Encode(params.get("password").toString(), "UTF-8");
+        UserInfo userInfo = new UserInfo();
+        userInfo.setLoginName(params.get("phone").toString());
+        userInfo.setTrueName(params.get("phone").toString());
+        userInfo.setPhone(params.get("phone").toString());
+        userInfo.setPassword(mdxPassword);
+        userInfo.setCreateTime(new Date());
+        userInfoService.saveUserInfo(userInfo);
+        UserApp userApp = new UserApp();
+        userApp.setUserId(userInfo.getId());
+        //判断推广员是否是业务员
+//        if ("agent_staff".equals(appInfo.getUserType())) {
+//            userApp.setAgentStaffId(appInfo.getUserId());
+//        }
+        if (StringUtil.isNotEmpty(parentApp.getPIdArr())) {
+            userApp.setPIdArr(parentApp.getUserId() + "," + parentApp.getPIdArr());
+        }
+        userApp.setParentId(Long.parseLong(params.get("userId").toString()));
+        Object userNo = params.get("userNo");
+        if (userNo != null) {
+            userApp.setUserNo(userNo.toString());
+        }
+        UserApp.setSort(parentApp, userApp);
+        UserApp.setRoleInfo(parentApp, userApp, 1);
+
+        userApp.setUserName(params.get("phone").toString());
+        userApp.setUserType("agent");
+        userApp.setLevel(1);
+        userApp.setStatus(0);
+
+        userApp.setCreateDt(new Date());
+        userApp.setInviteNum(StringUtil.genRandomNum(5));
+        baseMapper.insert(userApp);
+        ipRecordService.saveRegIp(userInfo.getId() + "", userInfo.getId() + "");
+        PhoneValidateCode phoneValidate = new PhoneValidateCode();
+        if (StringUtil.isNotEmpty(params.get("phone").toString())) {
+            phoneValidate.setPhone(params.get("phone").toString());
+            phoneValidateCodeService.deletePhoneValidateCode(phoneValidate);
+        }
+        //保存业务员考核数据
+        if(UserRoleEnum.ZY_BST.getCode().equals(userApp.getRoleCode())){
+            //新开的业务员
+            UserRole role = userRoleMapper.getByRoleCode(userApp.getRoleCode());
+            UserAssess assess = new UserAssess(userApp,role);
+            userAssessMapper.insert(assess);
+        }
+
+        //TODO 贝斯特开代理也同步用户到积分商城
+        jfShopHandler.syncJfShopUser(userApp, userInfo);
+    }
+
+    @Override
+    public UserApp checkApiToken() {
+        UserApp userApp = queryUserAppByToken();
+        if (userApp == null) {
+            MsgException.throwException("登录用户异常");
+        }
+        return userApp;
+    }
+
+    /**
+     * 根据手机号获取用户信息
+     *
+     * @param phone
+     * @return
+     */
+    @Override
+    public UserApp getUserAppByPhone(String phone, UserApp userApp) {
+        MsgException.checkBlank(phone, "手机号不能为空！");
+        List<UserApp> list = baseMapper.getUserInfoByPhone(phone);
+        if (list.isEmpty()) {
+            MsgException.throwException("手机号有误！");
+        }
+        UserApp app = list.get(0);
+        if (list.size() != 1) {
+            for (UserApp ua : list) {
+                if ("agent".equals(ua.getUserType())) {
+                    app = ua;
+                    break;
+                }
+            }
+        }
+        app.getLevelCode().replace("LV", "VIP");
+        MsgException.check(userApp.getUserId().equals(app.getUserId()), "无法选择自己");
+        return app;
+    }
+}
\ No newline at end of file
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/userAreaRewardFlow/UserAreaRewardFlowService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/userAreaRewardFlow/UserAreaRewardFlowService.java
new file mode 100644
index 0000000..1cc04a8
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/userAreaRewardFlow/UserAreaRewardFlowService.java
@@ -0,0 +1,31 @@
+package cn.pluss.platform.userAreaRewardFlow;
+
+import cn.pluss.platform.entity.UserAreaRewardFlow;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 用户区域流水 服务类
+ * </p>
+ *
+ * @author bzg
+ * @since 2022-03-01
+ */
+public interface UserAreaRewardFlowService extends IService<UserAreaRewardFlow> {
+
+    /**
+     * 根据用户ID查询流水
+     * @date: 2022/3/1 16:20
+     * @param userId:
+     * @return java.util.List<cn.pluss.platform.entity.UserAreaRewardFlow>
+     */
+    List<UserAreaRewardFlow> selectListByUserId(Long userId);
+
+    /**
+     * 计算区域流水
+     * @date: 2022/3/1 17:37
+     */
+    void calcUserAreaRewardFlow();
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/userAreaRewardFlow/impl/UserAreaRewardFlowServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/userAreaRewardFlow/impl/UserAreaRewardFlowServiceImpl.java
new file mode 100644
index 0000000..46386d1
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/userAreaRewardFlow/impl/UserAreaRewardFlowServiceImpl.java
@@ -0,0 +1,109 @@
+package cn.pluss.platform.userAreaRewardFlow.impl;
+
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.entity.UserAreaRewardFlow;
+import cn.pluss.platform.entity.UserRewardInfo;
+import cn.pluss.platform.mapper.UserAreaRewardFlowMapper;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantOrder.MerchantOrderService;
+import cn.pluss.platform.rewardConfig.RewardConfigService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.userAreaRewardFlow.UserAreaRewardFlowService;
+import cn.pluss.platform.userRewardInfo.UserRewardInfoService;
+import cn.pluss.platform.util.DateUtils;
+import cn.pluss.platform.util.StringUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 用户区域流水 服务实现类
+ * </p>
+ *
+ * @author bzg
+ * @since 2022-03-01
+ */
+@Service
+public class UserAreaRewardFlowServiceImpl extends ServiceImpl<UserAreaRewardFlowMapper, UserAreaRewardFlow> implements UserAreaRewardFlowService {
+
+
+    @Resource
+    private UserAppService userAppService;
+
+    @Resource
+    private UserRewardInfoService userRewardInfoService;
+
+    @Resource
+    private MerchantBaseInfoService baseInfoService;
+
+    @Resource
+    private MerchantOrderService merchantOrderService;
+
+    @Resource
+    private RewardConfigService rewardConfigService;
+
+    /**
+     * 根据用户ID查询流水
+     * @date: 2022/3/1 16:20
+     * @param userId:
+     * @return java.util.List<cn.pluss.platform.entity.UserAreaRewardFlow>
+     */
+    @Override
+    public List<UserAreaRewardFlow> selectListByUserId(Long userId) {
+        QueryWrapper<UserAreaRewardFlow> queryWrapper = new QueryWrapper<UserAreaRewardFlow>().eq("userId",userId);
+        return baseMapper.selectList(queryWrapper);
+    }
+
+
+    /**
+     * 统计用户区域奖励定 统计用户区域奖励流水
+     * @date: 2022/3/1 15:09
+     */
+    @Override
+    public void calcUserAreaRewardFlow() {
+        QueryWrapper<UserApp> queryWrapper = new QueryWrapper<UserApp>().eq("areaMark","1");
+        List<UserApp> list = userAppService.list(queryWrapper);
+        if(list.isEmpty()){
+            return;
+        }
+        for (UserApp app:list) {
+            if(StringUtil.isEmpty(app.getRoleCode())){
+                continue;
+            }
+            List<UserRewardInfo> areaRewardList = userRewardInfoService.selectListByUserIdAndRole(app.getUserId(),app.getRoleCode());
+            if(areaRewardList.isEmpty()){
+                //没有配置区域 关闭当前用户区域配置
+                app.setAreaMark(0);
+                userAppService.updateById(app);
+                continue;
+            }
+            BigDecimal scale = areaRewardList.get(0).getScale();
+            List<String> areaList = new ArrayList<>(10);
+            for (UserRewardInfo a:areaRewardList) {
+                areaList.add(a.getAreaNo());
+            }
+            List<String> mercList = baseInfoService.getAreaAndRoleList(areaList,app.getRoleCode());
+            if(mercList.isEmpty()){
+                continue;
+            }
+            String date = DateUtils.formatDateDefault(DateUtils.add(Calendar.DAY_OF_MONTH, new Date(), -1), "yyyy-MM-dd");
+            List<UserAreaRewardFlow> areaFlowList = selectListByUserId(app.getUserId());
+            Integer flag = 1;
+            if(areaFlowList.isEmpty()){
+                flag = -1;
+            }
+            BigDecimal flow = merchantOrderService.getAreaOrderCount(mercList,date,flag);
+            BigDecimal rewardAmt =  scale.multiply(flow).setScale(2,BigDecimal.ROUND_DOWN);
+            UserAreaRewardFlow areaFlow = new UserAreaRewardFlow(app,flow,rewardAmt);
+            this.baseMapper.insert(areaFlow);
+        }
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/userAssess/UserAssessService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/userAssess/UserAssessService.java
new file mode 100644
index 0000000..3be00e3
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/userAssess/UserAssessService.java
@@ -0,0 +1,26 @@
+package cn.pluss.platform.userAssess;
+
+import cn.pluss.platform.entity.MerchantBaseInfo;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.entity.UserAssess;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 用户考核表 服务类
+ * </p>
+ *
+ * @author bzg
+ * @since 2022-07-11
+ */
+public interface UserAssessService extends IService<UserAssess> {
+
+    void checkUserValid(MerchantBaseInfo mbi);
+
+    /**
+     * 获取用户的考核状态
+     * @param userId
+     * @return
+     */
+    boolean getUserValid(Long userId, UserApp userApp);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/userAssess/impl/UserAssessServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/userAssess/impl/UserAssessServiceImpl.java
new file mode 100644
index 0000000..5a91d30
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/userAssess/impl/UserAssessServiceImpl.java
@@ -0,0 +1,144 @@
+package cn.pluss.platform.userAssess.impl;
+
+import cn.pluss.platform.entity.MerchantBaseInfo;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.entity.UserAssess;
+import cn.pluss.platform.entity.UserRole;
+import cn.pluss.platform.enums.UserRoleEnum;
+import cn.pluss.platform.mapper.UserAppMapper;
+import cn.pluss.platform.mapper.UserAssessMapper;
+import cn.pluss.platform.mapper.UserRoleMapper;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantOrder.MerchantOrderService;
+import cn.pluss.platform.user.UserRoleService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.userAssess.UserAssessService;
+import cn.pluss.platform.util.DateUtils;
+import cn.pluss.platform.util.StringUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 用户考核表 服务实现类
+ * </p>
+ *
+ * @author bzg
+ * @since 2022-07-11
+ */
+@Service
+public class UserAssessServiceImpl extends ServiceImpl<UserAssessMapper, UserAssess> implements UserAssessService {
+
+    @Resource
+    private UserAppMapper userAppMapper;
+
+    @Resource
+    private MerchantOrderService merchantOrderService;
+
+    @Resource
+    private UserRoleMapper userRoleMapper;
+
+    @Resource
+    private MerchantBaseInfoService merchantBaseInfoService;
+
+    public static int DEFAULT_VALID_FLAG  = 1;
+    /**
+     * 校验该商户是否有效
+     * @param mbi
+     */
+    @Override
+    public void checkUserValid(MerchantBaseInfo mbi) {
+        if(mbi.getValidFlag() == DEFAULT_VALID_FLAG){
+            return;
+        }
+        UserApp userApp = userAppMapper.selectByUserId(mbi.getUserId());
+        if(userApp == null){
+            return;
+        }
+        if(!UserRoleEnum.ZY_BST.getCode().equals(userApp.getRoleCode())){
+            return;
+        }
+        if(userApp.getParentId() == null){
+            return;
+        }
+        UserApp pUser = userAppMapper.selectByUserId(userApp.getParentId());
+        if(pUser == null || !UserRoleEnum.ZY_BST.getCode().equals(pUser.getRoleCode())){
+            return;
+        }
+        if(!"agent".equals(pUser.getUserType()) || StringUtil.isEmpty(pUser.getRoleCode())){
+            return;
+        }
+        UserRole role = userRoleMapper.getByRoleCode(pUser.getRoleCode());
+        if(role == null){
+            return;
+        }
+        Map<String, Double> countTradeAmt = merchantOrderService.getCountTradeAmt(mbi.getMerchantCode(), DateUtils.toString(DateUtils.currentDate(), "yyyy-MM-dd"), null, null);
+        BigDecimal tradeAmt = BigDecimal.valueOf(countTradeAmt.get("tradeAmtCount"));
+        boolean amtFlag = tradeAmt.compareTo(role.getValidTransAmt()) >= 0;
+        int num = merchantOrderService.getValidNumByMerchantCode(mbi.getMerchantCode());
+        boolean numFlag = num >= role.getValidTransNum();
+        UserAssess assess = baseMapper.getByUserId(pUser.getUserId());
+        if(assess == null){
+            assess = new UserAssess(pUser,role);
+        }
+        List<String> codeList = merchantBaseInfoService.queryNextMercCodeByUserId(pUser.getUserId());
+        assess.setDirectMercNum(codeList.size());
+        if(amtFlag && numFlag){
+            assess.setValidMercNum(assess.getValidMercNum() + 1);
+            mbi.setValidFlag(DEFAULT_VALID_FLAG);
+        }
+        saveOrUpdate(assess);
+    }
+
+    /**
+     * 获取用户的考核状态
+     * @param userId
+     * @return
+     */
+    @Override
+    public boolean getUserValid(Long userId,UserApp userApp) {
+        boolean flag = true;
+        Date now = DateUtils.currentDate();
+        if(userApp == null){
+            userApp = userAppMapper.selectByUserId(userId);
+        }
+        if(!"agent".equals(userApp.getUserType())){
+            return flag;
+        }
+        UserAssess byUserId = baseMapper.getByUserId(userId);
+        try {
+            if(byUserId == null){
+                UserRole role = userRoleMapper.getByRoleCode(userApp.getRoleCode());
+                UserAssess assess = new UserAssess(userApp,role);
+                save(assess);
+                return flag;
+            }else{
+                UserRole role = userRoleMapper.getByRoleCode(byUserId.getRoleCode());
+                if(UserRole.DEFAULT_VALID_CLOSE == role.getValidFlag()){
+                    return flag;
+                }
+                //是否白名单
+                if(UserAssess.DEFAULT_IS_WHITE_YES == byUserId.getIsWhite()){
+                    return flag;
+                }
+                if(now.compareTo(byUserId.getExpireTime()) <= 0){
+                    return flag;
+                }
+                if(role.getMinNum() <= byUserId.getValidMercNum()){
+                    return flag;
+                }
+                flag = false;
+                return flag;
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        return flag;
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/userInfo/UserInfoService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/userInfo/UserInfoService.java
new file mode 100644
index 0000000..8b631fc
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/userInfo/UserInfoService.java
@@ -0,0 +1,137 @@
+package cn.pluss.platform.userInfo;
+
+import java.util.List;
+import java.util.Map;
+
+import cn.pluss.platform.dto.ChangePwdDTO;
+import cn.pluss.platform.entity.MerchantOrder;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.entity.UserInfo;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.UserInfoMapper;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @author djh
+ */
+public interface UserInfoService extends IService<UserInfo> {
+
+    UserInfo getMainUserInfo(Long id);
+
+    /**
+     * 注册
+     *
+     * @param userInfo 用户信息
+     */
+    void register(UserInfo userInfo);
+
+    /**
+     * 忘记密码
+     * @param userInfo 用户信息
+     */
+    void forgetPwd(UserInfo userInfo);
+
+    /**
+     * 保存安全密码
+     * @param userInfo 用户信息
+     */
+    void savePayPassword(UserInfo userInfo);
+
+    /**
+     * 校验支付密码
+     * @param payPassword 支付密码
+     */
+    void apiVerifyPayPassword(String payPassword);
+
+    /**
+     * 校验支付密码
+     * @param userId        用户id
+     * @param payPassword   支付密码
+     */
+    void verifyPayPassword(Long userId, String payPassword);
+
+    /**
+     * 绑定邀请码
+     * @param inviteCode
+     */
+    void bindInviteCode(String inviteCode);
+
+    default UserInfo queryUserInfo(UserInfo userInfo) {
+        return ((UserInfoMapper) getBaseMapper()).queryUserInfo(userInfo);
+    }
+
+    default List<UserInfo> queryUserInfoList(UserInfo userInfo) {
+        return ((UserInfoMapper) getBaseMapper()).queryUserInfoList(userInfo);
+    }
+
+    default Integer saveUserInfo(UserInfo userInfo) {
+        return ((UserInfoMapper) getBaseMapper()).saveUserInfo(userInfo);
+    }
+
+    default void updateUserInfo(UserInfo userInfo) {
+        ((UserInfoMapper) getBaseMapper()).updateUserInfo(userInfo);
+    }
+
+    default void deleteUserInfo(UserInfo userInfo) {
+        ((UserInfoMapper) getBaseMapper()).deleteUserInfo(userInfo);
+    }
+
+    default List<UserInfo> queryUserInfoPage(Map<String, Object> map) {
+        return ((UserInfoMapper) getBaseMapper()).queryUserInfoPage(map);
+    }
+
+    default Integer queryUserInfoPageCount(Map<String, Object> map) {
+        return ((UserInfoMapper) getBaseMapper()).queryUserInfoPageCount(map);
+    }
+
+    /**
+     * 修改手机号
+     */
+    void changePhone(ChangePwdDTO changePwdDTO) throws MsgException;
+
+    /**
+     * 登录
+     *
+     * @param loginName 用户手机号
+     * @param password  用户密码
+     * @return 个人信息
+     */
+    Map<String, Object> login(String loginName, String password);
+
+    /**
+     * 修改费率
+     *
+     * @param userId
+     * @param rate
+     */
+    void changeRate(String userId, Integer rate);
+
+    void apiChangeRate(String userId, Integer rate);
+
+    JSONObject getUserMerchantBaseInfo();
+
+    /**
+     * 确认人脸识别已经通过
+     */
+    void appVerifyFaceCert();
+
+    void verifyFaceCert(Long userId);
+
+    /**
+     * @description:发送订单支付模板消息
+     * @date: 2021/9/24 11:42
+     * @param order:
+     */
+    void sendPayWxTemplateMessage(MerchantOrder order);
+
+    /**
+     * 根据登录账号获取用户信息
+     * @date: 2022/3/1 18:11
+     * @param loginName:
+     * @return cn.pluss.platform.entity.UserInfo
+     */
+    UserInfo getUserInfoByLoginName(String loginName);
+
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/userInfo/impl/BaseUserInfoService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/userInfo/impl/BaseUserInfoService.java
new file mode 100644
index 0000000..be59519
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/userInfo/impl/BaseUserInfoService.java
@@ -0,0 +1,792 @@
+package cn.pluss.platform.userInfo.impl;
+
+import cn.hutool.crypto.SecureUtil;
+import cn.jiguang.common.utils.StringUtils;
+import cn.pluss.platform.channel.MchChannelRateNewService;
+import cn.pluss.platform.constants.CommonError;
+import cn.pluss.platform.dto.ChangePwdDTO;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.ipLocation.IpLocationService;
+import cn.pluss.platform.mapper.*;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchant.MerchantRateNewRecordService;
+import cn.pluss.platform.merchant.MerchantStaffConnService;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.operationRecord.OperationRecordService;
+import cn.pluss.platform.other.JfShopParam;
+import cn.pluss.platform.other.JfShopSyncUser;
+import cn.pluss.platform.phoneValidateCode.PhoneValidateCodeService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.userInfo.UserInfoService;
+import cn.pluss.platform.util.*;
+import cn.pluss.platform.vo.MerchantStaffConnVO;
+import cn.pluss.platform.wechat.WxConstants;
+import cn.pluss.platform.wx.WxAccessTokenRequest;
+import cn.pluss.platform.wx.WxCommonService;
+import cn.pluss.platform.wx.WxTemolateRequest;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.client.RestTemplate;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.*;
+
+/**
+ * 基础服务类
+ *
+ * @author djh
+ */
+@Slf4j
+public abstract class BaseUserInfoService extends ServiceImpl<UserInfoMapper, UserInfo> implements UserInfoService {
+
+    @Setter(onMethod_ = {@Lazy, @Autowired})
+    private MerchantBaseInfoService merchantBaseInfoService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private PhoneValidateCodeMapper phoneValidateCodeMapper;
+
+    @Setter(onMethod_ = {@Autowired})
+    private UserAppMapper userAppMapper;
+
+    @Resource
+    protected MerchantRateMapper merchantRateMapper;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantChannelStatusService mcsService;
+
+    @Autowired
+    private MchChannelRateNewService sxfChangeRateNewService;
+
+    @Autowired
+    private MchChannelRateNewService ryxChangeRateNewService;
+
+
+    @Setter(onMethod_ = {@Lazy, @Autowired})
+    protected UserAppService userAppService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantBaseInfoMapper merchantBaseInfoMapper;
+
+    @Setter(onMethod_ = {@Autowired})
+    private RestTemplate restTemplate;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantStaffConnService staffConnService;
+
+    @Autowired
+    protected PhoneValidateCodeService phoneValidateCodeService;
+
+    @Autowired
+    protected OperationRecordService opRecordService;
+
+    @Setter(onMethod_ = {@Lazy, @Autowired})
+    private MerchantStaffConnService merchantStaffConnService;
+
+    @Setter(onMethod_ = {@Lazy, @Autowired})
+    private MerchantRateNewRecordService merchantRateNewRecordService;
+
+    @Autowired
+    @Lazy
+    private MchChannelRateNewService ysChangeRateService;
+
+    @Autowired
+    @Lazy
+    private MchChannelRateNewService ysChangeRateNewService;
+
+    @Setter(onMethod_ = {@Lazy, @Autowired})
+    private WxCommonService wxCommonService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private UserInfoMapper userInfoMapper;
+
+    @Override
+    public void bindInviteCode(String inviteCode) {
+        UserApp userApp = userAppService.queryUserAppByToken();
+        if (userApp.getParentId() != null) {
+            throw new MsgException("拒绝访问!");
+        }
+
+        UserApp parentApp = new UserApp();
+        parentApp.setInviteNum(inviteCode.toUpperCase());
+        List<UserApp> queryUserAppList = userAppService.queryUserAppList(parentApp);
+
+        if (queryUserAppList == null || queryUserAppList.isEmpty()) {
+            throw new MsgException("无效的邀请码！");
+        }
+
+        UserApp pUserApp = queryUserAppList.get(0);
+
+        if (pUserApp.getUserType().equals("agent_staff")) {
+            UserApp agentUa = userAppService.getOne(new QueryWrapper<UserApp>().eq("userId", pUserApp.getParentId()));
+            if (!Objects.equals(agentUa.getStatus(), 3) || !Objects.equals(agentUa.getBankStatus(), 3)) {
+                throw new MsgException("邀请码无效，当前推广服务商未完成实名");
+            }
+
+            UserInfo ui = getById(agentUa.getUserId());
+            if (Objects.equals(ui.getStatus(), UserInfo.STATUS_NO_SPREAD)) {
+                throw new MsgException("当前推广服务商存在违规行为, 已被关闭推广权限, 请联系收银呗客服申诉");
+            }
+        } else {
+            if (!Objects.equals(pUserApp.getStatus(), 3) || !Objects.equals(pUserApp.getBankStatus(), 3)) {
+                throw new MsgException("邀请码无效，当前推广服务商未完成实名");
+            }
+
+            UserInfo ui = getById(pUserApp.getUserId());
+            if (Objects.equals(ui.getStatus(), UserInfo.STATUS_NO_SPREAD)) {
+                throw new MsgException("当前推广服务商存在违规行为, 已被关闭推广权限, 请联系收银呗客服申诉");
+            }
+
+            if (!"1".equals(pUserApp.getSpreadFlag())) {
+                throw new MsgException("该服务商已注册多个账户，该推广码无效");
+            }
+        }
+
+        UserInfo userInfo = new UserInfo();
+        userInfo.setId(userApp.getUserId());
+        userInfo = queryUserInfo(userInfo);
+        userInfo.setInviteCode(inviteCode);
+        updateUserInfo(userInfo);
+
+        userApp.setParentId(pUserApp.getUserId());
+        UserApp.setSort(pUserApp, userApp);
+        UserApp.setRoleInfo(pUserApp, userApp, null);
+        userApp.setInviteNum(getRandomNum());
+
+        if ("agent_staff".equals(pUserApp.getUserType())) {
+            userApp.setParentId(pUserApp.getParentId());
+            userApp.setAgentStaffId(pUserApp.getUserId());
+        } else {
+            userApp.setParentId(pUserApp.getUserId());
+        }
+        userAppService.updateById(userApp);
+    }
+
+    protected UserApp getSaveUserAppInfo(UserInfo userInfo) {
+
+        // 保存用户信息到userApp表
+        UserApp userApp = new UserApp();
+        userApp.setUserId(userInfo.getId());
+        // 默认一级推广员
+        userApp.setLevel(1);
+        userApp.setCreateDt(new Date());
+        userApp.setStatus(0);
+        userApp.setUserType("promoter");
+
+        userApp.setInviteNum(getRandomNum());
+
+        // 根据邀请码查询确定当前用户的上级关系
+        if (!StringUtils.isEmpty(userInfo.getInviteCode())) {
+            UserApp parentApp = new UserApp();
+            parentApp.setInviteNum(userInfo.getInviteCode());
+            parentApp = userAppService.queryUserApp(parentApp);
+            if (parentApp == null) {
+                throw new MsgException("请输入正确的邀请码");
+            }
+
+            userApp.setParentId(parentApp.getUserId());
+
+            if ("agent_staff".equals(parentApp.getUserType())) {
+                userApp.setParentId(parentApp.getParentId());
+                userApp.setAgentStaffId(parentApp.getUserId());
+            } else {
+                userApp.setParentId(parentApp.getUserId());
+            }
+        }
+        return userApp;
+    }
+
+    private String getRandomNum() {
+        String inviteNum;
+        UserApp condition = new UserApp();
+
+        do {
+            inviteNum = StringUtil.genRandomNum(5);
+            condition.setInviteNum(inviteNum);
+            UserApp userApp = userAppService.queryUserApp(condition);
+            if (userApp == null) {
+                return inviteNum;
+            }
+        } while (true);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void changePhone(ChangePwdDTO changePwdDTO) throws MsgException {
+        UserApp userApp = userAppService.queryUserAppByToken();
+
+        if ("agent".equals(userApp.getUserType()) && !"ZY_BST".equals(userApp.getRoleCode())) {
+            // 非倍斯特的代理账号，不允许修改手机号
+            throw new MsgException("原代理账号不支持修改手机号");
+        }
+
+
+        // step 1、数据校验
+        UserInfo userInfoCondition = new UserInfo();
+        userInfoCondition.setLoginName(changePwdDTO.getPhone());
+        UserInfo userInfo = baseMapper.queryUserInfo(userInfoCondition);
+        if (userInfo != null) {
+            QueryWrapper<UserApp> qWrapper = new QueryWrapper<UserApp>()
+                    .eq("userId", userApp.getUserId())
+                    .eq("userType", userApp.getUserType())
+                    .last("limit 1");
+            UserApp nua = userAppService.getOne(qWrapper);
+
+            MsgException.checkNonNull(nua, "新手机号已经存在关联账号");
+        }
+
+        userInfo = baseMapper.selectById(userApp.getUserId());
+        if (userInfo == null || !Objects.equals(userInfo.getPhone(), changePwdDTO.getOldPhone())) {
+            throw new MsgException("无法获取用户信息");
+        }
+
+        if (!MD5Util.MD5Encode(changePwdDTO.getPassword(), "utf-8").equalsIgnoreCase(userInfo.getPassword())) {
+            throw new MsgException("密码错误，请检查后重新输入");
+        }
+
+        // 校验手机验证码
+        LambdaQueryWrapper<PhoneValidateCode> qWrapper = Wrappers.lambdaQuery();
+        qWrapper.eq(PhoneValidateCode::getPhone, changePwdDTO.getPhone())
+                .orderByDesc(PhoneValidateCode::getSendDt)
+                .last("limit 1");
+        PhoneValidateCode existValidCode = phoneValidateCodeService.getOne(qWrapper);
+        MsgException.checkNull(existValidCode, "验证码不存在或验证码已失效");
+
+        if (!Objects.equals(existValidCode.getCode(), changePwdDTO.getCode())) {
+            if (existValidCode.getAttempt() == null) {
+                existValidCode.setAttempt(1);
+                phoneValidateCodeService.updateById(existValidCode);
+                throw new MsgException("验证码错误");
+            }
+
+            int newAttemptCount = existValidCode.getAttempt() + 1;
+            if (newAttemptCount == 5) {
+                phoneValidateCodeService.removeById(existValidCode.getId());
+                throw new MsgException("验证码错误，请重新获取验证码");
+            }
+        } else {
+            phoneValidateCodeService.removeById(existValidCode.getId());
+        }
+
+
+        // step 2、修改主账号手机号
+        userInfo.setOldPhone(changePwdDTO.getOldPhone());
+        userInfo.setPhone(changePwdDTO.getPhone());
+        userInfo.setLoginName(changePwdDTO.getPhone());
+        userInfo.setUpdateTime(new Date());
+        userInfo.setUpdator(changePwdDTO.getPhone());
+        baseMapper.updateUserInfo(userInfo);
+        // step 3、修改子账号(店员)手机号
+        changeChildPhone(userInfo.getOldPhone(), userInfo.getPhone());
+
+        try {
+            if (userApp != null && "promoter".equals(userApp.getUserType())) {
+                String url = "https://shop.shouyinbei.net/web/wmerchant.php?c=site&a=entry&ctrl=store&ac=oauth&op=set_password&ta=update_phone&do=web&m=we7_wmall&i=1";
+                url += "&old=" + changePwdDTO.getOldPhone();
+                url += "&new=" + changePwdDTO.getPhone();
+                log.info("==================>修改小程序请求链接为: {}<=================", url);
+                try {
+                    String result = restTemplate.getForObject(url, String.class);
+                    log.info("==================>修改小程序手机号结果: {}<=================", result);
+                } catch (Exception e) {
+                    log.info("==================>修改小程序手机号异常: {}<=================", e.getMessage());
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 修改子账号手机号
+     *
+     * @param oldPhone 老手机号
+     * @param phone    新手机号
+     */
+    private void changeChildPhone(String oldPhone, String phone) {
+        UserInfo queryCondition = new UserInfo();
+        queryCondition.setPhone(oldPhone);
+        List<UserInfo> queryUserInfoListLikeByPhone = baseMapper.queryUserInfoListLikeByPhone(queryCondition);
+        for (UserInfo userInfo : queryUserInfoListLikeByPhone) {
+            String childPhone = userInfo.getPhone();
+            if (StringUtils.isNotEmpty(childPhone) && childPhone.length() > 11 && childPhone.contains("@")) {
+                String newPhone = phone + childPhone.substring(childPhone.indexOf("@"));
+                userInfo.setPhone(newPhone);
+                userInfo.setLoginName(newPhone);
+                userInfo.setUpdateTime(new Date());
+                baseMapper.updateUserInfo(userInfo);
+            }
+        }
+    }
+
+    @Override
+    public Map<String, Object> login(String loginName, String password) {
+        Map<String, Object> resultMap = new HashMap<>();
+
+        UserInfo userInfo = new UserInfo();
+        userInfo.setLoginName(loginName);
+        String mdPasswordString = MD5Util.MD5Encode(password, "utf-8");
+        UserInfo checkUserInfo;
+        checkUserInfo = queryUserInfo(userInfo);
+
+        MsgException.checkNull(checkUserInfo, "无此用户！");
+
+        // 原则上不能以原密码进行对比，这里只是给后台登录页面一个方便
+        if (password.equalsIgnoreCase(checkUserInfo.getPassword())) {
+            UserApp queryUserApp;
+            queryUserApp = userAppMapper.selectUserApp(new QueryWrapper<>().eq("ua.userId", checkUserInfo.getId()));
+            log.error("=====================queryUserApp=====================" + JSON.toJSONString(queryUserApp));
+            String genRandomNum = StringUtil.genRandomNum(6) + StringUtil.getBillno() + StringUtil.genRandomNum(6);
+            UserApp uApp = new UserApp();
+            uApp.setToken(genRandomNum);
+            uApp.setId(queryUserApp.getId());
+            userAppMapper.updateById(uApp);
+            queryUserApp.setToken(genRandomNum);
+            resultMap.put("userInfo", checkUserInfo);
+            Long userId = checkUserInfo.getId();
+            MerchantBaseInfo merchantBaseInfo = new MerchantBaseInfo();
+            merchantBaseInfo.setUserId(userId + "");
+            List<MerchantBaseInfo> queryMerchantBaseInfoList = merchantBaseInfoService.queryMerchantBaseInfoList(merchantBaseInfo);
+            if (null != queryMerchantBaseInfoList && !queryMerchantBaseInfoList.isEmpty()) {
+                merchantBaseInfo = queryMerchantBaseInfoList.get(0);
+                queryUserApp.setMercId(merchantBaseInfo.getId());
+                queryUserApp.setMerchantType(merchantBaseInfo.getMerchantType());
+                queryUserApp.setMerchantName(merchantBaseInfo.getAlias());
+                queryUserApp.setAlias(merchantBaseInfo.getAlias());
+            }
+            resultMap.put("userApp", queryUserApp);
+            return resultMap;
+        }
+
+        if (!mdPasswordString.equalsIgnoreCase(checkUserInfo.getPassword())) {
+            throw new MsgException("密码不正确！");
+        }
+        // 获取当前用户的详情信息来判断用户的登陆类型
+        UserApp queryUserApp = new UserApp().setUserId(checkUserInfo.getId());
+        queryUserApp = userAppMapper.selectOne(new QueryWrapper<>(queryUserApp));
+        String genRandomNum = StringUtil.genRandomNum(6) + StringUtil.getBillno() + StringUtil.genRandomNum(6);
+        UserApp uApp = new UserApp();
+        uApp.setToken(genRandomNum);
+        uApp.setId(queryUserApp.getId());
+
+        MerchantChannelStatus merchantChannelStatus = mcsService.getValidData(queryUserApp.getMerchantCode());
+        uApp.setMerchantId(merchantChannelStatus == null ? null : merchantChannelStatus.getMerchantId());
+        uApp.setMerchantAuditStatus(merchantChannelStatus == null ? "0" : merchantChannelStatus.getAppStatus());
+
+        if (StringUtil.isEmpty(queryUserApp.getJfShopKey())) {
+            //TODO 积分商城登录后 加密用户ID用户Code等数据 用户积分商城那边默认登录 确认登录用户是哪个
+            JfShopSyncUser jfUser = new JfShopSyncUser(checkUserInfo, queryUserApp);
+            String aesKey = jfUser.createAesData(JfShopParam.pubKey);
+            if (StringUtils.isNotEmpty(aesKey)) {
+                String key = Base64Util.encode(aesKey);
+                uApp.setJfShopKey(key);
+                queryUserApp.setJfShopKey(key);
+            }
+        }
+        userAppMapper.updateById(uApp);
+
+        queryUserApp.setToken(genRandomNum);
+        checkUserInfo.setPassword(MD5Util.MD5Encode(password, "utf-8"));
+
+        LambdaUpdateWrapper<UserInfo> uWrapper = Wrappers.lambdaUpdate();
+        uWrapper.eq(UserInfo::getId, checkUserInfo.getId());
+        uWrapper.set(UserInfo::getFaceCert, 0);
+        userInfoMapper.update(null, uWrapper);
+
+        if ("staff".equals(queryUserApp.getUserType())) {
+
+            List<MerchantStaffConnVO> connList = staffConnService.getListByUserId(queryUserApp.getUserId() + "");
+            if (connList.size() == 1) {
+                // 只属于一家的员工时，拉出在所属商店的关联信息以及权限信息等
+                MerchantStaffConnVO connVO = connList.get(0);
+                queryUserApp.setMerchantCode(connVO.getMerchantCode());
+
+                UserApp bossUserApp = new UserApp();
+                bossUserApp.setMerchantCode(queryUserApp.getMerchantCode());
+                bossUserApp.setUserType("promoter");
+                bossUserApp = userAppMapper.selectOne(new QueryWrapper<>(bossUserApp));
+
+//                queryUserApp.setLeshuaStatus(bossUserApp.getLeshuaStatus());
+                queryUserApp.setLevel(bossUserApp.getLevel());
+                queryUserApp.setStatus(bossUserApp.getStatus());
+                queryUserApp.setPermissionBill(connVO.getPermissionBill());
+            }
+            resultMap.put("connList", connList);
+        }
+
+
+        resultMap.put("userInfo", checkUserInfo);
+        MerchantBaseInfo merchantBaseInfo = new MerchantBaseInfo();
+        if (StringUtils.isNotEmpty(queryUserApp.getMerchantCode())) {
+            merchantBaseInfo.setMerchantCode(queryUserApp.getMerchantCode());
+            List<MerchantBaseInfo> queryMerchantBaseInfoList = merchantBaseInfoService.queryMerchantBaseInfoList(merchantBaseInfo);
+            if (null != queryMerchantBaseInfoList && !queryMerchantBaseInfoList.isEmpty()) {
+                merchantBaseInfo = queryMerchantBaseInfoList.get(0);
+                queryUserApp.setMercId(merchantBaseInfo.getId());
+                queryUserApp.setMerchantType(merchantBaseInfo.getMerchantType());
+                queryUserApp.setMerchantName(merchantBaseInfo.getAlias());
+                queryUserApp.setAlias(merchantBaseInfo.getAlias());
+            }
+        }
+
+        resultMap.put("userApp", queryUserApp);
+
+        clearJpushAlias(queryUserApp.getUserId() + "");
+
+        OperationRecord opRecord = new OperationRecord();
+        opRecord.setUserId(queryUserApp.getUserId() + "");
+        opRecord.setDictValue("APP_LOGIN");
+        opRecord.setRemark("用户登录");
+        opRecord.setOperator(queryUserApp.getUserId() + "");
+        opRecordService.save(opRecord);
+        return resultMap;
+    }
+
+    private void clearJpushAlias(String userId) {
+        // 删除极光别名
+        try {
+            restTemplate.delete("https://device.jpush.cn/v3/aliases/" + userId);
+        } catch (Exception ignored) {
+        }
+    }
+
+    @Override
+    public void changeRate(String userId, Integer rate) {
+        UserApp userApp = userAppMapper.selectByUserId(userId);
+
+        LambdaQueryWrapper<MerchantChannelStatus> qWrapper = Wrappers.lambdaQuery();
+        qWrapper.eq(MerchantChannelStatus::getMerchantCode, userApp.getMerchantCode());
+        qWrapper.eq(MerchantChannelStatus::getStatus, MerchantChannelStatus.AUDIT_STATUS_SUCCESS);
+        List<MerchantChannelStatus> mcsList = mcsService.list(qWrapper);
+
+        for (MerchantChannelStatus mcs : mcsList) {
+            QueryWrapper<MerchantRateNewRecord> queryWrapper = new QueryWrapper<MerchantRateNewRecord>()
+                    .eq("merchantId", mcs.getMerchantId()).orderByDesc("createTime").last("limit 1");
+            MerchantRateNewRecord record = merchantRateNewRecordService.getOne(queryWrapper);
+
+            if (record != null) {
+                if (record.getWxRate() < rate) {
+                    MsgException.throwException("当前费率小于等于需要修改的费率，无需修改！");
+                } else if (record.getWxRate().intValue() == rate.intValue()) {
+                    MsgException.throwException("当前费率已经修改成功，无需再次修改！");
+                }
+            }
+            MerchantRateNew rateNew = new MerchantRateNew();
+            rateNew.setAliRate(rate);
+            rateNew.setWxRate(rate);
+            rateNew.setBankRate(rate);
+            rateNew.setBankRateLarge(rate);
+            rateNew.setChannel(mcs.getChannel());
+            rateNew.setMerchantId(mcs.getMerchantId());
+            MerchantRateNew.setRateValue(rateNew);
+            switch (mcs.getChannel()) {
+                case 1:
+                    sxfChangeRateNewService.changeRate(userId, rateNew, false);
+                    break;
+                case 2:
+                    // 乐刷的, 暂不考虑
+                    break;
+                case 3:
+                    ryxChangeRateNewService.changeRate(userId, rateNew, false);
+                    break;
+                case 4:
+                    if (StringUtils.isEmpty(mcs.getApplicationId())) {
+                        ysChangeRateNewService.changeRate(userId, rateNew, false);
+                    } else {
+                        ysChangeRateService.changeRate(userId, rateNew, false);
+                    }
+                    break;
+                default:
+                    break;
+            }
+        }
+    }
+
+    @Override
+    public void apiChangeRate(String userId, Integer rate) {
+        UserApp userApp = userAppService.queryUserAppByToken();
+        if (userApp == null) {
+            throw new MsgException("拒绝访问");
+        }
+
+        MerchantRate selfRate = new MerchantRate().setUserId(userApp.getUserId() + "");
+        selfRate = merchantRateMapper.selectOne(new QueryWrapper<>(selfRate));
+
+        if (selfRate == null) {
+            throw new MsgException("数据异常");
+        }
+
+        //费率校验
+        if (rate < selfRate.getRate() || rate > 38) {
+            throw new MsgException("商户费率应在0." + selfRate.getRate() + "%到0.38%之间");
+        }
+
+        changeRate(userId, rate);
+    }
+
+    @Override
+    public JSONObject getUserMerchantBaseInfo() {
+        UserApp userApp = userAppService.queryUserAppByToken();
+        MerchantBaseInfo merchantBaseInfo = new MerchantBaseInfo().setMerchantCode(userApp.getMerchantCode()).setUserId(userApp.getUserId() + "");
+        merchantBaseInfo = merchantBaseInfoMapper.selectOne(new QueryWrapper<>(merchantBaseInfo));
+
+        UserInfo userInfo = new UserInfo().setId(userApp.getUserId());
+        userInfo = queryUserInfo(userInfo);
+
+        MerchantChannelStatus merchantChannelStatus = mcsService.getByMerchantCode(userApp.getMerchantCode());
+
+        JSONObject result = new JSONObject();
+        result.put("phone", userInfo.getPhone());
+        result.put("token", userApp.getToken());
+        result.put("inviteNum", userApp.getInviteNum());
+        result.put("merchantCode", userApp.getMerchantCode());
+        result.put("userName", userApp.getUserName());
+        result.put("status", userApp.getStatus());
+        result.put("bankStatus", userApp.getBankStatus());
+
+        if (merchantBaseInfo != null) {
+            result.put("merchantName", merchantBaseInfo.getMerchantName());
+            result.put("merchantType", merchantBaseInfo.getMerchantType());
+            result.put("alisa", merchantBaseInfo.getAlias());
+        } else {
+            result.put("merchantName", null);
+            result.put("merchantType", null);
+            result.put("alisa", null);
+        }
+
+        if (merchantChannelStatus != null) {
+            result.put("merchantId", merchantChannelStatus.getMerchantId());
+            result.put("merchantAuditStatus", merchantChannelStatus.getAppStatus());
+        } else {
+            result.put("merchantId", null);
+            result.put("merchantAuditStatus", null);
+        }
+
+        return result;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void savePayPassword(UserInfo userInfo) {
+        UserApp userApp = userAppService.queryUserAppByToken();
+        // 只有推广者可以进入该方法
+        if (!("promoter".equals(userApp.getUserType()) || "agent".equals(userApp.getUserType()))) {
+            throw new MsgException("拒绝访问");
+        }
+
+        if (StringUtils.isEmpty(userInfo.getPayPassword())) {
+            throw new MsgException("缺少支付密码");
+        }
+
+        UserInfo tokenUserInfo = new UserInfo().setId(userApp.getUserId());
+        tokenUserInfo = getOne(new QueryWrapper<>(tokenUserInfo));
+
+        if (tokenUserInfo.getPhone().contains("@")) {
+            throw new MsgException("请切换至主商户进行操作");
+        }
+
+        if (StringUtils.isEmpty(userInfo.getCheckCode()) && StringUtils.isEmpty(userInfo.getOldPayPassword())) {
+            throw new MsgException("缺少验证码或支付密码");
+        }
+
+        if (StringUtils.isNotEmpty(userInfo.getCheckCode())) {
+            PhoneValidateCode phoneValidateCode;
+            QueryWrapper<PhoneValidateCode> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("phone", tokenUserInfo.getPhone());
+            queryWrapper.orderByDesc("sendDt");
+            queryWrapper.last("limit 1");
+            phoneValidateCode = phoneValidateCodeMapper.selectOne(queryWrapper);
+
+            MsgException.checkNull(phoneValidateCode, "未获取验证码");
+
+            MsgException.checkUnequals(userInfo.getCheckCode(), phoneValidateCode.getCode(), "验证码不正确");
+
+            phoneValidateCodeMapper.deleteById(phoneValidateCode.getId());
+        } else {
+            verifyPayPassword(tokenUserInfo.getId(), userInfo.getOldPayPassword());
+        }
+
+        userInfo.setPayPassword(SecureUtil.md5(userInfo.getPayPassword()));
+        userInfo.setId(tokenUserInfo.getId());
+        updateById(userInfo);
+
+    }
+
+    @Override
+    public void apiVerifyPayPassword(String payPassword) {
+        UserApp userApp = userAppService.queryUserAppByToken();
+        verifyPayPassword(userApp.getUserId(), payPassword);
+    }
+
+    @Override
+    public void verifyPayPassword(Long userId, String payPassword) {
+        if (userId == null) {
+            throw new MsgException("用户不存在");
+        }
+
+        UserInfo userInfo = getMainUserInfo(userId);
+
+        if (!SecureUtil.md5(payPassword).equals(userInfo.getPayPassword())) {
+            throw new MsgException("安全密码错误");
+        }
+    }
+
+    @Override
+    public UserInfo getMainUserInfo(Long id) {
+        UserInfo result = baseMapper.selectMainUserInfo(id);
+        if (result == null) {
+            result = baseMapper.selectById(id);
+        }
+        return result;
+    }
+
+    @Override
+    public void appVerifyFaceCert() {
+        UserApp tokenUserApp = userAppService.queryUserAppByToken();
+        verifyFaceCert(tokenUserApp.getUserId());
+    }
+
+    @Override
+    public void verifyFaceCert(Long userId) {
+        LambdaUpdateWrapper<UserInfo> uWrapper = Wrappers.lambdaUpdate();
+        uWrapper.eq(UserInfo::getId, userId)
+                .set(UserInfo::getFaceCert, "1")
+                .set(UserInfo::getFaceCompare, "1");
+
+        baseMapper.update(null, uWrapper);
+    }
+
+    @Override
+    public void forgetPwd(UserInfo userInfo) {
+        UserInfo queryUserInfo = new UserInfo();
+        queryUserInfo.setLoginName(userInfo.getPhone());
+        // 根据手机号获取当前用户信息
+        queryUserInfo = getOne(new QueryWrapper<>(queryUserInfo).last("limit 1"));
+
+        MsgException.checkNull(queryUserInfo, CommonError.NO_EXIST_ACCOUNT);
+
+        // 校验手机验证码
+        LambdaQueryWrapper<PhoneValidateCode> qWrapper = Wrappers.lambdaQuery();
+        qWrapper.eq(PhoneValidateCode::getPhone, queryUserInfo.getPhone())
+                .orderByDesc(PhoneValidateCode::getSendDt)
+                .last("limit 1");
+        PhoneValidateCode existValidCode = phoneValidateCodeService.getOne(qWrapper);
+        MsgException.checkNull(existValidCode, "验证码不存在或验证码已失效");
+
+        if (!Objects.equals(existValidCode.getCode(), userInfo.getCheckCode())) {
+            if (existValidCode.getAttempt() == null) {
+                existValidCode.setAttempt(1);
+                phoneValidateCodeService.updateById(existValidCode);
+                throw new MsgException("验证码错误");
+            }
+
+            int newAttemptCount = existValidCode.getAttempt() + 1;
+            if (newAttemptCount == 5) {
+                phoneValidateCodeService.removeById(existValidCode.getId());
+                throw new MsgException("验证码错误，请重新获取验证码");
+            }
+        } else {
+            phoneValidateCodeService.removeById(existValidCode.getId());
+        }
+
+        // 忘记密码
+        UserInfo updateUserInfo = new UserInfo();
+        updateUserInfo.setId(queryUserInfo.getId());
+        updateUserInfo.setPassword(MD5Util.MD5Encode(userInfo.getPassword(), "utf-8"));
+        updateUserInfo.setUpdateTime(new Date());
+        updateById(updateUserInfo);
+
+        // 修改小程序密码
+        UserApp userApp = new UserApp().setUserId(updateUserInfo.getId());
+        userApp = userAppService.queryUserApp(userApp);
+        if (userApp != null && "promoter".equals(userApp.getUserType())) {
+            String url = "https://shop.shouyinbei.net/web/wmerchant.php?c=site&a=entry&ctrl=store&ac=oauth&op=set_password&do=web&m=we7_wmall&i=1";
+            url += "&password=" + updateUserInfo.getPassword();
+            url += "&mobile=" + queryUserInfo.getLoginName();
+            log.info("==================>修改小程序请求链接为: {}<=================", url);
+            try {
+                String result = restTemplate.getForObject(url, String.class);
+                log.info("==================>修改小程序密码结果: {}<=================", result);
+            } catch (Exception e) {
+                log.info("==================>修改小程序密码异常: {}<=================", e.getMessage());
+            }
+        }
+    }
+
+    @Override
+    public void sendPayWxTemplateMessage(MerchantOrder order) {
+
+        MerchantBaseInfo baseinfo = merchantBaseInfoService.getMerchantBaseInfoByMerchantCode(order.getMerchantCode());
+        if (baseinfo != null) {
+            UserInfo userInfo = baseMapper.selectById(baseinfo.getUserId());
+            if (userInfo != null) {
+                sendWxMessage(userInfo, order, baseinfo);
+                if (userInfo.getLoginName().indexOf("@") > 0) {
+                    userInfo = baseMapper.selectMainUserInfo(Long.valueOf(baseinfo.getUserId()));
+                    sendWxMessage(userInfo, order, baseinfo);
+                }
+            }
+        }
+    }
+
+    public void sendWxMessage(UserInfo userInfo, MerchantOrder order, MerchantBaseInfo baseinfo) {
+        String tempId = "gqCxjTXqDbklITY2IdgqAJWvFLS6Q0zmlc--bEa9bs4";
+        if (userInfo != null) {
+            String first = "您有新的收款信息!";
+            if (StringUtils.isNotEmpty(order.getRemark())) {
+                first = "您有新的收款信息！（备注：" + order.getRemark() + "）";
+            }
+            String remark = "如对此订单有疑问，可以在app中查看详细信息";
+            MerchantOrder.updateOrderTypeDesc(order);
+            String[] array = {order.getConsumeFee() + "元", order.getMerchantName(), order.getOrderTypeDesc(), order.getOrderNumber(), DateUtils.formatDateDefault(order.getTransDt(), "yyyy-MM-dd HH:mm:ss")};
+            WxTemolateRequest request = new WxTemolateRequest(userInfo.getOpenId(), tempId, null, null).buildData(first, remark, array);
+            WxAccessTokenRequest tokenRequest = WxAccessTokenRequest.buidWxToken(ParametersUtil.SJ_APPID, ParametersUtil.SJ_APPSECRET, null, WxConstants.WX_SEND_TEMPLATE_URL);
+            if (StringUtils.isNotEmpty(userInfo.getOpenId()) && "1".equals(baseinfo.getIsPushWxMessage())) {
+                wxCommonService.sendTemplateMsg(request, tokenRequest);
+            }
+            //获取当前订单是否是由员工进行收款
+            String staffCode = order.getStaffCode();
+            if (StringUtils.isNotEmpty(staffCode) && StringUtil.isNumber(staffCode)) {
+                UserInfo staffInfo = baseMapper.selectById(Long.parseLong(staffCode));
+                if (staffInfo != null) {
+                    MerchantStaffConn conn = merchantStaffConnService.getStaffConnInfoByCodeAndId(staffCode, order.getMerchantCode());
+                    if (conn != null && StringUtils.isNotEmpty(staffInfo.getOpenId()) && "1".equals(conn.getIsPushWxMessage())) {
+                        request.setTouser(staffInfo.getOpenId());
+                        wxCommonService.sendTemplateMsg(request, tokenRequest);
+                    }
+                }
+            }
+            QueryWrapper<UserApp> queryWrapper = new QueryWrapper<UserApp>()
+                    .eq("merchantCode", order.getMerchantCode()).eq("userType", "staff");
+            List<UserApp> list = userAppService.list(queryWrapper);
+            if (!list.isEmpty()) {
+                for (UserApp u : list) {
+                    UserInfo info = userInfoMapper.selectById(u.getUserId());
+                    if (info != null && StringUtil.isNotEmpty(info.getOpenId())) {
+                        request.setTouser(info.getOpenId());
+                        wxCommonService.sendTemplateMsg(request, tokenRequest);
+                    }
+                }
+            }
+        }
+    }
+
+    @Override
+    public UserInfo getUserInfoByLoginName(String loginName) {
+        QueryWrapper<UserInfo> queryWrapper = new QueryWrapper<UserInfo>().eq("loginName", loginName);
+        return baseMapper.selectOne(queryWrapper);
+    }
+}
\ No newline at end of file
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/userInfo/impl/UserInfoServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/userInfo/impl/UserInfoServiceImpl.java
new file mode 100644
index 0000000..7de5235
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/userInfo/impl/UserInfoServiceImpl.java
@@ -0,0 +1,178 @@
+package cn.pluss.platform.userInfo.impl;
+
+import cn.jiguang.common.utils.StringUtils;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.jfShop.JfShopHandler;
+import cn.pluss.platform.roleUserInfo.RoleUserInfoService;
+import cn.pluss.platform.systemConfig.SystemConfigService;
+import cn.pluss.platform.util.MD5Util;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+
+@Service("userInfoService")
+@Slf4j
+@RequiredArgsConstructor
+public class UserInfoServiceImpl extends BaseUserInfoService {
+
+    @Setter(onMethod_ = {@Autowired})
+    private SystemConfigService systemConfigService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private RoleUserInfoService roleUserInfoService;
+
+    @Setter(onMethod_ = {@Autowired, @Lazy})
+    private JfShopHandler jfShopHandler;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void register(UserInfo userInfo) {
+        String inviteCode;
+        UserApp parentApp;
+        if (StringUtils.isEmpty(userInfo.getInviteCode())) {
+            throw new MsgException("请填写邀请码！");
+        }
+
+        parentApp = new UserApp();
+        parentApp.setInviteNum(userInfo.getInviteCode().toUpperCase());
+        List<UserApp> queryUserAppList = userAppService.queryUserAppList(parentApp);
+
+        if (queryUserAppList == null || queryUserAppList.isEmpty()) {
+            throw new MsgException("无效的邀请码！");
+        } else {
+            parentApp = queryUserAppList.get(0);
+        }
+
+        if (parentApp.getUserType().equals("agent_staff")) {
+            UserApp agentUa = userAppService.getOne(new QueryWrapper<UserApp>().eq("userId", parentApp.getParentId()));
+            if (!Objects.equals(agentUa.getStatus(), 3) || !Objects.equals(agentUa.getBankStatus(), 3) ) {
+                throw new MsgException("邀请码无效，当前推广服务商未完成实名");
+            }
+
+            UserInfo ui = getById(agentUa.getUserId());
+            if (Objects.equals(ui.getStatus(), UserInfo.STATUS_NO_SPREAD)) {
+                throw new MsgException("当前推广服务商存在违规行为, 已被关闭推广权限, 请联系收银呗客服申诉");
+            }
+        } else {
+            if (!Objects.equals(parentApp.getStatus(), 3) || !Objects.equals(parentApp.getBankStatus(), 3) ) {
+                throw new MsgException("邀请码无效，当前推广服务商未完成实名");
+            }
+
+            UserInfo ui = getById(parentApp.getUserId());
+            if (Objects.equals(ui.getStatus(), UserInfo.STATUS_NO_SPREAD)) {
+                throw new MsgException("当前推广服务商存在违规行为, 已被关闭推广权限, 请联系收银呗客服申诉");
+            }
+
+            if (!"1".equals(parentApp.getSpreadFlag())) {
+                throw new MsgException("该服务商已注册多个账户，该推广码无效");
+            }
+        }
+
+        inviteCode = userInfo.getInviteCode();
+        userInfo.setPassword(MD5Util.MD5Encode(userInfo.getPassword(), "utf-8"));
+        userInfo.setLoginName(userInfo.getPhone());
+        // 验证手机号是否已被使用
+        UserInfo queryUserInfo = new UserInfo();
+        queryUserInfo.setLoginName(userInfo.getPhone());
+        UserInfo checkUserInfo = queryUserInfo(queryUserInfo);
+        if (checkUserInfo != null) {
+            throw new MsgException("手机号已被注册！");
+        }
+        // 验证码
+        PhoneValidateCode phoneValidateCode = new PhoneValidateCode();
+        phoneValidateCode.setPhone(userInfo.getPhone());
+        phoneValidateCode = phoneValidateCodeService.queryPhoneValidateCode(phoneValidateCode);
+
+        if (phoneValidateCode == null) {
+            throw new MsgException("无效的验证码！");
+        }
+
+        if (!phoneValidateCode.getCode().equalsIgnoreCase(userInfo.getCheckCode())) {
+            throw new MsgException("无效的验证码！");
+        }
+        // 判断注册的角色信息
+        String roleType = null;
+        if ("staff".equalsIgnoreCase(userInfo.getSource())) {
+            roleType = "staff";
+        } else if ("promoter".equalsIgnoreCase(userInfo.getSource())) {
+            roleType = "promoter_role_id";
+        }
+        Long roleId = null;
+        // 获取全部的角色信息
+        List<SystemConfig> systemConfigs = systemConfigService.querySystemConfigList(new SystemConfig());
+        for (SystemConfig systemConfig : systemConfigs) {
+            if (systemConfig.getPropertyKey().equalsIgnoreCase(roleType)) {
+                roleId = Long.parseLong(systemConfig.getPropertyValue());
+            }
+        }
+        if (roleId == null) {
+            throw new MsgException("获取角色信息错误！");
+        }
+        userInfo.setCreateTime(new Date());
+        save(userInfo);
+        // 可能和数据库存储的数据不一致
+        userInfo.setCreateTime(null);
+        // 获取当前用户的id保存用户的角色信息
+        userInfo = queryUserInfo(userInfo);
+        userInfo.setInviteCode(inviteCode);
+        RoleUserInfo role = new RoleUserInfo();
+        role.setRoleId(roleId);
+        role.setUserId(userInfo.getId());
+        UserApp userApp = getSaveUserAppInfo(userInfo);
+
+        UserApp.setSort(parentApp, userApp);
+        UserApp.setRoleInfo(parentApp, userApp,null);
+
+        // 保存信息
+        userAppService.save(userApp);
+        roleUserInfoService.saveRoleUserInfo(role);
+        // 删除验证码
+        phoneValidateCodeService.deletePhoneValidateCode(phoneValidateCode);
+        //TODO 同步用户到新版积分商城
+        jfShopHandler.syncJfShopUser(userApp,userInfo);
+        // 可能存在token,
+        // ServletRequestAttributes requestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+
+//        String operatorUserId = userInfo.getId() + "";
+        // if (requestAttributes != null) {
+        //     HttpServletRequest request = requestAttributes.getRequest();
+        //     String token = request.getHeader("token");
+        //     String myLoginName = request.getHeader("myLoginName");
+        //     try {
+        //         myLoginName = URLDecoder.decode(myLoginName, "UTF-8");
+        //     } catch (Exception ignored) {
+        //     }
+        //
+        //     if (StringUtils.isNotEmpty(token) && StringUtils.isNotEmpty(myLoginName)) {
+        //         // 若存在token，则通过userInfo取手机号
+        //         UserInfo tokenUi = new UserInfo();
+        //         tokenUi.setLoginName(myLoginName);
+        //         tokenUi = getOne(new QueryWrapper<>(tokenUi));
+        //         if (tokenUi == null) {
+        //             throw new MsgException("非法的请求头");
+        //         }
+        //         UserApp tokenUa = new UserApp().setUserId(tokenUi.getId()).setToken(token);
+        //         tokenUa = userAppService.getOne(new QueryWrapper<>(tokenUa));
+        //
+        //         if (tokenUa == null) {
+        //             throw new MsgException("非法的请求头");
+        //         }
+        //
+        //         operatorUserId = userInfo.getId() + "";
+        //     }
+        // }
+
+
+        // ipRecordService.saveRegIp(userInfo.getId() + "", operatorUserId);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/userInfo/impl/UserInfoServiceNewImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/userInfo/impl/UserInfoServiceNewImpl.java
new file mode 100644
index 0000000..4df1a4b
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/userInfo/impl/UserInfoServiceNewImpl.java
@@ -0,0 +1,148 @@
+package cn.pluss.platform.userInfo.impl;
+
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.jfShop.JfShopHandler;
+import cn.pluss.platform.roleUserInfo.RoleUserInfoService;
+import cn.pluss.platform.systemConfig.SystemConfigService;
+import cn.pluss.platform.user.UserIpRecordService;
+import cn.pluss.platform.userInfo.UserInfoService;
+import cn.pluss.platform.util.MD5Util;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.context.annotation.Primary;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 新的实现类
+ * @author djh
+ */
+@Service("userInfoNewService")
+@Primary
+@Slf4j
+@RequiredArgsConstructor
+public class UserInfoServiceNewImpl extends BaseUserInfoService {
+
+    @Setter(onMethod_ = {@Autowired,@Lazy})
+    private UserInfoService userInfoService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private SystemConfigService systemConfigService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private RoleUserInfoService roleUserInfoService;
+
+    @Setter(onMethod_ = {@Autowired,@Lazy})
+    private JfShopHandler jfShopHandler;
+
+    /**
+     * 新的注册可以在没有邀请码的情况下注册，没有上级邀请码，新注册的账号也不会生成邀请码
+     * @param userInfo 用户信息
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void register(UserInfo userInfo) {
+        if (userInfo.getInviteCode() != null) {
+            // 如果有邀请码，走老注册逻辑
+            userInfoService.register(userInfo);
+            return;
+        }
+
+        userInfo.setPassword(MD5Util.MD5Encode(userInfo.getPassword(), "utf-8"));
+        userInfo.setLoginName(userInfo.getPhone());
+        // 验证手机号是否已被使用
+        UserInfo queryUserInfo = new UserInfo();
+        queryUserInfo.setLoginName(userInfo.getPhone());
+        UserInfo checkUserInfo = queryUserInfo(queryUserInfo);
+        if (checkUserInfo != null) {
+            throw new MsgException("手机号已被注册！");
+        }
+        // 验证码
+        PhoneValidateCode phoneValidateCode = new PhoneValidateCode();
+        phoneValidateCode.setPhone(userInfo.getPhone());
+        phoneValidateCode = phoneValidateCodeService.queryPhoneValidateCode(phoneValidateCode);
+
+        if (phoneValidateCode == null) {
+            throw new MsgException("无效的验证码！");
+        }
+
+        if (!phoneValidateCode.getCode().equalsIgnoreCase(userInfo.getCheckCode())) {
+            throw new MsgException("无效的验证码！");
+        }
+        // 判断注册的角色信息
+        String roleType = null;
+        if ("staff".equalsIgnoreCase(userInfo.getSource())) {
+            roleType = "staff";
+        } else if ("promoter".equalsIgnoreCase(userInfo.getSource())) {
+            roleType = "promoter_role_id";
+        }
+        Long roleId = null;
+        // 获取全部的角色信息
+        List<SystemConfig> systemConfigs = systemConfigService.querySystemConfigList(new SystemConfig());
+        for (SystemConfig systemConfig : systemConfigs) {
+            if (systemConfig.getPropertyKey().equalsIgnoreCase(roleType)) {
+                roleId = Long.parseLong(systemConfig.getPropertyValue());
+            }
+        }
+        if (roleId == null) {
+            throw new MsgException("获取角色信息错误！");
+        }
+        userInfo.setCreateTime(new Date());
+        saveUserInfo(userInfo);
+        // 可能和数据库存储的数据不一致
+        userInfo.setCreateTime(null);
+        // 获取当前用户的id保存用户的角色信息
+        userInfo = queryUserInfo(userInfo);
+        RoleUserInfo role = new RoleUserInfo();
+        role.setRoleId(roleId);
+        role.setUserId(userInfo.getId());
+        UserApp userApp = getSaveUserAppInfo(userInfo);
+        userApp.setInviteNum(null);
+        // 保存信息
+        userAppService.save(userApp);
+        roleUserInfoService.saveRoleUserInfo(role);
+        // 删除验证码
+        phoneValidateCodeService.deletePhoneValidateCode(phoneValidateCode);
+
+        //TODO 同步用户到新版积分商城
+        jfShopHandler.syncJfShopUser(userApp,userInfo);
+
+        // 可能存在token,
+        // ServletRequestAttributes requestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        // String operatorUserId = userInfo.getId() + "";
+        // if (requestAttributes != null) {
+        //     HttpServletRequest request = requestAttributes.getRequest();
+        //     String token = request.getHeader("token");
+        //     String myLoginName = request.getHeader("myLoginName");
+        //     if (StringUtils.isNotEmpty(token) && StringUtils.isNotEmpty(myLoginName)) {
+        //         // 若存在token，则通过userInfo取手机号
+        //         UserInfo tokenUi = new UserInfo();
+        //         tokenUi.setLoginName(myLoginName);
+        //         tokenUi = getOne(new QueryWrapper<>(tokenUi));
+        //         if (tokenUi == null) {
+        //             throw new MsgException("非法的请求头");
+        //         }
+        //         UserApp tokenUa = new UserApp().setUserId(tokenUi.getId()).setToken(token);
+        //         tokenUa = userAppService.getOne(new QueryWrapper<>(tokenUa));
+        //
+        //         if (tokenUa == null) {
+        //             throw new MsgException("非法的请求头");
+        //         }
+        //
+        //         operatorUserId = userInfo.getId() + "";
+        //     }
+        // }
+        // ipRecordService.saveRegIp(userInfo.getId() + "", operatorUserId);
+
+
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/userIntegral/UserIntegralService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/userIntegral/UserIntegralService.java
new file mode 100644
index 0000000..e7e90d4
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/userIntegral/UserIntegralService.java
@@ -0,0 +1,60 @@
+package cn.pluss.platform.userIntegral;
+
+import cn.pluss.platform.entity.MerchantOrder;
+import cn.pluss.platform.entity.MerchantStore;
+import cn.pluss.platform.entity.UserIntegral;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 用户积分详情表 服务类
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-05-17
+ */
+public interface UserIntegralService extends IService<UserIntegral> {
+
+    /**
+     * 保存用户积分操作
+     * @param orderNumber
+     * @param orderAmt
+     * @param userId
+     * @param type
+     * @param source
+     * @param integral
+     */
+    void saveUserIntegral(String orderNumber,BigDecimal orderAmt, Long userId, String type,String source, BigDecimal integral);
+
+    void bstOrderIntegralReward(MerchantOrder order);
+
+    /**
+     * 查询积分余额
+     * @param userId
+     * @param date
+     * @param auditDate
+     * @return
+     */
+    BigDecimal getCountIntegral(Serializable userId, String date, String auditDate);
+
+    /**
+     * 查询积分余额
+     * @param userId
+     * @return
+     */
+    BigDecimal getCountIntegral(Serializable userId);
+
+    /**
+     * 分页查询
+     * @param page
+     * @param query
+     * @return
+     */
+    Page<UserIntegral> pageInfo(Page<UserIntegral> page, UserIntegral query);
+
+    UserIntegral getByOrderNumber(String orderNumber);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/userIntegral/impl/UserIntegralServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/userIntegral/impl/UserIntegralServiceImpl.java
new file mode 100644
index 0000000..8754f04
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/userIntegral/impl/UserIntegralServiceImpl.java
@@ -0,0 +1,164 @@
+package cn.pluss.platform.userIntegral.impl;
+
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.enums.UserRoleEnum;
+import cn.pluss.platform.mapper.MercOrderDetailMapper;
+import cn.pluss.platform.mapper.MerchantStoreMapper;
+import cn.pluss.platform.mapper.UserAppMapper;
+import cn.pluss.platform.mapper.UserIntegralMapper;
+import cn.pluss.platform.merchantOrder.MerchantOrderService;
+import cn.pluss.platform.userIntegral.UserIntegralService;
+import cn.pluss.platform.util.StringUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 用户积分详情表 服务实现类
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-05-17
+ */
+@Service
+@Slf4j
+public class UserIntegralServiceImpl extends ServiceImpl<UserIntegralMapper, UserIntegral> implements UserIntegralService {
+
+    @Resource
+    private UserAppMapper userAppMapper;
+
+    @Resource
+    private MerchantStoreMapper merchantStoreMapper;
+
+    @Resource
+    private MercOrderDetailMapper mercOrderDetailMapper;
+
+    @Setter(onMethod_ = {@Autowired,@Lazy})
+    private MerchantOrderService merchantOrderService;
+
+    /**
+     * BST积分条件 交易笔数2000比
+     * @date: 2022/2/14 11:00
+     */
+    private final int BST_INTEGRAL_TRANS_NUM = 2000;
+
+
+    private final BigDecimal BST_LI_BAO_AMT2 = BigDecimal.valueOf(169);
+    /**
+     * BST积分条件 交易金额50000
+     * @date: 2022/2/14 11:00
+     */
+    private final double BST_INTEGRAL_TRANS_AMOUNT = 50000d;
+    /**
+     * 保存用户积分操作
+     * @param orderNumber 订单号
+     * @param orderAmt 订单金额
+     * @param userId 用户ID
+     * @param type 积分类型1：交易积分 2：机具积分 3：其他积分
+     * @param source 订单来源 1：交易 2：云音箱 3：扫码王
+     * @param integral 积分数值
+     */
+    @Override
+    public void saveUserIntegral(String orderNumber,BigDecimal orderAmt, Long userId, String type,String source, BigDecimal integral) {
+        UserIntegral userIntegral = new UserIntegral(orderNumber,orderAmt,userId,type,source,integral);
+        this.save(userIntegral);
+    }
+
+    @Override
+    public void bstOrderIntegralReward(MerchantOrder order) {
+        log.info("【倍斯特】积分返操作开始，订单号:{}",order.getOrderNumber());
+        try {
+            String merchantCode = order.getMerchantCode();
+            if(StringUtil.isEmpty(merchantCode)){
+                return;
+            }
+            UserApp userApp = userAppMapper.selectByMerchantCode(merchantCode);
+            if(userApp == null || !UserRoleEnum.ZY_BST.getCode().equals(userApp.getRoleCode())){
+                return;
+            }
+            MerchantStore store = merchantStoreMapper.getStoreByMerchantCode(merchantCode);
+            if(store == null || !"1".equals(store.getIsMarket())){
+                return;
+            }
+            QueryWrapper<MercOrderDetail> queryDeviceWrapper = new QueryWrapper<MercOrderDetail>()
+                    .eq("userId",userApp.getUserId()).in("status","01","05","06").eq("code","libao");
+            List<MercOrderDetail> list = mercOrderDetailMapper.selectList(queryDeviceWrapper);
+            if(list.isEmpty()){
+                return;
+            }
+            QueryWrapper<UserIntegral> queryWrapper = new QueryWrapper<UserIntegral>()
+                    .eq("userId",userApp.getUserId()).eq("type","2").eq("source","2");
+            List<UserIntegral> lists = baseMapper.selectList(queryWrapper);
+            if(!lists.isEmpty()){
+                return;
+            }
+            QueryWrapper<MerchantOrder> orderQuery = new QueryWrapper<MerchantOrder>()
+                    .eq("merchantCode",userApp.getMerchantCode())
+                    .eq("status","1").select("count(1) as transNum,IFNULL(SUM(consumeFee),0) as transAmt");
+            Map<String, Object> map = merchantOrderService.getMap(orderQuery);
+            if(map == null || map.size() == 0){
+                return;
+            }
+            long transNum = (long)map.get("transNum");
+            double transAmt = (double) map.get("transAmt");
+            log.info("【倍斯特】积分返操作成功，订单号:{},交易笔数：{}，交易总额：{}",order.getOrderNumber(),transNum,transAmt);
+            if(transNum >= BST_INTEGRAL_TRANS_NUM || transAmt >= BST_INTEGRAL_TRANS_AMOUNT){
+                this.saveUserIntegral(null,null,userApp.getUserId(),"2","2",BST_LI_BAO_AMT2);
+                log.info("【倍斯特】积分返操作成功，订单号:{},用户ID：{}，积分数值：{}",order.getOrderNumber(),userApp.getUserId(),BST_LI_BAO_AMT2);
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            log.error("【倍斯特】积分返异常,异常信息:{}",e.getMessage());
+        }
+    }
+
+    /**
+     * 查询积分余额
+     * @param userId
+     * @param date
+     * @param auditDate
+     * @return
+     */
+    @Override
+    public BigDecimal getCountIntegral(Serializable userId, String date, String auditDate) {
+        return baseMapper.getCountIntegral(userId,date,null);
+    }
+
+    /**
+     * 查询积分余额
+     * @param userId
+     * @return
+     */
+    @Override
+    public BigDecimal getCountIntegral(Serializable userId) {
+        return baseMapper.getCountIntegral(userId);
+    }
+
+    /**
+     * 分页查询
+     * @param page
+     * @param query
+     * @return
+     */
+    @Override
+    public Page<UserIntegral> pageInfo(Page<UserIntegral> page, UserIntegral query) {
+        return baseMapper.pageInfo(page,query);
+    }
+
+    @Override
+    public UserIntegral getByOrderNumber(String orderNumber) {
+        return baseMapper.getByOrderNumber(orderNumber);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/userIntegralUse/UserIntegralUseService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/userIntegralUse/UserIntegralUseService.java
new file mode 100644
index 0000000..485f119
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/userIntegralUse/UserIntegralUseService.java
@@ -0,0 +1,27 @@
+package cn.pluss.platform.userIntegralUse;
+
+import cn.pluss.platform.entity.UserIntegralUse;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 用户积分使用详情 服务类
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-05-19
+ */
+public interface UserIntegralUseService extends IService<UserIntegralUse> {
+
+    BigDecimal getUseIntegral(Serializable userId, String date);
+
+    default BigDecimal getUseIntegral(Serializable userId){
+        return getUseIntegral(userId,null);
+    }
+
+    Page pageInfo(Page<UserIntegralUse> page, UserIntegralUse query);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/userIntegralUse/impl/UserIntegralUseServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/userIntegralUse/impl/UserIntegralUseServiceImpl.java
new file mode 100644
index 0000000..6f6b78b
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/userIntegralUse/impl/UserIntegralUseServiceImpl.java
@@ -0,0 +1,33 @@
+package cn.pluss.platform.userIntegralUse.impl;
+
+import cn.pluss.platform.entity.UserIntegralUse;
+import cn.pluss.platform.mapper.UserIntegralUseMapper;
+import cn.pluss.platform.userIntegralUse.UserIntegralUseService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 用户积分使用详情 服务实现类
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-05-19
+ */
+@Service
+public class UserIntegralUseServiceImpl extends ServiceImpl<UserIntegralUseMapper, UserIntegralUse> implements UserIntegralUseService {
+
+    @Override
+    public BigDecimal getUseIntegral(Serializable userId, String date) {
+        return baseMapper.getUseIntegral(userId,date);
+    }
+
+    @Override
+    public Page pageInfo(Page<UserIntegralUse> page, UserIntegralUse query) {
+        return baseMapper.pageInfo(page,query);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/userManageProfit/UserManageProfitService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/userManageProfit/UserManageProfitService.java
new file mode 100644
index 0000000..262dfb3
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/userManageProfit/UserManageProfitService.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.userManageProfit;
+
+import cn.pluss.platform.entity.UserManageProfit;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 用户管理奖统计表 服务类
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-05-23
+ */
+public interface UserManageProfitService extends IService<UserManageProfit> {
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/userManageProfit/impl/UserManageProfitServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/userManageProfit/impl/UserManageProfitServiceImpl.java
new file mode 100644
index 0000000..db931e4
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/userManageProfit/impl/UserManageProfitServiceImpl.java
@@ -0,0 +1,20 @@
+package cn.pluss.platform.userManageProfit.impl;
+
+import cn.pluss.platform.entity.UserManageProfit;
+import cn.pluss.platform.mapper.UserManageProfitMapper;
+import cn.pluss.platform.userManageProfit.UserManageProfitService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 用户管理奖统计表 服务实现类
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-05-23
+ */
+@Service
+public class UserManageProfitServiceImpl extends ServiceImpl<UserManageProfitMapper, UserManageProfit> implements UserManageProfitService {
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/userOrgan/UserOrganService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/userOrgan/UserOrganService.java
new file mode 100644
index 0000000..86b6637
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/userOrgan/UserOrganService.java
@@ -0,0 +1,25 @@
+package cn.pluss.platform.userOrgan;
+
+import java.util.List;
+import java.util.Map;
+import cn.pluss.platform.entity.UserOrgan;
+
+public interface UserOrganService {
+
+    public UserOrgan queryUserOrgan(UserOrgan userOrgan);
+
+    public List<UserOrgan> queryUserOrganList(UserOrgan userOrgan);
+
+    public void saveUserOrgan(UserOrgan userOrgan);
+
+    public void updateUserOrgan(UserOrgan userOrgan);
+
+    public void deleteUserOrgan(UserOrgan userOrgan);
+
+    public List<UserOrgan> queryUserOrganPage(Map map);
+
+    public Integer queryUserOrganPageCount(Map map);
+
+    public void saveUserOrganBatch(List<UserOrgan> userOrganList);
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/userOrgan/impl/UserOrganServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/userOrgan/impl/UserOrganServiceImpl.java
new file mode 100644
index 0000000..c43819c
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/userOrgan/impl/UserOrganServiceImpl.java
@@ -0,0 +1,58 @@
+package cn.pluss.platform.userOrgan.impl;
+
+import java.util.List;
+import java.util.Map;
+import org.springframework.transaction.annotation.Transactional;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import cn.pluss.platform.entity.UserOrgan;
+import cn.pluss.platform.userOrgan.UserOrganService;
+import cn.pluss.platform.mapper.UserOrganMapper;
+
+@Transactional
+@Service("userOrganService")
+public class UserOrganServiceImpl  implements UserOrganService{
+
+	 private static final Logger logger = LoggerFactory.getLogger( UserOrganServiceImpl.class);
+
+
+    @Autowired
+	  private UserOrganMapper userOrganMapper;
+
+    @Override
+    public UserOrgan queryUserOrgan(UserOrgan userOrgan){
+        return userOrganMapper.queryUserOrgan(userOrgan);
+    }
+
+    @Override
+    public List<UserOrgan> queryUserOrganList(UserOrgan userOrgan){
+        return userOrganMapper.queryUserOrganList(userOrgan);
+    }
+    @Override
+    public void saveUserOrgan(UserOrgan userOrgan){
+          userOrganMapper.saveUserOrgan(userOrgan);
+    }
+    @Override
+    public void updateUserOrgan(UserOrgan userOrgan){
+        userOrganMapper.updateUserOrgan(userOrgan);
+    }
+    @Override
+    public void deleteUserOrgan(UserOrgan userOrgan){
+        userOrganMapper.deleteUserOrgan(userOrgan);
+    }
+    @Override
+    public List<UserOrgan> queryUserOrganPage(Map map){
+        return userOrganMapper.queryUserOrganPage(map);
+    }
+    @Override
+    public Integer queryUserOrganPageCount(Map map){
+        return userOrganMapper.queryUserOrganPageCount(map);
+    }
+    @Override
+    public void saveUserOrganBatch(List<UserOrgan> userOrganList) {
+         userOrganMapper.saveUserOrganBatch(userOrganList);
+    }
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/userRewardFlow/UserRewardFlowService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/userRewardFlow/UserRewardFlowService.java
new file mode 100644
index 0000000..5d4aaea
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/userRewardFlow/UserRewardFlowService.java
@@ -0,0 +1,20 @@
+package cn.pluss.platform.userRewardFlow;
+
+import cn.pluss.platform.entity.UserRewardFlow;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 直营贝斯特管理奖流水表 服务类
+ * </p>
+ *
+ * @author bzg
+ * @since 2022-01-23
+ */
+public interface UserRewardFlowService extends IService<UserRewardFlow> {
+
+    /**
+     * 统计用户管理奖收益
+     */
+    void countManageProfit();
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/userRewardFlow/impl/UserRewardFlowServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/userRewardFlow/impl/UserRewardFlowServiceImpl.java
new file mode 100644
index 0000000..a6d4f80
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/userRewardFlow/impl/UserRewardFlowServiceImpl.java
@@ -0,0 +1,39 @@
+package cn.pluss.platform.userRewardFlow.impl;
+
+import cn.pluss.platform.entity.UserManageProfit;
+import cn.pluss.platform.entity.UserRewardFlow;
+import cn.pluss.platform.mapper.UserManageProfitMapper;
+import cn.pluss.platform.mapper.UserRewardFlowMapper;
+import cn.pluss.platform.userManageProfit.UserManageProfitService;
+import cn.pluss.platform.userRewardFlow.UserRewardFlowService;
+import cn.pluss.platform.util.DateUtils;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 直营贝斯特管理奖流水表 服务实现类
+ * </p>
+ *
+ * @author bzg
+ * @since 2022-01-23
+ */
+@Service
+public class UserRewardFlowServiceImpl extends ServiceImpl<UserRewardFlowMapper, UserRewardFlow> implements UserRewardFlowService {
+
+    @Resource
+    private UserManageProfitService userManageProfitService;
+
+    @Override
+    public void countManageProfit() {
+        String date = DateUtils.toString(DateUtils.add(Calendar.DAY_OF_MONTH,new Date(),-1),DateUtils.DEFAULT_FORMAT);
+        List<UserManageProfit> list = baseMapper.listManageProfit(date);
+        if(!list.isEmpty()){
+            userManageProfitService.saveBatch(list);
+        }
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/userRewardInfo/UserRewardInfoService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/userRewardInfo/UserRewardInfoService.java
new file mode 100644
index 0000000..e9951fc
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/userRewardInfo/UserRewardInfoService.java
@@ -0,0 +1,27 @@
+package cn.pluss.platform.userRewardInfo;
+
+import cn.pluss.platform.entity.UserRewardInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 用户奖励信息表 服务类
+ * </p>
+ *
+ * @author bzg
+ * @since 2022-02-22
+ */
+public interface UserRewardInfoService extends IService<UserRewardInfo> {
+
+
+    /**
+     * 根据用户ID用户区域配置
+     * @date: 2022/3/1 15:38
+     * @param userId:
+     * @param roleCode:
+     * @return java.util.List<cn.pluss.platform.entity.UserRewardInfo>
+     */
+    List<UserRewardInfo> selectListByUserIdAndRole(Long userId, String roleCode);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/userRewardInfo/impl/UserRewardInfoServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/userRewardInfo/impl/UserRewardInfoServiceImpl.java
new file mode 100644
index 0000000..dbd12d5
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/userRewardInfo/impl/UserRewardInfoServiceImpl.java
@@ -0,0 +1,37 @@
+package cn.pluss.platform.userRewardInfo.impl;
+
+import cn.pluss.platform.entity.UserRewardInfo;
+import cn.pluss.platform.mapper.UserRewardInfoMapper;
+import cn.pluss.platform.userRewardInfo.UserRewardInfoService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 用户奖励信息表 服务实现类
+ * </p>
+ *
+ * @author bzg
+ * @since 2022-02-22
+ */
+@Service
+public class UserRewardInfoServiceImpl extends ServiceImpl<UserRewardInfoMapper, UserRewardInfo> implements UserRewardInfoService {
+
+
+    /**
+     * 根据用户ID获取区域配置
+     * @date: 2022/3/1 15:18
+     * @param userId:
+     * @param roleCode:
+     * @return java.util.List<cn.pluss.platform.entity.UserRewardInfo>
+     */
+    @Override
+    public List<UserRewardInfo> selectListByUserIdAndRole(Long userId,String roleCode) {
+        QueryWrapper<UserRewardInfo> queryWrapper = new QueryWrapper<UserRewardInfo>()
+                .last(" A left join tb_pluss_reward_config c on A.reId = c.id  where a.status = 1 and a.userId = "+userId+" and c.roleCode = '"+roleCode+"' ").select(" A.*,c.scale as scale ");
+        return baseMapper.selectList(queryWrapper);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/utils/WechatUtils.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/utils/WechatUtils.java
new file mode 100644
index 0000000..177cea2
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/utils/WechatUtils.java
@@ -0,0 +1,182 @@
+package cn.pluss.platform.utils;
+
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.util.HttpUtil;
+import cn.pluss.platform.wechat.WxConstants;
+import cn.pluss.platform.wx.*;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * @author Administrator
+ */
+public class WechatUtils {
+
+    private static Logger logger = LoggerFactory.getLogger(WechatUtils.class);
+
+    public static WxAccessTokenResponse getAccessToken(WxAccessTokenRequest request){
+        String url = WxConstants.ACCESS_TOKEN_URL.replace("APPID", request.getAppid()).replace("SECRET", request.getSecret());
+        try {
+            JSONObject response = HttpUtil.httpRequest(url,"GET", null);
+            if(response == null){
+                MsgException.throwException("获取token请求失败");
+            }
+            if(response.containsKey(WxConstants.ERRCODE_NAME_PARAM)){
+                logger.error("获取token失败,异常信息:{}", response.toJSONString());
+                MsgException.throwException("获取token请求失败");
+            }
+            return JSONObject.parseObject(response.toJSONString(),WxAccessTokenResponse.class);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("获取token失败,异常信息:{}",e.getMessage());
+        }
+        MsgException.throwException("获取token失败");
+        return null;
+    }
+
+    public static WxOpenidResponse getWxOpenid(WxAccessTokenRequest request) {
+        String url = request.getUrl().replace("APPID", request.getAppid()).replace("SECRET", request.getSecret()).replace("CODE",request.getCode());
+        try {
+            JSONObject response = HttpUtil.httpRequest(url,"GET", null);
+            if(response == null){
+                MsgException.throwException("获取openid请求失败");
+            }
+            if(response.containsKey(WxConstants.ERRCODE_NAME_PARAM) && !WxConstants.RESULT_SUCCESS_CODE.equals(response.getInteger(WxConstants.ERRCODE_NAME_PARAM))){
+                logger.error("获取openid失败,异常信息:{}", response.toJSONString());
+                MsgException.throwException("获取openid请求失败");
+            }
+            return JSONObject.parseObject(response.toJSONString(),WxOpenidResponse.class);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("获取openid失败,异常信息:{}",e.getMessage());
+            MsgException.throwException("获取openid失败");
+        }
+        return null;
+    }
+
+    /**
+     * 发送微信模板消息
+     * @date: 2021/11/29 18:22
+     * @param accessToken:
+     * @param request:
+     */
+    public static void sendTemplateMsg(String accessToken, WxTemolateRequest request) {
+        String url = WxConstants.WX_SEND_TEMPLATE_URL.replace("ACCESS_TOKEN",accessToken);
+        JSONObject response = HttpUtil.httpRequest(url, "POST", JSON.toJSONString(request));
+        if(response == null){
+            MsgException.throwException("模板消息发送失败！");
+        }
+        if(response.containsKey(WxConstants.ERRCODE_NAME_PARAM) && !WxConstants.RESULT_SUCCESS_CODE.equals(response.getInteger(WxConstants.ERRCODE_NAME_PARAM))){
+            logger.error("模板消息发送失败,异常信息:{}", response.toJSONString());
+            MsgException.throwException("模板消息发送失败");
+        }
+        logger.info("模板消息推送，推送人openid:{}",request.getTouser());
+        logger.info("模板消息发送结果:{}",response.toJSONString());
+    }
+
+    /**
+     * 微信网页授权信息获取
+     * @date: 2021/11/30 10:32
+     * @param request:
+     * @return cn.pluss.platform.wx.WxOauth2AccessTokenResponse
+     */
+    public static WxOauth2AccessTokenResponse getOauth2AccessToken(WxAccessTokenRequest request) {
+        String url = WxConstants.OAUTH2_ACCESS_TOKEN_URL.replace("APPID", request.getAppid()).replace("SECRET", request.getSecret()).replace("CODE",request.getCode());
+        JSONObject response = HttpUtil.httpRequest(url, "GET", null);
+        if (response == null)	{
+            MsgException.throwException("微信获取网页授权信息接口失败");
+        }
+        if(response.containsKey(WxConstants.ERRCODE_NAME_PARAM) && !WxConstants.RESULT_SUCCESS_CODE.equals(response.getInteger(WxConstants.ERRCODE_NAME_PARAM))){
+            logger.error("获取网页信息的失败,异常信息：{}",response.toJSONString());
+            MsgException.throwException("微信获取网页授权信息接口失败");
+        }
+        return JSONObject.parseObject(response.toJSONString(),WxOauth2AccessTokenResponse.class);
+    }
+
+    public static WxUserInfoResponse getWxUserInfo(String accessToken,String openid) {
+        String url = WxConstants.WX_USER_INFO_URL.replace("ACCESS_TOKEN", accessToken).replace("OPENID",openid);
+        try {
+            JSONObject response = HttpUtil.httpRequest(url,"GET", null);
+            if(response == null){
+                MsgException.throwException("获取微信用户信息异常");
+            }
+            if(response.containsKey(WxConstants.ERRCODE_NAME_PARAM) && !WxConstants.RESULT_SUCCESS_CODE.equals(response.getInteger(WxConstants.ERRCODE_NAME_PARAM))){
+                logger.error("获取微信用户信息异常,异常信息:{}", response.toJSONString());
+                MsgException.throwException("获取微信用户信息异常");
+            }
+            return JSONObject.parseObject(response.toJSONString(),WxUserInfoResponse.class);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("获取微信用户信息异常,异常信息:{}",e.getMessage());
+            MsgException.throwException("获取微信用户信息异常");
+        }
+        return null;
+    }
+
+    /**
+     * 微信生成带参数的二维码
+     * @date: 2021/12/9 11:26
+     * @param accessToken:
+     * @param qrCodeRequest:
+     * @return cn.pluss.platform.wx.WxCreateQrCodeResponse
+     */
+    public static WxCreateQrCodeResponse getWxQrCode(String accessToken, WxCreateQrCodeRequest qrCodeRequest) {
+        String url = WxConstants.WX_CREATE_QR_CODE_URL.replace("ACCESS_TOKEN", accessToken);
+        try {
+            JSONObject response = HttpUtil.httpRequest(url,"POST", JSON.toJSONString(qrCodeRequest));
+            if(response == null){
+                MsgException.throwException("生成微信带参数的二维码失败");
+            }
+            if(response.containsKey(WxConstants.ERRCODE_NAME_PARAM) && !WxConstants.RESULT_SUCCESS_CODE.equals(response.getInteger(WxConstants.ERRCODE_NAME_PARAM))){
+                logger.error("生成微信带参数的二维码异常,异常信息:{}", response.toJSONString());
+                MsgException.throwException("生成微信带参数的二维码异常");
+            }
+            return JSONObject.parseObject(response.toJSONString(),WxCreateQrCodeResponse.class);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("生成微信带参数的二维码异常,异常信息:{}",e.getMessage());
+            MsgException.throwException("生成微信带参数的二维码异常");
+        }
+        return null;
+    }
+
+    /**
+     * 获取微信jsapiticket
+     * @param accessToken
+     * @param type
+     * @return
+     */
+    public static WxJsApiTicketResponse getJsapiTicket(String accessToken, String type) {
+        String requestUrl = WxConstants.WX_TICKET_URL.replace("ACCESS_TOKEN", accessToken).replace("TYPE",type);
+        JSONObject response = HttpUtil.httpRequest(requestUrl,"GET",null);
+        if(response == null){
+            MsgException.throwException("获取微信ticket异常");
+        }
+        if(response.containsKey(WxConstants.ERRCODE_NAME_PARAM) && !WxConstants.RESULT_SUCCESS_CODE.equals(response.getInteger(WxConstants.ERRCODE_NAME_PARAM))){
+            logger.error("获取微信ticket异常,异常信息:{}", response.toJSONString());
+            MsgException.throwException("获取微信ticket异常");
+        }
+        return JSONObject.parseObject(response.toJSONString(),WxJsApiTicketResponse.class);
+    }
+
+    /**
+     * 获取小程序 scheme 码
+     * @param request
+     * @return
+     */
+    public static WxUrlschemeResponse getUrlecheme(WxUrlschemeRequest request,String accessToken) {
+        String url = WxConstants.GENERATE_SCHEME.replace("ACCESS_TOKEN",accessToken);
+        JSONObject response = HttpUtil.httpRequest(url, "POST", JSON.toJSONString(request));
+        if(response == null){
+            MsgException.throwException("获取微信小程序urlscheme异常");
+        }
+        WxUrlschemeResponse resp = JSONObject.parseObject(response.toJSONString(), WxUrlschemeResponse.class);
+        if(!WxConstants.RESULT_SUCCESS_CODE.equals(resp.getErrcode())){
+            logger.error("获取微信小程序urlscheme异常,异常信息:{}", resp.getErrmsg());
+            MsgException.throwException("获取微信小程序urlscheme异常");
+        }
+        return resp;
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/wechat/WechatService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/wechat/WechatService.java
new file mode 100644
index 0000000..dbc8293
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/wechat/WechatService.java
@@ -0,0 +1,129 @@
+package cn.pluss.platform.wechat;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.dto.WechatMerchantAuditDTO;
+import cn.pluss.platform.entity.BankCard;
+import cn.pluss.platform.entity.DeviceMerchantBuy;
+import cn.pluss.platform.dto.DeviceMerchantBuyDTO;
+import cn.pluss.platform.entity.MerchantBankCard;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.util.RSAEncryptUtil;
+import cn.pluss.platform.util.StringUtil;
+import cn.pluss.platform.util.WXPayHttpUtil;
+import cn.pluss.platform.util.WXPayXmlUtil;
+
+/**
+ * @author yuchen
+ * 
+ * @Description 
+ */
+public interface WechatService {
+
+	public final static String keyStoreUrl = "/home/syb/resources/wechatCert/apiclient_cert.p12";
+	
+	/**
+	 * 
+	 * AppPayParam:(APP统一下单MD5加密). <br/> 
+	 * 
+	 * @author Administrator 
+	 * @param request
+	 * @param map
+	 * @return 
+	 * @since JDK 1.8
+	 */
+	Result<Map<String, String>> appPayParam(HttpServletRequest request, Map<String, String> map, DeviceMerchantBuyDTO deviceMerchantBuyDTO);
+
+	/**
+	 *
+	 * AppPayParam:(APP统一下单MD5加密). <br/>
+	 * 
+	 * @author Administrator
+	 * @param request
+	 * @param map
+	 * @return
+	 * @since JDK 1.8
+	 */
+	Result<Map<String, String>> appPayParamV2(HttpServletRequest request, Map<String, String> map, DeviceMerchantBuyDTO deviceMerchantBuyDTO);
+
+	/**
+	 * app统一支付下单，非商城
+	 * AppPayParam:(APP统一下单MD5加密). <br/>
+	 * 
+	 * @author Administrator
+	 * @param request
+	 * @param map
+	 * @return
+	 * @since JDK 1.8
+	 */
+	Map<String, String> appPayParam(HttpServletRequest request, Map<String, String> map);
+
+	/**
+	 * 
+	 * AppRefund:(APP退款). <br/> 
+	 * 
+	 * @author Administrator 
+	 * @param deviceMerchantBuy
+	 * @return 
+	 * @since JDK 1.8
+	 */
+	Result<String> appRefund(DeviceMerchantBuy deviceMerchantBuy);
+	
+	/**
+	 * 
+	 * getRQcode:(获取关注公众号的图片). <br/> 
+	 * 
+	 * @author Administrator 
+	 * @param sceneStr
+	 * @return 
+	 * @since JDK 1.8
+	 */
+	Result<String>  getRQcode(String sceneStr);
+
+	/**
+	 * 新版获取微信带参数的二维码
+	 * @date: 2021/12/9 11:35
+	 * @param sceneStr:
+	 * @return cn.pluss.platform.api.Result<java.lang.String>
+	 */
+	Result<String>  getNewRQcode(String sceneStr);
+
+	// 修改微信小微商户结算银行卡信息
+	default Boolean updateWechatBankInfo(BankCard bankCard, UserApp userApp) throws Exception {
+//		Map<String, String> loadDataMap = new HashMap<String, String>();
+//		// 构造入住参数
+//		Map<String, String> registData = new HashMap<String, String>(16);
+//		loadDataMap.put("version", "1.0");
+//		loadDataMap.put("cert_sn", "4F3FF2964275BA2D2D8320BC8187FB3E18D22DFE");
+//		loadDataMap.put("mch_id", "1551169371");
+//		loadDataMap.put("nonce_str", StringUtil.genRandomNum(8));
+//		loadDataMap.put("sign_type", "HMAC-SHA256");
+//		loadDataMap.put("sub_mch_id", userApp.getSubMchId());
+//		loadDataMap.put("account_name", RSAEncryptUtil.rsaEncrypt(bankCard.getBankHolder()));
+//		loadDataMap.put("account_number", RSAEncryptUtil.rsaEncrypt(bankCard.getBankCardNo()));
+//		registData.put("account_bank", bankCard.getBankName());
+//		registData.put("bank_address_code", bankCard.getBankAddressNo());
+//		String result = WXPayHttpUtil.WXHttpPostXMLWithCert(
+//				"https://api.mch.weixin.qq.com/applyment/micro/modifyarchives", registData, keyStoreUrl);
+//		Map<String, String> resultMap = new HashMap<String, String>();
+//		resultMap = WXPayXmlUtil.parseXMLToMap(result);
+//		if ("SUCCESS".equalsIgnoreCase(resultMap.get("return_code"))
+//				&& "SUCCESS".equalsIgnoreCase(resultMap.get("result_code"))) {
+//			return true;
+//		}
+		return false;
+	}
+
+	/**
+	 * 微信进件
+	 * @deprecated 原生通道暂不使用
+	 * @param wechatMerchantAuditDTO
+	 */
+	@Deprecated
+	void wechatMerchantAudit(WechatMerchantAuditDTO wechatMerchantAuditDTO);
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/wechat/impl/WechatServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/wechat/impl/WechatServiceImpl.java
new file mode 100644
index 0000000..729fdd4
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/wechat/impl/WechatServiceImpl.java
@@ -0,0 +1,468 @@
+package cn.pluss.platform.wechat.impl;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.device.DeviceOrderInfoService;
+import cn.pluss.platform.deviceMerchantBuy.DeviceMerchantBuyService;
+import cn.pluss.platform.deviceMerchantBuyDetail.DeviceMerchantBuyDetailService;
+import cn.pluss.platform.dto.DeviceMerchantBuyDTO;
+import cn.pluss.platform.dto.WechatMerchantAuditDTO;
+import cn.pluss.platform.entitiy.ActionInfo;
+import cn.pluss.platform.entitiy.Scene;
+import cn.pluss.platform.entitiy.WechatQRCode;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.util.*;
+import cn.pluss.platform.wap.HttpUrlConnection;
+import cn.pluss.platform.wap.WxPaySignatureUtils;
+import cn.pluss.platform.wap.XmlUtil;
+import cn.pluss.platform.wechat.WechatService;
+import cn.pluss.platform.wechat.WxConstants;
+import cn.pluss.platform.wx.WxAccessTokenRequest;
+import cn.pluss.platform.wx.WxCommonService;
+import cn.pluss.platform.wx.WxCreateQrCodeRequest;
+import cn.pluss.platform.wx.WxCreateQrCodeResponse;
+import com.alibaba.fastjson.JSONObject;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.UnsupportedEncodingException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
+/**
+ * @author yuchen
+ * 
+ * @Description
+ */
+@Slf4j
+@Service("wechatService")
+public class WechatServiceImpl implements WechatService {
+
+    private static String requestUrl = "https://api.mch.weixin.qq.com/applyment/micro/submit";
+
+    private static final Logger logger = LoggerFactory.getLogger(WechatService.class);
+
+    @Setter(onMethod_ = {@Autowired})
+    private UserAppService userAppService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantBaseInfoService merchantBaseInfoService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private DeviceOrderInfoService deviceOrderInfoService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private DeviceMerchantBuyService deviceMerchantBuyService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private DeviceMerchantBuyDetailService deviceMerchantBuyDetailService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private WxCommonService wxCommonService;
+
+
+
+    @Override
+    public Result<Map<String, String>> appPayParam(HttpServletRequest request, Map<String, String> map, DeviceMerchantBuyDTO deviceMerchantBuyDTO) {
+        Map<String, String> reMap = appPayParam(request, map);
+
+        boolean createOrder = createOrder(map.get("outTradeNo"), deviceMerchantBuyDTO, request);
+        if (createOrder) {
+            return ResultGenerator.genSuccessResult(reMap);
+        } else {
+            throw new MsgException("系统繁忙，请稍后再试");
+        }
+    }
+
+    @Override
+    public Result<Map<String, String>> appPayParamV2(HttpServletRequest request, Map<String, String> map, DeviceMerchantBuyDTO deviceMerchantBuyDTO) {
+        Map<String, String> reMap = appPayParam(request, map);
+
+        boolean createOrder = createOrder(map.get("outTradeNo"), deviceMerchantBuyDTO, request);
+        if (createOrder) {
+            deviceOrderInfoService.createOrder(map.get("outTradeNo") + "", deviceMerchantBuyDTO);
+            return ResultGenerator.genSuccessResult(reMap);
+        } else {
+            throw new MsgException("系统繁忙，请稍后再试");
+        }
+    }
+
+    @Override
+    public Map<String, String> appPayParam(HttpServletRequest request, Map<String, String> map) {
+        Map<String, String> result = new HashMap<>(16);
+        result.put("appid", ParametersUtil.MERCHANT_APPID);
+        result.put("mch_id", ParametersUtil.MERCHANT_PID);
+        result.put("nonce_str", StringUtil.genRandomNum(32));
+        result.put("body", map.get("body"));
+        result.put("out_trade_no", map.get("outTradeNo"));
+        result.put("total_fee", (int) (Double.parseDouble(map.get("totalAmount")) * 100) + "");
+        result.put("spbill_create_ip", getIpAddress(request));
+        result.put("notify_url", ParametersUtil.domain + "/wap/wechat/wechatCallBackV2");
+        result.put("trade_type", "APP");
+        String sign = WxPaySignatureUtils.signature(result, ParametersUtil.MERCHANT_KEY);
+        result.put("sign", sign);
+        try {
+            String xml = WxPaySignatureUtils.mapToXml(result);
+            String httpXML = HttpUrlConnection.httpXML("https://api.mch.weixin.qq.com/pay/unifiedorder", xml);
+            if (httpXML == null) {
+                throw new MsgException("请求失败，请稍后再试");
+            }
+
+            Map<String, Object> parseXMLToMap = XmlUtil.toMap(httpXML);
+            if ("SUCCESS".equals(parseXMLToMap.get("return_code"))) {
+                if ("SUCCESS".equals((parseXMLToMap.get("result_code")))) {
+                    Map<String, String> reMap = new HashMap<>(16);
+                    String appid = ParametersUtil.MERCHANT_APPID;
+                    String partnerid = ParametersUtil.MERCHANT_PID;
+                    String prepayid = (String) parseXMLToMap.get("prepay_id");
+                    String packageMsg = "Sign=WXPay";
+                    String noncestr = StringUtil.genRandomNum(32);
+                    String timeStamp = String.valueOf(System.currentTimeMillis() / 1000);
+                    reMap.put("appid", appid);
+                    reMap.put("partnerid", partnerid);
+                    reMap.put("prepayid", prepayid);
+                    reMap.put("package", packageMsg);
+                    reMap.put("noncestr", noncestr);
+                    reMap.put("timestamp", timeStamp);
+                    String signature = WxPaySignatureUtils.signature(reMap, ParametersUtil.MERCHANT_KEY);
+                    reMap.put("sign", signature);
+
+                    return reMap;
+                } else {
+                    throw new MsgException("请求失败，请稍后再试");
+                }
+            } else {
+                throw new MsgException("请求失败，请稍后再试");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new MsgException("请求失败，请稍后再试");
+        }
+    }
+
+    /**
+     * createOrder:(创建订单). <br/>
+     *
+     * @param deviceMerchantBuyDTO
+     * @return
+     * 
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    public boolean createOrder(String orderNo, DeviceMerchantBuyDTO deviceMerchantBuyDTO, HttpServletRequest request) {
+        DeviceMerchantBuy deviceMerchantBuy = deviceMerchantBuyDTO.convertDeviceMerchantBuy();
+        try {
+            UserApp userApp = userAppService.queryUserAppByToken();
+            Long userId = userApp.getUserId();
+            MerchantBaseInfo merchantBaseInfo = new MerchantBaseInfo();
+            merchantBaseInfo.setUserId(userId + "");
+            List<MerchantBaseInfo> queryMerchantBaseInfoList = merchantBaseInfoService.queryMerchantBaseInfoList(merchantBaseInfo);
+            if (queryMerchantBaseInfoList != null && queryMerchantBaseInfoList.size() > 0) {
+                merchantBaseInfo = queryMerchantBaseInfoList.get(0);
+                deviceMerchantBuy.setMerchantCode(merchantBaseInfo.getMerchantCode());
+                deviceMerchantBuy.setMerchantName(merchantBaseInfo.getMerchantName());
+            }
+            deviceMerchantBuy.setOrderNo(orderNo);
+            deviceMerchantBuyService.saveDeviceMerchantBuy(deviceMerchantBuy);
+            for (int i = 0; i < deviceMerchantBuyDTO.getQuantity(); i++) {
+                DeviceMerchantBuyDetail deviceMerchantBuyDetail = new DeviceMerchantBuyDetail();
+                deviceMerchantBuyDetail.setOrderNo(orderNo);
+                deviceMerchantBuyDetail.setSoleCode(StringUtil.genRandomNum(3) + StringUtil.getBillno());
+                deviceMerchantBuyDetailService.saveDeviceMerchantBuyDetail(deviceMerchantBuyDetail);
+            }
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return false;
+        }
+
+    }
+
+
+    /**
+     * 从request中获取请求方IP
+     *
+     * @param request
+     * @return
+     */
+    public static String getIpAddress(HttpServletRequest request) {
+        String ip = request.getHeader("x-forwarded-for");
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getHeader("Proxy-Client-IP");
+        }
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getHeader("WL-Proxy-Client-IP");
+        }
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getHeader("HTTP_CLIENT_IP");
+        }
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getHeader("HTTP_X_FORWARDED_FOR");
+        }
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            // 若以上方式均为获取到ip则证明获得客户端并没有采用反向代理直接使用getRemoteAddr()获取客户端的ip地址
+            ip = request.getRemoteAddr();
+        }
+        // 多个路由时，取第一个非unknown的ip
+        final String[] arr = ip.split(",");
+        for (final String str : arr) {
+            if (!"unknown".equalsIgnoreCase(str)) {
+                ip = str;
+                break;
+            }
+        }
+        return ip;
+    }
+
+    @Override
+    public Result<String> appRefund(DeviceMerchantBuy deviceMerchantBuy) {
+        Map<String, String> wechatMap = new HashMap<String, String>(16);
+        String refundNo = StringUtil.genRandomNum(10);
+        wechatMap.put("appid", "wxed824282c345b7a0");
+        wechatMap.put("mch_id", "1551169371");
+        wechatMap.put("nonce_str", StringUtil.genRandomNum(10));
+        wechatMap.put("sign_type", "HMAC-SHA256");
+        wechatMap.put("out_trade_no", deviceMerchantBuy.getOrderNo());
+        wechatMap.put("out_refund_no", refundNo);
+        wechatMap.put("total_fee", ((int) (deviceMerchantBuy.getOrderAmount() * 100)) + "");
+        wechatMap.put("refund_fee", ((int) (deviceMerchantBuy.getOrderAmount() * 100)) + "");
+        wechatMap.put("sign", WechatSignUtil.sha256Sign(wechatMap, ""));
+        String resultString = WXPayHttpUtil.WXHttpPostXMLWithCertOrdinary("https://api.mch.weixin.qq.com/secapi/pay/refund", wechatMap, "");
+        Map<String, String> resultMap = WXPayXmlUtil.parseXMLToMap(resultString);
+        if ("SUCCESS".equalsIgnoreCase(resultMap.get("return_code"))) {
+            if ("SUCCESS".equalsIgnoreCase(resultMap.get("result_code"))) {
+                deviceMerchantBuy.setStatus("2");
+                deviceMerchantBuyService.updateDeviceMerchantBuy(deviceMerchantBuy);
+                return ResultGenerator.genSuccessResult("退款成功");
+            } else {
+                return ResultGenerator.genFailResult("退款失败");
+            }
+        } else {
+            return ResultGenerator.genFailResult("退款失败");
+        }
+    }
+
+    @Override
+    public Result<String> getRQcode(String sceneStr) {
+        WxAccessTokenRequest request = WxAccessTokenRequest.buidWxToken(ParametersUtil.APPID,ParametersUtil.APPSECRET,null, WxConstants.ACCESS_TOKEN_URL);
+        String accessToken = wxCommonService.getAccessToken(request,false);
+        WechatQRCode wechatQRCode = TemporaryQRcode.createForeverTicket(accessToken, 2592000, sceneStr);
+        Properties prop = System.getProperties();
+        String os = prop.getProperty("os.name");
+        String path = null;
+        if (os.startsWith("win") || os.startsWith("Win")) {
+            // windows目录
+            path = "D:/Pictures";
+        } else {
+            path = ParametersUtil.upload_save_path;
+        }
+
+        if (wechatQRCode == null) {
+            return ResultGenerator.genFailResult("获取失败");
+        }
+
+        try {
+            String rQcode = TemporaryQRcode.getRQcode(wechatQRCode.getTicket(), path);
+            return ResultGenerator.genSuccessResult(rQcode);
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        return ResultGenerator.genFailResult("获取失败");
+    }
+
+    /**
+     * 新获取用
+     * @date: 2021/12/9 14:05
+     * @param sceneStr:
+     * @return cn.pluss.platform.api.Result<java.lang.String>
+     */
+    @Override
+    public Result<String> getNewRQcode(String sceneStr) {
+        WxAccessTokenRequest tokenRequest = WxAccessTokenRequest.buidWxToken(ParametersUtil.APPID,ParametersUtil.APPSECRET,null, WxConstants.ACCESS_TOKEN_URL);
+        ActionInfo actionInfo = new ActionInfo(new Scene(sceneStr));
+        WxCreateQrCodeRequest qrCodeRequest = new WxCreateQrCodeRequest(WxConstants.QR_EXPIRE_SECONDS,WxConstants.QR_STR_SCENE,actionInfo,null,null);
+        WxCreateQrCodeResponse wxQrCode = wxCommonService.getWxQrCode(tokenRequest, qrCodeRequest);
+        return ResultGenerator.genSuccessResult("获取成功",wxQrCode.getUrl());
+    }
+
+    @Override
+    public void wechatMerchantAudit(WechatMerchantAuditDTO wechatMerchantAuditDTO) {
+//        String userId = wechatMerchantAuditDTO.getUserId();
+//        if (StringUtil.isEmpty(userId)) {
+//            throw new MsgException("userId参数不存在！");
+//        }
+//        UserApp userApp = new UserApp();
+//        userApp.setUserId(Long.valueOf(userId));
+//        List<UserApp> queryUserAppList = userAppService.queryUserAppList(userApp);
+//        if (queryUserAppList != null && queryUserAppList.size() > 0) {
+//            userApp = queryUserAppList.get(0);// 获取当前用户的信息
+//            if (null == userApp.getWechatStatus() || 0 == userApp.getWechatStatus() || 2 == userApp.getWechatStatus()) {
+//                MerchantBankCard merchantBankCard = merchantBankCardService.queryMerchantBankCard(userId);
+//
+//                if (merchantBankCard == null) {
+//                    throw new MsgException("请重新进行实名认证，并绑定银行卡");
+//                }
+//
+//                MerchantBaseInfo merchantBaseInfo = new MerchantBaseInfo();
+//                merchantBaseInfo.setUserId(userId);
+//                List<MerchantBaseInfo> queryMerchantBaseInfoList = merchantBaseInfoService
+//                        .queryMerchantBaseInfoList(merchantBaseInfo);
+//                if (queryMerchantBaseInfoList == null || queryMerchantBaseInfoList.size() == 0) {
+//                    throw new MsgException("请先填写商户基本资料");
+//                }
+//
+//                merchantBaseInfo = queryMerchantBaseInfoList.get(0);
+//                MerchantImage mImage = new MerchantImage();
+//                mImage.setMerchantCode(merchantBaseInfo.getMerchantCode());
+//                List<MerchantImage> queryMerchantImageList = merchantImageService.queryMerchantImageList(mImage);
+//                Result<Map<String, Object>> convertUserApp = wechatMerchantAuditDTO.convertMap(merchantBankCard,
+//                        merchantBaseInfo, queryMerchantImageList);
+//                if (400 == convertUserApp.getCode()) {
+//                    throw new MsgException(convertUserApp.getMessage());
+//                }
+//
+//                Map<String, Object> result = convertUserApp.getData();
+//                String indoorPic = (String) result.get("09");
+//                String storeEntrancePic = (String) result.get("06");
+//                String certFullPhoto = (String) result.get("01");
+//                String certBacKPhoto = (String) result.get("02");
+//                Properties prop = System.getProperties();
+//                String os = prop.getProperty("os.name");
+//                if (!os.startsWith("win") && !os.startsWith("Win")) {
+//                    String REPLACE = ParametersUtil.REPLACE;
+//                    indoorPic = indoorPic.replace("https://www.shouyinbei.net", REPLACE);
+//                    storeEntrancePic = storeEntrancePic.replace("https://www.shouyinbei.net", REPLACE);
+//                    certFullPhoto = certFullPhoto.replace("https://www.shouyinbei.net", REPLACE);
+//                    certBacKPhoto = certBacKPhoto.replaceAll("https://www.shouyinbei.net", REPLACE);
+//                }
+//                indoorPic = WeChatImageUploadUtils.upload(new File(indoorPic));
+//                storeEntrancePic = WeChatImageUploadUtils.upload(new File(storeEntrancePic));
+//                certFullPhoto = WeChatImageUploadUtils.upload(new File(certFullPhoto));
+//                certBacKPhoto = WeChatImageUploadUtils.upload(new File(certBacKPhoto));
+//                String businessCode = StringUtil.getBillno();
+//                Result<Map<String, String>> registMap = getWechatRegistMap(businessCode, merchantBaseInfo,
+//                        merchantBankCard, storeEntrancePic, indoorPic, certFullPhoto, certBacKPhoto);
+//                if (400 == registMap.getCode()) {
+//                    throw new MsgException(registMap.getMessage());
+//                }
+//                try {
+//                    Map<String, String> registData = registMap.getData();
+//                    String resultString = WXPayHttpUtil.WXHttpPostXMLWithCert(requestUrl, registData, keyStoreUrl);
+//                    Map<String, String> resultMap = WXPayXmlUtil.parseXMLToMap(resultString);
+//                    if ("SUCCESS".equals(resultMap.get("return_code"))) {
+//                        if ("SUCCESS".equals(resultMap.get("result_code"))) {
+//                            merchantBaseInfo.setApplymentId(resultMap.get("applyment_id"));
+//                            userApp.setWechatStatus(1);
+//                            if (StringUtil.isNotEmpty(userApp.getParentId())) {// 更新上级推广人的认证商户数量
+//                                UserApp parentApp = new UserApp();
+//                                parentApp.setUserId(userApp.getParentId());
+//                                List<UserApp> queryUserAppList2 = userAppService.queryUserAppList(parentApp);
+//                                if (StringUtil.isNotEmpty(userApp.getParentId()) && queryUserAppList2 != null
+//                                        && queryUserAppList2.size() > 0) {
+//                                    parentApp = queryUserAppList2.get(0);
+//                                    UserApp updateParentApp = new UserApp();
+//                                    updateParentApp.setId(parentApp.getId());
+//                                    updateParentApp.setAuthCount(
+//                                            parentApp.getAuthCount() == null ? 1 : parentApp.getAuthCount() + 1);
+//                                    userAppService.updateUserApp(updateParentApp);
+//                                }
+//                            }
+//                            throw new MsgException("进件中 请等待审核");
+//                        } else {
+//                            userApp.setWechatStatus(2);
+//                            throw new MsgException(resultMap.get("err_code_des"));
+//                        }
+//                    } else {
+//                        userApp.setWechatStatus(2);
+//                        throw new MsgException(resultMap.get("return_code"));
+//                    }
+//                } catch (Exception e) {
+//                    e.printStackTrace();
+//                    userApp.setWechatStatus(2);
+//                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+//                    throw new MsgException("系统繁忙，请联系管理员");
+//                } finally {
+//                    userAppService.updateUserApp(userApp);
+//                    merchantBaseInfo.setWechatRate(ParametersUtil.WECHAT_RATE);
+//                    merchantBaseInfoService.updateMerchantBaseInfo(merchantBaseInfo);
+//                }
+//            } else {
+//                throw new MsgException("您已成功进件或者进件正在审核中");
+//            }
+//        } else {
+//            throw new MsgException("该用户不存在");
+//        }
+    }
+
+    private Result<Map<String, String>> getWechatRegistMap(String businessCode, MerchantBaseInfo merchantBaseInfo,
+                                                           MerchantBankCard merchantBankCard, String storeMedia, String indoorPicMedia, String certFullPhoto,
+                                                           String certBacKPhoto) {
+        log.info("========storeMedia========" + storeMedia);
+        log.info("=========storeMedia=====" + indoorPicMedia);
+        log.info("=======storeMedia======" + certFullPhoto);
+        log.info("=======storeMedia=========" + certBacKPhoto);
+        if (StringUtil.isEmpty(storeMedia)) {
+            return ResultGenerator.genFailResult("上传出错，请重新上传门头照");
+        }
+        if (StringUtil.isEmpty(indoorPicMedia)) {
+            return ResultGenerator.genFailResult("上传出错，请重新上传门店内照");
+        }
+        if (StringUtil.isEmpty(certFullPhoto)) {
+            return ResultGenerator.genFailResult("上传出错，请重新上传身份证正面照");
+        }
+        if (StringUtil.isEmpty(certBacKPhoto)) {
+            return ResultGenerator.genFailResult("上传出错，请重新上传身份证背面照");
+        }
+        // 构造入住参数
+        Map<String, String> registData = new HashMap<String, String>();
+        registData.put("version", "3.0");
+        registData.put("cert_sn", "4F3FF2964275BA2D2D8320BC8187FB3E18D22DFE");
+        registData.put("mch_id", "1551169371");
+        registData.put("nonce_str", StringUtil.genRandomNum(8));
+        registData.put("sign_type", "HMAC-SHA256");
+        registData.put("business_code", businessCode);
+        registData.put("id_card_copy", certFullPhoto);
+        registData.put("id_card_national", certBacKPhoto);
+        try {
+            registData.put("id_card_name", RSAEncryptUtil.rsaEncrypt(merchantBankCard.getBankCertName()));
+            registData.put("id_card_number", RSAEncryptUtil.rsaEncrypt(merchantBankCard.getCertNo()));
+            registData.put("account_name", RSAEncryptUtil.rsaEncrypt(merchantBankCard.getBankCertName()));
+            registData.put("account_number", RSAEncryptUtil.rsaEncrypt(merchantBankCard.getBankCardNo()));
+            registData.put("contact", RSAEncryptUtil.rsaEncrypt(merchantBaseInfo.getContactName()));
+            registData.put("contact_phone", RSAEncryptUtil.rsaEncrypt(merchantBaseInfo.getContactMobile()));
+        } catch (Exception e) {
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return ResultGenerator.genFailResult("系统繁忙 ，进件失败");
+        }
+        registData.put("service_phone", merchantBaseInfo.getContactMobile());
+        registData.put("id_card_valid_time", "[\"" + merchantBankCard.getCertStartTime().trim() + "\",\""
+                + merchantBankCard.getCertEndTime().trim() + "\"]");
+        registData.put("account_bank", merchantBankCard.getBankName());
+        registData.put("bank_address_code", merchantBankCard.getBankAddressNo());
+        registData.put("store_name", merchantBaseInfo.getAlias());
+        registData.put("store_address_code", merchantBaseInfo.getAddressNo());
+        registData.put("store_street", merchantBaseInfo.getAddress());
+        registData.put("store_entrance_pic", storeMedia);
+        registData.put("indoor_pic", indoorPicMedia);
+        registData.put("merchant_shortname", merchantBaseInfo.getAlias());
+        registData.put("product_desc", merchantBaseInfo.getProductDesc());
+        registData.put("rate", "0.6%");
+        log.info(JSONObject.toJSONString(registData));
+        String signString = WechatSignUtil.sha256Sign(registData, "7F05NZBTJ3XNDK5HLSDC3H25ZXOQKDHT");
+        registData.put("sign", signString);
+        return ResultGenerator.genSuccessResult(registData);
+    }
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/wx/WxCertService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/wx/WxCertService.java
new file mode 100644
index 0000000..292a93d
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/wx/WxCertService.java
@@ -0,0 +1,53 @@
+package cn.pluss.platform.wx;
+
+import cn.pluss.platform.vo.WxCertInfoVO;
+
+import java.util.List;
+
+public interface WxCertService {
+
+    /**
+     * 发起微信认证
+     * @param userId        用户id
+     * @param merchantCode  商编
+     * @param channelId     通道id
+     */
+    void wxCert(String userId, String merchantCode, Integer channelId);
+
+    /**
+     * 微信认证取消
+     * @param userId        用户id
+     * @param merchantCode  商编
+     * @param channelId     通道id
+     */
+    void wxCertCancel(String userId, String merchantCode, Integer channelId);
+
+    /**
+     * 微信认证授权状态
+     * @param merchantCode  商编
+     * @param channelId     通道id
+     */
+    default void wxCertAuthStatus(String merchantCode, Integer channelId) {}
+
+    /**
+     * 微信认证申请单状态
+     * @param merchantCode  商编
+     * @param channelId     通道id
+     */
+    default void wxCertApplyStatus(String merchantCode, Integer channelId) {}
+
+    /**
+     * 微信认证状态表
+     * @param userId    用户id
+     * @param channelType   通道类型
+     * @return
+     */
+    WxCertInfoVO wxCertInfo(String userId, String channelType);
+
+    /**
+     * 微信认证状态表
+     * @param userId    用户id
+     * @return
+     */
+    List<WxCertInfoVO> wxCertInfo(String userId);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/wx/WxCommonService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/wx/WxCommonService.java
new file mode 100644
index 0000000..e499f60
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/wx/WxCommonService.java
@@ -0,0 +1,97 @@
+package cn.pluss.platform.wx;
+
+import com.alibaba.fastjson.JSONObject;
+import io.swagger.models.auth.In;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ *
+ * 微信公共service
+ *@author: bzg
+ *@time: 2021/11/29 15:21
+ */
+public interface WxCommonService {
+
+    String WX_ACCESS_TOKEN_PREFIX_CODE = "accesstoken:";
+
+    String WX_OAUTH2_ACCESS_TOKEN_PREFIX_CODE = "accesstoken:oauth2:";
+
+    String WX_JSAPI_TICKET_PREFIX_CODE = "jsapi:ticket:";
+
+    /**
+     * 获取accesstoken
+     * @date: 2021/11/29 18:18
+     * @param request:
+     * @param refresh:
+     * @return java.lang.String
+     */
+    String getAccessToken(WxAccessTokenRequest request,Boolean refresh);
+
+
+    /**
+     * 获取H5网页授权信息
+     * @date: 2021/11/29 18:18
+     * @param request:
+     * @return java.lang.String
+     */
+    WxOauth2AccessTokenResponse getOauth2Info(WxAccessTokenRequest request);
+
+    /**
+     * 获取openid
+     * @date: 2021/11/29 18:18
+     * @param request:
+     * @return java.lang.String
+     */
+    WxOpenidResponse getWxOpenId(WxAccessTokenRequest request);
+
+    /**
+     * 发送模板消息
+     * @date: 2021/11/29 18:19
+     * @param request:
+     * @param tokenRequest:
+     */
+    void sendTemplateMsg(WxTemolateRequest request,WxAccessTokenRequest tokenRequest);
+
+    /**
+     * 获取微信用户信息
+     * @date: 2021/11/30 13:49
+     * @param request:
+     * @param openid:
+     * @return cn.pluss.platform.wx.WxUserInfoResponse
+     */
+    WxUserInfoResponse getWxUserInfo(WxAccessTokenRequest request,String openid);
+
+    /**
+     * 获取微信带参数的二维码
+     * @date: 2021/12/9 11:21
+     * @param tokenRequest:
+     * @param qrCodeRequest:
+     * @return cn.pluss.platform.wx.WxCreateQrCodeResponse
+     */
+    WxCreateQrCodeResponse getWxQrCode(WxAccessTokenRequest tokenRequest,WxCreateQrCodeRequest qrCodeRequest);
+
+    /**
+     * 获取ticket
+     * @date: 2022/1/19 14:01
+     * @param request:
+     * @param type:
+     * @return java.lang.String
+     */
+    String getJsapiTicket(WxAccessTokenRequest request,String type);
+
+    /**
+     * 获取微信jsapi校验参数
+     * @date: 2022/3/10 15:27
+     * @param request:
+     * @return com.alibaba.fastjson.JSONObject
+     */
+    JSONObject getJsApiConfigParam(HttpServletRequest request);
+
+    /**
+     * 获取小程序 scheme 码
+     * @param request
+     * @return
+     */
+    WxUrlschemeResponse getUrlecheme(WxAccessTokenRequest request,WxJumpWxa wxJumpWxa);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/wx/WxPayNotifyService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/wx/WxPayNotifyService.java
new file mode 100644
index 0000000..2558033
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/wx/WxPayNotifyService.java
@@ -0,0 +1,29 @@
+package cn.pluss.platform.wx;
+
+import com.alipay.api.AlipayApiException;
+
+import java.util.Map;
+
+/**
+ * 微信直连支付回调处理
+ */
+public interface WxPayNotifyService {
+
+    /**
+     * 通用回调处理方法
+     * @param param 回调参数
+     */
+    void commonPayNotify(Map<String, Object> param);
+
+    /**
+     * 设备购买回调处理方法
+     * @param param 回调参数
+     */
+    void devicePayNotify(Map<String, Object> param);
+
+    /**
+     * 推广升级回调处理方法
+     * @param param 回调参数
+     */
+    void spreadUpgradePayNotify(Map<String, Object> param);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/wx/WxTalkService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/wx/WxTalkService.java
new file mode 100644
index 0000000..572d3a9
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/wx/WxTalkService.java
@@ -0,0 +1,68 @@
+package cn.pluss.platform.wx;
+
+
+/**
+ * 企业微信机器人发送消息工具类
+ * @author DJH
+ */
+public interface WxTalkService {
+
+    /**
+     * 发送markDown内容
+     * @param textMsg   发送内容
+     */
+    void sendTextMsg(String textMsg);
+
+    /**
+     * 发送文字到群里
+     */
+    void sendTextMsg(String textMsg, String url);
+
+    /**
+     * 发送markDown内容
+     * @param markDownMsg   发送内容
+     */
+    void sendMarkDownMsg(String markDownMsg);
+
+    /**
+     * 发送请求进件提醒
+     * @param userId    用户id
+     */
+    void sendAuditAlert(String userId);
+
+    /**
+     * 发送进件审核操作提示
+     * @param userId    用户id
+     */
+    void sendAuditResultAlert(String userId);
+
+    /**
+     * 发送请求进件提醒
+     * @param userId    用户id
+     */
+    void sendPluginAuditAlert(String userId);
+
+    /**
+     * 发送进件审核操作提示
+     * @param userId    用户id
+     */
+    void sendPluginAuditResultAlert(String userId);
+
+    void sendAtAll();
+
+    /**
+     * 发送后台管理页面登录提示
+     * @param loginName     登录帐号
+     * @param password      登录密码
+     * @param ip            登录IP
+     * @param isp           ip运营商
+     * @param ipLocation    登录IP地区
+     * @param successFlag   登录成功标识
+     */
+    void sendManageLoginInfo(String loginName, String password, String ip, String isp, String ipLocation, boolean successFlag);
+
+    /**
+     * 发送管理数据
+     */
+    void sendStatisticData();
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/wx/impl/WxCertServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/wx/impl/WxCertServiceImpl.java
new file mode 100644
index 0000000..36e20db
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/wx/impl/WxCertServiceImpl.java
@@ -0,0 +1,338 @@
+package cn.pluss.platform.wx.impl;
+
+import cn.pluss.platform.channel.MerchantAuditService;
+import cn.pluss.platform.channel.MerchantCertService;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.MerchantChannelMapper;
+import cn.pluss.platform.mapper.MerchantChannelStatusMapper;
+import cn.pluss.platform.mapper.SubMerchantApplyOrderMapper;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.subMerchant.SubMerchantService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.vo.WxCertInfoVO;
+import cn.pluss.platform.wx.WxCertService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * @author DJH
+ */
+@Slf4j
+@Service("wxCertService")
+@RequiredArgsConstructor
+public class WxCertServiceImpl implements WxCertService {
+
+    @Autowired
+    private MerchantBaseInfoService mbiService;
+
+    @Autowired
+    private MerchantCertService sxfCertService;
+
+    @Autowired
+    private MerchantCertService ysCertService;
+
+    @Autowired
+    private MerchantCertService ysCertV2Service;
+
+    @Autowired
+    private MerchantCertService ryxCertService;
+
+    @Autowired
+    private UserAppService userAppService;
+
+    @Autowired
+    private MerchantChannelStatusService mcsService;
+
+    @Autowired
+    private SubMerchantService smService;
+
+    @Resource
+    private MerchantChannelStatusMapper mcsMapper;
+
+    @Resource
+    private SubMerchantApplyOrderMapper applyOrderMapper;
+
+    @Resource
+    private MerchantChannelMapper mcMapper;
+
+    @Autowired @Lazy
+    private MerchantAuditService ryxMerchantAuditService;
+
+    @Override
+    public void wxCert(String userId, String merchantCode, Integer channelId) {
+        merchantCode = paramCheck(userId, merchantCode);
+
+        MerchantChannelStatus merchantChannelStatus = mcsMapper.getByMerchantCode(merchantCode, channelId);
+
+        if (merchantChannelStatus == null) {
+            throw new MsgException("无用户进件信息");
+        }
+
+        if (merchantChannelStatus.getChannel() == 3) {
+            throw new MsgException("非随行付、银盛进件商户不支持该操作");
+        }
+
+        // 存在待处理的微信认证请求即不再次请求认证
+        SubMerchantApplyOrder subMerchantApplyOrder = new SubMerchantApplyOrder()
+                .setMerchantCode(merchantCode)
+                .setChannelId(channelId)
+                .setSubMchType("WX")
+                .setStatus("0");
+        SubMerchantApplyOrder existData = applyOrderMapper.selectOne(new QueryWrapper<>(subMerchantApplyOrder).isNotNull("applyNo").orderByDesc("createTime").last("limit 1"));
+        if (existData != null) {
+            throw new MsgException("当前微信认证状态不允许执行该操作");
+        }
+
+        subMerchantApplyOrder.setStatus("1");
+        existData = applyOrderMapper.selectOne(new QueryWrapper<>(subMerchantApplyOrder).orderByDesc("createTime").last("limit 1"));
+        if (existData != null && !StringUtils.isEmpty(existData.getApplyNo()) && StringUtils.isEmpty(existData.getInfoQrcode())) {
+            // 存在已处理的微信认证, 并且微信认证不通过的, 将该数据撤销
+            if (merchantChannelStatus.getChannel() == 1) {
+                sxfCertService.wxReCert(merchantChannelStatus.getMerchantId(), merchantCode);
+            }
+
+            if (merchantChannelStatus.getChannel() == 4) {
+                ysCertService.wxReCert(merchantChannelStatus.getMerchantId(), merchantCode);
+            }
+        } else {
+            if (merchantChannelStatus.getChannel() == 1) {
+                sxfCertService.wxCert(merchantChannelStatus.getMerchantId(), merchantChannelStatus.getMerchantCode());
+            }
+
+            if (merchantChannelStatus.getChannel() == 4) {
+                ysCertService.wxCert(merchantChannelStatus.getMerchantId(), merchantCode);
+            }
+        }
+    }
+
+    @Override
+    public void wxCertCancel(String userId, String merchantCode, Integer channelId) {
+        merchantCode = paramCheck(userId, merchantCode);
+
+        SubMerchantApplyOrder subMerchantApplyOrder = new SubMerchantApplyOrder().setMerchantCode(merchantCode).setChannelId(1).setSubMchType("WX").setStatus("1");
+        subMerchantApplyOrder = applyOrderMapper.selectOne(new QueryWrapper<>(subMerchantApplyOrder).orderByDesc("createTime").last("limit 1"));
+        if (subMerchantApplyOrder == null) {
+            throw new MsgException("当前商户没有已发出的微信认证申请");
+        }
+
+        MerchantChannelStatus merchantChannelStatus = mcsMapper.getByMerchantCode(merchantCode, channelId);
+        if (merchantChannelStatus == null) {
+            throw new MsgException("无用户进件信息");
+        }
+
+        if (merchantChannelStatus.getChannel() == 1) {
+            sxfCertService.wxCertCancel(merchantChannelStatus.getMerchantId(), subMerchantApplyOrder);
+        } else {
+            throw new MsgException("非随行付进件商户不支持该操作");
+        }
+    }
+
+    private String paramCheck(String userId, String merchantCode) {
+        if (StringUtils.isEmpty(merchantCode)) {
+            if (StringUtils.isEmpty(userId)) {
+                throw new MsgException("缺少必要参数");
+            }
+
+            UserApp userApp = new UserApp().setUserId(Long.parseLong(userId));
+            userApp = userAppService.queryUserApp(userApp);
+
+            if (userApp == null) {
+                throw new MsgException("用户不存在");
+            }
+
+            return userApp.getMerchantCode();
+        } else {
+            return merchantCode;
+        }
+    }
+
+    @Override
+    public void wxCertApplyStatus(String merchantCode, Integer channelId) {
+        MerchantChannelStatus mcs = mcsMapper.getByMerchantCode(merchantCode, channelId);
+
+        SubMerchantApplyOrder applyOrder = new SubMerchantApplyOrder();
+        applyOrder.setMerchantCode(merchantCode);
+        applyOrder.setSubMchType("WX");
+        applyOrder = applyOrderMapper.selectOne(Wrappers.query(applyOrder).orderByDesc("createTime").last("limit 1"));
+        switch (channelId) {
+            case 1:
+                if (applyOrder != null) {
+                    sxfCertService.wxCertResult(mcs.getMerchantId(), applyOrder.getApplyNo());
+                }
+                break;
+            case 3:
+                ryxCertService.wxCertResult(mcs.getMerchantId(), null);
+                break;
+            case 4:
+                if (applyOrder != null) {
+                    ysCertV2Service.wxCertResult(mcs.getMerchantId(), applyOrder.getApplyNo());
+                }
+                break;
+            default:
+                break;
+        }
+    }
+
+    @Override
+    public WxCertInfoVO wxCertInfo(String userId, String channelType) {
+        MerchantBaseInfo mbi = mbiService.getMerchantBaseInfoByUserId(userId);
+        MsgException.checkNull(mbi, "暂未进件");
+
+        return wxCertInfo(mbi, channelType);
+    }
+
+    @Override
+    public List<WxCertInfoVO> wxCertInfo(String userId) {
+        MerchantBaseInfo mbi = mbiService.getMerchantBaseInfoByUserId(userId);
+        MsgException.checkNull(mbi, "暂未进件");
+
+        List<WxCertInfoVO> resultData = new ArrayList<>();
+        WxCertInfoVO d1Data = wxCertInfo(mbi, Account.CHANNEL_TYPE_D1);
+        resultData.add(d1Data);
+
+        WxCertInfoVO d0Data = wxCertInfo(mbi, Account.CHANNEL_TYPE_D0);
+        resultData.add(d0Data);
+
+        return resultData;
+    }
+
+    private WxCertInfoVO wxCertInfo(MerchantBaseInfo mbi, String channelType) {
+        if (StringUtils.isEmpty(channelType)) {
+            MerchantChannelStatus mcs = mcsService.getValidData(mbi.getMerchantCode());
+            if (Objects.equals(mcs.getChannel(), 4)) {
+                channelType = "D0";
+            } else {
+                channelType = "D1";
+            }
+        }
+
+        MerchantChannelStatus mcs = mcsService.getByMerchantCodeAndChannelType(mbi.getMerchantCode(), channelType);
+
+        WxCertInfoVO result = WxCertInfoVO.empty(channelType);
+        result.setMerchantCode(mbi.getMerchantCode());
+        if (mcs == null || !(MerchantChannelStatus.AUDIT_STATUS_SUCCESS.equals(mcs.getStatus())
+                || MerchantChannelStatus.AUDIT_STATUS_DATA_EDIT.equals(mcs.getStatus()))) {
+            return result;
+        }
+
+        result.setChannelId(mcs.getChannel() + "");
+        result.setMerchantId(mcs.getMerchantId());
+
+        MerchantChannel mc = new MerchantChannel();
+        mc.setId(mcs.getChannel());
+        mc = mcMapper.selectOne(new QueryWrapper<>(mc));
+        result.setChannelName(mc.getChannelName());
+        result.setAltImgUrl(mc.getWxCertImg());
+
+        SubMerchant subMerchant = new SubMerchant();
+        subMerchant.setSubMchType("WX");
+        subMerchant.setMerchantId(mcs.getMerchantId());
+
+        List<SubMerchant> subMerchantList = smService.list(new QueryWrapper<>(subMerchant));
+        // if (subMerchantList.isEmpty()) {
+        //     smService.reqChannelSubMerchant(mcs);
+        // }
+
+        for (SubMerchant merchant : subMerchantList) {
+            String subMchIdModel = merchant.getSubMchId();
+            if (subMchIdModel == null) {
+                continue;
+            }
+
+            String subMchId = subMchIdModel.split("_")[0];
+            if (StringUtils.isNotEmpty(subMchId) && !subMchId.equals(subMerchant.getSubMchId())) {
+                if (subMerchant.getSubMchId() == null) {
+                    result.setWxSubMerchantId(subMchId);
+                } else {
+                    result.setWxSubMerchantId(result.getWxSubMerchantId() + "、" + subMerchant);
+                }
+            }
+        }
+
+        if (Objects.equals(mcs.getAuthorizationStatus(), MerchantChannelStatus.AUTHORIZATION_STATUS_AUTHORIZED)) {
+            result.setStatus(SubMerchantApplyOrder.RES_STATUS_COMPLETE);
+            return result;
+        }
+
+        SubMerchantApplyOrder applyOrder = new SubMerchantApplyOrder()
+                .setMerchantCode(mbi.getMerchantCode())
+                .setChannelId(mcs.getChannel())
+                .setSubMchType("WX");
+        applyOrder = applyOrderMapper.selectOne(new QueryWrapper<>(applyOrder).orderByDesc("createTime").last("limit 1"));
+        if (applyOrder == null || !"1".equals(applyOrder.getStatus())) {
+            // 没有发起认证的信息，或申请单未得到结果，手动获取对应通道下的申请单结果
+            // wxCertApplyStatus(mcs.getMerchantCode(), mcs.getChannel());
+            applyOrder = applyOrderMapper.selectOne(new QueryWrapper<>(applyOrder).orderByDesc("createTime").last("limit 1"));
+        }
+
+        if (applyOrder == null) {
+            result.setStatus(SubMerchantApplyOrder.STATUS_NO_WX_AUDIT);
+            return result;
+        }
+
+        result.setStatus(applyOrder.getResultStatus());
+        result.setInfoQrcode(applyOrder.getInfoQrcode());
+        result.setRemark(applyOrder.getRemark());
+
+        // 未授权时查询商户的认证信息
+        // mcsService.verifyWxAuthStatus(mcs);
+        mcs = mcsService.getById(mcs.getId());
+        if (Objects.equals(mcs.getAuthorizationStatus(), MerchantChannelStatus.AUTHORIZATION_STATUS_AUTHORIZED)) {
+            result.setStatus(SubMerchantApplyOrder.RES_STATUS_COMPLETE);
+        }
+
+        if (SubMerchantApplyOrder.RES_STATUS_COMPLETE.equals(result.getStatus())) {
+            return result;
+        }
+
+        if (SubMerchantApplyOrder.RES_STATUS_COMPLETE.equals(applyOrder.getResultStatus())) {
+            result.setStatus(SubMerchantApplyOrder.RES_STATUS_SUCCESS);
+            return result;
+        }
+
+        if ("0".equals(applyOrder.getStatus()) || "审核中".equals(applyOrder.getResultStatus())) {
+            result.setStatus(SubMerchantApplyOrder.RES_STATUS_REVIEW);
+            return result;
+        }
+
+        if (StringUtils.isEmpty(applyOrder.getInfoQrcode())) {
+            result.setStatus(SubMerchantApplyOrder.RES_STATUS_FAILED);
+        } else {
+            result.setStatus(SubMerchantApplyOrder.RES_STATUS_SUCCESS);
+        }
+
+        return result;
+    }
+
+    @Override
+    public void wxCertAuthStatus(String merchantCode, Integer channelId) {
+        MerchantChannelStatus mcs = mcsMapper.getByMerchantCode(merchantCode, channelId);
+
+        switch (channelId) {
+            case 1:
+                sxfCertService.wxCertAuthStatus(mcs.getMerchantId());
+                break;
+            case 3:
+                ryxCertService.wxCertAuthStatus(mcs.getMerchantId());
+                break;
+            case 4:
+                ysCertV2Service.wxCertAuthStatus(mcs.getMerchantId());
+                break;
+            default:
+                break;
+        }
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/wx/impl/WxCommonServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/wx/impl/WxCommonServiceImpl.java
new file mode 100644
index 0000000..81b2c32
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/wx/impl/WxCommonServiceImpl.java
@@ -0,0 +1,260 @@
+package cn.pluss.platform.wx.impl;
+
+import cn.pluss.platform.api.ResultCode;
+import cn.pluss.platform.cacheInfo.CacheInfoService;
+import cn.pluss.platform.entity.CacheInfo;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.util.ParametersUtil;
+import cn.pluss.platform.util.SignUtils;
+import cn.pluss.platform.util.StringUtil;
+import cn.pluss.platform.utils.WechatUtils;
+import cn.pluss.platform.wx.*;
+import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ *
+ *@description:
+ *@author: bzg
+ *@time: 2021/11/29 15:28
+ */
+@Service
+@Slf4j
+public class WxCommonServiceImpl implements WxCommonService {
+
+
+    @Resource
+    private CacheInfoService cacheInfoService;
+
+    @Resource
+    protected RestTemplate restTemplate;
+
+    private final String API_TOKEN_URL = "https://shop.shouyinbei.net/addons/we7_wmall/api/cache.php?key=KEY&keyCode=CODE&refresh=REFRESH";
+    /**
+     * 获取wx access_token 参数
+     * @date: 2021/11/29 15:35
+     * @param request:
+     * @param refresh:
+     * @return cn.pluss.platform.wx.WxAccessTokenResponse
+     */
+    @Override
+    public String getAccessToken(WxAccessTokenRequest request,Boolean refresh) {
+        checkCommonParams(request);
+        String keyCode = WX_ACCESS_TOKEN_PREFIX_CODE + request.getAppid();
+        String url = API_TOKEN_URL.replace("KEY",request.getAppid()).replace("CODE",WX_ACCESS_TOKEN_PREFIX_CODE).replace("REFRESH",refresh ? "1" : "0");
+        JSONObject result = restTemplate.getForObject(url, JSONObject.class);
+        if(result.getInteger("code") != ResultCode.SUCCESS.code()){
+            CacheInfo cache = cacheInfoService.getCacheInfoByKeyCode(keyCode);
+            if(cache == null){
+                WxAccessTokenResponse response = WechatUtils.getAccessToken(request);
+                CacheInfo cacheInfo = new CacheInfo(response,request,keyCode);
+                cacheInfoService.save(cacheInfo);
+                return response.getAccess_token();
+            }else{
+                Long time = System.currentTimeMillis() / 1000;
+                if(time >= cache.getExpiresIn() - CacheInfo.MAX_CRITICAL_VALUE){
+                    WxAccessTokenResponse response = WechatUtils.getAccessToken(request);
+                    CacheInfo cacheInfo = new CacheInfo(response,request,keyCode);
+                    cacheInfo.setId(cache.getId());
+                    cacheInfoService.saveOrUpdate(cacheInfo);
+                    return response.getAccess_token();
+                }else{
+                    return cache.getAccessToken();
+                }
+            }
+        }else{
+            CacheInfo cache = cacheInfoService.getCacheInfoByKeyCode(keyCode);
+            JSONObject data = result.getJSONObject("data");
+            if(cache == null){
+                CacheInfo cacheInfo = new CacheInfo(request,keyCode,data.getString("accessToken"),data.getLong("expire"),data.getString("refreshToken"));
+                cacheInfoService.save(cacheInfo);
+                return data.getString("accessToken");
+            }else{
+                if(!cache.getAccessToken().equals(data.getString("accessToken"))){
+                    cache.setAccessToken(data.getString("accessToken"));
+                    cache.setExpiresIn(data.getLong("expire"));
+                    if(StringUtil.isNotEmpty(data.getString("refreshToken"))){
+                        cache.setRefreshToken(data.getString("refreshToken"));
+                    }
+                    cacheInfoService.saveOrUpdate(cache);
+                }
+                return data.getString("accessToken");
+            }
+        }
+    }
+
+    @Override
+    public WxOpenidResponse getWxOpenId(WxAccessTokenRequest request) {
+        checkCommonParams(request);
+        WxOpenidResponse response = WechatUtils.getWxOpenid(request);
+        if(StringUtil.isNotEmpty(response.getExpires_in())){
+            String keyCode = WX_OAUTH2_ACCESS_TOKEN_PREFIX_CODE + request.getAppid();
+            CacheInfo cacheInfo = new CacheInfo(response,request,keyCode);
+            after(cacheInfo,keyCode);
+        }
+        return response;
+    }
+
+    private void after(CacheInfo cacheInfo,String keyCode) {
+        CacheInfo cache = cacheInfoService.getCacheInfoByKeyCode(keyCode);
+        if(cache == null){
+            cacheInfoService.save(cacheInfo);
+        }else {
+            cacheInfo.setId(cache.getId());
+            cacheInfoService.updateById(cacheInfo);
+        }
+    }
+
+
+    @Override
+    public void sendTemplateMsg(WxTemolateRequest request,WxAccessTokenRequest tokenRequest) {
+        String accessToken = this.getAccessToken(tokenRequest,false);
+        try {
+            WechatUtils.sendTemplateMsg(accessToken,request);
+        }catch (MsgException e){
+            e.printStackTrace();
+            log.info("发送模板消息失败，异常信息:{},再次发送");
+            accessToken = this.getAccessToken(tokenRequest,true);
+            WechatUtils.sendTemplateMsg(accessToken,request);
+        }
+    }
+
+    public void checkCommonParams(WxAccessTokenRequest request){
+        MsgException.checkBlank(request.getAppid(),"缺失appid参数");
+        MsgException.checkBlank(request.getSecret(),"缺失secret参数");
+    }
+
+    /**
+     * 获取网页授权信息
+     * @date: 2021/11/30 10:28
+     * @param request:
+     * @return cn.pluss.platform.wx.WxOauth2AccessTokenResponse
+     */
+    @Override
+    public WxOauth2AccessTokenResponse getOauth2Info(WxAccessTokenRequest request) {
+        MsgException.checkBlank(request.getCode(),"缺失code参数");
+        String keyCode = WX_OAUTH2_ACCESS_TOKEN_PREFIX_CODE + request.getAppid();
+        WxOauth2AccessTokenResponse response = WechatUtils.getOauth2AccessToken(request);
+        CacheInfo cacheInfo = new CacheInfo(response,request,keyCode);
+        after(cacheInfo,keyCode);
+        return response;
+    }
+
+
+    /**
+     * @description:获取微信用户信息
+     * @date: 2021/11/30 13:50
+     * @param request:
+     * @param openid:
+     * @return cn.pluss.platform.wx.WxUserInfoResponse
+     */
+    @Override
+    public WxUserInfoResponse getWxUserInfo(WxAccessTokenRequest request,String openid) {
+        String accessToken = this.getAccessToken(request,false);
+        WxUserInfoResponse wxUserInfo = null;
+        try {
+            wxUserInfo = WechatUtils.getWxUserInfo(accessToken, openid);
+        }catch (MsgException e){
+            e.printStackTrace();
+            log.info("获取用户信息异常，异常信息:{},再次获取");
+            accessToken = this.getAccessToken(request,true);
+            wxUserInfo = WechatUtils.getWxUserInfo(accessToken, openid);
+        }
+        return wxUserInfo;
+    }
+
+    /**
+     * 生成带参数的二维码
+     * @date: 2021/12/9 11:22
+     * @param tokenRequest:
+     * @param qrCodeRequest:
+     * @return cn.pluss.platform.wx.WxCreateQrCodeResponse
+     */
+    @Override
+    public WxCreateQrCodeResponse getWxQrCode(WxAccessTokenRequest tokenRequest, WxCreateQrCodeRequest qrCodeRequest) {
+        String accessToken = this.getAccessToken(tokenRequest,false);
+        WxCreateQrCodeResponse response = null;
+        try {
+            response = WechatUtils.getWxQrCode(accessToken,qrCodeRequest);
+        }catch (MsgException e){
+            e.printStackTrace();
+            log.info("生成带参数的二维码，异常信息:{},再次获取");
+            accessToken = this.getAccessToken(tokenRequest,true);
+            response = WechatUtils.getWxQrCode(accessToken,qrCodeRequest);
+        }
+        return response;
+    }
+
+    /**
+     * 获取微信全局jsapiticket 方法
+     * @date: 2022/3/10 15:16
+     * @param request:
+     * @param type:
+     * @return java.lang.String
+     */
+    @Override
+    public String getJsapiTicket(WxAccessTokenRequest request, String type) {
+        String keyCode = WX_JSAPI_TICKET_PREFIX_CODE + request.getAppid();
+        CacheInfo cache = cacheInfoService.getCacheInfoByKeyCode(keyCode);
+        if(cache == null){
+            String accessToken = this.getAccessToken(request,false);
+            WxJsApiTicketResponse response = WechatUtils.getJsapiTicket(accessToken,type);
+            CacheInfo cacheInfo = new CacheInfo(response,request,keyCode);
+            cacheInfoService.save(cacheInfo);
+            return response.getTicket();
+        }else{
+            Long time = System.currentTimeMillis() / 1000;
+            if(time >= cache.getExpiresIn() - CacheInfo.MAX_CRITICAL_VALUE){
+                String accessToken = this.getAccessToken(request,false);
+                WxJsApiTicketResponse response = WechatUtils.getJsapiTicket(accessToken,type);
+                CacheInfo cacheInfo = new CacheInfo(response,request,keyCode);
+                cacheInfo.setId(cache.getId());
+                cacheInfoService.saveOrUpdate(cacheInfo);
+                return response.getTicket();
+            }else{
+                return cache.getAccessToken();
+            }
+        }
+    }
+
+    /**
+     * 获取微信jsapi校验参数
+     * @date: 2022/3/10 15:27
+     * @param request:
+     * @return com.alibaba.fastjson.JSONObject
+     */
+    @Override
+    public JSONObject getJsApiConfigParam(HttpServletRequest request) {
+        JSONObject result = new JSONObject(4);
+        WxAccessTokenRequest req = WxAccessTokenRequest.buidWxToken(ParametersUtil.APPID,ParametersUtil.APPSECRET);
+        String ticket = this.getJsapiTicket(req, "jsapi");
+        String noncestr = StringUtil.generateMixStr(10);
+        Long timestamp = System.currentTimeMillis() / 1000;
+        String pUrl = request.getRequestURL().toString() + "?" + request.getQueryString();
+        String signContent = "jsapi_ticket=" + ticket + "&noncestr="+noncestr + "&timestamp="+ timestamp + "&url="+pUrl;
+        String sign = SignUtils.sha1Encrypt(signContent);
+        result.put("signature",sign);
+        result.put("nonceStr",noncestr);
+        result.put("timestamp",timestamp);
+        result.put("appId",req.getAppid());
+        return result;
+    }
+
+    /**
+     * 获取微信小程序secheme码
+     * @param tokenRequest
+     * @return
+     */
+    @Override
+    public WxUrlschemeResponse getUrlecheme(WxAccessTokenRequest tokenRequest,WxJumpWxa wxJumpWxa) {
+        String accessToken = this.getAccessToken(tokenRequest,false);
+        WxUrlschemeRequest request = new WxUrlschemeRequest(wxJumpWxa,5);
+        WxUrlschemeResponse response = WechatUtils.getUrlecheme(request,accessToken);
+        return response;
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/wx/impl/WxPayNotifyServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/wx/impl/WxPayNotifyServiceImpl.java
new file mode 100644
index 0000000..2cb765f
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/wx/impl/WxPayNotifyServiceImpl.java
@@ -0,0 +1,256 @@
+package cn.pluss.platform.wx.impl;
+
+import cn.hutool.core.date.DateUtil;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.merchantIncome.MerchantIncomeService;
+import cn.pluss.platform.merchantOrder.MerchantOrderService;
+import cn.pluss.platform.merchantProfit.MerchantProfitService;
+import cn.pluss.platform.notice.NoticeService;
+import cn.pluss.platform.pay.PayCallbackService;
+import cn.pluss.platform.pay.impl.BaseCallbackService;
+import cn.pluss.platform.systemConfig.SystemConfigService;
+import cn.pluss.platform.user.impl.GeneralPushUtil;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.userInfo.UserInfoService;
+import cn.pluss.platform.util.DateUtils;
+import cn.pluss.platform.util.StringUtil;
+import cn.pluss.platform.wx.WxPayNotifyService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author DJH
+ */
+@Slf4j
+@Service
+public class WxPayNotifyServiceImpl extends BaseCallbackService implements WxPayNotifyService, PayCallbackService {
+
+    @Autowired
+    private GeneralPushUtil generalPushUtil;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantOrderService merchantOrderService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantIncomeService merchantIncomeService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private UserAppService userAppService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private UserInfoService userInfoService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private SystemConfigService systemConfigService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private MerchantProfitService merchantProfitService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private NoticeService noticeService;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void commonPayNotify(Map<String, Object> param) {
+        if (!"SUCCESS".equals(param.get("result_code"))) {
+            return;
+        }
+
+        // 商户订单号
+        String ordersSn = (String) param.get("out_trade_no");
+
+        assert ordersSn != null: "缺少订单号";
+
+        if (ordersSn.startsWith(MerchantOrder.UPGRADE_ORDER_PREFIX)) {
+            spreadUpgradePayNotify(param);
+            return;
+        }
+
+        devicePayNotify(param);
+    }
+
+    @Override
+    public void devicePayNotify(Map<String, Object> param) {
+        // 商户订单号
+        String orderNumber = (String) param.get("out_trade_no");
+        String transNo = (String) param.get("transaction_id");
+        // 实际支付的订单金额:单位 分
+        // String amountpaid = (String) param.get("total_fee");
+        // 用户openid
+        // String openid = (String) param.get("openid");
+        // 支付完成时间
+        String tranDtStr = (String) param.get("time_end");
+        Date tranDt = DateUtil.parse(tranDtStr, "yyyyMMddHHmmss").toJdkDate();
+
+        devicePaySuccessNotify(orderNumber, transNo, transNo, tranDt, param);
+
+        // // Double amount=Double.valueOf(amountpaid)*100;
+        // DeviceMerchantBuy deviceMerchantBuy = new DeviceMerchantBuy();
+        // deviceMerchantBuy.setOrderNo(orderNumber);
+        // deviceMerchantBuy = deviceMerchantBuyService.queryDeviceMerchantBuy(deviceMerchantBuy);
+        // if ("1".equals(deviceMerchantBuy.getStatus())) {
+        //     return;
+        // }
+        // deviceMerchantBuy.setStatus("1");
+        // deviceMerchantBuy.setTransNo(transNo);
+        //
+        // deviceMerchantBuy.setTransDt(tranDt);
+        // deviceMerchantBuyService.updateDeviceMerchantBuy(deviceMerchantBuy);
+        //
+        // DeviceOrderInfo deviceOrderInfo = new DeviceOrderInfo();
+        // deviceOrderInfo.setOrderNo(orderNumber);
+        // deviceOrderInfo = deviceOrderInfoService.getOne(new QueryWrapper<>(deviceOrderInfo));
+        // deviceOrderInfo.setTransNo(transNo);
+        // deviceOrderInfo.setUpdateTime(new Date());
+        // deviceOrderInfoService.updateById(deviceOrderInfo);
+    }
+
+    @Override
+    public void spreadUpgradePayNotify(Map<String, Object> param) {
+        String orderNumber = (String) param.get("out_trade_no");
+        // 微信交易流水号
+        String tradeNo = ((String) param.get("transaction_id"));
+
+        String consumeTime = ((String) param.get("time_end"));
+        Date transDt = DateUtils.parse(consumeTime, "yyyyMMddHHmmss");
+
+        upgradeSuccessNotify(orderNumber, tradeNo, tradeNo, transDt, param);
+
+        // 计算分润
+        // merchantIncome(param);
+        //
+        // // 更新订单信息
+        // updateOrderStatus(param);
+    }
+
+    /**
+     * 更新订单信息和状态
+     *
+     * @param param 订单回调信息
+     */
+    private void updateOrderStatus(Map<String, Object> param) {
+        // 商户订单号
+        String orderNumber = ((String) param.get("out_trade_no"));
+        // 支付宝交易号
+        String tradeNo = ((String) param.get("transaction_id"));
+        MerchantOrder mOrder = new MerchantOrder().setOrderNumber(orderNumber);
+        mOrder = merchantOrderService.getOne(new QueryWrapper<>(mOrder));
+
+        mOrder.setThirdTransNo(tradeNo);
+        // 交易付款时间
+        String consumeTime = ((String) param.get("time_end"));
+        mOrder.setStatus("1");
+        mOrder.setTransDt(DateUtils.parse(consumeTime, "yyyyMMddHHmmss"));
+        mOrder.setTransNo(tradeNo);
+        Object profitAmt = param.get("profitAmt");
+        if(StringUtil.isNotEmpty(profitAmt)){
+            mOrder.setProfitShareMoney(Double.valueOf(profitAmt.toString()));
+        }
+        merchantOrderService.updateById(mOrder);
+    }
+
+    private void merchantIncome(Map<String,Object> param) {
+        String orderSn = (String) param.get("out_trade_no");
+        MerchantIncome merchantIncome = new MerchantIncome();
+        merchantIncome.setDealCode(orderSn);
+        merchantIncome = merchantIncomeService.queryMerchantIncome(merchantIncome);
+        merchantIncome.setDealStatus(1);
+        merchantIncomeService.updateMerchantIncome(merchantIncome);
+
+        UserApp userApp = new UserApp();
+        userApp.setUserId(merchantIncome.getUserId().longValue());
+        userApp = userAppService.queryUserApp(userApp);
+
+        String content = "";
+
+        if (userApp == null || userApp.getParentId() == null) {
+            return;
+        }
+
+        UserApp userApp2 = new UserApp();
+        userApp2.setUserId(userApp.getParentId());
+        userApp2 = userAppService.queryUserApp(userApp2);
+
+//        if (userApp2 == null) {
+//            return;
+//        }
+
+
+        String userName = "";
+
+        UserInfo userInfo = new UserInfo();
+        userInfo.setId(userApp.getUserId());
+        userInfo = userInfoService.queryUserInfo(userInfo);
+        String twoConfigValue = systemConfigService.querySystemConfigValue("twoUpVipAmount");
+        String threeConfigValue = systemConfigService.querySystemConfigValue("threeUpVipAmount");
+        userName = userInfo.getLoginName().substring(0, 11);
+
+        userName = StringUtil.isHideMobile(userName);
+
+        MerchantProfit profit = new MerchantProfit();
+        profit.setUserId(userApp.getParentId());
+        profit.setMerchantCode("M800202008254990744");
+        profit.setMerchantName("安象科技公司");
+        profit.setConsumeFee(merchantIncome.getDealFee());
+        Double twoVipAmountD = 999.00;
+        Double twoVipShapeAmtD = 500.00;
+        Double threeVipAmountD = 9999.00;
+        Double threeVipShapeAmtD = 5000.00;
+        if (StringUtil.isNotEmpty(twoConfigValue)) {
+            String twoVipAmount = twoConfigValue.split("-")[0];
+            String twoVipShapeAmount = twoConfigValue.split("-")[1];
+            twoVipAmountD = Double.valueOf(twoVipAmount);
+            twoVipShapeAmtD = Double.valueOf(twoVipShapeAmount);
+        }
+        if (StringUtil.isNotEmpty(threeConfigValue)) {
+            String threeVipAmount = threeConfigValue.split("-")[0];
+            String threeVipShapeAmount = threeConfigValue.split("-")[1];
+            threeVipAmountD = Double.valueOf(threeVipAmount);
+            threeVipShapeAmtD = Double.valueOf(threeVipShapeAmount);
+        }
+        if (twoVipAmountD.equals(merchantIncome.getDealFee())) {
+            profit.setPrice(twoVipShapeAmtD);
+            userApp.setLevel(2);
+            content = "您的直接推荐 " + userName + "付费升级v2,收益" + twoVipShapeAmtD + "元";
+        }
+        if (threeVipAmountD.equals(merchantIncome.getDealFee())) {
+            profit.setPrice(threeVipShapeAmtD);
+            userApp.setLevel(3);
+            content = "您的直接推荐 " + userName + "付费升级v3,收益" + threeVipShapeAmtD + "元";
+        }
+
+        profit.setType("4");
+        profit.setCreateDt(new Date());
+        profit.setOrderDt(merchantIncome.getCreateTime());
+        profit.setStatus("1");
+        profit.setOrderNumber(orderSn);
+        merchantProfitService.saveMerchantProfit(profit);
+        userAppService.updateById(userApp);
+        param.put("profitAmt",profit.getPrice());
+        List<String> alias = new ArrayList<>();
+        log.info("=========推送人userId======" + profit.getUserId() + "=========金额=======" + profit.getPrice());
+        alias.add(profit.getUserId() + "");
+
+        if (userApp2 != null) {
+            Notice notice = new Notice(0, 7, userApp2);
+            notice.setConrtent(content);
+
+            noticeService.saveNotice(notice);
+            generalPushUtil.sendAllPlatByAlias(alias, "升级分润通知", content, "0");
+        }
+    }
+
+    @Override
+    public void orderCallback(Map<String, Object> callbackData) {
+        // 这里现有的逻辑不做更改
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/wx/impl/WxTalkServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/wx/impl/WxTalkServiceImpl.java
new file mode 100644
index 0000000..5863324
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/wx/impl/WxTalkServiceImpl.java
@@ -0,0 +1,331 @@
+package cn.pluss.platform.wx.impl;
+
+import cn.pluss.platform.entity.MerchantBaseInfo;
+import cn.pluss.platform.entity.MerchantOrder;
+import cn.pluss.platform.entity.MerchantOrderStatistics;
+import cn.pluss.platform.entity.PlatformData;
+import cn.pluss.platform.mapper.PlatformDataMapper;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantOrder.MerchantOrderService;
+import cn.pluss.platform.merchantOrder.MerchantOrderStatisticsService;
+import cn.pluss.platform.platformData.PlatformDataService;
+import cn.pluss.platform.wx.WxTalkService;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Locale;
+import java.util.Map;
+
+/**
+ * @author DJH
+ */
+@Service
+@Slf4j
+@RequiredArgsConstructor
+public class WxTalkServiceImpl implements WxTalkService {
+
+    /**
+     * 企业微信审核机器人的链接
+     */
+    private static final String WX_TALK_URL = "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=eba1e093-4cae-424d-be52-7013411194cc";
+
+    /**
+     * 企业微信上市机器人的链接
+     */
+    public static final String WX_GO_PUBLIC_TALK_URL = "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=d89ed4ad-d723-4dce-a80b-bbf370c91943";
+
+    private final RestTemplate restTemplate;
+
+    private final MerchantBaseInfoService merchantBaseInfoService;
+
+    @Lazy
+    @Autowired
+    private PlatformDataService platformDataService;
+
+    @Resource
+    private PlatformDataMapper platformDataMapper;
+
+    @Lazy
+    @Autowired
+    private MerchantOrderService moService;
+
+    @Lazy
+    @Autowired
+    private MerchantOrderStatisticsService mosService;
+
+    @Override
+    public void sendTextMsg(String textMsg) {
+        sendTextMsg(textMsg, WX_TALK_URL);
+    }
+
+    @Override
+    public void sendTextMsg(String textMsg, String url) {
+        JSONObject object = new JSONObject();
+        object.put("msgtype", "text");
+        JSONObject content = new JSONObject();
+        content.put("content", textMsg);
+        object.put("text", content);
+
+        try {
+            Object result = restTemplate.postForObject(url, object, Object.class);
+            log.info("微信机器人发送消息成功: {}", result);
+
+            sendAtAll();
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("微信机器人发送消息失败");
+        }
+    }
+
+    @Override
+    public void sendMarkDownMsg(String markDownMsg) {
+        JSONObject object = new JSONObject();
+        object.put("msgtype", "markdown");
+        JSONObject content = new JSONObject();
+        content.put("content", markDownMsg);
+        object.put("markdown", content);
+
+        try {
+            Object result = restTemplate.postForObject(WX_TALK_URL, object, Object.class);
+            log.info("微信机器人发送消息成功: {}", result);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("微信机器人发送消息失败");
+        }
+    }
+
+    @Override
+    public void sendAuditAlert(String userId) {
+        if (userId == null) {
+            return;
+        }
+
+        MerchantBaseInfo merchantBaseInfo = merchantBaseInfoService.getMerchantBaseInfoByUserId(userId);
+
+        String merchantName = merchantBaseInfo.getAlias();
+
+        String sb = "新增商户<font color=\"warning\">" +
+                merchantName +
+                "</font>进件请求，待审核\n" +
+                ">[点击查看详情](https://www.shouyinbei.net/wap/merchant/toAudit?userId=" +
+                userId + ")\n";
+        sendMarkDownMsg(sb);
+        sendAtAll();
+    }
+
+    @Override
+    public void sendAuditResultAlert(String userId) {
+        if (userId == null) {
+            return;
+        }
+
+        MerchantBaseInfo merchantBaseInfo = merchantBaseInfoService.getMerchantBaseInfoByUserId(userId);
+
+        String merchantName = merchantBaseInfo.getAlias();
+
+        sendMarkDownMsg("商户<font color=\"warning\">" +
+                merchantName + "</font>进件请求已处理");
+    }
+
+    @Override
+    public void sendPluginAuditAlert(String userId) {
+        if (userId == null) {
+            return;
+        }
+
+        MerchantBaseInfo merchantBaseInfo = merchantBaseInfoService.getMerchantBaseInfoByUserId(userId);
+
+        String merchantName = merchantBaseInfo.getAlias();
+
+        String sb = "新增商户<font color=\"warning\">" +
+                merchantName +
+                "</font>插件进件请求，待审核\n" +
+                ">[点击查看详情](https://www.shouyinbei.net/wap/merchant/toAudit?userId=" +
+                userId + ")\n";
+        sendMarkDownMsg(sb);
+        sendAtAll();
+    }
+
+    @Override
+    public void sendPluginAuditResultAlert(String userId) {
+        if (userId == null) {
+            return;
+        }
+
+        MerchantBaseInfo merchantBaseInfo = merchantBaseInfoService.getMerchantBaseInfoByUserId(userId);
+
+        String merchantName = merchantBaseInfo.getAlias();
+
+        sendMarkDownMsg("商户<font color=\"warning\">" +
+                merchantName + "</font>插件进件请求已处理");
+    }
+
+    @Override
+    public void sendAtAll() {
+        JSONObject object = new JSONObject();
+        JSONObject content = new JSONObject();
+        object.put("msgtype", "text");
+        content.put("content", "");
+        JSONArray mentionedList = new JSONArray();
+        mentionedList.add("@all");
+        content.put("mentioned_list", mentionedList);
+        object.put("text", content);
+
+        try {
+            Object result = restTemplate.postForObject(WX_TALK_URL, object, Object.class);
+            log.info("微信机器人发送消息成功: {}", result);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("微信机器人发送消息失败");
+        }
+    }
+
+    @Override
+    public void sendManageLoginInfo(String loginName, String password, String ip, String isp, String ipLocation, boolean successFlag) {
+        JSONObject object = new JSONObject();
+        JSONObject content = new JSONObject();
+        object.put("msgtype", "text");
+
+        String contentStr = "用户" + loginName;
+        if (successFlag) {
+            contentStr += "登录成功\n";
+            contentStr += "登录IP: " + ip + "\n";
+            contentStr += "IP运营商: " + isp + "\n";
+            contentStr += "登录地区: " + ipLocation + "\n";
+        } else {
+            contentStr += "登录失败\n";
+            contentStr += "错误密码为: " + password + "\n";
+            contentStr += "登录IP: " + ip + "\n";
+            contentStr += "IP运营商: " + isp + "\n";
+            contentStr += "登录地区: " + ipLocation + "\n";
+        }
+
+        content.put("content", contentStr);
+        JSONArray mentionedList = new JSONArray();
+        mentionedList.add("@all");
+        content.put("mentioned_list", mentionedList);
+        object.put("text", content);
+
+        try {
+            Object result = restTemplate.postForObject(WX_TALK_URL, object, Object.class);
+            log.info("微信机器人发送消息成功: {}", result);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("微信机器人发送消息失败");
+        }
+    }
+
+    @Override
+    public void sendStatisticData() {
+        Calendar calendar = Calendar.getInstance();
+        calendar.add(Calendar.DAY_OF_MONTH, -1);
+
+        final Date currentTime = calendar.getTime();
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault());
+
+        SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM", Locale.getDefault());
+
+        final String currentDate = sdf.format(currentTime);
+        final String currentMonth = sdf2.format(currentTime);
+
+        LambdaQueryWrapper<PlatformData> qWrapper = Wrappers.lambdaQuery();
+        qWrapper.eq(PlatformData::getOperatDate, currentDate);
+        // 获取昨天的数据
+        final PlatformData yesterdayData = platformDataService.getOne(qWrapper);
+        // 获取昨天当月的数据
+        final PlatformData monthData = platformDataMapper.selectMonthData(currentMonth);
+
+        final BigDecimal ysRate = BigDecimal.valueOf(0.6d);
+        final BigDecimal monthDayCount = BigDecimal.valueOf(calendar.getActualMaximum(Calendar.DAY_OF_MONTH));
+        final BigDecimal dayTarget = BigDecimal.valueOf(8500000L);
+        final BigDecimal hundred = BigDecimal.valueOf(100);
+        final BigDecimal monthTarget = dayTarget.multiply(monthDayCount);
+        final BigDecimal ysDayTarget = dayTarget.multiply(ysRate);
+        final BigDecimal ysMonthTarget = ysDayTarget.multiply(monthDayCount);
+
+        final BigDecimal dayProfitTarget = BigDecimal.valueOf(3600);
+        final BigDecimal monthProfitTarget = dayProfitTarget.multiply(monthDayCount);
+
+        StringBuilder sb = new StringBuilder();
+        sb.append("目标日期 ").append(currentDate).append("\n");
+        sb.append("单日目标：").append(dayTarget.stripTrailingZeros().toPlainString()).append("\n");
+        sb.append("月总目标：").append(monthTarget.stripTrailingZeros().toPlainString()).append("\n");
+        sb.append("银盛日目标（60%）：").append(ysDayTarget.stripTrailingZeros().toPlainString()).append("\n");
+        sb.append("银盛月目标（60%）：").append(ysMonthTarget.stripTrailingZeros().toPlainString()).append("\n");
+        sb.append("日目标营收：").append(dayProfitTarget.stripTrailingZeros().toPlainString()).append("\n");
+        sb.append("月目标营收：").append(monthProfitTarget.stripTrailingZeros().toPlainString()).append("\n");
+        sb.append("===================\n");
+        sb.append(currentDate).append(" 数据：\n");
+        sb.append("日交易额：").append(yesterdayData.getTransAmt().stripTrailingZeros().toPlainString()).append("\n");
+        sb.append("月总交易额：").append(monthData.getTransAmt().stripTrailingZeros().toPlainString()).append("\n");
+        sb.append("日交易及月交易额完成率：")
+                .append(yesterdayData.getTransAmt().multiply(hundred).divide(dayTarget, 2, RoundingMode.HALF_EVEN))
+                .append("% / ")
+                .append(monthData.getTransAmt().multiply(hundred).divide(monthTarget, 2, RoundingMode.HALF_EVEN))
+                .append("%\n");
+        sb.append("------------------\n");
+
+        QueryWrapper<MerchantOrder> orderQueryWrapper = new QueryWrapper<>();
+        orderQueryWrapper.select("SUM(consumeFee) consumeFee");
+        orderQueryWrapper.eq("status", "1");
+        orderQueryWrapper.eq("settlementType", "0");
+        orderQueryWrapper.eq("createDate", currentDate);
+        Map<String, Object> ysDayData = moService.getMap(orderQueryWrapper);
+        BigDecimal ysDay = new BigDecimal(ysDayData.get("consumeFee").toString());
+        sb.append("银盛日交易额: ").append(ysDay.stripTrailingZeros().toPlainString()).append("\n");
+
+        QueryWrapper<MerchantOrder> orderStatisticsQueryWrapper = new QueryWrapper<>();
+        orderStatisticsQueryWrapper.select("SUM(consumeFee) consumeFee");
+        orderStatisticsQueryWrapper.eq("settlementType", "0");
+        orderStatisticsQueryWrapper.eq("status", "1");
+
+        calendar.set(Calendar.DAY_OF_MONTH, 1);
+        Date monthBegin = calendar.getTime();
+        calendar.add(Calendar.MONTH, 1);
+        calendar.add(Calendar.DAY_OF_MONTH, -1);
+        Date monthEnd = calendar.getTime();
+
+        orderStatisticsQueryWrapper.between("createDate", sdf.format(monthBegin), sdf.format(monthEnd));
+
+        Map<String, Object> ysMonthData = moService.getMap(orderStatisticsQueryWrapper);
+        BigDecimal ysMonth = new BigDecimal(ysMonthData.get("consumeFee").toString());
+        sb.append("银盛月交易额：").append(ysMonth.stripTrailingZeros().toPlainString()).append("\n");
+        sb.append("银盛日交易及月交易额完成率：")
+                .append(ysDay.multiply(hundred).divide(ysDayTarget, 2, RoundingMode.HALF_EVEN))
+                .append("% / ")
+                .append(ysMonth.multiply(hundred).divide(ysMonthTarget, 2, RoundingMode.HALF_EVEN))
+                .append("%\n");
+        sb.append("------------------\n");
+        sb.append("日营收：").append(yesterdayData.getActualAmt().stripTrailingZeros().toPlainString()).append("\n");
+        sb.append("月营收：").append(monthData.getActualAmt().stripTrailingZeros().toPlainString()).append("\n");
+        sb.append("日营收及月营收完成率：")
+                .append(yesterdayData.getActualAmt().multiply(hundred).divide(dayProfitTarget, 2, RoundingMode.HALF_EVEN))
+                .append("% / ")
+                .append(monthData.getActualAmt().multiply(hundred).divide(monthProfitTarget, 2, RoundingMode.HALF_EVEN))
+                .append("%\n");
+        sb.append("------------------\n");
+        sb.append("日通道占比：D0 （暂未统计）/ D1 （暂未统计）\n");
+        sb.append("日新增门店：").append(yesterdayData.getStoreNum()).append("\n");
+        sb.append("日新增推广员：").append(yesterdayData.getPromoterNum()).append("\n");
+        sb.append("月总新增门店和推广员：暂未统计/暂未统计\n");
+        sb.append("==================");
+
+        sendTextMsg(sb.toString(), WX_GO_PUBLIC_TALK_URL);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/wxBankCode/WxBankCodeService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/wxBankCode/WxBankCodeService.java
new file mode 100644
index 0000000..dd385fa
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/wxBankCode/WxBankCodeService.java
@@ -0,0 +1,25 @@
+package cn.pluss.platform.wxBankCode;
+
+import java.util.List;
+import java.util.Map;
+import cn.pluss.platform.entity.WxBankCode;
+
+public interface WxBankCodeService {
+
+    public WxBankCode queryWxBankCode(WxBankCode wxBankCode);
+
+    public List<WxBankCode> queryWxBankCodeList(WxBankCode wxBankCode);
+
+    public void saveWxBankCode(WxBankCode wxBankCode);
+
+    public void updateWxBankCode(WxBankCode wxBankCode);
+
+    public void deleteWxBankCode(WxBankCode wxBankCode);
+
+    public List<WxBankCode> queryWxBankCodePage(Map map);
+
+    public Integer queryWxBankCodePageCount(Map map);
+
+    public void saveWxBankCodeBatch(List<WxBankCode> wxBankCodeList);
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/wxBankCode/impl/WxBankCodeServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/wxBankCode/impl/WxBankCodeServiceImpl.java
new file mode 100644
index 0000000..e471031
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/wxBankCode/impl/WxBankCodeServiceImpl.java
@@ -0,0 +1,58 @@
+package cn.pluss.platform.wxBankCode.impl;
+
+import java.util.List;
+import java.util.Map;
+import org.springframework.transaction.annotation.Transactional;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import cn.pluss.platform.entity.WxBankCode;
+import cn.pluss.platform.wxBankCode.WxBankCodeService;
+import cn.pluss.platform.mapper.WxBankCodeMapper;
+
+@Transactional
+@Service("wxBankCodeService")
+public class WxBankCodeServiceImpl  implements WxBankCodeService{
+
+	 private static final Logger logger = LoggerFactory.getLogger( WxBankCodeServiceImpl.class);
+
+
+    @Autowired
+	  private WxBankCodeMapper wxBankCodeMapper;
+
+    @Override
+    public WxBankCode queryWxBankCode(WxBankCode wxBankCode){
+        return wxBankCodeMapper.queryWxBankCode(wxBankCode);
+    }
+
+    @Override
+    public List<WxBankCode> queryWxBankCodeList(WxBankCode wxBankCode){
+        return wxBankCodeMapper.queryWxBankCodeList(wxBankCode);
+    }
+    @Override
+    public void saveWxBankCode(WxBankCode wxBankCode){
+          wxBankCodeMapper.saveWxBankCode(wxBankCode);
+    }
+    @Override
+    public void updateWxBankCode(WxBankCode wxBankCode){
+        wxBankCodeMapper.updateWxBankCode(wxBankCode);
+    }
+    @Override
+    public void deleteWxBankCode(WxBankCode wxBankCode){
+        wxBankCodeMapper.deleteWxBankCode(wxBankCode);
+    }
+    @Override
+    public List<WxBankCode> queryWxBankCodePage(Map map){
+        return wxBankCodeMapper.queryWxBankCodePage(map);
+    }
+    @Override
+    public Integer queryWxBankCodePageCount(Map map){
+        return wxBankCodeMapper.queryWxBankCodePageCount(map);
+    }
+    @Override
+    public void saveWxBankCodeBatch(List<WxBankCode> wxBankCodeList) {
+         wxBankCodeMapper.saveWxBankCodeBatch(wxBankCodeList);
+    }
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/wxCityInfo/WxCityInfoService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/wxCityInfo/WxCityInfoService.java
new file mode 100644
index 0000000..bff40d7
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/wxCityInfo/WxCityInfoService.java
@@ -0,0 +1,25 @@
+package cn.pluss.platform.wxCityInfo;
+
+import java.util.List;
+import java.util.Map;
+import cn.pluss.platform.entity.WxCityInfo;
+
+public interface WxCityInfoService {
+
+    WxCityInfo queryWxCityInfo(WxCityInfo wxCityInfo);
+
+    List<WxCityInfo> queryWxCityInfoList(WxCityInfo wxCityInfo);
+
+    void saveWxCityInfo(WxCityInfo wxCityInfo);
+
+    void updateWxCityInfo(WxCityInfo wxCityInfo);
+
+    void deleteWxCityInfo(WxCityInfo wxCityInfo);
+
+    List<WxCityInfo> queryWxCityInfoPage(Map map);
+
+    Integer queryWxCityInfoPageCount(Map map);
+
+    void saveWxCityInfoBatch(List<WxCityInfo> wxCityInfoList);
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/wxCityInfo/impl/WxCityInfoServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/wxCityInfo/impl/WxCityInfoServiceImpl.java
new file mode 100644
index 0000000..6946df4
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/wxCityInfo/impl/WxCityInfoServiceImpl.java
@@ -0,0 +1,111 @@
+package cn.pluss.platform.wxCityInfo.impl;
+
+import cn.pluss.platform.entity.AreaCity;
+import cn.pluss.platform.entity.WxCityInfo;
+import cn.pluss.platform.mapper.AreaCityMapper;
+import cn.pluss.platform.mapper.WxCityInfoMapper;
+import cn.pluss.platform.wxCityInfo.WxCityInfoService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+@Transactional
+@Service
+public class WxCityInfoServiceImpl implements WxCityInfoService {
+
+    @Resource
+    private WxCityInfoMapper wxCityInfoMapper;
+
+    @Resource
+    private AreaCityMapper areaCityMapper;
+
+    @Override
+    public WxCityInfo queryWxCityInfo(WxCityInfo wxCityInfo) {
+        String cityName = wxCityInfo.getCityName();
+        String[] areaArr = cityName.split(",");
+
+        AreaCity areaCityQuery = new AreaCity();
+        AreaCity areaCity = new AreaCity();
+
+        if (areaArr.length == 5 && "".equals(areaArr[1])) {
+            areaArr[1] = areaArr[2];
+            areaArr[2] = areaArr[3];
+            areaArr[3] = areaArr[4];
+        }
+
+        if (!("".equals(areaArr[1]) || areaArr[1].equals(areaArr[2]))) {
+            // 查省
+            areaCityQuery.setType("1");
+            areaCityQuery.setAreaName(areaArr[1]);
+            areaCity = areaCityMapper.selectOne(new QueryWrapper<>(areaCityQuery));
+            areaCityQuery.setType(null);
+        }
+
+        // 查市, 同一个省下面不可能存在两个同名市
+        areaCityQuery.setParentAreaCode(areaCity.getAreaCode());
+        areaCityQuery.setAreaName(areaArr[2]);
+        areaCity = areaCityMapper.selectOne(new QueryWrapper<>(areaCityQuery));
+
+        if (areaCity == null) {
+            wxCityInfo.setCityCode("000000");
+            return wxCityInfo;
+        }
+        // 查县/区/街道, type可能是3也可能是4
+        areaCityQuery.setParentAreaCode(areaCity.getAreaCode());
+        if (areaArr.length == 3) {
+            // 解决一些不必要的问题
+            wxCityInfo.setCityCode(areaCity.getAreaCode());
+            return wxCityInfo;
+        }
+        areaCityQuery.setAreaName(areaArr[3]);
+        areaCity = areaCityMapper.selectOne(new QueryWrapper<>(areaCityQuery));
+        if (areaCity == null) {
+            wxCityInfo.setCityCode("000000");
+            return wxCityInfo;
+        }
+
+        wxCityInfo.setCityCode(areaCity.getAreaCode());
+
+        return wxCityInfo;
+    }
+
+    @Override
+    public List<WxCityInfo> queryWxCityInfoList(WxCityInfo wxCityInfo) {
+        return wxCityInfoMapper.queryWxCityInfoList(wxCityInfo);
+    }
+
+    @Override
+    public void saveWxCityInfo(WxCityInfo wxCityInfo) {
+        wxCityInfoMapper.saveWxCityInfo(wxCityInfo);
+    }
+
+    @Override
+    public void updateWxCityInfo(WxCityInfo wxCityInfo) {
+        wxCityInfoMapper.updateWxCityInfo(wxCityInfo);
+    }
+
+    @Override
+    public void deleteWxCityInfo(WxCityInfo wxCityInfo) {
+        wxCityInfoMapper.deleteWxCityInfo(wxCityInfo);
+    }
+
+    @Override
+    public List<WxCityInfo> queryWxCityInfoPage(Map map) {
+        return wxCityInfoMapper.queryWxCityInfoPage(map);
+    }
+
+    @Override
+    public Integer queryWxCityInfoPageCount(Map map) {
+        return wxCityInfoMapper.queryWxCityInfoPageCount(map);
+    }
+
+    @Override
+    public void saveWxCityInfoBatch(List<WxCityInfo> wxCityInfoList) {
+        wxCityInfoMapper.saveWxCityInfoBatch(wxCityInfoList);
+    }
+}
+
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/RegionCodeYsService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/RegionCodeYsService.java
new file mode 100644
index 0000000..9f07b00
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/RegionCodeYsService.java
@@ -0,0 +1,24 @@
+package cn.pluss.platform.ys;
+
+import cn.pluss.platform.entity.RegionCodeYs;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 银盛地区表 服务类
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-07-24
+ */
+public interface RegionCodeYsService extends IService<RegionCodeYs> {
+
+    /**
+     * 通过省市区获取对应通道的地区编码
+     * @param province  省
+     * @param city      市
+     * @param area      区
+     * @return
+     */
+    RegionCodeYs getRegionData(String province, String city, String area);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/SubMercCodeYsService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/SubMercCodeYsService.java
new file mode 100644
index 0000000..c554dbd
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/SubMercCodeYsService.java
@@ -0,0 +1,22 @@
+package cn.pluss.platform.ys;
+
+import cn.pluss.platform.entity.SubMercCodeYs;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 银盛二级商户省市区code 服务类
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-06-15
+ */
+public interface SubMercCodeYsService extends IService<SubMercCodeYs> {
+
+    /**
+     * 根据ip获取二级商户地区code
+     * @param ip
+     * @return
+     */
+    SubMercCodeYs getSubCodeByIp(String ip);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/YSConstants.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/YSConstants.java
new file mode 100644
index 0000000..f89aa77
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/YSConstants.java
@@ -0,0 +1,438 @@
+package cn.pluss.platform.ys;
+
+/**
+ * 请求参数key值
+ * @author djh
+ */
+public class YSConstants {
+
+    /**
+     * 业务
+     */
+    public static final String BIZ_RESPONSE_JSON = "bizResponseJson";
+
+    /**
+     *刷卡支付响应 参数名
+     */
+    public static final String BAR_CODE_PAY_RESPONSE = "ysepay_online_barcodepay_response";
+
+    /**
+     *微信支付支付响应参数
+     */
+    public static final String YS_WX_PAY_SERVICE_RESPONSE = "ysepay_online_weixin_pay_response";
+
+    /**
+     * 支付宝支付响应参数
+     */
+    public static final String YS_ALIPAY_SERVICE_RESPONSE = "ysepay_online_alijsapi_pay_response";
+
+    /**
+     *银联支付支付响应参数
+     */
+    public static final String YS_YL_INDUSTRY_RESPONSE = "ysepay_online_cupmulapp_qrcodepay_response";
+
+    /**
+     * 无卡快捷响应参数
+     */
+    public static final String YS_FASTPAY_SERVICE_RESPONSE = "ysepay_online_fastpay_response";
+
+    /**
+     * 协议快捷响应参数
+     */
+    public static final String YS_TRUSTEESHIP_SERVICE_RESPONSE = "ysepay_trusteeship_sign_response";
+
+    /**
+     * 担保响应参数
+     */
+    public static final String YS_DELIVERED_SERVICE_RESPONSE = "ysepay_online_trade_delivered_response";
+
+    /**
+     * 订单退款响应
+     */
+    public static final String YS_REFUND_RESPONSE = "ysepay_online_trade_refund_response";
+
+
+    /**
+     * 订单退款查询响应
+     */
+    public static final String YS_REFUND_QUERY_RESPONSE = "ysepay_online_trade_refund_query_response";
+
+    /**
+     * 退款通知类型
+     */
+    public static final String REFUND_PAY_NOTIFY_CODE = "refund.status.sync";
+
+    /**
+     * 支付失败通知类型
+     */
+    public static final String FAIL_PAY_NOTIFY_CODE = "failpay.status.sync";
+
+
+    public static final String UPLOAD_IMG_TOKEN_GET = "ysepay_merchant_register_token_get_response";
+
+    public static final String UPLOAD_IMG_TOKEN = "ysepay_merchant_register_token_get_response";
+
+    /**
+     * 订单查询
+     */
+    public static final String ORDER_QUERY_RESPONSE = "ysepay_online_trade_order_query_response";
+
+    /**
+     * 银联授权返回
+     */
+    public static final String YS_YL_AUTH_RESPONSE = "ysepay_online_cupgetmulapp_userid_response";
+
+    public static final String YS_WAP_PAY_RESPONSE = "ysepay_online_alijsapi_pay_response";
+
+    public static final String YS_SPLIT_ACCEPT_RESPONSE = "ysepay_single_division_online_accept_response";
+
+    public static final String YS_SPLIT_REFUND_RESPONSE = "ysepay_online_trade_refund_split_response";
+
+    public static final String YS_SPLIT_QUERY_RESPONSE = "ysepay_single_division_online_query_response";
+
+    public static final String YS_SPLIT_GENERAL_REFUND_RESPONSE = "ysepay_online_trade_refund_general_account_response";
+
+    public static final String YS_MERCHANT_WITHDRAW_ACCEPT_RESPONSE = "ysepay_merchant_withdraw_d0_accept_response";
+
+    public static final String YS_ACTIVE_QR_CODE_PAY_RESPONSE = "ysepay_online_qrcodepay_response";
+
+    public static final String YS_UNION_ACCOUNT_RESPONSE = "ysepay_online_unionaccount_downloadurl_get_response";
+
+
+
+    public static final String SUCCES = "SUCCES";
+
+    public static final String FAILED = "FAILED";
+
+    public static final String SUCCESS_CODE = "10000";
+
+    public static final String WX_BANK_TYPE = "1902000";
+
+    public static final String ALI_BANK_TYPE = "1903000";
+
+    public static final String YL_BANK_TYPE = "9001002";
+
+    public static final String SN_BANK_TYPE = "1905000";
+
+
+    /**
+     * 通过商户类型获取行业类型
+     * @param merchantType 商户类型
+     * @return  行业类型
+     */
+    public static String getBusinessType(String merchantType) {
+        if ("1".equals(merchantType)) {
+            return "2";
+        }
+
+        return "0";
+    }
+
+    /**
+     * 商户类型转换
+     * @param merchantType 商户类型
+     * @return 通道商户类型
+     */
+    public static String getMerchantType(String merchantType) {
+        if ("1".equals(merchantType)) {
+            return "3";
+        }
+
+        //
+        if ("2".equals(merchantType)) {
+            return "0";
+        }
+
+        return "1";
+    }
+
+    /**
+     * 获取营业执照到期时间
+     * @param bussAuthEndTime
+     * @return
+     */
+    public static String getMerLicenseEnd(String bussAuthEndTime) {
+        if ("2099-12-30".equals(bussAuthEndTime)) {
+            return "29991231";
+        }
+
+        return bussAuthEndTime.replace("-", "");
+    }
+
+    /**
+     * 身份证到期时间转换
+     * @param expireDate    到期时间
+     * @return
+     */
+    public static String getIdCardLongExpire(String expireDate) {
+        if ("长期".equals(expireDate)) {
+            return "29991231";
+        }
+
+        return expireDate.replace("-", "");
+    }
+
+    /**
+     * 商户全称
+     */
+    public static final String MER_NAME = "merchantName";
+
+    /**
+     * 商户简称
+     */
+    public static final String MER_ALIAS = "merchantShortName";
+
+    /**
+     * 我方商编
+     */
+    public static final String MER_CODE = "outMerchantNo";
+
+    /**
+     * 行业类型
+     * 0：一般商户（企业商户、个体商户） 2：平台商户（小微商户、个人商户）
+     */
+    public static final String BUSINESS_TYPE = "businessType";
+
+    /**
+     * 营业执照号
+     */
+    public static final String MER_LICENSE_CODE = "businessCode";
+
+    /**
+     * 营业执照全称
+     */
+    public static final String MER_LICENSE_NAME = "businessName";
+
+    /**
+     * 营业执照开始日期
+     */
+    public static final String MER_LICENSE_START = "businessExpire";
+
+    /**
+     * 营业执照失效期 业务类型为0时必填 格式yyyyMMdd 长期填29991231
+     */
+    public static final String MER_LICENSE_END = "businessFailure";
+
+    /**
+     * 营业执照注册地址
+     */
+    public static final String MER_LICENSE_ADDRESS = "businessAddress";
+
+    /**
+     * 营业执照图片
+     */
+    public static final String MER_LICENSE_IMG = "businessPic";
+
+    /**
+     * 经营地址
+     */
+    public static final String MER_ADDRESS = "bizAddress";
+
+    /**
+     * 法人姓名
+     */
+    public static final String LEGAL_PERSON_NAME = "lawyerName";
+
+    /**
+     * 法人手机号
+     */
+    public static final String LEGAL_PERSON_PHONE = "lawyerPhone";
+
+    /**
+     * 法人证件号
+     */
+    public static final String LEGAL_PERSON_ID = "lawyerId";
+
+    /**
+     * 法人证件正面图
+     */
+    public static final String LEGAL_PERSON_ID_IMG_FRONT = "lawyerIdPicFront";
+
+    /**
+     * 法人证件反面图
+     */
+    public static final String LEGAL_PERSON_ID_IMG_BACK = "lawyerIdPicBack";
+
+    /**
+     * 法人手持身份证正面
+     */
+    public static final String LEGAL_PERSON_HAND_FRONT = "lawyerIdHandFront";
+
+    /**
+     * 法人身份证有效期开始时间
+     */
+    public static final String LEGAL_PERSON_ID_START = "lawyerIdExpired";
+
+    /**
+     * 法人手机号有效期结束时间
+     */
+    public static final String LEGAL_PERSON_ID_END = "lawyerIdFailure";
+
+    /**
+     * 法人国籍，中国传249
+     */
+    public static final String LEGAL_PERSON_COUNTRY = "lawyerCountry";
+
+    /**
+     * 法人职业, 有营业执照必传
+     */
+    public static final String LEGAL_PERSON_WORK = "lawyerWork";
+
+    /**
+     * 法人性别 业务类型为0时必填
+     * 0（男） 1（女）
+     */
+    public static final String LEGAL_PERSON_SEX = "lawyerSex";
+
+    /**
+     * 法人地址 业务类型为0时必填
+     */
+    public static final String LEGAL_PERSON_ADDRESS = "lawyerAddress";
+
+    /**
+     * 法人证件类型 00-身份证 01-中国护照 02-军人身份证 03-警官证 04-户口簿 05-临时身份证 06-外国护照 07-港澳通行证 08-台胞通行证 09-离休干部荣誉证 10-军官退休证 11-文职干部退休证 12-军事院校学员证 13-武装警察身份证 14-军官证 15-文职干部证 16-军人士兵证 17-武警士兵证 18-其他证件 19-营业执照
+     */
+    public static final String LEGAL_PERSON_CARD_TYPE = "lawyerIdType";
+
+    /**
+     * 结算账户卡类型 11=对私借记卡,13=对私存折,21=对公借记卡,23=对公存折,12=对私贷记卡 --个人贷记卡
+     * 这里只考虑 11 和 21
+     */
+    public static final String ACCOUNT_CARD_TYPE = "accountCardType";
+
+    /**
+     * 结算账户卡号
+     */
+    public static final String ACCOUNT_CARD_NO = "accountCardno";
+
+    /**
+     * 结算账户户名, 结算人姓名
+     */
+    public static final String ACCOUNT_CARD_NAME = "accountCardnoName";
+
+    /**
+     * 结算账户卡正面图片,商户图片进件接口的编号
+     */
+    public static final String ACCOUNT_CARD_FRONT = "accountCardPicFront";
+
+    /**
+     * 开户行省（省市区传中文）
+     */
+    public static final String OPEN_ACC_PROVINCE = "openAccProvince";
+
+    /**
+     * 开户行市
+     */
+    public static final String OPEN_ACC_CITY = "openAccCity";
+
+    /**
+     * 开户行区
+     */
+    public static final String OPEN_ACC_AREA = "openAccArea";
+
+    /**
+     * 开户行编号（支行）, 联行号
+     */
+    public static final String BANK_CONTACT_LINE = "openAccBanktype";
+
+    /**
+     * 联系人姓名
+     */
+    public static final String CONTACT_PERSON = "personName";
+
+    /**
+     * 联系人手机号
+     */
+    public static final String CONTACT_PERSON_PHONE = "personPhone";
+
+    /**
+     * 联系人邮箱
+     */
+    public static final String CONTACT_PERSON_EMAIL = "personEmail";
+
+    /**
+     * 联系人地址
+     */
+    public static final String CONTACT_PERSON_ADDRESS = "personAddress";
+
+    /**
+     * 店铺信息，所在省
+     */
+    public static final String CONTACT_PROVINCE = "province";
+
+    /**
+     * 店铺信息，所在市
+     */
+    public static final String CONTACT_CITY = "city";
+
+    /**
+     * 店铺信息，所在区
+     */
+    public static final String CONTACT_REGION = "region";
+
+    /**
+     * 责任经理
+     */
+    public static final String BIZ_NAME = "bizName";
+
+    /**
+     * MCC码
+     */
+    public static final String MCC_CODE = "mccCode";
+
+    /**
+     * 商户模式 0-个体商户;1-企业商户;3:小微商户
+     */
+    public static final String MER_TYPE = "merchantType";
+
+
+    /**
+     * 门头照
+     */
+    public static final String DOOR_FRONT_PIC = "doorFrontPic";
+
+    /**
+     * 收银台照
+     */
+    public static final String CASHIER_PIC = "cashierPic";
+
+    /**
+     * 内景照
+     */
+    public static final String SCENE_PIC = "scenePic";
+
+    /**
+     * 微信签约费率 费率 (单 位:%)    注:根据签约的费率来填写，最低不能低于0.21
+     */
+    public static final String WX_RATE = "wechatSignRate";
+
+    /**
+     * 微信费率, 最低扣费 (单位:元) (取值区间：0.01-9999.00)
+     */
+    public static final String WX_RATE_MIN = "wechatSignMin";
+
+    /**
+     * 微信费率, 最高扣费 (单位:元) (取值区间：0.01-9999.00)  注：不能小于9000
+     */
+    public static final String WX_RATE_MAX = "wechatSignMax";
+
+    /**
+     * 支付宝签约费率 费率 (单 位:%)   注:根据签约的费率来填写，最低不能低于0.21
+     */
+    public static final String ALI_RATE = "alipaySignRate";
+
+    /**
+     * 支付宝费率, 最低扣费 (单位:元) (取值区间：0.01-9999.00)
+     */
+    public static final String ALI_RATE_MIN = "alipaySignMin";
+
+    /**
+     * 回调地址
+     */
+    public static final String NOTIFY_ADDRESS = "notifyAddress";
+
+    /**
+     * 支付宝费率, 最高扣费 (单位:元) (取值区间：0.01-9999.00)  注：不能小于9000
+     */
+    public static final String ALI_RATE_MAX = "alipaySignMax";
+}
\ No newline at end of file
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/YsBusinessCodeEnum.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/YsBusinessCodeEnum.java
new file mode 100644
index 0000000..c1956e9
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/YsBusinessCodeEnum.java
@@ -0,0 +1,48 @@
+package cn.pluss.platform.ys;
+
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.util.StringUtil;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 银盛BusinessCode枚举类
+ * @DATE 2021/07/08
+ */
+@Getter
+@AllArgsConstructor
+public enum YsBusinessCodeEnum {
+
+    /**
+     * 正扫D0
+     */
+    D0("00510032", "D0"),
+
+    /**
+     * D1
+     */
+    D1("00510030", "D1"),
+
+    /**
+     * 反扫D0
+     */
+    FS_D0("00510080", "FS_D0");
+
+    private String code;
+
+    private String name;
+
+
+    public static String getCodeValue(String name) {
+        if(StringUtil.isEmpty(name)){
+            return YsBusinessCodeEnum.D0.getCode();
+        }
+        YsBusinessCodeEnum[] businessModeEnums = values();
+        for (YsBusinessCodeEnum businessModeEnum : businessModeEnums) {
+            if (businessModeEnum.name().equals(name)) {
+                return businessModeEnum.getCode();
+            }
+        }
+        return YsBusinessCodeEnum.D0.getCode();
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/YsCardTypeEnum.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/YsCardTypeEnum.java
new file mode 100644
index 0000000..4bebb24
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/YsCardTypeEnum.java
@@ -0,0 +1,25 @@
+package cn.pluss.platform.ys;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 银盛CARDTYPE相关枚举类
+ */
+@Getter
+@AllArgsConstructor
+public enum YsCardTypeEnum {
+
+    DEBIT_TYPE("debit","1","借记卡"),
+
+    CREDIT_TYPE("credit","2","贷记卡"),
+
+    OTHER_TYPE("other","3","其他");
+
+    private String code;
+
+    private String value;
+
+    private String desc;
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/YsConfig.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/YsConfig.java
new file mode 100644
index 0000000..2d0f26c
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/YsConfig.java
@@ -0,0 +1,234 @@
+package cn.pluss.platform.ys;
+
+import cn.pluss.platform.util.StringUtil;
+import cn.pluss.platform.yinsheng.YsOldSrcMerchantNo;
+import cn.pluss.platform.ys.payV2.YsOldPayV2;
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+
+@Data
+@Component
+@ConfigurationProperties(prefix = "ys")
+public class YsConfig {
+
+    private String auditDomain;
+
+    private String payDomain;
+
+    private String searchDomain;
+
+    private String commonDomain;
+
+    private String otherDomain;
+
+    private String settleDomain;
+
+    private String agentNo;
+
+    private String srcMerchantNo;
+
+    private String pubKey;
+
+    private String priKey;
+
+    private String oldPubKey;
+
+    //收银呗（武汉）科技有限公司
+    private YsOldPayV2 oldPayV2;
+
+    /**
+     * 进件，图片上传的接口链接
+     */
+    public static String IMG_UPLOAD;
+
+    /**
+     * 进件接口
+     */
+    public static String MER_AUDIT;
+
+    /**
+     * 进件结果查询接口
+     */
+    public static String MER_RESULT;
+
+    /**
+     * 微信认证
+     */
+    public static String WX_AUTH;
+
+    /**
+     * 微信认证取消
+     */
+    public static String WX_AUTH_CANCEL;
+
+    /**
+     * 微信认证状态查询
+     */
+    public static String WX_AUTH_STATUS;
+
+    /**
+     * 微信认证授权状态查询
+     */
+    public static String WX_AUTHORIZE_STATUS;
+
+    /**
+     * 微信反扫接口地址
+     */
+    public static String WX_BARCODE_PAY;
+
+    /**
+     * 微信公众号支付接口地址
+     */
+    public static String WX_JSAPI_PAY;
+
+    /**
+     * 微信小程序支付
+     */
+    public static String WX_APPLETS_PAY;
+
+
+    /**
+     * 支付宝反扫接口地址
+     */
+    public static String ALI_BARCODE_PAY;
+
+    /**
+     * 支付宝服务窗支付接口地址
+     */
+    public static String ALI_JSAPI_PAY;
+
+
+    /**
+     * 银联反扫接口地址
+     */
+    public static String UNI_BARCODE_PAY;
+
+    /**
+     * 银联服务窗支付接口地址
+     */
+    public static String UNI_JSAPI_PAY;
+
+
+    /**
+     * 退款请求地址
+     */
+    public static String REFUND_PAY;
+
+    /**
+     * 退款查询请求地址
+     */
+    public static String REFUND_QUERY;
+
+    /**
+     * 支付订单查询请求地址
+     */
+    public static String PAY_ORDER_QUERY;
+
+    /**
+     * 支付订单详情请求地址
+     */
+    public static String PAY_ORDER_DETAIL_QUERY;
+
+    /**
+     * 获取银联用户标识
+     */
+    public static String GET_UNION_USER_ID;
+
+    /**
+     * 结算提现接口地址
+     */
+    public static String SETTLE_TRADE;
+
+    /**
+     * 提现接口查询地址
+     */
+    public static String SETTLE_TRADE_QUERY;
+
+    /**
+     * 响应状态成功
+     */
+    public static final String RESULT_SUCCESS_CODE = "success";
+
+    /**
+     * 响应状态失败
+     */
+    public static final String YS_RESULT_FAIL_CODE = "fail";
+
+
+    public static final String YS_RESULT_PAY_SUCCESS_CODE = "success";
+
+    public static final String YS_RESULT_PAY_FAIL_CODE = "fail";
+
+    public static final String YS_RESULT_WAITPAY_CODE = "waitpay";
+
+    public static final String YS_RESULT_UNKNOW_CODE = "unknow";
+
+    public static final String YS_RESULT_ACCEPT_CODE = "accept";
+
+    public static final String YS_RESULT_DFREVERSE_CODE = "dfreverse";
+
+
+    @PostConstruct
+    public void init() {
+        IMG_UPLOAD = auditDomain + "/gateway/file/merchantPic";
+
+        MER_AUDIT = auditDomain + "/gateway/merchant/add";
+
+        MER_RESULT = auditDomain + "/gateway/merchant/query";
+
+        WX_AUTH = auditDomain + "/gateway/merchant/wxAuthSubmitApply";
+
+        WX_AUTH_CANCEL = auditDomain + "/gateway/merchant/wxAuthCancelApply";
+
+        WX_AUTH_STATUS = auditDomain + "/gateway/merchant/wxAuthQueryByApplyNo";
+
+        WX_AUTHORIZE_STATUS = auditDomain + "/gateway/merchant/wxAuthState";
+
+        WX_BARCODE_PAY = payDomain + "/gateway/trade/wxBarCode";
+
+        WX_JSAPI_PAY = payDomain + "/gateway/trade/wxJs";
+
+        WX_APPLETS_PAY = payDomain + "/gateway/trade/wxMiniProgram";
+
+        ALI_BARCODE_PAY = payDomain + "/gateway/trade/alipayBarCode";
+
+        ALI_JSAPI_PAY = payDomain + "/gateway/trade/aliServicePay";
+
+        UNI_BARCODE_PAY = payDomain + "/gateway/trade/ylpayBarCode";
+
+        UNI_JSAPI_PAY = payDomain + "/gateway/trade/ylJsPay";
+
+        REFUND_PAY =  payDomain + "/gateway/trade/applyRefund";
+
+        REFUND_QUERY =  payDomain + "/gateway/trade/queryRefund";
+
+        PAY_ORDER_QUERY =  payDomain + "/gateway/trade/queryOrder";
+
+        PAY_ORDER_DETAIL_QUERY =  payDomain + "/gateway/trade/queryOrderDetail";
+
+        GET_UNION_USER_ID = payDomain + "/gateway/trade/ylUserId";
+
+        SETTLE_TRADE = payDomain + "/gateway/trade/withdraw";
+
+        SETTLE_TRADE_QUERY = payDomain + "/gateway/trade/withdrawQuery";
+    }
+
+    public String getPrikeyVal(String srcMerchantNo) {
+        //获取秘钥
+        if(StringUtil.isEmpty(srcMerchantNo) || YsOldSrcMerchantNo.RSCY.getValue().equals(srcMerchantNo)){
+            return this.getPriKey();
+        }
+        return this.getOldPayV2().getPayPriKey();
+    }
+
+    public String getPubKeyVal(String srcMerchantNo) {
+        //获取秘钥
+        if(StringUtil.isEmpty(srcMerchantNo) || YsOldSrcMerchantNo.RSCY.getValue().equals(srcMerchantNo)){
+            return this.getOldPubKey();
+        }
+        return this.getOldPayV2().getPayPubKey();
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/YsEnum.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/YsEnum.java
new file mode 100644
index 0000000..0b3832e
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/YsEnum.java
@@ -0,0 +1,102 @@
+package cn.pluss.platform.ys;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 银盛相关枚举类
+ */
+@Getter
+@AllArgsConstructor
+public enum YsEnum {
+
+    // 微信，支付宝，银联反扫
+    BAR_CODE_PAY("ysepay.online.barcodepay", "反扫",YSConstants.BAR_CODE_PAY_RESPONSE),
+
+    //微信公众号、小程序支付
+    WECHART_JS_PAY("ysepay.online.weixin.pay", "微信主扫",YSConstants.YS_WX_PAY_SERVICE_RESPONSE),
+
+    // 支付宝生活号支付
+    ALI_JS_PAY("ysepay.online.alijsapi.pay", "支付宝主扫",YSConstants.YS_ALIPAY_SERVICE_RESPONSE),
+
+    // 银联行业码支付
+    YL_JS_PAY("ysepay.online.cupmulapp.qrcodepay", "银联被扫",YSConstants.YS_YL_INDUSTRY_RESPONSE),
+
+    // 无卡快捷类支付
+    NO_CARD_FAST("ysepay.online.fastpay", "无卡快捷支付",YSConstants.YS_FASTPAY_SERVICE_RESPONSE),
+
+    // 协议快捷类支付
+    PROTOCOL_FAST_PAY("ysepay.trusteeship.sign", "协议快捷支付",YSConstants.YS_TRUSTEESHIP_SERVICE_RESPONSE),
+
+    // 担保交易
+    DELIVERED_PAY("ysepay.online.trade.delivered", "担保交易",YSConstants.YS_DELIVERED_SERVICE_RESPONSE),
+
+    // 退款
+    REFUND_PAY("ysepay.online.trade.refund", "退款", YSConstants.YS_REFUND_RESPONSE),
+
+    // 退款查询
+    REFUND_PAY_QUERY("ysepay.online.trade.refund.query", "退款查询", YSConstants.YS_REFUND_QUERY_RESPONSE),
+
+    /**
+     * 获取图片token
+     */
+    UPLOAD_IMG_TOKEN("ysepay.merchant.register.token.get", "获取图片token",  YSConstants.UPLOAD_IMG_TOKEN_GET),
+
+    /**
+     * 获取图片token
+     */
+    UPLOAD_IMG("upload", "上传图片",  YSConstants.UPLOAD_IMG_TOKEN_GET),
+
+    /**
+     * 微信认证
+     */
+    WX_CERT_AUTH("ysepay.authenticate.wx.apply", "微信实名认证",  YSConstants.UPLOAD_IMG_TOKEN_GET),
+
+    /**
+     * 微信认证-撤销申请单
+     */
+    WX_CERT_CANCEL("ysepay.authenticate.wx.cancel", "微信实名认证撤销",  YSConstants.UPLOAD_IMG_TOKEN_GET),
+
+    /**
+     * 微信认证查询
+     */
+    WX_CERT_AUTH_STATUS("ysepay.authenticate.wx.query", "微信实名认证查询",  YSConstants.UPLOAD_IMG_TOKEN_GET),
+
+    // 交易查询
+    QRDER_QUERY("ysepay.online.trade.order.query", "订单查询",YSConstants.ORDER_QUERY_RESPONSE),
+
+    // 银联授权
+    YS_USERID_AUTH("ysepay.online.cupgetmulapp.userid", "银联用户标识查询",YSConstants.YS_YL_AUTH_RESPONSE),
+
+
+    // WAP支付
+    YS_WAP_PAY("ysepay.online.wap.directpay.createbyuser", "银盛wap支付",YSConstants.YS_WAP_PAY_RESPONSE),
+
+    //银盛分账登记
+    YS_SPLIT_ACCEPT("ysepay.single.division.online.accept", "银盛分账登记",YSConstants.YS_SPLIT_ACCEPT_RESPONSE),
+
+    //银盛分账查询
+    YS_SPLIT_QUERY("ysepay.single.division.online.query", "银盛分账查询",YSConstants.YS_SPLIT_QUERY_RESPONSE),
+
+    //银盛一般消费户退款
+    YS_SPLIT_GENERAL_REFUND("ysepay.online.trade.refund.general.account", "一般消费户退款接口",YSConstants.YS_SPLIT_GENERAL_REFUND_RESPONSE),
+
+    //待结算户到一般户/银行卡（实时）
+    YS_MERCHANT_WITHDRAW_ACCEPT("ysepay.merchant.withdraw.d0.accept", "实时提现交易(待结算账户到银行卡)",YSConstants.YS_MERCHANT_WITHDRAW_ACCEPT_RESPONSE),
+
+    //银盛分账退款
+    YS_SPLIT_REFUND("ysepay.online.trade.refund.split", "银盛分账退款",YSConstants.YS_SPLIT_REFUND_RESPONSE),
+
+    // 获取对账文件
+    YS_UNION_ACCOUNT("ysepay.online.unionaccount.downloadurl.get", "获取对账文件", YSConstants.YS_UNION_ACCOUNT_RESPONSE),
+
+    //与生成订单扫码支付
+    ACTIVE_QR_CODE_PAY("ysepay.online.qrcodepay", "银盛扫码支付",YSConstants.YS_ACTIVE_QR_CODE_PAY_RESPONSE);
+
+    private String apiName;
+
+    private String typeName;
+
+    private String responseParam;
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/YsNotifyTypeEnum.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/YsNotifyTypeEnum.java
new file mode 100644
index 0000000..ff16b78
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/YsNotifyTypeEnum.java
@@ -0,0 +1,22 @@
+package cn.pluss.platform.ys;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * TODO
+ * 银盛通知类型枚举
+ * @author crystal
+ * @date 2022/7/13 17:40
+ */
+@Getter
+@AllArgsConstructor
+public enum YsNotifyTypeEnum {
+
+    DIVISION("yspos.division.notity","分账登记通知");
+
+    private String code;
+
+    private String desc;
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/YsOldConfig.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/YsOldConfig.java
new file mode 100644
index 0000000..91660a6
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/YsOldConfig.java
@@ -0,0 +1,16 @@
+package cn.pluss.platform.ys;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * 旧版接口相关参数
+ */
+@Data
+@Component
+@ConfigurationProperties(prefix = "ys")
+public class YsOldConfig {
+
+    private String oldPubKey;
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/YsOldConstants.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/YsOldConstants.java
new file mode 100644
index 0000000..ab1c118
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/YsOldConstants.java
@@ -0,0 +1,402 @@
+package cn.pluss.platform.ys;
+
+import java.math.BigDecimal;
+
+public class YsOldConstants {
+
+    /**
+     * 通过商户类型获取行业类型
+     * @param merchantType 商户类型
+     * @return  行业类型
+     */
+    public static String getBusinessType(String merchantType) {
+        if ("1".equals(merchantType)) {
+            return "2";
+        }
+
+        return "0";
+    }
+
+    /**
+     * 商户类型转换
+     * @param merchantType 商户类型
+     * @return 通道商户类型
+     */
+    public static String getMerchantType(String merchantType) {
+        if ("1".equals(merchantType)) {
+            return "3";
+        }
+
+        if ("2".equals(merchantType)) {
+            return "0";
+        }
+
+        return "1";
+    }
+
+    /**
+     * 获取营业执照到期时间
+     * @param bussAuthEndTime
+     * @return
+     */
+    public static String getMerLicenseEnd(String bussAuthEndTime) {
+        if ("2099-12-30".equals(bussAuthEndTime)) {
+            return "29991231";
+        }
+
+        return bussAuthEndTime.replace("-", "");
+    }
+
+    /**
+     * 身份证到期时间转换
+     * @param expireDate    到期时间
+     * @return
+     */
+    public static String getIdCardLongExpire(String expireDate) {
+        if ("长期".equals(expireDate)) {
+            return "29991231";
+        }
+
+        return expireDate.replace("-", "");
+    }
+
+    /**
+     * 商户简称
+     */
+    public static final String MER_ALIAS = "userShortName";
+
+    /**
+     * 我方商编
+     */
+    public static final String MER_CODE = "outMerchantNo";
+
+    /**
+     * 营业执照号
+     */
+    public static final String MER_LICENSE_CODE = "businessLicenceNo";
+
+    /**
+     * 营业执照全称
+     */
+    public static final String MER_LICENSE_NAME = "businessLicence";
+
+    /**
+     * 营业执照开始日期
+     */
+    public static final String MER_LICENSE_START = "businessLicenceSdate";
+
+    /**
+     * 营业执照失效期 业务类型为0时必填 格式yyyyMMdd 长期填29991231
+     */
+    public static final String MER_LICENSE_END = "businessLicenceEdate";
+
+    /**
+     * 营业执照注册地址
+     */
+    public static final String MER_LICENSE_ADDRESS = "registeredAddress";
+
+    /**
+     * 营业执照图片
+     */
+    public static final String MER_LICENSE_IMG = "businessPic";
+
+    /**
+     * 经营地址
+     */
+    public static final String MER_ADDRESS = "businessAddress";
+
+    /**
+     * 法人姓名
+     */
+    public static final String LEGAL_PERSON_NAME = "legalPersonName";
+
+    /**
+     * 法人手机号
+     */
+    public static final String LEGAL_PERSON_PHONE = "legalPersonPhone";
+
+    /**
+     * 法人证件号
+     */
+    public static final String LEGAL_PERSON_ID = "legalPersonId";
+
+    /**
+     * 法人证件类型 00-身份证
+     */
+    public static final String LEGAL_PERSON_CARD_TYPE = "certType";
+
+    /**
+     * 结算账户卡类型 11=对私借记卡,13=对私存折,21=对公借记卡,23=对公存折,12=对私贷记卡 --个人贷记卡
+     * 这里只考虑 11 和 21
+     */
+    public static final String ACCOUNT_CARD_TYPE = "balanceAccType";
+
+    /**
+     * 法人证件正面图
+     */
+    public static final String LEGAL_PERSON_ID_IMG_FRONT = "lawyerIdPicFront";
+
+    /**
+     * 法人证件反面图
+     */
+    public static final String LEGAL_PERSON_ID_IMG_BACK = "lawyerIdPicBack";
+
+    /**
+     * 法人手持身份证正面
+     */
+    public static final String LEGAL_PERSON_HAND_FRONT = "lawyerIdHandFront";
+
+    /**
+     * 法人身份证有效期开始时间
+     */
+    public static final String LEGAL_PERSON_ID_START = "legalPersonIdSdate";
+
+    /**
+     * 法人手机号有效期结束时间
+     */
+    public static final String LEGAL_PERSON_ID_END = "legalPersonIdEdate";
+
+    /**
+     * 结算账户卡号
+     */
+    public static final String ACCOUNT_CARD_NO = "balanceAccCardno";
+
+    /**
+     * 结算账户户名
+     */
+    public static final String ACCOUNT_CARD_NAME = "balanceAccName";
+
+    /**
+     * 银行卡预留手机号
+     */
+    public static final String ACCOUNT_BANK_MOBILE = "bankMobile";
+
+    /**
+     * 非法人姓名
+     */
+    public static final String ACCOUNT_HOLDER_NAME = "unincorporatedName";
+
+    public static final String ACCOUNT_ID_CARD_NO = "unincorporatedId";
+
+    /**
+     * 结算账户卡正面图片,商户图片进件接口的编号
+     */
+    public static final String ACCOUNT_CARD_FRONT = "accountCardPicFront";
+
+    /**
+     * 银行名称
+     */
+    public static final String BANK_NAME = "bankName";
+
+    /**
+     * 银行编号
+     */
+    public static final String BANK_TYPE = "bankType";
+
+    /**
+     * 开户行省（省市区传中文）
+     */
+    public static final String OPEN_ACC_PROVINCE = "openAccProvince";
+
+    /**
+     * 开户行市
+     */
+    public static final String OPEN_ACC_CITY = "openAccCity";
+
+    /**
+     * 开户行区
+     */
+    public static final String OPEN_ACC_AREA = "openAccArea";
+
+    /**
+     * 开户行编号（支行）, 联行号
+     */
+    public static final String BANK_CONTACT_LINE = "openAccBanktype";
+
+    /**
+     * 开户支行名称
+     */
+    public static final String BANK_BRANCH_NAME = "openAccBankname";
+
+    /**
+     * 实际控制人
+     */
+    public static final String ACTUAL_MANAGER = "actualManager";
+
+    /**
+     * 联系人姓名
+     */
+    public static final String CONTACT_PERSON = "contactsName";
+
+    /**
+     * 联系人手机号
+     */
+    public static final String CONTACT_PERSON_PHONE = "contactsPhone";
+
+    /**
+     * 联系人邮箱
+     */
+    public static final String CONTACT_PERSON_EMAIL = "contactsEmail";
+
+    /**
+     * 联系人地址
+     */
+    public static final String CONTACT_PERSON_ADDRESS = "contactsAddr";
+
+    /**
+     * 店铺信息，所在省
+     */
+    public static final String CONTACT_PROVINCE = "province";
+
+    /**
+     * 店铺信息，所在市
+     */
+    public static final String CONTACT_CITY = "city";
+
+    /**
+     * 店铺信息，所在区
+     */
+    public static final String CONTACT_REGION = "region";
+
+    /**
+     * 责任经理
+     */
+    public static final String BIZ_NAME = "bizName";
+
+    /**
+     * MCC码
+     */
+    public static final String MCC_CODE = "mccCode";
+
+    /**
+     * 商户模式 0-个体商户;1-企业商户;3:小微商户
+     */
+    public static final String MER_TYPE = "userType";
+
+    /**
+     * 微信签约费率 费率 (单 位:0.01%)    注:根据签约的费率来填写，最低不能低于0.21
+     */
+    public static final String WX_RATE = "wechatSignRate";
+
+    /**
+     * 微信费率, 最低扣费 (单位:分) (取值区间：1-999999)
+     */
+    public static final String WX_RATE_MIN = "wechatSignMin";
+
+    /**
+     * 微信费率, 最高扣费 (单位:分) (取值区间：1-999999)  注：不能小于900000
+     */
+    public static final String WX_RATE_MAX = "wechatSignMax";
+
+    /**
+     * 支付宝签约费率 费率 (单 位:0.01%)   注:根据签约的费率来填写，最低不能低于0.21
+     */
+    public static final String ALI_RATE = "alipaySignRate";
+
+    /**
+     * 支付宝费率, 最低扣费 (单位:分) (取值区间：1-999999)
+     */
+    public static final String ALI_RATE_MIN = "alipaySignMin";
+
+    /**
+     * 支付宝费率, 最高扣费 (单位:分) (取值区间：1-999999)  注：不能小于9000
+     */
+    public static final String ALI_RATE_MAX = "alipaySignMax";
+
+    /**
+     * 是否开通扫码快付垫资费
+     */
+    public static final String QUICK_CASH = "codeAdvanceOpen";
+
+    /**
+     * 秒到提现费率 0.1%
+     */
+    public static final String QUICK_CASH_RATE = "dianziRate";
+
+    /**
+     * 秒到最低结算钱数，0.1
+     */
+    public static final String LOWEST_STL_AMT = "lowestStlAmt";
+
+    /**
+     * 商店级别
+     */
+    public static final String MERC_LVL = "mercLvl";
+
+
+    /*********************交易相关********************************/
+
+    /**
+     * WAIT_BUYER_PAY	交易创建，等待买家付款。
+     */
+    public static final String PAY_WAIT_BUYER_PAY = "WAIT_BUYER_PAY";
+
+    /**
+     * 在指定时间段内未支付时关闭的交易；
+     * 客户主动关闭订单。
+     */
+    public static final String PAY_TRADE_CLOSED = "TRADE_CLOSED";
+
+    /**
+     * 交易成功，且可对该交易做操作，如：多级分润、退款等。
+     */
+    public static final String PAY_TRADE_SUCCESS = "TRADE_SUCCESS";
+
+    /**
+     * 部分退款成功。
+     */
+    public static final String PAY_TRADE_PART_REFUND = "TRADE_PART_REFUND";
+
+    /**
+     * 全部退款成功。
+     */
+    public static final String PAY_TRADE_ALL_REFUND = "TRADE_ALL_REFUND";
+
+    /**
+     * 超金额支付。
+     */
+    public static final String PAY_OVERPAYMENT = "OVERPAYMENT";
+
+    /**
+     * 支付处理中
+     */
+    public static final String PAY_TRADE_PROCESS = "TRADE_PROCESS";
+
+    /**
+     * 交易失败
+     */
+    public static final String PAY_TRADE_FAILD = "TRADE_FAILD";
+
+    /**
+     * 买家已付款，等待卖家发货
+     */
+    public static final String TRADE_WAIT_SELLER_SEND_GOODS = "WAIT_SELLER_SEND_GOODS";
+
+    /**
+     * 卖家已发货，等待买家确认
+     */
+    public static final String TRADE_WAIT_BUYER_CONFIRM_GOODS = "WAIT_BUYER_CONFIRM_GOODS";
+
+    /**
+     * 异常订单,请继续查询到终态或者联系银盛客服
+     */
+    public static final String TRADE_TRADE_ABNORMALITY = "TRADE_ABNORMALITY";
+
+    /**
+     * @description:银盛银联云闪付贷记卡借记卡大于1000成本费率0.52%
+     * @date: 2021/8/24 14:33
+     */
+    public static final BigDecimal CREDIT_DEBIT_CARD_BANK_RATE_LARGE = BigDecimal.valueOf(0.0053);
+
+    /**
+     * @description:银盛微信支付宝成本银联1000以下费率0.21%
+     * @date: 2021/8/24 14:33
+     */
+    public static final BigDecimal CHANNEL_WECHAT_ALIPAY_BANK_COST_RATE = BigDecimal.valueOf(0.0021);
+
+    /**
+     * 银盛分账接口返回参数
+     */
+    public static final String YS_SPLIT_RESUT_CODE = "DIVISION_ACCEPT";
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/YsService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/YsService.java
new file mode 100644
index 0000000..641ba4a
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/YsService.java
@@ -0,0 +1,50 @@
+package cn.pluss.platform.ys;
+
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.core.io.ByteArrayResource;
+
+import java.util.Map;
+
+/**
+ * 银盛通用service
+ */
+public interface YsService {
+
+    String TYPE_AUDIT = "1";
+
+    String TYPE_PAY = "2";
+
+    String TYPE_OTHER = "3";
+
+
+    JSONObject requestApi(String url, JSONObject reqData, String type);
+
+    JSONObject requestApiCommon(String url, JSONObject reqData, String type);
+
+    /**
+     * 结果验签
+     * @param responseData
+     * @return
+     */
+    boolean checkSign(JSONObject responseData) throws Exception;
+
+    /**
+     * 旧版结果签名验签
+     * @param responseData
+     * @return
+     */
+    boolean oldCheckSign(JSONObject responseData,YsEnum ysEnum,String srcMerchantNo) throws Exception;
+
+
+    JSONObject requestOldApiCommon(String url, JSONObject reqData, String type,YsEnum ysEnum,String srcMerchantNo);
+
+    JSONObject requestOldApiCommon(String url, JSONObject reqData, String type, YsEnum ysEnum, Map<String, ByteArrayResource> fileMap,String srcMerchantNo);
+
+    /**
+     * 结果验签
+     * @param responseData
+     * @return
+     */
+    boolean checkSignOld(JSONObject responseData) throws Exception;
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/edit/YsChangeRateServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/edit/YsChangeRateServiceImpl.java
new file mode 100644
index 0000000..82e8f94
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/edit/YsChangeRateServiceImpl.java
@@ -0,0 +1,118 @@
+package cn.pluss.platform.ys.edit;
+
+import cn.pluss.platform.channel.BaseMchChannelRateNewService;
+import cn.pluss.platform.channel.MerchantAuditService;
+import cn.pluss.platform.converter.Converter;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.yinsheng.v20210929.ReqMethod;
+import cn.pluss.platform.ys.impl.v20210929.YsAuditServiceImpl;
+import cn.pluss.platform.ys.impl.v20210929.YsConfigV2;
+import cn.pluss.platform.ys.impl.v20210929.YsServiceV2;
+import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 银盛修改费率的接口
+ * @author djh
+ */
+@Slf4j
+@Service("ysChangeRateService")
+public class YsChangeRateServiceImpl extends BaseMchChannelRateNewService {
+
+    @Autowired
+    private YsServiceV2 ysServiceV2;
+
+    @Autowired
+    private MerchantAuditService ysAuditServiceV2;
+
+    @Autowired @Lazy
+    private MerchantBaseInfoService mbiService;
+
+    @Autowired @Lazy
+    private MerchantChannelStatusService mcsService;
+
+    @Override
+    public void process(String userId, MerchantRateNew merchantRate) {
+
+        MerchantBaseInfo mbi = mbiService.getMerchantBaseInfoByUserId(userId);
+        MerchantChannelStatus mcs = mcsService.getByMerchantCodeAndChannelType(mbi.getMerchantCode(), Account.CHANNEL_TYPE_D0);
+        if (!MerchantChannelStatus.isAudited(mcs)) {
+            throw new MsgException("暂未开通实时通道");
+        }
+
+        // 先赋值
+        MerchantRateNew.setRateValue(merchantRate);
+
+        JSONObject reqParam = new JSONObject();
+        JSONObject bankFee1 = new JSONObject();
+        bankFee1.put("creditRate", merchantRate.getBankRateLargeValue().divide(new BigDecimal(100)).doubleValue() + "");
+        bankFee1.put("creditMin", "1");
+        bankFee1.put("debitRate", merchantRate.getBankRateLargeValue().divide(new BigDecimal(100)).doubleValue() + "");
+        bankFee1.put("debitMin", "1");
+        bankFee1.put("debitMax", "999900");
+
+        JSONObject bankFee2 = new JSONObject();
+        bankFee2.put("creditRate", merchantRate.getBankRateValue().divide(new BigDecimal(100)).doubleValue() + "");
+        bankFee2.put("creditMin", "1");
+        bankFee2.put("debitRate", merchantRate.getBankRateValue().divide(new BigDecimal(100)).doubleValue() + "");
+        bankFee2.put("debitMin", "1");
+        bankFee2.put("debitMax", "999900");
+
+        JSONObject wxAliFee = new JSONObject();
+        wxAliFee.put("wechatSignRate", merchantRate.getWxRateValue().divide(new BigDecimal(100)).doubleValue() + "");
+        wxAliFee.put("wechatSignMin", "1");
+        wxAliFee.put("alipaySignRate", merchantRate.getAliRateValue().divide(new BigDecimal(100)).doubleValue() + "");
+        wxAliFee.put("alipaySignMin", "1");
+
+        reqParam.put("mercId", mcs.getMerchantId());
+        reqParam.put("bankFee1", bankFee1);
+        reqParam.put("bankFee2", bankFee2);
+        reqParam.put("wxAliFee", wxAliFee);
+
+        // TODO 发起修改费率请求
+        JSONObject respData = ysServiceV2.req(YsConfigV2.MER_RATE_CHANGE, ReqMethod.MERCHANT_CHANGE_ONLINE_FEE, reqParam);
+        log.info("请求结果：{}", respData);
+        String changeFlowId = respData.getString("changeFlowId");
+        mcs.getExtra().put("changeFlowId", changeFlowId);
+
+        MerchantRateNewRecord mrnr = Converter.INSTANCE.trans(merchantRate);
+        mrnr.setCreateTime(new Date());
+        mrnr.setUpdateTime(new Date());
+        mrnr.setRemark(changeFlowId);
+        rateNewRecordService.save(mrnr);
+
+        // 上传一张空白图作为结算信息修改申请表
+        ((YsAuditServiceImpl) ysAuditServiceV2).imageUploadEdit("https://www.shouyinbei.net/resources/images/upload/blank.png", "B008", changeFlowId);
+    }
+
+    @Override
+    public void after(String userId, MerchantRateNew merchantRate) {
+        // 不作任何保存
+    }
+
+    @Override
+    public String getChannelId() {
+        return "4";
+    }
+
+    @Override
+    public MerchantRateNew getDefaultRate() {
+        MerchantRateNew rate = new MerchantRateNew();
+        rate.setAliRate(38);
+        rate.setWxRate(38);
+        rate.setBankRate(36);
+        rate.setBankRateLarge(37);
+
+        MerchantRateNew.setRateValue(rate);
+        return rate;
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/AbYsAuditResultService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/AbYsAuditResultService.java
new file mode 100644
index 0000000..2428a48
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/AbYsAuditResultService.java
@@ -0,0 +1,206 @@
+package cn.pluss.platform.ys.impl;
+
+import cn.pluss.platform.channel.MerchantCertService;
+import cn.pluss.platform.entity.MerchantChannelStatus;
+import cn.pluss.platform.entity.Notice;
+import cn.pluss.platform.entity.SubMerchant;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.mapper.UserAppMapper;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.notice.NoticeService;
+import cn.pluss.platform.subMerchant.SubMerchantService;
+import cn.pluss.platform.task.IMerAuditHandler;
+import cn.pluss.platform.user.impl.GeneralPushUtil;
+import cn.pluss.platform.ys.YSConstants;
+import cn.pluss.platform.ys.YsConfig;
+import cn.pluss.platform.ys.YsService;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DuplicateKeyException;
+
+import javax.annotation.Resource;
+import java.util.Collections;
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * 实现进件结果返回的逻辑
+ *
+ * @author djh
+ */
+@Slf4j
+public abstract class AbYsAuditResultService extends AbYsImgUploadService {
+
+    @Autowired
+    protected IMerAuditHandler ysMerAuditHandler;
+
+    @Autowired
+    protected MerchantBaseInfoService merchantBaseInfoService;
+
+    @Autowired
+    protected MerchantChannelStatusService mcsService;
+
+    @Autowired
+    protected MerchantCertService ysCertService;
+
+    @Autowired
+    protected YsService ysService;
+
+    @Autowired
+    protected MerchantChannelStatusService channelStatusService;
+
+    @Autowired
+    protected NoticeService noticeService;
+
+    @Resource
+    protected UserAppMapper userAppMapper;
+
+    @Autowired
+    protected SubMerchantService smService;
+
+    @Autowired
+    private GeneralPushUtil generalPushUtil;
+
+
+    @Override
+    public JSONObject merchantAuditResult(Map<String, Object> result) throws Exception {
+        String merchantCode = (String) result.get("merchantCode");
+        LambdaQueryWrapper<MerchantChannelStatus> qWrapper = new LambdaQueryWrapper<MerchantChannelStatus>()
+                .eq(MerchantChannelStatus::getChannel, 4)
+                .eq(MerchantChannelStatus::getMerchantCode, merchantCode);
+
+        MerchantChannelStatus mcs = channelStatusService.getOne(qWrapper);
+        if (mcs == null) {
+            return null;
+        }
+
+        // 获取outMerchantCode
+        JSONObject extra = mcs.getExtra();
+        if (extra == null) {
+            return null;
+        }
+
+        String outMerchantCode = extra.getString(YSConstants.MER_CODE);
+
+        JSONObject bizReqJson = new JSONObject();
+        bizReqJson.put("outMerchantNo", outMerchantCode);
+
+        JSONObject auditResult = ysService.requestApiCommon(YsConfig.MER_RESULT, bizReqJson, YsService.TYPE_AUDIT);
+        String status = auditResult.getString("status");
+        String statusMsg = auditResult.getString("statusMeg");
+        String merchantId = auditResult.getString("merchantNo");
+        if (StringUtils.isEmpty(outMerchantCode)) {
+            log.error("查询进件信息异常, {}", statusMsg);
+            return null;
+        }
+
+        mcs.setThirdStatus(status);
+        if ("wait".equals(status)) {
+            return null;
+        }
+
+        // 通过有没有商编来判断是否进件初审状态, 避开待审核状态
+        if (StringUtils.isNotBlank(merchantId)) {
+            mcs.setMerchantId(merchantId);
+            mcs.setStatus(MerchantChannelStatus.AUDIT_STATUS_QUICK_CASH);
+            // 微信认证
+            try {
+                ysCertService.wxCert(merchantId, merchantCode);
+            } catch (Exception e) {
+                log.debug("微信认证异常");
+                e.printStackTrace();
+            }
+
+            mcsService.saveOrUpdate(mcs);
+
+            // 现在操作子商户信息
+            String wxMerchantNo = auditResult.getString("wxMerchantNo");
+            String zfbMerchantNo = auditResult.getString("zfbMerchantNo");
+            if (StringUtils.isNotEmpty(wxMerchantNo)) {
+                String[] wxMerchNos = wxMerchantNo.split(",");
+                for (String wxMerchNo : wxMerchNos) {
+                    try {
+                        SubMerchant subMerchant = new SubMerchant();
+                        subMerchant.setMerchantId(merchantId);
+                        subMerchant.setSubMchId(wxMerchNo);
+                        subMerchant.setSubMchType("WX");
+                        subMerchant.setRemark(statusMsg);
+                        subMerchant.setChannelTypeId("4");
+                        smService.save(subMerchant);
+                    } catch (DuplicateKeyException e) {
+                        log.warn("相同的微信子商户号, 不需要重复保存");
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                        log.warn("保存微信子商户号错误");
+                    }
+                }
+            }
+
+            if (StringUtils.isNotEmpty(zfbMerchantNo)) {
+                String[] zfbMerchNos = zfbMerchantNo.split(",");
+                for (String zfbMerchNo : zfbMerchNos) {
+                    try {
+                        SubMerchant subMerchant = new SubMerchant();
+                        subMerchant.setMerchantId(merchantId);
+                        subMerchant.setSubMchId(zfbMerchNo);
+                        subMerchant.setSubMchType("ZFB");
+                        subMerchant.setRemark(statusMsg);
+                        subMerchant.setChannelTypeId("4");
+                        smService.save(subMerchant);
+                    } catch (DuplicateKeyException e) {
+                        log.warn("相同的支付宝子商户号, 不需要重复保存");
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                        log.warn("保存支付宝子商户号错误");
+                    }
+                }
+            }
+        } else {
+            mcs.setStatus(MerchantChannelStatus.AUDIT_STATUS_REJECT);
+            mcs.setRemark(statusMsg);
+
+            String pushMsg = "实时到账申请失败";
+            if (StringUtils.isNotEmpty(statusMsg)) {
+                // 有原因则写，没有则不拼接
+                pushMsg += ", 原因：" + statusMsg;
+            }
+
+            LambdaQueryWrapper<UserApp> qWrapper2 = new LambdaQueryWrapper<UserApp>().eq(UserApp::getMerchantCode, merchantCode)
+                    .eq(UserApp::getUserType, "promoter");
+            UserApp userApp = userAppMapper.selectOne(qWrapper2);
+            Notice notice = new Notice();
+            String uniqueKey = "auditReq" + System.currentTimeMillis();
+            notice.setNoticeCode(uniqueKey);
+            notice.setUniqueKey(uniqueKey);
+            notice.setCreateDt(new Date());
+            notice.setConrtent(pushMsg);
+            notice.setUserId(userApp.getUserId() + "");
+            noticeService.saveMerAuthNotice(notice);
+            generalPushUtil.sendAllPlatByAlias(Collections.singletonList(userApp.getUserId() + ""), "商家审核通知", pushMsg, "1");
+
+            mcsService.saveOrUpdate(mcs);
+        }
+
+        return auditResult;
+    }
+
+    @Override
+    public JSONObject merchantAuditCallback(JSONObject auditResult) throws Exception {
+        ysMerAuditHandler.auditHandler(auditResult);
+        return null;
+    }
+
+    @Override
+    public JSONObject editMerchantCallback(JSONObject auditResult) throws Exception {
+        return null;
+    }
+
+    @Override
+    public void checkSign(JSONObject receiveData) throws Exception {
+        // checkSign由ysService提供
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/AbYsImgUploadService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/AbYsImgUploadService.java
new file mode 100644
index 0000000..00f19f9
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/AbYsImgUploadService.java
@@ -0,0 +1,123 @@
+package cn.pluss.platform.ys.impl;
+
+import cn.pluss.platform.channel.BaseMerchantAuditService;
+import cn.pluss.platform.channel.MerchantAuditService;
+import cn.pluss.platform.entity.MerchantChannelImg;
+import cn.pluss.platform.entity.MerchantImage;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.merchantChannelImg.MerchantChannelImgService;
+import cn.pluss.platform.util.Base64Util;
+import cn.pluss.platform.util.FileUtil;
+import cn.pluss.platform.util.LogExceptionUtils;
+import cn.pluss.platform.yinsheng.RespEntity;
+import cn.pluss.platform.ys.YSConstants;
+import cn.pluss.platform.ys.YsConfig;
+import cn.pluss.platform.ys.YsService;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.extern.slf4j.Slf4j;
+import lombok.val;
+import lombok.var;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.client.RestTemplate;
+
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.Objects;
+
+/**
+ * 上传图片方法实现
+ * @author djh
+ */
+@Slf4j
+public abstract class AbYsImgUploadService extends BaseMerchantAuditService {
+
+    @Autowired
+    protected YsService ysService;
+
+    @Autowired
+    protected RestTemplate restTemplate;
+
+    @Autowired
+    protected MerchantChannelImgService channelImgService;
+
+    /**
+     * 银盛的通道，进件失败一次，就得重新上传一次图片，所以这里将商户的外部商户号存储起来
+     * @param merchantImage 图片信息
+     */
+    @Override
+    public void imageUpload(MerchantImage merchantImage) {
+        val merchantChannelImg = new MerchantChannelImg()
+                .setSrcUrl(merchantImage.getPicUrl())
+                .setChannelType(4);
+        val existData = channelImgService.getOne(new QueryWrapper<>(merchantChannelImg));
+        if (existData != null) {
+            // 这里的channelImg的id由merchantImage带过去
+            merchantImage.setId(existData.getId());
+        } else {
+            merchantImage.setId(null);
+        }
+
+
+        String imgBase64Data = FileUtil.getBase64FromUrl(merchantImage.getPicUrl());
+
+        try {
+            if (!Objects.equals(merchantImage.getPhotoType(), MerchantImage.ImageType.BUSINESS_LICENSE)) {
+                log.debug("压缩图片");
+                imgBase64Data = Base64Util.compressPic(imgBase64Data, 500);
+            } else {
+                log.debug("压缩图片 - 营业执照");
+                imgBase64Data = Base64Util.compressPic(imgBase64Data, 1024);
+            }
+        } catch (Exception e) {
+            LogExceptionUtils.printStack(log, e, null);
+            throw new MsgException("上传文件失败");
+        }
+
+        JSONObject reqData = new JSONObject();
+        reqData.put("picFile", imgBase64Data);
+        reqData.put(YSConstants.MER_CODE, merchantImage.getMerchantCode());
+
+        val response = ysService.requestApiCommon(YsConfig.IMG_UPLOAD, reqData, "AUDIT");
+
+        log.info("上传图片返回结果为{}", response.toJSONString());
+        afterUpload(merchantImage, response);
+    }
+
+    @Override
+    public void imageUpload(String url, String picType) {
+        val merchantImage = new MerchantImage().setPicUrl(url);
+        imageUpload(merchantImage);
+    }
+
+    @Override
+    public String imgTypeTransform(String imageType) {
+        return null;
+    }
+
+    /**
+     * 返回参数处理
+     * @param merchantImage  图片信息
+     * @param responseData  返回数据
+     */
+    private void afterUpload(MerchantImage merchantImage, JSONObject responseData) {
+        val status = responseData.getString("status");
+        val statusMeg = responseData.getString("statusMeg");
+
+        if (!status.equals(RespEntity.SUCCESS)) {
+            throw new MsgException(statusMeg);
+        }
+
+        val fileCode = responseData.getString("fileCode");
+        var channelImg = new MerchantChannelImg()
+                .setChannelType(4)
+                // 这里的channelImg的id由merchantImage带过来
+                .setId(merchantImage.getId())
+                .setSrcUrl(merchantImage.getPicUrl())
+                .setChannelImgUrl(fileCode);
+
+        merchantImage.setPhotoUrl(fileCode);
+        channelImgService.saveOrUpdate(channelImg);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/RegionCodeYsServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/RegionCodeYsServiceImpl.java
new file mode 100644
index 0000000..0674e06
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/RegionCodeYsServiceImpl.java
@@ -0,0 +1,45 @@
+package cn.pluss.platform.ys.impl;
+
+import cn.pluss.platform.entity.RegionCodeYs;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.RegionCodeYsMapper;
+import cn.pluss.platform.ys.RegionCodeYsService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 银盛地区表 服务实现类
+ * </p>
+ *
+ * @author Djh
+ * @since 2021-07-24
+ */
+@Service
+public class RegionCodeYsServiceImpl extends ServiceImpl<RegionCodeYsMapper, RegionCodeYs> implements RegionCodeYsService {
+
+    @Override
+    public RegionCodeYs getRegionData(String province, String city, String area) {
+        MsgException.checkBlank(province, "省不能为空");
+        MsgException.checkBlank(province, "市不能为空");
+        MsgException.checkBlank(province, "县区不能为空");
+
+        // 银盛的直辖市的省与市同名
+        if (!province.endsWith("省") && !province.endsWith("自治区") && !province.endsWith("市")) {
+            province = province + "市";
+        }
+
+        if ("新疆维吾尔自治区".equals(province)) {
+            province = "新疆维吾尔族自治区";
+        }
+
+        /**
+         * 暂时
+         */
+        if (city.startsWith("潜江") || city.startsWith("仙桃") || city.startsWith("天门")) {
+            city = "荆门";
+        }
+
+        return null;
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/SubMercCodeYsServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/SubMercCodeYsServiceImpl.java
new file mode 100644
index 0000000..5f47b95
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/SubMercCodeYsServiceImpl.java
@@ -0,0 +1,40 @@
+package cn.pluss.platform.ys.impl;
+
+import cn.pluss.platform.entity.SubMercCodeYs;
+import cn.pluss.platform.ipLocation.IpLocationService;
+import cn.pluss.platform.mapper.SubMercCodeYsMapper;
+import cn.pluss.platform.ys.SubMercCodeYsService;
+import com.aliyuncs.geoip.model.v20200101.DescribeIpv4LocationResponse;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * <p>
+ * 银盛二级商户省市区code 服务实现类
+ * </p>
+ *
+ * @author crystal
+ * @since 2022-06-15
+ */
+@Service
+@Slf4j
+public class SubMercCodeYsServiceImpl extends ServiceImpl<SubMercCodeYsMapper, SubMercCodeYs> implements SubMercCodeYsService {
+
+    @Autowired
+    @Qualifier("ipLocationService")
+    private IpLocationService ipLocationService;
+
+    @Override
+    public SubMercCodeYs getSubCodeByIp(String ip) {
+        DescribeIpv4LocationResponse response = ipLocationService.getLocation(ip);
+        if(response == null){
+            return null;
+        }
+        return  baseMapper.getSubMercCodeYsByCity(response.getCity());
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/YsAuditServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/YsAuditServiceImpl.java
new file mode 100644
index 0000000..b487b0f
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/YsAuditServiceImpl.java
@@ -0,0 +1,269 @@
+package cn.pluss.platform.ys.impl;
+
+import cn.pluss.platform.dto.AccountDTO;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.AccountMapper;
+import cn.pluss.platform.mcc.MccInfoSortService;
+import cn.pluss.platform.util.ParametersUtil;
+import cn.pluss.platform.util.StringUtil;
+import cn.pluss.platform.ys.YSConstants;
+import cn.pluss.platform.ys.YsConfig;
+import cn.pluss.platform.ys.YsService;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 银盛进件实现类
+ *
+ * @author djh
+ */
+@Slf4j
+@Service("ysAuditService")
+public class YsAuditServiceImpl extends AbYsAuditResultService {
+
+    public static final String URI = "/api/auditCallback/ys";
+
+    @Autowired
+    private MccInfoSortService mccInfoSortService;
+
+    @Resource
+    private AccountMapper accountMapper;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void merchantAudit(String userId, boolean isFailCheck) {
+        merchantAuditCheck(userId, isFailCheck);
+
+        AccountDTO account = accountService.getRealAccount(userId, Account.CHANNEL_TYPE_D0);
+        IdCard idCard;
+        IdCard legalIdCard = idCardService.getLegalIdCard(userId);
+        MerchantBaseInfo mbi = merchantBaseInfoService.getMerchantBaseInfoByUserId(userId);
+        if (account.getSettleType().startsWith(Account.SETTLE_TYPE_PRIVATE_ILLEGAL)) {
+            mbi.setMerchantType("1");
+        }
+
+        int ysCount = accountMapper.selectYSAuditSmallCount(mbi.getUserId());
+        if (ysCount >= 2 && "1".equals(mbi.getMerchantType())) {
+            MsgException.throwException("非营业执照商户同一结算人最多可申请两次实时到账");
+        }
+
+        channelImgService.removeThirdImgRecord(mbi.getMerchantCode(), "4");
+        List<MerchantImage> merchantChannelImgList = channelImgService.getAuditImg(userId, "4");
+
+        JSONObject extra = new JSONObject();
+        String outMerchantCode = mbi.getMerchantCode() + (System.currentTimeMillis() / 1000);
+        extra.put(YSConstants.MER_CODE, outMerchantCode);
+
+        JSONObject bizReqJson = new JSONObject();
+        bizReqJson.put(YSConstants.MER_NAME, mbi.getMerchantName());
+        bizReqJson.put(YSConstants.MER_ALIAS, mbi.getAlias());
+
+        //
+        bizReqJson.put(YSConstants.MER_CODE, outMerchantCode);
+        bizReqJson.put(YSConstants.BUSINESS_TYPE, YSConstants.getBusinessType(mbi.getMerchantType()));
+        if ("0".equals(bizReqJson.getString(YSConstants.BUSINESS_TYPE))) {
+            // 添加营业执照信息
+            bizReqJson.put(YSConstants.MER_LICENSE_CODE, mbi.getBussAuthNum());
+            bizReqJson.put(YSConstants.MER_LICENSE_NAME, mbi.getBussAuthName());
+            bizReqJson.put(YSConstants.MER_LICENSE_START, mbi.getBussAuthStartTime().replace("-", ""));
+            bizReqJson.put(YSConstants.MER_LICENSE_END, YSConstants.getMerLicenseEnd(mbi.getBussAuthEndTime()));
+            bizReqJson.put(YSConstants.MER_LICENSE_ADDRESS, mbi.getBussAuthAddress());
+            // 营业执照图片信息在填写图片信息时填写
+            idCard = legalIdCard;
+
+            // 部分法人信息必传
+            // 国籍中国
+            bizReqJson.put(YSConstants.LEGAL_PERSON_COUNTRY, "249");
+            MccInfoSort mccInfoSort = mccInfoSortService.getByMcc(mbi.getMcc());
+
+            MsgException.checkNull(mccInfoSort, "请重新选择mcc");
+            bizReqJson.put(YSConstants.LEGAL_PERSON_WORK, mccInfoSort.getCode());
+            bizReqJson.put(YSConstants.LEGAL_PERSON_SEX, StringUtil.getSexFromCertNo(idCard.getCertNo()));
+            bizReqJson.put(YSConstants.LEGAL_PERSON_ADDRESS, mbi.getAddress());
+        } else {
+            // 小微商户的
+            idCard = account.getIdcard();
+        }
+
+        bizReqJson.put(YSConstants.MER_ADDRESS, mbi.getAddress());
+        bizReqJson.put(YSConstants.LEGAL_PERSON_NAME, idCard.getCertName());
+        bizReqJson.put(YSConstants.LEGAL_PERSON_ID, idCard.getCertNo());
+        // 这里为保证准确性，使用
+        bizReqJson.put(YSConstants.LEGAL_PERSON_PHONE, account.getBankCard().getPhone());
+        // 身份证正反面填写图片信息时填写
+        bizReqJson.put(YSConstants.LEGAL_PERSON_ID_START, idCard.getCertStartTime().replace("-", ""));
+        bizReqJson.put(YSConstants.LEGAL_PERSON_ID_END, YSConstants.getIdCardLongExpire(idCard.getCertEndTime()));
+
+        bizReqJson.put(YSConstants.LEGAL_PERSON_CARD_TYPE, "00");
+
+        if ("03".equals(account.getSettleType())) {
+            bizReqJson.put(YSConstants.ACCOUNT_CARD_TYPE, "21");
+        } else {
+            bizReqJson.put(YSConstants.ACCOUNT_CARD_TYPE, "11");
+        }
+
+        bizReqJson.put(YSConstants.ACCOUNT_CARD_NO, account.getBankCard().getBankCardNo());
+        bizReqJson.put(YSConstants.ACCOUNT_CARD_NAME, account.getBankCard().getBankHolder());
+        // 结算账户图片在填写图片信息时填写
+        String province = account.getBankCard().getBranchProvince();
+        String city = account.getBankCard().getBranchCity();
+        String area = account.getBankCard().getBranchArea();
+        RegionCodeYs regionCode = regionReflectService.getYsRegionCode(province, city, area);
+        bizReqJson.put(YSConstants.OPEN_ACC_PROVINCE, regionCode.getProvince());
+        bizReqJson.put(YSConstants.OPEN_ACC_CITY, regionCode.getCity());
+        if (regionCode.getArea() != null) {
+            bizReqJson.put(YSConstants.OPEN_ACC_AREA, regionCode.getArea());
+        }
+
+
+        bizReqJson.put(YSConstants.BANK_CONTACT_LINE, account.getBankCard().getContactLine());
+        bizReqJson.put(YSConstants.CONTACT_PERSON, mbi.getContactName());
+        bizReqJson.put(YSConstants.CONTACT_PERSON_PHONE, mbi.getContactMobile());
+        bizReqJson.put(YSConstants.CONTACT_PERSON_EMAIL, "18062761507@163.com");
+        bizReqJson.put(YSConstants.CONTACT_PERSON_ADDRESS, mbi.getAddress());
+
+        String mbiProvince = account.getBankCard().getBranchProvince();
+        String mbiCity = account.getBankCard().getBranchCity();
+        String mbiArea = account.getBankCard().getBranchArea();
+        RegionCodeYs mbiRegionCode = regionReflectService.getYsRegionCode(mbiProvince, mbiCity, mbiArea);
+        bizReqJson.put(YSConstants.CONTACT_PROVINCE, mbiRegionCode.getProvince());
+        bizReqJson.put(YSConstants.CONTACT_CITY, mbiRegionCode.getCity());
+        String distinct = mbiRegionCode.getArea();
+        if (distinct != null) {
+            bizReqJson.put(YSConstants.CONTACT_REGION, distinct);
+        }
+
+        bizReqJson.put(YSConstants.BIZ_NAME, "收银呗");
+        bizReqJson.put(YSConstants.MCC_CODE, mbi.getMcc());
+        bizReqJson.put(YSConstants.MER_TYPE, YSConstants.getMerchantType(mbi.getMerchantType()));
+        bizReqJson.put(YSConstants.WX_RATE, 0.38);
+        bizReqJson.put(YSConstants.WX_RATE_MAX, 9999.00);
+        bizReqJson.put(YSConstants.WX_RATE_MIN, 0.01);
+        bizReqJson.put(YSConstants.ALI_RATE, 0.38);
+        bizReqJson.put(YSConstants.ALI_RATE_MAX, 9999.00);
+        bizReqJson.put(YSConstants.ALI_RATE_MIN, 0.01);
+
+        bizReqJson.put(YSConstants.NOTIFY_ADDRESS, ParametersUtil.domain + URI);
+        concatImgInfo(bizReqJson, merchantChannelImgList, outMerchantCode);
+
+
+        log.info("{}银盛进件参数{}", userId, JSON.toJSONString(bizReqJson));
+
+        JSONObject resp = ysService.requestApiCommon(YsConfig.MER_AUDIT, bizReqJson, YsService.TYPE_AUDIT);
+
+        String status = resp.getString("status");
+        String statusMsg = resp.getString("statusMeg");
+
+        MerchantChannelStatus mcs = this.mcsService.getByMerchantCode(mbi.getMerchantCode(), 4);
+        mcs.setThirdStatus(status);
+        mcs.setRemark(statusMsg);
+        mcs.setChannel(4);
+        mcs.setExtra(extra);
+
+        if ("wait".equals(status)) {
+            mcs.setStatus(MerchantChannelStatus.AUDIT_STATUS_EXAMINING);
+        } else if ("success".equals(status)) {
+            mcs.setStatus(MerchantChannelStatus.AUDIT_STATUS_SUCCESS);
+        } else {
+            throw new MsgException(statusMsg);
+        }
+        this.mcsService.saveOrUpdate(mcs);
+    }
+
+    @Override
+    public void merchantAuditCheck(String userId, boolean isFailCheck) {
+
+    }
+
+    @Override
+    public void editMerchantAudit(String userId) {
+        // 银盛没有进件修改接口
+        MsgException.throwException("修改商户信息请联系客服");
+    }
+
+    /**
+     * 上传图片时需要将外部上号传入
+     *
+     * @param bizReqJson      最终请求业务数据
+     * @param imgList         图片列表
+     * @param outMerchantCode 外部商户号
+     */
+    private void concatImgInfo(JSONObject bizReqJson, List<MerchantImage> imgList, String outMerchantCode) {
+        for (MerchantImage merchantImage : imgList) {
+            merchantImage.setMerchantCode(outMerchantCode);
+
+            switch (merchantImage.getPhotoType()) {
+                case MerchantImage.ImageType.IDCARD_FRONT:
+                    if (!"3".equals(bizReqJson.getString(YSConstants.MER_TYPE))) {
+                        imageUpload(merchantImage);
+                        // 个体、企业
+                        bizReqJson.put(YSConstants.LEGAL_PERSON_ID_IMG_FRONT, merchantImage.getPhotoUrl());
+                        bizReqJson.put(YSConstants.LEGAL_PERSON_HAND_FRONT, merchantImage.getPhotoUrl());
+                    }
+                    break;
+                case MerchantImage.ImageType.IDCARD_BACK:
+                    if (!"3".equals(bizReqJson.getString(YSConstants.MER_TYPE))) {
+                        imageUpload(merchantImage);
+                        // 个体、企业
+                        bizReqJson.put(YSConstants.LEGAL_PERSON_ID_IMG_BACK, merchantImage.getPhotoUrl());
+                    }
+                    break;
+                case MerchantImage.ImageType.ACCOUNT_PERMITS:
+                    if (!"3".equals(bizReqJson.getString(YSConstants.MER_TYPE))) {
+                        imageUpload(merchantImage);
+                        // 个体、企业
+                        bizReqJson.put(YSConstants.ACCOUNT_CARD_FRONT, merchantImage.getPhotoUrl());
+                    }
+                    break;
+                case MerchantImage.ImageType.SETTLE_IDCARD_FRONT:
+                    if ("3".equals(bizReqJson.getString(YSConstants.MER_TYPE))) {
+                        imageUpload(merchantImage);
+                        // 个体、企业
+                        bizReqJson.put(YSConstants.LEGAL_PERSON_ID_IMG_FRONT, merchantImage.getPhotoUrl());
+                        bizReqJson.put(YSConstants.LEGAL_PERSON_HAND_FRONT, merchantImage.getPhotoUrl());
+                    }
+                    break;
+                case MerchantImage.ImageType.SETTLE_IDCARD_BACK:
+                    if ("3".equals(bizReqJson.getString(YSConstants.MER_TYPE))) {
+                        imageUpload(merchantImage);
+                        // 个体、企业
+                        bizReqJson.put(YSConstants.LEGAL_PERSON_ID_IMG_BACK, merchantImage.getPhotoUrl());
+                    }
+                    break;
+                case MerchantImage.ImageType.BANK_CARD_FRONT:
+                    imageUpload(merchantImage);
+                    bizReqJson.put(YSConstants.ACCOUNT_CARD_FRONT, merchantImage.getPhotoUrl());
+                    break;
+                case MerchantImage.ImageType.BUSINESS_LICENSE:
+                    if (!"3".equals(bizReqJson.getString(YSConstants.MER_TYPE))) {
+                        imageUpload(merchantImage);
+                        // 非小微商户添加营业执照
+                        bizReqJson.put(YSConstants.MER_LICENSE_IMG, merchantImage.getPhotoUrl());
+                    }
+                    break;
+                case MerchantImage.ImageType.SHOP_FRONT_DOOR:
+                    imageUpload(merchantImage);
+                    bizReqJson.put(YSConstants.DOOR_FRONT_PIC, merchantImage.getPhotoUrl());
+                    break;
+                case MerchantImage.ImageType.CASH_DESK_PHOTO:
+                    imageUpload(merchantImage);
+                    bizReqJson.put(YSConstants.CASHIER_PIC, merchantImage.getPhotoUrl());
+                    break;
+                case MerchantImage.ImageType.STORE_INTERIOR_PHOTO:
+                    imageUpload(merchantImage);
+                    bizReqJson.put(YSConstants.SCENE_PIC, merchantImage.getPhotoUrl());
+                    break;
+                default:
+                    break;
+            }
+        }
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/YsCertServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/YsCertServiceImpl.java
new file mode 100644
index 0000000..aba48f2
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/YsCertServiceImpl.java
@@ -0,0 +1,246 @@
+package cn.pluss.platform.ys.impl;
+
+import cn.jiguang.common.utils.StringUtils;
+import cn.pluss.platform.SubMerchantApplyOrderService;
+import cn.pluss.platform.channel.MerchantCertService;
+import cn.pluss.platform.dto.AccountDTO;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.merchant.AccountService;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.merchantImage.MerchantImageService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.util.Base64Util;
+import cn.pluss.platform.util.FileUtil;
+import cn.pluss.platform.util.OssOperatUtil;
+import cn.pluss.platform.ys.YsConfig;
+import cn.pluss.platform.ys.YsService;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import lombok.val;
+import lombok.var;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+
+/**
+ * @author djh
+ */
+@Slf4j
+@Service("ysCertService")
+public class YsCertServiceImpl implements MerchantCertService {
+
+    @Autowired
+    private MerchantBaseInfoService mbiService;
+
+    @Autowired
+    private MerchantChannelStatusService mcsService;
+
+    @Setter(onMethod_ = {@Autowired,@Lazy})
+    private UserAppService userAppService;
+
+    @Autowired
+    private MerchantImageService merchantImageService;
+
+    @Autowired
+    private SubMerchantApplyOrderService subMerchantApplyOrderService;
+
+    @Autowired
+    private YsService ysService;
+
+    @Setter(onMethod_ = {@Autowired,@Lazy})
+    private AccountService accountService;
+
+    @Override
+    public void wxCert(String merchantId, String merchantCode) {
+        MerchantBaseInfo mbi = new MerchantBaseInfo()
+                .setMerchantCode(merchantCode);
+        mbi = mbiService.getOne(new QueryWrapper<>(mbi));
+
+        MerchantImage merImg = new MerchantImage()
+                .setMerchantCode(merchantCode)
+                .setPhotoType(MerchantImage.ImageType.SHOP_FRONT_DOOR);
+        merImg = merchantImageService.getOne(new QueryWrapper<>(merImg));
+
+        MerchantImage merImg2 = new MerchantImage()
+                .setMerchantCode(merchantCode)
+                .setPhotoType(MerchantImage.ImageType.STORE_INTERIOR_PHOTO);
+        merImg2 = merchantImageService.getOne(new QueryWrapper<>(merImg2));
+
+
+        JSONObject reqData = new JSONObject();
+        reqData.put("merchantNo", merchantId);
+
+        AccountDTO account = accountService.getAccount(mbi.getUserId());
+
+        if ("1".equals(mbi.getMerchantType()) || account.getSettleType().startsWith(Account.SETTLE_TYPE_PRIVATE_ILLEGAL)) {
+            reqData.put("managementType", "00");
+            reqData.put("storeName", mbi.getAlias());
+
+            String base641 = Base64Util.compressPic(FileUtil.getBase64FromUrl(merImg.getPicUrl()), 150);
+            String base642 = Base64Util.compressPic(FileUtil.getBase64FromUrl(merImg2.getPicUrl()), 150);
+            reqData.put("shopPhoto", base641);
+            reqData.put("storeEnvirPhoto", base642);
+        }
+
+
+        JSONObject resp = ysService.requestApiCommon(YsConfig.WX_AUTH, reqData, YsService.TYPE_AUDIT);
+
+        if ("success".equals(resp.getString("status"))) {
+            String applyNo = resp.getString("applyNo");
+
+            // 将之前微信认证请求发生错误的信息直接全部清理
+            LambdaQueryWrapper<SubMerchantApplyOrder> qWrapper = Wrappers.lambdaQuery();
+            qWrapper.eq(SubMerchantApplyOrder::getMerchantCode, merchantCode)
+                    .eq(SubMerchantApplyOrder::getChannelId, 4);
+
+            subMerchantApplyOrderService.remove(qWrapper);
+
+            SubMerchantApplyOrder subMerchantApplyOrder = new SubMerchantApplyOrder()
+                    .setMerchantCode(mbi.getMerchantCode())
+                    .setSubMchType("WX")
+                    .setStatus("0")
+                    .setApplyNo(applyNo)
+                    .setChannelId(4);
+
+            subMerchantApplyOrderService.save(subMerchantApplyOrder);
+        } else {
+            String msg = resp.getString("statusMeg");
+            log.error("商户微信认证异常{}", msg);
+            if (msg.endsWith("该商户状态未注册")) {
+                // 类似于没有微信子商户号的情况
+                return;
+            }
+
+//            throw new MsgException(msg);
+
+            SubMerchantApplyOrder subMerchantApplyOrder = new SubMerchantApplyOrder()
+                    .setMerchantCode(mbi.getMerchantCode())
+                    .setSubMchType("WX")
+                    .setStatus("0")
+                    .setRemark(msg)
+                    .setResultStatus(SubMerchantApplyOrder.RES_STATUS_COMMIT_ERROR)
+                    .setChannelId(4);
+
+            // 先更新
+            LambdaUpdateWrapper<SubMerchantApplyOrder> uWrapper = Wrappers.lambdaUpdate();
+            uWrapper.eq(SubMerchantApplyOrder::getMerchantCode, merchantCode);
+            uWrapper.eq(SubMerchantApplyOrder::getChannelId, 4);
+            uWrapper.eq(SubMerchantApplyOrder::getResultStatus, "4");
+            uWrapper.set(SubMerchantApplyOrder::getStatus, "0")
+                    .set(SubMerchantApplyOrder::getResultStatus, SubMerchantApplyOrder.RES_STATUS_COMMIT_ERROR)
+                    .set(SubMerchantApplyOrder::getRemark, msg)
+                    .set(SubMerchantApplyOrder::getUpdateTime, new Date());
+            boolean updateFlag = subMerchantApplyOrderService.update(uWrapper);
+            if (!updateFlag) {
+                subMerchantApplyOrderService.save(subMerchantApplyOrder);
+            }
+        }
+    }
+
+    @Override
+    public void wxReCert(String merchantId, String merchantCode) {
+        var subMerchantApplyOrder = new SubMerchantApplyOrder()
+                .setMerchantCode(merchantCode)
+                .setStatus("1")
+                .setChannelId(4);
+        subMerchantApplyOrder = subMerchantApplyOrderService.getOne(new QueryWrapper<>(subMerchantApplyOrder));
+
+        wxCertCancel(merchantId, subMerchantApplyOrder);
+
+        wxCert(merchantId, merchantCode);
+    }
+
+    @Override
+    public JSONObject wxCertResult(String merchantId, String wxApplyNo) {
+        var subMerchantApplyOrder = new SubMerchantApplyOrder()
+                .setApplyNo(wxApplyNo)
+                .setChannelId(4);
+
+        subMerchantApplyOrder = subMerchantApplyOrderService.getOne(new QueryWrapper<>(subMerchantApplyOrder));
+
+        val reqParam = new JSONObject();
+        reqParam.put("applyNo", wxApplyNo);
+
+        var userApp = new UserApp()
+                .setMerchantCode(subMerchantApplyOrder.getMerchantCode())
+                .setUserType("promoter");
+        userApp = userAppService.queryUserApp(userApp);
+        val mbi = mbiService.getMerchantBaseInfoByUserId(userApp.getUserId() + "");
+
+        var resp = ysService.requestApiCommon(YsConfig.WX_AUTH_STATUS, reqParam, YsService.TYPE_AUDIT);
+
+        var status = resp.getString("status");
+        subMerchantApplyOrder.setResultStatus(status);
+        subMerchantApplyOrder.setRemark(resp.getString("rejectReason"));
+
+        val qrcodeData = resp.getString("qrcodeData");
+        if (StringUtils.isNotEmpty(qrcodeData)) {
+            val inputStream = Base64Util.base64ToInputStream(qrcodeData);
+            val fileUrl = OssOperatUtil.upload(inputStream, UUID.randomUUID().toString().replace("-", ""), "png");
+            subMerchantApplyOrder.setInfoQrcode(fileUrl);
+        }
+
+
+        List<String> alisaList = new ArrayList<>();
+        alisaList.add(userApp.getUserId() + "");
+        if ("confirmcontact".equals(status) || "confirmlegalperson".equals(status) || "passed".equals(status)) {
+            subMerchantApplyOrder.setStatus("1");
+        } else if ("rejected".equals(status) || "freezed".equals(status) || "canceled".equals(status) || "unknow".equals(status)) {
+            // 驳回或者未知状态标位已处理
+            subMerchantApplyOrder.setStatus("1");
+        } else if ("waitting".equals(status)) {
+            subMerchantApplyOrder.setRemark("待微信审核");
+        }
+
+        subMerchantApplyOrderService.updateById(subMerchantApplyOrder);
+
+
+        return null;
+    }
+
+    @Override
+    public JSONObject wxCertCallback(JSONObject certResult) {
+        return null;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void wxCertCancel(String merchantId, SubMerchantApplyOrder subMerchantApplyOrder) {
+        val reqParam = new JSONObject();
+        reqParam.put("applyNo", subMerchantApplyOrder.getApplyNo());
+
+        var resp = ysService.requestApiCommon(YsConfig.WX_AUTH_CANCEL, reqParam, YsService.TYPE_AUDIT);
+        if ("success".equals(resp.getString("status"))) {
+            subMerchantApplyOrder.setStatus("2");
+            subMerchantApplyOrderService.saveOrUpdate(subMerchantApplyOrder);
+        } else {
+            throw new MsgException(resp.getString("statusMeg"));
+        }
+    }
+
+    @Override
+    public void wxCertAuthStatus(String merchantId) {
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("merchantNo", merchantId);
+        JSONObject result = ysService.requestApiCommon(YsConfig.WX_AUTHORIZE_STATUS, jsonObject, YsService.TYPE_AUDIT);
+
+        String authStateX = result.getString("authStateX");
+        if (Objects.equals(authStateX, "AUTHORIZE_STATE_AUTHORIZED")) {
+            LambdaUpdateWrapper<MerchantChannelStatus> uWrapper = Wrappers.lambdaUpdate();
+            uWrapper.set(MerchantChannelStatus::getAuthorizationStatus, MerchantChannelStatus.AUTHORIZATION_STATUS_AUTHORIZED);
+            uWrapper.eq(MerchantChannelStatus::getMerchantId, merchantId);
+            uWrapper.eq(MerchantChannelStatus::getChannel, 4);
+            mcsService.update(uWrapper);
+        }
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/YsChangeRateNewServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/YsChangeRateNewServiceImpl.java
new file mode 100644
index 0000000..c34673e
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/YsChangeRateNewServiceImpl.java
@@ -0,0 +1,45 @@
+package cn.pluss.platform.ys.impl;
+
+import cn.pluss.platform.channel.BaseMchChannelRateNewService;
+import cn.pluss.platform.entity.MerchantRateNew;
+import cn.pluss.platform.entity.Notification;
+import cn.pluss.platform.notification.NotificationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author DJH
+ * 银盛老修改费率接口
+ */
+@Service("ysChangeRateNewService")
+public class YsChangeRateNewServiceImpl extends BaseMchChannelRateNewService {
+
+    @Autowired
+    private NotificationService notificationService;
+
+    @Override
+    public void process(String userId, MerchantRateNew merchantRate) {
+        // 此处不做任何变更，
+        Notification notification = new Notification();
+        notification.setTitle("D0费率修改申请");
+        notification.setStatus("1");
+        notification.setContent("用户" + userId + ", 申请修改费率");
+        notificationService.save(notification);
+    }
+
+    @Override
+    public String getChannelId() {
+        return "4";
+    }
+
+    @Override
+    public MerchantRateNew getDefaultRate() {
+        MerchantRateNew rateNew = new MerchantRateNew();
+        rateNew.setChannel(4);
+        rateNew.setWxRate(38);
+        rateNew.setAliRate(38);
+        rateNew.setBankRate(38);
+        rateNew.setBankRateLarge(38);
+        return rateNew;
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/YsMercSplitServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/YsMercSplitServiceImpl.java
new file mode 100644
index 0000000..fbae46e
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/YsMercSplitServiceImpl.java
@@ -0,0 +1,387 @@
+package cn.pluss.platform.ys.impl;
+
+import cn.pluss.platform.api.SplitReq;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.merchantOrder.BaseMercSplitService;
+import cn.pluss.platform.util.DateUtils;
+import cn.pluss.platform.util.StringUtil;
+import cn.pluss.platform.yinsheng.ReqOldEntity;
+import cn.pluss.platform.yinsheng.YsOldSrcMerchantNo;
+import cn.pluss.platform.ys.*;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * TODO
+ * 银盛分账服务类
+ * @author crystal
+ * @date 2022/7/1 11:49
+ */
+@Service("ysMercSplitService")
+@Slf4j
+public class YsMercSplitServiceImpl implements BaseMercSplitService {
+
+    @Resource
+    private YsService ysService;
+
+    @Resource
+    private YsConfig ysConfig;
+
+    @Resource
+    private MerchantChannelStatusService merchantChannelStatusService;
+
+    /**
+     * 分账登记
+     * @param order
+     * @param detailList
+     * @return
+     */
+    @Override
+    public boolean split(MerchantOrderSplit order, List<MerchantOrderSplitDetail> detailList,MerchantChannelStatus channel) {
+        JSONObject reqData = new JSONObject();
+        JSONArray divList = new JSONArray(detailList.size());
+        reqData.put("out_trade_no",order.getOrderNumber());
+        reqData.put("payee_usercode",channel.getMerchantId());
+        reqData.put("total_amount",order.getOrderAmt());
+        //原订单是否参与分账 01是02否
+        reqData.put("is_divistion",MerchantOrderSplit.DEFAULT_IS_DIVISTION);
+        //是否重新分账
+        reqData.put("is_again_division",MerchantOrderSplit.DEFAULT_IS_AGAIN_DIVISION);
+        reqData.put("division_mode",order.getDivisionMode());
+        for (MerchantOrderSplitDetail detail:detailList) {
+            JSONObject result = new JSONObject();
+            result.put("division_mer_usercode",detail.getMerchantId());
+            if(SplitReq.DivisionMode.SCALE.getValue().equals(order.getDivisionMode())){
+                result.put("div_ratio",detail.getDivRatio());
+                detail.setFinalAmt(order.getOrderAmt().multiply(detail.getDivRatio()).setScale(2,BigDecimal.ROUND_HALF_UP));
+            }
+            if(SplitReq.DivisionMode.AMT.getValue().equals(order.getDivisionMode())){
+                result.put("div_amount",detail.getDivAmt());
+                detail.setFinalAmt(detail.getDivAmt());
+            }
+            result.put("is_chargeFee",detail.getIsChargeFee());
+            detail.setIsChargeFee(detail.getIsChargeFee());
+            divList.add(result);
+        }
+        reqData.put("div_list",divList);
+        JSONObject result = ysService.requestOldApiCommon(ysConfig.getOtherDomain(), reqData, YsService.TYPE_PAY, YsEnum.YS_SPLIT_ACCEPT,channel.getSrcMerchantNo());
+        String msg = result.getString("msg");
+        String sub_msg = result.getString("sub_msg");
+        String code = result.getString("code");
+        order.setRemark(StringUtil.isNotEmpty(sub_msg) ? sub_msg :msg);
+        if(YSConstants.SUCCESS_CODE.equals(code)){
+            String returnInfo = result.getString("retrunInfo");
+            String returnCode = result.getString("returnCode");
+            order.setDivStatusCode(returnCode);
+            order.setRemark(returnInfo);
+            if("0000".equals(returnCode)){
+                order.setDivStatus(1);
+                return true;
+            }
+            order.setDivStatus(-1);
+            return false;
+        }
+        log.error("【银盛分账登记】接口请求失败：订单号：{}，失败原因：{}",order.getOrderNumber(),result.getString("msg"));
+        return false;
+    }
+
+    /**
+     * 分账登记
+     * @param order
+     * @param settingList
+     * @param flag
+     * @return
+     */
+    @Override
+    public MerchantOrderSplit split(MerchantOrder order, List<MerchantSplitSetting> settingList,boolean flag) {
+        MerchantChannelStatus channel = merchantChannelStatusService.getByMerchantId(settingList.get(0).getChieMerchantId());
+        JSONObject reqData = new JSONObject();
+        reqData.put("out_trade_no",order.getOrderNumber());
+        reqData.put("payee_usercode",settingList.get(0).getChieMerchantId());
+        reqData.put("total_amount",order.getConsumeFee());
+        //原订单是否参与分账 01是02否
+        reqData.put("is_divistion",MerchantOrderSplit.DEFAULT_IS_DIVISTION);
+        //是否重新分账
+        reqData.put("is_again_division",MerchantOrderSplit.DEFAULT_IS_AGAIN_DIVISION);
+        JSONArray divList = new JSONArray(settingList.size());
+        reqData.put("division_mode",settingList.get(0).getDivisionMode());
+        MerchantOrderSplit splitOrder = new MerchantOrderSplit(order,channel,settingList.get(0).getDivisionMode(),settingList.get(0).getNotifyUrl());
+        List<MerchantOrderSplitDetail> detailList = new ArrayList<>(settingList.size());
+        BigDecimal scale = BigDecimal.ZERO;
+        for (MerchantSplitSetting setting:settingList) {
+            MerchantOrderSplitDetail detail = new MerchantOrderSplitDetail();
+            detail.setIsChargeFee(setting.getIsChargeFee());
+            JSONObject result = new JSONObject();
+            detail.setOrderNumber(order.getOrderNumber());
+            detail.setMerchantCode(setting.getDiviMerchantCode());
+            detail.setMerchantId(setting.getDiviMerchantId());
+            result.put("division_mer_usercode",setting.getDiviMerchantId());
+            if(SplitReq.DivisionMode.SCALE.getValue().equals(settingList.get(0).getDivisionMode())){
+                result.put("div_ratio",setting.getDivRatio());
+                detail.setDivRatio(setting.getDivRatio());
+                scale = scale.add(setting.getDivRatio());
+                detail.setFinalAmt(BigDecimal.valueOf(order.getConsumeFee()).multiply(setting.getDivRatio()).setScale(2,BigDecimal.ROUND_HALF_UP));
+            }
+            if(SplitReq.DivisionMode.AMT.getValue().equals(settingList.get(0).getDivisionMode())){
+                result.put("div_amount",setting.getDivAmt());
+                detail.setDivAmt(setting.getDivAmt());
+            }
+            result.put("is_chargeFee",!flag ? MerchantSplitSetting.YES_IS_CHARGEFEE : setting.getIsChargeFee());
+            detail.setIsChargeFee(!flag ? MerchantSplitSetting.YES_IS_CHARGEFEE : setting.getIsChargeFee());
+            divList.add(result);
+            detailList.add(detail);
+        }
+        if(SplitReq.DivisionMode.SCALE.getValue().equals(settingList.get(0).getDivisionMode()) && flag){
+            MerchantOrderSplitDetail chiDetail = new MerchantOrderSplitDetail();
+            chiDetail.setOrderNumber(order.getOrderNumber());
+            chiDetail.setMerchantCode(settingList.get(0).getChieMerchantCode());
+            chiDetail.setMerchantId(settingList.get(0).getChieMerchantId());
+            BigDecimal cxScale = BigDecimal.ONE.subtract(scale);
+            chiDetail.setDivRatio(cxScale);
+            JSONObject chiResult = new JSONObject();
+            chiResult.put("division_mer_usercode",settingList.get(0).getChieMerchantId());
+            chiResult.put("div_ratio",cxScale);
+            chiResult.put("is_chargeFee",MerchantSplitSetting.YES_IS_CHARGEFEE);
+            detailList.add(chiDetail);
+            divList.add(chiResult);
+            chiDetail.setIsChargeFee(MerchantSplitSetting.YES_IS_CHARGEFEE);
+            chiDetail.setFinalAmt(BigDecimal.valueOf(order.getConsumeFee()).multiply(cxScale).setScale(2,BigDecimal.ROUND_HALF_UP));
+        }
+        reqData.put("div_list",divList);
+        JSONObject result = ysService.requestOldApiCommon(ysConfig.getOtherDomain(), reqData, YsService.TYPE_PAY, YsEnum.YS_SPLIT_ACCEPT,channel.getSrcMerchantNo());
+        splitOrder.setPayTime(order.getTransDt());
+        splitOrder.setStatus(1);
+        splitOrder.setMercOrderNo(order.getMercOrderNo());
+        splitOrder.setDetailList(detailList);
+        if(YSConstants.SUCCESS_CODE.equals(result.getString("code"))){
+            String returnInfo = result.getString("retrunInfo");
+            String returnCode = result.getString("returnCode");
+            if("0000".equals(returnCode)){
+                splitOrder.setDivStatus(1);
+            }else{
+                splitOrder.setDivStatus(-1);
+            }
+            splitOrder.setDivStatusCode(returnCode);
+            splitOrder.setRemark(returnInfo);
+            return splitOrder;
+        }
+        splitOrder.setDivStatus(-1);
+        splitOrder.setDivStatusCode(result.getString("code"));
+        log.error("【银盛分账登记】接口请求失败：订单号：{}，失败原因：{}",order.getOrderNumber(),result.getString("msg"));
+        splitOrder.setRemark(result.getString("msg"));
+        return splitOrder;
+    }
+
+    /**
+     * 分账退款接口
+     * @param refund
+     * @return
+     */
+    @Override
+    public boolean refund(MerchantOrderSplitRefund refund) {
+        JSONObject req = new JSONObject(16);
+        req.put("out_trade_no",refund.getOrderNumber());
+        req.put("shopdate", DateUtils.toString(refund.getOrderTime(),"yyyyMMdd"));
+        req.put("refund_amount",refund.getRefundAmt());
+        req.put("refund_reason",refund.getRefundReason());
+        req.put("out_request_no",refund.getRefundNo());
+        req.put("is_division",MerchantOrderSplit.DEFAULT_IS_DIVISTION);
+        req.put("ori_division_mode",refund.getDivisionMode());
+        req.put("refund_split_info",refund.getRefundDivList());
+        req.put("order_div_list",refund.getOrderDivList());
+        JSONObject result = ysService.requestOldApiCommon(ysConfig.getCommonDomain(), req, YsService.TYPE_PAY, YsEnum.YS_SPLIT_REFUND, YsOldSrcMerchantNo.SYB.getValue());
+        String msg = result.getString("msg");
+        String sub_msg = result.getString("sub_msg");
+        refund.setRemark(StringUtil.isNotEmpty(sub_msg) ? sub_msg :msg);
+        if(YSConstants.SUCCESS_CODE.equals(result.getString("code"))){
+            refund.setStatus(1);
+            refund.setRefundTime(new Date());
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * 一般消费户退款接口
+     * @param refund
+     * @return
+     */
+    @Override
+    public boolean generalRefund(MerchantOrderSplitRefund refund) {
+        JSONObject req = new JSONObject(16);
+        req.put("out_trade_no",refund.getOrderNumber());
+        req.put("shopdate", DateUtils.toString(refund.getOrderTime(),"yyyyMMdd"));
+        req.put("refund_amount",refund.getRefundAmt());
+        req.put("refund_reason",refund.getRefundReason());
+        req.put("out_request_no",refund.getRefundNo());
+        req.put("is_division",MerchantOrderSplit.DEFAULT_IS_DIVISTION);
+        req.put("refund_split_info",refund.getRefundDivList());
+        JSONObject result = ysService.requestOldApiCommon(ysConfig.getCommonDomain(), req, YsService.TYPE_PAY, YsEnum.YS_SPLIT_GENERAL_REFUND,YsOldSrcMerchantNo.SYB.getValue());
+        String msg = result.getString("msg");
+        String sub_msg = result.getString("sub_msg");
+        String code = result.getString("code");
+        refund.setRemark(StringUtil.isNotEmpty(sub_msg) ? sub_msg : msg);
+        if(YSConstants.SUCCESS_CODE.equals(code)){
+            refund.setChannelRefundNo(result.getString("refundsn"));
+            refund.setStatus(1);
+            refund.setRefundTime(new Date());
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * 分账订单查询接口
+     * @param order
+     */
+    @Override
+    public List<MerchantOrderSplitDetail> splitQuery(MerchantOrderSplit order,List<MerchantOrderSplitDetail> detailList) {
+        JSONObject reqData = new JSONObject(10);
+        reqData.put("src_usercode",order.getMerchantId());
+        reqData.put("out_trade_no",order.getOrderNumber());
+        YsEnum ysEnum = YsEnum.YS_SPLIT_QUERY;
+        JSONObject response = ysService.requestOldApiCommon(ysConfig.getOtherDomain(), reqData, YsService.TYPE_OTHER, ysEnum,YsOldSrcMerchantNo.SYB.getValue());
+        String code = response.getString("code");
+        String msg = response.getString("msg");
+        if(!YSConstants.SUCCESS_CODE.equals(code)){
+            MsgException.throwException(msg);
+        }
+        JSONArray detailResults = response.getJSONArray("detailResults");
+        if(detailResults == null){
+            String note = response.getString("note");
+            log.info("【银盛分账查询】订单号:{},note:{},返回参数：{}",order.getOrderNumber(),note,response.toJSONString());
+            return null;
+        }
+        BigDecimal fee = response.getBigDecimal("fee");
+        String fee_payer = response.getString("fee_payer");
+        String divisionStatus = response.getString("division_status");
+        String divisionStatusCode = response.getString("division_status_code");
+        String note = response.getString("note");
+        order.setFee(fee);
+        order.setFeePayer(fee_payer);
+        order.setDivStatusCode(divisionStatusCode);
+        order.setRemark(note);
+        Integer divStatus = null;
+        switch (divisionStatus){
+            case "01":
+                divStatus = 1;
+                break;
+            case "02":
+                divStatus = 3;
+                break;
+            case "00":
+                divStatus = 2;
+                break;
+            case "03":
+                divStatus = 4;
+                break;
+            default:
+                divStatus = -1;
+                break;
+        }
+        order.setDivStatus(divStatus);
+        for (int i = 0 ; i < detailResults.size(); i++) {
+            JSONObject o = detailResults.getJSONObject(i);
+            MerchantOrderSplitDetail detail = detailList.get(i);
+            detail.setFinalAmt(o.getBigDecimal("division_amount"));
+        }
+        return detailList;
+    }
+
+    /**
+     * 分账退款查询
+     * @param qRefund
+     * @param srList
+     * @return
+     */
+    @Override
+    public List<MerchantOrderSplitDetail> refundQuery(MerchantOrderSplitRefund qRefund, List<MerchantOrderSplitDetail> srList) {
+        JSONObject reqData = new JSONObject(16);
+        reqData.put("out_request_no",qRefund.getRefundNo());
+        reqData.put("out_trade_no",qRefund.getOrderNumber());
+        YsEnum ysEnum = YsEnum.REFUND_PAY_QUERY;
+        JSONObject response = ysService.requestOldApiCommon(ysConfig.getCommonDomain(), reqData, YsService.TYPE_OTHER, ysEnum,YsOldSrcMerchantNo.SYB.getValue());
+        String code = response.getString("code");
+        String msg = response.getString("msg");
+        if(!YSConstants.SUCCESS_CODE.equals(code)){
+            MsgException.throwException(msg);
+        }
+        String refund_state = response.getString("refund_state");
+        switch (refund_state){
+            case "success":
+                qRefund.setStatus(1);
+            case "fail":
+                qRefund.setStatus(2);
+            default:
+                qRefund.setStatus(0);
+        }
+        String funds_state = response.getString("funds_state");
+        String desc = "";
+        switch (funds_state){
+            case "success":
+                desc = "退款成功";
+                break;
+            case "in_process":
+                desc = "退款处理中";
+                break;
+            case "fail_to_manual_deal":
+                desc = "退款失败，待人工处理，有疑问请联系商务经理";
+                break;
+            case "fail_due_manual_close":
+                desc = "退款失败，人工关闭，有疑问请联系商务经理";
+                break;
+            case "fail":
+                desc = "退款失败";
+                break;
+        }
+        qRefund.setChannelFundsDesc(desc);
+        qRefund.setChannelRefundState(refund_state);
+        qRefund.setChannelFundsState(funds_state);
+        String refund_channelfunds_dynamics = response.getString("refund_channelfunds_dynamics");
+        JSONArray parse = JSONArray.parseArray(refund_channelfunds_dynamics);
+        for (int i = 0 ; i < parse.size(); i++) {
+            JSONObject jsonObject = parse.getJSONObject(i);
+            BigDecimal refundamount = jsonObject.getBigDecimal("refundamount");
+            String state = jsonObject.getString("state");
+            String channelSendSn = jsonObject.getString("channelSendSn");
+            String channelRecvSn = jsonObject.getString("channelRecvSn");
+            MerchantOrderSplitDetail detail = srList.get(i);
+            detail.setRefundAmt(refundamount);
+            detail.setStatus(-1);
+            detail.setState(state);
+            detail.setChannelSendSn(channelSendSn);
+            detail.setChannelRecvSn(channelRecvSn);
+        }
+        return srList;
+    }
+
+    /**
+     * 商户提现
+     * @param order
+     */
+    @Override
+    public void withdraw(MerchantOrderSplit order, MerchantChannelStatus channel) {
+        JSONObject reqData = new JSONObject(16);
+        reqData.put("out_trade_no",order.getOrderNumber());
+        reqData.put("merchant_usercode",channel.getMerchantId());
+        reqData.put("currency","CNY");
+        reqData.put("total_amount",order.getOrderAmt());
+        reqData.put("subject","发起提现");
+        reqData.put("shopdate",DateUtils.toString(order.getCreateTime(),"yyyyMMdd"));
+        reqData.put(ReqOldEntity.VERSION_NAME,ReqOldEntity.VERSION_3_1);
+        YsEnum ysEnum = YsEnum.YS_MERCHANT_WITHDRAW_ACCEPT;
+        JSONObject response = ysService.requestOldApiCommon(ysConfig.getOtherDomain(), reqData, YsService.TYPE_PAY, ysEnum, channel.getSrcMerchantNo());
+        String code = response.getString("code");
+        String msg = response.getString("msg");
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/YsServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/YsServiceImpl.java
new file mode 100644
index 0000000..885bf02
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/YsServiceImpl.java
@@ -0,0 +1,233 @@
+package cn.pluss.platform.ys.impl;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.util.*;
+import cn.pluss.platform.yinsheng.ReqEntity;
+import cn.pluss.platform.yinsheng.ReqOldEntity;
+import cn.pluss.platform.yinsheng.RespEntity;
+import cn.pluss.platform.ys.*;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import lombok.val;
+import org.springframework.core.io.ByteArrayResource;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Service;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.Map;
+
+/**
+ * 银盛通用接口实现类
+ *
+ * @DATE 2021-06-21
+ */
+@Service("ysService")
+@Slf4j
+@RequiredArgsConstructor
+public class YsServiceImpl implements YsService {
+
+    private final RestTemplate restTemplate;
+
+    private final YsConfig ysConfig;
+
+    private final YsOldConfig ysOldConfig;
+
+    @Override
+    public JSONObject requestApi(String url, JSONObject reqData, String type) {
+        try {
+            ReqEntity request = new ReqEntity();
+            if (YsService.TYPE_PAY.equals(type)) {
+                request.setSrcMerchantNo(ysConfig.getSrcMerchantNo());
+            } else {
+                request.setAgentNo(ysConfig.getAgentNo());
+            }
+            request.setBizReqJson(reqData.toJSONString());
+            HttpHeaders headers = new HttpHeaders();
+            headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
+            headers.add("User-Agent",
+                    "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36");
+
+            String signContent = SignUtils.getYSSignContent(JSONObject.parseObject(JSONObject.toJSONString(request)));
+
+            request.setSign(RSAUtils.sign(ysConfig.getPriKey(), signContent));
+            log.debug("请求报文==============>" + JSONObject.toJSONString(request));
+            val multiValueMap = MapUtils.map2MultiValueMap((JSONObject) JSON.toJSON(request));
+
+            HttpEntity<MultiValueMap<String, Object>> reqEntity = new HttpEntity<>(multiValueMap, headers);
+            JSONObject responseJson = restTemplate.postForObject(url, reqEntity, JSONObject.class);
+
+            if (responseJson == null) {
+                throw new MsgException("请求失败，请求状态异常");
+            }
+            log.info(responseJson.toJSONString());
+            return responseJson;
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new MsgException("银盛接口异常");
+        }
+    }
+
+    @Override
+    public JSONObject requestApiCommon(String url, JSONObject reqData, String type) {
+        try {
+            ReqEntity request = new ReqEntity();
+            if (YsService.TYPE_PAY.equals(type)) {
+                request.setSrcMerchantNo(ysConfig.getSrcMerchantNo());
+            } else {
+                request.setAgentNo(ysConfig.getAgentNo());
+            }
+            request.setBizReqJson(reqData.toJSONString());
+            HttpHeaders headers = new HttpHeaders();
+            headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
+            headers.add("User-Agent",
+                    "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36");
+
+            val bizContent = JSONObject.toJSONString(request);
+            String signContent = SignUtils.getYSSignContent(JSONObject.parseObject(bizContent));
+
+            request.setSign(RSAUtils.sign(ysConfig.getPriKey(), signContent));
+            // 上传图片的请求参数不打印，日志太多了
+            if (!url.equals(YsConfig.IMG_UPLOAD) && !url.equals(YsConfig.WX_AUTH)) {
+                log.info("请求报文==============>" + bizContent);
+            }
+
+            log.info("请求地址：{}", url);
+            val multiValueMap = MapUtils.map2MultiValueMap((JSONObject) JSON.toJSON(request));
+
+//            if (url.equals(YsConfig.java.MER_AUDIT)) {
+//                throw new MsgException("测试请求拦截");
+//            }
+
+            HttpEntity<MultiValueMap<String, Object>> reqEntity = new HttpEntity<>(multiValueMap, headers);
+            RespEntity resp = restTemplate.postForObject(url, reqEntity, RespEntity.class);
+
+            checkSign((JSONObject) JSON.toJSON(resp));
+
+            if (resp == null) {
+                throw new MsgException("请求失败，请求状态异常");
+            }
+            log.info(JSON.toJSONString(resp));
+
+            if (!RespEntity.SUCCESS.equals(resp.getResponseCode())) {
+                log.info(JSON.toJSONString(multiValueMap));
+                throw new MsgException(resp.getResponseMeg());
+            }
+
+            return JSON.parseObject(resp.getBizResponseJson());
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new MsgException("银盛接口异常");
+        }
+    }
+
+    @Override
+    public boolean checkSign(JSONObject responseData) throws Exception {
+        String signContent = SignUtils.getYSSignContent(responseData);
+        String sign = responseData.getString("sign");
+        if (sign == null) {
+            return true;
+        }
+        return RSAUtils.checkSign(ysConfig.getPubKey(), signContent, sign);
+    }
+
+    @Override
+    public boolean checkSignOld(JSONObject responseData) throws Exception {
+        String signContent = SignUtils.getYSSignContent(responseData);
+        String sign = responseData.getString("signValue");
+        return RSAUtils.checkSign(ysOldConfig.getOldPubKey(), signContent, sign);
+    }
+
+    /**
+     * 旧版
+     *
+     * @param responseData
+     * @param ysEnum
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public boolean oldCheckSign(JSONObject responseData, YsEnum ysEnum,String srcMerchantNo) {
+        try {
+            JSONObject respData = responseData.getJSONObject(ysEnum.getResponseParam());
+            String sign = responseData.getString("sign");
+            String signContent = SignUtils.getYSSignContent(respData);
+            return RSAUtils.checkSign(ysConfig.getPubKeyVal(srcMerchantNo), signContent, sign);
+        } catch (Exception e) {
+            e.printStackTrace();
+            MsgException.throwException("银盛接口签名异常！");
+            return false;
+        }
+    }
+
+
+    /**
+     * 旧版银盛通用支付接口
+     *
+     * @param url
+     * @param reqData
+     * @param ysEnum
+     * @return
+     */
+    @Override
+    public JSONObject requestOldApiCommon(String url, JSONObject reqData, String type, YsEnum ysEnum,String srcMerchantNo) {
+        return requestOldApiCommon(url, reqData, type, ysEnum, null,srcMerchantNo);
+    }
+
+    @Override
+    public JSONObject requestOldApiCommon(String url, JSONObject reqData, String type, YsEnum ysEnum, Map<String, ByteArrayResource> fileMap,String srcMerchantNo) {
+        try {
+            ReqOldEntity request = new ReqOldEntity(reqData.getString(ReqOldEntity.VERSION_NAME));
+            reqData.remove(ReqOldEntity.VERSION_NAME);
+            request.setPartner_id(srcMerchantNo);
+            request.setMethod(ysEnum.getApiName());
+            request.setBiz_content(reqData.toJSONString());
+            if (YsService.TYPE_PAY.equals(type)) {
+                request.setNotify_url(ParametersUtil.domain + "/wap/notify/old/ysCallBack");
+            }
+            if(StringUtil.isNotEmpty(reqData.getString("returnUrl"))){
+                request.setReturn_url(reqData.getString("returnUrl"));
+                reqData.remove("returnUrl");
+            }
+            String signContent = SignUtils.getYSSignContent(JSONObject.parseObject(JSONObject.toJSONString(request)));
+            log.info("========>【银盛】接口请求签名串为:{}<============", signContent);
+            request.setSign(RSAUtils.sign(ysConfig.getPrikeyVal(srcMerchantNo), signContent));
+
+            HttpHeaders headers = new HttpHeaders();
+            headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
+            headers.add("User-Agent",
+                    "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36");
+
+            log.info("请求地址：{}", url);
+            log.info("请求报文==============>:{}", JSONObject.toJSONString(request));
+
+            val multiValueMap = MapUtils.map2MultiValueMap((JSONObject) JSON.toJSON(request));
+
+            if (fileMap != null && !fileMap.isEmpty()) {
+                for (Map.Entry<String, ByteArrayResource> entry : fileMap.entrySet()) {
+                    multiValueMap.add(entry.getKey(), entry.getValue());
+                }
+            }
+
+            HttpEntity<MultiValueMap<String, Object>> reqEntity = new HttpEntity<>(multiValueMap, headers);
+
+            JSONObject resp = restTemplate.postForObject(url, reqEntity, JSONObject.class);
+
+            if (resp == null) {
+                throw new MsgException("请求失败，请求状态异常");
+            }
+            log.info("=========>【银盛】接口请求返回参数：{}<==================", resp.toJSONString());
+
+            oldCheckSign(resp, ysEnum,srcMerchantNo);
+
+            return resp.getJSONObject(ysEnum.getResponseParam());
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new MsgException(e.getMessage());
+        }
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/v20210929/AbstractYsImgUploadService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/v20210929/AbstractYsImgUploadService.java
new file mode 100644
index 0000000..de3e532
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/v20210929/AbstractYsImgUploadService.java
@@ -0,0 +1,155 @@
+package cn.pluss.platform.ys.impl.v20210929;
+
+import cn.pluss.platform.channel.MerchProtocolService;
+import cn.pluss.platform.channel.MerchantAuditService;
+import cn.pluss.platform.entity.MerchantImage;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.merchantChannelImg.MerchantChannelImgService;
+import cn.pluss.platform.util.*;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.ByteArrayResource;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.Base64;
+import java.util.Objects;
+import java.util.UUID;
+
+@Slf4j
+public abstract class AbstractYsImgUploadService implements MerchProtocolService, MerchantAuditService {
+
+    @Autowired
+    private YsConfigV2 ysConfig;
+
+    @Autowired
+    protected RestTemplate restTemplate;
+
+    @Autowired
+    protected MerchantChannelImgService channelImgService;
+
+    @Override
+    public void imageUpload(String url, String picType) {
+        MerchantImage merchantImage = new MerchantImage().setPicUrl(url);
+        imageUpload(merchantImage);
+    }
+
+    /**
+     * @param merchantImage 图片信息
+     */
+    @Override
+    public void imageUpload(MerchantImage merchantImage) {
+        String imgBase64Data = FileUtil.getBase64FromUrl(merchantImage.getPicUrl());
+
+        try {
+            if (!Objects.equals(merchantImage.getPhotoType(), MerchantImage.ImageType.BUSINESS_LICENSE)) {
+                log.debug("压缩图片");
+            } else {
+                log.debug("压缩图片 - 营业执照");
+            }
+            imgBase64Data = Base64Util.compressPic(imgBase64Data, 1024);
+        } catch (Exception e) {
+            LogExceptionUtils.printStack(log, e, null);
+            throw new MsgException("上传文件失败");
+        }
+
+        String picType = imgTypeTransform(merchantImage.getPhotoType());
+        if (picType == null) {
+            // 没有找到对应的图片类型，即不需要保存
+            return;
+        }
+
+        JSONObject param = new JSONObject();
+        param.put("sysFlowId", merchantImage.getPhotoUrl());
+        param.put("picType", picType);
+        try {
+            byte[] bytes = Base64.getDecoder().decode(imgBase64Data);
+            ByteArrayResource byteArrayResource = new ByteArrayResource(bytes) {
+                @Override
+                public String getFilename() {
+                    return picType + ".png";
+                }
+            };
+            String encryptOriginData = SignUtils.getSignContent(param);
+            log.info("加签源数据==============>" + encryptOriginData);
+            param.put("signValue", RSAUtils.sign(ysConfig.getPriKeyV2(), encryptOriginData));
+            param.put("file", byteArrayResource);
+        } catch (Exception e) {
+            log.error("数据异常" + e.getMessage());
+        }
+
+
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.MULTIPART_FORM_DATA);
+
+        int retryTimes = 3;
+        while (true) {
+            param.put("reqFlowId", "YS" + System.currentTimeMillis() % 10000000 + UUID.randomUUID().toString().substring(4, 7));
+
+            //        headers.add("User-Agent",
+            //                "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36");
+
+            MultiValueMap<String, Object> reqParam = MapUtils.map2MultiValueMap(param);
+            HttpEntity<MultiValueMap<String, Object>> reqEntity = new HttpEntity<>(reqParam, headers);
+
+            try {
+                String respStr = restTemplate.postForObject(YsConfigV2.IMG_UPLOAD, reqEntity, String.class);
+                log.info("result : " + respStr);
+                JSONObject resultJson = JSON.parseObject(respStr);
+                JSONObject data = resultJson.getJSONObject("data");
+                if (!"00".equals(data.getString("code"))) {
+                    throw new MsgException(data.getString("note"));
+                }
+                break;
+            } catch (Exception e) {
+                log.info(e.getClass().getName());
+                // 超时后自动重试
+                retryTimes--;
+                if (retryTimes <= 0) {
+                    throw new MsgException("图片3次上传失败：" + e.getMessage());
+                }
+            }
+        }
+    }
+
+    @Override
+    public String imgTypeTransform(String imageType) {
+        switch (imageType) {
+            case MerchantImage.ImageType.BUSINESS_LICENSE:
+                return "A001";
+            case MerchantImage.ImageType.IDCARD_FRONT:
+                return "A002";
+            case MerchantImage.ImageType.IDCARD_BACK:
+                return "A003";
+            case MerchantImage.ImageType.BANK_CARD_FRONT:
+                return "A004";
+            case MerchantImage.ImageType.BANK_CARD_BACK:
+                return "A005";
+            case MerchantImage.ImageType.SHOP_FRONT_DOOR:
+                return "A006";
+            case MerchantImage.ImageType.STORE_INTERIOR_PHOTO:
+                return "A007";
+            case MerchantImage.ImageType.CASH_DESK_PHOTO:
+                return "A008";
+            case MerchantImage.ImageType.HAND_IDCARD_PHOTO:
+                return "A009";
+            case MerchantImage.ImageType.ACCOUNT_PERMITS:
+                return "A011";
+            case MerchantImage.ImageType.SETTLE_IDCARD_FRONT:
+                return "A013";
+            case MerchantImage.ImageType.SETTLE_IDCARD_BACK:
+                return "A014";
+            case MerchantImage.ImageType.NON_LEG_SETTLE_AUTH:
+                return "B005";
+            case MerchantImage.ImageType.HAND_NON_LEG_SETTLE_AUTH:
+                return "B004";
+            default:
+                return null;
+        }
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/v20210929/AbstractYsResultService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/v20210929/AbstractYsResultService.java
new file mode 100644
index 0000000..a13bd4d
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/v20210929/AbstractYsResultService.java
@@ -0,0 +1,290 @@
+package cn.pluss.platform.ys.impl.v20210929;
+
+import cn.pluss.platform.channel.MerchantCertService;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchant.MerchantCashPlaceService;
+import cn.pluss.platform.merchant.MerchantRateNewService;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.subMerchant.SubMerchantService;
+import cn.pluss.platform.task.IMerAuditHandler;
+import cn.pluss.platform.task.MercIncomSetRateHandler;
+import cn.pluss.platform.task.SxfMerAuditHandler;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.util.LogExceptionUtils;
+import cn.pluss.platform.yinsheng.v20210929.ReqMethod;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+
+import java.util.Map;
+
+/**
+ * @author DJH
+ */
+@Slf4j
+public abstract class AbstractYsResultService extends AbstractYsImgUploadService {
+
+    @Autowired
+    protected MerchantChannelStatusService mcsService;
+
+    @Autowired
+    @Lazy
+    private IMerAuditHandler ysMerAuditV2Handler;
+
+    @Autowired
+    private YsServiceV2 ysServiceV2;
+
+    @Autowired
+    private SubMerchantService smService;
+
+    @Autowired
+    private MerchantCertService ysCertV2Service;
+
+    @Autowired
+    private UserAppService uaService;
+
+    @Autowired
+    private SxfMerAuditHandler sxfMerAuditHandler;
+
+    @Autowired
+    private MerchantRateNewService rateNewService;
+
+    @Autowired
+    private MercIncomSetRateHandler mercIncomSetRateHandler;
+
+    @Autowired @Lazy
+    private MerchantBaseInfoService mbiService;
+
+    @Autowired @Lazy
+    private MerchantCashPlaceService cashPlaceService;
+
+    @Override
+    public JSONObject editMerchantCallback(JSONObject auditResult) throws Exception {
+        return null;
+    }
+
+    @Override
+    public JSONObject merchantAuditCallback(JSONObject auditResult) throws Exception {
+        ysMerAuditV2Handler.auditHandler(auditResult);
+        return null;
+    }
+
+    @Override
+    public JSONObject merchantAuditResult(Map<String, Object> param) throws Exception {
+        try {
+            JSONObject reqParam = new JSONObject();
+            reqParam.putAll(param);
+            JSONObject data = ysServiceV2.req(YsConfigV2.MER_RESULT, ReqMethod.MERCHANT_QUERY, reqParam);
+
+            String status = data.getString("status");
+
+            if (YsConstant.AuditStatus.AUDIT_FIRST_TRIAL_SUCCESS.getCode().equals(status)
+                    || YsConstant.AuditStatus.AUDIT_NO_AUDIT.getCode().equals(status)) {
+                firstTrial(data);
+            } else if (YsConstant.AuditStatus.AUDIT_SUCCESS.getCode().equals(status)) {
+                success(data);
+            } else if (YsConstant.AuditStatus.AUDIT_FIRST_TRIAL_FAIL.getCode().equals(status)) {
+                fail(data);
+            }
+
+        } catch (Exception ignored) {
+            ignored.printStackTrace();
+        }
+
+        return null;
+    }
+
+    /**
+     * 初审
+     */
+    private void firstTrial(JSONObject data) {
+        String status = data.getString("status");
+        // 初审完成，判断电子合同签约状态
+        String sysFlowId = data.getString("sysFlowId");
+        MerchantChannelStatus mcs = getMcsInfoByAppId(sysFlowId);
+        commonPropSet(mcs, data);
+
+        if (!mcs.getStatus().equals(MerchantChannelStatus.AUDIT_STATUS_SIGNED)
+//                && !YsConstant.AuditStatus.AUDIT_NO_AUDIT.getCode().equals(status)
+                && !"wait".equals(status)) {
+            reqMerProtocolStatus(mcs);
+        }
+    }
+
+    public void collectSubMerId(JSONArray thirdMercIdList, String mercId) {
+        try {
+            if (thirdMercIdList != null) {
+
+                int size = thirdMercIdList.size();
+                for (int i = 0; i < size; i++) {
+                    JSONObject thirdMerc = thirdMercIdList.getJSONObject(i);
+                    String flag = thirdMerc.getString("flag");
+                    String thirdMercId = thirdMerc.getString("thirdMercId");
+                    String type = thirdMerc.getString("type");
+
+                    SubMerchant subMerchant = new SubMerchant();
+                    subMerchant.setMerchantId(mercId);
+
+                    if ("wx".equals(flag)) {
+                        flag = "WX";
+                    }
+
+                    if ("alipay".equals(flag)) {
+                        flag = "ZFB";
+                    }
+
+                    if (StringUtils.isEmpty(thirdMercId)) {
+                        continue;
+                    }
+
+                    subMerchant.setSubMchId(thirdMercId + "_" + type);
+                    subMerchant.setSubMchType(flag);
+                    subMerchant.setChannelTypeId("4");
+                    smService.save(subMerchant);
+                }
+            }
+        } catch (Exception ignored) {
+        }
+    }
+
+    /**
+     * 开户成功
+     */
+    public void success(JSONObject data) {
+        String mercId = data.getString("mercId");
+
+        String sysFlowId = (String) data.get("sysFlowId");
+        MerchantChannelStatus mcs = getMcsInfoByAppId(sysFlowId);
+
+        if (mcs.getStatus().equals(MerchantChannelStatus.AUDIT_STATUS_SUCCESS)) {
+            // 已经进件通过的，不进行初次进件的逻辑操作
+            return;
+        }
+
+        mcs.setStatus(MerchantChannelStatus.AUDIT_STATUS_SUCCESS);
+        // 此处的状态是参考文档上的状态，接口未传该信息
+        commonPropSet(mcs, data);
+        mcsService.updateById(mcs);
+
+        // 开通D0
+        openOnlinePay(mcs);
+
+        // 微信认证
+        try {
+            ysCertV2Service.wxCert(mercId, mcs.getMerchantCode());
+        } catch (Exception e) {
+            log.debug("微信认证异常");
+            e.printStackTrace();
+        }
+
+        String pushMsg = "商家审核通过";
+        LambdaQueryWrapper<UserApp> qWrapper2 = Wrappers.lambdaQuery();
+        qWrapper2.eq(UserApp::getMerchantCode, mcs.getMerchantCode());
+        qWrapper2.eq(UserApp::getUserType, "promoter");
+        UserApp userApp = uaService.getOne(qWrapper2);
+        sxfMerAuditHandler.sendNotice(userApp, "收银呗审核通知", pushMsg, mcs.getApplicationId());
+
+        // 因为接口进件费率与默认进件费率不一致，所以这里将费率存下来
+        try {
+            MerchantRateNew merchRateNew = new MerchantRateNew();
+            merchRateNew.setWxRate(38);
+            merchRateNew.setAliRate(38);
+            merchRateNew.setBankRate(38);
+            merchRateNew.setBankRateLarge(37);
+            merchRateNew.setChannel(4);
+            merchRateNew.setUserId(userApp.getUserId() + "");
+            merchRateNew.setMerchantId(mcs.getMerchantId());
+            rateNewService.save(merchRateNew);
+        } catch (Exception e) {
+            log.info("费率信息保存失败");
+        }
+
+        // 统计当前进件商户的上级商户是否满足费率要求
+        try {
+            mercIncomSetRateHandler.installSuperMerchantRate(userApp);
+        } catch (Exception e) {
+            log.info("设置进件商户上级商户费率异常，异常信息:{}", e.getMessage());
+        }
+
+        // 以下代码为进件结果处理后的操作
+        // 创建线上店铺
+        try {
+            log.info("===================>进件回调，创建店铺开始,商户编号为:{}<=====================", mcs.getMerchantId());
+            sxfMerAuditHandler.createStore(mcs);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.info("创建店铺信息异常,异常信息:{}", e.getMessage());
+        }
+
+        try {
+            MerchantBaseInfo merchantBaseInfo = mbiService.getMerchantBaseInfoByMerchantCode(mcs.getMerchantCode());
+            if (StringUtils.isNotBlank(merchantBaseInfo.getUserId())) {
+                cashPlaceService.createDefaultCashPlace(Long.parseLong(merchantBaseInfo.getUserId()));
+            }
+        } catch (Exception e) {
+            LogExceptionUtils.printStack(log, e, "创建默认收银点失败,异常信息:{}");
+        }
+    }
+
+    /**
+     * 失败
+     */
+    public void fail(JSONObject data) {
+        String mercId = data.getString("mercId");
+        String remark = data.getString("nogoRemark");
+        String sysFlowId = data.getString("sysFlowId");
+        MerchantChannelStatus mcs = getMcsInfoByAppId(sysFlowId);
+
+        mcs.setRemark(remark);
+        mcs.setStatus(MerchantChannelStatus.AUDIT_STATUS_REJECT);
+        // 此处的状态是参考文档上的状态，接口未传该信息
+        commonPropSet(mcs, data);
+        mcsService.updateById(mcs);
+
+        LambdaQueryWrapper<UserApp> qWrapper2 = Wrappers.lambdaQuery();
+        qWrapper2.eq(UserApp::getMerchantCode, mcs.getMerchantCode());
+        qWrapper2.eq(UserApp::getUserType, "promoter");
+        UserApp userApp = uaService.getOne(qWrapper2);
+        String uniqueKey = sysFlowId + System.currentTimeMillis();
+        sxfMerAuditHandler.sendNotice(userApp, "收银呗审核通知", remark, uniqueKey);
+    }
+
+    private MerchantChannelStatus getMcsInfoByAppId(String applicationId) {
+        MerchantChannelStatus mcs = new MerchantChannelStatus();
+        mcs.setApplicationId(applicationId);
+        mcs.setChannel(4);
+        mcs = mcsService.getOne(new QueryWrapper<>(mcs));
+
+        MsgException.checkNull(mcs, "未获取到进件信息");
+        mcs = mcsService.getByIdLock(mcs.getId());
+
+        return mcs;
+    }
+
+    private void commonPropSet(MerchantChannelStatus mcs, JSONObject data) {
+        String mercId = data.getString("mercId");
+        String remark = data.getString("note1");
+        String status = data.getString("status");
+
+        mcs.setThirdStatus(status);
+        mcs.setRemark(remark);
+        mcs.setMerchantId(mercId);
+        if (mcs.getExtra() == null) {
+            mcs.setExtra(new JSONObject());
+        }
+        mcs.getExtra().putAll(data);
+    }
+
+    /**
+     * 开通D0
+     */
+    abstract void openOnlinePay(MerchantChannelStatus mcs);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/v20210929/YsAuditServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/v20210929/YsAuditServiceImpl.java
new file mode 100644
index 0000000..e4c9e41
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/v20210929/YsAuditServiceImpl.java
@@ -0,0 +1,771 @@
+package cn.pluss.platform.ys.impl.v20210929;
+
+import cn.pluss.platform.IdCardService;
+import cn.pluss.platform.dto.AccountDTO;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.AccountMapper;
+import cn.pluss.platform.mapper.BankCodeYsMapper;
+import cn.pluss.platform.mcc.MccInfoSortService;
+import cn.pluss.platform.mcc.MccInfoYsService;
+import cn.pluss.platform.mcc.MccReflectService;
+import cn.pluss.platform.merchant.AccountService;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantImage.MerchantImageService;
+import cn.pluss.platform.notice.NoticeService;
+import cn.pluss.platform.region.RegionReflectService;
+import cn.pluss.platform.ryx.RyxConstants;
+import cn.pluss.platform.user.impl.GeneralPushUtil;
+import cn.pluss.platform.userInfo.UserInfoService;
+import cn.pluss.platform.util.*;
+import cn.pluss.platform.yinsheng.v20210929.ReqMethod;
+import cn.pluss.platform.yinsheng.v20210929.RespEntity;
+import cn.pluss.platform.ys.YSConstants;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.jetbrains.annotations.NotNull;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.ByteArrayResource;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.TransactionStatus;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionCallbackWithoutResult;
+import org.springframework.transaction.support.TransactionTemplate;
+import org.springframework.util.MultiValueMap;
+
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.concurrent.ExecutorService;
+
+/**
+ * @author djh
+ */
+@Slf4j
+@Service("ysAuditServiceV2")
+public class YsAuditServiceImpl extends AbstractYsResultService {
+
+    @Autowired
+    private GeneralPushUtil generalPushUtil;
+
+    @Autowired
+    private MerchantBaseInfoService mbiService;
+
+    @Autowired
+    private AccountService accountService;
+
+    @Resource
+    private AccountMapper accountMapper;
+
+    @Autowired
+    private IdCardService idCardService;
+
+    @Autowired
+    private RegionReflectService regionReflectService;
+
+    @Autowired
+    private MccReflectService mccReflectService;
+
+    @Autowired
+    private MccInfoYsService mccInfoYsService;
+
+    @Resource
+    private BankCodeYsMapper bankCodeYsMapper;
+
+    @Autowired
+    private MccInfoSortService mccInfoSortService;
+
+    @Autowired
+    private MerchantImageService miService;
+
+    @Autowired
+    private YsServiceV2 ysServiceV2;
+
+    @Autowired
+    private YsConfigV2 ysConfig;
+
+    @Autowired
+    private NoticeService noticeService;
+
+    @Autowired
+    private UserInfoService uiService;
+
+    @Autowired
+    private YsAuditServiceImpl ysAuditServiceV2;
+
+    @Autowired
+    private ExecutorService executorService;
+
+    @Autowired
+    private TransactionTemplate transactionTemplate;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRES_NEW)
+    public void merchantAudit(String userId, boolean isFailCheck) {
+
+        preCheck(userId);
+        try {
+            ysAuditServiceV2.step1(userId);
+            executorService.execute(() -> {
+                try {
+                    ysAuditServiceV2.step2(userId);
+                    ysAuditServiceV2.step3(userId);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    MerchantBaseInfo mbi = mbiService.getMerchantBaseInfoByUserId(userId);
+                    MerchantChannelStatus mcs = mcsService.getByMerchantCode(mbi.getMerchantCode(), 4);
+
+                    if (mcs != null && mcs.getChannel() == 4) {
+                        mcs.setStatus(MerchantChannelStatus.AUDIT_STATUS_EXAMINING);
+                        mcs.setThirdStatus(MerchantChannelStatus.AUDIT_THIRD_STATUS_WAITING);
+                        mcs.setRemark("银盛审核失败: " + e.getMessage());
+                        mcs.setUpdateTime(new Date());
+                        mcsService.updateById(mcs);
+                    }
+                }
+            });
+        } catch (Exception e) {
+            e.printStackTrace();
+            MerchantBaseInfo mbi = mbiService.getMerchantBaseInfoByUserId(userId);
+            MerchantChannelStatus mcs = mcsService.getByMerchantCode(mbi.getMerchantCode(), 4);
+
+            if (mcs != null && Objects.equals(mcs.getChannel(), 4)) {
+                mcs.setStatus(MerchantChannelStatus.AUDIT_STATUS_EXAMINING);
+                mcs.setThirdStatus(MerchantChannelStatus.AUDIT_THIRD_STATUS_WAITING);
+                mcs.setRemark("银盛审核失败: " + e.getMessage());
+                mcs.setUpdateTime(new Date());
+
+                // 这里将驳回的信息放入新的事务中，防止被回滚
+                transactionTemplate.execute(new TransactionCallbackWithoutResult() {
+                    @Override
+                    protected void doInTransactionWithoutResult(@NotNull TransactionStatus status) {
+                        mcsService.updateById(mcs);
+                    }
+                });
+            }
+
+            throw e;
+        }
+
+    }
+
+    public void preCheck(String userId) {
+        MerchantBaseInfo mbi = mbiService.getMerchantBaseInfoByUserId(userId);
+        LambdaQueryWrapper<MerchantChannelStatus> qWrapper = Wrappers.lambdaQuery();
+        qWrapper.eq(MerchantChannelStatus::getMerchantCode, mbi.getMerchantCode());
+        qWrapper.eq(MerchantChannelStatus::getVirChannelFlag, Account.CHANNEL_TYPE_D1);
+        MerchantChannelStatus existD1 = mcsService.getOne(qWrapper);
+
+        if (existD1 != null && !MerchantChannelStatus.AUDIT_STATUS_SUCCESS.equals(existD1.getStatus())
+                && !MerchantChannelStatus.AUDIT_STATUS_SIGNED.equals(existD1.getStatus())
+                && !MerchantChannelStatus.AUDIT_STATUS_WAITING_SIGN.equals(existD1.getStatus())) {
+            throw new MsgException("当前D1通道存在未进件完成的的进件数据，不允许进件银盛");
+        }
+
+        if ("1".equals(mbi.getMerchantType())) {
+            int ysCount = accountMapper.selectYSAuditSmallCount(mbi.getUserId());
+            if (ysCount >= 2) {
+                MsgException.throwException("非营业执照商户同一结算人仅可申请两次实时到账");
+            }
+        }
+
+        qWrapper.clear();
+        qWrapper.eq(MerchantChannelStatus::getMerchantCode, mbi.getMerchantCode());
+        qWrapper.eq(MerchantChannelStatus::getVirChannelFlag, mbi.getMerchantCode());
+        MerchantChannelStatus existD0 = mcsService.getOne(qWrapper);
+
+        if (existD0 != null) {
+            existD0 = mcsService.getByIdLock(existD0.getId());
+
+            if (existD0.getStatus().equals(MerchantChannelStatus.AUDIT_STATUS_REJECT)) {
+                return;
+            }
+
+            if (existD0.getStatus().equals(MerchantChannelStatus.AUDIT_STATUS_EXAMINING)
+                && existD0.getThirdStatus().equals(MerchantChannelStatus.AUDIT_THIRD_STATUS_AUDITING)) {
+                throw new MsgException("当前商户已经在后台审核中");
+            }
+        }
+    }
+
+    /**
+     * 提交基本信息
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void step1(String userId) {
+        MerchantBaseInfo mbi = mbiService.getMerchantBaseInfoByUserId(userId);
+        MerchantChannelStatus mcs = mcsService.getByMerchantCode(mbi.getMerchantCode(), 4);
+        MsgException.checkNull(mcs, "商户暂未请求进件");
+        mcs.setChannel(4);
+
+        AccountDTO account = accountService.getRealAccount(userId, Account.CHANNEL_TYPE_D0);
+        IdCard legalIdCard = idCardService.getLegalIdCard(userId);
+        if (legalIdCard == null) {
+            legalIdCard = account.getIdcard();
+        }
+        JSONObject param = new JSONObject();
+        if (!"1".equals(mbi.getMerchantType())) {
+            param.put(YsConstant.BUSINESS_LICENCE, mbi.getBussAuthName());
+            param.put(YsConstant.BUSINESS_LICENCE_NO, mbi.getBussAuthNum());
+            param.put(YsConstant.BUSINESS_LICENCE_START, mbi.getBussAuthStartTime().replace("-", ""));
+            param.put(YsConstant.BUSINESS_LICENCE_LIMIT, YSConstants.getMerLicenseEnd(mbi.getBussAuthEndTime()));
+            param.put(YsConstant.REGISTERED_ADDRESS, mbi.getBussAuthAddress());
+        }
+        param.put(YsConstant.ALIAS, mbi.getAlias());
+        param.put(YsConstant.BUSINESS_ADDRESS, mbi.getAddress());
+
+        RegionCodeYs ysRegionCode = regionReflectService.getYsRegionCode(mbi.getProvince(), mbi.getCity(), mbi.getDistrict());
+        param.put(YsConstant.MERC_PROV, ysRegionCode.getProvince());
+        param.put(YsConstant.MERC_CITY, ysRegionCode.getCity());
+        param.put(YsConstant.MERC_AREA, StringUtils.isEmpty(ysRegionCode.getArea()) ? ysRegionCode.getCity() : ysRegionCode.getArea());
+        param.put(YsConstant.LEGAL_PERSON_NAME, legalIdCard.getCertName());
+        param.put(YsConstant.LEGAL_PERSON_ID, legalIdCard.getCertNo());
+        param.put(YsConstant.LEGAL_PERSON_START, YSConstants.getIdCardLongExpire(legalIdCard.getCertStartTime()));
+        param.put(YsConstant.LEGAL_PERSON_LIMIT, YSConstants.getIdCardLongExpire(legalIdCard.getCertEndTime()));
+        param.put(YsConstant.LEGAL_PERSON_PHONE, mbi.getContactMobile());
+        param.put(YsConstant.ACCOUNT_PERSON_NAME, account.getIdcard().getCertName());
+        param.put(YsConstant.ACCOUNT_PERSON_ID, account.getIdcard().getCertNo());
+        param.put(YsConstant.ACCOUNT_CARD_NO, account.getBankCard().getBankCardNo());
+        param.put(YsConstant.ACCOUNT_CARD_NAME, account.getBankCard().getBankHolder());
+        RegionCodeYs bankRegion = regionReflectService.getYsRegionCode(account.getBankCard());
+        param.put(YsConstant.BANK_PROVINCE, bankRegion.getProvince());
+        param.put(YsConstant.BANK_CITY, bankRegion.getCity());
+
+        if (!StringUtils.isEmpty(bankRegion.getArea())) {
+            param.put(YsConstant.BANK_AREA, bankRegion.getArea());
+        }
+
+        BankCodeYs bankCodeYs = bankCodeYsMapper.selectByContactLine(account.getBankCard().getContactLine());
+        MsgException.checkNull(bankCodeYs, "银盛通道未找到对应的支行信息, 请重新选择支行");
+        param.put(YsConstant.BANK_NAME, bankCodeYs.getBankName());
+        param.put(YsConstant.BANK_TYPE, bankCodeYs.getBankType());
+        param.put(YsConstant.BANK_BRANCH_TYPE, bankCodeYs.getContactLine());
+        param.put(YsConstant.BANK_BRANCH_NAME, bankCodeYs.getBranchName());
+        param.put(YsConstant.CONTACTS_NAME, account.getIdcard().getCertName());
+        UserInfo ui = uiService.getById(userId);
+        param.put(YsConstant.CONTACTS_PHONE, ui.getPhone().substring(0, 11));
+        param.put(YsConstant.CONTACTS_EMAIL, "18062761507@163.com");
+        param.put(YsConstant.WECHAT_SIGN_RATE, "0.38");
+        param.put(YsConstant.WECHAT_SIGN_MIN, "1");
+        param.put(YsConstant.ALIPAY_SIGN_RATE, "0.38");
+        param.put(YsConstant.ALIPAY_SIGN_MIN, "1");
+        param.put(YsConstant.CREDIT_RATE_1, "0.61");
+        param.put(YsConstant.CREDIT_MIN_1, "1");
+        param.put(YsConstant.DEBIT_RATE_1, "0.61");
+        param.put(YsConstant.DEBIT_MIN_1, "1");
+        param.put(YsConstant.DEBIT_MAX_1, "999900");
+        param.put(YsConstant.CREDIT_RATE_2, "0.40");
+        param.put(YsConstant.CREDIT_MIN_2, "1");
+        param.put(YsConstant.DEBIT_RATE_2, "0.40");
+        param.put(YsConstant.DEBIT_MIN_2, "1");
+        param.put(YsConstant.DEBIT_MAX_2, "999900");
+        param.put(YsConstant.OPEN_POS_P, "0");
+        param.put(YsConstant.FAST_PAY, "0");
+        param.put(YsConstant.CODE_ADVANCE_OPEN, "1");
+        if (account.getSettleType().startsWith(Account.SETTLE_TYPE_PRIVATE_LEGAL)) {
+            param.put(YsConstant.CODE_LEGAL_PERSON_ACC, "1");
+        } else {
+            param.put(YsConstant.CODE_LEGAL_PERSON_ACC, "0");
+        }
+        param.put(YsConstant.CODE_ADVANCE_RATE, "0.10");
+        // 最低垫资费1角
+        param.put(YsConstant.CODE_ADVANCE_MIN, "1");
+        MccReflect mccReflect = mccReflectService.getYsMccReflect(mbi.getMcc());
+        MccInfoYs mccInfoYs = new MccInfoYs();
+        mccInfoYs.setMccCode(mccReflect.getMccCode());
+        mccInfoYs = mccInfoYsService.getOne(new QueryWrapper<>(mccInfoYs));
+        MsgException.checkNull(mccInfoYs, "对应的MCC缺少银盛商户类型");
+        MsgException.checkBlank(mccInfoYs.getType(), "对应的MCC缺少银盛商户类型");
+
+        if ("N".equals(mccInfoYs.getMicro()) && mbi.getMerchantType().equals(MerchantBaseInfo.MERCH_TYPE_MICRO)) {
+            throw new MsgException("小微不支持该mcc");
+        }
+
+        if ("N".equals(mccInfoYs.getIndividual()) && mbi.getMerchantType().equals(MerchantBaseInfo.MERCH_TYPE_INDIVIDUAL)) {
+            throw new MsgException("个体户不支持该mcc");
+        }
+
+        if ("N".equals(mccInfoYs.getCompan()) && mbi.getMerchantType().equals(MerchantBaseInfo.MERCH_TYPE_COMPANY)) {
+            throw new MsgException("企业不支持该mcc");
+        }
+
+        param.put(YsConstant.MCC_SUB_CD, mccInfoYs.getType());
+        param.put(YsConstant.MCC_CD, mccInfoYs.getMccCode());
+        param.put(YsConstant.INDUSTRY, mccInfoYs.getIndustry());
+        param.put(YsConstant.MCH_TYPE, mccInfoYs.getMchType());
+        param.put(YsConstant.CRP_GENDER, StringUtil.getSexFromCertNo(legalIdCard.getCertNo()));
+        MccInfoSort mccInfoSort = mccInfoSortService.getByMcc(mbi.getMcc());
+        param.put(YsConstant.CRP_PROFESSION, mccInfoSort.getCode());
+        param.put(YsConstant.CRP_ADDR, mbi.getAddress());
+        param.put(YsConstant.USER_TYPE, AuditUtils.getYsMerchantType(mbi.getMerchantType()));
+        param.put(YsConstant.LOWEST_STL_AMT, "1");
+        param.put(YsConstant.BANK_MOBILE, account.getBankCard().getPhone());
+        param.put(YsConstant.ACTUAL_MANAGER, mbi.getContactName());
+        param.put(YsConstant.CERT_TYPE, "00");
+        param.put(YsConstant.MERC_LVL, "1");
+        param.put(YsConstant.CONTACTS_ADDR, mbi.getAddress());
+        if (account.getSettleType().equals(Account.SETTLE_TYPE_CORPORATE)) {
+            param.put(YsConstant.BALANCE_ACC_TYPE, "21");
+        } else {
+            param.put(YsConstant.BALANCE_ACC_TYPE, "11");
+        }
+        param.put(YsConstant.EXPANDING_MANAGER, "收银呗");
+
+        // 这里在进件之前再加一次校验
+        preCheck(userId);
+        JSONObject data = ysServiceV2.req(YsConfigV2.MER_AUDIT, ReqMethod.MERCHANT_ADD, param);
+        RespEntity respEntity = JSON.toJavaObject(data, RespEntity.class);
+        if (!"00".equals(respEntity.getCode())) {
+            throw new MsgException(respEntity.getNote());
+        }
+
+        mcs.setApplicationId(respEntity.getSysFlowId());
+        mcs.setThirdStatus(MerchantChannelStatus.AUDIT_THIRD_STATUS_AUDITING);
+        mcsService.updateById(mcs);
+    }
+
+    /**
+     * 上传图片
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void step2(String userId) {
+        AccountDTO account = accountService.getRealAccount(userId, Account.CHANNEL_TYPE_D0);
+
+        MerchantBaseInfo mbi = mbiService.getMerchantBaseInfoByUserId(userId);
+        MerchantChannelStatus mcs = mcsService.getByMerchantCode(mbi.getMerchantCode(), 4);
+
+        // 进件上传图片
+        MerchantImage merchantImage = new MerchantImage();
+        merchantImage.setMerchantCode(mbi.getMerchantCode());
+        List<MerchantImage> miList = miService.getListOfMerch(userId, Account.CHANNEL_TYPE_D0);
+
+        for (MerchantImage image : miList) {
+            image.setPhotoUrl(mcs.getApplicationId());
+            if (StringUtils.isEmpty(image.getPicUrl())) {
+                continue;
+            }
+
+            if (!"1".equals(mbi.getMerchantType()) && image.getPhotoType().equals(MerchantImage.ImageType.HAND_IDCARD_PHOTO)) {
+                // 非小微手持由营业执照图片代替
+                continue;
+            }
+
+            if (!"1".equals(mbi.getMerchantType())
+                    && Account.SETTLE_TYPE_CORPORATE.equals(account.getSettleType())
+                    && image.getPhotoType().equals(MerchantImage.ImageType.BANK_CARD_FRONT)) {
+                // 对公结算没有银行卡正面图
+                continue;
+            }
+
+            if ("1".equals(mbi.getMerchantType())) {
+                if (MerchantImage.ImageType.IDCARD_FRONT.equals(image.getPhotoType())) {
+                    // 小微没有法人身份证正面
+                    continue;
+                }
+
+                if (MerchantImage.ImageType.IDCARD_BACK.equals(image.getPhotoType())) {
+                    // 小微没有法人身份证反面
+                    continue;
+                }
+
+                // 小微法人信息用结算身份证信息
+                reusedPic(image, MerchantImage.ImageType.SETTLE_IDCARD_FRONT, MerchantImage.ImageType.IDCARD_FRONT);
+                reusedPic(image, MerchantImage.ImageType.SETTLE_IDCARD_BACK, MerchantImage.ImageType.IDCARD_BACK);
+            }
+
+            imageUpload(image);
+
+            if ("3".equals(mbi.getMerchantType()) && !Account.SETTLE_TYPE_CORPORATE.equals(account.getSettleType())) {
+                // 企业非对公，用营业执照代替开户许可证
+                reusedPic(image, MerchantImage.ImageType.BUSINESS_LICENSE, MerchantImage.ImageType.ACCOUNT_PERMITS);
+
+                if (MerchantImage.ImageType.ACCOUNT_PERMITS.equals(image.getPhotoType())) {
+                    continue;
+                }
+            }
+
+            if (!"1".equals(mbi.getMerchantType())) {
+                reusedPic(image, MerchantImage.ImageType.BUSINESS_LICENSE, MerchantImage.ImageType.HAND_IDCARD_PHOTO);
+
+                if (account.getSettleType().startsWith(Account.SETTLE_TYPE_PRIVATE_ILLEGAL)) {
+                    // 非法人对私，非法人结算函复用作手持
+                    reusedPic(image, MerchantImage.ImageType.NON_LEG_SETTLE_AUTH, MerchantImage.ImageType.HAND_NON_LEG_SETTLE_AUTH);
+                }
+            }
+
+            if (!"1".equals(mbi.getMerchantType()) && Account.SETTLE_TYPE_CORPORATE.equals(account.getSettleType())) {
+                // 对公结算，开户许可证复用银行卡正面
+                reusedPic(image, MerchantImage.ImageType.ACCOUNT_PERMITS, MerchantImage.ImageType.BANK_CARD_FRONT);
+                // 对公结算，开户许可证复用银行卡反面
+                reusedPic(image, MerchantImage.ImageType.ACCOUNT_PERMITS, MerchantImage.ImageType.BANK_CARD_BACK);
+            } else {
+                // 银行卡反面图
+                reusedPic(image, MerchantImage.ImageType.BANK_CARD_FRONT, MerchantImage.ImageType.BANK_CARD_BACK);
+            }
+        }
+    }
+
+    /**
+     * 符合条件的图片类型以新的图片类型再次使用
+     *
+     * @param src     商户图片数据
+     * @param reqType 需要的图片原始类型
+     * @param newType 新的图片类型
+     */
+    private void reusedPic(MerchantImage src, String reqType, String newType) {
+        if (src.getPhotoType().equals(reqType)) {
+            String originType = src.getPhotoType();
+            src.setPhotoType(newType);
+            imageUpload(src);
+            src.setPhotoType(originType);
+        }
+    }
+
+    /**
+     * 发起进件
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void step3(String userId) {
+        MerchantBaseInfo mbi = mbiService.getMerchantBaseInfoByUserId(userId);
+        MerchantChannelStatus mcs = mcsService.getByMerchantCode(mbi.getMerchantCode(), 4);
+
+        JSONObject data = new JSONObject();
+        data.put("sysFlowId", mcs.getApplicationId());
+        JSONObject resp = ysServiceV2.req(YsConfigV2.MER_APPLY, ReqMethod.MERCHANT_APPLY, data);
+
+        RespEntity respEntity = JSON.toJavaObject(resp, RespEntity.class);
+        mcs.setChannel(4);
+        mcs.setThirdStatus(YsConstant.AuditStatus.AUDIT_NO_AUDIT.getCode());
+
+        String url = respEntity.getSignUrl();
+        if (StringUtils.isNotEmpty(url)) {
+            // 有签约链接即代表初审通过
+            mcs.setThirdStatus(YsConstant.AuditStatus.AUDIT_FIRST_TRIAL_SUCCESS.getCode());
+            mcs.setStatus(MerchantChannelStatus.AUDIT_STATUS_WAITING_SIGN);
+            Notice notice = new Notice(1, -1, mbi.getUserId());
+            String uniqueKey = "YS_QY" + System.currentTimeMillis();
+            String title = "电子协议签约通知";
+            String content = "尊敬的客户您好，请点此通知完成签约意愿授权。请注意，同意授权后，支付通道才会进行商户资料审核，否则会一直等待审核。";
+
+            notice.setUniqueKey(uniqueKey);
+            notice.setNoticeCode(uniqueKey);
+            notice.setTitle(title);
+            notice.setUrl(url);
+            notice.setDesc(content);
+            noticeService.save(notice);
+
+            generalPushUtil.sendAllPlatByAlias(Collections.singletonList(mbi.getUserId()), title, content, "1");
+        }
+
+        mcs.setExtra(resp);
+        mcs.setUpdateTime(new Date());
+        mcsService.updateById(mcs);
+    }
+
+    @Override
+    public void merchantAuditCheck(String userId, boolean isFailCheck) {
+        // nothing to do
+    }
+
+    @Override
+    public void editMerchantAudit(String userId) {
+        MerchantBaseInfo mbi = mbiService.getMerchantBaseInfoByUserId(userId);
+        // 进件参数拼接
+        JSONObject paramMap = new JSONObject();
+        MerchantChannelStatus mcs = mcsService.getByMerchantCode(mbi.getMerchantCode(), 4);
+
+        if (4 != mcs.getChannel()) {
+            throw new MsgException("修改通道选择错误");
+        }
+        paramMap.put(RyxConstants.MER_IN_ID, mcs.getExtra().getString(RyxConstants.MER_IN_ID));
+
+        Account account = new Account().setUserId(userId).setChannelType(Account.CHANNEL_TYPE_D0);
+        account = accountService.getOne(new QueryWrapper<>(account));
+        JSONObject bak = account.getBak();
+
+        BankCard newBankCard = JSON.toJavaObject(bak, BankCard.class);
+        BankCodeYs bankCodeYs = bankCodeYsMapper.selectByContactLine(newBankCard.getContactLine());
+        RegionCodeYs bankRegion = regionReflectService.getYsRegionCode(newBankCard);
+        paramMap.put(YsConstant.MERC_ID, mcs.getMerchantId());
+        paramMap.put(YsConstant.ACCOUNT_CARD_NAME, newBankCard.getBankHolder());
+        paramMap.put(YsConstant.ACCOUNT_CARD_NO, newBankCard.getBankCardNo());
+        paramMap.put(YsConstant.BANK_PROVINCE, bankRegion.getProvince());
+        paramMap.put(YsConstant.BANK_CITY, bankRegion.getCity());
+        paramMap.put(YsConstant.BANK_NAME, bankCodeYs.getBankName());
+        paramMap.put(YsConstant.BANK_TYPE, bankCodeYs.getBankType());
+        paramMap.put(YsConstant.BANK_BRANCH_TYPE, bankCodeYs.getContactLine());
+        paramMap.put(YsConstant.BANK_BRANCH_NAME, bankCodeYs.getBankName());
+        paramMap.put(YsConstant.BANK_MOBILE, newBankCard.getPhone());
+
+        /*
+         * {
+         * 	"charset":"UTF-8",
+         * 	"data":"{\"note\":\"商户账户信息变更提交成功\",\"code\":\"00\",\"changeFlowId\":\"20211210164429426221368030546\"}",
+         * 	"method":"changeMerAccInfo",
+         * 	"msgCode":"Merchant",
+         * 	"reqFlowId":"YS5869563172",
+         * 	"signType":"RSA",
+         * 	"signValue":"mKw+LR01rDNnkinQ0twx6DBEJYiKOezqh0gy4OAaTpRpVea4G/2Ck23wDFlXXz3/UC0wYPmBOS2AhubpY4L4t8y3aTPS5HE7ZpB8eg3NxPg+1MoGU/9/PqI6SFgqdTYQfUXEZFbDZwBKVhZEc4bUXy76Md/V53SBeMLjW0FCElo=",
+         * 	"src":"ORG20211020190222",
+         * 	"ver":"1.0"
+         * }
+         */
+        JSONObject req = ysServiceV2.req(YsConfigV2.MER_BANK_CHANGE, ReqMethod.MERCHANT_ACCOUNT_CHANGE, paramMap);
+
+        String changeFlowId = req.getString("changeFlowId");
+        mcs.getExtra().put("changeFlowId", changeFlowId);
+        mcs.setStatus(MerchantChannelStatus.AUDIT_STATUS_DATA_EDIT);
+        mcsService.updateById(mcs);
+
+        // 上传银行卡正面图片
+        imageUploadEdit(newBankCard.getImgUrl(), "A004", changeFlowId);
+        // 上传银行卡反面图片
+        imageUploadEdit(newBankCard.getImgUrl(), "A005", changeFlowId);
+        // 上传一张空白图作为结算信息修改申请表
+        imageUploadEdit("https://www.shouyinbei.net/resources/images/upload/blank.png", "B008", changeFlowId);
+    }
+
+    /**
+     * 修改商户信息，上传图片
+     */
+    public void imageUploadEdit(String url, String picType, String changeFlowId) {
+        String imgBase64Data = FileUtil.getBase64FromUrl(url);
+
+        try {
+            if (!Objects.equals(url, MerchantImage.ImageType.BUSINESS_LICENSE)) {
+                log.debug("压缩图片");
+            } else {
+                log.debug("压缩图片 - 营业执照");
+            }
+            imgBase64Data = Base64Util.compressPic(imgBase64Data, 1024);
+        } catch (Exception e) {
+            LogExceptionUtils.printStack(log, e, null);
+            throw new MsgException("上传文件失败");
+        }
+
+        JSONObject param = new JSONObject();
+        param.put("changeFlowId", changeFlowId);
+        param.put("picType", picType);
+        try {
+            byte[] bytes = Base64.getDecoder().decode(imgBase64Data);
+            ByteArrayResource byteArrayResource = new ByteArrayResource(bytes) {
+                @Override
+                public String getFilename() {
+                    return picType + ".png";
+                }
+            };
+            String encryptOriginData = SignUtils.getSignContent(param);
+            log.info("加签源数据==============>" + encryptOriginData);
+            param.put("signValue", RSAUtils.sign(ysConfig.getPriKeyV2(), encryptOriginData));
+            param.put("picFile", byteArrayResource);
+        } catch (Exception e) {
+            log.error("数据异常" + e.getMessage());
+        }
+
+
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.MULTIPART_FORM_DATA);
+
+        int retryTimes = 3;
+        while (true) {
+            param.put("reqFlowId", "YS" + System.currentTimeMillis() % 10000000 + UUID.randomUUID().toString().substring(4, 7));
+
+            headers.add("User-Agent",
+                    "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36");
+
+            MultiValueMap<String, Object> reqParam = MapUtils.map2MultiValueMap(param);
+            HttpEntity<MultiValueMap<String, Object>> reqEntity = new HttpEntity<>(reqParam, headers);
+
+            try {
+                String respStr = restTemplate.postForObject(YsConfigV2.MER_EDIT_PIC_UPLOAD, reqEntity, String.class);
+                log.info("result : " + respStr);
+                JSONObject resultJson = JSON.parseObject(respStr);
+                JSONObject data = resultJson.getJSONObject("data");
+                if (!"00".equals(data.getString("code"))) {
+                    throw new MsgException(data.getString("note"));
+                }
+                break;
+            } catch (Exception e) {
+                log.info(e.getClass().getName());
+                // 超时后自动重试
+                retryTimes--;
+                if (retryTimes <= 0) {
+                    throw new MsgException("图片3次上传失败：" + e.getMessage());
+                }
+            }
+        }
+    }
+
+    @Override
+    public void checkSign(JSONObject receiveData) throws Exception {
+        // nothing to do
+    }
+
+    @Override
+    public JSONObject reqMerProtocolStatus(MerchantChannelStatus mcs) {
+        String sysSignFlowId = mcs.getExtra().getString("sysSignFlowId");
+        if (sysSignFlowId == null) {
+            // 缺少签约参数, 发起签约申请
+            sendProtocolMsg(mcs);
+            return new JSONObject();
+        }
+
+        JSONObject data = new JSONObject();
+        data.put("sysSignFlowId", sysSignFlowId);
+        JSONObject result = ysServiceV2.req(YsConfigV2.MER_PROTOCOL_STATUS, ReqMethod.MERCHANT_PROTOCOL_STATUS, data);
+
+        if ("2".equals(result.getString("signSts"))) {
+            // 已签约
+            mcs.setStatus(MerchantChannelStatus.AUDIT_STATUS_SIGNED);
+            mcsService.updateById(mcs);
+            return new JSONObject();
+        } else {
+            mcs.setStatus(MerchantChannelStatus.AUDIT_STATUS_WAITING_SIGN);
+            mcsService.updateById(mcs);
+            return new JSONObject();
+        }
+    }
+
+    @Override
+    public JSONObject sendProtocolMsg(MerchantChannelStatus mcs) {
+        JSONObject data = new JSONObject();
+        data.put("sysFlowId", mcs.getApplicationId());
+        data.put("isSendMsg", "N");
+        JSONObject respResult = ysServiceV2.req(YsConfigV2.MER_PROTOCOL_MSG, ReqMethod.MERCHANT_SEND_MSG, data);
+
+        MerchantBaseInfo mbi = mbiService.getMerchantBaseInfoByMerchantCode(mcs.getMerchantCode());
+        if ("00".equals(respResult.getString("code"))) {
+            mcs.getExtra().put("sysSignFlowId", respResult.getString("sysSignFlowId"));
+            mcs.getExtra().put("signUrl", respResult.getString("signUrl"));
+
+            Notice notice = new Notice(1, -1, mbi.getUserId());
+            String uniqueKey = "YS_QY" + System.currentTimeMillis();
+            String title = "电子协议签约通知";
+            String content = "尊敬的客户您好，请点此通知完成签约意愿授权。请注意，同意授权后，支付通道才会进行商户资料审核，否则会一直等待审核。";
+            String url = respResult.getString("signUrl");
+            notice.setUniqueKey(uniqueKey);
+            notice.setNoticeCode(uniqueKey);
+            notice.setTitle(title);
+            notice.setUrl(url);
+            notice.setDesc(content);
+            noticeService.save(notice);
+
+            generalPushUtil.sendAllPlatByAlias(Collections.singletonList(mbi.getUserId()), title, content, "1");
+
+            mcs.setStatus(MerchantChannelStatus.AUDIT_STATUS_WAITING_SIGN);
+            mcsService.updateById(mcs);
+        }
+
+        return new JSONObject();
+    }
+
+    /**
+     * 开通线上支付
+     */
+    @Override
+    public void openOnlinePay(MerchantChannelStatus mcs) {
+        if (StringUtils.isEmpty(mcs.getMerchantId())) {
+            throw new MsgException("开通线上支付失败, 缺少商编");
+        }
+
+        int attemptCount = 5;
+
+        Exception throwException = null;
+
+        while (attemptCount > 0) {
+            try {
+                JSONObject param = new JSONObject();
+                param.put(YsConstant.MERC_ID, mcs.getMerchantId());
+                param.put(YsConstant.ACC_ORG_NO, ysConfig.getSrc());
+                param.put(YsConstant.SCAN_SERVICE_OPEN, "1,2,3,4,5,6");
+                JSONObject rate = new JSONObject();
+                param.put(YsConstant.EASY_FEE_BEAN, rate);
+
+                // 支付宝
+                rate.put(YsConstant.R_SCAN_WX_FEE_TYPE, "1");
+                rate.put(YsConstant.R_SCAN_WX_FEE_RATE, "0.38");
+                rate.put(YsConstant.R_SCAN_WX_FEE_NUM, "1");
+                // 微信
+                rate.put(YsConstant.R_SCAN_ALI_FEE_TYPE, "1");
+                rate.put(YsConstant.R_SCAN_ALI_FEE_RATE, "0.38");
+                rate.put(YsConstant.R_SCAN_ALI_FEE_NUM, "1");
+                // 银联借记卡 > 1000
+                rate.put(YsConstant.R_SCAN_DEBIT_TYPE_1, "1");
+                rate.put(YsConstant.R_SCAN_DEBIT_NUM_1, "0.61");
+                rate.put(YsConstant.R_SCAN_DEBIT_MIN_1, "1");
+                rate.put(YsConstant.R_SCAN_DEBIT_MAX_1, "999900");
+
+                // 银联借记卡 ≤ 1000
+                rate.put(YsConstant.R_SCAN_DEBIT_TYPE_2, "1");
+                rate.put(YsConstant.R_SCAN_DEBIT_NUM_2, "0.38");
+                rate.put(YsConstant.R_SCAN_DEBIT_MIN_2, "1");
+                rate.put(YsConstant.R_SCAN_DEBIT_MAX_2, "999900");
+
+                // 银联贷记卡 > 1000
+                rate.put(YsConstant.R_SCAN_CREDIT_TYPE_1, "1");
+                rate.put(YsConstant.R_SCAN_CREDIT_NUM_1, "0.61");
+                rate.put(YsConstant.R_SCAN_CREDIT_MIN_1, "1");
+
+                // 银联贷记卡 ≤ 1000
+                rate.put(YsConstant.R_SCAN_CREDIT_TYPE_2, "1");
+                rate.put(YsConstant.R_SCAN_CREDIT_NUM_2, "0.38");
+                rate.put(YsConstant.R_SCAN_CREDIT_MIN_2, "1");
+
+                try {
+                    // 开通线上支付T1
+                    ysServiceV2.req(YsConfigV2.MER_T1_REQ, ReqMethod.MERCHANT_ONLINE_TRADING, param);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+
+                param = new JSONObject();
+                param.put(YsConstant.MERC_ID, mcs.getMerchantId());
+                param.put("opType", "1");
+                param.put("feeRate", "0.10");
+                param.put("feeMin", "1");
+
+                ysServiceV2.req(YsConfigV2.MER_D0_REQ, ReqMethod.MERCHANT_OPT_ONLINE_D0, param);
+                return;
+            } catch (MsgException e) {
+                throwException = e;
+                break;
+            } catch (Exception e) {
+                throwException = e;
+                attemptCount--;
+            }
+        }
+
+        String message = throwException.getMessage();
+        log.error("开通线上支付失败: {}", message);
+
+        // MerchantBaseInfo mbi = mbiService.getMerchantBaseInfoByMerchantCode(mcs.getMerchantCode());
+        // Notice notice = new Notice(1, -1, mbi.getUserId());
+        // String uniqueKey = "YS_D0TZ" + System.currentTimeMillis();
+        // String title = "系统通知";
+        // String content = "实时到账开通失败,";
+        //
+        // if (message != null && !message.startsWith("银盛接口异常")) {
+        //     content += message + ",";
+        // }
+        //
+        // content += "详情可联系客服进行咨询";
+        //
+        // notice.setUniqueKey(uniqueKey);
+        // notice.setNoticeCode(uniqueKey);
+        // notice.setTitle(title);
+        // notice.setDesc(content);
+        // noticeService.save(notice);
+        // GeneralPushUtil.sendAllPlatByAlias(Collections.singletonList(mbi.getUserId()), title, content, "1");
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/v20210929/YsCertServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/v20210929/YsCertServiceImpl.java
new file mode 100644
index 0000000..53a649f
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/v20210929/YsCertServiceImpl.java
@@ -0,0 +1,536 @@
+package cn.pluss.platform.ys.impl.v20210929;
+
+import cn.hutool.crypto.symmetric.DES;
+import cn.jiguang.common.utils.StringUtils;
+import cn.pluss.platform.IdCardService;
+import cn.pluss.platform.SubMerchantApplyOrderService;
+import cn.pluss.platform.channel.MerchantCertService;
+import cn.pluss.platform.dto.AccountDTO;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.enums.WxApplyStatus;
+import cn.pluss.platform.enums.WxAuthStatus;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.merchant.AccountService;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.merchantImage.MerchantImageService;
+import cn.pluss.platform.notice.NoticeService;
+import cn.pluss.platform.subMerchant.SubMerchantService;
+import cn.pluss.platform.util.FileUtil;
+import cn.pluss.platform.user.impl.GeneralPushUtil;
+import cn.pluss.platform.util.OssOperatUtil;
+import cn.pluss.platform.util.SendMsgUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.ByteArrayResource;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.*;
+
+/**
+ * @author djh
+ */
+@Slf4j
+@Service("ysCertV2Service")
+public class YsCertServiceImpl implements MerchantCertService {
+
+    @Autowired
+    private MerchantBaseInfoService mbiService;
+
+    @Autowired
+    private MerchantChannelStatusService mcsService;
+
+    @Autowired
+    private MerchantImageService miService;
+
+    @Autowired
+    private SubMerchantApplyOrderService applyOrderService;
+
+    @Autowired
+    private YsServiceV2 ysService;
+
+    @Autowired
+    private YsConfigV2 ysConfigV2;
+
+    @Autowired
+    private AccountService accountService;
+
+    @Autowired
+    private IdCardService idCardService;
+
+    @Autowired
+    private SendMsgUtil sendMsgUtil;
+
+    @Autowired
+    private NoticeService noticeService;
+
+    @Autowired
+    private SubMerchantService smService;
+
+    @Autowired
+    private GeneralPushUtil generalPushUtil;
+
+
+    /**
+     * 826521754990231   测试商编
+     *
+     * @param merchantId   商户渠道编号
+     * @param merchantCode 商户code
+     */
+    @Override
+    public void wxCert(String merchantId, String merchantCode) {
+        MerchantBaseInfo mbi = new MerchantBaseInfo();
+        mbi.setMerchantCode(merchantCode);
+        mbi = mbiService.getOne(new QueryWrapper<>(mbi));
+
+        MerchantImage merImg = new MerchantImage();
+        merImg.setMerchantCode(merchantCode);
+        merImg.setPhotoType(MerchantImage.ImageType.SHOP_FRONT_DOOR);
+        merImg = miService.getOne(Wrappers.query(merImg));
+
+        MerchantImage merImg2 = new MerchantImage();
+        merImg2.setMerchantCode(merchantCode);
+        merImg2.setPhotoType(MerchantImage.ImageType.STORE_INTERIOR_PHOTO);
+        merImg2 = miService.getOne(Wrappers.query(merImg2));
+
+        AccountDTO account = accountService.getAccount(mbi.getUserId());
+
+        String token;
+        try {
+            JSONObject tokenJson = getToken();
+            JSONObject bizContent = tokenJson.getJSONObject("ysepay_merchant_register_token_get_response");
+            token = bizContent.getString("token");
+        } catch (Exception e) {
+            log.error("银盛微信认证获取token失败!");
+            return;
+        }
+
+        if ("1".equals(mbi.getMerchantType())) {
+            // 小微商户需要上传图片
+            uploadImg(token, merchantId, merImg);
+            uploadImg(token, merchantId, merImg2);
+        }
+
+        /*
+         * {
+         *     "sign": "CjoulHUit4wig8AyImfSb58ttsQS2cwZNKM/6fTot5rDmUfL730veMWh2Li8HLda5KlPamyF5WbFhGisDjyiSgsZ4Ls0XO45rZAEYmAXVnSjOyAqNS8CgYZ3vSZg3jFl5vuRvrHr4vdPxTKQ/xW9K1D+fJOnMi90+K+9mXmDrPI=",
+         *     "ysepay_authenticate_wx_apply_response": {
+         *     "code": "10000",
+         *     "msg": "Success",
+         *     "apply_no": "2000002223643720",
+         *     "send_channel_apply_no": "R1028184853490168051"
+         * }
+         */
+        JSONObject reqResult = wxCertReq(token, merchantId, mbi, account);
+        JSONObject wxCertResult = reqResult.getJSONObject("ysepay_authenticate_wx_apply_response");
+
+        if ("Success".equals(wxCertResult.getString("msg"))) {
+            String applyNo = wxCertResult.getString("apply_no");
+
+            // 将之前微信认证请求发生错误的信息直接全部清理
+            LambdaQueryWrapper<SubMerchantApplyOrder> qWrapper = Wrappers.lambdaQuery();
+            qWrapper.eq(SubMerchantApplyOrder::getMerchantCode, merchantCode)
+                    .eq(SubMerchantApplyOrder::getChannelId, 4);
+
+            applyOrderService.remove(qWrapper);
+
+            SubMerchantApplyOrder subMerchantApplyOrder = new SubMerchantApplyOrder()
+                    .setMerchantCode(mbi.getMerchantCode())
+                    .setSubMchType("WX")
+                    .setStatus("0")
+                    .setApplyNo(applyNo)
+                    .setChannelId(4);
+
+            applyOrderService.save(subMerchantApplyOrder);
+        } else {
+            log.error("商户微信认证异常{}", wxCertResult);
+
+            String msg = "微信认证异常";
+            SubMerchantApplyOrder subMerchantApplyOrder = new SubMerchantApplyOrder()
+                    .setMerchantCode(mbi.getMerchantCode())
+                    .setSubMchType("WX")
+                    .setStatus("0")
+                    .setRemark(msg)
+                    .setResultStatus(SubMerchantApplyOrder.RES_STATUS_COMMIT_ERROR)
+                    .setChannelId(4);
+
+            // 先更新
+            LambdaUpdateWrapper<SubMerchantApplyOrder> uWrapper = Wrappers.lambdaUpdate();
+            uWrapper.eq(SubMerchantApplyOrder::getMerchantCode, merchantCode);
+            uWrapper.eq(SubMerchantApplyOrder::getChannelId, 4);
+            uWrapper.eq(SubMerchantApplyOrder::getResultStatus, "4");
+            uWrapper.set(SubMerchantApplyOrder::getStatus, "0")
+                    .set(SubMerchantApplyOrder::getResultStatus, SubMerchantApplyOrder.RES_STATUS_COMMIT_ERROR)
+                    .set(SubMerchantApplyOrder::getRemark, msg)
+                    .set(SubMerchantApplyOrder::getUpdateTime, new Date());
+            boolean updateFlag = applyOrderService.update(uWrapper);
+            if (!updateFlag) {
+                applyOrderService.save(subMerchantApplyOrder);
+            }
+        }
+    }
+
+    @Override
+    public void wxReCert(String merchantId, String merchantCode) {
+        SubMerchantApplyOrder subMerchantApplyOrder = new SubMerchantApplyOrder()
+                .setMerchantCode(merchantCode)
+                .setStatus("1")
+                .setChannelId(4);
+        subMerchantApplyOrder = applyOrderService.getOne(new QueryWrapper<>(subMerchantApplyOrder));
+
+        wxCertCancel(merchantId, subMerchantApplyOrder);
+
+        wxCert(merchantId, merchantCode);
+    }
+
+    @Override
+    public JSONObject wxCertResult(String merchantId, String wxApplyNo) {
+        JSONObject param = new JSONObject();
+        param.put("apply_no", wxApplyNo);
+
+        JSONObject reqResult = ysService.req(YsConfigV2.MER_WX_CERT, "ysepay.authenticate.wx.query", param, null);
+        JSONObject wxCertResult = reqResult.getJSONObject("ysepay_authenticate_wx_query_response");
+        if (!"10000".equals(wxCertResult.getString("code"))) {
+            log.error("微信申请单{}, 查询状态失败, {}", wxApplyNo, wxCertResult.getString("msg"));
+            return null;
+        }
+
+        String applyState = wxCertResult.getString("apply_state");
+        String qrcodeData = wxCertResult.getString("qrcode_data");
+        if (applyState.equals(WxApplyStatus.EXAMINING.getStatusName())) {
+            LambdaUpdateWrapper<SubMerchantApplyOrder> uWrapper = Wrappers.lambdaUpdate();
+            uWrapper.eq(SubMerchantApplyOrder::getApplyNo, wxApplyNo);
+            uWrapper.set(SubMerchantApplyOrder::getResultStatus, applyState)
+                    .set(SubMerchantApplyOrder::getUpdateTime, new Date())
+                    .set(SubMerchantApplyOrder::getRemark, WxApplyStatus.EXAMINING.getStatusMsg())
+                    .set(SubMerchantApplyOrder::getStatus, "0");
+            applyOrderService.update(uWrapper);
+
+        } else if (applyState.equals(WxApplyStatus.EDITING.getStatusName())) {
+            LambdaUpdateWrapper<SubMerchantApplyOrder> uWrapper = Wrappers.lambdaUpdate();
+            uWrapper.eq(SubMerchantApplyOrder::getApplyNo, wxApplyNo);
+            uWrapper.set(SubMerchantApplyOrder::getResultStatus, applyState)
+                    .set(SubMerchantApplyOrder::getUpdateTime, new Date())
+                    .set(SubMerchantApplyOrder::getRemark, WxApplyStatus.EDITING.getStatusMsg())
+                    .set(SubMerchantApplyOrder::getStatus, "0");
+            applyOrderService.update(uWrapper);
+
+        } else if (applyState.equals(WxApplyStatus.CONFIRM_CONTACT.getStatusName())) {
+            success(merchantId, wxApplyNo, qrcodeData, WxApplyStatus.CONFIRM_CONTACT);
+
+        } else if (applyState.equals(WxApplyStatus.CONFIRM_LEGALPERSON.getStatusName())) {
+            success(merchantId, wxApplyNo, qrcodeData, WxApplyStatus.CONFIRM_LEGALPERSON);
+
+        } else if (applyState.equals(WxApplyStatus.PASSED.getStatusName())) {
+            success(merchantId, wxApplyNo, qrcodeData, WxApplyStatus.PASSED);
+
+        } else if (applyState.equals(WxApplyStatus.REJECTED.getStatusName())) {
+            LambdaUpdateWrapper<SubMerchantApplyOrder> uWrapper = Wrappers.lambdaUpdate();
+            uWrapper.eq(SubMerchantApplyOrder::getApplyNo, wxApplyNo);
+            uWrapper.set(SubMerchantApplyOrder::getResultStatus, applyState)
+                    .set(SubMerchantApplyOrder::getUpdateTime, new Date())
+                    .set(SubMerchantApplyOrder::getRemark, WxApplyStatus.EDITING.getStatusMsg())
+                    .set(SubMerchantApplyOrder::getStatus, "0");
+            applyOrderService.update(uWrapper);
+
+            try {
+                MerchantChannelStatus mcs = new MerchantChannelStatus();
+                mcs.setChannel(4);
+                mcs.setMerchantId(merchantId);
+                mcs = mcsService.getOne(Wrappers.query(mcs));
+
+                MerchantBaseInfo mbi = mbiService.getMerchantBaseInfoByMerchantCode(mcs.getMerchantCode());
+
+                String pushMsg = "您好！您的商户微信认证因“##”被驳回，请联系收银呗客服修改资料并重新审核";
+                pushMsg = pushMsg.replace("##", wxCertResult.getString("reject_reason"));
+                generalPushUtil.sendAllPlatByAlias(Collections.singletonList(mbi.getUserId()), "商户微信认证通知", pushMsg, "1");
+
+                Notice notice = new Notice(1, 1, mbi.getUserId());
+                notice.setConrtent(pushMsg);
+                noticeService.saveNotice(notice);
+            } catch (MsgException e) {
+                log.error(e.getMessage());
+            }
+
+        } else if (applyState.equals(WxApplyStatus.FREEZED.getStatusName())) {
+            success(merchantId, wxApplyNo, qrcodeData, WxApplyStatus.FREEZED);
+
+        } else if (applyState.equals(WxApplyStatus.CANCELED.getStatusName())) {
+            LambdaUpdateWrapper<SubMerchantApplyOrder> uWrapper = Wrappers.lambdaUpdate();
+            uWrapper.eq(SubMerchantApplyOrder::getApplyNo, wxApplyNo);
+            uWrapper.set(SubMerchantApplyOrder::getResultStatus, WxApplyStatus.CANCELED.getStatusName())
+                    .set(SubMerchantApplyOrder::getUpdateTime, new Date())
+                    .set(SubMerchantApplyOrder::getRemark, WxApplyStatus.CANCELED.getStatusMsg())
+                    .set(SubMerchantApplyOrder::getStatus, "2");
+            applyOrderService.update(uWrapper);
+        }
+
+        return null;
+    }
+
+    /**
+     * 有小程序码返回的
+     */
+    private void success(String merchantId, String wxApplyNo, String qrcodeData, WxApplyStatus wxApplyStatus) {
+        LambdaUpdateWrapper<SubMerchantApplyOrder> uWrapper = Wrappers.lambdaUpdate();
+        uWrapper.eq(SubMerchantApplyOrder::getApplyNo, wxApplyNo);
+        uWrapper.set(SubMerchantApplyOrder::getResultStatus, wxApplyStatus.getStatusName())
+                .set(SubMerchantApplyOrder::getUpdateTime, new Date())
+                .set(SubMerchantApplyOrder::getRemark, wxApplyStatus.getStatusMsg())
+                .set(SubMerchantApplyOrder::getStatus, "1");
+        uWrapper.set(SubMerchantApplyOrder::getInfoQrcode, uploadOSS(qrcodeData));
+        applyOrderService.update(uWrapper);
+
+        notify(merchantId);
+    }
+
+    /**
+     * 上传认证二维码图片信息到OSS
+     * @param base64ImgData 图片base64编码信息
+     * @return  OSS图片链接
+     */
+    private String uploadOSS(String base64ImgData) {
+        base64ImgData = base64ImgData.replace("data:image/png;base64,", "");
+
+        byte[] decode = Base64.getDecoder().decode(base64ImgData);
+        ByteArrayInputStream bais = new ByteArrayInputStream(decode);
+        return OssOperatUtil.upload(bais, UUID.randomUUID().toString(), "png");
+    }
+
+    /**
+     * 给商户发推送以及短信
+     * @param merchantId    通道商编
+     */
+    private void notify(String merchantId) {
+        try {
+            MerchantChannelStatus mcs = new MerchantChannelStatus();
+            mcs.setChannel(4);
+            mcs.setMerchantId(merchantId);
+            mcs = mcsService.getOne(Wrappers.query(mcs));
+
+            MerchantBaseInfo mbi = mbiService.getMerchantBaseInfoByMerchantCode(mcs.getMerchantCode());
+
+            String content = "请商户进行微信实名认证，短信将发送至商户联系人手机号，已认证可忽略";
+            generalPushUtil.sendAllPlatByAlias(Collections.singletonList(mbi.getUserId()), "商户微信认证通知", content, "1");
+
+            sendMsgUtil.verifyMsg(mbi.getContactMobile(), mbi.getMerchantCode() + "?i=" + 4);
+
+            Notice notice = new Notice(1, 1, mbi.getUserId());
+            notice.setConrtent(content);
+            noticeService.saveNotice(notice);
+        } catch (MsgException e) {
+            log.error(e.getMessage());
+        }
+    }
+
+    /**
+     * 获取token
+     *
+     * @return 返回参数
+     * {
+     * "ysepay_merchant_register_token_get_response": {
+     * "msg": "Success",
+     * "token_status": "TOKEN_GET_SUCCESS",
+     * "code": "10000",
+     * "token": "TK20211028151009850PQoPfeku"
+     * },
+     * "sign": "DU3+iNNNOHiMjDRlMf34ubE6Eqxtegj3b5HXhxjhWnS/WG+NX+QoTSLIV0Zm6Z8rP9/51N4OYUQTRhVpAbVD8Ub8J4fIv7cNpb7fd9SnO6XwOEq9YlJK6Plpk3W0lWq9sD/UJDEvG2Ab1zV+EJ9C7htFbJLrTNPkuIoQ4bQterY="
+     * }
+     * @throws Exception 可能存在的异常信息
+     */
+    public JSONObject getToken() throws Exception {
+        Map<String, Object> extraBase = new HashMap<>();
+        extraBase.put("notify_url", "http://api.test.ysepay.net/atinterface/receive_return.htm");
+        JSONObject bizContent = new JSONObject();
+        bizContent.put("biz_content", "{}");
+        JSONObject tokenResult = ysService.req(YsConfigV2.MER_UPLOAD_TOKEN, "ysepay.merchant.register.token.get", new JSONObject(), extraBase);
+
+        return tokenResult;
+    }
+
+    /**
+     * 上传图片
+     *
+     * @param token      token
+     * @param merchantId 商编
+     * @param mi         图片信息
+     */
+    private void uploadImg(String token, String merchantId, MerchantImage mi) {
+        String picType;
+        if (mi.getPhotoType().equals(MerchantImage.ImageType.SHOP_FRONT_DOOR)) {
+            picType = "34";
+        } else if (mi.getPhotoType().equals(MerchantImage.ImageType.STORE_INTERIOR_PHOTO)) {
+            picType = "50";
+        } else {
+            return;
+        }
+
+        JSONObject bizParam = new JSONObject();
+        bizParam.put("superUsercode", merchantId);
+        bizParam.put("picType", picType);
+        bizParam.put("token", token);
+
+        Map<String, Object> fileMap = new HashMap<>();
+        try {
+            byte[] base64 = FileUtil.url2Bytes(mi.getPicUrl());
+            ByteArrayResource file = new ByteArrayResource(base64) {
+                @Override
+                public String getFilename() {
+                    return "test.jpg";
+                }
+            };
+            fileMap.put("picFile", file);
+        } catch (IOException ignored) {
+
+        }
+
+        JSONObject uploadResult = ysService.req(YsConfigV2.MER_IMG_UPLOAD, null, null, bizParam, fileMap);
+        log.debug("银盛微信认证上传图片返回结果：{}", uploadResult.toJSONString());
+    }
+
+    /**
+     * 发起微信认证
+     *
+     * @return 发起微信认证的结果
+     * {
+     * "sign": "CjoulHUit4wig8AyImfSb58ttsQS2cwZNKM/6fTot5rDmUfL730veMWh2Li8HLda5KlPamyF5WbFhGisDjyiSgsZ4Ls0XO45rZAEYmAXVnSjOyAqNS8CgYZ3vSZg3jFl5vuRvrHr4vdPxTKQ/xW9K1D+fJOnMi90+K+9mXmDrPI=",
+     * "ysepay_authenticate_wx_apply_response": {
+     * "code": "10000",
+     * "msg": "Success",
+     * "apply_no": "2000002223643720",
+     * "send_channel_apply_no": "R1028184853490168051"
+     * }
+     * }
+     */
+    private JSONObject wxCertReq(String token, String merchantId, MerchantBaseInfo mbi, AccountDTO account) {
+
+        JSONObject bizContent = new JSONObject();
+        bizContent.put("usercode", merchantId);
+        if ("1".equals(mbi.getMerchantType())) {
+            IdCard idCard = account.getIdcard();
+            bizContent.put("cust_name", "商户_" + idCard.getCertName());
+        } else {
+            String bizName = mbi.getBussAuthName();
+
+            if (StringUtils.isNotEmpty(bizName) && !"**".equals(bizName)) {
+                bizContent.put("cust_name", bizName);
+            } else {
+                // 获取法人信息
+                IdCard legalIdCard = idCardService.getLegalIdCard(mbi.getUserId());
+                bizContent.put("cust_name", "个体户_" + legalIdCard.getCertName());
+            }
+        }
+
+        bizContent.put("contact_cert_type", "00");
+        DES des = new DES(ysConfigV2.getSrcMerchantNo().getBytes(StandardCharsets.UTF_8));
+
+        bizContent.put("contact_cert_no", des.encryptBase64(account.getIdcard().getCertNo()));
+        bizContent.put("legal_cert_initial", account.getIdcard().getCertStartTime().replace("-", ""));
+        if ("长期".equals(account.getIdcard().getCertEndTime())) {
+            bizContent.put("legal_cert_expire", "29991231");
+        } else {
+            bizContent.put("legal_cert_expire", account.getIdcard().getCertEndTime().replace("-", ""));
+        }
+
+        if (!"1".equals(mbi.getMerchantType())) {
+            bizContent.put("bus_license_initial", mbi.getBussAuthStartTime().replace("-", ""));
+            bizContent.put("bus_license_expire", mbi.getBussAuthEndTime().replace("-", ""));
+        } else {
+            bizContent.put("store_type", "00");
+            bizContent.put("store_name", mbi.getAlias());
+            bizContent.put("token", token);
+        }
+
+        JSONObject merContactInfo = new JSONObject();
+        merContactInfo.put("mer_contact_type", "65");
+        merContactInfo.put("id_type_cd", "00");
+
+        merContactInfo.put("id_validdate_begin", account.getIdcard().getCertStartTime());
+        merContactInfo.put("id_validdate_end", account.getIdcard().getCertEndTime());
+        bizContent.put("mer_contact_info", merContactInfo);
+
+
+        JSONObject wxCertResult = ysService.req(YsConfigV2.MER_WX_CERT, "ysepay.authenticate.wx.apply", bizContent, null);
+        log.debug("银盛微信认证请求返回结果：{}", wxCertResult.toString());
+
+        return wxCertResult;
+    }
+
+    @Override
+    public JSONObject wxCertCallback(JSONObject certResult) {
+        // 银盛没有回调
+        return null;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void wxCertCancel(String merchantId, SubMerchantApplyOrder subMerchantApplyOrder) {
+        JSONObject paramMap = new JSONObject();
+        paramMap.put("apply_no", subMerchantApplyOrder.getApplyNo());
+
+        JSONObject reqResult = ysService.req(YsConfigV2.MER_WX_CERT, "ysepay.authenticate.wx.apply.cancel", paramMap, null);
+        JSONObject respResult = reqResult.getJSONObject("ysepay_authenticate_wx_apply_cancel_response");
+
+        if (!"00".equals(respResult.getString("apply_state"))) {
+            throw new MsgException(respResult.getString("sub_msg"));
+        }
+    }
+
+    @Override
+    public void wxCertAuthStatus(String merchantId) {
+        JSONObject bizContent = new JSONObject();
+        bizContent.put("usercode", merchantId);
+
+        JSONObject reqResult = ysService.req(YsConfigV2.MER_WX_CERT, "ysepay.authenticate.wx.authorized.query", bizContent, null);
+        JSONObject respResult = reqResult.getJSONObject("ysepay_authenticate_wx_authorized_query_response");
+        String thirdAuthStatusX = respResult.getString("thirdparty_authstate_x");
+        String thirdMercIdX = respResult.getString("thirdparty_mercid_x");
+        String thirdAuthStatusY = respResult.getString("thirdparty_authstate_y");
+        String thirdMercIdY = respResult.getString("thirdparty_mercid_y");
+
+        LambdaQueryWrapper<SubMerchant> qWrapper = Wrappers.lambdaQuery();
+        qWrapper.eq(SubMerchant::getMerchantId, merchantId);
+        qWrapper.likeLeft(SubMerchant::getSubMchId, "_CUPS");
+        qWrapper.eq(SubMerchant::getSubMchType, "WX");
+        SubMerchant sub = smService.getOne(qWrapper);
+
+        if (sub == null) {
+            MerchantChannelStatus mcs = new MerchantChannelStatus().setMerchantId(merchantId).setChannel(4);
+            mcs = mcsService.getOne(new QueryWrapper<>(mcs));
+            smService.reqChannelSubMerchant(mcs.getMerchantCode(), mcs.getChannel());
+            sub = smService.getOne(qWrapper);
+            if (sub == null) {
+                log.warn("未查询到银联微信子商户号");
+                return;
+            }
+        }
+
+        String wxMercId = sub.getSubMchId().split("_")[0];
+        if (Objects.equals(thirdAuthStatusX, WxAuthStatus.AUTHORIZED.getName()) && wxMercId.equals(thirdMercIdX)) {
+            LambdaUpdateWrapper<MerchantChannelStatus> uWrapper = Wrappers.lambdaUpdate();
+            uWrapper.eq(MerchantChannelStatus::getMerchantId, merchantId);
+            uWrapper.eq(MerchantChannelStatus::getChannel, 4);
+            uWrapper.set(MerchantChannelStatus::getAuthorizationStatus, MerchantChannelStatus.AUTHORIZATION_STATUS_AUTHORIZED);
+            mcsService.update(uWrapper);
+            return;
+        }
+
+
+        if (Objects.equals(thirdAuthStatusY, WxAuthStatus.AUTHORIZED.getName()) && wxMercId.equals(thirdMercIdY)) {
+            LambdaUpdateWrapper<MerchantChannelStatus> uWrapper = Wrappers.lambdaUpdate();
+            uWrapper.eq(MerchantChannelStatus::getMerchantId, merchantId);
+            uWrapper.eq(MerchantChannelStatus::getChannel, 4);
+            uWrapper.set(MerchantChannelStatus::getAuthorizationStatus, MerchantChannelStatus.AUTHORIZATION_STATUS_AUTHORIZED);
+            mcsService.update(uWrapper);
+        }
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/v20210929/YsConfigV2.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/v20210929/YsConfigV2.java
new file mode 100644
index 0000000..b826441
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/v20210929/YsConfigV2.java
@@ -0,0 +1,166 @@
+package cn.pluss.platform.ys.impl.v20210929;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+
+@Data
+@Component
+@ConfigurationProperties(prefix = "ys")
+public class YsConfigV2 {
+
+    private String agentNoV2;
+
+    /**
+     * 发起方编号
+     */
+    private String srcMerchantNo;
+
+    /**
+     * 进件链接前缀
+     */
+    private String auditDomainV2;
+
+    /**
+     * 合作方商编
+     */
+    private String src;
+
+    /**
+     * 私钥
+     */
+    private String priKeyV2;
+
+    /**
+     * 公钥v2
+     */
+    private String pubKeyV2;
+
+    /**
+     * 加密秘钥
+     */
+    private String encryptPwd;
+
+    /**
+     * 进件，图片上传的接口链接
+     */
+    public static String IMG_UPLOAD;
+
+    /**
+     * 进件, 商户信息提交的接口
+     */
+    public static String MER_AUDIT;
+
+    /**
+     * 进件驳回后, 商户信息修改的接口
+     */
+    public static String MER_FAILED_EDIT;
+
+    /**
+     * 进件审核接口
+     */
+    public static String MER_APPLY;
+
+    /**
+     * 进件结果查询接口
+     */
+    public static String MER_RESULT;
+
+    /**
+     * 商户信息变更结果查询
+     */
+    public static String MER_EDIT_RESULT;
+
+    /**
+     * (重新)发送签约短信
+     */
+    public static String MER_PROTOCOL_MSG;
+
+    /**
+     * 查询签约状态
+     */
+    public static String MER_PROTOCOL_STATUS;
+
+    /**
+     * 线上支付开通， T1, 线上支付只分两种，T1和D0
+     */
+    public static String MER_T1_REQ;
+
+    /**
+     * 线上支付开通，D0
+     */
+    public static String MER_D0_REQ;
+
+    /**
+     * 修改商户基本信息
+     */
+    public static String MER_BASE_INFO_CHANGE;
+
+    /**
+     * 修改银行卡信息的链接
+     */
+    public static String MER_BANK_CHANGE;
+
+    /**
+     * 修改信息上传图片
+     */
+    public static String MER_EDIT_PIC_UPLOAD;
+
+    /**
+     * 修改费率
+     */
+    public static String MER_RATE_CHANGE;
+
+    /**
+     * 图片上传口令接口
+     */
+    public static String MER_UPLOAD_TOKEN = "https://register.ysepay.com:2443/register_gateway/gateway.do";
+
+    /**
+     * 微信认证上传图片
+     */
+    public static String MER_IMG_UPLOAD = "https://uploadApi.ysepay.com:2443/yspay-upload-service?method=upload";
+
+    /**
+     * 微信认证发起, 申请单状态查询
+     */
+    public static String MER_WX_CERT = "https://openapi.ysepay.com/gateway.do";
+
+
+    @PostConstruct
+    public void init() {
+        dataInit(this);
+    }
+
+    public static synchronized void dataInit(YsConfigV2 ysConfigV2) {
+        IMG_UPLOAD = ysConfigV2.auditDomainV2 + "saas/org/uploadPic";
+
+        MER_AUDIT = ysConfigV2.auditDomainV2 + "saas/org/addScanMerchant";
+
+        MER_FAILED_EDIT = ysConfigV2.auditDomainV2 + "saas/org/updateScanMerchant";
+
+        MER_APPLY = ysConfigV2.auditDomainV2 + "saas/org/autoAuditTerm";
+
+        MER_RESULT = ysConfigV2.auditDomainV2 + "saas/org/queryMerchant";
+
+        MER_PROTOCOL_MSG = ysConfigV2.auditDomainV2 + "saas/orgSign/sendScanSmsCode";
+
+        MER_PROTOCOL_STATUS = ysConfigV2.auditDomainV2 + "saas/orgSign/querySignSts";
+
+        MER_T1_REQ = ysConfigV2.auditDomainV2 + "saas/orgScan/onlineTrading";
+
+        MER_D0_REQ = ysConfigV2.auditDomainV2 + "saas/orgScan/optOnlineD0";
+
+        MER_BANK_CHANGE = ysConfigV2.auditDomainV2 + "saas/org/changeMerAccInfo";
+
+        MER_EDIT_RESULT = ysConfigV2.auditDomainV2 + "saas/org/queryModifyStatus";
+
+        MER_RATE_CHANGE = ysConfigV2.auditDomainV2 + "saas/org/changeMerOnlineFee";
+
+        MER_EDIT_PIC_UPLOAD = ysConfigV2.auditDomainV2 + "saas/org/changeMerPic";
+
+        MER_BASE_INFO_CHANGE = ysConfigV2.auditDomainV2 + "saas/org/changeMerInfo";
+    }
+}
\ No newline at end of file
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/v20210929/YsConstant.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/v20210929/YsConstant.java
new file mode 100644
index 0000000..13b6b72
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/v20210929/YsConstant.java
@@ -0,0 +1,679 @@
+package cn.pluss.platform.ys.impl.v20210929;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 记录银盛接口的参数的key值
+ */
+public class YsConstant {
+
+    @Getter
+    @AllArgsConstructor
+    public enum ReqStatus {
+        /** 请求状态值 */
+        SUCCESS("00", "请求成功");
+
+        private String code;
+        private String desc;
+    }
+
+    @Getter
+    @AllArgsConstructor
+    public enum AuditStatus {
+        /**
+         * 进件状态
+         */
+        AUDIT_NO_AUDIT("03", "待审核"), AUDIT_FIRST_TRIAL_SUCCESS("04", "初审完成"), AUDIT_SUCCESS("05", "开户完成"), AUDIT_FIRST_TRIAL_FAIL("90", "初审拒绝");
+
+        private String code;
+        private String desc;
+
+        public static AuditStatus getByCode(String code) {
+            for (AuditStatus value : AuditStatus.values()) {
+                if (value.code.equals(code)) {
+                    return value;
+                }
+            }
+
+            return null;
+        }
+    }
+
+    /**
+     * 营业执照全称
+     */
+    public static final String BUSINESS_LICENCE = "businessLicence";
+
+    /**
+     * 商户简称
+     */
+    public static final String ALIAS = "userShortName";
+
+    /**
+     * 营业执照全称
+     */
+    public static final String BUSINESS_LICENCE_NO = "businessLicenceNo";
+
+    /**
+     * 营业执照开始日期
+     */
+    public static final String BUSINESS_LICENCE_START = "businessLicenceSdate";
+
+    /**
+     * 营业执照结束日期
+     */
+    public static final String BUSINESS_LICENCE_LIMIT = "businessLicenceEdate";
+
+    /**
+     * 营业执照注册地址
+     */
+    public static final String REGISTERED_ADDRESS = "registeredAddress";
+
+    /**
+     * 营业地址
+     */
+    public static final String BUSINESS_ADDRESS = "businessAddress";
+
+    /**
+     * 商户归属省
+     */
+    public static final String MERC_PROV = "mercProv";
+
+    /**
+     * 商户归属市
+     */
+    public static final String MERC_CITY = "mercCity";
+
+    /**
+     * 商户归属区/县
+     */
+    public static final String MERC_AREA = "mercArea";
+
+    /**
+     * 法人姓名
+     */
+    public static final String LEGAL_PERSON_NAME = "legalPersonName";
+
+    /**
+     * 法人身份证号
+     */
+    public static final String LEGAL_PERSON_ID = "legalPersonId";
+
+    /**
+     * 法人身份证开始日期
+     */
+    public static final String LEGAL_PERSON_START = "legalPersonIdSdate";
+
+    /**
+     * 法人身份证到期日期
+     */
+    public static final String LEGAL_PERSON_LIMIT = "legalPersonIdEdate";
+
+    /**
+     * 法人电话
+     */
+    public static final String LEGAL_PERSON_PHONE = "legalPersonPhone";
+
+    /**
+     * 非法人姓名
+     */
+    public static final String ACCOUNT_PERSON_NAME = "unincorporatedName";
+
+    /**
+     * 非法人身份证号码
+     */
+    public static final String ACCOUNT_PERSON_ID = "unincorporatedId";
+
+    /**
+     * 结算账户卡号
+     */
+    public static final String ACCOUNT_CARD_NO = "balanceAccCardno";
+
+    /**
+     * 结算账户户名
+     */
+    public static final String ACCOUNT_CARD_NAME = "balanceAccName";
+
+    /**
+     * 开户行省（如湖北省）
+     */
+    public static final String BANK_PROVINCE = "openAccProvince";
+
+    /**
+     * 开户行市（如武汉市）
+     */
+    public static final String BANK_CITY = "openAccCity";
+
+    /**
+     * 开户行区/县（如洪山区）
+     */
+    public static final String BANK_AREA = "openAccArea";
+
+    /**
+     * 开户行行别名称
+     */
+    public static final String BANK_NAME = "bankName";
+
+    /**
+     * 开户行行别
+     */
+    public static final String BANK_TYPE = "bankType";
+
+    /**
+     * 开户行编号（支行）
+     */
+    public static final String BANK_BRANCH_TYPE = "openAccBanktype";
+
+    /**
+     * 开户行名称（支行）
+     */
+    public static final String BANK_BRANCH_NAME = "openAccBankname";
+
+    /**
+     * 联系人姓名
+     */
+    public static final String CONTACTS_NAME = "contactsName";
+
+    /**
+     * 联系人电话
+     */
+    public static final String CONTACTS_PHONE = "contactsPhone";
+
+    /**
+     * 联系人邮箱
+     */
+    public static final String CONTACTS_EMAIL = "contactsEmail";
+
+    /**
+     * 微信签约费率(最 低:0.01%)
+     */
+    public static final String WECHAT_SIGN_RATE = "wechatSignRate";
+
+    /**
+     * 微信签约费率封底(单位:分)
+     */
+    public static final String WECHAT_SIGN_MIN = "wechatSignMin";
+
+    /**
+     * 支付宝签约费率(最低:0.01%)
+     */
+    public static final String ALIPAY_SIGN_RATE = "alipaySignRate";
+
+    /**
+     * 支付宝签约费率封底(单位:分)
+     */
+    public static final String ALIPAY_SIGN_MIN = "alipaySignMin";
+
+    /**
+     * 银联一档（>1000）：贷记卡费率
+     */
+    public static final String CREDIT_RATE_1 = "creditRate1";
+
+    /**
+     * 银联一档（>1000）：贷记卡封底.（单位：分）
+     */
+    public static final String CREDIT_MIN_1 = "creditMin1";
+
+    /**
+     * 银联一档（>1000）：借记卡费率
+     */
+    public static final String DEBIT_RATE_1 = "debitRate1";
+
+    /**
+     * 银联一档（>1000）：借记卡封底（单位：分）
+     */
+    public static final String DEBIT_MIN_1 = "debitMin1";
+
+    /**
+     * 银联一档（>1000）：借记卡封顶（单位：分）
+     */
+    public static final String DEBIT_MAX_1 = "debitMax1";
+
+    /**
+     * 银联二档（<=1000）：贷记卡费率
+     */
+    public static final String CREDIT_RATE_2 = "creditRate2";
+
+    /**
+     * 银联二档（<=1000）：贷记卡封底（单位：分）
+     */
+    public static final String CREDIT_MIN_2 = "creditMin2";
+
+    /**
+     * 银联二档（<=1000）：借记卡费率
+     */
+    public static final String DEBIT_RATE_2 = "debitRate2";
+
+    /**
+     * 银联二档（<=1000）：借记卡封底（单位：分）
+     */
+    public static final String DEBIT_MIN_2 = "debitMin2";
+
+    /**
+     * 银联二档（<=1000）：借记卡封顶（单位：分）
+     */
+    public static final String DEBIT_MAX_2 = "debitMax2";
+
+    /**
+     * 是否开通刷卡业务
+     */
+    public static final String OPEN_POS_P = "openPosp";
+
+    /* 以下为T1 */
+    /**
+     * 工作日到账-借记卡费率
+     */
+    public static final String T_111_RATE = "t111Rate";
+
+    /**
+     * 工作日到账-借记卡费率封顶（单位：分）
+     */
+    public static final String T_111_RATE_TOP = "t111RateTop";
+
+    /**
+     * 工作日到账-借记卡费率封底（单位：分）
+     */
+    public static final String T_111_SIGN_RATE_MIN = "t111SignRateMin";
+
+    /**
+     * 工作日到账-贷记卡费率
+     */
+    public static final String T_112_RATE = "t112Rate";
+
+    /**
+     * 工作日到账-贷记卡费率封底（单位：分）
+     */
+    public static final String T_112_SIGN_RATE_MIN = "t112SignRateMin";
+
+    /* 以下为D1 */
+    /**
+     * 天天到账-借记卡费率
+     */
+    public static final String T_11_RATE = "t11Rate";
+
+    /**
+     * 天天到账-借记卡费率封顶（单位：分）
+     */
+    public static final String T_11_RATE_TOP = "t11RateTop";
+
+    /**
+     * 天天到账-借记卡费率封底（单位：分）
+     */
+    public static final String T_11_SIGN_RATE_MIN = "t11SignRateMin";
+
+    /**
+     * 天天到账-贷记卡费率
+     */
+    public static final String T_12_RATE = "t12Rate";
+
+    /**
+     * 天天到账-贷记卡费率封底（单位：分）
+     */
+    public static final String T_12_SIGN_RATE_MIN = "t12SignRateMin";
+
+    /**
+     * 天天到账-垫资费类型（百分比、元）
+     */
+    public static final String T_ADVANCE_TYPE = "tAdvanceType";
+
+    /**
+     * 天天到账-垫资费
+     */
+    public static final String T_ADVANCE_FEE = "tAdvanceFee";
+
+    /**
+     * 天天到账-垫资费封底（单位：分）
+     */
+    public static final String T_ADVANCE_MIN = "tAdvanceMin";
+
+    /* 以下为D0 */
+    /**
+     * 实时到账-借记卡费率
+     */
+    public static final String D_011_RATE = "d011Rate";
+
+    /**
+     * 实时到账-借记卡费率封顶（单位：分）
+     */
+    public static final String D_011_RATE_TOP = "d011RateTop";
+
+    /**
+     * 实时到账-借记卡费率最低（单位：分）
+     */
+    public static final String D_011_RATE_BOTTOM = "d011RateBottom";
+
+    /**
+     * 实时到账-贷记卡费率
+     */
+    public static final String D_012_RATE = "d012Rate";
+
+    /**
+     * 实时到账-贷记卡费率最低（单位：分）
+     */
+    public static final String D_012_RATE_BOTTOM = "d012RateBottom";
+
+    /**
+     * 实时到账-借记卡签约费率垫资费类型(百分比；元)
+     */
+    public static final String D_0_ADVANCE_J_SIGN_TYPE = "d0AdvanceJsignType";
+
+    /**
+     * 实时到账-借记卡签约费率垫资费
+     */
+    public static final String D_0_ADVANCE_J_SIGN_FEE = "d0AdvanceJsignFee";
+
+    /**
+     * 实时到账-借记卡签约费率垫资费封底（单位：分）
+     */
+    public static final String D_0_ADVANCE_J_SIGN_MIN = "d0AdvanceJsignMin";
+
+    /**
+     * 实时到账-借记卡签约费率垫资费封顶(单位:分)
+     */
+    public static final String D_0_ADVANCE_J_SIGN_MAX = "d0AdvanceJsignMax";
+
+    /**
+     * 实时到账-贷记卡签约费率垫资费类型(百分比；元)
+     */
+    public static final String D_0_ADVANCE_D_SIGN_TYPE = "d0AdvanceDsignType";
+
+    /**
+     * 实时到账-贷记卡签约费率垫资费
+     */
+    public static final String D_0_ADVANCE_D_SIGN_FEE = "d0AdvanceDsignFee";
+
+    /**
+     * 实时到账-贷记卡签约费率垫资费封底（单位：分）
+     */
+    public static final String D_0_ADVANCE_D_SIGN_MIN = "d0AdvanceDsignMin";
+
+    /**
+     * 实时到账-贷记卡签约费率垫资费封顶(单位:分)
+     */
+    public static final String D_0_ADVANCE_D_SIGN_MAX = "d0AdvanceDsignMax";
+
+    /**
+     * 是否开通扫码快付
+     */
+    public static final String CODE_ADVANCE_OPEN = "codeAdvanceOpen";
+
+    /**
+     * 是否开通快付
+     */
+    public static final String FAST_PAY = "fastPay";
+
+    /**
+     * 到账方式, 开通刷卡业务时必填
+     */
+    public static final String OPEN_BUS_RADIO = "openBusRadio";
+
+    /**
+     * 是否法人结算
+     */
+    public static final String CODE_LEGAL_PERSON_ACC = "codeLegalPersonAcc";
+
+    /**
+     * 垫资费费率
+     */
+    public static final String CODE_ADVANCE_RATE = "codeAdvanceRate";
+
+    /**
+     * 垫资费费率最低值（单位：分）
+     */
+    public static final String CODE_ADVANCE_MIN = "codeAdvanceMin";
+
+    /**
+     * 银盛商户类型
+     */
+    public static final String MCC_SUB_CD = "mccSubCd";
+
+    /**
+     * MCC 码
+     */
+    public static final String MCC_CD = "mccCd";
+
+    /**
+     * 代理商编号
+     */
+    public static final String CO_OPERATOR_NO = "coOperatorNo";
+
+    /**
+     * 代理商编号
+     */
+    public static final String INDUSTRY = "industry";
+
+    /**
+     * 扫码报备所需商户类型
+     */
+    public static final String MCH_TYPE = "mchtype";
+
+    /**
+     * 扫码报备所需商户类别
+     */
+    public static final String MCH_CATEGORY = "mchcategory";
+
+    /**
+     * 法人国籍
+     */
+    public static final String CRP_NATIONALITY = "crpNationality";
+
+    /**
+     * 法人性别
+     */
+    public static final String CRP_GENDER = "crpGender";
+
+    /**
+     * 法人职业
+     */
+    public static final String CRP_PROFESSION = "crpProfession";
+
+    /**
+     * 法人地址
+     */
+    public static final String CRP_ADDR = "crpAddr";
+
+    /**
+     * 商户模式
+     */
+    public static final String USER_TYPE = "userType";
+
+    /**
+     * 备注
+     */
+    public static final String REMARK = "remark";
+
+    /**
+     * 结算起始金额
+     */
+    public static final String LOWEST_STL_AMT = "lowestStlAmt";
+
+    /**
+     * 银行预留手机号
+     */
+    public static final String BANK_MOBILE = "bankMobile";
+
+    /**
+     * 实际控制人
+     */
+    public static final String ACTUAL_MANAGER = "actualManager";
+
+    /**
+     * 证件类型
+     */
+    public static final String CERT_TYPE = "certType";
+
+    /**
+     * 证件类型
+     */
+    public static final String MERC_LVL = "mercLvl";
+
+    /**
+     * 总店商户号
+     */
+    public static final String MERC_UP_ID = "mercUpId";
+
+    /**
+     * 联系人通讯地址
+     */
+    public static final String CONTACTS_ADDR = "contactsAddr";
+
+    /**
+     * 结算卡类型
+     */
+    public static final String BALANCE_ACC_TYPE = "balanceAccType";
+
+    /**
+     * 拓展经理姓名
+     */
+    public static final String EXPANDING_MANAGER = "expandingManager";
+
+
+
+
+    // ================ 以下为线上交易权限开通的接口参数名 ================
+
+    /**
+     * 商户号
+     */
+    public static final String MERC_ID = "mercId";
+
+    /**
+     * 接入机构号
+     */
+    public static final String ACC_ORG_NO = "accOrgNo";
+
+    /**
+     * 交易权限
+     */
+    public static final String SCAN_SERVICE_OPEN = "scanServiceOpen";
+
+    /**
+     * 费率信息
+     */
+    public static final String EASY_FEE_BEAN = "easyFeeBean";
+
+    /**
+     * 微信费率类型
+     * 必填 1 百分比，2 固定金额
+     */
+    public static final String R_SCAN_WX_FEE_TYPE = "rscanWxFeeType";
+
+    /**
+     * rscanWxFeeType 为 1时 必填
+     * 示例 0.3 表示 0.003
+     */
+    public static final String R_SCAN_WX_FEE_RATE = "rscanWxFeeRate";
+
+    /**
+     * 微信费率金额
+     * 单位：分
+     * rscanWxFeeType 为 1 时为封底金额
+     * rscanWxFeeType 为 2 时为固定金额
+     */
+    public static final String R_SCAN_WX_FEE_NUM = "rscanWxFeeNum";
+
+    /**
+     * 支付宝费率，同微信
+     */
+    public static final String R_SCAN_ALI_FEE_TYPE = "rscanAliFeeType";
+
+    public static final String R_SCAN_ALI_FEE_RATE = "rscanAliFeeRate";
+
+    public static final String R_SCAN_ALI_FEE_NUM = "rscanAliFeeNum";
+
+
+    /**
+     * 银联借记卡一档费率类型
+     * 1 百分比，2 固定金额
+     */
+    public static final String R_SCAN_DEBIT_TYPE_1 = "rscanDebitType1";
+
+    /**
+     * 银联借记卡一档金额
+     * rscanDebitType1 为 1 时为借记卡一档费率，示例 0.3 表示 0.003，
+     * rscanDebitType1 为 2 时为固定金额 单位：分
+     */
+    public static final String R_SCAN_DEBIT_NUM_1 = "rscanDebitNum1";
+
+    /**
+     * 银联借记卡一档金额封底金额
+     * 单位：分
+     * rscanDebitType1为1 必填
+     */
+    public static final String R_SCAN_DEBIT_MIN_1 = "rscanDebitMin1";
+
+    /**
+     * 银联借记卡一档金额封顶金额
+     * 单位：分
+     * rscanDebitType1为1, 必填
+     */
+    public static final String R_SCAN_DEBIT_MAX_1 = "rscanDebitMax1";
+
+    /**
+     * 银联借记卡二档费率类型
+     * 1、百分比; 2、固定金额
+     */
+    public static final String R_SCAN_DEBIT_TYPE_2 = "rscanDebitType2";
+
+    /**
+     * 银联借记卡二档金额
+     * rscanDebitType2为1时为借记卡一档费率，示例 0.3表 示 0.003;
+     * rscanDebitType2为2时为固定金额 单位：分
+     */
+    public static final String R_SCAN_DEBIT_NUM_2 = "rscanDebitNum2";
+
+    /**
+     * 银联借记卡二档金额封底金额
+     * 单位：分
+     * rscanDebitType2为1,必填
+     */
+    public static final String R_SCAN_DEBIT_MIN_2 = "rscanDebitMin2";
+
+    /**
+     * 银联借记卡二档金额封顶金额
+     * 单位：分
+     * rscanDebitType2 为 1 必填
+     */
+    public static final String R_SCAN_DEBIT_MAX_2 = "rscanDebitMax2";
+
+    /**
+     * 银联借记卡二档金额封顶金额
+     * 单位：分
+     * rscanDebitType2 为 1 必填
+     */
+    public static final String R_SCAN_CREDIT_TYPE_1 = "rscanCreditType1";
+
+    /**
+     * 银联贷记卡 一档金额(>1000)
+     * rscanCreditType1 为 1 时为借记卡一 档费率，示例 0.3 表示 0.003， rscanCreditType1 为 2 时为固定金额 单位：分
+     */
+    public static final String R_SCAN_CREDIT_NUM_1 = "rscanCreditNum1";
+
+    /**
+     * 银联贷记卡 一档金额封底金额
+     * 单位：分
+     * rscanCreditType1 为 1 必填
+     */
+    public static final String R_SCAN_CREDIT_MIN_1 = "rscanCreditMin1";
+
+    /**
+     * 银联贷记卡 二档费类型
+     * 1 百分比 2 固定金额
+     */
+    public static final String R_SCAN_CREDIT_TYPE_2 = "rscanCreditType2";
+
+    /**
+     * 银联贷记卡 二档金额
+     * rscanCreditType2 为 1 时为借记卡一 档费率，示例 0.3 表示 0.003;
+     * rscanCreditType2 为 2 时为固定金额 单位：分
+     */
+    public static final String R_SCAN_CREDIT_NUM_2 = "rscanCreditNum2";
+
+    /**
+     * 银联贷记卡 二档金额封底金额
+     * 单位：分 rscanCreditType2 为 1 必填
+     */
+    public static final String R_SCAN_CREDIT_MIN_2 = "rscanCreditMin2";
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/v20210929/YsServiceV2.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/v20210929/YsServiceV2.java
new file mode 100644
index 0000000..aef1bb1
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/v20210929/YsServiceV2.java
@@ -0,0 +1,169 @@
+package cn.pluss.platform.ys.impl.v20210929;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.crypto.symmetric.DES;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.util.MapUtils;
+import cn.pluss.platform.util.RSAUtils;
+import cn.pluss.platform.util.SignUtils;
+import cn.pluss.platform.yinsheng.v20210929.ReqEntity;
+import cn.pluss.platform.yinsheng.v20210929.ReqMethod;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Service;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestTemplate;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+@Slf4j
+@Service("ysServiceV2")
+public class YsServiceV2 {
+
+    @Autowired
+    private YsConfigV2 ysConfig;
+
+    @Autowired
+    private RestTemplate restTemplate;
+
+    /**
+     * 只用于新的进件接口
+     *
+     * @param url       请求链接
+     * @param reqMethod 请求方法
+     * @param reqData   请求参数
+     * @return
+     */
+    public JSONObject req(String url, ReqMethod reqMethod, JSONObject reqData) {
+
+        try {
+            ReqEntity request = new ReqEntity(reqMethod);
+            request.setSrc(ysConfig.getSrc());
+
+            request.setData(reqData.toJSONString());
+            HttpHeaders headers = new HttpHeaders();
+            headers.setContentType(MediaType.APPLICATION_JSON_UTF8);
+            headers.add("User-Agent",
+                    "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36");
+
+            log.info("业务参数==============>" + JSONObject.toJSONString(reqData));
+            DES des = new DES(ysConfig.getEncryptPwd().getBytes(StandardCharsets.UTF_8));
+            String s = des.encryptBase64(request.getData());
+            request.setData(s);
+            String encryptOriginData = SignUtils.getSignContent((JSONObject) JSON.toJSON(request));
+            log.info("加签源数据==============>" + encryptOriginData);
+            request.setSignValue(RSAUtils.sign(ysConfig.getPriKeyV2(), encryptOriginData));
+
+            request.setReqFlowId("YS" + System.currentTimeMillis() % 10000000 + UUID.randomUUID().toString().substring(4, 7));
+            // 上传图片的请求参数不打印，日志太多了
+            if (!url.equals(YsConfigV2.IMG_UPLOAD)) {
+                log.warn("请求报文==============>" + JSONObject.toJSONString(request));
+            }
+
+            log.info("请求地址：{}", url);
+
+            HttpEntity<JSONObject> reqEntity = new HttpEntity<>((JSONObject) JSON.toJSON(request), headers);
+            String respStr = restTemplate.postForObject(url, reqEntity, String.class);
+            log.info(respStr);
+
+            JSONObject result = JSON.parseObject(respStr);
+            try {
+                Object signValue = result.remove("signValue");
+                String decryptOriginData = result.toJSONString();
+                RSAUtils.checkSign(ysConfig.getPriKeyV2(), decryptOriginData, signValue.toString());
+            } catch (Exception e) {
+                log.error("返回参数验签异常");
+            }
+            JSONObject data = result.getJSONObject("data");
+            if (data == null) {
+                throw new MsgException("接口未获取到业务信息");
+            }
+
+            if (!data.getString("code").equals(YsConstant.ReqStatus.SUCCESS.getCode())
+                    && !"商户为非法人结算，需要人工审核".equals(data.getString("note"))) {
+                throw new MsgException(data.getString("note"));
+            }
+
+            return data;
+        } catch (Exception e) {
+//            e.printStackTrace();
+            if (e instanceof MsgException) {
+                throw (MsgException) e;
+            } else {
+                throw new MsgException("银盛接口异常, {}", e.getMessage());
+            }
+        }
+    }
+
+    /**
+     * 只用于新的进件接口
+     *
+     * @param url       请求链接
+     * @param method    请求方法
+     * @param reqData   请求参数
+     * @param extraBase 额外的基本参数
+     * @return
+     */
+    public JSONObject req(String url, String method, JSONObject reqData, Map<String, Object> extraBase, Map<String, Object> fileMap) {
+
+        try {
+            Map<String, Object> paramMap = new HashMap<>();
+            paramMap.put("method", method);
+            paramMap.put("partner_id", ysConfig.getSrcMerchantNo());
+            paramMap.put("timestamp", DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
+            paramMap.put("charset", "utf-8");
+            paramMap.put("sign_type", "RSA");
+            paramMap.put("version", "3.0");
+
+            if (extraBase != null) {
+                paramMap.putAll(extraBase);
+            }
+
+            paramMap.put("biz_content", JSON.toJSONString(reqData));
+            String encryptOriginData = SignUtils.getSignContent((JSONObject) JSON.toJSON(paramMap));
+            log.debug("加签源数据==============>"+ encryptOriginData);
+            paramMap.put("sign", RSAUtils.sign(ysConfig.getPriKeyV2(), encryptOriginData));
+
+            if (fileMap != null) {
+                paramMap.putAll(fileMap);
+            }
+
+            HttpHeaders headers = new HttpHeaders();
+            headers.add("User-Agent",
+                    "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36");
+
+            log.debug("业务参数==============>" + JSONObject.toJSONString(reqData));
+            HttpEntity<MultiValueMap<String, Object>> entity = new HttpEntity<>(MapUtils.map2MultiValueMap(paramMap), headers);
+            String result = restTemplate.postForObject(url, entity, String.class);
+
+            log.debug("请求结果：{}", result);
+
+            return JSONObject.parseObject(result);
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new MsgException("银盛接口异常");
+        }
+    }
+
+    /**
+     * 只用于新的进件接口
+     *
+     * @param url       请求链接
+     * @param method    请求方法
+     * @param reqData   请求参数
+     * @param extraBase 额外的基本参数
+     * @return
+     */
+    public JSONObject req(String url, String method, JSONObject reqData, Map<String, Object> extraBase) {
+        return req(url, method, reqData, extraBase, null);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/v20220527/YsConfigV3.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/v20220527/YsConfigV3.java
new file mode 100644
index 0000000..ad6085f
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/v20220527/YsConfigV3.java
@@ -0,0 +1,17 @@
+package cn.pluss.platform.ys.impl.v20220527;
+
+/**
+ * @author DJH
+ */
+public class YsConfigV3 {
+
+    /**
+     * 商户报备接口，自动报备失败后调用
+     */
+    public static String MER_REPORT = "https://ysgate.ysepay.com/openapi/smsc/saas/sweep/sweepreport";
+
+    /**
+     * 商户重新报备，已报备过的商户可以重新报备
+     */
+    public static String MER_REPORT_AGAIN = "https://ysgate.ysepay.com/openapi/smsc/saas/sweep/reportAgain";
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/pay/YsPayOldServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/pay/YsPayOldServiceImpl.java
new file mode 100644
index 0000000..6f3032f
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/pay/YsPayOldServiceImpl.java
@@ -0,0 +1,815 @@
+package cn.pluss.platform.ys.pay;
+
+
+import cn.pluss.platform.api.ResultCode;
+import cn.pluss.platform.constants.Constant;
+import cn.pluss.platform.device.MercOrderNewService;
+import cn.pluss.platform.dto.MerChantOrderDTO;
+import cn.pluss.platform.entitiy.SettleTypeEnum;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.jft.JftReceiptOrderService;
+import cn.pluss.platform.mapper.SubMercCodeYsMapper;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.merchantOrder.MerchantOrderService;
+import cn.pluss.platform.merchantOrderSplit.MerchantOrderSplitService;
+import cn.pluss.platform.notify.NotifyMessageService;
+import cn.pluss.platform.refundOrder.MerchantRefundOrderService;
+import cn.pluss.platform.util.*;
+import cn.pluss.platform.yinsheng.YsOldSrcMerchantNo;
+import cn.pluss.platform.ys.*;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.concurrent.ExecutorService;
+
+/**
+ * 银盛老版支付接口实现类
+ */
+@Service("ysPayOldService")
+@Slf4j
+public class YsPayOldServiceImpl extends YsPayServiceImpl{
+
+
+    @Resource
+    private YsService ysService;
+
+    @Resource
+    private YsConfig ysConfig;
+
+    @Resource
+    private YsOldConfig ysOldConfig;
+
+    @Setter(onMethod_ = {@Autowired, @Lazy})
+    private MerchantOrderService merchantOrderService;
+
+    @Setter(onMethod_ = {@Autowired, @Lazy})
+    private MerchantRefundOrderService merchantRefundOrderService;
+
+    @Setter(onMethod_ = {@Autowired, @Lazy})
+    private MerchantChannelStatusService merchantChannelStatusService;
+
+    @Resource
+    private ExecutorService executorService;
+
+    @Resource
+    private MercOrderNewService mercOrderNewService;
+
+    @Resource
+    private SubMercCodeYsMapper subMercCodeYsMapper;
+
+    @Resource
+    private JftReceiptOrderService jftReceiptOrderService;
+
+    @Resource
+    private MerchantOrderSplitService merchantOrderSplitService;
+
+    @Resource
+    private NotifyMessageService notifyMessageService;
+
+    public static final String TIMEOUT_EXPRESS = "15m";
+
+    /**
+     * 缴费通支付
+     * @param order
+     * @param jftMerc
+     * @param jftChannel
+     * @return
+     */
+    @Override
+    public JSONObject jftPay(JftReceiptOrder order, JftMercBaseInfo jftMerc, JftMercPaymentChannel jftChannel) {
+        JSONObject reqData = new JSONObject(10);
+        reqData.put("out_trade_no",order.getOrderNumber());
+        reqData.put("shopdate",DateUtils.toString(DateUtils.currentDate(),"yyyyMMdd"));
+        reqData.put("total_amount",order.getAmount());
+        reqData.put("seller_id",jftChannel.getMerchantId());
+        reqData.put("seller_name",jftChannel.getMercName());
+        reqData.put("timeout_express",TIMEOUT_EXPRESS);
+        if(StringUtil.isNotEmpty(order.getSubject())){
+            reqData.put("subject",order.getSubject());
+        }else{
+            reqData.put("subject",jftMerc.getAlias());
+        }
+        reqData.put("business_code",YsBusinessCodeEnum.D0.getCode());
+        reqData.put("buyer_id",order.getPayUserId());
+        reqData.put("fail_notify_url",ParametersUtil.domain + "/wap/notify/old/ysCallBack");
+        if(StringUtil.isNotEmpty(order.getPayUserCity())){
+            SubMercCodeYs ysCodeCity = subMercCodeYsMapper.getSubMercCodeYsByCity(order.getPayUserCity());
+            if(ysCodeCity != null){
+                reqData.put("province",ysCodeCity.getPCode());
+                reqData.put("city",ysCodeCity.getCode());
+            }
+        }
+        YsEnum ysEnum = YsEnum.ALI_JS_PAY;
+        if(Constant.PAY_TYPE_ALIPAY.equals(order.getPayType())){
+            reqData.put("buyer_id", order.getPayUserId());
+        }else{
+            MsgException.throwException("暂未开通当前支付方式，请使用支付宝支付！");
+        }
+        JSONObject respData = ysService.requestOldApiCommon(ysConfig.getPayDomain(), reqData, YsService.TYPE_PAY, ysEnum, YsOldSrcMerchantNo.RSCY.getValue());
+        if(!YSConstants.SUCCESS_CODE.equals(respData.getString("code"))){
+            String sub_code = respData.getString("sub_code");
+            String sub_msg = respData.getString("sub_msg");
+            if("4335".equals(sub_code) && StringUtil.isNotEmpty(sub_msg) && sub_msg.contains("金额超限")){
+                MsgException.throwException("单笔交易金额超限");
+            }else{
+                MsgException.throwException(StringUtil.isNotEmpty(sub_msg) ? respData.getString("sub_msg") : respData.getString("msg"));
+            }
+        }
+        JSONObject result = new JSONObject();
+        result.put("code",ResultCode.SUCCESS.code());
+        JSONObject payData = new JSONObject();
+        JSONObject pData = respData.getJSONObject("jsapi_pay_info");
+        payData.put("source",pData.get("tradeNO"));
+        order.setTransNo(StringUtil.isEmpty(respData.getString("trade_no")) ? "" : respData.getString("trade_no"));
+        result.put("payData",payData);
+        return result;
+    }
+
+    /**
+     * 正扫
+     * @param order
+     * @param channel
+     * @return
+     */
+    @Override
+    public JSONObject tradePay(MerchantOrder order, MerchantChannelStatus channel,MerchantBaseInfo merchant) {
+
+        if(Constant.PAY_TYPE_YSFPAY.equals(order.getPayTypeCode())){
+            MsgException.throwException("实时到账通道暂不支持银联支付，请修改次日到账交易");
+        }
+        if(StringUtil.isEmpty(channel.getSettlementType()) || YsBusinessCodeEnum.D0.getName().equals(channel.getSettlementType())){
+            MsgException.check(order.getConsumeFee() < 0.2,"当前通道最少支付金额为0.2元！");
+        }
+        JSONObject reqData = setPayCommonParams(order,channel.getMerchantId());
+        if(StringUtil.isNotEmpty(channel.getMercName())){
+            reqData.put("seller_name",channel.getMercName());
+        }
+        reqData.put("business_code",YsBusinessCodeEnum.getCodeValue(channel.getSettlementType()));
+        merchant.setChannelLimitPay(reqData,channel.getChannel());
+        YsEnum ysEnum = null;
+        if(StringUtil.isNotEmpty(order.getScanType()) && "01".equals(order.getScanType())){
+            ysEnum = YsEnum.ACTIVE_QR_CODE_PAY;
+            String bank_type = Constant.PAY_TYPE_WECHAT.equals(order.getPayTypeCode()) ? "1902000" : Constant.PAY_TYPE_ALIPAY.equals(order.getPayTypeCode()) ? "1903000" : "9001002";
+            reqData.put("bank_type",bank_type);
+        }else{
+            reqData.put("sub_openid", ParametersUtil.APPID);
+            if(Constant.PAY_TYPE_WECHAT.equals(order.getPayTypeCode())){
+                ysEnum = YsEnum.WECHART_JS_PAY;
+                // 会员充值主扫小程序  小程序当面付 10 小程序线上店
+                if("3".equals(order.getOrderType()) || "9".equals(order.getOrderType()) || "10".equals(order.getOrderType())){
+                    reqData.put("is_minipg", 1);
+                    String defaultAppId = ParametersUtil.APPLETS_APPID;
+                    if(order.getOrderNumber().contains("WAP") || order.getOrderNumber().contains("APP")){
+                        defaultAppId = YsOldSrcMerchantNo.getSubAppIdByValue(channel.getSrcMerchantNo());
+                    }else{
+                        if(StringUtil.isNotEmpty(merchant.getSubAppId())){
+                            defaultAppId = merchant.getSubAppId();
+                        }
+                    }
+                    reqData.put("appid", defaultAppId);
+                }else{
+                    String appid = ParametersUtil.APPID;
+                    if(StringUtil.isNotEmpty(merchant.getAppid())){
+                        appid = merchant.getAppid();
+                    }
+                    reqData.put("appid", appid);
+                    reqData.put("is_minipg", 2);
+                }
+                reqData.put("sub_openid",order.getMercUserId());
+            }else if(Constant.PAY_TYPE_ALIPAY.equals(order.getPayTypeCode())){
+                ysEnum = YsEnum.ALI_JS_PAY;
+                reqData.put("buyer_id", order.getMercUserId());
+            }else if(Constant.PAY_TYPE_YSFPAY.equals(order.getPayTypeCode())){
+                ysEnum = YsEnum.YL_JS_PAY;
+                reqData.put("spbill_create_ip", order.getIp());
+                reqData.put("bank_type",YSConstants.YL_BANK_TYPE);
+                reqData.put("device_info",StringUtil.genRandomNum(8));
+                reqData.put("userId",order.getMercUserId());
+            }
+        }
+        //支付失败通知地址
+        reqData.put("fail_notify_url",ParametersUtil.domain + "/wap/notify/old/ysCallBack");
+        if(StringUtil.isNotEmpty(order.getMercReturnUrl())){
+            reqData.put("returnUrl",order.getMercReturnUrl());
+        }
+        JSONObject respData = ysService.requestOldApiCommon(ysConfig.getPayDomain(), reqData, YsService.TYPE_PAY, ysEnum,channel.getSrcMerchantNo());
+
+        if(!YSConstants.SUCCESS_CODE.equals(respData.getString("code"))){
+            String sub_code = respData.getString("sub_code");
+            String sub_msg = respData.getString("sub_msg");
+            if("4335".equals(sub_code) && StringUtil.isNotEmpty(sub_msg) && sub_msg.contains("商户需补齐相关资料")){
+                MsgException.throwException("D0实时到账：商户未在收银呗APP-商户认证-微信认证内完成授权，暂时无法微信收款");
+            }else if("4335".equals(sub_code) && StringUtil.isNotEmpty(sub_msg) && sub_msg.contains("金额超限")){
+                MsgException.throwException("单笔交易金额超限");
+            }else{
+                MsgException.throwException(StringUtil.isNotEmpty(sub_msg) ? respData.getString("sub_msg") : respData.getString("msg"));
+            }
+        }
+        String tradeStatus = respData.getString("trade_status");
+
+        if(!YsOldConstants.PAY_WAIT_BUYER_PAY.equals(tradeStatus)){
+            MsgException.throwException("未知状态异常:"+tradeStatus);
+        }
+
+        JSONObject object = new JSONObject(3);
+
+        object.put("code",ResultCode.SUCCESS.code());
+
+        JSONObject payData = new JSONObject();
+        if(StringUtil.isNotEmpty(order.getScanType()) && "01".equals(order.getScanType())){
+            payData.put("payUrl",respData.getString("source_qr_code_url"));
+            payData.put("mercOrderNo",order.getMercOrderNo());
+            payData.put("orderNumber",order.getOrderNumber());
+        }else{
+            JSONObject pData = respData.getJSONObject("jsapi_pay_info");
+            if(Constant.PAY_TYPE_WECHAT.equals(order.getPayTypeCode())) {
+                payData.put("payAppId",pData.get("appId"));
+                payData.put("payTimeStamp",pData.get("timeStamp"));
+                payData.put("paynonceStr",pData.get("nonceStr"));
+                payData.put("payPackage",pData.get("package"));
+                payData.put("paySignType",pData.get("signType"));
+                payData.put("paySign",pData.get("paySign"));
+            }else if(Constant.PAY_TYPE_ALIPAY.equals(order.getPayTypeCode())){
+                payData.put("source",pData.get("tradeNO"));
+            }else{
+                payData.put("redirectUrl",respData.get("web_url"));
+            }
+        }
+        payData.put("channel",channel.getChannel());
+        order.setTransNo(StringUtil.isEmpty(respData.getString("trade_no")) ? "" : respData.getString("trade_no"));
+        object.put("payData",payData);
+        return object;
+    }
+
+    /**
+     * 反扫
+     * @param merchantOrderDTO
+     * @param order
+     * @return
+     */
+    @Override
+    public JSONObject tradePay(MerChantOrderDTO merchantOrderDTO, MerchantOrder order) {
+
+        JSONObject reqData = setPayCommonParams(order, merchantOrderDTO.getChannelNo());
+        if(StringUtil.isEmpty(merchantOrderDTO.getChannelStatus().getSettlementType()) || YsBusinessCodeEnum.D0.getName().equals(merchantOrderDTO.getChannelStatus().getSettlementType())){
+            MsgException.throwException("实时到账通道暂不支持反扫收款，请切换次日自动到账通道！");
+//            reqData.put("business_code",YsBusinessCodeEnum.FS_D0.getCode());
+        }else{
+            reqData.put("business_code",YsBusinessCodeEnum.getCodeValue(merchantOrderDTO.getChannelStatus().getSettlementType()));
+        }
+        if(StringUtil.isNotEmpty(merchantOrderDTO.getChannelStatus().getMercName())){
+            reqData.put("seller_name",merchantOrderDTO.getChannelStatus().getMercName());
+        }
+        if(merchantOrderDTO.getMerchantBaseInfo() != null){
+            merchantOrderDTO.getMerchantBaseInfo().setChannelLimitPay(reqData,Integer.valueOf(order.getAisleSwitch()));
+        }
+        if(Constant.PAY_TYPE_WECHAT.equals(order.getPayTypeCode())){
+            reqData.put("bank_type",YSConstants.WX_BANK_TYPE);
+        }else if(Constant.PAY_TYPE_ALIPAY.equals(order.getPayTypeCode())){
+            reqData.put("bank_type",YSConstants.ALI_BANK_TYPE);
+            reqData.put("scene","bar_code");
+        }else if(Constant.PAY_TYPE_YSFPAY.equals(order.getPayTypeCode())){
+            reqData.put("bank_type",YSConstants.YL_BANK_TYPE);
+            reqData.put("device_info", StringUtil.genRandomNum(8));
+        }else{
+            //苏宁
+            reqData.put("bank_type",YSConstants.SN_BANK_TYPE);
+        }
+        reqData.put("auth_code",merchantOrderDTO.getAuthCode());
+        //是否限制信用卡 0和空表示不限制 1表示禁用信用卡
+        reqData.put("limit_credit_pay","0");
+
+        //交易失败通知地址
+        reqData.put("fail_notify_url",ParametersUtil.domain + "/wap/notify/old/ysCallBack");
+        JSONObject respData = ysService.requestOldApiCommon(ysConfig.getPayDomain(), reqData, YsService.TYPE_PAY, YsEnum.BAR_CODE_PAY,merchantOrderDTO.getChannelStatus().getSrcMerchantNo());
+        JSONObject result = new JSONObject();
+        if(!YSConstants.SUCCESS_CODE.equals(respData.getString("code"))){
+            MsgException.throwException(respData.getString("msg"));
+        }
+        if(YsOldConstants.PAY_TRADE_SUCCESS.equals(respData.getString("trade_status"))){
+
+            order.setThirdTransNo(respData.getString("out_trade_no"));
+            order.setTransNo(respData.getString("trade_no"));
+            order.setMercUserId(respData.get("buyer_user_id") == null ? respData.getString("openid") : respData.getString("buyerId"));
+            String card_type = respData.getString("card_type");
+            if(StringUtil.isNotEmpty(card_type)){
+                String drType = card_type.equals("debit") ? "1" : card_type.equals("credit") ? "2" : "3";
+                order.setDrType(drType);
+            }
+            result.put("code",ResultCode.SUCCESS.code());
+            result.put("payStatus","1");
+            result.put("msg","请求成功！");
+            result.put("payTime",new Date());
+            result.put("channelOrderNo",respData.getString("out_trade_no"));
+            result.put("transNo",respData.getString("trade_no"));
+        }else if(YsOldConstants.PAY_TRADE_PROCESS.equals(respData.getString("trade_status"))){
+            result.put("code", ResultCode.TRANSUNKNOW.code());
+            result.put("msg","等待支付中...");
+            result.put("payStatus","7");
+        }else{
+            result.put("code", ResultCode.FAIL.code());
+            result.put("msg",respData.getString("sub_msg"));
+            result.put("payStatus","0");
+        }
+        return result;
+    }
+
+    /**
+     * 退款
+     * @param order
+     * @param mchNo
+     * @return
+     */
+    @Override
+    public Map<String, Object> refundPay(MerchantOrder order, String mchNo) {
+        if(SettleTypeEnum.D0.getValue() == order.getSettlementType()){
+            MsgException.throwException("当前订单不支持退款！");
+        }
+        MerchantChannelStatus channel = merchantChannelStatusService.getByMerchantId(mchNo);
+        Map<String,Object> result = new HashMap<>(4);
+        JSONObject reqData = new JSONObject(6);
+        String refundNo = "YSR"+StringUtil.getBillno();
+        reqData.put("out_trade_no",order.getOrderNumber());
+        reqData.put("shopdate",DateUtils.formatDateDefault(new Date(),"yyyyMMdd"));
+        reqData.put("trade_no",order.getTransNo());
+        reqData.put("refund_amount",StringUtil.isNotEmpty(order.getRefundType()) && order.getRefundType() == 2 ? order.getRefundAmt() : order.getConsumeFee());
+        reqData.put("refund_reason",StringUtil.isEmpty(order.getRemark()) ? "申请退款" : order.getRemark());
+        reqData.put("out_request_no",refundNo);
+
+        JSONObject respData = ysService.requestOldApiCommon(ysConfig.getCommonDomain(), reqData, YsService.TYPE_PAY, YsEnum.REFUND_PAY,channel.getSrcMerchantNo());
+
+        MsgException.check(!YSConstants.SUCCESS_CODE.equals(respData.getString("code")),respData.getString("sub_msg"));
+
+        result.put("refundNo",refundNo);
+        result.put("msg","退款成功！");
+        result.put("data",respData);
+        result.put("status","1");
+        result.put("code",ResultCode.SUCCESS.code());
+        return result;
+    }
+
+    /**
+     * 交易查询
+     * @param order
+     * @param mchId
+     * @return
+     */
+    @Override
+    public JSONObject tradeQuery(MerchantOrder order, String mchId) {
+        JSONObject result = new JSONObject();
+        JSONObject reqData = new JSONObject(8);
+        reqData.put("out_trade_no",order.getOrderNumber());
+        reqData.put("shopdate",DateUtils.formatDateDefault(order.getCreateDt(),"yyyyMMdd"));
+        MerchantChannelStatus channel = merchantChannelStatusService.getByMerchantId(mchId);
+        try {
+            JSONObject respones = ysService.requestOldApiCommon(ysConfig.getSearchDomain(), reqData, YsService.TYPE_OTHER, YsEnum.QRDER_QUERY,channel.getSrcMerchantNo());
+            String code = respones.getString("code");
+            if(!YSConstants.SUCCESS_CODE.equals(code)){
+                MsgException.throwException(respones.getString("msg"));
+            }
+            String trade_status = respones.getString("trade_status");
+            result.put("code", ResultCode.SUCCESS.code());
+            result.put("msg", "查询成功！");
+            if(YsOldConstants.PAY_TRADE_SUCCESS.equals(trade_status)){
+                String trade_no = respones.getString("trade_no");
+                JSONArray payList = respones.getJSONArray("pay_detail_list");
+                JSONArray quickList = respones.getJSONArray("quick_pay_detail_list");
+                if(quickList != null && quickList.size() > 0){
+                    JSONObject quickObj = quickList.getJSONObject(0);
+                    String quickFee = quickObj.getString("payee_fee");
+                    result.put("cashFee",quickFee);
+                }
+                if(payList.size() > 0){
+                    JSONObject payObj = payList.getJSONObject(0);
+                    String payTime = payObj.getString("pay_success_time");
+                    if(StringUtil.isNotEmpty(payTime)){
+                        result.put("payTime",DateUtils.parse(payTime,"yyyy-MM-dd HH:mm:ss"));
+                    }else{
+                        result.put("payTime",new Date());
+                    }
+                    String fee = payObj.getString("payee_fee");
+                    result.put("fee",fee);
+                }else{
+                    result.put("payTime",new Date());
+                }
+                result.put("transNo",trade_no);
+                String transactionId = respones.getString("channelRecvNo");//支付渠道单号
+//                if(StringUtil.isNotEmpty(transactionId)){
+//                    transactionId = transactionId.substring(2);
+//                }
+                result.put("channelOrderNo",transactionId);
+                result.put("payStatus", "1");
+//                result.put("buyerId", buyerId);
+            }else if(YsOldConstants.PAY_WAIT_BUYER_PAY.equals(trade_status) || YsOldConstants.PAY_TRADE_PROCESS.equals(trade_status)){
+                result.put("payStatus", "5");
+            }else if(YsOldConstants.PAY_TRADE_PART_REFUND.equals(trade_status)){
+                //部分退款
+                result.put("payStatus", "6");
+            }else if(YsOldConstants.PAY_TRADE_ALL_REFUND.equals(trade_status)){
+                //全部退款
+                result.put("payStatus", "9");
+            }else {
+                result.put("payStatus", "0");
+            }
+            return result;
+        }catch (RuntimeException e){
+            result.put("code", ResultCode.FAIL.code());
+            result.put("msg", e.getMessage());
+            return result;
+        }
+    }
+
+    /**
+     * 退款查询
+     * @param refundOrder
+     * @return
+     */
+    @Override
+    public JSONObject refundQuery(MerchantRefundOrder refundOrder) {
+        JSONObject reqData = new JSONObject(2);
+        reqData.put("out_trade_no",refundOrder.getOrderNumber());
+        reqData.put("out_request_no",refundOrder.getRefundNo());
+        MerchantChannelStatus channel = merchantChannelStatusService.getByMerchantCode(refundOrder.getMerchantCode(),4);
+        JSONObject respData = ysService.requestOldApiCommon(ysConfig.getCommonDomain(), reqData, YsService.TYPE_OTHER, YsEnum.REFUND_PAY_QUERY,channel.getSrcMerchantNo());
+        JSONObject result = new JSONObject();
+        if(!YSConstants.SUCCESS_CODE.equals(respData.getString("code"))){
+            MsgException.throwException(respData.getString("msg"));
+        }
+        if("success".equals(respData.getString("refund_state"))){
+            result.put("code",ResultCode.SUCCESS.code());
+            result.put("status","1");
+            result.put("msg","退款成功！");
+        }else if("in_process".equals(respData.getString("refund_state"))){
+            result.put("code", ResultCode.TRANSUNKNOW.code());
+            result.put("msg","退款中");
+            result.put("status","2");
+        }else{
+            result.put("code", ResultCode.FAIL.code());
+            result.put("payStatus","3");
+            result.put("msg","退款失败");
+        }
+        return result;
+    }
+
+    /**
+     * 获取银联用户标识
+     * @param userAuthCode
+     * @param paymentApp
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public Map<String, Object> getUnionInfo(String userAuthCode, String paymentApp,String merchantId) throws Exception {
+
+        if(StringUtil.isEmpty(userAuthCode)){
+            throw new MsgException("授权码不能为空！");
+        }
+        if(StringUtil.isEmpty(paymentApp)){
+            throw new MsgException("银联标识不能为空！");
+        }
+        MerchantChannelStatus channel = merchantChannelStatusService.getByMerchantId(merchantId);
+        JSONObject reqData = new JSONObject(2);
+        reqData.put("userAuthCode",userAuthCode);
+        reqData.put("appUpIdentifier",paymentApp);
+        JSONObject respones = ysService.requestOldApiCommon(ysConfig.getPayDomain(), reqData, YsService.TYPE_OTHER, YsEnum.YS_USERID_AUTH,channel.getSrcMerchantNo());
+        if(YSConstants.FAILED.equalsIgnoreCase(respones.getString("trade_status"))){
+            throw new MsgException(respones.getString("sub_msg"));
+        }
+        JSONObject result = new JSONObject();
+        reqData.put("data",respones.getString("userId"));
+        result.put("data",reqData);
+        result.put("code","1");
+        result.put("msg","获取成功");
+        return result;
+    }
+    /**
+     * @description:
+     * @date: 2021/8/20 10:04
+     * @param params:
+     * @return java.lang.String
+     */
+    @Override
+    public String payNotifyCallBack(Map<String,String> params){
+        if(!checkSign(params)) return YsConfig.YS_RESULT_FAIL_CODE;
+        //商户单号
+        String ordNo = params.get("out_trade_no");
+        //银盛交易流水号，32位
+        String ysTradeNo = params.get("trade_no");
+        String notify_type = params.get("notify_type");
+        //交易时间 yyyy-MM-dd HH:mm:ss
+        String payTime = params.get("notify_time");
+        //交易状态
+        String tradeStatus = params.get("trade_status");
+        //借贷标识
+        String card_type = params.get("card_type");
+        //发送渠道流水号
+        String channel_send_sn = params.get("channel_send_sn");
+        //openid
+        String openid = params.get("openid");
+        Date payDate = DateUtils.parse(payTime, "yyyy-MM-dd HH:mm:ss");
+        if(YsNotifyTypeEnum.DIVISION.getCode().equals(notify_type)){
+            String division_status_code = params.get("division_status_code");
+            String note = StringUtil.isEmpty(params.get("note")) ? "" : params.get("note");
+            String division_status = StringUtil.isEmpty(params.get("division_status")) ? "" : params.get("division_status");
+            MerchantOrderSplit orderSplit = merchantOrderSplitService.getByOrderNumber(ordNo);
+            if(orderSplit != null){
+                if("00".equals(division_status_code)){
+                    orderSplit.setDivStatus(2);
+                }else if("01".equals(division_status_code)){
+                    orderSplit.setDivStatus(1);
+                }else if("02".equals(division_status_code)){
+                    orderSplit.setDivStatus(3);
+                }else if("03".equals(division_status_code)){
+                    orderSplit.setDivStatus(4);
+                }else{
+                    orderSplit.setDivStatus(-1);
+                }
+                orderSplit.setDivStatusCode(division_status_code);
+                orderSplit.setRemark(note + "-"+division_status);
+                merchantOrderSplitService.updateById(orderSplit);
+                // 推送分账通知
+                executorService.execute(() -> notifyMessageService.sendLowerSplitNotify(orderSplit));
+            }
+        }else{
+            MercOrderNew newOrder = mercOrderNewService.getOrderByNo(ordNo);
+            if(newOrder != null){
+                log.info("====================>【银盛】新版设备订单回调,订单号:{}<====================",newOrder.getOrderNo());
+                if(YsOldConstants.PAY_TRADE_SUCCESS.equals(tradeStatus)){
+                    String channelRecvNo = params.get("channel_recv_sn");
+                    if(Constant.PAY_TYPE_ALIPAY.equals(newOrder.getPayType())){
+                        channelRecvNo = channelRecvNo.substring(2);
+                    }
+                    mercOrderNewService.devicePaySuccessNotifyV2(newOrder.getOrderNo(),ysTradeNo,channelRecvNo,payDate,newOrder);
+                }
+                return YsConfig.RESULT_SUCCESS_CODE;
+            }
+            JftReceiptOrder jftOrder = jftReceiptOrderService.getOrderByNo(ordNo);
+            if(jftOrder != null){
+                log.info("====================>【银盛】缴费通订单回调,订单号:{}<====================",jftOrder.getOrderNumber());
+                if(YsOldConstants.PAY_TRADE_SUCCESS.equals(tradeStatus)){
+                    String channelRecvNo = params.get("channel_recv_sn");
+                    if(Constant.PAY_TYPE_ALIPAY.equals(jftOrder.getPayType())){
+                        channelRecvNo = channelRecvNo.substring(2);
+                    }
+                    jftOrder.setTransNo(ysTradeNo);
+                    jftOrder.setTransTime(payDate);
+                    jftOrder.setChannelTransNo(channelRecvNo);
+                    executorService.execute(() -> jftReceiptOrderService.updatePaySuccessNotify(jftOrder));
+                }
+                return YsConfig.RESULT_SUCCESS_CODE;
+            }
+            //支付通知
+            QueryWrapper<MerchantOrder> orderWrapper = new QueryWrapper<MerchantOrder>()
+                    .eq("orderNumber",ordNo).in("status","5","7");
+            MerchantOrder order = merchantOrderService.getOne(orderWrapper);
+            if(order == null){
+                log.error("====================>【银盛】支付成功回调根据订单号查询带支付的订单，查询的订单为空：订单号：{}<====================",ordNo);
+                return YsConfig.RESULT_SUCCESS_CODE;
+            }
+            if(YSConstants.REFUND_PAY_NOTIFY_CODE.equals(notify_type)){
+                log.info("====================>【银盛】退款成功回调，我方原订单号：{}<====================",ordNo);
+                QueryWrapper<MerchantRefundOrder> queryWrapper = new QueryWrapper<MerchantRefundOrder>()
+                        .eq("orderNumber",ordNo).eq("channelNo",ysTradeNo).eq("status","2");
+                MerchantRefundOrder refundOrder = merchantRefundOrderService.getOne(queryWrapper);
+                if(refundOrder == null){
+                    log.error("====================>【银盛】退款成功回调，我方原订单号：{}，银盛原订单号：{}，查询出的退款订单为空！<====================",ordNo,ysTradeNo);
+                }else{
+                    if("2".equals(refundOrder.getStatus())){
+                        refundOrder.setRefundTime(payDate);
+                        refundOrder.setStatus("1");
+                        refundOrder.setFailMsg("退款成功");
+                        executorService.execute(() -> merchantRefundOrderService.updateOrderAndSendNotify(refundOrder));
+                    }else{
+                        log.error("====================>【银盛】退款订单状态有误，当前退款订单状态为：{}！<====================",refundOrder.getStatus());
+                    }
+                }
+            }else if(YSConstants.FAIL_PAY_NOTIFY_CODE.equals(notify_type)){
+                log.info("====================>【银盛】支付失败回调通知,notify_type参数：{}<====================",notify_type);
+                merchantOrderService.updateFailOrder(order,tradeStatus,params.get("result_note"));
+            }else{
+                if("TRADE_SUCCESS".equals(tradeStatus)){
+                    String channelRecvNo = params.get("channel_recv_sn");
+                    if(Constant.PAY_TYPE_ALIPAY.equals(order.getPayTypeCode())){
+                        channelRecvNo = channelRecvNo.substring(2);
+                    }
+                    //交易金额
+                    String total_amount = params.get("total_amount");
+                    BigDecimal tradeAmt = new BigDecimal(total_amount);
+                    //收款方手续费
+                    String payee_fee = StringUtil.isEmpty(params.get("payee_fee")) ? "0" : params.get("payee_fee");
+                    BigDecimal enterFee = tradeAmt.subtract(new BigDecimal(payee_fee)).setScale(2,BigDecimal.ROUND_UP);
+                    if(SettleTypeEnum.D0.getValue().intValue() == order.getSettlementType().intValue()){
+                        //提现手续费
+                        MerchantChannelStatus channel = merchantChannelStatusService.getByMerchantCode(order.getMerchantCode(), 4);
+                        try{
+                            JSONObject result = tradeQuery(order, channel.getMerchantId());
+                            String cashFee = result.getString("cashFee");
+                            if(StringUtil.isNotEmpty(cashFee) && BigDecimal.ZERO.compareTo(new BigDecimal(cashFee)) != 0){
+                                order.setCashFee(new BigDecimal(cashFee).setScale(2,BigDecimal.ROUND_HALF_UP));
+                                enterFee = enterFee.subtract(new BigDecimal(cashFee));
+                            }else{
+                                BigDecimal defaultFee = BigDecimal.valueOf(0.1);
+                                Date createTime = channel.getCreateTime();
+                                Date defaultTime = DateUtils.parse("2022-01-15");
+                                if(createTime.compareTo(defaultTime) > 0){
+                                    defaultFee  = BigDecimal.valueOf(0.01);
+                                }
+                                BigDecimal wFee = tradeAmt.multiply(new BigDecimal("0.001"));
+                                if(wFee.doubleValue() < defaultFee.doubleValue()){
+                                    order.setCashFee(defaultFee);
+                                    enterFee = enterFee.subtract(defaultFee).setScale(2,BigDecimal.ROUND_DOWN);
+                                }else{
+                                    order.setCashFee(wFee);
+                                    enterFee = enterFee.subtract(wFee).setScale(2,BigDecimal.ROUND_DOWN);
+                                }
+                            }
+                        }catch (Exception e){
+                            e.printStackTrace();
+                        }
+                    }
+                    order.setEnterFee(enterFee.doubleValue());
+                    order.setTransDt(payDate);
+                    order.setTransNo(ysTradeNo);
+                    order.setStatus("1");
+                    if(StringUtil.isNotEmpty(card_type)){
+                        if(YsCardTypeEnum.DEBIT_TYPE.getCode().equals(card_type)){
+                            order.setDrType(YsCardTypeEnum.DEBIT_TYPE.getValue());
+                        }else if(YsCardTypeEnum.CREDIT_TYPE.getCode().equals(card_type)){
+                            order.setDrType(YsCardTypeEnum.CREDIT_TYPE.getValue());
+                        }else{
+                            order.setDrType(YsCardTypeEnum.OTHER_TYPE.getValue());
+                        }
+                    }else{
+                        order.setDrType(YsCardTypeEnum.OTHER_TYPE.getValue());
+                    }
+                    order.setThirdTransNo(channelRecvNo);
+                    if(StringUtil.isEmpty(order.getMercUserId())){
+                        order.setMercUserId(openid);
+                    }
+                    order.setRemark(channel_send_sn);
+                    executorService.execute(() -> merchantOrderService.updateOrderAndCreateProfit(order));
+                }else{
+                    merchantOrderService.updateFailOrder(order,tradeStatus,"");
+                }
+            }
+        }
+        return YsConfig.RESULT_SUCCESS_CODE;
+    }
+
+    /**
+     * @description:校验签名
+     * @date: 2021/8/23 10:06
+     * @param params:
+     * @return boolean
+     */
+    private boolean checkSign(Map<String, String> params) {
+        String sign = params.get("sign");
+        params.remove("sign");
+        JSONObject paramsData = JSONObject.parseObject(JSONObject.toJSONString(params));
+        String signContent = SignUtils.getYSSignContent(paramsData);
+        boolean flag = false;
+        try {
+            flag = RSAUtils.checkSign(ysOldConfig.getOldPubKey(),signContent,sign);
+        } catch (Exception e) {
+            log.info("=========================>【银盛】校验签名异常，异常信息:{}<=====================",e.getMessage());
+            e.printStackTrace();
+        }
+        return flag;
+    }
+    /**
+     * @description:组装支付公共参数
+     * @date: 2021/9/29 11:54
+     * @param order:
+     * @param merchantId:
+     * @return com.alibaba.fastjson.JSONObject
+     */
+    private JSONObject setPayCommonParams(MerchantOrder order,String merchantId) {
+        JSONObject reqData = new JSONObject(8);
+        reqData.put("out_trade_no",order.getOrderNumber());
+        reqData.put("shopdate",DateUtils.formatDateDefault(new Date(),"yyyyMMdd"));
+        if(StringUtil.isNotEmpty(order.getSubject())){
+            reqData.put("subject",order.getSubject());
+        }else if(StringUtil.isNotEmpty(order.getMercRemark())){
+            reqData.put("subject",order.getMercRemark());
+        }else{
+            reqData.put("subject",order.getMerchantName());
+        }
+        reqData.put("total_amount",order.getConsumeFee().toString());
+        reqData.put("seller_id",merchantId);
+        reqData.put("seller_name",StringUtil.isNotEmpty(order.getAlias()) ? order.getAlias() : order.getMerchantName());
+        reqData.put("timeout_express",TIMEOUT_EXPRESS);
+        reqData.put("submer_ip","127.0.0.1");
+        if(StringUtil.isNotEmpty(order.getExtendParam())){
+            reqData.put(Constant.YS_PAY_ECHO_KEY_NAME,order.getExtendParam());
+        }
+        if(StringUtil.isNotEmpty(order.getCity())){
+            reqData.put("province",order.getProvince());
+            reqData.put("city",order.getCity());
+        }
+        else{
+            String ipAddress = order.getIpAddress();
+            if(StringUtil.isNotEmpty(ipAddress)){
+                String[] area = ipAddress.split("-");
+                if(area.length == 2 && StringUtil.isNotEmpty(area[1])){
+                    String city = area[1];
+                    SubMercCodeYs areaInfo = subMercCodeYsMapper.getSubMercCodeYsByCity(city);
+                    if(areaInfo != null){
+                        reqData.put("province",areaInfo.getPCode());
+                        reqData.put("city",areaInfo.getCode());
+                    }
+                }
+            }
+        }
+
+        return reqData;
+    }
+
+    @Override
+    public String tradePayWap(MerchantOrder order, MerchantChannelStatus channel) {
+        JSONObject reqData = bulidWapParams(order,channel);
+        String signContent = SignUtils.getYSSignContent(reqData);
+        try {
+            reqData.put("sign",RSAUtils.sign(ysConfig.getPriKey(), signContent));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return StringUtil.buildPostForm(ysConfig.getCommonDomain(), reqData.toJavaObject(Map.class));
+    }
+
+
+    private JSONObject bulidWapParams(MerchantOrder order,MerchantChannelStatus channel) {
+        JSONObject request = new JSONObject();
+        request.put("method",YsEnum.YS_WAP_PAY.getApiName());
+        request.put("partner_id",ysConfig.getSrcMerchantNo());
+        request.put("timestamp",DateUtils.currentYourDate("yyyy-MM-dd HH:mm:ss"));
+        request.put("charset","utf-8");
+        request.put("sign_type","RSA");
+        request.put("version","3.0");
+        request.put("notify_url",ParametersUtil.domain + "/wap/notify/old/ysCallBack");
+        request.put("return_url",ParametersUtil.domain + "/wap/activity/good?token="+order.getToken());
+
+        request.put("out_trade_no",order.getOrderNumber());
+        request.put("subject",order.getMerchantName());
+        request.put("total_amount",order.getConsumeFee().toString());
+        request.put("seller_id",channel.getMerchantId());
+        if(StringUtil.isNotEmpty(channel.getMercName())){
+            request.put("seller_name",channel.getMercName());
+        }else{
+            request.put("seller_name",StringUtil.isNotEmpty(order.getAlias()) ? order.getAlias() : order.getMerchantName());
+        }
+        request.put("timeout_express",TIMEOUT_EXPRESS);
+        request.put("business_code",YsBusinessCodeEnum.D1.getCode());
+        request.put("pay_mode","native");
+        request.put("bank_type","1903000");
+        request.put("tran_type","1");
+        request.put("shopdate",DateUtils.currentYourDate("yyyyMMdd"));
+        return request;
+    }
+    /**
+     * @description:获取分账参数
+     * @date: 2021/11/26 11:03
+     * @param divParans:
+     * @param settingList:
+     */
+    private JSONObject setDivMerchantParams(JSONObject divParans, List<MerchantSplitSetting> settingList) {
+        MsgException.checkNull(divParans.getString("merchantCode"),"分账商户号有误！");
+        JSONObject result = new JSONObject();
+        boolean flag = false;
+        for (MerchantSplitSetting setting:settingList) {
+            if(divParans.getString("merchantCode").equals(setting.getDiviMerchantCode())){
+                flag = true;
+                result.put("division_mer_usercode",setting.getDiviMerchantId());
+                break;
+            }
+        }
+        if(!flag){
+            MsgException.throwException("分账商户号有误！");
+        }
+        return result;
+    }
+
+    @Override
+    public JSONObject getUnionAccountUrl(JSONObject reqData) {
+        JSONObject respData = ysService.requestOldApiCommon(ysConfig.getCommonDomain(), reqData, YsService.TYPE_OTHER, YsEnum.YS_UNION_ACCOUNT,null);
+        if(!YSConstants.SUCCESS_CODE.equals(respData.getString("code"))){
+            MsgException.throwException(respData.getString("msg"));
+        }
+        String state = respData.getString("state");
+        if(!Constant.RESULT_CODE_SUCCESS.equals(state)){
+            MsgException.throwException(respData.getString("desc"));
+        }
+        JSONObject result = new JSONObject(1);
+        result.put("url",respData.getString("bill_download_url"));
+        return result;
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/pay/YsPayServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/pay/YsPayServiceImpl.java
new file mode 100644
index 0000000..9e8a400
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/pay/YsPayServiceImpl.java
@@ -0,0 +1,505 @@
+package cn.pluss.platform.ys.pay;
+
+import cn.pluss.platform.api.ResultCode;
+import cn.pluss.platform.channel.MakeMoneyService;
+import cn.pluss.platform.constants.Constant;
+import cn.pluss.platform.dto.MemberScanPayDTO;
+import cn.pluss.platform.dto.MerChantOrderDTO;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.merchantOrder.MerchantOrderService;
+import cn.pluss.platform.pay.PayService;
+import cn.pluss.platform.util.*;
+import cn.pluss.platform.ys.YsConfig;
+import cn.pluss.platform.ys.YsService;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 银盛支付实现类
+ */
+@Service("ysPayService")
+@Slf4j
+public class YsPayServiceImpl implements PayService {
+
+
+    @Resource
+    private YsService ysService;
+
+    @Resource
+    private YsConfig ysConfig;
+
+    @Setter(onMethod_ = {@Autowired,@Lazy})
+    private MakeMoneyService makeMoneyService;
+
+    @Setter(onMethod_ = {@Autowired,@Lazy})
+    private MerchantOrderService merchantOrderService;
+    /**
+     * 商家被扫
+     * @param order
+     * @param channel
+     * @return
+     */
+    @Override
+    public JSONObject tradePay(MerchantOrder order, MerchantChannelStatus channel,MerchantBaseInfo merchant) {
+        int flag = new BigDecimal(String.valueOf(order.getConsumeFee())).compareTo(new BigDecimal("0.01"));
+        MsgException.check(flag <= 0,"订单金额必须大于0.01元！");
+        //小程序
+        String url = ysConfig.UNI_JSAPI_PAY;
+        if("9".equals(order.getOrderType()) || "10".equals(order.getOrderType())){
+            url = ysConfig.WX_APPLETS_PAY;
+        }else{
+            if(Constant.PAY_TYPE_ALIPAY.equals(order.getPayTypeCode())){
+                url = ysConfig.ALI_JSAPI_PAY;
+            }else if(Constant.PAY_TYPE_WECHAT.equals(order.getPayTypeCode())){
+                url = ysConfig.WX_JSAPI_PAY;
+            }
+        }
+
+        JSONObject reqData = converParameter(order,channel);
+
+        JSONObject respones = ysService.requestApi(url, reqData,YsService.TYPE_PAY);
+
+        JSONObject rData = checkResultParams(respones);
+
+        JSONObject object = new JSONObject(3);
+
+        object.put("code",ResultCode.SUCCESS.code());
+
+        JSONObject payData = new JSONObject();
+
+        JSONObject pData = rData.getJSONObject("payData");
+        if(Constant.PAY_TYPE_WECHAT.equals(order.getPayTypeCode())) {
+//            payData.put("prepayId",pData.get("prepayId"));
+            payData.put("payAppId",pData.get("appId"));
+            payData.put("payTimeStamp",pData.get("timeStamp"));
+            payData.put("paynonceStr",pData.get("nonceStr"));
+            payData.put("payPackage",pData.get("package"));
+            payData.put("paySignType",pData.get("signType"));
+            payData.put("paySign",pData.get("paySign"));
+//            payData.put("partnerId",pData.get("partnerId"));
+        }else if(Constant.PAY_TYPE_ALIPAY.equals(order.getPayTypeCode())){
+            payData.put("source",pData.get("tradeNO"));
+        }else{
+            payData.put("redirectUrl",pData.get("redirectUrl"));
+        }
+        payData.put("channel",channel.getChannel());
+        order.setTransNo(StringUtil.isEmpty(rData.getString("ysTradeNo")) ? "" : rData.getString("ysTradeNo"));
+        object.put("payData",payData);
+        return object;
+    }
+
+    /**
+     * 组装请求业务参数
+     * @param order
+     * @param channel
+     * @return
+     */
+
+    public JSONObject converParameter(MerchantOrder order, MerchantChannelStatus channel) {
+        JSONObject reqData = new JSONObject(10);
+        reqData.put("merchantNo",channel.getMerchantId());
+        if(Constant.PAY_TYPE_WECHAT.equals(order.getPayTypeCode())){
+            reqData.put("openId",order.getMercUserId());
+            reqData.put("appId", ParametersUtil.APPID);
+        }else{
+            reqData.put("userId",order.getMercUserId());
+        }
+        reqData.put("backUrl", ParametersUtil.domain+"/wap/notify/ysCallBack");
+        reqData.put("merchantOrderNo",order.getOrderNumber());
+        reqData.put("tradeTime", DateUtils.formatDateDefault(new Date(),"yyyyMMddHHmmss"));
+        reqData.put("tradeAmount",new BigDecimal(String.valueOf(order.getConsumeFee())).setScale(2));
+        reqData.put("orderDesc",StringUtil.isEmpty(order.getRemark()) ? "下单" : order.getRemark());
+        return reqData;
+    }
+
+    /**
+     * 商家主扫
+     * @param merchantOrderDTO
+     * @param order
+     * @return
+     */
+    @Override
+    public JSONObject tradePay(MerChantOrderDTO merchantOrderDTO, MerchantOrder order) {
+
+        int flag = new BigDecimal(String.valueOf(order.getConsumeFee())).compareTo(new BigDecimal("0.01"));
+
+        MsgException.check(flag <= 0,"订单金额必须大于0.01元！");
+
+        String url = ysConfig.UNI_BARCODE_PAY;
+        if(Constant.PAY_TYPE_ALIPAY.equals(merchantOrderDTO.getPayTypeCode())){
+            url = ysConfig.ALI_BARCODE_PAY;
+        }else if(Constant.PAY_TYPE_WECHAT.equals(merchantOrderDTO.getPayTypeCode())){
+            url = ysConfig.WX_BARCODE_PAY;
+        }
+        JSONObject reqData = new JSONObject();
+        reqData.put("merchantNo",merchantOrderDTO.getChannelNo());
+        reqData.put("authCode",merchantOrderDTO.getAuthCode());
+        reqData.put("merchantOrderNo",order.getOrderNumber());
+        reqData.put("tradeTime",DateUtils.formatDateDefault(new Date(),"yyyyMMddHHmmss"));
+        reqData.put("tradeAmount",new BigDecimal(String.valueOf(order.getConsumeFee())).setScale(2));
+        reqData.put("orderDesc", StringUtil.isEmpty(order.getRemark()) ? "下单" : order.getRemark());
+        if(Constant.PAY_TYPE_YSFPAY.equals(order.getPayTypeCode())){
+            reqData.put("terminalNo", StringUtil.genRandomNum(8));
+        }
+        JSONObject respones = ysService.requestApi(url, reqData,YsService.TYPE_PAY);
+
+        JSONObject rData = checkResultParams(respones);
+
+        JSONObject result = new JSONObject();
+
+        //通道交易流水号 支付宝或微信交易流水号
+        result.put("channelOrderNo",rData.getString("channelRecvNo"));
+        result.put("transNo",rData.getString("ysTradeNo"));
+        if(YsConfig.YS_RESULT_WAITPAY_CODE.equals(rData.getString("status"))){
+            result.put("code", ResultCode.TRANSUNKNOW.code());
+            result.put("msg","等待支付中...");
+            result.put("payStatus","7");
+        }else{
+            result.put("code",ResultCode.SUCCESS.code());
+            result.put("payStatus","1");
+            result.put("msg","请求成功！");
+            String payTime = rData.getString("payTime");
+            result.put("payTime",DateUtils.parse(payTime,"yyyyMMddHHmmss"));
+        }
+        return result;
+    }
+
+    /**
+     * 校验返回参数
+     * @param respones
+     */
+    private JSONObject checkResultParams(JSONObject respones) {
+        if(YsConfig.YS_RESULT_FAIL_CODE.equals(respones.getString("responseCode"))){
+            MsgException.throwException(respones.getString("responseMeg"));
+        }
+        JSONObject respData = respones.getJSONObject("bizResponseJson");
+        if(YsConfig.YS_RESULT_PAY_FAIL_CODE.equals(respData.getString("status")) ||
+                YsConfig.YS_RESULT_UNKNOW_CODE.equals(respData.getString("status"))){
+            MsgException.throwException(respData.getString("statusMeg"));
+        }
+        return respData;
+    }
+
+    /**
+     * 商家退款
+     * @param order
+     * @param mchNo
+     * @return
+     */
+    @Override
+    public Map<String, Object> refundPay(MerchantOrder order, String mchNo) {
+        Map<String,Object> result = new HashMap<>(4);
+
+        JSONObject reqData = new JSONObject();
+        Double amt = new BigDecimal(String.valueOf(order.getConsumeFee())).setScale(2).doubleValue();
+        String refundNo = "YSR"+StringUtil.getBillno();
+        reqData.put("merchantNo",mchNo);
+        reqData.put("origMerchantOrderNo",order.getOrderNumber());
+        reqData.put("origAmount",amt);
+        reqData.put("refundOrderNo",refundNo);
+        reqData.put("refundAmount",amt);
+
+        JSONObject respones = ysService.requestApi(ysConfig.REFUND_PAY, reqData, YsService.TYPE_PAY);
+
+        JSONObject respData = checkResultParams(respones);
+
+        result.put("refundNo",refundNo);
+        result.put("status","3");
+        result.put("code",ResultCode.FAIL.code());
+        if(YsConfig.YS_RESULT_PAY_SUCCESS_CODE.equals(respData.getString("status"))){
+            result.put("msg","退款成功！");
+            result.put("data",respData);
+            result.put("status","1");
+            result.put("code",ResultCode.SUCCESS.code());
+            return result;
+        }else if(YsConfig.YS_RESULT_ACCEPT_CODE.equals(respData.getString("status"))){
+            result.put("msg","退款中！");
+            result.put("data",respData);
+            result.put("status","2");
+            result.put("code",ResultCode.TRANSUNKNOW.code());
+            return result;
+        }
+        result.put("msg",respData.getString("statusMeg"));
+        return result;
+    }
+
+    /**
+     * 交易查询
+     * @param order
+     * @return
+     */
+    @Override
+    public JSONObject tradeQuery(MerchantOrder order,String mchId) {
+
+        JSONObject result = new JSONObject(6);
+        JSONObject reqData = new JSONObject();
+        reqData.put("merchantNo",mchId);
+        reqData.put("merchantOrderNo",order.getOrderNumber());
+        try {
+            JSONObject respones = ysService.requestApiCommon(ysConfig.PAY_ORDER_QUERY, reqData, ysService.TYPE_PAY);
+            String status = respones.getString("status");
+            if(YsConfig.YS_RESULT_PAY_SUCCESS_CODE.equals(status)){
+                String ysTradeNo = respones.getString("ysTradeNo");
+                String payTime = respones.getString("payTime");
+                String transactionId = respones.getString("channelRecvNo");//支付渠道单号
+                String buyerId = respones.getString("buyerId");
+                if(StringUtil.isNotEmpty(transactionId)){
+                    transactionId = transactionId.substring(2);
+                }
+                result.put("channelOrderNo",transactionId);
+                result.put("payTime",DateUtils.parse(payTime,"yyyyMMddHHmmss"));
+                result.put("transNo",ysTradeNo);
+                result.put("code", ResultCode.SUCCESS.code());
+                result.put("payStatus", "1");
+                result.put("msg", "查询成功！");
+                result.put("buyerId", buyerId);
+                return result;
+            }else if(!"waitpay".equals(status)){
+                result.put("code", ResultCode.SUCCESS.code());
+                result.put("payStatus", "0");
+                result.put("msg", "查询成功");
+                result.put("remark",status);
+                return result;
+            }
+            result.put("code", ResultCode.SUCCESS.code());
+            result.put("payStatus", "5");
+            result.put("msg", "查询成功");
+            return result;
+        }catch (Exception e){
+            result.put("code",ResultCode.FAIL.code());
+            result.put("msg",e.getMessage());
+            return result;
+        }
+    }
+
+    /**
+     * 退款查询
+     * @param refundOrder
+     * @return
+     */
+    @Override
+    public JSONObject refundQuery(MerchantRefundOrder refundOrder) {
+        JSONObject result = new JSONObject(3);
+        JSONObject reqData = new JSONObject();
+        reqData.put("merchantNo",refundOrder.getChannelNo());
+        reqData.put("refundOrderId",refundOrder.getRefundNo());
+        try {
+            JSONObject respones = ysService.requestApiCommon(ysConfig.REFUND_QUERY, reqData, ysService.TYPE_PAY);
+            String status = respones.getString("status");
+            if(YsConfig.YS_RESULT_PAY_SUCCESS_CODE.equals(status)){
+                result.put("status","1");
+                result.put("refundTime",respones.getString("refundPayTime"));
+            }else if(YsConfig.YS_RESULT_ACCEPT_CODE.equals(status)){
+                result.put("status","2");
+            }else{
+                result.put("status","3");
+            }
+            result.put("code",ResultCode.SUCCESS.code());
+            result.put("msg",respones.getString("statusMeg"));
+            return result;
+        }catch (Exception e){
+            log.error("==============>【银盛】退款订单查询异常，异常信息：{}<==================",e.getMessage());
+            result.put("code",ResultCode.FAIL.code());
+            result.put("msg","退款查询异常！");
+            return result;
+        }
+    }
+
+    /**
+     * 订单关闭
+     * @param orderNumber
+     * @param channelNo
+     * @return
+     */
+    @Override
+    public Map<String, Object> closeOrder(String orderNumber, String channelNo) {
+        return null;
+    }
+
+    /**
+     * 获取用户id
+     * @param memberScanPayDTO
+     * @param channel
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public Map<String, Object> getWxOpenId(MemberScanPayDTO memberScanPayDTO, MerchantChannelStatus channel) throws Exception {
+        return null;
+    }
+
+    /**
+     * 获取银联用户标识
+     * @param userAuthCode
+     * @param paymentApp
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public Map<String, Object> getUnionInfo(String userAuthCode, String paymentApp,String merchantId) throws Exception {
+
+        if(StringUtil.isEmpty(userAuthCode)){
+            throw new MsgException("授权码不能为空！");
+        }
+        if(StringUtil.isEmpty(paymentApp)){
+            throw new MsgException("银联标识不能为空！");
+        }
+
+        Map<String,Object> result = new HashMap<>(2);
+
+        JSONObject reqData = new JSONObject(2);
+
+        reqData.put("userAuthCode",userAuthCode);
+        reqData.put("appUpIdentifier",paymentApp);
+        JSONObject respones  = ysService.requestApiCommon(ysConfig.GET_UNION_USER_ID, reqData,YsService.TYPE_PAY);
+        if(ysConfig.YS_RESULT_FAIL_CODE.equals(respones.getString("status"))){
+            throw new MsgException(respones.getString("statusMeg"));
+        }
+        reqData.put("data",respones.getString("unionUserId"));
+
+        result.put("data",reqData);
+        result.put("code","1");
+        result.put("msg","获取成功");
+        return result;
+    }
+
+    @Override
+    public String payNotifyCallBack(Map<String, String> params) {
+        if(params.size() <= 0){
+            return YsConfig.YS_RESULT_FAIL_CODE;
+        }
+        String sign = params.get("sign");
+        params.remove("sign");
+        JSONObject paramsData = JSONObject.parseObject(JSONObject.toJSONString(params));
+        String signContent = SignUtils.getYSSignContent(paramsData);
+        boolean flag = false;
+        try {
+            flag = RSAUtils.checkSign(ysConfig.getPubKey(),signContent,sign);
+        } catch (Exception e) {
+            log.info("=========================>【银盛】校验签名异常，异常信息:{}<=====================",e.getMessage());
+            e.printStackTrace();
+        }
+        if(!flag){
+            log.info("=========================>【银盛】异步通知签名校验失败<=====================");
+            return YsConfig.YS_RESULT_FAIL_CODE;
+        }
+        String serviceNo = params.get("serviceNo");
+        JSONObject respData = JSONObject.parseObject(params.get("bizResponseJson"));
+        //提现异步通道
+        if("withdrawNotify".equals(serviceNo)){
+            withdrawNotify(respData);
+        }else{
+            //支付异步通道
+            payNotify(respData);
+        }
+        return YsConfig.RESULT_SUCCESS_CODE;
+    }
+
+    /**
+     * @description:交易异步通知处理
+     * @date: 2021/8/20 10:22
+     */
+    private String payNotify(JSONObject respData) {
+        String ysTradeNo = respData.getString("ysTradeNo");  //随行付交易流水号，32位
+        //String merchantNo = respData.getString("merchantNo");  //商户编号
+        String ordNo = respData.getString("merchantOrderNo");  //商户单号
+        String payTime = respData.getString("payTime");  //交易时间 yyyyMMddHHmmss
+        //渠道订单号
+        String channelSendNo = respData.getString("channelSendNo");  //发往渠道流水
+        String channelRecvNo = respData.getString("channelRecvNo").substring(2);  //渠道响应流水
+        String settlementAmt = respData.getString("settlementAmt");  //结算金额
+        String srcFee = respData.getString("srcFee");  //发起方手续费
+        String payeeFee = respData.getString("payeeFee");  //收款方手续费
+        String payerFee = respData.getString("payerFee");  //付款方手续费,代付交易使用
+        //支付成功
+        QueryWrapper<MerchantOrder> queryWrapper = new QueryWrapper<MerchantOrder>().eq("orderNumber",ordNo);
+
+        Date payDate = new Date();
+        try {
+            payDate = new SimpleDateFormat("yyyyMMddHHmmss").parse(payTime);
+        } catch (ParseException e) {
+            log.info("====================>【银盛】回调时间格式化异常，待转换的时间格式:{}<====================",payTime);
+        }
+        MerchantOrder order = merchantOrderService.getOne(queryWrapper);
+        if(order == null){
+            log.error("====================>【银盛】支付成功回调订单号查询，查询的订单为空：订单号：{}<====================",ordNo);
+            return YsConfig.RESULT_SUCCESS_CODE;
+        }
+        order.setEnterFee(new BigDecimal(settlementAmt).setScale(2).doubleValue());
+        order.setTransDt(payDate);
+        order.setTransNo(ysTradeNo);
+        order.setThirdTransNo(channelRecvNo);
+        merchantOrderService.updateOrderAndCreateProfit(order);
+        return YsConfig.RESULT_SUCCESS_CODE;
+    }
+
+    /**
+     * @description:提现异步通知处理
+     * @date: 2021/8/20 10:24
+     * @param respData: 回调业务参数
+     * @return java.lang.String
+     */
+    private String withdrawNotify(JSONObject respData) {
+        String ordNo = respData.getString("merchantOrderNo");  //商户单号
+        MakeMoney makeMoney = makeMoneyService.getOne(new QueryWrapper<MakeMoney>().eq("billId", ordNo));
+        if(makeMoney == null){
+            log.info("======【银盛提现回调】========>提现单号：{}数据不存在，请核实<================",ordNo);
+            return YsConfig.RESULT_SUCCESS_CODE;
+        }
+        if(!"0".equals(makeMoney.getState())){
+            log.info("======【银盛提现回调】========>提现单号：{}数据打款状态不为打款中，无需打款状态<================",ordNo);
+            return YsConfig.RESULT_SUCCESS_CODE;
+        }
+        String status = respData.getString("status");
+        if(YsConfig.RESULT_SUCCESS_CODE.equals(status) || YsConfig.YS_RESULT_ACCEPT_CODE.equals(status)){
+            if(YsConfig.RESULT_SUCCESS_CODE.equals(status)){
+                makeMoney.setState("1");
+            }else{
+                makeMoney.setState("0");
+            }
+            makeMoney.setRemark(respData.getString("statusMeg"));
+            makeMoney.setChannelNo(respData.getString("ysTradeNo"));
+            makeMoney.setMercFee(respData.getBigDecimal("payeeFee").setScale(2).doubleValue());
+        }else{
+            if(YsConfig.YS_RESULT_DFREVERSE_CODE.equals(respData.getString("status"))){
+                makeMoney.setState("2");
+            }else{
+                makeMoney.setState("-1");
+            }
+            makeMoney.setThirdStatus(status);
+            makeMoney.setFailReason(respData.getString("statusMeg"));
+        }
+        makeMoneyService.updateById(makeMoney);
+        return YsConfig.RESULT_SUCCESS_CODE;
+    }
+
+    @Override
+    public String tradePayWap(MerchantOrder order, MerchantChannelStatus channel) {
+        return null;
+    }
+
+    @Override
+    public JSONObject getUnionAccountUrl(JSONObject reqData) {
+        return null;
+    }
+
+    @Override
+    public JSONObject jftPay(JftReceiptOrder order, JftMercBaseInfo jftMerc, JftMercPaymentChannel jftChannel) {
+        return null;
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/payV2/YsOldPayV2.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/payV2/YsOldPayV2.java
new file mode 100644
index 0000000..1172356
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/payV2/YsOldPayV2.java
@@ -0,0 +1,23 @@
+package cn.pluss.platform.ys.payV2;
+
+import lombok.Data;
+import org.springframework.stereotype.Component;
+
+/**
+ * TODO
+ *
+ * @author crystal
+ * @date 2022/7/12 17:56
+ */
+@Component
+@Data
+public class YsOldPayV2 {
+
+    private String srcMerchantNo;
+
+    private String payPriKey;
+
+    private String payPubKey;
+
+    private String sybPubKey;
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/settle/YsMakeMoneyServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/settle/YsMakeMoneyServiceImpl.java
new file mode 100644
index 0000000..73c0035
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/settle/YsMakeMoneyServiceImpl.java
@@ -0,0 +1,147 @@
+package cn.pluss.platform.ys.settle;
+
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.settle.ChannelMakeMoneyService;
+import cn.pluss.platform.util.FileUtil;
+import cn.pluss.platform.util.MapUtils;
+import cn.pluss.platform.util.RSAUtils;
+import cn.pluss.platform.util.SignUtils;
+import cn.pluss.platform.ys.YsConfig;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
+import lombok.val;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.*;
+import org.springframework.stereotype.Service;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestTemplate;
+
+import java.io.*;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 银盛通道，对账功能服务类
+ * @author djh
+ */
+@Slf4j
+@Service("ysMakeMoneyService")
+public class YsMakeMoneyServiceImpl implements ChannelMakeMoneyService {
+
+    @Autowired
+    private RestTemplate restTemplate;
+
+    @Autowired
+    private YsConfig ysConfig;
+
+    /**
+     * 对账接口名称
+     */
+    public static final String MAKE_MONEY_METHOD = "ysepay.online.bill.downloadurl.get";
+
+    /**
+     * @param params    参数，非统一参数，用map接收
+     *
+     * @return
+     */
+    @Override
+    public File getFile(Map<String, Object> params) {
+        val sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+        val bizContent = new JSONObject();
+        bizContent.put("account_date", params.get("account_date"));
+        val reqData = new JSONObject();
+        reqData.put("biz_content", bizContent.toJSONString());
+        reqData.put("method", MAKE_MONEY_METHOD);
+        reqData.put("partner_id", ysConfig.getSrcMerchantNo());
+        reqData.put("timestamp", sdf.format(new Date()));
+        reqData.put("charset", "utf-8");
+        reqData.put("sign_type", "RSA");
+        reqData.put("version", "3.0");
+
+        val signContent = SignUtils.getYSSignContent(reqData);
+        try {
+            val sign = RSAUtils.sign(ysConfig.getPriKey(), signContent);
+            reqData.put("sign", sign);
+        } catch (Exception e) {
+            log.info("======【银盛对账方法】签名异常");
+        }
+
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
+        headers.add("User-Agent",
+                "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36");
+
+        val multiValueMap = MapUtils.map2MultiValueMap(reqData);
+
+        HttpEntity<MultiValueMap<String, Object>> reqEntity = new HttpEntity<>(multiValueMap, headers);
+        JSONObject responseJson = restTemplate.postForObject(ysConfig.getSettleDomain(), reqEntity, JSONObject.class);
+
+        if (responseJson == null) {
+            throw new MsgException("银盛对账接口异常");
+        }
+
+        log.info("返回报文：{}", responseJson.toJSONString());
+
+        val bizResult = responseJson.getJSONObject("ysepay_online_bill_downloadurl_get_response");
+
+        val downloadUrl = bizResult.getString("bill_download_url");
+
+        log.info("文件下载链接: {}", downloadUrl);
+
+        val fileName = downloadUrl.substring(downloadUrl.lastIndexOf("/"));
+
+        ResponseEntity<byte[]> response = restTemplate.exchange(downloadUrl, HttpMethod.GET, null, byte[].class);
+
+        InputStream inputStream = new ByteArrayInputStream(response.getBody());
+
+        File file = new File("C:\\Users\\nb2020\\syb\\resources\\ysExcel");
+        if (!file.exists()) {
+            file.mkdirs();
+        }
+
+        File excelFile = new File(file, fileName + ".zip");
+
+
+        OutputStream os = null;
+        try {
+            if (!excelFile.createNewFile()) {
+                throw new MsgException("=======【银盛对账】创建文件失败");
+            }
+
+            log.info("文件路径：{}", excelFile.getAbsolutePath());
+            val bytes = FileUtil.readInputStream(inputStream);
+            os = new FileOutputStream(excelFile);
+            os.write(bytes);
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+            log.info("=======读取文件流异常");
+        } catch (IOException e) {
+            e.printStackTrace();
+            log.info("=======写入文件异常");
+        } finally {
+            if (os != null) {
+                try {
+                    os.close();
+                } catch (IOException e) {
+                    log.info("=======文件流关闭异常");
+                }
+            }
+        }
+
+        return excelFile;
+    }
+
+    @Override
+    public List<Map<String, Object>> readData(File file) {
+        return null;
+    }
+
+    @Override
+    public void insertData(List<Map<String, Object>> readData) {
+
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/settle/YsSettleServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/settle/YsSettleServiceImpl.java
new file mode 100644
index 0000000..3f4acd5
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/settle/YsSettleServiceImpl.java
@@ -0,0 +1,136 @@
+package cn.pluss.platform.ys.settle;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.entity.MakeMoney;
+import cn.pluss.platform.entity.MerchantChannelStatus;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.settle.SettleService;
+import cn.pluss.platform.util.DateUtils;
+import cn.pluss.platform.util.ParametersUtil;
+import cn.pluss.platform.util.StringUtil;
+import cn.pluss.platform.ys.YsConfig;
+import cn.pluss.platform.ys.YsService;
+import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Date;
+
+/**
+ * 银盛代付service
+ */
+@Service("ysSettleService")
+@Slf4j
+public class YsSettleServiceImpl implements SettleService {
+
+    @Resource
+    private YsService ysService;
+
+    @Resource
+    private YsConfig ysConfig;
+
+    /**
+     * 银盛提现接口
+     * @param makeMoney
+     * @return
+     */
+    @Override
+    public MakeMoney withdraw(MakeMoney makeMoney) {
+
+        MsgException.checkNull(makeMoney.getPlanAmount(),"应付提现金为空");
+
+        MsgException.checkBlank(makeMoney.getBillId(),"提现单号为空");
+
+        if(StringUtil.isEmpty(makeMoney.getSettDate()))makeMoney.setSettDate(DateUtils.formatDateDefault(new Date(),"yyyyMMdd"));
+
+        JSONObject reqData = new JSONObject();
+        reqData.put("merchantNo",makeMoney.getMerchantId());
+        reqData.put("merchantOrderNo",makeMoney.getBillId());
+        reqData.put("tradeAmount",makeMoney.getPlanAmount());
+        reqData.put("tradeTime",DateUtils.formatDateDefault(new Date(),"yyyyMMddHHmmss"));
+        reqData.put("shopDate",makeMoney.getSettDate());
+        reqData.put("orderDesc","转账");
+        reqData.put("backUrl", ParametersUtil.domain+"/wap/notify/ysCallBack");
+
+        try {
+            JSONObject respData = ysService.requestApiCommon(YsConfig.SETTLE_TRADE, reqData, YsService.TYPE_PAY);
+            if(YsConfig.RESULT_SUCCESS_CODE.equals(respData.getString("status"))){
+                makeMoney.setRemark(respData.getString("statusMeg"));
+                makeMoney.setThirdStatus(respData.getString("status"));
+                makeMoney.setState("1");
+                makeMoney.setSettType("D0");
+                makeMoney.setChannelNo(respData.getString("ysTradeNo"));
+                makeMoney.setMercFee(respData.getBigDecimal("payeeFee").setScale(2).doubleValue());
+            }else if(YsConfig.YS_RESULT_ACCEPT_CODE.equals(respData.getString("status"))){
+                makeMoney.setRemark(respData.getString("statusMeg"));
+                makeMoney.setThirdStatus(respData.getString("status"));
+                makeMoney.setState("0");
+                makeMoney.setSettType("D0");
+                makeMoney.setChannelNo(respData.getString("ysTradeNo"));
+                makeMoney.setMercFee(respData.getBigDecimal("payeeFee").setScale(2).doubleValue());
+            }else{
+                makeMoney.setFailReason(respData.getString("statusMeg"));
+                makeMoney.setThirdStatus(respData.getString("status"));
+                if(YsConfig.YS_RESULT_DFREVERSE_CODE.equals(respData.getString("status"))){
+                    makeMoney.setState("2");
+                }else{
+                    makeMoney.setState("-1");
+                }
+            }
+            return makeMoney;
+        }catch (Exception e){
+            e.printStackTrace();
+            MsgException.throwException(e.getMessage());
+        }
+        return null;
+    }
+
+    /**
+     * 提现结果查询
+     * @param makeMoney
+     * @return
+     */
+    @Override
+    public JSONObject query(MakeMoney makeMoney) {
+
+        MsgException.checkNull(makeMoney.getBillId(),"提现单号为空！");
+        JSONObject reqData = new JSONObject();
+        reqData.put("merchantNo","826440360108002");
+        reqData.put("merchantOrderNo",makeMoney.getBillId());
+
+        try {
+            JSONObject respData = ysService.requestApiCommon(YsConfig.SETTLE_TRADE_QUERY, reqData, YsService.TYPE_PAY);
+
+            String status = respData.getString("status");
+
+            JSONObject data = new JSONObject();
+
+            if(YsConfig.RESULT_SUCCESS_CODE.equals(status) || YsConfig.YS_RESULT_ACCEPT_CODE.equals(status)){
+                if(YsConfig.RESULT_SUCCESS_CODE.equals(status)){
+                    data.put("state","1");
+                }else{
+                    data.put("state","0");
+                }
+                data.put("thirdStatus",status);
+                data.put("remark",respData.getString("statusMeg"));
+                data.put("channelNo",respData.getString("ysTradeNo"));
+                data.put("mercFee",respData.getBigDecimal("payeeFee").setScale(2));
+            }else{
+                if(YsConfig.YS_RESULT_DFREVERSE_CODE.equals(respData.getString("status"))){
+                    data.put("state","2");
+                }else{
+                    data.put("state","-1");
+                }
+                data.put("thirdStatus",status);
+                data.put("failReason",respData.getString("statusMeg"));
+            }
+            return ResultGenerator.genSuccessJsonResult("查询成功！",data);
+        }catch (Exception e){
+            e.printStackTrace();
+            MsgException.throwException(e.getMessage());
+        }
+        return ResultGenerator.genFailJsonResult("查询失败！");
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ysExtension/bak.txt b/pluss-service-bundle/src/main/java/cn/pluss/platform/ysExtension/bak.txt
new file mode 100644
index 0000000..e69de29
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ysExtension/v20220615/AbstractYsImgUploadService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ysExtension/v20220615/AbstractYsImgUploadService.java
new file mode 100644
index 0000000..b7e777d
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ysExtension/v20220615/AbstractYsImgUploadService.java
@@ -0,0 +1,155 @@
+package cn.pluss.platform.ysExtension.v20220615;
+
+import cn.pluss.platform.channel.MerchProtocolService;
+import cn.pluss.platform.channel.MerchantAuditService;
+import cn.pluss.platform.entity.MerchantImage;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.merchantChannelImg.MerchantChannelImgService;
+import cn.pluss.platform.util.*;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.ByteArrayResource;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.Base64;
+import java.util.Objects;
+import java.util.UUID;
+
+@Slf4j
+public abstract class AbstractYsImgUploadService implements MerchProtocolService, MerchantAuditService {
+
+    @Autowired
+    private YsConfigExtensionV2 ysConfig;
+
+    @Autowired
+    protected RestTemplate restTemplate;
+
+    @Autowired
+    protected MerchantChannelImgService channelImgService;
+
+    @Override
+    public void imageUpload(String url, String picType) {
+        MerchantImage merchantImage = new MerchantImage().setPicUrl(url);
+        imageUpload(merchantImage);
+    }
+
+    /**
+     * @param merchantImage 图片信息
+     */
+    @Override
+    public void imageUpload(MerchantImage merchantImage) {
+        String imgBase64Data = FileUtil.getBase64FromUrl(merchantImage.getPicUrl());
+
+        try {
+            if (!Objects.equals(merchantImage.getPhotoType(), MerchantImage.ImageType.BUSINESS_LICENSE)) {
+                log.debug("压缩图片");
+            } else {
+                log.debug("压缩图片 - 营业执照");
+            }
+            imgBase64Data = Base64Util.compressPic(imgBase64Data, 1024);
+        } catch (Exception e) {
+            LogExceptionUtils.printStack(log, e, null);
+            throw new MsgException("上传文件失败");
+        }
+
+        String picType = imgTypeTransform(merchantImage.getPhotoType());
+        if (picType == null) {
+            // 没有找到对应的图片类型，即不需要保存
+            return;
+        }
+
+        JSONObject param = new JSONObject();
+        param.put("sysFlowId", merchantImage.getPhotoUrl());
+        param.put("picType", picType);
+        try {
+            byte[] bytes = Base64.getDecoder().decode(imgBase64Data);
+            ByteArrayResource byteArrayResource = new ByteArrayResource(bytes) {
+                @Override
+                public String getFilename() {
+                    return picType + ".png";
+                }
+            };
+            String encryptOriginData = SignUtils.getSignContent(param);
+            log.info("加签源数据==============>" + encryptOriginData);
+            param.put("signValue", RSAUtils.sign(ysConfig.getPriKeyV2(), encryptOriginData));
+            param.put("file", byteArrayResource);
+        } catch (Exception e) {
+            log.error("数据异常" + e.getMessage());
+        }
+
+
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.MULTIPART_FORM_DATA);
+
+        int retryTimes = 3;
+        while (true) {
+            param.put("reqFlowId", "YS" + System.currentTimeMillis() % 10000000 + UUID.randomUUID().toString().substring(4, 7));
+
+            //        headers.add("User-Agent",
+            //                "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36");
+
+            MultiValueMap<String, Object> reqParam = MapUtils.map2MultiValueMap(param);
+            HttpEntity<MultiValueMap<String, Object>> reqEntity = new HttpEntity<>(reqParam, headers);
+
+            try {
+                String respStr = restTemplate.postForObject(YsConfigExtensionV2.IMG_UPLOAD, reqEntity, String.class);
+                log.info("result : " + respStr);
+                JSONObject resultJson = JSON.parseObject(respStr);
+                JSONObject data = resultJson.getJSONObject("data");
+                if (!"00".equals(data.getString("code"))) {
+                    throw new MsgException(data.getString("note"));
+                }
+                break;
+            } catch (Exception e) {
+                log.info(e.getClass().getName());
+                // 超时后自动重试
+                retryTimes--;
+                if (retryTimes <= 0) {
+                    throw new MsgException("图片3次上传失败：" + e.getMessage());
+                }
+            }
+        }
+    }
+
+    @Override
+    public String imgTypeTransform(String imageType) {
+        switch (imageType) {
+            case MerchantImage.ImageType.BUSINESS_LICENSE:
+                return "A001";
+            case MerchantImage.ImageType.IDCARD_FRONT:
+                return "A002";
+            case MerchantImage.ImageType.IDCARD_BACK:
+                return "A003";
+            case MerchantImage.ImageType.BANK_CARD_FRONT:
+                return "A004";
+            case MerchantImage.ImageType.BANK_CARD_BACK:
+                return "A005";
+            case MerchantImage.ImageType.SHOP_FRONT_DOOR:
+                return "A006";
+            case MerchantImage.ImageType.STORE_INTERIOR_PHOTO:
+                return "A007";
+            case MerchantImage.ImageType.CASH_DESK_PHOTO:
+                return "A008";
+            case MerchantImage.ImageType.HAND_IDCARD_PHOTO:
+                return "A009";
+            case MerchantImage.ImageType.ACCOUNT_PERMITS:
+                return "A011";
+            case MerchantImage.ImageType.SETTLE_IDCARD_FRONT:
+                return "A013";
+            case MerchantImage.ImageType.SETTLE_IDCARD_BACK:
+                return "A014";
+            case MerchantImage.ImageType.NON_LEG_SETTLE_AUTH:
+                return "B005";
+            case MerchantImage.ImageType.HAND_NON_LEG_SETTLE_AUTH:
+                return "B004";
+            default:
+                return null;
+        }
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ysExtension/v20220615/AbstractYsResultService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ysExtension/v20220615/AbstractYsResultService.java
new file mode 100644
index 0000000..8d3c56a
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ysExtension/v20220615/AbstractYsResultService.java
@@ -0,0 +1,200 @@
+package cn.pluss.platform.ysExtension.v20220615;
+
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.jft.JftMercBaseInfoService;
+import cn.pluss.platform.merchant.JftMercPaymentChannelService;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.task.IJftMercAuditHandler;
+import cn.pluss.platform.task.SxfMerAuditHandler;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.userInfo.UserInfoService;
+import cn.pluss.platform.yinsheng.v20210929.ReqMethod;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+
+import java.util.Map;
+
+/**
+ * @author DJH
+ */
+@Slf4j
+public abstract class AbstractYsResultService extends AbstractYsImgUploadService {
+
+    @Autowired
+    protected MerchantChannelStatusService mcsService;
+
+    @Autowired
+    @Lazy
+    private IJftMercAuditHandler ysMerAuditExtensionV2Handler;
+
+    @Autowired
+    private YsServiceV2 ysServiceV2;
+
+    @Autowired
+    private UserAppService uaService;
+
+    @Autowired
+    private SxfMerAuditHandler sxfMerAuditHandler;
+
+    @Autowired
+    protected JftMercPaymentChannelService jpcService;
+
+    @Autowired
+    protected JftMercBaseInfoService jbiService;
+
+    @Autowired
+    private UserInfoService uiService;
+
+    @Override
+    public JSONObject editMerchantCallback(JSONObject auditResult) throws Exception {
+        return null;
+    }
+
+    @Override
+    public JSONObject merchantAuditCallback(JSONObject auditResult) throws Exception {
+        ysMerAuditExtensionV2Handler.auditCallback(auditResult);
+        return null;
+    }
+
+    @Override
+    public JSONObject merchantAuditResult(Map<String, Object> param) throws Exception {
+        try {
+            JSONObject reqParam = new JSONObject();
+            reqParam.putAll(param);
+            JSONObject data = ysServiceV2.req(YsConfigExtensionV2.MER_RESULT, ReqMethod.MERCHANT_QUERY, reqParam);
+
+            String status = data.getString("status");
+
+            if (YsConstant.AuditStatus.AUDIT_FIRST_TRIAL_SUCCESS.getCode().equals(status)
+                    || YsConstant.AuditStatus.AUDIT_NO_AUDIT.getCode().equals(status)) {
+                firstTrial(data);
+            } else if (YsConstant.AuditStatus.AUDIT_SUCCESS.getCode().equals(status)) {
+                success(data);
+            } else if (YsConstant.AuditStatus.AUDIT_FIRST_TRIAL_FAIL.getCode().equals(status)) {
+                fail(data);
+            }
+
+        } catch (Exception ignored) {
+            ignored.printStackTrace();
+        }
+
+        return null;
+    }
+
+    /**
+     * 初审
+     */
+    private void firstTrial(JSONObject data) {
+        String status = data.getString("status");
+        // 初审完成，判断电子合同签约状态
+        String sysFlowId = data.getString("sysFlowId");
+        JftMercPaymentChannel jpc = getMcsInfoByAppId(sysFlowId);
+        commonPropSet(jpc, data);
+
+        if (!jpc.getStatus().equals(MerchantChannelStatus.AUDIT_STATUS_SIGNED)
+                && !YsConstant.AuditStatus.AUDIT_NO_AUDIT.getCode().equals(status)
+                && !"wait".equals(status)) {
+            reqMerProtocolStatus(jpc);
+        }
+    }
+
+    public void remainSigned(JSONObject data) {
+        String sysFlowId = (String) data.get("sysFlowId");
+        JftMercPaymentChannel jpc = getMcsInfoByAppId(sysFlowId);
+        if (jpc.getStatus().equals(MerchantChannelStatus.AUDIT_STATUS_SUCCESS)) {
+            // 已经进件通过的，不进行初次进件的逻辑操作
+            return;
+        }
+
+        jpc.setStatus(MerchantChannelStatus.AUDIT_STATUS_SUCCESS);
+        // 此处的状态是参考文档上的状态，接口未传该信息
+        commonPropSet(jpc, data);
+        jpcService.updateById(jpc);
+
+        String pushMsg = "缴费通开通进度，当前待签约";
+        LambdaQueryWrapper<UserApp> qWrapper2 = Wrappers.lambdaQuery();
+        qWrapper2.eq(UserApp::getUserId, jpc.getUserId());
+        qWrapper2.eq(UserApp::getUserType, "promoter");
+        UserApp userApp = uaService.getOne(qWrapper2);
+
+        sxfMerAuditHandler.sendNotice(userApp, "收银呗审核通知", pushMsg, jpc.getApplicationId());
+
+    }
+
+    /**
+     * 开户成功
+     */
+    public void success(JSONObject data) {
+
+        String sysFlowId = (String) data.get("sysFlowId");
+        JftMercPaymentChannel jpc = getMcsInfoByAppId(sysFlowId);
+        if (jpc.getStatus().equals(MerchantChannelStatus.AUDIT_STATUS_SUCCESS)) {
+            // 已经进件通过的，不进行初次进件的逻辑操作
+            return;
+        }
+
+        jpc.setStatus(MerchantChannelStatus.AUDIT_STATUS_SUCCESS);
+        // 此处的状态是参考文档上的状态，接口未传该信息
+        commonPropSet(jpc, data);
+        jpcService.updateById(jpc);
+
+        // 开通D0
+        openOnlinePay(jpc);
+
+        String pushMsg = "缴费通审核通过";
+        LambdaQueryWrapper<UserApp> qWrapper2 = Wrappers.lambdaQuery();
+        qWrapper2.eq(UserApp::getUserId, jpc.getUserId());
+        UserApp userApp = uaService.getOne(qWrapper2);
+
+        sxfMerAuditHandler.sendNotice(userApp, "收银呗审核通知", pushMsg, jpc.getApplicationId());
+
+    }
+
+    /**
+     * 失败
+     */
+    public void fail(JSONObject data) {
+        String sysFlowId = data.getString("sysFlowId");
+        JftMercPaymentChannel jpc = getMcsInfoByAppId(sysFlowId);
+        jpc.setStatus(MerchantChannelStatus.AUDIT_STATUS_REJECT);
+        // 此处的状态是参考文档上的状态，接口未传该信息
+        commonPropSet(jpc, data);
+        jpcService.updateById(jpc);
+
+        LambdaQueryWrapper<UserApp> qWrapper2 = Wrappers.lambdaQuery();
+        qWrapper2.eq(UserApp::getUserId, jpc.getUserId());
+        qWrapper2.eq(UserApp::getUserType, "promoter");
+        UserApp userApp = uaService.getOne(qWrapper2);
+        String uniqueKey = sysFlowId + System.currentTimeMillis();
+        sxfMerAuditHandler.sendNotice(userApp, "收银呗审核通知", "缴费通审核不通过: " + data.getString("nogoRemark"), uniqueKey);
+
+    }
+
+    private JftMercPaymentChannel getMcsInfoByAppId(String applicationId) {
+        return jpcService.getByApplicationId(applicationId);
+    }
+
+    private void commonPropSet(JftMercPaymentChannel jpc, JSONObject data) {
+        String mercId = data.getString("mercId");
+        String remark = data.getString("note1");
+        String status = data.getString("status");
+
+        jpc.setThirdStatus(status);
+        jpc.setRemark(remark);
+        jpc.setMerchantId(mercId);
+        if (jpc.getExtra() == null) {
+            jpc.setExtra(new JSONObject());
+        }
+        jpc.getExtra().putAll(data);
+    }
+
+    /**
+     * 开通D0
+     */
+    abstract void openOnlinePay(JftMercPaymentChannel jpc);
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ysExtension/v20220615/YsAuditServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ysExtension/v20220615/YsAuditServiceImpl.java
new file mode 100644
index 0000000..7319253
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ysExtension/v20220615/YsAuditServiceImpl.java
@@ -0,0 +1,744 @@
+package cn.pluss.platform.ysExtension.v20220615;
+
+import cn.pluss.platform.IdCardService;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.jft.JftAuditService;
+import cn.pluss.platform.jft.JftBankCardService;
+import cn.pluss.platform.jft.JftMercBaseInfoService;
+import cn.pluss.platform.jft.JftMerchantRateService;
+import cn.pluss.platform.mapper.BankCodeYsMapper;
+import cn.pluss.platform.mapper.JftMercPaymentChannelMapper;
+import cn.pluss.platform.mcc.MccInfoSortService;
+import cn.pluss.platform.mcc.MccInfoYsService;
+import cn.pluss.platform.mcc.MccReflectService;
+import cn.pluss.platform.merchant.AccountService;
+import cn.pluss.platform.merchant.JftMercPaymentChannelService;
+import cn.pluss.platform.notice.NoticeService;
+import cn.pluss.platform.region.RegionReflectService;
+import cn.pluss.platform.ryx.RyxConstants;
+import cn.pluss.platform.user.impl.GeneralPushUtil;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.userInfo.UserInfoService;
+import cn.pluss.platform.util.*;
+import cn.pluss.platform.yinsheng.v20210929.ReqMethod;
+import cn.pluss.platform.yinsheng.v20210929.RespEntity;
+import cn.pluss.platform.ys.YSConstants;
+import cn.pluss.platform.ys.impl.v20210929.YsConfigV2;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.jetbrains.annotations.NotNull;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.ByteArrayResource;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.TransactionStatus;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionCallbackWithoutResult;
+import org.springframework.transaction.support.TransactionTemplate;
+import org.springframework.util.MultiValueMap;
+
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.concurrent.ExecutorService;
+
+/**
+ * @author djh
+ */
+@Slf4j
+@Service("ysAuditServiceExtensionV2")
+public class YsAuditServiceImpl extends AbstractYsResultService {
+
+    @Autowired
+    private GeneralPushUtil generalPushUtil;
+
+    @Autowired
+    private AccountService accountService;
+
+    @Autowired
+    private JftBankCardService jbcService;
+
+    @Autowired
+    private JftMercPaymentChannelService mpcService;
+
+    @Autowired
+    private IdCardService idCardService;
+
+    @Autowired
+    private RegionReflectService regionReflectService;
+
+    @Autowired
+    private MccReflectService mccReflectService;
+
+    @Autowired
+    private MccInfoYsService mccInfoYsService;
+
+    @Resource
+    private BankCodeYsMapper bankCodeYsMapper;
+
+    @Autowired
+    private MccInfoSortService mccInfoSortService;
+
+    @Autowired
+    private YsServiceV2 ysServiceV2;
+
+    @Autowired
+    private YsConfigExtensionV2 ysConfig;
+
+    @Autowired
+    private NoticeService noticeService;
+
+    @Autowired
+    private UserInfoService uiService;
+
+    @Autowired
+    private UserAppService uaService;
+
+    @Autowired
+    private YsAuditServiceImpl ysAuditServiceExtensionV2;
+
+    @Autowired
+    private ExecutorService executorService;
+
+    @Autowired
+    private JftAuditService jftAuditService;
+
+    @Resource
+    private JftMercPaymentChannelMapper jpcMapper;
+
+    @Autowired
+    private JftMerchantRateService jftMerchantRateService;
+
+    @Autowired
+    private JftMercBaseInfoService jmbiService;
+
+    @Autowired
+    private TransactionTemplate transactionTemplate;
+
+
+    @Override
+    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRES_NEW)
+    public void merchantAudit(String userId, boolean isFailCheck) {
+        preCheck(userId);
+        try {
+            ysAuditServiceExtensionV2.step1(userId);
+            executorService.execute(() -> {
+                try {
+                    ysAuditServiceExtensionV2.step2(userId);
+                    ysAuditServiceExtensionV2.step3(userId);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    final JftMercPaymentChannel entity = mpcService.getByUserId(userId);
+                    if (entity == null) {
+                        return;
+                    }
+
+                    entity.setStatus(MerchantChannelStatus.AUDIT_STATUS_REJECT);
+                    entity.setRemark("缴费通功能开通失败: " + e.getMessage());
+                    entity.setUpdateTime(new Date());
+                    mpcService.updateById(entity);
+                }
+            });
+        } catch (Exception e) {
+            final JftMercPaymentChannel entity = mpcService.getByUserId(userId);
+            if (entity != null) {
+                entity.setRemark("缴费通功能开通失败: " + e.getMessage());
+                entity.setStatus(MerchantChannelStatus.AUDIT_STATUS_REJECT);
+                entity.setUpdateTime(new Date());
+
+                // 这里将驳回的信息放入新的事务中，防止被回滚
+                transactionTemplate.execute(new TransactionCallbackWithoutResult() {
+                    @Override
+                    protected void doInTransactionWithoutResult(@NotNull TransactionStatus status) {
+                        mpcService.updateById(entity);
+                    }
+                });
+
+            }
+
+            throw e;
+        }
+
+    }
+
+    public void preCheck(String userId) {
+        LambdaQueryWrapper<JftMercPaymentChannel> qWrapper2 = Wrappers.lambdaQuery();
+        qWrapper2.eq(JftMercPaymentChannel::getUserId, userId);
+
+        final JftMercPaymentChannel one = mpcService.getOne(qWrapper2);
+        if (one != null) {
+            switch (one.getStatus()) {
+                case MerchantChannelStatus.AUDIT_STATUS_SUCCESS:
+                    throw new MsgException("功能已开通，请勿重复操作");
+                case MerchantChannelStatus.AUDIT_STATUS_EXAMINING:
+                    throw new MsgException("功能开通审核中，请耐心等待审核结果");
+                case MerchantChannelStatus.AUDIT_STATUS_REJECT:
+                    mpcService.removeById(one.getId());
+                default:
+                    break;
+            }
+        }
+
+        final IdCard certIdCard = idCardService.getCertIdCard(userId);
+        if (certIdCard == null) {
+            throw new MsgException("实名身份证不能空");
+        }
+
+        UserInfo ui = uiService.getById(userId);
+        if (StringUtils.isEmpty(ui.getChannelCode())) {
+            // 开放接口注册的用户不受限制
+            final Integer count = jpcMapper.selectCountByCertNo(certIdCard.getCertNo());
+
+            if (count > 1) {
+                throw new MsgException("同一实名信息只能开通一次该功能");
+            }
+        }
+    }
+
+    /**
+     * 提交基本信息
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void step1(String userId) {
+        JftMercBaseInfo jbi = jftAuditService.getMercBaseInfo(Long.parseLong(userId));
+        JftMercPaymentChannel mpc = mpcService.getByUserId(userId);
+
+        UserInfo ui = uiService.getById(userId);
+
+        // 先保存一个进件中的记录
+        if (mpc == null) {
+            mpc = new JftMercPaymentChannel();
+            mpc.setUserId(Long.parseLong(userId));
+            mpc.setStatus(MerchantChannelStatus.AUDIT_STATUS_EXAMINING);
+            mpcService.save(mpc);
+        }
+
+        JftBankCard bankCard = jbcService.getByUserId(Long.parseLong(userId));
+        if (bankCard == null) {
+            throw new MsgException("请先保存银行卡信息");
+        }
+
+        IdCard certIdCard = idCardService.getCertIdCard(userId);
+        JSONObject param = new JSONObject();
+        param.put(YsConstant.ALIAS, jbi.getAlias());
+        param.put(YsConstant.BUSINESS_ADDRESS, jbi.getAddress());
+
+        RegionCodeYs ysRegionCode = regionReflectService.getYsRegionCode(jbi.getProvince(), jbi.getCity(), jbi.getDistrict());
+        param.put(YsConstant.MERC_PROV, ysRegionCode.getProvince());
+        param.put(YsConstant.MERC_CITY, ysRegionCode.getCity());
+        param.put(YsConstant.MERC_AREA, StringUtils.isEmpty(ysRegionCode.getArea()) ? ysRegionCode.getCity() : ysRegionCode.getArea());
+        param.put(YsConstant.LEGAL_PERSON_NAME, certIdCard.getCertName());
+        param.put(YsConstant.LEGAL_PERSON_ID, certIdCard.getCertNo());
+        param.put(YsConstant.LEGAL_PERSON_START, YSConstants.getIdCardLongExpire(certIdCard.getCertStartTime()));
+        param.put(YsConstant.LEGAL_PERSON_LIMIT, YSConstants.getIdCardLongExpire(certIdCard.getCertEndTime()));
+        param.put(YsConstant.LEGAL_PERSON_PHONE, ui.getPhone().substring(0, 11));
+        param.put(YsConstant.ACCOUNT_PERSON_NAME, certIdCard.getCertName());
+        param.put(YsConstant.ACCOUNT_PERSON_ID, certIdCard.getCertNo());
+        param.put(YsConstant.ACCOUNT_CARD_NO, bankCard.getBankCardNo());
+        param.put(YsConstant.ACCOUNT_CARD_NAME, bankCard.getBankHolder());
+        RegionCodeYs bankRegion = regionReflectService.getYsRegionCode(bankCard.getBranchProvince(), bankCard.getBranchCity(), bankCard.getBranchArea());
+        param.put(YsConstant.BANK_PROVINCE, bankRegion.getProvince());
+        param.put(YsConstant.BANK_CITY, bankRegion.getCity());
+        param.put(YsConstant.BANK_AREA, StringUtils.isEmpty(bankRegion.getArea()) ? bankRegion.getCity() : bankRegion.getArea());
+        BankCodeYs bankCodeYs = bankCodeYsMapper.selectByContactLine(bankCard.getContactLine());
+        MsgException.checkNull(bankCodeYs, "银盛通道未找到对应的支行信息, 请重新选择支行");
+        param.put(YsConstant.BANK_NAME, bankCodeYs.getBankName());
+        param.put(YsConstant.BANK_TYPE, bankCodeYs.getBankType());
+        param.put(YsConstant.BANK_BRANCH_TYPE, bankCodeYs.getContactLine());
+        param.put(YsConstant.BANK_BRANCH_NAME, bankCodeYs.getBranchName());
+        param.put(YsConstant.CONTACTS_NAME, certIdCard.getCertName());
+
+        param.put(YsConstant.CONTACTS_PHONE, bankCard.getPhone());
+        param.put(YsConstant.CONTACTS_EMAIL, "18062761507@163.com");
+
+        JftMerchantRate jmrExist = jftMerchantRateService.getRateByUserId(userId);
+        JftMerchantRate rate;
+        if (jmrExist == null) {
+            final JftMerchantRate auditRate = jftMerchantRateService.getAuditRate(Long.parseLong(userId));
+            rate = new JftMerchantRate();
+            rate.setChannel(4);
+            rate.setAliRate(auditRate.getAliRate());
+            rate.setUserId(Long.parseLong(userId));
+            jftMerchantRateService.save(rate);
+        } else {
+            rate = jmrExist;
+        }
+
+        param.put(YsConstant.WECHAT_SIGN_RATE, (rate.getAliRate().intValue() / 100f) + "");
+        param.put(YsConstant.WECHAT_SIGN_MIN, "10");
+        param.put(YsConstant.ALIPAY_SIGN_RATE, (rate.getAliRate().intValue() / 100f) + "");
+        param.put(YsConstant.ALIPAY_SIGN_MIN, "10");
+        param.put(YsConstant.CREDIT_RATE_1, "0.61");
+        param.put(YsConstant.CREDIT_MIN_1, "10");
+        param.put(YsConstant.DEBIT_RATE_1, "0.61");
+        param.put(YsConstant.DEBIT_MIN_1, "10");
+        param.put(YsConstant.DEBIT_MAX_1, "999900");
+        param.put(YsConstant.CREDIT_RATE_2, "0.53");
+        param.put(YsConstant.CREDIT_MIN_2, "10");
+        param.put(YsConstant.DEBIT_RATE_2, "0.53");
+        param.put(YsConstant.DEBIT_MIN_2, "10");
+        param.put(YsConstant.DEBIT_MAX_2, "999900");
+        param.put(YsConstant.OPEN_POS_P, "0");
+        param.put(YsConstant.FAST_PAY, "0");
+        param.put(YsConstant.CODE_ADVANCE_OPEN, "1");
+        param.put(YsConstant.CODE_LEGAL_PERSON_ACC, "1");
+        param.put(YsConstant.CODE_ADVANCE_RATE, "0.10");
+        // 最低垫资费1角
+        param.put(YsConstant.CODE_ADVANCE_MIN, "1");
+        MccReflect mccReflect = mccReflectService.getYsMccReflect(jbi.getMcc());
+        MccInfoYs mccInfoYs = new MccInfoYs();
+        mccInfoYs.setMccCode(mccReflect.getMccCode());
+        mccInfoYs = mccInfoYsService.getOne(new QueryWrapper<>(mccInfoYs));
+        MsgException.checkNull(mccInfoYs, "对应的MCC缺少银盛商户类型");
+        MsgException.checkBlank(mccInfoYs.getType(), "对应的MCC缺少银盛商户类型");
+
+        if ("N".equals(mccInfoYs.getMicro()) && jbi.getMerchantType().equals(MerchantBaseInfo.MERCH_TYPE_MICRO)) {
+            throw new MsgException("小微不支持该mcc");
+        }
+
+        if ("N".equals(mccInfoYs.getIndividual()) && jbi.getMerchantType().equals(MerchantBaseInfo.MERCH_TYPE_INDIVIDUAL)) {
+            throw new MsgException("个体户不支持该mcc");
+        }
+
+        if ("N".equals(mccInfoYs.getCompan()) && jbi.getMerchantType().equals(MerchantBaseInfo.MERCH_TYPE_COMPANY)) {
+            throw new MsgException("企业不支持该mcc");
+        }
+
+        param.put(YsConstant.MCC_SUB_CD, mccInfoYs.getType());
+        param.put(YsConstant.MCC_CD, mccInfoYs.getMccCode());
+        param.put(YsConstant.INDUSTRY, mccInfoYs.getIndustry());
+        param.put(YsConstant.MCH_TYPE, mccInfoYs.getMchType());
+        param.put(YsConstant.CRP_GENDER, StringUtil.getSexFromCertNo(certIdCard.getCertNo()));
+        MccInfoSort mccInfoSort = mccInfoSortService.getByMcc(jbi.getMcc());
+        param.put(YsConstant.CRP_PROFESSION, mccInfoSort.getCode());
+        param.put(YsConstant.CRP_ADDR, jbi.getAddress());
+        param.put(YsConstant.USER_TYPE, AuditUtils.getYsMerchantType(jbi.getMerchantType()));
+        param.put(YsConstant.LOWEST_STL_AMT, "1");
+        param.put(YsConstant.BANK_MOBILE, bankCard.getPhone());
+        param.put(YsConstant.ACTUAL_MANAGER, certIdCard.getCertName());
+        param.put(YsConstant.CERT_TYPE, "00");
+        param.put(YsConstant.MERC_LVL, "1");
+        param.put(YsConstant.CONTACTS_ADDR, jbi.getAddress());
+        param.put(YsConstant.BALANCE_ACC_TYPE, "11");
+        param.put(YsConstant.EXPANDING_MANAGER, "收银呗");
+
+        JSONObject data = ysServiceV2.req(YsConfigExtensionV2.MER_AUDIT, ReqMethod.MERCHANT_ADD, param);
+        RespEntity respEntity = JSON.toJavaObject(data, RespEntity.class);
+        if (!"00".equals(respEntity.getCode())) {
+            throw new MsgException(respEntity.getNote());
+        }
+
+        mpc.setApplicationId(respEntity.getSysFlowId());
+        mpc.setThirdStatus(MerchantChannelStatus.AUDIT_THIRD_STATUS_AUDITING);
+        mpcService.updateById(mpc);
+    }
+
+    /**
+     * 上传图片
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void step2(String userId) {
+        JftMercPaymentChannel mpc = mpcService.getByUserId(userId);
+
+        List<MerchantImage> miList = jftAuditService.listMerchImage(Long.parseLong(userId));
+
+        for (MerchantImage image : miList) {
+            image.setPhotoUrl(mpc.getApplicationId());
+            if (StringUtils.isEmpty(image.getPicUrl())) {
+                continue;
+            }
+
+            if (MerchantImage.ImageType.IDCARD_FRONT.equals(image.getPhotoType())) {
+                // 小微没有法人身份证正面
+                continue;
+            }
+
+            if (MerchantImage.ImageType.IDCARD_BACK.equals(image.getPhotoType())) {
+                // 小微没有法人身份证反面
+                continue;
+            }
+
+            // 小微法人信息用结算身份证信息
+            reusedPic(image, MerchantImage.ImageType.SETTLE_IDCARD_FRONT, MerchantImage.ImageType.IDCARD_FRONT);
+            reusedPic(image, MerchantImage.ImageType.SETTLE_IDCARD_BACK, MerchantImage.ImageType.IDCARD_BACK);
+            reusedPic(image, MerchantImage.ImageType.SETTLE_IDCARD_FRONT, MerchantImage.ImageType.HAND_IDCARD_PHOTO);
+
+            // 银行卡反面图
+            reusedPic(image, MerchantImage.ImageType.BANK_CARD_FRONT, MerchantImage.ImageType.BANK_CARD_BACK);
+
+            imageUpload(image);
+        }
+    }
+
+    /**
+     * 符合条件的图片类型以新的图片类型再次使用
+     *
+     * @param src     商户图片数据
+     * @param reqType 需要的图片原始类型
+     * @param newType 新的图片类型
+     */
+    private boolean reusedPic(MerchantImage src, String reqType, String newType) {
+        if (src.getPhotoType().equals(reqType)) {
+            String originType = src.getPhotoType();
+            src.setPhotoType(newType);
+            imageUpload(src);
+            src.setPhotoType(originType);
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * 发起进件
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void step3(String userId) {
+        // 一码多户开通不需要这一步操作
+        JftMercPaymentChannel jpc = jpcService.getByUserId(userId);
+
+        JftMercBaseInfo jmbi = jmbiService.getMercBaseInfo(Long.parseLong(userId));
+
+        JSONObject data = new JSONObject();
+        data.put("sysFlowId", jpc.getApplicationId());
+        JSONObject resp = ysServiceV2.req(YsConfigV2.MER_APPLY, ReqMethod.MERCHANT_APPLY, data);
+
+        RespEntity respEntity = JSON.toJavaObject(resp, RespEntity.class);
+        jpc.setThirdStatus(cn.pluss.platform.ys.impl.v20210929.YsConstant.AuditStatus.AUDIT_NO_AUDIT.getCode());
+
+        String url = respEntity.getSignUrl();
+        if (StringUtils.isNotEmpty(url)) {
+            // 有签约链接即代表初审通过
+            jpc.setThirdStatus(cn.pluss.platform.ys.impl.v20210929.YsConstant.AuditStatus.AUDIT_FIRST_TRIAL_SUCCESS.getCode());
+            jpc.setStatus(MerchantChannelStatus.AUDIT_STATUS_WAITING_SIGN);
+            Notice notice = new Notice(1, -1, jpc.getUserId() + "");
+            String uniqueKey = "YS_QY" + System.currentTimeMillis();
+            String title = "电子协议签约通知";
+            String content = "尊敬的客户您好，请点此通知完成签约意愿授权。请注意，同意授权后，支付通道才会进行商户资料审核，否则会一直等待审核。";
+
+            notice.setUniqueKey(uniqueKey);
+            notice.setNoticeCode(uniqueKey);
+            notice.setTitle(title);
+            notice.setUrl(url);
+            notice.setDesc(content);
+            noticeService.save(notice);
+
+            generalPushUtil.sendAllPlatByAlias(Collections.singletonList(jpc.getUserId() + ""), title, content, "1");
+
+        }
+
+        jpc.setExtra(resp);
+        jpc.setUpdateTime(new Date());
+        jpcService.updateById(jpc);
+    }
+
+    @Override
+    public void merchantAuditCheck(String userId, boolean isFailCheck) {
+        // nothing to do
+    }
+
+    @Override
+    public void editMerchantAudit(String userId) {
+        // 进件参数拼接
+        JSONObject paramMap = new JSONObject();
+        JftMercPaymentChannel jmpc = jpcService.getByUserId(userId);
+
+        paramMap.put(RyxConstants.MER_IN_ID, jmpc.getExtra().getString(RyxConstants.MER_IN_ID));
+
+        LambdaQueryWrapper<JftBankCard> qWrapper = Wrappers.lambdaQuery();
+        qWrapper.eq(JftBankCard::getUserId, userId);
+        JftBankCard jftBankCard = jbcService.getByUserId(Long.parseLong(userId));
+        JSONObject bak = jftBankCard.getBak();
+
+        BankCard newBankCard = JSON.toJavaObject(bak, BankCard.class);
+        BankCodeYs bankCodeYs = bankCodeYsMapper.selectByContactLine(newBankCard.getContactLine());
+        RegionCodeYs bankRegion = regionReflectService.getYsRegionCode(newBankCard);
+        paramMap.put(YsConstant.MERC_ID, jmpc.getMerchantId());
+        paramMap.put(YsConstant.ACCOUNT_CARD_NAME, newBankCard.getBankHolder());
+        paramMap.put(YsConstant.ACCOUNT_CARD_NO, newBankCard.getBankCardNo());
+        paramMap.put(YsConstant.BANK_PROVINCE, bankRegion.getProvince());
+        paramMap.put(YsConstant.BANK_CITY, bankRegion.getCity());
+        paramMap.put(YsConstant.BANK_NAME, bankCodeYs.getBankName());
+        paramMap.put(YsConstant.BANK_TYPE, bankCodeYs.getBankType());
+        paramMap.put(YsConstant.BANK_BRANCH_TYPE, bankCodeYs.getContactLine());
+        paramMap.put(YsConstant.BANK_BRANCH_NAME, bankCodeYs.getBankName());
+        paramMap.put(YsConstant.BANK_MOBILE, newBankCard.getPhone());
+
+        /*
+         * {
+         * 	"charset":"UTF-8",
+         * 	"data":"{\"note\":\"商户账户信息变更提交成功\",\"code\":\"00\",\"changeFlowId\":\"20211210164429426221368030546\"}",
+         * 	"method":"changeMerAccInfo",
+         * 	"msgCode":"Merchant",
+         * 	"reqFlowId":"YS5869563172",
+         * 	"signType":"RSA",
+         * 	"signValue":"mKw+LR01rDNnkinQ0twx6DBEJYiKOezqh0gy4OAaTpRpVea4G/2Ck23wDFlXXz3/UC0wYPmBOS2AhubpY4L4t8y3aTPS5HE7ZpB8eg3NxPg+1MoGU/9/PqI6SFgqdTYQfUXEZFbDZwBKVhZEc4bUXy76Md/V53SBeMLjW0FCElo=",
+         * 	"src":"ORG20211020190222",
+         * 	"ver":"1.0"
+         * }
+         */
+        JSONObject req = ysServiceV2.req(YsConfigExtensionV2.MER_BANK_CHANGE, ReqMethod.MERCHANT_ACCOUNT_CHANGE, paramMap);
+
+        String changeFlowId = req.getString("changeFlowId");
+        jmpc.getExtra().put("changeFlowId", changeFlowId);
+        jmpc.setStatus(MerchantChannelStatus.AUDIT_STATUS_DATA_EDIT);
+        jpcService.updateById(jmpc);
+
+        // 上传银行卡正面图片
+        imageUploadEdit(newBankCard.getImgUrl(), "A004", changeFlowId);
+        // 上传银行卡反面图片
+        imageUploadEdit(newBankCard.getImgUrl(), "A005", changeFlowId);
+        // 上传一张空白图作为结算信息修改申请表
+        imageUploadEdit("https://www.shouyinbei.net/resources/images/upload/blank.png", "B008", changeFlowId);
+    }
+
+    /**
+     * 修改商户信息，上传图片
+     */
+    public void imageUploadEdit(String url, String picType, String changeFlowId) {
+        String imgBase64Data = FileUtil.getBase64FromUrl(url);
+
+        try {
+            if (!Objects.equals(url, MerchantImage.ImageType.BUSINESS_LICENSE)) {
+                log.debug("压缩图片");
+            } else {
+                log.debug("压缩图片 - 营业执照");
+            }
+            imgBase64Data = Base64Util.compressPic(imgBase64Data, 1024);
+        } catch (Exception e) {
+            LogExceptionUtils.printStack(log, e, null);
+            throw new MsgException("上传文件失败");
+        }
+
+        JSONObject param = new JSONObject();
+        param.put("changeFlowId", changeFlowId);
+        param.put("picType", picType);
+        try {
+            byte[] bytes = Base64.getDecoder().decode(imgBase64Data);
+            ByteArrayResource byteArrayResource = new ByteArrayResource(bytes) {
+                @Override
+                public String getFilename() {
+                    return picType + ".png";
+                }
+            };
+            String encryptOriginData = SignUtils.getSignContent(param);
+            log.info("加签源数据==============>" + encryptOriginData);
+            param.put("signValue", RSAUtils.sign(ysConfig.getPriKeyV2(), encryptOriginData));
+            param.put("picFile", byteArrayResource);
+        } catch (Exception e) {
+            log.error("数据异常" + e.getMessage());
+        }
+
+
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.MULTIPART_FORM_DATA);
+
+        int retryTimes = 3;
+        while (true) {
+            param.put("reqFlowId", "YS" + System.currentTimeMillis() % 10000000 + UUID.randomUUID().toString().substring(4, 7));
+
+            headers.add("User-Agent",
+                    "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36");
+
+            MultiValueMap<String, Object> reqParam = MapUtils.map2MultiValueMap(param);
+            HttpEntity<MultiValueMap<String, Object>> reqEntity = new HttpEntity<>(reqParam, headers);
+
+            try {
+                String respStr = restTemplate.postForObject(YsConfigExtensionV2.MER_EDIT_PIC_UPLOAD, reqEntity, String.class);
+                log.info("result : " + respStr);
+                JSONObject resultJson = JSON.parseObject(respStr);
+                JSONObject data = resultJson.getJSONObject("data");
+                if (!"00".equals(data.getString("code"))) {
+                    throw new MsgException(data.getString("note"));
+                }
+                break;
+            } catch (Exception e) {
+                log.info(e.getClass().getName());
+                // 超时后自动重试
+                retryTimes--;
+                if (retryTimes <= 0) {
+                    throw new MsgException("图片3次上传失败：" + e.getMessage());
+                }
+            }
+        }
+    }
+
+    @Override
+    public void checkSign(JSONObject receiveData) throws Exception {
+        // nothing to do
+    }
+
+    @Override
+    public JSONObject reqMerProtocolStatus(JftMercPaymentChannel jpc) {
+        String sysSignFlowId = jpc.getExtra().getString("sysSignFlowId");
+        if (sysSignFlowId == null) {
+            // 缺少签约参数, 发起签约申请
+            sendProtocolMsg(jpc);
+            return new JSONObject();
+        }
+
+        JSONObject data = new JSONObject();
+        data.put("sysSignFlowId", sysSignFlowId);
+        JSONObject result = ysServiceV2.req(YsConfigExtensionV2.MER_PROTOCOL_STATUS, ReqMethod.MERCHANT_PROTOCOL_STATUS, data);
+
+        if ("2".equals(result.getString("signSts"))) {
+            // 已签约
+            jpc.setStatus(MerchantChannelStatus.AUDIT_STATUS_SIGNED);
+            jpcService.updateById(jpc);
+            return new JSONObject();
+        }
+
+        if ("1".equals(result.getString("signSts")) || "8".equals(result.getString("signSts"))) {
+            // 待签署, 则检查签约是否超时, 这里的超时判断就用进件记录的更新时间
+            // long maxLimitTime = 3600 * 1000 * 2;
+            // // 签约短信2小时失效
+            // boolean expireFlag = (System.currentTimeMillis() - mcs.getUpdateTime().getTime()) > maxLimitTime;
+            //
+            // if (expireFlag) {
+            //     // 短信已经过期, 则重新发起签约申请
+            //     sendProtocolMsg(mcs);
+            //     return new JSONObject();
+            // }
+        }
+
+        return new JSONObject();
+    }
+
+    @Override
+    public JSONObject sendProtocolMsg(JftMercPaymentChannel jpc) {
+        JSONObject data = new JSONObject();
+        data.put("sysFlowId", jpc.getApplicationId());
+        data.put("isSendMsg", "N");
+        JSONObject respResult = ysServiceV2.req(YsConfigExtensionV2.MER_PROTOCOL_MSG, ReqMethod.MERCHANT_SEND_MSG, data);
+
+        if ("00".equals(respResult.getString("code"))) {
+            jpc.getExtra().put("sysSignFlowId", respResult.getString("sysSignFlowId"));
+            jpc.getExtra().put("signUrl", respResult.getString("signUrl"));
+
+            Notice notice = new Notice(1, -1, jpc.getUserId() + "");
+            String uniqueKey = "YS_QY" + System.currentTimeMillis();
+            String title = "电子协议签约通知";
+            String content = "尊敬的客户您好，请点此通知完成签约意愿授权。请注意，同意授权后，支付通道才会进行商户资料审核，否则会一直等待审核。";
+            String url = respResult.getString("signUrl");
+            notice.setUniqueKey(uniqueKey);
+            notice.setNoticeCode(uniqueKey);
+            notice.setTitle(title);
+            notice.setUrl(url);
+            notice.setDesc(content);
+            noticeService.save(notice);
+
+            generalPushUtil.sendAllPlatByAlias(Collections.singletonList(jpc.getUserId() + ""), title, content, "1");
+
+            jpc.setStatus(MerchantChannelStatus.AUDIT_STATUS_WAITING_SIGN);
+            jpcService.updateById(jpc);
+        }
+
+        return new JSONObject();
+    }
+
+    /**
+     * 开通线上支付
+     */
+    @Override
+    public void openOnlinePay(JftMercPaymentChannel mcs) {
+        UserApp ua = uaService.getUserAppByUserId(mcs.getUserId());
+
+        if (StringUtils.isEmpty(mcs.getMerchantId())) {
+            throw new MsgException("开通线上支付失败, 缺少商编");
+        }
+
+        int attemptCount = 5;
+
+        Exception throwException = null;
+
+        JftMerchantRate auditRate = jftMerchantRateService.getRateByUserId(mcs.getUserId());
+        auditRate.setMerchantId(mcs.getMerchantId());
+        jftMerchantRateService.updateById(auditRate);
+
+        final int rateVal = auditRate.getAliRate().intValue();
+
+        while (attemptCount > 0) {
+            try {
+                JSONObject param = new JSONObject();
+                param.put(YsConstant.MERC_ID, mcs.getMerchantId());
+                param.put(YsConstant.ACC_ORG_NO, ysConfig.getSrc());
+                param.put(YsConstant.SCAN_SERVICE_OPEN, "1,2,3,4,5,6");
+                JSONObject rate = new JSONObject();
+                param.put(YsConstant.EASY_FEE_BEAN, rate);
+
+                // 支付宝
+                rate.put(YsConstant.R_SCAN_WX_FEE_TYPE, "1");
+                rate.put(YsConstant.R_SCAN_WX_FEE_RATE, (rateVal / 100f) + "");
+                rate.put(YsConstant.R_SCAN_WX_FEE_NUM, "1");
+                // 微信
+                rate.put(YsConstant.R_SCAN_ALI_FEE_TYPE, "1");
+                rate.put(YsConstant.R_SCAN_ALI_FEE_RATE, (rateVal / 100f) + "");
+                rate.put(YsConstant.R_SCAN_ALI_FEE_NUM, "1");
+                // 银联借记卡 > 1000
+                rate.put(YsConstant.R_SCAN_DEBIT_TYPE_1, "1");
+                rate.put(YsConstant.R_SCAN_DEBIT_NUM_1, "0.61");
+                rate.put(YsConstant.R_SCAN_DEBIT_MIN_1, "1");
+                rate.put(YsConstant.R_SCAN_DEBIT_MAX_1, "999900");
+
+                // 银联借记卡 ≤ 1000
+                rate.put(YsConstant.R_SCAN_DEBIT_TYPE_2, "1");
+                rate.put(YsConstant.R_SCAN_DEBIT_NUM_2, (rateVal / 100f) + "");
+                rate.put(YsConstant.R_SCAN_DEBIT_MIN_2, "1");
+                rate.put(YsConstant.R_SCAN_DEBIT_MAX_2, "999900");
+
+                // 银联贷记卡 > 1000
+                rate.put(YsConstant.R_SCAN_CREDIT_TYPE_1, "1");
+                rate.put(YsConstant.R_SCAN_CREDIT_NUM_1, "0.61");
+                rate.put(YsConstant.R_SCAN_CREDIT_MIN_1, "1");
+
+                // 银联贷记卡 ≤ 1000
+                rate.put(YsConstant.R_SCAN_CREDIT_TYPE_2, "1");
+                rate.put(YsConstant.R_SCAN_CREDIT_NUM_2, (rateVal / 100f) + "");
+                rate.put(YsConstant.R_SCAN_CREDIT_MIN_2, "1");
+
+                try {
+                    // 开通线上支付T1
+                    ysServiceV2.req(YsConfigExtensionV2.MER_T1_REQ, ReqMethod.MERCHANT_ONLINE_TRADING, param);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+
+                param = new JSONObject();
+                param.put(YsConstant.MERC_ID, mcs.getMerchantId());
+                param.put("opType", "1");
+
+                if ("LL".equals(ua.getUserType())) {
+                    param.put("feeRate", "0.04");
+                } else {
+                    param.put("feeRate", "0.10");
+                }
+
+                param.put("feeMin", "1");
+
+                ysServiceV2.req(YsConfigExtensionV2.MER_D0_REQ, ReqMethod.MERCHANT_OPT_ONLINE_D0, param);
+                return;
+            } catch (MsgException e) {
+                throwException = e;
+                break;
+            } catch (Exception e) {
+                throwException = e;
+                attemptCount--;
+            }
+        }
+
+        String message = throwException.getMessage();
+        log.error("开通线上支付失败: {}", message);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ysExtension/v20220615/YsConfigExtensionV2.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ysExtension/v20220615/YsConfigExtensionV2.java
new file mode 100644
index 0000000..efed30d
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ysExtension/v20220615/YsConfigExtensionV2.java
@@ -0,0 +1,159 @@
+package cn.pluss.platform.ysExtension.v20220615;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+
+@Data
+@Component
+@ConfigurationProperties(prefix = "ys-extension")
+public class YsConfigExtensionV2 {
+
+    private String agentNoV2;
+
+    /**
+     * 发起方编号
+     */
+    private String srcMerchantNo;
+
+    /**
+     * 进件链接前缀
+     */
+    private String auditDomainV2;
+
+    /**
+     * 合作方商编
+     */
+    private String src;
+
+    /**
+     * 私钥
+     */
+    private String priKeyV2;
+
+    /**
+     * 公钥v2
+     */
+    private String pubKeyV2;
+
+    /**
+     * 加密秘钥
+     */
+    private String encryptPwd;
+
+    /**
+     * 进件，图片上传的接口链接
+     */
+    public static String IMG_UPLOAD;
+
+    /**
+     * 进件, 商户信息提交的接口
+     */
+    public static String MER_AUDIT;
+
+    /**
+     * 进件驳回后, 商户信息修改的接口
+     */
+    public static String MER_FAILED_EDIT;
+
+    /**
+     * 进件审核接口
+     */
+    public static String MER_APPLY;
+
+    /**
+     * 进件结果查询接口
+     */
+    public static String MER_RESULT;
+
+    /**
+     * 商户信息变更结果查询
+     */
+    public static String MER_EDIT_RESULT;
+
+    /**
+     * (重新)发送签约短信
+     */
+    public static String MER_PROTOCOL_MSG;
+
+    /**
+     * 查询签约状态
+     */
+    public static String MER_PROTOCOL_STATUS;
+
+    /**
+     * 线上支付开通， T1, 线上支付只分两种，T1和D0
+     */
+    public static String MER_T1_REQ;
+
+    /**
+     * 线上支付开通，D0
+     */
+    public static String MER_D0_REQ;
+
+    /**
+     * 修改银行卡信息的链接
+     */
+    public static String MER_BANK_CHANGE;
+
+    /**
+     * 修改信息上传图片
+     */
+    public static String MER_EDIT_PIC_UPLOAD;
+
+    /**
+     * 修改费率
+     */
+    public static String MER_RATE_CHANGE;
+
+    /**
+     * 图片上传口令接口
+     */
+    public static String MER_UPLOAD_TOKEN = "https://register.ysepay.com:2443/register_gateway/gateway.do";
+
+    /**
+     * 微信认证上传图片
+     */
+    public static String MER_IMG_UPLOAD = "https://uploadApi.ysepay.com:2443/yspay-upload-service?method=upload";
+
+    /**
+     * 微信认证发起, 申请单状态查询
+     */
+    public static String MER_WX_CERT = "https://openapi.ysepay.com/gateway.do";
+
+
+    @PostConstruct
+    public void init() {
+        dataInit(this);
+    }
+
+    public static synchronized void dataInit(YsConfigExtensionV2 ysConfigExtensionV2) {
+        IMG_UPLOAD = ysConfigExtensionV2.auditDomainV2 + "saas/org/uploadPic";
+
+        MER_AUDIT = ysConfigExtensionV2.auditDomainV2 + "saas/org/addScanMerchant";
+
+        MER_FAILED_EDIT = ysConfigExtensionV2.auditDomainV2 + "saas/org/updateScanMerchant";
+
+        MER_APPLY = ysConfigExtensionV2.auditDomainV2 + "saas/org/autoAuditTerm";
+
+        MER_RESULT = ysConfigExtensionV2.auditDomainV2 + "saas/org/queryMerchant";
+
+        MER_PROTOCOL_MSG = ysConfigExtensionV2.auditDomainV2 + "saas/orgSign/sendScanSmsCode";
+
+        MER_PROTOCOL_STATUS = ysConfigExtensionV2.auditDomainV2 + "saas/orgSign/querySignSts";
+
+        MER_T1_REQ = ysConfigExtensionV2.auditDomainV2 + "saas/orgScan/onlineTrading";
+
+        MER_D0_REQ = ysConfigExtensionV2.auditDomainV2 + "saas/orgScan/optOnlineD0";
+
+        MER_BANK_CHANGE = ysConfigExtensionV2.auditDomainV2 + "saas/org/changeMerAccInfo";
+
+        MER_EDIT_RESULT = ysConfigExtensionV2.auditDomainV2 + "saas/org/queryModifyStatus";
+
+        MER_RATE_CHANGE = ysConfigExtensionV2.auditDomainV2 + "saas/org/changeMerOnlineFee";
+
+        MER_EDIT_PIC_UPLOAD = ysConfigExtensionV2.auditDomainV2 + "saas/org/changeMerPic";
+    }
+}
\ No newline at end of file
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ysExtension/v20220615/YsConstant.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ysExtension/v20220615/YsConstant.java
new file mode 100644
index 0000000..0429926
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ysExtension/v20220615/YsConstant.java
@@ -0,0 +1,679 @@
+package cn.pluss.platform.ysExtension.v20220615;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 记录银盛接口的参数的key值
+ */
+public class YsConstant {
+
+    @Getter
+    @AllArgsConstructor
+    public enum ReqStatus {
+        /** 请求状态值 */
+        SUCCESS("00", "请求成功");
+
+        private String code;
+        private String desc;
+    }
+
+    @Getter
+    @AllArgsConstructor
+    public enum AuditStatus {
+        /**
+         * 进件状态
+         */
+        AUDIT_NO_AUDIT("03", "待审核"), AUDIT_FIRST_TRIAL_SUCCESS("04", "初审完成"), AUDIT_SUCCESS("05", "开户完成"), AUDIT_FIRST_TRIAL_FAIL("90", "初审拒绝");
+
+        private String code;
+        private String desc;
+
+        public static AuditStatus getByCode(String code) {
+            for (AuditStatus value : AuditStatus.values()) {
+                if (value.code.equals(code)) {
+                    return value;
+                }
+            }
+
+            return null;
+        }
+    }
+
+    /**
+     * 营业执照全称
+     */
+    public static final String BUSINESS_LICENCE = "businessLicence";
+
+    /**
+     * 商户简称
+     */
+    public static final String ALIAS = "userShortName";
+
+    /**
+     * 营业执照全称
+     */
+    public static final String BUSINESS_LICENCE_NO = "businessLicenceNo";
+
+    /**
+     * 营业执照开始日期
+     */
+    public static final String BUSINESS_LICENCE_START = "businessLicenceSdate";
+
+    /**
+     * 营业执照结束日期
+     */
+    public static final String BUSINESS_LICENCE_LIMIT = "businessLicenceEdate";
+
+    /**
+     * 营业执照注册地址
+     */
+    public static final String REGISTERED_ADDRESS = "registeredAddress";
+
+    /**
+     * 营业地址
+     */
+    public static final String BUSINESS_ADDRESS = "businessAddress";
+
+    /**
+     * 商户归属省
+     */
+    public static final String MERC_PROV = "mercProv";
+
+    /**
+     * 商户归属省
+     */
+    public static final String MERC_CITY = "mercCity";
+
+    /**
+     * 商户归属省
+     */
+    public static final String MERC_AREA = "mercArea";
+
+    /**
+     * 法人姓名
+     */
+    public static final String LEGAL_PERSON_NAME = "legalPersonName";
+
+    /**
+     * 法人身份证号
+     */
+    public static final String LEGAL_PERSON_ID = "legalPersonId";
+
+    /**
+     * 法人身份证开始日期
+     */
+    public static final String LEGAL_PERSON_START = "legalPersonIdSdate";
+
+    /**
+     * 法人身份证到期日期
+     */
+    public static final String LEGAL_PERSON_LIMIT = "legalPersonIdEdate";
+
+    /**
+     * 法人电话
+     */
+    public static final String LEGAL_PERSON_PHONE = "legalPersonPhone";
+
+    /**
+     * 非法人姓名
+     */
+    public static final String ACCOUNT_PERSON_NAME = "unincorporatedName";
+
+    /**
+     * 非法人身份证号码
+     */
+    public static final String ACCOUNT_PERSON_ID = "unincorporatedId";
+
+    /**
+     * 结算账户卡号
+     */
+    public static final String ACCOUNT_CARD_NO = "balanceAccCardno";
+
+    /**
+     * 结算账户户名
+     */
+    public static final String ACCOUNT_CARD_NAME = "balanceAccName";
+
+    /**
+     * 开户行省（如湖北省）
+     */
+    public static final String BANK_PROVINCE = "openAccProvince";
+
+    /**
+     * 开户行市（如武汉市）
+     */
+    public static final String BANK_CITY = "openAccCity";
+
+    /**
+     * 开户行市（如武汉市）
+     */
+    public static final String BANK_AREA = "openAccArea";
+
+    /**
+     * 开户行行别名称
+     */
+    public static final String BANK_NAME = "bankName";
+
+    /**
+     * 开户行行别
+     */
+    public static final String BANK_TYPE = "bankType";
+
+    /**
+     * 开户行编号（支行）
+     */
+    public static final String BANK_BRANCH_TYPE = "openAccBanktype";
+
+    /**
+     * 开户行名称（支行）
+     */
+    public static final String BANK_BRANCH_NAME = "openAccBankname";
+
+    /**
+     * 联系人姓名
+     */
+    public static final String CONTACTS_NAME = "contactsName";
+
+    /**
+     * 联系人电话
+     */
+    public static final String CONTACTS_PHONE = "contactsPhone";
+
+    /**
+     * 联系人邮箱
+     */
+    public static final String CONTACTS_EMAIL = "contactsEmail";
+
+    /**
+     * 微信签约费率(最 低:0.01%)
+     */
+    public static final String WECHAT_SIGN_RATE = "wechatSignRate";
+
+    /**
+     * 微信签约费率封底(单位:分)
+     */
+    public static final String WECHAT_SIGN_MIN = "wechatSignMin";
+
+    /**
+     * 支付宝签约费率(最低:0.01%)
+     */
+    public static final String ALIPAY_SIGN_RATE = "alipaySignRate";
+
+    /**
+     * 支付宝签约费率封底(单位:分)
+     */
+    public static final String ALIPAY_SIGN_MIN = "alipaySignMin";
+
+    /**
+     * 银联一档（>1000）：贷记卡费率
+     */
+    public static final String CREDIT_RATE_1 = "creditRate1";
+
+    /**
+     * 银联一档（>1000）：贷记卡封底.（单位：分）
+     */
+    public static final String CREDIT_MIN_1 = "creditMin1";
+
+    /**
+     * 银联一档（>1000）：借记卡费率
+     */
+    public static final String DEBIT_RATE_1 = "debitRate1";
+
+    /**
+     * 银联一档（>1000）：借记卡封底（单位：分）
+     */
+    public static final String DEBIT_MIN_1 = "debitMin1";
+
+    /**
+     * 银联一档（>1000）：借记卡封顶（单位：分）
+     */
+    public static final String DEBIT_MAX_1 = "debitMax1";
+
+    /**
+     * 银联二档（<=1000）：贷记卡费率
+     */
+    public static final String CREDIT_RATE_2 = "creditRate2";
+
+    /**
+     * 银联二档（<=1000）：贷记卡封底（单位：分）
+     */
+    public static final String CREDIT_MIN_2 = "creditMin2";
+
+    /**
+     * 银联二档（<=1000）：借记卡费率
+     */
+    public static final String DEBIT_RATE_2 = "debitRate2";
+
+    /**
+     * 银联二档（<=1000）：借记卡封底（单位：分）
+     */
+    public static final String DEBIT_MIN_2 = "debitMin2";
+
+    /**
+     * 银联二档（<=1000）：借记卡封顶（单位：分）
+     */
+    public static final String DEBIT_MAX_2 = "debitMax2";
+
+    /**
+     * 是否开通刷卡业务
+     */
+    public static final String OPEN_POS_P = "openPosp";
+
+    /* 以下为T1 */
+    /**
+     * 工作日到账-借记卡费率
+     */
+    public static final String T_111_RATE = "t111Rate";
+
+    /**
+     * 工作日到账-借记卡费率封顶（单位：分）
+     */
+    public static final String T_111_RATE_TOP = "t111RateTop";
+
+    /**
+     * 工作日到账-借记卡费率封底（单位：分）
+     */
+    public static final String T_111_SIGN_RATE_MIN = "t111SignRateMin";
+
+    /**
+     * 工作日到账-贷记卡费率
+     */
+    public static final String T_112_RATE = "t112Rate";
+
+    /**
+     * 工作日到账-贷记卡费率封底（单位：分）
+     */
+    public static final String T_112_SIGN_RATE_MIN = "t112SignRateMin";
+
+    /* 以下为D1 */
+    /**
+     * 天天到账-借记卡费率
+     */
+    public static final String T_11_RATE = "t11Rate";
+
+    /**
+     * 天天到账-借记卡费率封顶（单位：分）
+     */
+    public static final String T_11_RATE_TOP = "t11RateTop";
+
+    /**
+     * 天天到账-借记卡费率封底（单位：分）
+     */
+    public static final String T_11_SIGN_RATE_MIN = "t11SignRateMin";
+
+    /**
+     * 天天到账-贷记卡费率
+     */
+    public static final String T_12_RATE = "t12Rate";
+
+    /**
+     * 天天到账-贷记卡费率封底（单位：分）
+     */
+    public static final String T_12_SIGN_RATE_MIN = "t12SignRateMin";
+
+    /**
+     * 天天到账-垫资费类型（百分比、元）
+     */
+    public static final String T_ADVANCE_TYPE = "tAdvanceType";
+
+    /**
+     * 天天到账-垫资费
+     */
+    public static final String T_ADVANCE_FEE = "tAdvanceFee";
+
+    /**
+     * 天天到账-垫资费封底（单位：分）
+     */
+    public static final String T_ADVANCE_MIN = "tAdvanceMin";
+
+    /* 以下为D0 */
+    /**
+     * 实时到账-借记卡费率
+     */
+    public static final String D_011_RATE = "d011Rate";
+
+    /**
+     * 实时到账-借记卡费率封顶（单位：分）
+     */
+    public static final String D_011_RATE_TOP = "d011RateTop";
+
+    /**
+     * 实时到账-借记卡费率最低（单位：分）
+     */
+    public static final String D_011_RATE_BOTTOM = "d011RateBottom";
+
+    /**
+     * 实时到账-贷记卡费率
+     */
+    public static final String D_012_RATE = "d012Rate";
+
+    /**
+     * 实时到账-贷记卡费率最低（单位：分）
+     */
+    public static final String D_012_RATE_BOTTOM = "d012RateBottom";
+
+    /**
+     * 实时到账-借记卡签约费率垫资费类型(百分比；元)
+     */
+    public static final String D_0_ADVANCE_J_SIGN_TYPE = "d0AdvanceJsignType";
+
+    /**
+     * 实时到账-借记卡签约费率垫资费
+     */
+    public static final String D_0_ADVANCE_J_SIGN_FEE = "d0AdvanceJsignFee";
+
+    /**
+     * 实时到账-借记卡签约费率垫资费封底（单位：分）
+     */
+    public static final String D_0_ADVANCE_J_SIGN_MIN = "d0AdvanceJsignMin";
+
+    /**
+     * 实时到账-借记卡签约费率垫资费封顶(单位:分)
+     */
+    public static final String D_0_ADVANCE_J_SIGN_MAX = "d0AdvanceJsignMax";
+
+    /**
+     * 实时到账-贷记卡签约费率垫资费类型(百分比；元)
+     */
+    public static final String D_0_ADVANCE_D_SIGN_TYPE = "d0AdvanceDsignType";
+
+    /**
+     * 实时到账-贷记卡签约费率垫资费
+     */
+    public static final String D_0_ADVANCE_D_SIGN_FEE = "d0AdvanceDsignFee";
+
+    /**
+     * 实时到账-贷记卡签约费率垫资费封底（单位：分）
+     */
+    public static final String D_0_ADVANCE_D_SIGN_MIN = "d0AdvanceDsignMin";
+
+    /**
+     * 实时到账-贷记卡签约费率垫资费封顶(单位:分)
+     */
+    public static final String D_0_ADVANCE_D_SIGN_MAX = "d0AdvanceDsignMax";
+
+    /**
+     * 是否开通扫码快付
+     */
+    public static final String CODE_ADVANCE_OPEN = "codeAdvanceOpen";
+
+    /**
+     * 是否开通快付
+     */
+    public static final String FAST_PAY = "fastPay";
+
+    /**
+     * 到账方式, 开通刷卡业务时必填
+     */
+    public static final String OPEN_BUS_RADIO = "openBusRadio";
+
+    /**
+     * 是否法人结算
+     */
+    public static final String CODE_LEGAL_PERSON_ACC = "codeLegalPersonAcc";
+
+    /**
+     * 垫资费费率
+     */
+    public static final String CODE_ADVANCE_RATE = "codeAdvanceRate";
+
+    /**
+     * 垫资费费率最低值（单位：分）
+     */
+    public static final String CODE_ADVANCE_MIN = "codeAdvanceMin";
+
+    /**
+     * 银盛商户类型
+     */
+    public static final String MCC_SUB_CD = "mccSubCd";
+
+    /**
+     * MCC 码
+     */
+    public static final String MCC_CD = "mccCd";
+
+    /**
+     * 代理商编号
+     */
+    public static final String CO_OPERATOR_NO = "coOperatorNo";
+
+    /**
+     * 代理商编号
+     */
+    public static final String INDUSTRY = "industry";
+
+    /**
+     * 扫码报备所需商户类型
+     */
+    public static final String MCH_TYPE = "mchtype";
+
+    /**
+     * 扫码报备所需商户类别
+     */
+    public static final String MCH_CATEGORY = "mchcategory";
+
+    /**
+     * 法人国籍
+     */
+    public static final String CRP_NATIONALITY = "crpNationality";
+
+    /**
+     * 法人性别
+     */
+    public static final String CRP_GENDER = "crpGender";
+
+    /**
+     * 法人职业
+     */
+    public static final String CRP_PROFESSION = "crpProfession";
+
+    /**
+     * 法人地址
+     */
+    public static final String CRP_ADDR = "crpAddr";
+
+    /**
+     * 商户模式
+     */
+    public static final String USER_TYPE = "userType";
+
+    /**
+     * 备注
+     */
+    public static final String REMARK = "remark";
+
+    /**
+     * 结算起始金额
+     */
+    public static final String LOWEST_STL_AMT = "lowestStlAmt";
+
+    /**
+     * 银行预留手机号
+     */
+    public static final String BANK_MOBILE = "bankMobile";
+
+    /**
+     * 实际控制人
+     */
+    public static final String ACTUAL_MANAGER = "actualManager";
+
+    /**
+     * 证件类型
+     */
+    public static final String CERT_TYPE = "certType";
+
+    /**
+     * 证件类型
+     */
+    public static final String MERC_LVL = "mercLvl";
+
+    /**
+     * 总店商户号
+     */
+    public static final String MERC_UP_ID = "mercUpId";
+
+    /**
+     * 联系人通讯地址
+     */
+    public static final String CONTACTS_ADDR = "contactsAddr";
+
+    /**
+     * 结算卡类型
+     */
+    public static final String BALANCE_ACC_TYPE = "balanceAccType";
+
+    /**
+     * 拓展经理姓名
+     */
+    public static final String EXPANDING_MANAGER = "expandingManager";
+
+
+
+
+    // ================ 以下为线上交易权限开通的接口参数名 ================
+
+    /**
+     * 商户号
+     */
+    public static final String MERC_ID = "mercId";
+
+    /**
+     * 接入机构号
+     */
+    public static final String ACC_ORG_NO = "accOrgNo";
+
+    /**
+     * 交易权限
+     */
+    public static final String SCAN_SERVICE_OPEN = "scanServiceOpen";
+
+    /**
+     * 费率信息
+     */
+    public static final String EASY_FEE_BEAN = "easyFeeBean";
+
+    /**
+     * 微信费率类型
+     * 必填 1 百分比，2 固定金额
+     */
+    public static final String R_SCAN_WX_FEE_TYPE = "rscanWxFeeType";
+
+    /**
+     * rscanWxFeeType 为 1时 必填
+     * 示例 0.3 表示 0.003
+     */
+    public static final String R_SCAN_WX_FEE_RATE = "rscanWxFeeRate";
+
+    /**
+     * 微信费率金额
+     * 单位：分
+     * rscanWxFeeType 为 1 时为封底金额
+     * rscanWxFeeType 为 2 时为固定金额
+     */
+    public static final String R_SCAN_WX_FEE_NUM = "rscanWxFeeNum";
+
+    /**
+     * 支付宝费率，同微信
+     */
+    public static final String R_SCAN_ALI_FEE_TYPE = "rscanAliFeeType";
+
+    public static final String R_SCAN_ALI_FEE_RATE = "rscanAliFeeRate";
+
+    public static final String R_SCAN_ALI_FEE_NUM = "rscanAliFeeNum";
+
+
+    /**
+     * 银联借记卡一档费率类型
+     * 1 百分比，2 固定金额
+     */
+    public static final String R_SCAN_DEBIT_TYPE_1 = "rscanDebitType1";
+
+    /**
+     * 银联借记卡一档金额
+     * rscanDebitType1 为 1 时为借记卡一档费率，示例 0.3 表示 0.003，
+     * rscanDebitType1 为 2 时为固定金额 单位：分
+     */
+    public static final String R_SCAN_DEBIT_NUM_1 = "rscanDebitNum1";
+
+    /**
+     * 银联借记卡一档金额封底金额
+     * 单位：分
+     * rscanDebitType1为1 必填
+     */
+    public static final String R_SCAN_DEBIT_MIN_1 = "rscanDebitMin1";
+
+    /**
+     * 银联借记卡一档金额封顶金额
+     * 单位：分
+     * rscanDebitType1为1, 必填
+     */
+    public static final String R_SCAN_DEBIT_MAX_1 = "rscanDebitMax1";
+
+    /**
+     * 银联借记卡二档费率类型
+     * 1、百分比; 2、固定金额
+     */
+    public static final String R_SCAN_DEBIT_TYPE_2 = "rscanDebitType2";
+
+    /**
+     * 银联借记卡二档金额
+     * rscanDebitType2为1时为借记卡一档费率，示例 0.3表 示 0.003;
+     * rscanDebitType2为2时为固定金额 单位：分
+     */
+    public static final String R_SCAN_DEBIT_NUM_2 = "rscanDebitNum2";
+
+    /**
+     * 银联借记卡二档金额封底金额
+     * 单位：分
+     * rscanDebitType2为1,必填
+     */
+    public static final String R_SCAN_DEBIT_MIN_2 = "rscanDebitMin2";
+
+    /**
+     * 银联借记卡二档金额封顶金额
+     * 单位：分
+     * rscanDebitType2 为 1 必填
+     */
+    public static final String R_SCAN_DEBIT_MAX_2 = "rscanDebitMax2";
+
+    /**
+     * 银联借记卡二档金额封顶金额
+     * 单位：分
+     * rscanDebitType2 为 1 必填
+     */
+    public static final String R_SCAN_CREDIT_TYPE_1 = "rscanCreditType1";
+
+    /**
+     * 银联贷记卡 一档金额(>1000)
+     * rscanCreditType1 为 1 时为借记卡一 档费率，示例 0.3 表示 0.003， rscanCreditType1 为 2 时为固定金额 单位：分
+     */
+    public static final String R_SCAN_CREDIT_NUM_1 = "rscanCreditNum1";
+
+    /**
+     * 银联贷记卡 一档金额封底金额
+     * 单位：分
+     * rscanCreditType1 为 1 必填
+     */
+    public static final String R_SCAN_CREDIT_MIN_1 = "rscanCreditMin1";
+
+    /**
+     * 银联贷记卡 二档费类型
+     * 1 百分比 2 固定金额
+     */
+    public static final String R_SCAN_CREDIT_TYPE_2 = "rscanCreditType2";
+
+    /**
+     * 银联贷记卡 二档金额
+     * rscanCreditType2 为 1 时为借记卡一 档费率，示例 0.3 表示 0.003;
+     * rscanCreditType2 为 2 时为固定金额 单位：分
+     */
+    public static final String R_SCAN_CREDIT_NUM_2 = "rscanCreditNum2";
+
+    /**
+     * 银联贷记卡 二档金额封底金额
+     * 单位：分 rscanCreditType2 为 1 必填
+     */
+    public static final String R_SCAN_CREDIT_MIN_2 = "rscanCreditMin2";
+
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ysExtension/v20220615/YsServiceV2.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ysExtension/v20220615/YsServiceV2.java
new file mode 100644
index 0000000..451127c
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ysExtension/v20220615/YsServiceV2.java
@@ -0,0 +1,168 @@
+package cn.pluss.platform.ysExtension.v20220615;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.crypto.symmetric.DES;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.util.MapUtils;
+import cn.pluss.platform.util.RSAUtils;
+import cn.pluss.platform.util.SignUtils;
+import cn.pluss.platform.yinsheng.v20210929.ReqEntity;
+import cn.pluss.platform.yinsheng.v20210929.ReqMethod;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Service;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestTemplate;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+@Slf4j
+@Service("ysServiceExtensionV2")
+public class YsServiceV2 {
+
+    @Autowired
+    private YsConfigExtensionV2 ysConfig;
+
+    @Autowired
+    private RestTemplate restTemplate;
+
+    /**
+     * 只用于新的进件接口
+     *
+     * @param url       请求链接
+     * @param reqMethod 请求方法
+     * @param reqData   请求参数
+     * @return
+     */
+    public JSONObject req(String url, ReqMethod reqMethod, JSONObject reqData) {
+
+        try {
+            ReqEntity request = new ReqEntity(reqMethod);
+            request.setSrc(ysConfig.getSrc());
+
+            request.setData(reqData.toJSONString());
+            HttpHeaders headers = new HttpHeaders();
+            headers.setContentType(MediaType.APPLICATION_JSON_UTF8);
+            headers.add("User-Agent",
+                    "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36");
+
+            log.info("业务参数==============>" + JSONObject.toJSONString(reqData));
+            DES des = new DES(ysConfig.getEncryptPwd().getBytes(StandardCharsets.UTF_8));
+            String s = des.encryptBase64(request.getData());
+            request.setData(s);
+            String encryptOriginData = SignUtils.getSignContent((JSONObject) JSON.toJSON(request));
+            log.info("加签源数据==============>" + encryptOriginData);
+            request.setSignValue(RSAUtils.sign(ysConfig.getPriKeyV2(), encryptOriginData));
+
+            request.setReqFlowId("YS" + System.currentTimeMillis() % 10000000 + UUID.randomUUID().toString().substring(4, 7));
+            // 上传图片的请求参数不打印，日志太多了
+            if (!url.equals(YsConfigExtensionV2.IMG_UPLOAD)) {
+                log.warn("请求报文==============>" + JSONObject.toJSONString(request));
+            }
+
+            log.info("请求地址：{}", url);
+
+            HttpEntity<JSONObject> reqEntity = new HttpEntity<>((JSONObject) JSON.toJSON(request), headers);
+            String respStr = restTemplate.postForObject(url, reqEntity, String.class);
+            log.info(respStr);
+
+            JSONObject result = JSON.parseObject(respStr);
+            try {
+                Object signValue = result.remove("signValue");
+                String decryptOriginData = result.toJSONString();
+                RSAUtils.checkSign(ysConfig.getPubKeyV2(), decryptOriginData, signValue.toString());
+            } catch (Exception e) {
+                log.error("返回参数验签异常");
+            }
+            JSONObject data = result.getJSONObject("data");
+            if (data == null) {
+                throw new MsgException("接口未获取到业务信息");
+            }
+
+            if (!data.getString("code").equals(YsConstant.ReqStatus.SUCCESS.getCode())
+                    && !"商户为非法人结算，需要人工审核".equals(data.getString("note"))) {
+                throw new MsgException(data.getString("note"));
+            }
+
+            return data;
+        } catch (Exception e) {
+            if (e instanceof MsgException) {
+                throw (MsgException) e;
+            } else {
+                throw new MsgException("银盛接口异常, {}", e.getMessage());
+            }
+        }
+    }
+
+    /**
+     * 只用于新的进件接口
+     *
+     * @param url       请求链接
+     * @param method    请求方法
+     * @param reqData   请求参数
+     * @param extraBase 额外的基本参数
+     * @return
+     */
+    public JSONObject req(String url, String method, JSONObject reqData, Map<String, Object> extraBase, Map<String, Object> fileMap) {
+
+        try {
+            Map<String, Object> paramMap = new HashMap<>();
+            paramMap.put("method", method);
+            paramMap.put("partner_id", ysConfig.getSrcMerchantNo());
+            paramMap.put("timestamp", DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
+            paramMap.put("charset", "utf-8");
+            paramMap.put("sign_type", "RSA");
+            paramMap.put("version", "3.0");
+
+            if (extraBase != null) {
+                paramMap.putAll(extraBase);
+            }
+
+            paramMap.put("biz_content", JSON.toJSONString(reqData));
+            String encryptOriginData = SignUtils.getSignContent((JSONObject) JSON.toJSON(paramMap));
+            log.debug("加签源数据==============>"+ encryptOriginData);
+            paramMap.put("sign", RSAUtils.sign(ysConfig.getPriKeyV2(), encryptOriginData));
+
+            if (fileMap != null) {
+                paramMap.putAll(fileMap);
+            }
+
+            HttpHeaders headers = new HttpHeaders();
+            headers.add("User-Agent",
+                    "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36");
+
+            log.debug("业务参数==============>" + JSONObject.toJSONString(reqData));
+            HttpEntity<MultiValueMap<String, Object>> entity = new HttpEntity<>(MapUtils.map2MultiValueMap(paramMap), headers);
+            String result = restTemplate.postForObject(url, entity, String.class);
+
+            log.debug("请求结果：{}", result);
+
+            return JSONObject.parseObject(result);
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new MsgException("银盛接口异常");
+        }
+    }
+
+    /**
+     * 只用于新的进件接口
+     *
+     * @param url       请求链接
+     * @param method    请求方法
+     * @param reqData   请求参数
+     * @param extraBase 额外的基本参数
+     * @return
+     */
+    public JSONObject req(String url, String method, JSONObject reqData, Map<String, Object> extraBase) {
+        return req(url, method, reqData, extraBase, null);
+    }
+}
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/yt/YtLogistHandler.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/yt/YtLogistHandler.java
new file mode 100644
index 0000000..1d0e657
--- /dev/null
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/yt/YtLogistHandler.java
@@ -0,0 +1,141 @@
+package cn.pluss.platform.yt;
+
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.device.DeviceSpecService;
+import cn.pluss.platform.entity.DeviceMerchantBuy;
+import cn.pluss.platform.entity.DeviceSpec;
+import cn.pluss.platform.entity.MercOrderDetail;
+import cn.pluss.platform.entity.MercOrderNew;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.util.DateUtils;
+import cn.pluss.platform.util.StringUtil;
+import cn.pluss.platform.util.XmlUtil;
+import cn.pluss.platform.yt.constant.YtConstant;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.http.*;
+import org.springframework.stereotype.Component;
+import org.springframework.web.client.RestTemplate;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+/**
+ *
+ *圆通相关处理业务类
+ *@author: bzg
+ *@time: 2022/2/24 16:33
+ */
+@Slf4j
+@Component
+public class YtLogistHandler {
+
+    @Resource
+    private RestTemplate restTemplate;
+
+    @Resource
+    private DeviceSpecService deviceSpecService;
+
+    /**
+     * 圆通订单创建接口
+     * @date: 2022/2/24 16:37
+     * @param order:
+     * @return com.alibaba.fastjson.JSONObject
+     */
+    public DeviceMerchantBuy createYtOrder(DeviceMerchantBuy order){
+        if(order == null){
+            return null;
+        }
+        if(!"1".equals(order.getStatus())){
+            return null;
+        }
+        if(StringUtils.isNotEmpty(order.getExpressNo())){
+            return null;
+        }
+        String logisticsNo =  "YT" + DateUtils.currentYourDate("yyyyMMddHHmmssSSS") + StringUtil.generateMixStr(2).toUpperCase(Locale.ROOT);
+        order.setLogistNo(logisticsNo);
+        YtCreateOrder reqData = new YtCreateOrder();
+        reqData.setRecipientName(order.getLinkName());
+        reqData.setRecipientMobile(order.getLinkPhone());
+        reqData.setRecipientAddress(order.getAddress());
+        reqData.setRecipientProvinceName(order.getProvinces().split("-")[0]);
+        reqData.setRecipientCityName(order.getProvinces().split("-")[1]);
+        reqData.setRecipientCountyName(order.getProvinces().split("-")[2]);
+        reqData.setLogisticsNo(logisticsNo);
+        YtLogisticsRequest request = new YtLogisticsRequest(reqData,YtConstant.CUSTOMER_KEY, YtConstant.YT_CREATE_METHOD, YtConstant.CUSTOMER_CODE);
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON_UTF8);
+        HttpEntity<String> header = new HttpEntity<>(JSON.toJSONString(request), headers);
+        ResponseEntity<JSONObject> response = restTemplate.postForEntity(request.getReqUrl(), header, JSONObject.class);
+        if(HttpStatus.OK.equals(response.getStatusCode())){
+            JSONObject body = response.getBody();
+            String mailNo = body.getString("mailNo");
+            order.setExpressNo(mailNo);
+            return order;
+        }else{
+            log.info("【圆通】下单接口请求异常,异常信息:{}",response.getBody());
+            return null;
+        }
+    }
+
+    /**
+     * 解析圆通物流业务参数
+     * @param reqData
+     * @return
+     */
+    public YtUpdateInfo resolvXml(String reqData) {
+        Map<String, String> params = XmlUtil.readXml(reqData);
+        return JSONObject.parseObject(JSON.toJSONString(params),YtUpdateInfo.class);
+    }
+
+    /**
+     * 推送圆通物流信息V2
+     * @param list
+     * @return
+     */
+    public JSONObject createYtOrderV2(List<MercOrderDetail> list, MercOrderNew order) {
+        String logisticsNo = "YT" + DateUtils.currentYourDate("yyyyMMddHHmmssSSS") + StringUtil.generateMixStr(2).toUpperCase(Locale.ROOT);
+        YtCreateOrder reqData = new YtCreateOrder();
+        reqData.setRecipientName(order.getReceiver());
+        reqData.setRecipientMobile(order.getPhone());
+        reqData.setRecipientAddress(order.getAddress());
+        reqData.setRecipientProvinceName(order.getAreaName().split("-")[0]);
+        reqData.setRecipientCityName(order.getAreaName().split("-")[1]);
+        reqData.setRecipientCountyName(order.getAreaName().split("-")[2]);
+        reqData.setLogisticsNo(logisticsNo);
+        List<YtGood> ytGoods = new ArrayList<>(list.size());
+        for (MercOrderDetail detail:list) {
+            YtGood ytGood = new YtGood();
+            ytGood.setName(detail.getName());
+            ytGood.setPrice(detail.getPrice());
+            ytGood.setQuantity(detail.getNum());
+            DeviceSpec spec = deviceSpecService.getByCodeAndSpec(detail.getCode(), detail.getType());
+            MsgException.checkNull(spec,"商品规格信息异常");
+            ytGood.setWeight(spec.getWeight().multiply(BigDecimal.valueOf(detail.getNum())));
+            ytGoods.add(ytGood);
+        }
+        reqData.setGoods(ytGoods);
+        YtLogisticsRequest request = new YtLogisticsRequest(reqData,YtConstant.CUSTOMER_KEY, YtConstant.YT_CREATE_METHOD, YtConstant.CUSTOMER_CODE);
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON_UTF8);
+        HttpEntity<String> header = new HttpEntity<>(JSON.toJSONString(request), headers);
+        ResponseEntity<JSONObject> response = restTemplate.postForEntity(request.getReqUrl(), header, JSONObject.class);
+        if(HttpStatus.OK.equals(response.getStatusCode())){
+            JSONObject body = response.getBody();
+            String mailNo = body.getString("mailNo");
+            JSONObject params = new JSONObject(2);
+            params.put("logistNo",logisticsNo);
+            params.put("expressNo",mailNo);
+            return ResultGenerator.genSuccessJsonResult("下单成功",params);
+        }else{
+            log.info("【圆通】下单接口请求异常,异常信息:{}",response.getBody());
+            return ResultGenerator.genFailJsonResult(response.getBody().toJSONString());
+        }
+    }
+}
diff --git a/pluss-wap-page/autoStart.sh b/pluss-wap-page/autoStart.sh
new file mode 100644
index 0000000..aa75d19
--- /dev/null
+++ b/pluss-wap-page/autoStart.sh
@@ -0,0 +1,37 @@
+while true
+do
+    ONE='one'
+    ONE_FILE='./one/wap.jar'
+    ONE_TIME=$(stat -c %Y $ONE_FILE)
+
+    ANOTHER='another'
+    ANOTHER_FILE='./another/wap.jar'
+    ANOTHER_TIME=$(stat -c %Y $ANOTHER_FILE)
+
+    if [ "$ONE_TIME" -gt "$ANOTHER_TIME" ]
+    then
+        FILE_NAME="$ONE_FILE"
+        FOLD="$ONE"
+    else
+        FILE_NAME="$ANOTHER_FILE"
+        FOLD="$ANOTHER"
+    fi
+
+    echo "最新的文件是${FILE_NAME}"
+    echo "最新的文件夹是${FOLD}"
+
+    # 先操作7006的端口
+    proc70061=$(pgrep -f "${ONE_FILE}$")
+    proc70062=$(pgrep -f "${ANOTHER_FILE}$")
+    if [ "$proc70061"x == "x" ] && [ "$proc70062"x == "x" ] ; then
+        ./wapStart7006.sh $FOLD
+    fi
+
+    # 再操作7016
+    proc70161=$(pgrep -f "${ONE_FILE} --server.port=7016$")
+    proc70162=$(pgrep -f "${ANOTHER_FILE} --server.port=7016$")
+    if [ "$proc70161"x == "x" ] && [ "$proc70162"x == "x" ] ; then
+        ./wapStart7016.sh $FOLD
+    fi
+    sleep 30
+done
\ No newline at end of file
diff --git a/pluss-wap-page/pom.xml b/pluss-wap-page/pom.xml
new file mode 100644
index 0000000..65394ce
--- /dev/null
+++ b/pluss-wap-page/pom.xml
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>pluss-parent</artifactId>
+        <groupId>cn.pluss.platform</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>pluss-wap-page</artifactId>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>cn.pluss.platform</groupId>
+            <artifactId>pluss-model-bundle</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.pluss.platform</groupId>
+            <artifactId>pluss-common-bundle</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.pluss.platform</groupId>
+            <artifactId>pluss-service-bundle</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-tomcat</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <!--jsp支持 start -->
+        <dependency>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <artifactId>tomcat-embed-jasper</artifactId>
+            <!-- <scope>provided</scope> -->
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jstl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.taglibs</groupId>
+            <artifactId>taglibs-standard-impl</artifactId>
+            <version>1.2.5</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.shiro</groupId>
+            <artifactId>shiro-spring</artifactId>
+            <version>1.3.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-thymeleaf</artifactId>
+            <version>2.1.0.RELEASE</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>spring-boot-starter-logging</artifactId>
+                    <groupId>org.springframework.boot</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+<!--        <dependency>-->
+<!--            <groupId>com.aliyun</groupId>-->
+<!--            <artifactId>aliyun-java-sdk-dysmsapi</artifactId>-->
+<!--            <version>1.1.0</version>-->
+<!--        </dependency>-->
+        <dependency>
+            <groupId>net.sourceforge.nekohtml</groupId>
+            <artifactId>nekohtml</artifactId>
+            <version>1.9.22</version>
+        </dependency>
+    </dependencies>
+
+<!--    <dependencyManagement>-->
+<!--        <dependencies>-->
+<!--            <dependency>-->
+<!--                <groupId>org.springframework.boot</groupId>-->
+<!--                <artifactId>spring-boot-starter-thymeleaf</artifactId>-->
+<!--            </dependency>-->
+<!--        </dependencies>-->
+<!--    </dependencyManagement>-->
+
+    <build>
+        <finalName>wap</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.7.0</version>
+                <configuration>
+                    <encoding>UTF-8</encoding>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>1.4.2.RELEASE</version>
+                <configuration>
+                    <mainClass>cn.pluss.platform.WapApplication</mainClass>
+                    <outputDirectory>./</outputDirectory>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+        </plugins>
+        <resources>
+            <resource>
+                <filtering>true</filtering>
+                <directory>src/main/resources</directory>
+                <excludes>
+                    <exclude>static</exclude>
+                </excludes>
+            </resource>
+            <resource>
+                <directory>src/main/webapp</directory>
+                <targetPath>META-INF/resources</targetPath>
+            </resource>
+        </resources>
+    </build>
+</project>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/java/cn/pluss/platform/WapApplication.java b/pluss-wap-page/src/main/java/cn/pluss/platform/WapApplication.java
new file mode 100644
index 0000000..1d91899
--- /dev/null
+++ b/pluss-wap-page/src/main/java/cn/pluss/platform/WapApplication.java
@@ -0,0 +1,39 @@
+package cn.pluss.platform;
+
+import org.mybatis.spring.annotation.MapperScan;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+import org.springframework.context.annotation.Bean;
+import org.springframework.retry.annotation.EnableRetry;
+import org.springframework.scheduling.annotation.EnableAsync;
+
+import org.springframework.web.context.request.RequestContextListener;
+
+
+@MapperScan("cn.pluss.platform.mapper")
+@SpringBootApplication(scanBasePackages = "cn.pluss.platform")
+@EnableRetry
+@EnableAsync
+public class WapApplication extends SpringBootServletInitializer{
+
+    private static final Logger logger = LoggerFactory.getLogger(WapApplication.class);
+
+    public static void main(String[] args) {
+
+        SpringApplication.run(WapApplication.class, args);
+        logger.info("WapApplication Service Start Success");
+    }
+    @Override
+    protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
+        return builder.sources(WapApplication.class);
+    }
+
+    @Bean
+    public RequestContextListener requestContextListenerBean() {
+        return new RequestContextListener();
+    }
+}
diff --git a/pluss-wap-page/src/main/java/cn/pluss/platform/controller/component/PayCallbackConsumer.java b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/component/PayCallbackConsumer.java
new file mode 100644
index 0000000..08d845c
--- /dev/null
+++ b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/component/PayCallbackConsumer.java
@@ -0,0 +1,50 @@
+package cn.pluss.platform.controller.component;
+
+import cn.pluss.platform.entity.MerchantOrder;
+import cn.pluss.platform.merchantOrder.MerchantOrderService;
+import cn.pluss.platform.merchantProfit.MerchantProfitService;
+import cn.pluss.platform.realFans.RealFansService;
+import com.alibaba.fastjson.JSON;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.rabbit.annotation.RabbitHandler;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Configuration;
+
+import javax.annotation.Resource;
+/**
+ * @author SSS
+ */
+@Slf4j
+@Configuration
+@ConditionalOnProperty(prefix = "scheduling", name = "enabled", havingValue = "true")
+@RabbitListener(queues = "payCallback")
+public class PayCallbackConsumer {
+
+    @Resource
+    private MerchantProfitService merchantProfitService;
+
+    @Resource
+    private MerchantOrderService merchantOrderService;
+
+    @Resource
+    private RealFansService realFansService;
+
+    @RabbitHandler
+    public void process(String msg) {
+        log.info("接受到的消息内容为:{}", msg);
+        MerchantOrder order = JSON.parseObject(msg, MerchantOrder.class);
+        if(!"1".equals(order.getStatus())){
+            return;
+        }
+        if(!"1".equals(order.getOrderType())){
+            realFansService.createFansProfit(order);
+        }
+        merchantProfitService.createOrderProfitV2(order,"1");
+        MerchantOrder update = new MerchantOrder();
+        update.setId(order.getId());
+        update.setProfitShareMoney(order.getProfitShareMoney());
+        update.setFansShareMoney(order.getFansShareMoney());
+        merchantOrderService.updateById(update);
+    }
+}
diff --git a/pluss-wap-page/src/main/java/cn/pluss/platform/controller/config/ViewResolverConfiguration.java b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/config/ViewResolverConfiguration.java
new file mode 100644
index 0000000..f196312
--- /dev/null
+++ b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/config/ViewResolverConfiguration.java
@@ -0,0 +1,116 @@
+package cn.pluss.platform.controller.config;
+
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import org.springframework.web.accept.ContentNegotiationManager;
+import org.springframework.web.servlet.View;
+import org.springframework.web.servlet.ViewResolver;
+import org.springframework.web.servlet.view.ContentNegotiatingViewResolver;
+import org.springframework.web.servlet.view.InternalResourceViewResolver;
+import org.springframework.web.servlet.view.json.MappingJackson2JsonView;
+import org.thymeleaf.spring5.SpringTemplateEngine;
+import org.thymeleaf.spring5.templateresolver.SpringResourceTemplateResolver;
+import org.thymeleaf.spring5.view.ThymeleafViewResolver;
+import org.thymeleaf.templatemode.TemplateMode;
+import org.thymeleaf.templateresolver.ClassLoaderTemplateResolver;
+import org.thymeleaf.templateresolver.ITemplateResolver;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
+
+/**
+ * 主要配置多视图实现的视图解析器相关bean实例,将该视图解析器注册到容器中
+ * <p>
+ * <p>
+ * 其实关键点在于两个：
+ * 1、配置order属性
+ * 2、配置viewnames属性
+**/
+@Configuration
+public class ViewResolverConfiguration{
+
+
+    @Bean
+    public ViewResolver contentNegotiatingViewResolver(ContentNegotiationManager manager) {
+        ContentNegotiatingViewResolver resolver = new ContentNegotiatingViewResolver();
+        resolver.setContentNegotiationManager(manager);
+        List<ViewResolver> resolvers = new ArrayList<ViewResolver>();
+        resolvers.add(jsonViewResolver());
+        resolvers.add(jspViewResolver());
+        resolvers.add(thymeleafViewResolver());
+        resolver.setViewResolvers(resolvers);
+        return resolver;
+    }
+
+    @Bean
+    public ViewResolver jsonViewResolver() {
+        return new ViewResolver() {
+            @Override
+            public View resolveViewName(String viewName, Locale locale) throws Exception {
+                MappingJackson2JsonView view = new MappingJackson2JsonView();
+                view.setPrettyPrint(true);
+                return view;
+            }
+        };
+    }
+
+    @Bean
+    public ViewResolver jspViewResolver() {
+        InternalResourceViewResolver viewResolver = new InternalResourceViewResolver();
+        viewResolver.setPrefix("/WEB-INF/jsp/");
+        viewResolver.setSuffix(".jsp");
+        viewResolver.setContentType("text/html");
+        viewResolver.setOrder(2);
+        return viewResolver;
+    }
+
+    @Bean
+    public ViewResolver thymeleafViewResolver() {
+
+        ThymeleafViewResolver viewResolver = new ThymeleafViewResolver();
+
+        viewResolver.setTemplateEngine(thymeleafTemplateEngine());
+        viewResolver.setCharacterEncoding("UTF-8");
+        viewResolver.setOrder(0);
+        // Important!!
+        // th_page1.html, th_page2.html, ...
+        // 可以删除
+        viewResolver.setViewNames(new String[] { "th_*","*/th_*"});
+
+        return viewResolver;
+    }
+
+    // Thymeleaf template engine with Spring integration
+    @Bean
+    public SpringTemplateEngine thymeleafTemplateEngine() {
+
+        SpringTemplateEngine templateEngine = new SpringTemplateEngine();
+        templateEngine.setTemplateResolver(thymeleafTemplateResolver());
+        templateEngine.setEnableSpringELCompiler(true);
+
+        return templateEngine;
+    }
+
+    @Bean
+    public SpringResourceTemplateResolver springResourceTemplateResolver() {
+        return new SpringResourceTemplateResolver();
+    }
+
+    // Thymeleaf template resolver serving HTML 5
+    @Bean
+    public ITemplateResolver thymeleafTemplateResolver() {
+
+        ClassLoaderTemplateResolver templateResolver = new ClassLoaderTemplateResolver();
+        templateResolver.setPrefix("templates/");
+        templateResolver.setCacheable(false);
+        templateResolver.setSuffix(".html");
+        templateResolver.setTemplateMode(TemplateMode.HTML);
+        templateResolver.setCharacterEncoding("UTF-8");
+
+        return templateResolver;
+    }
+}
diff --git a/pluss-wap-page/src/main/java/cn/pluss/platform/controller/filter/AuthFilter.java b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/filter/AuthFilter.java
new file mode 100644
index 0000000..aa91a61
--- /dev/null
+++ b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/filter/AuthFilter.java
@@ -0,0 +1,68 @@
+package cn.pluss.platform.controller.filter;
+
+import java.io.IOException;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import cn.pluss.platform.entity.MerchantMenber;
+
+
+
+
+/**
+ * @author yuchen
+ *
+ * @Description 
+ */
+@Slf4j
+@Component
+public class AuthFilter implements Filter {
+
+	@Override
+	public void doFilter(ServletRequest req, ServletResponse resp, FilterChain arg2)
+			throws IOException, ServletException {
+		HttpServletRequest request=(HttpServletRequest) req;
+		log.info("requestURI : {}", request.getRequestURI());
+		log.info("requestMethod : {}", request.getMethod());
+		log.info("requestParams : {}", request.getParameterMap());
+		HttpServletResponse response= (HttpServletResponse) resp;
+		MerchantMenber merchantMenber = (MerchantMenber) request.getSession().getAttribute("sessionMerchantMenber");
+		String url = request.getRequestURI();
+		if(merchantMenber==null) {
+			if(!url.contains("CallBack")
+					&& !url.contains("wechat")
+					&& !url.contains("merchant")
+					&& !url.contains("myVIPCard")
+					&& !url.contains("resources")
+					&& !url.contains("openCardSuccess")
+					&& !url.contains("vipOpenCard")
+					&& !url.contains("auth")
+					&& !url.contains("jft")
+					&& !url.contains("getMemberInfo")
+					&& !url.contains("aliPay")
+					&& !url.contains("test")
+					&& !url.contains("life")
+					&& !url.contains("getPhoneCode")
+					&& !url.contains("api")
+					&& !url.contains("user")
+					&& !url.contains("activity")
+					&& !url.contains("kaptcha")
+					&& !url.contains("aliyun")) {
+				request.getRequestDispatcher("/vip/myVIPCard").forward(req, resp);
+				return;
+			}
+		}
+		arg2.doFilter(request, response);
+	}
+
+}
+
diff --git a/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/ActivityController.java b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/ActivityController.java
new file mode 100644
index 0000000..e2436d5
--- /dev/null
+++ b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/ActivityController.java
@@ -0,0 +1,1051 @@
+package cn.pluss.platform.controller.home;
+
+import cn.pluss.platform.activityEnroll.ActivityEnrollService;
+import cn.pluss.platform.annotation.NoRepeatSubmit;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.deviceStock.DeviceStockService;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.inviteRate.InviteRateService;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantOrder.MerchantOrderService;
+import cn.pluss.platform.merchantProfit.MerchantProfitService;
+import cn.pluss.platform.merchantStore.MerchantStoreService;
+import cn.pluss.platform.officialActivity.OfficialActivityService;
+
+import cn.pluss.platform.officialGoods.OfficialGoodsService;
+import cn.pluss.platform.officialGoods.exchange.OfficialGoodsExchangeService;
+import cn.pluss.platform.systemConfig.SystemConfigService;
+import cn.pluss.platform.userAddress.UserAddressService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.userInfo.UserInfoService;
+import cn.pluss.platform.userIntegral.UserIntegralService;
+import cn.pluss.platform.userIntegralUse.UserIntegralUseService;
+import cn.pluss.platform.util.*;
+import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+
+/**
+ * 官方活动
+ */
+@Controller
+@RequestMapping("activity")
+@Slf4j
+@RequiredArgsConstructor
+public class ActivityController {
+
+    private final OfficialActivityService officialActivityService;
+
+    private final MerchantOrderService merchantOrderService;
+
+    private final UserAppService userAppService;
+
+    private final OfficialGoodsService officialGoodsService;
+
+    private final OfficialGoodsExchangeService officialGoodsExchangeService;
+
+    private final MerchantStoreService merchantStoreService;
+
+    private final MerchantBaseInfoService merchantBaseInfoService;
+
+    private final ActivityEnrollService activityEnrollService;
+
+    private final SystemConfigService systemConfigService;
+
+    private final InviteRateService inviteRateService;
+
+    private final MerchantProfitService merchantProfitService;
+
+    private final DeviceStockService deviceStockService;
+
+    private final UserAddressService userAddressService;
+
+    private final UserIntegralService userIntegralService;
+
+    private final UserIntegralUseService userIntegralUseService;
+
+    private final UserInfoService userInfoService;
+
+
+    @GetMapping("/act/detail")
+    public ModelAndView actDetail(String token, Integer a, Integer c, String t, HttpServletRequest request) {
+        ModelAndView view = new ModelAndView();
+        UserApp app = checkToken(token, view, request);
+        if (app == null) {
+            view.addObject("error", "无效的用户！");
+            view.setViewName("merchant/errorInfo");
+            return view;
+        }
+        if (StringUtil.isEmpty(a)) {
+            view.addObject("error", "无效的活动");
+            view.setViewName("merchant/errorInfo");
+            return view;
+        }
+        OfficialActivity act = officialActivityService.getById(a);
+        if (act == null) {
+            view.addObject("error", "无效的活动");
+            view.setViewName("merchant/errorInfo");
+            return view;
+        }
+        view.setViewName("activity/actDetail");
+        view.addObject("token", token);
+        view.addObject("act", act);
+        view.addObject("marketAmtCount", "0.00");
+        view.addObject("t", t);
+        if (StringUtil.isEmpty(app.getMerchantCode())) {
+            view.addObject("isMarket", "0");
+            view.addObject("f", "1");
+        } else {
+            MerchantStore store = new MerchantStore();
+            store.setMerchantCode(app.getMerchantCode());
+            List<MerchantStore> storeList = merchantStoreService.queryMerchantStoreList(store);
+            if (storeList.isEmpty()) {
+                view.addObject("error", "请先开通商户");
+                view.setViewName("merchant/errorInfo");
+                return view;
+            }
+
+            view.addObject("isMarket", storeList.get(0).getIsMarket());
+
+            if (StringUtil.isNotEmpty(c)) {
+                BigDecimal marketQuota = new BigDecimal("500000");
+                String value = "";
+                if ("1".equals(String.valueOf(c))) {
+                    value = systemConfigService.querySystemConfigValue("activityTransMarketQuota");
+                } else if ("2".equals(String.valueOf(c))) {
+                    marketQuota = new BigDecimal("250000");
+                    value = systemConfigService.querySystemConfigValue("activityTransP117Quota");
+                } else if ("4".equals(String.valueOf(c))) {
+                    marketQuota = new BigDecimal("250000");
+                    value = systemConfigService.querySystemConfigValue("activityTransCG02Quota");
+                }
+                if (StringUtil.isNotEmpty(value)) {
+                    marketQuota = new BigDecimal(value.split("-")[0]);
+                }
+                view.addObject("marketQuota", marketQuota);
+
+                QueryWrapper<ActivityEnroll> enrollQueryWrapper = new QueryWrapper<ActivityEnroll>()
+                        .eq("merchantCode", app.getMerchantCode()).eq("actId", a)
+                        .orderByDesc("createTime").last("limit 1");
+                List<ActivityEnroll> actEnrollList = activityEnrollService.list(enrollQueryWrapper);
+                if (actEnrollList.isEmpty()) {
+                    view.addObject("progressNum", 0);
+                    view.addObject("tradeAmt", 0);
+                    view.addObject("actTitle", "您尚未参加此活动");
+                    view.addObject("f", "0");
+                } else {
+                    ActivityEnroll activityEnroll = actEnrollList.get(0);
+                    if ("0".equals(activityEnroll.getStatus())) {
+                        view.addObject("progressNum", 0);
+                        view.addObject("tradeAmt", 0);
+                        view.addObject("actTitle", "申请成功，等待审核...");
+                        view.addObject("f", "1");
+                    } else if ("1".equals(activityEnroll.getStatus())) {
+                        //获取商户当前已经积累的交易额度
+                        String auditDate = DateUtils.formatDateDefault(activityEnroll.getAuditTime(), "yyyy-MM-dd");
+                        if ("1".equals(c + "") || "2".equals(c + "") || "4".equals(c + "")) {
+                            Map<String, Double> countTradeAmt = merchantOrderService.getCountTradeAmt(app.getMerchantCode(), auditDate, null, null);
+                            //Double tradeAmt = countTradeAmt.get("tradeAmtCount");
+                            Double dateAmt = countTradeAmt.get("dateAmt");
+                            if (dateAmt == null) {
+                                view.addObject("progressNum", 0);
+                                view.addObject("tradeAmt", 0);
+                            } else {
+                                BigDecimal transAmt = new BigDecimal(Double.toString(dateAmt));
+                                if (transAmt.doubleValue() == 0.00) {
+                                    view.addObject("progressNum", 0);
+                                    view.addObject("tradeAmt", 0);
+                                } else {
+                                    Double progressNum = transAmt.divide(marketQuota).multiply(new BigDecimal(100))
+                                            .setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
+                                    view.addObject("progressNum", progressNum);
+                                    view.addObject("tradeAmt", dateAmt);
+                                }
+                            }
+                        } else if ("3".equals(String.valueOf(c))) {
+                            //获取插件以获得的奖励金
+                            BigDecimal countIntegral = userIntegralService.getCountIntegral(app.getUserId(), null, auditDate);
+                            view.addObject("marketAmtCount", countIntegral);
+                        }
+                        view.addObject("actTitle", "您已成功参与此活动");
+                        view.addObject("f", "1");
+                    } else {
+                        QueryWrapper<ActivityEnroll> activityEnrollQueryWrapper = new QueryWrapper<ActivityEnroll>()
+                                .eq("merchantCode", app.getMerchantCode()).orderByDesc("createTime").last("limit 1");
+                        List<ActivityEnroll> list = activityEnrollService.list(activityEnrollQueryWrapper);
+                        view.addObject("progressNum", 0);
+                        view.addObject("tradeAmt", 0);
+                        view.addObject("actTitle", "");
+                        view.addObject("checkTitle", "审核失败：" + list.get(0).getRemark());
+                        view.addObject("f", "2");
+                    }
+                }
+            }
+        }
+        view.addObject("userType", app.getUserType());
+        view.addObject("c", c);
+        return view;
+    }
+
+    @GetMapping("/one")
+    public ModelAndView actOne(String token, String t, HttpServletRequest request) {
+        ModelAndView view = new ModelAndView();
+        UserApp app = checkToken(token, view, request);
+        if (app == null) {
+            view.addObject("error", "无效的用户！");
+            view.setViewName("merchant/errorInfo");
+            return view;
+        }
+        if (StringUtil.isEmpty(app.getMerchantCode())) {
+            view.addObject("error", "暂无活动资格！");
+            view.setViewName("merchant/errorInfo");
+            return view;
+        }
+        if (StringUtil.isEmpty(t)) {
+            view.addObject("error", "缺失参数！");
+            view.setViewName("merchant/errorInfo");
+            return view;
+        }
+
+        if (app == null) {
+            view.addObject("error", "无效的用户！");
+            view.setViewName("merchant/errorInfo");
+            return view;
+        }
+        Map<String, Object> result = getActRateParam(t);
+
+        UserInfo byId = userInfoService.getById(app.getUserId());
+        if (byId != null) {
+            view.addObject("loginName", byId.getLoginName());
+        }
+        Map<String, Object> hashMap = new HashMap<>(1);
+        hashMap.put("userId", app.getUserId());
+        hashMap.put("startDate", result.get("startDate"));
+        hashMap.put("endDate", result.get("endDate"));
+        Map<String, Object> profitMap = merchantProfitService.getProfitCount(hashMap);
+        view.addObject("shareAmountCount", profitMap.get("shareAmountCount"));
+
+        Map<String, BigDecimal> saveMap = merchantOrderService.getSaveMoneyCount(app.getMerchantCode(), null, result.get("startDate").toString(), result.get("endDate").toString());
+        view.addObject("saveAmtCount", saveMap.get("saveAmtCount"));
+        //TODO 获取下级用户
+        Integer count = userAppService.getSubUserCount(app.getUserId(), result.get("startDate").toString(), result.get("endDate").toString());
+        view.addObject("userCount", count);
+        view.addObject("merchantCode", app.getMerchantCode());
+        view.addObject("token", token);
+        view.addObject("t", t);
+        view.addObject("inviteRateList", result.get("inviteRateList"));
+        view.setViewName("activity/act-one");
+        return view;
+    }
+
+    private Map<String, Object> getActRateParam(String t) {
+        Map<String, Object> result = new HashMap<>(3);
+        String startDate = "2020-12-01";
+        String endDate = "2021-02-01";
+        List<InviteRate> inviteRateList = inviteRateService.list(new QueryWrapper<InviteRate>().orderByAsc("number").eq("type", t));
+        if (!inviteRateList.isEmpty()) {
+            result.put("inviteRateList", inviteRateList);
+            InviteRate rate = inviteRateList.get(0);
+            OfficialActivity act = officialActivityService.getById(rate.getActId());
+            if (act != null) {
+                startDate = DateUtils.formatDateDefault(act.getStartTime(), "yyyy-MM-dd");
+                endDate = DateUtils.formatDateDefault(act.getEndTime(), "yyyy-MM-dd");
+            }
+        }
+        result.put("startDate", startDate);
+        result.put("endDate", endDate);
+        return result;
+    }
+
+    @GetMapping("/one/desc")
+    public ModelAndView actOneDesc(String token, String t, HttpServletRequest request) {
+        ModelAndView view = new ModelAndView();
+        UserApp app = checkToken(token, view, request);
+        if (app == null) {
+            view.addObject("error", "无效的用户！");
+            view.setViewName("merchant/errorInfo");
+            return view;
+        }
+        if (StringUtil.isEmpty(t)) {
+            view.addObject("error", "缺失参数！");
+            view.setViewName("merchant/errorInfo");
+            return view;
+        }
+        String actStartDate = "2020年12月01日";
+        String actEndDate = "2021年02月01日";
+        BigDecimal oneRate = new BigDecimal("0.30");
+        BigDecimal twoRate = new BigDecimal("0.25");
+        Integer oneLevel = 8;
+        Integer twoLevel = 16;
+        List<InviteRate> inviteRateList = inviteRateService.list(new QueryWrapper<InviteRate>().orderByAsc("number").eq("type", t));
+        if (!inviteRateList.isEmpty()) {
+            InviteRate one = inviteRateList.get(0);
+            InviteRate two = inviteRateList.get(1);
+            oneLevel = one.getNumber();
+            twoLevel = two.getNumber();
+            oneRate = one.getRate();
+            twoRate = two.getRate();
+            OfficialActivity byId = officialActivityService.getById(one.getActId());
+            if (byId != null) {
+                actStartDate = DateUtils.formatDateDefault(byId.getStartTime(), "yyyy年MM月dd日");
+                actEndDate = DateUtils.formatDateDefault(byId.getEndTime(), "yyyy年MM月dd日");
+            }
+        }
+        view.addObject("oneRate", oneRate);
+        view.addObject("twoRate", twoRate);
+        view.addObject("oneLevel", oneLevel);
+        view.addObject("twoLevel", twoLevel);
+        view.addObject("actStartDate", actStartDate);
+        view.addObject("actEndDate", actEndDate);
+        view.addObject("inviteRateList", inviteRateList);
+        view.addObject("t", t);
+        view.setViewName("activity/act-one-desc");
+        return view;
+    }
+
+    @GetMapping("/one/bonus")
+    public ModelAndView actOneBonus(String token, String t, HttpServletRequest request) {
+        ModelAndView view = new ModelAndView();
+        UserApp app = checkToken(token, view, request);
+        if (app == null) {
+            return view;
+        }
+        view.addObject("t", t);
+        view.setViewName("activity/act-one-bonus");
+        return view;
+    }
+
+
+    @GetMapping("/one/lay")
+    public ModelAndView actOneLay(String inviteNum, String t, HttpServletRequest request) {
+        ModelAndView view = new ModelAndView();
+        String merchantCode = chenkInviteNum(inviteNum, view, request);
+        if (StringUtil.isEmpty(merchantCode)) {
+            return view;
+        }
+        QueryWrapper<UserApp> queryWrapper = new QueryWrapper<UserApp>().eq("merchantCode", merchantCode)
+                .eq("userType", "promoter");
+        if (!merchantCode.contains("M")) {
+            queryWrapper = new QueryWrapper<UserApp>().eq("userId", merchantCode);
+        }
+        UserApp app = userAppService.getOne(queryWrapper);
+        if (app == null) {
+            view.addObject("error", "无效的用户！");
+            view.setViewName("merchant/errorInfo");
+            return view;
+        }
+        view.addObject("inviteNum", inviteNum);
+        view.addObject("token", app.getToken());
+        view.addObject("t", t);
+        view.setViewName("activity/act-one-lay");
+        return view;
+    }
+
+    private String chenkInviteNum(String inviteNum, ModelAndView view, HttpServletRequest request) {
+        if (StringUtil.isEmpty(inviteNum)) {
+            view.addObject("error", "无效的推广码");
+            view.setViewName("merchant/errorInfo");
+            return null;
+        }
+        Object code = request.getSession().getAttribute(inviteNum);
+        String merchantCode = "";
+        if (code == null) {
+            QueryWrapper<UserApp> queryAppWrapper = new QueryWrapper<UserApp>().eq("inviteNum", inviteNum);
+            UserApp app = userAppService.getOne(queryAppWrapper);
+            if (app == null) {
+                view.addObject("error", "无效的推广码");
+                view.setViewName("merchant/errorInfo");
+                return null;
+            }
+            if (StringUtil.isEmpty(app.getMerchantCode())) {
+                merchantCode = String.valueOf(app.getUserId());
+            } else {
+                merchantCode = app.getMerchantCode();
+            }
+            request.getSession().setAttribute(inviteNum, app.getMerchantCode());
+        } else {
+            merchantCode = code.toString();
+        }
+        return merchantCode;
+    }
+
+    @GetMapping("/one/detail")
+    public ModelAndView actOneDetail(String token, String t, HttpServletRequest request) {
+        ModelAndView view = new ModelAndView();
+        UserApp app = checkToken(token, view, request);
+        if (app == null) {
+            view.addObject("error", "无效的用户");
+            view.setViewName("merchant/errorInfo");
+            return null;
+        }
+        List<InviteRate> inviteRateList = inviteRateService.list(new QueryWrapper<InviteRate>().orderByAsc("number").eq("type", t));
+        view.addObject("inviteRateList", inviteRateList);
+        view.addObject("inviteNum", app.getInviteNum());
+        view.setViewName("activity/act-one-detail");
+        view.addObject("token", token);
+        view.addObject("t", t);
+        return view;
+    }
+
+    @GetMapping("/one/poster")
+    public ModelAndView actOnePoster(String token, String t, HttpServletRequest request) {
+        ModelAndView view = new ModelAndView();
+        UserApp app = checkToken(token, view, request);
+        if (app == null) {
+            view.addObject("error", "无效的用户");
+            view.setViewName("merchant/errorInfo");
+            return view;
+        }
+        String url = ParametersUtil.domain + "/wap/activity/one/lay?inviteNum=" + app.getInviteNum() + "&t=" + t;
+        view.addObject("token", token);
+        view.addObject("url", url);
+        view.setViewName("activity/act-one-poster");
+        return view;
+    }
+
+    @GetMapping("/one/income")
+    public ModelAndView actOneIncome(String token, String t, HttpServletRequest request) {
+        ModelAndView view = new ModelAndView();
+        UserApp app = checkToken(token, view, request);
+        if (app == null) {
+            view.addObject("error", "无效的用户");
+            view.setViewName("merchant/errorInfo");
+            return view;
+        }
+        if (StringUtil.isEmpty(t)) {
+            view.addObject("error", "缺失参数！");
+            view.setViewName("merchant/errorInfo");
+            return view;
+        }
+        Map<String, Object> resultMap = getActRateParam(t);
+        Map<String, Object> hashMap = new HashMap<>(3);
+        hashMap.put("userId", app.getUserId());
+        hashMap.put("startDate", resultMap.get("startDate"));
+        hashMap.put("endDate", resultMap.get("endDate"));
+        //查询获得的分润
+        Map<String, Object> profitMap = merchantProfitService.getProfitCount(hashMap);
+        view.addObject("mercShareAmtCount", profitMap.get("mercShareAmtCount"));
+        view.addObject("toUpShareAmtCount", profitMap.get("toUpShareAmtCount"));
+        view.addObject("token", token);
+        view.addObject("t", t);
+        view.setViewName("activity/act-one-income");
+        return view;
+    }
+
+    @GetMapping("/one/thrift")
+    public ModelAndView actOneThrift(String token, String t, HttpServletRequest request) {
+        ModelAndView view = new ModelAndView();
+        UserApp app = checkToken(token, view, request);
+        if (app == null) {
+            view.addObject("error", "无效的用户");
+            view.setViewName("merchant/errorInfo");
+            return view;
+        }
+        if (StringUtil.isEmpty(t)) {
+            view.addObject("error", "缺失参数！");
+            view.setViewName("merchant/errorInfo");
+            return view;
+        }
+
+        if (StringUtil.isEmpty(app.getMerchantCode())) {
+            view.addObject("error", "暂不支持当前活动");
+            view.setViewName("merchant/errorInfo");
+            return view;
+        }
+
+        Map<String, Object> resultMap = getActRateParam(t);
+        Date dateTime = new Date();
+        String date = new SimpleDateFormat("yyyy-MM-dd").format(dateTime);
+        String startDateStr = resultMap.get("startDate").toString();
+        String endDateStr = resultMap.get("endDate").toString();
+
+
+        Integer nowDateInt = Integer.parseInt(date.replace("-", ""));
+        Integer startDateInt = Integer.parseInt(startDateStr.replace("-", ""));
+        Integer endDateInt = Integer.parseInt(endDateStr.replace("-", ""));
+        if (nowDateInt < startDateInt || nowDateInt > endDateInt) {
+            date = null;
+        }
+        Map<String, Double> map = merchantOrderService.getCountTradeAmt(app.getMerchantCode(), date,
+                startDateStr, endDateStr);
+        view.addObject("map", map);
+
+        //TODO 计算累计省钱金额和今日省钱金额
+        String nowDate = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
+        Map<String, BigDecimal> result = merchantOrderService.getSaveMoneyCount(app.getMerchantCode(), nowDate, resultMap.get("startDate").toString(), resultMap.get("endDate").toString());
+        view.addObject("result", result);
+        view.addObject("token", token);
+        view.addObject("t", t);
+        view.setViewName("activity/act-one-thrift");
+        return view;
+    }
+
+    @GetMapping("/one/invite")
+    public ModelAndView actOneInvite(String token, String t, String count, HttpServletRequest request) {
+        ModelAndView view = new ModelAndView();
+        UserApp app = checkToken(token, view, request);
+        if (app == null) {
+            view.addObject("error", "无效的用户");
+            view.setViewName("merchant/errorInfo");
+            return view;
+        }
+        view.addObject("userCount", count);
+        view.addObject("token", token);
+        view.addObject("t", t);
+        view.setViewName("activity/act-one-invite");
+        return view;
+    }
+
+    @RequestMapping("/invite/page")
+    @ResponseBody
+    public Result<Map<String, Object>> invitePage(int pageNum, int pageSize, String t, String token, HttpServletRequest request) {
+        ModelAndView view = new ModelAndView();
+        UserApp app = checkToken(token, view, request);
+        if (app == null) {
+            return ResultGenerator.genFailResult(view.getModelMap().get("error").toString());
+        }
+        if (StringUtil.isEmpty(t)) {
+            return ResultGenerator.genFailResult("缺失参数");
+        }
+        Map<String, Object> resultMap = getActRateParam(t);
+        Date startDate = DateUtils.parse(resultMap.get("startDate").toString(), "yyyy-MM-dd");
+        Date endDate = DateUtils.parse(resultMap.get("endDate").toString(), "yyyy-MM-dd");
+        //TODO 获取下级用户
+        Page<UserApp> page = new Page<UserApp>();
+        page.setCurrent(pageNum);
+        page.setSize(pageSize == 0 ? 10 : pageSize);
+        UserApp userApp = new UserApp();
+        userApp.setUserId(app.getUserId());
+        userApp.setStartDate(startDate);
+        userApp.setEndDate(endDate);
+        page = userAppService.pageJoinData(page, userApp);
+
+        Page<MerchantBaseInfo> merchantPage = new Page<MerchantBaseInfo>();
+        merchantPage.setCurrent(pageNum);
+        merchantPage.setSize(pageSize == 0 ? 10 : pageSize);
+        merchantPage = merchantBaseInfoService.pageJoinData(merchantPage, userApp);
+        Map<String, Object> result = new HashMap<>(2);
+        result.put("userList", page);
+        result.put("mercList", merchantPage);
+        result.put("mercCount", merchantPage.getTotal());
+        return ResultGenerator.genSuccessResult(result);
+    }
+
+
+    @RequestMapping("/income/page")
+    @ResponseBody
+    public Result<Page<MerchantProfit>> incomePage(int pageNum, int pageSize, String t, String token, HttpServletRequest request) {
+        ModelAndView view = new ModelAndView();
+        UserApp app = checkToken(token, view, request);
+        if (app == null) {
+            return ResultGenerator.genFailResult(view.getModelMap().get("error").toString());
+        }
+        if (StringUtil.isEmpty(t)) {
+            return ResultGenerator.genFailResult("缺失参数");
+        }
+        Map<String, Object> resultMap = getActRateParam(t);
+        Date startDate = DateUtils.parse(resultMap.get("startDate").toString() + " 00:00:00", "yyyy-MM-dd HH:mm:ss");
+        Date endDate = DateUtils.parse(resultMap.get("endDate").toString() + " 23:59:59", "yyyy-MM-dd HH:mm:ss");
+
+        Page<MerchantProfit> page = new Page<MerchantProfit>();
+        page.setCurrent(pageNum);
+        page.setSize(pageSize == 0 ? 10 : pageSize);
+        QueryWrapper<MerchantProfit> profitWrapper = new QueryWrapper<MerchantProfit>()
+                .ne("price", 0.0)
+                .between("createDt", startDate, endDate)
+                .eq("userId", app.getUserId()).orderByDesc("createDt");
+
+        page = merchantProfitService.page(page, profitWrapper);
+        return ResultGenerator.genSuccessResult(page);
+    }
+
+
+    @RequestMapping("/thrift/page")
+    @ResponseBody
+    public Result<Page<MerchantOrder>> thriftPage(int pageNum, int pageSize, String t, String token, HttpServletRequest request) {
+        ModelAndView view = new ModelAndView();
+        UserApp app = checkToken(token, view, request);
+        if (app == null) {
+            return ResultGenerator.genFailResult(view.getModelMap().get("error").toString());
+        }
+        if (StringUtil.isEmpty(t)) {
+            return ResultGenerator.genFailResult("缺失参数");
+        }
+
+        if (StringUtil.isEmpty(app.getMerchantCode())) {
+            return ResultGenerator.genFailResult("暂不支持当前活动");
+        }
+        Map<String, Object> resultMap = getActRateParam(t);
+        Date startDate = DateUtils.parse(resultMap.get("startDate").toString() + " 00:00:00", "yyyy-MM-dd HH:mm:ss");
+        Date endDate = DateUtils.parse(resultMap.get("endDate").toString() + " 23:59:59", "yyyy-MM-dd HH:mm:ss");
+
+        Page<MerchantOrder> page = new Page<MerchantOrder>();
+        page.setCurrent(pageNum);
+        page.setSize(pageSize == 0 ? 10 : pageSize);
+        MerchantOrder order = new MerchantOrder();
+        order.setMerchantCode(app.getMerchantCode());
+        order.setStatus("1");
+        order.setStartTime(startDate);
+        order.setEndTime(endDate);
+        page = merchantOrderService.pageWapInfo(page, order);
+        return ResultGenerator.genSuccessResult(page);
+    }
+
+
+    @GetMapping("/index")
+    public ModelAndView index(String token, String t, HttpServletRequest request) {
+        ModelAndView view = new ModelAndView();
+        UserApp app = checkToken(token, view, request);
+        if (app == null) {
+            view.addObject("error", "无效的用户");
+            view.setViewName("merchant/errorInfo");
+            return view;
+        }
+        String activityGroupNo = null;
+        if (StringUtil.isNotEmpty(t)) {
+            activityGroupNo = t;
+        } else {
+            if ("agent".equals(app.getUserType())) {
+                activityGroupNo = "super";
+            } else {
+                activityGroupNo = "general";
+            }
+        }
+        view.setViewName("activity/activity");
+        view.addObject("token", token);
+        BigDecimal countIntegral = userIntegralService.getCountIntegral(app.getUserId());
+        BigDecimal useIntegral = userIntegralUseService.getUseIntegral(app.getUserId());
+        BigDecimal useAmt = countIntegral.add(useIntegral);
+        if (useAmt.compareTo(BigDecimal.ZERO) < 0) {
+            useAmt = new BigDecimal("0.00");
+        }
+        view.addObject("useAmt", useAmt);
+        view.addObject("marketAmtCount", countIntegral);
+        OfficialActivity condition = new OfficialActivity();
+        condition.setActivityGroupNo(activityGroupNo);
+        condition.setStatus("2");
+        condition.setRoleType(app.getRoleCode());
+        List<OfficialActivity> list = officialActivityService.getListByRole(condition);
+        view.addObject("activityList", list);
+        condition.setStatus("3");
+        List<OfficialActivity> oldList = officialActivityService.getListByRole(condition);
+        view.addObject("activitOldList", oldList);
+        view.addObject("t", activityGroupNo);
+        view.addObject("domain",ParametersUtil.domain);
+        return view;
+    }
+
+    private UserApp checkToken(String token, ModelAndView view, HttpServletRequest request) {
+        if (StringUtil.isEmpty(token)) {
+            view.addObject("error", "无效的token");
+            view.setViewName("merchant/errorInfo");
+            return null;
+        }
+
+        Object obj = request.getSession().getAttribute(token);
+        if ((obj instanceof UserApp)) {
+            return (UserApp) obj;
+        } else {
+            QueryWrapper<UserApp> queryAppWrapper = new QueryWrapper<>();
+            queryAppWrapper.eq("token", token);
+            UserApp app = userAppService.getOne(queryAppWrapper);
+            if (app == null) {
+                view.addObject("error", "无效的token");
+                view.setViewName("merchant/errorInfo");
+                return null;
+            }
+            request.getSession().setAttribute(token, app);
+            return app;
+        }
+    }
+
+    @GetMapping("/desc")
+    public ModelAndView desc(String token, HttpServletRequest request) {
+        ModelAndView view = new ModelAndView();
+        view.setViewName("activity/desc");
+        return view;
+    }
+
+
+    @GetMapping("/good")
+    public ModelAndView good(String token, HttpServletRequest request) {
+        ModelAndView view = new ModelAndView();
+        UserApp app = checkToken(token, view, request);
+        if (app == null) {
+            return view;
+        }
+        view.setViewName("activity/goods");
+        BigDecimal countIntegral = userIntegralService.getCountIntegral(app.getUserId());
+        BigDecimal useIntegral = userIntegralUseService.getUseIntegral(app.getUserId());
+        BigDecimal useAmt = countIntegral.add(useIntegral);
+        if (useAmt.compareTo(BigDecimal.ZERO) < 0) {
+            useAmt = new BigDecimal("0.00");
+        }
+        QueryWrapper<OfficialGoods> queryGoodsWrapper = new QueryWrapper<OfficialGoods>().orderByDesc("createTime");
+        queryGoodsWrapper.eq("status", "2");
+        List<OfficialGoods> list = officialGoodsService.list(queryGoodsWrapper);
+        view.addObject("useAmt", useAmt);
+        view.addObject("token", token);
+        view.addObject("goodList", list);
+        return view;
+    }
+
+    @GetMapping("/exchange/order")
+    public ModelAndView exchangeOrder(String token, Integer g, Integer aid,HttpServletRequest request) {
+        ModelAndView view = new ModelAndView();
+        UserApp app = checkToken(token, view, request);
+        if (app == null) {
+            return view;
+        }
+        if (StringUtil.isEmpty(g)) {
+            view.addObject("error", "无效的商品");
+            view.setViewName("merchant/errorInfo");
+            return view;
+        }
+        OfficialGoods good = officialGoodsService.getById(g);
+        if (StringUtil.isEmpty(good)) {
+            view.addObject("error", "无效的商品");
+            view.setViewName("merchant/errorInfo");
+            return view;
+        }
+        if (!"2".equals(good.getStatus())) {
+            view.addObject("error", "不可兑换的商品！");
+            view.setViewName("merchant/errorInfo");
+            return view;
+        }
+        UserAddress userAddres = null;
+        if(StringUtil.isNotEmpty(aid)){
+            userAddres = userAddressService.getById(aid);
+        }else{
+            List<UserAddress> addressList = userAddressService.getAddressList(app.getUserId(), 1, true);
+            if(!addressList.isEmpty()){
+                userAddres = addressList.get(0);
+            }
+        }
+        view.addObject("userAddres", userAddres);
+        view.addObject("good", good);
+        view.addObject("token", token);
+        if(StringUtil.isEmpty(aid) && userAddres != null){
+            view.addObject("aid", userAddres.getId());
+        }else{
+            view.addObject("aid", aid);
+        }
+        view.setViewName("activity/order");
+        return view;
+    }
+
+    @GetMapping("/address")
+    public ModelAndView address(String token, Integer g, HttpServletRequest request) {
+        ModelAndView view = new ModelAndView();
+        UserApp app = checkToken(token, view, request);
+        if (app == null) {
+            return view;
+        }
+        List<UserAddress> addressList = userAddressService.getAddressList(app.getUserId(), 1,false);
+        view.addObject("addressList", addressList);
+        view.addObject("token", token);
+        view.addObject("g", g);
+        view.setViewName("activity/address");
+        return view;
+    }
+
+    @PostMapping("/address/del/{id}")
+    @ResponseBody
+    public Result addressDel(@PathVariable("id") Integer id) {
+        userAddressService.removeById(id);
+        return ResultGenerator.genSuccessResult("操作成功",null);
+    }
+
+    @PostMapping("/address/save")
+    @ResponseBody
+    public Result addressSave(@RequestParam Map<String,String> params, HttpServletRequest request) {
+        ModelAndView view = new ModelAndView();
+        UserApp app = checkToken(params.get("token"), view, request);
+        if (app == null) {
+            return ResultGenerator.genFailResult(view.getModelMap().get("error").toString());
+        }
+        UserAddress userAddress = new UserAddress();
+        if(StringUtil.isNotEmpty(params.get("id"))){
+            userAddress.setId(Integer.valueOf(params.get("id")));
+        }
+        userAddress.setUserId(Integer.valueOf(app.getUserId().toString()));
+        userAddress.setName(params.get("name"));
+        userAddress.setPhone(params.get("phone"));
+        userAddress.setAddress(params.get("address"));
+        userAddress.setAreaCode(params.get("areaCode"));
+        userAddress.setAreaName(params.get("areaName"));
+        userAddress.setType(1);
+        userAddress.setDefFlag(params.get("defFlag"));
+        userAddressService.saveOrUpdate(userAddress);
+        return ResultGenerator.genSuccessResult("操作成功",userAddress);
+    }
+
+    @GetMapping("/address/add")
+    public ModelAndView addressAdd(String token, Integer g,Integer aid, HttpServletRequest request) {
+        ModelAndView view = new ModelAndView();
+        UserApp app = checkToken(token, view, request);
+        if (app == null) {
+            return view;
+        }
+        if(StringUtil.isNotEmpty(aid)){
+            UserAddress userAddress = userAddressService.getById(aid);
+            view.addObject("userAddress", userAddress);
+        }
+        view.addObject("token", token);
+        view.addObject("g", g);
+        view.setViewName("activity/addressPost");
+        return view;
+    }
+
+    @GetMapping("/good/detail")
+    public ModelAndView goodDetail(String token, Integer g, HttpServletRequest request) {
+        ModelAndView view = new ModelAndView();
+        UserApp app = checkToken(token, view, request);
+        if (app == null) {
+            return view;
+        }
+        if (StringUtil.isEmpty(g)) {
+            view.addObject("error", "无效的商品");
+            view.setViewName("merchant/errorInfo");
+            return view;
+        }
+        OfficialGoods good = officialGoodsService.getById(g);
+        if (StringUtil.isEmpty(good)) {
+            view.addObject("error", "无效的商品");
+            view.setViewName("merchant/errorInfo");
+            return view;
+        }
+        if (!"2".equals(good.getStatus())) {
+            view.addObject("error", "不可兑换的商品！");
+            view.setViewName("merchant/errorInfo");
+            return view;
+        }
+        BigDecimal countIntegral = userIntegralService.getCountIntegral(app.getUserId());
+        BigDecimal useIntegral = userIntegralUseService.getUseIntegral(app.getUserId());
+        BigDecimal useAmt = countIntegral.add(useIntegral);
+        if (good.getGoodPrice().compareTo(useAmt) > 0) {
+            view.addObject("flag", "0");
+        }else{
+            view.addObject("flag", "1");
+        }
+        view.addObject("good", good);
+        view.addObject("token", token);
+        view.setViewName("activity/goodDetail");
+        return view;
+    }
+
+    @GetMapping("/exchange/view")
+    public ModelAndView goodDetail(Page<OfficialGoodsExchange> page, String token, HttpServletRequest request) {
+        ModelAndView view = new ModelAndView();
+        UserApp app = checkToken(token, view, request);
+        if (app == null) {
+            return view;
+        }
+        QueryWrapper<OfficialGoodsExchange> queryExchangeQuery = new QueryWrapper<OfficialGoodsExchange>().orderByDesc("createTime");
+        queryExchangeQuery.eq("userId", app.getUserId());
+        page = officialGoodsExchangeService.page(page, queryExchangeQuery);
+        view.addObject("goodExchange", page);
+
+        BigDecimal countIntegral = userIntegralService.getCountIntegral(app.getUserId());
+        BigDecimal useIntegral = userIntegralUseService.getUseIntegral(app.getUserId());
+        BigDecimal useAmt = countIntegral.add(useIntegral);
+        view.addObject("token", token);
+        view.addObject("useAmt", useAmt);
+        view.setViewName("activity/goodExchange");
+        return view;
+    }
+
+
+    @PostMapping("/goods/exchange/page")
+    @ResponseBody
+    public Result exchangePage(int pageNum, int pageSize, String token, HttpServletRequest request) {
+        ModelAndView view = new ModelAndView();
+        UserApp app = checkToken(token, view, request);
+        if (app == null) {
+            return ResultGenerator.genFailResult(view.getModelMap().get("error").toString());
+        }
+        Page<OfficialGoodsExchange> page = new Page<OfficialGoodsExchange>();
+        page.setCurrent(pageNum);
+        page.setSize(pageSize == 0 ? 10 : pageSize);
+        QueryWrapper<OfficialGoodsExchange> goodsQuery = new QueryWrapper<OfficialGoodsExchange>().eq("userId", app.getUserId());
+        page = officialGoodsExchangeService.page(page, goodsQuery);
+        return ResultGenerator.genSuccessResult(page);
+    }
+
+    /**
+     * 活动报名
+     *
+     * @param token
+     * @param request
+     * @param actId
+     * @return
+     */
+    @NoRepeatSubmit
+    @PostMapping("/toEnroll")
+    @ResponseBody
+    public Result toEnroll(String token, HttpServletRequest request, Integer actId, String deviceNo, String c, ModelAndView view) {
+        UserApp app = checkToken(token, view, request);
+        if (app == null) {
+            return ResultGenerator.genFailResult(view.getModelMap().get("error").toString());
+        }
+        if (StringUtil.isEmpty(deviceNo)) {
+            return ResultGenerator.genFailResult("设备编号不能为空！");
+        }
+        if (StringUtil.isEmpty(actId)) {
+            return ResultGenerator.genFailResult("请选择正确的活动报名!");
+        }
+        OfficialActivity activity = officialActivityService.getById(actId);
+        if (activity == null) {
+            return ResultGenerator.genFailResult("活动异常!");
+        }
+        if (!"2".equals(activity.getStatus())) {
+            return ResultGenerator.genFailResult("当前活动已过期或已下架!");
+        }
+        QueryWrapper<MerchantBaseInfo> queryWrapper = new QueryWrapper<MerchantBaseInfo>().eq("userId", app.getUserId());
+        MerchantBaseInfo merchant = merchantBaseInfoService.getOne(queryWrapper);
+        if (merchant == null) {
+            return ResultGenerator.genFailResult("请先认证成为商户!");
+        }
+        QueryWrapper<ActivityEnroll> enrollQueryWrapper = new QueryWrapper<ActivityEnroll>()
+                .eq("merchantCode", app.getMerchantCode()).eq("status", "0").eq("actId", actId);
+        List<ActivityEnroll> list = activityEnrollService.list(enrollQueryWrapper);
+        if (!list.isEmpty()) {
+            return ResultGenerator.genFailResult("您已报名此活动，请勿重复报名!");
+        }
+
+        if (!"3".equals(c)) {
+            QueryWrapper<DeviceStock> stockWrapper = new QueryWrapper<DeviceStock>().eq("deviceNo", deviceNo);
+            List<DeviceStock> stockList = deviceStockService.list(stockWrapper);
+            if (stockList.isEmpty()) {
+                return ResultGenerator.genFailResult("设备SN号有误，请重新输入!");
+            }
+        }
+        String startDateStr = DateUtils.formatDateDefault(activity.getStartTime(), "yyyyMMdd");
+        String endDateStr = DateUtils.formatDateDefault(activity.getEndTime(), "yyyyMMdd");
+        String nowDateStr = DateUtils.formatDateDefault(new Date(), "yyyyMMdd");
+        if (Integer.valueOf(startDateStr) <= Integer.valueOf(nowDateStr)
+                && Integer.valueOf(endDateStr) >= Integer.valueOf(nowDateStr)) {
+            ActivityEnroll enroll = new ActivityEnroll();
+            enroll.setActId(actId);
+            enroll.setActType(activity.getActType());
+            enroll.setActName(activity.getOfficName());
+            enroll.setMerchantCode(merchant.getMerchantCode());
+            enroll.setMerchantName(merchant.getAlias());
+            enroll.setStatus("0");
+            enroll.setCreateTime(new Date());
+            enroll.setDeviceNo(deviceNo);
+            activityEnrollService.save(enroll);
+            return ResultGenerator.genSuccessResult("申请成功，等待审核...", null);
+        } else {
+            return ResultGenerator.genFailResult("活动已过期，无法报名", null);
+        }
+    }
+
+
+    @PostMapping("/goods/exchange")
+    @ResponseBody
+    public Result exchange(Integer goodsId, String token,Integer aid, HttpServletRequest request) {
+        ModelAndView view = new ModelAndView();
+        UserApp app = checkToken(token, view, request);
+        if (app == null) {
+            return ResultGenerator.genFailResult(view.getModelMap().get("error").toString());
+        }
+        if (StringUtil.isEmpty(goodsId)) {
+            return ResultGenerator.genFailResult("商品ID不能为空！");
+        }
+        if (StringUtil.isEmpty(aid)) {
+            return ResultGenerator.genFailResult("收货地址不能为空！");
+        }
+        OfficialGoods goods = officialGoodsService.getById(goodsId);
+        if (goods == null) {
+            return ResultGenerator.genFailResult("商品不存在！");
+        }
+        if (!"2".equals(goods.getStatus())) {
+            return ResultGenerator.genFailResult("商品已下架，请选择其他商品！");
+        }
+        BigDecimal goodsPrice = goods.getGoodPrice();
+        BigDecimal countIntegral = userIntegralService.getCountIntegral(app.getUserId());
+        BigDecimal useIntegral = userIntegralUseService.getUseIntegral(app.getUserId());
+        BigDecimal useAmt = countIntegral.add(useIntegral);
+        if (goodsPrice.compareTo(useAmt) > 0) {
+            return ResultGenerator.genFailResult("积分不足，兑换失败！");
+        }
+        return officialGoodsExchangeService.exchange(goods, app,aid);
+    }
+
+    @PostMapping("/page")
+    @ResponseBody
+    public Result page(int pageNum, int pageSize, String token, HttpServletRequest request, String date) {
+        ModelAndView view = new ModelAndView();
+        UserApp app = checkToken(token, view, request);
+        if (app == null) {
+            return ResultGenerator.genFailResult("无效用户");
+        }
+        UserIntegral query = new UserIntegral();
+        query.setUserId(app.getUserId());
+        query.setQueryDate(date);
+        Page<UserIntegral> page = new Page<>();
+        page.setCurrent(pageNum);
+        page.setSize(pageSize == 0 ? 10 : pageSize);
+        page = userIntegralService.pageInfo(page, query);
+
+        QueryWrapper<UserIntegralUse> queryWrapper = new QueryWrapper<UserIntegralUse>().orderByDesc("createTime");
+        queryWrapper.eq("userId", app.getUserId());
+        queryWrapper.eq("DATE_FORMAT(createTime,'%Y-%m')", date);
+        Page<UserIntegralUse> pageCash = new Page<>();
+        pageCash.setCurrent(pageNum);
+        pageCash.setSize(pageSize == 0 ? 10 : pageSize);
+        pageCash = userIntegralUseService.page(pageCash, queryWrapper);
+        Map<String, Object> result = new HashMap<>(2);
+        result.put("orderList", page);
+        result.put("cashList", pageCash);
+        return ResultGenerator.genSuccessResult(result);
+    }
+
+
+    @GetMapping("/detail")
+    public ModelAndView detail(String type, String date, String token, HttpServletRequest request) {
+        ModelAndView view = new ModelAndView();
+        UserApp app = checkToken(token, view, request);
+        if (app == null) {
+            return view;
+        }
+        view.setViewName("activity/detail");
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM");
+        String nowDateStr = format.format(new Date());
+        try {
+            List<Map<String, Object>> last6Months = DateUtils.getLast6Months();
+            view.addObject("monthList", JSONArray.toJSONString(last6Months));
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        if (StringUtil.isEmpty(date)) {
+            date = nowDateStr;
+            view.addObject("nowYear", DateUtils.getNowYear());
+            view.addObject("nowMonth", DateUtils.getNowMonth() < 10 ? "0" + DateUtils.getNowMonth() : DateUtils.getNowMonth());
+        } else {
+            view.addObject("nowYear", date.split("-")[0]);
+            view.addObject("nowMonth", date.split("-")[1]);
+        }
+        BigDecimal countIntegral = userIntegralService.getCountIntegral(app.getUserId(), date, null);
+        view.addObject("incomeAmt", countIntegral);
+        BigDecimal useIntegral = userIntegralUseService.getUseIntegral(app.getUserId(),date);
+        view.addObject("expendAmt", Math.abs(useIntegral.doubleValue()));
+        view.addObject("type", type);
+        view.addObject("token", token);
+        return view;
+    }
+}
diff --git a/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/AliPayController.java b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/AliPayController.java
new file mode 100644
index 0000000..eec2d07
--- /dev/null
+++ b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/AliPayController.java
@@ -0,0 +1,223 @@
+package cn.pluss.platform.controller.home;
+
+import cn.pluss.platform.ali.AliPayNotifyService;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.deviceMerchantBuy.DeviceMerchantBuyService;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.pay.ApiPayService;
+import cn.pluss.platform.util.*;
+import cn.pluss.platform.wap.HttpUrlConnection;
+import com.alibaba.fastjson.JSONObject;
+import com.alipay.api.AlipayApiException;
+import com.alipay.api.AlipayClient;
+import com.alipay.api.DefaultAlipayClient;
+import com.alipay.api.internal.util.AlipaySignature;
+import com.alipay.api.request.AlipaySystemOauthTokenRequest;
+import com.alipay.api.response.AlipaySystemOauthTokenResponse;
+import lombok.Setter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.io.UnsupportedEncodingException;
+import java.text.SimpleDateFormat;
+import java.util.Base64;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author yuchen
+ *
+ * @Description 授权应用获取token控制器
+ */
+@Controller
+@RequestMapping("aliPay")
+public class AliPayController {
+
+    @Setter(onMethod_ = {@Autowired})
+    private AliPayNotifyService aliPayNotifyService;
+
+    private static final Logger logger = LoggerFactory.getLogger(AliPayController.class);
+
+    @Setter(onMethod_ = {@Autowired})
+    private HttpServletRequest request;
+
+    @Setter(onMethod_ = {@Autowired})
+    private DeviceMerchantBuyService deviceMerchantBuyService;
+
+    /**
+     * base64编码
+     */
+    final static Base64.Encoder encoder = Base64.getEncoder();
+
+    @Resource
+    private ApiPayService apiPayService;
+
+
+    @GetMapping("/index")
+    public String index() throws UnsupportedEncodingException {
+        String userId = request.getParameter("userId");
+        if (userId == null) {
+            return "aliPay/fail";
+        }
+        byte[] textByte = userId.getBytes("UTF-8");
+        String returnUrl = ParametersUtil.ALI_RETURN_URL;
+        userId = encoder.encodeToString(textByte);
+        StringBuffer sb = new StringBuffer();
+        sb.append("https://openauth.alipay.com/oauth2/appToAppBatchAuth.htm?");
+        sb.append("app_id=" + ParametersUtil.ALI_APP_ID);
+        sb.append("&application_type=WEBAPP,MOBILEAPP");
+        sb.append("&redirect_uri=" + returnUrl);
+        sb.append("&state=" + userId);
+        request.setAttribute("returnUrl", sb);
+        return "aliPay/aliPay";
+    }
+
+    @GetMapping("/returnUrl")
+    public String returnUrl(String orderNumber){
+        request.setAttribute("orderNumber",orderNumber);
+        request.setAttribute("appId",ParametersUtil.ZY_ALI_APP_ID);
+        return "th_alipay";
+    }
+
+
+    /**
+     * aliCallBack:(设备订单支付宝回调通知). <br/>
+     *
+     * @param request
+     * @return
+     *
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    @PostMapping("/aliCallBack")
+    public String aliCallBack(HttpServletRequest request) {
+        Map<String, Object> srcParam = HttpUrlConnection.convertRequestParamsToMap(this.request);
+        Map<String, String> params = new HashMap<>();
+
+        for (Map.Entry<String, Object> entry : srcParam.entrySet()) {
+            params.put(entry.getKey(), (String) entry.getValue());
+        }
+
+        try {
+            boolean signVerified = AlipaySignature.rsaCheckV1(params, ParametersUtil.ZY_PUB, "UTF-8", "RSA2");
+            if (signVerified) {
+                String tradeStatus = params.get("trade_status");
+                logger.info("=====tradeStatus=====" + tradeStatus);
+                if ("TRADE_SUCCESS".equals(tradeStatus)) {
+                    String tradeNumber = params.get("trade_no");
+                    String orderNumber = params.get("out_trade_no");// 商家订单号
+                    String consumTime = params.get("gmt_payment");// 交易付款时间
+                    DeviceMerchantBuy deviceMerchantBuy = new DeviceMerchantBuy();
+                    deviceMerchantBuy.setOrderNo(orderNumber);
+                    deviceMerchantBuy = deviceMerchantBuyService.queryDeviceMerchantBuy(deviceMerchantBuy);
+                    if ("1".equals(deviceMerchantBuy.getStatus())) {
+                        return "success";
+                    }
+                    deviceMerchantBuy.setStatus("1");
+                    deviceMerchantBuy.setTransNo(tradeNumber);
+                    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                    deviceMerchantBuy.setTransDt(sdf.parse(consumTime));
+                    deviceMerchantBuyService.updateDeviceMerchantBuy(deviceMerchantBuy);
+                }
+                return "success";
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            return "failure";
+        }
+        return "failure";
+    }
+
+    /**
+     * aliCallBack:(设备订单支付宝回调通知). <br/>
+     *
+     * @param request
+     * @return
+     *
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    @PostMapping("/aliCallBackV2")
+    public String aliCallBackV2(HttpServletRequest request) {
+        Map<String, Object> param = HttpUrlConnection.convertRequestParamsToMap(request);
+        try {
+            aliPayNotifyService.commonPayNotify(param);
+            return "success";
+        } catch (Exception e) {
+            e.printStackTrace();
+            return "failure";
+        }
+    }
+
+    @PostMapping("/app/getAuthOpenId")
+    @ResponseBody
+    public Result<Object> getAuthOpenId(@RequestBody JSONObject params) {
+        String authCode = params.getString("authCode");
+        if(StringUtil.isEmpty(authCode)){
+            return ResultGenerator.genFailResult("获取授权信息失败！");
+        }
+        String privateKey = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCEWqqQVjebxhtnuGC9yBUFnFJ7R4ZYKJ/110WYdww/N2YDQPmOqYLW5d4BSDtjZmYlMwG/QFO2NIf5tMz1vtN4/Px9PUIlEFYkdTNAr4kQeQ/cEpj+jymZZ1cpGnZnFBiGYuSsovGIe5CmeegYBMKreuTzjZP5tsGMH2UQ9bEsc4q2y74VGV8j0ealA5Z9fh9aIF+CSi0SfftGuc3n0SSDIWB/ZOFVEkcuVbO/qbIM+2xFkS2RbKKlDW88cdHr9cSPY9A4b8c9aiaHUHWHCHRCKMZsgY8ANGrvCRC4sgMaX96UKk+0Ioy5lI0lkdHr5Yal/NExyWRwTZEugIaSMWF5AgMBAAECggEAR61iWbCXhQEQrmcn3R+SYut5r9HYa730gwsGYb93HnU+Bd0WSbB7by4lwMQBhZ9bCiJJe+22aCKi0RSdOykRFaDMjHa0b6YdQLlH/GwT6pvlfuWDfbjCapWQmm3+WWyEq6K6/NNxwtxIRiAXFYrecken3k56KO5UezI1Za3pOYzB2kRaIoJ0/jqpQPUBhbdIQ8CkztHmXmWb57CmuvlKHjc5YlxGS+vRTdRY6ifSbwFrcJgiO43zOmDjKJdnrmAaSVjZX4pThu4xZsOQLRJb6gWy6/Ia6rExF2dd0JsCOukt3TTvk3/qL/RIdvQ1AqKMQvlC65hxW9AjboC8nFpgEQKBgQC6izerAMaVDNaeWWJz6FioWrFtEDLg8HZNf76ydoYlB3867dK1IXGImItLsLAeH2oPs0WnDO4vBXRDHeyaYlYaeQWHrF/bK6nshs4Bbp7T1PL/S84glm5vFfW8RwWiKclFDaHj5xicN3sPJDyhebeiqRNefpWXhQWD9wiU2R0HCwKBgQC1okIEi+FKeWz2GZ0FMSt7A962yNQBx8DrDHOS62vo5U6YcbT2gepzjySToppkavyV08qJ3diQW3M4sBZAd/83TixogwiohMxtqxK4EKl/NzeWs/OxJB/5MHavlhthCpZ6jPJUXsz2xRqdSSsYVZ6QXXeWCXkfuKLaXHR9ChK8CwKBgCYdsic3xlvIPsYmP26tiAgGWACP8cVyfMnDE2UFwM0qJf4VgBtQlREzEitKFAJjqtlAaTgD9VsYQzQ/lgvJkgxgtBePyhpPZq4UsV0rjDp+ZZRymdCgzDnYg9iPrn//B8gbS/v0SVwKHhPu9JCN/U64O2Pwe4J1RLY9MLyxTDQXAoGAbtYs4wlY2VFvpF3M67Ytiku6RGAYv11d5BEdFbKDjwMfCveYLjTpFMtszoqTHGQM7oDnP2oZFT44+Ya6jWysWNtjTgNn7S3cca/LJHdGd1MCoPv+4UHiIPXp9wvqeTU0zmPkHIgdGxj8PK7BlX/p2r6ukugE+c550jZI/2R+OjECgYEAktRz2ujFsF+HVdRyT/0QRIEW9RSEzTO2oEjXQXA0XOqvKB56A4Bx27W/Bvpl4FUPEDUl+n0xZvA9rWYvkz8aIQPU7Lp8BMBu6y2MYKaljKkXhyNOZVfJdHClRjLjIIZGMqqyfQgdQwv+IewolWwEYCgJEzd0J7m2lCImnatMjMo=";
+        String publicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4Dlipw4sxS6I9xMbUAiPSQkfD+8JkGAdLQo5+7MpjYAHPBGakMNfOOZgFO6PDeMvnJtRhSrw0fIRK+S382Xx3kg9TXa2NW6J4tJ+limKEv4HKEH3a0ocNdVtjmyl5CoPlhuZVtktuan+3DVMLdHDXABOyRad447DWJkExpKqu79lAcvySzzgRwXPgDnvbOGrAiPIMJ0esp+aw9gGraais+EcYnptMTvbwlFiADcgPEyVf7htIVdxyZtBLiZl1ltYX9W69Fk6prP7/wYccy4uOyu2uhHS0AmMQrbXZg4EmpAUoY7ckUOqplP0+/nJlJLB1jMxkXWzDqnCanU9pEL3sQIDAQAB";
+        //实例化客户端 参数：正式环境URL,Appid,商户私钥 PKCS8格式,字符编码格式,字符格式,支付宝公钥,签名方式
+        AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do","2021003101623191",privateKey,"json","GBK",publicKey,"RSA2");
+        AlipaySystemOauthTokenRequest request = new AlipaySystemOauthTokenRequest();
+        // 值为authorization_code时，代表用code换取
+        request.setGrantType("authorization_code");
+        //授权码，用户对应用授权后得到的
+        request.setCode(authCode);
+        AlipaySystemOauthTokenResponse response = null;
+        try {
+            response = alipayClient.execute(request);
+            //刷新令牌，上次换取访问令牌时得到。见出参的refresh_token字段
+            request.setRefreshToken(response.getAccessToken());
+            //返回成功时 就将唯一标识返回
+            if(response.isSuccess()){
+                return ResultGenerator.genSuccessResult("获取成功",response.getUserId());
+            } else {
+                return ResultGenerator.genFailResult("授权失败");
+            }
+        } catch (AlipayApiException e) {
+            e.printStackTrace();
+        }
+        return ResultGenerator.genFailResult("授权失败");
+    }
+
+    @PostMapping("/orderPay")
+    @ResponseBody
+    public Result<Object> orderPay(String authCode,String orderNumber) {
+        if(StringUtil.isEmpty(authCode)){
+            return ResultGenerator.genFailResult("授权码信息为空");
+        }
+        if(StringUtil.isEmpty(orderNumber)){
+            return ResultGenerator.genFailResult("订单号为空");
+        }
+        AlipaySystemOauthTokenResponse tokenResponse = AliUtil.getAliUserIdV2(authCode, ParametersUtil.ZY_PRI, ParametersUtil.ZY_PUB, ParametersUtil.ZY_ALI_APP_ID);
+        return apiPayService.orderPay(tokenResponse.getUserId(),orderNumber);
+    }
+
+    public static void main(String[] args) {
+        String openid = "o_q_P5bPxk3JvvfGEHrDcDYxbl3o";
+        JSONObject result = new JSONObject(10);
+        result.put("merchantCode","M800202107223018811");
+        result.put("method","trans_wap_pay");
+        result.put("subject","测试123");
+        result.put("ip","127.0.0.1");
+        result.put("payWay","ZFBZF");
+        result.put("paySource","01");
+        result.put("mercOrderNo",StringUtil.getBillno());
+        result.put("payAmt","0.20");
+        result.put("notifyUrl","https://www.baici.com");
+//        String str = SignUtils.getSignContent(result) +"&key=efaa811e9f004429b5dc070c410405c8";
+        String str =  SignUtils.getSignContent(result) +"&key=4c8d277b0f274604af68e590cc0b3e6b";
+        String ckeckSign = MD5Util.MD5Encode(str, "UTF-8");
+        result.put("sign",ckeckSign);
+        System.out.println("支付参数:"+result.toJSONString());
+
+    }
+}
diff --git a/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/AliYunDeviceController.java b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/AliYunDeviceController.java
new file mode 100644
index 0000000..153d9f7
--- /dev/null
+++ b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/AliYunDeviceController.java
@@ -0,0 +1,94 @@
+package cn.pluss.platform.controller.home;
+
+import cn.pluss.platform.ali.device.AliDeviceService;
+import cn.pluss.platform.alidevice.AliScanCodeDevicePayEntity;
+import cn.pluss.platform.alidevice.AliScanCodeDevicePayEnum;
+import cn.pluss.platform.alidevice.RespDeviceEntity;
+import lombok.Setter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ *
+ *阿里云设备管理类
+ *@author: bzg
+ *@time: 2021/12/22 11:26
+ */
+@RestController
+@RequestMapping(value = "aliyun/device")
+public class AliYunDeviceController {
+
+    @Setter(onMethod_ = {@Autowired, @Qualifier("aliScanCodeDeviceService")})
+    private AliDeviceService aliScanCodeDeviceService;
+
+
+    /**
+     * 反扫阿里云扫码王设备支付接口
+     * @date: 2021/12/27 11:35
+     * @param payEntity:
+     * @return cn.pluss.platform.alidevice.RespDeviceEntity
+     */
+    @RequestMapping(value = "/pay/barcode",method = RequestMethod.POST)
+    public RespDeviceEntity payBarCode(@RequestBody AliScanCodeDevicePayEntity payEntity){
+        return aliScanCodeDeviceService.orderPay(payEntity, AliScanCodeDevicePayEnum.BARCODE.getCode());
+    }
+
+    /**
+     * 主扫阿里云扫码王设备支付接口
+     * @date: 2021/12/27 11:36
+     * @param payEntity:
+     * @return cn.pluss.platform.alidevice.RespDeviceEntity
+     */
+    @RequestMapping(value = "/pay/qrcode",method = RequestMethod.POST)
+    public RespDeviceEntity payQrCode(@RequestBody AliScanCodeDevicePayEntity payEntity){
+        return aliScanCodeDeviceService.orderPay(payEntity, AliScanCodeDevicePayEnum.QRCODE.getCode());
+    }
+    /**
+     * 阿里云设备扫码王订单查询接口
+     * @date: 2021/12/27 11:36
+     * @param payEntity:
+     * @return cn.pluss.platform.alidevice.RespDeviceEntity
+     */
+    @RequestMapping(value = "/order/query",method = RequestMethod.POST)
+    public RespDeviceEntity orderQuery(@RequestBody AliScanCodeDevicePayEntity payEntity){
+        return aliScanCodeDeviceService.orderQuery(payEntity.getTrace());
+    }
+
+    /**
+     * 获取阿里云云设备状态接口V1
+     * @date: 2021/12/27 11:37
+     * @return java.lang.Integer
+     */
+    @RequestMapping(value = "/status/v1",method = RequestMethod.POST)
+    public RespDeviceEntity getStatusV1(@RequestBody AliScanCodeDevicePayEntity payEntity){
+        return aliScanCodeDeviceService.getDeviceStatusV1(payEntity.getCode());
+    }
+
+    /**
+     * 获取阿里云扫码王设备状态接口V2
+     * @date: 2021/12/27 11:37
+     * @param payEntity:
+     * @return cn.pluss.platform.alidevice.AliScanCodeDeviceStatus
+     */
+    @RequestMapping(value = "/status/v2",method = RequestMethod.POST)
+    public RespDeviceEntity getStatusV2(@RequestBody AliScanCodeDevicePayEntity payEntity){
+        return aliScanCodeDeviceService.getDeviceStatusV2(payEntity.getCode());
+    }
+
+//    /**
+//     * 设备绑定接口 测试
+//     * @date: 2021/12/27 14:45
+//     * @param deviceNo:
+//     * @return cn.pluss.platform.alidevice.RespDeviceEntity
+//     */
+//    @RequestMapping(value = "/bind/{deviceNo}",method = RequestMethod.POST)
+//    @ResponseBody
+//    public Result<Object> payBarCode(@PathVariable("deviceNo") String deviceNo){
+//        return aliScanCodeDeviceService.bindDevice(deviceNo,"1791");
+//    }
+}
diff --git a/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/ApiMercSplitController.java b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/ApiMercSplitController.java
new file mode 100644
index 0000000..aad0efb
--- /dev/null
+++ b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/ApiMercSplitController.java
@@ -0,0 +1,33 @@
+package cn.pluss.platform.controller.home;
+
+import cn.pluss.platform.api.ApiMercSplitService;
+import cn.pluss.platform.api.SplitReq;
+import cn.pluss.platform.api.Result;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * TODO
+ * 接口商户分账设置控制器
+ * @author crystal
+ * @date 2022/6/29 14:07
+ */
+@RestController
+@RequestMapping(value = "/api")
+public class ApiMercSplitController {
+
+    @Resource
+    private ApiMercSplitService apiMercSplitService;
+    /**
+     * 商户分账
+     * @return
+     */
+    @RequestMapping(value = "/split")
+    public Result<Object> splitOperat(@RequestBody SplitReq req){
+        return apiMercSplitService.splitOperat(req);
+    }
+
+}
diff --git a/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/ApiPayController.java b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/ApiPayController.java
new file mode 100644
index 0000000..097c8b3
--- /dev/null
+++ b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/ApiPayController.java
@@ -0,0 +1,229 @@
+package cn.pluss.platform.controller.home;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.appletInfo.AppletInfoService;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.enums.SubAppLetInfo;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantOrder.MerchantOrderService;
+import cn.pluss.platform.merchantStore.MerchantStoreService;
+import cn.pluss.platform.notify.NotifyMessageService;
+import cn.pluss.platform.pay.ApiPayService;
+import cn.pluss.platform.util.*;
+import cn.pluss.platform.wechat.WxConstants;
+import cn.pluss.platform.wx.WxAccessTokenRequest;
+import cn.pluss.platform.wx.WxCommonService;
+import cn.pluss.platform.wx.WxOpenidResponse;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.*;
+
+/**
+ * 下游上送订单接口类
+ */
+@Controller
+@RequestMapping(value = "/api")
+public class ApiPayController {
+
+    /**
+     * 日志打印 log
+     */
+    private Logger logger = LoggerFactory.getLogger(this.getClass());
+
+
+    @Autowired
+    private MerchantOrderService merchantOrderService;
+
+
+    @Autowired
+    private NotifyMessageService notifyMessageService;
+
+    @Autowired
+    private ApiPayService apiPayService;
+
+    @Autowired
+    private MerchantStoreService merchantStoreService;
+
+    @Autowired
+    private MerchantBaseInfoService merchantBaseInfoService;
+
+    @Autowired
+    private WxCommonService wxCommonService;
+
+    @Autowired
+    private AppletInfoService appletInfoService;
+
+
+    @RequestMapping(value = "/trans/pay",method = RequestMethod.POST)
+    @ResponseBody
+    public JSONObject apiPay(@RequestBody String json, HttpServletRequest request){
+        logger.info("============>交易接口下单，请求交易数据:{}<============",json);
+        try {
+            String ip = IpUtils.getIpAddr(request);
+            return apiPayService.pay(json,ip);
+        }catch (Exception e){
+            return ResultGenerator.genFailJsonResult(e.getMessage());
+        }
+    }
+
+    /**
+     * 小程序退款接口
+     * @param params
+     * @return
+     */
+    @RequestMapping(value = "/trans/refund",method = RequestMethod.POST)
+    @ResponseBody
+    public Result<JSONObject> refund(@RequestBody JSONObject params){
+        return apiPayService.refund(params);
+    }
+
+    /**
+     * api退款接口
+     * @param params
+     * @return
+     */
+    @RequestMapping(value = "/trans/refund.do",method = RequestMethod.POST)
+    @ResponseBody
+    public Result<JSONObject> apiRefund(@RequestBody JSONObject params){
+        return apiPayService.apiRefund(params);
+    }
+
+
+    /**
+     * 小程序订单查询
+     * @param params
+     * @return
+     */
+    @RequestMapping(value = "/refund/query",method = RequestMethod.POST)
+    @ResponseBody
+    public Result<Object> refundQuery(@RequestBody JSONObject params){
+        return apiPayService.refundQuery(params);
+    }
+
+    /**
+     * 小程序取消支付
+     * @param params
+     * @return
+     */
+    @RequestMapping(value = "/mqtt/pay/cancel",method = RequestMethod.POST)
+    @ResponseBody
+    public Result<JSONObject> cancel(@RequestBody JSONObject params){
+        String storeId = Optional.ofNullable(params.getString("storeId")).orElseThrow(() -> new MsgException("店铺ID不能为空"));
+        String money = params.getString("money");
+        MerchantStore store = merchantStoreService.queryMerchantStore(new MerchantStore().setId(Integer.valueOf(storeId)));
+        if(store != null){
+            QueryWrapper<MerchantBaseInfo> queryWrapper = new QueryWrapper<MerchantBaseInfo>().eq("merchantCode",store.getMerchantCode());
+            List<MerchantBaseInfo> list = merchantBaseInfoService.list(queryWrapper);
+            if(!list.isEmpty()){
+                params.put("mercId",list.get(0).getId());
+                params.put("money",money);
+                params.put("userId",list.get(0).getUserId());
+                notifyMessageService.sendCancelPayMessage(params);
+                return ResultGenerator.genSuccessResult("推送成功！",null);
+            }
+        }
+        return ResultGenerator.genFailResult("推送失败！",null);
+    }
+
+    /**
+     * @description:小程序获取openid
+     * @date: 2021/10/13 13:46
+     * @param params:
+     * @return cn.pluss.platform.api.Result<com.alibaba.fastjson.JSONObject>
+     */
+    @RequestMapping(value = "/wxapp/getOpenId",method = RequestMethod.POST)
+    @ResponseBody
+    public Result<Object> getOpenId(@RequestBody JSONObject params){
+        String code = params.getString("code");
+        if(StringUtil.isEmpty(code)){
+            return ResultGenerator.genFailResult("缺失参数！");
+        }
+        String appid = StringUtil.isNotEmpty(params.getString("appid")) ? params.getString("appid") : SubAppLetInfo.SYB.getAppid();
+        AppletInfo applet = appletInfoService.getAppletInfoByAppId(appid);
+        MsgException.checkNull(applet,"小程序配置信息异常！");
+        String appSecret = applet.getSecret();
+        try {
+            WxAccessTokenRequest request = WxAccessTokenRequest.buidWxToken(appid,appSecret,code, WxConstants.WX_APPLET_OPENID_URL);
+            WxOpenidResponse wxOpenId = wxCommonService.getWxOpenId(request);
+            return ResultGenerator.genSuccessResult("获取成功！",wxOpenId);
+        }catch (Exception e){
+            return ResultGenerator.genFailResult(e.getMessage());
+        }
+    }
+
+    /**
+     * @description:小程序获取订单
+     * @date: 2021/10/13 13:46
+     * @param params:
+     * @return cn.pluss.platform.api.Result<com.alibaba.fastjson.JSONObject>
+     */
+    @RequestMapping(value = "/wxapp/getOrder",method = RequestMethod.POST)
+    @ResponseBody
+    public Result<Object> getOrder(@RequestBody JSONObject params){
+        String openid = params.getString("openid");
+        if(StringUtil.isEmpty(openid)){
+            return ResultGenerator.genFailResult("缺失参数！");
+        }
+        QueryWrapper<MerchantOrder> queryWrapper = new QueryWrapper<MerchantOrder>()
+                .eq("mercUserId",openid).eq("status","1");
+        List<MerchantOrder> list = merchantOrderService.list(queryWrapper);
+        return ResultGenerator.genSuccessResult("获取成功",list);
+    }
+
+    /**
+     *内部微信小程序支付
+     * @date: 2021/12/24 13:32
+     * @param params:
+     * @return cn.pluss.platform.api.Result<java.lang.Object>
+     */
+    @RequestMapping(value = "/wxapp/pay",method = RequestMethod.POST)
+    @ResponseBody
+    public JSONObject wxappPay(@RequestBody JSONObject params){
+        try {
+            return apiPayService.wxappPay(params);
+        }catch (Exception e){
+            return ResultGenerator.genFailJsonResult(e.getMessage());
+        }
+    }
+
+    @PostMapping("/applet/orderPay")
+    @ResponseBody
+    public Result<Object> orderPay(@RequestBody JSONObject params) {
+        String userId = params.getString("userId");
+        String orderNumber = params.getString("orderNumber");
+        return apiPayService.orderPay(userId,orderNumber);
+    }
+
+    public static void main(String[] args) {
+//        String openid = "oPhYX5BsUDxDgGOQ8GNLhanMR3f8";
+        String key = "5d7d4c33067b4489bcca25f034f46551";
+        String merchantCode = "M800202206280ff7f1";
+        String method = "trans_pay";
+        String notifyUrl = "https://www.shouyinbei.net/wap/notify/sxfCallBack";
+//        String returnUrl = "https://www.baidu.com";
+        String mercOrderNo = StringUtil.generateMixStr(3).toUpperCase(Locale.ROOT) + StringUtil.getBillno();
+        JSONObject params = new JSONObject(10);
+        params.put("merchantCode",merchantCode);
+        params.put("method",method);
+        params.put("mercOrderNo",mercOrderNo);
+        params.put("payAmt","0.20");
+        params.put("notifyUrl",notifyUrl);
+        params.put("payWay","WXZF");
+        params.put("payType","02");
+        params.put("subject","测试订单");
+//        params.put("userId",openid);
+        String signContent = SignUtils.getSignContent(params) + "&key="+key;
+        String sign = MD5Util.MD5Encode(signContent, "UTF-8");
+        params.put("sign",sign);
+        System.out.println("param==>" + params.toJSONString());
+    }
+}
diff --git a/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/ExtraController.java b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/ExtraController.java
new file mode 100644
index 0000000..6c53742
--- /dev/null
+++ b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/ExtraController.java
@@ -0,0 +1,27 @@
+package cn.pluss.platform.controller.home;
+
+import cn.pluss.platform.util.ParametersUtil;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+/**
+ * 因客户端错误的代码，添加的额外接口，临时使用
+ */
+@Controller
+public class ExtraController {
+
+    /**
+     * @TODO 下个版本安卓修改后，该接口需要删除
+     */
+    @GetMapping(value = "/wap/merchant/toUpGradeAuth")
+    public void toUpGradeAuth(String userId, HttpServletResponse response) {
+        String domain_wap = ParametersUtil.domain + "/wap";
+        try {
+            response.sendRedirect(domain_wap + "/merchant/toUpGradeAuth?userAppId=" + userId);
+        } catch (IOException e) {
+        }
+    }
+}
diff --git a/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/HomeController.java b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/HomeController.java
new file mode 100644
index 0000000..c824513
--- /dev/null
+++ b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/HomeController.java
@@ -0,0 +1,63 @@
+package cn.pluss.platform.controller.home;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.subject.Subject;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import cn.pluss.platform.entity.SystemConfig;
+import cn.pluss.platform.systemConfig.SystemConfigService;
+
+@Controller
+@RequestMapping("platform")
+public class HomeController {
+	@Autowired
+	private SystemConfigService systemConfigService;
+	
+	
+    @RequestMapping(value = "/console", method = RequestMethod.GET)
+    public String index(HttpServletRequest request) {
+    	
+    	List<SystemConfig> systemConfigList=systemConfigService.querySystemConfigList(null);
+    	request.setAttribute("systemConfigList", systemConfigList);
+        return "index/index";
+    }
+    @RequestMapping(value = "/first", method = RequestMethod.GET)
+	public String first() {
+		
+		System.out.println(111);
+		return "index/first";
+	}
+    
+   
+    
+    @RequestMapping(value = "/logout", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String,Object> login() {
+    	
+		Map<String,Object> result=new HashMap<String,Object>();
+		result.put("result", 2);
+        // 从SecurityUtils里边创建一个 subject
+        Subject subject = SecurityUtils.getSubject();
+       
+        // 执行认证登陆
+        try {
+            subject.logout();
+    		result.put("result", 1);
+    		result.put("url", "/login");
+        } catch (Exception uae) {
+        }
+
+        return result;
+    }
+    
+  
+}
diff --git a/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/JfShopController.java b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/JfShopController.java
new file mode 100644
index 0000000..45a851f
--- /dev/null
+++ b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/JfShopController.java
@@ -0,0 +1,70 @@
+package cn.pluss.platform.controller.home;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.jfShop.JfShopHandler;
+import cn.pluss.platform.other.JfShopParam;
+import cn.pluss.platform.other.JfShopAccount;
+import cn.pluss.platform.other.JfShopValidTask;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * TODO
+ *
+ * @author crystal
+ * @date 2022/5/16 14:43
+ */
+@Slf4j
+@RestController
+@RequestMapping("/api/jf/shop")
+public class JfShopController {
+
+    @Resource
+    private JfShopHandler jfShopHandler;
+
+    /**
+     * 新版积分商城积分数量获取接口
+     * @param param
+     * @return
+     */
+    @RequestMapping("/get/account")
+    public Result<JfShopAccount> getAccount(@RequestBody JfShopParam param){
+        return jfShopHandler.getAccount(param);
+    }
+
+    /**
+     * 获取积分详情
+     * @param param
+     * @return
+     */
+    @RequestMapping("/integral/page")
+    public Object page(@RequestBody JfShopParam param){
+        return jfShopHandler.page(param);
+    }
+
+    /**
+     * 积分商城新增接口
+     * @param param
+     * @return
+     */
+    @PostMapping("/integral/operate")
+    public Result<Object> operate(@RequestBody JfShopParam param){
+        return jfShopHandler.operate(param);
+    }
+
+    /**
+     *
+     * 获取积分商城任务完成进度
+     * @param param
+     * @return
+     */
+    @PostMapping("/task/status")
+    public Result<Object> getTaskStatus(@RequestBody JfShopValidTask param){
+        return jfShopHandler.getTaskStatus(param);
+    }
+}
diff --git a/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/JftController.java b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/JftController.java
new file mode 100644
index 0000000..546d58f
--- /dev/null
+++ b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/JftController.java
@@ -0,0 +1,85 @@
+package cn.pluss.platform.controller.home;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.dto.jft.JftPayDataDTO;
+import cn.pluss.platform.entity.JftReceiptInfo;
+import cn.pluss.platform.entity.JftReceiptOrder;
+import cn.pluss.platform.jft.JftReceiptInfoService;
+import cn.pluss.platform.jft.JftReceiptOrderService;
+import cn.pluss.platform.util.DateUtils;
+import lombok.extern.slf4j.Slf4j;
+import mob.push.api.http.Http;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * TODO
+ * 缴费通入口
+ * @author crystal
+ * @date 2022/6/22 17:28
+ */
+@Controller
+@RequestMapping(value = "jft")
+public class JftController {
+
+    @Resource
+    private JftReceiptInfoService jftReceiptInfoService;
+
+    @Resource
+    private JftReceiptOrderService jftReceiptOrderService;
+
+    @RequestMapping(value = "/auth")
+    public ModelAndView auth(HttpServletRequest request, HttpServletResponse response, String tk){
+        try {
+            JftReceiptInfo receiptInfo = jftReceiptInfoService.wapCheckTk(tk,request);
+            response.sendRedirect(receiptInfo.getJumpUrl());
+            return null;
+        }catch (Exception e){
+            ModelAndView view = new ModelAndView("merchant/errorInfo");
+            request.setAttribute("error",e.getMessage());
+            return view;
+        }
+    }
+
+    @RequestMapping(value = "/pay")
+    public String pay(HttpServletRequest request,HttpServletResponse response,String tk,String auth_code,String userId){
+        try {
+            jftReceiptInfoService.getPayInfo(request,response,tk,auth_code,userId);
+            return "jft/th_jft_pay";
+        }catch (Exception e){
+            request.setAttribute("error",e.getMessage());
+            return "merchant/errorInfo2";
+        }
+    }
+
+    @RequestMapping(value = "/jump")
+    public String pay(HttpServletRequest request,String orderNumber){
+        JftReceiptOrder orderInfo = jftReceiptOrderService.getOrderByNo(orderNumber);
+        JftReceiptInfo receiptInfo = jftReceiptInfoService.getById(orderInfo.getRid());
+        request.setAttribute("merchantName",orderInfo.getMerchantName());
+        request.setAttribute("payTypeDesc",orderInfo.getPayTypeDesc());
+        request.setAttribute("amount",orderInfo.getAmount());
+        request.setAttribute("pName",receiptInfo.getProjectName());
+        request.setAttribute("orderNumber",orderInfo.getOrderNumber());
+        request.setAttribute("date", DateUtils.toString(orderInfo.getCreateTime(),"yyyy-MM-dd HH:mm:ss"));
+        return "jft/th_jft_success";
+    }
+
+    /**
+     * 发起支付
+     * @param dto
+     * @return
+     */
+    @RequestMapping(value = "/tradePay")
+    @ResponseBody
+    public Result<Object> tradePay(JftPayDataDTO dto,HttpServletRequest request){
+        return  jftReceiptOrderService.tradePay(dto,request);
+    }
+}
diff --git a/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/KaptchaController.java b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/KaptchaController.java
new file mode 100644
index 0000000..ecd108f
--- /dev/null
+++ b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/KaptchaController.java
@@ -0,0 +1,56 @@
+package cn.pluss.platform.controller.home;
+
+import cn.pluss.platform.constants.Constant;
+import com.google.code.kaptcha.impl.DefaultKaptcha;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.apache.tomcat.util.http.fileupload.IOUtils;
+
+import javax.imageio.ImageIO;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+
+/**
+ *
+ *获取图形验证码
+ *@author: bzg
+ *@time: 2021/12/20 11:30
+ */
+@RestController
+@RequestMapping(value = "kaptcha")
+public class KaptchaController {
+
+    @Autowired
+    private DefaultKaptcha defaultKaptcha;
+
+    @GetMapping("/get")
+    public void getKaptcha(HttpServletRequest request, HttpServletResponse response) throws IOException {
+        //设置响应头
+        response.setHeader("Cache-Control", "no-cache");
+        response.setHeader("Pragma", "no-cache");
+        response.setContentType("image/jpeg");
+
+        String text = defaultKaptcha.createText();
+        HttpSession session = request.getSession();
+        //将验证码存入session
+        session.setAttribute(Constant.LOGIN_VALIDATE_CODE, text);
+        //创建验证码图片
+        BufferedImage image = defaultKaptcha.createImage(text);
+        ServletOutputStream os = response.getOutputStream();
+        ImageIO.write(image, "jpg", os);
+        ServletOutputStream out = response.getOutputStream();
+        // write the data out
+        ImageIO.write(image, "jpg", out);
+        try {
+            out.flush();
+        } finally {
+            out.close();
+        }
+    }
+}
diff --git a/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/LifeApiController.java b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/LifeApiController.java
new file mode 100644
index 0000000..0645249
--- /dev/null
+++ b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/LifeApiController.java
@@ -0,0 +1,59 @@
+package cn.pluss.platform.controller.home;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.entity.MerchantMemberCode;
+import cn.pluss.platform.life.LifeApiHandler;
+import cn.pluss.platform.life.LifeParam;
+import cn.pluss.platform.systemConfig.SystemConfigService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.sql.ResultSet;
+
+/**
+ * TODO
+ * 生活圈apiController
+ * @author crystal
+ * @date 2022/6/7 15:00
+ */
+@Slf4j
+@RestController
+@RequestMapping(value = "life")
+public class LifeApiController {
+
+    @Resource
+    private LifeApiHandler lifeApiHandler;
+
+    /**
+     * 生活圈获取会员卡过期时间
+     * @return
+     */
+    @RequestMapping(value = "/card/expire")
+    public Result<Object> getCardExpire(){
+        String value = lifeApiHandler.getCardExpire();
+        return ResultGenerator.genSuccessResult("获取成功",value);
+    }
+
+    /**
+     * 会员卡刷新code
+     * @param code
+     * @return
+     */
+    @RequestMapping(value = "/card/refresh")
+    public Result<Object> refreshCardCode(MerchantMemberCode code){
+        return lifeApiHandler.refreshCardCode(code);
+    }
+
+    /**
+     * 获取商户信息
+     * @return
+     */
+    @RequestMapping(value = "/merchant/info")
+    public Result<Object> getMerchantInfo(LifeParam param){
+        return lifeApiHandler.getMerchantInfo(param);
+    }
+}
diff --git a/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/LoginController.java b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/LoginController.java
new file mode 100644
index 0000000..65b5d51
--- /dev/null
+++ b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/LoginController.java
@@ -0,0 +1,54 @@
+package cn.pluss.platform.controller.home;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.authc.UsernamePasswordToken;
+import org.apache.shiro.subject.Subject;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+@Controller
+@RequestMapping("login")
+public class LoginController {
+
+    /**
+     * 引导页
+     *
+     * @return
+     */
+    @RequestMapping(value = "", method = RequestMethod.GET)
+    public String index() {
+
+        return "index/login";
+    }
+
+
+    @RequestMapping(value = "/doLogin", method = RequestMethod.POST)
+    @ResponseBody
+    public Map<String, Object> login(@RequestParam("loginName") String username, @RequestParam("password") String password) {
+
+        Map<String, Object> result = new HashMap<String, Object>();
+        result.put("result", 2);
+        // 从SecurityUtils里边创建一个 subject
+        Subject subject = SecurityUtils.getSubject();
+        // 在认证提交前准备 token（令牌）
+        UsernamePasswordToken token = new UsernamePasswordToken(username, password);
+        // 执行认证登陆
+        try {
+            subject.login(token);
+            result.put("result", 1);
+            result.put("redirectUri", "/platform/console");
+        } catch (Exception uae) {
+            result.put("message", "用户名或者密码错误");
+        }
+
+        return result;
+    }
+
+
+}
diff --git a/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/MerchantController.java b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/MerchantController.java
new file mode 100644
index 0000000..1ad55ce
--- /dev/null
+++ b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/MerchantController.java
@@ -0,0 +1,3977 @@
+package cn.pluss.platform.controller.home;
+
+import cn.pluss.platform.IdCardService;
+import cn.pluss.platform.activityActivate.ActivityActivateService;
+import cn.pluss.platform.activityConsumReturn.ActivityConsumReturnService;
+import cn.pluss.platform.activityRecharge.ActivityRechargeService;
+import cn.pluss.platform.annotation.NoRepeatSubmit;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultCode;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.deviceStock.DeviceStockService;
+import cn.pluss.platform.dto.AccountDTO;
+import cn.pluss.platform.dto.RealFansDTO;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.exception.PayRiskException;
+import cn.pluss.platform.guideLabel.GuideLabelService;
+import cn.pluss.platform.jfShop.JfShopHandler;
+import cn.pluss.platform.jft.JftMercBaseInfoService;
+import cn.pluss.platform.jft.JftReceiptInfoService;
+import cn.pluss.platform.jty.JtyDeviceHandler;
+import cn.pluss.platform.jty.constant.JtyConstant;
+import cn.pluss.platform.leshua.LeshuaService;
+import cn.pluss.platform.leshua.LeshuaSignature;
+import cn.pluss.platform.mapper.JftReceiptInfoMapper;
+import cn.pluss.platform.mapper.JftReceiptOrderMapper;
+import cn.pluss.platform.mapper.UserInfoMapper;
+import cn.pluss.platform.memberOrder.MemberOrderService;
+import cn.pluss.platform.merchant.*;
+import cn.pluss.platform.merchant.move.MerchantMoveRecordsService;
+import cn.pluss.platform.merchant.move.MerchantMoveSettingService;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchantChannel.MerchantChannelService;
+import cn.pluss.platform.merchantChannelStatus.MerchantChannelStatusService;
+import cn.pluss.platform.merchantComplaintImage.MerchantComplaintImageService;
+import cn.pluss.platform.merchantComplaintRecord.MerchantComplaintRecordService;
+import cn.pluss.platform.merchantGuide.MerchantGuideService;
+import cn.pluss.platform.merchantIncome.MerchantIncomeService;
+import cn.pluss.platform.merchantMenber.MerchantMenberService;
+import cn.pluss.platform.merchantMenberComsume.MerchantMenberComsumeService;
+import cn.pluss.platform.merchantMenberRecharge.MerchantMenberRechargeService;
+import cn.pluss.platform.merchantOrder.MerchantOrderService;
+import cn.pluss.platform.merchantProfit.MerchantProfitService;
+import cn.pluss.platform.merchantQrcode.MerchantQrcodeService;
+import cn.pluss.platform.merchantRejectDesc.MerchantRejectDescService;
+import cn.pluss.platform.merchantStore.MerchantStoreService;
+import cn.pluss.platform.mswitch.CommonSwitchService;
+import cn.pluss.platform.notify.NotifyMessageService;
+import cn.pluss.platform.pay.PayService;
+import cn.pluss.platform.phoneValidateCode.PhoneValidateCodeService;
+import cn.pluss.platform.ryx.pay.RyxPayService;
+import cn.pluss.platform.sxf.pay.SxfPayService;
+import cn.pluss.platform.systemConfig.SystemConfigService;
+import cn.pluss.platform.user.UserIpRecordService;
+import cn.pluss.platform.user.impl.GeneralPushUtil;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.userInfo.UserInfoService;
+import cn.pluss.platform.util.*;
+import cn.pluss.platform.vo.StoreSummaryVO;
+import cn.pluss.platform.vo.UserInfoVO;
+import cn.pluss.platform.wap.MD5Util;
+import cn.pluss.platform.wap.PayUnitedRequest;
+import cn.pluss.platform.wap.XmlUtil;
+import cn.pluss.platform.wap.*;
+import cn.pluss.platform.wechat.*;
+import cn.pluss.platform.wx.WxAccessTokenRequest;
+import cn.pluss.platform.wx.WxCommonService;
+import cn.pluss.platform.wx.WxOauth2AccessTokenResponse;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.alipay.api.AlipayApiException;
+import com.alipay.api.AlipayClient;
+import com.alipay.api.DefaultAlipayClient;
+import com.alipay.api.request.AlipayTradeCreateRequest;
+import com.alipay.api.response.AlipaySystemOauthTokenResponse;
+import com.alipay.api.response.AlipayTradeCreateResponse;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Controller;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+import javax.annotation.Resource;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
+import java.math.BigDecimal;
+import java.nio.charset.StandardCharsets;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * @author yuchen
+ * @Description (会员扫商户二维码 ， 走正常的扣款流程 ， 微信扫的话调微信支付接口 ， 支付宝扫调支付宝支付接口)
+ */
+@Controller
+@Slf4j
+@RequiredArgsConstructor
+@RequestMapping("merchant")
+public class MerchantController {
+
+    private final MerchantService merchantService;
+    private final LeshuaService leshuaService;
+    private final HttpServletRequest request;
+    private final HttpServletResponse response;
+    private final MerchantOrderService merchantOrderService;
+    private final SystemConfigService systemConfigService;
+    private final MerchantBaseInfoService merchantBaseInfoService;
+    private final MerchantStoreService merchantStoreService;
+    private final UserAppService userAppService;
+    private final PhoneValidateCodeService phoneValidateCodeService;
+    private final UserInfoService userInfoService;
+    private final MerchantMenberService merchantMenberService;
+    private final MerchantMenberRechargeService menberRechargeService;
+    private final MerchantIncomeService merchantIncomeService;
+    private final ActivityActivateService activityActivateService;
+    private final ActivityConsumReturnService activityConsumReturnService;
+    private final ActivityRechargeService activityRechargeService;
+    private final MerchantMenberComsumeService merchantMenberComsumeService;
+    private final MemberOrderService memberOrderService;
+    private final UserInfoMapper userInfoMapper;
+    private final CommonSwitchService commonSwitchService;
+    private final SxfPayService sxfPayService;
+    private final GuideLabelService guideLabelService;
+    private final MerchantGuideService merchantGuideService;
+    private final MerchantQrcodeService merchantQrcodeService;
+    private final MerchantChannelStatusService merchantChannelStatusService;
+    private final IdCardService idCardService;
+    private final MerchantRejectDescService merchantRejectDescService;
+    private final MerchantPluginService merchantPluginService;
+    private final MerchantChannelService merchantChannelService;
+    private final NotifyMessageService notifyMessageService;
+
+    private final AccountService accountService;
+
+    private final MerchantMoveRecordsService merchantMoveRecordsService;
+
+    private final MerchantMoveSettingService merchantMoveSettingService;
+
+    private final MerchantProfitService merchantProfitService;
+
+    private final MerchantComplaintRecordService merchantComplaintRecordService;
+
+    private final MerchantComplaintImageService merchantComplaintImageService;
+
+    private final MerchantStaffConnService merchantStaffConnService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private DeviceStockService deviceStockService;
+
+    @Setter(onMethod_ = {@Autowired, @Qualifier("ysPayOldService")})
+    private PayService ysPayOldService;
+
+    @Setter(onMethod_ = {@Autowired})
+    private RyxPayService ryxPayService;
+
+    @Autowired
+    private UserIpRecordService ipRecordService;
+
+    @Resource
+    private WxCommonService wxCommonService;
+
+    @Autowired
+    private GeneralPushUtil generalPushUtil;
+
+
+    @Setter(onMethod_ = {@Autowired})
+    private JtyDeviceHandler jtyDeviceHandler;
+
+    @Resource
+    private JfShopHandler jfShopHandler;
+
+    @Resource
+    private JftMercBaseInfoService jftMercBaseInfoService;
+
+    @Resource
+    private JftReceiptInfoMapper jftReceiptInfoMapper;
+
+    @Resource
+    private JftReceiptOrderMapper jftReceiptOrderMapper;
+
+    @GetMapping("/auth/aKfAirN1hO.txt")
+    @ResponseBody
+    public String aKfAirN1hO() {
+        return "3cdbacb2d4ceefa36ef1c43d0c562fb9";
+    }
+
+    @GetMapping("/account/auth")
+    public String accountAuth(HttpServletResponse response, HttpServletRequest request) {
+        String url = "/merchant/account/bind";
+        String domain_wap = ParametersUtil.domain + "/wap";
+        try {
+            String jump = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=" + ParametersUtil.SJ_APPID
+                    + "&redirect_uri=" + java.net.URLEncoder.encode(domain_wap + url, "utf-8")
+                    + "&response_type=code&scope=snsapi_base&state=123#wechat_redirect";
+            response.sendRedirect(jump);
+            return null;
+        } catch (Exception e) {
+            e.printStackTrace();
+            request.setAttribute("error", "授权出错！");
+            return "merchant/errorInfo2";
+        }
+    }
+
+    @GetMapping("/pay/test")
+    public String payTest(HttpServletResponse response, HttpServletRequest request) {
+        return "th_pay_test";
+    }
+
+    @RequestMapping("/jumpUrlTest")
+    public ModelAndView jumpUrlTest() {
+        ModelAndView modelAndView = new ModelAndView();
+        modelAndView.setViewName("merchant/paySuccess");
+        return modelAndView;
+    }
+
+    @PostMapping("/tradePayTest")
+    @ResponseBody
+    public Result<?> tradePayTest(String comsumeMoney) {
+        if (StringUtil.isEmpty(comsumeMoney)) {
+            return ResultGenerator.genFailResult("订单金额为空！");
+        }
+        DeviceStock stock = new DeviceStock();
+        stock.setDeviceNo(JtyConstant.TEST_DEVICE_NUM);
+        String data = jtyDeviceHandler.sendNotice(Double.parseDouble(comsumeMoney), "pay", stock);
+        return ResultGenerator.genSuccessResult("支付成功！","【佳天亿】支付成功消息推送响应参数:"+data);
+    }
+
+    @GetMapping("/cancelPayTest/{comsumeMoney}")
+    @ResponseBody
+    public Result cancelPayTest(@PathVariable("comsumeMoney") String comsumeMoney) {
+        try {
+            DeviceStock stock = new DeviceStock();
+            stock.setDeviceNo(JtyConstant.TEST_DEVICE_NUM);
+            String data = jtyDeviceHandler.sendNotice(Double.parseDouble(comsumeMoney), "cancel", stock);
+            return ResultGenerator.genSuccessResult("操作成功","【佳天亿】取消支付消息推送响应参数:"+data);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResultGenerator.genFailResult(e.getMessage());
+        }
+    }
+
+    @RequestMapping("/account/bind")
+    public String accountBind(String code, String openId, HttpServletResponse response) {
+        if (StringUtil.isNotEmpty(code)) {
+            WxAccessTokenRequest tokenRequest = WxAccessTokenRequest.buidWxToken(ParametersUtil.SJ_APPID, ParametersUtil.SJ_APPSECRET, code, WxConstants.OAUTH2_ACCESS_TOKEN_URL);
+            WxOauth2AccessTokenResponse result = wxCommonService.getOauth2Info(tokenRequest);
+            if (result == null) {
+                request.setAttribute("error", "授权出错，请重新扫码!");
+                return "merchant/errorInfo2";
+            }
+            openId = result.getOpenid();
+        }
+        request.setAttribute("openid", openId);
+        QueryWrapper<UserInfo> queryWrapper = new QueryWrapper<UserInfo>().eq("openid", openId);
+        List<UserInfo> lists = userInfoMapper.selectList(queryWrapper);
+        if (lists.isEmpty()) {
+            return "th_account_bind";
+        } else {
+            UserInfo userInfo = lists.get(0);
+            String url = ParametersUtil.domain + "/wap/merchant/account/list/" + userInfo.getId();
+            try {
+                response.sendRedirect(url);
+                return null;
+            } catch (IOException e) {
+                e.printStackTrace();
+                request.setAttribute("error", "跳转异常");
+                return "merchant/errorInfo2";
+            }
+        }
+    }
+
+    @GetMapping("/account/list/{userAppId}")
+    public String accountList(@PathVariable("userAppId") String userAppId) {
+        UserApp userApp = userAppService.queryUserApp(new UserApp().setUserId(Long.parseLong(userAppId)));
+        if (userApp == null) {
+            request.setAttribute("error", "参数有误！");
+            return "merchant/errorInfo2";
+        }
+        UserInfo userInfo = userInfoMapper.selectById(userAppId);
+        if (userInfo == null) {
+            request.setAttribute("error", "用户信息异常！");
+            return "merchant/errorInfo2";
+        }
+        if (StringUtil.isEmpty(userInfo.getOpenId())) {
+            request.setAttribute("error", "未获取到绑定信息，请重新扫码！");
+            return "merchant/errorInfo2";
+        }
+        if ("promoter".equals(userApp.getUserType())) {
+            List<UserInfoVO> listVo = userInfoMapper.selectMainUserInfoList(userAppId);
+            request.setAttribute("list", listVo);
+        } else if ("staff".equals(userApp.getUserType())) {
+            List<MerchantBaseInfo> list = merchantStaffConnService.getMercInfoByStaffId(userAppId);
+            request.setAttribute("list", list);
+        } else {
+            request.setAttribute("error", "当前角色不支持该操作！");
+            return "merchant/errorInfo2";
+        }
+        request.setAttribute("userAppId", userAppId);
+        return "th_account_list";
+    }
+
+    @PostMapping("/account/toBind")
+    @ResponseBody
+    public Result<?> toBind(String loginName, String password, String openid) {
+        if (StringUtil.isEmpty(loginName)) {
+            return ResultGenerator.genFailResult("账号不能为空！");
+        }
+        if (StringUtil.isEmpty(password)) {
+            return ResultGenerator.genFailResult("密码不能为空！");
+        }
+        if (StringUtil.isEmpty(openid)) {
+            return ResultGenerator.genFailResult("缺失参数！");
+        }
+        String pwd = MD5Util.MD5Encode(password);
+        QueryWrapper<UserInfo> queryWrapper = new QueryWrapper<UserInfo>().eq("loginName", loginName).eq("password", pwd);
+        UserInfo info = userInfoMapper.selectOne(queryWrapper);
+        if (info == null) {
+            return ResultGenerator.genFailResult("账号或密码不正确！");
+        }
+        info.setOpenId(openid);
+        userInfoMapper.updateById(info);
+        return ResultGenerator.genSuccessResult("绑定成功！", info.getId());
+    }
+
+    @RequestMapping("/account/unBind/{userAppId}")
+    @ResponseBody
+    public Result<?> unBind(@PathVariable("userAppId") String userAppId) {
+        if (StringUtil.isEmpty(userAppId)) {
+            return ResultGenerator.genFailResult("缺失参数！");
+        }
+        UserInfo info = userInfoMapper.selectById(userAppId);
+        if (info == null) {
+            return ResultGenerator.genFailResult("用户数据异常！");
+        }
+        String openid = info.getOpenId();
+        info.setOpenId(null);
+        userInfoMapper.updateById(info);
+        return ResultGenerator.genSuccessResult("解绑成功！", openid);
+    }
+
+    @RequestMapping("/account/unBindSend")
+    @ResponseBody
+    public Result<?> unBindSend(@RequestParam String userAppId, @RequestParam String merchantCode, @RequestParam String isPushWxMessage) {
+        UserApp userApp = userAppService.queryUserApp(new UserApp().setUserId(Long.parseLong(userAppId)));
+        if (userApp == null) {
+            return ResultGenerator.genFailResult("设置失败，用户异常！");
+        }
+        if ("promoter".equals(userApp.getUserType())) {
+            UpdateWrapper<MerchantBaseInfo> updateWrapper = new UpdateWrapper<MerchantBaseInfo>()
+                    .set("isPushWxMessage", isPushWxMessage).eq("merchantCode", merchantCode);
+            merchantBaseInfoService.update(updateWrapper);
+            return ResultGenerator.genSuccessResult("设置成功！", null);
+        } else if ("staff".equals(userApp.getUserType())) {
+            UpdateWrapper<MerchantStaffConn> updateWrapper = new UpdateWrapper<MerchantStaffConn>()
+                    .set("isPushWxMessage", isPushWxMessage).eq("userId", userAppId).eq("merchantCode", merchantCode);
+            merchantStaffConnService.update(updateWrapper);
+            return ResultGenerator.genSuccessResult("设置成功！", null);
+        } else {
+            return ResultGenerator.genFailResult("当前用户暂不支持！");
+        }
+    }
+
+    @GetMapping(value = "/complaint/{token}")
+    public String toComplaint(@PathVariable("token") String token) {
+        QueryWrapper<MerchantMoveRecords> queryWrapper = new QueryWrapper<MerchantMoveRecords>().eq("token", token);
+        MerchantMoveRecords record = merchantMoveRecordsService.getOne(queryWrapper);
+        if (record == null) {
+            JftReceiptInfo byToken = jftReceiptInfoMapper.getByToken(token);
+            if(byToken == null){
+                request.setAttribute("error", "参数有误！");
+                return "merchant/errorInfo2";
+            }
+            JftMercBaseInfo merchant = jftMercBaseInfoService.getMercBaseInfo(byToken.getUserId());
+            List<JftReceiptOrder> lists = jftReceiptOrderMapper.listByReceiptId(byToken.getId(), JftReceiptOrder.PAY_STATUS_YES);
+            request.setAttribute("mercName", merchant.getMerchantName());
+            if(!lists.isEmpty()){
+                request.setAttribute("orderNumber", lists.get(0).getOrderNumber());
+            }
+            request.setAttribute("merchantCode", merchant.getMerchantCode());
+            return "merchant/complaint";
+        }
+        MerchantBaseInfo baseInfo = merchantBaseInfoService.getMerchantBaseInfoByMerchantCode(record.getMerchantCode());
+        request.setAttribute("mercName", baseInfo.getAlias());
+        request.setAttribute("mercPhone", baseInfo.getContactMobile());
+        request.setAttribute("orderNumber", record.getOrderNumber());
+        request.setAttribute("merchantCode", record.getMerchantCode());
+        return "merchant/complaint";
+    }
+
+    @PostMapping(value = "/complaint/save")
+    @ResponseBody
+    @NoRepeatSubmit
+    public Result<?> complaintSave(MerchantComplaintRecord record) {
+        try {
+            if (record.getImageList() == null || record.getImageList().size() <= 0) {
+                return ResultGenerator.genFailResult("请上传交易截图和被骗经过截图！");
+            }
+            if (record.getImageList().size() > 8) {
+                return ResultGenerator.genFailResult("最多可上传8张截图！");
+            }
+            QueryWrapper<MerchantComplaintRecord> queryWrapper = new QueryWrapper<MerchantComplaintRecord>().eq("merchantCode", record.getMerchantCode())
+                    .eq("complaintPhone", record.getComplaintPhone());
+            MerchantComplaintRecord info = merchantComplaintRecordService.getOne(queryWrapper);
+            if (info != null) {
+                return ResultGenerator.genFailResult("您已提交过投诉，请耐心等待官方回复！");
+            }
+            merchantComplaintRecordService.save(record);
+            List<MerchantComplaintImage> list = new ArrayList<>();
+            for (String s : record.getImageList()) {
+                MerchantComplaintImage image = new MerchantComplaintImage();
+                image.setComplaintId(record.getId());
+                byte[] imgBase64 = Base64.getDecoder().decode(s);
+                ByteArrayInputStream bis = new ByteArrayInputStream(imgBase64);
+                String picUrl = OssOperatUtil.upload(bis, UUID.randomUUID().toString(), "jpeg");
+                image.setPicUrl(picUrl);
+                list.add(image);
+            }
+            if (!list.isEmpty()) {
+                merchantComplaintImageService.saveBatch(list);
+            }
+            return ResultGenerator.genSuccessResult("提交投诉成功，请耐心等待官方回复！", null);
+        } catch (Exception e) {
+            return ResultGenerator.genFailResult(e.getMessage());
+        }
+    }
+
+    /**
+     * @param params:
+     * @param request:
+     * @return cn.pluss.platform.api.Result<java.lang.Object>
+     * @description:动态码支付接口
+     * @date: 2021/8/23 14:57
+     */
+    @PostMapping("/moveTradePay")
+    @ResponseBody
+    public Result<Object> moveTradePay(@RequestParam Map<String, Object> params, HttpServletRequest request) {
+        try {
+            params.put("ip", IpUtils.getIpAddr(request));
+            return merchantService.moveTradePay(params);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResultGenerator.genFailResult(e.getMessage());
+        }
+    }
+
+    /**
+     * 动态码授权回调接口
+     *
+     * @param code
+     * @param auth_code
+     * @param userAuthCode
+     * @param p
+     * @param request
+     * @return
+     */
+    @GetMapping("/toMovePay")
+    public ModelAndView toMovePay(String code,
+                                  String auth_code,
+                                  String userAuthCode,
+                                  String p,
+                                  String token,
+                                  String merchantCode,
+                                  HttpServletRequest request,
+                                  HttpServletResponse response,
+                                  ModelAndView view) {
+        view.setViewName("merchant/errorInfo2");
+        if (StringUtil.isEmpty(p)) {
+            view.addObject("error", "缺失参数!");
+            return view;
+        }
+        if (StringUtil.isEmpty(merchantCode)) {
+            view.addObject("error", "缺失商编参数!");
+            return view;
+        }
+        if (StringUtil.isEmpty(token)) {
+            view.addObject("error", "缺失token参数!");
+            return view;
+        }
+        MerchantMoveSetting setting = merchantMoveSettingService.getOne(new QueryWrapper<MerchantMoveSetting>().eq("merchantCode", merchantCode));
+        if (setting == null) {
+            view.addObject("error", "当前商户未开启动态码功能！");
+            return view;
+        }
+        if (setting.getStatus() != 1) {
+            view.addObject("error", "当前商户动态码功能已被关闭，请联系客服！");
+            return view;
+        }
+        view.addObject("merchantCode", merchantCode);
+        view.addObject("token", token);
+        MerchantBaseInfo baseInfo = new MerchantBaseInfo();
+        baseInfo.setMerchantCode(merchantCode);
+        baseInfo = merchantBaseInfoService.queryMerchantBaseInfo(baseInfo);
+        view.addObject("storeName", baseInfo.getAlias());
+
+        AccountDTO realAccount = accountService.getRealAccount(baseInfo.getUserId());
+        view.addObject("accountName", StringUtil.hideSecret(realAccount.getBankCard().getBankHolder()));
+        view.addObject("accountPhone", StringUtil.hideSecret(realAccount.getBankCard().getPhone()));
+
+        if (StringUtil.isEmpty(code) && StringUtil.isEmpty(auth_code) && StringUtil.isEmpty(userAuthCode)) {
+            view.addObject("p", p);
+            view.setViewName("th_index");
+            return view;
+        } else {
+            String userId = "";
+            String payType = "";
+            if (StringUtil.isNotEmpty(code)) {
+                WxAccessTokenRequest tokenRequest = WxAccessTokenRequest.buidWxToken(ParametersUtil.APPID, ParametersUtil.APPSECRET, code, WxConstants.OAUTH2_ACCESS_TOKEN_URL);
+                WxOauth2AccessTokenResponse result = wxCommonService.getOauth2Info(tokenRequest);
+                String openid = result.getOpenid();
+                userId = openid;
+                payType = "WXZF";
+            } else if (StringUtil.isNotEmpty(auth_code)) {
+                //支付宝取消主动授权 采用静默授权方式，无法获取用户信息
+                AlipaySystemOauthTokenResponse tokenResponse = AliUtil.getAliUserIdV2(auth_code, ParametersUtil.ZY_PRI, ParametersUtil.ZY_PUB, ParametersUtil.ZY_ALI_APP_ID);
+                payType = "ZFBZF";
+                userId = tokenResponse.getUserId();
+            } else if (StringUtil.isNotEmpty(userAuthCode)) {
+                MerchantChannelStatus channel = merchantChannelStatusService.getValidData(merchantCode);
+                String ua = request.getHeader("User-Agent");
+                log.info("===================>【银联】标识，获取请求头部信息:{},==============", ua);
+                int begin = ua.indexOf("UnionPay");
+                String payMentApp = ua.substring(begin);
+                if (payMentApp.length() > 30) {
+                    payMentApp = payMentApp.substring(0, 30);
+                }
+                try {
+                    Map<String, Object> unionInfo = new HashMap<>(3);
+                    //随行付
+                    if (channel.getChannel() == 1) {
+                        unionInfo = sxfPayService.getUnionInfo(userAuthCode, payMentApp, null);
+                    } else if (channel.getChannel() == 2) {
+                        view.addObject("error", "当前通道已关闭,请联系客户切换");
+                        return view;
+                    } else if (channel.getChannel() == 3) {
+                        unionInfo = ryxPayService.getUnionInfo(userAuthCode, payMentApp, channel.getMerchantId());
+                    } else if (channel.getChannel() == 4) {
+                        unionInfo = ysPayOldService.getUnionInfo(userAuthCode, payMentApp, null);
+                    } else {
+                        view.addObject("error", "未知通道类型");
+                        return view;
+                    }
+                    payType = "UNIONPAY";
+                    log.info("===================>【银联】获取用户标识结果参数:{}==============", unionInfo);
+                    if ("1".equals(unionInfo.get("code"))) {
+                        Object userIdData = unionInfo.get("data");
+                        if (userIdData instanceof Map) {
+                            Map<String, String> data = (Map<String, String>) userIdData;
+                            userId = data.get("data");
+                        } else {
+                            userId = userIdData.toString();
+                        }
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    log.error("===================>【银联】获取用户标识出错，==============", ua);
+                }
+            } else {
+                view.addObject("error", "不支持当前扫码方式，请使用微信、支付宝、云闪付或京东金融扫码支付");
+                return view;
+            }
+            Integer overTime = 5;
+            if (setting.getPayOverTime() != null) {
+                overTime = setting.getPayOverTime();
+            }
+            if (StringUtil.isNotEmpty(userId)) {
+                String cokusName = "cokus_" + payType;
+                String cokusId = Base64.getEncoder().encodeToString(userId.getBytes(StandardCharsets.UTF_8));
+                Cookie cookie = new Cookie(cokusName, cokusId);
+                cookie.setMaxAge(-1);
+                response.addCookie(cookie);
+            }
+            Long endTime = DateUtils.add(Calendar.MINUTE, DateUtils.currentDate(), overTime).getTime();
+            String params = "cokus=" + userId + "&payType=" + payType + "&time=" + endTime;
+            try {
+                String pa = AESEncrypt.encryptEcbToString(params.getBytes(StandardCharsets.UTF_8), setting.getAesKey().getBytes(StandardCharsets.UTF_8), null);
+                String pk = new String(Base64.getEncoder().encode(pa.getBytes(StandardCharsets.UTF_8)), "UTF-8");
+                view.addObject("p", pk);
+            } catch (Exception e) {
+                e.printStackTrace();
+                view.addObject("error", "系统异常，数据处理失败！");
+                return view;
+            }
+        }
+        view.setViewName("th_index");
+        return view;
+    }
+
+    /**
+     * @param token:
+     * @param view:
+     * @param ipAddr:
+     * @return com.alibaba.fastjson.JSONObject
+     * @description:动态码参数校验
+     * @date: 2021/8/23 14:58
+     */
+    public JSONObject checkMovePayParams(String token, ModelAndView view, String ipAddr) {
+        view.addObject("token", token);
+        if (StringUtil.isEmpty(token)) {
+            view.addObject("error", "缺失参数!");
+            return ResultGenerator.genFailJsonResult("缺失参数");
+        }
+        Date now = DateUtils.currentDate();
+        QueryWrapper<MerchantMoveRecords> queryWrapper = new QueryWrapper<MerchantMoveRecords>()
+                .orderByDesc("createTime").eq("token", token);
+        List<MerchantMoveRecords> list = merchantMoveRecordsService.list(queryWrapper);
+        if (list.isEmpty()) {
+            view.addObject("error", "付款码已过期");
+            return ResultGenerator.genFailJsonResult("付款码已过期!");
+        }
+        MerchantMoveRecords record = list.get(0);
+        if (now.compareTo(record.getStartTime()) < 0 || now.compareTo(record.getEndTime()) > 0) {
+            view.addObject("error", "付款码已过期!");
+            return ResultGenerator.genFailJsonResult("付款码已过期");
+        }
+        if (StringUtil.isNotEmpty(record.getIp()) && !ipAddr.equals(record.getIp())) {
+            view.addObject("error", "当前付款码已被其他用户使用，请重新生成!");
+            return ResultGenerator.genFailJsonResult("当前付款码已被其他用户使用，请重新生成!");
+        }
+        MerchantMoveSetting setting = merchantMoveSettingService.getOne(new QueryWrapper<MerchantMoveSetting>().eq("merchantCode", record.getMerchantCode()).eq("status", "1"));
+        if (setting == null) {
+            view.addObject("error", "当前商户未开启动态码功能！");
+            return ResultGenerator.genFailJsonResult("当前商户未开启动态码功能!");
+        }
+        if (setting.getStatus() != 1) {
+            view.addObject("error", "当前商户动态码功能已被关闭，请联系客服开通！");
+            return ResultGenerator.genFailJsonResult("当前商户动态码功能已被关闭，请联系客服开通!");
+        }
+        if (StringUtil.isEmpty(record.getIp())) {
+            record.setIp(ipAddr);
+            merchantMoveRecordsService.updateById(record);
+        }
+        JSONObject result = new JSONObject(2);
+        result.put("record", record);
+        result.put("setting", setting);
+        return ResultGenerator.genSuccessJsonResult(result);
+    }
+
+    /**
+     * @param token:
+     * @return cn.pluss.platform.api.Result<java.lang.Object>
+     * @description: 动态码授权接口
+     * @date: 2021/7/30 16:29
+     */
+    @GetMapping("/moveAuth")
+    public ModelAndView moveAuth(String token, HttpServletRequest request, ModelAndView view, HttpServletResponse response) {
+        view.setViewName("merchant/errorInfo2");
+        String ipAddr = IpUtils.getIpAddr(request);
+        JSONObject result = checkMovePayParams(token, view, ipAddr);
+        if (ResultCode.FAIL.code() == result.getInteger("code")) {
+            return view;
+        }
+        MerchantMoveRecords record = result.getJSONObject("data").getObject("record", MerchantMoveRecords.class);
+        MerchantMoveSetting setting = result.getJSONObject("data").getObject("setting", MerchantMoveSetting.class);
+        String ua = request.getHeader("user-agent").toLowerCase();
+        String payType = "";
+        if (ua.contains("micromessenger")) {
+            payType = "WXZF";
+        } else if (ua.contains("alipay")) {
+            payType = "ZFBZF";
+        } else {
+            payType = "UNIONPAY";
+        }
+        Cookie[] cookies = request.getCookies();
+        String cokus = "";
+        String cokusName = "cokus_" + payType;
+        if (cookies != null && cookies.length > 0) {
+            for (Cookie c : cookies) {
+                if (cokusName.equals(c.getName())) {
+                    String cValue = c.getValue();
+                    if (StringUtil.isNotEmpty(cValue)) {
+                        //TODO 解决银联用户标识转码后特殊字符异常
+                        if ("UNIONPAY".equals(payType)) {
+                            cValue = cValue.replace(" ", "+");
+                        }
+                        byte[] decode = Base64.getDecoder().decode(cValue.getBytes(StandardCharsets.UTF_8));
+                        cokus = new String(decode, 0, 0, decode.length);
+                        break;
+                    }
+                }
+            }
+        }
+        String domain_wap = ParametersUtil.domain + "/wap";
+        String APP_ID = ParametersUtil.APPID;
+        String ali_appid = ParametersUtil.ZY_ALI_APP_ID;
+
+        String url = "/merchant/toMovePay?merchantCode=" + record.getMerchantCode() + "&token=" + token;
+        //付款时间10分钟
+        Integer overTime = 10;
+        if (setting.getPayOverTime() != null) {
+            overTime = setting.getPayOverTime();
+        }
+        Long endTime = DateUtils.add(Calendar.MINUTE, DateUtils.currentDate(), overTime).getTime();
+        if (StringUtil.isNotEmpty(cokus)) {
+            String params = "cokus=" + cokus + "&payType=" + payType + "&time=" + endTime;
+            try {
+                String p = AESEncrypt.encryptEcbToString(params.getBytes(StandardCharsets.UTF_8), setting.getAesKey().getBytes(StandardCharsets.UTF_8), null);
+                url = url + "&p=" + new String(Base64.getEncoder().encode(p.getBytes(StandardCharsets.UTF_8)), "UTF-8");
+                response.sendRedirect(domain_wap + url);
+                return null;
+            } catch (Exception e) {
+                e.printStackTrace();
+                view.addObject("error", "系统异常！");
+                return view;
+            }
+        } else {
+            String params = "time=" + endTime;
+            try {
+                String p = AESEncrypt.encryptEcbToString(params.getBytes(StandardCharsets.UTF_8), setting.getAesKey().getBytes(StandardCharsets.UTF_8), null);
+                url = url + "&p=" + p;
+                if (ua.contains("micromessenger")) {
+                    String jump = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=" + APP_ID
+                            + "&redirect_uri=" + java.net.URLEncoder.encode(domain_wap + url, "utf-8")
+                            + "&response_type=code&scope=snsapi_base&state=123#wechat_redirect";
+                    response.sendRedirect(jump);
+                    return null;
+                } else if (ua.contains("alipay")) {
+                    String urlString = domain_wap + url;
+                    String rurl = java.net.URLEncoder.encode(urlString, "utf-8");
+                    String jmp = "https://openauth.alipay.com/oauth2/publicAppAuthorize.htm?app_id=" + ali_appid + "&scope=auth_base&redirect_uri=" + rurl;
+                    response.sendRedirect(jmp);
+                    return null;
+                } else {
+                    String urlString = domain_wap + url;
+                    String rurl = java.net.URLEncoder.encode(urlString, "utf-8");
+                    String jmp = "https://qr.95516.com/qrcGtwWeb-web/api/userAuth?version=1.0.0&redirectUrl=" + rurl;
+                    response.sendRedirect(jmp);
+                    return null;
+                }
+            } catch (UnsupportedEncodingException e) {
+                view.addObject("error", "url转码异常!");
+                return view;
+            } catch (IOException e) {
+                view.addObject("error", "response跳转异常!");
+                return view;
+            } catch (Exception e) {
+                view.addObject("error", "系统异常!");
+                return view;
+            }
+        }
+    }
+
+
+    @GetMapping("/audit")
+    @ResponseBody
+    public Result<Object> audit(String userId) {
+        if (StringUtil.isEmpty(userId)) {
+            return ResultGenerator.genFailResult("缺失参数！");
+        }
+        QueryWrapper<UserApp> userAppQueryWrapper = new QueryWrapper<UserApp>().eq("userId", userId);
+        UserApp app = userAppService.getOne(userAppQueryWrapper);
+        if (app == null) {
+            return ResultGenerator.genFailResult("用户数据异常！");
+        }
+        MerchantChannelStatus byMerchantCode = merchantChannelStatusService.getByMerchantCode(app.getMerchantCode());
+        if (byMerchantCode == null) {
+            return ResultGenerator.genFailResult("进件数据不存在！");
+        }
+        if (!(MerchantChannelStatus.AUDIT_STATUS_EXAMINING.equals(byMerchantCode.getStatus()) && MerchantChannelStatus.AUDIT_THIRD_STATUS_WAITING.equals(byMerchantCode.getThirdStatus()))) {
+            return ResultGenerator.genFailResult("当前商户已处理，请勿重复操作！");
+        }
+        JSONObject object = new JSONObject();
+        object.put("userId", userId);
+        try {
+            userAppService.merchantAudit(object, "1");
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResultGenerator.genFailResult("操作失败！");
+        }
+        return ResultGenerator.genSuccessResult("操作成功！");
+    }
+
+    @GetMapping("/reject")
+    @ResponseBody
+    public Result<Object> reject(String userId, String remark) {
+        if (StringUtil.isEmpty(userId)) {
+            return ResultGenerator.genFailResult("用户id不能为空！");
+        }
+        if (StringUtil.isEmpty(remark)) {
+            return ResultGenerator.genFailResult("驳回原因不能为空！");
+        }
+        QueryWrapper<UserApp> userAppQueryWrapper = new QueryWrapper<UserApp>().eq("userId", userId);
+        UserApp app = userAppService.getOne(userAppQueryWrapper);
+        if (app == null) {
+            return ResultGenerator.genFailResult("用户数据异常！");
+        }
+        merchantChannelStatusService.rejectAudit(app.getMerchantCode(), remark);
+        return ResultGenerator.genSuccessResult("操作成功！");
+    }
+
+    @GetMapping("/toAudit")
+    public ModelAndView toAudit(String userId) {
+        ModelAndView view = new ModelAndView();
+        if (StringUtil.isEmpty(userId)) {
+            view.addObject("error", "无效的参数");
+            view.setViewName("merchant/errorInfo");
+            return view;
+        }
+        QueryWrapper<UserApp> appWrapper = new QueryWrapper<UserApp>().eq("userId", userId);
+        UserApp app = userAppService.getOne(appWrapper);
+        if (app == null) {
+            view.addObject("error", "无效的参数");
+            view.setViewName("merchant/errorInfo");
+            return view;
+        }
+        //查询当前商户已经进件的通道
+        QueryWrapper<MerchantChannelStatus> queryUseChannel = new QueryWrapper<MerchantChannelStatus>()
+                .eq("merchantCode", app.getMerchantCode())
+                .ne("status", MerchantChannelStatus.AUDIT_STATUS_EXAMINING)
+                .ne("thirdStatus", MerchantChannelStatus.AUDIT_THIRD_STATUS_WAITING);
+
+        List<MerchantChannelStatus> useChannelList = merchantChannelStatusService.list(queryUseChannel);
+        List<Integer> useList = new ArrayList<>(10);
+        if (!useChannelList.isEmpty()) {
+            for (MerchantChannelStatus channelStatus : useChannelList) {
+                useList.add(channelStatus.getChannel());
+            }
+        }
+        QueryWrapper<MerchantChannelStatus> query = new QueryWrapper<MerchantChannelStatus>()
+                .eq("merchantCode", app.getMerchantCode())
+                .eq("status", MerchantChannelStatus.AUDIT_STATUS_EXAMINING)
+                .eq("thirdStatus", MerchantChannelStatus.AUDIT_THIRD_STATUS_WAITING);
+        MerchantChannelStatus channel = merchantChannelStatusService.getOne(query);
+        if (channel == null) {
+            view.addObject("error", "未获取到等待进件的数据！");
+            view.setViewName("merchant/errorInfo");
+            return view;
+        }
+        QueryWrapper<MerchantPlugin> queryWrapper = new QueryWrapper<MerchantPlugin>().eq("userId", app.getUserId());
+        List<MerchantPlugin> list = merchantPluginService.list(queryWrapper);
+        if (list.isEmpty()) {
+            view.addObject("importType", "1");
+        } else {
+            view.addObject("importType", "2");
+        }
+        StoreSummaryVO storeSummaryVO = accountService.getReckoner(userId, "-1");
+        List<MerchantRejectDesc> rejectList = merchantRejectDescService.list(new QueryWrapper<MerchantRejectDesc>().orderByDesc("sort"));
+
+        IdCard cert = idCardService.getCertIdCard(userId);
+
+        AccountDTO account = accountService.getRealAccount(userId);
+        //获取上次驳回原因
+
+        UserApp userApp = userAppService.queryUserAppJoinById(Long.parseLong(userId));
+        view.addObject("userApp", userApp);
+        view.addObject("settleType", account.getSettleType());
+        view.addObject("cert", cert);
+        view.addObject("merchant", storeSummaryVO.getMerchantBaseInfo());
+        view.addObject("settleType", storeSummaryVO.getSettleType());
+        view.addObject("card", storeSummaryVO.getReckonerInfo());
+        view.addObject("bank", storeSummaryVO.getReckonerBankInfo());
+        UserInfo info = userInfoService.getById(userId);
+
+        //查询目前的启动的通道列表
+        QueryWrapper<MerchantChannel> channelWrapper = new QueryWrapper<MerchantChannel>().eq("status", "1");
+        List<MerchantChannel> channelList = merchantChannelService.list(channelWrapper);
+        List useChannelNameList = new ArrayList();
+        for (MerchantChannel c : channelList) {
+            if (useList.size() == 0) {
+                c.setUseFlag(false);
+            } else {
+                if (useList.contains(c.getId())) {
+                    c.setUseFlag(true);
+                    useChannelNameList.add(c.getChannelName());
+                } else {
+                    c.setUseFlag(false);
+                }
+            }
+        }
+        view.addObject("info", info);
+        view.addObject("channelList", channelList);
+        view.addObject("app", app);
+        view.addObject("userId", userId);
+        view.addObject("rejectList", rejectList);
+        view.addObject("channelFlag", useList.size() == 0 ? false : true);
+        view.addObject("useChannelName", StringUtils.join(useChannelNameList, ","));
+
+        view.setViewName("merchant/audit");
+        return view;
+    }
+
+    /**
+     * @param userAppId: 1257
+     * @param userId:    2088502904759300
+     * @param openId:
+     * @param qrNo:
+     * @param view:
+     * @return org.springframework.web.servlet.ModelAndView
+     * @description:支付测试
+     * @date: 2021/8/23 15:00
+     */
+    @GetMapping("/test/pay")
+    @ResponseBody
+    public ModelAndView testH5pay(String userAppId, String userId, String openId, String qrNo, ModelAndView view) {
+        view.setViewName("merchant/errorInfo2");
+        //oY6Es6YJKxaFRoGUlM9Yr6L4LbMo
+        if (StringUtil.isEmpty(userAppId)) {
+            view.addObject("error", "用户ID不能为空!");
+            return view;
+        }
+        Cookie[] cookies = request.getCookies();
+        String cokus = "2088502904759300";
+        if (cookies != null && cookies.length > 0) {
+            for (Cookie c : cookies) {
+                if ("cokus".equals(c.getName())) {
+                    String cValue = c.getValue();
+                    if (StringUtil.isNotEmpty(cValue)) {
+                        byte[] decode = Base64.getDecoder().decode(cValue.getBytes(StandardCharsets.UTF_8));
+                        cokus = new String(decode, 0, 0, decode.length);
+                        break;
+                    }
+                }
+            }
+        }
+        String domain_wap = ParametersUtil.domain + "/wap";
+        String ua = request.getHeader("user-agent").toLowerCase();
+        if (StringUtil.isNotEmpty(cokus)) {
+            String payType = "";
+            if (ua.contains("micromessenger")) {
+                payType = "WXZF";
+            } else if (ua.contains("alipay")) {
+                payType = "ZFBZF";
+            } else {
+                payType = "UNIONPAY";
+            }
+            String url = "/merchant/testH5pay?userAppId=" + userAppId + "&cokus=" + cokus + "&payType=" + payType;
+            if (StringUtil.isNotEmpty(qrNo)) {
+                url = url + "&qrNo=" + qrNo;
+            }
+            try {
+                response.sendRedirect(domain_wap + url);
+                return null;
+            } catch (IOException e) {
+                log.info("=================>【response跳转异常】异常信息:{}<==============", e.getMessage());
+                e.printStackTrace();
+            }
+            return null;
+        } else {
+            String url = "/merchant/testH5pay?userAppId=" + userAppId;
+            if (StringUtil.isNotEmpty(qrNo)) {
+                url = url + "&qrNo=" + qrNo;
+            }
+            if (StringUtil.isNotEmpty(userId)) {
+                url = url + "&userId=" + userId;
+            }
+            if (StringUtil.isNotEmpty(openId)) {
+                url = url + "&openId=" + openId;
+            }
+            String jmp = domain_wap + url;
+            try {
+                response.sendRedirect(jmp);
+                return null;
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return null;
+    }
+
+    /**
+     * @param model:
+     * @param userAppId:
+     * @param userId:
+     * @param openId:
+     * @param cokus:
+     * @param payType:
+     * @param qrNo:
+     * @param request:
+     * @param response:
+     * @param view:
+     * @return org.springframework.web.servlet.ModelAndView
+     * @description:支付测试回调
+     * @date: 2021/8/23 15:01
+     */
+    @GetMapping("/testH5pay")
+    public ModelAndView toTestH5pay(Model model,
+                                    String userAppId,
+                                    String userId,
+                                    String openId,
+                                    String cokus,
+                                    String payType,
+                                    String qrNo,
+                                    HttpServletRequest request,
+                                    HttpServletResponse response,
+                                    ModelAndView view) {
+        view.setViewName("merchant/errorInfo2");
+        if (StringUtil.isEmpty(userAppId)) {
+            model.addAttribute("error", "用户ID不能为空!");
+            return view;
+        }
+        QueryWrapper<UserApp> query = new QueryWrapper<UserApp>().eq("userId", userAppId);
+        UserApp userApp = userAppService.getOne(query);
+        if (userApp == null) {
+            model.addAttribute("error", "用户ID不存在！");
+            return view;
+        }
+        MerchantBaseInfo merchantBaseInfo = new MerchantBaseInfo();
+        merchantBaseInfo.setMerchantCode(userApp.getMerchantCode());
+        List<MerchantBaseInfo> queryMerchantBaseInfoList = merchantBaseInfoService
+                .queryMerchantBaseInfoList(merchantBaseInfo);
+        if (queryMerchantBaseInfoList.isEmpty()) {
+            model.addAttribute("error", "无此商家！");
+            return view;
+        }
+        MerchantStore store = new MerchantStore();
+        store.setMerchantCode(merchantBaseInfo.getMerchantCode());
+        List<MerchantStore> storeList = merchantStoreService.queryMerchantStoreList(store);
+        if (storeList.isEmpty()) {
+            model.addAttribute("error", "无此店铺！");
+            return view;
+        }
+        MerchantStore storeInfo = storeList.get(0);
+        if ("2".equals(storeInfo.getStatus())) {
+            model.addAttribute("error", "店铺已被禁用！");
+            return view;
+        }
+        MerchantBaseInfo baseInfo = queryMerchantBaseInfoList.get(0);
+        // 全局电子围栏和单商户电子围栏判定
+        if (!commonSwitchService.allowEcdemicPay() && !storeInfo.allowEcdemicPay()) {
+            // 不允许异地支付的时候需要校验ip和商户所在城市
+            try {
+                merchantService.checkPayLocation(request, baseInfo);
+            } catch (PayRiskException e) {
+                model.addAttribute("error", e.getMessage());
+                return view;
+            }
+        }
+        model.addAttribute("merchantCode", baseInfo.getMerchantCode());
+        model.addAttribute("userAppId", userApp.getUserId());
+        model.addAttribute("storeId", storeInfo.getStoreId());
+        if (StringUtil.isNotEmpty(cokus)) {
+            model.addAttribute("payType", payType);
+            model.addAttribute("openid", cokus);
+        } else {
+            String cookUid = "";
+            if (StringUtil.isNotEmpty(openId)) {
+                model.addAttribute("payType", "WXZF");
+                model.addAttribute("openid", openId);
+                cookUid = openId;
+            } else if (StringUtil.isNotEmpty(userId)) {
+                model.addAttribute("payType", "ZFBZF");
+                model.addAttribute("userid", userId);
+                cookUid = userId;
+            } else {
+                model.addAttribute("error", "未获取到有效的支付方式");
+                return view;
+            }
+            if (StringUtil.isNotEmpty(cookUid)) {
+                String cokusId = Base64.getEncoder().encodeToString(cookUid.getBytes(StandardCharsets.UTF_8));
+                Cookie cookie = new Cookie("cokus", cokusId);
+                cookie.setMaxAge(-1);
+                response.addCookie(cookie);
+            }
+        }
+        model.addAttribute("storeName", baseInfo.getAlias());
+        if (StringUtil.isNotEmpty(qrNo)) {
+            model.addAttribute("qrNo", qrNo);
+        }
+        view.setViewName("th_pay");
+        return view;
+    }
+
+    /**
+     * @param token:
+     * @param view:
+     * @param request:
+     * @return java.lang.String
+     * @description:校验token
+     * @date: 2021/8/23 15:01
+     */
+    private String chenkToken(String token, ModelAndView view, HttpServletRequest request) {
+        if (StringUtil.isEmpty(token)) {
+            view.addObject("error", "无效的token");
+            view.setViewName("merchant/errorInfo");
+            return null;
+        }
+        Object code = request.getSession().getAttribute(token);
+        String merchantCode = "";
+        if (code == null) {
+            QueryWrapper<UserApp> queryAppWrapper = new QueryWrapper<UserApp>();
+            queryAppWrapper.eq("token", token);
+            UserApp app = userAppService.getOne(queryAppWrapper);
+            if (app == null) {
+                view.addObject("error", "无效的token");
+                view.setViewName("merchant/errorInfo");
+                return null;
+            }
+            request.getSession().setAttribute(token, app.getMerchantCode());
+            merchantCode = app.getMerchantCode();
+        } else {
+            merchantCode = code.toString();
+        }
+        return merchantCode;
+    }
+
+    /**
+     * @param view:
+     * @param token:
+     * @param request:
+     * @return org.springframework.web.servlet.ModelAndView
+     * @description:用户自定义设置
+     * @date: 2021/8/23 15:01
+     */
+    @GetMapping("/customer/set")
+    public ModelAndView customerSet(ModelAndView view, String token, HttpServletRequest request) {
+        String merchantCode = chenkToken(token, view, request);
+        if (StringUtil.isEmpty(merchantCode)) {
+            return view;
+        }
+        view.setViewName("customer/customerSet");
+        QueryWrapper<GuideLabel> queryWrapper = new QueryWrapper<GuideLabel>().orderByAsc("id");
+        List<GuideLabel> guideLabel = guideLabelService.list(queryWrapper);
+        QueryWrapper<MerchantGuide> queryMgWrapper = new QueryWrapper<MerchantGuide>().eq("merchantCode", merchantCode).
+                orderByDesc("createTime").isNull("guideId");
+        List<MerchantGuide> mGlist = merchantGuideService.list(queryMgWrapper);
+
+        QueryWrapper<MerchantGuide> wrapper = new QueryWrapper<MerchantGuide>().eq("merchantCode", merchantCode)
+                .eq("status", "1")
+                .isNotNull("guideId");
+        List<MerchantGuide> notNullGlist = merchantGuideService.list(wrapper);
+        if (!notNullGlist.isEmpty()) {
+            view.addObject("checkCommonId", notNullGlist.get(0).getGuideId());
+        } else {
+            if (!mGlist.isEmpty()) {
+                boolean flag = false;
+                for (MerchantGuide g : mGlist) {
+                    if ("1".equals(g.getStatus())) {
+                        flag = true;
+                        break;
+                    }
+                }
+                if (flag) {
+                    for (GuideLabel l : guideLabel) {
+                        l.setStatus("0");
+                    }
+                }
+            }
+        }
+        view.addObject("token", token);
+        view.addObject("guideLabel", guideLabel);
+        view.addObject("mGlist", mGlist);
+        Map<String, String> uploadParam = OssOperatUtil.getUploadParam();
+        view.addObject("upload", JSONObject.toJSONString(uploadParam));
+        QueryWrapper<MerchantQrcode> qrcodeQueryWrapper = new QueryWrapper<MerchantQrcode>().eq("merchantCode", merchantCode);
+        MerchantQrcode qrCode = merchantQrcodeService.getOne(qrcodeQueryWrapper);
+        if (qrCode != null) {
+            view.addObject("qrCodeUrl", qrCode.getQrCodeUrl());
+            view.addObject("wechat", qrCode.getWechat());
+            view.addObject("id", qrCode.getId());
+        }
+        return view;
+    }
+
+    @RequestMapping("/guide/save")
+    @ResponseBody
+    public Result<JSONObject> guideSave(ModelAndView view, String token, Integer id, String type, HttpServletRequest request) {
+        String merchantCode = chenkToken(token, view, request);
+        if (StringUtil.isEmpty(merchantCode)) {
+            return ResultGenerator.genFailResult("未检查到有效的token");
+        }
+        if (StringUtil.isEmpty(id)) {
+            return ResultGenerator.genFailResult("标签id不能为空！");
+        }
+        if (StringUtil.isEmpty(type)) {
+            return ResultGenerator.genFailResult("标签type不能为空！");
+        }
+        QueryWrapper<MerchantBaseInfo> queryWrapper = new QueryWrapper<MerchantBaseInfo>().eq("merchantCode", merchantCode);
+        MerchantBaseInfo one = merchantBaseInfoService.getOne(queryWrapper);
+        if (one == null) {
+            return ResultGenerator.genFailResult("操作失败");
+        }
+        MerchantGuide guide = new MerchantGuide();
+        if ("common".equals(type)) {
+            UpdateWrapper<MerchantGuide> updateWapper = new UpdateWrapper<MerchantGuide>().eq("merchantCode", merchantCode)
+                    .isNull("guideId").set("status", "0");
+            merchantGuideService.update(updateWapper);
+            QueryWrapper<MerchantGuide> guideQueryWrapper = new QueryWrapper<MerchantGuide>().eq("merchantCode", merchantCode)
+                    .eq("guideId", id);
+            List<MerchantGuide> list = merchantGuideService.list(guideQueryWrapper);
+            if (list.isEmpty()) {
+                QueryWrapper<MerchantGuide> removeWapper = new QueryWrapper<MerchantGuide>().eq("merchantCode", merchantCode)
+                        .isNotNull("guideId");
+                merchantGuideService.remove(removeWapper);
+                guide.setCreateTime(new Date());
+                guide.setMerchantCode(merchantCode);
+                guide.setMerchantName(one.getAlias());
+                guide.setStatus("1");
+                guide.setGuideId(id);
+                merchantGuideService.save(guide);
+            } else if (list.size() == 1) {
+                MerchantGuide g = list.get(0);
+                if ("0".equals(g.getStatus())) {
+                    g.setStatus("1");
+                    merchantGuideService.saveOrUpdate(g);
+                }
+            } else {
+                List<Integer> ids = new ArrayList<>();
+                for (MerchantGuide g : list) {
+                    ids.add(g.getId());
+                }
+                merchantGuideService.removeByIds(ids);
+                guide.setCreateTime(new Date());
+                guide.setMerchantCode(merchantCode);
+                guide.setMerchantName(one.getAlias());
+                guide.setStatus("1");
+                guide.setGuideId(id);
+                merchantGuideService.save(guide);
+            }
+        } else {
+            UpdateWrapper<MerchantGuide> updateWapper = new UpdateWrapper<MerchantGuide>().eq("merchantCode", merchantCode)
+                    .isNotNull("guideId").set("status", "0");
+            merchantGuideService.update(updateWapper);
+            guide.setId(id);
+            guide.setStatus("1");
+            merchantGuideService.updateById(guide);
+        }
+        return ResultGenerator.genSuccessResult("操作成功！", null);
+    }
+
+    @NoRepeatSubmit
+    @RequestMapping("/guide/add")
+    @ResponseBody
+    public Result<MerchantGuide> getGuide(ModelAndView view, String token, String name, HttpServletRequest request) {
+        String merchantCode = chenkToken(token, view, request);
+        if (StringUtil.isEmpty(merchantCode)) {
+            return ResultGenerator.genFailResult("未检查到有效的token");
+        }
+        if (StringUtil.isEmpty(name)) {
+            return ResultGenerator.genFailResult("标签名称不能为空！");
+        }
+        if (name.contains("花呗") || name.contains("信用") || name.contains("套现")) {
+            return ResultGenerator.genFailResult("标签名称不能包含敏感字符！");
+        }
+        QueryWrapper<MerchantBaseInfo> queryWrapper = new QueryWrapper<MerchantBaseInfo>().eq("merchantCode", merchantCode);
+        MerchantBaseInfo one = merchantBaseInfoService.getOne(queryWrapper);
+        if (one == null) {
+            return ResultGenerator.genFailResult("操作失败");
+        }
+        MerchantGuide guide = new MerchantGuide();
+        guide.setCreateTime(new Date());
+        guide.setMerchantCode(merchantCode);
+        guide.setName(name);
+        guide.setMerchantName(one.getAlias());
+        guide.setStatus("0");
+        merchantGuideService.save(guide);
+        return ResultGenerator.genSuccessResult("操作成功！", guide);
+    }
+
+    @RequestMapping("/wechat/clear")
+    @ResponseBody
+    public Result<Object> clearWechat(ModelAndView view, String token, HttpServletRequest request) {
+        String merchantCode = chenkToken(token, view, request);
+        if (StringUtil.isEmpty(merchantCode)) {
+            return ResultGenerator.genFailResult("未检查到有效的token");
+        }
+
+        MerchantQrcode merchantQrcode = new MerchantQrcode().setMerchantCode(merchantCode);
+        QueryWrapper<MerchantQrcode> queryWrapper = new QueryWrapper<>(merchantQrcode);
+        merchantQrcodeService.remove(queryWrapper);
+
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @RequestMapping("/wechat/add")
+    @ResponseBody
+    public Result<MerchantQrcode> addWechat(ModelAndView view, String token, String wechat, Integer id, HttpServletRequest request) {
+        String merchantCode = chenkToken(token, view, request);
+        if (StringUtil.isEmpty(merchantCode)) {
+            return ResultGenerator.genFailResult("未检查到有效的token");
+        }
+        if (StringUtil.isEmpty(wechat)) {
+            return ResultGenerator.genFailResult("微信号不能为空！");
+        }
+        boolean b = wechat.matches("^[^\\u4e00-\\u9fa5]+$");
+        if (!b) {
+            return ResultGenerator.genFailResult("微信号不能包含中文字符！");
+        }
+        if (StringUtil.isEmpty(id)) {
+            return ResultGenerator.genFailResult("id不能为空！");
+        }
+        MerchantQrcode qrcode = new MerchantQrcode();
+        qrcode.setWechat(wechat);
+        qrcode.setId(id);
+        qrcode.setUpdateTime(new Date());
+        merchantQrcodeService.updateById(qrcode);
+        return ResultGenerator.genSuccessResult("操作成功！", qrcode);
+    }
+
+    @RequestMapping("/guide/remove")
+    @ResponseBody
+    public Result<JSONObject> guideRemove(ModelAndView view, String token, Integer id, HttpServletRequest request) {
+        String merchantCode = chenkToken(token, view, request);
+        if (StringUtil.isEmpty(merchantCode)) {
+            return ResultGenerator.genFailResult("未检查到有效的token");
+        }
+        if (StringUtil.isEmpty(id)) {
+            return ResultGenerator.genFailResult("标签ID不能为空！");
+        }
+        merchantGuideService.removeById(id);
+        return ResultGenerator.genSuccessResult("操作成功！", null);
+    }
+
+    @RequestMapping("/qrCode1/upload")
+    public ModelAndView qrCodeUpload(@RequestParam("file") MultipartFile file, ModelAndView view, HttpServletRequest request) {
+        System.out.println("file:" + file);
+        view.setViewName("customer/customerSet");
+        return view;
+    }
+
+    @RequestMapping("/qrCode/upload")
+    @ResponseBody
+    public Result<Object> qrCodeUpload(ModelAndView view, String token, String photoUrl, HttpServletRequest request) {
+        String merchantCode = chenkToken(token, view, request);
+        if (StringUtil.isEmpty(merchantCode)) {
+            return ResultGenerator.genFailResult("未检查到有效的token");
+        }
+        if (StringUtil.isEmpty(photoUrl)) {
+            return ResultGenerator.genFailResult("图片地址不能为空！");
+        }
+        QueryWrapper<MerchantBaseInfo> queryWrapper = new QueryWrapper<MerchantBaseInfo>().eq("merchantCode", merchantCode);
+        MerchantBaseInfo one = merchantBaseInfoService.getOne(queryWrapper);
+        if (one == null) {
+            return ResultGenerator.genFailResult("上传失败");
+        }
+        QueryWrapper<MerchantQrcode> removeWrapper = new QueryWrapper<MerchantQrcode>().eq("merchantCode", merchantCode);
+        merchantQrcodeService.remove(removeWrapper);
+        MerchantQrcode qrcode = new MerchantQrcode();
+        qrcode.setCreateTime(new Date());
+        qrcode.setMerchantCode(merchantCode);
+        qrcode.setMerchantName(one.getAlias());
+        qrcode.setQrCodeUrl(photoUrl);
+        merchantQrcodeService.save(qrcode);
+        return ResultGenerator.genSuccessResult("操作成功！", qrcode);
+    }
+
+    @GetMapping("/store/{qrNo}")
+    @ResponseBody
+    public Result<Map<String, Object>> getStoreQrNo(@PathVariable(value = "qrNo") String qrNo) {
+        Map<String, Object> result = new HashMap<>(2);
+        if (StringUtil.isEmpty(qrNo)) {
+            return ResultGenerator.genFailResult("二维码编号不能为空！");
+        }
+
+        DeviceStock deviceStock = new DeviceStock().setSnNo(qrNo);
+        deviceStock = deviceStockService.getOne(new QueryWrapper<>(deviceStock));
+        if (deviceStock == null) {
+            return ResultGenerator.genFailResult("未获取到当前二维码信息！");
+        }
+        if (!"3".equals(deviceStock.getStatus())) {
+            return ResultGenerator.genFailResult("当前二维码暂未激活！");
+        }
+        MerchantBaseInfo merchantInfo = merchantBaseInfoService.getById(deviceStock.getActMercId());
+        if (merchantInfo == null) {
+            return ResultGenerator.genFailResult("未获取到商户信息！");
+        }
+        MerchantStore store = new MerchantStore();
+        store.setMerchantCode(merchantInfo.getMerchantCode());
+        List<MerchantStore> storeList = merchantStoreService.queryMerchantStoreList(store);
+        if (storeList.isEmpty()) {
+            return ResultGenerator.genFailResult("未获取到店铺信息！");
+        }
+        result.put("storeId", storeList.get(0));
+        return ResultGenerator.genSuccessResult("获取成功！", result);
+    }
+
+    @RequestMapping("/store/userApp/{userAppId}")
+    @ResponseBody
+    public Result<Map<String, Object>> getStoreByUserAppId(@PathVariable(value = "userAppId") String userAppId) {
+        Map<String, Object> result = new HashMap<>(2);
+        if (StringUtil.isEmpty(userAppId)) {
+            return ResultGenerator.genFailResult("用户ID不能为空！");
+        }
+        QueryWrapper<UserApp> userAppQueryWrapper = new QueryWrapper<UserApp>().eq("userId", userAppId);
+        UserApp app = userAppService.getOne(userAppQueryWrapper);
+        if (app == null) {
+            return ResultGenerator.genFailResult("用户不存在！");
+        }
+        MerchantStore store = new MerchantStore();
+        store.setMerchantCode(app.getMerchantCode());
+        List<MerchantStore> storeList = merchantStoreService.queryMerchantStoreList(store);
+        if (storeList.isEmpty()) {
+            return ResultGenerator.genFailResult("未获取到店铺信息！");
+        }
+        result.put("storeId", storeList.get(0));
+        return ResultGenerator.genSuccessResult("获取成功！", result);
+    }
+
+    /**
+     * 更具id获取店铺ID
+     */
+    @RequestMapping(value = "/store/getInfoId", method = RequestMethod.POST)
+    @ResponseBody
+    public Result<JSONObject> getStoreId(@RequestBody JSONObject json) {
+        JSONObject result = new JSONObject();
+        String userAppId = json.getString("userAppId");
+        if (StringUtil.isEmpty(userAppId)) {
+            return ResultGenerator.genFailResult("用户ID不能为空！");
+        }
+        QueryWrapper<UserApp> userAppQueryWrapper = new QueryWrapper<UserApp>().eq("userId", userAppId);
+        UserApp app = userAppService.getOne(userAppQueryWrapper);
+        if (app == null) {
+            return ResultGenerator.genFailResult("用户不存在！");
+        }
+        MerchantStore store = new MerchantStore();
+        store.setMerchantCode(app.getMerchantCode());
+        List<MerchantStore> storeList = merchantStoreService.queryMerchantStoreList(store);
+        if (storeList.isEmpty()) {
+            return ResultGenerator.genFailResult("未获取到店铺信息！");
+        }
+        result.put("storeId", storeList.get(0));
+        return ResultGenerator.genSuccessResult("获取成功!", result);
+    }
+
+    /**
+     * 添加h5 页面转发接口
+     *
+     * @param request
+     * @param userAppId
+     * @return
+     */
+    @RequestMapping(value = "/h5/pay", method = RequestMethod.GET)
+    public ModelAndView toH5Pay(HttpServletRequest request, String userAppId) {
+        ModelAndView modelAndView = new ModelAndView();
+        JSONObject result = new JSONObject();
+        if (StringUtil.isEmpty(userAppId)) {
+            result.put("message", "用户ID不能为空！");
+            modelAndView.addAllObjects(result);
+            modelAndView.setViewName("merchant/error");
+            return modelAndView;
+        }
+        if (!"7249".equals(userAppId)) {
+            result.put("message", "当前商户暂不支持！");
+            modelAndView.addAllObjects(result);
+            modelAndView.setViewName("merchant/error");
+            return modelAndView;
+        }
+        String domain_wap = ParametersUtil.domain + "/wap";
+        String jump = "/merchant/auth?userAppId=" + userAppId;
+        try {
+            response.sendRedirect(domain_wap + jump);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 新版授权
+     *
+     * @param userAppId
+     * @param request
+     * @param view
+     * @param response
+     * @return
+     */
+    @GetMapping("/authPay")
+    public ModelAndView authPay(String userAppId, Integer channel, String qrNo, HttpServletRequest request, ModelAndView view, HttpServletResponse response) {
+        if (StringUtil.isEmpty(userAppId)) {
+            view.setViewName("merchant/errorInfo2");
+            view.addObject("error", "用户ID不能为空!");
+            return view;
+        }
+        String ua = request.getHeader("user-agent").toLowerCase();
+        String payType = "";
+        if (ua.contains("micromessenger")) {
+            payType = "WXZF";
+        } else if (ua.contains("alipay")) {
+            payType = "ZFBZF";
+        } else {
+            payType = "UNIONPAY";
+        }
+        String cokusName = "cokus_" + payType;
+        Cookie[] cookies = request.getCookies();
+        String cokus = "";
+        if (cookies != null && cookies.length > 0) {
+            for (Cookie c : cookies) {
+                if (cokusName.equals(c.getName())) {
+                    String cValue = c.getValue();
+                    if (StringUtil.isNotEmpty(cValue)) {
+                        //TODO 解决银联用户标识转码后特殊字符异常
+                        if ("UNIONPAY".equals(payType)) {
+                            cValue = cValue.replace(" ", "+");
+                        }
+                        byte[] decode = Base64.getDecoder().decode(cValue.getBytes(StandardCharsets.UTF_8));
+                        cokus = new String(decode, 0, 0, decode.length);
+                        break;
+                    }
+                }
+            }
+        }
+        String domain_wap = ParametersUtil.domain + "/wap";
+        String APP_ID = ParametersUtil.APPID;
+        String ali_appid = ParametersUtil.ZY_ALI_APP_ID;
+        String url = "/merchant/h5pay?userAppId=" + userAppId;
+        if (StringUtil.isNotEmpty(qrNo)) {
+            url = url + "&qrNo=" + qrNo;
+        }
+        if (StringUtil.isNotEmpty(channel)) {
+            url = url + "&channel=" + channel;
+        }
+        if (StringUtil.isNotEmpty(cokus)) {
+            url = url + "&cokus=" + cokus + "&payType=" + payType;
+            try {
+                response.sendRedirect(domain_wap + url);
+                return null;
+            } catch (IOException e) {
+                log.info("=================>【response跳转异常】异常信息:{}<==============", e.getMessage());
+                e.printStackTrace();
+            }
+            return null;
+        } else {
+            try {
+                if (ua.contains("micromessenger")) {
+                    String jump = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=" + APP_ID
+                            + "&redirect_uri=" + java.net.URLEncoder.encode(domain_wap + url, "utf-8")
+                            + "&response_type=code&scope=snsapi_base&state=123#wechat_redirect";
+                    response.sendRedirect(jump);
+                    return null;
+                } else if (ua.contains("alipay")) {
+                    String urlString = domain_wap + url;
+                    String rurl = java.net.URLEncoder.encode(urlString, "utf-8");
+                    String jmp = "https://openauth.alipay.com/oauth2/publicAppAuthorize.htm?app_id=" + ali_appid + "&scope=auth_base&redirect_uri=" + rurl;
+                    response.sendRedirect(jmp);
+                    return null;
+                } else {
+                    String urlString = domain_wap + url;
+                    String rurl = java.net.URLEncoder.encode(urlString, "utf-8");
+                    String jmp = "https://qr.95516.com/qrcGtwWeb-web/api/userAuth?version=1.0.0&redirectUrl=" + rurl;
+                    response.sendRedirect(jmp);
+                    return null;
+                }
+            } catch (UnsupportedEncodingException e) {
+                view.setViewName("merchant/errorInfo2");
+                view.addObject("error", "url转码异常!");
+                return view;
+            } catch (IOException e) {
+                view.setViewName("merchant/errorInfo2");
+                view.addObject("error", "response跳转异常!");
+                return view;
+            }
+        }
+    }
+
+    /**
+     * 新版授权回调页面
+     *
+     * @param model
+     * @param code
+     * @param auth_code
+     * @param userAuthCode
+     * @param userAppId
+     * @param request
+     * @return
+     */
+    @GetMapping("/h5pay")
+    public ModelAndView html(Model model,
+                             String code,
+                             String auth_code,
+                             String userAuthCode,
+                             String userAppId,
+                             String cokus,
+                             String payType,
+                             String qrNo,
+                             Integer channelVal,
+                             HttpServletRequest request,
+                             HttpServletResponse response,
+                             ModelAndView view, String province) {
+        view.setViewName("merchant/errorInfo2");
+        if (StringUtil.isEmpty(userAppId)) {
+            model.addAttribute("error", "用户ID不能为空!");
+            return view;
+        }
+        QueryWrapper<UserApp> query = new QueryWrapper<UserApp>().eq("userId", userAppId);
+        UserApp userApp = userAppService.getOne(query);
+        if (userApp == null) {
+            model.addAttribute("error", "用户ID不存在！");
+            return view;
+        }
+        MerchantBaseInfo merchantBaseInfo = new MerchantBaseInfo();
+        merchantBaseInfo.setMerchantCode(userApp.getMerchantCode());
+        List<MerchantBaseInfo> queryMerchantBaseInfoList = merchantBaseInfoService
+                .queryMerchantBaseInfoList(merchantBaseInfo);
+        if (queryMerchantBaseInfoList.isEmpty()) {
+            model.addAttribute("error", "无此商家！");
+            return view;
+        }
+        MerchantStore store = new MerchantStore();
+        store.setMerchantCode(merchantBaseInfo.getMerchantCode());
+        List<MerchantStore> storeList = merchantStoreService.queryMerchantStoreList(store);
+        if (storeList.isEmpty()) {
+            model.addAttribute("error", "无此店铺！");
+            return view;
+        }
+        MerchantStore storeInfo = storeList.get(0);
+        if ("2".equals(storeInfo.getStatus())) {
+            model.addAttribute("error", "店铺已被禁用！");
+            return view;
+        }
+        Map<String, Object> params = new HashMap<>(16);
+        params.put("code", code);
+        params.put("auth_code", auth_code);
+        params.put("userAuthCode", userAuthCode);
+        params.put("merchantCode", merchantBaseInfo.getMerchantCode());
+        params.put("userAppId", userAppId);
+        params.put("qrNo", qrNo);
+        params.put("payType", payType);
+        params.put("cokus", cokus);
+        params.put("province", province);
+        MerchantBaseInfo baseInfo = queryMerchantBaseInfoList.get(0);
+        // 全局电子围栏和单商户电子围栏判定
+        if (!commonSwitchService.allowEcdemicPay() && !storeInfo.allowEcdemicPay()) {
+            // 不允许异地支付的时候需要校验ip和商户所在城市
+            try {
+                String ip = IpUtils.getIpAddr(request);
+                merchantService.checkPayLocation(ip, baseInfo, province);
+            } catch (PayRiskException e) {
+                view.addObject("error", e.getMessage());
+                view.setViewName("/merchant/locationError");
+                view.addAllObjects(params);
+                return view;
+            }
+        }
+        model.addAttribute("merchantCode", baseInfo.getMerchantCode());
+        model.addAttribute("userAppId", userApp.getUserId());
+        model.addAttribute("storeId", storeInfo.getStoreId());
+        model.addAttribute("channelVal", channelVal);
+        if (StringUtil.isNotEmpty(cokus)) {
+            model.addAttribute("payType", payType);
+            model.addAttribute("openid", cokus);
+        } else {
+            String cookUid = "";
+            String pType = "";
+            if (StringUtil.isNotEmpty(code)) {
+                pType = "WXZF";
+                WxAccessTokenRequest tokenRequest = WxAccessTokenRequest.buidWxToken(ParametersUtil.APPID, ParametersUtil.APPSECRET, code, WxConstants.OAUTH2_ACCESS_TOKEN_URL);
+                WxOauth2AccessTokenResponse result = wxCommonService.getOauth2Info(tokenRequest);
+                String openid = result.getOpenid();
+                model.addAttribute("openid", openid);
+                model.addAttribute("unionId", result.getUnionid());
+                cookUid = openid;
+            } else if (StringUtil.isNotEmpty(auth_code)) {
+                pType = "ZFBZF";
+                AlipaySystemOauthTokenResponse tokenResponse = AliUtil.getAliUserIdV2(auth_code, ParametersUtil.ZY_PRI, ParametersUtil.ZY_PUB, ParametersUtil.ZY_ALI_APP_ID);
+                model.addAttribute("userid", tokenResponse.getUserId());
+                cookUid = tokenResponse.getUserId();
+            } else if (StringUtil.isNotEmpty(userAuthCode)) {
+                pType = "UNIONPAY";
+                MerchantChannelStatus channel = merchantChannelStatusService.getValidData(baseInfo.getMerchantCode());
+                String ua = request.getHeader("User-Agent");
+                log.info("===================>【银联】标识，获取请求头部信息:{},==============", ua);
+                int begin = ua.indexOf("UnionPay");
+                String payMentApp = ua.substring(begin);
+                if (payMentApp.length() > 30) {
+                    payMentApp = payMentApp.substring(0, 30);
+                }
+                try {
+                    Map<String, Object> unionInfo = null;
+                    //随行付
+                    if (channel.getChannel() == 1) {
+                        unionInfo = sxfPayService.getUnionInfo(userAuthCode, payMentApp, null);
+                    } else if (channel.getChannel() == 2) {
+                        view.addObject("error", "当前通道已关闭,请联系客户切换");
+                        return view;
+                    } else if (channel.getChannel() == 3) {
+                        unionInfo = ryxPayService.getUnionInfo(userAuthCode, payMentApp, channel.getMerchantId());
+                    } else if (channel.getChannel() == 4) {
+                        unionInfo = ysPayOldService.getUnionInfo(userAuthCode, payMentApp, null);
+                    } else {
+                        view.addObject("error", "未知通道类型");
+                        return view;
+                    }
+                    log.info("===================>【银联】获取用户标识结果参数:{}==============", unionInfo);
+                    if ("1".equals(unionInfo.get("code"))) {
+                        Object userIdData = unionInfo.get("data");
+                        String userId = "";
+                        if (userIdData instanceof Map) {
+                            Map<String, String> data = (Map<String, String>) userIdData;
+                            userId = data.get("data");
+                        } else {
+                            userId = userIdData.toString();
+                        }
+                        cookUid = userId;
+                        model.addAttribute("userid", userId);
+                    }
+                } catch (Exception e) {
+                    model.addAttribute("error", "银联用户标识解析出错！");
+                    return view;
+                }
+            } else {
+                model.addAttribute("error", "未获取到有效的支付方式");
+                return view;
+            }
+            model.addAttribute("payType", pType);
+            if (StringUtil.isNotEmpty(cookUid)) {
+                String cokusName = "cokus_" + pType;
+                String cokusId = Base64.getEncoder().encodeToString(cookUid.getBytes(StandardCharsets.UTF_8));
+                Cookie cookie = new Cookie(cokusName, cokusId);
+                cookie.setMaxAge(-1);
+                response.addCookie(cookie);
+            }
+        }
+        model.addAttribute("storeName", baseInfo.getAlias());
+        if (StringUtil.isNotEmpty(qrNo)) {
+            model.addAttribute("qrNo", qrNo);
+        }
+        view.setViewName("th_pay");
+        return view;
+    }
+
+    /**
+     * 扫码设备支付授权页面
+     *
+     * @param request:
+     * @return org.springframework.web.servlet.ModelAndView
+     * @date: 2021/12/28 13:53
+     */
+    @GetMapping("/scanPayAuth")
+    public ModelAndView scanPayAuth(HttpServletRequest request, HttpServletResponse response, String tk) {
+        return merchantService.scanPayAuth(request, response, tk);
+    }
+
+
+    /**
+     * 扫码支付页面
+     *
+     * @param request:
+     * @return org.springframework.web.servlet.ModelAndView
+     * @date: 2021/12/28 13:53
+     */
+    @GetMapping("/scanPay")
+    public ModelAndView scanPay(HttpServletRequest request, HttpServletResponse response, String tk,
+                                  String code,
+                                  String auth_code,
+                                  String userAuthCode,
+                                  String userId,
+                                  String payType) {
+        return merchantService.scanPay(request, response, tk, code, auth_code, userAuthCode, userId, payType);
+    }
+
+    @GetMapping("/auth")
+    public ModelAndView auth(HttpServletRequest request, String userAppId, String qrNo) throws IOException {
+        ModelAndView modelAndView = new ModelAndView();
+        modelAndView.setViewName("merchant/errorInfo2");
+        if (StringUtil.isEmpty(userAppId)) {
+            modelAndView.addObject("error", "用户ID不能为空！");
+            return modelAndView;
+        }
+        //TODO 喜客定制需求
+        if ("7044".equals(userAppId)) {
+            modelAndView.addObject("error", "本店不支持支付宝，请使用微信扫码支付！");
+            return modelAndView;
+        }
+        //支付宝更换支付页面
+        String jump = ParametersUtil.domain + "/wap/merchant/authPay?userAppId=" + userAppId + "&qrNo=" + qrNo;
+        response.sendRedirect(jump);
+        return null;
+    }
+
+    @ApiOperation(value = "商户码牌链接", notes = "商户码牌链接", httpMethod = "GET")
+    @GetMapping("/auth/{qrNo}")
+    public ModelAndView customQrCode(@ApiParam @PathVariable String qrNo, RedirectAttributes attrs) throws IOException {
+        ModelAndView view = new ModelAndView();
+        if (StringUtil.isEmpty(qrNo)) {
+            view.setViewName("merchant/errorInfo");
+            request.setAttribute("error", "请扫描正确的二维码！");
+            return view;
+        }
+        String actMercId = null;
+        DeviceStock deviceStock = new DeviceStock().setSnNo(qrNo);
+        List<DeviceStock> deviceStockList = deviceStockService.list(new QueryWrapper<>(deviceStock));
+        if (deviceStockList == null || deviceStockList.isEmpty()) {
+            view.setViewName("merchant/errorInfo");
+            request.setAttribute("error", "很抱歉，该收款码暂未激活！");
+            return view;
+        }
+        deviceStock = deviceStockList.get(0);
+        if ("1".equals(deviceStock.getStatus())) {
+            request.setAttribute("error", "很抱歉，该设备暂未激活！");
+            view.setViewName("merchant/errorInfo");
+            return view;
+        }
+
+        if (StringUtils.isEmpty(deviceStock.getActMercId())) {
+            request.setAttribute("error", "很抱歉，该设备暂未激活！");
+            view.setViewName("merchant/errorInfo");
+            return view;
+        }
+        actMercId = deviceStock.getActMercId();
+        MerchantBaseInfo merchantBaseInfo = new MerchantBaseInfo().setId(Long.parseLong(actMercId));
+        merchantBaseInfo = merchantBaseInfoService.queryMerchantBaseInfo(merchantBaseInfo);
+
+        String merchantCode = merchantBaseInfo.getMerchantCode();
+        UserApp userApp = new UserApp().setMerchantCode(merchantCode).setUserType("promoter");
+        userApp = userAppService.queryUserApp(userApp);
+        MerchantStore merchantStore = new MerchantStore().setMerchantCode(merchantCode);
+        merchantStore = merchantStoreService.queryMerchantStore(merchantStore);
+
+        // 通过各种检测即重定向到付款页
+        attrs.addAttribute("merchantCode", merchantCode);
+        attrs.addAttribute("storeId", merchantStore.getStoreId());
+        attrs.addAttribute("userAppId", userApp.getUserId());
+        attrs.addAttribute("qrNo", qrNo);
+        view.setViewName("redirect:/merchant/auth");
+        return view;
+    }
+
+    /**
+     * index:(授权回调页面). <br/>
+     *
+     * @param code
+     * @param auth_code
+     * @return
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    @GetMapping("/index")
+    public ModelAndView index(String code, String auth_code, String userAuthCode, String merchantCode, String storeId, String userAppId,
+                              String aisleSwitch, String qrNo, HttpServletRequest request, String province) {
+        ModelAndView modelAndView = new ModelAndView("merchant/index");
+        MerchantStore merchantStore = new MerchantStore().setMerchantCode(merchantCode);
+        List<MerchantStore> merchantStoreList = merchantStoreService.queryMerchantStoreList(merchantStore);
+        if (merchantStoreList == null || merchantStoreList.size() == 0) {
+            modelAndView.setViewName("/merchant/errorInfo");
+            modelAndView.addObject("error", "无法获取商户信息");
+            return modelAndView;
+        } else {
+            merchantStore = merchantStoreList.get(0);
+            if ("2".equals(merchantStore.getStatus())) {
+                modelAndView.setViewName("/merchant/errorInfo");
+                modelAndView.addObject("error", "该店铺已被冻结");
+                return modelAndView;
+            }
+        }
+        Map<String, Object> result = new HashMap<>(16);
+        result.put("code", code);
+        result.put("auth_code", auth_code);
+        result.put("userAuthCode", userAuthCode);
+        result.put("merchantCode", merchantCode);
+        result.put("storeId", storeId);
+        result.put("userAppId", userAppId);
+        result.put("aisleSwitch", aisleSwitch);
+        result.put("qrNo", qrNo);
+        result.put("province", province);
+        //电子围栏
+        MerchantBaseInfo merchantBaseInfo = new MerchantBaseInfo();
+        merchantBaseInfo.setMerchantCode(merchantCode);
+        merchantBaseInfo = merchantBaseInfoService.queryMerchantBaseInfo(merchantBaseInfo);
+        // 全局电子围栏和单商户电子围栏判定
+        if (!commonSwitchService.allowEcdemicPay() && !merchantStore.allowEcdemicPay()) {
+            // 不允许异地支付的时候需要校验ip和商户所在城市
+            try {
+                String ip = IpUtils.getIpAddr(request);
+                merchantService.checkPayLocation(ip, merchantBaseInfo, province);
+            } catch (PayRiskException e) {
+                modelAndView.addObject("error", e.getMessage());
+                modelAndView.setViewName("/merchant/locationError");
+                modelAndView.addAllObjects(result);
+                return modelAndView;
+            }
+        }
+        String userImg = "";// 用户头像
+        String nickName = "";// 用户昵称
+        if (StringUtil.isNotEmpty(code)) {
+            result.put("payType", "wx");
+            WxAccessTokenRequest tokenRequest = WxAccessTokenRequest.buidWxToken(ParametersUtil.APPID, ParametersUtil.APPSECRET, code, WxConstants.OAUTH2_ACCESS_TOKEN_URL);
+            WxOauth2AccessTokenResponse params = wxCommonService.getOauth2Info(tokenRequest);
+            result.put("openid", params.getOpenid());
+            result.put("unionId", params.getUnionid());
+        } else if (StringUtil.isNotEmpty(auth_code)) {
+            //支付宝取消主动授权 采用静默授权方式，无法获取用户信息
+            AlipaySystemOauthTokenResponse tokenResponse = AliUtil.getAliUserIdV2(auth_code, ParametersUtil.ZY_PRI, ParametersUtil.ZY_PUB, ParametersUtil.ZY_ALI_APP_ID);
+            result.put("payType", "alipay");
+            result.put("userid", tokenResponse.getUserId());
+        } else if (StringUtil.isNotEmpty(userAuthCode)) {
+            MerchantChannelStatus channel = merchantChannelStatusService.getValidData(merchantCode);
+            String ua = request.getHeader("User-Agent");
+            log.info("===================>【银联】标识，获取请求头部信息:{},==============", ua);
+            int begin = ua.indexOf("UnionPay");
+            String payMentApp = ua.substring(begin);
+            if (payMentApp.length() > 30) {
+                payMentApp = payMentApp.substring(0, 30);
+            }
+            try {
+                Map<String, Object> unionInfo = new HashMap<>(3);
+                //随行付
+                if (channel.getChannel() == 1) {
+                    unionInfo = sxfPayService.getUnionInfo(userAuthCode, payMentApp, null);
+                } else if (channel.getChannel() == 2) {
+                    modelAndView.addObject("error", "当前通道已关闭,请联系客户切换");
+                    modelAndView.setViewName("/merchant/errorInfo2");
+                    return modelAndView;
+                } else if (channel.getChannel() == 3) {
+                    modelAndView.addObject("error", "当前商户类型不支持扫码，请使用反扫功能或切换实时到账通道");
+                    modelAndView.setViewName("/merchant/errorInfo2");
+                    return modelAndView;
+                } else if (channel.getChannel() == 4) {
+                    unionInfo = ysPayOldService.getUnionInfo(userAuthCode, payMentApp, null);
+                } else {
+                    modelAndView.addObject("error", "未知通道类型");
+                    modelAndView.setViewName("/merchant/errorInfo2");
+                    return modelAndView;
+                }
+                log.info("===================>【银联】获取用户标识结果参数:{}==============", unionInfo);
+                if ("1".equals(unionInfo.get("code"))) {
+                    Object userIdData = unionInfo.get("data");
+                    String userId = "";
+                    if (userIdData instanceof Map) {
+                        Map<String, String> data = (Map<String, String>) userIdData;
+                        userId = data.get("data");
+                    } else {
+                        userId = userIdData.toString();
+                    }
+                    result.put("userid", userId);
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+                log.error("===================>【银联】获取用户标识出错:{}==============", ua);
+            }
+        } else {
+            modelAndView.addObject("error", "不支持当前扫码方式，请使用微信、支付宝、云闪付或京东金融扫码支付");
+            modelAndView.setViewName("/merchant/errorInfo2");
+            return modelAndView;
+        }
+        //TODO 测试
+//        result.put("payType", "wx");
+//        result.put("openid", "oY6Es6Y52jNTArOpt-CTDP4ScKqs");
+//        result.put("payType", "alipay");
+//        result.put("userid", "2088502904759300");
+
+        result.put("userImg", userImg);
+        result.put("nickName", nickName);
+        String storeName = "收银呗商家";
+        UserApp userApp = new UserApp();
+        userApp.setUserId(Long.parseLong(userAppId));
+        userApp = userAppService.queryUserApp(userApp);
+        if (StringUtil.isNotEmpty(userApp.getMerchantName())) {
+            storeName = userApp.getMerchantName();
+        }
+        if (StringUtil.isNotEmpty(merchantBaseInfo.getAlias())) {
+            storeName = merchantBaseInfo.getAlias();
+        }
+        result.put("storeName", storeName);
+        modelAndView.addAllObjects(result);
+        return modelAndView;
+    }
+
+//    public WeixinOauth2Token getWeChatUserOpenId(String code) {
+//        log.info(code);
+//        String appId = ParametersUtil.APPID;
+//        String appSecret = ParametersUtil.APPSECRET;
+//        log.info("====appId===" + appId);
+//        log.info("===appSecret===" + appSecret);
+//        String openid = "";
+//        WeixinOauth2Token wot = null;
+//        if (!"authdeny".equals(code)) {
+//            if (code != null) {
+//                wot = Oauth2Util.getOauth2AccessToken(appId, appSecret, code);
+//            }
+//        }
+//        log.info(openid);
+//        return wot;
+//    }
+
+//    public WeixinOauth2Token getWeChatUserOpenId(String code) {
+//        log.info(code);
+//        String appId = ParametersUtil.APPID;
+//        String appSecret = ParametersUtil.APPSECRET;
+//        log.info("====appId===" + appId);
+//        log.info("===appSecret===" + appSecret);
+//        String openid = "";
+//        Object oauthInfo = request.getSession().getAttribute(code);
+//        log.info("获取SESSION中微信授权信息:{}",oauthInfo);
+//        if(oauthInfo != null){
+//            return (WeixinOauth2Token) oauthInfo;
+//        }else{
+//            WeixinOauth2Token wot = null;
+//            if (!"authdeny".equals(code)) {
+//                if (code != null) {
+//                    wot = Oauth2Util.getOauth2AccessToken(appId, appSecret, code);
+//                    if(wot != null){
+//                        request.getSession().setAttribute(code,wot);
+//                    }
+//                }
+//            }
+//            log.info(openid);
+//            return wot;
+//        }
+//    }
+
+    /**
+     * wechatPay:(微信支付). <br/>
+     *
+     * @return
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    @PostMapping("/wechatPay")
+    @ResponseBody
+    public Map<String, Object> wechatPay(MerchantWechatPayDTO merchantWechatPayDTO) {
+        return null;
+//        String jsonString = JSONObject.toJSONString(merchantWechatPayDTO);
+//        log.error("==================merchantWechatPayDTO QIAN===================" + jsonString);
+////		log.info("===========nickName==========="+nickName);
+////		merchantWechatPayDTO.setOpenid(openid);
+////		merchantWechatPayDTO.setComsumeMoney(comsumeMoney);
+////		merchantWechatPayDTO.setMerchantCode(merchantCode);
+////		merchantWechatPayDTO.setUserAppId(userAppId);
+////		merchantWechatPayDTO.setUserImg(userImg);
+////		merchantWechatPayDTO.setNickName(nickName);
+//        Map<String, Object> result = new HashMap<String, Object>(16);
+//        // 通过UserApp-userId 查商户号
+//        UserApp userApp = new UserApp();
+//        MerchantBaseInfo merchantBaseInfo = new MerchantBaseInfo();
+//        if (StringUtil.isNotEmpty(merchantWechatPayDTO.getMerchantCode())) {
+//            merchantBaseInfo.setMerchantCode(merchantWechatPayDTO.getMerchantCode());
+//            merchantBaseInfo = merchantBaseInfoService.queryMerchantBaseInfo(merchantBaseInfo);
+//        }
+//        if (StringUtil.isNotEmpty(merchantWechatPayDTO.getUserAppId())) {
+//            userApp.setUserId(Long.valueOf(merchantWechatPayDTO.getUserAppId()));
+//            userApp = userAppService.queryUserApp(userApp);
+//        }
+//        if (StringUtil.isEmpty(merchantBaseInfo.getSubMchId()) && StringUtil.isEmpty(userApp.getSubMchId())) {
+//            result.put("code", "0");
+//            return result;
+//        }
+//        log.info("方法名wechatPay  userApp" + merchantWechatPayDTO.getUserAppId() + "====");
+//        // APPID
+//        String APPID = ParametersUtil.APPID;
+//        log.error("===APPID===" + APPID);
+//        String pid = ParametersUtil.PID;
+//        log.error("===APPID===" + pid);
+//        String subAppid = "";
+//        if (StringUtil.isNotEmpty(userApp.getSubMchId())) {
+//            subAppid = userApp.getSubMchId();
+//        } else if (StringUtil.isNotEmpty(merchantBaseInfo.getSubMchId())) {
+//            subAppid = merchantBaseInfo.getSubMchId();
+//        }
+//        log.error("===subAppid===" + subAppid);
+//        String wechatCallback = ParametersUtil.wechatCallback + "/wap/merchant/wechatCallback";// 支付成功后的回调地址
+//        merchantWechatPayDTO.setAppid(APPID);
+//        merchantWechatPayDTO.setNotifyUrl(wechatCallback);
+//        merchantWechatPayDTO.setMchId(pid);
+//        merchantWechatPayDTO.setSubMchId(subAppid);
+//        log.error("===merchantWechatPayDTO HOU===" + JSONObject.toJSONString(merchantWechatPayDTO));
+//        PayUnitedResponse payUnitedResponse = wechantMerchantOrderCreate(merchantWechatPayDTO, request);
+//        WechatPayment wechatPayment = toPay(payUnitedResponse);
+//        result.put("data", wechatPayment);
+//        log.info("===result==" + JSONObject.toJSONString(result));
+//        return result;
+    }
+
+    public WechatPayment toPay(PayUnitedResponse payUnitedResponse) {
+        String appId = ParametersUtil.APPID;
+        String appSecret = ParametersUtil.APPSECRET;
+        String pKey = ParametersUtil.KEY;
+        WechatPayment wechatPayment = new WechatPayment();
+        String nonceStr = UUID.randomUUID().toString();
+        wechatPayment.setAppId(appId);
+        wechatPayment.setNonceStr(nonceStr);
+        String timeStamp = System.currentTimeMillis() + "";
+        String packageMsg = "prepay_id=" + payUnitedResponse.getPrepay_id();
+        wechatPayment.setPackageMsg(packageMsg);
+        String signType = "MD5";
+        String paySgin = paySign(pKey, packageMsg, appId, timeStamp, appSecret, nonceStr, signType).toUpperCase();
+        wechatPayment.setSignType(signType);
+        wechatPayment.setPaySgin(paySgin);
+        wechatPayment.setTimeStamp(timeStamp);
+        System.out.println("pkey-------" + pKey + "---   wechatPayment=" + JSONObject.toJSONString(wechatPayment));
+        return wechatPayment;
+    }
+
+    /**
+     * paySign:(获取Sign). <br/>
+     *
+     * @param paternerKey
+     * @param packageMsg
+     * @param appId
+     * @param timeStamp
+     * @param appkey
+     * @param nonceStr
+     * @param signType
+     * @return
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    private String paySign(String paternerKey, String packageMsg, String appId, String timeStamp, String appkey,
+                           String nonceStr, String signType) {
+        Map<String, String> param = new HashMap<String, String>();
+        param.put("appId", appId);
+        param.put("timeStamp", timeStamp);
+        param.put("nonceStr", nonceStr);
+        param.put("package", packageMsg);
+        param.put("signType", signType);
+        // 去除空串
+        Map<String, String> array = MicroPayCore.paraFilter(param);
+        String sign = MicroPayCore.buildMysign(array, paternerKey);// 排序
+        return sign;
+    }
+
+    /**
+     * wechantMerchantOrderCreate:(微信生成订单). <br/>
+     *
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    private PayUnitedResponse wechantMerchantOrderCreate(MerchantWechatPayDTO merchantWechatPayDTO,
+                                                         HttpServletRequest request) {
+        MerchantStore merchantInfo = merchantStoreService.getMerchantInfo(merchantWechatPayDTO.getMerchantCode(),
+                merchantWechatPayDTO.getStoreId());
+        String orderSn = "W" + StringUtil.getBillno();
+        MerchantOrder merchantOrder = new MerchantOrder();
+        merchantOrder.setOrderType("2");
+        merchantOrder.setUserImg(merchantWechatPayDTO.getUserImg());
+        merchantOrder.setNickName(merchantWechatPayDTO.getNickName());
+        merchantOrder.setConsumeFee(Double.valueOf(merchantWechatPayDTO.getComsumeMoney()));
+        merchantOrder.setMerchantCode(merchantWechatPayDTO.getMerchantCode());
+        merchantOrder.setStoreId(merchantWechatPayDTO.getStoreId());
+        merchantOrder.setOrderNumber(orderSn);
+        String storeId = merchantWechatPayDTO.getStoreId();
+        MerchantStore merchantStore = new MerchantStore();
+        merchantStore.setStoreId(storeId);
+        merchantStore = merchantStoreService.queryMerchantStore(merchantStore);
+        if (null != merchantStore) {
+            String storeName = merchantStore.getStoreName();
+            merchantOrder.setStaffName(storeName);
+        }
+        merchantOrder.setStaffCode(merchantWechatPayDTO.getStoreId());
+        if (StringUtil.isNotEmpty(merchantInfo.getMerchantName())) {
+            merchantOrder.setMerchantName(merchantInfo.getMerchantName());
+        }
+        merchantOrder.setPayTypeCode("wechatPay");
+        merchantOrder.setPayTypeName("微信");
+        Date date = new Date();
+        merchantOrder.setCreateDt(date);
+        merchantOrder.setUpdateTime(date);
+        merchantOrder.setStatus("5");
+        merchantOrderService.save(merchantOrder);
+        PayUnitedRequest payUnitedRequest = new PayUnitedRequest();
+        merchantWechatPayDTO.setIp(IpUtils.getIpAddr(request));
+        merchantWechatPayDTO.setOrderSn(orderSn);
+        String WX_PAY_KEY = ParametersUtil.KEY;
+        Map<String, String> result = payUnitedRequest.getMerchantMap(merchantWechatPayDTO, merchantOrder.getStoreName(),
+                WX_PAY_KEY);
+        String xml = result.get("xml");
+        System.out.println(xml);
+        String response = HttpUrlConnection.httpXML("https://api.mch.weixin.qq.com/pay/unifiedorder", xml);
+        System.out.println(response);
+        PayUnitedResponse payUnitedResponse = WeiXinUtil.xmlToPayUnitedResponse(response);
+        return payUnitedResponse;
+    }
+
+    /**
+     * wechatCallback:(微信回调地址). <br/>
+     *
+     * @return
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    @RequestMapping("/wechatCallback")
+    @ResponseBody
+    public Map<String, Object> wechatCallback() {
+        RealFansDTO realFansDTO = new RealFansDTO();
+        InputStream is = null;
+        try {
+            is = request.getInputStream();// 获取请求的流信息(这里是微信发的xml格式所有只能使用流来读)
+            String xml = XmlUtil.toUTF8(is);
+            log.info(xml);
+            Map<String, Object> notifyMap = XmlUtil.toMap(xml);// 将微信发的xml转map
+            log.info("===notifyMap====" + notifyMap);
+            if ("SUCCESS".equals(notifyMap.get("result_code"))) {
+                String ordersSn = (String) notifyMap.get("out_trade_no");// 商户订单号
+                String transaction_id = (String) notifyMap.get("transaction_id");
+                String amountpaid = (String) notifyMap.get("total_fee");// 实际支付的订单金额:单位 分
+                String openid = (String) notifyMap.get("openid");// 用户openid
+                String time_end = (String) notifyMap.get("time_end");// 支付完成时间
+                BigDecimal amountPay = (new BigDecimal(amountpaid).divide(new BigDecimal("100"))).setScale(2);// 将分转换成元-实际支付金额:元
+                // 消费金额
+                String amount = amountPay + "";
+                MerchantOrder merchantOrder = new MerchantOrder();
+                merchantOrder.setOrderNumber(ordersSn);
+                List<MerchantOrder> queryMerchantOrderList = merchantOrderService.list(new QueryWrapper<>(merchantOrder));
+                if (queryMerchantOrderList != null && queryMerchantOrderList.size() > 0) {
+                    merchantOrder = queryMerchantOrderList.get(0);
+                    if ("1".equals(merchantOrder.getStatus())) {
+                        response.getWriter().write("<xml><return_code><![CDATA[SUCCESS]]></return_code></xml>");
+                        return null;
+                    }
+                    Map<String, Object> map = new HashMap<>(16);
+                    realFansDTO.setConSumMoney(amount);
+                    realFansDTO.setConsumTime(time_end);
+                    realFansDTO.setLogo(merchantOrder.getUserImg());
+                    realFansDTO.setNickName(merchantOrder.getNickName());
+                    realFansDTO.setMerchantCode(merchantOrder.getMerchantCode());
+                    realFansDTO.setOrderNumber(ordersSn);
+                    realFansDTO.setTradeNumber(transaction_id);
+                    realFansDTO.setSoleId(openid);
+                    realFansDTO.setPayWay("1");
+                    merchantOrder.setTransNo(transaction_id);
+                    merchantOrder.setTransDt(new Date());
+                    merchantOrder.setStatus("1");
+                    merchantOrder.setMercUserId(openid);
+                    merchantOrder.setThirdTransNo(transaction_id);
+                    merchantOrderService.updateOrderAndCreateProfit(merchantOrder);
+                }
+            } else {
+                log.info("回调失败");
+            }
+            // 告诉微信服务器收到信息了，不要在调用回调action了========这里很重要回复微信服务器信息用流发送一个xml即可
+            response.getWriter().write("<xml><return_code><![CDATA[SUCCESS]]></return_code></xml>");
+            is.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * aliPay:(支付宝支付). <br/>
+     *
+     * @return
+     * @throws AlipayApiException
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    @PostMapping("/aliPay")
+    @ResponseBody
+    public Map<String, Object> aliPay(MerchantAliPayDTO merchantAliPayDTO) {
+        Map<String, Object> result = new HashMap<>(16);
+        merchantAliPayDTO = getAppAuthToken(merchantAliPayDTO);
+        MerchantStore merchantStore = merchantStoreService.getMerchantInfo(merchantAliPayDTO.getMerchantCode(),
+                merchantAliPayDTO.getStoreId());
+        merchantAliPayDTO = alipayMerchantOrderCreate(merchantAliPayDTO, merchantStore);
+        if (StringUtil.isEmpty(merchantAliPayDTO.getAliPayTransNo())) {
+            result.put("code", "0");
+            return result;
+        } else {
+            // 组装订单类
+            MerchantOrder merchantOrder = merchantAliPayDTO.getMerchantOrder();
+            merchantOrder.setMerchantName(merchantStore.getMerchantName());
+            merchantOrder.setStoreName(merchantStore.getStoreName());
+            merchantOrder.setStaffCode(merchantStore.getStoreId());
+            merchantOrder.setStaffName(merchantStore.getStoreId());
+            // end
+            merchantOrderService.save(merchantOrder);
+            result.put("code", "1");
+            result.put("transNo", merchantOrder.getThirdTransNo());
+        }
+        return result;
+    }
+
+    /**
+     * getappAuthToken:(根据userId查询数据库里的商户appAuthToken). <br/>
+     *
+     * @param merchantAliPayDTO
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    private MerchantAliPayDTO getAppAuthToken(MerchantAliPayDTO merchantAliPayDTO) {
+        UserApp userApp = new UserApp();
+        userApp.setUserId(Long.valueOf(merchantAliPayDTO.getUserAppId()));
+        userApp = userAppService.queryUserApp(userApp);
+//        merchantAliPayDTO.setAppAuthToken(userApp.getAppAuthToken());
+        return merchantAliPayDTO;
+    }
+
+    /**
+     * alipayMerchantOrderCreate:(支付宝创建订单). <br/>
+     *
+     * @throws AlipayApiException
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    private MerchantAliPayDTO alipayMerchantOrderCreate(MerchantAliPayDTO merchantAliPayDTO,
+                                                        MerchantStore merchantStore) {
+        String appId = ParametersUtil.ZY_ALI_APP_ID;
+        String pri = ParametersUtil.ZY_PRI;
+        String pub = ParametersUtil.ZY_PUB;
+        AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do", appId, pri, "json",
+                "GBK", pub, "RSA2");
+        AlipayTradeCreateRequest request = new AlipayTradeCreateRequest();
+        System.out.println(ParametersUtil.domain + "/wap/merchant/aliCallBack");
+        request.setNotifyUrl(ParametersUtil.domain + "/wap/merchant/aliCallBack");
+        request.putOtherTextParam("app_auth_token", merchantAliPayDTO.getAppAuthToken());
+        request.setBizContent("{" + "\"out_trade_no\":\"" + merchantAliPayDTO.getOrderNumber() + "\","
+                + "\"buyer_id\":\"" + merchantAliPayDTO.getUserid() + "\"," + "\"total_amount\":"
+                + merchantAliPayDTO.getComsumeMoney() + "," + "\"subject\":\"" + merchantStore.getStoreName() + "\","
+                + "\"body\":\"" + merchantStore.getStoreName() + "\"" + "}");
+        AlipayTradeCreateResponse response;
+        try {
+            response = alipayClient.execute(request);
+            if (response.isSuccess()) {
+                String aliPayTransNo = response.getTradeNo();
+                merchantAliPayDTO.setAliPayTransNo(aliPayTransNo);
+            }
+        } catch (AlipayApiException e) {
+            e.printStackTrace();
+        }
+        return merchantAliPayDTO;
+    }
+
+
+    /**
+     * getaliCallBack:(支付宝回调通知). <br/>
+     *
+     * @return
+     * @throws Exception
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    @RequestMapping("/aliCallBack")
+    @ResponseBody
+    public String getaliCallBack() throws Exception {
+        RealFansDTO realFansDTO = new RealFansDTO();
+        // 必须返回success才会停止通知，若不返回则继续通知 本地无法测试该回调 必须要在服务器上测试
+        log.debug("===========================================================" + request
+                + "============================================================================================================");
+        String code = null;
+        Map<String, Object> params = HttpUrlConnection.convertRequestParamsToMap(this.request);
+        log.info("===params====" + params);
+        String paramsJson = JSON.toJSONString(params);
+        log.info("zhifubaohuidiao，{}", paramsJson);
+        try {
+            // boolean signVerified =
+            // AlipaySignature.rsaCheckV1(params,systemConfigService.querySystemConfigValue("PUB"),"GBK","RSA2");
+            // log.info("==signVerified===" + signVerified);
+            // if (signVerified) {
+            String tradeStatus = (String) params.get("trade_status");
+            log.info("=====tradeStatus=====" + tradeStatus);
+            if ("TRADE_SUCCESS".equals(tradeStatus)) {
+                String buyer_id = (String) params.get("buyer_id");// 支付宝唯一识别用户码
+                String tradeNumber = (String) params.get("trade_no");
+                String orderNumber = (String) params.get("out_trade_no");// 商家订单号
+                MerchantOrder merchantOrder = new MerchantOrder();
+                merchantOrder.setOrderNumber(orderNumber);
+                ;// 支付宝订单号
+                merchantOrder = merchantOrderService.queryMerchantOrder(merchantOrder);
+                if ("1".equals(merchantOrder.getStatus())) {
+                    code = "success";
+                    return code;
+                }
+                String amountPay = (String) params.get("total_amount");// 拿到消费金额
+                String consumTime = (String) params.get("gmt_payment");// 交易付款时间
+                merchantOrder.setTransNo(tradeNumber);
+                merchantOrder.setTransDt(new Date());
+                merchantOrder.setStatus("1");
+                merchantOrder.setMercUserId(buyer_id);
+                merchantOrder.setThirdTransNo(tradeNumber);
+                merchantOrderService.updateOrderAndCreateProfit(merchantOrder);
+            }
+            code = "success";
+//			} else {
+//				log.info("支付宝回调签名认证失败，signVerified=false, paramsJson:{}", paramsJson);
+//				return "failure";
+//			}
+        } catch (Exception e) {
+            code = "failure";
+            e.printStackTrace();
+        }
+        return code;
+    }
+
+    /**
+     * toUpDateMerchantOrder:(修改订单状态[支付宝发起的] 有bug 必须在用户支付完成之后点右上角的完成才会触发 这里照样保留该方法
+     * 在上面的getaliCallBack()方法也会进行这个修改订单的处理). <br/>
+     *
+     * @param aliPayTransNo
+     * @return
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    @GetMapping("/toUpDateMerchantOrder")
+    public void toUpDateMerchantOrder(String aliPayTransNo) {
+        MerchantOrder merchantOrder = new MerchantOrder();
+        merchantOrder.setThirdTransNo(aliPayTransNo);
+        merchantOrder = merchantOrderService.queryMerchantOrder(merchantOrder);
+        merchantOrder.setStatus("1");
+        Date date = new Date();
+        merchantOrder.setUpdateTime(date);
+        merchantOrder.setCreateDt(date);
+        merchantOrderService.updateById(merchantOrder);
+    }
+
+    @GetMapping("/paySuccess")
+    public ModelAndView paySuccess() {
+        return new ModelAndView("merchant/paySuccess");
+    }
+
+    /**
+     * register:(分享注册). <br/>
+     *
+     * @return
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    @GetMapping("/register")
+    public ModelAndView register() {
+        ModelAndView modelAndView = new ModelAndView("merchant/share");
+        Map<String, String> result = new HashMap<>(16);
+        String inviteNum = request.getParameter("inviteNum");// 推广码
+        String phone = "";
+        String userName = "";
+        if (StringUtil.isNotEmpty(inviteNum)) {
+            UserApp appInfo = userAppService.queryUserAppByInviteNum(inviteNum);
+            if (appInfo != null) {
+                phone = appInfo.getPhone();
+                userName = appInfo.getUserName();
+            }
+        }
+        String enPhone = phone.replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2");// 中间隐藏4位数的号码
+        if (StringUtil.isNotEmpty(userName)) {
+            String reg = ".{1}";
+            StringBuffer sb = new StringBuffer();
+            Pattern p = Pattern.compile(reg);
+            Matcher m = p.matcher(userName);
+            int i = 0;
+            while (m.find()) {
+                i++;
+                if (i == 1) {
+                    continue;
+                }
+                m.appendReplacement(sb, "*");
+            }
+            m.appendTail(sb);
+            result.put("userName", sb.toString());
+        }
+        result.put("enPhone", enPhone);
+        result.put("inviteNum", inviteNum);
+        modelAndView.addAllObjects(result);
+        return modelAndView;
+    }
+
+
+    /**
+     * goRegister:(去注册). <br/>
+     *
+     * @return
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    @NoRepeatSubmit
+    @PostMapping("/goRegister")
+    @Transactional(rollbackFor = Exception.class)
+    @ResponseBody
+    public Result<?> goRegister(String inviteNum, String phoneverify, String phone, String password) {
+        if (StringUtil.isEmpty(inviteNum)) {
+            return ResultGenerator.genFailResult("推荐人不能为空");
+        }
+        UserApp condition = new UserApp().setInviteNum(inviteNum);
+        UserApp appInfo = userAppService.getOne(new QueryWrapper<>(condition));
+        if (appInfo == null) {
+            return ResultGenerator.genFailResult("推荐人不存在！");
+        }
+
+        UserApp parentInfo;
+        if ("agent_staff".equals(appInfo.getUserType())) {
+            QueryWrapper<UserApp> queryWrapper = new QueryWrapper<UserApp>().eq("userId", appInfo.getParentId());
+            parentInfo = userAppService.getOne(queryWrapper);
+        } else {
+            parentInfo = appInfo;
+        }
+
+        if (!Objects.equals(parentInfo.getStatus(), 3) || !Objects.equals(parentInfo.getBankStatus(), 3)) {
+            throw new MsgException("邀请码无效，当前推广服务商未完成实名");
+        }
+
+        UserInfo ui = userInfoService.getById(parentInfo.getUserId());
+        if (Objects.equals(ui.getStatus(), UserInfo.STATUS_NO_SPREAD)) {
+            throw new MsgException("当前推广服务商存在违规行为, 已被关闭推广权限, 请联系收银呗客服申诉");
+        }
+
+        if (!"1".equals(parentInfo.getSpreadFlag())) {
+            throw new MsgException("该服务商已注册多个账户，该推广码无效");
+        }
+
+        UserInfo queryUserInfo = new UserInfo().setLoginName(phone);
+        List<UserInfo> existUserInfoList = userInfoMapper.queryUserInfoList(queryUserInfo);
+        if (existUserInfoList != null && !existUserInfoList.isEmpty()) {
+            return ResultGenerator.genFailResult("当前手机号已被注册！");
+        }
+        PhoneValidateCode phoneValidateCode = new PhoneValidateCode();
+        phoneValidateCode.setCode(phoneverify);
+        List<PhoneValidateCode> queryPhoneValidateCodeList = phoneValidateCodeService
+                .queryPhoneValidateCodeList(phoneValidateCode);
+        if (queryPhoneValidateCodeList != null && queryPhoneValidateCodeList.size() > 0) {
+            phoneValidateCode = queryPhoneValidateCodeList.get(0);
+            if (phoneverify.equals(phoneValidateCode.getCode())) {
+                password = MD5Util.MD5Encode(password);
+                UserInfo userInfo = new UserInfo();
+                userInfo.setLoginName(phone);
+                userInfo.setTrueName(phone);
+                userInfo.setPhone(phone);
+                userInfo.setPassword(password);
+                userInfo.setCreateTime(new Date());
+                userInfoService.saveUserInfo(userInfo);
+                UserApp userApp = new UserApp();
+                userApp.setUserId(userInfo.getId());
+
+                //判断推广员是否是业务员
+                if ("agent_staff".equals(appInfo.getUserType())) {
+                    userApp.setAgentStaffId(appInfo.getUserId());
+                }
+
+                userApp.setParentId(parentInfo.getUserId());
+                UserApp.setSort(parentInfo, userApp);
+                UserApp.setRoleInfo(parentInfo, userApp,null);
+
+                userApp.setUserName(phone);
+                userApp.setUserType("promoter");
+                userApp.setLevel(1);
+                userApp.setStatus(0);
+
+                userApp.setCreateDt(new Date());
+                userApp.setInviteNum(StringUtil.genRandomNum(5));
+                userAppService.save(userApp);
+                ipRecordService.saveRegIp(userInfo.getId() + "", userInfo.getId() + "");
+                PhoneValidateCode phoneValidate = new PhoneValidateCode();
+                if (StringUtil.isNotEmpty(phone)) {
+                    phoneValidate.setPhone(phone);
+                    phoneValidateCodeService.deletePhoneValidateCode(phoneValidate);
+                }
+                // TODO 同步用户到积分商城系统这边
+                jfShopHandler.syncJfShopUser(userApp,userInfo);
+                return ResultGenerator.genSuccessResult("注册成功!", null);
+            }
+        }
+        return ResultGenerator.genFailResult("验证码输入有误!");
+    }
+
+    /**
+     * registerSuccess:(分享注册成功). <br/>
+     *
+     * @return
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    @GetMapping("/registerSuccess")
+    public ModelAndView registerSuccess() {
+        ModelAndView modelAndView = new ModelAndView("merchant/registerSuccess");
+        return modelAndView;
+    }
+
+    /**
+     * 统一支付下单接口<br/>
+     *
+     * @return
+     * @throws Exception
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    @PostMapping("/tradePay")
+    @ResponseBody
+    public Result<Map<String, Object>> tradePay(@RequestParam Map<String, Object> params, HttpServletRequest request) {
+
+        try {
+            params.put("ip", IpUtils.getIpAddr(request));
+            return merchantService.tradePay(params);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResultGenerator.genFailResult(e.getMessage());
+        }
+    }
+
+    /**
+     * 取消支付播报
+     *
+     * @param orderNumber
+     * @return
+     */
+    @GetMapping("/cancelPay/{orderNumber}")
+    @ResponseBody
+    public Result cancelPay(@PathVariable("orderNumber") String orderNumber) {
+        try {
+            if (StringUtil.isEmpty(orderNumber)) {
+                return ResultGenerator.genFailResult("缺失参数", null);
+            }
+            QueryWrapper<MerchantOrder> orderWrapper = new QueryWrapper<MerchantOrder>().eq("orderNumber", orderNumber);
+            MerchantOrder order = merchantOrderService.getOne(orderWrapper);
+            if (order == null) {
+                return ResultGenerator.genFailResult("订单号异常", null);
+            }
+            QueryWrapper<MerchantBaseInfo> queryWrapper = new QueryWrapper<MerchantBaseInfo>().eq("merchantCode", order.getMerchantCode());
+            List<MerchantBaseInfo> list = merchantBaseInfoService.list(queryWrapper);
+            if (!list.isEmpty()) {
+                JSONObject params = new JSONObject();
+                params.put("mercId", list.get(0).getId());
+                params.put("order", order);
+                params.put("userId", list.get(0).getUserId());
+                notifyMessageService.sendCancelPayMessage(params);
+                return ResultGenerator.genSuccessResult("请求成功", null);
+            }
+            return ResultGenerator.genFailResult("商户数据不存在", null);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResultGenerator.genFailResult(e.getMessage());
+        }
+    }
+
+    /**
+     * jumpUrl:(支付完成后的跳转地址). <br/>
+     *
+     * @param orderNumber
+     * @param
+     * @return
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    @RequestMapping("/jumpUrl")
+    public ModelAndView jumpUrl(String orderNumber) {
+        log.info("====订单号====" + orderNumber);
+        ModelAndView modelAndView = new ModelAndView();
+        modelAndView.setViewName("merchant/errorInfo2");
+        if (StringUtil.isEmpty(orderNumber)) {
+            modelAndView.addObject("error", "参数不能为空");
+            return modelAndView;
+        }
+        QueryWrapper<MerchantOrder> queryWrapper = new QueryWrapper<MerchantOrder>().eq("orderNumber", orderNumber);
+        List<MerchantOrder> listOrder = merchantOrderService.list(queryWrapper);
+        if (listOrder.isEmpty()) {
+            modelAndView.addObject("error", "参数有误");
+            return modelAndView;
+        }
+        MerchantOrder order = listOrder.get(0);
+        String status = order.getStatus();
+        if ("1".equals(status)) {
+            modelAndView.setViewName("merchant/paySuccess");
+        } else if ("5".equals(status)) {
+            try {
+                merchantOrderService.suppleOrder(order.getId().intValue());
+                modelAndView.setViewName("merchant/paySuccess");
+            } catch (RuntimeException e) {
+                e.printStackTrace();
+                modelAndView.setViewName("merchant/payFail");
+            }
+        } else {
+            modelAndView.setViewName("merchant/payFail");
+        }
+        return modelAndView;
+    }
+
+    /**
+     * leshuaCallBack:(乐刷支付回调地址). <br/>
+     *
+     * @return
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    @RequestMapping("/leshuaCallBack")
+    @ResponseBody
+    public String leshuaCallBack(HttpServletRequest request) {
+        log.info("=========================jinruleshua huidiao =====================");
+        String respString = "";
+        InputStream is = null;
+        Map<String, Object> notifyMap = null;
+        try {
+            RealFansDTO realFansDTO = new RealFansDTO();
+            is = request.getInputStream();
+            String xml = XmlUtil.toUTF8(is);
+            log.info("=========fanhui     canshu=============" + xml);
+            notifyMap = XmlUtil.toMapLeshua(xml);
+            log.info("==================fanhuicanshu    Map   jihe=====" + notifyMap + "");
+            if (notifyMap.containsKey("sign")) {
+                if (!LeshuaSignature.checkIsSignValidFromResponseString(xml, LeshuaSignature.resExcludedSignParams(), "75C27ABB12F78A747DCB4368EEBCB542")) {
+                    log.info("============================qianming butongguo======================");
+                    respString = "error";
+                } else {
+                    String status = (String) notifyMap.get("status");
+                    if ("2".equals(status)) {
+                        // 此处可以再添加相关处理业务，校验通知参数中的商户订单号third_order_id和金额amount是否和商户业务系统的单号和金额是否一致，一致后方可更新数据可表中的数据
+                        log.info("============huidiao SUCCESS============");
+                        respString = "000000";
+                        // 乐刷商户id
+                        // String merchant_id = (String) notifyMap.get("merchant_id");
+                        String ordersSn = (String) notifyMap.get("third_order_id");// 商户订单号
+                        String amountpaid = (String) notifyMap.get("amount");// 订单金额
+                        String pay_way = (String) notifyMap.get("pay_way");// 支付类型
+                        String openid = (String) notifyMap.get("openid");// 微信openid
+                        String sub_openid = (String) notifyMap.get("sub_openid");//支付宝
+                        String transaction_id = (String) notifyMap.get("out_transaction_id");
+                        String leshua_order_id = (String) notifyMap.get("leshua_order_id");
+                        String pay_time = (String) notifyMap.get("pay_time");
+                        BigDecimal amountPay = (new BigDecimal(amountpaid).divide(new BigDecimal("100"))).setScale(2);// 将分转换成元-实际支付金额:元
+                        String amount = amountPay + "";// 消费金额
+                        MerchantOrder merchantOrder = new MerchantOrder();
+                        merchantOrder.setOrderNumber(ordersSn);
+                        List<MerchantOrder> queryMerchantOrderList = merchantOrderService.list(new QueryWrapper<>(merchantOrder));
+                        if (StringUtil.isNotEmpty(ordersSn) && queryMerchantOrderList != null && queryMerchantOrderList.size() > 0) {
+                            merchantOrder = queryMerchantOrderList.get(0);
+                            if ("1".equals(merchantOrder.getStatus())) {
+                                respString = "000000";
+                                return null;
+                            }
+                            Map<String, Object> map = new HashMap<>(16);
+                            realFansDTO.setConSumMoney(amount);
+                            realFansDTO.setConsumTime(pay_time);
+                            realFansDTO.setLogo(merchantOrder.getUserImg());
+                            realFansDTO.setNickName(merchantOrder.getNickName());
+                            realFansDTO.setMerchantCode(merchantOrder.getMerchantCode());
+                            realFansDTO.setOrderNumber(ordersSn);
+                            realFansDTO.setTradeNumber(leshua_order_id);
+                            String userId = "";
+                            if ("ZFBZF".equals(pay_way)) {
+                                userId = sub_openid;
+                            } else if ("WXZF".equals(pay_way)) {
+                                userId = openid;
+                            }
+                            map.put("realFansDTO", realFansDTO);
+                            log.info("=============realFansDTO================" + JSONObject.toJSONString(realFansDTO));
+                            merchantOrder.setTransNo(leshua_order_id);
+                            merchantOrder.setTransDt(new Date());
+                            merchantOrder.setStatus("1");
+                            merchantOrder.setMercUserId(userId);
+//                            merchantOrderService.updateOrderAndCreateProfit(merchantOrder,leshua_order_id);
+
+                        }
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return respString;
+    }
+
+
+    public static Set<String> resExcludedSignParams() {
+        Set<String> exludedSignParams = new HashSet<>(2);
+        exludedSignParams.add("sign");
+        exludedSignParams.add("error_code");
+        return exludedSignParams;
+    }
+
+    @PostMapping(value = "/posCallBack")
+    public String posCallBack(HttpServletRequest request) {
+//        InputStream is = null;
+//        Map<String, Object> notifyMap = null;
+//        String respString = "";
+//        try {
+//            is = request.getInputStream();
+//            String xml = XmlUtil.toUTF8(is);
+//            log.info("=========pos=========== fanhui     canshu=============" + xml);
+//            notifyMap = XmlUtil.toMapLeshua(xml);
+//            if (notifyMap.containsKey("sign")) {
+//                if (!LeshuaSignature.checkIsSignValidFromResponseString(xml, resExcludedSignParams(), "75C27ABB12F78A747DCB4368EEBCB542")) {
+//                    log.info("============================qianming butongguo======================");
+//                    respString = "error";
+//                } else {
+//                    respString = "000000";
+//                    String merchant_id = (String) notifyMap.get("merchant_id");//商户号
+//                    log.debug("=========merchant_id===============" + merchant_id);
+//                    String leshua_order_id = (String) notifyMap.get("leshua_order_id");//乐刷订单号
+//                    log.debug("=========leshua_order_id===============" + leshua_order_id);
+//                    String third_order_id = (String) notifyMap.get("third_order_id");//商户订单号
+//                    String flow_id = (String) notifyMap.get("flow_id");//凭证号
+//                    log.debug("=========third_order_id===============" + third_order_id);
+//                    String refund_amount = (String) notifyMap.get("refund_amount");//退款金额
+//                    log.debug("=========refund_amount===============" + refund_amount);
+//                    String status = (String) notifyMap.get("status");//订单状态
+//                    log.debug("=========status===============" + status);
+//                    String pay_time = (String) notifyMap.get("pay_time");//交易时间
+//                    log.debug("=========pay_time===============" + pay_time);
+//                    String refund_time = (String) notifyMap.get("refund_time");//退款时间
+//                    log.debug("=========refund_time===============" + refund_time);
+//                    String failure_reason = (String) notifyMap.get("failure_reason");//失败原因
+//                    log.debug("=========failure_reason===============" + failure_reason);
+//                    String leshua_refund_id = (String) notifyMap.get("leshua_refund_id");//失败原因
+//                    String pay_way = (String) notifyMap.get("pay_way");//支付类型
+//
+//                    UserApp userApp = new UserApp();
+//                    userApp.setLeshuaMchId(merchant_id);
+//                    List<UserApp> queryUserAppList = userAppService.queryUserAppList(userApp);
+//                    log.error("========queryUserAppList============" + JSONObject.toJSONString(queryUserAppList));
+//                    if (queryUserAppList != null && queryUserAppList.size() > 0) {
+//                        userApp = queryUserAppList.get(0);
+//                        String merchantCode = userApp.getMerchantCode();//商家Code;
+//                        MerchantBaseInfo merchantBaseInfo = new MerchantBaseInfo();
+//                        merchantBaseInfo.setMerchantCode(merchantCode);
+//                        List<MerchantBaseInfo> queryMerchantBaseInfoList = merchantBaseInfoService.queryMerchantBaseInfoList(merchantBaseInfo);
+//                        if (queryMerchantBaseInfoList != null && queryMerchantBaseInfoList.size() > 0) {
+//                            merchantBaseInfo = queryMerchantBaseInfoList.get(0);
+//                            String merchantName = merchantBaseInfo.getMerchantName();
+//                            String alias = merchantBaseInfo.getAlias();
+//                            if (StringUtil.isEmpty(merchantName)) {
+//                                merchantName = alias;
+//                            }
+//                            MerchantOrder merchantOrder = new MerchantOrder();
+//                            merchantOrder.setLeshuaTransNo(leshua_order_id);
+//                            List<MerchantOrder> queryMerchantOrderList = merchantOrderService.list(new QueryWrapper<>(merchantOrder));
+//                            if (queryMerchantOrderList != null && queryMerchantOrderList.size() > 0) {
+//                                merchantOrder = queryMerchantOrderList.get(0);
+//                                log.info("===========merchantOrder==============" + JSONObject.toJSONString(merchantOrder));
+//                                Double consumeFee = merchantOrder.getConsumeFee();
+//                                if ("5".equals(merchantOrder.getStatus())) {//待付款
+//                                    merchantOrder.setStatus("1");
+//                                    String userId = merchantBaseInfo.getUserId();
+//                                    if (StringUtil.isNotEmpty(userId)) {
+//                                        String amountpaid = (String) notifyMap.get("amount");//订单金额
+//                                        BigDecimal amountPay = (new BigDecimal(amountpaid).divide(new BigDecimal("100"))).setScale(2);// 将分转换成元-实际支付金额:元
+//                                        Double amount = Double.valueOf(amountPay + "");
+//                                        log.debug("=================ji guang tuisong===========================================");
+//                                        List<String> aliass = userAppService.storeMemberList(merchantCode);
+//                                        log.info("=========推送人userId======" + JSON.toJSONString(aliass) + "=========金额=======" + amount);
+//                                        aliass.add(userId);
+//
+//                                        GeneralPushUtil.sendAllPlatByAlias(aliass, "收银呗到账通知", "收银呗到账" + amount + "元", "3");
+//                                        log.debug("===============================收银呗到账" + amount + "元");
+//                                    }
+//                                    SimpleDateFormat sFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//                                    merchantOrder.setTransDt(sFormat.parse(pay_time));
+//                                    merchantOrder.setLeshuaMerchantRefundId(leshua_refund_id);
+//                                    merchantOrder.setLeshuaTransNo(leshua_order_id);
+//                                    log.info("===========merchantOrder==============" + JSONObject.toJSONString(merchantOrder));
+//                                    merchantOrderService.updateById(merchantOrder);
+//                                } else if ("1".equals(merchantOrder.getStatus())) {//付款成功
+//                                    if (StringUtil.isNotEmpty(refund_amount)) {
+//                                        Double refund = Double.valueOf(refund_amount) * 100;
+//                                        if ("11".equals(status) || "32".equals(status)) {
+//                                            if (consumeFee > refund) {
+//                                                merchantOrder.setStatus("6");
+//                                            } else {
+//                                                merchantOrder.setStatus("2");
+//                                            }
+//                                        }
+//                                    }
+//                                    SimpleDateFormat sFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//                                    merchantOrder.setTransDt(sFormat.parse(pay_time));
+//                                    merchantOrder.setLeshuaMerchantRefundId(leshua_refund_id);
+//                                    merchantOrder.setLeshuaTransNo(leshua_order_id);
+//                                    log.info("===========merchantOrder==============" + JSONObject.toJSONString(merchantOrder));
+//                                    merchantOrderService.updateById(merchantOrder);
+//                                }
+//                            } else {
+//                                SimpleDateFormat sFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//                                merchantOrder.setTransDt(sFormat.parse(pay_time));
+//                                String amountpaid = (String) notifyMap.get("amount");//订单金额
+//                                log.debug("=========amountpaid===============" + amountpaid);
+//                                BigDecimal amountPay = (new BigDecimal(amountpaid).divide(new BigDecimal("100"))).setScale(2);// 将分转换成元-实际支付金额:元
+//                                Double amount = Double.valueOf(amountPay + "");// 消费金额
+//                                log.debug("=========amount===============" + amount);
+//                                merchantOrder.setConsumeFee(amount);
+//                                merchantOrder.setMerchantCode(merchantCode);
+//                                merchantOrder.setMerchantName(merchantName);
+//
+//                                Date date = new Date();
+//                                merchantOrder.setCreateDt(date);
+//                                merchantOrder.setUpdateTime(date);
+//                                merchantOrder.setStoreId(merchantCode);
+//                                merchantOrder.setStoreName(merchantName);
+//                                merchantOrder.setStaffCode(merchantCode);
+//                                merchantOrder.setStaffName(merchantName);
+//
+//                                Double rate = 0.0038d;
+//                                List<MerchantRate> myRateList = merchantRateMapper.selectList(new QueryWrapper<MerchantRate>().eq("userId", userApp.getUserId()));
+//                                if(!myRateList.isEmpty()){
+//                                    rate = new BigDecimal(myRateList.get(0).getCurrentRate()).divide(new BigDecimal(10000)).doubleValue();
+//                                }
+//                                //rate = merchantOrderService.getCurrentFee(userApp, "current", rate, userApp.getUserId());
+//
+//                                merchantOrder.setEnterFee(StringUtil.bigDecimal(amount - amount * rate));
+//                                merchantOrder.setOrderType("1");
+//                                merchantOrder.setAisleSwitch("1");
+//                                if ("2".equals(status)) {
+//                                    if ("WXZF".equals(pay_way)) {
+//                                        merchantOrder.setPayTypeCode("leshuaPay1");
+//                                        merchantOrder.setPayTypeName("乐刷微信支付");
+//                                    } else if ("ZFBZF".equals(pay_way)) {
+//                                        merchantOrder.setPayTypeCode("leshuaPay0");
+//                                        merchantOrder.setPayTypeName("乐刷支付宝支付");
+//                                    }
+//                                    merchantOrder.setOrderNumber(third_order_id);
+//                                } else if ("30".equals(status)) {
+//                                    merchantOrder.setOrderNumber(flow_id);
+//                                    merchantOrder.setPayTypeCode("leshuaPay2");
+//                                    merchantOrder.setPayTypeName("乐刷刷卡支付");
+//                                    merchantOrder.setIsPos("isPos");
+//                                }
+//                                if ("2".equals(status) || "30".equals(status)) {
+//                                    merchantOrder.setStatus("1");
+//                                } else if ("8".equals(status)) {
+//                                    merchantOrder.setStatus("0");
+//                                }
+//                                merchantOrder.setOrderType("4");
+////                                merchantOrder.setRate(new BigDecimal(String.valueOf(rate)).multiply(new BigDecimal(10000)).intValue());
+//                                merchantOrderService.save(merchantOrder);
+//                                String userId = merchantBaseInfo.getUserId();
+//                                if (StringUtil.isNotEmpty(userId)) {
+//                                    log.debug("=================ji guang tuisong===========================================");
+//                                    List<String> aliass = userAppService.storeMemberList(merchantCode);
+//
+//                                    GeneralPushUtil.sendAllPlatByAlias(aliass, "收银呗到账通知", "收银呗到账" + amount + "元", "3");
+//                                    log.debug("===============================收银呗到账" + amount + "元");
+//                                }
+//                            }
+//                        }
+//                    }
+//                }
+//            }
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+        return null;
+    }
+
+
+    @PostMapping(value = "/appScanPayLeshuaCallBack")
+    public String appLeshuaCallBack(HttpServletRequest request) {
+        InputStream is = null;
+        Map<String, Object> notifyMap = null;
+        String respString = "";
+        try {
+            is = request.getInputStream();
+            String xml = XmlUtil.toUTF8(is);
+            log.info("=========appScanPayLeshuaCallBack=========== fanhui     canshu=============" + xml);
+            notifyMap = XmlUtil.toMapLeshua(xml);
+            if (notifyMap.containsKey("sign")) {
+                if (!LeshuaSignature.checkIsSignValidFromResponseString(xml, resExcludedSignParams(), "75C27ABB12F78A747DCB4368EEBCB542")) {
+                    log.info("============================qianming butongguo======================");
+                    respString = "error";
+                } else {
+                    respString = "000000";
+                    String merchant_id = (String) notifyMap.get("merchant_id");//商户号
+                    log.debug("=========merchant_id===============" + merchant_id);
+                    String leshua_order_id = (String) notifyMap.get("leshua_order_id");//乐刷订单号
+                    log.debug("=========leshua_order_id===============" + leshua_order_id);
+                    String third_order_id = (String) notifyMap.get("third_order_id");//商户订单号
+                    log.debug("=========third_order_id===============" + third_order_id);
+                    String refund_amount = (String) notifyMap.get("refund_amount");//退款金额
+                    log.debug("=========refund_amount===============" + refund_amount);
+                    String status = (String) notifyMap.get("status");//订单状态
+                    log.debug("=========status===============" + status);
+                    String pay_time = (String) notifyMap.get("pay_time");//交易时间
+                    log.debug("=========pay_time===============" + pay_time);
+                    String refund_time = (String) notifyMap.get("refund_time");//退款时间
+                    log.debug("=========refund_time===============" + refund_time);
+                    String failure_reason = (String) notifyMap.get("failure_reason");//失败原因
+                    log.debug("=========failure_reason===============" + failure_reason);
+                    String leshua_refund_id = (String) notifyMap.get("leshua_refund_id");//失败原因
+                    String pay_way = (String) notifyMap.get("pay_way");//支付类型
+                    MerchantOrder merchantOrder = new MerchantOrder();
+                    merchantOrder.setOrderNumber(third_order_id);
+                    List<MerchantOrder> queryMerchantOrderList = merchantOrderService.list(new QueryWrapper<>(merchantOrder));
+                    if (queryMerchantOrderList != null && queryMerchantOrderList.size() > 0) {
+                        merchantOrder = queryMerchantOrderList.get(0);
+                        if ("5".equals(merchantOrder.getStatus())) {
+                            merchantOrder.setThirdTransNo(leshua_order_id);
+                            SimpleDateFormat sFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                            merchantOrder.setTransDt(sFormat.parse(pay_time));
+                            merchantOrder.setStatus("1");
+                            merchantOrderService.updateById(merchantOrder);
+                        }
+                        respString = "000000";
+                        System.out.println("======支付成功========" + respString);
+                        return respString;
+                    }
+                }
+            }
+        } catch (Exception e) {
+//			respString = "error";
+
+            e.printStackTrace();
+            respString = "error";
+            return respString;
+        }
+
+        respString = "000000";
+        return respString;
+    }
+
+    @PostMapping(value = "/rechargeCallBack")
+    public String rechargeCallBack(HttpServletRequest request) {
+        InputStream is = null;
+        Map<String, Object> notifyMap = null;
+        String respString = "";
+        try {
+            is = request.getInputStream();
+            String xml = XmlUtil.toUTF8(is);
+            log.info("=========rechargeCallBack=========== fanhui     canshu=============" + xml);
+            notifyMap = XmlUtil.toMapLeshua(xml);
+            if (notifyMap.containsKey("sign")) {
+                if (!LeshuaSignature.checkIsSignValidFromResponseString(xml, resExcludedSignParams(), "75C27ABB12F78A747DCB4368EEBCB542")) {
+                    log.info("============================qianming butongguo======================");
+                    respString = "error";
+                } else {
+                    respString = "000000";
+                    String merchant_id = (String) notifyMap.get("merchant_id");//商户号
+                    log.debug("=========merchant_id===============" + merchant_id);
+                    String leshua_order_id = (String) notifyMap.get("leshua_order_id");//乐刷订单号
+                    log.debug("=========leshua_order_id===============" + leshua_order_id);
+                    String third_order_id = (String) notifyMap.get("third_order_id");//商户订单号
+                    log.debug("=========third_order_id===============" + third_order_id);
+                    String refund_amount = (String) notifyMap.get("refund_amount");//退款金额
+                    log.debug("=========refund_amount===============" + refund_amount);
+                    String status = (String) notifyMap.get("status");//订单状态
+                    log.debug("=========status===============" + status);
+                    String pay_time = (String) notifyMap.get("pay_time");//交易时间
+                    log.debug("=========pay_time===============" + pay_time);
+                    String refund_time = (String) notifyMap.get("refund_time");//退款时间
+                    log.debug("=========refund_time===============" + refund_time);
+                    String failure_reason = (String) notifyMap.get("failure_reason");//失败原因
+                    log.debug("=========failure_reason===============" + failure_reason);
+                    String leshua_refund_id = (String) notifyMap.get("leshua_refund_id");//失败原因
+                    String pay_way = (String) notifyMap.get("pay_way");//支付类型
+                    MerchantOrder merchantOrder = new MerchantOrder();
+                    merchantOrder.setOrderNumber(third_order_id);
+                    List<MerchantOrder> queryMerchantOrderList = merchantOrderService.list(new QueryWrapper<>(merchantOrder));
+                    if (queryMerchantOrderList != null && queryMerchantOrderList.size() > 0) {
+                        merchantOrder = queryMerchantOrderList.get(0);
+                        if ("1".equals(merchantOrder.getStatus())) {
+                            respString = "000000";
+                            return respString;
+                        }
+                        merchantOrder.setThirdTransNo(leshua_order_id);
+                        SimpleDateFormat sFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                        merchantOrder.setTransDt(sFormat.parse(pay_time));
+                        merchantOrder.setStatus("1");
+                        merchantOrderService.updateById(merchantOrder);
+                    }
+                }
+            }
+        } catch (Exception e) {
+            respString = "error";
+            e.printStackTrace();
+            respString = "error";
+            return respString;
+        }
+
+        respString = "000000";
+        return respString;
+    }
+
+    /**
+     * goMemberPay:(去充值页面). <br/>
+     *
+     * @param
+     * @param merchantCode
+     * @param storeId
+     * @return
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    @GetMapping(value = "/goMemberPay")
+    public ModelAndView goMemberPay(String openid, String merchantCode, String storeId) {
+        ModelAndView modelAndView = new ModelAndView("/merchant/goMemberPay");
+        Map<String, Object> result = new HashMap<String, Object>(16);
+        MerchantMenber merchantMenber = new MerchantMenber();
+        merchantMenber.setStoreId(storeId);
+        merchantMenber.setMerchantCode(merchantCode);
+        merchantMenber.setOpenid(openid);
+        List<MerchantMenber> queryMerchantMenberList = merchantMenberService.queryMerchantMenberList(merchantMenber);
+        if (queryMerchantMenberList != null && queryMerchantMenberList.size() > 0) {
+            merchantMenber = queryMerchantMenberList.get(0);
+            result.put("merchantMenber", merchantMenber);
+        }
+        getMerchantStoreActity(result, merchantMenber);
+        modelAndView.addAllObjects(result);
+        return modelAndView;
+    }
+
+
+    /**
+     * getMerchantStoreActity:(获取门店活动). <br/>
+     *
+     * @param result
+     * @param merchantMenber
+     * @return
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    public Map<String, Object> getMerchantStoreActity(Map<String, Object> result, MerchantMenber merchantMenber) {
+        if (StringUtil.isNotEmpty(merchantMenber.getStoreId())) {
+            ActivityActivate activityActivate = new ActivityActivate();// storeId 并获得门店的活动
+            activityActivate.setStoreId(merchantMenber.getStoreId());
+            List<ActivityActivate> activityActivateList = activityActivateService.queryActivityActivateList(activityActivate);// 激活送活动信息
+            ActivityConsumReturn activityConsumReturn = new ActivityConsumReturn();
+            activityConsumReturn.setStoreId(merchantMenber.getStoreId());
+            List<ActivityConsumReturn> activityConsumReturnList = activityConsumReturnService
+                    .queryActivityConsumReturnList(activityConsumReturn);// 消费返活动信息
+            ActivityRecharge activityRecharge = new ActivityRecharge();
+            activityRecharge.setStoreId(merchantMenber.getStoreId());
+            List<ActivityRecharge> activityRechargeList = activityRechargeService.queryActivityRechargeList(activityRecharge);// 充值活动信息
+            result.put("merchantMenber", merchantMenber);
+            result.put("activityActivateList", activityActivateList);
+            result.put("activityConsumReturnList", activityConsumReturnList);
+            result.put("activityRechargeList", activityRechargeList);
+        }
+        return result;
+    }
+
+
+    /**
+     * memberPay:(会员充值). <br/>
+     *
+     * @param merchantCode
+     * @param storeId
+     * @param consumeMoney
+     * @return
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    @PostMapping(value = "/memberPay")
+    @ResponseBody
+    public Map<String, Object> memberPay(String merchantCode, String storeId, String openId, String consumeMoney) {
+//        MerchantMenber merchantMenber = new MerchantMenber();
+//        merchantMenber.setMerchantCode(merchantCode);
+//        merchantMenber.setStoreId(storeId);
+//        merchantMenber.setOpenid(openId);
+//        merchantMenber = merchantMenberService.queryMerchantMenber(merchantMenber);// 当前会员信息
+//        String orderNumber = "CZ700" + StringUtil.getBillno();
+//        MerchantBaseInfo merchantBaseInfo = new MerchantBaseInfo();
+//        merchantBaseInfo.setMerchantCode(merchantCode);
+//        merchantBaseInfo = merchantBaseInfoService.queryMerchantBaseInfo(merchantBaseInfo);
+//        String userId = merchantBaseInfo.getUserId();
+//        MemberOrder memberOrder = new MemberOrder();
+//        memberOrder.setOrderFee(consumeMoney);
+//        memberOrder.setMemberCode(merchantMenber.getMemberCode());
+//        memberOrder.setMerchantCode(merchantMenber.getMerchantCode());
+//        memberOrder.setMerchantName(merchantMenber.getMerchantName());
+//        memberOrder.setStoreId(merchantMenber.getStoreId());
+//        memberOrder.setStoreName(merchantMenber.getStoreName());
+//        memberOrder.setCreateDt(new Date());
+//        memberOrder.setNickName(merchantMenber.getNickName());
+//        memberOrder.setOrderStatus("0");
+//        memberOrder.setOrderType("1");
+//        memberOrder.setRechargeType("0");
+//        memberOrder.setOrderNumber(orderNumber);
+//        log.info("=======wechatPay:fangfa" + JSONObject.toJSONString(memberOrder) + "");
+//        memberOrderService.saveMemberOrder(memberOrder);
+//        Map<String, String> reqMap = new HashMap<>(16);
+//        reqMap.put("service", "get_tdcode");
+//        reqMap.put("pay_way", "WXZF");
+//        reqMap.put("amount", Double.parseDouble(consumeMoney) * 100 + "");
+//        UserApp userApp = new UserApp();
+//        userApp.setUserId(Long.valueOf(userId));
+//        userApp = userAppService.queryUserApp(userApp);
+//        reqMap.put("merchant_id", userApp.getLeshuaMchId());
+//        reqMap.put("third_order_id", orderNumber);
+//        reqMap.put("jspay_flag", "2");
+//        Map<String, Object> mapLeshua = new HashMap<String, Object>(16);
+//        try {
+//            reqMap.put("notify_url", URLEncoder.encode(ParametersUtil.domain + "/wap/merchant/memberPayBack", "utf-8"));
+//            reqMap.put("jump_url", URLEncoder.encode(ParametersUtil.domain + "/wap/merchant/jpUrl?leshuaMchId=" + userApp.getLeshuaMchId() + "&orderNumber=" + orderNumber, "utf-8"));
+//            reqMap.put("client_ip", IpUtils.getIpAddr(request));
+//            MerchantStore merchantInfo = merchantStoreService.getMerchantInfo(merchantCode, storeId);
+//            if (StringUtil.isNotEmpty(merchantInfo.getStoreName())) {
+//                reqMap.put("body", merchantInfo.getStoreName());
+//            } else if (StringUtil.isNotEmpty(merchantInfo.getMerchantName())) {
+//                reqMap.put("body", merchantInfo.getMerchantName());
+//            } else {
+//                reqMap.put("body", "leshuaPay");
+//            }
+//            reqMap.put("nonce_str", StringUtil.genRandomNum(32));
+//            String apKey = "60E3F31EDEC8061C33721737B36FA86D";
+//            System.out.println("reqMap===========================" + JSONObject.toJSONString(reqMap));
+//            String requestPay = leshuaService.requestPay(reqMap, apKey, true);
+//            System.out.println("requestPay===========================" + requestPay);
+//            mapLeshua = XmlUtil.toMapLeshua(requestPay);
+//            MerchantOrder merchantOrder = new MerchantOrder();
+//            merchantOrder.setMerchantCode(merchantCode);
+//            merchantOrder.setStoreId(merchantMenber.getStoreId());
+//            merchantOrder.setStoreName(merchantMenber.getStoreName());
+//            merchantOrder.setMerchantName(merchantMenber.getMerchantName());
+//            merchantOrder.setOrderNumber(orderNumber);
+//            merchantOrder.setStaffCode(merchantMenber.getStoreId());
+//            merchantOrder.setStaffName(merchantMenber.getStoreId());
+//            merchantOrder.setPayTypeCode("leshuaPay1");
+//            merchantOrder.setPayTypeName("乐刷微信支付");
+//            merchantOrder.setConsumeFee(Double.valueOf(consumeMoney));
+//
+//            double rate = merchantRateNewService.getRate(userId,merchantOrder.getPayTypeCode(),merchantOrder.getConsumeFee());
+//            merchantOrder.setRate(new BigDecimal(String.valueOf(rate)));
+//            //rate = merchantOrderService.getCurrentFee(userApp, "current", rate, userApp.getUserId());
+////            merchantOrder.setEnterFee(StringUtil.bigDecimal(Double.parseDouble(consumeMoney) - Double.parseDouble(consumeMoney) * rate));
+//            Date date = new Date();
+//            merchantOrder.setCreateDt(date);
+//            merchantOrder.setUpdateTime(date);
+//            merchantOrder.setStatus("5");
+//            merchantOrder.setOrderType("3");
+////				merchantOrder.setOrderType("3");
+////            merchantOrder.setRate(new BigDecimal(String.valueOf(rate)).multiply(new BigDecimal(10000)).intValue());
+//            merchantOrderService.save(merchantOrder);
+//            mapLeshua.put("code", "1");
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//            mapLeshua.put("code", "0");
+//            mapLeshua.put("msg", "充值失败");
+//        }
+//        return mapLeshua;
+        return null;
+    }
+
+
+    @GetMapping("/jpUrl")
+    public ModelAndView jpUrl(String orderNumber, String leshuaMchId) {
+        log.info("====订单号====" + orderNumber);
+        if (orderNumber.contains("?")) {
+            String str[] = orderNumber.split("[?]");
+            orderNumber = str[0];
+        }
+        log.info("=========当前商户乐刷商户id==========" + leshuaMchId);
+        ModelAndView modelAndView = new ModelAndView();
+        Map<String, String> reqMap = new HashMap<String, String>(16);
+        Map<String, Object> mapLeshua = new HashMap<String, Object>(16);
+        try {
+            reqMap.put("service", "query_status");
+            reqMap.put("merchant_id", leshuaMchId);
+            reqMap.put("third_order_id", orderNumber);
+            reqMap.put("nonce_str", StringUtil.getBillno());
+            String requestPay = leshuaService.requestPay(reqMap, "60E3F31EDEC8061C33721737B36FA86D", true);
+            mapLeshua = XmlUtil.toMapLeshua(requestPay);
+            String resp_code = (String) mapLeshua.get("resp_code");
+            if ("0".equals(resp_code)) {
+                String result_code = (String) mapLeshua.get("result_code");
+                if ("0".equals(result_code)) {
+                    String status = (String) mapLeshua.get("status");
+                    if ("2".equals(status)) {
+                        modelAndView.setViewName("vip/paySuccess");
+                    } else {
+                        modelAndView.setViewName("vip/payFail");
+                    }
+                } else {
+                    modelAndView.addObject("message", "支付结果查询错误");
+                    modelAndView.setViewName("merchant/error");
+                }
+            } else {
+                modelAndView.addObject("message", "支付结果查询错误");
+                modelAndView.setViewName("merchant/error");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            modelAndView.addObject("message", "支付结果查询错误");
+            modelAndView.setViewName("merchant/error");
+        }
+        modelAndView.addObject("url", ParametersUtil.getRequestPrefix(request));
+        return modelAndView;
+    }
+
+    @PostMapping("/memberPayBack")
+    @ResponseBody
+    public String memberPayBack(HttpServletRequest request) {
+        log.info("=========================jinruleshua huidiao =====================");
+        String respString = "";
+        InputStream is = null;
+        Map<String, Object> notifyMap = null;
+        try {
+            is = request.getInputStream();
+            String xml = XmlUtil.toUTF8(is);
+            log.info("=========fanhui     canshu=============" + xml);
+            notifyMap = XmlUtil.toMapLeshua(xml);
+            log.info("==================fanhuicanshu    Map   jihe=====" + notifyMap + "");
+            if (notifyMap.containsKey("sign")) {
+                if (!LeshuaSignature.checkIsSignValidFromResponseString(xml, resExcludedSignParams(), "75C27ABB12F78A747DCB4368EEBCB542")) {
+                    log.info("============================qianming butongguo======================");
+                    respString = "error";
+                } else {
+                    String status = (String) notifyMap.get("status");
+                    if (status != null && "2".equals(status)) {
+                        respString = "000000";
+                        updateLeshuaOrder(notifyMap);
+                        updateLeshuaMerchantOrder(notifyMap);
+                        //TODO 添加推广分润
+                        String ordersSn = (String) notifyMap.get("third_order_id");// 商户订单号
+                        MerchantOrder merchantOrder = new MerchantOrder();
+                        merchantOrder.setOrderNumber(ordersSn);
+                        MerchantOrder order = merchantOrderService.queryMerchantOrder(merchantOrder);
+                        if (order != null) {
+                            merchantProfitService.createOrderProfitV2(order,"1");
+                        } else {
+                            log.error("===================添加推广分润失败，当前订单号：{}不存在<==============", ordersSn);
+                        }
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return respString;
+    }
+
+    private void updateLeshuaOrder(Map<String, Object> notifyMap) {
+        String ordersSn = (String) notifyMap.get("third_order_id");// 商户订单号
+        String amountpaid = (String) notifyMap.get("amount");// 订单金额
+        String pay_way = (String) notifyMap.get("pay_way");// 支付类型
+        String openid = (String) notifyMap.get("openid");// 微信openid
+        String sub_openid = (String) notifyMap.get("sub_openid");//支付宝
+        String transaction_id = (String) notifyMap.get("out_transaction_id");
+        String leshua_order_id = (String) notifyMap.get("leshua_order_id");
+        String pay_time = (String) notifyMap.get("pay_time");
+        BigDecimal amountPay = (new BigDecimal(amountpaid).divide(new BigDecimal("100"))).setScale(2);// 将分转换成元-实际支付金额:元
+        String amount = amountPay + "";// 消费金额
+        log.error("进入修改订单方法==========" + transaction_id);
+        // 订单表
+        MemberOrder memberOrder = new MemberOrder();
+        memberOrder.setOrderNumber(ordersSn);
+        memberOrder = memberOrderService.queryMemberOrder(memberOrder);
+        if ("1".equals(memberOrder.getOrderStatus())) {
+            return;
+        }
+        memberOrder.setOrderStatus("1");
+        memberOrder.setLeshuaTransNo(leshua_order_id);
+        memberOrderService.updateMemberOrder(memberOrder);
+        MerchantMenber merchantMenber = new MerchantMenber();// 会员表
+        merchantMenber.setMemberCode(memberOrder.getMemberCode());//会员编码
+        List<MerchantMenber> queryMerchantMenberList = merchantMenberService.queryMerchantMenberList(merchantMenber);
+        if (queryMerchantMenberList != null && queryMerchantMenberList.size() > 0) {
+            merchantMenber = queryMerchantMenberList.get(0);
+            merchantIncome(memberOrder, "2");
+        }
+        log.error("===============merchantMenber=====" + JSONObject.toJSONString(merchantMenber));
+        if (StringUtil.isNotEmpty(memberOrder.getOrderFee())) {
+            log.error("进入修改订单方法===OrderFee=======" + memberOrder.getOrderFee());
+            MerchantMenberRecharge merchantMenberRecharge = new MerchantMenberRecharge();
+            Double usableRechargeFee = merchantMenber.getUsableRechargeFee() == null ? 0d : merchantMenber.getUsableRechargeFee();
+            log.error("usableRechargeFee==qian==" + usableRechargeFee);
+            merchantMenber.setUsableRechargeFee(StringUtil.bigDecimal(usableRechargeFee + Double.valueOf(memberOrder.getOrderFee())));
+            log.error("usableRechargeFee==hou==" + merchantMenber.getUsableRechargeFee());
+            //在存会员充值表之前查一下当前店铺的充值
+            // 当前充值的店铺id
+            String storeId = merchantMenber.getStoreId();
+            ActivityRecharge activityRecharge = new ActivityRecharge();
+            activityRecharge.setMerchantCode(merchantMenber.getMerchantCode());
+            activityRecharge.setStoreId(storeId);
+            List<ActivityRecharge> queryActivityRechargeList = activityRechargeService.queryActivityRechargeList(activityRecharge);//根据店铺id查询店铺的充值活动
+            log.error("queryActivityRechargeList======前======" + queryActivityRechargeList);
+            Double orderFee = Double.valueOf(memberOrder.getOrderFee());//充值的金额
+            if (queryActivityRechargeList != null && queryActivityRechargeList.size() > 0) {
+                log.error("chongzhijine========" + orderFee);
+                queryActivityRechargeList = rechargeMoneyByDesc(queryActivityRechargeList);
+                log.error("queryActivityRechargeList======后======" + queryActivityRechargeList);
+                for (ActivityRecharge a : queryActivityRechargeList) {
+                    if (1 == a.getTimeType()) {
+                        if (null == a.getStartDt() || null == a.getEndDt()) {
+                            continue;
+                        }
+                        boolean bol = DateUtils.isBoolean(a.getStartDt(), a.getEndDt());
+                        if (!bol) {
+                            activityRechargeService.deleteActivityRecharge(a);
+                            continue;
+                        }
+                    }
+                    if (null != a.getRechargeMoney()) {
+                        if (orderFee >= a.getRechargeMoney()) {
+                            merchantMenberRecharge.setGiveMoney(a.getGiveMoney());
+                            Double totalGiveFee = merchantMenber.getTotalGiveFee() == null ? 0d : merchantMenber.getTotalGiveFee();//当前充值总额
+                            merchantMenber.setTotalGiveFee(StringUtil.bigDecimal(totalGiveFee + a.getGiveMoney()));
+                            Double usableGiveFee = merchantMenber.getUsableGiveFee() == null ? 0d : merchantMenber.getUsableGiveFee();
+                            merchantMenber.setUsableGiveFee(StringUtil.bigDecimal(usableGiveFee + a.getGiveMoney()));
+                            break;
+                        }
+                    }
+                }
+            }
+            merchantMenberRecharge.setRechargeMoney(StringUtil.bigDecimal(Double.valueOf(memberOrder.getOrderFee())));
+            merchantMenberRecharge.setMemberCode(merchantMenber.getMemberCode());
+            merchantMenberRecharge.setMerchantCode(merchantMenber.getMerchantCode());
+            merchantMenberRecharge.setMerchantName(merchantMenber.getMerchantName());
+            merchantMenberRecharge.setStoreId(merchantMenber.getStoreId());
+            merchantMenberRecharge.setStoreName(merchantMenber.getStoreName());
+            merchantMenberRecharge.setCreateDt(new Date());
+            merchantMenberRecharge.setLogo(merchantMenber.getLogo());
+            merchantMenberRecharge.setNickName(merchantMenber.getNickName());
+            merchantMenberRecharge.setPhone(merchantMenber.getPhone());
+            merchantMenberRecharge.setPayType(1);
+            merchantMenberRecharge.setOrderNumber(ordersSn);
+            log.error("进入修改订单方法===OrderFee==merchantMenberRecharge=====" + JSONObject.toJSONString(merchantMenberRecharge));
+            menberRechargeService.saveMerchantMenberRecharge(merchantMenberRecharge);
+        }
+        Double totalRechargeFee = merchantMenber.getTotalRechargeFee() == null ? 0d : merchantMenber.getTotalRechargeFee();
+        merchantMenber.setTotalRechargeFee(StringUtil.bigDecimal(totalRechargeFee + Double.valueOf(memberOrder.getOrderFee())));
+        log.error("进入修改订单方法===OrderFee==merchantMenber=====" + JSONObject.toJSONString(merchantMenber));
+        merchantMenberService.updateMerchantMenber(merchantMenber);
+
+        MerchantBaseInfo merchantBaseInfo = new MerchantBaseInfo();
+        merchantBaseInfo.setMerchantCode(memberOrder.getMerchantCode());
+        List<MerchantBaseInfo> queryMerchantBaseInfoList = merchantBaseInfoService.queryMerchantBaseInfoList(merchantBaseInfo);
+        if (queryMerchantBaseInfoList != null && queryMerchantBaseInfoList.size() > 0) {
+            merchantBaseInfo = queryMerchantBaseInfoList.get(0);
+            if (StringUtil.isNotEmpty(merchantBaseInfo.getUserId())) {
+                List<String> alias = userAppService.storeMemberList(merchantBaseInfo.getMerchantCode());
+                log.info("=========推送人userId======" + JSON.toJSONString(alias) + "=========金额=======" + memberOrder.getOrderFee());
+
+                generalPushUtil.sendAllPlatByAlias(alias, "会员充值通知", "会员充值" + memberOrder.getOrderFee() + "元", "3");
+//                JpushClientUtil.sendToRegistrationId2(alias, "会员充值通知", "会员充值通知",
+//                        "会员充值" + memberOrder.getOrderFee() + "元", "3",
+//                        DateUtils.currentYourDate("yyyy-MM-dd HH:mm:ss"));
+            }
+        }
+
+    }
+
+    private void updateLeshuaMerchantOrder(Map<String, Object> notifyMap) throws ParseException {
+        String ordersSn = (String) notifyMap.get("third_order_id");// 商户订单号
+        String amountpaid = (String) notifyMap.get("amount");// 订单金额
+        String pay_way = (String) notifyMap.get("pay_way");// 支付类型
+        String openid = (String) notifyMap.get("openid");// 微信openid
+        String sub_openid = (String) notifyMap.get("sub_openid");//支付宝
+        String transaction_id = (String) notifyMap.get("out_transaction_id");
+        String leshua_order_id = (String) notifyMap.get("leshua_order_id");
+        String pay_time = (String) notifyMap.get("pay_time");
+        BigDecimal amountPay = (new BigDecimal(amountpaid).divide(new BigDecimal("100"))).setScale(2);// 将分转换成元-实际支付金额:元
+        String amount = amountPay + "";// 消费金额
+        MerchantOrder merchantOrder = new MerchantOrder();
+        merchantOrder.setOrderNumber(ordersSn);
+        List<MerchantOrder> queryMerchantOrderList = merchantOrderService.list(new QueryWrapper<>(merchantOrder));
+        if (queryMerchantOrderList != null && queryMerchantOrderList.size() > 0) {
+            merchantOrder = queryMerchantOrderList.get(0);
+            if ("1".equals(merchantOrder.getStatus())) {
+                return;
+            }
+            MerchantOrder m = new MerchantOrder();
+            m.setId(merchantOrder.getId());
+            m.setStatus("1");
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            m.setTransDt(sdf.parse(pay_time));
+            m.setThirdTransNo(leshua_order_id);
+            merchantOrderService.updateById(m);
+        }
+
+    }
+
+
+    /**
+     * rechargeMoneyDesc:(充值金额从大到小). <br/>
+     *
+     * @param list
+     * @return
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    public List<ActivityRecharge> rechargeMoneyDesc(List<ActivityRecharge> list) {
+        Collections.sort(list, (o1, o2) -> {
+            int desc = (int) (o2.getRechargeMoney() - o1.getRechargeMoney());
+            return desc;
+        });
+        return list;
+
+    }
+
+    /**
+     * merchantIncome:(添加收益记录). <br/>
+     *
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    private void merchantIncome(MemberOrder memberOrder, String payTypeCode) {
+        MerchantIncome merchantIncome = new MerchantIncome();
+        merchantIncome.setMerchantCode(memberOrder.getMerchantCode());
+        merchantIncome.setMerchantName(memberOrder.getMerchantName());
+        merchantIncome.setStoreId(memberOrder.getStoreId());
+        merchantIncome.setStoreName(memberOrder.getStoreName());
+        merchantIncome.setDealFee(Double.valueOf(memberOrder.getOrderFee()));
+        merchantIncome.setIncomeFee(Double.valueOf(memberOrder.getOrderFee()));
+        merchantIncome.setPayTypeCode(payTypeCode);
+        merchantIncome.setPayTypeName("会员充值");
+        merchantIncome.setCreateTime(memberOrder.getCreateDt());
+        merchantIncomeService.saveMerchantIncome(merchantIncome);
+    }
+
+    /**
+     * orderByDesc:(充值金额从大到小排列). <br/>
+     *
+     * @param list
+     * @return
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    public List<ActivityRecharge> rechargeMoneyByDesc(List<ActivityRecharge> list) {
+        Collections.sort(list, new Comparator<ActivityRecharge>() {
+            @Override
+            public int compare(ActivityRecharge o1, ActivityRecharge o2) {
+                int desc = (int) (o2.getRechargeMoney() - o1.getRechargeMoney());
+                return desc;
+            }
+        });
+        return list;
+    }
+
+
+    /**
+     * leshuaCallBack:(乐刷退款回调地址). <br/>
+     *
+     * @return
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    @RequestMapping("/leshuaRefundCallBack")
+    @ResponseBody
+    public String leshuaRefundCallBack(HttpServletRequest request) {
+        return merchantService.appRefundCallback(request);
+    }
+
+    @PostMapping("/appMemberScanPayLeshuaCallBack")
+    @ResponseBody
+    public String appMemberScanPayLeshuaCallBack(HttpServletRequest request) {
+        String respString = "";
+        InputStream is = null;
+        Map<String, Object> notifyMap = null;
+        try {
+            is = request.getInputStream();
+            String xml = XmlUtil.toUTF8(is);
+            notifyMap = XmlUtil.toMapLeshua(xml);
+            if (notifyMap.containsKey("sign")) {
+                if (!LeshuaSignature.checkIsSignValidFromResponseString(xml, resExcludedSignParams(), "75C27ABB12F78A747DCB4368EEBCB542")) {
+                    log.info("============================签名不通过======================");
+                    respString = "error";
+                } else {
+                    String status = (String) notifyMap.get("status");
+                    log.info("============订单状态 status============" + status);
+                    respString = "000000";
+                    String orderNumber = (String) notifyMap.get("third_order_id");// 商户订单号
+                    MemberOrder memberOrder = new MemberOrder();
+                    memberOrder.setOrderNumber(orderNumber);
+                    List<MemberOrder> queryMemberOrderList = memberOrderService.queryMemberOrderList(memberOrder);
+                    System.out.println("======查询订单=====order=" + JSONObject.toJSONString(queryMemberOrderList));
+                    if (StringUtil.isNotEmpty(orderNumber) && queryMemberOrderList != null && queryMemberOrderList.size() > 0) {
+                        System.out.println("======订单状态=====order=" + JSONObject.toJSONString(queryMemberOrderList));
+                        memberOrder = queryMemberOrderList.get(0);
+                        if ("1".equals(memberOrder.getOrderStatus())) {
+                            return respString;
+                        }
+                        if ("2".equals(status)) {//交易成功
+                            memberOrder.setOrderStatus("1");
+                        }
+                        memberOrderService.updateMemberOrder(memberOrder);
+                        String memberCode = memberOrder.getMemberCode();//会员编码
+                        MerchantMenber menber = new MerchantMenber();
+                        menber.setMemberCode(memberCode);
+                        menber = merchantMenberService.queryMerchantMenber(menber);
+                        MerchantMenberComsume merchantMenberComsume = new MerchantMenberComsume();
+                        merchantMenberComsume.setComsumeMoney(Double.valueOf(memberOrder.getOrderFee()));
+                        merchantMenberComsume.setLogo(menber.getLogo());
+                        merchantMenberComsume.setMerchantCode(menber.getMerchantCode());
+                        merchantMenberComsume.setMerchantName(menber.getMerchantName());
+                        merchantMenberComsume.setStoreId(menber.getStoreId());
+                        merchantMenberComsume.setStoreName(menber.getStoreName());
+                        merchantMenberComsume.setOrderNumber(orderNumber);
+                        merchantMenberComsume.setPayType(1);
+                        merchantMenberComsume.setCreateDt(new Date());
+                        merchantMenberComsume.setLogo(menber.getLogo());
+                        merchantMenberComsume.setMemberCode(memberCode);
+                        merchantMenberComsume.setNickName(menber.getNickName());
+                        merchantMenberComsume.setPhone(menber.getPhone());
+                        merchantMenberComsumeService.saveMerchantMenberComsume(merchantMenberComsume);
+                        MerchantBaseInfo merchantBaseInfo = new MerchantBaseInfo();
+                        merchantBaseInfo.setMerchantCode(menber.getMerchantCode());
+                        List<MerchantBaseInfo> queryMerchantBaseInfoList = merchantBaseInfoService.queryMerchantBaseInfoList(merchantBaseInfo);
+                        if (queryMerchantBaseInfoList != null && queryMerchantBaseInfoList.size() > 0) {
+                            merchantBaseInfo = queryMerchantBaseInfoList.get(0);
+                            log.info("=========推送人userId======" + merchantBaseInfo.getUserId() + "=========金额=======" + memberOrder.getOrderFee());
+                            if (StringUtil.isNotEmpty(merchantBaseInfo.getUserId())) {
+                                List<String> alias = userAppService.storeMemberList(merchantBaseInfo.getMerchantCode());
+
+                                generalPushUtil.sendAllPlatByAlias(alias, "会员消费通知", "会员消费" + memberOrder.getOrderFee() + "元", "3");
+                            }
+                        }
+                    }
+                    return respString;
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+
+    /**
+     * 升级页面
+     */
+    @GetMapping(value = "/toUpGradeAuth")
+    public ModelAndView toUpGradeAuth(String userAppId,
+                                      HttpServletRequest request, ModelAndView view) {
+
+        String url = "/merchant/goUpgradePage?userAppId=" + userAppId;
+        String APP_ID = ParametersUtil.APPID;
+        String ali_appid = ParametersUtil.ZY_ALI_APP_ID;
+        this.request.setAttribute("appId", APP_ID);
+        this.request.setAttribute("ali_appid", ali_appid);
+        String domain_wap = ParametersUtil.domain + "/wap";
+        request.setAttribute("domain_wap", domain_wap);
+        try {
+            String ua = request.getHeader("user-agent").toLowerCase();
+            if (ua.contains("micromessenger")) {
+                String jump = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=" + APP_ID
+                        + "&redirect_uri=" + java.net.URLEncoder.encode(domain_wap + url, "utf-8")
+                        + "&response_type=code&scope=snsapi_userinfo&state=123#wechat_redirect";
+                response.sendRedirect(jump);
+                return null;
+            } else if (ua.contains("alipay")) {
+                String urlString = domain_wap + url;
+                log.info(urlString);
+                String rurl = java.net.URLEncoder.encode(urlString, "utf-8");
+                String jmp = "https://openauth.alipay.com/oauth2/publicAppAuthorize.htm?app_id=" + ali_appid + "&scope=auth_base&redirect_uri=" + rurl;
+                log.info(jmp);
+                response.sendRedirect(jmp);
+                return null;
+            } else {
+                String urlString = domain_wap + url;
+                log.info(urlString);
+                String rurl = java.net.URLEncoder.encode(urlString, "utf-8");
+                String jmp = "https://qr.95516.com/qrcGtwWeb-web/api/userAuth?version=1.0.0&redirectUrl=" + rurl;
+                log.info(jmp);
+                response.sendRedirect(jmp);
+                return null;
+            }
+        } catch (Exception e) {
+            view.setViewName("merchant/errorInfo");
+            request.setAttribute("error", "授权异常！");
+            return view;
+        }
+    }
+
+    /**
+     * goUpgradePage:(跳转到升级页面). <br/>
+     *
+     * @param userAppId
+     * @param code
+     * @param auth_code
+     * @param userAuthCode
+     * @param request
+     * @return
+     *
+     * @author Administrator
+     * @since JDK 1.8
+     */
+//    @GetMapping(value = "/goUpgradePage")
+//    public ModelAndView goUpgradePage(String userAppId, String code, String auth_code, String userAuthCode,
+//                                      HttpServletRequest request) {
+//        ModelAndView modelAndView = new ModelAndView();
+//        modelAndView.setViewName("merchant/goUpgradePage");
+//        setUpVipAmtResult(modelAndView, "twoUpVipAmount", 2);
+//        setUpVipAmtResult(modelAndView, "threeUpVipAmount", 3);
+//        modelAndView.addObject("userAppId", userAppId);
+//        UserApp userApp = new UserApp();
+//        userApp.setUserId(Long.valueOf(userAppId));
+//        userApp = userAppService.queryUserApp(userApp);
+//        if (null != userApp) {
+//            modelAndView.addObject("level", userApp.getLevel());
+//        }
+//        if (StringUtil.isNotEmpty(code)) {
+//            modelAndView.addObject("payType", "WXZF");
+//            WeixinOauth2Token wot = getWeChatUserOpenId(code);
+//            String openid = wot.getOpenId();
+//            log.info("openid  = " + openid);
+//            log.info("unionid  = " + wot.getUnionId());
+//            modelAndView.addObject("openid", openid);
+//        } else if (StringUtil.isNotEmpty(auth_code)) {
+//            modelAndView.addObject("payType", "ZFBZF");
+//            Map<String, Object> aliMap = AliUtil.getAliUserId(auth_code,ParametersUtil.ZY_PRI,ParametersUtil.ZY_PUB,ParametersUtil.ZY_ALI_APP_ID);
+//            //支付宝取消主动授权 采用静默授权方式，无法获取用户信息
+//           /* String accessToken = (String) aliMap.get("accessToken");
+//            AliUserInfoVO aliUserInfo = getAliUserInfo(accessToken);*/
+//            log.info("============aliUserInfo============" + JSONObject.toJSONString(aliMap));
+//            modelAndView.addObject("userid", aliMap.get("aliUserId"));
+//        } else if (StringUtil.isNotEmpty(userAuthCode)) {
+//            modelAndView.addObject("payType", "UNIONPAY");
+//            String ua = request.getHeader("User-Agent");
+//            log.info("===================>【银联】标识，获取请求头部信息:{},==============", ua);
+//            int begin = ua.indexOf("UnionPay");
+//            String payMentApp = ua.substring(begin);
+//            if(payMentApp.length() > 30){
+//                payMentApp = payMentApp.substring(0,30);
+//            }
+//            try {
+//                Map<String, Object> unionInfo = sxfPayService.getUnionInfo(userAuthCode, payMentApp);
+//                log.info("===================>【银联】获取用户标识结果参数，==============", unionInfo);
+//                if ("1".equals(unionInfo.get("code"))) {
+//                    Map<String, String> data = (Map<String, String>) unionInfo.get("data");
+//                    modelAndView.addObject("userid", data.get("data"));
+//                }
+//            } catch (Exception e) {
+//                log.error("===================>【银联】获取用户标识出错:{}==============", ua);
+//            }
+//        } else {
+//            modelAndView.setViewName("merchant/errorInfo");
+//            request.setAttribute("error", "请使用，支付宝、微信、云闪付扫码支付！");
+//            return modelAndView;
+//        }
+//        return modelAndView;
+//    }
+
+//    public void setUpVipAmtResult(ModelAndView modelAndView, String propertyKey, int level) {
+//        String configValue = systemConfigService.querySystemConfigValue(propertyKey);
+//        if (StringUtil.isNotEmpty(configValue)) {
+//            if (configValue.contains("-")) {
+//                modelAndView.addObject(propertyKey, configValue.split("-")[0]);
+//                //modelAndView.addObject(shapeKey, propertyValue.split("-")[1]);
+//            }
+//        } else {
+//            if (level == 2) {
+//                modelAndView.addObject(propertyKey, 999);
+//                //modelAndView.addObject(shapeKey, 500);
+//            } else {
+//                modelAndView.addObject(propertyKey, 9999);
+//                //modelAndView.addObject(shapeKey, 5000);
+//            }
+//        }
+//    }
+
+//    @PostMapping("/upGradePay")
+//    @ResponseBody
+//    public Map<String, Object> upGradePay(LevelDTO levelDTO, HttpServletRequest request) {
+//        Map<String, Object> result = new HashMap<>(16);
+//        if (StringUtil.isEmpty(levelDTO.getUserAppId())) {
+//            result.put("code", "0");
+//            result.put("msg", "页面已超时，请稍后再试");
+//            return result;
+//        }
+//        try {
+//            return merchantService.tradePay(levelDTO, request);
+//        } catch (Exception e) {
+//            result.put("code", "0");
+//            result.put("msg", "支付异常！");
+//            return result;
+//        }
+//    }
+
+    /**
+     * 获取商户支付成功页面的信息 二维码 和提示信息
+     *
+     * @return
+     */
+    @RequestMapping(value = "/pay/success/page/info", method = RequestMethod.POST)
+    @ResponseBody
+    public Result<JSONObject> getSuccessPageInfo(@RequestBody JSONObject json) {
+        JSONObject result = new JSONObject();
+        Integer storeId = json.getInteger("storeId");
+        if (StringUtil.isEmpty(storeId)) {
+            return ResultGenerator.genFailResult("店铺ID不能为空");
+        }
+        MerchantStore store = new MerchantStore();
+        store.setId(storeId);
+        MerchantStore storeInfo = merchantStoreService.queryMerchantStore(store);
+        if (storeInfo == null) {
+            return ResultGenerator.genFailResult("店铺信息异常!");
+        }
+        QueryWrapper<MerchantQrcode> qrcodeQueryWrapper = new QueryWrapper<MerchantQrcode>().eq("merchantCode", storeInfo.getMerchantCode());
+        MerchantQrcode one = merchantQrcodeService.getOne(qrcodeQueryWrapper);
+        if (one == null) {
+            result.put("qrCodeUrl", "");
+        } else {
+            result.put("qrCodeUrl", one.getQrCodeUrl());
+            result.put("wechat", one.getWechat());
+        }
+        QueryWrapper<MerchantGuide> guideQueryWrapper = new QueryWrapper<MerchantGuide>().eq("status", "1")
+                .eq("merchantCode", storeInfo.getMerchantCode());
+        List<MerchantGuide> list = merchantGuideService.list(guideQueryWrapper);
+        if (list.size() == 0) {
+            QueryWrapper<GuideLabel> labelQueryWrapper = new QueryWrapper<GuideLabel>().eq("status", "1")
+                    .orderByDesc("createTime");
+            List<GuideLabel> g = guideLabelService.list(labelQueryWrapper);
+            if (!g.isEmpty()) {
+                result.put("guideLabel", g.get(0).getName());
+            } else {
+                result.put("guideLabel", "");
+            }
+        } else {
+            MerchantGuide guide = list.get(0);
+            if (StringUtil.isNotEmpty(guide.getGuideId())) {
+                GuideLabel byId = guideLabelService.getById(guide.getGuideId());
+                if (byId != null) {
+                    result.put("guideLabel", byId.getName());
+                } else {
+                    result.put("guideLabel", "");
+                }
+            } else {
+                result.put("guideLabel", guide.getName());
+            }
+        }
+        return ResultGenerator.genSuccessResult("获取成功!", result);
+    }
+
+    /**
+     * 更新会员信息接口
+     *
+     * @param json
+     * @return
+     */
+    @RequestMapping(value = "/member/update", method = RequestMethod.POST)
+    @ResponseBody
+    public Result<JSONObject> vipOpenCard(@RequestBody JSONObject json) {
+        log.info("============>更新会员信息接口请求，请求参数:{}<============", json);
+        String memberName = json.getString("memberName");
+        String avatar = json.getString("avatar");
+        JSONObject result = new JSONObject();
+        String appOpenId = json.getString("appOpenId");
+        if (StringUtil.isEmpty(appOpenId)) {
+            return ResultGenerator.genFailResult("appOpenId不能为空！");
+        }
+        Integer storeId = json.getInteger("storeId");
+        if (StringUtil.isEmpty(storeId)) {
+            return ResultGenerator.genFailResult("店铺ID不能为空！");
+        }
+        MerchantStore store = new MerchantStore();
+        store.setId(storeId);
+        MerchantStore info = merchantStoreService.queryMerchantStore(store);
+        if (info == null) {
+            return ResultGenerator.genFailResult("店铺信息异常！");
+        }
+        QueryWrapper<MerchantMenber> queryWrapper = new QueryWrapper<MerchantMenber>().eq("appOpenId", appOpenId)
+                .eq("storeId", info.getStoreId());
+        MerchantMenber menber = merchantMenberService.getOne(queryWrapper);
+        if (menber != null) {
+            menber.setMemberName(memberName);
+            menber.setNickName(memberName);
+            menber.setLogo(avatar);
+            merchantMenberService.updateById(menber);
+        }
+        return ResultGenerator.genSuccessResult("操作成功!", result);
+    }
+
+    /**
+     * 被扫小程序会员卡充值接口
+     *
+     * @param json
+     * @return
+     */
+    @NoRepeatSubmit
+    @RequestMapping(value = "/toRecharge", method = RequestMethod.POST)
+    @ResponseBody
+    public Result<JSONObject> memberRecharge(@RequestBody JSONObject json, HttpServletRequest request) {
+        log.info("===============>小程序会员卡充值开始，请求参数:{}<===================", json);
+        try {
+            json.put("ip", IpUtils.getIpAddr(request));
+            return merchantService.memberRecharge(json);
+        } catch (Exception e) {
+            e.printStackTrace();
+            MsgException.throwException(e.getMessage());
+        }
+        return ResultGenerator.genFailResult("支付失败");
+    }
+
+    @GetMapping(value = "/recharge")
+    public ModelAndView recharge(ModelAndView view, Integer storeId, String appOpenId) {
+        view.setViewName("recharge/recharge");
+        if (StringUtil.isEmpty(storeId)) {
+            view.addObject("error", "店铺ID不能为空！");
+            view.setViewName("merchant/errorInfo");
+            return view;
+        }
+        if (StringUtil.isEmpty(appOpenId)) {
+            view.addObject("error", "openId不能为空！");
+            view.setViewName("merchant/errorInfo");
+            return view;
+        }
+        MerchantStore s = new MerchantStore();
+        s.setId(storeId);
+        MerchantStore store = merchantStoreService.queryMerchantStore(s);
+        if (store == null) {
+            view.addObject("error", "店铺数据异常！");
+            view.setViewName("merchant/errorInfo");
+            return view;
+        }
+        if ("0".equals(store.getStatus())) {
+            view.addObject("error", "店铺已经打烊！");
+            view.setViewName("merchant/errorInfo");
+            return view;
+        }
+        if ("2".equals(store.getStatus())) {
+            view.addObject("error", "店铺已被禁用！");
+            view.setViewName("merchant/errorInfo");
+            return view;
+        }
+        QueryWrapper<MerchantMenber> queryWrapper = new QueryWrapper<MerchantMenber>().eq("storeId", store.getStoreId())
+                .eq("appOpenId", appOpenId);
+        MerchantMenber menber = merchantMenberService.getOne(queryWrapper);
+        if (menber == null) {
+            view.addObject("error", "您还不是当前门店的会员，请先开通会员！");
+            view.setViewName("merchant/errorInfo");
+            return view;
+        }
+        QueryWrapper<MerchantBaseInfo> infoQueryWrapper = new QueryWrapper<MerchantBaseInfo>()
+                .eq("merchantCode", store.getMerchantCode());
+        MerchantBaseInfo merchant = merchantBaseInfoService.getOne(infoQueryWrapper);
+        if (merchant == null) {
+            view.addObject("error", "商户信息异常！");
+            view.setViewName("merchant/errorInfo");
+            return view;
+        }
+        ActivityRecharge activityRecharge = new ActivityRecharge();
+        activityRecharge.setMerchantCode(store.getMerchantCode());
+        activityRecharge.setStoreId(store.getStoreId());
+        List<String> amt = new ArrayList<String>() {{
+            add("100");
+            add("200");
+            add("300");
+            add("400");
+            add("500");
+            add("1000");
+        }};
+        int p = amt.size();
+        List<ActivityRecharge> rechargeList = activityRechargeService
+                .queryUsableActivityRechageList(activityRecharge);
+        if (!rechargeList.isEmpty()) {
+            view.addObject("list", rechargeList);
+            if (!"TQTDMS".equals(store.getStoreId())) {
+                if (rechargeList.size() < 6) {
+                    for (ActivityRecharge r : rechargeList) {
+                        String d = r.getRechargeMoney().intValue() + "";
+                        amt.remove(d);
+                    }
+                    int a = rechargeList.size();
+                    List<String> useAmtList = new ArrayList<>();
+                    for (int i = 0; i < p - a; i++) {
+                        useAmtList.add(amt.get(i));
+                    }
+                    amt = useAmtList;
+                } else if (rechargeList.size() >= 6 && rechargeList.size() <= 9) {
+                    amt.clear();
+                } else {
+                    List<ActivityRecharge> rList = new ArrayList<>();
+                    for (int i = 0; i < 9; i++) {
+                        rList.add(rechargeList.get(i));
+                    }
+                    view.addObject("list", rList);
+                }
+            } else {
+                amt.clear();
+            }
+        }
+        if (StringUtil.isNotEmpty(menber.getMemberName())) {
+            menber.setMemberName(EmojiUtil.emojiRecovery2(menber.getMemberName()));
+        }
+        if (StringUtil.isNotEmpty(menber.getNickName())) {
+            menber.setMemberName(EmojiUtil.emojiRecovery2(menber.getNickName()));
+        }
+        view.addObject("store", store);
+        view.addObject("amt", amt);
+        view.addObject("menber", menber);
+        Double rechargeFee = menber.getUsableRechargeFee() == null ? 0.00d : menber.getUsableRechargeFee();
+        Double giveFee = menber.getUsableGiveFee() == null ? 0.00d : menber.getUsableGiveFee();
+        double balance = StringUtil.bigDecimal(rechargeFee + giveFee);
+        view.addObject("balance", balance);
+        view.addObject("appOpenId", appOpenId);
+        view.addObject("merchant", merchant);
+        return view;
+    }
+
+    @GetMapping(value = "/wxLocation")
+    public ModelAndView wxLocation(ModelAndView view,HttpServletRequest request,String storeId,String appOpenId) {
+        String appId = ParametersUtil.APPID;
+        String noncestr = StringUtil.generateMixStr(10);
+        Long timestamp = System.currentTimeMillis() / 1000;
+        StringBuffer requestURL = request.getRequestURL();
+        if(StringUtil.isNotEmpty(request.getQueryString())){
+            requestURL.append("?"+request.getQueryString());
+        }
+        WxAccessTokenRequest tokenRequest = WxAccessTokenRequest.buidWxToken(appId, ParametersUtil.APPSECRET,null, WxConstants.ACCESS_TOKEN_URL);
+        String jsapiTicket = wxCommonService.getJsapiTicket(tokenRequest,"jsapi");
+        String signStr = "jsapi_ticket="+jsapiTicket +"&noncestr="+noncestr +"&timestamp="+ timestamp + "&url="+requestURL.toString();
+        String sign = SignUtils.sha1Encrypt(signStr);
+
+        view.addObject("appId",appId);
+        view.addObject("noncestr",noncestr);
+        view.addObject("timestamp",timestamp);
+        view.addObject("sign",sign);
+
+        view.addObject("storeId",storeId);
+        view.addObject("appOpenId",appOpenId);
+        view.setViewName("merchant/wxLocation");
+        return view;
+    }
+}
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/MerchantDeviceController.java b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/MerchantDeviceController.java
new file mode 100644
index 0000000..71efc00
--- /dev/null
+++ b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/MerchantDeviceController.java
@@ -0,0 +1,116 @@
+package cn.pluss.platform.controller.home;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.deviceStock.DeviceStockService;
+import cn.pluss.platform.entity.DeviceStock;
+import cn.pluss.platform.entity.OfficialGoods;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.officialGoods.exchange.OfficialGoodsExchangeService;
+import cn.pluss.platform.userApp.UserAppService;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
+
+/**
+ * @author SSS
+ */
+@Controller
+@RequestMapping("/merchantDevice")
+public class MerchantDeviceController {
+
+    @Autowired
+    private UserAppService uaService;
+
+    @Autowired
+    private OfficialGoodsExchangeService officialGoodsExchangeService;
+
+    @Autowired
+    private DeviceStockService dsService;
+
+    /**
+     * 流量卡充值开始页面
+     *
+     * @return
+     */
+    @GetMapping("/simChargeIndex")
+    public String simChargeIndex(HttpServletRequest request, String token) {
+        try {
+            request.setAttribute("token", token);
+            return "device/simChargeIndex";
+        } catch (Exception e) {
+            e.printStackTrace();
+            request.setAttribute("error", "拒绝访问！");
+            return "merchant/errorInfo2";
+        }
+    }
+
+    @GetMapping("/simOrder")
+    public String simOrder(HttpServletRequest request, String token, String snNo) {
+        try {
+            LambdaQueryWrapper<DeviceStock> qWrapper = Wrappers.lambdaQuery();
+            qWrapper.eq(DeviceStock::getDeviceNo, snNo).or().eq(DeviceStock::getSnNo, snNo);
+            DeviceStock one = dsService.getOne(qWrapper.last("limit 1"));
+            if (one == null) {
+                throw new MsgException("设备编号不存在");
+            }
+
+            if (!one.getCode().contains("4G")) {
+                throw new MsgException("该设备编码不需要通信服务费");
+            }
+
+            if (!"3".equals(one.getStatus())) {
+                throw new MsgException("该设备暂未绑定商户");
+            }
+
+            request.setAttribute("token", token);
+            request.setAttribute("snNo", snNo);
+            request.setAttribute("device", one);
+            return "device/order";
+        } catch (Exception e) {
+            e.printStackTrace();
+            request.setAttribute("error", e.getMessage());
+            return "merchant/errorInfo2";
+        }
+    }
+
+    @PostMapping("/simOrder")
+    @ResponseBody
+    public Result<Object> createSimChargeOrder(HttpServletRequest request, OfficialGoods goods, String token) {
+        LambdaQueryWrapper<DeviceStock> qWrapper = Wrappers.lambdaQuery();
+        qWrapper.eq(DeviceStock::getDeviceNo, goods.getAddress()).or().eq(DeviceStock::getSnNo, goods.getAddress());
+        DeviceStock one = dsService.getOne(qWrapper.last("limit 1"));
+        if (one == null) {
+            throw new MsgException("设备编号不存在");
+        }
+
+        if (!one.getCode().contains("4G")) {
+            throw new MsgException("该设备编码不需要通信服务费");
+        }
+
+        if (!"3".equals(one.getStatus())) {
+            throw new MsgException("该设备暂未绑定商户");
+        }
+
+        UserApp own = new UserApp();
+        own.setUserId(1791L);
+        own = uaService.getOne(new QueryWrapper<>(own));
+
+        goods.setId(10086);
+        goods.setIsPostage(1);
+        goods.setPostageFee(BigDecimal.ZERO);
+        goods.setDeductValue(BigDecimal.TEN);
+        goods.setGoodPrice(BigDecimal.TEN);
+        goods.setDeductRule(1);
+        return officialGoodsExchangeService.exchange(goods, own);
+    }
+}
diff --git a/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/PayNotifyController.java b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/PayNotifyController.java
new file mode 100644
index 0000000..3a4fa81
--- /dev/null
+++ b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/PayNotifyController.java
@@ -0,0 +1,61 @@
+package cn.pluss.platform.controller.home;
+
+import cn.pluss.platform.pay.PayService;
+import cn.pluss.platform.ryx.pay.RyxPayService;
+import cn.pluss.platform.sxf.pay.SxfPayService;
+import com.alibaba.fastjson.JSONObject;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
+import java.util.*;
+
+
+/**
+ * 统一接收支付成功异步地址
+ */
+@RestController
+@Slf4j
+@RequiredArgsConstructor
+@RequestMapping("/notify")
+public class PayNotifyController {
+
+    @Setter(onMethod_ = {@Autowired, @Qualifier("ysPayOldService")})
+    private PayService ysPayOldService;
+
+    @Setter(onMethod_ = {@Autowired, @Qualifier("ysPayService")})
+    private PayService ysPayService;
+
+    @Setter(onMethod_ = {@Autowired, @Lazy})
+    private SxfPayService sxfPayService;
+
+    @Setter(onMethod_ = {@Autowired, @Lazy})
+    private RyxPayService ryxPayService;
+
+    @RequestMapping(value = "/sxfCallBack",method = RequestMethod.POST)
+    public Map<String,String> sxfCallBack(@RequestBody Map<String, String> map) {
+        log.info("【随行付】异步回调开始，【随行付】回调参数:{}<=====================",JSONObject.toJSONString(map));
+        return (Map<String, String>) sxfPayService.payNotifyCallBack(map);
+    }
+
+    @RequestMapping(value = "/old/ysCallBack",method = RequestMethod.POST)
+    public String oldYsCallBack(@RequestParam Map<String,String> params) {
+        log.info("【银盛】旧版接口异步回调开始，【银盛】回调参数:{}<=====================",JSONObject.toJSONString(params));
+        return (String) ysPayOldService.payNotifyCallBack(params);
+    }
+
+    @RequestMapping(value = "/ysCallBack",method = RequestMethod.POST)
+    public String ysCallBack(@RequestParam Map<String,String> params) {
+        log.info("【银盛】新版异步回调开始，【银盛】回调参数:{}<=====================",JSONObject.toJSONString(params));
+        return (String) ysPayService.payNotifyCallBack(params);
+    }
+    @RequestMapping(value = "/ryxCallBack",method = RequestMethod.POST)
+    public String ryxCallBack(@RequestParam Map<String,String> params) {
+        log.info("【瑞银信】异步回调开始，【瑞银信】回调参数:{}<=====================",JSONObject.toJSONString(params));
+        return (String) ryxPayService.payNotifyCallBack(params);
+    }
+}
diff --git a/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/UserController.java b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/UserController.java
new file mode 100644
index 0000000..333e85c
--- /dev/null
+++ b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/UserController.java
@@ -0,0 +1,89 @@
+package cn.pluss.platform.controller.home;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.entity.UserApp;
+import cn.pluss.platform.enums.UserRoleEnum;
+import cn.pluss.platform.userApp.UserAppService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
+/**
+ *
+ *用户相关controller
+ *@author: bzg
+ *@time: 2022/2/16 10:14
+ */
+@Controller
+@RequestMapping(value = "/user")
+public class UserController {
+
+    @Resource
+    private UserAppService userAppService;
+
+    private final String ERROR_PATH = "merchant/errorInfo";
+
+    private final String ERROR_NAME = "error";
+
+    @GetMapping(value = "/agent/children")
+    public ModelAndView bstAgentChildrenList(ModelAndView view,String token,HttpServletRequest request){
+        view.setViewName(ERROR_PATH);
+        try {
+            userAppService.checkWapToken(token,request,UserRoleEnum.ZY_BST);
+            view.setViewName("user/th_agent_list");
+            view.addObject("token",token);
+            return view;
+        }catch (Exception e){
+            view.addObject(ERROR_NAME,e.getMessage());
+            return view;
+        }
+    }
+
+    @GetMapping(value = "/agent/open")
+    public ModelAndView bstOpenAgent(ModelAndView view,String token,HttpServletRequest request){
+        view.setViewName(ERROR_PATH);
+        try {
+            UserApp userApp = userAppService.checkWapToken(token,request,UserRoleEnum.ZY_BST);
+            view.setViewName("user/th_agent");
+            view.addObject("uid",userApp.getUserId());
+            view.addObject("token",token);
+            return view;
+        }catch (Exception e){
+            view.addObject(ERROR_NAME,e.getMessage());
+            return view;
+        }
+    }
+
+    @PostMapping(value = "/agent/save")
+    @ResponseBody
+    public Result<Object> bstSaveAgent(@RequestParam Map<String,Object> params){
+        try {
+            userAppService.bstSaveAgent(params);
+            return ResultGenerator.genSuccessResult("注册成功");
+        }catch (Exception e){
+            return ResultGenerator.genFailResult(e.getMessage(),null);
+        }
+    }
+
+    @PostMapping(value = "/agent/page")
+    @ResponseBody
+    public Result<Object> page(Page<UserApp> page,
+                               String token, HttpServletRequest request){
+        try {
+            UserApp userApp = userAppService.checkWapToken(token,request,UserRoleEnum.ZY_BST);
+            QueryWrapper<UserApp> queryWrapper = new QueryWrapper<UserApp>().eq("parentId",userApp.getUserId())
+                    .eq("userType","agent");
+            page = userAppService.page(page, queryWrapper);
+            return ResultGenerator.genSuccessResult("获取成功",page);
+        }catch (Exception e){
+            return ResultGenerator.genFailResult(e.getMessage());
+        }
+    }
+}
diff --git a/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/VIPController.java b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/VIPController.java
new file mode 100644
index 0000000..5d0d8d4
--- /dev/null
+++ b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/VIPController.java
@@ -0,0 +1,1834 @@
+package cn.pluss.platform.controller.home;
+
+import cn.jiguang.common.utils.StringUtils;
+import cn.pluss.platform.activityActivate.ActivityActivateService;
+import cn.pluss.platform.activityConsumReturn.ActivityConsumReturnService;
+import cn.pluss.platform.activityRecharge.ActivityRechargeService;
+import cn.pluss.platform.activityRecommend.ActivityRecommendService;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.bestNewActivity.BestNewActivityService;
+import cn.pluss.platform.constants.ServiceConstants;
+import cn.pluss.platform.controller.phonecode.PhoneCodeController;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.leshua.LeshuaService;
+import cn.pluss.platform.mapper.MerchantChannelStatusMapper;
+import cn.pluss.platform.memberOrder.MemberOrderService;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
+import cn.pluss.platform.merchant.MerchantRateNewService;
+import cn.pluss.platform.merchantChannel.MerchantChannelService;
+import cn.pluss.platform.merchantIncome.MerchantIncomeService;
+import cn.pluss.platform.merchantMenber.MerchantMenberService;
+import cn.pluss.platform.merchantMenberComsume.MerchantMenberComsumeService;
+import cn.pluss.platform.merchantMenberRecharge.MerchantMenberRechargeService;
+import cn.pluss.platform.merchantOrder.MerchantOrderService;
+import cn.pluss.platform.merchantStore.MerchantStoreService;
+import cn.pluss.platform.phoneValidateCode.PhoneValidateCodeService;
+import cn.pluss.platform.systemConfig.SystemConfigService;
+import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.util.*;
+import cn.pluss.platform.wap.HttpUrlConnection;
+import cn.pluss.platform.wap.PayUnitedRequest;
+import cn.pluss.platform.wap.WechantInfoVO;
+import cn.pluss.platform.wap.XmlUtil;
+import cn.pluss.platform.wechat.*;
+import cn.pluss.platform.wx.WxAccessTokenRequest;
+import cn.pluss.platform.wx.WxCommonService;
+import cn.pluss.platform.wx.WxUserInfoResponse;
+import com.alibaba.fastjson.JSONObject;
+import com.aliyuncs.exceptions.ClientException;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.annotation.Resource;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+/**
+ * @author yuchen
+ *
+ * @Description (会员出示付款码给商家扫码 ， 从会员余额里面扣款)
+ */
+@Controller
+@RequestMapping("vip")
+public class VIPController {
+
+    @Autowired
+    private HttpServletRequest request;
+
+    @Autowired
+    private HttpServletResponse response;
+
+    @Autowired
+    private MerchantMenberService merchantMenberService;
+
+    @Autowired
+    private ActivityActivateService activityActivateService;
+
+    @Autowired
+    private ActivityConsumReturnService activityConsumReturnService;
+
+    @Autowired
+    private ActivityRechargeService activityRechargeService;
+
+    @Autowired
+    private MerchantMenberComsumeService merchantMenberComsumeService;
+
+    @Autowired
+    private MerchantMenberRechargeService merchantMenberRechargeService;
+
+    @Autowired
+    private MemberOrderService memberOrderService;
+
+    @Autowired
+    private MerchantStoreService merchantStoreService;
+
+    @Autowired
+    private PhoneValidateCodeService phoneValidateCodeService;
+
+    @Autowired
+    private ActivityRecommendService activityRecommendService;
+
+    @Autowired
+    private BestNewActivityService bestNewActivityService;
+
+    @Autowired
+    private PhoneCodeController phoneCodeController;
+
+    @Autowired
+    private MerchantBaseInfoService merchantBaseInfoService;
+
+    @Autowired
+    private MerchantIncomeService merchantIncomeService;
+
+    @Autowired
+    private SystemConfigService systemConfigService;
+
+    @Autowired
+    private UserAppService userAppService;
+
+    @Autowired
+    private LeshuaService leshuaService;
+
+    @Autowired
+    private MerchantOrderService merchantOrderService;
+
+    @Autowired
+    private MerchantChannelStatusMapper merchantChannelStatusMapper;
+
+    @Autowired
+    private MerchantChannelService merchantChannelService;
+
+
+    @Resource
+    private MerchantRateNewService merchantRateNewService;
+
+    @Resource
+    private WxCommonService wxCommonService;
+
+
+
+
+
+    private Integer PAGE_SIZE = 10;
+
+    /**
+     * bestNewActivity:(最新活动). <br/>
+     *
+     * @return
+     *
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    @GetMapping("/bestNewActivity")
+    public ModelAndView bestNewActivity() {
+        ModelAndView modelAndView = new ModelAndView("vip/bestNewActivity");
+        List<BestNewActivity> bestNewActivityList = bestNewActivityService.queryBestNewActivityList(null);
+        Integer i = 0;
+        List<BestNewActivity> b = new ArrayList<BestNewActivity>();
+        for (BestNewActivity bestNewActivity : bestNewActivityList) {
+            if (i == 4) {
+                break;
+            }
+            b.add(bestNewActivity);
+            i++;
+        }
+        modelAndView.addObject("bestNewActivityList", b);
+        return modelAndView;
+    }
+
+    /**
+     * myVIPCard:(我的会员卡). <br/>
+     *
+     * @return
+     * @throws IOException
+     *
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    @RequestMapping(value = "/myVIPCard", method = RequestMethod.GET)
+    public ModelAndView myVIPCard(String storeId, String code, String phone, String nickName, String birthdayDt,
+                                  String checkCode) throws IOException {
+        ModelAndView modelAndView = new ModelAndView();
+        modelAndView.addObject("error", "请使用微信扫码");
+        modelAndView.setViewName("merchant/errorInfo");
+        return modelAndView;
+    }
+
+    public void getMemberInfo(WeixinOauth2Token wot, MerchantMenber merchantMenber) {
+        logger.info("========开始获取头像=======");
+        String accessToken = wot.getAccessToken();// token
+        String openId = wot.getOpenId();// openId
+        String url = "https://api.weixin.qq.com/sns/userinfo?access_token=ACCESS_TOKEN&openid=OPENID&lang=zh_CN";
+        url = url.replace("ACCESS_TOKEN",accessToken).replace("OPENID",openId);
+        try {
+            String userInfo = HttpUtil.GET(url);
+            logger.info("====-=userInfo========" + JSONObject.toJSONString(userInfo));
+            WechantInfoVO wechantInfoVO = WechantInfoVO.convert(userInfo);
+            logger.info("===微信返回的参数   用户信息======" + JSONObject.toJSONString(wechantInfoVO));
+            merchantMenber.setMemberName(wechantInfoVO.getNickName());
+            merchantMenber.setLogo(wechantInfoVO.getHeadimgurl());
+            merchantMenber.setSex(wechantInfoVO.getSex());
+            merchantMenber.setProvinces(
+                    wechantInfoVO.getProvince() + "-" + wechantInfoVO.getCity() + "-" + wechantInfoVO.getCountry());
+            merchantMenber.setOpenid(openId);
+            logger.info("======存储的merchantMenber========" + JSONObject.toJSONString(merchantMenber));
+            merchantMenberService.updateMerchantMenber(merchantMenber);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * vipOpenCard:(会员开卡). <br/>
+     *
+     * @param storeId
+     * @return
+     *
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    @GetMapping("/vipOpenCard")
+    public ModelAndView vipOpenCard(String storeId, String openid) {
+        ModelAndView modelAndView = new ModelAndView();
+        modelAndView.setViewName("vip/vipOpenCard");
+        modelAndView.addObject("storeId", storeId);
+        modelAndView.addObject("openid", openid);
+        return modelAndView;
+    }
+
+    /**
+     * openCardSuccess:(点击确认开卡的按钮). <br/>
+     *
+     * @return
+     *
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    @PostMapping("/openCardSuccess")
+    @ResponseBody
+    public Map<String, Object> openCardSuccess(MerchantMenber merchantMenber, String phoneverify) {
+        Map<String, Object> result = new HashMap<>(16);
+
+        if (StringUtils.isEmpty(merchantMenber.getPhone())) {
+            result.put("code", 400);
+            result.put("msg", "请输入手机号");
+            return result;
+        }
+
+        if (StringUtils.isEmpty(phoneverify)) {
+            result.put("code", 400);
+            result.put("msg", "请输入验证码");
+            return result;
+        }
+
+        if (StringUtils.isEmpty(merchantMenber.getNickName())) {
+            result.put("code", 400);
+            result.put("msg", "请输入会员名");
+            return result;
+        }
+
+        if (StringUtils.isEmpty(merchantMenber.getBirthdayDt())) {
+            result.put("code", 400);
+            result.put("msg", "请输入生日");
+            return result;
+        }
+
+        PhoneValidateCode phoneValidateCode = new PhoneValidateCode();
+        phoneValidateCode.setCode(phoneverify);
+        phoneValidateCode.setPhone(merchantMenber.getPhone());
+        phoneValidateCode = phoneValidateCodeService.queryPhoneValidateCode(phoneValidateCode);
+        if (phoneValidateCode == null) {// 验证码有问题
+            result.put("code", "0");
+            return result;
+        }
+        WxAccessTokenRequest tokenRequest = WxAccessTokenRequest.buidWxToken(ParametersUtil.APPID,ParametersUtil.APPSECRET,null, WxConstants.WX_USER_INFO_URL);
+        WxUserInfoResponse wxUserInfo = wxCommonService.getWxUserInfo(tokenRequest, merchantMenber.getOpenid());
+        wxUserInfo.buildMember(merchantMenber,null);
+//        WechatUtils.getWxUserInfo(merchantMenber, merchantMenber.getOpenid());
+        try {
+            MerchantStore merchantStore = new MerchantStore();
+            if (StringUtil.isEmpty(merchantMenber.getStoreId()) || StringUtil.isEmpty(merchantMenber.getOpenid())) {
+                result.put("code", "3");
+                return result;
+            }
+            ActivityActivate activityActivate = new ActivityActivate();
+            merchantStore.setStoreId(merchantMenber.getStoreId());
+            List<MerchantStore> queryMerchantStoreList = merchantStoreService.queryMerchantStoreList(merchantStore);
+            if (queryMerchantStoreList != null && queryMerchantStoreList.size() > 0) {
+                merchantStore = queryMerchantStoreList.get(0);
+                merchantMenber.setMerchantCode(merchantStore.getMerchantCode());
+                merchantMenber.setMerchantName(merchantStore.getMerchantName());
+                merchantMenber.setStoreName(merchantStore.getStoreName());
+                activityActivate.setStoreId(merchantStore.getStoreId());
+                activityActivate.setMerchantCode(merchantStore.getMerchantCode());
+                // 查询门店的激活送
+                List<ActivityActivate> queryActivityActivateList = activityActivateService
+                        .queryActivityActivateList(activityActivate);
+                if (queryActivityActivateList != null && queryActivityActivateList.size() > 0) {
+                    activityActivate = queryActivityActivateList.get(0);
+                    Double giveMoney = activityActivate.getGiveMoney();// 赠送金额
+                    merchantMenber.setUsableGiveFee(giveMoney);
+                    merchantMenber.setTotalGiveFee(giveMoney);
+                }
+            }
+            String number = StringUtil.getBillno();
+            merchantMenber.setMemberCode("VIP" + number);
+            merchantMenber.setCardNo("VIP" + number);
+            merchantMenberService.saveMerchantMenber(merchantMenber);
+            phoneValidateCodeService.deletePhoneValidateCode(phoneValidateCode);
+            result.put("code", "1");// 正常
+        } catch (Exception e) {
+            result.put("code", "2");// 系统有误
+            e.printStackTrace();
+        }
+        return result;
+    }
+
+    /**
+     * vipActivity:(会员活动). <br/>
+     *
+     * @return
+     * @throws IOException
+     * @throws ServletException
+     *
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    @GetMapping("/vipActivity")
+    public ModelAndView vipActivity() throws IOException {
+        ModelAndView modelAndView = new ModelAndView("vip/vipActivity");
+        MerchantMenber merchantMenber = getSessionMerchantMenber();
+        if (merchantMenber == null) {
+            response.sendRedirect("myVIPCard");
+            return null;
+        }
+        String storeId = merchantMenber.getStoreId();
+        // storeId 并获得门店的活动
+        ActivityActivate activityActivate = new ActivityActivate();
+        activityActivate.setStoreId(storeId);
+        // 激活送活动信息
+        List<ActivityActivate> activityActivateList = activityActivateService
+                .queryActivityActivateList(activityActivate);
+        if (activityActivateList != null && activityActivateList.size() > 0) {
+            activityActivate = activityActivateList.get(0);
+        } else {
+            activityActivate = null;
+        }
+        ActivityConsumReturn activityConsumReturn = new ActivityConsumReturn();
+        activityConsumReturn.setStoreId(storeId);
+        // 消费返活动信息
+        List<ActivityConsumReturn> activityConsumReturnList = activityConsumReturnService
+                .queryActivityConsumReturnList(activityConsumReturn);
+        if (activityConsumReturnList != null && activityConsumReturnList.size() > 0) {
+            activityConsumReturn = activityConsumReturnList.get(0);
+        } else {
+            activityConsumReturn = null;
+        }
+        ActivityRecharge activityRecharge = new ActivityRecharge();
+        activityRecharge.setStoreId(storeId);
+        // 充值活动信息
+        List<ActivityRecharge> activityRechargeList = activityRechargeService
+                .queryActivityRechargeList(activityRecharge);
+        if (activityRechargeList != null && activityRechargeList.size() > 0) {
+            activityRecharge = activityRechargeList.get(0);
+        } else {
+            activityRecharge = null;
+        }
+        // 推荐送
+        ActivityRecommend activityRecommend = new ActivityRecommend();
+        activityRecommend.setStoreId(storeId);
+        List<ActivityRecommend> queryActivityRecommendList = activityRecommendService
+                .queryActivityRecommendList(activityRecommend);
+        if (queryActivityRecommendList != null && queryActivityRecommendList.size() > 0) {
+            activityRecommend = queryActivityRecommendList.get(0);
+        } else {
+            activityRecommend = null;
+        }
+        Map<String, Object> result = new HashMap<String, Object>(16);
+        result.put("activityActivate", activityActivate);
+        result.put("activityConsumReturn", activityConsumReturn);
+        result.put("activityRecharge", activityRecharge);
+        result.put("activityRecommend", activityRecommend);
+        modelAndView.addAllObjects(result);
+        return modelAndView;
+    }
+
+    /**
+     * storeChoose:(门店选择). <br/>
+     *
+     * @return
+     *
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    @GetMapping("/storeChoose")
+    public ModelAndView storeChoose(String membercode) {
+        MerchantMenber merchantMenber = (MerchantMenber) request.getSession().getAttribute("sessionMerchantMenber");
+        MerchantMenber m = new MerchantMenber();
+        m.setOpenid(merchantMenber.getOpenid());
+        List<MerchantMenber> merchantMenberList = merchantMenberService.queryMerchantMenberList(m);
+        for (MerchantMenber member : merchantMenberList) {
+            MerchantBaseInfo merchantBaseInfo = new MerchantBaseInfo();
+            merchantBaseInfo.setMerchantCode(member.getMerchantCode());
+            merchantBaseInfo = merchantBaseInfoService.queryMerchantBaseInfo(merchantBaseInfo);
+            member.setStoreName(merchantBaseInfo.getAlias());
+        }
+        ModelAndView modelAndView = new ModelAndView("vip/storeChoose");
+        Map<String, Object> result = new HashMap<String, Object>(16);
+        result.put("merchantMenberList", merchantMenberList);
+        modelAndView.addAllObjects(result);
+        return modelAndView;
+    }
+
+    /**
+     * goPay:(去充值). <br/>
+     *
+     * @return
+     *
+     * @author Administrator
+     * @since JDK 1.8
+     */
+//    @GetMapping("/goPay")
+//    public ModelAndView goPay() {
+//        ModelAndView modelAndView = new ModelAndView();
+//        MerchantMenber merchantMenber = (MerchantMenber) request.getSession().getAttribute("sessionMerchantMenber");
+//        logger.debug(merchantMenber + "");
+//        Map<String, Object> result = new HashMap<>(16);
+//        modelAndView.setViewName("vip/goPay");
+//        result.put("merchantMenber", merchantMenber);
+//        String storeId = merchantMenber.getStoreId();
+//        String merchantCode = merchantMenber.getMerchantCode();
+//        ActivityRecharge activityRecharge = new ActivityRecharge();
+//        activityRecharge.setMerchantCode(merchantCode);
+//        activityRecharge.setStoreId(storeId);
+//        List<ActivityRecharge> queryActivityRechargeList = activityRechargeService
+//                .queryActivityRechargeList(activityRecharge);
+//        if (queryActivityRechargeList != null && queryActivityRechargeList.size() > 0) {
+//            result.put("activityRechargeList", queryActivityRechargeList);
+//        }
+//        modelAndView.addAllObjects(result);
+//        return modelAndView;
+//    }
+
+    /**
+     * wechatPay:(点击充值按钮进入的方法). <br/>
+     *
+     * @param rechargeMoney
+     * @return
+     *
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    @PostMapping("/wechatPay")
+    @ResponseBody
+    public Map<String, Object> wechatPay(String rechargeMoney) {
+        throw new MsgException("暂时不支持该接口");
+//        Map<String, Object> map = new HashMap<String, Object>(16);
+//        String orderNumber = "CZ700" + StringUtil.getBillno();
+//        String openid = (String) request.getSession().getAttribute("SessionOpenid");// 获取openId
+//        String unionId = (String) request.getSession().getAttribute("SessionUnionId");// 获取unionId
+//        MerchantMenber merchantMenber = (MerchantMenber) request.getSession().getAttribute("sessionMerchantMenber");
+//        String merchantCode = merchantMenber.getMerchantCode();
+//        MerchantBaseInfo merchantBaseInfo = new MerchantBaseInfo();
+//        merchantBaseInfo.setMerchantCode(merchantCode);
+//        List<MerchantBaseInfo> queryMerchantBaseInfoList = merchantBaseInfoService
+//                .queryMerchantBaseInfoList(merchantBaseInfo);
+//        if (queryMerchantBaseInfoList != null && queryMerchantBaseInfoList.size() > 0) {
+//            merchantBaseInfo = queryMerchantBaseInfoList.get(0);
+//        }
+//        String userId = merchantBaseInfo.getUserId();
+//        logger.info("wechatPay方法=====openid:" + openid + "=========");
+//        logger.info("wechatPay方法=====merchantMenber:" + JSONObject.toJSONString(merchantMenber) + "");
+//        String appId = ParametersUtil.APPID;
+//        PayInfo payInfo = new PayInfo();
+//        payInfo.setAppId(appId);
+//        if (StringUtil.isNotEmpty(merchantMenber.getStoreName())) {
+//            payInfo.setGoodsName(merchantMenber.getStoreName());
+//        } else {
+//            payInfo.setGoodsName("payment");
+//        }
+//        payInfo.setOrderNumber(orderNumber);
+//        payInfo.setOpenId(openid);
+//        payInfo.setOrderPrice(Double.valueOf(rechargeMoney));
+//        payInfo.setTransSeq(orderNumber);
+//        payInfo.setSubMchId(merchantBaseInfo.getSubMchId());
+//        PayUnitedResponse payUnitedResponse;
+//        try {
+//            // 订单表
+//            MemberOrder memberOrder = new MemberOrder();
+//            memberOrder.setOrderFee(rechargeMoney);
+//            memberOrder.setMemberCode(merchantMenber.getMemberCode());
+//            memberOrder.setMerchantCode(merchantMenber.getMerchantCode());
+//            memberOrder.setMerchantName(merchantMenber.getMerchantName());
+//            memberOrder.setStoreId(merchantMenber.getStoreId());
+//            memberOrder.setStoreName(merchantMenber.getStoreName());
+//            memberOrder.setCreateDt(new Date());
+//            memberOrder.setNickName(merchantMenber.getNickName());
+//            memberOrder.setOrderStatus("0");
+//            memberOrder.setOrderType("1");
+//            memberOrder.setRechargeType("0");
+//            memberOrder.setOrderNumber(orderNumber);
+//            logger.info("=======wechatPay:fangfa" + JSONObject.toJSONString(memberOrder) + "");
+//            memberOrderService.saveMemberOrder(memberOrder);
+//            UserApp userApp = new UserApp();
+//            userApp.setUserId(Long.valueOf(userId));
+//            userApp = userAppService.queryUserApp(userApp);
+//            String aisleSwitch = systemConfigService.querySystemConfigValue("aisleSwitch");
+//            String payTypeCode = "";
+//            String payTypeName = "";
+//            map.put("aisleSwitch",aisleSwitch);
+//            if ("0".equals(aisleSwitch)) {
+//                payTypeCode = "wechatPay";
+//                payTypeName = "微信";
+//                payUnitedResponse = buildPrePayment(payInfo, request);
+//                WechatPayment wechatPayment = toPay(payUnitedResponse);
+//                logger.info("===================wechatPayment===============" + JSONObject.toJSONString(wechatPayment));
+//                map.put("code", "1");
+//                map.put("data", wechatPayment);
+//            } else if ("1".equals(aisleSwitch)) {
+//                Map<String, String> reqMap = new HashMap<String, String>(16);
+//                reqMap.put("service", "get_tdcode");
+//                reqMap.put("pay_way", "WXZF");
+//                reqMap.put("amount", Double.valueOf(rechargeMoney) * 100 + "");
+//                reqMap.put("merchant_id", userApp.getLeshuaMchId());
+//                reqMap.put("third_order_id", orderNumber);
+//                reqMap.put("jspay_flag", "2");
+//                reqMap.put("notify_url", URLEncoder.encode(ParametersUtil.domain + "/wap/merchant/memberPayBack", "utf-8"));
+//                reqMap.put("jump_url", URLEncoder.encode(ParametersUtil.domain + "/wap/vip/jumpUrl?storeId="+merchantMenber.getStoreId()+"&leshuaMchId=" + userApp.getLeshuaMchId() + "&orderNumber=" + orderNumber, "utf-8"));
+//                reqMap.put("client_ip", getIpAddress(request));
+//                if (StringUtil.isNotEmpty(merchantMenber.getStoreName())) {
+//                    reqMap.put("body", merchantMenber.getStoreName());
+//                } else if (StringUtil.isNotEmpty(merchantMenber.getMerchantName())) {
+//                    reqMap.put("body", merchantMenber.getMerchantName());
+//                } else {
+//                    reqMap.put("body", "leshuaPay");
+//                }
+//                reqMap.put("nonce_str", StringUtil.genRandomNum(32));
+//                payTypeCode = "leshuaPay1";
+//                payTypeName = "乐刷微信支付";
+//                String apKey = "60E3F31EDEC8061C33721737B36FA86D";
+//                System.out.println("reqMap===========================" + JSONObject.toJSONString(reqMap));
+//                String requestPay = leshuaService.requestPay(reqMap, apKey, true);
+//                System.out.println("requestPay===========================" + requestPay);
+//                map = XmlUtil.toMapLeshua(requestPay);
+//                map.put("code", "2");
+//            }else if("2".equals(aisleSwitch)){
+//                payTypeCode = "sxfPay1";
+//                payTypeName = "随行微信支付";
+//                MerchantStore store = new MerchantStore();
+//                store.setStoreId(merchantMenber.getStoreId());
+//                store.setStoreName(merchantMenber.getStoreName());
+//                QueryWrapper<MerchantChannel> channelQueryWrapper = new QueryWrapper<MerchantChannel>().eq("channelCode","SXF");
+//                MerchantChannel channel = merchantChannelService.getOne(channelQueryWrapper);
+//                if(channel == null){
+//                    map.put("code", "1");
+//                    map.put("msg", "未获取到当前通道配置信息！");
+//                    return map;
+//                }
+//                if(!"1".equals(channel.getStatus())){
+//                    map.put("code", "0");
+//                    map.put("msg", "通道已经关闭！");
+//                    return map;
+//                }
+//                QueryWrapper<MerchantChannelStatus> statusQueryWrapper = new QueryWrapper<MerchantChannelStatus>().eq("channel",channel.getId())
+//                        .eq("merchantCode",merchantCode);
+//                MerchantChannelStatus channelStatus = merchantChannelStatusMapper.selectOne(statusQueryWrapper);
+//                if(channelStatus == null){
+//                    map.put("code", "0");
+//                    map.put("msg", "当前交易商户还未进件！");
+//                    return map;
+//                }
+//                if(!channelStatus.isPayment()){
+//                    map.put("code", "0");
+//                    map.put("msg", "当前交易商户进件还未成功！");
+//                    return map;
+//                }
+//                Map<String,String> params = new HashMap<>();
+//                params.put("comsumeMoney",rechargeMoney);
+//                params.put("payWay","WXZF");
+//                params.put("openid",merchantMenber.getOpenid());
+//                //Map<String, Object> resultMap = sxfPayService.tradePay(params, request, store, orderNumber, channelStatus);
+//                Map<String, Object> resultMap = new HashMap<>();
+//                if(!"1".equals(resultMap.get("code"))){
+//                    map.put("code", "0");
+//                    map.put("msg", resultMap.get("msg"));
+//                    return map;
+//                }
+//                Map<String,Object> result = (Map<String, Object>) resultMap.get("data");
+//                map.put("code", "2");
+//                map.put("data",result);
+//            }else{
+//                map.put("code", "0");
+//                map.put("data", null);
+//                map.put("msg", "暂不支持其他通道！");
+//            }
+//            MerchantOrder merchantOrder = new MerchantOrder();
+//            merchantOrder.setMerchantCode(merchantCode);
+//            merchantOrder.setStoreId(merchantMenber.getStoreId());
+//            merchantOrder.setStoreName(merchantMenber.getStoreName());
+//            merchantOrder.setMerchantName(merchantMenber.getMerchantName());
+//            merchantOrder.setOrderNumber(orderNumber);
+//            merchantOrder.setStaffCode(merchantMenber.getStoreId());
+//            merchantOrder.setStaffName(merchantMenber.getStoreName());
+//            merchantOrder.setPayTypeCode(payTypeCode);
+//            merchantOrder.setPayTypeName(payTypeName);
+//            merchantOrder.setConsumeFee(Double.valueOf(rechargeMoney));
+//            merchantOrder.setUserImg(merchantMenber.getLogo());
+//            merchantOrder.setNickName(merchantMenber.getNickName());
+//
+//            BigDecimal rate = merchantRateNewService.getMchRate(merchantBaseInfo.getMerchantCode(),merchantOrder.getPayTypeCode(), merchantOrder.getConsumeFee());
+//
+//            BigDecimal calcRate = rate.divide(new BigDecimal(10000));
+//
+//            merchantOrder.setEnterFee(StringUtil.bigDecimal(
+//                    Double.parseDouble(rechargeMoney) - Double.parseDouble(rechargeMoney) * calcRate.doubleValue()));
+//            Date date = new Date();
+//            merchantOrder.setCreateDt(date);
+//            merchantOrder.setUpdateTime(date);
+//            merchantOrder.setStatus("5");
+//            merchantOrder.setAisleSwitch(aisleSwitch);
+//            merchantOrder.setOrderType("3");
+//            merchantOrderService.save(merchantOrder);
+//        } catch (Exception e) {
+//            map.put("code", "0");
+//            e.printStackTrace();
+//        }
+//        return map;
+    }
+
+    /**
+     * jumpUrl:(乐刷支付完成后的跳转地址). <br/>
+     *
+     * @param orderNumber
+     * @param leshuaMchId
+     * @return
+     *
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    @GetMapping("/jumpUrl")
+    public ModelAndView jumpUrl(String orderNumber, String leshuaMchId,String storeId) {
+        logger.info("====订单号====" + orderNumber);
+        if (orderNumber.contains("?")) {
+            String str[] = orderNumber.split("[?]");
+            orderNumber = str[0];
+        }
+        logger.info("=========当前商户乐刷商户id==========" + leshuaMchId);
+        ModelAndView modelAndView = new ModelAndView();
+        Map<String, String> reqMap = new HashMap<>(16);
+        Map<String, Object> mapLeshua;
+        try {
+            reqMap.put("service", "query_status");
+            reqMap.put("merchant_id", leshuaMchId);
+            reqMap.put("third_order_id", orderNumber);
+            reqMap.put("nonce_str", StringUtil.getBillno());
+            String requestPay = leshuaService.requestPay(reqMap, "60E3F31EDEC8061C33721737B36FA86D", true);
+            mapLeshua = XmlUtil.toMapLeshua(requestPay);
+            String resp_code = (String) mapLeshua.get("resp_code");
+            if ("0".equals(resp_code)) {
+                String result_code = (String) mapLeshua.get("result_code");
+                if ("0".equals(result_code)) {
+                    String status = (String) mapLeshua.get("status");
+                    if ("2".equals(status)) {
+                        modelAndView.setViewName("vip/paySuccess");
+                    } else {
+                        modelAndView.setViewName("vip/payFail");
+                    }
+                } else {
+                    modelAndView.addObject("message", "支付结果查询错误");
+                    modelAndView.setViewName("merchant/error");
+                }
+            } else {
+                modelAndView.addObject("message", "支付结果查询错误");
+                modelAndView.setViewName("merchant/error");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            modelAndView.addObject("message", "支付结果查询错误");
+            modelAndView.setViewName("merchant/error");
+        }
+        modelAndView.addObject("url",ParametersUtil.getRequestPrefix(request));
+        modelAndView.addObject("storeId",storeId);
+        return modelAndView;
+    }
+
+    public static Set<String> resExcludedSignParams() {
+        Set<String> exludedSignParams = new HashSet<>(2);
+        exludedSignParams.add("sign");
+        exludedSignParams.add("error_code");
+        return exludedSignParams;
+    }
+
+    /**
+     * rechargeSuccess:(充值成功页面). <br/>
+     *
+     * @return
+     *
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    @GetMapping("/rechargeSuccess")
+    public ModelAndView rechargeSuccess() {
+        MerchantMenber merchantMenber = (MerchantMenber) request.getSession().getAttribute("sessionMerchantMenber");
+        ModelAndView modelAndView = new ModelAndView("vip/paySuccess");
+        modelAndView.addObject("url", ParametersUtil.getRequestPrefix(request));
+        modelAndView.addObject("storeId", merchantMenber.getStoreId());
+        return modelAndView;
+    }
+
+    /**
+     * rechargeFail:(充值失败页面). <br/>
+     *
+     * @return
+     *
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    @GetMapping("/rechargeFail")
+    public ModelAndView rechargeFail() {
+        MerchantMenber merchantMenber = (MerchantMenber) request.getSession().getAttribute("sessionMerchantMenber");
+        ModelAndView modelAndView = new ModelAndView("vip/payFail");
+        modelAndView.addObject("storeId", merchantMenber.getStoreId());
+        modelAndView.addObject("url",ParametersUtil.getRequestPrefix(request));
+        return modelAndView;
+    }
+
+    /**
+     * goPayment:(去支付). <br/>
+     *
+     * @return
+     * @throws IOException
+     *
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    @GetMapping("/goPayment")
+    public ModelAndView goPayment() {
+        ModelAndView modelAndView = new ModelAndView("vip/goPayment");
+        Map<String, Object> result = new HashMap<String, Object>(16);
+        MerchantMenber merchantMenber = getSessionMerchantMenber();
+        result.put("website", merchantMenber.getCardNo());
+        modelAndView.addAllObjects(result);
+        return modelAndView;
+    }
+
+//	/**
+//	 * 
+//	 * inputComsumeMoney:(输入消费金额跳转). <br/> 
+//	 *
+//	 * @author Administrator 
+//	 * @param cardNo
+//	 * @param storeId
+//	 * @return 
+//	 * @since JDK 1.8
+//	 */
+//	@GetMapping("/inputComsumeMoney")
+//	public ModelAndView inputComsumeMoney(String cardNo,String storeId) {
+//		ModelAndView modelAndView=new ModelAndView("vip/inputComsumeMoney");
+//		modelAndView.addObject("cardNo", cardNo);
+//		modelAndView.addObject("storeId", storeId);
+//		return modelAndView;
+//	}
+
+    /**
+     *
+     * paySuccessOrFail:(支付成功or支付失败). <br/>
+     *
+     *
+     * @author Administrator
+     * @return
+     * @since JDK 1.8
+     * @params comsumeMoney(消费金额)
+     */
+//	@GetMapping("/paySuccessOrFail")
+//	public ModelAndView paySuccessOrFail(MerchantMenber merchantMenber,String comsumeMoney) {
+//		ModelAndView modelAndView=new ModelAndView();
+//		try {
+//			List<MerchantMenber> queryMerchantMenberList = merchantMenberService.queryMerchantMenberList(merchantMenber);
+//			if(queryMerchantMenberList!=null&&queryMerchantMenberList.size()>0) {
+//				merchantMenber = queryMerchantMenberList.get(0);
+//			}else {
+//				modelAndView.setViewName("vip/payFail");
+//				return modelAndView;
+//			}
+//			//充值金额
+//			Double usableRechargeFee = merchantMenber.getUsableRechargeFee();
+//			if(usableRechargeFee==null) {
+//				usableRechargeFee=0.0d;
+//			}
+//			//赠送金额
+//			Double usableGiveFee = merchantMenber.getUsableGiveFee();
+//			if(usableGiveFee==null) {
+//				usableGiveFee=0.0d;
+//			}
+//			//账户余额
+//			Double count=usableRechargeFee+usableGiveFee;
+//			if(StringUtil.isNotEmpty(comsumeMoney)) {
+//				Double comsume=Double.valueOf(comsumeMoney);
+//				if(comsume>count) {
+//					//支付失败跳转的页面
+//					modelAndView.setViewName("vip/payFail");
+//					return modelAndView;
+//				}else {
+//					Double giveFee=0.0d;
+//					//赠送余额大于等于消费金额
+//					if(usableGiveFee>=comsume) {
+//						giveFee=usableGiveFee-comsume;
+//						merchantMenber.setUsableGiveFee(giveFee);
+//						merchantMenberService.updateMerchantMenber(merchantMenber);
+//						//赠送余额小于消费金额
+//					}else {
+//						Double recharge=usableRechargeFee-comsume-usableGiveFee;
+//						merchantMenber.setUsableGiveFee(giveFee);
+//						merchantMenber.setUsableRechargeFee(recharge);
+//						merchantMenberService.updateMerchantMenber(merchantMenber);
+//					}
+//				}
+//				//支付成功跳转的页面
+//				modelAndView.setViewName("vip/paySuccess");
+//			}
+//		} catch (NumberFormatException e) {
+//			modelAndView.setViewName("vip/payFail");
+//			e.printStackTrace();
+//		}
+//		return modelAndView;
+//	}
+
+    /**
+     * consumeLog:(消费记录跳转). <br/>
+     *
+     * @return
+     *
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    @GetMapping("/consumeLog")
+    public ModelAndView consumeLog() {
+        ModelAndView modelAndView = new ModelAndView("vip/consumeLog");
+        Map<String, Object> result = new HashMap<String, Object>(16);
+        MerchantMenber merchantMenber = getSessionMerchantMenber();
+        result.put("memberCode", merchantMenber.getMemberCode());
+        result.put("storeId", merchantMenber.getStoreId());
+        modelAndView.addAllObjects(result);
+        return modelAndView;
+    }
+
+    /**
+     * goConsumeLog:(消费记录). <br/>
+     *
+     * @param currPage
+     * @param memberCode
+     * @param storeId
+     * @return
+     *
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    @PostMapping("/goConsumeLog")
+    @ResponseBody
+    public Map<String, Object> goConsumeLog(@RequestParam(defaultValue = "1") Integer currPage, String memberCode,
+                                            String storeId) {
+        Map<String, Object> map = new HashMap<String, Object>(16);
+        if (StringUtil.isNotEmpty(memberCode)) {
+            map.put("memberCode", memberCode);
+        }
+        if (StringUtil.isNotEmpty(storeId)) {
+            map.put("storeId", storeId);
+        }
+        map.put("orderStatus", "1");
+        map.put("pageSize", PAGE_SIZE);
+        map.put("offset", (currPage - 1) * PAGE_SIZE);
+        Map<String, Object> result = new HashMap<>(16);
+        List<MerchantMenberComsume> merchantMenberComsumeList = merchantMenberComsumeService
+                .queryMerchantMenberComsumePage(map);
+        Integer count = merchantMenberComsumeService.queryMerchantMenberComsumePageCount(map);
+        result.put("merchantMenberComsumeList", merchantMenberComsumeList);
+        result.put("count", count);
+        result.put("pageCount", StringUtil.getPageCount(count, PAGE_SIZE));
+        result.put("currPage", currPage);
+        return result;
+    }
+
+    /**
+     * rechargeLog:(充值记录跳转). <br/>
+     *
+     * @return
+     *
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    @GetMapping("/rechargeLog")
+    public ModelAndView rechargeLog() {
+        ModelAndView modelAndView = new ModelAndView("vip/rechargeLog");
+        Map<String, Object> result = new HashMap<String, Object>(16);
+        MerchantMenber merchantMenber = getSessionMerchantMenber();
+        result.put("memberCode", merchantMenber.getMemberCode());
+        result.put("storeId", merchantMenber.getStoreId());
+        modelAndView.addAllObjects(result);
+        return modelAndView;
+    }
+
+    /**
+     * goRechargeLog:(充值记录). <br/>
+     *
+     * @param currPage
+     * @param memberCode
+     * @param storeId
+     * @return
+     *
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    @PostMapping("/goRechargeLog")
+    @ResponseBody
+    public Map<String, Object> goRechargeLog(@RequestParam(defaultValue = "1") Integer currPage, String memberCode,
+                                             String storeId) {
+        Map<String, Object> map = new HashMap<String, Object>();
+        if (StringUtil.isNotEmpty(memberCode)) {
+            map.put("memberCode", memberCode);
+        }
+        if (StringUtil.isNotEmpty(storeId)) {
+            map.put("storeId", storeId);
+        }
+        map.put("orderStatus", "1");
+        map.put("pageSize", PAGE_SIZE);
+        map.put("offset", (currPage - 1) * PAGE_SIZE);
+        List<MerchantMenberRecharge> merchantMenberRechargeList = merchantMenberRechargeService
+                .queryMerchantMenberRechargePage(map);
+        Integer count = merchantMenberRechargeService.queryMerchantMenberRechargePageCount(map);
+        Map<String, Object> result = new HashMap<String, Object>();
+        result.put("merchantMenberRechargeList", merchantMenberRechargeList);
+        result.put("count", count);
+        result.put("pageCount", StringUtil.getPageCount(count, PAGE_SIZE));
+        result.put("currPage", currPage);
+        return result;
+    }
+
+    private static final Logger logger = LoggerFactory.getLogger(VIPController.class);
+
+    /**
+     * getUserCode:(授权). <br/>
+     *
+     * @param response
+     * @return
+     * @throws UnsupportedEncodingException
+     *
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    @GetMapping("/auth")
+    public ModelAndView getUserCode(HttpServletResponse response, String storeId, String phone, String nickName,
+                                    String birthdayDt) throws UnsupportedEncodingException {
+        ModelAndView modelAndView = new ModelAndView("vip/auth");
+        Map<String, Object> result = new HashMap<String, Object>(16);
+        String APPID = ParametersUtil.APPID;
+        result.put("appId", APPID);
+        if (!StringUtil.isEmpty(nickName)) {
+            nickName = URLDecoder.decode(nickName, "UTF-8");
+        }
+        logger.error("======auth  fangfa=============" + nickName);
+        logger.debug("=======appId==" + APPID + "==appId===========");
+        result.put("appSecret", ParametersUtil.APPSECRET);
+        logger.debug("=======appSecret==" + APPID + "==appSecret===========");
+        modelAndView.addAllObjects(result);
+        // 判断是微信，跳转微信授权
+        String ua = request.getHeader("user-agent").toLowerCase();
+        String redirectUri = "";
+        if (StringUtil.isNotEmpty(phone)) {
+            MerchantMenber merchantMenber = new MerchantMenber();
+            MerchantStore merchantStore = new MerchantStore();
+            merchantStore.setStoreId(storeId);
+            merchantStore = merchantStoreService.queryMerchantStore(merchantStore);
+            merchantMenber.setStoreId(storeId);
+            if (StringUtil.isNotEmpty(nickName)) {
+                merchantMenber.setNickName(nickName);
+            }
+            merchantMenber.setPhone(phone);
+            List<MerchantMenber> queryMerchantMenberList = merchantMenberService
+                    .queryMerchantMenberList(merchantMenber);
+            merchantMenber.setMerchantCode(merchantStore.getMerchantCode());
+            String memberCode = "VIP" + StringUtil.getBillno();
+            merchantMenber.setMemberCode(memberCode);
+            merchantMenber.setCardNo(memberCode);
+            merchantMenber.setMerchantName(merchantStore.getMerchantName());
+            merchantMenber.setStoreName(merchantStore.getStoreName());
+            merchantMenber.setBirthdayDt(birthdayDt);
+            ActivityActivate activityActivate = new ActivityActivate();
+            if (StringUtil.isNotEmpty(storeId)) {
+                redirectUri = "/vip/myVIPCard?storeId=" + storeId + "&phone=" + phone;// 回调地址
+                activityActivate.setStoreId(storeId);
+                List<ActivityActivate> queryActivityActivateList = activityActivateService
+                        .queryActivityActivateList(activityActivate);// 查询门店的激活送
+                if (queryActivityActivateList != null && queryActivityActivateList.size() > 0) {
+                    activityActivate = queryActivityActivateList.get(0);
+                    Double giveMoney = activityActivate.getGiveMoney();// 赠送金额
+                    merchantMenber.setUsableGiveFee(giveMoney);
+                    merchantMenber.setTotalGiveFee(giveMoney);
+                }
+            } else {
+                redirectUri = "/vip/myVIPCard";
+            }
+            if (queryMerchantMenberList == null || queryMerchantMenberList.size() == 0) {
+                saveMemberOrderSS(merchantMenber, activityActivate);
+                merchantMenberService.saveMerchantMenber(merchantMenber);
+            }
+            request.getSession().setAttribute("sessionMerchantMenber", merchantMenber);
+        } else {
+            if (StringUtil.isNotEmpty(storeId)) {
+                redirectUri = ParametersUtil.getRequestPrefix(request)+ "/vip/myVIPCard?storeId=" + storeId;
+            } else {
+                redirectUri = ParametersUtil.getRequestPrefix(request) + "/vip/myVIPCard";
+            }
+        }
+        logger.debug("=======回调地址" + redirectUri + "回调地址===========");
+        request.setAttribute("url", redirectUri);
+        logger.debug("=======判断是否是微信" + ua + "判断是否是微信===========");
+        logger.debug("=======判断是否是微信" + ua.contains("micromessenger") + "判断是否是微信===========");
+        if (ua.contains("micromessenger")) {
+            try {
+                redirectUri = java.net.URLEncoder.encode(redirectUri, "utf-8");
+                logger.debug("=======回调地址" + redirectUri + "回调地址===========");
+                response.sendRedirect("https://open.weixin.qq.com/connect/oauth2/authorize?appid=" + APPID
+                        + "&redirect_uri=" + redirectUri
+                        + "&response_type=code&scope=snsapi_base&storeId=123#wechat_redirect");
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            return null;
+        }
+        return modelAndView;
+    }
+
+
+    /**
+     * getUserOpenId:(通过code获取openId). <br/>
+     *
+     * @param code
+     * @return
+     *
+     * @author Administrator
+     * @since JDK 1.8
+     */
+//    private WeixinOauth2Token getUserOpenId(String code) {
+//        String appId = ParametersUtil.APPID;
+//        String appSecret = ParametersUtil.APPSECRET;
+//        WeixinOauth2Token wot = null;
+//        System.out.println("=====getUserOpenId: appId=" + appId + ",appSecret=" + appSecret);
+//        if (!"authdeny".equals(code)) {
+//            if (code != null) {
+//                wot = Oauth2Util.getOauth2AccessToken(appId, appSecret, code);
+//                System.out.println("wot-------------------------" + JSONObject.toJSONString(wot));
+//                request.getSession().setAttribute("SessionOpenid", wot.getOpenId());
+//                request.getSession().setAttribute("SessionUnionId", wot.getOpenId());
+//            }
+////            MerchantMenber merchantMenber = new MerchantMenber();
+////            merchantMenber.setOpenid(wot.getOpenId());
+////            System.out.println("wot-------------------------" + JSONObject.toJSONString(merchantMenber));
+////            System.out.println("=====getUserOpenId: openid=" + wot.getOpenId());
+//        }
+//        return wot;
+//    }
+
+    /**
+     * buildPrePayment:(创建预支付信息). <br/>
+     *
+     * @param payInfo
+     * @return
+     * @throws Exception
+     *
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    private PayUnitedResponse buildPrePayment(PayInfo payInfo, HttpServletRequest request) throws Exception {
+        logger.debug("buildPrePayment 创建预支付信息====" + payInfo);
+        String appId = ParametersUtil.APPID;
+        String pId = ParametersUtil.PID;
+        String pKey = ParametersUtil.KEY;
+        payInfo.setPid(pId);
+        payInfo.setPkey(pKey);
+        payInfo.setAppId(appId);
+        // 创建请求对象
+        PayUnitedRequest payUnitedRequest = new PayUnitedRequest();
+        String notify_url = ParametersUtil.getSelfRedirectUrl(request, "/vip/wechatCallback");
+        Map<String, String> result = payUnitedRequest.getMap(payInfo, notify_url, getIpAddress(request));
+        String xml = result.get("xml");
+        String response = HttpUrlConnection.httpXML(ServiceConstants.WEIXIN_PAY_UNIFIED_URL, xml);
+        PayUnitedResponse payUnitedResponse = WeiXinUtil.xmlToPayUnitedResponse(response);
+        logger.info("=buildPrePayment==================fanhuijieguo" + response);
+        // 发起支付请求
+        return payUnitedResponse;
+    }
+
+    /**
+     * 微信支付回调
+     *
+     * @throws IOException
+     */
+    @PostMapping("/wechatCallback")
+    @ResponseBody
+    public void wechatCallback() throws IOException {
+        try {
+            String xml = readRequestMsg(request);
+            System.out.println("======================callback parameters info====================：" + xml);
+            // 解析报文
+            PayNotify payNotify = WeiXinUtil.xmlToPayNotify(xml);
+            if ("SUCCESS".equals(payNotify.getReturn_code())) {
+                String orderNumber = payNotify.getOut_trade_no();
+                UpdateOrder(orderNumber, payNotify);
+                UpdateMerchantOrder(orderNumber, payNotify);
+            }
+        } catch (Exception e) {
+            System.out.println("微信支付后台回调处理异常！===" + e);
+        }
+        response.getWriter().write("<xml><return_code><![CDATA[SUCCESS]]></return_code></xml>");
+    }
+
+    private void UpdateMerchantOrder(String orderNumber, PayNotify payNotify) throws Exception {
+        String transaction_id = payNotify.getTransaction_id();
+        String time_end = payNotify.getTime_end();
+        MerchantOrder merchantOrder = new MerchantOrder();
+        merchantOrder.setOrderNumber(orderNumber);
+        List<MerchantOrder> queryMerchantOrderList = merchantOrderService.list(new QueryWrapper<>(merchantOrder));
+        if (queryMerchantOrderList != null && queryMerchantOrderList.size() > 0) {
+            merchantOrder = queryMerchantOrderList.get(0);
+            if ("1".equals(merchantOrder.getStatus())) {
+                return;
+            }
+            MerchantOrder m = new MerchantOrder();
+            m.setThirdTransNo(transaction_id);
+            m.setStatus("1");
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd-HH-mm:ss");
+            m.setTransDt(sdf.parse(time_end));
+            m.setId(merchantOrder.getId());
+            merchantOrderService.updateById(m);
+        }
+
+    }
+
+    /**
+     * toPay:(支付). <br/>
+     *
+     * @param payUnitedResponse
+     * @return
+     *
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    private WechatPayment toPay(PayUnitedResponse payUnitedResponse) {
+        logger.info("==================payUnitedResponse======================="
+                + JSONObject.toJSONString(payUnitedResponse));
+        String appId = ParametersUtil.APPID;
+        String appSecret = ParametersUtil.APPSECRET;
+        String pKey = ParametersUtil.KEY;
+        WechatPayment wechatPayment = new WechatPayment();
+        String nonceStr = UUID.randomUUID().toString();
+        wechatPayment.setAppId(appId);
+        wechatPayment.setNonceStr(nonceStr);
+        String timeStamp = System.currentTimeMillis() + "";
+        String packageMsg = "prepay_id=" + payUnitedResponse.getPrepay_id();
+        wechatPayment.setPackageMsg(packageMsg);
+        String signType = "MD5";
+        String paySgin = paySign(pKey, packageMsg, appId, timeStamp, appSecret, nonceStr, signType).toUpperCase();
+
+        wechatPayment.setSignType(signType);
+        wechatPayment.setPaySgin(paySgin);
+        wechatPayment.setTimeStamp(timeStamp);
+        return wechatPayment;
+    }
+
+    /**
+     * paySign:(获取Sign). <br/>
+     *
+     * @param paternerKey
+     * @param packageMsg
+     * @param appId
+     * @param timeStamp
+     * @param appkey
+     * @param nonceStr
+     * @param signType
+     * @return
+     *
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    private String paySign(String paternerKey, String packageMsg, String appId, String timeStamp, String appkey,
+                           String nonceStr, String signType) {
+
+        Map<String, String> param = new HashMap<String, String>();
+        param.put("appId", appId);
+        param.put("timeStamp", timeStamp);
+        param.put("nonceStr", nonceStr);
+        param.put("package", packageMsg);
+        param.put("signType", signType);
+        // 去除空串
+        Map<String, String> array = MicroPayCore.paraFilter(param);
+        String sign = MicroPayCore.buildMysign(array, paternerKey);// 排序
+
+        return sign;
+    }
+
+    /**
+     * merchantIncome:(添加收益记录). <br/>
+     *
+     *
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    private void merchantIncome(MemberOrder memberOrder, String payTypeCode) {
+        MerchantIncome merchantIncome = new MerchantIncome();
+        merchantIncome.setMerchantCode(memberOrder.getMerchantCode());
+        merchantIncome.setMerchantName(memberOrder.getMerchantName());
+        merchantIncome.setStoreId(memberOrder.getStoreId());
+        merchantIncome.setStoreName(memberOrder.getStoreName());
+        merchantIncome.setDealFee(Double.valueOf(memberOrder.getOrderFee()));
+        merchantIncome.setIncomeFee(Double.valueOf(memberOrder.getOrderFee()));
+        merchantIncome.setPayTypeCode(payTypeCode);
+        merchantIncome.setPayTypeName("会员充值");
+        merchantIncome.setCreateTime(memberOrder.getCreateDt());
+        merchantIncomeService.saveMerchantIncome(merchantIncome);
+    }
+
+    /**
+     * 修改订单状态
+     *
+     * @param orderNumber
+     * @param payNotify
+     */
+    private void UpdateOrder(String orderNumber, PayNotify payNotify) {
+        // 支付商返回的支付订单号 暂时没有字段
+        String transaction_id = payNotify.getTransaction_id();
+        String openid = payNotify.getOpenid();
+        logger.error("进入修改订单方法==========" + transaction_id);
+        // 订单表
+        MemberOrder memberOrder = new MemberOrder();
+        memberOrder.setOrderNumber(orderNumber);
+        memberOrder = memberOrderService.queryMemberOrder(memberOrder);
+        if ("1".equals(memberOrder.getOrderStatus())) {
+            return;
+        }
+        memberOrder.setOrderStatus("1");
+        memberOrder.setWeChatTransNo(transaction_id);
+        memberOrderService.updateMemberOrder(memberOrder);
+        MerchantMenber merchantMenber = new MerchantMenber();// 会员表
+        merchantMenber.setOpenid(openid);// 会员openId
+        merchantMenber.setMemberCode(memberOrder.getMemberCode());// 会员编码
+        List<MerchantMenber> queryMerchantMenberList = merchantMenberService.queryMerchantMenberList(merchantMenber);
+        if (queryMerchantMenberList != null && queryMerchantMenberList.size() > 0) {
+            merchantMenber = queryMerchantMenberList.get(0);
+            merchantIncome(memberOrder, "2");
+        }
+        logger.error("===============merchantMenber=====" + JSONObject.toJSONString(merchantMenber));
+        if (StringUtil.isNotEmpty(memberOrder.getOrderFee())) {
+            logger.error("进入修改订单方法===OrderFee=======" + memberOrder.getOrderFee());
+            MerchantMenberRecharge merchantMenberRecharge = new MerchantMenberRecharge();
+            Double usableRechargeFee = merchantMenber.getUsableRechargeFee() == null ? new Double(0)
+                    : merchantMenber.getUsableRechargeFee();
+            logger.error("usableRechargeFee==qian==" + usableRechargeFee);
+            merchantMenber.setUsableRechargeFee(
+                    StringUtil.bigDecimal(usableRechargeFee + Double.parseDouble(memberOrder.getOrderFee())));
+            logger.error("usableRechargeFee==hou==" + merchantMenber.getUsableRechargeFee());
+            // 在存会员充值表之前查一下当前店铺的充值
+            // 当前充值的店铺id
+            String storeId = merchantMenber.getStoreId();
+            ActivityRecharge activityRecharge = new ActivityRecharge();
+            activityRecharge.setStoreId(storeId);
+            List<ActivityRecharge> queryActivityRechargeList = activityRechargeService
+                    .queryActivityRechargeList(activityRecharge);// 根据店铺id查询店铺的充值活动
+            logger.error("queryActivityRechargeList======前======" + queryActivityRechargeList);
+            Double orderFee = Double.valueOf(memberOrder.getOrderFee());// 充值的金额
+            if (queryActivityRechargeList != null && queryActivityRechargeList.size() > 0) {
+                logger.error("chongzhijine========" + orderFee);
+                queryActivityRechargeList = rechargeMoneyByDesc(queryActivityRechargeList);
+                logger.error("queryActivityRechargeList======后======" + queryActivityRechargeList);
+                for (ActivityRecharge a : queryActivityRechargeList) {
+                    if (1 == a.getTimeType()) {
+                        if (null == a.getStartDt() || null == a.getEndDt()) {
+                            continue;
+                        }
+                        boolean bol = isBoolean(a.getStartDt(), a.getEndDt());
+                        if (!bol) {
+                            activityRechargeService.deleteActivityRecharge(a);
+                            continue;
+                        }
+                    }
+                    if (null != a.getRechargeMoney()) {
+                        if (orderFee >= a.getRechargeMoney()) {
+                            merchantMenberRecharge.setGiveMoney(a.getGiveMoney());
+                            Double totalGiveFee = merchantMenber.getTotalGiveFee() == null ? Double.valueOf(0)
+                                    : merchantMenber.getTotalGiveFee();// 当前充值总额
+                            merchantMenber.setTotalGiveFee(StringUtil.bigDecimal(totalGiveFee + a.getGiveMoney()));
+                            Double usableGiveFee = merchantMenber.getUsableGiveFee() == null ? Double.valueOf(0)
+                                    : merchantMenber.getUsableGiveFee();
+                            merchantMenber.setUsableGiveFee(StringUtil.bigDecimal(usableGiveFee + a.getGiveMoney()));
+                            break;
+                        }
+                    }
+                }
+            }
+            merchantMenberRecharge.setRechargeMoney(StringUtil.bigDecimal(Double.valueOf(memberOrder.getOrderFee())));
+            merchantMenberRecharge.setMemberCode(merchantMenber.getMemberCode());
+            merchantMenberRecharge.setMerchantCode(merchantMenber.getMerchantCode());
+            merchantMenberRecharge.setMerchantName(merchantMenber.getMerchantName());
+            merchantMenberRecharge.setStoreId(merchantMenber.getStoreId());
+            merchantMenberRecharge.setStoreName(merchantMenber.getStoreName());
+            merchantMenberRecharge.setCreateDt(new Date());
+            merchantMenberRecharge.setLogo(merchantMenber.getLogo());
+            merchantMenberRecharge.setNickName(merchantMenber.getNickName());
+            merchantMenberRecharge.setPhone(merchantMenber.getPhone());
+            merchantMenberRecharge.setPayType(1);
+            merchantMenberRecharge.setOrderNumber(orderNumber);
+            logger.error("进入修改订单方法===OrderFee==merchantMenberRecharge====="
+                    + JSONObject.toJSONString(merchantMenberRecharge));
+            merchantMenberRechargeService.saveMerchantMenberRecharge(merchantMenberRecharge);
+        }
+        Double totalRechargeFee = merchantMenber.getTotalRechargeFee() == null ? new Double(0)
+                : merchantMenber.getTotalRechargeFee();
+        merchantMenber.setTotalRechargeFee(
+                StringUtil.bigDecimal(totalRechargeFee + Double.parseDouble(memberOrder.getOrderFee())));
+        logger.error("进入修改订单方法===OrderFee==merchantMenber=====" + JSONObject.toJSONString(merchantMenber));
+
+        merchantMenberService.updateMerchantMenber(merchantMenber);
+    }
+
+    @PostMapping("/getPhoneCode")
+    @ResponseBody
+    public Map<String, Object> getPhoneCode(String phone,String validateCode,HttpServletRequest request) {
+        Map<String, Object> result = new HashMap<>(16);
+        try {
+            ValidateCodeUtil.checkVerifyCode(request, validateCode);
+            String sevice = (String) phoneCodeController.sevice(phone);
+            if ("{\"SUCCESS\":\"发送成功\"}".equals(sevice)) {
+                result.put("code", "1");
+            } else if ("{\"FAIL\":\"手机号已注册\"}".equals(sevice)) {
+                result.put("code", "3");
+            } else {
+                result.put("code", "0");
+            }
+        } catch (ClientException e) {
+            result.put("code", "2");
+            e.printStackTrace();
+        }catch (MsgException e){
+            result.put("code", -1);
+            result.put("msg", e.getMessage());
+        }
+        return result;
+    }
+
+    @PostMapping("/getPhoneCodeVIP")
+    @ResponseBody
+    public Map<String, Object> getPhoneCodeVIP(String phone, String storeId) {
+        Map<String, Object> result = new HashMap<String, Object>(16);
+        try {
+            String sevice = (String) phoneCodeController.seviceVIP(phone, storeId);
+            if ("{\"SUCCESS\":\"发送成功\"}".equals(sevice)) {
+                result.put("code", "1");
+            } else if ("{\"FAIL\":\"该门店已注册会员\"}".equals(sevice)) {
+                result.put("code", "3");
+            } else {
+                result.put("code", "0");
+            }
+        } catch (ClientException e) {
+            result.put("code", "2");
+            e.printStackTrace();
+        }
+        return result;
+    }
+
+    private MerchantMenber getSessionMerchantMenber() {
+        MerchantMenber merchantMenber = (MerchantMenber) request.getSession().getAttribute("sessionMerchantMenber");
+        return merchantMenber;
+
+    }
+
+    /**
+     * orderByDesc:(充值金额从大到小排列). <br/>
+     *
+     * @param list
+     * @return
+     *
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    public List<ActivityRecharge> rechargeMoneyByDesc(List<ActivityRecharge> list) {
+        Collections.sort(list, new Comparator<ActivityRecharge>() {
+            @Override
+            public int compare(ActivityRecharge o1, ActivityRecharge o2) {
+                int desc = (int) (o2.getRechargeMoney() - o1.getRechargeMoney());
+                return desc;
+            }
+        });
+        return list;
+    }
+
+    /**
+     * isBoolean:(当前时间大于活动开始时间，并且当前时间小于活动结束时间). <br/>
+     *
+     * @return
+     *
+     * @author Administrator
+     * @since JDK 1.8
+     */
+    public boolean isBoolean(Date startTime, Date endTime) {
+        boolean flag = false;
+        boolean start = System.currentTimeMillis() >= startTime.getTime();
+        boolean end = System.currentTimeMillis() <= endTime.getTime();
+        if (start && end) {
+            flag = true;
+        }
+        return flag;
+    }
+
+    /**
+     * 从request中获取请求方IP
+     *
+     * @param request
+     * @return
+     */
+    public static String getIpAddress(HttpServletRequest request) {
+        String ip = request.getHeader("x-forwarded-for");
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getHeader("Proxy-Client-IP");
+        }
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getHeader("WL-Proxy-Client-IP");
+        }
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getHeader("HTTP_CLIENT_IP");
+        }
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getHeader("HTTP_X_FORWARDED_FOR");
+        }
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            // 若以上方式均为获取到ip则证明获得客户端并没有采用反向代理直接使用getRemoteAddr()获取客户端的ip地址
+            ip = request.getRemoteAddr();
+        }
+        // 多个路由时，取第一个非unknown的ip
+        final String[] arr = ip.split(",");
+        for (final String str : arr) {
+            if (!"unknown".equalsIgnoreCase(str)) {
+                ip = str;
+                break;
+            }
+        }
+        return ip;
+    }
+
+    private void saveMemberOrderSS(MerchantMenber merchantMenber, ActivityActivate activityActivate) {
+        String memberCode = merchantMenber.getMemberCode();
+        MerchantMenber merchantMenber2 = new MerchantMenber();
+        merchantMenber2.setMemberCode(memberCode);
+        MerchantMenber queryMerchantMenber = merchantMenberService.queryMerchantMenber(merchantMenber2);
+        if (null != queryMerchantMenber) {
+            MemberOrder memberOrder = new MemberOrder();
+            memberOrder.setMerchantCode(queryMerchantMenber.getMerchantCode());
+            memberOrder.setMerchantName(queryMerchantMenber.getMerchantName());
+            memberOrder.setStoreId(queryMerchantMenber.getStoreId());
+            memberOrder.setStoreName(queryMerchantMenber.getStoreName());
+            String billno = StringUtil.getBillno();
+            memberOrder.setOrderNumber(billno);
+            memberOrder.setMemberCode(memberCode);
+            memberOrder.setNickName(queryMerchantMenber.getNickName());
+            Date date = new Date();
+            memberOrder.setCreateDt(date);
+            memberOrder.setOrderType("1");
+            memberOrder.setOrderFee(activityActivate.getGiveMoney() + "");
+            memberOrder.setOrderStatus("1");
+            memberOrder.setRechargeType("0");
+            MerchantMenberRecharge menberRecharge = new MerchantMenberRecharge();
+            menberRecharge.setMerchantCode(queryMerchantMenber.getMerchantCode());
+            menberRecharge.setMerchantName(queryMerchantMenber.getMerchantName());
+            menberRecharge.setStoreId(queryMerchantMenber.getStoreId());
+            menberRecharge.setStoreName(queryMerchantMenber.getStoreName());
+            menberRecharge.setOrderNumber(billno);
+            menberRecharge.setCreateDt(date);
+            menberRecharge.setLogo(queryMerchantMenber.getLogo());
+            menberRecharge.setMemberCode(memberCode);
+            menberRecharge.setNickName(queryMerchantMenber.getNickName());
+            menberRecharge.setPhone(queryMerchantMenber.getPhone());
+            menberRecharge.setRechargeMoney(0d);
+            menberRecharge.setGiveMoney(activityActivate.getGiveMoney());
+            merchantMenberRechargeService.saveMerchantMenberRecharge(menberRecharge);
+            memberOrderService.saveMemberOrder(memberOrder);
+        }
+
+    }
+
+    /**
+     * 会员开卡
+
+     * @return
+     */
+    @RequestMapping(value = "/api/card/open",method = RequestMethod.POST)
+    @ResponseBody
+    public Result<JSONObject> vipOpenCard(@RequestBody JSONObject json) {
+        logger.info("============>会员开卡接口请求，请求参数:{}<============",json);
+        return merchantMenberService.vipOpenCard(json);
+    }
+
+    @RequestMapping(value = "/api/card/open/new",method = RequestMethod.POST)
+    @ResponseBody
+    public Result<JSONObject> vipOpenCardNew(@RequestBody JSONObject json) {
+        logger.info("============>会员开卡接口请求，请求参数:{}<============",json);
+        return merchantMenberService.vipOpenCard(json);
+    }
+
+    /**
+     *
+     * 获取会员信息接口
+     */
+    @RequestMapping(value = "/api/member/info",method = RequestMethod.POST)
+    @ResponseBody
+    public Result<JSONObject> getMenberInfo(@RequestBody JSONObject json){
+        JSONObject result = new JSONObject();
+        String appOpenId = json.getString("appOpenId");
+        if(StringUtil.isEmpty(appOpenId)){
+            return ResultGenerator.genFailResult("appOpenId不能为空！");
+        }
+        String unionId = json.getString("unionId");
+        String storeId = json.getString("storeId");
+        if(StringUtil.isEmpty(storeId) || "undefined".equals(storeId)){
+            return ResultGenerator.genFailResult("店铺ID不能为空！");
+        }
+        MerchantStore store = new MerchantStore();
+        store.setId(Integer.valueOf(storeId));
+        MerchantStore info = merchantStoreService.queryMerchantStore(store);
+        if(info == null){
+            return ResultGenerator.genFailResult("店铺信息异常！");
+        }
+        List<Map<String,Object>> lists = activityActivateService.getNewestActivityJoin(info.getStoreId());
+        List<String> titleTips = merchantMenberService.getTitleTips(lists);
+        result.put("title",titleTips);
+        QueryWrapper<MerchantMenber> queryWrapper = new QueryWrapper<MerchantMenber>().eq("appOpenId",appOpenId)
+                .eq("storeId",info.getStoreId());
+        MerchantMenber one = merchantMenberService.getOne(queryWrapper);
+        if(one == null){
+            if(StringUtil.isNotEmpty(unionId)){
+                QueryWrapper<MerchantMenber> qw = new QueryWrapper<MerchantMenber>().eq("storeId",info.getStoreId()).eq("unionId",unionId);
+                one = merchantMenberService.getOne(qw);
+                if(one != null){
+                    MerchantMenber update = new MerchantMenber();
+                    update.setId(one.getId());
+                    update.setAppOpenId(appOpenId);
+                    merchantMenberService.updateById(update);
+                }
+            }
+        }else{
+            if(StringUtil.isEmpty(one.getUnionId()) && StringUtil.isNotEmpty(unionId)){
+                MerchantMenber update = new MerchantMenber();
+                update.setId(one.getId());
+                update.setUnionId(unionId);
+                merchantMenberService.updateById(update);
+            }
+        }
+        logger.info("=========>【查询出的会员卡】查询结果：{}<==========",JSONObject.toJSONString(one));
+        if(one == null){
+            result.put("isFlag",0);
+        }else{
+            result.put("isFlag",1);
+            Double useRechFee = one.getUsableRechargeFee() == null ? new Double(0) : one.getUsableRechargeFee();
+            Double useGiveFee = one.getUsableGiveFee() == null ? new Double(0) : one.getUsableGiveFee();
+            BigDecimal useAmt = new BigDecimal(String.valueOf(useRechFee)).add(new BigDecimal(String.valueOf(useGiveFee))).setScale(2, RoundingMode.HALF_UP);
+            result.put("useAmt",useAmt);
+            result.put("cardNo",one.getCardNo());
+            result.put("phone",one.getPhone());
+            result.put("avater",one.getLogo());
+            result.put("nickName",EmojiUtil.emojiRecovery2(one.getNickName()));
+        }
+        logger.info("=========>【返回的会员卡信息】信息为：{}<==========",JSONObject.toJSONString(result));
+        return ResultGenerator.genSuccessResult("获取成功!",result);
+    }
+
+
+    /**
+     *
+     * 获取会员卡信息列表
+     */
+    @RequestMapping(value = "/api/card/list",method = RequestMethod.POST)
+    @ResponseBody
+    public Result<JSONObject> getCardList(@RequestBody JSONObject json){
+        JSONObject result = new JSONObject();
+        String appOpenId = json.getString("appOpenId");
+        if(StringUtil.isEmpty(appOpenId)){
+            return ResultGenerator.genFailResult("appOpenId不能为空！");
+        }
+        String unionid = json.getString("unionid");
+        Integer pageNum = json.getInteger("pageNum") == null ? Integer.valueOf(0) : json.getInteger("pageNum");
+        Integer pageSize = json.getInteger("pageSize") == null ? Integer.valueOf(10): json.getInteger("pageSize");
+
+        Page<MerchantMenber> page = new Page<>();
+        page.setCurrent(pageNum);
+        page.setSize(pageSize == 0 ? 10 : pageSize);
+        MerchantMenber menber = new MerchantMenber();
+        menber.setAppOpenId(appOpenId);
+        menber.setUnionId(unionid);
+        page = merchantMenberService.pageJoinData(page,menber);
+        result.put("cardList",page.getRecords());
+        result.put("count",page.getTotal());
+        return ResultGenerator.genSuccessResult("获取成功!",result);
+    }
+
+    /**
+     *
+     * 获取会员账单信息分页数据
+     */
+    @RequestMapping(value = "/api/member/bill",method = RequestMethod.POST)
+    @ResponseBody
+    public Result<JSONObject> getMenberBill(@RequestBody JSONObject json){
+        JSONObject result = new JSONObject();
+        String appOpenId = json.getString("appOpenId");
+        if(StringUtil.isEmpty(appOpenId)){
+            return ResultGenerator.genFailResult("appOpenId不能为空！");
+        }
+        Integer storeId = json.getInteger("storeId");
+        if(StringUtil.isEmpty(storeId)){
+            return ResultGenerator.genFailResult("店铺ID不能为空！");
+        }
+        MerchantStore store = new MerchantStore();
+        store.setId(storeId);
+        MerchantStore info = merchantStoreService.queryMerchantStore(store);
+        if(info == null){
+            return ResultGenerator.genFailResult("店铺信息异常！");
+        }
+        QueryWrapper<MerchantMenber> queryWrapper = new QueryWrapper<MerchantMenber>().eq("storeId",info.getStoreId()).eq("appOpenId",appOpenId);
+        MerchantMenber menber = merchantMenberService.getOne(queryWrapper);
+        if(menber == null){
+            return ResultGenerator.genFailResult("用户不是该门店的会员！");
+        }
+        int currPage = json.getInteger("currPage") == null ? 1 : json.getInteger("currPage");
+
+        Map<String,Object> params = new HashMap<>();
+        params.put("pageSize", PAGE_SIZE);
+        params.put("offset", (currPage - 1) * PAGE_SIZE);
+        params.put("storeId",info.getStoreId());
+        params.put("memberCode",menber.getMemberCode());
+
+        List<MerchantMenberRecharge> rechargeList = merchantMenberRechargeService.queryMerchantMenberRechargePage(params);
+        List<MerchantMenberComsume> comsumeList = merchantMenberComsumeService.queryMerchantMenberComsumePage(params);
+        result.put("rechargeList",rechargeList);
+        result.put("comsumeList",comsumeList);
+        result.put("totalGiveFee",menber.getTotalGiveFee() == null ? new Double(0) : menber.getTotalGiveFee());
+        Double rechargeFee = menber.getUsableRechargeFee() == null ? new Double(0) : menber.getUsableRechargeFee();
+        Double giveFee = menber.getUsableGiveFee() == null ? new Double(0) : menber.getUsableGiveFee();
+        result.put("useAmt",StringUtil.bigDecimal(rechargeFee + giveFee));
+        return ResultGenerator.genSuccessResult("获取成功!",result);
+    }
+
+
+    /**
+     * 创建会员卡接口 pY6Es6TELPLwuzi6hzBelewOtVhU
+     * @param
+     * @return
+     */
+    @RequestMapping(value = "/api/card/open",method = RequestMethod.GET)
+    public ModelAndView getMenberInfo(String storeId,String openId,HttpServletRequest request){
+        ModelAndView view = new ModelAndView("vip/card");
+        String appid = "wx20403c16079b1b59";
+        String key = "bca9c306d375840f4c5d7bfea22d5f74";
+        String cardId = "pY6Es6TELPLwuzi6hzBelewOtVhU";
+        String token = "43_Egb6xoDokwxQZFd2gkeznYyZ7MB_ykr8L-KroIgquIEpbDe8FO-IhgNQyhxl69c6BSImhJPPvVBEdYfj999JtX7czGK8fhX3FQY8IStnBSMp9IK8sQP5hqtjczVZOW84jeOxdbaguYED7jvFUHYdAIAFSJ";
+        String jsapi_ticket = "O3SMpm8bG7kJnF36aXbe8-RgUX3L9LUK8DbkzsSQfdxJp7Bx4zguzn3OJgSHpWxbEQdP5CT7SOYB06XmEHyJSQ";
+//        String token = Oauth2Util.getAccessToken4User(appid, key);
+//        System.out.println("=======================>token============>"+token);
+//        String jsapi_ticket = Oauth2Util.getJsapiTicket(token);
+//        System.out.println("=======================>jsapiTicket============>"+jsapi_ticket);
+        StringBuffer url = request.getRequestURL();
+        if(StringUtil.isNotEmpty(request.getQueryString())){
+            url.append("?"+request.getQueryString());
+        }
+        System.out.println("=======================>url================>"+url.toString());
+        String noncestr = UUID.randomUUID().toString().replace("-","").substring(0,16);
+        String timestamp = String.valueOf(System.currentTimeMillis());
+        JSONObject obj = new JSONObject();
+        obj.put("noncestr",noncestr);
+        obj.put("url",url.toString());
+        obj.put("timestamp",timestamp);
+        obj.put("jsapi_ticket",jsapi_ticket);
+        String signContent = SignUtils.getSignContent(obj);
+        String signature = SignUtils.sha1Encrypt(signContent);
+
+
+        String openid = "oY6Es6Y52jNTArOpt-CTDP4ScKqs";
+        String code = "1324567778978";
+        String nonce_str = UUID.randomUUID().toString().replace("-","").substring(0,16);
+        String timestamps = String.valueOf(new Date().getTime());
+
+
+        //String apiTicket = Oauth2Util.getApiTicket(appid,key);
+        String apiTicket = "kqxRwT0lF4G-mWsgBWkeIroojoScOkHH3OpnWuEYNQ_u2oZeZp_Y8eYgmBG1U0RJURSf1-SIFwWal_tW6ogaTA";
+        System.out.println("====================apiTicket=====================>"+apiTicket);
+
+
+        List<String> list = new ArrayList<>();
+        list.add(nonce_str);
+//        list.add(code);
+        list.add(timestamps);
+        list.add(apiTicket);
+        list.add(cardId);
+//        list.add(openid);
+        Collections.sort(list);
+
+        StringBuffer signStr = new StringBuffer();
+        for (String s:list) {
+            signStr.append(s);
+        }
+        System.out.println("====================带签名字符串=====================>"+signStr.toString());
+        String sign = SignUtils.sha1Encrypt(signStr.toString());
+        System.out.println("====================签名结果=====================>"+sign);
+
+        JSONObject cardExt = new JSONObject();
+        cardExt.put("nonce_str",nonce_str);
+//        cardExt.put("code",code);
+        cardExt.put("timestamp",timestamps);
+//        cardExt.put("openid",openid);
+        cardExt.put("apiTicket",apiTicket);
+        cardExt.put("card_id",cardId);
+        cardExt.put("signature",sign);
+
+        view.addObject("cardId",cardId);
+        view.addObject("appid",appid);
+        view.addObject("noncestr",noncestr);
+        view.addObject("timestamp",timestamp);
+        view.addObject("signature",signature);
+
+        view.addObject("nonce_str",nonce_str);
+        view.addObject("timestamps",timestamps);
+        view.addObject("api_ticket",apiTicket);
+        //view.addObject("card_id",card_id);
+        view.addObject("signatures",sign);
+        //view.addObject("cardExt",cardExt.toJSONString());
+        System.out.println("============================>cardExt===========================>"+cardExt);
+        return view;
+    }
+
+    @RequestMapping(value = "/api/check/token",method = RequestMethod.GET)
+    @ResponseBody
+    public String checkToken(@RequestParam Map<String,String> params){
+        return params.get("echostr");
+    }
+
+    @RequestMapping(value = "/api/create/card",method = RequestMethod.GET)
+    @ResponseBody
+    public Result createCard(@RequestParam Map<String,String> params){
+
+        String token = "43_av9Kgf3nnplHXLniPnbX16Qb7L30G8iZwS0GLBQazysmqNidr5cdta3s1Co-FvJC1sfC1Vg02_Qx9gOP49npQkTE8v9eKTPCnr5onQbCEDY312-O3zAKjWW5pcQ2JvoJ2xHoHWX6I75BqsrdFLXeABAJPB";
+        // String url = "https://api.weixin.qq.com/card/create?access_token="+token;
+
+        // JSONObject jsonObject = new JSONObject();
+
+        JSONObject card = new JSONObject();
+
+        card.put("card_type","MEMBER_CARD");
+
+        JSONObject memberCard = new JSONObject();
+
+        memberCard.put("background_pic_url","http://mmbiz.qpic.cn/mmbiz/p98FjXy8LacgHxp3sJ3vn97bGLz0ib0Sfz1bjiaoOYA027iasqSG0sjpiby4vce3AtaPu6cIhBHkt6IjlkY9YnDsfw/0");
+
+        JSONObject baseInfo = new JSONObject();
+
+        baseInfo.put("logo_url","http://mmbiz.qpic.cn/mmbiz/p98FjXy8LacgHxp3sJ3vn97bGLz0ib0Sfz1bjiaoOYA027iasqSG0sjpiby4vce3AtaPu6cIhBHkt6IjlkY9YnDsfw/0");
+
+        baseInfo.put("brand_name","收银呗");
+        baseInfo.put("code_type","CODE_TYPE_TEXT");
+        baseInfo.put("title","白金尊贵会员卡");
+        baseInfo.put("color","Color010");
+        baseInfo.put("notice","使用时向服务员出示此券");
+        baseInfo.put("service_phone","020-88888888");
+        baseInfo.put("description","不可与其他优惠同享");
+
+        JSONObject type = new JSONObject();
+        type.put("type","DATE_TYPE_PERMANENT");
+        baseInfo.put("date_info",type);
+        JSONObject sku = new JSONObject();
+        type.put("quantity","10000000");
+        baseInfo.put("sku",sku);
+
+        baseInfo.put("get_limit",1);
+        baseInfo.put("use_custom_code",false);
+        baseInfo.put("can_give_friend",true);
+
+        return null;
+    }
+
+//    @RequestMapping(value = "/api/card/sign",method = RequestMethod.GET)
+//    @ResponseBody
+//    public Result getCardSign(@RequestParam Map<String,String> params){
+//        return params.get("echostr");
+//    }
+
+    @GetMapping("/**.txt")
+    @ResponseBody
+    public String aKfAirN1hO() {
+
+        return "3cdbacb2d4ceefa36ef1c43d0c562fb9";
+    }
+
+    /**
+     * 读取request数据
+     *
+     * @param request
+     * @return
+     */
+    public String readRequestMsg(HttpServletRequest request) {
+        java.io.BufferedReader bis = null;
+        String line = null;
+        String result = "";
+        try {
+            bis = new java.io.BufferedReader(new java.io.InputStreamReader(
+                    request.getInputStream(), StandardCharsets.UTF_8));
+            StringBuilder sb = new StringBuilder();
+            while ((line = bis.readLine()) != null) {
+                sb.append(line).append("\r\n");
+            }
+            result = sb.toString();
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                if (bis != null) {
+                    bis.close();
+                }
+            } catch (IOException e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+            }
+        }
+        return result;
+    }
+}
diff --git a/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/WechantController.java b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/WechantController.java
new file mode 100644
index 0000000..ebe58d7
--- /dev/null
+++ b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/WechantController.java
@@ -0,0 +1,506 @@
+package cn.pluss.platform.controller.home;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintWriter;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.constants.Constant;
+import cn.pluss.platform.entity.*;
+import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.merchantStore.MerchantStoreService;
+import cn.pluss.platform.pay.ApiPayService;
+import cn.pluss.platform.systemConfig.SystemConfigService;
+import cn.pluss.platform.util.*;
+import cn.pluss.platform.wap.MD5Util;
+import cn.pluss.platform.wechat.WxConstants;
+import cn.pluss.platform.wx.*;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.client.RestTemplate;
+import org.springframework.web.servlet.ModelAndView;
+import cn.pluss.platform.deviceMerchantBuy.DeviceMerchantBuyService;
+import cn.pluss.platform.wap.XmlUtil;
+import cn.pluss.platform.leshua.LeshuaService;
+import cn.pluss.platform.merchantMenber.MerchantMenberService;
+import cn.pluss.platform.userApp.UserAppService;
+
+/**
+ * @author yuchen
+ * 
+ * @Description
+ */
+@Controller
+@Slf4j
+@RequestMapping("wechat")
+public class WechantController {
+
+	@Setter(onMethod_ = {@Autowired,@Lazy})
+	private UserAppService userAppService;
+
+	@Setter(onMethod_ = {@Autowired})
+	private WxPayNotifyService wxPayNotifyService;
+
+	@Setter(onMethod_ = {@Autowired})
+	private LeshuaService leshuaService;
+
+	@Setter(onMethod_ = {@Autowired})
+	private DeviceMerchantBuyService deviceMerchantBuyService;
+
+	@Setter(onMethod_ = {@Autowired})
+	private  MerchantMenberService merchantMenberService;
+
+	@Setter(onMethod_ = {@Autowired})
+	private SystemConfigService systemConfigService;
+
+	@Setter(onMethod_ = {@Autowired})
+	private ApiPayService apiPayService;
+
+	@Setter(onMethod_ = {@Autowired})
+	private WxCommonService wxCommonService;
+
+	@Setter(onMethod_ = {@Autowired})
+	private MerchantStoreService merchantStoreService;
+
+	@Setter(onMethod_ = {@Autowired})
+	private RestTemplate restTemplate;
+
+	/**
+	 * 
+	 * goUpgradePage:(跳转到升级页面). <br/>
+	 * 
+	 * 
+	 * @author Administrator
+	 * @param userId
+	 * @return
+	 * @since JDK 1.8
+	 */
+	@GetMapping(value = "/goUpgradePage")
+	public ModelAndView goUpgradePage(String userId) {
+		ModelAndView modelAndView = new ModelAndView();
+		modelAndView.setViewName("wechat/goUpgradePage");
+		setUpVipAmtResult(modelAndView,"twoUpVipAmount",2);
+		setUpVipAmtResult(modelAndView,"threeUpVipAmount",3);
+		modelAndView.addObject("userId", userId);
+		UserApp userApp=new UserApp();
+		userApp.setUserId(Long.valueOf(userId));
+		userApp=userAppService.queryUserApp(userApp);
+		if(null!=userApp) {
+			modelAndView.addObject("level", userApp.getLevel());
+		}
+		return modelAndView;
+	}
+
+	public void setUpVipAmtResult(ModelAndView modelAndView, String propertyKey,int level) {
+		String configValue = systemConfigService.querySystemConfigValue(propertyKey);
+		if(StringUtil.isNotEmpty(configValue)){
+			if(configValue.contains("-")){
+				modelAndView.addObject(propertyKey, configValue.split("-")[0]);
+				//modelAndView.addObject(shapeKey, propertyValue.split("-")[1]);
+			}
+		}else{
+			if(level == 2){
+				modelAndView.addObject(propertyKey, 999);
+				//modelAndView.addObject(shapeKey, 500);
+			}else{
+				modelAndView.addObject(propertyKey, 9999);
+				//modelAndView.addObject(shapeKey, 5000);
+			}
+		}
+	}
+
+	/**
+	 * 
+	 * jumpUrl:(乐刷支付完成后的跳转地址). <br/>
+	 * 
+	 * 
+	 * @author Administrator
+	 * @param orderNumber
+	 * @param
+	 * @return
+	 * @since JDK 1.8
+	 */
+	@GetMapping("/jumpUrl")
+	public ModelAndView jumpUrl(String orderNumber) {
+		log.info("====订单号====" + orderNumber);
+		if (orderNumber.contains("?")) {
+			String str[] = orderNumber.split("[?]");
+			orderNumber = str[0];
+		}
+		ModelAndView modelAndView = new ModelAndView();
+		Map<String, String> reqMap = new HashMap<String, String>(16);
+		Map<String, Object> mapLeshua = new HashMap<String, Object>(16);
+		try {
+			reqMap.put("service", "query_status");
+			reqMap.put("merchant_id", ParametersUtil.LESHUALIU);
+			reqMap.put("third_order_id", orderNumber);
+			reqMap.put("nonce_str", StringUtil.getBillno());
+			String requestPay = leshuaService.requestPay(reqMap, ParametersUtil.leshuapaykey, true);
+			mapLeshua = XmlUtil.toMapLeshua(requestPay);
+			String resp_code = (String) mapLeshua.get("resp_code");
+			if ("0".equals(resp_code)) {
+				String result_code = (String) mapLeshua.get("result_code");
+				if ("0".equals(result_code)) {
+					String status = (String) mapLeshua.get("status");
+					if ("2".equals(status)) {
+						modelAndView.setViewName("merchant/paySuccess");
+					} else {
+						modelAndView.setViewName("merchant/payFail");
+					}
+				} else {
+					modelAndView.addObject("message", "支付结果查询错误");
+					modelAndView.setViewName("merchant/error");
+				}
+			} else {
+				modelAndView.addObject("message", "支付结果查询错误");
+				modelAndView.setViewName("merchant/error");
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+			modelAndView.addObject("message", "支付结果查询错误");
+			modelAndView.setViewName("merchant/error");
+		}
+		return modelAndView;
+	}
+
+//	public static Set<String> resExcludedSignParams() {
+//		Set<String> exludedSignParams = new HashSet<String>(2);
+//		exludedSignParams.add("sign");
+//		exludedSignParams.add("error_code");
+//		return exludedSignParams;
+//	}
+
+	/**
+	 * 
+	 * getMerchantInfo:(得到商户名称，门店名称). <br/>
+	 * 
+	 * 
+	 * @author Administrator
+	 * @param merchantCode
+	 * @param storeId
+	 * @return
+	 * @since JDK 1.8
+	 */
+//	private MerchantStore getMerchantInfo(String merchantCode, String storeId) {
+//		// 因害怕表数据有误 分别根据merchantCode 查商家表 storeId查门店表
+//		MerchantStore merchantStore = new MerchantStore();
+//		merchantStore.setStoreId(storeId);
+//		MerchantBaseInfo merchantBaseInfo = new MerchantBaseInfo();
+//		merchantBaseInfo.setMerchantCode(merchantCode);
+//		List<MerchantBaseInfo> queryMerchantBaseInfoList = merchantBaseInfoService
+//				.queryMerchantBaseInfoList(merchantBaseInfo);
+//		if (queryMerchantBaseInfoList != null && queryMerchantBaseInfoList.size() > 0) {
+//			merchantBaseInfo = queryMerchantBaseInfoList.get(0);
+//			merchantStore.setMerchantCode(merchantCode);
+//		} else {
+//			merchantBaseInfo = null;
+//			merchantStore = null;
+//			return merchantStore;
+//		}
+//		List<MerchantStore> queryMerchantStoreList = merchantStoreService.queryMerchantStoreList(merchantStore);
+//		if (queryMerchantStoreList != null && queryMerchantStoreList.size() > 0) {
+//			merchantStore = queryMerchantStoreList.get(0);
+//			merchantStore.setMerchantName(merchantBaseInfo.getMerchantName());
+//		} else {
+//			merchantStore = null;
+//		}
+//		return merchantStore;
+//	}
+
+	/**
+	 * 从request中获取请求方IP
+	 * 
+	 * @param request
+	 * @return
+	 */
+	public static String getIpAddress(HttpServletRequest request) {
+		String ip = request.getHeader("x-forwarded-for");
+		if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+			ip = request.getHeader("Proxy-Client-IP");
+		}
+		if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+			ip = request.getHeader("WL-Proxy-Client-IP");
+		}
+		if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+			ip = request.getHeader("HTTP_CLIENT_IP");
+		}
+		if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+			ip = request.getHeader("HTTP_X_FORWARDED_FOR");
+		}
+		if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+			// 若以上方式均为获取到ip则证明获得客户端并没有采用反向代理直接使用getRemoteAddr()获取客户端的ip地址
+			ip = request.getRemoteAddr();
+		}
+		// 多个路由时，取第一个非unknown的ip
+		final String[] arr = ip.split(",");
+		for (final String str : arr) {
+			if (!"unknown".equalsIgnoreCase(str)) {
+				ip = str;
+				break;
+			}
+		}
+		return ip;
+	}
+
+	/**
+	 * 
+	 * wechatCallBack:(设备订单微信回调通知). <br/>
+	 * 
+	 * 
+	 * @author Administrator
+	 * @param request
+	 * @param response
+	 * @since JDK 1.8
+	 */
+	@PostMapping(value = "/wechatCallBack")
+	public void wechatCallBack(HttpServletRequest request, HttpServletResponse response) {
+		try {
+			InputStream is = request.getInputStream();
+			String xml = XmlUtil.toUTF8(is);
+			Map<String, Object> notifyMap = XmlUtil.toMap(xml);// 将微信发的xml转map
+			if ("SUCCESS".equals(notifyMap.get("result_code"))) {
+				String ordersSn = (String) notifyMap.get("out_trade_no");// 商户订单号
+				String transaction_id = (String) notifyMap.get("transaction_id");
+				// String amountpaid = (String) notifyMap.get("total_fee");// 实际支付的订单金额:单位 分
+				// String openid = (String) notifyMap.get("openid");// 用户openid
+				String time_end = (String) notifyMap.get("time_end");// 支付完成时间
+				// Double amount=Double.valueOf(amountpaid)*100;
+				DeviceMerchantBuy deviceMerchantBuy = new DeviceMerchantBuy();
+				deviceMerchantBuy.setOrderNo(ordersSn);
+				deviceMerchantBuy = deviceMerchantBuyService.queryDeviceMerchantBuy(deviceMerchantBuy);
+				if ("1".equals(deviceMerchantBuy.getStatus())) {
+					response.getWriter().write("<xml><return_code><![CDATA[SUCCESS]]></return_code></xml>");
+					return;
+				}
+				deviceMerchantBuy.setStatus("1");
+				deviceMerchantBuy.setTransNo(transaction_id);
+				SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
+				deviceMerchantBuy.setTransDt(sdf.parse(time_end));
+				deviceMerchantBuyService.updateDeviceMerchantBuy(deviceMerchantBuy);
+			}
+			is.close();
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 *
+	 * wechatCallBack:(设备订单微信回调通知). <br/>
+	 *
+	 * 
+	 * @author Administrator
+	 * @param request
+	 * @param response
+	 * @since JDK 1.8
+	 */
+	@PostMapping(value = "/wechatCallBackV2")
+	public void wechatCallBackV2(HttpServletRequest request, HttpServletResponse response) {
+		try {
+			InputStream is = request.getInputStream();
+			String xml = XmlUtil.toUTF8(is);
+			is.close();
+			// 将微信发的xml转map
+			assert xml != null : "无有效参数";
+
+			Map<String, Object> notifyMap = XmlUtil.toMap(xml);
+
+			wxPayNotifyService.commonPayNotify(notifyMap);
+
+			response.getWriter().write("<xml><return_code><![CDATA[SUCCESS]]></return_code></xml>");
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	@RequestMapping("attentionCallBack")
+	public void wechatNotice(HttpServletRequest request, HttpServletResponse response) throws Exception {
+		String signature = request.getParameter("signature");
+		// 时间戳
+		String timestamp = request.getParameter("timestamp");
+		// 随机数
+		String nonce = request.getParameter("nonce");
+		// 随机字符串
+		String echostr = request.getParameter("echostr");
+		InputStream is = request.getInputStream();
+		// 处理微信请求
+		if (!StringUtil.isEmpty(echostr)) {
+			// 响应消息
+			PrintWriter out = response.getWriter();
+			out.print(echostr);
+			out.close();
+			// this.sendMessages(echostr);
+			response.setContentType("text/json; charset=utf-8");
+			response.setCharacterEncoding("UTF-8");
+			response.getWriter().print(echostr);
+		}
+		String xml = readRequestMsg(request);
+		Map<String, Object> map = XmlUtil.toMap(xml);
+		String MsgType = (String) map.get("MsgType");
+		//openId
+		String openId = (String) map.get("FromUserName");
+		WxAccessTokenRequest tokenRequest = WxAccessTokenRequest.buidWxToken(ParametersUtil.APPID,ParametersUtil.APPSECRET,null, WxConstants.WX_USER_INFO_URL);
+		log.info("【微信消息接收】解析消息内容为：{}", JSON.toJSONString(map));
+		if("event".equals(MsgType)) {
+			String eventKey = (String) map.get("EventKey");
+			if("VIEW".equals(map.get("Event"))){
+				request.getRequestDispatcher(eventKey).forward(request,response);
+			}else if("subscribe".equals(map.get("Event"))||"SCAN".equals(map.get("Event"))){
+				//关注公众号 消息回复
+				if("subscribe".equals(map.get("Event"))){
+					StringBuilder backMsgXml = new StringBuilder("<xml>");
+					backMsgXml.append("<ToUserName><![CDATA["+openId+"]]></ToUserName>");
+					backMsgXml.append("<FromUserName><![CDATA["+(String) map.get("ToUserName")+"]]></FromUserName>");
+					backMsgXml.append("<CreateTime>"+System.currentTimeMillis()+"</CreateTime>");
+					backMsgXml.append("<MsgType><![CDATA[text]]></MsgType>");
+					backMsgXml.append("<Content><![CDATA[你好，欢迎关注收银呗生活圈！]]></Content>");
+					backMsgXml.append("</xml>");
+					response.setContentType("text/xml; charset=utf-8");
+					response.setCharacterEncoding("UTF-8");
+					response.getWriter().write(backMsgXml.toString());
+				}
+				WxUserInfoResponse wxUserInfo = wxCommonService.getWxUserInfo(tokenRequest, openId);
+				if(StringUtil.isNotEmpty(eventKey)){
+					eventKey = eventKey.replace("qrscene_","");
+					String[] data = null;
+					if(eventKey.contains("_")){
+						data = eventKey.split("_");
+					}else if(eventKey.contains(",")){
+						data = eventKey.split(",");
+					}else{
+						MsgException.throwException("分隔符有误！");
+					}
+					//商户id
+					String merchantCode = data[0];
+					//门店id
+					String storeId = data[1];
+					//手机号
+					String phone = data[2];
+					MerchantMenber merchantMenber=new MerchantMenber();
+					merchantMenber.setPhone(phone);
+					merchantMenber.setStoreId(storeId);
+					merchantMenber.setMerchantCode(merchantCode);
+					List<MerchantMenber> queryMerchantMenberList = merchantMenberService.queryMerchantMenberList(merchantMenber);
+					if(queryMerchantMenberList!=null&&queryMerchantMenberList.size()>0) {
+						merchantMenber = queryMerchantMenberList.get(0);
+						if(StringUtil.isBlank(merchantMenber.getOpenid())){
+							merchantMenber.setOpenid(openId);
+							if(wxUserInfo != null){
+								wxUserInfo.buildMember(merchantMenber,null);
+							}
+							merchantMenberService.updateMerchantMenber(merchantMenber);
+							try {
+								MerchantStore store = merchantStoreService.getStoreByMerchantCode(merchantMenber.getMerchantCode());
+
+								JSONObject miniprogram = new JSONObject();
+								miniprogram.put("appid",ParametersUtil.APPLETS_APPID);
+								miniprogram.put("pagepath","pages/card/index?storeId="+store.getId()+"&phone="+merchantMenber.getPhone());
+								String first = "恭喜您成为本店会员，祝你生活愉快!";
+								String remark = "如对此卡有疑问或查询会员更多优惠信息，可以点此进入小程序中查看！";
+								double usableRechargeFee = merchantMenber.getUsableRechargeFee() == null ? 0 : StringUtil.bigDecimal(merchantMenber.getUsableRechargeFee());
+								double usableGiveFee = merchantMenber.getUsableGiveFee() == null ? 0 : StringUtil.bigDecimal(merchantMenber.getUsableGiveFee());
+								String useFee = BigDecimal.valueOf(usableRechargeFee + usableGiveFee).setScale(2,BigDecimal.ROUND_HALF_DOWN).toString();
+								String[] array = {store.getStoreName(),merchantMenber.getPhone(),store.getStoreName()+"会员卡",useFee+"元"};
+								WxTemolateRequest tempRequest = new WxTemolateRequest(openId,WxConstants.VIP_CARD_SUCCESS_TEMPLATE_ID,null,miniprogram)
+										.buildData(first,remark,array);
+								//发送开卡成功消息模板
+								wxCommonService.sendTemplateMsg(tempRequest,tokenRequest);
+							}catch (Exception e){
+								e.printStackTrace();
+							}
+						}
+					}
+				}else{
+					if(StringUtil.isNotEmpty(wxUserInfo.getUnionid())){
+						merchantMenberService.updateByUnionId(openId,wxUserInfo.getUnionid());
+					}
+				}
+			}
+		}else{
+			StringBuilder backMsgXml = new StringBuilder("<xml>");
+			backMsgXml.append("<ToUserName><![CDATA["+openId+"]]></ToUserName>");
+			backMsgXml.append("<FromUserName><![CDATA["+(String) map.get("ToUserName")+"]]></FromUserName>");
+			backMsgXml.append("<CreateTime>"+System.currentTimeMillis()+"</CreateTime>");
+			backMsgXml.append("<MsgType><![CDATA[text]]></MsgType>");
+			backMsgXml.append("<Content><![CDATA[您好~很高兴为您服务\n<a href='https://gffhax2lhf4de.cschat.antcloud.com.cn/index.htm?tntInstId=1Jp_K9x2&scene=SCE00323632'>点此接入在线客服</a>]]></Content>");
+			backMsgXml.append("</xml>");
+			response.setContentType("text/xml; charset=utf-8");
+			response.setCharacterEncoding("UTF-8");
+			response.getWriter().write(backMsgXml.toString());
+		}
+	}
+	/**
+	 * 读取request数据
+	 * 
+	 * @param request
+	 * @return
+	 */
+	public String readRequestMsg(HttpServletRequest request) {
+		java.io.BufferedReader bis = null;
+		String line = null;
+		String result = "";
+		try {
+			bis = new java.io.BufferedReader(new java.io.InputStreamReader(request.getInputStream(), "UTF-8"));
+			while ((line = bis.readLine()) != null) {
+				result += line + "\r\n";
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		} finally {
+			try {
+				bis.close();
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+		}
+		return result;
+	}
+
+	@PostMapping("/orderPay")
+	@ResponseBody
+	public Result<Object> orderPay(@RequestBody JSONObject params) {
+		String openid = params.getString("openid");
+		String orderNumber = params.getString("orderNumber");
+		return apiPayService.orderPay(openid,orderNumber);
+	}
+
+	@PostMapping("/getAddress")
+	@ResponseBody
+	public Result<Object> getAddress(String lat ,String lng) {
+		String location = lat + "," + lng;
+		String key = "5G5BZ-BXLC3-BRM32-3LPUU-HVBFF-ULBRS";
+		String sercetKey = "LTDOFZ9utWc85jxPZdUzS2VelRCcqGf2";
+		String method = "/ws/geocoder/v1";
+
+		String reqParams = "key="+ key +"&location="+location + "&output=json";
+		String signStr = method + "?"+reqParams + sercetKey;
+		String sign = MD5Util.MD5Encode(signStr).toLowerCase(Locale.ROOT);
+		String url = Constant.TENCENT_GET_ADDRESS_URL + "?" + reqParams + "&sig=" + sign;
+		JSONObject response = restTemplate.getForObject(url, JSONObject.class);
+		Integer status = response.getInteger("status");
+		if(status != 0){
+			return ResultGenerator.genFailResult(response.getString("message"));
+		}
+		JSONObject result = response.getJSONObject("result");
+		JSONObject ad_info = result.getJSONObject("ad_info");
+		String province = ad_info.getString("province");
+		if(StringUtil.isEmpty(province)){
+			province = ad_info.getString("city");
+		}
+		return ResultGenerator.genSuccessResult("获取成功",province);
+	}
+}
diff --git a/pluss-wap-page/src/main/java/cn/pluss/platform/controller/job/SaticScheduleTask.java b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/job/SaticScheduleTask.java
new file mode 100644
index 0000000..fd3da86
--- /dev/null
+++ b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/job/SaticScheduleTask.java
@@ -0,0 +1,151 @@
+//package cn.pluss.platform.controller.job;
+//
+//import java.util.Date;
+//import java.util.HashMap;
+//import java.util.List;
+//import java.util.Map;
+//
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.scheduling.annotation.EnableScheduling;
+//import org.springframework.scheduling.annotation.Scheduled;
+//import org.springframework.stereotype.Component;
+//
+//import com.alipay.api.AlipayApiException;
+//import com.alipay.api.AlipayClient;
+//import com.alipay.api.DefaultAlipayClient;
+//import com.alipay.api.request.AlipayTradeQueryRequest;
+//import com.alipay.api.response.AlipayTradeQueryResponse;
+//
+//import cn.pluss.platform.entity.MerchantOrder;
+//import cn.pluss.platform.entity.UserApp;
+//import cn.pluss.platform.wap.HttpUrlConnection;
+//import cn.pluss.platform.wap.WxPaySignatureUtils;
+//import cn.pluss.platform.wap.XmlUtil;
+//import cn.pluss.platform.merchantOrder.MerchantOrderService;
+//import cn.pluss.platform.systemConfig.SystemConfigService;
+//import cn.pluss.platform.userApp.UserAppService;
+//import cn.pluss.platform.util.DateUtils;
+//import cn.pluss.platform.util.StringUtil;
+//import net.sf.json.JSONObject;
+//
+///**
+// * @author yuchen
+// *
+// * @Description 
+// * 定时任务查订单状态为等待付款的订单
+// */
+//@Component
+//@Configuration      //1.主要用于标记配置类，兼备Component的效果。
+//@EnableScheduling   // 2.开启定时任务
+//public class SaticScheduleTask {
+//	
+//	@Autowired
+//	private MerchantOrderService merchantOrderService;
+//	
+//	@Autowired
+//	private SystemConfigService systemConfigService;
+//	
+//	@Autowired
+//	private UserAppService userAppService;
+//	
+////    @Scheduled(fixedRate=1000*60*30)
+//    private void configureTasks() throws AlipayApiException {
+//    	MerchantOrder merchantOrder=new MerchantOrder();
+//    	merchantOrder.setStatus("5");
+//    	String endTime = DateUtils.formatDateDefault(new Date(),"yyyy-MM-dd 23:59:59");
+//    	String startTime = DateUtils.getDay(endTime, (int)0);
+//    	merchantOrder.setStartTime(startTime);
+//    	merchantOrder.setEndTime(endTime);
+//		List<MerchantOrder> queryMerchantOrderList = merchantOrderService.queryMerchantOrderList(merchantOrder);
+//		for (MerchantOrder m : queryMerchantOrderList) {
+//			merchantOrder.setId(m.getId());
+//			if("wechatPay".equalsIgnoreCase(m.getPayTypeCode())) {
+//				getwechatOrderQuery(merchantOrder);
+//			}else if("aliPay".equalsIgnoreCase(m.getPayTypeCode())) {
+//				getaliPayOrderQuery(merchantOrder);
+//			}
+//		}
+//    }
+//    
+//    /**
+//     * getaliPayOrderQuery:(查询支付宝订单 若trade_status=TRADE_SUCCESS 修改订单). <br/> 
+//     *
+//     * @author Administrator  
+//     * @throws AlipayApiException 
+//     * @since JDK 1.8
+//     */
+//	private void getaliPayOrderQuery(MerchantOrder merchantOrder) throws AlipayApiException {
+//		UserApp userApp=new UserApp();
+//		userApp.setMerchantCode(merchantOrder.getMerchantCode());
+//		List<UserApp> queryUserAppList = userAppService.queryUserAppList(userApp);
+//		if(queryUserAppList!=null&&queryUserAppList.size()>0) {
+//			userApp = queryUserAppList.get(0);
+//		}
+//		if(userApp.getAppAuthToken()==null) {
+//			return;
+//		}
+//		AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do",systemConfigService.querySystemConfigValue("ALI_APP_ID"),systemConfigService.querySystemConfigValue("PRI"),"json","GBK",systemConfigService.querySystemConfigValue("PUB"),"RSA2");
+//		AlipayTradeQueryRequest request = new AlipayTradeQueryRequest();
+//		request.setBizContent("{" +
+//				"\"out_trade_no\":\""+merchantOrder.getOrderNumber()+"\"" +
+//			"  }");
+//		AlipayTradeQueryResponse response = alipayClient.execute(request);
+//		request.putOtherTextParam("app_auth_token", userApp.getAppAuthToken());
+//		if(response.isSuccess()){
+//			String body = response.getBody();
+//			JSONObject object = (JSONObject) JSONObject.fromObject(body).get("alipay_trade_query_response");
+//			String tradeStatus = (String) object.get("trade_status");
+//			if("TRADE_SUCCESS".equals(tradeStatus)) {
+//				merchantOrder.setStatus("0");
+//				merchantOrderService.updateMerchantOrder(merchantOrder);
+//			}
+//		}
+//	}
+//    
+//	/**
+//	 * 
+//	 * getwechatOrderQuery:(查询微信订单). <br/> 
+//	 *
+//	 * @author Administrator  
+//	 * @since JDK 1.8
+//	 */
+//	private void getwechatOrderQuery(MerchantOrder merchantOrder) {
+//		UserApp userApp=new UserApp();
+//		userApp.setMerchantCode(merchantOrder.getMerchantCode());
+//		List<UserApp> queryUserAppList = userAppService.queryUserAppList(userApp);
+//		if(queryUserAppList!=null&&queryUserAppList.size()>0) {
+//			userApp = queryUserAppList.get(0);
+//		}
+//		if(userApp.getSubMchId()==null) {
+//			return;
+//		}
+//		Map<String, String> map=new HashMap<String, String>(16);
+//		map.put("appid", systemConfigService.querySystemConfigValue("APPID"));
+//		map.put("mch_id", systemConfigService.querySystemConfigValue("PID"));
+//		map.put("sub_mch_id", userApp.getSubMchId());
+//		map.put("out_trade_no", merchantOrder.getOrderNumber());
+//		map.put("nonce_str", StringUtil.getBillno());
+//		String WX_PAY_KEY = systemConfigService.querySystemConfigValue("KEY");
+//		String sign = WxPaySignatureUtils.signature(map, WX_PAY_KEY);
+//		StringBuffer xml=new StringBuffer();
+//		xml.append("<xml>");
+//		xml.append("<appid>"+ systemConfigService.querySystemConfigValue("APPID") +"</appid>");
+//		xml.append("<mch_id>"+ systemConfigService.querySystemConfigValue("PID") +"</mch_id>");
+//		xml.append("<nonce_str>"+ StringUtil.getBillno() +"</nonce_str>");
+//		xml.append("<out_trade_no>"+ merchantOrder.getOrderNumber() +"</out_trade_no>");
+//		xml.append("<sign>"+ sign +"</sign>");
+//		xml.append("</xml>");
+//		String httpXML = HttpUrlConnection.httpXML("https://api.mch.weixin.qq.com/pay/orderquery", xml.toString());
+//		Map<String, Object> result = XmlUtil.toMap(httpXML);
+//		if("SUCCESS".equals(result.get("return_code"))) {
+//			String tradeState = (String) result.get("trade_state");
+//			if("SUCCESS".equals(tradeState)){
+//				merchantOrder.setStatus("0");
+//				merchantOrderService.updateMerchantOrder(merchantOrder);
+//			}
+//		}
+//	}
+//
+//}
+//
diff --git a/pluss-wap-page/src/main/java/cn/pluss/platform/controller/phonecode/PhoneCodeController.java b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/phonecode/PhoneCodeController.java
new file mode 100644
index 0000000..9d3c6b9
--- /dev/null
+++ b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/phonecode/PhoneCodeController.java
@@ -0,0 +1,102 @@
+package cn.pluss.platform.controller.phonecode;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultCode;
+import cn.pluss.platform.constants.Constant;
+import cn.pluss.platform.entity.MerchantMenber;
+import cn.pluss.platform.entity.PhoneValidateCode;
+import cn.pluss.platform.entity.UserInfo;
+import cn.pluss.platform.merchantMenber.MerchantMenberService;
+import cn.pluss.platform.phoneValidateCode.PhoneValidateCodeService;
+import cn.pluss.platform.userInfo.UserInfoService;
+import cn.pluss.platform.util.StringUtil;
+import cn.pluss.platform.util.ValidateCodeUtil;
+import com.alibaba.fastjson.JSON;
+import com.aliyuncs.exceptions.ClientException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author yuchen
+ * @Description 验证码
+ */
+@Controller
+public class PhoneCodeController {
+
+    @Autowired
+    private PhoneValidateCodeService phoneValidateCodeService;
+
+    @Autowired
+    private UserInfoService userInfoService;
+
+    @Autowired
+    private MerchantMenberService merchantMenberService;
+
+    @Autowired
+    private ValidateCodeUtil validateCodeUtil;
+
+    public Object sevice(String param) throws ClientException {
+        UserInfo userInfo = new UserInfo();
+        userInfo.setLoginName(param);
+        Map<String, Object> result = new HashMap<>(16);
+        List<UserInfo> queryUserInfoList = userInfoService.queryUserInfoList(userInfo);
+        if (queryUserInfoList != null && queryUserInfoList.size() > 0) {
+            result.put(Constant.RESULT_CODE_FAIL, "手机号已注册");
+            return JSON.toJSONString(result);
+        }
+
+        String checkCode = StringUtil.random(4);
+        Result<Object> objectResult = validateCodeUtil.requestValidateCode(param, checkCode);
+        if (objectResult != null && objectResult.getCode() == ResultCode.FAIL.code()) {
+            result.put(Constant.RESULT_CODE_FAIL, objectResult.getMessage());
+            return JSON.toJSONString(result);
+        }
+
+        PhoneValidateCode phoneValidateCode = new PhoneValidateCode();
+        phoneValidateCode.setPhone(param);
+        phoneValidateCode.setSendDt(new Date());
+        result.put(Constant.RESULT_CODE_SUCCESS, "发送成功");
+        phoneValidateCode.setCode(checkCode);
+        phoneValidateCode.setStatus("1");
+        phoneValidateCodeService.savePhoneValidateCode(phoneValidateCode);
+        String res = JSON.toJSONString(result);
+        System.out.println(res);
+        return res;
+    }
+
+    public Object seviceVIP(String phone, String storeId) throws ClientException {
+        MerchantMenber merchantMenber = new MerchantMenber();
+        merchantMenber.setPhone(phone);
+        merchantMenber.setStoreId(storeId);
+        Map<String, Object> result = new HashMap<>(16);
+        List<MerchantMenber> queryMerchantMenberList = merchantMenberService.queryMerchantMenberList(merchantMenber);
+        if (queryMerchantMenberList != null && queryMerchantMenberList.size() > 0) {
+            result.put(Constant.RESULT_CODE_FAIL, "该门店已注册会员");
+            return JSON.toJSONString(result);
+        }
+
+        String checkCode = StringUtil.random(4);
+
+        Result<Object> objectResult = validateCodeUtil.requestValidateCode(phone, checkCode);
+        if (objectResult != null && objectResult.getCode() == ResultCode.FAIL.code()) {
+            result.put(Constant.RESULT_CODE_FAIL, objectResult.getMessage());
+            return JSON.toJSONString(result);
+        }
+
+        PhoneValidateCode phoneValidateCode = new PhoneValidateCode();
+        phoneValidateCode.setPhone(phone);
+        phoneValidateCode.setSendDt(new Date());
+        result.put(Constant.RESULT_CODE_SUCCESS, "发送成功");
+        phoneValidateCode.setCode(checkCode);
+        phoneValidateCode.setStatus("1");
+        phoneValidateCodeService.savePhoneValidateCode(phoneValidateCode);
+        return JSON.toJSONString(result);
+    }
+
+}
+
diff --git a/pluss-wap-page/src/main/java/cn/pluss/platform/controller/systemConfig/SystemConfigController.java b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/systemConfig/SystemConfigController.java
new file mode 100644
index 0000000..f59e349
--- /dev/null
+++ b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/systemConfig/SystemConfigController.java
@@ -0,0 +1,150 @@
+package cn.pluss.platform.controller.systemConfig;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import javax.servlet.http.HttpServletRequest;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import cn.pluss.platform.entity.SystemConfig;
+import cn.pluss.platform.systemConfig.SystemConfigService;
+import cn.pluss.platform.util.StringUtil;
+
+
+@Controller
+@RequestMapping("systemconfig")
+public class SystemConfigController {
+
+	private Integer PAGE_SIZE=12;
+    @Autowired
+    private SystemConfigService systemConfigService;
+    
+    //引导页
+    @RequestMapping(value = "/index", method = RequestMethod.GET)
+    public String index() {
+    	
+        return "systemConfig/systemconfigList";
+    }
+    
+    
+	//分页查询
+    @RequestMapping(value = "/querySystemconfigByPage", method = RequestMethod.POST)
+    @ResponseBody
+    public  Map<String,Object> querySystemconfigByPage(Integer currPage,Integer id) {
+    	
+    	if(currPage==null) {
+    		currPage=1;
+    	}
+    	Map<String,Object> map=new HashMap<String, Object>();
+    	map.put("pageSize",PAGE_SIZE);
+    	map.put("offset", (currPage-1)*PAGE_SIZE);
+    	map.put("id",  id);
+    	
+       	List<SystemConfig> systemconfigList=systemConfigService.querySystemConfigPage(map);
+    	Integer count=systemConfigService.querySystemConfigPageCount(map);
+        Map<String,Object> result=new HashMap<String,Object>();
+        result.put("systemconfigList", systemconfigList);
+        result.put("count", count);
+        result.put("pageCount",StringUtil.getPageCount(count,PAGE_SIZE));
+        result.put("currPage", currPage);
+    
+        return result;
+    }
+    
+    
+    //查询详情
+    @RequestMapping(value = "/querySystemconfigDetails", method = RequestMethod.GET)
+    public String querySystemconfigDetails(HttpServletRequest request,Integer id,Integer pageIndex) {
+    	if(id!=null&&id!=0) {
+    		SystemConfig systemconfig=new SystemConfig();
+        	systemconfig.setId(id);
+        	systemconfig=systemConfigService.querySystemConfig(systemconfig);
+        	request.setAttribute("systemconfig", systemconfig);
+        	request.setAttribute("pageIndex", pageIndex);
+    		
+    	}
+    
+        return "systemConfig/systemconfigDetails";
+    }
+    
+    
+    
+    /**
+     *查询详情
+     */
+    @RequestMapping(value = "/querySystemconfigBaseInfo", method = RequestMethod.GET)
+     public String querySystemConfigBaseInfo(HttpServletRequest request ,Integer id){
+    	if(id!=null&&id!=0) {
+		     SystemConfig systemconfig=new SystemConfig();
+		     systemconfig.setId(id);
+	    	 systemconfig=systemConfigService.querySystemConfig(systemconfig);
+	    	 request.setAttribute("systemconfig", systemconfig);
+    	}
+         return "systemConfig/systemconfigBaseInfo";
+     }
+     /**
+     *查询详情
+     */
+    @RequestMapping(value = "/querySystemconfigExtendsInfo", method = RequestMethod.GET)
+     public String querySystemConfigExtendsInfo(){
+    
+         return "systemConfig/systemconfigExtendsInfo";
+     }
+     /**
+     *查询详情
+     */
+    @RequestMapping(value = "/querySystemconfigFunctionsInfo", method = RequestMethod.GET)
+     public String querySystemConfigFunctionsInfo(){
+    
+         return "systemConfig/systemconfigFunctionsInfo";
+     }
+     /**
+     *保存对象
+     */
+    @RequestMapping(value = "/saveSystemconfig", method = RequestMethod.POST)
+    @ResponseBody
+     public Map<String,Object> saveSystemConfig(SystemConfig systemconfig){
+        if(systemconfig.getId()!=null&&systemconfig.getId()!=0){
+     		systemConfigService.updateSystemConfig(systemconfig);
+     	 }else{  
+     		 systemConfigService.saveSystemConfig(systemconfig);
+     	 }  
+ 		Map<String,Object> result=new HashMap<String,Object>();
+     	result.put("resultCode", "1");
+     	result.put("resultMessage", "保存成功!");
+     	return result;
+     }
+     /**
+     *修改对象
+     */
+    @RequestMapping(value = "/updateSystemconfig", method = RequestMethod.POST)
+    @ResponseBody
+     public  Map<String,Object> updateSystemConfig(Integer id){
+	     SystemConfig systemconfig=new SystemConfig();
+	     systemconfig.setId(id);
+       	systemConfigService.updateSystemConfig(systemconfig);
+       	Map<String,Object> result=new HashMap<String,Object>();
+     	result.put("resultCode", "1");
+     	result.put("resultMessage", "保存成功!");
+     	return result;
+     }
+     /**
+     *删除对象
+     */
+    @RequestMapping(value = "/deleteSystemconfig", method = RequestMethod.POST)
+    @ResponseBody
+     public Map<String,Object> deleteSystemConfig(Integer id){
+        SystemConfig systemconfig=new SystemConfig();
+	    systemconfig.setId(id);
+ 		systemConfigService.deleteSystemConfig(systemconfig);
+ 		Map<String,Object> result=new HashMap<String,Object>();
+     	result.put("resultCode", "1");
+     	result.put("resultMessage", "保存成功!");
+     	return result;
+     }
+    
+}
diff --git a/pluss-wap-page/src/main/java/cn/pluss/platform/controller/test/HelloController.java b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/test/HelloController.java
new file mode 100644
index 0000000..8f6f138
--- /dev/null
+++ b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/test/HelloController.java
@@ -0,0 +1,61 @@
+package cn.pluss.platform.controller.test;
+
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.pay.ApiPayService;
+import cn.pluss.platform.util.IpUtils;
+import cn.pluss.platform.util.MD5Util;
+import cn.pluss.platform.util.SignUtils;
+import cn.pluss.platform.util.StringUtil;
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
+
+
+@Controller
+@RequestMapping(value = "/test")
+public class HelloController {
+
+    @Resource
+    private ApiPayService apiPayService;
+
+    @RequestMapping(value = "/callbackV1")
+    @ResponseBody
+    public JSONObject callbackV1(){
+        JSONObject result = new JSONObject();
+        result.put("code","SUCCESS");
+        result.put("msg","成功");
+        return result;
+    }
+
+    @RequestMapping(value = "/callbackV2")
+    @ResponseBody
+    public String callbackV2(){
+        return "SUCCESS";
+    }
+
+    @RequestMapping(value = "testPay")
+    @ResponseBody
+    public Result<Object> payTest(Double payAmt, HttpServletRequest request){
+        String key = "4c8d277b0f274604af68e590cc0b3e6b";
+        JSONObject params = new JSONObject();
+        params.put("mercOrderNo","TEST100"+ StringUtil.genRandomNum(20));
+        params.put("merchantCode","M800202107223018811");
+        params.put("method","trans_wap_pay");
+        params.put("payAmt", BigDecimal.valueOf(payAmt).setScale(2,BigDecimal.ROUND_HALF_UP));
+        params.put("ip","171.83.125.71");
+        params.put("notifyUrl","http://bzgcrystal.natapp1.cc/wap/test/callbackV1");
+        params.put("payWay","WXZF");
+        params.put("subject","测试");
+        params.put("returnUrl","http://www.baidu.com");
+        String sigStr = SignUtils.getSignContent(params)+"&key="+key;
+        String sign = MD5Util.MD5Encode(sigStr, "UTF-8");
+        params.put("sign",sign);
+        JSONObject pay = apiPayService.pay(params.toString(), IpUtils.getIpAddr(request));
+        return ResultGenerator.genSuccessResult("获取成功",pay.getJSONObject("data").getString("orderNumber"));
+    }
+}
diff --git a/pluss-wap-page/src/main/resources/application-dev.yml b/pluss-wap-page/src/main/resources/application-dev.yml
new file mode 100644
index 0000000..a174eb6
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/application-dev.yml
@@ -0,0 +1,7 @@
+spring:
+  datasource:
+    druid:
+      url:
+      username:
+      password:
+      driver-class-name: com.mysql.jdbc.Driver
diff --git a/pluss-wap-page/src/main/resources/application-prod.yml b/pluss-wap-page/src/main/resources/application-prod.yml
new file mode 100644
index 0000000..5a6de5b
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/application-prod.yml
@@ -0,0 +1,10 @@
+spring:
+  datasource:
+    druid:
+      url:
+      username:
+      password:
+      driver-class-name: com.mysql.jdbc.Driver
+
+scheduling:
+  enabled: true
diff --git a/pluss-wap-page/src/main/resources/application-test.yml b/pluss-wap-page/src/main/resources/application-test.yml
new file mode 100644
index 0000000..a174eb6
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/application-test.yml
@@ -0,0 +1,7 @@
+spring:
+  datasource:
+    druid:
+      url:
+      username:
+      password:
+      driver-class-name: com.mysql.jdbc.Driver
diff --git a/pluss-wap-page/src/main/resources/application.yml b/pluss-wap-page/src/main/resources/application.yml
new file mode 100644
index 0000000..74e6fd2
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/application.yml
@@ -0,0 +1,40 @@
+server:
+  port: 8084
+  servlet:
+    context-path: /wap
+
+spring:
+  main:
+    allow-bean-definition-overriding: true
+  profiles:
+    include: common, ryx, ys
+    active: dev
+  datasource:
+    url:
+    username:
+    password:
+    driver-class-name: com.mysql.jdbc.Driver
+
+  #  mvc:
+  #    view:
+  #      prefix: /WEB-INF/jsp/
+  #      suffix: .jsp
+  #  thymeleaf:
+  #    mode: HTML
+  #    encoding: UTF-8
+  #    cache: false
+  #    prefix: classpath:/templates/
+  #    servlet:
+  #      content-type: text/html
+  resources:
+    static-locations: classpath:/static
+  rabbitmq:
+    username:
+    password:
+    host:
+    port: 5672
+
+jpush:
+  environment:
+    # 极光推送开发环境还是线上环境。暂未使用
+    develop: true
diff --git a/pluss-wap-page/src/main/resources/log4j2.xml b/pluss-wap-page/src/main/resources/log4j2.xml
new file mode 100644
index 0000000..3e1aa08
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/log4j2.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--日志级别以及优先级排序: OFF > FATAL > ERROR > WARN > INFO > DEBUG > TRACE > ALL -->
+<!--Configuration后面的status，这个用于设置log4j2自身内部的信息输出，可以不设置，当设置成trace时，你会看到log4j2内部各种详细输出-->
+<!--monitorInterval：Log4j能够自动检测修改配置 文件和重新配置本身，设置间隔秒数-->
+<configuration status="WARN" monitorInterval="30">
+    <!--先定义所有的appender-->
+    <appenders>
+        <!--这个输出控制台的配置-->
+        <console name="Console" target="SYSTEM_OUT">
+            <!--输出日志的格式-->
+            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss:SSS} %p - %l - %m%n"/>
+        </console>
+        <!--文件会打印出所有信息，这个log每次运行程序会自动清空，由append属性决定，这个也挺有用的，适合临时测试用-->
+        <File name="log" fileName="${sys:user.home}/wap/log/test.log" append="false">
+            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %class{36} %L %M - %msg%xEx%n" />
+        </File>
+        <!-- 这个会打印出所有的info及以下级别的信息，每次大小超过size，则这size大小的日志会自动存入按年份-月份建立的文件夹下面并进行压缩，作为存档-->
+        <RollingFile name="RollingFileInfo" fileName="${sys:user.home}/wap/logs/info.log"
+                     filePattern="${sys:user.home}/wap/logs/$${date:yyyy-MM}/info-%d{yyyy-MM-dd}-%i.log">
+            <!--控制台只输出level及以上级别的信息（onMatch），其他的直接拒绝（onMismatch）-->
+            <ThresholdFilter level="info" onMatch="ACCEPT" onMismatch="DENY"/>
+            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss:SSS} %p - %l - %m%n"/>
+            <Policies>
+                <TimeBasedTriggeringPolicy modulate="true" interval="1"/>
+                <SizeBasedTriggeringPolicy size="100 MB"/>
+            </Policies>
+        </RollingFile>
+        <RollingFile name="RollingFileWarn" fileName="${sys:user.home}/wap/logs/warn.log"
+                     filePattern="${sys:user.home}/wap/logs/$${date:yyyy-MM}/warn-%d{yyyy-MM-dd}-%i.log">
+            <ThresholdFilter level="warn" onMatch="ACCEPT" onMismatch="DENY"/>
+            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss:SSS} %p - %l - %m%n"/>
+            <Policies>
+                <TimeBasedTriggeringPolicy modulate="true" interval="1"/>
+                <SizeBasedTriggeringPolicy size="100 MB"/>
+            </Policies>
+            <!-- DefaultRolloverStrategy属性如不设置，则默认为最多同一文件夹下7个文件，这里设置了20 -->
+            <DefaultRolloverStrategy max="20"/>
+        </RollingFile>
+        <RollingFile name="RollingFileError" fileName="${sys:user.home}/wap/logs/error.log"
+                     filePattern="${sys:user.home}/wap/logs/$${date:yyyy-MM}/error-%d{yyyy-MM-dd}-%i.log">
+            <ThresholdFilter level="error" onMatch="ACCEPT" onMismatch="DENY"/>
+            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss:SSS} %p - %l - %m%n"/>
+            <Policies>
+                <TimeBasedTriggeringPolicy modulate="true" interval="1"/>
+                <SizeBasedTriggeringPolicy size="100 MB"/>
+            </Policies>
+        </RollingFile>
+    </appenders>
+    <!--然后定义logger，只有定义了logger并引入的appender，appender才会生效-->
+    <loggers>
+        <!--过滤掉spring和mybatis的一些无用的DEBUG信息-->
+        <logger name="org.springframework" level="INFO"></logger>
+        <logger name="org.mybatis" level="INFO"></logger>
+        <root level="all">
+            <appender-ref ref="Console"/>
+            <appender-ref ref="RollingFileInfo"/>
+            <appender-ref ref="RollingFileWarn"/>
+            <appender-ref ref="RollingFileError"/>
+        </root>
+    </loggers>
+</configuration>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/css/DPlayer.min.css b/pluss-wap-page/src/main/resources/static/resources/css/DPlayer.min.css
new file mode 100644
index 0000000..878ba62
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/css/DPlayer.min.css
@@ -0,0 +1,4 @@
+button[data-balloon]{overflow:visible}[data-balloon]{position:relative;cursor:pointer}[data-balloon]:after{font-family:sans-serif!important;font-weight:400!important;font-style:normal!important;text-shadow:none!important;font-size:12px!important;background:hsla(0,0%,7%,.9);border-radius:4px;color:#fff;content:attr(data-balloon);padding:.5em 1em;white-space:nowrap}[data-balloon]:after,[data-balloon]:before{filter:alpha(opactiy=0);-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";-moz-opacity:0;-khtml-opacity:0;opacity:0;pointer-events:none;transition:all .18s ease-out .18s;position:absolute;z-index:10}[data-balloon]:before{background:no-repeat url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='36' height='12'%3E%3Cpath fill='rgba(17, 17, 17, 0.9)' d='M2.658 0h32.004c-6 0-11.627 12.002-16.002 12.002C14.285 12.002 8.594 0 2.658 0z'/%3E%3C/svg%3E");background-size:100% auto;width:18px;height:6px;content:""}[data-balloon]:hover:after,[data-balloon]:hover:before,[data-balloon][data-balloon-visible]:after,[data-balloon][data-balloon-visible]:before{filter:alpha(opactiy=100);-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";-moz-opacity:1;-khtml-opacity:1;opacity:1;pointer-events:auto}[data-balloon].font-awesome:after{font-family:FontAwesome}[data-balloon][data-balloon-break]:after{white-space:pre}[data-balloon][data-balloon-blunt]:after,[data-balloon][data-balloon-blunt]:before{transition:none}[data-balloon][data-balloon-pos=up]:after{margin-bottom:11px}[data-balloon][data-balloon-pos=up]:after,[data-balloon][data-balloon-pos=up]:before{bottom:100%;left:50%;-webkit-transform:translate(-50%,10px);transform:translate(-50%,10px);-webkit-transform-origin:top;transform-origin:top}[data-balloon][data-balloon-pos=up]:before{margin-bottom:5px}[data-balloon][data-balloon-pos=up]:hover:after,[data-balloon][data-balloon-pos=up]:hover:before,[data-balloon][data-balloon-pos=up][data-balloon-visible]:after,[data-balloon][data-balloon-pos=up][data-balloon-visible]:before{-webkit-transform:translate(-50%);transform:translate(-50%)}[data-balloon][data-balloon-pos=up-left]:after{left:0;margin-bottom:11px}[data-balloon][data-balloon-pos=up-left]:after,[data-balloon][data-balloon-pos=up-left]:before{bottom:100%;-webkit-transform:translateY(10px);transform:translateY(10px);-webkit-transform-origin:top;transform-origin:top}[data-balloon][data-balloon-pos=up-left]:before{left:5px;margin-bottom:5px}[data-balloon][data-balloon-pos=up-left]:hover:after,[data-balloon][data-balloon-pos=up-left]:hover:before,[data-balloon][data-balloon-pos=up-left][data-balloon-visible]:after,[data-balloon][data-balloon-pos=up-left][data-balloon-visible]:before{-webkit-transform:translate(0);transform:translate(0)}[data-balloon][data-balloon-pos=up-right]:after{right:0;margin-bottom:11px}[data-balloon][data-balloon-pos=up-right]:after,[data-balloon][data-balloon-pos=up-right]:before{bottom:100%;-webkit-transform:translateY(10px);transform:translateY(10px);-webkit-transform-origin:top;transform-origin:top}[data-balloon][data-balloon-pos=up-right]:before{right:5px;margin-bottom:5px}[data-balloon][data-balloon-pos=up-right]:hover:after,[data-balloon][data-balloon-pos=up-right]:hover:before,[data-balloon][data-balloon-pos=up-right][data-balloon-visible]:after,[data-balloon][data-balloon-pos=up-right][data-balloon-visible]:before{-webkit-transform:translate(0);transform:translate(0)}[data-balloon][data-balloon-pos=down]:after{margin-top:11px}[data-balloon][data-balloon-pos=down]:after,[data-balloon][data-balloon-pos=down]:before{left:50%;top:100%;-webkit-transform:translate(-50%,-10px);transform:translate(-50%,-10px)}[data-balloon][data-balloon-pos=down]:before{background:no-repeat url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='36' height='12'%3E%3Cpath fill='rgba(17, 17, 17, 0.9)' d='M33.342 12H1.338c6 0 11.627-12.002 16.002-12.002C21.715-.002 27.406 12 33.342 12z'/%3E%3C/svg%3E");background-size:100% auto;width:18px;height:6px;margin-top:5px}[data-balloon][data-balloon-pos=down]:hover:after,[data-balloon][data-balloon-pos=down]:hover:before,[data-balloon][data-balloon-pos=down][data-balloon-visible]:after,[data-balloon][data-balloon-pos=down][data-balloon-visible]:before{-webkit-transform:translate(-50%);transform:translate(-50%)}[data-balloon][data-balloon-pos=down-left]:after{left:0;margin-top:11px;top:100%;-webkit-transform:translateY(-10px);transform:translateY(-10px)}[data-balloon][data-balloon-pos=down-left]:before{background:no-repeat url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='36' height='12'%3E%3Cpath fill='rgba(17, 17, 17, 0.9)' d='M33.342 12H1.338c6 0 11.627-12.002 16.002-12.002C21.715-.002 27.406 12 33.342 12z'/%3E%3C/svg%3E");background-size:100% auto;width:18px;height:6px;left:5px;margin-top:5px;top:100%;-webkit-transform:translateY(-10px);transform:translateY(-10px)}[data-balloon][data-balloon-pos=down-left]:hover:after,[data-balloon][data-balloon-pos=down-left]:hover:before,[data-balloon][data-balloon-pos=down-left][data-balloon-visible]:after,[data-balloon][data-balloon-pos=down-left][data-balloon-visible]:before{-webkit-transform:translate(0);transform:translate(0)}[data-balloon][data-balloon-pos=down-right]:after{right:0;margin-top:11px;top:100%;-webkit-transform:translateY(-10px);transform:translateY(-10px)}[data-balloon][data-balloon-pos=down-right]:before{background:no-repeat url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='36' height='12'%3E%3Cpath fill='rgba(17, 17, 17, 0.9)' d='M33.342 12H1.338c6 0 11.627-12.002 16.002-12.002C21.715-.002 27.406 12 33.342 12z'/%3E%3C/svg%3E");background-size:100% auto;width:18px;height:6px;right:5px;margin-top:5px;top:100%;-webkit-transform:translateY(-10px);transform:translateY(-10px)}[data-balloon][data-balloon-pos=down-right]:hover:after,[data-balloon][data-balloon-pos=down-right]:hover:before,[data-balloon][data-balloon-pos=down-right][data-balloon-visible]:after,[data-balloon][data-balloon-pos=down-right][data-balloon-visible]:before{-webkit-transform:translate(0);transform:translate(0)}[data-balloon][data-balloon-pos=left]:after{margin-right:11px;right:100%;top:50%;-webkit-transform:translate(10px,-50%);transform:translate(10px,-50%)}[data-balloon][data-balloon-pos=left]:before{background:no-repeat url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='36'%3E%3Cpath fill='rgba(17, 17, 17, 0.9)' d='M0 33.342V1.338c0 6 12.002 11.627 12.002 16.002C12.002 21.715 0 27.406 0 33.342z'/%3E%3C/svg%3E");background-size:100% auto;width:6px;height:18px;margin-right:5px;right:100%;top:50%;-webkit-transform:translate(10px,-50%);transform:translate(10px,-50%)}[data-balloon][data-balloon-pos=left]:hover:after,[data-balloon][data-balloon-pos=left]:hover:before,[data-balloon][data-balloon-pos=left][data-balloon-visible]:after,[data-balloon][data-balloon-pos=left][data-balloon-visible]:before{-webkit-transform:translateY(-50%);transform:translateY(-50%)}[data-balloon][data-balloon-pos=right]:after{left:100%;margin-left:11px;top:50%;-webkit-transform:translate(-10px,-50%);transform:translate(-10px,-50%)}[data-balloon][data-balloon-pos=right]:before{background:no-repeat url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='36'%3E%3Cpath fill='rgba(17, 17, 17, 0.9)' d='M12 2.658v32.004c0-6-12.002-11.627-12.002-16.002C-.002 14.285 12 8.594 12 2.658z'/%3E%3C/svg%3E");background-size:100% auto;width:6px;height:18px;left:100%;margin-left:5px;top:50%;-webkit-transform:translate(-10px,-50%);transform:translate(-10px,-50%)}[data-balloon][data-balloon-pos=right]:hover:after,[data-balloon][data-balloon-pos=right]:hover:before,[data-balloon][data-balloon-pos=right][data-balloon-visible]:after,[data-balloon][data-balloon-pos=right][data-balloon-visible]:before{-webkit-transform:translateY(-50%);transform:translateY(-50%)}[data-balloon][data-balloon-length=small]:after{white-space:normal;width:80px}[data-balloon][data-balloon-length=medium]:after{white-space:normal;width:150px}[data-balloon][data-balloon-length=large]:after{white-space:normal;width:260px}[data-balloon][data-balloon-length=xlarge]:after{white-space:normal;width:380px}@media screen and (max-width:768px){[data-balloon][data-balloon-length=xlarge]:after{white-space:normal;width:90vw}}[data-balloon][data-balloon-length=fit]:after{white-space:normal;width:100%}
+@-webkit-keyframes my-face{2%{-webkit-transform:translateY(1.5px) rotate(1.5deg);transform:translateY(1.5px) rotate(1.5deg)}4%{-webkit-transform:translateY(-1.5px) rotate(-.5deg);transform:translateY(-1.5px) rotate(-.5deg)}6%{-webkit-transform:translateY(1.5px) rotate(-1.5deg);transform:translateY(1.5px) rotate(-1.5deg)}8%{-webkit-transform:translateY(-1.5px) rotate(-1.5deg);transform:translateY(-1.5px) rotate(-1.5deg)}10%{-webkit-transform:translateY(2.5px) rotate(1.5deg);transform:translateY(2.5px) rotate(1.5deg)}12%{-webkit-transform:translateY(-.5px) rotate(1.5deg);transform:translateY(-.5px) rotate(1.5deg)}14%{-webkit-transform:translateY(-1.5px) rotate(1.5deg);transform:translateY(-1.5px) rotate(1.5deg)}16%{-webkit-transform:translateY(-.5px) rotate(-1.5deg);transform:translateY(-.5px) rotate(-1.5deg)}18%{-webkit-transform:translateY(.5px) rotate(-1.5deg);transform:translateY(.5px) rotate(-1.5deg)}20%{-webkit-transform:translateY(-1.5px) rotate(2.5deg);transform:translateY(-1.5px) rotate(2.5deg)}22%{-webkit-transform:translateY(.5px) rotate(-1.5deg);transform:translateY(.5px) rotate(-1.5deg)}24%{-webkit-transform:translateY(1.5px) rotate(1.5deg);transform:translateY(1.5px) rotate(1.5deg)}26%{-webkit-transform:translateY(.5px) rotate(.5deg);transform:translateY(.5px) rotate(.5deg)}28%{-webkit-transform:translateY(.5px) rotate(1.5deg);transform:translateY(.5px) rotate(1.5deg)}30%{-webkit-transform:translateY(-.5px) rotate(2.5deg);transform:translateY(-.5px) rotate(2.5deg)}32%{-webkit-transform:translateY(1.5px) rotate(-.5deg);transform:translateY(1.5px) rotate(-.5deg)}34%{-webkit-transform:translateY(1.5px) rotate(-.5deg);transform:translateY(1.5px) rotate(-.5deg)}36%{-webkit-transform:translateY(-1.5px) rotate(2.5deg);transform:translateY(-1.5px) rotate(2.5deg)}38%{-webkit-transform:translateY(1.5px) rotate(-1.5deg);transform:translateY(1.5px) rotate(-1.5deg)}40%{-webkit-transform:translateY(-.5px) rotate(2.5deg);transform:translateY(-.5px) rotate(2.5deg)}42%{-webkit-transform:translateY(2.5px) rotate(-1.5deg);transform:translateY(2.5px) rotate(-1.5deg)}44%{-webkit-transform:translateY(1.5px) rotate(.5deg);transform:translateY(1.5px) rotate(.5deg)}46%{-webkit-transform:translateY(-1.5px) rotate(2.5deg);transform:translateY(-1.5px) rotate(2.5deg)}48%{-webkit-transform:translateY(-.5px) rotate(.5deg);transform:translateY(-.5px) rotate(.5deg)}50%{-webkit-transform:translateY(.5px) rotate(.5deg);transform:translateY(.5px) rotate(.5deg)}52%{-webkit-transform:translateY(2.5px) rotate(2.5deg);transform:translateY(2.5px) rotate(2.5deg)}54%{-webkit-transform:translateY(-1.5px) rotate(1.5deg);transform:translateY(-1.5px) rotate(1.5deg)}56%{-webkit-transform:translateY(2.5px) rotate(2.5deg);transform:translateY(2.5px) rotate(2.5deg)}58%{-webkit-transform:translateY(.5px) rotate(2.5deg);transform:translateY(.5px) rotate(2.5deg)}60%{-webkit-transform:translateY(2.5px) rotate(2.5deg);transform:translateY(2.5px) rotate(2.5deg)}62%{-webkit-transform:translateY(-.5px) rotate(2.5deg);transform:translateY(-.5px) rotate(2.5deg)}64%{-webkit-transform:translateY(-.5px) rotate(1.5deg);transform:translateY(-.5px) rotate(1.5deg)}66%{-webkit-transform:translateY(1.5px) rotate(-.5deg);transform:translateY(1.5px) rotate(-.5deg)}68%{-webkit-transform:translateY(-1.5px) rotate(-.5deg);transform:translateY(-1.5px) rotate(-.5deg)}70%{-webkit-transform:translateY(1.5px) rotate(.5deg);transform:translateY(1.5px) rotate(.5deg)}72%{-webkit-transform:translateY(2.5px) rotate(1.5deg);transform:translateY(2.5px) rotate(1.5deg)}74%{-webkit-transform:translateY(-.5px) rotate(.5deg);transform:translateY(-.5px) rotate(.5deg)}76%{-webkit-transform:translateY(-.5px) rotate(2.5deg);transform:translateY(-.5px) rotate(2.5deg)}78%{-webkit-transform:translateY(-.5px) rotate(1.5deg);transform:translateY(-.5px) rotate(1.5deg)}80%{-webkit-transform:translateY(1.5px) rotate(1.5deg);transform:translateY(1.5px) rotate(1.5deg)}82%{-webkit-transform:translateY(-.5px) rotate(.5deg);transform:translateY(-.5px) rotate(.5deg)}84%{-webkit-transform:translateY(1.5px) rotate(2.5deg);transform:translateY(1.5px) rotate(2.5deg)}86%{-webkit-transform:translateY(-1.5px) rotate(-1.5deg);transform:translateY(-1.5px) rotate(-1.5deg)}88%{-webkit-transform:translateY(-.5px) rotate(2.5deg);transform:translateY(-.5px) rotate(2.5deg)}90%{-webkit-transform:translateY(2.5px) rotate(-.5deg);transform:translateY(2.5px) rotate(-.5deg)}92%{-webkit-transform:translateY(.5px) rotate(-.5deg);transform:translateY(.5px) rotate(-.5deg)}94%{-webkit-transform:translateY(2.5px) rotate(.5deg);transform:translateY(2.5px) rotate(.5deg)}96%{-webkit-transform:translateY(-.5px) rotate(1.5deg);transform:translateY(-.5px) rotate(1.5deg)}98%{-webkit-transform:translateY(-1.5px) rotate(-.5deg);transform:translateY(-1.5px) rotate(-.5deg)}0%,to{-webkit-transform:translate(0) rotate(0deg);transform:translate(0) rotate(0deg)}}@keyframes my-face{2%{-webkit-transform:translateY(1.5px) rotate(1.5deg);transform:translateY(1.5px) rotate(1.5deg)}4%{-webkit-transform:translateY(-1.5px) rotate(-.5deg);transform:translateY(-1.5px) rotate(-.5deg)}6%{-webkit-transform:translateY(1.5px) rotate(-1.5deg);transform:translateY(1.5px) rotate(-1.5deg)}8%{-webkit-transform:translateY(-1.5px) rotate(-1.5deg);transform:translateY(-1.5px) rotate(-1.5deg)}10%{-webkit-transform:translateY(2.5px) rotate(1.5deg);transform:translateY(2.5px) rotate(1.5deg)}12%{-webkit-transform:translateY(-.5px) rotate(1.5deg);transform:translateY(-.5px) rotate(1.5deg)}14%{-webkit-transform:translateY(-1.5px) rotate(1.5deg);transform:translateY(-1.5px) rotate(1.5deg)}16%{-webkit-transform:translateY(-.5px) rotate(-1.5deg);transform:translateY(-.5px) rotate(-1.5deg)}18%{-webkit-transform:translateY(.5px) rotate(-1.5deg);transform:translateY(.5px) rotate(-1.5deg)}20%{-webkit-transform:translateY(-1.5px) rotate(2.5deg);transform:translateY(-1.5px) rotate(2.5deg)}22%{-webkit-transform:translateY(.5px) rotate(-1.5deg);transform:translateY(.5px) rotate(-1.5deg)}24%{-webkit-transform:translateY(1.5px) rotate(1.5deg);transform:translateY(1.5px) rotate(1.5deg)}26%{-webkit-transform:translateY(.5px) rotate(.5deg);transform:translateY(.5px) rotate(.5deg)}28%{-webkit-transform:translateY(.5px) rotate(1.5deg);transform:translateY(.5px) rotate(1.5deg)}30%{-webkit-transform:translateY(-.5px) rotate(2.5deg);transform:translateY(-.5px) rotate(2.5deg)}32%{-webkit-transform:translateY(1.5px) rotate(-.5deg);transform:translateY(1.5px) rotate(-.5deg)}34%{-webkit-transform:translateY(1.5px) rotate(-.5deg);transform:translateY(1.5px) rotate(-.5deg)}36%{-webkit-transform:translateY(-1.5px) rotate(2.5deg);transform:translateY(-1.5px) rotate(2.5deg)}38%{-webkit-transform:translateY(1.5px) rotate(-1.5deg);transform:translateY(1.5px) rotate(-1.5deg)}40%{-webkit-transform:translateY(-.5px) rotate(2.5deg);transform:translateY(-.5px) rotate(2.5deg)}42%{-webkit-transform:translateY(2.5px) rotate(-1.5deg);transform:translateY(2.5px) rotate(-1.5deg)}44%{-webkit-transform:translateY(1.5px) rotate(.5deg);transform:translateY(1.5px) rotate(.5deg)}46%{-webkit-transform:translateY(-1.5px) rotate(2.5deg);transform:translateY(-1.5px) rotate(2.5deg)}48%{-webkit-transform:translateY(-.5px) rotate(.5deg);transform:translateY(-.5px) rotate(.5deg)}50%{-webkit-transform:translateY(.5px) rotate(.5deg);transform:translateY(.5px) rotate(.5deg)}52%{-webkit-transform:translateY(2.5px) rotate(2.5deg);transform:translateY(2.5px) rotate(2.5deg)}54%{-webkit-transform:translateY(-1.5px) rotate(1.5deg);transform:translateY(-1.5px) rotate(1.5deg)}56%{-webkit-transform:translateY(2.5px) rotate(2.5deg);transform:translateY(2.5px) rotate(2.5deg)}58%{-webkit-transform:translateY(.5px) rotate(2.5deg);transform:translateY(.5px) rotate(2.5deg)}60%{-webkit-transform:translateY(2.5px) rotate(2.5deg);transform:translateY(2.5px) rotate(2.5deg)}62%{-webkit-transform:translateY(-.5px) rotate(2.5deg);transform:translateY(-.5px) rotate(2.5deg)}64%{-webkit-transform:translateY(-.5px) rotate(1.5deg);transform:translateY(-.5px) rotate(1.5deg)}66%{-webkit-transform:translateY(1.5px) rotate(-.5deg);transform:translateY(1.5px) rotate(-.5deg)}68%{-webkit-transform:translateY(-1.5px) rotate(-.5deg);transform:translateY(-1.5px) rotate(-.5deg)}70%{-webkit-transform:translateY(1.5px) rotate(.5deg);transform:translateY(1.5px) rotate(.5deg)}72%{-webkit-transform:translateY(2.5px) rotate(1.5deg);transform:translateY(2.5px) rotate(1.5deg)}74%{-webkit-transform:translateY(-.5px) rotate(.5deg);transform:translateY(-.5px) rotate(.5deg)}76%{-webkit-transform:translateY(-.5px) rotate(2.5deg);transform:translateY(-.5px) rotate(2.5deg)}78%{-webkit-transform:translateY(-.5px) rotate(1.5deg);transform:translateY(-.5px) rotate(1.5deg)}80%{-webkit-transform:translateY(1.5px) rotate(1.5deg);transform:translateY(1.5px) rotate(1.5deg)}82%{-webkit-transform:translateY(-.5px) rotate(.5deg);transform:translateY(-.5px) rotate(.5deg)}84%{-webkit-transform:translateY(1.5px) rotate(2.5deg);transform:translateY(1.5px) rotate(2.5deg)}86%{-webkit-transform:translateY(-1.5px) rotate(-1.5deg);transform:translateY(-1.5px) rotate(-1.5deg)}88%{-webkit-transform:translateY(-.5px) rotate(2.5deg);transform:translateY(-.5px) rotate(2.5deg)}90%{-webkit-transform:translateY(2.5px) rotate(-.5deg);transform:translateY(2.5px) rotate(-.5deg)}92%{-webkit-transform:translateY(.5px) rotate(-.5deg);transform:translateY(.5px) rotate(-.5deg)}94%{-webkit-transform:translateY(2.5px) rotate(.5deg);transform:translateY(2.5px) rotate(.5deg)}96%{-webkit-transform:translateY(-.5px) rotate(1.5deg);transform:translateY(-.5px) rotate(1.5deg)}98%{-webkit-transform:translateY(-1.5px) rotate(-.5deg);transform:translateY(-1.5px) rotate(-.5deg)}0%,to{-webkit-transform:translate(0) rotate(0deg);transform:translate(0) rotate(0deg)}}.dplayer{position:relative;overflow:hidden;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;line-height:1}.dplayer *{box-sizing:content-box}.dplayer svg{width:100%;height:100%}.dplayer svg circle,.dplayer svg path{fill:#fff}.dplayer:-webkit-full-screen{width:100%;height:100%;background:#000;position:fixed;z-index:100000;left:0;top:0;margin:0;padding:0;-webkit-transform:translate(0);transform:translate(0)}.dplayer:-webkit-full-screen .dplayer-danmaku .dplayer-danmaku-bottom.dplayer-danmaku-move,.dplayer:-webkit-full-screen .dplayer-danmaku .dplayer-danmaku-top.dplayer-danmaku-move{-webkit-animation:danmaku-center 6s linear;animation:danmaku-center 6s linear;-webkit-animation-play-state:inherit;animation-play-state:inherit}.dplayer:-webkit-full-screen .dplayer-danmaku .dplayer-danmaku-right.dplayer-danmaku-move{-webkit-animation:danmaku 8s linear;animation:danmaku 8s linear;-webkit-animation-play-state:inherit;animation-play-state:inherit}.dplayer.dplayer-live .dplayer-bar-wrap,.dplayer.dplayer-live.dplayer-no-danmaku .dplayer-setting,.dplayer.dplayer-live .dplayer-setting-loop,.dplayer.dplayer-live .dplayer-setting-speed,.dplayer.dplayer-live .dplayer-time,.dplayer.dplayer-no-danmaku .dplayer-controller .dplayer-icons .dplayer-comment,.dplayer.dplayer-no-danmaku .dplayer-controller .dplayer-icons .dplayer-setting .dplayer-setting-box .dplayer-setting-danmaku,.dplayer.dplayer-no-danmaku .dplayer-controller .dplayer-icons .dplayer-setting .dplayer-setting-box .dplayer-setting-danunlimit,.dplayer.dplayer-no-danmaku .dplayer-controller .dplayer-icons .dplayer-setting .dplayer-setting-box .dplayer-setting-showdan,.dplayer.dplayer-no-danmaku .dplayer-danmaku{display:none}.dplayer.dplayer-arrow .dplayer-danmaku{font-size:18px}.dplayer.dplayer-arrow .dplayer-icon{margin:0 -3px}.dplayer.dplayer-playing .dplayer-danmaku .dplayer-danmaku-move{-webkit-animation-play-state:running;animation-play-state:running}@media (min-width:900px){.dplayer.dplayer-playing .dplayer-controller,.dplayer.dplayer-playing .dplayer-controller-mask{opacity:0}.dplayer.dplayer-playing:hover .dplayer-controller,.dplayer.dplayer-playing:hover .dplayer-controller-mask{opacity:1}}.dplayer.dplayer-loading .dplayer-bezel .diplayer-loading-icon{display:block}.dplayer.dplayer-loading .dplayer-danmaku,.dplayer.dplayer-loading .dplayer-danmaku-move,.dplayer.dplayer-paused .dplayer-danmaku,.dplayer.dplayer-paused .dplayer-danmaku-move{-webkit-animation-play-state:paused;animation-play-state:paused}.dplayer.dplayer-hide-controller{cursor:none}.dplayer.dplayer-hide-controller .dplayer-controller,.dplayer.dplayer-hide-controller .dplayer-controller-mask{opacity:0;-webkit-transform:translateY(100%);transform:translateY(100%)}.dplayer.dplayer-show-controller .dplayer-controller,.dplayer.dplayer-show-controller .dplayer-controller-mask{opacity:1}.dplayer.dplayer-fulled{position:fixed;z-index:100000;left:0;top:0;width:100%;height:100%}.dplayer.dplayer-mobile .dplayer-controller .dplayer-icons .dplayer-camera-icon,.dplayer.dplayer-mobile .dplayer-controller .dplayer-icons .dplayer-volume{display:none}.dplayer.dplayer-mobile .dplayer-controller .dplayer-icons .dplayer-full .dplayer-full-in-icon{position:static;display:inline-block}.dplayer.dplayer-mobile .dplayer-bar-time{display:none}.dplayer-web-fullscreen-fix{position:fixed;top:0;left:0;margin:0;padding:0}[data-balloon]:before{display:none}[data-balloon]:after{padding:.3em .7em;background:hsla(0,0%,7%,.7)}[data-balloon][data-balloon-pos=up]:after{margin-bottom:0}.dplayer-bezel{position:absolute;left:0;right:0;top:0;bottom:0;font-size:22px;color:#fff;pointer-events:none}.dplayer-bezel .dplayer-bezel-icon{position:absolute;top:50%;left:50%;margin:-26px 0 0 -26px;height:52px;width:52px;padding:12px;box-sizing:border-box;background:rgba(0,0,0,.5);border-radius:50%;opacity:0;pointer-events:none}.dplayer-bezel .dplayer-bezel-icon.dplayer-bezel-transition{-webkit-animation:bezel-hide .5s linear;animation:bezel-hide .5s linear}@-webkit-keyframes bezel-hide{0%{opacity:1;-webkit-transform:scale(1);transform:scale(1)}to{opacity:0;-webkit-transform:scale(2);transform:scale(2)}}@keyframes bezel-hide{0%{opacity:1;-webkit-transform:scale(1);transform:scale(1)}to{opacity:0;-webkit-transform:scale(2);transform:scale(2)}}.dplayer-bezel .dplayer-danloading{position:absolute;top:50%;margin-top:-7px;width:100%;text-align:center;font-size:14px;line-height:14px;-webkit-animation:my-face 5s infinite ease-in-out;animation:my-face 5s infinite ease-in-out}.dplayer-bezel .diplayer-loading-icon{display:none;position:absolute;top:50%;left:50%;margin:-18px 0 0 -18px;height:36px;width:36px;pointer-events:none}.dplayer-bezel .diplayer-loading-icon .diplayer-loading-hide{display:none}.dplayer-bezel .diplayer-loading-icon .diplayer-loading-dot{-webkit-animation:diplayer-loading-dot-fade .8s ease infinite;animation:diplayer-loading-dot-fade .8s ease infinite;opacity:0;-webkit-transform-origin:4px 4px;transform-origin:4px 4px}.dplayer-bezel .diplayer-loading-icon .diplayer-loading-dot.diplayer-loading-dot-7{-webkit-animation-delay:.7s;animation-delay:.7s}.dplayer-bezel .diplayer-loading-icon .diplayer-loading-dot.diplayer-loading-dot-6{-webkit-animation-delay:.6s;animation-delay:.6s}.dplayer-bezel .diplayer-loading-icon .diplayer-loading-dot.diplayer-loading-dot-5{-webkit-animation-delay:.5s;animation-delay:.5s}.dplayer-bezel .diplayer-loading-icon .diplayer-loading-dot.diplayer-loading-dot-4{-webkit-animation-delay:.4s;animation-delay:.4s}.dplayer-bezel .diplayer-loading-icon .diplayer-loading-dot.diplayer-loading-dot-3{-webkit-animation-delay:.3s;animation-delay:.3s}.dplayer-bezel .diplayer-loading-icon .diplayer-loading-dot.diplayer-loading-dot-2{-webkit-animation-delay:.2s;animation-delay:.2s}.dplayer-bezel .diplayer-loading-icon .diplayer-loading-dot.diplayer-loading-dot-1{-webkit-animation-delay:.1s;animation-delay:.1s}@-webkit-keyframes diplayer-loading-dot-fade{0%{opacity:.7;-webkit-transform:scale(1.2);transform:scale(1.2)}50%{opacity:.25;-webkit-transform:scale(.9);transform:scale(.9)}to{opacity:.25;-webkit-transform:scale(.85);transform:scale(.85)}}@keyframes diplayer-loading-dot-fade{0%{opacity:.7;-webkit-transform:scale(1.2);transform:scale(1.2)}50%{opacity:.25;-webkit-transform:scale(.9);transform:scale(.9)}to{opacity:.25;-webkit-transform:scale(.85);transform:scale(.85)}}.dplayer-controller-mask{background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAADGCAYAAAAT+OqFAAAAdklEQVQoz42QQQ7AIAgEF/T/D+kbq/RWAlnQyyazA4aoAB4FsBSA/bFjuF1EOL7VbrIrBuusmrt4ZZORfb6ehbWdnRHEIiITaEUKa5EJqUakRSaEYBJSCY2dEstQY7AuxahwXFrvZmWl2rh4JZ07z9dLtesfNj5q0FU3A5ObbwAAAABJRU5ErkJggg==) repeat-x bottom;height:98px;width:100%}.dplayer-controller,.dplayer-controller-mask{position:absolute;bottom:0;transition:all .3s ease}.dplayer-controller{left:0;right:0;height:41px;padding:0 20px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.dplayer-controller.dplayer-controller-comment .dplayer-icons{display:none}.dplayer-controller.dplayer-controller-comment .dplayer-icons.dplayer-comment-box{display:block}.dplayer-controller .dplayer-bar-wrap{padding:5px 0;cursor:pointer;position:absolute;bottom:33px;width:calc(100% - 40px);height:3px}.dplayer-controller .dplayer-bar-wrap:hover .dplayer-bar .dplayer-played .dplayer-thumb{-webkit-transform:scale(1);transform:scale(1)}.dplayer-controller .dplayer-bar-wrap:hover .dplayer-highlight{display:block;width:8px;-webkit-transform:translateX(-4px);transform:translateX(-4px);top:4px;height:40%}.dplayer-controller .dplayer-bar-wrap .dplayer-highlight{z-index:12;position:absolute;top:5px;width:6px;height:20%;border-radius:6px;background-color:#fff;text-align:center;-webkit-transform:translateX(-3px);transform:translateX(-3px);transition:all .2s ease-in-out}.dplayer-controller .dplayer-bar-wrap .dplayer-highlight:hover .dplayer-highlight-text{display:block}.dplayer-controller .dplayer-bar-wrap .dplayer-highlight:hover~.dplayer-bar-preview,.dplayer-controller .dplayer-bar-wrap .dplayer-highlight:hover~.dplayer-bar-time{opacity:0}.dplayer-controller .dplayer-bar-wrap .dplayer-highlight .dplayer-highlight-text{display:none;position:absolute;left:50%;top:-24px;padding:5px 8px;background-color:rgba(0,0,0,.62);color:#fff;border-radius:4px;font-size:12px;white-space:nowrap;-webkit-transform:translateX(-50%);transform:translateX(-50%)}.dplayer-controller .dplayer-bar-wrap .dplayer-bar-preview{position:absolute;background:#fff;pointer-events:none;display:none;background-size:16000px 100%}.dplayer-controller .dplayer-bar-wrap .dplayer-bar-preview-canvas{position:absolute;width:100%;height:100%;z-index:1;pointer-events:none}.dplayer-controller .dplayer-bar-wrap .dplayer-bar-time{position:absolute;left:0;top:-20px;border-radius:4px;padding:5px 7px;background-color:rgba(0,0,0,.62);color:#fff;font-size:12px;text-align:center;opacity:1;transition:opacity .1s ease-in-out;word-wrap:normal;word-break:normal;z-index:2;pointer-events:none}.dplayer-controller .dplayer-bar-wrap .dplayer-bar-time.hidden{opacity:0}.dplayer-controller .dplayer-bar-wrap .dplayer-bar{position:relative;height:3px;width:100%;background:hsla(0,0%,100%,.2);cursor:pointer}.dplayer-controller .dplayer-bar-wrap .dplayer-bar .dplayer-loaded{background:hsla(0,0%,100%,.4);transition:all .5s ease}.dplayer-controller .dplayer-bar-wrap .dplayer-bar .dplayer-loaded,.dplayer-controller .dplayer-bar-wrap .dplayer-bar .dplayer-played{position:absolute;left:0;top:0;bottom:0;height:3px;will-change:width}.dplayer-controller .dplayer-bar-wrap .dplayer-bar .dplayer-played .dplayer-thumb{position:absolute;top:0;right:5px;margin-top:-4px;margin-right:-10px;height:11px;width:11px;border-radius:50%;cursor:pointer;transition:all .3s ease-in-out;-webkit-transform:scale(0);transform:scale(0)}.dplayer-controller .dplayer-icons{height:38px;position:absolute;bottom:0}.dplayer-controller .dplayer-icons.dplayer-comment-box{display:none;position:absolute;transition:all .3s ease-in-out;z-index:2;height:38px;bottom:0;left:20px;right:20px;color:#fff}.dplayer-controller .dplayer-icons.dplayer-comment-box .dplayer-icon{padding:7px}.dplayer-controller .dplayer-icons.dplayer-comment-box .dplayer-comment-setting-icon{position:absolute;left:0;top:0}.dplayer-controller .dplayer-icons.dplayer-comment-box .dplayer-send-icon{position:absolute;right:0;top:0}.dplayer-controller .dplayer-icons.dplayer-comment-box .dplayer-comment-setting-box{position:absolute;background:rgba(28,28,28,.9);bottom:41px;left:0;box-shadow:0 0 25px rgba(0,0,0,.3);border-radius:4px;padding:10px 10px 16px;font-size:14px;width:204px;transition:all .3s ease-in-out;-webkit-transform:scale(0);transform:scale(0)}.dplayer-controller .dplayer-icons.dplayer-comment-box .dplayer-comment-setting-box.dplayer-comment-setting-open{-webkit-transform:scale(1);transform:scale(1)}.dplayer-controller .dplayer-icons.dplayer-comment-box .dplayer-comment-setting-box input[type=radio]{display:none}.dplayer-controller .dplayer-icons.dplayer-comment-box .dplayer-comment-setting-box label{cursor:pointer}.dplayer-controller .dplayer-icons.dplayer-comment-box .dplayer-comment-setting-box .dplayer-comment-setting-title{font-size:13px;color:#fff;line-height:30px}.dplayer-controller .dplayer-icons.dplayer-comment-box .dplayer-comment-setting-box .dplayer-comment-setting-type{font-size:0}.dplayer-controller .dplayer-icons.dplayer-comment-box .dplayer-comment-setting-box .dplayer-comment-setting-type .dplayer-comment-setting-title{margin-bottom:6px}.dplayer-controller .dplayer-icons.dplayer-comment-box .dplayer-comment-setting-box .dplayer-comment-setting-type label:nth-child(2) span{border-radius:4px 0 0 4px}.dplayer-controller .dplayer-icons.dplayer-comment-box .dplayer-comment-setting-box .dplayer-comment-setting-type label:nth-child(4) span{border-radius:0 4px 4px 0}.dplayer-controller .dplayer-icons.dplayer-comment-box .dplayer-comment-setting-box .dplayer-comment-setting-type span{width:33%;padding:4px 6px;line-height:16px;display:inline-block;font-size:12px;color:#fff;border:1px solid #fff;margin-right:-1px;box-sizing:border-box;text-align:center;cursor:pointer}.dplayer-controller .dplayer-icons.dplayer-comment-box .dplayer-comment-setting-box .dplayer-comment-setting-type input:checked+span{background:#e4e4e6;color:#1c1c1c}.dplayer-controller .dplayer-icons.dplayer-comment-box .dplayer-comment-setting-box .dplayer-comment-setting-color{font-size:0}.dplayer-controller .dplayer-icons.dplayer-comment-box .dplayer-comment-setting-box .dplayer-comment-setting-color label{font-size:0;padding:6px;display:inline-block}.dplayer-controller .dplayer-icons.dplayer-comment-box .dplayer-comment-setting-box .dplayer-comment-setting-color span{width:22px;height:22px;display:inline-block;border-radius:50%;box-sizing:border-box;cursor:pointer}.dplayer-controller .dplayer-icons.dplayer-comment-box .dplayer-comment-setting-box .dplayer-comment-setting-color span:hover{-webkit-animation:my-face 5s infinite ease-in-out;animation:my-face 5s infinite ease-in-out}.dplayer-controller .dplayer-icons.dplayer-comment-box .dplayer-comment-input{outline:none;border:none;padding:8px 31px;font-size:14px;line-height:18px;text-align:center;border-radius:4px;background:none;margin:0;height:100%;box-sizing:border-box;width:100%;color:#fff}.dplayer-controller .dplayer-icons.dplayer-comment-box .dplayer-comment-input::-webkit-input-placeholder{color:#fff;opacity:.8}.dplayer-controller .dplayer-icons.dplayer-comment-box .dplayer-comment-input:-ms-input-placeholder,.dplayer-controller .dplayer-icons.dplayer-comment-box .dplayer-comment-input::-ms-input-placeholder{color:#fff;opacity:.8}.dplayer-controller .dplayer-icons.dplayer-comment-box .dplayer-comment-input::placeholder{color:#fff;opacity:.8}.dplayer-controller .dplayer-icons.dplayer-comment-box .dplayer-comment-input::-ms-clear{display:none}.dplayer-controller .dplayer-icons.dplayer-icons-left .dplayer-icon{padding:7px}.dplayer-controller .dplayer-icons.dplayer-icons-right{right:20px}.dplayer-controller .dplayer-icons.dplayer-icons-right .dplayer-icon{padding:8px}.dplayer-controller .dplayer-icons .dplayer-live-badge,.dplayer-controller .dplayer-icons .dplayer-time{line-height:38px;color:#eee;text-shadow:0 0 2px rgba(0,0,0,.5);vertical-align:middle;font-size:13px;cursor:default}.dplayer-controller .dplayer-icons .dplayer-live-dot{display:inline-block;width:6px;height:6px;vertical-align:4%;margin-right:5px;content:"";border-radius:6px}.dplayer-controller .dplayer-icons .dplayer-icon{width:40px;height:100%;border:none;background-color:transparent;outline:none;cursor:pointer;vertical-align:middle;box-sizing:border-box;display:inline-block}.dplayer-controller .dplayer-icons .dplayer-icon .dplayer-icon-content{transition:all .2s ease-in-out;opacity:.8}.dplayer-controller .dplayer-icons .dplayer-icon:hover .dplayer-icon-content{opacity:1}.dplayer-controller .dplayer-icons .dplayer-icon.dplayer-quality-icon{color:#fff;width:auto;line-height:22px;font-size:14px}.dplayer-controller .dplayer-icons .dplayer-icon.dplayer-comment-icon{padding:10px 9px 9px}.dplayer-controller .dplayer-icons .dplayer-icon.dplayer-setting-icon{padding-top:8.5px}.dplayer-controller .dplayer-icons .dplayer-icon.dplayer-volume-icon{width:43px}.dplayer-controller .dplayer-icons .dplayer-volume{position:relative;display:inline-block;cursor:pointer;height:100%}.dplayer-controller .dplayer-icons .dplayer-volume:hover .dplayer-volume-bar-wrap .dplayer-volume-bar{width:45px}.dplayer-controller .dplayer-icons .dplayer-volume:hover .dplayer-volume-bar-wrap .dplayer-volume-bar .dplayer-volume-bar-inner .dplayer-thumb{-webkit-transform:scale(1);transform:scale(1)}.dplayer-controller .dplayer-icons .dplayer-volume.dplayer-volume-active .dplayer-volume-bar-wrap .dplayer-volume-bar{width:45px}.dplayer-controller .dplayer-icons .dplayer-volume.dplayer-volume-active .dplayer-volume-bar-wrap .dplayer-volume-bar .dplayer-volume-bar-inner .dplayer-thumb{-webkit-transform:scale(1);transform:scale(1)}.dplayer-controller .dplayer-icons .dplayer-volume .dplayer-volume-bar-wrap{display:inline-block;margin:0 10px 0 -5px;vertical-align:middle;height:100%}.dplayer-controller .dplayer-icons .dplayer-volume .dplayer-volume-bar-wrap .dplayer-volume-bar{position:relative;top:17px;width:0;height:3px;background:#aaa;transition:all .3s ease-in-out}.dplayer-controller .dplayer-icons .dplayer-volume .dplayer-volume-bar-wrap .dplayer-volume-bar .dplayer-volume-bar-inner{position:absolute;bottom:0;left:0;height:100%;transition:all .1s ease;will-change:width}.dplayer-controller .dplayer-icons .dplayer-volume .dplayer-volume-bar-wrap .dplayer-volume-bar .dplayer-volume-bar-inner .dplayer-thumb{position:absolute;top:0;right:5px;margin-top:-4px;margin-right:-10px;height:11px;width:11px;border-radius:50%;cursor:pointer;transition:all .3s ease-in-out;-webkit-transform:scale(0);transform:scale(0)}.dplayer-controller .dplayer-icons .dplayer-setting,.dplayer-controller .dplayer-icons .dplayer-subtitle-btn{display:inline-block;height:100%}.dplayer-controller .dplayer-icons .dplayer-setting .dplayer-setting-box{position:absolute;right:0;bottom:50px;-webkit-transform:scale(0);transform:scale(0);width:150px;border-radius:2px;background:rgba(28,28,28,.9);padding:7px 0;transition:all .3s ease-in-out;overflow:hidden;z-index:2}.dplayer-controller .dplayer-icons .dplayer-setting .dplayer-setting-box>div{display:none}.dplayer-controller .dplayer-icons .dplayer-setting .dplayer-setting-box>div.dplayer-setting-origin-panel{display:block}.dplayer-controller .dplayer-icons .dplayer-setting .dplayer-setting-box.dplayer-setting-box-open{-webkit-transform:scale(1);transform:scale(1)}.dplayer-controller .dplayer-icons .dplayer-setting .dplayer-setting-box.dplayer-setting-box-narrow{width:70px;height:180px;text-align:center}.dplayer-controller .dplayer-icons .dplayer-setting .dplayer-setting-box.dplayer-setting-box-speed .dplayer-setting-origin-panel{display:none}.dplayer-controller .dplayer-icons .dplayer-setting .dplayer-setting-box.dplayer-setting-box-speed .dplayer-setting-speed-panel{display:block}.dplayer-controller .dplayer-icons .dplayer-setting .dplayer-setting-item,.dplayer-controller .dplayer-icons .dplayer-setting .dplayer-setting-speed-item{height:30px;padding:5px 10px;box-sizing:border-box;cursor:pointer;position:relative}.dplayer-controller .dplayer-icons .dplayer-setting .dplayer-setting-item:hover,.dplayer-controller .dplayer-icons .dplayer-setting .dplayer-setting-speed-item:hover{background-color:hsla(0,0%,100%,.1)}.dplayer-controller .dplayer-icons .dplayer-setting .dplayer-setting-danmaku{padding:5px 0}.dplayer-controller .dplayer-icons .dplayer-setting .dplayer-setting-danmaku .dplayer-label{padding:0 10px;display:inline}.dplayer-controller .dplayer-icons .dplayer-setting .dplayer-setting-danmaku:hover .dplayer-label{display:none}.dplayer-controller .dplayer-icons .dplayer-setting .dplayer-setting-danmaku:hover .dplayer-danmaku-bar-wrap{display:inline-block}.dplayer-controller .dplayer-icons .dplayer-setting .dplayer-setting-danmaku.dplayer-setting-danmaku-active .dplayer-label{display:none}.dplayer-controller .dplayer-icons .dplayer-setting .dplayer-setting-danmaku.dplayer-setting-danmaku-active .dplayer-danmaku-bar-wrap{display:inline-block}.dplayer-controller .dplayer-icons .dplayer-setting .dplayer-setting-danmaku .dplayer-danmaku-bar-wrap{padding:0 10px;box-sizing:border-box;display:none;vertical-align:middle;height:100%;width:100%}.dplayer-controller .dplayer-icons .dplayer-setting .dplayer-setting-danmaku .dplayer-danmaku-bar-wrap .dplayer-danmaku-bar{position:relative;top:8.5px;width:100%;height:3px;background:#fff;transition:all .3s ease-in-out}.dplayer-controller .dplayer-icons .dplayer-setting .dplayer-setting-danmaku .dplayer-danmaku-bar-wrap .dplayer-danmaku-bar .dplayer-danmaku-bar-inner{position:absolute;bottom:0;left:0;height:100%;transition:all .1s ease;background:#aaa;will-change:width}.dplayer-controller .dplayer-icons .dplayer-setting .dplayer-setting-danmaku .dplayer-danmaku-bar-wrap .dplayer-danmaku-bar .dplayer-danmaku-bar-inner .dplayer-thumb{position:absolute;top:0;right:5px;margin-top:-4px;margin-right:-10px;height:11px;width:11px;border-radius:50%;cursor:pointer;transition:all .3s ease-in-out;background:#aaa}.dplayer-controller .dplayer-icons .dplayer-full{display:inline-block;height:100%;position:relative}.dplayer-controller .dplayer-icons .dplayer-full:hover .dplayer-full-in-icon{display:block}.dplayer-controller .dplayer-icons .dplayer-full .dplayer-full-in-icon{position:absolute;top:-30px;z-index:1;display:none}.dplayer-controller .dplayer-icons .dplayer-quality{position:relative;display:inline-block;height:100%;z-index:2}.dplayer-controller .dplayer-icons .dplayer-quality:hover .dplayer-quality-list,.dplayer-controller .dplayer-icons .dplayer-quality:hover .dplayer-quality-mask{display:block}.dplayer-controller .dplayer-icons .dplayer-quality .dplayer-quality-mask{display:none;position:absolute;bottom:38px;left:-18px;width:80px;padding-bottom:12px}.dplayer-controller .dplayer-icons .dplayer-quality .dplayer-quality-list{display:none;font-size:12px;width:80px;border-radius:2px;background:rgba(28,28,28,.9);padding:5px 0;transition:all .3s ease-in-out;overflow:hidden;color:#fff;text-align:center}.dplayer-controller .dplayer-icons .dplayer-quality .dplayer-quality-item{height:25px;box-sizing:border-box;cursor:pointer;line-height:25px}.dplayer-controller .dplayer-icons .dplayer-quality .dplayer-quality-item:hover{background-color:hsla(0,0%,100%,.1)}.dplayer-controller .dplayer-icons .dplayer-comment{display:inline-block;height:100%}.dplayer-controller .dplayer-icons .dplayer-label{color:#eee;font-size:13px;display:inline-block;vertical-align:middle;white-space:nowrap}.dplayer-controller .dplayer-icons .dplayer-toggle{width:32px;height:20px;text-align:center;font-size:0;vertical-align:middle;position:absolute;top:5px;right:10px}.dplayer-controller .dplayer-icons .dplayer-toggle input{max-height:0;max-width:0;display:none}.dplayer-controller .dplayer-icons .dplayer-toggle input+label{display:inline-block;position:relative;box-shadow:inset 0 0 0 0 #dfdfdf;border:1px solid #dfdfdf;height:20px;width:32px;border-radius:10px;box-sizing:border-box;cursor:pointer;transition:.2s ease-in-out}.dplayer-controller .dplayer-icons .dplayer-toggle input+label:after,.dplayer-controller .dplayer-icons .dplayer-toggle input+label:before{content:"";position:absolute;display:block;height:18px;width:18px;top:0;left:0;border-radius:15px;transition:.2s ease-in-out}.dplayer-controller .dplayer-icons .dplayer-toggle input+label:after{background:#fff;box-shadow:0 1px 3px rgba(0,0,0,.4)}.dplayer-controller .dplayer-icons .dplayer-toggle input:checked+label{border-color:hsla(0,0%,100%,.5)}.dplayer-controller .dplayer-icons .dplayer-toggle input:checked+label:before{width:30px;background:hsla(0,0%,100%,.5)}.dplayer-controller .dplayer-icons .dplayer-toggle input:checked+label:after{left:12px}.dplayer-danmaku{position:absolute;left:0;right:0;top:0;bottom:0;font-size:22px;color:#fff}.dplayer-danmaku .dplayer-danmaku-item{display:inline-block;pointer-events:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;cursor:default;white-space:nowrap;text-shadow:.5px .5px .5px rgba(0,0,0,.5)}.dplayer-danmaku .dplayer-danmaku-item--demo{position:absolute;visibility:hidden}.dplayer-danmaku .dplayer-danmaku-right{position:absolute;right:0;-webkit-transform:translateX(100%);transform:translateX(100%)}.dplayer-danmaku .dplayer-danmaku-right.dplayer-danmaku-move{will-change:transform;-webkit-animation:danmaku 5s linear;animation:danmaku 5s linear;-webkit-animation-play-state:paused;animation-play-state:paused}@-webkit-keyframes danmaku{0%{-webkit-transform:translateX(100%);transform:translateX(100%)}}@keyframes danmaku{0%{-webkit-transform:translateX(100%);transform:translateX(100%)}}.dplayer-danmaku .dplayer-danmaku-bottom,.dplayer-danmaku .dplayer-danmaku-top{position:absolute;width:100%;text-align:center;visibility:hidden}.dplayer-danmaku .dplayer-danmaku-bottom.dplayer-danmaku-move,.dplayer-danmaku .dplayer-danmaku-top.dplayer-danmaku-move{will-change:visibility;-webkit-animation:danmaku-center 4s linear;animation:danmaku-center 4s linear;-webkit-animation-play-state:paused;animation-play-state:paused}@-webkit-keyframes danmaku-center{0%{visibility:visible}to{visibility:visible}}@keyframes danmaku-center{0%{visibility:visible}to{visibility:visible}}.dplayer-logo{pointer-events:none;position:absolute;left:20px;top:20px;max-width:50px;max-height:50px}.dplayer-logo img{max-width:100%;max-height:100%;background:none}.dplayer-menu{position:absolute;width:170px;border-radius:2px;background:rgba(28,28,28,.85);padding:5px 0;overflow:hidden;z-index:3;display:none}.dplayer-menu.dplayer-menu-show{display:block}.dplayer-menu .dplayer-menu-item{height:30px;box-sizing:border-box;cursor:pointer}.dplayer-menu .dplayer-menu-item:hover{background-color:hsla(0,0%,100%,.1)}.dplayer-menu .dplayer-menu-item a{padding:0 10px;line-height:30px;color:#eee;font-size:13px;display:inline-block;vertical-align:middle;width:100%;box-sizing:border-box;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.dplayer-menu .dplayer-menu-item a:hover{text-decoration:none}.dplayer-notice{opacity:0;position:absolute;bottom:60px;left:20px;font-size:14px;border-radius:2px;background:rgba(28,28,28,.9);padding:7px 20px;transition:all .3s ease-in-out;overflow:hidden;color:#fff;pointer-events:none}.dplayer-subtitle{position:absolute;bottom:40px;width:90%;left:5%;text-align:center;color:#fff;text-shadow:.5px .5px .5px rgba(0,0,0,.5);font-size:20px}.dplayer-subtitle.dplayer-subtitle-hide{display:none}.dplayer-mask{position:absolute;top:0;bottom:0;left:0;right:0;z-index:1;display:none}.dplayer-mask.dplayer-mask-show{display:block}.dplayer-video-wrap{position:relative;background:#000;font-size:0;width:100%;height:100%}.dplayer-video-wrap .dplayer-video{width:100%;height:100%;display:none}.dplayer-video-wrap .dplayer-video-current{display:block}.dplayer-video-wrap .dplayer-video-prepare{display:none}.dplayer-info-panel{position:absolute;top:10px;left:10px;width:400px;background:rgba(28,28,28,.8);padding:10px;color:#fff;font-size:12px;border-radius:2px}.dplayer-info-panel-hide{display:none}.dplayer-info-panel .dplayer-info-panel-close{cursor:pointer;position:absolute;right:10px;top:10px}.dplayer-info-panel .dplayer-info-panel-item>span{display:inline-block;vertical-align:middle;line-height:15px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.dplayer-info-panel .dplayer-info-panel-item-title{width:100px;text-align:right;margin-right:10px}.dplayer-info-panel .dplayer-info-panel-item-data{width:260px}
+
+/*# sourceMappingURL=DPlayer.min.css.map*/
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/css/act-common.css b/pluss-wap-page/src/main/resources/static/resources/css/act-common.css
new file mode 100644
index 0000000..dab2514
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/css/act-common.css
@@ -0,0 +1,5652 @@
+@-webkit-keyframes slideFromBottom {
+    0% {
+        -webkit-transform: translateY(100%);
+        transform: translateY(100%)
+    }
+    to {
+        -webkit-transform: translateY(0);
+        transform: translateY(0)
+    }
+}
+
+@keyframes slideFromBottom {
+    0% {
+        -webkit-transform: translateY(100%);
+        transform: translateY(100%)
+    }
+    to {
+        -webkit-transform: translateY(0);
+        transform: translateY(0)
+    }
+}
+
+@font-face {
+    font-family: Jinrong-Bold;
+    src: url(assets/fonts/Jinrong-Bold.otf)
+}
+
+@font-face {
+    font-family: Pro-Normal;
+    src: url("assets/fonts/MI Lan Pro_Normal.ttf")
+}
+
+@font-face {
+    font-family: Pro-Medium;
+    src: url("assets/fonts/MI Lan Pro_Medium.ttf")
+}
+
+@font-face {
+    font-family: Pro-DemiBold;
+    src: url("assets/fonts/MI Lan Pro_DemiBold.ttf")
+}
+
+@font-face {
+    font-family: Pro-SemiBold;
+    src: url("assets/fonts/MI Lan Pro_SemiBold.ttf")
+}
+
+
+/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */
+
+* {
+    padding: 0;
+    margin: 0
+}
+
+#app,
+body,
+html {
+    width: 100%;
+    font-family: Pro-Normal
+}
+
+html {
+    line-height: 1.15;
+    -webkit-text-size-adjust: 100%
+}
+
+body,
+html {
+    background-color: #fff
+}
+
+body {
+    max-width: 800px;
+    width: 100%;
+    margin: 0 auto;
+    font-family: MILanPro_NORMAL--GB1-4, MILanPro_NORMAL--GB1, system-ui
+}
+
+main {
+    display: block
+}
+
+h1 {
+    font-size: 2em
+}
+
+h2,
+h3 {
+    font-family: MILanPro_MEDIUM--GB1-4, MILanPro_MEDIUM--GB1, system-ui;
+    font-weight: 400
+}
+
+ul {
+    list-style: none
+}
+
+hr {
+    box-sizing: content-box;
+    height: 0;
+    overflow: visible
+}
+
+pre {
+    font-family: monospace, monospace;
+    font-size: 1em
+}
+
+a {
+    background-color: transparent;
+    outline: none
+}
+
+abbr[title] {
+    border-bottom: none;
+    text-decoration: underline;
+    -webkit-text-decoration: underline dotted;
+    text-decoration: underline dotted
+}
+
+b,
+strong {
+    font-weight: bolder
+}
+
+code,
+kbd,
+samp {
+    font-family: monospace, monospace;
+    font-size: 1em
+}
+
+small {
+    font-size: 80%
+}
+
+sub,
+sup {
+    font-size: 75%;
+    line-height: 0;
+    position: relative;
+    vertical-align: baseline
+}
+
+sub {
+    bottom: -.25em
+}
+
+sup {
+    top: -.5em
+}
+
+img {
+    border-style: none
+}
+
+button,
+input,
+optgroup,
+select,
+textarea {
+    margin: 0;
+    border: none;
+    outline: none;
+    font-family: inherit;
+    font-size: 100%;
+    line-height: 1.15;
+    background-color: #fff
+}
+
+button,
+input {
+    overflow: visible
+}
+
+button,
+select {
+    text-transform: none
+}
+
+[type=button],
+[type=reset],
+[type=submit],
+button {
+    -webkit-appearance: button
+}
+
+[type=button]::-moz-focus-inner,
+[type=reset]::-moz-focus-inner,
+[type=submit]::-moz-focus-inner,
+button::-moz-focus-inner {
+    border-style: none;
+    padding: 0
+}
+
+[type=button]:-moz-focusring,
+[type=reset]:-moz-focusring,
+[type=submit]:-moz-focusring,
+button:-moz-focusring {
+    outline: 1px dotted ButtonText
+}
+
+fieldset {
+    padding: .35em .75em .625em
+}
+
+legend {
+    box-sizing: border-box;
+    color: inherit;
+    display: table;
+    max-width: 100%;
+    padding: 0;
+    white-space: normal
+}
+
+progress {
+    vertical-align: baseline
+}
+
+textarea {
+    overflow: auto
+}
+
+[type=checkbox],
+[type=radio] {
+    box-sizing: border-box;
+    padding: 0
+}
+
+[type=number]::-webkit-inner-spin-button,
+[type=number]::-webkit-outer-spin-button {
+    height: auto
+}
+
+[type=search] {
+    -webkit-appearance: textfield;
+    outline-offset: -2px
+}
+
+[type=search]::-webkit-search-decoration {
+    -webkit-appearance: none
+}
+
+::-webkit-file-upload-button {
+    -webkit-appearance: button;
+    font: inherit
+}
+
+details {
+    display: block
+}
+
+summary {
+    display: list-item
+}
+
+[hidden],
+template {
+    display: none
+}
+
+#app {
+    height: inherit
+}
+
+i.arrow {
+    width: 6px;
+    height: 10px;
+    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAAfBAMAAAAYfoC6AAAAKlBMVEVHcEy4usG5usG5usG5u8O9wse5usK7wcS6u8K6vMK7vcG7u8O6u8K4u8LztzLnAAAADnRSTlMA/+XtlgikF15QQyeIzfw5xJ0AAAB3SURBVBjTY6jxZoCCRKEJUJahoCaUdVBQaAGEVSYoqAVhsScKCjVAmGGCMJWsjnCVJYKCFgEQlY5wlWyCgpZQlc6CwlPRVQK1C0NVshgKakNY3BcFJdHEEOrgehHmwe1A2IuwAe4+uJsR/kD4DeFfRBggwgUeVgCA/hsqy7NAFgAAAABJRU5ErkJggg==);
+    background-repeat: no-repeat;
+    background-size: contain;
+    background-position: 50%
+}
+
+.btn-wrapper {
+    box-sizing: border-box;
+    width: 100%;
+    margin-bottom: .625rem
+}
+
+.btn-wrapper.fixed {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    max-width: 800px;
+    padding: 1.25rem;
+    z-index: 3;
+    margin-bottom: 0;
+    background-color: #fff
+}
+
+.btn-wrapper .info {
+    margin-bottom: 1.0625rem;
+    color: #7789a4;
+    text-align: center;
+    font-size: .75rem;
+    line-height: .75rem;
+    font-family: Pro-Normal
+}
+
+.btn-wrapper .info img {
+    width: .625rem
+}
+
+.btn {
+    width: 100%;
+    padding: .8125rem 0;
+    border: none;
+    border-radius: 1.5625rem;
+    color: #fff;
+    background-color: #005cff;
+    font-family: MILanPro_MEDIUM--GB1-4, MILanPro_MEDIUM--GB1, system-ui;
+    font-size: .9375rem;
+    line-height: 1.25rem;
+    opacity: 1;
+    font-family: Pro-Medium;
+    font-weight: 700;
+    cursor: pointer
+}
+
+.btn.disable {
+    opacity: .3;
+    cursor: not-allowed
+}
+
+.btn.gray {
+    color: #131c31
+}
+
+.btn.blue,
+.btn.gray {
+    background-color: #f3f3f4
+}
+
+.btn.blue,
+.btn.white {
+    color: #0097ff
+}
+
+.btn.white {
+    background-color: #fff
+}
+
+.radio-button {
+    position: relative;
+    box-sizing: border-box;
+    width: 2.8125rem;
+    padding: .25rem;
+    border-radius: .9375rem;
+    background-color: rgba(0, 0, 0, .1);
+    overflow: hidden
+}
+
+.radio-button.active {
+    background-color: #0097ff
+}
+
+.radio-button.active .radio {
+    float: right
+}
+
+.radio-button .radio {
+    float: left;
+    width: 1.25rem;
+    height: 1.25rem;
+    border-radius: 50%;
+    background-color: #fff;
+    -webkit-transition: float 2s .3s;
+    transition: float 2s .3s
+}
+
+.btn-timing {
+    min-width: 6rem;
+    text-align: right;
+    letter-spacing: 1px;
+    color: #0097ff
+}
+
+.btn-timing.black {
+    color: #666c79
+}
+
+.input-wrapper {
+    position: relative;
+    padding: .875rem 0 1px;
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(98%, #fff), to(#e5e6e8));
+    background: linear-gradient(180deg, #fff 98%, #e5e6e8);
+    font-size: .875rem
+}
+
+.input-wrapper.focus {
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(98%, #fff), to(#131c31));
+    background: linear-gradient(180deg, #fff 98%, #131c31)
+}
+
+.input-wrapper.error {
+    border-bottom: .03125rem solid #ff7575!important
+}
+
+.input-wrapper .error-text {
+    position: absolute;
+    left: 0;
+    bottom: -1.25rem;
+    color: #fe3d28;
+    font-size: .625rem;
+    line-height: 1rem;
+    z-index: 1;
+    font-family: Pro-Normal
+}
+
+.input-wrapper .delete {
+    position: absolute;
+    right: 0;
+    width: 1.0625rem;
+    height: 1.0625rem;
+    background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADQAAAA0CAMAAADypuvZAAAAM1BMVEVHcEzh4+nh4+nj5Orh4+ni5Orh4+ns7/Pj5Ozg4+jh4+nf5Ovh5Orh4+nh4unj5Ovg4uj6xntWAAAAEHRSTlMArb8q6mjYBRj3mwxOf5BAArxJJgAAAc9JREFUSMeVVlmWwyAMg2AWs9//tNMQmjFbQ/zZVwVZksGM9aWN8IErQAR1RCmMZk+lUzggk8IjevMb4lvEVaCkW0MEz4tSaQEzAfKy0Iop5sD8o1ClCTXITyV7Hb16xGToUGID86EoGz8h75WnGmxisro11AF3QZl//RKQ96sS1PwFJqsriL7VdTgW219iOahRIWrHh9499lok+iH42Ocs/c9x0uGdWTo05E5xjCWYovHRCdh5VCT9l6a0rWXbtRj0tuVvlWHh5iT2qvthcPTN8OImez0jC6PpujKEYokcrWITZytDPuV2NsXUbLQLQzPldhab5o5/p01Oo8TmAS8Me62fQKUf5uICNKUH5ucAzIS4PNWOuNyBJpNePY26y+GtLouLMZPE5cFcOeXm5JBDotIQWJo3mkN60/ajUblhn8N2NHTTFIqbG82h6vn7ZtxLDoDm8FSeEsTwOd3Qz6An3G6Gza0NaQgl8sE4ZWEMs1NvLkust3nCF6BQh8bZfcxh3j1pRQXyQKVtcvQBlVuvDdr2cd9BXUY3qGeQHbeWp6UAwrvNqGjt5yucWx+GYbm+aRPVJB0IXPzc+ITknY54hPS0XGon/H0eKj7bR/8Ahbp2sn6ka1oAAAAASUVORK5CYII=) no-repeat 0/1.0625rem 1.0625rem;
+    z-index: 2
+}
+
+.input-wrapper.norm-input {
+    font-size: 1rem
+}
+
+.input-wrapper.norm-input input {
+    width: 92%;
+    padding-bottom: .875rem;
+    border: none;
+    font-family: MILanPro_MEDIUM--GB1-4, MILanPro_MEDIUM--GB1, system-ui;
+    color: #131c31
+}
+
+.input-wrapper.norm-input input.number {
+    font-family: Jinrong-Bold
+}
+
+.input-wrapper.norm-input .placeholder {
+    position: absolute;
+    left: 0;
+    color: #b8bac1;
+    z-index: 0
+}
+
+.input-wrapper.label-input {
+    position: relative;
+    color: #131c31;
+    font-size: .875rem;
+    line-height: 1.1875rem;
+    overflow: hidden
+}
+
+.input-wrapper.label-input.gray {
+    color: #a4a7b0
+}
+
+.input-wrapper.label-input.big {
+    font-size: 1rem;
+    line-height: 1.3125rem
+}
+
+.input-wrapper.label-input.big label {
+    font-family: MILanPro_MEDIUM--GB1-4, MILanPro_MEDIUM--GB1, system-ui
+}
+
+.input-wrapper.label-input.bigger {
+    font-size: 1.375rem;
+    line-height: 1.625rem
+}
+
+.input-wrapper.label-input.bold {
+    padding-top: .625rem
+}
+
+.input-wrapper.label-input.bold label {
+    padding-bottom: .4375rem
+}
+
+.input-wrapper.label-input .arrow {
+    position: absolute;
+    top: 50%;
+    right: 0;
+    -webkit-transform: translateY(-50%);
+    transform: translateY(-50%);
+    width: .375rem;
+    height: .625rem
+}
+
+.input-wrapper.label-input .placeholder {
+    padding-bottom: .875rem;
+    color: #b8bac1
+}
+
+.input-wrapper.label-input .placeholder .icon {
+    width: .6875rem
+}
+
+.input-wrapper.label-input label {
+    float: left;
+    padding-bottom: .875rem;
+    font-size: .9375rem
+}
+
+.input-wrapper.label-input .content {
+    float: right;
+    padding-bottom: .875rem;
+    font-family: MILanPro_MEDIUM--GB1-4, MILanPro_MEDIUM--GB1, system-ui;
+    color: #a4a7b0
+}
+
+.input-wrapper.label-input .content.number {
+    font-family: Jinrong-Bold
+}
+
+.input-wrapper.fixed-text-input {
+    display: -webkit-box;
+    display: flex;
+    -webkit-box-pack: left;
+    justify-content: left;
+    -webkit-box-align: center;
+    align-items: center;
+    font-family: MILanPro_MEDIUM--GB1-4, MILanPro_MEDIUM--GB1, system-ui;
+    font-size: 1rem;
+    line-height: 1.3125rem
+}
+
+.input-wrapper.fixed-text-input .before {
+    padding-bottom: .875rem;
+    color: #a4a7b0
+}
+
+.input-wrapper.fixed-text-input .content {
+    -webkit-box-flex: 1;
+    flex: 1;
+    position: relative;
+    margin: 0 .4375rem;
+    padding-bottom: .875rem;
+    width: 50%
+}
+
+.input-wrapper.fixed-text-input .content input {
+    width: 100%;
+    border: none;
+    color: #131c31
+}
+
+.input-wrapper.fixed-text-input .content input.number {
+    font-family: Jinrong-Bold
+}
+
+.input-wrapper.fixed-text-input .content input::-webkit-input-placeholder {
+    color: #b8bac1
+}
+
+.input-wrapper.fixed-text-input .content input::-moz-placeholder {
+    color: #b8bac1
+}
+
+.input-wrapper.fixed-text-input .content input:-ms-input-placeholder {
+    color: #b8bac1
+}
+
+.input-wrapper.fixed-text-input .content input::-ms-input-placeholder {
+    color: #b8bac1
+}
+
+.input-wrapper.fixed-text-input .content input::placeholder {
+    color: #b8bac1
+}
+
+.input-wrapper.line-input {
+    display: -webkit-box;
+    display: flex;
+    -webkit-box-align: center;
+    align-items: center;
+    padding-top: 0;
+    margin-top: .5rem;
+    height: 3.125rem;
+    font-size: 1rem
+}
+
+.input-wrapper.line-input label {
+    width: 30%;
+    color: #666c79
+}
+
+.input-wrapper.line-input input {
+    overflow: hidden;
+    -webkit-box-flex: 1;
+    flex: 1;
+    margin-right: 1.25rem;
+    color: #333b4c;
+    font-family: Pro-Medium
+}
+
+.input-wrapper.line-input input::-webkit-input-placeholder {
+    color: #ccced2
+}
+
+.input-wrapper.line-input input::-moz-placeholder {
+    color: #ccced2
+}
+
+.input-wrapper.line-input input:-ms-input-placeholder {
+    color: #ccced2
+}
+
+.input-wrapper.line-input input::-ms-input-placeholder {
+    color: #ccced2
+}
+
+.input-wrapper.line-input input::placeholder {
+    color: #ccced2
+}
+
+.input-wrapper.line-input.error {
+    margin-bottom: 1.375rem
+}
+
+.input-wrapper.captcha-input .delete {
+    right: 6.8rem
+}
+
+.progress-nav {
+    overflow: hidden;
+    padding-top: .375rem;
+    width: 100%;
+    margin: 0 auto 2.0625rem
+}
+
+.progress-nav .progress-icon {
+    height: 3.375rem;
+    width: 100%;
+    background-image: url(assets/process4.adba4.png);
+    margin-bottom: .375rem;
+    background-repeat: no-repeat;
+    background-position: 50%;
+    background-size: contain
+}
+
+.progress-nav .progress-text {
+    font-size: .75rem;
+    color: #637392;
+    display: -webkit-box;
+    display: flex;
+    -webkit-box-pack: justify;
+    justify-content: space-between
+}
+
+.progress-nav .progress-text li {
+    width: 33.3%;
+    text-align: center
+}
+
+.progress-nav .progress-text li:first-of-type {
+    text-align: left
+}
+
+.progress-nav .progress-text li:nth-of-type(3) {
+    text-align: right
+}
+
+.img-upload-wrapper {
+    width: 100%
+}
+
+.img-upload-wrapper>span {
+    font-size: .875rem;
+    color: #ff5045;
+    line-height: 1.25rem;
+    margin-top: 1rem;
+    display: block
+}
+
+.img-upload-wrapper .adapt-img-upload {
+    position: relative
+}
+
+.img-upload-wrapper .adapt-img-upload img.show-img {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    -webkit-transform: translate(-50%, -50%);
+    transform: translate(-50%, -50%)
+}
+
+.img-upload-wrapper .adapt-img-upload img.show-img.adapt-width {
+    width: 100%
+}
+
+.img-upload-wrapper .adapt-img-upload img.show-img.adapt-height {
+    height: 96%
+}
+
+.img-upload-wrapper .adapt-img-upload img.bg-img {
+    width: 100%
+}
+
+.img-upload-wrapper .adapt-img-upload img.camera {
+    position: absolute;
+    bottom: .625rem;
+    left: .625rem;
+    z-index: 9;
+    width: 1.1875rem;
+    height: 1.0625rem
+}
+
+.img-upload-wrapper .adapt-img-upload .file-wrapper {
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0
+}
+
+.img-upload-wrapper .adapt-img-upload .file-wrapper input[type=file] {
+    width: 100%;
+    height: 100%;
+    opacity: 0
+}
+
+.img-upload-wrapper .multi-img-upload {
+    position: relative
+}
+
+.img-upload-wrapper .multi-img-upload .show-img-list {
+    display: -webkit-box;
+    display: flex;
+    -webkit-box-pack: left;
+    justify-content: left
+}
+
+.img-upload-wrapper .multi-img-upload .show-img-list div+div {
+    margin-left: .5rem
+}
+
+.img-upload-wrapper .multi-img-upload .show-img-list .show-img {
+    position: relative;
+    width: 6.25rem;
+    height: 6.25rem
+}
+
+.img-upload-wrapper .multi-img-upload .show-img-list .show-img .delete {
+    position: absolute;
+    top: -.1875rem;
+    right: -.1875rem;
+    width: 1.25rem
+}
+
+.img-upload-wrapper .multi-img-upload .show-img-list .show-img .img {
+    width: 100%;
+    height: 100%;
+    border-radius: .25rem
+}
+
+.img-upload-wrapper .multi-img-upload .show-img-list .example,
+.img-upload-wrapper .multi-img-upload .show-img-list .upload {
+    position: relative;
+    width: 6.875rem;
+    min-height: 6.875rem
+}
+
+.img-upload-wrapper .multi-img-upload .show-img-list .example.example.error,
+.img-upload-wrapper .multi-img-upload .show-img-list .upload.example.error {
+    border: .03125rem solid #ff4c4c;
+    border-radius: .5rem
+}
+
+.img-upload-wrapper .multi-img-upload .show-img-list .example .file-wrapper,
+.img-upload-wrapper .multi-img-upload .show-img-list .upload .file-wrapper {
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0
+}
+
+.img-upload-wrapper .multi-img-upload .show-img-list .example .file-wrapper input[type=file],
+.img-upload-wrapper .multi-img-upload .show-img-list .upload .file-wrapper input[type=file] {
+    width: 100%;
+    height: 100%;
+    opacity: 0
+}
+
+.img-upload-wrapper .multi-img-upload .show-img-list .example img,
+.img-upload-wrapper .multi-img-upload .show-img-list .upload img {
+    width: 100%;
+    border-radius: .5rem
+}
+
+.img-upload-wrapper .multi-img-upload .show-img-list .example .example-text {
+    position: absolute;
+    bottom: 0;
+    box-sizing: border-box;
+    width: 100%;
+    padding: .25rem;
+    border-radius: 0 0 .5rem .5rem;
+    text-align: center;
+    color: #fff;
+    font-size: .75rem;
+    line-height: 1rem;
+    background-color: #0097ff
+}
+
+.img-upload-wrapper .multi-img-upload .preview {
+    position: fixed;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    padding: .625rem 1.25rem;
+    background: transparent;
+    z-index: -999;
+    -webkit-transition: all .6s ease-out;
+    transition: all .6s ease-out
+}
+
+.img-upload-wrapper .multi-img-upload .preview.show {
+    background: #000;
+    z-index: 999
+}
+
+.img-upload-wrapper .multi-img-upload .preview img {
+    position: relative;
+    top: 50%;
+    -webkit-transform: translateY(-50%);
+    transform: translateY(-50%);
+    width: 100%
+}
+
+.img-upload-wrapper .wider-img-upload .show-img-list .example,
+.img-upload-wrapper .wider-img-upload .show-img-list .show-img,
+.img-upload-wrapper .wider-img-upload .show-img-list .upload {
+    margin-left: 0;
+    width: 10.1875rem;
+    height: 6.625rem
+}
+
+ul.tag-list-wrapper {
+    display: inline-block;
+    overflow: hidden;
+    width: 100%
+}
+
+ul.tag-list-wrapper.alone li {
+    width: inherit;
+    padding: .3125rem .4375rem;
+    text-align: left
+}
+
+ul.tag-list-wrapper li {
+    box-sizing: border-box;
+    float: left;
+    width: 3.75rem;
+    padding: .3125rem 0;
+    margin-right: .4375rem;
+    margin-bottom: .4375rem;
+    border-radius: 2px;
+    text-align: center;
+    line-height: 1rem;
+    vertical-align: middle;
+    font-size: .75rem;
+    color: #898d98;
+    background-color: #f5f7fc
+}
+
+ul.tag-list-wrapper li.active {
+    color: #fff;
+    background-color: #0097ff
+}
+
+.dialog-wrapper {
+    display: -webkit-box;
+    display: flex;
+    position: fixed;
+    top: 0;
+    left: 0;
+    bottom: 0;
+    right: 0;
+    background-color: rgba(0, 0, 0, .4);
+    z-index: 999
+}
+
+.dialog-wrapper.more-radius .dialog {
+    padding: 0 1.6875rem 1.25rem;
+    border-radius: 1.375rem 1.375rem 0 0
+}
+
+.dialog-wrapper.more-radius .dialog>.header {
+    border-radius: 1.375rem 1.375rem 0 0
+}
+
+.dialog-wrapper .dialog {
+    position: absolute;
+    left: 0;
+    bottom: 0;
+    box-sizing: border-box;
+    width: 100%;
+    border-radius: .75rem .75rem 0 0;
+    background-color: #fff;
+    -webkit-animation-name: slideFromBottom;
+    animation-name: slideFromBottom;
+    -webkit-animation-duration: .2s;
+    animation-duration: .2s;
+    -webkit-animation-timing-function: linear;
+    animation-timing-function: linear
+}
+
+.dialog-wrapper .dialog>.header {
+    position: relative;
+    padding: 1.6875rem 0 .9375rem;
+    border-radius: .75rem .75rem 0 0;
+    color: #000;
+    background-color: #fff;
+    text-align: center;
+    font-size: 1.0625rem;
+    line-height: 1.375rem
+}
+
+.dialog-wrapper .dialog>.header>.close {
+    position: absolute;
+    top: 50%;
+    right: 1.25rem;
+    width: .875rem
+}
+
+.dialog-wrapper .dialog>.header>.subtitle {
+    margin-top: .3125rem;
+    color: rgba(0, 0, 0, .7);
+    font-size: .875rem;
+    line-height: 1.1875rem
+}
+
+.dialog-wrapper .center-dialog {
+    overflow: hidden;
+    margin: auto;
+    width: 88%;
+    border-radius: .625rem;
+    background-color: #fff
+}
+
+.dialog-wrapper .center-dialog>.header {
+    position: relative;
+    padding: 1.6875rem 0 .9375rem;
+    text-align: center;
+    font-size: 1.0625rem;
+    line-height: 1.375rem;
+    color: #000;
+    background-color: #fff
+}
+
+.dialog-wrapper .center-dialog>.header>.icon-close {
+    position: absolute;
+    top: 50%;
+    right: 1.25rem;
+    width: .875rem
+}
+
+.dialog-wrapper .center-dialog>.content {
+    box-sizing: border-box;
+    padding: 1.25rem;
+    min-height: 5rem;
+    text-align: center
+}
+
+.dialog-wrapper .center-dialog>.btn-close {
+    border-top: 1px solid #ddd;
+    width: 100%;
+    height: 3.125rem;
+    color: #0097ff;
+    text-align: center
+}
+
+.county-dialog .content,
+.scope-dialog .content {
+    font-size: .875rem;
+    line-height: 1.1875rem
+}
+
+.county-dialog .content .selected-wrapper,
+.scope-dialog .content .selected-wrapper {
+    display: -webkit-box;
+    display: flex;
+    -webkit-box-pack: start;
+    justify-content: flex-start;
+    padding: .1875rem 1.25rem 0;
+    border-bottom: 1px solid #e5e6e8
+}
+
+.county-dialog .content .selected-wrapper li,
+.scope-dialog .content .selected-wrapper li {
+    max-width: 4.375rem;
+    padding-bottom: .5rem;
+    margin-right: 2.0625rem;
+    margin-bottom: -1px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis
+}
+
+.county-dialog .content .selected-wrapper li.active,
+.scope-dialog .content .selected-wrapper li.active {
+    border-bottom: 1px solid #0097ff;
+    color: #0097ff
+}
+
+.county-dialog .content .options-wrapper,
+.scope-dialog .content .options-wrapper {
+    padding: .625rem .9375rem .625rem 1.5625rem;
+    overflow-y: scroll
+}
+
+.county-dialog .content .options-wrapper li,
+.scope-dialog .content .options-wrapper li {
+    padding: .8125rem 0
+}
+
+.county-dialog .content .options-wrapper li.active,
+.scope-dialog .content .options-wrapper li.active {
+    padding-left: .875rem;
+    color: #0097ff;
+    background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAWCAMAAADgvdz9AAAANlBMVEVHcEwAl/8AmP8Al/8Amv8Amv8AmP8Amf8AmP8Al/8AmP8Al/8Amf8AnP8AmP8Al/8An/8Al/8TbcS/AAAAEXRSTlMA2z34GiTSM7LFoONOD31FCMXlP7AAAACaSURBVCjPfZFZEsQgCESJG24xw/0vO0pmLDVBvqx+0tgIINVZUjQiNZGIitgb9QZ/fIWUrODM9MjS3OacMh+9Wuf6Rg+Wq42+5t5AnYJrx5HbaW5pRg6HV7GgekCOgJPzdH0Qfs5qDam97dSplyUEA5adAy5B//KdCB9rwhaPtEAr58Y357uU21GAK21+sFZOFGRaeUTY1fmUvtDwCjYpJuRjAAAAAElFTkSuQmCC) no-repeat 0/.625rem .4375rem
+}
+
+.county-dialog .content {
+    height: 35rem
+}
+
+.county-dialog .content .options-wrapper {
+    height: 31.875rem
+}
+
+.scope-dialog .content .scope-tag {
+    padding: .9375rem 1.25rem 1.25rem
+}
+
+.scope-dialog .content .scope-tag h4 {
+    margin-bottom: .625rem
+}
+
+.scope-dialog .content .scope-option {
+    height: 18.75rem
+}
+
+.scope-dialog .content .scope-option .options-wrapper {
+    height: 15.625rem
+}
+
+.date-dialog .dialog .header {
+    padding-bottom: .3125rem
+}
+
+.wx-prompt-dialog {
+    position: fixed;
+    top: 0;
+    left: 0;
+    bottom: 0;
+    right: 0;
+    background-color: rgba(0, 0, 0, .7);
+    z-index: 999
+}
+
+.wx-prompt-dialog>div {
+    position: absolute;
+    top: 1.25rem;
+    right: .625rem;
+    border-radius: .5rem;
+    padding: .9375rem;
+    font-size: .875rem;
+    color: #131c31;
+    background-color: #fff
+}
+
+.wx-prompt-dialog>div:after {
+    content: "";
+    position: absolute;
+    top: -.625rem;
+    right: .9375rem;
+    border-bottom: 10px solid #fff;
+    border-left: 8px solid transparent;
+    border-right: 8px solid transparent
+}
+
+.upCenter-dialog-wrapper {
+    position: fixed;
+    width: 100%;
+    height: 100%;
+    background: rgba(0, 10, 31, .6);
+    z-index: 999;
+    top: 0;
+    left: 0
+}
+
+.upCenter-dialog-wrapper .toast2 {
+    position: absolute;
+    top: 50%;
+    width: 18rem;
+    background: #fff;
+    border-radius: .61125rem;
+    left: 50%;
+    -webkit-transform: translate(-50%, -50%);
+    transform: translate(-50%, -50%);
+    font-size: .9375rem;
+    padding: 1.21875rem;
+    -webkit-animation: showToast2 .7s;
+    animation: showToast2 .7s;
+    box-sizing: border-box
+}
+
+.upCenter-dialog-wrapper .toast2 .toast-title {
+    text-align: center;
+    font-size: 1.25rem;
+    color: #000;
+    margin-top: .4375rem;
+    font-family: Pro-Medium
+}
+
+.upCenter-dialog-wrapper .toast2 .toast-message,
+.upCenter-dialog-wrapper .toast2 p {
+    line-height: 1.375rem;
+    font-size: .875rem;
+    color: #666c79;
+    font-family: Pro-Normal
+}
+
+.upCenter-dialog-wrapper .toast2 .toast-message.p,
+.upCenter-dialog-wrapper .toast2 p.p {
+    text-align: left
+}
+
+.upCenter-dialog-wrapper .toast2 .toast-message.toast-message,
+.upCenter-dialog-wrapper .toast2 p.toast-message {
+    margin-top: 1.1875rem;
+    text-align: center
+}
+
+.upCenter-dialog-wrapper .toast2 .toast-message.important-note,
+.upCenter-dialog-wrapper .toast2 p.important-note {
+    margin-top: 1.25rem
+}
+
+.upCenter-dialog-wrapper .toast2 .btn-wrapper {
+    padding: 0!important
+}
+
+.upCenter-dialog-wrapper .toast2 button {
+    position: absolute;
+    bottom: 1.46875rem;
+    width: 86%
+}
+
+@-webkit-keyframes showToast {
+    0% {
+        bottom: 0
+    }
+    to {
+        bottom: 10%
+    }
+}
+
+@keyframes showToast {
+    0% {
+        bottom: 0
+    }
+    to {
+        bottom: 10%
+    }
+}
+
+@-webkit-keyframes showToast2 {
+    0% {
+        top: 100%
+    }
+    to {
+        bottom: 0
+    }
+}
+
+@keyframes showToast2 {
+    0% {
+        top: 100%
+    }
+    to {
+        bottom: 0
+    }
+}
+
+@keyframes showToast2-out {
+    0% {
+        bottom: 0
+    }
+    to {
+        top: 100%
+    }
+}
+
+
+.toast-wrapper {
+    position: fixed;
+    bottom: 10%;
+    left: 50%;
+    -webkit-transform: translateX(-50%);
+    transform: translateX(-50%);
+    -webkit-animation: showToast .7s;
+    animation: showToast .7s;
+    z-index: 99
+}
+
+.toast-wrapper .toast {
+    max-width: 75%;
+    padding: .75rem .8125rem;
+    margin: 0 auto;
+    border-radius: .75rem;
+    box-shadow: 0 1.0625rem 2.0625rem 0 rgba(0, 0, 0, .05), 0 .8125rem 1.6875rem 0 rgba(0, 0, 0, .05);
+    color: #000;
+    background-color: #fff;
+    text-align: left;
+    font-size: .75rem;
+    line-height: 1rem;
+    word-wrap: break-word
+}
+
+.toast-wrapper2 {
+    position: fixed;
+    width: 100%;
+    height: 100%;
+    background: rgba(0, 10, 31, .6);
+    z-index: 999;
+    top: 0;
+    left: 0
+}
+
+.toast-wrapper2 .toast2 {
+    position: absolute;
+    top: 13.25rem;
+    width: 18rem;
+    background: #fff;
+    border-radius: .61125rem;
+    left: 50%;
+    -webkit-transform: translateX(-50%);
+    transform: translateX(-50%);
+    font-size: .9375rem;
+    padding: 1.21875rem;
+    -webkit-animation: showToast2 .7s;
+    animation: showToast2 .7s;
+    box-sizing: border-box
+}
+.toast-wrapper2 .toast2-out {
+    -webkit-animation: showToast2-out .7s;
+    animation: showToast2-out .7s;
+}
+
+.toast-wrapper2 .toast2 .toast-title {
+    font-family: Pro-Medium;
+    text-align: center;
+    font-size: 1.0625rem;
+    color: #000;
+    margin-top: .4375rem
+}
+
+.toast-wrapper2 .toast2 .toast-message {
+    font-family: Pro-Normal;
+    margin-top: 1.1875rem;
+    line-height: 1.25rem;
+    font-size: .9375rem;
+    color: rgba(0, 0, 0, .7)
+}
+
+.toast-wrapper2 .toast2 button {
+    position: absolute;
+    height: 2.5625rem;
+    line-height: 2.5625rem;
+    padding: 0;
+    bottom: 1.46875rem;
+    width: 86%
+}
+
+.toast3-wrapper {
+    position: fixed;
+    top: 5.375rem;
+    left: 50%;
+    -webkit-transform: translateX(-50%);
+    transform: translateX(-50%);
+    padding: 1rem 2.125rem;
+    background: #3a4a6e;
+    border-radius: .625rem;
+    -webkit-animation: showToast .7s;
+    animation: showToast .7s;
+    z-index: 99;
+    font-size: .875rem;
+    color: #fff;
+    text-align: center;
+    box-sizing: border-box;
+    white-space: nowrap
+}
+
+.handwriting-wrapper {
+    color: #131c31
+}
+
+.handwriting-wrapper .info {
+    margin-bottom: .8125rem;
+    font-size: .875rem;
+    line-height: 1.1875rem
+}
+
+.handwriting-wrapper .canvas-wrapper canvas {
+    border-radius: .25rem;
+    border: 2px dotted #b8bac1
+}
+
+.handwriting-wrapper .btns {
+    display: -webkit-box;
+    display: flex;
+    justify-content: space-around;
+    margin-top: 1.25rem
+}
+
+.handwriting-wrapper .btns button+button {
+    margin-left: .8125rem
+}
+
+.loading-wrapper .page-loading {
+    position: fixed;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    background-color: #fff;
+    z-index: 999
+}
+
+.loading-wrapper .page-loading img {
+    position: fixed;
+    left: 50%;
+    top: 50%;
+    -webkit-transform: translate(-50%, -50%);
+    transform: translate(-50%, -50%);
+    width: 12.8%;
+    max-width: 80px
+}
+
+.loading-wrapper .bottom-loading-wrapper {
+    position: fixed;
+    top: 0;
+    left: 0;
+    bottom: 0;
+    right: 0;
+    background-color: rgba(0, 0, 0, .4);
+    z-index: 999
+}
+
+.loading-wrapper .bottom-loading-wrapper .bottom-loading {
+    position: absolute;
+    bottom: 0;
+    box-sizing: border-box;
+    width: 100%;
+    padding: 0 1.875rem;
+    border-radius: 1.375rem 1.375rem 0 0;
+    font-size: .9375rem;
+    line-height: 7.25rem;
+    color: rgba(0, 0, 0, .7);
+    background-color: #fff;
+    height: 7.25rem
+}
+
+.loading-wrapper .bottom-loading-wrapper .bottom-loading img {
+    width: 12.8%;
+    max-width: 80px;
+    margin-right: .8125rem;
+    vertical-align: middle
+}
+
+.loading-wrapper .circle-loading {
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    background-color: rgba(0, 0, 0, .2)
+}
+
+.loading-wrapper .circle-loading img {
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    margin-top: -.9375rem;
+    margin-left: -.9375rem;
+    width: 1.875rem;
+    height: 1.875rem;
+    -webkit-animation: rotate .7s linear infinite;
+    animation: rotate .7s linear infinite
+}
+
+@-webkit-keyframes rotate {
+    0% {
+        -webkit-transform: rotate(0);
+        transform: rotate(0)
+    }
+    to {
+        -webkit-transform: rotate(1turn);
+        transform: rotate(1turn)
+    }
+}
+
+@keyframes rotate {
+    0% {
+        -webkit-transform: rotate(0);
+        transform: rotate(0)
+    }
+    to {
+        -webkit-transform: rotate(1turn);
+        transform: rotate(1turn)
+    }
+}
+
+.qrcode-wrapper {
+    width: 100%;
+    height: 100vh;
+    background: url(assets/qrcode-bg.9fee9.png) no-repeat 50%;
+    background-size: 100% 100vh;
+    overflow: hidden
+}
+
+.qrcode-wrapper .qrcode {
+    height: inherit;
+    overflow: auto;
+    color: #131c31
+}
+
+.qrcode-wrapper .qrcode .qrcode-content {
+    margin: 1.25rem 1.25rem 0;
+    border-radius: .25rem;
+    background-color: #fff;
+    text-align: center
+}
+
+.qrcode-wrapper .qrcode .qrcode-content h3 {
+    padding: 2.125rem 0 1.6875rem;
+    font-size: 1.125rem;
+    line-height: 1.125rem
+}
+
+.qrcode-wrapper .qrcode .qrcode-content p {
+    color: #717783;
+    font-size: .875rem;
+    line-height: 1.1875rem
+}
+
+.qrcode-wrapper .qrcode .qrcode-content p .medium {
+    font-family: MILanPro_MEDIUM--GB1-4, MILanPro_MEDIUM--GB1, system-ui
+}
+
+.qrcode-wrapper .qrcode .qrcode-content .qrcode-img {
+    position: relative;
+    margin: 1.5rem 1.375rem;
+    text-align: center
+}
+
+.qrcode-wrapper .qrcode .qrcode-content .qrcode-img.no-qrcode {
+    width: 11.25rem;
+    height: 11.25rem;
+    margin: 1.0625rem auto 4.625rem;
+    background: -webkit-gradient(linear, left bottom, left top, from(#f6f8fd), to(#fafafc));
+    background: linear-gradient(1turn, #f6f8fd, #fafafc);
+    font-size: .875rem;
+    line-height: 1.1875rem
+}
+
+.qrcode-wrapper .qrcode .qrcode-content .qrcode-img.no-qrcode .no-qrcode-content img {
+    width: 1.3125rem;
+    height: 1.3125rem;
+    margin-top: 3.3125rem
+}
+
+.qrcode-wrapper .qrcode .qrcode-content .qrcode-img.no-qrcode .no-qrcode-content p {
+    margin: 1.0625rem 0 .25rem
+}
+
+.qrcode-wrapper .qrcode .qrcode-content .qrcode-img.no-qrcode .no-qrcode-content a {
+    color: #0097ff
+}
+
+.qrcode-wrapper .qrcode .qrcode-content .qrcode-img canvas {
+    width: 11.25rem!important;
+    height: 11.25rem!important
+}
+
+.qrcode-wrapper .qrcode .qrcode-content .qrcode-img>img {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    -webkit-transform: translate(-50%, -50%);
+    transform: translate(-50%, -50%);
+    width: 2.625rem;
+    height: 2.625rem
+}
+
+.qrcode-wrapper .qrcode .qrcode-content .qrcode-save {
+    margin-bottom: 2.5rem
+}
+
+.qrcode-wrapper .qrcode .qrcode-content .qrcode-save a {
+    color: #0097ff;
+    text-decoration: none
+}
+
+.qrcode-wrapper .qrcode .qrcode-content .qrcode-platform {
+    padding-bottom: 1.875rem
+}
+
+.qrcode-wrapper .qrcode .qrcode-content .qrcode-platform p {
+    display: -webkit-box;
+    display: flex;
+    -webkit-box-pack: center;
+    justify-content: center;
+    -webkit-box-align: center;
+    align-items: center;
+    margin-bottom: 1.25rem
+}
+
+.qrcode-wrapper .qrcode .qrcode-content .qrcode-platform p img {
+    width: .875rem;
+    margin-left: .25rem
+}
+
+.qrcode-wrapper .qrcode .qrcode-content .qrcode-platform ul {
+    display: -webkit-box;
+    display: flex;
+    -webkit-box-pack: center;
+    justify-content: center
+}
+
+.qrcode-wrapper .qrcode .qrcode-content .qrcode-platform ul li {
+    position: relative
+}
+
+.qrcode-wrapper .qrcode .qrcode-content .qrcode-platform ul li img.recommend {
+    position: absolute;
+    top: -.625rem;
+    left: 1.25rem;
+    width: 2rem;
+    height: 1rem
+}
+
+.qrcode-wrapper .qrcode .qrcode-content .qrcode-platform ul li img {
+    width: 1.875rem;
+    height: 1.875rem
+}
+
+.qrcode-wrapper .qrcode .qrcode-content .qrcode-platform ul li+li {
+    margin-left: 2.1875rem
+}
+
+.qrcode-wrapper .qrcode .qrcode-menu {
+    margin: .625rem 1.25rem;
+    border-radius: .25rem;
+    background-color: #fff
+}
+
+.qrcode-wrapper .qrcode .qrcode-menu li {
+    margin: 0 .8125rem
+}
+
+.qrcode-wrapper .qrcode .qrcode-menu li div {
+    padding: 1.125rem 0 1.125rem 1.4375rem;
+    overflow: hidden
+}
+
+.qrcode-wrapper .qrcode .qrcode-menu li div.merchantInfo {
+    background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACsAAAArCAMAAADWg4HyAAAAS1BMVEVHcEwNov8Vp/8Mov8Tp/8gsf8Fm/8VqP8Up/8Wqv8GnP8Qo/8jtf8ZrP8hs/8Oo/8Xqv8LoP8Rpv8dr/8UqP8arf8Hnf8is/8Cmf9oe0zAAAAAD3RSTlMAwTzvW7vWdyEJqY3T6a4ufcXKAAABX0lEQVQ4y42V6wJEIBCFdaHJZYlV3v9JNyWbmjC/P8cxc2ZUVVJAOzJ8bU3TtK7rstRVoYCTcZzn2aH3LLTMoS9YaNQY2AcPQNS4w+MzKzulDvRgJ4viLLCYvffb6lR3LelKhrAFXa71aw/dyT73wdlV6pVu63Rz9nPr4cp2CCsKrMBGofCeATaLJvi99KFHo8MVpstLMcv8LjXg8eUs0x14aYMES9hBlNBKiib2YFFZlYuS0AfLElrdFyeMfeeJDYRXjyWBCyE4lF8v6U5gxWnyFG20zvLgRrwspqeXE7LplI1h050TkRbdDja/DztrPsFHt20JmrHmGArs6Ib49bfEswZO2dzvFO5DLCwJqvv34GRNLd1xRHUTv6aHwGonjO6bZZcLe/ZBPeuWvi1h7SQiNr8lxrN+GvyVrk+obF70oZfhl4L04cr28N+c2C6SnTpKpeQtQ7Lj8zB8uDfwA94EUJuqbj6SAAAAAElFTkSuQmCC) no-repeat 0/.875rem .875rem, url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAAfBAMAAAAYfoC6AAAAKlBMVEVHcEy4usG5usG5usG5u8O9wse5usK7wcS6u8K6vMK7vcG7u8O6u8K4u8LztzLnAAAADnRSTlMA/+XtlgikF15QQyeIzfw5xJ0AAAB3SURBVBjTY6jxZoCCRKEJUJahoCaUdVBQaAGEVSYoqAVhsScKCjVAmGGCMJWsjnCVJYKCFgEQlY5wlWyCgpZQlc6CwlPRVQK1C0NVshgKakNY3BcFJdHEEOrgehHmwe1A2IuwAe4+uJsR/kD4DeFfRBggwgUeVgCA/hsqy7NAFgAAAABJRU5ErkJggg==) no-repeat 100%/.375rem .625rem
+}
+
+.qrcode-wrapper .qrcode .qrcode-menu li div.transaction {
+    background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACsAAAArCAMAAADWg4HyAAAARVBMVEVHcEz/dCn/ijb/izb/Wx3/Wxz/WBv/dCn/ZiP/Wxz/hzT/ZiT/jjj/iDT/YiD/cin/ZyP/bCb/dyv/XB3/gjH/fC7/fzALDaPFAAAADXRSTlMATbObsuvdGDiX6mzjxOd+0AAAASFJREFUOMulldGWgyAMRK2IAW1w24D//6nFAlURJd3m+Z6cgckkTbMU3DppzJ+vh6/J19OXc26erR3aGzSfAm2WOmGtRbHCmqjAusQiokiooiMb4Dn2RVSR7QKa2CnXgB5uIyupqOG50YBDZImqehGv2Z2GwCpNmd5HQcObVT0RQy/GT1hQ4miQxO+7SqizI6Nv0gC6P9Fb+F9QxJiHjRc8vV/5BmPGTkW9ox936Kr/EOAWlkxU5yHAInqx61ucHcR78o2ucpFYXfc4woLzNkxv83uExcZ9cvIP7ugFw7fVY8XOBWjJ7nuc9em0b/9F3iQjb3aXefpxlxTydthR5XnIvDCMvElGNofNXq/51l7ci7yv+twhc7lLfF/xr/vGvJsvn7hrDZisIRkAAAAASUVORK5CYII=) no-repeat 0/.875rem .875rem, url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAAfBAMAAAAYfoC6AAAAKlBMVEVHcEy4usG5usG5usG5u8O9wse5usK7wcS6u8K6vMK7vcG7u8O6u8K4u8LztzLnAAAADnRSTlMA/+XtlgikF15QQyeIzfw5xJ0AAAB3SURBVBjTY6jxZoCCRKEJUJahoCaUdVBQaAGEVSYoqAVhsScKCjVAmGGCMJWsjnCVJYKCFgEQlY5wlWyCgpZQlc6CwlPRVQK1C0NVshgKakNY3BcFJdHEEOrgehHmwe1A2IuwAe4+uJsR/kD4DeFfRBggwgUeVgCA/hsqy7NAFgAAAABJRU5ErkJggg==) no-repeat 100%/.375rem .625rem
+}
+
+.qrcode-wrapper .qrcode .qrcode-menu li div.material {
+    background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACsAAAArCAMAAADWg4HyAAAAV1BMVEVHcEwTp/8dr/8UqP8Yqf8Inv8esP8Vp/8Tqf8VqP8Vqf8dr/8Kn/8Up/8Hnf8Up/8Mof8gsf8Vp/8FnP8Vqf8Rpf8Jn/8UqP8Nov8Yq/8cr/8Emv8hs/+lS7o+AAAAFXRSTlMAjehtDtHRGgVFWry7fvid5fkx7PS8uE0lAAAB40lEQVQ4y61V2ZKEIBBTbrwQDzz//zuXBrVgRGerdnmbmkwmdNIhy26HYzpQzLNfHFmN0zhNpfyKJHk72jNNE8rJK1J0dJ4P7LSwTjxDed3OAXZB9ZNqIat5jrDLWso0dd4YE2AXOKuuU6TUGIcdQ95l3W/UPG8PaKRhWe1BeaRa0saYExxqAPCumQyu32+b2T6wF++67+dAiKw2OCaBXReP3b1qgfsLGek9Jay7AyMsMk63LcnraC9ey8wvrDFPej3vzl6wS6Q3xJrtkXdN886Pc4ixT/PdD8EWS9SH3vGBV9noc9W/8nosUs45UVSvc7ASdFmIK2VfeKOknUGLsYdvTH4GuE9l8h5fwiFuNJkHJuH+1/pz2ktXDc1Nr3YlIRHjR9IbOwZlu0AUtIl4B2avLzplZ6ahtCyb84LafILqgNdtg8BMw4DhH/ixFVtTwTeyvbAIVoGX+jDO5lfg9vSYFlYcUa3DujojBTs9RuCG8PsGXjSqczYO41DC7zo1HFHXZ0twWDnvMS3gcyc7uLcj9Xsc1HFgm+KeQHB1eqxj40h99Q7FMFKC2dU7NbmVpAeP81DhApfDmZ1kVdapnhzqP/cvDKSNeNHLaySy8L2YWPdf79Dxvo2/e98yF4KWFQnSH0TEZJGdQKGyAAAAAElFTkSuQmCC) no-repeat 0/.875rem .875rem, url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAAfBAMAAAAYfoC6AAAAKlBMVEVHcEy4usG5usG5usG5u8O9wse5usK7wcS6u8K6vMK7vcG7u8O6u8K4u8LztzLnAAAADnRSTlMA/+XtlgikF15QQyeIzfw5xJ0AAAB3SURBVBjTY6jxZoCCRKEJUJahoCaUdVBQaAGEVSYoqAVhsScKCjVAmGGCMJWsjnCVJYKCFgEQlY5wlWyCgpZQlc6CwlPRVQK1C0NVshgKakNY3BcFJdHEEOrgehHmwe1A2IuwAe4+uJsR/kD4DeFfRBggwgUeVgCA/hsqy7NAFgAAAABJRU5ErkJggg==) no-repeat 100%/.375rem .625rem
+}
+
+.qrcode-wrapper .qrcode .qrcode-menu li div.invite {
+    background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFQAAABWCAYAAABRo7HKAAAABGdBTUEAALGPC/xhBQAAADhlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAAqACAAQAAAABAAAAVKADAAQAAAABAAAAVgAAAADuYLwaAAATP0lEQVR4Ae1cC7CdVXVe+5x78wK0hUFpBZL7ACoZsU5bW9oiIOoQBig+0MBYmFQpjGAI0I5DYsghhkcmIQqaWnQUGRELY6117Nh2bIU+YJwRnToTq2nujRRpoVjBFPK4Oefsft/aa+1/n8cliaXhBM6eOf9ae73Xd/b/PP+9IsMxRGCIwBCBIQJDBIYIDBEYIjBEYIjAIY9AOOQ7OEgNxI9MTsie1hki4XCk3CIL5nw3rPzBf3enHwLajUgxj41GTZqfP1+kfY1EeVNSAbIY8Ql7JISbZM689aGxZcbdhoA6EgWNjclXSLO5DIBdDSDHVAUMwdswUANpeEDm/v5ZodFoUzkE1DECjY0Tx0WaV0lL3o/ZERWAVJqhA0vkXCbh+nDL9K20GAJKXNaOnSatcK3E9vlYcTUCU4AFPiMHBVcl50YTu1uOPubIcO3Du0bo+3Ic8f7Fc+T7O5ei9xXSlDckBIv1RVZxdDAdQJ+DktXdXubJfz11GmZ/+7IDNN48ebTMxMsB5pUA5BiAUI0CqyzMMmMy0MboCQrW9XgkfV42gMa1469DvytkpnkxltU8O1Prnksg8m6cJtgSsO5hq5TifBiALADsVvs5il/SgMYYg6ydOAfYrJB2+y0JJILC1gkEiK/ADgCp6NbREB/dxUk5xYbAUlYb+Te6vCQBjRtOOUz2PHuprJtYgWvIE7RxdstRrizlDbykVcycVaDaBqQL6UMRQVSAlbRk3ug0TbqiUXTojnjr+PEyI1ei0T8EcL+Q2yuBIxg+nO+ndx1tnXdK2NSHSoVwa7h1+iTOXhIrNK6b/C2JrWtkb/udWDl14aryXVNBsHXTARwVBIYwuJ48hsoKqkLamCKDSRFkIfxQTbA5ZAGN3zxjRB567F24drwGZ4Q3akPaLxv09sA4DiUIqs5GbtxF6cuAoPTN/pRDrHNlaPMDdz7kAI2bFh8pu567TB569Co0dWzVMPti89aagkDemtZjHqbUOxik7uOy7EIQOXFqCrUjj+E+7faht0LjxhN/RfbMXA0wL0GPCxSn1FbnNjcMIH0BubECRHMqOEC7ZXmeLJIZ7QgsPn4oqYLjGrR26KzQeMvY29AJrh9nztZuHDCl3qg139EwZKVNQqaQQUBcCWA/ELOSejPIYLrM8s8dySuUIQduxE2nzpeZJ96LRlag2ZPTSrKmcvPWjFZvbVDnIFKebQu+Q0+Dwrf0KX1p46C6PF+DytNh/Xa9S6L7QB1D4/qTfllk5gMA8wo0cFQFiHfB/q25DAx0zjtlZzqoI+OAgOZjJuW1n8H3leR05DSw8+Qq8zi08liQMZbIv3LjYyAAjevHfz2drWcuxCXPqBaXm+NMCzfgqLCGlRhPADLYGqHy47QDSBV8Ser1m6TV/A5cg+NHjX5BnkYFyKFpKCzyqK6Wd3dOXzRA4/0X1uVHj1yA4nk387taG1eY4+OUPbAJ0gyYTlLj6mDGakvehwowgaxj9YbbpT6yDmA+hLilgztWdagEcTy2xuHEYoaYT0g0PeiAxjvHXyk75H3y6LeXo8mFHY16/6zMeQdRZdZIVtIuG1ZO9PGLe8KlJoobuT+W1/ziHfL4038D3xMwr3J5qFLmwLlhWY/Kqot6Tg8aoHHTxCQeUCyXHa1l0tYfulIjWiAqYTMZCJbmK6DQEbwMoMl9gancfNTdeaO12h7kvTSsnbovrpY7YXImzXTAJOf3+L3AWW7WYH4ko/WDu0LjbRNn4viIh7jNcwESnoazehveCKfKo9Isc54Uwlkbha+DqXHMlmdhz1ULz0itfUFo/OjBeMM4fnDDvX45MkDGKHGetMjvBTK8hKYcd7g+FPFw/y8rNN4xOVf2xouw3+GxWfP1qTGtoPp2HQSKWbPVn6lW2K3E3P0c4NJOY9BGhWkTw2O48F4Sbti2JTbGz5FW3KAKj+MAlT7Z/Xny6yFFpsLlj+zN5mBeUEDjx8ZejYavkJnWB9DVq3LzqQNsUaDXyFXH0d2Ir0aVuxK2BID31q7XQPR3GXjVFVTkezJn5Jzw4a2Px7WTi6XZ/iK09ZTT83sOaHRAzjwU5y+Ntiqo8mv9ncdPur8ggMY7xl6PFYnVKBfhZDA3JWdh+OSVwHQYVlcGNkmrLe1p4+CoPwUcFs+nHptzl5EhH2p/j+vMtwPMHfqzx+7m1/Bc9BWVXekD3ofG5IT1g/TL77ZS3cO76OcGNEa8BHD73ecCwBV4bHamBtSmWAVGbhDzUk6dFkrGRmlLY9Wb0L8Up3RxsJXHRh8Cc8IB5xC+IDL/D/gCQmzgx7jdu/4CwkVQprGv/LQqgfUvLjfFALSpnjIlwc+xQuPmxYdLc+cy+ehdy1HkZELLExAE8CzAAdCTg6XzwgwrlXbwhT+VqisNKLT4Ki5yqT2EobZebpi6PgR99oYYOz+NOL9TfUn08dh0KobX7ZdcnGvNZuM5GYD8SOdFPa32e4XGTy5aJDPhgzKz832I1nm7hho1QaoaEwo4QF2Xi0niZK9GnYLcgDtarCynj+nchKKIA04Iy8Oa6c2yJvngjH49ALmE6qo+nVUb1uVfPqXMYynVyPeGfvlltOOSifalq/p3b+Lt47iLaeFuRnBXg6fhDOzgaHKEKGUeoJSRL1OpP0TdlL5lbM453I4xPG4GgS3EXRLrF4fG1FfUnpLGxAXSan3Z0ILEWmUsj0eq7oUMrAo9D6dqD0O1xSTNfxo2TB9FdTn6rtB456+Nyp6n361Axjbus72YsgIL48m8ygye+dDMv+Uyc19eK4YGQZ0l47zHtr1ZFUHwBtzIeWHNtoc9JM7ob5Bm6x7kpSfCJeIlJjvGRR6tP0k0nuYohbRjDH648UnoeCjiEXoAjZsXnS27f7IZjuMpGYLk+AimQS24rxLVMxGGyzRxElX+mHusbkrTHBu8YgGjbll5fAthu4yEs8PKbVvpzhFveu0vyczur4I9rCeXGnDDwQIMHK+FMscrM6xBHZJ9BWrHQxG3SO/x2Cx+fOHFuPD9GqZ4aYrBC5DcQynkJXBuR50nzEVAZmHU1TdeuOq4waeUeRy1V6OqMcYOtUdwRXlqWDldgcnnqHt2/yVKx08jtNFtRW2aiX9ZrF97APW6c37XZa/E1HqvQanIgMZPjC3EYf1TCFhPFTA4ojNBSTUx5VTAhkN5pyYz0uFLFw6NCUoblZmARP24wcfjJqNkrM3Hr8v8w08Pq7Y/CaEOfalhxxOfw+Q3kgRbz6M5TKrxTeeG2h+Mcj4YlX3mOGRYF/17L5kYrtjl21ciCHaT7sAWhNaqI8OqKC8GdSyC4rKwhFClo0t2NyaHor8GSHE0Hue041D+s3LawsvDmQ80k8y2N06sgRrHfRsaB36la87jRlSaUENjTr+O+k2fa4GLxqz33eUrQKOcZQXDgUGZ1ClZCqwA1VlylWkG86Ff95z+lGM4Vd4muVjMnXeqTuYYajeG1dMNkY7nERJvnHgPnmStyabKdNXAVBSR8sPRDVzZI42z3m1NFvBQZKLzoYjGw6YCVAT34RSXmTHtacwKpWmu0GS5IKhKXm1t0x0v56QPbSx/boZN4IXDEK4AmJ+xKJnExtgb8TTrcyroyGlxWJrGdVoIMusGtCnz06BrsH7pfSjiVvkYimPCYwoQ4+Wg5O2jgTBRHYUcpEVSt6EqJSaXzJyqv0rTprTLPOI6H+Q5PC06P6ze3gvmuonjEIQnIbxNB44+jE9eVxgIedVRhlHmd7ukwdZ7gULzq4H5UId56r/ngt5DVIAGwf2uB6KawSyIF8q5N6oRrICyyLIRtbGN1aYz5c1X81CKucYhxZR8qD0p7RpOPlNfV79ioy+ENdtfhe0xyZY++JT1eQpSzUk9PjqcgUJ1ZuT+XksKCg8NDkq73ltODUmNMxJH7sUqfUaL8+RUku+YW2BN6Aok4dynFVPIEMd70Nrd3oQazxPSNmyVOHpquGHqEUrLoWf053bcgzS/qvL8hWPGGnIs88p1mZ7ibFPkd9++9haLCbp+R3INaQY0LN/2Y6nVLsSq4PHKgKAzeObUZHRxHYXkPTvnNvK37AKjbuqULurvvqT6eVhqc387rP7h9q4Iabp24hbYXaCT7vzqjg1zdOTxOQ180I5GoCrmhrxOKp2bazzV9z3D0ywDyklYPv0NqcW3gv1WygBnJvTCaFRW6sVkeac6FanKalPGyrwzoDF+RQ475qx+f1TFIPHGRZfijP6hFBD2/uV7nQzFj2LC+m2eHNKEMhpo/aZQGTYahxPoFVhVmBEI9bXRWQHVtJV1xcU7xt8i7dbv4TCwBEEmUgEWsGwiF2ahPL9ThuzhaQuhysF7Y6H2J7Lykg+G0GjTrXvEdXhQ05S/g8OczpiMhTgWVv16ckKaZZaTc/aSn6daAL33t5gMpvVRRz78JNw2dXSa9G7NqldRSuInxk+UmTaAFbxeHU7Xp/JlEhqzOC0QNN9vmwxEB/U+nE8++HW8thK3kfq3Pm5S0viRk8akPfMt5Dha83gyj0Nj57upBjLgDLNs60kIInvSxcIANqc+P1yhvvbPYeNUeo/AfQvK8Ac08CRqgTz79JuRfAkyLQF4Y6kIhPFGPKLPSZ1XnRer6fdKLSwL10/jKXv/oe+CPvgoTk7xFG2UZh5vNlraOE9bpnTwHLSOPY7GHKwxcUrzXhQ+EzZOv980PaS8sO9R9hPgV76dkPMBCj+irxlKE6u3hdVbexOAnkN5KkK5tFHsWCSq9OIiXnkI4R0AE7vx84x/fPQKaBOY2qQho3G8cZN5GLWzifO++jw/i8wy2DqwdNM6ybBws+NU+j8UURU2BwyoOzoNf7SVF7n8fFSvDeP/8BZ2CYrjCsabIW4JmhuhDIUFeXdYNf29wqI/G2WVKhhL++OGw2k3r8pqk0ErinFZZZW4XCNiay6KLY/m7/9QxMOUFbnsBaNx4+TJeNB7DkB9K8BcjNMjTibtKdD7Zf6r/5R/yrevZHrsbO2xm3eUqw2TmqdS7bRTxs7KU1sCozgB0d/ieSwNWebwuG6geU8Km6pHhupSbJh2oAd+Aj5Z9ra2VAB6kyjbwfUOqPLeS5kDR1nWO3AUGgzqz00Bi9srDXvliOMWhEbXky6GsNFxHerCgaKnHos7prBDwUtNGSiYcLftHhS53MGoUCx0VDqQ4Dnt+YIoL3Vx6vnAZCkDD6g+9wzxmwkkdo2hOBRgKhhJlYEx0yRVlHtB64gDB/0iQBVEBjA/JdiEOOsFvWUffEC10NH6SnSJqws0xT51JZFaG2zYh/NOsz2YvHIpZCwL4HKNAbnOGUCdjZDvfNNOzbs2A79CWS9+hPs+dqbL0Oje3tWJRg0X7197dFkJlgJIwAoUytWoenckdXDJ0qn31ZsikrKHBKCsNDSm75X66OuA3l9n4LRnQ6fk1QHyEhtHUQHU3pPeV6ODTR/1oz8YnasAiurPZyxCD7FqeuQDLcBriSeiwKX4hXYpGn5tLtb7dkqF804JbAaPwmLugRTIbmhge8SCo/C+1E/drB/t9upnM9Ay/ARyCv69xUUA6T0Ab0yL7QEPUpUV4CmotKaMFJtuG4p9hPAU7uFf5dPZ6MACyofI+YWv2arvksfVJ/wmni0sxbGOf03ymkrtQFJifMcDD9eTmhcpQc/H4PgP4bbtp5t2VoIIgzXiXYvmya74JXTyNrwT/x0Ac5fMrf1ZuHz6Z/tbqf6/pdY9pym47fhOAJOeUBEc3Z0RKfMGga5Y8gCRYBJ4HZzQT67DHdImE85K3GtWg4OtiJ88/jIA+Sm9beStIz8x4GWw8Oc4KXxWrt32wIGs3Ng4Y0RmfnyWghvj2xEMbw4qQGABFoH156EKMvP1dN2S2vxjw4YtT/RougSDB+jmhasA4jp9xMZG29YwKRtt40f5GO7Cj3d3hw9P4Zfa/R/67v/jgr8ZbS8FiOcBzPRih69GX6UlJci12lVhwza877XvMYiAXoen8hsTeAYmj3e+WnXForF2aONzr8jxy/Z1O9gPhtjAc93dz5yXVq7+KoFX2TEcTPJBdgP01WHD1EZO92f8nx/f7U+SA7JpC3dvAIblyBXZA6bp2rEGkN8r8tg3YHX3AeWAcWjoc937wN4XP4Q/RmviR7+A1RtkDNrdkP+TzGl/PNw8/eSBxB5AQOu78COcAem7PFpKx9IEdLX78xhYP5CG+9mG9XrC45dywF9Md7wBvFNqY4USSJTqH65SrtY8B9/SVv5F6sditx+cMXgrtIVd3ldgBtJWqoNKKvIfMlI/F8dP7p4DMwYP0DZOBASMK1AB9NWJiQLMeXgWv18BTLycMWBj8AAVXHP6CUl38QJIziOgbsvScPO27w4YllrOAB5DCSiBw0rMFKAquKy5fjXOvH+l1Q/gZvBWKO+KFEhfmUDNj6kSPhbW7d8F9ouF9eCt0CaPoVydduzksVQBxnugo5dc92IBtb95Bw/QFq5DsTj1OJqAxCR8W0aPxB92NSgZ6DF4gK66+D+xOp/Kx1AJ/y6j88+zO5uBBpPFDRyg9ubdO7BKH0R9+AOu2pvxlHyfT3kGHulhgUMEhggMERgisE8E/hdBoeVF9ezjsQAAAABJRU5ErkJggg==) no-repeat 0/.875rem .875rem, url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAAfBAMAAAAYfoC6AAAAKlBMVEVHcEy4usG5usG5usG5u8O9wse5usK7wcS6u8K6vMK7vcG7u8O6u8K4u8LztzLnAAAADnRSTlMA/+XtlgikF15QQyeIzfw5xJ0AAAB3SURBVBjTY6jxZoCCRKEJUJahoCaUdVBQaAGEVSYoqAVhsScKCjVAmGGCMJWsjnCVJYKCFgEQlY5wlWyCgpZQlc6CwlPRVQK1C0NVshgKakNY3BcFJdHEEOrgehHmwe1A2IuwAe4+uJsR/kD4DeFfRBggwgUeVgCA/hsqy7NAFgAAAABJRU5ErkJggg==) no-repeat 100%/.375rem .625rem
+}
+
+.qrcode-wrapper .qrcode .qrcode-menu li div.suggestion {
+    background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACsAAAArCAYAAADhXXHAAAAHFklEQVRYw82ZT4xeVRnGf8+53/yhGUoZCCp1IMQE2mAXNFRFjYnKVuLGEBM2VFOjK+uyLjUuRGNiqG6MaXRlIxg3LkwkJlhrBbSNBBY2FhMt1NoB2pl2OjPffVzce88959w7k0JE/L7MfDP3nnvOc97zvO/7vO8n2/PA7cBNQODdeU2BVeCSpPWtBsn2t4HPAPcAc+8S2GvAy8DPgSclXRkHW2+s1v946p9+5adLrq/OSwIx+DGgAJIwbq8LbTGu+4z3ID6TzQ1o9tYVLR76Fzd/ehF0TNLhUbD1uZ+8sHnq8f0KggDGKLSAgvKFAYJA+b1u4QZcCyYkAEN3X1jNRpWOExBm18M9Ty+z8PAi8BFJfy7BhumZI3c1FjG243aldttu1m9WyC5gJ0aTGuDdy4VVIZlfcUh/c33Wb/7iYgt/35hlA2uv3taboD9K5+skU6tBmWJqN6v0CXXgsoNMVyrmBzbOV+3lxVGwNmoWcWNNN1BVQHQ8736cEsRycy8CtOPpxE3IcUa3x2LndthqH41lW6t0E6h9d9c6Ckj92bo1pyN8Gi5G+uTn4rhB2rl7mklbQRsD63wzHciMUE4Xd85DeiqzvWF64OnDvvH4FtJpJPWOpQJnyj8TaRAdqz0B98TJQbbPKxsTpxp7ZBxsxynb2J21kmMq3SQC66jTjfco7ZRRoqdCN1dpoK3BJpxVZGCx0ZQFUuscuRM2oa93wnSqyNmEChnlxqi3HWc1coSJTyVH5egVLljaO1cRhBPnTeJL3IDNDVl2ku82j4POokHv+4qhpxyfAFJOA7fvlBROMjAI6o1dYLH8yw/7ufkvUAEV55idOcOeK8uTLI53mSxlmtMIkIeuYbpoKNKFqT7JuIgHCenivoyna3fKNfXKiUdN/SgWqjHX10/Xf1k4HMacQO25O8loud+4z74k8b7g5tAxNZxGQ7qqtVzidg9U3ngypE7Q86qYWIla6UzhImaW2kBQ+Gsyv7YECGB1j7pdByw+GMrcnXpqHl7zCJ6Gr5SvTh0slRxKk45zruc5PQJVkiVxG7rGAGhUxiiZrBAkHQ22yGKpqIlxVilnGVg8u6eijOkDfOoGWdqIDpYCdoZNowEzFTVF2B4xiYbmcqYNGJVzUeoVdBioP6c0GjpZZ9mUBphinjTHu4jBKgpE9eqpG5XkgJwv8iC5vSVVMk6W/rdFFiHtAqzTQXnAT3Goc9mBXhhPQvmBKtMGaCjH1dZ2KrJb7mADbZAI5EIbSBQCXTeoDTyqDZxZ1olK6w86DM9EfehAiXxVwc38MRc6t6Su7cyyKrwrXUMeLaZyB7MZhpc4aaIN2n+9ndzWW+XrVtmuhxuGvEslR1EpONEGheBxog3YqhLI5vfAQJEGyrVvZ52guZ0rZTpU6hJKxIjyyJAW1nJOpa4gLM2ndIVB8bvQNpOuxpifUiiED3zl72MF9zB3K+eehqE8Lcc1plDKijmj7Qza+TAwxddeyjo/3ZBJuP/I3ZrMn5mePXoXm5d3EIxwqNmYUZetNBTTAqwJDqGNz8ROTrSacm1gd0fsvmIWOCyi2w6iWx/Dbz6DVv+I5fhMDIu2TwB7gJuBpsmwfPKljWc/tVdshqzF0/W3qsrc/ojC3ifQ/PvfXisuixybsPkGvvIH6nNfgvp1CC3I0LegJsBngU8AS8AO4LHtC6FqU3d/9YKWvrzbl/9KffaHvTBVUTN3PTAlR96FkpD87TW4/je8chL5cuFgPWcmki4CT7V8nAceatufWbdIAJO569Xe753X0uPvrV/7NfXpr+HVs7Hh1tCg7SKGhhZg3Dbz3Db/FJJOYmg32nUo5USWJDQYaAMYBt3OaLO7rlV7v3tRS1+8g+uXXpyeOmivnI2en00cq428JIiKzh6tEmNXJzpB6oDeBqwSUTj3vuVw//df19KheaRjay9/43Na//drJKVM1koqom+ayKPu0LAqi5V0m3jKmD0GtibMxBQaFu69EB782VS7P7+AdBT4+vyZoxckftWEFWXyL69mlDfikrhpJ0FPeRxUclr9PvSbyUhv/zw79z3I/B2rYWZhI3zo6U0t3Pce4AjwHTU1OWvHJ09Unu5BPiC1reZEeg3FlBi27CSgir2LjrPN8BpRGxzQ6XDT3CGNiORPAj8AduN6isIl4JuSjg3GHucWqsn+aQi7qS1CDVV7WBX9Z6C4VjXBX7ozBA5a3NuFp747Hn5cVfwWeJW12T/po5eXx8DOAg8AHwdq4PfAC5I2/9vfetiEzRPzH0P1UYl9DeBW2FfhULV/7Udp0TwZUTvrwCnbz7X/1+/UVzQSNaw965O7Hpn66nHgQCcVPd225TkAXb+TQLO1HnrjlcocDNIzrSNOqdh4G6rzf/fy7+buY47DU7RzSv2tuQPrL/L//PLz7PDz3OKRHPAfgKdmTTOIB+UAAAAASUVORK5CYII=) no-repeat 0/.875rem .875rem, url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACEAAAAhCAMAAABgOjJdAAAA21BMVEUAAAD///+ZmczMzMy/v7+xxMSzs7+8vMi1v7+0vMO9vcW5ucW6ur+4uMK3u7+4vMO3u8S7vsS6usC4u8O6usK4u8K5u8K3ucC5u8K5ucK4usG5ucG5usG5u8K4usG4vMG4ucG4u8G4usG5usG4ucC4ucK5usG4usK4ucG5u8K4ucG4usG4usK4usC5u8G4usK4usC4usG4usG3ucG4usG4usG5usG4usG4usG4usK4usG5usG4usG5u8K6vMK6vMO7vcTOz9TW19vY2t3e3uLh4uXk5ejw8PL///9PGq1wAAAAPHRSTlMAAQUFCA0UFxgiIywwNkBIUlJZXmBsbXV1eYyPkZKUlKWssbK3t73DxsjR09TX6Or09Pf5+fr6+/z9/v4UmA9IAAAA2UlEQVQ4y+XSxxKCMBCAYbABFiwoih1FwK6o2LAXfP8ncmeEaDCWgzf/2+58l+yEopwCqbZpeZs3Ez4X0MLAItXjXRGsWuQqrmAUmIwh3hh2DUykY3j5qVfEKLzM5EtBBxkoooKIM04h/4MICFUFUvsgdMWpVo7eRYp4h0U3jESHfIZRFgmTLJYFJGDanG28PSxLj2JrX/COfyd0SZLqs3fCTf4och+EobEvRasEFUWOevuWWz8S68MJb4eJOUwrb7ArItEk/0JDRCLZIwqNQ8LPVxpPyTkWgSvVIcZrAOaCXAAAAABJRU5ErkJggg==) no-repeat 100%/.6875rem .6875rem
+}
+
+.qrcode-wrapper .qrcode .qrcode-menu li div span {
+    float: right;
+    margin-right: 1rem;
+    color: #a4a7b0;
+    font-size: .875rem;
+    line-height: 1.125rem
+}
+
+.qrcode-wrapper .qrcode .qrcode-menu li div span.orange-red {
+    font-family: MILanPro_MEDIUM--GB1-4, MILanPro_MEDIUM--GB1, system-ui;
+    color: #ff561a
+}
+
+.qrcode-wrapper .qrcode .qrcode-menu li+li {
+    background: -webkit-gradient(linear, left bottom, left top, color-stop(98%, #fff), to(#e5e6e8));
+    background: linear-gradient(0deg, #fff 98%, #e5e6e8)
+}
+
+.date-picker-panel .subtitle {
+    margin-bottom: .1875rem;
+    color: rgba(0, 0, 0, .7);
+    font-size: .875rem;
+    text-align: center;
+    line-height: 1.1875rem
+}
+
+.date-picker-panel .date-picker-content {
+    position: relative
+}
+
+.date-picker-panel .date-picker-content .mask-bottom,
+.date-picker-panel .date-picker-content .mask-top {
+    position: absolute;
+    z-index: 10;
+    width: 100%;
+    height: 3.625rem;
+    pointer-events: none
+}
+
+.date-picker-panel .date-picker-content .mask-top {
+    top: 0;
+    background: -webkit-gradient(linear, left bottom, left top, from(hsla(0, 0%, 100%, .4)), to(hsla(0, 0%, 100%, .8)));
+    background: linear-gradient(0deg, hsla(0, 0%, 100%, .4), hsla(0, 0%, 100%, .8))
+}
+
+.date-picker-panel .date-picker-content .mask-bottom {
+    bottom: 0;
+    background: -webkit-gradient(linear, left top, left bottom, from(hsla(0, 0%, 100%, .4)), to(hsla(0, 0%, 100%, .8)));
+    background: linear-gradient(180deg, hsla(0, 0%, 100%, .4), hsla(0, 0%, 100%, .8))
+}
+
+.date-picker-panel .date-picker-content .date-picker-wrapper {
+    display: -webkit-box;
+    display: flex;
+    -webkit-box-pack: justify;
+    justify-content: space-between
+}
+
+.date-picker-panel .date-picker-content .date-picker-wrapper .date-picker-container {
+    overflow: hidden;
+    height: 10.875rem
+}
+
+.date-picker-panel .date-picker-content .date-picker-wrapper .date-day,
+.date-picker-panel .date-picker-content .date-picker-wrapper .date-month,
+.date-picker-panel .date-picker-content .date-picker-wrapper .date-year {
+    position: relative;
+    margin-top: 3.625rem;
+    width: 6.5rem;
+    color: rgba(0, 0, 0, .7);
+    font-size: 1.0625rem;
+    line-height: 1.375rem;
+    text-align: center
+}
+
+.date-picker-panel .date-picker-content .date-picker-wrapper .date-day li,
+.date-picker-panel .date-picker-content .date-picker-wrapper .date-month li,
+.date-picker-panel .date-picker-content .date-picker-wrapper .date-year li {
+    width: 6.5rem;
+    height: 3.625rem;
+    line-height: 3.625rem
+}
+
+.date-picker-panel .btns {
+    display: -webkit-box;
+    display: flex;
+    justify-content: space-around;
+    margin-top: 2rem
+}
+
+.date-picker-panel .btns button+button {
+    margin-left: .8125rem
+}
+
+#recordList {
+    border-radius: .75rem .75rem 0 0
+}
+
+#recordList .no-record {
+    margin-top: 3.4375rem;
+    text-align: center;
+    font-size: .875rem;
+    line-height: 1.1875rem;
+    color: #b8bac1;
+    padding-top: 1.25rem
+}
+
+#recordList .no-record.today {
+    margin: 0 1.25rem 1.25rem
+}
+
+#recordList .no-record.today img {
+    width: 1.375rem
+}
+
+#recordList .no-record img {
+    width: 2.125rem
+}
+
+#recordList .record-list {
+    padding-bottom: 1.875rem
+}
+
+#recordList .record-list.noTouch {
+    touch-action: none
+}
+
+#recordList .record-list .sticky-item {
+    position: -webkit-sticky;
+    position: sticky;
+    top: 0;
+    padding: 1.0625rem 1.25rem .75rem;
+    margin-top: -1px;
+    font-size: .8125rem;
+    line-height: 1.0625rem;
+    color: #717783;
+    background-color: #f5f7fc
+}
+
+#recordList .record-list .sticky-item>.transaction>.total {
+    margin-top: .4375rem;
+    overflow: hidden
+}
+
+#recordList .record-list .sticky-item>.transaction>.total .collection {
+    float: left
+}
+
+#recordList .record-list .sticky-item>.transaction>.total .refund {
+    float: left;
+    margin-left: 3rem
+}
+
+#recordList .record-list .sticky-item>.transaction>.total span {
+    color: #000
+}
+
+#recordList .record-list .sticky-item>.withdraw {
+    overflow: hidden
+}
+
+#recordList .record-list .sticky-item>.withdraw>div {
+    float: right
+}
+
+#recordList .record-list .sticky-item>.withdraw>div span {
+    color: #000
+}
+
+#recordList .record-list .record-item {
+    padding: 0 1.25rem
+}
+
+#recordList .record-list .record-item-content {
+    display: -webkit-box;
+    display: flex;
+    -webkit-box-pack: justify;
+    justify-content: space-between;
+    -webkit-box-align: center;
+    align-items: center;
+    padding: .9375rem 0;
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(98%, #fff), to(#e5e6e8));
+    background: linear-gradient(180deg, #fff 98%, #e5e6e8)
+}
+
+#recordList .record-list .record-item-content.gray .content-wrapper .icon.wechat-pay {
+    background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFcAAABXCAMAAABGFileAAAAM1BMVEVweIPq6+26vcPx8fP9/v6lq7L6+vpHcExxeIeMk5z29vfY2t11e4XJzdDh4+VxeYT///+8DsiFAAAAEHRSTlNCsmrE9VvlACNN1Y8RfJ4y+aQOeQAAAuhJREFUWMPVmenSqyAMhtlCCZve/9UerEsVAUFx5nz50el0eZqGkLwQ8tnMqmEg920YrP3ByPpEPWFubBtxbQ/qnjxzFeln9sftiSWDWrldsYvHgWtJb/tyuy3ZLhQTV5H+XBu4/d0lRH2IfQEbAkHUG9zg7fCnuO9EoZqL4DyXQmhqGPThIjNUSzFuJiT3DvARF9nk5niywDZwn8t4grmxKdzioitRZzJr5zIqxysT0kMbF40Yq0yzFi7QSmzw2WA1l/GxwVLrl+QyPTYZxSouNGLHkWMFtx0rtLvmIm3FagMV/hrRBJW6Lh9ANlGpm6kQ0U/clgwLuw2XLa+FKXJdw2KtLuI33TUUuLWLtquTuBSSo8MRl8k6KmVrOMGv9ZkXuMdkEJdFLAT29zrkufyYl+dSKcSuUaA7lCef5aI8bns0EVhyB7uid3xXZ7lw+OcyIGDfM+S+P0D8m6PAHDfKsmmF0cs1rzzDcpNiOa6P/jXO2RkIU1h31HRDNTmuTn4QveZuv03BpzOF5rjxxzWkpI/PFVJa62+06efl0tmC5yvje24EWFQqrjIfgsPuSC1rClaXvxOXHwNbrPn5/CXnfctSpSDTj/L1geZ6eFQKkmZq69nmMFaJtUI9S3S34PC5FCRFRFu/ENTzmhZd7BeEifGmcSj2Y3+X68p9Hvk9LL3QD8TJO9i4QiX02Z1ISHetJ5E2r91Zs6tnh4AF67FKrzeCpcfK80UTWKaEqsods2qzImj1+vNQvbyWtOn8Fkuf/EEWG8+x14VCbGK9ZxyC/HF44zxP16/T6Z4kFpWaXtxsZM/dfNH6gNMdDOVay8m01pyay+uSLPcr3OWm9BCAMeZceAg/dAUtcF1psR/cGxnJ3X1qIb4OCHmB+//e9/2te0/7zr3yW9zhvfv1F8YX8zzgBYfVO/OWYZkP2f7YeZ5lOwd3m7/Zzt7+5pCdFm8evu3nm7bDgHNQ9jQ3DWRr1QOz+3Hs5x9wPpnS3kBkyQAAAABJRU5ErkJggg==) no-repeat 0/1.8125rem 1.8125rem
+}
+
+#recordList .record-list .record-item-content.gray .content-wrapper .icon.alipay {
+    background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFcAAABXBAMAAACD5sRfAAAAKlBMVEVyd4L///+Ci5R4eYqFipKYnKTu8PD09vb6+vr+/v7c3uDk5ei4u8HLzdF2Xh5IAAAADnRSTlMvswEZMzqElKCsYnRJVlxdhiYAAAL/SURBVEjH7ZdNaxNBGMcf6ARBk0MuJqsIofEDhPgFlpgUiSlESFWa9NCDsVsMmINtJe0hB9PGnAJaa0VowUqNCha0tKSHChZ8hQqtiuh3cWZ2d3Zmd7OZRYoXH0LIbn55+D+v2YFBYvEEeNnAAKViQN69UYonTbg/i2kDjoOMpXQ4IQVDksByjolrDEs6BuQHhmQMZFXghMQgdjQwRp2S0dNyuVyRhINhbKdcYLdUHPcDh47M8z+VgdKmZQl8Om2ZEy6WTbtO4Ai7LE864SvhXnbyL+HL86YtECI6zazmEuCIaaM0QHY5UvjfG/3g9aXmAn3RUjw07J47vOpav5t+4Ffu8Pdp0WYovO8doGknaI/sysHHaF/n5eBLtKFADt4g8GM5GFUJfEcODrZtmfOC6ZAru+4w+vK82+3sWXMmzJ8ID2t6xRbXjBvvydUZNxh9qrMCN16+Y9W/5QYX61w7KFM7KiB657ULHKzb2qeVD9mLzeAfjmaLrDviM2DiWGl0O53Nibbwk/su8AfsaS2tggrpMa1HM5swGg8vMnHoW5OxomQdDrWVJ9y9jxOMrh044CHbLGe2Gb30xg5fFXMPENhicSqVggi/tQUCKLhlBdk4FOBVfiq5xrBLofCGYocDVSHdcwUvmLYnV5/WoQXbZQTGSWi/qzYphmZbgEPk+2XINrlOrOTNbIipC1LHuE5Zvva1AwpfEAYe7zG6A1T8aYwPdJ4W/2I4onLsKIksqocRus3RK0airlnsMPGmzNpGk8HoazjC+itEv33EVlxJE2GyL5f1vKMcVcl3oaVEhwG3WesX1p35qbM3hD8kTYBRkeR9qrs5o1dtLi9kx1RieIZnxo8pfNex9qoCHLSmIzqZd/41ajwMObODGy9Uly2Z03gYgC6wBzs9dipp2hV+Pkqf93qvdiyUh0FVvR6IS9v7IP0UD5mEDxj5fIyXPyCc9wOnfJ5TBs/KSqYHMclcpHyc2grG4VGVcZw04LiUYvMMe65/jq0DL8a9TYdifwDbYgPu/HQdjgAAAABJRU5ErkJggg==) no-repeat 0/1.8125rem 1.8125rem
+}
+
+#recordList .record-list .record-item-content.gray .content-wrapper .icon.union-pay {
+    background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFcAAABXBAMAAACD5sRfAAAALVBMVEVHcEzs7Oz4+Pj4+Pj5+fn19fX39/f39/fc3Nze3t7////7+/vy8vLk5OTW1tYZSgMSAAAACHRSTlMA/pJjNM0XtCIrMBYAAAVNSURBVEjHvZc/j5xWFMWRbLkfKZHHC0RW0qawlThNUqwTKR8gitzEkVb5o9RJlMrVdhd5QJoONEyxlaUHW0xhaReYglTDwBQUkRgz09NkPkPufQ/YN8B6u9zV7sDy48zhvPseoChYD775S8tur/jDP79VmnrwbKRvseZzR/xxOrXPH37RwM/i48O2vANUTv7wVLA/Zx0pA3pl7D4Q8KcbZ34kDPZNNbQ5ekLsvbjj0BhQBnC59FdJVxj6wmgkPsMoXnYdDyvD7jG66DmWlGXYRB+/PuoJDysbfyvK821PGIaEAf45U572hYeVYXqq/O70hGFQuDp/ovzYF75FGWG9LwwDp1gA/z5WNnLPEDO1JSwXpxuP0IYp4P1IH+VUexuM9UJs4jaYwYrDE492BJyGQejxKgxYM74VeAmAygT8WoID1tQYDLfZ9uE88IWNmWdbjeddO4HQrzPKtDjTtLVnl2xT7FIqlhWN8k0QBkw39fWV3jTwd6t1/T0rGa67wih9VJ8XBKssWa/KECtgYQGGBNui3xC2jfUSYRb4c0yDjs28Aqwmura2oOI1uYE3RpglJlsZ9nEabtjWAshGqjHcYL6NObsLAVs1XLbJMd9B2GWrtVegY0Ab7zBOoSw8u1nIIlEx2nBSb+yyiDIm5eBCwI1np/TqiWhjGi67ABMTwxGkC1yjtDyCzokvmhObWPVP8OrAZf6cKwOdK3l27LXPR0JLKOeSLslMN5nNlSH1CsmzYwSXvDt5vL5T0Ilz1xPKMAlt2caUXfEhWXt8BJvhrpXBETbqRppRPOi3ZAUcwahsdVrUfsdEGHRSF8YpwlsULKOBvVD0SwubWZ0z7WQBwvW0gkk7gDbCYiozHHEOVxZu48AIZewytW4NHAfeC4iFIV6HkVIyBm1XQhmvDaQJXVtuloWKaHQslGnpGV5WLEFbdEbFRzCh1aJeVow+XjUnVaScENJd1+DGAkctC08jG1wZbpZC05bMW/VPJSlzA+fJeUKDUdS3hWwspGs7PA2uSqYn1xOC5/WikGrLVpQ+WmVuepbMEi0rckfbGFrsLMxFHm91Q4eabtKgOKBczfQoTTJ3EU2jdL+YLnN1E50vLU5LyvRbjsv98nUSvRuru6ty74VjU02i2QooCtkz2VYLNV/ONhf4Wa7UfLE1s/U4UwuLTMjKVCd66F6X+uXJHsXT3TVMlmWhLugKK8tqlI16lQuXM1Rc4mc5pq+fRGlRXpMLOgGOlM1RMS3y+SNzZOe2PsW4NR3Kjwil+Kw2DUP0Vr3sSoVTnDxbQnkzdCerRFj4bRtLVk439q13Pp6C8IwdmiLsxXYPET/UGjwH+p2mHsLMWwzRokNFa+BeHjIOMxZtb+nlSrjH5ym8odUwC2MJr4RwJf6Q7Dylm18DMy/S7d70E4GAoYWCaWDcjLe27Jg4nm7eEjcw7mT61m406/HZa9JxGcbdMNP3TgM6SIby0WOYVxhl2kjTsjDoHBiCb63/F45GvOIs0+6E6YZwOBwqvC05wV2wj91AMIV3J7w4WBbBON/nd9q4xvFDuL5V3AmTiwMtJm4PVjvwqoJDrTzrwT904LFQRmH5OYTDT5RXnf8UN8pqD/6yG7MIg9/3O6N1qjzvwMCVecwd+M2Z8ttx8hfQKpudHsVn/nvH519WPGZS7sLf43vKq9tinnb6AN9TlOfBQMyk3BmTt/S6dP8ooSsx2vjwMT+O2XvB39qeytJRHMfYzfR8fGz5rXghvK8OzArP6zh+Ub9p/qQGd02p8Lv2Hfbrl+H7K/rjtH3jVX757OP31Sefn3HsP31+zQkBPwjUAAAAAElFTkSuQmCC) no-repeat 0/1.8125rem 1.8125rem
+}
+
+#recordList .record-list .record-item-content.gray .content-wrapper .icon.mipay {
+    background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFcAAABXCAMAAABGFileAAAAM1BMVEVHcEz09PTb29v////19fX09PTy8vL39/f19fX09PTo6OjMzMz8/Pzz8/PJycnQ0NDs7Oxlbf2UAAAACnRSTlMAhP//G2c/l+vDUZSjVwAAAq9JREFUWMPlmdG2oyAMRRUFQRPh/7/2glUrqCFSfJkJ9XWvvQ4RKTTNVr2SxmgsLW0G2fdNWr00GqDroLg68GyZkJXBAO1+LNCmj2TxZ+QKBq2+3LYWdlGWG1ZWxAbwaqyqYgN4ybg3dbE+4+GTQle7QhLVdVdhpavrduC7WEJ9boeqMW9wQb7CBc/Vr/i2Db7CHf5BLuBIFRZxAd2YqQtClgtZqq/nXBb2IokcFzlY99gXxjLdHJeVwkW8GS6WYmlu6aTluOW6JPcHXZJb2mMZbnGP0Vxg9liyp8xyL1MQp7LLCL+lMMe91D1Tp6istZDhIkf2y7Xh57F2pLnAC2Ga5h384Tqa61i683wMIQxB58BMwXMTX3regNK16+NTSH23dO+4t7o20d19F91pb7NrLrDSPaawokf6feOl61PYyUubTQJILo6sdOfY1+sivT44TroBO8f9IOh1h91jab5Ic2907Rkb+0YfjjOX1rXHSTv4+hiAXH8ZPWa/ugffkVzXATO9ILY3LfEVQHMd902LyRbJ7xAgb3lMU5gS3ZSLnHDFNKe+qW7CvZ00e4zinMLkyO8xPFgYIrIAmuseYrcUHL1/oN60PQQxz6mvoPfVkEvBxuluvjazr36w4ETk3L6ale551mxuX42jc+NxZLkBfTFpKdfFdYk95Suy+2p4zA26jH01nrBXT+wrGPvqWFjcVCQsgLOvjv5i33EPM3eXwnk92ztCELUbC+SeP0DImJJdyaHEiPxzDf8fAREddeDtwnAOAUrOS+B2/LfnRmXct8773jqfHF7xVa+c/wL2Tf/SefUL5+th2ppGVhdeb0aqC2P7uXWq3MJgtkuyqmD4XpXJimAwh4uyesYYXew1/aABKry/uk0vONVgEH4rbVrVnKtXUrZDabVSHa9j/wAuF6U5UgQ5nQAAAABJRU5ErkJggg==) no-repeat 0/1.8125rem 1.8125rem
+}
+
+#recordList .record-list .record-item-content.gray .content-wrapper .content div,
+#recordList .record-list .record-item-content.gray .content-wrapper .content span,
+#recordList .record-list .record-item-content.gray .status {
+    color: #b8bac1
+}
+
+#recordList .record-list .record-item-content .content-wrapper {
+    display: -webkit-box;
+    display: flex;
+    -webkit-box-pack: start;
+    justify-content: flex-start;
+    -webkit-box-align: center;
+    align-items: center
+}
+
+#recordList .record-list .record-item-content .content-wrapper .icon {
+    display: block;
+    width: 1.8125rem;
+    height: 1.8125rem;
+    margin-right: .625rem
+}
+
+#recordList .record-list .record-item-content .content-wrapper .icon.wechat-pay {
+    background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFgAAABXBAMAAABy7Z/SAAAAMFBMVEVDrzb///9HcExYuU1MvUBEsjdFrjbx+vByxGnI6MTg8t6W04+v3qpDsDZDsTdIsjztihy5AAAAEHRSTlOzswCzEzhQs7Ozs7OzlXIijPkFBwAAAq5JREFUSMe11zFvEzEUAGDTo3AQUrA6JLkwoKjK1vZQhqZqhip/AJSBH8DAiBSxkKjDRRlQBUNOHUB0aSYGMjRiKZmoGCiwoPyCCDEzsCM4++yLz372+ZB4Q5VePjl3z37vbFQjsf34GzJE8WeHMkT+bCxQRqx1OK4ji/jB8MIGF39RvImsYoXihR1G7QjXLS2aR3jfFl+JMLKOXLidBz9EW/Z4BW3a48t58E20b49XIew+f1OanPk22Hk/xiT6ClfwXoiX0fON2OliMQ58A3Y/4XSs63FhjOXwtDjEahxpsAtY7AUgvoHhAPG5Bn+AsMbi2wCe6nAvULDb1dhSoI58XWO9d8ADXtKMS6wv4xC0T8lXg4qEC6B9S8Z80cUSBm+ZLlGyECUM3EWfzsYh+ThK4y78aCyjT9KY5enL0h7TYpjRf8oQLqMZsxM6Fc1QXNUcO/HFCnLjr/txannhlHwRu8nU7tA0xNO2l9xUIGK+lqMnaWHvIv61wfJpT0XM01yNPr9mldQSMjQS8VV+c0KRidWbwtf41aRR7KrVwnEhdXMkaekiC4BsYHzC8AzrscOvxquxKS2VEjSDbAxH7mIVDR6lJiNV4AlO8nQLOc+UFXiSxkkjKJPKkOM0jZPRvDO1lbLsJ9gZY314cnVPDbgq47sGfCTjQubAAnbOtXhd7aK7WjwC+nOosa+gZn6owQGE3ZdwL4ffVi2w537UvAenpr4v4x3VXmjfsAO1mfvWr+Pe0LCFIAt5sszJwdC0OaGg+ZntZL4OkRkfx+uk0Wj4GRsqB1d9692XK0xA9lbN/4d9nR7fyYNzbVy38uC6PZ7n2Zl3/tsBIcLW6ViN8LYt/k7OVvftbJEexCyTN4/Pg1ZDr7HD44ZVkvkZtvY7MxPt5MBbq9178MgUf2L1F4HM0zNId0zXAAAAAElFTkSuQmCC) no-repeat 0/1.8125rem 1.8125rem
+}
+
+#recordList .record-list .record-item-content .content-wrapper .icon.alipay {
+    background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFgAAABXCAMAAAC3HXLTAAAAPFBMVEUAoeo3te8cq+zf9P1kvOPz+/8DoOn///+/ys0LpuyS1/ZYwvC45fpzzPSdzeN7w+MUqOs2sut0weJ4xen+8o6fAAAAFHRSTlPMzMzMcMzMzAHMzMzMzB5ArY5bgFtgpOgAAANNSURBVFjD7ZnbluogDIYhSGw49OC8/7tuqE6hFSgovdhrTWaWN7g+Y/rnIGFDsOlnmeljm38eYwRjAbsQsY8NGXPw23gEj8t69r3RYwceZ9bNbjGY+nEZLRt4BNbVbr/guS/3GWcHvhHrTR5XMOtv5MHjVeDpKrCuSixtf60KfBvYyKveed+syuVlYFONiJFvXFkFngd2Y1eAWSWYXQX+8/g/8RhSFoFTx1QDNiJhMmRe6lhRDfjebqYO7Nx7/w+WOK7xGK1KWeCmTvVVqsC/zGsG49Ei8PGoBUz6aDaAj0e8AcxFQ3JYqgdDA1hAg8dg5JmFfKF6MBI/tY2sqU1uWP4LKqHvdHz8WHURmLbaKrAnGFUIMesJDnIU0ARGIuDctTJKp6yVJ2JLgJGskfsMMIrTjo8y35JyYOIqkV1SKA4RejvQWAtWMpO5nk14LM5QVTYRstgNrzRgKFGmrh5jCO6hHuxCrsPbbBUYQb6gQllXZrVWxhS/goEaMFr/DV0k8dBKtBKymRuBuc9SyTFRjsAk0RaoBuwfnMgFjdsEWRoLuZYXwF70tuABkk66LTQQlsBUVOVTvslgrwLPg73oJZ1d+6TT8i4tzw6FvnKf/pjFQvcWRu8Kyi+YVL60Rj22PCTHjm9gNxWfgc8zXlgO7WCKWj7Pf8ZaCSkGn8SYogfn5GsL2S6N0pvcVLFW7eNg0FcWWxyXNlVYP0cWBBE5aPjrbsSIczCDeyHzKPYuKic+Z87AzJeKzLhE8aMyu+6HkIl1AK9FM9XDXDTj5wLH03REAvipfqNhxybQsUc+6zFZRfJg1OLpEt/KlZsudqqSIiP1NSIyA3ZjyG/WWz+suB/mrjft5cnzuiG9D/aumSpRbNBnF9fuYQS3d3MFFTRvdMXVqu+PKbBrQWntSGmo6qLd/W57NYPjJOQzVR6KirGIDRf4SL7TvA+FyK1rymuw3KsQhlPjVgB97x3Y4/3rENfWDStGKV9fP1g2uGEkfbeJ9O0l+Jy7jf12J7LU3h+3X/9feON92eX/QP3BsIK7x4Lm1+ZmuWC/8lxidd4JTWE7NveVWrQo7BcNmParzamTNmB825kOE4ev6ADzmFrG+o3h9Lh9bI8pXvIO/wDdPUiMq4S5mgAAAABJRU5ErkJggg==) no-repeat 0/1.8125rem 1.8125rem
+}
+
+#recordList .record-list .record-item-content .content-wrapper .icon.union-pay {
+    background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFcAAABXCAMAAABGFileAAAAtFBMVEVHcEz/////////////+vr////////7qKr7jJDd5ur////73N35zdD////////////////////3Jh70IB77Kh3zHh7tFh75KB31Ix/vGR/9MB7xGx8BamX/+fkJL2jyW1/xJin6XlP61NP4IBb5NSv88vL86er74ODzLy/5xsbyOTn3k5H1bmz2nZ3yT1H5u7v3r6/1hob3p6XY5Ob0eXjyP0H0SUfDGyygx8UhfXeHIkBLlpFkxrL6AAAAEXRSTlMAuxSfeljgiorlMIqKID5BOclT1cwAAAfuSURBVFjDxZmLdqM2EIZx4qQ9u9sLBmwwVSFgIcQdCvT2/u/VkZBAXLObnp6OvYnXl4/fv2ZGQ9C0Kc7PJ0Kb7O3bI6soOT2/aBvxdH7FZfswzTsP9suUcZMR3sJLyO4QxgVuIdwgLMuIa4pPK/LLa1Q/7rOAI5gTeqAPR7ioYfMw4G5YSYpPP6jYs6735n0ZE/Zm3ibRG1iOZrIL/fVHhauj1FwQuV5+Z1DJvXDsbRMLog0rR7qiNluJNVWxA9WU2A21BsNyp40afRLe6ujYA8WEyx53uDGwj16fOPdVT5dMxQZOvXPyZYGdeSvDshr9mSdY1O+bMHh7rHUygWMtO8Pc3drcMwFkMupdLtnMXVs1YbQXwo0b5vDrYw0Vinl63S9S7a4JqloIwzuDXPx+JtxWmbDMLxVruQZ60p7L+zpz5YINas3jvB3BEmu59Cft1N63wIMLD1G6l8WqzeQu1DJy/qIFj5kHWybsWgtVMPPWlf+Ks1aa88Qdm4zMsMvjbdsB2/bbWM0E+C/HWlb/WWsk97EKoTfX89nTscQmFSqlCwybotJnal03+aIJG0x9HagOGbdGyxeCAnBJpes4V7yNqU4SjnXj7zRpAVpzMePCkqXL11AJqwVYvfFZpxErxrku5/oj914Hq2geot9WVI1A1yPLTtiB/dju0lxEE+m4av0Fd73piIIog1ou2bBoPnBjZkLjE2oEi6/SOAp3tpvN6JcLAEKOfXgeT64YuAPWA0NaEskAuyJazPWqmauKVriVjvg+BlzMve0IcK04EdEHOim4Dc6o13xs7t+Py8iNqxLBdjVwmVrDKDBwjdgbilesG1AdhZvrW4lGRy4Y2nOwwbmYZUIPXCuheubyclhzzfsD65vgUHBZVmXwQWZFIhLM5lwPTM148QquI7nc0CRNU3h/ns7iTehly4+gZikoDgYTDKHX8iIgs7TlXMcZuUMnhwkGuOEiBq7PsA2sWUKRNEHqtZhisMJ1FtwpERjXvIlsGBsNcFqGZclrgJvMhN6a9Fou4VYs9Y7t9g1enurhkT0mLtKbi8GSN0wQyPcClWt5ACb9iiviQXT0NmGJjt9CwQ3t2Bg3h9ggUMesKXCuyzqNh2m89EGURJjBQR9TOUAVVPbIVTZeg9WxxUZIqRdyq4hVf6+K3hDWJg0n7hvWoz5ccPlWxrm8e496eZFtrNuNu6u3SveGFUINJC7jWrOhJplxB6oDaduRtd6b2UMGYaVJwlqgFLj2xOW3pqKSW3C9Q/htBYlNYlUv38rudFVtzIeJO4j1hvpWfBj0tvz5ylnpvYU9nXV1+mbwhktJbUxjQkwIqQq+O4LGoSsyblcSEnTXAcu5t2FL59PHLEKx+/IcG2ewOBabLlswX2Ih4tiXWMFVp/yNMcGYTUvT8GG50gR3wDkSK/Wa0yB62x1v7fkMZsn8GtS6zkSdfDge8pVpfAPLmRI744phfDEvzeVuqLUUuXPswN0Yx1MS2m0uekKPEnW+NTKMcDZ6q5ogsVLvasClKLSbNBxgfjucUQq1flPWFekUE5ZqFb3z+TYh2PBpZnVenSVG50F2sQd+UbcebGPF1Y88v4WnEq9w3IIV75Xdtrhq4mY6hc0gLlDgEWRQ7FNclMjNUZ/qfoG6Pq/8Lulp1GPipPi6UDtyuVplFK1RY2e6kaEKoDGJYP5wW+RSfC2Qn+kRxonjem0QxUHUEXJdqBXc5TAOmy+q4bTRSlGdkKhHQY5aq0Y+wW6G3BTlqecmDSF64FdRjetRriOPMOi9zM4dWEtAeYtJHOA+Q2WK0gblGaag2i8RSIQJDH7CMXInQ1F2nXsg9W6UQw2ZFLUdoFOcVjjzIoSDosYp+94RYW2xwlUQtU6PS19yBy+cibuqXmimeWF0TW1neVHnnZFVee/C4zhPu7xmCZaktKoT6OXegBWKBRm45k7tiiqz94qXW9oFsGgjdZa/j8cEXZ3420etBsIr69EE8ZO3yQS4WZZsnvcve4K1xg7N8SotkE2nqz3GZWMZTKT29knknglKY5zsvTqxx847JFfHZbdUa+xiXYG9OotyAKmUD6YjF7bS3DtojAPVWrZxIVXcHa8hA0zhctXUS/yvN0HR6ydeoJyNLbiwUwd5F9sHJkxqxzKDcaFrgtk53orLDClriVYzwZp2SNVbBk1ptGBscTk67RPfsOZyLTXDht7oJ0W+gu5zpSlRkNdZ0SWxz4K1BYc9SLoiq/MgQrufPOaKxYwILSs48ajrOk3zqqQkwu985mu4H4n/m4v+Cy4mfL78bRb4Pe61fQdLefb//usQv4j484/3uO/prXlR/bXk/vZvucU299CI7DstL95ZsqGxLLC//HHs7xetTL6G63yTDcj7rAX+h7iHNmDvrJ3e8Zcyqvv7N9kQ5C/ac3V4aJRflTT7Oi4qg5+1F1wdvidT02HkHtoLM5umaae4PPpKPt9wl+lwiE09dj3npe73nUDVdavaDrm0qPiFhqhL97ktz4ZVVRxx2+F6gHbS62DvPcTfqoo//z5YkKrSz5z7wysqyM67ym0b9tMB0QKdxPWhH/W22Fm7bXv/3k+HpsjFZRwWCAb0AG83X/4nzVnv3e3yEW0r9KpcJ/v0qntFHv27zQdFaZHpp6fZVchnnBcpJejDUBSUtdfg8+oC56czprX38UgpfnnSNi+d/vRy/vzl+4/El8/nl59V1j+hoLs7+SRqJgAAAABJRU5ErkJggg==) no-repeat 0/1.8125rem 1.8125rem
+}
+
+#recordList .record-list .record-item-content .content-wrapper .icon.mipay {
+    background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFgAAABYCAYAAABxlTA0AAAIo0lEQVR42u2daUxUVxSAB2SdReoS0xrTGlPSGP/YWqt/qknV+NPGNDVNqiBVwZq6FNMa6kIaDZI2tNYYl1CtC6agsmoVUBRwwaK0LG4sAmORZcAqRRzW03N4jg4yw8y8d9+7z/Hd5IRkEjL3fXPf2e655+p0LgYA+GRn58+6cOFK/N+lNwtu3a5prKqutVZV18GrJbVWenZiQCyICbHRiR2xseCbnVsYUV5xu7LF0gZ9fX2gDWEQC2JCbLJz8yOIlUdwT5/Oe+d6Sfmfj9r/02i6GMSIWBEzt+Dm5hbMx9ehvb+/X6Pn5iBWxIzYuYRbb27o0pCJG8TOKWRa4vQraJikDWI4RF2QkiY9oqkFNuqCWA4yfOQtaAaNreEjps/8XHI31DzhHvQQ6x4DlD0CKH0IcLcDwKpyr/EpUx8dOcwW9OnUNLoQ3slGgKgSgCm5AP6pALoTg8UXPws9AxB+DSD5HsDjHnUBJj+Z2OooKlFLENGG/suWmwDjTg4F6kpMGQBrSwHudaonGCG2Ogr9uE8GbeuuGoDRWZ6DfVH06QCxN4W3gPcgtjqKr3lOotkKMKdAOtgXZepZgErOdpvY6iiJwWsCFWi03vyDPVybjMoEON/C1Se26ihTxGOQNzA2Sz64NglGlZHTzAtwHXABbEaXa/wp+eHaxIgGsOTfVwQwGZ8P8pSDa5O3TgM86HoFAMdUKA/XJp9d9XLANx45DhqUlOwmLwb88WW+cG3uW1+/FwImr4E3XJuk3/dCwJEl6gE8r9DLAJPn8FqmegD7otx/4kWAybCoBa5Ndt/1IsAbyvmBDE4DCEHPJeQ4wEj8G/jUi1l09SUH3IX52ewyhJuM+YZkZWAGIkTDHsyobUOw0fg3Cj//fKgYV2GY/i2mN48ApGE+ucP6EgEuNaNB2486d8XzBzL9Lh9UHxQDfp/+OwC/cMdAXYk+AoOQXQCFd1QM+MY/6Of+NHTy/uHywTX8inDWiYPqTGZvBbhUqSLApApiUhBkmOMJmyLZgw1AlWPcxBasvfigLE8EaO/kDNjciombzcNPNmQVY6N1AAFHygfXXkLXCyqPC+DSekw5fuV6kiEr2QIev1YZuDYZuRzgbIXCgCtwF3fsSvcmaFjGNnk+baOygEmClwLk3VAIcDNt86zxbIJBx9gAno555IU/Kw944E3ElXyrQWbAlIWaEyfCDTrIBjDlM+Kz+AAmmfwNQGeXjIB35YqbmGEHG8CZmAUrM/MDTBJ9VCbAbViuNDpKpCO/WTrc108JJVRUnzhtEz/A5I7eaZQB8JYT4icVhPrL97g0wAl2zj+FtzxX8ZI9jAFTMDFupbRJGRPFww3NBui2q9ShVTxrKz/AAbiKmx4yBHzyL+mT0seIg0t7eFcd1CbWWtCyr+AHeWcOQ8BR+6VPaMQSVBVJngM+Uu98XuexBi0wnA/g+fEMAU/ZwGZSxo2erdzD9a4fgqIs0zLlARvxO3v7GADu6XWeyPE4ibIYoyI3dPHbZxyrBWejEq36dA6exd0WBoDrLGwnFfQl5m1THIOluuDttwGe9HoellIQ9BtWaU5apxxgUlGSAcvh2BufGrwg3M557xymBq8DpDYM9hTEDgJ9DvMGaw8DzIyVV31kXGcAmLJmckyOkkXv4i7EggSAuEzhh2R1yKka64J/qRJKpWaeR5WDdWnGWPbPkH6NAWDSM0q9cgQ8pUg86HyL82JuPwx0gtawna+rNKZbgK3dGIUtVtZ4fPi9oPvdHa2YgPmkyI105yF8ljB283QVMrvtpoVGc0gPrnBtRAZsBEZUEzyokjdsY2SsMUfc3csIcPhePs48BRHDvYblDz2vGKL9PP8vpM+NQnVmgUZyEb+QlLyAykbHamGCyPMdegZ5jLgshoAfW/lESzZ5f9PgqImM4MIrEo56HZU2H7JJtS0MAdOgKhieKcJ9eXbhcTOD83QSNk/JtWSeD77XJlTA8AI8cR2dnhTm8hGDc3X6ePHhfnGNTFtGsal8VzEZPDoIzmL7SZ8obg5he2Xck6PE+9QYfoBXox+7o4pR2ZWIxUJ1ILR1Juu2fSXW+o6K5AN4xhaAT4uAWZ2F3oPnCECX8aKHxYGiC08oAAiO4OOyzWB4xs74tfteQ9IlhUuncsqFpLPSkMdlsAM8wo3Uph+G1gdFnumQXPxXgv86UaFaMVpFph8Zn9VwsYLHRAlF5FzLVx90CMXLcsKlJH1wIrAvgx1mBc+NE6pHVVOATb80aw/DH/W8Af1Vv2MgSwG3ycEKnoSfJV1mk5tmfoSAdhPSMcs/b7u0FGcQvpqGH4TEjKxnOuxsCO1+HEJd282w94+sh2DuY/uA3bgdtGgnwBurhQjIaXkoZrf0WOysx9fScECZAzOj04WQNwF3O2pk6ieh2DGu9ag+/HFHwYT5jEA8V+GLpUcj9glVl8YUPse7Flx+yY9x2Y+0BvUdREyo8iLAHT1CNyg1Aa7p8CLANGiHVy1waadZiaEo4MJW9QA+VO+FgGnMzucPd9IZNgUuqgR8qVU4+soTcJJZscfl0xSJyqR4wZ1bwK56SLWA27uFinWl4Y7BXWCzwo1DuTWmo/49IzOUg+uXqmy3Ke6AbTvDwQr4xtQ+5iCfR7QB5tccNA9rC0JkXMkBacoataGAsTko7/a2t/Deg8k57OFSb8yLrcB1DLS3VUOD5k4soosuY9MVkNzAsGKhmzbvMdCgWU0txu9g4fSSYuHVFqNrKUNW/EAVj/K8xTg1cm9RWZP8JuxptrMaj0pdFFrTOoNKRxBmYXQYh+c6ajtU9QjPm+SDyq956O0XqnkuWIRGyzlNgnGk1d6t4qsenl3zoF1Uwn4IF5XkR2hX7cgwHF61o10WxdT3bXd6t5x23Zm0Mex1Z9qFfdLUglsX9mlXToozaB5dOeno0lSLdmnqkCDC8uzS1ELPL03Vrv1ld+3v/ygyF5Bme0yUAAAAAElFTkSuQmCC) no-repeat 0/1.8125rem 1.8125rem
+}
+
+#recordList .record-list .record-item-content .content-wrapper .content div {
+    color: #131c31;
+    font-family: Jinrong-Bold;
+    font-size: 1.0625rem;
+    line-height: 1.25rem
+}
+
+#recordList .record-list .record-item-content .content-wrapper .content span {
+    color: #a4a7b0;
+    font-size: .75rem;
+    line-height: 1rem
+}
+
+#recordList .record-list .record-item-content .status {
+    padding-right: 1rem;
+    color: #131c31;
+    font-size: .875rem;
+    line-height: 1.1875rem;
+    background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAAfBAMAAAAYfoC6AAAAKlBMVEVHcEy4usG5usG5usG5u8O9wse5usK7wcS6u8K6vMK7vcG7u8O6u8K4u8LztzLnAAAADnRSTlMA/+XtlgikF15QQyeIzfw5xJ0AAAB3SURBVBjTY6jxZoCCRKEJUJahoCaUdVBQaAGEVSYoqAVhsScKCjVAmGGCMJWsjnCVJYKCFgEQlY5wlWyCgpZQlc6CwlPRVQK1C0NVshgKakNY3BcFJdHEEOrgehHmwe1A2IuwAe4+uJsR/kD4DeFfRBggwgUeVgCA/hsqy7NAFgAAAABJRU5ErkJggg==) no-repeat 100%/.375rem .625rem
+}
+
+.record-nav-wrapper {
+    position: relative;
+    width: 100%;
+    height: 2.125rem
+}
+
+.record-nav-wrapper .record-nav {
+    width: 11.25rem;
+    left: 50%;
+    -webkit-transform: translateX(-50%);
+    transform: translateX(-50%);
+    position: absolute
+}
+
+.record-nav-wrapper .record-nav li {
+    color: #b5d8ff;
+    font-size: .9375rem;
+    line-height: 1.25rem;
+    float: left;
+    width: 4.375rem;
+    font-family: Pro-Medium
+}
+
+.record-nav-wrapper .record-nav li:first-of-type {
+    margin-right: 2.5rem
+}
+
+.record-nav-wrapper .record-nav li.active {
+    color: #fff;
+    font-size: .9375rem;
+    line-height: 1.25rem
+}
+
+.record-nav-wrapper .record-nav li.active .underline {
+    display: block
+}
+
+.record-nav-wrapper .record-nav li .underline {
+    display: none;
+    width: 1.25rem;
+    height: 2px;
+    margin: .4375rem auto 0;
+    background-color: #fff;
+    border-radius: .0625rem
+}
+
+.record-nav-wrapper .filter {
+    position: absolute;
+    padding-left: .8125rem;
+    color: #b5d8ff;
+    font-size: .8125rem;
+    line-height: 1.0625rem;
+    background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB8AAAAfCAMAAAAocOYLAAAAP1BMVEVHcEz///////////////////////////////////////////////////////////////////////////////9KjZoYAAAAFHRSTlMAHKuhCfqAFtiFZzRwyrMlRfKMmhptfDYAAADISURBVCjP3ZLLFoMgDEQHlII8RDT//60NaC0quuum2XDiTSZjANDeKGqFMl4DWrZpqZAa/h5zgYchSk63IjIySEQL2jFzKwIXTU08cX+A5THGNbBjTBZ9xwZDvOKw+keUXBdcQ5zG0iZGuiisWGzZWCf7bLmnIu9QigNWXdVQPOwKRXyp9dDnguz2Iz73R7/5mnjbeRj/WDpjHsEml/yVF6YGfd2XJ+oyH7bzHPbLX/hD7lIq+7vjmKx+5Fv8mvM9+ScugqmezhtQxxSJw8G7VgAAAABJRU5ErkJggg==) no-repeat 0/.625rem .625rem;
+    right: 0;
+    top: .09375rem;
+    font-family: Pro-Normal
+}
+
+#notice {
+    display: none
+}
+
+#notice.show {
+    display: block
+}
+
+#notice .notice-bar-wrapper {
+    position: fixed;
+    top: 0;
+    box-sizing: border-box;
+    width: 100%;
+    max-width: 800px;
+    padding: .4375rem 1.25rem;
+    z-index: 99;
+    color: #faa703;
+    background-color: #fff5eb;
+    font-size: .75rem;
+    line-height: 1rem
+}
+
+#notice .notice-bar-wrapper .notice-bar {
+    width: 100%;
+    overflow: hidden;
+    white-space: nowrap
+}
+
+#notice .notice-bar-wrapper a {
+    position: absolute;
+    top: .4375rem;
+    right: 1.25rem;
+    padding-left: 1.25rem;
+    color: #faa703;
+    background-color: #fff5eb
+}
+
+.point-progress .text {
+    display: -webkit-box;
+    display: flex;
+    -webkit-box-align: center;
+    align-items: center;
+    color: #131c31;
+    font-size: .875rem;
+    line-height: 1.1875rem
+}
+
+.point-progress .text.doing {
+    margin-top: .3125rem;
+    color: #b8bac1
+}
+
+.point-progress .text.doing .dot {
+    background-color: #b8bac1
+}
+
+.point-progress .text.doing.active {
+    color: #faa703
+}
+
+.point-progress .text.doing.active .dot {
+    margin: 0 .9375rem 0 -.3125rem;
+    border: .3125rem solid #e5e6e8;
+    background-color: #131c31
+}
+
+.point-progress .text.done .dot {
+    background-color: #131c31
+}
+
+.point-progress .text.done.active .dot {
+    margin: 0 .9375rem 0 -.3125rem;
+    border: .3125rem solid #e5e6e8
+}
+
+.point-progress .text.done.fail {
+    color: #fe3d28
+}
+
+.point-progress .text .dot {
+    display: inline-block;
+    width: .3125rem;
+    height: .3125rem;
+    margin-right: 1.25rem;
+    border-radius: 50%
+}
+
+.point-progress .date {
+    padding: .4375rem 0 1.4375rem 1.4375rem;
+    margin-left: .125rem;
+    border-left: 1px solid #131c31;
+    color: #b8bac1;
+    font-size: .75rem;
+    line-height: 1rem
+}
+
+.point-progress .date.doing {
+    border-left: 1px solid #b8bac1
+}
+
+.point-progress .date.no-border {
+    border: none
+}
+
+.error-wrapper {
+    position: fixed;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    z-index: 999;
+    background-color: #fff
+}
+
+.error-wrapper .error {
+    text-align: center
+}
+
+.error-wrapper .error-img {
+    width: 7.6875rem;
+    margin-top: 5rem
+}
+
+.error-wrapper .error p {
+    margin: 1.375rem 0 1.8125rem;
+    font-size: .875rem;
+    line-height: 1.1875rem;
+    color: #717783
+}
+
+.error-wrapper .error-btn {
+    width: 9.5625rem;
+    margin: 0 auto
+}
+
+.app-face img {
+    width: 100%;
+    margin-top: .8125rem
+}
+
+.footer {
+    position: fixed;
+    bottom: 0;
+    z-index: 998;
+    width: 100%;
+    height: 3.3125rem;
+    background-color: #fff
+}
+
+.footer ul {
+    display: -webkit-box;
+    display: flex;
+    justify-content: space-around;
+    -webkit-box-align: center;
+    align-items: center;
+    height: 100%;
+    font-size: .625rem
+}
+
+.footer ul li {
+    color: #5c677e
+}
+
+.footer ul li img {
+    display: block;
+    margin: 0 auto .1875rem;
+    height: 1.1875rem
+}
+
+.footer ul li.active {
+    color: #2184e7
+}
+
+#service-agreement {
+    padding: 1.25rem 1.25rem .625rem;
+    font-family: Pro-Normal
+}
+
+#service-agreement h2 {
+    margin-bottom: 1.125rem;
+    color: #333;
+    font-size: 1rem;
+    line-height: 1.3125rem;
+    font-weight: 400
+}
+
+#service-agreement h2 span {
+    float: right;
+    color: #a4a7b0
+}
+
+#service-agreement h2 span.number {
+    font-family: Jinrong-Bold
+}
+
+#service-agreement h3 {
+    margin-bottom: 2rem;
+    overflow: hidden;
+    color: #131c31;
+    font-size: .875rem;
+    line-height: 1.1875rem;
+    font-weight: 400
+}
+
+#service-agreement h3 span {
+    float: right;
+    display: -webkit-box;
+    display: flex;
+    -webkit-box-pack: justify;
+    justify-content: space-between;
+    -webkit-box-align: center;
+    align-items: center;
+    font-family: MILanPro_MEDIUM--GB1-4, MILanPro_MEDIUM--GB1, system-ui;
+    color: #a4a7b0
+}
+
+#service-agreement h3 span.number {
+    font-family: Jinrong-Bold
+}
+
+#service-agreement h3 span img {
+    width: .875rem;
+    height: .875rem;
+    margin-right: .4375rem
+}
+
+#service-agreement .subinfo {
+    margin-bottom: .875rem;
+    color: #717783;
+    font-size: .75rem;
+    line-height: 1rem
+}
+
+#service-agreement .confirm-identity,
+#service-agreement .confirm-rate,
+#service-agreement .confirm-shop {
+    margin-bottom: 1.25rem;
+    border-bottom: 1px solid #e5e6e8
+}
+
+#service-agreement .bank-rate h3 {
+    margin-bottom: .5625rem
+}
+
+#service-agreement .bank-rate .rate-line {
+    width: 100%;
+    height: .4375rem;
+    margin-bottom: .625rem;
+    background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAA8EAAAAWBAMAAAAStYM5AAAAGFBMVEVHcEzm5+nl6Ojm5+nq6+3m6Ovm5+nn6epSLsURAAAACHRSTlMAqlnODyd/QwuL5CQAAADaSURBVGje7dlBC4IwHAXwIZrXluVZNPoAgnZ1RXVV+gKN7C74/SEkzFkLuu7xfgcRj0+e/rcJYXWoBCELog1DgKYemiWGrnBZqYIxAOtbIXTHHGCF+TBr7RkEboWT4ZqxxKi8/LVgWjEKUOMfuL8xC0iL4j1RMwxEvq7H26ZlHIDUtJt1khXzwKtwZLzV45qBwGnMl+rLmomACeLZh/nMAwg01/kKyb+zxFjC+NfSiTBk28/Bi3uXULzv04YLDyCgKtz994xckk52tr6GZUoOS4Q0WAfnRpLDlk9Wt26ScMP6JAAAAABJRU5ErkJggg==) no-repeat 50%/100% .4375rem
+}
+
+#service-agreement .bank-rate p {
+    margin-bottom: 1.25rem;
+    color: #717783;
+    font-size: .875rem;
+    line-height: 1.1875rem;
+    overflow: hidden
+}
+
+#service-agreement .bank-rate p span {
+    float: right;
+    max-width: 7.5rem;
+    text-align: right
+}
+
+#service-agreement .bank-rate p span.number {
+    font-family: Jinrong-Bold
+}
+
+#service-agreement .dialog {
+    height: 90%
+}
+
+#service-agreement .dialog .content {
+    overflow: auto;
+    height: inherit;
+    margin: 0 1.25rem
+}
+
+#service-agreement .dialog-wrapper.more-radius .dialog {
+    height: inherit;
+    padding: 0 1.6875rem 1.25rem
+}
+
+#service-agreement .dialog-wrapper.more-radius .dialog .header span {
+    font-family: Pro-Medium
+}
+
+#service-agreement .dialog-wrapper.more-radius .dialog .content {
+    margin: 0;
+    padding: 0
+}
+
+#service-agreement .dialog-wrapper.more-radius .dialog .content p {
+    margin: 0
+}
+
+#service-agreement .dialog-wrapper.more-radius .dialog .content p.ruifutong {
+    color: #00adff;
+    margin-bottom: .625rem
+}
+
+#service-agreement .dialog-wrapper.more-radius .dialog .content p.suixing {
+    color: #00adff
+}
+
+#service-agreement .dialog-wrapper.more-radius .dialog .content p.suixing,
+#service-agreement .dialog-wrapper.more-radius .dialog .content p.title {
+    margin-bottom: 1.5rem
+}
+
+#service-agreement .dialog-wrapper.more-radius .dialog .content .btn-wrapper {
+    margin-bottom: 0;
+    margin-top: 0
+}
+
+#service-agreement .dialog-wrapper.more-radius .dialog .content .btn-wrapper:first-of-type .btn {
+    margin-bottom: .8125rem
+}
+
+#service-agreement .dialog-wrapper.more-radius .dialog .content .btn-wrapper:last-of-type .btn {
+    margin-bottom: .3125rem
+}
+
+.rule-wrapper .rule-content .rule li.mediu,
+.rule-wrapper .rule-content .rule li span.mediu {
+    font-family: Pro-DemiBold;
+    font-weight: 700;
+    font-size: .9375rem
+}
+
+.rule-wrapper .rule-content .rule li span.phoneNumber {
+    color: #3370ff
+}
+
+.status-wrapper {
+    padding: 1.25rem
+}
+
+.status-wrapper h2 {
+    padding: .625rem 0 1.0625rem;
+    color: #131c31;
+    font-size: 1.5rem;
+    line-height: 2rem;
+    font-weight: 400
+}
+
+.status-wrapper h2 span {
+    font-size: 1.375rem;
+    line-height: 1.8125rem;
+    color: #131c31;
+    margin-top: .1875rem
+}
+
+.status-wrapper h2 span.red {
+    font-family: Jinrong-Bold;
+    color: #fe3d28
+}
+
+.status-wrapper h3 {
+    padding: 1.875rem 0 .375rem;
+    font-size: 1rem;
+    font-weight: 400
+}
+
+.status-wrapper p {
+    margin-top: 1.0625rem;
+    color: #717783;
+    font-size: .875rem;
+    line-height: 1.25rem
+}
+
+.status-wrapper p.small {
+    font-size: .75rem;
+    line-height: 1rem
+}
+
+.status-wrapper p.black {
+    color: #131c31
+}
+
+.status-wrapper p .bold {
+    font-family: MILanPro_MEDIUM--GB1-4, MILanPro_MEDIUM--GB1, system-ui
+}
+
+.status-wrapper p span.red {
+    color: #fe5341
+}
+
+.status-wrapper p span.blue {
+    color: #0097ff
+}
+
+.status-wrapper p+p {
+    margin-top: .8125rem
+}
+
+.status-wrapper h4+p {
+    margin-top: 0
+}
+
+#statusCheckBack {
+    padding-bottom: 6.25rem;
+    background-color: #f5f6f7
+}
+
+#statusCheckBack .check-back-wrapper {
+    padding: 0 1.25rem
+}
+
+#statusCheckBack .check-back-wrapper .handheld-id,
+#statusCheckBack .check-back-wrapper .shop-pic {
+    margin-bottom: 1.375rem;
+    background-color: #fff;
+    border-radius: .5rem;
+    padding: 1.25rem 1rem
+}
+
+#statusCheckBack .check-back-wrapper .handheld-id p {
+    margin-bottom: .8125rem;
+    color: #131c31;
+    font-weight: 700
+}
+
+#statusCheckBack .check-back-wrapper .handheld-id p span {
+    font-family: MILanPro_MEDIUM--GB1-4, MILanPro_MEDIUM--GB1, system-ui;
+    color: #0b204b;
+    font-size: 1rem;
+    line-height: 1.375rem
+}
+
+#statusCheckBack .check-back-wrapper .shop-picture .subtitle {
+    overflow: hidden;
+    color: #0b204b;
+    font-size: 1rem;
+    line-height: 1.375rem;
+    font-weight: 700
+}
+
+#statusCheckBack .check-back-wrapper .shop-picture .subinfo {
+    margin-bottom: .75rem;
+    margin-top: .25rem;
+    color: #7c8495;
+    line-height: 1.25rem;
+    font-size: .875rem
+}
+
+#statusCheckBack .check-back-wrapper .shop-picture .pic-num {
+    float: right;
+    color: #717783;
+    font-size: .75rem;
+    line-height: .875rem
+}
+
+#statusCheckBack .check-back-wrapper .shop-picture .picture-upload {
+    width: 100%
+}
+
+#statusCheckBack .check-back-wrapper .card-picture,
+#statusCheckBack .check-back-wrapper .shop-picture .place-cash,
+#statusCheckBack .check-back-wrapper .shop-picture .place-head,
+#statusCheckBack .check-back-wrapper .shop-picture .place-inner {
+    background-color: #fff;
+    padding: 1.25rem 1rem;
+    border-radius: .5rem;
+    margin-bottom: 1.375rem
+}
+
+#statusCheckBack .check-back-wrapper .card-picture .subtitle {
+    color: #0b204b;
+    font-size: 1rem;
+    line-height: 1.375rem;
+    margin-bottom: .8125rem;
+    font-family: MILanPro_NORMAL--GB1-4, MILanPro_NORMAL--GB1, system-ui
+}
+
+#statusCheckBack .check-back-wrapper .card-picture .subtitle span {
+    font-family: MILanPro_MEDIUM--GB1-4, MILanPro_MEDIUM--GB1, system-ui
+}
+
+#statusCheckBack .check-back-wrapper .card-picture a span {
+    color: #ff5045;
+    font-size: .875rem;
+    line-height: 1.25rem;
+    margin-top: 1rem;
+    display: block
+}
+
+#statusCheckBack .check-back-wrapper .card-picture .face-photo {
+    width: 100%
+}
+
+#statusCheckBack .check-back-wrapper .subtitle {
+    color: #131c31;
+    font-size: .875rem;
+    font-weight: 400;
+    line-height: 1.1875rem
+}
+
+#statusCheckBack .check-back-wrapper .subinfo {
+    color: #717783;
+    font-size: .75rem;
+    line-height: .875rem
+}
+
+#statusCheckBack .btn-wrapper {
+    padding: 1.25rem;
+    margin: 0
+}
+
+#statusActivation .face-indicate {
+    box-sizing: border-box;
+    padding: 0 1.25rem;
+    width: 100%
+}
+
+#registerSubmit .open-wechat-collection,
+#statusCheckSuccess .open-wechat-collection {
+    margin-bottom: 5rem
+}
+
+#registerSubmit .status-wrapper h2 {
+    font-family: Pro-Medium;
+    padding-top: 0;
+    padding-bottom: 0;
+    height: 2.125rem;
+    line-height: 2.125rem;
+    font-size: 1.625rem;
+    font-weight: 700
+}
+
+#registerSubmit .status-wrapper p.subTitle {
+    font-family: Pro-Normal;
+    font-size: 1rem;
+    color: #131c31;
+    margin-top: .125rem
+}
+
+#registerSubmit .status-wrapper p.subTitle span {
+    color: #005cff
+}
+
+#registerSubmit .status-wrapper p.line {
+    border-top: .03125rem solid #e5e6e8;
+    margin-top: 1rem
+}
+
+#registerSubmit .usage {
+    margin-top: .625rem;
+    padding: 0 20px
+}
+
+#registerSubmit .usage h3 {
+    font-size: 1rem;
+    color: #333b4c;
+    font-family: Pro-Medium;
+    font-weight: 700
+}
+
+#registerSubmit .usage .method-one,
+#registerSubmit .usage .method-two {
+    font-family: Pro-Normal;
+    font-size: .875rem;
+    color: #7f848f;
+    line-height: 1.25rem;
+    margin-top: 1.3125rem;
+    overflow: hidden
+}
+
+#registerSubmit .usage .method-one img,
+#registerSubmit .usage .method-two img {
+    display: block
+}
+
+#registerSubmit .usage .method-one .explain span,
+#registerSubmit .usage .method-two .explain span {
+    color: #005cff
+}
+
+#registerSubmit .usage .method-one li:nth-of-type(2),
+#registerSubmit .usage .method-one li:nth-of-type(3),
+#registerSubmit .usage .method-two li:nth-of-type(2),
+#registerSubmit .usage .method-two li:nth-of-type(3) {
+    width: 50%;
+    float: left
+}
+
+#registerSubmit .usage .method-one li p,
+#registerSubmit .usage .method-two li p {
+    font-size: .75rem;
+    line-height: 1.0625rem;
+    color: #7f848f
+}
+
+#registerSubmit .usage .method-one.method-one li:nth-of-type(2),
+#registerSubmit .usage .method-two.method-one li:nth-of-type(2) {
+    padding-top: .6875rem
+}
+
+#registerSubmit .usage .method-one.method-one li:nth-of-type(2) img,
+#registerSubmit .usage .method-two.method-one li:nth-of-type(2) img {
+    width: 8.25rem;
+    height: 4.1875rem
+}
+
+#registerSubmit .usage .method-one.method-one li:nth-of-type(2) p,
+#registerSubmit .usage .method-two.method-one li:nth-of-type(2) p {
+    margin-top: .375rem
+}
+
+#registerSubmit .usage .method-one.method-one li:nth-of-type(3),
+#registerSubmit .usage .method-two.method-one li:nth-of-type(3) {
+    padding-top: .875rem
+}
+
+#registerSubmit .usage .method-one.method-one li:nth-of-type(3) img,
+#registerSubmit .usage .method-two.method-one li:nth-of-type(3) img {
+    width: 6.125rem;
+    height: 3.75rem
+}
+
+#registerSubmit .usage .method-one.method-one li:nth-of-type(3) p,
+#registerSubmit .usage .method-two.method-one li:nth-of-type(3) p {
+    padding-left: .4375rem;
+    margin-top: .625rem
+}
+
+#registerSubmit .usage .method-one.method-two,
+#registerSubmit .usage .method-two.method-two {
+    margin-top: 2.1875rem
+}
+
+#registerSubmit .usage .method-one.method-two li:nth-of-type(2),
+#registerSubmit .usage .method-two.method-two li:nth-of-type(2) {
+    padding-top: .8125rem
+}
+
+#registerSubmit .usage .method-one.method-two li:nth-of-type(2) img,
+#registerSubmit .usage .method-two.method-two li:nth-of-type(2) img {
+    width: 6.125rem;
+    height: 3.75rem
+}
+
+#registerSubmit .usage .method-one.method-two li:nth-of-type(2) p,
+#registerSubmit .usage .method-two.method-two li:nth-of-type(2) p {
+    margin-top: .875rem
+}
+
+#registerSubmit .usage .method-one.method-two li:nth-of-type(3),
+#registerSubmit .usage .method-two.method-two li:nth-of-type(3) {
+    padding-top: .8125rem
+}
+
+#registerSubmit .usage .method-one.method-two li:nth-of-type(3) img,
+#registerSubmit .usage .method-two.method-two li:nth-of-type(3) img {
+    width: 7.125rem;
+    height: 3.8125rem
+}
+
+#registerSubmit .usage .method-one.method-two li:nth-of-type(3) p,
+#registerSubmit .usage .method-two.method-two li:nth-of-type(3) p {
+    margin-top: .875rem;
+    padding-left: .5rem
+}
+
+#statusUpgradeCheckBack {
+    padding: 0 0 7.1875rem;
+    font-size: .9375rem;
+    letter-spacing: .5px;
+    background-color: #f5f6f7
+}
+
+#statusUpgradeCheckBack .check-back-wrapper {
+    padding: 0 1.25rem
+}
+
+#statusUpgradeCheckBack .check-back-wrapper .card,
+#statusUpgradeCheckBack .check-back-wrapper .license,
+#statusUpgradeCheckBack .check-back-wrapper .shop {
+    background-color: #fff;
+    padding: 1.25rem 1rem 0;
+    margin-bottom: 1rem;
+    border-radius: .5rem
+}
+
+#statusUpgradeCheckBack .check-back-wrapper .card>div,
+#statusUpgradeCheckBack .check-back-wrapper .license>div,
+#statusUpgradeCheckBack .check-back-wrapper .shop>div {
+    color: #0b204b;
+    font-size: 1rem;
+    line-height: 1.375rem
+}
+
+#statusUpgradeCheckBack .check-back-wrapper .card>div:first-child,
+#statusUpgradeCheckBack .check-back-wrapper .license>div:first-child,
+#statusUpgradeCheckBack .check-back-wrapper .shop>div:first-child {
+    font-weight: 700
+}
+
+#statusUpgradeCheckBack .check-back-wrapper .card .tips,
+#statusUpgradeCheckBack .check-back-wrapper .license .tips,
+#statusUpgradeCheckBack .check-back-wrapper .shop .tips {
+    color: #7c8495;
+    line-height: 1.25rem;
+    font-size: .875rem;
+    margin: .5rem 0 .8125rem
+}
+
+#statusUpgradeCheckBack .column {
+    margin: 0 0 1.375rem
+}
+
+#statusUpgradeCheckBack .column .error {
+    font-size: .875rem;
+    color: #ff5045;
+    line-height: 1.25rem;
+    margin-top: 1rem;
+    display: block
+}
+
+#StatusUpgradeCheckSuccess h3 {
+    font-weight: 700
+}
+
+#StatusUpgradeCheckSuccess h3+p {
+    margin-top: 0
+}
+
+#StatusUpgradeCheckSuccess img {
+    height: 9.8125rem
+}
+
+.subtitle {
+    font-weight: 700!important
+}
+
+.infos {
+    margin-bottom: 1.875rem;
+    color: #131c31
+}
+
+.infos h2 {
+    color: #0b204b;
+    line-height: 1.6875rem;
+    font-size: 1.25rem;
+    font-family: Pro-Medium;
+    font-weight: 700
+}
+
+.infos p {
+    margin-top: .375rem;
+    font-size: .875rem;
+    line-height: 1.25rem;
+    color: #7c8495;
+    font-family: Pro-Normal
+}
+
+.input-wrapper.line-input {
+    background: transparent;
+    font-size: .9375rem;
+    border-bottom: .03125rem solid #f5f5f6
+}
+
+.input-wrapper.line-input label {
+    color: #637392;
+    font-size: .9375rem
+}
+
+.input-wrapper.line-input input {
+    color: #3a4a6e;
+    font-family: Jinrong-Bold;
+    font-size: 1.0625rem
+}
+
+.JirongBold {
+    font-family: Jinrong-Bold
+}
+
+#RegisterInviteShow {
+    min-height: 100vh;
+    background-color: #fff7eb;
+    /*overflow: scroll;*/
+    padding-bottom: 6.25rem;
+    box-sizing: border-box
+}
+
+#RegisterInviteShow img {
+    display: block
+}
+
+#RegisterInviteShow .introduce {
+    width: 100%;
+    top: 0
+}
+
+#RegisterInviteShow .bottom {
+    background-color: #fff;
+    width: 90%;
+    margin: -1.75rem auto 0;
+    border-radius: 0 0 1rem 1rem;
+    position: relative;
+    padding: 0 1.5rem 1.5625rem;
+    box-sizing: border-box;
+    overflow: hidden
+}
+
+#RegisterInviteShow .bottom .introduceBac {
+    height: 3.375rem;
+    width: 120%;
+    margin-left: -1.5rem
+}
+
+#RegisterInviteShow .bottom .introduceBar {
+    margin-top: -2.125rem;
+    padding: .3125rem 0 0
+}
+
+#RegisterInviteShow .bottom .introduceBar li {
+    height: 4.125rem
+}
+
+#RegisterInviteShow .bottom .introduceBar li:nth-of-type(2) {
+    margin-top: 1.75rem
+}
+
+#RegisterInviteShow .bottom .introduceBar li:nth-of-type(3) {
+    height: 0;
+    border-bottom: .03125rem dashed #ffd1c8;
+    box-sizing: border-box;
+    margin-top: 1.25rem
+}
+
+#RegisterInviteShow .bottom .introduceBar li .left {
+    float: left;
+    width: 3.6875rem;
+    height: 1.375rem;
+    background-color: #fa4e35;
+    border-radius: 6.25rem;
+    color: #fff;
+    font-size: .8125rem;
+    line-height: 1.375rem;
+    text-align: center;
+    font-family: Pro-SemiBold;
+    font-weight: 700;
+    margin-top: .9375rem
+}
+
+#RegisterInviteShow .bottom .introduceBar li .right {
+    float: right
+}
+
+#RegisterInviteShow .bottom .introduceBar li .right h3 {
+    font-family: Pro-DemiBold;
+    color: #494949;
+    font-size: 1.125rem;
+    line-height: 1.5rem;
+    font-weight: 700
+}
+
+#RegisterInviteShow .bottom .introduceBar li .right p {
+    color: #8a8a8a;
+    font-size: .9375rem;
+    line-height: 1.25rem;
+    width: 13.25rem;
+    margin-top: .125rem
+}
+
+#RegisterInviteShow .bottom .introduceTable {
+    height: 2.1875rem;
+    border: .03125rem solid #ffd1c8;
+    border-radius: .5rem .5rem 0 0;
+    background: #feeeeb;
+    margin-top: 1.4375rem
+}
+
+#RegisterInviteShow .bottom .introduceTable p {
+    width: 50%;
+    float: left;
+    text-align: center;
+    line-height: 2.1875rem;
+    font-family: Pro-Medium;
+    color: #494949;
+    font-size: .875rem;
+    font-weight: 700;
+    box-sizing: border-box
+}
+
+#RegisterInviteShow .bottom .introduceTable p:first-of-type {
+    border-right: .03125rem solid #ffd1c8
+}
+
+#RegisterInviteShow .bottom .introduceList {
+    border: .03125rem solid #eaeaea;
+    border-radius: 0 0 .5rem .5rem;
+    overflow: hidden;
+    border-top: 0;
+    box-sizing: border-box
+}
+
+#RegisterInviteShow .bottom .introduceList li {
+    height: 2.375rem
+}
+
+#RegisterInviteShow .bottom .introduceList li:not(:last-child) {
+    border-bottom: .03125rem solid #eaeaea;
+    box-sizing: border-box
+}
+
+#RegisterInviteShow .bottom .introduceList li p {
+    width: 50%;
+    box-sizing: border-box;
+    float: left;
+    text-align: center;
+    height: 2.375rem;
+    line-height: 2.375rem;
+    color: #0b204b;
+    font-family: Jinrong-Bold
+}
+
+#RegisterInviteShow .bottom .introduceList li p:first-of-type {
+    border-right: .03125rem solid #eaeaea;
+    box-sizing: border-box
+}
+
+#RegisterInviteShow .noLimit {
+    color: #e75947;
+    font-family: Pro-Medium;
+    font-weight: 700;
+    font-size: .9375rem;
+    text-align: center;
+    margin-top: .75rem
+}
+
+#RegisterInviteShow .inviteBtn {
+    width: 100%;
+    position: fixed;
+    bottom: 0;
+    padding: .625rem 5%;
+    box-sizing: border-box;
+    z-index: 99;
+    background-color: #fff7eb
+}
+
+#RegisterInviteShow .inviteBtn img {
+    display: block;
+    width: 100%
+}
+
+#registerActivityEntrance,
+#registerEntrance {
+    box-sizing: border-box;
+    background-color: #f7f7f7;
+    width: 100%;
+    padding-bottom: 1.25rem;
+    min-height: 100vh
+}
+
+#registerActivityEntrance .top,
+#registerEntrance .top {
+    width: 100%;
+    height: auto;
+    position: relative;
+    overflow: hidden
+}
+
+#registerActivityEntrance .top img,
+#registerEntrance .top img {
+    display: block;
+    width: 100%
+}
+
+#registerActivityEntrance .top img.activity-button,
+#registerEntrance .top img.activity-button {
+    position: absolute;
+    bottom: 1.8125rem;
+    width: 18.125rem;
+    left: 50%;
+    margin-left: -9.0625rem
+}
+
+#registerActivityEntrance .top img.activity-qrcode,
+#registerEntrance .top img.activity-qrcode {
+    position: absolute;
+    bottom: 7.8125rem;
+    width: 18.125rem;
+    left: 50%;
+    margin-left: -9.0625rem
+}
+
+#registerActivityEntrance .bottom,
+#registerEntrance .bottom {
+    padding: 1rem 1rem 0
+}
+
+#registerActivityEntrance .bottom img,
+#registerEntrance .bottom img {
+    display: block;
+    width: 100%;
+    height: auto
+}
+
+#registerActivityEntrance .bottom .look,
+#registerEntrance .bottom .look {
+    position: relative;
+    overflow: hidden
+}
+
+#registerActivityEntrance .bottom .look .activity-use,
+#registerEntrance .bottom .look .activity-use {
+    margin-top: .75rem
+}
+
+#registerActivityEntrance .bottom .look span,
+#registerEntrance .bottom .look span {
+    width: 5rem;
+    height: 100%;
+    position: absolute;
+    right: 0;
+    top: .75rem;
+    background: transparent;
+    z-index: 9
+}
+
+#registerActivityEntrance .feature-desc,
+#registerEntrance .feature-desc {
+    display: block;
+    margin: 29.375rem auto 0;
+    height: 6.0625rem
+}
+
+#registerActivityEntrance .tip,
+#registerEntrance .tip {
+    margin-top: 3.75rem;
+    padding: .9375rem 0 7.1875rem;
+    line-height: 1.25rem;
+    font-size: .8125rem;
+    color: #b0b2c3;
+    background: -webkit-gradient(linear, left bottom, left top, color-stop(99.5%, #171a31), to(#b0b2c3));
+    background: linear-gradient(0deg, #171a31 99.5%, #b0b2c3)
+}
+
+#registerActivityEntrance .tip p:first-child,
+#registerEntrance .tip p:first-child {
+    margin-bottom: .3125rem
+}
+
+#registerActivityEntrance .btn-wrapper,
+#registerEntrance .btn-wrapper {
+    right: 0;
+    margin: 0 auto;
+    padding: 1.25rem 2.5rem;
+    background-color: #171a31
+}
+
+#RegisterIntroduce {
+    padding-bottom: 5.375rem
+}
+
+#RegisterIntroduce .introduce {
+    width: 100%;
+    height: auto
+}
+
+#registerIdentity {
+    padding: .625rem 1.25rem 7.5rem;
+    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAXcAAAGdCAMAAADewcMoAAAAolBMVEXk8f7l8f7l8v7l8v/m8f7m8v7n8f3n8f7n8v3n8v7o8v3o8/3p8vzp8v3p8/3q8Pfq8vzq8/zr8vzr8/zs8/vs8/zs9Pvt8/rt8/vt9Prt9Pvu8/ru8/vu9Prv8/rv9Pnv9Prw8/nw9Pnw9Prw9fnx9Pjx9Pnx9fjx9fny9Pfy9Pjy9ffy9fjz9Pbz9Pfz9fbz9ffz9fj09Pf09ff09vf19vcSC/WlAAAGoElEQVR42u3afVfbRhpA8SctCS+l2TgkECBQmpa8UKcLBb7/V1tpJFmSz+6StpmZBv/uOZbmjnzyx51BsQXxL9QgvkcNdNddd+iuO3TXHbrrDt11h+6Vu3+X+P67OTyzBwAU4skTXtKbiZaZ8AL+BDXQXXfdobvu0F136K47vrz707VrPJ/H1tbTrYZe2yEv4G33hq1Ed+YFPJ529L6C5/V4ihrorrvu0F136K47/k733d35PM/rkeZ2V1d3eRGPXdRAd911h+6642t27z7grD7n8CLu+6rnBLqjZHfPUMp583ccW9vb2+nPDLaHF8/u0R63e3Mudo7t7fR5crs9pylewuNZw86zOTy7x2q8Mxx4AY+dgTQ9gef06Gaerb2DZ/bYQQ1011136P6Yu++tfI8X8djZ20vjvUQ34Nk99lAD3XXXHbrrDt11h+66Q/d/aPcfG/bSqZviBTx+RA10132Tuz/nRdx+r7jfn3eMi8Jz+/j5/YfEHi/isZoZ53l+jx9QA91138juz5/PL/CsHu0HnOHKAM/uvjd5PqM7dNcduusO3XXHQ9339/fbV3saxjy7xz5qEPsvmuOLhnRqD7yAxzDzYnWNF/B4gRrorvsmdl8sFrN5ntftd/eZzeu+6F+rnwqe2WOxdufhRTx1T6PVkRfwvvticXCwmMGzeshRxSONE5NrPLfHwZTxTTyvz7ujFLpX6r5ADXTXXXforjt0fxzd1x4i8Oxuv1fb7wfT5zULXsRj8rBs+hiH53XPZzwX26zuL1++bF/taRjz7B4vUQPdddcd+bsfpNv95KbPC3h0ExN4CY9u2DFe4pl9/r1p8h6e1X1frfR99XVzSK/XkyPP7fEaNdBd943q/go10F133aG77tBdd+j+rXZ/8+YVL+L2u/uM7tBdd+iuO3T/1rofHs5neW633yvu9341VovCs3scpp+Bk9WBF/Gm+8lhN351eJKGvIDHSaJbiHaSF/G++8k4xUt4vEENdNddd+iuO3TXHX+n+9u1eZ7X7Xf3mc3s7k5Q0mf7/e3ae3k2j7eoge666w7ddYfu33z306Ojo9PTdDxuB7yIx9GE4+OjI17EYxger13iWT2OO9qpszTPS3hM1mL8eeC5Pd1n2gU4O5usDM/tMUyd9fAiHmeoge666w7ddYfuukN33aG77hi7X1zMZ3gJj/ZXfufnF+ctp2dnp7yIR2PtIE13A17A4xw10F133aH74+9+sXaN53P73X1mI7tfNEx/FnhWt98r7feLfi265egWhGf3OB/nx2s8t8cFahC/tHTjdOZFvOs+XvmFF3H3mUr3GQl01x266w7ddcdf6f4TaqC77rpD98fc/V37aulneW6Pd6iB7rrrDt11h+664y93/3Vtkmf30KCKu89Uus/83Bx+bg7v379LI17EY7QRnt1n95luTXgBjzR+P4UX8HiPGuiuu+7QXXd8ze7dx5z22H3e4SXc8xnP33WH7rojQ/e1R2c8r9vvdfd7/8ly8qiY5/TwNLyKe07g+Yzu0P2Rd//4cX6BZ/WY+Md0mZfw+X1mbY14Nu/2+8dEP+AFvNnvH1ouG5pjuxS8gMeHnsvL7hIv4vEBNdD9H9F9+YEX8Un35XL+Lp7Rwzas4rFcduuwnLLmv+HP8GDPxmP5BUj5J7s/zBd1x1dn6H51dTWb53k9rlAD3XXXHbrrDt11h+7fUPdL1CAum/jdsD/zEj65zwyzvIDH/MLsHsTzuf9XfZ7ZwO7d8+F+wPO7/V5pvy/nvuRFfPZ7vqvxl1E8r4/7fZjmJTz8xrmK+zuOun/HAd11R6nuN7yIhx5VfNX95iYdl7yIR+83w1VexOMGNdBdd92h+yPtft3QDdvB9TUv4nGNGuiuu+7Q/ZF2/x010L1a9z/64R+3/Znnd/u93n3m06dPszme38f93vwnO7vKc3qsZn9fexfP6XE9LEa6MiwKz+xxPcwOg//i/058/vx5cuL/0x/s2X1vWt141tZk9PHf7kf8//mDPa/b+ww8n9EduusO3XWH7rrjwe63t+1hnOTZPcYLk0s8t0e3FsOC3N7yIh63t6vxBJ7Z4xY10F133aG77tBdd+iuOx7uftcwneP5fdjvd2vrwfP60P3+fj7P83qsrcYdL+LR33Du79OKdDcint3j/v6uo7twz4t4pBW4X12640U87lED3XXXHbrrDt11h+66Q3fdobvuukN33aG77tBdd+iuO3TXXXforjt01x266w7ddYfuukN33TeL/wBxXo4fjG8o1wAAAABJRU5ErkJggg==);
+    background-repeat: no-repeat;
+    background-color: #f5f6f7;
+    background-size: 100% auto;
+    height: 100vh;
+    overflow: auto;
+    box-sizing: border-box
+}
+
+#registerIdentity .progress-nav .progress-icon {
+    background-image: url(assets/process4.adba4.png)
+}
+
+#registerIdentity .infos {
+    width: 100%;
+    height: 25.5625rem;
+    margin-top: -.9375rem;
+    background-color: #fff;
+    border-radius: .5rem;
+    padding: 1rem 1.25rem 0;
+    box-sizing: border-box
+}
+
+#registerIdentity .infos .identity-indicate .line .face-indicate,
+#registerIdentity .infos .identity-indicate .line .id-indicate {
+    width: 100%;
+    height: 4rem;
+    line-height: 4rem;
+    background: #f5f7fa;
+    border-radius: .375rem;
+    padding-left: 1rem;
+    position: relative;
+    overflow: hidden;
+    box-sizing: border-box
+}
+
+#registerIdentity .infos .identity-indicate .line .face-indicate img,
+#registerIdentity .infos .identity-indicate .line .id-indicate img {
+    position: absolute;
+    top: 1.4375rem;
+    width: 1.25rem;
+    height: 1.0625rem
+}
+
+#registerIdentity .infos .identity-indicate .line .face-indicate p,
+#registerIdentity .infos .identity-indicate .line .id-indicate p {
+    position: absolute;
+    left: 3rem;
+    top: 1.375rem;
+    margin-top: 0;
+    color: #3a4a6e;
+    font-family: Pro-Medium;
+    font-weight: 700
+}
+
+#registerIdentity .infos .identity-indicate .line .face-indicate.id-indicate,
+#registerIdentity .infos .identity-indicate .line .id-indicate.id-indicate {
+    margin-top: 1.5rem
+}
+
+#registerIdentity .infos .identity-indicate .line .face-indicate.face-indicate,
+#registerIdentity .infos .identity-indicate .line .id-indicate.face-indicate {
+    margin-top: .875rem
+}
+
+#registerIdentity .infos .identity-indicate .line .face-indicate a,
+#registerIdentity .infos .identity-indicate .line .id-indicate a {
+    display: block;
+    position: absolute;
+    width: 4.875rem;
+    height: 1.875rem;
+    border-radius: .9375rem;
+    top: 1.0625rem;
+    right: 1rem
+}
+
+#registerIdentity .infos .identity-indicate .line .face-indicate a img,
+#registerIdentity .infos .identity-indicate .line .id-indicate a img {
+    display: block;
+    width: 4.875rem;
+    height: 1.875rem;
+    top: 0
+}
+
+#registerIdentity .infos .identity-show {
+    margin-top: .5625rem;
+    border: 0
+}
+
+#registerIdentity .infos .identity-show .input-wrapper.label-input {
+    background: #fff;
+    color: #637392;
+    font-family: Pro-Normal
+}
+
+#registerIdentity .infos .identity-show .input-wrapper.label-input .content {
+    color: #b5bbc8;
+    font-family: Pro-Medium
+}
+
+#registerIdentity .infos .identity-show .input-wrapper.label-input .content.number {
+    font-family: Jinrong-Bold
+}
+
+#registerIdentity .infos .identity-show .input-wrapper.label-input:not(:last-child) {
+    border-bottom: .03125rem solid #f5f5f6
+}
+
+#registerShop .progress-nav .progress-icon {
+    background-image: url(assets/process5.b2621.png)
+}
+
+#adminInspection,
+#registerShop {
+    padding: .625rem 1.25rem;
+    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAXcAAAGdCAMAAADewcMoAAAAolBMVEXk8f7l8f7l8v7l8v/m8f7m8v7n8f3n8f7n8v3n8v7o8v3o8/3p8vzp8v3p8/3q8Pfq8vzq8/zr8vzr8/zs8/vs8/zs9Pvt8/rt8/vt9Prt9Pvu8/ru8/vu9Prv8/rv9Pnv9Prw8/nw9Pnw9Prw9fnx9Pjx9Pnx9fjx9fny9Pfy9Pjy9ffy9fjz9Pbz9Pfz9fbz9ffz9fj09Pf09ff09vf19vcSC/WlAAAGoElEQVR42u3afVfbRhpA8SctCS+l2TgkECBQmpa8UKcLBb7/V1tpJFmSz+6StpmZBv/uOZbmjnzyx51BsQXxL9QgvkcNdNddd+iuO3TXHbrrDt11h+6Vu3+X+P67OTyzBwAU4skTXtKbiZaZ8AL+BDXQXXfdobvu0F136K47vrz707VrPJ/H1tbTrYZe2yEv4G33hq1Ed+YFPJ529L6C5/V4ihrorrvu0F136K47/k733d35PM/rkeZ2V1d3eRGPXdRAd911h+6642t27z7grD7n8CLu+6rnBLqjZHfPUMp583ccW9vb2+nPDLaHF8/u0R63e3Mudo7t7fR5crs9pylewuNZw86zOTy7x2q8Mxx4AY+dgTQ9gef06Gaerb2DZ/bYQQ1011136P6Yu++tfI8X8djZ20vjvUQ34Nk99lAD3XXXHbrrDt11h+66Q/d/aPcfG/bSqZviBTx+RA10132Tuz/nRdx+r7jfn3eMi8Jz+/j5/YfEHi/isZoZ53l+jx9QA91138juz5/PL/CsHu0HnOHKAM/uvjd5PqM7dNcduusO3XXHQ9339/fbV3saxjy7xz5qEPsvmuOLhnRqD7yAxzDzYnWNF/B4gRrorvsmdl8sFrN5ntftd/eZzeu+6F+rnwqe2WOxdufhRTx1T6PVkRfwvvticXCwmMGzeshRxSONE5NrPLfHwZTxTTyvz7ujFLpX6r5ADXTXXXforjt0fxzd1x4i8Oxuv1fb7wfT5zULXsRj8rBs+hiH53XPZzwX26zuL1++bF/taRjz7B4vUQPdddcd+bsfpNv95KbPC3h0ExN4CY9u2DFe4pl9/r1p8h6e1X1frfR99XVzSK/XkyPP7fEaNdBd943q/go10F133aG77tBdd+j+rXZ/8+YVL+L2u/uM7tBdd+iuO3T/1rofHs5neW633yvu9341VovCs3scpp+Bk9WBF/Gm+8lhN351eJKGvIDHSaJbiHaSF/G++8k4xUt4vEENdNddd+iuO3TXHX+n+9u1eZ7X7Xf3mc3s7k5Q0mf7/e3ae3k2j7eoge666w7ddYfu33z306Ojo9PTdDxuB7yIx9GE4+OjI17EYxger13iWT2OO9qpszTPS3hM1mL8eeC5Pd1n2gU4O5usDM/tMUyd9fAiHmeoge666w7ddYfuukN33aG77hi7X1zMZ3gJj/ZXfufnF+ctp2dnp7yIR2PtIE13A17A4xw10F133aH74+9+sXaN53P73X1mI7tfNEx/FnhWt98r7feLfi265egWhGf3OB/nx2s8t8cFahC/tHTjdOZFvOs+XvmFF3H3mUr3GQl01x266w7ddcdf6f4TaqC77rpD98fc/V37aulneW6Pd6iB7rrrDt11h+664y93/3Vtkmf30KCKu89Uus/83Bx+bg7v379LI17EY7QRnt1n95luTXgBjzR+P4UX8HiPGuiuu+7QXXd8ze7dx5z22H3e4SXc8xnP33WH7rojQ/e1R2c8r9vvdfd7/8ly8qiY5/TwNLyKe07g+Yzu0P2Rd//4cX6BZ/WY+Md0mZfw+X1mbY14Nu/2+8dEP+AFvNnvH1ouG5pjuxS8gMeHnsvL7hIv4vEBNdD9H9F9+YEX8Un35XL+Lp7Rwzas4rFcduuwnLLmv+HP8GDPxmP5BUj5J7s/zBd1x1dn6H51dTWb53k9rlAD3XXXHbrrDt11h+7fUPdL1CAum/jdsD/zEj65zwyzvIDH/MLsHsTzuf9XfZ7ZwO7d8+F+wPO7/V5pvy/nvuRFfPZ7vqvxl1E8r4/7fZjmJTz8xrmK+zuOun/HAd11R6nuN7yIhx5VfNX95iYdl7yIR+83w1VexOMGNdBdd92h+yPtft3QDdvB9TUv4nGNGuiuu+7Q/ZF2/x010L1a9z/64R+3/Znnd/u93n3m06dPszme38f93vwnO7vKc3qsZn9fexfP6XE9LEa6MiwKz+xxPcwOg//i/058/vx5cuL/0x/s2X1vWt141tZk9PHf7kf8//mDPa/b+ww8n9EduusO3XWH7rrjwe63t+1hnOTZPcYLk0s8t0e3FsOC3N7yIh63t6vxBJ7Z4xY10F133aG77tBdd+iuOx7uftcwneP5fdjvd2vrwfP60P3+fj7P83qsrcYdL+LR33Du79OKdDcint3j/v6uo7twz4t4pBW4X12640U87lED3XXXHbrrDt11h+66Q3fdobvuukN33aG77tBdd+iuO3TXXXforjt01x266w7ddYfuukN33TeL/wBxXo4fjG8o1wAAAABJRU5ErkJggg==);
+    background-repeat: repeat-x;
+    background-color: #f5f6f7;
+    background-size: 100% 100%
+}
+
+#adminInspection#adminInspection,
+#registerShop#adminInspection {
+    background: #fff
+}
+
+#adminInspection .infos,
+#registerShop .infos {
+    margin-bottom: 0;
+    border-radius: .5rem .5rem 0 0
+}
+
+#adminInspection .infos p,
+#registerShop .infos p {
+    color: #0097ff
+}
+
+#adminInspection .infos .siteBar,
+#registerShop .infos .siteBar {
+    overflow: hidden
+}
+
+#adminInspection .infos .siteBar li,
+#registerShop .infos .siteBar li {
+    float: left;
+    width: 50%;
+    height: 2.875rem;
+    line-height: 2.875rem;
+    background-color: #dfecfa;
+    text-align: center;
+    border-radius: .5rem .5rem 0 0;
+    color: #3a4a6e;
+    font-family: Pro-Medium;
+    font-weight: 700
+}
+
+#adminInspection .infos .siteBar li img,
+#registerShop .infos .siteBar li img {
+    width: .875rem;
+    height: .875rem;
+    margin-right: .3125rem
+}
+
+#adminInspection .infos .siteBar li:nth-child(2) span:nth-child(2),
+#registerShop .infos .siteBar li:nth-child(2) span:nth-child(2) {
+    display: inline-block;
+    width: .25rem;
+    height: .25rem;
+    right: 1.3125rem;
+    background: #0097ff;
+    border-radius: 50%;
+    margin-bottom: .625rem
+}
+
+#adminInspection .infos .siteBar li.active,
+#registerShop .infos .siteBar li.active {
+    background-color: #fff;
+    color: #0097ff
+}
+
+#adminInspection .infos .siteBar li.active span:nth-of-type(2),
+#registerShop .infos .siteBar li.active span:nth-of-type(2) {
+    display: none
+}
+
+#adminInspection .shop-message,
+#registerShop .shop-message {
+    background-color: #fff;
+    padding: 1.25rem;
+    border-radius: 0 0 .5rem .5rem;
+    box-sizing: border-box
+}
+
+#adminInspection .shop-message h2,
+#registerShop .shop-message h2 {
+    color: #0b204b;
+    line-height: 1.375rem;
+    font-size: 1rem;
+    font-family: Pro-Medium;
+    font-weight: 700
+}
+
+#adminInspection .shop-message label,
+#registerShop .shop-message label {
+    font-family: Pro-Normal
+}
+
+#adminInspection .shop-message input,
+#registerShop .shop-message input {
+    font-family: Pro-Medium
+}
+
+#adminInspection .shop-message .shop-scope .icon-wrapper,
+#registerShop .shop-message .shop-scope .icon-wrapper {
+    display: -webkit-box;
+    display: flex;
+    -webkit-box-align: center;
+    align-items: center;
+    -webkit-box-pack: center;
+    justify-content: center;
+    position: relative;
+    height: 100%;
+    width: 1.25rem
+}
+
+#adminInspection .shop-message .shop-scope .subtitle,
+#registerShop .shop-message .shop-scope .subtitle {
+    margin: .125rem 0 .625rem;
+    line-height: 1rem;
+    font-size: .75rem;
+    color: #ccced2
+}
+
+#adminInspection .shop-message .shop-name .shop-name-prefix,
+#registerShop .shop-message .shop-name .shop-name-prefix {
+    margin-right: .3125rem;
+    color: #ccced2
+}
+
+#adminInspection .shop-picture,
+#registerShop .shop-picture {
+    margin-bottom: 2.625rem
+}
+
+#adminInspection .shop-picture .place-cash,
+#adminInspection .shop-picture .place-head,
+#adminInspection .shop-picture .place-inner,
+#registerShop .shop-picture .place-cash,
+#registerShop .shop-picture .place-head,
+#registerShop .shop-picture .place-inner {
+    width: 100%;
+    background: #fff;
+    padding: 1rem 1.25rem 1.375rem;
+    box-sizing: border-box;
+    margin-top: .75rem;
+    border-radius: .5rem
+}
+
+#adminInspection .shop-picture .place-cash .subtitle,
+#adminInspection .shop-picture .place-head .subtitle,
+#adminInspection .shop-picture .place-inner .subtitle,
+#registerShop .shop-picture .place-cash .subtitle,
+#registerShop .shop-picture .place-head .subtitle,
+#registerShop .shop-picture .place-inner .subtitle {
+    margin: 0 0 .25rem;
+    line-height: 1.375rem;
+    font-size: 1rem;
+    color: #0b204b;
+    font-family: Pro-Medium;
+    font-weight: 700
+}
+
+#adminInspection .shop-picture .place-cash .subtitle.asterisk,
+#adminInspection .shop-picture .place-head .subtitle.asterisk,
+#adminInspection .shop-picture .place-inner .subtitle.asterisk,
+#registerShop .shop-picture .place-cash .subtitle.asterisk,
+#registerShop .shop-picture .place-head .subtitle.asterisk,
+#registerShop .shop-picture .place-inner .subtitle.asterisk {
+    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAASCAYAAACEnoQPAAAB5klEQVQ4T62TzSvEcRDGP1/W+7uQi5S85SStkxwkV9y4uTggIW7KCTnvH6BEDi5bu+KiFKWQq0hRLl7CRYhdu6P5TdgsF0xNfev3e5555pkZJyLCL8P9LzgahdNTeHmBzEyoqoK0tG+1JVd+eICJCbi4gPp6mJyEoqIfwLGYoICcHEhNhXgcxsetenOzvXNzQa25uYGysg8iJ3d3QiAATU3Q1WUfZmdhdxfa22Fw0Eg3NmBtDaanP5Q4WVkRlpYM1NoKfX0QCsHqKnR3G2EwCOvrEItBWxuMjIDPh5PFRWF7G66vwTmoqYHCQtjfh8ZGeH6GoyMjLy2Flhbo6fFacRKJCLe3JjMcxnv7fPD6+ulBfj50dhqwpAQyMjyuT7dV0tUVzM/DwYEZpNHQAMPDUF6eNDIn0ahwcmIAzfNzA6nr2oaSVFSA32+pZKrMqzw3Jxwewv29AaqrobISNjdNps777AxSUiAvz2Y/NATFxZjby8smSZn7+83dd7d7e62VnR14ejK3x8Y8MpvzwgLU1UFHB6Snw8wM7O3ZnAcGrOrWluXoqLnuyY7HxWPMyrKftEdlVqmJG6aG6iYWFCRs2NeTfHyEqSm4vLSZ654nABKXPPkwIhE4PrblyM6G2lpr5Zv40z2/AWSD28v3yiq+AAAAAElFTkSuQmCC);
+    background-repeat: no-repeat;
+    background-position: .125rem .5rem;
+    margin-left: -.5rem;
+    padding-left: .5rem;
+    box-sizing: border-box;
+    background-size: .3125rem .375rem
+}
+
+#adminInspection .shop-picture .place-cash .subinfo,
+#adminInspection .shop-picture .place-head .subinfo,
+#adminInspection .shop-picture .place-inner .subinfo,
+#registerShop .shop-picture .place-cash .subinfo,
+#registerShop .shop-picture .place-head .subinfo,
+#registerShop .shop-picture .place-inner .subinfo {
+    color: #7c8495;
+    line-height: 1.25rem;
+    font-size: .875rem;
+    margin-bottom: 1rem;
+    font-family: Pro-Normal
+}
+
+#app,
+#registerCard,
+body,
+html {
+    /* overflow: scroll */
+}
+
+#registerCard {
+    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAXcAAAGdCAMAAADewcMoAAAAolBMVEXk8f7l8f7l8v7l8v/m8f7m8v7n8f3n8f7n8v3n8v7o8v3o8/3p8vzp8v3p8/3q8Pfq8vzq8/zr8vzr8/zs8/vs8/zs9Pvt8/rt8/vt9Prt9Pvu8/ru8/vu9Prv8/rv9Pnv9Prw8/nw9Pnw9Prw9fnx9Pjx9Pnx9fjx9fny9Pfy9Pjy9ffy9fjz9Pbz9Pfz9fbz9ffz9fj09Pf09ff09vf19vcSC/WlAAAGoElEQVR42u3afVfbRhpA8SctCS+l2TgkECBQmpa8UKcLBb7/V1tpJFmSz+6StpmZBv/uOZbmjnzyx51BsQXxL9QgvkcNdNddd+iuO3TXHbrrDt11h+6Vu3+X+P67OTyzBwAU4skTXtKbiZaZ8AL+BDXQXXfdobvu0F136K47vrz707VrPJ/H1tbTrYZe2yEv4G33hq1Ed+YFPJ529L6C5/V4ihrorrvu0F136K47/k733d35PM/rkeZ2V1d3eRGPXdRAd911h+6642t27z7grD7n8CLu+6rnBLqjZHfPUMp583ccW9vb2+nPDLaHF8/u0R63e3Mudo7t7fR5crs9pylewuNZw86zOTy7x2q8Mxx4AY+dgTQ9gef06Gaerb2DZ/bYQQ1011136P6Yu++tfI8X8djZ20vjvUQ34Nk99lAD3XXXHbrrDt11h+66Q/d/aPcfG/bSqZviBTx+RA10132Tuz/nRdx+r7jfn3eMi8Jz+/j5/YfEHi/isZoZ53l+jx9QA91138juz5/PL/CsHu0HnOHKAM/uvjd5PqM7dNcduusO3XXHQ9339/fbV3saxjy7xz5qEPsvmuOLhnRqD7yAxzDzYnWNF/B4gRrorvsmdl8sFrN5ntftd/eZzeu+6F+rnwqe2WOxdufhRTx1T6PVkRfwvvticXCwmMGzeshRxSONE5NrPLfHwZTxTTyvz7ujFLpX6r5ADXTXXXforjt0fxzd1x4i8Oxuv1fb7wfT5zULXsRj8rBs+hiH53XPZzwX26zuL1++bF/taRjz7B4vUQPdddcd+bsfpNv95KbPC3h0ExN4CY9u2DFe4pl9/r1p8h6e1X1frfR99XVzSK/XkyPP7fEaNdBd943q/go10F133aG77tBdd+j+rXZ/8+YVL+L2u/uM7tBdd+iuO3T/1rofHs5neW633yvu9341VovCs3scpp+Bk9WBF/Gm+8lhN351eJKGvIDHSaJbiHaSF/G++8k4xUt4vEENdNddd+iuO3TXHX+n+9u1eZ7X7Xf3mc3s7k5Q0mf7/e3ae3k2j7eoge666w7ddYfu33z306Ojo9PTdDxuB7yIx9GE4+OjI17EYxger13iWT2OO9qpszTPS3hM1mL8eeC5Pd1n2gU4O5usDM/tMUyd9fAiHmeoge666w7ddYfuukN33aG77hi7X1zMZ3gJj/ZXfufnF+ctp2dnp7yIR2PtIE13A17A4xw10F133aH74+9+sXaN53P73X1mI7tfNEx/FnhWt98r7feLfi265egWhGf3OB/nx2s8t8cFahC/tHTjdOZFvOs+XvmFF3H3mUr3GQl01x266w7ddcdf6f4TaqC77rpD98fc/V37aulneW6Pd6iB7rrrDt11h+664y93/3Vtkmf30KCKu89Uus/83Bx+bg7v379LI17EY7QRnt1n95luTXgBjzR+P4UX8HiPGuiuu+7QXXd8ze7dx5z22H3e4SXc8xnP33WH7rojQ/e1R2c8r9vvdfd7/8ly8qiY5/TwNLyKe07g+Yzu0P2Rd//4cX6BZ/WY+Md0mZfw+X1mbY14Nu/2+8dEP+AFvNnvH1ouG5pjuxS8gMeHnsvL7hIv4vEBNdD9H9F9+YEX8Un35XL+Lp7Rwzas4rFcduuwnLLmv+HP8GDPxmP5BUj5J7s/zBd1x1dn6H51dTWb53k9rlAD3XXXHbrrDt11h+7fUPdL1CAum/jdsD/zEj65zwyzvIDH/MLsHsTzuf9XfZ7ZwO7d8+F+wPO7/V5pvy/nvuRFfPZ7vqvxl1E8r4/7fZjmJTz8xrmK+zuOun/HAd11R6nuN7yIhx5VfNX95iYdl7yIR+83w1VexOMGNdBdd92h+yPtft3QDdvB9TUv4nGNGuiuu+7Q/ZF2/x010L1a9z/64R+3/Znnd/u93n3m06dPszme38f93vwnO7vKc3qsZn9fexfP6XE9LEa6MiwKz+xxPcwOg//i/058/vx5cuL/0x/s2X1vWt141tZk9PHf7kf8//mDPa/b+ww8n9EduusO3XWH7rrjwe63t+1hnOTZPcYLk0s8t0e3FsOC3N7yIh63t6vxBJ7Z4xY10F133aG77tBdd+iuOx7uftcwneP5fdjvd2vrwfP60P3+fj7P83qsrcYdL+LR33Du79OKdDcint3j/v6uo7twz4t4pBW4X12640U87lED3XXXHbrrDt11h+66Q3fdobvuukN33aG77tBdd+iuO3TXXXforjt01x266w7ddYfuukN33TeL/wBxXo4fjG8o1wAAAABJRU5ErkJggg==);
+    background-repeat: no-repeat;
+    background-color: #f5f6f7;
+    padding: .625rem 1.25rem 7.5625rem;
+    box-sizing: border-box;
+    height: 100%;
+    background-size: 100% 100%
+}
+
+#registerCard .progress-nav .progress-icon {
+    background-image: url(assets/process6.add3b.png);
+    background-repeat: no-repeat
+}
+
+#registerCard .btn-wrapper {
+    margin-top: 1.875rem
+}
+
+#registerCard .card-message {
+    width: 100%;
+    background: #fff;
+    border-radius: .5rem;
+    padding: 1rem 1.25rem;
+    box-sizing: border-box;
+    position: relative;
+    overflow: hidden
+}
+
+#registerCard .card-message .card-info {
+    margin-bottom: 1.6875rem
+}
+
+#registerCard .card-message .card-info h3.subtitle {
+    margin-top: -.375rem;
+    color: #637392;
+    font-family: Pro-Normal
+}
+
+#registerCard .card-message .card-info h3.subtitle span {
+    color: #3a4a6e;
+    font-family: Pro-Medium
+}
+
+#registerCard .card-message .card-info div {
+    margin-top: .125rem
+}
+
+#registerCard .card-message .card-info div.border-box {
+    border-bottom: .03125rem solid #f5f5f6
+}
+
+#registerCard .card-message .card-info div .input-wrapper.line-input {
+    margin-top: 0;
+    font-family: Pro-Medium
+}
+
+#registerCard .card-message .card-info div .input-wrapper.line-input input::-webkit-input-placeholder {
+    font-family: Pro-Normal
+}
+
+#registerCard .card-message .card-info div .input-wrapper.line-input input::-moz-placeholder {
+    font-family: Pro-Normal
+}
+
+#registerCard .card-message .card-info div .input-wrapper.line-input input:-ms-input-placeholder {
+    font-family: Pro-Normal
+}
+
+#registerCard .card-message .card-info div .input-wrapper.line-input input::-ms-input-placeholder {
+    font-family: Pro-Normal
+}
+
+#registerCard .card-message .card-info div .input-wrapper.line-input input::placeholder {
+    font-family: Pro-Normal
+}
+
+#registerCard .card-message .card-info div .input-wrapper.label-input {
+    background: #fff;
+    margin-left: 30%
+}
+
+#registerCard .card-message .card-info div .input-wrapper.label-input label {
+    color: #7c8495;
+    font-size: 1.0625rem;
+    font-family: Pro-Medium
+}
+
+#registerCard .card-message .card-info div .input-wrapper.label-input label.number {
+    font-family: Jinrong-Bold;
+    border: 0
+}
+
+#registerCard .card-message .card-info div label {
+    font-family: Pro-Normal
+}
+
+#registerCard .card-message .card-info div .text {
+    width: 30%;
+    position: absolute;
+    z-index: 100000;
+    line-height: 3.125rem;
+    display: inline-block;
+    height: 3.125rem;
+    z-index: 0;
+    color: #637392;
+    font-size: .9375rem;
+    box-sizing: border-box
+}
+
+#registerCard .card-message .card-info div .text:nth-of-type(2) {
+    height: 2.8125rem;
+    line-height: 2.8125rem
+}
+
+#registerCard .card-message .subtitle {
+    font-size: .875rem;
+    font-weight: 400;
+    line-height: 1.1875rem
+}
+
+#registerConfirm {
+    overflow: scroll;
+    padding: 1.25rem 1.25rem 7.5rem
+}
+
+#registerConfirm .modify {
+    color: #0097ff;
+    float: right;
+    font-size: .875rem;
+    font-family: Pro-Medium
+}
+
+#registerConfirm h2 {
+    margin-bottom: 1.125rem;
+    color: #333;
+    font-size: 1rem;
+    line-height: 1.3125rem;
+    font-weight: 700;
+    font-family: Pro-Medium
+}
+
+#registerConfirm h2 span {
+    float: right;
+    color: #a4a7b0
+}
+
+#registerConfirm h2 span.number {
+    font-family: Jinrong-Bold
+}
+
+#registerConfirm h3 {
+    margin-bottom: 2rem;
+    overflow: hidden;
+    color: #131c31;
+    font-size: .875rem;
+    line-height: 1.1875rem;
+    font-weight: 400;
+    font-family: Pro-Normal
+}
+
+#registerConfirm h3 span {
+    float: right;
+    display: -webkit-box;
+    display: flex;
+    -webkit-box-pack: justify;
+    justify-content: space-between;
+    -webkit-box-align: center;
+    align-items: center;
+    font-family: MILanPro_MEDIUM--GB1-4, MILanPro_MEDIUM--GB1, system-ui;
+    color: #a4a7b0;
+    font-family: Pro-Medium
+}
+
+#registerConfirm h3 span.number {
+    font-family: Jinrong-Bold
+}
+
+#registerConfirm h3 span img {
+    width: .875rem;
+    height: .875rem;
+    margin-right: .4375rem
+}
+
+#registerConfirm .subinfo {
+    margin-bottom: .875rem;
+    color: #717783;
+    font-size: .75rem;
+    line-height: 1rem;
+    font-family: Pro-Normal
+}
+
+#registerConfirm .confirm-identity,
+#registerConfirm .confirm-rate,
+#registerConfirm .confirm-shop {
+    margin-bottom: 1.25rem;
+    border-bottom: 1px solid #e5e6e8
+}
+
+#registerConfirm .confirm-time {
+    margin: 1.6875rem 0;
+    overflow: hidden
+}
+
+#registerConfirm .bank-rate h3 {
+    margin-bottom: .5625rem
+}
+
+#registerConfirm .bank-rate .rate-line {
+    width: 100%;
+    height: .4375rem;
+    margin-bottom: .625rem;
+    background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAA8EAAAAWBAMAAAAStYM5AAAAGFBMVEVHcEzm5+nl6Ojm5+nq6+3m6Ovm5+nn6epSLsURAAAACHRSTlMAqlnODyd/QwuL5CQAAADaSURBVGje7dlBC4IwHAXwIZrXluVZNPoAgnZ1RXVV+gKN7C74/SEkzFkLuu7xfgcRj0+e/rcJYXWoBCELog1DgKYemiWGrnBZqYIxAOtbIXTHHGCF+TBr7RkEboWT4ZqxxKi8/LVgWjEKUOMfuL8xC0iL4j1RMwxEvq7H26ZlHIDUtJt1khXzwKtwZLzV45qBwGnMl+rLmomACeLZh/nMAwg01/kKyb+zxFjC+NfSiTBk28/Bi3uXULzv04YLDyCgKtz994xckk52tr6GZUoOS4Q0WAfnRpLDlk9Wt26ScMP6JAAAAABJRU5ErkJggg==) no-repeat 50%/100% .4375rem
+}
+
+#registerConfirm .bank-rate p {
+    margin-bottom: 1.25rem;
+    color: #717783;
+    font-size: .875rem;
+    line-height: 1.1875rem;
+    overflow: hidden;
+    font-family: Pro-Normal
+}
+
+#registerConfirm .bank-rate p span {
+    float: right;
+    max-width: 7.5rem;
+    text-align: right
+}
+
+#registerConfirm .bank-rate p span.number {
+    font-family: Jinrong-Bold;
+    color: #a4a7b0
+}
+
+#registerConfirm .agree {
+    margin: 2.1875rem 0 1.4375rem;
+    font-size: .875rem;
+    line-height: 1.125rem;
+    font-family: Pro-Normal
+}
+
+#registerConfirm .agree img {
+    width: .875rem;
+    height: .875rem;
+    margin-right: .4375rem;
+    vertical-align: middle
+}
+
+#registerConfirm .agree span {
+    color: #0097ff
+}
+
+#registerConfirm .dialog {
+    height: 90%
+}
+
+#registerConfirm .dialog .content {
+    height: inherit;
+    margin: 0 1.25rem;
+    overflow: auto
+}
+
+#registerSign {
+    height: 100vh
+}
+
+#registerSign .dialog {
+    height: 97%
+}
+
+#registerSign .dialog .header span {
+    font-family: MILanPro_MEDIUM--GB1-4, MILanPro_MEDIUM--GB1, system-ui
+}
+
+#registerSign .dialog .content {
+    position: relative;
+    height: 90%
+}
+
+#registerSign .dialog .content .protocol {
+    margin: 0 1.25rem;
+    overflow: auto
+}
+
+#registerSign .dialog .content .handwriting {
+    position: absolute;
+    bottom: 0;
+    box-sizing: border-box;
+    width: 100%;
+    padding: 1.25rem
+}
+
+.rule-wrapper {
+    background: #fff
+}
+
+.rule-wrapper .rule-content {
+    margin: 0 .625rem;
+    overflow: auto;
+    color: #131c31;
+    font-size: .875rem
+}
+
+.rule-wrapper .rule-content .rule {
+    margin: 1.25rem 0;
+    list-style: none
+}
+
+.rule-wrapper .rule-content .rule-title {
+    text-align: center;
+    font-size: 1rem;
+    font-weight: 700
+}
+
+.rule-wrapper .rule-content .rule li {
+    margin: 1.25rem 0;
+    line-height: 1.3125rem
+}
+
+.rule-wrapper .rule-content .rule li.text-indent {
+    text-indent: 1.75rem
+}
+
+.rule-wrapper .rule-content .rule li .text-red {
+    color: #fe3d28
+}
+
+.rule-wrapper .rule-content .rule-sign {
+    float: right;
+    margin-top: .625rem
+}
+
+.rule-wrapper .rule-content .rule-sign li {
+    line-height: 1.3125rem
+}
+
+#adminMerchantInfo,
+#adminServices {
+    padding: 1.25rem;
+    color: #131c31
+}
+
+#adminMerchantInfo .dialog-wrapper.merchant-info-content,
+#adminMerchantInfo .merchant-info-content.merchant-info-content,
+#adminServices .dialog-wrapper.merchant-info-content,
+#adminServices .merchant-info-content.merchant-info-content {
+    margin-bottom: 1.875rem
+}
+
+#adminMerchantInfo .dialog-wrapper h2,
+#adminMerchantInfo .merchant-info-content h2,
+#adminServices .dialog-wrapper h2,
+#adminServices .merchant-info-content h2 {
+    margin-bottom: .875rem;
+    color: #0b204b;
+    font-size: 1.125rem;
+    line-height: 1.8125rem;
+    font-weight: 400
+}
+
+#adminMerchantInfo .dialog-wrapper h2 span,
+#adminMerchantInfo .merchant-info-content h2 span,
+#adminServices .dialog-wrapper h2 span,
+#adminServices .merchant-info-content h2 span {
+    float: right;
+    color: #a4a7b0
+}
+
+#adminMerchantInfo .dialog-wrapper h3,
+#adminMerchantInfo .merchant-info-content h3,
+#adminServices .dialog-wrapper h3,
+#adminServices .merchant-info-content h3 {
+    display: -webkit-box;
+    display: flex;
+    -webkit-box-pack: justify;
+    justify-content: space-between;
+    -webkit-box-align: center;
+    align-items: center;
+    padding: 1rem 0;
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(98%, #fff), to(#e5e6e8));
+    background: linear-gradient(180deg, #fff 98%, #e5e6e8);
+    overflow: hidden;
+    color: #0b204b;
+    font-family: MILanPro_NORMAL--GB1-4, MILanPro_NORMAL--GB1, system-ui;
+    font-size: .875rem;
+    line-height: 1.1875rem;
+    font-weight: 400;
+    font-family: Pro-Normal
+}
+
+#adminMerchantInfo .dialog-wrapper h3.less-padding,
+#adminMerchantInfo .merchant-info-content h3.less-padding,
+#adminServices .dialog-wrapper h3.less-padding,
+#adminServices .merchant-info-content h3.less-padding {
+    padding: .71875rem 0
+}
+
+#adminMerchantInfo .dialog-wrapper h3 label,
+#adminMerchantInfo .merchant-info-content h3 label,
+#adminServices .dialog-wrapper h3 label,
+#adminServices .merchant-info-content h3 label {
+    display: -webkit-box;
+    display: flex;
+    -webkit-box-pack: start;
+    justify-content: flex-start;
+    -webkit-box-align: center;
+    align-items: center
+}
+
+#adminMerchantInfo .dialog-wrapper h3 label img,
+#adminMerchantInfo .merchant-info-content h3 label img,
+#adminServices .dialog-wrapper h3 label img,
+#adminServices .merchant-info-content h3 label img {
+    width: 14px;
+    height: 14px;
+    margin-left: .3125rem
+}
+
+#adminMerchantInfo .dialog-wrapper h3 span,
+#adminMerchantInfo .merchant-info-content h3 span,
+#adminServices .dialog-wrapper h3 span,
+#adminServices .merchant-info-content h3 span {
+    float: right;
+    display: -webkit-box;
+    display: flex;
+    -webkit-box-pack: start;
+    justify-content: flex-start;
+    -webkit-box-align: center;
+    align-items: center;
+    max-width: 14.375rem;
+    text-align: right;
+    color: #98a1b3
+}
+
+#adminMerchantInfo .dialog-wrapper h3 span.number,
+#adminMerchantInfo .merchant-info-content h3 span.number,
+#adminServices .dialog-wrapper h3 span.number,
+#adminServices .merchant-info-content h3 span.number {
+    font-family: Jinrong-Bold;
+    letter-spacing: .0625rem
+}
+
+#adminMerchantInfo .dialog-wrapper h3 span img,
+#adminMerchantInfo .merchant-info-content h3 span img,
+#adminServices .dialog-wrapper h3 span img,
+#adminServices .merchant-info-content h3 span img {
+    width: .375rem;
+    height: .625rem
+}
+
+#adminMerchantInfo .dialog-wrapper h3 span img.logo,
+#adminMerchantInfo .merchant-info-content h3 span img.logo,
+#adminServices .dialog-wrapper h3 span img.logo,
+#adminServices .merchant-info-content h3 span img.logo {
+    width: .75rem;
+    height: .75rem;
+    margin-right: .375rem
+}
+
+#adminMerchantInfo .dialog-wrapper h3 .btn-copy,
+#adminMerchantInfo .merchant-info-content h3 .btn-copy,
+#adminServices .dialog-wrapper h3 .btn-copy,
+#adminServices .merchant-info-content h3 .btn-copy {
+    margin-left: .25rem;
+    color: #0097ff;
+    font-family: Pro-Medium
+}
+
+#adminMerchantInfo .dialog h3,
+#adminTransactionDetail .dialog h3 {
+    margin: .4375rem 0 .8125rem;
+    font-size: .9375rem;
+    line-height: 1.3125rem;
+    color: rgba(0, 0, 0, .7)
+}
+
+#adminMerchantInfo .dialog p,
+#adminTransactionDetail .dialog p {
+    font-size: .875rem;
+    line-height: 1.25rem;
+    color: rgba(0, 0, 0, .4)
+}
+
+#adminMerchantInfo .dialog .btn-wrapper,
+#adminTransactionDetail .dialog .btn-wrapper {
+    margin-top: 2.5rem
+}
+
+#adminContractRate {
+    padding: 1.25rem;
+    color: #131c31
+}
+
+#adminContractRate .contract-rate-content {
+    margin-bottom: 1.875rem
+}
+
+#adminContractRate .contract-rate-content h2 {
+    margin-bottom: .875rem;
+    color: #333;
+    font-size: 1.375rem;
+    line-height: 1.8125rem;
+    font-weight: 400
+}
+
+#adminContractRate .contract-rate-content h2 span {
+    float: right;
+    color: #a4a7b0
+}
+
+#adminContractRate .contract-rate-content h3 {
+    display: -webkit-box;
+    display: flex;
+    -webkit-box-pack: justify;
+    justify-content: space-between;
+    -webkit-box-align: center;
+    align-items: center;
+    padding: 1rem 0;
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(98%, #fff), to(#e5e6e8));
+    background: linear-gradient(180deg, #fff 98%, #e5e6e8);
+    overflow: hidden;
+    color: #131c31;
+    font-family: MILanPro_NORMAL--GB1-4, MILanPro_NORMAL--GB1, system-ui;
+    font-size: .875rem;
+    line-height: 1.1875rem;
+    font-weight: 400
+}
+
+#adminContractRate .contract-rate-content h3 label>img {
+    width: 2rem;
+    height: 1rem
+}
+
+#adminContractRate .contract-rate-content h3 span {
+    float: right;
+    max-width: 6.25rem;
+    text-align: right;
+    color: #a4a7b0
+}
+
+#adminContractRate .contract-rate-content h3 span.number {
+    font-family: Jinrong-Bold
+}
+
+#adminContractRate .contract-rate-content h3 span img {
+    width: .375rem;
+    height: .625rem
+}
+
+#adminContractRate .contract-info {
+    margin-top: 1.875rem;
+    font-size: .75rem;
+    line-height: 1rem;
+    color: #717783
+}
+
+#adminContractRate .contract-info h3 {
+    padding: 0;
+    margin-bottom: .3125rem;
+    background: none
+}
+
+#adminMaterial .material-wrapper p {
+    margin: 1.25rem;
+    font-size: .875rem;
+    line-height: 1.1875rem;
+    color: #131c31
+}
+
+#adminMaterial .material-banner {
+    position: relative;
+    display: inline-block
+}
+
+#adminMaterial .material-banner img {
+    width: 100%
+}
+
+#adminMaterial .material-banner .material-question {
+    position: absolute;
+    bottom: 2.6875rem;
+    left: 6%;
+    padding-right: .875rem;
+    font-size: .75rem;
+    line-height: .75rem;
+    color: #948d88;
+    background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACEAAAAhCAMAAABgOjJdAAAA21BMVEUAAAD///+ZmczMzMy/v7+xxMSzs7+8vMi1v7+0vMO9vcW5ucW6ur+4uMK3u7+4vMO3u8S7vsS6usC4u8O6usK4u8K5u8K3ucC5u8K5ucK4usG5ucG5usG5u8K4usG4vMG4ucG4u8G4usG5usG4ucC4ucK5usG4usK4ucG5u8K4ucG4usG4usK4usC5u8G4usK4usC4usG4usG3ucG4usG4usG5usG4usG4usG4usK4usG5usG4usG5u8K6vMK6vMO7vcTOz9TW19vY2t3e3uLh4uXk5ejw8PL///9PGq1wAAAAPHRSTlMAAQUFCA0UFxgiIywwNkBIUlJZXmBsbXV1eYyPkZKUlKWssbK3t73DxsjR09TX6Or09Pf5+fr6+/z9/v4UmA9IAAAA2UlEQVQ4y+XSxxKCMBCAYbABFiwoih1FwK6o2LAXfP8ncmeEaDCWgzf/2+58l+yEopwCqbZpeZs3Ez4X0MLAItXjXRGsWuQqrmAUmIwh3hh2DUykY3j5qVfEKLzM5EtBBxkoooKIM04h/4MICFUFUvsgdMWpVo7eRYp4h0U3jESHfIZRFgmTLJYFJGDanG28PSxLj2JrX/COfyd0SZLqs3fCTf4och+EobEvRasEFUWOevuWWz8S68MJb4eJOUwrb7ArItEk/0JDRCLZIwqNQ8LPVxpPyTkWgSvVIcZrAOaCXAAAAABJRU5ErkJggg==) no-repeat 100%/.6875rem .6875rem;
+    -webkit-transform: scale(.75);
+    transform: scale(.75);
+    -webkit-transform-origin: 0 top;
+    transform-origin: 0 top;
+    overflow: hidden
+}
+
+#adminMaterial .material-content {
+    padding: 1.25rem 1.25rem 6.875rem
+}
+
+#adminMaterial .material-content h2 {
+    color: #131c31;
+    font-size: 1.125rem;
+    font-weight: 400;
+    line-height: 1.5rem
+}
+
+#adminMaterial .material-content>div {
+    margin-top: 1.25rem
+}
+
+#adminMaterial .material-content .subtitle {
+    font-family: MILanPro_NORMAL--GB1-4, MILanPro_NORMAL--GB1, system-ui;
+    font-size: .875rem;
+    font-weight: 400;
+    line-height: 1.1875rem
+}
+
+#adminMaterial .material-content .subtitle .warning {
+    color: #ff561a
+}
+
+#adminMaterial .material-bottom {
+    position: fixed;
+    bottom: 0;
+    box-sizing: border-box;
+    display: -webkit-box;
+    display: flex;
+    -webkit-box-pack: justify;
+    justify-content: space-between;
+    -webkit-box-align: center;
+    align-items: center;
+    width: 100%;
+    max-width: 800px;
+    padding: .4375rem 1.25rem;
+    box-shadow: 0 0 .375rem 0 rgba(19, 28, 49, .08);
+    background-color: #fff
+}
+
+#adminMaterial .material-bottom-info {
+    display: inline-block;
+    overflow: hidden;
+    color: #131c31;
+    font-size: .75rem;
+    line-height: 1.0625rem
+}
+
+#adminMaterial .material-bottom-info .price {
+    margin: 0 .25rem;
+    color: #fe3d28
+}
+
+#adminMaterial .material-bottom-info .price span {
+    font-size: 1.375rem;
+    line-height: 1.625rem
+}
+
+#adminMaterial .material-bottom-info .price span.two {
+    font-size: 1.1875rem;
+    line-height: 1.375rem
+}
+
+#adminMaterial .material-bottom-info .price span.three {
+    font-size: 1rem;
+    line-height: 1.1875rem
+}
+
+#adminMaterial .material-bottom-info .cost {
+    color: #b8bac1;
+    font-size: .6875rem;
+    line-height: .875rem;
+    text-decoration: line-through
+}
+
+#adminMaterial .material-bottom-button {
+    position: relative;
+    float: right
+}
+
+#adminMaterial .material-bottom-button .free-num {
+    position: absolute;
+    top: -1.75rem;
+    left: .375rem
+}
+
+#adminMaterial .material-bottom-button .free-num .num {
+    padding: .25rem .625rem;
+    border-radius: 1.125rem 1.125rem 1.125rem 0;
+    color: #fff;
+    background-color: #ff561a;
+    font-size: .5625rem;
+    line-height: .75rem
+}
+
+#adminMaterial .material-bottom-button .free-num .radius {
+    display: block;
+    width: .5rem;
+    height: .5rem;
+    background-color: #ff561a
+}
+
+#adminMaterial .material-bottom-button .free-num .radius .border-radius {
+    width: inherit;
+    height: inherit;
+    border-radius: .5rem 0 0;
+    background-color: #fff
+}
+
+#adminMaterial .material-bottom-button button {
+    width: 10.8125rem;
+    padding: .625rem 0;
+    border-radius: 1.25rem;
+    text-align: center;
+    color: #fff;
+    background-color: #005cff
+}
+
+#adminActivity img {
+    width: 100%
+}
+
+#adminTransaction,
+#adminWithdraw {
+    position: relative;
+    padding-bottom: 3.3125rem
+}
+
+#adminTransaction .record-banner,
+#adminWithdraw .record-banner {
+    display: inline-block
+}
+
+#adminTransaction .record-banner img,
+#adminWithdraw .record-banner img {
+    width: 100%
+}
+
+#adminTransaction .nav,
+#adminWithdraw .nav {
+    position: absolute;
+    top: 0;
+    box-sizing: border-box;
+    width: 100%;
+    padding: 1rem 1.25rem .5rem
+}
+
+#adminTransaction>.total-info,
+#adminWithdraw>.total-info {
+    position: absolute;
+    top: 5.3125rem;
+    display: -webkit-box;
+    display: flex;
+    -webkit-box-pack: left;
+    justify-content: left;
+    -webkit-box-align: baseline;
+    align-items: baseline;
+    box-sizing: border-box;
+    width: 100%;
+    padding: 0 1.25rem
+}
+
+#adminTransaction>.total-info .collection .num,
+#adminTransaction>.total-info .refund .num,
+#adminWithdraw>.total-info .collection .num,
+#adminWithdraw>.total-info .refund .num {
+    color: #fff;
+    font-family: Jinrong-Bold;
+    font-size: 2.0625rem;
+    line-height: 2.5rem
+}
+
+#adminTransaction>.total-info .collection .info,
+#adminTransaction>.total-info .refund .info,
+#adminWithdraw>.total-info .collection .info,
+#adminWithdraw>.total-info .refund .info {
+    color: #b5d8ff;
+    font-size: .8125rem;
+    line-height: 1.0625rem
+}
+
+#adminTransaction>.total-info .collection .info span,
+#adminTransaction>.total-info .refund .info span,
+#adminWithdraw>.total-info .collection .info span,
+#adminWithdraw>.total-info .refund .info span {
+    color: #fff
+}
+
+#adminTransaction>.total-info .collection .num,
+#adminWithdraw>.total-info .collection .num {
+    margin-bottom: .3125rem
+}
+
+#adminTransaction>.total-info .refund,
+#adminWithdraw>.total-info .refund {
+    margin-left: 2.0625rem
+}
+
+#adminTransaction>.total-info .refund .num,
+#adminWithdraw>.total-info .refund .num {
+    margin-bottom: .5rem;
+    font-size: 1.375rem;
+    line-height: 1.625rem
+}
+
+#adminTransaction .list,
+#adminWithdraw .list {
+    display: inline-block;
+    box-sizing: border-box;
+    width: 100%;
+    padding-top: .75rem;
+    margin-top: -.75rem;
+    border-radius: .75rem .75rem 0 0;
+    background-color: #fff
+}
+
+#adminTransaction .list .record-list li:first-child ul .sticky-item,
+#adminWithdraw .list .record-list li:first-child ul .sticky-item {
+    display: none
+}
+
+#adminTransactionDetail .detail,
+#adminWithdrawDetail .detail {
+    padding: 1.25rem
+}
+
+#adminTransactionDetail .detail>.title,
+#adminWithdrawDetail .detail>.title {
+    margin: 1.875rem 0;
+    text-align: center
+}
+
+#adminTransactionDetail .detail>.title h2,
+#adminWithdrawDetail .detail>.title h2 {
+    color: #000;
+    font-family: Jinrong-Bold;
+    font-size: 2.3125rem;
+    line-height: 2.75rem;
+    font-weight: 400
+}
+
+#adminTransactionDetail .detail>.title p,
+#adminWithdrawDetail .detail>.title p {
+    color: #717783;
+    font-size: .9375rem;
+    line-height: 1.25rem
+}
+
+#adminTransactionDetail .detail>.title p.error,
+#adminWithdrawDetail .detail>.title p.error {
+    color: #fe3d28
+}
+
+#adminTransactionDetail .detail>.content,
+#adminWithdrawDetail .detail>.content {
+    font-size: .875rem;
+    line-height: 1.1875rem
+}
+
+#adminTransactionDetail .detail>.content li,
+#adminWithdrawDetail .detail>.content li {
+    margin-top: 1rem;
+    padding-bottom: 1rem;
+    overflow: hidden
+}
+
+#adminTransactionDetail .detail>.content li.under-border,
+#adminWithdrawDetail .detail>.content li.under-border {
+    border-bottom: 1px solid #e5e6e8
+}
+
+#adminTransactionDetail .detail>.content li span,
+#adminWithdrawDetail .detail>.content li span {
+    float: right;
+    max-width: 70%;
+    color: #a4a7b0;
+    text-align: right;
+    font-family: MILanPro_MEDIUM--GB1-4, MILanPro_MEDIUM--GB1, system-ui;
+    word-break: break-word
+}
+
+#adminTransactionDetail .detail>.content li img,
+#adminWithdrawDetail .detail>.content li img {
+    position: relative;
+    top: .125rem;
+    height: .875rem
+}
+
+#adminTransactionFilter {
+    padding: 1.5rem 1.25rem 6.25rem
+}
+
+#adminTransactionFilter h3 {
+    color: #0b204b;
+    line-height: 1.375rem;
+    font-size: 1rem;
+    font-family: Pro-DemiBold;
+    font-weight: 700
+}
+
+#adminTransactionFilter .list-name {
+    display: -webkit-box;
+    display: flex;
+    justify-content: space-around;
+    flex-wrap: wrap
+}
+
+#adminTransactionFilter .list-name li {
+    margin-top: .875rem;
+    width: 22.7%;
+    height: 2.3125rem;
+    background-color: #f2f4f7;
+    border-radius: 1.15625rem;
+    font-size: .875rem;
+    color: #3a4a6e;
+    text-align: center;
+    line-height: 2.3125rem;
+    box-sizing: border-box;
+    font-family: Pro-Normal
+}
+
+#adminTransactionFilter .list-name li.active {
+    color: #0097ff;
+    border: .03125rem solid #0097ff;
+    background-color: #e6f5ff;
+    font-family: Pro-Medium
+}
+
+#adminTransactionFilter .list-name li.nothing {
+    visibility: hidden
+}
+
+#adminTransactionFilter .list-name.list-status li {
+    width: 31%;
+    height: 2.625rem;
+    line-height: 2.625rem;
+    border-radius: .375rem
+}
+
+#adminTransactionFilter .list-name.list-status li.active {
+    color: #0097ff;
+    background-color: #e6f5ff;
+    border: .0625rem solid #0097ff
+}
+
+#adminTransactionFilter .transaction-method li {
+    background-repeat: no-repeat;
+    background-size: 1rem 1rem;
+    box-sizing: border-box;
+    text-align: start;
+    background-position: 1.75rem;
+    padding-left: 3rem
+}
+
+#adminTransactionFilter .transaction-method li:first-of-type {
+    text-align: center;
+    padding-left: 0
+}
+
+#adminTransactionFilter .transaction-method li:nth-of-type(2) {
+    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAGYElEQVRo3tVa+1OUZRTesX6wX2qmmWr6D+rHxhZcDSUXFlArUcBy1JTUMvOWjVl4AdSx1MamTFNTm9RSEthl5Q5yUUFAwPGCN1SUmyCX5b7s7emcF9TV9ttdPnaFPcw7O8N8+33nOe/zPuec76xCYWeBhwPHBulU76h1ynh1srKSlmGKVmmbkqzESCx6fvsUrd958meDRq96KzAvcKxCytQ6/zfowp1qrbJ+pBx2AaaBVnxIhupVh87TRVm0LKPR+SfrXSMF+GRkQuQLT9GGIz/6nX+ygpKUO4hOLwoAgvOjlDaSS6tsVCf5qQbpo4z3KefF8rOotf4bYxE7RsFq43sAxKE+GZQw7hWFkEqvPcTPmyDyNUkTXld4QueDtP4ITZmIiLRQLMtfgG3lm6C/m4RrbVdQ2lSEQ1V7EVP8NaJzo/DBqfeh0U2AWjtscCUBiePeVAwnumEpAViQE4UdFZtRUJeLpp5GWGwWSJnR0odqw00kVv+DdUUrMTtjugAjF0CIXAChuon4qiAaJ24dwe2OWzBbzRiqdZu6UNlchr2Xd2Fe1kzaxfHeB8BRj0wPw0GiRGNPAywyHLc3G/3xrjDVtl3YSPQK9B6AYIpQdO5s5NVly4q4KzP0G3DsxmFEUIDcPPzuA+DtZcpU0JZ70/osvTh1Nxlzs8LdAeEeAL7R/OxZQk2sNqtXAfRb+1HTeRvxpd+JHfcIgPDUYKTX6L3iPJ8Bs82MdmOr2N19V34hVYsU6jYjVY0Q5wrlGkAIqQ1LZK+51+OuGy1G1HfX4XRdJraXx4td5udxLomjHUisPo6VhYudUck5AP7inMwPcbX1kmdpQo7Xdt1DWo2OcsEKhKcFC7pM00+iJLgQKXcS0dzbJADq7pzEdH2gPAB80y1lMegydUokJSNajQ/dUCQbTFYTqUw7qkguE24dw6rCJSKXcJCm6SdjUe4n2H/lV8F/e6s23MCXlNllAZhKEUm6fcJhZrXS/y63XERsybc425CPHnO3Q373kcbfJac42lvK1gt1CU15T9w/jD6/yJuPv64dwM326yIfPGscvB/L46Ro5BzArLQQFDeecRxTm42idQefEm85ev9WH0NL30M7mvTjpuE6ZeqjWHtuubiXRqd6XDdxCbHr4jZUPrwgwDNYKVU6cHU3gge/OyQA87MjhJPSdY0Rf1z9Tdx8RmoQdlZsRemDIpQ3l+LPa/uxonCRoId9wcfXxRSvwenaTKJUm8vzwrvPdVPY4K4NCcDi3DnE8RanEsicjs6ZPUiJANqRCCzMiRIlwaNt58+ZaRpsLFmL1Jpk3KOguJvJWbo5sU1NmTR0AKxA7KAz6zX3YPelnySTTrBWJZQltUY7UDvZhlaCMNCj1w9K5QPnAD6iRJJfl+MyQucaCkSE7b/LfJ+XPVNQjGloIi7LMabpHqpWJQLkHADL3BFCbyYJdGYc2Zji1Y95HpUxFdsr4sV56OzvkDyg7lgbUTiudJ08FWJn1lMX1UFVoqv6Jb8+R2TS74tXoaA+V5wdZ42Nu1bVelmonOxSIpyoUSQhpc9ytbWvBZ2mDljhmZqJy5cj0vx3DwBzj3W8jYqt52m8e5daKoWqDbsaZXnkw9gv8yDKqVAfUG+9ibK8i8bf/YaGD2bW/VSXB9oT1mEyUMu6RxR3HuvIHjU1mff0ojDzVuSZqoeqfhc9iMd7YgYRkR5KZcI+8UbB087f76rBD+WxVD5P9u5rFW44CkkqPWGcCDlXcEXLPbfGcdHmWQBRGdNQ8uDcsFWmvrsWGUTJTVQjcSaX8RpSHoAlp+eKVvDR1vObNk73fPDKms5TWd3soFgbeP/DnVjO/XSiSpw4U0yXYbw/HToAzs6bqUvjRoUdTaz+Gx9TbW9/TrgF5DpoecFn+ObsMqw5sxRLqXHh60Idl8XPD4CGqsut1Flxh7X6zOfuvPrw5pJHIU5sw9x6zwIQo0zfHHDkhaUFvMY7UOKTALTK42FH/V/mGdkGHwRgCdL6xcTGKsYogk6Nf5uHyD4GoJZmxn4Dc2Ia3/MEnIfIPsJ9K60NTw27eXzPE3BfcJ4+f45MUL30v58bMCKegPMQmeewo43zTJuByDtw/vHPDmh8zxNwHiLzHJZHmYMqNSKLpZLVhg8sc/4p2jgznoDzEJnnsDzKDBmhxTrPUinURsL+A8qrPjCv5gs+AAAAAElFTkSuQmCC);
+    background-position: 1.75rem;
+    padding-left: 3rem
+}
+
+#adminTransactionFilter .transaction-method li:nth-of-type(3) {
+    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAIe0lEQVRo3s1aa3BU9RXfTQCTkBBKeVctMmhbA6V1REqrTq20/dLxQa3TzhQ+wNTUzjhoS512MAiM1KmgtZ32g+MHN8kukk0gMUQIzw0xQZZXkIetJSEhj33cu6/s+336O3cXuu9dkhuTO3NmZ3f/e+/5ncfvnPP/r0KRcOl0/SVvnx747ptdAztf1I30LNlvdZRoxOhd9QJ92VKiFuneRot9/THjmR1dgzV/0Bm+qevvL1Fku67cuLFg4/HhPStbhJEyjUAKtYUUtebJl3qRyvaKtLxZMDzXbtj5zumhORmVf/7I8NEKrSOsqBOmhuIpoqwTaXaDxf+rY4YmIipOCpuNxwf3lLPyU1DxJIFxK7U2qj42uFuno2kSgDcR8ytbzCNT1fLpIERaul80bukYWCMB2IWELVXL+AAV5ANTusgIYqbGHH6idWQbQqlIUX1ypEehtsp28xIwyPouJ20+67ot1Z86aXGjfKQwHQz1+MfmpvfO91Uq7mm0OBS18oSPEtavarFSIEJJlzUQpUfb7THvyPEcyLJGY8dvj/TOVyjrhKhsTAEFV7ZaKZQCQPRHZAXAcp/WqP91+8AihaxUlwvA4ckGoMovEoCPMgP4wS0AhYisAFRS1tMirZhXvgZ58og9DYAVAJ466aBFDfnvsRAidQKyAIDyxZCXzjpJ8EXyihnCykaT9Zfe25DIgjf/PfpdEdrU7aRpdTJ5oFhloudPOejwcCCvtEO6zME0AEF45IwYLOgeLTf99DS8VSxnDpSC2+fuzS/z4Po1h2xpIWSB9dcetdNcTf57fBVrSuonkoUmMoknmkYrYaHFnGwNmWUx5Eft6R7gQnY7ibPIAkiJWpg4ANMgf7roos8dIbqWQ/qc4bQcCOODflc45+9OGAP0cJttAmg0AcD2S266DgXHI70Q0R9NYym9GKKv30G/dMcAuP9gV69otmA6Grs8/JGF6nq9aR5SXffRLPWX0Uqoxi6c5Hc3inQWlJp4uUJR2qx35aXOcQEo4qLGrSwobkZ97JWLTXH8O2UBsctr1520S8Uu8fpiNEzfa7NOAAtBqRl4nY/QefywlTZ+MkqvXnDRth43bUVCb9Y7aX2ng35yxEZVzSLN3SegZsTyRZmJxdCS/PPfniSWgvHpwxt+qtAI8gIogiyEQr/pdlAHGMKINsAZjJIPARuIRMmPVw+e7gBFmqUWIEw6rHv7qoeehZWX7rdIMT291nQ7hL6D+L9qDyVZn1uMZ0445K0DrPxDrRZqHfSjDYhKLMGJxtZi5XlgYSvyZ3ibkTZvApC230/V3aO0GuFxX4MgeS6csJjvcQjtA1d62dppjuVVeOA5S1B6mBtaX7HHlHnnmpd2gEpZ9lz1gk188E6QBj0R8mJdKBVJXMkboM6jIwEa8oSTvjPAq0+fGNuckBXAwn2iFAqs/EVriKpPO2lpk0hf0cTiewZ2L1hKkcCV6tj6hw5apdn3uCFIFnB8MAOQ1Is91zYUoCX4fXGdTAA4dF44PSpZ/YwQpBWYbxUqU34LxXciZqIV+DHmAeZ5LlqcL9EsYPhjzh1Nn49+2TFKDyBnKvD74iwEUBCAStygccAv9eXfP2S7c9fGk7UMnnkUv//LZY9EkfkuNpgeteFvIICfMwHA42X1MdrN1uhlBHAPGjXudWr7/FQ0zr0ctuK9SNy2IT8VEFG388WCGsH599crHnoCjeECMGFJXdwrCWAyAngApd4E67+CeB7PZhQ/bMGHAu2+4k4LG6ZiL0IrUgAqpmkekF7vcdFa1Jpl8MxsdMRcQJdlBHDAIvH9rsvucQHg+vHGJReNBpMr7hDY6rULbqq56JYU4xoSLiThIRzW3eYAvf9fr1RAX+y06Hd1pgC4GxX3MgpND9inXCOMaVtlDiz/7jWPZOnUmeCVc26Jye4Ciy1BT/QCGO4TAOG1kQLjjNexZ0S3Tz8giskAKpB8arACM8frKDqzkNTKAhXnMXAVil9Dvy8tbIZh+T9C+eLUZPzATLMBeEMnz9x+yfucB4VgCQQCejEVANPoczqHRG82lNs3ULC+jRFxtoa5P5neimpjSs+DAmtQ+F5Db/SZNZgUElyxL9lCkqXLslXbeCPIrfo6PPtf6JUuWEJkQzLnCq+MAFjKYfW/f+6ROJyT7TMo8BZygm/+CCamB9HPLAco3mnb1DWKPt4r9UG+lKc5EBYHwUCPfWyXwBea/OWIguWoP1vOuegUwkvMAiQrABauupwsTGm3YpPzkT3DIyMrbOf9n2h6fDKQy7YwbUcILm6wxArhGGYOJUiEN8o2oZc6cDNAfXgmtyu39MkJgG8wHyX+96BT3s+x+rn7zBybbB1vOMYSvPYtFCMuYlyVx70XqoqF6iLUk58dt6P/8mAYCkkdrNsXB6DMcTLDBYSp9XefutCz++g8CswXPNdi96zXGcEwHqZTpiC99x8vbcCswGtnqifmZKYoHt4PNlvpZUxvbf1u/fkBAMDBgz3n+UC8z5leF5+JEZ/cHq9CA3f/fqvEIkqV/KcwOcMLM0ZVk0n3UqdxnmLD0WE9H2UW3uuYEsQs65Z5wTskYLTVraZ9/zhzfZZiR9dADe8GK+MswMKlujTeTCV+PjUO+gQq32sO/7DVsHX7dpyRvXxq4FtVTQaDMkXZTDJVzotxSjn0aufQI7FzYhzff6PRsLOo1uSf6gCYcOY2WCLrDhlrtNqEw+5Z2tE5+LJpKgNgy7Pyz7Yb3sXfDUrT/m7wCyBa3TKye2GDYEQjF55RH5+O4qV+MgAopX0ogSr2CuFlzZahde3DNRmV///fDmjan3EC/tM247YncQ674oCp4/5Go36ypOqASffYQeO+tW2GrVsR80lhk+viE3AtDpG3dPfO56FhsoR5nqlSYpss1/8A/lLiqmlpGZ4AAAAASUVORK5CYII=);
+    background-position: 1.3125rem;
+    padding-left: 2.5625rem
+}
+
+#adminTransactionFilter .transaction-method li:nth-of-type(4) {
+    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAIAAADYYG7QAAAMpklEQVRYw61Ze3Bc1Xn/feece3dX0ur9ftmWsBNZziBD/GrBEHDtGGYIwaZMAhSalJk0004mJKGBNukEkrbESWGgDUPSkoQJdVIXqNvEaeJC3SGNX/ghJD/lhx7Yeq5kaSXt7n18X/+4+9Bi2VhJ7h+ru1fnnvM7v+873+93ztLUdAKZSyky7OvJcZzrkZNddKabBvohAJD9lNwfSj9MXwKBgAQEABI0VABBRNI9aGlskLZ21b5CLWn1y8p9bbHk9UIBICLYWusLvfjpq/jf3fRuHyWTIgLS6YEAMCCU/Ta3n+ChCGWeZ9Gk/yeZCaSxhcPUvFjfeqv+2Me5pdVlyfZGU9MJIoRti44fxdefUGdPgRlEuS7y0GQGzKIhiATfSeQyNAgQkEiW3czLLFCali4zn3+Ubr016UkOUMhofaqLPvcpGh+D1plX8tCIEObn5jdCA0AoDat5kf3kk7zu9xyPASilSF/oxdcfvwoa/JZokEMT3FCAJsi5/j532zbqOa0VAVCGffz0VXX21FW4mSdvKI1G5BrQSI4bkmzoc2/xiZP+yz+ixCwApS+N057dYM6hwTVEKpM382TxldGkp5KPBkJwPX/fPpw8SYCic6fxbm9eFss1RIpFGPNzwwKZg0YAFgQ3ko8m80SIZHQU585BRMnJLkolc2iMhjFQlmhLjIY20EaUgTbQOrvGpLYeGzZJQQG0gjZQdtBAlBKtc6SQoo4OtWUrIhGAwAHrABG1tdHddyMSSQ+dSsnIKHzfqD2/EArKF3j1OvVHn6FIJJeGc6+U4770Ar21B6TQttx66mlcGEAymY5Chj6eTXg/3+W//hpY1Nq19pPfwNBgau+vJTkMS0nAasjWd9xpb9o0e+o0uo9BafFY4nEwG5w6mat+joOhi2Lb2QjlwXJdchwBgbR0v+M9/4z6QBuUyrIBAES07APWpx/h/fupsdH64mOITzk7dkikUD/0MKLRdFNt9KrVVFFhtmz1tOauYyKC2Vkwm7lrio4c4s5OUGZBZ3I8HXAGXB+kpLpKf+Up/vEr3k+2B4ojdfUyMYH4NEjpP7zP+uyf0W232w88gKlpZ8cOddPvw3Wte+6h6qr0FIlQWEjhsP3RTdzTw13HJZ1ZYuYIFCEShdF54pVTBgFIfMZ0HNV15uaPeAcO+G/9CsbgpvX2X/ylf/Sw982nZXREXJfKy0OPfhF9vannntVbtpqmpsTfP5N45E9ACskUALFs69Ofsm+/bfaxJ/jAAREBEUAAmUy2Q8or6QtP6MoqaA0BmOU9iSSQ8Zj7wnNghgiYQcDGjXrrff7eX5vbN+Bzjvv8c4hGAcLZM6m//Rvu6rI+cT8EVFFp7t0qI2PuD3+IsRjCIczOwvMxNSWeJ9pkGTAZMgippPSd48Ss2rAZqRTvfQueJ3lUicRimJ5GuDCgXTZstB//qpw84b74HT7faz/yCDUvUrW1fPKE85W/4qOdKCoKIi+uQwL7jx+GbTvPP08eg1Sw6iXjGkgggAFTWsOnpvDsNr+xmTbcwb/8mfzd18R1wenGKCsTECZiUDaqaiEizc32Jx9Ef5+z7WnpH/BfedktiNgPPSwjI6nt27mvb07ZIsQmnG3fFm3srVtkNuF+958yeZEu+UENTzOUroREYtl01xayjBzcL0SwQ4GjgB1Sn/lzWtzifenzmJlBEPLYhPfid/xj3XL8OJRCMun94CXp7UVJqb75Zjl8WMYnMnAggMRi7jPPYnJS1dZIKAThvEzNxMLMiYdISan+g80SG5N3DsNnQKUbOo5MTZo16/xbbpP//Pf02otP+a+9KiwglRaLySneuZPuvddc3+ERieRqMQCQksHh1LeegdLw3LxMkFwtMzkDKKDSMlVeIVph812SSIAo25wWLYHSqqXFSwc4T6cCxqm8gjpW6tVrxffFdYNVM1d3BICTQkWlWrNarWiHAK6bbxhhck6FSEaGvF079e2bzP0Pv7dMM/PbB7xf7AIpnorz2TM8NhaImaRHJqxYYX/pMSoocN98Q4aGQUo8j/v64DqSSKVFR2m9siP8+GPk+c7u//YHBjKlFSIggLzrW9j1ctxZlpRXQpmsMQ1mScwSj0s8LkJQClXVuHQJiQQHaIQYoFCYqqtFILEYpmcC0qk4KnZIRmNgluBJJELV1eL7MjoqiSQAYYDIuv8+evzLmWWvMq7c8TA0lLO4aV8sjMDHEADxGUNDga0hAUAc3CSS3NubjVSaksm4cDwj/ASBzCbkfG+6GAreEzIVLIPL/M0cNEVRNDaiMIqGegRuXICCQrR9kJSioJJIhk+lqLGROjpQXx9kdM7ESnaFB5o0DxoARiDZ0Mzjb1ho/Xr64Ap//1618kbvH/+BystkKo5IhKpq5Ow5KStGPA7PQ2kpHA+uq//0syBQNOp89WtCkEQKvi+B0yONmZlshss8jmJOpZ7fbSlS7R+Si4NU3yDjMfPoF9DUjHcH/D1vqPp6eeBBtXQp9/Tg0iW1aaNMTPr/8mNVW+u++pr56CZ0dFgbN1DK8Y4coYJChMMycMHd9fMrcZMN2dV8sdghalrEveepqkpiY6r1On5jN1VUqmVt1NKiOzr87dtVQyOtWs1v/A8mJqi5icrKqLbG/ckOKi2R8QmqrJTJKf3hG6mh3t2/P6fUV7iUQF3FF0NpAdRNt6CqBtMz4jjwmXvPU22dDA7BDtHatTwyTJGInDsPz6do1O/s9L7/spw5Y+7YDCK/54z0DqCywntzD0ZHAXUVNABMOtWu4NJlZtb71jfpw6vkyBG+dAn//D2JTXBnF5WWSF8f9/RQJOLvP8itLXz6DMfjcD3Zux+uy8Ojzks/UHW1/r6DKhrlrm7/4NtQ5opoCEEdJucja/2KSpw9g5nEnK3THJfODPaFFIGIRYiChSJEafdOSoRBGswCAkRICQCPRYSUopUdMJrfPhzI12VQCIWFanGzdedmeehBg/oG66+/4Z84Lq//m3R2ysw0/LSkZnZ1JNoEmwPR2a1LENCsfTUAROkAaVrDtQ7OGeSdLjDPg4YIRYW643r7no+ZFe1+bNwDGRBReYV918dl853e/n38X7v40CEMD8vsLDwvpwySLSJBkZgb6TllUHL+JrdR9fNPOIyhwgKqq9U3dFibN9nr1qiiIh4d5fFLeWpPlm3dtF7WrOOBfu7u9t/plGPHeKCPxieQciSzJRaRvO3inIFFMptryRNxEUAp2LYqL6PFi3T7crPyetPephc1Uzh8eR2iPBYtS7e06iUtZuMmTE/z6LB/7Lh/9KicOiUXLsjkJBwHHoMlbzwRDnZbae4IACwFK0TFUVVXq5YvNzd0mBXturaGigopHA5SeL7CKPMnGoXDCId1ZaVua8fWe8VxZGzM7++XgQG5OMhjozJxCdMznEqR40F8RQRtIxRCYSFKiqmyUjXU6eYm1dysqqvUZUxcednLNbUj26b6elVfj7Vr0+FwXbiuuK4wI5BKrWEZsiwYQ0R0BQ7eDxDLb/Aa4nGvfwCenyLVpwuSpACIhoQEigAxpBZXVpUVFCwY0Ew8UUpqYS/5fuKVf0298CJ53q9ClV8uXj6pbJBwjfhNkrYIWj9195ZPrlq7gG6JABjUNMLzF4RHEkln53/IhYvQel+0/DSnSFKw4FUzZ7Tcse2icGQBnbKI0SBSkVvW81R8IXDEHx7i02dgjK/UEbscpJQiWEABgQhERFQWLV7Z2LSAXh1HCFBKqeuW8OjogqbidnbL5CQRTajQcROloDSGIHaaHg201dbVlZQuAFB8GizQSlFTkz8yIo5z7QnkH3w7kLoeUzSsQ4GDkQKIziSmUquaFxl1zamZTPnDIxIOg5Ti4hJ4Hg+PXCtBM9N+V3dwIHnYLnUCPVOQYiADIBIKrV60ZAE5MDToDw1SY4MAyrdsvWxZ6v/28vQ03rcoifCFi9w3AK0TpA+ZkrRuaXABZ31ETVHx0pqaa0TDsXHnaJduvY6LSwAoFuHWVlVZ4ex+k2Ox98XEQyPwfAqH4pGiwcLSopCJhKyCIjsatYqNVWxZpba9sqGhorDoWtKRY+POkU4qKZYV7cycO8kPEfjQYX73gr1mlaqro3DoChOC39eX3PkzcZIJ0q+H64d1mAAx4BoOzEnIWLcsXbZmSYu+eg4lU97goHu0U5WUyo03uMbK+60DgK0VTpzwu7p1Y72uq6NolGwbv/NLADfFU9P+8LA/OKRbW+VDK1y57MeX9HJVRFNT0t+PlENaUTJFMzPZs2XIb42GSCJhCUdEGKEwNTZwSWkQqfkB5U62heEzPA/Mv2OGlIIx0Co4sLr8+n8Dst4T6oLIZAAAAABJRU5ErkJggg==)
+}
+
+#adminTransactionFilter .transaction-method li:nth-of-type(5) {
+    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADYAAAA2CAYAAACMRWrdAAAFUklEQVRo3u2ZW2wVVRSG/7aoIbxgQYiSiI0kJCbwAgnKAyFCeKD6QGIfgJnTIlQLEUUuogkYgomiBgxgok1UElCBIzNDoRCKJlxSLkKQCrRgBVsoLbdCW+hpS3vOfD5AaYFezpwzlKPpn/yve+Wbtffaa6+RetWrXvUqoVRAP21hshzWyGGbbApl4chmhRzGK0jKfwcGkpTHYNnkyKJcFnThc3IwtYvUxIbaQx85TJLN/m6A2vu2LLZpK2MFSYkJtpWJsrgoC9cDWKtL5TAhEaHGyKI2BqA225xQHsMTBypImmyOxAXVZkdB+iYCVIoclsii2SewsLYw+/GDbWeILI75BNXqU7IZ8HjB8kiXTYvPYDWymPJ4wSxyfQQKySYki4gclvfsBZ5BigIMUSbpMsjVBs7GABBRkJDWUatVHNd7lOpNamXgygDNoE7ZnJDJVzJ5VVMZrGUkPzookzRlskQGx2TQIgNXQW55gtpCk9ZySYu4oAC3ZUA3bpZBoQLM11QGPgqoMTI4cjfQnaAmdbI9XMZbuKoPKVNmVED326RJJgeUySh/gJbRRwEmyqC2g4CNXrqMtNUc9wz0sItlMjr+hjaTSTK52GmgTdREA5ViE15QwGEfwJDJaU1nROxgsxgsg/33DnVH/obiaMBe2k3VmRuU+AJ2x/sUiPWuM8npNsBHFHUHlWTjvltEZdilceJn/O0TWEgm2d6rpUk/GZR3G2A2N7SJ+q7Ant1B6I9argIUnadi0BzqfILLV4bXt5zJ5KgWD9Cg1VR2Bbb7CieBFoBwhPDKnVQ9mdWuusbuahkM8wZmsDbqAAu5ps00todJtnGf20l9wR2o++S6NH6RT2nq2zQkdXV+o/F03vCase0eqlRIn1PWWv2GF3Bp8Skun6zjSmumOlDkQCkXsr+j6oV5XI0DbqHXjBV6CpBJaNDHnMh2+L34BicjLrfpXm5zmPrjVRxd8Cv5aWvIT5rBLY+l/1OvGXPi2SLTvqa4+CKV4QjhjojCLk0Hqql6ZQ/lyRaRe9t4FSUyCXsAe98bWIAV8R7uQXOoW7mTKtelsT3UrTA1S4upeMrhdgfFpkkfcDbKGK4CvOYNLIvxfpTkJ7No/nIHpUCkNVNLi6l4wm6XpQf9A9XKpDGK9Su9V8UMUmRwzg+4ATk0HD3HBYBD1zvNVJuDhLSI891my8RSFv1j6TxMGTF04g84ycCdu57LLRHqx+3jnyhasBZ9Qo26vgpuKsA0KZZZ5ExSZbLNj6w9P49rhy5QdF+h6MqrqVCAhi7WzJNJv9gbYYOxMij1Ay57F4ejfrvlclpZHbRe03FlUqIZPBPvMD5JmUyQwYk4nxpNqbmciRpsHX9qBjUPrBORwV4FGOnfC9pguAwcGR7umDaoRi2nTJtp8gBW1AHYBs1kaGznqutK2VcGs2VySgY1d79gZzDNyqJBczmvb/nL88Dnzlaskcl1mRyUScajn1QFGKDpTFGA5cqhUHMo0yzK9RZleodyLeaKVlCnXCr0S4wzx+/5TTNZLIN0TePpnp0pZpCi9eRoI/X6kZB+ol4bCSnoYct1Nua2WPpoR27dD0xf9nFu3+rrskh/3CPuwbIo9BnsoPJ7evs9PMlKls182XFvv/b/yTKUEPqZgbI44ANURA4bEuuPpsMo2dGN4jqFstmrHQxNvN+1eYyWxekYwUqUx8jE/cEeZIRs9skiFMVZcmVxUxZ52hl379cDshkgm2xZ5MuiugMoVxaVsrFkMU0F8XTpPa1lJCtIqvIYJotx2srrssmQRbq2MlYOL8qhf+JuvV71qle9+r/pX7cMd0rkz4KqAAAAAElFTkSuQmCC);
+    background-position: .8125rem;
+    padding-left: 2.1875rem
+}
+
+#adminTransactionFilter .transaction-method,
+#adminTransactionFilter .transaction-status,
+#adminTransactionFilter .transaction-type {
+    margin-top: 2rem
+}
+
+#adminTransactionFilter .btn-box {
+    display: -webkit-box;
+    display: flex;
+    justify-content: space-around;
+    margin-top: 2.75rem;
+    width: 90%;
+    height: 6rem;
+    position: fixed;
+    bottom: 0;
+    overflow: hidden;
+    background-color: #fdfdfd
+}
+
+#adminTransactionFilter .btn-box .btn-wrapper {
+    width: 48%;
+    margin-top: 1rem
+}
+
+#adminTransactionFilter .date-select-wrapper {
+    margin-top: 1.125rem
+}
+
+#adminTransactionFilter .date-select-wrapper .date-select {
+    height: 3.3125rem;
+    position: relative;
+    overflow: hidden
+}
+
+#adminTransactionFilter .date-select-wrapper .date-select .input-wrapper.label-input {
+    height: 100%;
+    padding: 0;
+    line-height: 3.3125rem
+}
+
+#adminTransactionFilter .date-select-wrapper .date-select .placeholder {
+    color: #0b204b
+}
+
+#adminTransactionFilter .date-select-wrapper .date-select .specific {
+    position: absolute;
+    top: 1.0625rem;
+    z-index: 99;
+    color: #0b204b;
+    font-family: Pro-Normal
+}
+
+#adminTransactionFilter .date-select-wrapper .date-select label {
+    position: absolute;
+    left: 6.5rem;
+    font-family: Jinrong-Bold
+}
+
+#adminWithdrawFilter {
+    padding: 1.25rem 0
+}
+
+#adminWithdrawFilter h3 {
+    padding: 0 1.25rem;
+    margin-bottom: 1rem;
+    color: #717783;
+    font-size: .75rem;
+    font-weight: 400;
+    line-height: 1rem
+}
+
+#adminWithdrawFilter .date-select-wrapper {
+    display: -webkit-box;
+    display: flex;
+    -webkit-box-pack: justify;
+    justify-content: space-between;
+    -webkit-box-align: center;
+    align-items: center;
+    padding: 0 1.25rem
+}
+
+#adminWithdrawFilter .date-select-wrapper .date-select {
+    width: 8.75rem
+}
+
+#adminWithdrawFilter .btn-wrapper {
+    padding: 0 1.25rem;
+    margin: 1.875rem 0 1.6875rem
+}
+
+#adminWithdrawFilter .no-record.today {
+    display: none
+}
+
+#adminRefundDetail {
+    padding: 0 1.25rem
+}
+
+#adminRefundDetail .refund-info {
+    margin: 1.125rem 0 1.25rem;
+    border-bottom: 1px solid #e5e6e8
+}
+
+#adminRefundDetail .refund-info h3:last-child {
+    margin-bottom: 1rem
+}
+
+#adminRefundDetail h2 {
+    margin-bottom: 1.125rem;
+    color: #333;
+    font-size: 1rem;
+    line-height: 1.3125rem;
+    font-weight: 400
+}
+
+#adminRefundDetail h3 {
+    margin-bottom: 2rem;
+    overflow: hidden;
+    color: #131c31;
+    font-size: .875rem;
+    line-height: 1.1875rem;
+    font-weight: 400
+}
+
+#adminRefundDetail h3 span {
+    float: right;
+    width: 14.375rem;
+    color: #a4a7b0;
+    text-align: right;
+    white-space: normal;
+    word-break: break-all
+}
+
+#adminMaterial .more-radius .dialog,
+#adminRefund .more-radius .dialog,
+.qrcode-wrapper .more-radius .dialog {
+    padding: 0 2.5rem 1.4375rem
+}
+
+#adminMaterial .more-radius .dialog p,
+#adminRefund .more-radius .dialog p,
+.qrcode-wrapper .more-radius .dialog p {
+    margin: .375rem 0 2.25rem;
+    font-size: .9375rem;
+    line-height: 1.3125rem;
+    color: rgba(0, 0, 0, .7)
+}
+
+#adminMaterial .wechat-prompt,
+#adminRefund .wechat-prompt,
+.qrcode-wrapper .wechat-prompt {
+    display: -webkit-box;
+    display: flex;
+    -webkit-box-pack: center;
+    justify-content: center;
+    -webkit-box-align: center;
+    align-items: center;
+    margin: .625rem 1.25rem;
+    border-radius: .25rem;
+    height: 2.1875rem;
+    font-size: .8125rem;
+    color: #fff;
+    background-color: #2a3858
+}
+
+#adminMaterial .wechat-prompt img,
+#adminRefund .wechat-prompt img,
+.qrcode-wrapper .wechat-prompt img {
+    margin-right: .3125rem;
+    width: .75rem;
+    height: .75rem
+}
+
+#adminRefundResult .btns {
+    position: fixed;
+    bottom: 0;
+    display: -webkit-box;
+    display: flex;
+    justify-content: space-around;
+    box-sizing: border-box;
+    width: 100%;
+    max-width: 800px;
+    padding: 1.25rem
+}
+
+#adminRefundResult .btns button+button {
+    margin-left: .8125rem
+}
+
+#adminFace .face-indicate {
+    box-sizing: border-box;
+    padding: 0 1.25rem;
+    width: 100%;
+    font-size: .8125rem;
+    color: #717783
+}
+
+#adminFace .face-indicate span {
+    color: #ff561a
+}
+
+#adminAbout {
+    box-sizing: border-box;
+    padding: 1.25rem
+}
+
+#adminAbout .content {
+    font-size: .9375rem;
+    letter-spacing: .5px
+}
+
+#adminAbout .content img {
+    display: block;
+    margin: 0 auto;
+    height: 5.5625rem
+}
+
+#adminAbout .content h3 {
+    margin-top: .375rem;
+    text-align: center;
+    font-size: 1.1875rem;
+    font-weight: 700
+}
+
+#adminAbout .content div {
+    margin-top: .375rem;
+    text-align: center;
+    color: #999da5
+}
+
+#adminAbout .content p {
+    margin-top: 1.3125rem;
+    text-indent: 2em;
+    line-height: 1.5rem;
+    color: #666c79
+}
+
+#adminCardUpdate {
+    box-sizing: border-box;
+    padding: 1.25rem;
+    color: #fff
+}
+
+#adminCardUpdate .card {
+    overflow: hidden;
+    position: relative;
+    margin-bottom: 1.3125rem;
+    width: 100%;
+    height: 10rem;
+    background: url(assets/card-update-bg.0c465.png) no-repeat 50%/cover
+}
+
+#adminCardUpdate .card .card-header {
+    display: -webkit-box;
+    display: flex;
+    -webkit-box-align: center;
+    align-items: center;
+    margin: 1.75rem 0 0 1.75rem
+}
+
+#adminCardUpdate .card .card-header img {
+    margin-right: .375rem;
+    border-radius: 50%;
+    width: 2.1875rem;
+    height: 2.1875rem
+}
+
+#adminCardUpdate .card .card-header .name {
+    font-size: 1.0625rem
+}
+
+#adminCardUpdate .card .card-header .flag {
+    margin-top: .3125rem;
+    font-size: .6875rem
+}
+
+#adminCardUpdate .card .card-footer {
+    position: absolute;
+    bottom: 1.75rem;
+    left: 4.3125rem;
+    font-size: 1.5625rem;
+    line-height: 1.875rem;
+    letter-spacing: .0625rem
+}
+
+#adminCardUpdate .card .card-footer span {
+    display: inline-block;
+    vertical-align: sub
+}
+
+#adminCardUpdateDetail {
+    box-sizing: border-box;
+    padding: 1.25rem
+}
+
+#adminCardUpdateDetail>p {
+    margin-top: .625rem;
+    line-height: 1.25rem;
+    font-size: .6875rem;
+    color: #717783
+}
+
+#adminCardUpdateDetail>p span {
+    color: #0097ff
+}
+
+#adminCardUpdateDetail>p img {
+    position: relative;
+    top: 2px;
+    left: 5px;
+    width: .9375rem;
+    height: .9375rem
+}
+
+#adminCardUpdateDetail .subtitle {
+    margin-top: 1.25rem;
+    font-size: .9375rem;
+    color: #131c31
+}
+
+#adminCardUpdateDetail .subtitle span {
+    color: #ff561a
+}
+
+#adminCardUpdateDetail .card-img {
+    overflow: hidden
+}
+
+#adminCardUpdateDetail .card-img .column {
+    float: left;
+    margin: .75rem .75rem 0 0;
+    width: auto
+}
+
+#adminCardUpdateDetail .card-img .column .upload {
+    margin-left: 0
+}
+
+#adminCardUpdateDetail .card-img .column .img-desc {
+    margin: .75rem 0;
+    font-size: .6875rem;
+    text-align: center;
+    color: #717783
+}
+
+#adminCardUpdateDetail .card-infos {
+    margin-bottom: 7.5rem
+}
+
+#adminCardUpdateDetail .dialog-tip .dialog {
+    padding: .625rem 2.5rem 0;
+    line-height: 1.25rem;
+    font-size: .9375rem
+}
+
+#adminCardUpdateDetail .dialog-tip .dialog .header {
+    font-weight: 700
+}
+
+#adminCardUpdateDetail .dialog-tip .dialog .section {
+    margin-top: .75rem
+}
+
+#adminCardUpdateDetail .dialog-tip .dialog .section>span {
+    color: #faa703
+}
+
+#adminCardUpdateDetail .dialog-tip .dialog .btn-wrapper {
+    margin: 1.25rem 0
+}
+
+#wechatIdentity {
+    box-sizing: border-box;
+    padding: 1.25rem
+}
+
+#wechatIdentity .grey {
+    color: #666c79
+}
+
+#wechatIdentity .step-item .step-title {
+    margin: 1.25rem 0
+}
+
+#wechatIdentity .step-item .step-title span {
+    font-size: .9375rem;
+    font-weight: 700
+}
+
+#wechatIdentity .step-item img {
+    margin-bottom: 1.25rem;
+    width: 100%
+}
+
+#wechatIdentity .step-item p {
+    margin-bottom: .625rem;
+    font-size: .9375rem;
+    line-height: 1.1875rem;
+    letter-spacing: 1px
+}
+
+#wechatIdentity .step-item .remark {
+    margin-top: 2.1875rem;
+    font-size: .875rem
+}
+
+#adminInspection {
+    width: 100%;
+    height: 100%;
+    overflow: scroll;
+    background-color: #f5f6f7!important;
+    padding: 1.0625rem 1rem 2rem;
+    box-sizing: border-box
+}
+
+#adminInspection h3 {
+    color: #0b204b;
+    font-size: 1rem;
+    line-height: 1.375rem;
+    font-family: Pro-Medium;
+    font-weight: 700
+}
+
+#adminInspection .adminInspection-message {
+    padding: 1.25rem 1.25rem .625rem;
+    width: 100%;
+    background: #fff;
+    border-radius: .5rem;
+    box-sizing: border-box
+}
+
+#adminInspection .adminInspection-message button {
+    width: 33%;
+    background-color: #f2f4f7;
+    border-radius: 1.15625rem;
+    height: 2.3125rem;
+    margin: .875rem .75rem 1.5rem 0;
+    font-size: .875rem;
+    color: #3a4a6e;
+    font-family: Pro-Normal
+}
+
+#adminInspection .adminInspection-message button.active {
+    background-color: #e6f5ff;
+    color: #0097ff;
+    border: .0625rem solid #0097ff;
+    border-radius: 1.15625rem;
+    font-family: Pro-Medium
+}
+
+#adminInspection .adminInspection-message .address .input-wrapper.line-input {
+    margin-top: -.125rem;
+    border: .03125rem solid #98a1b3;
+    border-radius: .375rem;
+    height: 2.5625rem;
+    box-sizing: border-box;
+    padding-left: .625rem
+}
+
+#adminInspection .adminInspection-message .address .input-wrapper.line-input.error {
+    border: .03125rem solid #ff7575!important
+}
+
+#adminInspection .adminInspection-message .address .input-wrapper.line-input input {
+    font-family: Pro-Medium;
+    font-size: .875rem;
+    line-height: 1.1875rem;
+    color: #3a4a6e
+}
+
+#adminInspection .adminInspection-message .address .input-wrapper.line-input label {
+    display: none
+}
+
+#adminInspection .adminInspection-message .address .input-wrapper.line-input .delete {
+    right: .1875rem
+}
+
+#adminInspection .shop-picture .subinfo {
+    font-family: Pro-Normal
+}
+
+#adminInspection .btn-wrapper {
+    margin-bottom: 0;
+    margin-top: 2.625rem
+}
+
+#adminFilterResult {
+    background-color: #fff;
+    height: 100%;
+    overflow-x: hidden
+}
+
+#adminFilterResult .list {
+    display: inline-block;
+    box-sizing: border-box;
+    width: 100%;
+    padding-top: .75rem;
+    margin-top: -.75rem;
+    border-radius: .75rem .75rem 0 0;
+    background-color: #fff
+}
+
+#adminFilterResult .list .sticky-item {
+    background-color: #fff
+}
+
+#adminFilterResult .list .no-record.today {
+    display: none
+}
+
+#h5Face {
+    font-size: .9375rem
+}
+
+#h5Face .status-wrapper h2 {
+    display: -webkit-box;
+    display: flex;
+    -webkit-box-align: center;
+    align-items: center;
+    height: 4.375rem;
+    white-space: pre-wrap;
+    font-weight: 700
+}
+
+#h5Face input[type=file] {
+    display: none
+}
+
+#h5Face .face-wrapper {
+    padding: 0 1.25rem
+}
+
+#h5Face .face-wrapper .img-wrapper {
+    position: relative;
+    overflow: hidden;
+    margin: 1rem 0;
+    height: 16.875rem
+}
+
+#h5Face .face-wrapper .img-wrapper>img {
+    display: block;
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    width: 54%;
+    -webkit-transform: translate(-50%, -50%);
+    transform: translate(-50%, -50%)
+}
+
+#h5Face .face-wrapper .img-wrapper .uploaded {
+    width: 100%
+}
+
+#h5Face .face-wrapper .face-tips {
+    margin-bottom: .3125rem;
+    text-align: center;
+    color: #fe3d28
+}
+
+#h5Face .face-wrapper .row {
+    display: -webkit-box;
+    display: flex;
+    -webkit-box-pack: justify;
+    justify-content: space-between
+}
+
+#h5Face .face-wrapper .row>div {
+    color: #999
+}
+
+#h5Face .face-wrapper .row>div img {
+    display: block;
+    margin: .375rem auto;
+    width: 3.75rem;
+    height: 3.75rem
+}
+
+#h5Face .btn-wrapper {
+    position: relative;
+    padding: 0 1.25rem;
+    margin-top: 2.25rem
+}
+
+.page {
+    padding: .625rem 1.25rem 7.1875rem;
+    font-size: .875rem;
+    color: #131c31
+}
+
+.page .imgs-wrapper {
+    display: -webkit-box;
+    display: flex;
+    flex-wrap: wrap;
+    -webkit-box-pack: justify;
+    justify-content: space-between
+}
+
+.page .imgs-wrapper .column {
+    margin-top: 1.25rem
+}
+
+.page .imgs-wrapper .column .img-desc {
+    margin-top: .6875rem;
+    font-size: .6875rem;
+    text-align: center;
+    color: #717783
+}
+
+.page .line-input {
+    font-size: .875rem
+}
+
+.page .line-input label {
+    width: 45%;
+    color: #131c31
+}
+
+.page .line-input input {
+    margin-right: 0;
+    text-align: right;
+    text-overflow: ellipsis
+}
+
+.page .line-input input:disabled {
+    color: #a4a7b0
+}
+
+.page .btn-wrapper {
+    margin-bottom: 0
+}
+
+#upgradeIntro {
+    overflow: hidden;
+    width: 100%;
+    height: 100vh;
+    color: #fff;
+    background: url(assets/upgrade-intro-bg.353ab.png) no-repeat 0 0/contain, -webkit-gradient(linear, left top, left bottom, color-stop(52%, #0097ff), to(rgba(255, 206, 172, 0)));
+    background: url(assets/upgrade-intro-bg.353ab.png) no-repeat 0 0/contain, linear-gradient(180deg, #0097ff 52%, rgba(255, 206, 172, 0))
+}
+
+#upgradeIntro .title {
+    margin: 2.5rem 0 0 2.6875rem;
+    font-size: 2.1875rem
+}
+
+#upgradeIntro .sub-title {
+    margin: .625rem 0 0 2.6875rem
+}
+
+#upgradeIntro .btn-wrapper {
+    background-color: transparent
+}
+
+#upgradeIntro .btn-wrapper .btn {
+    display: block;
+    margin: 2rem auto 0;
+    width: 65%;
+    font-size: 1rem
+}
+
+#upgradeIntro img {
+    display: block;
+    margin: 2.625rem auto 0;
+    width: 92%
+}
+
+#upgradeLicense>p {
+    margin-top: .375rem;
+    color: #717783
+}
+
+#upgradeLicense .progress-nav .progress-icon {
+    background-image: url(assets/process7.ec6c5.png)
+}
+
+#upgradeLicense>a {
+    display: block;
+    margin-top: .5625rem;
+    color: #0097ff
+}
+
+#upgradeLicense .imgs-wrapper {
+    margin-bottom: 1.25rem
+}
+
+#upgradeLicense input:disabled {
+    color: #333b4c
+}
+
+#upgradeLicense h2 span {
+    font-weight: 700;
+    color: #fe3d28
+}
+
+#upgradeCard>p,
+#upgradeShop>p {
+    margin-top: .375rem
+}
+
+#upgradeShop .progress-nav .progress-icon {
+    background-image: url(assets/process8.2672d.png)
+}
+
+#upgradeCard .line-input {
+    margin-top: 1.25rem;
+    letter-spacing: 1px
+}
+
+#upgradeCard .progress-nav .progress-icon {
+    background-image: url(assets/process9.52be4.png)
+}
+
+.page-logout {
+    padding: 1.875rem 1.25rem 1.25rem
+}
+
+.page-logout h2 {
+    font-size: 1.25rem;
+    font-weight: 700;
+    color: #192235
+}
+
+.page-logout .content {
+    margin-top: .25rem;
+    line-height: 1.375rem;
+    letter-spacing: .5px;
+    font-size: 1rem;
+    color: #666c79
+}
+
+#logoutIndex .content p {
+    margin-bottom: .5625rem;
+    padding-left: 1em;
+    text-indent: -1em
+}
+
+#logoutIndex .content p:first-child {
+    margin-bottom: 1.3125rem
+}
+
+#logoutIndex .logout-footer {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    box-sizing: border-box;
+    padding: 0 1.25rem;
+    width: 100%
+}
+
+#logoutIndex .logout-footer .agree {
+    display: -webkit-box;
+    display: flex;
+    -webkit-box-align: center;
+    align-items: center;
+    margin-bottom: .8125rem;
+    font-size: .875rem;
+    color: #131c31
+}
+
+#logoutIndex .logout-footer .agree img {
+    margin-right: .25rem;
+    width: .9375rem;
+    height: auto
+}
+
+#logoutIndex .logout-footer .btn-wrapper {
+    margin-bottom: 0;
+    padding-bottom: 1.25rem
+}
+
+#logoutIndex .logout-footer .btn-logout {
+    padding-bottom: .8125rem
+}
+
+#logoutIndex .logout-footer .btn-logout .gray.disable {
+    opacity: 1
+}
+
+.accumulate-container {
+    margin-bottom: .75rem;
+    box-shadow: 0 .1875rem .4375rem .125rem rgba(250, 100, 0, .08);
+    box-sizing: border-box;
+    border-radius: .25rem;
+    padding: 1.25rem 0;
+    width: 47.5%;
+    height: 5rem;
+    line-height: 1.4;
+    letter-spacing: .0625rem;
+    color: #333;
+    background-color: hsla(0, 0%, 100%, .8)
+}
+
+.accumulate-container .desc {
+    display: -webkit-box;
+    display: flex;
+    -webkit-box-pack: center;
+    justify-content: center;
+    -webkit-box-align: center;
+    align-items: center;
+    font-size: .875rem
+}
+
+.accumulate-container .desc .prompt-container {
+    position: relative;
+    margin-left: .25rem
+}
+
+.accumulate-container .data {
+    text-align: center
+}
+
+.accumulate-container .data .val {
+    display: inline-block;
+    font-size: 1.3125rem;
+    font-weight: 700
+}
+
+.accumulate-container .data .unit {
+    display: inline-block;
+    font-size: .75rem
+}
+
+.accumulate-container.active {
+    position: relative;
+    color: #fff;
+    background-color: #e75947
+}
+
+.accumulate-container.active:after {
+    content: "";
+    position: absolute;
+    bottom: -.5rem;
+    left: 1.25rem;
+    height: 0;
+    width: 0;
+    border-top: 8px solid #e75947;
+    border-left: 6px solid transparent;
+    border-right: 6px solid transparent
+}
+
+.icon-question {
+    display: block;
+    margin-top: -.125rem;
+    height: .875rem;
+    width: .875rem;
+    background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACIAAAAiCAYAAAA6RwvCAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyNpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTQ4IDc5LjE2NDAzNiwgMjAxOS8wOC8xMy0wMTowNjo1NyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIDIwMjAgTWFjaW50b3NoIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjAwNzA5NkNEREY3NDExRUFBRDgwOUQyNkM0MEMzNUFBIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjAwNzA5NkNFREY3NDExRUFBRDgwOUQyNkM0MEMzNUFBIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6OUNBOTlFQzZEREVFMTFFQUFEODA5RDI2QzQwQzM1QUEiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MDA3MDk2Q0NERjc0MTFFQUFEODA5RDI2QzQwQzM1QUEiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz7crRh6AAAC8ElEQVR42sSYPUxUQRDHH8dLTAQMx1F5qAU2YOVHIeBpdZdAbcGrFGMAaeiUxkoTUBKTC9U1amNCQW2BJZ8mgiFRbLAwIpWG5PQ6Mf7H/Nesm7u3u/fwmOSXu3vv7cy8vZ3ZmW0K/KQD5MBFcBZkQQvvVcAXsAM2wAr46qq4yfG5C2AEDIBmxzG/wDJ4BjaTOtIFpjgLIj/BGlgF78Eu+M57bXz+HOgHfSDkvSUww+e9ZZAGt/hmEyDt+TdOcOwWdQ35OjHGwcIs6Azql07qUPrGXAfe5oC3YDg4PBmmTtE96vJ3KCfylmdPgAK4pVGwjMlrzgzWeiirrYnI4sCkNtUmsjCvx4yPtDWTVRf1UJxmblgET2KcKFne/Bi4xhyyXeX+O9ANesBp8FIupnjzPENUQvFRjJH7oNe4JsbWQdm4PknHq8kMbeWYo/46MsLPFzHZsNeYiTIjIOKnKF0wZu9yDV3faEvkhnJE4v0Kk9V8zGyYSoucCfOamRBryTxtygt0hPzSzEW2HzPwKddPF992MWE47zNLi/1cyA0s4CZlk11LmjajZd2ib4WOXEoxUkQ+JHzDAheo7sS2ZYyy2R1qsfwpgQP5Kgu56DBW2cyKI8f540cdTpSqLGJx4oHDbOg2W0KPmsRFFlh/eG/3ISurdtBqiRqbFBlZPtKqqrsUyzuRM0HjRdncE0c+8kfPETiibO6II2/4Y+AIHFE2N0KWcgesMdOe6+QVeK1tfj6SZsQdMKv/kTnWCHcaOBvjtDlntguqSM40wImMVlT/UwZscnra2D64il6ZlTzGTdHWkup5UkaxUmGqjv7jbES0UaHNwHREsuFDfr/rUDzXI3nqDmgrNgOPNqCdcO5t9AbrccIGK0Md3g2WkiFWUCqaxrknuUo7x6joWItrOW077ylwz2jCV40mvKwVy3oT3m804dIdfE56LCHl5E0W2SnPY4nnPC85lPMRvcO/qh3UnNS2cily9rSDmmWfg5rfAgwA+9a3mNaE+sAAAAAASUVORK5CYII=) no-repeat 50%/contain
+}
+
+.icon-question-white {
+    background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACIAAAAiCAYAAAA6RwvCAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyNpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTQ4IDc5LjE2NDAzNiwgMjAxOS8wOC8xMy0wMTowNjo1NyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIDIwMjAgTWFjaW50b3NoIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlDQTk5RUM0RERFRTExRUFBRDgwOUQyNkM0MEMzNUFBIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlDQTk5RUM1RERFRTExRUFBRDgwOUQyNkM0MEMzNUFBIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6OUNBOTlFQzJEREVFMTFFQUFEODA5RDI2QzQwQzM1QUEiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6OUNBOTlFQzNEREVFMTFFQUFEODA5RDI2QzQwQzM1QUEiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz7cWmmUAAAC0ElEQVR42sSYu24TQRSGbQihA1nKeiOBBDiio8IU3BwogkBJayPiBwhFLm0iBCbp4BHgASAYGrAjLqYgtIEutCFISCAZEcVuwElk/iP9Kw3D7uzsbnBG+mTPes45v2fnzJ7ZdLfbTUVoWTAKLoFT4Dg4xN9aYB2sgmXwCny39ixCLCiAGtjq2rdt2hRsYoQNyIG64rzD/gw4B1xwkLi8NsMxHcWuTl+xhIyDTTraAAvAsZxBIUubDfoQX+WoQirKv6mCwQgCdAbpw2sVWyG3lHs8mUCAziR9Srut/57WsmYcPAI74AZ4ZljnGTACcsq1NfDUYFMEi2A/KIPHfllzArSoeMrwzzLgniFbfoIJg/0Ux7UY859bU1fWhEnEB8v0NYl5omTTX0IuKtlhWphVn4AirMGZ0GcmE+DHVbKpoAp5wYvzBhF5n0Aj2pgH2piSwd88xzz3hGS5Y3ZC9olZi6nPaGNmDf4cxpTY2X18dvSBN6BpWPH3wRC4Aq6Dh6lkrcmYEnu0jw8waa8tjNdIUJvQ+m9D/EnMMXBZpmiF03gh4YZV0m5Lw8LmPMeuSKfJjpNAQNVnIectbB2O/yGdX+z0xxDRCNjQSpb2/bT5LYs1ndq9Jgv4TMg279tESJvfDycUMQduhixmvXkx2yLkMzsnU71vXsx1EfKJnfweCDnNz1UR8o6dq3sg5Bo/l6UecfHlq1QE4EjI7uq3gWX4/aPFBqY2h3FlMo56aVSzeOjtNncZs6Y+fQtKGeD2QERgGWBbGOlE3dL1wmjJr0LLWZaKSYWopWIuqIovKxV88T8IKSqVfDnsOHGnB8eJSpwD1mLCA5ZLH5EPWOptaivZJOk2EEHAAG287GjHOXJ6DPkcwiXvp8FZ1rsHSJbXpjlGPYQv0VfstwEew3S+HeG1xA5thm1ipGO8qBlTXtQcUx7lm+ALX9S8By/BN1vHfwQYACAPNzR0I0MLAAAAAElFTkSuQmCC) no-repeat 50%/contain
+}
+
+.prompt {
+    display: none;
+    position: absolute;
+    top: 1.5625rem;
+    right: -.9375rem;
+    z-index: 999;
+    box-shadow: 0 .1875rem .25rem .125rem rgba(250, 100, 0, .08);
+    box-sizing: border-box;
+    border-radius: .3125rem;
+    padding: 10px;
+    width: 9.375rem;
+    font-size: .75rem;
+    color: #717783;
+    background: #fff
+}
+
+.prompt:after {
+    content: "";
+    position: absolute;
+    top: -.5rem;
+    right: .9375rem;
+    height: 0;
+    width: 0;
+    border-bottom: 8px solid #fff;
+    border-left: 6px solid transparent;
+    border-right: 6px solid transparent
+}
+
+#adminInvite {
+    overflow-x:hidden;
+    /*overflow-y: auto;
+    overflow-x: hidden;*/
+    height: 100vh;
+    color: #fff;
+    background-color: #fff5e6
+}
+
+#adminInvite>.header {
+    position: relative;
+    box-sizing: border-box;
+    padding: 1.5rem;
+    height: 15rem;
+    background: url(assets/invite-bg.89420.png) no-repeat top/100%
+}
+
+#adminInvite>.header .info {
+    position: relative;
+    display: -webkit-box;
+    display: flex;
+    -webkit-box-align: center;
+    align-items: center
+}
+
+#adminInvite>.header .info img {
+    border-radius: 50%;
+    height: 1.1875rem
+}
+
+#adminInvite>.header .info span {
+    margin-left: .5rem;
+    font-size: .875rem
+}
+
+#adminInvite>.header .title {
+    margin-top: 1.5rem;
+    line-height: 2.25rem;
+    font-size: 2rem;
+    font-weight: 700;
+    letter-spacing: .125rem
+}
+
+#adminInvite>.header .title>span {
+    color: #ffee7c
+}
+
+#adminInvite>.header a {
+    position: absolute;
+    top: 1.5rem;
+    right: -.1875rem;
+    border-top-left-radius: .9375rem;
+    border-bottom-left-radius: .9375rem;
+    border: 1px solid #fcfcfc;
+    padding: .375rem .75rem .375rem 1.125rem;
+    text-align: center;
+    font-size: .875rem
+}
+
+#adminInvite .main {
+    position: relative;
+    z-index: 1;
+    margin-top: -4.375rem;
+    height: 20.3125rem;
+    color: #bc5927;
+    background: url(assets/invite-main-bg.92b73.png) no-repeat top/100% 100%
+}
+
+#adminInvite .main .reward .reward-item {
+    display: -webkit-box;
+    display: flex;
+    -webkit-box-align: center;
+    align-items: center;
+    margin: 0 3.0625rem;
+    height: 6.25rem
+}
+
+#adminInvite .main .reward .reward-item .reward-item-desc {
+    margin-left: 3.9375rem;
+    line-height: 1.4
+}
+
+#adminInvite .main .reward .reward-item .reward-item-desc .reward-item-title {
+    font-size: 1.0625rem;
+    font-family: Pro-Medium;
+    font-weight: 700
+}
+
+#adminInvite .main .reward .reward-item .reward-item-desc .reward-item-subtitle {
+    font-family: Pro-Normal;
+    margin-top: .125rem;
+    font-size: .8125rem
+}
+
+#adminInvite .main .reward .reward-item-rate {
+    background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIYAAACGCAYAAAAYefKRAAAAAXNSR0IArs4c6QAAAERlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAAhqADAAQAAAABAAAAhgAAAABg+kbfAAAXu0lEQVR4Ae1de3BbVXo/elw9bdmyrdhxQhwL5x2SbOLwTGATaHbbhdmBghkWFrLDNP6Hsv90Z5mhnfFMlxlaZjotw04n2ck0KSE0hmXbZhfYkiYshEfATpOQGEiIHefh2LEtWbL1lq76/W5yFUmWZUmWdO+175mR7/uc73zfz+f5PTRslqcznR0G28INDovDfouWs6zUMs7JtMyu1epqmIav0TBdHdOwWo1G5wAr4vHYMIuz0TiLjbC41sXzMRfjmZtnkV4+4u/xD7sveS93D69q6wjPZtZpZlPlug7utCxoXrbKbLVt1RpNd5DQ7yYA1Gt0OqbVG5hWxzGNTs80Gi2jPzeOWqbR0jWh43qKszjPE0J4AgmOdI3zWJTxsQjjo2E6jzECzBCB51M+FDwW8HkPX+n79kzrQ+3+2cJPkRuKrA9ag7oVm5YbKmse0BnMT+i0XKvOYGL4AQgaLQFBEHrxqwfwxPnrQImFg0z48ZGuWDjwZnjcdWjk66PfKLlVURwwjnR06Nc+cd+dnLX+Oa2ee1zHAQhmpuWMAhiKD4Hcc0RrwkdCBJIAi0WC1LpEDkR8Q6+dfPNPn2/p6IjmnpP0byoCGPF4XDNy6shSY3Xddq3B9LzeaLHoTVYChEV6DmahIBb2s2jQx6Ihv58PB18NjY3sqVuz5axGo4ln+UwWj2QNjK6dOzjnA+1terPlJc5gbtIZKxhHgKD+QRbMy5kIGqNECCCx0ASLhAP90YD/xd5DOztb23dFcs6jzC/KEhh9RzpM9qaHfqq3VL7CmSqq9OYqGjjqy8ya0hTH0yA2GvAQUCY8Uf/4L9z9B19v3tIRLE1phecqK2AM0KzCvLJ1h8Fqe0lvqrBwlipqHHSF107GX8b5GIv4PdTVTPjDPu+LgZ6uXY0ymtXIAhjxzsd0njteeFZvtL3GmSs5jlqIUs0m5IYVzG4iaEEC45FoyPtc1bGXd2va3opJTafkwBg6/fFaa42jkzPblnJW+5wBRLrgBYD43AQQ71mfa7itfvXmk+nvlPNaMmCce/dVW/3qrf+iN1m2GyvrhOlmOSsu17Iw3Q2Nj1AX498zdPrwz5f8xfNeKWgtOzAw9fT0ffkYZ63ZY7BUm/XmSinqLfsyo4FxFvK5A1G/e3tV88a3yj3FLeu8r+/fOkzey1/tM9oaDpjtjSoossAT/zCWmgVm8Ao8A++yvF70R2VrMYZO/d5prbv1fw0VNYs5S3XRKzKbM4z4x1h4wnXBN3L+/vo1D/aWo64lBwa6DvfF408aTfa9JlutVktL2GrKnwM8LbEHvaO0Z+d+xr5o/Rul7lpKukiAfY2altq9JksNrVg10JIElz9H1C8EDmBXWG+u0Gj4+CN+18Vbf1BVf3Dvhx/S9m9pUsmA8e6rf22868ln3qcZx4+NNgdtcZe8cSoNh2SUK3hIC39QF1hTv9q5afNi3YE33vuiJGseJZHW8NHdlWbnPR/ReGIdVi/VVHwOYNWUxh0nAr2f3OvY9Ox4sUsoOjCuHu90VM5f86Wx0tEEdKupdByg5XRa8xjuH796auP89W3DxSypqMAYOP6HJlvjkm6TzVEr9y3xYjJRyrywtR/0Do96B85taFz/o/5i0VI0YAgtReO6r01V9bVQnlFT+TgApaCgZ2h0fODEimK1HEVZ4MKYAt2H0FKooCgfIm6UhH9E8B4ygCyKQcCMgYHZBwaaGFOo3UcxRFJYHuA9ZABZQCaF5XLzqxlNV7FOcWNKehftjt7MVT2ThAOCArRG27DAufLubbZ5+2eyzlHwGAMrmrSG/++mSsdTNC2VhBFqoZk5QNNYFhwf3mdbeNvTha6QFtyVYJnbYK5SQZFZNpLexT8qZAMZFUpIQcDAhhj2PoxV8wotV/2uxByAbCAjyKqQovIGBrZ/rY6Ww9gQEyy6CilV/abkHIBsICPIqpAt+7zGGDfGFfvMVfU/UbfOSy7bohSALfuAZ2g/jTeeyme8kVeLAc0rg7laBUVRRFaeTPAPDJlBdvmUmDMwoKMJdTyjrS6f/NV3ZcAByAyygwxzJSdnYEBxFzqas9XOI1eGKfE9yAyygwxzpT8nYEDFH9rcquJurmyV33uQHWQIWeZC3bTAgDEQ7D6g4q8mZXMAMoQsIdPpajLtrGSsv3uH2TZ/p6Gydrq8SvYcK3mDJz9g7gsnaRfxGrkYCJWsrFJkrCMXDSZaV7AvXssa1m5jhgp7KYrJKc/w+CgLeK+2Vzdt2JXtg6zAgC2pbePWMUvNQk4qk8HBU4dY/8f7WSwqW8PwbPyd9Eyn51jT5p+whjUPTHpWjhuwePO7Lke8Xx6uzmYrm7UrMa9ubYctqVSguNJ1kPUe2TtrQAHBA+CoE+omRYIsIVMYj2crf0pgwBWBwWz7FQyMpUgTV79jFz/plKLospSJuqGOUiTIFB4FIOOpyp/S6YTgn4JcEUjVWlz87G1ynpeazPb5rG7pXdRHK8tgKTwxxkbOfsYC7quJCqFuqOPKR15I3CvXCWQKNxOQMWMdv8lUbkZgwJON4LREIg1veMjzXOpJode2YBlb9fAvBX8ZeK6kBJuQhRsfZGd+9w/Me+XbBOmoI/x1wYdYuRO09yPB8VdI1nsyefbJCAy4N4InG6kWs8AscqKYwqtFdz3KyJ8i8w+eve5mMeWpvC+woWWedytDHU6//VKCWNQRMy5zzYLEvXKdQLaQMWTN2K430sudNMbARhl8XsG9kVQJ/jTTk6V2IbkGGFccKFAP+AkF7ZbayQCIhgLpVS3bNWQMWUPm6YVOAga848ERmtx8Xs0GSza5qSlAxpA1ZD4tMOAyEd7x1DQ3OABZQ+bptU1pMaDcCz+agsvE9DfV61nJAcgaMofskyuYAgx43IVzVRr6J7+jns9mDpCsIXPIPrmaKSiBG2Z43FVSGh/sYxOjlwWn8LKgmxhdQQPlyoZmWZCTCxGQOWRP7x4V308AAw7bBd/cMnfDLBKO42jvCXb5//4n+ZYszq8RFQu/t43VOtfJgp7piICxEmRPGHhadIyf6DPgxV9pNqdjSYtF01W+3M/lTFsmXkD2wID4LAGMG6EdxPuKOJpkbOhkklBNoRDhYfUVGBC/TXQliPeB0A5KSg2r76OAMlHmG7kim4UvrFVY6xawhlX3KomVgp9VYICI/icQLgADkYEQBAa2j0pKOs7Abtnw50oiWba0QvbAALCASE1CV4JwUYgKpKa5zQFgAFgAFwRgIIaYCoy5DQrUHhgAFnAuAAOB5ZTWjYB4NRWXA8AAsIBcBWAg2iACy6lpbnNACC5IWAAXtMLCFkJQlija4NxmtbJqDwwgHKmACQSrRVxSNakcAAeABWBCa7DbmtTxhQoKkQPAAqJa6w3myuVK9vFNIaPITmJQVgtclpoGqOiLvFbUEVhAqHO9TqNrgbKqEtPE0AXW+9k7QnhtOdEPfjrveoRV1C+WE1k50QLayfLEqSVtP7vcVM5yqgG9NHTuS9mBArRDi/0a0abEJGBBy1P8EC1HEeom6YIqok6cjFdr9TKmLatwCQvAhJZpeMW2GA2rNjNTtfwcxIEm0KbEJLQYhAk9LW7VKVWVz2CtZsvu3874aFhWg09Fz/JodxiY0NPfWqUvbilaEDJrVgQsECbIJaPOQcsaMiNPJUc6DmhoyKlzCHsl0hGhlixXDujj8RhFxok3qa1GdhGFKdRUyDeGCMoMCkJk94lQELMw5DhZ1BIm9GRXO0peVpo0OrXxSIdGlIyrh2k9wnP5WxaacKc/JoAYWeW8ZuZY0kp2qY2TnivxBjzuABP6OIuNMDK6VVMqB4a/62ZDPUez+vuCL7CxK98Iv6oFS9jC9T9ktMeQmpHSrggLwAS1GFoXrLHVdJ0D+I+51P0ec188kxdLPFfOkWOUa6z5nr+kLka5Hg4FLBAm9Dwfc1GnkhcT5PZyJOClRi83cGOTKJu13aXj7+cNCpEfGIec/7iT1laeFuKjivcVdSQsABN6xjO3UluMILkm7Dv6Fgv7vXnxHuMB5z1twiAy+UNYtrn7TyffEs6N5NqprqWVxhOLhV1TLKj5yW2Sq/8rhpYiOSHkZd9n/8mWbHmSbitvGUDAAmFCz7NIr9JcF4mCGDxzNG9Q4Fv/6AAbPX+czVt+0443FgmzwTMfiVknjo6WDaxxzRaS8c3BOZnzMdv8FuGHHd4Lx/6bxiLBxDd+1wC1Oj3MvkhQuE7cV8IJsABMaMOB8W8yebBRQiVgbFRo4tP8eI2e72bR8E3hIt865/dY49r7U0CRXh621p33PDpp2jrY82n6q4q4Bhb4iL9HG3Z7+9E0KjHVL7tTmDLmS7vBYmN1t6YaHI9dOZuSDUfvNK7ZmnJvqgt0TY4lt6c8DvvcLDgG82ZlJaGbHHZf0nsvdw/XOFcoi/ob1FrJp9XyH7YLbqRzHSehG6BAPCzZlRT8YAXGhlJ4gNYiH11YdDnXvv08JY/xaxdkufubQmTaRTwWY8CEHmbv4wNPDNGoXpGa4tB7qHAsSqtefpeY1aSninn55YmZDqapQe9IIivMUpSUMLOjGckQMCGMqGhB49M4P9lTnpIqNRNascydngpxN8UZrSnZRIPSeeRLISTHC2AAWMDrAjD4UPCYUscZOdY562tY2k5P0QIiHESjqVERtAZlGYkDA8ACeCEAI+DzHo6ljcjTGTWbr/XmyV4KA66b7p1zqTtG80Ev7UcmJc6kLE1xYABYQBUEYFzp+/bMXAYGZin4JafRC6eSL6c9d/efISXgWMp7VsctKddyvwAGgAXQKQAD/hBifKRrLncnWLBKTlgEc+UIjmjQx4a+/iT5c7IcNwpO2lJuyvgCsgcGgAWQKQADJ+S/+02+gH4V386GhK3zdN/pl098QEveN53CZ6pnJDDBvjvaSQ7bfSmPHS0bJy16pbwgswvIHhgQyUoAIzzuOgTn7nM1QbG4tjk1jhy6hguf/xe72PUuBbW9OQ0Fj7BKiq35s4f2sJAndWyB9Q9Hy3pFsRKyBwZEohMmaCNfH/2mwkGKXHM4Nd72fTJ3vCpskCWzARtr+GEKq6cBJU+zD2hzTbUrDUBdOv5H1nT7Q1mX05PLkPocez3AgEhHosXAogYfjRyIhSfP6cWXZ/sR5nnNdz88pT4FuovA2OB1ba5pVBXGSOur/wsKb6UAXRfIHLIXfXxCzglg4CLiG3oNA6m5nCjyD22ZP8WgkZVPymTCoBRwQOaQfXJ9U4Bx8s0/fR4N+f1KQHlyJYp9DiEvvvNh5rz3cWYl98/ZEpbCG2+7j6168DnaSNs46VXZg4NaNMgcsk8mPjHGwM0tHR1R788eeZWazBeUasafXLmZnlfSmKvy+02kGT7BxknvIkSxzaLU7EILDPzBJp6lZn6iGEFvg66gQJycAI7zH77OlmxrT74ti3N0j3w4+Cpkn0xQCjDwIDQ2soez2lRgJHEJ3Yu9aXXSnalPpwKHq+8kO3do99QfSvQkFpoQZJ5efEpXgod1a7acjYQD/emKLOkflvuawjOVu8iCywM4MnUrLlIGklOCjCFryDydrknAoBBT8WjA/2I0IN2WcSYPP34KPYGpolJ8eUwFjnQB6I3SmRtAxpA1ZD6JrvQbuO49tLNz+Y//5tecpVqSSIpweE4WlLQFfJNexChFeE1L4wpZOkvJxMeWhmUUB6SGDZz4Y6bHQh0NEjnKj1NEykhwwgNZZyJuSjXmsd7uvzLXNO6SivCed15mY5eE/ZwE3UoNyOsixWPP5R7BXUOiMnRSfcsqSQLyggaE9Qy4BnZUOzf8Jpkm8XzS4FN84O4/+DpnefKfqdWQJFozYpR6CBg32wwmRDq+dOwdkURFH/EfKcSSlaAW0NSimZYfMp6q+EljDPHF5i0dwXDA+7cRicYaFbTbuYhsP2ZrQt1QRykSZBr2eV+EjKcqf0pg4IPA6a6d5C4xkquV11SFFHp/QetDzLnlGaYjBd7ZklAX1Al1kyJBlpBpoKdrV7bypxxjiB+N9XfvMNvm7zRIGLEH/eHgyQ+Y+8IJ0ggfzmpoLNItpyNUB01VDmZfvI41rP0zJtW4DTwJk/VewHu1vbppw8yAEe98TOfb9Pc9ZnvjUqVFQJITOORAC3QuAu6Bs9ajf7dS0/ZWqrpZGoHTthh4f+j0x2sr5y04IUVw+jR61csZcCDgusLGr11ZV79688npssk6xhA/RkakYr8nSu6Z1aRMDkB2kGEuoEANcwIGXhw6ffjnYf9YAAsjalIWByCzkM8dgAxzpTynrkTMbKz3izajreGAqbpevKUeFcCBIJlfhryDj1c7b8+4ypmpCjm3GPi4qnnjW+HA2P6In9Ta1KQIDkBWkBlklw/BeQEDmy2uQ+88S9PHC3ySP4h8ClTfLR8HICPICjLLtFGWjZK8uhIxo6FTv3dW1K88Z66ZTw5k88KWmIV6LDEHYP1P1nT8xFDPkvo1D/bmW1xBUkVBoaD7mZBHef4f8mWQUt+HbCCjQkCBOhcEDHxoX7T+jXDAsw+rkmqSFwcgE8gGMiqUsoKBgT7r+O53fkZEHI4ozA9EocxSwneQBWQC2eQ7rkiu34zCJ+798EN+82LdgYUttz1IWlcNmVTokwtTz0vLASgt017IiY9/+69btv3yH2fk8KSgwWd69YaP7q4033rPV6aq+iadwZL+WL0uAwdgNBT0DPUHzn9ym2PTszNeoi4KMFDvq8c7HZWN674mcNTqOFMZWKEWIXIA5oUEitHxgRMr5q9vSzWkFV/K81g0YKDcgeN/aLI1Lukmr/y1asuRpyQKfF1oKbzDo96Bcxsa1/+ov8BsJn1W8OBzUk50A4QBtWjS0N+pqbQcAI/Ba/C8mKAA1UUFBjJEU4Z+LuQdPqHOVsCR0iTwFjwGr4vVfSRTWnRgIHMMfj56+9d3EuGH1XWOZHYX5xw8BW/B42IMNDNRNaPpaqYMxXtvvPdFbJtt3n7HqiYn+adeozNayFioqEMasag5c8Qyd8hDO6U+177u3b99dKZT0myMK7mkyLRQ4754/Emjyb7XZKMAwOqMJZs8pnyGDbGgd5S8LbqfwYrmTBavpiwk6UHJgSGWhY03q6PlsMFqbyJbFfG2esyBA8LWuc/d7xv+bmuhex85FJPySknGGCkl3LhAhYbf/4/lAc/QfiiOqJpgmbiUeg88Aq/AM/CuXKAAFWVrMcQqo2vx9H35GNl07jFYqs168jOhpskcgI4mVCkjPtd2KNmUuutIp6BsLYZYMCoIFbOB7ncbAu7BPdBcnstuJEW+iEdBxZ94At6AR+BVuUEBWsreYogMEI8wTbDWODo5s20pZ7UryjemWIdiHAULMYpxQpEQzvpcw225anMXo+xMeUgODBAFoybPHS88qzfaXiMXRhxnrpozALluMugRzAajIe9zVcde3j2dMVAmQRb7niyAIVZq4OBOi3l1a7vBbPsVuTeycBYApGRLLWKxkhwxsMTqJazOYTwOO+HGG+6aJSEorVBZAUOkre9Ih8ne9NBP9ZbKVyhUdpWeWpDkiETie0o8wr0RPNnAaUnUP/4LuCLIZnUuVR1lCQyRGV07d3DOB9rb9GbLS5zB3KQzVgjeeakZEV9RxpFWLOEdD47Q4PMK7o3gyaa1fdeMlGlKWXlZA0OsOKa4I6eOLDVW123XGkzP640WC/xryn1rH1vicK4KP5pwmQiPiHCEJsUsQ+RlrkdFACO5Mkc6OvRrn7jvTs5a/xwFvnscSkHw2QVLfKlVC4UIQde9+AtxWOGGGR534Vw13Y9mcp3keK44YCQz8Uxnh6FuxablhsqaBwgcT+i0XKuOgufhB5BotFzJZjeYTSCGmBDngyIRIAgM4n0gtAO8+MNhe7Jv7mS6lXCuaGCkM7iLZjULmpetMlttW7VG0x0aprtbq9XVI0wEgAI3kXAkLxhJ0U7v9aP2BnhEVpCvQBI63GYLITvJvyiOQgRjBKulgC+ILoBogwgshxhiCBeFyEBiEJh0upR4LXJDibTnRDNaFdvCDQ6D3dZkMFcu1zLOybQ8tnlpNY23E3jqaJmvVqPROZBhPB4bJo9woyT0ERbXunk+4ma8dhRhrRHVGgGMEZdUya1BLoz7f4SSb6QGyZ13AAAAAElFTkSuQmCC) no-repeat 0/2.9375rem 2.9375rem, url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAC8AAABPCAIAAAD0sQuhAAAI4UlEQVRo3s1aiVdTdxZ+/80gMnZxbDvTTqfTTjtO68xU206VXQW3ulusIkWtG2pl3HDc96oVpC6tpUoCYQlJSNjCkgQSQgIJS8hO9jzme+9ZfC86QiX5dX4n53hy4Bw/7nd/937fvT9qnHec2iZD2dHO0wXWurvjND1O/FDcP9Gg321o7719UrUrU75tgebcjtHWupDH8SugiYYCvsE+4+2TjdsXVi76DT7SDe91nsx3alURn5c0Gq9Ja7p/UZH/UfWSlzk04sxZdWv+3HV2u62lhjQan9U4IL4p++If4szfcmjwEWWkNGx6X3txt71DHvI4yaGJ+Dwufav66AbEQ5SWXLkoaQKTdOPcrrOFzu6WSMBHCA0djYS9TkenQnN+h2TZq6L0mRNoqrJeqF/7jvbirtG2OnJ3io5Gw2PuEZW48/Q2/PfiDB5l6TNlm+fpLu91aFSJpozifwEgV3dLW/Ga2lV/FKXOmACET8Omv2kv7HLp23ABCaGhIxHUGLu6XnO2UJLzioCy7Bfr1/1Fd6XI3t5ACM0jyrzO4cbKjhNf1K99W5yRwqdMvuWf3d8ccPW0hr0uEmgeUeZ1uXQtbV+vqln++8rUJAFln7+PCLkNHdFwiBAaOhIOuR225mokdfWS2aL05MeULX5JuuGvPdcPOboUhNBwlIXc9iF5BVuH3uLnEGqSYttHPTeK3b0d8aWMevaPwx4nulXLgWWS3Ff4VZGhLG8eAHmMXShXhNDQ4VDINYqk7jy5tWrxy2ylfoQGTU26aa7+5mGnRkUIDUdZ0GUbarjfWry6bvWf+DmEBG/88l/60iMekxa1igQa7iCHHBpl8/7ciT4/8UGlNtw6DkDTF2hTRYP7zERI9mNHSR6al5Cy2Q15Hxhulbi6W6cJiJr6r9J0NOgYHqy/h6RmWgcPED7KHYsM5Se8/T1hn4cEGu4EXaOOTnnTvsWIkJCyJCikvntnAIgcmmgoGHSODNbdbT+2MZaypb9D64C4dhvUz3ftqef5E2g6MDporb3TtHdx7co3RGmCbq/6Kt145/SYxRDxe4mgYQEhh+xt9c17l1RlzuKjAThEyPTjpbEBPSk0rNMAIIvkO/XhdVBnfD1UnTNHse3jvntnmUodiZBAw0XIb7MAkHJnWs2KP8QItKbdWX3fn4cFiPjHiKBhK3Vg1DrSVNW0J5svhhgblJGC5tr/8BpyiBAa1qcGAvYheKC24tXwQPwIodcqty80/XDBY9JBpZBAwx3/kNlSVaYs/LRm+Wt8gSZKTWret9RUccU3ZJrUBsUNDQqMf2RgWF6BdOGLIc4GNX75CYKHHCKEhhstIKmRKC0HV8A7P45QapIk91XVrgxzxRXvgJ7+3xI2nmi4gwHDgOhbRcEnQBBL2f7c/sob/uF+4CaEBtmKFEGlRjAEYojV1I2FCy2SciAmhIYx9gGfb8iMzG0uymWaq5Ay9BMzrr3V+KTrSAga7qDMmB9cU+TPl+TM4WnqJJQAJJalusw/YolxrglEgz8dl8giLkUfjRFD6PbKHamY5yGEhNA8osxqRPUDO6weSprI6Jplr7UcWI58R6GaoCyxaLgD/YW7DbUK18FX+ChLrYc+G6y7h+7LVWoSaJAc0PC95ScU+QsEcpFL6j3ZmOcFnTZSaIJ+DBK6zhTAMsf4jZoVr7d+vcqpaw6PeRKPhqZBwZhF3//wOsYJqDd8UYavqEnGu6fBFDpLwtEwIto+DI7k+Quqsl/ia1b4Hlyr/gfXIEhIZDEuFLSf8e4Z5c50Jiq8LgGCkC7mB994zTq+BaMSSNCA3vzTVen69zAXExCU/aKKkYXnYIZi3CCVoLRF/A1lx1CIWZcjkMyq3ZkoMwGbhY4kvjOAIMx1kJtwn0xU+AStfAPKC22cdYB0grvmzwSZ7l/CIFycNUtAUNYLqMimisvPGEBR8Y0K5J/+5hHF1vmAwieIa90DVaV+hqBwwtHAprj06t47pxoLP42x6BghtOxfBiU6qXmg4kNQNAKCcE1qVr4uWJ2kzYAkbS7KgTydiqui4hIViL2eG4fkIEjoYDDgheCC/WMImsKcgJo2FC96EOYSioKP+WnLEvQmo6qqyia1CvFAw92g/h7jnVNYAwim7qkz8BVDpwFxKbwfCR+OJSPaYc/1gyBIlJ5SyScInfngCmvtbVwxWOOEz28wToMM6C0vkefP56ctQ9Bnb0JDIVeQTAQmJgxBXnO3obyEHfrPFMi5tOTWgysB5fm2EL8YDebC3j6t7moRRkYMFF7hR11pK2aUJQji9Eoi0YCgMTcm5723jsuxkhXORzDYbvv3GswDYSWJTGhBkEmHwo8BdozvR4QYKNLvf1HOPj8atDp0Zt3lfU8ShKioD68dlP6AEpf46TXNLGAdXY360qOyvHni9BR+SBgoR9YNNbBQpn2msPUIhyAosR5jCUqOGX9ie4UdFkNQPF6BTIIGS1dsgfFiAHNyxr3yCVrzdvuxTUOyirhEZRI0NEOQC0N8/beHGzbOjVkEMQQd3Tgs/wlj7DgqJOoZ5sOtV3dfLZIsnR1zg3C3O05sHm58yOimuD7TeToabKNQVzQXvpJt/jsj4XgE1a97p6Nk87DiQcBmjbumfuo+3GVvlyFt69e/y590AFbd6rfaj38+ohQFHSOJMBvUk+YD7VB7aU/MWwGGoKxZnafyR5rEIHGaVW5KaLCdw2sbzbntqCushOM9fVn/bud/tiAq8U3bp6NhH724RtVSPEzAgwW+3AdZuEFIW1tTNeAm1LdTE+bD2aXUnN8Z8/6G2zQjWrZmCUhMEEECNNjF4eUI3pXI8j4QrL5Sk/A2CY8XsNTAJoHApIdBM2bt7RfdwAsbwQ1KnwmCkLZ4lYQ3FeNEDoMGDh4FXr71w8eaEjOwnDnsA6lakBjHtwmTo4Ehgk3HoAWTJmYLl5aMORQejzHjOEydCJ6f30KGg75BI7yIfMuHzDu2MwX2DlnI6xwneyhekwxB2kE0waXa1VIEjBhBT69+sEiYtsO745aN/xqHGv9/Ov8Fj+cS9Hubos4AAAAASUVORK5CYII=) no-repeat 100%/.5rem .875rem
+}
+
+#adminInvite .main .reward .reward-item-bonus {
+    background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIYAAACGCAYAAAAYefKRAAAAAXNSR0IArs4c6QAAAERlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAAhqADAAQAAAABAAAAhgAAAABg+kbfAAAXlElEQVR4Ae1de3BbVXo/utLVy7ZsyVYUO04cO+8HCSRhw0ICTaBsp0B3lylmWXabUGaT6QxlZ/9gSof+4ZkuU6ZMd1omnU6yk2noEtiYQndgecwO6wBJWAJxCCEv8rBxHk5k2ZIlWe9Xv9+1r5BkWZFk3SvJvt9Mcu/Vvfec73zfz+eex/dQsRlOp7u7tKbW9Vaj1Tyf440rOcZ3MI6ZOU5tYaq4RcXUTUzFGlUqtRWiSCRiDpZgIwkWG2YJzhmPx5wszlxxFumLR/xn/A7XFc/VXseqzq7wTBadaiY17tjbu43z2petMtSYtnI6/UZS+p0EAJtKrWacRss4Nc9Uag1TqThG/00cOabi6JrQMU4JlojHCSFxAgmOdI3zWJTFYxEWj4bpPMYIMHYCzyfxUPBowOfpudb/9ekND+30zxR5itKoyvagN2hasWm5ts5yn1preEzN8RvUWj3DPwBBxREQBKWXvnkATyI+DpRYOMiEf/HIsVg48FrY6/xg+Ozhc9Xcq1QdMA52dWnWPnbPHXyN7SlOwz+q5gEEA+N4nQCG0kMg/xLRm8QjIQJJgMUiQepdIgciPvuuL1/76NMtXV3R/Esq/5NVAYxEIqEaPnlwqa6haTun1T+t0RmNGn0NAcJYfgnm4CAW9rNo0MeiIb8/Hg6+FBod3te0Zst5lUqVyPFaRdyqaGAc272D77hvZ6fGYHye1xra1LpaxhMg6PtQEcLLmwkao0QIILHQGIuEAwPRgP+5vg92d2/YuSeSdxkyP1iRwOg/2KU3tz30U42x7kVeX1uvMdTTwFEjs2ikqS5Og9howE1AGXNH/d5nXANv/6Z9S1dQmtqKL7WigDFIswrDyg07tDWm5zX6WiNvrKfOQV186yr4zUQ8xiJ+N31qxvxhn+e5wJlje1oqaFZTEcBIdD+idm989kmNzrSLN9TxPPUQUs0mKg0rmN1E0IMEvJFoyPNU/dEX9qo6X4+Vm8+yA8N+6tDaGou1mzeYlvI15lkDiEzFCwDxuQggnvM+p6PTtnrzl5nPyHldNmBcePclk2311v/Q6I3bdXVNwnRTzoZXal2Y7oa8w/SJ8e+zn+r5+ZK/fNpTDl5lBwamnu7+zx/hayz7tMYGg8ZQV452V3yd0YCXhXyuQNTv2l7ffvvrck9xZZ339f93l95z9atXdKa5BwzmFgUUOeCJPxijZZ4BsoLMILscj5f8lmw9hv3k7ztqmhb9UVtrWcgbG0rekJlcYMQ/ysJjzm98w5futa15sE+OtkoODHw6XJePP67Tm1/Wmxo5jpawFSpcAnFaYg96RmjPzrXNvGDdfqk/LZIuEmBfw7K48WW90UIrVnNpSYIvXCLKG4IEsCusMdSqVPHEw37n5UXfq7e9/fKHH9L2rzQkGTDefenvdd99fNv7NOP4vs5kpS1uyTsnaSRUQaVChrTwB3OBNbbVHZs2L1Qf2P/eZ5KseUiiLcfhvXWGjrs+pvHErVi9VKj0EsCqKY07TgT6jtxt3fSkt9Q1lBwY1493W+ua13yuq7O2Ad0KSScBWk6nNQ/HgPf6ydub13U6SllTSYExePydNlPLkl69ydpY6VvipRRiOcvC1n7Q4xjxDF5Y37LugYFS8VIyYAg9RcutZ/X1tkYYzygknwRgFBR020e8gydWlKrnKMkCF8YU+HwIPYUCCvkQMVET/hAhe+gAuigFA9MGBmYfGGhiTKF8PkqhkuLKgOyhA+gCOimulG/fmtZ0FesUE1PS79Lu6LelKmdlkYBgAK3i5s7rWHnn/aY5r05nnaPoMQZWNGkN/3/0ddaf0LS0LIJQKs0uAZrGsqDX8Yqp9Za/KXaFtOhPCZa5tYZ6BRTZdVPWX/GHCt1AR8UyUhQwsCGGvQ9d/Zxi61Xek1gC0A10BF0VU1XBwMD2b411cQ82xASPrmJqVd6RXALQDXQEXRWzZV/QGGNiXPGKod72Y2XrXHLdlqQCbNkH3PZXabzxk0LGGwX1GLC80hoaFFCURGXyFII/YOgMuiukxryBARtNmOPpTE2FlK88WwESgM6gO+gwX3byBgYMd2GjOVP9PPIVWDU+B51Bd9BhvvznBQyY+MOaWzHczVeslfccdAcdQpf5cHdTYMAZCH4fMPFXqLolAB1Cl9DpzVpy01nJ6EDvDoOpebe2rvFmZZXofoK5B04xZ99x5rl+noxRXOTr6aUgN9VFao2OUdwO1jB/FZuz8m5WY2uviAaEvSMs4Lm+s6Ft/Z5cDOUEBnxJTbdvHTVaWnk5XAZH+0+wgSMHmG/kai6eq/KedfmdbNG9f0sxPKa9vzWt9sPjze+8GvF83tOQy1c256fEsHrDTviSSg4KCmf0zcf72Zm3/m1GggKadJz7hJ3q/mcKrFJex3boEjqF83guhE0JDIQi0BpMv4SDsdR0/r1dbPCL96WupuzljzkG2IU/7C47H9ApIgpAx1MxM2XQCSE+BYUikLq3uHr0TTZ84bNJ/MHVoGHhGlZH32aNnmxPqszKHMa67iunmfvqubS2jVw8xtyXT7H6BavTfpfzAjpFmAnomLGuX2erOyswEMlGCFoisYV3wDXIrhz93SS+TC1L2ZL7dzBdvW38HsWSQDyJaiL4gbR+5wfM/tUf2aWefWms3/iqp6zAADOw3o8EvS+Srvdli+yTFRgIb4RINlIvZl3+0xsUKjF9vjH3lntZx9ZtxLqKRbxDLEq2BQijWG2EUT1vmsNs1J5R6iHQU4g0OnBSPC3bEbqFjqFrxvbsz2Rk0hgDG2WIeYXwRlJSLORnrku9aVUYzM2s/Z7Hhd4hOHSRhd32qgQFGgW4hz1DLBENMXP7bWntjFGoA5j+l5ugY+gaOs/kZRIwEB0PgdCkjnnlor8aCqKaxk/Hlm0UoJVnYdc1ISRi2s0qvUhEI0yXxcINfxjlJugYuobOM3mZBAyETER0PKnJP5y+VkHdGqufv5LFKOxQNFCWWCFSN7kiy4euofNM5tKAAeNexNEUQiZmPlni6wiFFUolfQMGmioFFKlCkeEcuobOofvU6tK+Lc6vD24yWpccghOy1HT+3V00TT2arKaWpqUYY3iunGFhLIFnfGaSD86wE4p1TmsKZlY3bymzrfozZmpdIXsLQx4H8zsubLYs23JYrDwNJQjDjIi75aAxez/Dv9lGGGcFKeZW8NywsDratGQjW/znP5M1Jhl0Dt2T7JPASH5KELBdiM1d4WGYZzpw0Iue/r8XhGwHcrUVzkrQPTAg1pkEBqL4Kz6noljKe/Rev0ibid2yMgHdAwNipclPyURqB/F3yY/I+ZGN6mnVs6apFQjOdrvqfuNrc4eqRPhGN42rnP1fpLXtxpd/YPM2PCCsUKbdkOgCGRyAASpeWH1LAgP5PpDaQS7KtsCzcNOPmGX+shmzhgFZ6izzp86SgGQ6tG7TfNtfsMHed9g3h3+bFD/GHk5aALTdsjX5m5Qn0D0wQHX8CvUIwEBmICSBge+jXBSjFcFUwmJLy/oHGFY8ZxKFnFdyNodTa5m+qU1o++Dx91iYNt9E8g/nfld8rhRH6B4YABaQqUkYYyBdFLICyUlCWqmUCmdrNL94LMzCtCcEMjTOS5EIQ/jotGupL4ABYAH1CMBADjG5gaHRpU+L5eytpBZwoeUnKDMSaLJnX9oyU6HFFvw8MAAs4EUBGEgsJ7dizO23pjFutLSkXSsX8ksAGAAWULMADGQbRGI5hWa3BITkgoQFSIETFraQglKibIOzW9TV1XpgAOlIBUwgWS3ykiqkSAASABaACU5rNrXJPb5QVFC5EgAWhKzWWkPdciXGd+UqSm7OgAWkOteoVerFMFxVaPoSCPvcSD5DviOUmJeyJeZL+CvVOodYhN5PpYhf3nUM1A0skOdJh4as/cyT58+p7CnnOSVAxsxOcqm0nz1Cq5alVWTQPb7wlbP+Et8UsMDFGzWUQIQy1Mm7kFLitpStuCil6h740+/YmIxL15I3lrAATGiYKq70GEVIOxoOsosH97MQuTfMJBJ6DMKEhha3mqouJXYFaOLy0bemBAWvM5JZfv6Rm4X1A3J2HnNcJr8DyXLT5Cc1CuoGTFCPwRqVxa38ZCY+5b72NfMOfSNeJo+NHbcx27I7yIYif1DgZdhC6OcsZp/t/ruy+5sIWCBMaFQqNVn+KmOMpHbzOLGf+3TSU20b/4o1tCYNoCbdr54fyEaEMKHMUwvUGLzIAqP2tLfMbasnQJFgQwSa4b4vGYtHKWjKCta8+h5hCpj2QhVcaBKJGGXGSbQpvUZ+2oqGfJMebJrYKXZc/IJdP30oed9xcdwFs2XtvcnfKv8kQf7EMQdHTpYjiLKiUH4SiJPLYRrR9E7fMB46e/TqmbRbuBi9cnbSb5X8g4AFwgSXYLHhso+EK1lSmbzBWzmVaIFLdI6C89Ak4qrsa02zImCCegzOmWlmN6lxyg9JCXD8ZLtYccxhyTA+wktNHWuT71bDiYAFwoSGrJGd9FGpBp4rgkeKX0V8YBb3rcyGzh9ltdYFzEyDTZCTgszByhvXTYvWC79VzX+EBWBCw+LMpfQY+asN1uy11vnji1ETr3lv9LOhr4+yOcs2CmAQAZJ/qZXzpIAFwgQXZ5G+RAE7gZXThPJxYlshWL+lMXD91Ees78jrAmDiE8a9aQ9UyQWwAExoyLP8nKEKQxmVU87CZ2PBKua6fDqNDfQc+AdSa8l5a3KgmrTnkxdwPKKl6GgFBFNBWKt4xH9GE3Z5BuJN4+brSUaVk5tKYP667zHYX0wVrDYWTneoummBFfIAeju/w3WF81ztdUzlR1ohvFYkGzBoWbS5k5mp55hJBCwAE9yqzq4wjULtyiJX4eoFOBbc/gBbdPePhFlJta8eAwPAAjAhrL7QgsYniXjkhypOPqfmwtVQuW9gzIF/0VCA4nRfI9fCMYY9lXwJjs18bSOzn/6IBUdvJF/TyRbYf7xKwgAWtz7BlQCMeCh4lL4tPyx3APSkRKr0RKMzMFPz4oK5F7fdEUk4FRjaWnPBZU3nBYwvgAWUIXiiBXyenhhZJCk0uyUADAALkIIAjGv9X59WgDG7QYHWAwPAAs4FYCAeQiweOVbNCzNojELFSwC6BwaABZQiAAMnsXDgNYT9UWh2SgC6BwbE1ieBEfY6P6Ab4u/KcZZJALoHBsRmJ4ExfPbwuViZs++ITClH+SUA3QMDYs1JYAgLXdHIgVi4/MHPReaUozwSgM7JMu0AMCDWmAQGfoj47Luiwck2jeLDshxpM2nWUZnbDJ1D96lyT9PCl6999Cnt8PnlMPVTkyNvKiGNJohSTc8qZwaY/KDNIFEGwgX9p5YjvCaZ8kHn0L1YL45pBolburqinicefikS9D07bqmU+mhpz3lDeprxgHOQjd24xGrnLmJ6Ak087JvxhmVwGea0iP5vFNoOGaSSrt6aeinJOemaZB18CbpPrSANGLgRGh3ex9eYJAeGcU5bKh+0Rp9g5976FWu7+8esniLwq3njrOg54APrvnScDRx6TZBBqlDMC9MD2KXeK9V5LDQm6DyzvEkuaEiD5L1+rr+mcYHkWY7OvPkvZF4/2eQ+k8nZeN1ASX1WPvyPkjYdMTx8I5cH6pqXt6tUqm+NWKnWtDEGuMAD0YD/uShlGpKaOrZuZxpyAFYoXQKQScfWJ9J/lOAKOoauM0GBqiYBAz/2fbC7OxIcc4v+EvhNCtI3NLOV33+GaSVO4ykF71KVCVlAJvqGuVJVIZQL3ULH0HW2iiZ9SsSHRvt6f2awtOzRZkn0Jj5TqiOS116l/KuOc0cYgpHMRtKQx7t1+V2sdeMPZMk4EKa4HjTY3dHQsf7X2eQ9JTCQ3nnOisdHDJZWybM1i4wBxb6hAZpTUxwrOp8NBO81nlJf1dBgXOo8t6I8YakVcF71D53d39i+pSurvcWUwEAhrv7eXxgt836FnF0KzRwJhOkPzz987RfmRev/fapWZR1jiA8HTh3bHQl4I4o9qCiR6j9Cl9Bp4MyxPblakxMYLbQ3Hw15nspMhZmrQOVeZUsAuoROodtcnOYEBl6sP/rCXsqbcV6x1cglxuq4Bx1Cl9DpzTjOOcYQX7afOrS2bs68EwZLeqIV8b5yrA4JBMiC3Tt07Vbb6s0U8ic33bTHwOsoKBr074tSolyFqlMC0B10mA8o0MK8gIEH7ad6fh72jwakXvRCXQqVVgLQGYWyDkCH+Zac16dELGy077NOnWnugfE87OKvyrHSJRCkYHIhz41HGzq+k3WVMxv/efcYeLm+/fbXw4HRVyP+0WxlKb9VoASgK+gMuiuEvYKAgc0W5wdvPknLqd/EFfvQQuRclmehI+gKOsu2UZaLqYI+JWJB9pO/76i1rbxgsDRzSuYCUSqVdURknIDzenzMfmaJbc2DfYVyV1CPIRaOikJB17ZQGdImiDwox9wSgG6go2JAgZKLAgZeNC9Ytz8ccL+CXTqFKksC0Al0Ax0Vy1nRwMA36/jeN58gJnqwba5QZUgAuoBOoJtCxxWpLcgSsTT1du7zlz/8ML55ofpA6+JbHqRcWnOVpHu55SX13WhwjLzJRk4ceuO/ttz/D/+aEcK4sNqLGnxmVuE4vLfOsOiur/T1tjY1WTwrJL8E4DQUdNsHApeO3GLd9OS0l6hLAgyI4frxbmtdy61nCRyNal4vv2RmcY1wLyRQjHgHT6xoXtdJSQOmTyUDBlgZPP5Om6llSa/eZG1Ueo7pKyefEoSewuMY8QxeWN+y7oGBfN7J55miB5/ZCgdjQC26NHzvFJJWApAxZA2ZlxIU4LqkwECB6MrwnQt5HCeU2QokIg1BtpAxZF2qz0cqpyUHBgrH4Ofj//3PO4jxHmWdI1XcpTmHTCFbyLgUA81sXE1rupqtQPG3/e99FrvfNOdV66q2DopPvUZNTjQ0rxZvK8ciJIBl7pCbdkp9zld6977x19OdkuZiQXJNweXRdfn44zq9+WW9qZFyvSozllwKmeoeNsSCnhGKtujahhXN6SxeTVVH6u+SA0OsDBtvNdbFPeSK0MYbG8SflWMeEhC2zn2uAZ/j4tZi9z7yqCbtEUnGGGk1TFygQY73f7s84La/CsMRxRIsm5TSf4OMICvIDLKTCxTgQrYeQ2wyPi3u/s8foWAh+7TGBkMhGY3FMmbDETaaMKWM+JzbYWQj9acjU6ay9RhixWggTMwGe9+dG3Dd2AfLZcU1QZQOpWslE3/IBLKBjCAruUEBbmTvMb4VwfgZXBNqLNZuirCzFD6cszWduOAhRs5A8PvwOR2d+VpzZ8qzVNdlBwYakuh+RO3e+OyTGp1pF4V44nlD/awByLjLoFtwG4SHGJyBVJ2vl92juyKAIaJ88O3dRsPqDTu1BtMvNfpaI0+xIuTyABd5kOuIgSVWL2lZ2x8OeP4JfsI3cxuUizfUU1HAEBuOEAzmtod+qjHWvcjra+s11IMge+FMIIQ3QiQbBC2J+r3PuAbe/s1UoQjK2d6KBIYokGO7d/Ad9+3s1BiMz/NaQ5taV8t4fQ3BWfYxs8hScUdasUR0PARCi4QDAwhvhEg2G3bumZYxTXHM5PdWRQNDbAKmuMMnDy7VNTRt57T6pylGlVFDAKn0rX1siSO4KuJoImQiIiI2rdlyvhyzDFGW+R6rAhipjTnY1aVZ+9g9d/A1tqc4Df8ojIKQIYijYKnlNi0UMgSNR/Gn1FdBIQwzIu4iuGpmHM3UNlXiedUBI1WIp7u7tE0rNi3X1lnuI3A8pub4DWotgKIXQKLieMlmN5hNIIeYkOeDYnUiCQzyfSC1A6L4I2B7amzuVL6r4byqgZEp4GM0q5nXvmyVoca0ldPpN6qY+k6KcWVTqdUCUMhgmSHzoeAkNZEEF+OV8bUTURQUipaUjrDZQjprynWOo5DBGMlqKeELUlAKmScpsRxyiCFdFDIDiUlgMvmqxmtRGtXIe148o1cxta63as2mNq2hbjnH+A7GxbHNS6tpcTOBp4nmZo0qlVqIz5xIxBwUoneEsgkOswTniscjFCmOG0Faa2S1RgJj5CWt5t4gH8H9PyB9R7h42zP4AAAAAElFTkSuQmCC) no-repeat 0/2.9375rem 2.9375rem, url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAC8AAABPCAIAAAD0sQuhAAAI4UlEQVRo3s1aiVdTdxZ+/80gMnZxbDvTTqfTTjtO68xU206VXQW3ulusIkWtG2pl3HDc96oVpC6tpUoCYQlJSNjCkgQSQgIJS8hO9jzme+9ZfC86QiX5dX4n53hy4Bw/7nd/937fvT9qnHec2iZD2dHO0wXWurvjND1O/FDcP9Gg321o7719UrUrU75tgebcjtHWupDH8SugiYYCvsE+4+2TjdsXVi76DT7SDe91nsx3alURn5c0Gq9Ja7p/UZH/UfWSlzk04sxZdWv+3HV2u62lhjQan9U4IL4p++If4szfcmjwEWWkNGx6X3txt71DHvI4yaGJ+Dwufav66AbEQ5SWXLkoaQKTdOPcrrOFzu6WSMBHCA0djYS9TkenQnN+h2TZq6L0mRNoqrJeqF/7jvbirtG2OnJ3io5Gw2PuEZW48/Q2/PfiDB5l6TNlm+fpLu91aFSJpozifwEgV3dLW/Ga2lV/FKXOmACET8Omv2kv7HLp23ABCaGhIxHUGLu6XnO2UJLzioCy7Bfr1/1Fd6XI3t5ACM0jyrzO4cbKjhNf1K99W5yRwqdMvuWf3d8ccPW0hr0uEmgeUeZ1uXQtbV+vqln++8rUJAFln7+PCLkNHdFwiBAaOhIOuR225mokdfWS2aL05MeULX5JuuGvPdcPOboUhNBwlIXc9iF5BVuH3uLnEGqSYttHPTeK3b0d8aWMevaPwx4nulXLgWWS3Ff4VZGhLG8eAHmMXShXhNDQ4VDINYqk7jy5tWrxy2ylfoQGTU26aa7+5mGnRkUIDUdZ0GUbarjfWry6bvWf+DmEBG/88l/60iMekxa1igQa7iCHHBpl8/7ciT4/8UGlNtw6DkDTF2hTRYP7zERI9mNHSR6al5Cy2Q15Hxhulbi6W6cJiJr6r9J0NOgYHqy/h6RmWgcPED7KHYsM5Se8/T1hn4cEGu4EXaOOTnnTvsWIkJCyJCikvntnAIgcmmgoGHSODNbdbT+2MZaypb9D64C4dhvUz3ftqef5E2g6MDporb3TtHdx7co3RGmCbq/6Kt145/SYxRDxe4mgYQEhh+xt9c17l1RlzuKjAThEyPTjpbEBPSk0rNMAIIvkO/XhdVBnfD1UnTNHse3jvntnmUodiZBAw0XIb7MAkHJnWs2KP8QItKbdWX3fn4cFiPjHiKBhK3Vg1DrSVNW0J5svhhgblJGC5tr/8BpyiBAa1qcGAvYheKC24tXwQPwIodcqty80/XDBY9JBpZBAwx3/kNlSVaYs/LRm+Wt8gSZKTWret9RUccU3ZJrUBsUNDQqMf2RgWF6BdOGLIc4GNX75CYKHHCKEhhstIKmRKC0HV8A7P45QapIk91XVrgxzxRXvgJ7+3xI2nmi4gwHDgOhbRcEnQBBL2f7c/sob/uF+4CaEBtmKFEGlRjAEYojV1I2FCy2SciAmhIYx9gGfb8iMzG0uymWaq5Ay9BMzrr3V+KTrSAga7qDMmB9cU+TPl+TM4WnqJJQAJJalusw/YolxrglEgz8dl8giLkUfjRFD6PbKHamY5yGEhNA8osxqRPUDO6weSprI6Jplr7UcWI58R6GaoCyxaLgD/YW7DbUK18FX+ChLrYc+G6y7h+7LVWoSaJAc0PC95ScU+QsEcpFL6j3ZmOcFnTZSaIJ+DBK6zhTAMsf4jZoVr7d+vcqpaw6PeRKPhqZBwZhF3//wOsYJqDd8UYavqEnGu6fBFDpLwtEwIto+DI7k+Quqsl/ia1b4Hlyr/gfXIEhIZDEuFLSf8e4Z5c50Jiq8LgGCkC7mB994zTq+BaMSSNCA3vzTVen69zAXExCU/aKKkYXnYIZi3CCVoLRF/A1lx1CIWZcjkMyq3ZkoMwGbhY4kvjOAIMx1kJtwn0xU+AStfAPKC22cdYB0grvmzwSZ7l/CIFycNUtAUNYLqMimisvPGEBR8Y0K5J/+5hHF1vmAwieIa90DVaV+hqBwwtHAprj06t47pxoLP42x6BghtOxfBiU6qXmg4kNQNAKCcE1qVr4uWJ2kzYAkbS7KgTydiqui4hIViL2eG4fkIEjoYDDgheCC/WMImsKcgJo2FC96EOYSioKP+WnLEvQmo6qqyia1CvFAw92g/h7jnVNYAwim7qkz8BVDpwFxKbwfCR+OJSPaYc/1gyBIlJ5SyScInfngCmvtbVwxWOOEz28wToMM6C0vkefP56ctQ9Bnb0JDIVeQTAQmJgxBXnO3obyEHfrPFMi5tOTWgysB5fm2EL8YDebC3j6t7moRRkYMFF7hR11pK2aUJQji9Eoi0YCgMTcm5723jsuxkhXORzDYbvv3GswDYSWJTGhBkEmHwo8BdozvR4QYKNLvf1HOPj8atDp0Zt3lfU8ShKioD68dlP6AEpf46TXNLGAdXY360qOyvHni9BR+SBgoR9YNNbBQpn2msPUIhyAosR5jCUqOGX9ie4UdFkNQPF6BTIIGS1dsgfFiAHNyxr3yCVrzdvuxTUOyirhEZRI0NEOQC0N8/beHGzbOjVkEMQQd3Tgs/wlj7DgqJOoZ5sOtV3dfLZIsnR1zg3C3O05sHm58yOimuD7TeToabKNQVzQXvpJt/jsj4XgE1a97p6Nk87DiQcBmjbumfuo+3GVvlyFt69e/y590AFbd6rfaj38+ohQFHSOJMBvUk+YD7VB7aU/MWwGGoKxZnafyR5rEIHGaVW5KaLCdw2sbzbntqCushOM9fVn/bud/tiAq8U3bp6NhH724RtVSPEzAgwW+3AdZuEFIW1tTNeAm1LdTE+bD2aXUnN8Z8/6G2zQjWrZmCUhMEEECNNjF4eUI3pXI8j4QrL5Sk/A2CY8XsNTAJoHApIdBM2bt7RfdwAsbwQ1KnwmCkLZ4lYQ3FeNEDoMGDh4FXr71w8eaEjOwnDnsA6lakBjHtwmTo4Ehgk3HoAWTJmYLl5aMORQejzHjOEydCJ6f30KGg75BI7yIfMuHzDu2MwX2DlnI6xwneyhekwxB2kE0waXa1VIEjBhBT69+sEiYtsO745aN/xqHGv9/Ov8Fj+cS9Hubos4AAAAASUVORK5CYII=) no-repeat 100%/.5rem .875rem
+}
+
+#adminInvite .main .total {
+    display: -webkit-box;
+    display: flex;
+    justify-content: space-around;
+    position: relative;
+    margin: 2.1875rem .625rem 0;
+    font-size: .75rem;
+    color: #fff
+}
+
+#adminInvite .main .total .total-income>div,
+#adminInvite .main .total .total-invite>div,
+#adminInvite .main .total .total-thrift>div {
+    margin-bottom: .375rem;
+    font-size: 1.5rem;
+    font-weight: 700;
+    text-align: center
+}
+
+#adminInvite .main .total .triangle {
+    display: inline-block;
+    width: 0;
+    height: 0;
+    border-top: 4px solid transparent;
+    border-bottom: 4px solid transparent;
+    border-left: 6px solid #fff
+}
+
+#adminInvite .main .total .view-tip {
+    position: absolute;
+    top: -1.25rem;
+    left: 3.5rem;
+    width: 3.5rem;
+    height: .875rem;
+    background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAKEAAAAqCAYAAADbJjutAAAAAXNSR0IArs4c6QAAAERlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAAoaADAAQAAAABAAAAKgAAAADbHHr5AAAM8ElEQVR4Ae1dCZgUxRX+q7tndnZBxIND8EK8g34oRhJFI95oUMALJRDRGBNEJR5BRcVFTT4jGpIoosSTkBhXFxEPPmKUCGgwoiieeCUey4Icgri7Mz3dlfdqmLFnpnume3Z7dtF539fb3XW8qq7+59V7r171AhWqjEA7j4AotX25ek5fWNapVH8ABHpB0iEknzuXyrNSbysZAYHNkKKB3nsDve8G6vUy6Ppc0WP4h6U8QSAQysb67pByPCCH07lfKQ1W6nyLR0CINwExB0LcIXqOWOP3SX2BUK55vjOs9ZcD9hUVSed3aL/D5VhSQpsKffvbRPfBdF2YioJQNtSNILE7ncDXozCrSm5lBHJGQGA14Wac6HVGfU5O1q2Wdee4kVIKueqxySRaH60A0DEwlUv/I8CCi/DDOGI8eVV0zZDyxWo0fv4gge8Mr4qV9MoIBBoBgTr07P1TIQ5rzq2XJwkVYssMQPv1lUjWLYC9/L3c/oV7nzBh/3uFOkDX5SRz+t9h3vkwsDnvnZSzG/lt2TbkZ6thLX4NWL8xP7/UFBZohCs3iWjk8Wysv77cEtBashzmY88iMuJoaP33yetSWAly42a0TPqTYl/98C0Q3bYLq6k8vsn658jBIGGceQJE5+q8/FASLBv4uhmSj3VfQq6lg89rNtD1BtifrIL8lNQ4M6maN44diOjV57ddVxQQ698ihrVOplkgVEYI5GRngcr11jECiRtmELiagKQFMNjoLG26jpuQLG2bCHgtiaIPI7p0gr7/HtD22JmO3uSNk+R1cdXaivJyLyAnE85WOI2VDAhTbpi1ZAV7K5DuTNsu1VrxAXDPY74ZGsMGQ3Tf3nf5MAva73yExLTZvptgKcgUv+oPgKH7qhcZPRT6oP7uZaMGrEXvZvIE84xE6NAh+LxdF3WWnzamJPCRtMbQuxvEjtuljm5dofFYUrlQifFF3hbC24K0+yYDQuUHbGc3jP3+J+DDL+k/ooH0AiH/+re8aE9+LDnSxNexqvSd+1kniVDjMXU2tcD+4FP3egVS7f/ygoNP2uTtcotePgbRS0Yp0CFKoHORXpL613zhjdB6d0d08oU+Gw2hGONM+Z1T07ICYWolxLoihOYCsdT36wP9UP8LMWLHrp78m8dMAut8fqn5/Cw1xbWatvduiN01yT3ve31Rfe8NrnmpRAmz7lkk5y9BZNQQJP86X0mkyNknwvzbfOgD9kf0wtMBPc9WzPBkqeVJVVGgyG/IfPw5Vd04/oeebMqXYV9BuLuLV1a2SELrYjJG2n3NVyMQGmOGlm8c2rIlkqJi917uHDd+hcTts5BcvByRc4Ygct5wBUIubJxKKkXnGiRm1iNx1yOouoYMge23defjkWotfAWJm2Z65H6TnFYBzPvnwnzgiW8yClxFfn4aGU/HFyhRYpbCGy8B4/oUCKUYRnNXidw6ZrXq+tuLdkx+sQHNIyeqcqFYx2RlJsnqN2c/AyQSStK5vVBj5Ik0jRowSR9uHnMdIqNPhjHiGJVW9CGogKiOQvTYoWBR+cV6MlgkxLadqXysYNmszE4BymZV9HNDMQgMwlQ0TNL/HOiH93e9DKkByScXITlvIWwCurbTjoheOwHavn08R8Y47Vho/fZE4sZ7kCAwJucuBBtexpBBwDY1nvU4Qxt4IGKzD/QsY694H/EJt0LQlB2bca23Hu3JIaQMCoJh/JFJpcKxQmolxTb50DxS2r0NDvujz1VB66U3IFevK9qX6ISfBJ6yijJtbQGSetZ/3oL1r1dgvfAqJDm/RSxK+t9JYL0PPqSPts/uiN1zHcyH55ME/ScSdz8K88EnoJMlqw86GPoh+5HeR7qfk778qqABJsn5nLhtlprnIiccRhYyTX4bNjk5+LvuQtpaAX3VHxOXUoQ/no4HuGS1aZL19kfqBRVjaq9aCz6KUeQXZ5KV33HIemoR6XN1kM0tqlPsHjFOOgKRc4dC7OBuPGnki4NN0yODwklkfbPOGBl2NMxZTyL5zBIkF7ykDgZ1dPzZ0IccnqnRPOpqX/4/rmA+sVAdmcoBLmIzJkHba7cANXwXHWDQ2+RA1LKQcdwPAlm/WZ2iFxb/7b1ZSa437Kz1SyQlMsTXQeo6fHsaW/TTH1F+NuPkIwiAg2B/vgbyE/LJ0eFGkbEcD0w4/Dg1C7iVYQkYOfcUJJ9diuTTi2k1oxHawSQNHaTtupOSuo6kzKVsXEcAjUOQBBO79Mykl3Ih2O0TBhH+hGx4lBZs5d5h8E/zZIcsT1XRcWeCdZ+SiADSdMIvVdXqWTdD9OqWx8Z+60O0XHJLXnoYCbGpl0E7aN8Ma0lLXmLnHqSgpVwszadT6GUp016GY+qiZv70jIEiP1tDbXTPKeF+y2u/iSl3Q9LqSXTcWTTuZOh0SBIrSRKqkPwO2b2tqVOCJJIb6YfsD7FNJ7cs7zTTVO6c3AKBAEgGDgNQH3gAjMGHlBaMwHqgQ+Ln9qdN7gl/RkfwD7bJwxATtj5rfLhm0u3JdRvRfEHKSV09k0Indwjgn+tUnWZT8By94DSIPXcpWCYv86smAuGEvGQ/CdaS15WFLbeoFtbSFWg640o/VfPKhKgHOtoSMkcrduRtjZdsvZEfzDc5w7fYDRKkru9GylfQev5lJG55AGkA8vKc1jfgD4C6a728wrex0+qnk1hVXhC2mAD9yksiK4DBwQ1s+hocECFqqrJ0t1La5nhHjkTR+/UNDFRz1jyAp7Ug5Pxx+KlHUs+cUQdzTmpZji1uDsfiJdDI+JF+OGSVaRl1DWTj2qy00G5ox15ZQZi4bw74KAfZZEnGr78T2q49Ebt/SquaTFAAKgcn5BojfpjyUl2YJNesVwaI9c7HqhmOyWSfpDn7adgNX6SCUwN2gC3qshFtGS0LCNlTL3zqUL4eXutIXsLCPa66amzKai5cLDv36xa0TJyWneZyZ7/yNuI3z4Qkqa98iJeNhn7MQHJwk/QlYn2Qjw5Oy8oCwmhtyrXSwQcjlO5pfXYuyTDx0xm5YaMCoEbuqqracRAchOogtsyN44JHzCTI5ykp6KIsRJvmwwch6SbmvY/DGHokBVH683GpfRe8cJ4TE8fRIhwjqA/+flnGpy0aUWvHNfQsAUhFSPsorxPAouSQNoaTD9BliwCrIjqF6AclQVE2ZQEhbZbnrzaEDkL29Ju0iYmnhdj9KXcIr10m7ptLa5gbEb1pfNYYxX81FfYbK1F1KzmDD/7GGczO1zj5vjgCJEZrrG7O6ixGHeQmfu0dofbEGP1jT/7WC6+RLvuZZ75XhmzLDU5ejah0+loDUbggjCdg/uUp1Rwv5GeI9EPrHy8pCy5CG22c66vaAXvCIhAmn1uKqAOE+qCDoNMmKIt25CVu/jOq/jgxnAX1TCdbd8EBsGyhtyexNJPxEowMmr1CJ/5KA30uhNsJFYRJchnwr0qj5Sz9aMcUSuuQGkUiM6B4mycr02ni0KUkWXbWoleBS0dllqw4PzpxLFp+Vgvr3Y9VdEnkvGHpah3uXPWbi9u9T6wCRS7qqC4abWr6ezWhgVD+rwHmQ0+qFxHhKWPLmmr6zei07sogtJavzAKhoNg77cC9lTS0lr6ZtbGH95NELzlHBTIkKdzJIGCL3bOV8TT/zLkpTqFVyzK3zgvp2LNhLX0DwsufV6pv09lYe1wnKSijFKlWbG9Oa5+FPw9C36lJswkHhPTgcQo3lzQd6wP2c1WOOXaOyX79PXV2/tEH9kuBkFYAcneXsaKtL3gR1rJ31O62qmm/dlbNu7ZpP2289u689NyExO9n5yYFuo9f+juo6OVAtYIVFl27oGr6Nb4rtSZ0y3cjQQsKIcm4HJfeacfVQwFh8pnF4EBVNiJ4F5gbaXvtqpJVyBMBxbmJRz/0AID2XHCQKzhGLycgNHrRWWi5YIpaEWGLWT+KFug9iPvAP4TWkPXau2rDeCEevJHcXk0h9CGSMIOtGmm0mV9F9gTsE0cjcVBuOCRqRa/T6528QwGhccpRBB6KY+P9DF57H7puA/Zv8a8bGzYDjp1k7O/SdqNvbtL0y/tAciNUBOUZFPTJER764f2dz5N3LWg/bWv9lC20TZK3SxaiqmlXknc4GEgK8XPNy1FpXMs4EvUjDupYOqH6Hs2IvOUriiesK1NIq2N00pese+T4AtNZrT5zkCpLUX5xOZI0MG/mw/xi5O8LI8Q9cIeKVOC+8lcY+NlL6W9aj8yN+i7SbMHsAh9ECkUSFuyMMzMsAHIb/AI6Fd4g5OxKwevWgrgg8xAy+dn5KJXaFHykA0LUoueIKYL1QRdqXxC6dKiS9C0aAfWRTDJCcnTA3CesgDB3RCr3rR+BgJ8LroCw9UNe4ZAeAVoLpql3Dq+EpB3R6axC5woIC41OJc99BFjSteG/kHBvpJJaGYEyjsD/AU9Gjez4w3yXAAAAAElFTkSuQmCC) no-repeat 50%/contain
+}
+
+#adminInvite>p {
+    margin-top: .625rem;
+    font-weight: 700;
+    text-align: center;
+    color: #e75947
+}
+
+#adminInvite .btn-invite {
+    margin-top: 1.5625rem;
+    height: 2.9375rem;
+    background: url(assets/invite-btn1.b408f.png) no-repeat top/contain
+}
+
+#adminInvite .btn-poster-create {
+    margin: 1.0625rem 0 2.4375rem;
+    height: 2.9375rem;
+    background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAABAAAAACSBAMAAAAp0qXrAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMjAtMDgtMTdUMDM6MjE6MTUrMDA6MDCayWH1AAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDIwLTA4LTE3VDAzOjIxOjE1KzAwOjAw65TZSQAAABBjYU52AAAEAgAAAJIAAAABAAAAAPPFXvQAAAAhUExURf+AUf+LXf+Yaf+kdP+sfP+WZ7ooC9VSLsQ3GOx1S/9+US7TMO4AAAALdFJOU2tra2trAf6o1oFNBpoiWQAAFStJREFUeNrsnEtT40gSx0X3YeA2Kg7ADZWmw+05NZInaLjKGxvRt53dufABZPk2Nht+3ICJ8OMGJqKxr0v7wqfczKySVHoZY3p7ZVQ5M8ZWSmWp8lf/zCrJY/yx2p6evjW1ba19e3p6JsDGKufFU0P34babe/60IQBPjzr8b8O+PG0AwIWW/jdk58uXAvCkO+1NmXf+MgD08H97eWC5PgBa/t+kLdcFQMe/QgQYOv7VJsDQ+b/aBBg6/pWqBJ8HQMf/bS8IPAfAhe6jt22/rQZAx/+tm7tcCYBOAFUrAwwtANUmwNDxr/Zc0NAJoNoSYBQIQANfPE98CP9u7mnQFu8ZT7OwtXU9ydYahccoHjfRiqt4vMS+bqNR4GkUHrOmx1M3ZT2N7+Rphp5lAQCP0HVuwwVruqHB7q7rwb8evUt5vFyPG3rcrAfDA1vwxHC/5vqexks8LvaDJzxewuOt9uCWYo+b48HLK/Qox3gv8VD/NTzFAx/B4xV4YIvrZTzU/bAl7fmSD8CF5xZYoeP7erwf5Wn+GI+7iafxAzyqBCgAfHO1VcIa7kkeAMUCoO3N2YccAB51t1RGAdzzLAAXDd0z/5dYvNjzXWyZAeBRZ4Aq2XkagIuGBqBStkwB8K+m7pNK5Z4vKQAePa0AlbJmEoALV8e/WgrgLRMA6BKwqmWgBEDHv3o5YKkAcKH7o3pJ4G8KAI+6P6o6D9AAVNdiAHQGqKI5ywiA33VvVNF+jQDQGaCaEhACoDNARW2pAai2fZAA6AxQUTvXAOgiAAGwbd0XlS0CAIALR/dEdYsAAOAffOsvhHMOKubY+T751151eL5E8jeujecEwGPuVTqFulAsGP8zjwjwc2bDEXYYumgjHJ3elnzvpptWQCpiasXpFCfUEnhyAbBdm0aAg9flcIcGDf0Nx4bqcQo8zmoPT3p4ocdRPfQvlyFzCo+x9xaLO5ef3TsiMvhqy9Y+De/wNBxnsa8e43JqBZvk/Gix2FfOwHaExz4Yvpd7i0Mdap/OHzuZ3sRmi3ap+5VjaEvCYyc99gs8PPTYr/bY+EUIwAV1IS+yTTwbmZOzTVyAY/X7/fsVxzQGgT917Pk4OiXnTrrsv/uT8XvcMpn096NjnIXydSeDyeRSaZVAwmZ7/mToZM/Nhv27TkYF1riesniiHZYIAC+t2cesgf165vv+5Yr9fun5fts5G/ndMOy1YF/6ar4P721+MvKDCCLwK0CBS20+Agm3t/J6EbbfwHbr9k41h2+dOb8BAP8sMQCD8XDmPA9AgwAYQLhk2J2ef+2ITH0IWz0YntBGwKIL7/kYZCkYVhIAAKlDqaAOX3uVLAqF8vUIAPswUK21hQBAEWD88Z/ynjgOwamzrgLAiwh7OOyhgcXiKwAAFQIB4EQCALuCWjh9tMEAvmYs3sJGe+4LrbA/wl4dUzHmRAqAOwJbigXO9hFgEwDlPb+z9QCwhQL85EeDHKJOB55OJtBEMJmMkYlojNrIChCCQz9pABB+KR1MrUxUu5YFASoAJ1ISAGyhAjgAgF1iAHCgrlED2ATASU/uzjmGJngHAITRafGPKgBzEeyTLACCOj+Y8Rw8prECIAC7Ww8Ad5ZGiWtAHLUU+PoaKaAldhcAnMh0UIsAQL2exrmFJOC9lQeAfYBv2k5MTwaAXAXYxhrAaZQbAEzC9wUKoM7BKAVApdfzW3I6NqdRryiADXp+ExdyRMb0Ux4AnA98Imnur1AABG2XsouwLVUAt9QAROVYngJYfcVQAbCGw1qOZu4k7l2M8/jh4WEEANAu40H/T5HHRZKADQP4D4tAMHjbDUsP/8bqrVKAa3F6bclhbTsVwLY/GL+X+PygowNeoAA1v8BEILBCb6MC/NVsNiUAvtR2tDoG+d7G/72T58D7fzeaXsP1eFhCBLNsBkjUAA4pQDs+m20EgPNfjRJPAmys4GmE++E8DWwonPXVANAiDsZlulgsAID6KBVECHKL8fpij/z+cHELb1g0+5i6qBF4sGJQGfIHOAUxbezuRjjxzwkAzhbbAoPzxXgs9yQga8FaCoD63FFqgNP0KMZ1Q9gL8zeV/ZMRvOlI8naDGRaIwX32LlBcNtwoAHykkiO0+uR+WxTgvMwKkB/j1loKAH4Y4PEsIHoXhsyet+RUP10DIh1DjnOBVvrucCEASjYguMb2lgDglhmA+SoAnlEAKCAS08B5WgH4GRR8dgqATph8HCoBx/2EzXIAiKuVqaIAI3+4NQCU99x+6a0C4FRdphspE7KxjPARUyhpYYRgluCP7+L8V6wAPGcRQNShdhaAxXDRTxyL6SWYbQkBJQYgu0yTqgGCaKEey/ZowT65kDA1bu8gHngvEOuCbkpk6D4OtkomFOAhnCXkAJCjAFJcbhIKgAlIA/A6O/Wjca2O9nFcA0Sl1mHBOgxQ8pfrNiD6pBwZAKw9qu5pFhCW+dByJ7PMFwMwEIIDr10JgLwn1E0oQCIlaAA2LgE60XSgi0/1oNmxAsyUkS6EwcosJY7FtA0DghkfgygndUyVmkt19QFXn2p+KxcAXPmh28FuWPmJPKNq/jHNK7oagFcvA/mzaLRf5uhDAgCIp7WTIkCtFLuU8SG0lpSSLs3p+9G8XhZ6NTF67d4wFwCZBq4Foe1oPqIOeJE/Wu80AK8xSqSx3KfHU10ddEIOrPrkrnAiCaMaVwPv4/Te5dkqE4btV0nLEX7D7Z7RGxrwuqeqhFgKDhUA2wvGswwA25EEygvAYdyFeQDUQgVgMOgPBA11PxiisNfD0fxZmTzUZ/s92utsBQCwER8r8KHQYKeYV+zTUXCPaWeknEJSAXginygABB0NwCvmAPHd/SIAEgqAO4Tb6uGkrhbNEP2b3hUXAByvAmAW3Qy0sDWGpzFmok6YKQrQUVd/zBzxIuhmGoDXzQHerUwBcUSOxA6H8pAIAMu4xQWAvcXeZDFqQRDRXV+tAMIv7iUHoqmpoGaWowBOUfbaliRQWgDm8ZpPYQqQ1dxVuMNXeUgIgLVj4BJByzLNBfwdjqhUPB4FvrhbPBjhnA7+CUZiPQkrQ/k8Ea0jt/jxQFT4aQW45sd3oACtIVr/AS0HAL+jAXhFCehfrQBAWaqbWseUoVGu2yoAZ/JRDXidIggj4sOSU/8u/3nnaG9vZ2/HONoxbhfw9mgnnBZOxS1ezo5GpCX1tAIcz69SzwTOkusAmcmhBuClAES9V5QCIqG1SJSPpTSHvo4CibwdKG4UWFZd1nR2+IspW/1txwF9tbjDx36iEzlOKcBw4E93M+VDRgGoftAAbJgCWvyZFBBnWujxKyt6JvBnMbe/VgGgxwBlUraEZFiW+TBOmIxhvYf7faYzsKAonPKMAoCwTAsVQAGg9BJQWgBqSszrq58Imsq7cYfRzNB28U5SAgCxZH+trNVBzkiXgZdyvD7MDvABM/E4ysCXz6T0+12x2iiOSilAHGpLAWCqFWDDWaDVa7FwpS7xRNAsLvx9Uc1NKSRtrAGjH//YaQBOKC90hV8WDTwNQBRDtpt7I+oGDmXhPDKlALkpoPyrgYZV0hNjh9c8936wjCE+sDF8WAxp7DOs/7EQaIvLYWwfAaiH922gCBTjNgEA4ywNgHRbhQBA+4uB+HCFTwWjTAzAUAFYRgGCrqmLwE0loP6OrQKAFn0Yw5E+tRhWDKgJVyHPBAB3nZ4fvMcCz6JBHQYpBIDnA1CsABY/GkSrPLgQdCpKFVw2ZlkA4My0AmyOQPpxjSwApomQXNGADR5ipwCgQ8VeMBRLtVQjzrIK0JKpZaAAUKgA7GASlvd3tBBEkTdNPBsrUwO03pU+/iW+F2AxcwUA1oFc9SMAKLg9VYZJAawoFDA8xSQhqwDXlniQhOr8aBAXARD+IHQ8I0jauLoIQoS/Qc4AEMwszrdBASxTqpdyviYlr+/u4S/x5KeAS0bHHIoxx8RIlzN/EQRsTQIQzhVglLK5qBfTCnAjV3M/SQBwj6O7WniTeCDKTzEl6EYNXlssBAAawhqkHX13CMCQM+WC5DWaJk9f6hoe67lj2KYeUACThgCWPvgiH6wSH76jh0kP/WU5HpbxsHn8w6v4iSCoq5AxAoAxFkm9yLlhawIAUwWgR4QQngIA08QKYqxMNWaMGmDz8Z/h/b+B38IjTmmGYZnh+tO1SXVCmzREJiJx4SaTAIyZyZXrYQz7X14ppw9rerh80o2JF8XDXu8xLNHXJn6LJToeOkH9EHos/GBaqd2gsQJPwTFsHY8lNhvC9nBZT7435Jceimj+t73zd04jh+I4ykwGkkramQzBVdZXeLjq5q64fyMptuEP8OIOXGDo7GYNnXFxmC6+GZr8laf3Q1rtIrBNMjeIlWZCDG9/gN5H3/eetCxqgp5ksbi2RyMAbCjXAPTpW794GsUAbFUB3FM6dRzRJl3CCoO8CRT3BcJFADyZqeg7Re8/UfZUivrBfJ7EflLzJEnsPugfbUn9lvTtlqR2tMRraaWWUP5nR6bXgh57pUWlxuIezXzWlyz2T4XD7jopDwzAdmiRhwGgdB76nHUG5wEUZBG0HJCoNk0PEyESvZv8VgPgmk8OE4uUE3T4sBeU7GnT8GZJcCkMAZCLiAu7L3RuggCM0rIj4POgxX1JbVmS8rVyzFa2Tl+2qB0W8n+ls6EfW8/q+Fu/9I3ppYRX+cxQ/kwpgN0FFUCBn8dCwCogD/Yr2oR2S3coAJ4P15sVrgUtEIAczzsdJSkpAAGA23bKfa1MJCqI1npOj/9N9lwAqMGQB3+Di6Hr8Uv9txSvoJEC/E1xXQNATmFGEtztWj7UC012Il5g1KeAgfcdWVoAUojIEwcACeEf3sy7CgB6lyDaeevf0BTAhmmMzX0G4IL8l6wTVwGe0G0SFABqgAfrGFSA7uK8ngRadRmi6AuKMbmwAKCGYsTHbyNc0RxUUVEfeFOjNAwAzoIIAR4FUJx39znbwq/ygd8XFE0RgC84OQz+yCUqxsQcBxVgkmMZyN/8+6OwcRy37ZqrSwq4rAOXBtPy3HfEiT56lyeGKwAslAoFgG9hKgB48LYlVJsBMDXeZDizTrxr422+pP4v7+DK3BPJhsLQfnOJACy40vhQhgA4NmaZ+L2RSa4f4Nn6QTl2VgDKEqrvrz9/DAeAQZgKAN0+m97DbM3QRAAgYcJfGEMFwBs9PME2OX7JAHChLBD4gcAwqdzlhQGA040xDpBhaL59eM/wTRAAVgBKJCsxXy7TUAB4HyoA4PFlcWlyf8rmxyTtJshDJZeTf64KjBB9c+M/HraP3ioAKopl4pmHHvoUgODLg3F5tW1CBQAmAtl9V4prfHNxINg7uBYzoZGs/aXdOQLX5WUEgYP65gEoB/TNQw99CkDTPrcqVACyIAFAJ7174nH/ZWIc1OOUgBx8e5HTeB4+djGJT6Zj5SjA0K8AVGFOXqsAmAUuwgXgWMuA1C6u0DWB7qIGJ+qfOfoiCODSsandSBKGDzNS6IX2OAhAsnamaiArBC8X3AwAAIdOFYtXKYBi+objIP0vs6MFQDo3Z4KV/ln59IFG+CLtwvU+I9XGqfcV3wjETBDjesw77c/5/Eao5KYyM9MlAcAqwJyEZxTQpt05rdwl1k0CXQWw4SdfhgjA2fEC0Ha7/9JJ1ufghx6lfOv1zZrlfIELgpTr4UtDeH4/E8lff57jBLl79CeSbSwWpS4ChZB9kz48URgxl4zTPaDxAqO0AgApQM9e/RMqAEeaBX6+3Nn0GO+YrOD8vDflQPBP6Qgwj9DJetg6d/qZTuc4D4Apfv6I/2P6JgUy9cgpwJBiEDZcj23bPE/j0nMUgM6OEMwCBODT8QLQ3gcA1u+kueQB6P2uWamnDAFD9XajeQCAY8QXlOFR+JIwVo8rZQnor3R4wFtMUJTvzu+n/AQAIPpW+DgKLwWAXwzJRHgK0CvM1Dxf8pELG/iXnMYptfLtfGv2uheqVACuCpZ8wDsqNWDlvLzCd1lmDwRAh1YBgD5UmzzAIgAAeA5PAWRRVt6FzcHbxgumbJx6dr7jKgD9aRWAykYsIDoEkS04DQB5WZLy4UEBJkQfAhQeADI7XgA6L+UA43JGgMOvnHIKoMUffdnzEMC7FTOTC9ya2p89qGuKoSOKdkLo1p1CQnwAgA7Tt6r/ukggOSD+cORxTv7c7GwzcLF1ktZkU5715izUXY7i8mZeVOt5FvJkJZSrAORmCuLtIq9NOdkgYxSHUn4A4ILp0/DlIjgAfqefjg1OuMBLtuqSxb0oqeFUfMLjNZUf1qsKPZVyvVQAuGEgHyfpjerJiLbZ/XD9aGkAkMVC8txigHUg/XZwpgJsvQfrxJWosgGvXbhRHC+r5UtKa6NUw0HC3VvbxV6lRF2KZmthX+zOZjPatA1iZM/eXgYLwLMKuiWvfG3H3ulLW9Dks7NDmqqfOuUxpQAIwDfVhCaxHbRreqJdYgAYNAIALdVCCBVbJQIgAFkg/vu5bWWrdaAAnD4Ax5sESBi1Ah5Ywbd96xvWwoFAGiSk3NpSlnmjjyOfYAhnF+FuEZ66fMwMAANx9KNfvkUH5D631n0s9tvr55VvVKMjHltnJQCnl/BV/z5Q+oXwOFuchv85AhAA2Xe3iN4x9bLHIn2vyLonqtvusahfYBHSlWuxZfbKvGd0i/LNChtcRC0ciK1zHGpRh1jEQRapshKArwJypBZkSvov2aJn+glMnFQsQuy1CEWTLWCRlHd5LfCg/yKLKC36ne2zqIql5VqUxyJoHwj+Xot+2LYIY1FkIbZ8Ftzn5y3S9I61KLcj6hbcccuCn7/cR7oWaTqiajlzABjQLJlo7WgHWdQhFvlmS+sQi3y9RZmPKH/F0f53y84+kBsHgOz7zgPEdqJNZC4A32KHNKxRDWABGIjYJQ0TgE0FgOx77JJmtY9ZFYBB7JJmtU81ALKYBTYqAKhNHYAfsVea1M6yOgCDKAFNqgE2WwDENLCJKaALQEwDG9Q2HgCiBDRRAFwAogQ0UABcAKIENFAAKgBksWuaMQmw2QXA19g5TROAKgAxCDSiZbsBiHlgszLALQCiBDQsAGwBEAk4ef9v9gMQg0CjAsA2AJGA024/spcAiOvCDUoAvADENKBJ/vcBEAlokP+9AEQCmuN/PwAxD2iM/3cAEAloQP6/F4BsEMPAaQ3/TfY2ALQIRAROaPjv8v8eALJBjAMn7/69AAACkYHwvf9jn4v3A8AQxBZu22xe8O9/kSMtK46A4AAAAAAASUVORK5CYII=) no-repeat top/contain
+}
+
+#adminInvite .dialog-rate .header {
+    font-weight: 700
+}
+
+#adminInvite .dialog-rate .rate .rate-item {
+    display: -webkit-box;
+    display: flex;
+    -webkit-box-pack: justify;
+    justify-content: space-between;
+    position: relative;
+    margin: 1.5625rem 1.125rem 0;
+    padding: 0 .8125rem .125rem;
+    font-size: .8125rem;
+    color: #131313
+}
+
+#adminInvite .dialog-rate .rate .rate-item:after {
+    content: "";
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    height: 1px;
+    -webkit-transform: scaleY(.5);
+    transform: scaleY(.5);
+    background-color: rgba(234, 68, 53, .21)
+}
+
+#adminInvite .dialog-rate .tip {
+    margin: 1.0625rem 2.0625rem 1.4375rem;
+    line-height: 1.375rem;
+    font-size: .8125rem;
+    color: #585858
+}
+
+#adminRewardIntro {
+    height: 100%;
+    box-sizing: border-box;
+    padding: 1.125rem 1.5rem;
+    font-size: .8125rem;
+    line-height: 1.8;
+    color: #585858;
+    background-color: #f0f2f5
+}
+
+#adminRewardIntro table {
+    margin: 1.25rem 0;
+    border-collapse: collapse;
+    border: 1px solid #e85946;
+    width: 100%;
+    text-align: center
+}
+
+#adminRewardIntro table tr td,
+#adminRewardIntro table tr th {
+    border: 1px solid rgba(234, 68, 53, .21);
+    height: 2.25rem;
+    width: 50%
+}
+
+#adminRewardIntro table tr th {
+    background-color: rgba(249, 212, 205, .4)
+}
+
+#adminRewardIntro .subtitle {
+    line-height: 1.5625rem;
+    font-size: 1.1875rem;
+    font-weight: 700
+}
+
+#adminRules {
+    box-sizing: border-box;
+    padding: 1.125rem 1.5rem;
+    line-height: 1.5;
+    font-size: .8125rem;
+    color: #585858;
+    background-color: #f0f2f5
+}
+
+#adminRules h2 {
+    font-weight: 700;
+    text-align: center;
+    color: #585858
+}
+
+#adminRules h3 {
+    margin: .5rem 0 .25rem;
+    font-weight: 700
+}
+
+#adminRules h4 {
+    margin: .25rem 0 .125rem
+}
+
+#adminRules p.indent {
+    text-indent: 2em
+}
+
+#adminFriends,
+#adminRewards {
+    box-sizing: border-box;
+    padding: 1.25rem;
+    height: 100%;
+    background: -webkit-gradient(linear, left top, left bottom, from(#ffe1cc), to(#fff));
+    background: linear-gradient(180deg, #ffe1cc, #fff)
+}
+
+#adminFriends .header,
+#adminRewards .header {
+    display: -webkit-box;
+    display: flex;
+    -webkit-box-pack: justify;
+    justify-content: space-between;
+    flex-wrap: wrap
+}
+
+#adminFriends table,
+#adminRewards table {
+    border-collapse: collapse;
+    border: none;
+    width: 100%;
+    font-size: .875rem;
+    background-color: #fff
+}
+
+#adminFriends table tr td,
+#adminFriends table tr th,
+#adminRewards table tr td,
+#adminRewards table tr th {
+    position: relative;
+    padding: .75rem 0;
+    line-height: 1.6;
+    text-align: center;
+    /*white-space: pre-line*/
+}
+
+#adminFriends table tr th,
+#adminRewards table tr th {
+    color: #000a1f
+}
+
+#adminFriends table tr,
+#adminRewards table tr {
+    color: #4d515e;
+    border-bottom: 1px solid rgba(234, 68, 53, .21)
+}
+
+#adminFriends table tr:last-child,
+#adminRewards table tr:last-child {
+    border-bottom: none
+}
+
+#adminFriends .table-header,
+#adminRewards .table-header {
+    border-radius: .3125rem .3125rem 0 0
+}
+
+#adminFriends .table-body,
+#adminRewards .table-body {
+    overflow-y: auto;
+    border-radius: 0 0 .3125rem .3125rem;
+    box-shadow: 0 .125rem .375rem 0 rgba(229, 158, 88, .3);
+    max-height: 26rem;
+    color: #4d515e
+}
+
+#adminFriends .table-body .no-data,
+#adminRewards .table-body .no-data {
+    padding: .75rem 0;
+    font-size: .875rem;
+    text-align: center;
+    background-color: #fff
+}
+
+#adminFriends .btn-invite,
+#adminRewards .btn-invite {
+    margin-top: 1.5625rem;
+    height: 2.9375rem;
+    /*background: url(assets/invite-btn3.5181d.png) no-repeat top/contain*/
+}
+
+#adminFriends table tr td,
+#adminFriends table tr th {
+    width: 33%
+}
+
+#adminFriends table tr th {
+    color: #000a1f;
+    background-color: rgba(250, 222, 193, .21)
+}
+
+#adminFriends table tr td .shop-status {
+    position: absolute;
+    top: .1875rem;
+    left: 5.625rem;
+    border-radius: .4375rem .4375rem .4375rem 0;
+    padding: 0 .3125rem;
+    height: .875rem;
+    line-height: .875rem;
+    font-size: .6875rem;
+    white-space: nowrap;
+    color: #fffaf7
+}
+
+#adminFriends table tr td .shop-status2 {
+    background-color: #4f49f3
+}
+
+#adminFriends table tr td .shop-status3 {
+    background-color: #17c475
+}
+
+#adminFriends table tr td .shop-status4 {
+    background-color: #2c7eff
+}
+
+#adminFriends table tr td .shop-status5 {
+    background-color: #ff5022
+}
+
+#adminFriends table tr td .shop-status6 {
+    background-color: #2d6389
+}
+
+#adminFriends table tr td .shop-status7 {
+    background-color: #737373
+}
+
+#adminFriends table tr td .shop-status8 {
+    background-color: #f3a349
+}
+
+#adminFriends .table-header {
+    margin-top: 1.25rem
+}
+
+#adminRewards .table-title {
+    margin-top: 1.25rem;
+    font-size: 1.0625rem;
+    text-align: center;
+    letter-spacing: .125rem;
+    color: #e75947
+}
+
+#adminRewards table tr td,
+#adminRewards table tr th {
+    width: 33%
+}
+
+#adminRewards table tr th {
+    color: hsla(0, 0%, 100%, .8)
+}
+
+#adminRewards .table-header {
+    margin-top: .5rem;
+    background-color: #e75947
+}
+
+#adminRewards .btn-invite {
+    margin-bottom: 1.5625rem
+}
+
+#adminPoster {
+    position: relative;
+    height: 100vh;
+    background-color: #171a31
+}
+
+#adminPoster .img-poster {
+    width: 100%
+}
+
+#adminPoster .info {
+    display: -webkit-box;
+    display: flex;
+    -webkit-box-align: center;
+    align-items: center;
+    position: absolute;
+    top: 1.25rem;
+    left: .9375rem
+}
+
+#adminPoster .info .img-avatar {
+    height: 1.25rem
+}
+
+#adminPoster .info .user-id {
+    margin-left: .375rem;
+    font-size: .875rem;
+    color: #fff;
+    white-space: nowrap
+}
+
+#adminPoster .qrcode-img {
+    position: absolute;
+    top: 25%;
+    left: 50%;
+    box-sizing: border-box;
+    border-radius: .625rem;
+    padding: .625rem;
+    width: 43%;
+    -webkit-transform: translateX(-50%);
+    transform: translateX(-50%);
+    background-color: #fff
+}
+
+#adminPoster .qrcode-img canvas {
+    width: 100%!important;
+    height: 100%!important
+}
+
+#adminPoster .qrcode-img>img {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    -webkit-transform: translate(-50%, -50%);
+    transform: translate(-50%, -50%);
+    width: 2.625rem;
+    height: 2.625rem
+}
+
+@media screen and (min-width:320px) {
+    #adminPoster .qrcode-img {
+        top: 9.375rem
+    }
+}
+
+@media screen and (min-width:375px) {
+    #adminPoster .qrcode-img {
+        top: 25%
+    }
+}
+
+@media screen and (min-width:724px) {
+    #adminPoster .qrcode-img {
+        top: 30%
+    }
+}
+
+.app-fixed-height {
+    overflow: hidden
+}
+
+.app-fixed-height #adminMerchantInfo {
+    overflow: auto;
+    height: calc(100% - 3.75rem)
+}
+
+.app-fixed-height #adminHome {
+    height: 100vh;
+    overflow: auto;
+    padding-bottom: 3.75rem
+}
+
+.app-fixed-height .qrcode-wrapper {
+    height: 100%
+}
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/css/assets/banner.9492e.png b/pluss-wap-page/src/main/resources/static/resources/css/assets/banner.9492e.png
new file mode 100644
index 0000000..8d5ce28
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/css/assets/banner.9492e.png differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/css/assets/button.2df98.png b/pluss-wap-page/src/main/resources/static/resources/css/assets/button.2df98.png
new file mode 100644
index 0000000..9023a6b
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/css/assets/button.2df98.png differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/css/assets/fonts/Jinrong-Bold.otf b/pluss-wap-page/src/main/resources/static/resources/css/assets/fonts/Jinrong-Bold.otf
new file mode 100644
index 0000000..bc14c53
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/css/assets/fonts/Jinrong-Bold.otf differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/css/assets/fonts/MI Lan Pro_DemiBold.ttf b/pluss-wap-page/src/main/resources/static/resources/css/assets/fonts/MI Lan Pro_DemiBold.ttf
new file mode 100644
index 0000000..cc4133e
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/css/assets/fonts/MI Lan Pro_DemiBold.ttf differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/css/assets/fonts/MI Lan Pro_Medium.ttf b/pluss-wap-page/src/main/resources/static/resources/css/assets/fonts/MI Lan Pro_Medium.ttf
new file mode 100644
index 0000000..cc4133e
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/css/assets/fonts/MI Lan Pro_Medium.ttf differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/css/assets/fonts/MI Lan Pro_Normal.ttf b/pluss-wap-page/src/main/resources/static/resources/css/assets/fonts/MI Lan Pro_Normal.ttf
new file mode 100644
index 0000000..cc4133e
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/css/assets/fonts/MI Lan Pro_Normal.ttf differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/css/assets/fonts/MI Lan Pro_SemiBold.ttf b/pluss-wap-page/src/main/resources/static/resources/css/assets/fonts/MI Lan Pro_SemiBold.ttf
new file mode 100644
index 0000000..cc4133e
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/css/assets/fonts/MI Lan Pro_SemiBold.ttf differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/css/assets/invite-bg.89420.png b/pluss-wap-page/src/main/resources/static/resources/css/assets/invite-bg.89420.png
new file mode 100644
index 0000000..239f2ba
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/css/assets/invite-bg.89420.png differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/css/assets/invite-btn.0ea39.png b/pluss-wap-page/src/main/resources/static/resources/css/assets/invite-btn.0ea39.png
new file mode 100644
index 0000000..6a9adb8
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/css/assets/invite-btn.0ea39.png differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/css/assets/invite-btn1.b408f.png b/pluss-wap-page/src/main/resources/static/resources/css/assets/invite-btn1.b408f.png
new file mode 100644
index 0000000..82870ec
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/css/assets/invite-btn1.b408f.png differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/css/assets/invite-main-bg.92b73.png b/pluss-wap-page/src/main/resources/static/resources/css/assets/invite-main-bg.92b73.png
new file mode 100644
index 0000000..8657920
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/css/assets/invite-main-bg.92b73.png differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/css/assets/inviteF.ca150.png b/pluss-wap-page/src/main/resources/static/resources/css/assets/inviteF.ca150.png
new file mode 100644
index 0000000..99c6e74
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/css/assets/inviteF.ca150.png differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/css/assets/invute-page.4fc98.png b/pluss-wap-page/src/main/resources/static/resources/css/assets/invute-page.4fc98.png
new file mode 100644
index 0000000..67f0ce5
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/css/assets/invute-page.4fc98.png differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/css/assets/poster.bg.04457.png b/pluss-wap-page/src/main/resources/static/resources/css/assets/poster.bg.04457.png
new file mode 100644
index 0000000..70b2498
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/css/assets/poster.bg.04457.png differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/css/comment.css b/pluss-wap-page/src/main/resources/static/resources/css/comment.css
new file mode 100644
index 0000000..25b3b2d
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/css/comment.css
@@ -0,0 +1,102 @@
+s{
+text-decoration:none;	
+}
+.perport-container .c {
+    font-size: 14px;
+    text-indent: 2em;
+    color: #666666;
+    line-height: 38px;
+}
+.perport-container .c b,.perport-container .c i {
+    position: relative;
+}
+.perport-container .c b {
+    color: #2e6eab;
+    background: #c1eee1;
+}
+.perport-container .c b a,.perport-container .c i a {
+    position: absolute;
+    padding: 0 6px;
+    height: 18px;
+    line-height: 18px;
+    top: -20px;
+    left: 10px;
+    font-size: 12px;
+    text-indent: 0;
+    border-radius: 4px 4px 4px 0;
+    background: #646464;
+    color: #fff;
+}
+.perport-container .c b s,.perport-container .c i s {
+    padding: 0 4px;
+}
+.perport-container .s {
+    background: #FCF0E2;
+    padding: 15px;
+    position: relative;
+    border-radius: 0 4px 4px 4px;
+    font-size: 14px;
+    color: #FF8901;
+    line-height: 24px;
+    margin: 12px auto;
+}
+.perport-container .s::before {
+    content: '';
+    position: absolute;
+    width: 0;
+    height: 0;
+    border-style: solid;
+    border-width: 5px;
+    left: 0;
+    top: -9px;
+    pointer-events: none;
+    border-color: transparent transparent #FCF0E2 #FCF0E2;
+}
+.perport-container .c b i {
+    color: #FF5844;
+    border-bottom: 1px solid #FF5844;
+}
+.list i{
+	display: inline-block;
+	    width: 10px;
+	    height: 10px;
+	    margin-right: 5px;
+}
+.green{
+	color:#2e6eab;
+}
+.orange{
+	color:#FF8901;
+}
+.red{
+	color:#FF5844;
+}
+.greenbg{
+	background-color:#2e6eab;
+}
+.orangebg{
+	background-color:#FF8901;
+}
+.redbg{
+	background-color:#FF5844;
+}
+.annotation-side ul li{
+	border-bottom:1px dotted #ccc;
+	padding:10px 0;
+}
+.annotation-side ul li .text {
+    font-size: 14px;
+    color: #999999;
+    line-height: 20px;
+    padding: 5px 0;
+}
+.praise{
+	background: url(../images/common/unprize.png) no-repeat center;
+	background-size:cover;
+	vertical-align: text-bottom;
+}
+.praise.current{
+	background: url(../images/common/prize.png) no-repeat center;
+	background-size:cover;
+	vertical-align: text-bottom;
+}
diff --git a/pluss-wap-page/src/main/resources/static/resources/css/h5-common.css b/pluss-wap-page/src/main/resources/static/resources/css/h5-common.css
new file mode 100644
index 0000000..1328d6c
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/css/h5-common.css
@@ -0,0 +1 @@
+.key-body{position:absolute!important;bottom:-2px!important;width:100%;background:#fff}.key-body>h5{font-weight:400;font-size:.32rem;text-align:center;line-height:2.6;position:relative}.key-body>h5:after{content:"";position:absolute;bottom:0;left:0;transform-origin:0 bottom;-webkit-transform-origin:0 bottom}.key-body>h5>i{background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAcCAYAAAB75n/uAAAAAXNSR0IArs4c6QAAA5ZJREFUSA3Vll+I1FUUx79n3FZ02xAiNnrpD2RJPvTQi7jJktUi7dOCPaQ9qKAuipDKzmwqqCDOtGHsqpFBZGQEBpkIgSj+w8R/qCAGgSKKIWrrYpatZXv7nN/M7zczzm/MRXzwDOd3zz33e/7ce8+9d0z3S/nwHtBeBf2kJi3QIrt2P6b2v6CPwmT9q5Xg3kywpuvIBTXrUy2wPxJ9ipAeYFMYqxt6Q8NaQsZtJbtBmVYhT0PXHuk8kKkf3qJuO1fCVTWmj8Oz+kevAWrC8AVG2+BJcCPsNKiM+gjWrx4bjDSF8BbY5fCUqF/8XMDHbsST8DXkAXVrrykfLgN8ugLo4h34GLwN558pazddWUP50IquC/uptC014xnNNq0NIRrwaUqX4EMaq/1s4u81BvUUIRg7MpGspxLsZWBTaCfQX9aQ2OTs/UQeqWDmSZ4usViVNcgT3E3GPw+THpEA/eEJ+T6k0IPPoBBm6JauKs+hS6EHC1AIi6iWr+HR7OaZFP91Njkf2uWH6V60Nqzm8PVFEOPEZ21DGrzeDLaQ1U6CzKkxCiFDGfpyrIDvUOuzlLN1NbiSol6A1QQwMvwcZzMT462hkQP1LWNd6IZAdJL5V8l4iuABhiL9ujAmGc/ZeuQc7OObOe3T1RuadE47cP4ujm/A7WS+I7GpFmJfQ+7gbDT2t8ZXYXqsgPuVOByFs2+4so8w/jZ8BX0bzg9U4Ss7QS9FXdNZD+C3n3DSEbWVn6ytQp8nyGPwK8jnqZdWruZTlbAquRCawb0OB36nMuT3RQQYZl19je+mnPWQ8YcYbMP5ZC224ozvxpX7c3DcTHc3s7xYPH35cBLlqyjXcOcvL2NHKBXCM/g5A48j8XeY6Y++RL488/gOw1mqptVVI6atYRQevoycm7535+6jGCBrR5F7Yb++t/PK+Z0+MjrPw+RFYFwbo7UwNi5fUH6ACvqODDoZ9ErpoMaPx8C67d7QQH1twm42mFuUQ5uWmr+GERVn4KLZMK/wTDLYSa8Fg32pJzkyK338PT+iXZFz05/YdlY6d1R5BrGhZ3RYG+nOjVSmPTjwzd8TQ9QfntJfms+ad6N7HL7Mpnaw7icSTEmoDRAj/PT6X5LyH4Jf6f/M8JPoJtIWS9rf8gZ9QOa/xaaVbf0AjvokjNNtMhVVFvScq0rkl9wPyH3U+sFYmdbeO0Bs4a9VXs/j9EV4APUvdf/KxDal9j80TQVYym/UxwAAAABJRU5ErkJggg==) no-repeat bottom/75%;position:relative;top:.08rem;margin-right:.08rem;display:inline-block;height:.56rem;width:.48rem}.key-body:before{transform-origin:0 0;-webkit-transform-origin:0 0}.key-body:before,.key-body>h5:after{width:100%;height:1px;-webkit-transform:scaleY(.5);transform:scaleY(.5);background:#ccc}.key-body ul.col li{position:relative;line-height:1;height:.58666667rem;line-height:.58666667rem;font-size:.48rem;box-sizing:content-box;-webkit-box-sizing:content-box}.key-body ul.col li.key-hide{text-indent:-999rem;background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAABYCAYAAAA9U/+JAAAABGdBTUEAALGPC/xhBQAAA0VJREFUeAHtmr+uEkEUxl00UBE7ChNbXmAvwc74CMb4ABaWFr6LfxILK9v7EJpAJMATWJKYGws7GyTgWeMkZJJzmYEpnHN+JGSZ2Zlhvu/7MSzDNm3bHu7wcOtAz61yhP91AACcgwAAAODcAefyWQGcA3BP079erxvtHPX1OaD92mMFqC/LojMGgKJ21jcYANSXWdEZA0BRO+sbDADqy6zojAGgqJ31DQYA9WVWdMYAUNTO+gYDgPoyKzpjdSfw1LtoO0txv1M7ioxz+45rKX/iXEKZFSA44fQIAE6DD7IBIDjh9AgAToMPsgEgOOH0CABOgw+yASA44fQIAE6DD7IBIDjh9NhoO02ndvCc+lWtbC1nVoBqIy0zcQAo42O1owBAtdGVmTgAlPGx2lEAoNroykz87PsBUt9eu/qM+5/61cE4t983EPuZWmYFSHXKaDsAMBpsqiwASHXKaDsAMBpsqiwASHXKaDsAMBpsqiwASHXKaDsAMBpsqiwASHXKaDvuBzAabCxL20llBYidclYGAGeBx3IBIHbEWRkAnAUeywWA2BFn5WL3A2hXmbGf2v/+qf3j8WotX+qD1j/XD1aAXMeMtQcAY4HmygGAXMeMtQcAY4HmygGAXMeMtQcAY4HmygGAXMeMtQcAY4HmygGAXMeMted+AGOBanK0nVZWAM0xJ/UA4CRoTSYAaM44qQcAJ0FrMgFAc8ZJPQA4CVqTCQCaM07qAcBJ0JpMANCccVKv7gQ60e9eJiuAcwQAAACcO+BcPisAADh3APk4gAM4gAM4gAM4gAM4gAM44MqBxqrayWTycr/fvxF9/Qs1bnu93qvlcvnhwnH+y+5mAejcnk6nj3a73bW8fHCO+03T3MjzmYQ/P6d/DX1M7wQuFouv8ultJcTZGWEsBoNBazn8zhPTAHQCJcCbw+HwRF6+68opDwHm42g0ejybzb6ntK+5jemvgDgYuS54IdcF76V+EJ/7V/4t4b9erVZvlfPmql0B0KUnEExkRbiW58MozR/ydfFcVowvUb3povmvgDg9CXjZ7/ev5JP++ejcWsK/8hZ+p//ukQluXm42m1/j8fjTdru9LyB8Gw6HT+fz+U83BhwJ/QNgkKAUUqQmEQAAAABJRU5ErkJggg==) no-repeat 50%/33%}.key-body ul.col li.key-back{text-indent:-999rem;background-repeat:no-repeat;background-size:36%;background-position:50%;background-color:#fff;margin-bottom:4%}.key-body ul.col li.key-ent{background:#49a6ff;color:#fff}.key-body ul.col li.key-ent:active{background:rgba(73,166,255,.7)}.key-body ul.col li.key-dis{text-indent:-999rem;background:#d8d8d8}.key-body ul.col li:active{background-color:#d8d8d8}.key-body [class*=line_]>li.key-back,.key-body ul.col li.key-back{background-image:url(https://p1.yqbimg.net/h5/v/manager/static/key-back-24aa37.png)}.key-body.keyAll ul.number{width:100%}.key-body.keyAll ul.number li:nth-of-type(3n):before{border-right:none}.key-body ul.number{width:75%}.key-body ul.number li{padding:.46666667rem 0;position:relative}.key-body ul.number li.key-back{background-size:24%}.key-body ul.number li:before{position:absolute;top:0;left:0;content:"";box-sizing:border-box;pointer-events:none;border:0;transform-origin:0 0;-webkit-transform-origin:0 0;width:200%;height:200%;transform:scale(.5);-webkit-transform:scale(.5);z-index:99;border-bottom-width:1px;border-bottom-style:solid;border-right-width:1px;border-right-style:solid;border-color:#d8d8d8;border-radius:0}.key-body .num-other{width:25%}.key-body .num-other li{padding:1.17333333rem 0;position:relative;border-radius:5px}.key-body .num-other li:before{position:absolute;top:0;left:0;content:"";box-sizing:border-box;pointer-events:none;border:0;transform-origin:0 0;-webkit-transform-origin:0 0;width:200%;height:200%;transform:scale(.5);-webkit-transform:scale(.5);z-index:99;border-bottom-width:1px;border-bottom-style:solid;border-color:#d8d8d8;border-radius:0}.key-body .num-other li:last-of-type:before{content:none}.key-body.complex{bottom:-1px!important}.key-body [class*=line_]{display:flex;display:-webkit-flex;background:#d7dadf}.key-body [class*=line_]>li{flex:1;-webkit-flex:1;text-align:center;color:#333;background-color:#fff;border-radius:.05333333rem;line-height:1.06666667rem;margin:.10666667rem .08rem;font-size:.4rem;transition:transform .1s linear;-webkit-transition:transform .1s linear;-webkit-box-shadow:0 1px 0 rgba(0,0,0,.4);box-shadow:0 1px 0 rgba(0,0,0,.4)}.key-body [class*=line_]>li[class*=key-]{background-color:#b7bdc6;background-repeat:no-repeat;background-size:46%;background-position:50%}.key-body [class*=line_]>li:active{transform:scale(.9);-webkit-transform:scale(.9)}.key-body .line_1{padding:0 .4rem}.key-body .line_2>li.key-back,.key-body .line_2>li.key-switch{padding:0 .2rem;text-indent:-999rem}.key-body .line_3>li.space{padding:0 1.25333333rem}.key-body.letter .line_2>li.key-switch{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAC0AAAAnCAYAAACbgcH8AAAAAXNSR0IArs4c6QAAAq9JREFUWAntmU1oE0EUx7MfmqZsRLyIaeilWEqhgiSQIAhppfUixWsvFjx59uI1B8/ePRSEKu3Fg+bWQ4kICaTZ+lUq4s1CkJ5aoiIxyfqfkJRtOtmdmX1JS8nAMJv35v3fr68LeY9oIcKVyWSsarX6VNO0RcdxLkO6ZBjGk1Kp9IkwTUijEkulUvF6vb4Jvetdmv/wRyyXy+W1LrvyR1050hXYBs7DxIBt7BuRSOQKYJ/h+QL2ajKZXMJJsoygKi7gCUBuRaPR+WKx+APrb6VS2YjH43hTnDn47sdise+w7QTNGQi6G9iyrIV8Pn/ghgLkO2pwZWgR4A48NbgStAxwP8CloVWAqcGloIMAU4ILQ1MAU4ELQVMCU4D7QvcDOCi4J3Q/gYOA94QeBLAqOBd6kMAq4CegTwNYFvwY9GkCy4AfQZ8FYFHwFvRZAhYBNwB8FRPHe1xu9cO89rIjNOiT0x3uwrarJRKJHGDuYTvYK9jH+mF8bi008b/wsI6x6VvbRHJgolmE9q1ms3n0qnKE2dQzhntVzJzTDPorDFOcizzTYTgcniwUCvs8p6wNuZcR80IizgF42tR1fRZBd7CveQWjEg/gn6nVammcb73uivoAcBejWAjnKvZnrzjk/w3W8haWif0Tl195BTAf/o1pJJjBIxtUqdbFttAbcLwWFSWZxkWTUd0bQlNV0k9nWGm/ClH5h5WmqqSfzrDSfhWi8p/vSuMrnHV5IZwWVcU6WugpWtqiujKV3maiaGwe4meKEdEEve6hj5+G7zbzQ/Njr3s8u/DPF0hyCcPCF4iMI8keqmTjbPBE/WztCjPgUWg8R4/+yC/G7ReGZkGsOo1G4yWS3nSLqD4zYGg9tm37j4yGFDQTzmazei6Xm8TjFJJ6TRs9Odg7bJrmB9Vh4j8yoAdMWBoGjQAAAABJRU5ErkJggg==)}.key-body.upper-letter .line_2>li.key-switch{background-color:#fff;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAC0AAAAnCAYAAACbgcH8AAAAAXNSR0IArs4c6QAAAhVJREFUWAnt1z1Lw0AcBvAml7GDmxjcqiKCUwtdK06CiLg4OPgdXFw7+CXcBAdBcMouglBoDKmCdnFzKOhodLJpfBKMxDRJ761pkARKmnt57pc/geSUisSj1WpVHcc5URRlx/O8OUSbhJBj0zQfJC5TUWSFNZvNxeFweI285VjmF27i0LKsi1g79yXhnhmZ+AO+QdNSpDn8S4De1XX9eTAYPIaNImdhdARcy4CoMuFCaEpweC/S4NxoRrBUOBeaEywNzowWBEuBM6ElgYXh1GjJYCE4FXpKYG74RPSUwVzwTHROYGZ4KjpnMBM8ET0jMDV8DD1jMBX8D7og4InwX3TBwJnwAF1QcCqcADyPHcctRtTCUQU8h5+1fWwk+kq9XjeA3C4gdIyEjYSDPeeaip6kLdLYBL8Bm1UvsSOnRixfdV1X11RV3cCam/gtpK2NOyQYfIDzetoYkXbknsPxBJSbljMajT4xxrrDQb0bbzQaVwjdSwsVaUfuvm3bl7QZ/uNBe0zt0UAFUyuchGNBJ82fSVuJzqvsZaXLSmdUoHw8Moojtet/Vxqv2g+p5YqE4Y3IlM1SaTuyjpS/KETwaYAPpnuWQGq0pmlnCH5hCc8a64OB9Y/Tbrf7mjU23keNRvA74FtYpBcP4bkOuADDfsQ6n/rTNAxut9uqYRgruF7FwsEeM+yjPfvPMArQ63Q6b7RzouO+AcVTE2t9YiJRAAAAAElFTkSuQmCC)}.key-body.symbol .line_1{padding:0}.key-body.symbol .line_2>li.key-switch{text-indent:0}.key-body .pwd-head{line-height:1.17333333rem;text-align:center;font-size:.42666667rem;color:#333;position:relative}.key-body .pwd-head>em{position:absolute;width:1.17333333rem;text-align:center;left:0}.key-body .pwd-group+h5{position:relative}.key-body .pwd-group+h5:before{position:absolute;top:0;left:0;content:"";box-sizing:border-box;pointer-events:none;border:0;transform-origin:0 0;-webkit-transform-origin:0 0;width:200%;height:200%;transform:scale(.5);-webkit-transform:scale(.5);z-index:99;border-top-width:1px;border-top-style:solid;border-color:#ccc;border-radius:0}[class*=-container]{visibility:hidden;opacity:0;position:fixed}[class*=-container].active{visibility:visible;opacity:1}.backdrop-container,.block-container{left:0;top:0;right:0;bottom:0;z-index:9990;background-color:rgba(0,0,0,.5);-webkit-transition:opacity .3s;transition:opacity .3s}.block-container{background-color:transparent}.backdrop-container{background-color:rgba(0,0,0,.2)}.drop-open{overflow:hidden}.model-container{left:0;top:0;right:0;bottom:0;z-index:9992;-webkit-transform:translate3d(0,100%,0) translateZ(0);transform:translate3d(0,100%,0) translateZ(0);transition:all .5s cubic-bezier(.42,-.05,.29,.91);-webkit-transition:all .5s cubic-bezier(.42,-.05,.29,.91)}.model-container>*{position:absolute;left:0;right:0;background:#fff;bottom:0}.model-container.lf{-webkit-transform:translate3d(-100%,0,0) translateZ(0);transform:translate3d(-100%,0,0) translateZ(0)}.model-container.lf>*{left:0;right:auto!important}.model-container.lr{-webkit-transform:translate3d(100%,0,0) translateZ(0);transform:translate3d(100%,0,0) translateZ(0)}.model-container.lr>*{right:0;left:auto!important}.model-container.tp{-webkit-transform:translate3d(0,-100%,0) translateZ(0);transform:translate3d(0,-100%,0) translateZ(0)}.model-container.tp>*{top:0;bottom:auto!important}.model-container.active{-webkit-transform:translateZ(0) translateZ(0);transform:translateZ(0) translateZ(0)}.model-container .action-sheet{background:transparent}.model-container .action-sheet .item-view{text-align:center;margin:.32rem .48rem;box-shadow:none;background:transparent}.model-container .action-sheet .item-view:after,.model-container .action-sheet .item-view:before{content:none}.model-container .action-sheet .item-view .item-list{background:#fff;letter-spacing:.1rem;color:#3d98cc}.model-container .action-sheet .item-view .item-list:active{opacity:.8}.model-container .action-sheet .item-view .item-list:first-of-type{border-radius:.05333333rem .05333333rem 0 0}.model-container .action-sheet .item-view .item-list:last-of-type{border-radius:0 0 .05333333rem .05333333rem}.model-container .action-sheet .item-view .item-list:last-of-type:before{content:none}.model-container .action-sheet .item-view .item-list:first-of-type:last-of-type{border-radius:.05333333rem}.model-container .action-sheet .item-view .item-list:after,.model-container .action-sheet .item-view .item-list:before{left:0}.model-container .action-sheet .item-view .item-list.cancel{color:#ff8568}[class*=spinner-]{fill:#666;stroke:#666}.spinner svg{width:1rem;height:1rem}.fade-enter-active,.fade-leave-active{transition:opacity .3s}.fade-enter,.fade-leave-to{opacity:0}.loading-container{visibility:visible;opacity:.7;font-size:.37333333rem;padding:.26666667rem;border-radius:.05333333rem;z-index:9994;background-color:rgba(0,0,0,.6);text-align:center;color:#fff;text-overflow:ellipsis}.loading-container [class*=spinner-]{fill:#fff;stroke:#fff}.loading-container .spinner-circular{animation:loading-rotate 1.8s linear infinite}.loading-container .path{animation:loading-dash 1.5s ease-in-out infinite;stroke-dasharray:90,150;stroke-dashoffset:0;stroke-width:2.2;stroke:hsla(0,0%,100%,.9);stroke-linecap:round}.loading-container p{padding:0 .16rem}.loading-container p>.icon-font{font-size:.41rem;margin-right:.16rem}.loading-container p.loading-txt{font-size:.34666667rem}.loading-container,.popup-container{left:50%;top:50%;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%)}.popup-container{z-index:9993;-webkit-transition:all .3s ease-out;transition:all .3s ease-out}.popup-container.top{top:30%;z-index:9991}.popup-container.bottom{top:70%;z-index:9991}.popup-container .popup{border-radius:.05333333rem;width:7.33333333rem;font-size:.4rem;-webkit-box-shadow:0 0 2px rgba(0,0,0,.2);box-shadow:0 0 2px rgba(0,0,0,.2);text-align:center;background-color:#fff}.popup-container .popup .popup-head{padding:.4rem .26666667rem .2rem}.popup-container .popup .popup-head .popup-title{font-size:1.1em;font-weight:400}.popup-container .popup .popup-head .popup-sub-title{margin-top:.13333333rem;font-size:.26666667rem;font-weight:400}.popup-container .popup .popup-head~.popup-body{padding:.32rem .32rem .64rem}.popup-container .popup .popup-body{padding:.64rem .32rem;font-size:.95em;overflow-y:auto;overflow-x:hidden}.popup-container .popup .popup-btns{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-direction:normal;-webkit-box-orient:horizontal;-webkit-flex-direction:row;flex-direction:row}.popup-container .popup .popup-btns:before{width:100%;height:1px;-webkit-transform:scaleY(.5);transform:scaleY(.5)}.popup-container .popup .popup-btns .btn:after,.popup-container .popup .popup-btns:before{background:#d8d8d8;content:"";position:absolute}.popup-container .popup .popup-btns .btn{padding:.26666667rem 0;-webkit-box-flex:1;-webkit-flex:1;flex:1;display:block;background:inherit}.popup-container .popup .popup-btns .btn:after{right:0;top:0;height:100%;width:1px;-webkit-transform:scaleX(.5);transform:scaleX(.5)}.popup-container .popup .popup-btns .btn:last-of-type:after{content:none}.popup-body .made-body{margin:-.56rem -.32rem -.53333333rem;color:#333}.popup-body .made-body .made-title{font-size:.42666667rem;padding:.26666667rem;position:relative}.popup-body .made-body .made-title em{position:absolute;line-height:.58666667rem;left:.26666667rem;color:#999;font-size:.72rem}.btn{padding:0 .4rem;background-color:#f8f8f8;color:#444;position:relative;display:inline-block;border:none;text-align:center;text-overflow:ellipsis}.btn.btn-positive{color:#3d98cc;font-weight:700}.btn.btn-default{color:#333}@keyframes loading-rotate{to{transform:rotate(1turn)}}@keyframes loading-dash{0%{stroke-dasharray:1,200;stroke-dashoffset:0}50%{stroke-dasharray:90,150;stroke-dashoffset:-40px}to{stroke-dasharray:90,150;stroke-dashoffset:-120px}}.share-box .share-banner{position:absolute;pointer-events:none;left:0;right:0;height:2.66666667rem;top:-1.33333333rem;background:url(https://p1.yqbimg.net/h5/v/manager/static/share-banner-2d1f3b.png) no-repeat 50%;background-size:contain}.share-box .share-text{padding:1.73333333rem .4rem .4rem;color:#333;font-size:.42666667rem}.share-box .share-icon:after,.share-box .share-icon:before{width:100%;height:1px;background:#d8d8d8;-webkit-transform:scaleY(.5);transform:scaleY(.5)}.share-box .share-icon li{padding:1.73333333rem .26666667rem .4rem;font-size:.34666667rem;color:#666}.share-box .share-icon li.icon-friends{background:url(https://p1.yqbimg.net/h5/v/manager/static/share-friends-3d0877.png) no-repeat}.share-box .share-icon li.icon-weChat{background:url(https://p1.yqbimg.net/h5/v/manager/static/share-wechat-4a09be.png) no-repeat}.share-box .share-icon li.icon-weiBo{background:url(https://p1.yqbimg.net/h5/v/manager/static/share-weibo-c2739d.png) no-repeat}.share-box .share-icon li.icon-qZone{background:url(https://p1.yqbimg.net/h5/v/manager/static/share-qzone-0dbd4d.png) no-repeat}.share-box .share-icon li[class*=icon-]{background-position:center .4rem!important;background-size:44%!important}.input-group{position:relative;margin-bottom:.4rem}.input-group:before{position:absolute;top:0;left:0;content:"";box-sizing:border-box;pointer-events:none;border:0;transform-origin:0 0;-webkit-transform-origin:0 0;width:200%;height:200%;transform:scale(.5);-webkit-transform:scale(.5);z-index:99;border-top-width:1px;border-top-style:solid;border-color:#d8d8d8;border-radius:0}.input-group .form-input:before{left:.4rem}.input-group .form-input:last-of-type:before{left:0}.form-input{position:relative}.form-input:before{top:0;content:"";box-sizing:border-box;border:0;transform-origin:0 0;-webkit-transform-origin:0 0;width:200%;height:200%;transform:scale(.5);-webkit-transform:scale(.5);z-index:99;border-bottom-width:1px;border-bottom-style:solid;border-color:#d8d8d8;border-radius:0}.form-input:before,.form-input label{position:absolute;left:0;pointer-events:none}.form-input label{color:#999;-webkit-transition:all .3s;transition:all .3s;padding:0 .4rem;top:.24rem;max-width:2.53333333rem;font-size:.34666667rem;line-height:.8rem}.form-input label+input{padding-left:2.66666667rem}.form-input .r_btn,.form-input label{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.form-input input{border:none;font-size:.4rem;line-height:.8rem;padding:.2rem .93333333rem .2rem .4rem}.form-input input::-webkit-input-placeholder{font-size:.34666667rem}.form-input .clear,.form-input .r_btn{position:absolute;z-index:9;color:#888;display:none}.form-input .clear:active,.form-input .r_btn:active{opacity:.7}.form-input .clear,.form-input .r_btn{top:.24rem;right:.33333333rem;height:.8rem;line-height:.8rem}.form-input .clear{width:.58666667rem;font-size:.42rem;text-align:center}.form-input.focus .clear{display:block}.form-input.focus .clear:before{content:"\E658"}.form-input.flt{padding-top:.64rem}.form-input.flt label{top:.64rem}.form-input.flt label+input{padding-left:.4rem}.form-input.flt input{padding:0 .93333333rem 0 .4rem}.form-input.flt input::-webkit-input-placeholder{opacity:0}.form-input.flt .clear,.form-input.flt .r_btn{top:.64rem}.form-input.flt.on label{font-size:.29333333rem;top:0}.form-input.flt .err-tip{margin-top:-.26666667rem}.form-input .err-tip{display:none;font-size:.29333333rem;padding:.13333333rem .8rem 0 .4rem;margin-top:-.46666667rem}.form-input.small input{padding-right:2.26666667rem}.form-input.small .clear{right:1.8rem}.form-input.small .r_btn{display:block;color:#4285f4;font-size:.32rem;max-width:1.46666667rem}.form-input.error:before{border-color:red;left:0}.form-input.error .err-tip{display:inline-block;color:red;text-align:left;pointer-events:none}.form-input input{display:block;width:100%}.vx-header{position:fixed;top:0;left:0;right:0;background-color:#fff;z-index:9999;box-shadow:0 0 1px #999;-webkit-box-shadow:0 0 1px #999;height:1.33333333rem;font-size:.4rem}.vx-header .head-left,.vx-header .head-right{position:absolute;top:0;color:#666;height:1.33333333rem}.vx-header .head-left>i,.vx-header .head-right>i{line-height:1.33333333rem;height:1.33333333rem;display:inline-block;padding:0 .26666667rem;font-style:normal}.vx-header .head-left>i.icon,.vx-header .head-right>i.icon{width:1.2rem;background-size:50%;background-position:50%;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACwAAAAsCAYAAAAehFoBAAAAAXNSR0IArs4c6QAAANpJREFUWAntlkEKAyEMRcdSegcv12tMV0V6lF7OO3RjDTQwSKDYZKAMbzaOUeP3EfEvCx8EIACBQxFIkacppVxqrY/W2lXyppSeOed7j7+i9jlHJZI8H7Gr5uzC1x6T7k1j3vbkTbBdr2S/xbbjs/+hgmc3/2V+qGCp2VGEFRvnzPRDa1gumNSsloZeuhlBzIUABCDgI4CXEP+gDPESnUTo06xk92xDBVu+wYp5DoSX8NBjLQQg8IcE8BJ4iaEsQ5/mIfcu3VDBlm+wYp6T4CU89FgLAQhAwE/gDThlfOfXJAPjAAAAAElFTkSuQmCC);background-repeat:no-repeat}.vx-header .head-left>i+i,.vx-header .head-right>i+i{padding-left:0}.vx-header .head-left>i:active,.vx-header .head-right>i:active{opacity:.5}.vx-header .head-left{left:0}.vx-header .head-right{right:0}.vx-header .head-title{line-height:1.33333333rem;font-size:.48rem;font-weight:400;text-overflow:ellipsis;overflow:hidden;white-space:nowrap;padding:0 2.13333333rem;text-align:center}.vx-header .head-title.close:after,.vx-header .head-title.open:after{font-family:iconfont;content:"\E661";-webkit-transform:scale(.85);transform:scale(.85);display:inline-block;-webkit-transition:transform .2s;transition:transform .2s}.vx-header .head-title.open:after{-webkit-transform:scale(.85) rotateX(180deg);transform:scale(.85) rotateX(180deg)}.vx-header+.static-wrapper{padding-top:1.32rem;overflow:hidden}.vx-header+.scroll-wrapper{top:1.32rem}html{-webkit-text-size-adjust:100%}*{-webkit-box-sizing:border-box;box-sizing:border-box;margin:0;padding:0;outline:0;-webkit-tap-highlight-color:rgba(0,0,0,0)}::-webkit-scrollbar{height:0;width:0;visibility:hidden}body{-webkit-overflow-scrolling:touch;font-family:Helvetica Neue,Helvetica,PingFang SC,Hiragino Sans GB,Microsoft YaHei,\\5FAE\8F6F\96C5\9ED1,Arial,sans-serif}body:before{position:fixed;top:0;left:0;width:0;height:.05333333rem;z-index:99999;content:"";opacity:0;-webkit-transition:width 2s cubic-bezier(.2,.8,.9,1);transition:width 2s cubic-bezier(.2,.8,.9,1);background-color:#0087ff}body.transition:before{width:85%;opacity:1}body.transition.on:before{width:100%;-webkit-transition:width .3s ease-in;transition:width .3s ease-in}li,ul{list-style:none}h1,h2,h3,h4,h5,h6{font-weight:400}.hidden{display:none}button,input,select{-webkit-appearance:none;appearance:none;border:none}input[type=number]::-webkit-inner-spin-button,input[type=search]::-webkit-search-cancel-button{-webkit-appearance:none;appearance:none}button{margin:.26666667rem auto;line-height:1.17333333rem;padding:0 .26666667rem;font-size:.42666667rem;border-radius:.08rem;display:block;width:88%;background:#49a6ff;color:#fff}button:active{opacity:.8}button:disabled{opacity:.4}button.default{background:#fff;color:#333}button>.icon-font{font-size:.42rem;margin-right:.16rem}.m-row:after,.m-row:before{display:table;content:""}.m-row:after{clear:both}.m-row>[class^=col]{position:relative;min-height:1px;float:left;text-align:center}.m-row .col-6{width:50%}.m-row .col-4{width:33.33333333%}.m-row .col-3{width:25%}@font-face{font-family:iconfont;src:url(https://p1.yqbimg.net/h5/v/manager/static/iconfont-9be535.woff) format("woff"),url(https://p1.yqbimg.net/h5/v/manager/static/iconfont-261629.ttf) format("truetype")}@font-face{font-family:iconfont-tools;src:url(https://p1.yqbimg.net/h5/v/manager/static/iconfont-tools-6930b2.woff) format("woff"),url(https://p1.yqbimg.net/h5/v/manager/static/iconfont-tools-57a593.ttf) format("truetype")}.icon-font,.icon-tools{font-size:.6rem;font-style:normal;-webkit-font-smoothing:antialiased;-webkit-text-stroke-width:.2px;-moz-osx-font-smoothing:grayscale}@keyframes rotating{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}@-webkit-keyframes rotating{0%{-webkit-transform:rotate(0deg)}to{-webkit-transform:rotate(1turn)}}.icon-font{font-family:iconfont!important}.icon-font.icon-appreciate:before{content:"\E644"}.icon-font.icon-check:before{content:"\E645"}.icon-font.icon-close:before{content:"\E646"}.icon-font.icon-edit:before{content:"\E649"}.icon-font.icon-emoji:before{content:"\E64A"}.icon-font.icon-favor-fill:before{content:"\E64B"}.icon-font.icon-favor:before{content:"\E64C"}.icon-font.icon-loading1:before,.icon-font.icon-loading:before{display:inline-block;-webkit-animation:rotating 1s linear infinite;animation:rotating 1s linear infinite}.icon-font.icon-loading:before{content:"\E64E"}.icon-font.icon-loading1:before{content:"\E609"}.icon-font.icon-location-fill:before{content:"\E650"}.icon-font.icon-location:before{content:"\E651"}.icon-font.icon-phone:before{content:"\E652"}.icon-font.icon-round-check-fill:before{content:"\E656"}.icon-font.icon-round-check:before{content:"\E657"}.icon-font.icon-round-close-fill:before{content:"\E658"}.icon-font.icon-round-close:before{content:"\E659"}.icon-font.icon-search:before{content:"\E65C"}.icon-font.icon-time-fill:before{content:"\E65E"}.icon-font.icon-time:before{content:"\E65F"}.icon-font.icon-unfold:before{content:"\E661"}.icon-font.icon-warn-fill:before{content:"\E662"}.icon-font.icon-warn:before{content:"\E663"}.icon-font.icon-camera-fill:before{content:"\E664"}.icon-font.icon-camera:before{content:"\E665"}.icon-font.icon-comment-fill:before{content:"\E666"}.icon-font.icon-comment:before{content:"\E667"}.icon-font.icon-like-fill:before{content:"\E668"}.icon-font.icon-like:before{content:"\E669"}.icon-font.icon-back:before{content:"\E679"}.icon-font.icon-cascades:before{content:"\E67C"}.icon-font.icon-list:before{content:"\E682"}.icon-font.icon-more:before{content:"\E684"}.icon-font.icon-scan:before{content:"\E689"}.icon-font.icon-question-fill:before{content:"\E690"}.icon-font.icon-question:before{content:"\E691"}.icon-font.icon-pic:before{content:"\E69B"}.icon-font.icon-filter:before{content:"\E69C"}.icon-font.icon-top:before{content:"\E69E"}.icon-font.icon-right:before{content:"\E6A3"}.icon-font.icon-refresh:before{content:"\E6A4"}.icon-font.icon-more-android:before{content:"\E6A5"}.icon-font.icon-delete-fill:before{content:"\E6A6"}.icon-font.icon-qr-code:before{content:"\E6B0"}.icon-font.icon-remind:before{content:"\E6B2"}.icon-font.icon-delete:before{content:"\E6B4"}.icon-font.icon-address-book:before{content:"\E6BD"}.icon-font.icon-present:before{content:"\E6D3"}.icon-font.icon-square-check-fill:before{content:"\E6D4"}.icon-font.icon-square:before{content:"\E6D5"}.icon-font.icon-square-check:before{content:"\E6D6"}.icon-font.icon-round:before{content:"\E6D7"}.icon-font.icon-round-add-fill:before{content:"\E6D8"}.icon-font.icon-round-add:before{content:"\E6D9"}.icon-font.icon-fold:before{content:"\E6DE"}.icon-font.icon-appreciate-fill:before{content:"\E6E3"}.icon-font.icon-info-fill:before{content:"\E6E4"}.icon-font.icon-info:before{content:"\E6E5"}.icon-font.icon-recharge-fill:before{content:"\E6EC"}.icon-font.icon-recharge:before{content:"\E6ED"}.icon-font.icon-vip-card:before{content:"\E6EE"}.icon-font.icon-wifi:before{content:"\E6F2"}.icon-font.icon-share:before{content:"\E6F3"}.icon-font.icon-barcode:before{content:"\E6FB"}.icon-font.icon-countdown-fill:before{content:"\E707"}.icon-font.icon-countdown:before{content:"\E708"}.icon-font.icon-notice-fill:before{content:"\E709"}.icon-font.icon-notice:before{content:"\E70A"}.icon-font.icon-qiang:before{content:"\E70B"}.icon-font.icon-female:before{content:"\E71A"}.icon-font.icon-male:before{content:"\E71C"}.icon-font.icon-camera-add:before{content:"\E724"}.icon-font.icon-camera-add-fill:before{content:"\E727"}.icon-font.icon-mark-fill:before{content:"\E730"}.icon-font.icon-mark:before{content:"\E731"}.icon-font.icon-post:before{content:"\E759"}.icon-font.icon-radio-box-fill:before{content:"\E763"}.icon-font.icon-add:before{content:"\E767"}.icon-font.icon-move:before{content:"\E768"}.icon-font.icon-emoji-fill:before{content:"\E78D"}.icon-font.icon-ask-fill:before{content:"\E7C9"}.icon-font.icon-ask:before{content:"\E7CA"}.icon-tools{font-family:iconfont-tools!important}.scroll-wrapper{position:absolute;z-index:2;top:0;bottom:0;left:0;width:100%;overflow:hidden}.scroll-wrapper>.scroll-body{position:absolute;z-index:1;min-width:100%;-webkit-transform:translateZ(0);transform:translateZ(0)}.scroll-wrapper>.scroll-body .top-pocket,.scroll-wrapper>.scroll-body>.bottom-pocket{position:absolute;left:0;right:0;z-index:999;text-align:center;color:#999;margin:0 auto;padding:.4rem;font-size:1.1em}.scroll-wrapper>.scroll-body>.top-pocket{top:0;-webkit-transform:translateY(-100%);transform:translateY(-100%)}.scroll-wrapper>.scroll-body>.bottom-pocket{bottom:0;-webkit-transform:translateY(100%);transform:translateY(100%)}.item-view{font-size:.42666667rem;background:#fff;position:relative}.item-view:before{position:absolute;top:0;left:0;content:"";box-sizing:border-box;pointer-events:none;border:0;transform-origin:0 0;-webkit-transform-origin:0 0;width:200%;height:200%;transform:scale(.5);-webkit-transform:scale(.5);z-index:99;border-top-width:1px;border-top-style:solid;border-color:#d8d8d8;border-radius:0}.item-view .item-list{position:relative;padding:.32rem .4rem}.item-view .item-list:before{position:absolute;top:0;left:0;content:"";box-sizing:border-box;pointer-events:none;border:0;transform-origin:0 0;-webkit-transform-origin:0 0;width:200%;height:200%;transform:scale(.5);-webkit-transform:scale(.5);z-index:99;border-bottom-width:1px;border-bottom-style:solid;border-color:#d8d8d8;border-radius:0;left:.4rem}.item-view .item-list:last-of-type:before{left:0}.el_radio[data-v-6135d417]{display:inline-block}.el_radio_label[data-v-6135d417]{position:relative;display:inline-block;vertical-align:top;width:16px;height:16px;border:1px solid #ccc;border-radius:50%;background-color:#fff;margin-right:1.28px;margin-right:.08rem}.el_radio_label.checked[data-v-6135d417]{position:relative}.el_radio_label.checked[data-v-6135d417]:before{content:"";position:absolute;top:50%;left:50%;width:8px;height:8px;border-radius:50%;background-color:#099fde;transform:translate(-50%,-50%)}.el_radio_slot[data-v-6135d417]{display:inline-block;vertical-align:top;font-size:5.12px;font-size:.32rem}.el_checkbox[data-v-b808b952]{display:inline-block}.el_checkbox_label[data-v-b808b952]{position:relative;display:inline-block;vertical-align:top;width:16px;height:16px;border:1px solid #ccc;border-radius:2px;background-color:#fff;margin-right:1.28px;margin-right:.08rem}.el_checkbox_label.checked[data-v-b808b952]{position:relative;border-color:#099fde;background-color:#099fde}.el_checkbox_label.checked[data-v-b808b952]:before{content:"";position:absolute;top:50%;left:50%;width:8px;height:4px;border:2px solid #fff;border-width:0 0 2px 2px;transform:translate(-50%,-50%) rotate(-45deg);transform-origin:35% 40%}.el_checkbox_slot[data-v-b808b952]{display:inline-block;vertical-align:top;font-size:5.12px;font-size:.32rem}
diff --git a/pluss-wap-page/src/main/resources/static/resources/css/h5.css b/pluss-wap-page/src/main/resources/static/resources/css/h5.css
new file mode 100644
index 0000000..cc3f701
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/css/h5.css
@@ -0,0 +1,2 @@
+.mint-popup-bottom{-webkit-transform:translate3d(-50%,0,0)!important}.mint-indicator-wrapper{-webkit-transform:translate(-50%,-50%);z-index:999}#app,body,html{font-size:.37333333rem;height:100%;color:#333;-webkit-user-select:none;-moz-user-select:none;-o-user-select:none;user-select:none}body,html,input,textarea{font-family:PingFangSC-Regular,Helvetica,sans-serif}input,textarea{background-color:#fff}input,li,ol,textarea,ul{padding:0;border:0;margin:0}.tc{text-align:center}.tr{text-align:right}.tl{text-align:left}.c4b{color:#4b4b4b}.c000{color:#000}.c333{color:#333}.c666{color:#666}.c999{color:#999}.cccc{color:#ccc}.cddd{color:#ddd}.c9b9b{color:#9b9b9b}.cblue{color:#3089f7}.cred{color:red}.cora{color:#faa800}.cbase{color:#ff721f}.cfff{color:#fff}.bfff{background-color:#fff}.bbase{background-color:#ff721f}.fl{float:left}.fr{float:right}.mt10{margin-top:.26666667rem}.ml15{margin-left:.4rem}.mr15{margin-right:.4rem}.mt15{margin-top:.4rem}.mb15{margin-bottom:.4rem}.pl15{padding-left:.4rem}.pr15{padding-right:.4rem}.pt15{padding-top:.4rem}.pb15{padding-bottom:.4rem}.mt30{margin-top:.8rem}.mb30{margin-bottom:.8rem}.fz12{font-size:.32rem}.fz13{font-size:.34666667rem}.fz14{font-size:.37333333rem}.fz15{font-size:.4rem}.fz16{font-size:.42666667rem}.fz18{font-size:.48rem}.fz20{font-size:.53333333rem}.fz22{font-size:.58666667rem}.fz24{font-size:.64rem}.fz32{font-size:.85333333rem}.fz36{font-size:.96rem}.block{display:block}b,dfn,em{font-style:normal;font-weight:400}.font-DINAlternate{font-family:DINAlternate-Bold,PingFangSC-Regular,Helvetica,sans-serif}.arr_r{position:relative}.arr_r:after{content:"";position:absolute;z-index:80;right:.4rem;top:50%;width:6px;height:6px;border:1px solid #c7c7cc;border-width:2px 2px 0 0;-webkit-transform:translateY(-50%) rotate(45deg);transform:translateY(-50%) rotate(45deg)}.shadow{box-shadow:0 8px 25px 0 #eaebec}.ellips{white-space:nowrap;overflow:hidden;text-overflow:ellipsis}.ellips_line2,.ellips_line3{display:-webkit-box;-webkit-box-orient:vertical;overflow:hidden}.ellips_line2{-webkit-line-clamp:2}.ellips_line3{-webkit-line-clamp:3}.to-check{position:relative}.to-check.checked:before{content:"";position:absolute;top:50%;right:.4rem;width:.4rem;height:.2rem;border:2px solid #ff721f;border-width:0 0 2px 2px;-webkit-transform:translateY(-50%) rotate(-45deg);transform:translateY(-50%) rotate(-45deg)}.ui-page{position:relative;max-width:16rem;min-height:100%;padding-top:1px;margin:-1px auto 0}.ui-page,.ui-page:after{background-color:#f7f7f7}.ui-page:after{content:"";position:fixed;top:0;bottom:0;left:0;right:0;z-index:-1}button{font-size:.4rem;border-radius:1px;background-color:#ff721f}button.disabled{opacity:.4}.mebtn{width:100%;padding:0 .4rem}input::-webkit-input-placeholder{color:#ccc}:-moz-placeholder,::-moz-placeholder{color:#ccc}:-ms-input-placeholder{color:#ccc}[class*=mint-tab-container]{visibility:visible;position:static;opacity:1}.loading-txt{width:4.8rem}.loading-txt em{display:block;margin:.26666667rem auto}.loading-txt .txt{margin-bottom:.16rem}.v-input-clear{position:absolute;right:-.26666667rem;top:50%;display:none;z-index:9;padding:.26666667rem;background-color:#fff;-webkit-transform:translateY(-50%);transform:translateY(-50%)}.v-input-clear.active{display:block}.v-input-clear .icon-font{display:block;color:#ccc;font-size:.48rem}.popup-container .popup-title{font-weight:700}.popup-container .popup-btns .btn{color:#ff721f}.flex{display:-webkit-flex;display:-ms-flexbox;display:flex}.flex .flex-li,.flex li{-webkit-flex:1;-ms-flex:1;flex:1}.i-warn-red{display:inline-block;width:20px;height:20px;background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAAAXNSR0IArs4c6QAAAkNJREFUSA29Vj1PVEEUvWdYA72dFkJCQkGhkJjQECpqTbQyWuhPcMFYUFjYyUfCbyDSYEJvZWhIiDEWmlCxFkBla8Tdfdcz897O7L7F2XkE3yS7e+fOOffMx92ZC0lo+vLOnAAPRWVRILdF9ZajAWf0ndJ3QN8+Nn98GRUOMYA2px6L6FsGm4nh/BhwLII1bJzseV/JuFRQV2amJLt4T7GFEj6xi0Mx40+wfnxSJgwJ6urkkmT6gVt1swyu1If8FINHeNf61M8bEHRiXfnIld3oB13dRlvGZLlf1Au6bdTfR6NXxiCQHU6CXH1KfCM6IbtSTNzvba/xYHtmKdto5BU2Wi/4eU7ua8//l2FjunzIAU6wyMa0BDH61cfGWLC98zJDF3IN6W0HUz+1dbCib2aP5FcH0rloptLc30tkD7o6PS/d9ud0okXyHF2rnFzzRrLOg5xc4RvyjejvFRg5lLeVYaIsViICW0yYOWy27nGl25W41DLubqzEMrse3pBge2fE4D3MFRYXcQQ3MNTQP76vjWB7Z8SgVvgfRnDXNgQot5RPTH3t3CbNaW161LJJc1CbILVs0uzXJkgt48oC91L/Z1lqWK0iS7GWLNfOQmajzx4ZINdw5LwGYVmQ0gzCzdTNgh3l4rBX54THkzWIpDzAmaxrc/Iu49sH+FlUxw66B5ixi+ZffNuvo8QI50FBV3uwBnGzKmZ05R+7slI9Y2MNCFqHE2UNQivtTC1pqJFr65hSxWZhA1ta5tVWCA8JX2Op/xc+6NDNayMwOQAAAABJRU5ErkJggg==) no-repeat;background-size:20px 20px}.i-checked,.i-unchecked{position:relative;display:inline-block;width:16px;height:16px;background:url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+Cjxzdmcgd2lkdGg9IjMycHgiIGhlaWdodD0iMzJweCIgdmlld0JveD0iMCAwIDMyIDMyIiB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPgogICAgPCEtLSBHZW5lcmF0b3I6IFNrZXRjaCA1MC4yICg1NTA0NykgLSBodHRwOi8vd3d3LmJvaGVtaWFuY29kaW5nLmNvbS9za2V0Y2ggLS0+CiAgICA8dGl0bGU+5Y2P6K6u5Yu+L+WLvjwvdGl0bGU+CiAgICA8ZGVzYz5DcmVhdGVkIHdpdGggU2tldGNoLjwvZGVzYz4KICAgIDxkZWZzPjwvZGVmcz4KICAgIDxnIGlkPSLljY/orq7li74v5Yu+IiBzdHJva2U9Im5vbmUiIHN0cm9rZS13aWR0aD0iMSIgZmlsbD0ibm9uZSIgZmlsbC1ydWxlPSJldmVub2RkIj4KICAgICAgICA8cGF0aCBkPSJNMjguNDQ0NDQ0NCwwIEwzLjU1NTU1NTU2LDAgQzEuNiwwIDAsMS42IDAsMy41NTU1NTU1NiBMMCwyOC40NDQ0NDQ0IEMwLDMwLjQgMS42LDMyIDMuNTU1NTU1NTYsMzIgTDI4LjQ0NDQ0NDQsMzIgQzMwLjQsMzIgMzIsMzAuNCAzMiwyOC40NDQ0NDQ0IEwzMiwzLjU1NTU1NTU2IEMzMiwxLjYgMzAuNCwwIDI4LjQ0NDQ0NDQsMCBMMjguNDQ0NDQ0NCwwIFogTTEyLjQ0NDQ0NDQsMjQuODg4ODg4OSBMMy41NTU1NTU1NiwxNi4zNDE4ODAzIEw2LjA0NDQ0NDQ0LDEzLjk0ODcxNzkgTDEyLjQ0NDQ0NDQsMjAuMTAyNTY0MSBMMjUuOTU1NTU1Niw3LjExMTExMTExIEwyOC40NDQ0NDQ0LDkuNTA0MjczNSBMMTIuNDQ0NDQ0NCwyNC44ODg4ODg5IEwxMi40NDQ0NDQ0LDI0Ljg4ODg4ODkgWiIgaWQ9IuWLvuS4iiIgZmlsbD0iI0ZGNzIxRiI+PC9wYXRoPgogICAgPC9nPgo8L3N2Zz4=) no-repeat;background-size:16px auto}.i-unchecked{background-image:url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+Cjxzdmcgd2lkdGg9IjMycHgiIGhlaWdodD0iMzJweCIgdmlld0JveD0iMCAwIDMyIDMyIiB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPgogICAgPCEtLSBHZW5lcmF0b3I6IFNrZXRjaCA1MC4yICg1NTA0NykgLSBodHRwOi8vd3d3LmJvaGVtaWFuY29kaW5nLmNvbS9za2V0Y2ggLS0+CiAgICA8dGl0bGU+5Y2P6K6u5Yu+L+acquWLvjwvdGl0bGU+CiAgICA8ZGVzYz5DcmVhdGVkIHdpdGggU2tldGNoLjwvZGVzYz4KICAgIDxkZWZzPjwvZGVmcz4KICAgIDxnIGlkPSLljY/orq7li74v5pyq5Yu+IiBzdHJva2U9Im5vbmUiIHN0cm9rZS13aWR0aD0iMSIgZmlsbD0ibm9uZSIgZmlsbC1ydWxlPSJldmVub2RkIiBmaWxsLW9wYWNpdHk9IjAuMyI+CiAgICAgICAgPHBhdGggZD0iTTI4LjQ0NDQ0NDQsMCBMMy41NTU1NTU1NiwwIEMxLjYsMCAwLDEuNiAwLDMuNTU1NTU1NTYgTDAsMjguNDQ0NDQ0NCBDMCwzMC40IDEuNiwzMiAzLjU1NTU1NTU2LDMyIEwyOC40NDQ0NDQ0LDMyIEMzMC40LDMyIDMyLDMwLjQgMzIsMjguNDQ0NDQ0NCBMMzIsMy41NTU1NTU1NiBDMzIsMS42IDMwLjQsMCAyOC40NDQ0NDQ0LDAgTDI4LjQ0NDQ0NDQsMCBaIE0xMi40NDQ0NDQ0LDI0Ljg4ODg4ODkgTDMuNTU1NTU1NTYsMTYuMzQxODgwMyBMNi4wNDQ0NDQ0NCwxMy45NDg3MTc5IEwxMi40NDQ0NDQ0LDIwLjEwMjU2NDEgTDI1Ljk1NTU1NTYsNy4xMTExMTExMSBMMjguNDQ0NDQ0NCw5LjUwNDI3MzUgTDEyLjQ0NDQ0NDQsMjQuODg4ODg4OSBMMTIuNDQ0NDQ0NCwyNC44ODg4ODg5IFoiIGlkPSLmsqHli77kuIoiIGZpbGw9IiNGRjcyMUYiPjwvcGF0aD4KICAgIDwvZz4KPC9zdmc+)}.model-container .key-body{padding-bottom:.09333333rem;background-color:#d2d5db}.model-container .key-body ul.number li{height:.93333333rem;line-height:.93333333rem;padding:.22666667rem 0;width:31%;margin:0 1.7% 1.7% 0;border-radius:5px;background-color:#fff;box-shadow:0 1px 0 0 #898a8d}.model-container .key-body ul.number li:nth-child(3n-2){margin-left:1.7%}.model-container .key-body ul.number li:before{content:none}.model-container .key-body ul.number li.key-back,.model-container .key-body ul.number li.key-null{background-color:#d2d5db;box-shadow:none}.model-container .key-body ul.number li.key-back:active{opacity:.5}.freeMask{background-color:transparent}.vx-header+.scroll-wrapper{top:0}@-webkit-keyframes lighter{0%{background-color:#000}50%{background-color:#000}51%{background-color:transparent}to{background-color:transparent}}@keyframes lighter{0%{background-color:#000}50%{background-color:#000}51%{background-color:transparent}to{background-color:transparent}}@-webkit-keyframes rotater{0%{-webkit-transform:rotate(0)}to{-webkit-transform:rotate(1turn)}}@keyframes rotater{0%{-webkit-transform:rotate(0)}to{-webkit-transform:rotate(1turn)}}.mint-popup-bottom{-webkit-transform:translate3d(-50%,0,0)!important}.mint-indicator-wrapper{-webkit-transform:translate(-50%,-50%);z-index:999}@font-face{font-family:PingFangSC-Medium;src:url(https://p1.yqbimg.net/h5/v/manager/static/MarkPro-Medium-8531ae.otf)}.merchant-page{background-color:#fff;padding-bottom:1.33333333rem}.merchant-page .logout{text-align:center;position:fixed;bottom:0;left:5%;width:90%;font-size:.37333333rem;height:1.33333333rem;line-height:1.33333333rem;color:#faa800;border:1px solid #faa800;border-radius:.13333333rem;margin:1.06666667rem auto}.merchant-page .logout.nofix{position:static}.merchant-page .cancellationList{margin-top:.66666667rem;text-align:center}.merchant-page .cancellationList .checkList{padding-left:.2rem;color:#faa800}.merchant-list{padding-left:.4rem;margin-top:.26666667rem;background-color:#fff}.merchant-list li{padding:.4rem .4rem .4rem 0;background:-webkit-linear-gradient(top,#ddd 50%,transparent 0) 100% 100%;background-size:100% 1px;background-repeat:no-repeat}.merchant-list li h3{margin-bottom:.13333333rem;word-break:break-all;max-width:8.85333333rem}.merchant-list li:last-child{background-image:none}.contract-view{padding:.4rem .73333333rem;padding-bottom:2.5rem;background-color:#f7fafc}.contract-view h2{padding:.26666667rem 0 .4rem;margin-top:.4rem}.contract-view .contract-content{color:#4a4a4a}.contract-confirm-view{position:fixed;left:0;right:0;bottom:0;z-index:1;padding:.26666667rem .4rem;background-color:#fff;box-shadow:0 8px 25px 0 #eaebec}.contract-confirm-view button{width:100%;margin:0}.login-page .otp-view .login-btn{margin-bottom:.26666667rem}.palife-otp-title{padding:.57333333rem 0 0}.palife-otp-title p{margin-bottom:.13333333rem}.wxHint{padding:.57333333rem 0}.mint-indicator{transition:opacity .2s linear}.mint-indicator-wrapper{top:50%;left:50%;position:fixed;transform:translate(-50%,-50%);border-radius:5px;background:rgba(0,0,0,.7);color:#fff;box-sizing:border-box;text-align:center}.mint-indicator-text{display:block;color:#fff;text-align:center;margin-top:10px;font-size:16px}.mint-indicator-spin{display:inline-block;text-align:center}.mint-indicator-mask{top:0;left:0;position:fixed;width:100%;height:100%;opacity:0;background:transparent}.mint-indicator-enter,.mint-indicator-leave-active{opacity:0}.mint-spinner-snake{animation:mint-spinner-rotate .8s infinite linear;border:4px solid transparent;border-radius:50%}@keyframes mint-spinner-rotate{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.mint-spinner-double-bounce{position:relative}.mint-spinner-double-bounce-bounce1,.mint-spinner-double-bounce-bounce2{width:100%;height:100%;border-radius:50%;opacity:.6;position:absolute;top:0;left:0;animation:mint-spinner-double-bounce 2s infinite ease-in-out}.mint-spinner-double-bounce-bounce2{animation-delay:-1s}@keyframes mint-spinner-double-bounce{0%,to{transform:scale(0)}50%{transform:scale(1)}}.mint-spinner-triple-bounce-bounce1,.mint-spinner-triple-bounce-bounce2,.mint-spinner-triple-bounce-bounce3{border-radius:100%;display:inline-block;animation:mint-spinner-triple-bounce 1.4s infinite ease-in-out both}.mint-spinner-triple-bounce-bounce1{animation-delay:-.32s}.mint-spinner-triple-bounce-bounce2{animation-delay:-.16s}@keyframes mint-spinner-triple-bounce{0%,80%,to{transform:scale(0)}40%{transform:scale(1)}}.mint-spinner-fading-circle{position:relative}.mint-spinner-fading-circle-circle{width:100%;height:100%;top:0;left:0;position:absolute}.mint-spinner-fading-circle-circle:before{content:" ";display:block;margin:0 auto;width:15%;height:15%;border-radius:100%;animation:mint-fading-circle 1.2s infinite ease-in-out both}.mint-spinner-fading-circle-circle.is-circle2{transform:rotate(30deg)}.mint-spinner-fading-circle-circle.is-circle2:before{animation-delay:-1.1s}.mint-spinner-fading-circle-circle.is-circle3{transform:rotate(60deg)}.mint-spinner-fading-circle-circle.is-circle3:before{animation-delay:-1s}.mint-spinner-fading-circle-circle.is-circle4{transform:rotate(90deg)}.mint-spinner-fading-circle-circle.is-circle4:before{animation-delay:-.9s}.mint-spinner-fading-circle-circle.is-circle5{transform:rotate(120deg)}.mint-spinner-fading-circle-circle.is-circle5:before{animation-delay:-.8s}.mint-spinner-fading-circle-circle.is-circle6{transform:rotate(150deg)}.mint-spinner-fading-circle-circle.is-circle6:before{animation-delay:-.7s}.mint-spinner-fading-circle-circle.is-circle7{transform:rotate(180deg)}.mint-spinner-fading-circle-circle.is-circle7:before{animation-delay:-.6s}.mint-spinner-fading-circle-circle.is-circle8{transform:rotate(210deg)}.mint-spinner-fading-circle-circle.is-circle8:before{animation-delay:-.5s}.mint-spinner-fading-circle-circle.is-circle9{transform:rotate(240deg)}.mint-spinner-fading-circle-circle.is-circle9:before{animation-delay:-.4s}.mint-spinner-fading-circle-circle.is-circle10{transform:rotate(270deg)}.mint-spinner-fading-circle-circle.is-circle10:before{animation-delay:-.3s}.mint-spinner-fading-circle-circle.is-circle11{transform:rotate(300deg)}.mint-spinner-fading-circle-circle.is-circle11:before{animation-delay:-.2s}.mint-spinner-fading-circle-circle.is-circle12{transform:rotate(330deg)}.mint-spinner-fading-circle-circle.is-circle12:before{animation-delay:-.1s}@keyframes mint-fading-circle{0%,39%,to{opacity:0}40%{opacity:1}}@charset "UTF-8";
+@keyframes fadeInRight{0%{opacity:0;transform:translate3d(100%,0,0)}to{opacity:1;transform:translateZ(0)}}.fadeInRight{animation-name:fadeInRight}@keyframes fadeInLeft{0%{opacity:0;transform:translate3d(-100%,0,0)}to{opacity:1;transform:translateZ(0)}}.fadeInLeft{animation-name:fadeInLeft}#vueg-background{position:absolute;z-index:-1;top:0;background:#f8f8f8}#vueg-background,.fit-to-screen{width:100vw;height:100vh;overflow:hidden}a,button,ul{animation:hue 60s infinite linear;-webkit-animation:hue 60s infinite linear}@keyframes hue{0%{-webkit-filter:hue-rotate(-1deg)}to{-webkit-filter:hue-rotate(0deg)}}
diff --git a/pluss-wap-page/src/main/resources/static/resources/css/icon.css b/pluss-wap-page/src/main/resources/static/resources/css/icon.css
new file mode 100644
index 0000000..596ba80
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/css/icon.css
@@ -0,0 +1,68 @@
+@font-face {font-family: "iconfont";
+  src: url('//at.alicdn.com/t/font_2120528_actmdls1his.eot?t=1603691377947'); /* IE9 */
+  src: url('//at.alicdn.com/t/font_2120528_actmdls1his.eot?t=1603691377947#iefix') format('embedded-opentype'), /* IE6-IE8 */
+  url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAAlMAAsAAAAAEaQAAAj/AAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIGVgCEcAqTSJAgATYCJAM4Cx4ABCAFhG0HgVAbFg/IDiUJwcBggKFEcfDPtz/+95mZCz7xC2iQkh3JUJHcxNUhrP4wiJumlMlbTLbdOveLCS27MiusTIpeFK6K3hS5Ors6cBNh/tdcnbch3lxDgzRimtiX4/FR1UZImvB4h4klDQlCWuiU1LBYLjNbs0UsTkSP1n/lYAiIaUoG0OguvWQgEgdDodgKSlUGIhsBuBFdEfr6kQ1dpKMgjNDsY1wAjrjf1y96KhIMnoUPNXF550rQ7ivnbVPYFNoDhtopwLRfGHC7GVigMwAHuheNuAHgADo7FMfKO44DQDW8zqW+5s+bPk96nvW88Hnz5y2fD3m+/GXayzNvm4QaIe5tZmM4SlQLrxqtB0iICHD4pMRfx788gyXDA/kQSg11sZGZwVeOIiTPuAkIEXASCAFwJggOOAsEH7gQhBS4OQgxcEsQQuAhIAh4OZxg4HsawQKfgRMy+N1E9jeLgNxsUAtgFMC2B8BFMLXCFQwRKZU/slzgsKIyNu0B85i1H+uA2U8LWazKPiKWRCDgQTOJ30EKpbQbO9sNwB7XLA8E7fUOu0utMLkQBGI/DEUPuGsoz2D7bDFunTNMQtjMJPIMsZpEMguGSeX22ZXIUzurKEgEpe4N+Q2CBzhfrtWxboOkZ8WHMv8tPPBEbt+43i3yy/yUdoKWESMvhcXMk8Db4IHCjp1dywEFyxGQzFDtrWtKcfjtPJsNgvfaUf5sK2DssQzmMfh1CJRQdDSjGssiFpTNGKemh/amutueictTZYRq7/WmK64V7brSaPnVsZxZGSWDrPtR7nVf07AVR4b2I2QD5MRAXN5fNvYDhQUC+AffaTA4COnvNh2alUZ4zOly7+zDppR+6HrDcIi2+BP2ndmFWD7pXQcv7YDMxy+fP3nybGLzQu/OrUulLChRrNzutW9EURLiMhUiRyOHP8O6aWV58DnhfyoLPNtfQwRUvjqQvPt8sve6VLohyRYsCvqjoQTedKhllmRLkOh7MJDpXg7sN+QWP27zK2azuQfsEsjsSeKtc0UBq3X0LBZrvwUwzrkT+Ru9EHzGVmNJjtigJMaFogesYryZOgghUNxWQO1SOYoj4KuSJh0/zZWEVHEHgIl4W/2AWXVmi5TYsVuc6k5df1pKJyxNvmwAl1mcyRtvtLzI9/dCbg5mlfr1dsi+RKK07XItF5OVFpN7tlQltUuhsScDscDiQtYdMh1OnO0Wg1X+TpxTT+Mguxfd6DMfSZrlkUBrb3TFbRtEIotDjCO6sAhY14tRECLcKAqTM14IKrpUCtk2SBDswIMgM+xLNqwTyQgMbsfhc+oVamT6sCc2RC76RCayacdlOWJmTJ8+Mzou2mHzz4i5eMAZ7fQwrk/8Fn7k0kwCjjHOTB8OXNw5gLcm40oOUSjLN66IUkSVNzlXSOQPXGUoH6QiiuR2aDCmQDmgt3LsMPeBJUMzqnfO0fH3SWMuYbsley9H7Wl6xdiEPh7emEsWEAUDVy7KdR+cl3ksIhfuE4wUpKsIHsFzpQU+Xzt1u1eias7rVqur1R51kOm+uLhea+QkoEWP1l22/U9L0BCrCyuElrD+o7ouJV1uvCpm4FBs+4CKmbUxYLaS4pJ+KYTfFUGKVC8oDWuumM46+UuXVAQh7sf3XO7f/6Y0Ay8DU8bUZ4PESpfDpKackCXg0NqoA04HibUE8QccDmcoDbBWHBfz4XsmpboePnLBQmxkFe1D5MSXkLLjsnlr19p3DK1dx8uOz4JCz/aAPMCYd/k9ms8ruHaCy2Ow2nUWxAcTMUbHz4+9/Udf6919R+qysOK4xf0uxF1oH/6iF7t44PW46/02AjDh0oqkPj8LTvWaFpVeCjTezWZNb2q1dwXC6A/ZDLvJnAJujehMduSsbavJAwslfQdjUL9T4xdo8ju1aL5nQPyzgczWHSJAuq99vyaBlVCkmzYoNnekTDCV9UZNl//bUyATT8rvXF5Pgd4949rCSH8wrMSBJWIzGHJ0V+HHUkXSLaQ5NJwxs7sTp1AOFP9mh88IbxkxI6JZ+MyIlio2bGxxeI1q0RI7MWjfhOmtdqQmTkiJhEJbfnxKeWPuKG7jTtffpEmn5ZU5V0Rtkna26di8YfdCfgt+XAuwM1wcEOGHWx8p/Hb8c2MX5XzrM/RTzSLw2XVghT1m3XpfRQepWZB+gOqfKyrH6N5XezKgidqnu357HLiuBowVvT3yTnf7bWLe6x2fn3wv8VDiXVnX+PgEAHpN/sZr355vZfPZH53tnB/dhK389u156td9Pjri0Nr5MyJGdyXy6j+ljLRZfb+0ASGukN0vUxdh3BK7U7e4YZe0bjQ53eXqlL7mWf3LxNnAxDoANNbbo7Z9qK5xKvwPngJAow8OWskzo73JuAhg1kAfb9NCDlg58492IcwZYoJD8ISmPbC3zGmLuczRsCnBvDbfCVwgee67EKvnjp2n4Lb6Fon+R05+dWiKliTnA9M6CRIIMUNAL7K8lrhRI6yQ6kXJgbl7kqhejX+rxqDVFsh2scxZRVSaAWLRC/LYmGLun0WVzZZn7lRZZW0IaAJsjN8aOPA7W3sk9AY++MOsYzrRtWJCCTpglC1FdWQqWYtCtooRlXMT1pZCLrId/561RznvrH0KBVvHTJdwhwltRSEddWSZgazEykdjVAVdp5TBBsQXH0CqjDVlurrSmRGkTk8lY7lZOe3srmQdqdtjFf0IVZ7BoMSUOroW61IcjqypoTGNjlaTFYasKoNB0yI7WxlbNauCrgUIo9BBUobB2K8Eo5zRnikqoKlDObgBpPPzAyBRYaSGMnQj9T57JiDRoYcaP0YuWeTMYHdFdbPqTaWsnhGoyMNAYUowVVUHTS0YXSiMpEZk0GBo4vOpIanAQBZVK9I0tCCb2lPORVnnU7W/dcSvr0FeP5eRlZMnX4FCRZnTzlJlylVAsIIuq6TqVNwxVcYyy2Aoo9RU2ZgyilP41WlkJYW+ijZqKTYUPYRZ6XI3KC+rqNZrdDqJjDHSUbcG2hg5popSGhloWEUbuVVGavSOW46gNFqqLCc3fCRJjaLqeN+/Yn5aITKaNk5ja/0BAA==') format('woff2'),
+  url('//at.alicdn.com/t/font_2120528_actmdls1his.woff?t=1603691377947') format('woff'),
+  url('//at.alicdn.com/t/font_2120528_actmdls1his.ttf?t=1603691377947') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
+  url('//at.alicdn.com/t/font_2120528_actmdls1his.svg?t=1603691377947#iconfont') format('svg'); /* iOS 4.1- */
+}
+
+.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-loading:before {
+  content: "\e65b";
+}
+
+.icon-zhuangtaijiazai:before {
+  content: "\e69d";
+}
+
+.icon-jianpan_shouqi:before {
+  content: "\e82a";
+}
+
+.icon-shouqijianpan:before {
+  content: "\e62d";
+}
+
+.icon-dian:before {
+  content: "\ec1e";
+}
+
+.icon-backspace:before {
+  content: "\e62e";
+}
+
+.icon-zuojiantou:before {
+  content: "\e626";
+}
+
+.icon-zhifubao:before {
+  content: "\e63b";
+}
+
+.icon-gou:before {
+  content: "\e61e";
+}
+
+.icon-huiyuanvipqia01:before {
+  content: "\e639";
+}
+
+.icon-weixin:before {
+  content: "\e60e";
+}
+
+.icon-iconfontjiantou5:before {
+  content: "\e635";
+}
+
+.icon-youhuiquan:before {
+  content: "\e8c8";
+}
diff --git a/pluss-wap-page/src/main/resources/static/resources/css/jquery-weui.min.css b/pluss-wap-page/src/main/resources/static/resources/css/jquery-weui.min.css
new file mode 100644
index 0000000..145c336
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/css/jquery-weui.min.css
@@ -0,0 +1,6 @@
+/** 
+* jQuery WeUI V1.2.1 
+* By 言川
+* http://lihongxun945.github.io/jquery-weui/
+ */
+.preloader{width:20px;height:20px;-webkit-transform-origin:50%;transform-origin:50%;-webkit-animation:preloader-spin 1s steps(12,end) infinite;animation:preloader-spin 1s steps(12,end) infinite}.preloader:after{display:block;width:100%;height:100%;content:"";background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg%20viewBox%3D'0%200%20120%20120'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20xmlns%3Axlink%3D'http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink'%3E%3Cdefs%3E%3Cline%20id%3D'l'%20x1%3D'60'%20x2%3D'60'%20y1%3D'7'%20y2%3D'27'%20stroke%3D'%236c6c6c'%20stroke-width%3D'11'%20stroke-linecap%3D'round'%2F%3E%3C%2Fdefs%3E%3Cg%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(30%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(60%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(90%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(120%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(150%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.37'%20transform%3D'rotate(180%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.46'%20transform%3D'rotate(210%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.56'%20transform%3D'rotate(240%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.66'%20transform%3D'rotate(270%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.75'%20transform%3D'rotate(300%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.85'%20transform%3D'rotate(330%2060%2C60)'%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E");background-repeat:no-repeat;background-position:50%;background-size:100%}@-webkit-keyframes preloader-spin{100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}label>*{pointer-events:none}html{font-size:20px}body{font-size:16px}@media only screen and (min-width:400px){html{font-size:21.33px!important}}@media only screen and (min-width:414px){html{font-size:22.08px!important}}@media only screen and (min-width:480px){html{font-size:25.6px!important}}.weui_navbar{z-index:10}.weui-mask,.weui-popup-container,.weui-popup-overlay{z-index:1000}.weui-row{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-lines:multiple;-moz-box-lines:multiple;-ms-flex-wrap:wrap;flex-wrap:wrap;-webkit-box-align:start;-ms-flex-align:start;align-items:flex-start}.weui-row>[class*=col-]{box-sizing:border-box}.weui-row .col-auto{width:100%}.weui-row .weui-col-100{width:100%;width:calc((100% - 15px*0)/ 1)}.weui-row.weui-no-gutter .weui-col-100{width:100%}.weui-row .weui-col-95{width:95%;width:calc((100% - 15px*.05263157894736836)/ 1.0526315789473684)}.weui-row.weui-no-gutter .weui-col-95{width:95%}.weui-row .weui-col-90{width:90%;width:calc((100% - 15px*.11111111111111116)/ 1.1111111111111112)}.weui-row.weui-no-gutter .weui-col-90{width:90%}.weui-row .weui-col-85{width:85%;width:calc((100% - 15px*.17647058823529416)/ 1.1764705882352942)}.weui-row.weui-no-gutter .weui-col-85{width:85%}.weui-row .weui-col-80{width:80%;width:calc((100% - 15px*.25)/ 1.25)}.weui-row.weui-no-gutter .weui-col-80{width:80%}.weui-row .weui-col-75{width:75%;width:calc((100% - 15px*.33333333333333326)/ 1.3333333333333333)}.weui-row.weui-no-gutter .weui-col-75{width:75%}.weui-row .weui-col-66{width:66.66666666666666%;width:calc((100% - 15px*.5000000000000002)/ 1.5000000000000002)}.weui-row.weui-no-gutter .weui-col-66{width:66.66666666666666%}.weui-row .weui-col-60{width:60%;width:calc((100% - 15px*.6666666666666667)/ 1.6666666666666667)}.weui-row.weui-no-gutter .weui-col-60{width:60%}.weui-row .weui-col-50{width:50%;width:calc((100% - 15px*1)/ 2)}.weui-row.weui-no-gutter .weui-col-50{width:50%}.weui-row .weui-col-40{width:40%;width:calc((100% - 15px*1.5)/ 2.5)}.weui-row.weui-no-gutter .weui-col-40{width:40%}.weui-row .weui-col-33{width:33.333333333333336%;width:calc((100% - 15px*2)/ 3)}.weui-row.weui-no-gutter .weui-col-33{width:33.333333333333336%}.weui-row .weui-col-25{width:25%;width:calc((100% - 15px*3)/ 4)}.weui-row.weui-no-gutter .weui-col-25{width:25%}.weui-row .weui-col-20{width:20%;width:calc((100% - 15px*4)/ 5)}.weui-row.weui-no-gutter .weui-col-20{width:20%}.weui-row .weui-col-15{width:15%;width:calc((100% - 15px*5.666666666666667)/ 6.666666666666667)}.weui-row.weui-no-gutter .weui-col-15{width:15%}.weui-row .weui-col-10{width:10%;width:calc((100% - 15px*9)/ 10)}.weui-row.weui-no-gutter .weui-col-10{width:10%}.weui-row .weui-col-5{width:5%;width:calc((100% - 15px*19)/ 20)}.weui-row.weui-no-gutter .weui-col-5{width:5%}.weui-row .weui-col-auto:nth-last-child(1),.weui-row .weui-col-auto:nth-last-child(1)~.weui-col-auto{width:100%;width:calc((100% - 15px*0)/ 1)}.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(1),.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(1)~.weui-col-auto{width:100%}.weui-row .weui-col-auto:nth-last-child(2),.weui-row .weui-col-auto:nth-last-child(2)~.weui-col-auto{width:50%;width:calc((100% - 15px*1)/ 2)}.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(2),.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(2)~.weui-col-auto{width:50%}.weui-row .weui-col-auto:nth-last-child(3),.weui-row .weui-col-auto:nth-last-child(3)~.weui-col-auto{width:33.33333333%;width:calc((100% - 15px*2)/ 3)}.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(3),.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(3)~.weui-col-auto{width:33.33333333%}.weui-row .weui-col-auto:nth-last-child(4),.weui-row .weui-col-auto:nth-last-child(4)~.weui-col-auto{width:25%;width:calc((100% - 15px*3)/ 4)}.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(4),.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(4)~.weui-col-auto{width:25%}.weui-row .weui-col-auto:nth-last-child(5),.weui-row .weui-col-auto:nth-last-child(5)~.weui-col-auto{width:20%;width:calc((100% - 15px*4)/ 5)}.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(5),.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(5)~.weui-col-auto{width:20%}.weui-row .weui-col-auto:nth-last-child(6),.weui-row .weui-col-auto:nth-last-child(6)~.weui-col-auto{width:16.66666667%;width:calc((100% - 15px*5)/ 6)}.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(6),.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(6)~.weui-col-auto{width:16.66666667%}.weui-row .weui-col-auto:nth-last-child(7),.weui-row .weui-col-auto:nth-last-child(7)~.weui-col-auto{width:14.28571429%;width:calc((100% - 15px*6)/ 7)}.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(7),.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(7)~.weui-col-auto{width:14.28571429%}.weui-row .weui-col-auto:nth-last-child(8),.weui-row .weui-col-auto:nth-last-child(8)~.weui-col-auto{width:12.5%;width:calc((100% - 15px*7)/ 8)}.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(8),.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(8)~.weui-col-auto{width:12.5%}.weui-row .weui-col-auto:nth-last-child(9),.weui-row .weui-col-auto:nth-last-child(9)~.weui-col-auto{width:11.11111111%;width:calc((100% - 15px*8)/ 9)}.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(9),.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(9)~.weui-col-auto{width:11.11111111%}.weui-row .weui-col-auto:nth-last-child(10),.weui-row .weui-col-auto:nth-last-child(10)~.weui-col-auto{width:10%;width:calc((100% - 15px*9)/ 10)}.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(10),.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(10)~.weui-col-auto{width:10%}.weui-row .weui-col-auto:nth-last-child(11),.weui-row .weui-col-auto:nth-last-child(11)~.weui-col-auto{width:9.09090909%;width:calc((100% - 15px*10)/ 11)}.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(11),.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(11)~.weui-col-auto{width:9.09090909%}.weui-row .weui-col-auto:nth-last-child(12),.weui-row .weui-col-auto:nth-last-child(12)~.weui-col-auto{width:8.33333333%;width:calc((100% - 15px*11)/ 12)}.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(12),.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(12)~.weui-col-auto{width:8.33333333%}.weui-row .weui-col-auto:nth-last-child(13),.weui-row .weui-col-auto:nth-last-child(13)~.weui-col-auto{width:7.69230769%;width:calc((100% - 15px*12)/ 13)}.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(13),.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(13)~.weui-col-auto{width:7.69230769%}.weui-row .weui-col-auto:nth-last-child(14),.weui-row .weui-col-auto:nth-last-child(14)~.weui-col-auto{width:7.14285714%;width:calc((100% - 15px*13)/ 14)}.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(14),.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(14)~.weui-col-auto{width:7.14285714%}.weui-row .weui-col-auto:nth-last-child(15),.weui-row .weui-col-auto:nth-last-child(15)~.weui-col-auto{width:6.66666667%;width:calc((100% - 15px*14)/ 15)}.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(15),.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(15)~.weui-col-auto{width:6.66666667%}@media all and (min-width:768px){.row .tablet-100{width:100%;width:calc((100% - 15px*0)/ 1)}.row.no-gutter .tablet-100{width:100%}.row .tablet-95{width:95%;width:calc((100% - 15px*.05263157894736836)/ 1.0526315789473684)}.row.no-gutter .tablet-95{width:95%}.row .tablet-90{width:90%;width:calc((100% - 15px*.11111111111111116)/ 1.1111111111111112)}.row.no-gutter .tablet-90{width:90%}.row .tablet-85{width:85%;width:calc((100% - 15px*.17647058823529416)/ 1.1764705882352942)}.row.no-gutter .tablet-85{width:85%}.row .tablet-80{width:80%;width:calc((100% - 15px*.25)/ 1.25)}.row.no-gutter .tablet-80{width:80%}.row .tablet-75{width:75%;width:calc((100% - 15px*.33333333333333326)/ 1.3333333333333333)}.row.no-gutter .tablet-75{width:75%}.row .tablet-66{width:66.66666666666666%;width:calc((100% - 15px*.5000000000000002)/ 1.5000000000000002)}.row.no-gutter .tablet-66{width:66.66666666666666%}.row .tablet-60{width:60%;width:calc((100% - 15px*.6666666666666667)/ 1.6666666666666667)}.row.no-gutter .tablet-60{width:60%}.row .tablet-50{width:50%;width:calc((100% - 15px*1)/ 2)}.row.no-gutter .tablet-50{width:50%}.row .tablet-40{width:40%;width:calc((100% - 15px*1.5)/ 2.5)}.row.no-gutter .tablet-40{width:40%}.row .tablet-33{width:33.333333333333336%;width:calc((100% - 15px*2)/ 3)}.row.no-gutter .tablet-33{width:33.333333333333336%}.row .tablet-25{width:25%;width:calc((100% - 15px*3)/ 4)}.row.no-gutter .tablet-25{width:25%}.row .tablet-20{width:20%;width:calc((100% - 15px*4)/ 5)}.row.no-gutter .tablet-20{width:20%}.row .tablet-15{width:15%;width:calc((100% - 15px*5.666666666666667)/ 6.666666666666667)}.row.no-gutter .tablet-15{width:15%}.row .tablet-10{width:10%;width:calc((100% - 15px*9)/ 10)}.row.no-gutter .tablet-10{width:10%}.row .tablet-5{width:5%;width:calc((100% - 15px*19)/ 20)}.row.no-gutter .tablet-5{width:5%}.row .tablet-auto:nth-last-child(1),.row .tablet-auto:nth-last-child(1)~.col-auto{width:100%;width:calc((100% - 15px*0)/ 1)}.row.no-gutter .tablet-auto:nth-last-child(1),.row.no-gutter .tablet-auto:nth-last-child(1)~.tablet-auto{width:100%}.row .tablet-auto:nth-last-child(2),.row .tablet-auto:nth-last-child(2)~.col-auto{width:50%;width:calc((100% - 15px*1)/ 2)}.row.no-gutter .tablet-auto:nth-last-child(2),.row.no-gutter .tablet-auto:nth-last-child(2)~.tablet-auto{width:50%}.row .tablet-auto:nth-last-child(3),.row .tablet-auto:nth-last-child(3)~.col-auto{width:33.33333333%;width:calc((100% - 15px*2)/ 3)}.row.no-gutter .tablet-auto:nth-last-child(3),.row.no-gutter .tablet-auto:nth-last-child(3)~.tablet-auto{width:33.33333333%}.row .tablet-auto:nth-last-child(4),.row .tablet-auto:nth-last-child(4)~.col-auto{width:25%;width:calc((100% - 15px*3)/ 4)}.row.no-gutter .tablet-auto:nth-last-child(4),.row.no-gutter .tablet-auto:nth-last-child(4)~.tablet-auto{width:25%}.row .tablet-auto:nth-last-child(5),.row .tablet-auto:nth-last-child(5)~.col-auto{width:20%;width:calc((100% - 15px*4)/ 5)}.row.no-gutter .tablet-auto:nth-last-child(5),.row.no-gutter .tablet-auto:nth-last-child(5)~.tablet-auto{width:20%}.row .tablet-auto:nth-last-child(6),.row .tablet-auto:nth-last-child(6)~.col-auto{width:16.66666667%;width:calc((100% - 15px*5)/ 6)}.row.no-gutter .tablet-auto:nth-last-child(6),.row.no-gutter .tablet-auto:nth-last-child(6)~.tablet-auto{width:16.66666667%}.row .tablet-auto:nth-last-child(7),.row .tablet-auto:nth-last-child(7)~.col-auto{width:14.28571429%;width:calc((100% - 15px*6)/ 7)}.row.no-gutter .tablet-auto:nth-last-child(7),.row.no-gutter .tablet-auto:nth-last-child(7)~.tablet-auto{width:14.28571429%}.row .tablet-auto:nth-last-child(8),.row .tablet-auto:nth-last-child(8)~.col-auto{width:12.5%;width:calc((100% - 15px*7)/ 8)}.row.no-gutter .tablet-auto:nth-last-child(8),.row.no-gutter .tablet-auto:nth-last-child(8)~.tablet-auto{width:12.5%}.row .tablet-auto:nth-last-child(9),.row .tablet-auto:nth-last-child(9)~.col-auto{width:11.11111111%;width:calc((100% - 15px*8)/ 9)}.row.no-gutter .tablet-auto:nth-last-child(9),.row.no-gutter .tablet-auto:nth-last-child(9)~.tablet-auto{width:11.11111111%}.row .tablet-auto:nth-last-child(10),.row .tablet-auto:nth-last-child(10)~.col-auto{width:10%;width:calc((100% - 15px*9)/ 10)}.row.no-gutter .tablet-auto:nth-last-child(10),.row.no-gutter .tablet-auto:nth-last-child(10)~.tablet-auto{width:10%}.row .tablet-auto:nth-last-child(11),.row .tablet-auto:nth-last-child(11)~.col-auto{width:9.09090909%;width:calc((100% - 15px*10)/ 11)}.row.no-gutter .tablet-auto:nth-last-child(11),.row.no-gutter .tablet-auto:nth-last-child(11)~.tablet-auto{width:9.09090909%}.row .tablet-auto:nth-last-child(12),.row .tablet-auto:nth-last-child(12)~.col-auto{width:8.33333333%;width:calc((100% - 15px*11)/ 12)}.row.no-gutter .tablet-auto:nth-last-child(12),.row.no-gutter .tablet-auto:nth-last-child(12)~.tablet-auto{width:8.33333333%}.row .tablet-auto:nth-last-child(13),.row .tablet-auto:nth-last-child(13)~.col-auto{width:7.69230769%;width:calc((100% - 15px*12)/ 13)}.row.no-gutter .tablet-auto:nth-last-child(13),.row.no-gutter .tablet-auto:nth-last-child(13)~.tablet-auto{width:7.69230769%}.row .tablet-auto:nth-last-child(14),.row .tablet-auto:nth-last-child(14)~.col-auto{width:7.14285714%;width:calc((100% - 15px*13)/ 14)}.row.no-gutter .tablet-auto:nth-last-child(14),.row.no-gutter .tablet-auto:nth-last-child(14)~.tablet-auto{width:7.14285714%}.row .tablet-auto:nth-last-child(15),.row .tablet-auto:nth-last-child(15)~.col-auto{width:6.66666667%;width:calc((100% - 15px*14)/ 15)}.row.no-gutter .tablet-auto:nth-last-child(15),.row.no-gutter .tablet-auto:nth-last-child(15)~.tablet-auto{width:6.66666667%}}.weui-cell__hd img{display:block;margin-right:5px}.weui-cell_swiped .weui-cell__bd{-webkit-transition:-webkit-transform .3s;transition:-webkit-transform .3s;transition:transform .3s;transition:transform .3s,-webkit-transform .3s}.swipeout-touching .weui-cell__bd{-webkit-transition:none;transition:none}.weui-dialog,.weui-toast{-webkit-transition-duration:.2s;transition-duration:.2s;opacity:0;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%);-webkit-transform-origin:0 0;transform-origin:0 0;visibility:hidden;margin:0;top:45%;z-index:2000}.weui-dialog .weui-dialog__btn.default,.weui-toast .weui-dialog__btn.default{color:#5f646e}.weui-dialog .weui-dialog__btn+.weui-dialog__btn,.weui-toast .weui-dialog__btn+.weui-dialog__btn{position:relative}.weui-dialog .weui-dialog__btn+.weui-dialog__btn:after,.weui-toast .weui-dialog__btn+.weui-dialog__btn:after{content:" ";position:absolute;left:0;top:0;width:1px;height:100%;border-left:1px solid #D5D5D6;color:#D5D5D6;-webkit-transform-origin:0 0;transform-origin:0 0;-webkit-transform:scaleX(.5);transform:scaleX(.5)}.weui-dialog.weui-dialog--visible,.weui-dialog.weui-toast--visible,.weui-toast.weui-dialog--visible,.weui-toast.weui-toast--visible{opacity:1;visibility:visible}.weui-toast_forbidden{color:#F76260}.weui-toast_cancel .weui-icon-toast:before{content:"\EA0D"}.weui-toast_forbidden .weui-icon-toast:before{content:"\EA0B";color:#F76260}.weui-toast_text{min-height:1em;width:auto;height:45px;border-radius:25px;margin-left:0;-webkit-transform:scale(.9) translate3d(-50%,0,0);transform:scale(.9) translate3d(-50%,0,0);-webkit-transform-origin:left;transform-origin:left}.weui-toast_text.weui-toast--visible{-webkit-transform:scale(1) translate3d(-50%,0,0);transform:scale(1) translate3d(-50%,0,0)}.weui-toast_text .weui-icon-toast{display:none}.weui-toast_text .weui-toast_content{margin:10px 15px}.weui-mask{opacity:0;-webkit-transition-duration:.3s;transition-duration:.3s;visibility:hidden}.weui-mask.weui-mask--visible{opacity:1;visibility:visible}.weui-prompt-input{padding:4px 6px;border:1px solid #ccc;box-sizing:border-box;height:2em;width:80%;margin-top:10px}.weui-pull-to-refresh{margin-top:-50px;-webkit-transition:-webkit-transform .4s;transition:-webkit-transform .4s;transition:transform .4s;transition:transform .4s,-webkit-transform .4s}.weui-pull-to-refresh.refreshing{-webkit-transform:translate3d(0,50px,0);transform:translate3d(0,50px,0)}.weui-pull-to-refresh.touching{-webkit-transition-duration:0s;transition-duration:0s}.weui-pull-to-refresh__layer{height:30px;line-height:30px;padding:10px;text-align:center}.weui-pull-to-refresh__layer .down{display:inline-block}.weui-pull-to-refresh__layer .refresh,.weui-pull-to-refresh__layer .up{display:none}.weui-pull-to-refresh__layer .weui-pull-to-refresh__arrow{display:inline-block;z-index:10;width:20px;height:20px;margin-right:4px;vertical-align:-4px;background:url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2026%2040'%3E%3Cpolygon%20points%3D'9%2C22%209%2C0%2017%2C0%2017%2C22%2026%2C22%2013.5%2C40%200%2C22'%20fill%3D'%238c8c8c'%2F%3E%3C%2Fsvg%3E") center no-repeat;background-size:13px 20px;-webkit-transition-duration:.3s;transition-duration:.3s;-webkit-transform:rotate(0) translate3d(0,0,0);transform:rotate(0) translate3d(0,0,0)}.weui-pull-to-refresh__layer .weui-pull-to-refresh__preloader{display:none;vertical-align:-4px;margin-right:4px;width:20px;height:20px;-webkit-transform-origin:50%;transform-origin:50%;-webkit-animation:preloader-spin 1s steps(12,end) infinite;animation:preloader-spin 1s steps(12,end) infinite}.weui-pull-to-refresh__layer .weui-pull-to-refresh__preloader:after{display:block;width:100%;height:100%;content:"";background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg%20viewBox%3D'0%200%20120%20120'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20xmlns%3Axlink%3D'http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink'%3E%3Cdefs%3E%3Cline%20id%3D'l'%20x1%3D'60'%20x2%3D'60'%20y1%3D'7'%20y2%3D'27'%20stroke%3D'%236c6c6c'%20stroke-width%3D'11'%20stroke-linecap%3D'round'%2F%3E%3C%2Fdefs%3E%3Cg%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(30%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(60%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(90%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(120%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(150%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.37'%20transform%3D'rotate(180%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.46'%20transform%3D'rotate(210%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.56'%20transform%3D'rotate(240%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.66'%20transform%3D'rotate(270%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.75'%20transform%3D'rotate(300%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.85'%20transform%3D'rotate(330%2060%2C60)'%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E");background-repeat:no-repeat;background-position:50%;background-size:100%}.pull-up .weui-pull-to-refresh__layer .down,.refreshing .weui-pull-to-refresh__layer .down{display:none}.pull-up .weui-pull-to-refresh__layer .weui-pull-to-refresh__arrow{display:inline-block;-webkit-transform:rotate(180deg) translate3d(0,0,0);transform:rotate(180deg) translate3d(0,0,0)}.pull-down .weui-pull-to-refresh__layer .down,.pull-down .weui-pull-to-refresh__layer .weui-pull-to-refresh__arrow,.pull-up .weui-pull-to-refresh__layer .up{display:inline-block}.refreshing .weui-pull-to-refresh__layer .weui-pull-to-refresh__arrow{display:none}.refreshing .weui-pull-to-refresh__layer .refresh,.refreshing .weui-pull-to-refresh__layer .weui-pull-to-refresh__preloader{display:inline-block}@keyframes preloader-spin{100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.weui-tab__bd-item.weui-pull-to-refresh{position:absolute;top:50px}.toolbar,.weui-tabbar__item{position:relative}.weui-tabbar__item.weui-bar__item--on .weui-tabbar__label{color:#04BE02}.weui-navbar__item{color:#888}.weui-navbar__item.weui-bar__item--on{color:#666;background-color:#f1f1f1}.toolbar,.toolbar .title{font-size:.85rem;color:#3d4145;width:100%}.weui-tab__bd{box-sizing:border-box;height:100%}.weui-tab__bd .weui-tab__bd-item{display:none;height:100%;overflow:auto}.weui-tab__bd .weui-tab__bd-item.weui-tab__bd-item--active{display:block}.weui-navbar+.weui-tab__bd{padding-top:50px}.toolbar{line-height:1.5;background:#f7f7f8}.toolbar:before{content:'';position:absolute;left:0;top:0;bottom:auto;right:auto;height:1px;width:100%;background-color:#d9d9d9;display:block;z-index:15;-webkit-transform-origin:50% 0;transform-origin:50% 0}@media only screen and (-webkit-min-device-pixel-ratio:2){.toolbar:before{-webkit-transform:scaleY(.5);transform:scaleY(.5)}}@media only screen and (-webkit-min-device-pixel-ratio:3){.toolbar:before{-webkit-transform:scaleY(.33);transform:scaleY(.33)}}.toolbar .toolbar-inner{height:2.2rem;display:-webkit-box;display:-ms-flexbox;display:flex;text-align:center}.toolbar .title{position:absolute;display:block;padding:0;font-weight:400;line-height:2.2rem;text-align:center;white-space:nowrap}.toolbar .picker-button{position:absolute;right:0;box-sizing:border-box;height:2.2rem;line-height:2.2rem;color:#04BE02;z-index:1;padding:0 .5rem}.weui-picker-modal{width:100%;position:absolute;bottom:0;text-align:center;border-radius:0;opacity:.6;color:#3d4145;-webkit-transition-duration:.3s;transition-duration:.3s;height:13rem;background:#EFEFF4;-webkit-transform:translate3d(0,100%,0);transform:translate3d(0,100%,0);-webkit-transition-property:opacity,-webkit-transform;transition-property:opacity,-webkit-transform;transition-property:transform,opacity;transition-property:transform,opacity,-webkit-transform}.weui-picker-modal.picker-modal-inline{height:10.8rem;opacity:1;position:static;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}.weui-picker-modal.picker-modal-inline .toolbar{display:none}.weui-picker-modal.picker-columns-single .picker-items-col{width:100%}.weui-picker-modal.weui-picker-modal-visible{opacity:1;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}.weui-picker-modal .picker-modal-inner{position:relative;height:10.8rem}.weui-picker-modal .picker-columns{width:100%;height:13rem;z-index:11500}.popover .weui-picker-modal .picker-columns,.weui-picker-modal .picker-columns.picker-modal-inline{height:10rem}@media (orientation:landscape) and (max-height:415px){.weui-picker-modal .picker-columns:not(.picker-modal-inline){height:10rem}}.weui-picker-modal .popover.popover-picker-columns{width:14rem}.weui-picker-modal .picker-items{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;width:100%;padding:0;text-align:right;font-size:1rem;font-weight:400;-webkit-mask-box-image:-webkit-linear-gradient(bottom,transparent,transparent 5%,#fff 20%,#fff 80%,transparent 95%,transparent);-webkit-mask-box-image:linear-gradient(to top,transparent,transparent 5%,#fff 20%,#fff 80%,transparent 95%,transparent)}.weui-picker-modal .bar+.picker-items{height:10.8rem}.weui-picker-modal .picker-items-col{overflow:hidden;position:relative;max-height:100%}.weui-picker-modal .picker-items-col.picker-items-col-left{text-align:left}.weui-picker-modal .picker-items-col.picker-items-col-center{text-align:center}.weui-picker-modal .picker-items-col.picker-items-col-right{text-align:right}.weui-picker-modal .picker-items-col.picker-items-col-divider{color:#3d4145;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.weui-picker-modal .picker-items-col-wrapper{-webkit-transition:.3s;transition:.3s;-webkit-transition-timing-function:ease-out;transition-timing-function:ease-out}.weui-picker-modal .picker-item{height:32px;line-height:32px;padding:0 10px;white-space:nowrap;position:relative;overflow:hidden;text-overflow:ellipsis;color:#9b9b9b;left:0;top:0;width:100%;box-sizing:border-box;-webkit-transition:.3s;transition:.3s}.picker-items-col-absolute .weui-picker-modal .picker-item{position:absolute}.weui-picker-modal .picker-item.picker-item-far{pointer-events:none}.weui-picker-modal .picker-item.picker-selected{color:#3d4145;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0);-webkit-transform:rotateX(0);transform:rotateX(0)}.weui-picker-modal .picker-center-highlight{height:32px;box-sizing:border-box;position:absolute;left:0;width:100%;top:50%;margin-top:-16px;pointer-events:none}.weui-picker-modal .picker-center-highlight:after,.weui-picker-modal .picker-center-highlight:before{content:'';position:absolute;right:auto;height:1px;background-color:#D9D9D9;display:block;z-index:15;left:0;width:100%}.weui-picker-modal .picker-center-highlight:before{top:0;bottom:auto;-webkit-transform-origin:50% 0;transform-origin:50% 0}@media only screen and (-webkit-min-device-pixel-ratio:2){.weui-picker-modal .picker-center-highlight:before{-webkit-transform:scaleY(.5);transform:scaleY(.5)}}@media only screen and (-webkit-min-device-pixel-ratio:3){.weui-picker-modal .picker-center-highlight:before{-webkit-transform:scaleY(.33);transform:scaleY(.33)}}.weui-picker-modal .picker-center-highlight:after{bottom:0;top:auto;-webkit-transform-origin:50% 100%;transform-origin:50% 100%}@media only screen and (-webkit-min-device-pixel-ratio:2){.weui-picker-modal .picker-center-highlight:after{-webkit-transform:scaleY(.5);transform:scaleY(.5)}}@media only screen and (-webkit-min-device-pixel-ratio:3){.weui-picker-modal .picker-center-highlight:after{-webkit-transform:scaleY(.33);transform:scaleY(.33)}}.weui-picker-modal .picker-3d .picker-items{overflow:hidden;-webkit-perspective:1200px;perspective:1200px}.weui-picker-modal .picker-3d .picker-item,.weui-picker-modal .picker-3d .picker-items-col,.weui-picker-modal .picker-3d .picker-items-col-wrapper{-webkit-transform-style:preserve-3d;transform-style:preserve-3d}.weui-picker-modal .picker-3d .picker-items-col{overflow:visible}.weui-picker-modal .picker-3d .picker-item{-webkit-transform-origin:center center -110px;transform-origin:center center -110px;-webkit-backface-visibility:hidden;backface-visibility:hidden;-webkit-transition-timing-function:ease-out;transition-timing-function:ease-out}.weui-picker-container,.weui-picker-overlay{position:fixed;bottom:0;left:0;right:0;height:0;width:100%;z-index:1000}.picker-calendar-row:after,.picker-calendar-week-days:after{content:'';z-index:15;left:0;right:auto}.city-picker .picker-items-col{-webkit-box-flex:1;-ms-flex:1;flex:1;max-width:7rem}.weui-picker-container .weui-cells{margin:0;text-align:left}.datetime-picker .picker-item{text-overflow:initial}.weui-select-modal{height:auto}.weui-select-modal .weui-cells{margin:0;text-align:left;overflow-y:auto;overflow-x:hidden;max-height:16rem}.weui-select-modal .weui-cells:after{display:none}.weui-picker-calendar{background:#fff;height:15rem;width:100%;overflow:hidden}.weui-picker-calendar .picker-modal-inner{overflow:hidden;height:12.8rem}.picker-calendar-week-days{height:.9rem;background:#f7f7f8;display:-webkit-box;display:-ms-flexbox;display:flex;font-size:11px;box-sizing:border-box;position:relative}.picker-calendar-week-days:after{position:absolute;bottom:0;top:auto;height:1px;width:100%;background-color:#c4c4c4;display:block;-webkit-transform-origin:50% 100%;transform-origin:50% 100%}@media only screen and (-webkit-min-device-pixel-ratio:2){.picker-calendar-week-days:after{-webkit-transform:scaleY(.5);transform:scaleY(.5)}}@media only screen and (-webkit-min-device-pixel-ratio:3){.picker-calendar-week-days:after{-webkit-transform:scaleY(.33);transform:scaleY(.33)}}.picker-calendar-week-days .picker-calendar-week-day{-webkit-flex-shrink:1;-ms-flex:0 1 auto;-ms-flex-negative:1;flex-shrink:1;width:14.28571429%;width:calc(100% / 7);line-height:17px;text-align:center}.picker-calendar-week-days+.picker-calendar-months{height:11.9rem}.picker-calendar-months{width:100%;height:100%;overflow:hidden;position:relative}.picker-calendar-months-wrapper{position:relative;width:100%;height:100%;-webkit-transition:.3s;transition:.3s}.picker-calendar-month{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-ms-flex-direction:column;flex-direction:column;width:100%;height:100%;position:absolute;left:0;top:0}.picker-calendar-row{height:16.66666667%;height:calc(100% / 6);display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-flex-shrink:1;-ms-flex:0 1 auto;-ms-flex-negative:1;flex-shrink:1;width:100%;position:relative}.picker-calendar-row:after{position:absolute;bottom:0;top:auto;height:1px;width:100%;background-color:#ccc;display:block;-webkit-transform-origin:50% 100%;transform-origin:50% 100%}@media only screen and (-webkit-min-device-pixel-ratio:2){.picker-calendar-row:after{-webkit-transform:scaleY(.5);transform:scaleY(.5)}}@media only screen and (-webkit-min-device-pixel-ratio:3){.picker-calendar-row:after{-webkit-transform:scaleY(.33);transform:scaleY(.33)}}.weui-picker-modal .picker-calendar-row:last-child:after{display:none}.picker-calendar-day{-webkit-flex-shrink:1;-ms-flex:0 1 auto;-ms-flex-negative:1;flex-shrink:1;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;box-sizing:border-box;width:14.28571429%;width:calc(100% / 7);text-align:center;color:#3d4145;font-size:15px;cursor:pointer}.picker-calendar-day.picker-calendar-day-next,.picker-calendar-day.picker-calendar-day-prev{color:#ccc}.picker-calendar-day.picker-calendar-day-disabled{color:#d4d4d4;cursor:auto}.picker-calendar-day.picker-calendar-day-today span{background:#e3e3e3}.picker-calendar-day.picker-calendar-day-selected span{background:#04BE02;color:#fff}.picker-calendar-day span{display:inline-block;border-radius:100%;width:30px;height:30px;line-height:30px}.picker-calendar-month-picker,.picker-calendar-year-picker{-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;width:50%;max-width:200px;-webkit-flex-shrink:10;-ms-flex-negative:10;flex-shrink:10}.picker-calendar-month-picker span,.picker-calendar-year-picker span{-webkit-flex-shrink:1;-ms-flex:0 1 auto;-ms-flex-negative:1;flex-shrink:1;position:relative;overflow:hidden;text-overflow:ellipsis}.picker-calendar.picker-modal-inline .picker-calendar-week-days,.popover .picker-calendar .picker-calendar-week-days{background:0 0}.swiper-button-next,.swiper-button-prev,i.icon{background-position:center;background-repeat:no-repeat}.picker-calendar.picker-modal-inline .picker-calendar-week-days:after,.picker-calendar.picker-modal-inline .picker-calendar-week-days:before,.picker-calendar.picker-modal-inline .toolbar:after,.picker-calendar.picker-modal-inline .toolbar:before,.popover .picker-calendar .picker-calendar-week-days:after,.popover .picker-calendar .picker-calendar-week-days:before,.popover .picker-calendar .toolbar:after,.popover .picker-calendar .toolbar:before{display:none}.picker-calendar.picker-modal-inline .picker-calendar-week-days~.picker-calendar-months:before,.picker-calendar.picker-modal-inline .toolbar~.picker-modal-inner .picker-calendar-months:before,.popover .picker-calendar .picker-calendar-week-days~.picker-calendar-months:before,.popover .picker-calendar .toolbar~.picker-modal-inner .picker-calendar-months:before{content:'';position:absolute;left:0;top:0;bottom:auto;right:auto;height:1px;width:100%;background-color:#c4c4c4;display:block;z-index:15;-webkit-transform-origin:50% 0;transform-origin:50% 0}@media only screen and (-webkit-min-device-pixel-ratio:2){.picker-calendar.picker-modal-inline .picker-calendar-week-days~.picker-calendar-months:before,.picker-calendar.picker-modal-inline .toolbar~.picker-modal-inner .picker-calendar-months:before,.popover .picker-calendar .picker-calendar-week-days~.picker-calendar-months:before,.popover .picker-calendar .toolbar~.picker-modal-inner .picker-calendar-months:before{-webkit-transform:scaleY(.5);transform:scaleY(.5)}}@media only screen and (-webkit-min-device-pixel-ratio:3){.picker-calendar.picker-modal-inline .picker-calendar-week-days~.picker-calendar-months:before,.picker-calendar.picker-modal-inline .toolbar~.picker-modal-inner .picker-calendar-months:before,.popover .picker-calendar .picker-calendar-week-days~.picker-calendar-months:before,.popover .picker-calendar .toolbar~.picker-modal-inner .picker-calendar-months:before{-webkit-transform:scaleY(.33);transform:scaleY(.33)}}.picker-calendar-month-picker,.picker-calendar-year-picker{display:block;line-height:2.2rem;-webkit-box-flex:1;-ms-flex:1;flex:1}.picker-calendar-month-picker a.icon-only,.picker-calendar-year-picker a.icon-only{min-width:36px;float:left;width:25%;height:2.2rem;line-height:2rem}.picker-calendar-month-picker .current-month-value,.picker-calendar-month-picker .current-year-value,.picker-calendar-year-picker .current-month-value,.picker-calendar-year-picker .current-year-value{float:left;width:50%;height:2.2rem}i.icon{display:inline-block;vertical-align:middle;background-size:100% auto;font-style:normal;position:relative}i.icon.icon-next,i.icon.icon-prev{width:.75rem;height:.75rem}.swiper-slide,.swiper-wrapper{width:100%;height:100%;position:relative}i.icon.icon-next{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2015%2015'%3E%3Cg%3E%3Cpath%20fill%3D'%2304BE02'%20d%3D'M1%2C1.6l11.8%2C5.8L1%2C13.4V1.6%20M0%2C0v15l15-7.6L0%2C0L0%2C0z'%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E")}i.icon.icon-prev{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2015%2015'%3E%3Cg%3E%3Cpath%20fill%3D'%2304BE02'%20d%3D'M14%2C1.6v11.8L2.2%2C7.6L14%2C1.6%20M15%2C0L0%2C7.6L15%2C15V0L15%2C0z'%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E")}.swiper-container{margin:0 auto;position:relative;overflow:hidden;z-index:1}.swiper-container-no-flexbox .swiper-slide{float:left}.swiper-container-vertical>.swiper-wrapper{-webkit-box-orient:vertical;-ms-flex-direction:column;flex-direction:column}.swiper-wrapper{z-index:1;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-transition-property:-webkit-transform;transition-property:-webkit-transform;transition-property:transform;transition-property:transform,-webkit-transform;box-sizing:content-box}.swiper-container-android .swiper-slide,.swiper-wrapper{-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}.swiper-container-multirow>.swiper-wrapper{-webkit-box-lines:multiple;-moz-box-lines:multiple;-ms-flex-wrap:wrap;flex-wrap:wrap}.swiper-container-free-mode>.swiper-wrapper{-webkit-transition-timing-function:ease-out;transition-timing-function:ease-out;margin:0 auto}.swiper-slide{-webkit-flex-shrink:0;-ms-flex:0 0 auto;-ms-flex-negative:0;flex-shrink:0}.swiper-container-autoheight,.swiper-container-autoheight .swiper-slide{height:auto}.swiper-container-autoheight .swiper-wrapper{-webkit-box-align:start;-ms-flex-align:start;align-items:flex-start;-webkit-transition-property:-webkit-transform,height;-webkit-transition-property:height,-webkit-transform;transition-property:height,-webkit-transform;transition-property:transform,height;transition-property:transform,height,-webkit-transform}.swiper-container .swiper-notification{position:absolute;left:0;top:0;pointer-events:none;opacity:0;z-index:-1000}.swiper-wp8-horizontal{-ms-touch-action:pan-y;touch-action:pan-y}.swiper-wp8-vertical{-ms-touch-action:pan-x;touch-action:pan-x}.swiper-button-next,.swiper-button-prev{position:absolute;top:50%;width:27px;height:44px;margin-top:-22px;z-index:10;cursor:pointer;background-size:27px 44px}.swiper-button-next.swiper-button-disabled,.swiper-button-prev.swiper-button-disabled{opacity:.35;cursor:auto;pointer-events:none}.swiper-button-prev,.swiper-container-rtl .swiper-button-next{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2027%2044'%3E%3Cpath%20d%3D'M0%2C22L22%2C0l2.1%2C2.1L4.2%2C22l19.9%2C19.9L22%2C44L0%2C22L0%2C22L0%2C22z'%20fill%3D'%23007aff'%2F%3E%3C%2Fsvg%3E");left:10px;right:auto}.swiper-button-prev.swiper-button-black,.swiper-container-rtl .swiper-button-next.swiper-button-black{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2027%2044'%3E%3Cpath%20d%3D'M0%2C22L22%2C0l2.1%2C2.1L4.2%2C22l19.9%2C19.9L22%2C44L0%2C22L0%2C22L0%2C22z'%20fill%3D'%23000000'%2F%3E%3C%2Fsvg%3E")}.swiper-button-prev.swiper-button-white,.swiper-container-rtl .swiper-button-next.swiper-button-white{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2027%2044'%3E%3Cpath%20d%3D'M0%2C22L22%2C0l2.1%2C2.1L4.2%2C22l19.9%2C19.9L22%2C44L0%2C22L0%2C22L0%2C22z'%20fill%3D'%23ffffff'%2F%3E%3C%2Fsvg%3E")}.swiper-button-next,.swiper-container-rtl .swiper-button-prev{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2027%2044'%3E%3Cpath%20d%3D'M27%2C22L27%2C22L5%2C44l-2.1-2.1L22.8%2C22L2.9%2C2.1L5%2C0L27%2C22L27%2C22z'%20fill%3D'%23007aff'%2F%3E%3C%2Fsvg%3E");right:10px;left:auto}.swiper-button-next.swiper-button-black,.swiper-container-rtl .swiper-button-prev.swiper-button-black{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2027%2044'%3E%3Cpath%20d%3D'M27%2C22L27%2C22L5%2C44l-2.1-2.1L22.8%2C22L2.9%2C2.1L5%2C0L27%2C22L27%2C22z'%20fill%3D'%23000000'%2F%3E%3C%2Fsvg%3E")}.swiper-button-next.swiper-button-white,.swiper-container-rtl .swiper-button-prev.swiper-button-white{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2027%2044'%3E%3Cpath%20d%3D'M27%2C22L27%2C22L5%2C44l-2.1-2.1L22.8%2C22L2.9%2C2.1L5%2C0L27%2C22L27%2C22z'%20fill%3D'%23ffffff'%2F%3E%3C%2Fsvg%3E")}.swiper-pagination{position:absolute;text-align:center;-webkit-transition:.3s;transition:.3s;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0);z-index:10}.swiper-pagination.swiper-pagination-hidden{opacity:0}.swiper-container-horizontal>.swiper-pagination-bullets,.swiper-pagination-custom,.swiper-pagination-fraction{bottom:10px;left:0;width:100%}.swiper-pagination-bullet{width:8px;height:8px;display:inline-block;border-radius:100%;background:#000;opacity:.2}button.swiper-pagination-bullet{border:none;margin:0;padding:0;box-shadow:none;-moz-appearance:none;-ms-appearance:none;-webkit-appearance:none;appearance:none}.swiper-pagination-clickable .swiper-pagination-bullet{cursor:pointer}.swiper-pagination-white .swiper-pagination-bullet{background:#fff}.swiper-pagination-bullet-active{opacity:1;background:#04BE02}.swiper-pagination-white .swiper-pagination-bullet-active{background:#fff}.swiper-pagination-black .swiper-pagination-bullet-active{background:#000}.swiper-container-vertical>.swiper-pagination-bullets{right:10px;top:50%;-webkit-transform:translate3d(0,-50%,0);transform:translate3d(0,-50%,0)}.swiper-container-vertical>.swiper-pagination-bullets .swiper-pagination-bullet{margin:5px 0;display:block}.swiper-container-horizontal>.swiper-pagination-bullets .swiper-pagination-bullet{margin:0 5px}.swiper-pagination-progress{background:rgba(0,0,0,.25);position:absolute}.swiper-pagination-progress .swiper-pagination-progressbar{background:#007aff;position:absolute;left:0;top:0;width:100%;height:100%;-webkit-transform:scale(0);transform:scale(0);-webkit-transform-origin:left top;transform-origin:left top}.swiper-container-rtl .swiper-pagination-progress .swiper-pagination-progressbar{-webkit-transform-origin:right top;transform-origin:right top}.swiper-container-horizontal>.swiper-pagination-progress{width:100%;height:4px;left:0;top:0}.swiper-container-vertical>.swiper-pagination-progress{width:4px;height:100%;left:0;top:0}.swiper-pagination-progress.swiper-pagination-white{background:rgba(255,255,255,.5)}.swiper-pagination-progress.swiper-pagination-white .swiper-pagination-progressbar{background:#fff}.swiper-pagination-progress.swiper-pagination-black .swiper-pagination-progressbar{background:#000}.swiper-container-3d{-webkit-perspective:1200px;-o-perspective:1200px;perspective:1200px}.swiper-container-3d .swiper-cube-shadow,.swiper-container-3d .swiper-slide,.swiper-container-3d .swiper-slide-shadow-bottom,.swiper-container-3d .swiper-slide-shadow-left,.swiper-container-3d .swiper-slide-shadow-right,.swiper-container-3d .swiper-slide-shadow-top,.swiper-container-3d .swiper-wrapper{-webkit-transform-style:preserve-3d;transform-style:preserve-3d}.swiper-container-3d .swiper-slide-shadow-bottom,.swiper-container-3d .swiper-slide-shadow-left,.swiper-container-3d .swiper-slide-shadow-right,.swiper-container-3d .swiper-slide-shadow-top{position:absolute;left:0;top:0;width:100%;height:100%;pointer-events:none;z-index:10}.swiper-container-3d .swiper-slide-shadow-left{background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.5)),to(rgba(0,0,0,0)));background-image:-webkit-linear-gradient(right,rgba(0,0,0,.5),rgba(0,0,0,0));background-image:linear-gradient(to left,rgba(0,0,0,.5),rgba(0,0,0,0))}.swiper-container-3d .swiper-slide-shadow-right{background-image:-webkit-gradient(linear,right top,left top,from(rgba(0,0,0,.5)),to(rgba(0,0,0,0)));background-image:-webkit-linear-gradient(left,rgba(0,0,0,.5),rgba(0,0,0,0));background-image:linear-gradient(to right,rgba(0,0,0,.5),rgba(0,0,0,0))}.swiper-container-3d .swiper-slide-shadow-top{background-image:-webkit-gradient(linear,left top,left bottom,from(rgba(0,0,0,.5)),to(rgba(0,0,0,0)));background-image:-webkit-linear-gradient(bottom,rgba(0,0,0,.5),rgba(0,0,0,0));background-image:linear-gradient(to top,rgba(0,0,0,.5),rgba(0,0,0,0))}.swiper-container-3d .swiper-slide-shadow-bottom{background-image:-webkit-gradient(linear,left bottom,left top,from(rgba(0,0,0,.5)),to(rgba(0,0,0,0)));background-image:-webkit-linear-gradient(top,rgba(0,0,0,.5),rgba(0,0,0,0));background-image:linear-gradient(to bottom,rgba(0,0,0,.5),rgba(0,0,0,0))}.swiper-container-coverflow .swiper-wrapper,.swiper-container-flip .swiper-wrapper{-ms-perspective:1200px}.swiper-container-cube,.swiper-container-flip{overflow:visible}.swiper-container-cube .swiper-slide,.swiper-container-flip .swiper-slide{pointer-events:none;-webkit-backface-visibility:hidden;backface-visibility:hidden;z-index:1}.swiper-container-cube .swiper-slide .swiper-slide,.swiper-container-flip .swiper-slide .swiper-slide{pointer-events:none}.swiper-container-cube .swiper-slide-active,.swiper-container-cube .swiper-slide-active .swiper-slide-active,.swiper-container-flip .swiper-slide-active,.swiper-container-flip .swiper-slide-active .swiper-slide-active{pointer-events:auto}.swiper-container-cube .swiper-slide-shadow-bottom,.swiper-container-cube .swiper-slide-shadow-left,.swiper-container-cube .swiper-slide-shadow-right,.swiper-container-cube .swiper-slide-shadow-top,.swiper-container-flip .swiper-slide-shadow-bottom,.swiper-container-flip .swiper-slide-shadow-left,.swiper-container-flip .swiper-slide-shadow-right,.swiper-container-flip .swiper-slide-shadow-top{z-index:0;-webkit-backface-visibility:hidden;backface-visibility:hidden}.swiper-container-cube .swiper-slide{visibility:hidden;-webkit-transform-origin:0 0;transform-origin:0 0;width:100%;height:100%}.swiper-container-cube.swiper-container-rtl .swiper-slide{-webkit-transform-origin:100% 0;transform-origin:100% 0}.swiper-container-cube .swiper-slide-active,.swiper-container-cube .swiper-slide-next,.swiper-container-cube .swiper-slide-next+.swiper-slide,.swiper-container-cube .swiper-slide-prev{pointer-events:auto;visibility:visible}.swiper-container-cube .swiper-cube-shadow{position:absolute;left:0;bottom:0;width:100%;height:100%;background:#000;opacity:.6;-webkit-filter:blur(50px);filter:blur(50px);z-index:0}.swiper-container-fade.swiper-container-free-mode .swiper-slide{-webkit-transition-timing-function:ease-out;transition-timing-function:ease-out}.swiper-container-fade .swiper-slide{pointer-events:none;-webkit-transition-property:opacity;transition-property:opacity}.swiper-container-fade .swiper-slide .swiper-slide{pointer-events:none}.swiper-container-fade .swiper-slide-active,.swiper-container-fade .swiper-slide-active .swiper-slide-active{pointer-events:auto}.swiper-scrollbar{border-radius:10px;position:relative;-ms-touch-action:none;background:rgba(0,0,0,.1)}.swiper-container-horizontal>.swiper-scrollbar{position:absolute;left:1%;bottom:3px;z-index:50;height:5px;width:98%}.swiper-container-vertical>.swiper-scrollbar{position:absolute;right:3px;top:1%;z-index:50;width:5px;height:98%}.swiper-scrollbar-drag{height:100%;width:100%;position:relative;background:rgba(0,0,0,.5);border-radius:10px;left:0;top:0}.swiper-scrollbar-cursor-drag{cursor:move}.swiper-lazy-preloader{width:42px;height:42px;position:absolute;left:50%;top:50%;margin-left:-21px;margin-top:-21px;z-index:10;-webkit-transform-origin:50%;transform-origin:50%;-webkit-animation:swiper-preloader-spin 1s steps(12,end) infinite;animation:swiper-preloader-spin 1s steps(12,end) infinite}.swiper-lazy-preloader:after{display:block;content:"";width:100%;height:100%;background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg%20viewBox%3D'0%200%20120%20120'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20xmlns%3Axlink%3D'http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink'%3E%3Cdefs%3E%3Cline%20id%3D'l'%20x1%3D'60'%20x2%3D'60'%20y1%3D'7'%20y2%3D'27'%20stroke%3D'%236c6c6c'%20stroke-width%3D'11'%20stroke-linecap%3D'round'%2F%3E%3C%2Fdefs%3E%3Cg%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(30%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(60%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(90%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(120%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(150%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.37'%20transform%3D'rotate(180%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.46'%20transform%3D'rotate(210%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.56'%20transform%3D'rotate(240%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.66'%20transform%3D'rotate(270%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.75'%20transform%3D'rotate(300%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.85'%20transform%3D'rotate(330%2060%2C60)'%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E");background-position:50%;background-size:100%;background-repeat:no-repeat}.swiper-lazy-preloader-white:after{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg%20viewBox%3D'0%200%20120%20120'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20xmlns%3Axlink%3D'http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink'%3E%3Cdefs%3E%3Cline%20id%3D'l'%20x1%3D'60'%20x2%3D'60'%20y1%3D'7'%20y2%3D'27'%20stroke%3D'%23fff'%20stroke-width%3D'11'%20stroke-linecap%3D'round'%2F%3E%3C%2Fdefs%3E%3Cg%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(30%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(60%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(90%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(120%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(150%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.37'%20transform%3D'rotate(180%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.46'%20transform%3D'rotate(210%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.56'%20transform%3D'rotate(240%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.66'%20transform%3D'rotate(270%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.75'%20transform%3D'rotate(300%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.85'%20transform%3D'rotate(330%2060%2C60)'%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E")}@-webkit-keyframes swiper-preloader-spin{100%{-webkit-transform:rotate(360deg)}}@keyframes swiper-preloader-spin{100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.weui-actionsheet{z-index:10000}.weui-popup__container,.weui-popup__overlay{position:fixed;bottom:0;left:0;right:0;width:100%;height:100%;z-index:10}.weui-popup__overlay{background-color:rgba(0,0,0,.6);opacity:0;-webkit-transition:opacity .3s;transition:opacity .3s}.weui-popup__container{display:none}.weui-popup__container.weui-popup__container--visible{display:block}.weui-popup__container .weui-cells{margin:0;text-align:left}.weui-popup__modal{width:100%;position:absolute;z-index:100;bottom:0;border-radius:0;opacity:.6;color:#3d4145;-webkit-transition-duration:.3s;transition-duration:.3s;height:100%;background:#EFEFF4;-webkit-transform:translate3d(0,100%,0);transform:translate3d(0,100%,0);-webkit-transition-property:opacity,-webkit-transform;transition-property:opacity,-webkit-transform;transition-property:transform,opacity;transition-property:transform,opacity,-webkit-transform;overflow-x:hidden;overflow-y:auto}.popup-bottom .weui-popup__modal{height:auto}.weui-popup__modal .toolbar{position:absolute;left:0;top:0;right:0;z-index:1}.weui-popup__modal .modal-content{height:100%;padding-top:2.2rem;overflow:auto;box-sizing:border-box}.weui-popup__container--visible .weui-popup__overlay{opacity:1}.weui-popup__container--visible .weui-popup__modal{opacity:1;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}.weui-notification{position:fixed;width:100%;min-height:3.4rem;top:-2rem;padding-top:2rem;left:0;right:0;z-index:9999;background-color:rgba(0,0,0,.85);color:#fff;font-size:.65rem;-webkit-transform:translate3d(0,-100%,0);transform:translate3d(0,-100%,0);-webkit-transition:.4s;transition:.4s}.weui-notification.weui-notification--in{-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}.weui-notification.weui-notification--touching{-webkit-transition-duration:0s;transition-duration:0s}.weui-notification .weui-notification__inner{padding:.4rem .6rem 1rem;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:start;-ms-flex-align:start;align-items:flex-start}.weui-notification .weui-notification__content{width:100%;margin:0 .4rem}.weui-notification .weui-notification__title{font-weight:700}.weui-notification .weui-notification__text{line-height:1}.weui-notification .weui-notification__media{height:1rem;width:1rem}.weui-notification .weui-notification__media img{width:100%}.weui-notification .weui-notification__handle-bar{position:absolute;bottom:.2rem;left:50%;-webkit-transform:translate3d(-50%,0,0);transform:translate3d(-50%,0,0);width:2rem;height:.3rem;border-radius:.15rem;background:#fff;opacity:.5}.weui-photo-browser-modal{position:fixed;top:0;left:0;right:0;bottom:0;background:#000;display:none;opacity:0;-webkit-transition:opacity .3s;transition:opacity .3s}.weui-photo-browser-modal.weui-photo-browser-modal-visible{opacity:1}.weui-photo-browser-modal .swiper-container{height:100%;-webkit-transform:scale(.2);transform:scale(.2);-webkit-transition:-webkit-transform .5s;transition:-webkit-transform .5s;transition:transform .5s;transition:transform .5s,-webkit-transform .5s}.weui-photo-browser-modal .swiper-container .swiper-pagination-bullet{background:#fff;visibility:hidden}.weui-photo-browser-modal .swiper-container.swiper-container-visible{-webkit-transform:scale(1);transform:scale(1)}.weui-photo-browser-modal .swiper-container.swiper-container-visible .swiper-pagination-bullet{visibility:visible;-webkit-transition-property:visibility;transition-property:visibility;-webkit-transition-delay:.5s;transition-delay:.5s}.weui-photo-browser-modal .swiper-container .swiper-pagination{bottom:10px;left:0;width:100%}.weui-photo-browser-modal .photo-container{height:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;overflow:hidden}.weui-photo-browser-modal .photo-container img{max-width:100%;margin-top:-30px}.weui-photo-browser-modal .caption{position:absolute;bottom:40px;left:0;right:0;color:#fff;text-align:center;padding:0 12px;min-height:3rem;font-size:14px;z-index:10;-webkit-transition:opacity .3s;transition:opacity .3s;-webkit-transition-delay:.5s;transition-delay:.5s;opacity:0}.weui-photo-browser-modal .caption .caption-item{display:none;opacity:0;-webkit-transition:opacity .15s;transition:opacity .15s}.weui-photo-browser-modal .caption .caption-item.active{display:block;opacity:1}.weui-photo-browser-modal .swiper-container-visible .caption{opacity:1}.color-primary{color:#04BE02}.color-danger,.color-error{color:#f6383a}.color-warning{color:#f60}.color-success{color:#4cd964}.bg-danger,.bg-error,.bg-primary,.bg-success,.bg-warning{color:#fff}.bg-primary{background-color:#04BE02}.bg-danger,.bg-error{background-color:#f6383a}.bg-warning{background-color:#f60}.bg-success{background-color:#4cd964}.weui-toptips{z-index:100;opacity:0;-webkit-transition:opacity .3s;transition:opacity .3s}.weui-toptips.weui-toptips_visible{opacity:1}.weui-icon_toast{font-size:55px;color:#fff;margin-bottom:6px}.weui-toast--forbidden .weui-icon_toast{color:#f6383a}.weui-toast--text{min-height:initial;font-size:18px;padding:8px 16px;width:auto;top:40%}.weui-toast--text .weui-icon_toast{display:none}.weui-count{display:inline-block;height:25px;line-height:25px}.weui-count .weui-count__btn{height:21px;width:21px;line-height:21px;display:inline-block;position:relative;border:1px solid #04BE02;border-radius:50%;vertical-align:-6px}.weui-count .weui-count__btn:after,.weui-count .weui-count__btn:before{content:" ";position:absolute;height:1px;width:11px;background-color:#04BE02;left:50%;top:50%;margin-left:-5.5px}.weui-count .weui-count__btn:after{height:11px;width:1px;margin-top:-5.5px;margin-left:-1px}.weui-count .weui-count__decrease:after{display:none}.weui-count .weui-count__increase{background-color:#04BE02}.weui-count .weui-count__increase:after,.weui-count .weui-count__increase:before{background-color:#fff}.weui-count .weui-count__number{background-color:transparent;font-size:.8rem;border:0;width:1.3rem;text-align:center;color:#5f646e}.weui-panel .weui-media-box__title-after{color:#9b9b9b;font-size:.65rem;float:right}
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/css/mescroll.css b/pluss-wap-page/src/main/resources/static/resources/css/mescroll.css
new file mode 100644
index 0000000..a267244
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/css/mescroll.css
@@ -0,0 +1,216 @@
+/*
+ * mescroll -- 精致的下拉刷新和上拉加载js框架  ( a great JS framework for pull-refresh and pull-up-loading )
+ * version 1.1.6
+ * 2017-08-27
+ * https://github.com/mescroll/mescroll.git
+ * http://www.mescroll.com
+ * author: wenju < mescroll@qq.com > 文举
+ * 
+ * ----- mescroll的html结构解析 ----
+ * 
+   <div id="mescroll" class="mescroll">
+	
+		//下拉刷新区域 ( mescroll初始化之后自动创建 )
+		<div class="mescroll-downwarp">
+			<div class="downwarp-content">
+				<p class="downwarp-progress"></p> <p class="downwarp-tip">下拉刷新 </p>
+			</div>
+		</div>
+		
+		//界面的具体内容
+		//<div>界面内容</div>
+		//数据列表..
+		//<ul id="dataList" class="data-list">
+		//	<li>数据列表</li>
+		
+			//空布局 ( 列表无任何数据时, 自动创建显示 )
+			<div class="mescroll-empty">
+				<img class="empty-icon" src="../img/mescroll-empty.png"/>
+				<p class="empty-tip">暂无相关数据~</p>
+				 <p class="empty-btn">去逛逛 ></p> 
+			</div>
+			
+		//</ul>
+	
+		//上拉加载区域 ( mescroll初始化之后自动创建 )
+		<div class="mescroll-upwarp">
+			//加载中..
+			<p class="upwarp-progress mescroll-rotate"></p><p class="upwarp-tip">加载中..</p>
+			//无数据
+			<p class="upwarp-nodata">-- END --</p>
+		</div>
+		
+		//回到顶部按钮 ( 列表滚动到配置的距离时, 自动创建显示 )
+		<img class="mescroll-totop" src="../img/mescroll-totop.png"/>
+		
+	</div>
+ * 
+ */
+
+/*下拉刷新和上拉加载的滑动区域*/
+.mescroll {
+	width: 100%;
+	height: 100%;
+	overflow-y: auto;
+	-webkit-overflow-scrolling: touch;
+}
+
+/*启用硬件加速:动画渲染流畅,解决IOS下拉刷新因隐藏进度条致使的闪屏问题,在下拉刷新和上拉加载触发时启用,结束后移除,避免滥用导致其他兼容性问题*/
+.mescroll-hardware{
+	-webkit-transform: translateZ(0);
+	transform: translateZ(0);
+}
+
+/*下拉刷新区域*/
+.mescroll-downwarp{
+	position: relative;
+	width: 100%;
+	height: 0;
+	overflow: hidden;
+	text-align: center;
+}
+/*下拉刷新--高度重置的过渡动画*/
+.mescroll-downwarp-reset{
+	-webkit-transition: height 300ms;
+	transition: height 300ms;
+}
+/*下拉刷新--内容区,定位于区域底部*/
+.mescroll-downwarp .downwarp-content{
+	position: absolute;
+	left: 0;
+	bottom: 0;
+	width: 100%;
+	min-height: 30px;
+	padding: 10px 0;
+}
+
+/*上拉加载区域*/
+.mescroll-upwarp {
+	min-height: 30px;
+	padding: 15px 0;
+	text-align: center;
+	visibility: hidden;/*代替display: none,列表快速滑动到底部能及时显示上拉加载的区域*/
+}
+
+/*下拉刷新,上拉加载--提示文本*/
+.mescroll-downwarp .downwarp-tip,
+.mescroll-upwarp .upwarp-tip,
+.mescroll-upwarp .upwarp-nodata {
+	display: inline-block;
+	font-size: 12px;
+	color: gray;
+	vertical-align: middle;
+}
+
+/*下拉刷新,上拉加载--旋转进度条*/
+.mescroll-downwarp .downwarp-progress,
+.mescroll-upwarp .upwarp-progress {
+	display: inline-block;
+	width: 16px;
+	height: 16px;
+	border-radius: 50%;
+    border: 1px solid gray;
+    margin-right: 8px;
+    border-bottom-color: transparent;
+	vertical-align: middle;
+}
+
+/*旋转动画*/
+.mescroll-rotate{
+	-webkit-animation: mescrollRotate 0.6s linear infinite;
+	animation: mescrollRotate 0.6s linear infinite;
+}
+@-webkit-keyframes mescrollRotate {
+	0% { -webkit-transform: rotate(0deg); }
+	100% { -webkit-transform: rotate(360deg); }
+}
+@keyframes mescrollRotate {
+	0% { transform: rotate(0deg); }
+	100% { transform: rotate(360deg); }
+}
+
+/*无任何数据的空布局*/
+.mescroll-empty {
+	width: 100%;
+	padding-top: 20px;
+	text-align: center;
+}
+.mescroll-empty .empty-icon {
+	width: 45%;
+}
+.mescroll-empty .empty-tip {
+	margin-top: 6px;
+	font-size: 14px;
+	color: gray;
+}
+.mescroll-empty .empty-btn {
+	max-width: 50%;
+	margin: 20px auto;
+	padding: 10px;
+	border: 1px solid #65AADD;
+	border-radius: 6px;
+	background-color: white;
+	color: #65AADD;
+}
+.mescroll-empty .empty-btn:active {
+	opacity: .75;
+}
+
+/*回到顶部的按钮*/
+.mescroll-totop {
+	z-index: 9990;
+	position: fixed;
+	right: 10px;
+	bottom: 30px;
+	width: 36px;
+	height: 36px;
+	border-radius: 50%;
+	opacity: 0;
+}
+
+/*显示动画--淡入*/
+.mescroll-fade-in{
+	-webkit-animation: mescrollFadeIn .5s linear forwards;
+	animation: mescrollFadeIn .5s linear forwards;
+}
+@-webkit-keyframes mescrollFadeIn {
+	0% { opacity: 0; }
+	100% { opacity: 1; }
+}
+@keyframes mescrollFadeIn {
+	0% { opacity: 0; }
+	100% { opacity: 1; }
+}
+
+/*隐藏动画--淡出*/
+.mescroll-fade-out{
+	pointer-events: none;
+	-webkit-animation: mescrollFadeOut .5s linear forwards;
+	animation: mescrollFadeOut .5s linear forwards;
+}
+@-webkit-keyframes mescrollFadeOut {
+	0% { opacity: 1; }
+	100% { opacity: 0; }
+}
+@keyframes mescrollFadeOut {
+	0% { opacity: 1; }
+	100% { opacity: 0; }
+}
+
+/*滚动条轨道背景(默认在PC端设置)*/
+.mescroll-bar::-webkit-scrollbar-track{
+	background-color: transparent;
+}
+/*滚动条轨道宽度 (默认在PC端设置)*/
+.mescroll-bar::-webkit-scrollbar{
+	width: 6px;
+}
+/*滚动条游标 (默认在PC端设置)*/
+.mescroll-bar::-webkit-scrollbar-thumb{
+	border-radius: 6px;
+	background-color: #ccc;
+}
+/*滚动条游标鼠标经过的颜色变化 (默认在PC端设置)*/
+.mescroll-bar::-webkit-scrollbar-thumb:hover{
+	background-color: #aaa;
+}
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/css/mobileSelect.css b/pluss-wap-page/src/main/resources/static/resources/css/mobileSelect.css
new file mode 100644
index 0000000..6ca1730
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/css/mobileSelect.css
@@ -0,0 +1,150 @@
+.mobileSelect {
+  position: relative;
+  z-index: 0;
+  opacity: 0;
+  visibility: hidden;
+  -webkit-transition: opacity 0.4s, z-index 0.4s;
+  transition: opacity 0.4s, z-index 0.4s;
+}
+.mobileSelect * {
+  margin: 0;
+  padding: 0;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+}
+.mobileSelect .grayLayer {
+  position: fixed;
+  top: 0;
+  left: 0;
+  bottom: 0;
+  right: 0;
+  background: #eee;
+  background: rgba(0, 0, 0, 0.7);
+  z-index: 888;
+  display: block;
+}
+.mobileSelect .content {
+  width: 100%;
+  display: block;
+  position: fixed;
+  z-index: 889;
+  color: black;
+  -webkit-transition: all 0.4s;
+  transition: all 0.4s;
+  bottom: -350px;
+  left: 0;
+  background: white;
+}
+.mobileSelect .content .fixWidth {
+  width: 90%;
+  margin: 0 auto;
+  position: relative;
+}
+.mobileSelect .content .fixWidth:after {
+  content: ".";
+  display: block;
+  height: 0;
+  clear: both;
+  visibility: hidden;
+}
+.mobileSelect .content .btnBar {
+  border-bottom: 1px solid #DCDCDC;
+  font-size: 15px;
+  height: 45px;
+  position: relative;
+  text-align: center;
+  line-height: 45px;
+}
+.mobileSelect .content .btnBar .cancel,
+.mobileSelect .content .btnBar .ensure {
+  height: 45px;
+  width: 55px;
+  cursor: pointer;
+  position: absolute;
+  top: 0;
+}
+.mobileSelect .content .btnBar .cancel {
+  left: 0;
+  color: #666;
+}
+.mobileSelect .content .btnBar .ensure {
+  right: 0;
+  color: #1e83d3;
+}
+.mobileSelect .content .btnBar .title {
+  font-size: 15px;
+  padding: 0 15%;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+.mobileSelect .content .panel:after {
+  content: ".";
+  display: block;
+  height: 0;
+  clear: both;
+  visibility: hidden;
+}
+.mobileSelect .content .panel .wheels {
+  width: 100%;
+  height: 200px;
+  overflow: hidden;
+}
+.mobileSelect .content .panel .wheel {
+  position: relative;
+  z-index: 0;
+  float: left;
+  width: 50%;
+  height: 200px;
+  overflow: hidden;
+  -webkit-transition: width 0.3s ease;
+  transition: width 0.3s ease;
+}
+.mobileSelect .content .panel .wheel .selectContainer {
+  display: block;
+  text-align: center;
+  -webkit-transition: -webkit-transform 0.18s ease-out;
+  transition: -webkit-transform 0.18s ease-out;
+  transition: transform 0.18s ease-out;
+  transition: transform 0.18s ease-out, -webkit-transform 0.18s ease-out;
+}
+.mobileSelect .content .panel .wheel .selectContainer li {
+  font-size: 15px;
+  display: block;
+  height: 40px;
+  line-height: 40px;
+  cursor: pointer;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+.mobileSelect .content .panel .selectLine {
+  height: 40px;
+  width: 100%;
+  position: absolute;
+  top: 80px;
+  pointer-events: none;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+  border-top: 1px solid #DCDCDC;
+  border-bottom: 1px solid #DCDCDC;
+}
+.mobileSelect .content .panel .shadowMask {
+  position: absolute;
+  top: 0;
+  width: 100%;
+  height: 200px;
+  background: -webkit-gradient(linear, left top, left bottom, from(#ffffff), color-stop(rgba(255, 255, 255, 0)), to(#ffffff));
+  background: -webkit-linear-gradient(top, #ffffff, rgba(255, 255, 255, 0), #ffffff);
+  background: linear-gradient(to bottom, #ffffff, rgba(255, 255, 255, 0), #ffffff);
+  opacity: 0.9;
+  pointer-events: none;
+}
+.mobileSelect-show {
+  opacity: 1;
+  z-index: 10000;
+  visibility: visible;
+}
+.mobileSelect-show .content {
+  bottom: 0;
+}
diff --git a/pluss-wap-page/src/main/resources/static/resources/css/recharge.css b/pluss-wap-page/src/main/resources/static/resources/css/recharge.css
new file mode 100644
index 0000000..4968a76
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/css/recharge.css
@@ -0,0 +1,266 @@
+*{
+	padding: 0;
+	margin: 0;
+	box-sizing: border-box;
+}
+html{
+	width: 100%;
+	height: 100%;
+}
+body{
+	width: 100%;
+	height: 100%;
+	background-color: #f7f7f7;
+}
+.none{
+	display: none;
+}
+.flex-cc{
+	display: flex;
+	justify-content: center;
+	align-items: center;
+}
+.test{
+	border: 0.1rem solid green;
+}
+.container{
+	width: 100%;
+	height: 100%;
+}
+.cont{
+
+}
+.top{
+	width:100%;
+	height:18rem;
+	display: flex;
+	flex-wrap: wrap;
+	justify-content: center;
+	background-color:#ffffff;
+}
+.card{
+	width: 24.23rem;
+	height: 14.5rem;
+	display: flex;
+	align-items: flex-start;
+	flex-direction: column;
+	margin-top: 1.23rem;
+	padding: 1rem 1.5rem;
+	box-sizing: border-box;
+	color: #c9ada1;
+	background-image: url(data:image/jpg;base64,iVBORw0KGgoAAAANSUhEUgAAASwAAACzCAMAAAAE5NFlAAAA9lBMVEVCOTxHPD9WSktLQEFGOz5URURANzuNeGpEOTxEOj5YTExKPj9IPkByY19mWVdTREJMQUROREVaTUxVR0ZgU1JtXll5ZmBNQEFRQ0NsWVNzWU1+bmhYR0RcT055amSAcGpRRkdjVlNtVUxrW1iKdWhXSUdmVU9tYF5/bWVzXFN0ZWF5Y1tzX1hhTUhgUU13aGSCcm1TSElmUUp+amBeS0Z3X1WDcmtpU0tzYVt6bGeGd3FwV0yFdG5lTkheTUuGcmVaSkeUfnHOsp2kj4CxmYg+NDnZv6vKpIq7o5PCmX6phW58a2Tiy7e3jXGbhniUdGHw2caHaVo/diy3AAAACXBIWXMAAAsTAAALEwEAmpwYAAAFHGlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNS42LWMxNDIgNzkuMTYwOTI0LCAyMDE3LzA3LzEzLTAxOjA2OjM5ICAgICAgICAiPiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1sbnM6cGhvdG9zaG9wPSJodHRwOi8vbnMuYWRvYmUuY29tL3Bob3Rvc2hvcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RFdnQ9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZUV2ZW50IyIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOCAoV2luZG93cykiIHhtcDpDcmVhdGVEYXRlPSIyMDIwLTEwLTIyVDEzOjM2OjM4KzA4OjAwIiB4bXA6TW9kaWZ5RGF0ZT0iMjAyMC0xMC0yMlQxNDo1ODoxNiswODowMCIgeG1wOk1ldGFkYXRhRGF0ZT0iMjAyMC0xMC0yMlQxNDo1ODoxNiswODowMCIgZGM6Zm9ybWF0PSJpbWFnZS9wbmciIHBob3Rvc2hvcDpDb2xvck1vZGU9IjIiIHBob3Rvc2hvcDpJQ0NQcm9maWxlPSJzUkdCIElFQzYxOTY2LTIuMSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo5M2Y1ZjFlNy1jNGFkLTY0NDItYTRiOC03ZmYwNTI1OGQxMmQiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6OTNmNWYxZTctYzRhZC02NDQyLWE0YjgtN2ZmMDUyNThkMTJkIiB4bXBNTTpPcmlnaW5hbERvY3VtZW50SUQ9InhtcC5kaWQ6OTNmNWYxZTctYzRhZC02NDQyLWE0YjgtN2ZmMDUyNThkMTJkIj4gPHhtcE1NOkhpc3Rvcnk+IDxyZGY6U2VxPiA8cmRmOmxpIHN0RXZ0OmFjdGlvbj0iY3JlYXRlZCIgc3RFdnQ6aW5zdGFuY2VJRD0ieG1wLmlpZDo5M2Y1ZjFlNy1jNGFkLTY0NDItYTRiOC03ZmYwNTI1OGQxMmQiIHN0RXZ0OndoZW49IjIwMjAtMTAtMjJUMTM6MzY6MzgrMDg6MDAiIHN0RXZ0OnNvZnR3YXJlQWdlbnQ9IkFkb2JlIFBob3Rvc2hvcCBDQyAyMDE4IChXaW5kb3dzKSIvPiA8L3JkZjpTZXE+IDwveG1wTU06SGlzdG9yeT4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz7qem09AAAS3ElEQVR4nO1d6XPjRnb/4SAOgqQI3hLF0Uhzae4rXntnveu1vSk7+ZDkP00lH5JKJbsbp7LeTcWOy+PxNWONrtFBSSTBA8IN5ANICiBASjNjcWDCvw8S0N1QPf2q+/Xr169fAz/jrBCJNy3BTweFRWpMze/MXz+dqihRB3+19pwOr7pmb12ZrjARx33HeSINyHrvL7666+0PwE5fpIgit1cUHhtK/40u+GvfLeAfpi1RhJF8/x4JAG7PuvHYX1s4EutTFymq4Jbyu7o9fJ0fqb6WwQfZqQoUYfDpewXepYgGgOZI/dL3GUjTFiqiEFexd+SlaESV3yDx8d0pyxRVFH6RoYE+RWRIgxUb9JdTFSmq4C8sPumY/jJ/z3o3hao4RYmii8xSOtV/HNOziGwPN1vTlCmiIO6mZaMXKPb1rI+BwodTkyi6uLiU9iycw3vWfR249/vpyRRVZEq24YyUBdaG2T8A3JQEijCu9fa2A4WjZIkUcO3FdASKLnI8V5fG1Hl01ocAPp6COFEGl14qjHYiFgA/UlgigJQ+LamiiawwtykHSun5NDNC1q3/AOb+MCWpookCy6wrvhLOdMR7x7KR9JP14ZcAbu5MUbSoIZXkOt7/nzc4UXpAfpn8vVPV/GQRR0DBmq54UQLPlXc66vCVtrKUULPa30j8vzkZ2u9Wfv8AwO3YGlmcupDY7Z0YVxdZpUJ9TWwTJhQ2JbYcH1nUYwDx3e/RSl1L73PFJY1MqXH81DQ33IJq7sBnZ334GYB3vpqyiJHBHV3bNgHQuP2Cr+xTrf/lThT9o9ae4iPLlgBkD6csY0TA35XqLQA8TzEHmb2GRqs44YqglA2fBf+7zwCM20ecdYgrvU1HKBJyrmlLGq0CPjdWGlvoayhWG/4sNc3gX5p5EDfZg+2amoex7nBKsF68mfgj+j2JtgB89BQA3l6bppARQeIeLVXKO1Rzt+UgpLMIy/JjC95heOQA+HhjWgJGCIWl7RKeHSvdcQ3I9J+Y4QsL4CMCAD44f9EiB75UrExskL13yfU1DHrWwyMHAP/knAWLIoTaQdB15UVmrd/n+p5SovQ5APzy+FzFiiYqCXWit7NADFjpk/V3/+q+Bf3zM4/KwZMLkywASrAHq2WXLMEAAGT2z1euSILI9pCeUH856x+k7N+7vz86P5EiC/5hAvNXx9fXlijAu7vzyO1Y+OK8JYsg+F0TWm6s0iLs1onLigSA1L8AAN6PY/gayznQjLFKK08bJy8kgEq/KTN5Bp1J8JYEWEiNqaYWbc/qhwTwoO90j+MovEIZgCrR4bG1XFL3diDybSwm3Me/GQ3TigPsYg+AfjlcaVWuf+t9JY9/Zf+T+0jH0N/wG2wBQNMIHYdJ5wffDj49dIy+t3m+ckUSjaYKADYSIZV0wfQPtpPAEO7xaOPZB3WoqwDg7I5uoALgatVdf8kJWUfnK1ckUcq6+16q1g0qLb64NxJGMyTrb9fPV65IYqnRtzjbwXAi5PY3RkoGZFFWDOfCSlfr76gSxcDykMwHduYHZN2L4569NYyCTBybvL+OWPwusDU/IKsUQ7cfX+oMHhXFUv2V6WRntP2ArPlgjM3s463myZmbNua8VVx2NeQ8DrkIALj/X+crVyTR1E5mO8WvtNSl9ZCAbfqt++RXO7GMbyij7Xk7ZjwrGO6qFBbcTv8jVu5eIz4/d9Gih7lGwqPCO5TnpaLbY9d+cfRjAbd+433jHwonzzcujDZmQ55ihPwtf1xHKTd8vFMNhHyMPegUDzC6345S2YGlJTT2wqMfY0sWkW34CxILfQcyR9bsYHvAGxgSM+TM7ogOT8ouW3bhWZAs2kJ8exZfLo6EFilNV3UTV/fGzYRj8jrMPHjqYLRIIBUFQKE5ZhDGt2exDWm0aLNrAEgxybEfxZQsPndFHS1jcxzAEfrG5E/jZ2fdmQ8Jni2RQG6VD1Yg3nYWq4UYANQy6JIaElI6QDwVfEVph5TqcxB3jJCKAeLZswg9zLJsYj7fC6gyD2JJFr3YCCvmmnNPR49F+xBLspZ7UlixguxErgqxJKtnha7v8rmw0iFSi3EkS8iG7pHyFw+kSfPdBSeOZD2UQkdb6mmzuTj+KzK3FUeyDq+ErZTzeQfU0dh4Sbr2uBVDskTp+7BiiumhXh3rek+ax3GcDWsIS9F3SXkGEGPP8T5a2TNjSJYQGrhGZY8VgG8sjhmH1JodRztLx26wkL+uMQBkpxc+Di9CRhzJWpZCQhVq7LoCwGnlQy0wft6xEUOyBCpkFFLpdZdBxh/yMPxI+W8ghmTpeBYsXN3sH/xSdsLM0sKim/cpbmQJD0Kce3cO5YGzwT0u7gfPNt0Y0riRdb0TjNojEo2hx69VDX6zMMhSGjeyZCloZL29exLYbSM7Wn0xvdcPEIwZWRSCmdtF4+DE48ftBGJCGsO9sZi5lW/I/xcoWzjwmguFvZHqi87QBR2vnkWbFwIHm6/6TgAorbzfhk/Nt6Th5+cmWBRBSIG7JlLpx749irbg3yQrbp1k9YtXz3qQDhjoF5v+/Ryu47MtRHvvRKHFiiziMJCK4TcHIzEPSsFrafElb+RDrMh6GDiglJfnRleKPktL4L17rnEii6eyI7uCXGU3cNS53T1RWqmVF14vRJzIyhyOOmd+0T9C5wWl3xw8cmLd1xXjRNZ1ZSTJB/8dGdxtpZ3h3k9x3r85FiOy+K3Rdd8lSgo2U81ByDdl9/xn7GMUU1pIrfmthCtUPSxkhpJsAwC4C9mT018xiynlipp/4uMZPfR4l6a7llYlP3pqPD5k0fJIgu3sQXgqd9MpAQCfXJdGauJDlsb6uUnkzDFxa3QPACfIgSSksSGLXx3xgRaMcbeaHCIF0MkgNbEhy2z4rYRcPsQX78LmRR5FKxg9Ehuvw23FZ5FWCrtjY7FYPWmIdojyj0vPEvb9txLmG+PTG6pOy7zAScGKuPSst4w/e1+v2p0JwaPbtxwpLNlMTMjiOr58YlTi6aSo5ASfDE3HHROysvu+RcpVahJX0CQ+dJDGRGetLnt3wBLk1xNb55TQe5roeJDFb3kzWvCXw8M/BiAWj7vZkPJL8RiGGdXbsWr4dGLrtNEKOxnG9+LRs2qcx2oqJ1oTc9BlxU2zlw2Ow0I8hiHhdR7zpDEx0S/NtGQ4lSCfi61Y+LMSgudc0yN7bexRVQC4xewAnDMn+UppSzxOxUFncTc8kZGCcjBxEKYaxwAIKVBhdrpxGIbU/kmYEVF9EXrI6aSB3gLgmKPJx4gMGws7S/TEct+fCxwk97etKgCgstURDb+IWIR289X88Fmgws84DfFIcyNHjP2RCMEcJ8VhuUNuD718fEabmGCUzu73Z0or4Sf10XMiFsudlZObdG5mv5nY9Hbheb+t0lr21ZDORhzIok9cpIJsTpwJCWV32AnbrHccZoljxIEs4SQBWzUz1pUMANxtTxQ8v1H2VNHxOGEhXBqq98W5yc4G9RsIq4Ora9W0N3Gr5iiIAVn0/sBW4KrWKZe/mEZTI3NufEOi7TmoKWZsIAZk3RkaWe90Jmt3AI3clm7T1QIPKE3PsRXL9VPM+tpQKJc2+k909/SMyJ2s3CGSD2WGMOYMcuCmv5h3uhZmn6xy61t32UzfTH57SlvApN7l9vXOrp2vzXWTww0eq/gd7b+FbiZBV63+GvoOdZb0ournWQCyLBvC6nAWTWX6xteM96xitx/LXU6Iz8/ygcot1QGYDtnoVQqWwplAhm6pcehZJdndd+YF+j/P9IG50/coK1AIRVw5POzRSarvtZjt2ZDO9MOM3lZ/OOMnTGOwzuFFduuZdS+TFQdm/WyTlV93lzpEfWFCWiwfFONG/8ncy6PV2EyvqlK/ZLZ11orj7iz/VfrLM9+TY1KOu8NqlspHptFRWK7ep2imySKohgEAZXnzrB0LsI1SP547d0ApgN3KGWoMYkozkAGAv5x/mbsB1IHWOhKLAJDsDWbBWe5Z3K3ULgC8u/ZS9z2bDOWGK+sG0QWgO/OHsz8MLfspAAiy9XKXThBitm0DQImSbQCCuLA/88PwYc0BwJfzYblnJkBp9NwlEtWcB4BOsm93zHDP4mipAyBv1/VT2/pBmCv9+CxNA2Dnre6sD0OWbppAhSJf+mIvM0kYBgDVyHcBIEkQ5mwvd+gH+i6AJfpPL/+tQojHAJBxX1uWJ1PUTKYLLi+UAfx24dVufrmbA4DUDXelmPnljKcLLqENCE/lidk0x4FrX+YAmC9qAIBLu4+AGSaLyFxVgWuVsLzAp0Ot9xgAKu065J81SWCGySrjE2Bu/3TvaDiU41UAyGzRANBzx/KsksUtdRwQgnz2NeEI6t8WAWx3XB3fI7KYXbK07edAFa82CAFAkZcBECXXW5FBGrNLVpWTQdivYz+S32YAU88CACQkMbNk8YwOLL/sOscHU17lgJ7lxmklc5hZskj1CHPqV6c3nADn2yVAn3MZ6u4kx1nwzHsAgH8/ef/kPeCTl11jvTmsJHcr5MQ429PhXG6StnU4vwYAn65K49aGjLz9fXNvbzCVMEvP2cSf10GU5SxhZbnX0gXTAO+07GRlYsjMGSAV2K6ZpNoAQHeXO2b4MLRMM2maZhkAGAZks9N5QoEsGiQMdF9Thilgbrl+mXtVE2sINUkncVx1bawctDE9y7Io3gRMxwIsC5YBIEOockZwHm1AdxIR71r32x20TwmZOQPq4uUXqcTiPgC6TealMLIYC6S7Y+1uczBZlmXZ3D4Ex8FTLnUsjt6XwZ1572QqoPXNt1Mv5UoeA9MyjMyWBoA2Fup6GFkWYJk0ANAGAFhJAKjTlC0r0ND76ycURVHeazmjxRXSGfV488eQSU/c2MjkDwHQVqtMhM2GjA64M4lo6ADc+zcpioEAGbj4mQgAsBgL0Zwf8/rcq69zfFCUmtPjVAAgCTJEwTM6AN0EgLoIgFkAAMdOFQrtgs7pnXa73dY0zdFoiwE4juP40MOMbwqCusy9+jrHB3lrUeKvAwBMwRzrKTVoAFAZvd97Wg4ArDEqAw64BnzJqSoSOtyIr0l3+0wbK7L9Oqa7Bzxa7fJu333YXQ4hyyVHzykA0gpQbgJwEvow44bK4TsFDAsVxSjebC6rm68kFq9SKHBdKMk0QHZy2BVbV+cUkXAIWga2yfE++GapC9STOpNpAkjoHAbzCweAUykDgLjxKlKdLypq7X9Ob8WZAJs2gCSdMBKtMlLPcSmF55UmBFUHiloDrGM9u+uIm8T87q/lr7sLEzYsuq7loANA7oVfKSkM8+4rbARMA/SVtY1AIW8kDE4A0LyI5m0b66LaTXNq16iAQQO9Eup1ZPbTsJ/muosbEoWdvmL5okZIMAgHN5sKAYTn9QbK6jFQvv6pngFuf0qCbwOgSTUncQDAqVCzPZ1TPTSq4N648qpc0j4DuDkASACoaMjKUlaQE4dZ9Lp8Su0iDYDLAk8YQOswwIS5k7u23gFYLUvPTSCLKdUBMGI9g9wPLMAVsQaatFNSnx5uqb+i6PP1xnkCAKyoFQiQshKrZXcEIAEDYPcBfiMH9DSacF5O0BrZllyKJgxD13rQ6wCaCRUwigCgMoDKaQCR6H09MLOiQZOLRlrQ1wC5um4+1/yWaR14BQP6qFiW3KdJO9J62Z1U2NwOZQEltslX2xbFqKBJw7HNU47uvSFona2mnlBoYj5vL1VJ3npdU95c6WY6pwbg6kP/QsJrqavA2Lt8ogEFMtr7bErVKyXpMvZyz047iDIRX9zoWyITYx10175njQ4AqA6g6BZFmjDpiK0GQ2AbstZpvtB7u4u8qKXvFKv25AN047GoOJaFfhcJV/AAwwPg4cYagiJRbcs6c7MFhOasjCyE9KqlA4dFw/jOJl6BsUz6SMMpZAEAFwVz4McAnW/+qpNoiR0pze5qLzcsU7eL/4xJw5BxC03f/MFEUqefCbZsb+ztqMc7d03NKleoBYczz+ql1xPpPXMSWQWLpkmOAsNSFgSaZg3BoG3WYjiDAMCbBIho6/kwGLK9WW/zanu1l7RrJXrB0c8SOWIu7msTFbxiJgjSIU09QZkOZZs2Y7AULMuxU0iQFk3YNPty4z8qDlVb7imbjbasy6s960LNyohKcrJnTl/umubpOutHRBR1H0+qxYOlRILDtjrX1cbOW+yDZ0dTJSu64FWB7pRNIoedQp20QtZDbFpouxsWpdffCPlpw4SuOlaHqAumfAHpd0iiZFK015gsHaRyDQoAend+JM/iTxomdEdSErLQ3TBK7dVMl2eGNtmdNRSK++59DY1b49j6CdsKrwZdlRTClu010zKXa05NMwQdd76xoenOYPJ/7y8A8M7pfyx4idtZsF0LXKwRfTwCQAIEkn8kejbI2k/PUpouOJOjs1bbyYloLv5M1plAc0qGEH8m68wIuXLzZ4zH/wPIeJopCfvdJwAAAABJRU5ErkJggg==);
+	background-size:100% 100%;
+	background-repeat:no-repeat;
+}
+.shopName{
+	font-size: 1.3rem;
+}
+.shopDes{
+	margin-top: 0.2rem;
+	font-size: 1.1rem;
+}
+.shopAct{
+	margin-top: 0.2rem;
+	display: flex;
+	align-items: center;
+}
+.icon-dian{
+	font-size:1.5rem !important;
+	position: relative;
+	top: 0.1rem;
+}
+.uInfo{
+	width: 100%;
+	height: 2rem;
+	display: flex;
+	flex: 1;
+	justify-content: space-between;
+	align-items: flex-end;
+}
+.uInfo-lef{
+	display: flex;
+	flex-direction: column-reverse;
+}
+.uInfo-rig{
+
+}
+.curNum{
+	font-size: 1.5rem;
+}
+.curBalance{
+	display: flex;
+	font-size: 1.3rem;
+}
+.curNum{
+	font-weight: bold;
+}
+.mid{
+	width:100%;
+	height:22rem;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	margin-top: 0.5rem;
+	background-color:#ffffff;
+}
+.rechargeNum-box{
+	width: 24.23rem;
+	height: 4rem;
+	font-size: 1.2rem;
+	display: flex;
+	align-items: center;
+	border-bottom: 0.1rem solid #ccc;
+}
+.rn-des{
+	font-size: 1.8rem;
+	margin-right:0.5rem;
+}
+.rechargeNum-input{
+	width: 20rem;
+	font-size: 1.5rem;
+	border: none;
+	position: relative;
+	top: 0.1rem;
+	text-align: right;
+}
+
+.rechargeNum-input::-webkit-input-placeholder{
+	/* text-align: right; */
+}
+:focus{
+	outline: none;
+}
+.choseCard-box{
+	width:24.23rem;
+	/*height:8rem;*/
+	display: flex;
+	/*flex-direction: column;*/
+	/*justify-content: space-between;*/
+	flex-wrap: wrap;
+	margin: 1rem 0 0 1rem;
+}
+.choseCard{
+	width: 7rem;
+	height: 3.5rem;
+	margin-right: 0.8rem;
+	position: relative;
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+	align-items: center;
+	border: 0.1rem solid #ccc;
+	border-radius: 0.5rem;
+}
+.choseCard-line1{
+	width: 100%;
+	display: flex;
+	justify-content: space-between;
+}
+.choseCard-line2{
+	width: 100%;
+	display: flex;
+}
+.choseCard-line2 .choseCard{
+	/* margin-right: 0.8rem; */
+}
+.cardNum{
+	font-weight: bold;
+}
+.cardNumA{
+	color:red;
+	font-weight: bold;
+	font-size: 0.8rem;
+}
+.cardActive{
+	border-color:#ef6980;
+}
+.recharge-button{
+	width: 24.23rem;
+	height: 3rem;
+	margin-top: .5rem;
+	background-color:#f33c5b;
+	color: #F7F7F7;
+	border-radius:0.5rem;
+}
+.recharge-button:active{
+	background-color: #a74253;
+}
+.banlanceRecord-item{
+	display: flex;
+	flex-wrap:wrap ;
+	align-items: center;
+	position: relative;
+	height: 4rem;
+	padding: 0rem 1.4rem;
+	border-bottom:0.1rem solid #ccc ;
+}
+.bot-title{
+	position: relative;
+	top: -0.3rem;
+	font-size: 1.1rem;
+}
+.bi-des{
+	width: 100%;
+	color: #5c5c5c;
+}
+.bi-Num{
+	position: absolute;
+	right:1.4rem;
+	bottom:0.3rem;
+	color: #979797;
+}
+.bi-time{
+	position: relative;
+	top: -0.3rem;
+	font-size: 0.8rem;
+	color: #9b9b9b;
+}
+.sel-icon{
+	color:#f33c5b;
+	position: absolute;
+	right: 0.1rem;
+	bottom: 0.1rem;
+}
+@keyframes turn {
+	0% {
+		-webkit-transform: rotate(0deg);
+	}
+	25% {
+		-webkit-transform: rotate(90deg);
+	}
+	50% {
+		-webkit-transform: rotate(180deg);
+	}
+	75% {
+		-webkit-transform: rotate(270deg);
+	}
+	100% {
+		-webkit-transform: rotate(360deg);
+	}
+}
+.recharge-loading{
+	color:#FFFFFF;
+	font-size:1.5rem !important;
+	animation: turn 2.5s linear infinite;
+}
+.weui-mask {
+	background: rgb(0 0 0 / 19%) !important;
+}
+.weui-dialog__btn.primary{
+	color: #e85353 !important;
+}
+@media only screen and (min-width: 400px) {
+	html {
+		font-size: 1rem !important;
+	}
+}
+@media only screen and (min-width: 414px) {
+	html {
+		font-size: 1rem !important;
+	}
+}
+@media only screen and (min-width: 480px) {
+	html {
+		font-size: 1rem !important;
+	}
+}
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/css/reset.css b/pluss-wap-page/src/main/resources/static/resources/css/reset.css
new file mode 100644
index 0000000..8f66588
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/css/reset.css
@@ -0,0 +1,392 @@
+html {
+    -ms-text-size-adjust:none;
+    -webkit-text-size-adjust:none;
+     font-size:100px;
+     box-sizing: border-box;
+}
+body {
+     font-family: "Helvetica Neue", Helvetica, STHeiTi, Arial, sans-serif;
+    margin: 0;
+    padding:0;
+    color: #333333;
+    background-color: white;
+    font-size:0.3rem;
+    overflow-x: hidden;
+    -webkit-overflow-scrolling: touch;
+    overflow-y:auto;
+}
+
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+main,
+nav,
+section,
+summary {
+    display: block;
+}
+
+audio,
+canvas,
+progress,
+video {
+    display: inline-block;
+    vertical-align: baseline;
+}
+
+audio:not([controls]) {
+    display: none;
+    height: 0;
+}
+
+[hidden],
+template {
+    display: none;
+}
+
+svg:not(:root) {
+    overflow: hidden;
+}
+
+a {
+    background: transparent;
+    text-decoration: none;
+    -webkit-tap-highlight-color: transparent;
+    color: #333;
+    display:block;
+}
+li{
+    list-style-type:none;
+}
+.red{
+    color:#f00;
+}
+a:active {
+    outline: 0;
+}
+
+a:active {
+    color: #333;
+}
+
+abbr[title] {
+    border-bottom: 1px dotted;
+}
+
+b,
+strong {
+    font-weight: bold;
+}
+
+dfn {
+    font-style: italic;
+}
+
+mark {
+    background: #ff0;
+    color: #000;
+}
+
+small {
+    font-size: 80%;
+}
+
+sub,
+sup {
+    font-size: 75%;
+    line-height: 0;
+    position: relative;
+    vertical-align: baseline;
+}
+
+sup {
+    top: -0.5em;
+}
+
+sub {
+    bottom: -0.25em;
+}
+
+img {
+    border: 0;
+    vertical-align: middle;
+}
+
+hr {
+    -moz-box-sizing: content-box;
+    box-sizing: content-box;
+    height: 0;
+}
+
+pre {
+    overflow: auto;
+    white-space: pre;
+    white-space: pre-wrap;
+    word-wrap: break-word;
+}
+
+code,
+kbd,
+pre,
+samp {
+    font-family: monospace, monospace;
+    font-size: 1em;
+}
+
+button,
+input,
+optgroup,
+select,
+textarea {
+    color: inherit;
+    font: inherit;
+    margin: 0;
+}
+
+button {
+    overflow: visible;
+}
+
+button,
+select {
+    text-transform: none;
+}
+div{
+    text-align:center;
+}
+button,
+html input[type="button"],
+input[type="reset"],
+input[type="submit"] {
+    -webkit-appearance: button;
+    cursor: pointer;
+}
+
+button[disabled],
+html input[disabled] {
+    cursor: default;
+}
+
+button::-moz-focus-inner,
+input::-moz-focus-inner {
+    border: 0;
+    padding: 0;
+}
+
+input {
+    line-height: normal;
+}
+
+input[type="checkbox"],
+input[type="radio"] {
+    box-sizing: border-box;
+    padding: 0;
+}
+
+input[type="number"]::-webkit-inner-spin-button,
+input[type="number"]::-webkit-outer-spin-button {
+    height: auto;
+}
+
+input[type="search"] {
+    -webkit-appearance: textfield;
+    -moz-box-sizing: border-box;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+}
+
+input[type="search"]::-webkit-search-cancel-button,
+input[type="search"]::-webkit-search-decoration {
+    -webkit-appearance: none;
+}
+
+fieldset {
+    border: 1px solid #c0c0c0;
+    margin: 0 2px;
+    padding: 0.35em 0.625em 0.75em;
+}
+
+legend {
+    border: 0;
+    padding: 0;
+}
+
+textarea {
+    overflow: auto;
+    resize: vertical;
+}
+
+optgroup {
+    font-weight: bold;
+}
+
+table {
+    border-collapse: collapse;
+    border-spacing: 0;
+}
+
+td,
+th {
+    padding: 0;
+}
+
+html,
+button,
+input,
+select,
+textarea {
+    font-family: "Helvetica Neue", Helvetica, STHeiTi, Arial, sans-serif;
+}
+
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+p,
+figure,
+form,
+blockquote {
+    margin: 0;
+}
+
+ul,
+ol,
+li,
+dl,
+dd {
+    margin: 0;
+    padding: 0;
+}
+
+ul,
+ol {
+    list-style: none outside none;
+}
+
+h1,
+h2,
+h3 {
+    font-weight: normal;
+}
+.fl{
+    float: left;
+}
+.fr{
+    float: right;
+}
+.mar1{
+    margin:0.2rem 0.1rem;
+}
+.pad1{
+    padding:0.1rem;
+}
+.textl{
+    text-align: left;
+}
+.textr{
+    text-align: right;
+}
+input::-moz-placeholder,
+textarea::-moz-placeholder {
+    color: #cccccc;
+}
+
+input:-ms-input-placeholder,
+textarea:-ms-input-placeholder {
+    color: #cccccc;
+}
+
+input::-webkit-input-placeholder,
+textarea::-webkit-input-placeholder {
+    color: #cccccc;
+}
+
+* {
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
+}
+
+
+/* 隐藏文字 */
+
+.offScreen {
+    left: -9999px;
+    position: absolute;
+}
+
+::-webkit-input-placeholder {
+    /* WebKit browsers */
+    color: #999;
+}
+
+:-moz-placeholder {
+    /* Mozilla Firefox 4 to 18 */
+    color: #999;
+}
+
+::-moz-placeholder {
+    /* Mozilla Firefox 19+ */
+    color: #999;
+}
+
+:-ms-input-placeholder {
+    /* Internet Explorer 10+ */
+    color: #999;
+}
+    a,
+    button,
+    input,
+    div {
+        -webkit-tap-highlight-color: rgba(255, 0, 0, 0);
+        -webkit-overflow-scrolling: touch;
+    }
+.clearfix:after {
+	content: "\200B";
+	display: block;
+	height: 0;
+	clear: both;
+}
+.positionr{
+	position:relative;
+}
+.positiona{
+	position:absolute;
+}
+.red{
+	color:#df6051;
+}
+.fw800{
+	font-weight:800;
+}
+/* reset 部分样式重置 end ======================================= */
+
+
+
+ .payBox{
+ 	top:0;
+ 	left:0;
+ 	right:0;
+ 	bottom:0;
+ 	position: fixed;
+ 	background:rgba(0,0,0,0.4);
+ 	 z-index: 3;
+ }
+ .payBox>div{
+    background-color:white;
+    position: absolute;
+    height: 4.2rem;
+    top:22%;
+    margin-right: 0.6rem;
+    margin-left: 0.6rem;
+    border-radius: 0.08rem;
+    /*border: 1rem solid #EEEEEE;
+    border-radius: 10rem;*/
+} 
diff --git a/pluss-wap-page/src/main/resources/static/resources/css/weui.css b/pluss-wap-page/src/main/resources/static/resources/css/weui.css
new file mode 100644
index 0000000..6edb73d
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/css/weui.css
@@ -0,0 +1,2972 @@
+/*!
+ * WeUI v1.1.3 (https://github.com/weui/weui)
+ */
+html{
+  -ms-text-size-adjust:100%;
+  -webkit-text-size-adjust:100%;
+}
+body{
+  font-family:-apple-system-font, "Helvetica Neue", sans-serif;
+   color:#999999;
+   background-size:#f0f0f0;
+}
+*{
+  margin:0;
+  padding:0;
+}
+a img{
+  border:0;
+}
+a{
+  text-decoration:none;
+  -webkit-tap-highlight-color:rgba(0, 0, 0, 0);
+}
+li{
+	list-style-type:none;
+}
+input{
+	outline:none;
+	border:none;
+	background:none;
+}
+@font-face{
+  font-weight:normal;
+  font-style:normal;
+  font-family:"weui";
+  src:url('data:application/octet-stream;base64,AAEAAAALAIAAAwAwR1NVQrD+s+0AAAE4AAAAQk9TLzJAKEx+AAABfAAAAFZjbWFw65cFHQAAAhwAAAJQZ2x5ZvCRR/EAAASUAAAKtGhlYWQMPROtAAAA4AAAADZoaGVhCCwD+gAAALwAAAAkaG10eEJo//8AAAHUAAAASGxvY2EYqhW4AAAEbAAAACZtYXhwASEAVQAAARgAAAAgbmFtZeNcHtgAAA9IAAAB5nBvc3T6bLhLAAARMAAAAOYAAQAAA+gAAABaA+j/////A+kAAQAAAAAAAAAAAAAAAAAAABIAAQAAAAEAACbZbxtfDzz1AAsD6AAAAADUm2dvAAAAANSbZ2///wAAA+kD6gAAAAgAAgAAAAAAAAABAAAAEgBJAAUAAAAAAAIAAAAKAAoAAAD/AAAAAAAAAAEAAAAKAB4ALAABREZMVAAIAAQAAAAAAAAAAQAAAAFsaWdhAAgAAAABAAAAAQAEAAQAAAABAAgAAQAGAAAAAQAAAAAAAQOwAZAABQAIAnoCvAAAAIwCegK8AAAB4AAxAQIAAAIABQMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUGZFZABA6gHqEQPoAAAAWgPqAAAAAAABAAAAAAAAAAAAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+j//wPoAAAD6AAAAAAABQAAAAMAAAAsAAAABAAAAXQAAQAAAAAAbgADAAEAAAAsAAMACgAAAXQABABCAAAABAAEAAEAAOoR//8AAOoB//8AAAABAAQAAAABAAIAAwAEAAUABgAHAAgACQAKAAsADAANAA4ADwAQABEAAAEGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAANwAAAAAAAAAEQAA6gEAAOoBAAAAAQAA6gIAAOoCAAAAAgAA6gMAAOoDAAAAAwAA6gQAAOoEAAAABAAA6gUAAOoFAAAABQAA6gYAAOoGAAAABgAA6gcAAOoHAAAABwAA6ggAAOoIAAAACAAA6gkAAOoJAAAACQAA6goAAOoKAAAACgAA6gsAAOoLAAAACwAA6gwAAOoMAAAADAAA6g0AAOoNAAAADQAA6g4AAOoOAAAADgAA6g8AAOoPAAAADwAA6hAAAOoQAAAAEAAA6hEAAOoRAAAAEQAAAAAARgCMANIBJAF4AcQCMgJgAqgC/ANIA6YD/gROBKAE9AVaAAAAAgAAAAADrwOtABQAKQAAASIHBgcGFBcWFxYyNzY3NjQnJicmAyInJicmNDc2NzYyFxYXFhQHBgcGAfV4Z2Q7PDw7ZGfwZmQ7PDw7ZGZ4bl5bNjc3Nlte215bNjc3NlteA608O2Rn8GdjOzw8O2Nn8GdkOzz8rzc1W17bXlw1Nzc1XF7bXls1NwAAAAACAAAAAAOzA7MAFwAtAAABIgcGBwYVFBcWFxYzMjc2NzY1NCcmJyYTBwYiLwEmNjsBETQ2OwEyFhURMzIWAe52Z2Q7PT07ZGd2fGpmOz4+O2ZpIXYOKA52Dg0XXQsHJgcLXRcNA7M+O2ZqfHZnZDs9PTtkZ3Z9aWY7Pv3wmhISmhIaARcICwsI/ukaAAMAAAAAA+UD5QAXACMALAAAASIHBgcGFRQXFhcWMzI3Njc2NTQnJicmAxQrASI1AzQ7ATIHJyImNDYyFhQGAe6Ecm9BRERBb3KEiXZxQkREQnF1aQIxAwgCQgMBIxIZGSQZGQPkREJxdomEcm9BRERBb3KEinVxQkT9HQICAWICAjEZIxkZIxkAAAAAAgAAAAADsQPkABkALgAAAQYHBgc2BREUFxYXFhc2NzY3NjURJBcmJyYTAQYvASY/ATYyHwEWNjclNjIfARYB9VVVQk+v/tFHPmxebGxdbT1I/tGvT0JVo/7VBASKAwMSAQUBcQEFAgESAgUBEQQD4xMYEhk3YP6sjnVlSD8cHD9IZXWOAVRgNxkSGP62/tkDA48EBBkCAVYCAQHlAQIQBAAAAAADAAAAAAOxA+QAGwAqADMAAAEGBwYHBgcGNxEUFxYXFhc2NzY3NjURJBcmJyYHMzIWFQMUBisBIicDNDYTIiY0NjIWFAYB9UFBODssO38gRz5sXmxsXW09SP7YqFBBVW80BAYMAwImBQELBh4PFhYeFRUD5A8SDhIOEikK/q2PdWRJPh0dPklkdY8BU141GRIY/AYE/sYCAwUBOgQG/kAVHxUVHxUAAAACAAAAAAPkA+QAFwAtAAABIgcGBwYVFBcWFxYzMjc2NzY1NCcmJyYTAQYiLwEmPwE2Mh8BFjI3ATYyHwEWAe6Ecm9BQ0NCbnODiXVxQkREQnF1kf6gAQUBowMDFgEFAYUCBQEBQwIFARUEA+NEQnF1iYNzbkJDQ0FvcoSJdXFCRP6j/qUBAagEBR4CAWYBAQENAgIVBAAAAAQAAAAAA68DrQAUACkAPwBDAAABIgcGBwYUFxYXFjI3Njc2NCcmJyYDIicmJyY0NzY3NjIXFhcWFAcGBwYTBQ4BLwEmBg8BBhYfARYyNwE+ASYiFzAfAQH1eGdkOzw8O2Rn8GZkOzw8O2RmeG5eWzY3NzZbXtteWzY3NzZbXmn+9gYSBmAGDwUDBQEGfQUQBgElBQELEBUBAQOtPDtkZ/BnYzs8PDtjZ/BnZDs8/K83NVte215cNTc3NVxe215bNTcCJt0FAQVJBQIGBAcRBoAGBQEhBQ8LBAEBAAABAAAAAAO7AzoAFwAAEy4BPwE+AR8BFjY3ATYWFycWFAcBBiInPQoGBwUHGgzLDCELAh0LHwsNCgr9uQoeCgGzCyEOCw0HCZMJAQoBvgkCCg0LHQv9sQsKAAAAAAIAAAAAA+UD5gAXACwAAAEiBwYHBhUUFxYXFjMyNzY3NjU0JyYnJhMHBi8BJicmNRM0NjsBMhYVExceAQHvhHJvQUNDQm5zg4l1cUJEREJxdVcQAwT6AwIEEAMCKwIDDsUCAQPlREJxdYmDc25CQ0NBb3KEiXVxQkT9VhwEAncCAgMGAXoCAwMC/q2FAgQAAAQAAAAAA68DrQADABgALQAzAAABMB8BAyIHBgcGFBcWFxYyNzY3NjQnJicmAyInJicmNDc2NzYyFxYXFhQHBgcGAyMVMzUjAuUBAfJ4Z2Q7PDw7ZGfwZmQ7PDw7ZGZ4bl5bNjc3Nlte215bNjc3NltemyT92QKDAQEBLDw7ZGfwZ2M7PDw7Y2fwZ2Q7PPyvNzVbXtteXDU3NzVcXtteWzU3AjH9JAAAAAMAAAAAA+QD5AAXACcAMAAAASIHBgcGFRQXFhcWMzI3Njc2NTQnJicmAzMyFhUDFAYrASImNQM0NhMiJjQ2MhYUBgHuhHJvQUNDQm5zg4l1cUJEREJxdZ42BAYMAwInAwMMBh8PFhYeFhYD40RCcXWJg3NuQkNDQW9yhIl1cUJE/vYGBf7AAgMDAgFABQb+NhYfFhYfFgAABAAAAAADwAPAAAgAEgAoAD0AAAEyNjQmIgYUFhcjFTMRIxUzNSMDIgcGBwYVFBYXFjMyNzY3NjU0Jy4BAyInJicmNDc2NzYyFxYXFhQHBgcGAfQYISEwISFRjzk5yTorhG5rPT99am+DdmhlPD4+PMyFbV5bNTc3NVte2l5bNTc3NVteAqAiLyIiLyI5Hf7EHBwCsT89a26Ed8w8Pj48ZWh2g29qffyjNzVbXtpeWzU3NzVbXtpeWzU3AAADAAAAAAOoA6gACwAgADUAAAEHJwcXBxc3FzcnNwMiBwYHBhQXFhcWMjc2NzY0JyYnJgMiJyYnJjQ3Njc2MhcWFxYUBwYHBgKOmpocmpocmpocmpq2dmZiOjs7OmJm7GZiOjs7OmJmdmtdWTQ2NjRZXdZdWTQ2NjRZXQKqmpocmpocmpocmpoBGTs6YmbsZmI6Ozs6YmbsZmI6O/zCNjRZXdZdWTQ2NjRZXdZdWTQ2AAMAAAAAA+kD6gAaAC8AMAAAAQYHBiMiJyYnJjQ3Njc2MhcWFxYVFAcGBwEHATI3Njc2NCcmJyYiBwYHBhQXFhcWMwKONUBCR21dWjU3NzVaXdpdWzU2GBcrASM5/eBXS0grKysrSEuuSkkqLCwqSUpXASMrFxg2NVtd2l1aNTc3NVpdbUdCQDX+3jkBGSsrSEuuSkkqLCwqSUquS0grKwAC//8AAAPoA+gAFAAwAAABIgcGBwYQFxYXFiA3Njc2ECcmJyYTFg4BIi8BBwYuATQ/AScmPgEWHwE3Nh4BBg8BAfSIdHFDRERDcXQBEHRxQ0REQ3F0SQoBFBsKoqgKGxMKqKIKARQbCqKoChsUAQqoA+hEQ3F0/vB0cUNERENxdAEQdHFDRP1jChsTCqiiCgEUGwqiqAobFAEKqKIKARQbCqIAAAIAAAAAA+QD5AAXADQAAAEiBwYHBhUUFxYXFjMyNzY3NjU0JyYnJhMUBiMFFxYUDwEGLwEuAT8BNh8BFhQPAQUyFh0BAe6Ecm9BQ0NCbnODiXVxQkREQnF1fwQC/pGDAQEVAwTsAgEC7AQEFAIBhAFwAgMD40RCcXWJg3NuQkNDQW9yhIl1cUJE/fYCAwuVAgQCFAQE0AIFAtEEBBQCBQGVCwMDJwAAAAUAAAAAA9QD0wAjACcANwBHAEgAAAERFAYjISImNREjIiY9ATQ2MyE1NDYzITIWHQEhMhYdARQGIyERIREHIgYVERQWOwEyNjURNCYjISIGFREUFjsBMjY1ETQmKwEDeyYb/XYbJkMJDQ0JAQYZEgEvExkBBgkNDQn9CQJc0QkNDQktCQ0NCf7sCQ0NCS0JDQ0JLQMi/TQbJiYbAswMCiwJDS4SGRkSLg0JLAoM/UwCtGsNCf5NCQ0NCQGzCQ0NCf5NCQ0NCQGzCQ0AAAAAEADGAAEAAAAAAAEABAAAAAEAAAAAAAIABwAEAAEAAAAAAAMABAALAAEAAAAAAAQABAAPAAEAAAAAAAUACwATAAEAAAAAAAYABAAeAAEAAAAAAAoAKwAiAAEAAAAAAAsAEwBNAAMAAQQJAAEACABgAAMAAQQJAAIADgBoAAMAAQQJAAMACAB2AAMAAQQJAAQACAB+AAMAAQQJAAUAFgCGAAMAAQQJAAYACACcAAMAAQQJAAoAVgCkAAMAAQQJAAsAJgD6d2V1aVJlZ3VsYXJ3ZXVpd2V1aVZlcnNpb24gMS4wd2V1aUdlbmVyYXRlZCBieSBzdmcydHRmIGZyb20gRm9udGVsbG8gcHJvamVjdC5odHRwOi8vZm9udGVsbG8uY29tAHcAZQB1AGkAUgBlAGcAdQBsAGEAcgB3AGUAdQBpAHcAZQB1AGkAVgBlAHIAcwBpAG8AbgAgADEALgAwAHcAZQB1AGkARwBlAG4AZQByAGEAdABlAGQAIABiAHkAIABzAHYAZwAyAHQAdABmACAAZgByAG8AbQAgAEYAbwBuAHQAZQBsAGwAbwAgAHAAcgBvAGoAZQBjAHQALgBoAHQAdABwADoALwAvAGYAbwBuAHQAZQBsAGwAbwAuAGMAbwBtAAAAAgAAAAAAAAAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASAQIBAwEEAQUBBgEHAQgBCQEKAQsBDAENAQ4BDwEQAREBEgETAAZjaXJjbGUIZG93bmxvYWQEaW5mbwxzYWZlX3N1Y2Nlc3MJc2FmZV93YXJuB3N1Y2Nlc3MOc3VjY2Vzcy1jaXJjbGURc3VjY2Vzcy1uby1jaXJjbGUHd2FpdGluZw53YWl0aW5nLWNpcmNsZQR3YXJuC2luZm8tY2lyY2xlBmNhbmNlbAZzZWFyY2gFY2xlYXIEYmFjawZkZWxldGUAAAAA') format('truetype');
+}
+[class^="weui-icon-"],
+[class*=" weui-icon-"]{
+  display:inline-block;
+  vertical-align:middle;
+  font:normal normal normal 14px/1 "weui";
+  font-size:inherit;
+  text-rendering:auto;
+  -webkit-font-smoothing:antialiased;
+}
+[class^="weui-icon-"]:before,
+[class*=" weui-icon-"]:before{
+  display:inline-block;
+  margin-left:.2em;
+  margin-right:.2em;
+}
+.weui-icon-circle:before{
+  content:"\EA01";
+}
+.weui-icon-download:before{
+  content:"\EA02";
+}
+.weui-icon-info:before{
+  content:"\EA03";
+}
+.weui-icon-safe-success:before{
+  content:"\EA04";
+}
+.weui-icon-safe-warn:before{
+  content:"\EA05";
+}
+.weui-icon-success:before{
+  content:"\EA06";
+}
+.weui-icon-success-circle:before{
+  content:"\EA07";
+}
+.weui-icon-success-no-circle:before{
+  content:"\EA08";
+}
+.weui-icon-waiting:before{
+  content:"\EA09";
+}
+.weui-icon-waiting-circle:before{
+  content:"\EA0A";
+}
+.weui-icon-warn:before{
+  content:"\EA0B";
+}
+.weui-icon-info-circle:before{
+  content:"\EA0C";
+}
+.weui-icon-cancel:before{
+  content:"\EA0D";
+}
+.weui-icon-search:before{
+  content:"\EA0E";
+}
+.weui-icon-clear:before{
+  content:"\EA0F";
+}
+.weui-icon-back:before{
+  content:"\EA10";
+}
+.weui-icon-delete:before{
+  content:"\EA11";
+}
+[class^="weui-icon_"]:before,
+[class*=" weui-icon_"]:before{
+  margin:0;
+}
+.weui-icon-success{
+  font-size:23px;
+  color:#00a7ff;
+}
+.weui-icon-waiting{
+  font-size:23px;
+  color:#10AEFF;
+}
+.weui-icon-warn{
+  font-size:23px;
+  color:#F43530;
+}
+.weui-icon-info{
+  font-size:23px;
+  color:#10AEFF;
+}
+.weui-icon-success-circle{
+  font-size:23px;
+  color:#00a7ff;
+}
+.weui-icon-success-no-circle{
+  font-size:23px;
+  color:#00a7ff;
+}
+.weui-icon-waiting-circle{
+  font-size:23px;
+  color:#10AEFF;
+}
+.weui-icon-circle{
+  font-size:23px;
+  color:#C9C9C9;
+}
+.weui-icon-download{
+  font-size:23px;
+  color:#00a7ff;
+}
+.weui-icon-info-circle{
+  font-size:23px;
+  color:#00a7ff;
+}
+.weui-icon-safe-success{
+  color:#00a7ff;
+}
+.weui-icon-safe-warn{
+  color:#FFBE00;
+}
+.weui-icon-cancel{
+  color:#F43530;
+  font-size:22px;
+}
+.weui-icon-search{
+  color:#B2B2B2;
+  font-size:14px;
+}
+.weui-icon-clear{
+  color:#B2B2B2;
+  font-size:14px;
+}
+.weui-icon-delete.weui-icon_gallery-delete{
+  color:#FFFFFF;
+  font-size:22px;
+}
+.weui-icon_msg{
+  font-size:93px;
+}
+.weui-icon_msg.weui-icon-warn{
+  color:#F76260;
+}
+.weui-icon_msg-primary{
+  font-size:93px;
+}
+.weui-icon_msg-primary.weui-icon-warn{
+  color:#FFBE00;
+}
+.weui-btn{
+  position:relative;
+  display:block;
+  margin-left:auto;
+  margin-right:auto;
+  padding-left:14px;
+  padding-right:14px;
+  box-sizing:border-box;
+  font-size:18px;
+  text-align:center;
+  text-decoration:none;
+  color:#FFFFFF;
+  line-height:2.55555556;
+  border-radius:5px;
+  -webkit-tap-highlight-color:rgba(0, 0, 0, 0);
+  overflow:hidden;
+}
+.weui-btn:after{
+  content:" ";
+  width:200%;
+  height:200%;
+  position:absolute;
+  top:0;
+  left:0;
+  border:1px solid rgba(0, 0, 0, 0.2);
+  -webkit-transform:scale(0.5);
+          transform:scale(0.5);
+  -webkit-transform-origin:0 0;
+          transform-origin:0 0;
+  box-sizing:border-box;
+  border-radius:10px;
+}
+.weui-btn_inline{
+  display:inline-block;
+}
+.weui-btn_default{
+  color:#000000;
+  background-color:#F8F8F8;
+}
+.weui-btn_default:not(.weui-btn_disabled):visited{
+  color:#000000;
+}
+.weui-btn_default:not(.weui-btn_disabled):active{
+  color:rgba(0, 0, 0, 0.6);
+  background-color:#DEDEDE;
+}
+.weui-btn_primary{
+  		background: -moz-linear-gradient(left,#FF586A,#FD7564);
+  	    background: -webkit-gradient(left,#FF586A,#FD7564);
+  	    background: -webkit-linear-gradient(left,#FF586A,#FD7564);
+  	    background: -o-linear-gradient(left,#FF586A,#FD7564);
+  	    background: -ms-linear-gradient(left,#FF586A,#FD7564);
+  	    background: linear-gradient(left,#FF586A,#FD7564);
+}
+.weui-btn_primary:not(.weui-btn_disabled):visited{
+  color:#FFFFFF;
+}
+.weui-btn_warn{
+  background-color:#E64340;
+}
+.weui-btn_warn:not(.weui-btn_disabled):visited{
+  color:#FFFFFF;
+}
+.weui-btn_warn:not(.weui-btn_disabled):active{
+  color:rgba(255, 255, 255, 0.6);
+  background-color:#CE3C39;
+}
+.weui-btn_disabled{
+  color:rgba(255, 255, 255, 0.6);
+}
+.weui-btn_disabled.weui-btn_default{
+  color:rgba(0, 0, 0, 0.3);
+  background-color:#F7F7F7;
+}
+.weui-btn_disabled.weui-btn_primary{
+  background-color:#9ED99D;
+}
+.weui-btn_disabled.weui-btn_warn{
+  background-color:#EC8B89;
+}
+.weui-btn_loading .weui-loading{
+  margin:-0.2em 0.34em 0 0;
+}
+.weui-btn_loading.weui-btn_primary,
+.weui-btn_loading.weui-btn_warn{
+  color:rgba(255, 255, 255, 0.6);
+}
+.weui-btn_loading.weui-btn_primary{
+  background-color:#179B16;
+}
+.weui-btn_loading.weui-btn_warn{
+  background-color:#CE3C39;
+}
+.weui-btn_plain-primary{
+  color:#00a7ff;
+  border:1px solid #00a7ff;
+}
+.weui-btn_plain-primary:not(.weui-btn_plain-disabled):active{
+  color:rgba(26, 173, 25, 0.6);
+  border-color:rgba(26, 173, 25, 0.6);
+}
+.weui-btn_plain-primary:after{
+  border-width:0;
+}
+.weui-btn_plain-default{
+  color:#353535;
+  border:1px solid #353535;
+}
+.weui-btn_plain-default:not(.weui-btn_plain-disabled):active{
+  color:rgba(53, 53, 53, 0.6);
+  border-color:rgba(53, 53, 53, 0.6);
+}
+.weui-btn_plain-default:after{
+  border-width:0;
+}
+.weui-btn_plain-disabled{
+  color:rgba(0, 0, 0, 0.2);
+  border-color:rgba(0, 0, 0, 0.2);
+}
+button.weui-btn,
+input.weui-btn{
+  width:100%;
+  border-width:0;
+  outline:0;
+  -webkit-appearance:none;
+}
+button.weui-btn:focus,
+input.weui-btn:focus{
+  outline:0;
+}
+button.weui-btn_inline,
+input.weui-btn_inline,
+button.weui-btn_mini,
+input.weui-btn_mini{
+  width:auto;
+}
+button.weui-btn_plain-primary,
+input.weui-btn_plain-primary,
+button.weui-btn_plain-default,
+input.weui-btn_plain-default{
+  border-width:1px;
+  background-color:transparent;
+}
+.weui-btn_mini{
+  display:inline-block;
+  padding:0 1.32em;
+  line-height:2.3;
+  font-size:13px;
+}
+.weui-btn + .weui-btn{
+  margin-top:15px;
+}
+.weui-btn.weui-btn_inline + .weui-btn.weui-btn_inline{
+  margin-top:auto;
+  margin-left:15px;
+}
+.weui-btn-area{
+  margin:1.17647059em 15px 0.3em;
+}
+.weui-btn-area_inline{
+  display:-webkit-box;
+  display:-webkit-flex;
+  display:flex;
+}
+.weui-btn-area_inline .weui-btn{
+  margin-top:auto;
+  margin-right:15px;
+  width:100%;
+  -webkit-box-flex:1;
+  -webkit-flex:1;
+          flex:1;
+}
+.weui-btn-area_inline .weui-btn:last-child{
+  margin-right:0;
+}
+.weui-cells{
+  line-height:1.47058824;
+  font-size:17px;
+  overflow:hidden;
+  position:relative;
+}
+.weui-cells__title{
+  margin-top:.77em;
+  margin-bottom:.3em;
+  padding-left:15px;
+  padding-right:15px;
+  color:#999999;
+  font-size:14px;
+}
+.weui-cells__title + .weui-cells{
+  margin-top:0;
+}
+.weui-cells__tips{
+  margin-top:.3em;
+  color:#999999;
+  padding-left:15px;
+  padding-right:15px;
+  font-size:14px;
+}
+.weui-cell{
+  padding:15px 10px;
+  position:relative;
+  display:-webkit-box;
+  display:-webkit-flex;
+  display:flex;
+  -webkit-box-align:center;
+  -webkit-align-items:center;
+          align-items:center;
+}
+
+.weui-cell:first-child:before{
+  display:none;
+}
+.weui-cell_primary{
+  -webkit-box-align:start;
+  -webkit-align-items:flex-start;
+          align-items:flex-start;
+}
+.weui-cell__bd{
+  -webkit-box-flex:1;
+  -webkit-flex:1;
+          flex:1;
+}
+.weui-cell__ft{
+  text-align:right;
+  color:#999999;
+}
+.weui-cell_swiped{
+  display:block;
+  padding:0;
+}
+.weui-cell_swiped > .weui-cell__bd{
+  position:relative;
+  z-index:1;
+  background-color:#FFFFFF;
+}
+.weui-cell_swiped > .weui-cell__ft{
+  position:absolute;
+  right:0;
+  top:0;
+  bottom:0;
+  display:-webkit-box;
+  display:-webkit-flex;
+  display:flex;
+  color:#FFFFFF;
+}
+.weui-swiped-btn{
+  display:block;
+  padding:10px 1em;
+  line-height:1.47058824;
+  color:inherit;
+}
+.weui-swiped-btn_default{
+  background-color:#C7C7CC;
+}
+.weui-swiped-btn_warn{
+  background-color:#FF3B30;
+}
+.weui-cell_access{
+  -webkit-tap-highlight-color:rgba(0, 0, 0, 0);
+  color:inherit;
+}
+.weui-cell_access:active{
+  background-color:#ECECEC;
+}
+.weui-cell_access .weui-cell__ft{
+  padding-right:13px;
+  position:relative;
+}
+.weui-cell_access .weui-cell__ft:after{
+  content:" ";
+  display:inline-block;
+  height:6px;
+  width:6px;
+  border-width:2px 2px 0 0;
+  border-color:#C8C8CD;
+  border-style:solid;
+  -webkit-transform:matrix(0.71, 0.71, -0.71, 0.71, 0, 0);
+          transform:matrix(0.71, 0.71, -0.71, 0.71, 0, 0);
+  position:relative;
+  top:-2px;
+  position:absolute;
+  top:50%;
+  margin-top:-4px;
+  right:2px;
+}
+.weui-cell_link{
+  color:#586C94;
+  font-size:14px;
+}
+.weui-cell_link:first-child:before{
+  display:block;
+}
+.weui-check__label{
+  -webkit-tap-highlight-color:rgba(0, 0, 0, 0);
+}
+.weui-check__label:active{
+  background-color:#ECECEC;
+}
+.weui-check{
+  position:absolute;
+  left:-9999em;
+}
+.weui-cells_radio .weui-cell__ft{
+  padding-left:0.35em;
+}
+.weui-cells_radio .weui-check + .weui-icon-checked{
+  min-width:16px;
+}
+.weui-cells_radio .weui-check:checked + .weui-icon-checked:before{
+  display:block;
+  content:'\EA08';
+  color:#00a7ff;
+  font-size:16px;
+}
+.weui-cells_checkbox .weui-icon-checked:before{
+  content:'\EA01';
+  color:#C9C9C9;
+  font-size:23px;
+  display:block;
+}
+.weui-cells_checkbox .weui-check:checked + .weui-icon-checked.false:before{
+  content:'\EA0D';
+  background-color:#EF4F4F;
+  color:white;
+  border-radius:50%;
+  
+}
+.weui-cells_checkbox .weui-check:checked + .weui-icon-checked:before{
+  content:'\EA06';
+  color:#FF4854;
+}
+
+.weui-label{
+  display:block;
+  width:105px;
+  word-wrap:break-word;
+  word-break:break-all;
+}
+.weui-input{
+  width:100%;
+  border:0;
+  outline:0;
+  -webkit-appearance:none;
+  background-color:transparent;
+  font-size:inherit;
+  color:inherit;
+  height:1.47058824em;
+  line-height:1.47058824;
+}
+.weui-input::-webkit-outer-spin-button,
+.weui-input::-webkit-inner-spin-button{
+  -webkit-appearance:none;
+  margin:0;
+}
+.weui-textarea{
+  display:block;
+  border:0;
+  resize:none;
+  width:100%;
+  color:inherit;
+  font-size:1em;
+  line-height:inherit;
+  outline:0;
+}
+.weui-textarea-counter{
+  color:#B2B2B2;
+  text-align:right;
+}
+.weui-cell_warn .weui-textarea-counter{
+  color:#E64340;
+}
+.weui-toptips{
+  display:none;
+  position:fixed;
+  -webkit-transform:translateZ(0);
+          transform:translateZ(0);
+  top:0;
+  left:0;
+  right:0;
+  padding:5px;
+  font-size:14px;
+  text-align:center;
+  color:#FFF;
+  z-index:5000;
+  word-wrap:break-word;
+  word-break:break-all;
+}
+.weui-toptips_warn{
+  background-color:#E64340;
+}
+.weui-cells_form .weui-cell__ft{
+  font-size:0;
+}
+.weui-cells_form .weui-icon-warn{
+  display:none;
+}
+.weui-cells_form input,
+.weui-cells_form textarea,
+.weui-cells_form label[for]{
+  -webkit-tap-highlight-color:rgba(0, 0, 0, 0);
+}
+
+.weui-cell_warn .weui-icon-warn{
+  display:inline-block;
+}
+.weui-form-preview{
+  position:relative;
+  background-color:#FFFFFF;
+}
+.weui-form-preview:before{
+  content:" ";
+  position:absolute;
+  left:0;
+  top:0;
+  right:0;
+  height:1px;
+  border-top:1px solid #e5e5e5;
+  color:#e5e5e5;
+  -webkit-transform-origin:0 0;
+          transform-origin:0 0;
+  -webkit-transform:scaleY(0.5);
+          transform:scaleY(0.5);
+}
+.weui-form-preview:after{
+  content:" ";
+  position:absolute;
+  left:0;
+  bottom:0;
+  right:0;
+  height:1px;
+  border-bottom:1px solid #e5e5e5;
+  color:#e5e5e5;
+  -webkit-transform-origin:0 100%;
+          transform-origin:0 100%;
+  -webkit-transform:scaleY(0.5);
+          transform:scaleY(0.5);
+}
+.weui-form-preview__hd{
+  position:relative;
+  padding:10px 15px;
+  text-align:right;
+  line-height:2.5em;
+}
+.weui-form-preview__hd:after{
+  content:" ";
+  position:absolute;
+  left:0;
+  bottom:0;
+  right:0;
+  height:1px;
+  border-bottom:1px solid #e5e5e5;
+  color:#e5e5e5;
+  -webkit-transform-origin:0 100%;
+          transform-origin:0 100%;
+  -webkit-transform:scaleY(0.5);
+          transform:scaleY(0.5);
+  left:15px;
+}
+.weui-form-preview__hd .weui-form-preview__value{
+  font-style:normal;
+  font-size:1.6em;
+}
+.weui-form-preview__bd{
+  padding:10px 15px;
+  text-align:right;
+  color:#999999;
+  line-height:1.2;
+}
+.weui-form-preview__ft{
+  position:relative;
+  line-height:50px;
+  display:-webkit-box;
+  display:-webkit-flex;
+  display:flex;
+}
+.weui-form-preview__ft:before{
+  content:" ";
+  position:absolute;
+  left:0;
+  top:0;
+  right:0;
+  height:1px;
+  border-top:1px solid #D5D5D6;
+  color:#D5D5D6;
+  -webkit-transform-origin:0 0;
+          transform-origin:0 0;
+  -webkit-transform:scaleY(0.5);
+          transform:scaleY(0.5);
+}
+.weui-form-preview__item{
+  overflow:hidden;
+}
+.weui-form-preview__label{
+  float:left;
+  margin-right:1em;
+  min-width:4em;
+  color:#999999;
+  text-align:justify;
+  text-align-last:justify;
+}
+.weui-form-preview__value{
+  display:block;
+  overflow:hidden;
+  word-break:normal;
+  word-wrap:break-word;
+}
+.weui-form-preview__btn{
+  position:relative;
+  display:block;
+  -webkit-box-flex:1;
+  -webkit-flex:1;
+          flex:1;
+  color:#00a7ff;
+  text-align:center;
+  -webkit-tap-highlight-color:rgba(0, 0, 0, 0);
+}
+button.weui-form-preview__btn{
+  background-color:transparent;
+  border:0;
+  outline:0;
+  line-height:inherit;
+  font-size:inherit;
+}
+.weui-form-preview__btn:active{
+  background-color:#EEEEEE;
+}
+.weui-form-preview__btn:after{
+  content:" ";
+  position:absolute;
+  left:0;
+  top:0;
+  width:1px;
+  bottom:0;
+  border-left:1px solid #D5D5D6;
+  color:#D5D5D6;
+  -webkit-transform-origin:0 0;
+          transform-origin:0 0;
+  -webkit-transform:scaleX(0.5);
+          transform:scaleX(0.5);
+}
+.weui-form-preview__btn:first-child:after{
+  display:none;
+}
+.weui-form-preview__btn_default{
+  color:#999999;
+}
+.weui-form-preview__btn_primary{
+  color:#0BB20C;
+}
+.weui-cell_select{
+  padding:0;
+}
+.weui-cell_select .weui-select{
+  padding-right:30px;
+}
+.weui-cell_select .weui-cell__bd:after{
+  content:" ";
+  display:inline-block;
+  height:6px;
+  width:6px;
+  border-width:2px 2px 0 0;
+  border-color:#C8C8CD;
+  border-style:solid;
+  -webkit-transform:matrix(0.71, 0.71, -0.71, 0.71, 0, 0);
+          transform:matrix(0.71, 0.71, -0.71, 0.71, 0, 0);
+  position:relative;
+  top:-2px;
+  position:absolute;
+  top:50%;
+  right:15px;
+  margin-top:-4px;
+}
+.weui-select{
+  -webkit-appearance:none;
+  border:0;
+  outline:0;
+  background-color:transparent;
+  width:100%;
+  font-size:inherit;
+  height:45px;
+  line-height:45px;
+  position:relative;
+  z-index:1;
+  padding-left:15px;
+}
+.weui-cell_select-before{
+  padding-right:15px;
+}
+.weui-cell_select-before .weui-select{
+  width:105px;
+  box-sizing:border-box;
+}
+.weui-cell_select-before .weui-cell__hd{
+  position:relative;
+}
+.weui-cell_select-before .weui-cell__hd:after{
+  content:" ";
+  position:absolute;
+  right:0;
+  top:0;
+  width:1px;
+  bottom:0;
+  border-right:1px solid #e5e5e5;
+  color:#e5e5e5;
+  -webkit-transform-origin:100% 0;
+          transform-origin:100% 0;
+  -webkit-transform:scaleX(0.5);
+          transform:scaleX(0.5);
+}
+.weui-cell_select-before .weui-cell__hd:before{
+  content:" ";
+  display:inline-block;
+  height:6px;
+  width:6px;
+  border-width:2px 2px 0 0;
+  border-color:#C8C8CD;
+  border-style:solid;
+  -webkit-transform:matrix(0.71, 0.71, -0.71, 0.71, 0, 0);
+          transform:matrix(0.71, 0.71, -0.71, 0.71, 0, 0);
+  position:relative;
+  top:-2px;
+  position:absolute;
+  top:50%;
+  right:15px;
+  margin-top:-4px;
+}
+.weui-cell_select-before .weui-cell__bd{
+  padding-left:15px;
+}
+.weui-cell_select-before .weui-cell__bd:after{
+  display:none;
+}
+.weui-cell_select-after{
+  padding-left:15px;
+}
+.weui-cell_select-after .weui-select{
+  padding-left:0;
+}
+.weui-cell_vcode{
+  padding-top:0;
+  padding-right:0;
+  padding-bottom:0;
+}
+.weui-vcode-img{
+  margin-left:5px;
+  height:45px;
+  vertical-align:middle;
+}
+.weui-vcode-btn{
+  display:inline-block;
+  height:45px;
+  margin-left:5px;
+  padding:0 0.6em 0 0.7em;
+  border-left:1px solid #E5E5E5;
+  line-height:45px;
+  vertical-align:middle;
+  font-size:17px;
+  color:#00a7ff;
+}
+button.weui-vcode-btn{
+  background-color:transparent;
+  border-top:0;
+  border-right:0;
+  border-bottom:0;
+  outline:0;
+}
+.weui-vcode-btn:active{
+  color:#52a341;
+}
+.weui-gallery{
+  display:none;
+  position:fixed;
+  top:0;
+  right:0;
+  bottom:0;
+  left:0;
+  background-color:#000000;
+  z-index:1000;
+}
+.weui-gallery__img{
+  position:absolute;
+  top:0;
+  right:0;
+  bottom:60px;
+  left:0;
+  background:center center no-repeat;
+  background-size:contain;
+}
+.weui-gallery__opr{
+  position:absolute;
+  right:0;
+  bottom:0;
+  left:0;
+  background-color:#0D0D0D;
+  color:#FFFFFF;
+  line-height:60px;
+  text-align:center;
+}
+.weui-gallery__del{
+  display:block;
+}
+.weui-cell_switch{
+  padding-top:6.5px;
+  padding-bottom:6.5px;
+}
+.weui-switch{
+  -webkit-appearance:none;
+          appearance:none;
+}
+.weui-switch,
+.weui-switch-cp__box{
+  position:relative;
+  width:52px;
+  height:32px;
+  border:1px solid #DFDFDF;
+  outline:0;
+  border-radius:16px;
+  box-sizing:border-box;
+  background-color:#DFDFDF;
+  -webkit-transition:background-color 0.1s, border 0.1s;
+  transition:background-color 0.1s, border 0.1s;
+}
+.weui-switch:before,
+.weui-switch-cp__box:before{
+  content:" ";
+  position:absolute;
+  top:0;
+  left:0;
+  width:50px;
+  height:30px;
+  border-radius:15px;
+  background-color:#FDFDFD;
+  -webkit-transition:-webkit-transform 0.35s cubic-bezier(0.45, 1, 0.4, 1);
+  transition:-webkit-transform 0.35s cubic-bezier(0.45, 1, 0.4, 1);
+  transition:transform 0.35s cubic-bezier(0.45, 1, 0.4, 1);
+  transition:transform 0.35s cubic-bezier(0.45, 1, 0.4, 1), -webkit-transform 0.35s cubic-bezier(0.45, 1, 0.4, 1);
+}
+.weui-switch:after,
+.weui-switch-cp__box:after{
+  content:" ";
+  position:absolute;
+  top:0;
+  left:0;
+  width:30px;
+  height:30px;
+  border-radius:15px;
+  background-color:#FFFFFF;
+  box-shadow:0 1px 3px rgba(0, 0, 0, 0.4);
+  -webkit-transition:-webkit-transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35);
+  transition:-webkit-transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35);
+  transition:transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35);
+  transition:transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35), -webkit-transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35);
+}
+.weui-switch:checked,
+.weui-switch-cp__input:checked ~ .weui-switch-cp__box{
+  border-color:#04BE02;
+  background-color:#04BE02;
+}
+.weui-switch:checked:before,
+.weui-switch-cp__input:checked ~ .weui-switch-cp__box:before{
+  -webkit-transform:scale(0);
+          transform:scale(0);
+}
+.weui-switch:checked:after,
+.weui-switch-cp__input:checked ~ .weui-switch-cp__box:after{
+  -webkit-transform:translateX(20px);
+          transform:translateX(20px);
+}
+.weui-switch-cp__input{
+  position:absolute;
+  left:-9999px;
+}
+.weui-switch-cp__box{
+  display:block;
+}
+.weui-uploader__hd{
+  display:-webkit-box;
+  display:-webkit-flex;
+  display:flex;
+  padding-bottom:10px;
+  -webkit-box-align:center;
+  -webkit-align-items:center;
+          align-items:center;
+}
+.weui-uploader__title{
+  -webkit-box-flex:1;
+  -webkit-flex:1;
+          flex:1;
+}
+.weui-uploader__info{
+  color:#B2B2B2;
+}
+.weui-uploader__bd{
+  margin-bottom:-4px;
+  margin-right:-9px;
+  overflow:hidden;
+}
+.weui-uploader__files{
+  list-style:none;
+}
+.weui-uploader__file{
+  margin:20px auto;
+  width:90%;
+  height:350px;
+  background:no-repeat center center;
+  background-size:cover;
+}
+.weui-uploader__file_status{
+  position:relative;
+}
+.weui-uploader__file_status:before{
+  content:" ";
+  position:absolute;
+  top:0;
+  right:0;
+  bottom:0;
+  left:0;
+  background-color:rgba(0, 0, 0, 0.5);
+}
+.weui-uploader__file_status .weui-uploader__file-content{
+  display:block;
+}
+.weui-uploader__file-content{
+  display:none;
+  position:absolute;
+  top:50%;
+  left:50%;
+  -webkit-transform:translate(-50%, -50%);
+          transform:translate(-50%, -50%);
+  color:#FFFFFF;
+}
+.weui-uploader__file-content .weui-icon-warn{
+  display:inline-block;
+}
+.weui-uploader__input-box{
+  position:relative;
+  width:90%;
+  height:350px;
+  border:1px solid #D9D9D9;
+  margin:20px auto;
+}
+.weui-uploader__input-box:before,
+.weui-uploader__input-box:after{
+  content:" ";
+  position:absolute;
+  top:50%;
+  left:50%;
+  -webkit-transform:translate(-50%, -50%);
+          transform:translate(-50%, -50%);
+  background-color:#D9D9D9;
+}
+.weui-uploader__input-box:before{
+  width:2px;
+  height:39.5px;
+}
+.weui-uploader__input-box:after{
+  width:39.5px;
+  height:2px;
+}
+.weui-uploader__input-box:active{
+  border-color:#999999;
+}
+.weui-uploader__input-box:active:before,
+.weui-uploader__input-box:active:after{
+  background-color:#999999;
+}
+.weui-uploader__input{
+  position:absolute;
+  z-index:1;
+  top:0;
+  left:0;
+  width:100%;
+  height:100%;
+  opacity:0;
+  -webkit-tap-highlight-color:rgba(0, 0, 0, 0);
+}
+.weui-msg{
+  padding-top:36px;
+  text-align:center;
+}
+.weui-msg__icon-area{
+  margin-bottom:30px;
+}
+.weui-msg__text-area{
+  margin-bottom:25px;
+  padding:0 20px;
+}
+.weui-msg__text-area a{
+  color:#586C94;
+}
+.weui-msg__title{
+  margin-bottom:5px;
+  font-weight:400;
+  font-size:20px;
+  word-wrap:break-word;
+  word-break:break-all;
+}
+.weui-msg__desc{
+  font-size:14px;
+  color:#999999;
+  word-wrap:break-word;
+  word-break:break-all;
+}
+.weui-msg__opr-area{
+  margin-bottom:25px;
+}
+.weui-msg__extra-area{
+  margin-bottom:15px;
+  font-size:14px;
+  color:#999999;
+}
+.weui-msg__extra-area a{
+  color:#586C94;
+}
+@media screen and (min-height: 438px){
+  .weui-msg__extra-area{
+    position:fixed;
+    left:0;
+    bottom:0;
+    width:100%;
+    text-align:center;
+  }
+}
+@media only screen and (device-width: 375px) and (device-height: 812px) and (-webkit-device-pixel-ratio: 3){
+  .weui-msg__extra-area{
+    margin-bottom:49px;
+  }
+}
+.weui-article{
+  padding:20px 15px;
+  font-size:15px;
+}
+.weui-article section{
+  margin-bottom:1.5em;
+}
+.weui-article h1{
+  font-size:18px;
+  font-weight:400;
+  margin-bottom:.9em;
+}
+.weui-article h2{
+  font-size:16px;
+  font-weight:400;
+  margin-bottom:.34em;
+}
+.weui-article h3{
+  font-weight:400;
+  font-size:15px;
+  margin-bottom:.34em;
+}
+.weui-article *{
+  max-width:100%;
+  box-sizing:border-box;
+  word-wrap:break-word;
+}
+.weui-article p{
+  margin:0 0 .8em;
+}
+.weui-tabbar{
+  display:-webkit-box;
+  display:-webkit-flex;
+  display:flex;
+  position:fixed;
+  z-index:500;
+  bottom:0;
+  width:100%;
+  background-color:#F7F7FA;
+}
+.weui-tabbar:before{
+  content:" ";
+  position:absolute;
+  left:0;
+  top:0;
+  right:0;
+  height:1px;
+  border-top:1px solid #C0BFC4;
+  color:#C0BFC4;
+  -webkit-transform-origin:0 0;
+          transform-origin:0 0;
+  -webkit-transform:scaleY(0.5);
+          transform:scaleY(0.5);
+}
+.weui-tabbar__item{
+  display:block;
+  -webkit-box-flex:1;
+  -webkit-flex:1;
+          flex:1;
+  padding:5px 0 0;
+  font-size:0;
+  color:#999999;
+  text-align:center;
+  -webkit-tap-highlight-color:rgba(0, 0, 0, 0);
+}
+.weui-tabbar__item.weui-bar__item_on .weui-tabbar__icon,
+.weui-tabbar__item.weui-bar__item_on .weui-tabbar__icon > i,
+.weui-tabbar__item.weui-bar__item_on .weui-tabbar__label{
+  color:#00a7ff;
+}
+.weui-tabbar__icon{
+  display:inline-block;
+  width:27px;
+  height:27px;
+}
+i.weui-tabbar__icon,
+.weui-tabbar__icon > i{
+  font-size:24px;
+}
+.weui-tabbar__icon img{
+  width:100%;
+  height:100%;
+}
+.weui-tabbar__label{
+  text-align:center;
+  font-size:10px;
+  line-height:1.8;
+}
+.weui-navbar{
+  display:-webkit-box;
+  display:-webkit-flex;
+  display:flex;
+  position:absolute;
+  z-index:500;
+  top:0;
+  width:100%;
+  background-color:#FAFAFA;
+}
+.weui-navbar:after{
+  content:" ";
+  position:absolute;
+  left:0;
+  bottom:0;
+  right:0;
+  height:1px;
+  border-bottom:1px solid #CCCCCC;
+  color:#CCCCCC;
+  -webkit-transform-origin:0 100%;
+          transform-origin:0 100%;
+  -webkit-transform:scaleY(0.5);
+          transform:scaleY(0.5);
+}
+.weui-navbar + .weui-tab__panel{
+  padding-top:50px;
+  padding-bottom:0;
+}
+.weui-navbar__item{
+  position:relative;
+  display:block;
+  -webkit-box-flex:1;
+  -webkit-flex:1;
+          flex:1;
+  padding:10px 0;
+  text-align:center;
+  font-size:15px;
+  -webkit-tap-highlight-color:rgba(0, 0, 0, 0);
+}
+.weui-navbar__item:active{
+  background-color:#EDEDED;
+}
+.weui-navbar__item.weui-bar__item_on{
+  background-color:#EAEAEA;
+}
+.weui-navbar__item:after{
+  content:" ";
+  position:absolute;
+  right:0;
+  top:0;
+  width:1px;
+  bottom:0;
+  border-right:1px solid #CCCCCC;
+  color:#CCCCCC;
+  -webkit-transform-origin:100% 0;
+          transform-origin:100% 0;
+  -webkit-transform:scaleX(0.5);
+          transform:scaleX(0.5);
+}
+.weui-navbar__item:last-child:after{
+  display:none;
+}
+.weui-tab{
+  position:relative;
+  height:100%;
+}
+.weui-tab__panel{
+  box-sizing:border-box;
+  height:100%;
+  padding-bottom:50px;
+  overflow:auto;
+  -webkit-overflow-scrolling:touch;
+}
+.weui-tab__content{
+  display:none;
+}
+.weui-progress{
+  display:-webkit-box;
+  display:-webkit-flex;
+  display:flex;
+  -webkit-box-align:center;
+  -webkit-align-items:center;
+          align-items:center;
+}
+.weui-progress__bar{
+  background-color:#EBEBEB;
+  height:3px;
+  -webkit-box-flex:1;
+  -webkit-flex:1;
+          flex:1;
+}
+.weui-progress__inner-bar{
+  width:0;
+  height:100%;
+  background-color:#00a7ff;
+}
+.weui-progress__opr{
+  display:block;
+  margin-left:15px;
+  font-size:0;
+}
+.weui-panel{
+  background-color:#FFFFFF;
+  margin-top:10px;
+  position:relative;
+  overflow:hidden;
+}
+.weui-panel:first-child{
+  margin-top:0;
+}
+
+.weui-panel__hd{
+  padding:14px 15px 10px;
+  color:#999999;
+  font-size:13px;
+  position:relative;
+}
+.weui-panel__hd:after{
+  content:" ";
+  position:absolute;
+  left:0;
+  bottom:0;
+  right:0;
+  height:1px;
+  border-bottom:1px solid #E5E5E5;
+  color:#E5E5E5;
+  -webkit-transform-origin:0 100%;
+          transform-origin:0 100%;
+  -webkit-transform:scaleY(0.5);
+          transform:scaleY(0.5);
+  left:15px;
+}
+.weui-media-box{
+  padding:7px;
+  position:relative;
+}
+.weui-media-box:before{
+  content:" ";
+  position:absolute;
+  left:0;
+  top:0;
+  right:0;
+  height:1px;
+  border-top:1px solid #E5E5E5;
+  color:#E5E5E5;
+  -webkit-transform-origin:0 0;
+          transform-origin:0 0;
+  -webkit-transform:scaleY(0.5);
+          transform:scaleY(0.5);
+  left:15px;
+}
+.weui-media-box:first-child:before{
+  display:none;
+}
+a.weui-media-box{
+  color:#000000;
+  -webkit-tap-highlight-color:rgba(0, 0, 0, 0);
+}
+a.weui-media-box:active{
+  background-color:#ECECEC;
+}
+.weui-media-box__title{
+  font-weight:400;
+  font-size:16px;
+  width:auto;
+  overflow:hidden;
+  text-overflow:ellipsis;
+  white-space:nowrap;
+  word-wrap:normal;
+  word-wrap:break-word;
+  word-break:break-all;
+}
+.weui-media-box__desc{
+  color:#999999;
+  font-size:16px;
+  line-height:1.2;
+  overflow:hidden;
+  text-overflow:ellipsis;
+  display:-webkit-box;
+  -webkit-box-orient:vertical;
+  -webkit-line-clamp:2;
+}
+.weui-media-box__info{
+  margin-top:15px;
+  padding-bottom:5px;
+  font-size:13px;
+  color:#CECECE;
+  line-height:1em;
+  list-style:none;
+  overflow:hidden;
+}
+.weui-media-box__info__meta{
+  float:left;
+  padding-right:1em;
+}
+.weui-media-box__info__meta_extra{
+  padding-left:1em;
+  border-left:1px solid #CECECE;
+}
+.weui-media-box_text .weui-media-box__title{
+  margin-bottom:8px;
+}
+.weui-media-box_appmsg{
+  display:-webkit-box;
+  display:-webkit-flex;
+  display:flex;
+  -webkit-box-align:center;
+  -webkit-align-items:center;
+          align-items:center;
+}
+.weui-media-box_appmsg .weui-media-box__hd{
+  margin-right:.8em;
+  width:120px;
+  height:100px;
+  text-align:center;
+}
+.weui-media-box_appmsg .weui-media-box__thumb{
+  width:100%;
+  max-height:100%;
+  vertical-align:top;
+}
+.weui-media-box_appmsg .weui-media-box__bd{
+  -webkit-box-flex:1;
+  -webkit-flex:1;
+          flex:1;
+  min-width:0;
+}
+.weui-media-box_small-appmsg{
+  padding:0;
+}
+.weui-media-box_small-appmsg .weui-cells{
+  margin-top:0;
+}
+.weui-media-box_small-appmsg .weui-cells:before{
+  display:none;
+}
+.weui-grids{
+  position:relative;
+  overflow:hidden;
+}
+.weui-grids:before{
+  content:" ";
+  position:absolute;
+  left:0;
+  top:0;
+  right:0;
+  height:1px;
+  border-top:1px solid #D9D9D9;
+  color:#D9D9D9;
+  -webkit-transform-origin:0 0;
+          transform-origin:0 0;
+  -webkit-transform:scaleY(0.5);
+          transform:scaleY(0.5);
+}
+.weui-grids:after{
+  content:" ";
+  position:absolute;
+  left:0;
+  top:0;
+  width:1px;
+  bottom:0;
+  border-left:1px solid #D9D9D9;
+  color:#D9D9D9;
+  -webkit-transform-origin:0 0;
+          transform-origin:0 0;
+  -webkit-transform:scaleX(0.5);
+          transform:scaleX(0.5);
+}
+.weui-grid{
+  position:relative;
+  float:left;
+  padding:20px 10px;
+  width:33.33333333%;
+  box-sizing:border-box;
+}
+.weui-grid:before{
+  content:" ";
+  position:absolute;
+  right:0;
+  top:0;
+  width:1px;
+  bottom:0;
+  border-right:1px solid #D9D9D9;
+  color:#D9D9D9;
+  -webkit-transform-origin:100% 0;
+          transform-origin:100% 0;
+  -webkit-transform:scaleX(0.5);
+          transform:scaleX(0.5);
+}
+.weui-grid:after{
+  content:" ";
+  position:absolute;
+  left:0;
+  bottom:0;
+  right:0;
+  height:1px;
+  border-bottom:1px solid #D9D9D9;
+  color:#D9D9D9;
+  -webkit-transform-origin:0 100%;
+          transform-origin:0 100%;
+  -webkit-transform:scaleY(0.5);
+          transform:scaleY(0.5);
+}
+.weui-grid:active{
+  background-color:#ECECEC;
+}
+.weui-grid__icon{
+  width:28px;
+  height:28px;
+  margin:0 auto;
+}
+.weui-grid__icon img{
+  display:block;
+  width:100%;
+  height:100%;
+}
+.weui-grid__icon + .weui-grid__label{
+  margin-top:5px;
+}
+.weui-grid__label{
+  display:block;
+  text-align:center;
+  color:#000000;
+  font-size:14px;
+  white-space:nowrap;
+  text-overflow:ellipsis;
+  overflow:hidden;
+}
+.weui-footer{
+  color:#999999;
+  font-size:14px;
+  text-align:center;
+}
+.weui-footer a{
+  color:#586C94;
+}
+.weui-footer_fixed-bottom{
+  position:fixed;
+  bottom:.52em;
+  left:0;
+  right:0;
+}
+.weui-footer__links{
+  font-size:0;
+}
+.weui-footer__link{
+  display:inline-block;
+  vertical-align:top;
+  margin:0 .62em;
+  position:relative;
+  font-size:14px;
+}
+.weui-footer__link:before{
+  content:" ";
+  position:absolute;
+  left:0;
+  top:0;
+  width:1px;
+  bottom:0;
+  border-left:1px solid #C7C7C7;
+  color:#C7C7C7;
+  -webkit-transform-origin:0 0;
+          transform-origin:0 0;
+  -webkit-transform:scaleX(0.5);
+          transform:scaleX(0.5);
+  left:-0.65em;
+  top:.36em;
+  bottom:.36em;
+}
+.weui-footer__link:first-child:before{
+  display:none;
+}
+.weui-footer__text{
+  padding:0 .34em;
+  font-size:12px;
+}
+.weui-flex{
+  display:-webkit-box;
+  display:-webkit-flex;
+  display:flex;
+  align-items: center;
+}
+.weui-flex__item{
+  -webkit-box-flex:1;
+  -webkit-flex:1;
+          flex:1;
+}
+.weui-flex__item2{
+  -webkit-box-flex:2;
+  -webkit-flex:2;
+          flex:2;
+}
+.weui-dialog{
+  position:fixed;
+  z-index:5000;
+  width:80%;
+  max-width:300px;
+  top:50%;
+  left:50%;
+  -webkit-transform:translate(-50%, -50%);
+          transform:translate(-50%, -50%);
+  background-color:#FFFFFF;
+  text-align:center;
+  border-radius:3px;
+  overflow:hidden;
+}
+.weui-dialog__hd{
+  padding:1.3em 1.6em 0.5em;
+}
+.weui-dialog__title{
+  font-weight:400;
+  font-size:18px;
+}
+.weui-dialog__bd{
+  padding:0 1.6em 0.8em;
+  min-height:40px;
+  font-size:15px;
+  line-height:1.3;
+  word-wrap:break-word;
+  word-break:break-all;
+  color:#999999;
+}
+.weui-dialog__bd:first-child{
+  padding:2.7em 20px 1.7em;
+  color:#353535;
+}
+.weui-dialog__ft{
+  position:relative;
+  line-height:48px;
+  font-size:16px;
+  display:-webkit-box;
+  display:-webkit-flex;
+  display:flex;
+}
+.weui-dialog__ft:after{
+  content:" ";
+  position:absolute;
+  left:0;
+  top:0;
+  right:0;
+  height:1px;
+  border-top:1px solid #D5D5D6;
+  color:#D5D5D6;
+  -webkit-transform-origin:0 0;
+          transform-origin:0 0;
+  -webkit-transform:scaleY(0.5);
+          transform:scaleY(0.5);
+}
+.weui-dialog__btn{
+  display:block;
+  -webkit-box-flex:1;
+  -webkit-flex:1;
+          flex:1;
+  color:#00a7ff;
+  text-decoration:none;
+  -webkit-tap-highlight-color:rgba(0, 0, 0, 0);
+  position:relative;
+}
+.weui-dialog__btn:active{
+  background-color:#EEEEEE;
+}
+.weui-dialog__btn:after{
+  content:" ";
+  position:absolute;
+  left:0;
+  top:0;
+  width:1px;
+  bottom:0;
+  border-left:1px solid #D5D5D6;
+  color:#D5D5D6;
+  -webkit-transform-origin:0 0;
+          transform-origin:0 0;
+  -webkit-transform:scaleX(0.5);
+          transform:scaleX(0.5);
+}
+.weui-dialog__btn:first-child:after{
+  display:none;
+}
+.weui-dialog__btn_default{
+  color:#353535;
+}
+.weui-dialog__btn_primary{
+  color:#0BB20C;
+}
+.weui-skin_android .weui-dialog{
+  text-align:left;
+  box-shadow:0 6px 30px 0 rgba(0, 0, 0, 0.1);
+}
+.weui-skin_android .weui-dialog__title{
+  font-size:21px;
+}
+.weui-skin_android .weui-dialog__hd{
+  text-align:left;
+}
+.weui-skin_android .weui-dialog__bd{
+  color:#999999;
+  padding:0.25em 1.6em 2em;
+  font-size:17px;
+  text-align:left;
+}
+.weui-skin_android .weui-dialog__bd:first-child{
+  padding:1.6em 1.6em 2em;
+  color:#353535;
+}
+.weui-skin_android .weui-dialog__ft{
+  display:block;
+  text-align:right;
+  line-height:42px;
+  font-size:16px;
+  padding:0 1.6em 0.7em;
+}
+.weui-skin_android .weui-dialog__ft:after{
+  display:none;
+}
+.weui-skin_android .weui-dialog__btn{
+  display:inline-block;
+  vertical-align:top;
+  padding:0 .8em;
+}
+.weui-skin_android .weui-dialog__btn:after{
+  display:none;
+}
+.weui-skin_android .weui-dialog__btn:active{
+  background-color:rgba(0, 0, 0, 0.06);
+}
+.weui-skin_android .weui-dialog__btn:visited{
+  background-color:rgba(0, 0, 0, 0.06);
+}
+.weui-skin_android .weui-dialog__btn:last-child{
+  margin-right:-0.8em;
+}
+.weui-skin_android .weui-dialog__btn_default{
+  color:#808080;
+}
+@media screen and (min-width: 1024px){
+  .weui-dialog{
+    width:35%;
+  }
+}
+.weui-toast{
+  position:fixed;
+  z-index:5000;
+  width:7.6em;
+  min-height:7.6em;
+  top:180px;
+  left:50%;
+  margin-left:-3.8em;
+  background:rgba(17, 17, 17, 0.7);
+  text-align:center;
+  border-radius:5px;
+  color:#FFFFFF;
+}
+.weui-icon_toast{
+  margin:22px 0 0;
+  display:block;
+}
+.weui-icon_toast.weui-icon-success-no-circle:before{
+  color:#FFFFFF;
+  font-size:55px;
+}
+.weui-icon_toast.weui-loading{
+  margin:30px 0 0;
+  width:38px;
+  height:38px;
+  vertical-align:baseline;
+}
+.weui-toast__content{
+  margin:0 0 15px;
+}
+.weui-toast_content{
+  color: #fff;
+}
+.weui-mask{
+  position:fixed;
+  z-index:1000;
+  top:0;
+  right:0;
+  left:0;
+  bottom:0;
+  background:rgba(0, 0, 0, 0.6);
+}
+.weui-mask_transparent{
+  position:fixed;
+  z-index:1000;
+  top:0;
+  right:0;
+  left:0;
+  bottom:0;
+}
+.weui-actionsheet{
+  position:fixed;
+  left:0;
+  bottom:0;
+  -webkit-transform:translate(0, 100%);
+          transform:translate(0, 100%);
+  -webkit-backface-visibility:hidden;
+          backface-visibility:hidden;
+  z-index:5000;
+  width:100%;
+  background-color:#EFEFF4;
+  -webkit-transition:-webkit-transform .3s;
+  transition:-webkit-transform .3s;
+  transition:transform .3s;
+  transition:transform .3s, -webkit-transform .3s;
+}
+.weui-actionsheet__title{
+  position:relative;
+  height:65px;
+  padding:0 20px;
+  line-height:1.4;
+  display:-webkit-box;
+  display:-webkit-flex;
+  display:flex;
+  -webkit-box-pack:center;
+  -webkit-justify-content:center;
+          justify-content:center;
+  -webkit-box-orient:vertical;
+  -webkit-box-direction:normal;
+  -webkit-flex-direction:column;
+          flex-direction:column;
+  text-align:center;
+  font-size:14px;
+  color:#888;
+  background:#FCFCFD;
+}
+.weui-actionsheet__title:before{
+  content:" ";
+  position:absolute;
+  left:0;
+  bottom:0;
+  right:0;
+  height:1px;
+  border-bottom:1px solid #e5e5e5;
+  color:#e5e5e5;
+  -webkit-transform-origin:0 100%;
+          transform-origin:0 100%;
+  -webkit-transform:scaleY(0.5);
+          transform:scaleY(0.5);
+}
+.weui-actionsheet__title .weui-actionsheet__title-text{
+  overflow:hidden;
+  text-overflow:ellipsis;
+  display:-webkit-box;
+  -webkit-box-orient:vertical;
+  -webkit-line-clamp:2;
+}
+.weui-actionsheet__menu{
+  background-color:#FCFCFD;
+}
+.weui-actionsheet__action{
+  margin-top:6px;
+  background-color:#FCFCFD;
+}
+.weui-actionsheet__cell{
+  position:relative;
+  padding:10px 0;
+  text-align:center;
+  font-size:18px;
+}
+.weui-actionsheet__cell:before{
+  content:" ";
+  position:absolute;
+  left:0;
+  top:0;
+  right:0;
+  height:1px;
+  border-top:1px solid #e5e5e5;
+  color:#e5e5e5;
+  -webkit-transform-origin:0 0;
+          transform-origin:0 0;
+  -webkit-transform:scaleY(0.5);
+          transform:scaleY(0.5);
+}
+.weui-actionsheet__cell:active{
+  background-color:#ECECEC;
+}
+.weui-actionsheet__cell:first-child:before{
+  display:none;
+}
+.weui-skin_android .weui-actionsheet{
+  position:fixed;
+  left:50%;
+  top:50%;
+  bottom:auto;
+  -webkit-transform:translate(-50%, -50%);
+          transform:translate(-50%, -50%);
+  width:274px;
+  box-sizing:border-box;
+  -webkit-backface-visibility:hidden;
+          backface-visibility:hidden;
+  background:transparent;
+  -webkit-transition:-webkit-transform .3s;
+  transition:-webkit-transform .3s;
+  transition:transform .3s;
+  transition:transform .3s, -webkit-transform .3s;
+}
+.weui-skin_android .weui-actionsheet__action{
+  display:none;
+}
+.weui-skin_android .weui-actionsheet__menu{
+  border-radius:2px;
+  box-shadow:0 6px 30px 0 rgba(0, 0, 0, 0.1);
+}
+.weui-skin_android .weui-actionsheet__cell{
+  padding:13px 24px;
+  font-size:16px;
+  line-height:1.4;
+  text-align:left;
+}
+.weui-skin_android .weui-actionsheet__cell:first-child{
+  border-top-left-radius:2px;
+  border-top-right-radius:2px;
+}
+.weui-skin_android .weui-actionsheet__cell:last-child{
+  border-bottom-left-radius:2px;
+  border-bottom-right-radius:2px;
+}
+.weui-actionsheet_toggle{
+  -webkit-transform:translate(0, 0);
+          transform:translate(0, 0);
+}
+.weui-loadmore{
+  width:65%;
+  margin:1.5em auto;
+  line-height:1.6em;
+  font-size:14px;
+  text-align:center;
+}
+.weui-loadmore__tips{
+  display:inline-block;
+  vertical-align:middle;
+}
+.weui-loadmore_line{
+  border-top:1px solid #E5E5E5;
+  margin-top:2.4em;
+}
+.weui-loadmore_line .weui-loadmore__tips{
+  position:relative;
+  top:-0.9em;
+  padding:0 .55em;
+  background-color:#FFFFFF;
+  color:#999999;
+}
+.weui-loadmore_dot .weui-loadmore__tips{
+  padding:0 .16em;
+}
+.weui-loadmore_dot .weui-loadmore__tips:before{
+  content:" ";
+  width:4px;
+  height:4px;
+  border-radius:50%;
+  background-color:#E5E5E5;
+  display:inline-block;
+  position:relative;
+  vertical-align:0;
+  top:-0.16em;
+}
+.weui-badge{
+  display:inline-block;
+  padding:.15em .4em;
+  min-width:8px;
+  border-radius:18px;
+  background-color:#F43530;
+  color:#FFFFFF;
+  line-height:1.2;
+  text-align:center;
+  font-size:12px;
+  vertical-align:middle;
+}
+.weui-badge_dot{
+  padding:.4em;
+  min-width:0;
+}
+.weui-search-bar{
+  position:relative;
+  padding:8px 10px;
+  display:-webkit-box;
+  display:-webkit-flex;
+  display:flex;
+  box-sizing:border-box;
+  -webkit-text-size-adjust:100%;
+  -webkit-box-align:center;
+  -webkit-align-items:center;
+          align-items:center;
+}
+.weui-search-bar:before{
+  content:" ";
+  position:absolute;
+  left:0;
+  top:0;
+  right:0;
+  height:1px;
+  color:#D7D6DC;
+  -webkit-transform-origin:0 0;
+          transform-origin:0 0;
+  -webkit-transform:scaleY(0.5);
+          transform:scaleY(0.5);
+}
+.weui-search-bar:after{
+  content:" ";
+  position:absolute;
+  left:0;
+  bottom:0;
+  right:0;
+  height:1px;
+  color:#D7D6DC;
+  -webkit-transform-origin:0 100%;
+          transform-origin:0 100%;
+  -webkit-transform:scaleY(0.5);
+          transform:scaleY(0.5);
+}
+.weui-search-bar.weui-search-bar_focusing .weui-search-bar__cancel-btn{
+  display:block;
+}
+.weui-search-bar.weui-search-bar_focusing .weui-search-bar__label{
+  display:none;
+}
+.weui-search-bar__form{
+  position:relative;
+  -webkit-box-flex:1;
+  -webkit-flex:auto;
+          flex:auto;
+  background-color:#EFEFF4;
+}
+.weui-search-bar__form:after{
+  content:'';
+  position:absolute;
+  left:0;
+  top:0;
+  width:200%;
+  height:200%;
+  -webkit-transform:scale(0.5);
+          transform:scale(0.5);
+  -webkit-transform-origin:0 0;
+          transform-origin:0 0;
+  border-radius:10px;
+  border:1px solid #E6E6EA;
+  box-sizing:border-box;
+  background:#FFFFFF;
+}
+.weui-search-bar__box{
+  position:relative;
+  padding-left:30px;
+  padding-right:30px;
+  height:100%;
+  width:100%;
+  box-sizing:border-box;
+  z-index:1;
+}
+.weui-search-bar__box .weui-search-bar__input{
+  padding:4px 0;
+  width:100%;
+  height:1.42857143em;
+  border:0;
+  font-size:14px;
+  line-height:1.42857143em;
+  box-sizing:content-box;
+  background:transparent;
+}
+.weui-search-bar__box .weui-search-bar__input:focus{
+  outline:none;
+}
+.weui-search-bar__box .weui-icon-search{
+  position:absolute;
+  top:50%;
+  left:10px;
+  margin-top:-14px;
+  line-height:28px;
+}
+.weui-search-bar__box .weui-icon-clear{
+  position:absolute;
+  top:50%;
+  right:0;
+  margin-top:-14px;
+  padding:0 10px;
+  line-height:28px;
+}
+.weui-search-bar__label{
+  position:absolute;
+  top:1px;
+  right:1px;
+  bottom:1px;
+  left:1px;
+  z-index:2;
+  border-radius:3px;
+  text-align:center;
+  color:#9B9B9B;
+  background:#FFFFFF;
+  padding-top:2px;
+}
+.weui-search-bar__label span{
+  display:inline-block;
+  font-size:14px;
+  vertical-align:middle;
+}
+.weui-search-bar__label .weui-icon-search{
+  margin-right:5px;
+}
+.weui-search-bar__cancel-btn{
+  display:none;
+  margin-left:10px;
+  line-height:28px;
+  color:#00a7ff;
+  white-space:nowrap;
+}
+.weui-search-bar__input:not(:valid) ~ .weui-icon-clear{
+  display:none;
+}
+input[type="search"]::-webkit-search-decoration,
+input[type="search"]::-webkit-search-cancel-button,
+input[type="search"]::-webkit-search-results-button,
+input[type="search"]::-webkit-search-results-decoration{
+  display:none;
+}
+.weui-picker{
+  position:fixed;
+  width:100%;
+  left:0;
+  bottom:0;
+  z-index:5000;
+  -webkit-backface-visibility:hidden;
+          backface-visibility:hidden;
+  -webkit-transform:translate(0, 100%);
+          transform:translate(0, 100%);
+  -webkit-transition:-webkit-transform .3s;
+  transition:-webkit-transform .3s;
+  transition:transform .3s;
+  transition:transform .3s, -webkit-transform .3s;
+}
+.weui-picker__hd{
+  display:-webkit-box;
+  display:-webkit-flex;
+  display:flex;
+  padding:9px 15px;
+  background-color:#fff;
+  position:relative;
+  text-align:center;
+  font-size:17px;
+}
+.weui-picker__hd:after{
+  content:" ";
+  position:absolute;
+  left:0;
+  bottom:0;
+  right:0;
+  height:1px;
+  border-bottom:1px solid #E5E5E5;
+  color:#E5E5E5;
+  -webkit-transform-origin:0 100%;
+          transform-origin:0 100%;
+  -webkit-transform:scaleY(0.5);
+          transform:scaleY(0.5);
+}
+.weui-picker__action{
+  display:block;
+  -webkit-box-flex:1;
+  -webkit-flex:1;
+          flex:1;
+  color:#00a7ff;
+}
+.weui-picker__action:first-child{
+  text-align:left;
+  color:#888;
+}
+.weui-picker__action:last-child{
+  text-align:right;
+}
+.weui-picker__bd{
+  display:-webkit-box;
+  display:-webkit-flex;
+  display:flex;
+  position:relative;
+  background-color:#fff;
+  height:238px;
+  overflow:hidden;
+}
+.weui-picker__group{
+  -webkit-box-flex:1;
+  -webkit-flex:1;
+          flex:1;
+  position:relative;
+  height:100%;
+}
+.weui-picker__mask{
+  position:absolute;
+  top:0;
+  left:0;
+  width:100%;
+  height:100%;
+  margin:0 auto;
+  z-index:3;
+  background:-webkit-linear-gradient(top, rgba(255, 255, 255, 0.95), rgba(255, 255, 255, 0.6)), -webkit-linear-gradient(bottom, rgba(255, 255, 255, 0.95), rgba(255, 255, 255, 0.6));
+  background:linear-gradient(180deg, rgba(255, 255, 255, 0.95), rgba(255, 255, 255, 0.6)), linear-gradient(0deg, rgba(255, 255, 255, 0.95), rgba(255, 255, 255, 0.6));
+  background-position:top, bottom;
+  background-size:100% 102px;
+  background-repeat:no-repeat;
+  -webkit-transform:translateZ(0);
+          transform:translateZ(0);
+}
+.weui-picker__indicator{
+  width:100%;
+  height:34px;
+  position:absolute;
+  left:0;
+  top:102px;
+  z-index:3;
+}
+.weui-picker__indicator:before{
+  content:" ";
+  position:absolute;
+  left:0;
+  top:0;
+  right:0;
+  height:1px;
+  border-top:1px solid #E5E5E5;
+  color:#E5E5E5;
+  -webkit-transform-origin:0 0;
+          transform-origin:0 0;
+  -webkit-transform:scaleY(0.5);
+          transform:scaleY(0.5);
+}
+.weui-picker__indicator:after{
+  content:" ";
+  position:absolute;
+  left:0;
+  bottom:0;
+  right:0;
+  height:1px;
+  border-bottom:1px solid #E5E5E5;
+  color:#E5E5E5;
+  -webkit-transform-origin:0 100%;
+          transform-origin:0 100%;
+  -webkit-transform:scaleY(0.5);
+          transform:scaleY(0.5);
+}
+.weui-picker__content{
+  position:absolute;
+  top:0;
+  left:0;
+  width:100%;
+}
+.weui-picker__item{
+  padding:0;
+  height:34px;
+  line-height:34px;
+  text-align:center;
+  color:#000;
+  text-overflow:ellipsis;
+  white-space:nowrap;
+  overflow:hidden;
+}
+.weui-picker__item_disabled{
+  color:#999999;
+}
+@-webkit-keyframes slideUp{
+  from{
+    -webkit-transform:translate3d(0, 100%, 0);
+            transform:translate3d(0, 100%, 0);
+  }
+  to{
+    -webkit-transform:translate3d(0, 0, 0);
+            transform:translate3d(0, 0, 0);
+  }
+}
+@keyframes slideUp{
+  from{
+    -webkit-transform:translate3d(0, 100%, 0);
+            transform:translate3d(0, 100%, 0);
+  }
+  to{
+    -webkit-transform:translate3d(0, 0, 0);
+            transform:translate3d(0, 0, 0);
+  }
+}
+.weui-animate-slide-up{
+  -webkit-animation:slideUp ease .3s forwards;
+          animation:slideUp ease .3s forwards;
+}
+@-webkit-keyframes slideDown{
+  from{
+    -webkit-transform:translate3d(0, 0, 0);
+            transform:translate3d(0, 0, 0);
+  }
+  to{
+    -webkit-transform:translate3d(0, 100%, 0);
+            transform:translate3d(0, 100%, 0);
+  }
+}
+@keyframes slideDown{
+  from{
+    -webkit-transform:translate3d(0, 0, 0);
+            transform:translate3d(0, 0, 0);
+  }
+  to{
+    -webkit-transform:translate3d(0, 100%, 0);
+            transform:translate3d(0, 100%, 0);
+  }
+}
+.weui-animate-slide-down{
+  -webkit-animation:slideDown ease .3s forwards;
+          animation:slideDown ease .3s forwards;
+}
+@-webkit-keyframes fadeIn{
+  from{
+    opacity:0;
+  }
+  to{
+    opacity:1;
+  }
+}
+@keyframes fadeIn{
+  from{
+    opacity:0;
+  }
+  to{
+    opacity:1;
+  }
+}
+.weui-animate-fade-in{
+  -webkit-animation:fadeIn ease .3s forwards;
+          animation:fadeIn ease .3s forwards;
+}
+@-webkit-keyframes fadeOut{
+  from{
+    opacity:1;
+  }
+  to{
+    opacity:0;
+  }
+}
+@keyframes fadeOut{
+  from{
+    opacity:1;
+  }
+  to{
+    opacity:0;
+  }
+}
+.weui-animate-fade-out{
+  -webkit-animation:fadeOut ease .3s forwards;
+          animation:fadeOut ease .3s forwards;
+}
+.weui-agree{
+  display:block;
+  padding:.5em 15px;
+  font-size:13px;
+}
+.weui-agree a{
+  color:#586C94;
+}
+.weui-agree__text{
+  color:#999999;
+}
+.weui-agree__checkbox{
+  -webkit-appearance:none;
+          appearance:none;
+  outline:0;
+  font-size:0;
+  border:1px solid #D1D1D1;
+  background-color:#FFFFFF;
+  border-radius:3px;
+  width:13px;
+  height:13px;
+  position:relative;
+  vertical-align:0;
+  top:2px;
+}
+.weui-agree__checkbox:checked:before{
+  font-family:"weui";
+  font-style:normal;
+  font-weight:normal;
+  font-variant:normal;
+  text-transform:none;
+  text-align:center;
+  speak:none;
+  display:inline-block;
+  vertical-align:middle;
+  text-decoration:inherit;
+  content:"\EA08";
+  color:#00a7ff;
+  font-size:13px;
+  position:absolute;
+  top:50%;
+  left:50%;
+  -webkit-transform:translate(-50%, -48%) scale(0.73);
+          transform:translate(-50%, -48%) scale(0.73);
+}
+.weui-agree__checkbox:disabled{
+  background-color:#E1E1E1;
+}
+.weui-agree__checkbox:disabled:before{
+  color:#ADADAD;
+}
+.weui-loading{
+  width:20px;
+  height:20px;
+  display:inline-block;
+  vertical-align:middle;
+  -webkit-animation:weuiLoading 1s steps(12, end) infinite;
+          animation:weuiLoading 1s steps(12, end) infinite;
+  background:transparent url("data:image/svg+xml;charset=utf8, %3Csvg xmlns='http://www.w3.org/2000/svg' width='120' height='120' viewBox='0 0 100 100'%3E%3Cpath fill='none' d='M0 0h100v100H0z'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23E9E9E9' rx='5' ry='5' transform='translate(0 -30)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23989697' rx='5' ry='5' transform='rotate(30 105.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%239B999A' rx='5' ry='5' transform='rotate(60 75.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23A3A1A2' rx='5' ry='5' transform='rotate(90 65 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23ABA9AA' rx='5' ry='5' transform='rotate(120 58.66 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23B2B2B2' rx='5' ry='5' transform='rotate(150 54.02 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23BAB8B9' rx='5' ry='5' transform='rotate(180 50 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23C2C0C1' rx='5' ry='5' transform='rotate(-150 45.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23CBCBCB' rx='5' ry='5' transform='rotate(-120 41.34 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23D2D2D2' rx='5' ry='5' transform='rotate(-90 35 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23DADADA' rx='5' ry='5' transform='rotate(-60 24.02 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23E2E2E2' rx='5' ry='5' transform='rotate(-30 -5.98 65)'/%3E%3C/svg%3E") no-repeat;
+  background-size:100%;
+}
+.weui-loading.weui-loading_transparent,
+.weui-btn_loading.weui-btn_primary .weui-loading,
+.weui-btn_loading.weui-btn_warn .weui-loading{
+  background-image:url("data:image/svg+xml;charset=utf8, %3Csvg xmlns='http://www.w3.org/2000/svg' width='120' height='120' viewBox='0 0 100 100'%3E%3Cpath fill='none' d='M0 0h100v100H0z'/%3E%3Crect xmlns='http://www.w3.org/2000/svg' width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.56)' rx='5' ry='5' transform='translate(0 -30)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.5)' rx='5' ry='5' transform='rotate(30 105.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.43)' rx='5' ry='5' transform='rotate(60 75.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.38)' rx='5' ry='5' transform='rotate(90 65 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.32)' rx='5' ry='5' transform='rotate(120 58.66 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.28)' rx='5' ry='5' transform='rotate(150 54.02 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.25)' rx='5' ry='5' transform='rotate(180 50 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.2)' rx='5' ry='5' transform='rotate(-150 45.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.17)' rx='5' ry='5' transform='rotate(-120 41.34 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.14)' rx='5' ry='5' transform='rotate(-90 35 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.1)' rx='5' ry='5' transform='rotate(-60 24.02 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.03)' rx='5' ry='5' transform='rotate(-30 -5.98 65)'/%3E%3C/svg%3E");
+}
+@-webkit-keyframes weuiLoading{
+  0%{
+    -webkit-transform:rotate3d(0, 0, 1, 0deg);
+            transform:rotate3d(0, 0, 1, 0deg);
+  }
+  100%{
+    -webkit-transform:rotate3d(0, 0, 1, 360deg);
+            transform:rotate3d(0, 0, 1, 360deg);
+  }
+}
+@keyframes weuiLoading{
+  0%{
+    -webkit-transform:rotate3d(0, 0, 1, 0deg);
+            transform:rotate3d(0, 0, 1, 0deg);
+  }
+  100%{
+    -webkit-transform:rotate3d(0, 0, 1, 360deg);
+            transform:rotate3d(0, 0, 1, 360deg);
+  }
+}
+.weui-slider{
+  padding:15px 18px;
+  -webkit-user-select:none;
+          user-select:none;
+}
+.weui-slider__inner{
+  position:relative;
+  height:2px;
+  background-color:#E9E9E9;
+}
+.weui-slider__track{
+  height:2px;
+  background-color:#00a7ff;
+  width:0;
+}
+.weui-slider__handler{
+  position:absolute;
+  left:0;
+  top:50%;
+  width:28px;
+  height:28px;
+  margin-left:-14px;
+  margin-top:-14px;
+  border-radius:50%;
+  background-color:#FFFFFF;
+  box-shadow:0 0 4px rgba(0, 0, 0, 0.2);
+}
+.weui-slider-box{
+  display:-webkit-box;
+  display:-webkit-flex;
+  display:flex;
+  -webkit-box-align:center;
+  -webkit-align-items:center;
+          align-items:center;
+}
+.weui-slider-box .weui-slider{
+  -webkit-box-flex:1;
+  -webkit-flex:1;
+          flex:1;
+}
+.weui-slider-box__value{
+  margin-left:.5em;
+  min-width:24px;
+  color:#888888;
+  text-align:center;
+  font-size:14px;
+}
+.swiper-container {
+  margin: 0 auto;
+  position: relative;
+  overflow: hidden;
+  /* Fix of Webkit flickering */
+  z-index: 1;
+}
+.swiper-container-no-flexbox .swiper-slide {
+  float: left;
+}
+.swiper-container-vertical > .swiper-wrapper {
+  -webkit-box-orient: vertical;
+  -ms-flex-direction: column;
+  flex-direction: column;
+}
+.swiper-wrapper {
+  position: relative;
+  width: 100%;
+  height: 100%;
+  z-index: 1;
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-transition-property: -webkit-transform;
+  transition-property: -webkit-transform;
+  transition-property: transform;
+  transition-property: transform, -webkit-transform;
+  box-sizing: content-box;
+}
+.swiper-container-android .swiper-slide,
+.swiper-wrapper {
+  -webkit-transform: translate3d(0px, 0, 0);
+  transform: translate3d(0px, 0, 0);
+}
+.swiper-container-multirow > .swiper-wrapper {
+  -webkit-box-lines: multiple;
+  -moz-box-lines: multiple;
+  -ms-flex-wrap: wrap;
+  flex-wrap: wrap;
+}
+.swiper-container-free-mode > .swiper-wrapper {
+  -webkit-transition-timing-function: ease-out;
+  transition-timing-function: ease-out;
+  margin: 0 auto;
+}
+.swiper-slide {
+  -webkit-flex-shrink: 0;
+  -ms-flex: 0 0 auto;
+  -ms-flex-negative: 0;
+      flex-shrink: 0;
+  width: 100%;
+  height: 100%;
+  position: relative;
+}
+/* Auto Height */
+.swiper-container-autoheight,
+.swiper-container-autoheight .swiper-slide {
+  height: auto;
+}
+.swiper-container-autoheight .swiper-wrapper {
+  -webkit-box-align: start;
+  -ms-flex-align: start;
+  align-items: flex-start;
+  -webkit-transition-property: -webkit-transform, height;
+  -webkit-transition-property: height, -webkit-transform;
+  transition-property: height, -webkit-transform;
+  transition-property: transform, height;
+  transition-property: transform, height, -webkit-transform;
+}
+/* a11y */
+.swiper-container .swiper-notification {
+  position: absolute;
+  left: 0;
+  top: 0;
+  pointer-events: none;
+  opacity: 0;
+  z-index: -1000;
+}
+/* IE10 Windows Phone 8 Fixes */
+.swiper-wp8-horizontal {
+  -ms-touch-action: pan-y;
+  touch-action: pan-y;
+}
+.swiper-wp8-vertical {
+  -ms-touch-action: pan-x;
+  touch-action: pan-x;
+}
+/* Arrows */
+.swiper-button-prev,
+.swiper-button-next {
+  position: absolute;
+  top: 50%;
+  width: 27px;
+  height: 44px;
+  margin-top: -22px;
+  z-index: 10;
+  cursor: pointer;
+  background-size: 27px 44px;
+  background-position: center;
+  background-repeat: no-repeat;
+}
+.swiper-button-prev.swiper-button-disabled,
+.swiper-button-next.swiper-button-disabled {
+  opacity: 0.35;
+  cursor: auto;
+  pointer-events: none;
+}
+.swiper-button-prev,
+.swiper-container-rtl .swiper-button-next {
+  background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2027%2044'%3E%3Cpath%20d%3D'M0%2C22L22%2C0l2.1%2C2.1L4.2%2C22l19.9%2C19.9L22%2C44L0%2C22L0%2C22L0%2C22z'%20fill%3D'%23007aff'%2F%3E%3C%2Fsvg%3E");
+  left: 10px;
+  right: auto;
+}
+.swiper-button-prev.swiper-button-black,
+.swiper-container-rtl .swiper-button-next.swiper-button-black {
+  background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2027%2044'%3E%3Cpath%20d%3D'M0%2C22L22%2C0l2.1%2C2.1L4.2%2C22l19.9%2C19.9L22%2C44L0%2C22L0%2C22L0%2C22z'%20fill%3D'%23000000'%2F%3E%3C%2Fsvg%3E");
+}
+.swiper-button-prev.swiper-button-white,
+.swiper-container-rtl .swiper-button-next.swiper-button-white {
+  background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2027%2044'%3E%3Cpath%20d%3D'M0%2C22L22%2C0l2.1%2C2.1L4.2%2C22l19.9%2C19.9L22%2C44L0%2C22L0%2C22L0%2C22z'%20fill%3D'%23ffffff'%2F%3E%3C%2Fsvg%3E");
+}
+.swiper-button-next,
+.swiper-container-rtl .swiper-button-prev {
+  background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2027%2044'%3E%3Cpath%20d%3D'M27%2C22L27%2C22L5%2C44l-2.1-2.1L22.8%2C22L2.9%2C2.1L5%2C0L27%2C22L27%2C22z'%20fill%3D'%23007aff'%2F%3E%3C%2Fsvg%3E");
+  right: 10px;
+  left: auto;
+}
+.swiper-button-next.swiper-button-black,
+.swiper-container-rtl .swiper-button-prev.swiper-button-black {
+  background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2027%2044'%3E%3Cpath%20d%3D'M27%2C22L27%2C22L5%2C44l-2.1-2.1L22.8%2C22L2.9%2C2.1L5%2C0L27%2C22L27%2C22z'%20fill%3D'%23000000'%2F%3E%3C%2Fsvg%3E");
+}
+.swiper-button-next.swiper-button-white,
+.swiper-container-rtl .swiper-button-prev.swiper-button-white {
+  background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2027%2044'%3E%3Cpath%20d%3D'M27%2C22L27%2C22L5%2C44l-2.1-2.1L22.8%2C22L2.9%2C2.1L5%2C0L27%2C22L27%2C22z'%20fill%3D'%23ffffff'%2F%3E%3C%2Fsvg%3E");
+}
+/* Pagination Styles */
+.swiper-pagination {
+  position: absolute;
+  text-align: center;
+  -webkit-transition: 300ms;
+  transition: 300ms;
+  -webkit-transform: translate3d(0, 0, 0);
+  transform: translate3d(0, 0, 0);
+  z-index: 10;
+}
+.swiper-pagination.swiper-pagination-hidden {
+  opacity: 0;
+}
+/* Common Styles */
+.swiper-pagination-fraction,
+.swiper-pagination-custom,
+.swiper-container-horizontal > .swiper-pagination-bullets {
+  bottom: 10px;
+  left: 0;
+  width: 100%;
+}
+/* Bullets */
+.swiper-pagination-bullet {
+  width: 8px;
+  height: 8px;
+  display: inline-block;
+  border-radius: 100%;
+  background: #000;
+  opacity: 0.2;
+}
+button.swiper-pagination-bullet {
+  border: none;
+  margin: 0;
+  padding: 0;
+  box-shadow: none;
+  -moz-appearance: none;
+  -ms-appearance: none;
+  -webkit-appearance: none;
+  appearance: none;
+}
+.swiper-pagination-clickable .swiper-pagination-bullet {
+  cursor: pointer;
+}
+.swiper-pagination-white .swiper-pagination-bullet {
+  background: #fff;
+}
+.swiper-pagination-bullet-active {
+  opacity: 1;
+  background: #076ba7;
+}
+.swiper-pagination-white .swiper-pagination-bullet-active {
+  background: #fff;
+}
+.swiper-pagination-black .swiper-pagination-bullet-active {
+  background: #000;
+}
+.swiper-container-vertical > .swiper-pagination-bullets {
+  right: 10px;
+  top: 50%;
+  -webkit-transform: translate3d(0px, -50%, 0);
+  transform: translate3d(0px, -50%, 0);
+}
+.swiper-container-vertical > .swiper-pagination-bullets .swiper-pagination-bullet {
+  margin: 5px 0;
+  display: block;
+}
+.swiper-container-horizontal > .swiper-pagination-bullets .swiper-pagination-bullet {
+  margin: 0 5px;
+}
+/* Progress */
+.swiper-pagination-progress {
+  background: rgba(0, 0, 0, 0.25);
+  position: absolute;
+}
+.swiper-pagination-progress .swiper-pagination-progressbar {
+  background: #007aff;
+  position: absolute;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  -webkit-transform: scale(0);
+  transform: scale(0);
+  -webkit-transform-origin: left top;
+  transform-origin: left top;
+}
+.swiper-container-rtl .swiper-pagination-progress .swiper-pagination-progressbar {
+  -webkit-transform-origin: right top;
+  transform-origin: right top;
+}
+.swiper-container-horizontal > .swiper-pagination-progress {
+  width: 100%;
+  height: 4px;
+  left: 0;
+  top: 0;
+}
+.swiper-container-vertical > .swiper-pagination-progress {
+  width: 4px;
+  height: 100%;
+  left: 0;
+  top: 0;
+}
+.swiper-pagination-progress.swiper-pagination-white {
+  background: rgba(255, 255, 255, 0.5);
+}
+.swiper-pagination-progress.swiper-pagination-white .swiper-pagination-progressbar {
+  background: #fff;
+}
+.swiper-pagination-progress.swiper-pagination-black .swiper-pagination-progressbar {
+  background: #000;
+}
+/* 3D Container */
+.swiper-container-3d {
+  -webkit-perspective: 1200px;
+  -o-perspective: 1200px;
+  perspective: 1200px;
+}
+.swiper-container-3d .swiper-wrapper,
+.swiper-container-3d .swiper-slide,
+.swiper-container-3d .swiper-slide-shadow-left,
+.swiper-container-3d .swiper-slide-shadow-right,
+.swiper-container-3d .swiper-slide-shadow-top,
+.swiper-container-3d .swiper-slide-shadow-bottom,
+.swiper-container-3d .swiper-cube-shadow {
+  -webkit-transform-style: preserve-3d;
+  transform-style: preserve-3d;
+}
+.swiper-container-3d .swiper-slide-shadow-left,
+.swiper-container-3d .swiper-slide-shadow-right,
+.swiper-container-3d .swiper-slide-shadow-top,
+.swiper-container-3d .swiper-slide-shadow-bottom {
+  position: absolute;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  pointer-events: none;
+  z-index: 10;
+}
+.swiper-container-3d .swiper-slide-shadow-left {
+  background-image: -webkit-gradient(linear, left top, right top, from(rgba(0, 0, 0, 0.5)), to(rgba(0, 0, 0, 0)));
+  /* Safari 4+, Chrome */
+  background-image: -webkit-linear-gradient(right, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0));
+  /* Chrome 10+, Safari 5.1+, iOS 5+ */
+  /* Firefox 3.6-15 */
+  /* Opera 11.10-12.00 */
+  background-image: linear-gradient(to left, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0));
+  /* Firefox 16+, IE10, Opera 12.50+ */
+}
+.swiper-container-3d .swiper-slide-shadow-right {
+  background-image: -webkit-gradient(linear, right top, left top, from(rgba(0, 0, 0, 0.5)), to(rgba(0, 0, 0, 0)));
+  /* Safari 4+, Chrome */
+  background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0));
+  /* Chrome 10+, Safari 5.1+, iOS 5+ */
+  /* Firefox 3.6-15 */
+  /* Opera 11.10-12.00 */
+  background-image: linear-gradient(to right, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0));
+  /* Firefox 16+, IE10, Opera 12.50+ */
+}
+.swiper-container-3d .swiper-slide-shadow-top {
+  background-image: -webkit-gradient(linear, left top, left bottom, from(rgba(0, 0, 0, 0.5)), to(rgba(0, 0, 0, 0)));
+  /* Safari 4+, Chrome */
+  background-image: -webkit-linear-gradient(bottom, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0));
+  /* Chrome 10+, Safari 5.1+, iOS 5+ */
+  /* Firefox 3.6-15 */
+  /* Opera 11.10-12.00 */
+  background-image: linear-gradient(to top, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0));
+  /* Firefox 16+, IE10, Opera 12.50+ */
+}
+.swiper-container-3d .swiper-slide-shadow-bottom {
+  background-image: -webkit-gradient(linear, left bottom, left top, from(rgba(0, 0, 0, 0.5)), to(rgba(0, 0, 0, 0)));
+  /* Safari 4+, Chrome */
+  background-image: -webkit-linear-gradient(top, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0));
+  /* Chrome 10+, Safari 5.1+, iOS 5+ */
+  /* Firefox 3.6-15 */
+  /* Opera 11.10-12.00 */
+  background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0));
+  /* Firefox 16+, IE10, Opera 12.50+ */
+}
+/* Coverflow */
+.swiper-container-coverflow .swiper-wrapper,
+.swiper-container-flip .swiper-wrapper {
+  /* Windows 8 IE 10 fix */
+  -ms-perspective: 1200px;
+}
+/* Cube + Flip */
+.swiper-container-cube,
+.swiper-container-flip {
+  overflow: visible;
+}
+.swiper-container-cube .swiper-slide,
+.swiper-container-flip .swiper-slide {
+  pointer-events: none;
+  -webkit-backface-visibility: hidden;
+  backface-visibility: hidden;
+  z-index: 1;
+}
+.swiper-container-cube .swiper-slide .swiper-slide,
+.swiper-container-flip .swiper-slide .swiper-slide {
+  pointer-events: none;
+}
+.swiper-container-cube .swiper-slide-active,
+.swiper-container-flip .swiper-slide-active,
+.swiper-container-cube .swiper-slide-active .swiper-slide-active,
+.swiper-container-flip .swiper-slide-active .swiper-slide-active {
+  pointer-events: auto;
+}
+.swiper-container-cube .swiper-slide-shadow-top,
+.swiper-container-flip .swiper-slide-shadow-top,
+.swiper-container-cube .swiper-slide-shadow-bottom,
+.swiper-container-flip .swiper-slide-shadow-bottom,
+.swiper-container-cube .swiper-slide-shadow-left,
+.swiper-container-flip .swiper-slide-shadow-left,
+.swiper-container-cube .swiper-slide-shadow-right,
+.swiper-container-flip .swiper-slide-shadow-right {
+  z-index: 0;
+  -webkit-backface-visibility: hidden;
+  backface-visibility: hidden;
+}
+/* Cube */
+.swiper-container-cube .swiper-slide {
+  visibility: hidden;
+  -webkit-transform-origin: 0 0;
+  transform-origin: 0 0;
+  width: 100%;
+  height: 100%;
+}
+.swiper-container-cube.swiper-container-rtl .swiper-slide {
+  -webkit-transform-origin: 100% 0;
+  transform-origin: 100% 0;
+}
+.swiper-container-cube .swiper-slide-active,
+.swiper-container-cube .swiper-slide-next,
+.swiper-container-cube .swiper-slide-prev,
+.swiper-container-cube .swiper-slide-next + .swiper-slide {
+  pointer-events: auto;
+  visibility: visible;
+}
+.swiper-container-cube .swiper-cube-shadow {
+  position: absolute;
+  left: 0;
+  bottom: 0px;
+  width: 100%;
+  height: 100%;
+  background: #000;
+  opacity: 0.6;
+  -webkit-filter: blur(50px);
+  filter: blur(50px);
+  z-index: 0;
+}
+/* Fade */
+.swiper-container-fade.swiper-container-free-mode .swiper-slide {
+  -webkit-transition-timing-function: ease-out;
+  transition-timing-function: ease-out;
+}
+.swiper-container-fade .swiper-slide {
+  pointer-events: none;
+  -webkit-transition-property: opacity;
+  transition-property: opacity;
+}
+.swiper-container-fade .swiper-slide .swiper-slide {
+  pointer-events: none;
+}
+.swiper-container-fade .swiper-slide-active,
+.swiper-container-fade .swiper-slide-active .swiper-slide-active {
+  pointer-events: auto;
+}
+/* Scrollbar */
+.swiper-scrollbar {
+  border-radius: 10px;
+  position: relative;
+  -ms-touch-action: none;
+  background: rgba(0, 0, 0, 0.1);
+}
+.swiper-container-horizontal > .swiper-scrollbar {
+  position: absolute;
+  left: 1%;
+  bottom: 3px;
+  z-index: 50;
+  height: 5px;
+  width: 98%;
+}
+.swiper-container-vertical > .swiper-scrollbar {
+  position: absolute;
+  right: 3px;
+  top: 1%;
+  z-index: 50;
+  width: 5px;
+  height: 98%;
+}
+.swiper-scrollbar-drag {
+  height: 100%;
+  width: 100%;
+  position: relative;
+  background: rgba(0, 0, 0, 0.5);
+  border-radius: 10px;
+  left: 0;
+  top: 0;
+}
+.swiper-scrollbar-cursor-drag {
+  cursor: move;
+}
+/* Preloader */
+.swiper-lazy-preloader {
+  width: 42px;
+  height: 42px;
+  position: absolute;
+  left: 50%;
+  top: 50%;
+  margin-left: -21px;
+  margin-top: -21px;
+  z-index: 10;
+  -webkit-transform-origin: 50%;
+  transform-origin: 50%;
+  -webkit-animation: swiper-preloader-spin 1s steps(12, end) infinite;
+  animation: swiper-preloader-spin 1s steps(12, end) infinite;
+}
+.swiper-lazy-preloader:after {
+  display: block;
+  content: "";
+  width: 100%;
+  height: 100%;
+  background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20viewBox%3D'0%200%20120%20120'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20xmlns%3Axlink%3D'http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink'%3E%3Cdefs%3E%3Cline%20id%3D'l'%20x1%3D'60'%20x2%3D'60'%20y1%3D'7'%20y2%3D'27'%20stroke%3D'%236c6c6c'%20stroke-width%3D'11'%20stroke-linecap%3D'round'%2F%3E%3C%2Fdefs%3E%3Cg%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(30%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(60%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(90%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(120%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(150%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.37'%20transform%3D'rotate(180%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.46'%20transform%3D'rotate(210%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.56'%20transform%3D'rotate(240%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.66'%20transform%3D'rotate(270%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.75'%20transform%3D'rotate(300%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.85'%20transform%3D'rotate(330%2060%2C60)'%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E");
+  background-position: 50%;
+  background-size: 100%;
+  background-repeat: no-repeat;
+}
+.swiper-lazy-preloader-white:after {
+  background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20viewBox%3D'0%200%20120%20120'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20xmlns%3Axlink%3D'http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink'%3E%3Cdefs%3E%3Cline%20id%3D'l'%20x1%3D'60'%20x2%3D'60'%20y1%3D'7'%20y2%3D'27'%20stroke%3D'%23fff'%20stroke-width%3D'11'%20stroke-linecap%3D'round'%2F%3E%3C%2Fdefs%3E%3Cg%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(30%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(60%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(90%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(120%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(150%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.37'%20transform%3D'rotate(180%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.46'%20transform%3D'rotate(210%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.56'%20transform%3D'rotate(240%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.66'%20transform%3D'rotate(270%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.75'%20transform%3D'rotate(300%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.85'%20transform%3D'rotate(330%2060%2C60)'%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E");
+}
+@-webkit-keyframes swiper-preloader-spin {
+  100% {
+    -webkit-transform: rotate(360deg);
+  }
+}
+@keyframes swiper-preloader-spin {
+  100% {
+    -webkit-transform: rotate(360deg);
+            transform: rotate(360deg);
+  }
+}
+.w5{
+	width:5px;
+	height:20px;
+}
+.left50{
+	left:50%;
+} 
+.top50{
+	top:50%;
+}
+.bofang{
+	margin-left:-20px;
+	margin-top:-20px;
+}
+.lh40{
+	line-height:40px;
+}
+.bdb5{
+	border-bottom:5px solid #eee;
+}
+.wp33{
+	width:33%;
+}
diff --git a/pluss-wap-page/src/main/resources/static/resources/css/weui.min.css b/pluss-wap-page/src/main/resources/static/resources/css/weui.min.css
new file mode 100644
index 0000000..1be9c6d
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/css/weui.min.css
@@ -0,0 +1,2901 @@
+/*!
+ * WeUI v1.1.3 (https://github.com/weui/weui)
+ * Copyright 2018 Tencent, Inc.
+ * Licensed under the MIT license
+ */
+html {
+	-ms-text-size-adjust: 100%;
+	-webkit-text-size-adjust: 100%
+}
+
+body {
+	line-height: 1.6;
+	font-family: -apple-system-font, Helvetica Neue, sans-serif
+}
+
+* {
+	margin: 0;
+	padding: 0
+}
+
+a img {
+	border: 0
+}
+
+a {
+	text-decoration: none;
+	-webkit-tap-highlight-color: rgba(0, 0, 0, 0)
+}
+
+@font-face {
+	font-weight: 400;
+	font-style: normal;
+	font-family: weui;
+	src:
+		url('data:application/octet-stream;base64,AAEAAAALAIAAAwAwR1NVQrD+s+0AAAE4AAAAQk9TLzJAKEx+AAABfAAAAFZjbWFw65cFHQAAAhwAAAJQZ2x5ZvCRR/EAAASUAAAKtGhlYWQMPROtAAAA4AAAADZoaGVhCCwD+gAAALwAAAAkaG10eEJo//8AAAHUAAAASGxvY2EYqhW4AAAEbAAAACZtYXhwASEAVQAAARgAAAAgbmFtZeNcHtgAAA9IAAAB5nBvc3T6bLhLAAARMAAAAOYAAQAAA+gAAABaA+j/////A+kAAQAAAAAAAAAAAAAAAAAAABIAAQAAAAEAACbZbxtfDzz1AAsD6AAAAADUm2dvAAAAANSbZ2///wAAA+kD6gAAAAgAAgAAAAAAAAABAAAAEgBJAAUAAAAAAAIAAAAKAAoAAAD/AAAAAAAAAAEAAAAKAB4ALAABREZMVAAIAAQAAAAAAAAAAQAAAAFsaWdhAAgAAAABAAAAAQAEAAQAAAABAAgAAQAGAAAAAQAAAAAAAQOwAZAABQAIAnoCvAAAAIwCegK8AAAB4AAxAQIAAAIABQMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUGZFZABA6gHqEQPoAAAAWgPqAAAAAAABAAAAAAAAAAAAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+j//wPoAAAD6AAAAAAABQAAAAMAAAAsAAAABAAAAXQAAQAAAAAAbgADAAEAAAAsAAMACgAAAXQABABCAAAABAAEAAEAAOoR//8AAOoB//8AAAABAAQAAAABAAIAAwAEAAUABgAHAAgACQAKAAsADAANAA4ADwAQABEAAAEGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAANwAAAAAAAAAEQAA6gEAAOoBAAAAAQAA6gIAAOoCAAAAAgAA6gMAAOoDAAAAAwAA6gQAAOoEAAAABAAA6gUAAOoFAAAABQAA6gYAAOoGAAAABgAA6gcAAOoHAAAABwAA6ggAAOoIAAAACAAA6gkAAOoJAAAACQAA6goAAOoKAAAACgAA6gsAAOoLAAAACwAA6gwAAOoMAAAADAAA6g0AAOoNAAAADQAA6g4AAOoOAAAADgAA6g8AAOoPAAAADwAA6hAAAOoQAAAAEAAA6hEAAOoRAAAAEQAAAAAARgCMANIBJAF4AcQCMgJgAqgC/ANIA6YD/gROBKAE9AVaAAAAAgAAAAADrwOtABQAKQAAASIHBgcGFBcWFxYyNzY3NjQnJicmAyInJicmNDc2NzYyFxYXFhQHBgcGAfV4Z2Q7PDw7ZGfwZmQ7PDw7ZGZ4bl5bNjc3Nlte215bNjc3NlteA608O2Rn8GdjOzw8O2Nn8GdkOzz8rzc1W17bXlw1Nzc1XF7bXls1NwAAAAACAAAAAAOzA7MAFwAtAAABIgcGBwYVFBcWFxYzMjc2NzY1NCcmJyYTBwYiLwEmNjsBETQ2OwEyFhURMzIWAe52Z2Q7PT07ZGd2fGpmOz4+O2ZpIXYOKA52Dg0XXQsHJgcLXRcNA7M+O2ZqfHZnZDs9PTtkZ3Z9aWY7Pv3wmhISmhIaARcICwsI/ukaAAMAAAAAA+UD5QAXACMALAAAASIHBgcGFRQXFhcWMzI3Njc2NTQnJicmAxQrASI1AzQ7ATIHJyImNDYyFhQGAe6Ecm9BRERBb3KEiXZxQkREQnF1aQIxAwgCQgMBIxIZGSQZGQPkREJxdomEcm9BRERBb3KEinVxQkT9HQICAWICAjEZIxkZIxkAAAAAAgAAAAADsQPkABkALgAAAQYHBgc2BREUFxYXFhc2NzY3NjURJBcmJyYTAQYvASY/ATYyHwEWNjclNjIfARYB9VVVQk+v/tFHPmxebGxdbT1I/tGvT0JVo/7VBASKAwMSAQUBcQEFAgESAgUBEQQD4xMYEhk3YP6sjnVlSD8cHD9IZXWOAVRgNxkSGP62/tkDA48EBBkCAVYCAQHlAQIQBAAAAAADAAAAAAOxA+QAGwAqADMAAAEGBwYHBgcGNxEUFxYXFhc2NzY3NjURJBcmJyYHMzIWFQMUBisBIicDNDYTIiY0NjIWFAYB9UFBODssO38gRz5sXmxsXW09SP7YqFBBVW80BAYMAwImBQELBh4PFhYeFRUD5A8SDhIOEikK/q2PdWRJPh0dPklkdY8BU141GRIY/AYE/sYCAwUBOgQG/kAVHxUVHxUAAAACAAAAAAPkA+QAFwAtAAABIgcGBwYVFBcWFxYzMjc2NzY1NCcmJyYTAQYiLwEmPwE2Mh8BFjI3ATYyHwEWAe6Ecm9BQ0NCbnODiXVxQkREQnF1kf6gAQUBowMDFgEFAYUCBQEBQwIFARUEA+NEQnF1iYNzbkJDQ0FvcoSJdXFCRP6j/qUBAagEBR4CAWYBAQENAgIVBAAAAAQAAAAAA68DrQAUACkAPwBDAAABIgcGBwYUFxYXFjI3Njc2NCcmJyYDIicmJyY0NzY3NjIXFhcWFAcGBwYTBQ4BLwEmBg8BBhYfARYyNwE+ASYiFzAfAQH1eGdkOzw8O2Rn8GZkOzw8O2RmeG5eWzY3NzZbXtteWzY3NzZbXmn+9gYSBmAGDwUDBQEGfQUQBgElBQELEBUBAQOtPDtkZ/BnYzs8PDtjZ/BnZDs8/K83NVte215cNTc3NVxe215bNTcCJt0FAQVJBQIGBAcRBoAGBQEhBQ8LBAEBAAABAAAAAAO7AzoAFwAAEy4BPwE+AR8BFjY3ATYWFycWFAcBBiInPQoGBwUHGgzLDCELAh0LHwsNCgr9uQoeCgGzCyEOCw0HCZMJAQoBvgkCCg0LHQv9sQsKAAAAAAIAAAAAA+UD5gAXACwAAAEiBwYHBhUUFxYXFjMyNzY3NjU0JyYnJhMHBi8BJicmNRM0NjsBMhYVExceAQHvhHJvQUNDQm5zg4l1cUJEREJxdVcQAwT6AwIEEAMCKwIDDsUCAQPlREJxdYmDc25CQ0NBb3KEiXVxQkT9VhwEAncCAgMGAXoCAwMC/q2FAgQAAAQAAAAAA68DrQADABgALQAzAAABMB8BAyIHBgcGFBcWFxYyNzY3NjQnJicmAyInJicmNDc2NzYyFxYXFhQHBgcGAyMVMzUjAuUBAfJ4Z2Q7PDw7ZGfwZmQ7PDw7ZGZ4bl5bNjc3Nlte215bNjc3NltemyT92QKDAQEBLDw7ZGfwZ2M7PDw7Y2fwZ2Q7PPyvNzVbXtteXDU3NzVcXtteWzU3AjH9JAAAAAMAAAAAA+QD5AAXACcAMAAAASIHBgcGFRQXFhcWMzI3Njc2NTQnJicmAzMyFhUDFAYrASImNQM0NhMiJjQ2MhYUBgHuhHJvQUNDQm5zg4l1cUJEREJxdZ42BAYMAwInAwMMBh8PFhYeFhYD40RCcXWJg3NuQkNDQW9yhIl1cUJE/vYGBf7AAgMDAgFABQb+NhYfFhYfFgAABAAAAAADwAPAAAgAEgAoAD0AAAEyNjQmIgYUFhcjFTMRIxUzNSMDIgcGBwYVFBYXFjMyNzY3NjU0Jy4BAyInJicmNDc2NzYyFxYXFhQHBgcGAfQYISEwISFRjzk5yTorhG5rPT99am+DdmhlPD4+PMyFbV5bNTc3NVte2l5bNTc3NVteAqAiLyIiLyI5Hf7EHBwCsT89a26Ed8w8Pj48ZWh2g29qffyjNzVbXtpeWzU3NzVbXtpeWzU3AAADAAAAAAOoA6gACwAgADUAAAEHJwcXBxc3FzcnNwMiBwYHBhQXFhcWMjc2NzY0JyYnJgMiJyYnJjQ3Njc2MhcWFxYUBwYHBgKOmpocmpocmpocmpq2dmZiOjs7OmJm7GZiOjs7OmJmdmtdWTQ2NjRZXdZdWTQ2NjRZXQKqmpocmpocmpocmpoBGTs6YmbsZmI6Ozs6YmbsZmI6O/zCNjRZXdZdWTQ2NjRZXdZdWTQ2AAMAAAAAA+kD6gAaAC8AMAAAAQYHBiMiJyYnJjQ3Njc2MhcWFxYVFAcGBwEHATI3Njc2NCcmJyYiBwYHBhQXFhcWMwKONUBCR21dWjU3NzVaXdpdWzU2GBcrASM5/eBXS0grKysrSEuuSkkqLCwqSUpXASMrFxg2NVtd2l1aNTc3NVpdbUdCQDX+3jkBGSsrSEuuSkkqLCwqSUquS0grKwAC//8AAAPoA+gAFAAwAAABIgcGBwYQFxYXFiA3Njc2ECcmJyYTFg4BIi8BBwYuATQ/AScmPgEWHwE3Nh4BBg8BAfSIdHFDRERDcXQBEHRxQ0REQ3F0SQoBFBsKoqgKGxMKqKIKARQbCqKoChsUAQqoA+hEQ3F0/vB0cUNERENxdAEQdHFDRP1jChsTCqiiCgEUGwqiqAobFAEKqKIKARQbCqIAAAIAAAAAA+QD5AAXADQAAAEiBwYHBhUUFxYXFjMyNzY3NjU0JyYnJhMUBiMFFxYUDwEGLwEuAT8BNh8BFhQPAQUyFh0BAe6Ecm9BQ0NCbnODiXVxQkREQnF1fwQC/pGDAQEVAwTsAgEC7AQEFAIBhAFwAgMD40RCcXWJg3NuQkNDQW9yhIl1cUJE/fYCAwuVAgQCFAQE0AIFAtEEBBQCBQGVCwMDJwAAAAUAAAAAA9QD0wAjACcANwBHAEgAAAERFAYjISImNREjIiY9ATQ2MyE1NDYzITIWHQEhMhYdARQGIyERIREHIgYVERQWOwEyNjURNCYjISIGFREUFjsBMjY1ETQmKwEDeyYb/XYbJkMJDQ0JAQYZEgEvExkBBgkNDQn9CQJc0QkNDQktCQ0NCf7sCQ0NCS0JDQ0JLQMi/TQbJiYbAswMCiwJDS4SGRkSLg0JLAoM/UwCtGsNCf5NCQ0NCQGzCQ0NCf5NCQ0NCQGzCQ0AAAAAEADGAAEAAAAAAAEABAAAAAEAAAAAAAIABwAEAAEAAAAAAAMABAALAAEAAAAAAAQABAAPAAEAAAAAAAUACwATAAEAAAAAAAYABAAeAAEAAAAAAAoAKwAiAAEAAAAAAAsAEwBNAAMAAQQJAAEACABgAAMAAQQJAAIADgBoAAMAAQQJAAMACAB2AAMAAQQJAAQACAB+AAMAAQQJAAUAFgCGAAMAAQQJAAYACACcAAMAAQQJAAoAVgCkAAMAAQQJAAsAJgD6d2V1aVJlZ3VsYXJ3ZXVpd2V1aVZlcnNpb24gMS4wd2V1aUdlbmVyYXRlZCBieSBzdmcydHRmIGZyb20gRm9udGVsbG8gcHJvamVjdC5odHRwOi8vZm9udGVsbG8uY29tAHcAZQB1AGkAUgBlAGcAdQBsAGEAcgB3AGUAdQBpAHcAZQB1AGkAVgBlAHIAcwBpAG8AbgAgADEALgAwAHcAZQB1AGkARwBlAG4AZQByAGEAdABlAGQAIABiAHkAIABzAHYAZwAyAHQAdABmACAAZgByAG8AbQAgAEYAbwBuAHQAZQBsAGwAbwAgAHAAcgBvAGoAZQBjAHQALgBoAHQAdABwADoALwAvAGYAbwBuAHQAZQBsAGwAbwAuAGMAbwBtAAAAAgAAAAAAAAAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASAQIBAwEEAQUBBgEHAQgBCQEKAQsBDAENAQ4BDwEQAREBEgETAAZjaXJjbGUIZG93bmxvYWQEaW5mbwxzYWZlX3N1Y2Nlc3MJc2FmZV93YXJuB3N1Y2Nlc3MOc3VjY2Vzcy1jaXJjbGURc3VjY2Vzcy1uby1jaXJjbGUHd2FpdGluZw53YWl0aW5nLWNpcmNsZQR3YXJuC2luZm8tY2lyY2xlBmNhbmNlbAZzZWFyY2gFY2xlYXIEYmFjawZkZWxldGUAAAAA')
+		format('truetype')
+}
+
+[class*=" weui-icon-"], [class^=weui-icon-] {
+	display: inline-block;
+	vertical-align: middle;
+	font: normal normal normal 14px/1 weui;
+	font-size: inherit;
+	text-rendering: auto;
+	-webkit-font-smoothing: antialiased
+}
+
+[class*=" weui-icon-"]:before, [class^=weui-icon-]:before {
+	display: inline-block;
+	margin-left: .2em;
+	margin-right: .2em
+}
+
+.weui-icon-circle:before {
+	content: "\EA01"
+}
+
+.weui-icon-download:before {
+	content: "\EA02"
+}
+
+.weui-icon-info:before {
+	content: "\EA03"
+}
+
+.weui-icon-safe-success:before {
+	content: "\EA04"
+}
+
+.weui-icon-safe-warn:before {
+	content: "\EA05"
+}
+
+.weui-icon-success:before {
+	content: "\EA06"
+}
+
+.weui-icon-success-circle:before {
+	content: "\EA07"
+}
+
+.weui-icon-success-no-circle:before {
+	content: "\EA08"
+}
+
+.weui-icon-waiting:before {
+	content: "\EA09"
+}
+
+.weui-icon-waiting-circle:before {
+	content: "\EA0A"
+}
+
+.weui-icon-warn:before {
+	content: "\EA0B"
+}
+
+.weui-icon-info-circle:before {
+	content: "\EA0C"
+}
+
+.weui-icon-cancel:before {
+	content: "\EA0D"
+}
+
+.weui-icon-search:before {
+	content: "\EA0E"
+}
+
+.weui-icon-clear:before {
+	content: "\EA0F"
+}
+
+.weui-icon-back:before {
+	content: "\EA10"
+}
+
+.weui-icon-delete:before {
+	content: "\EA11"
+}
+
+[class*=" weui-icon_"]:before, [class^=weui-icon_]:before {
+	margin: 0
+}
+
+.weui-icon-success {
+	font-size: 23px;
+	color: #09bb07
+}
+
+.weui-icon-waiting {
+	font-size: 23px;
+	color: #10aeff
+}
+
+.weui-icon-warn {
+	font-size: 23px;
+	color: #f43530
+}
+
+.weui-icon-info {
+	font-size: 23px;
+	color: #10aeff
+}
+
+.weui-icon-success-circle, .weui-icon-success-no-circle {
+	font-size: 23px;
+	color: #09bb07
+}
+
+.weui-icon-waiting-circle {
+	font-size: 23px;
+	color: #10aeff
+}
+
+.weui-icon-circle {
+	font-size: 23px;
+	color: #c9c9c9
+}
+
+.weui-icon-download, .weui-icon-info-circle {
+	font-size: 23px;
+	color: #09bb07
+}
+
+.weui-icon-safe-success {
+	color: #09bb07
+}
+
+.weui-icon-safe-warn {
+	color: #ffbe00
+}
+
+.weui-icon-cancel {
+	color: #f43530;
+	font-size: 22px
+}
+
+.weui-icon-clear, .weui-icon-search {
+	color: #b2b2b2;
+	font-size: 14px
+}
+
+.weui-icon-delete.weui-icon_gallery-delete {
+	color: #fff;
+	font-size: 22px
+}
+
+.weui-icon_msg {
+	font-size: 93px
+}
+
+.weui-icon_msg.weui-icon-warn {
+	color: #f76260
+}
+
+.weui-icon_msg-primary {
+	font-size: 93px
+}
+
+.weui-icon_msg-primary.weui-icon-warn {
+	color: #ffbe00
+}
+
+.weui-btn {
+	position: relative;
+	display: block;
+	margin-left: auto;
+	margin-right: auto;
+	padding-left: 14px;
+	padding-right: 14px;
+	box-sizing: border-box;
+	font-size: 18px;
+	text-align: center;
+	text-decoration: none;
+	color: #fff;
+	line-height: 2.55555556;
+	border-radius: 5px;
+	-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+	overflow: hidden
+}
+
+.weui-btn:after {
+	content: " ";
+	width: 200%;
+	height: 200%;
+	position: absolute;
+	top: 0;
+	left: 0;
+	border: 1px solid rgba(0, 0, 0, .2);
+	-webkit-transform: scale(.5);
+	transform: scale(.5);
+	-webkit-transform-origin: 0 0;
+	transform-origin: 0 0;
+	box-sizing: border-box;
+	border-radius: 10px
+}
+
+.weui-btn_inline {
+	display: inline-block
+}
+
+.weui-btn_default {
+	color: #000;
+	background-color: #f8f8f8
+}
+
+.weui-btn_default:not (.weui-btn_disabled ):visited {
+	color: #000
+}
+
+.weui-btn_default:not (.weui-btn_disabled ):active {
+	color: rgba(0, 0, 0, .6);
+	background-color: #dedede
+}
+
+.weui-btn_primary {
+	background-color: #1aad19
+}
+
+.weui-btn_primary:not (.weui-btn_disabled ):visited {
+	color: #fff
+}
+
+.weui-btn_primary:not (.weui-btn_disabled ):active {
+	color: hsla(0, 0%, 100%, .6);
+	background-color: #179b16
+}
+
+.weui-btn_warn {
+	background-color: #e64340
+}
+
+.weui-btn_warn:not (.weui-btn_disabled ):visited {
+	color: #fff
+}
+
+.weui-btn_warn:not (.weui-btn_disabled ):active {
+	color: hsla(0, 0%, 100%, .6);
+	background-color: #ce3c39
+}
+
+.weui-btn_disabled {
+	color: hsla(0, 0%, 100%, .6)
+}
+
+.weui-btn_disabled.weui-btn_default {
+	color: rgba(0, 0, 0, .3);
+	background-color: #f7f7f7
+}
+
+.weui-btn_disabled.weui-btn_primary {
+	background-color: #9ed99d
+}
+
+.weui-btn_disabled.weui-btn_warn {
+	background-color: #ec8b89
+}
+
+.weui-btn_loading .weui-loading {
+	margin: -.2em .34em 0 0
+}
+
+.weui-btn_loading.weui-btn_primary, .weui-btn_loading.weui-btn_warn {
+	color: hsla(0, 0%, 100%, .6)
+}
+
+.weui-btn_loading.weui-btn_primary {
+	background-color: #179b16
+}
+
+.weui-btn_loading.weui-btn_warn {
+	background-color: #ce3c39
+}
+
+.weui-btn_plain-primary {
+	color: #1aad19;
+	border: 1px solid #1aad19
+}
+
+.weui-btn_plain-primary:not (.weui-btn_plain-disabled ):active {
+	color: rgba(26, 173, 25, .6);
+	border-color: rgba(26, 173, 25, .6)
+}
+
+.weui-btn_plain-primary:after {
+	border-width: 0
+}
+
+.weui-btn_plain-default {
+	color: #353535;
+	border: 1px solid #353535
+}
+
+.weui-btn_plain-default:not (.weui-btn_plain-disabled ):active {
+	color: rgba(53, 53, 53, .6);
+	border-color: rgba(53, 53, 53, .6)
+}
+
+.weui-btn_plain-default:after {
+	border-width: 0
+}
+
+.weui-btn_plain-disabled {
+	color: rgba(0, 0, 0, .2);
+	border-color: rgba(0, 0, 0, .2)
+}
+
+button.weui-btn, input.weui-btn {
+	width: 100%;
+	border-width: 0;
+	outline: 0;
+	-webkit-appearance: none
+}
+
+button.weui-btn:focus, input.weui-btn:focus {
+	outline: 0
+}
+
+button.weui-btn_inline, button.weui-btn_mini, input.weui-btn_inline,
+	input.weui-btn_mini {
+	width: auto
+}
+
+button.weui-btn_plain-default, button.weui-btn_plain-primary, input.weui-btn_plain-default,
+	input.weui-btn_plain-primary {
+	border-width: 1px;
+	background-color: transparent
+}
+
+.weui-btn_mini {
+	display: inline-block;
+	padding: 0 1.32em;
+	line-height: 2.3;
+	font-size: 13px
+}
+
+.weui-btn+.weui-btn {
+	margin-top: 15px
+}
+
+.weui-btn.weui-btn_inline+.weui-btn.weui-btn_inline {
+	margin-top: auto;
+	margin-left: 15px
+}
+
+.weui-btn-area {
+	margin: 1.17647059em 15px .3em
+}
+
+.weui-btn-area_inline {
+	display: -webkit-box;
+	display: -webkit-flex;
+	display: flex
+}
+
+.weui-btn-area_inline .weui-btn {
+	margin-top: auto;
+	margin-right: 15px;
+	width: 100%;
+	-webkit-box-flex: 1;
+	-webkit-flex: 1;
+	flex: 1
+}
+
+.weui-btn-area_inline .weui-btn:last-child {
+	margin-right: 0
+}
+
+.weui-cells {
+	margin-top: 1.17647059em;
+	background-color: #fff;
+	line-height: 1.47058824;
+	font-size: 17px;
+	overflow: hidden;
+	position: relative
+}
+
+.weui-cells:before {
+	top: 0;
+	border-top: 1px solid #e5e5e5;
+	-webkit-transform-origin: 0 0;
+	transform-origin: 0 0;
+	-webkit-transform: scaleY(.5);
+	transform: scaleY(.5)
+}
+
+.weui-cells:after, .weui-cells:before {
+	content: " ";
+	position: absolute;
+	left: 0;
+	right: 0;
+	height: 1px;
+	color: #e5e5e5;
+	z-index: 2
+}
+
+.weui-cells:after {
+	bottom: 0;
+	border-bottom: 1px solid #e5e5e5;
+	-webkit-transform-origin: 0 100%;
+	transform-origin: 0 100%;
+	-webkit-transform: scaleY(.5);
+	transform: scaleY(.5)
+}
+
+.weui-cells__title {
+	margin-top: .77em;
+	margin-bottom: .3em;
+	padding-left: 15px;
+	padding-right: 15px;
+	color: #999;
+	font-size: 14px
+}
+
+.weui-cells__title+.weui-cells {
+	margin-top: 0
+}
+
+.weui-cells__tips {
+	margin-top: .3em;
+	color: #999;
+	padding-left: 15px;
+	padding-right: 15px;
+	font-size: 14px
+}
+
+.weui-cell {
+	padding: 10px 15px;
+	position: relative;
+	display: -webkit-box;
+	display: -webkit-flex;
+	display: flex;
+	-webkit-box-align: center;
+	-webkit-align-items: center;
+	align-items: center
+}
+
+.weui-cell:before {
+	content: " ";
+	position: absolute;
+	left: 0;
+	top: 0;
+	right: 0;
+	height: 1px;
+	border-top: 1px solid #e5e5e5;
+	color: #e5e5e5;
+	-webkit-transform-origin: 0 0;
+	transform-origin: 0 0;
+	-webkit-transform: scaleY(.5);
+	transform: scaleY(.5);
+	left: 15px;
+	z-index: 2
+}
+
+.weui-cell:first-child:before {
+	display: none
+}
+
+.weui-cell_primary {
+	-webkit-box-align: start;
+	-webkit-align-items: flex-start;
+	align-items: flex-start
+}
+
+.weui-cell__bd {
+	-webkit-box-flex: 1;
+	-webkit-flex: 1;
+	flex: 1
+}
+
+.weui-cell__ft {
+	text-align: right;
+	color: #999
+}
+
+.weui-cell_swiped {
+	display: block;
+	padding: 0
+}
+
+.weui-cell_swiped>.weui-cell__bd {
+	position: relative;
+	z-index: 1;
+	background-color: #fff
+}
+
+.weui-cell_swiped>.weui-cell__ft {
+	position: absolute;
+	right: 0;
+	top: 0;
+	bottom: 0;
+	display: -webkit-box;
+	display: -webkit-flex;
+	display: flex;
+	color: #fff
+}
+
+.weui-swiped-btn {
+	display: block;
+	padding: 10px 1em;
+	line-height: 1.47058824;
+	color: inherit
+}
+
+.weui-swiped-btn_default {
+	background-color: #c7c7cc
+}
+
+.weui-swiped-btn_warn {
+	background-color: #ff3b30
+}
+
+.weui-cell_access {
+	-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+	color: inherit
+}
+
+.weui-cell_access:active {
+	background-color: #ececec
+}
+
+.weui-cell_access .weui-cell__ft {
+	padding-right: 13px;
+	position: relative
+}
+
+.weui-cell_access .weui-cell__ft:after {
+	content: " ";
+	display: inline-block;
+	height: 6px;
+	width: 6px;
+	border-width: 2px 2px 0 0;
+	border-color: #c8c8cd;
+	border-style: solid;
+	-webkit-transform: matrix(.71, .71, -.71, .71, 0, 0);
+	transform: matrix(.71, .71, -.71, .71, 0, 0);
+	position: relative;
+	top: -2px;
+	position: absolute;
+	top: 50%;
+	margin-top: -4px;
+	right: 2px
+}
+
+.weui-cell_link {
+	color: #586c94;
+	font-size: 14px
+}
+
+.weui-cell_link:first-child:before {
+	display: block
+}
+
+.weui-check__label {
+	-webkit-tap-highlight-color: rgba(0, 0, 0, 0)
+}
+
+.weui-check__label:active {
+	background-color: #ececec
+}
+
+.weui-check {
+	position: absolute;
+	left: -9999em
+}
+
+.weui-cells_radio .weui-cell__ft {
+	padding-left: .35em
+}
+
+.weui-cells_radio .weui-check+.weui-icon-checked {
+	min-width: 16px
+}
+
+.weui-cells_radio .weui-check:checked+.weui-icon-checked:before {
+	display: block;
+	content: '\EA08';
+	color: #09bb07;
+	font-size: 16px
+}
+
+
+.weui-cells_checkbox .weui-icon-checked:before {
+	content: '\EA01';
+	color: #c9c9c9;
+	font-size: 23px;
+	display: block
+}
+
+.weui-cells_checkbox .weui-check:checked+.weui-icon-checked:before {
+	content: '\EA06';
+	color: #FF586A
+}
+
+.weui-label {
+	display: block;
+	width: 105px;
+	word-wrap: break-word;
+	word-break: break-all
+}
+
+.weui-input {
+	width: 100%;
+	border: 0;
+	outline: 0;
+	-webkit-appearance: none;
+	background-color: transparent;
+	font-size: inherit;
+	color: inherit;
+	height: 1.47058824em;
+	line-height: 1.47058824
+}
+
+.weui-input::-webkit-inner-spin-button, .weui-input::-webkit-outer-spin-button
+	{
+	-webkit-appearance: none;
+	margin: 0
+}
+
+.weui-textarea {
+	display: block;
+	border: 0;
+	resize: none;
+	width: 100%;
+	color: inherit;
+	font-size: 1em;
+	line-height: inherit;
+	outline: 0
+}
+
+.weui-textarea-counter {
+	color: #b2b2b2;
+	text-align: right
+}
+
+.weui-cell_warn .weui-textarea-counter {
+	color: #e64340
+}
+
+.weui-toptips {
+	display: none;
+	position: fixed;
+	-webkit-transform: translateZ(0);
+	transform: translateZ(0);
+	top: 0;
+	left: 0;
+	right: 0;
+	padding: 5px;
+	font-size: 14px;
+	text-align: center;
+	color: #fff;
+	z-index: 5000;
+	word-wrap: break-word;
+	word-break: break-all
+}
+
+.weui-toptips_warn {
+	background-color: #e64340
+}
+
+.weui-cells_form .weui-cell__ft {
+	font-size: 0
+}
+
+.weui-cells_form .weui-icon-warn {
+	display: none
+}
+
+.weui-cells_form input, .weui-cells_form label[for], .weui-cells_form textarea
+	{
+	-webkit-tap-highlight-color: rgba(0, 0, 0, 0)
+}
+
+.weui-cell_warn {
+	color: #e64340
+}
+
+.weui-cell_warn .weui-icon-warn {
+	display: inline-block
+}
+
+.weui-form-preview {
+	position: relative;
+	background-color: #fff
+}
+
+.weui-form-preview:before {
+	top: 0;
+	border-top: 1px solid #e5e5e5;
+	-webkit-transform-origin: 0 0;
+	transform-origin: 0 0;
+	-webkit-transform: scaleY(.5);
+	transform: scaleY(.5)
+}
+
+.weui-form-preview:after, .weui-form-preview:before {
+	content: " ";
+	position: absolute;
+	left: 0;
+	right: 0;
+	height: 1px;
+	color: #e5e5e5
+}
+
+.weui-form-preview:after {
+	bottom: 0;
+	border-bottom: 1px solid #e5e5e5;
+	-webkit-transform-origin: 0 100%;
+	transform-origin: 0 100%;
+	-webkit-transform: scaleY(.5);
+	transform: scaleY(.5)
+}
+
+.weui-form-preview__hd {
+	position: relative;
+	padding: 10px 15px;
+	text-align: right;
+	line-height: 2.5em
+}
+
+.weui-form-preview__hd:after {
+	content: " ";
+	position: absolute;
+	left: 0;
+	bottom: 0;
+	right: 0;
+	height: 1px;
+	border-bottom: 1px solid #e5e5e5;
+	color: #e5e5e5;
+	-webkit-transform-origin: 0 100%;
+	transform-origin: 0 100%;
+	-webkit-transform: scaleY(.5);
+	transform: scaleY(.5);
+	left: 15px
+}
+
+.weui-form-preview__hd .weui-form-preview__value {
+	font-style: normal;
+	font-size: 1.6em
+}
+
+.weui-form-preview__bd {
+	padding: 10px 15px;
+	font-size: .9em;
+	text-align: right;
+	color: #999;
+	line-height: 2
+}
+
+.weui-form-preview__ft {
+	position: relative;
+	line-height: 50px;
+	display: -webkit-box;
+	display: -webkit-flex;
+	display: flex
+}
+
+.weui-form-preview__ft:before {
+	content: " ";
+	position: absolute;
+	left: 0;
+	top: 0;
+	right: 0;
+	height: 1px;
+	border-top: 1px solid #d5d5d6;
+	color: #d5d5d6;
+	-webkit-transform-origin: 0 0;
+	transform-origin: 0 0;
+	-webkit-transform: scaleY(.5);
+	transform: scaleY(.5)
+}
+
+.weui-form-preview__item {
+	overflow: hidden
+}
+
+.weui-form-preview__label {
+	float: left;
+	margin-right: 1em;
+	min-width: 4em;
+	color: #999;
+	text-align: justify;
+	text-align-last: justify
+}
+
+.weui-form-preview__value {
+	display: block;
+	overflow: hidden;
+	word-break: normal;
+	word-wrap: break-word
+}
+
+.weui-form-preview__btn {
+	position: relative;
+	display: block;
+	-webkit-box-flex: 1;
+	-webkit-flex: 1;
+	flex: 1;
+	color: #3cc51f;
+	text-align: center;
+	-webkit-tap-highlight-color: rgba(0, 0, 0, 0)
+}
+
+button.weui-form-preview__btn {
+	background-color: transparent;
+	border: 0;
+	outline: 0;
+	line-height: inherit;
+	font-size: inherit
+}
+
+.weui-form-preview__btn:active {
+	background-color: #eee
+}
+
+.weui-form-preview__btn:after {
+	content: " ";
+	position: absolute;
+	left: 0;
+	top: 0;
+	width: 1px;
+	bottom: 0;
+	border-left: 1px solid #d5d5d6;
+	color: #d5d5d6;
+	-webkit-transform-origin: 0 0;
+	transform-origin: 0 0;
+	-webkit-transform: scaleX(.5);
+	transform: scaleX(.5)
+}
+
+.weui-form-preview__btn:first-child:after {
+	display: none
+}
+
+.weui-form-preview__btn_default {
+	color: #999
+}
+
+.weui-form-preview__btn_primary {
+	color: #0bb20c
+}
+
+.weui-cell_select {
+	padding: 0
+}
+
+.weui-cell_select .weui-select {
+	padding-right: 30px
+}
+
+.weui-cell_select .weui-cell__bd:after {
+	content: " ";
+	display: inline-block;
+	height: 6px;
+	width: 6px;
+	border-width: 2px 2px 0 0;
+	border-color: #c8c8cd;
+	border-style: solid;
+	-webkit-transform: matrix(.71, .71, -.71, .71, 0, 0);
+	transform: matrix(.71, .71, -.71, .71, 0, 0);
+	position: relative;
+	top: -2px;
+	position: absolute;
+	top: 50%;
+	right: 15px;
+	margin-top: -4px
+}
+
+.weui-select {
+	-webkit-appearance: none;
+	border: 0;
+	outline: 0;
+	background-color: transparent;
+	width: 100%;
+	font-size: inherit;
+	height: 45px;
+	line-height: 45px;
+	position: relative;
+	z-index: 1;
+	padding-left: 15px
+}
+
+.weui-cell_select-before {
+	padding-right: 15px
+}
+
+.weui-cell_select-before .weui-select {
+	width: 105px;
+	box-sizing: border-box
+}
+
+.weui-cell_select-before .weui-cell__hd {
+	position: relative
+}
+
+.weui-cell_select-before .weui-cell__hd:after {
+	content: " ";
+	position: absolute;
+	right: 0;
+	top: 0;
+	width: 1px;
+	bottom: 0;
+	border-right: 1px solid #e5e5e5;
+	color: #e5e5e5;
+	-webkit-transform-origin: 100% 0;
+	transform-origin: 100% 0;
+	-webkit-transform: scaleX(.5);
+	transform: scaleX(.5)
+}
+
+.weui-cell_select-before .weui-cell__hd:before {
+	content: " ";
+	display: inline-block;
+	height: 6px;
+	width: 6px;
+	border-width: 2px 2px 0 0;
+	border-color: #c8c8cd;
+	border-style: solid;
+	-webkit-transform: matrix(.71, .71, -.71, .71, 0, 0);
+	transform: matrix(.71, .71, -.71, .71, 0, 0);
+	position: relative;
+	top: -2px;
+	position: absolute;
+	top: 50%;
+	right: 15px;
+	margin-top: -4px
+}
+
+.weui-cell_select-before .weui-cell__bd {
+	padding-left: 15px
+}
+
+.weui-cell_select-before .weui-cell__bd:after {
+	display: none
+}
+
+.weui-cell_select-after {
+	padding-left: 15px
+}
+
+.weui-cell_select-after .weui-select {
+	padding-left: 0
+}
+
+.weui-cell_vcode {
+	padding-top: 0;
+	padding-right: 0;
+	padding-bottom: 0
+}
+
+.weui-vcode-btn, .weui-vcode-img {
+	margin-left: 5px;
+	height: 45px;
+	vertical-align: middle
+}
+
+.weui-vcode-btn {
+	display: inline-block;
+	padding: 0 .6em 0 .7em;
+	border-left: 1px solid #e5e5e5;
+	line-height: 45px;
+	font-size: 17px;
+	color: #3cc51f
+}
+
+button.weui-vcode-btn {
+	background-color: transparent;
+	border-top: 0;
+	border-right: 0;
+	border-bottom: 0;
+	outline: 0
+}
+
+.weui-vcode-btn:active {
+	color: #52a341
+}
+
+.weui-gallery {
+	display: none;
+	position: fixed;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	left: 0;
+	background-color: #000;
+	z-index: 1000
+}
+
+.weui-gallery__img {
+	position: absolute;
+	top: 0;
+	right: 0;
+	bottom: 60px;
+	left: 0;
+	background: 50% no-repeat;
+	background-size: contain
+}
+
+.weui-gallery__opr {
+	position: absolute;
+	right: 0;
+	bottom: 0;
+	left: 0;
+	background-color: #0d0d0d;
+	color: #fff;
+	line-height: 60px;
+	text-align: center
+}
+
+.weui-gallery__del {
+	display: block
+}
+
+.weui-cell_switch {
+	padding-top: 6.5px;
+	padding-bottom: 6.5px
+}
+
+.weui-switch {
+	-webkit-appearance: none;
+	appearance: none
+}
+
+.weui-switch, .weui-switch-cp__box {
+	position: relative;
+	width: 52px;
+	height: 32px;
+	border: 1px solid #dfdfdf;
+	outline: 0;
+	border-radius: 16px;
+	box-sizing: border-box;
+	background-color: #dfdfdf;
+	-webkit-transition: background-color .1s, border .1s;
+	transition: background-color .1s, border .1s
+}
+
+.weui-switch-cp__box:before, .weui-switch:before {
+	content: " ";
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 50px;
+	height: 30px;
+	border-radius: 15px;
+	background-color: #fdfdfd;
+	-webkit-transition: -webkit-transform .35s cubic-bezier(.45, 1, .4, 1);
+	transition: -webkit-transform .35s cubic-bezier(.45, 1, .4, 1);
+	transition: transform .35s cubic-bezier(.45, 1, .4, 1);
+	transition: transform .35s cubic-bezier(.45, 1, .4, 1),
+		-webkit-transform .35s cubic-bezier(.45, 1, .4, 1)
+}
+
+.weui-switch-cp__box:after, .weui-switch:after {
+	content: " ";
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 30px;
+	height: 30px;
+	border-radius: 15px;
+	background-color: #fff;
+	box-shadow: 0 1px 3px rgba(0, 0, 0, .4);
+	-webkit-transition: -webkit-transform .35s
+		cubic-bezier(.4, .4, .25, 1.35);
+	transition: -webkit-transform .35s cubic-bezier(.4, .4, .25, 1.35);
+	transition: transform .35s cubic-bezier(.4, .4, .25, 1.35);
+	transition: transform .35s cubic-bezier(.4, .4, .25, 1.35),
+		-webkit-transform .35s cubic-bezier(.4, .4, .25, 1.35)
+}
+
+.weui-switch-cp__input:checked ~.weui-switch-cp__box, .weui-switch:checked
+	{
+	border-color: #04be02;
+	background-color: #04be02
+}
+
+.weui-switch-cp__input:checked ~.weui-switch-cp__box:before,
+	.weui-switch:checked:before {
+	-webkit-transform: scale(0);
+	transform: scale(0)
+}
+
+.weui-switch-cp__input:checked ~.weui-switch-cp__box:after, .weui-switch:checked:after
+	{
+	-webkit-transform: translateX(20px);
+	transform: translateX(20px)
+}
+
+.weui-switch-cp__input {
+	position: absolute;
+	left: -9999px
+}
+
+.weui-switch-cp__box {
+	display: block
+}
+
+.weui-uploader__hd {
+	display: -webkit-box;
+	display: -webkit-flex;
+	display: flex;
+	padding-bottom: 10px;
+	-webkit-box-align: center;
+	-webkit-align-items: center;
+	align-items: center
+}
+
+.weui-uploader__title {
+	-webkit-box-flex: 1;
+	-webkit-flex: 1;
+	flex: 1
+}
+
+.weui-uploader__info {
+	color: #b2b2b2
+}
+
+.weui-uploader__bd {
+	margin-bottom: -4px;
+	margin-right: -9px;
+	overflow: hidden
+}
+
+.weui-uploader__files {
+	list-style: none
+}
+
+.weui-uploader__file {
+	float: left;
+	margin-right: 9px;
+	margin-bottom: 9px;
+	width: 79px;
+	height: 79px;
+	background: no-repeat 50%;
+	background-size: cover
+}
+
+.weui-uploader__file_status {
+	position: relative
+}
+
+.weui-uploader__file_status:before {
+	content: " ";
+	position: absolute;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	left: 0;
+	background-color: rgba(0, 0, 0, .5)
+}
+
+.weui-uploader__file_status .weui-uploader__file-content {
+	display: block
+}
+
+.weui-uploader__file-content {
+	display: none;
+	position: absolute;
+	top: 50%;
+	left: 50%;
+	-webkit-transform: translate(-50%, -50%);
+	transform: translate(-50%, -50%);
+	color: #fff
+}
+
+.weui-uploader__file-content .weui-icon-warn {
+	display: inline-block
+}
+
+.weui-uploader__input-box {
+	float: left;
+	position: relative;
+	margin-right: 9px;
+	margin-bottom: 9px;
+	width: 77px;
+	height: 77px;
+	border: 1px solid #d9d9d9
+}
+
+.weui-uploader__input-box:after, .weui-uploader__input-box:before {
+	content: " ";
+	position: absolute;
+	top: 50%;
+	left: 50%;
+	-webkit-transform: translate(-50%, -50%);
+	transform: translate(-50%, -50%);
+	background-color: #d9d9d9
+}
+
+.weui-uploader__input-box:before {
+	width: 2px;
+	height: 39.5px
+}
+
+.weui-uploader__input-box:after {
+	width: 39.5px;
+	height: 2px
+}
+
+.weui-uploader__input-box:active {
+	border-color: #999
+}
+
+.weui-uploader__input-box:active:after, .weui-uploader__input-box:active:before
+	{
+	background-color: #999
+}
+
+.weui-uploader__input {
+	position: absolute;
+	z-index: 1;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	opacity: 0;
+	-webkit-tap-highlight-color: rgba(0, 0, 0, 0)
+}
+
+.weui-msg {
+	padding-top: 36px;
+	text-align: center
+}
+
+.weui-msg__icon-area {
+	margin-bottom: 30px
+}
+
+.weui-msg__text-area {
+	margin-bottom: 25px;
+	padding: 0 20px
+}
+
+.weui-msg__text-area a {
+	color: #586c94
+}
+
+.weui-msg__title {
+	margin-bottom: 5px;
+	font-weight: 400;
+	font-size: 20px
+}
+
+.weui-msg__desc, .weui-msg__title {
+	word-wrap: break-word;
+	word-break: break-all
+}
+
+.weui-msg__desc {
+	font-size: 14px;
+	color: #999
+}
+
+.weui-msg__opr-area {
+	margin-bottom: 25px
+}
+
+.weui-msg__extra-area {
+	margin-bottom: 15px;
+	font-size: 14px;
+	color: #999
+}
+
+.weui-msg__extra-area a {
+	color: #586c94
+}
+
+@media screen and (min-height:438px) {
+	.weui-msg__extra-area {
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		width: 100%;
+		text-align: center
+	}
+}
+
+@media only screen and (device-width:375px) and (device-height:812px)
+	and (-webkit-device-pixel-ratio:3) {
+	.weui-msg__extra-area {
+		margin-bottom: 49px
+	}
+}
+
+.weui-article {
+	padding: 20px 15px;
+	font-size: 15px
+}
+
+.weui-article section {
+	margin-bottom: 1.5em
+}
+
+.weui-article h1 {
+	font-size: 18px;
+	font-weight: 400;
+	margin-bottom: .9em
+}
+
+.weui-article h2 {
+	font-size: 16px
+}
+
+.weui-article h2, .weui-article h3 {
+	font-weight: 400;
+	margin-bottom: .34em
+}
+
+.weui-article h3 {
+	font-size: 15px
+}
+
+.weui-article * {
+	max-width: 100%;
+	box-sizing: border-box;
+	word-wrap: break-word
+}
+
+.weui-article p {
+	margin: 0 0 .8em
+}
+
+.weui-tabbar {
+	display: -webkit-box;
+	display: -webkit-flex;
+	display: flex;
+	position: absolute;
+	z-index: 500;
+	bottom: 0;
+	width: 100%;
+	background-color: #f7f7fa
+}
+
+.weui-tabbar:before {
+	content: " ";
+	position: absolute;
+	left: 0;
+	top: 0;
+	right: 0;
+	height: 1px;
+	border-top: 1px solid #c0bfc4;
+	color: #c0bfc4;
+	-webkit-transform-origin: 0 0;
+	transform-origin: 0 0;
+	-webkit-transform: scaleY(.5);
+	transform: scaleY(.5)
+}
+
+.weui-tabbar__item {
+	display: block;
+	-webkit-box-flex: 1;
+	-webkit-flex: 1;
+	flex: 1;
+	padding: 5px 0 0;
+	font-size: 0;
+	color: #999;
+	text-align: center;
+	-webkit-tap-highlight-color: rgba(0, 0, 0, 0)
+}
+
+.weui-tabbar__item.weui-bar__item_on .weui-tabbar__icon,
+	.weui-tabbar__item.weui-bar__item_on .weui-tabbar__icon>i,
+	.weui-tabbar__item.weui-bar__item_on .weui-tabbar__label {
+	color: #09bb07
+}
+
+.weui-tabbar__icon {
+	display: inline-block;
+	width: 27px;
+	height: 27px
+}
+
+.weui-tabbar__icon>i, i.weui-tabbar__icon {
+	font-size: 24px;
+	color: #999
+}
+
+.weui-tabbar__icon img {
+	width: 100%;
+	height: 100%
+}
+
+.weui-tabbar__label {
+	text-align: center;
+	color: #999;
+	font-size: 10px;
+	line-height: 1.8
+}
+
+.weui-navbar {
+	display: -webkit-box;
+	display: -webkit-flex;
+	display: flex;
+	position: absolute;
+	z-index: 500;
+	top: 0;
+	width: 100%;
+	background-color: #fafafa
+}
+
+.weui-navbar:after {
+	content: " ";
+	position: absolute;
+	left: 0;
+	bottom: 0;
+	right: 0;
+	height: 1px;
+	border-bottom: 1px solid #ccc;
+	color: #ccc;
+	-webkit-transform-origin: 0 100%;
+	transform-origin: 0 100%;
+	-webkit-transform: scaleY(.5);
+	transform: scaleY(.5)
+}
+
+.weui-navbar+.weui-tab__panel {
+	padding-top: 50px;
+	padding-bottom: 0
+}
+
+.weui-navbar__item {
+	position: relative;
+	display: block;
+	-webkit-box-flex: 1;
+	-webkit-flex: 1;
+	flex: 1;
+	padding: 13px 0;
+	text-align: center;
+	font-size: 15px;
+	-webkit-tap-highlight-color: rgba(0, 0, 0, 0)
+}
+
+.weui-navbar__item:active {
+	background-color: #ededed
+}
+
+.weui-navbar__item.weui-bar__item_on {
+	background-color: #eaeaea
+}
+
+.weui-navbar__item:after {
+	content: " ";
+	position: absolute;
+	right: 0;
+	top: 0;
+	width: 1px;
+	bottom: 0;
+	border-right: 1px solid #ccc;
+	color: #ccc;
+	-webkit-transform-origin: 100% 0;
+	transform-origin: 100% 0;
+	-webkit-transform: scaleX(.5);
+	transform: scaleX(.5)
+}
+
+.weui-navbar__item:last-child:after {
+	display: none
+}
+
+.weui-tab {
+	position: relative;
+	height: 100%
+}
+
+.weui-tab__panel {
+	box-sizing: border-box;
+	height: 100%;
+	padding-bottom: 50px;
+	overflow: auto;
+	-webkit-overflow-scrolling: touch
+}
+
+.weui-tab__content {
+	display: none
+}
+
+.weui-progress {
+	display: -webkit-box;
+	display: -webkit-flex;
+	display: flex;
+	-webkit-box-align: center;
+	-webkit-align-items: center;
+	align-items: center
+}
+
+.weui-progress__bar {
+	background-color: #ebebeb;
+	height: 3px;
+	-webkit-box-flex: 1;
+	-webkit-flex: 1;
+	flex: 1
+}
+
+.weui-progress__inner-bar {
+	width: 0;
+	height: 100%;
+	background-color: #09bb07
+}
+
+.weui-progress__opr {
+	display: block;
+	margin-left: 15px;
+	font-size: 0
+}
+
+.weui-panel {
+	background-color: #fff;
+	margin-top: 10px;
+	position: relative;
+	overflow: hidden
+}
+
+.weui-panel:first-child {
+	margin-top: 0
+}
+
+.weui-panel:before {
+	top: 0;
+	border-top: 1px solid #e5e5e5;
+	-webkit-transform-origin: 0 0;
+	transform-origin: 0 0;
+	-webkit-transform: scaleY(.5);
+	transform: scaleY(.5)
+}
+
+.weui-panel:after, .weui-panel:before {
+	content: " ";
+	position: absolute;
+	left: 0;
+	right: 0;
+	height: 1px;
+	color: #e5e5e5
+}
+
+.weui-panel:after {
+	bottom: 0;
+	border-bottom: 1px solid #e5e5e5;
+	-webkit-transform-origin: 0 100%;
+	transform-origin: 0 100%;
+	-webkit-transform: scaleY(.5);
+	transform: scaleY(.5)
+}
+
+.weui-panel__hd {
+	padding: 14px 15px 10px;
+	color: #999;
+	font-size: 13px;
+	position: relative
+}
+
+.weui-panel__hd:after {
+	content: " ";
+	position: absolute;
+	left: 0;
+	bottom: 0;
+	right: 0;
+	height: 1px;
+	border-bottom: 1px solid #e5e5e5;
+	color: #e5e5e5;
+	-webkit-transform-origin: 0 100%;
+	transform-origin: 0 100%;
+	-webkit-transform: scaleY(.5);
+	transform: scaleY(.5);
+	left: 15px
+}
+
+.weui-media-box {
+	padding: 15px;
+	position: relative
+}
+
+.weui-media-box:before {
+	content: " ";
+	position: absolute;
+	left: 0;
+	top: 0;
+	right: 0;
+	height: 1px;
+	border-top: 1px solid #e5e5e5;
+	color: #e5e5e5;
+	-webkit-transform-origin: 0 0;
+	transform-origin: 0 0;
+	-webkit-transform: scaleY(.5);
+	transform: scaleY(.5);
+	left: 15px
+}
+
+.weui-media-box:first-child:before {
+	display: none
+}
+
+a.weui-media-box {
+	color: #000;
+	-webkit-tap-highlight-color: rgba(0, 0, 0, 0)
+}
+
+a.weui-media-box:active {
+	background-color: #ececec
+}
+
+.weui-media-box__title {
+	font-weight: 400;
+	font-size: 17px;
+	width: auto;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	word-wrap: normal;
+	word-wrap: break-word;
+	word-break: break-all
+}
+
+.weui-media-box__desc {
+	color: #999;
+	font-size: 13px;
+	line-height: 1.2;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	display: -webkit-box;
+	-webkit-box-orient: vertical;
+	-webkit-line-clamp: 2
+}
+
+.weui-media-box__info {
+	margin-top: 15px;
+	padding-bottom: 5px;
+	font-size: 13px;
+	color: #cecece;
+	line-height: 1em;
+	list-style: none;
+	overflow: hidden
+}
+
+.weui-media-box__info__meta {
+	float: left;
+	padding-right: 1em
+}
+
+.weui-media-box__info__meta_extra {
+	padding-left: 1em;
+	border-left: 1px solid #cecece
+}
+
+.weui-media-box_text .weui-media-box__title {
+	margin-bottom: 8px
+}
+
+.weui-media-box_appmsg {
+	display: -webkit-box;
+	display: -webkit-flex;
+	display: flex;
+	-webkit-box-align: center;
+	-webkit-align-items: center;
+	align-items: center
+}
+
+.weui-media-box_appmsg .weui-media-box__hd {
+	margin-right: .8em;
+	width: 60px;
+	height: 60px;
+	line-height: 60px;
+	text-align: center
+}
+
+.weui-media-box_appmsg .weui-media-box__thumb {
+	width: 100%;
+	max-height: 100%;
+	vertical-align: top
+}
+
+.weui-media-box_appmsg .weui-media-box__bd {
+	-webkit-box-flex: 1;
+	-webkit-flex: 1;
+	flex: 1;
+	min-width: 0
+}
+
+.weui-media-box_small-appmsg {
+	padding: 0
+}
+
+.weui-media-box_small-appmsg .weui-cells {
+	margin-top: 0
+}
+
+.weui-media-box_small-appmsg .weui-cells:before {
+	display: none
+}
+
+.weui-grids {
+	position: relative;
+	overflow: hidden
+}
+
+.weui-grids:before {
+	right: 0;
+	height: 1px;
+	border-top: 1px solid #d9d9d9;
+	-webkit-transform-origin: 0 0;
+	transform-origin: 0 0;
+	-webkit-transform: scaleY(.5);
+	transform: scaleY(.5)
+}
+
+.weui-grids:after, .weui-grids:before {
+	content: " ";
+	position: absolute;
+	left: 0;
+	top: 0;
+	color: #d9d9d9
+}
+
+.weui-grids:after {
+	width: 1px;
+	bottom: 0;
+	border-left: 1px solid #d9d9d9;
+	-webkit-transform-origin: 0 0;
+	transform-origin: 0 0;
+	-webkit-transform: scaleX(.5);
+	transform: scaleX(.5)
+}
+
+.weui-grid {
+	position: relative;
+	float: left;
+	padding: 20px 10px;
+	width: 33.33333333%;
+	box-sizing: border-box
+}
+
+.weui-grid:before {
+	top: 0;
+	width: 1px;
+	border-right: 1px solid #d9d9d9;
+	-webkit-transform-origin: 100% 0;
+	transform-origin: 100% 0;
+	-webkit-transform: scaleX(.5);
+	transform: scaleX(.5)
+}
+
+.weui-grid:after, .weui-grid:before {
+	content: " ";
+	position: absolute;
+	right: 0;
+	bottom: 0;
+	color: #d9d9d9
+}
+
+.weui-grid:after {
+	left: 0;
+	height: 1px;
+	border-bottom: 1px solid #d9d9d9;
+	-webkit-transform-origin: 0 100%;
+	transform-origin: 0 100%;
+	-webkit-transform: scaleY(.5);
+	transform: scaleY(.5)
+}
+
+.weui-grid:active {
+	background-color: #ececec
+}
+
+.weui-grid__icon {
+	width: 28px;
+	height: 28px;
+	margin: 0 auto
+}
+
+.weui-grid__icon img {
+	display: block;
+	width: 100%;
+	height: 100%
+}
+
+.weui-grid__icon+.weui-grid__label {
+	margin-top: 5px
+}
+
+.weui-grid__label {
+	display: block;
+	color: #000;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	overflow: hidden
+}
+
+.weui-footer, .weui-grid__label {
+	text-align: center;
+	font-size: 14px
+}
+
+.weui-footer {
+	color: #999
+}
+
+.weui-footer a {
+	color: #586c94
+}
+
+.weui-footer_fixed-bottom {
+	position: fixed;
+	bottom: .52em;
+	left: 0;
+	right: 0
+}
+
+.weui-footer__links {
+	font-size: 0
+}
+
+.weui-footer__link {
+	display: inline-block;
+	vertical-align: top;
+	margin: 0 .62em;
+	position: relative;
+	font-size: 14px
+}
+
+.weui-footer__link:before {
+	content: " ";
+	position: absolute;
+	left: 0;
+	top: 0;
+	width: 1px;
+	bottom: 0;
+	border-left: 1px solid #c7c7c7;
+	color: #c7c7c7;
+	-webkit-transform-origin: 0 0;
+	transform-origin: 0 0;
+	-webkit-transform: scaleX(.5);
+	transform: scaleX(.5);
+	left: -.65em;
+	top: .36em;
+	bottom: .36em
+}
+
+.weui-footer__link:first-child:before {
+	display: none
+}
+
+.weui-footer__text {
+	padding: 0 .34em;
+	font-size: 12px
+}
+
+.weui-flex {
+	display: -webkit-box;
+	display: -webkit-flex;
+	display: flex
+}
+
+.weui-flex__item {
+	-webkit-box-flex: 1;
+	-webkit-flex: 1;
+	flex: 1
+}
+
+.weui-dialog {
+	position: fixed;
+	z-index: 5000;
+	width: 80%;
+	max-width: 300px;
+	top: 50%;
+	left: 50%;
+	-webkit-transform: translate(-50%, -50%);
+	transform: translate(-50%, -50%);
+	background-color: #fff;
+	text-align: center;
+	border-radius: 3px;
+	overflow: hidden
+}
+
+.weui-dialog__hd {
+	padding: 1.3em 1.6em .5em
+}
+
+.weui-dialog__title {
+	font-weight: 400;
+	font-size: 18px
+}
+
+.weui-dialog__bd {
+	padding: 0 1.6em .8em;
+	min-height: 40px;
+	font-size: 15px;
+	line-height: 1.3;
+	word-wrap: break-word;
+	word-break: break-all;
+	color: #999
+}
+
+.weui-dialog__bd:first-child {
+	padding: 2.7em 20px 1.7em;
+	color: #353535
+}
+
+.weui-dialog__ft {
+	position: relative;
+	line-height: 48px;
+	font-size: 18px;
+	display: -webkit-box;
+	display: -webkit-flex;
+	display: flex
+}
+
+.weui-dialog__ft:after {
+	content: " ";
+	position: absolute;
+	left: 0;
+	top: 0;
+	right: 0;
+	height: 1px;
+	border-top: 1px solid #d5d5d6;
+	color: #d5d5d6;
+	-webkit-transform-origin: 0 0;
+	transform-origin: 0 0;
+	-webkit-transform: scaleY(.5);
+	transform: scaleY(.5)
+}
+
+.weui-dialog__btn {
+	display: block;
+	-webkit-box-flex: 1;
+	-webkit-flex: 1;
+	flex: 1;
+	color: #3cc51f;
+	text-decoration: none;
+	-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+	position: relative
+}
+
+.weui-dialog__btn:active {
+	background-color: #eee
+}
+
+.weui-dialog__btn:after {
+	content: " ";
+	position: absolute;
+	left: 0;
+	top: 0;
+	width: 1px;
+	bottom: 0;
+	border-left: 1px solid #d5d5d6;
+	color: #d5d5d6;
+	-webkit-transform-origin: 0 0;
+	transform-origin: 0 0;
+	-webkit-transform: scaleX(.5);
+	transform: scaleX(.5)
+}
+
+.weui-dialog__btn:first-child:after {
+	display: none
+}
+
+.weui-dialog__btn_default {
+	color: #353535
+}
+
+.weui-dialog__btn_primary {
+	color: #0bb20c
+}
+
+.weui-skin_android .weui-dialog {
+	text-align: left;
+	box-shadow: 0 6px 30px 0 rgba(0, 0, 0, .1)
+}
+
+.weui-skin_android .weui-dialog__title {
+	font-size: 21px
+}
+
+.weui-skin_android .weui-dialog__hd {
+	text-align: left
+}
+
+.weui-skin_android .weui-dialog__bd {
+	color: #999;
+	padding: .25em 1.6em 2em;
+	font-size: 17px;
+	text-align: left
+}
+
+.weui-skin_android .weui-dialog__bd:first-child {
+	padding: 1.6em 1.6em 2em;
+	color: #353535
+}
+
+.weui-skin_android .weui-dialog__ft {
+	display: block;
+	text-align: right;
+	line-height: 42px;
+	font-size: 16px;
+	padding: 0 1.6em .7em
+}
+
+.weui-skin_android .weui-dialog__ft:after {
+	display: none
+}
+
+.weui-skin_android .weui-dialog__btn {
+	display: inline-block;
+	vertical-align: top;
+	padding: 0 .8em
+}
+
+.weui-skin_android .weui-dialog__btn:after {
+	display: none
+}
+
+.weui-skin_android .weui-dialog__btn:active, .weui-skin_android .weui-dialog__btn:visited
+	{
+	background-color: rgba(0, 0, 0, .06)
+}
+
+.weui-skin_android .weui-dialog__btn:last-child {
+	margin-right: -.8em
+}
+
+.weui-skin_android .weui-dialog__btn_default {
+	color: gray
+}
+
+@media screen and (min-width:1024px) {
+	.weui-dialog {
+		width: 35%
+	}
+}
+
+.weui-toast {
+	position: fixed;
+	z-index: 5000;
+	width: 7.6em;
+	min-height: 7.6em;
+	top: 180px;
+	left: 50%;
+	margin-left: -3.8em;
+	background: hsla(0, 0%, 7%, .7);
+	text-align: center;
+	border-radius: 5px;
+	color: #fff
+}
+
+.weui-icon_toast {
+	margin: 22px 0 0;
+	display: block
+}
+
+.weui-icon_toast.weui-icon-success-no-circle:before {
+	color: #fff;
+	font-size: 55px
+}
+
+.weui-icon_toast.weui-loading {
+	margin: 30px 0 0;
+	width: 38px;
+	height: 38px;
+	vertical-align: baseline
+}
+
+.weui-toast__content {
+	margin: 0 0 15px
+}
+
+.weui-mask {
+	background: rgba(0, 0, 0, .6)
+}
+
+.weui-mask, .weui-mask_transparent {
+	position: fixed;
+	z-index: 1000;
+	top: 0;
+	right: 0;
+	left: 0;
+	bottom: 0
+}
+
+.weui-actionsheet {
+	position: fixed;
+	left: 0;
+	bottom: 0;
+	-webkit-transform: translateY(100%);
+	transform: translateY(100%);
+	-webkit-backface-visibility: hidden;
+	backface-visibility: hidden;
+	z-index: 5000;
+	width: 100%;
+	background-color: #efeff4;
+	-webkit-transition: -webkit-transform .3s;
+	transition: -webkit-transform .3s;
+	transition: transform .3s;
+	transition: transform .3s, -webkit-transform .3s
+}
+
+.weui-actionsheet__title {
+	position: relative;
+	height: 65px;
+	padding: 0 20px;
+	line-height: 1.4;
+	display: -webkit-box;
+	display: -webkit-flex;
+	display: flex;
+	-webkit-box-pack: center;
+	-webkit-justify-content: center;
+	justify-content: center;
+	-webkit-box-orient: vertical;
+	-webkit-box-direction: normal;
+	-webkit-flex-direction: column;
+	flex-direction: column;
+	text-align: center;
+	font-size: 14px;
+	color: #888;
+	background: #fcfcfd
+}
+
+.weui-actionsheet__title:before {
+	content: " ";
+	position: absolute;
+	left: 0;
+	bottom: 0;
+	right: 0;
+	height: 1px;
+	border-bottom: 1px solid #e5e5e5;
+	color: #e5e5e5;
+	-webkit-transform-origin: 0 100%;
+	transform-origin: 0 100%;
+	-webkit-transform: scaleY(.5);
+	transform: scaleY(.5)
+}
+
+.weui-actionsheet__title .weui-actionsheet__title-text {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	display: -webkit-box;
+	-webkit-box-orient: vertical;
+	-webkit-line-clamp: 2
+}
+
+.weui-actionsheet__menu {
+	background-color: #fcfcfd
+}
+
+.weui-actionsheet__action {
+	margin-top: 6px;
+	background-color: #fcfcfd
+}
+
+.weui-actionsheet__cell {
+	position: relative;
+	padding: 10px 0;
+	text-align: center;
+	font-size: 18px
+}
+
+.weui-actionsheet__cell:before {
+	content: " ";
+	position: absolute;
+	left: 0;
+	top: 0;
+	right: 0;
+	height: 1px;
+	border-top: 1px solid #e5e5e5;
+	color: #e5e5e5;
+	-webkit-transform-origin: 0 0;
+	transform-origin: 0 0;
+	-webkit-transform: scaleY(.5);
+	transform: scaleY(.5)
+}
+
+.weui-actionsheet__cell:active {
+	background-color: #ececec
+}
+
+.weui-actionsheet__cell:first-child:before {
+	display: none
+}
+
+.weui-skin_android .weui-actionsheet {
+	position: fixed;
+	left: 50%;
+	top: 50%;
+	bottom: auto;
+	-webkit-transform: translate(-50%, -50%);
+	transform: translate(-50%, -50%);
+	width: 274px;
+	box-sizing: border-box;
+	-webkit-backface-visibility: hidden;
+	backface-visibility: hidden;
+	background: transparent;
+	-webkit-transition: -webkit-transform .3s;
+	transition: -webkit-transform .3s;
+	transition: transform .3s;
+	transition: transform .3s, -webkit-transform .3s
+}
+
+.weui-skin_android .weui-actionsheet__action {
+	display: none
+}
+
+.weui-skin_android .weui-actionsheet__menu {
+	border-radius: 2px;
+	box-shadow: 0 6px 30px 0 rgba(0, 0, 0, .1)
+}
+
+.weui-skin_android .weui-actionsheet__cell {
+	padding: 13px 24px;
+	font-size: 16px;
+	line-height: 1.4;
+	text-align: left
+}
+
+.weui-skin_android .weui-actionsheet__cell:first-child {
+	border-top-left-radius: 2px;
+	border-top-right-radius: 2px
+}
+
+.weui-skin_android .weui-actionsheet__cell:last-child {
+	border-bottom-left-radius: 2px;
+	border-bottom-right-radius: 2px
+}
+
+.weui-actionsheet_toggle {
+	-webkit-transform: translate(0);
+	transform: translate(0)
+}
+
+.weui-loadmore {
+	width: 65%;
+	margin: 1.5em auto;
+	line-height: 1.6em;
+	font-size: 14px;
+	text-align: center
+}
+
+.weui-loadmore__tips {
+	display: inline-block;
+	vertical-align: middle
+}
+
+.weui-loadmore_line {
+	border-top: 1px solid #e5e5e5;
+	margin-top: 2.4em
+}
+
+.weui-loadmore_line .weui-loadmore__tips {
+	position: relative;
+	top: -.9em;
+	padding: 0 .55em;
+	background-color: #fff;
+	color: #999
+}
+
+.weui-loadmore_dot .weui-loadmore__tips {
+	padding: 0 .16em
+}
+
+.weui-loadmore_dot .weui-loadmore__tips:before {
+	content: " ";
+	width: 4px;
+	height: 4px;
+	border-radius: 50%;
+	background-color: #e5e5e5;
+	display: inline-block;
+	position: relative;
+	vertical-align: 0;
+	top: -.16em
+}
+
+.weui-badge {
+	display: inline-block;
+	padding: .15em .4em;
+	min-width: 8px;
+	border-radius: 18px;
+	background-color: #f43530;
+	color: #fff;
+	line-height: 1.2;
+	text-align: center;
+	font-size: 12px;
+	vertical-align: middle
+}
+
+.weui-badge_dot {
+	padding: .4em;
+	min-width: 0
+}
+
+.weui-search-bar {
+	position: relative;
+	padding: 8px 10px;
+	display: -webkit-box;
+	display: -webkit-flex;
+	display: flex;
+	box-sizing: border-box;
+	background-color: #efeff4;
+	-webkit-text-size-adjust: 100%;
+	-webkit-box-align: center;
+	-webkit-align-items: center;
+	align-items: center
+}
+
+.weui-search-bar:before {
+	top: 0;
+	border-top: 1px solid #d7d6dc;
+	-webkit-transform-origin: 0 0;
+	transform-origin: 0 0;
+	-webkit-transform: scaleY(.5);
+	transform: scaleY(.5)
+}
+
+.weui-search-bar:after, .weui-search-bar:before {
+	content: " ";
+	position: absolute;
+	left: 0;
+	right: 0;
+	height: 1px;
+	color: #d7d6dc
+}
+
+.weui-search-bar:after {
+	bottom: 0;
+	border-bottom: 1px solid #d7d6dc;
+	-webkit-transform-origin: 0 100%;
+	transform-origin: 0 100%;
+	-webkit-transform: scaleY(.5);
+	transform: scaleY(.5)
+}
+
+.weui-search-bar.weui-search-bar_focusing .weui-search-bar__cancel-btn {
+	display: block
+}
+
+.weui-search-bar.weui-search-bar_focusing .weui-search-bar__label {
+	display: none
+}
+
+.weui-search-bar__form {
+	position: relative;
+	-webkit-box-flex: 1;
+	-webkit-flex: auto;
+	flex: auto;
+	background-color: #efeff4
+}
+
+.weui-search-bar__form:after {
+	content: '';
+	position: absolute;
+	left: 0;
+	top: 0;
+	width: 200%;
+	height: 200%;
+	-webkit-transform: scale(.5);
+	transform: scale(.5);
+	-webkit-transform-origin: 0 0;
+	transform-origin: 0 0;
+	border-radius: 10px;
+	border: 1px solid #e6e6ea;
+	box-sizing: border-box;
+	background: #fff
+}
+
+.weui-search-bar__box {
+	position: relative;
+	padding-left: 30px;
+	padding-right: 30px;
+	height: 100%;
+	width: 100%;
+	box-sizing: border-box;
+	z-index: 1
+}
+
+.weui-search-bar__box .weui-search-bar__input {
+	padding: 4px 0;
+	width: 100%;
+	height: 1.42857143em;
+	border: 0;
+	font-size: 14px;
+	line-height: 1.42857143em;
+	box-sizing: content-box;
+	background: transparent
+}
+
+.weui-search-bar__box .weui-search-bar__input:focus {
+	outline: none
+}
+
+.weui-search-bar__box .weui-icon-search {
+	position: absolute;
+	top: 50%;
+	left: 10px;
+	margin-top: -14px;
+	line-height: 28px
+}
+
+.weui-search-bar__box .weui-icon-clear {
+	position: absolute;
+	top: 50%;
+	right: 0;
+	margin-top: -14px;
+	padding: 0 10px;
+	line-height: 28px
+}
+
+.weui-search-bar__label {
+	position: absolute;
+	top: 1px;
+	right: 1px;
+	bottom: 1px;
+	left: 1px;
+	z-index: 2;
+	border-radius: 3px;
+	text-align: center;
+	color: #9b9b9b;
+	background: #fff
+}
+
+.weui-search-bar__label span {
+	display: inline-block;
+	font-size: 14px;
+	vertical-align: middle
+}
+
+.weui-search-bar__label .weui-icon-search {
+	margin-right: 5px
+}
+
+.weui-search-bar__cancel-btn {
+	display: none;
+	margin-left: 10px;
+	line-height: 28px;
+	color: #09bb07;
+	white-space: nowrap
+}
+
+.weui-search-bar__input:not (:valid )~.weui-icon-clear {
+	display: none
+}
+
+input[type=search]::-webkit-search-cancel-button, input[type=search]::-webkit-search-decoration,
+	input[type=search]::-webkit-search-results-button, input[type=search]::-webkit-search-results-decoration
+	{
+	display: none
+}
+
+.weui-picker {
+	position: fixed;
+	width: 100%;
+	left: 0;
+	bottom: 0;
+	z-index: 5000;
+	-webkit-backface-visibility: hidden;
+	backface-visibility: hidden;
+	-webkit-transform: translateY(100%);
+	transform: translateY(100%);
+	-webkit-transition: -webkit-transform .3s;
+	transition: -webkit-transform .3s;
+	transition: transform .3s;
+	transition: transform .3s, -webkit-transform .3s
+}
+
+.weui-picker__hd {
+	display: -webkit-box;
+	display: -webkit-flex;
+	display: flex;
+	padding: 9px 15px;
+	background-color: #fff;
+	position: relative;
+	text-align: center;
+	font-size: 17px
+}
+
+.weui-picker__hd:after {
+	content: " ";
+	position: absolute;
+	left: 0;
+	bottom: 0;
+	right: 0;
+	height: 1px;
+	border-bottom: 1px solid #e5e5e5;
+	color: #e5e5e5;
+	-webkit-transform-origin: 0 100%;
+	transform-origin: 0 100%;
+	-webkit-transform: scaleY(.5);
+	transform: scaleY(.5)
+}
+
+.weui-picker__action {
+	display: block;
+	-webkit-box-flex: 1;
+	-webkit-flex: 1;
+	flex: 1;
+	color: #1aad19
+}
+
+.weui-picker__action:first-child {
+	text-align: left;
+	color: #888
+}
+
+.weui-picker__action:last-child {
+	text-align: right
+}
+
+.weui-picker__bd {
+	display: -webkit-box;
+	display: -webkit-flex;
+	display: flex;
+	position: relative;
+	background-color: #fff;
+	height: 238px;
+	overflow: hidden
+}
+
+.weui-picker__group {
+	-webkit-box-flex: 1;
+	-webkit-flex: 1;
+	flex: 1;
+	position: relative;
+	height: 100%
+}
+
+.weui-picker__mask {
+	top: 0;
+	height: 100%;
+	margin: 0 auto;
+	background: -webkit-linear-gradient(top, hsla(0, 0%, 100%, .95),
+		hsla(0, 0%, 100%, .6)),
+		-webkit-linear-gradient(bottom, hsla(0, 0%, 100%, .95),
+		hsla(0, 0%, 100%, .6));
+	background: linear-gradient(180deg, hsla(0, 0%, 100%, .95),
+		hsla(0, 0%, 100%, .6)), linear-gradient(0deg, hsla(0, 0%, 100%, .95),
+		hsla(0, 0%, 100%, .6));
+	background-position: top, bottom;
+	background-size: 100% 102px;
+	background-repeat: no-repeat;
+	-webkit-transform: translateZ(0);
+	transform: translateZ(0)
+}
+
+.weui-picker__indicator, .weui-picker__mask {
+	position: absolute;
+	left: 0;
+	width: 100%;
+	z-index: 3
+}
+
+.weui-picker__indicator {
+	height: 34px;
+	top: 102px
+}
+
+.weui-picker__indicator:before {
+	top: 0;
+	border-top: 1px solid #e5e5e5;
+	-webkit-transform-origin: 0 0;
+	transform-origin: 0 0;
+	-webkit-transform: scaleY(.5);
+	transform: scaleY(.5)
+}
+
+.weui-picker__indicator:after, .weui-picker__indicator:before {
+	content: " ";
+	position: absolute;
+	left: 0;
+	right: 0;
+	height: 1px;
+	color: #e5e5e5
+}
+
+.weui-picker__indicator:after {
+	bottom: 0;
+	border-bottom: 1px solid #e5e5e5;
+	-webkit-transform-origin: 0 100%;
+	transform-origin: 0 100%;
+	-webkit-transform: scaleY(.5);
+	transform: scaleY(.5)
+}
+
+.weui-picker__content {
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 100%
+}
+
+.weui-picker__item {
+	padding: 0;
+	height: 34px;
+	line-height: 34px;
+	text-align: center;
+	color: #000;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	overflow: hidden
+}
+
+.weui-picker__item_disabled {
+	color: #999
+}
+
+@
+-webkit-keyframes a { 0%{
+	-webkit-transform: translate3d(0, 100%, 0);
+	transform: translate3d(0, 100%, 0)
+}
+
+to {
+	-webkit-transform: translateZ(0);
+	transform: translateZ(0)
+}
+
+}
+@
+keyframes a { 0%{
+	-webkit-transform: translate3d(0, 100%, 0);
+	transform: translate3d(0, 100%, 0)
+}
+
+to {
+	-webkit-transform: translateZ(0);
+	transform: translateZ(0)
+}
+
+}
+.weui-animate-slide-up {
+	-webkit-animation: a ease .3s forwards;
+	animation: a ease .3s forwards
+}
+
+@
+-webkit-keyframes b { 0%{
+	-webkit-transform: translateZ(0);
+	transform: translateZ(0)
+}
+
+to {
+	-webkit-transform: translate3d(0, 100%, 0);
+	transform: translate3d(0, 100%, 0)
+}
+
+}
+@
+keyframes b { 0%{
+	-webkit-transform: translateZ(0);
+	transform: translateZ(0)
+}
+
+to {
+	-webkit-transform: translate3d(0, 100%, 0);
+	transform: translate3d(0, 100%, 0)
+}
+
+}
+.weui-animate-slide-down {
+	-webkit-animation: b ease .3s forwards;
+	animation: b ease .3s forwards
+}
+
+@
+-webkit-keyframes c { 0%{
+	opacity: 0
+}
+
+to {
+	opacity: 1
+}
+
+}
+@
+keyframes c { 0%{
+	opacity: 0
+}
+
+to {
+	opacity: 1
+}
+
+}
+.weui-animate-fade-in {
+	-webkit-animation: c ease .3s forwards;
+	animation: c ease .3s forwards
+}
+
+@
+-webkit-keyframes d { 0%{
+	opacity: 1
+}
+
+to {
+	opacity: 0
+}
+
+}
+@
+keyframes d { 0%{
+	opacity: 1
+}
+
+to {
+	opacity: 0
+}
+
+}
+.weui-animate-fade-out {
+	-webkit-animation: d ease .3s forwards;
+	animation: d ease .3s forwards
+}
+
+.weui-agree {
+	display: block;
+	padding: .5em 15px;
+	font-size: 13px
+}
+
+.weui-agree a {
+	color: #586c94
+}
+
+.weui-agree__text {
+	color: #999
+}
+
+.weui-agree__checkbox {
+	-webkit-appearance: none;
+	appearance: none;
+	outline: 0;
+	font-size: 0;
+	border: 1px solid #d1d1d1;
+	background-color: #fff;
+	border-radius: 3px;
+	width: 13px;
+	height: 13px;
+	position: relative;
+	vertical-align: 0;
+	top: 2px
+}
+
+.weui-agree__checkbox:checked:before {
+	font-family: weui;
+	font-style: normal;
+	font-weight: 400;
+	font-variant: normal;
+	text-transform: none;
+	text-align: center;
+	speak: none;
+	display: inline-block;
+	vertical-align: middle;
+	text-decoration: inherit;
+	content: "\EA08";
+	color: #09bb07;
+	font-size: 13px;
+	position: absolute;
+	top: 50%;
+	left: 50%;
+	-webkit-transform: translate(-50%, -48%) scale(.73);
+	transform: translate(-50%, -48%) scale(.73)
+}
+
+.weui-agree__checkbox:disabled {
+	background-color: #e1e1e1
+}
+
+.weui-agree__checkbox:disabled:before {
+	color: #adadad
+}
+
+.weui-loading {
+	width: 20px;
+	height: 20px;
+	display: inline-block;
+	vertical-align: middle;
+	-webkit-animation: e 1s steps(12) infinite;
+	animation: e 1s steps(12) infinite;
+	background: transparent
+		url("data:image/svg+xml;charset=utf8, %3Csvg xmlns='http://www.w3.org/2000/svg' width='120' height='120' viewBox='0 0 100 100'%3E%3Cpath fill='none' d='M0 0h100v100H0z'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23E9E9E9' rx='5' ry='5' transform='translate(0 -30)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23989697' rx='5' ry='5' transform='rotate(30 105.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%239B999A' rx='5' ry='5' transform='rotate(60 75.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23A3A1A2' rx='5' ry='5' transform='rotate(90 65 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23ABA9AA' rx='5' ry='5' transform='rotate(120 58.66 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23B2B2B2' rx='5' ry='5' transform='rotate(150 54.02 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23BAB8B9' rx='5' ry='5' transform='rotate(180 50 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23C2C0C1' rx='5' ry='5' transform='rotate(-150 45.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23CBCBCB' rx='5' ry='5' transform='rotate(-120 41.34 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23D2D2D2' rx='5' ry='5' transform='rotate(-90 35 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23DADADA' rx='5' ry='5' transform='rotate(-60 24.02 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23E2E2E2' rx='5' ry='5' transform='rotate(-30 -5.98 65)'/%3E%3C/svg%3E")
+		no-repeat;
+	background-size: 100%
+}
+
+.weui-btn_loading.weui-btn_primary .weui-loading, .weui-btn_loading.weui-btn_warn .weui-loading,
+	.weui-loading.weui-loading_transparent {
+	background-image:
+		url("data:image/svg+xml;charset=utf8, %3Csvg xmlns='http://www.w3.org/2000/svg' width='120' height='120' viewBox='0 0 100 100'%3E%3Cpath fill='none' d='M0 0h100v100H0z'/%3E%3Crect xmlns='http://www.w3.org/2000/svg' width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.56)' rx='5' ry='5' transform='translate(0 -30)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.5)' rx='5' ry='5' transform='rotate(30 105.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.43)' rx='5' ry='5' transform='rotate(60 75.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.38)' rx='5' ry='5' transform='rotate(90 65 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.32)' rx='5' ry='5' transform='rotate(120 58.66 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.28)' rx='5' ry='5' transform='rotate(150 54.02 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.25)' rx='5' ry='5' transform='rotate(180 50 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.2)' rx='5' ry='5' transform='rotate(-150 45.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.17)' rx='5' ry='5' transform='rotate(-120 41.34 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.14)' rx='5' ry='5' transform='rotate(-90 35 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.1)' rx='5' ry='5' transform='rotate(-60 24.02 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.03)' rx='5' ry='5' transform='rotate(-30 -5.98 65)'/%3E%3C/svg%3E")
+}
+
+@
+-webkit-keyframes e { 0%{
+	-webkit-transform: rotate(0deg);
+	transform: rotate(0deg)
+}
+
+to {
+	-webkit-transform: rotate(1turn);
+	transform: rotate(1turn)
+}
+
+}
+@
+keyframes e { 0%{
+	-webkit-transform: rotate(0deg);
+	transform: rotate(0deg)
+}
+
+to {
+	-webkit-transform: rotate(1turn);
+	transform: rotate(1turn)
+}
+
+}
+.weui-slider {
+	padding: 15px 18px;
+	-webkit-user-select: none;
+	user-select: none
+}
+
+.weui-slider__inner {
+	position: relative;
+	height: 2px;
+	background-color: #e9e9e9
+}
+
+.weui-slider__track {
+	height: 2px;
+	background-color: #1aad19;
+	width: 0
+}
+
+.weui-slider__handler {
+	position: absolute;
+	left: 0;
+	top: 50%;
+	width: 28px;
+	height: 28px;
+	margin-left: -14px;
+	margin-top: -14px;
+	border-radius: 50%;
+	background-color: #fff;
+	box-shadow: 0 0 4px rgba(0, 0, 0, .2)
+}
+
+.weui-slider-box {
+	display: -webkit-box;
+	display: -webkit-flex;
+	display: flex;
+	-webkit-box-align: center;
+	-webkit-align-items: center;
+	align-items: center
+}
+
+.weui-slider-box .weui-slider {
+	-webkit-box-flex: 1;
+	-webkit-flex: 1;
+	flex: 1
+}
+
+.weui-slider-box__value {
+	margin-left: .5em;
+	min-width: 24px;
+	color: #888;
+	text-align: center;
+	font-size: 14px
+}
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/css/weui/jquery-weui.min.css b/pluss-wap-page/src/main/resources/static/resources/css/weui/jquery-weui.min.css
new file mode 100644
index 0000000..145c336
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/css/weui/jquery-weui.min.css
@@ -0,0 +1,6 @@
+/** 
+* jQuery WeUI V1.2.1 
+* By 言川
+* http://lihongxun945.github.io/jquery-weui/
+ */
+.preloader{width:20px;height:20px;-webkit-transform-origin:50%;transform-origin:50%;-webkit-animation:preloader-spin 1s steps(12,end) infinite;animation:preloader-spin 1s steps(12,end) infinite}.preloader:after{display:block;width:100%;height:100%;content:"";background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg%20viewBox%3D'0%200%20120%20120'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20xmlns%3Axlink%3D'http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink'%3E%3Cdefs%3E%3Cline%20id%3D'l'%20x1%3D'60'%20x2%3D'60'%20y1%3D'7'%20y2%3D'27'%20stroke%3D'%236c6c6c'%20stroke-width%3D'11'%20stroke-linecap%3D'round'%2F%3E%3C%2Fdefs%3E%3Cg%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(30%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(60%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(90%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(120%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(150%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.37'%20transform%3D'rotate(180%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.46'%20transform%3D'rotate(210%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.56'%20transform%3D'rotate(240%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.66'%20transform%3D'rotate(270%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.75'%20transform%3D'rotate(300%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.85'%20transform%3D'rotate(330%2060%2C60)'%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E");background-repeat:no-repeat;background-position:50%;background-size:100%}@-webkit-keyframes preloader-spin{100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}label>*{pointer-events:none}html{font-size:20px}body{font-size:16px}@media only screen and (min-width:400px){html{font-size:21.33px!important}}@media only screen and (min-width:414px){html{font-size:22.08px!important}}@media only screen and (min-width:480px){html{font-size:25.6px!important}}.weui_navbar{z-index:10}.weui-mask,.weui-popup-container,.weui-popup-overlay{z-index:1000}.weui-row{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-lines:multiple;-moz-box-lines:multiple;-ms-flex-wrap:wrap;flex-wrap:wrap;-webkit-box-align:start;-ms-flex-align:start;align-items:flex-start}.weui-row>[class*=col-]{box-sizing:border-box}.weui-row .col-auto{width:100%}.weui-row .weui-col-100{width:100%;width:calc((100% - 15px*0)/ 1)}.weui-row.weui-no-gutter .weui-col-100{width:100%}.weui-row .weui-col-95{width:95%;width:calc((100% - 15px*.05263157894736836)/ 1.0526315789473684)}.weui-row.weui-no-gutter .weui-col-95{width:95%}.weui-row .weui-col-90{width:90%;width:calc((100% - 15px*.11111111111111116)/ 1.1111111111111112)}.weui-row.weui-no-gutter .weui-col-90{width:90%}.weui-row .weui-col-85{width:85%;width:calc((100% - 15px*.17647058823529416)/ 1.1764705882352942)}.weui-row.weui-no-gutter .weui-col-85{width:85%}.weui-row .weui-col-80{width:80%;width:calc((100% - 15px*.25)/ 1.25)}.weui-row.weui-no-gutter .weui-col-80{width:80%}.weui-row .weui-col-75{width:75%;width:calc((100% - 15px*.33333333333333326)/ 1.3333333333333333)}.weui-row.weui-no-gutter .weui-col-75{width:75%}.weui-row .weui-col-66{width:66.66666666666666%;width:calc((100% - 15px*.5000000000000002)/ 1.5000000000000002)}.weui-row.weui-no-gutter .weui-col-66{width:66.66666666666666%}.weui-row .weui-col-60{width:60%;width:calc((100% - 15px*.6666666666666667)/ 1.6666666666666667)}.weui-row.weui-no-gutter .weui-col-60{width:60%}.weui-row .weui-col-50{width:50%;width:calc((100% - 15px*1)/ 2)}.weui-row.weui-no-gutter .weui-col-50{width:50%}.weui-row .weui-col-40{width:40%;width:calc((100% - 15px*1.5)/ 2.5)}.weui-row.weui-no-gutter .weui-col-40{width:40%}.weui-row .weui-col-33{width:33.333333333333336%;width:calc((100% - 15px*2)/ 3)}.weui-row.weui-no-gutter .weui-col-33{width:33.333333333333336%}.weui-row .weui-col-25{width:25%;width:calc((100% - 15px*3)/ 4)}.weui-row.weui-no-gutter .weui-col-25{width:25%}.weui-row .weui-col-20{width:20%;width:calc((100% - 15px*4)/ 5)}.weui-row.weui-no-gutter .weui-col-20{width:20%}.weui-row .weui-col-15{width:15%;width:calc((100% - 15px*5.666666666666667)/ 6.666666666666667)}.weui-row.weui-no-gutter .weui-col-15{width:15%}.weui-row .weui-col-10{width:10%;width:calc((100% - 15px*9)/ 10)}.weui-row.weui-no-gutter .weui-col-10{width:10%}.weui-row .weui-col-5{width:5%;width:calc((100% - 15px*19)/ 20)}.weui-row.weui-no-gutter .weui-col-5{width:5%}.weui-row .weui-col-auto:nth-last-child(1),.weui-row .weui-col-auto:nth-last-child(1)~.weui-col-auto{width:100%;width:calc((100% - 15px*0)/ 1)}.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(1),.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(1)~.weui-col-auto{width:100%}.weui-row .weui-col-auto:nth-last-child(2),.weui-row .weui-col-auto:nth-last-child(2)~.weui-col-auto{width:50%;width:calc((100% - 15px*1)/ 2)}.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(2),.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(2)~.weui-col-auto{width:50%}.weui-row .weui-col-auto:nth-last-child(3),.weui-row .weui-col-auto:nth-last-child(3)~.weui-col-auto{width:33.33333333%;width:calc((100% - 15px*2)/ 3)}.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(3),.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(3)~.weui-col-auto{width:33.33333333%}.weui-row .weui-col-auto:nth-last-child(4),.weui-row .weui-col-auto:nth-last-child(4)~.weui-col-auto{width:25%;width:calc((100% - 15px*3)/ 4)}.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(4),.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(4)~.weui-col-auto{width:25%}.weui-row .weui-col-auto:nth-last-child(5),.weui-row .weui-col-auto:nth-last-child(5)~.weui-col-auto{width:20%;width:calc((100% - 15px*4)/ 5)}.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(5),.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(5)~.weui-col-auto{width:20%}.weui-row .weui-col-auto:nth-last-child(6),.weui-row .weui-col-auto:nth-last-child(6)~.weui-col-auto{width:16.66666667%;width:calc((100% - 15px*5)/ 6)}.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(6),.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(6)~.weui-col-auto{width:16.66666667%}.weui-row .weui-col-auto:nth-last-child(7),.weui-row .weui-col-auto:nth-last-child(7)~.weui-col-auto{width:14.28571429%;width:calc((100% - 15px*6)/ 7)}.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(7),.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(7)~.weui-col-auto{width:14.28571429%}.weui-row .weui-col-auto:nth-last-child(8),.weui-row .weui-col-auto:nth-last-child(8)~.weui-col-auto{width:12.5%;width:calc((100% - 15px*7)/ 8)}.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(8),.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(8)~.weui-col-auto{width:12.5%}.weui-row .weui-col-auto:nth-last-child(9),.weui-row .weui-col-auto:nth-last-child(9)~.weui-col-auto{width:11.11111111%;width:calc((100% - 15px*8)/ 9)}.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(9),.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(9)~.weui-col-auto{width:11.11111111%}.weui-row .weui-col-auto:nth-last-child(10),.weui-row .weui-col-auto:nth-last-child(10)~.weui-col-auto{width:10%;width:calc((100% - 15px*9)/ 10)}.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(10),.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(10)~.weui-col-auto{width:10%}.weui-row .weui-col-auto:nth-last-child(11),.weui-row .weui-col-auto:nth-last-child(11)~.weui-col-auto{width:9.09090909%;width:calc((100% - 15px*10)/ 11)}.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(11),.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(11)~.weui-col-auto{width:9.09090909%}.weui-row .weui-col-auto:nth-last-child(12),.weui-row .weui-col-auto:nth-last-child(12)~.weui-col-auto{width:8.33333333%;width:calc((100% - 15px*11)/ 12)}.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(12),.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(12)~.weui-col-auto{width:8.33333333%}.weui-row .weui-col-auto:nth-last-child(13),.weui-row .weui-col-auto:nth-last-child(13)~.weui-col-auto{width:7.69230769%;width:calc((100% - 15px*12)/ 13)}.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(13),.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(13)~.weui-col-auto{width:7.69230769%}.weui-row .weui-col-auto:nth-last-child(14),.weui-row .weui-col-auto:nth-last-child(14)~.weui-col-auto{width:7.14285714%;width:calc((100% - 15px*13)/ 14)}.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(14),.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(14)~.weui-col-auto{width:7.14285714%}.weui-row .weui-col-auto:nth-last-child(15),.weui-row .weui-col-auto:nth-last-child(15)~.weui-col-auto{width:6.66666667%;width:calc((100% - 15px*14)/ 15)}.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(15),.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(15)~.weui-col-auto{width:6.66666667%}@media all and (min-width:768px){.row .tablet-100{width:100%;width:calc((100% - 15px*0)/ 1)}.row.no-gutter .tablet-100{width:100%}.row .tablet-95{width:95%;width:calc((100% - 15px*.05263157894736836)/ 1.0526315789473684)}.row.no-gutter .tablet-95{width:95%}.row .tablet-90{width:90%;width:calc((100% - 15px*.11111111111111116)/ 1.1111111111111112)}.row.no-gutter .tablet-90{width:90%}.row .tablet-85{width:85%;width:calc((100% - 15px*.17647058823529416)/ 1.1764705882352942)}.row.no-gutter .tablet-85{width:85%}.row .tablet-80{width:80%;width:calc((100% - 15px*.25)/ 1.25)}.row.no-gutter .tablet-80{width:80%}.row .tablet-75{width:75%;width:calc((100% - 15px*.33333333333333326)/ 1.3333333333333333)}.row.no-gutter .tablet-75{width:75%}.row .tablet-66{width:66.66666666666666%;width:calc((100% - 15px*.5000000000000002)/ 1.5000000000000002)}.row.no-gutter .tablet-66{width:66.66666666666666%}.row .tablet-60{width:60%;width:calc((100% - 15px*.6666666666666667)/ 1.6666666666666667)}.row.no-gutter .tablet-60{width:60%}.row .tablet-50{width:50%;width:calc((100% - 15px*1)/ 2)}.row.no-gutter .tablet-50{width:50%}.row .tablet-40{width:40%;width:calc((100% - 15px*1.5)/ 2.5)}.row.no-gutter .tablet-40{width:40%}.row .tablet-33{width:33.333333333333336%;width:calc((100% - 15px*2)/ 3)}.row.no-gutter .tablet-33{width:33.333333333333336%}.row .tablet-25{width:25%;width:calc((100% - 15px*3)/ 4)}.row.no-gutter .tablet-25{width:25%}.row .tablet-20{width:20%;width:calc((100% - 15px*4)/ 5)}.row.no-gutter .tablet-20{width:20%}.row .tablet-15{width:15%;width:calc((100% - 15px*5.666666666666667)/ 6.666666666666667)}.row.no-gutter .tablet-15{width:15%}.row .tablet-10{width:10%;width:calc((100% - 15px*9)/ 10)}.row.no-gutter .tablet-10{width:10%}.row .tablet-5{width:5%;width:calc((100% - 15px*19)/ 20)}.row.no-gutter .tablet-5{width:5%}.row .tablet-auto:nth-last-child(1),.row .tablet-auto:nth-last-child(1)~.col-auto{width:100%;width:calc((100% - 15px*0)/ 1)}.row.no-gutter .tablet-auto:nth-last-child(1),.row.no-gutter .tablet-auto:nth-last-child(1)~.tablet-auto{width:100%}.row .tablet-auto:nth-last-child(2),.row .tablet-auto:nth-last-child(2)~.col-auto{width:50%;width:calc((100% - 15px*1)/ 2)}.row.no-gutter .tablet-auto:nth-last-child(2),.row.no-gutter .tablet-auto:nth-last-child(2)~.tablet-auto{width:50%}.row .tablet-auto:nth-last-child(3),.row .tablet-auto:nth-last-child(3)~.col-auto{width:33.33333333%;width:calc((100% - 15px*2)/ 3)}.row.no-gutter .tablet-auto:nth-last-child(3),.row.no-gutter .tablet-auto:nth-last-child(3)~.tablet-auto{width:33.33333333%}.row .tablet-auto:nth-last-child(4),.row .tablet-auto:nth-last-child(4)~.col-auto{width:25%;width:calc((100% - 15px*3)/ 4)}.row.no-gutter .tablet-auto:nth-last-child(4),.row.no-gutter .tablet-auto:nth-last-child(4)~.tablet-auto{width:25%}.row .tablet-auto:nth-last-child(5),.row .tablet-auto:nth-last-child(5)~.col-auto{width:20%;width:calc((100% - 15px*4)/ 5)}.row.no-gutter .tablet-auto:nth-last-child(5),.row.no-gutter .tablet-auto:nth-last-child(5)~.tablet-auto{width:20%}.row .tablet-auto:nth-last-child(6),.row .tablet-auto:nth-last-child(6)~.col-auto{width:16.66666667%;width:calc((100% - 15px*5)/ 6)}.row.no-gutter .tablet-auto:nth-last-child(6),.row.no-gutter .tablet-auto:nth-last-child(6)~.tablet-auto{width:16.66666667%}.row .tablet-auto:nth-last-child(7),.row .tablet-auto:nth-last-child(7)~.col-auto{width:14.28571429%;width:calc((100% - 15px*6)/ 7)}.row.no-gutter .tablet-auto:nth-last-child(7),.row.no-gutter .tablet-auto:nth-last-child(7)~.tablet-auto{width:14.28571429%}.row .tablet-auto:nth-last-child(8),.row .tablet-auto:nth-last-child(8)~.col-auto{width:12.5%;width:calc((100% - 15px*7)/ 8)}.row.no-gutter .tablet-auto:nth-last-child(8),.row.no-gutter .tablet-auto:nth-last-child(8)~.tablet-auto{width:12.5%}.row .tablet-auto:nth-last-child(9),.row .tablet-auto:nth-last-child(9)~.col-auto{width:11.11111111%;width:calc((100% - 15px*8)/ 9)}.row.no-gutter .tablet-auto:nth-last-child(9),.row.no-gutter .tablet-auto:nth-last-child(9)~.tablet-auto{width:11.11111111%}.row .tablet-auto:nth-last-child(10),.row .tablet-auto:nth-last-child(10)~.col-auto{width:10%;width:calc((100% - 15px*9)/ 10)}.row.no-gutter .tablet-auto:nth-last-child(10),.row.no-gutter .tablet-auto:nth-last-child(10)~.tablet-auto{width:10%}.row .tablet-auto:nth-last-child(11),.row .tablet-auto:nth-last-child(11)~.col-auto{width:9.09090909%;width:calc((100% - 15px*10)/ 11)}.row.no-gutter .tablet-auto:nth-last-child(11),.row.no-gutter .tablet-auto:nth-last-child(11)~.tablet-auto{width:9.09090909%}.row .tablet-auto:nth-last-child(12),.row .tablet-auto:nth-last-child(12)~.col-auto{width:8.33333333%;width:calc((100% - 15px*11)/ 12)}.row.no-gutter .tablet-auto:nth-last-child(12),.row.no-gutter .tablet-auto:nth-last-child(12)~.tablet-auto{width:8.33333333%}.row .tablet-auto:nth-last-child(13),.row .tablet-auto:nth-last-child(13)~.col-auto{width:7.69230769%;width:calc((100% - 15px*12)/ 13)}.row.no-gutter .tablet-auto:nth-last-child(13),.row.no-gutter .tablet-auto:nth-last-child(13)~.tablet-auto{width:7.69230769%}.row .tablet-auto:nth-last-child(14),.row .tablet-auto:nth-last-child(14)~.col-auto{width:7.14285714%;width:calc((100% - 15px*13)/ 14)}.row.no-gutter .tablet-auto:nth-last-child(14),.row.no-gutter .tablet-auto:nth-last-child(14)~.tablet-auto{width:7.14285714%}.row .tablet-auto:nth-last-child(15),.row .tablet-auto:nth-last-child(15)~.col-auto{width:6.66666667%;width:calc((100% - 15px*14)/ 15)}.row.no-gutter .tablet-auto:nth-last-child(15),.row.no-gutter .tablet-auto:nth-last-child(15)~.tablet-auto{width:6.66666667%}}.weui-cell__hd img{display:block;margin-right:5px}.weui-cell_swiped .weui-cell__bd{-webkit-transition:-webkit-transform .3s;transition:-webkit-transform .3s;transition:transform .3s;transition:transform .3s,-webkit-transform .3s}.swipeout-touching .weui-cell__bd{-webkit-transition:none;transition:none}.weui-dialog,.weui-toast{-webkit-transition-duration:.2s;transition-duration:.2s;opacity:0;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%);-webkit-transform-origin:0 0;transform-origin:0 0;visibility:hidden;margin:0;top:45%;z-index:2000}.weui-dialog .weui-dialog__btn.default,.weui-toast .weui-dialog__btn.default{color:#5f646e}.weui-dialog .weui-dialog__btn+.weui-dialog__btn,.weui-toast .weui-dialog__btn+.weui-dialog__btn{position:relative}.weui-dialog .weui-dialog__btn+.weui-dialog__btn:after,.weui-toast .weui-dialog__btn+.weui-dialog__btn:after{content:" ";position:absolute;left:0;top:0;width:1px;height:100%;border-left:1px solid #D5D5D6;color:#D5D5D6;-webkit-transform-origin:0 0;transform-origin:0 0;-webkit-transform:scaleX(.5);transform:scaleX(.5)}.weui-dialog.weui-dialog--visible,.weui-dialog.weui-toast--visible,.weui-toast.weui-dialog--visible,.weui-toast.weui-toast--visible{opacity:1;visibility:visible}.weui-toast_forbidden{color:#F76260}.weui-toast_cancel .weui-icon-toast:before{content:"\EA0D"}.weui-toast_forbidden .weui-icon-toast:before{content:"\EA0B";color:#F76260}.weui-toast_text{min-height:1em;width:auto;height:45px;border-radius:25px;margin-left:0;-webkit-transform:scale(.9) translate3d(-50%,0,0);transform:scale(.9) translate3d(-50%,0,0);-webkit-transform-origin:left;transform-origin:left}.weui-toast_text.weui-toast--visible{-webkit-transform:scale(1) translate3d(-50%,0,0);transform:scale(1) translate3d(-50%,0,0)}.weui-toast_text .weui-icon-toast{display:none}.weui-toast_text .weui-toast_content{margin:10px 15px}.weui-mask{opacity:0;-webkit-transition-duration:.3s;transition-duration:.3s;visibility:hidden}.weui-mask.weui-mask--visible{opacity:1;visibility:visible}.weui-prompt-input{padding:4px 6px;border:1px solid #ccc;box-sizing:border-box;height:2em;width:80%;margin-top:10px}.weui-pull-to-refresh{margin-top:-50px;-webkit-transition:-webkit-transform .4s;transition:-webkit-transform .4s;transition:transform .4s;transition:transform .4s,-webkit-transform .4s}.weui-pull-to-refresh.refreshing{-webkit-transform:translate3d(0,50px,0);transform:translate3d(0,50px,0)}.weui-pull-to-refresh.touching{-webkit-transition-duration:0s;transition-duration:0s}.weui-pull-to-refresh__layer{height:30px;line-height:30px;padding:10px;text-align:center}.weui-pull-to-refresh__layer .down{display:inline-block}.weui-pull-to-refresh__layer .refresh,.weui-pull-to-refresh__layer .up{display:none}.weui-pull-to-refresh__layer .weui-pull-to-refresh__arrow{display:inline-block;z-index:10;width:20px;height:20px;margin-right:4px;vertical-align:-4px;background:url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2026%2040'%3E%3Cpolygon%20points%3D'9%2C22%209%2C0%2017%2C0%2017%2C22%2026%2C22%2013.5%2C40%200%2C22'%20fill%3D'%238c8c8c'%2F%3E%3C%2Fsvg%3E") center no-repeat;background-size:13px 20px;-webkit-transition-duration:.3s;transition-duration:.3s;-webkit-transform:rotate(0) translate3d(0,0,0);transform:rotate(0) translate3d(0,0,0)}.weui-pull-to-refresh__layer .weui-pull-to-refresh__preloader{display:none;vertical-align:-4px;margin-right:4px;width:20px;height:20px;-webkit-transform-origin:50%;transform-origin:50%;-webkit-animation:preloader-spin 1s steps(12,end) infinite;animation:preloader-spin 1s steps(12,end) infinite}.weui-pull-to-refresh__layer .weui-pull-to-refresh__preloader:after{display:block;width:100%;height:100%;content:"";background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg%20viewBox%3D'0%200%20120%20120'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20xmlns%3Axlink%3D'http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink'%3E%3Cdefs%3E%3Cline%20id%3D'l'%20x1%3D'60'%20x2%3D'60'%20y1%3D'7'%20y2%3D'27'%20stroke%3D'%236c6c6c'%20stroke-width%3D'11'%20stroke-linecap%3D'round'%2F%3E%3C%2Fdefs%3E%3Cg%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(30%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(60%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(90%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(120%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(150%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.37'%20transform%3D'rotate(180%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.46'%20transform%3D'rotate(210%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.56'%20transform%3D'rotate(240%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.66'%20transform%3D'rotate(270%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.75'%20transform%3D'rotate(300%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.85'%20transform%3D'rotate(330%2060%2C60)'%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E");background-repeat:no-repeat;background-position:50%;background-size:100%}.pull-up .weui-pull-to-refresh__layer .down,.refreshing .weui-pull-to-refresh__layer .down{display:none}.pull-up .weui-pull-to-refresh__layer .weui-pull-to-refresh__arrow{display:inline-block;-webkit-transform:rotate(180deg) translate3d(0,0,0);transform:rotate(180deg) translate3d(0,0,0)}.pull-down .weui-pull-to-refresh__layer .down,.pull-down .weui-pull-to-refresh__layer .weui-pull-to-refresh__arrow,.pull-up .weui-pull-to-refresh__layer .up{display:inline-block}.refreshing .weui-pull-to-refresh__layer .weui-pull-to-refresh__arrow{display:none}.refreshing .weui-pull-to-refresh__layer .refresh,.refreshing .weui-pull-to-refresh__layer .weui-pull-to-refresh__preloader{display:inline-block}@keyframes preloader-spin{100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.weui-tab__bd-item.weui-pull-to-refresh{position:absolute;top:50px}.toolbar,.weui-tabbar__item{position:relative}.weui-tabbar__item.weui-bar__item--on .weui-tabbar__label{color:#04BE02}.weui-navbar__item{color:#888}.weui-navbar__item.weui-bar__item--on{color:#666;background-color:#f1f1f1}.toolbar,.toolbar .title{font-size:.85rem;color:#3d4145;width:100%}.weui-tab__bd{box-sizing:border-box;height:100%}.weui-tab__bd .weui-tab__bd-item{display:none;height:100%;overflow:auto}.weui-tab__bd .weui-tab__bd-item.weui-tab__bd-item--active{display:block}.weui-navbar+.weui-tab__bd{padding-top:50px}.toolbar{line-height:1.5;background:#f7f7f8}.toolbar:before{content:'';position:absolute;left:0;top:0;bottom:auto;right:auto;height:1px;width:100%;background-color:#d9d9d9;display:block;z-index:15;-webkit-transform-origin:50% 0;transform-origin:50% 0}@media only screen and (-webkit-min-device-pixel-ratio:2){.toolbar:before{-webkit-transform:scaleY(.5);transform:scaleY(.5)}}@media only screen and (-webkit-min-device-pixel-ratio:3){.toolbar:before{-webkit-transform:scaleY(.33);transform:scaleY(.33)}}.toolbar .toolbar-inner{height:2.2rem;display:-webkit-box;display:-ms-flexbox;display:flex;text-align:center}.toolbar .title{position:absolute;display:block;padding:0;font-weight:400;line-height:2.2rem;text-align:center;white-space:nowrap}.toolbar .picker-button{position:absolute;right:0;box-sizing:border-box;height:2.2rem;line-height:2.2rem;color:#04BE02;z-index:1;padding:0 .5rem}.weui-picker-modal{width:100%;position:absolute;bottom:0;text-align:center;border-radius:0;opacity:.6;color:#3d4145;-webkit-transition-duration:.3s;transition-duration:.3s;height:13rem;background:#EFEFF4;-webkit-transform:translate3d(0,100%,0);transform:translate3d(0,100%,0);-webkit-transition-property:opacity,-webkit-transform;transition-property:opacity,-webkit-transform;transition-property:transform,opacity;transition-property:transform,opacity,-webkit-transform}.weui-picker-modal.picker-modal-inline{height:10.8rem;opacity:1;position:static;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}.weui-picker-modal.picker-modal-inline .toolbar{display:none}.weui-picker-modal.picker-columns-single .picker-items-col{width:100%}.weui-picker-modal.weui-picker-modal-visible{opacity:1;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}.weui-picker-modal .picker-modal-inner{position:relative;height:10.8rem}.weui-picker-modal .picker-columns{width:100%;height:13rem;z-index:11500}.popover .weui-picker-modal .picker-columns,.weui-picker-modal .picker-columns.picker-modal-inline{height:10rem}@media (orientation:landscape) and (max-height:415px){.weui-picker-modal .picker-columns:not(.picker-modal-inline){height:10rem}}.weui-picker-modal .popover.popover-picker-columns{width:14rem}.weui-picker-modal .picker-items{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;width:100%;padding:0;text-align:right;font-size:1rem;font-weight:400;-webkit-mask-box-image:-webkit-linear-gradient(bottom,transparent,transparent 5%,#fff 20%,#fff 80%,transparent 95%,transparent);-webkit-mask-box-image:linear-gradient(to top,transparent,transparent 5%,#fff 20%,#fff 80%,transparent 95%,transparent)}.weui-picker-modal .bar+.picker-items{height:10.8rem}.weui-picker-modal .picker-items-col{overflow:hidden;position:relative;max-height:100%}.weui-picker-modal .picker-items-col.picker-items-col-left{text-align:left}.weui-picker-modal .picker-items-col.picker-items-col-center{text-align:center}.weui-picker-modal .picker-items-col.picker-items-col-right{text-align:right}.weui-picker-modal .picker-items-col.picker-items-col-divider{color:#3d4145;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.weui-picker-modal .picker-items-col-wrapper{-webkit-transition:.3s;transition:.3s;-webkit-transition-timing-function:ease-out;transition-timing-function:ease-out}.weui-picker-modal .picker-item{height:32px;line-height:32px;padding:0 10px;white-space:nowrap;position:relative;overflow:hidden;text-overflow:ellipsis;color:#9b9b9b;left:0;top:0;width:100%;box-sizing:border-box;-webkit-transition:.3s;transition:.3s}.picker-items-col-absolute .weui-picker-modal .picker-item{position:absolute}.weui-picker-modal .picker-item.picker-item-far{pointer-events:none}.weui-picker-modal .picker-item.picker-selected{color:#3d4145;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0);-webkit-transform:rotateX(0);transform:rotateX(0)}.weui-picker-modal .picker-center-highlight{height:32px;box-sizing:border-box;position:absolute;left:0;width:100%;top:50%;margin-top:-16px;pointer-events:none}.weui-picker-modal .picker-center-highlight:after,.weui-picker-modal .picker-center-highlight:before{content:'';position:absolute;right:auto;height:1px;background-color:#D9D9D9;display:block;z-index:15;left:0;width:100%}.weui-picker-modal .picker-center-highlight:before{top:0;bottom:auto;-webkit-transform-origin:50% 0;transform-origin:50% 0}@media only screen and (-webkit-min-device-pixel-ratio:2){.weui-picker-modal .picker-center-highlight:before{-webkit-transform:scaleY(.5);transform:scaleY(.5)}}@media only screen and (-webkit-min-device-pixel-ratio:3){.weui-picker-modal .picker-center-highlight:before{-webkit-transform:scaleY(.33);transform:scaleY(.33)}}.weui-picker-modal .picker-center-highlight:after{bottom:0;top:auto;-webkit-transform-origin:50% 100%;transform-origin:50% 100%}@media only screen and (-webkit-min-device-pixel-ratio:2){.weui-picker-modal .picker-center-highlight:after{-webkit-transform:scaleY(.5);transform:scaleY(.5)}}@media only screen and (-webkit-min-device-pixel-ratio:3){.weui-picker-modal .picker-center-highlight:after{-webkit-transform:scaleY(.33);transform:scaleY(.33)}}.weui-picker-modal .picker-3d .picker-items{overflow:hidden;-webkit-perspective:1200px;perspective:1200px}.weui-picker-modal .picker-3d .picker-item,.weui-picker-modal .picker-3d .picker-items-col,.weui-picker-modal .picker-3d .picker-items-col-wrapper{-webkit-transform-style:preserve-3d;transform-style:preserve-3d}.weui-picker-modal .picker-3d .picker-items-col{overflow:visible}.weui-picker-modal .picker-3d .picker-item{-webkit-transform-origin:center center -110px;transform-origin:center center -110px;-webkit-backface-visibility:hidden;backface-visibility:hidden;-webkit-transition-timing-function:ease-out;transition-timing-function:ease-out}.weui-picker-container,.weui-picker-overlay{position:fixed;bottom:0;left:0;right:0;height:0;width:100%;z-index:1000}.picker-calendar-row:after,.picker-calendar-week-days:after{content:'';z-index:15;left:0;right:auto}.city-picker .picker-items-col{-webkit-box-flex:1;-ms-flex:1;flex:1;max-width:7rem}.weui-picker-container .weui-cells{margin:0;text-align:left}.datetime-picker .picker-item{text-overflow:initial}.weui-select-modal{height:auto}.weui-select-modal .weui-cells{margin:0;text-align:left;overflow-y:auto;overflow-x:hidden;max-height:16rem}.weui-select-modal .weui-cells:after{display:none}.weui-picker-calendar{background:#fff;height:15rem;width:100%;overflow:hidden}.weui-picker-calendar .picker-modal-inner{overflow:hidden;height:12.8rem}.picker-calendar-week-days{height:.9rem;background:#f7f7f8;display:-webkit-box;display:-ms-flexbox;display:flex;font-size:11px;box-sizing:border-box;position:relative}.picker-calendar-week-days:after{position:absolute;bottom:0;top:auto;height:1px;width:100%;background-color:#c4c4c4;display:block;-webkit-transform-origin:50% 100%;transform-origin:50% 100%}@media only screen and (-webkit-min-device-pixel-ratio:2){.picker-calendar-week-days:after{-webkit-transform:scaleY(.5);transform:scaleY(.5)}}@media only screen and (-webkit-min-device-pixel-ratio:3){.picker-calendar-week-days:after{-webkit-transform:scaleY(.33);transform:scaleY(.33)}}.picker-calendar-week-days .picker-calendar-week-day{-webkit-flex-shrink:1;-ms-flex:0 1 auto;-ms-flex-negative:1;flex-shrink:1;width:14.28571429%;width:calc(100% / 7);line-height:17px;text-align:center}.picker-calendar-week-days+.picker-calendar-months{height:11.9rem}.picker-calendar-months{width:100%;height:100%;overflow:hidden;position:relative}.picker-calendar-months-wrapper{position:relative;width:100%;height:100%;-webkit-transition:.3s;transition:.3s}.picker-calendar-month{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-ms-flex-direction:column;flex-direction:column;width:100%;height:100%;position:absolute;left:0;top:0}.picker-calendar-row{height:16.66666667%;height:calc(100% / 6);display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-flex-shrink:1;-ms-flex:0 1 auto;-ms-flex-negative:1;flex-shrink:1;width:100%;position:relative}.picker-calendar-row:after{position:absolute;bottom:0;top:auto;height:1px;width:100%;background-color:#ccc;display:block;-webkit-transform-origin:50% 100%;transform-origin:50% 100%}@media only screen and (-webkit-min-device-pixel-ratio:2){.picker-calendar-row:after{-webkit-transform:scaleY(.5);transform:scaleY(.5)}}@media only screen and (-webkit-min-device-pixel-ratio:3){.picker-calendar-row:after{-webkit-transform:scaleY(.33);transform:scaleY(.33)}}.weui-picker-modal .picker-calendar-row:last-child:after{display:none}.picker-calendar-day{-webkit-flex-shrink:1;-ms-flex:0 1 auto;-ms-flex-negative:1;flex-shrink:1;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;box-sizing:border-box;width:14.28571429%;width:calc(100% / 7);text-align:center;color:#3d4145;font-size:15px;cursor:pointer}.picker-calendar-day.picker-calendar-day-next,.picker-calendar-day.picker-calendar-day-prev{color:#ccc}.picker-calendar-day.picker-calendar-day-disabled{color:#d4d4d4;cursor:auto}.picker-calendar-day.picker-calendar-day-today span{background:#e3e3e3}.picker-calendar-day.picker-calendar-day-selected span{background:#04BE02;color:#fff}.picker-calendar-day span{display:inline-block;border-radius:100%;width:30px;height:30px;line-height:30px}.picker-calendar-month-picker,.picker-calendar-year-picker{-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;width:50%;max-width:200px;-webkit-flex-shrink:10;-ms-flex-negative:10;flex-shrink:10}.picker-calendar-month-picker span,.picker-calendar-year-picker span{-webkit-flex-shrink:1;-ms-flex:0 1 auto;-ms-flex-negative:1;flex-shrink:1;position:relative;overflow:hidden;text-overflow:ellipsis}.picker-calendar.picker-modal-inline .picker-calendar-week-days,.popover .picker-calendar .picker-calendar-week-days{background:0 0}.swiper-button-next,.swiper-button-prev,i.icon{background-position:center;background-repeat:no-repeat}.picker-calendar.picker-modal-inline .picker-calendar-week-days:after,.picker-calendar.picker-modal-inline .picker-calendar-week-days:before,.picker-calendar.picker-modal-inline .toolbar:after,.picker-calendar.picker-modal-inline .toolbar:before,.popover .picker-calendar .picker-calendar-week-days:after,.popover .picker-calendar .picker-calendar-week-days:before,.popover .picker-calendar .toolbar:after,.popover .picker-calendar .toolbar:before{display:none}.picker-calendar.picker-modal-inline .picker-calendar-week-days~.picker-calendar-months:before,.picker-calendar.picker-modal-inline .toolbar~.picker-modal-inner .picker-calendar-months:before,.popover .picker-calendar .picker-calendar-week-days~.picker-calendar-months:before,.popover .picker-calendar .toolbar~.picker-modal-inner .picker-calendar-months:before{content:'';position:absolute;left:0;top:0;bottom:auto;right:auto;height:1px;width:100%;background-color:#c4c4c4;display:block;z-index:15;-webkit-transform-origin:50% 0;transform-origin:50% 0}@media only screen and (-webkit-min-device-pixel-ratio:2){.picker-calendar.picker-modal-inline .picker-calendar-week-days~.picker-calendar-months:before,.picker-calendar.picker-modal-inline .toolbar~.picker-modal-inner .picker-calendar-months:before,.popover .picker-calendar .picker-calendar-week-days~.picker-calendar-months:before,.popover .picker-calendar .toolbar~.picker-modal-inner .picker-calendar-months:before{-webkit-transform:scaleY(.5);transform:scaleY(.5)}}@media only screen and (-webkit-min-device-pixel-ratio:3){.picker-calendar.picker-modal-inline .picker-calendar-week-days~.picker-calendar-months:before,.picker-calendar.picker-modal-inline .toolbar~.picker-modal-inner .picker-calendar-months:before,.popover .picker-calendar .picker-calendar-week-days~.picker-calendar-months:before,.popover .picker-calendar .toolbar~.picker-modal-inner .picker-calendar-months:before{-webkit-transform:scaleY(.33);transform:scaleY(.33)}}.picker-calendar-month-picker,.picker-calendar-year-picker{display:block;line-height:2.2rem;-webkit-box-flex:1;-ms-flex:1;flex:1}.picker-calendar-month-picker a.icon-only,.picker-calendar-year-picker a.icon-only{min-width:36px;float:left;width:25%;height:2.2rem;line-height:2rem}.picker-calendar-month-picker .current-month-value,.picker-calendar-month-picker .current-year-value,.picker-calendar-year-picker .current-month-value,.picker-calendar-year-picker .current-year-value{float:left;width:50%;height:2.2rem}i.icon{display:inline-block;vertical-align:middle;background-size:100% auto;font-style:normal;position:relative}i.icon.icon-next,i.icon.icon-prev{width:.75rem;height:.75rem}.swiper-slide,.swiper-wrapper{width:100%;height:100%;position:relative}i.icon.icon-next{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2015%2015'%3E%3Cg%3E%3Cpath%20fill%3D'%2304BE02'%20d%3D'M1%2C1.6l11.8%2C5.8L1%2C13.4V1.6%20M0%2C0v15l15-7.6L0%2C0L0%2C0z'%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E")}i.icon.icon-prev{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2015%2015'%3E%3Cg%3E%3Cpath%20fill%3D'%2304BE02'%20d%3D'M14%2C1.6v11.8L2.2%2C7.6L14%2C1.6%20M15%2C0L0%2C7.6L15%2C15V0L15%2C0z'%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E")}.swiper-container{margin:0 auto;position:relative;overflow:hidden;z-index:1}.swiper-container-no-flexbox .swiper-slide{float:left}.swiper-container-vertical>.swiper-wrapper{-webkit-box-orient:vertical;-ms-flex-direction:column;flex-direction:column}.swiper-wrapper{z-index:1;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-transition-property:-webkit-transform;transition-property:-webkit-transform;transition-property:transform;transition-property:transform,-webkit-transform;box-sizing:content-box}.swiper-container-android .swiper-slide,.swiper-wrapper{-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}.swiper-container-multirow>.swiper-wrapper{-webkit-box-lines:multiple;-moz-box-lines:multiple;-ms-flex-wrap:wrap;flex-wrap:wrap}.swiper-container-free-mode>.swiper-wrapper{-webkit-transition-timing-function:ease-out;transition-timing-function:ease-out;margin:0 auto}.swiper-slide{-webkit-flex-shrink:0;-ms-flex:0 0 auto;-ms-flex-negative:0;flex-shrink:0}.swiper-container-autoheight,.swiper-container-autoheight .swiper-slide{height:auto}.swiper-container-autoheight .swiper-wrapper{-webkit-box-align:start;-ms-flex-align:start;align-items:flex-start;-webkit-transition-property:-webkit-transform,height;-webkit-transition-property:height,-webkit-transform;transition-property:height,-webkit-transform;transition-property:transform,height;transition-property:transform,height,-webkit-transform}.swiper-container .swiper-notification{position:absolute;left:0;top:0;pointer-events:none;opacity:0;z-index:-1000}.swiper-wp8-horizontal{-ms-touch-action:pan-y;touch-action:pan-y}.swiper-wp8-vertical{-ms-touch-action:pan-x;touch-action:pan-x}.swiper-button-next,.swiper-button-prev{position:absolute;top:50%;width:27px;height:44px;margin-top:-22px;z-index:10;cursor:pointer;background-size:27px 44px}.swiper-button-next.swiper-button-disabled,.swiper-button-prev.swiper-button-disabled{opacity:.35;cursor:auto;pointer-events:none}.swiper-button-prev,.swiper-container-rtl .swiper-button-next{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2027%2044'%3E%3Cpath%20d%3D'M0%2C22L22%2C0l2.1%2C2.1L4.2%2C22l19.9%2C19.9L22%2C44L0%2C22L0%2C22L0%2C22z'%20fill%3D'%23007aff'%2F%3E%3C%2Fsvg%3E");left:10px;right:auto}.swiper-button-prev.swiper-button-black,.swiper-container-rtl .swiper-button-next.swiper-button-black{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2027%2044'%3E%3Cpath%20d%3D'M0%2C22L22%2C0l2.1%2C2.1L4.2%2C22l19.9%2C19.9L22%2C44L0%2C22L0%2C22L0%2C22z'%20fill%3D'%23000000'%2F%3E%3C%2Fsvg%3E")}.swiper-button-prev.swiper-button-white,.swiper-container-rtl .swiper-button-next.swiper-button-white{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2027%2044'%3E%3Cpath%20d%3D'M0%2C22L22%2C0l2.1%2C2.1L4.2%2C22l19.9%2C19.9L22%2C44L0%2C22L0%2C22L0%2C22z'%20fill%3D'%23ffffff'%2F%3E%3C%2Fsvg%3E")}.swiper-button-next,.swiper-container-rtl .swiper-button-prev{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2027%2044'%3E%3Cpath%20d%3D'M27%2C22L27%2C22L5%2C44l-2.1-2.1L22.8%2C22L2.9%2C2.1L5%2C0L27%2C22L27%2C22z'%20fill%3D'%23007aff'%2F%3E%3C%2Fsvg%3E");right:10px;left:auto}.swiper-button-next.swiper-button-black,.swiper-container-rtl .swiper-button-prev.swiper-button-black{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2027%2044'%3E%3Cpath%20d%3D'M27%2C22L27%2C22L5%2C44l-2.1-2.1L22.8%2C22L2.9%2C2.1L5%2C0L27%2C22L27%2C22z'%20fill%3D'%23000000'%2F%3E%3C%2Fsvg%3E")}.swiper-button-next.swiper-button-white,.swiper-container-rtl .swiper-button-prev.swiper-button-white{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2027%2044'%3E%3Cpath%20d%3D'M27%2C22L27%2C22L5%2C44l-2.1-2.1L22.8%2C22L2.9%2C2.1L5%2C0L27%2C22L27%2C22z'%20fill%3D'%23ffffff'%2F%3E%3C%2Fsvg%3E")}.swiper-pagination{position:absolute;text-align:center;-webkit-transition:.3s;transition:.3s;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0);z-index:10}.swiper-pagination.swiper-pagination-hidden{opacity:0}.swiper-container-horizontal>.swiper-pagination-bullets,.swiper-pagination-custom,.swiper-pagination-fraction{bottom:10px;left:0;width:100%}.swiper-pagination-bullet{width:8px;height:8px;display:inline-block;border-radius:100%;background:#000;opacity:.2}button.swiper-pagination-bullet{border:none;margin:0;padding:0;box-shadow:none;-moz-appearance:none;-ms-appearance:none;-webkit-appearance:none;appearance:none}.swiper-pagination-clickable .swiper-pagination-bullet{cursor:pointer}.swiper-pagination-white .swiper-pagination-bullet{background:#fff}.swiper-pagination-bullet-active{opacity:1;background:#04BE02}.swiper-pagination-white .swiper-pagination-bullet-active{background:#fff}.swiper-pagination-black .swiper-pagination-bullet-active{background:#000}.swiper-container-vertical>.swiper-pagination-bullets{right:10px;top:50%;-webkit-transform:translate3d(0,-50%,0);transform:translate3d(0,-50%,0)}.swiper-container-vertical>.swiper-pagination-bullets .swiper-pagination-bullet{margin:5px 0;display:block}.swiper-container-horizontal>.swiper-pagination-bullets .swiper-pagination-bullet{margin:0 5px}.swiper-pagination-progress{background:rgba(0,0,0,.25);position:absolute}.swiper-pagination-progress .swiper-pagination-progressbar{background:#007aff;position:absolute;left:0;top:0;width:100%;height:100%;-webkit-transform:scale(0);transform:scale(0);-webkit-transform-origin:left top;transform-origin:left top}.swiper-container-rtl .swiper-pagination-progress .swiper-pagination-progressbar{-webkit-transform-origin:right top;transform-origin:right top}.swiper-container-horizontal>.swiper-pagination-progress{width:100%;height:4px;left:0;top:0}.swiper-container-vertical>.swiper-pagination-progress{width:4px;height:100%;left:0;top:0}.swiper-pagination-progress.swiper-pagination-white{background:rgba(255,255,255,.5)}.swiper-pagination-progress.swiper-pagination-white .swiper-pagination-progressbar{background:#fff}.swiper-pagination-progress.swiper-pagination-black .swiper-pagination-progressbar{background:#000}.swiper-container-3d{-webkit-perspective:1200px;-o-perspective:1200px;perspective:1200px}.swiper-container-3d .swiper-cube-shadow,.swiper-container-3d .swiper-slide,.swiper-container-3d .swiper-slide-shadow-bottom,.swiper-container-3d .swiper-slide-shadow-left,.swiper-container-3d .swiper-slide-shadow-right,.swiper-container-3d .swiper-slide-shadow-top,.swiper-container-3d .swiper-wrapper{-webkit-transform-style:preserve-3d;transform-style:preserve-3d}.swiper-container-3d .swiper-slide-shadow-bottom,.swiper-container-3d .swiper-slide-shadow-left,.swiper-container-3d .swiper-slide-shadow-right,.swiper-container-3d .swiper-slide-shadow-top{position:absolute;left:0;top:0;width:100%;height:100%;pointer-events:none;z-index:10}.swiper-container-3d .swiper-slide-shadow-left{background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.5)),to(rgba(0,0,0,0)));background-image:-webkit-linear-gradient(right,rgba(0,0,0,.5),rgba(0,0,0,0));background-image:linear-gradient(to left,rgba(0,0,0,.5),rgba(0,0,0,0))}.swiper-container-3d .swiper-slide-shadow-right{background-image:-webkit-gradient(linear,right top,left top,from(rgba(0,0,0,.5)),to(rgba(0,0,0,0)));background-image:-webkit-linear-gradient(left,rgba(0,0,0,.5),rgba(0,0,0,0));background-image:linear-gradient(to right,rgba(0,0,0,.5),rgba(0,0,0,0))}.swiper-container-3d .swiper-slide-shadow-top{background-image:-webkit-gradient(linear,left top,left bottom,from(rgba(0,0,0,.5)),to(rgba(0,0,0,0)));background-image:-webkit-linear-gradient(bottom,rgba(0,0,0,.5),rgba(0,0,0,0));background-image:linear-gradient(to top,rgba(0,0,0,.5),rgba(0,0,0,0))}.swiper-container-3d .swiper-slide-shadow-bottom{background-image:-webkit-gradient(linear,left bottom,left top,from(rgba(0,0,0,.5)),to(rgba(0,0,0,0)));background-image:-webkit-linear-gradient(top,rgba(0,0,0,.5),rgba(0,0,0,0));background-image:linear-gradient(to bottom,rgba(0,0,0,.5),rgba(0,0,0,0))}.swiper-container-coverflow .swiper-wrapper,.swiper-container-flip .swiper-wrapper{-ms-perspective:1200px}.swiper-container-cube,.swiper-container-flip{overflow:visible}.swiper-container-cube .swiper-slide,.swiper-container-flip .swiper-slide{pointer-events:none;-webkit-backface-visibility:hidden;backface-visibility:hidden;z-index:1}.swiper-container-cube .swiper-slide .swiper-slide,.swiper-container-flip .swiper-slide .swiper-slide{pointer-events:none}.swiper-container-cube .swiper-slide-active,.swiper-container-cube .swiper-slide-active .swiper-slide-active,.swiper-container-flip .swiper-slide-active,.swiper-container-flip .swiper-slide-active .swiper-slide-active{pointer-events:auto}.swiper-container-cube .swiper-slide-shadow-bottom,.swiper-container-cube .swiper-slide-shadow-left,.swiper-container-cube .swiper-slide-shadow-right,.swiper-container-cube .swiper-slide-shadow-top,.swiper-container-flip .swiper-slide-shadow-bottom,.swiper-container-flip .swiper-slide-shadow-left,.swiper-container-flip .swiper-slide-shadow-right,.swiper-container-flip .swiper-slide-shadow-top{z-index:0;-webkit-backface-visibility:hidden;backface-visibility:hidden}.swiper-container-cube .swiper-slide{visibility:hidden;-webkit-transform-origin:0 0;transform-origin:0 0;width:100%;height:100%}.swiper-container-cube.swiper-container-rtl .swiper-slide{-webkit-transform-origin:100% 0;transform-origin:100% 0}.swiper-container-cube .swiper-slide-active,.swiper-container-cube .swiper-slide-next,.swiper-container-cube .swiper-slide-next+.swiper-slide,.swiper-container-cube .swiper-slide-prev{pointer-events:auto;visibility:visible}.swiper-container-cube .swiper-cube-shadow{position:absolute;left:0;bottom:0;width:100%;height:100%;background:#000;opacity:.6;-webkit-filter:blur(50px);filter:blur(50px);z-index:0}.swiper-container-fade.swiper-container-free-mode .swiper-slide{-webkit-transition-timing-function:ease-out;transition-timing-function:ease-out}.swiper-container-fade .swiper-slide{pointer-events:none;-webkit-transition-property:opacity;transition-property:opacity}.swiper-container-fade .swiper-slide .swiper-slide{pointer-events:none}.swiper-container-fade .swiper-slide-active,.swiper-container-fade .swiper-slide-active .swiper-slide-active{pointer-events:auto}.swiper-scrollbar{border-radius:10px;position:relative;-ms-touch-action:none;background:rgba(0,0,0,.1)}.swiper-container-horizontal>.swiper-scrollbar{position:absolute;left:1%;bottom:3px;z-index:50;height:5px;width:98%}.swiper-container-vertical>.swiper-scrollbar{position:absolute;right:3px;top:1%;z-index:50;width:5px;height:98%}.swiper-scrollbar-drag{height:100%;width:100%;position:relative;background:rgba(0,0,0,.5);border-radius:10px;left:0;top:0}.swiper-scrollbar-cursor-drag{cursor:move}.swiper-lazy-preloader{width:42px;height:42px;position:absolute;left:50%;top:50%;margin-left:-21px;margin-top:-21px;z-index:10;-webkit-transform-origin:50%;transform-origin:50%;-webkit-animation:swiper-preloader-spin 1s steps(12,end) infinite;animation:swiper-preloader-spin 1s steps(12,end) infinite}.swiper-lazy-preloader:after{display:block;content:"";width:100%;height:100%;background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg%20viewBox%3D'0%200%20120%20120'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20xmlns%3Axlink%3D'http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink'%3E%3Cdefs%3E%3Cline%20id%3D'l'%20x1%3D'60'%20x2%3D'60'%20y1%3D'7'%20y2%3D'27'%20stroke%3D'%236c6c6c'%20stroke-width%3D'11'%20stroke-linecap%3D'round'%2F%3E%3C%2Fdefs%3E%3Cg%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(30%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(60%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(90%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(120%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(150%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.37'%20transform%3D'rotate(180%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.46'%20transform%3D'rotate(210%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.56'%20transform%3D'rotate(240%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.66'%20transform%3D'rotate(270%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.75'%20transform%3D'rotate(300%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.85'%20transform%3D'rotate(330%2060%2C60)'%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E");background-position:50%;background-size:100%;background-repeat:no-repeat}.swiper-lazy-preloader-white:after{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg%20viewBox%3D'0%200%20120%20120'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20xmlns%3Axlink%3D'http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink'%3E%3Cdefs%3E%3Cline%20id%3D'l'%20x1%3D'60'%20x2%3D'60'%20y1%3D'7'%20y2%3D'27'%20stroke%3D'%23fff'%20stroke-width%3D'11'%20stroke-linecap%3D'round'%2F%3E%3C%2Fdefs%3E%3Cg%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(30%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(60%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(90%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(120%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(150%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.37'%20transform%3D'rotate(180%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.46'%20transform%3D'rotate(210%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.56'%20transform%3D'rotate(240%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.66'%20transform%3D'rotate(270%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.75'%20transform%3D'rotate(300%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.85'%20transform%3D'rotate(330%2060%2C60)'%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E")}@-webkit-keyframes swiper-preloader-spin{100%{-webkit-transform:rotate(360deg)}}@keyframes swiper-preloader-spin{100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.weui-actionsheet{z-index:10000}.weui-popup__container,.weui-popup__overlay{position:fixed;bottom:0;left:0;right:0;width:100%;height:100%;z-index:10}.weui-popup__overlay{background-color:rgba(0,0,0,.6);opacity:0;-webkit-transition:opacity .3s;transition:opacity .3s}.weui-popup__container{display:none}.weui-popup__container.weui-popup__container--visible{display:block}.weui-popup__container .weui-cells{margin:0;text-align:left}.weui-popup__modal{width:100%;position:absolute;z-index:100;bottom:0;border-radius:0;opacity:.6;color:#3d4145;-webkit-transition-duration:.3s;transition-duration:.3s;height:100%;background:#EFEFF4;-webkit-transform:translate3d(0,100%,0);transform:translate3d(0,100%,0);-webkit-transition-property:opacity,-webkit-transform;transition-property:opacity,-webkit-transform;transition-property:transform,opacity;transition-property:transform,opacity,-webkit-transform;overflow-x:hidden;overflow-y:auto}.popup-bottom .weui-popup__modal{height:auto}.weui-popup__modal .toolbar{position:absolute;left:0;top:0;right:0;z-index:1}.weui-popup__modal .modal-content{height:100%;padding-top:2.2rem;overflow:auto;box-sizing:border-box}.weui-popup__container--visible .weui-popup__overlay{opacity:1}.weui-popup__container--visible .weui-popup__modal{opacity:1;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}.weui-notification{position:fixed;width:100%;min-height:3.4rem;top:-2rem;padding-top:2rem;left:0;right:0;z-index:9999;background-color:rgba(0,0,0,.85);color:#fff;font-size:.65rem;-webkit-transform:translate3d(0,-100%,0);transform:translate3d(0,-100%,0);-webkit-transition:.4s;transition:.4s}.weui-notification.weui-notification--in{-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}.weui-notification.weui-notification--touching{-webkit-transition-duration:0s;transition-duration:0s}.weui-notification .weui-notification__inner{padding:.4rem .6rem 1rem;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:start;-ms-flex-align:start;align-items:flex-start}.weui-notification .weui-notification__content{width:100%;margin:0 .4rem}.weui-notification .weui-notification__title{font-weight:700}.weui-notification .weui-notification__text{line-height:1}.weui-notification .weui-notification__media{height:1rem;width:1rem}.weui-notification .weui-notification__media img{width:100%}.weui-notification .weui-notification__handle-bar{position:absolute;bottom:.2rem;left:50%;-webkit-transform:translate3d(-50%,0,0);transform:translate3d(-50%,0,0);width:2rem;height:.3rem;border-radius:.15rem;background:#fff;opacity:.5}.weui-photo-browser-modal{position:fixed;top:0;left:0;right:0;bottom:0;background:#000;display:none;opacity:0;-webkit-transition:opacity .3s;transition:opacity .3s}.weui-photo-browser-modal.weui-photo-browser-modal-visible{opacity:1}.weui-photo-browser-modal .swiper-container{height:100%;-webkit-transform:scale(.2);transform:scale(.2);-webkit-transition:-webkit-transform .5s;transition:-webkit-transform .5s;transition:transform .5s;transition:transform .5s,-webkit-transform .5s}.weui-photo-browser-modal .swiper-container .swiper-pagination-bullet{background:#fff;visibility:hidden}.weui-photo-browser-modal .swiper-container.swiper-container-visible{-webkit-transform:scale(1);transform:scale(1)}.weui-photo-browser-modal .swiper-container.swiper-container-visible .swiper-pagination-bullet{visibility:visible;-webkit-transition-property:visibility;transition-property:visibility;-webkit-transition-delay:.5s;transition-delay:.5s}.weui-photo-browser-modal .swiper-container .swiper-pagination{bottom:10px;left:0;width:100%}.weui-photo-browser-modal .photo-container{height:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;overflow:hidden}.weui-photo-browser-modal .photo-container img{max-width:100%;margin-top:-30px}.weui-photo-browser-modal .caption{position:absolute;bottom:40px;left:0;right:0;color:#fff;text-align:center;padding:0 12px;min-height:3rem;font-size:14px;z-index:10;-webkit-transition:opacity .3s;transition:opacity .3s;-webkit-transition-delay:.5s;transition-delay:.5s;opacity:0}.weui-photo-browser-modal .caption .caption-item{display:none;opacity:0;-webkit-transition:opacity .15s;transition:opacity .15s}.weui-photo-browser-modal .caption .caption-item.active{display:block;opacity:1}.weui-photo-browser-modal .swiper-container-visible .caption{opacity:1}.color-primary{color:#04BE02}.color-danger,.color-error{color:#f6383a}.color-warning{color:#f60}.color-success{color:#4cd964}.bg-danger,.bg-error,.bg-primary,.bg-success,.bg-warning{color:#fff}.bg-primary{background-color:#04BE02}.bg-danger,.bg-error{background-color:#f6383a}.bg-warning{background-color:#f60}.bg-success{background-color:#4cd964}.weui-toptips{z-index:100;opacity:0;-webkit-transition:opacity .3s;transition:opacity .3s}.weui-toptips.weui-toptips_visible{opacity:1}.weui-icon_toast{font-size:55px;color:#fff;margin-bottom:6px}.weui-toast--forbidden .weui-icon_toast{color:#f6383a}.weui-toast--text{min-height:initial;font-size:18px;padding:8px 16px;width:auto;top:40%}.weui-toast--text .weui-icon_toast{display:none}.weui-count{display:inline-block;height:25px;line-height:25px}.weui-count .weui-count__btn{height:21px;width:21px;line-height:21px;display:inline-block;position:relative;border:1px solid #04BE02;border-radius:50%;vertical-align:-6px}.weui-count .weui-count__btn:after,.weui-count .weui-count__btn:before{content:" ";position:absolute;height:1px;width:11px;background-color:#04BE02;left:50%;top:50%;margin-left:-5.5px}.weui-count .weui-count__btn:after{height:11px;width:1px;margin-top:-5.5px;margin-left:-1px}.weui-count .weui-count__decrease:after{display:none}.weui-count .weui-count__increase{background-color:#04BE02}.weui-count .weui-count__increase:after,.weui-count .weui-count__increase:before{background-color:#fff}.weui-count .weui-count__number{background-color:transparent;font-size:.8rem;border:0;width:1.3rem;text-align:center;color:#5f646e}.weui-panel .weui-media-box__title-after{color:#9b9b9b;font-size:.65rem;float:right}
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/css/weui/weui.min.css b/pluss-wap-page/src/main/resources/static/resources/css/weui/weui.min.css
new file mode 100644
index 0000000..1371e18
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/css/weui/weui.min.css
@@ -0,0 +1,5 @@
+/*!
+ * WeUI v1.1.3 (https://github.com/weui/weui)
+ * Copyright 2018 Tencent, Inc.
+ * Licensed under the MIT license
+ */html{-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{line-height:1.6;font-family:-apple-system-font,Helvetica Neue,sans-serif}*{margin:0;padding:0}a img{border:0}a{text-decoration:none;-webkit-tap-highlight-color:rgba(0,0,0,0)}@font-face{font-weight:400;font-style:normal;font-family:weui;src:url('data:application/octet-stream;base64,AAEAAAALAIAAAwAwR1NVQrD+s+0AAAE4AAAAQk9TLzJAKEx+AAABfAAAAFZjbWFw65cFHQAAAhwAAAJQZ2x5ZvCRR/EAAASUAAAKtGhlYWQMPROtAAAA4AAAADZoaGVhCCwD+gAAALwAAAAkaG10eEJo//8AAAHUAAAASGxvY2EYqhW4AAAEbAAAACZtYXhwASEAVQAAARgAAAAgbmFtZeNcHtgAAA9IAAAB5nBvc3T6bLhLAAARMAAAAOYAAQAAA+gAAABaA+j/////A+kAAQAAAAAAAAAAAAAAAAAAABIAAQAAAAEAACbZbxtfDzz1AAsD6AAAAADUm2dvAAAAANSbZ2///wAAA+kD6gAAAAgAAgAAAAAAAAABAAAAEgBJAAUAAAAAAAIAAAAKAAoAAAD/AAAAAAAAAAEAAAAKAB4ALAABREZMVAAIAAQAAAAAAAAAAQAAAAFsaWdhAAgAAAABAAAAAQAEAAQAAAABAAgAAQAGAAAAAQAAAAAAAQOwAZAABQAIAnoCvAAAAIwCegK8AAAB4AAxAQIAAAIABQMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUGZFZABA6gHqEQPoAAAAWgPqAAAAAAABAAAAAAAAAAAAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+gAAAPoAAAD6AAAA+j//wPoAAAD6AAAAAAABQAAAAMAAAAsAAAABAAAAXQAAQAAAAAAbgADAAEAAAAsAAMACgAAAXQABABCAAAABAAEAAEAAOoR//8AAOoB//8AAAABAAQAAAABAAIAAwAEAAUABgAHAAgACQAKAAsADAANAA4ADwAQABEAAAEGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAANwAAAAAAAAAEQAA6gEAAOoBAAAAAQAA6gIAAOoCAAAAAgAA6gMAAOoDAAAAAwAA6gQAAOoEAAAABAAA6gUAAOoFAAAABQAA6gYAAOoGAAAABgAA6gcAAOoHAAAABwAA6ggAAOoIAAAACAAA6gkAAOoJAAAACQAA6goAAOoKAAAACgAA6gsAAOoLAAAACwAA6gwAAOoMAAAADAAA6g0AAOoNAAAADQAA6g4AAOoOAAAADgAA6g8AAOoPAAAADwAA6hAAAOoQAAAAEAAA6hEAAOoRAAAAEQAAAAAARgCMANIBJAF4AcQCMgJgAqgC/ANIA6YD/gROBKAE9AVaAAAAAgAAAAADrwOtABQAKQAAASIHBgcGFBcWFxYyNzY3NjQnJicmAyInJicmNDc2NzYyFxYXFhQHBgcGAfV4Z2Q7PDw7ZGfwZmQ7PDw7ZGZ4bl5bNjc3Nlte215bNjc3NlteA608O2Rn8GdjOzw8O2Nn8GdkOzz8rzc1W17bXlw1Nzc1XF7bXls1NwAAAAACAAAAAAOzA7MAFwAtAAABIgcGBwYVFBcWFxYzMjc2NzY1NCcmJyYTBwYiLwEmNjsBETQ2OwEyFhURMzIWAe52Z2Q7PT07ZGd2fGpmOz4+O2ZpIXYOKA52Dg0XXQsHJgcLXRcNA7M+O2ZqfHZnZDs9PTtkZ3Z9aWY7Pv3wmhISmhIaARcICwsI/ukaAAMAAAAAA+UD5QAXACMALAAAASIHBgcGFRQXFhcWMzI3Njc2NTQnJicmAxQrASI1AzQ7ATIHJyImNDYyFhQGAe6Ecm9BRERBb3KEiXZxQkREQnF1aQIxAwgCQgMBIxIZGSQZGQPkREJxdomEcm9BRERBb3KEinVxQkT9HQICAWICAjEZIxkZIxkAAAAAAgAAAAADsQPkABkALgAAAQYHBgc2BREUFxYXFhc2NzY3NjURJBcmJyYTAQYvASY/ATYyHwEWNjclNjIfARYB9VVVQk+v/tFHPmxebGxdbT1I/tGvT0JVo/7VBASKAwMSAQUBcQEFAgESAgUBEQQD4xMYEhk3YP6sjnVlSD8cHD9IZXWOAVRgNxkSGP62/tkDA48EBBkCAVYCAQHlAQIQBAAAAAADAAAAAAOxA+QAGwAqADMAAAEGBwYHBgcGNxEUFxYXFhc2NzY3NjURJBcmJyYHMzIWFQMUBisBIicDNDYTIiY0NjIWFAYB9UFBODssO38gRz5sXmxsXW09SP7YqFBBVW80BAYMAwImBQELBh4PFhYeFRUD5A8SDhIOEikK/q2PdWRJPh0dPklkdY8BU141GRIY/AYE/sYCAwUBOgQG/kAVHxUVHxUAAAACAAAAAAPkA+QAFwAtAAABIgcGBwYVFBcWFxYzMjc2NzY1NCcmJyYTAQYiLwEmPwE2Mh8BFjI3ATYyHwEWAe6Ecm9BQ0NCbnODiXVxQkREQnF1kf6gAQUBowMDFgEFAYUCBQEBQwIFARUEA+NEQnF1iYNzbkJDQ0FvcoSJdXFCRP6j/qUBAagEBR4CAWYBAQENAgIVBAAAAAQAAAAAA68DrQAUACkAPwBDAAABIgcGBwYUFxYXFjI3Njc2NCcmJyYDIicmJyY0NzY3NjIXFhcWFAcGBwYTBQ4BLwEmBg8BBhYfARYyNwE+ASYiFzAfAQH1eGdkOzw8O2Rn8GZkOzw8O2RmeG5eWzY3NzZbXtteWzY3NzZbXmn+9gYSBmAGDwUDBQEGfQUQBgElBQELEBUBAQOtPDtkZ/BnYzs8PDtjZ/BnZDs8/K83NVte215cNTc3NVxe215bNTcCJt0FAQVJBQIGBAcRBoAGBQEhBQ8LBAEBAAABAAAAAAO7AzoAFwAAEy4BPwE+AR8BFjY3ATYWFycWFAcBBiInPQoGBwUHGgzLDCELAh0LHwsNCgr9uQoeCgGzCyEOCw0HCZMJAQoBvgkCCg0LHQv9sQsKAAAAAAIAAAAAA+UD5gAXACwAAAEiBwYHBhUUFxYXFjMyNzY3NjU0JyYnJhMHBi8BJicmNRM0NjsBMhYVExceAQHvhHJvQUNDQm5zg4l1cUJEREJxdVcQAwT6AwIEEAMCKwIDDsUCAQPlREJxdYmDc25CQ0NBb3KEiXVxQkT9VhwEAncCAgMGAXoCAwMC/q2FAgQAAAQAAAAAA68DrQADABgALQAzAAABMB8BAyIHBgcGFBcWFxYyNzY3NjQnJicmAyInJicmNDc2NzYyFxYXFhQHBgcGAyMVMzUjAuUBAfJ4Z2Q7PDw7ZGfwZmQ7PDw7ZGZ4bl5bNjc3Nlte215bNjc3NltemyT92QKDAQEBLDw7ZGfwZ2M7PDw7Y2fwZ2Q7PPyvNzVbXtteXDU3NzVcXtteWzU3AjH9JAAAAAMAAAAAA+QD5AAXACcAMAAAASIHBgcGFRQXFhcWMzI3Njc2NTQnJicmAzMyFhUDFAYrASImNQM0NhMiJjQ2MhYUBgHuhHJvQUNDQm5zg4l1cUJEREJxdZ42BAYMAwInAwMMBh8PFhYeFhYD40RCcXWJg3NuQkNDQW9yhIl1cUJE/vYGBf7AAgMDAgFABQb+NhYfFhYfFgAABAAAAAADwAPAAAgAEgAoAD0AAAEyNjQmIgYUFhcjFTMRIxUzNSMDIgcGBwYVFBYXFjMyNzY3NjU0Jy4BAyInJicmNDc2NzYyFxYXFhQHBgcGAfQYISEwISFRjzk5yTorhG5rPT99am+DdmhlPD4+PMyFbV5bNTc3NVte2l5bNTc3NVteAqAiLyIiLyI5Hf7EHBwCsT89a26Ed8w8Pj48ZWh2g29qffyjNzVbXtpeWzU3NzVbXtpeWzU3AAADAAAAAAOoA6gACwAgADUAAAEHJwcXBxc3FzcnNwMiBwYHBhQXFhcWMjc2NzY0JyYnJgMiJyYnJjQ3Njc2MhcWFxYUBwYHBgKOmpocmpocmpocmpq2dmZiOjs7OmJm7GZiOjs7OmJmdmtdWTQ2NjRZXdZdWTQ2NjRZXQKqmpocmpocmpocmpoBGTs6YmbsZmI6Ozs6YmbsZmI6O/zCNjRZXdZdWTQ2NjRZXdZdWTQ2AAMAAAAAA+kD6gAaAC8AMAAAAQYHBiMiJyYnJjQ3Njc2MhcWFxYVFAcGBwEHATI3Njc2NCcmJyYiBwYHBhQXFhcWMwKONUBCR21dWjU3NzVaXdpdWzU2GBcrASM5/eBXS0grKysrSEuuSkkqLCwqSUpXASMrFxg2NVtd2l1aNTc3NVpdbUdCQDX+3jkBGSsrSEuuSkkqLCwqSUquS0grKwAC//8AAAPoA+gAFAAwAAABIgcGBwYQFxYXFiA3Njc2ECcmJyYTFg4BIi8BBwYuATQ/AScmPgEWHwE3Nh4BBg8BAfSIdHFDRERDcXQBEHRxQ0REQ3F0SQoBFBsKoqgKGxMKqKIKARQbCqKoChsUAQqoA+hEQ3F0/vB0cUNERENxdAEQdHFDRP1jChsTCqiiCgEUGwqiqAobFAEKqKIKARQbCqIAAAIAAAAAA+QD5AAXADQAAAEiBwYHBhUUFxYXFjMyNzY3NjU0JyYnJhMUBiMFFxYUDwEGLwEuAT8BNh8BFhQPAQUyFh0BAe6Ecm9BQ0NCbnODiXVxQkREQnF1fwQC/pGDAQEVAwTsAgEC7AQEFAIBhAFwAgMD40RCcXWJg3NuQkNDQW9yhIl1cUJE/fYCAwuVAgQCFAQE0AIFAtEEBBQCBQGVCwMDJwAAAAUAAAAAA9QD0wAjACcANwBHAEgAAAERFAYjISImNREjIiY9ATQ2MyE1NDYzITIWHQEhMhYdARQGIyERIREHIgYVERQWOwEyNjURNCYjISIGFREUFjsBMjY1ETQmKwEDeyYb/XYbJkMJDQ0JAQYZEgEvExkBBgkNDQn9CQJc0QkNDQktCQ0NCf7sCQ0NCS0JDQ0JLQMi/TQbJiYbAswMCiwJDS4SGRkSLg0JLAoM/UwCtGsNCf5NCQ0NCQGzCQ0NCf5NCQ0NCQGzCQ0AAAAAEADGAAEAAAAAAAEABAAAAAEAAAAAAAIABwAEAAEAAAAAAAMABAALAAEAAAAAAAQABAAPAAEAAAAAAAUACwATAAEAAAAAAAYABAAeAAEAAAAAAAoAKwAiAAEAAAAAAAsAEwBNAAMAAQQJAAEACABgAAMAAQQJAAIADgBoAAMAAQQJAAMACAB2AAMAAQQJAAQACAB+AAMAAQQJAAUAFgCGAAMAAQQJAAYACACcAAMAAQQJAAoAVgCkAAMAAQQJAAsAJgD6d2V1aVJlZ3VsYXJ3ZXVpd2V1aVZlcnNpb24gMS4wd2V1aUdlbmVyYXRlZCBieSBzdmcydHRmIGZyb20gRm9udGVsbG8gcHJvamVjdC5odHRwOi8vZm9udGVsbG8uY29tAHcAZQB1AGkAUgBlAGcAdQBsAGEAcgB3AGUAdQBpAHcAZQB1AGkAVgBlAHIAcwBpAG8AbgAgADEALgAwAHcAZQB1AGkARwBlAG4AZQByAGEAdABlAGQAIABiAHkAIABzAHYAZwAyAHQAdABmACAAZgByAG8AbQAgAEYAbwBuAHQAZQBsAGwAbwAgAHAAcgBvAGoAZQBjAHQALgBoAHQAdABwADoALwAvAGYAbwBuAHQAZQBsAGwAbwAuAGMAbwBtAAAAAgAAAAAAAAAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASAQIBAwEEAQUBBgEHAQgBCQEKAQsBDAENAQ4BDwEQAREBEgETAAZjaXJjbGUIZG93bmxvYWQEaW5mbwxzYWZlX3N1Y2Nlc3MJc2FmZV93YXJuB3N1Y2Nlc3MOc3VjY2Vzcy1jaXJjbGURc3VjY2Vzcy1uby1jaXJjbGUHd2FpdGluZw53YWl0aW5nLWNpcmNsZQR3YXJuC2luZm8tY2lyY2xlBmNhbmNlbAZzZWFyY2gFY2xlYXIEYmFjawZkZWxldGUAAAAA') format('truetype')}[class*=" weui-icon-"],[class^=weui-icon-]{display:inline-block;vertical-align:middle;font:normal normal normal 14px/1 weui;font-size:inherit;text-rendering:auto;-webkit-font-smoothing:antialiased}[class*=" weui-icon-"]:before,[class^=weui-icon-]:before{display:inline-block;margin-left:.2em;margin-right:.2em}.weui-icon-circle:before{content:"\EA01"}.weui-icon-download:before{content:"\EA02"}.weui-icon-info:before{content:"\EA03"}.weui-icon-safe-success:before{content:"\EA04"}.weui-icon-safe-warn:before{content:"\EA05"}.weui-icon-success:before{content:"\EA06"}.weui-icon-success-circle:before{content:"\EA07"}.weui-icon-success-no-circle:before{content:"\EA08"}.weui-icon-waiting:before{content:"\EA09"}.weui-icon-waiting-circle:before{content:"\EA0A"}.weui-icon-warn:before{content:"\EA0B"}.weui-icon-info-circle:before{content:"\EA0C"}.weui-icon-cancel:before{content:"\EA0D"}.weui-icon-search:before{content:"\EA0E"}.weui-icon-clear:before{content:"\EA0F"}.weui-icon-back:before{content:"\EA10"}.weui-icon-delete:before{content:"\EA11"}[class*=" weui-icon_"]:before,[class^=weui-icon_]:before{margin:0}.weui-icon-success{font-size:23px;color:#09bb07}.weui-icon-waiting{font-size:23px;color:#10aeff}.weui-icon-warn{font-size:23px;color:#f43530}.weui-icon-info{font-size:23px;color:#10aeff}.weui-icon-success-circle,.weui-icon-success-no-circle{font-size:23px;color:#09bb07}.weui-icon-waiting-circle{font-size:23px;color:#10aeff}.weui-icon-circle{font-size:23px;color:#c9c9c9}.weui-icon-download,.weui-icon-info-circle{font-size:23px;color:#09bb07}.weui-icon-safe-success{color:#09bb07}.weui-icon-safe-warn{color:#ffbe00}.weui-icon-cancel{color:#f43530;font-size:22px}.weui-icon-clear,.weui-icon-search{color:#b2b2b2;font-size:14px}.weui-icon-delete.weui-icon_gallery-delete{color:#fff;font-size:22px}.weui-icon_msg{font-size:93px}.weui-icon_msg.weui-icon-warn{color:#f76260}.weui-icon_msg-primary{font-size:93px}.weui-icon_msg-primary.weui-icon-warn{color:#ffbe00}.weui-btn{position:relative;display:block;margin-left:auto;margin-right:auto;padding-left:14px;padding-right:14px;box-sizing:border-box;font-size:18px;text-align:center;text-decoration:none;color:#fff;line-height:2.55555556;border-radius:5px;-webkit-tap-highlight-color:rgba(0,0,0,0);overflow:hidden}.weui-btn:after{content:" ";width:200%;height:200%;position:absolute;top:0;left:0;border:1px solid rgba(0,0,0,.2);-webkit-transform:scale(.5);transform:scale(.5);-webkit-transform-origin:0 0;transform-origin:0 0;box-sizing:border-box;border-radius:10px}.weui-btn_inline{display:inline-block}.weui-btn_default{color:#000;background-color:#f8f8f8}.weui-btn_default:not(.weui-btn_disabled):visited{color:#000}.weui-btn_default:not(.weui-btn_disabled):active{color:rgba(0,0,0,.6);background-color:#dedede}.weui-btn_primary{background-color:#1aad19}.weui-btn_primary:not(.weui-btn_disabled):visited{color:#fff}.weui-btn_primary:not(.weui-btn_disabled):active{color:hsla(0,0%,100%,.6);background-color:#179b16}.weui-btn_warn{background-color:#e64340}.weui-btn_warn:not(.weui-btn_disabled):visited{color:#fff}.weui-btn_warn:not(.weui-btn_disabled):active{color:hsla(0,0%,100%,.6);background-color:#ce3c39}.weui-btn_disabled{color:hsla(0,0%,100%,.6)}.weui-btn_disabled.weui-btn_default{color:rgba(0,0,0,.3);background-color:#f7f7f7}.weui-btn_disabled.weui-btn_primary{background-color:#9ed99d}.weui-btn_disabled.weui-btn_warn{background-color:#ec8b89}.weui-btn_loading .weui-loading{margin:-.2em .34em 0 0}.weui-btn_loading.weui-btn_primary,.weui-btn_loading.weui-btn_warn{color:hsla(0,0%,100%,.6)}.weui-btn_loading.weui-btn_primary{background-color:#179b16}.weui-btn_loading.weui-btn_warn{background-color:#ce3c39}.weui-btn_plain-primary{color:#1aad19;border:1px solid #1aad19}.weui-btn_plain-primary:not(.weui-btn_plain-disabled):active{color:rgba(26,173,25,.6);border-color:rgba(26,173,25,.6)}.weui-btn_plain-primary:after{border-width:0}.weui-btn_plain-default{color:#353535;border:1px solid #353535}.weui-btn_plain-default:not(.weui-btn_plain-disabled):active{color:rgba(53,53,53,.6);border-color:rgba(53,53,53,.6)}.weui-btn_plain-default:after{border-width:0}.weui-btn_plain-disabled{color:rgba(0,0,0,.2);border-color:rgba(0,0,0,.2)}button.weui-btn,input.weui-btn{width:100%;border-width:0;outline:0;-webkit-appearance:none}button.weui-btn:focus,input.weui-btn:focus{outline:0}button.weui-btn_inline,button.weui-btn_mini,input.weui-btn_inline,input.weui-btn_mini{width:auto}button.weui-btn_plain-default,button.weui-btn_plain-primary,input.weui-btn_plain-default,input.weui-btn_plain-primary{border-width:1px;background-color:transparent}.weui-btn_mini{display:inline-block;padding:0 1.32em;line-height:2.3;font-size:13px}.weui-btn+.weui-btn{margin-top:15px}.weui-btn.weui-btn_inline+.weui-btn.weui-btn_inline{margin-top:auto;margin-left:15px}.weui-btn-area{margin:1.17647059em 15px .3em}.weui-btn-area_inline{display:-webkit-box;display:-webkit-flex;display:flex}.weui-btn-area_inline .weui-btn{margin-top:auto;margin-right:15px;width:100%;-webkit-box-flex:1;-webkit-flex:1;flex:1}.weui-btn-area_inline .weui-btn:last-child{margin-right:0}.weui-cells{margin-top:1.17647059em;background-color:#fff;line-height:1.47058824;font-size:17px;overflow:hidden;position:relative}.weui-cells:before{top:0;border-top:1px solid #e5e5e5;-webkit-transform-origin:0 0;transform-origin:0 0;-webkit-transform:scaleY(.5);transform:scaleY(.5)}.weui-cells:after,.weui-cells:before{content:" ";position:absolute;left:0;right:0;height:1px;color:#e5e5e5;z-index:2}.weui-cells:after{bottom:0;border-bottom:1px solid #e5e5e5;-webkit-transform-origin:0 100%;transform-origin:0 100%;-webkit-transform:scaleY(.5);transform:scaleY(.5)}.weui-cells__title{margin-top:.77em;margin-bottom:.3em;padding-left:15px;padding-right:15px;color:#999;font-size:14px}.weui-cells__title+.weui-cells{margin-top:0}.weui-cells__tips{margin-top:.3em;color:#999;padding-left:15px;padding-right:15px;font-size:14px}.weui-cell{padding:10px 15px;position:relative;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.weui-cell:before{content:" ";position:absolute;left:0;top:0;right:0;height:1px;border-top:1px solid #e5e5e5;color:#e5e5e5;-webkit-transform-origin:0 0;transform-origin:0 0;-webkit-transform:scaleY(.5);transform:scaleY(.5);left:15px;z-index:2}.weui-cell:first-child:before{display:none}.weui-cell_primary{-webkit-box-align:start;-webkit-align-items:flex-start;align-items:flex-start}.weui-cell__bd{-webkit-box-flex:1;-webkit-flex:1;flex:1}.weui-cell__ft{text-align:right;color:#999}.weui-cell_swiped{display:block;padding:0}.weui-cell_swiped>.weui-cell__bd{position:relative;z-index:1;background-color:#fff}.weui-cell_swiped>.weui-cell__ft{position:absolute;right:0;top:0;bottom:0;display:-webkit-box;display:-webkit-flex;display:flex;color:#fff}.weui-swiped-btn{display:block;padding:10px 1em;line-height:1.47058824;color:inherit}.weui-swiped-btn_default{background-color:#c7c7cc}.weui-swiped-btn_warn{background-color:#ff3b30}.weui-cell_access{-webkit-tap-highlight-color:rgba(0,0,0,0);color:inherit}.weui-cell_access:active{background-color:#ececec}.weui-cell_access .weui-cell__ft{padding-right:13px;position:relative}.weui-cell_access .weui-cell__ft:after{content:" ";display:inline-block;height:6px;width:6px;border-width:2px 2px 0 0;border-color:#c8c8cd;border-style:solid;-webkit-transform:matrix(.71,.71,-.71,.71,0,0);transform:matrix(.71,.71,-.71,.71,0,0);position:relative;top:-2px;position:absolute;top:50%;margin-top:-4px;right:2px}.weui-cell_link{color:#586c94;font-size:14px}.weui-cell_link:first-child:before{display:block}.weui-check__label{-webkit-tap-highlight-color:rgba(0,0,0,0)}.weui-check__label:active{background-color:#ececec}.weui-check{position:absolute;left:-9999em}.weui-cells_radio .weui-cell__ft{padding-left:.35em}.weui-cells_radio .weui-check+.weui-icon-checked{min-width:16px}.weui-cells_radio .weui-check:checked+.weui-icon-checked:before{display:block;content:'\EA08';color:#09bb07;font-size:16px}.weui-cells_checkbox .weui-cell__hd{padding-right:.35em}.weui-cells_checkbox .weui-icon-checked:before{content:'\EA01';color:#c9c9c9;font-size:23px;display:block}.weui-cells_checkbox .weui-check:checked+.weui-icon-checked:before{content:'\EA06';color:#09bb07}.weui-label{display:block;width:105px;word-wrap:break-word;word-break:break-all}.weui-input{width:100%;border:0;outline:0;-webkit-appearance:none;background-color:transparent;font-size:inherit;color:inherit;height:1.47058824em;line-height:1.47058824}.weui-input::-webkit-inner-spin-button,.weui-input::-webkit-outer-spin-button{-webkit-appearance:none;margin:0}.weui-textarea{display:block;border:0;resize:none;width:100%;color:inherit;font-size:1em;line-height:inherit;outline:0}.weui-textarea-counter{color:#b2b2b2;text-align:right}.weui-cell_warn .weui-textarea-counter{color:#e64340}.weui-toptips{display:none;position:fixed;-webkit-transform:translateZ(0);transform:translateZ(0);top:0;left:0;right:0;padding:5px;font-size:14px;text-align:center;color:#fff;z-index:5000;word-wrap:break-word;word-break:break-all}.weui-toptips_warn{background-color:#e64340}.weui-cells_form .weui-cell__ft{font-size:0}.weui-cells_form .weui-icon-warn{display:none}.weui-cells_form input,.weui-cells_form label[for],.weui-cells_form textarea{-webkit-tap-highlight-color:rgba(0,0,0,0)}.weui-cell_warn{color:#e64340}.weui-cell_warn .weui-icon-warn{display:inline-block}.weui-form-preview{position:relative;background-color:#fff}.weui-form-preview:before{top:0;border-top:1px solid #e5e5e5;-webkit-transform-origin:0 0;transform-origin:0 0;-webkit-transform:scaleY(.5);transform:scaleY(.5)}.weui-form-preview:after,.weui-form-preview:before{content:" ";position:absolute;left:0;right:0;height:1px;color:#e5e5e5}.weui-form-preview:after{bottom:0;border-bottom:1px solid #e5e5e5;-webkit-transform-origin:0 100%;transform-origin:0 100%;-webkit-transform:scaleY(.5);transform:scaleY(.5)}.weui-form-preview__hd{position:relative;padding:10px 15px;text-align:right;line-height:2.5em}.weui-form-preview__hd:after{content:" ";position:absolute;left:0;bottom:0;right:0;height:1px;border-bottom:1px solid #e5e5e5;color:#e5e5e5;-webkit-transform-origin:0 100%;transform-origin:0 100%;-webkit-transform:scaleY(.5);transform:scaleY(.5);left:15px}.weui-form-preview__hd .weui-form-preview__value{font-style:normal;font-size:1.6em}.weui-form-preview__bd{padding:10px 15px;font-size:.9em;text-align:right;color:#999;line-height:2}.weui-form-preview__ft{position:relative;line-height:50px;display:-webkit-box;display:-webkit-flex;display:flex}.weui-form-preview__ft:before{content:" ";position:absolute;left:0;top:0;right:0;height:1px;border-top:1px solid #d5d5d6;color:#d5d5d6;-webkit-transform-origin:0 0;transform-origin:0 0;-webkit-transform:scaleY(.5);transform:scaleY(.5)}.weui-form-preview__item{overflow:hidden}.weui-form-preview__label{float:left;margin-right:1em;min-width:4em;color:#999;text-align:justify;text-align-last:justify}.weui-form-preview__value{display:block;overflow:hidden;word-break:normal;word-wrap:break-word}.weui-form-preview__btn{position:relative;display:block;-webkit-box-flex:1;-webkit-flex:1;flex:1;color:#3cc51f;text-align:center;-webkit-tap-highlight-color:rgba(0,0,0,0)}button.weui-form-preview__btn{background-color:transparent;border:0;outline:0;line-height:inherit;font-size:inherit}.weui-form-preview__btn:active{background-color:#eee}.weui-form-preview__btn:after{content:" ";position:absolute;left:0;top:0;width:1px;bottom:0;border-left:1px solid #d5d5d6;color:#d5d5d6;-webkit-transform-origin:0 0;transform-origin:0 0;-webkit-transform:scaleX(.5);transform:scaleX(.5)}.weui-form-preview__btn:first-child:after{display:none}.weui-form-preview__btn_default{color:#999}.weui-form-preview__btn_primary{color:#0bb20c}.weui-cell_select{padding:0}.weui-cell_select .weui-select{padding-right:30px}.weui-cell_select .weui-cell__bd:after{content:" ";display:inline-block;height:6px;width:6px;border-width:2px 2px 0 0;border-color:#c8c8cd;border-style:solid;-webkit-transform:matrix(.71,.71,-.71,.71,0,0);transform:matrix(.71,.71,-.71,.71,0,0);position:relative;top:-2px;position:absolute;top:50%;right:15px;margin-top:-4px}.weui-select{-webkit-appearance:none;border:0;outline:0;background-color:transparent;width:100%;font-size:inherit;height:45px;line-height:45px;position:relative;z-index:1;padding-left:15px}.weui-cell_select-before{padding-right:15px}.weui-cell_select-before .weui-select{width:105px;box-sizing:border-box}.weui-cell_select-before .weui-cell__hd{position:relative}.weui-cell_select-before .weui-cell__hd:after{content:" ";position:absolute;right:0;top:0;width:1px;bottom:0;border-right:1px solid #e5e5e5;color:#e5e5e5;-webkit-transform-origin:100% 0;transform-origin:100% 0;-webkit-transform:scaleX(.5);transform:scaleX(.5)}.weui-cell_select-before .weui-cell__hd:before{content:" ";display:inline-block;height:6px;width:6px;border-width:2px 2px 0 0;border-color:#c8c8cd;border-style:solid;-webkit-transform:matrix(.71,.71,-.71,.71,0,0);transform:matrix(.71,.71,-.71,.71,0,0);position:relative;top:-2px;position:absolute;top:50%;right:15px;margin-top:-4px}.weui-cell_select-before .weui-cell__bd{padding-left:15px}.weui-cell_select-before .weui-cell__bd:after{display:none}.weui-cell_select-after{padding-left:15px}.weui-cell_select-after .weui-select{padding-left:0}.weui-cell_vcode{padding-top:0;padding-right:0;padding-bottom:0}.weui-vcode-btn,.weui-vcode-img{margin-left:5px;height:45px;vertical-align:middle}.weui-vcode-btn{display:inline-block;padding:0 .6em 0 .7em;border-left:1px solid #e5e5e5;line-height:45px;font-size:17px;color:#3cc51f}button.weui-vcode-btn{background-color:transparent;border-top:0;border-right:0;border-bottom:0;outline:0}.weui-vcode-btn:active{color:#52a341}.weui-gallery{display:none;position:fixed;top:0;right:0;bottom:0;left:0;background-color:#000;z-index:1000}.weui-gallery__img{position:absolute;top:0;right:0;bottom:60px;left:0;background:50% no-repeat;background-size:contain}.weui-gallery__opr{position:absolute;right:0;bottom:0;left:0;background-color:#0d0d0d;color:#fff;line-height:60px;text-align:center}.weui-gallery__del{display:block}.weui-cell_switch{padding-top:6.5px;padding-bottom:6.5px}.weui-switch{-webkit-appearance:none;appearance:none}.weui-switch,.weui-switch-cp__box{position:relative;width:52px;height:32px;border:1px solid #dfdfdf;outline:0;border-radius:16px;box-sizing:border-box;background-color:#dfdfdf;-webkit-transition:background-color .1s,border .1s;transition:background-color .1s,border .1s}.weui-switch-cp__box:before,.weui-switch:before{content:" ";position:absolute;top:0;left:0;width:50px;height:30px;border-radius:15px;background-color:#fdfdfd;-webkit-transition:-webkit-transform .35s cubic-bezier(.45,1,.4,1);transition:-webkit-transform .35s cubic-bezier(.45,1,.4,1);transition:transform .35s cubic-bezier(.45,1,.4,1);transition:transform .35s cubic-bezier(.45,1,.4,1),-webkit-transform .35s cubic-bezier(.45,1,.4,1)}.weui-switch-cp__box:after,.weui-switch:after{content:" ";position:absolute;top:0;left:0;width:30px;height:30px;border-radius:15px;background-color:#fff;box-shadow:0 1px 3px rgba(0,0,0,.4);-webkit-transition:-webkit-transform .35s cubic-bezier(.4,.4,.25,1.35);transition:-webkit-transform .35s cubic-bezier(.4,.4,.25,1.35);transition:transform .35s cubic-bezier(.4,.4,.25,1.35);transition:transform .35s cubic-bezier(.4,.4,.25,1.35),-webkit-transform .35s cubic-bezier(.4,.4,.25,1.35)}.weui-switch-cp__input:checked~.weui-switch-cp__box,.weui-switch:checked{border-color:#04be02;background-color:#04be02}.weui-switch-cp__input:checked~.weui-switch-cp__box:before,.weui-switch:checked:before{-webkit-transform:scale(0);transform:scale(0)}.weui-switch-cp__input:checked~.weui-switch-cp__box:after,.weui-switch:checked:after{-webkit-transform:translateX(20px);transform:translateX(20px)}.weui-switch-cp__input{position:absolute;left:-9999px}.weui-switch-cp__box{display:block}.weui-uploader__hd{display:-webkit-box;display:-webkit-flex;display:flex;padding-bottom:10px;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.weui-uploader__title{-webkit-box-flex:1;-webkit-flex:1;flex:1}.weui-uploader__info{color:#b2b2b2}.weui-uploader__bd{margin-bottom:-4px;margin-right:-9px;overflow:hidden}.weui-uploader__files{list-style:none}.weui-uploader__file{float:left;margin-right:9px;margin-bottom:9px;width:79px;height:79px;background:no-repeat 50%;background-size:cover}.weui-uploader__file_status{position:relative}.weui-uploader__file_status:before{content:" ";position:absolute;top:0;right:0;bottom:0;left:0;background-color:rgba(0,0,0,.5)}.weui-uploader__file_status .weui-uploader__file-content{display:block}.weui-uploader__file-content{display:none;position:absolute;top:50%;left:50%;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%);color:#fff}.weui-uploader__file-content .weui-icon-warn{display:inline-block}.weui-uploader__input-box{float:left;position:relative;margin-right:9px;margin-bottom:9px;width:77px;height:77px;border:1px solid #d9d9d9}.weui-uploader__input-box:after,.weui-uploader__input-box:before{content:" ";position:absolute;top:50%;left:50%;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%);background-color:#d9d9d9}.weui-uploader__input-box:before{width:2px;height:39.5px}.weui-uploader__input-box:after{width:39.5px;height:2px}.weui-uploader__input-box:active{border-color:#999}.weui-uploader__input-box:active:after,.weui-uploader__input-box:active:before{background-color:#999}.weui-uploader__input{position:absolute;z-index:1;top:0;left:0;width:100%;height:100%;opacity:0;-webkit-tap-highlight-color:rgba(0,0,0,0)}.weui-msg{padding-top:36px;text-align:center}.weui-msg__icon-area{margin-bottom:30px}.weui-msg__text-area{margin-bottom:25px;padding:0 20px}.weui-msg__text-area a{color:#586c94}.weui-msg__title{margin-bottom:5px;font-weight:400;font-size:20px}.weui-msg__desc,.weui-msg__title{word-wrap:break-word;word-break:break-all}.weui-msg__desc{font-size:14px;color:#999}.weui-msg__opr-area{margin-bottom:25px}.weui-msg__extra-area{margin-bottom:15px;font-size:14px;color:#999}.weui-msg__extra-area a{color:#586c94}@media screen and (min-height:438px){.weui-msg__extra-area{position:fixed;left:0;bottom:0;width:100%;text-align:center}}@media only screen and (device-width:375px) and (device-height:812px) and (-webkit-device-pixel-ratio:3){.weui-msg__extra-area{margin-bottom:49px}}.weui-article{padding:20px 15px;font-size:15px}.weui-article section{margin-bottom:1.5em}.weui-article h1{font-size:18px;font-weight:400;margin-bottom:.9em}.weui-article h2{font-size:16px}.weui-article h2,.weui-article h3{font-weight:400;margin-bottom:.34em}.weui-article h3{font-size:15px}.weui-article *{max-width:100%;box-sizing:border-box;word-wrap:break-word}.weui-article p{margin:0 0 .8em}.weui-tabbar{display:-webkit-box;display:-webkit-flex;display:flex;position:absolute;z-index:500;bottom:0;width:100%;background-color:#f7f7fa}.weui-tabbar:before{content:" ";position:absolute;left:0;top:0;right:0;height:1px;border-top:1px solid #c0bfc4;color:#c0bfc4;-webkit-transform-origin:0 0;transform-origin:0 0;-webkit-transform:scaleY(.5);transform:scaleY(.5)}.weui-tabbar__item{display:block;-webkit-box-flex:1;-webkit-flex:1;flex:1;padding:5px 0 0;font-size:0;color:#999;text-align:center;-webkit-tap-highlight-color:rgba(0,0,0,0)}.weui-tabbar__item.weui-bar__item_on .weui-tabbar__icon,.weui-tabbar__item.weui-bar__item_on .weui-tabbar__icon>i,.weui-tabbar__item.weui-bar__item_on .weui-tabbar__label{color:#09bb07}.weui-tabbar__icon{display:inline-block;width:27px;height:27px}.weui-tabbar__icon>i,i.weui-tabbar__icon{font-size:24px;color:#999}.weui-tabbar__icon img{width:100%;height:100%}.weui-tabbar__label{text-align:center;color:#999;font-size:10px;line-height:1.8}.weui-navbar{display:-webkit-box;display:-webkit-flex;display:flex;position:absolute;z-index:500;top:0;width:100%;background-color:#fafafa}.weui-navbar:after{content:" ";position:absolute;left:0;bottom:0;right:0;height:1px;border-bottom:1px solid #ccc;color:#ccc;-webkit-transform-origin:0 100%;transform-origin:0 100%;-webkit-transform:scaleY(.5);transform:scaleY(.5)}.weui-navbar+.weui-tab__panel{padding-top:50px;padding-bottom:0}.weui-navbar__item{position:relative;display:block;-webkit-box-flex:1;-webkit-flex:1;flex:1;padding:13px 0;text-align:center;font-size:15px;-webkit-tap-highlight-color:rgba(0,0,0,0)}.weui-navbar__item:active{background-color:#ededed}.weui-navbar__item.weui-bar__item_on{background-color:#eaeaea}.weui-navbar__item:after{content:" ";position:absolute;right:0;top:0;width:1px;bottom:0;border-right:1px solid #ccc;color:#ccc;-webkit-transform-origin:100% 0;transform-origin:100% 0;-webkit-transform:scaleX(.5);transform:scaleX(.5)}.weui-navbar__item:last-child:after{display:none}.weui-tab{position:relative;height:100%}.weui-tab__panel{box-sizing:border-box;height:100%;padding-bottom:50px;overflow:auto;-webkit-overflow-scrolling:touch}.weui-tab__content{display:none}.weui-progress{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.weui-progress__bar{background-color:#ebebeb;height:3px;-webkit-box-flex:1;-webkit-flex:1;flex:1}.weui-progress__inner-bar{width:0;height:100%;background-color:#09bb07}.weui-progress__opr{display:block;margin-left:15px;font-size:0}.weui-panel{background-color:#fff;margin-top:10px;position:relative;overflow:hidden}.weui-panel:first-child{margin-top:0}.weui-panel:before{top:0;border-top:1px solid #e5e5e5;-webkit-transform-origin:0 0;transform-origin:0 0;-webkit-transform:scaleY(.5);transform:scaleY(.5)}.weui-panel:after,.weui-panel:before{content:" ";position:absolute;left:0;right:0;height:1px;color:#e5e5e5}.weui-panel:after{bottom:0;border-bottom:1px solid #e5e5e5;-webkit-transform-origin:0 100%;transform-origin:0 100%;-webkit-transform:scaleY(.5);transform:scaleY(.5)}.weui-panel__hd{padding:14px 15px 10px;color:#999;font-size:13px;position:relative}.weui-panel__hd:after{content:" ";position:absolute;left:0;bottom:0;right:0;height:1px;border-bottom:1px solid #e5e5e5;color:#e5e5e5;-webkit-transform-origin:0 100%;transform-origin:0 100%;-webkit-transform:scaleY(.5);transform:scaleY(.5);left:15px}.weui-media-box{padding:15px;position:relative}.weui-media-box:before{content:" ";position:absolute;left:0;top:0;right:0;height:1px;border-top:1px solid #e5e5e5;color:#e5e5e5;-webkit-transform-origin:0 0;transform-origin:0 0;-webkit-transform:scaleY(.5);transform:scaleY(.5);left:15px}.weui-media-box:first-child:before{display:none}a.weui-media-box{color:#000;-webkit-tap-highlight-color:rgba(0,0,0,0)}a.weui-media-box:active{background-color:#ececec}.weui-media-box__title{font-weight:400;font-size:17px;width:auto;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;word-wrap:normal;word-wrap:break-word;word-break:break-all}.weui-media-box__desc{color:#999;font-size:13px;line-height:1.2;overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2}.weui-media-box__info{margin-top:15px;padding-bottom:5px;font-size:13px;color:#cecece;line-height:1em;list-style:none;overflow:hidden}.weui-media-box__info__meta{float:left;padding-right:1em}.weui-media-box__info__meta_extra{padding-left:1em;border-left:1px solid #cecece}.weui-media-box_text .weui-media-box__title{margin-bottom:8px}.weui-media-box_appmsg{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.weui-media-box_appmsg .weui-media-box__hd{margin-right:.8em;width:60px;height:60px;line-height:60px;text-align:center}.weui-media-box_appmsg .weui-media-box__thumb{width:100%;max-height:100%;vertical-align:top}.weui-media-box_appmsg .weui-media-box__bd{-webkit-box-flex:1;-webkit-flex:1;flex:1;min-width:0}.weui-media-box_small-appmsg{padding:0}.weui-media-box_small-appmsg .weui-cells{margin-top:0}.weui-media-box_small-appmsg .weui-cells:before{display:none}.weui-grids{position:relative;overflow:hidden}.weui-grids:before{right:0;height:1px;border-top:1px solid #d9d9d9;-webkit-transform-origin:0 0;transform-origin:0 0;-webkit-transform:scaleY(.5);transform:scaleY(.5)}.weui-grids:after,.weui-grids:before{content:" ";position:absolute;left:0;top:0;color:#d9d9d9}.weui-grids:after{width:1px;bottom:0;border-left:1px solid #d9d9d9;-webkit-transform-origin:0 0;transform-origin:0 0;-webkit-transform:scaleX(.5);transform:scaleX(.5)}.weui-grid{position:relative;float:left;padding:20px 10px;width:33.33333333%;box-sizing:border-box}.weui-grid:before{top:0;width:1px;border-right:1px solid #d9d9d9;-webkit-transform-origin:100% 0;transform-origin:100% 0;-webkit-transform:scaleX(.5);transform:scaleX(.5)}.weui-grid:after,.weui-grid:before{content:" ";position:absolute;right:0;bottom:0;color:#d9d9d9}.weui-grid:after{left:0;height:1px;border-bottom:1px solid #d9d9d9;-webkit-transform-origin:0 100%;transform-origin:0 100%;-webkit-transform:scaleY(.5);transform:scaleY(.5)}.weui-grid:active{background-color:#ececec}.weui-grid__icon{width:28px;height:28px;margin:0 auto}.weui-grid__icon img{display:block;width:100%;height:100%}.weui-grid__icon+.weui-grid__label{margin-top:5px}.weui-grid__label{display:block;color:#000;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.weui-footer,.weui-grid__label{text-align:center;font-size:14px}.weui-footer{color:#999}.weui-footer a{color:#586c94}.weui-footer_fixed-bottom{position:fixed;bottom:.52em;left:0;right:0}.weui-footer__links{font-size:0}.weui-footer__link{display:inline-block;vertical-align:top;margin:0 .62em;position:relative;font-size:14px}.weui-footer__link:before{content:" ";position:absolute;left:0;top:0;width:1px;bottom:0;border-left:1px solid #c7c7c7;color:#c7c7c7;-webkit-transform-origin:0 0;transform-origin:0 0;-webkit-transform:scaleX(.5);transform:scaleX(.5);left:-.65em;top:.36em;bottom:.36em}.weui-footer__link:first-child:before{display:none}.weui-footer__text{padding:0 .34em;font-size:12px}.weui-flex{display:-webkit-box;display:-webkit-flex;display:flex}.weui-flex__item{-webkit-box-flex:1;-webkit-flex:1;flex:1}.weui-dialog{position:fixed;z-index:5000;width:80%;max-width:300px;top:50%;left:50%;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%);background-color:#fff;text-align:center;border-radius:3px;overflow:hidden}.weui-dialog__hd{padding:1.3em 1.6em .5em}.weui-dialog__title{font-weight:400;font-size:18px}.weui-dialog__bd{padding:0 1.6em .8em;min-height:40px;font-size:15px;line-height:1.3;word-wrap:break-word;word-break:break-all;color:#999}.weui-dialog__bd:first-child{padding:2.7em 20px 1.7em;color:#353535}.weui-dialog__ft{position:relative;line-height:48px;font-size:18px;display:-webkit-box;display:-webkit-flex;display:flex}.weui-dialog__ft:after{content:" ";position:absolute;left:0;top:0;right:0;height:1px;border-top:1px solid #d5d5d6;color:#d5d5d6;-webkit-transform-origin:0 0;transform-origin:0 0;-webkit-transform:scaleY(.5);transform:scaleY(.5)}.weui-dialog__btn{display:block;-webkit-box-flex:1;-webkit-flex:1;flex:1;color:#3cc51f;text-decoration:none;-webkit-tap-highlight-color:rgba(0,0,0,0);position:relative}.weui-dialog__btn:active{background-color:#eee}.weui-dialog__btn:after{content:" ";position:absolute;left:0;top:0;width:1px;bottom:0;border-left:1px solid #d5d5d6;color:#d5d5d6;-webkit-transform-origin:0 0;transform-origin:0 0;-webkit-transform:scaleX(.5);transform:scaleX(.5)}.weui-dialog__btn:first-child:after{display:none}.weui-dialog__btn_default{color:#353535}.weui-dialog__btn_primary{color:#0bb20c}.weui-skin_android .weui-dialog{text-align:left;box-shadow:0 6px 30px 0 rgba(0,0,0,.1)}.weui-skin_android .weui-dialog__title{font-size:21px}.weui-skin_android .weui-dialog__hd{text-align:left}.weui-skin_android .weui-dialog__bd{color:#999;padding:.25em 1.6em 2em;font-size:17px;text-align:left}.weui-skin_android .weui-dialog__bd:first-child{padding:1.6em 1.6em 2em;color:#353535}.weui-skin_android .weui-dialog__ft{display:block;text-align:right;line-height:42px;font-size:16px;padding:0 1.6em .7em}.weui-skin_android .weui-dialog__ft:after{display:none}.weui-skin_android .weui-dialog__btn{display:inline-block;vertical-align:top;padding:0 .8em}.weui-skin_android .weui-dialog__btn:after{display:none}.weui-skin_android .weui-dialog__btn:active,.weui-skin_android .weui-dialog__btn:visited{background-color:rgba(0,0,0,.06)}.weui-skin_android .weui-dialog__btn:last-child{margin-right:-.8em}.weui-skin_android .weui-dialog__btn_default{color:gray}@media screen and (min-width:1024px){.weui-dialog{width:35%}}.weui-toast{position:fixed;z-index:5000;width:7.6em;min-height:7.6em;top:180px;left:50%;margin-left:-3.8em;background:hsla(0,0%,7%,.7);text-align:center;border-radius:5px;color:#fff}.weui-icon_toast{margin:22px 0 0;display:block}.weui-icon_toast.weui-icon-success-no-circle:before{color:#fff;font-size:55px}.weui-icon_toast.weui-loading{margin:30px 0 0;width:38px;height:38px;vertical-align:baseline}.weui-toast__content{margin:0 0 15px}.weui-mask{background:rgba(0,0,0,.6)}.weui-mask,.weui-mask_transparent{position:fixed;z-index:1000;top:0;right:0;left:0;bottom:0}.weui-actionsheet{position:fixed;left:0;bottom:0;-webkit-transform:translateY(100%);transform:translateY(100%);-webkit-backface-visibility:hidden;backface-visibility:hidden;z-index:5000;width:100%;background-color:#efeff4;-webkit-transition:-webkit-transform .3s;transition:-webkit-transform .3s;transition:transform .3s;transition:transform .3s,-webkit-transform .3s}.weui-actionsheet__title{position:relative;height:65px;padding:0 20px;line-height:1.4;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;flex-direction:column;text-align:center;font-size:14px;color:#888;background:#fcfcfd}.weui-actionsheet__title:before{content:" ";position:absolute;left:0;bottom:0;right:0;height:1px;border-bottom:1px solid #e5e5e5;color:#e5e5e5;-webkit-transform-origin:0 100%;transform-origin:0 100%;-webkit-transform:scaleY(.5);transform:scaleY(.5)}.weui-actionsheet__title .weui-actionsheet__title-text{overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2}.weui-actionsheet__menu{background-color:#fcfcfd}.weui-actionsheet__action{margin-top:6px;background-color:#fcfcfd}.weui-actionsheet__cell{position:relative;padding:10px 0;text-align:center;font-size:18px}.weui-actionsheet__cell:before{content:" ";position:absolute;left:0;top:0;right:0;height:1px;border-top:1px solid #e5e5e5;color:#e5e5e5;-webkit-transform-origin:0 0;transform-origin:0 0;-webkit-transform:scaleY(.5);transform:scaleY(.5)}.weui-actionsheet__cell:active{background-color:#ececec}.weui-actionsheet__cell:first-child:before{display:none}.weui-skin_android .weui-actionsheet{position:fixed;left:50%;top:50%;bottom:auto;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%);width:274px;box-sizing:border-box;-webkit-backface-visibility:hidden;backface-visibility:hidden;background:transparent;-webkit-transition:-webkit-transform .3s;transition:-webkit-transform .3s;transition:transform .3s;transition:transform .3s,-webkit-transform .3s}.weui-skin_android .weui-actionsheet__action{display:none}.weui-skin_android .weui-actionsheet__menu{border-radius:2px;box-shadow:0 6px 30px 0 rgba(0,0,0,.1)}.weui-skin_android .weui-actionsheet__cell{padding:13px 24px;font-size:16px;line-height:1.4;text-align:left}.weui-skin_android .weui-actionsheet__cell:first-child{border-top-left-radius:2px;border-top-right-radius:2px}.weui-skin_android .weui-actionsheet__cell:last-child{border-bottom-left-radius:2px;border-bottom-right-radius:2px}.weui-actionsheet_toggle{-webkit-transform:translate(0);transform:translate(0)}.weui-loadmore{width:65%;margin:1.5em auto;line-height:1.6em;font-size:14px;text-align:center}.weui-loadmore__tips{display:inline-block;vertical-align:middle}.weui-loadmore_line{border-top:1px solid #e5e5e5;margin-top:2.4em}.weui-loadmore_line .weui-loadmore__tips{position:relative;top:-.9em;padding:0 .55em;background-color:#fff;color:#999}.weui-loadmore_dot .weui-loadmore__tips{padding:0 .16em}.weui-loadmore_dot .weui-loadmore__tips:before{content:" ";width:4px;height:4px;border-radius:50%;background-color:#e5e5e5;display:inline-block;position:relative;vertical-align:0;top:-.16em}.weui-badge{display:inline-block;padding:.15em .4em;min-width:8px;border-radius:18px;background-color:#f43530;color:#fff;line-height:1.2;text-align:center;font-size:12px;vertical-align:middle}.weui-badge_dot{padding:.4em;min-width:0}.weui-search-bar{position:relative;padding:8px 10px;display:-webkit-box;display:-webkit-flex;display:flex;box-sizing:border-box;background-color:#efeff4;-webkit-text-size-adjust:100%;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.weui-search-bar:before{top:0;border-top:1px solid #d7d6dc;-webkit-transform-origin:0 0;transform-origin:0 0;-webkit-transform:scaleY(.5);transform:scaleY(.5)}.weui-search-bar:after,.weui-search-bar:before{content:" ";position:absolute;left:0;right:0;height:1px;color:#d7d6dc}.weui-search-bar:after{bottom:0;border-bottom:1px solid #d7d6dc;-webkit-transform-origin:0 100%;transform-origin:0 100%;-webkit-transform:scaleY(.5);transform:scaleY(.5)}.weui-search-bar.weui-search-bar_focusing .weui-search-bar__cancel-btn{display:block}.weui-search-bar.weui-search-bar_focusing .weui-search-bar__label{display:none}.weui-search-bar__form{position:relative;-webkit-box-flex:1;-webkit-flex:auto;flex:auto;background-color:#efeff4}.weui-search-bar__form:after{content:'';position:absolute;left:0;top:0;width:200%;height:200%;-webkit-transform:scale(.5);transform:scale(.5);-webkit-transform-origin:0 0;transform-origin:0 0;border-radius:10px;border:1px solid #e6e6ea;box-sizing:border-box;background:#fff}.weui-search-bar__box{position:relative;padding-left:30px;padding-right:30px;height:100%;width:100%;box-sizing:border-box;z-index:1}.weui-search-bar__box .weui-search-bar__input{padding:4px 0;width:100%;height:1.42857143em;border:0;font-size:14px;line-height:1.42857143em;box-sizing:content-box;background:transparent}.weui-search-bar__box .weui-search-bar__input:focus{outline:none}.weui-search-bar__box .weui-icon-search{position:absolute;top:50%;left:10px;margin-top:-14px;line-height:28px}.weui-search-bar__box .weui-icon-clear{position:absolute;top:50%;right:0;margin-top:-14px;padding:0 10px;line-height:28px}.weui-search-bar__label{position:absolute;top:1px;right:1px;bottom:1px;left:1px;z-index:2;border-radius:3px;text-align:center;color:#9b9b9b;background:#fff}.weui-search-bar__label span{display:inline-block;font-size:14px;vertical-align:middle}.weui-search-bar__label .weui-icon-search{margin-right:5px}.weui-search-bar__cancel-btn{display:none;margin-left:10px;line-height:28px;color:#09bb07;white-space:nowrap}.weui-search-bar__input:not(:valid)~.weui-icon-clear{display:none}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration,input[type=search]::-webkit-search-results-button,input[type=search]::-webkit-search-results-decoration{display:none}.weui-picker{position:fixed;width:100%;left:0;bottom:0;z-index:5000;-webkit-backface-visibility:hidden;backface-visibility:hidden;-webkit-transform:translateY(100%);transform:translateY(100%);-webkit-transition:-webkit-transform .3s;transition:-webkit-transform .3s;transition:transform .3s;transition:transform .3s,-webkit-transform .3s}.weui-picker__hd{display:-webkit-box;display:-webkit-flex;display:flex;padding:9px 15px;background-color:#fff;position:relative;text-align:center;font-size:17px}.weui-picker__hd:after{content:" ";position:absolute;left:0;bottom:0;right:0;height:1px;border-bottom:1px solid #e5e5e5;color:#e5e5e5;-webkit-transform-origin:0 100%;transform-origin:0 100%;-webkit-transform:scaleY(.5);transform:scaleY(.5)}.weui-picker__action{display:block;-webkit-box-flex:1;-webkit-flex:1;flex:1;color:#1aad19}.weui-picker__action:first-child{text-align:left;color:#888}.weui-picker__action:last-child{text-align:right}.weui-picker__bd{display:-webkit-box;display:-webkit-flex;display:flex;position:relative;background-color:#fff;height:238px;overflow:hidden}.weui-picker__group{-webkit-box-flex:1;-webkit-flex:1;flex:1;position:relative;height:100%}.weui-picker__mask{top:0;height:100%;margin:0 auto;background:-webkit-linear-gradient(top,hsla(0,0%,100%,.95),hsla(0,0%,100%,.6)),-webkit-linear-gradient(bottom,hsla(0,0%,100%,.95),hsla(0,0%,100%,.6));background:linear-gradient(180deg,hsla(0,0%,100%,.95),hsla(0,0%,100%,.6)),linear-gradient(0deg,hsla(0,0%,100%,.95),hsla(0,0%,100%,.6));background-position:top,bottom;background-size:100% 102px;background-repeat:no-repeat;-webkit-transform:translateZ(0);transform:translateZ(0)}.weui-picker__indicator,.weui-picker__mask{position:absolute;left:0;width:100%;z-index:3}.weui-picker__indicator{height:34px;top:102px}.weui-picker__indicator:before{top:0;border-top:1px solid #e5e5e5;-webkit-transform-origin:0 0;transform-origin:0 0;-webkit-transform:scaleY(.5);transform:scaleY(.5)}.weui-picker__indicator:after,.weui-picker__indicator:before{content:" ";position:absolute;left:0;right:0;height:1px;color:#e5e5e5}.weui-picker__indicator:after{bottom:0;border-bottom:1px solid #e5e5e5;-webkit-transform-origin:0 100%;transform-origin:0 100%;-webkit-transform:scaleY(.5);transform:scaleY(.5)}.weui-picker__content{position:absolute;top:0;left:0;width:100%}.weui-picker__item{padding:0;height:34px;line-height:34px;text-align:center;color:#000;text-overflow:ellipsis;white-space:nowrap;overflow:hidden}.weui-picker__item_disabled{color:#999}@-webkit-keyframes a{0%{-webkit-transform:translate3d(0,100%,0);transform:translate3d(0,100%,0)}to{-webkit-transform:translateZ(0);transform:translateZ(0)}}@keyframes a{0%{-webkit-transform:translate3d(0,100%,0);transform:translate3d(0,100%,0)}to{-webkit-transform:translateZ(0);transform:translateZ(0)}}.weui-animate-slide-up{-webkit-animation:a ease .3s forwards;animation:a ease .3s forwards}@-webkit-keyframes b{0%{-webkit-transform:translateZ(0);transform:translateZ(0)}to{-webkit-transform:translate3d(0,100%,0);transform:translate3d(0,100%,0)}}@keyframes b{0%{-webkit-transform:translateZ(0);transform:translateZ(0)}to{-webkit-transform:translate3d(0,100%,0);transform:translate3d(0,100%,0)}}.weui-animate-slide-down{-webkit-animation:b ease .3s forwards;animation:b ease .3s forwards}@-webkit-keyframes c{0%{opacity:0}to{opacity:1}}@keyframes c{0%{opacity:0}to{opacity:1}}.weui-animate-fade-in{-webkit-animation:c ease .3s forwards;animation:c ease .3s forwards}@-webkit-keyframes d{0%{opacity:1}to{opacity:0}}@keyframes d{0%{opacity:1}to{opacity:0}}.weui-animate-fade-out{-webkit-animation:d ease .3s forwards;animation:d ease .3s forwards}.weui-agree{display:block;padding:.5em 15px;font-size:13px}.weui-agree a{color:#586c94}.weui-agree__text{color:#999}.weui-agree__checkbox{-webkit-appearance:none;appearance:none;outline:0;font-size:0;border:1px solid #d1d1d1;background-color:#fff;border-radius:3px;width:13px;height:13px;position:relative;vertical-align:0;top:2px}.weui-agree__checkbox:checked:before{font-family:weui;font-style:normal;font-weight:400;font-variant:normal;text-transform:none;text-align:center;speak:none;display:inline-block;vertical-align:middle;text-decoration:inherit;content:"\EA08";color:#09bb07;font-size:13px;position:absolute;top:50%;left:50%;-webkit-transform:translate(-50%,-48%) scale(.73);transform:translate(-50%,-48%) scale(.73)}.weui-agree__checkbox:disabled{background-color:#e1e1e1}.weui-agree__checkbox:disabled:before{color:#adadad}.weui-loading{width:20px;height:20px;display:inline-block;vertical-align:middle;-webkit-animation:e 1s steps(12) infinite;animation:e 1s steps(12) infinite;background:transparent url("data:image/svg+xml;charset=utf8, %3Csvg xmlns='http://www.w3.org/2000/svg' width='120' height='120' viewBox='0 0 100 100'%3E%3Cpath fill='none' d='M0 0h100v100H0z'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23E9E9E9' rx='5' ry='5' transform='translate(0 -30)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23989697' rx='5' ry='5' transform='rotate(30 105.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%239B999A' rx='5' ry='5' transform='rotate(60 75.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23A3A1A2' rx='5' ry='5' transform='rotate(90 65 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23ABA9AA' rx='5' ry='5' transform='rotate(120 58.66 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23B2B2B2' rx='5' ry='5' transform='rotate(150 54.02 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23BAB8B9' rx='5' ry='5' transform='rotate(180 50 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23C2C0C1' rx='5' ry='5' transform='rotate(-150 45.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23CBCBCB' rx='5' ry='5' transform='rotate(-120 41.34 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23D2D2D2' rx='5' ry='5' transform='rotate(-90 35 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23DADADA' rx='5' ry='5' transform='rotate(-60 24.02 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='%23E2E2E2' rx='5' ry='5' transform='rotate(-30 -5.98 65)'/%3E%3C/svg%3E") no-repeat;background-size:100%}.weui-btn_loading.weui-btn_primary .weui-loading,.weui-btn_loading.weui-btn_warn .weui-loading,.weui-loading.weui-loading_transparent{background-image:url("data:image/svg+xml;charset=utf8, %3Csvg xmlns='http://www.w3.org/2000/svg' width='120' height='120' viewBox='0 0 100 100'%3E%3Cpath fill='none' d='M0 0h100v100H0z'/%3E%3Crect xmlns='http://www.w3.org/2000/svg' width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.56)' rx='5' ry='5' transform='translate(0 -30)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.5)' rx='5' ry='5' transform='rotate(30 105.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.43)' rx='5' ry='5' transform='rotate(60 75.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.38)' rx='5' ry='5' transform='rotate(90 65 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.32)' rx='5' ry='5' transform='rotate(120 58.66 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.28)' rx='5' ry='5' transform='rotate(150 54.02 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.25)' rx='5' ry='5' transform='rotate(180 50 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.2)' rx='5' ry='5' transform='rotate(-150 45.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.17)' rx='5' ry='5' transform='rotate(-120 41.34 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.14)' rx='5' ry='5' transform='rotate(-90 35 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.1)' rx='5' ry='5' transform='rotate(-60 24.02 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.03)' rx='5' ry='5' transform='rotate(-30 -5.98 65)'/%3E%3C/svg%3E")}@-webkit-keyframes e{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}@keyframes e{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}.weui-slider{padding:15px 18px;-webkit-user-select:none;user-select:none}.weui-slider__inner{position:relative;height:2px;background-color:#e9e9e9}.weui-slider__track{height:2px;background-color:#1aad19;width:0}.weui-slider__handler{position:absolute;left:0;top:50%;width:28px;height:28px;margin-left:-14px;margin-top:-14px;border-radius:50%;background-color:#fff;box-shadow:0 0 4px rgba(0,0,0,.2)}.weui-slider-box{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.weui-slider-box .weui-slider{-webkit-box-flex:1;-webkit-flex:1;flex:1}.weui-slider-box__value{margin-left:.5em;min-width:24px;color:#888;text-align:center;font-size:14px}
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/css/weuix.css b/pluss-wap-page/src/main/resources/static/resources/css/weuix.css
new file mode 100644
index 0000000..bcae943
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/css/weuix.css
@@ -0,0 +1,7096 @@
+/*导入扩展图标*/
+/*图标*/
+@font-face {
+	font-family: "iconfont";
+	src: url("data:application/octet-stream;base64,AAEAAAAPAIAAAwBwRkZUTXNQs2kAAAD8AAAAHE9TLzJXdF0oAAABGAAAAGBjbWFwzBkhrwAAAXgA AAFKY3Z0IA1l/uoAAM9YAAAAJGZwZ20w956VAADPfAAACZZnYXNwAAAAEAAAz1AAAAAIZ2x5ZivY uVsAAALEAADB4mhlYWQKMlSSAADEqAAAADZoaGVhB94D6AAAxOAAAAAkaG10eKguI8oAAMUEAAAB 2mxvY2F3HUZsAADG4AAAAQZtYXhwAyQM8wAAx+gAAAAgbmFtZQp/3BcAAMgIAAACLnBvc3QVuwse AADKOAAABRZwcmVwpbm+ZgAA2RQAAACVAAAAAQAAAADMPaLPAAAAANOJiEwAAAAA04mITQAEA/8B 9AAFAAACmQLMAAAAjwKZAswAAAHrADMBCQAAAgAGAwAAAAAAAAAAAAEQAAAAAAAAAAAAAABQZkVk AMAAeOZ9A4D/gABcA4AAhQAAAAEAAAAAAxgAAAAAACAAAQAAAAMAAAADAAAAHAABAAAAAABEAAMA AQAAABwABAAoAAAABgAEAAEAAgB45n3//wAAAHjmAP///4saBAABAAAAAAAAAAABBgAAAQAAAAAA AAABAgAAAAIAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAIgAAATICqgADAAcAKUAmAAAAAwIAA1cAAgEBAksA AgIBTwQBAQIBQwAABwYFBAADAAMRBQ8rMxEhESczESMiARDuzMwCqv1WIgJmAAAABQAs/+EDvAMY ABYAMAA6AFIAXgF3S7ATUFhASgIBAA0ODQAOZgADDgEOA14AAQgIAVwQAQkICgYJXhEBDAYEBgxe AAsEC2kPAQgABgwIBlgACgcFAgQLCgRZEgEODg1RAA0NCg5CG0uwF1BYQEsCAQANDg0ADmYAAw4B DgNeAAEICAFcEAEJCAoICQpmEQEMBgQGDF4ACwQLaQ8BCAAGDAgGWAAKBwUCBAsKBFkSAQ4ODVEA DQ0KDkIbS7AYUFhATAIBAA0ODQAOZgADDgEOA14AAQgIAVwQAQkICggJCmYRAQwGBAYMBGYACwQL aQ8BCAAGDAgGWAAKBwUCBAsKBFkSAQ4ODVEADQ0KDkIbQE4CAQANDg0ADmYAAw4BDgMBZgABCA4B CGQQAQkICggJCmYRAQwGBAYMBGYACwQLaQ8BCAAGDAgGWAAKBwUCBAsKBFkSAQ4ODVEADQ0KDkJZ WVlAKFNTOzsyMRcXU15TXltYO1I7UktDNzUxOjI6FzAXMFERMRgRKBVAExYrAQYrASIOAh0BITU0 JjU0LgIrARUhBRUUFhQOAiMGJisBJyEHKwEiJyIuAj0BFyIGFBYzMjY0JhcGBw4DHgE7BjI2Jy4B JyYnATU0PgI7ATIWHQEBGRsaUxIlHBIDkAEKGCcehf5KAqIBFR8jDg4fDiAt/kksHSIUGRkgEwh3 DBISDA0SEowIBgULBAIEDw4lQ1FQQCQXFgkFCQUFBv6kBQ8aFbwfKQIfAQwZJxpMKRAcBA0gGxJh iDQXOjolFwkBAYCAARMbIA6nPxEaEREaEXwaFhMkDhANCBgaDSMRExQBd+QLGBMMHSbjAAABACz/ iAPSA14AKQBGQEMGAQECHhQCBAMCAQUAA0AAAgABAwIBWQADAAQAAwRZBgEABQUATQYBAAAFUQAF AAVFAQAlIx0bFxUPDQkHACkBKQcOKyUiByU2JyUWMz4BNy4BJw4BBxQXBSYjDgEHHgEXMjcFBhUe ARc+ATcuAQM4Ri3+mgYGAWYuRUFYAQFYQUJZAQP+nC9EQlkBAVlCRC8BZAMBWUJBWAEBWLwx0BkY zzIBWEFCWAEBWUEKE8w0AVhBQlcBM80TC0JXAQFXQkFYAAAAAAIAJf+hA98DXwASACAAMEAtAQED AhEBAQMCQBIAAgE9AAAAAgMAAlkAAwEBA00AAwMBUQABAwFFJiUmJgQSKwUBNjUmJyYnBgcGBxYX FhcyNwkBPgE3FhcWFwYHBgcuAQPf/s9EBWVkmZllZQMEZWSZcV8BMfzfA6J7elFSBARSUXp7ogsB MWBxmmNmBQVmZJmYZmQEQ/7NAlZ7ogMDUVB8e1BRBASiAAEAQv+oA7kDRAAHAAazBwIBJislBRMB FwkBBwI2AQV+/InpAjP+PAZncQNO/fZuAgD9zPAAAAAAAQBXADgDqQLDAAIADkALAgEAPQAAAF8Q AQ8rEyEBVwNS/lYCw/11AAIAvAAaA0EC4AADAAsAO0A4BQECAQFABgQCAgEDAQIDZgADA2cAAAEB AEsAAAABTwUBAQABQwQEAAAECwQLCgkHBgADAAMRBw8rEzUhFQElBSMdASMRvAKF/bwBAAEEwIMC fmJi/v/i4sGiAWMAAAABAFcANgOpAsEAAgAOQAsAAQA+AAAAXxEBDysJASEB/wGq/K4Cwf11AAAA AAIADP/wA/QDEQA6AE4AhEANPiolHwQKCyQBBQoCQEuwIVBYQCsIAQAHAQECAAFXBgECAAMEAgNY AAQACwoEC1kACQkKQQAKCgVRAAUFCwVCG0AoCAEABwEBAgABVwYBAgADBAIDWAAEAAsKBAtZAAoA BQoFVQAJCQoJQllAFE1LRUM6OTg2NDMyMBYoIREREQwUKwEHIRUhFSMVPwEHDgEHBicuASMOAQcO ARceATc+AT8BFxYEHwE1Jy4BLwE3PgE1NCYrATUhNTQPATUjAxYfAQcGBw4BJyYnJjY3PgEXHgEB ogL+9gEN3uHjBAgwBghCVWc5OlIkRwlBRtJoJG0WDCYdAQEeFjspoCARFxE1KE51ARqNjY0dQyUn FhcoOXJEkAkDEBgdP0EwMwLPQjJYMAICEB5yAwITGhMBFxoypzc7CjISThkOEw92DQmtDwsyDQYu JJYOBwRYLAQBAYj+BxcTFRscHisjBAhuISsSFg4CAQkAAAASAET/xAO8AzwAAAACAAQABgAIAAoA DAAcACsAOwBIAFgAZwBvAH8AjQCcAJ0AnUCaOjIeAwAGlkMCCQedd2dlYzMrKScACgsJh1cCDQt+ dloDDAIFQAAABgEGAAFmEAEBBwYBB2QRAQMNAg0DAmYAAgwNAgxkAAQABgAEBlkIAQcKAQkLBwlZ DwELDgENAwsNWQAMBQUMTQAMDAVRAAUMBUULCwUFj46Mi4qJc3FtbGloUE9HRkVELy0WFQ4NCwwL DAwLBQYFBhUSDysBJRUBNQMzNxUBNQUjAiIOAhQeAjI+AjQuAQMRFhcWFxYXFhcHNic0JwM2MzIX FhcRJicmLwM2BzY3Njc2NxcmDwEhNgMmNTQ3NjchBgcGDwMmNxEmJyYnJicmJzcGFxQXNjIWFAYi JjQTBiMiJyYnERYXFh8DBjcGBwYHBgcnFjcyNyEGNyE2NzY/AxYXFhUUByMA/wIC/pQBAdb+lAFr AQ+0pXZHR3altKV2R0d2XTMsEw8nGwYGzwMCAdAYFzY0DQ0MDgUGJBLDM94PECcvCwzQExMO/qAW NAMPAwQBJhAMBQQkEcQU8TMsExAmGwYH0AMCAWtuT09uT7QYFzY0DQ0MDgYFJRHDM9wPECYwCwzQ ExMHBwFgFSL+2hAMBQQkEcQVBgMOjgHrAwH+kAECAwIB/pIBmAK/R3altKV2R0d2pbSldv7cAS0W IhAPJy8LDNATEwcHAX0DDgMF/toQDAUEJRHDFZQTECYbBwbQAwECM/79GBc2NA0NDA4FBiURwzMX /tMWIw8QJi8LDNATEwcHok9uT09u/i4DDgMFASYQDAUEJBLDFZITDycbBgbPAwIBM1IMDgUGJBLD MzgYFzY0AAwAh//VA34DLABXAGMAcACRAJ8AqADLAOEA+wEPARoBIQLuS7ALUFhBJgEhAFoAAgAD AAQAhAANAAwAAwAFAAYAlgABAAgACQDIAMQAtACpAEYAPwAZAAcACwAIAOQAOwAgAB8ABAAOAAsA NgABAAwADgAGAEAbS7AMUFhBJgEhAFoAAgADAAQAhAANAAwAAwAFAAYAlgABAAgABwDIAMQAtACp AEYAPwAZAAcACwAIAOQAOwAgAB8ABAAOAAsANgABAAwADgAGAEAbQSYBIQBaAAIAAwAEAIQADQAM AAMABQAGAJYAAQAIAAkAyADEALQAqQBGAD8AGQAHAAsACADkADsAIAAfAAQADgALADYAAQAMAA4A BgBAWVlLsAtQWEBXAAQCAwIEA2YAAAMGAwAGZgAJBwgHCQhmAAgLBwgLZAALDgcLDmQADgwHDgxk DwENDAEMDQFmAAMABgUDBloABQoBBwkFB1kAAgIKQQAMDAFSAAEBCwFCG0uwDFBYQFEABAIDAgQD ZgAAAwYDAAZmCQEIBwsHCAtmAAsOBwsOZAAODAcODGQPAQ0MAQwNAWYAAwAGBQMGWgAFCgEHCAUH WQACAgpBAAwMAVIAAQELAUIbS7AbUFhAVwAEAgMCBANmAAADBgMABmYACQcIBwkIZgAICwcIC2QA Cw4HCw5kAA4MBw4MZA8BDQwBDA0BZgADAAYFAwZaAAUKAQcJBQdZAAICCkEADAwBUgABAQsBQhtL sDJQWEBUAAIEAmgABAMEaAAAAwYDAAZmAAkHCAcJCGYACAsHCAtkAAsOBwsOZAAODAcODGQPAQ0M AQwNAWYAAwAGBQMGWgAFCgEHCQUHWQAMDAFSAAEBCwFCG0BZAAIEAmgABAMEaAAAAwYDAAZmAAkH CAcJCGYACAsHCAtkAAsOBwsOZAAODAcODGQPAQ0MAQwNAWYAAwAGBQMGWgAFCgEHCQUHWQAMDQEM TQAMDAFSAAEMAUZZWVlZQCHw7ufl19XBv7Gvp6WjoZiXlZORkIGAcG9dXFdWLy4kEA8rAQ4BBwYj IgYVFAcGHwEHDgEXHgE3PgE3NhcUFhceAR8BBgcGFQYXFhcWFxY2NzYyFxY3NicmNzYnJi8BNzY/ ARceARcWNjc2Jy4BJy4BNzYnJicuAScuARcWFxYGJicmNjc+AQcWFxYHBicmNTQ3PgEXHgEVFAYH BjU0NzYHBgcOAScmBwYXFgYmJyY1NDY3NhYHFjMyFQYiJicmJyYXFhcGKwE3NjsBBgUWBwYWFxYz FjY9ARcWNjc2Fx4BBw4BBwYnJicmNj8BFx4BBxYXFhcWFxYUBiMiJicmNz4BJyY3NgUWBxQjIhcW FxYGBwYnIicmNzY3Njc2Nz4BAw4BFxY3Njc2FxYfARY3NjU0JyYHBhYXFjY3NjU0JhYUBicmNhcB y1p2BwIDBA0FBgIBFiceDAUKCwggBQYDGQsFBwECAQ4oAQcIAxA/GjEyMz81ki8jDAUCAQULHgwS EgoJDQoYCAoQAwEHBiIQCwMCBxUKBAltUhdUeRkDAx8tDwkBCAojgBkDAxUVFyUYCB6dITsiDggL DAkFCzmBNxMBAggHBCAJCksoHGHAMkAgAiEzEjcJBg4GzAoTExQUCQUB/ucEBwYDCxQsIxAdTY83 EgMJBgcUgVV1UT0JAQYGBQ4FDR0GCw0NChwZER4qPQgECQYBBQwXGAH4FQEIBQYGAgEDCRpEKgUK JCgGBAoLCQgIywYGAgMHAgEECgUCAwMFAggQgQoBCwgKBwkZDQsDAggEAycUil8cGQcKCAgZGRw0 ai4UCgQEIgoIBQYwEAYKAwQBBxUyEQoLBRwJBAQKCgodMSYdDAECCxQMBhoaGRkUDxkDAygiIBwZ RxUPCQ4mIg8fU4IaCAOBECsmMQMeEDgRFA4NESwsFxYKEDksFAcCqwkeCQUWBAIBAg8QBAIJKgIp DgIBDQwEDgcHBwsiCAUDfxEEAwUECgkFBAIUAgICATQCLConDBcBFzIrAwgeJA0DCl8cT2YEBU8+ VBQ3DgwJAwjlBgcIDQkYFA8FFhIJEAwFAgQQEAwKCwUHBhELCQcXAQUKFBcMBwMCDgwCAhIHFQcO DgMGEAEBCBEPCgUMEgYOCgsjCAUBCAgQExIYEAMGBQsCAAAGAB7/8QPjAwkAHAAnADIASgBTAFwA KkAnDQEAAwFAPzwLAwA9AAIBAmgAAQMBaAADAANoAAAAX1BPMjElLwQQKwEOAx4BFxYGDwE/ARcW OwEnJj4COwEnLgIHHgEHBi4CNz4BBR4BDgEnLgE3NhYXDgEXHgM/ARcWNzYnJjY3PgEuAwceAQcO AScmNhcWBgcGJjc+AQE1RXFGIQ0/NwoCDhA6OR82LhAGECRWg0obBRZ+r3MXAhYRJRYHDAsqAQIR CA8iFB4FHAsed2qDBANFbIlFFi4uAgEMCwEONjALPF2CSwkIBAg2Cgst3w4EERopDQkmAwkNQ1pt aWUkBg8pMB8eBw4WPHlaORNMcjCgEDYOCwUYIhIPCQoMJh8QBwxADwYBgBSQXD1oPRcVBhkZAgMl IgwKJ2hnYUUekQcaCxkCFxslFA4nCQ0nGhAHAAAGACoABAPUAv0AFgAxAEQAVABeAHAAOkA3LAEE BQFAAAABAGgAAQUBaAAFBAVoAAIDAmkABAMDBE0ABAQDUgADBANGY2FUU0tKOjkxMCUGDysBDgEX HgEzMhceARUUFhcWNjc2JicuAQUGBwYWFxYkNz4BJicuATc2Jy4BDwE3NicmBhceARUUBgcOAScu ATU0Nz4BNzYHBhUUFxY2Nz4BNTQmJyYGFxYVFAYnJj4CAQYWMzIWFRQWFxY2NTQmJyYGAqAWCRAI FyBYLBwOBAwcJAYIRj0ocv6yZml/D4ySAVlqNR4zOxAMAxIKDmROKQQGKhE/jkVPXE8rhCdKTzUZ LyV1U19HHFggKDAwIRpNEQc4EAkEFCkBLBUXIh0bBQgZJEE0FhIC+AooEAcFNCArOjQUBxAmNEOL JBcQgCRwh+9ERylmMW9aFQUJBS8eLBQbDilFFQkB+RNOMjZdGw4EChVPNDgxGBsNJ1ssVEolDwIQ FUgnH0ENCwOBBxEXGw8JIxUDAYkVKR8hFRAGESEpM0QEAgQAAAABACkAaAPXApoAFABTS7AWUFhA HAACAwJoAAMBAQNcAAEAAAFNAAEBAFIEAQABAEYbQBsAAgMCaAADAQNoAAEAAAFNAAEBAFIEAQAB AEZZQA4BAA8NCwkGBQAUARMFDislMjY1NCYjNC4BIyIGByMiBhUUFjMDXjRFRzJXk1Z1thQeQFhX QWhGNDVTVY1Oh2xkQ0FXAAAAAAQAK/+pA9UDUwAIABkAJQAmADlANiYBBAE/BgECAAUBAgVZAAEA AAQBAFkABAMDBE0ABAQDUQADBANFCgkhIBsaEhEJGQoZExIHECsTFBYgNhAmIAYBIg4CFB4CMj4C NC4CEiIuATQ+ATIeARQGBcW4AQW5uf77uAE7YK1+Skp+rb+ufUtLfa4S4sBvb8Div3Bw/tABfoK5 uQEFuLgBUkp+rb+ufUtLfa6/rX5K/Itwv+LAb2/A4r9wAAAAAwAr/6kD1QNTABAAHAAdAC9ALB0B AgE/BAEAAAMCAANZAAIBAQJNAAICAVEAAQIBRQEAGBcSEQkIABABEAUOKwEiDgIUHgIyPgI0LgIS Ii4BND4BMh4BFAYFAgBgrX5KSn6tv659S0t9rhLiwG9vwOK/cHD+0ANTSn6tv659S0t9rr+tfkr8 i3C/4sBvb8Div3AAAAMAQP/AA8ADQAAHAA8ANgBJQEYUAQQCLygfHgQFBAJAAAQCBQIEBWYHAQUG AgUGZAAGAwIGA2QAAQACBAECWQADAAADTQADAwBSAAADAEYVFS4YExMTEAgWKwQgABAAIAAQACAG EBYgNhAHJy4BDwEjBg8BBhQXFh8BHgQzMj8BERQWMjY1ERcWMzY3NjQCuf6O/vkBBwFyAQf+3/7C 4eEBPuHKngcTCQEBBgKgCQkBAgICBAMEAwINCWgTGhNpCQ4NCQpAAQcBcgEH/vn+jgI54f7C4eEB PmmgBwQEAQMDnwkbCQIBAgEBAQEBCmf+zw0TEw0BM2oKAQgKGgAAAAABAEj/4AO/Ax4AUAAlQCJQ OAQABAI+AwECAQJoAAEBAFEAAAALAEJHRkVDKikUEgQOKwEmBg8BJicuAQYHDgEXHgEXHgEzMjY3 PgU3NiYnJg4BBwYHDgIiJicuAScmNz4BFhceARcnJgYHBhQeAR8BFjsBFzI+Az8BNiYnA6sMGAQZ LVhb385FMikLDFVEN4FDYrM8CREODAsIAwMODQgRCwIQLyNeaW5tLjlIChVYOq+9Tio/Em4NGAUC BQkGogYGAwIECAYGBQE6BAsNAn8FCw1FZEJEGVZbQp9TUo4yKSpWUAwZGhscHA8NFgMCBgwJSj0u QR4kIit3RpB1TEoWOSBVMisFCwwGDQsJAz8CAQIEBQcEoQwYBQAAAAMBogAAAmIDAAAHABUAHQB4 S7ALUFhAIAAAAAECAAFZAAIAAwQCA1kABAUFBE0ABAQFUQAFBAVFG0uwFlBYQBoAAgADBAIDWQAE AAUEBVUAAQEAUQAAAAoBQhtAIAAAAAECAAFZAAIAAwQCA1kABAUFBE0ABAQFUQAFBAVFWVm3ExUl IxMSBhQrADQ2MhYUBiIHNDYzMh4BFRQGIyIuARA0NjIWFAYiAaI4Tzk5Tzg4KBosGjknGi0ZOE85 OU8CeFA4OFA4wCg4GiwaKDgaLP7SUDg4UDgAAAQAQP/AA8ADQAAVACYAMgA+AExASQABAAFoAgoC AAADBAADWgsBBAkBBwYEB1kIAQYFBQZNCAEGBgVRAAUGBUUYFgEAPDs2NTAvKikhHhYmGCYSDwwK BwQAFQEVDA4rASM1NCYjISIGHQEjIgYUFjMhMjY0JgchIgcGFREUFjMhMjY1ETQmARQGIiY1ETQ2 MhYVExQGIiY1ETQ2MhYVA6CgOCf+vyg4oA0TEw0DQA0TE439wA0KCTgoAcAoOBP+kxMaExMaE8AT GhMTGhMCoEAoODgoQBMaExMaE4AJCQ7+ICg4OCgB4A0T/kANExMNAWANExMN/qANExMNAWANExMN AAAABABA/8ADwQNAAAsAFAA0AFgAvrU4AQgMAUBLsChQWEBAAAgMBwwIB2YOAg0DAAQBBABeAwEB AWcABgAFCwYFWQALAAoJCwpZAAkADAgJDFkABwQEB00ABwcEUQ8BBAcERRtAQQAIDAcMCAdmDgIN AwAEAQQAAWYDAQEBZwAGAAULBgVZAAsACgkLClkACQAMCAkMWQAHBAQHTQAHBwRRDwEEBwRFWUAo FxUNDAEAWFdPTElGPj02NTEuKCUiHxU0FzQREAwUDRQGBAALAQsQDislIgYUFjMyPgE1NCYhIgYU FjI2NCY3ISIuAicDJy4BKwEiJjQ2OwEyFh8BEx4BMyEyFhQGJSImJzQ+ATclMjY3EzYmJy4BIyEi JjQ2MyEyHgEXFgcDDgEjAWEbJSUbER0SJgGmGyUlNSYmJf34ESAYEQI2HwISCikNExMNKSM2BB82 AhEKAggNExP+EwwTAQcOCQGyDBIBMwEFBQMHBf3WDRMTDQIqDBcUCB4GMwQ1I0AlNiURHhEbJSU2 JSU2JSANFh8RAX6zCxETGhMwI7L+gAsQExoTgBENCBAJASAQCwEgCBEFAwQTGhMHDAohMP7fITAA AAAADwBg/+ADoAMgAA8AHwArADcAQwBPAFsAZwB3AIcAlwCnALcAxwDXANRA0R0BFyYcIwMWFRcW WRsBFSQYIQMSARUSWR8BAg4BAk0ADggBDk0ACBEBCE0ADQoEDU0PCwkDAQAKBwEKWQAHBQQHTQAR IAEQAxEQWQAFDAYCBAAFBFklGiIDFBQTURkBExMKQQADAwBRHgEAAAsAQsrIubiqqJqYiYh6eGpo ERACANLPyNfK18G+uMe5xrKvqLeqt6KfmKeap5GOiJeJloJ/eId6h3JvaHdqd2NiXVxXVlFQS0pF RD8+OTgzMi0sJyYhIBkWEB8RHgoHAA8CDycOKwUjIiY9ATQ2OwEyFh0BFAYDIgYdARQWOwEyNj0B NCYjACImPQE0NjIWHQEUFiImPQE0NjIWHQEUJiImPQE0NjIWHQEUBiImPQE0NjIWHQEUBiImPQE0 NjIWHQEUJiImPQE0NjIWHQEUBSMiJj0BNDY7ATIWHQEUBhMjIiY9ATQ2OwEyFh0BFAYDIgYdARQW OwEyNj0BNCYjByMiJj0BNDY7ATIWHQEUBgUjIiY9ATQ2OwEyFh0BFAYDIgYdARQWOwEyNj0BNCYj ByMiJj0BNDY7ATIWHQEUBgGAwCg4OCjAKDg46A0TEw3ADRMTDQFtGhMTGhNtGhMTGhMTGhMTGhOT GhMTGhOTGhMTGhMTGhMTGhP+wEANExMNQA0TEzPAKDg4KMAoODjoDRMTDcANExMNQEANExMNQA0T EwHzwCg4OCjAKDg46A0TEw3ADRMTDUBADRMTDUANExMgOCjAKDg4KMAoOAFAEw3ADRMTDcANE/7g Ew1ADRMTDUANExMNYA0TEw1gDc0TDUANExMNQA1TEw2ADRMTDYANsxMNgA0TEw2ADe0TDSANExMN IA2zEw1ADRMTDUANEwFAOCjAKDg4KMAoOAFAEw3ADRMTDcANE8ATDUANExMNQA0TgDgowCg4OCjA KDgBQBMNwA0TEw3ADRPAEw1ADRMTDUANEwAFAED/wAPAA0AACwAXAC0AOABaAQhLsAtQWEA0AAUI BWgABwQBAQdeAAgJBg4DBAcIBFkNCwMDAQIBAAwBAFoADAoKDE0ADAwKUQ8BCgwKRRtLsBRQWEAu AAUIBWgABwQBAQdeDQsDAwECAQAMAQBaAAwPAQoMClUJBg4DBAQIUQAICAoEQhtLsBZQWEAvAAUI BWgABwQBBAcBZg0LAwMBAgEADAEAWgAMDwEKDApVCQYOAwQECFEACAgKBEIbQDUABQgFaAAHBAEE BwFmAAgJBg4DBAcIBFkNCwMDAQIBAAwBAFoADAoKDE0ADAwKUQ8BCgwKRVlZWUAiOzkZGFNSS0hD QTlaO1o4NzMwKickIh8cGC0ZLRUVFRAQEiskIiY1ETQ2MhYVERQGIiY1ETQ2MhYVERQBIzU0JiMh IgYdASMiBhQWMyEyNjQmJTQ2MyEyHgEdASEBISImNRE0PgEzMhYVERQWMyEyNjURND4CMh4CFREU BgJtGhMTGhPTGhMTGhMB4KA4J/6/KDigDRMTDQNADRMT/ZMTDQFBCA8I/oABoP5AKDgJDgkNExMN AcANEwUJDA0MCAU4gBMNAWANExMN/qANExMNAWANExMN/qANAg1AKDg4KEATGhMTGhNADRMIDwlA /SA4KAHgCQ8IEg7+IA0TEw0B3wcMCAUFCAwH/iEoOAAAAwAg/+AD4ANBACUAKwBCAEhARUI9Hh0U CwYCCAFAAAIIBggCBmYAAAAIAgAIWQAGAAMEBgNZBwUJAwQEAVEAAQELAUImJkA/Ojg0Mi8tJism Kx8mOxIKEisJASYiBwEOAR4BPwERFBYzITI2NREXHgEzMj4CPwE+AjQuAgE1NDIdASUUKwE1NCYj Ig4BHQEjIiY1EQE2MhcBA9T+ahpIGv5qCgMQGgoNRSgCgCUuDAQKBgMFBgUCBAIDAgIDBP4JQAFA E+0yLh8tFNMPHgFJCRsJAUoB6wFBFRX+vwgaFQMIC/58KDg1KwGCCQMEAQIDAgQDBwcHBwYG/jex Dg6xICCxHy8YIhSxFQsBtgEEBwf++wAAAwBB/8ADwQNAAAgAEQBCAFZAUyYBBAYBQAAFAAYEBQZZ AAQACQgECVkACAAHAAgHWQsCCgMAAQEATQsCCgMAAAFRAwEBAAFFCgkBADs5NTIvLCIfHBkVEw4N CREKEQUEAAgBCAwOKyUiBhQWMjY0JiEiBhQWMjY0JhMmIyEnLgIrASIGFBY7ATIeAhUXEx4DMyEy NjQmIyEiLgEvASUyPgI3EzYmAWEaJiY1JSUBpRomJjUlJW0ZJv1/AgMbKRcoDRMTDSgFCwgGHzYD EBkgEQIIDRMTDf34Bw0IAQUB+xEgGRACMwMNQCU1JiY1JSU1JiY1JQKEHA0XJhYTGhMECAsFs/6C ER8WDRMaEwcNByYfDRYeEQEgFysAAAACAB//4APiA0EAIwAvAC5AKxQLAgIAAUADAQIABQACBWYA AAAFBAAFWQAEBAFRAAEBCwFCIxghGDsSBhQrCQEmIgcBDgEeAT8BERQWMyEyNjURFx4DMhYzMjY3 PgEuAQEVIzU0NjMyHgIVA9b+ZxpIGv5qCgMQGgsNRCgCgCYuDgIDAwQDAwIHDgQEBAIG/oXAMi4Y JhYMAewBQBUV/r8IGhUDCAv+fCg4NSsBhQwBAgECAQcGBQwMDP57Q7MfLg0XGg8ABQBA/+ADwAMg AAsAOQBFAFEAlgCWQJNqXQIKC2tcAgMKAkAABg0JDQYJZgADCg8KAw9mAA8MCg8MZBMBDAQKDARk AA0ADggNDlkACREBCAEJCFkAAQAACwEAWQALEgEKAwsKWQAFBQdRAAcHCkEABAQCURABAgILAkJT UkhGPDoODJSTiIZjYVKWU5ZOS0ZRSFFCPzpFPEU0MSopJCEcGRQTDDkOORUQFBArEiImPQE0NjIW HQEUASEiJj0BNDYyFh0BFBYzITI2NRE0JiMhIgYdARQGIiY9ATQ+AjMhMhYVERQGASMiJjQ2OwEy FhQGAyMiJjQ2OwEyFhQGFyIuAicmNjc2NzUuATU0MzIeAxUUBxUeBBceAQ4BJy4CJy4CPQE0Njc2 NTQmIyIGFRQWFxYdARQGBwYHBq0aExMaEwKg/YAoOBMaExMNAoANExMN/YANExMaEw8aJBMCgCg4 OP04YA0TEw1gDRMTDWANExMNYA0TE3IFCggGAgMODWFHMi7ALkYpGgl/EzElKg0GDQ4GFg0RLGEc CA4IBwZyPERFOycsDRIMMIsEASATDaANExMNoA3+rTgnQQ0TEw1BDRITDQKADRMLBi8NExMNLxAe Fg04KP2AKDgCQBMaExMaE/6gExoTExoTYQQGCQYNFgMXCBQrgWLAFyU1Mh2rZBQCCAcJAgIDFhoO AwQJEAIBCQ4IQQgNBVKTRTs7RVlrIgkQQQwTAQIdAQAAAAQAYP/AA6ADQAALABsAKwBNAEtASAAJ AAcDCQdZAAMIBgsDBAEDBFkAAQAABQEAWQAFAgIFTQAFBQJRCgECBQJFHRwODENBOzo1My0sJSIc Kx0qFhMMGw4bFRAMECskIiY9ATQ2MhYdARQFISImNRE0NjMhMhYVERQGASIGFREUFjMhMjY1ETQm IyoBJj0BNC4BIyIGHQEUBiImPQE0PgEzMh4GHQEUAg0aExMaEwEg/YAoODgoAoAoODj9WA0TEw0C gA0TEw1TGhM7WS5KdBMaE0xyQBcvLCskHxYMgBMNYA0TEw1gDdM4KAFgKDg4KP6gKDgB4BMN/qAN ExMNAWANExMNgjRZMWlVgg0TEw2CTHc7ChIaISkuNRuCDQAAAAIAYP/gA6ADIAAPADABNEuwC1BY QBgrAQUGIBICAgUbGAIDAgNAEQEFHgECAj8bS7AMUFhAEysgEhEEAgYbGAIBAgJAHgECAT8bQBgr AQUGIBICAgUbGAIDAgNAEQEFHgECAj9ZWUuwClBYQCwABgcFBwZeAAUCBwUCZAACAwcCA2QABwcA UQgBAAAKQQQBAwMBUQABAQsBQhtLsAtQWEAtAAYHBQcGBWYABQIHBQJkAAIDBwIDZAAHBwBRCAEA AApBBAEDAwFRAAEBCwFCG0uwDFBYQCEABgcCBwYCZgAHBwBRCAEAAApBBQQDAwICAVEAAQELAUIb QC0ABgcFBwYFZgAFAgcFAmQAAgMHAgNkAAcHAFEIAQAACkEEAQMDAVEAAQELAUJZWVlAFgIALi0p KCIhHRwaGRUUCgcADwIPCQ4rASEiBhURFBYzITI2NRE0JgMBFQYHIg4BBwYiLwEiNSYnNSMnLgE2 NzYWHwE3NjIeAQNA/YAoODgoAoAoODiR/wACBAEBAgEGDAYCAQYBAX4GBAUGCRsJZ+oJGxIBAyA4 KP2AKDg4KAKAKDj+qv79AQICAQEBAgICAQMBAYEGERAHCQEJauwJExoAAAAAAwBg/+ADoAMgACAA MABAATxLsAtQWEAaIAACAQAEAQIBGw0CAwIVEQIEAwRAHAECAT8bS7AMUFhAFyAAAgEABAECARsV EQ0EBAIDQBwBAgE/G0AaIAACAQAEAQIBGw0CAwIVEQIEAwRAHAECAT9ZWUuwC1BYQDwAAAgBCAAB ZgABAggBAmQAAgMIAgNkBQEDBAgDBGQABAkIBAlkCwEICAdRAAcHCkEACQkGUgoBBgYLBkIbS7AM UFhANgAACAEIAAFmAAECCAECZAMBAgQIAgRkBQEECQgECWQLAQgIB1EABwcKQQAJCQZSCgEGBgsG QhtAPAAACAEIAAFmAAECCAECZAACAwgCA2QFAQMECAMEZAAECQgECWQLAQgIB1EABwcKQQAJCQZS CgEGBgsGQllZQBgyMSMhOjcxQDI/KyghMCMwFCITFBQRDBQrASYiDwEnLgEGFB8BMxUWFzMXFjMy Nz4CMzY3NQE2JicTISImNRE0NjMhMhYVERQGASIGFREUFjMhMjY1ETQmIwLXCRsJ6mcJGxMJfgEB BAIDBgYHBQECAQEEAgEACgEJaf2AKDg4KAKAKDg4/VgNExMNAoANExMNAfYKCexqCQETGgqBAQED AwICAQEBAgIBAQMJGgr96TgoAoAoODgo/YAoOAMAEw39gA0TEw0CgA0TAAACAED/wgPAAz4AGAA0 AEFAPgcBBQYCBgUCZgQIAgIDBgIDZAAAAAYFAAZZAAMBAQNNAAMDAVIAAQMBRhoZMS8sKygmIyEe HRk0GjQsEgkQKwEuASIGBw4CFRQWFx4CMzI+AjU0LgEDIxUUBiImPQEjIiY0NjsBNTQ2MhYdATMy FhQGAz1Ao7SjQCo7HkQ/KmZxPFqjf0QeO4fAExoTwA0TEw3AExoTwA0TEwK7QENDQCplcTtZoz8q Ox5Df6NZO3Fl/s/ADRMTDcATGhPADRMTDcATGhMAAAABAH8A3wOBAnsAHwAdQBoUDQIBAAFAAwEA PgAAAQBoAgEBAV8kLhEDESsJASM1JgcGBwEOARQWFx4CMzI3CQEWMzI2Nz4CLgEDd/6eARIVBAL+ ogUFBQUDBwgEDgkBSAFMCg0GDAUDBQEBBQEXAV8BEQ0CA/6fBQwMDAQDBAIJAUv+tgkFBQMKCQoJ AAMAQP/CA8ADPgASACUAQQCSS7AKUFhANgAFAgQCBV4GCgIEBwIEB2QJAQcIAgcIZAAIAwMIXAAB AAIFAQJZAAMAAANNAAMDAFIAAAMARhtAOAAFAgQCBQRmBgoCBAcCBAdkCQEHCAIHCGQACAMCCANk AAEAAgUBAlkAAwAAA00AAwMAUgAAAwBGWUAWJyY+PDk4NTMwLisqJkEnQScXGhALEisEIi4CNTQ+ ATc+ATIeAhQOAQIiDgIUHgIzMj4BNz4BNC4BEyM1NCYiBh0BIyIGFBY7ARUUFjI2PQEzMjY0JgJa tKN/RB47KkCjtKN/RER/sJqMbTo6bYxNM2FXJTY6Om0HwBMaE8ANExMNwBMaE8ANExM+Q3+jWTtx ZSpAQ0N/o7KjfwL5OmyLmotsOhoyJDaMmYts/tzADRMTDcATGhPADRMTDcATGhMABAAfACED3wLf AFIAbgB2AH4Av0uwFFBYQEQABgsFCwYFZgoBCA0OCQheAAMAAgsDAlkACwwHEAMFDQsFWQANAA4J DQ5ZAAkBAAlNAAEABAABBFcACQkAUg8BAAkARhtARQAGCwULBgVmCgEIDQ4NCA5mAAMAAgsDAlkA CwwHEAMFDQsFWQANAA4JDQ5ZAAkBAAlNAAEABAABBFcACQkAUg8BAAkARllAKFRTAQB+fXp5dnVy cWtpZmViYF1bWFdTblRuUE9CQD06JSIAUgFSEQ4rNyMuAjc+ARcWFxYGBw4BJicuAScmBgcGHgIX Fj4BNz4BMyEyHgIXHgE3PgE3NicuAScuAQcGBwYrASImNDY7ATY3NhYXFgcOAQcGJicjDgETIzU0 JiIGHQEjIgYUFjsBFRQWMjY9ATMyNjQmJDQ2MhYUBiIGNDYyFhQGIs0LNVAmCAx9UTczCAUKBxEQ BRIcDS9cCgUOHyoXGjMpDgMRCwEsBQoIBgIWSSgWKA4jDQYhGRYwFh0fCRHtDRMTDdwtNFCDDw4o FUMqPWke/BthOSATGhMgDRMTDSATGhMgDRMTAZMmNCYmNKYmNCYmNCEFZKVhlsAHBUcLGggFAgcH GRgBBJ96PW9MLwICJ040Cw0DBwgGUFsFAiwmW3w8aycjIwIDLg4TGhM5BQnAlItpOEEEBmVfWmUB nyANExMNIBMaEyANExMNIBMaEyY0JiY0Jlo0JiY0JgAAAAIAQP/AA8ADQAAtADsALkArBAEGAwAF AQIDAAJZBAEGAwAAA1EAAwADRQEANzUvLiYjIR4YFQAtAS0HDisBIz4CJy4BJy4BDgEHDgIHBgcO ASsBIg4BFREUFjsBMh4BOwEyPgESNTQuASAiBhURFB4BMzI2NRE0A2C9BwwGBQUyJg4dGhcIDBQL CBELFEsOWgkOCRMNVwhKbTLYIUcfOR4s/PcaEwkOCQ0TAgARO0wmLUENBQMECwgMLiQiRhMiLwkO Cf5ADRMgIBozAWwmGi0aEw3+QAkOCRMNAcANAAAAAwBC/8IDvgM+ABIAHgAmADZAMwYBAAAFBAAF WQAEAAMCBANZAAIBAQJNAAICAVEAAQIBRQEAJCMgHxwbFhULCgASARIHDisBIg4DFRQeAjI+AjQu AgMUBiImNRE0NjIWFSYiJjQ2MhYUAgBJiG1TLUd3pbald0dHd6U7ExoTExoTDCgcHCgcAz4tU22I SVuld0dHd6W2pXdH/WINExMNASANExMNYBwoHBwoAAQAQv/CA74DPgAXACMAKwA3AEJAPwABAAIE AQJZAAQABQcEBVkABwAGAwcGWQADAAADTQADAwBRCAEAAwBFAQAzMi0sKyonJh8eGRgNCwAXARcJ DisFIi4CNTQ+BDMyHgIVFA4EEiIOARQeATI+ATQmBDQ2MhYUBiISIiY1ETQ2MhYVERQCAFuld0cg OlJicz1bpXdHIDpSYnMr0LBmZrDQsGZm/rgcKBwcKCEaExMaEz5Hd6VbPXNiUjogR3elWz1zYlI6 IAM8ZrDQsGZmsNCwXCgcHCgc/mATDQEgDRMTDf7gDQAAAAABAEH/wAPAAzoAOgBHQEQpAQQDKCIC AAECQCoBBT4ABQIFaAYBAAEAaQACAAMEAgNZAAQBAQRNAAQEAVEAAQQBRQEALi0lIx0bFhQIBwA6 AToHDisFIiYnLgE1EQYHBgcGJjc+Ajc+ATMyHgEVFAYjIg4DBzYzMhYdAQkBFRQGIiY9ATQ2FwEW FAcBBgIgAwYDCQvDohgNEigFAgstHkXHewkOCRMNRHhRRCYQttENEwE0/swTGhMpDwGACAn+gAlA AQEEEAoBHwlxEQsQFhcOLHEwbXIJDgkNEyo+V0knbxMN7gFKAU8rDRMTDX0VEBD+YAkZCf5jCgAA AAACAED/wAPAA0AABwBMAKJADUM8MwMICR0cAgMCAkBLsApQWEA0CgEICQcJCAdmBQEDAgQEA14A AAAJCAAJWQsBBwYMAgIDBwJZAAQBAQRNAAQEAVIAAQQBRhtANQoBCAkHCQgHZgUBAwIEAgMEZgAA AAkIAAlZCwEHBgwCAgMHAlkABAEBBE0ABAQBUgABBAFGWUAcCQhLSUZEPz4yMCclJCIXFRIRDgwI TAlMExANECsAIAAQACAAEAUyFhQGKwEVFAYiJj0BIyIuAy8BLgE1NDY7ATUjIi4FNTQ2OwE1JyY2 Nz4BFh8BNzYyHgEPARUzMhYUBisBFQK5/o7++QEHAXIBB/7BDRMTDWETGhNfAwcFBgQCAgIBEw1f XwQHBgYEAwITDV92CgEJBhEQBmxlChoTAQp2YQ0TEw1hA0D++f6O/vkBBwFy+RMaE18NExMNXwED AwUCBgIHAw0TQAIDBAYGBwQNExR2ChoKBgQEBmxrChIaCnwPExoTQAAAAAADAED/wAPAA0AABwAP AEoAaUBmKyEXAwUGAUAHAQYDBQMGBWYADAsCCwwCZgAAAAMGAANZCAEFCQ8CBAoFBFoOAQoNAQsM CgtZAAIBAQJNAAICAVEAAQIBRREQSUdEQj8+Ozk2NDMxLiwkIx4dFhQQShFKExMTEBASKwAgABAA IAAQACAmEDYgFhAnMjY0JisBNTc2JicuASIGDwEnJiIHDgIWHwEVIyIGFBY7ARUjIgYUFjsBFRQW MjY9ATMyNjQmKwE1Arn+jv75AQcBcgEH/t/+wuHhAT7h/w0TEw1hdwkBCQUMDAwEZmsKGgoEBQEF BXZfDRMTDV9fDRMTDV8TGhNhDRMTDWEDQP75/o7++QEHAXL9x+EBPuHh/sKfExoTD3wKGgkFBAUF a2wJCQUMDAwFdhQTGhNAExoTXw0TEw1fExoTQAAAAwCg/8ADYAM+AA8AGwBGAJ+2RDUCBwUBQEuw ClBYQDcAAQIBaAYBBAIDAgQDZgoBAAMFAwAFZgAFBwcFXAACAAMAAgNZCQEHCAgHTQkBBwcIUgAI BwhGG0A4AAECAWgGAQQCAwIEA2YKAQADBQMABWYABQcDBQdkAAIAAwACA1kJAQcICAdNCQEHBwhS AAgHCEZZQBoBAENBPjs4Ni4tKCYgHxcWERAJBwAPAQ8LDislIiY1ETQ+ATMyFhURFAcGAiIGFREU FjI2NRE0EzU0JiIGHQEUDgEjIiY9ATQmIgYdARQeARcVIyIGFBYzITI2NCYrATU+AQIAT3EzWTRP cUU2EGpLS2pL4BMaE02FTnepExoTVZNYwA0TEw0BwA0TEw3Ah7m+cU8BADRZM3FP/wBZOiwCP0s1 /wA1S0s1AQA1/u2ADRMTDYBPhU6qeIANExMNgFqdYgg/ExoTExoTPw3KAAACAKD/wANgAz4ACwA2 AHW2NCUCBQMBQEuwClBYQCoEAQIBAAECAGYAAwAFBQNeAAEAAAMBAFkHAQUGBgVNBwEFBQZSAAYF BkYbQCsEAQIBAAECAGYAAwAFAAMFZgABAAADAQBZBwEFBgYFTQcBBQUGUgAGBQZGWUAKIzMoFSYY FRAIFiskMjY1ETQmIgYVERQlNTQmIgYdARQOASMiJj0BNCYiBh0BFB4BFxUjIgYUFjMhMjY0JisB NT4BAbGecXGecQIgExoTTYVOd6kTGhNVk1jADRMTDQHADRMTDcCHub5xTwEAT3FxT/8AT3GADRMT DYBPhU6qeIANExMNgFqdYgg/ExoTExoTPw3KAAAAAAQAf//AA4EDQAAqAD4ATABaAHdAdAsBAQcY AQgDIQEECQIBCwAEQAACDQEGBwIGWQAHAAEDBwFZAAMACAkDCFkACQAEAAkEWQwBAAALCgALWQ4B CgUFCk0OAQoKBVEABQoFRU5NLCsBAFVTTVpOWkdFQkE1Mys+LD4nJiAeGxkSEQ4MACoBKg8OKyUi ByU+AzU0JyUWMzI2NCYiBhUUFhcFJiMiBhQWMzI3BQYVFBYyNjQmAzIWFRQOAyMiJjU0PgUBNDYy FhQGIyIuBAEiJjU0PgEzMhYVFA4BAwE2Jf7KBAUEAgYBMSUwNUtLaksEBP7SJjQ1S0s1JiABQQVL aktLNxslBgwQEwsaJgQGCQsMD/3HJjUlJRsJEA4MCAUCQhslER0SGiYRHsAmrAcNDw8IERO9IUtq S0s1ChUKvCVLaksVsxIQNUtLaksCQCYaChQQDAYlGwcPDAwIBwP+gBslJTUmBQgMDhD+iSYaEh0R JRsRHRIAAAAFAD//wAO/A0AAFQAoAEUAVQBlAFxAWQAFBwYHBQZmAAEMAQIIAQJZCgEICQEHBQgH WQAGDQEEAwYEWQADAAADTQADAwBRCwEAAwBFKikXFgEAYV9XVk9NR0Y7OTMyKUUqRR0cFigXKAkI ABUBFQ4OKwUiLgI0PgIyHgIVFA4GAyIOARQeATI+ATU0LgYDIiYnJjY3PgIyHgIXHgEzMjY3PgEe AQcOAgIiLgE9ATQ2MzIeAR0BFAYEIiY9ATQ+AzMyFh0BFAH/W6Z4R0d4prameEcSIjE9SFBYLmix Z2ex0LFnEB0qMz9ETCZDdykIAwsCBwcHBwYGAiFcNDVdIAgaFQQJG0hUsBoWDRwUDRYNDQERKBwF CQwOCBQcQEd4prameEdHeKZbLllPSTwxIhIDQGex0LFnZ7FoJ0xEPzMqHRD9ezo0CxoIAgQBAgME AyktLSoLAxAaCyMzGgECDRYNQBQcDRYNQA0WDRwUQAgODAkFHBRAFAAAAQBA/8ADvgNAACIAGEAV HxUQAwEAAUAAAAEAaAABAV8+JwIQKwEuAiclAyYjIgcDBQ4BHwEDBhY/ARcWOwEyNjU0JwM3PgED vQIHCgb+8XgJFBUIev7xEw0OxC8DIRHy8gcIAQ0TAi3FBgQB7AUJBgEqAQMSEv7+KQMlDsr+4xQX CoWGBBMNBgUBF8kHEQAAAQBA/8ADvQNAAEwAKEAlRzUvLiomIh4QAwoAAQFAAAEAAWgDAgIAAF8A AABMAEw/PTYEDysFJi8BBw4BKwEiLgInJjcTJyY3PgI/ATYeAQYPARcWDwE3Nh8BJyY/AScuAS8B LgMvAQcOAS4BNxM2MzIWFxMFHgEPARMWBgcGAv8JBvL2AgQCBQIEBQQBEQMvxA4GAggKBZwNFQUQ DV+mCwMnyA8QxyYDDKThAgUCBAIDAwIBZGQFGRgJBYIIFQkQBHgBDxMMDcUuAQcICEABA4aHAQEB AQMBCxQBHcoOEgYJBgEaAxAaFQMQqgwQ624ICW7sEAupIgEBAQIBAwQDAtXUDAkLGQwBEhIKCP79 KgMlDsn+4wkRBQYAAAACAED/wAPAA0AABwAZADNAMAAEAwIDBAJmAAAAAwQAA1kFAQIBAQJNBQEC AgFRAAECAUUKCBYUERAIGQoZExAGECsAIAAQACAAEAUjIi4BNRE0NjIWHQEzMhYUBgK5/o7++QEH AXIBB/7fvwkOCRMaE58OEhIDQP75/o7++QEHAXL5CQ4JAP8NExMN3xMaEwADAED/wAPAA0AABwAT ACgAPEA5AAUDBAMFBGYAAAADBQADWQcBBAAGAgQGWgACAQECTQACAgFRAAECAUUVFCUiGxkUKBUo FRMTEAgSKwAgABAAIAAQACIuATQ+ATIeARQGAyM1NC4BIyIOAhURFBY7ATI2NCYCuf6O/vkBBwFy AQf+qNCxZ2ex0LFnZ3mgCQ4JBwsJBRMNwA0TEwNA/vn+jv75AQcBcv3HZ7HQsWdnsdCxARngCQ4J BQkMBv8ADRMTGhMAAwBg/+QDwAMcABcAPwBZAEVAQgUIAgQBBgEEBmYJAQYAAQYAZAACAAEEAgFZ AAMDCkEHAQAACwBCQUAZGAEAQFlBWRsaGD8ZPxEPDQsGBAAXARcKDisFIiYvASMiJj0BNDY7ATc2 MzIeARURFAY3IyciJicuAT8BPgI1NC4BJyYnJjY3PgEWFx4BFx4CFRQOAQ8BBhciJy4BNz4CNTQm JyY2Nz4BFhceARQGBwYCDg8jE7ZTKDg4KFO2JSANFRAejggEAgMCCwQIDBYUFBITFAoHCAQLBxEQ BQMHBhcXGBoYGAwKXAwJCgEIJjAmQjoIAQoHERAGP0xMPwocExK3OCjAKDi3JQscFf1AHx3CAgIC BxsKEh0gOh8hNx4bDQoKGwcFAgcHBQkHHyVKKilMJyARDW0ICRoKK0dpN1CAQgoaCQYDBQdJlbyV SQsAAAAABABg/+QDwAMcABcAKQBRAGsAYEBdJAECAyMBAAgCQAcLAgYBCAEGCGYMAQgAAQgAZAAC CgEEBQIEWQAFAAEGBQFZAAMDCkEJAQAACwBCU1IrKhkYAQBSa1NrLSwqUStRIR4YKRkoEQ8NCwYE ABcBFw0OKwUiJi8BIyImPQE0NjsBNzYzMh4BFREUBgEiBh0BFBY7ATIfAREGDwEGIwEjJyImJy4B PwE+AjU0LgEnJicmNjc+ARYXHgEXHgIVFA4BDwEGFyInLgE3PgI1NCYnJjY3PgEWFx4BFAYHBgIO DyMTtlMoODgoU7YlIA0VEB7+ng0TEw1gDQrJBQTACg0BkAgEAgMCCwQIDBYUFBITFAoHCAQLBxEQ BQMHBhcXGBoYGAwKXAwJCgEIJjAmQjoIAQoHERAGP0xMPwocExK3OCjAKDi3JQscFf1AHx0CHBMN wA0TCckCpAQFwAn+pgICAgcbChIdIDofITceGw0KChsHBQIHBwUJBx8lSiopTCcgEQ1tCAkaCitH aTdQgEIKGgkGAwUHSZW8lUkLAAQAQAAAA8ADAAAHABgAKABrAOlLsAtQWEA8Bw4CBgsFCwYFZgAD DQEEAAMEWQAJAAoBCQpZAAAAAQgAAVkACAALBggLWQAFAgIFTQAFBQJRDAECBQJFG0uwFlBYQDYH DgIGCwULBgVmAAkACgEJClkAAAABCAABWQAIAAsGCAtZAAUMAQIFAlUNAQQEA1EAAwMKBEIbQDwH DgIGCwULBgVmAAMNAQQAAwRZAAkACgEJClkAAAABCAABWQAIAAsGCAtZAAUCAgVNAAUFAlEMAQIF AkVZWUAkKykaGQoIZmNPTUpIODYtLClrK2siHxkoGicTEAgYChgTEg8QKwA0NjIWFAYiASEiLgE1 ETQ2MyEyFhURFAYBIgYVERQWMyEyNjURNCYjASMiJiMuATc+BRcWFx4CNz4ENz4EMzIWFAYjIg4C Bw4FBw4BLgEnLgMrASIOAgcGAQAmNCYmNAIl/WofNx9FMAKWMEVF/ToWHx8WApYWHx8W/ZUEAQMC DAwDAgkVHic2HSM5GBcwDwYKCAgGBQgLHSE6JA0TEw0cJRkOCgUGDA0SGQ8aGy0VEw0NFhMJARYq HhQGBgHmNCYmNCb+QB83HwIWMEVFMP3qMEUCwB8W/eoWHx8WAhYWH/2/AQQYDAcVMCoqGQEBEQcG BgUBBwoSEw8aHTEbFhMaEw0hIB4QER0SFAwCAgIIBgYDBAUDHzAqERcAAwBA/+ADwAL/ADkAPwBG AFJATwkBAAFAPQIDCC8gAgQDA0AAAQABaAcBAwgECAMEZgIKAgAJAQgDAAhYBgEEBAVRAAUFCwVC AQBDQjs6NTMuLCkmIyEcGhYUDgsAOQE5Cw4rASM2PQE0JjQmJzQmIyEiBgcGFRQXIyIGFRQWOwE3 HgEXFSMiBhQWMyEyNjQmKwE1PgE3FzMyNjU0JgUzFhcuAQU2NzMOAgOgYwMBAQETDP3FDRIBAwNj DRNrVQMCJ3JCgA0TEw0BQA0TEw2AQnIoAQNVaxP81UgLFCk3Ao4UC0gFGywCYCUeCwYNDQ0HDBER DCMcHiUTDWN9AVFlCoETGhMTGhOBCmVRAX1jDRNAQzsIQ0s6RCI1IQAEAED/4APAAv8AOQA/AEsA UgBgQF0JAQoBTD0CAwgvIAIECQNABwEDCAkIAwlmAAkECAkEZAABAAoAAQpXAgwCAAsBCAMACFcG AQQEBVIABQULBUIBAE9OR0ZBQDs6NTMuLCkmIyEcGhYUDgsAOQE5DQ4rASM2PQE0JjQmJzQmIyEi BgcGFRQXIyIGFRQWOwE3HgEXFSMiBhQWMyEyNjQmKwE1PgE3FzMyNjU0JgUzFhcuAQAiLgE1NDch FhUUBjc2NzMOAgOgYwMBAQETDP3FDRIBAwNjDRNrVQMCJ3JCgA0TEw0BQA0TEw2AQnIoAQNVaxP8 1UgLFCk3AbuIdkYBAf4BRl0UC0gFGywCYCUeCwYNDQ0HDBERDCMcHiUTDWN9AVFlCoETGhMTGhOB CmVRAX1jDRNAQzsIQ/7ye9B5Dg4PDXnQSDpEIjUhAAIAoP/AA2ADQAAhACkAorYfCAIBBgFAS7AK UFhAKAAGBwEBBl4AAwICA10AAAAHBgAHWQUBAQICAU0FAQEBAlIEAQIBAkYbS7AUUFhAKQAGBwEH BgFmAAMCAgNdAAAABwYAB1kFAQECAgFNBQEBAQJSBAECAQJGG0AoAAYHAQcGAWYAAwIDaQAAAAcG AAdZBQEBAgIBTQUBAQECUgQBAgECRllZQAoTFCMjEyMmEggWKwE0JiAGFRQWFxUjIgYUFjsBFRQW MjY9ATMyNjQmKwE1PgEGIiY0NjIWFANgzv7czrmHgA0TEw2AExoTgA0TEw2Ah7np7qmp7qkB4JLO zpKJyQxCExoTIA0TEw0gExoTQgzJl6nuqanuAAAAAgBg/+ADoAMgACwANACKQBkNDAoJBwUDBwAB AAECACQBAwIjGAIFBwRAS7AgUFhAKgAFBwYHBQZmAAMABwUDB1kAAAAKQQACAgFRAAEBCkEABgYE UQAEBAsEQhtALQAAAQIBAAJmAAUHBgcFBmYAAwAHBQMHWQACAgFRAAEBCkEABgYEUQAEBAsEQllA ChMXGBMiIz0RCBYrATQjNSYnNCc0LwEmLwEuASsBIgYUFjsBByYjIgYQFiA2NTQnNxUUFjI2PQE0 AhQGIiY0NjIDnwEBAwEBAQEEBQMHA+ANExMNi5hedZLOzgEkzl6eExoTwKnuqanuAwcBAwIEAQEB AQEBAwMBAhMaE4dHzv7czs6SiWWLeQ0TEw3AAf627qmp7qkAAAMAQP/AA8ADQAAHAA8ALQBIQEUR AQUGAUAABwIGAgcGZgAGBQIGBWQABQQCBQRkAAQDAgQDZAABAAIHAQJZAAMAAANNAAMDAFIAAAMA RiQjJhgTExMQCBYrBCAAEAAgABAAIAYQFiA2EAUXFh8BFjI3PgEmLwEhMjY0JiMhNzY0JiMiBg8B BgK5/o7++QEHAXIBB/7f/sLh4QE+4f2iAQIEnwoaCgYEBAZoATEOEhIO/s5qCRIOBgwEoQ9AAQcB cgEH/vn+jgI54f7C4eEBPqsBBgSfCgoGEBEGZxMbEmkKGhMFBJ8PAAADAEAAAAPAAwAAFQAdAEIA 4kuwC1BYQC4ABgIDAgZeAAMFAgMFZAAFBAIFBGQHAQAAAgYAAlkABAEBBE0ABAQBUgABBAFGG0uw FFBYQCgABgIDAgZeAAMFAgMFZAAFBAIFBGQABAABBAFWAAICAFEHAQAACgJCG0uwFlBYQCkABgID AgYDZgADBQIDBWQABQQCBQRkAAQAAQQBVgACAgBRBwEAAAoCQhtALwAGAgMCBgNmAAMFAgMFZAAF BAIFBGQHAQAAAgYAAlkABAEBBE0ABAQBUgABBAFGWVlZQBQCAD89Ly0jIBsaFxYQDQAVAhUIDisB ISIOBhURFBYzITI2NRE0JgQyFhQGIiY0ARQGIwUiJyY3PgYzMh4CFxY3PgE3PgQzMhYVFwNL/WoM FxUTDw0JBUUwApYwRUX9ijYlJTYlAmATDf3CEQkKBQIFERMfIy4ZDhkbDw9EKg4RDAgLHCE6JA4S AgMABQkNDxMVFwz96jBFRTACFjBFoCU2JSU2/mUNEgEMDRAFDyYjKR0UAwYFBBQGAx0mGh0xGxYT DX8AAAABAIP/wAOAAzwAPQAdQBovGgIBAAFABwEAPgAAAQBoAAEBXzMxIB4CDisBLgEOARcWBy4E JyYGFxYUHgEUDgMHLgEnJicmBwYXHggVFBceATMyPgE1Ni4FAvUHExIKAQUGF0g/SB0JESQCAQIB AwUJDwkJFQsvYRUKCQ8BAwcICQkIBgQBCcuLX6NeAQ0WIBsdDQK4BgMJEQo8NCVTPDwWBwwVFQMJ HR4tKjMuMBUKEQgfBgEUFA8BBAoOFRkhJTAZAwSKv16iXzhqTUcsJwwAAQCB/8ADgANAAGQAO0A4 UzQoAwEEAwEDAQJAAAQBBGgCAQEDAWgAAwAAA00AAwMAUgUBAAMARgEATEskIx4dHBsAZAFjBg4r BSImJyY1NC4BJyY3Njc+AhYXHgEOAScuAyIGIxYXFRQWMjY1NicGBw4CJicmJy4BJxUUDgYHDgEu ATc+AjQuAT4BFhceBBc2JyY3NhYXHgQHFAcGBwIgi8sJAR4TBgwEBREJFy8zFAwKCxkMBAoKCgsL BigDqe6pBEMIJwMHCAcEDwUTgEoCAwYICw4TCwcaFgUIFx0KAwIJEBMICR1IP0gXBgUCFAkTBwcW MCUbAmJhi0C/igQDRm8gBQ0REgUCBQUFCQUZGAoGAQMCAQFOdwR3qal3ontdGwICAQEBBQ89iz0f ECYmKCgoJiQQCwUPGgsjZlVgIhQRCQEFBxY8PFMlNDwWCgQDBgcXS1aNTYxmZgcAAgAgACAD4ALg ACUALQBHQEQGAQEFFRQCAwMBGAEEAwNABAEBAT8AAQUDBQEDZgADBAUDBGQAAAAFAQAFWQAEAgIE TQAEBAJRAAIEAkUTExYaFhkGFCsBNCcmJyY1JyYkIAQHDgEVFCMUDwEVHwMWBCAkNz4BNTQzNzYE IiY0NjIWFAPgAQEBAQJC/vr+3P76QgEBAQECAQECAkIBBgEkAQZBAQIBAQL+YoReXoReAYAJAgYF AQEEkbOykQEDAQICBgsGCAcGBJGzspABBAIBCQibXoReXoQABAAgACAD4ALgACUAQgBKAFIAckBv BgEBCkJAPzIxFAIHBQEsJxUDAwUYAQkDBEAEAQEmAQUCPwABCgUKAQVmAAUDCgUDZAADCQoDCWQA AAAGBwAGWQAHAAoBBwpZAAkACAQJCFkABAICBE0ABAQCUQACBAJFUE9MSxMdJhMWFhoWGQsXKwE0 JyYnJjUnJiQgBAcOARUUIxQPARUfAxYEICQ3PgE1NDM3NicVDgEiJic1IzU0NzU+ATMyHgcXFRYV JCIGFBYyNjQGIiY0NjIWFAPgAQEBAQJC/vr+3P76QgEBAQECAQECAkIBBgEkAQZBAQIBAQJBO+X+ 5DwBATvlfxw5NjUyLyomIQ0B/qKEXl6EXnhQODhQOAGACQIGBQEBBJGzspEBAwECAgYLBggHBgSR s7KQAQQCAQkIAwKAnJyAAgMBAQGAnAgQFx8kKi81HAEDAaFehF5ehKI4UDg4UAAAAAADAED/wAPA A0AACwA+AHUAYEBdTAEFCAFAAAEMAgwBAmYAAwAMAQMMWQQOAgINCwoDCQgCCVkACAAFAAgFWQcB AAYGAE0HAQAABlEABgAGRQ0Mb2xhYFVUU1JRT05NREE4NTIwKykYFww+DT4VEA8QKzIiJjURNDYy FhURFAEjPgEnLgQnJiIGBw4CDwIOAwcOAgcjIgYVERQWOwEeAjsBMj4BEjU0JgMOASsBIi4GLwEj ETMyNzI1Mzc+Azc2NzY3NjIXHgEXFg4BBwYXFjsBMh4BFRQHBm0aExMaEwLgvQwPBwILEBYbDxMm IQoMFAoJBQQCBAUFAw40Hg1aDRMTDVcWNnE02CFHHzk+QQQpFNgSJiIhGxkTDgQEUEACBAEFAQwc Li0OEBMVDQMTDxAcBAUSDgUHCQkS6wUPDCgQEw0BwA0TEw3+QA0B7RxuNBIgHBcRBQcLCwwuJCIS EAoNEAsFFygOBBMN/kANEwwYHBozAWwmJzr+FQcOBAgJCwsJCAICAYABAQEEDRoqGRpPVQ4DBAcg Hy5pJwsQDw4JEAg16V0AAAAAAQCAAEADggJeAB4AWkALBQEBABIPAgIBAkBLsAtQWEAQAAABAGgE AQECAWgDAQICXxtLsAxQWEAQAAABAGgAAQIBaAQDAgICXxtAEAAAAQBoBAEBAgFoAwECAl9ZWbYR EhYUFwUTKwEuAQYHAScmIgYUFwUzFhcUFhcWMzY3MjYzNjcBNjQDeAYREAb+VekKGhMKAQABAQYC AQYGBwUBAgEFAgHBCQJWBgQFB/465gkTGwn9AQMBAQECAQICAwIB3wkbAAQAgP/AA74DPgAjADMA PwBLAOBLsAtQWEA5AAYBBmgABAIIAgQIZgABAAIEAQJZAAgMBwIFCggFWQAKDQEJAwoJWQADAAAD TQADAwBRCwEAAwBFG0uwFlBYQDMABgEGaAAEAggCBAhmAAgMBwIFCggFWQAKDQEJAwoJWQADCwEA AwBVAAICAVEAAQEKAkIbQDkABgEGaAAEAggCBAhmAAEAAgQBAlkACAwHAgUKCAVZAAoNAQkDCglZ AAMAAANNAAMDAFELAQADAEVZWUAkQkA2NAIASEVAS0JLPDk0PzY/LSwlJB4dGBUQDQoHACMCIw4O KwUhIiY1ETQ2MyEyFhQGIyEiBhURFBYzITI2NRE0NjIWFREUBgIiJy4BNjcBNjIXFgcGBwEHIyIm NDY7ATIWFAYXISImNDYzITIWFAYDIP3AKDg4KAHADRMTDf5ADRMTDQJADRMTGhM41xoKBgQEBgE+ ChoKEQwDAv7Cm8ANExMNwA0TE7P+gA0TEw0BgA0TE0A4KAKAKDgTGhMTDf2ADRMTDQIADRMTDf4A KDgCAAkHEBAHAT4JCRIVBAP+wgkTGhMTGhPAExoTExoTAAACAKD/wANgA0AAEgAaACFAHgAAAAMC AANZAAIBAQJNAAICAVEAAQIBRRMWORAEEisAIAYVFB4DFxY7ATI/ARI1NAAiJjQ2MhYUApL+3M5E VW8xEAkOAQ4Jbdv+4oReXoReA0DOkjWVfIk2EQoLfQEMjJL+zl6EXl6EAAAAAwCg/8ADYANAAAcA DwA2ADlANgcBBAAEaQAGAAUBBgVZAAEAAgMBAlkAAwAAA00AAwMAUQAAAwBFERAtLB4dEDYRNhMT ExAIEisAIiY0NjIWFCYiBhQWMjY0AyInJjQ3PgQ1NCYiBhUUFhcWDgEmJwI1NDYgFhUUDgMHBgJP nnFxnnGLaktLakuADQkKCR5IWUcxqe6paWMJAxUaCNvOASTORFVvMRAJASBxnnFxns9LaktLav2r CQkbCSBTdG1wJnepqXc5vXkLGhEDCgEMjJLOzpI1lXyJNhEKAAIAQv/CA74DPgATADQBC0uwC1BY QBgvAQUGJBYCAgUfHAIDAgNAFQEFIgECAj8bS7AMUFhAEy8kFhUEAgYfHAIBAgJAIgECAT8bQBgv AQUGJBYCAgUfHAIDAgNAFQEFIgECAj9ZWUuwC1BYQDUABwAGAAcGZgAGBQAGBWQABQIABQJkAAID AAIDZAQBAwEAAwFkAAAHAQBNAAAAAVEAAQABRRtLsAxQWEApAAcABgAHBmYABgIABgJkBQQDAwIB AAIBZAAABwEATQAAAAFRAAEAAUUbQDUABwAGAAcGZgAGBQAGBWQABQIABQJkAAIDAAIDZAQBAwEA AwFkAAAHAQBNAAAAAVEAAQABRVlZQAoUFhQSFBsqEAgWKwAiDgIVFB4EMzI+AjQuAQMBFQYHIg4B BwYiLwEiNSYnNSMnLgE2NzYWHwE3NjIeAQJbtqV3RyA6UmJzPVuld0dHdyn/AAIEAQECAQYMBgIB BgEBfgYEBQYJGwln6gkbEgEDPkd3pVs9c2JSOiBHd6W2pXf+0/79AQICAQEBAgICAQMBAYEGERAH CQEJauwJEhsAAwBA/8ADwANAAAcAEwA0ATRLsAtQWEAaNBQCBQQYAQYFLyECBwYpJQIIBwRAMAEG AT8bS7AMUFhAFzQUAgUEGAEGBS8pJSEECAYDQDABBgE/G0AaNBQCBQQYAQYFLyECBwYpJQIIBwRA MAEGAT9ZWUuwC1BYQD0ABAIFAgQFZgAFBgIFBmQABgcCBgdkCQEHCAIHCGQACAMCCANkAAEAAgQB AlkAAwAAA00AAwMAUgAAAwBGG0uwDFBYQDcABAIFAgQFZgAFBgIFBmQHAQYIAgYIZAkBCAMCCANk AAEAAgQBAlkAAwAAA00AAwMAUgAAAwBGG0A9AAQCBQIEBWYABQYCBQZkAAYHAgYHZAkBBwgCBwhk AAgDAggDZAABAAIEAQJZAAMAAANNAAMDAFIAAAMARllZQA0tLCITFBQWFRMTEAoXKwQgABAAIAAQ ACIOARQeATI+ATQmByYiDwEnLgEGFB8BMxUWFzMXFjMyNz4CMzY3NQE2JicCuf6O/vkBBwFyAQf+ qNCxZ2ex0LFnZ0IJGwnqZwkbEwl+AQEEAgMGBgcFAQIBAQQCAQAKAQlAAQcBcgEH/vn+jgI5Z7HQ sWdnsdCxowoJ7GoJARMaCoEBAQMDAgIBAQECAgEBAwkaCgAAAAIAQP/AA8ADQAAHACwAL0AsLCUe EAQCBAFAAAAFAQQCAARZAwECAQECTQMBAgIBUQABAgFFFB4kGBMQBhQrACAAEAAgABABHgEGBwYi LwEHBiMiJicuAjQ+AT8BJyY0NjIfATc2MhYUDwECuf6O/vkBBwFyAQf+9wYEBAYKGgqJigoNBgwE BAQCAgUDiooJExoKiYoKGhMKigNA/vn+jv75AQcBcv69BhEQBgoKiokJBQUDBwgICAgDiIoJGxMK iokJExoKiAAAAwBA/8ADwANAAAcAEwAzAD9APC0kGxQEBQQBQAAEAgUCBAVmBgEFAwIFA2QAAQAC BAECWQADAAADTQADAwBSAAADAEYwLyopGRUTExAHEysEIAAQACAAEAAiDgEUHgEyPgE0JgM3NjQm Ig8BJy4BBgcGFB8BBw4BFhcyNj8BFxYyNjQnArn+jv75AQcBcgEH/qjQsWdnsdCxZ2fsigoTGgqK iQYQEQYJCYiJCQEUDAcLBYqKChoTCUABBwFyAQf++f6OAjlnsdCxZ2ex0LH+5ogKGhMJiYkGBAQG CRsJiYgJGxIBBQWIjAkTGgoAAAAAAQCCAJ0DhAI8ABwAG0AYERACAQABQAUBAD4AAAEAaAABAV8T HgIQKwEmBwYHCQEuAQYHBhQXATMXFRYyNwE+Ay4CA3oRFgMD/rj+tAYREAYKCgFhAQEKGgkBXgME AgEBAgQCNRINAwL+tQFJBwQFBgkbCf6iAQEJCQFiAgcGBwgGBgAAAwBL/+ADtQMfAAwAGAAgAChA JQADAAUEAwVZAAICAFEAAAAKQQAEBAFRAAEBCwFCExMVFDUSBhQrJQEmIgcBBhcWMyEyNgE0NjIW FREUBiImNRYiJjQ2MhYUA6/+qyNvI/6sIhwdRwKiRzn+DxMaExMaEzQoHBwoHH8CYT8//Z8+MTBh Af8NExMN/uANExMN4BwoHBwoAAAEAEv/3wO1Ax8ADwAdACkANQBEQEEABQAEBgUEWQAGAAcDBgdZ CQECAgFRAAEBCkEAAwMAUQgBAAALAEIREAIANDMuLSUkHx4ZFhAdER0IBgAPAg8KDisFISImNwE2 MzIeAhcBFgYBIgYHAQYWMyEyNicBJgIiJjURNDYyFhURFAc0PgEyHgEVFAYiJgNR/V5HOSIBVCM4 DRkXFQgBVSI5/mgJEgj+rBEUIwKiIxQR/qsQBRoTExoTUA0WGhYNHCgcIWI+AmE/CBAYD/2fP2ED ABAO/Z4eIiIeAmIe/iETDQEgDRMTDf7gDYMNFg0NFg0UHBwAAwBAAAADwAMgABcAHwAnAHFLsChQ WEAmAAcABQUHXgAGBQQFBgRmAggCAAAFBgAFWgAEAAMEA1YAAQEKAUIbQCcABwAFAAcFZgAGBQQF BgRmAggCAAAFBgAFWgAEAAMEA1YAAQEKAUJZQBYBACUkISAdHBkYEg8KCAYDABcBFwkOKwEhNCYr ASIGFSMiBhURFBYzITI2NRE0JgAiJjQ2MhYUNiImNDYyFhQDYP6gOChAKDhgKDg4KALAKDg4/see cXGecYQoHBwoHALAKDg4KDgo/gAoODgoAgAoOP3gcZ5xcZ7PHCgcHCgAAAAFAEAAAAPAAyAABwAP ADsAQwBPAFZAUwkBBQgBBgoFBlkACgALAgoLWQABAAIDAQJZAAMAAAcDAFkABw4BBAcEVQAMDA1R AA0NCgxCEhBPTElGQ0I/PjYzMC0oJSAdGhcQOxI7ExMTEA8SKyQiJjQ2MhYUJiIGFBYyNjQTISIm NRE0NjsBMhYUBisBIgYVERQWMyEyNjURNCYjISImNDYzITIWFREUBgI0NjIWFAYiABQGKwEiJjQ2 OwEyAk+ecXGecYtqS0tqS+D9QCg4OChgDRMTDWANExMNAsANExMN/qANExMNAWAoODiIHCgcHCj+ xBMNgA0TEw2ADaBxnnFxns9LaktLav5rOCgCACg4ExoTEw3+AA0TEw0CAA0TExoTOCj+ACg4Ahwo HBwoHAENGhMTGhMAAAAEAGD/4AOgAwAAFQAdACUALQCQS7ALUFhAHwoBAAkHAgUEAAVZAwEBAgQB TQgGAgQEAlEAAgILAkIbS7AWUFhAIQMBAQIEAU0JBwIFBQBRCgEAAApBCAYCBAQCUQACAgsCQhtA HwoBAAkHAgUEAAVZAwEBAgQBTQgGAgQEAlEAAgILAkJZWUAaAgArKicmIyIfHhsaFxYQDgwLCQcA FQIVCw4rASEiBhURFBY7ARcWMj8BMzI2NRE0JgAiJjQ2MhYUFiImNDYyFhQWIiY0NjIWFANA/YAo ODgo01YKGgpW0yg4OP38KBwcKBykKBwcKBykKBwcKBwDADgo/gAoOFcJCVc4KAIAKDj+gBwoHBwo HBwoHBwoHBwoHBwoAAQAYP/gA6ADAAA2AD4ARgBOAJ+1CwEABAFAS7ALUFhAJAAFAAIIBQJZDAoC CAsJAgcBCAdZAwEBBgEEAAEEWQAAAAsAQhtLsBZQWEAmDAoCCAsJAgcBCAdZAwEBBgEEAAEEWQAC AgVRAAUFCkEAAAALAEIbQCQABQACCAUCWQwKAggLCQIHAQgHWQMBAQYBBAABBFkAAAALAEJZWUAT TEtIR0RDQD8TEiU1MzU1PBANFysEIi8BJjQ3PgEWHwE3NjsBMjY1ETQmIyEiBhURFBY7ATIWFAYr ASImNRE0NjMhMhYVERQGKwEHAiImNDYyFhQWIiY0NjIWFBYiJjQ2MhYUAg0aCmAJCQcQEAdJSQoN 4A0TEw39gA0TEw1gDRMTDWAoODgoAoAoODgo01azKBwcKBykKBwcKBykKBwcKBwgCWAKGgoGBAQG SkoJEw0CAA0TEw3+AA0TExoTOCgCACg4OCj+ACg4VwGXHCgcHCgcHCgcHCgcHCgcHCgABgCAAGAD oAKgAAsAFwAjACsAMwA7AGdAZAAGAQZoAAsFC2kAAQwBAAcBAFkABwAIAgcIWQ0BAgADCQIDWQAJ AAoECQpZDgEEBQUETQ4BBAQFUQAFBAVFGhgODAIAOzo3NjMyLy4rKicmIB0YIxojFBEMFw4XCAUA CwILDw4rASEyNjQmIyEiBhQWBSEiBhQWMyEyNjQmByEiBhQWMyEyNjQmADQ2MhYUBiIGNDYyFhQG IgY0NjIWFAYiAYACAA0TEw3+AA0TEwIN/gANExMNAgANExMN/gANExMNAgANExP88yY0JiY0JiY0 JiY0JiY0JiY0AkATGhMTGhOgExoTExoT4BMaExMaEwGGNCYmNCa6NCYmNCa6NCYmNCYAAAAABQCB /8ADgQM8ABoANgBjAIAAjABtQGpaUUYDCwgBQHEBCD4ADQANaQkBCAwBCwoIC1kOEgIKEQEHAQoH WQQBAgUBAQACAVkGEAMPBAAACwBCZWQ5NxwbAQCIh4KBe3pramSAZYBWU0VCN2M5YzU0LSonJRs2 HDYQDQoIABoBGhMOKwUiJicuBCMiJjQ2MzIeAxceAQ4BBwYzIicuATc+BDMyFhQGIyIOAwcOAiMH JyMiJy4BJy4BNz4BOwEyFz4BNzY3Nh8BHgEXPgE7ATIeAh8BFgYHDgIHBiczNjc+AScGBwYmJyYn DgMHDgEnJicGFhcWFxYiJj0BNDYyFh0BFAGWBw0EGD80NxUGDRMSDQYeQEBMHQUEAQUFCcoMCgkB CR5NP0AcBw0SEw0GFDc0QBgCBQQDBD5qAwJRhi0zFiIEEAkKW04dPyQEBBAPBCQ+HSdXLwoEBwYG AgQiFjMeUGA2BWRcjE0pFxVYRwwaBjE5DxsbGQwGGgxGVRUXKU2MPBoTExoTJAUGGiYSCgISGxMC DBYvIQUMDAwECAgJGwogMBUMAhMbEgELEicaAgMDAqMBC1tMV9BSCQoiNE0aAwIHCQQaTTUSEgID BQMGUtBYMkouBwFAEINFpUIDJwcIDWMxDB8lKhgNCAcmAkKlRYMQ/xMNvw0TEw2/DQAAAAADAIAB IAOAAeAABwAPABcAIUAeBQMCAQAAAU0FAwIBAQBRBAICAAEARRMTExMTEAYUKwAiJjQ2MhYUFiIm NDYyFhQWIiY0NjIWFAEIUDg4UDjoUDg4UDjoUDg4UDgBIDhQODhQODhQODhQODhQODhQAAAAAAIA QP/AA8ADQAAHADMALkArJyAfExIIBgECAUAAAAADAgADWQACAQECTQACAgFRAAECAUUuLRoYExAE ECsAIAAQACAAEAM0Jy4CLwEuASc1PgE1NCYjIgYVFBYXFQ4CBw4BFy4BNTQ+ATIeARUUBgK5/o7+ +QEHAXIBB8MVAxMQDhkMIA8uOF9XWWcmKhUqOxQLCgM9RGex0bFnRgNA/vn+jv75AQcBcv4nFggB CAcECQQIAg4tm0VgaGpeMqAzEQULEQcEFQs1lVRosWdnsWhVlgAAAwBA/8ADwANAAAcALABSAEpA R0hDQjIxLQYCAwFAAAIDBAMCBGYFAQQGAwQGZAAAAAgHAAhZAAcAAwIHA1kABgEBBk0ABgYBUQAB BgFFTk0sIREeLRMTEAkWKwAgABAAIAAQATM3Njc+AT0BNCcuATU0MzIVFAYHBh0BFB4CFxYXMxYz BiMiJTQnJic1PgE1NC4BIyIGFRQeAxcVBgcOARcuATU0NiAWFRQGArn+jv75AQcBcgEH/WEBCWc3 DBELJSN9djQmDAUHCwYyYgMBAWF1egF3FFA5MDYrUTpZZAIKESAWPVQLCwI8ReEBPuFGA0D++f6O /vkBBwFy/g8BJQQBEg07DwkgfUKIiEKFHgoPNwYLCQUBBicBQV8XCB8MDi2ZR0BZL2peESZBOT4W EQseAxULNZVUn+Hhn1WWAAAFAED/4APAAyAACwAfADMARwBbAGNAYAsBCAoBCggBZgYBBAADAAQD ZgABDgEABAEAWQwBCgoJUQ0BCQkKQQcBAwMCURAFDwMCAgsCQiIgDgwCAFdUUU5JSENAPTo1NDAt KCcgMyIzGhkUEQwfDh8IBQALAgsRDisBISImNDYzITIWFAYDIyImNDY7ATI2PQE0NjIWHQEUBiEj IiY9ATQ2MhYdARQWOwEyFhQGAiImPQE0NjsBMhYUBisBIgYdARQEIiY9ATQmKwEiJjQ2OwEyFh0B FAOg/MANExMNA0ANExNtwA0TEw3ADRMTGhM4/figKDgTGhMTDaANExPgGhM4KKANExMNoA0TAu0a ExMNwA0TEw3AKDgBYBMaExMaE/6AExoTEw2gDRMTDaAoODgooA0TEw2gDRMTGhMCIBMNoCg4ExoT Ew2gDRMTDaANExMaEzgooA0AAAMAQP/AA8ADQAAHABQARgBIQEUABQcGBwUGZgAGBAcGBGQAAAAH BQAHWQAEAAMCBANaCAECAQECTQgBAgIBUgABAgFGCQhAPjY0MC4dHA4MCBQJFBMQCRArACAAEAAg ABABIiY0NjMyHgEVFAcGEw4CHQEUBiImPQE0PgE3PgI1NC4EIyIGFRQGIyIuAjU0PgIzMhYVFA4C Arn+jv75AQcBcgEH/kAUHBwUDRYNHQpQExMTExoTGhkYEhESBwwSFRkNKDgTDQcLCQUZKzwgQl4L GRIDQP75/o7++QEHAXL+BxwoHA0WDSANAwFHExQgDDYNExMNNhkyHRgRExwKDRkVEg0HNygNEwUJ DAYgOysZXkMRICEUAAAEAED/wAPAA0AADQAVACEAVABPQEwACAcGBwgGZgoBBgAHBgBkAAMABAkD BFkACQAHCAkHWQAAAAEFAAFZAAUCAgVNAAUFAlEAAgUCRSMiR0U9Ozc1IlQjVBUTExEnIgsUKyQ0 NjMyHgIVFA4BIyIWIAAQACAAEAAiDgEUHgEyPgE0JgEiLgE9ATQ+ATc+AjU0LgQjIgYVFAYjIi4C NTQ+AjMyFhUUDgEHDgIdARQGAdAcFAoSDAgNFg0Uzf6O/vkBBwFyAQf+qNCxZ2ex0LFnZ/7nCQ4J GhkYEhESBwwSFRkNKDgTDQcLCQUZKzwgQl4YGBcTExMTXCgcCA0SCQ0XDIABBwFyAQf++f6OAjln sdCxZ2ex0LH+RQkPCDYZMh0YEhIcCg0ZFRINBzcoDRMFCQwGIDsrGV5DFi8bFxMUIAw2DRMAAAAA AwCAAAADgAMAAA8AHwAvAJFLsAtQWEAiCAEEAAEETQYBAAIBAE0HAQIBAQJNBwECAgFRBQMCAQIB RRtLsBZQWEAcBgEAAgEATQcBAgEBAk0FAwIBAQRRCAEEBAoEQhtAIggBBAABBE0GAQACAQBNBwEC AQECTQcBAgIBUQUDAgECAUVZWUAaIiASEAIAKicgLyIvGhcQHxIfCgcADwIPCQ4rASMiBhURFBY7 ATI2NRE0JgUjIgYVERQWOwEyNjURNCYBIyIGFREUFjsBMjY1ETQmASCADRMTDYANExMBE4ANExMN gA0TEwETgA0TEw2ADRMTAmATDf3gDRMTDQIgDRPAEw3+oA0TEw0BYA0TAWATDf1ADRMTDQLADRMA AAAABADg/8ADIANAAAAAEAAbAB8AQkA/AAECAwFABgEAAAUEAAVXAAQAAwIEA1kHAQIBAQJNBwEC AgFRAAECAUUSEQMBHx4dHBYVERsSGwsIARADEAgOKyUTISIGFREUFjMhMjY1ETQmAyImNDYyFhUU DgE3IREhAgDg/kAaJiYaAcAaJib6GiYmNCYRHq/+gAGAIAMgJhr9ABomJhoDABom/MAlNSYmGhId EcACIAAAAAAHAGD/owOgA2AAJABCAGEAdACBAI0AmQB3QHRYTUYDBAYBQA8HDgMGAgQCBgRmBQ0C BAsCBAtkAAkACAEJCFkAAQACBgECWQALEAEKAwsKWQADAAADTQADAwBRDAEAAwBFkI52dWNiREMC AJaTjpmQmYmIg4J1gXaBYnRjdEpJQ2FEYTUyJiUVEwAkAiQRDisFIyImPQE0LgEnLgQ1ND4CMzIe ARUUDgMHDgEdARQGAiIGFRQeARceAR0BFBY7ATI2PQE0PgI3PgI1NAciLwEHDgEiJi8BBw4BLgE/ AT4BHwE3NhYfARYGBwYTIicuAT4BPwE2FhceARQGDwEGISIvAS4BPgEfAR4BBiQiJj0BNDYyFh0B FBMjIiY0NjsBMhYUBgJAgDVLEBoOBAoZEg8zVnZBV5NWDxIZCgQWIksL1JYeEwYfKiYagBomCxQb DwcSHoAXBxA7BQwMDAU7EAQYGQwFIAUjDUlJDSMFIAUMDQXbDwkEBQEFBSEKGgkEBAYEIQn9NAwJ IQkCEhoKIQoBEgFeGhMTGhMggA0TEw2ADRMTXUs1OBY3NBAEDScpPh9Bd1YyVZRXHz4pJw0EGVch ODVLAweWaiZMGwYhbi04GiYmGjgWNTIvEAgZTCZq1BYvPAQFBQQ8Lw0MCRgMYBEIDEpKDAgRYAwY BAIBQAoFDAwMBB4JAgoEDQwLBR0ICB0JGxMCCR4IGxSAEw0gDRMTDSAN/Q0TGhMTGhMAAwBA/8AD wANAAAcADwAuADhANSgBAwUBQAAEAgUCBAVmAAUDAgUDZAABAAIEAQJZAAMAAANNAAMDAFIAAAMA RiMuExMTEAYUKwQgABAAIAAQACAGEBYgNhAHJi8BLgEGBwYUHwEhIgYUFjMhBwYUFxYXNj8BPgE0 Arn+jv75AQcBcgEH/t/+wuHhAT7howMEnwYREAYKCmf+zw0TEw0BM2oKCQoNDQqgBQRAAQcBcgEH /vn+jgI54f7C4eEBPpQGBKAGBAQGCRsJaBMaE2kJGwkJAQEJngUMDAAAAAgAY//gA6ADIAAQACcA OQBJAFwAdgCHAJkAhECBcXBsa2oFAwIBQAsBAxQIEAMABQMAWQ0BBRcOEwMGBwUGWRUKEQMCAgFR CQEBAQpBDwEHBwRRFgwSAwQECwRCiYh5d15dTEo7OiooEhECAJOQiJmJmIF+d4d5h2dkXXZedVVS SlxMXENAOkk7SDMwKDkqOR4bEScSJgoHABACEBgOKwEjIiY9ATQ2OwEyFh0BFA4BAyIOAR0BFB4D OwEyPgM9ATQmIxEjIi4BPQE0NjsBMhYdARQOAQMiBh0BFBY7ATI2PQE0JiMlIyIuAT0BNDY7ATIW HQEUDgIDIg4BHQEUFjsBMj4BPwI+AjU3NTQuASMRIyImPQE0NjsBMh4BHQEUBgMiBh0BFB4COwEy Nj0BNCYjAYPAJzk5J8AoOBkt2ggPCQQFCAoFwAUKCAYDEw3AGiwaOSfAKDgZLdoNExMNwA0TEw0B vcAaLBo4KMAoOA8aI9QJDgkTDcADBQUCBAQCAgMCCA8JwCg4OCjAGiwaOOgNEwUJDAbADRMTDQGg OSfAKDg4KMAaLBoBQAgPCcAFCggFBAQFCAoFwA4S/QAaLBrAKDg4KMAaLBoBQBIOwA0TEw3ADhKA GiwawCg4OCjAEyQZEAFACA8JwA0TAQIBAgQBBAUCBsQJDwj9ADknwCg4GS0awCc5AUASDsAGDAkF Ew3ADhIAAAAABQCB/8ADgQM8ABoANgBjAIAAjABtQGpaUUYDCwgBQHEBCD4ADQANaQkBCAwBCwoI C1kOEgIKEQEHAQoHWQQBAgUBAQACAVkGEAMPBAAACwBCZWQ5NxwbAQCIh4KBe3pramSAZYBWU0VC N2M5YzU0LSonJRs2HDYQDQoIABoBGhMOKwUiJicuBCMiJjQ2MzIeAxceAQ4BBwYzIicuATc+BDMy FhQGIyIOAwcOAiMHJyMiJy4BJy4BNz4BOwEyFz4BNzY3Nh8BHgEXPgE7ATIeAh8BFgYHDgIHBicz Njc+AScGBwYmJyYnDgMHDgEnJicGFhcWFxYiJj0BNDYyFh0BFAGWBw0EGD80NxUGDRMSDQYeQEBM HQUEAQUFCcoMCgkBCR5NP0AcBw0SEw0GFDc0QBgCBQQDBD5qAwJRhi0zFiIEEAkKW04dPyQEBBAP BCQ+HSdXLwoEBwYGAgQiFjMeUGA2BWRcjE0pFxVYRwwaBjE5DxsbGQwGGgxGVRUXKU2MPBoTExoT JAUGGiYSCgISGxMCDBYvIQUMDAwECAgJGwogMBUMAhMbEgELEicaAgMDAqMBC1tMV9BSCQoiNE0a AwIHCQQaTTUSEgIDBQMGUtBYMkouBwFAEINFpUIDJwcIDWMxDB8lKhgNCAcmAkKlRYMQ/xMNvw0T Ew2/DQAAAAABAMAAPgNAAr0AIgAiQB8XEAkABAEAAUAAAAEBAE0AAAABUQIBAQABRSQYGwMRKwkB NjQnLgEGBwkBJiIGFBcJAQYUFjI3CQEWMzI+Ajc2NCcCLQEKCQkGERAH/vf++QkbEwoBB/73ChMa CgEJAQkKDQMGBgUDCQkBfwEICRoKBgUFBv74AQgJEhsJ/vj++AkbEgkBCP71CQECBAIKGgoAAQAg /+AD4AMAABgAUbUEAQIAAUBLsAtQWEANAQMCAAIAaAACAgsCQhtLsBZQWEANAQMCAAAKQQACAgsC QhtADQEDAgACAGgAAgILAkJZWUAMAQAPDggGABgBGAQOKwEiBwYHJyYjIgYVFBcBFjI3ATc+AjU0 JgLgZkoGKi9KZ2qWTAE9KloqATwDGRkYlgMARgUrL0eWamRS/r8pKgFAAh8lRylqlgAAAwBg/+AD oAMgAAcADwBAAEVAQgAFBwEHBQFmAAEAAgMBAlkAAwAABgMAWQAHBwhRAAgICkEABgYEUgkBBAQL BEIREDg1Mi8lJBkYEEARQBMTExAKEisAIiY0NjIWFCYiBhQWMjY0ASInASY2NwE+ARcWBwEGFh8B HgIyPgE3AT4BPQE0JisBIiY0NjsBMhYdARQGBwEGAuhQODhQOFMaExMaE/7zMyD/ACEDHgEgCh0K GB3+6RUBFfkGCgsLCwwHAU0TDS1TwA0TEw3AbVMYKP7AIAHgOFA4OFBIExoTExr9kyABACVdHgEg CgEJGR3+6RcfFfkGBwQECAcBTRMoJYBTLRMaE1NtgDk/KP7AIAADAAD/wAQAA0AAAwAHAA0ANUAy BgEBAAMCAQNXAAIAAAQCAFcABAUFBEsABAQFTwAFBAVDAAAMCwkIBwYFBAADAAMRBw8rGQEhEQMh ESEBIQ8BIScEAED8gAOA/uD+wCBAAgBAA0D9gAKA/cACAP2AgEBAAAQAF//MA+4DNAA2AEcAeACx AMhAHCEBBAWsimZFQ0E+PDo3LisfFA4GBJuZAg4MA0BLsBpQWEA+AA4MDQwODWYACgALBQoLWQAF AAQGBQRZAAYAAwIGA1kAAQAADAEAWQkHAgIPAQwOAgxZAA0NCFIACAgLCEIbQEMADgwNDA4NZgAK AAsFCgtZAAUABAYFBFkABgADAgYDWQABAAAMAQBZCQcCAg8BDA4CDFkADQgIDU0ADQ0IUgAIDQhG WUAbpKOioaCdlZJ/fnBuX15XVE5NHiQvIREiIhAVKyUOASsBJiczMjYzJicjLgInJjc1Nz4BNTQu AiMiByYnNjMyHgIVFAYHFh8BHgIXMhYXFiUXFgcmJzY/ATY3Jic2NxYXBxceAhceARcWBw4BIyEm JyY3PgMzPgI/ATY3LgE1ND4DMzIeAhUUBgcWEzQuAyIOAxUUHgIfAhYHDgIPASsBIg4CBxQHHgEz ITI2MyYvAS4CJyY/Aj4DA+4JJQxRCxZyAgIBDRgDK0QXByEDDR0oFiMeDw4OBgsVFh05MR8yKQEL AwMOOCQSLBAV/sQBAhIeIAcEAgsBCgsRDg4PlQQFFU8zGT8WHxINNBb9gzYWEhMLIiYXCjRREgUD EAI8TR4wQEEhKVFILEw8A0YcKTIpHykzKRwaKikVEgEFLwshYD4DAgUDDgwOAwECBwECewIIAhQg BT1hIQovBAETFCkqGXMUFh8fBxUBBxwRCCFCEAgSUT4qPBwLBCIeBxoxUjNAayAaCwMDCxYGFxgh xBAxHwoEBQQCCxoICxgbEwmMBAUPHggBHyIvJxsSAygkLBcgDgUIIA4FAw8kLp1ZOV09KRIePW1G Wp0tJAFIL0wtHQsLHS1MLy1QOSYNCxdbLgsZJgkBAwYLBwEBARYWHQEBCSYZCy1cFwsNJjlQAAAC ABf/zAPuAzQAOQBqAJFAGCQBAgNYMS4eHBoYEw8NCgQCVRECBQQDQEuwGlBYQCoABwMHaAADAgNo AAIEAmgAAQUABQEAZgAEAAAGBABZAAUFBlIABgYLBkIbQC8ABwMHaAADAgNoAAIEAmgAAQUABQEA ZgAFAQYFTQAEAAAGBABZAAUFBlIABgUGRllAEGJgSUZAPzY1JyUiIRIiCBArJQ4BKwEmJzMuAicm JzAHMAcmJzY/ATY3Jic2NxQXNi8BMyYnNjMyHgIVFAYHFh8BHgIXMhYXFiUXHgIXHgEXFgcOASMh JicmNz4DNz4CPwE2Ny4BNTQ+AzMyHgIVFAYHFgPuCSUMQw8YAgYsWQYOBwUCKzEoEQILAQoLEQ4I NSQHCQQGFRYdOTEfMikBCwMDDjgkEiwQFf4iBAUVTzMZPxYfEg00Fv2DNhYSEwsiJhcKNFAUBAMQ AjxNHjE/QSEpUUgsTDwDcxQWIR0HGi8DBwQFAgkFDRECCxoICxccAQl6oxgTEAcaMVIzQGsgGgsD AwsWBhcYIUAEBQ8eCAEfIi8nGxIDKCQsFyAOBAEIIA8EAw8kLp1ZOV09KRIePW1GWp0tJAAAAAAE AA7/kAPuA3AAIwBYAGAAagCGQIM3Ni0sHh0YFwgJPlFQSEcMCwYFCAg9DgELCgMKCwNmAAMCCgMC ZAAEAgUCBAVmAAUHAgUHZAAGBwAHBgBmAAkMAQoLCQpZAAcAAAEHAFoAAgABDQIBWQANCAgNTQAN DQhRAAgNCEVhYWZlYmFhamFqamleXVpZWFdAPz49ER8RHxAPEysBDgEHFBcHLgEHBgcnNiYnJgc3 PgE3Nic3HgE3NjcXBhYXFjcHIi4CJy4BNycOBAcGJicHFg4BFQ4BBxUyHgEXHgIHFz4DNzYWFzcm PgE1PgE3BCImNDYyFhQnIgYUFjI2NCYjA+tOcQEYqiaWRCwapiclQywyA05xAQEaqiaXRCwapygl QyszPgodFiIEOSogZwQOFA8YBDmhIFMGAQcBYz8MGx8JJC8DFGcFFxAjAzihIFMGAQgBdUH+o6t5 eat5zjxVVXdVVTwBIwF0UDUsZ0UnKRsuYkebJxoByQF0UDUtZ0UoKRsuYkebJxoBLgwNFQMhlDw+ Bw4OCg4CIyY6PhMcNglGgQFoERsFFWFkKykIFAoVASMmOT4SHDUKRIQBpnqreXmr5lV4VVV4VQAC AA7/jgPyA3IAIwAsAC9ALAoJBAMEAz4cGxYVBAE9AAACAQBNAAMAAgEDAlkAAAABUQABAAFFER8R HgQSKwEuATcnBgcGJicHFgcOAQ8BNhceAQcXNjc2Fhc3Jjc+AT8BBgEGLgE+AR4BBgOUQyYpqBos RZcmqhkBAXFPAzMsQyYopxotRJYmqxkBAXFOAzL+p0qlVi2UpVYtAgUnnEdjLxspKEZoLTVRdAHK ARonnEdiLhspJ0ZoLTRRdAHKAf7hKiyUplYslaYAAAADAA3/ugP2A0oALgA0ADkAPEA5OTQTAAQE ASEBAAQCQDMyAgM9AgEBBAFoAAMAA2kABAAABE0ABAQAUQAABABFNzUxMCgnJiUfHQUOKwEUBwMG BzAHDgEnJS4BNzY3NjcTBwYHAw4BLgE/ASEiJjUmNjcBMjYzNh8BFhcWAQciFRcTATMyFwED9gHt Aw0DCBoK/wAKAggGCQMF0PoLCkMDFhkOAz/+0A0SBgwQA5wBAgEMDwgJBAT+FgEByML88vYGCAF6 AywGAvy6DQcFCgII2gkaCgYDBgcBEOcIAf79CgkGEwrzEg0MHAkB9AEKAwQDBwb9gQEBqgKt/oUE AV0AAQAO/44D8gNyAJQAcEBtHBsCBAJ/fG9uNg8GAAeUAAIBAFQBBgVcAQgGBUBCAQUBPwADBAcE AwdmAAcABAcAZAAAAQQAAWQAAQUEAQVkAAUGBAUGZAACAAQDAgRZAAYICAZNAAYGCFIACAYIRoaE eXdiXUA/JCcrGBIJEyslJyYnJg4BBw4BDwEmJyYnNzY3Ni8BLgEnIg8BFQYVFBY7ATc+AjMyFh8B FgcGDwEOBBceARceBBcyFjc+AT8BPgE3PgEeBB8BFg8BDgEHMAcGBzQrASIHLgEnLgEnJjY9ATQm NzUwPQI0BiYGIyIGHQEWBhceARceARcWNjc+Ajc2PwE2Jy4BJwOwcjQlCQwRBAgqDDNWRjIiaD0B AhxPFkkqLyg2GRATFT4CEw4GFTUJUxYBASgqAh0SFwwBB0wqGS4rGikFAxACARMBPgYcCAQJCggL BgwCkQEBPgsfCgoYEg8oGRhw3VJJagcBAQEBBAMKBBMXAQEBBmJWYfqDO14IBg0PBCYXLxgEASAh /EwiAQEGDQMFLwo/BUUxQVMxNi4sfiMnARggAQscEQspAQ4GGhB8IxwmGCkCEA4XHxITXCIVHRAI CAECAgIRAVMKHAQCAQICBwMIAmgFOWgKFAYFDgcBAQJiV07cYAMlAikFDAQqCQYEAgEBARUUFQxH DnbfXGZxAgEOCAEFCQISJEomQiEsFAAAAAABAA7/jgPyA3IASQBDQEAyHx4XFAUGAgoBAQACQAQD AgIGAmgABgUGaAAABQEFAAFmAAUAAQVNAAUFAVIAAQUBRkNCODcnJSQjIiFCGAcQKyUWDwEGBwYH MDMVBicGIy4BJy4BJyY2JzU0NzY3Njc1NzYzMDMwMx4BHwIWBxQHBg8BFhcWFxYXPwE2NzY3PgIX Fh8BHgEXFgPyAhksFyYSFQEsSRgUg/phVmIGAQEBExg1Bww2KC8BASpIFiEtHAIIETdJCBoQFUZW Hg0SHw4HBBEMCSU0ciEgAQF8MShGJBMIBAEOBAECcWZc33YORwwVGQpFMQ0FASAYASgjNkcsLRQT PiEtKSkTFUUFJRUdEw8EAw0GAQEiSxQsIQ8AAAAJAA7/zAPyAzQAIwAzAEMAUwBjAGcAdwCHAJcA z0uwGFBYQD8RAQkaEBgDCAcJCFkVDAIHFA0XAwYKBwZZGxIZAwoTAQsDCgtZDwQCAgIBUQ4FAgEB CkEAAwMAURYBAAALAEIbQDwRAQkaEBgDCAcJCFkVDAIHFA0XAwYKBwZZGxIZAwoTAQsDCgtZAAMW AQADAFUPBAICAgFRDgUCAQEKAkJZQEZ6eGpoRkQ2NCYkAgCWk46Lgn94h3qHcm9od2p3Z2ZlZGFe WVZOS0RTRlM+OzRDNkMuKyQzJjMeHBsZFBEMCgkHACMCIxwOKwUhIiY1ETQ2OwEVIyIGFREUFjMh MjY1ETQmKwE1MzIWFREUBgMjIiY9ATQ2OwEyFh0BFAYDIyImPQE0NjsBMhYdARQGATMyFh0BFAYr ASImPQE0Nic0NjsBMhYdARQGKwEiJjUDMxUjByMiJj0BNDY7ATIWHQEUBgMzMhYdARQGKwEiJj0B NDY3FRQGKwEiJj0BNDY7ATIWA3b9FTRJSTQpFSIxMSICwiIxHiAqKjNJSYZTERkZEVMRGBgoTwkO EgpKCg0N/sFTERgYEVMRGRkZGRFTERgYEVMRGSn5+UBQCQ0SCkoJDQ1vUxEYGBFTERkZjRgRUxEZ GRFTERg0STQCWTRJPjEi/c8iMTEiAjElLj5JNP2nNEkBnxgSUxEYGBFTEhgBTA0JUAkODglQCQ3+ TBgRUxEZGRFTERjlERgYEVMSGBgSAYo+Kg0JUAkODglQCQ3+TBgRUxEZGRFTERjlUxIYGBJTERgY AAAEAAn/gAQAA4AAQwBPAF8AYwBaQFdjYmFgJwUFACgBCwYOAQgCA0ABAQAFAGgABQYFaAAECAoI BApmAAMHA2kABgALAgYLWQACCQEIBAIIWQAKCgdRAAcHCwdCWVhSUUtKFyomERcoKRExDBcrASYr ASIGIwUOBBURJiMiBw4BBwYXHgEzMjY3PgE3NjUzETI3JREuAiMiBgcOAQcGFx4CMzI2Nz4BNzY1 MxE0AQYuATY3Nh4BFxYGJQYuAScmNjc+AR4BFxYHBhMFNSUD6RIXBAIDAv3gCREMCgU0RSonLkUT HRYSYD8UKBQvRRIPAQUGAhUQJysXFSgULkYSHRYMNUYpFSoSLkYSDwH89zpoIDs6J0g3CxA7AiUo RzgKEDs6HDkwJAgTLx0+/eACIANxDwFgAggMDhIJ/dslDRA6Jjw8MToHBg87Jh8kAgABXv58CxEJ BwYQOiY8PCAxGgcGDzsmHyQCoB78bBMgVVcTDAUjHCpXTQwFIxwqVxMJAQ8eFTQyHwKnYGBgAAAB ARb/ygLtAzYAGQAztQABAAEBQEuwFlBYQAsAAQEAUQAAAAsAQhtAEAABAAABTQABAQBRAAABAEVZ sxwWAhArCQEGFBceATI2NwE2NTQuAScBLgEiBgcGFBcCoP6ACgoFCwwMBQGTDQEDA/5nBQwMCwUK CgGA/oAKGQoFBAQFAZMNDQUHCwMBkwUEBAUKGQoAAAAAAQET/8MC6gM2ABEAHUAaAAEBAAFAAAAB AQBNAAAAAVEAAQABRRgUAhArCQE2NCYiBwEGFRQXARYyNjQnAWABgAoUGQr+bQ0HAZkKGRQKAYAB gAoZEwn+bQ0NEwf+ZwoTGgoAAAMAAP/mA80CTQAQABsALABFQEInIQIEAgFABwEAAwgCAgQAAlkA BAAGBQQGWQkBBQUBUQABAQsBQh4cEhECACUjHCweLBcWFBMRGxIaCgcAEAIQCg4rASEiBhURFBYz ITI2NRE0LgEHMhYzAQYiJwE2MwEhIiY1EQUWMzI3JREUDgIDgPzNIC0tIAMzIC0VIxUBAgH+fwsj C/5+AwIDM/zNCw8BexggIRgBewQHCgJNLSD+MyAtLSABzRUjFTMB/v8HBwEBAf4ADwoBt/wQEPz+ SQUJBwQAAAEBAP+AAs0DgAA6AENAQAcBAwUEBQMEZgABAAUDAQVZAAQAAgYEAlkABgAABk0ABgYA UQgBAAYARQEANDIqKCMiHRwWFA8OCAcAOgE5CQ4rBSImNRE0PgEyHgEVERQGIiY1ETQ2MzIeARUR FBYyNjURNCYiBhURFBYzMj4BNRE0PgIzMhYVERQGIwHmX4cwU2FSMEtqSw8LBwwHLT8tS2pLaUox UzAEBwkFCw+HX4CHXwJnMFMwMFMw/c01S0s1ATMKDwYMB/7NIC0tIAIzNUtLNf2ZSmkwUzABZwUJ BwQPCv6ZX4cAAAACAGb/swNmAxoAEQBBADVAMg8OAgADAUAAAwEAAQMAZgAEAAIEAlUFAQAAAVEA AQEKAEIBAC8tHRwTEgcGABEBEQYOKwEiJjURNDYyFhURFA4BDwEOARIiLgI1NDc2NzYyHgIXFgYH DgEVFB4EMzI+ATU0JicuAT4BFxYXFhUUDgEB5goPDxUPAgMDBAMHSZqMbTpOTHkECAcHBAIDCwpp hBgqPklWLVuZWYVpCgoGEwp4TU06bQEaDwoBzQsPDwv+MwMHBgIEAgH+mTptjE2BZ2QkAQMEBwQK EwMfsm4tVkk+KxhamVpush8DExQKAyRkZ4FNjG0AAAMAAP+AA+wDgABLAF4AqQCHQIQsAQYDjEAC CgumpaGNBAcIHQEAB5EBAQAFQAALBgoGCwpmAAoJBgoJZA4BBQkICQUIZgABAAFpAAQADAMEDFkA Aw8BBgsDBlkACQAIBwkIWQ0BBwAAB00NAQcHAFECAQAHAEVOTAAAn5yDgX17cXBqaGJgVlNMXk5e AEsASyk1OikoEBMrAR4BFRQGBw4BKwEWBw4GIyImJy4CJyYnDgErASImNRE0NjsBMhYXPgI3PgIz MhYXFhcWFxYdARQHHgIXFhUUBgcGFQEjIgYVERQWOwEyNjURNC4DASYjIi4CNTQ2MzI3NjU0JyYi JjU0Njc2LgEnJiMiJjU0JiMiDgIHDgMHERYXFhc2Nz4BLgEnJjc+ATsBMj8BPgI3NTY1NAPIERMJ CAsiFIZtNwUODhEQEA8HCg4CBCU8KHiXCSYWmiAtLSCaGCYJL0gfGR4nX0IcMhQnCR8VFgEHDAsE FwYGAv0dmQsPDwuZCw8DBAcHAsALCAUKBwQPCwQCBRAOFg8GBgEFDQkMCQsPOScuQzAZFBQZMD0o p4N9HBsNBwUIKyYHBwMMB7MOCAICAgEBAQG+EzwgFCMOERPHYgkRDAoHBAINCSJKTSRsMxMZLSAB zSAtGxYGEw4NEQ8QDg0aKw0rLS0IAwMFDRAKLDEQGwsCAQFcDwv+MwoPDwoBzQQIBgUD/nQVBAcK BQoPBAoTJSIcDwoHCwQJHSUNEQ8KICIGDgsLCgwSDQX+XTd2cXEIFw4nQ2Y/DQ0GBwwFAwYHBAgE BCMAAAQALv+OA9MDcgAjACgAMwA9AD1AOiopJyUkBQIEAUAABAIEaAABAgACAQBmAwECAQACTQMB AgIAUgUBAAIARgIALiweHBsaBwQAIwIjBg4rBSEiJzArASInJjcTNjcBNjc2HwEeAQcBBg8BITAz Mh4BFRQGAScBBzcBJTc2MzIfAR4BBy8BJgYPARc3NiYDq/y8DQsBAQsJDQIcAQYBkAkNDQrrCgII /nEHCU0CmRAEEAUX/vy7/osW0QH+/uQtKDwtI1soCCI3WxM2EQW7BRIEcggHCxEBEgkIAeEKAQEI yAkaCv4gCAIWBAkIEBkCT5/+Ptk7AgHwNi8dTSJqKYRNEAYUBZ4FFTYAAAACAC7/jgPTA3IAJAAv ADpANyYlAgIEAUAABAIEaAABAgACAQBmAwECAQACTQMBAgIAUgUBAAIARgIAKigeHBsaBwQAJAIj Bg4rBSEiJzArASInJjcTNjcBNjc2HwEeAQcBBg8BITAzMh4BFRQGIwMlNzYzMh8BHgEHA6v8vAwL AQILCQ0CHAEGAZAJDQ0K6woCCP5xBwlMApgQBBAFFxBr/uQtJz0tI1soCCJyCAcLEQESCQgB4QoB AQjICRoK/iAIAhYECQgQGQKP8DYvHU0iaikAAAMAAP+AA80DTQAXACoARQBJQEY5MgIHBAFAAAQF BwUEB2YIAQcGBQcGZAAAAAIFAAJZAAUABgMFBlkAAwEBA00AAwMBUQABAwFFKysrRStFHRUYJyUb KQkVKwQ+ATQmJy4DIyIOAwcOARQeAjIBND4CMzIeAxUUBCMiLgIFNzY0JiIPARE0JiIGFREnLgEG BwYUHwEWMjcC+YpKSkUiUFdeMSZMSEQ+HERKSomyw/3rRXWhWEeFa1Es/wC0WKF1RQHFzQgPFQih DxUPoQUNDgUHCMwIFQg2ibLDsUUjNSQTDBgiLRxFscOyiUoB5lmhdUUsUWuFR7T/RXWh080HFQ8H oQIPCg8PCv3xoQUDAwUIFQfNCAgAAAAIAEL/ewO/At0ADQBBAIIAogCxALsAygDLAXlALAkBAgE3 AQcYdgEPDZBcAhAPsEhGRAQJFrEBCwmHARoRv74CFRoIQMsBFQE/S7AMUFhAfwAHGAUYBwVmAA0O Dw4ND2YAEA8KDxAKZgAKFhEKXAACAAMAAgNXAAEAABIBAFcABgAIGAYIWQASABgHEhhZAAUABA4F BFcADAAODQwOWRMBDwAWCQ8WWRsBCQALEQkLWhwBEQAaFREaWh0ZFwMVFBQVTR0ZFwMVFRRRABQV FEUbQIAABxgFGAcFZgANDg8ODQ9mABAPCg8QCmYAChYPChZkAAIAAwACA1cAAQAAEgEAVwAGAAgY BghZABIAGAcSGFkABQAEDgUEVwAMAA4NDA5ZEwEPABYJDxZZGwEJAAsRCQtaHAERABoVERpaHRkX AxUUFBVNHRkXAxUVFFEAFBUURVlAPr28hYNDQsXCvMq9yrm2s7KtqqWjnZqVko2Kg6KFont6eXdx b21sZmRUUktKQoJDgjw6NTQwLhEdERcREB4UKwEzNSMGBwYHBgcGIxUzBQYHBgcGBwYHBgcGFTM1 IzY3Njc2Nz4BNzY1NCYnJicmIyIOAhUzNDc+AjMyFhUUBwYFIicmJyYnJjUjFBcWFxYXFjMyPgE3 NjU0Jic+ATU0JicuASMiBgcGBwYHMzQ2MzIWFRQGBwYrARUzHgIVFAcGFyMiDwERNCYrASIGHQEn JisBIgYVERQWMyEyNj0BNCYBIyImNRM0NjsBMhYdARcBIxE0NjsBMhYVASM1NzU0NjsBMhYVFxQG IwHyGxUBBAQFBQcGByH+7AUEBwIICAgGBgMDYj8FBgcGCQUGCwMECAYGCAkJDBIMBhoBAQUIBgkL AwMCTAYEBAMDAQIaBAMHBgkKCwkSDgQEDQsJCggHBhAIChEGBgMDARoKCggLBQUDBgkKBQoFBgVS 0QkIBR8V3RYeBQgJ0hYeHhUDFxUeH/2+6QUHAQcF0gUHCgEd9QcF3QUHARHpCgcF0QUHAQcEAleG CAUFAwQBARTOBAIFAgUGBgcHCAgNGAcFBQUGAwQMBwcKChAFBQMDCA8UCwUGBQkGCwoGBQW2AgIE AwUGBAsJCgUHAwMGCwgICwsRAgMPCgkOBAUFBwYGCQgKCg0JCAYHAgITAQQHCAoFBk8DAgEdFR8f FY4BAx8V/nYVHx8V+xYf/sQHBQGKBAcHBAkK/n0CVAUGBgX9rPQKCQUHBwX7BQcAAAAABgB2/4wD iwLUACAAKAA1AEkAWQBpAH1Aeh8DAggHFwEGC2RhAgUMVFECDg8EQAABAAkAAQlmAAIABwgCB1kA CAAAAQgAWQAJAAsGCQtZAAYABRAGBVkADAAQDwwQWQAPAA4EDw5ZAA0ACg0KVQAEBANRAAMDCwNC Y2JbWlNSS0pBQDc2MS8qKRMVERURFxQTEBEXKwAyNjcVMzU0LgEiDgEVERQeATM1IiY9AR4BMzUi Jj0BFjYyFhQGIiY0BCIGFREUFjMyNjcRNCYyHgMUDgMiLgM0PgISIi4DPQEWMjcVFA4CJiIuAz0B FjI3FRQOAgFpmI0tOWGOoI9gYI9QcpQtjUxylC1n45WV45QCachzc2RjcwH1PDUkGwwMGyQ1PDUk GwwMGyRxPDUkGww8xDwMGyQ1PDUkGww8xDwMGyQBpCAeS6UvRyIiRy/+Py9HIjk+IYceITk+IYce 1z5DPj5D2UAs/uArQUArASEsCAgMDg0JDQ4MCAgMDg0JDQ4M/oEICw8MBUUhIUUFDA8LiAgMDgwF RSEhRQUMDgwAAAACAHEAIwOPAuQABQALAChAJQoHBAEEAj4FAwICAAJoBAECAABfBgYAAAYLBgsJ CAAFAAUSBg8rNwkBBwkBAwkBBwkBcQGPAY8q/pv+ny4BjwGPKv6b/p8kAab+WgEBWf6oARkBp/5Z AQFZ/qgAAAAAAgBxACMDjwLkAAUACwAoQCUKBwQBBAI9BAECAAIAaAUDAgICXwYGAAAGCwYLCQgA BQAFEgYPKxMJARcJARMJARcJAZ8BYQFlKv5x/nEuAWEBZSr+cf5xAuP+qAFZAf5ZAaf+5v6oAVkB /loBpgAAAAMAS/+YA7UDYgAVAEsAXgAeQBtaAQECAUAAAgECaAABAAFoAAAAX1dWQD8pAw8rARQX HgEVFAcGFjMyNjc2Jy4BJyYnJgcOARceARcWBw4BFRQWNzY3NhcWBwYWFxY2Nz4BNz4BNzY3PgE1 NCYnJiIHBgcGJjU2JicuAQUGBwYXFjc+ATc2FhcWNSYnLgEBrRIoGwcEBAgMDxANCQYNFRcrG9Qy IwICExwGHy4lfFg3DhkGBQMEHCoZGh8jIAQCEzKBNTMlCxQ7r387EwMEARQgInsB41kvHQgEDgke PCJhKDIBCBNsA2IFIkZ0ZIAfEg4sVEpIOC4rMScZjBtQUTlQQw8THDgpTzEsGwwWBwlIV0oPCQMP EDEsFwoGDR4cOzUgHxQ/PxwJAkc4ZGA1OS/NID4nBQINCRMhFAIUGREIDyIiAA8AIQAkA9sCLgAF AAsAEQAXACcAYQByAIsAmgC9AOEBAwEuAWYBgArqQUIBJwEiAGkAAwAuADQAYgABABMAMwCLAAEA DQAeAVsAAQAAAA0AWgABABsAAACAAAEAOQAbAFYAAQAPADkAegABAAEADwF8AWUBOQADAAUAAQBS AAEAMQAVAX4AAQAEADEBbQABACUADgFyAAEAEgAUAA0AQAA1AAEALgExAAEAOQACAD9LsAtQWEDN ACEINC4hXgA0Li40XCIgCwMKLjMuCl41ATMTLjNcABMfLhNcACkfDB4pXgARDCsMEStmNjItAyse DCseZDcBDR4ALg1eABsAOQEbXgAPOQESD14AFQUxGBVeADEEEjFcAA4EJRIOXicBJRgSJVwAFBgS EhReOwEILwEuCgguWSwjAh8qKCQDHg0fHlkQAQwAOQ8MOVkdAzoDABwaAgMBBQABWQYBBA4FBE0Z FgcDBQAYFAUYWTgwJhcEEgkJEk04MCYXBBISCVIACRIJRhtLsAxQWEDSACEINC4hXgA0Li40XCIg CwMKLjMuCl41ATMTLjNcABMsLhNcACksDB4pXgARDCsMEStmNjItAyseDCseZDcBDR4ALg1eABsA OQEbXgAPOQE5DwFmABUFMRgVXgAxBBIxXAAOBCUSDl4nASUYEiVcABQYEhIUXjsBCC8BLgoILlkA LCkeLE4qKCQDHg0MHk0jHxADDAA5Dww5WR0DOgMAHBoCAwEFAAFZBgEEDgUETRkWBwMFABgUBRhZ ODAmFwQSCQkSTTgwJhcEEhIJUgAJEglGG0uwEFBYQM4AIQg0LiFeADQuLjRcIiALAwouMy4KXjUB MxMuM1wAEx8uE1wAKR8MHileABEMKwwRK2Y2Mi0DKx4MKx5kNwENHgAuDV4AGwA5ARteAA85ATkP AWYAFQUxGBVeADEEEjFcAA4EJRIOXicBJRgSJVwAFBgSEhReOwEILwEuCgguWSwjAh8qKCQDHg0f HlkQAQwAOQ8MOVkdAzoDABwaAgMBBQABWQYBBA4FBE0ZFgcDBQAYFAUYWTgwJhcEEgkJEk04MCYX BBISCVIACRIJRhtLsBhQWEDQACEINC4hXgA0Li40XCIgCwMKLjMuCl41ATMTLjNcABMfLhNcACkf DB4pXgARDCsMEStmNjItAyseDCseZDcBDR4AHg0AZgAbADkBG14ADzkBOQ8BZgAVBTEYFV4AMQQF MQRkAA4EJRIOXicBJRgSJVwAFBgSEhReOwEILwEuCgguWSwjAh8qKCQDHg0fHlkQAQwAOQ8MOVkd AzoDABwaAgMBBQABWQYBBA4FBE0ZFgcDBQAYFAUYWTgwJhcEEgkJEk04MCYXBBISCVIACRIJRhtL sBpQWEDRACEINC4hXgA0Li40XCIgCwMKLjMuCl41ATMTLjNcABMfLhNcACkfDB4pXgARDCsMEStm NjItAyseDCseZDcBDR4AHg0AZgAbADkBG14ADzkBOQ8BZgAVBTEYFV4AMQQFMQRkAA4EJQQOJWYn ASUYEiVcABQYEhIUXjsBCC8BLgoILlksIwIfKigkAx4NHx5ZEAEMADkPDDlZHQM6AwAcGgIDAQUA AVkGAQQOBQRNGRYHAwUAGBQFGFk4MCYXBBIJCRJNODAmFwQSEglSAAkSCUYbS7AiUFhA0gAhCDQu IV4ANC4uNFwiIAsDCi4zLgpeNQEzEy4zXAATHy4TXAApHwweKV4AEQwrDBErZjYyLQMrHgwrHmQ3 AQ0eAB4NAGYAGwA5ARteAA85ATkPAWYAFQUxBRUxZgAxBAUxBGQADgQlBA4lZicBJRgSJVwAFBgS EhReOwEILwEuCgguWSwjAh8qKCQDHg0fHlkQAQwAOQ8MOVkdAzoDABwaAgMBBQABWQYBBA4FBE0Z FgcDBQAYFAUYWTgwJhcEEgkJEk04MCYXBBISCVIACRIJRhtLsCRQWEDTACEINAghNGYANC4uNFwi IAsDCi4zLgpeNQEzEy4zXAATHy4TXAApHwweKV4AEQwrDBErZjYyLQMrHgwrHmQ3AQ0eAB4NAGYA GwA5ARteAA85ATkPAWYAFQUxBRUxZgAxBAUxBGQADgQlBA4lZicBJRgSJVwAFBgSEhReOwEILwEu CgguWSwjAh8qKCQDHg0fHlkQAQwAOQ8MOVkdAzoDABwaAgMBBQABWQYBBA4FBE0ZFgcDBQAYFAUY WTgwJhcEEgkJEk04MCYXBBISCVIACRIJRhtLsClQWEDUACEINAghNGYANC4uNFwiIAsDCi4zLgpe NQEzEy4zXAATHy4TXAApHwweKV4AEQwrDBErZjYyLQMrHgwrHmQ3AQ0eAB4NAGYAGwA5ARteAA85 ATkPAWYAFQUxBRUxZgAxBAUxBGQADgQlBA4lZicBJRgEJRhkABQYEhIUXjsBCC8BLgoILlksIwIf KigkAx4NHx5ZEAEMADkPDDlZHQM6AwAcGgIDAQUAAVkGAQQOBQRNGRYHAwUAGBQFGFk4MCYXBBIJ CRJNODAmFwQSEglSAAkSCUYbS7AqUFhA1QAhCDQIITRmADQuCDQuZCIgCwMKLjMuCl41ATMTLjNc ABMfLhNcACkfDB4pXgARDCsMEStmNjItAyseDCseZDcBDR4AHg0AZgAbADkBG14ADzkBOQ8BZgAV BTEFFTFmADEEBTEEZAAOBCUEDiVmJwElGAQlGGQAFBgSEhReOwEILwEuCgguWSwjAh8qKCQDHg0f HlkQAQwAOQ8MOVkdAzoDABwaAgMBBQABWQYBBA4FBE0ZFgcDBQAYFAUYWTgwJhcEEgkJEk04MCYX BBISCVIACRIJRhtLsDBQWEDWACEINAghNGYANC4INC5kIiALAwouMy4KXjUBMxMuM1wAEx8uE1wA KR8MHileABEMKwwRK2Y2Mi0DKx4MKx5kNwENHgAeDQBmABsAOQEbXgAPOQE5DwFmABUFMQUVMWYA MQQFMQRkAA4EJQQOJWYnASUYBCUYZAAUGBIYFBJmOwEILwEuCgguWSwjAh8qKCQDHg0fHlkQAQwA OQ8MOVkdAzoDABwaAgMBBQABWQYBBA4FBE0ZFgcDBQAYFAUYWTgwJhcEEgkJEk04MCYXBBISCVIA CRIJRhtA1wAhCDQIITRmADQuCDQuZCIgCwMKLjMuCl41ATMTLjNcABMfLhMfZAApHwweKV4AEQwr DBErZjYyLQMrHgwrHmQ3AQ0eAB4NAGYAGwA5ARteAA85ATkPAWYAFQUxBRUxZgAxBAUxBGQADgQl BA4lZicBJRgEJRhkABQYEhgUEmY7AQgvAS4KCC5ZLCMCHyooJAMeDR8eWRABDAA5Dww5WR0DOgMA HBoCAwEFAAFZBgEEDgUETRkWBwMFABgUBRhZODAmFwQSCQkSTTgwJhcEEhIJUgAJEglGWVlZWVlZ WVlZWUF+ABoAGAABAAABegF5AWoBaQFeAV0BWgFYAVUBUwFQAU8BTAFKAUYBRAE+AT0BNgE0ASsB KQEeARwBFwEVAQ8BDAEHAQYBAQD/APsA+gD3APUA8ADuAOsA6gDmAOQA4ADeAN0A2wDYANYA0wDS AM8AzQDKAMgAxwDFAMIAvwC8ALoAtwC2ALMAsQCtAKsAqACmAKMAoQCeAJwAlwCWAJAAjwCGAIUA dgB1AG8AbgBgAF4AWABXAE8ATgBDAEIAPgA8ADkANwArACkAIgAfABgAJwAaACcAFwAWABQAEgAR ABAADwANAAsACQAIAAcAAwACAAAABQABAAUAPAAOKwEjFTM1NAcVMzUjIhUUOwE1IxczMj0BIwEh IgYVERQWMyEyNjURNCYGNjsBLgM0NhceARcUBzMyFhQGKwEWFAYHMjc+Ax4BBw4CIi4BNz4CNwYH Bjc0PgE3IyImJT4EFhUGDwEOASMGJjQXFAYjLgE9AQYnLgE0Nz4EMh4BBwYHFg4BJyIuAz4BMx4C NgYrARUUBiMiNTQ2MxY2PQEjIiY1NDY7ATU0NjIWHQEzMhY2BisBIiY0NjsBNSMiJjQ2OwE1ND4B Fh0BMzIeAQYrARUzMhYFFAYnIxUUBiciJj0BIwY9ATQ+ATsBNTQ2Mx4BHQEzMhYVNxQOASY9ATQm KwEiDgEdARQGIyImPQE0NjsBLgI1Njc2FgcGBzMyHgEVFiYnFRQGIyImPQEHDgIiJjQ+AjcjIiY3 PgE7ATU0PgEWHQEzMh4BBisBFTY3Mh4BFRQOAScmFgYnIi4BJw4CJjc0PgUyFhUGBx4BAjgqMoUy KwcHKzJTKwcyAZP8uhgiIhgDRhgiIr0JCDUDAgoFCwcKGQEDLAcJCQc3AgcbDR4DCwUMCwEDBDFB FAcBBAIGKhsTGBoCBR8NKQcJ/WICGw0ODxEBDhQTEQQFCkoICQkHEA0GCQUCFhgMBxAJAQQDDlQC CQYGBQQGBwEJBwUJC2UJBREHIRcHAxAFWgYJCQZaBxAJEQcHAgkGiwULCgYzKAUKCQYoBxIHKQUJ AQoFKTgECwECExUrCgcFCy0nAxATLgkJBwgrFxEYBxEKAwegBgIBBwoGChMVRQMGAgIKChkBAQRF Ew8EcwUGCQgHCAUBCQgNBwIUDwUXBQoBAQgFGAcQCQgFCQEKBQgEBwYLCwYMAwSwCwcFBxEUFyMn DAELLCcdDwgNCgEkIQgBLxYPBwcPFkMHFxcGEQEyIhj+ahgiIhgBlhgitgoEAwkHCQsBARsGBAQJ CgoDBQ0XBQQSBAEJDAYGOiYJCwQCBBIZBAECFAUGEhoHBQMSDREODwcJDhMSBgEHDbkFDAELBWYS AgEJDQUDDxgXCAoKCAUQbQoHAQYJCQwJCAEIFCcHOgYVEwcGAQYIKAgGBgoHBQkJBQcKLQkGDwgc Bw0IGwUKAQsFGwYPBxwHXRQPARgFCQEHBhgBI0EEEQ0NBAkBCAQNEBM1BgYBBwUIBAMCAwEGBAkH BgkRDwUHBgUKAgMXCAMEDA0GYhAKbwcJCQdYCQMLBgkLBhciFAkIBggkBwkBCQgkBw8JIAYBDBwF BQsBAwJWCgEGFREQFQ4OBwgFEB4bEwcJBw4fHA4AAAsAIQAkA9sCLgAFAAsAEQAXACcAYQCaALwA 5wEgAToHMEEzANsAAQAUACcA4AABACEAFAEVAAEAAQANAFoAAQAsAAEAVgABAA8AFQE2AR8A8gAD AAMAAAE4AAEAAgAkAScAAQAWAA4BLAABABEAGAAJAEAANQABACEA6gABACwAUgABABcAAwA/S7AL UFhAtQAnCBQUJ14iASEUChQhXgsBChMUClwoASYTHxQmXgAcHwwbHF4pJSADHgwbDB4bZioBDRIB FA1eAA8VABEPXgAXAyQDFyRmACQCESRcAA4CFhEOXhoBGBYRERheKyMCGREJERleLgEIABQhCBRZ AB8dARsSHxtZABMAEg0TElkQAQwALBUMLFktBAIBBQEAAwEAVwcBAwYBAg4DAlkAFQAWGBUWWQAR GQkRTQAREQlSAAkRCUYbS7AOUFhAtgAnCBQUJ14iASEUChQhXgsBChMUClwoASYTHxQmXgAcHwwb HF4pJSADHgwbDB4bZioBDRIBFA1eAA8VABUPAGYAFwMkAxckZgAkAhEkXAAOAhYRDl4aARgWEREY XisjAhkRCREZXi4BCAAUIQgUWQAfHQEbEh8bWQATABINExJZEAEMACwVDCxZLQQCAQUBAAMBAFcH AQMGAQIOAwJZABUAFhgVFlkAERkJEU0AEREJUgAJEQlGG0uwE1BYQLcAJwgUFCdeIgEhFAoUIV4L AQoTFApcKAEmEx8UJl4AHB8MGxxeKSUgAx4MGwweG2YqAQ0SARINAWYADxUAFQ8AZgAXAyQDFyRm ACQCESRcAA4CFhEOXhoBGBYRERheKyMCGREJERleLgEIABQhCBRZAB8dARsSHxtZABMAEg0TElkQ AQwALBUMLFktBAIBBQEAAwEAVwcBAwYBAg4DAlkAFQAWGBUWWQARGQkRTQAREQlSAAkRCUYbS7Ac UFhAuAAnCBQUJ14iASEUChQhXgsBChMUClwoASYTHxQmXgAcHwwbHF4pJSADHgwbDB4bZioBDRIB Eg0BZgAPFQAVDwBmABcDJAMXJGYAJAIDJAJkAA4CFhEOXhoBGBYRERheKyMCGREJERleLgEIABQh CBRZAB8dARsSHxtZABMAEg0TElkQAQwALBUMLFktBAIBBQEAAwEAVwcBAwYBAg4DAlkAFQAWGBUW WQARGQkRTQAREQlSAAkRCUYbS7AjUFhAuQAnCBQUJ14iASEUChQhXgsBChMUClwoASYTHxQmXgAc HwwbHF4pJSADHgwbDB4bZioBDRIBEg0BZgAPFQAVDwBmABcDJAMXJGYAJAIDJAJkAA4CFgIOFmYa ARgWEREYXisjAhkRCREZXi4BCAAUIQgUWQAfHQEbEh8bWQATABINExJZEAEMACwVDCxZLQQCAQUB AAMBAFcHAQMGAQIOAwJZABUAFhgVFlkAERkJEU0AEREJUgAJEQlGG0uwLFBYQLoAJwgUFCdeIgEh FAoUIV4LAQoTFApcKAEmEx8TJh9mABwfDBscXiklIAMeDBsMHhtmKgENEgESDQFmAA8VABUPAGYA FwMkAxckZgAkAgMkAmQADgIWAg4WZhoBGBYRERheKyMCGREJERleLgEIABQhCBRZAB8dARsSHxtZ ABMAEg0TElkQAQwALBUMLFktBAIBBQEAAwEAVwcBAwYBAg4DAlkAFQAWGBUWWQARGQkRTQAREQlS AAkRCUYbS7AxUFhAuwAnCBQUJ14iASEUChQhXgsBChMUClwoASYTHxMmH2YAHB8MGxxeKSUgAx4M GwweG2YqAQ0SARINAWYADxUAFQ8AZgAXAyQDFyRmACQCAyQCZAAOAhYCDhZmGgEYFhEWGBFmKyMC GREJERleLgEIABQhCBRZAB8dARsSHxtZABMAEg0TElkQAQwALBUMLFktBAIBBQEAAwEAVwcBAwYB Ag4DAlkAFQAWGBUWWQARGQkRTQAREQlSAAkRCUYbQLwAJwgUFCdeIgEhFAoUIV4LAQoTFApcKAEm Ex8TJh9mABwfDB8cDGYpJSADHgwbDB4bZioBDRIBEg0BZgAPFQAVDwBmABcDJAMXJGYAJAIDJAJk AA4CFgIOFmYaARgWERYYEWYrIwIZEQkRGV4uAQgAFCEIFFkAHx0BGxIfG1kAEwASDRMSWRABDAAs FQwsWS0EAgEFAQADAQBXBwEDBgECDgMCWQAVABYYFRZZABEZCRFNABERCVIACREJRllZWVlZWVlB YAAaABgADQAMATQBMwEkASMBGAEXARQBEgEPAQ0BCgEJAQYBBAEAAP4A+AD3AO8A7QDkAOIA1wDV ANAAzgDIAMUAwAC/ALoAuAC0ALMAsACuAKkApwCkAKMAnwCdAJkAlwCSAJAAjACJAIMAgAB8AHkA dQBzAGkAZgBgAF4AWABXAE8ATgBDAEIAPgA8ADkANwArACkAIgAfABgAJwAaACcAFwAWABUAEwAP AA4ADAARAA0AEQASACEAIQARAC8AEisBFTM1IyIXMzI9ASM3IxUzNTQHFDsBNSMBISIGFREUFjMh MjY1ETQmBjY7AS4DNDYXHgEXFAczMhYUBisBFhQGBzI3PgMeAQcOAiIuATc+AjcGBwY3ND4BNyMi JgUOAysBLgI9ATQ+ARYdATMyNj0BNCsBIiY1NDY7ATIWHQEUDgIjBxUUHgEzMj4BPwE2Mx4BJRQG JyMVFAYnIiY9ASMGPQE0PgE7ATU0NjMeAR0BMzIWFTcUDgEmPQE0JisBIg4BHQEUBiMiJj0BNDY7 AS4CNTY3NhYHBgczMh4BFRYmJxUUBiMiJj0BMAcOAiImND4CNyMiJjc+ATsBNTQ+ARYdATMyHgEG KwEVNjcyHgEVFA4BJyYWBiciLgEnDgImNzQ+BTIWFQYHHgEBuzIrB1MrBzIqKjKFBysyAeb8uhgi IhgDRhgiIr0JCDUDAgoFCwcKGQEDLAcJCQc3AgcbDR4DCwUMCwEDBDFBFAcBBAIGKhsTGBoCBR8N KQcJ/l4DCxIPODcdGhEIDgx4CwMOkggICAiWFhYDCxAOfAQTRC0NCAMFBQsQAgEDExUrCgcFCy0n AxATLgkJBwgrFxEYBxEKAwegBgIBBwoGChMVRQMGAgIKChkBAQRFEw8EcwUGCQgHCAUBCQgNBwIU DwUXBQoBAQgFGAcQCQgFCQEKBQgEBwYLCwYMAwSwCwcFBxEUFyMnDAELLCcdDwgNCgEkIQgBKA8W SgYRMxYPB0MHFwEyIhj+ahgiIhgBlhgitgoEAwkHCQsBARsGBAQJCgoDBQ0XBQQSBAEJDAYGOiYJ CwQCBBIZBAECFAUGEhoHmAoXBwIBBhAYdgcKAQoIDggFIA0LBgYIExgiChMMAQFFBwgEAwYGDQsB Ew0UDwEYBQkBBwYYASNBBBENDQQJAQgEDRATNQYGAQcFCAQDAgMBBgQJBwYJEQ8FBwYFCgIDFwgD BAwNBmIQCm8HCQkHWAkDCwYJCwYXIhQJCAYIJAcJAQkIJAcPCSAGAQwcBQULAQMCVgoBBhUREBUO DgcIBRAeGxMHCQcOHxwOAAIATf/EA7MDKgAXACMAR0uwHFBYQBMEAQIAAQIBVQADAwBRAAAACgNC G0AaAAAAAwIAA1kEAQIBAQJNBAECAgFRAAECAUVZQAwaGCAdGCMaIxsUBRArAS4BJyYiBw4BBwYU Fx4BFxYyNz4BNzY0ByEiJjQ2MyEyFhQGA5EheU5RsFFOeSEiIiF5TlGwUU55ISK9/hQKDw8KAewK Dw8CIE94ISIiIXhPULFRTnkhIiIheU5RsXMPFQ8PFQ8ABADXAIEDKQJ/AEwATQBfAGAAXkBbEwEC AE1LNjUtKwoACAECAkBgAQYBPwACAAEAAgFmAAEDAAEDZAUBAwQAAwRkAAAABAYABFkIAQYHBwZN CAEGBgdRAAcGB0VfXFhVUE5IR0E+ODc0MykoGRgJDisTMDc2NzYXFgcwBx4BFxYXFjc2NyYnJjc2 FhcWBgcwFx4BFx4BNz4BNzI2NyY1JjY3NhYXMhcVBiMGBw4BBwYjISInLgEnJiciJyYnMDUBMzIe AQYHBiMhIicmNzYzNjMx1wIIGRgMCxAEDTcOFQoJBSc3FgEBDAwgCwsIEhgMLQsEBwcSRhIBAwEM AREODhgEAQEKHQIBCikKBAz+nAwDCSEIAwsYCwEEASmmCxADDQoDBP60FQYHEAkKEpMB7wYXAgIW FhMECCEJDQYGCUhkCxYRCwwCDQ4fDS0UUxUHAgQLKwsCAQwODhYCAw8OBA0eBQIjjSQMDB1zHAkm FAEJDf7KDhYRAgETFAsFAQAADgAbAJsD5QJlAA8AHwAxAEAARgBiAGYAagBuAHIAdgB6AH4AigOV QBRBASUFQgEkJYNFAg8OhEQCAg8EQEuwC1BYQJUhIAIdCgkUHV4tIh8DHgkECh5eCAEEFAoEXAAG ExIJBl4AKxIREisRZgcBBSYlBgVeLAEAAAMKAANZEA0LAwkeCglLFQwCChYBFBMKFFcXARMYARIr ExJXGQERACopESpXACkAKCcpKFcAJwAmBScmVwAlACQOJSRXIxwaAw4bAQ8CDg9ZAAIBAQJNAAIC AVIAAQIBRhtLsBtQWECWISACHQoJFB1eLSIfAx4JBAoeXggBBBQKBFwABhMSCQZeACsSERIrEWYH AQUmJSYFJWYsAQAAAwoAA1kQDQsDCR4KCUsVDAIKFgEUEwoUVxcBExgBEisTElcZAREAKikRKlcA KQAoJykoVwAnACYFJyZXACUAJA4lJFcjHBoDDhsBDwIOD1kAAgEBAk0AAgIBUgABAgFGG0uwHFBY QJchIAIdCgkUHV4tIh8DHgkECh5eCAEEFAkEFGQABhMSCQZeACsSERIrEWYHAQUmJSYFJWYsAQAA AwoAA1kQDQsDCR4KCUsVDAIKFgEUEwoUVxcBExgBEisTElcZAREAKikRKlcAKQAoJykoVwAnACYF JyZXACUAJA4lJFcjHBoDDhsBDwIOD1kAAgEBAk0AAgIBUgABAgFGG0uwJFBYQJghIAIdCgkUHV4t Ih8DHgkECh5eCAEEFAkEFGQABhMSEwYSZgArEhESKxFmBwEFJiUmBSVmLAEAAAMKAANZEA0LAwke CglLFQwCChYBFBMKFFcXARMYARIrExJXGQERACopESpXACkAKCcpKFcAJwAmBScmVwAlACQOJSRX IxwaAw4bAQ8CDg9ZAAIBAQJNAAICAVIAAQIBRhtAmiEgAh0KCQodCWYtIh8DHgkECR4EZggBBBQJ BBRkAAYTEhMGEmYAKxIREisRZgcBBSYlJgUlZiwBAAADCgADWRANCwMJHgoJSxUMAgoWARQTChRX FwETGAESKxMSVxkBEQAqKREqVwApACgnKShXACcAJgUnJlcAJQAkDiUkVyMcGgMOGwEPAg4PWQAC AQECTQACAgFSAAECAUZZWVlZQGJrawIAiol+fXx7enl4d3Z1dHNycXBva25rbm1samloZ2ZlZGNi YWBfXl1cW1hXVlVUU1JRUE9OTUxLSEdAPz07Ojc1NDMyMC8uLSwrKSgnJiUkIyIhIB0aFRIKBwAP Ag8uDisBISIGFREUFjMhMjY1ETQmExQGIyEiJjURNDYzITIWFQUjFTM1MxUzNSM2NzM1IxUzBicj FTMVFCMiJxczMj0BMxcHFhc3JiUjNDY3MzUjNzM1IxUzByMVMxQGByMVIxUzNSMnMxUrAjUzFzUz FRcjNTM1IzUzNSM1MzUjNTMFBgcGBxc2NzY3NSMDr/yiFiAgFgNeFiAgEhcR/KIRFxcRA14RF/7h LRJSEzYCATyIOQJBXSkKCRMEHxcgYw0eEg4T/sNOAgFtawFYw1gCaGYCAUEn8ScrKChOKCgSKip9 fX19fX19fQESAhARKwstExQCEwJlIBb+ohYgIBYBXhYg/mwRFxcRAV4RFxcRaYBuboAMEBMTECMT uAsBExi9nQ0YFg4VaQMLAg8PMjIPDwMKA3YQEMgWFhYWFrIRDBENEQwRFSIWFA0QDhcZKzAAAAAD AD//vwPAA0AADwAbAB8AMkAvAAQDBQMEBWYABQIDBQJkAAAAAwQAA1kAAgEBAk0AAgIBUgABAgFG ERUVFxcQBhQrACIOAhQeAjI+AjQuAQIiLgE0PgEyHgEUBgEhFSECW7emeEdHeKa3pnhHR3iZ0bFn Z7HRsWdn/ekB+/4FA0BHeKa3pnhHR3imt6Z4/QZnsdGxZ2ex0bEBPkoAAAAAAgBAAAADvgMCABIA EwBPQA8JAgIDAA8BAQMCQBMBAD5LsBdQWEASAAEDAWkEAQMDAE8CAQAACgNCG0AYAAEDAWkCAQAD AwBLAgEAAANRBAEDAANFWbYUERQUEAUTKwEhFQYHAyMDJic1IRUGFxsBNiM1AnsBQ3Yx7Wn5K10B pokyqK44ogMCLAuE/bkCY2IRLCwGYv43Ab5zLAAACACBAAEDfwL/ABcAIwCGAJUArwDaAOAA5AY1 QD6GeHQDBRR7ARUFrAEHCKsBCwmdeQIWC24BChZGAQwKRQEgDL1KAh8gVQElH+DJXwMkJVNSAiYk DEBtAQwBP0uwClBYQKoAAgACaAAAFABoABQFFGgABRUEBVwoARUEFWgAGAYIBhheAAgHBwhcGgEL CRYKC14AFgoJFgpkACAMHwwgH2YADiYnDA5eABAjIiMQImYAIg8jIg9kIR4CDwEjD1wAAQMjAQNk AAMDZxMBBBcBBhgEBlodAQccAQkLBwlaGxkSAwoRDQIMIAoMWgAfACUkHyVXACQAJg4kJlcAJyMj J0sAJycjTykBIycjQxtLsAtQWECrAAIAAmgAABQAaAAUBRRoAAUVBAVcKAEVBBVoABgGCAYYXgAI BwcIXBoBCwkWCgteABYKCRYKZAAgDB8MIB9mAA4mJyYOJ2YAECMiIxAiZgAiDyMiD2QhHgIPASMP XAABAyMBA2QAAwNnEwEEFwEGGAQGWh0BBxwBCQsHCVobGRIDChENAgwgCgxaAB8AJSQfJVcAJAAm DiQmVwAnIyMnSwAnJyNPKQEjJyNDG0uwIVBYQKwAAgACaAAAFABoABQFFGgABRUEBVwoARUEFWgA GAYIBhheAAgHBwhcGgELCRYKC14AFgoJFgpkACAMHwwgH2YADiYnJg4nZgAQIyIjECJmACIPIyIP ZCEeAg8BIw8BZAABAyMBA2QAAwNnEwEEFwEGGAQGWh0BBxwBCQsHCVobGRIDChENAgwgCgxaAB8A JSQfJVcAJAAmDiQmVwAnIyMnSwAnJyNPKQEjJyNDG0uwIlBYQK0AAgACaAAAFABoABQFFGgABRUE BVwoARUEFWgAGAYIBhheAAgHBwhcGgELCRYJCxZmABYKCRYKZAAgDB8MIB9mAA4mJyYOJ2YAECMi IxAiZgAiDyMiD2QhHgIPASMPAWQAAQMjAQNkAAMDZxMBBBcBBhgEBlodAQccAQkLBwlaGxkSAwoR DQIMIAoMWgAfACUkHyVXACQAJg4kJlcAJyMjJ0sAJycjTykBIycjQxtLsCNQWECsAAIAAmgAABQA aAAUBRRoAAUVBAVcKAEVBBVoABgGCAYYXgAIBwcIXBoBCwkWCgteABYKCRYKZAAgDB8MIB9mAA4m JyYOJ2YAECMiIxAiZgAiDyMiD2QhHgIPASMPAWQAAQMjAQNkAAMDZxMBBBcBBhgEBlodAQccAQkL BwlaGxkSAwoRDQIMIAoMWgAfACUkHyVXACQAJg4kJlcAJyMjJ0sAJycjTykBIycjQxtLsCVQWECt AAIAAmgAABQAaAAUBRRoAAUVBAVcKAEVBBVoABgGCAYYXgAIBwcIXBoBCwkWCQsWZgAWCgkWCmQA IAwfDCAfZgAOJicmDidmABAjIiMQImYAIg8jIg9kIR4CDwEjDwFkAAEDIwEDZAADA2cTAQQXAQYY BAZaHQEHHAEJCwcJWhsZEgMKEQ0CDCAKDFoAHwAlJB8lVwAkACYOJCZXACcjIydLACcnI08pASMn I0MbS7AmUFhArAACAAJoAAAUAGgAFAUUaAAFFQVoKAEVBBVoABgGCAYYXgAIBwcIXBoBCwkWCQsW ZgAWCgkWCmQAIAwfDCAfZgAOJicmDidmABAjIiMQImYAIg8jIg9kIR4CDwEjDwFkAAEDIwEDZAAD A2cTAQQXAQYYBAZaHQEHHAEJCwcJWhsZEgMKEQ0CDCAKDFoAHwAlJB8lVwAkACYOJCZXACcjIydL ACcnI08pASMnI0MbQK0AAgACaAAAFABoABQFFGgABRUFaCgBFQQVaAAYBggGGF4ACAcGCAdkGgEL CRYJCxZmABYKCRYKZAAgDB8MIB9mAA4mJyYOJ2YAECMiIxAiZgAiDyMiD2QhHgIPASMPAWQAAQMj AQNkAAMDZxMBBBcBBhgEBlodAQccAQkLBwlaGxkSAwoRDQIMIAoMWgAfACUkHyVXACQAJg4kJlcA JyMjJ0sAJycjTykBIycjQ1lZWVlZWVlAUbCwiIfk4+Lh3t3c27DasNrW1c/OxcPAv7a0r62qqKel oqGfnpqZl5aOjIeViJWCgX59cW9samVkW1lQT0lHREE+PDo5ODYiESMiFRUbGxAqFysAMhceARcW FAcOAQcGIicuAScmNDc+ATc2Ig4BFB4BMj4BNCYHMz4BMzIWFRQrARUzPgEzMhYUKwEVMz4BMzIW FRQrASIHJwYrARUeARUUBiImNTc0JxUUDgEjIjU3PQEGBwYHBiM1NDc2NyMiBycWOwE1NCceARQH FTY3FhczNTQnHgIUBwUyHgEUBiMiNzY1NCcmNAUjFgYjDgEHFTM+ATIWFxY7ATUjIgcnFjsBBxUU DgEjIjU3Nj0BNCcWFzM+AjMyHgEUBxUUDgIiJy4BJyY0Mj4BPQEnMzUjBgcXIxUzAbiQQT9iGxsb G2I/QZBBP2IaHBwaYj/x0LBnZ7DQsGdnnykKCwQIMgpyGg4HAwYxC143CQ0EBjMK9QoJCAQHRiMm FBYLARUEHhAFARQRFhoIAQQ3EygNCgwLEEABNBANEg4YFFgBHiIJC/6UBC0bFQwZAwETBAEwQgEF BQsaNBEKCAggBAcMQjwLCQ8NDkQQBiEQBQEBASkWWwQMAwIGKxEMBA8oEwIFExYHJRcHaGhdAwho aGgC4BsbYj9BkEE/YhocHBpiP0GQQT9iGzpmsdCwZ2ew0LFmExAnCQUoGQgnDC4TEyoIBQYLAh8J JBULFwwLDBsY3wYFCAYWMHkfFRkVBwECBk9rAxcCeiMZBAQKBn8pRAoMExsVAQYECQUjGSEgFxsL CiEZBQIZAwQBFTQTEgwbBgEuBhkB9WQFBQgEGRoVkhoVCgsHEQIaDAsEnRkXDQkJFxAGAwMDCgso SyUIAywoAAcAL/+AA9EDgAAfACMAKwA0ADgAQgBMAHJAbzUhAgEENgEHATIxMC0sIAYGB0tJSEdG RURDQkA/Pj08OzoYCxIFBgRAAwEBBAcEAQdmCgEACQgCBAEABFcABwAGBQcGWQAFAgIFTQAFBQJR AAIFAkUCADg3NDMvLisqJyYjIhoZEhEKCQAfAh8LDisBISIGHQEUFhcWMxcOARUUHgEyPgE1NCYn Nz4BPQE0JgEnNTMAFAYgJjQ2IDcHJiIHJxcRIRcHETMBBxcHNxcnNy8BFwcXJwc3Jz8BFwOR/N4a JiEZAQPIR1NfpcKlX1NHyBokJv1yw8MCGrb+/ra2AQJNKk2uTR8LAYbYra3+FJ1xG42NG3GdRppa IWFhIVt7IB8DgCMY2RchAgFhLYxSWJZXV5ZYUowtYQEjF9kYI/6HZe394eqmpuqmHBYkJBAGAWnt WgFH/cYWapVHR5VqFoivU2A9PWBVDlRUAAMAggAFA4AC+wBdALMAtABdQFqknZqXljAjBwIDqKZ4 dXMFAQKxr62rbm06NzUzIR8bDQABA0COAQM+tGteUE1FQD8WFBENCwkGDwA9BAEDAgNoAAIBAmgA AQABaAAAAF+Qj42MfHtxcBkYBQ4rJTY3Njc2PwE2NzQ3MDc0NzY3NDY1NjcwNTM2NTA1NCc9ASYn BwYmLwEmNh8BHgEPARYfARQVFhcUFhUWHQEUBxUGBw4BFQYHBgcGBwYHDgEHBgcOAQcGBwYHBi4B NiUHBhYfARY2LwEuAQ8BJic1JjcyPQE2NzQ2NzY3NjM2Nz4BNzY3Njc+AS4BBwYHIjEVIgYHBgcG DwEOAQcOAQcGBwYHDgEVBgcUDwEGFx0BFhcUFRcWFwI0XUEICAEDAgcEBgkEBgMBBQMBCwIMSS8C BgEpAQQDyQMCAjBVFgEBAgECDwQGAQIEBwQCBAcHAQECAQILAQMBDQxUeBMfBxb+0DACAgPJAwQB KQEGAi9KCwcZAQQGAgEEBgQBBQcBAwEICUFcEhYHHxN3VAEBAgEMCAIDAwEIAgECAQEGCAUBAwcF AQEhCQICARZVYBBDCAoBAwMKBQEJDwEHDAcBAwENCgEoKgENDQMDZkgvAgEDygIEASkBBQIwVXYB AQEEEgEGAg4TAzY1Ag0RAQUBCg4IAwcNCwIBAwEEDQEEAREMVBUDFiYfFTACBQEpAQQDyQMCAy9K aAFGQgEBCgsBBAEHCwcICQEEAQoJQhADHyYWAxRVAQMBDAoCBAQBCwMBAwECCg0IAgcBDwsBAQJW XAIBEwgBAQJ1VQAAAAABAAAAAQAAxncRmF8PPPUACwQAAAAAANOJiE0AAAAA04mITQAA/3sEAAOA AAAACAACAAAAAAAAAAEAAAOA/3sAXAQBAAAAAAQAAAEAAAAAAAAAAAAAAAAAAABrAXYAIgAAAAAB VQAAA+kALAQAACwEAAAlBAAAQgQAAFcEAAC8BAAAVwQAAAwEAABEBAAAhwQAAB4EAAAqBAAAKQQA ACsEAAArBAAAQAQAAEgEAAGiBAAAQAQAAEAEAABgBAAAQAQAACAEAABBBAAAHwQAAEAEAABgBAAA YAQAAGAEAABABAAAfwQAAEAEAAAfBAAAQAQAAEIEAABCBAAAQQQAAEAEAABABAAAoAQAAKAEAAB/ BAAAPwQAAEAEAABABAAAQAQAAEAEAABgBAAAYAQAAEAEAABABAAAQAQAAKAEAABgBAAAQAQAAEAE AACDBAAAgQQAACAEAAAgBAAAQAQAAIAEAACABAAAoAQAAKAEAABCBAAAQAQAAEAEAABABAAAggQA AEsEAABLBAAAQAQAAEAEAABgBAAAYAQAAIAEAACBBAAAgAQAAEAEAABABAAAQAQAAEAEAABABAAA gAQAAOAEAABgBAAAQAQAAGMEAACBBAAAwAQAACAEAABgBAAAAAQAABcEAAAXBAAADgQAAA4EAAAN BAAADgQAAA4EAAAOBAEACQQAARYBEwAAAQAAZgAAAC4ALgAAAEIAdgBxAHEASwAhACEATQDXABsA PwBAAIEALwCCAAAAAAAoACgAKAFkAc4CIgI+AlICigKgA1wEpAfQCHgJRAmQCe4KOAq4C0YLsgw0 DRgOlg+aECQQshEUEioSuhOiFKIVDhVUFfoXEBeAF9YYShjIGYgaLBreG2YcIhzeHSYdtB38Hl4f Bh/UIOAhbiIUIqIjNCOoJHok4iWQJfwmrieCJ+QoxCkCKXAqRis4K5wsFCxWLKItHC2SLi4uvC96 MAoxCjFEMa4yTjL6M4Y0KjS6NRI2KDaWN6I4ojjyOUY5zjoIO2Y8Sj0uPZQ+FD8gP7BA3EGiQexC HkKKQv5DekSmRSxFlkYiR/hIyEkASThJ2lFIVnxW2leaWiBacFq+XwpfvmDxAAAAAQAAAIIBgQAS AAAAAAACAHgAhgBsAAABqwrqAAAAAAAAAAwAlgABAAAAAAABAAgAAAABAAAAAAACAAYACAABAAAA AAADACQADgABAAAAAAAEAAgAMgABAAAAAAAFAEYAOgABAAAAAAAGAAgAgAADAAEECQABABAAiAAD AAEECQACAAwAmAADAAEECQADAEgApAADAAEECQAEABAA7AADAAEECQAFAIwA/AADAAEECQAGABAB iGljb25mb250TWVkaXVtRm9udEZvcmdlIDIuMCA6IGljb25mb250IDogMTctNi0yMDE2aWNvbmZv bnRWZXJzaW9uIDEuMCA7IHR0ZmF1dG9oaW50ICh2MC45NCkgLWwgOCAtciA1MCAtRyAyMDAgLXgg MTQgLXcgIkciIC1mIC1zaWNvbmZvbnQAaQBjAG8AbgBmAG8AbgB0AE0AZQBkAGkAdQBtAEYAbwBu AHQARgBvAHIAZwBlACAAMgAuADAAIAA6ACAAaQBjAG8AbgBmAG8AbgB0ACAAOgAgADEANwAtADYA LQAyADAAMQA2AGkAYwBvAG4AZgBvAG4AdABWAGUAcgBzAGkAbwBuACAAMQAuADAAIAA7ACAAdAB0 AGYAYQB1AHQAbwBoAGkAbgB0ACAAKAB2ADAALgA5ADQAKQAgAC0AbAAgADgAIAAtAHIAIAA1ADAA IAAtAEcAIAAyADAAMAAgAC0AeAAgADEANAAgAC0AdwAgACIARwAiACAALQBmACAALQBzAGkAYwBv AG4AZgBvAG4AdAAAAAIAAAAAAAD/gwAyAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAEAAgBbAQIB AwEEAQUBBgEHAQgBCQEKAQsBDAENAQ4BDwEQAREBEgETARQBFQEWARcBGAEZARoBGwEcAR0BHgEf ASABIQEiASMBJAElASYBJwEoASkBKgErASwBLQEuAS8BMAExATIBMwE0ATUBNgE3ATgBOQE6ATsB PAE9AT4BPwFAAUEBQgFDAUQBRQFGAUcBSAFJAUoBSwFMAU0BTgFPAVABUQFSAVMBVAFVAVYBVwFY AVkBWgFbAVwBXQFeAV8BYAFhAWIBYwFkAWUBZgFnAWgBaQFqAWsBbAFtAW4BbwFwAXEBcgFzAXQB dQF2AXcBeAF5AXoBewF8AX0BfgF/B3VuaUU2MDAHdW5pRTYwMQd1bmlFNjAyB3VuaUU2MDMHdW5p RTYwNAd1bmlFNjA1B3VuaUU2MDYHdW5pRTYwNwd1bmlFNjA4B3VuaUU2MDkHdW5pRTYwQQd1bmlF NjBCB3VuaUU2MEMHdW5pRTYwRAd1bmlFNjBFB3VuaUU2MEYHdW5pRTYxMAd1bmlFNjExB3VuaUU2 MTIHdW5pRTYxMwd1bmlFNjE0B3VuaUU2MTUHdW5pRTYxNgd1bmlFNjE3B3VuaUU2MTgHdW5pRTYx OQd1bmlFNjFBB3VuaUU2MUIHdW5pRTYxQwd1bmlFNjFEB3VuaUU2MUUHdW5pRTYxRgd1bmlFNjIw B3VuaUU2MjEHdW5pRTYyMgd1bmlFNjIzB3VuaUU2MjQHdW5pRTYyNQd1bmlFNjI2B3VuaUU2MjcH dW5pRTYyOAd1bmlFNjI5B3VuaUU2MkEHdW5pRTYyQgd1bmlFNjJDB3VuaUU2MkQHdW5pRTYyRQd1 bmlFNjJGB3VuaUU2MzAHdW5pRTYzMQd1bmlFNjMyB3VuaUU2MzMHdW5pRTYzNAd1bmlFNjM1B3Vu aUU2MzYHdW5pRTYzNwd1bmlFNjM4B3VuaUU2MzkHdW5pRTYzQQd1bmlFNjNCB3VuaUU2M0MHdW5p RTYzRAd1bmlFNjNFB3VuaUU2M0YHdW5pRTY0MAd1bmlFNjQxB3VuaUU2NDIHdW5pRTY0Mwd1bmlF NjQ0B3VuaUU2NDUHdW5pRTY0Ngd1bmlFNjQ3B3VuaUU2NDgHdW5pRTY0OQd1bmlFNjRBB3VuaUU2 NEIHdW5pRTY0Qwd1bmlFNjREB3VuaUU2NEUHdW5pRTY0Rgd1bmlFNjUwB3VuaUU2NTEHdW5pRTY1 Mgd1bmlFNjUzB3VuaUU2NTQHdW5pRTY1NQd1bmlFNjU2B3VuaUU2NTcHdW5pRTY1OAd1bmlFNjU5 B3VuaUU2NUEHdW5pRTY1Qgd1bmlFNjVDB3VuaUU2NUQHdW5pRTY1RQd1bmlFNjVGB3VuaUU2NjAH dW5pRTY2MQd1bmlFNjYyB3VuaUU2NjMHdW5pRTY2NAd1bmlFNjY1B3VuaUU2NjYHdW5pRTY2Nwd1 bmlFNjY4B3VuaUU2NjkHdW5pRTY2QQd1bmlFNjZCB3VuaUU2NkMHdW5pRTY2RAd1bmlFNjZFB3Vu aUU2NkYHdW5pRTY3MAd1bmlFNjcxB3VuaUU2NzIHdW5pRTY3Mwd1bmlFNjc0B3VuaUU2NzUHdW5p RTY3Ngd1bmlFNjc3B3VuaUU2NzgHdW5pRTY3OQd1bmlFNjdBB3VuaUU2N0IHdW5pRTY3Qwd1bmlF NjdEAAAAAQAB//8ADwAAAAAAAAAAAAAAAAAAAAAAMgAyAxj/4QOA/3sDGP/hA4D/e7AALLAgYGYt sAEsIGQgsMBQsAQmWrAERVtYISMhG4pYILBQUFghsEBZGyCwOFBYIbA4WVkgsApFYWSwKFBYIbAK RSCwMFBYIbAwWRsgsMBQWCBmIIqKYSCwClBYYBsgsCBQWCGwCmAbILA2UFghsDZgG2BZWVkbsAAr WVkjsABQWGVZWS2wAiwgRSCwBCVhZCCwBUNQWLAFI0KwBiNCGyEhWbABYC2wAywjISMhIGSxBWJC ILAGI0KyCgACKiEgsAZDIIogirAAK7EwBSWKUVhgUBthUllYI1khILBAU1iwACsbIbBAWSOwAFBY ZVktsAQssAgjQrAHI0KwACNCsABDsAdDUViwCEMrsgABAENgQrAWZRxZLbAFLLAAQyBFILACRWOw AUViYEQtsAYssABDIEUgsAArI7EEBCVgIEWKI2EgZCCwIFBYIbAAG7AwUFiwIBuwQFlZI7AAUFhl WbADJSNhREQtsAcssQUFRbABYUQtsAgssAFgICCwCkNKsABQWCCwCiNCWbALQ0qwAFJYILALI0JZ LbAJLCC4BABiILgEAGOKI2GwDENgIIpgILAMI0IjLbAKLEtUWLEHAURZJLANZSN4LbALLEtRWEtT WLEHAURZGyFZJLATZSN4LbAMLLEADUNVWLENDUOwAWFCsAkrWbAAQ7ACJUKyAAEAQ2BCsQoCJUKx CwIlQrABFiMgsAMlUFiwAEOwBCVCioogiiNhsAgqISOwAWEgiiNhsAgqIRuwAEOwAiVCsAIlYbAI KiFZsApDR7ALQ0dgsIBiILACRWOwAUViYLEAABMjRLABQ7AAPrIBAQFDYEItsA0ssQAFRVRYALAN I0IgYLABYbUODgEADABCQopgsQwEK7BrKxsiWS2wDiyxAA0rLbAPLLEBDSstsBAssQINKy2wESyx Aw0rLbASLLEEDSstsBMssQUNKy2wFCyxBg0rLbAVLLEHDSstsBYssQgNKy2wFyyxCQ0rLbAYLLAH K7EABUVUWACwDSNCIGCwAWG1Dg4BAAwAQkKKYLEMBCuwaysbIlktsBkssQAYKy2wGiyxARgrLbAb LLECGCstsBwssQMYKy2wHSyxBBgrLbAeLLEFGCstsB8ssQYYKy2wICyxBxgrLbAhLLEIGCstsCIs sQkYKy2wIywgYLAOYCBDI7ABYEOwAiWwAiVRWCMgPLABYCOwEmUcGyEhWS2wJCywIyuwIyotsCUs ICBHICCwAkVjsAFFYmAjYTgjIIpVWCBHICCwAkVjsAFFYmAjYTgbIVktsCYssQAFRVRYALABFrAl KrABFTAbIlktsCcssAcrsQAFRVRYALABFrAlKrABFTAbIlktsCgsIDWwAWAtsCksALADRWOwAUVi sAArsAJFY7ABRWKwACuwABa0AAAAAABEPiM4sSgBFSotsCosIDwgRyCwAkVjsAFFYmCwAENhOC2w KywuFzwtsCwsIDwgRyCwAkVjsAFFYmCwAENhsAFDYzgtsC0ssQIAFiUgLiBHsAAjQrACJUmKikcj RyNhIFhiGyFZsAEjQrIsAQEVFCotsC4ssAAWsAQlsAQlRyNHI2GwBkUrZYouIyAgPIo4LbAvLLAA FrAEJbAEJSAuRyNHI2EgsAQjQrAGRSsgsGBQWCCwQFFYswIgAyAbswImAxpZQkIjILAJQyCKI0cj RyNhI0ZgsARDsIBiYCCwACsgiophILACQ2BkI7ADQ2FkUFiwAkNhG7ADQ2BZsAMlsIBiYSMgILAE JiNGYTgbI7AJQ0awAiWwCUNHI0cjYWAgsARDsIBiYCMgsAArI7AEQ2CwACuwBSVhsAUlsIBisAQm YSCwBCVgZCOwAyVgZFBYIRsjIVkjICCwBCYjRmE4WS2wMCywABYgICCwBSYgLkcjRyNhIzw4LbAx LLAAFiCwCSNCICAgRiNHsAArI2E4LbAyLLAAFrADJbACJUcjRyNhsABUWC4gPCMhG7ACJbACJUcj RyNhILAFJbAEJUcjRyNhsAYlsAUlSbACJWGwAUVjIyBYYhshWWOwAUViYCMuIyAgPIo4IyFZLbAz LLAAFiCwCUMgLkcjRyNhIGCwIGBmsIBiIyAgPIo4LbA0LCMgLkawAiVGUlggPFkusSQBFCstsDUs IyAuRrACJUZQWCA8WS6xJAEUKy2wNiwjIC5GsAIlRlJYIDxZIyAuRrACJUZQWCA8WS6xJAEUKy2w NyywLisjIC5GsAIlRlJYIDxZLrEkARQrLbA4LLAvK4ogIDywBCNCijgjIC5GsAIlRlJYIDxZLrEk ARQrsARDLrAkKy2wOSywABawBCWwBCYgLkcjRyNhsAZFKyMgPCAuIzixJAEUKy2wOiyxCQQlQrAA FrAEJbAEJSAuRyNHI2EgsAQjQrAGRSsgsGBQWCCwQFFYswIgAyAbswImAxpZQkIjIEewBEOwgGJg ILAAKyCKimEgsAJDYGQjsANDYWRQWLACQ2EbsANDYFmwAyWwgGJhsAIlRmE4IyA8IzgbISAgRiNH sAArI2E4IVmxJAEUKy2wOyywLisusSQBFCstsDwssC8rISMgIDywBCNCIzixJAEUK7AEQy6wJCst sD0ssAAVIEewACNCsgABARUUEy6wKiotsD4ssAAVIEewACNCsgABARUUEy6wKiotsD8ssQABFBOw KyotsEAssC0qLbBBLLAAFkUjIC4gRoojYTixJAEUKy2wQiywCSNCsEErLbBDLLIAADorLbBELLIA ATorLbBFLLIBADorLbBGLLIBATorLbBHLLIAADsrLbBILLIAATsrLbBJLLIBADsrLbBKLLIBATsr LbBLLLIAADcrLbBMLLIAATcrLbBNLLIBADcrLbBOLLIBATcrLbBPLLIAADkrLbBQLLIAATkrLbBR LLIBADkrLbBSLLIBATkrLbBTLLIAADwrLbBULLIAATwrLbBVLLIBADwrLbBWLLIBATwrLbBXLLIA ADgrLbBYLLIAATgrLbBZLLIBADgrLbBaLLIBATgrLbBbLLAwKy6xJAEUKy2wXCywMCuwNCstsF0s sDArsDUrLbBeLLAAFrAwK7A2Ky2wXyywMSsusSQBFCstsGAssDErsDQrLbBhLLAxK7A1Ky2wYiyw MSuwNistsGMssDIrLrEkARQrLbBkLLAyK7A0Ky2wZSywMiuwNSstsGYssDIrsDYrLbBnLLAzKy6x JAEUKy2waCywMyuwNCstsGkssDMrsDUrLbBqLLAzK7A2Ky2waywrsAhlsAMkUHiwARUwLQAAS7gA yFJYsQEBjlm5CAAIAGMgsAEjRCCwAyNwsA5FICBLuAAOUUuwBlNaWLA0G7AoWWBmIIpVWLACJWGw AUVjI2KwAiNEswoJBQQrswoLBQQrsw4PBQQrWbIEKAlFUkSzCg0GBCuxBgFEsSQBiFFYsECIWLEG A0SxJgGIUVi4BACIWLEGAURZWVlZuAH/hbAEjbEFAEQAAAA=") format('truetype');
+}
+
+.icon {
+	font-family: iconfont !important;
+	font-size: 16px;
+	font-style: normal;
+	-webkit-font-smoothing: antialiased;
+	-webkit-text-stroke-width: .2px;
+}
+
+.icon-1:before {
+	content: "\e66f"
+}
+
+.icon-2:before {
+	content: "\e670"
+}
+
+.icon-3:before {
+	content: "\e600"
+}
+
+.icon-4:before {
+	content: "\e601"
+}
+
+.icon-5:before {
+	content: "\e602"
+}
+
+.icon-6:before {
+	content: "\e603"
+}
+
+.icon-7:before {
+	content: "\e604"
+}
+
+.icon-8:before {
+	content: "\e605"
+}
+
+.icon-9:before {
+	content: "\e671"
+}
+
+.icon-10:before {
+	content: "\e672"
+}
+
+.icon-11:before {
+	content: "\e606"
+}
+
+.icon-12:before {
+	content: "\e607"
+}
+
+.icon-13:before {
+	content: "\e608"
+}
+
+.icon-14:before {
+	content: "\e609"
+}
+
+.icon-15:before {
+	content: "\e60a"
+}
+
+.icon-16:before {
+	content: "\e673"
+}
+
+.icon-17:before {
+	content: "\e60b"
+}
+
+.icon-18:before {
+	content: "\e60c"
+}
+
+.icon-19:before {
+	content: "\e60d"
+}
+
+.icon-20:before {
+	content: "\e60e"
+}
+
+.icon-21:before {
+	content: "\e60f"
+}
+
+.icon-22:before {
+	content: "\e610"
+}
+
+.icon-23:before {
+	content: "\e611"
+}
+
+.icon-24:before {
+	content: "\e612"
+}
+
+.icon-25:before {
+	content: "\e613"
+}
+
+.icon-26:before {
+	content: "\e614"
+}
+
+.icon-27:before {
+	content: "\e615"
+}
+
+.icon-28:before {
+	content: "\e616"
+}
+
+.icon-29:before {
+	content: "\e617"
+}
+
+.icon-30:before {
+	content: "\e618"
+}
+
+.icon-31:before {
+	content: "\e619"
+}
+
+.icon-32:before {
+	content: "\e61a"
+}
+
+.icon-33:before {
+	content: "\e61b"
+}
+
+.icon-34:before {
+	content: "\e61c"
+}
+
+.icon-35:before {
+	content: "\e61d"
+}
+
+.icon-36:before {
+	content: "\e61e"
+}
+
+.icon-37:before {
+	content: "\e61f"
+}
+
+.icon-38:before {
+	content: "\e620"
+}
+
+.icon-39:before {
+	content: "\e621"
+}
+
+.icon-40:before {
+	content: "\e622"
+}
+
+.icon-41:before {
+	content: "\e623"
+}
+
+.icon-42:before {
+	content: "\e624"
+}
+
+.icon-43:before {
+	content: "\e625"
+}
+
+.icon-44:before {
+	content: "\e626"
+}
+
+.icon-45:before {
+	content: "\e627"
+}
+
+.icon-46:before {
+	content: "\e628"
+}
+
+.icon-47:before {
+	content: "\e629"
+}
+
+.icon-48:before {
+	content: "\e62a"
+}
+
+.icon-49:before {
+	content: "\e62b"
+}
+
+.icon-50:before {
+	content: "\e62c"
+}
+
+.icon-51:before {
+	content: "\e62d"
+}
+
+.icon-52:before {
+	content: "\e62e"
+}
+
+.icon-53:before {
+	content: "\e62f"
+}
+
+.icon-54:before {
+	content: "\e630"
+}
+
+.icon-55:before {
+	content: "\e631"
+}
+
+.icon-56:before {
+	content: "\e632"
+}
+
+.icon-57:before {
+	content: "\e633"
+}
+
+.icon-58:before {
+	content: "\e634"
+}
+
+.icon-59:before {
+	content: "\e635"
+}
+
+.icon-60:before {
+	content: "\e636"
+}
+
+.icon-61:before {
+	content: "\e637"
+}
+
+.icon-62:before {
+	content: "\e638"
+}
+
+.icon-63:before {
+	content: "\e639"
+}
+
+.icon-64:before {
+	content: "\e63a"
+}
+
+.icon-65:before {
+	content: "\e63b"
+}
+
+.icon-66:before {
+	content: "\e63c"
+}
+
+.icon-67:before {
+	content: "\e63d"
+}
+
+.icon-68:before {
+	content: "\e63e"
+}
+
+.icon-69:before {
+	content: "\e63f"
+}
+
+.icon-70:before {
+	content: "\e640"
+}
+
+.icon-71:before {
+	content: "\e641"
+}
+
+.icon-72:before {
+	content: "\e642"
+}
+
+.icon-73:before {
+	content: "\e643"
+}
+
+.icon-74:before {
+	content: "\e644"
+}
+
+.icon-75:before {
+	content: "\e645"
+}
+
+.icon-76:before {
+	content: "\e646"
+}
+
+.icon-77:before {
+	content: "\e647"
+}
+
+.icon-78:before {
+	content: "\e648"
+}
+
+.icon-79:before {
+	content: "\e649"
+}
+
+.icon-80:before {
+	content: "\e64a"
+}
+
+.icon-81:before {
+	content: "\e64b"
+}
+
+.icon-82:before {
+	content: "\e64c"
+}
+
+.icon-83:before {
+	content: "\e64d"
+}
+
+.icon-84:before {
+	content: "\e64e"
+}
+
+.icon-85:before {
+	content: "\e64f"
+}
+
+.icon-86:before {
+	content: "\e650"
+}
+
+.icon-87:before {
+	content: "\e651"
+}
+
+.icon-88:before {
+	content: "\e652"
+}
+
+.icon-89:before {
+	content: "\e653"
+}
+
+.icon-90:before {
+	content: "\e654"
+}
+
+.icon-91:before {
+	content: "\e655"
+}
+
+.icon-92:before {
+	content: "\e656"
+}
+
+.icon-93:before {
+	content: "\e657"
+}
+
+.icon-94:before {
+	content: "\e658"
+}
+
+.icon-95:before {
+	content: "\e659"
+}
+
+.icon-96:before {
+	content: "\e65a"
+}
+
+.icon-97:before {
+	content: "\e65b"
+}
+
+.icon-98:before {
+	content: "\e65c"
+}
+
+.icon-99:before {
+	content: "\e65d"
+}
+
+.icon-100:before {
+	content: "\e65e"
+}
+
+.icon-101:before {
+	content: "\e65f"
+}
+
+.icon-102:before {
+	content: "\e660"
+}
+
+.icon-103:before {
+	content: "\e661"
+}
+
+.icon-104:before {
+	content: "\e662"
+}
+
+.icon-105:before {
+	content: "\e663"
+}
+
+.icon-106:before {
+	content: "\e664"
+}
+
+.icon-107:before {
+	content: "\e665"
+}
+
+.icon-108:before {
+	content: "\e666"
+}
+
+.icon-109:before {
+	content: "\e667"
+}
+
+.icon-110:before {
+	content: "\e668"
+}
+
+.icon-111:before {
+	content: "\e669"
+}
+
+.icon-112:before {
+	content: "\e66a"
+}
+
+.icon-113:before {
+	content: "\e66b"
+}
+
+.icon-114:before {
+	content: "\e66e"
+}
+
+.icon-115:before {
+	content: "\e66c"
+}
+
+.icon-116:before {
+	content: "\e66d"
+}
+
+.icon-117:before {
+	content: "\e674"
+}
+
+.icon-118:before {
+	content: "\e675"
+}
+
+.icon-119:before {
+	content: "\e676"
+}
+
+.icon-120:before {
+	content: "\e677"
+}
+
+.icon-121:before {
+	content: "\e678"
+}
+
+.icon-122:before {
+	content: "\e679"
+}
+
+.icon-123:before {
+	content: "\e67a"
+}
+
+.icon-124:before {
+	content: "\e67b"
+}
+
+.icon-125:before {
+	content: "\e67c"
+}
+
+.icon-126:before {
+	content: "\e67d"
+}
+
+/*基本样式类*/
+body,
+html {
+	-webkit-tap-highlight-color: transparent
+}
+
+a {
+	color: #999;
+	text-decoration: none;
+	-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+}
+
+::-webkit-input-placeholder {
+	color: #CCCCCC;
+}
+
+.baseline {
+	vertical-align: baseline;
+}
+
+.middle {
+	vertical-align: middle;
+}
+
+.top {
+	vertical-align: top;
+}
+
+.block {
+	display: block;
+}
+
+.show {
+	display: block;
+}
+
+.hide {
+	display: none;
+}
+
+.inline {
+	display: inline;
+}
+
+.iblock {
+	display: inline-block;
+	*display: inline;
+	*zoom: 1;
+}
+
+.tleft {
+	text-align: left;
+}
+
+.tright {
+	text-align: right;
+}
+
+.tcenter {
+	text-align: center;
+}
+
+.center {
+	margin: 0 auto;
+}
+
+.border {
+	border: 1px solid #e0e0e0 !important;
+}
+
+.border-t {
+	border-top: 1px solid #e0e0e0;
+}
+
+.border-b {
+	border-bottom: 1px dotted #eee;
+}
+
+.border-tb {
+	border-top: #e0e0e0 1px solid;
+	border-bottom: #e0e0e0 1px solid;
+	background-image: none;
+}
+
+.border-l {
+	border-left: 1px solid #e0e0e0;
+}
+
+.border-r {
+	border-right: 1px solid #e0e0e0;
+}
+
+.border-radius {
+	border: 1px solid #e0e0e0;
+	border-radius: 4px;
+}
+
+.dotted {
+	border: 1px dotted #e0e0e0 !important;
+}
+
+.dotted-b {
+	border-bottom: 1px dotted #e0e0e0 !important;
+}
+
+.hand {
+	cursor: pointer;
+}
+
+.move {
+	cursor: move;
+}
+
+.u {
+	text-decoration: underline;
+}
+
+.del {
+	text-decoration: line-through;
+}
+
+.-u {
+	text-decoration: none;
+}
+
+.i {
+	font-style: italic;
+}
+
+.-i {
+	font-style: normal;
+}
+
+.bold {
+	font-weight: bold;
+}
+
+.-bold {
+	font-weight: normal;
+}
+
+.-wrap {
+	white-space: nowrap;
+	word-break: break-all;
+	overflow: hidden;
+}
+
+.wrap {
+	white-space: pre-wrap;
+	word-wrap: break-word;
+	word-break: break-all;
+}
+
+.left {
+	float: left;
+}
+
+.right {
+	float: right;
+}
+
+.clear {
+	clear: both;
+}
+
+.clearfix:after,
+.clearfix:before {
+	display: table;
+	content: " ";
+}
+
+.clearfix:after {
+	clear: both;
+}
+
+.upper {
+	text-transform: uppercase;
+}
+
+.lower {
+	text-transform: lowercase;
+}
+
+.cap {
+	text-transform: capitalize;
+}
+
+.hidden {
+	overflow: hidden;
+}
+
+.visible {
+	overflow: visible;
+}
+
+.rel {
+	position: relative;
+}
+
+.abs {
+	position: absolute;
+}
+
+.fixed {
+	position: fixed;
+}
+
+.indent {
+	text-indent: 20px;
+}
+
+.indent200 {
+	text-indent: 250px;
+}
+
+.lheight {
+	line-height: 22px;
+}
+
+.outline {
+	outline: none;
+}
+
+.ell {
+	text-overflow: ellipsis;
+	overflow: hidden;
+}
+
+.yahei {
+	font-family: "Microsoft YaHei";
+}
+
+.hr1 {
+	width: 100%;
+	margin: 0 auto;
+	border: 0;
+	height: 0;
+	border-top: 1px solid rgba(0, 0, 0, 0.1);
+}
+
+.v-center {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.req:before {
+	content: ' *';
+	color: #EF4F4F;
+	font-weight: bold;
+}
+
+/*页面整体样式*/
+.container {
+	position: absolute;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	left: 0;
+	overflow-y: auto;
+	-webkit-overflow-scrolling: touch;
+	z-index: 1;
+
+}
+
+.page-bg {
+	background-color: #F8F8F8;
+}
+
+.page-bd-15 {
+	padding: 0 15px;
+}
+
+.page-hd,
+padding20 {
+	padding: 20px;
+}
+
+.page-bd,
+padding0 {
+	padding: 0;
+}
+
+.padding5 {
+	padding: 5px;
+}
+
+.padding10 {
+	padding: 10px;
+}
+
+.padding15 {
+	padding: 15px;
+}
+
+.margin5 {
+	margin: 5px;
+}
+
+.margin10 {
+	margin: 10px;
+}
+
+.margin15 {
+	margin: 15px;
+}
+
+margin20 {
+	margin: 20px;
+}
+
+.page-hd-title {
+	text-align: left;
+	font-size: 20px;
+	font-weight: 400;
+}
+
+.page-hd-desc {
+	margin-top: 5px;
+	color: #888888;
+	text-align: left;
+	font-size: 14px;
+}
+
+/*表格样式*/
+
+.weui-table,
+table {
+	width: 100%;
+	border-collapse: collapse;
+	background-color: #fff;
+	line-height: 32px;
+	text-align: center;
+	border: none;
+}
+
+.weui-table th,
+table th {
+	font-weight: 700
+}
+
+.weui-table a,
+table a {
+	color: #00a7ff;
+}
+
+.weui-table td,
+.weui-table th,
+table td,
+table th {
+	text-align: left;
+	line-height: 25px;
+	padding: 8px;
+}
+
+.weui-table tr:hover,
+able tr:hover {
+	background: #F7F7F7;
+}
+
+.weui-table-2n tr:nth-child(2n) {
+	background-color: #F7F7F7;
+}
+
+@media only screen and (max-width: 767px) {
+
+	.weui-table {
+		border: none;
+	}
+
+	.weui-table thead {
+		display: none;
+	}
+
+	.weui-table tr {
+		display: block;
+		border-bottom: 1px solid #e0e0e0;
+	}
+
+	.weui-table td {
+		display: block;
+		text-align: right;
+		line-height: 25px;
+		border: none;
+	}
+
+	.weui-table td:last-child {
+		border-bottom: none;
+	}
+
+	.weui-table td:before {
+		content: attr(title);
+		float: left;
+		text-transform: uppercase;
+		font-weight: bold;
+	}
+
+	.weui-table-2n tr:nth-child(2n) {
+		background-color: transparent;
+	}
+}
+
+/*
+weui.js.css*/
+.preloader {
+	width: 20px;
+	height: 20px;
+	-webkit-transform-origin: 50%;
+	transform-origin: 50%;
+	-webkit-animation: preloader-spin 1s steps(12, end) infinite;
+	animation: preloader-spin 1s steps(12, end) infinite;
+}
+
+.preloader:after {
+	display: block;
+	width: 100%;
+	height: 100%;
+	content: "";
+	background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20viewBox%3D'0%200%20120%20120'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20xmlns%3Axlink%3D'http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink'%3E%3Cdefs%3E%3Cline%20id%3D'l'%20x1%3D'60'%20x2%3D'60'%20y1%3D'7'%20y2%3D'27'%20stroke%3D'%236c6c6c'%20stroke-width%3D'11'%20stroke-linecap%3D'round'%2F%3E%3C%2Fdefs%3E%3Cg%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(30%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(60%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(90%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(120%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(150%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.37'%20transform%3D'rotate(180%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.46'%20transform%3D'rotate(210%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.56'%20transform%3D'rotate(240%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.66'%20transform%3D'rotate(270%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.75'%20transform%3D'rotate(300%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.85'%20transform%3D'rotate(330%2060%2C60)'%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E");
+	background-repeat: no-repeat;
+	background-position: 50%;
+	background-size: 100%;
+}
+
+@-webkit-keyframes preloader-spin {
+	100% {
+		-webkit-transform: rotate(360deg);
+		transform: rotate(360deg);
+	}
+}
+
+@keyframes preloader-spin {
+	100% {
+		-webkit-transform: rotate(360deg);
+		transform: rotate(360deg);
+	}
+}
+
+label>* {
+	pointer-events: none;
+}
+
+html {
+	font-size: 20px;
+}
+
+body {
+	font-size: 16px;
+}
+
+@media only screen and (min-width: 400px) {
+	html {
+		font-size: 21.33333333px !important;
+	}
+}
+
+@media only screen and (min-width: 414px) {
+	html {
+		font-size: 22.08px !important;
+	}
+}
+
+@media only screen and (min-width: 480px) {
+	html {
+		font-size: 25.6px !important;
+	}
+}
+
+.weui-navbar {
+	z-index: 10;
+}
+
+.weui-popup-overlay,
+.weui-popup-container {
+	z-index: 1000;
+}
+
+.weui-mask {
+	z-index: 1000;
+}
+
+/* === Grid === */
+.weui-row {
+	display: -webkit-box;
+	display: -ms-flexbox;
+	display: -webkit-flex;
+	display: flex;
+	-webkit-box-pack: justify;
+	-ms-flex-pack: justify;
+	-webkit-justify-content: space-between;
+	justify-content: space-between;
+	-webkit-box-lines: multiple;
+	-moz-box-lines: multiple;
+	-webkit-flex-wrap: wrap;
+	-ms-flex-wrap: wrap;
+	flex-wrap: wrap;
+	-webkit-box-align: start;
+	-ms-flex-align: start;
+	-webkit-align-items: flex-start;
+	align-items: flex-start;
+}
+
+.weui-row>[class*="col-"] {
+	box-sizing: border-box;
+}
+
+.weui-row .col-auto {
+	width: 100%;
+}
+
+.weui-row .weui-col-100 {
+	width: 100%;
+	width: calc((100% - 15px*0) / 1);
+}
+
+.weui-row.weui-no-gutter .weui-col-100 {
+	width: 100%;
+}
+
+.weui-row .weui-col-95 {
+	width: 95%;
+	width: calc((100% - 15px*0.05263157894736836) / 1.0526315789473684);
+}
+
+.weui-row.weui-no-gutter .weui-col-95 {
+	width: 95%;
+}
+
+.weui-row .weui-col-90 {
+	width: 90%;
+	width: calc((100% - 15px*0.11111111111111116) / 1.1111111111111112);
+}
+
+.weui-row.weui-no-gutter .weui-col-90 {
+	width: 90%;
+}
+
+.weui-row .weui-col-85 {
+	width: 85%;
+	width: calc((100% - 15px*0.17647058823529416) / 1.1764705882352942);
+}
+
+.weui-row.weui-no-gutter .weui-col-85 {
+	width: 85%;
+}
+
+.weui-row .weui-col-80 {
+	width: 80%;
+	width: calc((100% - 15px*0.25) / 1.25);
+}
+
+.weui-row.weui-no-gutter .weui-col-80 {
+	width: 80%;
+}
+
+.weui-row .weui-col-75 {
+	width: 75%;
+	width: calc((100% - 15px*0.33333333333333326) / 1.3333333333333333);
+}
+
+.weui-row.weui-no-gutter .weui-col-75 {
+	width: 75%;
+}
+
+.weui-row .weui-col-66 {
+	width: 66.66666666666666%;
+	width: calc((100% - 15px*0.5000000000000002) / 1.5000000000000002);
+}
+
+.weui-row.weui-no-gutter .weui-col-66 {
+	width: 66.66666666666666%;
+}
+
+.weui-row .weui-col-60 {
+	width: 60%;
+	width: calc((100% - 15px*0.6666666666666667) / 1.6666666666666667);
+}
+
+.weui-row.weui-no-gutter .weui-col-60 {
+	width: 60%;
+}
+
+.weui-row .weui-col-50 {
+	width: 50%;
+	width: calc((100% - 15px*1) / 2);
+}
+
+.weui-row.weui-no-gutter .weui-col-50 {
+	width: 50%;
+}
+
+.weui-row .weui-col-40 {
+	width: 40%;
+	width: calc((100% - 15px*1.5) / 2.5);
+}
+
+.weui-row.weui-no-gutter .weui-col-40 {
+	width: 40%;
+}
+
+.weui-row .weui-col-33 {
+	width: 33.333333333333336%;
+	width: calc((100% - 15px*2) / 3);
+}
+
+.weui-row.weui-no-gutter .weui-col-33 {
+	width: 33.333333333333336%;
+}
+
+.weui-row .weui-col-25 {
+	width: 25%;
+	width: calc((100% - 15px*3) / 4);
+}
+
+.weui-row.weui-no-gutter .weui-col-25 {
+	width: 25%;
+}
+
+.weui-row .weui-col-20 {
+	width: 20%;
+	width: calc((100% - 15px*4) / 5);
+}
+
+.weui-row.weui-no-gutter .weui-col-20 {
+	width: 20%;
+}
+
+.weui-row .weui-col-15 {
+	width: 15%;
+	width: calc((100% - 15px*5.666666666666667) / 6.666666666666667);
+}
+
+.weui-row.weui-no-gutter .weui-col-15 {
+	width: 15%;
+}
+
+.weui-row .weui-col-10 {
+	width: 10%;
+	width: calc((100% - 15px*9) / 10);
+}
+
+.weui-row.weui-no-gutter .weui-col-10 {
+	width: 10%;
+}
+
+.weui-row .weui-col-5 {
+	width: 5%;
+	width: calc((100% - 15px*19) / 20);
+}
+
+.weui-row.weui-no-gutter .weui-col-5 {
+	width: 5%;
+}
+
+.weui-row .weui-col-auto:nth-last-child(1),
+.weui-row .weui-col-auto:nth-last-child(1)~.weui-col-auto {
+	width: 100%;
+	width: calc((100% - 15px*0) / 1);
+}
+
+.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(1),
+.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(1)~.weui-col-auto {
+	width: 100%;
+}
+
+.weui-row .weui-col-auto:nth-last-child(2),
+.weui-row .weui-col-auto:nth-last-child(2)~.weui-col-auto {
+	width: 50%;
+	width: calc((100% - 15px*1) / 2);
+}
+
+.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(2),
+.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(2)~.weui-col-auto {
+	width: 50%;
+}
+
+.weui-row .weui-col-auto:nth-last-child(3),
+.weui-row .weui-col-auto:nth-last-child(3)~.weui-col-auto {
+	width: 33.33333333%;
+	width: calc((100% - 15px*2) / 3);
+}
+
+.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(3),
+.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(3)~.weui-col-auto {
+	width: 33.33333333%;
+}
+
+.weui-row .weui-col-auto:nth-last-child(4),
+.weui-row .weui-col-auto:nth-last-child(4)~.weui-col-auto {
+	width: 25%;
+	width: calc((100% - 15px*3) / 4);
+}
+
+.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(4),
+.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(4)~.weui-col-auto {
+	width: 25%;
+}
+
+.weui-row .weui-col-auto:nth-last-child(5),
+.weui-row .weui-col-auto:nth-last-child(5)~.weui-col-auto {
+	width: 20%;
+	width: calc((100% - 15px*4) / 5);
+}
+
+.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(5),
+.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(5)~.weui-col-auto {
+	width: 20%;
+}
+
+.weui-row .weui-col-auto:nth-last-child(6),
+.weui-row .weui-col-auto:nth-last-child(6)~.weui-col-auto {
+	width: 16.66666667%;
+	width: calc((100% - 15px*5) / 6);
+}
+
+.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(6),
+.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(6)~.weui-col-auto {
+	width: 16.66666667%;
+}
+
+.weui-row .weui-col-auto:nth-last-child(7),
+.weui-row .weui-col-auto:nth-last-child(7)~.weui-col-auto {
+	width: 14.28571429%;
+	width: calc((100% - 15px*6) / 7);
+}
+
+.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(7),
+.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(7)~.weui-col-auto {
+	width: 14.28571429%;
+}
+
+.weui-row .weui-col-auto:nth-last-child(8),
+.weui-row .weui-col-auto:nth-last-child(8)~.weui-col-auto {
+	width: 12.5%;
+	width: calc((100% - 15px*7) / 8);
+}
+
+.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(8),
+.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(8)~.weui-col-auto {
+	width: 12.5%;
+}
+
+.weui-row .weui-col-auto:nth-last-child(9),
+.weui-row .weui-col-auto:nth-last-child(9)~.weui-col-auto {
+	width: 11.11111111%;
+	width: calc((100% - 15px*8) / 9);
+}
+
+.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(9),
+.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(9)~.weui-col-auto {
+	width: 11.11111111%;
+}
+
+.weui-row .weui-col-auto:nth-last-child(10),
+.weui-row .weui-col-auto:nth-last-child(10)~.weui-col-auto {
+	width: 10%;
+	width: calc((100% - 15px*9) / 10);
+}
+
+.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(10),
+.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(10)~.weui-col-auto {
+	width: 10%;
+}
+
+.weui-row .weui-col-auto:nth-last-child(11),
+.weui-row .weui-col-auto:nth-last-child(11)~.weui-col-auto {
+	width: 9.09090909%;
+	width: calc((100% - 15px*10) / 11);
+}
+
+.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(11),
+.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(11)~.weui-col-auto {
+	width: 9.09090909%;
+}
+
+.weui-row .weui-col-auto:nth-last-child(12),
+.weui-row .weui-col-auto:nth-last-child(12)~.weui-col-auto {
+	width: 8.33333333%;
+	width: calc((100% - 15px*11) / 12);
+}
+
+.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(12),
+.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(12)~.weui-col-auto {
+	width: 8.33333333%;
+}
+
+.weui-row .weui-col-auto:nth-last-child(13),
+.weui-row .weui-col-auto:nth-last-child(13)~.weui-col-auto {
+	width: 7.69230769%;
+	width: calc((100% - 15px*12) / 13);
+}
+
+.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(13),
+.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(13)~.weui-col-auto {
+	width: 7.69230769%;
+}
+
+.weui-row .weui-col-auto:nth-last-child(14),
+.weui-row .weui-col-auto:nth-last-child(14)~.weui-col-auto {
+	width: 7.14285714%;
+	width: calc((100% - 15px*13) / 14);
+}
+
+.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(14),
+.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(14)~.weui-col-auto {
+	width: 7.14285714%;
+}
+
+.weui-row .weui-col-auto:nth-last-child(15),
+.weui-row .weui-col-auto:nth-last-child(15)~.weui-col-auto {
+	width: 6.66666667%;
+	width: calc((100% - 15px*14) / 15);
+}
+
+.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(15),
+.weui-row.weui-no-gutter .weui-col-auto:nth-last-child(15)~.weui-col-auto {
+	width: 6.66666667%;
+}
+
+@media all and (min-width: 768px) {
+	.row .tablet-100 {
+		width: 100%;
+		width: calc((100% - 15px*0) / 1);
+	}
+
+	.row.no-gutter .tablet-100 {
+		width: 100%;
+	}
+
+	.row .tablet-95 {
+		width: 95%;
+		width: calc((100% - 15px*0.05263157894736836) / 1.0526315789473684);
+	}
+
+	.row.no-gutter .tablet-95 {
+		width: 95%;
+	}
+
+	.row .tablet-90 {
+		width: 90%;
+		width: calc((100% - 15px*0.11111111111111116) / 1.1111111111111112);
+	}
+
+	.row.no-gutter .tablet-90 {
+		width: 90%;
+	}
+
+	.row .tablet-85 {
+		width: 85%;
+		width: calc((100% - 15px*0.17647058823529416) / 1.1764705882352942);
+	}
+
+	.row.no-gutter .tablet-85 {
+		width: 85%;
+	}
+
+	.row .tablet-80 {
+		width: 80%;
+		width: calc((100% - 15px*0.25) / 1.25);
+	}
+
+	.row.no-gutter .tablet-80 {
+		width: 80%;
+	}
+
+	.row .tablet-75 {
+		width: 75%;
+		width: calc((100% - 15px*0.33333333333333326) / 1.3333333333333333);
+	}
+
+	.row.no-gutter .tablet-75 {
+		width: 75%;
+	}
+
+	.row .tablet-66 {
+		width: 66.66666666666666%;
+		width: calc((100% - 15px*0.5000000000000002) / 1.5000000000000002);
+	}
+
+	.row.no-gutter .tablet-66 {
+		width: 66.66666666666666%;
+	}
+
+	.row .tablet-60 {
+		width: 60%;
+		width: calc((100% - 15px*0.6666666666666667) / 1.6666666666666667);
+	}
+
+	.row.no-gutter .tablet-60 {
+		width: 60%;
+	}
+
+	.row .tablet-50 {
+		width: 50%;
+		width: calc((100% - 15px*1) / 2);
+	}
+
+	.row.no-gutter .tablet-50 {
+		width: 50%;
+	}
+
+	.row .tablet-40 {
+		width: 40%;
+		width: calc((100% - 15px*1.5) / 2.5);
+	}
+
+	.row.no-gutter .tablet-40 {
+		width: 40%;
+	}
+
+	.row .tablet-33 {
+		width: 33.333333333333336%;
+		width: calc((100% - 15px*2) / 3);
+	}
+
+	.row.no-gutter .tablet-33 {
+		width: 33.333333333333336%;
+	}
+
+	.row .tablet-25 {
+		width: 25%;
+		width: calc((100% - 15px*3) / 4);
+	}
+
+	.row.no-gutter .tablet-25 {
+		width: 25%;
+	}
+
+	.row .tablet-20 {
+		width: 20%;
+		width: calc((100% - 15px*4) / 5);
+	}
+
+	.row.no-gutter .tablet-20 {
+		width: 20%;
+	}
+
+	.row .tablet-15 {
+		width: 15%;
+		width: calc((100% - 15px*5.666666666666667) / 6.666666666666667);
+	}
+
+	.row.no-gutter .tablet-15 {
+		width: 15%;
+	}
+
+	.row .tablet-10 {
+		width: 10%;
+		width: calc((100% - 15px*9) / 10);
+	}
+
+	.row.no-gutter .tablet-10 {
+		width: 10%;
+	}
+
+	.row .tablet-5 {
+		width: 5%;
+		width: calc((100% - 15px*19) / 20);
+	}
+
+	.row.no-gutter .tablet-5 {
+		width: 5%;
+	}
+
+	.row .tablet-auto:nth-last-child(1),
+	.row .tablet-auto:nth-last-child(1)~.col-auto {
+		width: 100%;
+		width: calc((100% - 15px*0) / 1);
+	}
+
+	.row.no-gutter .tablet-auto:nth-last-child(1),
+	.row.no-gutter .tablet-auto:nth-last-child(1)~.tablet-auto {
+		width: 100%;
+	}
+
+	.row .tablet-auto:nth-last-child(2),
+	.row .tablet-auto:nth-last-child(2)~.col-auto {
+		width: 50%;
+		width: calc((100% - 15px*1) / 2);
+	}
+
+	.row.no-gutter .tablet-auto:nth-last-child(2),
+	.row.no-gutter .tablet-auto:nth-last-child(2)~.tablet-auto {
+		width: 50%;
+	}
+
+	.row .tablet-auto:nth-last-child(3),
+	.row .tablet-auto:nth-last-child(3)~.col-auto {
+		width: 33.33333333%;
+		width: calc((100% - 15px*2) / 3);
+	}
+
+	.row.no-gutter .tablet-auto:nth-last-child(3),
+	.row.no-gutter .tablet-auto:nth-last-child(3)~.tablet-auto {
+		width: 33.33333333%;
+	}
+
+	.row .tablet-auto:nth-last-child(4),
+	.row .tablet-auto:nth-last-child(4)~.col-auto {
+		width: 25%;
+		width: calc((100% - 15px*3) / 4);
+	}
+
+	.row.no-gutter .tablet-auto:nth-last-child(4),
+	.row.no-gutter .tablet-auto:nth-last-child(4)~.tablet-auto {
+		width: 25%;
+	}
+
+	.row .tablet-auto:nth-last-child(5),
+	.row .tablet-auto:nth-last-child(5)~.col-auto {
+		width: 20%;
+		width: calc((100% - 15px*4) / 5);
+	}
+
+	.row.no-gutter .tablet-auto:nth-last-child(5),
+	.row.no-gutter .tablet-auto:nth-last-child(5)~.tablet-auto {
+		width: 20%;
+	}
+
+	.row .tablet-auto:nth-last-child(6),
+	.row .tablet-auto:nth-last-child(6)~.col-auto {
+		width: 16.66666667%;
+		width: calc((100% - 15px*5) / 6);
+	}
+
+	.row.no-gutter .tablet-auto:nth-last-child(6),
+	.row.no-gutter .tablet-auto:nth-last-child(6)~.tablet-auto {
+		width: 16.66666667%;
+	}
+
+	.row .tablet-auto:nth-last-child(7),
+	.row .tablet-auto:nth-last-child(7)~.col-auto {
+		width: 14.28571429%;
+		width: calc((100% - 15px*6) / 7);
+	}
+
+	.row.no-gutter .tablet-auto:nth-last-child(7),
+	.row.no-gutter .tablet-auto:nth-last-child(7)~.tablet-auto {
+		width: 14.28571429%;
+	}
+
+	.row .tablet-auto:nth-last-child(8),
+	.row .tablet-auto:nth-last-child(8)~.col-auto {
+		width: 12.5%;
+		width: calc((100% - 15px*7) / 8);
+	}
+
+	.row.no-gutter .tablet-auto:nth-last-child(8),
+	.row.no-gutter .tablet-auto:nth-last-child(8)~.tablet-auto {
+		width: 12.5%;
+	}
+
+	.row .tablet-auto:nth-last-child(9),
+	.row .tablet-auto:nth-last-child(9)~.col-auto {
+		width: 11.11111111%;
+		width: calc((100% - 15px*8) / 9);
+	}
+
+	.row.no-gutter .tablet-auto:nth-last-child(9),
+	.row.no-gutter .tablet-auto:nth-last-child(9)~.tablet-auto {
+		width: 11.11111111%;
+	}
+
+	.row .tablet-auto:nth-last-child(10),
+	.row .tablet-auto:nth-last-child(10)~.col-auto {
+		width: 10%;
+		width: calc((100% - 15px*9) / 10);
+	}
+
+	.row.no-gutter .tablet-auto:nth-last-child(10),
+	.row.no-gutter .tablet-auto:nth-last-child(10)~.tablet-auto {
+		width: 10%;
+	}
+
+	.row .tablet-auto:nth-last-child(11),
+	.row .tablet-auto:nth-last-child(11)~.col-auto {
+		width: 9.09090909%;
+		width: calc((100% - 15px*10) / 11);
+	}
+
+	.row.no-gutter .tablet-auto:nth-last-child(11),
+	.row.no-gutter .tablet-auto:nth-last-child(11)~.tablet-auto {
+		width: 9.09090909%;
+	}
+
+	.row .tablet-auto:nth-last-child(12),
+	.row .tablet-auto:nth-last-child(12)~.col-auto {
+		width: 8.33333333%;
+		width: calc((100% - 15px*11) / 12);
+	}
+
+	.row.no-gutter .tablet-auto:nth-last-child(12),
+	.row.no-gutter .tablet-auto:nth-last-child(12)~.tablet-auto {
+		width: 8.33333333%;
+	}
+
+	.row .tablet-auto:nth-last-child(13),
+	.row .tablet-auto:nth-last-child(13)~.col-auto {
+		width: 7.69230769%;
+		width: calc((100% - 15px*12) / 13);
+	}
+
+	.row.no-gutter .tablet-auto:nth-last-child(13),
+	.row.no-gutter .tablet-auto:nth-last-child(13)~.tablet-auto {
+		width: 7.69230769%;
+	}
+
+	.row .tablet-auto:nth-last-child(14),
+	.row .tablet-auto:nth-last-child(14)~.col-auto {
+		width: 7.14285714%;
+		width: calc((100% - 15px*13) / 14);
+	}
+
+	.row.no-gutter .tablet-auto:nth-last-child(14),
+	.row.no-gutter .tablet-auto:nth-last-child(14)~.tablet-auto {
+		width: 7.14285714%;
+	}
+
+	.row .tablet-auto:nth-last-child(15),
+	.row .tablet-auto:nth-last-child(15)~.col-auto {
+		width: 6.66666667%;
+		width: calc((100% - 15px*14) / 15);
+	}
+
+	.row.no-gutter .tablet-auto:nth-last-child(15),
+	.row.no-gutter .tablet-auto:nth-last-child(15)~.tablet-auto {
+		width: 6.66666667%;
+	}
+}
+
+.weui-cell__hd img {
+	display: block;
+	margin-right: 5px;
+}
+
+.weui-cell_swiped .weui-cell__bd {
+	-webkit-transition: -webkit-transform .3s;
+	transition: -webkit-transform .3s;
+	transition: transform .3s;
+	transition: transform .3s, -webkit-transform .3s;
+}
+
+.swipeout-touching .weui-cell__bd {
+	-webkit-transition: none;
+	transition: none;
+}
+
+.weui-dialog,
+.weui-toast {
+	-webkit-transition-duration: .2s;
+	transition-duration: .2s;
+	opacity: 0;
+	-webkit-transform: translate(-50%, -50%);
+	transform: translate(-50%, -50%);
+	-webkit-transform-origin: 0 0;
+	transform-origin: 0 0;
+	visibility: hidden;
+	margin: 0;
+	top: 45%;
+	z-index: 2000;
+}
+
+.weui-dialog .weui-dialog__btn.default,
+.weui-toast .weui-dialog__btn.default {
+	color: #5f646e;
+}
+
+.weui-dialog .weui-dialog__btn+.weui-dialog__btn,
+.weui-toast .weui-dialog__btn+.weui-dialog__btn {
+	position: relative;
+}
+
+.weui-dialog .weui-dialog__btn+.weui-dialog__btn:after,
+.weui-toast .weui-dialog__btn+.weui-dialog__btn:after {
+	content: " ";
+	position: absolute;
+	left: 0;
+	top: 0;
+	width: 1px;
+	height: 100%;
+	border-left: 1px solid #D5D5D6;
+	color: #D5D5D6;
+	-webkit-transform-origin: 0 0;
+	transform-origin: 0 0;
+	-webkit-transform: scaleX(0.5);
+	transform: scaleX(0.5);
+}
+
+.weui-dialog.weui-dialog--visible,
+.weui-toast.weui-dialog--visible,
+.weui-dialog.weui-toast--visible,
+.weui-toast.weui-toast--visible {
+	opacity: 1;
+	visibility: visible;
+}
+
+.weui-toast_forbidden {
+	color: #F76260;
+}
+
+.weui-toast_cancel .weui-icon-toast:before {
+	content: "\EA0D";
+}
+
+.weui-toast_forbidden .weui-icon-toast:before {
+	content: "\EA0B";
+	color: #F76260;
+}
+
+.weui-toast_text {
+	min-height: 1em;
+	width: auto;
+	height: 45px;
+	border-radius: 25px;
+	margin-left: 0;
+	-webkit-transform: scale(0.9) translate3d(-50%, 0, 0);
+	transform: scale(0.9) translate3d(-50%, 0, 0);
+	-webkit-transform-origin: left;
+	transform-origin: left;
+}
+
+.weui-toast_text.weui-toast--visible {
+	-webkit-transform: scale(1) translate3d(-50%, 0, 0);
+	transform: scale(1) translate3d(-50%, 0, 0);
+}
+
+.weui-toast_text .weui-icon-toast {
+	display: none;
+}
+
+.weui-toast_text .weui-toast_content {
+	margin: 10px 15px;
+}
+
+.weui-mask {
+	opacity: 0;
+	-webkit-transition-duration: .3s;
+	transition-duration: .3s;
+	visibility: hidden;
+}
+
+.weui-mask.weui-mask--visible {
+	opacity: 1;
+	visibility: visible;
+}
+
+.weui-prompt-input {
+	padding: 4px 6px;
+	border: 1px solid #ccc;
+	box-sizing: border-box;
+	height: 2em;
+	width: 80%;
+	margin-top: 10px;
+}
+
+.weui-pull-to-refresh {
+	margin-top: -50px;
+	-webkit-transition: -webkit-transform .4s;
+	transition: -webkit-transform .4s;
+	transition: transform .4s;
+	transition: transform .4s, -webkit-transform .4s;
+}
+
+.weui-pull-to-refresh.refreshing {
+	-webkit-transform: translate3d(0, 50px, 0);
+	transform: translate3d(0, 50px, 0);
+}
+
+.weui-pull-to-refresh.touching {
+	-webkit-transition-duration: 0s;
+	transition-duration: 0s;
+}
+
+.weui-pull-to-refresh__layer {
+	height: 30px;
+	line-height: 30px;
+	padding: 10px;
+	text-align: center;
+}
+
+.weui-pull-to-refresh__layer .down {
+	display: inline-block;
+}
+
+.weui-pull-to-refresh__layer .up,
+.weui-pull-to-refresh__layer .refresh {
+	display: none;
+}
+
+.weui-pull-to-refresh__layer .weui-pull-to-refresh__arrow {
+	display: inline-block;
+	z-index: 10;
+	width: 20px;
+	height: 20px;
+	margin-right: 4px;
+	vertical-align: -4px;
+	background: no-repeat center;
+	background-size: 13px 20px;
+	-webkit-transition-duration: 300ms;
+	transition-duration: 300ms;
+	-webkit-transform: rotate(0deg) translate3d(0, 0, 0);
+	transform: rotate(0deg) translate3d(0, 0, 0);
+	background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2026%2040'%3E%3Cpolygon%20points%3D'9%2C22%209%2C0%2017%2C0%2017%2C22%2026%2C22%2013.5%2C40%200%2C22'%20fill%3D'%238c8c8c'%2F%3E%3C%2Fsvg%3E");
+}
+
+.weui-pull-to-refresh__layer .weui-pull-to-refresh__preloader {
+	display: none;
+	vertical-align: -4px;
+	margin-right: 4px;
+	width: 20px;
+	height: 20px;
+	-webkit-transform-origin: 50%;
+	transform-origin: 50%;
+	-webkit-animation: preloader-spin 1s steps(12, end) infinite;
+	animation: preloader-spin 1s steps(12, end) infinite;
+}
+
+.weui-pull-to-refresh__layer .weui-pull-to-refresh__preloader:after {
+	display: block;
+	width: 100%;
+	height: 100%;
+	content: "";
+	background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20viewBox%3D'0%200%20120%20120'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20xmlns%3Axlink%3D'http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink'%3E%3Cdefs%3E%3Cline%20id%3D'l'%20x1%3D'60'%20x2%3D'60'%20y1%3D'7'%20y2%3D'27'%20stroke%3D'%236c6c6c'%20stroke-width%3D'11'%20stroke-linecap%3D'round'%2F%3E%3C%2Fdefs%3E%3Cg%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(30%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(60%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(90%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(120%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.27'%20transform%3D'rotate(150%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.37'%20transform%3D'rotate(180%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.46'%20transform%3D'rotate(210%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.56'%20transform%3D'rotate(240%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.66'%20transform%3D'rotate(270%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.75'%20transform%3D'rotate(300%2060%2C60)'%2F%3E%3Cuse%20xlink%3Ahref%3D'%23l'%20opacity%3D'.85'%20transform%3D'rotate(330%2060%2C60)'%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E");
+	background-repeat: no-repeat;
+	background-position: 50%;
+	background-size: 100%;
+}
+
+.pull-up .weui-pull-to-refresh__layer .down,
+.refreshing .weui-pull-to-refresh__layer .down {
+	display: none;
+}
+
+.pull-up .weui-pull-to-refresh__layer .weui-pull-to-refresh__arrow {
+	display: inline-block;
+	-webkit-transform: rotate(180deg) translate3d(0, 0, 0);
+	transform: rotate(180deg) translate3d(0, 0, 0);
+}
+
+.pull-up .weui-pull-to-refresh__layer .up {
+	display: inline-block;
+}
+
+.pull-down .weui-pull-to-refresh__layer .weui-pull-to-refresh__arrow {
+	display: inline-block;
+}
+
+.pull-down .weui-pull-to-refresh__layer .down {
+	display: inline-block;
+}
+
+.refreshing .weui-pull-to-refresh__layer .weui-pull-to-refresh__arrow {
+	display: none;
+}
+
+.refreshing .weui-pull-to-refresh__layer .weui-pull-to-refresh__preloader {
+	display: inline-block;
+}
+
+.refreshing .weui-pull-to-refresh__layer .refresh {
+	display: inline-block;
+}
+
+@keyframes preloader-spin {
+	100% {
+		-webkit-transform: rotate(360deg);
+		transform: rotate(360deg);
+	}
+}
+
+.weui-tab__bd-item.weui-pull-to-refresh {
+	position: absolute;
+	top: 50px;
+}
+
+.weui-tabbar__item {
+	position: relative;
+}
+
+.weui-tabbar__item.weui-bar__item--on .weui-tabbar__label {
+	color: #04BE02;
+}
+
+.weui-navbar__item {
+	color: #888;
+}
+
+.weui-navbar__item.weui-bar__item--on {
+	color: #076ba7;
+	border-bottom: 1px solid #076ba7;
+}
+
+.weui-tab__bd {
+	box-sizing: border-box;
+	height: 100%;
+}
+
+.weui-tab__bd .weui-tab__bd-item {
+	display: none;
+	height: 100%;
+	overflow: auto;
+}
+
+.weui-tab__bd .weui-tab__bd-item.weui-tab__bd-item--active {
+	display: block;
+}
+
+.weui-navbar+.weui-tab__bd {
+	padding-top: 50px;
+}
+
+.toolbar {
+	position: relative;
+	width: 100%;
+	font-size: .7rem;
+	line-height: 1.5;
+	color: #3d4145;
+	background: #f7f7f8;
+}
+
+.toolbar:before {
+	content: '';
+	position: absolute;
+	left: 0;
+	top: 0;
+	bottom: auto;
+	right: auto;
+	height: 1px;
+	width: 100%;
+	background-color: #d9d9d9;
+	display: block;
+	z-index: 15;
+	-webkit-transform-origin: 50% 0%;
+	transform-origin: 50% 0%;
+}
+
+@media only screen and (-webkit-min-device-pixel-ratio: 2) {
+	.toolbar:before {
+		-webkit-transform: scaleY(0.5);
+		transform: scaleY(0.5);
+	}
+}
+
+@media only screen and (-webkit-min-device-pixel-ratio: 3) {
+	.toolbar:before {
+		-webkit-transform: scaleY(0.33);
+		transform: scaleY(0.33);
+	}
+}
+
+.toolbar .toolbar-inner {
+	height: 2.2rem;
+	display: -webkit-box;
+	display: -ms-flexbox;
+	display: -webkit-flex;
+	display: flex;
+	text-align: center;
+}
+
+.toolbar .title {
+	position: absolute;
+	display: block;
+	width: 100%;
+	padding: 0;
+	font-size: .7rem;
+	font-weight: normal;
+	line-height: 2.2rem;
+	color: #3d4145;
+	text-align: center;
+	white-space: nowrap;
+}
+
+.toolbar .picker-button {
+	position: absolute;
+	right: 0;
+	box-sizing: border-box;
+	height: 2.2rem;
+	line-height: 2.2rem;
+	color: #00a7ff;
+	z-index: 1;
+	padding: 0 .5rem;
+}
+
+/* === Columns Picker === */
+.weui-picker-modal {
+	width: 100%;
+	position: absolute;
+	bottom: 0;
+	text-align: center;
+	border-radius: 0;
+	opacity: 0.6;
+	color: #3d4145;
+	-webkit-transition-duration: .3s;
+	transition-duration: .3s;
+	height: 13rem;
+	background: #EFEFF4;
+	-webkit-transform: translate3d(0, 100%, 0);
+	transform: translate3d(0, 100%, 0);
+	-webkit-transition-property: opacity, -webkit-transform;
+	transition-property: opacity, -webkit-transform;
+	transition-property: transform, opacity;
+	transition-property: transform, opacity, -webkit-transform;
+}
+
+.weui-picker-modal.picker-modal-inline {
+	height: 10.8rem;
+	opacity: 1;
+	position: static;
+	-webkit-transform: translate3d(0, 0, 0);
+	transform: translate3d(0, 0, 0);
+}
+
+.weui-picker-modal.picker-modal-inline .toolbar {
+	display: none;
+}
+
+.weui-picker-modal.picker-columns-single .picker-items-col {
+	width: 100%;
+}
+
+.weui-picker-modal.weui-picker-modal-visible {
+	opacity: 1;
+	-webkit-transform: translate3d(0, 0, 0);
+	transform: translate3d(0, 0, 0);
+}
+
+.weui-picker-modal .picker-modal-inner {
+	position: relative;
+	height: 10.8rem;
+}
+
+.weui-picker-modal .picker-columns {
+	width: 100%;
+	height: 13rem;
+	z-index: 11500;
+}
+
+.weui-picker-modal .picker-columns.picker-modal-inline,
+.popover .weui-picker-modal .picker-columns {
+	height: 10rem;
+}
+
+@media (orientation: landscape) and (max-height: 415px) {
+	.weui-picker-modal .picker-columns:not(.picker-modal-inline) {
+		height: 10rem;
+	}
+}
+
+.weui-picker-modal .popover.popover-picker-columns {
+	width: 14rem;
+}
+
+.weui-picker-modal .picker-items {
+	display: -webkit-box;
+	display: -ms-flexbox;
+	display: -webkit-flex;
+	display: flex;
+	-webkit-box-pack: center;
+	-ms-flex-pack: center;
+	-webkit-justify-content: center;
+	justify-content: center;
+	width: 100%;
+	padding: 0;
+	text-align: right;
+	font-size: 0.7rem;
+	font-weight: normal;
+	-webkit-mask-box-image: -webkit-linear-gradient(bottom, transparent, transparent 5%, white 20%, white 80%, transparent 95%, transparent);
+	-webkit-mask-box-image: linear-gradient(to top, transparent, transparent 5%, white 20%, white 80%, transparent 95%, transparent);
+}
+
+.weui-picker-modal .bar+.picker-items {
+	height: 10.8rem;
+}
+
+.weui-picker-modal .picker-items-col {
+	overflow: hidden;
+	position: relative;
+	max-height: 100%;
+}
+
+.weui-picker-modal .picker-items-col.picker-items-col-left {
+	text-align: left;
+}
+
+.weui-picker-modal .picker-items-col.picker-items-col-center {
+	text-align: center;
+}
+
+.weui-picker-modal .picker-items-col.picker-items-col-right {
+	text-align: right;
+}
+
+.weui-picker-modal .picker-items-col.picker-items-col-divider {
+	color: #3d4145;
+	display: -webkit-box;
+	display: -ms-flexbox;
+	display: -webkit-flex;
+	display: flex;
+	-webkit-box-align: center;
+	-ms-flex-align: center;
+	-webkit-align-items: center;
+	align-items: center;
+}
+
+.weui-picker-modal .picker-items-col-wrapper {
+	-webkit-transition: 300ms;
+	transition: 300ms;
+	-webkit-transition-timing-function: ease-out;
+	transition-timing-function: ease-out;
+}
+
+.weui-picker-modal .picker-item {
+	height: 32px;
+	line-height: 32px;
+	padding: 0 10px;
+	white-space: nowrap;
+	position: relative;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	color: #9b9b9b;
+	left: 0;
+	top: 0;
+	width: 100%;
+	box-sizing: border-box;
+	-webkit-transition: 300ms;
+	transition: 300ms;
+}
+
+.picker-items-col-absolute .weui-picker-modal .picker-item {
+	position: absolute;
+}
+
+.weui-picker-modal .picker-item.picker-item-far {
+	pointer-events: none;
+}
+
+.weui-picker-modal .picker-item.picker-selected {
+	color: #3d4145;
+	-webkit-transform: translate3d(0, 0, 0);
+	transform: translate3d(0, 0, 0);
+	-webkit-transform: rotateX(0deg);
+	transform: rotateX(0deg);
+}
+
+.weui-picker-modal .picker-center-highlight {
+	height: 32px;
+	box-sizing: border-box;
+	position: absolute;
+	left: 0;
+	width: 100%;
+	top: 50%;
+	margin-top: -16px;
+	pointer-events: none;
+}
+
+.weui-picker-modal .picker-center-highlight:before {
+	content: '';
+	position: absolute;
+	left: 0;
+	top: 0;
+	bottom: auto;
+	right: auto;
+	height: 1px;
+	width: 100%;
+	background-color: #D9D9D9;
+	display: block;
+	z-index: 15;
+	-webkit-transform-origin: 50% 0%;
+	transform-origin: 50% 0%;
+}
+
+@media only screen and (-webkit-min-device-pixel-ratio: 2) {
+	.weui-picker-modal .picker-center-highlight:before {
+		-webkit-transform: scaleY(0.5);
+		transform: scaleY(0.5);
+	}
+}
+
+@media only screen and (-webkit-min-device-pixel-ratio: 3) {
+	.weui-picker-modal .picker-center-highlight:before {
+		-webkit-transform: scaleY(0.33);
+		transform: scaleY(0.33);
+	}
+}
+
+.weui-picker-modal .picker-center-highlight:after {
+	content: '';
+	position: absolute;
+	left: 0;
+	bottom: 0;
+	right: auto;
+	top: auto;
+	height: 1px;
+	width: 100%;
+	background-color: #D9D9D9;
+	display: block;
+	z-index: 15;
+	-webkit-transform-origin: 50% 100%;
+	transform-origin: 50% 100%;
+}
+
+@media only screen and (-webkit-min-device-pixel-ratio: 2) {
+	.weui-picker-modal .picker-center-highlight:after {
+		-webkit-transform: scaleY(0.5);
+		transform: scaleY(0.5);
+	}
+}
+
+@media only screen and (-webkit-min-device-pixel-ratio: 3) {
+	.weui-picker-modal .picker-center-highlight:after {
+		-webkit-transform: scaleY(0.33);
+		transform: scaleY(0.33);
+	}
+}
+
+.weui-picker-modal .picker-3d .picker-items {
+	overflow: hidden;
+	-webkit-perspective: 1200px;
+	perspective: 1200px;
+}
+
+.weui-picker-modal .picker-3d .picker-items-col,
+.weui-picker-modal .picker-3d .picker-items-col-wrapper,
+.weui-picker-modal .picker-3d .picker-item {
+	-webkit-transform-style: preserve-3d;
+	transform-style: preserve-3d;
+}
+
+.weui-picker-modal .picker-3d .picker-items-col {
+	overflow: visible;
+}
+
+.weui-picker-modal .picker-3d .picker-item {
+	-webkit-transform-origin: center center -110px;
+	transform-origin: center center -110px;
+	-webkit-backface-visibility: hidden;
+	backface-visibility: hidden;
+	-webkit-transition-timing-function: ease-out;
+	transition-timing-function: ease-out;
+}
+
+.weui-picker-container {
+	/* background-color: rgba(0, 0, 0, .4); */
+	height: 100%;
+}
+
+.weui-picker-overlay {
+	height: 0;
+}
+
+.weui-picker-container,
+.weui-picker-overlay {
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	right: 0;
+	width: 100%;
+	z-index: 1000
+}
+
+.city-picker .picker-items-col {
+	-webkit-box-flex: 1;
+	-webkit-flex: 1;
+	-ms-flex: 1;
+	flex: 1;
+	max-width: 7rem;
+}
+
+.weui-picker-container .weui-cells {
+	margin: 0;
+	text-align: left;
+}
+
+.datetime-picker .picker-item {
+	text-overflow: initial;
+}
+
+.weui-select-modal {
+	height: auto;
+}
+
+.weui-select-modal .weui-cells {
+	margin: 0;
+	text-align: left;
+	overflow-y: auto;
+	overflow-x: hidden;
+	max-height: 16rem;
+}
+
+.weui-select-modal .weui-cells:after {
+	display: none;
+}
+
+/* === Calendar === */
+.weui-picker-calendar {
+	background: #fff;
+	height: 15rem;
+	width: 100%;
+	overflow: hidden;
+}
+
+.weui-picker-calendar .picker-modal-inner {
+	overflow: hidden;
+	height: 12.8rem;
+}
+
+.picker-calendar-week-days {
+	height: .9rem;
+	background: #f7f7f8;
+	display: -webkit-box;
+	display: -ms-flexbox;
+	display: -webkit-flex;
+	display: flex;
+	font-size: 11px;
+	box-sizing: border-box;
+	position: relative;
+}
+
+.picker-calendar-week-days:after {
+	content: '';
+	position: absolute;
+	left: 0;
+	bottom: 0;
+	right: auto;
+	top: auto;
+	height: 1px;
+	width: 100%;
+	background-color: #c4c4c4;
+	display: block;
+	z-index: 15;
+	-webkit-transform-origin: 50% 100%;
+	transform-origin: 50% 100%;
+}
+
+@media only screen and (-webkit-min-device-pixel-ratio: 2) {
+	.picker-calendar-week-days:after {
+		-webkit-transform: scaleY(0.5);
+		transform: scaleY(0.5);
+	}
+}
+
+@media only screen and (-webkit-min-device-pixel-ratio: 3) {
+	.picker-calendar-week-days:after {
+		-webkit-transform: scaleY(0.33);
+		transform: scaleY(0.33);
+	}
+}
+
+.picker-calendar-week-days .picker-calendar-week-day {
+	-webkit-flex-shrink: 1;
+	-ms-flex: 0 1 auto;
+	-webkit-flex-shrink: 1;
+	-ms-flex-negative: 1;
+	flex-shrink: 1;
+	width: 14.28571429%;
+	width: calc(100% / 7);
+	line-height: 17px;
+	text-align: center;
+}
+
+.picker-calendar-week-days+.picker-calendar-months {
+	height: 11.9rem;
+}
+
+.picker-calendar-months {
+	width: 100%;
+	height: 100%;
+	overflow: hidden;
+	position: relative;
+}
+
+.picker-calendar-months-wrapper {
+	position: relative;
+	width: 100%;
+	height: 100%;
+	-webkit-transition: 300ms;
+	transition: 300ms;
+}
+
+.picker-calendar-month {
+	display: -webkit-box;
+	display: -ms-flexbox;
+	display: -webkit-flex;
+	display: flex;
+	-webkit-box-orient: vertical;
+	-ms-flex-direction: column;
+	-webkit-flex-direction: column;
+	flex-direction: column;
+	width: 100%;
+	height: 100%;
+	position: absolute;
+	left: 0;
+	top: 0;
+}
+
+.picker-calendar-row {
+	height: 16.66666667%;
+	height: calc(100% / 6);
+	display: -webkit-box;
+	display: -ms-flexbox;
+	display: -webkit-flex;
+	display: flex;
+	-webkit-flex-shrink: 1;
+	-ms-flex: 0 1 auto;
+	-webkit-flex-shrink: 1;
+	-ms-flex-negative: 1;
+	flex-shrink: 1;
+	width: 100%;
+	position: relative;
+}
+
+.picker-calendar-row:after {
+	content: '';
+	position: absolute;
+	left: 0;
+	bottom: 0;
+	right: auto;
+	top: auto;
+	height: 1px;
+	width: 100%;
+	background-color: #ccc;
+	display: block;
+	z-index: 15;
+	-webkit-transform-origin: 50% 100%;
+	transform-origin: 50% 100%;
+}
+
+@media only screen and (-webkit-min-device-pixel-ratio: 2) {
+	.picker-calendar-row:after {
+		-webkit-transform: scaleY(0.5);
+		transform: scaleY(0.5);
+	}
+}
+
+@media only screen and (-webkit-min-device-pixel-ratio: 3) {
+	.picker-calendar-row:after {
+		-webkit-transform: scaleY(0.33);
+		transform: scaleY(0.33);
+	}
+}
+
+.weui-picker-modal .picker-calendar-row:last-child:after {
+	display: none;
+}
+
+.picker-calendar-day {
+	-webkit-flex-shrink: 1;
+	-ms-flex: 0 1 auto;
+	-webkit-flex-shrink: 1;
+	-ms-flex-negative: 1;
+	flex-shrink: 1;
+	display: -webkit-box;
+	display: -ms-flexbox;
+	display: -webkit-flex;
+	display: flex;
+	-webkit-box-pack: center;
+	-ms-flex-pack: center;
+	-webkit-justify-content: center;
+	justify-content: center;
+	-webkit-box-align: center;
+	-ms-flex-align: center;
+	-webkit-align-items: center;
+	align-items: center;
+	box-sizing: border-box;
+	width: 14.28571429%;
+	width: calc(100% / 7);
+	text-align: center;
+	color: #3d4145;
+	font-size: 15px;
+	cursor: pointer;
+}
+
+.picker-calendar-day.picker-calendar-day-prev,
+.picker-calendar-day.picker-calendar-day-next {
+	color: #ccc;
+}
+
+.picker-calendar-day.picker-calendar-day-disabled {
+	color: #d4d4d4;
+	cursor: auto;
+}
+
+.picker-calendar-day.picker-calendar-day-today span {
+	background: #e3e3e3;
+}
+
+.picker-calendar-day.picker-calendar-day-selected span {
+	background: #04BE02;
+	color: #fff;
+}
+
+.picker-calendar-day span {
+	display: inline-block;
+	border-radius: 100%;
+	width: 30px;
+	height: 30px;
+	line-height: 30px;
+}
+
+.picker-calendar-month-picker,
+.picker-calendar-year-picker {
+	display: -webkit-box;
+	display: -ms-flexbox;
+	display: -webkit-flex;
+	display: flex;
+	-webkit-box-align: center;
+	-ms-flex-align: center;
+	-webkit-align-items: center;
+	align-items: center;
+	-webkit-box-pack: justify;
+	-ms-flex-pack: justify;
+	-webkit-justify-content: space-between;
+	justify-content: space-between;
+	width: 50%;
+	max-width: 200px;
+	-webkit-flex-shrink: 10;
+	-ms-flex: 0 10 auto;
+	-webkit-flex-shrink: 10;
+	-ms-flex-negative: 10;
+	flex-shrink: 10;
+}
+
+.picker-calendar-month-picker a.icon-only,
+.picker-calendar-year-picker a.icon-only {
+	min-width: 36px;
+}
+
+.picker-calendar-month-picker span,
+.picker-calendar-year-picker span {
+	-webkit-flex-shrink: 1;
+	-ms-flex: 0 1 auto;
+	-webkit-flex-shrink: 1;
+	-ms-flex-negative: 1;
+	flex-shrink: 1;
+	position: relative;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+
+.popover .picker-calendar .picker-calendar-week-days,
+.picker-calendar.picker-modal-inline .picker-calendar-week-days {
+	background: none;
+}
+
+.popover .picker-calendar .toolbar:before,
+.picker-calendar.picker-modal-inline .toolbar:before,
+.popover .picker-calendar .picker-calendar-week-days:before,
+.picker-calendar.picker-modal-inline .picker-calendar-week-days:before {
+	display: none;
+}
+
+.popover .picker-calendar .toolbar:after,
+.picker-calendar.picker-modal-inline .toolbar:after,
+.popover .picker-calendar .picker-calendar-week-days:after,
+.picker-calendar.picker-modal-inline .picker-calendar-week-days:after {
+	display: none;
+}
+
+.popover .picker-calendar .toolbar~.picker-modal-inner .picker-calendar-months:before,
+.picker-calendar.picker-modal-inline .toolbar~.picker-modal-inner .picker-calendar-months:before,
+.popover .picker-calendar .picker-calendar-week-days~.picker-calendar-months:before,
+.picker-calendar.picker-modal-inline .picker-calendar-week-days~.picker-calendar-months:before {
+	content: '';
+	position: absolute;
+	left: 0;
+	top: 0;
+	bottom: auto;
+	right: auto;
+	height: 1px;
+	width: 100%;
+	background-color: #c4c4c4;
+	display: block;
+	z-index: 15;
+	-webkit-transform-origin: 50% 0%;
+	transform-origin: 50% 0%;
+}
+
+@media only screen and (-webkit-min-device-pixel-ratio: 2) {
+
+	.popover .picker-calendar .toolbar~.picker-modal-inner .picker-calendar-months:before,
+	.picker-calendar.picker-modal-inline .toolbar~.picker-modal-inner .picker-calendar-months:before,
+	.popover .picker-calendar .picker-calendar-week-days~.picker-calendar-months:before,
+	.picker-calendar.picker-modal-inline .picker-calendar-week-days~.picker-calendar-months:before {
+		-webkit-transform: scaleY(0.5);
+		transform: scaleY(0.5);
+	}
+}
+
+@media only screen and (-webkit-min-device-pixel-ratio: 3) {
+
+	.popover .picker-calendar .toolbar~.picker-modal-inner .picker-calendar-months:before,
+	.picker-calendar.picker-modal-inline .toolbar~.picker-modal-inner .picker-calendar-months:before,
+	.popover .picker-calendar .picker-calendar-week-days~.picker-calendar-months:before,
+	.picker-calendar.picker-modal-inline .picker-calendar-week-days~.picker-calendar-months:before {
+		-webkit-transform: scaleY(0.33);
+		transform: scaleY(0.33);
+	}
+}
+
+.picker-calendar-month-picker,
+.picker-calendar-year-picker {
+	display: block;
+	line-height: 2.2rem;
+	-webkit-box-flex: 1;
+	-webkit-flex: 1;
+	-ms-flex: 1;
+	flex: 1;
+}
+
+.picker-calendar-month-picker a.icon-only,
+.picker-calendar-year-picker a.icon-only {
+	float: left;
+	width: 25%;
+	height: 2.2rem;
+	line-height: 2rem;
+}
+
+.picker-calendar-month-picker .current-month-value,
+.picker-calendar-year-picker .current-month-value,
+.picker-calendar-month-picker .current-year-value,
+.picker-calendar-year-picker .current-year-value {
+	float: left;
+	width: 50%;
+	height: 2.2rem;
+}
+
+i.icon {
+	display: inline-block;
+	vertical-align: middle;
+	background-size: 100% auto;
+	background-position: center;
+	background-repeat: no-repeat;
+	font-style: normal;
+	position: relative;
+}
+
+i.icon.icon-next,
+i.icon.icon-prev {
+	width: 0.75rem;
+	height: 0.75rem;
+}
+
+i.icon.icon-next {
+	background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2015%2015'%3E%3Cg%3E%3Cpath%20fill%3D'%2304BE02'%20d%3D'M1%2C1.6l11.8%2C5.8L1%2C13.4V1.6%20M0%2C0v15l15-7.6L0%2C0L0%2C0z'%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E");
+}
+
+i.icon.icon-prev {
+	background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2015%2015'%3E%3Cg%3E%3Cpath%20fill%3D'%2304BE02'%20d%3D'M14%2C1.6v11.8L2.2%2C7.6L14%2C1.6%20M15%2C0L0%2C7.6L15%2C15V0L15%2C0z'%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E");
+}
+
+.weui-actionsheet {
+	z-index: 10000;
+}
+
+.weui-popup__overlay,
+.weui-popup__container {
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	right: 0;
+	top: 40px;
+	width: 100%;
+	z-index: 10;
+	padding-bottom: 40px;
+}
+
+.weui-popup__overlay {
+	background-color: rgba(0, 0, 0, 0.6);
+	opacity: 0;
+	-webkit-transition: opacity .3s;
+	transition: opacity .3s;
+}
+
+.weui-popup__container {
+	display: none;
+}
+
+.weui-popup__container.weui-popup__container--visible {
+	display: block;
+}
+
+.weui-popup__container .weui-cells {
+	margin: 0;
+	text-align: left;
+}
+
+.weui-popup__modal {
+	width: 100%;
+	position: absolute;
+	z-index: 100;
+	bottom: 0;
+	border-radius: 0;
+	opacity: 0.6;
+	color: #3d4145;
+	-webkit-transition-duration: .3s;
+	transition-duration: .3s;
+	height: 100%;
+	background: #fff;
+	-webkit-transform: translate3d(0, 100%, 0);
+	transform: translate3d(0, 100%, 0);
+	-webkit-transition-property: opacity, -webkit-transform;
+	transition-property: opacity, -webkit-transform;
+	transition-property: transform, opacity;
+	transition-property: transform, opacity, -webkit-transform;
+	overflow-x: hidden;
+	overflow-y: auto;
+}
+
+.popup-bottom .weui-popup__modal {
+	height: auto;
+}
+
+.weui-popup__modal .toolbar {
+	position: absolute;
+	left: 0;
+	top: 0;
+	right: 0;
+	z-index: 1;
+}
+
+.weui-popup__modal .modal-content {
+	height: 100%;
+	padding-top: 2.2rem;
+	overflow: auto;
+	box-sizing: border-box;
+}
+
+.weui-popup__container--visible .weui-popup__overlay {
+	opacity: 1;
+}
+
+.weui-popup__container--visible .weui-popup__modal {
+	opacity: 1;
+	-webkit-transform: translate3d(0, 0, 0);
+	transform: translate3d(0, 0, 0);
+}
+
+.weui-notification {
+	position: fixed;
+	width: 100%;
+	min-height: 3.4rem;
+	top: -2rem;
+	padding-top: 2rem;
+	left: 0;
+	right: 0;
+	z-index: 9999;
+	background-color: rgba(0, 0, 0, 0.75);
+	color: white;
+	font-size: .65rem;
+	-webkit-transform: translate3d(0, -100%, 0);
+	transform: translate3d(0, -100%, 0);
+	-webkit-transition: .4s;
+	transition: .4s;
+}
+
+.weui-notification.weui-notification--in {
+	-webkit-transform: translate3d(0, 0, 0);
+	transform: translate3d(0, 0, 0);
+}
+
+.weui-notification.weui-notification--touching {
+	-webkit-transition-duration: 0s;
+	transition-duration: 0s;
+}
+
+.weui-notification .weui-notification__inner {
+	padding: .4rem .6rem 1rem .6rem;
+	display: -webkit-box;
+	display: -ms-flexbox;
+	display: -webkit-flex;
+	display: flex;
+	-webkit-box-align: start;
+	-ms-flex-align: start;
+	-webkit-align-items: flex-start;
+	align-items: flex-start;
+}
+
+.weui-notification .weui-notification__content {
+	width: 100%;
+	margin: 0rem .4rem;
+}
+
+.weui-notification .weui-notification__title {
+	font-weight: bold;
+}
+
+.weui-notification .weui-notification__text {
+	line-height: 1;
+}
+
+.weui-notification .weui-notification__media {
+	height: 1rem;
+	width: 1rem;
+}
+
+.weui-notification .weui-notification__media img {
+	width: 100%;
+}
+
+.weui-notification .weui-notification__handle-bar {
+	position: absolute;
+	bottom: .2rem;
+	left: 50%;
+	-webkit-transform: translate3d(-50%, 0, 0);
+	transform: translate3d(-50%, 0, 0);
+	width: 2rem;
+	height: .3rem;
+	border-radius: .15rem;
+	background: white;
+	opacity: .5;
+}
+
+.weui-photo-browser-modal {
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	background: black;
+	display: none;
+	opacity: 0;
+	-webkit-transition: opacity .3s;
+	transition: opacity .3s;
+}
+
+.weui-photo-browser-modal.weui-photo-browser-modal-visible {
+	opacity: 1;
+}
+
+.weui-photo-browser-modal .swiper-container {
+	height: 100%;
+	-webkit-transform: scale(0.2);
+	transform: scale(0.2);
+	-webkit-transition: -webkit-transform .5s;
+	transition: -webkit-transform .5s;
+	transition: transform .5s;
+	transition: transform .5s, -webkit-transform .5s;
+}
+
+.weui-photo-browser-modal .swiper-container .swiper-pagination-bullet {
+	background: white;
+	visibility: hidden;
+}
+
+.weui-photo-browser-modal .swiper-container.swiper-container-visible {
+	-webkit-transform: scale(1);
+	transform: scale(1);
+}
+
+.weui-photo-browser-modal .swiper-container.swiper-container-visible .swiper-pagination-bullet {
+	visibility: visible;
+	-webkit-transition-property: visibility;
+	transition-property: visibility;
+	-webkit-transition-delay: .5s;
+	transition-delay: .5s;
+}
+
+.weui-photo-browser-modal .swiper-container .swiper-pagination {
+	bottom: 10px;
+	left: 0;
+	width: 100%;
+}
+
+.weui-photo-browser-modal .photo-container {
+	height: 100%;
+	display: -webkit-box;
+	display: -webkit-flex;
+	display: -ms-flexbox;
+	display: flex;
+	-webkit-box-align: center;
+	-webkit-align-items: center;
+	-ms-flex-align: center;
+	align-items: center;
+	overflow: hidden;
+}
+
+.weui-photo-browser-modal .photo-container img {
+	max-width: 100%;
+	margin-top: -30px;
+}
+
+.weui-photo-browser-modal .caption {
+	position: absolute;
+	bottom: 40px;
+	left: 0;
+	right: 0;
+	color: white;
+	text-align: center;
+	padding: 0 12px;
+	min-height: 3rem;
+	font-size: 14px;
+	z-index: 10;
+	-webkit-transition: opacity .3s;
+	transition: opacity .3s;
+	-webkit-transition-delay: .5s;
+	transition-delay: .5s;
+	opacity: 0;
+}
+
+.weui-photo-browser-modal .caption .caption-item {
+	display: none;
+	opacity: 0;
+	-webkit-transition: opacity .15s;
+	transition: opacity .15s;
+}
+
+.weui-photo-browser-modal .caption .caption-item.active {
+	display: block;
+	opacity: 1;
+}
+
+.weui-photo-browser-modal .swiper-container-visible .caption {
+	opacity: 1;
+}
+
+.color-primary {
+	color: #04BE02;
+}
+
+.color-danger,
+.color-error {
+	color: #f6383a;
+}
+
+.color-warning {
+	color: #f60;
+}
+
+.color-success {
+	color: #4cd964;
+}
+
+.bg-primary,
+.bg-success,
+.bg-danger,
+.bg-error,
+.bg-warning {
+	color: white;
+}
+
+.bg-primary {
+	background-color: #04BE02;
+}
+
+.bg-danger,
+.bg-error {
+	background-color: #EF4F4F;
+}
+
+.bg-warning {
+	background-color: #FF6600;
+}
+
+.bg-success {
+	background-color: #04BE02;
+}
+
+.weui-toptips {
+	z-index: 100;
+	opacity: 0;
+	-webkit-transition: opacity .3s;
+	transition: opacity .3s;
+}
+
+.weui-toptips.weui-toptips_visible {
+	opacity: 1;
+}
+
+.weui-icon_toast {
+	font-size: 55px;
+	color: white;
+	margin-bottom: 6px;
+}
+
+.weui-toast--forbidden .weui-icon_toast {
+	color: #f6383a;
+}
+
+.weui-toast--text {
+	min-height: initial;
+	font-size: 14px;
+	padding: 8px 10px;
+	width: auto;
+	top: 40%;
+}
+
+.weui-toast--text .weui-icon_toast {
+	display: none;
+}
+
+.weui-count {
+	display: inline-block;
+	height: 25px;
+	line-height: 25px;
+}
+
+.weui-count .weui-count__btn {
+	height: 21px;
+	width: 21px;
+	line-height: 21px;
+	display: inline-block;
+	position: relative;
+	border: 1px solid #04BE02;
+	border-radius: 50%;
+	vertical-align: -6px;
+}
+
+.weui-count .weui-count__btn:after,
+.weui-count .weui-count__btn:before {
+	content: " ";
+	position: absolute;
+	height: 1px;
+	width: 11px;
+	background-color: #04BE02;
+	left: 50%;
+	top: 50%;
+	margin-left: -5.5px;
+}
+
+.weui-count .weui-count__btn:after {
+	height: 11px;
+	width: 1px;
+	margin-top: -5.5px;
+	margin-left: -1px;
+}
+
+.weui-count .weui-count__decrease:after {
+	display: none;
+}
+
+.weui-count .weui-count__increase {
+	background-color: #04BE02;
+}
+
+.weui-count .weui-count__increase:after,
+.weui-count .weui-count__increase:before {
+	background-color: white;
+}
+
+.weui-count .weui-count__number {
+	background-color: transparent;
+	font-size: .8rem;
+	border: 0;
+	width: 1.3rem;
+	text-align: center;
+	color: #5f646e;
+}
+
+.weui-panel .weui-media-box__title-after {
+	color: #9b9b9b;
+	font-size: .65rem;
+	float: right;
+}
+
+/*菜单竖线*/
+.weui-nav {
+	display: flex;
+}
+
+.weui-nav li {
+	list-style-type: none;
+	margin: 0;
+	padding: 0 0.75rem;
+}
+
+.weui-nav li:not(:last-child) {
+	border-right: 1px solid #9b9b9b;
+}
+
+/*字体11-55号*/
+
+.f11 {
+	font-size: 11px !important;
+	line-height: 11px;
+}
+
+.f12 {
+	font-size: 12px !important;
+	line-height: 12px;
+}
+
+.f13 {
+	font-size: 13px !important;
+	line-height: 13px;
+}
+
+.f14 {
+	font-size: 14px !important;
+	line-height: 14px;
+}
+
+.f15 {
+	font-size: 15px !important;
+	line-height: 15px;
+}
+
+.f16 {
+	font-size: 16px !important;
+	line-height: 16px;
+}
+
+.f17 {
+	font-size: 17px !important;
+	line-height: 17px;
+}
+
+.f18 {
+	font-size: 18px !important;
+}
+
+.f19 {
+	font-size: 19px !important;
+	line-height: 19px;
+}
+
+.f20 {
+	font-size: 20px !important;
+	line-height: 20px;
+}
+
+.f21 {
+	font-size: 21px !important;
+	line-height: 21px;
+}
+
+.f22 {
+	font-size: 22px !important;
+	line-height: 22px;
+}
+
+.f23 {
+	font-size: 23px !important;
+	line-height: 23px;
+}
+
+.f24 {
+	font-size: 24px !important;
+	line-height: 24px;
+}
+
+.f25 {
+	font-size: 25px !important;
+	line-height: 25px;
+}
+
+.f26 {
+	font-size: 26px !important;
+	line-height: 26px;
+}
+
+.f27 {
+	font-size: 27px !important;
+	line-height: 27px;
+}
+
+.f28 {
+	font-size: 28px !important;
+	line-height: 28px;
+}
+
+.f29 {
+	font-size: 29px !important;
+	line-height: 29px;
+}
+
+.f30 {
+	font-size: 30px !important;
+	line-height: 30px;
+}
+
+.f31 {
+	font-size: 31px !important;
+	line-height: 31px;
+}
+
+.f32 {
+	font-size: 32px !important;
+	line-height: 32px;
+}
+
+.f35 {
+	font-size: 35px !important;
+	line-height: 35px;
+}
+
+.f40 {
+	font-size: 40px !important;
+	line-height: 40px;
+}
+
+.f45 {
+	font-size: 45px !important;
+	line-height: 45px;
+}
+
+.f50 {
+	font-size: 50px !important;
+	line-height: 50px;
+}
+
+.f55 {
+	font-size: 55px !important;
+	line-height: 55px;
+}
+
+/*字体颜色*/
+.f-red {
+	color: #ef4f4f !important;
+}
+
+.f-green {
+	color: #04be02 !important;
+}
+
+.f-blue {
+	color: #FF4B51 !important;
+}
+
+.f-black {
+	color: #333 !important;
+}
+
+.f-white {
+	color: #FFF !important;
+}
+
+.f-zi {
+	color: #FF33CC !important;
+}
+
+.f-gray {
+	color: #CCCCCC !important;
+}
+
+.f-yellow {
+	color: #FFFF66 !important;
+}
+
+.f-orange {
+	color: #FF6600 !important;
+}
+
+/*背景颜色*/
+
+.bg-green {
+	background-color: #5bbb5a;
+}
+
+.bg-red {
+	background-color: #EF4F4F;
+}
+
+.bg-blue {
+	background-color: #00a7ff;
+}
+
+.bg-blue:not(.weui-btn_disabled):visited {
+	color: #FFFFFF;
+}
+
+.b-red {
+	color: #EF4F4F;
+	border: 1px solid #EF4F4F !important;
+
+}
+
+.red {
+	color: #EF4F4F;
+}
+
+.b-green {
+	border: 1px solid #04BE02 !important;
+}
+
+.b-blue {
+	color: #00a7ff;
+	border: 1px solid #00a7ff !important;
+}
+
+button.b-blue,
+input.b-blue {
+	border-width: 1px;
+	background-color: transparent;
+}
+
+.bg-orange {
+	background-color: #FF6600;
+}
+
+.bg-orange:not(.weui-btn_disabled):visited {
+	color: #FFFFFF;
+}
+
+.b-orange {
+	color: #FF6600;
+	border: 1px solid #FF6600 !important;
+}
+
+button.b-orange,
+input.b-orange {
+	border-width: 1px;
+	background-color: transparent;
+}
+
+.b-gray {
+	color: #333;
+	border: 1px solid #bbb;
+
+}
+
+.bg-gray {
+	background-color: #f7f7f7;
+}
+
+/*
+十六宫格*/
+.grid {
+	position: relative;
+	float: left;
+	padding: 20px 10px;
+	width: 33.33%;
+	box-sizing: border-box;
+	text-decoration: none
+}
+
+.grids-small .grid {
+	width: 25%;
+	padding: 15px 8px
+}
+
+.grid:before {
+	content: " ";
+	position: absolute;
+	right: 0;
+	top: 0;
+	width: 1px;
+	height: 100%;
+	border-right: 1px solid #d9d9d9;
+	color: #d9d9d9;
+	transform-origin: 100% 0;
+	transform: scaleX(0.5)
+}
+
+.grid:after {
+	content: " ";
+	position: absolute;
+	left: 0;
+	bottom: 0;
+	width: 100%;
+	height: 1px;
+	border-bottom: 1px solid #d9d9d9;
+	color: #d9d9d9;
+	-webkit-transform-origin: 0 100%;
+	transform-origin: 0 100%;
+	-webkit-transform: scaleY(0.5);
+	transform: scaleY(0.5)
+}
+
+/*loading动画*/
+@keyframes donut-spin {
+	0% {
+		transform: rotate(0deg);
+	}
+
+	100% {
+		transform: rotate(360deg);
+	}
+}
+
+.loading {
+	display: inline-block;
+	border: 3px solid rgba(0, 0, 0, 0.2);
+	border-left-color: #333;
+	border-radius: 50%;
+	width: 25px;
+	height: 25px;
+	animation: donut-spin 1s linear infinite;
+}
+
+.loading2 {
+	color: #fff;
+	position: fixed;
+	box-sizing: border-box;
+	left: -9999px;
+	top: -9999px;
+	width: 0;
+	height: 0;
+	overflow: hidden;
+	z-index: 999999
+}
+
+.loading2:after,
+.loading2:before {
+	box-sizing: border-box
+}
+
+.loading2 {
+	background-color: rgba(0, 0, 0, 0.7);
+	width: 100%;
+	height: 100%;
+	left: 0;
+	top: 0
+}
+
+@keyframes rotation {
+	from {
+		transform: rotate(0)
+	}
+
+	to {
+		transform: rotate(359deg)
+	}
+}
+
+@keyframes blink {
+	from {
+		opacity: .5
+	}
+
+	to {
+		opacity: 1
+	}
+}
+
+.loading2[data-text]:before {
+	position: fixed;
+	left: 0;
+	top: 50%;
+	color: currentColor;
+	font-family: Helvetica, Arial, sans-serif;
+	text-align: center;
+	width: 100%;
+	font-size: 16px
+}
+
+.loading2[data-text='']:before {
+	content: 'Loading...'
+}
+
+.loading2:not([data-text='']):before {
+	content: attr(data-text)
+}
+
+.loading2[data-text]:before {
+	top: calc(50% - 63px)
+}
+
+.loading2:after {
+	content: '';
+	position: fixed;
+	width: 48px;
+	height: 48px;
+	border: solid 4px #fff;
+	border-left-color: transparent;
+	border-radius: 50%;
+	top: calc(50% - 24px);
+	left: calc(50% - 24px);
+	animation: rotation 1s linear infinite
+}
+
+/*时间线*/
+.timeline {
+	padding: 15px;
+}
+
+.timeline-item {
+	position: relative;
+	list-style: none;
+}
+
+.timeline-item-color {
+	background-color: #04BE02;
+
+}
+
+.timeline-item-head-first {
+	width: 20px;
+	height: 20px;
+	left: -4px;
+	top: 5px;
+	position: absolute;
+	content: '';
+	z-index: 99;
+	border-radius: 99px;
+}
+
+.timeline-item-head {
+	width: 10px;
+	height: 10px;
+	left: 1px;
+	top: 4px;
+	position: absolute;
+	content: '';
+	z-index: 99;
+	border-radius: 99px;
+}
+
+.timeline-item-checked {
+	width: 100%;
+	position: absolute;
+	left: 0;
+	top: 0;
+	width: 20px;
+	height: 20px;
+	color: #FFF;
+}
+
+.timeline-item-checked.weui-icon-success-no-circle::before {
+	font-size: 14px;
+	position: absolute;
+	left: 3px;
+	top: 3px;
+	margin: 0 !important;
+	color: #FFF;
+}
+
+.timeline-item-tail {
+	position: absolute;
+	content: '';
+	height: 100%;
+	width: 2px;
+	left: 5px;
+	top: 5px;
+	background-color: #04BE02;
+
+}
+
+.timeline-item-content {
+	padding: 0 0 15px 1.2rem;
+}
+
+.timeline .recent {
+	color: #04be02;
+}
+
+.timeline h4 {
+	color: #333;
+	font-weight: normal;
+}
+
+.timeline p {
+	color: #888;
+	font-size: 14px;
+}
+
+/*
+* 红点提醒
+*/
+.weui-reddot,
+.weui-reddot-s {
+	position: relative;
+	display: inline-block;
+	line-height: 22px;
+	padding: 0 6px;
+}
+
+.weui-reddot:after {
+	content: '';
+	position: absolute;
+	display: block;
+	width: 8px;
+	height: 8px;
+	background-color: #f74c31;
+	border-radius: 5px;
+	right: -3px;
+	top: -3px;
+	background-clip: padding-box;
+}
+
+.weui-reddot-s:after {
+	content: '';
+	position: absolute;
+	display: block;
+	width: 8px;
+	height: 8px;
+	background-color: #f74c31;
+	border-radius: 5px;
+	width: 6px;
+	height: 6px;
+	top: 0;
+	right: 0;
+	background-clip: padding-box;
+}
+
+/*weui-tab*/
+.weui-tab-nav {
+	display: -webkit-box;
+	display: -webkit-flex;
+	display: flex
+}
+
+.weui-tab-nav .weui-nav-green {
+	display: block;
+	-webkit-box-flex: 1;
+	-webkit-flex: 1;
+	flex: 1;
+	width: 100%;
+	height: 30px;
+	padding: 0;
+	font-size: 14px;
+	line-height: 31px;
+	text-align: center;
+	border: 1px solid #04be02;
+	border-width: 1px 1px 1px 0;
+	color: #04be02;
+	white-space: nowrap;
+	background: #fdfdfd
+}
+
+.weui-tab-nav .weui-nav-green.bg-green {
+	border-color: #04be02;
+	color: #fff;
+	background: #04be02
+}
+
+.weui-tab-nav .weui-nav-red {
+	display: block;
+	-webkit-box-flex: 1;
+	-webkit-flex: 1;
+	flex: 1;
+	width: 100%;
+	height: 30px;
+	padding: 0;
+	font-size: 14px;
+	line-height: 31px;
+	text-align: center;
+	border: 1px solid #ef4f4f;
+	border-width: 1px 1px 1px 0;
+	color: #ef4f4f;
+	white-space: nowrap;
+	background: #fdfdfd
+}
+
+.weui-tab-nav .weui-nav-red.bg-red {
+	border-color: #EF4F4F;
+	color: #fff;
+	background: #EF4F4F
+}
+
+.weui-tab-nav .weui-navbar__item:first-child {
+	border-width: 1px;
+	border-top-left-radius: 5px;
+	border-bottom-left-radius: 5px;
+	background-clip: padding-box
+}
+
+.weui-tab-nav .weui-navbar__item:last-child {
+	border-top-right-radius: 5px;
+	border-bottom-right-radius: 5px;
+	background-clip: padding-box
+}
+
+.tab-fixed {
+	position: fixed;
+	top: 0;
+	width: 100%;
+	z-index: 100;
+}
+
+.tab-bottom {
+	bottom: 0;
+	width: 100%;
+	position: fixed;
+}
+
+.weui-navbar__item.tab-green {
+	background: rgba(0, 0, 0, 0) none repeat scroll 0 0;
+	border-bottom: 3px solid #04be02;
+	color: #04be02;
+	transition: right 0.3s cubic-bezier(0.35, 0, 0.25, 1) 0.09s, left 0.3s cubic-bezier(0.35, 0, 0.25, 1);
+}
+
+.weui-navbar__item.tab-red {
+	background: rgba(0, 0, 0, 0) none repeat scroll 0 0;
+	border-bottom: 3px solid #ef4f4f;
+	color: #ef4f4f;
+}
+
+.weui-navbar__item.tab-blue {
+	background: rgba(0, 0, 0, 0) none repeat scroll 0 0;
+	border-bottom: 3px solid #00a7ff;
+	color: #00a7ff;
+}
+
+.weui-navbar__item:after {
+	border-right: none;
+}
+
+.weui-tabbar__label {
+	font-size: 13px;
+}
+
+/*swipe*/
+.slide {
+	position: absolute;
+	width: 100%;
+	overflow: hidden;
+	top: 40px;
+	left: 0;
+	bottom: 65px;
+}
+
+.slide:after {
+	content: '';
+	display: block;
+	width: 100%;
+	padding-top: 50%;
+}
+
+.slide ul {
+	position: absolute;
+	left: 0;
+	top: 0;
+	width: 100%;
+	height: 100%;
+}
+
+.slide li {
+	list-style: none;
+	position: absolute;
+	left: 0;
+	top: 0;
+	width: 100%;
+	bottom: 0;
+	overflow: scroll;
+	padding-bottom: 20px;
+}
+
+.slide li:first-child {
+	z-index: 1;
+}
+
+.slide li img {
+	position: absolute;
+	left: 0;
+	top: 0;
+	width: 100%;
+	height: 100%;
+	border: none;
+}
+
+.slide .slide-desc {
+	background-color: rgba(0, 0, 0, 0.5);
+	position: absolute;
+	bottom: 0;
+	overflow: hidden;
+	padding: 5px;
+	width: 100%;
+	color: #fff;
+	font-size: 16px;
+	text-align: center;
+	white-space: nowrap;
+	word-break: break-all;
+	text-overflow: ellipsis;
+}
+
+.slide .dot {
+	position: absolute;
+	right: 10px;
+	bottom: 10px;
+	z-index: 5;
+	font-size: 0;
+}
+
+#slide2 .dot {
+	position: absolute;
+	right: 50%;
+	bottom: 10px;
+	z-index: 5;
+	font-size: 0;
+	text-align: center;
+	margin: 0 auto;
+}
+
+.slide .dot span {
+	display: inline-block;
+	width: 5px;
+	height: 5px;
+	margin-left: 5px;
+	border: 1px solid #fff;
+	border-radius: 50%;
+}
+
+.slide .dot .cur {
+	background-color: #04BE02;
+	border: 1px solid #04BE02;
+}
+
+.slide-m {
+	background: #f8f8f8;
+	height: 40px;
+	line-height: 40px;
+	vertical-align: middle;
+	margin: 0 auto;
+}
+
+.slide .txt {
+	overflow: hidden;
+	text-align: center;
+	font-size: 16px;
+	white-space: nowrap;
+	word-break: break-all;
+	text-overflow: ellipsis;
+}
+
+/*
+提示空白页*/
+.weui-msgbox {
+	width: 100%;
+	height: 80%;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.weui-msgbox p {
+	font-size: 16px;
+	color: #bbbbbb;
+	padding: 0 15px;
+}
+
+/*搜索*/
+.search-input {
+	box-sizing: content-box;
+	width: 100%;
+	line-height: 2.1;
+	display: inline-block;
+	border: none;
+	-webkit-appearance: none;
+	appearance: none;
+	border-radius: 1px;
+	font-family: inherit;
+	color: #666;
+	font-size: 16px;
+	font-weight: normal;
+	padding: 0 5px;
+	background-color: #fff;
+	border: 1px solid #04be02;
+	opacity: 0.9;
+}
+
+.search-input::-webkit-input-placeholder {
+	color: #cccccc;
+	opacity: 1;
+}
+
+.search-input+button::after {
+	border: 1px solid #04be02 !important;
+}
+
+.search-input+button {
+	border-radius: 0 !important;
+}
+
+/*支付场景*/
+.weui-pay {
+	position: relative;
+	z-index: 1;
+	padding: 15px;
+}
+
+.weui-pay-12 {
+	font-size: 12px;
+	font-weight: normal;
+}
+
+.weui-pay-inner {
+	background-color: #FFFFFF;
+	padding: 16px;
+	position: relative;
+	z-index: 0;
+}
+
+.weui-pay-inner:after {
+	content: " ";
+	width: 200%;
+	height: 200%;
+	position: absolute;
+	top: 0;
+	left: 0;
+	border: 1px solid #DDDDDD;
+	transform: scale(0.5);
+	transform-origin: 0 0;
+	box-sizing: border-box;
+}
+
+.weui-pay-title {
+	font-size: 12px;
+	color: #333333;
+	font-weight: normal;
+}
+
+.weui-pay-input {
+	margin-top: 12px;
+	padding-bottom: 18px;
+	position: relative;
+	z-index: 2;
+	color: #333333;
+}
+
+.weui-pay-input:after {
+	content: " ";
+	position: absolute;
+	left: 0;
+	bottom: 0;
+	right: 0;
+	height: 1px;
+	border-bottom: 1px solid #DDDDDD;
+	color: #DDDDDD;
+	transform-origin: 0 100%;
+	transform: scaleY(0.5);
+}
+
+.weui-pay-strong {
+	position: absolute;
+	color: #000000;
+	font-size: 28px;
+	line-height: 1;
+	left: -6px;
+	top: -3px;
+	font-weight: normal;
+}
+
+.weui-pay-inputs {
+	padding-left: 28px;
+	width: 100%;
+	box-sizing: border-box;
+	border: none;
+	outline: 0;
+	height: 40px;
+	line-height: 40px;
+	font-size: 40px;
+}
+
+.weui-pay-inputs::-webkit-textfield-decoration-container {
+	background-color: transparent;
+}
+
+.weui-pay-inputs::-webkit-inner-spin-button {
+	-webkit-appearance: none;
+}
+
+.weui-pay-inputs::-webkit-outer-spin-button {
+	-webkit-appearance: none;
+}
+
+.weui-pay-inputs::-webkit-input-placeholder {
+	color: #EEEEEE;
+}
+
+.weui-pay-intro {
+	font-size: 12px;
+	color: #9e9e9e;
+	margin-top: 14px;
+}
+
+.weui-pay-info {
+	font-size: 12px;
+	color: #9e9e9e;
+	margin-top: 16px;
+	text-align: center;
+}
+
+.weui-pay-btn {
+	margin-top: 12px;
+}
+
+.weui-payselect-title {
+	font-size: 17px;
+	font-weight: bold;
+	text-align: center;
+	color: #000000;
+}
+
+.weui-payselect-info {
+	font-size: 12px;
+	color: #a6a4a5;
+	text-align: center;
+	margin-top: 6px;
+}
+
+.weui-payselect-ul {
+	margin-top: 28px;
+	margin-right: -12px;
+	overflow: hidden;
+}
+
+.weui-payselect-li {
+	float: left;
+	list-style-type: none;
+	width: 33.33%;
+	box-sizing: border-box;
+	padding-right: 12px;
+	padding-bottom: 12px;
+}
+
+.weui-payselect-a {
+	display: block;
+	border: 1px solid #DADADA;
+	color: #dadada;
+	height: 38px;
+	line-height: 38px;
+	text-align: center;
+	font-size: 16px;
+	font-weight: bold;
+}
+
+.weui-payselect-on {
+	border-color: #09ba07;
+	color: #09ba07;
+}
+
+.weui-pay-num {
+	font-size: 50px;
+	text-align: center;
+}
+
+.weui-pay-u li {
+	display: -webkit-box;
+	display: -webkit-flex;
+	display: flex;
+	-webkit-box-orient: horizontal;
+	box-orient: horizontal;
+	line-height: 22px;
+	width: 100%
+}
+
+.weui-pay-u .title {
+	font-size: 12px;
+	color: #999;
+	-webkit-box-flex: 1;
+	width: 30%;
+	-webkit-flex: 1;
+	flex: 1;
+	display: block
+}
+
+.weui-pay-u .content {
+	font-size: 12px;
+	color: #333;
+	text-align: right;
+	-webkit-box-flex: 1;
+	width: 70%;
+	-webkit-flex: 1;
+	flex: 1;
+	display: block
+}
+
+.weui-pay .pay-div {
+	margin: 19px 0 13px 0
+}
+
+.weui-payrec {
+	position: relative;
+	z-index: 1;
+}
+
+.weui-payrec .weui_cell_title {
+	font-size: 14px;
+	line-height: 1.6;
+	color: #000000;
+}
+
+.weui-payrec .weui_cell_info {
+	font-size: 12px;
+	line-height: 1.6;
+	color: #999;
+}
+
+.weui-payrec .access .weui_cell_ft:after {
+	content: " ";
+	display: inline-block;
+	height: 6px;
+	width: 6px;
+	border-width: 2px 2px 0 0;
+	border-color: #C8C8CD;
+	border-style: solid;
+	-webkit-transform: matrix(0.71, 0.71, -0.71, 0.71, 0, 0);
+	transform: matrix(0.71, 0.71, -0.71, 0.71, 0, 0);
+	position: relative;
+	top: -2px;
+	position: absolute;
+	top: 50%;
+	margin-top: -4px;
+	right: 2px;
+}
+
+.weui-pay-order {
+	background-color: #FFFFFF;
+	margin-bottom: 20px;
+	overflow: hidden;
+	padding: 18px 29px 0;
+}
+
+.weui-pay-m {
+	background-color: #FFFFFF;
+	margin: 0 0 13px;
+	padding: 0;
+	position: relative;
+}
+
+.weui-pay-m::before {
+	content: '';
+	position: absolute;
+	top: -50%;
+	bottom: -50%;
+	left: -50%;
+	right: -50%;
+	-webkit-transform: scale(0.5);
+	transform: scale(0.5);
+	border-style: solid;
+	border-width: 1px;
+	border-color: #EDEDED;
+
+}
+
+.weui-pay-order:before,
+.weui-pay-order:after {
+	content: "";
+	background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAyCAMAAABiSatuAAAAS1BMVEX////j4+P////////t7e3////j4+P////////u7u7g4ODu7u7k5OT8/Pz////////////////////u7u7l5eXf39/s7Ozt7e38/PybHTnUAAAAF3RSTlOv6+mh61D+/ev9r6+vr3jZN0r//////pA5V/oAAACISURBVHja7ZNbDgIhDEUvgMA8Hxba2f9KdTQCpisw8XyeBNqbtlgdOtwKt9lUsZsDbOywAFK8V2L6i6c4KZeS6fwIKpmJOBd5Cw5CLyTwJXygSvDAYrgJNgsmMzQxmAmz74WfMX6LUQn1RH2qyurGdOspyhVOWrgW/8dHqXZdXYO+l/24dRz7A2urJ0UzyblDAAAAAElFTkSuQmCC") repeat-y;
+	width: 8px;
+	height: 100%;
+	-webkit-background-size: 8px 25px;
+	background-size: 8px 25px;
+	position: absolute;
+	top: 0;
+}
+
+.weui-pay-order:before {
+	left: 8px;
+}
+
+.weui-pay-order:after {
+	right: 8px;
+}
+
+.weui-pay-line {
+	padding: 0;
+	background-color: #FFFFFF;
+	position: relative;
+	font-size: 16px;
+	color: #888888;
+}
+
+.weui-pay-line:after {
+	content: "";
+	height: 1px;
+	width: 100%;
+	left: 0;
+	bottom: -1px;
+	position: absolute;
+	display: block;
+	z-index: 11;
+}
+
+.weui-pay-name {
+	font-size: 15px;
+	color: #333333;
+	padding-bottom: 5px;
+}
+
+.weui-pay-label {
+	font-size: 13px;
+	overflow: hidden;
+	color: #999999;
+	width: 72px;
+	display: inline-block;
+}
+
+.weui-pay-e {
+	display: inline-block;
+	font-size: 13px;
+	color: #333333;
+	word-break: break-all;
+	word-wrap: break-word;
+	padding-right: 15px;
+	position: relative;
+	overflow: hidden;
+}
+
+.weui-pay-area {
+	margin-top: 7px;
+	border-top: 0.0625rem dashed #DEDEDE;
+}
+
+.weui-pay-area {
+	padding: 15px 0 14px;
+	text-align: center;
+	font-size: 13px;
+	font-weight: 700;
+	display: -webkit-box;
+	display: -webkit-flex;
+	display: flex;
+	-webkit-box-orient: horizontal;
+	box-orient: horizontal;
+}
+
+.weui-pay-c {
+	color: #999999;
+	position: relative;
+}
+
+.weui-pay-c,
+.weui-pay-v {
+	-webkit-box-flex: 1;
+	-webkit-flex: 1;
+	flex: 1;
+	display: block;
+}
+
+.weui-pay-c:after {
+	content: "";
+	width: 1px;
+	height: 25px;
+	border-left: 1px solid #DEDEDE;
+	position: absolute;
+	top: 0;
+	right: 0;
+}
+
+.weui-pay-v {
+	color: #04be02;
+}
+
+/*fullpage*/
+.fullPage-wp {
+	-webkit-transform: translate3d(0, 0, 0);
+	transform: translate3d(0, 0, 0);
+}
+
+.fullPage-wp:after {
+	display: block;
+	content: ' ';
+	height: 0;
+	clear: both;
+}
+
+.fullPage-wp.anim {
+	-webkit-transition: all 500ms ease-out 0s;
+	transition: all 500ms ease-out 0s;
+}
+
+.fullPage-page {
+	display: block;
+	overflow: hidden;
+}
+
+.fullPage-dir-h {
+	float: left;
+}
+
+/* 箭头 */
+@-webkit-keyframes start {
+
+	0%,
+	30% {
+		opacity: 0.2;
+		-webkit-transform: translate(0, 10px);
+	}
+
+	60% {
+		opacity: 1;
+		-webkit-transform: translate(0, 0);
+	}
+
+	100% {
+		opacity: 0.2;
+		-webkit-transform: translate(0, -5px);
+	}
+}
+
+@keyframes start {
+
+	0%,
+	30% {
+		opacity: 0.2;
+		transform: translate(0, 10px);
+	}
+
+	60% {
+		opacity: 1;
+		transform: translate(0, 0);
+	}
+
+	100% {
+		opacity: 0.2;
+		transform: translate(0, -5px);
+	}
+}
+
+.start {
+	position: fixed;
+	left: 50%;
+	margin-left: -17px;
+	top: 95%;
+	margin-top: -34px;
+	width: 34px;
+	height: 34px;
+}
+
+.start b {
+	position: absolute;
+	left: 50%;
+	top: 10px;
+	margin-left: -9px;
+	width: 19px;
+	height: 12px;
+	background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACUAAAAYCAYAAAB9ejRwAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2RpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDo3NEE1QzAwRjUwNUVFNDExQjUyN0I2QzNBRjZFQTlDRiIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDpBRkFBRkZBNTY5NzcxMUU0QjQ4RkMyMjdFRTY0MERCQiIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDpBRkFBRkZBNDY5NzcxMUU0QjQ4RkMyMjdFRTY0MERCQiIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M1IFdpbmRvd3MiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo2NURGOEYwOEMyNjhFNDExQjM3NEZBQ0Q5QTM2MUEyMiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDo3NEE1QzAwRjUwNUVFNDExQjUyN0I2QzNBRjZFQTlDRiIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PoRMrLEAAADlSURBVHjazNddEYMwDADg4WBSkDAJkxAJk4ATpEzCJEwCEkJ6K0fXDZrfu+YubzT5epBeGRDx0l14oagOUC6UYxcoqvHAPewwK4rWz/gbNpgFdQCyw7SoBsgG06CYID1MihKCdDAuip67Ur5QH3wYB+UAksFaKAEovdYxN7bBzlASULGGC7uJURqQEJYC2Khc9M0oOp1sVg+rUeZdetQqUZ4gU80NFQFSwxIqEqSCZRRnhO8O9y7OAC0bCkKuIPKj5tOr+KYgGtSA7b2q6YNo0AHsu9efcwqiQRXsWfcaevzFWgUYANEEcX5wqz+wAAAAAElFTkSuQmCC);
+	background-size: 100% 100%;
+	-webkit-animation: start 1.5s infinite ease-in-out;
+	animation: start 1.5s infinite ease-in-out;
+}
+
+.fullpage {
+	overflow: hidden;
+	position: absolute;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+}
+
+/*分享到朋友圈或朋友*/
+.weui-share {
+	position: fixed;
+	left: 0;
+	top: 0;
+	z-index: 9999;
+	width: 100%;
+	height: 100%;
+	cursor: pointer;
+	background: rgba(0, 0, 0, 0.75);
+}
+
+.weui-share .weui-share-box {
+	position: absolute;
+	top: 65px;
+	right: 20px;
+	width: 140px;
+	padding: 10px;
+	color: #fff;
+	font-size: 20px;
+	line-height: 30px;
+	border: 2px solid;
+	-webkit-border-radius: 10px;
+	border-radius: 10px;
+}
+
+.weui-share i {
+	position: absolute;
+	background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAHAAAAB6CAYAAABne9ctAAAACXBIWXMAAAsSAAALEgHS3X78AAAgAElEQVR4nO19e3RV1b3u95trv/JOIOEhAhrFF4otKqDiURSttdrW2lLP8dTT9tbjPe3Ve3vGaa/WcUdtj8NRO6jaoCi1jSiIgqDyMrw0BuQVIAHyfu+8d7KTnZ2dvbMfa8057x9zLbNFlFeAnZhvjDU2mezHWutbvzl/70k4TUgpT/ejYwAYAGH+2wmAAOgAUsy/NfM90wDYAdg559mapmUJIdKllLU+n69i6dKlbtt5OPnRDIK64RKKEABIAmCDIiULiiSHOT4ZQJoQwmmOp5mfnwgghYiyzfFMxlimlJIbhnG4ubm5cenSpaEXX3zRPkbg8EJGo9ELNU2bDkC32WwThRATGWOThBDjAOQQkV0IkcUYmwyAA8giIgZFKsxXOwAQkSP+y4PBYMXOnTt3//rXv26tra11AhgjcLghhMix2WyPM8ZmSCntRJQJIJ2IBBG5ADBN0ySUtJ40Ojo6at58880dixcv7uzt7U0xP8/HCBxmhEIhP2Ms2+l0XgE1bVowTL1BCiF0xpjNlDxATbmQUoKIKG6MDMMw3G5388svv7z75Zdfduu6PgjAB8APIMowhmHFe++95/F4PDuFEJaSAsMw9Gg0GuOccyGEYIzZ8XkJJAAUR541JltbWzuXL19evGzZsipd1zsA1AFoBTAAgI8ROMx49NFHQ5s2bdrqdrv3GYYRAwDGmOZwOJyaCTJxou9qbm7uWLVq1b6VK1eWh8PhZgDVANwA+gEYAOQYgcMPUVlZ2eTxeEqi0WgYAJiCFjdlnhBer7c3Pz//0yVLlpQ2Nzc3IE7ypJTcet/YGjjMCAaDObquX885v8jhcBx7f6UcMqCtafPYN6C7u9v77rvv7n/mmWdKhBCtAOpxHPKAMQKHCwRlr12bkpLyPSnl96WUExljKfFvklLKWCymExE5HA778b7I5/P1rVy5cvcLL7xQIoToAFALNW0GoMyOz2GMwDOHE8AFQojvE9F3iGg+ETks0TKVFgYo6RJCCIfD4cBxzIi+vj7/unXr9uXl5ZW2t7e7ochrhlrzuDyO+2uMwDPDVADXSSn/hYhuJKIL4/+zp6fHEwgEwllZWZmZmZmZluQREUkpZfz82d/fP7B27dq9zz33XHFLS4sbas1rAuCXUhpfdgJjBJ4eNABzADwkpbyNiGbA9KRIKYVhGHp1dXXDhx9+WFlVVdXzgx/84PKFCxfOTU5OTgYAzrlhaqMMAIVCodDWrVsPPvvss8Vut9sNteY1Qdl6X5g24zFG4KljPIBbpJSPEtHt8e6uWCwW7u7u7tm1a1fN8uXLK7dt29bicrkCANouu+yy8bm5uVcASiu1yItEIpFNmzYVP/vss/vcbncLFHmNAPqgjP+vjBqMEXhq+AaA+6WU3yWiaxDnaent7fWWlJTUrVmzpnLHjh3tbrfbA8ATiUQ6N2/ebNx7773pWVlZWRMmTLjQnDkpGo1Gdu3adfT3v//9npqaGjeABvPwAdBPRB4wRuDJgAHIAHCTKXV3mlLHACAWi0Wrq6vrN2/eXPWPf/yjqqmpySuE8ALoANAOoLenp0e0trYWGoZxFxFNBYBAIBDYs2dPxZ///Oe9NTU1LVDE1eMUyAPGCDwZTBZCPEBEPyGi661BKaX0+/29u3fvrsrLyyspLCxsMwwjnjgvlLsrBgDRaLQ6FAqVAfjGwMBAYMOGDfv/8pe/HDx69Ggr1JRZD6AHQOxkyQPGCDwRZgL4GRH9kIimW4OGYeg1NTX1W7ZsqcrPz6+urKxshyKuFUAnTEczAGGRsWDBAs/cuXM/0XX9goMHD4Z+97vflXR0dLRDKSsNUISfEnnAKYY04jHKI/IagFullP+TiL4NIBVQUjc4OBjctWvX0TfeeKPs/fffbzQMo4dz3gygBYqEEI5jsy1YsMA2adKkCxlj83bv3p3d3NwchJK8RgC9ACKnQp5lgYwR+EVkArhbSvlLIrrFGhRCGB6Pp2vTpk2HlyxZcrS8vLwDSupazFcflASJ432pafMlA5gCFXEPw1wjcQprXtz3qddTvToLo5TAyUKIHxPRT4noWmvQMAy9oqKi9q233ip9++2369ra2tqhiGsG0A0ldSdU+YlIgyLRBZVycVKf+5LvUq+n+kELo5DAqQD+h5TyESKaDICklFLX9diePXuOLlu27NCaNWvqhBAeKN9kC5T0RL9M6o6FKYXWIfF55/YpwSJwTIlRmAHgV1LKHxPRRJg3uLe3t2fHjh1H8/LySvfu3dsMoA1K6eiA8k+e0tRnvndYn/yvO4EagKsB/ArAj4ko3RyXra2trR988EHpK6+8UlZVVdUGNV02AvAAGMSXOJfPNb7OBGoArhdC/JKIvhdHHurr65veeOON/UuWLCnr7+/vgJoy3VBaZuRkp8xzga8rgQ4AN0gpf8MYuwsqRxNSSlFVVVX3+uuvH3jllVfKQqGQZWS3YEjLPO9SF4+vK4FzpZSPE9F9MF1i0Wh0sKampvm5557b9f7779eGw2HLsdwKMwcl0cgDvn4EMijJe5yI7sWQPzNSUlJSnZ+fX/Luu+9W6breAhWPa4NKY/jSeNz5xteJQA3AVVLK/zIlzwkAuq5H9+7dW7548eI927dvb9B1vRmKvHYAwWNzUEYNpJQj7fgm5/xNKeWgNGEYhlFUVHRg4cKFLwD4JYDvALgCqkaBJcA5f+lh4esigdcKIf6DiL4HU2GJRCKDR44cqX3++ef37tixow5DEQEPgMFE0jS/Cl8HAqcLIR6PNxUMw4iVlJRU5+Xl7du4cWMtlHFeBxVJSCgz4UQY7QROEkL8lDH2Y6i0P3DO9cOHD1fn5eXtKygoqBFCxJMXTkRN86swmgkcL4T4HhH9BEPkGVVVVfVLlizZu3r16iooyauFmjZPKZyTKBitBKYIIX5ERP9ORJcAyg/Z2NjYnJ+fX7xy5coqKNeYJXkjZs07FqOxNkLjnH+LiB4hoqutwba2tvZVq1YdXLFiRYUQwiKvAyOYPGB0SuAsxtjPiGi2NeD3+/s2bNhQumzZsiM9PT1uqBSGEU8eMPoInC6E+CkR3WoN9PX19RQUFJTm5eWVdHZ2NkOR1wYgNNLJA0bXFDpeCPHPRLSIiNIA5SL75JNPyvPy8g42NDRY4SCrOHLEkweMHglM5pzfxxj7VyKaBChzoaysrO6ll146tH//fivnshlmuvpI1DiPh1Ehgbquz2KM/ZCIrgBURVBbW1vn22+/XfLxxx83QJkLTVAhoYSMKpwuRgOBkzRNewjAjTBT3X0+n2/btm1H33rrrQqo9c6N00iaHQkY6QQmc86/bSbeZgLKx1lUVFT+2muvHfZ4PK0YiqRHRxt5wMgm0GYYxnWMsQfNdY9xzo2ysrK6ZcuWHSopKWmEIs8y1EcdecDIVmImMsYeAHCTNdDZ2elZu3bt0e3bt9dDkdcKVZo8KjTO42GkSqCdc34HgO8SUSoARKPRyCeffFK1Zs2aSqhgbDNOM+t5JGEkSiABuIQx9hMiughQWmdVVVVjfn7+YbNIshmnWSwy0jASJTBNCPEtAHNhJuD29PT0rFu37khhYWEjlNbpgQoNjdqp08KII9AwjKullHdb3pZIJBI5dOhQ3fr166sxVOLVjxPUlo8WjDQCMwB8izH2meLS2trauWXLlqrq6upmKPJ68TWYOi2MJALthmHMM0ucLekbPHDgQMPKlSsrdF1vB9CFUWwyHA8jicBsAHcxxmbCrBxyu90d27dvr/X5fFat3plOnfFKHeGL9+e0q7nOFkaMFmoYxkwAt1qJSaFQKPTpp5/WfvLJJ1YmmVW3cLLSZ9XpOaF6UxMAp2EYus1mc0G55XwYaqEcAhCEKmwxzL+jw3V9p4uRQmAagPmaps0w/5atra0dGzZsqGptbW2HIvBEISInVPXtBQAuEUJcwBi7UEp5MZR0J0spNU3T0jnnfgDEGHMJIQLm5wPmb4SIqFVKeSQWi+1LSkrqgyL1vGBEEKjreq7ZyiodUJpncXFxY1FRUSPn3CpvPp7BngyVB3otgEsBXCOlvB5Atuk7zQAAIrJ6VEsApGlDjXbj2yNLKXWoUFRECNGuaVp5NBotFkLsCwaDR3NyckIY5vq/E2EkEGgHMIeIrrQGOjs7vbt3724MBAIeKOkL4vPS5wQwWwhxLWPseinlDQAmEtF4s0r2M4bi2pXF33gphOBEpJnvl1K1Q7YDsBORy+wif6kQ4lbDMA4nJSVt7unp2Z6Tk1N7LpWokUDgFAA3McZyAMAwDKOmpqb14MGDLVD16X0YMhvGA7gKqhXW7UQ0W0qZTETOY79U1/Wopmm2QCDgF0LIUCgUBiBDoVB0cHAwarPZSAghAcBut9tSU1OTs7Ky0h0Oh8Nms9k0TbMRkVPTtEmapt1ts9muI6J5vb29b3Z2dn46efLkczKtJjqBNsMwZhDRN4jIJaWUXq+3p6ioqK62trYNyuYLSylTAMwCcI+U8i4AuUQ0Lv6LhBCGSVSgo6Ojx+Px9LW3twdaW1sDg4ODus/nG/R6vWFd17lhGHxwcFB3uVxMCIEJEya4srOzkyZOnJg2efLkjGnTpmXn5uZOmjhxYo7D4XACgKZpOUlJSQ9IKafpuv7K8uXL3//Zz3521kNYiU5gEud8pt1unwqoxNz29nZvUVFRYygU6rr99tsH161bd7nZq/PbRPRNsxPEZ93gOee8t7fX6/F4fOXl5R1lZWXdtbW1fZWVlT6v1xuSUsZ8Pl8IgO5yuXgkEolBmSI8KSkJ4XDYWhdtOTk5qUlJSSnTp0/PvPHGG6fNmzfv0lmzZl06ZcqUiXa73c4Yc6WkpNwshHDNmzcv+PTTT28HEDmbNyihCYxEIllENNOKOMRisWhNTU37wYMHWxYtWsSXLFkyPyMj4wcAFhBRVvxng8Fgv9fr7T18+HDL7t27WysrK3v37NnTFYlEBqPR6ACUVmmZBREAsUgkokOZCBwAt8gDQJxzm8fjcQBIampqSt67d2/aVVddNXXRokXX3XHHHdddccUVM9LS0lKJiKWmpn4zOzv71/fee2+QiHbKs1iilsgEalLKC8xenHYA0uPxeBsaGjqfeOKJnMcee2x+dnb2XWZXic/WOF3XY3V1dY0HDx5s3rp1a1NxcXF3fX19D5SR3w+V1NQPZRIMQtlyFmnCPI7tJmG1BtGg7pk9Go0ml5aWtjQ3NzdVVVXVP/zww3fPnTv3+tTU1FTGmC0zM/OmaDT66Jo1azqIqO5sOdYTmcAkm812DWPsEiIizrkYHByMzZ49O2fOnDk/ysnJmY2489d1PdrR0eEpKiqq2bRpU8O2bdtaBwcH+3Rd90Hlw/RiiLgIVKMdjjiyTrRexXXYJSgJ9vl8vp4333yzKxKJ+DRN0+fMmXNjcnJyqs1mc2ZlZS3Mzc0tvfnmm5cSUfBsrIcJS2B/f7/dbrdPd7lcGVCuMzFhwoSsCy644Jvjxo2bYr1PCMH7+vp8Bw4cqF21alVlYWFhW1tbmxdKQ+2C8tD0QXlOrPVNns7NjPuMBCCIyICS4FBBQcHguHHj+Lhx49Jnzpx5vaZpWnJy8riJEyd+9+GHH969e/fu/RjaEGvYkLAE6rrustvtOTDPUdM0LTs7Ozu+TX84HA4dOXKkdsuWLTWvv/56bVdXV280Gu2CyoPphDLwQ1A3Tgy3BJjfZxBRcGBgoG358uWFc+bMufDiiy++LC0tLQsAZWVlzZwxY8admZmZ5UQUGO6pNGEJdDqdaQAmWTYcETGLPCml9Pv9voKCgtI33nijfNu2bVbbK6tXZw+GenWelrSdCqSUgojCkUika+/evQVz5sy56corr1zIGNNcLldqenr6tbNmzZq8c+fOQfOchg0JG42w2+0X2my23GN3O4lGo5GKioqavLy8HU8++eTubdu2VUNlXZcBqIBKp/DB7GF2rrwi5u9Etm/fXtfW1vZxf3+/F1AzR1ZW1iULFy68BoDzCzt9nCESVQKvtdvtDxLRxXFjMhwORwoLC0v//ve/l65fv94thOiGIqwFSurCOI9p86YkBsPh8GFd171QbSUpLS1t/NSpUy+fPn36rubm5mH1lyYigTcIIX7NGLuLiJKtwUgkEi0sLCxdvHjxPjP3pQOKvHYo0yBRovA8Go02SCl7TP8pUlNTM5xOZ46maWkwMwaG68cSicAUqA5K/8kYuxtxDmcppfR4PN7NmzdXFRYWWlvRNGKoV2fCFKtIKWVpaakBoEtKaZgOcHI6neMHBgaSAdiIaNhSHRNlDXQZhnGLlPK3RPQ58gBlKvj9/mBra6sldbVQkjcgpUy4YpVIJDIgpfRyznXgs4iHMycnJw3HXNuZIhEITOKc36tp2n8BuBXmBRqGoVubKBIRk1LqSUlJQaip04sEThvs7e2NSClDlr6iqQAjM6VxWO/5+SYwlXP+Y8bYk0R0K6k9ZtHf39/X2NjYMjAwMABAMsaYw+GwZWZm6lD+y0RZ746LGTNmaJqmxeLMHggh0N7ezjGKCMzgnN/PGPtPs57dBign9LZt20oLCgqORiKRMKCmUCKSRBTvq0xYjB8/HowxLs0meZxzg3Mu/X7/sM8Y54vAZJO8x8wtbAAAgUCgf/PmzQefeOKJT2traxs1TeMw95ZNSkpK0jSNYcixnLCIRCJ2TdOSMZSKAcMwxJQpU2wYBS2XMzjn9zLGHo8jT/b39/s3btx48LnnnitubGxsyc3NHW+322OAWgM1TdMyMjKSkODkAYDT6XQ4HI4JjDEXoDTTUCgUsdlswAgnMJlz/kPG2KNmW38GAH6/3//ee+/te/bZZ61mBHW5ubkBTdPCMLfjdjqdzqSkJKfT6dSi0fOezfeVcDgcyUQ02fIiCSFkf3//YHNz87AHd88lgTbO+XcYY/9BRNdZg319fb0FBQUlf/3rX0saGhqaANSPGzfOPWnSpEhcSh9cLleSEMJmt9vt0Wg0oaXQ6XROIaIcMzsAsVgs6vf7wxgKXw0bztUaaAdwL2Psf8eT19/f79+8efOhP/3pT/srKioaobon1ft8vm4i6o5EIm2WsskYYxkZGSnBYPB4GdOJBAJwiaZpk62B7u5uX0dHRwBDgeNhw7m4EXYAN0spHyOieeaY9Pv9vs2bNx/4wx/+sK+srKyRc2717OwFEDtw4IAvFAo1G4YRBgC73W7Pzc29IDc3N+kcnPPpggBMIKLrNE2bAKgsuoaGho6SkhIPlAttWB3sZ5tAgvJtPkpE82Ea6QMDAwMFBQUlf/zjH/fX19e7oaIJDYirqK2rq4sKITotVdzpdDouuuiiqfPnz88BYOVrJhrIMIwrNU2bR0Q2QF1rWVlZ29GjR7tg7jcxnD94tgm8xtyX4R6Ye8wGg8FAUVHRkaVLl5bU1NQ04fPkfWagjx8/nkej0WYhRBhQmmh2dvbk6dOnT05LS3MiMbXRTAC3McY+KwFob2/vLikpaYNyuIcwQggkABcLIR5hjN1vpcTruh7dt29fxQsvvFC8d+9ei7gGHKeHy9NPP837+/sbBgYGGqyxjIyMcbNnz/5GWlpaylk899MFGYYxk4jusMrfgsFgqLS0tMnc5NFK6xhWY/5s3YTxAP6NiB6Eqk+Quq5HS0pKqhYvXrx/165ddZzz+L3zvuCdl1LKioqKjkAgUMk5jwFAcnJyyowZM76xcOHCKUisSAoA5DDG7mOMXW/6bkV7e3vXRx99VOt2u61NIYfdBXg2CMwSQjwopXyIiLIBQNd1vaysrDYvL2/v1q1b63Rdt3at/MruSS+++GKfz+crDYfDPgCSiNikSZMuufPOO+dkZma6EmgddJhdM+62/LnBYDBUXFxc/+GHH9bFYrFuqCy2Yc8PHW4CbWbnpJ8TUS6gJMntdrfm5+cfWLVqVSVULK8BKpb3lannFRUVRmNj44G+vr5qmGteWlra+FmzZt3+i1/8YhqGOTRzBvgmgIfMHFYAkI2Nja0FBQVVXq/Xg6G4ZUL7Qm0A5jLG/p2IZgFgQgjh9Xq9q1evPrR69epKqNQHqyDzZLrDy3Xr1jW0t7d/Go1GgwDgcDic06ZNu+G22267NScn53xLIUFtGvkQY+wOS/r6+vr8GzduLCsqKrJ2O0u8fZfkFzejuJZzvsIKsEopRVdXV+ff/va3zVlZWf8XwI+gNhU+pU01ANjz8/MXut3uvUIIIaWUQgheX1+//fnnn78egO1kv+ssHOmc88eFEG3mNctwOBwsKCjYnZKS8hsA34eqS3RB5bYO+8YfwyWBlwghfk5qPyINAILB4MBHH31Unp+ff7ivr68NSmE5nTbH/IMPPiirq6v7aHBwsB9QJsXkyZOvv+OOO36Sl5c36TxJYSrn/AFzuZgCqLBXVVWVe+XKlYdDoVA3VNeMHiRit6i4p8HJOX9CCNFhPYWGYRiFhYXFt9xyy3MA/g2qFaSVpHvKTyIA59NPPz2/urq6UMbB7/c3HTp06Fe//e1v007ne8/gSDEM4ydCiD1SSm6dj9vtbn7qqadWpqamPgbgdgCTTveaT1YCz5TAJCnld4UQldZFcM6NysrKmkWLFr0E4BGoNIkLoAz507oQqJkic8WKFf+rs7OzQZr5npxz7vP5ykpKSv75ww8/TD9H5I03DOOn5jXHzMsWgUDA/8ILL7w/adKk3wL4HtS2rq6zdR7DQqCu6zcLIdZJc90TQojGxsbG3/zmNysAPAbgbgDTMQxrAADHggULLt+wYUNed3d3p/XACCGM3t7eYrfb/fPnn38+6Ux/5ysOklJezDl/UghRIePg8/m8K1as2Dp16tT/B+BBqJr8DJzFDbSGg8AZnPO/CSH6rAvxer3dr7zyysZp06Y9CeB+AJdBGfJnfFOhNL7U+++/f35BQcHbgUDAH38TA4HA4Y6Ojv/T0tJyiXmzh/OGZUop75JSvimEaD+WvLfeemvbDTfc8CyAn0L1cBuPs6xcnSl546SUTwshfNaFhMPh0Nq1az++7rrr/oihpzAdw/gUQilI4x955JHvFhYWbhwcHAxZvy+E4OFwuMnv97/i9XoXdHd3p57Bb5GUkkkpXVLK2zjnTwshiqWU4Xjyuru7PS+99NKGmTNn/remaT8HMB9q3bMPx0N7MgSesjtKSuninC9gjP3IqorlnBtHjx6tXbp06aHDhw83QRnr7Rj+vRkEgMBrr71WrGlast1ud15zzTVz09PT04mIOZ3O6Tab7V+i0eglUspd4XB4OxF5XC6XD0MNegB13fHBVRb37wugUuIvBXC9lHI+Y+waqJmEAcqn29XV5V29enXx73//+4OhUKgTyjnRBOXzPGe5qqdMoK7rs2w227/GeR3Q2travmbNmiNmh3g3zlKnXCmlNGvy+l599dXdvb29ctGiRf65c+feOGXKlMmMMc1ms6VrmnaHEGIe5/xuKWW5YRj1ROQBEDQTpWK6rvvtdrvVrSkKtWZNBXCplPJyKCUk2yrvthAIBHxlZWWN77zzTsW7775ba26UbF33OTfYT4lAKWWGEOIBAAugpgl4vd7uTZs2HTE9LVaH+LPWKdckMQagZ+PGjfvr6+vDDz30kPfOO+/8p0svvTQ3OTk5yUyCSmOMzZNSzoYqehmA6v8yAEC32WwpQoiQmfZgJUtlEFG6WdLGYdq0QgjOOddbWlrat2zZUvHqq69WNDU1eUOhUAcUedZ+FOc8S/ykCZRSpnDOH2CMLSKiDECVeu3Zs6c6Pz//aFtbWzPUhfTgLHeIN0mMRCKRrtLS0tKmpia/x+Px3nTTTXOuvvrqy6dMmTLJItJ0b7mgYnXxBr88xgEg8HnHhsY510OhUKi1tbXzwIEDzdu3b3evXbvWHYvFeqCWiFaoQtKAPE8bJZ+0B0PX9fmapv2OiL4Fs0N8eXl57TPPPLNj7dq1pQCqoJ7GPnmONg42CXAAyMjOzp46bdq0K+655565s2fPvvzKK6/MTUtLS05NTU1JTk522e12qxGClFLG17tDCMEZYxrnPBaLxWKcc+nz+XzV1dXtVVVV3Vu3bm0+fPiwt7Ozsxcqrb8NyqvUByXd56wOMe7aAZykBEopJ5pT5zyYT2l3d7d348aNZdu2bauHclK34Rx3iI+bTn09PT2xnp6eQGVlZce0adOmXXbZZRdde+2106ZPn549ffr0nAkTJqQ7HA4bY4yZAWEZjUZjABAOh6N+vz/o8/kGfT7fYH19fV9dXZ2/pqbGV1FR0QMgqOu6RV4X1CwTRALsAnNCCZRS2jjnDzLG/kiqyTgNDg4GN23aVPzUU099VF9fXwlVGduG87gLprmWOaGc5eNdLtdEIspKT0/Puvjii8cnJSWljBs3LjU1NdUZiUREWlqaHQALBoOxcDisu93uYCQS0d1u94DdbjeCweAgVAiozzysLhchKEXlvBbWnIoE5gL4oVUtyzk3qqurm1atWnWkvr7e6hB/wtje2YaUkhNRGCrzayASiXQDSAuHw6ldXV2pAFKhlBUbAJvD4bDFYjEAEGZHpiiUNhqNRqMRKLMjaB5Wb1Ad56Dm/lTwlQSaWuf3GWNWOiB8Pp9/x44d1Vu2bKnD0CKeEHvxmTfWICIOdcMDUNqyA0o6HVDXrMViMavOQobDYQFlI8bMQzcPwzzO+Rp3svhSAqWUzDCMmZqm/YiIcgDVBam4uLh63bp1ldFotANq2vQjwTrEmzebA+BEpEMpGlZCcHxxjPVqNfv5XPVTopIWj6+SwAsYYw/ER9fb29s977zzztHi4uImKPISfkcw89ys80uoB204cNyArpRS45zPB3AXPp/PWblhwwarvHlE7/48WvBlEfmpAO6xFBchhKiurm5ev359ZSAQ6MTQ1HlejNcxDOELBJpmw61EtICIkgDV0e3jjz+u3b9/fxOU9J1qh/gxnCUcTwKnAfg2Y2wyTI9LZWWl+/3336/s6uqytM7g2GCz26sAAAHHSURBVNSZGPgcgab03UJEN2BoO9O+nTt31h06dKiZc94Os0P8eTjXMRwHx0rghQDuJaILAeUjLC8vbyosLGzgnHtgbm2DBG8y8HXCZwRKlV12ExHdTEQOANLn8/Vt3ry58sCBA01QCap+mN6I83S+YzgG8RI4GcBCxthEQNUzVFVVtWzcuLF2YGCgA8rmi2CMvIQCA5TXhXN+o1mEyQCgr6+vf+fOnTVNTU0dUIpLwnlcxqASjghqc41vm9EGSCml2+3u3LJlS62u61b4JIxRvJnwSAUD4OKc/xNj7E6zlxf8fn9fYWFhtbk7ShfOUmnUGM4cLBqNTgFwu+Ww5pwbtbW1revXr6+ORCKW9I2tfQkKpmnaRVLKaxBn93366ad1lZWVbVDS148xl1nCggWDQa7rugCAgYGBwKFDh+pWrFhR1t/f3wEVqLW6JY0hAWGrra11u1yuApvNFqmoqIisWbOmpry8vBnK7vva7AY9UkH33Xdfck5OzlUDAwOz6+vrs2pqanoHBwcbANRAOa2P6zYb82OfX1g5MQTAlpqaOi4YDE4BMA5qyuyAWv++VHkZI/D8Ip5AK7cyGSpvJH6D3zG7L8Hx/wHMjoQADguORgAAAABJRU5ErkJggg==) no-repeat 90% 5px;
+	-webkit-background-size: 56px 61px;
+	background-size: 56px 61px;
+	width: 56px;
+	height: 61px;
+	top: -63px;
+	right: 23px;
+}
+
+/*常见动画*/
+.animated {
+	-webkit-animation-duration: 1s;
+	animation-duration: 1s;
+	-webkit-animation-fill-mode: both;
+	animation-fill-mode: both;
+}
+
+@-webkit-keyframes fadeIn {
+	0% {
+		opacity: 0;
+	}
+
+	100% {
+		opacity: 1;
+	}
+}
+
+@keyframes fadeIn {
+	0% {
+		opacity: 0;
+	}
+
+	100% {
+		opacity: 1;
+	}
+}
+
+.fadeIn {
+	-webkit-animation-name: fadeIn;
+	animation-name: fadeIn;
+}
+
+@-webkit-keyframes fadeOut {
+	0% {
+		opacity: 1;
+	}
+
+	100% {
+		opacity: 0;
+	}
+}
+
+@keyframes fadeOut {
+	0% {
+		opacity: 1;
+	}
+
+	100% {
+		opacity: 0;
+	}
+}
+
+.fadeOut {
+	-webkit-animation-name: fadeOut;
+	animation-name: fadeOut;
+}
+
+@-webkit-keyframes pulse {
+	0% {
+		-webkit-transform: scale3d(1, 1, 1);
+		transform: scale3d(1, 1, 1);
+	}
+
+	50% {
+		-webkit-transform: scale3d(1.05, 1.05, 1.05);
+		transform: scale3d(1.05, 1.05, 1.05);
+	}
+
+	100% {
+		-webkit-transform: scale3d(1, 1, 1);
+		transform: scale3d(1, 1, 1);
+	}
+}
+
+@keyframes pulse {
+	0% {
+		-webkit-transform: scale3d(1, 1, 1);
+		transform: scale3d(1, 1, 1);
+	}
+
+	50% {
+		-webkit-transform: scale3d(1.05, 1.05, 1.05);
+		transform: scale3d(1.05, 1.05, 1.05);
+	}
+
+	100% {
+		-webkit-transform: scale3d(1, 1, 1);
+		transform: scale3d(1, 1, 1);
+	}
+}
+
+/*放大*/
+.pulse {
+	-webkit-animation-name: pulse;
+	animation-name: pulse;
+}
+
+@-webkit-keyframes shake {
+
+	0%,
+	100% {
+		-webkit-transform: translate3d(0, 0, 0);
+		transform: translate3d(0, 0, 0);
+	}
+
+	10%,
+	30%,
+	50%,
+	70%,
+	90% {
+		-webkit-transform: translate3d(-10px, 0, 0);
+		transform: translate3d(-10px, 0, 0);
+	}
+
+	20%,
+	40%,
+	60%,
+	80% {
+		-webkit-transform: translate3d(10px, 0, 0);
+		transform: translate3d(10px, 0, 0);
+	}
+}
+
+@keyframes shake {
+
+	0%,
+	100% {
+		-webkit-transform: translate3d(0, 0, 0);
+		transform: translate3d(0, 0, 0);
+	}
+
+	10%,
+	30%,
+	50%,
+	70%,
+	90% {
+		-webkit-transform: translate3d(-10px, 0, 0);
+		transform: translate3d(-10px, 0, 0);
+	}
+
+	20%,
+	40%,
+	60%,
+	80% {
+		-webkit-transform: translate3d(10px, 0, 0);
+		transform: translate3d(10px, 0, 0);
+	}
+}
+
+.shake {
+	-webkit-animation-name: shake;
+	animation-name: shake;
+}
+
+@-webkit-keyframes rotateIn {
+	0% {
+		-webkit-transform-origin: center;
+		transform-origin: center;
+		-webkit-transform: rotate3d(0, 0, 1, -200deg);
+		transform: rotate3d(0, 0, 1, -200deg);
+		opacity: 0;
+	}
+
+	100% {
+		-webkit-transform-origin: center;
+		transform-origin: center;
+		-webkit-transform: none;
+		transform: none;
+		opacity: 1;
+	}
+}
+
+@keyframes rotateIn {
+	0% {
+		-webkit-transform-origin: center;
+		transform-origin: center;
+		-webkit-transform: rotate3d(0, 0, 1, -200deg);
+		transform: rotate3d(0, 0, 1, -200deg);
+		opacity: 0;
+	}
+
+	100% {
+		-webkit-transform-origin: center;
+		transform-origin: center;
+		-webkit-transform: none;
+		transform: none;
+		opacity: 1;
+	}
+}
+
+.rotateIn {
+	-webkit-animation-name: rotateIn;
+	animation-name: rotateIn;
+}
+
+@keyframes xz360 {
+	0% {
+		-webkit-transform: rotate(0deg);
+		transform: rotate(0deg);
+		-webkit-transform-origin: 50% 50%;
+		transform-origin: 50% 50%;
+	}
+
+	100% {
+		-webkit-transform: rotate(360deg);
+		transform: rotate(360deg);
+		-webkit-transform-origin: 50% 50%;
+		transform-origin: 50% 50%;
+	}
+}
+
+@-webkit-keyframes xz360 {
+	0% {
+		-webkit-transform: rotate(0deg);
+		-webkit-transform-origin: 50% 50%;
+	}
+
+	100% {
+		-webkit-transform: rotate(360deg);
+		-webkit-transform-origin: 50% 50%;
+	}
+}
+
+.xz360 {
+	-webkit-animation: xz360 6s ease-out 0.1s infinite;
+	animation: xz360 6s ease-out 0.1s infinite;
+}
+
+@-webkit-keyframes zoomIn {
+	0% {
+		opacity: 0;
+		-webkit-transform: scale3d(.3, .3, .3);
+		transform: scale3d(.3, .3, .3);
+	}
+
+	50% {
+		opacity: 1;
+	}
+}
+
+@keyframes zoomIn {
+	0% {
+		opacity: 0;
+		-webkit-transform: scale3d(.3, .3, .3);
+		transform: scale3d(.3, .3, .3);
+	}
+
+	50% {
+		opacity: 1;
+	}
+}
+
+.zoomIn {
+	-webkit-animation-name: zoomIn;
+	animation-name: zoomIn;
+}
+
+@-webkit-keyframes swing {
+	20% {
+		-webkit-transform: rotate3d(0, 0, 1, 15deg);
+		transform: rotate3d(0, 0, 1, 15deg);
+	}
+
+	40% {
+		-webkit-transform: rotate3d(0, 0, 1, -10deg);
+		transform: rotate3d(0, 0, 1, -10deg);
+	}
+
+	60% {
+		-webkit-transform: rotate3d(0, 0, 1, 5deg);
+		transform: rotate3d(0, 0, 1, 5deg);
+	}
+
+	80% {
+		-webkit-transform: rotate3d(0, 0, 1, -5deg);
+		transform: rotate3d(0, 0, 1, -5deg);
+	}
+
+	100% {
+		-webkit-transform: rotate3d(0, 0, 1, 0deg);
+		transform: rotate3d(0, 0, 1, 0deg);
+	}
+}
+
+@keyframes swing {
+	20% {
+		-webkit-transform: rotate3d(0, 0, 1, 15deg);
+		transform: rotate3d(0, 0, 1, 15deg);
+	}
+
+	40% {
+		-webkit-transform: rotate3d(0, 0, 1, -10deg);
+		transform: rotate3d(0, 0, 1, -10deg);
+	}
+
+	60% {
+		-webkit-transform: rotate3d(0, 0, 1, 5deg);
+		transform: rotate3d(0, 0, 1, 5deg);
+	}
+
+	80% {
+		-webkit-transform: rotate3d(0, 0, 1, -5deg);
+		transform: rotate3d(0, 0, 1, -5deg);
+	}
+
+	100% {
+		-webkit-transform: rotate3d(0, 0, 1, 0deg);
+		transform: rotate3d(0, 0, 1, 0deg);
+	}
+}
+
+.swing {
+	-webkit-transform-origin: top center;
+	transform-origin: top center;
+	-webkit-animation-name: swing;
+	animation-name: swing;
+}
+
+/*星级评分*/
+.weui-rater {
+	text-align: left;
+	display: inline-block;
+	line-height: normal;
+}
+
+.weui-rater a {
+	line-height: 25px;
+	cursor: pointer;
+	color: #ccc;
+	margin-right: 2px;
+	font-size: 25px;
+}
+
+.weui-rater a:last-child {
+	padding-right: 2px !important;
+	margin-right: 0px !important;
+}
+
+.weui-rater a.on,
+.weui-rater a:hover {
+	color: rgb(255, 153, 0) !important;
+}
+
+/*
+美化版表单*/
+/*新单选复选文本文本框*/
+.weui-start:after {
+	content: '*';
+	font-weight: 700;
+	color: #f00;
+	margin-left: 5px;
+}
+
+.weui-form-li {
+	vertical-align: middle;
+	position: relative;
+	margin: 10px 20px;
+}
+
+.weui-form-checkbox {
+	-webkit-appearance: none;
+	width: 0;
+	height: 0;
+	opacity: 0;
+	border: none;
+	float: left;
+}
+
+.weui-icon-radio {
+	-webkit-border-radius: 100%;
+	border-radius: 100%;
+	width: 16px;
+	height: 16px;
+	display: inline-block;
+	margin-top: 6px;
+	margin-right: 5px;
+	border: 1px solid #b8b8b8;
+	background-color: #fafafa;
+	vertical-align: top;
+}
+
+.weui-form-text {
+	display: inline-block;
+	position: relative;
+	margin-top: 2px;
+	margin-right: 10px;
+	cursor: pointer;
+}
+
+.weui-form-checkbox[type="radio"]:checked+label .weui-icon-radio {
+	background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMDE0IDc5LjE1Njc5NywgMjAxNC8wOC8yMC0wOTo1MzowMiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTQgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjA3QUE4OTlFQjJCODExRTVBRkM2RDBFMDhDRDA3MTJFIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjA3QUE4OTlGQjJCODExRTVBRkM2RDBFMDhDRDA3MTJFIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDdBQTg5OUNCMkI4MTFFNUFGQzZEMEUwOENEMDcxMkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MDdBQTg5OURCMkI4MTFFNUFGQzZEMEUwOENEMDcxMkUiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz5LqQGPAAAA7ElEQVR42uyXTQrCMBCFG+tKRY/gz0naXlFc2HqUKvQk4hEUVDCVcQIBu5HMTFK6MA8+KCWZeW2SV6oAIBlSo2RgRQPRQDQw9pg7Rdb2+ozcRVVMEDHJkBrR8JW29zJuPc7gFNmCW6UdG9zAHugqQxvIga88pIGjwEBNqa0IX0Oz269Iytzfb2ThOh2UHFgKmid2zipEELUeWaFdAyhLMEFuwiWYIw/fN2AKNIKnb1zNOUlYCE5BETqIKkbzQ19RvCM0r/qK4m4qmmBqO03N9Ymaftwg+qUZskFeyAV5Soqo+F8QDUQDf2/gI8AAIiHXffupwGIAAAAASUVORK5CYII=");
+	background-size: 100%;
+	border-radius: 100%;
+	background-color: #04be02;
+	border: 1px solid #04be02;
+	cursor: pointer;
+}
+
+
+
+.weui-icon-checkbox {
+	display: inline-block;
+	-webkit-box-sizing: border-box;
+	box-sizing: border-box;
+	width: 16px;
+	height: 16px;
+	margin-top: 6px;
+	margin-right: 5px;
+	border: 1px solid #b8b8b8;
+	background-color: #fafafa;
+	vertical-align: top;
+}
+
+.weui-form-checkbox[type="checkbox"]:checked+label .weui-icon-checkbox {
+	background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMDE0IDc5LjE1Njc5NywgMjAxNC8wOC8yMC0wOTo1MzowMiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTQgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkY0MTI1RkFBQjJCNzExRTU5NzE3RDMyNDM3NTgzRTE4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkY0MTI1RkFCQjJCNzExRTU5NzE3RDMyNDM3NTgzRTE4Ij4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RjQxMjVGQThCMkI3MTFFNTk3MTdEMzI0Mzc1ODNFMTgiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6RjQxMjVGQTlCMkI3MTFFNTk3MTdEMzI0Mzc1ODNFMTgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz5UDJTUAAABUElEQVR42mL8//8/w0ACJoYBBqMOGHEOsB0oB/AC8UIgPgTEZvR2gDYQnwXiOChfH0UWVA7QEPsA8af/CDAJXQ0tLS8G4r9Ili8BYkZ6OaD9Pyo4AcQc2NRS22ImIJ6OZvltIBbFpYealjMD8WI0y78CsS4+fdS0fNl/TBBOSC8uCVBiyQViASItX4HF8j5iHI/LwIVQQ+4CsQEeA1iAeBUWyw9AzSHLAS1ohn0H4hQs6liBeDUWy58AsTix0YdNUBiIz2AxeD4Qc0HVsAHxOixqfgKxNSnpB5cEPxAfw2LBeWiq3vofO8gjNQHjk+QF4kNYLPmHw/Kl5OQgQgpAQb77P2FwDil6qOoABmgRuhWP5a+AWJbcMoRYhaBEtx5HorOjpBAjRTEo261Ec0AKpaUoOUUurJDqpEYxTm6Nl05sSUcIM472jEYdMOIdABBgAFfZNpPCdKCTAAAAAElFTkSuQmCC");
+	background-size: 100%;
+	background-color: #04be02;
+	border: 1px solid #04be02;
+	cursor: pointer;
+}
+
+.weui-form-input,
+.weui-form-area {
+	background-color: #fff;
+	border: 1px solid #cdcdcd;
+	border-radius: 1px;
+	padding: 5px 2px;
+	line-height: 24px;
+	font-size: 16px;
+	width: 100%;
+	outline: 0;
+	-webkit-appearance: none;
+	cursor: pointer;
+}
+
+.weui-form-input:focus,
+.weui-form-area:focus {
+	outline: none;
+	border: 1px solid #04be02;
+}
+
+.weui-form-area {
+	overflow: auto;
+}
+
+.weui-form label {
+	cursor: pointer;
+}
+
+/*
+图片效果*/
+.img-max {
+	display: block;
+	max-width: 100%;
+}
+
+.img-box {
+	position: relative;
+}
+
+.img-box img {
+	border-radius: 2px;
+	cursor: pointer;
+	display: block;
+	max-width: 100%;
+}
+
+.img-box-title {
+	color: #fff;
+	font-size: 16px;
+	left: 0;
+	position: absolute;
+	text-align: left;
+	bottom: 0;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	display: -webkit-box;
+	-webkit-box-orient: vertical;
+	-webkit-line-clamp: 2;
+	padding: 0.2em 0.5em;
+	max-height: 500px;
+	background: rgba(0, 0, 0, .7);
+}
+
+/*标签*/
+.weui-label-list .label {
+	display: inline-block;
+	position: relative;
+	line-height: 1.4em;
+	height: 1.4em;
+	padding: 0 0.625em;
+	border: 1px solid #cacccd;
+	border-radius: 0.1875em;
+}
+
+@media screen and (-webkit-min-device-pixel-ratio: 2) {
+	.weui-label-list .label {
+		position: relative;
+		border: 0;
+	}
+
+	.weui-label-list .label:before {
+		content: "";
+		width: 200%;
+		height: 200%;
+		position: absolute;
+		top: 0;
+		left: 0;
+		border: 1px solid #cacccd;
+		-webkit-transform: scale(0.5);
+		-webkit-transform-origin: 0 0;
+		padding: 1px;
+		-webkit-box-sizing: border-box;
+		border-radius: .1875em;
+	}
+}
+
+.weui-label-list .label:active {
+	background-color: #f3f2f2;
+}
+
+.weui-label-list {
+	margin: 0 0.625em;
+}
+
+.weui-label-list .label {
+	margin: 0.3125em 0.3125em 0 0;
+}
+
+.weui-label-s {
+	font-size: 14px;
+	line-height: 1em;
+	display: inline-block;
+	position: relative;
+	padding: 1px;
+	color: #ff7f0d;
+	/* border: 1px solid #ff7f0d;*/
+	border-radius: 2px;
+}
+
+@media screen and (-webkit-min-device-pixel-ratio: 2) {
+	.weui-label-s {
+		position: relative;
+		border: 0;
+		padding: 0.1875em;
+	}
+
+	.weui-label-s:before {
+		content: "";
+		width: 200%;
+		height: 200%;
+		position: absolute;
+		top: 0;
+		left: 0;
+		/*    border: 1px solid #ff7f0d;*/
+		-webkit-transform: scale(0.5);
+		-webkit-transform-origin: 0 0;
+		padding: 1px;
+		-webkit-box-sizing: border-box;
+		border-radius: 0.3125em
+	}
+}
+
+.weui-label-s:active {
+	background-color: #f3f2f2;
+}
+
+.weui-label-s:after {
+	content: "";
+	position: absolute;
+	top: -.3125em;
+	left: -5px;
+}
+
+/*分页*/
+.pager {
+	font-size: 14px;
+}
+
+.pager:after {
+	clear: both;
+}
+
+.pager:after,
+.pager:before {
+	display: table;
+	content: " ";
+}
+
+.pager-left {
+	width: 40%;
+	border: 0px solid #D5D5D5;
+	text-align: center;
+	background-color: #fff;
+	border-radius: 5px;
+	float: left;
+}
+
+.pager-cen {
+	float: left;
+	width: 19%;
+	text-align: center;
+	padding: 7px 0;
+}
+
+.pager-right {
+	width: 40%;
+	border: 0px solid #D5D5D5;
+	text-align: center;
+	background-color: #fff;
+	border-radius: 5px;
+	float: right;
+}
+
+.pager-first {
+	width: 44%;
+	padding: 7px 0;
+	float: left;
+	border-right: 1px solid #EFEFEF;
+}
+
+.pager-pre {
+	width: 55%;
+	padding: 7px 0;
+	float: right;
+}
+
+.pager-next {
+	width: 55%;
+	padding: 7px 0;
+	float: left;
+	border-right: 1px solid #EFEFEF;
+}
+
+.pager-end {
+	width: 44%;
+	padding: 7px 0;
+	float: right;
+}
+
+.page_div {
+	margin-top: 20px;
+	margin-bottom: 20px;
+	font-size: 15px;
+	font-family: "microsoft yahei";
+	color: #666666;
+	margin-right: 10px;
+	padding-left: 20px;
+	box-sizing: border-box;
+}
+
+/*
+ * 页数按钮样式
+ */
+.pager2 {
+	margin: 1em auto;
+	font-size: 16px;
+	color: #666666;
+	box-sizing: border-box;
+	text-align: center;
+}
+
+.pager2 a {
+	min-width: 30px;
+	height: 2em;
+	border: 1px solid #e5e5e5;
+	text-align: center;
+	margin: 0 5px;
+	cursor: pointer;
+	line-height: 2em;
+	color: #666666;
+	display: inline-block;
+}
+
+.pager2-pre,
+.pager2-next {
+	width: 3em;
+	color: #00a7ff;
+	border: 1px solid #e5e5e5;
+}
+
+.pager2 .active {
+	background-color: #00a7ff;
+	border-color: rgba(0, 0, 0, 0);
+	color: #FFFFFF;
+}
+
+/*留言列表*/
+.weui-comment {
+	font-size: 16px;
+	margin-top: -5px;
+	padding-bottom: 20px;
+
+}
+
+.weui-comment-item {
+	margin-top: 15px;
+	padding-left: 45px;
+	position: relative;
+	list-style-type: none;
+}
+
+.weui-comment-item::after {
+	clear: both;
+	content: "​";
+	display: block;
+	height: 0;
+}
+
+.weui-comment-item .userinfo {
+	min-height: 20px;
+	overflow: hidden;
+}
+
+.weui-comment-item .nickname {
+	color: #727272;
+	display: block;
+	font-style: normal;
+	font-weight: 400;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	width: 9em;
+	word-wrap: normal;
+}
+
+.weui-comment-item .avatar {
+	border-radius: 2px;
+	height: 35px;
+	left: 0;
+	margin-top: 0;
+	position: absolute;
+	top: 3px;
+	vertical-align: top;
+	width: 35px;
+}
+
+.weui-comment-item .weui-comment-msg {
+	color: #3e3e3e;
+	line-height: 1.5;
+}
+
+.weui-comment-item .time {
+	color: #8c8c8c;
+	font-size: 12px;
+}
+
+.weui-comment-item .time a {
+	margin-left: 0.5em;
+}
+
+.weui-comment-item .status {
+	color: #ff7a21;
+	white-space: nowrap;
+}
+
+.weui-comment-item .status i {
+	font-style: normal;
+	margin-right: 2px;
+}
+
+.weui-comment-item .weui-comment-li {
+	float: right;
+}
+
+.weui-comment-item .weui-comment-li .check {
+	display: inline-block;
+	margin-top: -5px;
+	padding-top: 5px;
+	text-align: right;
+}
+
+.weui-comment-reply {
+	margin-top: 0.5em;
+	padding-left: 0.4em;
+	padding-top: 0.5em;
+	position: relative;
+}
+
+.weui-comment-num {
+	color: #666;
+	display: inline-block;
+	font-size: 14px;
+	vertical-align: middle;
+}
+
+.weui-comment-reply::before {
+	border-top: 1px solid #dadada;
+	content: " ";
+	height: 1px;
+	left: 0;
+	position: absolute;
+	top: 0;
+	transform: scaleY(0.5);
+	transform-origin: 0 0 0;
+	width: 100%;
+}
+
+.weui-comment-reply .nickname {
+	overflow: visible;
+	position: relative;
+}
+
+.weui-comment-reply .nickname::before {
+	background-color: #02bb00;
+	content: " ";
+	height: 14px;
+	left: -0.4em;
+	margin-top: -7px;
+	position: absolute;
+	top: 50%;
+	width: 3px;
+}
+
+.weui-comment-icon {
+	background: transparent url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABoAAAA+CAYAAAA1dwvuAAAACXBIWXMAAA7EAAAOxAGVKw4bAAACd0lEQVRYhe2XMWhUMRjHfycdpDg4iJN26CQih4NUlFIc3iTasaAO+iZBnorIId2CDg6PLqWDXSy0p28TJ6ejILgoKiLFSeRcnASLnDf2HPKll8b3ah5NQPB+cHzJl0v+73J5Sf6NwWCAD6kqxoEV4BywCTwA2j59V9QlxrxUNJeBOSkfBtaAHvDcp/O+GkJHJd4H7kr5nm/nOkJHJH4FHkv5WAyhUxLfAgelvBlUKFXFBNCU6oYl+j6oEHohADwFtoDTUn8dTChVxX7gjlSfSJyS+CaYEDCPXs4d4IXkzDR+8BWqfI9SVUyil/ENST20ml8BF4Afu4z9HT3V80B/TAY9CxTABNAHxp1Oj4B1q34dWAamGa5Al0PALfSs3TS/aE1EcERWgQXgozPIN+Ai6O2ljFQVM8BLZJqN0KTEhgj9kvrViqf1wYz5BcoXQ38Pg9uckfiuSigU0xLXowmlqpgCjgNd4FM0IeCKxGcmEUtoRqLZScILpaqYA06iN9/tTTfGLzKvxLKdDCqUquIEcB59xK9GE2J4xLeBn3ZD1abaq/sQqSpmgWvo82rBbTdCPeAA4N69/noXS1XhphaBz27SPPVtapz/FXSBFsNDcgcN3wvkiBEjRoSndAtqLXXKvuvtYfMs+SP3T3tYm6ge1iaqh7UJ62HRTqNZko/mYV3CeVjA9rAuUTxsGd4edrcX1vWwddn2sHmWaA/bWuq4HnYLff3aC7U8bAiaMPyPJp3GhnxCUOlhQxPdwxrieViLbp4lUT2sIbqHNcTzsBYbeZZE9bCGeB7WIrqHNbTzLNnhYWMIlXpYI9Rz8gM8/GsFi3mW/Ace9jf8QZwIX5o4uQAAAABJRU5ErkJggg==") no-repeat scroll 0 0 / 100% auto;
+	display: inline-block;
+	height: 13px;
+	vertical-align: middle;
+	width: 13px;
+}
+
+.weui-comment-icon.checked,
+.checked .weui-comment-icon {
+	background-position: 0 -18px;
+}
+
+/*
+头条列表
+*/
+.weui-news {
+	-webkit-overflow-scrolling: touch;
+	overflow-x: hidden;
+	word-break: break-all;
+}
+
+.weui-news-list {
+	position: relative;
+	font-size: 0.8rem;
+	background-color: #ffffff;
+}
+
+.weui-news-item {
+	display: block;
+	list-style: none;
+	margin: 0;
+	padding: 0;
+	padding-left: 0.75rem;
+	color: #212121;
+	border-bottom: 1px solid #E5E5E5;
+	position: relative;
+	min-height: 2.2rem;
+	-webkit-box-sizing: border-box;
+	box-sizing: border-box;
+	display: -webkit-box;
+	display: -webkit-flex;
+	display: flex;
+	-webkit-box-pack: justify;
+	-webkit-justify-content: space-between;
+	justify-content: space-between;
+}
+
+.weui-news-item:last-child {
+	border-bottom: 0;
+}
+
+.weui-news-inner {
+	-webkit-box-sizing: border-box;
+	box-sizing: border-box;
+	display: -webkit-box;
+	display: -webkit-flex;
+	display: flex;
+	width: 100%;
+}
+
+.weui-news-inners {
+	position: relative;
+	min-height: 2.2rem;
+	padding-right: 0.75rem;
+	width: 100%;
+	-webkit-box-sizing: border-box;
+	box-sizing: border-box;
+	display: -webkit-box;
+	display: -webkit-flex;
+	display: flex;
+	-webkit-box-flex: 1;
+	-webkit-box-pack: justify;
+	-webkit-justify-content: space-between;
+	justify-content: space-between;
+	-webkit-box-align: center;
+	-webkit-align-items: center;
+	align-items: center;
+	display: block;
+	padding-top: 0.5rem;
+	padding-bottom: 0;
+}
+
+.weui-news-text {
+	font-size: 0.7rem;
+	color: #757575;
+	position: relative;
+	-webkit-box-sizing: border-box;
+	box-sizing: border-box;
+	display: -webkit-box;
+	display: -webkit-flex;
+	display: flex;
+	-webkit-box-pack: justify;
+	-webkit-justify-content: space-between;
+	justify-content: space-between;
+	-webkit-align-items: center;
+	align-items: center;
+}
+
+.weui-news-title {
+	font-size: 0.8rem;
+	position: relative;
+	max-width: 100%;
+	color: #212121;
+	display: -webkit-box;
+	-webkit-line-clamp: 2;
+	-webkit-box-orient: vertical;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	word-wrap: break-word;
+	word-break: break-all;
+	white-space: normal !important;
+}
+
+.weui-news-info {
+	position: relative;
+	padding: 0.5rem 0;
+	font-size: 0.7rem;
+	color: #757575;
+	background-color: transparent;
+	-webkit-box-sizing: border-box;
+	box-sizing: border-box;
+	display: -webkit-box;
+	display: -webkit-flex;
+	display: flex;
+	-webkit-box-pack: justify;
+	-webkit-justify-content: space-between;
+	justify-content: space-between;
+	-webkit-box-align: center;
+	-webkit-align-items: center;
+	align-items: center;
+	width: 100%;
+
+}
+
+.weui-news-infoitem {
+	-webkit-box-sizing: border-box;
+	box-sizing: border-box;
+	display: -webkit-box;
+	display: -webkit-flex;
+	display: flex;
+	-webkit-box-align: center;
+	-webkit-align-items: center;
+	align-items: center;
+	font-size: 0.6rem !important;
+}
+
+.weui-news-round {
+	width: 1rem;
+	border-radius: 50%;
+	max-width: 100%;
+	position: relative;
+}
+
+.weui-news-media {
+	width: 6rem;
+	position: relative;
+	padding: 0.5rem 0;
+	padding-right: 0.75rem;
+	display: inherit;
+	-webkit-flex-shrink: 0;
+	flex-shrink: 0;
+	-webkit-flex-wrap: nowrap;
+	flex-wrap: nowrap;
+	-webkit-box-align: center;
+	-webkit-align-items: flex-start;
+	align-items: flex-start;
+}
+
+.weui-news-media img {
+	width: 100%;
+	display: block;
+	max-width: 100%;
+}
+
+.weui-news-medias {
+	margin: 0;
+	overflow: hidden;
+
+}
+
+.weui-news-medialist {
+	padding: 0.125rem;
+	width: 31.5%;
+	position: relative;
+	float: left;
+}
+
+.weui-news-medialist img {
+	max-width: 100%;
+	width: 100%;
+	display: block;
+}
+
+.weui-news-p {
+	display: -webkit-box;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	word-wrap: break-word;
+	word-break: break-all;
+	white-space: normal !important;
+	-webkit-line-clamp: 2;
+	-webkit-box-orient: vertical;
+	font-size: 0.7rem;
+	color: #757575;
+}
+
+.weui-news-left {
+	margin-left: 0.25rem !important;
+	font-size: 0.6rem !important;
+}
+
+/*
+微信文章样式
+*/
+.weui-content {
+	padding: 20px 16px 12px;
+	padding-top: 32px;
+	word-wrap: break-word;
+	position: relative;
+	background-color: #fff;
+}
+
+.weui-c-inner {
+	max-width: 677px;
+	margin-left: auto;
+	margin-right: auto;
+}
+
+.weui-c-content {}
+
+.weui-c-title {
+	font-size: 22px;
+	line-height: 1.4;
+	margin-bottom: 14px;
+	font-weight: 400;
+}
+
+@supports (-webkit-overflow-scrolling:touch) {
+	.weui-c-title {
+		font-weight: 700
+	}
+}
+
+.weui-c-meta {
+	margin-bottom: 22px;
+	line-height: 20px;
+	font-size: 0;
+	word-wrap: break-word;
+	word-break: break-all
+}
+
+.weui-c-meta em {
+	font-style: normal;
+	color: rgba(0, 0, 0, 0.3);
+}
+
+.weui-c-nickname {
+	display: inline-block;
+	vertical-align: middle;
+	margin: 0 10px 10px 0;
+	font-size: 15px;
+	-webkit-tap-highlight-color: rgba(0, 0, 0, 0)
+}
+
+.weui-c-article {
+	overflow: hidden;
+	color: #333;
+	font-size: 17px;
+	word-wrap: break-word;
+	-webkit-hyphens: auto;
+	-ms-hyphens: auto;
+	hyphens: auto;
+	text-align: justify
+}
+
+.weui-c-article * {
+	max-width: 100% !important;
+	box-sizing: border-box !important;
+	-webkit-box-sizing: border-box !important;
+	word-wrap: break-word !important
+}
+
+.weui-c-article p {
+	clear: both;
+	min-height: 1em;
+	text-indent: 2em;
+}
+
+.weui-c-article em {
+	font-style: italic
+}
+
+.weui-c-article fieldset {
+	min-width: 0
+}
+
+.weui-c-article .list-paddingleft-2 {
+	padding-left: 2.2em
+}
+
+.weui-c-article .list-paddingleft-2 .list-paddingleft-2 {
+	padding-left: 30px
+}
+
+.weui-c-article blockquote {
+	margin: 0;
+	padding-left: 10px;
+	border-left: 3px solid #dbdbdb
+}
+
+.weui-c-article img {
+	height: auto !important;
+	display: block;
+	width: 100%;
+	max-width: 100%;
+}
+
+.weui-c-tools {
+	font-size: 15px;
+	padding-top: 24px;
+	overflow: hidden;
+	line-height: 32px;
+}
+
+.weui-c-tools a {
+	margin-right: 20px;
+
+}
+
+.weui-c-readnum {
+	display: inline-block;
+	margin-right: 20px;
+	color: rgba(0, 0, 0, 0.3);
+}
+
+.weui-c-like {
+	min-width: 2.5em;
+	color: #576b95;
+	text-align: right;
+	float: right;
+	margin-left: 10px;
+	display: inline-block;
+}
+
+.weui-c-like .icon {
+	background: transparent url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABoAAAA+CAYAAAA1dwvuAAAACXBIWXMAAA7EAAAOxAGVKw4bAAACd0lEQVRYhe2XMWhUMRjHfycdpDg4iJN26CQih4NUlFIc3iTasaAO+iZBnorIId2CDg6PLqWDXSy0p28TJ6ejILgoKiLFSeRcnASLnDf2HPKll8b3ah5NQPB+cHzJl0v+73J5Sf6NwWCAD6kqxoEV4BywCTwA2j59V9QlxrxUNJeBOSkfBtaAHvDcp/O+GkJHJd4H7kr5nm/nOkJHJH4FHkv5WAyhUxLfAgelvBlUKFXFBNCU6oYl+j6oEHohADwFtoDTUn8dTChVxX7gjlSfSJyS+CaYEDCPXs4d4IXkzDR+8BWqfI9SVUyil/ENST20ml8BF4Afu4z9HT3V80B/TAY9CxTABNAHxp1Oj4B1q34dWAamGa5Al0PALfSs3TS/aE1EcERWgQXgozPIN+Ai6O2ljFQVM8BLZJqN0KTEhgj9kvrViqf1wYz5BcoXQ38Pg9uckfiuSigU0xLXowmlqpgCjgNd4FM0IeCKxGcmEUtoRqLZScILpaqYA06iN9/tTTfGLzKvxLKdDCqUquIEcB59xK9GE2J4xLeBn3ZD1abaq/sQqSpmgWvo82rBbTdCPeAA4N69/noXS1XhphaBz27SPPVtapz/FXSBFsNDcgcN3wvkiBEjRoSndAtqLXXKvuvtYfMs+SP3T3tYm6ge1iaqh7UJ62HRTqNZko/mYV3CeVjA9rAuUTxsGd4edrcX1vWwddn2sHmWaA/bWuq4HnYLff3aC7U8bAiaMPyPJp3GhnxCUOlhQxPdwxrieViLbp4lUT2sIbqHNcTzsBYbeZZE9bCGeB7WIrqHNbTzLNnhYWMIlXpYI9Rz8gM8/GsFi3mW/Ace9jf8QZwIX5o4uQAAAABJRU5ErkJggg==) no-repeat 0 0;
+	width: 1em;
+	height: 1em;
+	vertical-align: middle;
+	display: inline-block;
+	-webkit-background-size: 100% auto;
+	background-size: 100% auto;
+	position: relative;
+	top: 1px;
+	cursor: pointer;
+}
+
+.weui-c-like .on {
+	background-position: 1px -22px;
+}
+
+.weui-c-like span {
+	margin-left: -3px;
+	display: inline-block;
+	vertical-align: middle;
+	color: #576b95;
+}
+
+/*
+信息流*/
+.weui-feeds {
+	width: 100%;
+	overflow: hidden
+}
+
+.weui-feeds>ul {
+	height: auto;
+	overflow: hidden;
+	margin: 0 -1px
+}
+
+.weui-feeds>ul>li {
+	display: block;
+	height: auto;
+	float: left;
+	-webkit-box-sizing: border-box;
+	box-sizing: border-box;
+	padding: 0 1px;
+	position: relative
+}
+
+.weui-feeds>ul>li>span {
+	display: block;
+	width: 100%;
+	padding-top: 100%;
+	background-position: center;
+	-webkit-background-size: 100% auto;
+	background-size: 100% auto;
+	background-color: #ccc
+}
+
+.weui-feeds>ul>li:first-child:nth-last-child(1),
+.weui-feeds>ul>li:first-child:nth-last-child(1)~li {
+	width: 100%;
+	max-height: 3.75rem;
+	max-height: 100vw
+}
+
+.weui-feeds>ul>li:first-child:nth-last-child(1) img,
+.weui-feeds>ul>li:first-child:nth-last-child(1)~li img {
+	display: block;
+	width: 100%;
+	height: auto
+}
+
+.weui-feeds>ul>li:first-child:nth-last-child(2),
+.weui-feeds>ul>li:first-child:nth-last-child(2)~li {
+	width: 50%
+}
+
+.weui-feeds>ul>li:first-child:nth-last-child(3),
+.weui-feeds>ul>li:first-child:nth-last-child(3)~li {
+	width: 50%
+}
+
+.weui-feeds>ul>li:first-child:nth-last-child(3) {
+	width: 100%;
+	padding-bottom: 2px
+}
+
+.weui-feeds>ul>li:first-child:nth-last-child(3):after {
+	content: "";
+	position: absolute;
+	bottom: 0;
+	height: 2px;
+	width: 100%;
+	background-color: #fff;
+	z-index: 99
+}
+
+.weui-feeds>ul>li:first-child:nth-last-child(3)>span {
+	padding-top: 50%
+}
+
+.weui-feeds>ul>li:first-child:nth-last-child(3)~li {
+	width: 50%
+}
+
+.weui-feeds>ul>li:first-child:nth-last-child(3)~li>span {
+	padding-top: 100%;
+	position: relative
+}
+
+.weui-feeds>ul>li:first-child:nth-last-child(4),
+.weui-feeds>ul>li:first-child:nth-last-child(4)~li {
+	width: 50%
+}
+
+.weui-feeds>ul>li:first-child:nth-last-child(4) {
+	width: 100%;
+	padding-bottom: 2px
+}
+
+.weui-feeds>ul>li:first-child:nth-last-child(4):after {
+	content: "";
+	position: absolute;
+	bottom: 0;
+	height: 2px;
+	width: 100%;
+	background-color: #fff;
+	z-index: 99
+}
+
+.weui-feeds>ul>li:first-child:nth-last-child(4)>span {
+	padding-top: 50%
+}
+
+.weui-feeds>ul>li:first-child:nth-last-child(4)~li {
+	width: 33.3%
+}
+
+.weui-feeds>ul>li:first-child:nth-last-child(4)~li>span {
+	padding-top: 100%
+}
+
+.weui-feeds>ul>li:first-child:nth-last-child(5),
+.weui-feeds>ul>li:first-child:nth-last-child(5)~li:nth-child(2) {
+	width: 50%;
+	padding-bottom: 2px
+}
+
+.weui-feeds>ul>li:first-child:nth-last-child(5):after,
+.weui-feeds>ul>li:first-child:nth-last-child(5)~li:nth-child(2):after {
+	content: "";
+	position: absolute;
+	bottom: 0;
+	height: 2px;
+	width: 100%;
+	background-color: #fff;
+	z-index: 99
+}
+
+.weui-feeds>ul>li:first-child:nth-last-child(5)>span,
+.weui-feeds>ul>li:first-child:nth-last-child(5)~li:nth-child(2)>span {
+	padding-top: 100%
+}
+
+.weui-feeds>ul>li:first-child:nth-last-child(5)~li {
+	width: 33.3%
+}
+
+.weui-feeds>ul>li:first-child:nth-last-child(5)~li>span {
+	padding-top: 100%
+}
+
+.weui-feeds>ul>li:first-child:nth-last-child(6) {
+	width: 66.666%;
+	padding-bottom: 1px
+}
+
+.weui-feeds>ul>li:first-child:nth-last-child(6):after {
+	content: "";
+	position: absolute;
+	bottom: 0;
+	height: 2px;
+	width: 100%;
+	background-color: #fff;
+	z-index: 99
+}
+
+.weui-feeds>ul>li:first-child:nth-last-child(6)>span {
+	padding-top: 100.3%
+}
+
+.weui-feeds>ul>li:first-child:nth-last-child(6)~li {
+	width: 33.3%
+}
+
+.weui-feeds>ul>li:first-child:nth-last-child(6)~li>span {
+	padding-top: 100%
+}
+
+.weui-feeds>ul>li:first-child:nth-last-child(6)~li:nth-child(2) {
+	padding-bottom: 2px;
+	width: 33.333%
+}
+
+.weui-feeds>ul>li:first-child:nth-last-child(6)~li:nth-child(2):after {
+	content: "";
+	position: absolute;
+	bottom: 0;
+	height: 2px;
+	width: 100%;
+	background-color: #fff;
+	z-index: 99
+}
+
+.weui-feeds>ul>li:first-child:nth-last-child(6)~li:nth-child(2)>span {
+	padding-top: 100.15%
+}
+
+.weui-feeds>ul>li:first-child:nth-last-child(6)~li:nth-child(3) {
+	padding-bottom: 2px;
+	width: 33.333%
+}
+
+.weui-feeds>ul>li:first-child:nth-last-child(6)~li:nth-child(3):after {
+	content: "";
+	position: absolute;
+	bottom: 0;
+	height: 2px;
+	width: 100%;
+	background-color: #fff;
+	z-index: 99
+}
+
+.weui-feeds>ul>li:first-child:nth-last-child(6)~li:nth-child(3)>span {
+	padding-top: 100.15%
+}
+
+.weui-feeds>ul>li:first-child:nth-last-child(6)~li:nth-child(4) {
+	clear: both
+}
+
+.weui-feeds>ul>li:first-child:nth-last-child(7) {
+	width: 100%;
+	padding-bottom: 2px
+}
+
+.weui-feeds>ul>li:first-child:nth-last-child(7):after {
+	content: "";
+	position: absolute;
+	bottom: 0;
+	height: 2px;
+	width: 100%;
+	background-color: #fff;
+	z-index: 99
+}
+
+.weui-feeds>ul>li:first-child:nth-last-child(7)>span {
+	padding-top: 50%
+}
+
+.weui-feeds>ul>li:first-child:nth-last-child(7)~li:nth-child(2),
+.weui-feeds>ul>li:first-child:nth-last-child(7)~li:nth-child(3),
+.weui-feeds>ul>li:first-child:nth-last-child(7)~li:nth-child(4) {
+	padding-bottom: 2px
+}
+
+.weui-feeds>ul>li:first-child:nth-last-child(7)~li:nth-child(2):after,
+.weui-feeds>ul>li:first-child:nth-last-child(7)~li:nth-child(3):after,
+.weui-feeds>ul>li:first-child:nth-last-child(7)~li:nth-child(4):after {
+	content: "";
+	position: absolute;
+	bottom: 0;
+	height: 2px;
+	width: 100%;
+	background-color: #fff;
+	z-index: 99
+}
+
+.weui-feeds>ul>li:first-child:nth-last-child(7)~li {
+	width: 33.3%
+}
+
+.weui-feeds>ul>li:first-child:nth-last-child(7)~li>span {
+	padding-top: 100%
+}
+
+.weui-feeds>ul>li:first-child:nth-last-child(8),
+.weui-feeds>ul>li:first-child:nth-last-child(8)~li:nth-child(2) {
+	width: 50%;
+	padding-bottom: 2px
+}
+
+.weui-feeds>ul>li:first-child:nth-last-child(8):after,
+.weui-feeds>ul>li:first-child:nth-last-child(8)~li:nth-child(2):after {
+	content: "";
+	position: absolute;
+	bottom: 0;
+	height: 2px;
+	width: 100%;
+	background-color: #fff;
+	z-index: 99
+}
+
+.weui-feeds>ul>li:first-child:nth-last-child(8) span,
+.weui-feeds>ul>li:first-child:nth-last-child(8)~li:nth-child(2) span {
+	padding-top: 100%
+}
+
+.weui-feeds>ul>li:first-child:nth-last-child(8)~li:nth-child(3),
+.weui-feeds>ul>li:first-child:nth-last-child(8)~li:nth-child(4),
+.weui-feeds>ul>li:first-child:nth-last-child(8)~li:nth-child(5) {
+	padding-bottom: 2px
+}
+
+.weui-feeds>ul>li:first-child:nth-last-child(8)~li:nth-child(3):after,
+.weui-feeds>ul>li:first-child:nth-last-child(8)~li:nth-child(4):after,
+.weui-feeds>ul>li:first-child:nth-last-child(8)~li:nth-child(5):after {
+	content: "";
+	position: absolute;
+	bottom: 0;
+	height: 2px;
+	width: 100%;
+	background-color: #fff;
+	z-index: 99
+}
+
+.weui-feeds>ul>li:first-child:nth-last-child(8)~li {
+	width: 33.3%
+}
+
+.weui-feeds>ul>li:first-child:nth-last-child(8)~li>span {
+	padding-top: 100%
+}
+
+.weui-feeds>ul>li:first-child:nth-last-child(9),
+.weui-feeds>ul>li:first-child:nth-last-child(9)~li {
+	width: 33.333%
+}
+
+.weui-feeds>ul>li:first-child:nth-last-child(9),
+.weui-feeds>ul>li:first-child:nth-last-child(9)~li:nth-child(2),
+.weui-feeds>ul>li:first-child:nth-last-child(9)~li:nth-child(3),
+.weui-feeds>ul>li:first-child:nth-last-child(9)~li:nth-child(4),
+.weui-feeds>ul>li:first-child:nth-last-child(9)~li:nth-child(5),
+.weui-feeds>ul>li:first-child:nth-last-child(9)~li:nth-child(6) {
+	padding-bottom: 2px
+}
+
+.weui-feeds>ul>li:first-child:nth-last-child(9):after,
+.weui-feeds>ul>li:first-child:nth-last-child(9)~li:nth-child(2):after,
+.weui-feeds>ul>li:first-child:nth-last-child(9)~li:nth-child(3):after,
+.weui-feeds>ul>li:first-child:nth-last-child(9)~li:nth-child(4):after,
+.weui-feeds>ul>li:first-child:nth-last-child(9)~li:nth-child(5):after,
+.weui-feeds>ul>li:first-child:nth-last-child(9)~li:nth-child(6):after {
+	content: "";
+	position: absolute;
+	bottom: 0;
+	height: 2px;
+	width: 100%;
+	background-color: #fff;
+	z-index: 99
+}
+
+/*
+今日头条导航*/
+.weui-navigator {
+	background: #fafafa;
+	position: relative;
+	padding: 0;
+	margin: 0
+}
+
+.weui-navigator-list {
+	width: 100%;
+	list-style: none;
+	display: -webkit-box;
+	margin: 0 auto
+}
+
+.weui-navigator-list li {
+	list-style: none;
+	line-height: 37px;
+	font-size: 16px;
+	text-align: center;
+	-webkit-box-flex: 1;
+	display: -webkit-box;
+	white-space: nowrap;
+	-webkit-box-align: center;
+	-webkit-box-pack: center
+}
+
+.weui-navigator.weui-navigator-wrapper {
+	z-index: 1;
+	width: 100%;
+	overflow: hidden;
+	position: relative;
+	-webkit-backface-visibility: hidden
+}
+
+.weui-navigator-list li a {
+	text-decoration: none;
+	color: #666;
+	display: block;
+	width: 100%;
+	-webkit-box-sizing: border-box;
+	padding: 0 15px
+}
+
+.weui-navigator-list li.weui-state-hover,
+.weui-navigator-list li.weui-state-active a {
+	color: #04be02
+}
+
+.weui-navigator-list li.weui-state-hover,
+.weui-navigator-list li.weui-state-active a:after {
+	content: '';
+	display: block;
+	height: 2px;
+	background-color: #04be02
+}
+
+.weui-navigator .weui-navigator-list {
+	display: table;
+	table-layout: fixed;
+	white-space: nowrap;
+	width: auto
+}
+
+.weui-navigator .weui-navigator-list:after {
+	content: '';
+	clear: both;
+	display: inline-block;
+	width: 0;
+	height: 0;
+	overflow: hidden
+}
+
+.weui-navigator .weui-navigator-list li {
+	display: inline-block
+}
+
+/*
+侧边栏*/
+.weui-navs {
+	width: 220px;
+	height: 100%;
+	background: #000;
+	transition: all .3s;
+	position: absolute;
+	top: 0;
+	left: 0;
+}
+
+.weui-navs a {
+	display: block;
+	overflow: hidden;
+	padding-left: 10px;
+	line-height: 46px;
+	max-height: 46px;
+	color: #666;
+	transition: all .3s;
+}
+
+.weui-navs a span {
+	margin-left: 30px;
+}
+
+.nav-item {
+	position: relative;
+}
+
+.nav-item.nav-show {
+	border-bottom: none;
+}
+
+.nav-item ul {
+	display: none;
+	background: rgba(0, 0, 0, .1);
+}
+
+.nav-item.nav-show ul {
+	display: block;
+}
+
+.nav-item>a:before {
+	content: "";
+	position: absolute;
+	left: 0px;
+	width: 2px;
+	height: 46px;
+	background: #FFF;
+	opacity: 0;
+	transition: all .3s;
+}
+
+.weui-navs .nav-icon {
+	font-size: 16px;
+	position: absolute;
+	margin-left: -1px;
+}
+
+.nav-more {
+	float: right;
+	margin-right: 20px;
+	font-size: 16px;
+	transition: transform .3s;
+}
+
+.nav-show .nav-more {
+	transform: rotate(180deg);
+}
+
+.nav-more::after {
+	content: "\e644";
+}
+
+.nav-show,
+.nav-item>a:hover {
+	color: #666;
+	background: rgba(0, 0, 0, 0);
+}
+
+.nav-show>a:before,
+.nav-item>a:hover:before {
+	opacity: .5;
+}
+
+.nav-item li:hover a {
+	color: #666;
+	background: rgba(0, 0, 0, 0);
+}
+
+[sidebarjs-background],
+[sidebarjs] {
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+}
+
+[sidebarjs].sidebarjs--left,
+[sidebarjs].sidebarjs--left [sidebarjs-container] {
+	-webkit-transform: translate(-100%, 0);
+	transform: translate(-100%, 0);
+}
+
+[sidebarjs].sidebarjs--left [sidebarjs-container] {
+	box-shadow: 2px 0 4px rgba(0, 0, 0, 0.2);
+}
+
+[sidebarjs-background] {
+	position: absolute;
+	background: #fff;
+	opacity: 0;
+	-webkit-transition: opacity 0.3s ease;
+	transition: opacity 0.3s ease;
+}
+
+[sidebarjs-container] {
+	position: relative;
+	z-index: 1;
+	display: -webkit-box;
+	display: -ms-flexbox;
+	display: flex;
+	-webkit-box-orient: vertical;
+	-webkit-box-direction: normal;
+	-ms-flex-direction: column;
+	flex-direction: column;
+	width: 80%;
+	max-width: 300px;
+	height: 100%;
+	background: #fff;
+	-webkit-transition: all ease 0.3s;
+	transition: all ease 0.3s;
+}
+
+[sidebarjs] {
+	position: fixed;
+	z-index: 9999;
+	-webkit-transition: -webkit-transform 0s ease 0.3s;
+	transition: -webkit-transform 0s ease 0.3s;
+	transition: transform 0s ease 0.3s;
+	transition: transform 0s ease 0.3s, -webkit-transform 0s ease 0.3s;
+}
+
+[sidebarjs].sidebarjs--is-visible {
+	-webkit-transform: translate(0, 0);
+	transform: translate(0, 0);
+	-webkit-transition: -webkit-transform 0s ease 0s;
+	transition: -webkit-transform 0s ease 0s;
+	transition: transform 0s ease 0s;
+	transition: transform 0s ease 0s, -webkit-transform 0s ease 0s;
+}
+
+[sidebarjs].sidebarjs--is-visible [sidebarjs-container] {
+	-webkit-transform: translate(0, 0);
+	transform: translate(0, 0);
+}
+
+[sidebarjs].sidebarjs--is-visible [sidebarjs-background] {
+	opacity: .3;
+}
+
+[sidebarjs].sidebarjs--is-moving {
+	-webkit-transition: none;
+	transition: none;
+}
+
+[sidebarjs].sidebarjs--is-moving [sidebarjs-container],
+[sidebarjs].sidebarjs--is-moving [sidebarjs-background] {
+	-webkit-transition: none;
+	transition: none;
+}
+
+/*
+头像*/
+.weui-avatar img {
+	border-radius: 4px;
+	height: 52px;
+	vertical-align: middle;
+	position: relative;
+	width: 52px;
+	display: inline-block;
+}
+
+.weui-avatar-circle img {
+	border-radius: 50%;
+	display: inline-block;
+	height: 50px;
+	margin-right: 13px;
+	position: relative;
+	vertical-align: middle;
+	width: 50px;
+}
+
+.weui-avatar,
+.weui-avatar-circle {
+	width: 50px;
+	height: 50px;
+	position: relative;
+}
+
+.weui-avatar span,
+.weui-avatar-circle span {
+	bottom: -2px;
+	height: 20px;
+	position: absolute;
+	right: -3px;
+	width: 20px;
+	border-radius: 50%;
+	background-color: #fff;
+	font-size: 20px !important;
+}
+
+.weui-avatar span::before,
+.weui-avatar-circle span::before {
+	margin: 0;
+	font-size: 20px !important;
+}
+
+/*
+折叠面板*/
+.collapse li {
+	background-color: #fff;
+	border-radius: 2px;
+	cursor: pointer;
+	margin: 10px 0;
+	overflow: hidden;
+	vertical-align: bottom;
+	display: block;
+}
+
+.collapse li.js-show .weui-flex {
+	opacity: 0.4;
+}
+
+.collapse li.js-show .page-category {
+	height: auto;
+}
+
+.collapse li.js-show .page-category-content {
+	opacity: 1;
+	transform: translateY(0px);
+}
+
+.collapse li:first-child {
+	margin-top: 0;
+}
+
+.collapse .page-category {
+	height: 0;
+	overflow: hidden;
+}
+
+.collapse .page-category-content {
+	opacity: 0;
+	transform: translateY(-50%);
+	transition: 0.3s;
+}
+
+.collapse .weui-flex {
+
+	align-items: center;
+	padding: 10px;
+	transition: all 0.3s ease 0s;
+	display: -webkit-flex;
+	display: -webkit-box;
+	display: flex;
+}
+
+.collapse .weui-flex--item {
+	-webkit-flex: 1 1 0;
+	flex: 1 1 0;
+}
+
+.collapse .weui-cells {
+	margin-top: 0;
+}
+
+.collapse .content {
+	font-size: 16px;
+	text-indent: 2em;
+	margin: .5em auto;
+	padding: 0 0.5em;
+}
+
+/*角标*/
+.weui-mark {
+	padding-left: 0.625em;
+	padding-right: 0;
+	padding-top: .625em;
+	-webkit-overflow-scrolling: touch;
+}
+
+.weui-mark li {
+	padding-right: 0.625em;
+	padding-bottom: 0.625em;
+	float: left;
+	position: relative;
+	-webkit-box-sizing: border-box;
+	width: 50%;
+	list-style: outside none none;
+}
+
+.weui-mark-img {
+	padding-top: 100%;
+	position: relative;
+	width: 100%;
+}
+
+.weui-mark-img img {
+	width: 100%;
+	height: 100%;
+	position: absolute;
+	left: 0;
+	top: 0;
+}
+
+.weui-mark-rt {
+	border-radius: 2px;
+	top: 0;
+	color: #fff;
+	font-size: 1em;
+	height: 1.25em;
+	line-height: 1.25em;
+	position: absolute;
+	right: 0.625em;
+	text-align: center;
+	padding: 0.1em;
+	bottom: 0.625em !important;
+
+}
+
+.weui-mark-rb {
+	border-radius: 2px;
+	bottom: 0.825em !important;
+	color: #fff;
+	font-size: 0.825em;
+	height: 1.25em;
+	line-height: 1.25em;
+	position: absolute;
+	right: 1em;
+	text-align: center;
+	padding: 0.1em;
+	background-color: rgba(0, 0, 0, 0.5);
+}
+
+.weui-mark-lb {
+	border-radius: 2px;
+	bottom: .825em;
+	color: #fff;
+	font-size: 0.825em;
+	height: 1.25em;
+	line-height: 1.25em;
+	position: absolute;
+	text-align: left;
+	max-width: 100%;
+	display: block;
+	padding: 0.125em 0.375em;
+	background-color: rgba(0, 0, 0, 0.4);
+}
+
+.weui-mark-vip {
+	left: 0;
+	position: absolute;
+	top: 0;
+	overflow: hidden;
+	height: 50px;
+	width: 90px;
+}
+
+.weui-mark-lt {
+	color: #fff;
+	display: block;
+	font-size: 0.875em !important;
+	left: -0.6875em;
+	height: 1em;
+	line-height: 1em !important;
+	position: relative;
+	text-align: center;
+	top: 0.875em;
+	transform: rotate(-45deg);
+	width: 4.375em;
+	padding: 0.125em;
+
+}
+
+.weui-mark-meta {
+	position: relative;
+}
+
+.weui-mark-title,
+.weui-mark-desc {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	font-size: 0.875em;
+	padding: 0.1em 0;
+	color: #777;
+}
+
+.weui-mark-title a {
+	font-weight: 700;
+	color: #000;
+	font-size: 1.25em;
+}
+
+/*定位样式*/
+
+.positionr {
+	position: relative;
+}
+
+.positionf {
+	position: fixed;
+}
+
+.positiona {
+	position: absolute;
+}
+
+.radiusp50 {
+	border-radius: 50%;
+}
+
+.bluebg {
+	background: -moz-linear-gradient(left, #FF586A, #FD7564);
+	background: -webkit-gradient(left, #FF586A, #FD7564);
+	background: -webkit-linear-gradient(left, #FF586A, #FD7564);
+	background: -o-linear-gradient(left, #FF586A, #FD7564);
+	background: -ms-linear-gradient(left, #FF586A, #FD7564);
+	background: linear-gradient(left, #FF586A, #FD7564);
+}
+
+.clearfix:after {
+	content: "\200B";
+	display: block;
+	height: 0;
+	clear: both;
+}
+
+.h40 {
+	height: 50px;
+	line-height: 50px;
+}
+
+.white {
+	color: white;
+}
+
+.ml10 {
+	margin-left: 10px;
+}
+
+.top0 {
+	top: 0;
+}
+
+.left10 {
+	left: 10px;
+}
+
+.right10 {
+	right: 10px;
+}
+
+.whitebg {
+	background: white;
+}
+
+.graybg {
+	background: #f4f4f4;
+}
+
+.bdrc {
+	border-right: 1px solid #eee;
+}
+
+.pt20 {
+	padding-top: 20px;
+}
+
+.pb20 {
+	padding-bottom: 20px;
+}
+
+.w40 {
+	width: 40px;
+}
+
+.right0 {
+	right: 0;
+}
+
+.mt10 {
+	margin-top: 10px;
+}
+
+.dlblock {
+	display: inline-block;
+}
+
+.dblock {
+	display: block;
+}
+
+.fc {
+	margin: 0 auto;
+}
+
+.mt5 {
+	margin-top: 5px;
+}
+
+.mt50 {
+	margin-top: 50px;
+}
+
+.black {
+	color: #000;
+}
+
+.pt10 {
+	padding-top: 10px;
+}
+
+.pb10 {
+	padding-bottom: 10px;
+}
+
+.bdbe {
+	border-bottom: 1px solid #eee;
+}
+
+.ml20 {
+	margin-left: 20px;
+}
+
+.mr20 {
+	margin-right: 20px;
+}
+
+.wp100 {
+	width: 100%;
+}
+
+.gray {
+	color: #ccc;
+}
+
+.pt5 {
+	padding-top: 5px;
+}
+
+.pb5 {
+	padding-bottom: 5px;
+}
+
+.w60 {
+	width: 60px;
+}
+
+.pt15 {
+	padding-top: 15px;
+}
+
+.pb15 {
+	padding-bottom: 15px;
+}
+
+.pt7 {
+	padding-top: 7px;
+}
+
+.pb7 {
+	padding-bottom: 7px;
+}
+
+.lh32 {
+	line-height: 36px;
+}
+
+.h32 {
+	height: 36px;
+}
+
+.mt30 {
+	margin-top: 30px;
+}
+
+.radius10 {
+	border-radius: 40px;
+}
+
+.pr10 {
+	padding-right: 10px;
+}
+
+.pl10 {
+	padding-left: 10px;
+}
+
+.left0 {
+	left: 0;
+}
+
+.pt40 {
+	padding-top: 40px;
+}
+
+.borderblue {
+	border: 3px solid #8bd8ff;
+}
+
+.w50 {
+	width: 50px;
+}
+
+.dgray {
+	color: #999999;
+}
+
+.pb100 {
+	padding-bottom: 70px;
+}
+
+.zindex100 {
+	z-index: 100;
+}
+
+.vm {
+	vertical-align: middle;
+}
+
+.mr {
+	margin-right: 10px;
+}
+
+.fr {
+	float: right;
+}
+
+.lh20 {
+	line-height: 20px;
+}
+
+.bdc {
+	border: 1px solid #ccc;
+}
+
+.pd2 {
+	padding: 2px;
+}
+
+.translate {
+	transform: rotate(-90deg);
+}
+
+.dn {
+	display: none;
+}
+
+.pt7 {
+	padding-top: 7px;
+}
+
+.pb7 {
+	padding-bottom: 7px;
+}
+
+.radius5 {
+	border-radius: 5px;
+}
+
+.overFont {
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	-ms-text-overflow: ellipsis;
+	-o-text-overflow: ellipsis;
+}
+
+.wp68 {
+	width: 68%;
+}
+
+.pl5 {
+	padding-left: 5px;
+}
+
+.pr5 {
+	padding-right: 5px;
+}
+
+.bottom0 {
+	bottom: 0;
+}
+
+.pl30 {
+	padding-left: 30px;
+}
+
+.pr30 {
+	padding-right: 30px;
+}
+
+.radiuslr7 {
+	border-bottom-right-radius: 7px;
+	border-top-left-radius: 7px;
+}
+
+.mr10 {
+	margin-right: 10px;
+}
+
+.ml5 {
+	margin-left: 5px;
+}
+
+.mr5 {
+	margin-right: 5px;
+}
+
+.bdt5 {
+	border-top: 5px solid #eee;
+}
+
+.w25 {
+	width: 25px;
+}
+
+.h25 {
+	line-height: 25px;
+}
+
+.mb10 {
+	margin-bottom: 10px;
+}
+
+.bdbc {
+	border-bottom: 1px solid #ccc;
+}
+
+.bde {
+	border: 1px solid #d8d8d8;
+}
+
+.pb200 {
+	padding-bottom: 200px;
+}
+
+/*滑动验证码*/
+.verify-bar-area {
+	position: relative;
+	background: #FFFFFF;
+	text-align: center;
+	-webkit-box-sizing: content-box;
+	-moz-box-sizing: content-box;
+	box-sizing: content-box;
+	border: 1px solid #ddd;
+}
+
+.verify-bar-area .verify-move-block {
+	position: absolute;
+	top: 0px;
+	left: 0;
+	background: #fff;
+	cursor: pointer;
+	-webkit-box-sizing: content-box;
+	-moz-box-sizing: content-box;
+	box-sizing: content-box;
+	box-shadow: 0 0 2px #888888;
+	-webkit-border-radius: 1px;
+}
+
+.verify-bar-area .verify-move-block:hover {
+	background-color: #337ab7;
+	color: #FFFFFF;
+}
+
+.verify-bar-area .verify-left-bar {
+	position: absolute;
+	top: -1px;
+	left: -1px;
+	background: #f0fff0;
+	cursor: pointer;
+	-webkit-box-sizing: content-box;
+	-moz-box-sizing: content-box;
+	box-sizing: content-box;
+	border: 1px solid #ddd;
+}
+
+.verify-img-panel {
+	margin: 0;
+	-webkit-box-sizing: content-box;
+	-moz-box-sizing: content-box;
+	box-sizing: content-box;
+	border: 1px solid #ddd;
+	border-radius: 3px;
+	position: relative;
+}
+
+.verify-img-panel .verify-refresh {
+	width: 25px;
+	height: 25px;
+	text-align: center;
+	padding: 5px;
+	cursor: pointer;
+	position: absolute;
+	top: 0;
+	right: 0;
+	z-index: 2;
+}
+
+.verify-img-panel .icon-refresh {
+	font-size: 20px;
+	color: #fff;
+}
+
+.verify-img-panel .verify-gap {
+	background-color: #fff;
+	position: relative;
+	z-index: 2;
+	border: 1px solid #fff;
+}
+
+.verify-bar-area .verify-move-block .verify-sub-block {
+	position: absolute;
+	text-align: center;
+	z-index: 3;
+	border: 1px solid #fff;
+}
+
+.verify-bar-area .verify-move-block .verify-icon {
+	font-size: 18px;
+}
+
+.verify-bar-area .verify-msg {
+	z-index: 3;
+}
+
+.mt130 {
+	margin-top: 130px;
+}
+
+.ml30 {
+	margin-left: 30px;
+}
+
+.h42 {
+	height: 42px;
+	line-height: 49px;
+}
+
+.labelblue {
+	color: #3695fe;
+	background: #cde2f9;
+	border-radius: 3px;
+}
+
+.pd3 {
+	padding: 3px;
+}
+
+.mt100 {
+	margin-top: 100px;
+}
+
+.lgraybg {
+	background: #eee;
+}
+
+/* 上传照片 */
+/* 第一部分，通用样式 */
+.easy-uploader .cursor-select {
+	cursor: pointer;
+	user-select: none;
+}
+
+.easy-uploader .btn {
+	margin: 50px auto;
+	width: 70%;
+	border: 1px dotted #ccc;
+	text-align: center;
+	font-size: 12px;
+	border-radius: 3px;
+	cursor: pointer;
+	user-select: none;
+	padding: 80px 0;
+}
+
+.easy-uploader .primary {
+	color: #fff;
+	background-color: #409eff;
+	border: 0;
+}
+
+.easy-uploader .checkbox {
+	display: inline-block;
+	width: 16px;
+	height: 16px;
+	background-size: 16px 16px;
+}
+
+.easy-uploader .unchecked {
+	background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAB/klEQVQ4T5WTMWgTYRiG3++/2uKqEOlmwalWUaLk7prk7CLqKFScFDG56yIuFbdaRXCwOChY79qhXS04KCi4mLuE5EItCkJadHNodSkOLk1798oFEmopJfm27//+9/nfH75XsKcKlYyuxeomgGEQJwmhAKsEG7EWL8xn6+FuibSbOz9ODDTXUw8hvEegDEidwJdkrogzAEwCJhSf4nBzyju3sp3MWoDpTxf61rWthDxE8tacFb7d6yzpi4F5XYhZAdYG4/7c9FhppwWwffMxBHZftH365djyr/3E7TM7SA8KBr4CfOXmaw+kUM6kVazVAVzxrOrHg8TtWbGiX5ZIvRO1kxY7MOeE0F2reqobcfuO45vfCFbFCYwKydCzwsleAHZgPBMgLbZv/AXkarf2Ow7KxiVQFsXxjQ2qeNzL1Su9OCiURnOaxK+TL3wA+N7Nhy96ATi+cReQi2KXjSeIkfKs2u0eAYtQ/CkTNf04m/KZh5D1zNpaNxAnyAwTWinScL61SI5v3qegGPdHo/N6/fdBkEKYOaY1tWWQz12rNtMCjBPakcAMAQ4BtF0rfLMfZMLXr8Uis0L5vpmvZpcE0X9h2tpIPRJwsh0mxXglEqUEOCuEkYRJgJnNo3+mlkYazU6Ydr/mlEwDijeSOBMYASQScBVAg8IFLxcma9+pf7Er0M3JZjQlAAAAAElFTkSuQmCC);
+}
+
+.easy-uploader .checked {
+	background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABwUlEQVQ4T42Ty2sTYRTFf+dzQoqrFlToyo0IggtRRGc0KVIf6cJ/oGpwlcGFuvOBe9GNCoJSi2BtC/4HpW5kJjW6dJOFuCgIoigSBUFjzVyZtAnTR0i+3T33nvMd7kNseBdfHRjOu6EzOPabuX1gOwR/MBaaye+ZZyfe/chSlA3CODhvxkOJ4Y3Ca3EjEVenC7XZTr4rUImPXhPubg/iOthIbj0pvr2dgm2BShScllgchNypSbDSdPHNoi5/2JNvft61LBjtJ2BmPxHbhXIGH/OjX/eqEvmTkub7kuFby7PAW+Ee0tm03szOqRL7z4Uu9BFomGcB/ygJ3e/UGswpjP0l0LE2aPbJxBehQ92i1DYUEONZ8mreXiuMghhRWLO0vM2tnGwluReSDmP8MiVj4I4IHm1yaVQVRv4MUjljqw7NU1h+HpfcxNzBLcnp/9jslk00rPa3lR/Pec1JZ3raqz/tJq6Oced7od39JpHNd8eYgmHVL2FaGFTA0gHCRHuROqQwCq4j7gwkYtyYGqu11379MUV+GekBMNLrmIArU8Xa3KZj6gCXqsdHkqRVRkwYDMn4bqIus7pz3svHhaVGVvw/Gf+svZgLZgkAAAAASUVORK5CYII=);
+}
+
+
+/* 第二部分，分别样式 */
+.easy-uploader .btn-box {
+	display: flex;
+	align-items: center;
+}
+
+.easy-uploader .list {
+	list-style: none;
+}
+
+.easy-uploader .list-item {
+	box-sizing: border-box;
+	position: relative;
+	margin-top: 10px;
+	padding: 10px 10px 10px 60px;
+	background-color: #fff;
+	border: 1px solid #c0ccda;
+	border-radius: 6px;
+	overflow: hidden;
+	margin: 0 30px;
+}
+
+.easy-uploader .preview {
+	position: relative;
+	z-index: 1;
+	float: left;
+	vertical-align: middle;
+	width: 50px;
+	height: 50px;
+	margin-left: -60px;
+}
+
+.easy-uploader .preview-img {
+	max-width: 50px;
+	max-height: 50px;
+}
+
+.easy-uploader .info {
+	position: relative;
+	color: #606266;
+	margin-top: 12px;
+}
+
+.easy-uploader .filename {
+	margin-top: 20px;
+	line-height: 30px;
+	color: #606266;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	overflow: hidden;
+}
+
+.easy-uploader .progress-wrapper {
+	position: relative;
+	height: 2px;
+	background-color: #eee;
+}
+
+.easy-uploader .progressbar {
+	height: 100%;
+	background-color: #409eff;
+}
+
+.easy-uploader .progress-text {
+	position: absolute;
+	right: 0;
+	top: 0;
+	transform: translateY(-100%);
+	font-size: 14px;
+	line-height: 30px;
+	color: #606266;
+}
+
+.easy-uploader .delete-label {
+	box-sizing: border-box;
+	position: absolute;
+	right: -17px;
+	top: -7px;
+	z-index: 0;
+	padding-right: 12px;
+	width: 46px;
+	height: 26px;
+	text-align: center;
+	background-color: #13ce66;
+	transform: rotate(45deg);
+	box-shadow: 0 1px 1px #ccc;
+}
+
+.easy-uploader .delete-label i {
+	transform: rotate(-45deg);
+	margin-top: 10px;
+	margin-left: 10px;
+}
+
+.easy-uploader .delete-icon {
+	position: absolute;
+	margin-top: 12px;
+	font-size: 12px;
+	color: #fff;
+	text-align: center;
+	transform: rotate(-45deg);
+}
+
+.easy-uploader .select-icon {
+	position: absolute;
+	right: -30px;
+	top: 50%;
+	transform: translateY(-50%);
+}
+
+.overflowh {
+	overflow: hidden;
+}
+
+.f-grey {
+	color: #333;
+}
+
+.gbluebg {
+	background: url(../images/bg.png) no-repeat center;
+}
+
+.fl {
+	float: left;
+}
+
+.mt60 {
+	margin-top: 60px;
+}
+
+.pl20 {
+	padding-left: 20px;
+}
+
+.pr20 {
+	padding-right: 20px;
+}
+
+.pt15 {
+	padding-top: 15px;
+}
+
+.pb15 {
+	padding-bottom: 15px;
+}
+
+.bdr {
+	border: 1px solid #FF4854;
+	color: #FF4854;
+}
+
+.mr30 {
+	margin-right: 30px;
+}
+
+.mt20 {
+	margin-top: 20px;
+}
+
+.payTab>div>a {
+	background: #eee;
+
+}
+
+.payTab>div.current>a {
+	background: #FE5A6A;
+	color: #fff;
+}
+
+.bdl2r {
+	border-left: 4px solid #E74744;
+}
+
+.bdl2g {
+	border-left: 4px solid #77C78E;
+}
+
+.bdl2o {
+	border-left: 4px solid #FDBB59;
+}
+
+.pb50 {
+	padding-bottom: 40px;
+}
+
+.cardbg {
+	background: url(../images/cardbg.png) no-repeat center;
+	width: 90%;
+	margin:80px auto;
+	background-size: cover;
+}
+.cardbg>.lgraybg{
+	 width:70%;
+	 margin:10px auto;
+}
+
+@media screen and (min-width: 414px) {
+	.gbluebg {
+		background: url(../images/bg1.png) no-repeat center;
+	}
+.cardbg>.lgraybg{
+	 width:75%;
+	 margin:10px auto;
+}
+
+}
diff --git a/pluss-wap-page/src/main/resources/static/resources/images/0-rate.jpg b/pluss-wap-page/src/main/resources/static/resources/images/0-rate.jpg
new file mode 100644
index 0000000..21a5920
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/images/0-rate.jpg differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/images/1-rate.jpg b/pluss-wap-page/src/main/resources/static/resources/images/1-rate.jpg
new file mode 100644
index 0000000..228b09e
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/images/1-rate.jpg differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/images/2-rate.jpg b/pluss-wap-page/src/main/resources/static/resources/images/2-rate.jpg
new file mode 100644
index 0000000..8ca34cb
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/images/2-rate.jpg differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/images/3-rate-f.jpg b/pluss-wap-page/src/main/resources/static/resources/images/3-rate-f.jpg
new file mode 100644
index 0000000..4b2ab19
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/images/3-rate-f.jpg differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/images/3-rate-m.jpg b/pluss-wap-page/src/main/resources/static/resources/images/3-rate-m.jpg
new file mode 100644
index 0000000..2f24d18
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/images/3-rate-m.jpg differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/images/3-rate.jpg b/pluss-wap-page/src/main/resources/static/resources/images/3-rate.jpg
new file mode 100644
index 0000000..9701f8a
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/images/3-rate.jpg differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/images/4-rate.jpg b/pluss-wap-page/src/main/resources/static/resources/images/4-rate.jpg
new file mode 100644
index 0000000..735252e
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/images/4-rate.jpg differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/images/account_icon.2635004.png b/pluss-wap-page/src/main/resources/static/resources/images/account_icon.2635004.png
new file mode 100644
index 0000000..e2890ae
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/images/account_icon.2635004.png differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/images/act-tip.png b/pluss-wap-page/src/main/resources/static/resources/images/act-tip.png
new file mode 100644
index 0000000..0c70f2f
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/images/act-tip.png differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/images/acti1.png b/pluss-wap-page/src/main/resources/static/resources/images/acti1.png
new file mode 100644
index 0000000..1bdf015
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/images/acti1.png differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/images/acti2.png b/pluss-wap-page/src/main/resources/static/resources/images/acti2.png
new file mode 100644
index 0000000..3fd46d4
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/images/acti2.png differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/images/acti3.png b/pluss-wap-page/src/main/resources/static/resources/images/acti3.png
new file mode 100644
index 0000000..6017b82
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/images/acti3.png differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/images/acti4.png b/pluss-wap-page/src/main/resources/static/resources/images/acti4.png
new file mode 100644
index 0000000..ed5f7c8
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/images/acti4.png differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/images/address-icon.png b/pluss-wap-page/src/main/resources/static/resources/images/address-icon.png
new file mode 100644
index 0000000..68a20fd
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/images/address-icon.png differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/images/alipay-icon.png b/pluss-wap-page/src/main/resources/static/resources/images/alipay-icon.png
new file mode 100644
index 0000000..28f830e
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/images/alipay-icon.png differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/images/arrow-right-icon.png b/pluss-wap-page/src/main/resources/static/resources/images/arrow-right-icon.png
new file mode 100644
index 0000000..6c8642b
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/images/arrow-right-icon.png differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/images/bankcard.png b/pluss-wap-page/src/main/resources/static/resources/images/bankcard.png
new file mode 100644
index 0000000..06597c3
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/images/bankcard.png differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/images/bg.png b/pluss-wap-page/src/main/resources/static/resources/images/bg.png
new file mode 100644
index 0000000..57afa22
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/images/bg.png differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/images/bg1.png b/pluss-wap-page/src/main/resources/static/resources/images/bg1.png
new file mode 100644
index 0000000..de12e5c
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/images/bg1.png differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/images/bg_amt.png b/pluss-wap-page/src/main/resources/static/resources/images/bg_amt.png
new file mode 100644
index 0000000..90608bd
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/images/bg_amt.png differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/images/bg_error_msg.png b/pluss-wap-page/src/main/resources/static/resources/images/bg_error_msg.png
new file mode 100644
index 0000000..777d962
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/images/bg_error_msg.png differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/images/bg_logo.png b/pluss-wap-page/src/main/resources/static/resources/images/bg_logo.png
new file mode 100644
index 0000000..9ad8c12
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/images/bg_logo.png differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/images/card_bg.jpg b/pluss-wap-page/src/main/resources/static/resources/images/card_bg.jpg
new file mode 100644
index 0000000..0c6f373
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/images/card_bg.jpg differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/images/cardbg.png b/pluss-wap-page/src/main/resources/static/resources/images/cardbg.png
new file mode 100644
index 0000000..536864e
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/images/cardbg.png differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/images/case.png b/pluss-wap-page/src/main/resources/static/resources/images/case.png
new file mode 100644
index 0000000..b83f5f8
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/images/case.png differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/images/del.png b/pluss-wap-page/src/main/resources/static/resources/images/del.png
new file mode 100644
index 0000000..cd80dea
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/images/del.png differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/images/error.jpg b/pluss-wap-page/src/main/resources/static/resources/images/error.jpg
new file mode 100644
index 0000000..f48d9d3
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/images/error.jpg differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/images/error_img.png b/pluss-wap-page/src/main/resources/static/resources/images/error_img.png
new file mode 100644
index 0000000..d2b14b3
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/images/error_img.png differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/images/example.jpg b/pluss-wap-page/src/main/resources/static/resources/images/example.jpg
new file mode 100644
index 0000000..3c8aa9a
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/images/example.jpg differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/images/icon-add.png b/pluss-wap-page/src/main/resources/static/resources/images/icon-add.png
new file mode 100644
index 0000000..5b8403d
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/images/icon-add.png differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/images/icon-del-1.png b/pluss-wap-page/src/main/resources/static/resources/images/icon-del-1.png
new file mode 100644
index 0000000..a2b710c
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/images/icon-del-1.png differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/images/icon-del.png b/pluss-wap-page/src/main/resources/static/resources/images/icon-del.png
new file mode 100644
index 0000000..e305215
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/images/icon-del.png differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/images/icon-save-1.png b/pluss-wap-page/src/main/resources/static/resources/images/icon-save-1.png
new file mode 100644
index 0000000..4b80577
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/images/icon-save-1.png differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/images/icon-save.png b/pluss-wap-page/src/main/resources/static/resources/images/icon-save.png
new file mode 100644
index 0000000..bb2573b
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/images/icon-save.png differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/images/icon1.png b/pluss-wap-page/src/main/resources/static/resources/images/icon1.png
new file mode 100644
index 0000000..1df660f
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/images/icon1.png differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/images/icon2.png b/pluss-wap-page/src/main/resources/static/resources/images/icon2.png
new file mode 100644
index 0000000..0ad7c62
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/images/icon2.png differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/images/icon3.png b/pluss-wap-page/src/main/resources/static/resources/images/icon3.png
new file mode 100644
index 0000000..3d60cff
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/images/icon3.png differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/images/jft-rmb-icon.png b/pluss-wap-page/src/main/resources/static/resources/images/jft-rmb-icon.png
new file mode 100644
index 0000000..a62caaa
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/images/jft-rmb-icon.png differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/images/jft-success-icon.png b/pluss-wap-page/src/main/resources/static/resources/images/jft-success-icon.png
new file mode 100644
index 0000000..d99804a
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/images/jft-success-icon.png differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/images/jft-tips-icon.png b/pluss-wap-page/src/main/resources/static/resources/images/jft-tips-icon.png
new file mode 100644
index 0000000..e74d5f0
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/images/jft-tips-icon.png differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/images/jft-wallet-icon.png b/pluss-wap-page/src/main/resources/static/resources/images/jft-wallet-icon.png
new file mode 100644
index 0000000..f4ee79b
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/images/jft-wallet-icon.png differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/images/keyboard.png b/pluss-wap-page/src/main/resources/static/resources/images/keyboard.png
new file mode 100644
index 0000000..8b870f5
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/images/keyboard.png differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/images/loading-2.gif b/pluss-wap-page/src/main/resources/static/resources/images/loading-2.gif
new file mode 100644
index 0000000..5bb90fd
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/images/loading-2.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/images/loading.gif b/pluss-wap-page/src/main/resources/static/resources/images/loading.gif
new file mode 100644
index 0000000..c69e937
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/images/loading.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/images/no-goods.png b/pluss-wap-page/src/main/resources/static/resources/images/no-goods.png
new file mode 100644
index 0000000..25aab16
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/images/no-goods.png differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/images/pwd_icon.6459233.png b/pluss-wap-page/src/main/resources/static/resources/images/pwd_icon.6459233.png
new file mode 100644
index 0000000..8357cc5
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/images/pwd_icon.6459233.png differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/images/sim_card.png b/pluss-wap-page/src/main/resources/static/resources/images/sim_card.png
new file mode 100644
index 0000000..920e2f0
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/images/sim_card.png differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/images/title.png b/pluss-wap-page/src/main/resources/static/resources/images/title.png
new file mode 100644
index 0000000..a8dcb4d
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/images/title.png differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/images/update-icon.png b/pluss-wap-page/src/main/resources/static/resources/images/update-icon.png
new file mode 100644
index 0000000..a4c6434
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/images/update-icon.png differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/images/upload-icon.png b/pluss-wap-page/src/main/resources/static/resources/images/upload-icon.png
new file mode 100644
index 0000000..b38e776
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/images/upload-icon.png differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/images/upload-icon1.png b/pluss-wap-page/src/main/resources/static/resources/images/upload-icon1.png
new file mode 100644
index 0000000..550fec1
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/images/upload-icon1.png differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/images/vip-card-logo.png b/pluss-wap-page/src/main/resources/static/resources/images/vip-card-logo.png
new file mode 100644
index 0000000..c61d9af
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/images/vip-card-logo.png differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/images/weixin.png b/pluss-wap-page/src/main/resources/static/resources/images/weixin.png
new file mode 100644
index 0000000..d779c8a
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/images/weixin.png differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/images/wollet.png b/pluss-wap-page/src/main/resources/static/resources/images/wollet.png
new file mode 100644
index 0000000..79a8c6d
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/images/wollet.png differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/images/wxpay-icon.png b/pluss-wap-page/src/main/resources/static/resources/images/wxpay-icon.png
new file mode 100644
index 0000000..b2c1829
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/images/wxpay-icon.png differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/My97DatePicker/My97DatePicker.htm b/pluss-wap-page/src/main/resources/static/resources/js/My97DatePicker/My97DatePicker.htm
new file mode 100644
index 0000000..5a0b5b0
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/My97DatePicker/My97DatePicker.htm
@@ -0,0 +1,49 @@
+<html>

+<head>

+<meta http-equiv="content-type" content="text/xml; charset=utf-8" />

+<title>My97DatePicker</title>

+<script type="text/javascript" src="config.js"></script>

+<script>

+if(parent==window)

+	location.href = 'http://www.my97.net';

+var $d, $dp, $pdp = parent.$dp, $dt, $tdt, $sdt, $IE=$pdp.ie, $FF = $pdp.ff,$OPERA=$pdp.opera, $ny, $cMark = false;

+if ($pdp.eCont) {

+	$dp = {};

+	for (var p in $pdp) {

+		$dp[p] = $pdp[p];

+	}

+}

+else

+	$dp = $pdp;

+	

+$dp.getLangIndex = function(name){

+	var arr = langList;

+	for (var i = 0; i < arr.length; i++) {

+		if (arr[i].name == name) {

+			return i;

+		}

+	}

+	return -1;

+}

+

+$dp.getLang = function(name){

+	var index = $dp.getLangIndex(name);

+	if (index == -1) {

+		index = 0;

+	}

+	return langList[index];

+}

+ 

+$dp.realLang = $dp.getLang($dp.lang);

+document.write("<script src='lang/" + $dp.realLang.name + ".js' charset='" + $dp.realLang.charset + "'><\/script>");

+

+for (var i = 0; i < skinList.length; i++) {

+    document.write('<link rel="stylesheet" type="text/css" href="skin/' + skinList[i].name + '/datepicker.css" title="' + skinList[i].name + '" charset="' + skinList[i].charset + '" disabled="true"/>');

+}

+</script>

+<script type="text/javascript" src="calendar.js"></script>

+</head>

+<body leftmargin="0" topmargin="0" onload="$c.autoSize()" tabindex=0>

+</body>

+</html>

+<script>new My97DP();</script>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/My97DatePicker/WdatePicker.js b/pluss-wap-page/src/main/resources/static/resources/js/My97DatePicker/WdatePicker.js
new file mode 100644
index 0000000..d51a9ca
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/My97DatePicker/WdatePicker.js
@@ -0,0 +1,523 @@
+/*
+ * My97 DatePicker 4.72 Release
+ * License: http://www.my97.net/dp/license.asp
+ */
+var $dp, WdatePicker;
+(function() {
+	var _ = {
+		$wdate : true,
+		$dpPath : "",
+		$crossFrame : true,
+		doubleCalendar : false,
+		enableKeyboard : true,
+		enableInputMask : true,
+		autoUpdateOnChanged : null,
+		whichDayIsfirstWeek : 4,
+		position : {},
+		lang : "auto",
+		skin : "twoer",
+		dateFmt : "yyyy-MM-dd",
+		realDateFmt : "yyyy-MM-dd",
+		realTimeFmt : "HH:mm:ss",
+		realFullFmt : "%Date %Time",
+		minDate : "1900-01-01 00:00:00",
+		maxDate : "2099-12-31 23:59:59",
+		startDate : "",
+		alwaysUseStartDate : false,
+		yearOffset : 1911,
+		firstDayOfWeek : 0,
+		isShowWeek : false,
+		highLineWeekDay : true,
+		isShowClear : true,
+		isShowToday : true,
+		isShowOK : true,
+		isShowOthers : true,
+		readOnly : false,
+		errDealMode : 0,
+		autoPickDate : null,
+		qsEnabled : true,
+		autoShowQS : false,
+
+		specialDates : null,
+		specialDays : null,
+		disabledDates : null,
+		disabledDays : null,
+		opposite : false,
+		onpicking : null,
+		onpicked : null,
+		onclearing : null,
+		oncleared : null,
+		ychanging : null,
+		ychanged : null,
+		Mchanging : null,
+		Mchanged : null,
+		dchanging : null,
+		dchanged : null,
+		Hchanging : null,
+		Hchanged : null,
+		mchanging : null,
+		mchanged : null,
+		schanging : null,
+		schanged : null,
+		eCont : null,
+		vel : null,
+		errMsg : "",
+		quickSel : [],
+		has : {}
+	};
+	WdatePicker = U;
+	var X = window, O = "document", J = "documentElement", C = "getElementsByTagName", V, A, T, I, b;
+	switch (navigator.appName) {
+	case "Microsoft Internet Explorer":
+		T = true;
+		break;
+	case "Opera":
+		b = true;
+		break;
+	default:
+		I = true;
+		break
+	}
+	A = L();
+	if (_.$wdate)
+		M(A + "skin/WdatePicker.css");
+	V = X;
+	if (_.$crossFrame) {
+		try {
+			while (V.parent && V.parent[O] != V[O]
+					&& V.parent[O][C]("frameset").length == 0)
+				V = V.parent
+		} catch (P) {
+		}
+	}
+	if (!V.$dp)
+		V.$dp = {
+			ff : I,
+			ie : T,
+			opera : b,
+			el : null,
+			win : X,
+			status : 0,
+			defMinDate : _.minDate,
+			defMaxDate : _.maxDate,
+			flatCfgs : []
+		};
+	B();
+	if ($dp.status == 0)
+		Z(X, function() {
+			U(null, true)
+		});
+	if (!X[O].docMD) {
+		E(X[O], "onmousedown", D);
+		X[O].docMD = true
+	}
+	if (!V[O].docMD) {
+		E(V[O], "onmousedown", D);
+		V[O].docMD = true
+	}
+	E(X, "onunload", function() {
+		if ($dp.dd)
+			Q($dp.dd, "none")
+	});
+	function B() {
+		V.$dp = V.$dp || {};
+		obj = {
+			$ : function($) {
+				return (typeof $ == "string") ? X[O].getElementById($) : $
+			},
+			$D : function($, _) {
+				return this.$DV(this.$($).value, _)
+			},
+			$DV : function(_, $) {
+				if (_ != "") {
+					this.dt = $dp.cal.splitDate(_, $dp.cal.dateFmt);
+					if ($)
+						for ( var B in $)
+							if (this.dt[B] === undefined)
+								this.errMsg = "invalid property:" + B;
+							else {
+								this.dt[B] += $[B];
+								if (B == "M") {
+									var C = $["M"] > 0 ? 1 : 0, A = new Date(
+											this.dt["y"], this.dt["M"], 0)
+											.getDate();
+									this.dt["d"] = Math
+											.min(A + C, this.dt["d"])
+								}
+							}
+					if (this.dt.refresh())
+						return this.dt
+				}
+				return ""
+			},
+			show : function() {
+				var A = V[O].getElementsByTagName("div"), $ = 100000;
+				for ( var B = 0; B < A.length; B++) {
+					var _ = parseInt(A[B].style.zIndex);
+					if (_ > $)
+						$ = _
+				}
+				this.dd.style.zIndex = $ + 2;
+				Q(this.dd, "block")
+			},
+			hide : function() {
+				Q(this.dd, "none")
+			},
+			attachEvent : E
+		};
+		for ( var $ in obj)
+			V.$dp[$] = obj[$];
+		$dp = V.$dp;
+		$dp.dd = V[O].getElementById("_my97DP")
+	}
+	function E(A, $, _) {
+		if (T)
+			A.attachEvent($, _);
+		else if (_) {
+			var B = $.replace(/on/, "");
+			_._ieEmuEventHandler = function($) {
+				return _($)
+			};
+			A.addEventListener(B, _._ieEmuEventHandler, false)
+		}
+	}
+	function L() {
+		var _, A, $ = X[O][C]("script");
+		for ( var B = 0; B < $.length; B++) {
+			_ = $[B].src.substring(0, $[B].src.toLowerCase().indexOf(
+					"wdatepicker.js"));
+			A = _.lastIndexOf("/");
+			if (A > 0)
+				_ = _.substring(0, A + 1);
+			if (_)
+				break
+		}
+		return _
+	}
+	function F(F) {
+		var E, C;
+		if (F.substring(0, 1) != "/" && F.indexOf("://") == -1) {
+			E = V.location.href;
+			C = location.href;
+			if (E.indexOf("?") > -1)
+				E = E.substring(0, E.indexOf("?"));
+			if (C.indexOf("?") > -1)
+				C = C.substring(0, C.indexOf("?"));
+			var G, I, $ = "", D = "", A = "", J, H, B = "";
+			for (J = 0; J < Math.max(E.length, C.length); J++) {
+				G = E.charAt(J).toLowerCase();
+				I = C.charAt(J).toLowerCase();
+				if (G == I) {
+					if (G == "/")
+						H = J
+				} else {
+					$ = E.substring(H + 1, E.length);
+					$ = $.substring(0, $.lastIndexOf("/"));
+					D = C.substring(H + 1, C.length);
+					D = D.substring(0, D.lastIndexOf("/"));
+					break
+				}
+			}
+			if ($ != "")
+				for (J = 0; J < $.split("/").length; J++)
+					B += "../";
+			if (D != "")
+				B += D + "/";
+			F = E.substring(0, E.lastIndexOf("/") + 1) + B + F
+		}
+		_.$dpPath = F
+	}
+	function M(A, $, B) {
+		var D = X[O][C]("HEAD").item(0), _ = X[O].createElement("link");
+		if (D) {
+			_.href = A;
+			_.rel = "stylesheet";
+			_.type = "text/css";
+			if ($)
+				_.title = $;
+			if (B)
+				_.charset = B;
+			D.appendChild(_)
+		}
+	}
+	function Z($, _) {
+		E($, "onload", _)
+	}
+	function G($) {
+		$ = $ || V;
+		var A = 0, _ = 0;
+		while ($ != V) {
+			var D = $.parent[O][C]("iframe");
+			for ( var F = 0; F < D.length; F++) {
+				try {
+					if (D[F].contentWindow == $) {
+						var E = W(D[F]);
+						A += E.left;
+						_ += E.top;
+						break
+					}
+				} catch (B) {
+				}
+			}
+			$ = $.parent
+		}
+		return {
+			"leftM" : A,
+			"topM" : _
+		}
+	}
+	function W(F) {
+		if (F.getBoundingClientRect)
+			return F.getBoundingClientRect();
+		else {
+			var A = {
+				ROOT_TAG : /^body|html$/i,
+				OP_SCROLL : /^(?:inline|table-row)$/i
+			}, E = false, H = null, _ = F.offsetTop, G = F.offsetLeft, D = F.offsetWidth, B = F.offsetHeight, C = F.offsetParent;
+			if (C != F)
+				while (C) {
+					G += C.offsetLeft;
+					_ += C.offsetTop;
+					if (S(C, "position").toLowerCase() == "fixed")
+						E = true;
+					else if (C.tagName.toLowerCase() == "body")
+						H = C.ownerDocument.defaultView;
+					C = C.offsetParent
+				}
+			C = F.parentNode;
+			while (C.tagName && !A.ROOT_TAG.test(C.tagName)) {
+				if (C.scrollTop || C.scrollLeft)
+					if (!A.OP_SCROLL.test(Q(C)))
+						if (!b || C.style.overflow !== "visible") {
+							G -= C.scrollLeft;
+							_ -= C.scrollTop
+						}
+				C = C.parentNode
+			}
+			if (!E) {
+				var $ = a(H);
+				G -= $.left;
+				_ -= $.top
+			}
+			D += G;
+			B += _;
+			return {
+				"left" : G,
+				"top" : _,
+				"right" : D,
+				"bottom" : B
+			}
+		}
+	}
+	function N($) {
+		$ = $ || V;
+		var B = $[O], A = ($.innerWidth) ? $.innerWidth
+				: (B[J] && B[J].clientWidth) ? B[J].clientWidth
+						: B.body.offsetWidth, _ = ($.innerHeight) ? $.innerHeight
+				: (B[J] && B[J].clientHeight) ? B[J].clientHeight
+						: B.body.offsetHeight;
+		return {
+			"width" : A,
+			"height" : _
+		}
+	}
+	function a($) {
+		$ = $ || V;
+		var B = $[O], A = B[J], _ = B.body;
+		B = (A && A.scrollTop != null && (A.scrollTop > _.scrollTop || A.scrollLeft > _.scrollLeft)) ? A
+				: _;
+		return {
+			"top" : B.scrollTop,
+			"left" : B.scrollLeft
+		}
+	}
+	function D($) {
+		var _ = $ ? ($.srcElement || $.target) : null;
+		try {
+			if ($dp.cal && !$dp.eCont && $dp.dd && _ != $dp.el
+					&& $dp.dd.style.display == "block")
+				$dp.cal.close()
+		} catch ($) {
+		}
+	}
+	function Y() {
+		$dp.status = 2;
+		H()
+	}
+	function H() {
+		if ($dp.flatCfgs.length > 0) {
+			var $ = $dp.flatCfgs.shift();
+			$.el = {
+				innerHTML : ""
+			};
+			$.autoPickDate = true;
+			$.qsEnabled = false;
+			K($)
+		}
+	}
+	var R, $;
+	function U(J, C) {
+		$dp.win = X;
+		B();
+		J = J || {};
+		if (C) {
+			if (!G()) {
+				$ = $ || setInterval(function() {
+					if (V[O].readyState == "complete")
+						clearInterval($);
+					U(null, true)
+				}, 50);
+				return
+			}
+			if ($dp.status == 0) {
+				$dp.status = 1;
+				K({
+					el : {
+						innerHTML : ""
+					}
+				}, true)
+			} else
+				return
+		} else if (J.eCont) {
+			J.eCont = $dp.$(J.eCont);
+			$dp.flatCfgs.push(J);
+			if ($dp.status == 2)
+				H()
+		} else {
+			if ($dp.status == 0) {
+				U(null, true);
+				return
+			}
+			if ($dp.status != 2)
+				return;
+			var F = D();
+			if (F) {
+				$dp.srcEl = F.srcElement || F.target;
+				F.cancelBubble = true
+			}
+			$dp.el = J.el = $dp.$(J.el || $dp.srcEl);
+			if (!$dp.el
+					|| $dp.el["My97Mark"] === true
+					|| $dp.el.disabled
+					|| ($dp.el == $dp.el && Q($dp.dd) != "none" && $dp.dd.style.left != "-1970px")) {
+				$dp.el["My97Mark"] = false;
+				return
+			}
+			K(J);
+			if (F && $dp.el.nodeType == 1 && $dp.el["My97Mark"] === undefined) {
+				$dp.el["My97Mark"] = false;
+				var _, A;
+				if (F.type == "focus") {
+					_ = "onclick";
+					A = "onfocus"
+				} else {
+					_ = "onfocus";
+					A = "onclick"
+				}
+				E($dp.el, _, $dp.el[A])
+			}
+		}
+		function G() {
+			if (T && V != X && V[O].readyState != "complete")
+				return false;
+			return true
+		}
+		function D() {
+			if (I) {
+				func = D.caller;
+				while (func != null) {
+					var $ = func.arguments[0];
+					if ($ && ($ + "").indexOf("Event") >= 0)
+						return $;
+					func = func.caller
+				}
+				return null
+			}
+			return event
+		}
+	}
+	function S(_, $) {
+		return _.currentStyle ? _.currentStyle[$] : document.defaultView
+				.getComputedStyle(_, false)[$]
+	}
+	function Q(_, $) {
+		if (_)
+			if ($ != null)
+				_.style.display = $;
+			else
+				return S(_, "display")
+	}
+	function K(H, $) {
+		for ( var D in _)
+			if (D.substring(0, 1) != "$")
+				$dp[D] = _[D];
+		for (D in H)
+			if ($dp[D] !== undefined)
+				$dp[D] = H[D];
+		var E = $dp.el ? $dp.el.nodeName : "INPUT";
+		if ($ || $dp.eCont
+				|| new RegExp(/input|textarea|div|span|p|a/ig).test(E))
+			$dp.elProp = E == "INPUT" ? "value" : "innerHTML";
+		else
+			return;
+		if ($dp.lang == "auto")
+			$dp.lang = T ? navigator.browserLanguage.toLowerCase()
+					: navigator.language.toLowerCase();
+		if (!$dp.dd
+				|| $dp.eCont
+				|| ($dp.lang && $dp.realLang && $dp.realLang.name != $dp.lang
+						&& $dp.getLangIndex && $dp.getLangIndex($dp.lang) >= 0)) {
+			if ($dp.dd && !$dp.eCont)
+				V[O].body.removeChild($dp.dd);
+			if (_.$dpPath == "")
+				F(A);
+			var B = "<iframe style=\"width:1px;height:1px\" src=\""
+					+ _.$dpPath
+					+ "My97DatePicker.htm\" frameborder=\"0\" border=\"0\" scrolling=\"no\"></iframe>";
+			if ($dp.eCont) {
+				$dp.eCont.innerHTML = B;
+				Z($dp.eCont.childNodes[0], Y)
+			} else {
+				$dp.dd = V[O].createElement("DIV");
+				$dp.dd.id = "_my97DP";
+				$dp.dd.style.cssText = "position:absolute";
+				$dp.dd.innerHTML = B;
+				V[O].body.appendChild($dp.dd);
+				Z($dp.dd.childNodes[0], Y);
+				if ($)
+					$dp.dd.style.left = $dp.dd.style.top = "-1970px";
+				else {
+					$dp.show();
+					C()
+				}
+			}
+		} else if ($dp.cal) {
+			$dp.show();
+			$dp.cal.init();
+			if (!$dp.eCont)
+				C()
+		}
+		function C() {
+			var F = $dp.position.left, B = $dp.position.top, C = $dp.el;
+			if (C != $dp.srcEl && (Q(C) == "none" || C.type == "hidden"))
+				C = $dp.srcEl;
+			var H = W(C), $ = G(X), D = N(V), A = a(V), E = $dp.dd.offsetHeight, _ = $dp.dd.offsetWidth;
+			if (isNaN(B)) {
+				if (B == "above"
+						|| (B != "under" && (($.topM + H.bottom + E > D.height) && ($.topM
+								+ H.top - E > 0))))
+					B = A.top + $.topM + H.top - E - 2;
+				else
+					B = A.top + $.topM + Math.min(H.bottom, D.height - E) + 2
+			} else
+				B += A.top + $.topM;
+			if (isNaN(F))
+				F = A.left + Math.min($.leftM + H.left, D.width - _ - 5)
+						- (T ? 2 : 0);
+			else
+				F += A.left + $.leftM;
+			$dp.dd.style.top = B + "px";
+			$dp.dd.style.left = F + "px"
+		}
+	}
+})()
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/My97DatePicker/calendar.js b/pluss-wap-page/src/main/resources/static/resources/js/My97DatePicker/calendar.js
new file mode 100644
index 0000000..46cc248
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/My97DatePicker/calendar.js
@@ -0,0 +1,5 @@
+/*
+ * My97 DatePicker 4.72 Release
+ * License: http://www.my97.net/dp/license.asp
+ */
+eval(function(p,a,c,k,e,d){e=function(c){return(c<a?"":e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)d[e(c)]=k[c]||e(c);k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1;};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p;}('o $c;k($5u){5Q.2X.7n("6G",l($){k(!$)h.25();t $});5Q.2X.7e("6w",l(){o $=h.6t;3i($.5M!=1)$=$.7g;t $});7f.2X.2I=l($,b){o A=$.1l(/6p/,"");b.5R=l($){6L.1Y=$;t b()};h.7t(A,b.5R,1m)}}l 5H(){$c=h;h.2Y=[];$d=1Q.7q("x");$d.1d="4d";$d.1L="<x 1D=6Y><x Y=\\"3H 6W\\"><a 3W=\\"###\\"></a></x><x Y=\\"3H 76\\"><a 3W=\\"###\\"></a></x><x 1c=\\"3g:2v\\"><x Y=\\"33 7a\\"></x><1v Y=3M></x><x 1c=\\"3g:2v\\"><x Y=\\"33 81\\"></x><1v Y=3M></x><x Y=\\"3H 83\\"><a 3W=\\"###\\"></a></x><x Y=\\"3H 84\\"><a 3W=\\"###\\"></a></x><x 1c=\\"3g:5i\\"></x></x><x 1c=\\"86:85;7B:6A\\"></x><x></x><x 1D=7x><x Y=\\"33 7A\\"></x><x Y=\\"33 7M\\"></x><x Y=\\"33 7P\\"></x><1x 2o=0 2m=0 2u=0><1j><18 7J=2><4h 1D=7L></4h>&4B;<1v Y=7o 4b=2><1v 1g=\\":\\" Y=5P 5N><1v Y=5O 4b=2><1v 1g=\\":\\" Y=5P 5N><1v Y=5O 4b=2></18><18><1O 1D=7I></1O></18></1j><1j><18><1O 1D=7Q></1O></18></1j></1x></x><x 1D=7O></x><x 1D=7N><1v Y=4e 1D=7G 3o=1O><1v Y=4e 1D=7z 3o=1O><1v Y=4e 1D=7E 3o=1O></x>";6M($d,l(){3t()});A();$f.1W=[1Q,$d.1M,$d.1t,$d.2V,$d.3r,$d.3I,$d.2S,$d.28,$d.1U];1b(o B=0;B<$f.1W.u;B++){o b=$f.1W[B];b.3q=B==$f.1W.u-1?$f.1W[1]:$f.1W[B+1];$f.2I(b,"4c",4R)}h.5F();$();4Q("y,M,H,m,s");$d.5S.1q=l(){4Z(1)};$d.5T.1q=l(){4Z(-1)};$d.4i.1q=l(){k($d.1E.1c.2h!="6K"){$c.4p();3w($d.1E)}q 1n($d.1E)};1Q.6N.4q($d);l A(){o b=$("a");1r=$("x"),1I=$("1v"),4g=$("1O"),5G=$("4h");$d.3y=b[0];$d.3V=b[1];$d.42=b[3];$d.3Y=b[2];$d.3K=1r[9];$d.1M=1I[0];$d.1t=1I[1];$d.4k=1r[0];$d.3T=1r[4];$d.2J=1r[6];$d.1E=1r[10];$d.2T=1r[11];$d.2H=1r[12];$d.6R=1r[13];$d.6Q=1r[14];$d.6O=1r[15];$d.4i=1r[16];$d.3z=1r[17];$d.2V=1I[2];$d.3r=1I[4];$d.3I=1I[6];$d.2S=1I[7];$d.28=1I[8];$d.1U=1I[9];$d.5S=4g[0];$d.5T=4g[1];$d.5L=5G[0];l $($){t $d.4o($)}}l $(){$d.3y.1q=l(){$1P=$1P<=0?$1P-1:-1;k($1P%5==0){$d.1t.2d();t}$d.1t.1g=$n.y-1;$d.1t.2n()};$d.3V.1q=l(){$n.2C("M",-1);$d.1M.2n()};$d.42.1q=l(){$n.2C("M",1);$d.1M.2n()};$d.3Y.1q=l(){$1P=$1P>=0?$1P+1:1;k($1P%5==0){$d.1t.2d();t}$d.1t.1g=$n.y+1;$d.1t.2n()}}}5H.2X={5F:l(){$1P=0;$f.5K=h;k($f.3N&&$f.z.3N!=1i){$f.z.3N=19;$f.z.4w()}$();h.5j();$n=h.6f=1a 1C();$1B=1a 1C();$1w=h.2w=1a 1C();h.1y=h.34($f.1y);h.2P=$f.2P==1i?($f.Z.2a&&$f.Z.2a?1m:19):$f.2P;$f.2z=$f.2z==1i?($f.4j&&$f.Z.d?1m:19):$f.2z;h.49=h.3f("8a");h.68=h.3f("8b");h.64=h.3f("89");h.5C=h.3f("87");h.1X=h.3P($f.1X,$f.1X!=$f.5D?$f.1S:$f.3j,$f.5D);h.1Z=h.3P($f.1Z,$f.1Z!=$f.5E?$f.1S:$f.3j,$f.5E);k(h.1X.2r(h.1Z)>0)$f.4f=$1k.7V;k(h.1R()){h.5J();h.3O=$f.z[$f.1z]}q h.3m(1m,2);4u($n);$d.5L.1L=$1k.7R;$d.2S.1g=$1k.7S;$d.28.1g=$1k.7Z;$d.1U.1g=$1k.80;$d.1U.1N=!$c.1u($1w);h.5c();h.6l();k($f.4f)7Y($f.4f);h.4C();k($f.z.5M==1&&$f.z["4m"]===4Y){$f.2I($f.z,"4c",4R);$f.2I($f.z,"2n",l(){k($f.1K.1c.2h=="2E"){$c.3Q();k($f.5K.3O!=$f.z[$f.1z]&&$f.z.75)4I($f.z,"73")}})}$c.1f=$f.z;3t();l $(){o b,$;1b(b=0;($=1Q.4o("71")[b]);b++)k($["72"].1o("1c")!=-1&&$["5I"]){$.1N=19;k($["5I"]==$f.79)$.1N=1m}}},5J:l(){o b=h.2L();k(b!=0){o $;k(b>0)$=h.1Z;q $=h.1X;k($f.Z.3u){$n.y=$.y;$n.M=$.M;$n.d=$.d}k($f.Z.2a){$n.H=$.H;$n.m=$.m;$n.s=$.s}}},3b:l(J,C,Q,E,B,G,F,K,L){o $;k(J&&J.1R)$=J;q{$=1a 1C();k(J!=""){C=C||$f.1y;o H,P=0,O,A=/3a|2l|36|y|2A|2Z|3U|M|1K|d|%2k|4J|H|4K|m|4G|s|3c|D|4H|W|w/g,b=C.35(A);A.2x=0;k(L)O=J.4O(/\\W+/);q{o D=0,M="^";3i((O=A.3h(C))!==1i){k(D>=0)M+=C.1F(D,O.3x);D=A.2x;2G(O[0]){1e"3a":M+="(\\\\d{4})";1h;1e"2l":M+="(\\\\d{3})";1h;1e"2A":1e"2Z":1e"3c":1e"D":M+="(\\\\D+)";1h;5X:M+="(\\\\d\\\\d?)";1h}}M+=".*$";O=1a 4r(M).3h(J);P=1}k(O){1b(H=0;H<b.u;H++){o I=O[H+P];k(I)2G(b[H]){1e"2A":1e"2Z":$.M=N(b[H],I);1h;1e"y":1e"36":I=3E(I,0);k(I<50)I+=5z;q I+=78;$.y=I;1h;1e"2l":$.y=3E(I,0)+$f.5p;1h;5X:$[b[H].4T(-1)]=I;1h}}}q $.d=32}}$.6r(Q,E,B,G,F,K);t $;l N(A,$){o b=A=="2A"?$1k.5m:$1k.29;1b(o B=0;B<12;B++)k(b[B].3X()==$.77(0,b[B].u).3X())t B+1;t-1}},3f:l(b){o B,$=$f[b],A="(?:";k($){1b(B=0;B<$.u;B++){A+=h.34($[B]);k(B!=$.u-1)A+="|"}A=1a 4r(A+")")}q A=1i;t A},2p:l(){o $=h.4s();k($f.z[$f.1z]!=$)$f.z[$f.1z]=$;h.3R()},3R:l($){o b=$f.$($f.6V),$=2K($,h.4s($f.1S));k(b)b.1g=$;$f.z["3v"]=$},34:l(s){o 3D="2N",1s,2B,6c=/#?\\{(.*?)\\}/;s=s+"";1b(o i=0;i<3D.u;i++)s=s.1l("%"+3D.1J(i),h.1V(3D.1J(i),1i,$1B));k(s.1F(0,3)=="#F{"){s=s.1F(3,s.u-1);k(s.1o("t ")<0)s="t "+s;s=$f.4N.2W("1a 6S(\\""+s+"\\");");s=s()}q 3i((1s=6c.3h(s))!=1i){1s.2x=1s.3x+1s[1].u+1s[0].u-1s[1].u-1;2B=2e(2W(1s[1]));k(2B<0)2B="2b"+(-2B);s=s.1F(0,1s.3x)+2B+s.1F(1s.2x+1)}t s},3P:l(A,B,b){o $;A=h.34(A);k(!A||A=="")A=b;k(6Z A=="70")$=A;q{$=h.3b(A,B,1i,1i,1,0,0,0,19);$.y=(""+$.y).1l(/^2b/,"-");$.M=(""+$.M).1l(/^2b/,"-");$.d=(""+$.d).1l(/^2b/,"-");$.H=(""+$.H).1l(/^2b/,"-");$.m=(""+$.m).1l(/^2b/,"-");$.s=(""+$.s).1l(/^2b/,"-");k(A.1o("%2k")>=0){A=A.1l(/%2k/g,"0");$.d=0;$.M=2e($.M)+1}$.20()}t $},1R:l(){o b,$;k($f.7b||($f.6b!=""&&$f.z[$f.1z]=="")){b=h.34($f.6b);$=$f.1S}q{b=$f.z[$f.1z];$=h.1y}$n.2c(h.3b(b,$));k(b!=""){o A=1;k($f.Z.3u&&!h.44($n)){$n.y=$1B.y;$n.M=$1B.M;$n.d=$1B.d;A=0}k($f.Z.2a&&!h.4a($n)){$n.H=$1B.H;$n.m=$1B.m;$n.s=$1B.s;A=0}t A&&h.1u($n)}t 1},44:l($){k($.y!=1i)$=3n($.y,4)+"-"+$.M+"-"+$.d;t $.35(/^((\\d{2}(([69][7p])|([6a][26]))[\\-\\/\\s]?((((0?[6h])|(1[6i]))[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])|(3[6g])))|(((0?[6e])|(11))[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])|(30)))|(0?2[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])))))|(\\d{2}(([69][74])|([6a][7u]))[\\-\\/\\s]?((((0?[6h])|(1[6i]))[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])|(3[6g])))|(((0?[6e])|(11))[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])|(30)))|(0?2[\\-\\/\\s]?((0?[1-9])|(1[0-9])|(2[0-8]))))))(\\s(((0?[0-9])|([1-2][0-3]))\\:([0-5]?[0-9])((\\s)|(\\:([0-5]?[0-9])))))?$/)},4a:l($){k($.H!=1i)$=$.H+":"+$.m+":"+$.s;t $.35(/^([0-9]|([0-1][0-9])|([2][0-3])):([0-9]|([0-5][0-9])):([0-9]|([0-5][0-9]))$/)},2L:l($,A){$=$||$n;o b=$.2r(h.1X,A);k(b>0){b=$.2r(h.1Z,A);k(b<0)b=0}t b},1u:l($,A,B){A=A||$f.Z.3A;o b=h.2L($,A);k(b==0){b=1;k(A=="d"&&B==1i)B=2y.5Y((1a 1G($.y,$.M-1,$.d).21()-$f.41)%7);b=!h.67(B)&&!h.5Z($,A)}q b=0;t b},62:l(){o b=$f.z,A=h,$=$f.z[$f.1z];k($!=1i){k($!="")A.2w.2c(A.3b($,A.1y));k($==""||(A.44(A.2w)&&A.4a(A.2w)&&A.1u(A.2w))){k($!=""){A.6f.2c(A.2w);A.2p()}q A.3R("")}q t 1m}t 19},3Q:l($){3t();k(h.62()){h.3m(19);$f.1n()}q{k($){3k($);h.3m(1m,2)}q h.3m(1m);$f.24()}},3F:l(){o E,C,D,K,A,H=1a 2s(),F=$1k.5y,G=$f.41,I="",$="",b=1a 1C($n.y,$n.M,$n.d,0,0,0),J=b.y,B=b.M;A=1-1a 1G(J,B-1,1).21()+G;k(A>1)A-=7;H.a("<1x Y=5g 2U=3p% 2u=0 2o=0 2m=0>");H.a("<1j Y=5f 4A=5h>");k($f.61)H.a("<18>"+F[0]+"</18>");1b(E=0;E<7;E++)H.a("<18>"+F[(G+E)%7+1]+"</18>");H.a("</1j>");1b(E=1,C=A;E<7;E++){H.a("<1j>");1b(D=0;D<7;D++){b.1R(J,B,C++);b.20();k(b.M==B){K=19;k(b.2r($1w,"d")==0)I="7s";q k(b.2r($1B,"d")==0)I="7d";q I=($f.63&&(0==(G+D)%7||6==(G+D)%7)?"7k":"7l");$=($f.63&&(0==(G+D)%7||6==(G+D)%7)?"7i":"7j")}q k($f.5s){K=19;I="7c";$="8L"}q K=1m;k($f.61&&D==0&&(E<4||K))H.a("<18 Y=8H>"+4t(b,$f.41==0?1:0)+"</18>");H.a("<18 ");k(K){k(h.1u(b,"d",D)){k(h.65(2y.5Y((1a 1G(b.y,b.M-1,b.d).21()-$f.41)%7))||h.66(b))I="8K";H.a("1q=\\"2O("+b.y+","+b.M+","+b.d+");\\" ");H.a("2t=\\"h.1d=\'"+$+"\'\\" ");H.a("2q=\\"h.1d=\'"+I+"\'\\" ")}q I="8M";H.a("Y="+I);H.a(">"+b.d+"</18>")}q H.a("></18>")}H.a("</1j>")}H.a("</1x>");t H.j()},5Z:l(b,A){o $=h.47(b,h.49,A);t(h.49&&$f.5e)?!$:$},67:l($){t h.4x($,h.68)},66:l($){t h.47($,h.64)},65:l($){t h.4x($,h.5C)},47:l($,B,A){o b=A=="d"?$f.4l:$f.1S;t B?B.4P(h.3S(b,$)):0},4x:l(b,$){t $?$.4P(b):0},2R:l(p,c,r,e,2j){o s=1a 2s(),4y=2j?"r"+p:p;5b=$n[p];s.a("<1x 2o=0 2m=3 2u=0");1b(o i=0;i<r;i++){s.a("<1j 3d=\\"3d\\">");1b(o j=0;j<c;j++){s.a("<18 3d ");$n[p]=2W(e);k(($f.5e&&h.2L($n,p)==0)||h.1u($n,p)){s.a("Y=\'1A\' 2t=\\"h.1d=\'3e\'\\" 2q=\\"h.1d=\'1A\'\\" 3Z=\\"");s.a("1n($d."+p+"D);$d."+4y+"I.1g="+$n[p]+";$d."+4y+"I.4w();\\"")}q s.a("Y=\'4z\'");s.a(">"+(p=="M"?$1k.29[$n[p]-1]:$n[p])+"</18>")}s.a("</1j>")}s.a("</1x>");$n[p]=5b;t s.j()},4E:l($,b){k($){o A=$.8Q;k($6m)A=$.8V().2v;b.1c.2v=A}},8E:l($){h.4E($,$d.3T);$d.3T.1L=h.2R("M",2,6,"i+j*6+1",$==$d.2i)},4v:l(b,A){o $=1a 2s();A=2K(A,$n.y-5);$.a(h.2R("y",2,5,A+"+i+j*5",b==$d.2D));$.a("<1x 2o=0 2m=3 2u=0 4A=5h><1j><18 ");$.a(h.1X.y<A?"Y=\'1A\' 2t=\\"h.1d=\'3e\'\\" 2q=\\"h.1d=\'1A\'\\" 3Z=\'k(1Y.25)1Y.25();1Y.4S=19;$c.4v(0,"+(A-10)+")\'":"Y=\'4z\'");$.a(">\\8l</18><18 Y=\'1A\' 2t=\\"h.1d=\'3e\'\\" 2q=\\"h.1d=\'1A\'\\" 3Z=\\"1n($d.2J);$d.1t.4w();\\">\\5l</18><18 ");$.a(h.1Z.y>A+10?"Y=\'1A\' 2t=\\"h.1d=\'3e\'\\" 2q=\\"h.1d=\'1A\'\\" 3Z=\'k(1Y.25)1Y.25();1Y.4S=19;$c.4v(0,"+(A+10)+")\'":"Y=\'4z\'");$.a(">\\8p</18></1j></1x>");h.4E(b,$d.2J);$d.2J.1L=$.j()},3C:l(A,b,$){$d[A+"D"].1L=h.2R(A,6,b,$)},8n:l(){h.3C("H",4,"i * 6 + j")},8e:l(){h.3C("m",2,"i * 30 + j * 5")},8c:l(){h.3C("s",1,"j * 10")},4p:l(A){h.6F();o b=h.2Y,C=b.1c,$=1a 2s();$.a("<1x Y=5g 2U=3p% 2f=3p% 2u=0 2o=0 2m=0>");$.a("<1j Y=5f><18><x 1c=\\"3g:2v\\">"+$1k.8g+"</x>");k(!A)$.a("<x 1c=\\"3g:5i;8z:8y\\" 1q=\\"1n($d.1E);\\">\\5l</x>");$.a("</18></1j>");1b(o B=0;B<b.u;B++)k(b[B]){$.a("<1j><18 1c=\'55-4A:2v\' 3d=\'3d\' Y=\'1A\' 2t=\\"h.1d=\'3e\'\\" 2q=\\"h.1d=\'1A\'\\" 1q=\\"");$.a("2O("+b[B].y+", "+b[B].M+", "+b[B].d+","+b[B].H+","+b[B].m+","+b[B].s+");\\">");$.a("&4B;"+h.3S(1i,b[B]));$.a("</18></1j>")}q $.a("<1j><18 Y=\'1A\'>&4B;</18></1j>");$.a("</1x>");$d.1E.1L=$.j()},5j:l(){$(/w/);$(/4H|W/);$(/3c|D/);$(/3a|2l|36|y/);$(/2A|2Z|3U|M/);$(/1K|d/);$(/4J|H/);$(/4K|m/);$(/4G|s/);$f.Z.3u=($f.Z.y||$f.Z.M||$f.Z.d)?19:1m;$f.Z.2a=($f.Z.H||$f.Z.m||$f.Z.s)?19:1m;$f.3j=$f.3j.1l(/%1G/,$f.4l).1l(/%8w/,$f.5d);k($f.Z.3u){k($f.Z.2a)$f.1S=$f.3j;q $f.1S=$f.4l}q $f.1S=$f.5d;l $(b){o $=(b+"").4T(1,2);$f.Z[$]=b.3h($f.1y)?($f.Z.3A=$,19):1m}},5c:l(){o $=0;$f.Z.y?($=1,24($d.1t,$d.3y,$d.3Y)):1n($d.1t,$d.3y,$d.3Y);$f.Z.M?($=1,24($d.1M,$d.3V,$d.42)):1n($d.1M,$d.3V,$d.42);$?24($d.4k):1n($d.4k);k($f.Z.2a){24($d.2H);3G($d.2V,$f.Z.H);3G($d.3r,$f.Z.m);3G($d.3I,$f.Z.s)}q 1n($d.2H);2M($d.2S,$f.5w);2M($d.28,$f.5x);2M($d.1U,$f.4j);2M($d.4i,!$f.5n&&$f.Z.d&&$f.8t);k($f.6v||!($f.5w||$f.5x||$f.4j))1n($d.3z);q 24($d.3z)},3m:l(B,D){o A=$f.z,b=$5u?"Y":"1d";k(B)C(A);q{k(D==1i)D=$f.8s;2G(D){1e 0:k(8B($1k.8C)){A[$f.1z]=h.3O;C(A)}q $(A);1h;1e 1:A[$f.1z]=h.3O;C(A);1h;1e 2:$(A);1h}}l C(A){o B=A.1d;k(B){o $=B.1l(/5B/g,"");k(B!=$)A.5A(b,$)}}l $($){$.5A(b,$.1d+" 5B")}},1V:l(D,b,$){$=$||$1w;o H,C=[D+D,D],E,A=$[D],F=l($){t 3n(A,$.u)};2G(D){1e"w":A=21($);1h;1e"D":o G=21($)+1;F=l($){t $.u==2?$1k.8A[G]:$1k.5y[G]};1h;1e"W":A=4t($);1h;1e"y":C=["3a","2l","36","y"];b=b||C[0];F=l(b){t 3n((b.u<4)?(b.u<3?$.y%3p:($.y+5z-$f.5p)%8x):A,b.u)};1h;1e"M":C=["2A","2Z","3U","M"];F=l($){t($.u==4)?$1k.5m[A-1]:($.u==3)?$1k.29[A-1]:3n(A,$.u)};1h}b=b||D+D;k("2N".1o(D)>-1&&D!="y"&&!$f.Z[D])k("8h".1o(D)>-1)A=0;q A=1;o B=[];1b(H=0;H<C.u;H++){E=C[H];k(b.1o(E)>=0){B[H]=F(E);b=b.1l(E,"{"+H+"}")}}1b(H=0;H<B.u;H++)b=b.1l(1a 4r("\\\\{"+H+"\\\\}","g"),B[H]);t b},3S:l(b,$){$=$||h.3b($f.z[$f.1z],h.1y)||$1w;b=b||h.1y;k(b.1o("%2k")>=0){o A=1a 1C();A.2c($);A.d=0;A.M=2e(A.M)+1;A.20();b=b.1l(/%2k/g,A.d)}o B="8d";1b(o D=0;D<B.u;D++){o C=B.1J(D);b=h.1V(C,b,$)}k($f.Z["D"]){b=b.1l(/3c/g,"%1K").1l(/D/g,"%d");b=h.1V("M",b,$);b=b.1l(/\\%1K/g,h.1V("D","3c")).1l(/\\%d/g,h.1V("D","D"))}q b=h.1V("M",b,$);t b},8o:l(b,$){t h.1V(b,$,$n)},4s:l($){t h.3S($,$n)},4C:l(){$d.3K.1L="";k($f.5n){$c.2P=19;$f.5s=1m;$d.1d="4d 8T";o $=1a 2s();$.a("<1x Y=8R 2U=3p% 2o=0 2m=0 2u=1><1j><18 5q=5r>");$.a(h.3F());$.a("</18><18 5q=5r>");$n.2C("M",1);$.a(h.3F());$d.2i=$d.1M.5o(19);$d.2D=$d.1t.5o(19);$d.3K.4q($d.2i);$d.3K.4q($d.2D);$d.2i.1g=$1k.29[$n.M-1];$d.2i["3v"]=$n.M;$d.2D.1g=$n.y;4Q("6H,6E");$d.2i.1d=$d.2D.1d="3M";$n.2C("M",-1);$.a("</18></1j></1x>");$d.2T.1L=$.j()}q{$d.1d="4d";$d.2T.1L=h.3F()}k(!$f.Z.d||$f.8J){h.4p(19);3w($d.1E)}q 1n($d.1E);h.6P()},6P:l(){o b=8W.1Q.4o("8k");1b(o C=0;C<b.u;C++){o $=$d.1c.2f;$d.1c.2f="";o A=$d.3l;k(b[C].8j==6L&&A){b[C].1c.2U=$d.6q+"6s";o B=$d.2H.3l;k(B&&$d.3z.1c.2h=="2E"&&$d.2H.1c.2h!="2E"&&1Q.6N.8f-A>=B){A+=B;$d.1c.2f=A}q $d.1c.2f=$;b[C].1c.2f=2y.5v(A,$d.3l)+"6s"}}$d.1E.1c.2U=$d.2T.6q;$d.1E.1c.2f=$d.2T.3l},4W:l(){$n.d=2y.8D(1a 1G($n.y,$n.M,0).2F(),$n.d);$1w.2c($n);h.2p();k(!$f.6v)k(h.1u($n)){4n();1n($f.1K)}k($f.6u)2g("6u")},6l:l(){$d.2S.1q=l(){k(!2g("8q")){$f.z[$f.1z]="";$c.3R("");4n();1n($f.1K);k($f.6n)2g("6n")}};$d.1U.1q=l(){2O()};k(h.1u($1B)){$d.28.1N=1m;$d.28.1q=l(){$n.2c($1B);2O()}}q $d.28.1N=19},6F:l(){o H,G,A,F,C=[],$=5,E=$f.6I.u,b=$f.Z.3A;k(E>$)E=$;q k(b=="m"||b=="s")C=[-60,-30,0,30,60,-15,15,-45,45];q 1b(H=0;H<$;H++)C[H]=$n[b]-2+H;1b(H=G=0;H<E;H++){A=h.3P($f.6I[H]);k(h.1u(A))h.2Y[G++]=A}o B="2N",D=[1,1,1,0,0,0];1b(H=0;H<=B.1o(b);H++)D[H]=$n[B.1J(H)];1b(H=0;G<$;H++)k(H<C.u){A=1a 1C(D[0],D[1],D[2],D[3],D[4],D[5]);A[b]=C[H];A.20();k(h.1u(A))h.2Y[G++]=A}q h.2Y[G++]=1i}};l 4n(){o b=$f.z;8F{k(b.1c.2h!="2E"&&b.3o!="6A"&&(b.6D.3X()=="1v"||b.6D.3X()=="8G")){k($f.8N==b)$f.z["4m"]=19;$f.z.2d();t}}8O($){}b["4m"]=1m}l 2s(){h.s=1a 7h();h.i=0;h.a=l($){h.s[h.i++]=$};h.j=l(){t h.s.7r("")}}l 4t($,B){B=B||0;o b=1a 1G($.y,$.M-1,$.d+B);b.6z(b.2F()-(b.21()+6)%7+$f.7v-1);o A=b.6J();b.7m(0);b.6z(4);t 2y.6X((A-b.6J())/(7*6T))+1}l 21($){o b=1a 1G($.y,$.M-1,$.d);t b.21()}l 24(){3s(2Q,"")}l 3w(){3s(2Q,"6K")}l 1n(){3s(2Q,"2E")}l 3s(b,$){1b(i=0;i<b.u;i++)b[i].1c.2h=$}l 2M(b,$){$?24(b):1n(b)}l 3G(b,$){k($)b.1N=1m;q{b.1N=19;b.1g="7T"}}l c(p,1H){k(p=="M")1H=43(1H,1,12);q k(p=="H")1H=43(1H,0,23);q k("5k".1o(p)>=0)1H=43(1H,0,59);k($1w[p]!=1H&&!2g(p+"7U")){o 6o="1T(\\""+p+"\\","+1H+")",3B=$c.2L();k(3B==0)2W(6o);q k(3B<0)4D($c.1X);q k(3B>0)4D($c.1Z);$d.1U.1N=!$c.1u($1w);k("7C".1o(p)>=0)$c.4C();2g(p+"7D")}l 4D($){4u($c.1u($)?$:$1w)}}l 4u($){1T("y",$.y);1T("M",$.M);1T("d",$.d);1T("H",$.H);1T("m",$.m);1T("s",$.s)}l 2O(F,B,b,D,C,A){o $=1a 1C($n.y,$n.M,$n.d,$n.H,$n.m,$n.s);$n.1R(F,B,b,D,C,A);k(!2g("7H")){o E=$.y==F&&$.M==B&&$.d==b;k(!E&&2Q.u!=0){c("y",F);c("M",B);c("d",b);$c.1f=$f.z;k($f.2z)$c.2p()}k($c.2P||E||2Q.u==0)$c.4W()}q $n=$}l 2g($){o b;k($f[$])b=$f[$].4V($f.z,$f);t b}l 1T(b,$){k($==1i)$=$n[b];$1w[b]=$n[b]=$;k("7K".1o(b)>=0)$d[b+"I"].1g=$;k(b=="M"){$d.1M["3v"]=$;$d.1M.1g=$1k.29[$-1]}}l 43(b,$,A){k(b<$)b=$;q k(b>A)b=A;t b}l 6M($,b){$.2I("4c",l(){o $=1Y,A=($.4M==4Y)?$.4F:$.4M;k(A==9)b()})}l 3n($,b){$=$+"";3i($.u<b)$="0"+$;t $}l 3t(){1n($d.2J,$d.3T,$d.6R,$d.6Q,$d.6O)}l 4Z($){k($c.1f==4Y)$c.1f=$d.2V;2G($c.1f){1e $d.2V:c("H",$n.H+$);1h;1e $d.3r:c("m",$n.m+$);1h;1e $d.3I:c("s",$n.s+$);1h}k($f.2z)$c.2p()}l 1C(D,A,$,C,B,b){h.1R(D,A,$,C,B,b)}1C.2X={1R:l(E,B,b,D,C,A){o $=1a 1G();h.y=1p(E,h.y,$.52());h.M=1p(B,h.M,$.5a()+1);h.d=$f.Z.d?1p(b,h.d,$.2F()):1;h.H=1p(D,h.H,$.54());h.m=1p(C,h.m,$.53());h.s=1p(A,h.s,$.56())},2c:l($){k($)h.1R($.y,$.M,$.d,$.H,$.m,$.s)},6r:l(E,B,b,D,C,A){o $=1a 1G();h.y=1p(h.y,E,$.52());h.M=1p(h.M,B,$.5a()+1);h.d=$f.Z.d?1p(h.d,b,$.2F()):1;h.H=1p(h.H,D,$.54());h.m=1p(h.m,C,$.53());h.s=1p(h.s,A,$.56())},2r:l($,C){o A="2N",b,B;C=A.1o(C);C=C>=0?C:5;1b(o D=0;D<=C;D++){B=A.1J(D);b=h[B]-$[B];k(b>0)t 1;q k(b<0)t-1}t 0},20:l(){o $=1a 1G(h.y,h.M-1,h.d,h.H,h.m,h.s);h.y=$.52();h.M=$.5a()+1;h.d=$.2F();h.H=$.54();h.m=$.53();h.s=$.56();t!6j(h.y)},2C:l(b,$){k("2N".1o(b)>=0){o A=h.d;k(b=="M")h.d=1;h[b]+=$;h.20();h.d=A}}};l 2e($){t 7F($,10)}l 3E($,b){t 2K(2e($),b)}l 1p($,A,b){t 3E($,2K(A,b))}l 2K($,b){t $==1i||6j($)?b:$}l 4I(A,$){k($6m)A.4I("6p"+$);q{o b=1Q.82("88");b.7W($,19,19);A.7X(b)}}l 3J($){o A,B,b="y,M,H,m,s,6E,6H".4O(",");1b(B=0;B<b.u;B++){A=b[B];k($d[A+"I"]==$)t A.4T(A.u-1,A.u)}t 0}l 6k($){o b=3J(h);k(!b)t;$c.1f=h;k(b=="y")h.1d="6x";q k(b=="M"){h.1d="6x";h.1g=h["3v"]}h.4U();$c["2R"+b](h);3w($d[b+"D"])}l 3L(6y){o p=3J(h),2j,51,v=h.1g,6C=$n[p];k(p==0)t;$n[p]=6B(v)>=0?6B(v):$n[p];k(p=="y"){2j=h==$d.2D;k(2j&&$n.M==12)$n.y-=1}q k(p=="M"){2j=h==$d.2i;k(2j){51=$1k.29[$n[p]-1];k(6C==12)$n.y+=1;$n.2C("M",-1)}k($1w.M==$n.M)h.1g=51||$1k.29[$n[p]-1];k(($1w.y!=$n.y))c("y",$n.y)}2W("c(\\""+p+"\\","+$n[p]+")");k(6y!==19){k(p=="y"||p=="M")h.1d="3M";1n($d[p+"D"])}k($f.2z)$c.2p()}l 3k($){k($.25){$.25();$.8i()}q{$.4S=19;$.6G=1m}k($5t)$.4F=0}l 4Q($){o A=$.4O(",");1b(o B=0;B<A.u;B++){o b=A[B]+"I";$d[b].8u=6k;$d[b].2n=3L}}l 4R(M){o H=M.6w||M.6t,Q=M.4M||M.4F;58=$f.1K.1c.2h!="2E";k(Q>=8m&&Q<=8U)Q-=48;k($f.8I&&58){k(!H.3q){H.3q=$f.1W[1];$c.1f=$f.z}k(H==$f.z)$c.1f=$f.z;k(Q==27)k(H==$f.z){$c.3Q();t}q $f.z.2d();k(Q>=37&&Q<=40){o U;k($c.1f==$f.z||$c.1f==$d.1U)k($f.Z.d){U="d";k(Q==38)$n[U]-=7;q k(Q==39)$n[U]+=1;q k(Q==37)$n[U]-=1;q $n[U]+=7;$n.20();c("y",$n["y"]);c("M",$n["M"]);c("d",$n[U]);3k(M);t}q{U=$f.Z.3A;$d[U+"I"].2d()}U=U||3J($c.1f);k(U){k(Q==38||Q==39)$n[U]+=1;q $n[U]-=1;$n.20();$c.1f.1g=$n[U];3L.4V($c.1f,19);$c.1f.4U()}}q k(Q==9){o D=H.3q;1b(o R=0;R<$f.1W.u;R++)k(D.1N==19||D.3l==0)D=D.3q;q 1h;k($c.1f!=D){$c.1f=D;D.2d()}}q k(Q==13){3L.4V($c.1f);k($c.1f.3o=="1O")$c.1f.8P();q $c.4W();$c.1f=$f.z}}q k(Q==9&&H==$f.z)$c.3Q();k($f.8S&&!$5t&&!$f.3N&&$c.1f==$f.z&&(Q>=48&&Q<=57)){o T=$f.z,S=T.1g,F=E(T),I={22:"",1s:[]},R=0,K,N=0,X=0,O=0,J,b=/3a|2l|36|y|3U|M|1K|d|%2k|4J|H|4K|m|4G|s|4H|W|w/g,L=$f.1y.35(b),B,A,$,V,W,G,J=0;k(S!=""){O=S.35(/[0-9]/g);O=O==1i?0:O.u;1b(R=0;R<L.u;R++)O-=2y.5v(L[R].u,2);O=O>=0?1:0;k(O==1&&F>=S.u)F=S.u-1}S=S.1F(0,F)+8r.8v(Q)+S.1F(F+O);F++;1b(R=0;R<S.u;R++){o C=S.1J(R);k(/[0-9]/.4P(C))I.22+=C;q I.1s[R]=1}S="";b.2x=0;3i((K=b.3h($f.1y))!==1i){X=K.3x-(K[0]=="%2k"?1:0);k(N>=0){S+=$f.1y.1F(N,X);k(F>=N+J&&F<=X+J)F+=X-N}N=b.2x;G=N-X;B=I.22.1F(0,G);A=K[0].1J(0);$=2e(B.1J(0));k(I.22.u>1){V=I.22.1J(1);W=$*10+2e(V)}q{V="";W=$}k(I.1s[X+1]||A=="M"&&W>12||A=="d"&&W>31||A=="H"&&W>23||"5k".1o(A)>=0&&W>59){k(K[0].u==2)B="0"+$;q B=$;F++}q k(G==1){B=W;G++;J++}S+=B;I.22=I.22.1F(G);k(I.22=="")1h}T.1g=S;P(T,F);3k(M)}k(58&&$c.1f!=$f.z&&!((Q>=48&&Q<=57)||Q==8||Q==46))3k(M);l E(A){o b=0;k($f.4N.1Q.6d){o B=$f.4N.1Q.6d.6U(),$=B.55.u;B.5V("4X",-A.1g.u);b=B.55.u-$}q k(A.4L||A.4L=="0")b=A.4L;t b}l P(b,A){k(b.5U){b.2d();b.5U(A,A)}q k(b.5W){o $=b.5W();$.7w(19);$.7y("4X",A);$.5V("4X",A);$.4U()}}}',62,555,'|||||||||||_||||dp||this|||if|function||dt|var||else|||return|length|||div||el|||||||||||||||||||||||||class|has|||||||||td|true|new|for|style|className|case|currFocus|value|break|null|tr|lang|replace|false|hide|indexOf|pInt3|onclick|divs|arr|yI|checkValid|input|sdt|table|dateFmt|elProp|menu|tdt|DPDate|id|qsDivSel|substring|Date|pv|ipts|charAt|dd|innerHTML|MI|disabled|button|ny|document|loadDate|realFmt|sv|okI|getP|focusArr|minDate|event|maxDate|refresh|getDay|str||show|preventDefault|||todayI|aMonStr|st|9700|loadFromDate|focus|pInt|height|callFunc|display|rMI|isR|ld|yyy|cellpadding|onblur|cellspacing|update|onmouseout|compareWith|sb|onmouseover|border|left|date|lastIndex|Math|autoUpdateOnChanged|MMMM|tmpEval|attr|ryI|none|getDate|switch|tDiv|attachEvent|yD|rtn|checkRange|shorH|yMdHms|day_Click|autoPickDate|arguments|_f|clearI|dDiv|width|HI|eval|prototype|QS|MMM||||menuSel|doExp|match|yy||||yyyy|splitDate|DD|nowrap|menuOn|_initRe|float|exec|while|realFullFmt|_cancelKey|offsetHeight|mark|doStr|type|100|nextCtrl|mI|setDisp|hideSel|sd|realValue|showB|index|navLeftImg|bDiv|minUnit|rv|_fHMS|ps|pInt2|_fd|disHMS|navImg|sI|_foundInput|rMD|_blur|yminput|readOnly|oldValue|doCustomDate|close|setRealValue|getDateStr|MD|MM|leftImg|href|toLowerCase|navRightImg|onmousedown||firstDayOfWeek|rightImg|makeInRange|isDate|||testDate||ddateRe|isTime|maxlength|onkeydown|WdateDiv|dpButton|errMsg|btns|span|qsDiv|isShowOK|titleDiv|realDateFmt|My97Mark|elFocus|getElementsByTagName|_fillQS|appendChild|RegExp|getNewDateStr|getWeek|_setAll|_fy|blur|testDay|fp|invalidMenu|align|nbsp|draw|_setFrom|_fMyPos|keyCode|ss|WW|fireEvent|HH|mm|selectionStart|which|win|split|test|_inputBindEvent|_tab|cancelBubble|slice|select|call|pickDate|character|undefined|updownEvent||mStr|getFullYear|getMinutes|getHours|text|getSeconds||isShow||getMonth|bak|initShowAndHide|realTimeFmt|opposite|MTitle|WdayTable|center|right|_dealFmt|ms|xd7|aLongMonStr|doubleCalendar|cloneNode|yearOffset|valign|top|isShowOthers|OPERA|FF|max|isShowClear|isShowToday|aWeekStr|2000|setAttribute|WdateFmtErr|sdayRe|defMinDate|defMaxDate|init|spans|My97DP|title|_makeDateInRange|cal|timeSpan|nodeType|readonly|tE|tm|Event|_ieEmuEventHandler|upButton|downButton|setSelectionRange|moveStart|createTextRange|default|abs|testDisDate||isShowWeek|checkAndUpdate|highLineWeekDay|sdateRe|testSpeDay|testSpeDate|testDisDay|ddayRe|02468|13579|startDate|re|selection|469|newdate|01|13578|02|isNaN|_focus|initBtn|IE|oncleared|func|on|offsetWidth|coverDate|px|target|onpicked|eCont|srcElement|yminputfocus|showDiv|setDate|hidden|Number|oldv|nodeName|ry|initQS|returnValue|rM|quickSel|valueOf|block|window|attachTabEvent|body|sD|autoSize|mD|HD|Function|86400000|createRange|vel|NavImgll|round|dpTitle|typeof|object|link|rel|change|1235679|onchange|NavImgl|substr|1900|skin|MMenu|alwaysUseStartDate|WotherDay|Wtoday|__defineGetter__|HTMLElement|parentNode|Array|WwdayOn|WdayOn|Wwday|Wday|setMonth|__defineSetter__|tB|048|createElement|join|Wselday|addEventListener|01345789|whichDayIsfirstWeek|collapse|dpTime|moveEnd|dpTodayInput|hhMenu|overflow|yMd|changed|dpOkInput|parseInt|dpClearInput|onpicking|dpTimeUp|rowspan|yHms|dpTimeStr|mmMenu|dpControl|dpQS|ssMenu|dpTimeDown|timeStr|clearStr|00|changing|err_1|initEvent|dispatchEvent|alert|todayStr|okStr|YMenu|createEvent|NavImgrr|NavImgr|absolute|position|specialDays|HTMLEvents|specialDates|disabledDates|disabledDays|_fs|ydHmswW|_fm|scrollHeight|quickStr|Hms|stopPropagation|contentWindow|iframe|u2190|96|_fH|getNewP|u2192|onclearing|String|errDealMode|qsEnabled|onfocus|fromCharCode|Time|1000|pointer|cursor|aLongWeekStr|confirm|errAlertMsg|min|_fM|try|textarea|Wweek|enableKeyboard|autoShowQS|WspecialDay|WotherDayOn|WinvalidDay|srcEl|catch|click|offsetLeft|WdayTable2|enableInputMask|WdateDiv2|105|getBoundingClientRect|parent'.split('|'),0,{}))
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/My97DatePicker/config.js b/pluss-wap-page/src/main/resources/static/resources/js/My97DatePicker/config.js
new file mode 100644
index 0000000..96a4afb
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/My97DatePicker/config.js
@@ -0,0 +1,13 @@
+var langList = 
+[
+	{name:'en',	charset:'UTF-8'},
+	{name:'zh-cn',	charset:'UTF-8'},
+	{name:'zh-tw',	charset:'UTF-8'}
+];
+
+var skinList = 
+[
+	{name:'default',	charset:'UTF-8'},
+	{name:'twoer',	charset:'GB2312'},
+	{name:'whyGreen',	charset:'UTF-8'}
+];
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/My97DatePicker/lang/en.js b/pluss-wap-page/src/main/resources/static/resources/js/My97DatePicker/lang/en.js
new file mode 100644
index 0000000..3159885
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/My97DatePicker/lang/en.js
@@ -0,0 +1,14 @@
+var $lang={
+errAlertMsg: "Invalid date or the date out of range,redo or not?",
+aWeekStr: ["wk", "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"],
+aLongWeekStr:["wk","Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday","Sunday"],
+aMonStr: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"],
+aLongMonStr: ["January","February","March","April","May","June","July","August","September","October","November","December"],
+clearStr: "Clear",
+todayStr: "Today",
+okStr: "OK",
+updateStr: "OK",
+timeStr: "Time",
+quickStr: "Quick Selection",
+err_1: 'MinDate Cannot be bigger than MaxDate!'
+}
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/My97DatePicker/lang/zh-cn.js b/pluss-wap-page/src/main/resources/static/resources/js/My97DatePicker/lang/zh-cn.js
new file mode 100644
index 0000000..70e5e4f
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/My97DatePicker/lang/zh-cn.js
@@ -0,0 +1,14 @@
+var $lang={
+errAlertMsg: "\u4E0D\u5408\u6CD5\u7684\u65E5\u671F\u683C\u5F0F\u6216\u8005\u65E5\u671F\u8D85\u51FA\u9650\u5B9A\u8303\u56F4,\u9700\u8981\u64A4\u9500\u5417?",
+aWeekStr: ["\u5468","\u65E5","\u4E00","\u4E8C","\u4E09","\u56DB","\u4E94","\u516D"],
+aLongWeekStr:["\u5468","\u661F\u671F\u65E5","\u661F\u671F\u4E00","\u661F\u671F\u4E8C","\u661F\u671F\u4E09","\u661F\u671F\u56DB","\u661F\u671F\u4E94","\u661F\u671F\u516D"],
+aMonStr: ["\u4E00\u6708","\u4E8C\u6708","\u4E09\u6708","\u56DB\u6708","\u4E94\u6708","\u516D\u6708","\u4E03\u6708","\u516B\u6708","\u4E5D\u6708","\u5341\u6708","\u5341\u4E00","\u5341\u4E8C"],
+aLongMonStr: ["\u4E00\u6708","\u4E8C\u6708","\u4E09\u6708","\u56DB\u6708","\u4E94\u6708","\u516D\u6708","\u4E03\u6708","\u516B\u6708","\u4E5D\u6708","\u5341\u6708","\u5341\u4E00\u6708","\u5341\u4E8C\u6708"],
+clearStr: "\u6E05\u7A7A",
+todayStr: "\u4ECA\u5929",
+okStr: "\u786E\u5B9A",
+updateStr: "\u786E\u5B9A",
+timeStr: "\u65F6\u95F4",
+quickStr: "\u5FEB\u901F\u9009\u62E9", 
+err_1: '\u6700\u5C0F\u65E5\u671F\u4E0D\u80FD\u5927\u4E8E\u6700\u5927\u65E5\u671F!'
+}
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/My97DatePicker/lang/zh-tw.js b/pluss-wap-page/src/main/resources/static/resources/js/My97DatePicker/lang/zh-tw.js
new file mode 100644
index 0000000..b92e0ee
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/My97DatePicker/lang/zh-tw.js
@@ -0,0 +1,14 @@
+var $lang={
+errAlertMsg: "\u4E0D\u5408\u6CD5\u7684\u65E5\u671F\u683C\u5F0F\u6216\u8005\u65E5\u671F\u8D85\u51FA\u9650\u5B9A\u7BC4\u570D,\u9700\u8981\u64A4\u92B7\u55CE?",
+aWeekStr: ["\u5468","\u65E5","\u4E00","\u4E8C","\u4E09","\u56DB","\u4E94","\u516D"],
+aLongWeekStr:["\u5468","\u661F\u671F\u65E5","\u661F\u671F\u4E00","\u661F\u671F\u4E8C","\u661F\u671F\u4E09","\u661F\u671F\u56DB","\u661F\u671F\u4E94","\u661F\u671F\u516D"],
+aMonStr: ["\u4E00\u6708","\u4E8C\u6708","\u4E09\u6708","\u56DB\u6708","\u4E94\u6708","\u516D\u6708","\u4E03\u6708","\u516B\u6708","\u4E5D\u6708","\u5341\u6708","\u5341\u4E00","\u5341\u4E8C"],
+aLongMonStr: ["\u4E00\u6708","\u4E8C\u6708","\u4E09\u6708","\u56DB\u6708","\u4E94\u6708","\u516D\u6708","\u4E03\u6708","\u516B\u6708","\u4E5D\u6708","\u5341\u6708","\u5341\u4E00\u6708","\u5341\u4E8C\u6708"],
+clearStr: "\u6E05\u7A7A",
+todayStr: "\u4ECA\u5929",
+okStr: "\u78BA\u5B9A",
+updateStr: "\u78BA\u5B9A",
+timeStr: "\u6642\u9593",
+quickStr: "\u5FEB\u901F\u9078\u64C7",
+err_1: '\u6700\u5C0F\u65E5\u671F\u4E0D\u80FD\u5927\u65BC\u6700\u5927\u65E5\u671F!'
+}
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/My97DatePicker/skin/WdatePicker.css b/pluss-wap-page/src/main/resources/static/resources/js/My97DatePicker/skin/WdatePicker.css
new file mode 100644
index 0000000..8d447b5
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/My97DatePicker/skin/WdatePicker.css
@@ -0,0 +1,10 @@
+.Wdate{
+	border:#999 1px solid;
+	height:20px;
+	background:#fff url(datePicker.gif) no-repeat right;
+}
+
+.WdateFmtErr{
+	font-weight:bold;
+	color:red;
+}
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/My97DatePicker/skin/datePicker.gif b/pluss-wap-page/src/main/resources/static/resources/js/My97DatePicker/skin/datePicker.gif
new file mode 100644
index 0000000..d6bf40c
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/My97DatePicker/skin/datePicker.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/My97DatePicker/skin/default/datepicker.css b/pluss-wap-page/src/main/resources/static/resources/js/My97DatePicker/skin/default/datepicker.css
new file mode 100644
index 0000000..29d5432
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/My97DatePicker/skin/default/datepicker.css
@@ -0,0 +1,246 @@
+/* 
+ * My97 DatePicker 4.7
+ */
+
+.WdateDiv{
+	width:180px;
+	background-color:#FFFFFF;
+	border:#bbb 1px solid;
+	padding:2px;
+}
+
+.WdateDiv2{
+	width:360px;
+}
+.WdateDiv *{font-size:9pt;}
+
+.WdateDiv .NavImg a{
+	display:block;
+	cursor:pointer;
+	height:16px;
+	width:16px;
+}
+
+.WdateDiv .NavImgll a{
+	float:left;
+	background:transparent url(img.gif) no-repeat scroll 0 0;
+}
+.WdateDiv .NavImgl a{
+	float:left;
+	background:transparent url(img.gif) no-repeat scroll -16px 0;
+}
+.WdateDiv .NavImgr a{
+	float:right;
+	background:transparent url(img.gif) no-repeat scroll -32px 0;
+}
+.WdateDiv .NavImgrr a{
+	float:right;
+	background:transparent url(img.gif) no-repeat scroll -48px 0;
+}
+
+.WdateDiv #dpTitle{
+	height:24px;
+	margin-bottom:2px;
+	padding:1px;
+}
+
+.WdateDiv .yminput{
+	margin-top:2px;
+	text-align:center;
+	height:20px;
+	border:0px;
+	width:50px;
+	cursor:pointer;		
+}
+
+.WdateDiv .yminputfocus{
+	margin-top:2px;
+	text-align:center;
+	font-weight:bold;
+	height:20px;
+	color:blue;
+	border:#ccc 1px solid;
+	width:50px;
+}
+
+.WdateDiv .menuSel{
+	z-index:1;
+	position:absolute;
+	background-color:#FFFFFF;	
+	border:#ccc 1px solid;
+	display:none;
+}
+
+.WdateDiv .menu{
+	cursor:pointer;
+	background-color:#fff;
+}
+
+.WdateDiv .menuOn{
+	cursor:pointer;
+	background-color:#BEEBEE;
+}
+
+.WdateDiv .invalidMenu{
+	color:#aaa;
+}
+
+.WdateDiv .YMenu{
+	margin-top:20px;
+	
+}
+
+.WdateDiv .MMenu{
+	margin-top:20px;
+	*width:62px;
+}
+
+.WdateDiv .hhMenu{
+	margin-top:-90px; 
+	margin-left:26px;
+}
+
+.WdateDiv .mmMenu{
+	margin-top:-46px; 
+	margin-left:26px;
+}
+
+.WdateDiv .ssMenu{
+	margin-top:-24px; 
+	margin-left:26px;
+}
+
+ .WdateDiv .Wweek {
+ 	text-align:center;
+	background:#DAF3F5;
+	border-right:#BDEBEE 1px solid;
+ }
+
+.WdateDiv .MTitle{
+	background-color:#BDEBEE;
+}
+.WdateDiv .WdayTable2{
+	border-collapse:collapse;
+	border:#c5d9e8 1px solid;
+}
+.WdateDiv .WdayTable2 table{
+	border:0;
+}
+
+.WdateDiv .WdayTable{
+	line-height:20px;
+	border:#c5d9e8 1px solid;
+}
+.WdateDiv .WdayTable td{
+	text-align:center;
+}
+
+.WdateDiv .Wday{
+	cursor:pointer;
+}
+
+.WdateDiv .WdayOn{
+	cursor:pointer;
+	background-color:#C0EBEF;
+}
+
+.WdateDiv .Wwday{
+	cursor:pointer;
+	color:#FF2F2F;
+}
+
+.WdateDiv .WwdayOn{
+	cursor:pointer;
+	color:#000;
+	background-color:#C0EBEF;
+}
+.WdateDiv .Wtoday{
+	cursor:pointer;
+	color:blue;
+}
+.WdateDiv .Wselday{
+	background-color:#A9E4E9;
+}
+.WdateDiv .WspecialDay{
+	background-color:#66F4DF;
+}
+
+.WdateDiv .WotherDay{ 
+	cursor:pointer;
+	color:#6A6AFF;	
+}
+
+.WdateDiv .WotherDayOn{ 
+	cursor:pointer;
+	background-color:#C0EBEF;	
+}
+
+.WdateDiv .WinvalidDay{
+	color:#aaa;
+}
+
+.WdateDiv #dpTime{
+	float:left;
+	margin-top:3px;
+	margin-right:30px;
+}
+
+.WdateDiv #dpTime #dpTimeStr{
+	margin-left:1px;
+}
+
+.WdateDiv #dpTime input{
+	width:18px;
+	height:20px;
+	text-align:center;
+	border:#ccc 1px solid;	
+}
+
+.WdateDiv #dpTime .tB{
+	border-right:0px;
+}
+
+.WdateDiv #dpTime .tE{
+	border-left:0;
+	border-right:0;
+}
+
+.WdateDiv #dpTime .tm{
+	width:7px;
+	border-left:0;
+	border-right:0;
+}
+
+.WdateDiv #dpTime #dpTimeUp{
+	height:10px;
+	width:13px;
+	border:0px;
+	background:url(img.gif) no-repeat -32px -16px;
+}
+
+.WdateDiv #dpTime #dpTimeDown{
+	height:10px;
+	width:13px;
+	border:0px;
+    background:url(img.gif) no-repeat -48px -16px;
+}
+
+ .WdateDiv #dpQS {
+ 	float:left;
+	margin-right:3px;
+	margin-top:3px;
+	background:url(img.gif) no-repeat 0px -16px;
+	width:20px;
+	height:20px;
+	cursor:pointer;
+ }
+.WdateDiv #dpControl {
+	text-align:right;	
+}
+.WdateDiv .dpButton{ 
+	height:20px;
+	width:45px;
+	border:#ccc 1px solid;
+	margin-top:2px;
+	margin-right:1px;
+}
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/My97DatePicker/skin/default/img.gif b/pluss-wap-page/src/main/resources/static/resources/js/My97DatePicker/skin/default/img.gif
new file mode 100644
index 0000000..053205d
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/My97DatePicker/skin/default/img.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/My97DatePicker/skin/twoer/datepicker-dev.css b/pluss-wap-page/src/main/resources/static/resources/js/My97DatePicker/skin/twoer/datepicker-dev.css
new file mode 100644
index 0000000..db1a639
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/My97DatePicker/skin/twoer/datepicker-dev.css
@@ -0,0 +1,339 @@
+/* 
+ * My97 DatePicker 4.8 
+ * auther : zhangkun , hejianting(design)
+ * email : zhangkun_net@hotmail.com
+ * date : 2012-05-25
+ */ 
+.WdateDiv
+{
+	position:relative;
+	padding:5px;
+	width:180px;
+	*width:190px;
+	font-size:12px;
+	color:#333;
+	border:solid 1px #DEDEDE;
+	background-color:#F2F0F1;
+}
+
+.WdateDiv2
+{
+	width:360px;
+}
+
+.WdateDiv .NavImg a,.WdateDiv .yminput,.WdateDiv .yminputfocus,.WdateDiv #dpQS 
+{
+	background:url(img.gif) no-repeat;
+}
+
+.WdateDiv .NavImg a
+{
+	float:left;
+	width:16px;
+	height:16px;
+	cursor:pointer;
+}
+.WdateDiv .NavImgll a
+{
+	background-position:0px 5px;
+}
+.WdateDiv .NavImgl a
+{
+	background-position:0px -10px;
+}
+.WdateDiv .NavImgr a
+{
+	background-position:0px -25px;
+	float:right;
+}
+.WdateDiv .NavImgrr a
+{
+	background-position:0px -40px;
+	float:right;
+}
+
+.WdateDiv #dpTitle
+{
+	padding:3px 0px 0px 0px;
+	line-height:0px;
+	height:20px;
+	*height:23;
+}
+
+.WdateDiv .yminput,.WdateDiv .yminputfocus
+{
+	margin-left:3px;
+	width:50px;
+	height:20px;
+	line-height:16px;
+	border:solid 1px #F2F0F1;
+	cursor:pointer;
+	background-position:35px -68px;
+}
+
+.WdateDiv .yminputfocus
+{
+	background-color:#fff;
+	border:solid 1px #D8D8D8;
+}
+
+.WdateDiv .menuSel{
+	z-index:1;
+	position:absolute;
+	background-color:#FFFFFF;
+	border:#A3C6C8 1px solid;
+	display:none;
+}
+
+.WdateDiv .menu
+{
+	background:#fff;
+}
+.WdateDiv .menuOn
+{
+	color:#fff;
+	background:#64A3F3;
+}
+
+.WdateDiv .invalidMenu{
+	color:#aaa;
+}
+
+.WdateDiv .MMenu,.WdateDiv .YMenu
+{
+	padding:2px;
+	margin-top:20px;
+	margin-left:-1px;
+	width:68px;
+	border:solid 1px #D9D9D9;
+}
+.WdateDiv .MMenu table,.WdateDiv .YMenu table
+{
+	width:100%;
+}
+.WdateDiv .MMenu table td,.WdateDiv .YMenu table td
+{
+	padding:0px;
+	line-height:20px;
+	text-align:center;
+	font-size:12px;
+	cursor: pointer;
+}
+
+.WdateDiv .Wweek {
+ 	text-align:center;
+	background:#DAF3F5;
+	border-right:#BDEBEE 1px solid;
+ }
+
+.WdateDiv td
+{
+	padding:1px;
+	line-height:20px;
+	font-size:12px;
+	color:#999999;
+	background:#fff;
+	cursor:pointer;
+}
+.WdateDiv .MTitle td
+{
+	line-height:24px;
+	color:#7D7D7D;
+	background:#F2F0F1;
+	cursor: default;
+}
+
+.WdateDiv .WdayTable2
+{
+	border-collapse:collapse;
+	border:#808080 1px solid;
+}
+.WdateDiv .WdayTable2 table
+{
+	border:0;
+}
+
+.WdateDiv .WdayTable{
+	line-height:20px;	
+	color:#13777e;
+	background-color:#edfbfb;
+}
+.WdateDiv .WdayTable td{
+	text-align:center;
+}
+
+.WdateDiv .Wday
+{
+	color:#323232;
+}
+
+.WdateDiv .WdayOn
+{
+	color:#fff;
+	background-color:#65A2F3;	
+}
+
+.WdateDiv .Wwday
+{
+	color:#65A4F3;
+}
+
+.WdateDiv .WwdayOn
+{
+	color:#fff;
+	background-color:#65A2F3;	
+}
+.WdateDiv .Wtoday
+{
+	color:#FF6D10;
+	background:#E0EDFE;
+}
+.WdateDiv .Wselday
+{
+	color:#fff;
+	background-color:#65A2F3;	
+}
+.WdateDiv .WspecialDay{
+	background-color:#66F4DF;
+}
+
+.WdateDiv .WotherDay
+{ 
+	color:#D4D4D4;	
+}
+.WdateDiv .WotherDayOn
+{
+	color:#fff;
+	background-color:#65A2F3;	
+}
+
+.WdateDiv .WinvalidDay{
+	color:#aaa;
+}
+
+.WdateDiv #dpTime
+{
+	position:relative;
+	margin-top:5px;
+}
+
+.WdateDiv #dpTime #dpTimeStr
+{
+	display:inline-block;
+	width:28px;
+	*width:30px;
+	color:#7d7d7d;
+}
+
+.WdateDiv #dpTime input
+{
+	padding:0px;
+	margin:0px;
+	width:25px;
+	height:20px;
+	line-height:20px;
+	text-align:center;
+	color:#333;
+	border:#D9D9D9 1px solid;	
+}
+
+.WdateDiv #dpTime .tm
+{
+	width:7px;
+	border:none;
+	background:#F2F0F1;
+}
+
+.WdateDiv #dpTime #dpTimeUp
+{
+	display:none;
+}
+
+.WdateDiv #dpTime #dpTimeDown
+{
+	display:none;
+}
+
+.WdateDiv #dpQS 
+ {
+ 	float:left;
+	margin-right:3px;
+	margin-top:9px;
+	*margin-top:6px;
+	width:16px;
+	height:16px;
+	cursor:pointer;
+	background-position:0px -90px;
+ }
+.WdateDiv #dpControl 
+{
+	text-align:right;
+	margin-top:3px;
+}
+.WdateDiv .dpButton
+{ 
+	margin-left:2px;
+	line-height:18px;
+	*line-height:16px;
+	width:45px;
+	background-color:#C3C3C3;
+	*background-color:#64A3F3;
+	color:#fff;
+	border:none;
+	cursor: pointer;
+}
+.WdateDiv .dpButton:hover
+{ 
+	background-color:#64A3F3;
+}
+
+.WdateDiv .hhMenu,
+.WdateDiv .mmMenu,
+.WdateDiv .ssMenu
+{
+	position:absolute;
+	padding:3px;
+	font-size:12px;
+	color:#333;
+	border:solid 1px #DEDEDE;
+	background-color:#F2F0F1;
+}
+
+.WdateDiv #dpTime .menu,.WdateDiv #dpTime .menuOn
+{
+	width:18px;
+	height:18px;
+	line-height:18px;
+	text-align:center;
+	background:#fff;
+}
+.WdateDiv #dpTime .menuOn
+{
+	background:#65A2F3;
+}
+
+.WdateDiv #dpTime td
+{
+	background:#F2F0F1;
+}
+
+.WdateDiv .hhMenu
+{
+	top:-87px;
+	left:35px;
+	left:32px\9;
+}
+
+.WdateDiv .mmMenu
+{
+	top:-47px;
+	left:35px;
+	left:32px\9;
+}
+
+.WdateDiv .ssMenu
+{
+	top:-27px;
+	left:35px;
+	left:32px\9;
+}
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/My97DatePicker/skin/twoer/datepicker.css b/pluss-wap-page/src/main/resources/static/resources/js/My97DatePicker/skin/twoer/datepicker.css
new file mode 100644
index 0000000..020ceec
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/My97DatePicker/skin/twoer/datepicker.css
@@ -0,0 +1 @@
+.WdateDiv{position:relative;width:190px;font-size:12px;color:#333;border:solid 1px #DEDEDE;background-color:#F2F0F1;padding:5px;}.WdateDiv2{width:360px;}.WdateDiv .NavImg a,.WdateDiv .yminput,.WdateDiv .yminputfocus,.WdateDiv #dpQS{background:url(img.gif) no-repeat;}.WdateDiv .NavImg a{float:left;width:16px;height:16px;cursor:pointer;}.WdateDiv .NavImgll a{background-position:0 5px;}.WdateDiv .NavImgl a{background-position:0 -10px;}.WdateDiv .NavImgr a{background-position:0 -25px;float:right;}.WdateDiv .NavImgrr a{background-position:0 -40px;float:right;}.WdateDiv #dpTitle{line-height:0;height:23px;padding:3px 0 0;}.WdateDiv .yminput,.WdateDiv .yminputfocus{margin-left:3px;width:50px;height:20px;line-height:16px;border:solid 1px #F2F0F1;cursor:pointer;background-position:35px -68px;}.WdateDiv .yminputfocus{background-color:#fff;border:solid 1px #D8D8D8;}.WdateDiv .menuSel{z-index:1;position:absolute;background-color:#FFF;border:#A3C6C8 1px solid;display:none;}.WdateDiv .menu{background:#fff;}.WdateDiv .menuOn{color:#fff;background:#64A3F3;}.WdateDiv .MMenu,.WdateDiv .YMenu{margin-top:20px;margin-left:-1px;width:68px;border:solid 1px #D9D9D9;padding:2px;}.WdateDiv .MMenu table,.WdateDiv .YMenu table{width:100%;}.WdateDiv .MMenu table td,.WdateDiv .YMenu table td{line-height:20px;text-align:center;font-size:12px;cursor:pointer;padding:0;}.WdateDiv .Wweek{text-align:center;background:#DAF3F5;border-right:#BDEBEE 1px solid;}.WdateDiv td{line-height:20px;font-size:12px;color:#999;background:#fff;cursor:pointer;padding:1px;}.WdateDiv .MTitle td{line-height:24px;color:#7D7D7D;background:#F2F0F1;cursor:default;}.WdateDiv .WdayTable2{border-collapse:collapse;border:gray 1px solid;}.WdateDiv .WdayTable2 table{border:0;}.WdateDiv .WdayTable{line-height:20px;color:#13777e;background-color:#edfbfb;}.WdateDiv .WdayTable td{text-align:center;}.WdateDiv .Wday{color:#323232;}.WdateDiv .Wwday{color:#65A4F3;}.WdateDiv .Wtoday{color:#FF6D10;background:#E0EDFE;}.WdateDiv .WspecialDay{background-color:#66F4DF;}.WdateDiv .WotherDay{color:#D4D4D4;}.WdateDiv #dpTime{position:relative;margin-top:5px;}.WdateDiv #dpTime #dpTimeStr{display:inline-block;width:30px;color:#7d7d7d;}.WdateDiv #dpTime input{width:25px;height:20px;line-height:20px;text-align:center;color:#333;border:#D9D9D9 1px solid;margin:0;padding:0;}.WdateDiv #dpTime .tm{width:7px;border:none;background:#F2F0F1;}.WdateDiv #dpQS{float:left;margin-right:3px;margin-top:6px;width:16px;height:16px;cursor:pointer;background-position:0 -90px;}.WdateDiv #dpControl{text-align:right;margin-top:3px;}.WdateDiv .dpButton{margin-left:2px;line-height:16px;width:45px;background-color:#64A3F3;color:#fff;border:none;cursor:pointer;}.WdateDiv .dpButton:hover{background-color:#64A3F3;}.WdateDiv .hhMenu,.WdateDiv .mmMenu,.WdateDiv .ssMenu{position:absolute;font-size:12px;color:#333;border:solid 1px #DEDEDE;background-color:#F2F0F1;padding:3px;}.WdateDiv #dpTime .menu,.WdateDiv #dpTime .menuOn{width:18px;height:18px;line-height:18px;text-align:center;background:#fff;}.WdateDiv #dpTime .menuOn{background:#65A2F3;}.WdateDiv #dpTime td{background:#F2F0F1;}.WdateDiv .hhMenu{top:-87px;left:32px;}.WdateDiv .mmMenu{top:-47px;left:32px;}.WdateDiv .ssMenu{top:-27px;left:32px;}.WdateDiv .invalidMenu,.WdateDiv .WinvalidDay{color:#aaa;}.WdateDiv .WdayOn,.WdateDiv .WwdayOn,.WdateDiv .Wselday,.WdateDiv .WotherDayOn{background-color:#65A2F3;color:#fff;}.WdateDiv #dpTime #dpTimeUp,.WdateDiv #dpTime #dpTimeDown{display:none;}
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/My97DatePicker/skin/twoer/img.gif b/pluss-wap-page/src/main/resources/static/resources/js/My97DatePicker/skin/twoer/img.gif
new file mode 100644
index 0000000..da838ce
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/My97DatePicker/skin/twoer/img.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/My97DatePicker/skin/twoer/img.png b/pluss-wap-page/src/main/resources/static/resources/js/My97DatePicker/skin/twoer/img.png
new file mode 100644
index 0000000..99960d8
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/My97DatePicker/skin/twoer/img.png differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/My97DatePicker/skin/whyGreen/bg.jpg b/pluss-wap-page/src/main/resources/static/resources/js/My97DatePicker/skin/whyGreen/bg.jpg
new file mode 100644
index 0000000..75516a6
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/My97DatePicker/skin/whyGreen/bg.jpg differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/My97DatePicker/skin/whyGreen/datepicker.css b/pluss-wap-page/src/main/resources/static/resources/js/My97DatePicker/skin/whyGreen/datepicker.css
new file mode 100644
index 0000000..f8426f5
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/My97DatePicker/skin/whyGreen/datepicker.css
@@ -0,0 +1,256 @@
+/* 
+ * My97 DatePicker 4.7 Skin:whyGreen
+ */ 
+.WdateDiv{
+	width:180px;
+	background-color:#fff;
+	border:#C5E1E4 1px solid;
+	padding:2px;
+}
+
+.WdateDiv2{
+	width:360px;
+}
+.WdateDiv *{font-size:9pt;}
+
+.WdateDiv .NavImg a{
+	cursor:pointer;
+	display:block;
+	width:16px;
+	height:16px;
+	margin-top:1px;
+}
+
+.WdateDiv .NavImgll a{
+	float:left;
+	background:url(img.gif) no-repeat;
+}
+.WdateDiv .NavImgl a{
+	float:left;
+	background:url(img.gif) no-repeat -16px 0px;
+}
+.WdateDiv .NavImgr a{
+	float:right;
+	background:url(img.gif) no-repeat -32px 0px;
+}
+.WdateDiv .NavImgrr a{
+	float:right;
+	background:url(img.gif) no-repeat -48px 0px;
+}
+
+.WdateDiv #dpTitle{
+	height:24px;
+	padding:1px;
+	border:#c5d9e8 1px solid;
+	background:url(bg.jpg);
+	margin-bottom:2px;
+}
+
+.WdateDiv .yminput{
+	margin-top:2px;
+	text-align:center;
+	border:0px;
+	height:20px;
+	width:50px;
+	color:#034c50;
+	background-color:transparent;
+	cursor:pointer;
+}
+
+.WdateDiv .yminputfocus{
+	margin-top:2px;
+	text-align:center;
+	border:#939393 1px solid;
+	font-weight:bold;
+	color:#034c50;	
+	height:20px;
+	width:50px;
+}
+
+.WdateDiv .menuSel{
+	z-index:1;
+	position:absolute;
+	background-color:#FFFFFF;
+	border:#A3C6C8 1px solid;
+	display:none;
+}
+
+.WdateDiv .menu{
+	cursor:pointer;
+	background-color:#fff;
+	color:#11777C;
+}
+
+.WdateDiv .menuOn{
+	cursor:pointer;
+	background-color:#BEEBEE;
+}
+
+.WdateDiv .invalidMenu{
+	color:#aaa;
+}
+
+.WdateDiv .YMenu{
+	margin-top:20px;
+}
+
+.WdateDiv .MMenu{
+	margin-top:20px;
+	*width:62px;
+}
+
+.WdateDiv .hhMenu{
+	margin-top:-90px; 
+	margin-left:26px;
+}
+
+.WdateDiv .mmMenu{
+	margin-top:-46px; 
+	margin-left:26px;
+}
+
+.WdateDiv .ssMenu{
+	margin-top:-24px; 
+	margin-left:26px;
+}
+
+ .WdateDiv .Wweek {
+ 	text-align:center;
+	background:#DAF3F5;
+	border-right:#BDEBEE 1px solid;
+ }
+
+.WdateDiv .MTitle{
+	color:#13777e;
+	background-color:#bdebee;
+}
+.WdateDiv .WdayTable2{
+	border-collapse:collapse;
+	border:#BEE9F0 1px solid;
+}
+.WdateDiv .WdayTable2 table{
+	border:0;
+}
+
+.WdateDiv .WdayTable{
+	line-height:20px;	
+	color:#13777e;
+	background-color:#edfbfb;
+	border:#BEE9F0 1px solid;
+}
+.WdateDiv .WdayTable td{
+	text-align:center;
+}
+
+.WdateDiv .Wday{
+	cursor:pointer;
+}
+
+.WdateDiv .WdayOn{
+	cursor:pointer;
+	background-color:#74d2d9 ;
+}
+
+.WdateDiv .Wwday{
+	cursor:pointer;
+	color:#ab1e1e;
+}
+
+.WdateDiv .WwdayOn{
+	cursor:pointer;
+	background-color:#74d2d9;
+}
+.WdateDiv .Wtoday{
+	cursor:pointer;
+	color:blue;
+}
+.WdateDiv .Wselday{
+	background-color:#A7E2E7;
+}
+.WdateDiv .WspecialDay{
+	background-color:#66F4DF;
+}
+
+.WdateDiv .WotherDay{ 
+	cursor:pointer;
+	color:#0099CC;	
+}
+
+.WdateDiv .WotherDayOn{ 
+	cursor:pointer;
+	background-color:#C0EBEF;	
+}
+
+.WdateDiv .WinvalidDay{
+	color:#aaa;
+}
+
+.WdateDiv #dpTime{
+	float:left;
+	margin-top:3px;
+	margin-right:30px;
+}
+
+.WdateDiv #dpTime #dpTimeStr{
+	margin-left:1px;
+	color:#497F7F;
+}
+
+.WdateDiv #dpTime input{
+	height:20px;
+	width:18px;
+	text-align:center;
+	color:#333;
+	border:#61CAD0 1px solid;	
+}
+
+.WdateDiv #dpTime .tB{
+	border-right:0px;
+}
+
+.WdateDiv #dpTime .tE{
+	border-left:0;
+	border-right:0;
+}
+
+.WdateDiv #dpTime .tm{
+	width:7px;
+	border-left:0;
+	border-right:0;
+}
+
+.WdateDiv #dpTime #dpTimeUp{
+	height:10px;
+	width:13px;
+	border:0px;
+	background:url(img.gif) no-repeat -32px -16px;
+}
+
+.WdateDiv #dpTime #dpTimeDown{
+	height:10px;
+	width:13px;
+	border:0px;
+	background:url(img.gif) no-repeat -48px -16px;
+}
+
+ .WdateDiv #dpQS {
+ 	float:left;
+	margin-right:3px;
+	margin-top:3px;
+	background:url(img.gif) no-repeat 0px -16px;
+	width:20px;
+	height:20px;
+	cursor:pointer;
+ }
+.WdateDiv #dpControl {
+	text-align:right;
+	margin-top:3px;
+}
+.WdateDiv .dpButton{ 
+	height:20px;
+	width:45px;
+	margin-top:2px;
+	border:#38B1B9 1px solid;
+	background-color:#CFEBEE;
+	color:#08575B;
+}
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/My97DatePicker/skin/whyGreen/img.gif b/pluss-wap-page/src/main/resources/static/resources/js/My97DatePicker/skin/whyGreen/img.gif
new file mode 100644
index 0000000..4003f20
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/My97DatePicker/skin/whyGreen/img.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/auto-size.js b/pluss-wap-page/src/main/resources/static/resources/js/auto-size.js
new file mode 100644
index 0000000..d5167aa
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/auto-size.js
@@ -0,0 +1,34 @@
+/**
+ * Created by lovo_bdk on 15-12-17.
+ */
+!(function(win, doc){
+    function setFontSize() {
+        // 获取window 宽度
+        // zepto实现 $(window).width()就是这么干的
+        var winWidth =  window.innerWidth;
+        doc.documentElement.style.fontSize = (winWidth /750) * 100 + 'px' ;
+
+    }
+
+    var evt = 'onorientationchange' in win ? 'orientationchange' : 'resize';
+
+    var timer = null;
+
+    win.addEventListener(evt, function () {
+        clearTimeout(timer);
+
+        timer = setTimeout(setFontSize, 300);
+    }, false);
+
+    win.addEventListener("pageshow", function(e) {
+        if (e.persisted) {
+            clearTimeout(timer);
+
+            timer = setTimeout(setFontSize, 300);
+        }
+    }, false);
+
+    //初始化
+    setFontSize();
+
+}(window, document));
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/bootstrap.min.js b/pluss-wap-page/src/main/resources/static/resources/js/bootstrap.min.js
new file mode 100644
index 0000000..f936727
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/bootstrap.min.js
@@ -0,0 +1,221 @@
+/*!
+ * Bootstrap v3.3.7 (http://getbootstrap.com)
+ * Copyright 2011-2016 Twitter, Inc.
+ * Licensed under the MIT license
+ */
+if("undefined"==typeof jQuery)throw Error("Bootstrap's JavaScript requires jQuery");+function(t){"use strict"
+var e=t.fn.jquery.split(" ")[0].split(".")
+if(e[0]<2&&e[1]<9||1==e[0]&&9==e[1]&&e[2]<1||e[0]>3)throw Error("Bootstrap's JavaScript requires jQuery version 1.9.1 or higher, but lower than version 4")}(jQuery),+function(t){"use strict"
+function e(){var t=document.createElement("bootstrap"),e={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"}
+for(var i in e)if(void 0!==t.style[i])return{end:e[i]}
+return!1}t.fn.emulateTransitionEnd=function(e){var i=!1,o=this
+t(this).one("bsTransitionEnd",function(){i=!0})
+var n=function(){i||t(o).trigger(t.support.transition.end)}
+return setTimeout(n,e),this},t(function(){t.support.transition=e(),t.support.transition&&(t.event.special.bsTransitionEnd={bindType:t.support.transition.end,delegateType:t.support.transition.end,handle:function(e){return t(e.target).is(this)?e.handleObj.handler.apply(this,arguments):void 0}})})}(jQuery),+function(t){"use strict"
+function e(e){return this.each(function(){var i=t(this),n=i.data("bs.alert")
+n||i.data("bs.alert",n=new o(this)),"string"==typeof e&&n[e].call(i)})}var i='[data-dismiss="alert"]',o=function(e){t(e).on("click",i,this.close)}
+o.VERSION="3.3.7",o.TRANSITION_DURATION=150,o.prototype.close=function(e){function i(){a.detach().trigger("closed.bs.alert").remove()}var n=t(this),s=n.attr("data-target")
+s||(s=n.attr("href"),s=s&&s.replace(/.*(?=#[^\s]*$)/,""))
+var a=t("#"===s?[]:s)
+e&&e.preventDefault(),a.length||(a=n.closest(".alert")),a.trigger(e=t.Event("close.bs.alert")),e.isDefaultPrevented()||(a.removeClass("in"),t.support.transition&&a.hasClass("fade")?a.one("bsTransitionEnd",i).emulateTransitionEnd(o.TRANSITION_DURATION):i())}
+var n=t.fn.alert
+t.fn.alert=e,t.fn.alert.Constructor=o,t.fn.alert.noConflict=function(){return t.fn.alert=n,this},t(document).on("click.bs.alert.data-api",i,o.prototype.close)}(jQuery),+function(t){"use strict"
+function e(e){return this.each(function(){var o=t(this),n=o.data("bs.button"),s="object"==typeof e&&e
+n||o.data("bs.button",n=new i(this,s)),"toggle"==e?n.toggle():e&&n.setState(e)})}var i=function(e,o){this.$element=t(e),this.options=t.extend({},i.DEFAULTS,o),this.isLoading=!1}
+i.VERSION="3.3.7",i.DEFAULTS={loadingText:null},i.prototype.setState=function(e){var i="disabled",o=this.$element,n=o.is("input")?"val":"html",s=o.data()
+e+="Text",null==s.resetText&&o.data("resetText",o[n]()),setTimeout(t.proxy(function(){this.options[e]&&o[n](null==s[e]?this.options[e]:s[e]),"loadingText"==e?(this.isLoading=!0,o.addClass(i).attr(i,i).prop(i,!0)):this.isLoading&&(this.isLoading=!1,o.removeClass(i).removeAttr(i).prop(i,!1))},this),0)},i.prototype.toggle=function(){var t=!0,e=this.$element.closest('[data-toggle="buttons"]')
+if(e.length){var i=this.$element.find("input")
+"radio"==i.prop("type")?(i.prop("checked")&&(t=!1),e.find(".active").removeClass("active"),this.$element.addClass("active")):"checkbox"==i.prop("type")&&(i.prop("checked")!==this.$element.hasClass("active")&&(t=!1),this.$element.toggleClass("active")),i.prop("checked",this.$element.hasClass("active")),t&&i.trigger("change")}else this.$element.attr("aria-pressed",!this.$element.hasClass("active")),this.$element.toggleClass("active")}
+var o=t.fn.button
+t.fn.button=e,t.fn.button.Constructor=i,t.fn.button.noConflict=function(){return t.fn.button=o,this},t(document).on("click.bs.button.data-api",'[data-toggle^="button"]',function(i){var o=t(i.target).closest(".btn")
+e.call(o,"toggle"),t(i.target).is('input[type="radio"], input[type="checkbox"]')||(i.preventDefault(),o.is("input,button")?o.trigger("focus"):o.find("input:visible,button:visible").first().trigger("focus"))}).on("focus.bs.button.data-api blur.bs.button.data-api",'[data-toggle^="button"]',function(e){t(e.target).closest(".btn").toggleClass("focus",/^focus(in)?$/.test(e.type))})}(jQuery),+function(t){"use strict"
+function e(e){return this.each(function(){var o=t(this),n=o.data("bs.carousel"),s=t.extend({},i.DEFAULTS,o.data(),"object"==typeof e&&e),a="string"==typeof e?e:s.slide
+n||o.data("bs.carousel",n=new i(this,s)),"number"==typeof e?n.to(e):a?n[a]():s.interval&&n.pause().cycle()})}var i=function(e,i){this.$element=t(e),this.$indicators=this.$element.find(".carousel-indicators"),this.options=i,this.paused=null,this.sliding=null,this.interval=null,this.$active=null,this.$items=null,this.options.keyboard&&this.$element.on("keydown.bs.carousel",t.proxy(this.keydown,this)),"hover"==this.options.pause&&!("ontouchstart"in document.documentElement)&&this.$element.on("mouseenter.bs.carousel",t.proxy(this.pause,this)).on("mouseleave.bs.carousel",t.proxy(this.cycle,this))}
+i.VERSION="3.3.7",i.TRANSITION_DURATION=600,i.DEFAULTS={interval:5e3,pause:"hover",wrap:!0,keyboard:!0},i.prototype.keydown=function(t){if(!/input|textarea/i.test(t.target.tagName)){switch(t.which){case 37:this.prev()
+break
+case 39:this.next()
+break
+default:return}t.preventDefault()}},i.prototype.cycle=function(e){return e||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(t.proxy(this.next,this),this.options.interval)),this},i.prototype.getItemIndex=function(t){return this.$items=t.parent().children(".item"),this.$items.index(t||this.$active)},i.prototype.getItemForDirection=function(t,e){var i=this.getItemIndex(e),o="prev"==t&&0===i||"next"==t&&i==this.$items.length-1
+if(o&&!this.options.wrap)return e
+var n="prev"==t?-1:1,s=(i+n)%this.$items.length
+return this.$items.eq(s)},i.prototype.to=function(t){var e=this,i=this.getItemIndex(this.$active=this.$element.find(".item.active"))
+return t>this.$items.length-1||0>t?void 0:this.sliding?this.$element.one("slid.bs.carousel",function(){e.to(t)}):i==t?this.pause().cycle():this.slide(t>i?"next":"prev",this.$items.eq(t))},i.prototype.pause=function(e){return e||(this.paused=!0),this.$element.find(".next, .prev").length&&t.support.transition&&(this.$element.trigger(t.support.transition.end),this.cycle(!0)),this.interval=clearInterval(this.interval),this},i.prototype.next=function(){return this.sliding?void 0:this.slide("next")},i.prototype.prev=function(){return this.sliding?void 0:this.slide("prev")},i.prototype.slide=function(e,o){var n=this.$element.find(".item.active"),s=o||this.getItemForDirection(e,n),a=this.interval,r="next"==e?"left":"right",l=this
+if(s.hasClass("active"))return this.sliding=!1
+var h=s[0],d=t.Event("slide.bs.carousel",{relatedTarget:h,direction:r})
+if(this.$element.trigger(d),!d.isDefaultPrevented()){if(this.sliding=!0,a&&this.pause(),this.$indicators.length){this.$indicators.find(".active").removeClass("active")
+var p=t(this.$indicators.children()[this.getItemIndex(s)])
+p&&p.addClass("active")}var c=t.Event("slid.bs.carousel",{relatedTarget:h,direction:r})
+return t.support.transition&&this.$element.hasClass("slide")?(s.addClass(e),s[0].offsetWidth,n.addClass(r),s.addClass(r),n.one("bsTransitionEnd",function(){s.removeClass([e,r].join(" ")).addClass("active"),n.removeClass(["active",r].join(" ")),l.sliding=!1,setTimeout(function(){l.$element.trigger(c)},0)}).emulateTransitionEnd(i.TRANSITION_DURATION)):(n.removeClass("active"),s.addClass("active"),this.sliding=!1,this.$element.trigger(c)),a&&this.cycle(),this}}
+var o=t.fn.carousel
+t.fn.carousel=e,t.fn.carousel.Constructor=i,t.fn.carousel.noConflict=function(){return t.fn.carousel=o,this}
+var n=function(i){var o,n=t(this),s=t(n.attr("data-target")||(o=n.attr("href"))&&o.replace(/.*(?=#[^\s]+$)/,""))
+if(s.hasClass("carousel")){var a=t.extend({},s.data(),n.data()),r=n.attr("data-slide-to")
+r&&(a.interval=!1),e.call(s,a),r&&s.data("bs.carousel").to(r),i.preventDefault()}}
+t(document).on("click.bs.carousel.data-api","[data-slide]",n).on("click.bs.carousel.data-api","[data-slide-to]",n),t(window).on("load",function(){t('[data-ride="carousel"]').each(function(){var i=t(this)
+e.call(i,i.data())})})}(jQuery),+function(t){"use strict"
+function e(e){var i,o=e.attr("data-target")||(i=e.attr("href"))&&i.replace(/.*(?=#[^\s]+$)/,"")
+return t(o)}function i(e){return this.each(function(){var i=t(this),n=i.data("bs.collapse"),s=t.extend({},o.DEFAULTS,i.data(),"object"==typeof e&&e)
+!n&&s.toggle&&/show|hide/.test(e)&&(s.toggle=!1),n||i.data("bs.collapse",n=new o(this,s)),"string"==typeof e&&n[e]()})}var o=function(e,i){this.$element=t(e),this.options=t.extend({},o.DEFAULTS,i),this.$trigger=t('[data-toggle="collapse"][href="#'+e.id+'"],[data-toggle="collapse"][data-target="#'+e.id+'"]'),this.transitioning=null,this.options.parent?this.$parent=this.getParent():this.addAriaAndCollapsedClass(this.$element,this.$trigger),this.options.toggle&&this.toggle()}
+o.VERSION="3.3.7",o.TRANSITION_DURATION=350,o.DEFAULTS={toggle:!0},o.prototype.dimension=function(){var t=this.$element.hasClass("width")
+return t?"width":"height"},o.prototype.show=function(){if(!this.transitioning&&!this.$element.hasClass("in")){var e,n=this.$parent&&this.$parent.children(".panel").children(".in, .collapsing")
+if(!(n&&n.length&&(e=n.data("bs.collapse"),e&&e.transitioning))){var s=t.Event("show.bs.collapse")
+if(this.$element.trigger(s),!s.isDefaultPrevented()){n&&n.length&&(i.call(n,"hide"),e||n.data("bs.collapse",null))
+var a=this.dimension()
+this.$element.removeClass("collapse").addClass("collapsing")[a](0).attr("aria-expanded",!0),this.$trigger.removeClass("collapsed").attr("aria-expanded",!0),this.transitioning=1
+var r=function(){this.$element.removeClass("collapsing").addClass("collapse in")[a](""),this.transitioning=0,this.$element.trigger("shown.bs.collapse")}
+if(!t.support.transition)return r.call(this)
+var l=t.camelCase(["scroll",a].join("-"))
+this.$element.one("bsTransitionEnd",t.proxy(r,this)).emulateTransitionEnd(o.TRANSITION_DURATION)[a](this.$element[0][l])}}}},o.prototype.hide=function(){if(!this.transitioning&&this.$element.hasClass("in")){var e=t.Event("hide.bs.collapse")
+if(this.$element.trigger(e),!e.isDefaultPrevented()){var i=this.dimension()
+this.$element[i](this.$element[i]())[0].offsetHeight,this.$element.addClass("collapsing").removeClass("collapse in").attr("aria-expanded",!1),this.$trigger.addClass("collapsed").attr("aria-expanded",!1),this.transitioning=1
+var n=function(){this.transitioning=0,this.$element.removeClass("collapsing").addClass("collapse").trigger("hidden.bs.collapse")}
+return t.support.transition?void this.$element[i](0).one("bsTransitionEnd",t.proxy(n,this)).emulateTransitionEnd(o.TRANSITION_DURATION):n.call(this)}}},o.prototype.toggle=function(){this[this.$element.hasClass("in")?"hide":"show"]()},o.prototype.getParent=function(){return t(this.options.parent).find('[data-toggle="collapse"][data-parent="'+this.options.parent+'"]').each(t.proxy(function(i,o){var n=t(o)
+this.addAriaAndCollapsedClass(e(n),n)},this)).end()},o.prototype.addAriaAndCollapsedClass=function(t,e){var i=t.hasClass("in")
+t.attr("aria-expanded",i),e.toggleClass("collapsed",!i).attr("aria-expanded",i)}
+var n=t.fn.collapse
+t.fn.collapse=i,t.fn.collapse.Constructor=o,t.fn.collapse.noConflict=function(){return t.fn.collapse=n,this},t(document).on("click.bs.collapse.data-api",'[data-toggle="collapse"]',function(o){var n=t(this)
+n.attr("data-target")||o.preventDefault()
+var s=e(n),a=s.data("bs.collapse"),r=a?"toggle":n.data()
+i.call(s,r)})}(jQuery),+function(t){"use strict"
+function e(e){var i=e.attr("data-target")
+i||(i=e.attr("href"),i=i&&/#[A-Za-z]/.test(i)&&i.replace(/.*(?=#[^\s]*$)/,""))
+var o=i&&t(i)
+return o&&o.length?o:e.parent()}function i(i){i&&3===i.which||(t(n).remove(),t(s).each(function(){var o=t(this),n=e(o),s={relatedTarget:this}
+n.hasClass("open")&&(i&&"click"==i.type&&/input|textarea/i.test(i.target.tagName)&&t.contains(n[0],i.target)||(n.trigger(i=t.Event("hide.bs.dropdown",s)),i.isDefaultPrevented()||(o.attr("aria-expanded","false"),n.removeClass("open").trigger(t.Event("hidden.bs.dropdown",s)))))}))}function o(e){return this.each(function(){var i=t(this),o=i.data("bs.dropdown")
+o||i.data("bs.dropdown",o=new a(this)),"string"==typeof e&&o[e].call(i)})}var n=".dropdown-backdrop",s='[data-toggle="dropdown"]',a=function(e){t(e).on("click.bs.dropdown",this.toggle)}
+a.VERSION="3.3.7",a.prototype.toggle=function(o){var n=t(this)
+if(!n.is(".disabled, :disabled")){var s=e(n),a=s.hasClass("open")
+if(i(),!a){"ontouchstart"in document.documentElement&&!s.closest(".navbar-nav").length&&t(document.createElement("div")).addClass("dropdown-backdrop").insertAfter(t(this)).on("click",i)
+var r={relatedTarget:this}
+if(s.trigger(o=t.Event("show.bs.dropdown",r)),o.isDefaultPrevented())return
+n.trigger("focus").attr("aria-expanded","true"),s.toggleClass("open").trigger(t.Event("shown.bs.dropdown",r))}return!1}},a.prototype.keydown=function(i){if(/(38|40|27|32)/.test(i.which)&&!/input|textarea/i.test(i.target.tagName)){var o=t(this)
+if(i.preventDefault(),i.stopPropagation(),!o.is(".disabled, :disabled")){var n=e(o),a=n.hasClass("open")
+if(!a&&27!=i.which||a&&27==i.which)return 27==i.which&&n.find(s).trigger("focus"),o.trigger("click")
+var r=" li:not(.disabled):visible a",l=n.find(".dropdown-menu"+r)
+if(l.length){var h=l.index(i.target)
+38==i.which&&h>0&&h--,40==i.which&&h<l.length-1&&h++,~h||(h=0),l.eq(h).trigger("focus")}}}}
+var r=t.fn.dropdown
+t.fn.dropdown=o,t.fn.dropdown.Constructor=a,t.fn.dropdown.noConflict=function(){return t.fn.dropdown=r,this},t(document).on("click.bs.dropdown.data-api",i).on("click.bs.dropdown.data-api",".dropdown form",function(t){t.stopPropagation()}).on("click.bs.dropdown.data-api",s,a.prototype.toggle).on("keydown.bs.dropdown.data-api",s,a.prototype.keydown).on("keydown.bs.dropdown.data-api",".dropdown-menu",a.prototype.keydown)}(jQuery),+function(t){"use strict"
+function e(e,o){return this.each(function(){var n=t(this),s=n.data("bs.modal"),a=t.extend({},i.DEFAULTS,n.data(),"object"==typeof e&&e)
+s||n.data("bs.modal",s=new i(this,a)),"string"==typeof e?s[e](o):a.show&&s.show(o)})}var i=function(e,i){this.options=i,this.$body=t(document.body),this.$element=t(e),this.$dialog=this.$element.find(".modal-dialog"),this.$backdrop=null,this.isShown=null,this.originalBodyPad=null,this.scrollbarWidth=0,this.ignoreBackdropClick=!1,this.options.remote&&this.$element.find(".modal-content").load(this.options.remote,t.proxy(function(){this.$element.trigger("loaded.bs.modal")},this))}
+i.VERSION="3.3.7",i.TRANSITION_DURATION=300,i.BACKDROP_TRANSITION_DURATION=150,i.DEFAULTS={backdrop:!0,keyboard:!0,show:!0},i.prototype.toggle=function(t){return this.isShown?this.hide():this.show(t)},i.prototype.show=function(e){var o=this,n=t.Event("show.bs.modal",{relatedTarget:e})
+this.$element.trigger(n),this.isShown||n.isDefaultPrevented()||(this.isShown=!0,this.checkScrollbar(),this.setScrollbar(),this.$body.addClass("modal-open"),this.escape(),this.resize(),this.$element.on("click.dismiss.bs.modal",'[data-dismiss="modal"]',t.proxy(this.hide,this)),this.$dialog.on("mousedown.dismiss.bs.modal",function(){o.$element.one("mouseup.dismiss.bs.modal",function(e){t(e.target).is(o.$element)&&(o.ignoreBackdropClick=!0)})}),this.backdrop(function(){var n=t.support.transition&&o.$element.hasClass("fade")
+o.$element.parent().length||o.$element.appendTo(o.$body),o.$element.show().scrollTop(0),o.adjustDialog(),n&&o.$element[0].offsetWidth,o.$element.addClass("in"),o.enforceFocus()
+var s=t.Event("shown.bs.modal",{relatedTarget:e})
+n?o.$dialog.one("bsTransitionEnd",function(){o.$element.trigger("focus").trigger(s)}).emulateTransitionEnd(i.TRANSITION_DURATION):o.$element.trigger("focus").trigger(s)}))},i.prototype.hide=function(e){e&&e.preventDefault(),e=t.Event("hide.bs.modal"),this.$element.trigger(e),this.isShown&&!e.isDefaultPrevented()&&(this.isShown=!1,this.escape(),this.resize(),t(document).off("focusin.bs.modal"),this.$element.removeClass("in").off("click.dismiss.bs.modal").off("mouseup.dismiss.bs.modal"),this.$dialog.off("mousedown.dismiss.bs.modal"),t.support.transition&&this.$element.hasClass("fade")?this.$element.one("bsTransitionEnd",t.proxy(this.hideModal,this)).emulateTransitionEnd(i.TRANSITION_DURATION):this.hideModal())},i.prototype.enforceFocus=function(){t(document).off("focusin.bs.modal").on("focusin.bs.modal",t.proxy(function(t){document===t.target||this.$element[0]===t.target||this.$element.has(t.target).length||this.$element.trigger("focus")},this))},i.prototype.escape=function(){this.isShown&&this.options.keyboard?this.$element.on("keydown.dismiss.bs.modal",t.proxy(function(t){27==t.which&&this.hide()},this)):this.isShown||this.$element.off("keydown.dismiss.bs.modal")},i.prototype.resize=function(){this.isShown?t(window).on("resize.bs.modal",t.proxy(this.handleUpdate,this)):t(window).off("resize.bs.modal")},i.prototype.hideModal=function(){var t=this
+this.$element.hide(),this.backdrop(function(){t.$body.removeClass("modal-open"),t.resetAdjustments(),t.resetScrollbar(),t.$element.trigger("hidden.bs.modal")})},i.prototype.removeBackdrop=function(){this.$backdrop&&this.$backdrop.remove(),this.$backdrop=null},i.prototype.backdrop=function(e){var o=this,n=this.$element.hasClass("fade")?"fade":""
+if(this.isShown&&this.options.backdrop){var s=t.support.transition&&n
+if(this.$backdrop=t(document.createElement("div")).addClass("modal-backdrop "+n).appendTo(this.$body),this.$element.on("click.dismiss.bs.modal",t.proxy(function(t){return this.ignoreBackdropClick?void(this.ignoreBackdropClick=!1):void(t.target===t.currentTarget&&("static"==this.options.backdrop?this.$element[0].focus():this.hide()))},this)),s&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),!e)return
+s?this.$backdrop.one("bsTransitionEnd",e).emulateTransitionEnd(i.BACKDROP_TRANSITION_DURATION):e()}else if(!this.isShown&&this.$backdrop){this.$backdrop.removeClass("in")
+var a=function(){o.removeBackdrop(),e&&e()}
+t.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one("bsTransitionEnd",a).emulateTransitionEnd(i.BACKDROP_TRANSITION_DURATION):a()}else e&&e()},i.prototype.handleUpdate=function(){this.adjustDialog()},i.prototype.adjustDialog=function(){var t=this.$element[0].scrollHeight>document.documentElement.clientHeight
+this.$element.css({paddingLeft:!this.bodyIsOverflowing&&t?this.scrollbarWidth:"",paddingRight:this.bodyIsOverflowing&&!t?this.scrollbarWidth:""})},i.prototype.resetAdjustments=function(){this.$element.css({paddingLeft:"",paddingRight:""})},i.prototype.checkScrollbar=function(){var t=window.innerWidth
+if(!t){var e=document.documentElement.getBoundingClientRect()
+t=e.right-Math.abs(e.left)}this.bodyIsOverflowing=document.body.clientWidth<t,this.scrollbarWidth=this.measureScrollbar()},i.prototype.setScrollbar=function(){var t=parseInt(this.$body.css("padding-right")||0,10)
+this.originalBodyPad=document.body.style.paddingRight||"",this.bodyIsOverflowing&&this.$body.css("padding-right",t+this.scrollbarWidth)},i.prototype.resetScrollbar=function(){this.$body.css("padding-right",this.originalBodyPad)},i.prototype.measureScrollbar=function(){var t=document.createElement("div")
+t.className="modal-scrollbar-measure",this.$body.append(t)
+var e=t.offsetWidth-t.clientWidth
+return this.$body[0].removeChild(t),e}
+var o=t.fn.modal
+t.fn.modal=e,t.fn.modal.Constructor=i,t.fn.modal.noConflict=function(){return t.fn.modal=o,this},t(document).on("click.bs.modal.data-api",'[data-toggle="modal"]',function(i){var o=t(this),n=o.attr("href"),s=t(o.attr("data-target")||n&&n.replace(/.*(?=#[^\s]+$)/,"")),a=s.data("bs.modal")?"toggle":t.extend({remote:!/#/.test(n)&&n},s.data(),o.data())
+o.is("a")&&i.preventDefault(),s.one("show.bs.modal",function(t){t.isDefaultPrevented()||s.one("hidden.bs.modal",function(){o.is(":visible")&&o.trigger("focus")})}),e.call(s,a,this)})}(jQuery),+function(t){"use strict"
+function e(e){return this.each(function(){var o=t(this),n=o.data("bs.tooltip"),s="object"==typeof e&&e;(n||!/destroy|hide/.test(e))&&(n||o.data("bs.tooltip",n=new i(this,s)),"string"==typeof e&&n[e]())})}var i=function(t,e){this.type=null,this.options=null,this.enabled=null,this.timeout=null,this.hoverState=null,this.$element=null,this.inState=null,this.init("tooltip",t,e)}
+i.VERSION="3.3.7",i.TRANSITION_DURATION=150,i.DEFAULTS={animation:!0,placement:"top",selector:!1,template:'<div class="tooltip" role="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',trigger:"hover focus",title:"",delay:0,html:!1,container:!1,viewport:{selector:"body",padding:0}},i.prototype.init=function(e,i,o){if(this.enabled=!0,this.type=e,this.$element=t(i),this.options=this.getOptions(o),this.$viewport=this.options.viewport&&t(t.isFunction(this.options.viewport)?this.options.viewport.call(this,this.$element):this.options.viewport.selector||this.options.viewport),this.inState={click:!1,hover:!1,focus:!1},this.$element[0]instanceof document.constructor&&!this.options.selector)throw Error("`selector` option must be specified when initializing "+this.type+" on the window.document object!")
+for(var n=this.options.trigger.split(" "),s=n.length;s--;){var a=n[s]
+if("click"==a)this.$element.on("click."+this.type,this.options.selector,t.proxy(this.toggle,this))
+else if("manual"!=a){var r="hover"==a?"mouseenter":"focusin",l="hover"==a?"mouseleave":"focusout"
+this.$element.on(r+"."+this.type,this.options.selector,t.proxy(this.enter,this)),this.$element.on(l+"."+this.type,this.options.selector,t.proxy(this.leave,this))}}this.options.selector?this._options=t.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},i.prototype.getDefaults=function(){return i.DEFAULTS},i.prototype.getOptions=function(e){return e=t.extend({},this.getDefaults(),this.$element.data(),e),e.delay&&"number"==typeof e.delay&&(e.delay={show:e.delay,hide:e.delay}),e},i.prototype.getDelegateOptions=function(){var e={},i=this.getDefaults()
+return this._options&&t.each(this._options,function(t,o){i[t]!=o&&(e[t]=o)}),e},i.prototype.enter=function(e){var i=e instanceof this.constructor?e:t(e.currentTarget).data("bs."+this.type)
+return i||(i=new this.constructor(e.currentTarget,this.getDelegateOptions()),t(e.currentTarget).data("bs."+this.type,i)),e instanceof t.Event&&(i.inState["focusin"==e.type?"focus":"hover"]=!0),i.tip().hasClass("in")||"in"==i.hoverState?void(i.hoverState="in"):(clearTimeout(i.timeout),i.hoverState="in",i.options.delay&&i.options.delay.show?void(i.timeout=setTimeout(function(){"in"==i.hoverState&&i.show()},i.options.delay.show)):i.show())},i.prototype.isInStateTrue=function(){for(var t in this.inState)if(this.inState[t])return!0
+return!1},i.prototype.leave=function(e){var i=e instanceof this.constructor?e:t(e.currentTarget).data("bs."+this.type)
+return i||(i=new this.constructor(e.currentTarget,this.getDelegateOptions()),t(e.currentTarget).data("bs."+this.type,i)),e instanceof t.Event&&(i.inState["focusout"==e.type?"focus":"hover"]=!1),i.isInStateTrue()?void 0:(clearTimeout(i.timeout),i.hoverState="out",i.options.delay&&i.options.delay.hide?void(i.timeout=setTimeout(function(){"out"==i.hoverState&&i.hide()},i.options.delay.hide)):i.hide())},i.prototype.show=function(){var e=t.Event("show.bs."+this.type)
+if(this.hasContent()&&this.enabled){this.$element.trigger(e)
+var o=t.contains(this.$element[0].ownerDocument.documentElement,this.$element[0])
+if(e.isDefaultPrevented()||!o)return
+var n=this,s=this.tip(),a=this.getUID(this.type)
+this.setContent(),s.attr("id",a),this.$element.attr("aria-describedby",a),this.options.animation&&s.addClass("fade")
+var r="function"==typeof this.options.placement?this.options.placement.call(this,s[0],this.$element[0]):this.options.placement,l=/\s?auto?\s?/i,h=l.test(r)
+h&&(r=r.replace(l,"")||"top"),s.detach().css({top:0,left:0,display:"block"}).addClass(r).data("bs."+this.type,this),this.options.container?s.appendTo(this.options.container):s.insertAfter(this.$element),this.$element.trigger("inserted.bs."+this.type)
+var d=this.getPosition(),p=s[0].offsetWidth,c=s[0].offsetHeight
+if(h){var f=r,u=this.getPosition(this.$viewport)
+r="bottom"==r&&d.bottom+c>u.bottom?"top":"top"==r&&d.top-c<u.top?"bottom":"right"==r&&d.right+p>u.width?"left":"left"==r&&d.left-p<u.left?"right":r,s.removeClass(f).addClass(r)}var g=this.getCalculatedOffset(r,d,p,c)
+this.applyPlacement(g,r)
+var m=function(){var t=n.hoverState
+n.$element.trigger("shown.bs."+n.type),n.hoverState=null,"out"==t&&n.leave(n)}
+t.support.transition&&this.$tip.hasClass("fade")?s.one("bsTransitionEnd",m).emulateTransitionEnd(i.TRANSITION_DURATION):m()}},i.prototype.applyPlacement=function(e,i){var o=this.tip(),n=o[0].offsetWidth,s=o[0].offsetHeight,a=parseInt(o.css("margin-top"),10),r=parseInt(o.css("margin-left"),10)
+isNaN(a)&&(a=0),isNaN(r)&&(r=0),e.top+=a,e.left+=r,t.offset.setOffset(o[0],t.extend({using:function(t){o.css({top:Math.round(t.top),left:Math.round(t.left)})}},e),0),o.addClass("in")
+var l=o[0].offsetWidth,h=o[0].offsetHeight
+"top"==i&&h!=s&&(e.top=e.top+s-h)
+var d=this.getViewportAdjustedDelta(i,e,l,h)
+d.left?e.left+=d.left:e.top+=d.top
+var p=/top|bottom/.test(i),c=p?2*d.left-n+l:2*d.top-s+h,f=p?"offsetWidth":"offsetHeight"
+o.offset(e),this.replaceArrow(c,o[0][f],p)},i.prototype.replaceArrow=function(t,e,i){this.arrow().css(i?"left":"top",50*(1-t/e)+"%").css(i?"top":"left","")},i.prototype.setContent=function(){var t=this.tip(),e=this.getTitle()
+t.find(".tooltip-inner")[this.options.html?"html":"text"](e),t.removeClass("fade in top bottom left right")},i.prototype.hide=function(e){function o(){"in"!=n.hoverState&&s.detach(),n.$element&&n.$element.removeAttr("aria-describedby").trigger("hidden.bs."+n.type),e&&e()}var n=this,s=t(this.$tip),a=t.Event("hide.bs."+this.type)
+return this.$element.trigger(a),a.isDefaultPrevented()?void 0:(s.removeClass("in"),t.support.transition&&s.hasClass("fade")?s.one("bsTransitionEnd",o).emulateTransitionEnd(i.TRANSITION_DURATION):o(),this.hoverState=null,this)},i.prototype.fixTitle=function(){var t=this.$element;(t.attr("title")||"string"!=typeof t.attr("data-original-title"))&&t.attr("data-original-title",t.attr("title")||"").attr("title","")},i.prototype.hasContent=function(){return this.getTitle()},i.prototype.getPosition=function(e){e=e||this.$element
+var i=e[0],o="BODY"==i.tagName,n=i.getBoundingClientRect()
+null==n.width&&(n=t.extend({},n,{width:n.right-n.left,height:n.bottom-n.top}))
+var s=window.SVGElement&&i instanceof window.SVGElement,a=o?{top:0,left:0}:s?null:e.offset(),r={scroll:o?document.documentElement.scrollTop||document.body.scrollTop:e.scrollTop()},l=o?{width:t(window).width(),height:t(window).height()}:null
+return t.extend({},n,r,l,a)},i.prototype.getCalculatedOffset=function(t,e,i,o){return"bottom"==t?{top:e.top+e.height,left:e.left+e.width/2-i/2}:"top"==t?{top:e.top-o,left:e.left+e.width/2-i/2}:"left"==t?{top:e.top+e.height/2-o/2,left:e.left-i}:{top:e.top+e.height/2-o/2,left:e.left+e.width}},i.prototype.getViewportAdjustedDelta=function(t,e,i,o){var n={top:0,left:0}
+if(!this.$viewport)return n
+var s=this.options.viewport&&this.options.viewport.padding||0,a=this.getPosition(this.$viewport)
+if(/right|left/.test(t)){var r=e.top-s-a.scroll,l=e.top+s-a.scroll+o
+r<a.top?n.top=a.top-r:l>a.top+a.height&&(n.top=a.top+a.height-l)}else{var h=e.left-s,d=e.left+s+i
+h<a.left?n.left=a.left-h:d>a.right&&(n.left=a.left+a.width-d)}return n},i.prototype.getTitle=function(){var t,e=this.$element,i=this.options
+return t=e.attr("data-original-title")||("function"==typeof i.title?i.title.call(e[0]):i.title)},i.prototype.getUID=function(t){do t+=~~(1e6*Math.random())
+while(document.getElementById(t))
+return t},i.prototype.tip=function(){if(!this.$tip&&(this.$tip=t(this.options.template),1!=this.$tip.length))throw Error(this.type+" `template` option must consist of exactly 1 top-level element!")
+return this.$tip},i.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".tooltip-arrow")},i.prototype.enable=function(){this.enabled=!0},i.prototype.disable=function(){this.enabled=!1},i.prototype.toggleEnabled=function(){this.enabled=!this.enabled},i.prototype.toggle=function(e){var i=this
+e&&(i=t(e.currentTarget).data("bs."+this.type),i||(i=new this.constructor(e.currentTarget,this.getDelegateOptions()),t(e.currentTarget).data("bs."+this.type,i))),e?(i.inState.click=!i.inState.click,i.isInStateTrue()?i.enter(i):i.leave(i)):i.tip().hasClass("in")?i.leave(i):i.enter(i)},i.prototype.destroy=function(){var t=this
+clearTimeout(this.timeout),this.hide(function(){t.$element.off("."+t.type).removeData("bs."+t.type),t.$tip&&t.$tip.detach(),t.$tip=null,t.$arrow=null,t.$viewport=null,t.$element=null})}
+var o=t.fn.tooltip
+t.fn.tooltip=e,t.fn.tooltip.Constructor=i,t.fn.tooltip.noConflict=function(){return t.fn.tooltip=o,this}}(jQuery),+function(t){"use strict"
+function e(e){return this.each(function(){var o=t(this),n=o.data("bs.popover"),s="object"==typeof e&&e;(n||!/destroy|hide/.test(e))&&(n||o.data("bs.popover",n=new i(this,s)),"string"==typeof e&&n[e]())})}var i=function(t,e){this.init("popover",t,e)}
+if(!t.fn.tooltip)throw Error("Popover requires tooltip.js")
+i.VERSION="3.3.7",i.DEFAULTS=t.extend({},t.fn.tooltip.Constructor.DEFAULTS,{placement:"right",trigger:"click",content:"",template:'<div class="popover" role="tooltip"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'}),i.prototype=t.extend({},t.fn.tooltip.Constructor.prototype),i.prototype.constructor=i,i.prototype.getDefaults=function(){return i.DEFAULTS},i.prototype.setContent=function(){var t=this.tip(),e=this.getTitle(),i=this.getContent()
+t.find(".popover-title")[this.options.html?"html":"text"](e),t.find(".popover-content").children().detach().end()[this.options.html?"string"==typeof i?"html":"append":"text"](i),t.removeClass("fade top bottom left right in"),t.find(".popover-title").html()||t.find(".popover-title").hide()},i.prototype.hasContent=function(){return this.getTitle()||this.getContent()},i.prototype.getContent=function(){var t=this.$element,e=this.options
+return t.attr("data-content")||("function"==typeof e.content?e.content.call(t[0]):e.content)},i.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".arrow")}
+var o=t.fn.popover
+t.fn.popover=e,t.fn.popover.Constructor=i,t.fn.popover.noConflict=function(){return t.fn.popover=o,this}}(jQuery),+function(t){"use strict"
+function e(i,o){this.$body=t(document.body),this.$scrollElement=t(t(i).is(document.body)?window:i),this.options=t.extend({},e.DEFAULTS,o),this.selector=(this.options.target||"")+" .nav li > a",this.offsets=[],this.targets=[],this.activeTarget=null,this.scrollHeight=0,this.$scrollElement.on("scroll.bs.scrollspy",t.proxy(this.process,this)),this.refresh(),this.process()}function i(i){return this.each(function(){var o=t(this),n=o.data("bs.scrollspy"),s="object"==typeof i&&i
+n||o.data("bs.scrollspy",n=new e(this,s)),"string"==typeof i&&n[i]()})}e.VERSION="3.3.7",e.DEFAULTS={offset:10},e.prototype.getScrollHeight=function(){return this.$scrollElement[0].scrollHeight||Math.max(this.$body[0].scrollHeight,document.documentElement.scrollHeight)},e.prototype.refresh=function(){var e=this,i="offset",o=0
+this.offsets=[],this.targets=[],this.scrollHeight=this.getScrollHeight(),t.isWindow(this.$scrollElement[0])||(i="position",o=this.$scrollElement.scrollTop()),this.$body.find(this.selector).map(function(){var e=t(this),n=e.data("target")||e.attr("href"),s=/^#./.test(n)&&t(n)
+return s&&s.length&&s.is(":visible")&&[[s[i]().top+o,n]]||null}).sort(function(t,e){return t[0]-e[0]}).each(function(){e.offsets.push(this[0]),e.targets.push(this[1])})},e.prototype.process=function(){var t,e=this.$scrollElement.scrollTop()+this.options.offset,i=this.getScrollHeight(),o=this.options.offset+i-this.$scrollElement.height(),n=this.offsets,s=this.targets,a=this.activeTarget
+if(this.scrollHeight!=i&&this.refresh(),e>=o)return a!=(t=s[s.length-1])&&this.activate(t)
+if(a&&e<n[0])return this.activeTarget=null,this.clear()
+for(t=n.length;t--;)a!=s[t]&&e>=n[t]&&(void 0===n[t+1]||e<n[t+1])&&this.activate(s[t])},e.prototype.activate=function(e){this.activeTarget=e,this.clear()
+var i=this.selector+'[data-target="'+e+'"],'+this.selector+'[href="'+e+'"]',o=t(i).parents("li").addClass("active")
+o.parent(".dropdown-menu").length&&(o=o.closest("li.dropdown").addClass("active")),o.trigger("activate.bs.scrollspy")},e.prototype.clear=function(){t(this.selector).parentsUntil(this.options.target,".active").removeClass("active")}
+var o=t.fn.scrollspy
+t.fn.scrollspy=i,t.fn.scrollspy.Constructor=e,t.fn.scrollspy.noConflict=function(){return t.fn.scrollspy=o,this},t(window).on("load.bs.scrollspy.data-api",function(){t('[data-spy="scroll"]').each(function(){var e=t(this)
+i.call(e,e.data())})})}(jQuery),+function(t){"use strict"
+function e(e){return this.each(function(){var o=t(this),n=o.data("bs.tab")
+n||o.data("bs.tab",n=new i(this)),"string"==typeof e&&n[e]()})}var i=function(e){this.element=t(e)}
+i.VERSION="3.3.7",i.TRANSITION_DURATION=150,i.prototype.show=function(){var e=this.element,i=e.closest("ul:not(.dropdown-menu)"),o=e.data("target")
+if(o||(o=e.attr("href"),o=o&&o.replace(/.*(?=#[^\s]*$)/,"")),!e.parent("li").hasClass("active")){var n=i.find(".active:last a"),s=t.Event("hide.bs.tab",{relatedTarget:e[0]}),a=t.Event("show.bs.tab",{relatedTarget:n[0]})
+if(n.trigger(s),e.trigger(a),!a.isDefaultPrevented()&&!s.isDefaultPrevented()){var r=t(o)
+this.activate(e.closest("li"),i),this.activate(r,r.parent(),function(){n.trigger({type:"hidden.bs.tab",relatedTarget:e[0]}),e.trigger({type:"shown.bs.tab",relatedTarget:n[0]})})}}},i.prototype.activate=function(e,o,n){function s(){a.removeClass("active").find("> .dropdown-menu > .active").removeClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!1),e.addClass("active").find('[data-toggle="tab"]').attr("aria-expanded",!0),r?(e[0].offsetWidth,e.addClass("in")):e.removeClass("fade"),e.parent(".dropdown-menu").length&&e.closest("li.dropdown").addClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!0),n&&n()}var a=o.find("> .active"),r=n&&t.support.transition&&(a.length&&a.hasClass("fade")||!!o.find("> .fade").length)
+a.length&&r?a.one("bsTransitionEnd",s).emulateTransitionEnd(i.TRANSITION_DURATION):s(),a.removeClass("in")}
+var o=t.fn.tab
+t.fn.tab=e,t.fn.tab.Constructor=i,t.fn.tab.noConflict=function(){return t.fn.tab=o,this}
+var n=function(i){i.preventDefault(),e.call(t(this),"show")}
+t(document).on("click.bs.tab.data-api",'[data-toggle="tab"]',n).on("click.bs.tab.data-api",'[data-toggle="pill"]',n)}(jQuery),+function(t){"use strict"
+function e(e){return this.each(function(){var o=t(this),n=o.data("bs.affix"),s="object"==typeof e&&e
+n||o.data("bs.affix",n=new i(this,s)),"string"==typeof e&&n[e]()})}var i=function(e,o){this.options=t.extend({},i.DEFAULTS,o),this.$target=t(this.options.target).on("scroll.bs.affix.data-api",t.proxy(this.checkPosition,this)).on("click.bs.affix.data-api",t.proxy(this.checkPositionWithEventLoop,this)),this.$element=t(e),this.affixed=null,this.unpin=null,this.pinnedOffset=null,this.checkPosition()}
+i.VERSION="3.3.7",i.RESET="affix affix-top affix-bottom",i.DEFAULTS={offset:0,target:window},i.prototype.getState=function(t,e,i,o){var n=this.$target.scrollTop(),s=this.$element.offset(),a=this.$target.height()
+if(null!=i&&"top"==this.affixed)return i>n?"top":!1
+if("bottom"==this.affixed)return null!=i?n+this.unpin<=s.top?!1:"bottom":t-o>=n+a?!1:"bottom"
+var r=null==this.affixed,l=r?n:s.top,h=r?a:e
+return null!=i&&i>=n?"top":null!=o&&l+h>=t-o?"bottom":!1},i.prototype.getPinnedOffset=function(){if(this.pinnedOffset)return this.pinnedOffset
+this.$element.removeClass(i.RESET).addClass("affix")
+var t=this.$target.scrollTop(),e=this.$element.offset()
+return this.pinnedOffset=e.top-t},i.prototype.checkPositionWithEventLoop=function(){setTimeout(t.proxy(this.checkPosition,this),1)},i.prototype.checkPosition=function(){if(this.$element.is(":visible")){var e=this.$element.height(),o=this.options.offset,n=o.top,s=o.bottom,a=Math.max(t(document).height(),t(document.body).height())
+"object"!=typeof o&&(s=n=o),"function"==typeof n&&(n=o.top(this.$element)),"function"==typeof s&&(s=o.bottom(this.$element))
+var r=this.getState(a,e,n,s)
+if(this.affixed!=r){null!=this.unpin&&this.$element.css("top","")
+var l="affix"+(r?"-"+r:""),h=t.Event(l+".bs.affix")
+if(this.$element.trigger(h),h.isDefaultPrevented())return
+this.affixed=r,this.unpin="bottom"==r?this.getPinnedOffset():null,this.$element.removeClass(i.RESET).addClass(l).trigger(l.replace("affix","affixed")+".bs.affix")}"bottom"==r&&this.$element.offset({top:a-e-s})}}
+var o=t.fn.affix
+t.fn.affix=e,t.fn.affix.Constructor=i,t.fn.affix.noConflict=function(){return t.fn.affix=o,this},t(window).on("load",function(){t('[data-spy="affix"]').each(function(){var i=t(this),o=i.data()
+o.offset=o.offset||{},null!=o.offsetBottom&&(o.offset.bottom=o.offsetBottom),null!=o.offsetTop&&(o.offset.top=o.offsetTop),e.call(i,o)})})}(jQuery)
+
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/city-picker.js b/pluss-wap-page/src/main/resources/static/resources/js/city-picker.js
new file mode 100644
index 0000000..129755d
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/city-picker.js
@@ -0,0 +1,16713 @@
+// jshint ignore: start
++function($){
+
+$.rawCitiesData = [
+  {
+    "name":"北京",
+    "code":"110000",
+    "sub": [
+      {
+        "name": "北京市",
+        "code": "110000",
+        "sub":[
+            {
+              "name":"东城区",
+              "code":"110101"
+            },
+            {
+              "name":"西城区",
+              "code":"110102"
+            },
+            {
+              "name":"朝阳区",
+              "code":"110105"
+            },
+            {
+              "name":"丰台区",
+              "code":"110106"
+            },
+            {
+              "name":"石景山区",
+              "code":"110107"
+            },
+            {
+              "name":"海淀区",
+              "code":"110108"
+            },
+            {
+              "name":"门头沟区",
+              "code":"110109"
+            },
+            {
+              "name":"房山区",
+              "code":"110111"
+            },
+            {
+              "name":"通州区",
+              "code":"110112"
+            },
+            {
+              "name":"顺义区",
+              "code":"110113"
+            },
+            {
+              "name":"昌平区",
+              "code":"110114"
+            },
+            {
+              "name":"大兴区",
+              "code":"110115"
+            },
+            {
+              "name":"怀柔区",
+              "code":"110116"
+            },
+            {
+              "name":"平谷区",
+              "code":"110117"
+            },
+            {
+              "name":"密云县",
+              "code":"110228"
+            },
+            {
+              "name":"延庆县",
+              "code":"110229"
+            }
+        ]
+      }
+    ]
+  },
+  {
+    "name":"天津",
+    "code":"120000",
+    "sub": [
+      {
+        "name": "天津市",
+        "code": "120000",
+        "sub":[
+            {
+              "name":"和平区",
+              "code":"120101"
+            },
+            {
+              "name":"河东区",
+              "code":"120102"
+            },
+            {
+              "name":"河西区",
+              "code":"120103"
+            },
+            {
+              "name":"南开区",
+              "code":"120104"
+            },
+            {
+              "name":"河北区",
+              "code":"120105"
+            },
+            {
+              "name":"红桥区",
+              "code":"120106"
+            },
+            {
+              "name":"东丽区",
+              "code":"120110"
+            },
+            {
+              "name":"西青区",
+              "code":"120111"
+            },
+            {
+              "name":"津南区",
+              "code":"120112"
+            },
+            {
+              "name":"北辰区",
+              "code":"120113"
+            },
+            {
+              "name":"武清区",
+              "code":"120114"
+            },
+            {
+              "name":"宝坻区",
+              "code":"120115"
+            },
+            {
+              "name":"滨海新区",
+              "code":"120116"
+            },
+            {
+              "name":"宁河县",
+              "code":"120221"
+            },
+            {
+              "name":"静海县",
+              "code":"120223"
+            },
+            {
+              "name":"蓟县",
+              "code":"120225"
+            }
+        ]
+      }
+    ]
+  },
+  {
+    "name":"河北省",
+    "code":"130000",
+    "sub":[
+      {
+        "name":"石家庄市",
+        "code":"130100",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"130101"
+          },
+          {
+            "name":"长安区",
+            "code":"130102"
+          },
+          {
+            "name":"桥西区",
+            "code":"130104"
+          },
+          {
+            "name":"新华区",
+            "code":"130105"
+          },
+          {
+            "name":"井陉矿区",
+            "code":"130107"
+          },
+          {
+            "name":"裕华区",
+            "code":"130108"
+          },
+          {
+            "name":"藁城区",
+            "code":"130109"
+          },
+          {
+            "name":"鹿泉区",
+            "code":"130110"
+          },
+          {
+            "name":"栾城区",
+            "code":"130111"
+          },
+          {
+            "name":"井陉县",
+            "code":"130121"
+          },
+          {
+            "name":"正定县",
+            "code":"130123"
+          },
+          {
+            "name":"行唐县",
+            "code":"130125"
+          },
+          {
+            "name":"灵寿县",
+            "code":"130126"
+          },
+          {
+            "name":"高邑县",
+            "code":"130127"
+          },
+          {
+            "name":"深泽县",
+            "code":"130128"
+          },
+          {
+            "name":"赞皇县",
+            "code":"130129"
+          },
+          {
+            "name":"无极县",
+            "code":"130130"
+          },
+          {
+            "name":"平山县",
+            "code":"130131"
+          },
+          {
+            "name":"元氏县",
+            "code":"130132"
+          },
+          {
+            "name":"赵县",
+            "code":"130133"
+          },
+          {
+            "name":"辛集市",
+            "code":"130181"
+          },
+          {
+            "name":"晋州市",
+            "code":"130183"
+          },
+          {
+            "name":"新乐市",
+            "code":"130184"
+          }
+        ]
+      },
+      {
+        "name":"唐山市",
+        "code":"130200",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"130201"
+          },
+          {
+            "name":"路南区",
+            "code":"130202"
+          },
+          {
+            "name":"路北区",
+            "code":"130203"
+          },
+          {
+            "name":"古冶区",
+            "code":"130204"
+          },
+          {
+            "name":"开平区",
+            "code":"130205"
+          },
+          {
+            "name":"丰南区",
+            "code":"130207"
+          },
+          {
+            "name":"丰润区",
+            "code":"130208"
+          },
+          {
+            "name":"曹妃甸区",
+            "code":"130209"
+          },
+          {
+            "name":"滦县",
+            "code":"130223"
+          },
+          {
+            "name":"滦南县",
+            "code":"130224"
+          },
+          {
+            "name":"乐亭县",
+            "code":"130225"
+          },
+          {
+            "name":"迁西县",
+            "code":"130227"
+          },
+          {
+            "name":"玉田县",
+            "code":"130229"
+          },
+          {
+            "name":"遵化市",
+            "code":"130281"
+          },
+          {
+            "name":"迁安市",
+            "code":"130283"
+          }
+        ]
+      },
+      {
+        "name":"秦皇岛市",
+        "code":"130300",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"130301"
+          },
+          {
+            "name":"海港区",
+            "code":"130302"
+          },
+          {
+            "name":"山海关区",
+            "code":"130303"
+          },
+          {
+            "name":"北戴河区",
+            "code":"130304"
+          },
+          {
+            "name":"青龙满族自治县",
+            "code":"130321"
+          },
+          {
+            "name":"昌黎县",
+            "code":"130322"
+          },
+          {
+            "name":"抚宁县",
+            "code":"130323"
+          },
+          {
+            "name":"卢龙县",
+            "code":"130324"
+          }
+        ]
+      },
+      {
+        "name":"邯郸市",
+        "code":"130400",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"130401"
+          },
+          {
+            "name":"邯山区",
+            "code":"130402"
+          },
+          {
+            "name":"丛台区",
+            "code":"130403"
+          },
+          {
+            "name":"复兴区",
+            "code":"130404"
+          },
+          {
+            "name":"峰峰矿区",
+            "code":"130406"
+          },
+          {
+            "name":"邯郸县",
+            "code":"130421"
+          },
+          {
+            "name":"临漳县",
+            "code":"130423"
+          },
+          {
+            "name":"成安县",
+            "code":"130424"
+          },
+          {
+            "name":"大名县",
+            "code":"130425"
+          },
+          {
+            "name":"涉县",
+            "code":"130426"
+          },
+          {
+            "name":"磁县",
+            "code":"130427"
+          },
+          {
+            "name":"肥乡县",
+            "code":"130428"
+          },
+          {
+            "name":"永年县",
+            "code":"130429"
+          },
+          {
+            "name":"邱县",
+            "code":"130430"
+          },
+          {
+            "name":"鸡泽县",
+            "code":"130431"
+          },
+          {
+            "name":"广平县",
+            "code":"130432"
+          },
+          {
+            "name":"馆陶县",
+            "code":"130433"
+          },
+          {
+            "name":"魏县",
+            "code":"130434"
+          },
+          {
+            "name":"曲周县",
+            "code":"130435"
+          },
+          {
+            "name":"武安市",
+            "code":"130481"
+          }
+        ]
+      },
+      {
+        "name":"邢台市",
+        "code":"130500",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"130501"
+          },
+          {
+            "name":"桥东区",
+            "code":"130502"
+          },
+          {
+            "name":"桥西区",
+            "code":"130503"
+          },
+          {
+            "name":"邢台县",
+            "code":"130521"
+          },
+          {
+            "name":"临城县",
+            "code":"130522"
+          },
+          {
+            "name":"内丘县",
+            "code":"130523"
+          },
+          {
+            "name":"柏乡县",
+            "code":"130524"
+          },
+          {
+            "name":"隆尧县",
+            "code":"130525"
+          },
+          {
+            "name":"任县",
+            "code":"130526"
+          },
+          {
+            "name":"南和县",
+            "code":"130527"
+          },
+          {
+            "name":"宁晋县",
+            "code":"130528"
+          },
+          {
+            "name":"巨鹿县",
+            "code":"130529"
+          },
+          {
+            "name":"新河县",
+            "code":"130530"
+          },
+          {
+            "name":"广宗县",
+            "code":"130531"
+          },
+          {
+            "name":"平乡县",
+            "code":"130532"
+          },
+          {
+            "name":"威县",
+            "code":"130533"
+          },
+          {
+            "name":"清河县",
+            "code":"130534"
+          },
+          {
+            "name":"临西县",
+            "code":"130535"
+          },
+          {
+            "name":"南宫市",
+            "code":"130581"
+          },
+          {
+            "name":"沙河市",
+            "code":"130582"
+          }
+        ]
+      },
+      {
+        "name":"保定市",
+        "code":"130600",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"130601"
+          },
+          {
+            "name":"新市区",
+            "code":"130602"
+          },
+          {
+            "name":"北市区",
+            "code":"130603"
+          },
+          {
+            "name":"南市区",
+            "code":"130604"
+          },
+          {
+            "name":"满城县",
+            "code":"130621"
+          },
+          {
+            "name":"清苑县",
+            "code":"130622"
+          },
+          {
+            "name":"涞水县",
+            "code":"130623"
+          },
+          {
+            "name":"阜平县",
+            "code":"130624"
+          },
+          {
+            "name":"徐水县",
+            "code":"130625"
+          },
+          {
+            "name":"定兴县",
+            "code":"130626"
+          },
+          {
+            "name":"唐县",
+            "code":"130627"
+          },
+          {
+            "name":"高阳县",
+            "code":"130628"
+          },
+          {
+            "name":"容城县",
+            "code":"130629"
+          },
+          {
+            "name":"涞源县",
+            "code":"130630"
+          },
+          {
+            "name":"望都县",
+            "code":"130631"
+          },
+          {
+            "name":"安新县",
+            "code":"130632"
+          },
+          {
+            "name":"易县",
+            "code":"130633"
+          },
+          {
+            "name":"曲阳县",
+            "code":"130634"
+          },
+          {
+            "name":"蠡县",
+            "code":"130635"
+          },
+          {
+            "name":"顺平县",
+            "code":"130636"
+          },
+          {
+            "name":"博野县",
+            "code":"130637"
+          },
+          {
+            "name":"雄县",
+            "code":"130638"
+          },
+          {
+            "name":"涿州市",
+            "code":"130681"
+          },
+          {
+            "name":"定州市",
+            "code":"130682"
+          },
+          {
+            "name":"安国市",
+            "code":"130683"
+          },
+          {
+            "name":"高碑店市",
+            "code":"130684"
+          }
+        ]
+      },
+      {
+        "name":"张家口市",
+        "code":"130700",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"130701"
+          },
+          {
+            "name":"桥东区",
+            "code":"130702"
+          },
+          {
+            "name":"桥西区",
+            "code":"130703"
+          },
+          {
+            "name":"宣化区",
+            "code":"130705"
+          },
+          {
+            "name":"下花园区",
+            "code":"130706"
+          },
+          {
+            "name":"宣化县",
+            "code":"130721"
+          },
+          {
+            "name":"张北县",
+            "code":"130722"
+          },
+          {
+            "name":"康保县",
+            "code":"130723"
+          },
+          {
+            "name":"沽源县",
+            "code":"130724"
+          },
+          {
+            "name":"尚义县",
+            "code":"130725"
+          },
+          {
+            "name":"蔚县",
+            "code":"130726"
+          },
+          {
+            "name":"阳原县",
+            "code":"130727"
+          },
+          {
+            "name":"怀安县",
+            "code":"130728"
+          },
+          {
+            "name":"万全县",
+            "code":"130729"
+          },
+          {
+            "name":"怀来县",
+            "code":"130730"
+          },
+          {
+            "name":"涿鹿县",
+            "code":"130731"
+          },
+          {
+            "name":"赤城县",
+            "code":"130732"
+          },
+          {
+            "name":"崇礼县",
+            "code":"130733"
+          }
+        ]
+      },
+      {
+        "name":"承德市",
+        "code":"130800",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"130801"
+          },
+          {
+            "name":"双桥区",
+            "code":"130802"
+          },
+          {
+            "name":"双滦区",
+            "code":"130803"
+          },
+          {
+            "name":"鹰手营子矿区",
+            "code":"130804"
+          },
+          {
+            "name":"承德县",
+            "code":"130821"
+          },
+          {
+            "name":"兴隆县",
+            "code":"130822"
+          },
+          {
+            "name":"平泉县",
+            "code":"130823"
+          },
+          {
+            "name":"滦平县",
+            "code":"130824"
+          },
+          {
+            "name":"隆化县",
+            "code":"130825"
+          },
+          {
+            "name":"丰宁满族自治县",
+            "code":"130826"
+          },
+          {
+            "name":"宽城满族自治县",
+            "code":"130827"
+          },
+          {
+            "name":"围场满族蒙古族自治县",
+            "code":"130828"
+          }
+        ]
+      },
+      {
+        "name":"沧州市",
+        "code":"130900",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"130901"
+          },
+          {
+            "name":"新华区",
+            "code":"130902"
+          },
+          {
+            "name":"运河区",
+            "code":"130903"
+          },
+          {
+            "name":"沧县",
+            "code":"130921"
+          },
+          {
+            "name":"青县",
+            "code":"130922"
+          },
+          {
+            "name":"东光县",
+            "code":"130923"
+          },
+          {
+            "name":"海兴县",
+            "code":"130924"
+          },
+          {
+            "name":"盐山县",
+            "code":"130925"
+          },
+          {
+            "name":"肃宁县",
+            "code":"130926"
+          },
+          {
+            "name":"南皮县",
+            "code":"130927"
+          },
+          {
+            "name":"吴桥县",
+            "code":"130928"
+          },
+          {
+            "name":"献县",
+            "code":"130929"
+          },
+          {
+            "name":"孟村回族自治县",
+            "code":"130930"
+          },
+          {
+            "name":"泊头市",
+            "code":"130981"
+          },
+          {
+            "name":"任丘市",
+            "code":"130982"
+          },
+          {
+            "name":"黄骅市",
+            "code":"130983"
+          },
+          {
+            "name":"河间市",
+            "code":"130984"
+          }
+        ]
+      },
+      {
+        "name":"廊坊市",
+        "code":"131000",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"131001"
+          },
+          {
+            "name":"安次区",
+            "code":"131002"
+          },
+          {
+            "name":"广阳区",
+            "code":"131003"
+          },
+          {
+            "name":"固安县",
+            "code":"131022"
+          },
+          {
+            "name":"永清县",
+            "code":"131023"
+          },
+          {
+            "name":"香河县",
+            "code":"131024"
+          },
+          {
+            "name":"大城县",
+            "code":"131025"
+          },
+          {
+            "name":"文安县",
+            "code":"131026"
+          },
+          {
+            "name":"大厂回族自治县",
+            "code":"131028"
+          },
+          {
+            "name":"霸州市",
+            "code":"131081"
+          },
+          {
+            "name":"三河市",
+            "code":"131082"
+          }
+        ]
+      },
+      {
+        "name":"衡水市",
+        "code":"131100",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"131101"
+          },
+          {
+            "name":"桃城区",
+            "code":"131102"
+          },
+          {
+            "name":"枣强县",
+            "code":"131121"
+          },
+          {
+            "name":"武邑县",
+            "code":"131122"
+          },
+          {
+            "name":"武强县",
+            "code":"131123"
+          },
+          {
+            "name":"饶阳县",
+            "code":"131124"
+          },
+          {
+            "name":"安平县",
+            "code":"131125"
+          },
+          {
+            "name":"故城县",
+            "code":"131126"
+          },
+          {
+            "name":"景县",
+            "code":"131127"
+          },
+          {
+            "name":"阜城县",
+            "code":"131128"
+          },
+          {
+            "name":"冀州市",
+            "code":"131181"
+          },
+          {
+            "name":"深州市",
+            "code":"131182"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "name":"山西省",
+    "code":"140000",
+    "sub":[
+      {
+        "name":"太原市",
+        "code":"140100",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"140101"
+          },
+          {
+            "name":"小店区",
+            "code":"140105"
+          },
+          {
+            "name":"迎泽区",
+            "code":"140106"
+          },
+          {
+            "name":"杏花岭区",
+            "code":"140107"
+          },
+          {
+            "name":"尖草坪区",
+            "code":"140108"
+          },
+          {
+            "name":"万柏林区",
+            "code":"140109"
+          },
+          {
+            "name":"晋源区",
+            "code":"140110"
+          },
+          {
+            "name":"清徐县",
+            "code":"140121"
+          },
+          {
+            "name":"阳曲县",
+            "code":"140122"
+          },
+          {
+            "name":"娄烦县",
+            "code":"140123"
+          },
+          {
+            "name":"古交市",
+            "code":"140181"
+          }
+        ]
+      },
+      {
+        "name":"大同市",
+        "code":"140200",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"140201"
+          },
+          {
+            "name":"城区",
+            "code":"140202"
+          },
+          {
+            "name":"矿区",
+            "code":"140203"
+          },
+          {
+            "name":"南郊区",
+            "code":"140211"
+          },
+          {
+            "name":"新荣区",
+            "code":"140212"
+          },
+          {
+            "name":"阳高县",
+            "code":"140221"
+          },
+          {
+            "name":"天镇县",
+            "code":"140222"
+          },
+          {
+            "name":"广灵县",
+            "code":"140223"
+          },
+          {
+            "name":"灵丘县",
+            "code":"140224"
+          },
+          {
+            "name":"浑源县",
+            "code":"140225"
+          },
+          {
+            "name":"左云县",
+            "code":"140226"
+          },
+          {
+            "name":"大同县",
+            "code":"140227"
+          }
+        ]
+      },
+      {
+        "name":"阳泉市",
+        "code":"140300",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"140301"
+          },
+          {
+            "name":"城区",
+            "code":"140302"
+          },
+          {
+            "name":"矿区",
+            "code":"140303"
+          },
+          {
+            "name":"郊区",
+            "code":"140311"
+          },
+          {
+            "name":"平定县",
+            "code":"140321"
+          },
+          {
+            "name":"盂县",
+            "code":"140322"
+          }
+        ]
+      },
+      {
+        "name":"长治市",
+        "code":"140400",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"140401"
+          },
+          {
+            "name":"城区",
+            "code":"140402"
+          },
+          {
+            "name":"郊区",
+            "code":"140411"
+          },
+          {
+            "name":"长治县",
+            "code":"140421"
+          },
+          {
+            "name":"襄垣县",
+            "code":"140423"
+          },
+          {
+            "name":"屯留县",
+            "code":"140424"
+          },
+          {
+            "name":"平顺县",
+            "code":"140425"
+          },
+          {
+            "name":"黎城县",
+            "code":"140426"
+          },
+          {
+            "name":"壶关县",
+            "code":"140427"
+          },
+          {
+            "name":"长子县",
+            "code":"140428"
+          },
+          {
+            "name":"武乡县",
+            "code":"140429"
+          },
+          {
+            "name":"沁县",
+            "code":"140430"
+          },
+          {
+            "name":"沁源县",
+            "code":"140431"
+          },
+          {
+            "name":"潞城市",
+            "code":"140481"
+          }
+        ]
+      },
+      {
+        "name":"晋城市",
+        "code":"140500",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"140501"
+          },
+          {
+            "name":"城区",
+            "code":"140502"
+          },
+          {
+            "name":"沁水县",
+            "code":"140521"
+          },
+          {
+            "name":"阳城县",
+            "code":"140522"
+          },
+          {
+            "name":"陵川县",
+            "code":"140524"
+          },
+          {
+            "name":"泽州县",
+            "code":"140525"
+          },
+          {
+            "name":"高平市",
+            "code":"140581"
+          }
+        ]
+      },
+      {
+        "name":"朔州市",
+        "code":"140600",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"140601"
+          },
+          {
+            "name":"朔城区",
+            "code":"140602"
+          },
+          {
+            "name":"平鲁区",
+            "code":"140603"
+          },
+          {
+            "name":"山阴县",
+            "code":"140621"
+          },
+          {
+            "name":"应县",
+            "code":"140622"
+          },
+          {
+            "name":"右玉县",
+            "code":"140623"
+          },
+          {
+            "name":"怀仁县",
+            "code":"140624"
+          }
+        ]
+      },
+      {
+        "name":"晋中市",
+        "code":"140700",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"140701"
+          },
+          {
+            "name":"榆次区",
+            "code":"140702"
+          },
+          {
+            "name":"榆社县",
+            "code":"140721"
+          },
+          {
+            "name":"左权县",
+            "code":"140722"
+          },
+          {
+            "name":"和顺县",
+            "code":"140723"
+          },
+          {
+            "name":"昔阳县",
+            "code":"140724"
+          },
+          {
+            "name":"寿阳县",
+            "code":"140725"
+          },
+          {
+            "name":"太谷县",
+            "code":"140726"
+          },
+          {
+            "name":"祁县",
+            "code":"140727"
+          },
+          {
+            "name":"平遥县",
+            "code":"140728"
+          },
+          {
+            "name":"灵石县",
+            "code":"140729"
+          },
+          {
+            "name":"介休市",
+            "code":"140781"
+          }
+        ]
+      },
+      {
+        "name":"运城市",
+        "code":"140800",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"140801"
+          },
+          {
+            "name":"盐湖区",
+            "code":"140802"
+          },
+          {
+            "name":"临猗县",
+            "code":"140821"
+          },
+          {
+            "name":"万荣县",
+            "code":"140822"
+          },
+          {
+            "name":"闻喜县",
+            "code":"140823"
+          },
+          {
+            "name":"稷山县",
+            "code":"140824"
+          },
+          {
+            "name":"新绛县",
+            "code":"140825"
+          },
+          {
+            "name":"绛县",
+            "code":"140826"
+          },
+          {
+            "name":"垣曲县",
+            "code":"140827"
+          },
+          {
+            "name":"夏县",
+            "code":"140828"
+          },
+          {
+            "name":"平陆县",
+            "code":"140829"
+          },
+          {
+            "name":"芮城县",
+            "code":"140830"
+          },
+          {
+            "name":"永济市",
+            "code":"140881"
+          },
+          {
+            "name":"河津市",
+            "code":"140882"
+          }
+        ]
+      },
+      {
+        "name":"忻州市",
+        "code":"140900",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"140901"
+          },
+          {
+            "name":"忻府区",
+            "code":"140902"
+          },
+          {
+            "name":"定襄县",
+            "code":"140921"
+          },
+          {
+            "name":"五台县",
+            "code":"140922"
+          },
+          {
+            "name":"代县",
+            "code":"140923"
+          },
+          {
+            "name":"繁峙县",
+            "code":"140924"
+          },
+          {
+            "name":"宁武县",
+            "code":"140925"
+          },
+          {
+            "name":"静乐县",
+            "code":"140926"
+          },
+          {
+            "name":"神池县",
+            "code":"140927"
+          },
+          {
+            "name":"五寨县",
+            "code":"140928"
+          },
+          {
+            "name":"岢岚县",
+            "code":"140929"
+          },
+          {
+            "name":"河曲县",
+            "code":"140930"
+          },
+          {
+            "name":"保德县",
+            "code":"140931"
+          },
+          {
+            "name":"偏关县",
+            "code":"140932"
+          },
+          {
+            "name":"原平市",
+            "code":"140981"
+          }
+        ]
+      },
+      {
+        "name":"临汾市",
+        "code":"141000",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"141001"
+          },
+          {
+            "name":"尧都区",
+            "code":"141002"
+          },
+          {
+            "name":"曲沃县",
+            "code":"141021"
+          },
+          {
+            "name":"翼城县",
+            "code":"141022"
+          },
+          {
+            "name":"襄汾县",
+            "code":"141023"
+          },
+          {
+            "name":"洪洞县",
+            "code":"141024"
+          },
+          {
+            "name":"古县",
+            "code":"141025"
+          },
+          {
+            "name":"安泽县",
+            "code":"141026"
+          },
+          {
+            "name":"浮山县",
+            "code":"141027"
+          },
+          {
+            "name":"吉县",
+            "code":"141028"
+          },
+          {
+            "name":"乡宁县",
+            "code":"141029"
+          },
+          {
+            "name":"大宁县",
+            "code":"141030"
+          },
+          {
+            "name":"隰县",
+            "code":"141031"
+          },
+          {
+            "name":"永和县",
+            "code":"141032"
+          },
+          {
+            "name":"蒲县",
+            "code":"141033"
+          },
+          {
+            "name":"汾西县",
+            "code":"141034"
+          },
+          {
+            "name":"侯马市",
+            "code":"141081"
+          },
+          {
+            "name":"霍州市",
+            "code":"141082"
+          }
+        ]
+      },
+      {
+        "name":"吕梁市",
+        "code":"141100",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"141101"
+          },
+          {
+            "name":"离石区",
+            "code":"141102"
+          },
+          {
+            "name":"文水县",
+            "code":"141121"
+          },
+          {
+            "name":"交城县",
+            "code":"141122"
+          },
+          {
+            "name":"兴县",
+            "code":"141123"
+          },
+          {
+            "name":"临县",
+            "code":"141124"
+          },
+          {
+            "name":"柳林县",
+            "code":"141125"
+          },
+          {
+            "name":"石楼县",
+            "code":"141126"
+          },
+          {
+            "name":"岚县",
+            "code":"141127"
+          },
+          {
+            "name":"方山县",
+            "code":"141128"
+          },
+          {
+            "name":"中阳县",
+            "code":"141129"
+          },
+          {
+            "name":"交口县",
+            "code":"141130"
+          },
+          {
+            "name":"孝义市",
+            "code":"141181"
+          },
+          {
+            "name":"汾阳市",
+            "code":"141182"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "name":"内蒙古自治区",
+    "code":"150000",
+    "sub":[
+      {
+        "name":"呼和浩特市",
+        "code":"150100",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"150101"
+          },
+          {
+            "name":"新城区",
+            "code":"150102"
+          },
+          {
+            "name":"回民区",
+            "code":"150103"
+          },
+          {
+            "name":"玉泉区",
+            "code":"150104"
+          },
+          {
+            "name":"赛罕区",
+            "code":"150105"
+          },
+          {
+            "name":"土默特左旗",
+            "code":"150121"
+          },
+          {
+            "name":"托克托县",
+            "code":"150122"
+          },
+          {
+            "name":"和林格尔县",
+            "code":"150123"
+          },
+          {
+            "name":"清水河县",
+            "code":"150124"
+          },
+          {
+            "name":"武川县",
+            "code":"150125"
+          }
+        ]
+      },
+      {
+        "name":"包头市",
+        "code":"150200",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"150201"
+          },
+          {
+            "name":"东河区",
+            "code":"150202"
+          },
+          {
+            "name":"昆都仑区",
+            "code":"150203"
+          },
+          {
+            "name":"青山区",
+            "code":"150204"
+          },
+          {
+            "name":"石拐区",
+            "code":"150205"
+          },
+          {
+            "name":"白云鄂博矿区",
+            "code":"150206"
+          },
+          {
+            "name":"九原区",
+            "code":"150207"
+          },
+          {
+            "name":"土默特右旗",
+            "code":"150221"
+          },
+          {
+            "name":"固阳县",
+            "code":"150222"
+          },
+          {
+            "name":"达尔罕茂明安联合旗",
+            "code":"150223"
+          }
+        ]
+      },
+      {
+        "name":"乌海市",
+        "code":"150300",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"150301"
+          },
+          {
+            "name":"海勃湾区",
+            "code":"150302"
+          },
+          {
+            "name":"海南区",
+            "code":"150303"
+          },
+          {
+            "name":"乌达区",
+            "code":"150304"
+          }
+        ]
+      },
+      {
+        "name":"赤峰市",
+        "code":"150400",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"150401"
+          },
+          {
+            "name":"红山区",
+            "code":"150402"
+          },
+          {
+            "name":"元宝山区",
+            "code":"150403"
+          },
+          {
+            "name":"松山区",
+            "code":"150404"
+          },
+          {
+            "name":"阿鲁科尔沁旗",
+            "code":"150421"
+          },
+          {
+            "name":"巴林左旗",
+            "code":"150422"
+          },
+          {
+            "name":"巴林右旗",
+            "code":"150423"
+          },
+          {
+            "name":"林西县",
+            "code":"150424"
+          },
+          {
+            "name":"克什克腾旗",
+            "code":"150425"
+          },
+          {
+            "name":"翁牛特旗",
+            "code":"150426"
+          },
+          {
+            "name":"喀喇沁旗",
+            "code":"150428"
+          },
+          {
+            "name":"宁城县",
+            "code":"150429"
+          },
+          {
+            "name":"敖汉旗",
+            "code":"150430"
+          }
+        ]
+      },
+      {
+        "name":"通辽市",
+        "code":"150500",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"150501"
+          },
+          {
+            "name":"科尔沁区",
+            "code":"150502"
+          },
+          {
+            "name":"科尔沁左翼中旗",
+            "code":"150521"
+          },
+          {
+            "name":"科尔沁左翼后旗",
+            "code":"150522"
+          },
+          {
+            "name":"开鲁县",
+            "code":"150523"
+          },
+          {
+            "name":"库伦旗",
+            "code":"150524"
+          },
+          {
+            "name":"奈曼旗",
+            "code":"150525"
+          },
+          {
+            "name":"扎鲁特旗",
+            "code":"150526"
+          },
+          {
+            "name":"霍林郭勒市",
+            "code":"150581"
+          }
+        ]
+      },
+      {
+        "name":"鄂尔多斯市",
+        "code":"150600",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"150601"
+          },
+          {
+            "name":"东胜区",
+            "code":"150602"
+          },
+          {
+            "name":"达拉特旗",
+            "code":"150621"
+          },
+          {
+            "name":"准格尔旗",
+            "code":"150622"
+          },
+          {
+            "name":"鄂托克前旗",
+            "code":"150623"
+          },
+          {
+            "name":"鄂托克旗",
+            "code":"150624"
+          },
+          {
+            "name":"杭锦旗",
+            "code":"150625"
+          },
+          {
+            "name":"乌审旗",
+            "code":"150626"
+          },
+          {
+            "name":"伊金霍洛旗",
+            "code":"150627"
+          }
+        ]
+      },
+      {
+        "name":"呼伦贝尔市",
+        "code":"150700",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"150701"
+          },
+          {
+            "name":"海拉尔区",
+            "code":"150702"
+          },
+          {
+            "name":"扎赉诺尔区",
+            "code":"150703"
+          },
+          {
+            "name":"阿荣旗",
+            "code":"150721"
+          },
+          {
+            "name":"莫力达瓦达斡尔族自治旗",
+            "code":"150722"
+          },
+          {
+            "name":"鄂伦春自治旗",
+            "code":"150723"
+          },
+          {
+            "name":"鄂温克族自治旗",
+            "code":"150724"
+          },
+          {
+            "name":"陈巴尔虎旗",
+            "code":"150725"
+          },
+          {
+            "name":"新巴尔虎左旗",
+            "code":"150726"
+          },
+          {
+            "name":"新巴尔虎右旗",
+            "code":"150727"
+          },
+          {
+            "name":"满洲里市",
+            "code":"150781"
+          },
+          {
+            "name":"牙克石市",
+            "code":"150782"
+          },
+          {
+            "name":"扎兰屯市",
+            "code":"150783"
+          },
+          {
+            "name":"额尔古纳市",
+            "code":"150784"
+          },
+          {
+            "name":"根河市",
+            "code":"150785"
+          }
+        ]
+      },
+      {
+        "name":"巴彦淖尔市",
+        "code":"150800",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"150801"
+          },
+          {
+            "name":"临河区",
+            "code":"150802"
+          },
+          {
+            "name":"五原县",
+            "code":"150821"
+          },
+          {
+            "name":"磴口县",
+            "code":"150822"
+          },
+          {
+            "name":"乌拉特前旗",
+            "code":"150823"
+          },
+          {
+            "name":"乌拉特中旗",
+            "code":"150824"
+          },
+          {
+            "name":"乌拉特后旗",
+            "code":"150825"
+          },
+          {
+            "name":"杭锦后旗",
+            "code":"150826"
+          }
+        ]
+      },
+      {
+        "name":"乌兰察布市",
+        "code":"150900",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"150901"
+          },
+          {
+            "name":"集宁区",
+            "code":"150902"
+          },
+          {
+            "name":"卓资县",
+            "code":"150921"
+          },
+          {
+            "name":"化德县",
+            "code":"150922"
+          },
+          {
+            "name":"商都县",
+            "code":"150923"
+          },
+          {
+            "name":"兴和县",
+            "code":"150924"
+          },
+          {
+            "name":"凉城县",
+            "code":"150925"
+          },
+          {
+            "name":"察哈尔右翼前旗",
+            "code":"150926"
+          },
+          {
+            "name":"察哈尔右翼中旗",
+            "code":"150927"
+          },
+          {
+            "name":"察哈尔右翼后旗",
+            "code":"150928"
+          },
+          {
+            "name":"四子王旗",
+            "code":"150929"
+          },
+          {
+            "name":"丰镇市",
+            "code":"150981"
+          }
+        ]
+      },
+      {
+        "name":"兴安盟",
+        "code":"152200",
+        "sub":[
+          {
+            "name":"乌兰浩特市",
+            "code":"152201"
+          },
+          {
+            "name":"阿尔山市",
+            "code":"152202"
+          },
+          {
+            "name":"科尔沁右翼前旗",
+            "code":"152221"
+          },
+          {
+            "name":"科尔沁右翼中旗",
+            "code":"152222"
+          },
+          {
+            "name":"扎赉特旗",
+            "code":"152223"
+          },
+          {
+            "name":"突泉县",
+            "code":"152224"
+          }
+        ]
+      },
+      {
+        "name":"锡林郭勒盟",
+        "code":"152500",
+        "sub":[
+          {
+            "name":"二连浩特市",
+            "code":"152501"
+          },
+          {
+            "name":"锡林浩特市",
+            "code":"152502"
+          },
+          {
+            "name":"阿巴嘎旗",
+            "code":"152522"
+          },
+          {
+            "name":"苏尼特左旗",
+            "code":"152523"
+          },
+          {
+            "name":"苏尼特右旗",
+            "code":"152524"
+          },
+          {
+            "name":"东乌珠穆沁旗",
+            "code":"152525"
+          },
+          {
+            "name":"西乌珠穆沁旗",
+            "code":"152526"
+          },
+          {
+            "name":"太仆寺旗",
+            "code":"152527"
+          },
+          {
+            "name":"镶黄旗",
+            "code":"152528"
+          },
+          {
+            "name":"正镶白旗",
+            "code":"152529"
+          },
+          {
+            "name":"正蓝旗",
+            "code":"152530"
+          },
+          {
+            "name":"多伦县",
+            "code":"152531"
+          }
+        ]
+      },
+      {
+        "name":"阿拉善盟",
+        "code":"152900",
+        "sub":[
+          {
+            "name":"阿拉善左旗",
+            "code":"152921"
+          },
+          {
+            "name":"阿拉善右旗",
+            "code":"152922"
+          },
+          {
+            "name":"额济纳旗",
+            "code":"152923"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "name":"辽宁省",
+    "code":"210000",
+    "sub":[
+      {
+        "name":"沈阳市",
+        "code":"210100",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"210101"
+          },
+          {
+            "name":"和平区",
+            "code":"210102"
+          },
+          {
+            "name":"沈河区",
+            "code":"210103"
+          },
+          {
+            "name":"大东区",
+            "code":"210104"
+          },
+          {
+            "name":"皇姑区",
+            "code":"210105"
+          },
+          {
+            "name":"铁西区",
+            "code":"210106"
+          },
+          {
+            "name":"苏家屯区",
+            "code":"210111"
+          },
+          {
+            "name":"浑南区",
+            "code":"210112"
+          },
+          {
+            "name":"沈北新区",
+            "code":"210113"
+          },
+          {
+            "name":"于洪区",
+            "code":"210114"
+          },
+          {
+            "name":"辽中县",
+            "code":"210122"
+          },
+          {
+            "name":"康平县",
+            "code":"210123"
+          },
+          {
+            "name":"法库县",
+            "code":"210124"
+          },
+          {
+            "name":"新民市",
+            "code":"210181"
+          }
+        ]
+      },
+      {
+        "name":"大连市",
+        "code":"210200",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"210201"
+          },
+          {
+            "name":"中山区",
+            "code":"210202"
+          },
+          {
+            "name":"西岗区",
+            "code":"210203"
+          },
+          {
+            "name":"沙河口区",
+            "code":"210204"
+          },
+          {
+            "name":"甘井子区",
+            "code":"210211"
+          },
+          {
+            "name":"旅顺口区",
+            "code":"210212"
+          },
+          {
+            "name":"金州区",
+            "code":"210213"
+          },
+          {
+            "name":"长海县",
+            "code":"210224"
+          },
+          {
+            "name":"瓦房店市",
+            "code":"210281"
+          },
+          {
+            "name":"普兰店市",
+            "code":"210282"
+          },
+          {
+            "name":"庄河市",
+            "code":"210283"
+          }
+        ]
+      },
+      {
+        "name":"鞍山市",
+        "code":"210300",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"210301"
+          },
+          {
+            "name":"铁东区",
+            "code":"210302"
+          },
+          {
+            "name":"铁西区",
+            "code":"210303"
+          },
+          {
+            "name":"立山区",
+            "code":"210304"
+          },
+          {
+            "name":"千山区",
+            "code":"210311"
+          },
+          {
+            "name":"台安县",
+            "code":"210321"
+          },
+          {
+            "name":"岫岩满族自治县",
+            "code":"210323"
+          },
+          {
+            "name":"海城市",
+            "code":"210381"
+          }
+        ]
+      },
+      {
+        "name":"抚顺市",
+        "code":"210400",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"210401"
+          },
+          {
+            "name":"新抚区",
+            "code":"210402"
+          },
+          {
+            "name":"东洲区",
+            "code":"210403"
+          },
+          {
+            "name":"望花区",
+            "code":"210404"
+          },
+          {
+            "name":"顺城区",
+            "code":"210411"
+          },
+          {
+            "name":"抚顺县",
+            "code":"210421"
+          },
+          {
+            "name":"新宾满族自治县",
+            "code":"210422"
+          },
+          {
+            "name":"清原满族自治县",
+            "code":"210423"
+          }
+        ]
+      },
+      {
+        "name":"本溪市",
+        "code":"210500",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"210501"
+          },
+          {
+            "name":"平山区",
+            "code":"210502"
+          },
+          {
+            "name":"溪湖区",
+            "code":"210503"
+          },
+          {
+            "name":"明山区",
+            "code":"210504"
+          },
+          {
+            "name":"南芬区",
+            "code":"210505"
+          },
+          {
+            "name":"本溪满族自治县",
+            "code":"210521"
+          },
+          {
+            "name":"桓仁满族自治县",
+            "code":"210522"
+          }
+        ]
+      },
+      {
+        "name":"丹东市",
+        "code":"210600",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"210601"
+          },
+          {
+            "name":"元宝区",
+            "code":"210602"
+          },
+          {
+            "name":"振兴区",
+            "code":"210603"
+          },
+          {
+            "name":"振安区",
+            "code":"210604"
+          },
+          {
+            "name":"宽甸满族自治县",
+            "code":"210624"
+          },
+          {
+            "name":"东港市",
+            "code":"210681"
+          },
+          {
+            "name":"凤城市",
+            "code":"210682"
+          }
+        ]
+      },
+      {
+        "name":"锦州市",
+        "code":"210700",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"210701"
+          },
+          {
+            "name":"古塔区",
+            "code":"210702"
+          },
+          {
+            "name":"凌河区",
+            "code":"210703"
+          },
+          {
+            "name":"太和区",
+            "code":"210711"
+          },
+          {
+            "name":"黑山县",
+            "code":"210726"
+          },
+          {
+            "name":"义县",
+            "code":"210727"
+          },
+          {
+            "name":"凌海市",
+            "code":"210781"
+          },
+          {
+            "name":"北镇市",
+            "code":"210782"
+          }
+        ]
+      },
+      {
+        "name":"营口市",
+        "code":"210800",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"210801"
+          },
+          {
+            "name":"站前区",
+            "code":"210802"
+          },
+          {
+            "name":"西市区",
+            "code":"210803"
+          },
+          {
+            "name":"鲅鱼圈区",
+            "code":"210804"
+          },
+          {
+            "name":"老边区",
+            "code":"210811"
+          },
+          {
+            "name":"盖州市",
+            "code":"210881"
+          },
+          {
+            "name":"大石桥市",
+            "code":"210882"
+          }
+        ]
+      },
+      {
+        "name":"阜新市",
+        "code":"210900",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"210901"
+          },
+          {
+            "name":"海州区",
+            "code":"210902"
+          },
+          {
+            "name":"新邱区",
+            "code":"210903"
+          },
+          {
+            "name":"太平区",
+            "code":"210904"
+          },
+          {
+            "name":"清河门区",
+            "code":"210905"
+          },
+          {
+            "name":"细河区",
+            "code":"210911"
+          },
+          {
+            "name":"阜新蒙古族自治县",
+            "code":"210921"
+          },
+          {
+            "name":"彰武县",
+            "code":"210922"
+          }
+        ]
+      },
+      {
+        "name":"辽阳市",
+        "code":"211000",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"211001"
+          },
+          {
+            "name":"白塔区",
+            "code":"211002"
+          },
+          {
+            "name":"文圣区",
+            "code":"211003"
+          },
+          {
+            "name":"宏伟区",
+            "code":"211004"
+          },
+          {
+            "name":"弓长岭区",
+            "code":"211005"
+          },
+          {
+            "name":"太子河区",
+            "code":"211011"
+          },
+          {
+            "name":"辽阳县",
+            "code":"211021"
+          },
+          {
+            "name":"灯塔市",
+            "code":"211081"
+          }
+        ]
+      },
+      {
+        "name":"盘锦市",
+        "code":"211100",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"211101"
+          },
+          {
+            "name":"双台子区",
+            "code":"211102"
+          },
+          {
+            "name":"兴隆台区",
+            "code":"211103"
+          },
+          {
+            "name":"大洼县",
+            "code":"211121"
+          },
+          {
+            "name":"盘山县",
+            "code":"211122"
+          }
+        ]
+      },
+      {
+        "name":"铁岭市",
+        "code":"211200",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"211201"
+          },
+          {
+            "name":"银州区",
+            "code":"211202"
+          },
+          {
+            "name":"清河区",
+            "code":"211204"
+          },
+          {
+            "name":"铁岭县",
+            "code":"211221"
+          },
+          {
+            "name":"西丰县",
+            "code":"211223"
+          },
+          {
+            "name":"昌图县",
+            "code":"211224"
+          },
+          {
+            "name":"调兵山市",
+            "code":"211281"
+          },
+          {
+            "name":"开原市",
+            "code":"211282"
+          }
+        ]
+      },
+      {
+        "name":"朝阳市",
+        "code":"211300",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"211301"
+          },
+          {
+            "name":"双塔区",
+            "code":"211302"
+          },
+          {
+            "name":"龙城区",
+            "code":"211303"
+          },
+          {
+            "name":"朝阳县",
+            "code":"211321"
+          },
+          {
+            "name":"建平县",
+            "code":"211322"
+          },
+          {
+            "name":"喀喇沁左翼蒙古族自治县",
+            "code":"211324"
+          },
+          {
+            "name":"北票市",
+            "code":"211381"
+          },
+          {
+            "name":"凌源市",
+            "code":"211382"
+          }
+        ]
+      },
+      {
+        "name":"葫芦岛市",
+        "code":"211400",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"211401"
+          },
+          {
+            "name":"连山区",
+            "code":"211402"
+          },
+          {
+            "name":"龙港区",
+            "code":"211403"
+          },
+          {
+            "name":"南票区",
+            "code":"211404"
+          },
+          {
+            "name":"绥中县",
+            "code":"211421"
+          },
+          {
+            "name":"建昌县",
+            "code":"211422"
+          },
+          {
+            "name":"兴城市",
+            "code":"211481"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "name":"吉林省",
+    "code":"220000",
+    "sub":[
+      {
+        "name":"长春市",
+        "code":"220100",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"220101"
+          },
+          {
+            "name":"南关区",
+            "code":"220102"
+          },
+          {
+            "name":"宽城区",
+            "code":"220103"
+          },
+          {
+            "name":"朝阳区",
+            "code":"220104"
+          },
+          {
+            "name":"二道区",
+            "code":"220105"
+          },
+          {
+            "name":"绿园区",
+            "code":"220106"
+          },
+          {
+            "name":"双阳区",
+            "code":"220112"
+          },
+          {
+            "name":"九台区",
+            "code":"220113"
+          },
+          {
+            "name":"农安县",
+            "code":"220122"
+          },
+          {
+            "name":"榆树市",
+            "code":"220182"
+          },
+          {
+            "name":"德惠市",
+            "code":"220183"
+          }
+        ]
+      },
+      {
+        "name":"吉林市",
+        "code":"220200",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"220201"
+          },
+          {
+            "name":"昌邑区",
+            "code":"220202"
+          },
+          {
+            "name":"龙潭区",
+            "code":"220203"
+          },
+          {
+            "name":"船营区",
+            "code":"220204"
+          },
+          {
+            "name":"丰满区",
+            "code":"220211"
+          },
+          {
+            "name":"永吉县",
+            "code":"220221"
+          },
+          {
+            "name":"蛟河市",
+            "code":"220281"
+          },
+          {
+            "name":"桦甸市",
+            "code":"220282"
+          },
+          {
+            "name":"舒兰市",
+            "code":"220283"
+          },
+          {
+            "name":"磐石市",
+            "code":"220284"
+          }
+        ]
+      },
+      {
+        "name":"四平市",
+        "code":"220300",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"220301"
+          },
+          {
+            "name":"铁西区",
+            "code":"220302"
+          },
+          {
+            "name":"铁东区",
+            "code":"220303"
+          },
+          {
+            "name":"梨树县",
+            "code":"220322"
+          },
+          {
+            "name":"伊通满族自治县",
+            "code":"220323"
+          },
+          {
+            "name":"公主岭市",
+            "code":"220381"
+          },
+          {
+            "name":"双辽市",
+            "code":"220382"
+          }
+        ]
+      },
+      {
+        "name":"辽源市",
+        "code":"220400",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"220401"
+          },
+          {
+            "name":"龙山区",
+            "code":"220402"
+          },
+          {
+            "name":"西安区",
+            "code":"220403"
+          },
+          {
+            "name":"东丰县",
+            "code":"220421"
+          },
+          {
+            "name":"东辽县",
+            "code":"220422"
+          }
+        ]
+      },
+      {
+        "name":"通化市",
+        "code":"220500",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"220501"
+          },
+          {
+            "name":"东昌区",
+            "code":"220502"
+          },
+          {
+            "name":"二道江区",
+            "code":"220503"
+          },
+          {
+            "name":"通化县",
+            "code":"220521"
+          },
+          {
+            "name":"辉南县",
+            "code":"220523"
+          },
+          {
+            "name":"柳河县",
+            "code":"220524"
+          },
+          {
+            "name":"梅河口市",
+            "code":"220581"
+          },
+          {
+            "name":"集安市",
+            "code":"220582"
+          }
+        ]
+      },
+      {
+        "name":"白山市",
+        "code":"220600",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"220601"
+          },
+          {
+            "name":"浑江区",
+            "code":"220602"
+          },
+          {
+            "name":"江源区",
+            "code":"220605"
+          },
+          {
+            "name":"抚松县",
+            "code":"220621"
+          },
+          {
+            "name":"靖宇县",
+            "code":"220622"
+          },
+          {
+            "name":"长白朝鲜族自治县",
+            "code":"220623"
+          },
+          {
+            "name":"临江市",
+            "code":"220681"
+          }
+        ]
+      },
+      {
+        "name":"松原市",
+        "code":"220700",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"220701"
+          },
+          {
+            "name":"宁江区",
+            "code":"220702"
+          },
+          {
+            "name":"前郭尔罗斯蒙古族自治县",
+            "code":"220721"
+          },
+          {
+            "name":"长岭县",
+            "code":"220722"
+          },
+          {
+            "name":"乾安县",
+            "code":"220723"
+          },
+          {
+            "name":"扶余市",
+            "code":"220781"
+          }
+        ]
+      },
+      {
+        "name":"白城市",
+        "code":"220800",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"220801"
+          },
+          {
+            "name":"洮北区",
+            "code":"220802"
+          },
+          {
+            "name":"镇赉县",
+            "code":"220821"
+          },
+          {
+            "name":"通榆县",
+            "code":"220822"
+          },
+          {
+            "name":"洮南市",
+            "code":"220881"
+          },
+          {
+            "name":"大安市",
+            "code":"220882"
+          }
+        ]
+      },
+      {
+        "name":"延边朝鲜族自治州",
+        "code":"222400",
+        "sub":[
+          {
+            "name":"延吉市",
+            "code":"222401"
+          },
+          {
+            "name":"图们市",
+            "code":"222402"
+          },
+          {
+            "name":"敦化市",
+            "code":"222403"
+          },
+          {
+            "name":"珲春市",
+            "code":"222404"
+          },
+          {
+            "name":"龙井市",
+            "code":"222405"
+          },
+          {
+            "name":"和龙市",
+            "code":"222406"
+          },
+          {
+            "name":"汪清县",
+            "code":"222424"
+          },
+          {
+            "name":"安图县",
+            "code":"222426"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "name":"黑龙江省",
+    "code":"230000",
+    "sub":[
+      {
+        "name":"哈尔滨市",
+        "code":"230100",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"230101"
+          },
+          {
+            "name":"道里区",
+            "code":"230102"
+          },
+          {
+            "name":"南岗区",
+            "code":"230103"
+          },
+          {
+            "name":"道外区",
+            "code":"230104"
+          },
+          {
+            "name":"平房区",
+            "code":"230108"
+          },
+          {
+            "name":"松北区",
+            "code":"230109"
+          },
+          {
+            "name":"香坊区",
+            "code":"230110"
+          },
+          {
+            "name":"呼兰区",
+            "code":"230111"
+          },
+          {
+            "name":"阿城区",
+            "code":"230112"
+          },
+          {
+            "name":"双城区",
+            "code":"230113"
+          },
+          {
+            "name":"依兰县",
+            "code":"230123"
+          },
+          {
+            "name":"方正县",
+            "code":"230124"
+          },
+          {
+            "name":"宾县",
+            "code":"230125"
+          },
+          {
+            "name":"巴彦县",
+            "code":"230126"
+          },
+          {
+            "name":"木兰县",
+            "code":"230127"
+          },
+          {
+            "name":"通河县",
+            "code":"230128"
+          },
+          {
+            "name":"延寿县",
+            "code":"230129"
+          },
+          {
+            "name":"尚志市",
+            "code":"230183"
+          },
+          {
+            "name":"五常市",
+            "code":"230184"
+          }
+        ]
+      },
+      {
+        "name":"齐齐哈尔市",
+        "code":"230200",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"230201"
+          },
+          {
+            "name":"龙沙区",
+            "code":"230202"
+          },
+          {
+            "name":"建华区",
+            "code":"230203"
+          },
+          {
+            "name":"铁锋区",
+            "code":"230204"
+          },
+          {
+            "name":"昂昂溪区",
+            "code":"230205"
+          },
+          {
+            "name":"富拉尔基区",
+            "code":"230206"
+          },
+          {
+            "name":"碾子山区",
+            "code":"230207"
+          },
+          {
+            "name":"梅里斯达斡尔族区",
+            "code":"230208"
+          },
+          {
+            "name":"龙江县",
+            "code":"230221"
+          },
+          {
+            "name":"依安县",
+            "code":"230223"
+          },
+          {
+            "name":"泰来县",
+            "code":"230224"
+          },
+          {
+            "name":"甘南县",
+            "code":"230225"
+          },
+          {
+            "name":"富裕县",
+            "code":"230227"
+          },
+          {
+            "name":"克山县",
+            "code":"230229"
+          },
+          {
+            "name":"克东县",
+            "code":"230230"
+          },
+          {
+            "name":"拜泉县",
+            "code":"230231"
+          },
+          {
+            "name":"讷河市",
+            "code":"230281"
+          }
+        ]
+      },
+      {
+        "name":"鸡西市",
+        "code":"230300",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"230301"
+          },
+          {
+            "name":"鸡冠区",
+            "code":"230302"
+          },
+          {
+            "name":"恒山区",
+            "code":"230303"
+          },
+          {
+            "name":"滴道区",
+            "code":"230304"
+          },
+          {
+            "name":"梨树区",
+            "code":"230305"
+          },
+          {
+            "name":"城子河区",
+            "code":"230306"
+          },
+          {
+            "name":"麻山区",
+            "code":"230307"
+          },
+          {
+            "name":"鸡东县",
+            "code":"230321"
+          },
+          {
+            "name":"虎林市",
+            "code":"230381"
+          },
+          {
+            "name":"密山市",
+            "code":"230382"
+          }
+        ]
+      },
+      {
+        "name":"鹤岗市",
+        "code":"230400",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"230401"
+          },
+          {
+            "name":"向阳区",
+            "code":"230402"
+          },
+          {
+            "name":"工农区",
+            "code":"230403"
+          },
+          {
+            "name":"南山区",
+            "code":"230404"
+          },
+          {
+            "name":"兴安区",
+            "code":"230405"
+          },
+          {
+            "name":"东山区",
+            "code":"230406"
+          },
+          {
+            "name":"兴山区",
+            "code":"230407"
+          },
+          {
+            "name":"萝北县",
+            "code":"230421"
+          },
+          {
+            "name":"绥滨县",
+            "code":"230422"
+          }
+        ]
+      },
+      {
+        "name":"双鸭山市",
+        "code":"230500",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"230501"
+          },
+          {
+            "name":"尖山区",
+            "code":"230502"
+          },
+          {
+            "name":"岭东区",
+            "code":"230503"
+          },
+          {
+            "name":"四方台区",
+            "code":"230505"
+          },
+          {
+            "name":"宝山区",
+            "code":"230506"
+          },
+          {
+            "name":"集贤县",
+            "code":"230521"
+          },
+          {
+            "name":"友谊县",
+            "code":"230522"
+          },
+          {
+            "name":"宝清县",
+            "code":"230523"
+          },
+          {
+            "name":"饶河县",
+            "code":"230524"
+          }
+        ]
+      },
+      {
+        "name":"大庆市",
+        "code":"230600",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"230601"
+          },
+          {
+            "name":"萨尔图区",
+            "code":"230602"
+          },
+          {
+            "name":"龙凤区",
+            "code":"230603"
+          },
+          {
+            "name":"让胡路区",
+            "code":"230604"
+          },
+          {
+            "name":"红岗区",
+            "code":"230605"
+          },
+          {
+            "name":"大同区",
+            "code":"230606"
+          },
+          {
+            "name":"肇州县",
+            "code":"230621"
+          },
+          {
+            "name":"肇源县",
+            "code":"230622"
+          },
+          {
+            "name":"林甸县",
+            "code":"230623"
+          },
+          {
+            "name":"杜尔伯特蒙古族自治县",
+            "code":"230624"
+          }
+        ]
+      },
+      {
+        "name":"伊春市",
+        "code":"230700",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"230701"
+          },
+          {
+            "name":"伊春区",
+            "code":"230702"
+          },
+          {
+            "name":"南岔区",
+            "code":"230703"
+          },
+          {
+            "name":"友好区",
+            "code":"230704"
+          },
+          {
+            "name":"西林区",
+            "code":"230705"
+          },
+          {
+            "name":"翠峦区",
+            "code":"230706"
+          },
+          {
+            "name":"新青区",
+            "code":"230707"
+          },
+          {
+            "name":"美溪区",
+            "code":"230708"
+          },
+          {
+            "name":"金山屯区",
+            "code":"230709"
+          },
+          {
+            "name":"五营区",
+            "code":"230710"
+          },
+          {
+            "name":"乌马河区",
+            "code":"230711"
+          },
+          {
+            "name":"汤旺河区",
+            "code":"230712"
+          },
+          {
+            "name":"带岭区",
+            "code":"230713"
+          },
+          {
+            "name":"乌伊岭区",
+            "code":"230714"
+          },
+          {
+            "name":"红星区",
+            "code":"230715"
+          },
+          {
+            "name":"上甘岭区",
+            "code":"230716"
+          },
+          {
+            "name":"嘉荫县",
+            "code":"230722"
+          },
+          {
+            "name":"铁力市",
+            "code":"230781"
+          }
+        ]
+      },
+      {
+        "name":"佳木斯市",
+        "code":"230800",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"230801"
+          },
+          {
+            "name":"向阳区",
+            "code":"230803"
+          },
+          {
+            "name":"前进区",
+            "code":"230804"
+          },
+          {
+            "name":"东风区",
+            "code":"230805"
+          },
+          {
+            "name":"郊区",
+            "code":"230811"
+          },
+          {
+            "name":"桦南县",
+            "code":"230822"
+          },
+          {
+            "name":"桦川县",
+            "code":"230826"
+          },
+          {
+            "name":"汤原县",
+            "code":"230828"
+          },
+          {
+            "name":"抚远县",
+            "code":"230833"
+          },
+          {
+            "name":"同江市",
+            "code":"230881"
+          },
+          {
+            "name":"富锦市",
+            "code":"230882"
+          }
+        ]
+      },
+      {
+        "name":"七台河市",
+        "code":"230900",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"230901"
+          },
+          {
+            "name":"新兴区",
+            "code":"230902"
+          },
+          {
+            "name":"桃山区",
+            "code":"230903"
+          },
+          {
+            "name":"茄子河区",
+            "code":"230904"
+          },
+          {
+            "name":"勃利县",
+            "code":"230921"
+          }
+        ]
+      },
+      {
+        "name":"牡丹江市",
+        "code":"231000",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"231001"
+          },
+          {
+            "name":"东安区",
+            "code":"231002"
+          },
+          {
+            "name":"阳明区",
+            "code":"231003"
+          },
+          {
+            "name":"爱民区",
+            "code":"231004"
+          },
+          {
+            "name":"西安区",
+            "code":"231005"
+          },
+          {
+            "name":"东宁县",
+            "code":"231024"
+          },
+          {
+            "name":"林口县",
+            "code":"231025"
+          },
+          {
+            "name":"绥芬河市",
+            "code":"231081"
+          },
+          {
+            "name":"海林市",
+            "code":"231083"
+          },
+          {
+            "name":"宁安市",
+            "code":"231084"
+          },
+          {
+            "name":"穆棱市",
+            "code":"231085"
+          }
+        ]
+      },
+      {
+        "name":"黑河市",
+        "code":"231100",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"231101"
+          },
+          {
+            "name":"爱辉区",
+            "code":"231102"
+          },
+          {
+            "name":"嫩江县",
+            "code":"231121"
+          },
+          {
+            "name":"逊克县",
+            "code":"231123"
+          },
+          {
+            "name":"孙吴县",
+            "code":"231124"
+          },
+          {
+            "name":"北安市",
+            "code":"231181"
+          },
+          {
+            "name":"五大连池市",
+            "code":"231182"
+          }
+        ]
+      },
+      {
+        "name":"绥化市",
+        "code":"231200",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"231201"
+          },
+          {
+            "name":"北林区",
+            "code":"231202"
+          },
+          {
+            "name":"望奎县",
+            "code":"231221"
+          },
+          {
+            "name":"兰西县",
+            "code":"231222"
+          },
+          {
+            "name":"青冈县",
+            "code":"231223"
+          },
+          {
+            "name":"庆安县",
+            "code":"231224"
+          },
+          {
+            "name":"明水县",
+            "code":"231225"
+          },
+          {
+            "name":"绥棱县",
+            "code":"231226"
+          },
+          {
+            "name":"安达市",
+            "code":"231281"
+          },
+          {
+            "name":"肇东市",
+            "code":"231282"
+          },
+          {
+            "name":"海伦市",
+            "code":"231283"
+          }
+        ]
+      },
+      {
+        "name":"大兴安岭地区",
+        "code":"232700",
+        "sub":[
+          {
+            "name":"呼玛县",
+            "code":"232721"
+          },
+          {
+            "name":"塔河县",
+            "code":"232722"
+          },
+          {
+            "name":"漠河县",
+            "code":"232723"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "name":"上海",
+    "code":"310000",
+    "sub": [
+      {
+        "name":"上海市",
+        "code": "310000",
+        "sub":[
+            {
+              "name":"黄浦区",
+              "code":"310101"
+            },
+            {
+              "name":"徐汇区",
+              "code":"310104"
+            },
+            {
+              "name":"长宁区",
+              "code":"310105"
+            },
+            {
+              "name":"静安区",
+              "code":"310106"
+            },
+            {
+              "name":"普陀区",
+              "code":"310107"
+            },
+            {
+              "name":"闸北区",
+              "code":"310108"
+            },
+            {
+              "name":"虹口区",
+              "code":"310109"
+            },
+            {
+              "name":"杨浦区",
+              "code":"310110"
+            },
+            {
+              "name":"闵行区",
+              "code":"310112"
+            },
+            {
+              "name":"宝山区",
+              "code":"310113"
+            },
+            {
+              "name":"嘉定区",
+              "code":"310114"
+            },
+            {
+              "name":"浦东新区",
+              "code":"310115"
+            },
+            {
+              "name":"金山区",
+              "code":"310116"
+            },
+            {
+              "name":"松江区",
+              "code":"310117"
+            },
+            {
+              "name":"青浦区",
+              "code":"310118"
+            },
+            {
+              "name":"奉贤区",
+              "code":"310120"
+            },
+            {
+              "name":"崇明县",
+              "code":"310230"
+            }
+        ]
+      }
+    ]
+  },
+  {
+    "name":"江苏省",
+    "code":"320000",
+    "sub":[
+      {
+        "name":"南京市",
+        "code":"320100",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"320101"
+          },
+          {
+            "name":"玄武区",
+            "code":"320102"
+          },
+          {
+            "name":"秦淮区",
+            "code":"320104"
+          },
+          {
+            "name":"建邺区",
+            "code":"320105"
+          },
+          {
+            "name":"鼓楼区",
+            "code":"320106"
+          },
+          {
+            "name":"浦口区",
+            "code":"320111"
+          },
+          {
+            "name":"栖霞区",
+            "code":"320113"
+          },
+          {
+            "name":"雨花台区",
+            "code":"320114"
+          },
+          {
+            "name":"江宁区",
+            "code":"320115"
+          },
+          {
+            "name":"六合区",
+            "code":"320116"
+          },
+          {
+            "name":"溧水区",
+            "code":"320117"
+          },
+          {
+            "name":"高淳区",
+            "code":"320118"
+          }
+        ]
+      },
+      {
+        "name":"无锡市",
+        "code":"320200",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"320201"
+          },
+          {
+            "name":"崇安区",
+            "code":"320202"
+          },
+          {
+            "name":"南长区",
+            "code":"320203"
+          },
+          {
+            "name":"北塘区",
+            "code":"320204"
+          },
+          {
+            "name":"锡山区",
+            "code":"320205"
+          },
+          {
+            "name":"惠山区",
+            "code":"320206"
+          },
+          {
+            "name":"滨湖区",
+            "code":"320211"
+          },
+          {
+            "name":"江阴市",
+            "code":"320281"
+          },
+          {
+            "name":"宜兴市",
+            "code":"320282"
+          }
+        ]
+      },
+      {
+        "name":"徐州市",
+        "code":"320300",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"320301"
+          },
+          {
+            "name":"鼓楼区",
+            "code":"320302"
+          },
+          {
+            "name":"云龙区",
+            "code":"320303"
+          },
+          {
+            "name":"贾汪区",
+            "code":"320305"
+          },
+          {
+            "name":"泉山区",
+            "code":"320311"
+          },
+          {
+            "name":"铜山区",
+            "code":"320312"
+          },
+          {
+            "name":"丰县",
+            "code":"320321"
+          },
+          {
+            "name":"沛县",
+            "code":"320322"
+          },
+          {
+            "name":"睢宁县",
+            "code":"320324"
+          },
+          {
+            "name":"新沂市",
+            "code":"320381"
+          },
+          {
+            "name":"邳州市",
+            "code":"320382"
+          }
+        ]
+      },
+      {
+        "name":"常州市",
+        "code":"320400",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"320401"
+          },
+          {
+            "name":"天宁区",
+            "code":"320402"
+          },
+          {
+            "name":"钟楼区",
+            "code":"320404"
+          },
+          {
+            "name":"戚墅堰区",
+            "code":"320405"
+          },
+          {
+            "name":"新北区",
+            "code":"320411"
+          },
+          {
+            "name":"武进区",
+            "code":"320412"
+          },
+          {
+            "name":"溧阳市",
+            "code":"320481"
+          },
+          {
+            "name":"金坛市",
+            "code":"320482"
+          }
+        ]
+      },
+      {
+        "name":"苏州市",
+        "code":"320500",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"320501"
+          },
+          {
+            "name":"虎丘区",
+            "code":"320505"
+          },
+          {
+            "name":"吴中区",
+            "code":"320506"
+          },
+          {
+            "name":"相城区",
+            "code":"320507"
+          },
+          {
+            "name":"姑苏区",
+            "code":"320508"
+          },
+          {
+            "name":"吴江区",
+            "code":"320509"
+          },
+          {
+            "name":"常熟市",
+            "code":"320581"
+          },
+          {
+            "name":"张家港市",
+            "code":"320582"
+          },
+          {
+            "name":"昆山市",
+            "code":"320583"
+          },
+          {
+            "name":"太仓市",
+            "code":"320585"
+          }
+        ]
+      },
+      {
+        "name":"南通市",
+        "code":"320600",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"320601"
+          },
+          {
+            "name":"崇川区",
+            "code":"320602"
+          },
+          {
+            "name":"港闸区",
+            "code":"320611"
+          },
+          {
+            "name":"通州区",
+            "code":"320612"
+          },
+          {
+            "name":"海安县",
+            "code":"320621"
+          },
+          {
+            "name":"如东县",
+            "code":"320623"
+          },
+          {
+            "name":"启东市",
+            "code":"320681"
+          },
+          {
+            "name":"如皋市",
+            "code":"320682"
+          },
+          {
+            "name":"海门市",
+            "code":"320684"
+          }
+        ]
+      },
+      {
+        "name":"连云港市",
+        "code":"320700",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"320701"
+          },
+          {
+            "name":"连云区",
+            "code":"320703"
+          },
+          {
+            "name":"海州区",
+            "code":"320706"
+          },
+          {
+            "name":"赣榆区",
+            "code":"320707"
+          },
+          {
+            "name":"东海县",
+            "code":"320722"
+          },
+          {
+            "name":"灌云县",
+            "code":"320723"
+          },
+          {
+            "name":"灌南县",
+            "code":"320724"
+          }
+        ]
+      },
+      {
+        "name":"淮安市",
+        "code":"320800",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"320801"
+          },
+          {
+            "name":"清河区",
+            "code":"320802"
+          },
+          {
+            "name":"淮安区",
+            "code":"320803"
+          },
+          {
+            "name":"淮阴区",
+            "code":"320804"
+          },
+          {
+            "name":"清浦区",
+            "code":"320811"
+          },
+          {
+            "name":"涟水县",
+            "code":"320826"
+          },
+          {
+            "name":"洪泽县",
+            "code":"320829"
+          },
+          {
+            "name":"盱眙县",
+            "code":"320830"
+          },
+          {
+            "name":"金湖县",
+            "code":"320831"
+          }
+        ]
+      },
+      {
+        "name":"盐城市",
+        "code":"320900",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"320901"
+          },
+          {
+            "name":"亭湖区",
+            "code":"320902"
+          },
+          {
+            "name":"盐都区",
+            "code":"320903"
+          },
+          {
+            "name":"响水县",
+            "code":"320921"
+          },
+          {
+            "name":"滨海县",
+            "code":"320922"
+          },
+          {
+            "name":"阜宁县",
+            "code":"320923"
+          },
+          {
+            "name":"射阳县",
+            "code":"320924"
+          },
+          {
+            "name":"建湖县",
+            "code":"320925"
+          },
+          {
+            "name":"东台市",
+            "code":"320981"
+          },
+          {
+            "name":"大丰市",
+            "code":"320982"
+          }
+        ]
+      },
+      {
+        "name":"扬州市",
+        "code":"321000",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"321001"
+          },
+          {
+            "name":"广陵区",
+            "code":"321002"
+          },
+          {
+            "name":"邗江区",
+            "code":"321003"
+          },
+          {
+            "name":"江都区",
+            "code":"321012"
+          },
+          {
+            "name":"宝应县",
+            "code":"321023"
+          },
+          {
+            "name":"仪征市",
+            "code":"321081"
+          },
+          {
+            "name":"高邮市",
+            "code":"321084"
+          }
+        ]
+      },
+      {
+        "name":"镇江市",
+        "code":"321100",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"321101"
+          },
+          {
+            "name":"京口区",
+            "code":"321102"
+          },
+          {
+            "name":"润州区",
+            "code":"321111"
+          },
+          {
+            "name":"丹徒区",
+            "code":"321112"
+          },
+          {
+            "name":"丹阳市",
+            "code":"321181"
+          },
+          {
+            "name":"扬中市",
+            "code":"321182"
+          },
+          {
+            "name":"句容市",
+            "code":"321183"
+          }
+        ]
+      },
+      {
+        "name":"泰州市",
+        "code":"321200",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"321201"
+          },
+          {
+            "name":"海陵区",
+            "code":"321202"
+          },
+          {
+            "name":"高港区",
+            "code":"321203"
+          },
+          {
+            "name":"姜堰区",
+            "code":"321204"
+          },
+          {
+            "name":"兴化市",
+            "code":"321281"
+          },
+          {
+            "name":"靖江市",
+            "code":"321282"
+          },
+          {
+            "name":"泰兴市",
+            "code":"321283"
+          }
+        ]
+      },
+      {
+        "name":"宿迁市",
+        "code":"321300",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"321301"
+          },
+          {
+            "name":"宿城区",
+            "code":"321302"
+          },
+          {
+            "name":"宿豫区",
+            "code":"321311"
+          },
+          {
+            "name":"沭阳县",
+            "code":"321322"
+          },
+          {
+            "name":"泗阳县",
+            "code":"321323"
+          },
+          {
+            "name":"泗洪县",
+            "code":"321324"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "name":"浙江省",
+    "code":"330000",
+    "sub":[
+      {
+        "name":"杭州市",
+        "code":"330100",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"330101"
+          },
+          {
+            "name":"上城区",
+            "code":"330102"
+          },
+          {
+            "name":"下城区",
+            "code":"330103"
+          },
+          {
+            "name":"江干区",
+            "code":"330104"
+          },
+          {
+            "name":"拱墅区",
+            "code":"330105"
+          },
+          {
+            "name":"西湖区",
+            "code":"330106"
+          },
+          {
+            "name":"滨江区",
+            "code":"330108"
+          },
+          {
+            "name":"萧山区",
+            "code":"330109"
+          },
+          {
+            "name":"余杭区",
+            "code":"330110"
+          },
+          {
+            "name":"富阳区",
+            "code":"330111"
+          },
+          {
+            "name":"桐庐县",
+            "code":"330122"
+          },
+          {
+            "name":"淳安县",
+            "code":"330127"
+          },
+          {
+            "name":"建德市",
+            "code":"330182"
+          },
+          {
+            "name":"临安市",
+            "code":"330185"
+          }
+        ]
+      },
+      {
+        "name":"宁波市",
+        "code":"330200",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"330201"
+          },
+          {
+            "name":"海曙区",
+            "code":"330203"
+          },
+          {
+            "name":"江东区",
+            "code":"330204"
+          },
+          {
+            "name":"江北区",
+            "code":"330205"
+          },
+          {
+            "name":"北仑区",
+            "code":"330206"
+          },
+          {
+            "name":"镇海区",
+            "code":"330211"
+          },
+          {
+            "name":"鄞州区",
+            "code":"330212"
+          },
+          {
+            "name":"象山县",
+            "code":"330225"
+          },
+          {
+            "name":"宁海县",
+            "code":"330226"
+          },
+          {
+            "name":"余姚市",
+            "code":"330281"
+          },
+          {
+            "name":"慈溪市",
+            "code":"330282"
+          },
+          {
+            "name":"奉化市",
+            "code":"330283"
+          }
+        ]
+      },
+      {
+        "name":"温州市",
+        "code":"330300",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"330301"
+          },
+          {
+            "name":"鹿城区",
+            "code":"330302"
+          },
+          {
+            "name":"龙湾区",
+            "code":"330303"
+          },
+          {
+            "name":"瓯海区",
+            "code":"330304"
+          },
+          {
+            "name":"洞头县",
+            "code":"330322"
+          },
+          {
+            "name":"永嘉县",
+            "code":"330324"
+          },
+          {
+            "name":"平阳县",
+            "code":"330326"
+          },
+          {
+            "name":"苍南县",
+            "code":"330327"
+          },
+          {
+            "name":"文成县",
+            "code":"330328"
+          },
+          {
+            "name":"泰顺县",
+            "code":"330329"
+          },
+          {
+            "name":"瑞安市",
+            "code":"330381"
+          },
+          {
+            "name":"乐清市",
+            "code":"330382"
+          }
+        ]
+      },
+      {
+        "name":"嘉兴市",
+        "code":"330400",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"330401"
+          },
+          {
+            "name":"南湖区",
+            "code":"330402"
+          },
+          {
+            "name":"秀洲区",
+            "code":"330411"
+          },
+          {
+            "name":"嘉善县",
+            "code":"330421"
+          },
+          {
+            "name":"海盐县",
+            "code":"330424"
+          },
+          {
+            "name":"海宁市",
+            "code":"330481"
+          },
+          {
+            "name":"平湖市",
+            "code":"330482"
+          },
+          {
+            "name":"桐乡市",
+            "code":"330483"
+          }
+        ]
+      },
+      {
+        "name":"湖州市",
+        "code":"330500",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"330501"
+          },
+          {
+            "name":"吴兴区",
+            "code":"330502"
+          },
+          {
+            "name":"南浔区",
+            "code":"330503"
+          },
+          {
+            "name":"德清县",
+            "code":"330521"
+          },
+          {
+            "name":"长兴县",
+            "code":"330522"
+          },
+          {
+            "name":"安吉县",
+            "code":"330523"
+          }
+        ]
+      },
+      {
+        "name":"绍兴市",
+        "code":"330600",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"330601"
+          },
+          {
+            "name":"越城区",
+            "code":"330602"
+          },
+          {
+            "name":"柯桥区",
+            "code":"330603"
+          },
+          {
+            "name":"上虞区",
+            "code":"330604"
+          },
+          {
+            "name":"新昌县",
+            "code":"330624"
+          },
+          {
+            "name":"诸暨市",
+            "code":"330681"
+          },
+          {
+            "name":"嵊州市",
+            "code":"330683"
+          }
+        ]
+      },
+      {
+        "name":"金华市",
+        "code":"330700",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"330701"
+          },
+          {
+            "name":"婺城区",
+            "code":"330702"
+          },
+          {
+            "name":"金东区",
+            "code":"330703"
+          },
+          {
+            "name":"武义县",
+            "code":"330723"
+          },
+          {
+            "name":"浦江县",
+            "code":"330726"
+          },
+          {
+            "name":"磐安县",
+            "code":"330727"
+          },
+          {
+            "name":"兰溪市",
+            "code":"330781"
+          },
+          {
+            "name":"义乌市",
+            "code":"330782"
+          },
+          {
+            "name":"东阳市",
+            "code":"330783"
+          },
+          {
+            "name":"永康市",
+            "code":"330784"
+          }
+        ]
+      },
+      {
+        "name":"衢州市",
+        "code":"330800",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"330801"
+          },
+          {
+            "name":"柯城区",
+            "code":"330802"
+          },
+          {
+            "name":"衢江区",
+            "code":"330803"
+          },
+          {
+            "name":"常山县",
+            "code":"330822"
+          },
+          {
+            "name":"开化县",
+            "code":"330824"
+          },
+          {
+            "name":"龙游县",
+            "code":"330825"
+          },
+          {
+            "name":"江山市",
+            "code":"330881"
+          }
+        ]
+      },
+      {
+        "name":"舟山市",
+        "code":"330900",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"330901"
+          },
+          {
+            "name":"定海区",
+            "code":"330902"
+          },
+          {
+            "name":"普陀区",
+            "code":"330903"
+          },
+          {
+            "name":"岱山县",
+            "code":"330921"
+          },
+          {
+            "name":"嵊泗县",
+            "code":"330922"
+          }
+        ]
+      },
+      {
+        "name":"台州市",
+        "code":"331000",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"331001"
+          },
+          {
+            "name":"椒江区",
+            "code":"331002"
+          },
+          {
+            "name":"黄岩区",
+            "code":"331003"
+          },
+          {
+            "name":"路桥区",
+            "code":"331004"
+          },
+          {
+            "name":"玉环县",
+            "code":"331021"
+          },
+          {
+            "name":"三门县",
+            "code":"331022"
+          },
+          {
+            "name":"天台县",
+            "code":"331023"
+          },
+          {
+            "name":"仙居县",
+            "code":"331024"
+          },
+          {
+            "name":"温岭市",
+            "code":"331081"
+          },
+          {
+            "name":"临海市",
+            "code":"331082"
+          }
+        ]
+      },
+      {
+        "name":"丽水市",
+        "code":"331100",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"331101"
+          },
+          {
+            "name":"莲都区",
+            "code":"331102"
+          },
+          {
+            "name":"青田县",
+            "code":"331121"
+          },
+          {
+            "name":"缙云县",
+            "code":"331122"
+          },
+          {
+            "name":"遂昌县",
+            "code":"331123"
+          },
+          {
+            "name":"松阳县",
+            "code":"331124"
+          },
+          {
+            "name":"云和县",
+            "code":"331125"
+          },
+          {
+            "name":"庆元县",
+            "code":"331126"
+          },
+          {
+            "name":"景宁畲族自治县",
+            "code":"331127"
+          },
+          {
+            "name":"龙泉市",
+            "code":"331181"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "name":"安徽省",
+    "code":"340000",
+    "sub":[
+      {
+        "name":"合肥市",
+        "code":"340100",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"340101"
+          },
+          {
+            "name":"瑶海区",
+            "code":"340102"
+          },
+          {
+            "name":"庐阳区",
+            "code":"340103"
+          },
+          {
+            "name":"蜀山区",
+            "code":"340104"
+          },
+          {
+            "name":"包河区",
+            "code":"340111"
+          },
+          {
+            "name":"长丰县",
+            "code":"340121"
+          },
+          {
+            "name":"肥东县",
+            "code":"340122"
+          },
+          {
+            "name":"肥西县",
+            "code":"340123"
+          },
+          {
+            "name":"庐江县",
+            "code":"340124"
+          },
+          {
+            "name":"巢湖市",
+            "code":"340181"
+          }
+        ]
+      },
+      {
+        "name":"芜湖市",
+        "code":"340200",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"340201"
+          },
+          {
+            "name":"镜湖区",
+            "code":"340202"
+          },
+          {
+            "name":"弋江区",
+            "code":"340203"
+          },
+          {
+            "name":"鸠江区",
+            "code":"340207"
+          },
+          {
+            "name":"三山区",
+            "code":"340208"
+          },
+          {
+            "name":"芜湖县",
+            "code":"340221"
+          },
+          {
+            "name":"繁昌县",
+            "code":"340222"
+          },
+          {
+            "name":"南陵县",
+            "code":"340223"
+          },
+          {
+            "name":"无为县",
+            "code":"340225"
+          }
+        ]
+      },
+      {
+        "name":"蚌埠市",
+        "code":"340300",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"340301"
+          },
+          {
+            "name":"龙子湖区",
+            "code":"340302"
+          },
+          {
+            "name":"蚌山区",
+            "code":"340303"
+          },
+          {
+            "name":"禹会区",
+            "code":"340304"
+          },
+          {
+            "name":"淮上区",
+            "code":"340311"
+          },
+          {
+            "name":"怀远县",
+            "code":"340321"
+          },
+          {
+            "name":"五河县",
+            "code":"340322"
+          },
+          {
+            "name":"固镇县",
+            "code":"340323"
+          }
+        ]
+      },
+      {
+        "name":"淮南市",
+        "code":"340400",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"340401"
+          },
+          {
+            "name":"大通区",
+            "code":"340402"
+          },
+          {
+            "name":"田家庵区",
+            "code":"340403"
+          },
+          {
+            "name":"谢家集区",
+            "code":"340404"
+          },
+          {
+            "name":"八公山区",
+            "code":"340405"
+          },
+          {
+            "name":"潘集区",
+            "code":"340406"
+          },
+          {
+            "name":"凤台县",
+            "code":"340421"
+          }
+        ]
+      },
+      {
+        "name":"马鞍山市",
+        "code":"340500",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"340501"
+          },
+          {
+            "name":"花山区",
+            "code":"340503"
+          },
+          {
+            "name":"雨山区",
+            "code":"340504"
+          },
+          {
+            "name":"博望区",
+            "code":"340506"
+          },
+          {
+            "name":"当涂县",
+            "code":"340521"
+          },
+          {
+            "name":"含山县",
+            "code":"340522"
+          },
+          {
+            "name":"和县",
+            "code":"340523"
+          }
+        ]
+      },
+      {
+        "name":"淮北市",
+        "code":"340600",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"340601"
+          },
+          {
+            "name":"杜集区",
+            "code":"340602"
+          },
+          {
+            "name":"相山区",
+            "code":"340603"
+          },
+          {
+            "name":"烈山区",
+            "code":"340604"
+          },
+          {
+            "name":"濉溪县",
+            "code":"340621"
+          }
+        ]
+      },
+      {
+        "name":"铜陵市",
+        "code":"340700",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"340701"
+          },
+          {
+            "name":"铜官山区",
+            "code":"340702"
+          },
+          {
+            "name":"狮子山区",
+            "code":"340703"
+          },
+          {
+            "name":"郊区",
+            "code":"340711"
+          },
+          {
+            "name":"铜陵县",
+            "code":"340721"
+          }
+        ]
+      },
+      {
+        "name":"安庆市",
+        "code":"340800",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"340801"
+          },
+          {
+            "name":"迎江区",
+            "code":"340802"
+          },
+          {
+            "name":"大观区",
+            "code":"340803"
+          },
+          {
+            "name":"宜秀区",
+            "code":"340811"
+          },
+          {
+            "name":"怀宁县",
+            "code":"340822"
+          },
+          {
+            "name":"枞阳县",
+            "code":"340823"
+          },
+          {
+            "name":"潜山县",
+            "code":"340824"
+          },
+          {
+            "name":"太湖县",
+            "code":"340825"
+          },
+          {
+            "name":"宿松县",
+            "code":"340826"
+          },
+          {
+            "name":"望江县",
+            "code":"340827"
+          },
+          {
+            "name":"岳西县",
+            "code":"340828"
+          },
+          {
+            "name":"桐城市",
+            "code":"340881"
+          }
+        ]
+      },
+      {
+        "name":"黄山市",
+        "code":"341000",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"341001"
+          },
+          {
+            "name":"屯溪区",
+            "code":"341002"
+          },
+          {
+            "name":"黄山区",
+            "code":"341003"
+          },
+          {
+            "name":"徽州区",
+            "code":"341004"
+          },
+          {
+            "name":"歙县",
+            "code":"341021"
+          },
+          {
+            "name":"休宁县",
+            "code":"341022"
+          },
+          {
+            "name":"黟县",
+            "code":"341023"
+          },
+          {
+            "name":"祁门县",
+            "code":"341024"
+          }
+        ]
+      },
+      {
+        "name":"滁州市",
+        "code":"341100",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"341101"
+          },
+          {
+            "name":"琅琊区",
+            "code":"341102"
+          },
+          {
+            "name":"南谯区",
+            "code":"341103"
+          },
+          {
+            "name":"来安县",
+            "code":"341122"
+          },
+          {
+            "name":"全椒县",
+            "code":"341124"
+          },
+          {
+            "name":"定远县",
+            "code":"341125"
+          },
+          {
+            "name":"凤阳县",
+            "code":"341126"
+          },
+          {
+            "name":"天长市",
+            "code":"341181"
+          },
+          {
+            "name":"明光市",
+            "code":"341182"
+          }
+        ]
+      },
+      {
+        "name":"阜阳市",
+        "code":"341200",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"341201"
+          },
+          {
+            "name":"颍州区",
+            "code":"341202"
+          },
+          {
+            "name":"颍东区",
+            "code":"341203"
+          },
+          {
+            "name":"颍泉区",
+            "code":"341204"
+          },
+          {
+            "name":"临泉县",
+            "code":"341221"
+          },
+          {
+            "name":"太和县",
+            "code":"341222"
+          },
+          {
+            "name":"阜南县",
+            "code":"341225"
+          },
+          {
+            "name":"颍上县",
+            "code":"341226"
+          },
+          {
+            "name":"界首市",
+            "code":"341282"
+          }
+        ]
+      },
+      {
+        "name":"宿州市",
+        "code":"341300",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"341301"
+          },
+          {
+            "name":"埇桥区",
+            "code":"341302"
+          },
+          {
+            "name":"砀山县",
+            "code":"341321"
+          },
+          {
+            "name":"萧县",
+            "code":"341322"
+          },
+          {
+            "name":"灵璧县",
+            "code":"341323"
+          },
+          {
+            "name":"泗县",
+            "code":"341324"
+          }
+        ]
+      },
+      {
+        "name":"六安市",
+        "code":"341500",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"341501"
+          },
+          {
+            "name":"金安区",
+            "code":"341502"
+          },
+          {
+            "name":"裕安区",
+            "code":"341503"
+          },
+          {
+            "name":"寿县",
+            "code":"341521"
+          },
+          {
+            "name":"霍邱县",
+            "code":"341522"
+          },
+          {
+            "name":"舒城县",
+            "code":"341523"
+          },
+          {
+            "name":"金寨县",
+            "code":"341524"
+          },
+          {
+            "name":"霍山县",
+            "code":"341525"
+          }
+        ]
+      },
+      {
+        "name":"亳州市",
+        "code":"341600",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"341601"
+          },
+          {
+            "name":"谯城区",
+            "code":"341602"
+          },
+          {
+            "name":"涡阳县",
+            "code":"341621"
+          },
+          {
+            "name":"蒙城县",
+            "code":"341622"
+          },
+          {
+            "name":"利辛县",
+            "code":"341623"
+          }
+        ]
+      },
+      {
+        "name":"池州市",
+        "code":"341700",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"341701"
+          },
+          {
+            "name":"贵池区",
+            "code":"341702"
+          },
+          {
+            "name":"东至县",
+            "code":"341721"
+          },
+          {
+            "name":"石台县",
+            "code":"341722"
+          },
+          {
+            "name":"青阳县",
+            "code":"341723"
+          }
+        ]
+      },
+      {
+        "name":"宣城市",
+        "code":"341800",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"341801"
+          },
+          {
+            "name":"宣州区",
+            "code":"341802"
+          },
+          {
+            "name":"郎溪县",
+            "code":"341821"
+          },
+          {
+            "name":"广德县",
+            "code":"341822"
+          },
+          {
+            "name":"泾县",
+            "code":"341823"
+          },
+          {
+            "name":"绩溪县",
+            "code":"341824"
+          },
+          {
+            "name":"旌德县",
+            "code":"341825"
+          },
+          {
+            "name":"宁国市",
+            "code":"341881"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "name":"福建省",
+    "code":"350000",
+    "sub":[
+      {
+        "name":"福州市",
+        "code":"350100",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"350101"
+          },
+          {
+            "name":"鼓楼区",
+            "code":"350102"
+          },
+          {
+            "name":"台江区",
+            "code":"350103"
+          },
+          {
+            "name":"仓山区",
+            "code":"350104"
+          },
+          {
+            "name":"马尾区",
+            "code":"350105"
+          },
+          {
+            "name":"晋安区",
+            "code":"350111"
+          },
+          {
+            "name":"闽侯县",
+            "code":"350121"
+          },
+          {
+            "name":"连江县",
+            "code":"350122"
+          },
+          {
+            "name":"罗源县",
+            "code":"350123"
+          },
+          {
+            "name":"闽清县",
+            "code":"350124"
+          },
+          {
+            "name":"永泰县",
+            "code":"350125"
+          },
+          {
+            "name":"平潭县",
+            "code":"350128"
+          },
+          {
+            "name":"福清市",
+            "code":"350181"
+          },
+          {
+            "name":"长乐市",
+            "code":"350182"
+          }
+        ]
+      },
+      {
+        "name":"厦门市",
+        "code":"350200",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"350201"
+          },
+          {
+            "name":"思明区",
+            "code":"350203"
+          },
+          {
+            "name":"海沧区",
+            "code":"350205"
+          },
+          {
+            "name":"湖里区",
+            "code":"350206"
+          },
+          {
+            "name":"集美区",
+            "code":"350211"
+          },
+          {
+            "name":"同安区",
+            "code":"350212"
+          },
+          {
+            "name":"翔安区",
+            "code":"350213"
+          }
+        ]
+      },
+      {
+        "name":"莆田市",
+        "code":"350300",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"350301"
+          },
+          {
+            "name":"城厢区",
+            "code":"350302"
+          },
+          {
+            "name":"涵江区",
+            "code":"350303"
+          },
+          {
+            "name":"荔城区",
+            "code":"350304"
+          },
+          {
+            "name":"秀屿区",
+            "code":"350305"
+          },
+          {
+            "name":"仙游县",
+            "code":"350322"
+          }
+        ]
+      },
+      {
+        "name":"三明市",
+        "code":"350400",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"350401"
+          },
+          {
+            "name":"梅列区",
+            "code":"350402"
+          },
+          {
+            "name":"三元区",
+            "code":"350403"
+          },
+          {
+            "name":"明溪县",
+            "code":"350421"
+          },
+          {
+            "name":"清流县",
+            "code":"350423"
+          },
+          {
+            "name":"宁化县",
+            "code":"350424"
+          },
+          {
+            "name":"大田县",
+            "code":"350425"
+          },
+          {
+            "name":"尤溪县",
+            "code":"350426"
+          },
+          {
+            "name":"沙县",
+            "code":"350427"
+          },
+          {
+            "name":"将乐县",
+            "code":"350428"
+          },
+          {
+            "name":"泰宁县",
+            "code":"350429"
+          },
+          {
+            "name":"建宁县",
+            "code":"350430"
+          },
+          {
+            "name":"永安市",
+            "code":"350481"
+          }
+        ]
+      },
+      {
+        "name":"泉州市",
+        "code":"350500",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"350501"
+          },
+          {
+            "name":"鲤城区",
+            "code":"350502"
+          },
+          {
+            "name":"丰泽区",
+            "code":"350503"
+          },
+          {
+            "name":"洛江区",
+            "code":"350504"
+          },
+          {
+            "name":"泉港区",
+            "code":"350505"
+          },
+          {
+            "name":"惠安县",
+            "code":"350521"
+          },
+          {
+            "name":"安溪县",
+            "code":"350524"
+          },
+          {
+            "name":"永春县",
+            "code":"350525"
+          },
+          {
+            "name":"德化县",
+            "code":"350526"
+          },
+          {
+            "name":"金门县",
+            "code":"350527"
+          },
+          {
+            "name":"石狮市",
+            "code":"350581"
+          },
+          {
+            "name":"晋江市",
+            "code":"350582"
+          },
+          {
+            "name":"南安市",
+            "code":"350583"
+          }
+        ]
+      },
+      {
+        "name":"漳州市",
+        "code":"350600",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"350601"
+          },
+          {
+            "name":"芗城区",
+            "code":"350602"
+          },
+          {
+            "name":"龙文区",
+            "code":"350603"
+          },
+          {
+            "name":"云霄县",
+            "code":"350622"
+          },
+          {
+            "name":"漳浦县",
+            "code":"350623"
+          },
+          {
+            "name":"诏安县",
+            "code":"350624"
+          },
+          {
+            "name":"长泰县",
+            "code":"350625"
+          },
+          {
+            "name":"东山县",
+            "code":"350626"
+          },
+          {
+            "name":"南靖县",
+            "code":"350627"
+          },
+          {
+            "name":"平和县",
+            "code":"350628"
+          },
+          {
+            "name":"华安县",
+            "code":"350629"
+          },
+          {
+            "name":"龙海市",
+            "code":"350681"
+          }
+        ]
+      },
+      {
+        "name":"南平市",
+        "code":"350700",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"350701"
+          },
+          {
+            "name":"延平区",
+            "code":"350702"
+          },
+          {
+            "name":"建阳区",
+            "code":"350703"
+          },
+          {
+            "name":"顺昌县",
+            "code":"350721"
+          },
+          {
+            "name":"浦城县",
+            "code":"350722"
+          },
+          {
+            "name":"光泽县",
+            "code":"350723"
+          },
+          {
+            "name":"松溪县",
+            "code":"350724"
+          },
+          {
+            "name":"政和县",
+            "code":"350725"
+          },
+          {
+            "name":"邵武市",
+            "code":"350781"
+          },
+          {
+            "name":"武夷山市",
+            "code":"350782"
+          },
+          {
+            "name":"建瓯市",
+            "code":"350783"
+          }
+        ]
+      },
+      {
+        "name":"龙岩市",
+        "code":"350800",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"350801"
+          },
+          {
+            "name":"新罗区",
+            "code":"350802"
+          },
+          {
+            "name":"永定区",
+            "code":"350803"
+          },
+          {
+            "name":"长汀县",
+            "code":"350821"
+          },
+          {
+            "name":"上杭县",
+            "code":"350823"
+          },
+          {
+            "name":"武平县",
+            "code":"350824"
+          },
+          {
+            "name":"连城县",
+            "code":"350825"
+          },
+          {
+            "name":"漳平市",
+            "code":"350881"
+          }
+        ]
+      },
+      {
+        "name":"宁德市",
+        "code":"350900",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"350901"
+          },
+          {
+            "name":"蕉城区",
+            "code":"350902"
+          },
+          {
+            "name":"霞浦县",
+            "code":"350921"
+          },
+          {
+            "name":"古田县",
+            "code":"350922"
+          },
+          {
+            "name":"屏南县",
+            "code":"350923"
+          },
+          {
+            "name":"寿宁县",
+            "code":"350924"
+          },
+          {
+            "name":"周宁县",
+            "code":"350925"
+          },
+          {
+            "name":"柘荣县",
+            "code":"350926"
+          },
+          {
+            "name":"福安市",
+            "code":"350981"
+          },
+          {
+            "name":"福鼎市",
+            "code":"350982"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "name":"江西省",
+    "code":"360000",
+    "sub":[
+      {
+        "name":"南昌市",
+        "code":"360100",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"360101"
+          },
+          {
+            "name":"东湖区",
+            "code":"360102"
+          },
+          {
+            "name":"西湖区",
+            "code":"360103"
+          },
+          {
+            "name":"青云谱区",
+            "code":"360104"
+          },
+          {
+            "name":"湾里区",
+            "code":"360105"
+          },
+          {
+            "name":"青山湖区",
+            "code":"360111"
+          },
+          {
+            "name":"南昌县",
+            "code":"360121"
+          },
+          {
+            "name":"新建县",
+            "code":"360122"
+          },
+          {
+            "name":"安义县",
+            "code":"360123"
+          },
+          {
+            "name":"进贤县",
+            "code":"360124"
+          }
+        ]
+      },
+      {
+        "name":"景德镇市",
+        "code":"360200",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"360201"
+          },
+          {
+            "name":"昌江区",
+            "code":"360202"
+          },
+          {
+            "name":"珠山区",
+            "code":"360203"
+          },
+          {
+            "name":"浮梁县",
+            "code":"360222"
+          },
+          {
+            "name":"乐平市",
+            "code":"360281"
+          }
+        ]
+      },
+      {
+        "name":"萍乡市",
+        "code":"360300",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"360301"
+          },
+          {
+            "name":"安源区",
+            "code":"360302"
+          },
+          {
+            "name":"湘东区",
+            "code":"360313"
+          },
+          {
+            "name":"莲花县",
+            "code":"360321"
+          },
+          {
+            "name":"上栗县",
+            "code":"360322"
+          },
+          {
+            "name":"芦溪县",
+            "code":"360323"
+          }
+        ]
+      },
+      {
+        "name":"九江市",
+        "code":"360400",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"360401"
+          },
+          {
+            "name":"庐山区",
+            "code":"360402"
+          },
+          {
+            "name":"浔阳区",
+            "code":"360403"
+          },
+          {
+            "name":"九江县",
+            "code":"360421"
+          },
+          {
+            "name":"武宁县",
+            "code":"360423"
+          },
+          {
+            "name":"修水县",
+            "code":"360424"
+          },
+          {
+            "name":"永修县",
+            "code":"360425"
+          },
+          {
+            "name":"德安县",
+            "code":"360426"
+          },
+          {
+            "name":"星子县",
+            "code":"360427"
+          },
+          {
+            "name":"都昌县",
+            "code":"360428"
+          },
+          {
+            "name":"湖口县",
+            "code":"360429"
+          },
+          {
+            "name":"彭泽县",
+            "code":"360430"
+          },
+          {
+            "name":"瑞昌市",
+            "code":"360481"
+          },
+          {
+            "name":"共青城市",
+            "code":"360482"
+          }
+        ]
+      },
+      {
+        "name":"新余市",
+        "code":"360500",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"360501"
+          },
+          {
+            "name":"渝水区",
+            "code":"360502"
+          },
+          {
+            "name":"分宜县",
+            "code":"360521"
+          }
+        ]
+      },
+      {
+        "name":"鹰潭市",
+        "code":"360600",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"360601"
+          },
+          {
+            "name":"月湖区",
+            "code":"360602"
+          },
+          {
+            "name":"余江县",
+            "code":"360622"
+          },
+          {
+            "name":"贵溪市",
+            "code":"360681"
+          }
+        ]
+      },
+      {
+        "name":"赣州市",
+        "code":"360700",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"360701"
+          },
+          {
+            "name":"章贡区",
+            "code":"360702"
+          },
+          {
+            "name":"南康区",
+            "code":"360703"
+          },
+          {
+            "name":"赣县",
+            "code":"360721"
+          },
+          {
+            "name":"信丰县",
+            "code":"360722"
+          },
+          {
+            "name":"大余县",
+            "code":"360723"
+          },
+          {
+            "name":"上犹县",
+            "code":"360724"
+          },
+          {
+            "name":"崇义县",
+            "code":"360725"
+          },
+          {
+            "name":"安远县",
+            "code":"360726"
+          },
+          {
+            "name":"龙南县",
+            "code":"360727"
+          },
+          {
+            "name":"定南县",
+            "code":"360728"
+          },
+          {
+            "name":"全南县",
+            "code":"360729"
+          },
+          {
+            "name":"宁都县",
+            "code":"360730"
+          },
+          {
+            "name":"于都县",
+            "code":"360731"
+          },
+          {
+            "name":"兴国县",
+            "code":"360732"
+          },
+          {
+            "name":"会昌县",
+            "code":"360733"
+          },
+          {
+            "name":"寻乌县",
+            "code":"360734"
+          },
+          {
+            "name":"石城县",
+            "code":"360735"
+          },
+          {
+            "name":"瑞金市",
+            "code":"360781"
+          }
+        ]
+      },
+      {
+        "name":"吉安市",
+        "code":"360800",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"360801"
+          },
+          {
+            "name":"吉州区",
+            "code":"360802"
+          },
+          {
+            "name":"青原区",
+            "code":"360803"
+          },
+          {
+            "name":"吉安县",
+            "code":"360821"
+          },
+          {
+            "name":"吉水县",
+            "code":"360822"
+          },
+          {
+            "name":"峡江县",
+            "code":"360823"
+          },
+          {
+            "name":"新干县",
+            "code":"360824"
+          },
+          {
+            "name":"永丰县",
+            "code":"360825"
+          },
+          {
+            "name":"泰和县",
+            "code":"360826"
+          },
+          {
+            "name":"遂川县",
+            "code":"360827"
+          },
+          {
+            "name":"万安县",
+            "code":"360828"
+          },
+          {
+            "name":"安福县",
+            "code":"360829"
+          },
+          {
+            "name":"永新县",
+            "code":"360830"
+          },
+          {
+            "name":"井冈山市",
+            "code":"360881"
+          }
+        ]
+      },
+      {
+        "name":"宜春市",
+        "code":"360900",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"360901"
+          },
+          {
+            "name":"袁州区",
+            "code":"360902"
+          },
+          {
+            "name":"奉新县",
+            "code":"360921"
+          },
+          {
+            "name":"万载县",
+            "code":"360922"
+          },
+          {
+            "name":"上高县",
+            "code":"360923"
+          },
+          {
+            "name":"宜丰县",
+            "code":"360924"
+          },
+          {
+            "name":"靖安县",
+            "code":"360925"
+          },
+          {
+            "name":"铜鼓县",
+            "code":"360926"
+          },
+          {
+            "name":"丰城市",
+            "code":"360981"
+          },
+          {
+            "name":"樟树市",
+            "code":"360982"
+          },
+          {
+            "name":"高安市",
+            "code":"360983"
+          }
+        ]
+      },
+      {
+        "name":"抚州市",
+        "code":"361000",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"361001"
+          },
+          {
+            "name":"临川区",
+            "code":"361002"
+          },
+          {
+            "name":"南城县",
+            "code":"361021"
+          },
+          {
+            "name":"黎川县",
+            "code":"361022"
+          },
+          {
+            "name":"南丰县",
+            "code":"361023"
+          },
+          {
+            "name":"崇仁县",
+            "code":"361024"
+          },
+          {
+            "name":"乐安县",
+            "code":"361025"
+          },
+          {
+            "name":"宜黄县",
+            "code":"361026"
+          },
+          {
+            "name":"金溪县",
+            "code":"361027"
+          },
+          {
+            "name":"资溪县",
+            "code":"361028"
+          },
+          {
+            "name":"东乡县",
+            "code":"361029"
+          },
+          {
+            "name":"广昌县",
+            "code":"361030"
+          }
+        ]
+      },
+      {
+        "name":"上饶市",
+        "code":"361100",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"361101"
+          },
+          {
+            "name":"信州区",
+            "code":"361102"
+          },
+          {
+            "name":"上饶县",
+            "code":"361121"
+          },
+          {
+            "name":"广丰县",
+            "code":"361122"
+          },
+          {
+            "name":"玉山县",
+            "code":"361123"
+          },
+          {
+            "name":"铅山县",
+            "code":"361124"
+          },
+          {
+            "name":"横峰县",
+            "code":"361125"
+          },
+          {
+            "name":"弋阳县",
+            "code":"361126"
+          },
+          {
+            "name":"余干县",
+            "code":"361127"
+          },
+          {
+            "name":"鄱阳县",
+            "code":"361128"
+          },
+          {
+            "name":"万年县",
+            "code":"361129"
+          },
+          {
+            "name":"婺源县",
+            "code":"361130"
+          },
+          {
+            "name":"德兴市",
+            "code":"361181"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "name":"山东省",
+    "code":"370000",
+    "sub":[
+      {
+        "name":"济南市",
+        "code":"370100",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"370101"
+          },
+          {
+            "name":"历下区",
+            "code":"370102"
+          },
+          {
+            "name":"市中区",
+            "code":"370103"
+          },
+          {
+            "name":"槐荫区",
+            "code":"370104"
+          },
+          {
+            "name":"天桥区",
+            "code":"370105"
+          },
+          {
+            "name":"历城区",
+            "code":"370112"
+          },
+          {
+            "name":"长清区",
+            "code":"370113"
+          },
+          {
+            "name":"平阴县",
+            "code":"370124"
+          },
+          {
+            "name":"济阳县",
+            "code":"370125"
+          },
+          {
+            "name":"商河县",
+            "code":"370126"
+          },
+          {
+            "name":"章丘市",
+            "code":"370181"
+          }
+        ]
+      },
+      {
+        "name":"青岛市",
+        "code":"370200",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"370201"
+          },
+          {
+            "name":"市南区",
+            "code":"370202"
+          },
+          {
+            "name":"市北区",
+            "code":"370203"
+          },
+          {
+            "name":"黄岛区",
+            "code":"370211"
+          },
+          {
+            "name":"崂山区",
+            "code":"370212"
+          },
+          {
+            "name":"李沧区",
+            "code":"370213"
+          },
+          {
+            "name":"城阳区",
+            "code":"370214"
+          },
+          {
+            "name":"胶州市",
+            "code":"370281"
+          },
+          {
+            "name":"即墨市",
+            "code":"370282"
+          },
+          {
+            "name":"平度市",
+            "code":"370283"
+          },
+          {
+            "name":"莱西市",
+            "code":"370285"
+          }
+        ]
+      },
+      {
+        "name":"淄博市",
+        "code":"370300",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"370301"
+          },
+          {
+            "name":"淄川区",
+            "code":"370302"
+          },
+          {
+            "name":"张店区",
+            "code":"370303"
+          },
+          {
+            "name":"博山区",
+            "code":"370304"
+          },
+          {
+            "name":"临淄区",
+            "code":"370305"
+          },
+          {
+            "name":"周村区",
+            "code":"370306"
+          },
+          {
+            "name":"桓台县",
+            "code":"370321"
+          },
+          {
+            "name":"高青县",
+            "code":"370322"
+          },
+          {
+            "name":"沂源县",
+            "code":"370323"
+          }
+        ]
+      },
+      {
+        "name":"枣庄市",
+        "code":"370400",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"370401"
+          },
+          {
+            "name":"市中区",
+            "code":"370402"
+          },
+          {
+            "name":"薛城区",
+            "code":"370403"
+          },
+          {
+            "name":"峄城区",
+            "code":"370404"
+          },
+          {
+            "name":"台儿庄区",
+            "code":"370405"
+          },
+          {
+            "name":"山亭区",
+            "code":"370406"
+          },
+          {
+            "name":"滕州市",
+            "code":"370481"
+          }
+        ]
+      },
+      {
+        "name":"东营市",
+        "code":"370500",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"370501"
+          },
+          {
+            "name":"东营区",
+            "code":"370502"
+          },
+          {
+            "name":"河口区",
+            "code":"370503"
+          },
+          {
+            "name":"垦利县",
+            "code":"370521"
+          },
+          {
+            "name":"利津县",
+            "code":"370522"
+          },
+          {
+            "name":"广饶县",
+            "code":"370523"
+          }
+        ]
+      },
+      {
+        "name":"烟台市",
+        "code":"370600",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"370601"
+          },
+          {
+            "name":"芝罘区",
+            "code":"370602"
+          },
+          {
+            "name":"福山区",
+            "code":"370611"
+          },
+          {
+            "name":"牟平区",
+            "code":"370612"
+          },
+          {
+            "name":"莱山区",
+            "code":"370613"
+          },
+          {
+            "name":"长岛县",
+            "code":"370634"
+          },
+          {
+            "name":"龙口市",
+            "code":"370681"
+          },
+          {
+            "name":"莱阳市",
+            "code":"370682"
+          },
+          {
+            "name":"莱州市",
+            "code":"370683"
+          },
+          {
+            "name":"蓬莱市",
+            "code":"370684"
+          },
+          {
+            "name":"招远市",
+            "code":"370685"
+          },
+          {
+            "name":"栖霞市",
+            "code":"370686"
+          },
+          {
+            "name":"海阳市",
+            "code":"370687"
+          }
+        ]
+      },
+      {
+        "name":"潍坊市",
+        "code":"370700",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"370701"
+          },
+          {
+            "name":"潍城区",
+            "code":"370702"
+          },
+          {
+            "name":"寒亭区",
+            "code":"370703"
+          },
+          {
+            "name":"坊子区",
+            "code":"370704"
+          },
+          {
+            "name":"奎文区",
+            "code":"370705"
+          },
+          {
+            "name":"临朐县",
+            "code":"370724"
+          },
+          {
+            "name":"昌乐县",
+            "code":"370725"
+          },
+          {
+            "name":"青州市",
+            "code":"370781"
+          },
+          {
+            "name":"诸城市",
+            "code":"370782"
+          },
+          {
+            "name":"寿光市",
+            "code":"370783"
+          },
+          {
+            "name":"安丘市",
+            "code":"370784"
+          },
+          {
+            "name":"高密市",
+            "code":"370785"
+          },
+          {
+            "name":"昌邑市",
+            "code":"370786"
+          }
+        ]
+      },
+      {
+        "name":"济宁市",
+        "code":"370800",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"370801"
+          },
+          {
+            "name":"任城区",
+            "code":"370811"
+          },
+          {
+            "name":"兖州区",
+            "code":"370812"
+          },
+          {
+            "name":"微山县",
+            "code":"370826"
+          },
+          {
+            "name":"鱼台县",
+            "code":"370827"
+          },
+          {
+            "name":"金乡县",
+            "code":"370828"
+          },
+          {
+            "name":"嘉祥县",
+            "code":"370829"
+          },
+          {
+            "name":"汶上县",
+            "code":"370830"
+          },
+          {
+            "name":"泗水县",
+            "code":"370831"
+          },
+          {
+            "name":"梁山县",
+            "code":"370832"
+          },
+          {
+            "name":"曲阜市",
+            "code":"370881"
+          },
+          {
+            "name":"邹城市",
+            "code":"370883"
+          }
+        ]
+      },
+      {
+        "name":"泰安市",
+        "code":"370900",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"370901"
+          },
+          {
+            "name":"泰山区",
+            "code":"370902"
+          },
+          {
+            "name":"岱岳区",
+            "code":"370911"
+          },
+          {
+            "name":"宁阳县",
+            "code":"370921"
+          },
+          {
+            "name":"东平县",
+            "code":"370923"
+          },
+          {
+            "name":"新泰市",
+            "code":"370982"
+          },
+          {
+            "name":"肥城市",
+            "code":"370983"
+          }
+        ]
+      },
+      {
+        "name":"威海市",
+        "code":"371000",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"371001"
+          },
+          {
+            "name":"环翠区",
+            "code":"371002"
+          },
+          {
+            "name":"文登市",
+            "code":"371081"
+          },
+          {
+            "name":"荣成市",
+            "code":"371082"
+          },
+          {
+            "name":"乳山市",
+            "code":"371083"
+          }
+        ]
+      },
+      {
+        "name":"日照市",
+        "code":"371100",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"371101"
+          },
+          {
+            "name":"东港区",
+            "code":"371102"
+          },
+          {
+            "name":"岚山区",
+            "code":"371103"
+          },
+          {
+            "name":"五莲县",
+            "code":"371121"
+          },
+          {
+            "name":"莒县",
+            "code":"371122"
+          }
+        ]
+      },
+      {
+        "name":"莱芜市",
+        "code":"371200",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"371201"
+          },
+          {
+            "name":"莱城区",
+            "code":"371202"
+          },
+          {
+            "name":"钢城区",
+            "code":"371203"
+          }
+        ]
+      },
+      {
+        "name":"临沂市",
+        "code":"371300",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"371301"
+          },
+          {
+            "name":"兰山区",
+            "code":"371302"
+          },
+          {
+            "name":"罗庄区",
+            "code":"371311"
+          },
+          {
+            "name":"河东区",
+            "code":"371312"
+          },
+          {
+            "name":"沂南县",
+            "code":"371321"
+          },
+          {
+            "name":"郯城县",
+            "code":"371322"
+          },
+          {
+            "name":"沂水县",
+            "code":"371323"
+          },
+          {
+            "name":"兰陵县",
+            "code":"371324"
+          },
+          {
+            "name":"费县",
+            "code":"371325"
+          },
+          {
+            "name":"平邑县",
+            "code":"371326"
+          },
+          {
+            "name":"莒南县",
+            "code":"371327"
+          },
+          {
+            "name":"蒙阴县",
+            "code":"371328"
+          },
+          {
+            "name":"临沭县",
+            "code":"371329"
+          }
+        ]
+      },
+      {
+        "name":"德州市",
+        "code":"371400",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"371401"
+          },
+          {
+            "name":"德城区",
+            "code":"371402"
+          },
+          {
+            "name":"陵城区",
+            "code":"371403"
+          },
+          {
+            "name":"宁津县",
+            "code":"371422"
+          },
+          {
+            "name":"庆云县",
+            "code":"371423"
+          },
+          {
+            "name":"临邑县",
+            "code":"371424"
+          },
+          {
+            "name":"齐河县",
+            "code":"371425"
+          },
+          {
+            "name":"平原县",
+            "code":"371426"
+          },
+          {
+            "name":"夏津县",
+            "code":"371427"
+          },
+          {
+            "name":"武城县",
+            "code":"371428"
+          },
+          {
+            "name":"乐陵市",
+            "code":"371481"
+          },
+          {
+            "name":"禹城市",
+            "code":"371482"
+          }
+        ]
+      },
+      {
+        "name":"聊城市",
+        "code":"371500",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"371501"
+          },
+          {
+            "name":"东昌府区",
+            "code":"371502"
+          },
+          {
+            "name":"阳谷县",
+            "code":"371521"
+          },
+          {
+            "name":"莘县",
+            "code":"371522"
+          },
+          {
+            "name":"茌平县",
+            "code":"371523"
+          },
+          {
+            "name":"东阿县",
+            "code":"371524"
+          },
+          {
+            "name":"冠县",
+            "code":"371525"
+          },
+          {
+            "name":"高唐县",
+            "code":"371526"
+          },
+          {
+            "name":"临清市",
+            "code":"371581"
+          }
+        ]
+      },
+      {
+        "name":"滨州市",
+        "code":"371600",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"371601"
+          },
+          {
+            "name":"滨城区",
+            "code":"371602"
+          },
+          {
+            "name":"沾化区",
+            "code":"371603"
+          },
+          {
+            "name":"惠民县",
+            "code":"371621"
+          },
+          {
+            "name":"阳信县",
+            "code":"371622"
+          },
+          {
+            "name":"无棣县",
+            "code":"371623"
+          },
+          {
+            "name":"博兴县",
+            "code":"371625"
+          },
+          {
+            "name":"邹平县",
+            "code":"371626"
+          }
+        ]
+      },
+      {
+        "name":"菏泽市",
+        "code":"371700",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"371701"
+          },
+          {
+            "name":"牡丹区",
+            "code":"371702"
+          },
+          {
+            "name":"曹县",
+            "code":"371721"
+          },
+          {
+            "name":"单县",
+            "code":"371722"
+          },
+          {
+            "name":"成武县",
+            "code":"371723"
+          },
+          {
+            "name":"巨野县",
+            "code":"371724"
+          },
+          {
+            "name":"郓城县",
+            "code":"371725"
+          },
+          {
+            "name":"鄄城县",
+            "code":"371726"
+          },
+          {
+            "name":"定陶县",
+            "code":"371727"
+          },
+          {
+            "name":"东明县",
+            "code":"371728"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "name":"河南省",
+    "code":"410000",
+    "sub":[
+      {
+        "name":"郑州市",
+        "code":"410100",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"410101"
+          },
+          {
+            "name":"中原区",
+            "code":"410102"
+          },
+          {
+            "name":"二七区",
+            "code":"410103"
+          },
+          {
+            "name":"管城回族区",
+            "code":"410104"
+          },
+          {
+            "name":"金水区",
+            "code":"410105"
+          },
+          {
+            "name":"上街区",
+            "code":"410106"
+          },
+          {
+            "name":"惠济区",
+            "code":"410108"
+          },
+          {
+            "name":"中牟县",
+            "code":"410122"
+          },
+          {
+            "name":"巩义市",
+            "code":"410181"
+          },
+          {
+            "name":"荥阳市",
+            "code":"410182"
+          },
+          {
+            "name":"新密市",
+            "code":"410183"
+          },
+          {
+            "name":"新郑市",
+            "code":"410184"
+          },
+          {
+            "name":"登封市",
+            "code":"410185"
+          }
+        ]
+      },
+      {
+        "name":"开封市",
+        "code":"410200",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"410201"
+          },
+          {
+            "name":"龙亭区",
+            "code":"410202"
+          },
+          {
+            "name":"顺河回族区",
+            "code":"410203"
+          },
+          {
+            "name":"鼓楼区",
+            "code":"410204"
+          },
+          {
+            "name":"禹王台区",
+            "code":"410205"
+          },
+          {
+            "name":"祥符区",
+            "code":"410212"
+          },
+          {
+            "name":"杞县",
+            "code":"410221"
+          },
+          {
+            "name":"通许县",
+            "code":"410222"
+          },
+          {
+            "name":"尉氏县",
+            "code":"410223"
+          },
+          {
+            "name":"兰考县",
+            "code":"410225"
+          }
+        ]
+      },
+      {
+        "name":"洛阳市",
+        "code":"410300",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"410301"
+          },
+          {
+            "name":"老城区",
+            "code":"410302"
+          },
+          {
+            "name":"西工区",
+            "code":"410303"
+          },
+          {
+            "name":"瀍河回族区",
+            "code":"410304"
+          },
+          {
+            "name":"涧西区",
+            "code":"410305"
+          },
+          {
+            "name":"吉利区",
+            "code":"410306"
+          },
+          {
+            "name":"洛龙区",
+            "code":"410311"
+          },
+          {
+            "name":"孟津县",
+            "code":"410322"
+          },
+          {
+            "name":"新安县",
+            "code":"410323"
+          },
+          {
+            "name":"栾川县",
+            "code":"410324"
+          },
+          {
+            "name":"嵩县",
+            "code":"410325"
+          },
+          {
+            "name":"汝阳县",
+            "code":"410326"
+          },
+          {
+            "name":"宜阳县",
+            "code":"410327"
+          },
+          {
+            "name":"洛宁县",
+            "code":"410328"
+          },
+          {
+            "name":"伊川县",
+            "code":"410329"
+          },
+          {
+            "name":"偃师市",
+            "code":"410381"
+          }
+        ]
+      },
+      {
+        "name":"平顶山市",
+        "code":"410400",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"410401"
+          },
+          {
+            "name":"新华区",
+            "code":"410402"
+          },
+          {
+            "name":"卫东区",
+            "code":"410403"
+          },
+          {
+            "name":"石龙区",
+            "code":"410404"
+          },
+          {
+            "name":"湛河区",
+            "code":"410411"
+          },
+          {
+            "name":"宝丰县",
+            "code":"410421"
+          },
+          {
+            "name":"叶县",
+            "code":"410422"
+          },
+          {
+            "name":"鲁山县",
+            "code":"410423"
+          },
+          {
+            "name":"郏县",
+            "code":"410425"
+          },
+          {
+            "name":"舞钢市",
+            "code":"410481"
+          },
+          {
+            "name":"汝州市",
+            "code":"410482"
+          }
+        ]
+      },
+      {
+        "name":"安阳市",
+        "code":"410500",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"410501"
+          },
+          {
+            "name":"文峰区",
+            "code":"410502"
+          },
+          {
+            "name":"北关区",
+            "code":"410503"
+          },
+          {
+            "name":"殷都区",
+            "code":"410505"
+          },
+          {
+            "name":"龙安区",
+            "code":"410506"
+          },
+          {
+            "name":"安阳县",
+            "code":"410522"
+          },
+          {
+            "name":"汤阴县",
+            "code":"410523"
+          },
+          {
+            "name":"滑县",
+            "code":"410526"
+          },
+          {
+            "name":"内黄县",
+            "code":"410527"
+          },
+          {
+            "name":"林州市",
+            "code":"410581"
+          }
+        ]
+      },
+      {
+        "name":"鹤壁市",
+        "code":"410600",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"410601"
+          },
+          {
+            "name":"鹤山区",
+            "code":"410602"
+          },
+          {
+            "name":"山城区",
+            "code":"410603"
+          },
+          {
+            "name":"淇滨区",
+            "code":"410611"
+          },
+          {
+            "name":"浚县",
+            "code":"410621"
+          },
+          {
+            "name":"淇县",
+            "code":"410622"
+          }
+        ]
+      },
+      {
+        "name":"新乡市",
+        "code":"410700",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"410701"
+          },
+          {
+            "name":"红旗区",
+            "code":"410702"
+          },
+          {
+            "name":"卫滨区",
+            "code":"410703"
+          },
+          {
+            "name":"凤泉区",
+            "code":"410704"
+          },
+          {
+            "name":"牧野区",
+            "code":"410711"
+          },
+          {
+            "name":"新乡县",
+            "code":"410721"
+          },
+          {
+            "name":"获嘉县",
+            "code":"410724"
+          },
+          {
+            "name":"原阳县",
+            "code":"410725"
+          },
+          {
+            "name":"延津县",
+            "code":"410726"
+          },
+          {
+            "name":"封丘县",
+            "code":"410727"
+          },
+          {
+            "name":"长垣县",
+            "code":"410728"
+          },
+          {
+            "name":"卫辉市",
+            "code":"410781"
+          },
+          {
+            "name":"辉县市",
+            "code":"410782"
+          }
+        ]
+      },
+      {
+        "name":"焦作市",
+        "code":"410800",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"410801"
+          },
+          {
+            "name":"解放区",
+            "code":"410802"
+          },
+          {
+            "name":"中站区",
+            "code":"410803"
+          },
+          {
+            "name":"马村区",
+            "code":"410804"
+          },
+          {
+            "name":"山阳区",
+            "code":"410811"
+          },
+          {
+            "name":"修武县",
+            "code":"410821"
+          },
+          {
+            "name":"博爱县",
+            "code":"410822"
+          },
+          {
+            "name":"武陟县",
+            "code":"410823"
+          },
+          {
+            "name":"温县",
+            "code":"410825"
+          },
+          {
+            "name":"沁阳市",
+            "code":"410882"
+          },
+          {
+            "name":"孟州市",
+            "code":"410883"
+          }
+        ]
+      },
+      {
+        "name":"濮阳市",
+        "code":"410900",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"410901"
+          },
+          {
+            "name":"华龙区",
+            "code":"410902"
+          },
+          {
+            "name":"清丰县",
+            "code":"410922"
+          },
+          {
+            "name":"南乐县",
+            "code":"410923"
+          },
+          {
+            "name":"范县",
+            "code":"410926"
+          },
+          {
+            "name":"台前县",
+            "code":"410927"
+          },
+          {
+            "name":"濮阳县",
+            "code":"410928"
+          }
+        ]
+      },
+      {
+        "name":"许昌市",
+        "code":"411000",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"411001"
+          },
+          {
+            "name":"魏都区",
+            "code":"411002"
+          },
+          {
+            "name":"许昌县",
+            "code":"411023"
+          },
+          {
+            "name":"鄢陵县",
+            "code":"411024"
+          },
+          {
+            "name":"襄城县",
+            "code":"411025"
+          },
+          {
+            "name":"禹州市",
+            "code":"411081"
+          },
+          {
+            "name":"长葛市",
+            "code":"411082"
+          }
+        ]
+      },
+      {
+        "name":"漯河市",
+        "code":"411100",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"411101"
+          },
+          {
+            "name":"源汇区",
+            "code":"411102"
+          },
+          {
+            "name":"郾城区",
+            "code":"411103"
+          },
+          {
+            "name":"召陵区",
+            "code":"411104"
+          },
+          {
+            "name":"舞阳县",
+            "code":"411121"
+          },
+          {
+            "name":"临颍县",
+            "code":"411122"
+          }
+        ]
+      },
+      {
+        "name":"三门峡市",
+        "code":"411200",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"411201"
+          },
+          {
+            "name":"湖滨区",
+            "code":"411202"
+          },
+          {
+            "name":"渑池县",
+            "code":"411221"
+          },
+          {
+            "name":"陕县",
+            "code":"411222"
+          },
+          {
+            "name":"卢氏县",
+            "code":"411224"
+          },
+          {
+            "name":"义马市",
+            "code":"411281"
+          },
+          {
+            "name":"灵宝市",
+            "code":"411282"
+          }
+        ]
+      },
+      {
+        "name":"南阳市",
+        "code":"411300",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"411301"
+          },
+          {
+            "name":"宛城区",
+            "code":"411302"
+          },
+          {
+            "name":"卧龙区",
+            "code":"411303"
+          },
+          {
+            "name":"南召县",
+            "code":"411321"
+          },
+          {
+            "name":"方城县",
+            "code":"411322"
+          },
+          {
+            "name":"西峡县",
+            "code":"411323"
+          },
+          {
+            "name":"镇平县",
+            "code":"411324"
+          },
+          {
+            "name":"内乡县",
+            "code":"411325"
+          },
+          {
+            "name":"淅川县",
+            "code":"411326"
+          },
+          {
+            "name":"社旗县",
+            "code":"411327"
+          },
+          {
+            "name":"唐河县",
+            "code":"411328"
+          },
+          {
+            "name":"新野县",
+            "code":"411329"
+          },
+          {
+            "name":"桐柏县",
+            "code":"411330"
+          },
+          {
+            "name":"邓州市",
+            "code":"411381"
+          }
+        ]
+      },
+      {
+        "name":"商丘市",
+        "code":"411400",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"411401"
+          },
+          {
+            "name":"梁园区",
+            "code":"411402"
+          },
+          {
+            "name":"睢阳区",
+            "code":"411403"
+          },
+          {
+            "name":"民权县",
+            "code":"411421"
+          },
+          {
+            "name":"睢县",
+            "code":"411422"
+          },
+          {
+            "name":"宁陵县",
+            "code":"411423"
+          },
+          {
+            "name":"柘城县",
+            "code":"411424"
+          },
+          {
+            "name":"虞城县",
+            "code":"411425"
+          },
+          {
+            "name":"夏邑县",
+            "code":"411426"
+          },
+          {
+            "name":"永城市",
+            "code":"411481"
+          }
+        ]
+      },
+      {
+        "name":"信阳市",
+        "code":"411500",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"411501"
+          },
+          {
+            "name":"浉河区",
+            "code":"411502"
+          },
+          {
+            "name":"平桥区",
+            "code":"411503"
+          },
+          {
+            "name":"罗山县",
+            "code":"411521"
+          },
+          {
+            "name":"光山县",
+            "code":"411522"
+          },
+          {
+            "name":"新县",
+            "code":"411523"
+          },
+          {
+            "name":"商城县",
+            "code":"411524"
+          },
+          {
+            "name":"固始县",
+            "code":"411525"
+          },
+          {
+            "name":"潢川县",
+            "code":"411526"
+          },
+          {
+            "name":"淮滨县",
+            "code":"411527"
+          },
+          {
+            "name":"息县",
+            "code":"411528"
+          }
+        ]
+      },
+      {
+        "name":"周口市",
+        "code":"411600",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"411601"
+          },
+          {
+            "name":"川汇区",
+            "code":"411602"
+          },
+          {
+            "name":"扶沟县",
+            "code":"411621"
+          },
+          {
+            "name":"西华县",
+            "code":"411622"
+          },
+          {
+            "name":"商水县",
+            "code":"411623"
+          },
+          {
+            "name":"沈丘县",
+            "code":"411624"
+          },
+          {
+            "name":"郸城县",
+            "code":"411625"
+          },
+          {
+            "name":"淮阳县",
+            "code":"411626"
+          },
+          {
+            "name":"太康县",
+            "code":"411627"
+          },
+          {
+            "name":"鹿邑县",
+            "code":"411628"
+          },
+          {
+            "name":"项城市",
+            "code":"411681"
+          }
+        ]
+      },
+      {
+        "name":"驻马店市",
+        "code":"411700",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"411701"
+          },
+          {
+            "name":"驿城区",
+            "code":"411702"
+          },
+          {
+            "name":"西平县",
+            "code":"411721"
+          },
+          {
+            "name":"上蔡县",
+            "code":"411722"
+          },
+          {
+            "name":"平舆县",
+            "code":"411723"
+          },
+          {
+            "name":"正阳县",
+            "code":"411724"
+          },
+          {
+            "name":"确山县",
+            "code":"411725"
+          },
+          {
+            "name":"泌阳县",
+            "code":"411726"
+          },
+          {
+            "name":"汝南县",
+            "code":"411727"
+          },
+          {
+            "name":"遂平县",
+            "code":"411728"
+          },
+          {
+            "name":"新蔡县",
+            "code":"411729"
+          }
+        ]
+      },
+      {
+        "name":"济源市",
+        "code":"419001"
+      }
+    ]
+  },
+  {
+    "name":"湖北省",
+    "code":"420000",
+    "sub":[
+      {
+        "name":"武汉市",
+        "code":"420100",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"420101"
+          },
+          {
+            "name":"江岸区",
+            "code":"420102"
+          },
+          {
+            "name":"江汉区",
+            "code":"420103"
+          },
+          {
+            "name":"硚口区",
+            "code":"420104"
+          },
+          {
+            "name":"汉阳区",
+            "code":"420105"
+          },
+          {
+            "name":"武昌区",
+            "code":"420106"
+          },
+          {
+            "name":"青山区",
+            "code":"420107"
+          },
+          {
+            "name":"洪山区",
+            "code":"420111"
+          },
+          {
+            "name":"东西湖区",
+            "code":"420112"
+          },
+          {
+            "name":"汉南区",
+            "code":"420113"
+          },
+          {
+            "name":"蔡甸区",
+            "code":"420114"
+          },
+          {
+            "name":"江夏区",
+            "code":"420115"
+          },
+          {
+            "name":"黄陂区",
+            "code":"420116"
+          },
+          {
+            "name":"新洲区",
+            "code":"420117"
+          }
+        ]
+      },
+      {
+        "name":"黄石市",
+        "code":"420200",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"420201"
+          },
+          {
+            "name":"黄石港区",
+            "code":"420202"
+          },
+          {
+            "name":"西塞山区",
+            "code":"420203"
+          },
+          {
+            "name":"下陆区",
+            "code":"420204"
+          },
+          {
+            "name":"铁山区",
+            "code":"420205"
+          },
+          {
+            "name":"阳新县",
+            "code":"420222"
+          },
+          {
+            "name":"大冶市",
+            "code":"420281"
+          }
+        ]
+      },
+      {
+        "name":"十堰市",
+        "code":"420300",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"420301"
+          },
+          {
+            "name":"茅箭区",
+            "code":"420302"
+          },
+          {
+            "name":"张湾区",
+            "code":"420303"
+          },
+          {
+            "name":"郧阳区",
+            "code":"420304"
+          },
+          {
+            "name":"郧西县",
+            "code":"420322"
+          },
+          {
+            "name":"竹山县",
+            "code":"420323"
+          },
+          {
+            "name":"竹溪县",
+            "code":"420324"
+          },
+          {
+            "name":"房县",
+            "code":"420325"
+          },
+          {
+            "name":"丹江口市",
+            "code":"420381"
+          }
+        ]
+      },
+      {
+        "name":"宜昌市",
+        "code":"420500",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"420501"
+          },
+          {
+            "name":"西陵区",
+            "code":"420502"
+          },
+          {
+            "name":"伍家岗区",
+            "code":"420503"
+          },
+          {
+            "name":"点军区",
+            "code":"420504"
+          },
+          {
+            "name":"猇亭区",
+            "code":"420505"
+          },
+          {
+            "name":"夷陵区",
+            "code":"420506"
+          },
+          {
+            "name":"远安县",
+            "code":"420525"
+          },
+          {
+            "name":"兴山县",
+            "code":"420526"
+          },
+          {
+            "name":"秭归县",
+            "code":"420527"
+          },
+          {
+            "name":"长阳土家族自治县",
+            "code":"420528"
+          },
+          {
+            "name":"五峰土家族自治县",
+            "code":"420529"
+          },
+          {
+            "name":"宜都市",
+            "code":"420581"
+          },
+          {
+            "name":"当阳市",
+            "code":"420582"
+          },
+          {
+            "name":"枝江市",
+            "code":"420583"
+          }
+        ]
+      },
+      {
+        "name":"襄阳市",
+        "code":"420600",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"420601"
+          },
+          {
+            "name":"襄城区",
+            "code":"420602"
+          },
+          {
+            "name":"樊城区",
+            "code":"420606"
+          },
+          {
+            "name":"襄州区",
+            "code":"420607"
+          },
+          {
+            "name":"南漳县",
+            "code":"420624"
+          },
+          {
+            "name":"谷城县",
+            "code":"420625"
+          },
+          {
+            "name":"保康县",
+            "code":"420626"
+          },
+          {
+            "name":"老河口市",
+            "code":"420682"
+          },
+          {
+            "name":"枣阳市",
+            "code":"420683"
+          },
+          {
+            "name":"宜城市",
+            "code":"420684"
+          }
+        ]
+      },
+      {
+        "name":"鄂州市",
+        "code":"420700",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"420701"
+          },
+          {
+            "name":"梁子湖区",
+            "code":"420702"
+          },
+          {
+            "name":"华容区",
+            "code":"420703"
+          },
+          {
+            "name":"鄂城区",
+            "code":"420704"
+          }
+        ]
+      },
+      {
+        "name":"荆门市",
+        "code":"420800",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"420801"
+          },
+          {
+            "name":"东宝区",
+            "code":"420802"
+          },
+          {
+            "name":"掇刀区",
+            "code":"420804"
+          },
+          {
+            "name":"京山县",
+            "code":"420821"
+          },
+          {
+            "name":"沙洋县",
+            "code":"420822"
+          },
+          {
+            "name":"钟祥市",
+            "code":"420881"
+          }
+        ]
+      },
+      {
+        "name":"孝感市",
+        "code":"420900",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"420901"
+          },
+          {
+            "name":"孝南区",
+            "code":"420902"
+          },
+          {
+            "name":"孝昌县",
+            "code":"420921"
+          },
+          {
+            "name":"大悟县",
+            "code":"420922"
+          },
+          {
+            "name":"云梦县",
+            "code":"420923"
+          },
+          {
+            "name":"应城市",
+            "code":"420981"
+          },
+          {
+            "name":"安陆市",
+            "code":"420982"
+          },
+          {
+            "name":"汉川市",
+            "code":"420984"
+          }
+        ]
+      },
+      {
+        "name":"荆州市",
+        "code":"421000",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"421001"
+          },
+          {
+            "name":"沙市区",
+            "code":"421002"
+          },
+          {
+            "name":"荆州区",
+            "code":"421003"
+          },
+          {
+            "name":"公安县",
+            "code":"421022"
+          },
+          {
+            "name":"监利县",
+            "code":"421023"
+          },
+          {
+            "name":"江陵县",
+            "code":"421024"
+          },
+          {
+            "name":"石首市",
+            "code":"421081"
+          },
+          {
+            "name":"洪湖市",
+            "code":"421083"
+          },
+          {
+            "name":"松滋市",
+            "code":"421087"
+          }
+        ]
+      },
+      {
+        "name":"黄冈市",
+        "code":"421100",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"421101"
+          },
+          {
+            "name":"黄州区",
+            "code":"421102"
+          },
+          {
+            "name":"团风县",
+            "code":"421121"
+          },
+          {
+            "name":"红安县",
+            "code":"421122"
+          },
+          {
+            "name":"罗田县",
+            "code":"421123"
+          },
+          {
+            "name":"英山县",
+            "code":"421124"
+          },
+          {
+            "name":"浠水县",
+            "code":"421125"
+          },
+          {
+            "name":"蕲春县",
+            "code":"421126"
+          },
+          {
+            "name":"黄梅县",
+            "code":"421127"
+          },
+          {
+            "name":"麻城市",
+            "code":"421181"
+          },
+          {
+            "name":"武穴市",
+            "code":"421182"
+          }
+        ]
+      },
+      {
+        "name":"咸宁市",
+        "code":"421200",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"421201"
+          },
+          {
+            "name":"咸安区",
+            "code":"421202"
+          },
+          {
+            "name":"嘉鱼县",
+            "code":"421221"
+          },
+          {
+            "name":"通城县",
+            "code":"421222"
+          },
+          {
+            "name":"崇阳县",
+            "code":"421223"
+          },
+          {
+            "name":"通山县",
+            "code":"421224"
+          },
+          {
+            "name":"赤壁市",
+            "code":"421281"
+          }
+        ]
+      },
+      {
+        "name":"随州市",
+        "code":"421300",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"421301"
+          },
+          {
+            "name":"曾都区",
+            "code":"421303"
+          },
+          {
+            "name":"随县",
+            "code":"421321"
+          },
+          {
+            "name":"广水市",
+            "code":"421381"
+          }
+        ]
+      },
+      {
+        "name":"恩施土家族苗族自治州",
+        "code":"422800",
+        "sub":[
+          {
+            "name":"恩施市",
+            "code":"422801"
+          },
+          {
+            "name":"利川市",
+            "code":"422802"
+          },
+          {
+            "name":"建始县",
+            "code":"422822"
+          },
+          {
+            "name":"巴东县",
+            "code":"422823"
+          },
+          {
+            "name":"宣恩县",
+            "code":"422825"
+          },
+          {
+            "name":"咸丰县",
+            "code":"422826"
+          },
+          {
+            "name":"来凤县",
+            "code":"422827"
+          },
+          {
+            "name":"鹤峰县",
+            "code":"422828"
+          }
+        ]
+      },
+      {
+        "name":"仙桃市",
+        "code":"429004"
+      },
+      {
+        "name":"潜江市",
+        "code":"429005"
+      },
+      {
+        "name":"天门市",
+        "code":"429006"
+      },
+      {
+        "name":"神农架林区",
+        "code":"429021"
+      }
+    ]
+  },
+  {
+    "name":"湖南省",
+    "code":"430000",
+    "sub":[
+      {
+        "name":"长沙市",
+        "code":"430100",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"430101"
+          },
+          {
+            "name":"芙蓉区",
+            "code":"430102"
+          },
+          {
+            "name":"天心区",
+            "code":"430103"
+          },
+          {
+            "name":"岳麓区",
+            "code":"430104"
+          },
+          {
+            "name":"开福区",
+            "code":"430105"
+          },
+          {
+            "name":"雨花区",
+            "code":"430111"
+          },
+          {
+            "name":"望城区",
+            "code":"430112"
+          },
+          {
+            "name":"长沙县",
+            "code":"430121"
+          },
+          {
+            "name":"宁乡县",
+            "code":"430124"
+          },
+          {
+            "name":"浏阳市",
+            "code":"430181"
+          }
+        ]
+      },
+      {
+        "name":"株洲市",
+        "code":"430200",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"430201"
+          },
+          {
+            "name":"荷塘区",
+            "code":"430202"
+          },
+          {
+            "name":"芦淞区",
+            "code":"430203"
+          },
+          {
+            "name":"石峰区",
+            "code":"430204"
+          },
+          {
+            "name":"天元区",
+            "code":"430211"
+          },
+          {
+            "name":"株洲县",
+            "code":"430221"
+          },
+          {
+            "name":"攸县",
+            "code":"430223"
+          },
+          {
+            "name":"茶陵县",
+            "code":"430224"
+          },
+          {
+            "name":"炎陵县",
+            "code":"430225"
+          },
+          {
+            "name":"醴陵市",
+            "code":"430281"
+          }
+        ]
+      },
+      {
+        "name":"湘潭市",
+        "code":"430300",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"430301"
+          },
+          {
+            "name":"雨湖区",
+            "code":"430302"
+          },
+          {
+            "name":"岳塘区",
+            "code":"430304"
+          },
+          {
+            "name":"湘潭县",
+            "code":"430321"
+          },
+          {
+            "name":"湘乡市",
+            "code":"430381"
+          },
+          {
+            "name":"韶山市",
+            "code":"430382"
+          }
+        ]
+      },
+      {
+        "name":"衡阳市",
+        "code":"430400",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"430401"
+          },
+          {
+            "name":"珠晖区",
+            "code":"430405"
+          },
+          {
+            "name":"雁峰区",
+            "code":"430406"
+          },
+          {
+            "name":"石鼓区",
+            "code":"430407"
+          },
+          {
+            "name":"蒸湘区",
+            "code":"430408"
+          },
+          {
+            "name":"南岳区",
+            "code":"430412"
+          },
+          {
+            "name":"衡阳县",
+            "code":"430421"
+          },
+          {
+            "name":"衡南县",
+            "code":"430422"
+          },
+          {
+            "name":"衡山县",
+            "code":"430423"
+          },
+          {
+            "name":"衡东县",
+            "code":"430424"
+          },
+          {
+            "name":"祁东县",
+            "code":"430426"
+          },
+          {
+            "name":"耒阳市",
+            "code":"430481"
+          },
+          {
+            "name":"常宁市",
+            "code":"430482"
+          }
+        ]
+      },
+      {
+        "name":"邵阳市",
+        "code":"430500",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"430501"
+          },
+          {
+            "name":"双清区",
+            "code":"430502"
+          },
+          {
+            "name":"大祥区",
+            "code":"430503"
+          },
+          {
+            "name":"北塔区",
+            "code":"430511"
+          },
+          {
+            "name":"邵东县",
+            "code":"430521"
+          },
+          {
+            "name":"新邵县",
+            "code":"430522"
+          },
+          {
+            "name":"邵阳县",
+            "code":"430523"
+          },
+          {
+            "name":"隆回县",
+            "code":"430524"
+          },
+          {
+            "name":"洞口县",
+            "code":"430525"
+          },
+          {
+            "name":"绥宁县",
+            "code":"430527"
+          },
+          {
+            "name":"新宁县",
+            "code":"430528"
+          },
+          {
+            "name":"城步苗族自治县",
+            "code":"430529"
+          },
+          {
+            "name":"武冈市",
+            "code":"430581"
+          }
+        ]
+      },
+      {
+        "name":"岳阳市",
+        "code":"430600",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"430601"
+          },
+          {
+            "name":"岳阳楼区",
+            "code":"430602"
+          },
+          {
+            "name":"云溪区",
+            "code":"430603"
+          },
+          {
+            "name":"君山区",
+            "code":"430611"
+          },
+          {
+            "name":"岳阳县",
+            "code":"430621"
+          },
+          {
+            "name":"华容县",
+            "code":"430623"
+          },
+          {
+            "name":"湘阴县",
+            "code":"430624"
+          },
+          {
+            "name":"平江县",
+            "code":"430626"
+          },
+          {
+            "name":"汨罗市",
+            "code":"430681"
+          },
+          {
+            "name":"临湘市",
+            "code":"430682"
+          }
+        ]
+      },
+      {
+        "name":"常德市",
+        "code":"430700",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"430701"
+          },
+          {
+            "name":"武陵区",
+            "code":"430702"
+          },
+          {
+            "name":"鼎城区",
+            "code":"430703"
+          },
+          {
+            "name":"安乡县",
+            "code":"430721"
+          },
+          {
+            "name":"汉寿县",
+            "code":"430722"
+          },
+          {
+            "name":"澧县",
+            "code":"430723"
+          },
+          {
+            "name":"临澧县",
+            "code":"430724"
+          },
+          {
+            "name":"桃源县",
+            "code":"430725"
+          },
+          {
+            "name":"石门县",
+            "code":"430726"
+          },
+          {
+            "name":"津市市",
+            "code":"430781"
+          }
+        ]
+      },
+      {
+        "name":"张家界市",
+        "code":"430800",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"430801"
+          },
+          {
+            "name":"永定区",
+            "code":"430802"
+          },
+          {
+            "name":"武陵源区",
+            "code":"430811"
+          },
+          {
+            "name":"慈利县",
+            "code":"430821"
+          },
+          {
+            "name":"桑植县",
+            "code":"430822"
+          }
+        ]
+      },
+      {
+        "name":"益阳市",
+        "code":"430900",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"430901"
+          },
+          {
+            "name":"资阳区",
+            "code":"430902"
+          },
+          {
+            "name":"赫山区",
+            "code":"430903"
+          },
+          {
+            "name":"南县",
+            "code":"430921"
+          },
+          {
+            "name":"桃江县",
+            "code":"430922"
+          },
+          {
+            "name":"安化县",
+            "code":"430923"
+          },
+          {
+            "name":"沅江市",
+            "code":"430981"
+          }
+        ]
+      },
+      {
+        "name":"郴州市",
+        "code":"431000",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"431001"
+          },
+          {
+            "name":"北湖区",
+            "code":"431002"
+          },
+          {
+            "name":"苏仙区",
+            "code":"431003"
+          },
+          {
+            "name":"桂阳县",
+            "code":"431021"
+          },
+          {
+            "name":"宜章县",
+            "code":"431022"
+          },
+          {
+            "name":"永兴县",
+            "code":"431023"
+          },
+          {
+            "name":"嘉禾县",
+            "code":"431024"
+          },
+          {
+            "name":"临武县",
+            "code":"431025"
+          },
+          {
+            "name":"汝城县",
+            "code":"431026"
+          },
+          {
+            "name":"桂东县",
+            "code":"431027"
+          },
+          {
+            "name":"安仁县",
+            "code":"431028"
+          },
+          {
+            "name":"资兴市",
+            "code":"431081"
+          }
+        ]
+      },
+      {
+        "name":"永州市",
+        "code":"431100",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"431101"
+          },
+          {
+            "name":"零陵区",
+            "code":"431102"
+          },
+          {
+            "name":"冷水滩区",
+            "code":"431103"
+          },
+          {
+            "name":"祁阳县",
+            "code":"431121"
+          },
+          {
+            "name":"东安县",
+            "code":"431122"
+          },
+          {
+            "name":"双牌县",
+            "code":"431123"
+          },
+          {
+            "name":"道县",
+            "code":"431124"
+          },
+          {
+            "name":"江永县",
+            "code":"431125"
+          },
+          {
+            "name":"宁远县",
+            "code":"431126"
+          },
+          {
+            "name":"蓝山县",
+            "code":"431127"
+          },
+          {
+            "name":"新田县",
+            "code":"431128"
+          },
+          {
+            "name":"江华瑶族自治县",
+            "code":"431129"
+          }
+        ]
+      },
+      {
+        "name":"怀化市",
+        "code":"431200",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"431201"
+          },
+          {
+            "name":"鹤城区",
+            "code":"431202"
+          },
+          {
+            "name":"中方县",
+            "code":"431221"
+          },
+          {
+            "name":"沅陵县",
+            "code":"431222"
+          },
+          {
+            "name":"辰溪县",
+            "code":"431223"
+          },
+          {
+            "name":"溆浦县",
+            "code":"431224"
+          },
+          {
+            "name":"会同县",
+            "code":"431225"
+          },
+          {
+            "name":"麻阳苗族自治县",
+            "code":"431226"
+          },
+          {
+            "name":"新晃侗族自治县",
+            "code":"431227"
+          },
+          {
+            "name":"芷江侗族自治县",
+            "code":"431228"
+          },
+          {
+            "name":"靖州苗族侗族自治县",
+            "code":"431229"
+          },
+          {
+            "name":"通道侗族自治县",
+            "code":"431230"
+          },
+          {
+            "name":"洪江市",
+            "code":"431281"
+          }
+        ]
+      },
+      {
+        "name":"娄底市",
+        "code":"431300",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"431301"
+          },
+          {
+            "name":"娄星区",
+            "code":"431302"
+          },
+          {
+            "name":"双峰县",
+            "code":"431321"
+          },
+          {
+            "name":"新化县",
+            "code":"431322"
+          },
+          {
+            "name":"冷水江市",
+            "code":"431381"
+          },
+          {
+            "name":"涟源市",
+            "code":"431382"
+          }
+        ]
+      },
+      {
+        "name":"湘西土家族苗族自治州",
+        "code":"433100",
+        "sub":[
+          {
+            "name":"吉首市",
+            "code":"433101"
+          },
+          {
+            "name":"泸溪县",
+            "code":"433122"
+          },
+          {
+            "name":"凤凰县",
+            "code":"433123"
+          },
+          {
+            "name":"花垣县",
+            "code":"433124"
+          },
+          {
+            "name":"保靖县",
+            "code":"433125"
+          },
+          {
+            "name":"古丈县",
+            "code":"433126"
+          },
+          {
+            "name":"永顺县",
+            "code":"433127"
+          },
+          {
+            "name":"龙山县",
+            "code":"433130"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "name":"广东省",
+    "code":"440000",
+    "sub":[
+      {
+        "name":"广州市",
+        "code":"440100",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"440101"
+          },
+          {
+            "name":"荔湾区",
+            "code":"440103"
+          },
+          {
+            "name":"越秀区",
+            "code":"440104"
+          },
+          {
+            "name":"海珠区",
+            "code":"440105"
+          },
+          {
+            "name":"天河区",
+            "code":"440106"
+          },
+          {
+            "name":"白云区",
+            "code":"440111"
+          },
+          {
+            "name":"黄埔区",
+            "code":"440112"
+          },
+          {
+            "name":"番禺区",
+            "code":"440113"
+          },
+          {
+            "name":"花都区",
+            "code":"440114"
+          },
+          {
+            "name":"南沙区",
+            "code":"440115"
+          },
+          {
+            "name":"从化区",
+            "code":"440117"
+          },
+          {
+            "name":"增城区",
+            "code":"440118"
+          }
+        ]
+      },
+      {
+        "name":"韶关市",
+        "code":"440200",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"440201"
+          },
+          {
+            "name":"武江区",
+            "code":"440203"
+          },
+          {
+            "name":"浈江区",
+            "code":"440204"
+          },
+          {
+            "name":"曲江区",
+            "code":"440205"
+          },
+          {
+            "name":"始兴县",
+            "code":"440222"
+          },
+          {
+            "name":"仁化县",
+            "code":"440224"
+          },
+          {
+            "name":"翁源县",
+            "code":"440229"
+          },
+          {
+            "name":"乳源瑶族自治县",
+            "code":"440232"
+          },
+          {
+            "name":"新丰县",
+            "code":"440233"
+          },
+          {
+            "name":"乐昌市",
+            "code":"440281"
+          },
+          {
+            "name":"南雄市",
+            "code":"440282"
+          }
+        ]
+      },
+      {
+        "name":"深圳市",
+        "code":"440300",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"440301"
+          },
+          {
+            "name":"罗湖区",
+            "code":"440303"
+          },
+          {
+            "name":"福田区",
+            "code":"440304"
+          },
+          {
+            "name":"南山区",
+            "code":"440305"
+          },
+          {
+            "name":"宝安区",
+            "code":"440306"
+          },
+          {
+            "name":"龙岗区",
+            "code":"440307"
+          },
+          {
+            "name":"盐田区",
+            "code":"440308"
+          }
+        ]
+      },
+      {
+        "name":"珠海市",
+        "code":"440400",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"440401"
+          },
+          {
+            "name":"香洲区",
+            "code":"440402"
+          },
+          {
+            "name":"斗门区",
+            "code":"440403"
+          },
+          {
+            "name":"金湾区",
+            "code":"440404"
+          }
+        ]
+      },
+      {
+        "name":"汕头市",
+        "code":"440500",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"440501"
+          },
+          {
+            "name":"龙湖区",
+            "code":"440507"
+          },
+          {
+            "name":"金平区",
+            "code":"440511"
+          },
+          {
+            "name":"濠江区",
+            "code":"440512"
+          },
+          {
+            "name":"潮阳区",
+            "code":"440513"
+          },
+          {
+            "name":"潮南区",
+            "code":"440514"
+          },
+          {
+            "name":"澄海区",
+            "code":"440515"
+          },
+          {
+            "name":"南澳县",
+            "code":"440523"
+          }
+        ]
+      },
+      {
+        "name":"佛山市",
+        "code":"440600",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"440601"
+          },
+          {
+            "name":"禅城区",
+            "code":"440604"
+          },
+          {
+            "name":"南海区",
+            "code":"440605"
+          },
+          {
+            "name":"顺德区",
+            "code":"440606"
+          },
+          {
+            "name":"三水区",
+            "code":"440607"
+          },
+          {
+            "name":"高明区",
+            "code":"440608"
+          }
+        ]
+      },
+      {
+        "name":"江门市",
+        "code":"440700",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"440701"
+          },
+          {
+            "name":"蓬江区",
+            "code":"440703"
+          },
+          {
+            "name":"江海区",
+            "code":"440704"
+          },
+          {
+            "name":"新会区",
+            "code":"440705"
+          },
+          {
+            "name":"台山市",
+            "code":"440781"
+          },
+          {
+            "name":"开平市",
+            "code":"440783"
+          },
+          {
+            "name":"鹤山市",
+            "code":"440784"
+          },
+          {
+            "name":"恩平市",
+            "code":"440785"
+          }
+        ]
+      },
+      {
+        "name":"湛江市",
+        "code":"440800",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"440801"
+          },
+          {
+            "name":"赤坎区",
+            "code":"440802"
+          },
+          {
+            "name":"霞山区",
+            "code":"440803"
+          },
+          {
+            "name":"坡头区",
+            "code":"440804"
+          },
+          {
+            "name":"麻章区",
+            "code":"440811"
+          },
+          {
+            "name":"遂溪县",
+            "code":"440823"
+          },
+          {
+            "name":"徐闻县",
+            "code":"440825"
+          },
+          {
+            "name":"廉江市",
+            "code":"440881"
+          },
+          {
+            "name":"雷州市",
+            "code":"440882"
+          },
+          {
+            "name":"吴川市",
+            "code":"440883"
+          }
+        ]
+      },
+      {
+        "name":"茂名市",
+        "code":"440900",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"440901"
+          },
+          {
+            "name":"茂南区",
+            "code":"440902"
+          },
+          {
+            "name":"电白区",
+            "code":"440904"
+          },
+          {
+            "name":"高州市",
+            "code":"440981"
+          },
+          {
+            "name":"化州市",
+            "code":"440982"
+          },
+          {
+            "name":"信宜市",
+            "code":"440983"
+          }
+        ]
+      },
+      {
+        "name":"肇庆市",
+        "code":"441200",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"441201"
+          },
+          {
+            "name":"端州区",
+            "code":"441202"
+          },
+          {
+            "name":"鼎湖区",
+            "code":"441203"
+          },
+          {
+            "name":"广宁县",
+            "code":"441223"
+          },
+          {
+            "name":"怀集县",
+            "code":"441224"
+          },
+          {
+            "name":"封开县",
+            "code":"441225"
+          },
+          {
+            "name":"德庆县",
+            "code":"441226"
+          },
+          {
+            "name":"高要市",
+            "code":"441283"
+          },
+          {
+            "name":"四会市",
+            "code":"441284"
+          }
+        ]
+      },
+      {
+        "name":"惠州市",
+        "code":"441300",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"441301"
+          },
+          {
+            "name":"惠城区",
+            "code":"441302"
+          },
+          {
+            "name":"惠阳区",
+            "code":"441303"
+          },
+          {
+            "name":"博罗县",
+            "code":"441322"
+          },
+          {
+            "name":"惠东县",
+            "code":"441323"
+          },
+          {
+            "name":"龙门县",
+            "code":"441324"
+          }
+        ]
+      },
+      {
+        "name":"梅州市",
+        "code":"441400",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"441401"
+          },
+          {
+            "name":"梅江区",
+            "code":"441402"
+          },
+          {
+            "name":"梅县区",
+            "code":"441403"
+          },
+          {
+            "name":"大埔县",
+            "code":"441422"
+          },
+          {
+            "name":"丰顺县",
+            "code":"441423"
+          },
+          {
+            "name":"五华县",
+            "code":"441424"
+          },
+          {
+            "name":"平远县",
+            "code":"441426"
+          },
+          {
+            "name":"蕉岭县",
+            "code":"441427"
+          },
+          {
+            "name":"兴宁市",
+            "code":"441481"
+          }
+        ]
+      },
+      {
+        "name":"汕尾市",
+        "code":"441500",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"441501"
+          },
+          {
+            "name":"城区",
+            "code":"441502"
+          },
+          {
+            "name":"海丰县",
+            "code":"441521"
+          },
+          {
+            "name":"陆河县",
+            "code":"441523"
+          },
+          {
+            "name":"陆丰市",
+            "code":"441581"
+          }
+        ]
+      },
+      {
+        "name":"河源市",
+        "code":"441600",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"441601"
+          },
+          {
+            "name":"源城区",
+            "code":"441602"
+          },
+          {
+            "name":"紫金县",
+            "code":"441621"
+          },
+          {
+            "name":"龙川县",
+            "code":"441622"
+          },
+          {
+            "name":"连平县",
+            "code":"441623"
+          },
+          {
+            "name":"和平县",
+            "code":"441624"
+          },
+          {
+            "name":"东源县",
+            "code":"441625"
+          }
+        ]
+      },
+      {
+        "name":"阳江市",
+        "code":"441700",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"441701"
+          },
+          {
+            "name":"江城区",
+            "code":"441702"
+          },
+          {
+            "name":"阳东区",
+            "code":"441704"
+          },
+          {
+            "name":"阳西县",
+            "code":"441721"
+          },
+          {
+            "name":"阳春市",
+            "code":"441781"
+          }
+        ]
+      },
+      {
+        "name":"清远市",
+        "code":"441800",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"441801"
+          },
+          {
+            "name":"清城区",
+            "code":"441802"
+          },
+          {
+            "name":"清新区",
+            "code":"441803"
+          },
+          {
+            "name":"佛冈县",
+            "code":"441821"
+          },
+          {
+            "name":"阳山县",
+            "code":"441823"
+          },
+          {
+            "name":"连山壮族瑶族自治县",
+            "code":"441825"
+          },
+          {
+            "name":"连南瑶族自治县",
+            "code":"441826"
+          },
+          {
+            "name":"英德市",
+            "code":"441881"
+          },
+          {
+            "name":"连州市",
+            "code":"441882"
+          }
+        ]
+      },
+      {
+        "name":"东莞市",
+        "code":"441900",
+        "sub":[
+
+        ]
+      },
+      {
+        "name":"中山市",
+        "code":"442000",
+        "sub":[
+
+        ]
+      },
+      {
+        "name":"潮州市",
+        "code":"445100",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"445101"
+          },
+          {
+            "name":"湘桥区",
+            "code":"445102"
+          },
+          {
+            "name":"潮安区",
+            "code":"445103"
+          },
+          {
+            "name":"饶平县",
+            "code":"445122"
+          }
+        ]
+      },
+      {
+        "name":"揭阳市",
+        "code":"445200",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"445201"
+          },
+          {
+            "name":"榕城区",
+            "code":"445202"
+          },
+          {
+            "name":"揭东区",
+            "code":"445203"
+          },
+          {
+            "name":"揭西县",
+            "code":"445222"
+          },
+          {
+            "name":"惠来县",
+            "code":"445224"
+          },
+          {
+            "name":"普宁市",
+            "code":"445281"
+          }
+        ]
+      },
+      {
+        "name":"云浮市",
+        "code":"445300",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"445301"
+          },
+          {
+            "name":"云城区",
+            "code":"445302"
+          },
+          {
+            "name":"云安区",
+            "code":"445303"
+          },
+          {
+            "name":"新兴县",
+            "code":"445321"
+          },
+          {
+            "name":"郁南县",
+            "code":"445322"
+          },
+          {
+            "name":"罗定市",
+            "code":"445381"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "name":"广西壮族自治区",
+    "code":"450000",
+    "sub":[
+      {
+        "name":"南宁市",
+        "code":"450100",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"450101"
+          },
+          {
+            "name":"兴宁区",
+            "code":"450102"
+          },
+          {
+            "name":"青秀区",
+            "code":"450103"
+          },
+          {
+            "name":"江南区",
+            "code":"450105"
+          },
+          {
+            "name":"西乡塘区",
+            "code":"450107"
+          },
+          {
+            "name":"良庆区",
+            "code":"450108"
+          },
+          {
+            "name":"邕宁区",
+            "code":"450109"
+          },
+          {
+            "name":"武鸣县",
+            "code":"450122"
+          },
+          {
+            "name":"隆安县",
+            "code":"450123"
+          },
+          {
+            "name":"马山县",
+            "code":"450124"
+          },
+          {
+            "name":"上林县",
+            "code":"450125"
+          },
+          {
+            "name":"宾阳县",
+            "code":"450126"
+          },
+          {
+            "name":"横县",
+            "code":"450127"
+          }
+        ]
+      },
+      {
+        "name":"柳州市",
+        "code":"450200",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"450201"
+          },
+          {
+            "name":"城中区",
+            "code":"450202"
+          },
+          {
+            "name":"鱼峰区",
+            "code":"450203"
+          },
+          {
+            "name":"柳南区",
+            "code":"450204"
+          },
+          {
+            "name":"柳北区",
+            "code":"450205"
+          },
+          {
+            "name":"柳江县",
+            "code":"450221"
+          },
+          {
+            "name":"柳城县",
+            "code":"450222"
+          },
+          {
+            "name":"鹿寨县",
+            "code":"450223"
+          },
+          {
+            "name":"融安县",
+            "code":"450224"
+          },
+          {
+            "name":"融水苗族自治县",
+            "code":"450225"
+          },
+          {
+            "name":"三江侗族自治县",
+            "code":"450226"
+          }
+        ]
+      },
+      {
+        "name":"桂林市",
+        "code":"450300",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"450301"
+          },
+          {
+            "name":"秀峰区",
+            "code":"450302"
+          },
+          {
+            "name":"叠彩区",
+            "code":"450303"
+          },
+          {
+            "name":"象山区",
+            "code":"450304"
+          },
+          {
+            "name":"七星区",
+            "code":"450305"
+          },
+          {
+            "name":"雁山区",
+            "code":"450311"
+          },
+          {
+            "name":"临桂区",
+            "code":"450312"
+          },
+          {
+            "name":"阳朔县",
+            "code":"450321"
+          },
+          {
+            "name":"灵川县",
+            "code":"450323"
+          },
+          {
+            "name":"全州县",
+            "code":"450324"
+          },
+          {
+            "name":"兴安县",
+            "code":"450325"
+          },
+          {
+            "name":"永福县",
+            "code":"450326"
+          },
+          {
+            "name":"灌阳县",
+            "code":"450327"
+          },
+          {
+            "name":"龙胜各族自治县",
+            "code":"450328"
+          },
+          {
+            "name":"资源县",
+            "code":"450329"
+          },
+          {
+            "name":"平乐县",
+            "code":"450330"
+          },
+          {
+            "name":"荔浦县",
+            "code":"450331"
+          },
+          {
+            "name":"恭城瑶族自治县",
+            "code":"450332"
+          }
+        ]
+      },
+      {
+        "name":"梧州市",
+        "code":"450400",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"450401"
+          },
+          {
+            "name":"万秀区",
+            "code":"450403"
+          },
+          {
+            "name":"长洲区",
+            "code":"450405"
+          },
+          {
+            "name":"龙圩区",
+            "code":"450406"
+          },
+          {
+            "name":"苍梧县",
+            "code":"450421"
+          },
+          {
+            "name":"藤县",
+            "code":"450422"
+          },
+          {
+            "name":"蒙山县",
+            "code":"450423"
+          },
+          {
+            "name":"岑溪市",
+            "code":"450481"
+          }
+        ]
+      },
+      {
+        "name":"北海市",
+        "code":"450500",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"450501"
+          },
+          {
+            "name":"海城区",
+            "code":"450502"
+          },
+          {
+            "name":"银海区",
+            "code":"450503"
+          },
+          {
+            "name":"铁山港区",
+            "code":"450512"
+          },
+          {
+            "name":"合浦县",
+            "code":"450521"
+          }
+        ]
+      },
+      {
+        "name":"防城港市",
+        "code":"450600",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"450601"
+          },
+          {
+            "name":"港口区",
+            "code":"450602"
+          },
+          {
+            "name":"防城区",
+            "code":"450603"
+          },
+          {
+            "name":"上思县",
+            "code":"450621"
+          },
+          {
+            "name":"东兴市",
+            "code":"450681"
+          }
+        ]
+      },
+      {
+        "name":"钦州市",
+        "code":"450700",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"450701"
+          },
+          {
+            "name":"钦南区",
+            "code":"450702"
+          },
+          {
+            "name":"钦北区",
+            "code":"450703"
+          },
+          {
+            "name":"灵山县",
+            "code":"450721"
+          },
+          {
+            "name":"浦北县",
+            "code":"450722"
+          }
+        ]
+      },
+      {
+        "name":"贵港市",
+        "code":"450800",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"450801"
+          },
+          {
+            "name":"港北区",
+            "code":"450802"
+          },
+          {
+            "name":"港南区",
+            "code":"450803"
+          },
+          {
+            "name":"覃塘区",
+            "code":"450804"
+          },
+          {
+            "name":"平南县",
+            "code":"450821"
+          },
+          {
+            "name":"桂平市",
+            "code":"450881"
+          }
+        ]
+      },
+      {
+        "name":"玉林市",
+        "code":"450900",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"450901"
+          },
+          {
+            "name":"玉州区",
+            "code":"450902"
+          },
+          {
+            "name":"福绵区",
+            "code":"450903"
+          },
+          {
+            "name":"容县",
+            "code":"450921"
+          },
+          {
+            "name":"陆川县",
+            "code":"450922"
+          },
+          {
+            "name":"博白县",
+            "code":"450923"
+          },
+          {
+            "name":"兴业县",
+            "code":"450924"
+          },
+          {
+            "name":"北流市",
+            "code":"450981"
+          }
+        ]
+      },
+      {
+        "name":"百色市",
+        "code":"451000",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"451001"
+          },
+          {
+            "name":"右江区",
+            "code":"451002"
+          },
+          {
+            "name":"田阳县",
+            "code":"451021"
+          },
+          {
+            "name":"田东县",
+            "code":"451022"
+          },
+          {
+            "name":"平果县",
+            "code":"451023"
+          },
+          {
+            "name":"德保县",
+            "code":"451024"
+          },
+          {
+            "name":"靖西县",
+            "code":"451025"
+          },
+          {
+            "name":"那坡县",
+            "code":"451026"
+          },
+          {
+            "name":"凌云县",
+            "code":"451027"
+          },
+          {
+            "name":"乐业县",
+            "code":"451028"
+          },
+          {
+            "name":"田林县",
+            "code":"451029"
+          },
+          {
+            "name":"西林县",
+            "code":"451030"
+          },
+          {
+            "name":"隆林各族自治县",
+            "code":"451031"
+          }
+        ]
+      },
+      {
+        "name":"贺州市",
+        "code":"451100",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"451101"
+          },
+          {
+            "name":"八步区",
+            "code":"451102"
+          },
+          {
+            "name":"平桂管理区",
+            "code":"451119"
+          },
+          {
+            "name":"昭平县",
+            "code":"451121"
+          },
+          {
+            "name":"钟山县",
+            "code":"451122"
+          },
+          {
+            "name":"富川瑶族自治县",
+            "code":"451123"
+          }
+        ]
+      },
+      {
+        "name":"河池市",
+        "code":"451200",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"451201"
+          },
+          {
+            "name":"金城江区",
+            "code":"451202"
+          },
+          {
+            "name":"南丹县",
+            "code":"451221"
+          },
+          {
+            "name":"天峨县",
+            "code":"451222"
+          },
+          {
+            "name":"凤山县",
+            "code":"451223"
+          },
+          {
+            "name":"东兰县",
+            "code":"451224"
+          },
+          {
+            "name":"罗城仫佬族自治县",
+            "code":"451225"
+          },
+          {
+            "name":"环江毛南族自治县",
+            "code":"451226"
+          },
+          {
+            "name":"巴马瑶族自治县",
+            "code":"451227"
+          },
+          {
+            "name":"都安瑶族自治县",
+            "code":"451228"
+          },
+          {
+            "name":"大化瑶族自治县",
+            "code":"451229"
+          },
+          {
+            "name":"宜州市",
+            "code":"451281"
+          }
+        ]
+      },
+      {
+        "name":"来宾市",
+        "code":"451300",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"451301"
+          },
+          {
+            "name":"兴宾区",
+            "code":"451302"
+          },
+          {
+            "name":"忻城县",
+            "code":"451321"
+          },
+          {
+            "name":"象州县",
+            "code":"451322"
+          },
+          {
+            "name":"武宣县",
+            "code":"451323"
+          },
+          {
+            "name":"金秀瑶族自治县",
+            "code":"451324"
+          },
+          {
+            "name":"合山市",
+            "code":"451381"
+          }
+        ]
+      },
+      {
+        "name":"崇左市",
+        "code":"451400",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"451401"
+          },
+          {
+            "name":"江州区",
+            "code":"451402"
+          },
+          {
+            "name":"扶绥县",
+            "code":"451421"
+          },
+          {
+            "name":"宁明县",
+            "code":"451422"
+          },
+          {
+            "name":"龙州县",
+            "code":"451423"
+          },
+          {
+            "name":"大新县",
+            "code":"451424"
+          },
+          {
+            "name":"天等县",
+            "code":"451425"
+          },
+          {
+            "name":"凭祥市",
+            "code":"451481"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "name":"海南省",
+    "code":"460000",
+    "sub":[
+      {
+        "name":"海口市",
+        "code":"460100",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"460101"
+          },
+          {
+            "name":"秀英区",
+            "code":"460105"
+          },
+          {
+            "name":"龙华区",
+            "code":"460106"
+          },
+          {
+            "name":"琼山区",
+            "code":"460107"
+          },
+          {
+            "name":"美兰区",
+            "code":"460108"
+          }
+        ]
+      },
+      {
+        "name":"三亚市",
+        "code":"460200",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"460201"
+          },
+          {
+            "name":"海棠区",
+            "code":"460202"
+          },
+          {
+            "name":"吉阳区",
+            "code":"460203"
+          },
+          {
+            "name":"天涯区",
+            "code":"460204"
+          },
+          {
+            "name":"崖州区",
+            "code":"460205"
+          }
+        ]
+      },
+      {
+        "name":"三沙市",
+        "code":"460300",
+        "sub":[
+          {
+            "name":"西沙群岛",
+            "code":"460321"
+          },
+          {
+            "name":"南沙群岛",
+            "code":"460322"
+          },
+          {
+            "name":"中沙群岛的岛礁及其海域",
+            "code":"460323"
+          }
+        ]
+      },
+      {
+        "name":"五指山市",
+        "code":"469001"
+      },
+      {
+        "name":"琼海市",
+        "code":"469002"
+      },
+      {
+        "name":"儋州市",
+        "code":"469003"
+      },
+      {
+        "name":"文昌市",
+        "code":"469005"
+      },
+      {
+        "name":"万宁市",
+        "code":"469006"
+      },
+      {
+        "name":"东方市",
+        "code":"469007"
+      },
+      {
+        "name":"定安县",
+        "code":"469021"
+      },
+      {
+        "name":"屯昌县",
+        "code":"469022"
+      },
+      {
+        "name":"澄迈县",
+        "code":"469023"
+      },
+      {
+        "name":"临高县",
+        "code":"469024"
+      },
+      {
+        "name":"白沙黎族自治县",
+        "code":"469025"
+      },
+      {
+        "name":"昌江黎族自治县",
+        "code":"469026"
+      },
+      {
+        "name":"乐东黎族自治县",
+        "code":"469027"
+      },
+      {
+        "name":"陵水黎族自治县",
+        "code":"469028"
+      },
+      {
+        "name":"保亭黎族苗族自治县",
+        "code":"469029"
+      },
+      {
+        "name":"琼中黎族苗族自治县",
+        "code":"469030"
+      }
+    ]
+  },
+  {
+    "name":"重庆",
+    "code":"500000",
+    "sub": [
+      {
+        "name": "重庆市",
+        "code": "500000",
+        "sub":[
+            {
+              "name":"万州区",
+              "code":"500101"
+            },
+            {
+              "name":"涪陵区",
+              "code":"500102"
+            },
+            {
+              "name":"渝中区",
+              "code":"500103"
+            },
+            {
+              "name":"大渡口区",
+              "code":"500104"
+            },
+            {
+              "name":"江北区",
+              "code":"500105"
+            },
+            {
+              "name":"沙坪坝区",
+              "code":"500106"
+            },
+            {
+              "name":"九龙坡区",
+              "code":"500107"
+            },
+            {
+              "name":"南岸区",
+              "code":"500108"
+            },
+            {
+              "name":"北碚区",
+              "code":"500109"
+            },
+            {
+              "name":"綦江区",
+              "code":"500110"
+            },
+            {
+              "name":"大足区",
+              "code":"500111"
+            },
+            {
+              "name":"渝北区",
+              "code":"500112"
+            },
+            {
+              "name":"巴南区",
+              "code":"500113"
+            },
+            {
+              "name":"黔江区",
+              "code":"500114"
+            },
+            {
+              "name":"长寿区",
+              "code":"500115"
+            },
+            {
+              "name":"江津区",
+              "code":"500116"
+            },
+            {
+              "name":"合川区",
+              "code":"500117"
+            },
+            {
+              "name":"永川区",
+              "code":"500118"
+            },
+            {
+              "name":"南川区",
+              "code":"500119"
+            },
+            {
+              "name":"璧山区",
+              "code":"500120"
+            },
+            {
+              "name":"铜梁区",
+              "code":"500151"
+            },
+            {
+              "name":"潼南县",
+              "code":"500223"
+            },
+            {
+              "name":"荣昌县",
+              "code":"500226"
+            },
+            {
+              "name":"梁平县",
+              "code":"500228"
+            },
+            {
+              "name":"城口县",
+              "code":"500229"
+            },
+            {
+              "name":"丰都县",
+              "code":"500230"
+            },
+            {
+              "name":"垫江县",
+              "code":"500231"
+            },
+            {
+              "name":"武隆县",
+              "code":"500232"
+            },
+            {
+              "name":"忠县",
+              "code":"500233"
+            },
+            {
+              "name":"开县",
+              "code":"500234"
+            },
+            {
+              "name":"云阳县",
+              "code":"500235"
+            },
+            {
+              "name":"奉节县",
+              "code":"500236"
+            },
+            {
+              "name":"巫山县",
+              "code":"500237"
+            },
+            {
+              "name":"巫溪县",
+              "code":"500238"
+            },
+            {
+              "name":"石柱土家族自治县",
+              "code":"500240"
+            },
+            {
+              "name":"秀山土家族苗族自治县",
+              "code":"500241"
+            },
+            {
+              "name":"酉阳土家族苗族自治县",
+              "code":"500242"
+            },
+            {
+              "name":"彭水苗族土家族自治县",
+              "code":"500243"
+            }
+        ]
+      }
+    ]
+  },
+  {
+    "name":"四川省",
+    "code":"510000",
+    "sub":[
+      {
+        "name":"成都市",
+        "code":"510100",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"510101"
+          },
+          {
+            "name":"锦江区",
+            "code":"510104"
+          },
+          {
+            "name":"青羊区",
+            "code":"510105"
+          },
+          {
+            "name":"金牛区",
+            "code":"510106"
+          },
+          {
+            "name":"武侯区",
+            "code":"510107"
+          },
+          {
+            "name":"成华区",
+            "code":"510108"
+          },
+          {
+            "name":"龙泉驿区",
+            "code":"510112"
+          },
+          {
+            "name":"青白江区",
+            "code":"510113"
+          },
+          {
+            "name":"新都区",
+            "code":"510114"
+          },
+          {
+            "name":"温江区",
+            "code":"510115"
+          },
+          {
+            "name":"金堂县",
+            "code":"510121"
+          },
+          {
+            "name":"双流县",
+            "code":"510122"
+          },
+          {
+            "name":"郫县",
+            "code":"510124"
+          },
+          {
+            "name":"大邑县",
+            "code":"510129"
+          },
+          {
+            "name":"蒲江县",
+            "code":"510131"
+          },
+          {
+            "name":"新津县",
+            "code":"510132"
+          },
+          {
+            "name":"都江堰市",
+            "code":"510181"
+          },
+          {
+            "name":"彭州市",
+            "code":"510182"
+          },
+          {
+            "name":"邛崃市",
+            "code":"510183"
+          },
+          {
+            "name":"崇州市",
+            "code":"510184"
+          }
+        ]
+      },
+      {
+        "name":"自贡市",
+        "code":"510300",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"510301"
+          },
+          {
+            "name":"自流井区",
+            "code":"510302"
+          },
+          {
+            "name":"贡井区",
+            "code":"510303"
+          },
+          {
+            "name":"大安区",
+            "code":"510304"
+          },
+          {
+            "name":"沿滩区",
+            "code":"510311"
+          },
+          {
+            "name":"荣县",
+            "code":"510321"
+          },
+          {
+            "name":"富顺县",
+            "code":"510322"
+          }
+        ]
+      },
+      {
+        "name":"攀枝花市",
+        "code":"510400",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"510401"
+          },
+          {
+            "name":"东区",
+            "code":"510402"
+          },
+          {
+            "name":"西区",
+            "code":"510403"
+          },
+          {
+            "name":"仁和区",
+            "code":"510411"
+          },
+          {
+            "name":"米易县",
+            "code":"510421"
+          },
+          {
+            "name":"盐边县",
+            "code":"510422"
+          }
+        ]
+      },
+      {
+        "name":"泸州市",
+        "code":"510500",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"510501"
+          },
+          {
+            "name":"江阳区",
+            "code":"510502"
+          },
+          {
+            "name":"纳溪区",
+            "code":"510503"
+          },
+          {
+            "name":"龙马潭区",
+            "code":"510504"
+          },
+          {
+            "name":"泸县",
+            "code":"510521"
+          },
+          {
+            "name":"合江县",
+            "code":"510522"
+          },
+          {
+            "name":"叙永县",
+            "code":"510524"
+          },
+          {
+            "name":"古蔺县",
+            "code":"510525"
+          }
+        ]
+      },
+      {
+        "name":"德阳市",
+        "code":"510600",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"510601"
+          },
+          {
+            "name":"旌阳区",
+            "code":"510603"
+          },
+          {
+            "name":"中江县",
+            "code":"510623"
+          },
+          {
+            "name":"罗江县",
+            "code":"510626"
+          },
+          {
+            "name":"广汉市",
+            "code":"510681"
+          },
+          {
+            "name":"什邡市",
+            "code":"510682"
+          },
+          {
+            "name":"绵竹市",
+            "code":"510683"
+          }
+        ]
+      },
+      {
+        "name":"绵阳市",
+        "code":"510700",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"510701"
+          },
+          {
+            "name":"涪城区",
+            "code":"510703"
+          },
+          {
+            "name":"游仙区",
+            "code":"510704"
+          },
+          {
+            "name":"三台县",
+            "code":"510722"
+          },
+          {
+            "name":"盐亭县",
+            "code":"510723"
+          },
+          {
+            "name":"安县",
+            "code":"510724"
+          },
+          {
+            "name":"梓潼县",
+            "code":"510725"
+          },
+          {
+            "name":"北川羌族自治县",
+            "code":"510726"
+          },
+          {
+            "name":"平武县",
+            "code":"510727"
+          },
+          {
+            "name":"江油市",
+            "code":"510781"
+          }
+        ]
+      },
+      {
+        "name":"广元市",
+        "code":"510800",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"510801"
+          },
+          {
+            "name":"利州区",
+            "code":"510802"
+          },
+          {
+            "name":"昭化区",
+            "code":"510811"
+          },
+          {
+            "name":"朝天区",
+            "code":"510812"
+          },
+          {
+            "name":"旺苍县",
+            "code":"510821"
+          },
+          {
+            "name":"青川县",
+            "code":"510822"
+          },
+          {
+            "name":"剑阁县",
+            "code":"510823"
+          },
+          {
+            "name":"苍溪县",
+            "code":"510824"
+          }
+        ]
+      },
+      {
+        "name":"遂宁市",
+        "code":"510900",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"510901"
+          },
+          {
+            "name":"船山区",
+            "code":"510903"
+          },
+          {
+            "name":"安居区",
+            "code":"510904"
+          },
+          {
+            "name":"蓬溪县",
+            "code":"510921"
+          },
+          {
+            "name":"射洪县",
+            "code":"510922"
+          },
+          {
+            "name":"大英县",
+            "code":"510923"
+          }
+        ]
+      },
+      {
+        "name":"内江市",
+        "code":"511000",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"511001"
+          },
+          {
+            "name":"市中区",
+            "code":"511002"
+          },
+          {
+            "name":"东兴区",
+            "code":"511011"
+          },
+          {
+            "name":"威远县",
+            "code":"511024"
+          },
+          {
+            "name":"资中县",
+            "code":"511025"
+          },
+          {
+            "name":"隆昌县",
+            "code":"511028"
+          }
+        ]
+      },
+      {
+        "name":"乐山市",
+        "code":"511100",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"511101"
+          },
+          {
+            "name":"市中区",
+            "code":"511102"
+          },
+          {
+            "name":"沙湾区",
+            "code":"511111"
+          },
+          {
+            "name":"五通桥区",
+            "code":"511112"
+          },
+          {
+            "name":"金口河区",
+            "code":"511113"
+          },
+          {
+            "name":"犍为县",
+            "code":"511123"
+          },
+          {
+            "name":"井研县",
+            "code":"511124"
+          },
+          {
+            "name":"夹江县",
+            "code":"511126"
+          },
+          {
+            "name":"沐川县",
+            "code":"511129"
+          },
+          {
+            "name":"峨边彝族自治县",
+            "code":"511132"
+          },
+          {
+            "name":"马边彝族自治县",
+            "code":"511133"
+          },
+          {
+            "name":"峨眉山市",
+            "code":"511181"
+          }
+        ]
+      },
+      {
+        "name":"南充市",
+        "code":"511300",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"511301"
+          },
+          {
+            "name":"顺庆区",
+            "code":"511302"
+          },
+          {
+            "name":"高坪区",
+            "code":"511303"
+          },
+          {
+            "name":"嘉陵区",
+            "code":"511304"
+          },
+          {
+            "name":"南部县",
+            "code":"511321"
+          },
+          {
+            "name":"营山县",
+            "code":"511322"
+          },
+          {
+            "name":"蓬安县",
+            "code":"511323"
+          },
+          {
+            "name":"仪陇县",
+            "code":"511324"
+          },
+          {
+            "name":"西充县",
+            "code":"511325"
+          },
+          {
+            "name":"阆中市",
+            "code":"511381"
+          }
+        ]
+      },
+      {
+        "name":"眉山市",
+        "code":"511400",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"511401"
+          },
+          {
+            "name":"东坡区",
+            "code":"511402"
+          },
+          {
+            "name":"彭山区",
+            "code":"511403"
+          },
+          {
+            "name":"仁寿县",
+            "code":"511421"
+          },
+          {
+            "name":"洪雅县",
+            "code":"511423"
+          },
+          {
+            "name":"丹棱县",
+            "code":"511424"
+          },
+          {
+            "name":"青神县",
+            "code":"511425"
+          }
+        ]
+      },
+      {
+        "name":"宜宾市",
+        "code":"511500",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"511501"
+          },
+          {
+            "name":"翠屏区",
+            "code":"511502"
+          },
+          {
+            "name":"南溪区",
+            "code":"511503"
+          },
+          {
+            "name":"宜宾县",
+            "code":"511521"
+          },
+          {
+            "name":"江安县",
+            "code":"511523"
+          },
+          {
+            "name":"长宁县",
+            "code":"511524"
+          },
+          {
+            "name":"高县",
+            "code":"511525"
+          },
+          {
+            "name":"珙县",
+            "code":"511526"
+          },
+          {
+            "name":"筠连县",
+            "code":"511527"
+          },
+          {
+            "name":"兴文县",
+            "code":"511528"
+          },
+          {
+            "name":"屏山县",
+            "code":"511529"
+          }
+        ]
+      },
+      {
+        "name":"广安市",
+        "code":"511600",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"511601"
+          },
+          {
+            "name":"广安区",
+            "code":"511602"
+          },
+          {
+            "name":"前锋区",
+            "code":"511603"
+          },
+          {
+            "name":"岳池县",
+            "code":"511621"
+          },
+          {
+            "name":"武胜县",
+            "code":"511622"
+          },
+          {
+            "name":"邻水县",
+            "code":"511623"
+          },
+          {
+            "name":"华蓥市",
+            "code":"511681"
+          }
+        ]
+      },
+      {
+        "name":"达州市",
+        "code":"511700",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"511701"
+          },
+          {
+            "name":"通川区",
+            "code":"511702"
+          },
+          {
+            "name":"达川区",
+            "code":"511703"
+          },
+          {
+            "name":"宣汉县",
+            "code":"511722"
+          },
+          {
+            "name":"开江县",
+            "code":"511723"
+          },
+          {
+            "name":"大竹县",
+            "code":"511724"
+          },
+          {
+            "name":"渠县",
+            "code":"511725"
+          },
+          {
+            "name":"万源市",
+            "code":"511781"
+          }
+        ]
+      },
+      {
+        "name":"雅安市",
+        "code":"511800",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"511801"
+          },
+          {
+            "name":"雨城区",
+            "code":"511802"
+          },
+          {
+            "name":"名山区",
+            "code":"511803"
+          },
+          {
+            "name":"荥经县",
+            "code":"511822"
+          },
+          {
+            "name":"汉源县",
+            "code":"511823"
+          },
+          {
+            "name":"石棉县",
+            "code":"511824"
+          },
+          {
+            "name":"天全县",
+            "code":"511825"
+          },
+          {
+            "name":"芦山县",
+            "code":"511826"
+          },
+          {
+            "name":"宝兴县",
+            "code":"511827"
+          }
+        ]
+      },
+      {
+        "name":"巴中市",
+        "code":"511900",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"511901"
+          },
+          {
+            "name":"巴州区",
+            "code":"511902"
+          },
+          {
+            "name":"恩阳区",
+            "code":"511903"
+          },
+          {
+            "name":"通江县",
+            "code":"511921"
+          },
+          {
+            "name":"南江县",
+            "code":"511922"
+          },
+          {
+            "name":"平昌县",
+            "code":"511923"
+          }
+        ]
+      },
+      {
+        "name":"资阳市",
+        "code":"512000",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"512001"
+          },
+          {
+            "name":"雁江区",
+            "code":"512002"
+          },
+          {
+            "name":"安岳县",
+            "code":"512021"
+          },
+          {
+            "name":"乐至县",
+            "code":"512022"
+          },
+          {
+            "name":"简阳市",
+            "code":"512081"
+          }
+        ]
+      },
+      {
+        "name":"阿坝藏族羌族自治州",
+        "code":"513200",
+        "sub":[
+          {
+            "name":"汶川县",
+            "code":"513221"
+          },
+          {
+            "name":"理县",
+            "code":"513222"
+          },
+          {
+            "name":"茂县",
+            "code":"513223"
+          },
+          {
+            "name":"松潘县",
+            "code":"513224"
+          },
+          {
+            "name":"九寨沟县",
+            "code":"513225"
+          },
+          {
+            "name":"金川县",
+            "code":"513226"
+          },
+          {
+            "name":"小金县",
+            "code":"513227"
+          },
+          {
+            "name":"黑水县",
+            "code":"513228"
+          },
+          {
+            "name":"马尔康县",
+            "code":"513229"
+          },
+          {
+            "name":"壤塘县",
+            "code":"513230"
+          },
+          {
+            "name":"阿坝县",
+            "code":"513231"
+          },
+          {
+            "name":"若尔盖县",
+            "code":"513232"
+          },
+          {
+            "name":"红原县",
+            "code":"513233"
+          }
+        ]
+      },
+      {
+        "name":"甘孜藏族自治州",
+        "code":"513300",
+        "sub":[
+          {
+            "name":"康定县",
+            "code":"513321"
+          },
+          {
+            "name":"泸定县",
+            "code":"513322"
+          },
+          {
+            "name":"丹巴县",
+            "code":"513323"
+          },
+          {
+            "name":"九龙县",
+            "code":"513324"
+          },
+          {
+            "name":"雅江县",
+            "code":"513325"
+          },
+          {
+            "name":"道孚县",
+            "code":"513326"
+          },
+          {
+            "name":"炉霍县",
+            "code":"513327"
+          },
+          {
+            "name":"甘孜县",
+            "code":"513328"
+          },
+          {
+            "name":"新龙县",
+            "code":"513329"
+          },
+          {
+            "name":"德格县",
+            "code":"513330"
+          },
+          {
+            "name":"白玉县",
+            "code":"513331"
+          },
+          {
+            "name":"石渠县",
+            "code":"513332"
+          },
+          {
+            "name":"色达县",
+            "code":"513333"
+          },
+          {
+            "name":"理塘县",
+            "code":"513334"
+          },
+          {
+            "name":"巴塘县",
+            "code":"513335"
+          },
+          {
+            "name":"乡城县",
+            "code":"513336"
+          },
+          {
+            "name":"稻城县",
+            "code":"513337"
+          },
+          {
+            "name":"得荣县",
+            "code":"513338"
+          }
+        ]
+      },
+      {
+        "name":"凉山彝族自治州",
+        "code":"513400",
+        "sub":[
+          {
+            "name":"西昌市",
+            "code":"513401"
+          },
+          {
+            "name":"木里藏族自治县",
+            "code":"513422"
+          },
+          {
+            "name":"盐源县",
+            "code":"513423"
+          },
+          {
+            "name":"德昌县",
+            "code":"513424"
+          },
+          {
+            "name":"会理县",
+            "code":"513425"
+          },
+          {
+            "name":"会东县",
+            "code":"513426"
+          },
+          {
+            "name":"宁南县",
+            "code":"513427"
+          },
+          {
+            "name":"普格县",
+            "code":"513428"
+          },
+          {
+            "name":"布拖县",
+            "code":"513429"
+          },
+          {
+            "name":"金阳县",
+            "code":"513430"
+          },
+          {
+            "name":"昭觉县",
+            "code":"513431"
+          },
+          {
+            "name":"喜德县",
+            "code":"513432"
+          },
+          {
+            "name":"冕宁县",
+            "code":"513433"
+          },
+          {
+            "name":"越西县",
+            "code":"513434"
+          },
+          {
+            "name":"甘洛县",
+            "code":"513435"
+          },
+          {
+            "name":"美姑县",
+            "code":"513436"
+          },
+          {
+            "name":"雷波县",
+            "code":"513437"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "name":"贵州省",
+    "code":"520000",
+    "sub":[
+      {
+        "name":"贵阳市",
+        "code":"520100",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"520101"
+          },
+          {
+            "name":"南明区",
+            "code":"520102"
+          },
+          {
+            "name":"云岩区",
+            "code":"520103"
+          },
+          {
+            "name":"花溪区",
+            "code":"520111"
+          },
+          {
+            "name":"乌当区",
+            "code":"520112"
+          },
+          {
+            "name":"白云区",
+            "code":"520113"
+          },
+          {
+            "name":"观山湖区",
+            "code":"520115"
+          },
+          {
+            "name":"开阳县",
+            "code":"520121"
+          },
+          {
+            "name":"息烽县",
+            "code":"520122"
+          },
+          {
+            "name":"修文县",
+            "code":"520123"
+          },
+          {
+            "name":"清镇市",
+            "code":"520181"
+          }
+        ]
+      },
+      {
+        "name":"六盘水市",
+        "code":"520200",
+        "sub":[
+          {
+            "name":"钟山区",
+            "code":"520201"
+          },
+          {
+            "name":"六枝特区",
+            "code":"520203"
+          },
+          {
+            "name":"水城县",
+            "code":"520221"
+          },
+          {
+            "name":"盘县",
+            "code":"520222"
+          }
+        ]
+      },
+      {
+        "name":"遵义市",
+        "code":"520300",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"520301"
+          },
+          {
+            "name":"红花岗区",
+            "code":"520302"
+          },
+          {
+            "name":"汇川区",
+            "code":"520303"
+          },
+          {
+            "name":"遵义县",
+            "code":"520321"
+          },
+          {
+            "name":"桐梓县",
+            "code":"520322"
+          },
+          {
+            "name":"绥阳县",
+            "code":"520323"
+          },
+          {
+            "name":"正安县",
+            "code":"520324"
+          },
+          {
+            "name":"道真仡佬族苗族自治县",
+            "code":"520325"
+          },
+          {
+            "name":"务川仡佬族苗族自治县",
+            "code":"520326"
+          },
+          {
+            "name":"凤冈县",
+            "code":"520327"
+          },
+          {
+            "name":"湄潭县",
+            "code":"520328"
+          },
+          {
+            "name":"余庆县",
+            "code":"520329"
+          },
+          {
+            "name":"习水县",
+            "code":"520330"
+          },
+          {
+            "name":"赤水市",
+            "code":"520381"
+          },
+          {
+            "name":"仁怀市",
+            "code":"520382"
+          }
+        ]
+      },
+      {
+        "name":"安顺市",
+        "code":"520400",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"520401"
+          },
+          {
+            "name":"西秀区",
+            "code":"520402"
+          },
+          {
+            "name":"平坝区",
+            "code":"520403"
+          },
+          {
+            "name":"普定县",
+            "code":"520422"
+          },
+          {
+            "name":"镇宁布依族苗族自治县",
+            "code":"520423"
+          },
+          {
+            "name":"关岭布依族苗族自治县",
+            "code":"520424"
+          },
+          {
+            "name":"紫云苗族布依族自治县",
+            "code":"520425"
+          }
+        ]
+      },
+      {
+        "name":"毕节市",
+        "code":"520500",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"520501"
+          },
+          {
+            "name":"七星关区",
+            "code":"520502"
+          },
+          {
+            "name":"大方县",
+            "code":"520521"
+          },
+          {
+            "name":"黔西县",
+            "code":"520522"
+          },
+          {
+            "name":"金沙县",
+            "code":"520523"
+          },
+          {
+            "name":"织金县",
+            "code":"520524"
+          },
+          {
+            "name":"纳雍县",
+            "code":"520525"
+          },
+          {
+            "name":"威宁彝族回族苗族自治县",
+            "code":"520526"
+          },
+          {
+            "name":"赫章县",
+            "code":"520527"
+          }
+        ]
+      },
+      {
+        "name":"铜仁市",
+        "code":"520600",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"520601"
+          },
+          {
+            "name":"碧江区",
+            "code":"520602"
+          },
+          {
+            "name":"万山区",
+            "code":"520603"
+          },
+          {
+            "name":"江口县",
+            "code":"520621"
+          },
+          {
+            "name":"玉屏侗族自治县",
+            "code":"520622"
+          },
+          {
+            "name":"石阡县",
+            "code":"520623"
+          },
+          {
+            "name":"思南县",
+            "code":"520624"
+          },
+          {
+            "name":"印江土家族苗族自治县",
+            "code":"520625"
+          },
+          {
+            "name":"德江县",
+            "code":"520626"
+          },
+          {
+            "name":"沿河土家族自治县",
+            "code":"520627"
+          },
+          {
+            "name":"松桃苗族自治县",
+            "code":"520628"
+          }
+        ]
+      },
+      {
+        "name":"黔西南布依族苗族自治州",
+        "code":"522300",
+        "sub":[
+          {
+            "name":"兴义市",
+            "code":"522301"
+          },
+          {
+            "name":"兴仁县",
+            "code":"522322"
+          },
+          {
+            "name":"普安县",
+            "code":"522323"
+          },
+          {
+            "name":"晴隆县",
+            "code":"522324"
+          },
+          {
+            "name":"贞丰县",
+            "code":"522325"
+          },
+          {
+            "name":"望谟县",
+            "code":"522326"
+          },
+          {
+            "name":"册亨县",
+            "code":"522327"
+          },
+          {
+            "name":"安龙县",
+            "code":"522328"
+          }
+        ]
+      },
+      {
+        "name":"黔东南苗族侗族自治州",
+        "code":"522600",
+        "sub":[
+          {
+            "name":"凯里市",
+            "code":"522601"
+          },
+          {
+            "name":"黄平县",
+            "code":"522622"
+          },
+          {
+            "name":"施秉县",
+            "code":"522623"
+          },
+          {
+            "name":"三穗县",
+            "code":"522624"
+          },
+          {
+            "name":"镇远县",
+            "code":"522625"
+          },
+          {
+            "name":"岑巩县",
+            "code":"522626"
+          },
+          {
+            "name":"天柱县",
+            "code":"522627"
+          },
+          {
+            "name":"锦屏县",
+            "code":"522628"
+          },
+          {
+            "name":"剑河县",
+            "code":"522629"
+          },
+          {
+            "name":"台江县",
+            "code":"522630"
+          },
+          {
+            "name":"黎平县",
+            "code":"522631"
+          },
+          {
+            "name":"榕江县",
+            "code":"522632"
+          },
+          {
+            "name":"从江县",
+            "code":"522633"
+          },
+          {
+            "name":"雷山县",
+            "code":"522634"
+          },
+          {
+            "name":"麻江县",
+            "code":"522635"
+          },
+          {
+            "name":"丹寨县",
+            "code":"522636"
+          }
+        ]
+      },
+      {
+        "name":"黔南布依族苗族自治州",
+        "code":"522700",
+        "sub":[
+          {
+            "name":"都匀市",
+            "code":"522701"
+          },
+          {
+            "name":"福泉市",
+            "code":"522702"
+          },
+          {
+            "name":"荔波县",
+            "code":"522722"
+          },
+          {
+            "name":"贵定县",
+            "code":"522723"
+          },
+          {
+            "name":"瓮安县",
+            "code":"522725"
+          },
+          {
+            "name":"独山县",
+            "code":"522726"
+          },
+          {
+            "name":"平塘县",
+            "code":"522727"
+          },
+          {
+            "name":"罗甸县",
+            "code":"522728"
+          },
+          {
+            "name":"长顺县",
+            "code":"522729"
+          },
+          {
+            "name":"龙里县",
+            "code":"522730"
+          },
+          {
+            "name":"惠水县",
+            "code":"522731"
+          },
+          {
+            "name":"三都水族自治县",
+            "code":"522732"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "name":"云南省",
+    "code":"530000",
+    "sub":[
+      {
+        "name":"昆明市",
+        "code":"530100",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"530101"
+          },
+          {
+            "name":"五华区",
+            "code":"530102"
+          },
+          {
+            "name":"盘龙区",
+            "code":"530103"
+          },
+          {
+            "name":"官渡区",
+            "code":"530111"
+          },
+          {
+            "name":"西山区",
+            "code":"530112"
+          },
+          {
+            "name":"东川区",
+            "code":"530113"
+          },
+          {
+            "name":"呈贡区",
+            "code":"530114"
+          },
+          {
+            "name":"晋宁县",
+            "code":"530122"
+          },
+          {
+            "name":"富民县",
+            "code":"530124"
+          },
+          {
+            "name":"宜良县",
+            "code":"530125"
+          },
+          {
+            "name":"石林彝族自治县",
+            "code":"530126"
+          },
+          {
+            "name":"嵩明县",
+            "code":"530127"
+          },
+          {
+            "name":"禄劝彝族苗族自治县",
+            "code":"530128"
+          },
+          {
+            "name":"寻甸回族彝族自治县",
+            "code":"530129"
+          },
+          {
+            "name":"安宁市",
+            "code":"530181"
+          }
+        ]
+      },
+      {
+        "name":"曲靖市",
+        "code":"530300",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"530301"
+          },
+          {
+            "name":"麒麟区",
+            "code":"530302"
+          },
+          {
+            "name":"马龙县",
+            "code":"530321"
+          },
+          {
+            "name":"陆良县",
+            "code":"530322"
+          },
+          {
+            "name":"师宗县",
+            "code":"530323"
+          },
+          {
+            "name":"罗平县",
+            "code":"530324"
+          },
+          {
+            "name":"富源县",
+            "code":"530325"
+          },
+          {
+            "name":"会泽县",
+            "code":"530326"
+          },
+          {
+            "name":"沾益县",
+            "code":"530328"
+          },
+          {
+            "name":"宣威市",
+            "code":"530381"
+          }
+        ]
+      },
+      {
+        "name":"玉溪市",
+        "code":"530400",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"530401"
+          },
+          {
+            "name":"红塔区",
+            "code":"530402"
+          },
+          {
+            "name":"江川县",
+            "code":"530421"
+          },
+          {
+            "name":"澄江县",
+            "code":"530422"
+          },
+          {
+            "name":"通海县",
+            "code":"530423"
+          },
+          {
+            "name":"华宁县",
+            "code":"530424"
+          },
+          {
+            "name":"易门县",
+            "code":"530425"
+          },
+          {
+            "name":"峨山彝族自治县",
+            "code":"530426"
+          },
+          {
+            "name":"新平彝族傣族自治县",
+            "code":"530427"
+          },
+          {
+            "name":"元江哈尼族彝族傣族自治县",
+            "code":"530428"
+          }
+        ]
+      },
+      {
+        "name":"保山市",
+        "code":"530500",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"530501"
+          },
+          {
+            "name":"隆阳区",
+            "code":"530502"
+          },
+          {
+            "name":"施甸县",
+            "code":"530521"
+          },
+          {
+            "name":"腾冲县",
+            "code":"530522"
+          },
+          {
+            "name":"龙陵县",
+            "code":"530523"
+          },
+          {
+            "name":"昌宁县",
+            "code":"530524"
+          }
+        ]
+      },
+      {
+        "name":"昭通市",
+        "code":"530600",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"530601"
+          },
+          {
+            "name":"昭阳区",
+            "code":"530602"
+          },
+          {
+            "name":"鲁甸县",
+            "code":"530621"
+          },
+          {
+            "name":"巧家县",
+            "code":"530622"
+          },
+          {
+            "name":"盐津县",
+            "code":"530623"
+          },
+          {
+            "name":"大关县",
+            "code":"530624"
+          },
+          {
+            "name":"永善县",
+            "code":"530625"
+          },
+          {
+            "name":"绥江县",
+            "code":"530626"
+          },
+          {
+            "name":"镇雄县",
+            "code":"530627"
+          },
+          {
+            "name":"彝良县",
+            "code":"530628"
+          },
+          {
+            "name":"威信县",
+            "code":"530629"
+          },
+          {
+            "name":"水富县",
+            "code":"530630"
+          }
+        ]
+      },
+      {
+        "name":"丽江市",
+        "code":"530700",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"530701"
+          },
+          {
+            "name":"古城区",
+            "code":"530702"
+          },
+          {
+            "name":"玉龙纳西族自治县",
+            "code":"530721"
+          },
+          {
+            "name":"永胜县",
+            "code":"530722"
+          },
+          {
+            "name":"华坪县",
+            "code":"530723"
+          },
+          {
+            "name":"宁蒗彝族自治县",
+            "code":"530724"
+          }
+        ]
+      },
+      {
+        "name":"普洱市",
+        "code":"530800",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"530801"
+          },
+          {
+            "name":"思茅区",
+            "code":"530802"
+          },
+          {
+            "name":"宁洱哈尼族彝族自治县",
+            "code":"530821"
+          },
+          {
+            "name":"墨江哈尼族自治县",
+            "code":"530822"
+          },
+          {
+            "name":"景东彝族自治县",
+            "code":"530823"
+          },
+          {
+            "name":"景谷傣族彝族自治县",
+            "code":"530824"
+          },
+          {
+            "name":"镇沅彝族哈尼族拉祜族自治县",
+            "code":"530825"
+          },
+          {
+            "name":"江城哈尼族彝族自治县",
+            "code":"530826"
+          },
+          {
+            "name":"孟连傣族拉祜族佤族自治县",
+            "code":"530827"
+          },
+          {
+            "name":"澜沧拉祜族自治县",
+            "code":"530828"
+          },
+          {
+            "name":"西盟佤族自治县",
+            "code":"530829"
+          }
+        ]
+      },
+      {
+        "name":"临沧市",
+        "code":"530900",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"530901"
+          },
+          {
+            "name":"临翔区",
+            "code":"530902"
+          },
+          {
+            "name":"凤庆县",
+            "code":"530921"
+          },
+          {
+            "name":"云县",
+            "code":"530922"
+          },
+          {
+            "name":"永德县",
+            "code":"530923"
+          },
+          {
+            "name":"镇康县",
+            "code":"530924"
+          },
+          {
+            "name":"双江拉祜族佤族布朗族傣族自治县",
+            "code":"530925"
+          },
+          {
+            "name":"耿马傣族佤族自治县",
+            "code":"530926"
+          },
+          {
+            "name":"沧源佤族自治县",
+            "code":"530927"
+          }
+        ]
+      },
+      {
+        "name":"楚雄彝族自治州",
+        "code":"532300",
+        "sub":[
+          {
+            "name":"楚雄市",
+            "code":"532301"
+          },
+          {
+            "name":"双柏县",
+            "code":"532322"
+          },
+          {
+            "name":"牟定县",
+            "code":"532323"
+          },
+          {
+            "name":"南华县",
+            "code":"532324"
+          },
+          {
+            "name":"姚安县",
+            "code":"532325"
+          },
+          {
+            "name":"大姚县",
+            "code":"532326"
+          },
+          {
+            "name":"永仁县",
+            "code":"532327"
+          },
+          {
+            "name":"元谋县",
+            "code":"532328"
+          },
+          {
+            "name":"武定县",
+            "code":"532329"
+          },
+          {
+            "name":"禄丰县",
+            "code":"532331"
+          }
+        ]
+      },
+      {
+        "name":"红河哈尼族彝族自治州",
+        "code":"532500",
+        "sub":[
+          {
+            "name":"个旧市",
+            "code":"532501"
+          },
+          {
+            "name":"开远市",
+            "code":"532502"
+          },
+          {
+            "name":"蒙自市",
+            "code":"532503"
+          },
+          {
+            "name":"弥勒市",
+            "code":"532504"
+          },
+          {
+            "name":"屏边苗族自治县",
+            "code":"532523"
+          },
+          {
+            "name":"建水县",
+            "code":"532524"
+          },
+          {
+            "name":"石屏县",
+            "code":"532525"
+          },
+          {
+            "name":"泸西县",
+            "code":"532527"
+          },
+          {
+            "name":"元阳县",
+            "code":"532528"
+          },
+          {
+            "name":"红河县",
+            "code":"532529"
+          },
+          {
+            "name":"金平苗族瑶族傣族自治县",
+            "code":"532530"
+          },
+          {
+            "name":"绿春县",
+            "code":"532531"
+          },
+          {
+            "name":"河口瑶族自治县",
+            "code":"532532"
+          }
+        ]
+      },
+      {
+        "name":"文山壮族苗族自治州",
+        "code":"532600",
+        "sub":[
+          {
+            "name":"文山市",
+            "code":"532601"
+          },
+          {
+            "name":"砚山县",
+            "code":"532622"
+          },
+          {
+            "name":"西畴县",
+            "code":"532623"
+          },
+          {
+            "name":"麻栗坡县",
+            "code":"532624"
+          },
+          {
+            "name":"马关县",
+            "code":"532625"
+          },
+          {
+            "name":"丘北县",
+            "code":"532626"
+          },
+          {
+            "name":"广南县",
+            "code":"532627"
+          },
+          {
+            "name":"富宁县",
+            "code":"532628"
+          }
+        ]
+      },
+      {
+        "name":"西双版纳傣族自治州",
+        "code":"532800",
+        "sub":[
+          {
+            "name":"景洪市",
+            "code":"532801"
+          },
+          {
+            "name":"勐海县",
+            "code":"532822"
+          },
+          {
+            "name":"勐腊县",
+            "code":"532823"
+          }
+        ]
+      },
+      {
+        "name":"大理白族自治州",
+        "code":"532900",
+        "sub":[
+          {
+            "name":"大理市",
+            "code":"532901"
+          },
+          {
+            "name":"漾濞彝族自治县",
+            "code":"532922"
+          },
+          {
+            "name":"祥云县",
+            "code":"532923"
+          },
+          {
+            "name":"宾川县",
+            "code":"532924"
+          },
+          {
+            "name":"弥渡县",
+            "code":"532925"
+          },
+          {
+            "name":"南涧彝族自治县",
+            "code":"532926"
+          },
+          {
+            "name":"巍山彝族回族自治县",
+            "code":"532927"
+          },
+          {
+            "name":"永平县",
+            "code":"532928"
+          },
+          {
+            "name":"云龙县",
+            "code":"532929"
+          },
+          {
+            "name":"洱源县",
+            "code":"532930"
+          },
+          {
+            "name":"剑川县",
+            "code":"532931"
+          },
+          {
+            "name":"鹤庆县",
+            "code":"532932"
+          }
+        ]
+      },
+      {
+        "name":"德宏傣族景颇族自治州",
+        "code":"533100",
+        "sub":[
+          {
+            "name":"瑞丽市",
+            "code":"533102"
+          },
+          {
+            "name":"芒市",
+            "code":"533103"
+          },
+          {
+            "name":"梁河县",
+            "code":"533122"
+          },
+          {
+            "name":"盈江县",
+            "code":"533123"
+          },
+          {
+            "name":"陇川县",
+            "code":"533124"
+          }
+        ]
+      },
+      {
+        "name":"怒江傈僳族自治州",
+        "code":"533300",
+        "sub":[
+          {
+            "name":"泸水县",
+            "code":"533321"
+          },
+          {
+            "name":"福贡县",
+            "code":"533323"
+          },
+          {
+            "name":"贡山独龙族怒族自治县",
+            "code":"533324"
+          },
+          {
+            "name":"兰坪白族普米族自治县",
+            "code":"533325"
+          }
+        ]
+      },
+      {
+        "name":"迪庆藏族自治州",
+        "code":"533400",
+        "sub":[
+          {
+            "name":"香格里拉市",
+            "code":"533401"
+          },
+          {
+            "name":"德钦县",
+            "code":"533422"
+          },
+          {
+            "name":"维西傈僳族自治县",
+            "code":"533423"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "name":"西藏自治区",
+    "code":"540000",
+    "sub":[
+      {
+        "name":"拉萨市",
+        "code":"540100",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"540101"
+          },
+          {
+            "name":"城关区",
+            "code":"540102"
+          },
+          {
+            "name":"林周县",
+            "code":"540121"
+          },
+          {
+            "name":"当雄县",
+            "code":"540122"
+          },
+          {
+            "name":"尼木县",
+            "code":"540123"
+          },
+          {
+            "name":"曲水县",
+            "code":"540124"
+          },
+          {
+            "name":"堆龙德庆县",
+            "code":"540125"
+          },
+          {
+            "name":"达孜县",
+            "code":"540126"
+          },
+          {
+            "name":"墨竹工卡县",
+            "code":"540127"
+          }
+        ]
+      },
+      {
+        "name":"日喀则市",
+        "code":"540200",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"540201"
+          },
+          {
+            "name":"桑珠孜区",
+            "code":"540202"
+          },
+          {
+            "name":"南木林县",
+            "code":"540221"
+          },
+          {
+            "name":"江孜县",
+            "code":"540222"
+          },
+          {
+            "name":"定日县",
+            "code":"540223"
+          },
+          {
+            "name":"萨迦县",
+            "code":"540224"
+          },
+          {
+            "name":"拉孜县",
+            "code":"540225"
+          },
+          {
+            "name":"昂仁县",
+            "code":"540226"
+          },
+          {
+            "name":"谢通门县",
+            "code":"540227"
+          },
+          {
+            "name":"白朗县",
+            "code":"540228"
+          },
+          {
+            "name":"仁布县",
+            "code":"540229"
+          },
+          {
+            "name":"康马县",
+            "code":"540230"
+          },
+          {
+            "name":"定结县",
+            "code":"540231"
+          },
+          {
+            "name":"仲巴县",
+            "code":"540232"
+          },
+          {
+            "name":"亚东县",
+            "code":"540233"
+          },
+          {
+            "name":"吉隆县",
+            "code":"540234"
+          },
+          {
+            "name":"聂拉木县",
+            "code":"540235"
+          },
+          {
+            "name":"萨嘎县",
+            "code":"540236"
+          },
+          {
+            "name":"岗巴县",
+            "code":"540237"
+          }
+        ]
+      },
+      {
+        "name":"昌都市",
+        "code":"540300",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"540301"
+          },
+          {
+            "name":"卡若区",
+            "code":"540302"
+          },
+          {
+            "name":"江达县",
+            "code":"540321"
+          },
+          {
+            "name":"贡觉县",
+            "code":"540322"
+          },
+          {
+            "name":"类乌齐县",
+            "code":"540323"
+          },
+          {
+            "name":"丁青县",
+            "code":"540324"
+          },
+          {
+            "name":"察雅县",
+            "code":"540325"
+          },
+          {
+            "name":"八宿县",
+            "code":"540326"
+          },
+          {
+            "name":"左贡县",
+            "code":"540327"
+          },
+          {
+            "name":"芒康县",
+            "code":"540328"
+          },
+          {
+            "name":"洛隆县",
+            "code":"540329"
+          },
+          {
+            "name":"边坝县",
+            "code":"540330"
+          }
+        ]
+      },
+      {
+        "name":"山南地区",
+        "code":"542200",
+        "sub":[
+          {
+            "name":"乃东县",
+            "code":"542221"
+          },
+          {
+            "name":"扎囊县",
+            "code":"542222"
+          },
+          {
+            "name":"贡嘎县",
+            "code":"542223"
+          },
+          {
+            "name":"桑日县",
+            "code":"542224"
+          },
+          {
+            "name":"琼结县",
+            "code":"542225"
+          },
+          {
+            "name":"曲松县",
+            "code":"542226"
+          },
+          {
+            "name":"措美县",
+            "code":"542227"
+          },
+          {
+            "name":"洛扎县",
+            "code":"542228"
+          },
+          {
+            "name":"加查县",
+            "code":"542229"
+          },
+          {
+            "name":"隆子县",
+            "code":"542231"
+          },
+          {
+            "name":"错那县",
+            "code":"542232"
+          },
+          {
+            "name":"浪卡子县",
+            "code":"542233"
+          }
+        ]
+      },
+      {
+        "name":"那曲地区",
+        "code":"542400",
+        "sub":[
+          {
+            "name":"那曲县",
+            "code":"542421"
+          },
+          {
+            "name":"嘉黎县",
+            "code":"542422"
+          },
+          {
+            "name":"比如县",
+            "code":"542423"
+          },
+          {
+            "name":"聂荣县",
+            "code":"542424"
+          },
+          {
+            "name":"安多县",
+            "code":"542425"
+          },
+          {
+            "name":"申扎县",
+            "code":"542426"
+          },
+          {
+            "name":"索县",
+            "code":"542427"
+          },
+          {
+            "name":"班戈县",
+            "code":"542428"
+          },
+          {
+            "name":"巴青县",
+            "code":"542429"
+          },
+          {
+            "name":"尼玛县",
+            "code":"542430"
+          },
+          {
+            "name":"双湖县",
+            "code":"542431"
+          }
+        ]
+      },
+      {
+        "name":"阿里地区",
+        "code":"542500",
+        "sub":[
+          {
+            "name":"普兰县",
+            "code":"542521"
+          },
+          {
+            "name":"札达县",
+            "code":"542522"
+          },
+          {
+            "name":"噶尔县",
+            "code":"542523"
+          },
+          {
+            "name":"日土县",
+            "code":"542524"
+          },
+          {
+            "name":"革吉县",
+            "code":"542525"
+          },
+          {
+            "name":"改则县",
+            "code":"542526"
+          },
+          {
+            "name":"措勤县",
+            "code":"542527"
+          }
+        ]
+      },
+      {
+        "name":"林芝地区",
+        "code":"542600",
+        "sub":[
+          {
+            "name":"林芝县",
+            "code":"542621"
+          },
+          {
+            "name":"工布江达县",
+            "code":"542622"
+          },
+          {
+            "name":"米林县",
+            "code":"542623"
+          },
+          {
+            "name":"墨脱县",
+            "code":"542624"
+          },
+          {
+            "name":"波密县",
+            "code":"542625"
+          },
+          {
+            "name":"察隅县",
+            "code":"542626"
+          },
+          {
+            "name":"朗县",
+            "code":"542627"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "name":"陕西省",
+    "code":"610000",
+    "sub":[
+      {
+        "name":"西安市",
+        "code":"610100",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"610101"
+          },
+          {
+            "name":"新城区",
+            "code":"610102"
+          },
+          {
+            "name":"碑林区",
+            "code":"610103"
+          },
+          {
+            "name":"莲湖区",
+            "code":"610104"
+          },
+          {
+            "name":"灞桥区",
+            "code":"610111"
+          },
+          {
+            "name":"未央区",
+            "code":"610112"
+          },
+          {
+            "name":"雁塔区",
+            "code":"610113"
+          },
+          {
+            "name":"阎良区",
+            "code":"610114"
+          },
+          {
+            "name":"临潼区",
+            "code":"610115"
+          },
+          {
+            "name":"长安区",
+            "code":"610116"
+          },
+          {
+            "name":"高陵区",
+            "code":"610117"
+          },
+          {
+            "name":"蓝田县",
+            "code":"610122"
+          },
+          {
+            "name":"周至县",
+            "code":"610124"
+          },
+          {
+            "name":"户县",
+            "code":"610125"
+          }
+        ]
+      },
+      {
+        "name":"铜川市",
+        "code":"610200",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"610201"
+          },
+          {
+            "name":"王益区",
+            "code":"610202"
+          },
+          {
+            "name":"印台区",
+            "code":"610203"
+          },
+          {
+            "name":"耀州区",
+            "code":"610204"
+          },
+          {
+            "name":"宜君县",
+            "code":"610222"
+          }
+        ]
+      },
+      {
+        "name":"宝鸡市",
+        "code":"610300",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"610301"
+          },
+          {
+            "name":"渭滨区",
+            "code":"610302"
+          },
+          {
+            "name":"金台区",
+            "code":"610303"
+          },
+          {
+            "name":"陈仓区",
+            "code":"610304"
+          },
+          {
+            "name":"凤翔县",
+            "code":"610322"
+          },
+          {
+            "name":"岐山县",
+            "code":"610323"
+          },
+          {
+            "name":"扶风县",
+            "code":"610324"
+          },
+          {
+            "name":"眉县",
+            "code":"610326"
+          },
+          {
+            "name":"陇县",
+            "code":"610327"
+          },
+          {
+            "name":"千阳县",
+            "code":"610328"
+          },
+          {
+            "name":"麟游县",
+            "code":"610329"
+          },
+          {
+            "name":"凤县",
+            "code":"610330"
+          },
+          {
+            "name":"太白县",
+            "code":"610331"
+          }
+        ]
+      },
+      {
+        "name":"咸阳市",
+        "code":"610400",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"610401"
+          },
+          {
+            "name":"秦都区",
+            "code":"610402"
+          },
+          {
+            "name":"杨陵区",
+            "code":"610403"
+          },
+          {
+            "name":"渭城区",
+            "code":"610404"
+          },
+          {
+            "name":"三原县",
+            "code":"610422"
+          },
+          {
+            "name":"泾阳县",
+            "code":"610423"
+          },
+          {
+            "name":"乾县",
+            "code":"610424"
+          },
+          {
+            "name":"礼泉县",
+            "code":"610425"
+          },
+          {
+            "name":"永寿县",
+            "code":"610426"
+          },
+          {
+            "name":"彬县",
+            "code":"610427"
+          },
+          {
+            "name":"长武县",
+            "code":"610428"
+          },
+          {
+            "name":"旬邑县",
+            "code":"610429"
+          },
+          {
+            "name":"淳化县",
+            "code":"610430"
+          },
+          {
+            "name":"武功县",
+            "code":"610431"
+          },
+          {
+            "name":"兴平市",
+            "code":"610481"
+          }
+        ]
+      },
+      {
+        "name":"渭南市",
+        "code":"610500",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"610501"
+          },
+          {
+            "name":"临渭区",
+            "code":"610502"
+          },
+          {
+            "name":"华县",
+            "code":"610521"
+          },
+          {
+            "name":"潼关县",
+            "code":"610522"
+          },
+          {
+            "name":"大荔县",
+            "code":"610523"
+          },
+          {
+            "name":"合阳县",
+            "code":"610524"
+          },
+          {
+            "name":"澄城县",
+            "code":"610525"
+          },
+          {
+            "name":"蒲城县",
+            "code":"610526"
+          },
+          {
+            "name":"白水县",
+            "code":"610527"
+          },
+          {
+            "name":"富平县",
+            "code":"610528"
+          },
+          {
+            "name":"韩城市",
+            "code":"610581"
+          },
+          {
+            "name":"华阴市",
+            "code":"610582"
+          }
+        ]
+      },
+      {
+        "name":"延安市",
+        "code":"610600",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"610601"
+          },
+          {
+            "name":"宝塔区",
+            "code":"610602"
+          },
+          {
+            "name":"延长县",
+            "code":"610621"
+          },
+          {
+            "name":"延川县",
+            "code":"610622"
+          },
+          {
+            "name":"子长县",
+            "code":"610623"
+          },
+          {
+            "name":"安塞县",
+            "code":"610624"
+          },
+          {
+            "name":"志丹县",
+            "code":"610625"
+          },
+          {
+            "name":"吴起县",
+            "code":"610626"
+          },
+          {
+            "name":"甘泉县",
+            "code":"610627"
+          },
+          {
+            "name":"富县",
+            "code":"610628"
+          },
+          {
+            "name":"洛川县",
+            "code":"610629"
+          },
+          {
+            "name":"宜川县",
+            "code":"610630"
+          },
+          {
+            "name":"黄龙县",
+            "code":"610631"
+          },
+          {
+            "name":"黄陵县",
+            "code":"610632"
+          }
+        ]
+      },
+      {
+        "name":"汉中市",
+        "code":"610700",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"610701"
+          },
+          {
+            "name":"汉台区",
+            "code":"610702"
+          },
+          {
+            "name":"南郑县",
+            "code":"610721"
+          },
+          {
+            "name":"城固县",
+            "code":"610722"
+          },
+          {
+            "name":"洋县",
+            "code":"610723"
+          },
+          {
+            "name":"西乡县",
+            "code":"610724"
+          },
+          {
+            "name":"勉县",
+            "code":"610725"
+          },
+          {
+            "name":"宁强县",
+            "code":"610726"
+          },
+          {
+            "name":"略阳县",
+            "code":"610727"
+          },
+          {
+            "name":"镇巴县",
+            "code":"610728"
+          },
+          {
+            "name":"留坝县",
+            "code":"610729"
+          },
+          {
+            "name":"佛坪县",
+            "code":"610730"
+          }
+        ]
+      },
+      {
+        "name":"榆林市",
+        "code":"610800",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"610801"
+          },
+          {
+            "name":"榆阳区",
+            "code":"610802"
+          },
+          {
+            "name":"神木县",
+            "code":"610821"
+          },
+          {
+            "name":"府谷县",
+            "code":"610822"
+          },
+          {
+            "name":"横山县",
+            "code":"610823"
+          },
+          {
+            "name":"靖边县",
+            "code":"610824"
+          },
+          {
+            "name":"定边县",
+            "code":"610825"
+          },
+          {
+            "name":"绥德县",
+            "code":"610826"
+          },
+          {
+            "name":"米脂县",
+            "code":"610827"
+          },
+          {
+            "name":"佳县",
+            "code":"610828"
+          },
+          {
+            "name":"吴堡县",
+            "code":"610829"
+          },
+          {
+            "name":"清涧县",
+            "code":"610830"
+          },
+          {
+            "name":"子洲县",
+            "code":"610831"
+          }
+        ]
+      },
+      {
+        "name":"安康市",
+        "code":"610900",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"610901"
+          },
+          {
+            "name":"汉阴县",
+            "code":"610921"
+          },
+          {
+            "name":"石泉县",
+            "code":"610922"
+          },
+          {
+            "name":"宁陕县",
+            "code":"610923"
+          },
+          {
+            "name":"紫阳县",
+            "code":"610924"
+          },
+          {
+            "name":"岚皋县",
+            "code":"610925"
+          },
+          {
+            "name":"平利县",
+            "code":"610926"
+          },
+          {
+            "name":"镇坪县",
+            "code":"610927"
+          },
+          {
+            "name":"旬阳县",
+            "code":"610928"
+          },
+          {
+            "name":"白河县",
+            "code":"610929"
+          }
+        ]
+      },
+      {
+        "name":"商洛市",
+        "code":"611000",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"611001"
+          },
+          {
+            "name":"商州区",
+            "code":"611002"
+          },
+          {
+            "name":"洛南县",
+            "code":"611021"
+          },
+          {
+            "name":"丹凤县",
+            "code":"611022"
+          },
+          {
+            "name":"商南县",
+            "code":"611023"
+          },
+          {
+            "name":"山阳县",
+            "code":"611024"
+          },
+          {
+            "name":"镇安县",
+            "code":"611025"
+          },
+          {
+            "name":"柞水县",
+            "code":"611026"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "name":"甘肃省",
+    "code":"620000",
+    "sub":[
+      {
+        "name":"兰州市",
+        "code":"620100",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"620101"
+          },
+          {
+            "name":"城关区",
+            "code":"620102"
+          },
+          {
+            "name":"七里河区",
+            "code":"620103"
+          },
+          {
+            "name":"西固区",
+            "code":"620104"
+          },
+          {
+            "name":"安宁区",
+            "code":"620105"
+          },
+          {
+            "name":"红古区",
+            "code":"620111"
+          },
+          {
+            "name":"永登县",
+            "code":"620121"
+          },
+          {
+            "name":"皋兰县",
+            "code":"620122"
+          },
+          {
+            "name":"榆中县",
+            "code":"620123"
+          }
+        ]
+      },
+      {
+        "name":"嘉峪关市",
+        "code":"620200",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"620201"
+          }
+        ]
+      },
+      {
+        "name":"金昌市",
+        "code":"620300",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"620301"
+          },
+          {
+            "name":"金川区",
+            "code":"620302"
+          },
+          {
+            "name":"永昌县",
+            "code":"620321"
+          }
+        ]
+      },
+      {
+        "name":"白银市",
+        "code":"620400",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"620401"
+          },
+          {
+            "name":"白银区",
+            "code":"620402"
+          },
+          {
+            "name":"平川区",
+            "code":"620403"
+          },
+          {
+            "name":"靖远县",
+            "code":"620421"
+          },
+          {
+            "name":"会宁县",
+            "code":"620422"
+          },
+          {
+            "name":"景泰县",
+            "code":"620423"
+          }
+        ]
+      },
+      {
+        "name":"天水市",
+        "code":"620500",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"620501"
+          },
+          {
+            "name":"秦州区",
+            "code":"620502"
+          },
+          {
+            "name":"麦积区",
+            "code":"620503"
+          },
+          {
+            "name":"清水县",
+            "code":"620521"
+          },
+          {
+            "name":"秦安县",
+            "code":"620522"
+          },
+          {
+            "name":"甘谷县",
+            "code":"620523"
+          },
+          {
+            "name":"武山县",
+            "code":"620524"
+          },
+          {
+            "name":"张家川回族自治县",
+            "code":"620525"
+          }
+        ]
+      },
+      {
+        "name":"武威市",
+        "code":"620600",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"620601"
+          },
+          {
+            "name":"凉州区",
+            "code":"620602"
+          },
+          {
+            "name":"民勤县",
+            "code":"620621"
+          },
+          {
+            "name":"古浪县",
+            "code":"620622"
+          },
+          {
+            "name":"天祝藏族自治县",
+            "code":"620623"
+          }
+        ]
+      },
+      {
+        "name":"张掖市",
+        "code":"620700",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"620701"
+          },
+          {
+            "name":"甘州区",
+            "code":"620702"
+          },
+          {
+            "name":"肃南裕固族自治县",
+            "code":"620721"
+          },
+          {
+            "name":"民乐县",
+            "code":"620722"
+          },
+          {
+            "name":"临泽县",
+            "code":"620723"
+          },
+          {
+            "name":"高台县",
+            "code":"620724"
+          },
+          {
+            "name":"山丹县",
+            "code":"620725"
+          }
+        ]
+      },
+      {
+        "name":"平凉市",
+        "code":"620800",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"620801"
+          },
+          {
+            "name":"崆峒区",
+            "code":"620802"
+          },
+          {
+            "name":"泾川县",
+            "code":"620821"
+          },
+          {
+            "name":"灵台县",
+            "code":"620822"
+          },
+          {
+            "name":"崇信县",
+            "code":"620823"
+          },
+          {
+            "name":"华亭县",
+            "code":"620824"
+          },
+          {
+            "name":"庄浪县",
+            "code":"620825"
+          },
+          {
+            "name":"静宁县",
+            "code":"620826"
+          }
+        ]
+      },
+      {
+        "name":"酒泉市",
+        "code":"620900",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"620901"
+          },
+          {
+            "name":"肃州区",
+            "code":"620902"
+          },
+          {
+            "name":"金塔县",
+            "code":"620921"
+          },
+          {
+            "name":"瓜州县",
+            "code":"620922"
+          },
+          {
+            "name":"肃北蒙古族自治县",
+            "code":"620923"
+          },
+          {
+            "name":"阿克塞哈萨克族自治县",
+            "code":"620924"
+          },
+          {
+            "name":"玉门市",
+            "code":"620981"
+          },
+          {
+            "name":"敦煌市",
+            "code":"620982"
+          }
+        ]
+      },
+      {
+        "name":"庆阳市",
+        "code":"621000",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"621001"
+          },
+          {
+            "name":"西峰区",
+            "code":"621002"
+          },
+          {
+            "name":"庆城县",
+            "code":"621021"
+          },
+          {
+            "name":"环县",
+            "code":"621022"
+          },
+          {
+            "name":"华池县",
+            "code":"621023"
+          },
+          {
+            "name":"合水县",
+            "code":"621024"
+          },
+          {
+            "name":"正宁县",
+            "code":"621025"
+          },
+          {
+            "name":"宁县",
+            "code":"621026"
+          },
+          {
+            "name":"镇原县",
+            "code":"621027"
+          }
+        ]
+      },
+      {
+        "name":"定西市",
+        "code":"621100",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"621101"
+          },
+          {
+            "name":"安定区",
+            "code":"621102"
+          },
+          {
+            "name":"通渭县",
+            "code":"621121"
+          },
+          {
+            "name":"陇西县",
+            "code":"621122"
+          },
+          {
+            "name":"渭源县",
+            "code":"621123"
+          },
+          {
+            "name":"临洮县",
+            "code":"621124"
+          },
+          {
+            "name":"漳县",
+            "code":"621125"
+          },
+          {
+            "name":"岷县",
+            "code":"621126"
+          }
+        ]
+      },
+      {
+        "name":"陇南市",
+        "code":"621200",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"621201"
+          },
+          {
+            "name":"武都区",
+            "code":"621202"
+          },
+          {
+            "name":"成县",
+            "code":"621221"
+          },
+          {
+            "name":"文县",
+            "code":"621222"
+          },
+          {
+            "name":"宕昌县",
+            "code":"621223"
+          },
+          {
+            "name":"康县",
+            "code":"621224"
+          },
+          {
+            "name":"西和县",
+            "code":"621225"
+          },
+          {
+            "name":"礼县",
+            "code":"621226"
+          },
+          {
+            "name":"徽县",
+            "code":"621227"
+          },
+          {
+            "name":"两当县",
+            "code":"621228"
+          }
+        ]
+      },
+      {
+        "name":"临夏回族自治州",
+        "code":"622900",
+        "sub":[
+          {
+            "name":"临夏市",
+            "code":"622901"
+          },
+          {
+            "name":"临夏县",
+            "code":"622921"
+          },
+          {
+            "name":"康乐县",
+            "code":"622922"
+          },
+          {
+            "name":"永靖县",
+            "code":"622923"
+          },
+          {
+            "name":"广河县",
+            "code":"622924"
+          },
+          {
+            "name":"和政县",
+            "code":"622925"
+          },
+          {
+            "name":"东乡族自治县",
+            "code":"622926"
+          },
+          {
+            "name":"积石山保安族东乡族撒拉族自治县",
+            "code":"622927"
+          }
+        ]
+      },
+      {
+        "name":"甘南藏族自治州",
+        "code":"623000",
+        "sub":[
+          {
+            "name":"合作市",
+            "code":"623001"
+          },
+          {
+            "name":"临潭县",
+            "code":"623021"
+          },
+          {
+            "name":"卓尼县",
+            "code":"623022"
+          },
+          {
+            "name":"舟曲县",
+            "code":"623023"
+          },
+          {
+            "name":"迭部县",
+            "code":"623024"
+          },
+          {
+            "name":"玛曲县",
+            "code":"623025"
+          },
+          {
+            "name":"碌曲县",
+            "code":"623026"
+          },
+          {
+            "name":"夏河县",
+            "code":"623027"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "name":"青海省",
+    "code":"630000",
+    "sub":[
+      {
+        "name":"西宁市",
+        "code":"630100",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"630101"
+          },
+          {
+            "name":"城东区",
+            "code":"630102"
+          },
+          {
+            "name":"城中区",
+            "code":"630103"
+          },
+          {
+            "name":"城西区",
+            "code":"630104"
+          },
+          {
+            "name":"城北区",
+            "code":"630105"
+          },
+          {
+            "name":"大通回族土族自治县",
+            "code":"630121"
+          },
+          {
+            "name":"湟中县",
+            "code":"630122"
+          },
+          {
+            "name":"湟源县",
+            "code":"630123"
+          }
+        ]
+      },
+      {
+        "name":"海东市",
+        "code":"630200",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"630201"
+          },
+          {
+            "name":"乐都区",
+            "code":"630202"
+          },
+          {
+            "name":"平安县",
+            "code":"630221"
+          },
+          {
+            "name":"民和回族土族自治县",
+            "code":"630222"
+          },
+          {
+            "name":"互助土族自治县",
+            "code":"630223"
+          },
+          {
+            "name":"化隆回族自治县",
+            "code":"630224"
+          },
+          {
+            "name":"循化撒拉族自治县",
+            "code":"630225"
+          }
+        ]
+      },
+      {
+        "name":"海北藏族自治州",
+        "code":"632200",
+        "sub":[
+          {
+            "name":"门源回族自治县",
+            "code":"632221"
+          },
+          {
+            "name":"祁连县",
+            "code":"632222"
+          },
+          {
+            "name":"海晏县",
+            "code":"632223"
+          },
+          {
+            "name":"刚察县",
+            "code":"632224"
+          }
+        ]
+      },
+      {
+        "name":"黄南藏族自治州",
+        "code":"632300",
+        "sub":[
+          {
+            "name":"同仁县",
+            "code":"632321"
+          },
+          {
+            "name":"尖扎县",
+            "code":"632322"
+          },
+          {
+            "name":"泽库县",
+            "code":"632323"
+          },
+          {
+            "name":"河南蒙古族自治县",
+            "code":"632324"
+          }
+        ]
+      },
+      {
+        "name":"海南藏族自治州",
+        "code":"632500",
+        "sub":[
+          {
+            "name":"共和县",
+            "code":"632521"
+          },
+          {
+            "name":"同德县",
+            "code":"632522"
+          },
+          {
+            "name":"贵德县",
+            "code":"632523"
+          },
+          {
+            "name":"兴海县",
+            "code":"632524"
+          },
+          {
+            "name":"贵南县",
+            "code":"632525"
+          }
+        ]
+      },
+      {
+        "name":"果洛藏族自治州",
+        "code":"632600",
+        "sub":[
+          {
+            "name":"玛沁县",
+            "code":"632621"
+          },
+          {
+            "name":"班玛县",
+            "code":"632622"
+          },
+          {
+            "name":"甘德县",
+            "code":"632623"
+          },
+          {
+            "name":"达日县",
+            "code":"632624"
+          },
+          {
+            "name":"久治县",
+            "code":"632625"
+          },
+          {
+            "name":"玛多县",
+            "code":"632626"
+          }
+        ]
+      },
+      {
+        "name":"玉树藏族自治州",
+        "code":"632700",
+        "sub":[
+          {
+            "name":"玉树市",
+            "code":"632701"
+          },
+          {
+            "name":"杂多县",
+            "code":"632722"
+          },
+          {
+            "name":"称多县",
+            "code":"632723"
+          },
+          {
+            "name":"治多县",
+            "code":"632724"
+          },
+          {
+            "name":"囊谦县",
+            "code":"632725"
+          },
+          {
+            "name":"曲麻莱县",
+            "code":"632726"
+          }
+        ]
+      },
+      {
+        "name":"海西蒙古族藏族自治州",
+        "code":"632800",
+        "sub":[
+          {
+            "name":"格尔木市",
+            "code":"632801"
+          },
+          {
+            "name":"德令哈市",
+            "code":"632802"
+          },
+          {
+            "name":"乌兰县",
+            "code":"632821"
+          },
+          {
+            "name":"都兰县",
+            "code":"632822"
+          },
+          {
+            "name":"天峻县",
+            "code":"632823"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "name":"宁夏回族自治区",
+    "code":"640000",
+    "sub":[
+      {
+        "name":"银川市",
+        "code":"640100",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"640101"
+          },
+          {
+            "name":"兴庆区",
+            "code":"640104"
+          },
+          {
+            "name":"西夏区",
+            "code":"640105"
+          },
+          {
+            "name":"金凤区",
+            "code":"640106"
+          },
+          {
+            "name":"永宁县",
+            "code":"640121"
+          },
+          {
+            "name":"贺兰县",
+            "code":"640122"
+          },
+          {
+            "name":"灵武市",
+            "code":"640181"
+          }
+        ]
+      },
+      {
+        "name":"石嘴山市",
+        "code":"640200",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"640201"
+          },
+          {
+            "name":"大武口区",
+            "code":"640202"
+          },
+          {
+            "name":"惠农区",
+            "code":"640205"
+          },
+          {
+            "name":"平罗县",
+            "code":"640221"
+          }
+        ]
+      },
+      {
+        "name":"吴忠市",
+        "code":"640300",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"640301"
+          },
+          {
+            "name":"利通区",
+            "code":"640302"
+          },
+          {
+            "name":"红寺堡区",
+            "code":"640303"
+          },
+          {
+            "name":"盐池县",
+            "code":"640323"
+          },
+          {
+            "name":"同心县",
+            "code":"640324"
+          },
+          {
+            "name":"青铜峡市",
+            "code":"640381"
+          }
+        ]
+      },
+      {
+        "name":"固原市",
+        "code":"640400",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"640401"
+          },
+          {
+            "name":"原州区",
+            "code":"640402"
+          },
+          {
+            "name":"西吉县",
+            "code":"640422"
+          },
+          {
+            "name":"隆德县",
+            "code":"640423"
+          },
+          {
+            "name":"泾源县",
+            "code":"640424"
+          },
+          {
+            "name":"彭阳县",
+            "code":"640425"
+          }
+        ]
+      },
+      {
+        "name":"中卫市",
+        "code":"640500",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"640501"
+          },
+          {
+            "name":"沙坡头区",
+            "code":"640502"
+          },
+          {
+            "name":"中宁县",
+            "code":"640521"
+          },
+          {
+            "name":"海原县",
+            "code":"640522"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "name":"新疆维吾尔自治区",
+    "code":"650000",
+    "sub":[
+      {
+        "name":"乌鲁木齐市",
+        "code":"650100",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"650101"
+          },
+          {
+            "name":"天山区",
+            "code":"650102"
+          },
+          {
+            "name":"沙依巴克区",
+            "code":"650103"
+          },
+          {
+            "name":"新市区",
+            "code":"650104"
+          },
+          {
+            "name":"水磨沟区",
+            "code":"650105"
+          },
+          {
+            "name":"头屯河区",
+            "code":"650106"
+          },
+          {
+            "name":"达坂城区",
+            "code":"650107"
+          },
+          {
+            "name":"米东区",
+            "code":"650109"
+          },
+          {
+            "name":"乌鲁木齐县",
+            "code":"650121"
+          }
+        ]
+      },
+      {
+        "name":"克拉玛依市",
+        "code":"650200",
+        "sub":[
+          {
+            "name":"市辖区",
+            "code":"650201"
+          },
+          {
+            "name":"独山子区",
+            "code":"650202"
+          },
+          {
+            "name":"克拉玛依区",
+            "code":"650203"
+          },
+          {
+            "name":"白碱滩区",
+            "code":"650204"
+          },
+          {
+            "name":"乌尔禾区",
+            "code":"650205"
+          }
+        ]
+      },
+      {
+        "name":"吐鲁番地区",
+        "code":"652100",
+        "sub":[
+          {
+            "name":"吐鲁番市",
+            "code":"652101"
+          },
+          {
+            "name":"鄯善县",
+            "code":"652122"
+          },
+          {
+            "name":"托克逊县",
+            "code":"652123"
+          }
+        ]
+      },
+      {
+        "name":"哈密地区",
+        "code":"652200",
+        "sub":[
+          {
+            "name":"哈密市",
+            "code":"652201"
+          },
+          {
+            "name":"巴里坤哈萨克自治县",
+            "code":"652222"
+          },
+          {
+            "name":"伊吾县",
+            "code":"652223"
+          }
+        ]
+      },
+      {
+        "name":"昌吉回族自治州",
+        "code":"652300",
+        "sub":[
+          {
+            "name":"昌吉市",
+            "code":"652301"
+          },
+          {
+            "name":"阜康市",
+            "code":"652302"
+          },
+          {
+            "name":"呼图壁县",
+            "code":"652323"
+          },
+          {
+            "name":"玛纳斯县",
+            "code":"652324"
+          },
+          {
+            "name":"奇台县",
+            "code":"652325"
+          },
+          {
+            "name":"吉木萨尔县",
+            "code":"652327"
+          },
+          {
+            "name":"木垒哈萨克自治县",
+            "code":"652328"
+          }
+        ]
+      },
+      {
+        "name":"博尔塔拉蒙古自治州",
+        "code":"652700",
+        "sub":[
+          {
+            "name":"博乐市",
+            "code":"652701"
+          },
+          {
+            "name":"阿拉山口市",
+            "code":"652702"
+          },
+          {
+            "name":"精河县",
+            "code":"652722"
+          },
+          {
+            "name":"温泉县",
+            "code":"652723"
+          }
+        ]
+      },
+      {
+        "name":"巴音郭楞蒙古自治州",
+        "code":"652800",
+        "sub":[
+          {
+            "name":"库尔勒市",
+            "code":"652801"
+          },
+          {
+            "name":"轮台县",
+            "code":"652822"
+          },
+          {
+            "name":"尉犁县",
+            "code":"652823"
+          },
+          {
+            "name":"若羌县",
+            "code":"652824"
+          },
+          {
+            "name":"且末县",
+            "code":"652825"
+          },
+          {
+            "name":"焉耆回族自治县",
+            "code":"652826"
+          },
+          {
+            "name":"和静县",
+            "code":"652827"
+          },
+          {
+            "name":"和硕县",
+            "code":"652828"
+          },
+          {
+            "name":"博湖县",
+            "code":"652829"
+          }
+        ]
+      },
+      {
+        "name":"阿克苏地区",
+        "code":"652900",
+        "sub":[
+          {
+            "name":"阿克苏市",
+            "code":"652901"
+          },
+          {
+            "name":"温宿县",
+            "code":"652922"
+          },
+          {
+            "name":"库车县",
+            "code":"652923"
+          },
+          {
+            "name":"沙雅县",
+            "code":"652924"
+          },
+          {
+            "name":"新和县",
+            "code":"652925"
+          },
+          {
+            "name":"拜城县",
+            "code":"652926"
+          },
+          {
+            "name":"乌什县",
+            "code":"652927"
+          },
+          {
+            "name":"阿瓦提县",
+            "code":"652928"
+          },
+          {
+            "name":"柯坪县",
+            "code":"652929"
+          }
+        ]
+      },
+      {
+        "name":"克孜勒苏柯尔克孜自治州",
+        "code":"653000",
+        "sub":[
+          {
+            "name":"阿图什市",
+            "code":"653001"
+          },
+          {
+            "name":"阿克陶县",
+            "code":"653022"
+          },
+          {
+            "name":"阿合奇县",
+            "code":"653023"
+          },
+          {
+            "name":"乌恰县",
+            "code":"653024"
+          }
+        ]
+      },
+      {
+        "name":"喀什地区",
+        "code":"653100",
+        "sub":[
+          {
+            "name":"喀什市",
+            "code":"653101"
+          },
+          {
+            "name":"疏附县",
+            "code":"653121"
+          },
+          {
+            "name":"疏勒县",
+            "code":"653122"
+          },
+          {
+            "name":"英吉沙县",
+            "code":"653123"
+          },
+          {
+            "name":"泽普县",
+            "code":"653124"
+          },
+          {
+            "name":"莎车县",
+            "code":"653125"
+          },
+          {
+            "name":"叶城县",
+            "code":"653126"
+          },
+          {
+            "name":"麦盖提县",
+            "code":"653127"
+          },
+          {
+            "name":"岳普湖县",
+            "code":"653128"
+          },
+          {
+            "name":"伽师县",
+            "code":"653129"
+          },
+          {
+            "name":"巴楚县",
+            "code":"653130"
+          },
+          {
+            "name":"塔什库尔干塔吉克自治县",
+            "code":"653131"
+          }
+        ]
+      },
+      {
+        "name":"和田地区",
+        "code":"653200",
+        "sub":[
+          {
+            "name":"和田市",
+            "code":"653201"
+          },
+          {
+            "name":"和田县",
+            "code":"653221"
+          },
+          {
+            "name":"墨玉县",
+            "code":"653222"
+          },
+          {
+            "name":"皮山县",
+            "code":"653223"
+          },
+          {
+            "name":"洛浦县",
+            "code":"653224"
+          },
+          {
+            "name":"策勒县",
+            "code":"653225"
+          },
+          {
+            "name":"于田县",
+            "code":"653226"
+          },
+          {
+            "name":"民丰县",
+            "code":"653227"
+          }
+        ]
+      },
+      {
+        "name":"伊犁哈萨克自治州",
+        "code":"654000",
+        "sub":[
+          {
+            "name":"伊宁市",
+            "code":"654002"
+          },
+          {
+            "name":"奎屯市",
+            "code":"654003"
+          },
+          {
+            "name":"霍尔果斯市",
+            "code":"654004"
+          },
+          {
+            "name":"伊宁县",
+            "code":"654021"
+          },
+          {
+            "name":"察布查尔锡伯自治县",
+            "code":"654022"
+          },
+          {
+            "name":"霍城县",
+            "code":"654023"
+          },
+          {
+            "name":"巩留县",
+            "code":"654024"
+          },
+          {
+            "name":"新源县",
+            "code":"654025"
+          },
+          {
+            "name":"昭苏县",
+            "code":"654026"
+          },
+          {
+            "name":"特克斯县",
+            "code":"654027"
+          },
+          {
+            "name":"尼勒克县",
+            "code":"654028"
+          },
+          {
+            "name":"塔城地区",
+            "code":"654200"
+          },
+          {
+            "name":"塔城市",
+            "code":"654201"
+          },
+          {
+            "name":"乌苏市",
+            "code":"654202"
+          },
+          {
+            "name":"额敏县",
+            "code":"654221"
+          },
+          {
+            "name":"沙湾县",
+            "code":"654223"
+          },
+          {
+            "name":"托里县",
+            "code":"654224"
+          },
+          {
+            "name":"裕民县",
+            "code":"654225"
+          },
+          {
+            "name":"和布克赛尔蒙古自治县",
+            "code":"654226"
+          },
+          {
+            "name":"阿勒泰地区",
+            "code":"654300"
+          },
+          {
+            "name":"阿勒泰市",
+            "code":"654301"
+          },
+          {
+            "name":"布尔津县",
+            "code":"654321"
+          },
+          {
+            "name":"富蕴县",
+            "code":"654322"
+          },
+          {
+            "name":"福海县",
+            "code":"654323"
+          },
+          {
+            "name":"哈巴河县",
+            "code":"654324"
+          },
+          {
+            "name":"青河县",
+            "code":"654325"
+          },
+          {
+            "name":"吉木乃县",
+            "code":"654326"
+          }
+        ]
+      },
+      {
+        "name":"自治区直辖县级行政区划",
+        "code":"659000",
+        "sub":[
+          {
+            "name":"石河子市",
+            "code":"659001"
+          },
+          {
+            "name":"阿拉尔市",
+            "code":"659002"
+          },
+          {
+            "name":"图木舒克市",
+            "code":"659003"
+          },
+          {
+            "name":"五家渠市",
+            "code":"659004"
+          },
+          {
+            "name":"北屯市",
+            "code":"659005"
+          },
+          {
+            "name":"铁门关市",
+            "code":"659006"
+          },
+          {
+            "name":"双河市",
+            "code":"659007"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "name":"台湾省",
+    "code":"710000",
+    "sub":[
+      {
+        "name":"台北市",
+        "code":"710100",
+        "sub":[
+          {
+            "name":"松山区",
+            "code":"710101"
+          },
+          {
+            "name":"信义区",
+            "code":"710102"
+          },
+          {
+            "name":"大安区",
+            "code":"710103"
+          },
+          {
+            "name":"中山区",
+            "code":"710104"
+          },
+          {
+            "name":"中正区",
+            "code":"710105"
+          },
+          {
+            "name":"大同区",
+            "code":"710106"
+          },
+          {
+            "name":"万华区",
+            "code":"710107"
+          },
+          {
+            "name":"文山区",
+            "code":"710108"
+          },
+          {
+            "name":"南港区",
+            "code":"710109"
+          },
+          {
+            "name":"内湖区",
+            "code":"710110"
+          },
+          {
+            "name":"士林区",
+            "code":"710111"
+          },
+          {
+            "name":"北投区",
+            "code":"710112"
+          }
+        ]
+      },
+      {
+        "name":"高雄市",
+        "code":"710200",
+        "sub":[
+          {
+            "name":"盐埕区",
+            "code":"710201"
+          },
+          {
+            "name":"鼓山区",
+            "code":"710202"
+          },
+          {
+            "name":"左营区",
+            "code":"710203"
+          },
+          {
+            "name":"楠梓区",
+            "code":"710204"
+          },
+          {
+            "name":"三民区",
+            "code":"710205"
+          },
+          {
+            "name":"新兴区",
+            "code":"710206"
+          },
+          {
+            "name":"前金区",
+            "code":"710207"
+          },
+          {
+            "name":"苓雅区",
+            "code":"710208"
+          },
+          {
+            "name":"前镇区",
+            "code":"710209"
+          },
+          {
+            "name":"旗津区",
+            "code":"710210"
+          },
+          {
+            "name":"小港区",
+            "code":"710211"
+          },
+          {
+            "name":"凤山区",
+            "code":"710212"
+          },
+          {
+            "name":"林园区",
+            "code":"710213"
+          },
+          {
+            "name":"大寮区",
+            "code":"710214"
+          },
+          {
+            "name":"大树区",
+            "code":"710215"
+          },
+          {
+            "name":"大社区",
+            "code":"710216"
+          },
+          {
+            "name":"仁武区",
+            "code":"710217"
+          },
+          {
+            "name":"鸟松区",
+            "code":"710218"
+          },
+          {
+            "name":"冈山区",
+            "code":"710219"
+          },
+          {
+            "name":"桥头区",
+            "code":"710220"
+          },
+          {
+            "name":"燕巢区",
+            "code":"710221"
+          },
+          {
+            "name":"田寮区",
+            "code":"710222"
+          },
+          {
+            "name":"阿莲区",
+            "code":"710223"
+          },
+          {
+            "name":"路竹区",
+            "code":"710224"
+          },
+          {
+            "name":"湖内区",
+            "code":"710225"
+          },
+          {
+            "name":"茄萣区",
+            "code":"710226"
+          },
+          {
+            "name":"永安区",
+            "code":"710227"
+          },
+          {
+            "name":"弥陀区",
+            "code":"710228"
+          },
+          {
+            "name":"梓官区",
+            "code":"710229"
+          },
+          {
+            "name":"旗山区",
+            "code":"710230"
+          },
+          {
+            "name":"美浓区",
+            "code":"710231"
+          },
+          {
+            "name":"六龟区",
+            "code":"710232"
+          },
+          {
+            "name":"甲仙区",
+            "code":"710233"
+          },
+          {
+            "name":"杉林区",
+            "code":"710234"
+          },
+          {
+            "name":"内门区",
+            "code":"710235"
+          },
+          {
+            "name":"茂林区",
+            "code":"710236"
+          },
+          {
+            "name":"桃源区",
+            "code":"710237"
+          },
+          {
+            "name":"那玛夏区",
+            "code":"710238"
+          }
+        ]
+      },
+      {
+        "name":"基隆市",
+        "code":"710300",
+        "sub":[
+          {
+            "name":"中正区",
+            "code":"710301"
+          },
+          {
+            "name":"七堵区",
+            "code":"710302"
+          },
+          {
+            "name":"暖暖区",
+            "code":"710303"
+          },
+          {
+            "name":"仁爱区",
+            "code":"710304"
+          },
+          {
+            "name":"中山区",
+            "code":"710305"
+          },
+          {
+            "name":"安乐区",
+            "code":"710306"
+          },
+          {
+            "name":"信义区",
+            "code":"710307"
+          }
+        ]
+      },
+      {
+        "name":"台中市",
+        "code":"710400",
+        "sub":[
+          {
+            "name":"中区",
+            "code":"710401"
+          },
+          {
+            "name":"东区",
+            "code":"710402"
+          },
+          {
+            "name":"南区",
+            "code":"710403"
+          },
+          {
+            "name":"西区",
+            "code":"710404"
+          },
+          {
+            "name":"北区",
+            "code":"710405"
+          },
+          {
+            "name":"西屯区",
+            "code":"710406"
+          },
+          {
+            "name":"南屯区",
+            "code":"710407"
+          },
+          {
+            "name":"北屯区",
+            "code":"710408"
+          },
+          {
+            "name":"丰原区",
+            "code":"710409"
+          },
+          {
+            "name":"东势区",
+            "code":"710410"
+          },
+          {
+            "name":"大甲区",
+            "code":"710411"
+          },
+          {
+            "name":"清水区",
+            "code":"710412"
+          },
+          {
+            "name":"沙鹿区",
+            "code":"710413"
+          },
+          {
+            "name":"梧栖区",
+            "code":"710414"
+          },
+          {
+            "name":"后里区",
+            "code":"710415"
+          },
+          {
+            "name":"神冈区",
+            "code":"710416"
+          },
+          {
+            "name":"潭子区",
+            "code":"710417"
+          },
+          {
+            "name":"大雅区",
+            "code":"710418"
+          },
+          {
+            "name":"新社区",
+            "code":"710419"
+          },
+          {
+            "name":"石冈区",
+            "code":"710420"
+          },
+          {
+            "name":"外埔区",
+            "code":"710421"
+          },
+          {
+            "name":"大安区",
+            "code":"710422"
+          },
+          {
+            "name":"乌日区",
+            "code":"710423"
+          },
+          {
+            "name":"大肚区",
+            "code":"710424"
+          },
+          {
+            "name":"龙井区",
+            "code":"710425"
+          },
+          {
+            "name":"雾峰区",
+            "code":"710426"
+          },
+          {
+            "name":"太平区",
+            "code":"710427"
+          },
+          {
+            "name":"大里区",
+            "code":"710428"
+          },
+          {
+            "name":"和平区",
+            "code":"710429"
+          }
+        ]
+      },
+      {
+        "name":"台南市",
+        "code":"710500",
+        "sub":[
+          {
+            "name":"东区",
+            "code":"710501"
+          },
+          {
+            "name":"南区",
+            "code":"710502"
+          },
+          {
+            "name":"北区",
+            "code":"710504"
+          },
+          {
+            "name":"安南区",
+            "code":"710506"
+          },
+          {
+            "name":"安平区",
+            "code":"710507"
+          },
+          {
+            "name":"中西区",
+            "code":"710508"
+          },
+          {
+            "name":"新营区",
+            "code":"710509"
+          },
+          {
+            "name":"盐水区",
+            "code":"710510"
+          },
+          {
+            "name":"白河区",
+            "code":"710511"
+          },
+          {
+            "name":"柳营区",
+            "code":"710512"
+          },
+          {
+            "name":"后壁区",
+            "code":"710513"
+          },
+          {
+            "name":"东山区",
+            "code":"710514"
+          },
+          {
+            "name":"麻豆区",
+            "code":"710515"
+          },
+          {
+            "name":"下营区",
+            "code":"710516"
+          },
+          {
+            "name":"六甲区",
+            "code":"710517"
+          },
+          {
+            "name":"官田区",
+            "code":"710518"
+          },
+          {
+            "name":"大内区",
+            "code":"710519"
+          },
+          {
+            "name":"佳里区",
+            "code":"710520"
+          },
+          {
+            "name":"学甲区",
+            "code":"710521"
+          },
+          {
+            "name":"西港区",
+            "code":"710522"
+          },
+          {
+            "name":"七股区",
+            "code":"710523"
+          },
+          {
+            "name":"将军区",
+            "code":"710524"
+          },
+          {
+            "name":"北门区",
+            "code":"710525"
+          },
+          {
+            "name":"新化区",
+            "code":"710526"
+          },
+          {
+            "name":"善化区",
+            "code":"710527"
+          },
+          {
+            "name":"新市区",
+            "code":"710528"
+          },
+          {
+            "name":"安定区",
+            "code":"710529"
+          },
+          {
+            "name":"山上区",
+            "code":"710530"
+          },
+          {
+            "name":"玉井区",
+            "code":"710531"
+          },
+          {
+            "name":"楠西区",
+            "code":"710532"
+          },
+          {
+            "name":"南化区",
+            "code":"710533"
+          },
+          {
+            "name":"左镇区",
+            "code":"710534"
+          },
+          {
+            "name":"仁德区",
+            "code":"710535"
+          },
+          {
+            "name":"归仁区",
+            "code":"710536"
+          },
+          {
+            "name":"关庙区",
+            "code":"710537"
+          },
+          {
+            "name":"龙崎区",
+            "code":"710538"
+          },
+          {
+            "name":"永康区",
+            "code":"710539"
+          }
+        ]
+      },
+      {
+        "name":"新竹市",
+        "code":"710600",
+        "sub":[
+          {
+            "name":"东区",
+            "code":"710601"
+          },
+          {
+            "name":"北区",
+            "code":"710602"
+          },
+          {
+            "name":"香山区",
+            "code":"710603"
+          }
+        ]
+      },
+      {
+        "name":"嘉义市",
+        "code":"710700",
+        "sub":[
+          {
+            "name":"东区",
+            "code":"710701"
+          },
+          {
+            "name":"西区",
+            "code":"710702"
+          }
+        ]
+      },
+      {
+        "name":"新北市",
+        "code":"710800",
+        "sub":[
+          {
+            "name":"板桥区",
+            "code":"710801"
+          },
+          {
+            "name":"三重区",
+            "code":"710802"
+          },
+          {
+            "name":"中和区",
+            "code":"710803"
+          },
+          {
+            "name":"永和区",
+            "code":"710804"
+          },
+          {
+            "name":"新庄区",
+            "code":"710805"
+          },
+          {
+            "name":"新店区",
+            "code":"710806"
+          },
+          {
+            "name":"树林区",
+            "code":"710807"
+          },
+          {
+            "name":"莺歌区",
+            "code":"710808"
+          },
+          {
+            "name":"三峡区",
+            "code":"710809"
+          },
+          {
+            "name":"淡水区",
+            "code":"710810"
+          },
+          {
+            "name":"汐止区",
+            "code":"710811"
+          },
+          {
+            "name":"瑞芳区",
+            "code":"710812"
+          },
+          {
+            "name":"土城区",
+            "code":"710813"
+          },
+          {
+            "name":"芦洲区",
+            "code":"710814"
+          },
+          {
+            "name":"五股区",
+            "code":"710815"
+          },
+          {
+            "name":"泰山区",
+            "code":"710816"
+          },
+          {
+            "name":"林口区",
+            "code":"710817"
+          },
+          {
+            "name":"深坑区",
+            "code":"710818"
+          },
+          {
+            "name":"石碇区",
+            "code":"710819"
+          },
+          {
+            "name":"坪林区",
+            "code":"710820"
+          },
+          {
+            "name":"三芝区",
+            "code":"710821"
+          },
+          {
+            "name":"石门区",
+            "code":"710822"
+          },
+          {
+            "name":"八里区",
+            "code":"710823"
+          },
+          {
+            "name":"平溪区",
+            "code":"710824"
+          },
+          {
+            "name":"双溪区",
+            "code":"710825"
+          },
+          {
+            "name":"贡寮区",
+            "code":"710826"
+          },
+          {
+            "name":"金山区",
+            "code":"710827"
+          },
+          {
+            "name":"万里区",
+            "code":"710828"
+          },
+          {
+            "name":"乌来区",
+            "code":"710829"
+          }
+        ]
+      },
+      {
+        "name":"宜兰县",
+        "code":"712200",
+        "sub":[
+          {
+            "name":"宜兰市",
+            "code":"712201"
+          },
+          {
+            "name":"罗东镇",
+            "code":"712221"
+          },
+          {
+            "name":"苏澳镇",
+            "code":"712222"
+          },
+          {
+            "name":"头城镇",
+            "code":"712223"
+          },
+          {
+            "name":"礁溪乡",
+            "code":"712224"
+          },
+          {
+            "name":"壮围乡",
+            "code":"712225"
+          },
+          {
+            "name":"员山乡",
+            "code":"712226"
+          },
+          {
+            "name":"冬山乡",
+            "code":"712227"
+          },
+          {
+            "name":"五结乡",
+            "code":"712228"
+          },
+          {
+            "name":"三星乡",
+            "code":"712229"
+          },
+          {
+            "name":"大同乡",
+            "code":"712230"
+          },
+          {
+            "name":"南澳乡",
+            "code":"712231"
+          }
+        ]
+      },
+      {
+        "name":"桃园县",
+        "code":"712300",
+        "sub":[
+          {
+            "name":"桃园市",
+            "code":"712301"
+          },
+          {
+            "name":"中坜市",
+            "code":"712302"
+          },
+          {
+            "name":"平镇市",
+            "code":"712303"
+          },
+          {
+            "name":"八德市",
+            "code":"712304"
+          },
+          {
+            "name":"杨梅市",
+            "code":"712305"
+          },
+          {
+            "name":"大溪镇",
+            "code":"712321"
+          },
+          {
+            "name":"芦竹乡",
+            "code":"712323"
+          },
+          {
+            "name":"大园乡",
+            "code":"712324"
+          },
+          {
+            "name":"龟山乡",
+            "code":"712325"
+          },
+          {
+            "name":"龙潭乡",
+            "code":"712327"
+          },
+          {
+            "name":"新屋乡",
+            "code":"712329"
+          },
+          {
+            "name":"观音乡",
+            "code":"712330"
+          },
+          {
+            "name":"复兴乡",
+            "code":"712331"
+          }
+        ]
+      },
+      {
+        "name":"新竹县",
+        "code":"712400",
+        "sub":[
+          {
+            "name":"竹北市",
+            "code":"712401"
+          },
+          {
+            "name":"竹东镇",
+            "code":"712421"
+          },
+          {
+            "name":"新埔镇",
+            "code":"712422"
+          },
+          {
+            "name":"关西镇",
+            "code":"712423"
+          },
+          {
+            "name":"湖口乡",
+            "code":"712424"
+          },
+          {
+            "name":"新丰乡",
+            "code":"712425"
+          },
+          {
+            "name":"芎林乡",
+            "code":"712426"
+          },
+          {
+            "name":"橫山乡",
+            "code":"712427"
+          },
+          {
+            "name":"北埔乡",
+            "code":"712428"
+          },
+          {
+            "name":"宝山乡",
+            "code":"712429"
+          },
+          {
+            "name":"峨眉乡",
+            "code":"712430"
+          },
+          {
+            "name":"尖石乡",
+            "code":"712431"
+          },
+          {
+            "name":"五峰乡",
+            "code":"712432"
+          }
+        ]
+      },
+      {
+        "name":"苗栗县",
+        "code":"712500",
+        "sub":[
+          {
+            "name":"苗栗市",
+            "code":"712501"
+          },
+          {
+            "name":"苑里镇",
+            "code":"712521"
+          },
+          {
+            "name":"通霄镇",
+            "code":"712522"
+          },
+          {
+            "name":"竹南镇",
+            "code":"712523"
+          },
+          {
+            "name":"头份镇",
+            "code":"712524"
+          },
+          {
+            "name":"后龙镇",
+            "code":"712525"
+          },
+          {
+            "name":"卓兰镇",
+            "code":"712526"
+          },
+          {
+            "name":"大湖乡",
+            "code":"712527"
+          },
+          {
+            "name":"公馆乡",
+            "code":"712528"
+          },
+          {
+            "name":"铜锣乡",
+            "code":"712529"
+          },
+          {
+            "name":"南庄乡",
+            "code":"712530"
+          },
+          {
+            "name":"头屋乡",
+            "code":"712531"
+          },
+          {
+            "name":"三义乡",
+            "code":"712532"
+          },
+          {
+            "name":"西湖乡",
+            "code":"712533"
+          },
+          {
+            "name":"造桥乡",
+            "code":"712534"
+          },
+          {
+            "name":"三湾乡",
+            "code":"712535"
+          },
+          {
+            "name":"狮潭乡",
+            "code":"712536"
+          },
+          {
+            "name":"泰安乡",
+            "code":"712537"
+          }
+        ]
+      },
+      {
+        "name":"彰化县",
+        "code":"712700",
+        "sub":[
+          {
+            "name":"彰化市",
+            "code":"712701"
+          },
+          {
+            "name":"鹿港镇",
+            "code":"712721"
+          },
+          {
+            "name":"和美镇",
+            "code":"712722"
+          },
+          {
+            "name":"线西乡",
+            "code":"712723"
+          },
+          {
+            "name":"伸港乡",
+            "code":"712724"
+          },
+          {
+            "name":"福兴乡",
+            "code":"712725"
+          },
+          {
+            "name":"秀水乡",
+            "code":"712726"
+          },
+          {
+            "name":"花坛乡",
+            "code":"712727"
+          },
+          {
+            "name":"芬园乡",
+            "code":"712728"
+          },
+          {
+            "name":"员林镇",
+            "code":"712729"
+          },
+          {
+            "name":"溪湖镇",
+            "code":"712730"
+          },
+          {
+            "name":"田中镇",
+            "code":"712731"
+          },
+          {
+            "name":"大村乡",
+            "code":"712732"
+          },
+          {
+            "name":"埔盐乡",
+            "code":"712733"
+          },
+          {
+            "name":"埔心乡",
+            "code":"712734"
+          },
+          {
+            "name":"永靖乡",
+            "code":"712735"
+          },
+          {
+            "name":"社头乡",
+            "code":"712736"
+          },
+          {
+            "name":"二水乡",
+            "code":"712737"
+          },
+          {
+            "name":"北斗镇",
+            "code":"712738"
+          },
+          {
+            "name":"二林镇",
+            "code":"712739"
+          },
+          {
+            "name":"田尾乡",
+            "code":"712740"
+          },
+          {
+            "name":"埤头乡",
+            "code":"712741"
+          },
+          {
+            "name":"芳苑乡",
+            "code":"712742"
+          },
+          {
+            "name":"大城乡",
+            "code":"712743"
+          },
+          {
+            "name":"竹塘乡",
+            "code":"712744"
+          },
+          {
+            "name":"溪州乡",
+            "code":"712745"
+          }
+        ]
+      },
+      {
+        "name":"南投县",
+        "code":"712800",
+        "sub":[
+          {
+            "name":"南投市",
+            "code":"712801"
+          },
+          {
+            "name":"埔里镇",
+            "code":"712821"
+          },
+          {
+            "name":"草屯镇",
+            "code":"712822"
+          },
+          {
+            "name":"竹山镇",
+            "code":"712823"
+          },
+          {
+            "name":"集集镇",
+            "code":"712824"
+          },
+          {
+            "name":"名间乡",
+            "code":"712825"
+          },
+          {
+            "name":"鹿谷乡",
+            "code":"712826"
+          },
+          {
+            "name":"中寮乡",
+            "code":"712827"
+          },
+          {
+            "name":"鱼池乡",
+            "code":"712828"
+          },
+          {
+            "name":"国姓乡",
+            "code":"712829"
+          },
+          {
+            "name":"水里乡",
+            "code":"712830"
+          },
+          {
+            "name":"信义乡",
+            "code":"712831"
+          },
+          {
+            "name":"仁爱乡",
+            "code":"712832"
+          }
+        ]
+      },
+      {
+        "name":"云林县",
+        "code":"712900",
+        "sub":[
+          {
+            "name":"斗六市",
+            "code":"712901"
+          },
+          {
+            "name":"斗南镇",
+            "code":"712921"
+          },
+          {
+            "name":"虎尾镇",
+            "code":"712922"
+          },
+          {
+            "name":"西螺镇",
+            "code":"712923"
+          },
+          {
+            "name":"土库镇",
+            "code":"712924"
+          },
+          {
+            "name":"北港镇",
+            "code":"712925"
+          },
+          {
+            "name":"古坑乡",
+            "code":"712926"
+          },
+          {
+            "name":"大埤乡",
+            "code":"712927"
+          },
+          {
+            "name":"莿桐乡",
+            "code":"712928"
+          },
+          {
+            "name":"林内乡",
+            "code":"712929"
+          },
+          {
+            "name":"二仑乡",
+            "code":"712930"
+          },
+          {
+            "name":"仑背乡",
+            "code":"712931"
+          },
+          {
+            "name":"麦寮乡",
+            "code":"712932"
+          },
+          {
+            "name":"东势乡",
+            "code":"712933"
+          },
+          {
+            "name":"褒忠乡",
+            "code":"712934"
+          },
+          {
+            "name":"台西乡",
+            "code":"712935"
+          },
+          {
+            "name":"元长乡",
+            "code":"712936"
+          },
+          {
+            "name":"四湖乡",
+            "code":"712937"
+          },
+          {
+            "name":"口湖乡",
+            "code":"712938"
+          },
+          {
+            "name":"水林乡",
+            "code":"712939"
+          }
+        ]
+      },
+      {
+        "name":"嘉义县",
+        "code":"713000",
+        "sub":[
+          {
+            "name":"太保市",
+            "code":"713001"
+          },
+          {
+            "name":"朴子市",
+            "code":"713002"
+          },
+          {
+            "name":"布袋镇",
+            "code":"713023"
+          },
+          {
+            "name":"大林镇",
+            "code":"713024"
+          },
+          {
+            "name":"民雄乡",
+            "code":"713025"
+          },
+          {
+            "name":"溪口乡",
+            "code":"713026"
+          },
+          {
+            "name":"新港乡",
+            "code":"713027"
+          },
+          {
+            "name":"六脚乡",
+            "code":"713028"
+          },
+          {
+            "name":"东石乡",
+            "code":"713029"
+          },
+          {
+            "name":"义竹乡",
+            "code":"713030"
+          },
+          {
+            "name":"鹿草乡",
+            "code":"713031"
+          },
+          {
+            "name":"水上乡",
+            "code":"713032"
+          },
+          {
+            "name":"中埔乡",
+            "code":"713033"
+          },
+          {
+            "name":"竹崎乡",
+            "code":"713034"
+          },
+          {
+            "name":"梅山乡",
+            "code":"713035"
+          },
+          {
+            "name":"番路乡",
+            "code":"713036"
+          },
+          {
+            "name":"大埔乡",
+            "code":"713037"
+          },
+          {
+            "name":"阿里山乡",
+            "code":"713038"
+          }
+        ]
+      },
+      {
+        "name":"屏东县",
+        "code":"713300",
+        "sub":[
+          {
+            "name":"屏东市",
+            "code":"713301"
+          },
+          {
+            "name":"潮州镇",
+            "code":"713321"
+          },
+          {
+            "name":"东港镇",
+            "code":"713322"
+          },
+          {
+            "name":"恒春镇",
+            "code":"713323"
+          },
+          {
+            "name":"万丹乡",
+            "code":"713324"
+          },
+          {
+            "name":"长治乡",
+            "code":"713325"
+          },
+          {
+            "name":"麟洛乡",
+            "code":"713326"
+          },
+          {
+            "name":"九如乡",
+            "code":"713327"
+          },
+          {
+            "name":"里港乡",
+            "code":"713328"
+          },
+          {
+            "name":"盐埔乡",
+            "code":"713329"
+          },
+          {
+            "name":"高树乡",
+            "code":"713330"
+          },
+          {
+            "name":"万峦乡",
+            "code":"713331"
+          },
+          {
+            "name":"内埔乡",
+            "code":"713332"
+          },
+          {
+            "name":"竹田乡",
+            "code":"713333"
+          },
+          {
+            "name":"新埤乡",
+            "code":"713334"
+          },
+          {
+            "name":"枋寮乡",
+            "code":"713335"
+          },
+          {
+            "name":"新园乡",
+            "code":"713336"
+          },
+          {
+            "name":"崁顶乡",
+            "code":"713337"
+          },
+          {
+            "name":"林边乡",
+            "code":"713338"
+          },
+          {
+            "name":"南州乡",
+            "code":"713339"
+          },
+          {
+            "name":"佳冬乡",
+            "code":"713340"
+          },
+          {
+            "name":"琉球乡",
+            "code":"713341"
+          },
+          {
+            "name":"车城乡",
+            "code":"713342"
+          },
+          {
+            "name":"满州乡",
+            "code":"713343"
+          },
+          {
+            "name":"枋山乡",
+            "code":"713344"
+          },
+          {
+            "name":"三地门乡",
+            "code":"713345"
+          },
+          {
+            "name":"雾台乡",
+            "code":"713346"
+          },
+          {
+            "name":"玛家乡",
+            "code":"713347"
+          },
+          {
+            "name":"泰武乡",
+            "code":"713348"
+          },
+          {
+            "name":"来义乡",
+            "code":"713349"
+          },
+          {
+            "name":"春日乡",
+            "code":"713350"
+          },
+          {
+            "name":"狮子乡",
+            "code":"713351"
+          },
+          {
+            "name":"牡丹乡",
+            "code":"713352"
+          }
+        ]
+      },
+      {
+        "name":"台东县",
+        "code":"713400",
+        "sub":[
+          {
+            "name":"台东市",
+            "code":"713401"
+          },
+          {
+            "name":"成功镇",
+            "code":"713421"
+          },
+          {
+            "name":"关山镇",
+            "code":"713422"
+          },
+          {
+            "name":"卑南乡",
+            "code":"713423"
+          },
+          {
+            "name":"鹿野乡",
+            "code":"713424"
+          },
+          {
+            "name":"池上乡",
+            "code":"713425"
+          },
+          {
+            "name":"东河乡",
+            "code":"713426"
+          },
+          {
+            "name":"长滨乡",
+            "code":"713427"
+          },
+          {
+            "name":"太麻里乡",
+            "code":"713428"
+          },
+          {
+            "name":"大武乡",
+            "code":"713429"
+          },
+          {
+            "name":"绿岛乡",
+            "code":"713430"
+          },
+          {
+            "name":"海端乡",
+            "code":"713431"
+          },
+          {
+            "name":"延平乡",
+            "code":"713432"
+          },
+          {
+            "name":"金峰乡",
+            "code":"713433"
+          },
+          {
+            "name":"达仁乡",
+            "code":"713434"
+          },
+          {
+            "name":"兰屿乡",
+            "code":"713435"
+          }
+        ]
+      },
+      {
+        "name":"花莲县",
+        "code":"713500",
+        "sub":[
+          {
+            "name":"花莲市",
+            "code":"713501"
+          },
+          {
+            "name":"凤林镇",
+            "code":"713521"
+          },
+          {
+            "name":"玉里镇",
+            "code":"713522"
+          },
+          {
+            "name":"新城乡",
+            "code":"713523"
+          },
+          {
+            "name":"吉安乡",
+            "code":"713524"
+          },
+          {
+            "name":"寿丰乡",
+            "code":"713525"
+          },
+          {
+            "name":"光复乡",
+            "code":"713526"
+          },
+          {
+            "name":"丰滨乡",
+            "code":"713527"
+          },
+          {
+            "name":"瑞穗乡",
+            "code":"713528"
+          },
+          {
+            "name":"富里乡",
+            "code":"713529"
+          },
+          {
+            "name":"秀林乡",
+            "code":"713530"
+          },
+          {
+            "name":"万荣乡",
+            "code":"713531"
+          },
+          {
+            "name":"卓溪乡",
+            "code":"713532"
+          }
+        ]
+      },
+      {
+        "name":"澎湖县",
+        "code":"713600",
+        "sub":[
+          {
+            "name":"马公市",
+            "code":"713601"
+          },
+          {
+            "name":"湖西乡",
+            "code":"713621"
+          },
+          {
+            "name":"白沙乡",
+            "code":"713622"
+          },
+          {
+            "name":"西屿乡",
+            "code":"713623"
+          },
+          {
+            "name":"望安乡",
+            "code":"713624"
+          },
+          {
+            "name":"七美乡",
+            "code":"713625"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "name":"香港特别行政区",
+    "code":"810000",
+    "sub":[
+      {
+        "name":"香港岛",
+        "code":"810100",
+        "sub":[
+          {
+            "name":"中西区",
+            "code":"810101"
+          },
+          {
+            "name":"湾仔区",
+            "code":"810102"
+          },
+          {
+            "name":"东区",
+            "code":"810103"
+          },
+          {
+            "name":"南区",
+            "code":"810104"
+          }
+        ]
+      },
+      {
+        "name":"九龙",
+        "code":"810200",
+        "sub":[
+          {
+            "name":"油尖旺区",
+            "code":"810201"
+          },
+          {
+            "name":"深水埗区",
+            "code":"810202"
+          },
+          {
+            "name":"九龙城区",
+            "code":"810203"
+          },
+          {
+            "name":"黄大仙区",
+            "code":"810204"
+          },
+          {
+            "name":"观塘区",
+            "code":"810205"
+          }
+        ]
+      },
+      {
+        "name":"新界",
+        "code":"810300",
+        "sub":[
+          {
+            "name":"荃湾区",
+            "code":"810301"
+          },
+          {
+            "name":"屯门区",
+            "code":"810302"
+          },
+          {
+            "name":"元朗区",
+            "code":"810303"
+          },
+          {
+            "name":"北区",
+            "code":"810304"
+          },
+          {
+            "name":"大埔区",
+            "code":"810305"
+          },
+          {
+            "name":"西贡区",
+            "code":"810306"
+          },
+          {
+            "name":"沙田区",
+            "code":"810307"
+          },
+          {
+            "name":"葵青区",
+            "code":"810308"
+          },
+          {
+            "name":"离岛区",
+            "code":"810309"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "name":"澳门特别行政区",
+    "code":"820000",
+    "sub":[
+      {
+        "name":"澳门半岛",
+        "code":"820100",
+        "sub":[
+          {
+            "name":"花地玛堂区",
+            "code":"820101"
+          },
+          {
+            "name":"圣安多尼堂区",
+            "code":"820102"
+          },
+          {
+            "name":"大堂区",
+            "code":"820103"
+          },
+          {
+            "name":"望德堂区",
+            "code":"820104"
+          },
+          {
+            "name":"风顺堂区",
+            "code":"820105"
+          }
+        ]
+      },
+      {
+        "name":"氹仔岛",
+        "code":"820200",
+        "sub":[
+          {
+            "name":"嘉模堂区",
+            "code":"820201"
+          }
+        ]
+      },
+      {
+        "name":"路环岛",
+        "code":"820300",
+        "sub":[
+          {
+            "name":"圣方济各堂区",
+            "code":"820301"
+          }
+        ]
+      }
+    ]
+  }
+
+];
+}($);
+// jshint ignore: end
+
+/* global $:true */
+/* jshint unused:false*/
+
++ function($) {
+  "use strict";
+
+  var defaults;
+  var raw = $.rawCitiesData;
+
+  var format = function(data) {
+    var result = [];
+    for(var i=0;i<data.length;i++) {
+      var d = data[i];
+      if(/^请选择|市辖区/.test(d.name)) continue;
+      result.push(d);
+    }
+    if(result.length) return result;
+    return [];
+  };
+
+  var sub = function(data) {
+    if(!data.sub) return [{ name: '', code: data.code }];  // 有可能某些县级市没有区
+    return format(data.sub);
+  };
+
+  var getCities = function(d) {
+    for(var i=0;i< raw.length;i++) {
+      if(raw[i].code === d || raw[i].name === d) return sub(raw[i]);
+    }
+    return [];
+  };
+
+  var getDistricts = function(p, c) {
+    for(var i=0;i< raw.length;i++) {
+      if(raw[i].code === p || raw[i].name === p) {
+        for(var j=0;j< raw[i].sub.length;j++) {
+          if(raw[i].sub[j].code === c || raw[i].sub[j].name === c) {
+            return sub(raw[i].sub[j]);
+          }
+        }
+      }
+    }
+  };
+
+  var parseInitValue = function (val) {
+    var p = raw[0], c, d;
+    var tokens = val.split(' ');
+    raw.map(function (t) {
+      if (t.name === tokens[0]) p = t;
+    });
+
+    p.sub.map(function (t) {
+      if (t.name === tokens[1]) c = t;
+    })
+
+    if (tokens[2]) {
+      c.sub.map(function (t) {
+        if (t.name === tokens[2]) d = t;
+      })
+    }
+
+    if (d) return [p.code, c.code, d.code];
+    return [p.code, c.code];
+  }
+
+  $.fn.cityPicker = function(params) {
+    params = $.extend({}, defaults, params);
+    return this.each(function() {
+      var self = this;
+      
+      var provincesName = raw.map(function(d) {
+        return d.name;
+      });
+      var provincesCode = raw.map(function(d) {
+        return d.code;
+      });
+      var initCities = sub(raw[0]);
+      var initCitiesName = initCities.map(function (c) {
+        return c.name;
+      });
+      var initCitiesCode = initCities.map(function (c) {
+        return c.code;
+      });
+      var initDistricts = sub(raw[0].sub[0]);
+
+      var initDistrictsName = initDistricts.map(function (c) {
+        return c.name;
+      });
+      var initDistrictsCode = initDistricts.map(function (c) {
+        return c.code;
+      });
+
+      var currentProvince = provincesName[0];
+      var currentCity = initCitiesName[0];
+      var currentDistrict = initDistrictsName[0];
+
+      var cols = [
+          {
+            displayValues: provincesName,
+            values: provincesCode,
+            cssClass: "col-province"
+          },
+          {
+            displayValues: initCitiesName,
+            values: initCitiesCode,
+            cssClass: "col-city"
+          }
+        ];
+
+        if(params.showDistrict) cols.push({
+          values: initDistrictsCode,
+          displayValues: initDistrictsName,
+          cssClass: "col-district"
+        });
+
+      var config = {
+
+        cssClass: "city-picker",
+        rotateEffect: false,  //为了性能
+        formatValue: function (p, values, displayValues) {
+          return displayValues.join(' ');
+        },
+        onChange: function (picker, values, displayValues) {
+          var newProvince = picker.cols[0].displayValue;
+          var newCity;
+          if(newProvince !== currentProvince) {
+            var newCities = getCities(newProvince);
+            newCity = newCities[0].name;
+            var newDistricts = getDistricts(newProvince, newCity);
+            picker.cols[1].replaceValues(newCities.map(function (c) {
+              return c.code;
+            }), newCities.map(function (c) {
+              return c.name;
+            }));
+            if(params.showDistrict) picker.cols[2].replaceValues(newDistricts.map(function (d) {
+              return d.code;
+            }), newDistricts.map(function (d) {
+              return d.name;
+            }));
+            currentProvince = newProvince;
+            currentCity = newCity;
+            picker.updateValue();
+            return false; // 因为数据未更新完，所以这里不进行后序的值的处理
+          } else {
+            if(params.showDistrict) {
+              newCity = picker.cols[1].displayValue;
+              if(newCity !== currentCity) {
+                var districts = getDistricts(newProvince, newCity);
+                picker.cols[2].replaceValues(districts.map(function (d) {
+                  return d.code;
+                }), districts.map(function (d) {
+                  return d.name;
+                }));
+                currentCity = newCity;
+                picker.updateValue();
+                return false; // 因为数据未更新完，所以这里不进行后序的值的处理
+              }
+            }
+          }
+          //如果最后一列是空的，那么取倒数第二列
+          var len = (values[values.length-1] ? values.length - 1 : values.length - 2)
+          $(self).attr('data-code', values[len]);
+          $(self).attr('data-codes', values.join(','));
+          if (params.onChange) {
+            params.onChange.call(self, picker, values, displayValues);
+          }
+        },
+
+        cols: cols
+      };
+
+      if(!this) return;
+      var p = $.extend({}, params, config);
+      //计算value
+      var val = $(this).val();
+      if (!val) val = '北京 北京市 东城区';
+      currentProvince = val.split(" ")[0];
+      currentCity = val.split(" ")[1];
+      currentDistrict= val.split(" ")[2];
+      if(val) {
+        p.value = parseInitValue(val);
+        if(p.value[0]) {
+          var cities = getCities(p.value[0]);
+          p.cols[1].values = cities.map(function (c) {
+            return c.code;
+          });
+          p.cols[1].displayValues = cities.map(function (c) {
+            return c.name;
+          });
+        }
+
+        if(p.value[1]) {
+          if (params.showDistrict) {
+            var dis = getDistricts(p.value[0], p.value[1]);
+            p.cols[2].values = dis.map(function (d) {
+              return d.code;
+            });
+            p.cols[2].displayValues = dis.map(function (d) {
+              return d.name;
+            });
+          }
+        } else {
+          if (params.showDistrict) {
+            var dis = getDistricts(p.value[0], p.cols[1].values[0]);
+            p.cols[2].values = dis.map(function (d) {
+              return d.code;
+            });
+            p.cols[2].displayValues = dis.map(function (d) {
+              return d.name;
+            });
+          }
+        }
+      }
+      $(this).picker(p);
+    });
+  };
+
+  defaults = $.fn.cityPicker.prototype.defaults = {
+    showDistrict: true //是否显示地区选择
+  };
+
+}($);
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/common/h5.js b/pluss-wap-page/src/main/resources/static/resources/js/common/h5.js
new file mode 100644
index 0000000..281adb8
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/common/h5.js
@@ -0,0 +1,90 @@
+/* === 判断支持版本 start === */
+(function () {
+    var viewportTag = null;
+    var metaTags = document.getElementsByTagName('meta');
+    for (var i = 0; i < metaTags.length; i++) {
+        if (metaTags[i].getAttribute('name') === "viewport") {
+            viewportTag = metaTags[i];
+            break;
+        }
+    }
+    if (!viewportTag) {
+        viewportTag = document.createElement("meta");
+        viewportTag.setAttribute('name', 'viewport');
+    }
+
+    var viewportTagContent =
+        'width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no';
+
+    // Detect if iOS device
+    if (/(iPhone|iPod|iPad)/i.test(window.navigator.userAgent)) {
+        // Get iOS major version
+        var iosVersion = parseInt((window.navigator.userAgent).match(/OS (\d+)_(\d+)_?(\d+)? like Mac OS X/i)[1]);
+        // Detect if device is running >iOS 11
+        // iOS 11's UIWebView and WKWebView changes the viewport behaviour to render viewport without the status bar. Need to override with "viewport-fit: cover" to include the status bar.
+        if (iosVersion >= 11) {
+            viewportTagContent += ', viewport-fit=cover';
+        }
+    }
+
+    // Update viewport tag attribute
+    viewportTag.setAttribute('content', viewportTagContent);
+})();
+/* === 判断支持版本 end === */
+
+// refs http://www.html-js.com/article/3041 移动端高清、多屏适配方案
+!function (a, b) {
+    function c() {
+        var b = f.getBoundingClientRect().width;
+        b / i > 540 && (b = 540 * i);
+        var c = b / 10;
+        f.style.fontSize = c + "px", k.rem = a.rem = c
+    }
+    var d, e = a.document,
+        f = e.documentElement,
+        g = e.querySelector('meta[name="viewport"]'),
+        h = e.querySelector('meta[name="flexible"]'),
+        i = 0,
+        j = 0,
+        k = b.flexible || (b.flexible = {});
+    if (g) {
+        var l = g.getAttribute("content").match(/initial\-scale=([\d\.]+)/);
+        l && (j = parseFloat(l[1]), i = parseInt(1 / j))
+    } else if (h) {
+        var m = h.getAttribute("content");
+        if (m) {
+            var n = m.match(/initial\-dpr=([\d\.]+)/),
+                o = m.match(/maximum\-dpr=([\d\.]+)/);
+            n && (i = parseFloat(n[1]), j = parseFloat((1 / i).toFixed(2))), o && (i = parseFloat(o[1]), j = parseFloat((
+                1 / i).toFixed(2)))
+        }
+    }
+    if (!i && !j) {
+        var p = (a.navigator.appVersion.match(/android/gi), a.navigator.appVersion.match(/iphone/gi)),
+            q = a.devicePixelRatio;
+        i = p ? q >= 3 && (!i || i >= 3) ? 3 : q >= 2 && (!i || i >= 2) ? 2 : 1 : 1, j = 1 / i
+    }
+    if (f.setAttribute("data-dpr", i), !g)
+        if (g = e.createElement("meta"), g.setAttribute("name", "viewport"), g.setAttribute("content",
+            "initial-scale=" + j + ", maximum-scale=" + j + ", minimum-scale=" + j + ", user-scalable=no"), f
+            .firstElementChild) f.firstElementChild.appendChild(g);
+        else {
+            var r = e.createElement("div");
+            r.appendChild(g), e.write(r.innerHTML)
+        }
+    a.addEventListener("resize", function () {
+        clearTimeout(d), d = setTimeout(c, 300)
+    }, !1), a.addEventListener("pageshow", function (a) {
+        a.persisted && (clearTimeout(d), d = setTimeout(c, 300))
+    }, !1), "complete" === e.readyState ? e.body.style.fontSize = 12 * i + "px" : e.addEventListener(
+        "DOMContentLoaded",
+        function () {
+            e.body.style.fontSize = 12 * i + "px"
+        }, !1), c(), k.dpr = a.dpr = i, k.refreshRem = c, k.rem2px = function (a) {
+        var b = parseFloat(a) * this.rem;
+        return "string" == typeof a && a.match(/rem$/) && (b += "px"), b
+    }, k.px2rem = function (a) {
+        var b = parseFloat(a) / this.rem;
+        return "string" == typeof a && a.match(/px$/) && (b += "rem"), b
+    }
+}(window, window.lib || (window.lib = {}));
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/consumeLog/consumeLog.js b/pluss-wap-page/src/main/resources/static/resources/js/consumeLog/consumeLog.js
new file mode 100644
index 0000000..7a7cb49
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/consumeLog/consumeLog.js
@@ -0,0 +1,81 @@
+var pageIndex=1;
+$(document).ready(function(){
+	//调用查询
+	pageIndex=StringUtil.getQueryString('pageIndex');
+	if(pageIndex==undefined||pageIndex==null){
+		pageIndex=1;
+	}
+	queryConsumeLog(pageIndex);
+});
+
+function queryConsumeLog(index){
+	if(typeof(index)=='undefined'){
+		index=1;
+	}
+	 $.ajax({
+         url:ctx+'/vip/goConsumeLog',
+         data:{
+            "currPage":index,
+            "memberCode":$("#memberCode").val(),
+            "storeId":$("#storeId").val(),
+         },
+         dataType:"json",
+         type:"post",
+         success:function(result){
+        	 $('#data_content').empty();
+         	 var data='';
+        	 $.each(result.merchantMenberComsumeList,function(i){
+        		 var merchantMenberComsume=result.merchantMenberComsumeList[i];
+        		 var createDt='';
+        		 if(StringUtil.isNotBlank(merchantMenberComsume.createDt)){
+        			 createDt=new Date(merchantMenberComsume.createDt).toYYYYMMDDHHMMSS();
+        		 }
+         		data+='<div class="weui-flex pt10 pb10 bdbe">';
+         	    data+='<div class="ml10"><img src="'+ctx+'/resources/images/bg.png" class="dlblock fc radiusp50 vm" width="45" height="45"/></div>';
+         	    data+=' <div class="weui-flex__item">';
+         	    data+=' <div class="mb10 f16 tleft ml10 f-black">'+merchantMenberComsume.nickName+'</div>';
+         	    data+='<div class="f14 ml10">'+createDt+'</div>';
+         	    data+='</div>';
+         	    data+='<div class="mr10 f16 tright pt10 f-black">-'+merchantMenberComsume.comsumeMoney+'</div>';
+         	    data+='</div>';
+        	 });
+        	 $('#data_content').append(data);
+         }
+      })
+}
+
+function queryConsumeLog2(index){
+	if(typeof(index)=='undefined'){
+		index=1;
+	}
+	 $.ajax({
+         url:ctx+'/vip/goConsumeLog',
+         data:{
+            "currPage":index,
+            "memberCode":$("#memberCode").val(),
+            "storeId":$("#storeId").val(),
+         },
+         dataType:"json",
+         type:"post",
+         success:function(result){
+        	 var data='';
+        	 $.each(result.merchantMenberComsumeList,function(i){
+        		 var merchantMenberComsume=result.merchantMenberComsumeList[i];
+        		 var createDt='';
+        		 if(StringUtil.isNotBlank(merchantMenberComsume.createDt)){
+        			 createDt=new Date(merchantMenberComsume.createDt).toYYYYMMDDHHMMSS();
+        		 }
+         		data+='<div class="weui-flex pt10 pb10 bdbe">';
+         	    data+='<div class="ml10"><img src="'+ctx+'/resources/images/bg.png" class="dlblock fc radiusp50 vm" width="45" height="45"/></div>';
+         	    data+=' <div class="weui-flex__item">';
+         	    data+=' <div class="mb10 f16 tleft ml10 f-black">'+merchantMenberComsume.nickName+'</div>';
+         	    data+='<div class="f14 ml10">'+createDt+'</div>';
+         	    data+='</div>';
+         	    data+='<div class="mr10 f16 tright pt10 f-black">-'+merchantMenberComsume.comsumeMoney+'</div>';
+         	    data+='</div>';
+        	 });
+        	 $('#data_content').append(data);
+         }
+      })
+}
+
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/easyUploader.jq.js b/pluss-wap-page/src/main/resources/static/resources/js/easyUploader.jq.js
new file mode 100644
index 0000000..062eceb
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/easyUploader.jq.js
@@ -0,0 +1,4591 @@
+/**
+ * @author  funnyque@163.com (github:https://github.com/funnyque/easyUpload.js) (qq:1016981640)
+ * @param   configs(required)
+ * @return  Xhr object
+ * @version 2.0.4
+ * @description js小文件上传插件，支持多文件上传、批量上传及混合上传
+ */
+;
+(function(window, document) {
+	/*! jQuery v3.3.1 | (c) JS Foundation and other contributors | jquery.org/license */
+	! function(e, t) {
+		"object" == typeof module && "object" == typeof module.exports ? module.exports = e.document ? t(e, !0) : function(e) {
+			if (!e.document) {
+				throw new Error("jQuery requires a window with a document")
+			}
+			return t(e)
+		} : t(e)
+	}("undefined" != typeof window ? window : this, function(e, t) {
+		var n = [],
+			r = e.document,
+			i = Object.getPrototypeOf,
+			o = n.slice,
+			a = n.concat,
+			s = n.push,
+			u = n.indexOf,
+			l = {},
+			c = l.toString,
+			f = l.hasOwnProperty,
+			p = f.toString,
+			d = p.call(Object),
+			h = {},
+			g = function e(t) {
+				return "function" == typeof t && "number" != typeof t.nodeType
+			},
+			y = function e(t) {
+				return null != t && t === t.window
+			},
+			v = {
+				type: !0,
+				src: !0,
+				noModule: !0
+			};
+
+		function m(e, t, n) {
+			var i, o = (t = t || r).createElement("script");
+			if (o.text = e, n) {
+				for (i in v) {
+					n[i] && (o[i] = n[i])
+				}
+			}
+			t.head.appendChild(o).parentNode.removeChild(o)
+		}
+
+		function x(e) {
+			return null == e ? e + "" : "object" == typeof e || "function" == typeof e ? l[c.call(e)] || "object" : typeof e
+		}
+		var b = "3.3.1",
+			w = function(e, t) {
+				return new w.fn.init(e, t)
+			},
+			T = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;
+		w.fn = w.prototype = {
+			jquery: "3.3.1",
+			constructor: w,
+			length: 0,
+			toArray: function() {
+				return o.call(this)
+			},
+			get: function(e) {
+				return null == e ? o.call(this) : e < 0 ? this[e + this.length] : this[e]
+			},
+			pushStack: function(e) {
+				var t = w.merge(this.constructor(), e);
+				return t.prevObject = this, t
+			},
+			each: function(e) {
+				return w.each(this, e)
+			},
+			map: function(e) {
+				return this.pushStack(w.map(this, function(t, n) {
+					return e.call(t, n, t)
+				}))
+			},
+			slice: function() {
+				return this.pushStack(o.apply(this, arguments))
+			},
+			first: function() {
+				return this.eq(0)
+			},
+			last: function() {
+				return this.eq(-1)
+			},
+			eq: function(e) {
+				var t = this.length,
+					n = +e + (e < 0 ? t : 0);
+				return this.pushStack(n >= 0 && n < t ? [this[n]] : [])
+			},
+			end: function() {
+				return this.prevObject || this.constructor()
+			},
+			push: s,
+			sort: n.sort,
+			splice: n.splice
+		}, w.extend = w.fn.extend = function() {
+			var e, t, n, r, i, o, a = arguments[0] || {},
+				s = 1,
+				u = arguments.length,
+				l = !1;
+			for ("boolean" == typeof a && (l = a, a = arguments[s] || {}, s++), "object" == typeof a || g(a) || (a = {}), s ===
+				u && (a = this, s--); s < u; s++) {
+				if (null != (e = arguments[s])) {
+					for (t in e) {
+						n = a[t], a !== (r = e[t]) && (l && r && (w.isPlainObject(r) || (i = Array.isArray(r))) ? (i ? (i = !1, o = n &&
+								Array.isArray(n) ? n : []) : o = n && w.isPlainObject(n) ? n : {}, a[t] = w.extend(l, o, r)) : void 0 !==
+							r && (a[t] = r))
+					}
+				}
+			}
+			return a
+		}, w.extend({
+			expando: "jQuery" + ("3.3.1" + Math.random()).replace(/\D/g, ""),
+			isReady: !0,
+			error: function(e) {
+				throw new Error(e)
+			},
+			noop: function() {},
+			isPlainObject: function(e) {
+				var t, n;
+				return !(!e || "[object Object]" !== c.call(e)) && (!(t = i(e)) || "function" == typeof(n = f.call(t,
+					"constructor") && t.constructor) && p.call(n) === d)
+			},
+			isEmptyObject: function(e) {
+				var t;
+				for (t in e) {
+					return !1
+				}
+				return !0
+			},
+			globalEval: function(e) {
+				m(e)
+			},
+			each: function(e, t) {
+				var n, r = 0;
+				if (C(e)) {
+					for (n = e.length; r < n; r++) {
+						if (!1 === t.call(e[r], r, e[r])) {
+							break
+						}
+					}
+				} else {
+					for (r in e) {
+						if (!1 === t.call(e[r], r, e[r])) {
+							break
+						}
+					}
+				}
+				return e
+			},
+			trim: function(e) {
+				return null == e ? "" : (e + "").replace(T, "")
+			},
+			makeArray: function(e, t) {
+				var n = t || [];
+				return null != e && (C(Object(e)) ? w.merge(n, "string" == typeof e ? [e] : e) : s.call(n, e)), n
+			},
+			inArray: function(e, t, n) {
+				return null == t ? -1 : u.call(t, e, n)
+			},
+			merge: function(e, t) {
+				for (var n = +t.length, r = 0, i = e.length; r < n; r++) {
+					e[i++] = t[r]
+				}
+				return e.length = i, e
+			},
+			grep: function(e, t, n) {
+				for (var r, i = [], o = 0, a = e.length, s = !n; o < a; o++) {
+					(r = !t(e[o], o)) !== s && i.push(e[o])
+				}
+				return i
+			},
+			map: function(e, t, n) {
+				var r, i, o = 0,
+					s = [];
+				if (C(e)) {
+					for (r = e.length; o < r; o++) {
+						null != (i = t(e[o], o, n)) && s.push(i)
+					}
+				} else {
+					for (o in e) {
+						null != (i = t(e[o], o, n)) && s.push(i)
+					}
+				}
+				return a.apply([], s)
+			},
+			guid: 1,
+			support: h
+		}), "function" == typeof Symbol && (w.fn[Symbol.iterator] = n[Symbol.iterator]), w.each(
+			"Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),
+			function(e, t) {
+				l["[object " + t + "]"] = t.toLowerCase()
+			});
+
+		function C(e) {
+			var t = !!e && "length" in e && e.length,
+				n = x(e);
+			return !g(e) && !y(e) && ("array" === n || 0 === t || "number" == typeof t && t > 0 && t - 1 in e)
+		}
+		var E = function(e) {
+			var t, n, r, i, o, a, s, u, l, c, f, p, d, h, g, y, v, m, x, b = "sizzle" + 1 * new Date,
+				w = e.document,
+				T = 0,
+				C = 0,
+				E = ae(),
+				k = ae(),
+				S = ae(),
+				D = function(e, t) {
+					return e === t && (f = !0), 0
+				},
+				N = {}.hasOwnProperty,
+				A = [],
+				j = A.pop,
+				q = A.push,
+				L = A.push,
+				H = A.slice,
+				O = function(e, t) {
+					for (var n = 0, r = e.length; n < r; n++) {
+						if (e[n] === t) {
+							return n
+						}
+					}
+					return -1
+				},
+				P =
+				"checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",
+				M = "[\\x20\\t\\r\\n\\f]",
+				R = "(?:\\\\.|[\\w-]|[^\0-\\xa0])+",
+				I = "\\[" + M + "*(" + R + ")(?:" + M + "*([*^$|!~]?=)" + M +
+				"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|(" + R + "))|)" + M + "*\\]",
+				W = ":(" + R + ")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|" + I +
+				")*)|.*)\\)|)",
+				$ = new RegExp(M + "+", "g"),
+				B = new RegExp("^" + M + "+|((?:^|[^\\\\])(?:\\\\.)*)" + M + "+$", "g"),
+				F = new RegExp("^" + M + "*," + M + "*"),
+				_ = new RegExp("^" + M + "*([>+~]|" + M + ")" + M + "*"),
+				z = new RegExp("=" + M + "*([^\\]'\"]*?)" + M + "*\\]", "g"),
+				X = new RegExp(W),
+				U = new RegExp("^" + R + "$"),
+				V = {
+					ID: new RegExp("^#(" + R + ")"),
+					CLASS: new RegExp("^\\.(" + R + ")"),
+					TAG: new RegExp("^(" + R + "|[*])"),
+					ATTR: new RegExp("^" + I),
+					PSEUDO: new RegExp("^" + W),
+					CHILD: new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" + M + "*(even|odd|(([+-]|)(\\d*)n|)" +
+						M + "*(?:([+-]|)" + M + "*(\\d+)|))" + M + "*\\)|)", "i"),
+					bool: new RegExp("^(?:" + P + ")$", "i"),
+					needsContext: new RegExp("^" + M + "*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" + M + "*((?:-\\d)?\\d*)" +
+						M + "*\\)|)(?=[^-]|$)", "i")
+				},
+				G = /^(?:input|select|textarea|button)$/i,
+				Y = /^h\d$/i,
+				Q = /^[^{]+\{\s*\[native \w/,
+				J = /^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,
+				K = /[+~]/,
+				Z = new RegExp("\\\\([\\da-f]{1,6}" + M + "?|(" + M + ")|.)", "ig"),
+				ee = function(e, t, n) {
+					var r = "0x" + t - 65536;
+					return r !== r || n ? t : r < 0 ? String.fromCharCode(r + 65536) : String.fromCharCode(r >> 10 | 55296, 1023 &
+						r | 56320)
+				},
+				te = /([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,
+				ne = function(e, t) {
+					return t ? "\0" === e ? "\ufffd" : e.slice(0, -1) + "\\" + e.charCodeAt(e.length - 1).toString(16) + " " : "\\" +
+						e
+				},
+				re = function() {
+					p()
+				},
+				ie = me(function(e) {
+					return !0 === e.disabled && ("form" in e || "label" in e)
+				}, {
+					dir: "parentNode",
+					next: "legend"
+				});
+			try {
+				L.apply(A = H.call(w.childNodes), w.childNodes), A[w.childNodes.length].nodeType
+			} catch (e) {
+				L = {
+					apply: A.length ? function(e, t) {
+						q.apply(e, H.call(t))
+					} : function(e, t) {
+						var n = e.length,
+							r = 0;
+						while (e[n++] = t[r++]) {}
+						e.length = n - 1
+					}
+				}
+			}
+
+			function oe(e, t, r, i) {
+				var o, s, l, c, f, h, v, m = t && t.ownerDocument,
+					T = t ? t.nodeType : 9;
+				if (r = r || [], "string" != typeof e || !e || 1 !== T && 9 !== T && 11 !== T) {
+					return r
+				}
+				if (!i && ((t ? t.ownerDocument || t : w) !== d && p(t), t = t || d, g)) {
+					if (11 !== T && (f = J.exec(e))) {
+						if (o = f[1]) {
+							if (9 === T) {
+								if (!(l = t.getElementById(o))) {
+									return r
+								}
+								if (l.id === o) {
+									return r.push(l), r
+								}
+							} else {
+								if (m && (l = m.getElementById(o)) && x(t, l) && l.id === o) {
+									return r.push(l), r
+								}
+							}
+						} else {
+							if (f[2]) {
+								return L.apply(r, t.getElementsByTagName(e)), r
+							}
+							if ((o = f[3]) && n.getElementsByClassName && t.getElementsByClassName) {
+								return L.apply(r, t.getElementsByClassName(o)), r
+							}
+						}
+					}
+					if (n.qsa && !S[e + " "] && (!y || !y.test(e))) {
+						if (1 !== T) {
+							m = t, v = e
+						} else {
+							if ("object" !== t.nodeName.toLowerCase()) {
+								(c = t.getAttribute("id")) ? c = c.replace(te, ne): t.setAttribute("id", c = b), s = (h = a(e)).length;
+								while (s--) {
+									h[s] = "#" + c + " " + ve(h[s])
+								}
+								v = h.join(","), m = K.test(e) && ge(t.parentNode) || t
+							}
+						}
+						if (v) {
+							try {
+								return L.apply(r, m.querySelectorAll(v)), r
+							} catch (e) {} finally {
+								c === b && t.removeAttribute("id")
+							}
+						}
+					}
+				}
+				return u(e.replace(B, "$1"), t, r, i)
+			}
+
+			function ae() {
+				var e = [];
+
+				function t(n, i) {
+					return e.push(n + " ") > r.cacheLength && delete t[e.shift()], t[n + " "] = i
+				}
+				return t
+			}
+
+			function se(e) {
+				return e[b] = !0, e
+			}
+
+			function ue(e) {
+				var t = d.createElement("fieldset");
+				try {
+					return !!e(t)
+				} catch (e) {
+					return !1
+				} finally {
+					t.parentNode && t.parentNode.removeChild(t), t = null
+				}
+			}
+
+			function le(e, t) {
+				var n = e.split("|"),
+					i = n.length;
+				while (i--) {
+					r.attrHandle[n[i]] = t
+				}
+			}
+
+			function ce(e, t) {
+				var n = t && e,
+					r = n && 1 === e.nodeType && 1 === t.nodeType && e.sourceIndex - t.sourceIndex;
+				if (r) {
+					return r
+				}
+				if (n) {
+					while (n = n.nextSibling) {
+						if (n === t) {
+							return -1
+						}
+					}
+				}
+				return e ? 1 : -1
+			}
+
+			function fe(e) {
+				return function(t) {
+					return "input" === t.nodeName.toLowerCase() && t.type === e
+				}
+			}
+
+			function pe(e) {
+				return function(t) {
+					var n = t.nodeName.toLowerCase();
+					return ("input" === n || "button" === n) && t.type === e
+				}
+			}
+
+			function de(e) {
+				return function(t) {
+					return "form" in t ? t.parentNode && !1 === t.disabled ? "label" in t ? "label" in t.parentNode ? t.parentNode
+						.disabled === e : t.disabled === e : t.isDisabled === e || t.isDisabled !== !e && ie(t) === e : t.disabled ===
+						e : "label" in t && t.disabled === e
+				}
+			}
+
+			function he(e) {
+				return se(function(t) {
+					return t = +t, se(function(n, r) {
+						var i, o = e([], n.length, t),
+							a = o.length;
+						while (a--) {
+							n[i = o[a]] && (n[i] = !(r[i] = n[i]))
+						}
+					})
+				})
+			}
+
+			function ge(e) {
+				return e && "undefined" != typeof e.getElementsByTagName && e
+			}
+			n = oe.support = {}, o = oe.isXML = function(e) {
+				var t = e && (e.ownerDocument || e).documentElement;
+				return !!t && "HTML" !== t.nodeName
+			}, p = oe.setDocument = function(e) {
+				var t, i, a = e ? e.ownerDocument || e : w;
+				return a !== d && 9 === a.nodeType && a.documentElement ? (d = a, h = d.documentElement, g = !o(d), w !== d &&
+					(i = d.defaultView) && i.top !== i && (i.addEventListener ? i.addEventListener("unload", re, !1) : i.attachEvent &&
+						i.attachEvent("onunload", re)), n.attributes = ue(function(e) {
+						return e.className = "i", !e.getAttribute("className")
+					}), n.getElementsByTagName = ue(function(e) {
+						return e.appendChild(d.createComment("")), !e.getElementsByTagName("*").length
+					}), n.getElementsByClassName = Q.test(d.getElementsByClassName), n.getById = ue(function(e) {
+						return h.appendChild(e).id = b, !d.getElementsByName || !d.getElementsByName(b).length
+					}), n.getById ? (r.filter.ID = function(e) {
+						var t = e.replace(Z, ee);
+						return function(e) {
+							return e.getAttribute("id") === t
+						}
+					}, r.find.ID = function(e, t) {
+						if ("undefined" != typeof t.getElementById && g) {
+							var n = t.getElementById(e);
+							return n ? [n] : []
+						}
+					}) : (r.filter.ID = function(e) {
+						var t = e.replace(Z, ee);
+						return function(e) {
+							var n = "undefined" != typeof e.getAttributeNode && e.getAttributeNode("id");
+							return n && n.value === t
+						}
+					}, r.find.ID = function(e, t) {
+						if ("undefined" != typeof t.getElementById && g) {
+							var n, r, i, o = t.getElementById(e);
+							if (o) {
+								if ((n = o.getAttributeNode("id")) && n.value === e) {
+									return [o]
+								}
+								i = t.getElementsByName(e), r = 0;
+								while (o = i[r++]) {
+									if ((n = o.getAttributeNode("id")) && n.value === e) {
+										return [o]
+									}
+								}
+							}
+							return []
+						}
+					}), r.find.TAG = n.getElementsByTagName ? function(e, t) {
+						return "undefined" != typeof t.getElementsByTagName ? t.getElementsByTagName(e) : n.qsa ? t.querySelectorAll(
+							e) : void 0
+					} : function(e, t) {
+						var n, r = [],
+							i = 0,
+							o = t.getElementsByTagName(e);
+						if ("*" === e) {
+							while (n = o[i++]) {
+								1 === n.nodeType && r.push(n)
+							}
+							return r
+						}
+						return o
+					}, r.find.CLASS = n.getElementsByClassName && function(e, t) {
+						if ("undefined" != typeof t.getElementsByClassName && g) {
+							return t.getElementsByClassName(e)
+						}
+					}, v = [], y = [], (n.qsa = Q.test(d.querySelectorAll)) && (ue(function(e) {
+						h.appendChild(e).innerHTML = "<a id='" + b + "'></a><select id='" + b +
+							"-\r\\' msallowcapture=''><option selected=''></option></select>", e.querySelectorAll(
+								"[msallowcapture^='']").length && y.push("[*^$]=" + M + "*(?:''|\"\")"), e.querySelectorAll("[selected]")
+							.length || y.push("\\[" + M + "*(?:value|" + P + ")"), e.querySelectorAll("[id~=" + b + "-]").length || y
+							.push("~="), e.querySelectorAll(":checked").length || y.push(":checked"), e.querySelectorAll("a#" + b +
+								"+*").length || y.push(".#.+[+~]")
+					}), ue(function(e) {
+						e.innerHTML = "<a href='' disabled='disabled'></a><select disabled='disabled'><option/></select>";
+						var t = d.createElement("input");
+						t.setAttribute("type", "hidden"), e.appendChild(t).setAttribute("name", "D"), e.querySelectorAll(
+								"[name=d]").length && y.push("name" + M + "*[*^$|!~]?="), 2 !== e.querySelectorAll(":enabled").length &&
+							y.push(":enabled", ":disabled"), h.appendChild(e).disabled = !0, 2 !== e.querySelectorAll(":disabled").length &&
+							y.push(":enabled", ":disabled"), e.querySelectorAll("*,:x"), y.push(",.*:")
+					})), (n.matchesSelector = Q.test(m = h.matches || h.webkitMatchesSelector || h.mozMatchesSelector || h.oMatchesSelector ||
+						h.msMatchesSelector)) && ue(function(e) {
+						n.disconnectedMatch = m.call(e, "*"), m.call(e, "[s!='']:x"), v.push("!=", W)
+					}), y = y.length && new RegExp(y.join("|")), v = v.length && new RegExp(v.join("|")), t = Q.test(h.compareDocumentPosition),
+					x = t || Q.test(h.contains) ? function(e, t) {
+						var n = 9 === e.nodeType ? e.documentElement : e,
+							r = t && t.parentNode;
+						return e === r || !(!r || 1 !== r.nodeType || !(n.contains ? n.contains(r) : e.compareDocumentPosition && 16 &
+							e.compareDocumentPosition(r)))
+					} : function(e, t) {
+						if (t) {
+							while (t = t.parentNode) {
+								if (t === e) {
+									return !0
+								}
+							}
+						}
+						return !1
+					}, D = t ? function(e, t) {
+						if (e === t) {
+							return f = !0, 0
+						}
+						var r = !e.compareDocumentPosition - !t.compareDocumentPosition;
+						return r || (1 & (r = (e.ownerDocument || e) === (t.ownerDocument || t) ? e.compareDocumentPosition(t) : 1) ||
+							!n.sortDetached && t.compareDocumentPosition(e) === r ? e === d || e.ownerDocument === w && x(w, e) ? -1 :
+							t === d || t.ownerDocument === w && x(w, t) ? 1 : c ? O(c, e) - O(c, t) : 0 : 4 & r ? -1 : 1)
+					} : function(e, t) {
+						if (e === t) {
+							return f = !0, 0
+						}
+						var n, r = 0,
+							i = e.parentNode,
+							o = t.parentNode,
+							a = [e],
+							s = [t];
+						if (!i || !o) {
+							return e === d ? -1 : t === d ? 1 : i ? -1 : o ? 1 : c ? O(c, e) - O(c, t) : 0
+						}
+						if (i === o) {
+							return ce(e, t)
+						}
+						n = e;
+						while (n = n.parentNode) {
+							a.unshift(n)
+						}
+						n = t;
+						while (n = n.parentNode) {
+							s.unshift(n)
+						}
+						while (a[r] === s[r]) {
+							r++
+						}
+						return r ? ce(a[r], s[r]) : a[r] === w ? -1 : s[r] === w ? 1 : 0
+					}, d) : d
+			}, oe.matches = function(e, t) {
+				return oe(e, null, null, t)
+			}, oe.matchesSelector = function(e, t) {
+				if ((e.ownerDocument || e) !== d && p(e), t = t.replace(z, "='$1']"), n.matchesSelector && g && !S[t + " "] &&
+					(!v || !v.test(t)) && (!y || !y.test(t))) {
+					try {
+						var r = m.call(e, t);
+						if (r || n.disconnectedMatch || e.document && 11 !== e.document.nodeType) {
+							return r
+						}
+					} catch (e) {}
+				}
+				return oe(t, d, null, [e]).length > 0
+			}, oe.contains = function(e, t) {
+				return (e.ownerDocument || e) !== d && p(e), x(e, t)
+			}, oe.attr = function(e, t) {
+				(e.ownerDocument || e) !== d && p(e);
+				var i = r.attrHandle[t.toLowerCase()],
+					o = i && N.call(r.attrHandle, t.toLowerCase()) ? i(e, t, !g) : void 0;
+				return void 0 !== o ? o : n.attributes || !g ? e.getAttribute(t) : (o = e.getAttributeNode(t)) && o.specified ?
+					o.value : null
+			}, oe.escape = function(e) {
+				return (e + "").replace(te, ne)
+			}, oe.error = function(e) {
+				throw new Error("Syntax error, unrecognized expression: " + e)
+			}, oe.uniqueSort = function(e) {
+				var t, r = [],
+					i = 0,
+					o = 0;
+				if (f = !n.detectDuplicates, c = !n.sortStable && e.slice(0), e.sort(D), f) {
+					while (t = e[o++]) {
+						t === e[o] && (i = r.push(o))
+					}
+					while (i--) {
+						e.splice(r[i], 1)
+					}
+				}
+				return c = null, e
+			}, i = oe.getText = function(e) {
+				var t, n = "",
+					r = 0,
+					o = e.nodeType;
+				if (o) {
+					if (1 === o || 9 === o || 11 === o) {
+						if ("string" == typeof e.textContent) {
+							return e.textContent
+						}
+						for (e = e.firstChild; e; e = e.nextSibling) {
+							n += i(e)
+						}
+					} else {
+						if (3 === o || 4 === o) {
+							return e.nodeValue
+						}
+					}
+				} else {
+					while (t = e[r++]) {
+						n += i(t)
+					}
+				}
+				return n
+			}, (r = oe.selectors = {
+				cacheLength: 50,
+				createPseudo: se,
+				match: V,
+				attrHandle: {},
+				find: {},
+				relative: {
+					">": {
+						dir: "parentNode",
+						first: !0
+					},
+					" ": {
+						dir: "parentNode"
+					},
+					"+": {
+						dir: "previousSibling",
+						first: !0
+					},
+					"~": {
+						dir: "previousSibling"
+					}
+				},
+				preFilter: {
+					ATTR: function(e) {
+						return e[1] = e[1].replace(Z, ee), e[3] = (e[3] || e[4] || e[5] || "").replace(Z, ee), "~=" === e[2] && (e[
+							3] = " " + e[3] + " "), e.slice(0, 4)
+					},
+					CHILD: function(e) {
+						return e[1] = e[1].toLowerCase(), "nth" === e[1].slice(0, 3) ? (e[3] || oe.error(e[0]), e[4] = +(e[4] ? e[5] +
+								(e[6] || 1) : 2 * ("even" === e[3] || "odd" === e[3])), e[5] = +(e[7] + e[8] || "odd" === e[3])) : e[3] &&
+							oe.error(e[0]), e
+					},
+					PSEUDO: function(e) {
+						var t, n = !e[6] && e[2];
+						return V.CHILD.test(e[0]) ? null : (e[3] ? e[2] = e[4] || e[5] || "" : n && X.test(n) && (t = a(n, !0)) &&
+							(t = n.indexOf(")", n.length - t) - n.length) && (e[0] = e[0].slice(0, t), e[2] = n.slice(0, t)), e.slice(
+								0, 3))
+					}
+				},
+				filter: {
+					TAG: function(e) {
+						var t = e.replace(Z, ee).toLowerCase();
+						return "*" === e ? function() {
+							return !0
+						} : function(e) {
+							return e.nodeName && e.nodeName.toLowerCase() === t
+						}
+					},
+					CLASS: function(e) {
+						var t = E[e + " "];
+						return t || (t = new RegExp("(^|" + M + ")" + e + "(" + M + "|$)")) && E(e, function(e) {
+							return t.test("string" == typeof e.className && e.className || "undefined" != typeof e.getAttribute && e
+								.getAttribute("class") || "")
+						})
+					},
+					ATTR: function(e, t, n) {
+						return function(r) {
+							var i = oe.attr(r, e);
+							return null == i ? "!=" === t : !t || (i += "", "=" === t ? i === n : "!=" === t ? i !== n : "^=" === t ?
+								n && 0 === i.indexOf(n) : "*=" === t ? n && i.indexOf(n) > -1 : "$=" === t ? n && i.slice(-n.length) ===
+								n : "~=" === t ? (" " + i.replace($, " ") + " ").indexOf(n) > -1 : "|=" === t && (i === n || i.slice(0,
+									n.length + 1) === n + "-"))
+						}
+					},
+					CHILD: function(e, t, n, r, i) {
+						var o = "nth" !== e.slice(0, 3),
+							a = "last" !== e.slice(-4),
+							s = "of-type" === t;
+						return 1 === r && 0 === i ? function(e) {
+							return !!e.parentNode
+						} : function(t, n, u) {
+							var l, c, f, p, d, h, g = o !== a ? "nextSibling" : "previousSibling",
+								y = t.parentNode,
+								v = s && t.nodeName.toLowerCase(),
+								m = !u && !s,
+								x = !1;
+							if (y) {
+								if (o) {
+									while (g) {
+										p = t;
+										while (p = p[g]) {
+											if (s ? p.nodeName.toLowerCase() === v : 1 === p.nodeType) {
+												return !1
+											}
+										}
+										h = g = "only" === e && !h && "nextSibling"
+									}
+									return !0
+								}
+								if (h = [a ? y.firstChild : y.lastChild], a && m) {
+									x = (d = (l = (c = (f = (p = y)[b] || (p[b] = {}))[p.uniqueID] || (f[p.uniqueID] = {}))[e] || [])[0] ===
+										T && l[1]) && l[2], p = d && y.childNodes[d];
+									while (p = ++d && p && p[g] || (x = d = 0) || h.pop()) {
+										if (1 === p.nodeType && ++x && p === t) {
+											c[e] = [T, d, x];
+											break
+										}
+									}
+								} else {
+									if (m && (x = d = (l = (c = (f = (p = t)[b] || (p[b] = {}))[p.uniqueID] || (f[p.uniqueID] = {}))[e] ||
+											[])[0] === T && l[1]), !1 === x) {
+										while (p = ++d && p && p[g] || (x = d = 0) || h.pop()) {
+											if ((s ? p.nodeName.toLowerCase() === v : 1 === p.nodeType) && ++x && (m && ((c = (f = p[b] || (p[b] = {}))[
+													p.uniqueID] || (f[p.uniqueID] = {}))[e] = [T, x]), p === t)) {
+												break
+											}
+										}
+									}
+								}
+								return (x -= i) === r || x % r == 0 && x / r >= 0
+							}
+						}
+					},
+					PSEUDO: function(e, t) {
+						var n, i = r.pseudos[e] || r.setFilters[e.toLowerCase()] || oe.error("unsupported pseudo: " + e);
+						return i[b] ? i(t) : i.length > 1 ? (n = [e, e, "", t], r.setFilters.hasOwnProperty(e.toLowerCase()) ? se(
+							function(e, n) {
+								var r, o = i(e, t),
+									a = o.length;
+								while (a--) {
+									e[r = O(e, o[a])] = !(n[r] = o[a])
+								}
+							}) : function(e) {
+							return i(e, 0, n)
+						}) : i
+					}
+				},
+				pseudos: {
+					not: se(function(e) {
+						var t = [],
+							n = [],
+							r = s(e.replace(B, "$1"));
+						return r[b] ? se(function(e, t, n, i) {
+							var o, a = r(e, null, i, []),
+								s = e.length;
+							while (s--) {
+								(o = a[s]) && (e[s] = !(t[s] = o))
+							}
+						}) : function(e, i, o) {
+							return t[0] = e, r(t, null, o, n), t[0] = null, !n.pop()
+						}
+					}),
+					has: se(function(e) {
+						return function(t) {
+							return oe(e, t).length > 0
+						}
+					}),
+					contains: se(function(e) {
+						return e = e.replace(Z, ee),
+							function(t) {
+								return (t.textContent || t.innerText || i(t)).indexOf(e) > -1
+							}
+					}),
+					lang: se(function(e) {
+						return U.test(e || "") || oe.error("unsupported lang: " + e), e = e.replace(Z, ee).toLowerCase(),
+							function(t) {
+								var n;
+								do {
+									if (n = g ? t.lang : t.getAttribute("xml:lang") || t.getAttribute("lang")) {
+										return (n = n.toLowerCase()) === e || 0 === n.indexOf(e + "-")
+									}
+								} while ((t = t.parentNode) && 1 === t.nodeType);
+								return !1
+							}
+					}),
+					target: function(t) {
+						var n = e.location && e.location.hash;
+						return n && n.slice(1) === t.id
+					},
+					root: function(e) {
+						return e === h
+					},
+					focus: function(e) {
+						return e === d.activeElement && (!d.hasFocus || d.hasFocus()) && !!(e.type || e.href || ~e.tabIndex)
+					},
+					enabled: de(!1),
+					disabled: de(!0),
+					checked: function(e) {
+						var t = e.nodeName.toLowerCase();
+						return "input" === t && !!e.checked || "option" === t && !!e.selected
+					},
+					selected: function(e) {
+						return e.parentNode && e.parentNode.selectedIndex, !0 === e.selected
+					},
+					empty: function(e) {
+						for (e = e.firstChild; e; e = e.nextSibling) {
+							if (e.nodeType < 6) {
+								return !1
+							}
+						}
+						return !0
+					},
+					parent: function(e) {
+						return !r.pseudos.empty(e)
+					},
+					header: function(e) {
+						return Y.test(e.nodeName)
+					},
+					input: function(e) {
+						return G.test(e.nodeName)
+					},
+					button: function(e) {
+						var t = e.nodeName.toLowerCase();
+						return "input" === t && "button" === e.type || "button" === t
+					},
+					text: function(e) {
+						var t;
+						return "input" === e.nodeName.toLowerCase() && "text" === e.type && (null == (t = e.getAttribute("type")) ||
+							"text" === t.toLowerCase())
+					},
+					first: he(function() {
+						return [0]
+					}),
+					last: he(function(e, t) {
+						return [t - 1]
+					}),
+					eq: he(function(e, t, n) {
+						return [n < 0 ? n + t : n]
+					}),
+					even: he(function(e, t) {
+						for (var n = 0; n < t; n += 2) {
+							e.push(n)
+						}
+						return e
+					}),
+					odd: he(function(e, t) {
+						for (var n = 1; n < t; n += 2) {
+							e.push(n)
+						}
+						return e
+					}),
+					lt: he(function(e, t, n) {
+						for (var r = n < 0 ? n + t : n; --r >= 0;) {
+							e.push(r)
+						}
+						return e
+					}),
+					gt: he(function(e, t, n) {
+						for (var r = n < 0 ? n + t : n; ++r < t;) {
+							e.push(r)
+						}
+						return e
+					})
+				}
+			}).pseudos.nth = r.pseudos.eq;
+			for (t in {
+					radio: !0,
+					checkbox: !0,
+					file: !0,
+					password: !0,
+					image: !0
+				}) {
+				r.pseudos[t] = fe(t)
+			}
+			for (t in {
+					submit: !0,
+					reset: !0
+				}) {
+				r.pseudos[t] = pe(t)
+			}
+
+			function ye() {}
+			ye.prototype = r.filters = r.pseudos, r.setFilters = new ye, a = oe.tokenize = function(e, t) {
+				var n, i, o, a, s, u, l, c = k[e + " "];
+				if (c) {
+					return t ? 0 : c.slice(0)
+				}
+				s = e, u = [], l = r.preFilter;
+				while (s) {
+					n && !(i = F.exec(s)) || (i && (s = s.slice(i[0].length) || s), u.push(o = [])), n = !1, (i = _.exec(s)) && (n =
+						i.shift(), o.push({
+							value: n,
+							type: i[0].replace(B, " ")
+						}), s = s.slice(n.length));
+					for (a in r.filter) {
+						!(i = V[a].exec(s)) || l[a] && !(i = l[a](i)) || (n = i.shift(), o.push({
+							value: n,
+							type: a,
+							matches: i
+						}), s = s.slice(n.length))
+					}
+					if (!n) {
+						break
+					}
+				}
+				return t ? s.length : s ? oe.error(e) : k(e, u).slice(0)
+			};
+
+			function ve(e) {
+				for (var t = 0, n = e.length, r = ""; t < n; t++) {
+					r += e[t].value
+				}
+				return r
+			}
+
+			function me(e, t, n) {
+				var r = t.dir,
+					i = t.next,
+					o = i || r,
+					a = n && "parentNode" === o,
+					s = C++;
+				return t.first ? function(t, n, i) {
+					while (t = t[r]) {
+						if (1 === t.nodeType || a) {
+							return e(t, n, i)
+						}
+					}
+					return !1
+				} : function(t, n, u) {
+					var l, c, f, p = [T, s];
+					if (u) {
+						while (t = t[r]) {
+							if ((1 === t.nodeType || a) && e(t, n, u)) {
+								return !0
+							}
+						}
+					} else {
+						while (t = t[r]) {
+							if (1 === t.nodeType || a) {
+								if (f = t[b] || (t[b] = {}), c = f[t.uniqueID] || (f[t.uniqueID] = {}), i && i === t.nodeName.toLowerCase()) {
+									t = t[r] || t
+								} else {
+									if ((l = c[o]) && l[0] === T && l[1] === s) {
+										return p[2] = l[2]
+									}
+									if (c[o] = p, p[2] = e(t, n, u)) {
+										return !0
+									}
+								}
+							}
+						}
+					}
+					return !1
+				}
+			}
+
+			function xe(e) {
+				return e.length > 1 ? function(t, n, r) {
+					var i = e.length;
+					while (i--) {
+						if (!e[i](t, n, r)) {
+							return !1
+						}
+					}
+					return !0
+				} : e[0]
+			}
+
+			function be(e, t, n) {
+				for (var r = 0, i = t.length; r < i; r++) {
+					oe(e, t[r], n)
+				}
+				return n
+			}
+
+			function we(e, t, n, r, i) {
+				for (var o, a = [], s = 0, u = e.length, l = null != t; s < u; s++) {
+					(o = e[s]) && (n && !n(o, r, i) || (a.push(o), l && t.push(s)))
+				}
+				return a
+			}
+
+			function Te(e, t, n, r, i, o) {
+				return r && !r[b] && (r = Te(r)), i && !i[b] && (i = Te(i, o)), se(function(o, a, s, u) {
+					var l, c, f, p = [],
+						d = [],
+						h = a.length,
+						g = o || be(t || "*", s.nodeType ? [s] : s, []),
+						y = !e || !o && t ? g : we(g, p, e, s, u),
+						v = n ? i || (o ? e : h || r) ? [] : a : y;
+					if (n && n(y, v, s, u), r) {
+						l = we(v, d), r(l, [], s, u), c = l.length;
+						while (c--) {
+							(f = l[c]) && (v[d[c]] = !(y[d[c]] = f))
+						}
+					}
+					if (o) {
+						if (i || e) {
+							if (i) {
+								l = [], c = v.length;
+								while (c--) {
+									(f = v[c]) && l.push(y[c] = f)
+								}
+								i(null, v = [], l, u)
+							}
+							c = v.length;
+							while (c--) {
+								(f = v[c]) && (l = i ? O(o, f) : p[c]) > -1 && (o[l] = !(a[l] = f))
+							}
+						}
+					} else {
+						v = we(v === a ? v.splice(h, v.length) : v), i ? i(null, a, v, u) : L.apply(a, v)
+					}
+				})
+			}
+
+			function Ce(e) {
+				for (var t, n, i, o = e.length, a = r.relative[e[0].type], s = a || r.relative[" "], u = a ? 1 : 0, c = me(
+						function(e) {
+							return e === t
+						}, s, !0), f = me(function(e) {
+						return O(t, e) > -1
+					}, s, !0), p = [function(e, n, r) {
+						var i = !a && (r || n !== l) || ((t = n).nodeType ? c(e, n, r) : f(e, n, r));
+						return t = null, i
+					}]; u < o; u++) {
+					if (n = r.relative[e[u].type]) {
+						p = [me(xe(p), n)]
+					} else {
+						if ((n = r.filter[e[u].type].apply(null, e[u].matches))[b]) {
+							for (i = ++u; i < o; i++) {
+								if (r.relative[e[i].type]) {
+									break
+								}
+							}
+							return Te(u > 1 && xe(p), u > 1 && ve(e.slice(0, u - 1).concat({
+								value: " " === e[u - 2].type ? "*" : ""
+							})).replace(B, "$1"), n, u < i && Ce(e.slice(u, i)), i < o && Ce(e = e.slice(i)), i < o && ve(e))
+						}
+						p.push(n)
+					}
+				}
+				return xe(p)
+			}
+
+			function Ee(e, t) {
+				var n = t.length > 0,
+					i = e.length > 0,
+					o = function(o, a, s, u, c) {
+						var f, h, y, v = 0,
+							m = "0",
+							x = o && [],
+							b = [],
+							w = l,
+							C = o || i && r.find.TAG("*", c),
+							E = T += null == w ? 1 : Math.random() || 0.1,
+							k = C.length;
+						for (c && (l = a === d || a || c); m !== k && null != (f = C[m]); m++) {
+							if (i && f) {
+								h = 0, a || f.ownerDocument === d || (p(f), s = !g);
+								while (y = e[h++]) {
+									if (y(f, a || d, s)) {
+										u.push(f);
+										break
+									}
+								}
+								c && (T = E)
+							}
+							n && ((f = !y && f) && v--, o && x.push(f))
+						}
+						if (v += m, n && m !== v) {
+							h = 0;
+							while (y = t[h++]) {
+								y(x, b, a, s)
+							}
+							if (o) {
+								if (v > 0) {
+									while (m--) {
+										x[m] || b[m] || (b[m] = j.call(u))
+									}
+								}
+								b = we(b)
+							}
+							L.apply(u, b), c && !o && b.length > 0 && v + t.length > 1 && oe.uniqueSort(u)
+						}
+						return c && (T = E, l = w), x
+					};
+				return n ? se(o) : o
+			}
+			return s = oe.compile = function(e, t) {
+				var n, r = [],
+					i = [],
+					o = S[e + " "];
+				if (!o) {
+					t || (t = a(e)), n = t.length;
+					while (n--) {
+						(o = Ce(t[n]))[b] ? r.push(o): i.push(o)
+					}(o = S(e, Ee(i, r))).selector = e
+				}
+				return o
+			}, u = oe.select = function(e, t, n, i) {
+				var o, u, l, c, f, p = "function" == typeof e && e,
+					d = !i && a(e = p.selector || e);
+				if (n = n || [], 1 === d.length) {
+					if ((u = d[0] = d[0].slice(0)).length > 2 && "ID" === (l = u[0]).type && 9 === t.nodeType && g && r.relative[u[
+							1].type]) {
+						if (!(t = (r.find.ID(l.matches[0].replace(Z, ee), t) || [])[0])) {
+							return n
+						}
+						p && (t = t.parentNode), e = e.slice(u.shift().value.length)
+					}
+					o = V.needsContext.test(e) ? 0 : u.length;
+					while (o--) {
+						if (l = u[o], r.relative[c = l.type]) {
+							break
+						}
+						if ((f = r.find[c]) && (i = f(l.matches[0].replace(Z, ee), K.test(u[0].type) && ge(t.parentNode) || t))) {
+							if (u.splice(o, 1), !(e = i.length && ve(u))) {
+								return L.apply(n, i), n
+							}
+							break
+						}
+					}
+				}
+				return (p || s(e, d))(i, t, !g, n, !t || K.test(e) && ge(t.parentNode) || t), n
+			}, n.sortStable = b.split("").sort(D).join("") === b, n.detectDuplicates = !!f, p(), n.sortDetached = ue(
+				function(e) {
+					return 1 & e.compareDocumentPosition(d.createElement("fieldset"))
+				}), ue(function(e) {
+				return e.innerHTML = "<a href='#'></a>", "#" === e.firstChild.getAttribute("href")
+			}) || le("type|href|height|width", function(e, t, n) {
+				if (!n) {
+					return e.getAttribute(t, "type" === t.toLowerCase() ? 1 : 2)
+				}
+			}), n.attributes && ue(function(e) {
+				return e.innerHTML = "<input/>", e.firstChild.setAttribute("value", ""), "" === e.firstChild.getAttribute(
+					"value")
+			}) || le("value", function(e, t, n) {
+				if (!n && "input" === e.nodeName.toLowerCase()) {
+					return e.defaultValue
+				}
+			}), ue(function(e) {
+				return null == e.getAttribute("disabled")
+			}) || le(P, function(e, t, n) {
+				var r;
+				if (!n) {
+					return !0 === e[t] ? t.toLowerCase() : (r = e.getAttributeNode(t)) && r.specified ? r.value : null
+				}
+			}), oe
+		}(e);
+		w.find = E, w.expr = E.selectors, w.expr[":"] = w.expr.pseudos, w.uniqueSort = w.unique = E.uniqueSort, w.text = E.getText,
+			w.isXMLDoc = E.isXML, w.contains = E.contains, w.escapeSelector = E.escape;
+		var k = function(e, t, n) {
+				var r = [],
+					i = void 0 !== n;
+				while ((e = e[t]) && 9 !== e.nodeType) {
+					if (1 === e.nodeType) {
+						if (i && w(e).is(n)) {
+							break
+						}
+						r.push(e)
+					}
+				}
+				return r
+			},
+			S = function(e, t) {
+				for (var n = []; e; e = e.nextSibling) {
+					1 === e.nodeType && e !== t && n.push(e)
+				}
+				return n
+			},
+			D = w.expr.match.needsContext;
+
+		function N(e, t) {
+			return e.nodeName && e.nodeName.toLowerCase() === t.toLowerCase()
+		}
+		var A = /^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;
+
+		function j(e, t, n) {
+			return g(t) ? w.grep(e, function(e, r) {
+				return !!t.call(e, r, e) !== n
+			}) : t.nodeType ? w.grep(e, function(e) {
+				return e === t !== n
+			}) : "string" != typeof t ? w.grep(e, function(e) {
+				return u.call(t, e) > -1 !== n
+			}) : w.filter(t, e, n)
+		}
+		w.filter = function(e, t, n) {
+			var r = t[0];
+			return n && (e = ":not(" + e + ")"), 1 === t.length && 1 === r.nodeType ? w.find.matchesSelector(r, e) ? [r] : [] :
+				w.find.matches(e, w.grep(t, function(e) {
+					return 1 === e.nodeType
+				}))
+		}, w.fn.extend({
+			find: function(e) {
+				var t, n, r = this.length,
+					i = this;
+				if ("string" != typeof e) {
+					return this.pushStack(w(e).filter(function() {
+						for (t = 0; t < r; t++) {
+							if (w.contains(i[t], this)) {
+								return !0
+							}
+						}
+					}))
+				}
+				for (n = this.pushStack([]), t = 0; t < r; t++) {
+					w.find(e, i[t], n)
+				}
+				return r > 1 ? w.uniqueSort(n) : n
+			},
+			filter: function(e) {
+				return this.pushStack(j(this, e || [], !1))
+			},
+			not: function(e) {
+				return this.pushStack(j(this, e || [], !0))
+			},
+			is: function(e) {
+				return !!j(this, "string" == typeof e && D.test(e) ? w(e) : e || [], !1).length
+			}
+		});
+		var q, L = /^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/;
+		(w.fn.init = function(e, t, n) {
+			var i, o;
+			if (!e) {
+				return this
+			}
+			if (n = n || q, "string" == typeof e) {
+				if (!(i = "<" === e[0] && ">" === e[e.length - 1] && e.length >= 3 ? [null, e, null] : L.exec(e)) || !i[1] && t) {
+					return !t || t.jquery ? (t || n).find(e) : this.constructor(t).find(e)
+				}
+				if (i[1]) {
+					if (t = t instanceof w ? t[0] : t, w.merge(this, w.parseHTML(i[1], t && t.nodeType ? t.ownerDocument || t : r,
+							!0)), A.test(i[1]) && w.isPlainObject(t)) {
+						for (i in t) {
+							g(this[i]) ? this[i](t[i]) : this.attr(i, t[i])
+						}
+					}
+					return this
+				}
+				return (o = r.getElementById(i[2])) && (this[0] = o, this.length = 1), this
+			}
+			return e.nodeType ? (this[0] = e, this.length = 1, this) : g(e) ? void 0 !== n.ready ? n.ready(e) : e(w) : w.makeArray(
+				e, this)
+		}).prototype = w.fn, q = w(r);
+		var H = /^(?:parents|prev(?:Until|All))/,
+			O = {
+				children: !0,
+				contents: !0,
+				next: !0,
+				prev: !0
+			};
+		w.fn.extend({
+			has: function(e) {
+				var t = w(e, this),
+					n = t.length;
+				return this.filter(function() {
+					for (var e = 0; e < n; e++) {
+						if (w.contains(this, t[e])) {
+							return !0
+						}
+					}
+				})
+			},
+			closest: function(e, t) {
+				var n, r = 0,
+					i = this.length,
+					o = [],
+					a = "string" != typeof e && w(e);
+				if (!D.test(e)) {
+					for (; r < i; r++) {
+						for (n = this[r]; n && n !== t; n = n.parentNode) {
+							if (n.nodeType < 11 && (a ? a.index(n) > -1 : 1 === n.nodeType && w.find.matchesSelector(n, e))) {
+								o.push(n);
+								break
+							}
+						}
+					}
+				}
+				return this.pushStack(o.length > 1 ? w.uniqueSort(o) : o)
+			},
+			index: function(e) {
+				return e ? "string" == typeof e ? u.call(w(e), this[0]) : u.call(this, e.jquery ? e[0] : e) : this[0] && this[
+					0].parentNode ? this.first().prevAll().length : -1
+			},
+			add: function(e, t) {
+				return this.pushStack(w.uniqueSort(w.merge(this.get(), w(e, t))))
+			},
+			addBack: function(e) {
+				return this.add(null == e ? this.prevObject : this.prevObject.filter(e))
+			}
+		});
+
+		function P(e, t) {
+			while ((e = e[t]) && 1 !== e.nodeType) {}
+			return e
+		}
+		w.each({
+			parent: function(e) {
+				var t = e.parentNode;
+				return t && 11 !== t.nodeType ? t : null
+			},
+			parents: function(e) {
+				return k(e, "parentNode")
+			},
+			parentsUntil: function(e, t, n) {
+				return k(e, "parentNode", n)
+			},
+			next: function(e) {
+				return P(e, "nextSibling")
+			},
+			prev: function(e) {
+				return P(e, "previousSibling")
+			},
+			nextAll: function(e) {
+				return k(e, "nextSibling")
+			},
+			prevAll: function(e) {
+				return k(e, "previousSibling")
+			},
+			nextUntil: function(e, t, n) {
+				return k(e, "nextSibling", n)
+			},
+			prevUntil: function(e, t, n) {
+				return k(e, "previousSibling", n)
+			},
+			siblings: function(e) {
+				return S((e.parentNode || {}).firstChild, e)
+			},
+			children: function(e) {
+				return S(e.firstChild)
+			},
+			contents: function(e) {
+				return N(e, "iframe") ? e.contentDocument : (N(e, "template") && (e = e.content || e), w.merge([], e.childNodes))
+			}
+		}, function(e, t) {
+			w.fn[e] = function(n, r) {
+				var i = w.map(this, t, n);
+				return "Until" !== e.slice(-5) && (r = n), r && "string" == typeof r && (i = w.filter(r, i)), this.length > 1 &&
+					(O[e] || w.uniqueSort(i), H.test(e) && i.reverse()), this.pushStack(i)
+			}
+		});
+		var M = /[^\x20\t\r\n\f]+/g;
+
+		function R(e) {
+			var t = {};
+			return w.each(e.match(M) || [], function(e, n) {
+				t[n] = !0
+			}), t
+		}
+		w.Callbacks = function(e) {
+			e = "string" == typeof e ? R(e) : w.extend({}, e);
+			var t, n, r, i, o = [],
+				a = [],
+				s = -1,
+				u = function() {
+					for (i = i || e.once, r = t = !0; a.length; s = -1) {
+						n = a.shift();
+						while (++s < o.length) {
+							!1 === o[s].apply(n[0], n[1]) && e.stopOnFalse && (s = o.length, n = !1)
+						}
+					}
+					e.memory || (n = !1), t = !1, i && (o = n ? [] : "")
+				},
+				l = {
+					add: function() {
+						return o && (n && !t && (s = o.length - 1, a.push(n)), function t(n) {
+							w.each(n, function(n, r) {
+								g(r) ? e.unique && l.has(r) || o.push(r) : r && r.length && "string" !== x(r) && t(r)
+							})
+						}(arguments), n && !t && u()), this
+					},
+					remove: function() {
+						return w.each(arguments, function(e, t) {
+							var n;
+							while ((n = w.inArray(t, o, n)) > -1) {
+								o.splice(n, 1), n <= s && s--
+							}
+						}), this
+					},
+					has: function(e) {
+						return e ? w.inArray(e, o) > -1 : o.length > 0
+					},
+					empty: function() {
+						return o && (o = []), this
+					},
+					disable: function() {
+						return i = a = [], o = n = "", this
+					},
+					disabled: function() {
+						return !o
+					},
+					lock: function() {
+						return i = a = [], n || t || (o = n = ""), this
+					},
+					locked: function() {
+						return !!i
+					},
+					fireWith: function(e, n) {
+						return i || (n = [e, (n = n || []).slice ? n.slice() : n], a.push(n), t || u()), this
+					},
+					fire: function() {
+						return l.fireWith(this, arguments), this
+					},
+					fired: function() {
+						return !!r
+					}
+				};
+			return l
+		};
+
+		function I(e) {
+			return e
+		}
+
+		function W(e) {
+			throw e
+		}
+
+		function $(e, t, n, r) {
+			var i;
+			try {
+				e && g(i = e.promise) ? i.call(e).done(t).fail(n) : e && g(i = e.then) ? i.call(e, t, n) : t.apply(void 0, [e].slice(
+					r))
+			} catch (e) {
+				n.apply(void 0, [e])
+			}
+		}
+		w.extend({
+			Deferred: function(t) {
+				var n = [
+						["notify", "progress", w.Callbacks("memory"), w.Callbacks("memory"), 2],
+						["resolve", "done", w.Callbacks("once memory"), w.Callbacks("once memory"), 0, "resolved"],
+						["reject", "fail", w.Callbacks("once memory"), w.Callbacks("once memory"), 1, "rejected"]
+					],
+					r = "pending",
+					i = {
+						state: function() {
+							return r
+						},
+						always: function() {
+							return o.done(arguments).fail(arguments), this
+						},
+						"catch": function(e) {
+							return i.then(null, e)
+						},
+						pipe: function() {
+							var e = arguments;
+							return w.Deferred(function(t) {
+								w.each(n, function(n, r) {
+									var i = g(e[r[4]]) && e[r[4]];
+									o[r[1]](function() {
+										var e = i && i.apply(this, arguments);
+										e && g(e.promise) ? e.promise().progress(t.notify).done(t.resolve).fail(t.reject) : t[r[0] +
+											"With"](this, i ? [e] : arguments)
+									})
+								}), e = null
+							}).promise()
+						},
+						then: function(t, r, i) {
+							var o = 0;
+
+							function a(t, n, r, i) {
+								return function() {
+									var s = this,
+										u = arguments,
+										l = function() {
+											var e, l;
+											if (!(t < o)) {
+												if ((e = r.apply(s, u)) === n.promise()) {
+													throw new TypeError("Thenable self-resolution")
+												}
+												l = e && ("object" == typeof e || "function" == typeof e) && e.then, g(l) ? i ? l.call(e, a(o, n, I,
+													i), a(o, n, W, i)) : (o++, l.call(e, a(o, n, I, i), a(o, n, W, i), a(o, n, I, n.notifyWith))) : (r !==
+													I && (s = void 0, u = [e]), (i || n.resolveWith)(s, u))
+											}
+										},
+										c = i ? l : function() {
+											try {
+												l()
+											} catch (e) {
+												w.Deferred.exceptionHook && w.Deferred.exceptionHook(e, c.stackTrace), t + 1 >= o && (r !== W && (s =
+													void 0, u = [e]), n.rejectWith(s, u))
+											}
+										};
+									t ? c() : (w.Deferred.getStackHook && (c.stackTrace = w.Deferred.getStackHook()), e.setTimeout(c))
+								}
+							}
+							return w.Deferred(function(e) {
+								n[0][3].add(a(0, e, g(i) ? i : I, e.notifyWith)), n[1][3].add(a(0, e, g(t) ? t : I)), n[2][3].add(a(0,
+									e, g(r) ? r : W))
+							}).promise()
+						},
+						promise: function(e) {
+							return null != e ? w.extend(e, i) : i
+						}
+					},
+					o = {};
+				return w.each(n, function(e, t) {
+					var a = t[2],
+						s = t[5];
+					i[t[1]] = a.add, s && a.add(function() {
+							r = s
+						}, n[3 - e][2].disable, n[3 - e][3].disable, n[0][2].lock, n[0][3].lock), a.add(t[3].fire), o[t[0]] =
+						function() {
+							return o[t[0] + "With"](this === o ? void 0 : this, arguments), this
+						}, o[t[0] + "With"] = a.fireWith
+				}), i.promise(o), t && t.call(o, o), o
+			},
+			when: function(e) {
+				var t = arguments.length,
+					n = t,
+					r = Array(n),
+					i = o.call(arguments),
+					a = w.Deferred(),
+					s = function(e) {
+						return function(n) {
+							r[e] = this, i[e] = arguments.length > 1 ? o.call(arguments) : n, --t || a.resolveWith(r, i)
+						}
+					};
+				if (t <= 1 && ($(e, a.done(s(n)).resolve, a.reject, !t), "pending" === a.state() || g(i[n] && i[n].then))) {
+					return a.then()
+				}
+				while (n--) {
+					$(i[n], s(n), a.reject)
+				}
+				return a.promise()
+			}
+		});
+		var B = /^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;
+		w.Deferred.exceptionHook = function(t, n) {
+			e.console && e.console.warn && t && B.test(t.name) && e.console.warn("jQuery.Deferred exception: " + t.message, t
+				.stack, n)
+		}, w.readyException = function(t) {
+			e.setTimeout(function() {
+				throw t
+			})
+		};
+		var F = w.Deferred();
+		w.fn.ready = function(e) {
+			return F.then(e)["catch"](function(e) {
+				w.readyException(e)
+			}), this
+		}, w.extend({
+			isReady: !1,
+			readyWait: 1,
+			ready: function(e) {
+				(!0 === e ? --w.readyWait : w.isReady) || (w.isReady = !0, !0 !== e && --w.readyWait > 0 || F.resolveWith(r, [
+					w
+				]))
+			}
+		}), w.ready.then = F.then;
+
+		function _() {
+			r.removeEventListener("DOMContentLoaded", _), e.removeEventListener("load", _), w.ready()
+		}
+		"complete" === r.readyState || "loading" !== r.readyState && !r.documentElement.doScroll ? e.setTimeout(w.ready) :
+			(r.addEventListener("DOMContentLoaded", _), e.addEventListener("load", _));
+		var z = function(e, t, n, r, i, o, a) {
+				var s = 0,
+					u = e.length,
+					l = null == n;
+				if ("object" === x(n)) {
+					i = !0;
+					for (s in n) {
+						z(e, t, s, n[s], !0, o, a)
+					}
+				} else {
+					if (void 0 !== r && (i = !0, g(r) || (a = !0), l && (a ? (t.call(e, r), t = null) : (l = t, t = function(e, t, n) {
+							return l.call(w(e), n)
+						})), t)) {
+						for (; s < u; s++) {
+							t(e[s], n, a ? r : r.call(e[s], s, t(e[s], n)))
+						}
+					}
+				}
+				return i ? e : l ? t.call(e) : u ? t(e[0], n) : o
+			},
+			X = /^-ms-/,
+			U = /-([a-z])/g;
+
+		function V(e, t) {
+			return t.toUpperCase()
+		}
+
+		function G(e) {
+			return e.replace(X, "ms-").replace(U, V)
+		}
+		var Y = function(e) {
+			return 1 === e.nodeType || 9 === e.nodeType || !+e.nodeType
+		};
+
+		function Q() {
+			this.expando = w.expando + Q.uid++
+		}
+		Q.uid = 1, Q.prototype = {
+			cache: function(e) {
+				var t = e[this.expando];
+				return t || (t = {}, Y(e) && (e.nodeType ? e[this.expando] = t : Object.defineProperty(e, this.expando, {
+					value: t,
+					configurable: !0
+				}))), t
+			},
+			set: function(e, t, n) {
+				var r, i = this.cache(e);
+				if ("string" == typeof t) {
+					i[G(t)] = n
+				} else {
+					for (r in t) {
+						i[G(r)] = t[r]
+					}
+				}
+				return i
+			},
+			get: function(e, t) {
+				return void 0 === t ? this.cache(e) : e[this.expando] && e[this.expando][G(t)]
+			},
+			access: function(e, t, n) {
+				return void 0 === t || t && "string" == typeof t && void 0 === n ? this.get(e, t) : (this.set(e, t, n), void 0 !==
+					n ? n : t)
+			},
+			remove: function(e, t) {
+				var n, r = e[this.expando];
+				if (void 0 !== r) {
+					if (void 0 !== t) {
+						n = (t = Array.isArray(t) ? t.map(G) : (t = G(t)) in r ? [t] : t.match(M) || []).length;
+						while (n--) {
+							delete r[t[n]]
+						}
+					}(void 0 === t || w.isEmptyObject(r)) && (e.nodeType ? e[this.expando] = void 0 : delete e[this.expando])
+				}
+			},
+			hasData: function(e) {
+				var t = e[this.expando];
+				return void 0 !== t && !w.isEmptyObject(t)
+			}
+		};
+		var J = new Q,
+			K = new Q,
+			Z = /^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,
+			ee = /[A-Z]/g;
+
+		function te(e) {
+			return "true" === e || "false" !== e && ("null" === e ? null : e === +e + "" ? +e : Z.test(e) ? JSON.parse(e) : e)
+		}
+
+		function ne(e, t, n) {
+			var r;
+			if (void 0 === n && 1 === e.nodeType) {
+				if (r = "data-" + t.replace(ee, "-$&").toLowerCase(), "string" == typeof(n = e.getAttribute(r))) {
+					try {
+						n = te(n)
+					} catch (e) {}
+					K.set(e, t, n)
+				} else {
+					n = void 0
+				}
+			}
+			return n
+		}
+		w.extend({
+			hasData: function(e) {
+				return K.hasData(e) || J.hasData(e)
+			},
+			data: function(e, t, n) {
+				return K.access(e, t, n)
+			},
+			removeData: function(e, t) {
+				K.remove(e, t)
+			},
+			_data: function(e, t, n) {
+				return J.access(e, t, n)
+			},
+			_removeData: function(e, t) {
+				J.remove(e, t)
+			}
+		}), w.fn.extend({
+			data: function(e, t) {
+				var n, r, i, o = this[0],
+					a = o && o.attributes;
+				if (void 0 === e) {
+					if (this.length && (i = K.get(o), 1 === o.nodeType && !J.get(o, "hasDataAttrs"))) {
+						n = a.length;
+						while (n--) {
+							a[n] && 0 === (r = a[n].name).indexOf("data-") && (r = G(r.slice(5)), ne(o, r, i[r]))
+						}
+						J.set(o, "hasDataAttrs", !0)
+					}
+					return i
+				}
+				return "object" == typeof e ? this.each(function() {
+					K.set(this, e)
+				}) : z(this, function(t) {
+					var n;
+					if (o && void 0 === t) {
+						if (void 0 !== (n = K.get(o, e))) {
+							return n
+						}
+						if (void 0 !== (n = ne(o, e))) {
+							return n
+						}
+					} else {
+						this.each(function() {
+							K.set(this, e, t)
+						})
+					}
+				}, null, t, arguments.length > 1, null, !0)
+			},
+			removeData: function(e) {
+				return this.each(function() {
+					K.remove(this, e)
+				})
+			}
+		}), w.extend({
+			queue: function(e, t, n) {
+				var r;
+				if (e) {
+					return t = (t || "fx") + "queue", r = J.get(e, t), n && (!r || Array.isArray(n) ? r = J.access(e, t, w.makeArray(
+						n)) : r.push(n)), r || []
+				}
+			},
+			dequeue: function(e, t) {
+				t = t || "fx";
+				var n = w.queue(e, t),
+					r = n.length,
+					i = n.shift(),
+					o = w._queueHooks(e, t),
+					a = function() {
+						w.dequeue(e, t)
+					};
+				"inprogress" === i && (i = n.shift(), r--), i && ("fx" === t && n.unshift("inprogress"), delete o.stop, i.call(
+					e, a, o)), !r && o && o.empty.fire()
+			},
+			_queueHooks: function(e, t) {
+				var n = t + "queueHooks";
+				return J.get(e, n) || J.access(e, n, {
+					empty: w.Callbacks("once memory").add(function() {
+						J.remove(e, [t + "queue", n])
+					})
+				})
+			}
+		}), w.fn.extend({
+			queue: function(e, t) {
+				var n = 2;
+				return "string" != typeof e && (t = e, e = "fx", n--), arguments.length < n ? w.queue(this[0], e) : void 0 ===
+					t ? this : this.each(function() {
+						var n = w.queue(this, e, t);
+						w._queueHooks(this, e), "fx" === e && "inprogress" !== n[0] && w.dequeue(this, e)
+					})
+			},
+			dequeue: function(e) {
+				return this.each(function() {
+					w.dequeue(this, e)
+				})
+			},
+			clearQueue: function(e) {
+				return this.queue(e || "fx", [])
+			},
+			promise: function(e, t) {
+				var n, r = 1,
+					i = w.Deferred(),
+					o = this,
+					a = this.length,
+					s = function() {
+						--r || i.resolveWith(o, [o])
+					};
+				"string" != typeof e && (t = e, e = void 0), e = e || "fx";
+				while (a--) {
+					(n = J.get(o[a], e + "queueHooks")) && n.empty && (r++, n.empty.add(s))
+				}
+				return s(), i.promise(t)
+			}
+		});
+		var re = /[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,
+			ie = new RegExp("^(?:([+-])=|)(" + re + ")([a-z%]*)$", "i"),
+			oe = ["Top", "Right", "Bottom", "Left"],
+			ae = function(e, t) {
+				return "none" === (e = t || e).style.display || "" === e.style.display && w.contains(e.ownerDocument, e) &&
+					"none" === w.css(e, "display")
+			},
+			se = function(e, t, n, r) {
+				var i, o, a = {};
+				for (o in t) {
+					a[o] = e.style[o], e.style[o] = t[o]
+				}
+				i = n.apply(e, r || []);
+				for (o in t) {
+					e.style[o] = a[o]
+				}
+				return i
+			};
+
+		function ue(e, t, n, r) {
+			var i, o, a = 20,
+				s = r ? function() {
+					return r.cur()
+				} : function() {
+					return w.css(e, t, "")
+				},
+				u = s(),
+				l = n && n[3] || (w.cssNumber[t] ? "" : "px"),
+				c = (w.cssNumber[t] || "px" !== l && +u) && ie.exec(w.css(e, t));
+			if (c && c[3] !== l) {
+				u /= 2, l = l || c[3], c = +u || 1;
+				while (a--) {
+					w.style(e, t, c + l), (1 - o) * (1 - (o = s() / u || 0.5)) <= 0 && (a = 0), c /= o
+				}
+				c *= 2, w.style(e, t, c + l), n = n || []
+			}
+			return n && (c = +c || +u || 0, i = n[1] ? c + (n[1] + 1) * n[2] : +n[2], r && (r.unit = l, r.start = c, r.end = i)),
+				i
+		}
+		var le = {};
+
+		function ce(e) {
+			var t, n = e.ownerDocument,
+				r = e.nodeName,
+				i = le[r];
+			return i || (t = n.body.appendChild(n.createElement(r)), i = w.css(t, "display"), t.parentNode.removeChild(t),
+				"none" === i && (i = "block"), le[r] = i, i)
+		}
+
+		function fe(e, t) {
+			for (var n, r, i = [], o = 0, a = e.length; o < a; o++) {
+				(r = e[o]).style && (n = r.style.display, t ? ("none" === n && (i[o] = J.get(r, "display") || null, i[o] || (r.style
+					.display = "")), "" === r.style.display && ae(r) && (i[o] = ce(r))) : "none" !== n && (i[o] = "none", J.set(r,
+					"display", n)))
+			}
+			for (o = 0; o < a; o++) {
+				null != i[o] && (e[o].style.display = i[o])
+			}
+			return e
+		}
+		w.fn.extend({
+			show: function() {
+				return fe(this, !0)
+			},
+			hide: function() {
+				return fe(this)
+			},
+			toggle: function(e) {
+				return "boolean" == typeof e ? e ? this.show() : this.hide() : this.each(function() {
+					ae(this) ? w(this).show() : w(this).hide()
+				})
+			}
+		});
+		var pe = /^(?:checkbox|radio)$/i,
+			de = /<([a-z][^\/\0>\x20\t\r\n\f]+)/i,
+			he = /^$|^module$|\/(?:java|ecma)script/i,
+			ge = {
+				option: [1, "<select multiple='multiple'>", "</select>"],
+				thead: [1, "<table>", "</table>"],
+				col: [2, "<table><colgroup>", "</colgroup></table>"],
+				tr: [2, "<table><tbody>", "</tbody></table>"],
+				td: [3, "<table><tbody><tr>", "</tr></tbody></table>"],
+				_default: [0, "", ""]
+			};
+		ge.optgroup = ge.option, ge.tbody = ge.tfoot = ge.colgroup = ge.caption = ge.thead, ge.th = ge.td;
+
+		function ye(e, t) {
+			var n;
+			return n = "undefined" != typeof e.getElementsByTagName ? e.getElementsByTagName(t || "*") : "undefined" != typeof e
+				.querySelectorAll ? e.querySelectorAll(t || "*") : [], void 0 === t || t && N(e, t) ? w.merge([e], n) : n
+		}
+
+		function ve(e, t) {
+			for (var n = 0, r = e.length; n < r; n++) {
+				J.set(e[n], "globalEval", !t || J.get(t[n], "globalEval"))
+			}
+		}
+		var me = /<|&#?\w+;/;
+
+		function xe(e, t, n, r, i) {
+			for (var o, a, s, u, l, c, f = t.createDocumentFragment(), p = [], d = 0, h = e.length; d < h; d++) {
+				if ((o = e[d]) || 0 === o) {
+					if ("object" === x(o)) {
+						w.merge(p, o.nodeType ? [o] : o)
+					} else {
+						if (me.test(o)) {
+							a = a || f.appendChild(t.createElement("div")), s = (de.exec(o) || ["", ""])[1].toLowerCase(), u = ge[s] || ge
+								._default, a.innerHTML = u[1] + w.htmlPrefilter(o) + u[2], c = u[0];
+							while (c--) {
+								a = a.lastChild
+							}
+							w.merge(p, a.childNodes), (a = f.firstChild).textContent = ""
+						} else {
+							p.push(t.createTextNode(o))
+						}
+					}
+				}
+			}
+			f.textContent = "", d = 0;
+			while (o = p[d++]) {
+				if (r && w.inArray(o, r) > -1) {
+					i && i.push(o)
+				} else {
+					if (l = w.contains(o.ownerDocument, o), a = ye(f.appendChild(o), "script"), l && ve(a), n) {
+						c = 0;
+						while (o = a[c++]) {
+							he.test(o.type || "") && n.push(o)
+						}
+					}
+				}
+			}
+			return f
+		}! function() {
+			var e = r.createDocumentFragment().appendChild(r.createElement("div")),
+				t = r.createElement("input");
+			t.setAttribute("type", "radio"), t.setAttribute("checked", "checked"), t.setAttribute("name", "t"), e.appendChild(
+					t), h.checkClone = e.cloneNode(!0).cloneNode(!0).lastChild.checked, e.innerHTML = "<textarea>x</textarea>", h.noCloneChecked = !
+				!e.cloneNode(!0).lastChild.defaultValue
+		}();
+		var be = r.documentElement,
+			we = /^key/,
+			Te = /^(?:mouse|pointer|contextmenu|drag|drop)|click/,
+			Ce = /^([^.]*)(?:\.(.+)|)/;
+
+		function Ee() {
+			return !0
+		}
+
+		function ke() {
+			return !1
+		}
+
+		function Se() {
+			try {
+				return r.activeElement
+			} catch (e) {}
+		}
+
+		function De(e, t, n, r, i, o) {
+			var a, s;
+			if ("object" == typeof t) {
+				"string" != typeof n && (r = r || n, n = void 0);
+				for (s in t) {
+					De(e, s, n, r, t[s], o)
+				}
+				return e
+			}
+			if (null == r && null == i ? (i = n, r = n = void 0) : null == i && ("string" == typeof n ? (i = r, r = void 0) :
+					(i = r, r = n, n = void 0)), !1 === i) {
+				i = ke
+			} else {
+				if (!i) {
+					return e
+				}
+			}
+			return 1 === o && (a = i, (i = function(e) {
+				return w().off(e), a.apply(this, arguments)
+			}).guid = a.guid || (a.guid = w.guid++)), e.each(function() {
+				w.event.add(this, t, i, r, n)
+			})
+		}
+		w.event = {
+			global: {},
+			add: function(e, t, n, r, i) {
+				var o, a, s, u, l, c, f, p, d, h, g, y = J.get(e);
+				if (y) {
+					n.handler && (n = (o = n).handler, i = o.selector), i && w.find.matchesSelector(be, i), n.guid || (n.guid = w.guid++),
+						(u = y.events) || (u = y.events = {}), (a = y.handle) || (a = y.handle = function(t) {
+							return "undefined" != typeof w && w.event.triggered !== t.type ? w.event.dispatch.apply(e, arguments) :
+								void 0
+						}), l = (t = (t || "").match(M) || [""]).length;
+					while (l--) {
+						d = g = (s = Ce.exec(t[l]) || [])[1], h = (s[2] || "").split(".").sort(), d && (f = w.event.special[d] || {},
+							d = (i ? f.delegateType : f.bindType) || d, f = w.event.special[d] || {}, c = w.extend({
+								type: d,
+								origType: g,
+								data: r,
+								handler: n,
+								guid: n.guid,
+								selector: i,
+								needsContext: i && w.expr.match.needsContext.test(i),
+								namespace: h.join(".")
+							}, o), (p = u[d]) || ((p = u[d] = []).delegateCount = 0, f.setup && !1 !== f.setup.call(e, r, h, a) || e.addEventListener &&
+								e.addEventListener(d, a)), f.add && (f.add.call(e, c), c.handler.guid || (c.handler.guid = n.guid)), i ? p
+							.splice(p.delegateCount++, 0, c) : p.push(c), w.event.global[d] = !0)
+					}
+				}
+			},
+			remove: function(e, t, n, r, i) {
+				var o, a, s, u, l, c, f, p, d, h, g, y = J.hasData(e) && J.get(e);
+				if (y && (u = y.events)) {
+					l = (t = (t || "").match(M) || [""]).length;
+					while (l--) {
+						if (s = Ce.exec(t[l]) || [], d = g = s[1], h = (s[2] || "").split(".").sort(), d) {
+							f = w.event.special[d] || {}, p = u[d = (r ? f.delegateType : f.bindType) || d] || [], s = s[2] && new RegExp(
+								"(^|\\.)" + h.join("\\.(?:.*\\.|)") + "(\\.|$)"), a = o = p.length;
+							while (o--) {
+								c = p[o], !i && g !== c.origType || n && n.guid !== c.guid || s && !s.test(c.namespace) || r && r !== c.selector &&
+									("**" !== r || !c.selector) || (p.splice(o, 1), c.selector && p.delegateCount--, f.remove && f.remove.call(
+										e, c))
+							}
+							a && !p.length && (f.teardown && !1 !== f.teardown.call(e, h, y.handle) || w.removeEvent(e, d, y.handle),
+								delete u[d])
+						} else {
+							for (d in u) {
+								w.event.remove(e, d + t[l], n, r, !0)
+							}
+						}
+					}
+					w.isEmptyObject(u) && J.remove(e, "handle events")
+				}
+			},
+			dispatch: function(e) {
+				var t = w.event.fix(e),
+					n, r, i, o, a, s, u = new Array(arguments.length),
+					l = (J.get(this, "events") || {})[t.type] || [],
+					c = w.event.special[t.type] || {};
+				for (u[0] = t, n = 1; n < arguments.length; n++) {
+					u[n] = arguments[n]
+				}
+				if (t.delegateTarget = this, !c.preDispatch || !1 !== c.preDispatch.call(this, t)) {
+					s = w.event.handlers.call(this, t, l), n = 0;
+					while ((o = s[n++]) && !t.isPropagationStopped()) {
+						t.currentTarget = o.elem, r = 0;
+						while ((a = o.handlers[r++]) && !t.isImmediatePropagationStopped()) {
+							t.rnamespace && !t.rnamespace.test(a.namespace) || (t.handleObj = a, t.data = a.data, void 0 !== (i = ((w.event
+								.special[a.origType] || {}).handle || a.handler).apply(o.elem, u)) && !1 === (t.result = i) && (t.preventDefault(),
+								t.stopPropagation()))
+						}
+					}
+					return c.postDispatch && c.postDispatch.call(this, t), t.result
+				}
+			},
+			handlers: function(e, t) {
+				var n, r, i, o, a, s = [],
+					u = t.delegateCount,
+					l = e.target;
+				if (u && l.nodeType && !("click" === e.type && e.button >= 1)) {
+					for (; l !== this; l = l.parentNode || this) {
+						if (1 === l.nodeType && ("click" !== e.type || !0 !== l.disabled)) {
+							for (o = [], a = {}, n = 0; n < u; n++) {
+								void 0 === a[i = (r = t[n]).selector + " "] && (a[i] = r.needsContext ? w(i, this).index(l) > -1 : w.find(i,
+									this, null, [l]).length), a[i] && o.push(r)
+							}
+							o.length && s.push({
+								elem: l,
+								handlers: o
+							})
+						}
+					}
+				}
+				return l = this, u < t.length && s.push({
+					elem: l,
+					handlers: t.slice(u)
+				}), s
+			},
+			addProp: function(e, t) {
+				Object.defineProperty(w.Event.prototype, e, {
+					enumerable: !0,
+					configurable: !0,
+					get: g(t) ? function() {
+						if (this.originalEvent) {
+							return t(this.originalEvent)
+						}
+					} : function() {
+						if (this.originalEvent) {
+							return this.originalEvent[e]
+						}
+					},
+					set: function(t) {
+						Object.defineProperty(this, e, {
+							enumerable: !0,
+							configurable: !0,
+							writable: !0,
+							value: t
+						})
+					}
+				})
+			},
+			fix: function(e) {
+				return e[w.expando] ? e : new w.Event(e)
+			},
+			special: {
+				load: {
+					noBubble: !0
+				},
+				focus: {
+					trigger: function() {
+						if (this !== Se() && this.focus) {
+							return this.focus(), !1
+						}
+					},
+					delegateType: "focusin"
+				},
+				blur: {
+					trigger: function() {
+						if (this === Se() && this.blur) {
+							return this.blur(), !1
+						}
+					},
+					delegateType: "focusout"
+				},
+				click: {
+					trigger: function() {
+						if ("checkbox" === this.type && this.click && N(this, "input")) {
+							return this.click(), !1
+						}
+					},
+					_default: function(e) {
+						return N(e.target, "a")
+					}
+				},
+				beforeunload: {
+					postDispatch: function(e) {
+						void 0 !== e.result && e.originalEvent && (e.originalEvent.returnValue = e.result)
+					}
+				}
+			}
+		}, w.removeEvent = function(e, t, n) {
+			e.removeEventListener && e.removeEventListener(t, n)
+		}, w.Event = function(e, t) {
+			if (!(this instanceof w.Event)) {
+				return new w.Event(e, t)
+			}
+			e && e.type ? (this.originalEvent = e, this.type = e.type, this.isDefaultPrevented = e.defaultPrevented || void 0 ===
+					e.defaultPrevented && !1 === e.returnValue ? Ee : ke, this.target = e.target && 3 === e.target.nodeType ? e.target
+					.parentNode : e.target, this.currentTarget = e.currentTarget, this.relatedTarget = e.relatedTarget) : this.type =
+				e, t && w.extend(this, t), this.timeStamp = e && e.timeStamp || Date.now(), this[w.expando] = !0
+		}, w.Event.prototype = {
+			constructor: w.Event,
+			isDefaultPrevented: ke,
+			isPropagationStopped: ke,
+			isImmediatePropagationStopped: ke,
+			isSimulated: !1,
+			preventDefault: function() {
+				var e = this.originalEvent;
+				this.isDefaultPrevented = Ee, e && !this.isSimulated && e.preventDefault()
+			},
+			stopPropagation: function() {
+				var e = this.originalEvent;
+				this.isPropagationStopped = Ee, e && !this.isSimulated && e.stopPropagation()
+			},
+			stopImmediatePropagation: function() {
+				var e = this.originalEvent;
+				this.isImmediatePropagationStopped = Ee, e && !this.isSimulated && e.stopImmediatePropagation(), this.stopPropagation()
+			}
+		}, w.each({
+			altKey: !0,
+			bubbles: !0,
+			cancelable: !0,
+			changedTouches: !0,
+			ctrlKey: !0,
+			detail: !0,
+			eventPhase: !0,
+			metaKey: !0,
+			pageX: !0,
+			pageY: !0,
+			shiftKey: !0,
+			view: !0,
+			"char": !0,
+			charCode: !0,
+			key: !0,
+			keyCode: !0,
+			button: !0,
+			buttons: !0,
+			clientX: !0,
+			clientY: !0,
+			offsetX: !0,
+			offsetY: !0,
+			pointerId: !0,
+			pointerType: !0,
+			screenX: !0,
+			screenY: !0,
+			targetTouches: !0,
+			toElement: !0,
+			touches: !0,
+			which: function(e) {
+				var t = e.button;
+				return null == e.which && we.test(e.type) ? null != e.charCode ? e.charCode : e.keyCode : !e.which && void 0 !==
+					t && Te.test(e.type) ? 1 & t ? 1 : 2 & t ? 3 : 4 & t ? 2 : 0 : e.which
+			}
+		}, w.event.addProp), w.each({
+			mouseenter: "mouseover",
+			mouseleave: "mouseout",
+			pointerenter: "pointerover",
+			pointerleave: "pointerout"
+		}, function(e, t) {
+			w.event.special[e] = {
+				delegateType: t,
+				bindType: t,
+				handle: function(e) {
+					var n, r = this,
+						i = e.relatedTarget,
+						o = e.handleObj;
+					return i && (i === r || w.contains(r, i)) || (e.type = o.origType, n = o.handler.apply(this, arguments), e.type =
+						t), n
+				}
+			}
+		}), w.fn.extend({
+			on: function(e, t, n, r) {
+				return De(this, e, t, n, r)
+			},
+			one: function(e, t, n, r) {
+				return De(this, e, t, n, r, 1)
+			},
+			off: function(e, t, n) {
+				var r, i;
+				if (e && e.preventDefault && e.handleObj) {
+					return r = e.handleObj, w(e.delegateTarget).off(r.namespace ? r.origType + "." + r.namespace : r.origType, r.selector,
+						r.handler), this
+				}
+				if ("object" == typeof e) {
+					for (i in e) {
+						this.off(i, t, e[i])
+					}
+					return this
+				}
+				return !1 !== t && "function" != typeof t || (n = t, t = void 0), !1 === n && (n = ke), this.each(function() {
+					w.event.remove(this, e, n, t)
+				})
+			}
+		});
+		var Ne = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([a-z][^\/\0>\x20\t\r\n\f]*)[^>]*)\/>/gi,
+			Ae = /<script|<style|<link/i,
+			je = /checked\s*(?:[^=]|=\s*.checked.)/i,
+			qe = /^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;
+
+		function Le(e, t) {
+			return N(e, "table") && N(11 !== t.nodeType ? t : t.firstChild, "tr") ? w(e).children("tbody")[0] || e : e
+		}
+
+		function He(e) {
+			return e.type = (null !== e.getAttribute("type")) + "/" + e.type, e
+		}
+
+		function Oe(e) {
+			return "true/" === (e.type || "").slice(0, 5) ? e.type = e.type.slice(5) : e.removeAttribute("type"), e
+		}
+
+		function Pe(e, t) {
+			var n, r, i, o, a, s, u, l;
+			if (1 === t.nodeType) {
+				if (J.hasData(e) && (o = J.access(e), a = J.set(t, o), l = o.events)) {
+					delete a.handle, a.events = {};
+					for (i in l) {
+						for (n = 0, r = l[i].length; n < r; n++) {
+							w.event.add(t, i, l[i][n])
+						}
+					}
+				}
+				K.hasData(e) && (s = K.access(e), u = w.extend({}, s), K.set(t, u))
+			}
+		}
+
+		function Me(e, t) {
+			var n = t.nodeName.toLowerCase();
+			"input" === n && pe.test(e.type) ? t.checked = e.checked : "input" !== n && "textarea" !== n || (t.defaultValue =
+				e.defaultValue)
+		}
+
+		function Re(e, t, n, r) {
+			t = a.apply([], t);
+			var i, o, s, u, l, c, f = 0,
+				p = e.length,
+				d = p - 1,
+				y = t[0],
+				v = g(y);
+			if (v || p > 1 && "string" == typeof y && !h.checkClone && je.test(y)) {
+				return e.each(function(i) {
+					var o = e.eq(i);
+					v && (t[0] = y.call(this, i, o.html())), Re(o, t, n, r)
+				})
+			}
+			if (p && (i = xe(t, e[0].ownerDocument, !1, e, r), o = i.firstChild, 1 === i.childNodes.length && (i = o), o || r)) {
+				for (u = (s = w.map(ye(i, "script"), He)).length; f < p; f++) {
+					l = i, f !== d && (l = w.clone(l, !0, !0), u && w.merge(s, ye(l, "script"))), n.call(e[f], l, f)
+				}
+				if (u) {
+					for (c = s[s.length - 1].ownerDocument, w.map(s, Oe), f = 0; f < u; f++) {
+						l = s[f], he.test(l.type || "") && !J.access(l, "globalEval") && w.contains(c, l) && (l.src && "module" !== (l.type ||
+							"").toLowerCase() ? w._evalUrl && w._evalUrl(l.src) : m(l.textContent.replace(qe, ""), c, l))
+					}
+				}
+			}
+			return e
+		}
+
+		function Ie(e, t, n) {
+			for (var r, i = t ? w.filter(t, e) : e, o = 0; null != (r = i[o]); o++) {
+				n || 1 !== r.nodeType || w.cleanData(ye(r)), r.parentNode && (n && w.contains(r.ownerDocument, r) && ve(ye(r,
+					"script")), r.parentNode.removeChild(r))
+			}
+			return e
+		}
+		w.extend({
+			htmlPrefilter: function(e) {
+				return e.replace(Ne, "<$1></$2>")
+			},
+			clone: function(e, t, n) {
+				var r, i, o, a, s = e.cloneNode(!0),
+					u = w.contains(e.ownerDocument, e);
+				if (!(h.noCloneChecked || 1 !== e.nodeType && 11 !== e.nodeType || w.isXMLDoc(e))) {
+					for (a = ye(s), r = 0, i = (o = ye(e)).length; r < i; r++) {
+						Me(o[r], a[r])
+					}
+				}
+				if (t) {
+					if (n) {
+						for (o = o || ye(e), a = a || ye(s), r = 0, i = o.length; r < i; r++) {
+							Pe(o[r], a[r])
+						}
+					} else {
+						Pe(e, s)
+					}
+				}
+				return (a = ye(s, "script")).length > 0 && ve(a, !u && ye(e, "script")), s
+			},
+			cleanData: function(e) {
+				for (var t, n, r, i = w.event.special, o = 0; void 0 !== (n = e[o]); o++) {
+					if (Y(n)) {
+						if (t = n[J.expando]) {
+							if (t.events) {
+								for (r in t.events) {
+									i[r] ? w.event.remove(n, r) : w.removeEvent(n, r, t.handle)
+								}
+							}
+							n[J.expando] = void 0
+						}
+						n[K.expando] && (n[K.expando] = void 0)
+					}
+				}
+			}
+		}), w.fn.extend({
+			detach: function(e) {
+				return Ie(this, e, !0)
+			},
+			remove: function(e) {
+				return Ie(this, e)
+			},
+			text: function(e) {
+				return z(this, function(e) {
+					return void 0 === e ? w.text(this) : this.empty().each(function() {
+						1 !== this.nodeType && 11 !== this.nodeType && 9 !== this.nodeType || (this.textContent = e)
+					})
+				}, null, e, arguments.length)
+			},
+			append: function() {
+				return Re(this, arguments, function(e) {
+					1 !== this.nodeType && 11 !== this.nodeType && 9 !== this.nodeType || Le(this, e).appendChild(e)
+				})
+			},
+			prepend: function() {
+				return Re(this, arguments, function(e) {
+					if (1 === this.nodeType || 11 === this.nodeType || 9 === this.nodeType) {
+						var t = Le(this, e);
+						t.insertBefore(e, t.firstChild)
+					}
+				})
+			},
+			before: function() {
+				return Re(this, arguments, function(e) {
+					this.parentNode && this.parentNode.insertBefore(e, this)
+				})
+			},
+			after: function() {
+				return Re(this, arguments, function(e) {
+					this.parentNode && this.parentNode.insertBefore(e, this.nextSibling)
+				})
+			},
+			empty: function() {
+				for (var e, t = 0; null != (e = this[t]); t++) {
+					1 === e.nodeType && (w.cleanData(ye(e, !1)), e.textContent = "")
+				}
+				return this
+			},
+			clone: function(e, t) {
+				return e = null != e && e, t = null == t ? e : t, this.map(function() {
+					return w.clone(this, e, t)
+				})
+			},
+			html: function(e) {
+				return z(this, function(e) {
+					var t = this[0] || {},
+						n = 0,
+						r = this.length;
+					if (void 0 === e && 1 === t.nodeType) {
+						return t.innerHTML
+					}
+					if ("string" == typeof e && !Ae.test(e) && !ge[(de.exec(e) || ["", ""])[1].toLowerCase()]) {
+						e = w.htmlPrefilter(e);
+						try {
+							for (; n < r; n++) {
+								1 === (t = this[n] || {}).nodeType && (w.cleanData(ye(t, !1)), t.innerHTML = e)
+							}
+							t = 0
+						} catch (e) {}
+					}
+					t && this.empty().append(e)
+				}, null, e, arguments.length)
+			},
+			replaceWith: function() {
+				var e = [];
+				return Re(this, arguments, function(t) {
+					var n = this.parentNode;
+					w.inArray(this, e) < 0 && (w.cleanData(ye(this)), n && n.replaceChild(t, this))
+				}, e)
+			}
+		}), w.each({
+			appendTo: "append",
+			prependTo: "prepend",
+			insertBefore: "before",
+			insertAfter: "after",
+			replaceAll: "replaceWith"
+		}, function(e, t) {
+			w.fn[e] = function(e) {
+				for (var n, r = [], i = w(e), o = i.length - 1, a = 0; a <= o; a++) {
+					n = a === o ? this : this.clone(!0), w(i[a])[t](n), s.apply(r, n.get())
+				}
+				return this.pushStack(r)
+			}
+		});
+		var We = new RegExp("^(" + re + ")(?!px)[a-z%]+$", "i"),
+			$e = function(t) {
+				var n = t.ownerDocument.defaultView;
+				return n && n.opener || (n = e), n.getComputedStyle(t)
+			},
+			Be = new RegExp(oe.join("|"), "i");
+		! function() {
+			function t() {
+				if (c) {
+					l.style.cssText = "position:absolute;left:-11111px;width:60px;margin-top:1px;padding:0;border:0", c.style.cssText =
+						"position:relative;display:block;box-sizing:border-box;overflow:scroll;margin:auto;border:1px;padding:1px;width:60%;top:1%",
+						be.appendChild(l).appendChild(c);
+					var t = e.getComputedStyle(c);
+					i = "1%" !== t.top, u = 12 === n(t.marginLeft), c.style.right = "60%", s = 36 === n(t.right), o = 36 === n(t.width),
+						c.style.position = "absolute", a = 36 === c.offsetWidth || "absolute", be.removeChild(l), c = null
+				}
+			}
+
+			function n(e) {
+				return Math.round(parseFloat(e))
+			}
+			var i, o, a, s, u, l = r.createElement("div"),
+				c = r.createElement("div");
+			c.style && (c.style.backgroundClip = "content-box", c.cloneNode(!0).style.backgroundClip = "", h.clearCloneStyle =
+				"content-box" === c.style.backgroundClip, w.extend(h, {
+					boxSizingReliable: function() {
+						return t(), o
+					},
+					pixelBoxStyles: function() {
+						return t(), s
+					},
+					pixelPosition: function() {
+						return t(), i
+					},
+					reliableMarginLeft: function() {
+						return t(), u
+					},
+					scrollboxSize: function() {
+						return t(), a
+					}
+				}))
+		}();
+
+		function Fe(e, t, n) {
+			var r, i, o, a, s = e.style;
+			return (n = n || $e(e)) && ("" !== (a = n.getPropertyValue(t) || n[t]) || w.contains(e.ownerDocument, e) || (a = w
+					.style(e, t)), !h.pixelBoxStyles() && We.test(a) && Be.test(t) && (r = s.width, i = s.minWidth, o = s.maxWidth,
+					s.minWidth = s.maxWidth = s.width = a, a = n.width, s.width = r, s.minWidth = i, s.maxWidth = o)), void 0 !== a ?
+				a + "" : a
+		}
+
+		function _e(e, t) {
+			return {
+				get: function() {
+					if (!e()) {
+						return (this.get = t).apply(this, arguments)
+					}
+					delete this.get
+				}
+			}
+		}
+		var ze = /^(none|table(?!-c[ea]).+)/,
+			Xe = /^--/,
+			Ue = {
+				position: "absolute",
+				visibility: "hidden",
+				display: "block"
+			},
+			Ve = {
+				letterSpacing: "0",
+				fontWeight: "400"
+			},
+			Ge = ["Webkit", "Moz", "ms"],
+			Ye = r.createElement("div").style;
+
+		function Qe(e) {
+			if (e in Ye) {
+				return e
+			}
+			var t = e[0].toUpperCase() + e.slice(1),
+				n = Ge.length;
+			while (n--) {
+				if ((e = Ge[n] + t) in Ye) {
+					return e
+				}
+			}
+		}
+
+		function Je(e) {
+			var t = w.cssProps[e];
+			return t || (t = w.cssProps[e] = Qe(e) || e), t
+		}
+
+		function Ke(e, t, n) {
+			var r = ie.exec(t);
+			return r ? Math.max(0, r[2] - (n || 0)) + (r[3] || "px") : t
+		}
+
+		function Ze(e, t, n, r, i, o) {
+			var a = "width" === t ? 1 : 0,
+				s = 0,
+				u = 0;
+			if (n === (r ? "border" : "content")) {
+				return 0
+			}
+			for (; a < 4; a += 2) {
+				"margin" === n && (u += w.css(e, n + oe[a], !0, i)), r ? ("content" === n && (u -= w.css(e, "padding" + oe[a], !0,
+					i)), "margin" !== n && (u -= w.css(e, "border" + oe[a] + "Width", !0, i))) : (u += w.css(e, "padding" + oe[a],
+					!0, i), "padding" !== n ? u += w.css(e, "border" + oe[a] + "Width", !0, i) : s += w.css(e, "border" + oe[a] +
+					"Width", !0, i))
+			}
+			return !r && o >= 0 && (u += Math.max(0, Math.ceil(e["offset" + t[0].toUpperCase() + t.slice(1)] - o - u - s - 0.5))),
+				u
+		}
+
+		function et(e, t, n) {
+			var r = $e(e),
+				i = Fe(e, t, r),
+				o = "border-box" === w.css(e, "boxSizing", !1, r),
+				a = o;
+			if (We.test(i)) {
+				if (!n) {
+					return i
+				}
+				i = "auto"
+			}
+			return a = a && (h.boxSizingReliable() || i === e.style[t]), ("auto" === i || !parseFloat(i) && "inline" === w.css(
+					e, "display", !1, r)) && (i = e["offset" + t[0].toUpperCase() + t.slice(1)], a = !0), (i = parseFloat(i) || 0) +
+				Ze(e, t, n || (o ? "border" : "content"), a, r, i) + "px"
+		}
+		w.extend({
+			cssHooks: {
+				opacity: {
+					get: function(e, t) {
+						if (t) {
+							var n = Fe(e, "opacity");
+							return "" === n ? "1" : n
+						}
+					}
+				}
+			},
+			cssNumber: {
+				animationIterationCount: !0,
+				columnCount: !0,
+				fillOpacity: !0,
+				flexGrow: !0,
+				flexShrink: !0,
+				fontWeight: !0,
+				lineHeight: !0,
+				opacity: !0,
+				order: !0,
+				orphans: !0,
+				widows: !0,
+				zIndex: !0,
+				zoom: !0
+			},
+			cssProps: {},
+			style: function(e, t, n, r) {
+				if (e && 3 !== e.nodeType && 8 !== e.nodeType && e.style) {
+					var i, o, a, s = G(t),
+						u = Xe.test(t),
+						l = e.style;
+					if (u || (t = Je(s)), a = w.cssHooks[t] || w.cssHooks[s], void 0 === n) {
+						return a && "get" in a && void 0 !== (i = a.get(e, !1, r)) ? i : l[t]
+					}
+					"string" == (o = typeof n) && (i = ie.exec(n)) && i[1] && (n = ue(e, t, i), o = "number"), null != n && n ===
+						n && ("number" === o && (n += i && i[3] || (w.cssNumber[s] ? "" : "px")), h.clearCloneStyle || "" !== n || 0 !==
+							t.indexOf("background") || (l[t] = "inherit"), a && "set" in a && void 0 === (n = a.set(e, n, r)) || (u ? l
+								.setProperty(t, n) : l[t] = n))
+				}
+			},
+			css: function(e, t, n, r) {
+				var i, o, a, s = G(t);
+				return Xe.test(t) || (t = Je(s)), (a = w.cssHooks[t] || w.cssHooks[s]) && "get" in a && (i = a.get(e, !0, n)),
+					void 0 === i && (i = Fe(e, t, r)), "normal" === i && t in Ve && (i = Ve[t]), "" === n || n ? (o = parseFloat(
+						i), !0 === n || isFinite(o) ? o || 0 : i) : i
+			}
+		}), w.each(["height", "width"], function(e, t) {
+			w.cssHooks[t] = {
+				get: function(e, n, r) {
+					if (n) {
+						return !ze.test(w.css(e, "display")) || e.getClientRects().length && e.getBoundingClientRect().width ? et(e,
+							t, r) : se(e, Ue, function() {
+							return et(e, t, r)
+						})
+					}
+				},
+				set: function(e, n, r) {
+					var i, o = $e(e),
+						a = "border-box" === w.css(e, "boxSizing", !1, o),
+						s = r && Ze(e, t, r, a, o);
+					return a && h.scrollboxSize() === o.position && (s -= Math.ceil(e["offset" + t[0].toUpperCase() + t.slice(1)] -
+							parseFloat(o[t]) - Ze(e, t, "border", !1, o) - 0.5)), s && (i = ie.exec(n)) && "px" !== (i[3] || "px") &&
+						(e.style[t] = n, n = w.css(e, t)), Ke(e, n, s)
+				}
+			}
+		}), w.cssHooks.marginLeft = _e(h.reliableMarginLeft, function(e, t) {
+			if (t) {
+				return (parseFloat(Fe(e, "marginLeft")) || e.getBoundingClientRect().left - se(e, {
+					marginLeft: 0
+				}, function() {
+					return e.getBoundingClientRect().left
+				})) + "px"
+			}
+		}), w.each({
+			margin: "",
+			padding: "",
+			border: "Width"
+		}, function(e, t) {
+			w.cssHooks[e + t] = {
+				expand: function(n) {
+					for (var r = 0, i = {}, o = "string" == typeof n ? n.split(" ") : [n]; r < 4; r++) {
+						i[e + oe[r] + t] = o[r] || o[r - 2] || o[0]
+					}
+					return i
+				}
+			}, "margin" !== e && (w.cssHooks[e + t].set = Ke)
+		}), w.fn.extend({
+			css: function(e, t) {
+				return z(this, function(e, t, n) {
+					var r, i, o = {},
+						a = 0;
+					if (Array.isArray(t)) {
+						for (r = $e(e), i = t.length; a < i; a++) {
+							o[t[a]] = w.css(e, t[a], !1, r)
+						}
+						return o
+					}
+					return void 0 !== n ? w.style(e, t, n) : w.css(e, t)
+				}, e, t, arguments.length > 1)
+			}
+		});
+
+		function tt(e, t, n, r, i) {
+			return new tt.prototype.init(e, t, n, r, i)
+		}
+		w.Tween = tt, tt.prototype = {
+			constructor: tt,
+			init: function(e, t, n, r, i, o) {
+				this.elem = e, this.prop = n, this.easing = i || w.easing._default, this.options = t, this.start = this.now =
+					this.cur(), this.end = r, this.unit = o || (w.cssNumber[n] ? "" : "px")
+			},
+			cur: function() {
+				var e = tt.propHooks[this.prop];
+				return e && e.get ? e.get(this) : tt.propHooks._default.get(this)
+			},
+			run: function(e) {
+				var t, n = tt.propHooks[this.prop];
+				return this.options.duration ? this.pos = t = w.easing[this.easing](e, this.options.duration * e, 0, 1, this.options
+						.duration) : this.pos = t = e, this.now = (this.end - this.start) * t + this.start, this.options.step && this
+					.options.step.call(this.elem, this.now, this), n && n.set ? n.set(this) : tt.propHooks._default.set(this),
+					this
+			}
+		}, tt.prototype.init.prototype = tt.prototype, tt.propHooks = {
+			_default: {
+				get: function(e) {
+					var t;
+					return 1 !== e.elem.nodeType || null != e.elem[e.prop] && null == e.elem.style[e.prop] ? e.elem[e.prop] : (t =
+						w.css(e.elem, e.prop, "")) && "auto" !== t ? t : 0
+				},
+				set: function(e) {
+					w.fx.step[e.prop] ? w.fx.step[e.prop](e) : 1 !== e.elem.nodeType || null == e.elem.style[w.cssProps[e.prop]] &&
+						!w.cssHooks[e.prop] ? e.elem[e.prop] = e.now : w.style(e.elem, e.prop, e.now + e.unit)
+				}
+			}
+		}, tt.propHooks.scrollTop = tt.propHooks.scrollLeft = {
+			set: function(e) {
+				e.elem.nodeType && e.elem.parentNode && (e.elem[e.prop] = e.now)
+			}
+		}, w.easing = {
+			linear: function(e) {
+				return e
+			},
+			swing: function(e) {
+				return 0.5 - Math.cos(e * Math.PI) / 2
+			},
+			_default: "swing"
+		}, w.fx = tt.prototype.init, w.fx.step = {};
+		var nt, rt, it = /^(?:toggle|show|hide)$/,
+			ot = /queueHooks$/;
+
+		function at() {
+			rt && (!1 === r.hidden && e.requestAnimationFrame ? e.requestAnimationFrame(at) : e.setTimeout(at, w.fx.interval),
+				w.fx.tick())
+		}
+
+		function st() {
+			return e.setTimeout(function() {
+				nt = void 0
+			}), nt = Date.now()
+		}
+
+		function ut(e, t) {
+			var n, r = 0,
+				i = {
+					height: e
+				};
+			for (t = t ? 1 : 0; r < 4; r += 2 - t) {
+				i["margin" + (n = oe[r])] = i["padding" + n] = e
+			}
+			return t && (i.opacity = i.width = e), i
+		}
+
+		function lt(e, t, n) {
+			for (var r, i = (pt.tweeners[t] || []).concat(pt.tweeners["*"]), o = 0, a = i.length; o < a; o++) {
+				if (r = i[o].call(n, t, e)) {
+					return r
+				}
+			}
+		}
+
+		function ct(e, t, n) {
+			var r, i, o, a, s, u, l, c, f = "width" in t || "height" in t,
+				p = this,
+				d = {},
+				h = e.style,
+				g = e.nodeType && ae(e),
+				y = J.get(e, "fxshow");
+			n.queue || (null == (a = w._queueHooks(e, "fx")).unqueued && (a.unqueued = 0, s = a.empty.fire, a.empty.fire =
+				function() {
+					a.unqueued || s()
+				}), a.unqueued++, p.always(function() {
+				p.always(function() {
+					a.unqueued--, w.queue(e, "fx").length || a.empty.fire()
+				})
+			}));
+			for (r in t) {
+				if (i = t[r], it.test(i)) {
+					if (delete t[r], o = o || "toggle" === i, i === (g ? "hide" : "show")) {
+						if ("show" !== i || !y || void 0 === y[r]) {
+							continue
+						}
+						g = !0
+					}
+					d[r] = y && y[r] || w.style(e, r)
+				}
+			}
+			if ((u = !w.isEmptyObject(t)) || !w.isEmptyObject(d)) {
+				f && 1 === e.nodeType && (n.overflow = [h.overflow, h.overflowX, h.overflowY], null == (l = y && y.display) && (l =
+					J.get(e, "display")), "none" === (c = w.css(e, "display")) && (l ? c = l : (fe([e], !0), l = e.style.display ||
+					l, c = w.css(e, "display"), fe([e]))), ("inline" === c || "inline-block" === c && null != l) && "none" === w.css(
+					e, "float") && (u || (p.done(function() {
+					h.display = l
+				}), null == l && (c = h.display, l = "none" === c ? "" : c)), h.display = "inline-block")), n.overflow && (h.overflow =
+					"hidden", p.always(function() {
+						h.overflow = n.overflow[0], h.overflowX = n.overflow[1], h.overflowY = n.overflow[2]
+					})), u = !1;
+				for (r in d) {
+					u || (y ? "hidden" in y && (g = y.hidden) : y = J.access(e, "fxshow", {
+						display: l
+					}), o && (y.hidden = !g), g && fe([e], !0), p.done(function() {
+						g || fe([e]), J.remove(e, "fxshow");
+						for (r in d) {
+							w.style(e, r, d[r])
+						}
+					})), u = lt(g ? y[r] : 0, r, p), r in y || (y[r] = u.start, g && (u.end = u.start, u.start = 0))
+				}
+			}
+		}
+
+		function ft(e, t) {
+			var n, r, i, o, a;
+			for (n in e) {
+				if (r = G(n), i = t[r], o = e[n], Array.isArray(o) && (i = o[1], o = e[n] = o[0]), n !== r && (e[r] = o, delete e[
+						n]), (a = w.cssHooks[r]) && "expand" in a) {
+					o = a.expand(o), delete e[r];
+					for (n in o) {
+						n in e || (e[n] = o[n], t[n] = i)
+					}
+				} else {
+					t[r] = i
+				}
+			}
+		}
+
+		function pt(e, t, n) {
+			var r, i, o = 0,
+				a = pt.prefilters.length,
+				s = w.Deferred().always(function() {
+					delete u.elem
+				}),
+				u = function() {
+					if (i) {
+						return !1
+					}
+					for (var t = nt || st(), n = Math.max(0, l.startTime + l.duration - t), r = 1 - (n / l.duration || 0), o = 0, a =
+							l.tweens.length; o < a; o++) {
+						l.tweens[o].run(r)
+					}
+					return s.notifyWith(e, [l, r, n]), r < 1 && a ? n : (a || s.notifyWith(e, [l, 1, 0]), s.resolveWith(e, [l]), !1)
+				},
+				l = s.promise({
+					elem: e,
+					props: w.extend({}, t),
+					opts: w.extend(!0, {
+						specialEasing: {},
+						easing: w.easing._default
+					}, n),
+					originalProperties: t,
+					originalOptions: n,
+					startTime: nt || st(),
+					duration: n.duration,
+					tweens: [],
+					createTween: function(t, n) {
+						var r = w.Tween(e, l.opts, t, n, l.opts.specialEasing[t] || l.opts.easing);
+						return l.tweens.push(r), r
+					},
+					stop: function(t) {
+						var n = 0,
+							r = t ? l.tweens.length : 0;
+						if (i) {
+							return this
+						}
+						for (i = !0; n < r; n++) {
+							l.tweens[n].run(1)
+						}
+						return t ? (s.notifyWith(e, [l, 1, 0]), s.resolveWith(e, [l, t])) : s.rejectWith(e, [l, t]), this
+					}
+				}),
+				c = l.props;
+			for (ft(c, l.opts.specialEasing); o < a; o++) {
+				if (r = pt.prefilters[o].call(l, e, c, l.opts)) {
+					return g(r.stop) && (w._queueHooks(l.elem, l.opts.queue).stop = r.stop.bind(r)), r
+				}
+			}
+			return w.map(c, lt, l), g(l.opts.start) && l.opts.start.call(e, l), l.progress(l.opts.progress).done(l.opts.done,
+				l.opts.complete).fail(l.opts.fail).always(l.opts.always), w.fx.timer(w.extend(u, {
+				elem: e,
+				anim: l,
+				queue: l.opts.queue
+			})), l
+		}
+		w.Animation = w.extend(pt, {
+				tweeners: {
+					"*": [function(e, t) {
+						var n = this.createTween(e, t);
+						return ue(n.elem, e, ie.exec(t), n), n
+					}]
+				},
+				tweener: function(e, t) {
+					g(e) ? (t = e, e = ["*"]) : e = e.match(M);
+					for (var n, r = 0, i = e.length; r < i; r++) {
+						n = e[r], pt.tweeners[n] = pt.tweeners[n] || [], pt.tweeners[n].unshift(t)
+					}
+				},
+				prefilters: [ct],
+				prefilter: function(e, t) {
+					t ? pt.prefilters.unshift(e) : pt.prefilters.push(e)
+				}
+			}), w.speed = function(e, t, n) {
+				var r = e && "object" == typeof e ? w.extend({}, e) : {
+					complete: n || !n && t || g(e) && e,
+					duration: e,
+					easing: n && t || t && !g(t) && t
+				};
+				return w.fx.off ? r.duration = 0 : "number" != typeof r.duration && (r.duration in w.fx.speeds ? r.duration = w.fx
+						.speeds[r.duration] : r.duration = w.fx.speeds._default), null != r.queue && !0 !== r.queue || (r.queue = "fx"),
+					r.old = r.complete, r.complete = function() {
+						g(r.old) && r.old.call(this), r.queue && w.dequeue(this, r.queue)
+					}, r
+			}, w.fn.extend({
+				fadeTo: function(e, t, n, r) {
+					return this.filter(ae).css("opacity", 0).show().end().animate({
+						opacity: t
+					}, e, n, r)
+				},
+				animate: function(e, t, n, r) {
+					var i = w.isEmptyObject(e),
+						o = w.speed(t, n, r),
+						a = function() {
+							var t = pt(this, w.extend({}, e), o);
+							(i || J.get(this, "finish")) && t.stop(!0)
+						};
+					return a.finish = a, i || !1 === o.queue ? this.each(a) : this.queue(o.queue, a)
+				},
+				stop: function(e, t, n) {
+					var r = function(e) {
+						var t = e.stop;
+						delete e.stop, t(n)
+					};
+					return "string" != typeof e && (n = t, t = e, e = void 0), t && !1 !== e && this.queue(e || "fx", []), this.each(
+						function() {
+							var t = !0,
+								i = null != e && e + "queueHooks",
+								o = w.timers,
+								a = J.get(this);
+							if (i) {
+								a[i] && a[i].stop && r(a[i])
+							} else {
+								for (i in a) {
+									a[i] && a[i].stop && ot.test(i) && r(a[i])
+								}
+							}
+							for (i = o.length; i--;) {
+								o[i].elem !== this || null != e && o[i].queue !== e || (o[i].anim.stop(n), t = !1, o.splice(i, 1))
+							}!t && n || w.dequeue(this, e)
+						})
+				},
+				finish: function(e) {
+					return !1 !== e && (e = e || "fx"), this.each(function() {
+						var t, n = J.get(this),
+							r = n[e + "queue"],
+							i = n[e + "queueHooks"],
+							o = w.timers,
+							a = r ? r.length : 0;
+						for (n.finish = !0, w.queue(this, e, []), i && i.stop && i.stop.call(this, !0), t = o.length; t--;) {
+							o[t].elem === this && o[t].queue === e && (o[t].anim.stop(!0), o.splice(t, 1))
+						}
+						for (t = 0; t < a; t++) {
+							r[t] && r[t].finish && r[t].finish.call(this)
+						}
+						delete n.finish
+					})
+				}
+			}), w.each(["toggle", "show", "hide"], function(e, t) {
+				var n = w.fn[t];
+				w.fn[t] = function(e, r, i) {
+					return null == e || "boolean" == typeof e ? n.apply(this, arguments) : this.animate(ut(t, !0), e, r, i)
+				}
+			}), w.each({
+				slideDown: ut("show"),
+				slideUp: ut("hide"),
+				slideToggle: ut("toggle"),
+				fadeIn: {
+					opacity: "show"
+				},
+				fadeOut: {
+					opacity: "hide"
+				},
+				fadeToggle: {
+					opacity: "toggle"
+				}
+			}, function(e, t) {
+				w.fn[e] = function(e, n, r) {
+					return this.animate(t, e, n, r)
+				}
+			}), w.timers = [], w.fx.tick = function() {
+				var e, t = 0,
+					n = w.timers;
+				for (nt = Date.now(); t < n.length; t++) {
+					(e = n[t])() || n[t] !== e || n.splice(t--, 1)
+				}
+				n.length || w.fx.stop(), nt = void 0
+			}, w.fx.timer = function(e) {
+				w.timers.push(e), w.fx.start()
+			}, w.fx.interval = 13, w.fx.start = function() {
+				rt || (rt = !0, at())
+			}, w.fx.stop = function() {
+				rt = null
+			}, w.fx.speeds = {
+				slow: 600,
+				fast: 200,
+				_default: 400
+			}, w.fn.delay = function(t, n) {
+				return t = w.fx ? w.fx.speeds[t] || t : t, n = n || "fx", this.queue(n, function(n, r) {
+					var i = e.setTimeout(n, t);
+					r.stop = function() {
+						e.clearTimeout(i)
+					}
+				})
+			},
+			function() {
+				var e = r.createElement("input"),
+					t = r.createElement("select").appendChild(r.createElement("option"));
+				e.type = "checkbox", h.checkOn = "" !== e.value, h.optSelected = t.selected, (e = r.createElement("input")).value =
+					"t", e.type = "radio", h.radioValue = "t" === e.value
+			}();
+		var dt, ht = w.expr.attrHandle;
+		w.fn.extend({
+			attr: function(e, t) {
+				return z(this, w.attr, e, t, arguments.length > 1)
+			},
+			removeAttr: function(e) {
+				return this.each(function() {
+					w.removeAttr(this, e)
+				})
+			}
+		}), w.extend({
+			attr: function(e, t, n) {
+				var r, i, o = e.nodeType;
+				if (3 !== o && 8 !== o && 2 !== o) {
+					return "undefined" == typeof e.getAttribute ? w.prop(e, t, n) : (1 === o && w.isXMLDoc(e) || (i = w.attrHooks[
+							t.toLowerCase()] || (w.expr.match.bool.test(t) ? dt : void 0)), void 0 !== n ? null === n ? void w.removeAttr(
+							e, t) : i && "set" in i && void 0 !== (r = i.set(e, n, t)) ? r : (e.setAttribute(t, n + ""), n) : i &&
+						"get" in i && null !== (r = i.get(e, t)) ? r : null == (r = w.find.attr(e, t)) ? void 0 : r)
+				}
+			},
+			attrHooks: {
+				type: {
+					set: function(e, t) {
+						if (!h.radioValue && "radio" === t && N(e, "input")) {
+							var n = e.value;
+							return e.setAttribute("type", t), n && (e.value = n), t
+						}
+					}
+				}
+			},
+			removeAttr: function(e, t) {
+				var n, r = 0,
+					i = t && t.match(M);
+				if (i && 1 === e.nodeType) {
+					while (n = i[r++]) {
+						e.removeAttribute(n)
+					}
+				}
+			}
+		}), dt = {
+			set: function(e, t, n) {
+				return !1 === t ? w.removeAttr(e, n) : e.setAttribute(n, n), n
+			}
+		}, w.each(w.expr.match.bool.source.match(/\w+/g), function(e, t) {
+			var n = ht[t] || w.find.attr;
+			ht[t] = function(e, t, r) {
+				var i, o, a = t.toLowerCase();
+				return r || (o = ht[a], ht[a] = i, i = null != n(e, t, r) ? a : null, ht[a] = o), i
+			}
+		});
+		var gt = /^(?:input|select|textarea|button)$/i,
+			yt = /^(?:a|area)$/i;
+		w.fn.extend({
+			prop: function(e, t) {
+				return z(this, w.prop, e, t, arguments.length > 1)
+			},
+			removeProp: function(e) {
+				return this.each(function() {
+					delete this[w.propFix[e] || e]
+				})
+			}
+		}), w.extend({
+			prop: function(e, t, n) {
+				var r, i, o = e.nodeType;
+				if (3 !== o && 8 !== o && 2 !== o) {
+					return 1 === o && w.isXMLDoc(e) || (t = w.propFix[t] || t, i = w.propHooks[t]), void 0 !== n ? i && "set" in
+						i && void 0 !== (r = i.set(e, n, t)) ? r : e[t] = n : i && "get" in i && null !== (r = i.get(e, t)) ? r : e[
+							t]
+				}
+			},
+			propHooks: {
+				tabIndex: {
+					get: function(e) {
+						var t = w.find.attr(e, "tabindex");
+						return t ? parseInt(t, 10) : gt.test(e.nodeName) || yt.test(e.nodeName) && e.href ? 0 : -1
+					}
+				}
+			},
+			propFix: {
+				"for": "htmlFor",
+				"class": "className"
+			}
+		}), h.optSelected || (w.propHooks.selected = {
+			get: function(e) {
+				var t = e.parentNode;
+				return t && t.parentNode && t.parentNode.selectedIndex, null
+			},
+			set: function(e) {
+				var t = e.parentNode;
+				t && (t.selectedIndex, t.parentNode && t.parentNode.selectedIndex)
+			}
+		}), w.each(["tabIndex", "readOnly", "maxLength", "cellSpacing", "cellPadding", "rowSpan", "colSpan", "useMap",
+			"frameBorder", "contentEditable"
+		], function() {
+			w.propFix[this.toLowerCase()] = this
+		});
+
+		function vt(e) {
+			return (e.match(M) || []).join(" ")
+		}
+
+		function mt(e) {
+			return e.getAttribute && e.getAttribute("class") || ""
+		}
+
+		function xt(e) {
+			return Array.isArray(e) ? e : "string" == typeof e ? e.match(M) || [] : []
+		}
+		w.fn.extend({
+			addClass: function(e) {
+				var t, n, r, i, o, a, s, u = 0;
+				if (g(e)) {
+					return this.each(function(t) {
+						w(this).addClass(e.call(this, t, mt(this)))
+					})
+				}
+				if ((t = xt(e)).length) {
+					while (n = this[u++]) {
+						if (i = mt(n), r = 1 === n.nodeType && " " + vt(i) + " ") {
+							a = 0;
+							while (o = t[a++]) {
+								r.indexOf(" " + o + " ") < 0 && (r += o + " ")
+							}
+							i !== (s = vt(r)) && n.setAttribute("class", s)
+						}
+					}
+				}
+				return this
+			},
+			removeClass: function(e) {
+				var t, n, r, i, o, a, s, u = 0;
+				if (g(e)) {
+					return this.each(function(t) {
+						w(this).removeClass(e.call(this, t, mt(this)))
+					})
+				}
+				if (!arguments.length) {
+					return this.attr("class", "")
+				}
+				if ((t = xt(e)).length) {
+					while (n = this[u++]) {
+						if (i = mt(n), r = 1 === n.nodeType && " " + vt(i) + " ") {
+							a = 0;
+							while (o = t[a++]) {
+								while (r.indexOf(" " + o + " ") > -1) {
+									r = r.replace(" " + o + " ", " ")
+								}
+							}
+							i !== (s = vt(r)) && n.setAttribute("class", s)
+						}
+					}
+				}
+				return this
+			},
+			toggleClass: function(e, t) {
+				var n = typeof e,
+					r = "string" === n || Array.isArray(e);
+				return "boolean" == typeof t && r ? t ? this.addClass(e) : this.removeClass(e) : g(e) ? this.each(function(n) {
+					w(this).toggleClass(e.call(this, n, mt(this), t), t)
+				}) : this.each(function() {
+					var t, i, o, a;
+					if (r) {
+						i = 0, o = w(this), a = xt(e);
+						while (t = a[i++]) {
+							o.hasClass(t) ? o.removeClass(t) : o.addClass(t)
+						}
+					} else {
+						void 0 !== e && "boolean" !== n || ((t = mt(this)) && J.set(this, "__className__", t), this.setAttribute &&
+							this.setAttribute("class", t || !1 === e ? "" : J.get(this, "__className__") || ""))
+					}
+				})
+			},
+			hasClass: function(e) {
+				var t, n, r = 0;
+				t = " " + e + " ";
+				while (n = this[r++]) {
+					if (1 === n.nodeType && (" " + vt(mt(n)) + " ").indexOf(t) > -1) {
+						return !0
+					}
+				}
+				return !1
+			}
+		});
+		var bt = /\r/g;
+		w.fn.extend({
+			val: function(e) {
+				var t, n, r, i = this[0];
+				if (arguments.length) {
+					return r = g(e), this.each(function(n) {
+						var i;
+						1 === this.nodeType && (null == (i = r ? e.call(this, n, w(this).val()) : e) ? i = "" : "number" == typeof i ?
+							i += "" : Array.isArray(i) && (i = w.map(i, function(e) {
+								return null == e ? "" : e + ""
+							})), (t = w.valHooks[this.type] || w.valHooks[this.nodeName.toLowerCase()]) && "set" in t && void 0 !==
+							t.set(this, i, "value") || (this.value = i))
+					})
+				}
+				if (i) {
+					return (t = w.valHooks[i.type] || w.valHooks[i.nodeName.toLowerCase()]) && "get" in t && void 0 !== (n = t.get(
+						i, "value")) ? n : "string" == typeof(n = i.value) ? n.replace(bt, "") : null == n ? "" : n
+				}
+			}
+		}), w.extend({
+			valHooks: {
+				option: {
+					get: function(e) {
+						var t = w.find.attr(e, "value");
+						return null != t ? t : vt(w.text(e))
+					}
+				},
+				select: {
+					get: function(e) {
+						var t, n, r, i = e.options,
+							o = e.selectedIndex,
+							a = "select-one" === e.type,
+							s = a ? null : [],
+							u = a ? o + 1 : i.length;
+						for (r = o < 0 ? u : a ? o : 0; r < u; r++) {
+							if (((n = i[r]).selected || r === o) && !n.disabled && (!n.parentNode.disabled || !N(n.parentNode,
+									"optgroup"))) {
+								if (t = w(n).val(), a) {
+									return t
+								}
+								s.push(t)
+							}
+						}
+						return s
+					},
+					set: function(e, t) {
+						var n, r, i = e.options,
+							o = w.makeArray(t),
+							a = i.length;
+						while (a--) {
+							((r = i[a]).selected = w.inArray(w.valHooks.option.get(r), o) > -1) && (n = !0)
+						}
+						return n || (e.selectedIndex = -1), o
+					}
+				}
+			}
+		}), w.each(["radio", "checkbox"], function() {
+			w.valHooks[this] = {
+				set: function(e, t) {
+					if (Array.isArray(t)) {
+						return e.checked = w.inArray(w(e).val(), t) > -1
+					}
+				}
+			}, h.checkOn || (w.valHooks[this].get = function(e) {
+				return null === e.getAttribute("value") ? "on" : e.value
+			})
+		}), h.focusin = "onfocusin" in e;
+		var wt = /^(?:focusinfocus|focusoutblur)$/,
+			Tt = function(e) {
+				e.stopPropagation()
+			};
+		w.extend(w.event, {
+			trigger: function(t, n, i, o) {
+				var a, s, u, l, c, p, d, h, v = [i || r],
+					m = f.call(t, "type") ? t.type : t,
+					x = f.call(t, "namespace") ? t.namespace.split(".") : [];
+				if (s = h = u = i = i || r, 3 !== i.nodeType && 8 !== i.nodeType && !wt.test(m + w.event.triggered) && (m.indexOf(
+							".") > -1 && (m = (x = m.split(".")).shift(), x.sort()), c = m.indexOf(":") < 0 && "on" + m, t = t[w.expando] ?
+						t : new w.Event(m, "object" == typeof t && t), t.isTrigger = o ? 2 : 3, t.namespace = x.join("."), t.rnamespace =
+						t.namespace ? new RegExp("(^|\\.)" + x.join("\\.(?:.*\\.|)") + "(\\.|$)") : null, t.result = void 0, t.target ||
+						(t.target = i), n = null == n ? [t] : w.makeArray(n, [t]), d = w.event.special[m] || {}, o || !d.trigger ||
+						!1 !== d.trigger.apply(i, n))) {
+					if (!o && !d.noBubble && !y(i)) {
+						for (l = d.delegateType || m, wt.test(l + m) || (s = s.parentNode); s; s = s.parentNode) {
+							v.push(s), u = s
+						}
+						u === (i.ownerDocument || r) && v.push(u.defaultView || u.parentWindow || e)
+					}
+					a = 0;
+					while ((s = v[a++]) && !t.isPropagationStopped()) {
+						h = s, t.type = a > 1 ? l : d.bindType || m, (p = (J.get(s, "events") || {})[t.type] && J.get(s, "handle")) &&
+							p.apply(s, n), (p = c && s[c]) && p.apply && Y(s) && (t.result = p.apply(s, n), !1 === t.result && t.preventDefault())
+					}
+					return t.type = m, o || t.isDefaultPrevented() || d._default && !1 !== d._default.apply(v.pop(), n) || !Y(i) ||
+						c && g(i[m]) && !y(i) && ((u = i[c]) && (i[c] = null), w.event.triggered = m, t.isPropagationStopped() && h.addEventListener(
+								m, Tt), i[m](), t.isPropagationStopped() && h.removeEventListener(m, Tt), w.event.triggered = void 0, u &&
+							(i[c] = u)), t.result
+				}
+			},
+			simulate: function(e, t, n) {
+				var r = w.extend(new w.Event, n, {
+					type: e,
+					isSimulated: !0
+				});
+				w.event.trigger(r, null, t)
+			}
+		}), w.fn.extend({
+			trigger: function(e, t) {
+				return this.each(function() {
+					w.event.trigger(e, t, this)
+				})
+			},
+			triggerHandler: function(e, t) {
+				var n = this[0];
+				if (n) {
+					return w.event.trigger(e, t, n, !0)
+				}
+			}
+		}), h.focusin || w.each({
+			focus: "focusin",
+			blur: "focusout"
+		}, function(e, t) {
+			var n = function(e) {
+				w.event.simulate(t, e.target, w.event.fix(e))
+			};
+			w.event.special[t] = {
+				setup: function() {
+					var r = this.ownerDocument || this,
+						i = J.access(r, t);
+					i || r.addEventListener(e, n, !0), J.access(r, t, (i || 0) + 1)
+				},
+				teardown: function() {
+					var r = this.ownerDocument || this,
+						i = J.access(r, t) - 1;
+					i ? J.access(r, t, i) : (r.removeEventListener(e, n, !0), J.remove(r, t))
+				}
+			}
+		});
+		var Ct = e.location,
+			Et = Date.now(),
+			kt = /\?/;
+		w.parseXML = function(t) {
+			var n;
+			if (!t || "string" != typeof t) {
+				return null
+			}
+			try {
+				n = (new e.DOMParser).parseFromString(t, "text/xml")
+			} catch (e) {
+				n = void 0
+			}
+			return n && !n.getElementsByTagName("parsererror").length || w.error("Invalid XML: " + t), n
+		};
+		var St = /\[\]$/,
+			Dt = /\r?\n/g,
+			Nt = /^(?:submit|button|image|reset|file)$/i,
+			At = /^(?:input|select|textarea|keygen)/i;
+
+		function jt(e, t, n, r) {
+			var i;
+			if (Array.isArray(t)) {
+				w.each(t, function(t, i) {
+					n || St.test(e) ? r(e, i) : jt(e + "[" + ("object" == typeof i && null != i ? t : "") + "]", i, n, r)
+				})
+			} else {
+				if (n || "object" !== x(t)) {
+					r(e, t)
+				} else {
+					for (i in t) {
+						jt(e + "[" + i + "]", t[i], n, r)
+					}
+				}
+			}
+		}
+		w.param = function(e, t) {
+			var n, r = [],
+				i = function(e, t) {
+					var n = g(t) ? t() : t;
+					r[r.length] = encodeURIComponent(e) + "=" + encodeURIComponent(null == n ? "" : n)
+				};
+			if (Array.isArray(e) || e.jquery && !w.isPlainObject(e)) {
+				w.each(e, function() {
+					i(this.name, this.value)
+				})
+			} else {
+				for (n in e) {
+					jt(n, e[n], t, i)
+				}
+			}
+			return r.join("&")
+		}, w.fn.extend({
+			serialize: function() {
+				return w.param(this.serializeArray())
+			},
+			serializeArray: function() {
+				return this.map(function() {
+					var e = w.prop(this, "elements");
+					return e ? w.makeArray(e) : this
+				}).filter(function() {
+					var e = this.type;
+					return this.name && !w(this).is(":disabled") && At.test(this.nodeName) && !Nt.test(e) && (this.checked || !
+						pe.test(e))
+				}).map(function(e, t) {
+					var n = w(this).val();
+					return null == n ? null : Array.isArray(n) ? w.map(n, function(e) {
+						return {
+							name: t.name,
+							value: e.replace(Dt, "\r\n")
+						}
+					}) : {
+						name: t.name,
+						value: n.replace(Dt, "\r\n")
+					}
+				}).get()
+			}
+		});
+		var qt = /%20/g,
+			Lt = /#.*$/,
+			Ht = /([?&])_=[^&]*/,
+			Ot = /^(.*?):[ \t]*([^\r\n]*)$/gm,
+			Pt = /^(?:about|app|app-storage|.+-extension|file|res|widget):$/,
+			Mt = /^(?:GET|HEAD)$/,
+			Rt = /^\/\//,
+			It = {},
+			Wt = {},
+			$t = "*/".concat("*"),
+			Bt = r.createElement("a");
+		Bt.href = Ct.href;
+
+		function Ft(e) {
+			return function(t, n) {
+				"string" != typeof t && (n = t, t = "*");
+				var r, i = 0,
+					o = t.toLowerCase().match(M) || [];
+				if (g(n)) {
+					while (r = o[i++]) {
+						"+" === r[0] ? (r = r.slice(1) || "*", (e[r] = e[r] || []).unshift(n)) : (e[r] = e[r] || []).push(n)
+					}
+				}
+			}
+		}
+
+		function _t(e, t, n, r) {
+			var i = {},
+				o = e === Wt;
+
+			function a(s) {
+				var u;
+				return i[s] = !0, w.each(e[s] || [], function(e, s) {
+					var l = s(t, n, r);
+					return "string" != typeof l || o || i[l] ? o ? !(u = l) : void 0 : (t.dataTypes.unshift(l), a(l), !1)
+				}), u
+			}
+			return a(t.dataTypes[0]) || !i["*"] && a("*")
+		}
+
+		function zt(e, t) {
+			var n, r, i = w.ajaxSettings.flatOptions || {};
+			for (n in t) {
+				void 0 !== t[n] && ((i[n] ? e : r || (r = {}))[n] = t[n])
+			}
+			return r && w.extend(!0, e, r), e
+		}
+
+		function Xt(e, t, n) {
+			var r, i, o, a, s = e.contents,
+				u = e.dataTypes;
+			while ("*" === u[0]) {
+				u.shift(), void 0 === r && (r = e.mimeType || t.getResponseHeader("Content-Type"))
+			}
+			if (r) {
+				for (i in s) {
+					if (s[i] && s[i].test(r)) {
+						u.unshift(i);
+						break
+					}
+				}
+			}
+			if (u[0] in n) {
+				o = u[0]
+			} else {
+				for (i in n) {
+					if (!u[0] || e.converters[i + " " + u[0]]) {
+						o = i;
+						break
+					}
+					a || (a = i)
+				}
+				o = o || a
+			}
+			if (o) {
+				return o !== u[0] && u.unshift(o), n[o]
+			}
+		}
+
+		function Ut(e, t, n, r) {
+			var i, o, a, s, u, l = {},
+				c = e.dataTypes.slice();
+			if (c[1]) {
+				for (a in e.converters) {
+					l[a.toLowerCase()] = e.converters[a]
+				}
+			}
+			o = c.shift();
+			while (o) {
+				if (e.responseFields[o] && (n[e.responseFields[o]] = t), !u && r && e.dataFilter && (t = e.dataFilter(t, e.dataType)),
+					u = o, o = c.shift()) {
+					if ("*" === o) {
+						o = u
+					} else {
+						if ("*" !== u && u !== o) {
+							if (!(a = l[u + " " + o] || l["* " + o])) {
+								for (i in l) {
+									if ((s = i.split(" "))[1] === o && (a = l[u + " " + s[0]] || l["* " + s[0]])) {
+										!0 === a ? a = l[i] : !0 !== l[i] && (o = s[0], c.unshift(s[1]));
+										break
+									}
+								}
+							}
+							if (!0 !== a) {
+								if (a && e["throws"]) {
+									t = a(t)
+								} else {
+									try {
+										t = a(t)
+									} catch (e) {
+										return {
+											state: "parsererror",
+											error: a ? e : "No conversion from " + u + " to " + o
+										}
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+			return {
+				state: "success",
+				data: t
+			}
+		}
+		w.extend({
+			active: 0,
+			lastModified: {},
+			etag: {},
+			ajaxSettings: {
+				url: Ct.href,
+				type: "GET",
+				isLocal: Pt.test(Ct.protocol),
+				global: !0,
+				processData: !0,
+				async: !0,
+				contentType: "application/x-www-form-urlencoded; charset=UTF-8",
+				accepts: {
+					"*": $t,
+					text: "text/plain",
+					html: "text/html",
+					xml: "application/xml, text/xml",
+					json: "application/json, text/javascript"
+				},
+				contents: {
+					xml: /\bxml\b/,
+					html: /\bhtml/,
+					json: /\bjson\b/
+				},
+				responseFields: {
+					xml: "responseXML",
+					text: "responseText",
+					json: "responseJSON"
+				},
+				converters: {
+					"* text": String,
+					"text html": !0,
+					"text json": JSON.parse,
+					"text xml": w.parseXML
+				},
+				flatOptions: {
+					url: !0,
+					context: !0
+				}
+			},
+			ajaxSetup: function(e, t) {
+				return t ? zt(zt(e, w.ajaxSettings), t) : zt(w.ajaxSettings, e)
+			},
+			ajaxPrefilter: Ft(It),
+			ajaxTransport: Ft(Wt),
+			ajax: function(t, n) {
+				"object" == typeof t && (n = t, t = void 0), n = n || {};
+				var i, o, a, s, u, l, c, f, p, d, h = w.ajaxSetup({}, n),
+					g = h.context || h,
+					y = h.context && (g.nodeType || g.jquery) ? w(g) : w.event,
+					v = w.Deferred(),
+					m = w.Callbacks("once memory"),
+					x = h.statusCode || {},
+					b = {},
+					T = {},
+					C = "canceled",
+					E = {
+						readyState: 0,
+						getResponseHeader: function(e) {
+							var t;
+							if (c) {
+								if (!s) {
+									s = {};
+									while (t = Ot.exec(a)) {
+										s[t[1].toLowerCase()] = t[2]
+									}
+								}
+								t = s[e.toLowerCase()]
+							}
+							return null == t ? null : t
+						},
+						getAllResponseHeaders: function() {
+							return c ? a : null
+						},
+						setRequestHeader: function(e, t) {
+							return null == c && (e = T[e.toLowerCase()] = T[e.toLowerCase()] || e, b[e] = t), this
+						},
+						overrideMimeType: function(e) {
+							return null == c && (h.mimeType = e), this
+						},
+						statusCode: function(e) {
+							var t;
+							if (e) {
+								if (c) {
+									E.always(e[E.status])
+								} else {
+									for (t in e) {
+										x[t] = [x[t], e[t]]
+									}
+								}
+							}
+							return this
+						},
+						abort: function(e) {
+							var t = e || C;
+							return i && i.abort(t), k(0, t), this
+						}
+					};
+				if (v.promise(E), h.url = ((t || h.url || Ct.href) + "").replace(Rt, Ct.protocol + "//"), h.type = n.method ||
+					n.type || h.method || h.type, h.dataTypes = (h.dataType || "*").toLowerCase().match(M) || [""], null == h.crossDomain
+				) {
+					l = r.createElement("a");
+					try {
+						l.href = h.url, l.href = l.href, h.crossDomain = Bt.protocol + "//" + Bt.host != l.protocol + "//" + l.host
+					} catch (e) {
+						h.crossDomain = !0
+					}
+				}
+				if (h.data && h.processData && "string" != typeof h.data && (h.data = w.param(h.data, h.traditional)), _t(It,
+						h, n, E), c) {
+					return E
+				}(f = w.event && h.global) && 0 == w.active++ && w.event.trigger("ajaxStart"), h.type = h.type.toUpperCase(),
+					h.hasContent = !Mt.test(h.type), o = h.url.replace(Lt, ""), h.hasContent ? h.data && h.processData && 0 ===
+					(h.contentType || "").indexOf("application/x-www-form-urlencoded") && (h.data = h.data.replace(qt, "+")) : (d =
+						h.url.slice(o.length), h.data && (h.processData || "string" == typeof h.data) && (o += (kt.test(o) ? "&" :
+							"?") + h.data, delete h.data), !1 === h.cache && (o = o.replace(Ht, "$1"), d = (kt.test(o) ? "&" : "?") +
+							"_=" + Et++ + d), h.url = o + d), h.ifModified && (w.lastModified[o] && E.setRequestHeader(
+						"If-Modified-Since", w.lastModified[o]), w.etag[o] && E.setRequestHeader("If-None-Match", w.etag[o])), (h.data &&
+						h.hasContent && !1 !== h.contentType || n.contentType) && E.setRequestHeader("Content-Type", h.contentType),
+					E.setRequestHeader("Accept", h.dataTypes[0] && h.accepts[h.dataTypes[0]] ? h.accepts[h.dataTypes[0]] + ("*" !==
+						h.dataTypes[0] ? ", " + $t + "; q=0.01" : "") : h.accepts["*"]);
+				for (p in h.headers) {
+					E.setRequestHeader(p, h.headers[p])
+				}
+				if (h.beforeSend && (!1 === h.beforeSend.call(g, E, h) || c)) {
+					return E.abort()
+				}
+				if (C = "abort", m.add(h.complete), E.done(h.success), E.fail(h.error), i = _t(Wt, h, n, E)) {
+					if (E.readyState = 1, f && y.trigger("ajaxSend", [E, h]), c) {
+						return E
+					}
+					h.async && h.timeout > 0 && (u = e.setTimeout(function() {
+						E.abort("timeout")
+					}, h.timeout));
+					try {
+						c = !1, i.send(b, k)
+					} catch (e) {
+						if (c) {
+							throw e
+						}
+						k(-1, e)
+					}
+				} else {
+					k(-1, "No Transport")
+				}
+
+				function k(t, n, r, s) {
+					var l, p, d, b, T, C = n;
+					c || (c = !0, u && e.clearTimeout(u), i = void 0, a = s || "", E.readyState = t > 0 ? 4 : 0, l = t >= 200 &&
+						t < 300 || 304 === t, r && (b = Xt(h, E, r)), b = Ut(h, b, E, l), l ? (h.ifModified && ((T = E.getResponseHeader(
+								"Last-Modified")) && (w.lastModified[o] = T), (T = E.getResponseHeader("etag")) && (w.etag[o] = T)), 204 ===
+							t || "HEAD" === h.type ? C = "nocontent" : 304 === t ? C = "notmodified" : (C = b.state, p = b.data, l = !
+								(d = b.error))) : (d = C, !t && C || (C = "error", t < 0 && (t = 0))), E.status = t, E.statusText = (n ||
+							C) + "", l ? v.resolveWith(g, [p, C, E]) : v.rejectWith(g, [E, C, d]), E.statusCode(x), x = void 0, f && y
+						.trigger(l ? "ajaxSuccess" : "ajaxError", [E, h, l ? p : d]), m.fireWith(g, [E, C]), f && (y.trigger(
+							"ajaxComplete", [E, h]), --w.active || w.event.trigger("ajaxStop")))
+				}
+				return E
+			},
+			getJSON: function(e, t, n) {
+				return w.get(e, t, n, "json")
+			},
+			getScript: function(e, t) {
+				return w.get(e, void 0, t, "script")
+			}
+		}), w.each(["get", "post"], function(e, t) {
+			w[t] = function(e, n, r, i) {
+				return g(n) && (i = i || r, r = n, n = void 0), w.ajax(w.extend({
+					url: e,
+					type: t,
+					dataType: i,
+					data: n,
+					success: r
+				}, w.isPlainObject(e) && e))
+			}
+		}), w._evalUrl = function(e) {
+			return w.ajax({
+				url: e,
+				type: "GET",
+				dataType: "script",
+				cache: !0,
+				async: !1,
+				global: !1,
+				"throws": !0
+			})
+		}, w.fn.extend({
+			wrapAll: function(e) {
+				var t;
+				return this[0] && (g(e) && (e = e.call(this[0])), t = w(e, this[0].ownerDocument).eq(0).clone(!0), this[0].parentNode &&
+					t.insertBefore(this[0]), t.map(function() {
+						var e = this;
+						while (e.firstElementChild) {
+							e = e.firstElementChild
+						}
+						return e
+					}).append(this)), this
+			},
+			wrapInner: function(e) {
+				return g(e) ? this.each(function(t) {
+					w(this).wrapInner(e.call(this, t))
+				}) : this.each(function() {
+					var t = w(this),
+						n = t.contents();
+					n.length ? n.wrapAll(e) : t.append(e)
+				})
+			},
+			wrap: function(e) {
+				var t = g(e);
+				return this.each(function(n) {
+					w(this).wrapAll(t ? e.call(this, n) : e)
+				})
+			},
+			unwrap: function(e) {
+				return this.parent(e).not("body").each(function() {
+					w(this).replaceWith(this.childNodes)
+				}), this
+			}
+		}), w.expr.pseudos.hidden = function(e) {
+			return !w.expr.pseudos.visible(e)
+		}, w.expr.pseudos.visible = function(e) {
+			return !!(e.offsetWidth || e.offsetHeight || e.getClientRects().length)
+		}, w.ajaxSettings.xhr = function() {
+			try {
+				return new e.XMLHttpRequest
+			} catch (e) {}
+		};
+		var Vt = {
+				0: 200,
+				1223: 204
+			},
+			Gt = w.ajaxSettings.xhr();
+		h.cors = !!Gt && "withCredentials" in Gt, h.ajax = Gt = !!Gt, w.ajaxTransport(function(t) {
+			var n, r;
+			if (h.cors || Gt && !t.crossDomain) {
+				return {
+					send: function(i, o) {
+						var a, s = t.xhr();
+						if (s.open(t.type, t.url, t.async, t.username, t.password), t.xhrFields) {
+							for (a in t.xhrFields) {
+								s[a] = t.xhrFields[a]
+							}
+						}
+						t.mimeType && s.overrideMimeType && s.overrideMimeType(t.mimeType), t.crossDomain || i["X-Requested-With"] ||
+							(i["X-Requested-With"] = "XMLHttpRequest");
+						for (a in i) {
+							s.setRequestHeader(a, i[a])
+						}
+						n = function(e) {
+								return function() {
+									n && (n = r = s.onload = s.onerror = s.onabort = s.ontimeout = s.onreadystatechange = null, "abort" ===
+										e ? s.abort() : "error" === e ? "number" != typeof s.status ? o(0, "error") : o(s.status, s.statusText) :
+										o(Vt[s.status] || s.status, s.statusText, "text" !== (s.responseType || "text") || "string" != typeof s
+											.responseText ? {
+												binary: s.response
+											} : {
+												text: s.responseText
+											}, s.getAllResponseHeaders()))
+								}
+							}, s.onload = n(), r = s.onerror = s.ontimeout = n("error"), void 0 !== s.onabort ? s.onabort = r : s.onreadystatechange =
+							function() {
+								4 === s.readyState && e.setTimeout(function() {
+									n && r()
+								})
+							}, n = n("abort");
+						try {
+							s.send(t.hasContent && t.data || null)
+						} catch (e) {
+							if (n) {
+								throw e
+							}
+						}
+					},
+					abort: function() {
+						n && n()
+					}
+				}
+			}
+		}), w.ajaxPrefilter(function(e) {
+			e.crossDomain && (e.contents.script = !1)
+		}), w.ajaxSetup({
+			accepts: {
+				script: "text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"
+			},
+			contents: {
+				script: /\b(?:java|ecma)script\b/
+			},
+			converters: {
+				"text script": function(e) {
+					return w.globalEval(e), e
+				}
+			}
+		}), w.ajaxPrefilter("script", function(e) {
+			void 0 === e.cache && (e.cache = !1), e.crossDomain && (e.type = "GET")
+		}), w.ajaxTransport("script", function(e) {
+			if (e.crossDomain) {
+				var t, n;
+				return {
+					send: function(i, o) {
+						t = w("<script>").prop({
+							charset: e.scriptCharset,
+							src: e.url
+						}).on("load error", n = function(e) {
+							t.remove(), n = null, e && o("error" === e.type ? 404 : 200, e.type)
+						}), r.head.appendChild(t[0])
+					},
+					abort: function() {
+						n && n()
+					}
+				}
+			}
+		});
+		var Yt = [],
+			Qt = /(=)\?(?=&|$)|\?\?/;
+		w.ajaxSetup({
+				jsonp: "callback",
+				jsonpCallback: function() {
+					var e = Yt.pop() || w.expando + "_" + Et++;
+					return this[e] = !0, e
+				}
+			}), w.ajaxPrefilter("json jsonp", function(t, n, r) {
+				var i, o, a, s = !1 !== t.jsonp && (Qt.test(t.url) ? "url" : "string" == typeof t.data && 0 === (t.contentType ||
+					"").indexOf("application/x-www-form-urlencoded") && Qt.test(t.data) && "data");
+				if (s || "jsonp" === t.dataTypes[0]) {
+					return i = t.jsonpCallback = g(t.jsonpCallback) ? t.jsonpCallback() : t.jsonpCallback, s ? t[s] = t[s].replace(
+						Qt, "$1" + i) : !1 !== t.jsonp && (t.url += (kt.test(t.url) ? "&" : "?") + t.jsonp + "=" + i), t.converters[
+						"script json"] = function() {
+						return a || w.error(i + " was not called"), a[0]
+					}, t.dataTypes[0] = "json", o = e[i], e[i] = function() {
+						a = arguments
+					}, r.always(function() {
+						void 0 === o ? w(e).removeProp(i) : e[i] = o, t[i] && (t.jsonpCallback = n.jsonpCallback, Yt.push(i)), a &&
+							g(o) && o(a[0]), a = o = void 0
+					}), "script"
+				}
+			}), h.createHTMLDocument = function() {
+				var e = r.implementation.createHTMLDocument("").body;
+				return e.innerHTML = "<form></form><form></form>", 2 === e.childNodes.length
+			}(), w.parseHTML = function(e, t, n) {
+				if ("string" != typeof e) {
+					return []
+				}
+				"boolean" == typeof t && (n = t, t = !1);
+				var i, o, a;
+				return t || (h.createHTMLDocument ? ((i = (t = r.implementation.createHTMLDocument("")).createElement("base")).href =
+					r.location.href, t.head.appendChild(i)) : t = r), o = A.exec(e), a = !n && [], o ? [t.createElement(o[1])] : (o =
+					xe([e], t, a), a && a.length && w(a).remove(), w.merge([], o.childNodes))
+			}, w.fn.load = function(e, t, n) {
+				var r, i, o, a = this,
+					s = e.indexOf(" ");
+				return s > -1 && (r = vt(e.slice(s)), e = e.slice(0, s)), g(t) ? (n = t, t = void 0) : t && "object" == typeof t &&
+					(i = "POST"), a.length > 0 && w.ajax({
+						url: e,
+						type: i || "GET",
+						dataType: "html",
+						data: t
+					}).done(function(e) {
+						o = arguments, a.html(r ? w("<div>").append(w.parseHTML(e)).find(r) : e)
+					}).always(n && function(e, t) {
+						a.each(function() {
+							n.apply(this, o || [e.responseText, t, e])
+						})
+					}), this
+			}, w.each(["ajaxStart", "ajaxStop", "ajaxComplete", "ajaxError", "ajaxSuccess", "ajaxSend"], function(e, t) {
+				w.fn[t] = function(e) {
+					return this.on(t, e)
+				}
+			}), w.expr.pseudos.animated = function(e) {
+				return w.grep(w.timers, function(t) {
+					return e === t.elem
+				}).length
+			}, w.offset = {
+				setOffset: function(e, t, n) {
+					var r, i, o, a, s, u, l, c = w.css(e, "position"),
+						f = w(e),
+						p = {};
+					"static" === c && (e.style.position = "relative"), s = f.offset(), o = w.css(e, "top"), u = w.css(e, "left"), (
+							l = ("absolute" === c || "fixed" === c) && (o + u).indexOf("auto") > -1) ? (a = (r = f.position()).top, i = r
+							.left) : (a = parseFloat(o) || 0, i = parseFloat(u) || 0), g(t) && (t = t.call(e, n, w.extend({}, s))), null !=
+						t.top && (p.top = t.top - s.top + a), null != t.left && (p.left = t.left - s.left + i), "using" in t ? t.using
+						.call(e, p) : f.css(p)
+				}
+			}, w.fn.extend({
+				offset: function(e) {
+					if (arguments.length) {
+						return void 0 === e ? this : this.each(function(t) {
+							w.offset.setOffset(this, e, t)
+						})
+					}
+					var t, n, r = this[0];
+					if (r) {
+						return r.getClientRects().length ? (t = r.getBoundingClientRect(), n = r.ownerDocument.defaultView, {
+							top: t.top + n.pageYOffset,
+							left: t.left + n.pageXOffset
+						}) : {
+							top: 0,
+							left: 0
+						}
+					}
+				},
+				position: function() {
+					if (this[0]) {
+						var e, t, n, r = this[0],
+							i = {
+								top: 0,
+								left: 0
+							};
+						if ("fixed" === w.css(r, "position")) {
+							t = r.getBoundingClientRect()
+						} else {
+							t = this.offset(), n = r.ownerDocument, e = r.offsetParent || n.documentElement;
+							while (e && (e === n.body || e === n.documentElement) && "static" === w.css(e, "position")) {
+								e = e.parentNode
+							}
+							e && e !== r && 1 === e.nodeType && ((i = w(e).offset()).top += w.css(e, "borderTopWidth", !0), i.left += w.css(
+								e, "borderLeftWidth", !0))
+						}
+						return {
+							top: t.top - i.top - w.css(r, "marginTop", !0),
+							left: t.left - i.left - w.css(r, "marginLeft", !0)
+						}
+					}
+				},
+				offsetParent: function() {
+					return this.map(function() {
+						var e = this.offsetParent;
+						while (e && "static" === w.css(e, "position")) {
+							e = e.offsetParent
+						}
+						return e || be
+					})
+				}
+			}), w.each({
+				scrollLeft: "pageXOffset",
+				scrollTop: "pageYOffset"
+			}, function(e, t) {
+				var n = "pageYOffset" === t;
+				w.fn[e] = function(r) {
+					return z(this, function(e, r, i) {
+						var o;
+						if (y(e) ? o = e : 9 === e.nodeType && (o = e.defaultView), void 0 === i) {
+							return o ? o[t] : e[r]
+						}
+						o ? o.scrollTo(n ? o.pageXOffset : i, n ? i : o.pageYOffset) : e[r] = i
+					}, e, r, arguments.length)
+				}
+			}), w.each(["top", "left"], function(e, t) {
+				w.cssHooks[t] = _e(h.pixelPosition, function(e, n) {
+					if (n) {
+						return n = Fe(e, t), We.test(n) ? w(e).position()[t] + "px" : n
+					}
+				})
+			}), w.each({
+				Height: "height",
+				Width: "width"
+			}, function(e, t) {
+				w.each({
+					padding: "inner" + e,
+					content: t,
+					"": "outer" + e
+				}, function(n, r) {
+					w.fn[r] = function(i, o) {
+						var a = arguments.length && (n || "boolean" != typeof i),
+							s = n || (!0 === i || !0 === o ? "margin" : "border");
+						return z(this, function(t, n, i) {
+							var o;
+							return y(t) ? 0 === r.indexOf("outer") ? t["inner" + e] : t.document.documentElement["client" + e] : 9 ===
+								t.nodeType ? (o = t.documentElement, Math.max(t.body["scroll" + e], o["scroll" + e], t.body["offset" +
+									e], o["offset" + e], o["client" + e])) : void 0 === i ? w.css(t, n, s) : w.style(t, n, i, s)
+						}, t, a ? i : void 0, a)
+					}
+				})
+			}), w.each(
+				"blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu"
+				.split(" "),
+				function(e, t) {
+					w.fn[t] = function(e, n) {
+						return arguments.length > 0 ? this.on(t, null, e, n) : this.trigger(t)
+					}
+				}), w.fn.extend({
+				hover: function(e, t) {
+					return this.mouseenter(e).mouseleave(t || e)
+				}
+			}), w.fn.extend({
+				bind: function(e, t, n) {
+					return this.on(e, null, t, n)
+				},
+				unbind: function(e, t) {
+					return this.off(e, null, t)
+				},
+				delegate: function(e, t, n, r) {
+					return this.on(t, e, n, r)
+				},
+				undelegate: function(e, t, n) {
+					return 1 === arguments.length ? this.off(e, "**") : this.off(t, e || "**", n)
+				}
+			}), w.proxy = function(e, t) {
+				var n, r, i;
+				if ("string" == typeof t && (n = e[t], t = e, e = n), g(e)) {
+					return r = o.call(arguments, 2), i = function() {
+						return e.apply(t || this, r.concat(o.call(arguments)))
+					}, i.guid = e.guid = e.guid || w.guid++, i
+				}
+			}, w.holdReady = function(e) {
+				e ? w.readyWait++ : w.ready(!0)
+			}, w.isArray = Array.isArray, w.parseJSON = JSON.parse, w.nodeName = N, w.isFunction = g, w.isWindow = y, w.camelCase =
+			G, w.type = x, w.now = Date.now, w.isNumeric = function(e) {
+				var t = w.type(e);
+				return ("number" === t || "string" === t) && !isNaN(e - parseFloat(e))
+			}, "function" == typeof define && define.amd && define("jquery", [], function() {
+				return w
+			});
+		var Jt = e.jQuery,
+			Kt = e.$;
+		return w.noConflict = function(t) {
+			return e.$ === w && (e.$ = Kt), t && e.jQuery === w && (e.jQuery = Jt), w
+		}, t || (e.jQuery = e.$ = w), w
+	});
+
+	var easyUploader = function(configs) {
+		if (!configs || !configs.id) {
+			alert('缺少配置参数');
+			return;
+		}
+		if (!(this instanceof easyUploader)) return new easyUploader(configs);
+		this.initPlugin(configs);
+	};
+	var defaultConfigs = {
+			id: "",
+			/* 渲染容器id */
+			accept: '.jpg,.png',
+			/* 上传类型 */
+			action: "",
+			/* 上传地址 */
+			autoUpload: false,
+			/* 是否开启自动上传 */
+			crossDomain: true,
+			/* 是否允许跨域 */
+			data: null,
+			/* 上传配置参数，依据dataFormat而不同， */
+			dataFormat: 'formData',
+			/* 上传表单类型，有formData和base64两种 */
+			dataType: 'json',
+			/* 同$.ajax，默认返回数据格式为json */
+			headers: {
+				// testKey: 'testValue'
+			},
+			/* 上传的请求头部，视需要配置 */
+			maxCount: 3,
+			/* 最大上传文件数 */
+			maxSize: 3,
+			/* 最大上传文件体积，单位M */
+			multiple: false,
+			/* 是否开启多选上传 */
+			name: 'file',
+			/* 上传的文件字段名 */
+			previewWidth: 70,
+			/* 压缩预览图的宽度，样式中高度等于宽度 */
+			processData: false,
+			/* 同$.ajax参数，这里默认为false */
+			successKey: 'code',
+			/* 标识上传成功的key */
+			successValue: 200,
+			/* 标识上传成功对应的value */
+			showAlert: true,
+			/* 是否开启alert提示 */
+			timeout: 0,
+			/* ajax请求超时时间，默认值为0，表示永不超时*/
+			withCredentials: true,
+			/* 是否支持发送 cookie 凭证信息 */
+			beforeUpload: null,
+			/* ajax上传前的回调函数 */
+			onAlert: null,
+			/* alert时的回调函数 */
+			onChange: null,
+			/* input change的回调函数 */
+			onError: null,
+			/* 上传失败时的回调函数 */
+			onRemove: null,
+			/* 移除文件时的回调函数 */
+			onSuccess: null,
+			/* 上传成功时的回调函数 */
+		},
+		iconFile = 'data:img/jpg;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAABkCAYAAABw4pVUAAAD3klEQVR4Xu2cTUhUYRSG329GK+lPF5m0sXATLXJRCf5lmOmmFkLQaiAJjCIpimojVKtISAgjkIioVq4yaNEP2J8a5KogCG1hmxAlnLJobJr5ooWZ4ATjOXfmXHpdz3m / 9 z7PPXNHYXTgjykCzlQblgGFGLsJKIRCjBEwVocbQiHGCBirww2hEGMEjNXhhlCIMQLG6nBDKMQYAWN1uCEUYoyAsTrcEAoxRsBYHW4IhRgjYKwON4RCjBEwVocbQiHGCBirE8yG1H2tBJIlwVyre43B4ulgsvOfqi + kPj4MoDrAS3vfXnF3X + /uiw8AlGc4p9/FRlsD7BBYtK6Q2i / 1 iKSfB9Z2PviVb99 + Fog8yXyWv + JiYydy0EX1CF0hNfFmRPFQtWGmMI9L / nBVAsC5f5zX6 mKj / Tnpo3RImIV4pNHkj1R1A6hclIf3caSSm1zbeFyJV + AxukJq43sQwaPAW88d4DF5esvtmq66nhtwriHDuRdcbPR8zjoJD9IVUhdvgsNjYafsxr2fgcMteHzKblD66sg0ZqN9GFk1IU36e15XSK43RJPEUrI8pjBYXLqU0UwzukJy + VDXpCDJSkd2YmjNC0lEcBvyPwpJoQXDxWrPTW6I9NYOm5DyMoe9NRGsXCG98vzOf0sA94fT + DDhFxYJk5DSEoe3d5bll6Ti6YkfwLZDSUxOp + dTwyTk + P4oOg8WKCLJf1Tn9RR67 / 0 Mp5ADjRFcPVmYf4qKDY51J9E3ENINoZDs7wTVT1lb25KNy4uil + dqrFuLgo0bfMgf5 wuhjn90ianP + POeNfs9derNzcKB7NEvPqEqpKbDN8Pl6K + 9 WgSkOR4twz3O5u8hFCK1C93vqVMIhcgJSBP4liUlqDxPIcpApXEUIiWoPE8hykClcRQiJag8TyHKQKVxFCIlqDxPIcpApXEUIiWoPE8hykClcRQiJag8TyHKQKVxFCIlqDxPIcpApXEUIiWoPE8hykClcRQiJag8TyHKQKVxFCIlqDxPIcpApXEUIiWoPE8hykClcRQiJag8TyHKQKVxFCIlqDxPIcpApXEUIiWoPE8hykClcRQiJag8TyHKQKVxloVUd / gG5 / BUeo1hmvceu172uGdanVW / 0 lZ7xq9OJzDmgPVaBU3neEy5IlQMdbkZrZ6qQn6X2nHUl0Uj2KxV0HJOKo13I9ec4X / PZJleSLqpb0hIrttsTQoxpoZCKMQYAWN1uCEUYoyAsTrcEAoxRsBYHW4IhRgjYKwON4RCjBEwVocbQiHGCBirww2hEGMEjNXhhlCIMQLG6nBDKMQYAWN1uCEUYoyAsTq /AHksh3RWY + nuAAAAAElFTkSuQmCC '; // 非图像文件预览的base64编码
+
+	easyUploader.prototype = {
+		configs: {},
+		/* 当前实例的配置 */
+		files: [],
+		fileId: 0,
+		/* ajax待传文件id */
+		fileObj: {
+			fileList: [],
+			/* 当前实例选中过滤后的文件 */
+			isReady: true /* 图片转base是异步的，用开关来控制每一次更新 */
+		},
+		node: { /* 用于接收dom节点 */
+			list: null,
+			input: null
+		},
+		ajax: {
+			example: null,
+			isReady: true,
+			index: 0,
+			/*用于接收最近一个等待上传文件的索引 */
+		},
+		initPlugin: function(configs) {
+			this.configs = Object.assign({}, defaultConfigs, configs);
+			var container = document.getElementById(this.configs.id);
+			if (!container) {
+				alert("没有找到id为" + this.configs.id + "的渲染容器");
+				return;
+			} else {
+				container.innerHTML = this.buildUploader();
+				this.bindHeadEvent();
+			}
+			this.startInterceptor(); /* 启动拦截器 */
+		},
+		buildUploader: function() {
+			var html = '';
+			html += '<div class="easy-uploader">' +
+				'<div class="btn-box">' +
+				'<div class="btn-select-file btn">' +
+				'<div class="f55">' +
+				'+' +
+				'</div>' +
+				'选取文件' +
+				'</div>'
+				// +  '<i class="btn-check-all cursor-select checkbox unchecked"></i>'
+				+
+				'<input class="input-file" type="file" accept="' + this.configs.accept + '" ' +
+				(this.configs.multiple ? 'multiple="multiple" ' : '') +
+				'style="display:none;"></input>' +
+				'</div>' +
+				'<ul class="list">' +
+				'</ul>' +
+				'</div>';
+			return html;
+		},
+		updateHeadDom: function() {
+			let isAllChecked = true;
+			this.files.forEach(function(item) {
+				if (!item.checked) {
+					isAllChecked = false;
+				}
+			});
+			if (isAllChecked) {
+				$(this.node.input).siblings('.checkbox').removeClass('unchecked').addClass('checked');
+			} else {
+				$(this.node.input).siblings('.checkbox').removeClass('checked').addClass('unchecked');
+			}
+		},
+		updateFilesDom: function() {
+			var that = this,
+				html = '';
+			var buildCheckBox = function(fileItem) {
+					if (that.configs.multiple) {
+						if (fileItem.checked) {
+							return '<i class="btn-check-item select-icon cursor-select checkbox checked"></i>';
+						} else {
+							return '<i class="btn-check-item select-icon cursor-select checkbox unchecked"></i>';
+						}
+					} else {
+						return '';
+					}
+				},
+				matchProgressText = function(fileItem) {
+					if (fileItem.uploadPercentage == 0) {
+						if (fileItem.uploadStatus == 'loading') {
+							return '等待';
+						} else {
+							return '0%';
+						}
+					} else {
+						if (fileItem.uploadStatus == 'error') {
+							return '失败';
+						} else {
+							return (fileItem.uploadPercentage + '%');
+						}
+					}
+				};
+			this.files.forEach(function(fileItem, index) {
+				html += '<li id="' + fileItem.id + '" class="list-item">' +
+					'<div class="preview">' +
+					'<img class="preview-img" src="' + fileItem.previewBase + '" />' +
+					'</div>' +
+					'<div class="info">' +
+					'<a class="filename">' +
+					fileItem.file.name +
+					'</a>' +
+					'<div class="progress-wrapper">' +
+					'<div class="progressbar" style="width:' + fileItem.uploadPercentage + '%;' +
+					(fileItem.uploadStatus == 'error' ? 'background-color:#f56c6c' : '') + '">' +
+					'</div>' +
+					'<div class="progress-text">' +
+					matchProgressText(fileItem) +
+					'</div>' +
+					'</div>' +
+					buildCheckBox(fileItem) +
+					'</div>' +
+					'<label class="btn-delete-item delete-label cursor-select">' +
+					'<i class="icon icon-95 f16 white"></i>' +
+					'</label>' +
+					'</li>';
+			});
+			this.node.list.html(html);
+			this.bindListEvent();
+			this.updateHeadDom(); /* 每更新一次list，默认调一次updateHeadDom */
+		},
+		bindHeadEvent: function() {
+			var that = this;
+			$(".btn-select-file").off("click").on("click", function() {
+				that.node.list = $(this).parent().siblings(".list");
+				$(this).parent().children(".input-file").trigger("click").on("change", function(e) {
+					that.fileObj = {
+						fileList: e.target.files,
+						isReady: true
+					};
+					that.node.input = $(this);
+					that.updateFiles();
+					that.configs.onChange && that.configs.onChange(e.target.files);
+				});
+			});
+			$(".btn-upload-file").off("click").on("click", function() {
+				var hasLoading = false; /* 用于标识队列中还存在上传状态 */
+				that.files.forEach(function(item) {
+					if (item.uploadStatus == 'loading') {
+						hasLoading = true;
+					}
+				});
+				if (hasLoading) {
+					if (that.ajax.isReady) {
+						var message = '正在上传，请稍后';
+						if (that.configs.showAlert) {
+							alert(message);
+						}
+						that.configs.onAlert && that.configs.onAlert(message);
+					} else {
+						that.ajax.isReady = true;
+						that.upload();
+					}
+				} else {
+					that.ajax.isReady = true;
+					that.upload();
+				}
+			});
+			$(".btn-delete-file").off("click").on("click", function() {
+				var hasLoading = false;
+				that.files.forEach(function(item) {
+					if (item.checked && item.uploadStatus == 'loading') {
+						hasLoading = true;
+					}
+				});
+				if (hasLoading) {
+					var message = '正在上传，请稍后操作';
+					if (that.configs.showAlert) {
+						alert(message);
+					}
+					that.configs.onAlert && that.configs.onAlert(message);
+				} else {
+					var newFiles = [];
+					that.ajax.isReady = false;
+					that.files.forEach(function(item) {
+						if (!item.checked) {
+							newFiles.push(item);
+						}
+					});
+					that.files = newFiles;
+					that.updateFilesDom();
+					that.ajax.isReady = true;
+				}
+			});
+			$(".btn-cancel-upload").off("click").on("click", function() {
+				that.ajax.isReady = false; /* 关闭开关 */
+				that.ajax.example.abort();
+				that.files.forEach(function(item) {
+					if (item.uploadStatus == 'loading') {
+						item.uploadStatus = 'waiting';
+					}
+				});
+				that.updateFilesDom();
+			});
+			$(".btn-check-all").off("click").on("click", function() {
+				var isChecked = true;
+				if ($(this).hasClass('checked')) {
+					isChecked = false;
+					$(this).removeClass('checked').addClass('unchecked');
+				} else {
+					isChecked = true;
+					$(this).removeClass('unchecked').addClass('checked');
+				}
+				that.files.forEach(function(item) {
+					item.checked = isChecked;
+					if (!item.checked && item.uploadStatus == 'loading') {
+						item.uploadStatus = 'waiting';
+					}
+				});
+				that.updateFilesDom();
+			});
+		},
+		bindListEvent: function() {
+			var id = undefined,
+				that = this;
+			$(".btn-delete-item").off("click").on("click", function() {
+				id = $(this).parent().attr('id');
+				if ((that.files[that.ajax.index] && that.files[that.ajax.index].id == id) && that.files[that.ajax.index].uploadStatus ==
+					'loading') {
+					var message = '正在上传，请稍后操作';
+					if (that.configs.showAlert) {
+						alert(message);
+					}
+					that.configs.onAlert && that.configs.onAlert(message);
+				} else {
+					that.ajax.isReady = false;
+					that.files.forEach(function(item, index) {
+						if (item.id == id) {
+							that.files.splice(index, 1);
+						}
+					});
+					that.updateFilesDom();
+					that.ajax.isReady = true;
+				}
+			});
+			$(".btn-check-item").off("click").on("click", function() {
+				id = $(this).parent().parent().attr('id');
+				that.files.forEach(function(item, index) {
+					if (item.id == id) {
+						if (item.checked) {
+							item.checked = false;
+							if (item.uploadStatus == 'loading') {
+								item.uploadStatus = 'waiting';
+							}
+						} else {
+							item.checked = true;
+						}
+					}
+				});
+				that.updateFilesDom();
+			});
+		},
+		checkImg: function(file) {
+			var imgTypes = ['image/jpeg', 'image/jpg', 'image/png', 'image/gif'],
+				isImg = false;
+			imgTypes.forEach(function(type) {
+				if (file.type == type) isImg = true;
+			});
+			return isImg;
+		},
+		convertToBase: function(file) {
+			var reader,
+				isImg = this.checkImg(file);
+			if (typeof FileReader !== 'undefined') {
+				reader = new FileReader();
+			} else {
+				if (window.FileReader) reader = new window.FileReader();
+			}
+			reader.onload = (e) => {
+				var base = e.target.result;
+				if (isImg) {
+					this.compressImg(base, file);
+				} else {
+					this.formatFile(file, iconFile, base);
+				}
+			}
+			reader.readAsDataURL(file);
+		},
+		compressImg: function(base, file) {
+			var img;
+			if (typeof Image !== 'undefined') {
+				img = new Image();
+			} else {
+				if (window.Image) img = new window.Image();
+			}
+			var drawImg = (img, w, h) => {
+				var canvas = document.createElement('canvas');
+				var ctx = canvas.getContext('2d');
+				var drawImage = ctx.drawImage;
+				ctx.drawImage = (img, sx, sy, sw, sh, dx, dy, dw, dh) => {
+					var vertSquashRatio = 1;
+					if (arguments.length == 9)
+						drawImage.call(ctx, img, sx, sy, sw, sh, dx, dy, dw, dh / vertSquashRatio);
+					else if (typeof sw != 'undefined') {
+						drawImage.call(ctx, img, sx, sy, sw, sh / vertSquashRatio);
+					} else {
+						drawImage.call(ctx, img, sx, sy);
+					}
+				}
+				canvas.width = w;
+				canvas.height = h;
+				ctx.drawImage(img, 0, 0, w, h);
+				var previewBase = canvas.toDataURL('image/png');
+				this.formatFile(file, previewBase, base);
+			};
+			img.onload = () => {
+				var w = this.configs.previewWidth,
+					h = w;
+				drawImg(img, w, h);
+			}
+			img.src = base;
+		},
+		formatFile: function(file, previewBase, base) {
+			this.files.push({
+				ajaxResponse: undefined,
+				base: base,
+				checked: false,
+				file: file,
+				id: this.fileId,
+				isImg: this.checkImg(file),
+				previewBase: previewBase,
+				uploadPercentage: 0,
+				uploadStatus: 'waiting',
+			});
+			this.fileId++; /* 保证id自增 */
+			this.updateFilesDom(); /* 更新上传文件的dom */
+			this.fileObj.isReady = true; /* 每完成一次push打开开关 */
+		},
+		updateFiles: function(type) {
+			var existingCout = this.files.length,
+				/* files 数组里已有的数量 */
+				index = 0,
+				isSizeOver = false,
+				timer = null,
+				that = this;
+			var onAlert = function(message) {
+				if (that.configs.showAlert) {
+					alert(message);
+				}
+				if (that.configs.onAlert) {
+					that.configs.onAlert(message);
+				}
+			}
+			timer = setInterval(function() {
+				if (that.fileObj.isReady) {
+					if (that.fileObj.fileList[index] && that.fileObj.fileList[index].size > that.configs.maxSize * (1024 * 1024)) {
+						isSizeOver = true;
+						index++; /* 发现文件尺寸超出就跳过当前文件 */
+					}
+					if (that.files.length < that.configs.maxCount && index < that.fileObj.fileList.length) {
+						that.fileObj.isReady = false; /* 一旦进入代码块立即关闭更新开关 */
+						that.convertToBase(that.fileObj.fileList[index]);
+						index++;
+					} else {
+						var countDiff = that.fileObj.fileList.length + existingCout - that.configs.maxCount,
+							fileSize = that.fileObj.fileList[index - 1] ? (that.fileObj.fileList[index - 1].size / (1024 * 1024)).toFixed(
+								2) : 0,
+							message = '';
+						if (that.configs.multiple && that.fileObj.fileList.length > 1) {
+							/* 选中多个文件时给出不同提示 */
+							if (countDiff > 0 && isSizeOver) {
+								message = '文件数量超出，超出' + countDiff + '个；部分文件大小超出，允许大小为' + that.configs.maxSize + 'M';
+								onAlert(message);
+							} else if (countDiff > 0 && !isSizeOver) {
+								message = '文件数量超出，超出' + countDiff + '个';
+								onAlert(message);
+							} else if (countDiff <= 0 && isSizeOver) {
+								message = '部分文件大小超出，允许大小为' + that.configs.maxSize + 'M';
+								onAlert(message);
+							}
+						} else {
+							if (countDiff > 0 && fileSize > that.configs.maxSize) {
+								message = '文件数量超出，文件大小超出；当前文件' + fileSize + 'M，允许大小为' + that.configs.maxSize + 'M';
+								onAlert(message);
+							} else if (countDiff > 0 && fileSize <= that.configs.maxSize) {
+								message = '文件数量超出';
+								onAlert(message);
+							} else if (countDiff <= 0 && fileSize > that.configs.maxSize) {
+								message = '文件大小超出，当前文件' + fileSize + 'M，允许大小为' + that.configs.maxSize + 'M';
+								onAlert(message);
+							}
+						}
+						$(that.node.input).val("");
+						clearInterval(timer);
+						if (that.configs.autoUpload) {
+							that.files.forEach(function(item) {
+								item.checked = true;
+							});
+							that.upload();
+						} /* 开启自动上传时调用上传方法 */
+					}
+				}
+			}, 10);
+		},
+		startInterceptor: function() {
+			var that = this;
+			$.ajaxSetup({
+				crossDomain: that.configs.crossDomain,
+				xhrFields: {
+					withCredentials: that.configs.withCredentials
+				},
+				beforeSend: function() {
+					that.configs.beforeUpload && that.configs.beforeUpload(that.files[that.ajax.index], that.configs.data,
+						arguments);
+				}
+			});
+		},
+		upload: function() {
+			if (this.ajax.isReady) { /* 开关打开才能进行上传操作 */
+				var that = this,
+					hasChecked = false,
+					checkedWaitingFiles = [];
+				that.files.forEach(function(item) {
+					if (item.checked) {
+						hasChecked = true;
+						if (item.uploadStatus == 'waiting' || (item.uploadStatus == 'loading' && item.uploadPercentage == 0)) {
+							checkedWaitingFiles.push(item);
+						}
+					}
+				});
+				if (hasChecked) {
+					if (checkedWaitingFiles.length) {
+						that.files.forEach(function(item, index) {
+							if (item.id == checkedWaitingFiles[0].id) {
+								that.ajax.index = index;
+							}
+						});
+						checkedWaitingFiles.forEach(function(item1) {
+							that.files.forEach(function(item2) {
+								if (item1.id == item2.id) {
+									item2.uploadStatus = 'loading';
+								}
+							});
+						});
+						this.updateFilesDom();
+						if (this.configs.dataFormat == 'formData') {
+							this.configs.data = new FormData();
+							this.configs.data.append(this.configs.name, this.files[this.ajax.index].file);
+						} else {
+							this.configs.data = {}; /* 设为空对象便于在beforeUpload回调函数中配置 */
+						}
+						this.ajax.example = $.ajax({
+							url: that.configs.action,
+							type: "POST",
+							contentType: false,
+							data: that.configs.data,
+							dataType: that.configs.dataType,
+							headers: that.configs.headers,
+							processData: that.configs.processData,
+							timeout: that.configs.timeout,
+							xhr: function() {
+								var myXhr = $.ajaxSettings.xhr();
+								if (myXhr.upload) {
+									myXhr.upload.addEventListener('progress', function(e) {
+										that.files[that.ajax.index].uploadPercentage = Math.floor(100 * e.loaded / e.total);
+										that.updateFilesDom();
+									}, false);
+								}
+								return myXhr;
+							},
+							success: function(res) {
+								if (res[that.configs.successKey] == that.configs.successValue) {
+									that.files[that.ajax.index].uploadPercentage = 100;
+									that.files[that.ajax.index].uploadStatus = 'success';
+									that.files[that.ajax.index].ajaxResponse = res;
+								} else {
+									that.files[that.ajax.index].uploadStatus = 'error';
+									that.files[that.ajax.index].ajaxResponse = res;
+								}
+								that.updateFilesDom();
+								that.configs.onSuccess && that.configs.onSuccess(res);
+								that.upload();
+							},
+							error: function(err) {
+								that.files[that.ajax.index].uploadStatus = 'error';
+								that.files[that.ajax.index].ajaxResponse = err;
+								that.updateFilesDom();
+								that.configs.onError && that.configs.onError(err);
+								that.upload();
+							}
+						});
+					}
+
+				}
+			}
+		}
+	};
+	window.easyUploader = easyUploader;
+}(window, document));
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/echarts.js b/pluss-wap-page/src/main/resources/static/resources/js/echarts.js
new file mode 100644
index 0000000..d568900
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/echarts.js
@@ -0,0 +1,63208 @@
+(function webpackUniversalModuleDefinition(root, factory) {
+	if(typeof exports === 'object' && typeof module === 'object')
+		module.exports = factory();
+	else if(typeof define === 'function' && define.amd)
+		define([], factory);
+	else if(typeof exports === 'object')
+		exports["echarts"] = factory();
+	else
+		root["echarts"] = factory();
+})(this, function() {
+return /******/ (function(modules) { // webpackBootstrap
+/******/ 	// The module cache
+/******/ 	var installedModules = {};
+
+/******/ 	// The require function
+/******/ 	function __webpack_require__(moduleId) {
+
+/******/ 		// Check if module is in cache
+/******/ 		if(installedModules[moduleId])
+/******/ 			return installedModules[moduleId].exports;
+
+/******/ 		// Create a new module (and put it into the cache)
+/******/ 		var module = installedModules[moduleId] = {
+/******/ 			exports: {},
+/******/ 			id: moduleId,
+/******/ 			loaded: false
+/******/ 		};
+
+/******/ 		// Execute the module function
+/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
+
+/******/ 		// Flag the module as loaded
+/******/ 		module.loaded = true;
+
+/******/ 		// Return the exports of the module
+/******/ 		return module.exports;
+/******/ 	}
+
+
+/******/ 	// expose the modules object (__webpack_modules__)
+/******/ 	__webpack_require__.m = modules;
+
+/******/ 	// expose the module cache
+/******/ 	__webpack_require__.c = installedModules;
+
+/******/ 	// __webpack_public_path__
+/******/ 	__webpack_require__.p = "";
+
+/******/ 	// Load entry module and return exports
+/******/ 	return __webpack_require__(0);
+/******/ })
+/************************************************************************/
+/******/ ([
+/* 0 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * Export echarts as CommonJS module
+	 */
+	module.exports = __webpack_require__(1);
+
+	// Import all charts and components
+	__webpack_require__(99);
+	__webpack_require__(133);
+	__webpack_require__(138);
+	__webpack_require__(147);
+	__webpack_require__(151);
+
+	__webpack_require__(161);
+	__webpack_require__(182);
+	__webpack_require__(194);
+	__webpack_require__(215);
+	__webpack_require__(219);
+	__webpack_require__(223);
+	__webpack_require__(238);
+	__webpack_require__(244);
+	__webpack_require__(251);
+	__webpack_require__(257);
+	__webpack_require__(261);
+	__webpack_require__(269);
+
+	__webpack_require__(112);
+	__webpack_require__(273);
+	__webpack_require__(279);
+	__webpack_require__(283);
+	__webpack_require__(294);
+	__webpack_require__(224);
+	__webpack_require__(297);
+	__webpack_require__(303);
+
+	__webpack_require__(315);
+
+	__webpack_require__(316);
+	__webpack_require__(329);
+
+	__webpack_require__(344);
+	__webpack_require__(350);
+	__webpack_require__(353);
+
+	__webpack_require__(356);
+	__webpack_require__(365);
+
+	__webpack_require__(378);
+
+
+/***/ },
+/* 1 */
+/***/ function(module, exports, __webpack_require__) {
+
+	// Enable DEV mode when using source code without build. which has no __DEV__ variable
+	// In build process 'typeof __DEV__' will be replace with 'boolean'
+	// So this code will be removed or disabled anyway after built.
+	if (false) {
+	    // In browser
+	    if (typeof window !== 'undefined') {
+	        window.__DEV__ = true;
+	    }
+	    // In node
+	    else if (typeof global !== 'undefined') {
+	        global.__DEV__ = true;
+	    }
+	}
+
+	/*!
+	 * ECharts, a javascript interactive chart library.
+	 *
+	 * Copyright (c) 2015, Baidu Inc.
+	 * All rights reserved.
+	 *
+	 * LICENSE
+	 * https://github.com/ecomfe/echarts/blob/master/LICENSE.txt
+	 */
+
+	/**
+	 * @module echarts
+	 */
+
+
+	    var env = __webpack_require__(2);
+
+	    var GlobalModel = __webpack_require__(3);
+	    var ExtensionAPI = __webpack_require__(25);
+	    var CoordinateSystemManager = __webpack_require__(26);
+	    var OptionManager = __webpack_require__(27);
+
+	    var ComponentModel = __webpack_require__(19);
+	    var SeriesModel = __webpack_require__(28);
+
+	    var ComponentView = __webpack_require__(29);
+	    var ChartView = __webpack_require__(42);
+	    var graphic = __webpack_require__(43);
+
+	    var zrender = __webpack_require__(81);
+	    var zrUtil = __webpack_require__(4);
+	    var colorTool = __webpack_require__(39);
+	    var Eventful = __webpack_require__(33);
+	    var timsort = __webpack_require__(85);
+
+	    var each = zrUtil.each;
+
+	    var PRIORITY_PROCESSOR_FILTER = 1000;
+	    var PRIORITY_PROCESSOR_STATISTIC = 5000;
+
+
+	    var PRIORITY_VISUAL_LAYOUT = 1000;
+	    var PRIORITY_VISUAL_GLOBAL = 2000;
+	    var PRIORITY_VISUAL_CHART = 3000;
+	    var PRIORITY_VISUAL_COMPONENT = 4000;
+	    var PRIORITY_VISUAL_BRUSH = 5000;
+
+	    // Main process have three entries: `setOption`, `dispatchAction` and `resize`,
+	    // where they must not be invoked nestedly, except the only case: invoke
+	    // dispatchAction with updateMethod "none" in main process.
+	    // This flag is used to carry out this rule.
+	    // All events will be triggered out side main process (i.e. when !this[IN_MAIN_PROCESS]).
+	    var IN_MAIN_PROCESS = '__flag_in_main_process';
+	    var HAS_GRADIENT_OR_PATTERN_BG = '_hasGradientOrPatternBg';
+
+	    function createRegisterEventWithLowercaseName(method) {
+	        return function (eventName, handler, context) {
+	            // Event name is all lowercase
+	            eventName = eventName && eventName.toLowerCase();
+	            Eventful.prototype[method].call(this, eventName, handler, context);
+	        };
+	    }
+	    /**
+	     * @module echarts~MessageCenter
+	     */
+	    function MessageCenter() {
+	        Eventful.call(this);
+	    }
+	    MessageCenter.prototype.on = createRegisterEventWithLowercaseName('on');
+	    MessageCenter.prototype.off = createRegisterEventWithLowercaseName('off');
+	    MessageCenter.prototype.one = createRegisterEventWithLowercaseName('one');
+	    zrUtil.mixin(MessageCenter, Eventful);
+	    /**
+	     * @module echarts~ECharts
+	     */
+	    function ECharts (dom, theme, opts) {
+	        opts = opts || {};
+
+	        // Get theme by name
+	        if (typeof theme === 'string') {
+	            theme = themeStorage[theme];
+	        }
+
+	        /**
+	         * @type {string}
+	         */
+	        this.id;
+	        /**
+	         * Group id
+	         * @type {string}
+	         */
+	        this.group;
+	        /**
+	         * @type {HTMLDomElement}
+	         * @private
+	         */
+	        this._dom = dom;
+	        /**
+	         * @type {module:zrender/ZRender}
+	         * @private
+	         */
+	        this._zr = zrender.init(dom, {
+	            renderer: opts.renderer || 'canvas',
+	            devicePixelRatio: opts.devicePixelRatio
+	        });
+
+	        /**
+	         * @type {Object}
+	         * @private
+	         */
+	        this._theme = zrUtil.clone(theme);
+
+	        /**
+	         * @type {Array.<module:echarts/view/Chart>}
+	         * @private
+	         */
+	        this._chartsViews = [];
+
+	        /**
+	         * @type {Object.<string, module:echarts/view/Chart>}
+	         * @private
+	         */
+	        this._chartsMap = {};
+
+	        /**
+	         * @type {Array.<module:echarts/view/Component>}
+	         * @private
+	         */
+	        this._componentsViews = [];
+
+	        /**
+	         * @type {Object.<string, module:echarts/view/Component>}
+	         * @private
+	         */
+	        this._componentsMap = {};
+
+	        /**
+	         * @type {module:echarts/ExtensionAPI}
+	         * @private
+	         */
+	        this._api = new ExtensionAPI(this);
+
+	        /**
+	         * @type {module:echarts/CoordinateSystem}
+	         * @private
+	         */
+	        this._coordSysMgr = new CoordinateSystemManager();
+
+	        Eventful.call(this);
+
+	        /**
+	         * @type {module:echarts~MessageCenter}
+	         * @private
+	         */
+	        this._messageCenter = new MessageCenter();
+
+	        // Init mouse events
+	        this._initEvents();
+
+	        // In case some people write `window.onresize = chart.resize`
+	        this.resize = zrUtil.bind(this.resize, this);
+
+	        // Can't dispatch action during rendering procedure
+	        this._pendingActions = [];
+	        // Sort on demand
+	        function prioritySortFunc(a, b) {
+	            return a.prio - b.prio;
+	        }
+	        timsort(visualFuncs, prioritySortFunc);
+	        timsort(dataProcessorFuncs, prioritySortFunc);
+	    }
+
+	    var echartsProto = ECharts.prototype;
+
+	    /**
+	     * @return {HTMLDomElement}
+	     */
+	    echartsProto.getDom = function () {
+	        return this._dom;
+	    };
+
+	    /**
+	     * @return {module:zrender~ZRender}
+	     */
+	    echartsProto.getZr = function () {
+	        return this._zr;
+	    };
+
+	    /**
+	     * @param {Object} option
+	     * @param {boolean} notMerge
+	     * @param {boolean} [notRefreshImmediately=false] Useful when setOption frequently.
+	     */
+	    echartsProto.setOption = function (option, notMerge, notRefreshImmediately) {
+	        if (true) {
+	            zrUtil.assert(!this[IN_MAIN_PROCESS], '`setOption` should not be called during main process.');
+	        }
+
+	        this[IN_MAIN_PROCESS] = true;
+
+	        if (!this._model || notMerge) {
+	            var optionManager = new OptionManager(this._api);
+	            var theme = this._theme;
+	            var ecModel = this._model = new GlobalModel(null, null, theme, optionManager);
+	            ecModel.init(null, null, theme, optionManager);
+	        }
+
+	        this._model.setOption(option, optionPreprocessorFuncs);
+
+	        updateMethods.prepareAndUpdate.call(this);
+
+	        this[IN_MAIN_PROCESS] = false;
+
+	        this._flushPendingActions();
+
+	        !notRefreshImmediately && this._zr.refreshImmediately();
+	    };
+
+	    /**
+	     * @DEPRECATED
+	     */
+	    echartsProto.setTheme = function () {
+	        console.log('ECharts#setTheme() is DEPRECATED in ECharts 3.0');
+	    };
+
+	    /**
+	     * @return {module:echarts/model/Global}
+	     */
+	    echartsProto.getModel = function () {
+	        return this._model;
+	    };
+
+	    /**
+	     * @return {Object}
+	     */
+	    echartsProto.getOption = function () {
+	        return this._model.getOption();
+	    };
+
+	    /**
+	     * @return {number}
+	     */
+	    echartsProto.getWidth = function () {
+	        return this._zr.getWidth();
+	    };
+
+	    /**
+	     * @return {number}
+	     */
+	    echartsProto.getHeight = function () {
+	        return this._zr.getHeight();
+	    };
+
+	    /**
+	     * Get canvas which has all thing rendered
+	     * @param {Object} opts
+	     * @param {string} [opts.backgroundColor]
+	     */
+	    echartsProto.getRenderedCanvas = function (opts) {
+	        if (!env.canvasSupported) {
+	            return;
+	        }
+	        opts = opts || {};
+	        opts.pixelRatio = opts.pixelRatio || 1;
+	        opts.backgroundColor = opts.backgroundColor
+	            || this._model.get('backgroundColor');
+	        var zr = this._zr;
+	        var list = zr.storage.getDisplayList();
+	        // Stop animations
+	        zrUtil.each(list, function (el) {
+	            el.stopAnimation(true);
+	        });
+	        return zr.painter.getRenderedCanvas(opts);
+	    };
+	    /**
+	     * @return {string}
+	     * @param {Object} opts
+	     * @param {string} [opts.type='png']
+	     * @param {string} [opts.pixelRatio=1]
+	     * @param {string} [opts.backgroundColor]
+	     */
+	    echartsProto.getDataURL = function (opts) {
+	        opts = opts || {};
+	        var excludeComponents = opts.excludeComponents;
+	        var ecModel = this._model;
+	        var excludesComponentViews = [];
+	        var self = this;
+
+	        each(excludeComponents, function (componentType) {
+	            ecModel.eachComponent({
+	                mainType: componentType
+	            }, function (component) {
+	                var view = self._componentsMap[component.__viewId];
+	                if (!view.group.ignore) {
+	                    excludesComponentViews.push(view);
+	                    view.group.ignore = true;
+	                }
+	            });
+	        });
+
+	        var url = this.getRenderedCanvas(opts).toDataURL(
+	            'image/' + (opts && opts.type || 'png')
+	        );
+
+	        each(excludesComponentViews, function (view) {
+	            view.group.ignore = false;
+	        });
+	        return url;
+	    };
+
+
+	    /**
+	     * @return {string}
+	     * @param {Object} opts
+	     * @param {string} [opts.type='png']
+	     * @param {string} [opts.pixelRatio=1]
+	     * @param {string} [opts.backgroundColor]
+	     */
+	    echartsProto.getConnectedDataURL = function (opts) {
+	        if (!env.canvasSupported) {
+	            return;
+	        }
+	        var groupId = this.group;
+	        var mathMin = Math.min;
+	        var mathMax = Math.max;
+	        var MAX_NUMBER = Infinity;
+	        if (connectedGroups[groupId]) {
+	            var left = MAX_NUMBER;
+	            var top = MAX_NUMBER;
+	            var right = -MAX_NUMBER;
+	            var bottom = -MAX_NUMBER;
+	            var canvasList = [];
+	            var dpr = (opts && opts.pixelRatio) || 1;
+	            for (var id in instances) {
+	                var chart = instances[id];
+	                if (chart.group === groupId) {
+	                    var canvas = chart.getRenderedCanvas(
+	                        zrUtil.clone(opts)
+	                    );
+	                    var boundingRect = chart.getDom().getBoundingClientRect();
+	                    left = mathMin(boundingRect.left, left);
+	                    top = mathMin(boundingRect.top, top);
+	                    right = mathMax(boundingRect.right, right);
+	                    bottom = mathMax(boundingRect.bottom, bottom);
+	                    canvasList.push({
+	                        dom: canvas,
+	                        left: boundingRect.left,
+	                        top: boundingRect.top
+	                    });
+	                }
+	            }
+
+	            left *= dpr;
+	            top *= dpr;
+	            right *= dpr;
+	            bottom *= dpr;
+	            var width = right - left;
+	            var height = bottom - top;
+	            var targetCanvas = zrUtil.createCanvas();
+	            targetCanvas.width = width;
+	            targetCanvas.height = height;
+	            var zr = zrender.init(targetCanvas);
+
+	            each(canvasList, function (item) {
+	                var img = new graphic.Image({
+	                    style: {
+	                        x: item.left * dpr - left,
+	                        y: item.top * dpr - top,
+	                        image: item.dom
+	                    }
+	                });
+	                zr.add(img);
+	            });
+	            zr.refreshImmediately();
+
+	            return targetCanvas.toDataURL('image/' + (opts && opts.type || 'png'));
+	        }
+	        else {
+	            return this.getDataURL(opts);
+	        }
+	    };
+
+	    var updateMethods = {
+
+
+	        /**
+	         * @param {Object} payload
+	         * @private
+	         */
+	        update: function (payload) {
+	            // console.time && console.time('update');
+
+	            var ecModel = this._model;
+	            var api = this._api;
+	            var coordSysMgr = this._coordSysMgr;
+	            var zr = this._zr;
+	            // update before setOption
+	            if (!ecModel) {
+	                return;
+	            }
+
+	            // Fixme First time update ?
+	            ecModel.restoreData();
+
+	            // TODO
+	            // Save total ecModel here for undo/redo (after restoring data and before processing data).
+	            // Undo (restoration of total ecModel) can be carried out in 'action' or outside API call.
+
+	            // Create new coordinate system each update
+	            // In LineView may save the old coordinate system and use it to get the orignal point
+	            coordSysMgr.create(this._model, this._api);
+
+	            processData.call(this, ecModel, api);
+
+	            stackSeriesData.call(this, ecModel);
+
+	            coordSysMgr.update(ecModel, api);
+
+	            doVisualEncoding.call(this, ecModel, payload);
+
+	            doRender.call(this, ecModel, payload);
+
+	            // Set background
+	            var backgroundColor = ecModel.get('backgroundColor') || 'transparent';
+
+	            var painter = zr.painter;
+	            // TODO all use clearColor ?
+	            if (painter.isSingleCanvas && painter.isSingleCanvas()) {
+	                zr.configLayer(0, {
+	                    clearColor: backgroundColor
+	                });
+	            }
+	            else {
+	                // In IE8
+	                if (!env.canvasSupported) {
+	                    var colorArr = colorTool.parse(backgroundColor);
+	                    backgroundColor = colorTool.stringify(colorArr, 'rgb');
+	                    if (colorArr[3] === 0) {
+	                        backgroundColor = 'transparent';
+	                    }
+	                }
+	                if (backgroundColor.colorStops || backgroundColor.image) {
+	                    // Gradient background
+	                    // FIXME Fixed layer？
+	                    zr.configLayer(0, {
+	                        clearColor: backgroundColor
+	                    });
+	                    this[HAS_GRADIENT_OR_PATTERN_BG] = true;
+
+	                    this._dom.style.background = 'transparent';
+	                }
+	                else {
+	                    if (this[HAS_GRADIENT_OR_PATTERN_BG]) {
+	                        zr.configLayer(0, {
+	                            clearColor: null
+	                        });
+	                    }
+	                    this[HAS_GRADIENT_OR_PATTERN_BG] = false;
+
+	                    this._dom.style.background = backgroundColor;
+	                }
+	            }
+
+	            // console.time && console.timeEnd('update');
+	        },
+
+	        // PENDING
+	        /**
+	         * @param {Object} payload
+	         * @private
+	         */
+	        updateView: function (payload) {
+	            var ecModel = this._model;
+
+	            // update before setOption
+	            if (!ecModel) {
+	                return;
+	            }
+
+	            ecModel.eachSeries(function (seriesModel) {
+	                seriesModel.getData().clearAllVisual();
+	            });
+
+	            doVisualEncoding.call(this, ecModel, payload);
+
+	            invokeUpdateMethod.call(this, 'updateView', ecModel, payload);
+	        },
+
+	        /**
+	         * @param {Object} payload
+	         * @private
+	         */
+	        updateVisual: function (payload) {
+	            var ecModel = this._model;
+
+	            // update before setOption
+	            if (!ecModel) {
+	                return;
+	            }
+
+	            ecModel.eachSeries(function (seriesModel) {
+	                seriesModel.getData().clearAllVisual();
+	            });
+
+	            doVisualEncoding.call(this, ecModel, payload);
+
+	            invokeUpdateMethod.call(this, 'updateVisual', ecModel, payload);
+	        },
+
+	        /**
+	         * @param {Object} payload
+	         * @private
+	         */
+	        updateLayout: function (payload) {
+	            var ecModel = this._model;
+
+	            // update before setOption
+	            if (!ecModel) {
+	                return;
+	            }
+
+	            doLayout.call(this, ecModel, payload);
+
+	            invokeUpdateMethod.call(this, 'updateLayout', ecModel, payload);
+	        },
+
+	        /**
+	         * @param {Object} payload
+	         * @private
+	         */
+	        highlight: function (payload) {
+	            toggleHighlight.call(this, 'highlight', payload);
+	        },
+
+	        /**
+	         * @param {Object} payload
+	         * @private
+	         */
+	        downplay: function (payload) {
+	            toggleHighlight.call(this, 'downplay', payload);
+	        },
+
+	        /**
+	         * @param {Object} payload
+	         * @private
+	         */
+	        prepareAndUpdate: function (payload) {
+	            var ecModel = this._model;
+
+	            prepareView.call(this, 'component', ecModel);
+
+	            prepareView.call(this, 'chart', ecModel);
+
+	            updateMethods.update.call(this, payload);
+	        }
+	    };
+
+	    /**
+	     * @param {Object} payload
+	     * @private
+	     */
+	    function toggleHighlight(method, payload) {
+	        var ecModel = this._model;
+
+	        // dispatchAction before setOption
+	        if (!ecModel) {
+	            return;
+	        }
+
+	        ecModel.eachComponent(
+	            {mainType: 'series', query: payload},
+	            function (seriesModel, index) {
+	                var chartView = this._chartsMap[seriesModel.__viewId];
+	                if (chartView && chartView.__alive) {
+	                    chartView[method](
+	                        seriesModel, ecModel, this._api, payload
+	                    );
+	                }
+	            },
+	            this
+	        );
+	    }
+
+	    /**
+	     * Resize the chart
+	     */
+	    echartsProto.resize = function () {
+	        if (true) {
+	            zrUtil.assert(!this[IN_MAIN_PROCESS], '`resize` should not be called during main process.');
+	        }
+
+	        this[IN_MAIN_PROCESS] = true;
+
+	        this._zr.resize();
+
+	        var optionChanged = this._model && this._model.resetOption('media');
+	        updateMethods[optionChanged ? 'prepareAndUpdate' : 'update'].call(this);
+
+	        // Resize loading effect
+	        this._loadingFX && this._loadingFX.resize();
+
+	        this[IN_MAIN_PROCESS] = false;
+
+	        this._flushPendingActions();
+	    };
+
+	    var defaultLoadingEffect = __webpack_require__(93);
+	    /**
+	     * Show loading effect
+	     * @param  {string} [name='default']
+	     * @param  {Object} [cfg]
+	     */
+	    echartsProto.showLoading = function (name, cfg) {
+	        if (zrUtil.isObject(name)) {
+	            cfg = name;
+	            name = 'default';
+	        }
+	        this.hideLoading();
+	        var el = defaultLoadingEffect(this._api, cfg);
+	        var zr = this._zr;
+	        this._loadingFX = el;
+
+	        zr.add(el);
+	    };
+
+	    /**
+	     * Hide loading effect
+	     */
+	    echartsProto.hideLoading = function () {
+	        this._loadingFX && this._zr.remove(this._loadingFX);
+	        this._loadingFX = null;
+	    };
+
+	    /**
+	     * @param {Object} eventObj
+	     * @return {Object}
+	     */
+	    echartsProto.makeActionFromEvent = function (eventObj) {
+	        var payload = zrUtil.extend({}, eventObj);
+	        payload.type = eventActionMap[eventObj.type];
+	        return payload;
+	    };
+
+	    /**
+	     * @pubilc
+	     * @param {Object} payload
+	     * @param {string} [payload.type] Action type
+	     * @param {boolean} [silent=false] Whether trigger event.
+	     */
+	    echartsProto.dispatchAction = function (payload, silent) {
+	        var actionWrap = actions[payload.type];
+	        if (!actionWrap) {
+	            return;
+	        }
+
+	        var actionInfo = actionWrap.actionInfo;
+	        var updateMethod = actionInfo.update || 'update';
+
+	        // if (__DEV__) {
+	        //     zrUtil.assert(
+	        //         !this[IN_MAIN_PROCESS],
+	        //         '`dispatchAction` should not be called during main process.'
+	        //         + 'unless updateMathod is "none".'
+	        //     );
+	        // }
+
+	        // May dispatchAction in rendering procedure
+	        if (this[IN_MAIN_PROCESS]) {
+	            this._pendingActions.push(payload);
+	            return;
+	        }
+
+	        this[IN_MAIN_PROCESS] = true;
+
+	        var payloads = [payload];
+	        var batched = false;
+	        // Batch action
+	        if (payload.batch) {
+	            batched = true;
+	            payloads = zrUtil.map(payload.batch, function (item) {
+	                item = zrUtil.defaults(zrUtil.extend({}, item), payload);
+	                item.batch = null;
+	                return item;
+	            });
+	        }
+
+	        var eventObjBatch = [];
+	        var eventObj;
+	        var isHighlightOrDownplay = payload.type === 'highlight' || payload.type === 'downplay';
+	        for (var i = 0; i < payloads.length; i++) {
+	            var batchItem = payloads[i];
+	            // Action can specify the event by return it.
+	            eventObj = actionWrap.action(batchItem, this._model);
+	            // Emit event outside
+	            eventObj = eventObj || zrUtil.extend({}, batchItem);
+	            // Convert type to eventType
+	            eventObj.type = actionInfo.event || eventObj.type;
+	            eventObjBatch.push(eventObj);
+
+	            // Highlight and downplay are special.
+	            isHighlightOrDownplay && updateMethods[updateMethod].call(this, batchItem);
+	        }
+
+	        (updateMethod !== 'none' && !isHighlightOrDownplay)
+	            && updateMethods[updateMethod].call(this, payload);
+
+	        // Follow the rule of action batch
+	        if (batched) {
+	            eventObj = {
+	                type: actionInfo.event || payload.type,
+	                batch: eventObjBatch
+	            };
+	        }
+	        else {
+	            eventObj = eventObjBatch[0];
+	        }
+
+	        this[IN_MAIN_PROCESS] = false;
+
+	        !silent && this._messageCenter.trigger(eventObj.type, eventObj);
+
+	        this._flushPendingActions();
+
+	    };
+
+	    echartsProto._flushPendingActions = function () {
+	        var pendingActions = this._pendingActions;
+	        while (pendingActions.length) {
+	            var payload = pendingActions.shift();
+	            this.dispatchAction(payload);
+	        }
+	    };
+
+	    /**
+	     * Register event
+	     * @method
+	     */
+	    echartsProto.on = createRegisterEventWithLowercaseName('on');
+	    echartsProto.off = createRegisterEventWithLowercaseName('off');
+	    echartsProto.one = createRegisterEventWithLowercaseName('one');
+
+	    /**
+	     * @param {string} methodName
+	     * @private
+	     */
+	    function invokeUpdateMethod(methodName, ecModel, payload) {
+	        var api = this._api;
+
+	        // Update all components
+	        each(this._componentsViews, function (component) {
+	            var componentModel = component.__model;
+	            component[methodName](componentModel, ecModel, api, payload);
+
+	            updateZ(componentModel, component);
+	        }, this);
+
+	        // Upate all charts
+	        ecModel.eachSeries(function (seriesModel, idx) {
+	            var chart = this._chartsMap[seriesModel.__viewId];
+	            chart[methodName](seriesModel, ecModel, api, payload);
+
+	            updateZ(seriesModel, chart);
+
+	            updateProgressiveAndBlend(seriesModel, chart);
+	        }, this);
+
+	        // If use hover layer
+	        updateHoverLayerStatus(this._zr, ecModel);
+	    }
+
+	    /**
+	     * Prepare view instances of charts and components
+	     * @param  {module:echarts/model/Global} ecModel
+	     * @private
+	     */
+	    function prepareView(type, ecModel) {
+	        var isComponent = type === 'component';
+	        var viewList = isComponent ? this._componentsViews : this._chartsViews;
+	        var viewMap = isComponent ? this._componentsMap : this._chartsMap;
+	        var zr = this._zr;
+
+	        for (var i = 0; i < viewList.length; i++) {
+	            viewList[i].__alive = false;
+	        }
+
+	        ecModel[isComponent ? 'eachComponent' : 'eachSeries'](function (componentType, model) {
+	            if (isComponent) {
+	                if (componentType === 'series') {
+	                    return;
+	                }
+	            }
+	            else {
+	                model = componentType;
+	            }
+
+	            // Consider: id same and type changed.
+	            var viewId = model.id + '_' + model.type;
+	            var view = viewMap[viewId];
+	            if (!view) {
+	                var classType = ComponentModel.parseClassType(model.type);
+	                var Clazz = isComponent
+	                    ? ComponentView.getClass(classType.main, classType.sub)
+	                    : ChartView.getClass(classType.sub);
+	                if (Clazz) {
+	                    view = new Clazz();
+	                    view.init(ecModel, this._api);
+	                    viewMap[viewId] = view;
+	                    viewList.push(view);
+	                    zr.add(view.group);
+	                }
+	                else {
+	                    // Error
+	                    return;
+	                }
+	            }
+
+	            model.__viewId = viewId;
+	            view.__alive = true;
+	            view.__id = viewId;
+	            view.__model = model;
+	        }, this);
+
+	        for (var i = 0; i < viewList.length;) {
+	            var view = viewList[i];
+	            if (!view.__alive) {
+	                zr.remove(view.group);
+	                view.dispose(ecModel, this._api);
+	                viewList.splice(i, 1);
+	                delete viewMap[view.__id];
+	            }
+	            else {
+	                i++;
+	            }
+	        }
+	    }
+
+	    /**
+	     * Processor data in each series
+	     *
+	     * @param {module:echarts/model/Global} ecModel
+	     * @private
+	     */
+	    function processData(ecModel, api) {
+	        each(dataProcessorFuncs, function (process) {
+	            process.func(ecModel, api);
+	        });
+	    }
+
+	    /**
+	     * @private
+	     */
+	    function stackSeriesData(ecModel) {
+	        var stackedDataMap = {};
+	        ecModel.eachSeries(function (series) {
+	            var stack = series.get('stack');
+	            var data = series.getData();
+	            if (stack && data.type === 'list') {
+	                var previousStack = stackedDataMap[stack];
+	                if (previousStack) {
+	                    data.stackedOn = previousStack;
+	                }
+	                stackedDataMap[stack] = data;
+	            }
+	        });
+	    }
+
+	    /**
+	     * Layout before each chart render there series, special visual encoding stage
+	     *
+	     * @param {module:echarts/model/Global} ecModel
+	     * @private
+	     */
+	    function doLayout(ecModel, payload) {
+	        var api = this._api;
+	        each(visualFuncs, function (visual) {
+	            if (visual.isLayout) {
+	                visual.func(ecModel, api, payload);
+	            }
+	        });
+	    }
+
+	    /**
+	     * Encode visual infomation from data after data processing
+	     *
+	     * @param {module:echarts/model/Global} ecModel
+	     * @private
+	     */
+	    function doVisualEncoding(ecModel, payload) {
+	        var api = this._api;
+	        ecModel.clearColorPalette();
+	        ecModel.eachSeries(function (seriesModel) {
+	            seriesModel.clearColorPalette();
+	        });
+	        each(visualFuncs, function (visual) {
+	            visual.func(ecModel, api, payload);
+	        });
+	    }
+
+	    /**
+	     * Render each chart and component
+	     * @private
+	     */
+	    function doRender(ecModel, payload) {
+	        var api = this._api;
+	        // Render all components
+	        each(this._componentsViews, function (componentView) {
+	            var componentModel = componentView.__model;
+	            componentView.render(componentModel, ecModel, api, payload);
+
+	            updateZ(componentModel, componentView);
+	        }, this);
+
+	        each(this._chartsViews, function (chart) {
+	            chart.__alive = false;
+	        }, this);
+
+	        // Render all charts
+	        ecModel.eachSeries(function (seriesModel, idx) {
+	            var chartView = this._chartsMap[seriesModel.__viewId];
+	            chartView.__alive = true;
+	            chartView.render(seriesModel, ecModel, api, payload);
+
+	            chartView.group.silent = !!seriesModel.get('silent');
+
+	            updateZ(seriesModel, chartView);
+
+	            updateProgressiveAndBlend(seriesModel, chartView);
+
+	        }, this);
+
+	        // If use hover layer
+	        updateHoverLayerStatus(this._zr, ecModel);
+
+	        // Remove groups of unrendered charts
+	        each(this._chartsViews, function (chart) {
+	            if (!chart.__alive) {
+	                chart.remove(ecModel, api);
+	            }
+	        }, this);
+	    }
+
+	    var MOUSE_EVENT_NAMES = [
+	        'click', 'dblclick', 'mouseover', 'mouseout', 'mousedown', 'mouseup', 'globalout'
+	    ];
+	    /**
+	     * @private
+	     */
+	    echartsProto._initEvents = function () {
+	        each(MOUSE_EVENT_NAMES, function (eveName) {
+	            this._zr.on(eveName, function (e) {
+	                var ecModel = this.getModel();
+	                var el = e.target;
+	                if (el && el.dataIndex != null) {
+	                    var dataModel = el.dataModel || ecModel.getSeriesByIndex(el.seriesIndex);
+	                    var params = dataModel && dataModel.getDataParams(el.dataIndex, el.dataType) || {};
+	                    params.event = e;
+	                    params.type = eveName;
+	                    this.trigger(eveName, params);
+	                }
+	                // If element has custom eventData of components
+	                else if (el && el.eventData) {
+	                    this.trigger(eveName, el.eventData);
+	                }
+	            }, this);
+	        }, this);
+
+	        each(eventActionMap, function (actionType, eventType) {
+	            this._messageCenter.on(eventType, function (event) {
+	                this.trigger(eventType, event);
+	            }, this);
+	        }, this);
+	    };
+
+	    /**
+	     * @return {boolean}
+	     */
+	    echartsProto.isDisposed = function () {
+	        return this._disposed;
+	    };
+
+	    /**
+	     * Clear
+	     */
+	    echartsProto.clear = function () {
+	        this.setOption({}, true);
+	    };
+	    /**
+	     * Dispose instance
+	     */
+	    echartsProto.dispose = function () {
+	        if (this._disposed) {
+	            if (true) {
+	                console.warn('Instance ' + this.id + ' has been disposed');
+	            }
+	            return;
+	        }
+	        this._disposed = true;
+
+	        var api = this._api;
+	        var ecModel = this._model;
+
+	        each(this._componentsViews, function (component) {
+	            component.dispose(ecModel, api);
+	        });
+	        each(this._chartsViews, function (chart) {
+	            chart.dispose(ecModel, api);
+	        });
+
+	        // Dispose after all views disposed
+	        this._zr.dispose();
+
+	        delete instances[this.id];
+	    };
+
+	    zrUtil.mixin(ECharts, Eventful);
+
+	    function updateHoverLayerStatus(zr, ecModel) {
+	        var storage = zr.storage;
+	        var elCount = 0;
+	        storage.traverse(function (el) {
+	            if (!el.isGroup) {
+	                elCount++;
+	            }
+	        });
+	        if (elCount > ecModel.get('hoverLayerThreshold') && !env.node) {
+	            storage.traverse(function (el) {
+	                if (!el.isGroup) {
+	                    el.useHoverLayer = true;
+	                }
+	            });
+	        }
+	    }
+	    /**
+	     * Update chart progressive and blend.
+	     * @param {module:echarts/model/Series|module:echarts/model/Component} model
+	     * @param {module:echarts/view/Component|module:echarts/view/Chart} view
+	     */
+	    function updateProgressiveAndBlend(seriesModel, chartView) {
+	        // Progressive configuration
+	        var elCount = 0;
+	        chartView.group.traverse(function (el) {
+	            if (el.type !== 'group' && !el.ignore) {
+	                elCount++;
+	            }
+	        });
+	        var frameDrawNum = +seriesModel.get('progressive');
+	        var needProgressive = elCount > seriesModel.get('progressiveThreshold') && frameDrawNum && !env.node;
+	        if (needProgressive) {
+	            chartView.group.traverse(function (el) {
+	                // FIXME marker and other components
+	                if (!el.isGroup) {
+	                    el.progressive = needProgressive ?
+	                        Math.floor(elCount++ / frameDrawNum) : -1;
+	                    if (needProgressive) {
+	                        el.stopAnimation(true);
+	                    }
+	                }
+	            });
+	        }
+
+	        // Blend configration
+	        var blendMode = seriesModel.get('blendMode') || null;
+	        if (true) {
+	            if (!env.canvasSupported && blendMode && blendMode !== 'source-over') {
+	                console.warn('Only canvas support blendMode');
+	            }
+	        }
+	        chartView.group.traverse(function (el) {
+	            // FIXME marker and other components
+	            if (!el.isGroup) {
+	                el.setStyle('blend', blendMode);
+	            }
+	        });
+	    }
+	    /**
+	     * @param {module:echarts/model/Series|module:echarts/model/Component} model
+	     * @param {module:echarts/view/Component|module:echarts/view/Chart} view
+	     */
+	    function updateZ(model, view) {
+	        var z = model.get('z');
+	        var zlevel = model.get('zlevel');
+	        // Set z and zlevel
+	        view.group.traverse(function (el) {
+	            if (el.type !== 'group') {
+	                z != null && (el.z = z);
+	                zlevel != null && (el.zlevel = zlevel);
+	            }
+	        });
+	    }
+	    /**
+	     * @type {Array.<Function>}
+	     * @inner
+	     */
+	    var actions = [];
+
+	    /**
+	     * Map eventType to actionType
+	     * @type {Object}
+	     */
+	    var eventActionMap = {};
+
+	    /**
+	     * Data processor functions of each stage
+	     * @type {Array.<Object.<string, Function>>}
+	     * @inner
+	     */
+	    var dataProcessorFuncs = [];
+
+	    /**
+	     * @type {Array.<Function>}
+	     * @inner
+	     */
+	    var optionPreprocessorFuncs = [];
+
+	    /**
+	     * Visual encoding functions of each stage
+	     * @type {Array.<Object.<string, Function>>}
+	     * @inner
+	     */
+	    var visualFuncs = [];
+	    /**
+	     * Theme storage
+	     * @type {Object.<key, Object>}
+	     */
+	    var themeStorage = {};
+
+
+	    var instances = {};
+	    var connectedGroups = {};
+
+	    var idBase = new Date() - 0;
+	    var groupIdBase = new Date() - 0;
+	    var DOM_ATTRIBUTE_KEY = '_echarts_instance_';
+	    /**
+	     * @alias module:echarts
+	     */
+	    var echarts = {
+	        /**
+	         * @type {number}
+	         */
+	        version: '3.2.2',
+	        dependencies: {
+	            zrender: '3.1.2'
+	        }
+	    };
+
+	    function enableConnect(chart) {
+
+	        var STATUS_PENDING = 0;
+	        var STATUS_UPDATING = 1;
+	        var STATUS_UPDATED = 2;
+	        var STATUS_KEY = '__connectUpdateStatus';
+	        function updateConnectedChartsStatus(charts, status) {
+	            for (var i = 0; i < charts.length; i++) {
+	                var otherChart = charts[i];
+	                otherChart[STATUS_KEY] = status;
+	            }
+	        }
+	        zrUtil.each(eventActionMap, function (actionType, eventType) {
+	            chart._messageCenter.on(eventType, function (event) {
+	                if (connectedGroups[chart.group] && chart[STATUS_KEY] !== STATUS_PENDING) {
+	                    var action = chart.makeActionFromEvent(event);
+	                    var otherCharts = [];
+	                    for (var id in instances) {
+	                        var otherChart = instances[id];
+	                        if (otherChart !== chart && otherChart.group === chart.group) {
+	                            otherCharts.push(otherChart);
+	                        }
+	                    }
+	                    updateConnectedChartsStatus(otherCharts, STATUS_PENDING);
+	                    each(otherCharts, function (otherChart) {
+	                        if (otherChart[STATUS_KEY] !== STATUS_UPDATING) {
+	                            otherChart.dispatchAction(action);
+	                        }
+	                    });
+	                    updateConnectedChartsStatus(otherCharts, STATUS_UPDATED);
+	                }
+	            });
+	        });
+
+	    }
+	    /**
+	     * @param {HTMLDomElement} dom
+	     * @param {Object} [theme]
+	     * @param {Object} opts
+	     */
+	    echarts.init = function (dom, theme, opts) {
+	        if (true) {
+	            // Check version
+	            if ((zrender.version.replace('.', '') - 0) < (echarts.dependencies.zrender.replace('.', '') - 0)) {
+	                throw new Error(
+	                    'ZRender ' + zrender.version
+	                    + ' is too old for ECharts ' + echarts.version
+	                    + '. Current version need ZRender '
+	                    + echarts.dependencies.zrender + '+'
+	                );
+	            }
+	            if (!dom) {
+	                throw new Error('Initialize failed: invalid dom.');
+	            }
+	            if (zrUtil.isDom(dom) && dom.nodeName.toUpperCase() !== 'CANVAS' && (!dom.clientWidth || !dom.clientHeight)) {
+	                console.warn('Can\'t get dom width or height');
+	            }
+	        }
+
+	        var chart = new ECharts(dom, theme, opts);
+	        chart.id = 'ec_' + idBase++;
+	        instances[chart.id] = chart;
+
+	        dom.setAttribute &&
+	            dom.setAttribute(DOM_ATTRIBUTE_KEY, chart.id);
+
+	        enableConnect(chart);
+
+	        return chart;
+	    };
+
+	    /**
+	     * @return {string|Array.<module:echarts~ECharts>} groupId
+	     */
+	    echarts.connect = function (groupId) {
+	        // Is array of charts
+	        if (zrUtil.isArray(groupId)) {
+	            var charts = groupId;
+	            groupId = null;
+	            // If any chart has group
+	            zrUtil.each(charts, function (chart) {
+	                if (chart.group != null) {
+	                    groupId = chart.group;
+	                }
+	            });
+	            groupId = groupId || ('g_' + groupIdBase++);
+	            zrUtil.each(charts, function (chart) {
+	                chart.group = groupId;
+	            });
+	        }
+	        connectedGroups[groupId] = true;
+	        return groupId;
+	    };
+
+	    /**
+	     * @return {string} groupId
+	     */
+	    echarts.disConnect = function (groupId) {
+	        connectedGroups[groupId] = false;
+	    };
+
+	    /**
+	     * Dispose a chart instance
+	     * @param  {module:echarts~ECharts|HTMLDomElement|string} chart
+	     */
+	    echarts.dispose = function (chart) {
+	        if (zrUtil.isDom(chart)) {
+	            chart = echarts.getInstanceByDom(chart);
+	        }
+	        else if (typeof chart === 'string') {
+	            chart = instances[chart];
+	        }
+	        if ((chart instanceof ECharts) && !chart.isDisposed()) {
+	            chart.dispose();
+	        }
+	    };
+
+	    /**
+	     * @param  {HTMLDomElement} dom
+	     * @return {echarts~ECharts}
+	     */
+	    echarts.getInstanceByDom = function (dom) {
+	        var key = dom.getAttribute(DOM_ATTRIBUTE_KEY);
+	        return instances[key];
+	    };
+	    /**
+	     * @param {string} key
+	     * @return {echarts~ECharts}
+	     */
+	    echarts.getInstanceById = function (key) {
+	        return instances[key];
+	    };
+
+	    /**
+	     * Register theme
+	     */
+	    echarts.registerTheme = function (name, theme) {
+	        themeStorage[name] = theme;
+	    };
+
+	    /**
+	     * Register option preprocessor
+	     * @param {Function} preprocessorFunc
+	     */
+	    echarts.registerPreprocessor = function (preprocessorFunc) {
+	        optionPreprocessorFuncs.push(preprocessorFunc);
+	    };
+
+	    /**
+	     * @param {number} [priority=1000]
+	     * @param {Function} processorFunc
+	     */
+	    echarts.registerProcessor = function (priority, processorFunc) {
+	        if (typeof priority === 'function') {
+	            processorFunc = priority;
+	            priority = PRIORITY_PROCESSOR_FILTER;
+	        }
+	        if (true) {
+	            if (isNaN(priority)) {
+	                throw new Error('Unkown processor priority');
+	            }
+	        }
+	        dataProcessorFuncs.push({
+	            prio: priority,
+	            func: processorFunc
+	        });
+	    };
+
+	    /**
+	     * Usage:
+	     * registerAction('someAction', 'someEvent', function () { ... });
+	     * registerAction('someAction', function () { ... });
+	     * registerAction(
+	     *     {type: 'someAction', event: 'someEvent', update: 'updateView'},
+	     *     function () { ... }
+	     * );
+	     *
+	     * @param {(string|Object)} actionInfo
+	     * @param {string} actionInfo.type
+	     * @param {string} [actionInfo.event]
+	     * @param {string} [actionInfo.update]
+	     * @param {string} [eventName]
+	     * @param {Function} action
+	     */
+	    echarts.registerAction = function (actionInfo, eventName, action) {
+	        if (typeof eventName === 'function') {
+	            action = eventName;
+	            eventName = '';
+	        }
+	        var actionType = zrUtil.isObject(actionInfo)
+	            ? actionInfo.type
+	            : ([actionInfo, actionInfo = {
+	                event: eventName
+	            }][0]);
+
+	        // Event name is all lowercase
+	        actionInfo.event = (actionInfo.event || actionType).toLowerCase();
+	        eventName = actionInfo.event;
+
+	        if (!actions[actionType]) {
+	            actions[actionType] = {action: action, actionInfo: actionInfo};
+	        }
+	        eventActionMap[eventName] = actionType;
+	    };
+
+	    /**
+	     * @param {string} type
+	     * @param {*} CoordinateSystem
+	     */
+	    echarts.registerCoordinateSystem = function (type, CoordinateSystem) {
+	        CoordinateSystemManager.register(type, CoordinateSystem);
+	    };
+
+	    /**
+	     * Layout is a special stage of visual encoding
+	     * Most visual encoding like color are common for different chart
+	     * But each chart has it's own layout algorithm
+	     *
+	     * @param {string} [priority=1000]
+	     * @param {Function} layoutFunc
+	     */
+	    echarts.registerLayout = function (priority, layoutFunc) {
+	        if (typeof priority === 'function') {
+	            layoutFunc = priority;
+	            priority = PRIORITY_VISUAL_LAYOUT;
+	        }
+	        if (true) {
+	            if (isNaN(priority)) {
+	                throw new Error('Unkown layout priority');
+	            }
+	        }
+	        visualFuncs.push({
+	            prio: priority,
+	            func: layoutFunc,
+	            isLayout: true
+	        });
+	    };
+
+	    /**
+	     * @param {string} [priority=3000]
+	     * @param {Function} visualFunc
+	     */
+	    echarts.registerVisual = function (priority, visualFunc) {
+	        if (typeof priority === 'function') {
+	            visualFunc = priority;
+	            priority = PRIORITY_VISUAL_CHART;
+	        }
+	        if (true) {
+	            if (isNaN(priority)) {
+	                throw new Error('Unkown visual priority');
+	            }
+	        }
+	        visualFuncs.push({
+	            prio: priority,
+	            func: visualFunc
+	        });
+	    };
+
+	    var parseClassType = ComponentModel.parseClassType;
+	    /**
+	     * @param {Object} opts
+	     * @param {string} [superClass]
+	     */
+	    echarts.extendComponentModel = function (opts, superClass) {
+	        var Clazz = ComponentModel;
+	        if (superClass) {
+	            var classType = parseClassType(superClass);
+	            Clazz = ComponentModel.getClass(classType.main, classType.sub, true);
+	        }
+	        return Clazz.extend(opts);
+	    };
+
+	    /**
+	     * @param {Object} opts
+	     * @param {string} [superClass]
+	     */
+	    echarts.extendComponentView = function (opts, superClass) {
+	        var Clazz = ComponentView;
+	        if (superClass) {
+	            var classType = parseClassType(superClass);
+	            Clazz = ComponentView.getClass(classType.main, classType.sub, true);
+	        }
+	        return Clazz.extend(opts);
+	    };
+
+	    /**
+	     * @param {Object} opts
+	     * @param {string} [superClass]
+	     */
+	    echarts.extendSeriesModel = function (opts, superClass) {
+	        var Clazz = SeriesModel;
+	        if (superClass) {
+	            superClass = 'series.' + superClass.replace('series.', '');
+	            var classType = parseClassType(superClass);
+	            Clazz = SeriesModel.getClass(classType.main, classType.sub, true);
+	        }
+	        return Clazz.extend(opts);
+	    };
+
+	    /**
+	     * @param {Object} opts
+	     * @param {string} [superClass]
+	     */
+	    echarts.extendChartView = function (opts, superClass) {
+	        var Clazz = ChartView;
+	        if (superClass) {
+	            superClass.replace('series.', '');
+	            var classType = parseClassType(superClass);
+	            Clazz = ChartView.getClass(classType.main, true);
+	        }
+	        return ChartView.extend(opts);
+	    };
+
+	    /**
+	     * ZRender need a canvas context to do measureText.
+	     * But in node environment canvas may be created by node-canvas.
+	     * So we need to specify how to create a canvas instead of using document.createElement('canvas')
+	     *
+	     * Be careful of using it in the browser.
+	     *
+	     * @param {Function} creator
+	     * @example
+	     *     var Canvas = require('canvas');
+	     *     var echarts = require('echarts');
+	     *     echarts.setCanvasCreator(function () {
+	     *         // Small size is enough.
+	     *         return new Canvas(32, 32);
+	     *     });
+	     */
+	    echarts.setCanvasCreator = function (creator) {
+	        zrUtil.createCanvas = creator;
+	    };
+
+	    echarts.registerVisual(PRIORITY_VISUAL_GLOBAL, __webpack_require__(94));
+	    echarts.registerPreprocessor(__webpack_require__(95));
+
+	    // Default action
+	    echarts.registerAction({
+	        type: 'highlight',
+	        event: 'highlight',
+	        update: 'highlight'
+	    }, zrUtil.noop);
+	    echarts.registerAction({
+	        type: 'downplay',
+	        event: 'downplay',
+	        update: 'downplay'
+	    }, zrUtil.noop);
+
+
+	    // --------
+	    // Exports
+	    // --------
+	    //
+	    echarts.List = __webpack_require__(97);
+	    echarts.Model = __webpack_require__(12);
+
+	    echarts.graphic = __webpack_require__(43);
+	    echarts.number = __webpack_require__(7);
+	    echarts.format = __webpack_require__(6);
+	    echarts.matrix = __webpack_require__(11);
+	    echarts.vector = __webpack_require__(10);
+	    echarts.color = __webpack_require__(39);
+
+	    echarts.util = {};
+	    each([
+	            'map', 'each', 'filter', 'indexOf', 'inherits',
+	            'reduce', 'filter', 'bind', 'curry', 'isArray',
+	            'isString', 'isObject', 'isFunction', 'extend', 'defaults'
+	        ],
+	        function (name) {
+	            echarts.util[name] = zrUtil[name];
+	        }
+	    );
+
+	    // PRIORITY
+	    echarts.PRIORITY = {
+	        PROCESSOR: {
+	            FILTER: PRIORITY_PROCESSOR_FILTER,
+	            STATISTIC: PRIORITY_PROCESSOR_STATISTIC
+	        },
+	        VISUAL: {
+	            LAYOUT: PRIORITY_VISUAL_LAYOUT,
+	            GLOBAL: PRIORITY_VISUAL_GLOBAL,
+	            CHART: PRIORITY_VISUAL_CHART,
+	            COMPONENT: PRIORITY_VISUAL_COMPONENT,
+	            BRUSH: PRIORITY_VISUAL_BRUSH
+	        }
+	    };
+
+	    module.exports = echarts;
+
+
+/***/ },
+/* 2 */
+/***/ function(module, exports) {
+
+	/**
+	 * echarts设备环境识别
+	 *
+	 * @desc echarts基于Canvas，纯Javascript图表库，提供直观，生动，可交互，可个性化定制的数据统计图表。
+	 * @author firede[firede@firede.us]
+	 * @desc thanks zepto.
+	 */
+
+	    var env = {};
+	    if (typeof navigator === 'undefined') {
+	        // In node
+	        env = {
+	            browser: {},
+	            os: {},
+	            node: true,
+	            // Assume canvas is supported
+	            canvasSupported: true
+	        };
+	    }
+	    else {
+	        env = detect(navigator.userAgent);
+	    }
+
+	    module.exports = env;
+
+	    // Zepto.js
+	    // (c) 2010-2013 Thomas Fuchs
+	    // Zepto.js may be freely distributed under the MIT license.
+
+	    function detect(ua) {
+	        var os = {};
+	        var browser = {};
+	        // var webkit = ua.match(/Web[kK]it[\/]{0,1}([\d.]+)/);
+	        // var android = ua.match(/(Android);?[\s\/]+([\d.]+)?/);
+	        // var ipad = ua.match(/(iPad).*OS\s([\d_]+)/);
+	        // var ipod = ua.match(/(iPod)(.*OS\s([\d_]+))?/);
+	        // var iphone = !ipad && ua.match(/(iPhone\sOS)\s([\d_]+)/);
+	        // var webos = ua.match(/(webOS|hpwOS)[\s\/]([\d.]+)/);
+	        // var touchpad = webos && ua.match(/TouchPad/);
+	        // var kindle = ua.match(/Kindle\/([\d.]+)/);
+	        // var silk = ua.match(/Silk\/([\d._]+)/);
+	        // var blackberry = ua.match(/(BlackBerry).*Version\/([\d.]+)/);
+	        // var bb10 = ua.match(/(BB10).*Version\/([\d.]+)/);
+	        // var rimtabletos = ua.match(/(RIM\sTablet\sOS)\s([\d.]+)/);
+	        // var playbook = ua.match(/PlayBook/);
+	        // var chrome = ua.match(/Chrome\/([\d.]+)/) || ua.match(/CriOS\/([\d.]+)/);
+	        var firefox = ua.match(/Firefox\/([\d.]+)/);
+	        // var safari = webkit && ua.match(/Mobile\//) && !chrome;
+	        // var webview = ua.match(/(iPhone|iPod|iPad).*AppleWebKit(?!.*Safari)/) && !chrome;
+	        var ie = ua.match(/MSIE\s([\d.]+)/)
+	            // IE 11 Trident/7.0; rv:11.0
+	            || ua.match(/Trident\/.+?rv:(([\d.]+))/);
+	        var edge = ua.match(/Edge\/([\d.]+)/); // IE 12 and 12+
+
+	        // Todo: clean this up with a better OS/browser seperation:
+	        // - discern (more) between multiple browsers on android
+	        // - decide if kindle fire in silk mode is android or not
+	        // - Firefox on Android doesn't specify the Android version
+	        // - possibly devide in os, device and browser hashes
+
+	        // if (browser.webkit = !!webkit) browser.version = webkit[1];
+
+	        // if (android) os.android = true, os.version = android[2];
+	        // if (iphone && !ipod) os.ios = os.iphone = true, os.version = iphone[2].replace(/_/g, '.');
+	        // if (ipad) os.ios = os.ipad = true, os.version = ipad[2].replace(/_/g, '.');
+	        // if (ipod) os.ios = os.ipod = true, os.version = ipod[3] ? ipod[3].replace(/_/g, '.') : null;
+	        // if (webos) os.webos = true, os.version = webos[2];
+	        // if (touchpad) os.touchpad = true;
+	        // if (blackberry) os.blackberry = true, os.version = blackberry[2];
+	        // if (bb10) os.bb10 = true, os.version = bb10[2];
+	        // if (rimtabletos) os.rimtabletos = true, os.version = rimtabletos[2];
+	        // if (playbook) browser.playbook = true;
+	        // if (kindle) os.kindle = true, os.version = kindle[1];
+	        // if (silk) browser.silk = true, browser.version = silk[1];
+	        // if (!silk && os.android && ua.match(/Kindle Fire/)) browser.silk = true;
+	        // if (chrome) browser.chrome = true, browser.version = chrome[1];
+	        if (firefox) browser.firefox = true, browser.version = firefox[1];
+	        // if (safari && (ua.match(/Safari/) || !!os.ios)) browser.safari = true;
+	        // if (webview) browser.webview = true;
+	        if (ie) {
+	            browser.ie = true; browser.version = ie[1];
+	        }
+	        if (ie) {
+	            browser.ie = true;
+	            browser.version = ie[1];
+	        }
+	        if (edge) {
+	            browser.edge = true;
+	            browser.version = edge[1];
+	        }
+
+	        // os.tablet = !!(ipad || playbook || (android && !ua.match(/Mobile/)) ||
+	        //     (firefox && ua.match(/Tablet/)) || (ie && !ua.match(/Phone/) && ua.match(/Touch/)));
+	        // os.phone  = !!(!os.tablet && !os.ipod && (android || iphone || webos ||
+	        //     (chrome && ua.match(/Android/)) || (chrome && ua.match(/CriOS\/([\d.]+)/)) ||
+	        //     (firefox && ua.match(/Mobile/)) || (ie && ua.match(/Touch/))));
+
+	        return {
+	            browser: browser,
+	            os: os,
+	            node: false,
+	            // 原生canvas支持，改极端点了
+	            // canvasSupported : !(browser.ie && parseFloat(browser.version) < 9)
+	            canvasSupported : document.createElement('canvas').getContext ? true : false,
+	            // @see <http://stackoverflow.com/questions/4817029/whats-the-best-way-to-detect-a-touch-screen-device-using-javascript>
+	            // works on most browsers
+	            // IE10/11 does not support touch event, and MS Edge supports them but not by
+	            // default, so we dont check navigator.maxTouchPoints for them here.
+	            touchEventsSupported: 'ontouchstart' in window && !browser.ie && !browser.edge,
+	            // <http://caniuse.com/#search=pointer%20event>.
+	            pointerEventsSupported: 'onpointerdown' in window
+	                // Firefox supports pointer but not by default,
+	                // only MS browsers are reliable on pointer events currently.
+	                && (browser.edge || (browser.ie && browser.version >= 10))
+	        };
+	    }
+
+
+/***/ },
+/* 3 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * ECharts global model
+	 *
+	 * @module {echarts/model/Global}
+	 *
+	 */
+
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var modelUtil = __webpack_require__(5);
+	    var Model = __webpack_require__(12);
+	    var each = zrUtil.each;
+	    var filter = zrUtil.filter;
+	    var map = zrUtil.map;
+	    var isArray = zrUtil.isArray;
+	    var indexOf = zrUtil.indexOf;
+	    var isObject = zrUtil.isObject;
+
+	    var ComponentModel = __webpack_require__(19);
+
+	    var globalDefault = __webpack_require__(23);
+
+	    var OPTION_INNER_KEY = '\0_ec_inner';
+
+	    /**
+	     * @alias module:echarts/model/Global
+	     *
+	     * @param {Object} option
+	     * @param {module:echarts/model/Model} parentModel
+	     * @param {Object} theme
+	     */
+	    var GlobalModel = Model.extend({
+
+	        constructor: GlobalModel,
+
+	        init: function (option, parentModel, theme, optionManager) {
+	            theme = theme || {};
+
+	            this.option = null; // Mark as not initialized.
+
+	            /**
+	             * @type {module:echarts/model/Model}
+	             * @private
+	             */
+	            this._theme = new Model(theme);
+
+	            /**
+	             * @type {module:echarts/model/OptionManager}
+	             */
+	            this._optionManager = optionManager;
+	        },
+
+	        setOption: function (option, optionPreprocessorFuncs) {
+	            zrUtil.assert(
+	                !(OPTION_INNER_KEY in option),
+	                'please use chart.getOption()'
+	            );
+
+	            this._optionManager.setOption(option, optionPreprocessorFuncs);
+
+	            this.resetOption();
+	        },
+
+	        /**
+	         * @param {string} type null/undefined: reset all.
+	         *                      'recreate': force recreate all.
+	         *                      'timeline': only reset timeline option
+	         *                      'media': only reset media query option
+	         * @return {boolean} Whether option changed.
+	         */
+	        resetOption: function (type) {
+	            var optionChanged = false;
+	            var optionManager = this._optionManager;
+
+	            if (!type || type === 'recreate') {
+	                var baseOption = optionManager.mountOption(type === 'recreate');
+
+	                if (!this.option || type === 'recreate') {
+	                    initBase.call(this, baseOption);
+	                }
+	                else {
+	                    this.restoreData();
+	                    this.mergeOption(baseOption);
+	                }
+	                optionChanged = true;
+	            }
+
+	            if (type === 'timeline' || type === 'media') {
+	                this.restoreData();
+	            }
+
+	            if (!type || type === 'recreate' || type === 'timeline') {
+	                var timelineOption = optionManager.getTimelineOption(this);
+	                timelineOption && (this.mergeOption(timelineOption), optionChanged = true);
+	            }
+
+	            if (!type || type === 'recreate' || type === 'media') {
+	                var mediaOptions = optionManager.getMediaOption(this, this._api);
+	                if (mediaOptions.length) {
+	                    each(mediaOptions, function (mediaOption) {
+	                        this.mergeOption(mediaOption, optionChanged = true);
+	                    }, this);
+	                }
+	            }
+
+	            return optionChanged;
+	        },
+
+	        /**
+	         * @protected
+	         */
+	        mergeOption: function (newOption) {
+	            var option = this.option;
+	            var componentsMap = this._componentsMap;
+	            var newCptTypes = [];
+
+	            // 如果不存在对应的 component model 则直接 merge
+	            each(newOption, function (componentOption, mainType) {
+	                if (componentOption == null) {
+	                    return;
+	                }
+
+	                if (!ComponentModel.hasClass(mainType)) {
+	                    option[mainType] = option[mainType] == null
+	                        ? zrUtil.clone(componentOption)
+	                        : zrUtil.merge(option[mainType], componentOption, true);
+	                }
+	                else {
+	                    newCptTypes.push(mainType);
+	                }
+	            });
+
+	            // FIXME OPTION 同步是否要改回原来的
+	            ComponentModel.topologicalTravel(
+	                newCptTypes, ComponentModel.getAllClassMainTypes(), visitComponent, this
+	            );
+
+	            function visitComponent(mainType, dependencies) {
+	                var newCptOptionList = modelUtil.normalizeToArray(newOption[mainType]);
+
+	                var mapResult = modelUtil.mappingToExists(
+	                    componentsMap[mainType], newCptOptionList
+	                );
+
+	                makeKeyInfo(mainType, mapResult);
+
+	                var dependentModels = getComponentsByTypes(
+	                    componentsMap, dependencies
+	                );
+
+	                option[mainType] = [];
+	                componentsMap[mainType] = [];
+
+	                each(mapResult, function (resultItem, index) {
+	                    var componentModel = resultItem.exist;
+	                    var newCptOption = resultItem.option;
+
+	                    zrUtil.assert(
+	                        isObject(newCptOption) || componentModel,
+	                        'Empty component definition'
+	                    );
+
+	                    // Consider where is no new option and should be merged using {},
+	                    // see removeEdgeAndAdd in topologicalTravel and
+	                    // ComponentModel.getAllClassMainTypes.
+	                    if (!newCptOption) {
+	                        componentModel.mergeOption({}, this);
+	                        componentModel.optionUpdated({}, false);
+	                    }
+	                    else {
+	                        var ComponentModelClass = ComponentModel.getClass(
+	                            mainType, resultItem.keyInfo.subType, true
+	                        );
+
+	                        if (componentModel && componentModel instanceof ComponentModelClass) {
+	                            componentModel.mergeOption(newCptOption, this);
+	                            componentModel.optionUpdated(newCptOption, false);
+	                        }
+	                        else {
+	                            // PENDING Global as parent ?
+	                            var extraOpt = zrUtil.extend(
+	                                {
+	                                    dependentModels: dependentModels,
+	                                    componentIndex: index
+	                                },
+	                                resultItem.keyInfo
+	                            );
+	                            componentModel = new ComponentModelClass(
+	                                newCptOption, this, this, extraOpt
+	                            );
+	                            componentModel.init(newCptOption, this, this, extraOpt);
+	                            // Call optionUpdated after init.
+	                            // newCptOption has been used as componentModel.option
+	                            // and may be merged with theme and default, so pass null
+	                            // to avoid confusion.
+	                            componentModel.optionUpdated(null, true);
+	                        }
+	                    }
+
+	                    componentsMap[mainType][index] = componentModel;
+	                    option[mainType][index] = componentModel.option;
+	                }, this);
+
+	                // Backup series for filtering.
+	                if (mainType === 'series') {
+	                    this._seriesIndices = createSeriesIndices(componentsMap.series);
+	                }
+	            }
+	        },
+
+	        /**
+	         * Get option for output (cloned option and inner info removed)
+	         * @public
+	         * @return {Object}
+	         */
+	        getOption: function () {
+	            var option = zrUtil.clone(this.option);
+
+	            each(option, function (opts, mainType) {
+	                if (ComponentModel.hasClass(mainType)) {
+	                    var opts = modelUtil.normalizeToArray(opts);
+	                    for (var i = opts.length - 1; i >= 0; i--) {
+	                        // Remove options with inner id.
+	                        if (modelUtil.isIdInner(opts[i])) {
+	                            opts.splice(i, 1);
+	                        }
+	                    }
+	                    option[mainType] = opts;
+	                }
+	            });
+
+	            delete option[OPTION_INNER_KEY];
+
+	            return option;
+	        },
+
+	        /**
+	         * @return {module:echarts/model/Model}
+	         */
+	        getTheme: function () {
+	            return this._theme;
+	        },
+
+	        /**
+	         * @param {string} mainType
+	         * @param {number} [idx=0]
+	         * @return {module:echarts/model/Component}
+	         */
+	        getComponent: function (mainType, idx) {
+	            var list = this._componentsMap[mainType];
+	            if (list) {
+	                return list[idx || 0];
+	            }
+	        },
+
+	        /**
+	         * @param {Object} condition
+	         * @param {string} condition.mainType
+	         * @param {string} [condition.subType] If ignore, only query by mainType
+	         * @param {number} [condition.index] Either input index or id or name.
+	         * @param {string} [condition.id] Either input index or id or name.
+	         * @param {string} [condition.name] Either input index or id or name.
+	         * @return {Array.<module:echarts/model/Component>}
+	         */
+	        queryComponents: function (condition) {
+	            var mainType = condition.mainType;
+	            if (!mainType) {
+	                return [];
+	            }
+
+	            var index = condition.index;
+	            var id = condition.id;
+	            var name = condition.name;
+
+	            var cpts = this._componentsMap[mainType];
+
+	            if (!cpts || !cpts.length) {
+	                return [];
+	            }
+
+	            var result;
+
+	            if (index != null) {
+	                if (!isArray(index)) {
+	                    index = [index];
+	                }
+	                result = filter(map(index, function (idx) {
+	                    return cpts[idx];
+	                }), function (val) {
+	                    return !!val;
+	                });
+	            }
+	            else if (id != null) {
+	                var isIdArray = isArray(id);
+	                result = filter(cpts, function (cpt) {
+	                    return (isIdArray && indexOf(id, cpt.id) >= 0)
+	                        || (!isIdArray && cpt.id === id);
+	                });
+	            }
+	            else if (name != null) {
+	                var isNameArray = isArray(name);
+	                result = filter(cpts, function (cpt) {
+	                    return (isNameArray && indexOf(name, cpt.name) >= 0)
+	                        || (!isNameArray && cpt.name === name);
+	                });
+	            }
+
+	            return filterBySubType(result, condition);
+	        },
+
+	        /**
+	         * The interface is different from queryComponents,
+	         * which is convenient for inner usage.
+	         *
+	         * @usage
+	         * var result = findComponents(
+	         *     {mainType: 'dataZoom', query: {dataZoomId: 'abc'}}
+	         * );
+	         * var result = findComponents(
+	         *     {mainType: 'series', subType: 'pie', query: {seriesName: 'uio'}}
+	         * );
+	         * var result = findComponents(
+	         *     {mainType: 'series'},
+	         *     function (model, index) {...}
+	         * );
+	         * // result like [component0, componnet1, ...]
+	         *
+	         * @param {Object} condition
+	         * @param {string} condition.mainType Mandatory.
+	         * @param {string} [condition.subType] Optional.
+	         * @param {Object} [condition.query] like {xxxIndex, xxxId, xxxName},
+	         *        where xxx is mainType.
+	         *        If query attribute is null/undefined or has no index/id/name,
+	         *        do not filtering by query conditions, which is convenient for
+	         *        no-payload situations or when target of action is global.
+	         * @param {Function} [condition.filter] parameter: component, return boolean.
+	         * @return {Array.<module:echarts/model/Component>}
+	         */
+	        findComponents: function (condition) {
+	            var query = condition.query;
+	            var mainType = condition.mainType;
+
+	            var queryCond = getQueryCond(query);
+	            var result = queryCond
+	                ? this.queryComponents(queryCond)
+	                : this._componentsMap[mainType];
+
+	            return doFilter(filterBySubType(result, condition));
+
+	            function getQueryCond(q) {
+	                var indexAttr = mainType + 'Index';
+	                var idAttr = mainType + 'Id';
+	                var nameAttr = mainType + 'Name';
+	                return q && (
+	                        q.hasOwnProperty(indexAttr)
+	                        || q.hasOwnProperty(idAttr)
+	                        || q.hasOwnProperty(nameAttr)
+	                    )
+	                    ? {
+	                        mainType: mainType,
+	                        // subType will be filtered finally.
+	                        index: q[indexAttr],
+	                        id: q[idAttr],
+	                        name: q[nameAttr]
+	                    }
+	                    : null;
+	            }
+
+	            function doFilter(res) {
+	                return condition.filter
+	                     ? filter(res, condition.filter)
+	                     : res;
+	            }
+	        },
+
+	        /**
+	         * @usage
+	         * eachComponent('legend', function (legendModel, index) {
+	         *     ...
+	         * });
+	         * eachComponent(function (componentType, model, index) {
+	         *     // componentType does not include subType
+	         *     // (componentType is 'xxx' but not 'xxx.aa')
+	         * });
+	         * eachComponent(
+	         *     {mainType: 'dataZoom', query: {dataZoomId: 'abc'}},
+	         *     function (model, index) {...}
+	         * );
+	         * eachComponent(
+	         *     {mainType: 'series', subType: 'pie', query: {seriesName: 'uio'}},
+	         *     function (model, index) {...}
+	         * );
+	         *
+	         * @param {string|Object=} mainType When mainType is object, the definition
+	         *                                  is the same as the method 'findComponents'.
+	         * @param {Function} cb
+	         * @param {*} context
+	         */
+	        eachComponent: function (mainType, cb, context) {
+	            var componentsMap = this._componentsMap;
+
+	            if (typeof mainType === 'function') {
+	                context = cb;
+	                cb = mainType;
+	                each(componentsMap, function (components, componentType) {
+	                    each(components, function (component, index) {
+	                        cb.call(context, componentType, component, index);
+	                    });
+	                });
+	            }
+	            else if (zrUtil.isString(mainType)) {
+	                each(componentsMap[mainType], cb, context);
+	            }
+	            else if (isObject(mainType)) {
+	                var queryResult = this.findComponents(mainType);
+	                each(queryResult, cb, context);
+	            }
+	        },
+
+	        /**
+	         * @param {string} name
+	         * @return {Array.<module:echarts/model/Series>}
+	         */
+	        getSeriesByName: function (name) {
+	            var series = this._componentsMap.series;
+	            return filter(series, function (oneSeries) {
+	                return oneSeries.name === name;
+	            });
+	        },
+
+	        /**
+	         * @param {number} seriesIndex
+	         * @return {module:echarts/model/Series}
+	         */
+	        getSeriesByIndex: function (seriesIndex) {
+	            return this._componentsMap.series[seriesIndex];
+	        },
+
+	        /**
+	         * @param {string} subType
+	         * @return {Array.<module:echarts/model/Series>}
+	         */
+	        getSeriesByType: function (subType) {
+	            var series = this._componentsMap.series;
+	            return filter(series, function (oneSeries) {
+	                return oneSeries.subType === subType;
+	            });
+	        },
+
+	        /**
+	         * @return {Array.<module:echarts/model/Series>}
+	         */
+	        getSeries: function () {
+	            return this._componentsMap.series.slice();
+	        },
+
+	        /**
+	         * After filtering, series may be different
+	         * frome raw series.
+	         *
+	         * @param {Function} cb
+	         * @param {*} context
+	         */
+	        eachSeries: function (cb, context) {
+	            assertSeriesInitialized(this);
+	            each(this._seriesIndices, function (rawSeriesIndex) {
+	                var series = this._componentsMap.series[rawSeriesIndex];
+	                cb.call(context, series, rawSeriesIndex);
+	            }, this);
+	        },
+
+	        /**
+	         * Iterate raw series before filtered.
+	         *
+	         * @param {Function} cb
+	         * @param {*} context
+	         */
+	        eachRawSeries: function (cb, context) {
+	            each(this._componentsMap.series, cb, context);
+	        },
+
+	        /**
+	         * After filtering, series may be different.
+	         * frome raw series.
+	         *
+	         * @parma {string} subType
+	         * @param {Function} cb
+	         * @param {*} context
+	         */
+	        eachSeriesByType: function (subType, cb, context) {
+	            assertSeriesInitialized(this);
+	            each(this._seriesIndices, function (rawSeriesIndex) {
+	                var series = this._componentsMap.series[rawSeriesIndex];
+	                if (series.subType === subType) {
+	                    cb.call(context, series, rawSeriesIndex);
+	                }
+	            }, this);
+	        },
+
+	        /**
+	         * Iterate raw series before filtered of given type.
+	         *
+	         * @parma {string} subType
+	         * @param {Function} cb
+	         * @param {*} context
+	         */
+	        eachRawSeriesByType: function (subType, cb, context) {
+	            return each(this.getSeriesByType(subType), cb, context);
+	        },
+
+	        /**
+	         * @param {module:echarts/model/Series} seriesModel
+	         */
+	        isSeriesFiltered: function (seriesModel) {
+	            assertSeriesInitialized(this);
+	            return zrUtil.indexOf(this._seriesIndices, seriesModel.componentIndex) < 0;
+	        },
+
+	        /**
+	         * @param {Function} cb
+	         * @param {*} context
+	         */
+	        filterSeries: function (cb, context) {
+	            assertSeriesInitialized(this);
+	            var filteredSeries = filter(
+	                this._componentsMap.series, cb, context
+	            );
+	            this._seriesIndices = createSeriesIndices(filteredSeries);
+	        },
+
+	        restoreData: function () {
+	            var componentsMap = this._componentsMap;
+
+	            this._seriesIndices = createSeriesIndices(componentsMap.series);
+
+	            var componentTypes = [];
+	            each(componentsMap, function (components, componentType) {
+	                componentTypes.push(componentType);
+	            });
+
+	            ComponentModel.topologicalTravel(
+	                componentTypes,
+	                ComponentModel.getAllClassMainTypes(),
+	                function (componentType, dependencies) {
+	                    each(componentsMap[componentType], function (component) {
+	                        component.restoreData();
+	                    });
+	                }
+	            );
+	        }
+
+	    });
+
+	    /**
+	     * @inner
+	     */
+	    function mergeTheme(option, theme) {
+	        for (var name in theme) {
+	            // 如果有 component model 则把具体的 merge 逻辑交给该 model 处理
+	            if (!ComponentModel.hasClass(name)) {
+	                if (typeof theme[name] === 'object') {
+	                    option[name] = !option[name]
+	                        ? zrUtil.clone(theme[name])
+	                        : zrUtil.merge(option[name], theme[name], false);
+	                }
+	                else {
+	                    if (option[name] == null) {
+	                        option[name] = theme[name];
+	                    }
+	                }
+	            }
+	        }
+	    }
+
+	    function initBase(baseOption) {
+	        baseOption = baseOption;
+
+	        // Using OPTION_INNER_KEY to mark that this option can not be used outside,
+	        // i.e. `chart.setOption(chart.getModel().option);` is forbiden.
+	        this.option = {};
+	        this.option[OPTION_INNER_KEY] = 1;
+
+	        /**
+	         * @type {Object.<string, Array.<module:echarts/model/Model>>}
+	         * @private
+	         */
+	        this._componentsMap = {};
+
+	        /**
+	         * Mapping between filtered series list and raw series list.
+	         * key: filtered series indices, value: raw series indices.
+	         * @type {Array.<nubmer>}
+	         * @private
+	         */
+	        this._seriesIndices = null;
+
+	        mergeTheme(baseOption, this._theme.option);
+
+	        // TODO Needs clone when merging to the unexisted property
+	        zrUtil.merge(baseOption, globalDefault, false);
+
+	        this.mergeOption(baseOption);
+	    }
+
+	    /**
+	     * @inner
+	     * @param {Array.<string>|string} types model types
+	     * @return {Object} key: {string} type, value: {Array.<Object>} models
+	     */
+	    function getComponentsByTypes(componentsMap, types) {
+	        if (!zrUtil.isArray(types)) {
+	            types = types ? [types] : [];
+	        }
+
+	        var ret = {};
+	        each(types, function (type) {
+	            ret[type] = (componentsMap[type] || []).slice();
+	        });
+
+	        return ret;
+	    }
+
+	    /**
+	     * @inner
+	     */
+	    function makeKeyInfo(mainType, mapResult) {
+	        // We use this id to hash component models and view instances
+	        // in echarts. id can be specified by user, or auto generated.
+
+	        // The id generation rule ensures new view instance are able
+	        // to mapped to old instance when setOption are called in
+	        // no-merge mode. So we generate model id by name and plus
+	        // type in view id.
+
+	        // name can be duplicated among components, which is convenient
+	        // to specify multi components (like series) by one name.
+
+	        // Ensure that each id is distinct.
+	        var idMap = {};
+
+	        each(mapResult, function (item, index) {
+	            var existCpt = item.exist;
+	            existCpt && (idMap[existCpt.id] = item);
+	        });
+
+	        each(mapResult, function (item, index) {
+	            var opt = item.option;
+
+	            zrUtil.assert(
+	                !opt || opt.id == null || !idMap[opt.id] || idMap[opt.id] === item,
+	                'id duplicates: ' + (opt && opt.id)
+	            );
+
+	            opt && opt.id != null && (idMap[opt.id] = item);
+
+	            // Complete subType
+	            if (isObject(opt)) {
+	                var subType = determineSubType(mainType, opt, item.exist);
+	                item.keyInfo = {mainType: mainType, subType: subType};
+	            }
+	        });
+
+	        // Make name and id.
+	        each(mapResult, function (item, index) {
+	            var existCpt = item.exist;
+	            var opt = item.option;
+	            var keyInfo = item.keyInfo;
+
+	            if (!isObject(opt)) {
+	                return;
+	            }
+
+	            // name can be overwitten. Consider case: axis.name = '20km'.
+	            // But id generated by name will not be changed, which affect
+	            // only in that case: setOption with 'not merge mode' and view
+	            // instance will be recreated, which can be accepted.
+	            keyInfo.name = opt.name != null
+	                ? opt.name + ''
+	                : existCpt
+	                ? existCpt.name
+	                : '\0-';
+
+	            if (existCpt) {
+	                keyInfo.id = existCpt.id;
+	            }
+	            else if (opt.id != null) {
+	                keyInfo.id = opt.id + '';
+	            }
+	            else {
+	                // Consider this situatoin:
+	                //  optionA: [{name: 'a'}, {name: 'a'}, {..}]
+	                //  optionB [{..}, {name: 'a'}, {name: 'a'}]
+	                // Series with the same name between optionA and optionB
+	                // should be mapped.
+	                var idNum = 0;
+	                do {
+	                    keyInfo.id = '\0' + keyInfo.name + '\0' + idNum++;
+	                }
+	                while (idMap[keyInfo.id]);
+	            }
+
+	            idMap[keyInfo.id] = item;
+	        });
+	    }
+
+	    /**
+	     * @inner
+	     */
+	    function determineSubType(mainType, newCptOption, existComponent) {
+	        var subType = newCptOption.type
+	            ? newCptOption.type
+	            : existComponent
+	            ? existComponent.subType
+	            // Use determineSubType only when there is no existComponent.
+	            : ComponentModel.determineSubType(mainType, newCptOption);
+
+	        // tooltip, markline, markpoint may always has no subType
+	        return subType;
+	    }
+
+	    /**
+	     * @inner
+	     */
+	    function createSeriesIndices(seriesModels) {
+	        return map(seriesModels, function (series) {
+	            return series.componentIndex;
+	        }) || [];
+	    }
+
+	    /**
+	     * @inner
+	     */
+	    function filterBySubType(components, condition) {
+	        // Using hasOwnProperty for restrict. Consider
+	        // subType is undefined in user payload.
+	        return condition.hasOwnProperty('subType')
+	            ? filter(components, function (cpt) {
+	                return cpt.subType === condition.subType;
+	            })
+	            : components;
+	    }
+
+	    /**
+	     * @inner
+	     */
+	    function assertSeriesInitialized(ecModel) {
+	        // Components that use _seriesIndices should depends on series component,
+	        // which make sure that their initialization is after series.
+	        if (true) {
+	            if (!ecModel._seriesIndices) {
+	                throw new Error('Series has not been initialized yet.');
+	            }
+	        }
+	    }
+
+	    zrUtil.mixin(GlobalModel, __webpack_require__(24));
+
+	    module.exports = GlobalModel;
+
+
+/***/ },
+/* 4 */
+/***/ function(module, exports) {
+
+	/**
+	 * @module zrender/core/util
+	 */
+
+
+	    // 用于处理merge时无法遍历Date等对象的问题
+	    var BUILTIN_OBJECT = {
+	        '[object Function]': 1,
+	        '[object RegExp]': 1,
+	        '[object Date]': 1,
+	        '[object Error]': 1,
+	        '[object CanvasGradient]': 1,
+	        '[object CanvasPattern]': 1,
+	        // In node-canvas Image can be Canvas.Image
+	        '[object Image]': 1
+	    };
+
+	    var objToString = Object.prototype.toString;
+
+	    var arrayProto = Array.prototype;
+	    var nativeForEach = arrayProto.forEach;
+	    var nativeFilter = arrayProto.filter;
+	    var nativeSlice = arrayProto.slice;
+	    var nativeMap = arrayProto.map;
+	    var nativeReduce = arrayProto.reduce;
+
+	    /**
+	     * @param {*} source
+	     * @return {*} 拷贝后的新对象
+	     */
+	    function clone(source) {
+	        if (typeof source == 'object' && source !== null) {
+	            var result = source;
+	            if (source instanceof Array) {
+	                result = [];
+	                for (var i = 0, len = source.length; i < len; i++) {
+	                    result[i] = clone(source[i]);
+	                }
+	            }
+	            else if (
+	                !isBuildInObject(source)
+	                // 是否为 dom 对象
+	                && !isDom(source)
+	            ) {
+	                result = {};
+	                for (var key in source) {
+	                    if (source.hasOwnProperty(key)) {
+	                        result[key] = clone(source[key]);
+	                    }
+	                }
+	            }
+
+	            return result;
+	        }
+
+	        return source;
+	    }
+
+	    /**
+	     * @memberOf module:zrender/core/util
+	     * @param {*} target
+	     * @param {*} source
+	     * @param {boolean} [overwrite=false]
+	     */
+	    function merge(target, source, overwrite) {
+	        // We should escapse that source is string
+	        // and enter for ... in ...
+	        if (!isObject(source) || !isObject(target)) {
+	            return overwrite ? clone(source) : target;
+	        }
+
+	        for (var key in source) {
+	            if (source.hasOwnProperty(key)) {
+	                var targetProp = target[key];
+	                var sourceProp = source[key];
+
+	                if (isObject(sourceProp)
+	                    && isObject(targetProp)
+	                    && !isArray(sourceProp)
+	                    && !isArray(targetProp)
+	                    && !isDom(sourceProp)
+	                    && !isDom(targetProp)
+	                    && !isBuildInObject(sourceProp)
+	                    && !isBuildInObject(targetProp)
+	                ) {
+	                    // 如果需要递归覆盖，就递归调用merge
+	                    merge(targetProp, sourceProp, overwrite);
+	                }
+	                else if (overwrite || !(key in target)) {
+	                    // 否则只处理overwrite为true，或者在目标对象中没有此属性的情况
+	                    // NOTE，在 target[key] 不存在的时候也是直接覆盖
+	                    target[key] = clone(source[key], true);
+	                }
+	            }
+	        }
+
+	        return target;
+	    }
+
+	    /**
+	     * @param {Array} targetAndSources The first item is target, and the rests are source.
+	     * @param {boolean} [overwrite=false]
+	     * @return {*} target
+	     */
+	    function mergeAll(targetAndSources, overwrite) {
+	        var result = targetAndSources[0];
+	        for (var i = 1, len = targetAndSources.length; i < len; i++) {
+	            result = merge(result, targetAndSources[i], overwrite);
+	        }
+	        return result;
+	    }
+
+	    /**
+	     * @param {*} target
+	     * @param {*} source
+	     * @memberOf module:zrender/core/util
+	     */
+	    function extend(target, source) {
+	        for (var key in source) {
+	            if (source.hasOwnProperty(key)) {
+	                target[key] = source[key];
+	            }
+	        }
+	        return target;
+	    }
+
+	    /**
+	     * @param {*} target
+	     * @param {*} source
+	     * @param {boolen} [overlay=false]
+	     * @memberOf module:zrender/core/util
+	     */
+	    function defaults(target, source, overlay) {
+	        for (var key in source) {
+	            if (source.hasOwnProperty(key)
+	                && (overlay ? source[key] != null : target[key] == null)
+	            ) {
+	                target[key] = source[key];
+	            }
+	        }
+	        return target;
+	    }
+
+	    function createCanvas() {
+	        return document.createElement('canvas');
+	    }
+	    // FIXME
+	    var _ctx;
+	    function getContext() {
+	        if (!_ctx) {
+	            // Use util.createCanvas instead of createCanvas
+	            // because createCanvas may be overwritten in different environment
+	            _ctx = util.createCanvas().getContext('2d');
+	        }
+	        return _ctx;
+	    }
+
+	    /**
+	     * 查询数组中元素的index
+	     * @memberOf module:zrender/core/util
+	     */
+	    function indexOf(array, value) {
+	        if (array) {
+	            if (array.indexOf) {
+	                return array.indexOf(value);
+	            }
+	            for (var i = 0, len = array.length; i < len; i++) {
+	                if (array[i] === value) {
+	                    return i;
+	                }
+	            }
+	        }
+	        return -1;
+	    }
+
+	    /**
+	     * 构造类继承关系
+	     *
+	     * @memberOf module:zrender/core/util
+	     * @param {Function} clazz 源类
+	     * @param {Function} baseClazz 基类
+	     */
+	    function inherits(clazz, baseClazz) {
+	        var clazzPrototype = clazz.prototype;
+	        function F() {}
+	        F.prototype = baseClazz.prototype;
+	        clazz.prototype = new F();
+
+	        for (var prop in clazzPrototype) {
+	            clazz.prototype[prop] = clazzPrototype[prop];
+	        }
+	        clazz.prototype.constructor = clazz;
+	        clazz.superClass = baseClazz;
+	    }
+
+	    /**
+	     * @memberOf module:zrender/core/util
+	     * @param {Object|Function} target
+	     * @param {Object|Function} sorce
+	     * @param {boolean} overlay
+	     */
+	    function mixin(target, source, overlay) {
+	        target = 'prototype' in target ? target.prototype : target;
+	        source = 'prototype' in source ? source.prototype : source;
+
+	        defaults(target, source, overlay);
+	    }
+
+	    /**
+	     * @param {Array|TypedArray} data
+	     */
+	    function isArrayLike(data) {
+	        if (! data) {
+	            return;
+	        }
+	        if (typeof data == 'string') {
+	            return false;
+	        }
+	        return typeof data.length == 'number';
+	    }
+
+	    /**
+	     * 数组或对象遍历
+	     * @memberOf module:zrender/core/util
+	     * @param {Object|Array} obj
+	     * @param {Function} cb
+	     * @param {*} [context]
+	     */
+	    function each(obj, cb, context) {
+	        if (!(obj && cb)) {
+	            return;
+	        }
+	        if (obj.forEach && obj.forEach === nativeForEach) {
+	            obj.forEach(cb, context);
+	        }
+	        else if (obj.length === +obj.length) {
+	            for (var i = 0, len = obj.length; i < len; i++) {
+	                cb.call(context, obj[i], i, obj);
+	            }
+	        }
+	        else {
+	            for (var key in obj) {
+	                if (obj.hasOwnProperty(key)) {
+	                    cb.call(context, obj[key], key, obj);
+	                }
+	            }
+	        }
+	    }
+
+	    /**
+	     * 数组映射
+	     * @memberOf module:zrender/core/util
+	     * @param {Array} obj
+	     * @param {Function} cb
+	     * @param {*} [context]
+	     * @return {Array}
+	     */
+	    function map(obj, cb, context) {
+	        if (!(obj && cb)) {
+	            return;
+	        }
+	        if (obj.map && obj.map === nativeMap) {
+	            return obj.map(cb, context);
+	        }
+	        else {
+	            var result = [];
+	            for (var i = 0, len = obj.length; i < len; i++) {
+	                result.push(cb.call(context, obj[i], i, obj));
+	            }
+	            return result;
+	        }
+	    }
+
+	    /**
+	     * @memberOf module:zrender/core/util
+	     * @param {Array} obj
+	     * @param {Function} cb
+	     * @param {Object} [memo]
+	     * @param {*} [context]
+	     * @return {Array}
+	     */
+	    function reduce(obj, cb, memo, context) {
+	        if (!(obj && cb)) {
+	            return;
+	        }
+	        if (obj.reduce && obj.reduce === nativeReduce) {
+	            return obj.reduce(cb, memo, context);
+	        }
+	        else {
+	            for (var i = 0, len = obj.length; i < len; i++) {
+	                memo = cb.call(context, memo, obj[i], i, obj);
+	            }
+	            return memo;
+	        }
+	    }
+
+	    /**
+	     * 数组过滤
+	     * @memberOf module:zrender/core/util
+	     * @param {Array} obj
+	     * @param {Function} cb
+	     * @param {*} [context]
+	     * @return {Array}
+	     */
+	    function filter(obj, cb, context) {
+	        if (!(obj && cb)) {
+	            return;
+	        }
+	        if (obj.filter && obj.filter === nativeFilter) {
+	            return obj.filter(cb, context);
+	        }
+	        else {
+	            var result = [];
+	            for (var i = 0, len = obj.length; i < len; i++) {
+	                if (cb.call(context, obj[i], i, obj)) {
+	                    result.push(obj[i]);
+	                }
+	            }
+	            return result;
+	        }
+	    }
+
+	    /**
+	     * 数组项查找
+	     * @memberOf module:zrender/core/util
+	     * @param {Array} obj
+	     * @param {Function} cb
+	     * @param {*} [context]
+	     * @return {Array}
+	     */
+	    function find(obj, cb, context) {
+	        if (!(obj && cb)) {
+	            return;
+	        }
+	        for (var i = 0, len = obj.length; i < len; i++) {
+	            if (cb.call(context, obj[i], i, obj)) {
+	                return obj[i];
+	            }
+	        }
+	    }
+
+	    /**
+	     * @memberOf module:zrender/core/util
+	     * @param {Function} func
+	     * @param {*} context
+	     * @return {Function}
+	     */
+	    function bind(func, context) {
+	        var args = nativeSlice.call(arguments, 2);
+	        return function () {
+	            return func.apply(context, args.concat(nativeSlice.call(arguments)));
+	        };
+	    }
+
+	    /**
+	     * @memberOf module:zrender/core/util
+	     * @param {Function} func
+	     * @return {Function}
+	     */
+	    function curry(func) {
+	        var args = nativeSlice.call(arguments, 1);
+	        return function () {
+	            return func.apply(this, args.concat(nativeSlice.call(arguments)));
+	        };
+	    }
+
+	    /**
+	     * @memberOf module:zrender/core/util
+	     * @param {*} value
+	     * @return {boolean}
+	     */
+	    function isArray(value) {
+	        return objToString.call(value) === '[object Array]';
+	    }
+
+	    /**
+	     * @memberOf module:zrender/core/util
+	     * @param {*} value
+	     * @return {boolean}
+	     */
+	    function isFunction(value) {
+	        return typeof value === 'function';
+	    }
+
+	    /**
+	     * @memberOf module:zrender/core/util
+	     * @param {*} value
+	     * @return {boolean}
+	     */
+	    function isString(value) {
+	        return objToString.call(value) === '[object String]';
+	    }
+
+	    /**
+	     * @memberOf module:zrender/core/util
+	     * @param {*} value
+	     * @return {boolean}
+	     */
+	    function isObject(value) {
+	        // Avoid a V8 JIT bug in Chrome 19-20.
+	        // See https://code.google.com/p/v8/issues/detail?id=2291 for more details.
+	        var type = typeof value;
+	        return type === 'function' || (!!value && type == 'object');
+	    }
+
+	    /**
+	     * @memberOf module:zrender/core/util
+	     * @param {*} value
+	     * @return {boolean}
+	     */
+	    function isBuildInObject(value) {
+	        return !!BUILTIN_OBJECT[objToString.call(value)];
+	    }
+
+	    /**
+	     * @memberOf module:zrender/core/util
+	     * @param {*} value
+	     * @return {boolean}
+	     */
+	    function isDom(value) {
+	        return value && value.nodeType === 1
+	               && typeof(value.nodeName) == 'string';
+	    }
+
+	    /**
+	     * If value1 is not null, then return value1, otherwise judget rest of values.
+	     * @memberOf module:zrender/core/util
+	     * @return {*} Final value
+	     */
+	    function retrieve(values) {
+	        for (var i = 0, len = arguments.length; i < len; i++) {
+	            if (arguments[i] != null) {
+	                return arguments[i];
+	            }
+	        }
+	    }
+
+	    /**
+	     * @memberOf module:zrender/core/util
+	     * @param {Array} arr
+	     * @param {number} startIndex
+	     * @param {number} endIndex
+	     * @return {Array}
+	     */
+	    function slice() {
+	        return Function.call.apply(nativeSlice, arguments);
+	    }
+
+	    /**
+	     * @memberOf module:zrender/core/util
+	     * @param {boolean} condition
+	     * @param {string} message
+	     */
+	    function assert(condition, message) {
+	        if (!condition) {
+	            throw new Error(message);
+	        }
+	    }
+
+	    var util = {
+	        inherits: inherits,
+	        mixin: mixin,
+	        clone: clone,
+	        merge: merge,
+	        mergeAll: mergeAll,
+	        extend: extend,
+	        defaults: defaults,
+	        getContext: getContext,
+	        createCanvas: createCanvas,
+	        indexOf: indexOf,
+	        slice: slice,
+	        find: find,
+	        isArrayLike: isArrayLike,
+	        each: each,
+	        map: map,
+	        reduce: reduce,
+	        filter: filter,
+	        bind: bind,
+	        curry: curry,
+	        isArray: isArray,
+	        isString: isString,
+	        isObject: isObject,
+	        isFunction: isFunction,
+	        isBuildInObject: isBuildInObject,
+	        isDom: isDom,
+	        retrieve: retrieve,
+	        assert: assert,
+	        noop: function () {}
+	    };
+	    module.exports = util;
+
+
+
+/***/ },
+/* 5 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var formatUtil = __webpack_require__(6);
+	    var nubmerUtil = __webpack_require__(7);
+	    var Model = __webpack_require__(12);
+	    var zrUtil = __webpack_require__(4);
+
+	    var AXIS_DIMS = ['x', 'y', 'z', 'radius', 'angle'];
+
+	    var modelUtil = {};
+
+	    /**
+	     * Create "each" method to iterate names.
+	     *
+	     * @pubilc
+	     * @param  {Array.<string>} names
+	     * @param  {Array.<string>=} attrs
+	     * @return {Function}
+	     */
+	    modelUtil.createNameEach = function (names, attrs) {
+	        names = names.slice();
+	        var capitalNames = zrUtil.map(names, modelUtil.capitalFirst);
+	        attrs = (attrs || []).slice();
+	        var capitalAttrs = zrUtil.map(attrs, modelUtil.capitalFirst);
+
+	        return function (callback, context) {
+	            zrUtil.each(names, function (name, index) {
+	                var nameObj = {name: name, capital: capitalNames[index]};
+
+	                for (var j = 0; j < attrs.length; j++) {
+	                    nameObj[attrs[j]] = name + capitalAttrs[j];
+	                }
+
+	                callback.call(context, nameObj);
+	            });
+	        };
+	    };
+
+	    /**
+	     * @public
+	     */
+	    modelUtil.capitalFirst = function (str) {
+	        return str ? str.charAt(0).toUpperCase() + str.substr(1) : str;
+	    };
+
+	    /**
+	     * Iterate each dimension name.
+	     *
+	     * @public
+	     * @param {Function} callback The parameter is like:
+	     *                            {
+	     *                                name: 'angle',
+	     *                                capital: 'Angle',
+	     *                                axis: 'angleAxis',
+	     *                                axisIndex: 'angleAixs',
+	     *                                index: 'angleIndex'
+	     *                            }
+	     * @param {Object} context
+	     */
+	    modelUtil.eachAxisDim = modelUtil.createNameEach(AXIS_DIMS, ['axisIndex', 'axis', 'index']);
+
+	    /**
+	     * If value is not array, then translate it to array.
+	     * @param  {*} value
+	     * @return {Array} [value] or value
+	     */
+	    modelUtil.normalizeToArray = function (value) {
+	        return value instanceof Array
+	            ? value
+	            : value == null
+	            ? []
+	            : [value];
+	    };
+
+	    /**
+	     * If tow dataZoomModels has the same axis controlled, we say that they are 'linked'.
+	     * dataZoomModels and 'links' make up one or more graphics.
+	     * This function finds the graphic where the source dataZoomModel is in.
+	     *
+	     * @public
+	     * @param {Function} forEachNode Node iterator.
+	     * @param {Function} forEachEdgeType edgeType iterator
+	     * @param {Function} edgeIdGetter Giving node and edgeType, return an array of edge id.
+	     * @return {Function} Input: sourceNode, Output: Like {nodes: [], dims: {}}
+	     */
+	    modelUtil.createLinkedNodesFinder = function (forEachNode, forEachEdgeType, edgeIdGetter) {
+
+	        return function (sourceNode) {
+	            var result = {
+	                nodes: [],
+	                records: {} // key: edgeType.name, value: Object (key: edge id, value: boolean).
+	            };
+
+	            forEachEdgeType(function (edgeType) {
+	                result.records[edgeType.name] = {};
+	            });
+
+	            if (!sourceNode) {
+	                return result;
+	            }
+
+	            absorb(sourceNode, result);
+
+	            var existsLink;
+	            do {
+	                existsLink = false;
+	                forEachNode(processSingleNode);
+	            }
+	            while (existsLink);
+
+	            function processSingleNode(node) {
+	                if (!isNodeAbsorded(node, result) && isLinked(node, result)) {
+	                    absorb(node, result);
+	                    existsLink = true;
+	                }
+	            }
+
+	            return result;
+	        };
+
+	        function isNodeAbsorded(node, result) {
+	            return zrUtil.indexOf(result.nodes, node) >= 0;
+	        }
+
+	        function isLinked(node, result) {
+	            var hasLink = false;
+	            forEachEdgeType(function (edgeType) {
+	                zrUtil.each(edgeIdGetter(node, edgeType) || [], function (edgeId) {
+	                    result.records[edgeType.name][edgeId] && (hasLink = true);
+	                });
+	            });
+	            return hasLink;
+	        }
+
+	        function absorb(node, result) {
+	            result.nodes.push(node);
+	            forEachEdgeType(function (edgeType) {
+	                zrUtil.each(edgeIdGetter(node, edgeType) || [], function (edgeId) {
+	                    result.records[edgeType.name][edgeId] = true;
+	                });
+	            });
+	        }
+	    };
+
+	    /**
+	     * Sync default option between normal and emphasis like `position` and `show`
+	     * In case some one will write code like
+	     *     label: {
+	     *         normal: {
+	     *             show: false,
+	     *             position: 'outside',
+	     *             textStyle: {
+	     *                 fontSize: 18
+	     *             }
+	     *         },
+	     *         emphasis: {
+	     *             show: true
+	     *         }
+	     *     }
+	     * @param {Object} opt
+	     * @param {Array.<string>} subOpts
+	     */
+	     modelUtil.defaultEmphasis = function (opt, subOpts) {
+	        if (opt) {
+	            var emphasisOpt = opt.emphasis = opt.emphasis || {};
+	            var normalOpt = opt.normal = opt.normal || {};
+
+	            // Default emphasis option from normal
+	            zrUtil.each(subOpts, function (subOptName) {
+	                var val = zrUtil.retrieve(emphasisOpt[subOptName], normalOpt[subOptName]);
+	                if (val != null) {
+	                    emphasisOpt[subOptName] = val;
+	                }
+	            });
+	        }
+	    };
+
+	    modelUtil.LABEL_OPTIONS = ['position', 'show', 'textStyle', 'distance', 'formatter'];
+
+	    /**
+	     * data could be [12, 2323, {value: 223}, [1221, 23], {value: [2, 23]}]
+	     * This helper method retieves value from data.
+	     * @param {string|number|Date|Array|Object} dataItem
+	     * @return {number|string|Date|Array.<number|string|Date>}
+	     */
+	    modelUtil.getDataItemValue = function (dataItem) {
+	        // Performance sensitive.
+	        return dataItem && (dataItem.value == null ? dataItem : dataItem.value);
+	    };
+
+	    /**
+	     * data could be [12, 2323, {value: 223}, [1221, 23], {value: [2, 23]}]
+	     * This helper method determine if dataItem has extra option besides value
+	     * @param {string|number|Date|Array|Object} dataItem
+	     */
+	    modelUtil.isDataItemOption = function (dataItem) {
+	        return zrUtil.isObject(dataItem)
+	            && !(dataItem instanceof Array);
+	            // // markLine data can be array
+	            // && !(dataItem[0] && zrUtil.isObject(dataItem[0]) && !(dataItem[0] instanceof Array));
+	    };
+
+	    /**
+	     * This helper method convert value in data.
+	     * @param {string|number|Date} value
+	     * @param {Object|string} [dimInfo] If string (like 'x'), dimType defaults 'number'.
+	     */
+	    modelUtil.converDataValue = function (value, dimInfo) {
+	        // Performance sensitive.
+	        var dimType = dimInfo && dimInfo.type;
+	        if (dimType === 'ordinal') {
+	            return value;
+	        }
+
+	        if (dimType === 'time' && !isFinite(value) && value != null && value !== '-') {
+	            value = +nubmerUtil.parseDate(value);
+	        }
+
+	        // dimType defaults 'number'.
+	        // If dimType is not ordinal and value is null or undefined or NaN or '-',
+	        // parse to NaN.
+	        return (value == null || value === '')
+	            ? NaN : +value; // If string (like '-'), using '+' parse to NaN
+	    };
+
+	    /**
+	     * Create a model proxy to be used in tooltip for edge data, markLine data, markPoint data.
+	     * @param {module:echarts/data/List} data
+	     * @param {Object} opt
+	     * @param {string} [opt.seriesIndex]
+	     * @param {Object} [opt.name]
+	     * @param {Object} [opt.mainType]
+	     * @param {Object} [opt.subType]
+	     */
+	    modelUtil.createDataFormatModel = function (data, opt) {
+	        var model = new Model();
+	        zrUtil.mixin(model, modelUtil.dataFormatMixin);
+	        model.seriesIndex = opt.seriesIndex;
+	        model.name = opt.name || '';
+	        model.mainType = opt.mainType;
+	        model.subType = opt.subType;
+
+	        model.getData = function () {
+	            return data;
+	        };
+	        return model;
+	    };
+
+	    // PENDING A little ugly
+	    modelUtil.dataFormatMixin = {
+	        /**
+	         * Get params for formatter
+	         * @param {number} dataIndex
+	         * @param {string} [dataType]
+	         * @return {Object}
+	         */
+	        getDataParams: function (dataIndex, dataType) {
+	            var data = this.getData(dataType);
+
+	            var seriesIndex = this.seriesIndex;
+	            var seriesName = this.name;
+
+	            var rawValue = this.getRawValue(dataIndex, dataType);
+	            var rawDataIndex = data.getRawIndex(dataIndex);
+	            var name = data.getName(dataIndex, true);
+	            var itemOpt = data.getRawDataItem(dataIndex);
+
+	            return {
+	                componentType: this.mainType,
+	                componentSubType: this.subType,
+	                seriesType: this.mainType === 'series' ? this.subType : null,
+	                seriesIndex: seriesIndex,
+	                seriesName: seriesName,
+	                name: name,
+	                dataIndex: rawDataIndex,
+	                data: itemOpt,
+	                dataType: dataType,
+	                value: rawValue,
+	                color: data.getItemVisual(dataIndex, 'color'),
+
+	                // Param name list for mapping `a`, `b`, `c`, `d`, `e`
+	                $vars: ['seriesName', 'name', 'value']
+	            };
+	        },
+
+	        /**
+	         * Format label
+	         * @param {number} dataIndex
+	         * @param {string} [status='normal'] 'normal' or 'emphasis'
+	         * @param {string} [dataType]
+	         * @param {number} [dimIndex]
+	         * @return {string}
+	         */
+	        getFormattedLabel: function (dataIndex, status, dataType, dimIndex) {
+	            status = status || 'normal';
+	            var data = this.getData(dataType);
+	            var itemModel = data.getItemModel(dataIndex);
+
+	            var params = this.getDataParams(dataIndex, dataType);
+	            if (dimIndex != null && (params.value instanceof Array)) {
+	                params.value = params.value[dimIndex];
+	            }
+
+	            var formatter = itemModel.get(['label', status, 'formatter']);
+
+	            if (typeof formatter === 'function') {
+	                params.status = status;
+	                return formatter(params);
+	            }
+	            else if (typeof formatter === 'string') {
+	                return formatUtil.formatTpl(formatter, params);
+	            }
+	        },
+
+	        /**
+	         * Get raw value in option
+	         * @param {number} idx
+	         * @param {string} [dataType]
+	         * @return {Object}
+	         */
+	        getRawValue: function (idx, dataType) {
+	            var data = this.getData(dataType);
+	            var dataItem = data.getRawDataItem(idx);
+	            if (dataItem != null) {
+	                return (zrUtil.isObject(dataItem) && !(dataItem instanceof Array))
+	                    ? dataItem.value : dataItem;
+	            }
+	        },
+
+	        /**
+	         * Should be implemented.
+	         * @param {number} dataIndex
+	         * @param {boolean} [multipleSeries=false]
+	         * @param {number} [dataType]
+	         * @return {string} tooltip string
+	         */
+	        formatTooltip: zrUtil.noop
+	    };
+
+	    /**
+	     * Mapping to exists for merge.
+	     *
+	     * @public
+	     * @param {Array.<Object>|Array.<module:echarts/model/Component>} exists
+	     * @param {Object|Array.<Object>} newCptOptions
+	     * @return {Array.<Object>} Result, like [{exist: ..., option: ...}, {}],
+	     *                          which order is the same as exists.
+	     */
+	    modelUtil.mappingToExists = function (exists, newCptOptions) {
+	        // Mapping by the order by original option (but not order of
+	        // new option) in merge mode. Because we should ensure
+	        // some specified index (like xAxisIndex) is consistent with
+	        // original option, which is easy to understand, espatially in
+	        // media query. And in most case, merge option is used to
+	        // update partial option but not be expected to change order.
+	        newCptOptions = (newCptOptions || []).slice();
+
+	        var result = zrUtil.map(exists || [], function (obj, index) {
+	            return {exist: obj};
+	        });
+
+	        // Mapping by id or name if specified.
+	        zrUtil.each(newCptOptions, function (cptOption, index) {
+	            if (!zrUtil.isObject(cptOption)) {
+	                return;
+	            }
+
+	            for (var i = 0; i < result.length; i++) {
+	                var exist = result[i].exist;
+	                if (!result[i].option // Consider name: two map to one.
+	                    && (
+	                        // id has highest priority.
+	                        (cptOption.id != null && exist.id === cptOption.id + '')
+	                        || (cptOption.name != null
+	                            && !modelUtil.isIdInner(cptOption)
+	                            && !modelUtil.isIdInner(exist)
+	                            && exist.name === cptOption.name + ''
+	                        )
+	                    )
+	                ) {
+	                    result[i].option = cptOption;
+	                    newCptOptions[index] = null;
+	                    break;
+	                }
+	            }
+	        });
+
+	        // Otherwise mapping by index.
+	        zrUtil.each(newCptOptions, function (cptOption, index) {
+	            if (!zrUtil.isObject(cptOption)) {
+	                return;
+	            }
+
+	            var i = 0;
+	            for (; i < result.length; i++) {
+	                var exist = result[i].exist;
+	                if (!result[i].option
+	                    && !modelUtil.isIdInner(exist)
+	                    // Caution:
+	                    // Do not overwrite id. But name can be overwritten,
+	                    // because axis use name as 'show label text'.
+	                    // 'exist' always has id and name and we dont
+	                    // need to check it.
+	                    && cptOption.id == null
+	                ) {
+	                    result[i].option = cptOption;
+	                    break;
+	                }
+	            }
+
+	            if (i >= result.length) {
+	                result.push({option: cptOption});
+	            }
+	        });
+
+	        return result;
+	    };
+
+	    /**
+	     * @public
+	     * @param {Object} cptOption
+	     * @return {boolean}
+	     */
+	    modelUtil.isIdInner = function (cptOption) {
+	        return zrUtil.isObject(cptOption)
+	            && cptOption.id
+	            && (cptOption.id + '').indexOf('\0_ec_\0') === 0;
+	    };
+
+	    /**
+	     * A helper for removing duplicate items between batchA and batchB,
+	     * and in themselves, and categorize by series.
+	     *
+	     * @param {Array.<Object>} batchA Like: [{seriesId: 2, dataIndex: [32, 4, 5]}, ...]
+	     * @param {Array.<Object>} batchB Like: [{seriesId: 2, dataIndex: [32, 4, 5]}, ...]
+	     * @return {Array.<Array.<Object>, Array.<Object>>} result: [resultBatchA, resultBatchB]
+	     */
+	    modelUtil.compressBatches = function (batchA, batchB) {
+	        var mapA = {};
+	        var mapB = {};
+
+	        makeMap(batchA || [], mapA);
+	        makeMap(batchB || [], mapB, mapA);
+
+	        return [mapToArray(mapA), mapToArray(mapB)];
+
+	        function makeMap(sourceBatch, map, otherMap) {
+	            for (var i = 0, len = sourceBatch.length; i < len; i++) {
+	                var seriesId = sourceBatch[i].seriesId;
+	                var dataIndices = modelUtil.normalizeToArray(sourceBatch[i].dataIndex);
+	                var otherDataIndices = otherMap && otherMap[seriesId];
+
+	                for (var j = 0, lenj = dataIndices.length; j < lenj; j++) {
+	                    var dataIndex = dataIndices[j];
+
+	                    if (otherDataIndices && otherDataIndices[dataIndex]) {
+	                        otherDataIndices[dataIndex] = null;
+	                    }
+	                    else {
+	                        (map[seriesId] || (map[seriesId] = {}))[dataIndex] = 1;
+	                    }
+	                }
+	            }
+	        }
+
+	        function mapToArray(map, isData) {
+	            var result = [];
+	            for (var i in map) {
+	                if (map.hasOwnProperty(i) && map[i] != null) {
+	                    if (isData) {
+	                        result.push(+i);
+	                    }
+	                    else {
+	                        var dataIndices = mapToArray(map[i], true);
+	                        dataIndices.length && result.push({seriesId: i, dataIndex: dataIndices});
+	                    }
+	                }
+	            }
+	            return result;
+	        }
+	    };
+
+	    module.exports = modelUtil;
+
+
+/***/ },
+/* 6 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+	    var numberUtil = __webpack_require__(7);
+	    var textContain = __webpack_require__(8);
+
+	    /**
+	     * 每三位默认加,格式化
+	     * @type {string|number} x
+	     */
+	    function addCommas(x) {
+	        if (isNaN(x)) {
+	            return '-';
+	        }
+	        x = (x + '').split('.');
+	        return x[0].replace(/(\d{1,3})(?=(?:\d{3})+(?!\d))/g,'$1,')
+	               + (x.length > 1 ? ('.' + x[1]) : '');
+	    }
+
+	    /**
+	     * @param {string} str
+	     * @return {string} str
+	     */
+	    function toCamelCase(str) {
+	        return str.toLowerCase().replace(/-(.)/g, function(match, group1) {
+	            return group1.toUpperCase();
+	        });
+	    }
+
+	    /**
+	     * Normalize css liked array configuration
+	     * e.g.
+	     *  3 => [3, 3, 3, 3]
+	     *  [4, 2] => [4, 2, 4, 2]
+	     *  [4, 3, 2] => [4, 3, 2, 3]
+	     * @param {number|Array.<number>} val
+	     */
+	    function normalizeCssArray(val) {
+	        var len = val.length;
+	        if (typeof (val) === 'number') {
+	            return [val, val, val, val];
+	        }
+	        else if (len === 2) {
+	            // vertical | horizontal
+	            return [val[0], val[1], val[0], val[1]];
+	        }
+	        else if (len === 3) {
+	            // top | horizontal | bottom
+	            return [val[0], val[1], val[2], val[1]];
+	        }
+	        return val;
+	    }
+
+	    function encodeHTML(source) {
+	        return String(source)
+	            .replace(/&/g, '&amp;')
+	            .replace(/</g, '&lt;')
+	            .replace(/>/g, '&gt;')
+	            .replace(/"/g, '&quot;')
+	            .replace(/'/g, '&#39;');
+	    }
+
+	    var TPL_VAR_ALIAS = ['a', 'b', 'c', 'd', 'e', 'f', 'g'];
+
+	    function wrapVar(varName, seriesIdx) {
+	        return '{' + varName + (seriesIdx == null ? '' : seriesIdx) + '}';
+	    }
+	    /**
+	     * Template formatter
+	     * @param  {string} tpl
+	     * @param  {Array.<Object>|Object} paramsList
+	     * @return {string}
+	     */
+	    function formatTpl(tpl, paramsList) {
+	        if (!zrUtil.isArray(paramsList)) {
+	            paramsList = [paramsList];
+	        }
+	        var seriesLen = paramsList.length;
+	        if (!seriesLen) {
+	            return '';
+	        }
+
+	        var $vars = paramsList[0].$vars || [];
+	        for (var i = 0; i < $vars.length; i++) {
+	            var alias = TPL_VAR_ALIAS[i];
+	            tpl = tpl.replace(wrapVar(alias),  wrapVar(alias, 0));
+	        }
+	        for (var seriesIdx = 0; seriesIdx < seriesLen; seriesIdx++) {
+	            for (var k = 0; k < $vars.length; k++) {
+	                tpl = tpl.replace(
+	                    wrapVar(TPL_VAR_ALIAS[k], seriesIdx),
+	                    paramsList[seriesIdx][$vars[k]]
+	                );
+	            }
+	        }
+
+	        return tpl;
+	    }
+
+	    /**
+	     * ISO Date format
+	     * @param {string} tpl
+	     * @param {number} value
+	     * @inner
+	     */
+	    function formatTime(tpl, value) {
+	        if (tpl === 'week'
+	            || tpl === 'month'
+	            || tpl === 'quarter'
+	            || tpl === 'half-year'
+	            || tpl === 'year'
+	        ) {
+	            tpl = 'MM-dd\nyyyy';
+	        }
+
+	        var date = numberUtil.parseDate(value);
+	        var y = date.getFullYear();
+	        var M = date.getMonth() + 1;
+	        var d = date.getDate();
+	        var h = date.getHours();
+	        var m = date.getMinutes();
+	        var s = date.getSeconds();
+
+	        tpl = tpl.replace('MM', s2d(M))
+	            .toLowerCase()
+	            .replace('yyyy', y)
+	            .replace('yy', y % 100)
+	            .replace('dd', s2d(d))
+	            .replace('d', d)
+	            .replace('hh', s2d(h))
+	            .replace('h', h)
+	            .replace('mm', s2d(m))
+	            .replace('m', m)
+	            .replace('ss', s2d(s))
+	            .replace('s', s);
+
+	        return tpl;
+	    }
+
+	    /**
+	     * @param {string} str
+	     * @return {string}
+	     * @inner
+	     */
+	    function s2d(str) {
+	        return str < 10 ? ('0' + str) : str;
+	    }
+
+	    module.exports = {
+
+	        normalizeCssArray: normalizeCssArray,
+
+	        addCommas: addCommas,
+
+	        toCamelCase: toCamelCase,
+
+	        encodeHTML: encodeHTML,
+
+	        formatTpl: formatTpl,
+
+	        formatTime: formatTime,
+
+	        truncateText: textContain.truncateText
+	    };
+
+
+/***/ },
+/* 7 */
+/***/ function(module, exports) {
+
+	/**
+	 * 数值处理模块
+	 * @module echarts/util/number
+	 */
+
+
+
+	    var number = {};
+
+	    var RADIAN_EPSILON = 1e-4;
+
+	    function _trim(str) {
+	        return str.replace(/^\s+/, '').replace(/\s+$/, '');
+	    }
+
+	    /**
+	     * Linear mapping a value from domain to range
+	     * @memberOf module:echarts/util/number
+	     * @param  {(number|Array.<number>)} val
+	     * @param  {Array.<number>} domain Domain extent domain[0] can be bigger than domain[1]
+	     * @param  {Array.<number>} range  Range extent range[0] can be bigger than range[1]
+	     * @param  {boolean} clamp
+	     * @return {(number|Array.<number>}
+	     */
+	    number.linearMap = function (val, domain, range, clamp) {
+	        var subDomain = domain[1] - domain[0];
+	        var subRange = range[1] - range[0];
+
+	        if (subDomain === 0) {
+	            return subRange === 0
+	                ? range[0]
+	                : (range[0] + range[1]) / 2;
+	        }
+
+	        // Avoid accuracy problem in edge, such as
+	        // 146.39 - 62.83 === 83.55999999999999.
+	        // See echarts/test/ut/spec/util/number.js#linearMap#accuracyError
+	        // It is a little verbose for efficiency considering this method
+	        // is a hotspot.
+	        if (clamp) {
+	            if (subDomain > 0) {
+	                if (val <= domain[0]) {
+	                    return range[0];
+	                }
+	                else if (val >= domain[1]) {
+	                    return range[1];
+	                }
+	            }
+	            else {
+	                if (val >= domain[0]) {
+	                    return range[0];
+	                }
+	                else if (val <= domain[1]) {
+	                    return range[1];
+	                }
+	            }
+	        }
+	        else {
+	            if (val === domain[0]) {
+	                return range[0];
+	            }
+	            if (val === domain[1]) {
+	                return range[1];
+	            }
+	        }
+
+	        return (val - domain[0]) / subDomain * subRange + range[0];
+	    };
+
+	    /**
+	     * Convert a percent string to absolute number.
+	     * Returns NaN if percent is not a valid string or number
+	     * @memberOf module:echarts/util/number
+	     * @param {string|number} percent
+	     * @param {number} all
+	     * @return {number}
+	     */
+	    number.parsePercent = function(percent, all) {
+	        switch (percent) {
+	            case 'center':
+	            case 'middle':
+	                percent = '50%';
+	                break;
+	            case 'left':
+	            case 'top':
+	                percent = '0%';
+	                break;
+	            case 'right':
+	            case 'bottom':
+	                percent = '100%';
+	                break;
+	        }
+	        if (typeof percent === 'string') {
+	            if (_trim(percent).match(/%$/)) {
+	                return parseFloat(percent) / 100 * all;
+	            }
+
+	            return parseFloat(percent);
+	        }
+
+	        return percent == null ? NaN : +percent;
+	    };
+
+	    /**
+	     * Fix rounding error of float numbers
+	     * @param {number} x
+	     * @return {number}
+	     */
+	    number.round = function (x) {
+	        // PENDING
+	        return +(+x).toFixed(10);
+	    };
+
+	    number.asc = function (arr) {
+	        arr.sort(function (a, b) {
+	            return a - b;
+	        });
+	        return arr;
+	    };
+
+	    /**
+	     * Get precision
+	     * @param {number} val
+	     */
+	    number.getPrecision = function (val) {
+	        val = +val;
+	        if (isNaN(val)) {
+	            return 0;
+	        }
+	        // It is much faster than methods converting number to string as follows
+	        //      var tmp = val.toString();
+	        //      return tmp.length - 1 - tmp.indexOf('.');
+	        // especially when precision is low
+	        var e = 1;
+	        var count = 0;
+	        while (Math.round(val * e) / e !== val) {
+	            e *= 10;
+	            count++;
+	        }
+	        return count;
+	    };
+
+	    /**
+	     * @param {Array.<number>} dataExtent
+	     * @param {Array.<number>} pixelExtent
+	     * @return {number}  precision
+	     */
+	    number.getPixelPrecision = function (dataExtent, pixelExtent) {
+	        var log = Math.log;
+	        var LN10 = Math.LN10;
+	        var dataQuantity = Math.floor(log(dataExtent[1] - dataExtent[0]) / LN10);
+	        var sizeQuantity = Math.round(log(Math.abs(pixelExtent[1] - pixelExtent[0])) / LN10);
+	        return Math.max(
+	            -dataQuantity + sizeQuantity,
+	            0
+	        );
+	    };
+
+	    // Number.MAX_SAFE_INTEGER, ie do not support.
+	    number.MAX_SAFE_INTEGER = 9007199254740991;
+
+	    /**
+	     * To 0 - 2 * PI, considering negative radian.
+	     * @param {number} radian
+	     * @return {number}
+	     */
+	    number.remRadian = function (radian) {
+	        var pi2 = Math.PI * 2;
+	        return (radian % pi2 + pi2) % pi2;
+	    };
+
+	    /**
+	     * @param {type} radian
+	     * @return {boolean}
+	     */
+	    number.isRadianAroundZero = function (val) {
+	        return val > -RADIAN_EPSILON && val < RADIAN_EPSILON;
+	    };
+
+	    /**
+	     * @param {string|Date|number} value
+	     * @return {number} timestamp
+	     */
+	    number.parseDate = function (value) {
+	        return value instanceof Date
+	            ? value
+	            : new Date(
+	                typeof value === 'string'
+	                    // FIXME Date.parse('1970-01-01') is UTC, Date.parse('1970/01/01') is local
+	                    ? (new Date(value.replace(/-/g, '/')) - new Date('1970/01/01'))
+	                    : Math.round(value)
+	            );
+	    };
+
+	    /**
+	     * Quantity of a number. e.g. 0.1, 1, 10, 100
+	     * @param  {number} val
+	     * @return {number}
+	     */
+	    number.quantity = function (val) {
+	        return Math.pow(10, Math.floor(Math.log(val) / Math.LN10));
+	    };
+
+	    // "Nice Numbers for Graph Labels" of Graphic Gems
+	    /**
+	     * find a “nice” number approximately equal to x. Round the number if round = true, take ceiling if round = false
+	     * The primary observation is that the “nicest” numbers in decimal are 1, 2, and 5, and all power-of-ten multiples of these numbers.
+	     * @param  {number} val
+	     * @param  {boolean} round
+	     * @return {number}
+	     */
+	    number.nice = function (val, round) {
+	        var exp10 = number.quantity(val);
+	        var f = val / exp10; // between 1 and 10
+	        var nf;
+	        if (round) {
+	            if (f < 1.5) { nf = 1; }
+	            else if (f < 2.5) { nf = 2; }
+	            else if (f < 4) { nf = 3; }
+	            else if (f < 7) { nf = 5; }
+	            else { nf = 10; }
+	        }
+	        else {
+	            if (f < 1) { nf = 1; }
+	            else if (f < 2) { nf = 2; }
+	            else if (f < 3) { nf = 3; }
+	            else if (f < 5) { nf = 5; }
+	            else { nf = 10; }
+	        }
+	        return nf * exp10;
+	    };
+
+	    module.exports = number;
+
+
+/***/ },
+/* 8 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var textWidthCache = {};
+	    var textWidthCacheCounter = 0;
+	    var TEXT_CACHE_MAX = 5000;
+
+	    var util = __webpack_require__(4);
+	    var BoundingRect = __webpack_require__(9);
+	    var retrieve = util.retrieve;
+
+	    function getTextWidth(text, textFont) {
+	        var key = text + ':' + textFont;
+	        if (textWidthCache[key]) {
+	            return textWidthCache[key];
+	        }
+
+	        var textLines = (text + '').split('\n');
+	        var width = 0;
+
+	        for (var i = 0, l = textLines.length; i < l; i++) {
+	            // measureText 可以被覆盖以兼容不支持 Canvas 的环境
+	            width = Math.max(textContain.measureText(textLines[i], textFont).width, width);
+	        }
+
+	        if (textWidthCacheCounter > TEXT_CACHE_MAX) {
+	            textWidthCacheCounter = 0;
+	            textWidthCache = {};
+	        }
+	        textWidthCacheCounter++;
+	        textWidthCache[key] = width;
+
+	        return width;
+	    }
+
+	    function getTextRect(text, textFont, textAlign, textBaseline) {
+	        var textLineLen = ((text || '') + '').split('\n').length;
+
+	        var width = getTextWidth(text, textFont);
+	        // FIXME 高度计算比较粗暴
+	        var lineHeight = getTextWidth('国', textFont);
+	        var height = textLineLen * lineHeight;
+
+	        var rect = new BoundingRect(0, 0, width, height);
+	        // Text has a special line height property
+	        rect.lineHeight = lineHeight;
+
+	        switch (textBaseline) {
+	            case 'bottom':
+	            case 'alphabetic':
+	                rect.y -= lineHeight;
+	                break;
+	            case 'middle':
+	                rect.y -= lineHeight / 2;
+	                break;
+	            // case 'hanging':
+	            // case 'top':
+	        }
+
+	        // FIXME Right to left language
+	        switch (textAlign) {
+	            case 'end':
+	            case 'right':
+	                rect.x -= rect.width;
+	                break;
+	            case 'center':
+	                rect.x -= rect.width / 2;
+	                break;
+	            // case 'start':
+	            // case 'left':
+	        }
+
+	        return rect;
+	    }
+
+	    function adjustTextPositionOnRect(textPosition, rect, textRect, distance) {
+
+	        var x = rect.x;
+	        var y = rect.y;
+
+	        var height = rect.height;
+	        var width = rect.width;
+
+	        var textHeight = textRect.height;
+
+	        var halfHeight = height / 2 - textHeight / 2;
+
+	        var textAlign = 'left';
+
+	        switch (textPosition) {
+	            case 'left':
+	                x -= distance;
+	                y += halfHeight;
+	                textAlign = 'right';
+	                break;
+	            case 'right':
+	                x += distance + width;
+	                y += halfHeight;
+	                textAlign = 'left';
+	                break;
+	            case 'top':
+	                x += width / 2;
+	                y -= distance + textHeight;
+	                textAlign = 'center';
+	                break;
+	            case 'bottom':
+	                x += width / 2;
+	                y += height + distance;
+	                textAlign = 'center';
+	                break;
+	            case 'inside':
+	                x += width / 2;
+	                y += halfHeight;
+	                textAlign = 'center';
+	                break;
+	            case 'insideLeft':
+	                x += distance;
+	                y += halfHeight;
+	                textAlign = 'left';
+	                break;
+	            case 'insideRight':
+	                x += width - distance;
+	                y += halfHeight;
+	                textAlign = 'right';
+	                break;
+	            case 'insideTop':
+	                x += width / 2;
+	                y += distance;
+	                textAlign = 'center';
+	                break;
+	            case 'insideBottom':
+	                x += width / 2;
+	                y += height - textHeight - distance;
+	                textAlign = 'center';
+	                break;
+	            case 'insideTopLeft':
+	                x += distance;
+	                y += distance;
+	                textAlign = 'left';
+	                break;
+	            case 'insideTopRight':
+	                x += width - distance;
+	                y += distance;
+	                textAlign = 'right';
+	                break;
+	            case 'insideBottomLeft':
+	                x += distance;
+	                y += height - textHeight - distance;
+	                break;
+	            case 'insideBottomRight':
+	                x += width - distance;
+	                y += height - textHeight - distance;
+	                textAlign = 'right';
+	                break;
+	        }
+
+	        return {
+	            x: x,
+	            y: y,
+	            textAlign: textAlign,
+	            textBaseline: 'top'
+	        };
+	    }
+
+	    /**
+	     * Show ellipsis if overflow.
+	     *
+	     * @param  {string} text
+	     * @param  {string} containerWidth
+	     * @param  {string} textFont
+	     * @param  {number} [ellipsis='...']
+	     * @param  {Object} [options]
+	     * @param  {number} [options.maxIterations=3]
+	     * @param  {number} [options.minChar=0] If truncate result are less
+	     *                  then minChar, ellipsis will not show, which is
+	     *                  better for user hint in some cases.
+	     * @param  {number} [options.placeholder=''] When all truncated, use the placeholder.
+	     * @return {string}
+	     */
+	    function truncateText(text, containerWidth, textFont, ellipsis, options) {
+	        if (!containerWidth) {
+	            return '';
+	        }
+
+	        options = options || {};
+
+	        ellipsis = retrieve(ellipsis, '...');
+	        var maxIterations = retrieve(options.maxIterations, 2);
+	        var minChar = retrieve(options.minChar, 0);
+	        // FIXME
+	        // Other languages?
+	        var cnCharWidth = getTextWidth('国', textFont);
+	        // FIXME
+	        // Consider proportional font?
+	        var ascCharWidth = getTextWidth('a', textFont);
+	        var placeholder = retrieve(options.placeholder, '');
+
+	        // Example 1: minChar: 3, text: 'asdfzxcv', truncate result: 'asdf', but not: 'a...'.
+	        // Example 2: minChar: 3, text: '维度', truncate result: '维', but not: '...'.
+	        var contentWidth = containerWidth = Math.max(0, containerWidth - 1); // Reserve some gap.
+	        for (var i = 0; i < minChar && contentWidth >= ascCharWidth; i++) {
+	            contentWidth -= ascCharWidth;
+	        }
+
+	        var ellipsisWidth = getTextWidth(ellipsis);
+	        if (ellipsisWidth > contentWidth) {
+	            ellipsis = '';
+	            ellipsisWidth = 0;
+	        }
+
+	        contentWidth = containerWidth - ellipsisWidth;
+
+	        var textLines = (text + '').split('\n');
+
+	        for (var i = 0, len = textLines.length; i < len; i++) {
+	            var textLine = textLines[i];
+	            var lineWidth = getTextWidth(textLine, textFont);
+
+	            if (lineWidth <= containerWidth) {
+	                continue;
+	            }
+
+	            for (var j = 0;; j++) {
+	                if (lineWidth <= contentWidth || j >= maxIterations) {
+	                    textLine += ellipsis;
+	                    break;
+	                }
+
+	                var subLength = j === 0
+	                    ? estimateLength(textLine, contentWidth, ascCharWidth, cnCharWidth)
+	                    : lineWidth > 0
+	                    ? Math.floor(textLine.length * contentWidth / lineWidth)
+	                    : 0;
+
+	                textLine = textLine.substr(0, subLength);
+	                lineWidth = getTextWidth(textLine, textFont);
+	            }
+
+	            if (textLine === '') {
+	                textLine = placeholder;
+	            }
+
+	            textLines[i] = textLine;
+	        }
+
+	        return textLines.join('\n');
+	    }
+
+	    function estimateLength(text, contentWidth, ascCharWidth, cnCharWidth) {
+	        var width = 0;
+	        var i = 0;
+	        for (var len = text.length; i < len && width < contentWidth; i++) {
+	            var charCode = text.charCodeAt(i);
+	            width += (0 <= charCode && charCode <= 127) ? ascCharWidth : cnCharWidth;
+	        }
+	        return i;
+	    }
+
+	    var textContain = {
+
+	        getWidth: getTextWidth,
+
+	        getBoundingRect: getTextRect,
+
+	        adjustTextPositionOnRect: adjustTextPositionOnRect,
+
+	        truncateText: truncateText,
+
+	        measureText: function (text, textFont) {
+	            var ctx = util.getContext();
+	            ctx.font = textFont || '12px sans-serif';
+	            return ctx.measureText(text);
+	        }
+	    };
+
+	    module.exports = textContain;
+
+
+/***/ },
+/* 9 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+	/**
+	 * @module echarts/core/BoundingRect
+	 */
+
+
+	    var vec2 = __webpack_require__(10);
+	    var matrix = __webpack_require__(11);
+
+	    var v2ApplyTransform = vec2.applyTransform;
+	    var mathMin = Math.min;
+	    var mathAbs = Math.abs;
+	    var mathMax = Math.max;
+	    /**
+	     * @alias module:echarts/core/BoundingRect
+	     */
+	    function BoundingRect(x, y, width, height) {
+	        /**
+	         * @type {number}
+	         */
+	        this.x = x;
+	        /**
+	         * @type {number}
+	         */
+	        this.y = y;
+	        /**
+	         * @type {number}
+	         */
+	        this.width = width;
+	        /**
+	         * @type {number}
+	         */
+	        this.height = height;
+	    }
+
+	    BoundingRect.prototype = {
+
+	        constructor: BoundingRect,
+
+	        /**
+	         * @param {module:echarts/core/BoundingRect} other
+	         */
+	        union: function (other) {
+	            var x = mathMin(other.x, this.x);
+	            var y = mathMin(other.y, this.y);
+
+	            this.width = mathMax(
+	                    other.x + other.width,
+	                    this.x + this.width
+	                ) - x;
+	            this.height = mathMax(
+	                    other.y + other.height,
+	                    this.y + this.height
+	                ) - y;
+	            this.x = x;
+	            this.y = y;
+	        },
+
+	        /**
+	         * @param {Array.<number>} m
+	         * @methods
+	         */
+	        applyTransform: (function () {
+	            var min = [];
+	            var max = [];
+	            return function (m) {
+	                // In case usage like this
+	                // el.getBoundingRect().applyTransform(el.transform)
+	                // And element has no transform
+	                if (!m) {
+	                    return;
+	                }
+	                min[0] = this.x;
+	                min[1] = this.y;
+	                max[0] = this.x + this.width;
+	                max[1] = this.y + this.height;
+
+	                v2ApplyTransform(min, min, m);
+	                v2ApplyTransform(max, max, m);
+
+	                this.x = mathMin(min[0], max[0]);
+	                this.y = mathMin(min[1], max[1]);
+	                this.width = mathAbs(max[0] - min[0]);
+	                this.height = mathAbs(max[1] - min[1]);
+	            };
+	        })(),
+
+	        /**
+	         * Calculate matrix of transforming from self to target rect
+	         * @param  {module:zrender/core/BoundingRect} b
+	         * @return {Array.<number>}
+	         */
+	        calculateTransform: function (b) {
+	            var a = this;
+	            var sx = b.width / a.width;
+	            var sy = b.height / a.height;
+
+	            var m = matrix.create();
+
+	            // 矩阵右乘
+	            matrix.translate(m, m, [-a.x, -a.y]);
+	            matrix.scale(m, m, [sx, sy]);
+	            matrix.translate(m, m, [b.x, b.y]);
+
+	            return m;
+	        },
+
+	        /**
+	         * @param {(module:echarts/core/BoundingRect|Object)} b
+	         * @return {boolean}
+	         */
+	        intersect: function (b) {
+	            var a = this;
+	            var ax0 = a.x;
+	            var ax1 = a.x + a.width;
+	            var ay0 = a.y;
+	            var ay1 = a.y + a.height;
+
+	            var bx0 = b.x;
+	            var bx1 = b.x + b.width;
+	            var by0 = b.y;
+	            var by1 = b.y + b.height;
+
+	            return ! (ax1 < bx0 || bx1 < ax0 || ay1 < by0 || by1 < ay0);
+	        },
+
+	        contain: function (x, y) {
+	            var rect = this;
+	            return x >= rect.x
+	                && x <= (rect.x + rect.width)
+	                && y >= rect.y
+	                && y <= (rect.y + rect.height);
+	        },
+
+	        /**
+	         * @return {module:echarts/core/BoundingRect}
+	         */
+	        clone: function () {
+	            return new BoundingRect(this.x, this.y, this.width, this.height);
+	        },
+
+	        /**
+	         * Copy from another rect
+	         */
+	        copy: function (other) {
+	            this.x = other.x;
+	            this.y = other.y;
+	            this.width = other.width;
+	            this.height = other.height;
+	        }
+	    };
+
+	    module.exports = BoundingRect;
+
+
+/***/ },
+/* 10 */
+/***/ function(module, exports) {
+
+	
+	    var ArrayCtor = typeof Float32Array === 'undefined'
+	        ? Array
+	        : Float32Array;
+
+	    /**
+	     * @typedef {Float32Array|Array.<number>} Vector2
+	     */
+	    /**
+	     * 二维向量类
+	     * @exports zrender/tool/vector
+	     */
+	    var vector = {
+	        /**
+	         * 创建一个向量
+	         * @param {number} [x=0]
+	         * @param {number} [y=0]
+	         * @return {Vector2}
+	         */
+	        create: function (x, y) {
+	            var out = new ArrayCtor(2);
+	            if (x == null) {
+	                x = 0;
+	            }
+	            if (y == null) {
+	                y = 0;
+	            }
+	            out[0] = x;
+	            out[1] = y;
+	            return out;
+	        },
+
+	        /**
+	         * 复制向量数据
+	         * @param {Vector2} out
+	         * @param {Vector2} v
+	         * @return {Vector2}
+	         */
+	        copy: function (out, v) {
+	            out[0] = v[0];
+	            out[1] = v[1];
+	            return out;
+	        },
+
+	        /**
+	         * 克隆一个向量
+	         * @param {Vector2} v
+	         * @return {Vector2}
+	         */
+	        clone: function (v) {
+	            var out = new ArrayCtor(2);
+	            out[0] = v[0];
+	            out[1] = v[1];
+	            return out;
+	        },
+
+	        /**
+	         * 设置向量的两个项
+	         * @param {Vector2} out
+	         * @param {number} a
+	         * @param {number} b
+	         * @return {Vector2} 结果
+	         */
+	        set: function (out, a, b) {
+	            out[0] = a;
+	            out[1] = b;
+	            return out;
+	        },
+
+	        /**
+	         * 向量相加
+	         * @param {Vector2} out
+	         * @param {Vector2} v1
+	         * @param {Vector2} v2
+	         */
+	        add: function (out, v1, v2) {
+	            out[0] = v1[0] + v2[0];
+	            out[1] = v1[1] + v2[1];
+	            return out;
+	        },
+
+	        /**
+	         * 向量缩放后相加
+	         * @param {Vector2} out
+	         * @param {Vector2} v1
+	         * @param {Vector2} v2
+	         * @param {number} a
+	         */
+	        scaleAndAdd: function (out, v1, v2, a) {
+	            out[0] = v1[0] + v2[0] * a;
+	            out[1] = v1[1] + v2[1] * a;
+	            return out;
+	        },
+
+	        /**
+	         * 向量相减
+	         * @param {Vector2} out
+	         * @param {Vector2} v1
+	         * @param {Vector2} v2
+	         */
+	        sub: function (out, v1, v2) {
+	            out[0] = v1[0] - v2[0];
+	            out[1] = v1[1] - v2[1];
+	            return out;
+	        },
+
+	        /**
+	         * 向量长度
+	         * @param {Vector2} v
+	         * @return {number}
+	         */
+	        len: function (v) {
+	            return Math.sqrt(this.lenSquare(v));
+	        },
+
+	        /**
+	         * 向量长度平方
+	         * @param {Vector2} v
+	         * @return {number}
+	         */
+	        lenSquare: function (v) {
+	            return v[0] * v[0] + v[1] * v[1];
+	        },
+
+	        /**
+	         * 向量乘法
+	         * @param {Vector2} out
+	         * @param {Vector2} v1
+	         * @param {Vector2} v2
+	         */
+	        mul: function (out, v1, v2) {
+	            out[0] = v1[0] * v2[0];
+	            out[1] = v1[1] * v2[1];
+	            return out;
+	        },
+
+	        /**
+	         * 向量除法
+	         * @param {Vector2} out
+	         * @param {Vector2} v1
+	         * @param {Vector2} v2
+	         */
+	        div: function (out, v1, v2) {
+	            out[0] = v1[0] / v2[0];
+	            out[1] = v1[1] / v2[1];
+	            return out;
+	        },
+
+	        /**
+	         * 向量点乘
+	         * @param {Vector2} v1
+	         * @param {Vector2} v2
+	         * @return {number}
+	         */
+	        dot: function (v1, v2) {
+	            return v1[0] * v2[0] + v1[1] * v2[1];
+	        },
+
+	        /**
+	         * 向量缩放
+	         * @param {Vector2} out
+	         * @param {Vector2} v
+	         * @param {number} s
+	         */
+	        scale: function (out, v, s) {
+	            out[0] = v[0] * s;
+	            out[1] = v[1] * s;
+	            return out;
+	        },
+
+	        /**
+	         * 向量归一化
+	         * @param {Vector2} out
+	         * @param {Vector2} v
+	         */
+	        normalize: function (out, v) {
+	            var d = vector.len(v);
+	            if (d === 0) {
+	                out[0] = 0;
+	                out[1] = 0;
+	            }
+	            else {
+	                out[0] = v[0] / d;
+	                out[1] = v[1] / d;
+	            }
+	            return out;
+	        },
+
+	        /**
+	         * 计算向量间距离
+	         * @param {Vector2} v1
+	         * @param {Vector2} v2
+	         * @return {number}
+	         */
+	        distance: function (v1, v2) {
+	            return Math.sqrt(
+	                (v1[0] - v2[0]) * (v1[0] - v2[0])
+	                + (v1[1] - v2[1]) * (v1[1] - v2[1])
+	            );
+	        },
+
+	        /**
+	         * 向量距离平方
+	         * @param {Vector2} v1
+	         * @param {Vector2} v2
+	         * @return {number}
+	         */
+	        distanceSquare: function (v1, v2) {
+	            return (v1[0] - v2[0]) * (v1[0] - v2[0])
+	                + (v1[1] - v2[1]) * (v1[1] - v2[1]);
+	        },
+
+	        /**
+	         * 求负向量
+	         * @param {Vector2} out
+	         * @param {Vector2} v
+	         */
+	        negate: function (out, v) {
+	            out[0] = -v[0];
+	            out[1] = -v[1];
+	            return out;
+	        },
+
+	        /**
+	         * 插值两个点
+	         * @param {Vector2} out
+	         * @param {Vector2} v1
+	         * @param {Vector2} v2
+	         * @param {number} t
+	         */
+	        lerp: function (out, v1, v2, t) {
+	            out[0] = v1[0] + t * (v2[0] - v1[0]);
+	            out[1] = v1[1] + t * (v2[1] - v1[1]);
+	            return out;
+	        },
+
+	        /**
+	         * 矩阵左乘向量
+	         * @param {Vector2} out
+	         * @param {Vector2} v
+	         * @param {Vector2} m
+	         */
+	        applyTransform: function (out, v, m) {
+	            var x = v[0];
+	            var y = v[1];
+	            out[0] = m[0] * x + m[2] * y + m[4];
+	            out[1] = m[1] * x + m[3] * y + m[5];
+	            return out;
+	        },
+	        /**
+	         * 求两个向量最小值
+	         * @param  {Vector2} out
+	         * @param  {Vector2} v1
+	         * @param  {Vector2} v2
+	         */
+	        min: function (out, v1, v2) {
+	            out[0] = Math.min(v1[0], v2[0]);
+	            out[1] = Math.min(v1[1], v2[1]);
+	            return out;
+	        },
+	        /**
+	         * 求两个向量最大值
+	         * @param  {Vector2} out
+	         * @param  {Vector2} v1
+	         * @param  {Vector2} v2
+	         */
+	        max: function (out, v1, v2) {
+	            out[0] = Math.max(v1[0], v2[0]);
+	            out[1] = Math.max(v1[1], v2[1]);
+	            return out;
+	        }
+	    };
+
+	    vector.length = vector.len;
+	    vector.lengthSquare = vector.lenSquare;
+	    vector.dist = vector.distance;
+	    vector.distSquare = vector.distanceSquare;
+
+	    module.exports = vector;
+
+
+
+/***/ },
+/* 11 */
+/***/ function(module, exports) {
+
+	
+	    var ArrayCtor = typeof Float32Array === 'undefined'
+	        ? Array
+	        : Float32Array;
+	    /**
+	     * 3x2矩阵操作类
+	     * @exports zrender/tool/matrix
+	     */
+	    var matrix = {
+	        /**
+	         * 创建一个单位矩阵
+	         * @return {Float32Array|Array.<number>}
+	         */
+	        create : function() {
+	            var out = new ArrayCtor(6);
+	            matrix.identity(out);
+
+	            return out;
+	        },
+	        /**
+	         * 设置矩阵为单位矩阵
+	         * @param {Float32Array|Array.<number>} out
+	         */
+	        identity : function(out) {
+	            out[0] = 1;
+	            out[1] = 0;
+	            out[2] = 0;
+	            out[3] = 1;
+	            out[4] = 0;
+	            out[5] = 0;
+	            return out;
+	        },
+	        /**
+	         * 复制矩阵
+	         * @param {Float32Array|Array.<number>} out
+	         * @param {Float32Array|Array.<number>} m
+	         */
+	        copy: function(out, m) {
+	            out[0] = m[0];
+	            out[1] = m[1];
+	            out[2] = m[2];
+	            out[3] = m[3];
+	            out[4] = m[4];
+	            out[5] = m[5];
+	            return out;
+	        },
+	        /**
+	         * 矩阵相乘
+	         * @param {Float32Array|Array.<number>} out
+	         * @param {Float32Array|Array.<number>} m1
+	         * @param {Float32Array|Array.<number>} m2
+	         */
+	        mul : function (out, m1, m2) {
+	            // Consider matrix.mul(m, m2, m);
+	            // where out is the same as m2.
+	            // So use temp variable to escape error.
+	            var out0 = m1[0] * m2[0] + m1[2] * m2[1];
+	            var out1 = m1[1] * m2[0] + m1[3] * m2[1];
+	            var out2 = m1[0] * m2[2] + m1[2] * m2[3];
+	            var out3 = m1[1] * m2[2] + m1[3] * m2[3];
+	            var out4 = m1[0] * m2[4] + m1[2] * m2[5] + m1[4];
+	            var out5 = m1[1] * m2[4] + m1[3] * m2[5] + m1[5];
+	            out[0] = out0;
+	            out[1] = out1;
+	            out[2] = out2;
+	            out[3] = out3;
+	            out[4] = out4;
+	            out[5] = out5;
+	            return out;
+	        },
+	        /**
+	         * 平移变换
+	         * @param {Float32Array|Array.<number>} out
+	         * @param {Float32Array|Array.<number>} a
+	         * @param {Float32Array|Array.<number>} v
+	         */
+	        translate : function(out, a, v) {
+	            out[0] = a[0];
+	            out[1] = a[1];
+	            out[2] = a[2];
+	            out[3] = a[3];
+	            out[4] = a[4] + v[0];
+	            out[5] = a[5] + v[1];
+	            return out;
+	        },
+	        /**
+	         * 旋转变换
+	         * @param {Float32Array|Array.<number>} out
+	         * @param {Float32Array|Array.<number>} a
+	         * @param {number} rad
+	         */
+	        rotate : function(out, a, rad) {
+	            var aa = a[0];
+	            var ac = a[2];
+	            var atx = a[4];
+	            var ab = a[1];
+	            var ad = a[3];
+	            var aty = a[5];
+	            var st = Math.sin(rad);
+	            var ct = Math.cos(rad);
+
+	            out[0] = aa * ct + ab * st;
+	            out[1] = -aa * st + ab * ct;
+	            out[2] = ac * ct + ad * st;
+	            out[3] = -ac * st + ct * ad;
+	            out[4] = ct * atx + st * aty;
+	            out[5] = ct * aty - st * atx;
+	            return out;
+	        },
+	        /**
+	         * 缩放变换
+	         * @param {Float32Array|Array.<number>} out
+	         * @param {Float32Array|Array.<number>} a
+	         * @param {Float32Array|Array.<number>} v
+	         */
+	        scale : function(out, a, v) {
+	            var vx = v[0];
+	            var vy = v[1];
+	            out[0] = a[0] * vx;
+	            out[1] = a[1] * vy;
+	            out[2] = a[2] * vx;
+	            out[3] = a[3] * vy;
+	            out[4] = a[4] * vx;
+	            out[5] = a[5] * vy;
+	            return out;
+	        },
+	        /**
+	         * 求逆矩阵
+	         * @param {Float32Array|Array.<number>} out
+	         * @param {Float32Array|Array.<number>} a
+	         */
+	        invert : function(out, a) {
+
+	            var aa = a[0];
+	            var ac = a[2];
+	            var atx = a[4];
+	            var ab = a[1];
+	            var ad = a[3];
+	            var aty = a[5];
+
+	            var det = aa * ad - ab * ac;
+	            if (!det) {
+	                return null;
+	            }
+	            det = 1.0 / det;
+
+	            out[0] = ad * det;
+	            out[1] = -ab * det;
+	            out[2] = -ac * det;
+	            out[3] = aa * det;
+	            out[4] = (ac * aty - ad * atx) * det;
+	            out[5] = (ab * atx - aa * aty) * det;
+	            return out;
+	        }
+	    };
+
+	    module.exports = matrix;
+
+
+
+/***/ },
+/* 12 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @module echarts/model/Model
+	 */
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var clazzUtil = __webpack_require__(13);
+
+	    /**
+	     * @alias module:echarts/model/Model
+	     * @constructor
+	     * @param {Object} option
+	     * @param {module:echarts/model/Model} [parentModel]
+	     * @param {module:echarts/model/Global} [ecModel]
+	     */
+	    function Model(option, parentModel, ecModel) {
+	        /**
+	         * @type {module:echarts/model/Model}
+	         * @readOnly
+	         */
+	        this.parentModel = parentModel;
+
+	        /**
+	         * @type {module:echarts/model/Global}
+	         * @readOnly
+	         */
+	        this.ecModel = ecModel;
+
+	        /**
+	         * @type {Object}
+	         * @protected
+	         */
+	        this.option = option;
+
+	        // Simple optimization
+	        // if (this.init) {
+	        //     if (arguments.length <= 4) {
+	        //         this.init(option, parentModel, ecModel, extraOpt);
+	        //     }
+	        //     else {
+	        //         this.init.apply(this, arguments);
+	        //     }
+	        // }
+	    }
+
+	    Model.prototype = {
+
+	        constructor: Model,
+
+	        /**
+	         * Model 的初始化函数
+	         * @param {Object} option
+	         */
+	        init: null,
+
+	        /**
+	         * 从新的 Option merge
+	         */
+	        mergeOption: function (option) {
+	            zrUtil.merge(this.option, option, true);
+	        },
+
+	        /**
+	         * @param {string} path
+	         * @param {boolean} [ignoreParent=false]
+	         * @return {*}
+	         */
+	        get: function (path, ignoreParent) {
+	            if (!path) {
+	                return this.option;
+	            }
+
+	            if (typeof path === 'string') {
+	                path = path.split('.');
+	            }
+
+	            var obj = this.option;
+	            var parentModel = this.parentModel;
+	            for (var i = 0; i < path.length; i++) {
+	                // Ignore empty
+	                if (!path[i]) {
+	                    continue;
+	                }
+	                // obj could be number/string/... (like 0)
+	                obj = (obj && typeof obj === 'object') ? obj[path[i]] : null;
+	                if (obj == null) {
+	                    break;
+	                }
+	            }
+	            if (obj == null && parentModel && !ignoreParent) {
+	                obj = parentModel.get(path);
+	            }
+	            return obj;
+	        },
+
+	        /**
+	         * @param {string} key
+	         * @param {boolean} [ignoreParent=false]
+	         * @return {*}
+	         */
+	        getShallow: function (key, ignoreParent) {
+	            var option = this.option;
+	            var val = option && option[key];
+	            var parentModel = this.parentModel;
+	            if (val == null && parentModel && !ignoreParent) {
+	                val = parentModel.getShallow(key);
+	            }
+	            return val;
+	        },
+
+	        /**
+	         * @param {string} path
+	         * @param {module:echarts/model/Model} [parentModel]
+	         * @return {module:echarts/model/Model}
+	         */
+	        getModel: function (path, parentModel) {
+	            var obj = this.get(path, true);
+	            var thisParentModel = this.parentModel;
+	            var model = new Model(
+	                obj, parentModel || (thisParentModel && thisParentModel.getModel(path)),
+	                this.ecModel
+	            );
+	            return model;
+	        },
+
+	        /**
+	         * If model has option
+	         */
+	        isEmpty: function () {
+	            return this.option == null;
+	        },
+
+	        restoreData: function () {},
+
+	        // Pending
+	        clone: function () {
+	            var Ctor = this.constructor;
+	            return new Ctor(zrUtil.clone(this.option));
+	        },
+
+	        setReadOnly: function (properties) {
+	            clazzUtil.setReadOnly(this, properties);
+	        }
+	    };
+
+	    // Enable Model.extend.
+	    clazzUtil.enableClassExtend(Model);
+
+	    var mixin = zrUtil.mixin;
+	    mixin(Model, __webpack_require__(14));
+	    mixin(Model, __webpack_require__(16));
+	    mixin(Model, __webpack_require__(17));
+	    mixin(Model, __webpack_require__(18));
+
+	    module.exports = Model;
+
+
+/***/ },
+/* 13 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+
+	    var clazz = {};
+
+	    var TYPE_DELIMITER = '.';
+	    var IS_CONTAINER = '___EC__COMPONENT__CONTAINER___';
+	    /**
+	     * @public
+	     */
+	    var parseClassType = clazz.parseClassType = function (componentType) {
+	        var ret = {main: '', sub: ''};
+	        if (componentType) {
+	            componentType = componentType.split(TYPE_DELIMITER);
+	            ret.main = componentType[0] || '';
+	            ret.sub = componentType[1] || '';
+	        }
+	        return ret;
+	    };
+	    /**
+	     * @public
+	     */
+	    clazz.enableClassExtend = function (RootClass) {
+
+	        RootClass.$constructor = RootClass;
+	        RootClass.extend = function (proto) {
+	            var superClass = this;
+	            var ExtendedClass = function () {
+	                if (!proto.$constructor) {
+	                    superClass.apply(this, arguments);
+	                }
+	                else {
+	                    proto.$constructor.apply(this, arguments);
+	                }
+	            };
+
+	            zrUtil.extend(ExtendedClass.prototype, proto);
+
+	            ExtendedClass.extend = this.extend;
+	            ExtendedClass.superCall = superCall;
+	            ExtendedClass.superApply = superApply;
+	            zrUtil.inherits(ExtendedClass, this);
+	            ExtendedClass.superClass = superClass;
+
+	            return ExtendedClass;
+	        };
+	    };
+
+	    // superCall should have class info, which can not be fetch from 'this'.
+	    // Consider this case:
+	    // class A has method f,
+	    // class B inherits class A, overrides method f, f call superApply('f'),
+	    // class C inherits class B, do not overrides method f,
+	    // then when method of class C is called, dead loop occured.
+	    function superCall(context, methodName) {
+	        var args = zrUtil.slice(arguments, 2);
+	        return this.superClass.prototype[methodName].apply(context, args);
+	    }
+
+	    function superApply(context, methodName, args) {
+	        return this.superClass.prototype[methodName].apply(context, args);
+	    }
+
+	    /**
+	     * @param {Object} entity
+	     * @param {Object} options
+	     * @param {boolean} [options.registerWhenExtend]
+	     * @public
+	     */
+	    clazz.enableClassManagement = function (entity, options) {
+	        options = options || {};
+
+	        /**
+	         * Component model classes
+	         * key: componentType,
+	         * value:
+	         *     componentClass, when componentType is 'xxx'
+	         *     or Object.<subKey, componentClass>, when componentType is 'xxx.yy'
+	         * @type {Object}
+	         */
+	        var storage = {};
+
+	        entity.registerClass = function (Clazz, componentType) {
+	            if (componentType) {
+	                componentType = parseClassType(componentType);
+
+	                if (!componentType.sub) {
+	                    if (true) {
+	                        if (storage[componentType.main]) {
+	                            console.warn(componentType.main + ' exists.');
+	                        }
+	                    }
+	                    storage[componentType.main] = Clazz;
+	                }
+	                else if (componentType.sub !== IS_CONTAINER) {
+	                    var container = makeContainer(componentType);
+	                    container[componentType.sub] = Clazz;
+	                }
+	            }
+	            return Clazz;
+	        };
+
+	        entity.getClass = function (componentTypeMain, subType, throwWhenNotFound) {
+	            var Clazz = storage[componentTypeMain];
+
+	            if (Clazz && Clazz[IS_CONTAINER]) {
+	                Clazz = subType ? Clazz[subType] : null;
+	            }
+
+	            if (throwWhenNotFound && !Clazz) {
+	                throw new Error(
+	                    'Component ' + componentTypeMain + '.' + (subType || '') + ' not exists. Load it first.'
+	                );
+	            }
+
+	            return Clazz;
+	        };
+
+	        entity.getClassesByMainType = function (componentType) {
+	            componentType = parseClassType(componentType);
+
+	            var result = [];
+	            var obj = storage[componentType.main];
+
+	            if (obj && obj[IS_CONTAINER]) {
+	                zrUtil.each(obj, function (o, type) {
+	                    type !== IS_CONTAINER && result.push(o);
+	                });
+	            }
+	            else {
+	                result.push(obj);
+	            }
+
+	            return result;
+	        };
+
+	        entity.hasClass = function (componentType) {
+	            // Just consider componentType.main.
+	            componentType = parseClassType(componentType);
+	            return !!storage[componentType.main];
+	        };
+
+	        /**
+	         * @return {Array.<string>} Like ['aa', 'bb'], but can not be ['aa.xx']
+	         */
+	        entity.getAllClassMainTypes = function () {
+	            var types = [];
+	            zrUtil.each(storage, function (obj, type) {
+	                types.push(type);
+	            });
+	            return types;
+	        };
+
+	        /**
+	         * If a main type is container and has sub types
+	         * @param  {string}  mainType
+	         * @return {boolean}
+	         */
+	        entity.hasSubTypes = function (componentType) {
+	            componentType = parseClassType(componentType);
+	            var obj = storage[componentType.main];
+	            return obj && obj[IS_CONTAINER];
+	        };
+
+	        entity.parseClassType = parseClassType;
+
+	        function makeContainer(componentType) {
+	            var container = storage[componentType.main];
+	            if (!container || !container[IS_CONTAINER]) {
+	                container = storage[componentType.main] = {};
+	                container[IS_CONTAINER] = true;
+	            }
+	            return container;
+	        }
+
+	        if (options.registerWhenExtend) {
+	            var originalExtend = entity.extend;
+	            if (originalExtend) {
+	                entity.extend = function (proto) {
+	                    var ExtendedClass = originalExtend.call(this, proto);
+	                    return entity.registerClass(ExtendedClass, proto.type);
+	                };
+	            }
+	        }
+
+	        return entity;
+	    };
+
+	    /**
+	     * @param {string|Array.<string>} properties
+	     */
+	    clazz.setReadOnly = function (obj, properties) {
+	        // FIXME It seems broken in IE8 simulation of IE11
+	        // if (!zrUtil.isArray(properties)) {
+	        //     properties = properties != null ? [properties] : [];
+	        // }
+	        // zrUtil.each(properties, function (prop) {
+	        //     var value = obj[prop];
+
+	        //     Object.defineProperty
+	        //         && Object.defineProperty(obj, prop, {
+	        //             value: value, writable: false
+	        //         });
+	        //     zrUtil.isArray(obj[prop])
+	        //         && Object.freeze
+	        //         && Object.freeze(obj[prop]);
+	        // });
+	    };
+
+	    module.exports = clazz;
+
+
+/***/ },
+/* 14 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+	    var getLineStyle = __webpack_require__(15)(
+	        [
+	            ['lineWidth', 'width'],
+	            ['stroke', 'color'],
+	            ['opacity'],
+	            ['shadowBlur'],
+	            ['shadowOffsetX'],
+	            ['shadowOffsetY'],
+	            ['shadowColor']
+	        ]
+	    );
+	    module.exports = {
+	        getLineStyle: function (excludes) {
+	            var style = getLineStyle.call(this, excludes);
+	            var lineDash = this.getLineDash();
+	            lineDash && (style.lineDash = lineDash);
+	            return style;
+	        },
+
+	        getLineDash: function () {
+	            var lineType = this.get('type');
+	            return (lineType === 'solid' || lineType == null) ? null
+	                : (lineType === 'dashed' ? [5, 5] : [1, 1]);
+	        }
+	    };
+
+
+/***/ },
+/* 15 */
+/***/ function(module, exports, __webpack_require__) {
+
+	// TODO Parse shadow style
+	// TODO Only shallow path support
+
+	    var zrUtil = __webpack_require__(4);
+
+	    module.exports = function (properties) {
+	        // Normalize
+	        for (var i = 0; i < properties.length; i++) {
+	            if (!properties[i][1]) {
+	               properties[i][1] = properties[i][0];
+	            }
+	        }
+	        return function (excludes) {
+	            var style = {};
+	            for (var i = 0; i < properties.length; i++) {
+	                var propName = properties[i][1];
+	                if (excludes && zrUtil.indexOf(excludes, propName) >= 0) {
+	                    continue;
+	                }
+	                var val = this.getShallow(propName);
+	                if (val != null) {
+	                    style[properties[i][0]] = val;
+	                }
+	            }
+	            return style;
+	        };
+	    };
+
+
+/***/ },
+/* 16 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+	    module.exports = {
+	        getAreaStyle: __webpack_require__(15)(
+	            [
+	                ['fill', 'color'],
+	                ['shadowBlur'],
+	                ['shadowOffsetX'],
+	                ['shadowOffsetY'],
+	                ['opacity'],
+	                ['shadowColor']
+	            ]
+	        )
+	    };
+
+
+/***/ },
+/* 17 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var textContain = __webpack_require__(8);
+
+	    function getShallow(model, path) {
+	        return model && model.getShallow(path);
+	    }
+
+	    module.exports = {
+	        /**
+	         * Get color property or get color from option.textStyle.color
+	         * @return {string}
+	         */
+	        getTextColor: function () {
+	            var ecModel = this.ecModel;
+	            return this.getShallow('color')
+	                || (ecModel && ecModel.get('textStyle.color'));
+	        },
+
+	        /**
+	         * Create font string from fontStyle, fontWeight, fontSize, fontFamily
+	         * @return {string}
+	         */
+	        getFont: function () {
+	            var ecModel = this.ecModel;
+	            var gTextStyleModel = ecModel && ecModel.getModel('textStyle');
+	            return [
+	                // FIXME in node-canvas fontWeight is before fontStyle
+	                this.getShallow('fontStyle') || getShallow(gTextStyleModel, 'fontStyle'),
+	                this.getShallow('fontWeight') || getShallow(gTextStyleModel, 'fontWeight'),
+	                (this.getShallow('fontSize') || getShallow(gTextStyleModel, 'fontSize') || 12) + 'px',
+	                this.getShallow('fontFamily') || getShallow(gTextStyleModel, 'fontFamily') || 'sans-serif'
+	            ].join(' ');
+	        },
+
+	        getTextRect: function (text) {
+	            var textStyle = this.get('textStyle') || {};
+	            return textContain.getBoundingRect(
+	                text,
+	                this.getFont(),
+	                textStyle.align,
+	                textStyle.baseline
+	            );
+	        },
+
+	        truncateText: function (text, containerWidth, ellipsis, options) {
+	            return textContain.truncateText(
+	                text, containerWidth, this.getFont(), ellipsis, options
+	            );
+	        }
+	    };
+
+
+/***/ },
+/* 18 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+	    var getItemStyle = __webpack_require__(15)(
+	        [
+	            ['fill', 'color'],
+	            ['stroke', 'borderColor'],
+	            ['lineWidth', 'borderWidth'],
+	            ['opacity'],
+	            ['shadowBlur'],
+	            ['shadowOffsetX'],
+	            ['shadowOffsetY'],
+	            ['shadowColor']
+	        ]
+	    );
+	    module.exports = {
+	        getItemStyle: function (excludes) {
+	            var style = getItemStyle.call(this, excludes);
+	            var lineDash = this.getBorderLineDash();
+	            lineDash && (style.lineDash = lineDash);
+	            return style;
+	        },
+
+	        getBorderLineDash: function () {
+	            var lineType = this.get('borderType');
+	            return (lineType === 'solid' || lineType == null) ? null
+	                : (lineType === 'dashed' ? [5, 5] : [1, 1]);
+	        }
+	    };
+
+
+/***/ },
+/* 19 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * Component model
+	 *
+	 * @module echarts/model/Component
+	 */
+
+
+	    var Model = __webpack_require__(12);
+	    var zrUtil = __webpack_require__(4);
+	    var arrayPush = Array.prototype.push;
+	    var componentUtil = __webpack_require__(20);
+	    var clazzUtil = __webpack_require__(13);
+	    var layout = __webpack_require__(21);
+
+	    /**
+	     * @alias module:echarts/model/Component
+	     * @constructor
+	     * @param {Object} option
+	     * @param {module:echarts/model/Model} parentModel
+	     * @param {module:echarts/model/Model} ecModel
+	     */
+	    var ComponentModel = Model.extend({
+
+	        type: 'component',
+
+	        /**
+	         * @readOnly
+	         * @type {string}
+	         */
+	        id: '',
+
+	        /**
+	         * @readOnly
+	         */
+	        name: '',
+
+	        /**
+	         * @readOnly
+	         * @type {string}
+	         */
+	        mainType: '',
+
+	        /**
+	         * @readOnly
+	         * @type {string}
+	         */
+	        subType: '',
+
+	        /**
+	         * @readOnly
+	         * @type {number}
+	         */
+	        componentIndex: 0,
+
+	        /**
+	         * @type {Object}
+	         * @protected
+	         */
+	        defaultOption: null,
+
+	        /**
+	         * @type {module:echarts/model/Global}
+	         * @readOnly
+	         */
+	        ecModel: null,
+
+	        /**
+	         * key: componentType
+	         * value:  Component model list, can not be null.
+	         * @type {Object.<string, Array.<module:echarts/model/Model>>}
+	         * @readOnly
+	         */
+	        dependentModels: [],
+
+	        /**
+	         * @type {string}
+	         * @readOnly
+	         */
+	        uid: null,
+
+	        /**
+	         * Support merge layout params.
+	         * Only support 'box' now (left/right/top/bottom/width/height).
+	         * @type {string|Object} Object can be {ignoreSize: true}
+	         * @readOnly
+	         */
+	        layoutMode: null,
+
+	        $constructor: function (option, parentModel, ecModel, extraOpt) {
+	            Model.call(this, option, parentModel, ecModel, extraOpt);
+
+	            // Set dependentModels, componentIndex, name, id, mainType, subType.
+	            zrUtil.extend(this, extraOpt);
+
+	            this.uid = componentUtil.getUID('componentModel');
+	        },
+
+
+	        init: function (option, parentModel, ecModel, extraOpt) {
+	            this.mergeDefaultAndTheme(option, ecModel);
+	        },
+
+	        mergeDefaultAndTheme: function (option, ecModel) {
+	            var layoutMode = this.layoutMode;
+	            var inputPositionParams = layoutMode
+	                ? layout.getLayoutParams(option) : {};
+
+	            var themeModel = ecModel.getTheme();
+	            zrUtil.merge(option, themeModel.get(this.mainType));
+	            zrUtil.merge(option, this.getDefaultOption());
+
+	            if (layoutMode) {
+	                layout.mergeLayoutParam(option, inputPositionParams, layoutMode);
+	            }
+	        },
+
+	        mergeOption: function (option) {
+	            zrUtil.merge(this.option, option, true);
+
+	            var layoutMode = this.layoutMode;
+	            if (layoutMode) {
+	                layout.mergeLayoutParam(this.option, option, layoutMode);
+	            }
+	        },
+
+	        // Hooker after init or mergeOption
+	        optionUpdated: function (newCptOption, isInit) {},
+
+	        getDefaultOption: function () {
+	            if (!this.hasOwnProperty('__defaultOption')) {
+	                var optList = [];
+	                var Class = this.constructor;
+	                while (Class) {
+	                    var opt = Class.prototype.defaultOption;
+	                    opt && optList.push(opt);
+	                    Class = Class.superClass;
+	                }
+
+	                var defaultOption = {};
+	                for (var i = optList.length - 1; i >= 0; i--) {
+	                    defaultOption = zrUtil.merge(defaultOption, optList[i], true);
+	                }
+	                this.__defaultOption = defaultOption;
+	            }
+	            return this.__defaultOption;
+	        }
+
+	    });
+
+	    // Reset ComponentModel.extend, add preConstruct.
+	    // clazzUtil.enableClassExtend(
+	    //     ComponentModel,
+	    //     function (option, parentModel, ecModel, extraOpt) {
+	    //         // Set dependentModels, componentIndex, name, id, mainType, subType.
+	    //         zrUtil.extend(this, extraOpt);
+
+	    //         this.uid = componentUtil.getUID('componentModel');
+
+	    //         // this.setReadOnly([
+	    //         //     'type', 'id', 'uid', 'name', 'mainType', 'subType',
+	    //         //     'dependentModels', 'componentIndex'
+	    //         // ]);
+	    //     }
+	    // );
+
+	    // Add capability of registerClass, getClass, hasClass, registerSubTypeDefaulter and so on.
+	    clazzUtil.enableClassManagement(
+	        ComponentModel, {registerWhenExtend: true}
+	    );
+	    componentUtil.enableSubTypeDefaulter(ComponentModel);
+
+	    // Add capability of ComponentModel.topologicalTravel.
+	    componentUtil.enableTopologicalTravel(ComponentModel, getDependencies);
+
+	    function getDependencies(componentType) {
+	        var deps = [];
+	        zrUtil.each(ComponentModel.getClassesByMainType(componentType), function (Clazz) {
+	            arrayPush.apply(deps, Clazz.prototype.dependencies || []);
+	        });
+	        // Ensure main type
+	        return zrUtil.map(deps, function (type) {
+	            return clazzUtil.parseClassType(type).main;
+	        });
+	    }
+
+	    zrUtil.mixin(ComponentModel, __webpack_require__(22));
+
+	    module.exports = ComponentModel;
+
+
+/***/ },
+/* 20 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+	    var clazz = __webpack_require__(13);
+
+	    var parseClassType = clazz.parseClassType;
+
+	    var base = 0;
+
+	    var componentUtil = {};
+
+	    var DELIMITER = '_';
+
+	    /**
+	     * @public
+	     * @param {string} type
+	     * @return {string}
+	     */
+	    componentUtil.getUID = function (type) {
+	        // Considering the case of crossing js context,
+	        // use Math.random to make id as unique as possible.
+	        return [(type || ''), base++, Math.random()].join(DELIMITER);
+	    };
+
+	    /**
+	     * @inner
+	     */
+	    componentUtil.enableSubTypeDefaulter = function (entity) {
+
+	        var subTypeDefaulters = {};
+
+	        entity.registerSubTypeDefaulter = function (componentType, defaulter) {
+	            componentType = parseClassType(componentType);
+	            subTypeDefaulters[componentType.main] = defaulter;
+	        };
+
+	        entity.determineSubType = function (componentType, option) {
+	            var type = option.type;
+	            if (!type) {
+	                var componentTypeMain = parseClassType(componentType).main;
+	                if (entity.hasSubTypes(componentType) && subTypeDefaulters[componentTypeMain]) {
+	                    type = subTypeDefaulters[componentTypeMain](option);
+	                }
+	            }
+	            return type;
+	        };
+
+	        return entity;
+	    };
+
+	    /**
+	     * Topological travel on Activity Network (Activity On Vertices).
+	     * Dependencies is defined in Model.prototype.dependencies, like ['xAxis', 'yAxis'].
+	     *
+	     * If 'xAxis' or 'yAxis' is absent in componentTypeList, just ignore it in topology.
+	     *
+	     * If there is circle dependencey, Error will be thrown.
+	     *
+	     */
+	    componentUtil.enableTopologicalTravel = function (entity, dependencyGetter) {
+
+	        /**
+	         * @public
+	         * @param {Array.<string>} targetNameList Target Component type list.
+	         *                                           Can be ['aa', 'bb', 'aa.xx']
+	         * @param {Array.<string>} fullNameList By which we can build dependency graph.
+	         * @param {Function} callback Params: componentType, dependencies.
+	         * @param {Object} context Scope of callback.
+	         */
+	        entity.topologicalTravel = function (targetNameList, fullNameList, callback, context) {
+	            if (!targetNameList.length) {
+	                return;
+	            }
+
+	            var result = makeDepndencyGraph(fullNameList);
+	            var graph = result.graph;
+	            var stack = result.noEntryList;
+
+	            var targetNameSet = {};
+	            zrUtil.each(targetNameList, function (name) {
+	                targetNameSet[name] = true;
+	            });
+
+	            while (stack.length) {
+	                var currComponentType = stack.pop();
+	                var currVertex = graph[currComponentType];
+	                var isInTargetNameSet = !!targetNameSet[currComponentType];
+	                if (isInTargetNameSet) {
+	                    callback.call(context, currComponentType, currVertex.originalDeps.slice());
+	                    delete targetNameSet[currComponentType];
+	                }
+	                zrUtil.each(
+	                    currVertex.successor,
+	                    isInTargetNameSet ? removeEdgeAndAdd : removeEdge
+	                );
+	            }
+
+	            zrUtil.each(targetNameSet, function () {
+	                throw new Error('Circle dependency may exists');
+	            });
+
+	            function removeEdge(succComponentType) {
+	                graph[succComponentType].entryCount--;
+	                if (graph[succComponentType].entryCount === 0) {
+	                    stack.push(succComponentType);
+	                }
+	            }
+
+	            // Consider this case: legend depends on series, and we call
+	            // chart.setOption({series: [...]}), where only series is in option.
+	            // If we do not have 'removeEdgeAndAdd', legendModel.mergeOption will
+	            // not be called, but only sereis.mergeOption is called. Thus legend
+	            // have no chance to update its local record about series (like which
+	            // name of series is available in legend).
+	            function removeEdgeAndAdd(succComponentType) {
+	                targetNameSet[succComponentType] = true;
+	                removeEdge(succComponentType);
+	            }
+	        };
+
+	        /**
+	         * DepndencyGraph: {Object}
+	         * key: conponentType,
+	         * value: {
+	         *     successor: [conponentTypes...],
+	         *     originalDeps: [conponentTypes...],
+	         *     entryCount: {number}
+	         * }
+	         */
+	        function makeDepndencyGraph(fullNameList) {
+	            var graph = {};
+	            var noEntryList = [];
+
+	            zrUtil.each(fullNameList, function (name) {
+
+	                var thisItem = createDependencyGraphItem(graph, name);
+	                var originalDeps = thisItem.originalDeps = dependencyGetter(name);
+
+	                var availableDeps = getAvailableDependencies(originalDeps, fullNameList);
+	                thisItem.entryCount = availableDeps.length;
+	                if (thisItem.entryCount === 0) {
+	                    noEntryList.push(name);
+	                }
+
+	                zrUtil.each(availableDeps, function (dependentName) {
+	                    if (zrUtil.indexOf(thisItem.predecessor, dependentName) < 0) {
+	                        thisItem.predecessor.push(dependentName);
+	                    }
+	                    var thatItem = createDependencyGraphItem(graph, dependentName);
+	                    if (zrUtil.indexOf(thatItem.successor, dependentName) < 0) {
+	                        thatItem.successor.push(name);
+	                    }
+	                });
+	            });
+
+	            return {graph: graph, noEntryList: noEntryList};
+	        }
+
+	        function createDependencyGraphItem(graph, name) {
+	            if (!graph[name]) {
+	                graph[name] = {predecessor: [], successor: []};
+	            }
+	            return graph[name];
+	        }
+
+	        function getAvailableDependencies(originalDeps, fullNameList) {
+	            var availableDeps = [];
+	            zrUtil.each(originalDeps, function (dep) {
+	                zrUtil.indexOf(fullNameList, dep) >= 0 && availableDeps.push(dep);
+	            });
+	            return availableDeps;
+	        }
+	    };
+
+	    module.exports = componentUtil;
+
+
+/***/ },
+/* 21 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+	// Layout helpers for each component positioning
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var BoundingRect = __webpack_require__(9);
+	    var numberUtil = __webpack_require__(7);
+	    var formatUtil = __webpack_require__(6);
+	    var parsePercent = numberUtil.parsePercent;
+	    var each = zrUtil.each;
+
+	    var layout = {};
+
+	    var LOCATION_PARAMS = ['left', 'right', 'top', 'bottom', 'width', 'height'];
+
+	    function boxLayout(orient, group, gap, maxWidth, maxHeight) {
+	        var x = 0;
+	        var y = 0;
+	        if (maxWidth == null) {
+	            maxWidth = Infinity;
+	        }
+	        if (maxHeight == null) {
+	            maxHeight = Infinity;
+	        }
+	        var currentLineMaxSize = 0;
+	        group.eachChild(function (child, idx) {
+	            var position = child.position;
+	            var rect = child.getBoundingRect();
+	            var nextChild = group.childAt(idx + 1);
+	            var nextChildRect = nextChild && nextChild.getBoundingRect();
+	            var nextX;
+	            var nextY;
+	            if (orient === 'horizontal') {
+	                var moveX = rect.width + (nextChildRect ? (-nextChildRect.x + rect.x) : 0);
+	                nextX = x + moveX;
+	                // Wrap when width exceeds maxWidth or meet a `newline` group
+	                if (nextX > maxWidth || child.newline) {
+	                    x = 0;
+	                    nextX = moveX;
+	                    y += currentLineMaxSize + gap;
+	                    currentLineMaxSize = rect.height;
+	                }
+	                else {
+	                    currentLineMaxSize = Math.max(currentLineMaxSize, rect.height);
+	                }
+	            }
+	            else {
+	                var moveY = rect.height + (nextChildRect ? (-nextChildRect.y + rect.y) : 0);
+	                nextY = y + moveY;
+	                // Wrap when width exceeds maxHeight or meet a `newline` group
+	                if (nextY > maxHeight || child.newline) {
+	                    x += currentLineMaxSize + gap;
+	                    y = 0;
+	                    nextY = moveY;
+	                    currentLineMaxSize = rect.width;
+	                }
+	                else {
+	                    currentLineMaxSize = Math.max(currentLineMaxSize, rect.width);
+	                }
+	            }
+
+	            if (child.newline) {
+	                return;
+	            }
+
+	            position[0] = x;
+	            position[1] = y;
+
+	            orient === 'horizontal'
+	                ? (x = nextX + gap)
+	                : (y = nextY + gap);
+	        });
+	    }
+
+	    /**
+	     * VBox or HBox layouting
+	     * @param {string} orient
+	     * @param {module:zrender/container/Group} group
+	     * @param {number} gap
+	     * @param {number} [width=Infinity]
+	     * @param {number} [height=Infinity]
+	     */
+	    layout.box = boxLayout;
+
+	    /**
+	     * VBox layouting
+	     * @param {module:zrender/container/Group} group
+	     * @param {number} gap
+	     * @param {number} [width=Infinity]
+	     * @param {number} [height=Infinity]
+	     */
+	    layout.vbox = zrUtil.curry(boxLayout, 'vertical');
+
+	    /**
+	     * HBox layouting
+	     * @param {module:zrender/container/Group} group
+	     * @param {number} gap
+	     * @param {number} [width=Infinity]
+	     * @param {number} [height=Infinity]
+	     */
+	    layout.hbox = zrUtil.curry(boxLayout, 'horizontal');
+
+	    /**
+	     * If x or x2 is not specified or 'center' 'left' 'right',
+	     * the width would be as long as possible.
+	     * If y or y2 is not specified or 'middle' 'top' 'bottom',
+	     * the height would be as long as possible.
+	     *
+	     * @param {Object} positionInfo
+	     * @param {number|string} [positionInfo.x]
+	     * @param {number|string} [positionInfo.y]
+	     * @param {number|string} [positionInfo.x2]
+	     * @param {number|string} [positionInfo.y2]
+	     * @param {Object} containerRect
+	     * @param {string|number} margin
+	     * @return {Object} {width, height}
+	     */
+	    layout.getAvailableSize = function (positionInfo, containerRect, margin) {
+	        var containerWidth = containerRect.width;
+	        var containerHeight = containerRect.height;
+
+	        var x = parsePercent(positionInfo.x, containerWidth);
+	        var y = parsePercent(positionInfo.y, containerHeight);
+	        var x2 = parsePercent(positionInfo.x2, containerWidth);
+	        var y2 = parsePercent(positionInfo.y2, containerHeight);
+
+	        (isNaN(x) || isNaN(parseFloat(positionInfo.x))) && (x = 0);
+	        (isNaN(x2) || isNaN(parseFloat(positionInfo.x2))) && (x2 = containerWidth);
+	        (isNaN(y) || isNaN(parseFloat(positionInfo.y))) && (y = 0);
+	        (isNaN(y2) || isNaN(parseFloat(positionInfo.y2))) && (y2 = containerHeight);
+
+	        margin = formatUtil.normalizeCssArray(margin || 0);
+
+	        return {
+	            width: Math.max(x2 - x - margin[1] - margin[3], 0),
+	            height: Math.max(y2 - y - margin[0] - margin[2], 0)
+	        };
+	    };
+
+	    /**
+	     * Parse position info.
+	     *
+	     * @param {Object} positionInfo
+	     * @param {number|string} [positionInfo.left]
+	     * @param {number|string} [positionInfo.top]
+	     * @param {number|string} [positionInfo.right]
+	     * @param {number|string} [positionInfo.bottom]
+	     * @param {number|string} [positionInfo.width]
+	     * @param {number|string} [positionInfo.height]
+	     * @param {number|string} [positionInfo.aspect] Aspect is width / height
+	     * @param {Object} containerRect
+	     * @param {string|number} [margin]
+	     *
+	     * @return {module:zrender/core/BoundingRect}
+	     */
+	    layout.getLayoutRect = function (
+	        positionInfo, containerRect, margin
+	    ) {
+	        margin = formatUtil.normalizeCssArray(margin || 0);
+
+	        var containerWidth = containerRect.width;
+	        var containerHeight = containerRect.height;
+
+	        var left = parsePercent(positionInfo.left, containerWidth);
+	        var top = parsePercent(positionInfo.top, containerHeight);
+	        var right = parsePercent(positionInfo.right, containerWidth);
+	        var bottom = parsePercent(positionInfo.bottom, containerHeight);
+	        var width = parsePercent(positionInfo.width, containerWidth);
+	        var height = parsePercent(positionInfo.height, containerHeight);
+
+	        var verticalMargin = margin[2] + margin[0];
+	        var horizontalMargin = margin[1] + margin[3];
+	        var aspect = positionInfo.aspect;
+
+	        // If width is not specified, calculate width from left and right
+	        if (isNaN(width)) {
+	            width = containerWidth - right - horizontalMargin - left;
+	        }
+	        if (isNaN(height)) {
+	            height = containerHeight - bottom - verticalMargin - top;
+	        }
+
+	        // If width and height are not given
+	        // 1. Graph should not exceeds the container
+	        // 2. Aspect must be keeped
+	        // 3. Graph should take the space as more as possible
+	        if (isNaN(width) && isNaN(height)) {
+	            if (aspect > containerWidth / containerHeight) {
+	                width = containerWidth * 0.8;
+	            }
+	            else {
+	                height = containerHeight * 0.8;
+	            }
+	        }
+
+	        if (aspect != null) {
+	            // Calculate width or height with given aspect
+	            if (isNaN(width)) {
+	                width = aspect * height;
+	            }
+	            if (isNaN(height)) {
+	                height = width / aspect;
+	            }
+	        }
+
+	        // If left is not specified, calculate left from right and width
+	        if (isNaN(left)) {
+	            left = containerWidth - right - width - horizontalMargin;
+	        }
+	        if (isNaN(top)) {
+	            top = containerHeight - bottom - height - verticalMargin;
+	        }
+
+	        // Align left and top
+	        switch (positionInfo.left || positionInfo.right) {
+	            case 'center':
+	                left = containerWidth / 2 - width / 2 - margin[3];
+	                break;
+	            case 'right':
+	                left = containerWidth - width - horizontalMargin;
+	                break;
+	        }
+	        switch (positionInfo.top || positionInfo.bottom) {
+	            case 'middle':
+	            case 'center':
+	                top = containerHeight / 2 - height / 2 - margin[0];
+	                break;
+	            case 'bottom':
+	                top = containerHeight - height - verticalMargin;
+	                break;
+	        }
+	        // If something is wrong and left, top, width, height are calculated as NaN
+	        left = left || 0;
+	        top = top || 0;
+	        if (isNaN(width)) {
+	            // Width may be NaN if only one value is given except width
+	            width = containerWidth - left - (right || 0);
+	        }
+	        if (isNaN(height)) {
+	            // Height may be NaN if only one value is given except height
+	            height = containerHeight - top - (bottom || 0);
+	        }
+
+	        var rect = new BoundingRect(left + margin[3], top + margin[0], width, height);
+	        rect.margin = margin;
+	        return rect;
+	    };
+
+	    /**
+	     * Position group of component in viewport
+	     *  Group position is specified by either
+	     *  {left, top}, {right, bottom}
+	     *  If all properties exists, right and bottom will be igonred.
+	     *
+	     * @param {module:zrender/container/Group} group
+	     * @param {Object} positionInfo
+	     * @param {number|string} [positionInfo.left]
+	     * @param {number|string} [positionInfo.top]
+	     * @param {number|string} [positionInfo.right]
+	     * @param {number|string} [positionInfo.bottom]
+	     * @param {Object} containerRect
+	     * @param {string|number} margin
+	     */
+	    layout.positionGroup = function (
+	        group, positionInfo, containerRect, margin
+	    ) {
+	        var groupRect = group.getBoundingRect();
+
+	        positionInfo = zrUtil.extend(zrUtil.clone(positionInfo), {
+	            width: groupRect.width,
+	            height: groupRect.height
+	        });
+
+	        positionInfo = layout.getLayoutRect(
+	            positionInfo, containerRect, margin
+	        );
+
+	        group.attr('position', [
+	            positionInfo.x - groupRect.x,
+	            positionInfo.y - groupRect.y
+	        ]);
+	    };
+
+	    /**
+	     * Consider Case:
+	     * When defulat option has {left: 0, width: 100}, and we set {right: 0}
+	     * through setOption or media query, using normal zrUtil.merge will cause
+	     * {right: 0} does not take effect.
+	     *
+	     * @example
+	     * ComponentModel.extend({
+	     *     init: function () {
+	     *         ...
+	     *         var inputPositionParams = layout.getLayoutParams(option);
+	     *         this.mergeOption(inputPositionParams);
+	     *     },
+	     *     mergeOption: function (newOption) {
+	     *         newOption && zrUtil.merge(thisOption, newOption, true);
+	     *         layout.mergeLayoutParam(thisOption, newOption);
+	     *     }
+	     * });
+	     *
+	     * @param {Object} targetOption
+	     * @param {Object} newOption
+	     * @param {Object|string} [opt]
+	     * @param {boolean} [opt.ignoreSize=false] Some component must has width and height.
+	     */
+	    layout.mergeLayoutParam = function (targetOption, newOption, opt) {
+	        !zrUtil.isObject(opt) && (opt = {});
+	        var hNames = ['width', 'left', 'right']; // Order by priority.
+	        var vNames = ['height', 'top', 'bottom']; // Order by priority.
+	        var hResult = merge(hNames);
+	        var vResult = merge(vNames);
+
+	        copy(hNames, targetOption, hResult);
+	        copy(vNames, targetOption, vResult);
+
+	        function merge(names) {
+	            var newParams = {};
+	            var newValueCount = 0;
+	            var merged = {};
+	            var mergedValueCount = 0;
+	            var enoughParamNumber = opt.ignoreSize ? 1 : 2;
+
+	            each(names, function (name) {
+	                merged[name] = targetOption[name];
+	            });
+	            each(names, function (name) {
+	                // Consider case: newOption.width is null, which is
+	                // set by user for removing width setting.
+	                hasProp(newOption, name) && (newParams[name] = merged[name] = newOption[name]);
+	                hasValue(newParams, name) && newValueCount++;
+	                hasValue(merged, name) && mergedValueCount++;
+	            });
+
+	            // Case: newOption: {width: ..., right: ...},
+	            // or targetOption: {right: ...} and newOption: {width: ...},
+	            // There is no conflict when merged only has params count
+	            // little than enoughParamNumber.
+	            if (mergedValueCount === enoughParamNumber || !newValueCount) {
+	                return merged;
+	            }
+	            // Case: newOption: {width: ..., right: ...},
+	            // Than we can make sure user only want those two, and ignore
+	            // all origin params in targetOption.
+	            else if (newValueCount >= enoughParamNumber) {
+	                return newParams;
+	            }
+	            else {
+	                // Chose another param from targetOption by priority.
+	                // When 'ignoreSize', enoughParamNumber is 1 and those will not happen.
+	                for (var i = 0; i < names.length; i++) {
+	                    var name = names[i];
+	                    if (!hasProp(newParams, name) && hasProp(targetOption, name)) {
+	                        newParams[name] = targetOption[name];
+	                        break;
+	                    }
+	                }
+	                return newParams;
+	            }
+	        }
+
+	        function hasProp(obj, name) {
+	            return obj.hasOwnProperty(name);
+	        }
+
+	        function hasValue(obj, name) {
+	            return obj[name] != null && obj[name] !== 'auto';
+	        }
+
+	        function copy(names, target, source) {
+	            each(names, function (name) {
+	                target[name] = source[name];
+	            });
+	        }
+	    };
+
+	    /**
+	     * Retrieve 'left', 'right', 'top', 'bottom', 'width', 'height' from object.
+	     * @param {Object} source
+	     * @return {Object} Result contains those props.
+	     */
+	    layout.getLayoutParams = function (source) {
+	        return layout.copyLayoutParams({}, source);
+	    };
+
+	    /**
+	     * Retrieve 'left', 'right', 'top', 'bottom', 'width', 'height' from object.
+	     * @param {Object} source
+	     * @return {Object} Result contains those props.
+	     */
+	    layout.copyLayoutParams = function (target, source) {
+	        source && target && each(LOCATION_PARAMS, function (name) {
+	            source.hasOwnProperty(name) && (target[name] = source[name]);
+	        });
+	        return target;
+	    };
+
+	    module.exports = layout;
+
+
+/***/ },
+/* 22 */
+/***/ function(module, exports) {
+
+	
+
+	    module.exports = {
+	        getBoxLayoutParams: function () {
+	            return {
+	                left: this.get('left'),
+	                top: this.get('top'),
+	                right: this.get('right'),
+	                bottom: this.get('bottom'),
+	                width: this.get('width'),
+	                height: this.get('height')
+	            };
+	        }
+	    };
+
+
+/***/ },
+/* 23 */
+/***/ function(module, exports) {
+
+	
+	    var platform = '';
+	    // Navigator not exists in node
+	    if (typeof navigator !== 'undefined') {
+	        platform = navigator.platform || '';
+	    }
+	    module.exports = {
+	        // 全图默认背景
+	        // backgroundColor: 'rgba(0,0,0,0)',
+
+	        // https://dribbble.com/shots/1065960-Infographic-Pie-chart-visualization
+	        // color: ['#5793f3', '#d14a61', '#fd9c35', '#675bba', '#fec42c', '#dd4444', '#d4df5a', '#cd4870'],
+	        // 浅色
+	        // color: ['#bcd3bb', '#e88f70', '#edc1a5', '#9dc5c8', '#e1e8c8', '#7b7c68', '#e5b5b5', '#f0b489', '#928ea8', '#bda29a'],
+	        // color: ['#cc5664', '#9bd6ec', '#ea946e', '#8acaaa', '#f1ec64', '#ee8686', '#a48dc1', '#5da6bc', '#b9dcae'],
+	        // 深色
+	        color: ['#c23531','#2f4554', '#61a0a8', '#d48265', '#91c7ae','#749f83',  '#ca8622', '#bda29a','#6e7074', '#546570', '#c4ccd3'],
+
+	        // 默认需要 Grid 配置项
+	        grid: {},
+	        // 主题，主题
+	        textStyle: {
+	            // color: '#000',
+	            // decoration: 'none',
+	            // PENDING
+	            fontFamily: platform.match(/^Win/) ? 'Microsoft YaHei' : 'sans-serif',
+	            // fontFamily: 'Arial, Verdana, sans-serif',
+	            fontSize: 12,
+	            fontStyle: 'normal',
+	            fontWeight: 'normal'
+	        },
+
+	        // http://blogs.adobe.com/webplatform/2014/02/24/using-blend-modes-in-html-canvas/
+	        // https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/globalCompositeOperation
+	        // Default is source-over
+	        blendMode: null,
+
+	        animation: true,
+	        animationDuration: 1000,
+	        animationDurationUpdate: 300,
+	        animationEasing: 'exponentialOut',
+	        animationEasingUpdate: 'cubicOut',
+
+	        animationThreshold: 2000,
+	        // Configuration for progressive/incremental rendering
+	        progressiveThreshold: 3000,
+	        progressive: 400,
+
+	        // Threshold of if use single hover layer to optimize.
+	        hoverLayerThreshold: 3000
+	    };
+
+
+/***/ },
+/* 24 */
+/***/ function(module, exports) {
+
+	
+	    module.exports = {
+	        clearColorPalette: function () {
+	            this._colorIdx = 0;
+	            this._colorNameMap = {};
+	        },
+
+	        getColorFromPalette: function (name, scope) {
+	            scope = scope || this;
+	            var colorIdx = scope._colorIdx || 0;
+	            var colorNameMap = scope._colorNameMap || (scope._colorNameMap = {});
+	            if (colorNameMap[name]) {
+	                return colorNameMap[name];
+	            }
+	            var colorPalette = this.get('color', true) || [];
+	            if (!colorPalette.length) {
+	                return;
+	            }
+
+	            var color = colorPalette[colorIdx];
+	            if (name) {
+	                colorNameMap[name] = color;
+	            }
+	            scope._colorIdx = (colorIdx + 1) % colorPalette.length;
+
+	            return color;
+	        }
+	    };
+
+
+/***/ },
+/* 25 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var zrUtil = __webpack_require__(4);
+
+	    var echartsAPIList = [
+	        'getDom', 'getZr', 'getWidth', 'getHeight', 'dispatchAction', 'isDisposed',
+	        'on', 'off', 'getDataURL', 'getConnectedDataURL', 'getModel', 'getOption'
+	    ];
+
+	    function ExtensionAPI(chartInstance) {
+	        zrUtil.each(echartsAPIList, function (name) {
+	            this[name] = zrUtil.bind(chartInstance[name], chartInstance);
+	        }, this);
+	    }
+
+	    module.exports = ExtensionAPI;
+
+
+/***/ },
+/* 26 */
+/***/ function(module, exports) {
+
+	'use strict';
+
+
+	    var coordinateSystemCreators = {};
+
+	    function CoordinateSystemManager() {
+
+	        this._coordinateSystems = [];
+	    }
+
+	    CoordinateSystemManager.prototype = {
+
+	        constructor: CoordinateSystemManager,
+
+	        create: function (ecModel, api) {
+	            var coordinateSystems = [];
+	            for (var type in coordinateSystemCreators) {
+	                var list = coordinateSystemCreators[type].create(ecModel, api);
+	                list && (coordinateSystems = coordinateSystems.concat(list));
+	            }
+
+	            this._coordinateSystems = coordinateSystems;
+	        },
+
+	        update: function (ecModel, api) {
+	            var coordinateSystems = this._coordinateSystems;
+	            for (var i = 0; i < coordinateSystems.length; i++) {
+	                // FIXME MUST have
+	                coordinateSystems[i].update && coordinateSystems[i].update(ecModel, api);
+	            }
+	        }
+	    };
+
+	    CoordinateSystemManager.register = function (type, coordinateSystemCreator) {
+	        coordinateSystemCreators[type] = coordinateSystemCreator;
+	    };
+
+	    CoordinateSystemManager.get = function (type) {
+	        return coordinateSystemCreators[type];
+	    };
+
+	    module.exports = CoordinateSystemManager;
+
+
+/***/ },
+/* 27 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * ECharts option manager
+	 *
+	 * @module {echarts/model/OptionManager}
+	 */
+
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var modelUtil = __webpack_require__(5);
+	    var ComponentModel = __webpack_require__(19);
+	    var each = zrUtil.each;
+	    var clone = zrUtil.clone;
+	    var map = zrUtil.map;
+	    var merge = zrUtil.merge;
+
+	    var QUERY_REG = /^(min|max)?(.+)$/;
+
+	    /**
+	     * TERM EXPLANATIONS:
+	     *
+	     * [option]:
+	     *
+	     *     An object that contains definitions of components. For example:
+	     *     var option = {
+	     *         title: {...},
+	     *         legend: {...},
+	     *         visualMap: {...},
+	     *         series: [
+	     *             {data: [...]},
+	     *             {data: [...]},
+	     *             ...
+	     *         ]
+	     *     };
+	     *
+	     * [rawOption]:
+	     *
+	     *     An object input to echarts.setOption. 'rawOption' may be an
+	     *     'option', or may be an object contains multi-options. For example:
+	     *     var option = {
+	     *         baseOption: {
+	     *             title: {...},
+	     *             legend: {...},
+	     *             series: [
+	     *                 {data: [...]},
+	     *                 {data: [...]},
+	     *                 ...
+	     *             ]
+	     *         },
+	     *         timeline: {...},
+	     *         options: [
+	     *             {title: {...}, series: {data: [...]}},
+	     *             {title: {...}, series: {data: [...]}},
+	     *             ...
+	     *         ],
+	     *         media: [
+	     *             {
+	     *                 query: {maxWidth: 320},
+	     *                 option: {series: {x: 20}, visualMap: {show: false}}
+	     *             },
+	     *             {
+	     *                 query: {minWidth: 320, maxWidth: 720},
+	     *                 option: {series: {x: 500}, visualMap: {show: true}}
+	     *             },
+	     *             {
+	     *                 option: {series: {x: 1200}, visualMap: {show: true}}
+	     *             }
+	     *         ]
+	     *     };
+	     *
+	     * @alias module:echarts/model/OptionManager
+	     * @param {module:echarts/ExtensionAPI} api
+	     */
+	    function OptionManager(api) {
+
+	        /**
+	         * @private
+	         * @type {module:echarts/ExtensionAPI}
+	         */
+	        this._api = api;
+
+	        /**
+	         * @private
+	         * @type {Array.<number>}
+	         */
+	        this._timelineOptions = [];
+
+	        /**
+	         * @private
+	         * @type {Array.<Object>}
+	         */
+	        this._mediaList = [];
+
+	        /**
+	         * @private
+	         * @type {Object}
+	         */
+	        this._mediaDefault;
+
+	        /**
+	         * -1, means default.
+	         * empty means no media.
+	         * @private
+	         * @type {Array.<number>}
+	         */
+	        this._currentMediaIndices = [];
+
+	        /**
+	         * @private
+	         * @type {Object}
+	         */
+	        this._optionBackup;
+
+	        /**
+	         * @private
+	         * @type {Object}
+	         */
+	        this._newBaseOption;
+	    }
+
+	    // timeline.notMerge is not supported in ec3. Firstly there is rearly
+	    // case that notMerge is needed. Secondly supporting 'notMerge' requires
+	    // rawOption cloned and backuped when timeline changed, which does no
+	    // good to performance. What's more, that both timeline and setOption
+	    // method supply 'notMerge' brings complex and some problems.
+	    // Consider this case:
+	    // (step1) chart.setOption({timeline: {notMerge: false}, ...}, false);
+	    // (step2) chart.setOption({timeline: {notMerge: true}, ...}, false);
+
+	    OptionManager.prototype = {
+
+	        constructor: OptionManager,
+
+	        /**
+	         * @public
+	         * @param {Object} rawOption Raw option.
+	         * @param {module:echarts/model/Global} ecModel
+	         * @param {Array.<Function>} optionPreprocessorFuncs
+	         * @return {Object} Init option
+	         */
+	        setOption: function (rawOption, optionPreprocessorFuncs) {
+	            rawOption = clone(rawOption, true);
+
+	            // FIXME
+	            // 如果 timeline options 或者 media 中设置了某个属性，而baseOption中没有设置，则进行警告。
+
+	            var oldOptionBackup = this._optionBackup;
+	            var newParsedOption = parseRawOption.call(
+	                this, rawOption, optionPreprocessorFuncs, !oldOptionBackup
+	            );
+	            this._newBaseOption = newParsedOption.baseOption;
+
+	            // For setOption at second time (using merge mode);
+	            if (oldOptionBackup) {
+	                // Only baseOption can be merged.
+	                mergeOption(oldOptionBackup.baseOption, newParsedOption.baseOption);
+
+	                // For simplicity, timeline options and media options do not support merge,
+	                // that is, if you `setOption` twice and both has timeline options, the latter
+	                // timeline opitons will not be merged to the formers, but just substitude them.
+	                if (newParsedOption.timelineOptions.length) {
+	                    oldOptionBackup.timelineOptions = newParsedOption.timelineOptions;
+	                }
+	                if (newParsedOption.mediaList.length) {
+	                    oldOptionBackup.mediaList = newParsedOption.mediaList;
+	                }
+	                if (newParsedOption.mediaDefault) {
+	                    oldOptionBackup.mediaDefault = newParsedOption.mediaDefault;
+	                }
+	            }
+	            else {
+	                this._optionBackup = newParsedOption;
+	            }
+	        },
+
+	        /**
+	         * @param {boolean} isRecreate
+	         * @return {Object}
+	         */
+	        mountOption: function (isRecreate) {
+	            var optionBackup = this._optionBackup;
+
+	            // TODO
+	            // 如果没有reset功能则不clone。
+
+	            this._timelineOptions = map(optionBackup.timelineOptions, clone);
+	            this._mediaList = map(optionBackup.mediaList, clone);
+	            this._mediaDefault = clone(optionBackup.mediaDefault);
+	            this._currentMediaIndices = [];
+
+	            return clone(isRecreate
+	                // this._optionBackup.baseOption, which is created at the first `setOption`
+	                // called, and is merged into every new option by inner method `mergeOption`
+	                // each time `setOption` called, can be only used in `isRecreate`, because
+	                // its reliability is under suspicion. In other cases option merge is
+	                // proformed by `model.mergeOption`.
+	                ? optionBackup.baseOption : this._newBaseOption
+	            );
+	        },
+
+	        /**
+	         * @param {module:echarts/model/Global} ecModel
+	         * @return {Object}
+	         */
+	        getTimelineOption: function (ecModel) {
+	            var option;
+	            var timelineOptions = this._timelineOptions;
+
+	            if (timelineOptions.length) {
+	                // getTimelineOption can only be called after ecModel inited,
+	                // so we can get currentIndex from timelineModel.
+	                var timelineModel = ecModel.getComponent('timeline');
+	                if (timelineModel) {
+	                    option = clone(
+	                        timelineOptions[timelineModel.getCurrentIndex()],
+	                        true
+	                    );
+	                }
+	            }
+
+	            return option;
+	        },
+
+	        /**
+	         * @param {module:echarts/model/Global} ecModel
+	         * @return {Array.<Object>}
+	         */
+	        getMediaOption: function (ecModel) {
+	            var ecWidth = this._api.getWidth();
+	            var ecHeight = this._api.getHeight();
+	            var mediaList = this._mediaList;
+	            var mediaDefault = this._mediaDefault;
+	            var indices = [];
+	            var result = [];
+
+	            // No media defined.
+	            if (!mediaList.length && !mediaDefault) {
+	                return result;
+	            }
+
+	            // Multi media may be applied, the latter defined media has higher priority.
+	            for (var i = 0, len = mediaList.length; i < len; i++) {
+	                if (applyMediaQuery(mediaList[i].query, ecWidth, ecHeight)) {
+	                    indices.push(i);
+	                }
+	            }
+
+	            // FIXME
+	            // 是否mediaDefault应该强制用户设置，否则可能修改不能回归。
+	            if (!indices.length && mediaDefault) {
+	                indices = [-1];
+	            }
+
+	            if (indices.length && !indicesEquals(indices, this._currentMediaIndices)) {
+	                result = map(indices, function (index) {
+	                    return clone(
+	                        index === -1 ? mediaDefault.option : mediaList[index].option
+	                    );
+	                });
+	            }
+	            // Otherwise return nothing.
+
+	            this._currentMediaIndices = indices;
+
+	            return result;
+	        }
+	    };
+
+	    function parseRawOption(rawOption, optionPreprocessorFuncs, isNew) {
+	        var timelineOptions = [];
+	        var mediaList = [];
+	        var mediaDefault;
+	        var baseOption;
+
+	        // Compatible with ec2.
+	        var timelineOpt = rawOption.timeline;
+
+	        if (rawOption.baseOption) {
+	            baseOption = rawOption.baseOption;
+	        }
+
+	        // For timeline
+	        if (timelineOpt || rawOption.options) {
+	            baseOption = baseOption || {};
+	            timelineOptions = (rawOption.options || []).slice();
+	        }
+
+	        // For media query
+	        if (rawOption.media) {
+	            baseOption = baseOption || {};
+	            var media = rawOption.media;
+	            each(media, function (singleMedia) {
+	                if (singleMedia && singleMedia.option) {
+	                    if (singleMedia.query) {
+	                        mediaList.push(singleMedia);
+	                    }
+	                    else if (!mediaDefault) {
+	                        // Use the first media default.
+	                        mediaDefault = singleMedia;
+	                    }
+	                }
+	            });
+	        }
+
+	        // For normal option
+	        if (!baseOption) {
+	            baseOption = rawOption;
+	        }
+
+	        // Set timelineOpt to baseOption in ec3,
+	        // which is convenient for merge option.
+	        if (!baseOption.timeline) {
+	            baseOption.timeline = timelineOpt;
+	        }
+
+	        // Preprocess.
+	        each([baseOption].concat(timelineOptions)
+	            .concat(zrUtil.map(mediaList, function (media) {
+	                return media.option;
+	            })),
+	            function (option) {
+	                each(optionPreprocessorFuncs, function (preProcess) {
+	                    preProcess(option, isNew);
+	                });
+	            }
+	        );
+
+	        return {
+	            baseOption: baseOption,
+	            timelineOptions: timelineOptions,
+	            mediaDefault: mediaDefault,
+	            mediaList: mediaList
+	        };
+	    }
+
+	    /**
+	     * @see <http://www.w3.org/TR/css3-mediaqueries/#media1>
+	     * Support: width, height, aspectRatio
+	     * Can use max or min as prefix.
+	     */
+	    function applyMediaQuery(query, ecWidth, ecHeight) {
+	        var realMap = {
+	            width: ecWidth,
+	            height: ecHeight,
+	            aspectratio: ecWidth / ecHeight // lowser case for convenientce.
+	        };
+
+	        var applicatable = true;
+
+	        zrUtil.each(query, function (value, attr) {
+	            var matched = attr.match(QUERY_REG);
+
+	            if (!matched || !matched[1] || !matched[2]) {
+	                return;
+	            }
+
+	            var operator = matched[1];
+	            var realAttr = matched[2].toLowerCase();
+
+	            if (!compare(realMap[realAttr], value, operator)) {
+	                applicatable = false;
+	            }
+	        });
+
+	        return applicatable;
+	    }
+
+	    function compare(real, expect, operator) {
+	        if (operator === 'min') {
+	            return real >= expect;
+	        }
+	        else if (operator === 'max') {
+	            return real <= expect;
+	        }
+	        else { // Equals
+	            return real === expect;
+	        }
+	    }
+
+	    function indicesEquals(indices1, indices2) {
+	        // indices is always order by asc and has only finite number.
+	        return indices1.join(',') === indices2.join(',');
+	    }
+
+	    /**
+	     * Consider case:
+	     * `chart.setOption(opt1);`
+	     * Then user do some interaction like dataZoom, dataView changing.
+	     * `chart.setOption(opt2);`
+	     * Then user press 'reset button' in toolbox.
+	     *
+	     * After doing that all of the interaction effects should be reset, the
+	     * chart should be the same as the result of invoke
+	     * `chart.setOption(opt1); chart.setOption(opt2);`.
+	     *
+	     * Although it is not able ensure that
+	     * `chart.setOption(opt1); chart.setOption(opt2);` is equivalents to
+	     * `chart.setOption(merge(opt1, opt2));` exactly,
+	     * this might be the only simple way to implement that feature.
+	     *
+	     * MEMO: We've considered some other approaches:
+	     * 1. Each model handle its self restoration but not uniform treatment.
+	     *     (Too complex in logic and error-prone)
+	     * 2. Use a shadow ecModel. (Performace expensive)
+	     */
+	    function mergeOption(oldOption, newOption) {
+	        newOption = newOption || {};
+
+	        each(newOption, function (newCptOpt, mainType) {
+	            if (newCptOpt == null) {
+	                return;
+	            }
+
+	            var oldCptOpt = oldOption[mainType];
+
+	            if (!ComponentModel.hasClass(mainType)) {
+	                oldOption[mainType] = merge(oldCptOpt, newCptOpt, true);
+	            }
+	            else {
+	                newCptOpt = modelUtil.normalizeToArray(newCptOpt);
+	                oldCptOpt = modelUtil.normalizeToArray(oldCptOpt);
+
+	                var mapResult = modelUtil.mappingToExists(oldCptOpt, newCptOpt);
+
+	                oldOption[mainType] = map(mapResult, function (item) {
+	                    return (item.option && item.exist)
+	                        ? merge(item.exist, item.option, true)
+	                        : (item.exist || item.option);
+	                });
+	            }
+	        });
+	    }
+
+	    module.exports = OptionManager;
+
+
+/***/ },
+/* 28 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var formatUtil = __webpack_require__(6);
+	    var modelUtil = __webpack_require__(5);
+	    var ComponentModel = __webpack_require__(19);
+	    var colorPaletteMixin = __webpack_require__(24);
+	    var env = __webpack_require__(2);
+
+	    var encodeHTML = formatUtil.encodeHTML;
+	    var addCommas = formatUtil.addCommas;
+
+	    var SeriesModel = ComponentModel.extend({
+
+	        type: 'series.__base__',
+
+	        /**
+	         * @readOnly
+	         */
+	        seriesIndex: 0,
+
+	        // coodinateSystem will be injected in the echarts/CoordinateSystem
+	        coordinateSystem: null,
+
+	        /**
+	         * @type {Object}
+	         * @protected
+	         */
+	        defaultOption: null,
+
+	        /**
+	         * Data provided for legend
+	         * @type {Function}
+	         */
+	        // PENDING
+	        legendDataProvider: null,
+
+	        /**
+	         * Access path of color for visual
+	         */
+	        visualColorAccessPath: 'itemStyle.normal.color',
+
+	        init: function (option, parentModel, ecModel, extraOpt) {
+
+	            /**
+	             * @type {number}
+	             * @readOnly
+	             */
+	            this.seriesIndex = this.componentIndex;
+
+	            this.mergeDefaultAndTheme(option, ecModel);
+
+	            /**
+	             * @type {module:echarts/data/List|module:echarts/data/Tree|module:echarts/data/Graph}
+	             * @private
+	             */
+	            this._dataBeforeProcessed = this.getInitialData(option, ecModel);
+
+	            // If we reverse the order (make this._data firstly, and then make
+	            // this._dataBeforeProcessed by cloneShallow), cloneShallow will
+	            // cause this._data.graph.data !== this._data when using
+	            // module:echarts/data/Graph or module:echarts/data/Tree.
+	            // See module:echarts/data/helper/linkList
+	            this._data = this._dataBeforeProcessed.cloneShallow();
+	        },
+
+	        /**
+	         * Util for merge default and theme to option
+	         * @param  {Object} option
+	         * @param  {module:echarts/model/Global} ecModel
+	         */
+	        mergeDefaultAndTheme: function (option, ecModel) {
+	            zrUtil.merge(
+	                option,
+	                ecModel.getTheme().get(this.subType)
+	            );
+	            zrUtil.merge(option, this.getDefaultOption());
+
+	            // Default label emphasis `position` and `show`
+	            // FIXME Set label in mergeOption
+	            modelUtil.defaultEmphasis(option.label, modelUtil.LABEL_OPTIONS);
+
+	            this.fillDataTextStyle(option.data);
+	        },
+
+	        mergeOption: function (newSeriesOption, ecModel) {
+	            newSeriesOption = zrUtil.merge(this.option, newSeriesOption, true);
+	            this.fillDataTextStyle(newSeriesOption.data);
+
+	            var data = this.getInitialData(newSeriesOption, ecModel);
+	            // TODO Merge data?
+	            if (data) {
+	                this._data = data;
+	                this._dataBeforeProcessed = data.cloneShallow();
+	            }
+	        },
+
+	        fillDataTextStyle: function (data) {
+	            // Default data label emphasis `position` and `show`
+	            // FIXME Tree structure data ?
+	            // FIXME Performance ?
+	            if (data) {
+	                for (var i = 0; i < data.length; i++) {
+	                    if (data[i] && data[i].label) {
+	                        modelUtil.defaultEmphasis(data[i].label, modelUtil.LABEL_OPTIONS);
+	                    }
+	                }
+	            }
+	        },
+
+	        /**
+	         * Init a data structure from data related option in series
+	         * Must be overwritten
+	         */
+	        getInitialData: function () {},
+
+	        /**
+	         * @param {string} [dataType]
+	         * @return {module:echarts/data/List}
+	         */
+	        getData: function (dataType) {
+	            return dataType == null ? this._data : this._data.getLinkedData(dataType);
+	        },
+
+	        /**
+	         * @param {module:echarts/data/List} data
+	         */
+	        setData: function (data) {
+	            this._data = data;
+	        },
+
+	        /**
+	         * Get data before processed
+	         * @return {module:echarts/data/List}
+	         */
+	        getRawData: function () {
+	            return this._dataBeforeProcessed;
+	        },
+
+	        /**
+	         * Coord dimension to data dimension.
+	         *
+	         * By default the result is the same as dimensions of series data.
+	         * But in some series data dimensions are different from coord dimensions (i.e.
+	         * candlestick and boxplot). Override this method to handle those cases.
+	         *
+	         * Coord dimension to data dimension can be one-to-many
+	         *
+	         * @param {string} coordDim
+	         * @return {Array.<string>} dimensions on the axis.
+	         */
+	        coordDimToDataDim: function (coordDim) {
+	            return [coordDim];
+	        },
+
+	        /**
+	         * Convert data dimension to coord dimension.
+	         *
+	         * @param {string|number} dataDim
+	         * @return {string}
+	         */
+	        dataDimToCoordDim: function (dataDim) {
+	            return dataDim;
+	        },
+
+	        /**
+	         * Get base axis if has coordinate system and has axis.
+	         * By default use coordSys.getBaseAxis();
+	         * Can be overrided for some chart.
+	         * @return {type} description
+	         */
+	        getBaseAxis: function () {
+	            var coordSys = this.coordinateSystem;
+	            return coordSys && coordSys.getBaseAxis && coordSys.getBaseAxis();
+	        },
+
+	        // FIXME
+	        /**
+	         * Default tooltip formatter
+	         *
+	         * @param {number} dataIndex
+	         * @param {boolean} [multipleSeries=false]
+	         * @param {number} [dataType]
+	         */
+	        formatTooltip: function (dataIndex, multipleSeries, dataType) {
+	            function formatArrayValue(value) {
+	                return zrUtil.map(value, function (val, idx) {
+	                    var dimInfo = data.getDimensionInfo(idx);
+	                    var dimType = dimInfo && dimInfo.type;
+	                    if (dimType === 'ordinal') {
+	                        return val;
+	                    }
+	                    else if (dimType === 'time') {
+	                        return multipleSeries ? '' : formatUtil.formatTime('yyyy/mm/dd hh:mm:ss', val);
+	                    }
+	                    else {
+	                        return addCommas(val);
+	                    }
+	                }).filter(function (val) {
+	                    return !!val;
+	                }).join(', ');
+	            }
+
+	            var data = this._data;
+
+	            var value = this.getRawValue(dataIndex);
+	            var formattedValue = zrUtil.isArray(value)
+	                ? formatArrayValue(value) : addCommas(value);
+	            var name = data.getName(dataIndex);
+	            var color = data.getItemVisual(dataIndex, 'color');
+	            var colorEl = '<span style="display:inline-block;margin-right:5px;'
+	                + 'border-radius:10px;width:9px;height:9px;background-color:' + color + '"></span>';
+
+	            var seriesName = this.name;
+	            // FIXME
+	            if (seriesName === '\0-') {
+	                // Not show '-'
+	                seriesName = '';
+	            }
+	            return !multipleSeries
+	                ? ((seriesName && encodeHTML(seriesName) + '<br />') + colorEl
+	                    + (name
+	                        ? encodeHTML(name) + ' : ' + formattedValue
+	                        : formattedValue)
+	                  )
+	                : (colorEl + encodeHTML(this.name) + ' : ' + formattedValue);
+	        },
+
+	        /**
+	         * @return {boolean}
+	         */
+	        ifEnableAnimation: function () {
+	            if (env.node) {
+	                return false;
+	            }
+
+	            var animationEnabled = this.getShallow('animation');
+	            if (animationEnabled) {
+	                if (this.getData().count() > this.getShallow('animationThreshold')) {
+	                    animationEnabled = false;
+	                }
+	            }
+	            return animationEnabled;
+	        },
+
+	        restoreData: function () {
+	            this._data = this._dataBeforeProcessed.cloneShallow();
+	        },
+
+	        getColorFromPalette: function (name, scope) {
+	            var ecModel = this.ecModel;
+	            // PENDING
+	            var color = colorPaletteMixin.getColorFromPalette.call(this, name, scope);
+	            if (!color) {
+	                color = ecModel.getColorFromPalette(name, scope);
+	            }
+	            return color;
+	        },
+
+	        getAxisTooltipDataIndex: null
+	    });
+
+	    zrUtil.mixin(SeriesModel, modelUtil.dataFormatMixin);
+	    zrUtil.mixin(SeriesModel, colorPaletteMixin);
+
+	    module.exports = SeriesModel;
+
+
+/***/ },
+/* 29 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var Group = __webpack_require__(30);
+	    var componentUtil = __webpack_require__(20);
+	    var clazzUtil = __webpack_require__(13);
+
+	    var Component = function () {
+	        /**
+	         * @type {module:zrender/container/Group}
+	         * @readOnly
+	         */
+	        this.group = new Group();
+
+	        /**
+	         * @type {string}
+	         * @readOnly
+	         */
+	        this.uid = componentUtil.getUID('viewComponent');
+	    };
+
+	    Component.prototype = {
+
+	        constructor: Component,
+
+	        init: function (ecModel, api) {},
+
+	        render: function (componentModel, ecModel, api, payload) {},
+
+	        dispose: function () {}
+	    };
+
+	    var componentProto = Component.prototype;
+	    componentProto.updateView
+	        = componentProto.updateLayout
+	        = componentProto.updateVisual
+	        = function (seriesModel, ecModel, api, payload) {
+	            // Do nothing;
+	        };
+	    // Enable Component.extend.
+	    clazzUtil.enableClassExtend(Component);
+
+	    // Enable capability of registerClass, getClass, hasClass, registerSubTypeDefaulter and so on.
+	    clazzUtil.enableClassManagement(Component, {registerWhenExtend: true});
+
+	    module.exports = Component;
+
+
+/***/ },
+/* 30 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * Group是一个容器，可以插入子节点，Group的变换也会被应用到子节点上
+	 * @module zrender/graphic/Group
+	 * @example
+	 *     var Group = require('zrender/lib/container/Group');
+	 *     var Circle = require('zrender/lib/graphic/shape/Circle');
+	 *     var g = new Group();
+	 *     g.position[0] = 100;
+	 *     g.position[1] = 100;
+	 *     g.add(new Circle({
+	 *         style: {
+	 *             x: 100,
+	 *             y: 100,
+	 *             r: 20,
+	 *         }
+	 *     }));
+	 *     zr.add(g);
+	 */
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var Element = __webpack_require__(31);
+	    var BoundingRect = __webpack_require__(9);
+
+	    /**
+	     * @alias module:zrender/graphic/Group
+	     * @constructor
+	     * @extends module:zrender/mixin/Transformable
+	     * @extends module:zrender/mixin/Eventful
+	     */
+	    var Group = function (opts) {
+
+	        opts = opts || {};
+
+	        Element.call(this, opts);
+
+	        for (var key in opts) {
+	            this[key] = opts[key];
+	        }
+
+	        this._children = [];
+
+	        this.__storage = null;
+
+	        this.__dirty = true;
+	    };
+
+	    Group.prototype = {
+
+	        constructor: Group,
+
+	        isGroup: true,
+
+	        /**
+	         * @type {string}
+	         */
+	        type: 'group',
+
+	        /**
+	         * 所有子孙元素是否响应鼠标事件
+	         * @name module:/zrender/container/Group#silent
+	         * @type {boolean}
+	         * @default false
+	         */
+	        silent: false,
+
+	        /**
+	         * @return {Array.<module:zrender/Element>}
+	         */
+	        children: function () {
+	            return this._children.slice();
+	        },
+
+	        /**
+	         * 获取指定 index 的儿子节点
+	         * @param  {number} idx
+	         * @return {module:zrender/Element}
+	         */
+	        childAt: function (idx) {
+	            return this._children[idx];
+	        },
+
+	        /**
+	         * 获取指定名字的儿子节点
+	         * @param  {string} name
+	         * @return {module:zrender/Element}
+	         */
+	        childOfName: function (name) {
+	            var children = this._children;
+	            for (var i = 0; i < children.length; i++) {
+	                if (children[i].name === name) {
+	                    return children[i];
+	                }
+	             }
+	        },
+
+	        /**
+	         * @return {number}
+	         */
+	        childCount: function () {
+	            return this._children.length;
+	        },
+
+	        /**
+	         * 添加子节点到最后
+	         * @param {module:zrender/Element} child
+	         */
+	        add: function (child) {
+	            if (child && child !== this && child.parent !== this) {
+
+	                this._children.push(child);
+
+	                this._doAdd(child);
+	            }
+
+	            return this;
+	        },
+
+	        /**
+	         * 添加子节点在 nextSibling 之前
+	         * @param {module:zrender/Element} child
+	         * @param {module:zrender/Element} nextSibling
+	         */
+	        addBefore: function (child, nextSibling) {
+	            if (child && child !== this && child.parent !== this
+	                && nextSibling && nextSibling.parent === this) {
+
+	                var children = this._children;
+	                var idx = children.indexOf(nextSibling);
+
+	                if (idx >= 0) {
+	                    children.splice(idx, 0, child);
+	                    this._doAdd(child);
+	                }
+	            }
+
+	            return this;
+	        },
+
+	        _doAdd: function (child) {
+	            if (child.parent) {
+	                child.parent.remove(child);
+	            }
+
+	            child.parent = this;
+
+	            var storage = this.__storage;
+	            var zr = this.__zr;
+	            if (storage && storage !== child.__storage) {
+
+	                storage.addToMap(child);
+
+	                if (child instanceof Group) {
+	                    child.addChildrenToStorage(storage);
+	                }
+	            }
+
+	            zr && zr.refresh();
+	        },
+
+	        /**
+	         * 移除子节点
+	         * @param {module:zrender/Element} child
+	         */
+	        remove: function (child) {
+	            var zr = this.__zr;
+	            var storage = this.__storage;
+	            var children = this._children;
+
+	            var idx = zrUtil.indexOf(children, child);
+	            if (idx < 0) {
+	                return this;
+	            }
+	            children.splice(idx, 1);
+
+	            child.parent = null;
+
+	            if (storage) {
+
+	                storage.delFromMap(child.id);
+
+	                if (child instanceof Group) {
+	                    child.delChildrenFromStorage(storage);
+	                }
+	            }
+
+	            zr && zr.refresh();
+
+	            return this;
+	        },
+
+	        /**
+	         * 移除所有子节点
+	         */
+	        removeAll: function () {
+	            var children = this._children;
+	            var storage = this.__storage;
+	            var child;
+	            var i;
+	            for (i = 0; i < children.length; i++) {
+	                child = children[i];
+	                if (storage) {
+	                    storage.delFromMap(child.id);
+	                    if (child instanceof Group) {
+	                        child.delChildrenFromStorage(storage);
+	                    }
+	                }
+	                child.parent = null;
+	            }
+	            children.length = 0;
+
+	            return this;
+	        },
+
+	        /**
+	         * 遍历所有子节点
+	         * @param  {Function} cb
+	         * @param  {}   context
+	         */
+	        eachChild: function (cb, context) {
+	            var children = this._children;
+	            for (var i = 0; i < children.length; i++) {
+	                var child = children[i];
+	                cb.call(context, child, i);
+	            }
+	            return this;
+	        },
+
+	        /**
+	         * 深度优先遍历所有子孙节点
+	         * @param  {Function} cb
+	         * @param  {}   context
+	         */
+	        traverse: function (cb, context) {
+	            for (var i = 0; i < this._children.length; i++) {
+	                var child = this._children[i];
+	                cb.call(context, child);
+
+	                if (child.type === 'group') {
+	                    child.traverse(cb, context);
+	                }
+	            }
+	            return this;
+	        },
+
+	        addChildrenToStorage: function (storage) {
+	            for (var i = 0; i < this._children.length; i++) {
+	                var child = this._children[i];
+	                storage.addToMap(child);
+	                if (child instanceof Group) {
+	                    child.addChildrenToStorage(storage);
+	                }
+	            }
+	        },
+
+	        delChildrenFromStorage: function (storage) {
+	            for (var i = 0; i < this._children.length; i++) {
+	                var child = this._children[i];
+	                storage.delFromMap(child.id);
+	                if (child instanceof Group) {
+	                    child.delChildrenFromStorage(storage);
+	                }
+	            }
+	        },
+
+	        dirty: function () {
+	            this.__dirty = true;
+	            this.__zr && this.__zr.refresh();
+	            return this;
+	        },
+
+	        /**
+	         * @return {module:zrender/core/BoundingRect}
+	         */
+	        getBoundingRect: function (includeChildren) {
+	            // TODO Caching
+	            // TODO Transform
+	            var rect = null;
+	            var tmpRect = new BoundingRect(0, 0, 0, 0);
+	            var children = includeChildren || this._children;
+	            var tmpMat = [];
+
+	            for (var i = 0; i < children.length; i++) {
+	                var child = children[i];
+	                if (child.ignore || child.invisible) {
+	                    continue;
+	                }
+
+	                var childRect = child.getBoundingRect();
+	                var transform = child.getLocalTransform(tmpMat);
+	                if (transform) {
+	                    tmpRect.copy(childRect);
+	                    tmpRect.applyTransform(transform);
+	                    rect = rect || tmpRect.clone();
+	                    rect.union(tmpRect);
+	                }
+	                else {
+	                    rect = rect || childRect.clone();
+	                    rect.union(childRect);
+	                }
+	            }
+	            return rect || tmpRect;
+	        }
+	    };
+
+	    zrUtil.inherits(Group, Element);
+
+	    module.exports = Group;
+
+
+/***/ },
+/* 31 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+	/**
+	 * @module zrender/Element
+	 */
+
+
+	    var guid = __webpack_require__(32);
+	    var Eventful = __webpack_require__(33);
+	    var Transformable = __webpack_require__(34);
+	    var Animatable = __webpack_require__(35);
+	    var zrUtil = __webpack_require__(4);
+
+	    /**
+	     * @alias module:zrender/Element
+	     * @constructor
+	     * @extends {module:zrender/mixin/Animatable}
+	     * @extends {module:zrender/mixin/Transformable}
+	     * @extends {module:zrender/mixin/Eventful}
+	     */
+	    var Element = function (opts) {
+
+	        Transformable.call(this, opts);
+	        Eventful.call(this, opts);
+	        Animatable.call(this, opts);
+
+	        /**
+	         * 画布元素ID
+	         * @type {string}
+	         */
+	        this.id = opts.id || guid();
+	    };
+
+	    Element.prototype = {
+
+	        /**
+	         * 元素类型
+	         * Element type
+	         * @type {string}
+	         */
+	        type: 'element',
+
+	        /**
+	         * 元素名字
+	         * Element name
+	         * @type {string}
+	         */
+	        name: '',
+
+	        /**
+	         * ZRender 实例对象，会在 element 添加到 zrender 实例中后自动赋值
+	         * ZRender instance will be assigned when element is associated with zrender
+	         * @name module:/zrender/Element#__zr
+	         * @type {module:zrender/ZRender}
+	         */
+	        __zr: null,
+
+	        /**
+	         * 图形是否忽略，为true时忽略图形的绘制以及事件触发
+	         * If ignore drawing and events of the element object
+	         * @name module:/zrender/Element#ignore
+	         * @type {boolean}
+	         * @default false
+	         */
+	        ignore: false,
+
+	        /**
+	         * 用于裁剪的路径(shape)，所有 Group 内的路径在绘制时都会被这个路径裁剪
+	         * 该路径会继承被裁减对象的变换
+	         * @type {module:zrender/graphic/Path}
+	         * @see http://www.w3.org/TR/2dcontext/#clipping-region
+	         * @readOnly
+	         */
+	        clipPath: null,
+
+	        /**
+	         * Drift element
+	         * @param  {number} dx dx on the global space
+	         * @param  {number} dy dy on the global space
+	         */
+	        drift: function (dx, dy) {
+	            switch (this.draggable) {
+	                case 'horizontal':
+	                    dy = 0;
+	                    break;
+	                case 'vertical':
+	                    dx = 0;
+	                    break;
+	            }
+
+	            var m = this.transform;
+	            if (!m) {
+	                m = this.transform = [1, 0, 0, 1, 0, 0];
+	            }
+	            m[4] += dx;
+	            m[5] += dy;
+
+	            this.decomposeTransform();
+	            this.dirty(false);
+	        },
+
+	        /**
+	         * Hook before update
+	         */
+	        beforeUpdate: function () {},
+	        /**
+	         * Hook after update
+	         */
+	        afterUpdate: function () {},
+	        /**
+	         * Update each frame
+	         */
+	        update: function () {
+	            this.updateTransform();
+	        },
+
+	        /**
+	         * @param  {Function} cb
+	         * @param  {}   context
+	         */
+	        traverse: function (cb, context) {},
+
+	        /**
+	         * @protected
+	         */
+	        attrKV: function (key, value) {
+	            if (key === 'position' || key === 'scale' || key === 'origin') {
+	                // Copy the array
+	                if (value) {
+	                    var target = this[key];
+	                    if (!target) {
+	                        target = this[key] = [];
+	                    }
+	                    target[0] = value[0];
+	                    target[1] = value[1];
+	                }
+	            }
+	            else {
+	                this[key] = value;
+	            }
+	        },
+
+	        /**
+	         * Hide the element
+	         */
+	        hide: function () {
+	            this.ignore = true;
+	            this.__zr && this.__zr.refresh();
+	        },
+
+	        /**
+	         * Show the element
+	         */
+	        show: function () {
+	            this.ignore = false;
+	            this.__zr && this.__zr.refresh();
+	        },
+
+	        /**
+	         * @param {string|Object} key
+	         * @param {*} value
+	         */
+	        attr: function (key, value) {
+	            if (typeof key === 'string') {
+	                this.attrKV(key, value);
+	            }
+	            else if (zrUtil.isObject(key)) {
+	                for (var name in key) {
+	                    if (key.hasOwnProperty(name)) {
+	                        this.attrKV(name, key[name]);
+	                    }
+	                }
+	            }
+
+	            this.dirty(false);
+
+	            return this;
+	        },
+
+	        /**
+	         * @param {module:zrender/graphic/Path} clipPath
+	         */
+	        setClipPath: function (clipPath) {
+	            var zr = this.__zr;
+	            if (zr) {
+	                clipPath.addSelfToZr(zr);
+	            }
+
+	            // Remove previous clip path
+	            if (this.clipPath && this.clipPath !== clipPath) {
+	                this.removeClipPath();
+	            }
+
+	            this.clipPath = clipPath;
+	            clipPath.__zr = zr;
+	            clipPath.__clipTarget = this;
+
+	            this.dirty(false);
+	        },
+
+	        /**
+	         */
+	        removeClipPath: function () {
+	            var clipPath = this.clipPath;
+	            if (clipPath) {
+	                if (clipPath.__zr) {
+	                    clipPath.removeSelfFromZr(clipPath.__zr);
+	                }
+
+	                clipPath.__zr = null;
+	                clipPath.__clipTarget = null;
+	                this.clipPath = null;
+
+	                this.dirty(false);
+	            }
+	        },
+
+	        /**
+	         * Add self from zrender instance.
+	         * Not recursively because it will be invoked when element added to storage.
+	         * @param {module:zrender/ZRender} zr
+	         */
+	        addSelfToZr: function (zr) {
+	            this.__zr = zr;
+	            // 添加动画
+	            var animators = this.animators;
+	            if (animators) {
+	                for (var i = 0; i < animators.length; i++) {
+	                    zr.animation.addAnimator(animators[i]);
+	                }
+	            }
+
+	            if (this.clipPath) {
+	                this.clipPath.addSelfToZr(zr);
+	            }
+	        },
+
+	        /**
+	         * Remove self from zrender instance.
+	         * Not recursively because it will be invoked when element added to storage.
+	         * @param {module:zrender/ZRender} zr
+	         */
+	        removeSelfFromZr: function (zr) {
+	            this.__zr = null;
+	            // 移除动画
+	            var animators = this.animators;
+	            if (animators) {
+	                for (var i = 0; i < animators.length; i++) {
+	                    zr.animation.removeAnimator(animators[i]);
+	                }
+	            }
+
+	            if (this.clipPath) {
+	                this.clipPath.removeSelfFromZr(zr);
+	            }
+	        }
+	    };
+
+	    zrUtil.mixin(Element, Animatable);
+	    zrUtil.mixin(Element, Transformable);
+	    zrUtil.mixin(Element, Eventful);
+
+	    module.exports = Element;
+
+
+/***/ },
+/* 32 */
+/***/ function(module, exports) {
+
+	/**
+	 * zrender: 生成唯一id
+	 *
+	 * @author errorrik (errorrik@gmail.com)
+	 */
+
+
+	    var idStart = 0x0907;
+
+	    module.exports = function () {
+	        return idStart++;
+	    };
+
+
+
+/***/ },
+/* 33 */
+/***/ function(module, exports) {
+
+	/**
+	 * 事件扩展
+	 * @module zrender/mixin/Eventful
+	 * @author Kener (@Kener-林峰, kener.linfeng@gmail.com)
+	 *         pissang (https://www.github.com/pissang)
+	 */
+
+
+	    var arrySlice = Array.prototype.slice;
+
+	    /**
+	     * 事件分发器
+	     * @alias module:zrender/mixin/Eventful
+	     * @constructor
+	     */
+	    var Eventful = function () {
+	        this._$handlers = {};
+	    };
+
+	    Eventful.prototype = {
+
+	        constructor: Eventful,
+
+	        /**
+	         * 单次触发绑定，trigger后销毁
+	         *
+	         * @param {string} event 事件名
+	         * @param {Function} handler 响应函数
+	         * @param {Object} context
+	         */
+	        one: function (event, handler, context) {
+	            var _h = this._$handlers;
+
+	            if (!handler || !event) {
+	                return this;
+	            }
+
+	            if (!_h[event]) {
+	                _h[event] = [];
+	            }
+
+	            for (var i = 0; i < _h[event].length; i++) {
+	                if (_h[event][i].h === handler) {
+	                    return this;
+	                }
+	            }
+
+	            _h[event].push({
+	                h: handler,
+	                one: true,
+	                ctx: context || this
+	            });
+
+	            return this;
+	        },
+
+	        /**
+	         * 绑定事件
+	         * @param {string} event 事件名
+	         * @param {Function} handler 事件处理函数
+	         * @param {Object} [context]
+	         */
+	        on: function (event, handler, context) {
+	            var _h = this._$handlers;
+
+	            if (!handler || !event) {
+	                return this;
+	            }
+
+	            if (!_h[event]) {
+	                _h[event] = [];
+	            }
+
+	            for (var i = 0; i < _h[event].length; i++) {
+	                if (_h[event][i].h === handler) {
+	                    return this;
+	                }
+	            }
+
+	            _h[event].push({
+	                h: handler,
+	                one: false,
+	                ctx: context || this
+	            });
+
+	            return this;
+	        },
+
+	        /**
+	         * 是否绑定了事件
+	         * @param  {string}  event
+	         * @return {boolean}
+	         */
+	        isSilent: function (event) {
+	            var _h = this._$handlers;
+	            return _h[event] && _h[event].length;
+	        },
+
+	        /**
+	         * 解绑事件
+	         * @param {string} event 事件名
+	         * @param {Function} [handler] 事件处理函数
+	         */
+	        off: function (event, handler) {
+	            var _h = this._$handlers;
+
+	            if (!event) {
+	                this._$handlers = {};
+	                return this;
+	            }
+
+	            if (handler) {
+	                if (_h[event]) {
+	                    var newList = [];
+	                    for (var i = 0, l = _h[event].length; i < l; i++) {
+	                        if (_h[event][i]['h'] != handler) {
+	                            newList.push(_h[event][i]);
+	                        }
+	                    }
+	                    _h[event] = newList;
+	                }
+
+	                if (_h[event] && _h[event].length === 0) {
+	                    delete _h[event];
+	                }
+	            }
+	            else {
+	                delete _h[event];
+	            }
+
+	            return this;
+	        },
+
+	        /**
+	         * 事件分发
+	         *
+	         * @param {string} type 事件类型
+	         */
+	        trigger: function (type) {
+	            if (this._$handlers[type]) {
+	                var args = arguments;
+	                var argLen = args.length;
+
+	                if (argLen > 3) {
+	                    args = arrySlice.call(args, 1);
+	                }
+
+	                var _h = this._$handlers[type];
+	                var len = _h.length;
+	                for (var i = 0; i < len;) {
+	                    // Optimize advise from backbone
+	                    switch (argLen) {
+	                        case 1:
+	                            _h[i]['h'].call(_h[i]['ctx']);
+	                            break;
+	                        case 2:
+	                            _h[i]['h'].call(_h[i]['ctx'], args[1]);
+	                            break;
+	                        case 3:
+	                            _h[i]['h'].call(_h[i]['ctx'], args[1], args[2]);
+	                            break;
+	                        default:
+	                            // have more than 2 given arguments
+	                            _h[i]['h'].apply(_h[i]['ctx'], args);
+	                            break;
+	                    }
+
+	                    if (_h[i]['one']) {
+	                        _h.splice(i, 1);
+	                        len--;
+	                    }
+	                    else {
+	                        i++;
+	                    }
+	                }
+	            }
+
+	            return this;
+	        },
+
+	        /**
+	         * 带有context的事件分发, 最后一个参数是事件回调的context
+	         * @param {string} type 事件类型
+	         */
+	        triggerWithContext: function (type) {
+	            if (this._$handlers[type]) {
+	                var args = arguments;
+	                var argLen = args.length;
+
+	                if (argLen > 4) {
+	                    args = arrySlice.call(args, 1, args.length - 1);
+	                }
+	                var ctx = args[args.length - 1];
+
+	                var _h = this._$handlers[type];
+	                var len = _h.length;
+	                for (var i = 0; i < len;) {
+	                    // Optimize advise from backbone
+	                    switch (argLen) {
+	                        case 1:
+	                            _h[i]['h'].call(ctx);
+	                            break;
+	                        case 2:
+	                            _h[i]['h'].call(ctx, args[1]);
+	                            break;
+	                        case 3:
+	                            _h[i]['h'].call(ctx, args[1], args[2]);
+	                            break;
+	                        default:
+	                            // have more than 2 given arguments
+	                            _h[i]['h'].apply(ctx, args);
+	                            break;
+	                    }
+
+	                    if (_h[i]['one']) {
+	                        _h.splice(i, 1);
+	                        len--;
+	                    }
+	                    else {
+	                        i++;
+	                    }
+	                }
+	            }
+
+	            return this;
+	        }
+	    };
+
+	    // 对象可以通过 onxxxx 绑定事件
+	    /**
+	     * @event module:zrender/mixin/Eventful#onclick
+	     * @type {Function}
+	     * @default null
+	     */
+	    /**
+	     * @event module:zrender/mixin/Eventful#onmouseover
+	     * @type {Function}
+	     * @default null
+	     */
+	    /**
+	     * @event module:zrender/mixin/Eventful#onmouseout
+	     * @type {Function}
+	     * @default null
+	     */
+	    /**
+	     * @event module:zrender/mixin/Eventful#onmousemove
+	     * @type {Function}
+	     * @default null
+	     */
+	    /**
+	     * @event module:zrender/mixin/Eventful#onmousewheel
+	     * @type {Function}
+	     * @default null
+	     */
+	    /**
+	     * @event module:zrender/mixin/Eventful#onmousedown
+	     * @type {Function}
+	     * @default null
+	     */
+	    /**
+	     * @event module:zrender/mixin/Eventful#onmouseup
+	     * @type {Function}
+	     * @default null
+	     */
+	    /**
+	     * @event module:zrender/mixin/Eventful#ondragstart
+	     * @type {Function}
+	     * @default null
+	     */
+	    /**
+	     * @event module:zrender/mixin/Eventful#ondragend
+	     * @type {Function}
+	     * @default null
+	     */
+	    /**
+	     * @event module:zrender/mixin/Eventful#ondragenter
+	     * @type {Function}
+	     * @default null
+	     */
+	    /**
+	     * @event module:zrender/mixin/Eventful#ondragleave
+	     * @type {Function}
+	     * @default null
+	     */
+	    /**
+	     * @event module:zrender/mixin/Eventful#ondragover
+	     * @type {Function}
+	     * @default null
+	     */
+	    /**
+	     * @event module:zrender/mixin/Eventful#ondrop
+	     * @type {Function}
+	     * @default null
+	     */
+
+	    module.exports = Eventful;
+
+
+
+/***/ },
+/* 34 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+	/**
+	 * 提供变换扩展
+	 * @module zrender/mixin/Transformable
+	 * @author pissang (https://www.github.com/pissang)
+	 */
+
+
+	    var matrix = __webpack_require__(11);
+	    var vector = __webpack_require__(10);
+	    var mIdentity = matrix.identity;
+
+	    var EPSILON = 5e-5;
+
+	    function isNotAroundZero(val) {
+	        return val > EPSILON || val < -EPSILON;
+	    }
+
+	    /**
+	     * @alias module:zrender/mixin/Transformable
+	     * @constructor
+	     */
+	    var Transformable = function (opts) {
+	        opts = opts || {};
+	        // If there are no given position, rotation, scale
+	        if (!opts.position) {
+	            /**
+	             * 平移
+	             * @type {Array.<number>}
+	             * @default [0, 0]
+	             */
+	            this.position = [0, 0];
+	        }
+	        if (opts.rotation == null) {
+	            /**
+	             * 旋转
+	             * @type {Array.<number>}
+	             * @default 0
+	             */
+	            this.rotation = 0;
+	        }
+	        if (!opts.scale) {
+	            /**
+	             * 缩放
+	             * @type {Array.<number>}
+	             * @default [1, 1]
+	             */
+	            this.scale = [1, 1];
+	        }
+	        /**
+	         * 旋转和缩放的原点
+	         * @type {Array.<number>}
+	         * @default null
+	         */
+	        this.origin = this.origin || null;
+	    };
+
+	    var transformableProto = Transformable.prototype;
+	    transformableProto.transform = null;
+
+	    /**
+	     * 判断是否需要有坐标变换
+	     * 如果有坐标变换, 则从position, rotation, scale以及父节点的transform计算出自身的transform矩阵
+	     */
+	    transformableProto.needLocalTransform = function () {
+	        return isNotAroundZero(this.rotation)
+	            || isNotAroundZero(this.position[0])
+	            || isNotAroundZero(this.position[1])
+	            || isNotAroundZero(this.scale[0] - 1)
+	            || isNotAroundZero(this.scale[1] - 1);
+	    };
+
+	    transformableProto.updateTransform = function () {
+	        var parent = this.parent;
+	        var parentHasTransform = parent && parent.transform;
+	        var needLocalTransform = this.needLocalTransform();
+
+	        var m = this.transform;
+	        if (!(needLocalTransform || parentHasTransform)) {
+	            m && mIdentity(m);
+	            return;
+	        }
+
+	        m = m || matrix.create();
+
+	        if (needLocalTransform) {
+	            this.getLocalTransform(m);
+	        }
+	        else {
+	            mIdentity(m);
+	        }
+
+	        // 应用父节点变换
+	        if (parentHasTransform) {
+	            if (needLocalTransform) {
+	                matrix.mul(m, parent.transform, m);
+	            }
+	            else {
+	                matrix.copy(m, parent.transform);
+	            }
+	        }
+	        // 保存这个变换矩阵
+	        this.transform = m;
+
+	        this.invTransform = this.invTransform || matrix.create();
+	        matrix.invert(this.invTransform, m);
+	    };
+
+	    transformableProto.getLocalTransform = function (m) {
+	        m = m || [];
+	        mIdentity(m);
+
+	        var origin = this.origin;
+
+	        var scale = this.scale;
+	        var rotation = this.rotation;
+	        var position = this.position;
+	        if (origin) {
+	            // Translate to origin
+	            m[4] -= origin[0];
+	            m[5] -= origin[1];
+	        }
+	        matrix.scale(m, m, scale);
+	        if (rotation) {
+	            matrix.rotate(m, m, rotation);
+	        }
+	        if (origin) {
+	            // Translate back from origin
+	            m[4] += origin[0];
+	            m[5] += origin[1];
+	        }
+
+	        m[4] += position[0];
+	        m[5] += position[1];
+
+	        return m;
+	    };
+	    /**
+	     * 将自己的transform应用到context上
+	     * @param {Context2D} ctx
+	     */
+	    transformableProto.setTransform = function (ctx) {
+	        var m = this.transform;
+	        if (m) {
+	            ctx.transform(m[0], m[1], m[2], m[3], m[4], m[5]);
+	        }
+	    };
+
+	    transformableProto.restoreTransform = function (ctx) {
+	        var m = this.invTransform;
+	        if (m) {
+	            ctx.transform(m[0], m[1], m[2], m[3], m[4], m[5]);
+	        }
+	    }
+
+	    var tmpTransform = [];
+
+	    /**
+	     * 分解`transform`矩阵到`position`, `rotation`, `scale`
+	     */
+	    transformableProto.decomposeTransform = function () {
+	        if (!this.transform) {
+	            return;
+	        }
+	        var parent = this.parent;
+	        var m = this.transform;
+	        if (parent && parent.transform) {
+	            // Get local transform and decompose them to position, scale, rotation
+	            matrix.mul(tmpTransform, parent.invTransform, m);
+	            m = tmpTransform;
+	        }
+	        var sx = m[0] * m[0] + m[1] * m[1];
+	        var sy = m[2] * m[2] + m[3] * m[3];
+	        var position = this.position;
+	        var scale = this.scale;
+	        if (isNotAroundZero(sx - 1)) {
+	            sx = Math.sqrt(sx);
+	        }
+	        if (isNotAroundZero(sy - 1)) {
+	            sy = Math.sqrt(sy);
+	        }
+	        if (m[0] < 0) {
+	            sx = -sx;
+	        }
+	        if (m[3] < 0) {
+	            sy = -sy;
+	        }
+	        position[0] = m[4];
+	        position[1] = m[5];
+	        scale[0] = sx;
+	        scale[1] = sy;
+	        this.rotation = Math.atan2(-m[1] / sy, m[0] / sx);
+	    };
+
+	    /**
+	     * Get global scale
+	     * @return {Array.<number>}
+	     */
+	    transformableProto.getGlobalScale = function () {
+	        var m = this.transform;
+	        if (!m) {
+	            return [1, 1];
+	        }
+	        var sx = Math.sqrt(m[0] * m[0] + m[1] * m[1]);
+	        var sy = Math.sqrt(m[2] * m[2] + m[3] * m[3]);
+	        if (m[0] < 0) {
+	            sx = -sx;
+	        }
+	        if (m[3] < 0) {
+	            sy = -sy;
+	        }
+	        return [sx, sy];
+	    };
+	    /**
+	     * 变换坐标位置到 shape 的局部坐标空间
+	     * @method
+	     * @param {number} x
+	     * @param {number} y
+	     * @return {Array.<number>}
+	     */
+	    transformableProto.transformCoordToLocal = function (x, y) {
+	        var v2 = [x, y];
+	        var invTransform = this.invTransform;
+	        if (invTransform) {
+	            vector.applyTransform(v2, v2, invTransform);
+	        }
+	        return v2;
+	    };
+
+	    /**
+	     * 变换局部坐标位置到全局坐标空间
+	     * @method
+	     * @param {number} x
+	     * @param {number} y
+	     * @return {Array.<number>}
+	     */
+	    transformableProto.transformCoordToGlobal = function (x, y) {
+	        var v2 = [x, y];
+	        var transform = this.transform;
+	        if (transform) {
+	            vector.applyTransform(v2, v2, transform);
+	        }
+	        return v2;
+	    };
+
+	    module.exports = Transformable;
+
+
+
+/***/ },
+/* 35 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+	/**
+	 * @module zrender/mixin/Animatable
+	 */
+
+
+	    var Animator = __webpack_require__(36);
+	    var util = __webpack_require__(4);
+	    var isString = util.isString;
+	    var isFunction = util.isFunction;
+	    var isObject = util.isObject;
+	    var log = __webpack_require__(40);
+
+	    /**
+	     * @alias modue:zrender/mixin/Animatable
+	     * @constructor
+	     */
+	    var Animatable = function () {
+
+	        /**
+	         * @type {Array.<module:zrender/animation/Animator>}
+	         * @readOnly
+	         */
+	        this.animators = [];
+	    };
+
+	    Animatable.prototype = {
+
+	        constructor: Animatable,
+
+	        /**
+	         * 动画
+	         *
+	         * @param {string} path 需要添加动画的属性获取路径，可以通过a.b.c来获取深层的属性
+	         * @param {boolean} [loop] 动画是否循环
+	         * @return {module:zrender/animation/Animator}
+	         * @example:
+	         *     el.animate('style', false)
+	         *         .when(1000, {x: 10} )
+	         *         .done(function(){ // Animation done })
+	         *         .start()
+	         */
+	        animate: function (path, loop) {
+	            var target;
+	            var animatingShape = false;
+	            var el = this;
+	            var zr = this.__zr;
+	            if (path) {
+	                var pathSplitted = path.split('.');
+	                var prop = el;
+	                // If animating shape
+	                animatingShape = pathSplitted[0] === 'shape';
+	                for (var i = 0, l = pathSplitted.length; i < l; i++) {
+	                    if (!prop) {
+	                        continue;
+	                    }
+	                    prop = prop[pathSplitted[i]];
+	                }
+	                if (prop) {
+	                    target = prop;
+	                }
+	            }
+	            else {
+	                target = el;
+	            }
+
+	            if (!target) {
+	                log(
+	                    'Property "'
+	                    + path
+	                    + '" is not existed in element '
+	                    + el.id
+	                );
+	                return;
+	            }
+
+	            var animators = el.animators;
+
+	            var animator = new Animator(target, loop);
+
+	            animator.during(function (target) {
+	                el.dirty(animatingShape);
+	            })
+	            .done(function () {
+	                // FIXME Animator will not be removed if use `Animator#stop` to stop animation
+	                animators.splice(util.indexOf(animators, animator), 1);
+	            });
+
+	            animators.push(animator);
+
+	            // If animate after added to the zrender
+	            if (zr) {
+	                zr.animation.addAnimator(animator);
+	            }
+
+	            return animator;
+	        },
+
+	        /**
+	         * 停止动画
+	         * @param {boolean} forwardToLast If move to last frame before stop
+	         */
+	        stopAnimation: function (forwardToLast) {
+	            var animators = this.animators;
+	            var len = animators.length;
+	            for (var i = 0; i < len; i++) {
+	                animators[i].stop(forwardToLast);
+	            }
+	            animators.length = 0;
+
+	            return this;
+	        },
+
+	        /**
+	         * @param {Object} target
+	         * @param {number} [time=500] Time in ms
+	         * @param {string} [easing='linear']
+	         * @param {number} [delay=0]
+	         * @param {Function} [callback]
+	         *
+	         * @example
+	         *  // Animate position
+	         *  el.animateTo({
+	         *      position: [10, 10]
+	         *  }, function () { // done })
+	         *
+	         *  // Animate shape, style and position in 100ms, delayed 100ms, with cubicOut easing
+	         *  el.animateTo({
+	         *      shape: {
+	         *          width: 500
+	         *      },
+	         *      style: {
+	         *          fill: 'red'
+	         *      }
+	         *      position: [10, 10]
+	         *  }, 100, 100, 'cubicOut', function () { // done })
+	         */
+	         // TODO Return animation key
+	        animateTo: function (target, time, delay, easing, callback) {
+	            // animateTo(target, time, easing, callback);
+	            if (isString(delay)) {
+	                callback = easing;
+	                easing = delay;
+	                delay = 0;
+	            }
+	            // animateTo(target, time, delay, callback);
+	            else if (isFunction(easing)) {
+	                callback = easing;
+	                easing = 'linear';
+	                delay = 0;
+	            }
+	            // animateTo(target, time, callback);
+	            else if (isFunction(delay)) {
+	                callback = delay;
+	                delay = 0;
+	            }
+	            // animateTo(target, callback)
+	            else if (isFunction(time)) {
+	                callback = time;
+	                time = 500;
+	            }
+	            // animateTo(target)
+	            else if (!time) {
+	                time = 500;
+	            }
+	            // Stop all previous animations
+	            this.stopAnimation();
+	            this._animateToShallow('', this, target, time, delay, easing, callback);
+
+	            // Animators may be removed immediately after start
+	            // if there is nothing to animate
+	            var animators = this.animators.slice();
+	            var count = animators.length;
+	            function done() {
+	                count--;
+	                if (!count) {
+	                    callback && callback();
+	                }
+	            }
+
+	            // No animators. This should be checked before animators[i].start(),
+	            // because 'done' may be executed immediately if no need to animate.
+	            if (!count) {
+	                callback && callback();
+	            }
+	            // Start after all animators created
+	            // Incase any animator is done immediately when all animation properties are not changed
+	            for (var i = 0; i < animators.length; i++) {
+	                animators[i]
+	                    .done(done)
+	                    .start(easing);
+	            }
+	        },
+
+	        /**
+	         * @private
+	         * @param {string} path=''
+	         * @param {Object} source=this
+	         * @param {Object} target
+	         * @param {number} [time=500]
+	         * @param {number} [delay=0]
+	         *
+	         * @example
+	         *  // Animate position
+	         *  el._animateToShallow({
+	         *      position: [10, 10]
+	         *  })
+	         *
+	         *  // Animate shape, style and position in 100ms, delayed 100ms
+	         *  el._animateToShallow({
+	         *      shape: {
+	         *          width: 500
+	         *      },
+	         *      style: {
+	         *          fill: 'red'
+	         *      }
+	         *      position: [10, 10]
+	         *  }, 100, 100)
+	         */
+	        _animateToShallow: function (path, source, target, time, delay) {
+	            var objShallow = {};
+	            var propertyCount = 0;
+	            for (var name in target) {
+	                if (source[name] != null) {
+	                    if (isObject(target[name]) && !util.isArrayLike(target[name])) {
+	                        this._animateToShallow(
+	                            path ? path + '.' + name : name,
+	                            source[name],
+	                            target[name],
+	                            time,
+	                            delay
+	                        );
+	                    }
+	                    else {
+	                        objShallow[name] = target[name];
+	                        propertyCount++;
+	                    }
+	                }
+	                else if (target[name] != null) {
+	                    // Attr directly if not has property
+	                    // FIXME, if some property not needed for element ?
+	                    if (!path) {
+	                        this.attr(name, target[name]);
+	                    }
+	                    else {  // Shape or style
+	                        var props = {};
+	                        props[path] = {};
+	                        props[path][name] = target[name];
+	                        this.attr(props);
+	                    }
+	                }
+	            }
+
+	            if (propertyCount > 0) {
+	                this.animate(path, false)
+	                    .when(time == null ? 500 : time, objShallow)
+	                    .delay(delay || 0);
+	            }
+
+	            return this;
+	        }
+	    };
+
+	    module.exports = Animatable;
+
+
+/***/ },
+/* 36 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @module echarts/animation/Animator
+	 */
+
+
+	    var Clip = __webpack_require__(37);
+	    var color = __webpack_require__(39);
+	    var util = __webpack_require__(4);
+	    var isArrayLike = util.isArrayLike;
+
+	    var arraySlice = Array.prototype.slice;
+
+	    function defaultGetter(target, key) {
+	        return target[key];
+	    }
+
+	    function defaultSetter(target, key, value) {
+	        target[key] = value;
+	    }
+
+	    /**
+	     * @param  {number} p0
+	     * @param  {number} p1
+	     * @param  {number} percent
+	     * @return {number}
+	     */
+	    function interpolateNumber(p0, p1, percent) {
+	        return (p1 - p0) * percent + p0;
+	    }
+
+	    /**
+	     * @param  {string} p0
+	     * @param  {string} p1
+	     * @param  {number} percent
+	     * @return {string}
+	     */
+	    function interpolateString(p0, p1, percent) {
+	        return percent > 0.5 ? p1 : p0;
+	    }
+
+	    /**
+	     * @param  {Array} p0
+	     * @param  {Array} p1
+	     * @param  {number} percent
+	     * @param  {Array} out
+	     * @param  {number} arrDim
+	     */
+	    function interpolateArray(p0, p1, percent, out, arrDim) {
+	        var len = p0.length;
+	        if (arrDim == 1) {
+	            for (var i = 0; i < len; i++) {
+	                out[i] = interpolateNumber(p0[i], p1[i], percent);
+	            }
+	        }
+	        else {
+	            var len2 = p0[0].length;
+	            for (var i = 0; i < len; i++) {
+	                for (var j = 0; j < len2; j++) {
+	                    out[i][j] = interpolateNumber(
+	                        p0[i][j], p1[i][j], percent
+	                    );
+	                }
+	            }
+	        }
+	    }
+
+	    // arr0 is source array, arr1 is target array.
+	    // Do some preprocess to avoid error happened when interpolating from arr0 to arr1
+	    function fillArr(arr0, arr1, arrDim) {
+	        var arr0Len = arr0.length;
+	        var arr1Len = arr1.length;
+	        if (arr0Len !== arr1Len) {
+	            // FIXME Not work for TypedArray
+	            var isPreviousLarger = arr0Len > arr1Len;
+	            if (isPreviousLarger) {
+	                // Cut the previous
+	                arr0.length = arr1Len;
+	            }
+	            else {
+	                // Fill the previous
+	                for (var i = arr0Len; i < arr1Len; i++) {
+	                    arr0.push(
+	                        arrDim === 1 ? arr1[i] : arraySlice.call(arr1[i])
+	                    );
+	                }
+	            }
+	        }
+	        // Handling NaN value
+	        var len2 = arr0[0] && arr0[0].length;
+	        for (var i = 0; i < arr0.length; i++) {
+	            if (arrDim === 1) {
+	                if (isNaN(arr0[i])) {
+	                    arr0[i] = arr1[i];
+	                }
+	            }
+	            else {
+	                for (var j = 0; j < len2; j++) {
+	                    if (isNaN(arr0[i][j])) {
+	                        arr0[i][j] = arr1[i][j];
+	                    }
+	                }
+	            }
+	        }
+	    }
+
+	    /**
+	     * @param  {Array} arr0
+	     * @param  {Array} arr1
+	     * @param  {number} arrDim
+	     * @return {boolean}
+	     */
+	    function isArraySame(arr0, arr1, arrDim) {
+	        if (arr0 === arr1) {
+	            return true;
+	        }
+	        var len = arr0.length;
+	        if (len !== arr1.length) {
+	            return false;
+	        }
+	        if (arrDim === 1) {
+	            for (var i = 0; i < len; i++) {
+	                if (arr0[i] !== arr1[i]) {
+	                    return false;
+	                }
+	            }
+	        }
+	        else {
+	            var len2 = arr0[0].length;
+	            for (var i = 0; i < len; i++) {
+	                for (var j = 0; j < len2; j++) {
+	                    if (arr0[i][j] !== arr1[i][j]) {
+	                        return false;
+	                    }
+	                }
+	            }
+	        }
+	        return true;
+	    }
+
+	    /**
+	     * Catmull Rom interpolate array
+	     * @param  {Array} p0
+	     * @param  {Array} p1
+	     * @param  {Array} p2
+	     * @param  {Array} p3
+	     * @param  {number} t
+	     * @param  {number} t2
+	     * @param  {number} t3
+	     * @param  {Array} out
+	     * @param  {number} arrDim
+	     */
+	    function catmullRomInterpolateArray(
+	        p0, p1, p2, p3, t, t2, t3, out, arrDim
+	    ) {
+	        var len = p0.length;
+	        if (arrDim == 1) {
+	            for (var i = 0; i < len; i++) {
+	                out[i] = catmullRomInterpolate(
+	                    p0[i], p1[i], p2[i], p3[i], t, t2, t3
+	                );
+	            }
+	        }
+	        else {
+	            var len2 = p0[0].length;
+	            for (var i = 0; i < len; i++) {
+	                for (var j = 0; j < len2; j++) {
+	                    out[i][j] = catmullRomInterpolate(
+	                        p0[i][j], p1[i][j], p2[i][j], p3[i][j],
+	                        t, t2, t3
+	                    );
+	                }
+	            }
+	        }
+	    }
+
+	    /**
+	     * Catmull Rom interpolate number
+	     * @param  {number} p0
+	     * @param  {number} p1
+	     * @param  {number} p2
+	     * @param  {number} p3
+	     * @param  {number} t
+	     * @param  {number} t2
+	     * @param  {number} t3
+	     * @return {number}
+	     */
+	    function catmullRomInterpolate(p0, p1, p2, p3, t, t2, t3) {
+	        var v0 = (p2 - p0) * 0.5;
+	        var v1 = (p3 - p1) * 0.5;
+	        return (2 * (p1 - p2) + v0 + v1) * t3
+	                + (-3 * (p1 - p2) - 2 * v0 - v1) * t2
+	                + v0 * t + p1;
+	    }
+
+	    function cloneValue(value) {
+	        if (isArrayLike(value)) {
+	            var len = value.length;
+	            if (isArrayLike(value[0])) {
+	                var ret = [];
+	                for (var i = 0; i < len; i++) {
+	                    ret.push(arraySlice.call(value[i]));
+	                }
+	                return ret;
+	            }
+
+	            return arraySlice.call(value);
+	        }
+
+	        return value;
+	    }
+
+	    function rgba2String(rgba) {
+	        rgba[0] = Math.floor(rgba[0]);
+	        rgba[1] = Math.floor(rgba[1]);
+	        rgba[2] = Math.floor(rgba[2]);
+
+	        return 'rgba(' + rgba.join(',') + ')';
+	    }
+
+	    function createTrackClip (animator, easing, oneTrackDone, keyframes, propName) {
+	        var getter = animator._getter;
+	        var setter = animator._setter;
+	        var useSpline = easing === 'spline';
+
+	        var trackLen = keyframes.length;
+	        if (!trackLen) {
+	            return;
+	        }
+	        // Guess data type
+	        var firstVal = keyframes[0].value;
+	        var isValueArray = isArrayLike(firstVal);
+	        var isValueColor = false;
+	        var isValueString = false;
+
+	        // For vertices morphing
+	        var arrDim = (
+	                isValueArray
+	                && isArrayLike(firstVal[0])
+	            )
+	            ? 2 : 1;
+	        var trackMaxTime;
+	        // Sort keyframe as ascending
+	        keyframes.sort(function(a, b) {
+	            return a.time - b.time;
+	        });
+
+	        trackMaxTime = keyframes[trackLen - 1].time;
+	        // Percents of each keyframe
+	        var kfPercents = [];
+	        // Value of each keyframe
+	        var kfValues = [];
+	        var prevValue = keyframes[0].value;
+	        var isAllValueEqual = true;
+	        for (var i = 0; i < trackLen; i++) {
+	            kfPercents.push(keyframes[i].time / trackMaxTime);
+	            // Assume value is a color when it is a string
+	            var value = keyframes[i].value;
+
+	            // Check if value is equal, deep check if value is array
+	            if (!((isValueArray && isArraySame(value, prevValue, arrDim))
+	                || (!isValueArray && value === prevValue))) {
+	                isAllValueEqual = false;
+	            }
+	            prevValue = value;
+
+	            // Try converting a string to a color array
+	            if (typeof value == 'string') {
+	                var colorArray = color.parse(value);
+	                if (colorArray) {
+	                    value = colorArray;
+	                    isValueColor = true;
+	                }
+	                else {
+	                    isValueString = true;
+	                }
+	            }
+	            kfValues.push(value);
+	        }
+	        if (isAllValueEqual) {
+	            return;
+	        }
+
+	        var lastValue = kfValues[trackLen - 1];
+	        // Polyfill array and NaN value
+	        for (var i = 0; i < trackLen - 1; i++) {
+	            if (isValueArray) {
+	                fillArr(kfValues[i], lastValue, arrDim);
+	            }
+	            else {
+	                if (isNaN(kfValues[i]) && !isNaN(lastValue) && !isValueString && !isValueColor) {
+	                    kfValues[i] = lastValue;
+	                }
+	            }
+	        }
+	        isValueArray && fillArr(getter(animator._target, propName), lastValue, arrDim);
+
+	        // Cache the key of last frame to speed up when
+	        // animation playback is sequency
+	        var lastFrame = 0;
+	        var lastFramePercent = 0;
+	        var start;
+	        var w;
+	        var p0;
+	        var p1;
+	        var p2;
+	        var p3;
+
+	        if (isValueColor) {
+	            var rgba = [0, 0, 0, 0];
+	        }
+
+	        var onframe = function (target, percent) {
+	            // Find the range keyframes
+	            // kf1-----kf2---------current--------kf3
+	            // find kf2 and kf3 and do interpolation
+	            var frame;
+	            if (percent < lastFramePercent) {
+	                // Start from next key
+	                // PENDING start from lastFrame ?
+	                start = Math.min(lastFrame + 1, trackLen - 1);
+	                for (frame = start; frame >= 0; frame--) {
+	                    if (kfPercents[frame] <= percent) {
+	                        break;
+	                    }
+	                }
+	                // PENDING really need to do this ?
+	                frame = Math.min(frame, trackLen - 2);
+	            }
+	            else {
+	                for (frame = lastFrame; frame < trackLen; frame++) {
+	                    if (kfPercents[frame] > percent) {
+	                        break;
+	                    }
+	                }
+	                frame = Math.min(frame - 1, trackLen - 2);
+	            }
+	            lastFrame = frame;
+	            lastFramePercent = percent;
+
+	            var range = (kfPercents[frame + 1] - kfPercents[frame]);
+	            if (range === 0) {
+	                return;
+	            }
+	            else {
+	                w = (percent - kfPercents[frame]) / range;
+	            }
+	            if (useSpline) {
+	                p1 = kfValues[frame];
+	                p0 = kfValues[frame === 0 ? frame : frame - 1];
+	                p2 = kfValues[frame > trackLen - 2 ? trackLen - 1 : frame + 1];
+	                p3 = kfValues[frame > trackLen - 3 ? trackLen - 1 : frame + 2];
+	                if (isValueArray) {
+	                    catmullRomInterpolateArray(
+	                        p0, p1, p2, p3, w, w * w, w * w * w,
+	                        getter(target, propName),
+	                        arrDim
+	                    );
+	                }
+	                else {
+	                    var value;
+	                    if (isValueColor) {
+	                        value = catmullRomInterpolateArray(
+	                            p0, p1, p2, p3, w, w * w, w * w * w,
+	                            rgba, 1
+	                        );
+	                        value = rgba2String(rgba);
+	                    }
+	                    else if (isValueString) {
+	                        // String is step(0.5)
+	                        return interpolateString(p1, p2, w);
+	                    }
+	                    else {
+	                        value = catmullRomInterpolate(
+	                            p0, p1, p2, p3, w, w * w, w * w * w
+	                        );
+	                    }
+	                    setter(
+	                        target,
+	                        propName,
+	                        value
+	                    );
+	                }
+	            }
+	            else {
+	                if (isValueArray) {
+	                    interpolateArray(
+	                        kfValues[frame], kfValues[frame + 1], w,
+	                        getter(target, propName),
+	                        arrDim
+	                    );
+	                }
+	                else {
+	                    var value;
+	                    if (isValueColor) {
+	                        interpolateArray(
+	                            kfValues[frame], kfValues[frame + 1], w,
+	                            rgba, 1
+	                        );
+	                        value = rgba2String(rgba);
+	                    }
+	                    else if (isValueString) {
+	                        // String is step(0.5)
+	                        return interpolateString(kfValues[frame], kfValues[frame + 1], w);
+	                    }
+	                    else {
+	                        value = interpolateNumber(kfValues[frame], kfValues[frame + 1], w);
+	                    }
+	                    setter(
+	                        target,
+	                        propName,
+	                        value
+	                    );
+	                }
+	            }
+	        };
+
+	        var clip = new Clip({
+	            target: animator._target,
+	            life: trackMaxTime,
+	            loop: animator._loop,
+	            delay: animator._delay,
+	            onframe: onframe,
+	            ondestroy: oneTrackDone
+	        });
+
+	        if (easing && easing !== 'spline') {
+	            clip.easing = easing;
+	        }
+
+	        return clip;
+	    }
+
+	    /**
+	     * @alias module:zrender/animation/Animator
+	     * @constructor
+	     * @param {Object} target
+	     * @param {boolean} loop
+	     * @param {Function} getter
+	     * @param {Function} setter
+	     */
+	    var Animator = function(target, loop, getter, setter) {
+	        this._tracks = {};
+	        this._target = target;
+
+	        this._loop = loop || false;
+
+	        this._getter = getter || defaultGetter;
+	        this._setter = setter || defaultSetter;
+
+	        this._clipCount = 0;
+
+	        this._delay = 0;
+
+	        this._doneList = [];
+
+	        this._onframeList = [];
+
+	        this._clipList = [];
+	    };
+
+	    Animator.prototype = {
+	        /**
+	         * 设置动画关键帧
+	         * @param  {number} time 关键帧时间，单位是ms
+	         * @param  {Object} props 关键帧的属性值，key-value表示
+	         * @return {module:zrender/animation/Animator}
+	         */
+	        when: function(time /* ms */, props) {
+	            var tracks = this._tracks;
+	            for (var propName in props) {
+	                if (!tracks[propName]) {
+	                    tracks[propName] = [];
+	                    // Invalid value
+	                    var value = this._getter(this._target, propName);
+	                    if (value == null) {
+	                        // zrLog('Invalid property ' + propName);
+	                        continue;
+	                    }
+	                    // If time is 0
+	                    //  Then props is given initialize value
+	                    // Else
+	                    //  Initialize value from current prop value
+	                    if (time !== 0) {
+	                        tracks[propName].push({
+	                            time: 0,
+	                            value: cloneValue(value)
+	                        });
+	                    }
+	                }
+	                tracks[propName].push({
+	                    time: time,
+	                    value: props[propName]
+	                });
+	            }
+	            return this;
+	        },
+	        /**
+	         * 添加动画每一帧的回调函数
+	         * @param  {Function} callback
+	         * @return {module:zrender/animation/Animator}
+	         */
+	        during: function (callback) {
+	            this._onframeList.push(callback);
+	            return this;
+	        },
+
+	        _doneCallback: function () {
+	            // Clear all tracks
+	            this._tracks = {};
+	            // Clear all clips
+	            this._clipList.length = 0;
+
+	            var doneList = this._doneList;
+	            var len = doneList.length;
+	            for (var i = 0; i < len; i++) {
+	                doneList[i].call(this);
+	            }
+	        },
+	        /**
+	         * 开始执行动画
+	         * @param  {string|Function} easing
+	         *         动画缓动函数，详见{@link module:zrender/animation/easing}
+	         * @return {module:zrender/animation/Animator}
+	         */
+	        start: function (easing) {
+
+	            var self = this;
+	            var clipCount = 0;
+
+	            var oneTrackDone = function() {
+	                clipCount--;
+	                if (!clipCount) {
+	                    self._doneCallback();
+	                }
+	            };
+
+	            var lastClip;
+	            for (var propName in this._tracks) {
+	                var clip = createTrackClip(
+	                    this, easing, oneTrackDone,
+	                    this._tracks[propName], propName
+	                );
+	                if (clip) {
+	                    this._clipList.push(clip);
+	                    clipCount++;
+
+	                    // If start after added to animation
+	                    if (this.animation) {
+	                        this.animation.addClip(clip);
+	                    }
+
+	                    lastClip = clip;
+	                }
+	            }
+
+	            // Add during callback on the last clip
+	            if (lastClip) {
+	                var oldOnFrame = lastClip.onframe;
+	                lastClip.onframe = function (target, percent) {
+	                    oldOnFrame(target, percent);
+
+	                    for (var i = 0; i < self._onframeList.length; i++) {
+	                        self._onframeList[i](target, percent);
+	                    }
+	                };
+	            }
+
+	            if (!clipCount) {
+	                this._doneCallback();
+	            }
+	            return this;
+	        },
+	        /**
+	         * 停止动画
+	         * @param {boolean} forwardToLast If move to last frame before stop
+	         */
+	        stop: function (forwardToLast) {
+	            var clipList = this._clipList;
+	            var animation = this.animation;
+	            for (var i = 0; i < clipList.length; i++) {
+	                var clip = clipList[i];
+	                if (forwardToLast) {
+	                    // Move to last frame before stop
+	                    clip.onframe(this._target, 1);
+	                }
+	                animation && animation.removeClip(clip);
+	            }
+	            clipList.length = 0;
+	        },
+	        /**
+	         * 设置动画延迟开始的时间
+	         * @param  {number} time 单位ms
+	         * @return {module:zrender/animation/Animator}
+	         */
+	        delay: function (time) {
+	            this._delay = time;
+	            return this;
+	        },
+	        /**
+	         * 添加动画结束的回调
+	         * @param  {Function} cb
+	         * @return {module:zrender/animation/Animator}
+	         */
+	        done: function(cb) {
+	            if (cb) {
+	                this._doneList.push(cb);
+	            }
+	            return this;
+	        },
+
+	        /**
+	         * @return {Array.<module:zrender/animation/Clip>}
+	         */
+	        getClips: function () {
+	            return this._clipList;
+	        }
+	    };
+
+	    module.exports = Animator;
+
+
+/***/ },
+/* 37 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * 动画主控制器
+	 * @config target 动画对象，可以是数组，如果是数组的话会批量分发onframe等事件
+	 * @config life(1000) 动画时长
+	 * @config delay(0) 动画延迟时间
+	 * @config loop(true)
+	 * @config gap(0) 循环的间隔时间
+	 * @config onframe
+	 * @config easing(optional)
+	 * @config ondestroy(optional)
+	 * @config onrestart(optional)
+	 *
+	 * TODO pause
+	 */
+
+
+	    var easingFuncs = __webpack_require__(38);
+
+	    function Clip(options) {
+
+	        this._target = options.target;
+
+	        // 生命周期
+	        this._life = options.life || 1000;
+	        // 延时
+	        this._delay = options.delay || 0;
+	        // 开始时间
+	        // this._startTime = new Date().getTime() + this._delay;// 单位毫秒
+	        this._initialized = false;
+
+	        // 是否循环
+	        this.loop = options.loop == null ? false : options.loop;
+
+	        this.gap = options.gap || 0;
+
+	        this.easing = options.easing || 'Linear';
+
+	        this.onframe = options.onframe;
+	        this.ondestroy = options.ondestroy;
+	        this.onrestart = options.onrestart;
+	    }
+
+	    Clip.prototype = {
+
+	        constructor: Clip,
+
+	        step: function (time) {
+	            // Set startTime on first step, or _startTime may has milleseconds different between clips
+	            // PENDING
+	            if (!this._initialized) {
+	                this._startTime = new Date().getTime() + this._delay;
+	                this._initialized = true;
+	            }
+
+	            var percent = (time - this._startTime) / this._life;
+
+	            // 还没开始
+	            if (percent < 0) {
+	                return;
+	            }
+
+	            percent = Math.min(percent, 1);
+
+	            var easing = this.easing;
+	            var easingFunc = typeof easing == 'string' ? easingFuncs[easing] : easing;
+	            var schedule = typeof easingFunc === 'function'
+	                ? easingFunc(percent)
+	                : percent;
+
+	            this.fire('frame', schedule);
+
+	            // 结束
+	            if (percent == 1) {
+	                if (this.loop) {
+	                    this.restart();
+	                    // 重新开始周期
+	                    // 抛出而不是直接调用事件直到 stage.update 后再统一调用这些事件
+	                    return 'restart';
+	                }
+
+	                // 动画完成将这个控制器标识为待删除
+	                // 在Animation.update中进行批量删除
+	                this._needsRemove = true;
+	                return 'destroy';
+	            }
+
+	            return null;
+	        },
+
+	        restart: function() {
+	            var time = new Date().getTime();
+	            var remainder = (time - this._startTime) % this._life;
+	            this._startTime = new Date().getTime() - remainder + this.gap;
+
+	            this._needsRemove = false;
+	        },
+
+	        fire: function(eventType, arg) {
+	            eventType = 'on' + eventType;
+	            if (this[eventType]) {
+	                this[eventType](this._target, arg);
+	            }
+	        }
+	    };
+
+	    module.exports = Clip;
+
+
+
+/***/ },
+/* 38 */
+/***/ function(module, exports) {
+
+	/**
+	 * 缓动代码来自 https://github.com/sole/tween.js/blob/master/src/Tween.js
+	 * @see http://sole.github.io/tween.js/examples/03_graphs.html
+	 * @exports zrender/animation/easing
+	 */
+
+	    var easing = {
+	        /**
+	        * @param {number} k
+	        * @return {number}
+	        */
+	        linear: function (k) {
+	            return k;
+	        },
+
+	        /**
+	        * @param {number} k
+	        * @return {number}
+	        */
+	        quadraticIn: function (k) {
+	            return k * k;
+	        },
+	        /**
+	        * @param {number} k
+	        * @return {number}
+	        */
+	        quadraticOut: function (k) {
+	            return k * (2 - k);
+	        },
+	        /**
+	        * @param {number} k
+	        * @return {number}
+	        */
+	        quadraticInOut: function (k) {
+	            if ((k *= 2) < 1) {
+	                return 0.5 * k * k;
+	            }
+	            return -0.5 * (--k * (k - 2) - 1);
+	        },
+
+	        // 三次方的缓动（t^3）
+	        /**
+	        * @param {number} k
+	        * @return {number}
+	        */
+	        cubicIn: function (k) {
+	            return k * k * k;
+	        },
+	        /**
+	        * @param {number} k
+	        * @return {number}
+	        */
+	        cubicOut: function (k) {
+	            return --k * k * k + 1;
+	        },
+	        /**
+	        * @param {number} k
+	        * @return {number}
+	        */
+	        cubicInOut: function (k) {
+	            if ((k *= 2) < 1) {
+	                return 0.5 * k * k * k;
+	            }
+	            return 0.5 * ((k -= 2) * k * k + 2);
+	        },
+
+	        // 四次方的缓动（t^4）
+	        /**
+	        * @param {number} k
+	        * @return {number}
+	        */
+	        quarticIn: function (k) {
+	            return k * k * k * k;
+	        },
+	        /**
+	        * @param {number} k
+	        * @return {number}
+	        */
+	        quarticOut: function (k) {
+	            return 1 - (--k * k * k * k);
+	        },
+	        /**
+	        * @param {number} k
+	        * @return {number}
+	        */
+	        quarticInOut: function (k) {
+	            if ((k *= 2) < 1) {
+	                return 0.5 * k * k * k * k;
+	            }
+	            return -0.5 * ((k -= 2) * k * k * k - 2);
+	        },
+
+	        // 五次方的缓动（t^5）
+	        /**
+	        * @param {number} k
+	        * @return {number}
+	        */
+	        quinticIn: function (k) {
+	            return k * k * k * k * k;
+	        },
+	        /**
+	        * @param {number} k
+	        * @return {number}
+	        */
+	        quinticOut: function (k) {
+	            return --k * k * k * k * k + 1;
+	        },
+	        /**
+	        * @param {number} k
+	        * @return {number}
+	        */
+	        quinticInOut: function (k) {
+	            if ((k *= 2) < 1) {
+	                return 0.5 * k * k * k * k * k;
+	            }
+	            return 0.5 * ((k -= 2) * k * k * k * k + 2);
+	        },
+
+	        // 正弦曲线的缓动（sin(t)）
+	        /**
+	        * @param {number} k
+	        * @return {number}
+	        */
+	        sinusoidalIn: function (k) {
+	            return 1 - Math.cos(k * Math.PI / 2);
+	        },
+	        /**
+	        * @param {number} k
+	        * @return {number}
+	        */
+	        sinusoidalOut: function (k) {
+	            return Math.sin(k * Math.PI / 2);
+	        },
+	        /**
+	        * @param {number} k
+	        * @return {number}
+	        */
+	        sinusoidalInOut: function (k) {
+	            return 0.5 * (1 - Math.cos(Math.PI * k));
+	        },
+
+	        // 指数曲线的缓动（2^t）
+	        /**
+	        * @param {number} k
+	        * @return {number}
+	        */
+	        exponentialIn: function (k) {
+	            return k === 0 ? 0 : Math.pow(1024, k - 1);
+	        },
+	        /**
+	        * @param {number} k
+	        * @return {number}
+	        */
+	        exponentialOut: function (k) {
+	            return k === 1 ? 1 : 1 - Math.pow(2, -10 * k);
+	        },
+	        /**
+	        * @param {number} k
+	        * @return {number}
+	        */
+	        exponentialInOut: function (k) {
+	            if (k === 0) {
+	                return 0;
+	            }
+	            if (k === 1) {
+	                return 1;
+	            }
+	            if ((k *= 2) < 1) {
+	                return 0.5 * Math.pow(1024, k - 1);
+	            }
+	            return 0.5 * (-Math.pow(2, -10 * (k - 1)) + 2);
+	        },
+
+	        // 圆形曲线的缓动（sqrt(1-t^2)）
+	        /**
+	        * @param {number} k
+	        * @return {number}
+	        */
+	        circularIn: function (k) {
+	            return 1 - Math.sqrt(1 - k * k);
+	        },
+	        /**
+	        * @param {number} k
+	        * @return {number}
+	        */
+	        circularOut: function (k) {
+	            return Math.sqrt(1 - (--k * k));
+	        },
+	        /**
+	        * @param {number} k
+	        * @return {number}
+	        */
+	        circularInOut: function (k) {
+	            if ((k *= 2) < 1) {
+	                return -0.5 * (Math.sqrt(1 - k * k) - 1);
+	            }
+	            return 0.5 * (Math.sqrt(1 - (k -= 2) * k) + 1);
+	        },
+
+	        // 创建类似于弹簧在停止前来回振荡的动画
+	        /**
+	        * @param {number} k
+	        * @return {number}
+	        */
+	        elasticIn: function (k) {
+	            var s;
+	            var a = 0.1;
+	            var p = 0.4;
+	            if (k === 0) {
+	                return 0;
+	            }
+	            if (k === 1) {
+	                return 1;
+	            }
+	            if (!a || a < 1) {
+	                a = 1; s = p / 4;
+	            }
+	            else {
+	                s = p * Math.asin(1 / a) / (2 * Math.PI);
+	            }
+	            return -(a * Math.pow(2, 10 * (k -= 1)) *
+	                        Math.sin((k - s) * (2 * Math.PI) / p));
+	        },
+	        /**
+	        * @param {number} k
+	        * @return {number}
+	        */
+	        elasticOut: function (k) {
+	            var s;
+	            var a = 0.1;
+	            var p = 0.4;
+	            if (k === 0) {
+	                return 0;
+	            }
+	            if (k === 1) {
+	                return 1;
+	            }
+	            if (!a || a < 1) {
+	                a = 1; s = p / 4;
+	            }
+	            else {
+	                s = p * Math.asin(1 / a) / (2 * Math.PI);
+	            }
+	            return (a * Math.pow(2, -10 * k) *
+	                    Math.sin((k - s) * (2 * Math.PI) / p) + 1);
+	        },
+	        /**
+	        * @param {number} k
+	        * @return {number}
+	        */
+	        elasticInOut: function (k) {
+	            var s;
+	            var a = 0.1;
+	            var p = 0.4;
+	            if (k === 0) {
+	                return 0;
+	            }
+	            if (k === 1) {
+	                return 1;
+	            }
+	            if (!a || a < 1) {
+	                a = 1; s = p / 4;
+	            }
+	            else {
+	                s = p * Math.asin(1 / a) / (2 * Math.PI);
+	            }
+	            if ((k *= 2) < 1) {
+	                return -0.5 * (a * Math.pow(2, 10 * (k -= 1))
+	                    * Math.sin((k - s) * (2 * Math.PI) / p));
+	            }
+	            return a * Math.pow(2, -10 * (k -= 1))
+	                    * Math.sin((k - s) * (2 * Math.PI) / p) * 0.5 + 1;
+
+	        },
+
+	        // 在某一动画开始沿指示的路径进行动画处理前稍稍收回该动画的移动
+	        /**
+	        * @param {number} k
+	        * @return {number}
+	        */
+	        backIn: function (k) {
+	            var s = 1.70158;
+	            return k * k * ((s + 1) * k - s);
+	        },
+	        /**
+	        * @param {number} k
+	        * @return {number}
+	        */
+	        backOut: function (k) {
+	            var s = 1.70158;
+	            return --k * k * ((s + 1) * k + s) + 1;
+	        },
+	        /**
+	        * @param {number} k
+	        * @return {number}
+	        */
+	        backInOut: function (k) {
+	            var s = 1.70158 * 1.525;
+	            if ((k *= 2) < 1) {
+	                return 0.5 * (k * k * ((s + 1) * k - s));
+	            }
+	            return 0.5 * ((k -= 2) * k * ((s + 1) * k + s) + 2);
+	        },
+
+	        // 创建弹跳效果
+	        /**
+	        * @param {number} k
+	        * @return {number}
+	        */
+	        bounceIn: function (k) {
+	            return 1 - easing.bounceOut(1 - k);
+	        },
+	        /**
+	        * @param {number} k
+	        * @return {number}
+	        */
+	        bounceOut: function (k) {
+	            if (k < (1 / 2.75)) {
+	                return 7.5625 * k * k;
+	            }
+	            else if (k < (2 / 2.75)) {
+	                return 7.5625 * (k -= (1.5 / 2.75)) * k + 0.75;
+	            }
+	            else if (k < (2.5 / 2.75)) {
+	                return 7.5625 * (k -= (2.25 / 2.75)) * k + 0.9375;
+	            }
+	            else {
+	                return 7.5625 * (k -= (2.625 / 2.75)) * k + 0.984375;
+	            }
+	        },
+	        /**
+	        * @param {number} k
+	        * @return {number}
+	        */
+	        bounceInOut: function (k) {
+	            if (k < 0.5) {
+	                return easing.bounceIn(k * 2) * 0.5;
+	            }
+	            return easing.bounceOut(k * 2 - 1) * 0.5 + 0.5;
+	        }
+	    };
+
+	    module.exports = easing;
+
+
+
+
+/***/ },
+/* 39 */
+/***/ function(module, exports) {
+
+	/**
+	 * @module zrender/tool/color
+	 */
+
+
+	    var kCSSColorTable = {
+	        'transparent': [0,0,0,0], 'aliceblue': [240,248,255,1],
+	        'antiquewhite': [250,235,215,1], 'aqua': [0,255,255,1],
+	        'aquamarine': [127,255,212,1], 'azure': [240,255,255,1],
+	        'beige': [245,245,220,1], 'bisque': [255,228,196,1],
+	        'black': [0,0,0,1], 'blanchedalmond': [255,235,205,1],
+	        'blue': [0,0,255,1], 'blueviolet': [138,43,226,1],
+	        'brown': [165,42,42,1], 'burlywood': [222,184,135,1],
+	        'cadetblue': [95,158,160,1], 'chartreuse': [127,255,0,1],
+	        'chocolate': [210,105,30,1], 'coral': [255,127,80,1],
+	        'cornflowerblue': [100,149,237,1], 'cornsilk': [255,248,220,1],
+	        'crimson': [220,20,60,1], 'cyan': [0,255,255,1],
+	        'darkblue': [0,0,139,1], 'darkcyan': [0,139,139,1],
+	        'darkgoldenrod': [184,134,11,1], 'darkgray': [169,169,169,1],
+	        'darkgreen': [0,100,0,1], 'darkgrey': [169,169,169,1],
+	        'darkkhaki': [189,183,107,1], 'darkmagenta': [139,0,139,1],
+	        'darkolivegreen': [85,107,47,1], 'darkorange': [255,140,0,1],
+	        'darkorchid': [153,50,204,1], 'darkred': [139,0,0,1],
+	        'darksalmon': [233,150,122,1], 'darkseagreen': [143,188,143,1],
+	        'darkslateblue': [72,61,139,1], 'darkslategray': [47,79,79,1],
+	        'darkslategrey': [47,79,79,1], 'darkturquoise': [0,206,209,1],
+	        'darkviolet': [148,0,211,1], 'deeppink': [255,20,147,1],
+	        'deepskyblue': [0,191,255,1], 'dimgray': [105,105,105,1],
+	        'dimgrey': [105,105,105,1], 'dodgerblue': [30,144,255,1],
+	        'firebrick': [178,34,34,1], 'floralwhite': [255,250,240,1],
+	        'forestgreen': [34,139,34,1], 'fuchsia': [255,0,255,1],
+	        'gainsboro': [220,220,220,1], 'ghostwhite': [248,248,255,1],
+	        'gold': [255,215,0,1], 'goldenrod': [218,165,32,1],
+	        'gray': [128,128,128,1], 'green': [0,128,0,1],
+	        'greenyellow': [173,255,47,1], 'grey': [128,128,128,1],
+	        'honeydew': [240,255,240,1], 'hotpink': [255,105,180,1],
+	        'indianred': [205,92,92,1], 'indigo': [75,0,130,1],
+	        'ivory': [255,255,240,1], 'khaki': [240,230,140,1],
+	        'lavender': [230,230,250,1], 'lavenderblush': [255,240,245,1],
+	        'lawngreen': [124,252,0,1], 'lemonchiffon': [255,250,205,1],
+	        'lightblue': [173,216,230,1], 'lightcoral': [240,128,128,1],
+	        'lightcyan': [224,255,255,1], 'lightgoldenrodyellow': [250,250,210,1],
+	        'lightgray': [211,211,211,1], 'lightgreen': [144,238,144,1],
+	        'lightgrey': [211,211,211,1], 'lightpink': [255,182,193,1],
+	        'lightsalmon': [255,160,122,1], 'lightseagreen': [32,178,170,1],
+	        'lightskyblue': [135,206,250,1], 'lightslategray': [119,136,153,1],
+	        'lightslategrey': [119,136,153,1], 'lightsteelblue': [176,196,222,1],
+	        'lightyellow': [255,255,224,1], 'lime': [0,255,0,1],
+	        'limegreen': [50,205,50,1], 'linen': [250,240,230,1],
+	        'magenta': [255,0,255,1], 'maroon': [128,0,0,1],
+	        'mediumaquamarine': [102,205,170,1], 'mediumblue': [0,0,205,1],
+	        'mediumorchid': [186,85,211,1], 'mediumpurple': [147,112,219,1],
+	        'mediumseagreen': [60,179,113,1], 'mediumslateblue': [123,104,238,1],
+	        'mediumspringgreen': [0,250,154,1], 'mediumturquoise': [72,209,204,1],
+	        'mediumvioletred': [199,21,133,1], 'midnightblue': [25,25,112,1],
+	        'mintcream': [245,255,250,1], 'mistyrose': [255,228,225,1],
+	        'moccasin': [255,228,181,1], 'navajowhite': [255,222,173,1],
+	        'navy': [0,0,128,1], 'oldlace': [253,245,230,1],
+	        'olive': [128,128,0,1], 'olivedrab': [107,142,35,1],
+	        'orange': [255,165,0,1], 'orangered': [255,69,0,1],
+	        'orchid': [218,112,214,1], 'palegoldenrod': [238,232,170,1],
+	        'palegreen': [152,251,152,1], 'paleturquoise': [175,238,238,1],
+	        'palevioletred': [219,112,147,1], 'papayawhip': [255,239,213,1],
+	        'peachpuff': [255,218,185,1], 'peru': [205,133,63,1],
+	        'pink': [255,192,203,1], 'plum': [221,160,221,1],
+	        'powderblue': [176,224,230,1], 'purple': [128,0,128,1],
+	        'red': [255,0,0,1], 'rosybrown': [188,143,143,1],
+	        'royalblue': [65,105,225,1], 'saddlebrown': [139,69,19,1],
+	        'salmon': [250,128,114,1], 'sandybrown': [244,164,96,1],
+	        'seagreen': [46,139,87,1], 'seashell': [255,245,238,1],
+	        'sienna': [160,82,45,1], 'silver': [192,192,192,1],
+	        'skyblue': [135,206,235,1], 'slateblue': [106,90,205,1],
+	        'slategray': [112,128,144,1], 'slategrey': [112,128,144,1],
+	        'snow': [255,250,250,1], 'springgreen': [0,255,127,1],
+	        'steelblue': [70,130,180,1], 'tan': [210,180,140,1],
+	        'teal': [0,128,128,1], 'thistle': [216,191,216,1],
+	        'tomato': [255,99,71,1], 'turquoise': [64,224,208,1],
+	        'violet': [238,130,238,1], 'wheat': [245,222,179,1],
+	        'white': [255,255,255,1], 'whitesmoke': [245,245,245,1],
+	        'yellow': [255,255,0,1], 'yellowgreen': [154,205,50,1]
+	    };
+
+	    function clampCssByte(i) {  // Clamp to integer 0 .. 255.
+	        i = Math.round(i);  // Seems to be what Chrome does (vs truncation).
+	        return i < 0 ? 0 : i > 255 ? 255 : i;
+	    }
+
+	    function clampCssAngle(i) {  // Clamp to integer 0 .. 360.
+	        i = Math.round(i);  // Seems to be what Chrome does (vs truncation).
+	        return i < 0 ? 0 : i > 360 ? 360 : i;
+	    }
+
+	    function clampCssFloat(f) {  // Clamp to float 0.0 .. 1.0.
+	        return f < 0 ? 0 : f > 1 ? 1 : f;
+	    }
+
+	    function parseCssInt(str) {  // int or percentage.
+	        if (str.length && str.charAt(str.length - 1) === '%') {
+	            return clampCssByte(parseFloat(str) / 100 * 255);
+	        }
+	        return clampCssByte(parseInt(str, 10));
+	    }
+
+	    function parseCssFloat(str) {  // float or percentage.
+	        if (str.length && str.charAt(str.length - 1) === '%') {
+	            return clampCssFloat(parseFloat(str) / 100);
+	        }
+	        return clampCssFloat(parseFloat(str));
+	    }
+
+	    function cssHueToRgb(m1, m2, h) {
+	        if (h < 0) {
+	            h += 1;
+	        }
+	        else if (h > 1) {
+	            h -= 1;
+	        }
+
+	        if (h * 6 < 1) {
+	            return m1 + (m2 - m1) * h * 6;
+	        }
+	        if (h * 2 < 1) {
+	            return m2;
+	        }
+	        if (h * 3 < 2) {
+	            return m1 + (m2 - m1) * (2/3 - h) * 6;
+	        }
+	        return m1;
+	    }
+
+	    function lerp(a, b, p) {
+	        return a + (b - a) * p;
+	    }
+
+	    /**
+	     * @param {string} colorStr
+	     * @return {Array.<number>}
+	     * @memberOf module:zrender/util/color
+	     */
+	    function parse(colorStr) {
+	        if (!colorStr) {
+	            return;
+	        }
+	        // colorStr may be not string
+	        colorStr = colorStr + '';
+	        // Remove all whitespace, not compliant, but should just be more accepting.
+	        var str = colorStr.replace(/ /g, '').toLowerCase();
+
+	        // Color keywords (and transparent) lookup.
+	        if (str in kCSSColorTable) {
+	            return kCSSColorTable[str].slice();  // dup.
+	        }
+
+	        // #abc and #abc123 syntax.
+	        if (str.charAt(0) === '#') {
+	            if (str.length === 4) {
+	                var iv = parseInt(str.substr(1), 16);  // TODO(deanm): Stricter parsing.
+	                if (!(iv >= 0 && iv <= 0xfff)) {
+	                    return;  // Covers NaN.
+	                }
+	                return [
+	                    ((iv & 0xf00) >> 4) | ((iv & 0xf00) >> 8),
+	                    (iv & 0xf0) | ((iv & 0xf0) >> 4),
+	                    (iv & 0xf) | ((iv & 0xf) << 4),
+	                    1
+	                ];
+	            }
+	            else if (str.length === 7) {
+	                var iv = parseInt(str.substr(1), 16);  // TODO(deanm): Stricter parsing.
+	                if (!(iv >= 0 && iv <= 0xffffff)) {
+	                    return;  // Covers NaN.
+	                }
+	                return [
+	                    (iv & 0xff0000) >> 16,
+	                    (iv & 0xff00) >> 8,
+	                    iv & 0xff,
+	                    1
+	                ];
+	            }
+
+	            return;
+	        }
+	        var op = str.indexOf('('), ep = str.indexOf(')');
+	        if (op !== -1 && ep + 1 === str.length) {
+	            var fname = str.substr(0, op);
+	            var params = str.substr(op + 1, ep - (op + 1)).split(',');
+	            var alpha = 1;  // To allow case fallthrough.
+	            switch (fname) {
+	                case 'rgba':
+	                    if (params.length !== 4) {
+	                        return;
+	                    }
+	                    alpha = parseCssFloat(params.pop()); // jshint ignore:line
+	                // Fall through.
+	                case 'rgb':
+	                    if (params.length !== 3) {
+	                        return;
+	                    }
+	                    return [
+	                        parseCssInt(params[0]),
+	                        parseCssInt(params[1]),
+	                        parseCssInt(params[2]),
+	                        alpha
+	                    ];
+	                case 'hsla':
+	                    if (params.length !== 4) {
+	                        return;
+	                    }
+	                    params[3] = parseCssFloat(params[3]);
+	                    return hsla2rgba(params);
+	                case 'hsl':
+	                    if (params.length !== 3) {
+	                        return;
+	                    }
+	                    return hsla2rgba(params);
+	                default:
+	                    return;
+	            }
+	        }
+
+	        return;
+	    }
+
+	    /**
+	     * @param {Array.<number>} hsla
+	     * @return {Array.<number>} rgba
+	     */
+	    function hsla2rgba(hsla) {
+	        var h = (((parseFloat(hsla[0]) % 360) + 360) % 360) / 360;  // 0 .. 1
+	        // NOTE(deanm): According to the CSS spec s/l should only be
+	        // percentages, but we don't bother and let float or percentage.
+	        var s = parseCssFloat(hsla[1]);
+	        var l = parseCssFloat(hsla[2]);
+	        var m2 = l <= 0.5 ? l * (s + 1) : l + s - l * s;
+	        var m1 = l * 2 - m2;
+
+	        var rgba = [
+	            clampCssByte(cssHueToRgb(m1, m2, h + 1 / 3) * 255),
+	            clampCssByte(cssHueToRgb(m1, m2, h) * 255),
+	            clampCssByte(cssHueToRgb(m1, m2, h - 1 / 3) * 255)
+	        ];
+
+	        if (hsla.length === 4) {
+	            rgba[3] = hsla[3];
+	        }
+
+	        return rgba;
+	    }
+
+	    /**
+	     * @param {Array.<number>} rgba
+	     * @return {Array.<number>} hsla
+	     */
+	    function rgba2hsla(rgba) {
+	        if (!rgba) {
+	            return;
+	        }
+
+	        // RGB from 0 to 255
+	        var R = rgba[0] / 255;
+	        var G = rgba[1] / 255;
+	        var B = rgba[2] / 255;
+
+	        var vMin = Math.min(R, G, B); // Min. value of RGB
+	        var vMax = Math.max(R, G, B); // Max. value of RGB
+	        var delta = vMax - vMin; // Delta RGB value
+
+	        var L = (vMax + vMin) / 2;
+	        var H;
+	        var S;
+	        // HSL results from 0 to 1
+	        if (delta === 0) {
+	            H = 0;
+	            S = 0;
+	        }
+	        else {
+	            if (L < 0.5) {
+	                S = delta / (vMax + vMin);
+	            }
+	            else {
+	                S = delta / (2 - vMax - vMin);
+	            }
+
+	            var deltaR = (((vMax - R) / 6) + (delta / 2)) / delta;
+	            var deltaG = (((vMax - G) / 6) + (delta / 2)) / delta;
+	            var deltaB = (((vMax - B) / 6) + (delta / 2)) / delta;
+
+	            if (R === vMax) {
+	                H = deltaB - deltaG;
+	            }
+	            else if (G === vMax) {
+	                H = (1 / 3) + deltaR - deltaB;
+	            }
+	            else if (B === vMax) {
+	                H = (2 / 3) + deltaG - deltaR;
+	            }
+
+	            if (H < 0) {
+	                H += 1;
+	            }
+
+	            if (H > 1) {
+	                H -= 1;
+	            }
+	        }
+
+	        var hsla = [H * 360, S, L];
+
+	        if (rgba[3] != null) {
+	            hsla.push(rgba[3]);
+	        }
+
+	        return hsla;
+	    }
+
+	    /**
+	     * @param {string} color
+	     * @param {number} level
+	     * @return {string}
+	     * @memberOf module:zrender/util/color
+	     */
+	    function lift(color, level) {
+	        var colorArr = parse(color);
+	        if (colorArr) {
+	            for (var i = 0; i < 3; i++) {
+	                if (level < 0) {
+	                    colorArr[i] = colorArr[i] * (1 - level) | 0;
+	                }
+	                else {
+	                    colorArr[i] = ((255 - colorArr[i]) * level + colorArr[i]) | 0;
+	                }
+	            }
+	            return stringify(colorArr, colorArr.length === 4 ? 'rgba' : 'rgb');
+	        }
+	    }
+
+	    /**
+	     * @param {string} color
+	     * @return {string}
+	     * @memberOf module:zrender/util/color
+	     */
+	    function toHex(color, level) {
+	        var colorArr = parse(color);
+	        if (colorArr) {
+	            return ((1 << 24) + (colorArr[0] << 16) + (colorArr[1] << 8) + (+colorArr[2])).toString(16).slice(1);
+	        }
+	    }
+
+	    /**
+	     * Map value to color. Faster than mapToColor methods because color is represented by rgba array
+	     * @param {number} normalizedValue A float between 0 and 1.
+	     * @param {Array.<Array.<number>>} colors List of rgba color array
+	     * @param {Array.<number>} [out] Mapped gba color array
+	     * @return {Array.<number>}
+	     */
+	    function fastMapToColor(normalizedValue, colors, out) {
+	        if (!(colors && colors.length)
+	            || !(normalizedValue >= 0 && normalizedValue <= 1)
+	        ) {
+	            return;
+	        }
+	        out = out || [0, 0, 0, 0];
+	        var value = normalizedValue * (colors.length - 1);
+	        var leftIndex = Math.floor(value);
+	        var rightIndex = Math.ceil(value);
+	        var leftColor = colors[leftIndex];
+	        var rightColor = colors[rightIndex];
+	        var dv = value - leftIndex;
+	        out[0] = clampCssByte(lerp(leftColor[0], rightColor[0], dv));
+	        out[1] = clampCssByte(lerp(leftColor[1], rightColor[1], dv));
+	        out[2] = clampCssByte(lerp(leftColor[2], rightColor[2], dv));
+	        out[3] = clampCssByte(lerp(leftColor[3], rightColor[3], dv));
+	        return out;
+	    }
+	    /**
+	     * @param {number} normalizedValue A float between 0 and 1.
+	     * @param {Array.<string>} colors Color list.
+	     * @param {boolean=} fullOutput Default false.
+	     * @return {(string|Object)} Result color. If fullOutput,
+	     *                           return {color: ..., leftIndex: ..., rightIndex: ..., value: ...},
+	     * @memberOf module:zrender/util/color
+	     */
+	    function mapToColor(normalizedValue, colors, fullOutput) {
+	        if (!(colors && colors.length)
+	            || !(normalizedValue >= 0 && normalizedValue <= 1)
+	        ) {
+	            return;
+	        }
+
+	        var value = normalizedValue * (colors.length - 1);
+	        var leftIndex = Math.floor(value);
+	        var rightIndex = Math.ceil(value);
+	        var leftColor = parse(colors[leftIndex]);
+	        var rightColor = parse(colors[rightIndex]);
+	        var dv = value - leftIndex;
+
+	        var color = stringify(
+	            [
+	                clampCssByte(lerp(leftColor[0], rightColor[0], dv)),
+	                clampCssByte(lerp(leftColor[1], rightColor[1], dv)),
+	                clampCssByte(lerp(leftColor[2], rightColor[2], dv)),
+	                clampCssFloat(lerp(leftColor[3], rightColor[3], dv))
+	            ],
+	            'rgba'
+	        );
+
+	        return fullOutput
+	            ? {
+	                color: color,
+	                leftIndex: leftIndex,
+	                rightIndex: rightIndex,
+	                value: value
+	            }
+	            : color;
+	    }
+
+	    /**
+	     * @param {string} color
+	     * @param {number=} h 0 ~ 360, ignore when null.
+	     * @param {number=} s 0 ~ 1, ignore when null.
+	     * @param {number=} l 0 ~ 1, ignore when null.
+	     * @return {string} Color string in rgba format.
+	     * @memberOf module:zrender/util/color
+	     */
+	    function modifyHSL(color, h, s, l) {
+	        color = parse(color);
+
+	        if (color) {
+	            color = rgba2hsla(color);
+	            h != null && (color[0] = clampCssAngle(h));
+	            s != null && (color[1] = parseCssFloat(s));
+	            l != null && (color[2] = parseCssFloat(l));
+
+	            return stringify(hsla2rgba(color), 'rgba');
+	        }
+	    }
+
+	    /**
+	     * @param {string} color
+	     * @param {number=} alpha 0 ~ 1
+	     * @return {string} Color string in rgba format.
+	     * @memberOf module:zrender/util/color
+	     */
+	    function modifyAlpha(color, alpha) {
+	        color = parse(color);
+
+	        if (color && alpha != null) {
+	            color[3] = clampCssFloat(alpha);
+	            return stringify(color, 'rgba');
+	        }
+	    }
+
+	    /**
+	     * @param {Array.<string>} colors Color list.
+	     * @param {string} type 'rgba', 'hsva', ...
+	     * @return {string} Result color.
+	     */
+	    function stringify(arrColor, type) {
+	        var colorStr = arrColor[0] + ',' + arrColor[1] + ',' + arrColor[2];
+	        if (type === 'rgba' || type === 'hsva' || type === 'hsla') {
+	            colorStr += ',' + arrColor[3];
+	        }
+	        return type + '(' + colorStr + ')';
+	    }
+
+	    module.exports = {
+	        parse: parse,
+	        lift: lift,
+	        toHex: toHex,
+	        fastMapToColor: fastMapToColor,
+	        mapToColor: mapToColor,
+	        modifyHSL: modifyHSL,
+	        modifyAlpha: modifyAlpha,
+	        stringify: stringify
+	    };
+
+
+
+
+/***/ },
+/* 40 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+	        var config = __webpack_require__(41);
+
+	        /**
+	         * @exports zrender/tool/log
+	         * @author Kener (@Kener-林峰, kener.linfeng@gmail.com)
+	         */
+	        module.exports = function() {
+	            if (config.debugMode === 0) {
+	                return;
+	            }
+	            else if (config.debugMode == 1) {
+	                for (var k in arguments) {
+	                    throw new Error(arguments[k]);
+	                }
+	            }
+	            else if (config.debugMode > 1) {
+	                for (var k in arguments) {
+	                    console.log(arguments[k]);
+	                }
+	            }
+	        };
+
+	        /* for debug
+	        return function(mes) {
+	            document.getElementById('wrong-message').innerHTML =
+	                mes + ' ' + (new Date() - 0)
+	                + '<br/>' 
+	                + document.getElementById('wrong-message').innerHTML;
+	        };
+	        */
+	    
+
+
+/***/ },
+/* 41 */
+/***/ function(module, exports) {
+
+	
+	    var dpr = 1;
+	    // If in browser environment
+	    if (typeof window !== 'undefined') {
+	        dpr = Math.max(window.devicePixelRatio || 1, 1);
+	    }
+	    /**
+	     * config默认配置项
+	     * @exports zrender/config
+	     * @author Kener (@Kener-林峰, kener.linfeng@gmail.com)
+	     */
+	    var config = {
+	        /**
+	         * debug日志选项：catchBrushException为true下有效
+	         * 0 : 不生成debug数据，发布用
+	         * 1 : 异常抛出，调试用
+	         * 2 : 控制台输出，调试用
+	         */
+	        debugMode: 0,
+
+	        // retina 屏幕优化
+	        devicePixelRatio: dpr
+	    };
+	    module.exports = config;
+
+
+
+
+/***/ },
+/* 42 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var Group = __webpack_require__(30);
+	    var componentUtil = __webpack_require__(20);
+	    var clazzUtil = __webpack_require__(13);
+
+	    function Chart() {
+
+	        /**
+	         * @type {module:zrender/container/Group}
+	         * @readOnly
+	         */
+	        this.group = new Group();
+
+	        /**
+	         * @type {string}
+	         * @readOnly
+	         */
+	        this.uid = componentUtil.getUID('viewChart');
+	    }
+
+	    Chart.prototype = {
+
+	        type: 'chart',
+
+	        /**
+	         * Init the chart
+	         * @param  {module:echarts/model/Global} ecModel
+	         * @param  {module:echarts/ExtensionAPI} api
+	         */
+	        init: function (ecModel, api) {},
+
+	        /**
+	         * Render the chart
+	         * @param  {module:echarts/model/Series} seriesModel
+	         * @param  {module:echarts/model/Global} ecModel
+	         * @param  {module:echarts/ExtensionAPI} api
+	         * @param  {Object} payload
+	         */
+	        render: function (seriesModel, ecModel, api, payload) {},
+
+	        /**
+	         * Highlight series or specified data item
+	         * @param  {module:echarts/model/Series} seriesModel
+	         * @param  {module:echarts/model/Global} ecModel
+	         * @param  {module:echarts/ExtensionAPI} api
+	         * @param  {Object} payload
+	         */
+	        highlight: function (seriesModel, ecModel, api, payload) {
+	            toggleHighlight(seriesModel.getData(), payload, 'emphasis');
+	        },
+
+	        /**
+	         * Downplay series or specified data item
+	         * @param  {module:echarts/model/Series} seriesModel
+	         * @param  {module:echarts/model/Global} ecModel
+	         * @param  {module:echarts/ExtensionAPI} api
+	         * @param  {Object} payload
+	         */
+	        downplay: function (seriesModel, ecModel, api, payload) {
+	            toggleHighlight(seriesModel.getData(), payload, 'normal');
+	        },
+
+	        /**
+	         * Remove self
+	         * @param  {module:echarts/model/Global} ecModel
+	         * @param  {module:echarts/ExtensionAPI} api
+	         */
+	        remove: function (ecModel, api) {
+	            this.group.removeAll();
+	        },
+
+	        /**
+	         * Dispose self
+	         * @param  {module:echarts/model/Global} ecModel
+	         * @param  {module:echarts/ExtensionAPI} api
+	         */
+	        dispose: function () {}
+	    };
+
+	    var chartProto = Chart.prototype;
+	    chartProto.updateView
+	        = chartProto.updateLayout
+	        = chartProto.updateVisual
+	        = function (seriesModel, ecModel, api, payload) {
+	            this.render(seriesModel, ecModel, api, payload);
+	        };
+
+	    /**
+	     * Set state of single element
+	     * @param  {module:zrender/Element} el
+	     * @param  {string} state
+	     */
+	    function elSetState(el, state) {
+	        if (el) {
+	            el.trigger(state);
+	            if (el.type === 'group') {
+	                for (var i = 0; i < el.childCount(); i++) {
+	                    elSetState(el.childAt(i), state);
+	                }
+	            }
+	        }
+	    }
+	    /**
+	     * @param  {module:echarts/data/List} data
+	     * @param  {Object} payload
+	     * @param  {string} state 'normal'|'emphasis'
+	     * @inner
+	     */
+	    function toggleHighlight(data, payload, state) {
+	        var dataIndex = payload && payload.dataIndex;
+	        var name = payload && payload.name;
+
+	        if (dataIndex != null) {
+	            var dataIndices = dataIndex instanceof Array ? dataIndex : [dataIndex];
+	            for (var i = 0, len = dataIndices.length; i < len; i++) {
+	                elSetState(data.getItemGraphicEl(dataIndices[i]), state);
+	            }
+	        }
+	        else if (name) {
+	            var names = name instanceof Array ? name : [name];
+	            for (var i = 0, len = names.length; i < len; i++) {
+	                var dataIndex = data.indexOfName(names[i]);
+	                elSetState(data.getItemGraphicEl(dataIndex), state);
+	            }
+	        }
+	        else {
+	            data.eachItemGraphicEl(function (el) {
+	                elSetState(el, state);
+	            });
+	        }
+	    }
+
+	    // Enable Chart.extend.
+	    clazzUtil.enableClassExtend(Chart);
+
+	    // Add capability of registerClass, getClass, hasClass, registerSubTypeDefaulter and so on.
+	    clazzUtil.enableClassManagement(Chart, {registerWhenExtend: true});
+
+	    module.exports = Chart;
+
+
+/***/ },
+/* 43 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var zrUtil = __webpack_require__(4);
+
+	    var pathTool = __webpack_require__(44);
+	    var round = Math.round;
+	    var Path = __webpack_require__(45);
+	    var colorTool = __webpack_require__(39);
+	    var matrix = __webpack_require__(11);
+	    var vector = __webpack_require__(10);
+	    var Gradient = __webpack_require__(61);
+
+	    var graphic = {};
+
+	    graphic.Group = __webpack_require__(30);
+
+	    graphic.Image = __webpack_require__(62);
+
+	    graphic.Text = __webpack_require__(64);
+
+	    graphic.Circle = __webpack_require__(65);
+
+	    graphic.Sector = __webpack_require__(66);
+
+	    graphic.Ring = __webpack_require__(67);
+
+	    graphic.Polygon = __webpack_require__(68);
+
+	    graphic.Polyline = __webpack_require__(72);
+
+	    graphic.Rect = __webpack_require__(73);
+
+	    graphic.Line = __webpack_require__(75);
+
+	    graphic.BezierCurve = __webpack_require__(76);
+
+	    graphic.Arc = __webpack_require__(77);
+
+	    graphic.CompoundPath = __webpack_require__(78);
+
+	    graphic.LinearGradient = __webpack_require__(79);
+
+	    graphic.RadialGradient = __webpack_require__(80);
+
+	    graphic.BoundingRect = __webpack_require__(9);
+
+	    /**
+	     * Extend shape with parameters
+	     */
+	    graphic.extendShape = function (opts) {
+	        return Path.extend(opts);
+	    };
+
+	    /**
+	     * Extend path
+	     */
+	    graphic.extendPath = function (pathData, opts) {
+	        return pathTool.extendFromString(pathData, opts);
+	    };
+
+	    /**
+	     * Create a path element from path data string
+	     * @param {string} pathData
+	     * @param {Object} opts
+	     * @param {module:zrender/core/BoundingRect} rect
+	     * @param {string} [layout=cover] 'center' or 'cover'
+	     */
+	    graphic.makePath = function (pathData, opts, rect, layout) {
+	        var path = pathTool.createFromString(pathData, opts);
+	        var boundingRect = path.getBoundingRect();
+	        if (rect) {
+	            var aspect = boundingRect.width / boundingRect.height;
+
+	            if (layout === 'center') {
+	                // Set rect to center, keep width / height ratio.
+	                var width = rect.height * aspect;
+	                var height;
+	                if (width <= rect.width) {
+	                    height = rect.height;
+	                }
+	                else {
+	                    width = rect.width;
+	                    height = width / aspect;
+	                }
+	                var cx = rect.x + rect.width / 2;
+	                var cy = rect.y + rect.height / 2;
+
+	                rect.x = cx - width / 2;
+	                rect.y = cy - height / 2;
+	                rect.width = width;
+	                rect.height = height;
+	            }
+
+	            this.resizePath(path, rect);
+	        }
+	        return path;
+	    };
+
+	    graphic.mergePath = pathTool.mergePath,
+
+	    /**
+	     * Resize a path to fit the rect
+	     * @param {module:zrender/graphic/Path} path
+	     * @param {Object} rect
+	     */
+	    graphic.resizePath = function (path, rect) {
+	        if (!path.applyTransform) {
+	            return;
+	        }
+
+	        var pathRect = path.getBoundingRect();
+
+	        var m = pathRect.calculateTransform(rect);
+
+	        path.applyTransform(m);
+	    };
+
+	    /**
+	     * Sub pixel optimize line for canvas
+	     *
+	     * @param {Object} param
+	     * @param {Object} [param.shape]
+	     * @param {number} [param.shape.x1]
+	     * @param {number} [param.shape.y1]
+	     * @param {number} [param.shape.x2]
+	     * @param {number} [param.shape.y2]
+	     * @param {Object} [param.style]
+	     * @param {number} [param.style.lineWidth]
+	     * @return {Object} Modified param
+	     */
+	    graphic.subPixelOptimizeLine = function (param) {
+	        var subPixelOptimize = graphic.subPixelOptimize;
+	        var shape = param.shape;
+	        var lineWidth = param.style.lineWidth;
+
+	        if (round(shape.x1 * 2) === round(shape.x2 * 2)) {
+	            shape.x1 = shape.x2 = subPixelOptimize(shape.x1, lineWidth, true);
+	        }
+	        if (round(shape.y1 * 2) === round(shape.y2 * 2)) {
+	            shape.y1 = shape.y2 = subPixelOptimize(shape.y1, lineWidth, true);
+	        }
+	        return param;
+	    };
+
+	    /**
+	     * Sub pixel optimize rect for canvas
+	     *
+	     * @param {Object} param
+	     * @param {Object} [param.shape]
+	     * @param {number} [param.shape.x]
+	     * @param {number} [param.shape.y]
+	     * @param {number} [param.shape.width]
+	     * @param {number} [param.shape.height]
+	     * @param {Object} [param.style]
+	     * @param {number} [param.style.lineWidth]
+	     * @return {Object} Modified param
+	     */
+	    graphic.subPixelOptimizeRect = function (param) {
+	        var subPixelOptimize = graphic.subPixelOptimize;
+	        var shape = param.shape;
+	        var lineWidth = param.style.lineWidth;
+	        var originX = shape.x;
+	        var originY = shape.y;
+	        var originWidth = shape.width;
+	        var originHeight = shape.height;
+	        shape.x = subPixelOptimize(shape.x, lineWidth, true);
+	        shape.y = subPixelOptimize(shape.y, lineWidth, true);
+	        shape.width = Math.max(
+	            subPixelOptimize(originX + originWidth, lineWidth, false) - shape.x,
+	            originWidth === 0 ? 0 : 1
+	        );
+	        shape.height = Math.max(
+	            subPixelOptimize(originY + originHeight, lineWidth, false) - shape.y,
+	            originHeight === 0 ? 0 : 1
+	        );
+	        return param;
+	    };
+
+	    /**
+	     * Sub pixel optimize for canvas
+	     *
+	     * @param {number} position Coordinate, such as x, y
+	     * @param {number} lineWidth Should be nonnegative integer.
+	     * @param {boolean=} positiveOrNegative Default false (negative).
+	     * @return {number} Optimized position.
+	     */
+	    graphic.subPixelOptimize = function (position, lineWidth, positiveOrNegative) {
+	        // Assure that (position + lineWidth / 2) is near integer edge,
+	        // otherwise line will be fuzzy in canvas.
+	        var doubledPosition = round(position * 2);
+	        return (doubledPosition + round(lineWidth)) % 2 === 0
+	            ? doubledPosition / 2
+	            : (doubledPosition + (positiveOrNegative ? 1 : -1)) / 2;
+	    };
+
+	    function hasFillOrStroke(fillOrStroke) {
+	        return fillOrStroke != null && fillOrStroke != 'none';
+	    }
+
+	    function liftColor(color) {
+	        return typeof color === 'string' ? colorTool.lift(color, -0.1) : color;
+	    }
+
+	    /**
+	     * @private
+	     */
+	    function cacheElementStl(el) {
+	        if (el.__hoverStlDirty) {
+	            var stroke = el.style.stroke;
+	            var fill = el.style.fill;
+
+	            // Create hoverStyle on mouseover
+	            var hoverStyle = el.__hoverStl;
+	            hoverStyle.fill = hoverStyle.fill
+	                || (hasFillOrStroke(fill) ? liftColor(fill) : null);
+	            hoverStyle.stroke = hoverStyle.stroke
+	                || (hasFillOrStroke(stroke) ? liftColor(stroke) : null);
+
+	            var normalStyle = {};
+	            for (var name in hoverStyle) {
+	                if (hoverStyle.hasOwnProperty(name)) {
+	                    normalStyle[name] = el.style[name];
+	                }
+	            }
+
+	            el.__normalStl = normalStyle;
+
+	            el.__hoverStlDirty = false;
+	        }
+	    }
+
+	    /**
+	     * @private
+	     */
+	    function doSingleEnterHover(el) {
+	        if (el.__isHover) {
+	            return;
+	        }
+
+	        cacheElementStl(el);
+
+	        if (el.useHoverLayer) {
+	            el.__zr && el.__zr.addHover(el, el.__hoverStl);
+	        }
+	        else {
+	            el.setStyle(el.__hoverStl);
+	            el.z2 += 1;
+	        }
+
+	        el.__isHover = true;
+	    }
+
+	    /**
+	     * @inner
+	     */
+	    function doSingleLeaveHover(el) {
+	        if (!el.__isHover) {
+	            return;
+	        }
+
+	        var normalStl = el.__normalStl;
+	        if (el.useHoverLayer) {
+	            el.__zr && el.__zr.removeHover(el);
+	        }
+	        else {
+	            normalStl && el.setStyle(normalStl);
+	            el.z2 -= 1;
+	        }
+
+	        el.__isHover = false;
+	    }
+
+	    /**
+	     * @inner
+	     */
+	    function doEnterHover(el) {
+	        el.type === 'group'
+	            ? el.traverse(function (child) {
+	                if (child.type !== 'group') {
+	                    doSingleEnterHover(child);
+	                }
+	            })
+	            : doSingleEnterHover(el);
+	    }
+
+	    function doLeaveHover(el) {
+	        el.type === 'group'
+	            ? el.traverse(function (child) {
+	                if (child.type !== 'group') {
+	                    doSingleLeaveHover(child);
+	                }
+	            })
+	            : doSingleLeaveHover(el);
+	    }
+
+	    /**
+	     * @inner
+	     */
+	    function setElementHoverStl(el, hoverStl) {
+	        // If element has sepcified hoverStyle, then use it instead of given hoverStyle
+	        // Often used when item group has a label element and it's hoverStyle is different
+	        el.__hoverStl = el.hoverStyle || hoverStl || {};
+	        el.__hoverStlDirty = true;
+
+	        if (el.__isHover) {
+	            cacheElementStl(el);
+	        }
+	    }
+
+	    /**
+	     * @inner
+	     */
+	    function onElementMouseOver() {
+	        // Only if element is not in emphasis status
+	        !this.__isEmphasis && doEnterHover(this);
+	    }
+
+	    /**
+	     * @inner
+	     */
+	    function onElementMouseOut() {
+	        // Only if element is not in emphasis status
+	        !this.__isEmphasis && doLeaveHover(this);
+	    }
+
+	    /**
+	     * @inner
+	     */
+	    function enterEmphasis() {
+	        this.__isEmphasis = true;
+	        doEnterHover(this);
+	    }
+
+	    /**
+	     * @inner
+	     */
+	    function leaveEmphasis() {
+	        this.__isEmphasis = false;
+	        doLeaveHover(this);
+	    }
+
+	    /**
+	     * Set hover style of element
+	     * @param {module:zrender/Element} el
+	     * @param {Object} [hoverStyle]
+	     */
+	    graphic.setHoverStyle = function (el, hoverStyle) {
+	        el.type === 'group'
+	            ? el.traverse(function (child) {
+	                if (child.type !== 'group') {
+	                    setElementHoverStl(child, hoverStyle);
+	                }
+	            })
+	            : setElementHoverStl(el, hoverStyle);
+	        // Remove previous bound handlers
+	        el.on('mouseover', onElementMouseOver)
+	          .on('mouseout', onElementMouseOut);
+
+	        // Emphasis, normal can be triggered manually
+	        el.on('emphasis', enterEmphasis)
+	          .on('normal', leaveEmphasis);
+	    };
+
+	    /**
+	     * Set text option in the style
+	     * @param {Object} textStyle
+	     * @param {module:echarts/model/Model} labelModel
+	     * @param {string} color
+	     */
+	    graphic.setText = function (textStyle, labelModel, color) {
+	        var labelPosition = labelModel.getShallow('position') || 'inside';
+	        var labelColor = labelPosition.indexOf('inside') >= 0 ? 'white' : color;
+	        var textStyleModel = labelModel.getModel('textStyle');
+	        zrUtil.extend(textStyle, {
+	            textDistance: labelModel.getShallow('distance') || 5,
+	            textFont: textStyleModel.getFont(),
+	            textPosition: labelPosition,
+	            textFill: textStyleModel.getTextColor() || labelColor
+	        });
+	    };
+
+	    function animateOrSetProps(isUpdate, el, props, animatableModel, dataIndex, cb) {
+	        if (typeof dataIndex === 'function') {
+	            cb = dataIndex;
+	            dataIndex = null;
+	        }
+	        var animationEnabled = animatableModel
+	            && (
+	                animatableModel.ifEnableAnimation
+	                ? animatableModel.ifEnableAnimation()
+	                // Directly use animation property
+	                : animatableModel.getShallow('animation')
+	            );
+
+	        if (animationEnabled) {
+	            var postfix = isUpdate ? 'Update' : '';
+	            var duration = animatableModel
+	                && animatableModel.getShallow('animationDuration' + postfix);
+	            var animationEasing = animatableModel
+	                && animatableModel.getShallow('animationEasing' + postfix);
+	            var animationDelay = animatableModel
+	                && animatableModel.getShallow('animationDelay' + postfix);
+	            if (typeof animationDelay === 'function') {
+	                animationDelay = animationDelay(dataIndex);
+	            }
+	            duration > 0
+	                ? el.animateTo(props, duration, animationDelay || 0, animationEasing, cb)
+	                : (el.attr(props), cb && cb());
+	        }
+	        else {
+	            el.attr(props);
+	            cb && cb();
+	        }
+	    }
+	    /**
+	     * Update graphic element properties with or without animation according to the configuration in series
+	     * @param {module:zrender/Element} el
+	     * @param {Object} props
+	     * @param {module:echarts/model/Model} [animatableModel]
+	     * @param {number} [dataIndex]
+	     * @param {Function} [cb]
+	     * @example
+	     *     graphic.updateProps(el, {
+	     *         position: [100, 100]
+	     *     }, seriesModel, dataIndex, function () { console.log('Animation done!'); });
+	     *     // Or
+	     *     graphic.updateProps(el, {
+	     *         position: [100, 100]
+	     *     }, seriesModel, function () { console.log('Animation done!'); });
+	     */
+	    graphic.updateProps = function (el, props, animatableModel, dataIndex, cb) {
+	        animateOrSetProps(true, el, props, animatableModel, dataIndex, cb);
+	    };
+
+	    /**
+	     * Init graphic element properties with or without animation according to the configuration in series
+	     * @param {module:zrender/Element} el
+	     * @param {Object} props
+	     * @param {module:echarts/model/Model} [animatableModel]
+	     * @param {number} [dataIndex]
+	     * @param {Function} cb
+	     */
+	    graphic.initProps = function (el, props, animatableModel, dataIndex, cb) {
+	        animateOrSetProps(false, el, props, animatableModel, dataIndex, cb);
+	    };
+
+	    /**
+	     * Get transform matrix of target (param target),
+	     * in coordinate of its ancestor (param ancestor)
+	     *
+	     * @param {module:zrender/mixin/Transformable} target
+	     * @param {module:zrender/mixin/Transformable} [ancestor]
+	     */
+	    graphic.getTransform = function (target, ancestor) {
+	        var mat = matrix.identity([]);
+
+	        while (target && target !== ancestor) {
+	            matrix.mul(mat, target.getLocalTransform(), mat);
+	            target = target.parent;
+	        }
+
+	        return mat;
+	    };
+
+	    /**
+	     * Apply transform to an vertex.
+	     * @param {Array.<number>} vertex [x, y]
+	     * @param {Array.<number>} transform Transform matrix: like [1, 0, 0, 1, 0, 0]
+	     * @param {boolean=} invert Whether use invert matrix.
+	     * @return {Array.<number>} [x, y]
+	     */
+	    graphic.applyTransform = function (vertex, transform, invert) {
+	        if (invert) {
+	            transform = matrix.invert([], transform);
+	        }
+	        return vector.applyTransform([], vertex, transform);
+	    };
+
+	    /**
+	     * @param {string} direction 'left' 'right' 'top' 'bottom'
+	     * @param {Array.<number>} transform Transform matrix: like [1, 0, 0, 1, 0, 0]
+	     * @param {boolean=} invert Whether use invert matrix.
+	     * @return {string} Transformed direction. 'left' 'right' 'top' 'bottom'
+	     */
+	    graphic.transformDirection = function (direction, transform, invert) {
+
+	        // Pick a base, ensure that transform result will not be (0, 0).
+	        var hBase = (transform[4] === 0 || transform[5] === 0 || transform[0] === 0)
+	            ? 1 : Math.abs(2 * transform[4] / transform[0]);
+	        var vBase = (transform[4] === 0 || transform[5] === 0 || transform[2] === 0)
+	            ? 1 : Math.abs(2 * transform[4] / transform[2]);
+
+	        var vertex = [
+	            direction === 'left' ? -hBase : direction === 'right' ? hBase : 0,
+	            direction === 'top' ? -vBase : direction === 'bottom' ? vBase : 0
+	        ];
+
+	        vertex = graphic.applyTransform(vertex, transform, invert);
+
+	        return Math.abs(vertex[0]) > Math.abs(vertex[1])
+	            ? (vertex[0] > 0 ? 'right' : 'left')
+	            : (vertex[1] > 0 ? 'bottom' : 'top');
+	    };
+
+	    /**
+	     * Apply group transition animation from g1 to g2
+	     */
+	    graphic.groupTransition = function (g1, g2, animatableModel, cb) {
+	        if (!g1 || !g2) {
+	            return;
+	        }
+
+	        function getElMap(g) {
+	            var elMap = {};
+	            g.traverse(function (el) {
+	                if (!el.isGroup && el.anid) {
+	                    elMap[el.anid] = el;
+	                }
+	            });
+	            return elMap;
+	        }
+	        function getAnimatableProps(el) {
+	            var obj = {
+	                position: vector.clone(el.position),
+	                rotation: el.rotation
+	            };
+	            if (el.shape) {
+	                obj.shape = zrUtil.extend({}, el.shape);
+	            }
+	            return obj;
+	        }
+	        var elMap1 = getElMap(g1);
+
+	        g2.traverse(function (el) {
+	            if (!el.isGroup && el.anid) {
+	                var oldEl = elMap1[el.anid];
+	                if (oldEl) {
+	                    var newProp = getAnimatableProps(el);
+	                    el.attr(getAnimatableProps(oldEl));
+	                    graphic.updateProps(el, newProp, animatableModel, el.dataIndex);
+	                }
+	                // else {
+	                //     if (el.previousProps) {
+	                //         graphic.updateProps
+	                //     }
+	                // }
+	            }
+	        });
+	    };
+
+	    module.exports = graphic;
+
+
+/***/ },
+/* 44 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var Path = __webpack_require__(45);
+	    var PathProxy = __webpack_require__(49);
+	    var transformPath = __webpack_require__(60);
+	    var matrix = __webpack_require__(11);
+
+	    // command chars
+	    var cc = [
+	        'm', 'M', 'l', 'L', 'v', 'V', 'h', 'H', 'z', 'Z',
+	        'c', 'C', 'q', 'Q', 't', 'T', 's', 'S', 'a', 'A'
+	    ];
+
+	    var mathSqrt = Math.sqrt;
+	    var mathSin = Math.sin;
+	    var mathCos = Math.cos;
+	    var PI = Math.PI;
+
+	    var vMag = function(v) {
+	        return Math.sqrt(v[0] * v[0] + v[1] * v[1]);
+	    };
+	    var vRatio = function(u, v) {
+	        return (u[0] * v[0] + u[1] * v[1]) / (vMag(u) * vMag(v));
+	    };
+	    var vAngle = function(u, v) {
+	        return (u[0] * v[1] < u[1] * v[0] ? -1 : 1)
+	                * Math.acos(vRatio(u, v));
+	    };
+
+	    function processArc(x1, y1, x2, y2, fa, fs, rx, ry, psiDeg, cmd, path) {
+	        var psi = psiDeg * (PI / 180.0);
+	        var xp = mathCos(psi) * (x1 - x2) / 2.0
+	                 + mathSin(psi) * (y1 - y2) / 2.0;
+	        var yp = -1 * mathSin(psi) * (x1 - x2) / 2.0
+	                 + mathCos(psi) * (y1 - y2) / 2.0;
+
+	        var lambda = (xp * xp) / (rx * rx) + (yp * yp) / (ry * ry);
+
+	        if (lambda > 1) {
+	            rx *= mathSqrt(lambda);
+	            ry *= mathSqrt(lambda);
+	        }
+
+	        var f = (fa === fs ? -1 : 1)
+	            * mathSqrt((((rx * rx) * (ry * ry))
+	                    - ((rx * rx) * (yp * yp))
+	                    - ((ry * ry) * (xp * xp))) / ((rx * rx) * (yp * yp)
+	                    + (ry * ry) * (xp * xp))
+	                ) || 0;
+
+	        var cxp = f * rx * yp / ry;
+	        var cyp = f * -ry * xp / rx;
+
+	        var cx = (x1 + x2) / 2.0
+	                 + mathCos(psi) * cxp
+	                 - mathSin(psi) * cyp;
+	        var cy = (y1 + y2) / 2.0
+	                + mathSin(psi) * cxp
+	                + mathCos(psi) * cyp;
+
+	        var theta = vAngle([ 1, 0 ], [ (xp - cxp) / rx, (yp - cyp) / ry ]);
+	        var u = [ (xp - cxp) / rx, (yp - cyp) / ry ];
+	        var v = [ (-1 * xp - cxp) / rx, (-1 * yp - cyp) / ry ];
+	        var dTheta = vAngle(u, v);
+
+	        if (vRatio(u, v) <= -1) {
+	            dTheta = PI;
+	        }
+	        if (vRatio(u, v) >= 1) {
+	            dTheta = 0;
+	        }
+	        if (fs === 0 && dTheta > 0) {
+	            dTheta = dTheta - 2 * PI;
+	        }
+	        if (fs === 1 && dTheta < 0) {
+	            dTheta = dTheta + 2 * PI;
+	        }
+
+	        path.addData(cmd, cx, cy, rx, ry, theta, dTheta, psi, fs);
+	    }
+
+	    function createPathProxyFromString(data) {
+	        if (!data) {
+	            return [];
+	        }
+
+	        // command string
+	        var cs = data.replace(/-/g, ' -')
+	            .replace(/  /g, ' ')
+	            .replace(/ /g, ',')
+	            .replace(/,,/g, ',');
+
+	        var n;
+	        // create pipes so that we can split the data
+	        for (n = 0; n < cc.length; n++) {
+	            cs = cs.replace(new RegExp(cc[n], 'g'), '|' + cc[n]);
+	        }
+
+	        // create array
+	        var arr = cs.split('|');
+	        // init context point
+	        var cpx = 0;
+	        var cpy = 0;
+
+	        var path = new PathProxy();
+	        var CMD = PathProxy.CMD;
+
+	        var prevCmd;
+	        for (n = 1; n < arr.length; n++) {
+	            var str = arr[n];
+	            var c = str.charAt(0);
+	            var off = 0;
+	            var p = str.slice(1).replace(/e,-/g, 'e-').split(',');
+	            var cmd;
+
+	            if (p.length > 0 && p[0] === '') {
+	                p.shift();
+	            }
+
+	            for (var i = 0; i < p.length; i++) {
+	                p[i] = parseFloat(p[i]);
+	            }
+	            while (off < p.length && !isNaN(p[off])) {
+	                if (isNaN(p[0])) {
+	                    break;
+	                }
+	                var ctlPtx;
+	                var ctlPty;
+
+	                var rx;
+	                var ry;
+	                var psi;
+	                var fa;
+	                var fs;
+
+	                var x1 = cpx;
+	                var y1 = cpy;
+
+	                // convert l, H, h, V, and v to L
+	                switch (c) {
+	                    case 'l':
+	                        cpx += p[off++];
+	                        cpy += p[off++];
+	                        cmd = CMD.L;
+	                        path.addData(cmd, cpx, cpy);
+	                        break;
+	                    case 'L':
+	                        cpx = p[off++];
+	                        cpy = p[off++];
+	                        cmd = CMD.L;
+	                        path.addData(cmd, cpx, cpy);
+	                        break;
+	                    case 'm':
+	                        cpx += p[off++];
+	                        cpy += p[off++];
+	                        cmd = CMD.M;
+	                        path.addData(cmd, cpx, cpy);
+	                        c = 'l';
+	                        break;
+	                    case 'M':
+	                        cpx = p[off++];
+	                        cpy = p[off++];
+	                        cmd = CMD.M;
+	                        path.addData(cmd, cpx, cpy);
+	                        c = 'L';
+	                        break;
+	                    case 'h':
+	                        cpx += p[off++];
+	                        cmd = CMD.L;
+	                        path.addData(cmd, cpx, cpy);
+	                        break;
+	                    case 'H':
+	                        cpx = p[off++];
+	                        cmd = CMD.L;
+	                        path.addData(cmd, cpx, cpy);
+	                        break;
+	                    case 'v':
+	                        cpy += p[off++];
+	                        cmd = CMD.L;
+	                        path.addData(cmd, cpx, cpy);
+	                        break;
+	                    case 'V':
+	                        cpy = p[off++];
+	                        cmd = CMD.L;
+	                        path.addData(cmd, cpx, cpy);
+	                        break;
+	                    case 'C':
+	                        cmd = CMD.C;
+	                        path.addData(
+	                            cmd, p[off++], p[off++], p[off++], p[off++], p[off++], p[off++]
+	                        );
+	                        cpx = p[off - 2];
+	                        cpy = p[off - 1];
+	                        break;
+	                    case 'c':
+	                        cmd = CMD.C;
+	                        path.addData(
+	                            cmd,
+	                            p[off++] + cpx, p[off++] + cpy,
+	                            p[off++] + cpx, p[off++] + cpy,
+	                            p[off++] + cpx, p[off++] + cpy
+	                        );
+	                        cpx += p[off - 2];
+	                        cpy += p[off - 1];
+	                        break;
+	                    case 'S':
+	                        ctlPtx = cpx;
+	                        ctlPty = cpy;
+	                        var len = path.len();
+	                        var pathData = path.data;
+	                        if (prevCmd === CMD.C) {
+	                            ctlPtx += cpx - pathData[len - 4];
+	                            ctlPty += cpy - pathData[len - 3];
+	                        }
+	                        cmd = CMD.C;
+	                        x1 = p[off++];
+	                        y1 = p[off++];
+	                        cpx = p[off++];
+	                        cpy = p[off++];
+	                        path.addData(cmd, ctlPtx, ctlPty, x1, y1, cpx, cpy);
+	                        break;
+	                    case 's':
+	                        ctlPtx = cpx;
+	                        ctlPty = cpy;
+	                        var len = path.len();
+	                        var pathData = path.data;
+	                        if (prevCmd === CMD.C) {
+	                            ctlPtx += cpx - pathData[len - 4];
+	                            ctlPty += cpy - pathData[len - 3];
+	                        }
+	                        cmd = CMD.C;
+	                        x1 = cpx + p[off++];
+	                        y1 = cpy + p[off++];
+	                        cpx += p[off++];
+	                        cpy += p[off++];
+	                        path.addData(cmd, ctlPtx, ctlPty, x1, y1, cpx, cpy);
+	                        break;
+	                    case 'Q':
+	                        x1 = p[off++];
+	                        y1 = p[off++];
+	                        cpx = p[off++];
+	                        cpy = p[off++];
+	                        cmd = CMD.Q;
+	                        path.addData(cmd, x1, y1, cpx, cpy);
+	                        break;
+	                    case 'q':
+	                        x1 = p[off++] + cpx;
+	                        y1 = p[off++] + cpy;
+	                        cpx += p[off++];
+	                        cpy += p[off++];
+	                        cmd = CMD.Q;
+	                        path.addData(cmd, x1, y1, cpx, cpy);
+	                        break;
+	                    case 'T':
+	                        ctlPtx = cpx;
+	                        ctlPty = cpy;
+	                        var len = path.len();
+	                        var pathData = path.data;
+	                        if (prevCmd === CMD.Q) {
+	                            ctlPtx += cpx - pathData[len - 4];
+	                            ctlPty += cpy - pathData[len - 3];
+	                        }
+	                        cpx = p[off++];
+	                        cpy = p[off++];
+	                        cmd = CMD.Q;
+	                        path.addData(cmd, ctlPtx, ctlPty, cpx, cpy);
+	                        break;
+	                    case 't':
+	                        ctlPtx = cpx;
+	                        ctlPty = cpy;
+	                        var len = path.len();
+	                        var pathData = path.data;
+	                        if (prevCmd === CMD.Q) {
+	                            ctlPtx += cpx - pathData[len - 4];
+	                            ctlPty += cpy - pathData[len - 3];
+	                        }
+	                        cpx += p[off++];
+	                        cpy += p[off++];
+	                        cmd = CMD.Q;
+	                        path.addData(cmd, ctlPtx, ctlPty, cpx, cpy);
+	                        break;
+	                    case 'A':
+	                        rx = p[off++];
+	                        ry = p[off++];
+	                        psi = p[off++];
+	                        fa = p[off++];
+	                        fs = p[off++];
+
+	                        x1 = cpx, y1 = cpy;
+	                        cpx = p[off++];
+	                        cpy = p[off++];
+	                        cmd = CMD.A;
+	                        processArc(
+	                            x1, y1, cpx, cpy, fa, fs, rx, ry, psi, cmd, path
+	                        );
+	                        break;
+	                    case 'a':
+	                        rx = p[off++];
+	                        ry = p[off++];
+	                        psi = p[off++];
+	                        fa = p[off++];
+	                        fs = p[off++];
+
+	                        x1 = cpx, y1 = cpy;
+	                        cpx += p[off++];
+	                        cpy += p[off++];
+	                        cmd = CMD.A;
+	                        processArc(
+	                            x1, y1, cpx, cpy, fa, fs, rx, ry, psi, cmd, path
+	                        );
+	                        break;
+	                }
+	            }
+
+	            if (c === 'z' || c === 'Z') {
+	                cmd = CMD.Z;
+	                path.addData(cmd);
+	            }
+
+	            prevCmd = cmd;
+	        }
+
+	        path.toStatic();
+
+	        return path;
+	    }
+
+	    // TODO Optimize double memory cost problem
+	    function createPathOptions(str, opts) {
+	        var pathProxy = createPathProxyFromString(str);
+	        var transform;
+	        opts = opts || {};
+	        opts.buildPath = function (path) {
+	            path.setData(pathProxy.data);
+	            transform && transformPath(path, transform);
+	            // Svg and vml renderer don't have context
+	            var ctx = path.getContext();
+	            if (ctx) {
+	                path.rebuildPath(ctx);
+	            }
+	        };
+
+	        opts.applyTransform = function (m) {
+	            if (!transform) {
+	                transform = matrix.create();
+	            }
+	            matrix.mul(transform, m, transform);
+	        };
+
+	        return opts;
+	    }
+
+	    module.exports = {
+	        /**
+	         * Create a Path object from path string data
+	         * http://www.w3.org/TR/SVG/paths.html#PathData
+	         * @param  {Object} opts Other options
+	         */
+	        createFromString: function (str, opts) {
+	            return new Path(createPathOptions(str, opts));
+	        },
+
+	        /**
+	         * Create a Path class from path string data
+	         * @param  {string} str
+	         * @param  {Object} opts Other options
+	         */
+	        extendFromString: function (str, opts) {
+	            return Path.extend(createPathOptions(str, opts));
+	        },
+
+	        /**
+	         * Merge multiple paths
+	         */
+	        // TODO Apply transform
+	        // TODO stroke dash
+	        // TODO Optimize double memory cost problem
+	        mergePath: function (pathEls, opts) {
+	            var pathList = [];
+	            var len = pathEls.length;
+	            for (var i = 0; i < len; i++) {
+	                var pathEl = pathEls[i];
+	                if (pathEl.__dirty) {
+	                    pathEl.buildPath(pathEl.path, pathEl.shape, true);
+	                }
+	                pathList.push(pathEl.path);
+	            }
+
+	            var pathBundle = new Path(opts);
+	            pathBundle.buildPath = function (path) {
+	                path.appendPath(pathList);
+	                // Svg and vml renderer don't have context
+	                var ctx = path.getContext();
+	                if (ctx) {
+	                    path.rebuildPath(ctx);
+	                }
+	            };
+
+	            return pathBundle;
+	        }
+	    };
+
+
+/***/ },
+/* 45 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * Path element
+	 * @module zrender/graphic/Path
+	 */
+
+
+
+	    var Displayable = __webpack_require__(46);
+	    var zrUtil = __webpack_require__(4);
+	    var PathProxy = __webpack_require__(49);
+	    var pathContain = __webpack_require__(52);
+
+	    var Pattern = __webpack_require__(59);
+	    var getCanvasPattern = Pattern.prototype.getCanvasPattern;
+
+	    var abs = Math.abs;
+
+	    /**
+	     * @alias module:zrender/graphic/Path
+	     * @extends module:zrender/graphic/Displayable
+	     * @constructor
+	     * @param {Object} opts
+	     */
+	    function Path(opts) {
+	        Displayable.call(this, opts);
+
+	        /**
+	         * @type {module:zrender/core/PathProxy}
+	         * @readOnly
+	         */
+	        this.path = new PathProxy();
+	    }
+
+	    Path.prototype = {
+
+	        constructor: Path,
+
+	        type: 'path',
+
+	        __dirtyPath: true,
+
+	        strokeContainThreshold: 5,
+
+	        brush: function (ctx, prevEl) {
+	            var style = this.style;
+	            var path = this.path;
+	            var hasStroke = style.hasStroke();
+	            var hasFill = style.hasFill();
+	            var fill = style.fill;
+	            var stroke = style.stroke;
+	            var hasFillGradient = hasFill && !!(fill.colorStops);
+	            var hasStrokeGradient = hasStroke && !!(stroke.colorStops);
+	            var hasFillPattern = hasFill && !!(fill.image);
+	            var hasStrokePattern = hasStroke && !!(stroke.image);
+
+	            style.bind(ctx, this, prevEl);
+	            this.setTransform(ctx);
+
+	            if (this.__dirty) {
+	                var rect = this.getBoundingRect();
+	                // Update gradient because bounding rect may changed
+	                if (hasFillGradient) {
+	                    this._fillGradient = style.getGradient(ctx, fill, rect);
+	                }
+	                if (hasStrokeGradient) {
+	                    this._strokeGradient = style.getGradient(ctx, stroke, rect);
+	                }
+	            }
+	            // Use the gradient or pattern
+	            if (hasFillGradient) {
+	                // PENDING If may have affect the state
+	                ctx.fillStyle = this._fillGradient;
+	            }
+	            else if (hasFillPattern) {
+	                ctx.fillStyle = getCanvasPattern.call(fill, ctx);
+	            }
+	            if (hasStrokeGradient) {
+	                ctx.strokeStyle = this._strokeGradient;
+	            }
+	            else if (hasStrokePattern) {
+	                ctx.strokeStyle = getCanvasPattern.call(stroke, ctx);
+	            }
+
+	            var lineDash = style.lineDash;
+	            var lineDashOffset = style.lineDashOffset;
+
+	            var ctxLineDash = !!ctx.setLineDash;
+
+	            // Update path sx, sy
+	            var scale = this.getGlobalScale();
+	            path.setScale(scale[0], scale[1]);
+
+	            // Proxy context
+	            // Rebuild path in following 2 cases
+	            // 1. Path is dirty
+	            // 2. Path needs javascript implemented lineDash stroking.
+	            //    In this case, lineDash information will not be saved in PathProxy
+	            if (this.__dirtyPath || (
+	                lineDash && !ctxLineDash && hasStroke
+	            )) {
+	                path = this.path.beginPath(ctx);
+
+	                // Setting line dash before build path
+	                if (lineDash && !ctxLineDash) {
+	                    path.setLineDash(lineDash);
+	                    path.setLineDashOffset(lineDashOffset);
+	                }
+
+	                this.buildPath(path, this.shape, false);
+
+	                // Clear path dirty flag
+	                this.__dirtyPath = false;
+	            }
+	            else {
+	                // Replay path building
+	                ctx.beginPath();
+	                this.path.rebuildPath(ctx);
+	            }
+
+	            hasFill && path.fill(ctx);
+
+	            if (lineDash && ctxLineDash) {
+	                ctx.setLineDash(lineDash);
+	                ctx.lineDashOffset = lineDashOffset;
+	            }
+
+	            hasStroke && path.stroke(ctx);
+
+	            if (lineDash && ctxLineDash) {
+	                // PENDING
+	                // Remove lineDash
+	                ctx.setLineDash([]);
+	            }
+
+
+	            this.restoreTransform(ctx);
+
+	            // Draw rect text
+	            if (style.text || style.text === 0) {
+	                // var rect = this.getBoundingRect();
+	                this.drawRectText(ctx, this.getBoundingRect());
+	            }
+	        },
+
+	        // When bundling path, some shape may decide if use moveTo to begin a new subpath or closePath
+	        // Like in circle
+	        buildPath: function (ctx, shapeCfg, inBundle) {},
+
+	        getBoundingRect: function () {
+	            var rect = this._rect;
+	            var style = this.style;
+	            var needsUpdateRect = !rect;
+	            if (needsUpdateRect) {
+	                var path = this.path;
+	                if (this.__dirtyPath) {
+	                    path.beginPath();
+	                    this.buildPath(path, this.shape, false);
+	                }
+	                rect = path.getBoundingRect();
+	            }
+	            this._rect = rect;
+
+	            if (style.hasStroke()) {
+	                // Needs update rect with stroke lineWidth when
+	                // 1. Element changes scale or lineWidth
+	                // 2. Shape is changed
+	                var rectWithStroke = this._rectWithStroke || (this._rectWithStroke = rect.clone());
+	                if (this.__dirty || needsUpdateRect) {
+	                    rectWithStroke.copy(rect);
+	                    // FIXME Must after updateTransform
+	                    var w = style.lineWidth;
+	                    // PENDING, Min line width is needed when line is horizontal or vertical
+	                    var lineScale = style.strokeNoScale ? this.getLineScale() : 1;
+
+	                    // Only add extra hover lineWidth when there are no fill
+	                    if (!style.hasFill()) {
+	                        w = Math.max(w, this.strokeContainThreshold || 4);
+	                    }
+	                    // Consider line width
+	                    // Line scale can't be 0;
+	                    if (lineScale > 1e-10) {
+	                        rectWithStroke.width += w / lineScale;
+	                        rectWithStroke.height += w / lineScale;
+	                        rectWithStroke.x -= w / lineScale / 2;
+	                        rectWithStroke.y -= w / lineScale / 2;
+	                    }
+	                }
+
+	                // Return rect with stroke
+	                return rectWithStroke;
+	            }
+
+	            return rect;
+	        },
+
+	        contain: function (x, y) {
+	            var localPos = this.transformCoordToLocal(x, y);
+	            var rect = this.getBoundingRect();
+	            var style = this.style;
+	            x = localPos[0];
+	            y = localPos[1];
+
+	            if (rect.contain(x, y)) {
+	                var pathData = this.path.data;
+	                if (style.hasStroke()) {
+	                    var lineWidth = style.lineWidth;
+	                    var lineScale = style.strokeNoScale ? this.getLineScale() : 1;
+	                    // Line scale can't be 0;
+	                    if (lineScale > 1e-10) {
+	                        // Only add extra hover lineWidth when there are no fill
+	                        if (!style.hasFill()) {
+	                            lineWidth = Math.max(lineWidth, this.strokeContainThreshold);
+	                        }
+	                        if (pathContain.containStroke(
+	                            pathData, lineWidth / lineScale, x, y
+	                        )) {
+	                            return true;
+	                        }
+	                    }
+	                }
+	                if (style.hasFill()) {
+	                    return pathContain.contain(pathData, x, y);
+	                }
+	            }
+	            return false;
+	        },
+
+	        /**
+	         * @param  {boolean} dirtyPath
+	         */
+	        dirty: function (dirtyPath) {
+	            if (dirtyPath == null) {
+	                dirtyPath = true;
+	            }
+	            // Only mark dirty, not mark clean
+	            if (dirtyPath) {
+	                this.__dirtyPath = dirtyPath;
+	                this._rect = null;
+	            }
+
+	            this.__dirty = true;
+
+	            this.__zr && this.__zr.refresh();
+
+	            // Used as a clipping path
+	            if (this.__clipTarget) {
+	                this.__clipTarget.dirty();
+	            }
+	        },
+
+	        /**
+	         * Alias for animate('shape')
+	         * @param {boolean} loop
+	         */
+	        animateShape: function (loop) {
+	            return this.animate('shape', loop);
+	        },
+
+	        // Overwrite attrKV
+	        attrKV: function (key, value) {
+	            // FIXME
+	            if (key === 'shape') {
+	                this.setShape(value);
+	                this.__dirtyPath = true;
+	                this._rect = null;
+	            }
+	            else {
+	                Displayable.prototype.attrKV.call(this, key, value);
+	            }
+	        },
+
+	        /**
+	         * @param {Object|string} key
+	         * @param {*} value
+	         */
+	        setShape: function (key, value) {
+	            var shape = this.shape;
+	            // Path from string may not have shape
+	            if (shape) {
+	                if (zrUtil.isObject(key)) {
+	                    for (var name in key) {
+	                        shape[name] = key[name];
+	                    }
+	                }
+	                else {
+	                    shape[key] = value;
+	                }
+	                this.dirty(true);
+	            }
+	            return this;
+	        },
+
+	        getLineScale: function () {
+	            var m = this.transform;
+	            // Get the line scale.
+	            // Determinant of `m` means how much the area is enlarged by the
+	            // transformation. So its square root can be used as a scale factor
+	            // for width.
+	            return m && abs(m[0] - 1) > 1e-10 && abs(m[3] - 1) > 1e-10
+	                ? Math.sqrt(abs(m[0] * m[3] - m[2] * m[1]))
+	                : 1;
+	        }
+	    };
+
+	    /**
+	     * 扩展一个 Path element, 比如星形，圆等。
+	     * Extend a path element
+	     * @param {Object} props
+	     * @param {string} props.type Path type
+	     * @param {Function} props.init Initialize
+	     * @param {Function} props.buildPath Overwrite buildPath method
+	     * @param {Object} [props.style] Extended default style config
+	     * @param {Object} [props.shape] Extended default shape config
+	     */
+	    Path.extend = function (defaults) {
+	        var Sub = function (opts) {
+	            Path.call(this, opts);
+
+	            if (defaults.style) {
+	                // Extend default style
+	                this.style.extendFrom(defaults.style, false);
+	            }
+
+	            // Extend default shape
+	            var defaultShape = defaults.shape;
+	            if (defaultShape) {
+	                this.shape = this.shape || {};
+	                var thisShape = this.shape;
+	                for (var name in defaultShape) {
+	                    if (
+	                        ! thisShape.hasOwnProperty(name)
+	                        && defaultShape.hasOwnProperty(name)
+	                    ) {
+	                        thisShape[name] = defaultShape[name];
+	                    }
+	                }
+	            }
+
+	            defaults.init && defaults.init.call(this, opts);
+	        };
+
+	        zrUtil.inherits(Sub, Path);
+
+	        // FIXME 不能 extend position, rotation 等引用对象
+	        for (var name in defaults) {
+	            // Extending prototype values and methods
+	            if (name !== 'style' && name !== 'shape') {
+	                Sub.prototype[name] = defaults[name];
+	            }
+	        }
+
+	        return Sub;
+	    };
+
+	    zrUtil.inherits(Path, Displayable);
+
+	    module.exports = Path;
+
+
+/***/ },
+/* 46 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * 可绘制的图形基类
+	 * Base class of all displayable graphic objects
+	 * @module zrender/graphic/Displayable
+	 */
+
+
+
+	    var zrUtil = __webpack_require__(4);
+
+	    var Style = __webpack_require__(47);
+
+	    var Element = __webpack_require__(31);
+	    var RectText = __webpack_require__(48);
+	    // var Stateful = require('./mixin/Stateful');
+
+	    /**
+	     * @alias module:zrender/graphic/Displayable
+	     * @extends module:zrender/Element
+	     * @extends module:zrender/graphic/mixin/RectText
+	     */
+	    function Displayable(opts) {
+
+	        opts = opts || {};
+
+	        Element.call(this, opts);
+
+	        // Extend properties
+	        for (var name in opts) {
+	            if (
+	                opts.hasOwnProperty(name) &&
+	                name !== 'style'
+	            ) {
+	                this[name] = opts[name];
+	            }
+	        }
+
+	        /**
+	         * @type {module:zrender/graphic/Style}
+	         */
+	        this.style = new Style(opts.style);
+
+	        this._rect = null;
+	        // Shapes for cascade clipping.
+	        this.__clipPaths = [];
+
+	        // FIXME Stateful must be mixined after style is setted
+	        // Stateful.call(this, opts);
+	    }
+
+	    Displayable.prototype = {
+
+	        constructor: Displayable,
+
+	        type: 'displayable',
+
+	        /**
+	         * Displayable 是否为脏，Painter 中会根据该标记判断是否需要是否需要重新绘制
+	         * Dirty flag. From which painter will determine if this displayable object needs brush
+	         * @name module:zrender/graphic/Displayable#__dirty
+	         * @type {boolean}
+	         */
+	        __dirty: true,
+
+	        /**
+	         * 图形是否可见，为true时不绘制图形，但是仍能触发鼠标事件
+	         * If ignore drawing of the displayable object. Mouse event will still be triggered
+	         * @name module:/zrender/graphic/Displayable#invisible
+	         * @type {boolean}
+	         * @default false
+	         */
+	        invisible: false,
+
+	        /**
+	         * @name module:/zrender/graphic/Displayable#z
+	         * @type {number}
+	         * @default 0
+	         */
+	        z: 0,
+
+	        /**
+	         * @name module:/zrender/graphic/Displayable#z
+	         * @type {number}
+	         * @default 0
+	         */
+	        z2: 0,
+
+	        /**
+	         * z层level，决定绘画在哪层canvas中
+	         * @name module:/zrender/graphic/Displayable#zlevel
+	         * @type {number}
+	         * @default 0
+	         */
+	        zlevel: 0,
+
+	        /**
+	         * 是否可拖拽
+	         * @name module:/zrender/graphic/Displayable#draggable
+	         * @type {boolean}
+	         * @default false
+	         */
+	        draggable: false,
+
+	        /**
+	         * 是否正在拖拽
+	         * @name module:/zrender/graphic/Displayable#draggable
+	         * @type {boolean}
+	         * @default false
+	         */
+	        dragging: false,
+
+	        /**
+	         * 是否相应鼠标事件
+	         * @name module:/zrender/graphic/Displayable#silent
+	         * @type {boolean}
+	         * @default false
+	         */
+	        silent: false,
+
+	        /**
+	         * If enable culling
+	         * @type {boolean}
+	         * @default false
+	         */
+	        culling: false,
+
+	        /**
+	         * Mouse cursor when hovered
+	         * @name module:/zrender/graphic/Displayable#cursor
+	         * @type {string}
+	         */
+	        cursor: 'pointer',
+
+	        /**
+	         * If hover area is bounding rect
+	         * @name module:/zrender/graphic/Displayable#rectHover
+	         * @type {string}
+	         */
+	        rectHover: false,
+
+	        /**
+	         * Render the element progressively when the value >= 0,
+	         * usefull for large data.
+	         * @type {number}
+	         */
+	        progressive: -1,
+
+	        beforeBrush: function (ctx) {},
+
+	        afterBrush: function (ctx) {},
+
+	        /**
+	         * 图形绘制方法
+	         * @param {Canvas2DRenderingContext} ctx
+	         */
+	        // Interface
+	        brush: function (ctx, prevEl) {},
+
+	        /**
+	         * 获取最小包围盒
+	         * @return {module:zrender/core/BoundingRect}
+	         */
+	        // Interface
+	        getBoundingRect: function () {},
+
+	        /**
+	         * 判断坐标 x, y 是否在图形上
+	         * If displayable element contain coord x, y
+	         * @param  {number} x
+	         * @param  {number} y
+	         * @return {boolean}
+	         */
+	        contain: function (x, y) {
+	            return this.rectContain(x, y);
+	        },
+
+	        /**
+	         * @param  {Function} cb
+	         * @param  {}   context
+	         */
+	        traverse: function (cb, context) {
+	            cb.call(context, this);
+	        },
+
+	        /**
+	         * 判断坐标 x, y 是否在图形的包围盒上
+	         * If bounding rect of element contain coord x, y
+	         * @param  {number} x
+	         * @param  {number} y
+	         * @return {boolean}
+	         */
+	        rectContain: function (x, y) {
+	            var coord = this.transformCoordToLocal(x, y);
+	            var rect = this.getBoundingRect();
+	            return rect.contain(coord[0], coord[1]);
+	        },
+
+	        /**
+	         * 标记图形元素为脏，并且在下一帧重绘
+	         * Mark displayable element dirty and refresh next frame
+	         */
+	        dirty: function () {
+	            this.__dirty = true;
+
+	            this._rect = null;
+
+	            this.__zr && this.__zr.refresh();
+	        },
+
+	        /**
+	         * 图形是否会触发事件
+	         * If displayable object binded any event
+	         * @return {boolean}
+	         */
+	        // TODO, 通过 bind 绑定的事件
+	        // isSilent: function () {
+	        //     return !(
+	        //         this.hoverable || this.draggable
+	        //         || this.onmousemove || this.onmouseover || this.onmouseout
+	        //         || this.onmousedown || this.onmouseup || this.onclick
+	        //         || this.ondragenter || this.ondragover || this.ondragleave
+	        //         || this.ondrop
+	        //     );
+	        // },
+	        /**
+	         * Alias for animate('style')
+	         * @param {boolean} loop
+	         */
+	        animateStyle: function (loop) {
+	            return this.animate('style', loop);
+	        },
+
+	        attrKV: function (key, value) {
+	            if (key !== 'style') {
+	                Element.prototype.attrKV.call(this, key, value);
+	            }
+	            else {
+	                this.style.set(value);
+	            }
+	        },
+
+	        /**
+	         * @param {Object|string} key
+	         * @param {*} value
+	         */
+	        setStyle: function (key, value) {
+	            this.style.set(key, value);
+	            this.dirty(false);
+	            return this;
+	        },
+
+	        /**
+	         * Use given style object
+	         * @param  {Object} obj
+	         */
+	        useStyle: function (obj) {
+	            this.style = new Style(obj);
+	            this.dirty(false);
+	            return this;
+	        }
+	    };
+
+	    zrUtil.inherits(Displayable, Element);
+
+	    zrUtil.mixin(Displayable, RectText);
+	    // zrUtil.mixin(Displayable, Stateful);
+
+	    module.exports = Displayable;
+
+
+/***/ },
+/* 47 */
+/***/ function(module, exports) {
+
+	/**
+	 * @module zrender/graphic/Style
+	 */
+
+
+	    var STYLE_COMMON_PROPS = [
+	        ['shadowBlur', 0], ['shadowOffsetX', 0], ['shadowOffsetY', 0], ['shadowColor', '#000'],
+	        ['lineCap', 'butt'], ['lineJoin', 'miter'], ['miterLimit', 10]
+	    ];
+
+	    // var SHADOW_PROPS = STYLE_COMMON_PROPS.slice(0, 4);
+	    // var LINE_PROPS = STYLE_COMMON_PROPS.slice(4);
+
+	    var Style = function (opts) {
+	        this.extendFrom(opts);
+	    };
+
+	    function createLinearGradient(ctx, obj, rect) {
+	        // var size =
+	        var x = obj.x;
+	        var x2 = obj.x2;
+	        var y = obj.y;
+	        var y2 = obj.y2;
+
+	        if (!obj.global) {
+	            x = x * rect.width + rect.x;
+	            x2 = x2 * rect.width + rect.x;
+	            y = y * rect.height + rect.y;
+	            y2 = y2 * rect.height + rect.y;
+	        }
+
+	        var canvasGradient = ctx.createLinearGradient(x, y, x2, y2);
+
+	        return canvasGradient;
+	    }
+
+	    function createRadialGradient(ctx, obj, rect) {
+	        var width = rect.width;
+	        var height = rect.height;
+	        var min = Math.min(width, height);
+
+	        var x = obj.x;
+	        var y = obj.y;
+	        var r = obj.r;
+	        if (!obj.global) {
+	            x = x * width + rect.x;
+	            y = y * height + rect.y;
+	            r = r * min;
+	        }
+
+	        var canvasGradient = ctx.createRadialGradient(x, y, 0, x, y, r);
+
+	        return canvasGradient;
+	    }
+
+
+	    Style.prototype = {
+
+	        constructor: Style,
+
+	        /**
+	         * @type {string}
+	         */
+	        fill: '#000000',
+
+	        /**
+	         * @type {string}
+	         */
+	        stroke: null,
+
+	        /**
+	         * @type {number}
+	         */
+	        opacity: 1,
+
+	        /**
+	         * @type {Array.<number>}
+	         */
+	        lineDash: null,
+
+	        /**
+	         * @type {number}
+	         */
+	        lineDashOffset: 0,
+
+	        /**
+	         * @type {number}
+	         */
+	        shadowBlur: 0,
+
+	        /**
+	         * @type {number}
+	         */
+	        shadowOffsetX: 0,
+
+	        /**
+	         * @type {number}
+	         */
+	        shadowOffsetY: 0,
+
+	        /**
+	         * @type {number}
+	         */
+	        lineWidth: 1,
+
+	        /**
+	         * If stroke ignore scale
+	         * @type {Boolean}
+	         */
+	        strokeNoScale: false,
+
+	        // Bounding rect text configuration
+	        // Not affected by element transform
+	        /**
+	         * @type {string}
+	         */
+	        text: null,
+
+	        /**
+	         * @type {string}
+	         */
+	        textFill: '#000',
+
+	        /**
+	         * @type {string}
+	         */
+	        textStroke: null,
+
+	        /**
+	         * 'inside', 'left', 'right', 'top', 'bottom'
+	         * [x, y]
+	         * @type {string|Array.<number>}
+	         * @default 'inside'
+	         */
+	        textPosition: 'inside',
+
+	        /**
+	         * @type {string}
+	         */
+	        textBaseline: null,
+
+	        /**
+	         * @type {string}
+	         */
+	        textAlign: null,
+
+	        /**
+	         * @type {string}
+	         */
+	        textVerticalAlign: null,
+
+	        /**
+	         * @type {number}
+	         */
+	        textDistance: 5,
+
+	        /**
+	         * @type {number}
+	         */
+	        textShadowBlur: 0,
+
+	        /**
+	         * @type {number}
+	         */
+	        textShadowOffsetX: 0,
+
+	        /**
+	         * @type {number}
+	         */
+	        textShadowOffsetY: 0,
+
+	        /**
+	         * @type {string}
+	         * https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/globalCompositeOperation
+	         */
+	        blend: null,
+
+	        /**
+	         * @param {CanvasRenderingContext2D} ctx
+	         */
+	        bind: function (ctx, el, prevEl) {
+	            var style = this;
+	            var prevStyle = prevEl && prevEl.style;
+	            var firstDraw = !prevStyle;
+
+	            for (var i = 0; i < STYLE_COMMON_PROPS.length; i++) {
+	                var prop = STYLE_COMMON_PROPS[i];
+	                var styleName = prop[0];
+
+	                if (firstDraw || style[styleName] !== prevStyle[styleName]) {
+	                    // FIXME Invalid property value will cause style leak from previous element.
+	                    ctx[styleName] = style[styleName] || prop[1];
+	                }
+	            }
+
+	            if ((firstDraw || style.fill !== prevStyle.fill)) {
+	                ctx.fillStyle = style.fill;
+	            }
+	            if ((firstDraw || style.stroke !== prevStyle.stroke)) {
+	                ctx.strokeStyle = style.stroke;
+	            }
+	            if ((firstDraw || style.opacity !== prevStyle.opacity)) {
+	                ctx.globalAlpha = style.opacity == null ? 1 : style.opacity;
+	            }
+
+	            if ((firstDraw || style.blend !== prevStyle.blend)) {
+	                ctx.globalCompositeOperation = style.blend || 'source-over';
+	            }
+	            if (this.hasStroke()) {
+	                var lineWidth = style.lineWidth;
+	                ctx.lineWidth = lineWidth / (
+	                    (this.strokeNoScale && el && el.getLineScale) ? el.getLineScale() : 1
+	                );
+	            }
+	        },
+
+	        hasFill: function () {
+	            var fill = this.fill;
+	            return fill != null && fill !== 'none';
+	        },
+
+	        hasStroke: function () {
+	            var stroke = this.stroke;
+	            return stroke != null && stroke !== 'none' && this.lineWidth > 0;
+	        },
+
+	        /**
+	         * Extend from other style
+	         * @param {zrender/graphic/Style} otherStyle
+	         * @param {boolean} overwrite
+	         */
+	        extendFrom: function (otherStyle, overwrite) {
+	            if (otherStyle) {
+	                var target = this;
+	                for (var name in otherStyle) {
+	                    if (otherStyle.hasOwnProperty(name)
+	                        && (overwrite || ! target.hasOwnProperty(name))
+	                    ) {
+	                        target[name] = otherStyle[name];
+	                    }
+	                }
+	            }
+	        },
+
+	        /**
+	         * Batch setting style with a given object
+	         * @param {Object|string} obj
+	         * @param {*} [obj]
+	         */
+	        set: function (obj, value) {
+	            if (typeof obj === 'string') {
+	                this[obj] = value;
+	            }
+	            else {
+	                this.extendFrom(obj, true);
+	            }
+	        },
+
+	        /**
+	         * Clone
+	         * @return {zrender/graphic/Style} [description]
+	         */
+	        clone: function () {
+	            var newStyle = new this.constructor();
+	            newStyle.extendFrom(this, true);
+	            return newStyle;
+	        },
+
+	        getGradient: function (ctx, obj, rect) {
+	            var method = obj.type === 'radial' ? createRadialGradient : createLinearGradient;
+	            var canvasGradient = method(ctx, obj, rect);
+	            var colorStops = obj.colorStops;
+	            for (var i = 0; i < colorStops.length; i++) {
+	                canvasGradient.addColorStop(
+	                    colorStops[i].offset, colorStops[i].color
+	                );
+	            }
+	            return canvasGradient;
+	        }
+	    };
+
+	    var styleProto = Style.prototype;
+	    for (var i = 0; i < STYLE_COMMON_PROPS.length; i++) {
+	        var prop = STYLE_COMMON_PROPS[i];
+	        if (!(prop[0] in styleProto)) {
+	            styleProto[prop[0]] = prop[1];
+	        }
+	    }
+
+	    // Provide for others
+	    Style.getGradient = styleProto.getGradient;
+
+	    module.exports = Style;
+
+
+/***/ },
+/* 48 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * Mixin for drawing text in a element bounding rect
+	 * @module zrender/mixin/RectText
+	 */
+
+
+
+	    var textContain = __webpack_require__(8);
+	    var BoundingRect = __webpack_require__(9);
+
+	    var tmpRect = new BoundingRect();
+
+	    var RectText = function () {};
+
+	    function parsePercent(value, maxValue) {
+	        if (typeof value === 'string') {
+	            if (value.lastIndexOf('%') >= 0) {
+	                return parseFloat(value) / 100 * maxValue;
+	            }
+	            return parseFloat(value);
+	        }
+	        return value;
+	    }
+
+	    function setTransform(ctx, m) {
+	        ctx.transform(m[0], m[1], m[2], m[3], m[4], m[5]);
+	    }
+
+	    RectText.prototype = {
+
+	        constructor: RectText,
+
+	        /**
+	         * Draw text in a rect with specified position.
+	         * @param  {CanvasRenderingContext} ctx
+	         * @param  {Object} rect Displayable rect
+	         * @return {Object} textRect Alternative precalculated text bounding rect
+	         */
+	        drawRectText: function (ctx, rect, textRect) {
+	            var style = this.style;
+	            var text = style.text;
+	            // Convert to string
+	            text != null && (text += '');
+	            if (!text) {
+	                return;
+	            }
+
+	            // FIXME
+	            ctx.save();
+
+	            var x;
+	            var y;
+	            var textPosition = style.textPosition;
+	            var distance = style.textDistance;
+	            var align = style.textAlign;
+	            var font = style.textFont || style.font;
+	            var baseline = style.textBaseline;
+	            var verticalAlign = style.textVerticalAlign;
+
+	            textRect = textRect || textContain.getBoundingRect(text, font, align, baseline);
+
+	            // Transform rect to view space
+	            var transform = this.transform;
+	            if (transform) {
+	                tmpRect.copy(rect);
+	                tmpRect.applyTransform(transform);
+	                rect = tmpRect;
+	            }
+
+	            // Text position represented by coord
+	            if (textPosition instanceof Array) {
+	                // Percent
+	                x = rect.x + parsePercent(textPosition[0], rect.width);
+	                y = rect.y + parsePercent(textPosition[1], rect.height);
+	                align = align || 'left';
+	                baseline = baseline || 'top';
+
+	                if (verticalAlign) {
+	                    switch (verticalAlign) {
+	                        case 'middle':
+	                            y -= textRect.height / 2 - textRect.lineHeight / 2;
+	                            break;
+	                        case 'bottom':
+	                            y -= textRect.height - textRect.lineHeight / 2;
+	                            break;
+	                        default:
+	                            y += textRect.lineHeight / 2;
+	                    }
+	                    // Force bseline to be middle
+	                    baseline = 'middle';
+	                }
+	            }
+	            else {
+	                var res = textContain.adjustTextPositionOnRect(
+	                    textPosition, rect, textRect, distance
+	                );
+	                x = res.x;
+	                y = res.y;
+	                // Default align and baseline when has textPosition
+	                align = align || res.textAlign;
+	                baseline = baseline || res.textBaseline;
+	            }
+
+	            // Use canvas default left textAlign. Giving invalid value will cause state not change
+	            ctx.textAlign = align || 'left';
+	            // Use canvas default alphabetic baseline
+	            ctx.textBaseline = baseline || 'alphabetic';
+
+	            var textFill = style.textFill;
+	            var textStroke = style.textStroke;
+	            textFill && (ctx.fillStyle = textFill);
+	            textStroke && (ctx.strokeStyle = textStroke);
+	            ctx.font = font;
+
+	            // Text shadow
+	            // Always set shadowBlur and shadowOffset to avoid leak from displayable
+	            ctx.shadowBlur = style.textShadowBlur;
+	            ctx.shadowColor = style.textShadowColor || 'transparent';
+	            ctx.shadowOffsetX = style.textShadowOffsetX;
+	            ctx.shadowOffsetY = style.textShadowOffsetY;
+
+	            var textLines = text.split('\n');
+	            for (var i = 0; i < textLines.length; i++) {
+	                textFill && ctx.fillText(textLines[i], x, y);
+	                textStroke && ctx.strokeText(textLines[i], x, y);
+	                y += textRect.lineHeight;
+	            }
+
+	            ctx.restore();
+	        }
+	    };
+
+	    module.exports = RectText;
+
+
+/***/ },
+/* 49 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+	/**
+	 * Path 代理，可以在`buildPath`中用于替代`ctx`, 会保存每个path操作的命令到pathCommands属性中
+	 * 可以用于 isInsidePath 判断以及获取boundingRect
+	 *
+	 * @module zrender/core/PathProxy
+	 * @author Yi Shen (http://www.github.com/pissang)
+	 */
+
+	 // TODO getTotalLength, getPointAtLength
+
+
+	    var curve = __webpack_require__(50);
+	    var vec2 = __webpack_require__(10);
+	    var bbox = __webpack_require__(51);
+	    var BoundingRect = __webpack_require__(9);
+	    var dpr = __webpack_require__(41).devicePixelRatio;
+
+	    var CMD = {
+	        M: 1,
+	        L: 2,
+	        C: 3,
+	        Q: 4,
+	        A: 5,
+	        Z: 6,
+	        // Rect
+	        R: 7
+	    };
+
+	    var min = [];
+	    var max = [];
+	    var min2 = [];
+	    var max2 = [];
+	    var mathMin = Math.min;
+	    var mathMax = Math.max;
+	    var mathCos = Math.cos;
+	    var mathSin = Math.sin;
+	    var mathSqrt = Math.sqrt;
+	    var mathAbs = Math.abs;
+
+	    var hasTypedArray = typeof Float32Array != 'undefined';
+
+	    /**
+	     * @alias module:zrender/core/PathProxy
+	     * @constructor
+	     */
+	    var PathProxy = function () {
+
+	        /**
+	         * Path data. Stored as flat array
+	         * @type {Array.<Object>}
+	         */
+	        this.data = [];
+
+	        this._len = 0;
+
+	        this._ctx = null;
+
+	        this._xi = 0;
+	        this._yi = 0;
+
+	        this._x0 = 0;
+	        this._y0 = 0;
+
+	        // Unit x, Unit y. Provide for avoiding drawing that too short line segment
+	        this._ux = 0;
+	        this._uy = 0;
+	    };
+
+	    /**
+	     * 快速计算Path包围盒（并不是最小包围盒）
+	     * @return {Object}
+	     */
+	    PathProxy.prototype = {
+
+	        constructor: PathProxy,
+
+	        _lineDash: null,
+
+	        _dashOffset: 0,
+
+	        _dashIdx: 0,
+
+	        _dashSum: 0,
+
+	        /**
+	         * @readOnly
+	         */
+	        setScale: function (sx, sy) {
+	            this._ux = mathAbs(1 / dpr / sx) || 0;
+	            this._uy = mathAbs(1 / dpr / sy) || 0;
+	        },
+
+	        getContext: function () {
+	            return this._ctx;
+	        },
+
+	        /**
+	         * @param  {CanvasRenderingContext2D} ctx
+	         * @return {module:zrender/core/PathProxy}
+	         */
+	        beginPath: function (ctx) {
+	            this._ctx = ctx;
+
+	            ctx && ctx.beginPath();
+
+	            // Reset
+	            this._len = 0;
+
+	            if (this._lineDash) {
+	                this._lineDash = null;
+
+	                this._dashOffset = 0;
+	            }
+
+	            return this;
+	        },
+
+	        /**
+	         * @param  {number} x
+	         * @param  {number} y
+	         * @return {module:zrender/core/PathProxy}
+	         */
+	        moveTo: function (x, y) {
+	            this.addData(CMD.M, x, y);
+	            this._ctx && this._ctx.moveTo(x, y);
+
+	            // x0, y0, xi, yi 是记录在 _dashedXXXXTo 方法中使用
+	            // xi, yi 记录当前点, x0, y0 在 closePath 的时候回到起始点。
+	            // 有可能在 beginPath 之后直接调用 lineTo，这时候 x0, y0 需要
+	            // 在 lineTo 方法中记录，这里先不考虑这种情况，dashed line 也只在 IE10- 中不支持
+	            this._x0 = x;
+	            this._y0 = y;
+
+	            this._xi = x;
+	            this._yi = y;
+
+	            return this;
+	        },
+
+	        /**
+	         * @param  {number} x
+	         * @param  {number} y
+	         * @return {module:zrender/core/PathProxy}
+	         */
+	        lineTo: function (x, y) {
+	            var exceedUnit = mathAbs(x - this._xi) > this._ux
+	                || mathAbs(y - this._yi) > this._uy
+	                // Force draw the first segment
+	                || this._len < 5;
+
+	            this.addData(CMD.L, x, y);
+
+	            if (this._ctx && exceedUnit) {
+	                this._needsDash() ? this._dashedLineTo(x, y)
+	                    : this._ctx.lineTo(x, y);
+	            }
+	            if (exceedUnit) {
+	                this._xi = x;
+	                this._yi = y;
+	            }
+
+	            return this;
+	        },
+
+	        /**
+	         * @param  {number} x1
+	         * @param  {number} y1
+	         * @param  {number} x2
+	         * @param  {number} y2
+	         * @param  {number} x3
+	         * @param  {number} y3
+	         * @return {module:zrender/core/PathProxy}
+	         */
+	        bezierCurveTo: function (x1, y1, x2, y2, x3, y3) {
+	            this.addData(CMD.C, x1, y1, x2, y2, x3, y3);
+	            if (this._ctx) {
+	                this._needsDash() ? this._dashedBezierTo(x1, y1, x2, y2, x3, y3)
+	                    : this._ctx.bezierCurveTo(x1, y1, x2, y2, x3, y3);
+	            }
+	            this._xi = x3;
+	            this._yi = y3;
+	            return this;
+	        },
+
+	        /**
+	         * @param  {number} x1
+	         * @param  {number} y1
+	         * @param  {number} x2
+	         * @param  {number} y2
+	         * @return {module:zrender/core/PathProxy}
+	         */
+	        quadraticCurveTo: function (x1, y1, x2, y2) {
+	            this.addData(CMD.Q, x1, y1, x2, y2);
+	            if (this._ctx) {
+	                this._needsDash() ? this._dashedQuadraticTo(x1, y1, x2, y2)
+	                    : this._ctx.quadraticCurveTo(x1, y1, x2, y2);
+	            }
+	            this._xi = x2;
+	            this._yi = y2;
+	            return this;
+	        },
+
+	        /**
+	         * @param  {number} cx
+	         * @param  {number} cy
+	         * @param  {number} r
+	         * @param  {number} startAngle
+	         * @param  {number} endAngle
+	         * @param  {boolean} anticlockwise
+	         * @return {module:zrender/core/PathProxy}
+	         */
+	        arc: function (cx, cy, r, startAngle, endAngle, anticlockwise) {
+	            this.addData(
+	                CMD.A, cx, cy, r, r, startAngle, endAngle - startAngle, 0, anticlockwise ? 0 : 1
+	            );
+	            this._ctx && this._ctx.arc(cx, cy, r, startAngle, endAngle, anticlockwise);
+
+	            this._xi = mathCos(endAngle) * r + cx;
+	            this._xi = mathSin(endAngle) * r + cx;
+	            return this;
+	        },
+
+	        // TODO
+	        arcTo: function (x1, y1, x2, y2, radius) {
+	            if (this._ctx) {
+	                this._ctx.arcTo(x1, y1, x2, y2, radius);
+	            }
+	            return this;
+	        },
+
+	        // TODO
+	        rect: function (x, y, w, h) {
+	            this._ctx && this._ctx.rect(x, y, w, h);
+	            this.addData(CMD.R, x, y, w, h);
+	            return this;
+	        },
+
+	        /**
+	         * @return {module:zrender/core/PathProxy}
+	         */
+	        closePath: function () {
+	            this.addData(CMD.Z);
+
+	            var ctx = this._ctx;
+	            var x0 = this._x0;
+	            var y0 = this._y0;
+	            if (ctx) {
+	                this._needsDash() && this._dashedLineTo(x0, y0);
+	                ctx.closePath();
+	            }
+
+	            this._xi = x0;
+	            this._yi = y0;
+	            return this;
+	        },
+
+	        /**
+	         * Context 从外部传入，因为有可能是 rebuildPath 完之后再 fill。
+	         * stroke 同样
+	         * @param {CanvasRenderingContext2D} ctx
+	         * @return {module:zrender/core/PathProxy}
+	         */
+	        fill: function (ctx) {
+	            ctx && ctx.fill();
+	            this.toStatic();
+	        },
+
+	        /**
+	         * @param {CanvasRenderingContext2D} ctx
+	         * @return {module:zrender/core/PathProxy}
+	         */
+	        stroke: function (ctx) {
+	            ctx && ctx.stroke();
+	            this.toStatic();
+	        },
+
+	        /**
+	         * 必须在其它绘制命令前调用
+	         * Must be invoked before all other path drawing methods
+	         * @return {module:zrender/core/PathProxy}
+	         */
+	        setLineDash: function (lineDash) {
+	            if (lineDash instanceof Array) {
+	                this._lineDash = lineDash;
+
+	                this._dashIdx = 0;
+
+	                var lineDashSum = 0;
+	                for (var i = 0; i < lineDash.length; i++) {
+	                    lineDashSum += lineDash[i];
+	                }
+	                this._dashSum = lineDashSum;
+	            }
+	            return this;
+	        },
+
+	        /**
+	         * 必须在其它绘制命令前调用
+	         * Must be invoked before all other path drawing methods
+	         * @return {module:zrender/core/PathProxy}
+	         */
+	        setLineDashOffset: function (offset) {
+	            this._dashOffset = offset;
+	            return this;
+	        },
+
+	        /**
+	         *
+	         * @return {boolean}
+	         */
+	        len: function () {
+	            return this._len;
+	        },
+
+	        /**
+	         * 直接设置 Path 数据
+	         */
+	        setData: function (data) {
+
+	            var len = data.length;
+
+	            if (! (this.data && this.data.length == len) && hasTypedArray) {
+	                this.data = new Float32Array(len);
+	            }
+
+	            for (var i = 0; i < len; i++) {
+	                this.data[i] = data[i];
+	            }
+
+	            this._len = len;
+	        },
+
+	        /**
+	         * 添加子路径
+	         * @param {module:zrender/core/PathProxy|Array.<module:zrender/core/PathProxy>} path
+	         */
+	        appendPath: function (path) {
+	            if (!(path instanceof Array)) {
+	                path = [path];
+	            }
+	            var len = path.length;
+	            var appendSize = 0;
+	            var offset = this._len;
+	            for (var i = 0; i < len; i++) {
+	                appendSize += path[i].len();
+	            }
+	            if (hasTypedArray && (this.data instanceof Float32Array)) {
+	                this.data = new Float32Array(offset + appendSize);
+	            }
+	            for (var i = 0; i < len; i++) {
+	                var appendPathData = path[i].data;
+	                for (var k = 0; k < appendPathData.length; k++) {
+	                    this.data[offset++] = appendPathData[k];
+	                }
+	            }
+	            this._len = offset;
+	        },
+
+	        /**
+	         * 填充 Path 数据。
+	         * 尽量复用而不申明新的数组。大部分图形重绘的指令数据长度都是不变的。
+	         */
+	        addData: function (cmd) {
+	            var data = this.data;
+	            if (this._len + arguments.length > data.length) {
+	                // 因为之前的数组已经转换成静态的 Float32Array
+	                // 所以不够用时需要扩展一个新的动态数组
+	                this._expandData();
+	                data = this.data;
+	            }
+	            for (var i = 0; i < arguments.length; i++) {
+	                data[this._len++] = arguments[i];
+	            }
+
+	            this._prevCmd = cmd;
+	        },
+
+	        _expandData: function () {
+	            // Only if data is Float32Array
+	            if (!(this.data instanceof Array)) {
+	                var newData = [];
+	                for (var i = 0; i < this._len; i++) {
+	                    newData[i] = this.data[i];
+	                }
+	                this.data = newData;
+	            }
+	        },
+
+	        /**
+	         * If needs js implemented dashed line
+	         * @return {boolean}
+	         * @private
+	         */
+	        _needsDash: function () {
+	            return this._lineDash;
+	        },
+
+	        _dashedLineTo: function (x1, y1) {
+	            var dashSum = this._dashSum;
+	            var offset = this._dashOffset;
+	            var lineDash = this._lineDash;
+	            var ctx = this._ctx;
+
+	            var x0 = this._xi;
+	            var y0 = this._yi;
+	            var dx = x1 - x0;
+	            var dy = y1 - y0;
+	            var dist = mathSqrt(dx * dx + dy * dy);
+	            var x = x0;
+	            var y = y0;
+	            var dash;
+	            var nDash = lineDash.length;
+	            var idx;
+	            dx /= dist;
+	            dy /= dist;
+
+	            if (offset < 0) {
+	                // Convert to positive offset
+	                offset = dashSum + offset;
+	            }
+	            offset %= dashSum;
+	            x -= offset * dx;
+	            y -= offset * dy;
+
+	            while ((dx > 0 && x <= x1) || (dx < 0 && x >= x1)
+	            || (dx == 0 && ((dy > 0 && y <= y1) || (dy < 0 && y >= y1)))) {
+	                idx = this._dashIdx;
+	                dash = lineDash[idx];
+	                x += dx * dash;
+	                y += dy * dash;
+	                this._dashIdx = (idx + 1) % nDash;
+	                // Skip positive offset
+	                if ((dx > 0 && x < x0) || (dx < 0 && x > x0) || (dy > 0 && y < y0) || (dy < 0 && y > y0)) {
+	                    continue;
+	                }
+	                ctx[idx % 2 ? 'moveTo' : 'lineTo'](
+	                    dx >= 0 ? mathMin(x, x1) : mathMax(x, x1),
+	                    dy >= 0 ? mathMin(y, y1) : mathMax(y, y1)
+	                );
+	            }
+	            // Offset for next lineTo
+	            dx = x - x1;
+	            dy = y - y1;
+	            this._dashOffset = -mathSqrt(dx * dx + dy * dy);
+	        },
+
+	        // Not accurate dashed line to
+	        _dashedBezierTo: function (x1, y1, x2, y2, x3, y3) {
+	            var dashSum = this._dashSum;
+	            var offset = this._dashOffset;
+	            var lineDash = this._lineDash;
+	            var ctx = this._ctx;
+
+	            var x0 = this._xi;
+	            var y0 = this._yi;
+	            var t;
+	            var dx;
+	            var dy;
+	            var cubicAt = curve.cubicAt;
+	            var bezierLen = 0;
+	            var idx = this._dashIdx;
+	            var nDash = lineDash.length;
+
+	            var x;
+	            var y;
+
+	            var tmpLen = 0;
+
+	            if (offset < 0) {
+	                // Convert to positive offset
+	                offset = dashSum + offset;
+	            }
+	            offset %= dashSum;
+	            // Bezier approx length
+	            for (t = 0; t < 1; t += 0.1) {
+	                dx = cubicAt(x0, x1, x2, x3, t + 0.1)
+	                    - cubicAt(x0, x1, x2, x3, t);
+	                dy = cubicAt(y0, y1, y2, y3, t + 0.1)
+	                    - cubicAt(y0, y1, y2, y3, t);
+	                bezierLen += mathSqrt(dx * dx + dy * dy);
+	            }
+
+	            // Find idx after add offset
+	            for (; idx < nDash; idx++) {
+	                tmpLen += lineDash[idx];
+	                if (tmpLen > offset) {
+	                    break;
+	                }
+	            }
+	            t = (tmpLen - offset) / bezierLen;
+
+	            while (t <= 1) {
+
+	                x = cubicAt(x0, x1, x2, x3, t);
+	                y = cubicAt(y0, y1, y2, y3, t);
+
+	                // Use line to approximate dashed bezier
+	                // Bad result if dash is long
+	                idx % 2 ? ctx.moveTo(x, y)
+	                    : ctx.lineTo(x, y);
+
+	                t += lineDash[idx] / bezierLen;
+
+	                idx = (idx + 1) % nDash;
+	            }
+
+	            // Finish the last segment and calculate the new offset
+	            (idx % 2 !== 0) && ctx.lineTo(x3, y3);
+	            dx = x3 - x;
+	            dy = y3 - y;
+	            this._dashOffset = -mathSqrt(dx * dx + dy * dy);
+	        },
+
+	        _dashedQuadraticTo: function (x1, y1, x2, y2) {
+	            // Convert quadratic to cubic using degree elevation
+	            var x3 = x2;
+	            var y3 = y2;
+	            x2 = (x2 + 2 * x1) / 3;
+	            y2 = (y2 + 2 * y1) / 3;
+	            x1 = (this._xi + 2 * x1) / 3;
+	            y1 = (this._yi + 2 * y1) / 3;
+
+	            this._dashedBezierTo(x1, y1, x2, y2, x3, y3);
+	        },
+
+	        /**
+	         * 转成静态的 Float32Array 减少堆内存占用
+	         * Convert dynamic array to static Float32Array
+	         */
+	        toStatic: function () {
+	            var data = this.data;
+	            if (data instanceof Array) {
+	                data.length = this._len;
+	                if (hasTypedArray) {
+	                    this.data = new Float32Array(data);
+	                }
+	            }
+	        },
+
+	        /**
+	         * @return {module:zrender/core/BoundingRect}
+	         */
+	        getBoundingRect: function () {
+	            min[0] = min[1] = min2[0] = min2[1] = Number.MAX_VALUE;
+	            max[0] = max[1] = max2[0] = max2[1] = -Number.MAX_VALUE;
+
+	            var data = this.data;
+	            var xi = 0;
+	            var yi = 0;
+	            var x0 = 0;
+	            var y0 = 0;
+
+	            for (var i = 0; i < data.length;) {
+	                var cmd = data[i++];
+
+	                if (i == 1) {
+	                    // 如果第一个命令是 L, C, Q
+	                    // 则 previous point 同绘制命令的第一个 point
+	                    //
+	                    // 第一个命令为 Arc 的情况下会在后面特殊处理
+	                    xi = data[i];
+	                    yi = data[i + 1];
+
+	                    x0 = xi;
+	                    y0 = yi;
+	                }
+
+	                switch (cmd) {
+	                    case CMD.M:
+	                        // moveTo 命令重新创建一个新的 subpath, 并且更新新的起点
+	                        // 在 closePath 的时候使用
+	                        x0 = data[i++];
+	                        y0 = data[i++];
+	                        xi = x0;
+	                        yi = y0;
+	                        min2[0] = x0;
+	                        min2[1] = y0;
+	                        max2[0] = x0;
+	                        max2[1] = y0;
+	                        break;
+	                    case CMD.L:
+	                        bbox.fromLine(xi, yi, data[i], data[i + 1], min2, max2);
+	                        xi = data[i++];
+	                        yi = data[i++];
+	                        break;
+	                    case CMD.C:
+	                        bbox.fromCubic(
+	                            xi, yi, data[i++], data[i++], data[i++], data[i++], data[i], data[i + 1],
+	                            min2, max2
+	                        );
+	                        xi = data[i++];
+	                        yi = data[i++];
+	                        break;
+	                    case CMD.Q:
+	                        bbox.fromQuadratic(
+	                            xi, yi, data[i++], data[i++], data[i], data[i + 1],
+	                            min2, max2
+	                        );
+	                        xi = data[i++];
+	                        yi = data[i++];
+	                        break;
+	                    case CMD.A:
+	                        // TODO Arc 判断的开销比较大
+	                        var cx = data[i++];
+	                        var cy = data[i++];
+	                        var rx = data[i++];
+	                        var ry = data[i++];
+	                        var startAngle = data[i++];
+	                        var endAngle = data[i++] + startAngle;
+	                        // TODO Arc 旋转
+	                        var psi = data[i++];
+	                        var anticlockwise = 1 - data[i++];
+
+	                        if (i == 1) {
+	                            // 直接使用 arc 命令
+	                            // 第一个命令起点还未定义
+	                            x0 = mathCos(startAngle) * rx + cx;
+	                            y0 = mathSin(startAngle) * ry + cy;
+	                        }
+
+	                        bbox.fromArc(
+	                            cx, cy, rx, ry, startAngle, endAngle,
+	                            anticlockwise, min2, max2
+	                        );
+
+	                        xi = mathCos(endAngle) * rx + cx;
+	                        yi = mathSin(endAngle) * ry + cy;
+	                        break;
+	                    case CMD.R:
+	                        x0 = xi = data[i++];
+	                        y0 = yi = data[i++];
+	                        var width = data[i++];
+	                        var height = data[i++];
+	                        // Use fromLine
+	                        bbox.fromLine(x0, y0, x0 + width, y0 + height, min2, max2);
+	                        break;
+	                    case CMD.Z:
+	                        xi = x0;
+	                        yi = y0;
+	                        break;
+	                }
+
+	                // Union
+	                vec2.min(min, min, min2);
+	                vec2.max(max, max, max2);
+	            }
+
+	            // No data
+	            if (i === 0) {
+	                min[0] = min[1] = max[0] = max[1] = 0;
+	            }
+
+	            return new BoundingRect(
+	                min[0], min[1], max[0] - min[0], max[1] - min[1]
+	            );
+	        },
+
+	        /**
+	         * Rebuild path from current data
+	         * Rebuild path will not consider javascript implemented line dash.
+	         * @param {CanvasRenderingContext} ctx
+	         */
+	        rebuildPath: function (ctx) {
+	            var d = this.data;
+	            var x0, y0;
+	            var xi, yi;
+	            var x, y;
+	            var ux = this._ux;
+	            var uy = this._uy;
+	            var len = this._len;
+	            for (var i = 0; i < len;) {
+	                var cmd = d[i++];
+
+	                if (i == 1) {
+	                    // 如果第一个命令是 L, C, Q
+	                    // 则 previous point 同绘制命令的第一个 point
+	                    //
+	                    // 第一个命令为 Arc 的情况下会在后面特殊处理
+	                    xi = d[i];
+	                    yi = d[i + 1];
+
+	                    x0 = xi;
+	                    y0 = yi;
+	                }
+	                switch (cmd) {
+	                    case CMD.M:
+	                        x0 = xi = d[i++];
+	                        y0 = yi = d[i++];
+	                        ctx.moveTo(xi, yi);
+	                        break;
+	                    case CMD.L:
+	                        x = d[i++];
+	                        y = d[i++];
+	                        // Not draw too small seg between
+	                        if (mathAbs(x - xi) > ux || mathAbs(y - yi) > uy || i === len - 1) {
+	                            ctx.lineTo(x, y);
+	                            xi = x;
+	                            yi = y;
+	                        }
+	                        break;
+	                    case CMD.C:
+	                        ctx.bezierCurveTo(
+	                            d[i++], d[i++], d[i++], d[i++], d[i++], d[i++]
+	                        );
+	                        xi = d[i - 2];
+	                        yi = d[i - 1];
+	                        break;
+	                    case CMD.Q:
+	                        ctx.quadraticCurveTo(d[i++], d[i++], d[i++], d[i++]);
+	                        xi = d[i - 2];
+	                        yi = d[i - 1];
+	                        break;
+	                    case CMD.A:
+	                        var cx = d[i++];
+	                        var cy = d[i++];
+	                        var rx = d[i++];
+	                        var ry = d[i++];
+	                        var theta = d[i++];
+	                        var dTheta = d[i++];
+	                        var psi = d[i++];
+	                        var fs = d[i++];
+	                        var r = (rx > ry) ? rx : ry;
+	                        var scaleX = (rx > ry) ? 1 : rx / ry;
+	                        var scaleY = (rx > ry) ? ry / rx : 1;
+	                        var isEllipse = Math.abs(rx - ry) > 1e-3;
+	                        var endAngle = theta + dTheta;
+	                        if (isEllipse) {
+	                            ctx.translate(cx, cy);
+	                            ctx.rotate(psi);
+	                            ctx.scale(scaleX, scaleY);
+	                            ctx.arc(0, 0, r, theta, endAngle, 1 - fs);
+	                            ctx.scale(1 / scaleX, 1 / scaleY);
+	                            ctx.rotate(-psi);
+	                            ctx.translate(-cx, -cy);
+	                        }
+	                        else {
+	                            ctx.arc(cx, cy, r, theta, endAngle, 1 - fs);
+	                        }
+
+	                        if (i == 1) {
+	                            // 直接使用 arc 命令
+	                            // 第一个命令起点还未定义
+	                            x0 = mathCos(theta) * rx + cx;
+	                            y0 = mathSin(theta) * ry + cy;
+	                        }
+	                        xi = mathCos(endAngle) * rx + cx;
+	                        yi = mathSin(endAngle) * ry + cy;
+	                        break;
+	                    case CMD.R:
+	                        x0 = xi = d[i];
+	                        y0 = yi = d[i + 1];
+	                        ctx.rect(d[i++], d[i++], d[i++], d[i++]);
+	                        break;
+	                    case CMD.Z:
+	                        ctx.closePath();
+	                        xi = x0;
+	                        yi = y0;
+	                }
+	            }
+	        }
+	    };
+
+	    PathProxy.CMD = CMD;
+
+	    module.exports = PathProxy;
+
+
+/***/ },
+/* 50 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+	/**
+	 * 曲线辅助模块
+	 * @module zrender/core/curve
+	 * @author pissang(https://www.github.com/pissang)
+	 */
+
+
+	    var vec2 = __webpack_require__(10);
+	    var v2Create = vec2.create;
+	    var v2DistSquare = vec2.distSquare;
+	    var mathPow = Math.pow;
+	    var mathSqrt = Math.sqrt;
+
+	    var EPSILON = 1e-8;
+	    var EPSILON_NUMERIC = 1e-4;
+
+	    var THREE_SQRT = mathSqrt(3);
+	    var ONE_THIRD = 1 / 3;
+
+	    // 临时变量
+	    var _v0 = v2Create();
+	    var _v1 = v2Create();
+	    var _v2 = v2Create();
+	    // var _v3 = vec2.create();
+
+	    function isAroundZero(val) {
+	        return val > -EPSILON && val < EPSILON;
+	    }
+	    function isNotAroundZero(val) {
+	        return val > EPSILON || val < -EPSILON;
+	    }
+	    /**
+	     * 计算三次贝塞尔值
+	     * @memberOf module:zrender/core/curve
+	     * @param  {number} p0
+	     * @param  {number} p1
+	     * @param  {number} p2
+	     * @param  {number} p3
+	     * @param  {number} t
+	     * @return {number}
+	     */
+	    function cubicAt(p0, p1, p2, p3, t) {
+	        var onet = 1 - t;
+	        return onet * onet * (onet * p0 + 3 * t * p1)
+	             + t * t * (t * p3 + 3 * onet * p2);
+	    }
+
+	    /**
+	     * 计算三次贝塞尔导数值
+	     * @memberOf module:zrender/core/curve
+	     * @param  {number} p0
+	     * @param  {number} p1
+	     * @param  {number} p2
+	     * @param  {number} p3
+	     * @param  {number} t
+	     * @return {number}
+	     */
+	    function cubicDerivativeAt(p0, p1, p2, p3, t) {
+	        var onet = 1 - t;
+	        return 3 * (
+	            ((p1 - p0) * onet + 2 * (p2 - p1) * t) * onet
+	            + (p3 - p2) * t * t
+	        );
+	    }
+
+	    /**
+	     * 计算三次贝塞尔方程根，使用盛金公式
+	     * @memberOf module:zrender/core/curve
+	     * @param  {number} p0
+	     * @param  {number} p1
+	     * @param  {number} p2
+	     * @param  {number} p3
+	     * @param  {number} val
+	     * @param  {Array.<number>} roots
+	     * @return {number} 有效根数目
+	     */
+	    function cubicRootAt(p0, p1, p2, p3, val, roots) {
+	        // Evaluate roots of cubic functions
+	        var a = p3 + 3 * (p1 - p2) - p0;
+	        var b = 3 * (p2 - p1 * 2 + p0);
+	        var c = 3 * (p1  - p0);
+	        var d = p0 - val;
+
+	        var A = b * b - 3 * a * c;
+	        var B = b * c - 9 * a * d;
+	        var C = c * c - 3 * b * d;
+
+	        var n = 0;
+
+	        if (isAroundZero(A) && isAroundZero(B)) {
+	            if (isAroundZero(b)) {
+	                roots[0] = 0;
+	            }
+	            else {
+	                var t1 = -c / b;  //t1, t2, t3, b is not zero
+	                if (t1 >= 0 && t1 <= 1) {
+	                    roots[n++] = t1;
+	                }
+	            }
+	        }
+	        else {
+	            var disc = B * B - 4 * A * C;
+
+	            if (isAroundZero(disc)) {
+	                var K = B / A;
+	                var t1 = -b / a + K;  // t1, a is not zero
+	                var t2 = -K / 2;  // t2, t3
+	                if (t1 >= 0 && t1 <= 1) {
+	                    roots[n++] = t1;
+	                }
+	                if (t2 >= 0 && t2 <= 1) {
+	                    roots[n++] = t2;
+	                }
+	            }
+	            else if (disc > 0) {
+	                var discSqrt = mathSqrt(disc);
+	                var Y1 = A * b + 1.5 * a * (-B + discSqrt);
+	                var Y2 = A * b + 1.5 * a * (-B - discSqrt);
+	                if (Y1 < 0) {
+	                    Y1 = -mathPow(-Y1, ONE_THIRD);
+	                }
+	                else {
+	                    Y1 = mathPow(Y1, ONE_THIRD);
+	                }
+	                if (Y2 < 0) {
+	                    Y2 = -mathPow(-Y2, ONE_THIRD);
+	                }
+	                else {
+	                    Y2 = mathPow(Y2, ONE_THIRD);
+	                }
+	                var t1 = (-b - (Y1 + Y2)) / (3 * a);
+	                if (t1 >= 0 && t1 <= 1) {
+	                    roots[n++] = t1;
+	                }
+	            }
+	            else {
+	                var T = (2 * A * b - 3 * a * B) / (2 * mathSqrt(A * A * A));
+	                var theta = Math.acos(T) / 3;
+	                var ASqrt = mathSqrt(A);
+	                var tmp = Math.cos(theta);
+
+	                var t1 = (-b - 2 * ASqrt * tmp) / (3 * a);
+	                var t2 = (-b + ASqrt * (tmp + THREE_SQRT * Math.sin(theta))) / (3 * a);
+	                var t3 = (-b + ASqrt * (tmp - THREE_SQRT * Math.sin(theta))) / (3 * a);
+	                if (t1 >= 0 && t1 <= 1) {
+	                    roots[n++] = t1;
+	                }
+	                if (t2 >= 0 && t2 <= 1) {
+	                    roots[n++] = t2;
+	                }
+	                if (t3 >= 0 && t3 <= 1) {
+	                    roots[n++] = t3;
+	                }
+	            }
+	        }
+	        return n;
+	    }
+
+	    /**
+	     * 计算三次贝塞尔方程极限值的位置
+	     * @memberOf module:zrender/core/curve
+	     * @param  {number} p0
+	     * @param  {number} p1
+	     * @param  {number} p2
+	     * @param  {number} p3
+	     * @param  {Array.<number>} extrema
+	     * @return {number} 有效数目
+	     */
+	    function cubicExtrema(p0, p1, p2, p3, extrema) {
+	        var b = 6 * p2 - 12 * p1 + 6 * p0;
+	        var a = 9 * p1 + 3 * p3 - 3 * p0 - 9 * p2;
+	        var c = 3 * p1 - 3 * p0;
+
+	        var n = 0;
+	        if (isAroundZero(a)) {
+	            if (isNotAroundZero(b)) {
+	                var t1 = -c / b;
+	                if (t1 >= 0 && t1 <=1) {
+	                    extrema[n++] = t1;
+	                }
+	            }
+	        }
+	        else {
+	            var disc = b * b - 4 * a * c;
+	            if (isAroundZero(disc)) {
+	                extrema[0] = -b / (2 * a);
+	            }
+	            else if (disc > 0) {
+	                var discSqrt = mathSqrt(disc);
+	                var t1 = (-b + discSqrt) / (2 * a);
+	                var t2 = (-b - discSqrt) / (2 * a);
+	                if (t1 >= 0 && t1 <= 1) {
+	                    extrema[n++] = t1;
+	                }
+	                if (t2 >= 0 && t2 <= 1) {
+	                    extrema[n++] = t2;
+	                }
+	            }
+	        }
+	        return n;
+	    }
+
+	    /**
+	     * 细分三次贝塞尔曲线
+	     * @memberOf module:zrender/core/curve
+	     * @param  {number} p0
+	     * @param  {number} p1
+	     * @param  {number} p2
+	     * @param  {number} p3
+	     * @param  {number} t
+	     * @param  {Array.<number>} out
+	     */
+	    function cubicSubdivide(p0, p1, p2, p3, t, out) {
+	        var p01 = (p1 - p0) * t + p0;
+	        var p12 = (p2 - p1) * t + p1;
+	        var p23 = (p3 - p2) * t + p2;
+
+	        var p012 = (p12 - p01) * t + p01;
+	        var p123 = (p23 - p12) * t + p12;
+
+	        var p0123 = (p123 - p012) * t + p012;
+	        // Seg0
+	        out[0] = p0;
+	        out[1] = p01;
+	        out[2] = p012;
+	        out[3] = p0123;
+	        // Seg1
+	        out[4] = p0123;
+	        out[5] = p123;
+	        out[6] = p23;
+	        out[7] = p3;
+	    }
+
+	    /**
+	     * 投射点到三次贝塞尔曲线上，返回投射距离。
+	     * 投射点有可能会有一个或者多个，这里只返回其中距离最短的一个。
+	     * @param {number} x0
+	     * @param {number} y0
+	     * @param {number} x1
+	     * @param {number} y1
+	     * @param {number} x2
+	     * @param {number} y2
+	     * @param {number} x3
+	     * @param {number} y3
+	     * @param {number} x
+	     * @param {number} y
+	     * @param {Array.<number>} [out] 投射点
+	     * @return {number}
+	     */
+	    function cubicProjectPoint(
+	        x0, y0, x1, y1, x2, y2, x3, y3,
+	        x, y, out
+	    ) {
+	        // http://pomax.github.io/bezierinfo/#projections
+	        var t;
+	        var interval = 0.005;
+	        var d = Infinity;
+	        var prev;
+	        var next;
+	        var d1;
+	        var d2;
+
+	        _v0[0] = x;
+	        _v0[1] = y;
+
+	        // 先粗略估计一下可能的最小距离的 t 值
+	        // PENDING
+	        for (var _t = 0; _t < 1; _t += 0.05) {
+	            _v1[0] = cubicAt(x0, x1, x2, x3, _t);
+	            _v1[1] = cubicAt(y0, y1, y2, y3, _t);
+	            d1 = v2DistSquare(_v0, _v1);
+	            if (d1 < d) {
+	                t = _t;
+	                d = d1;
+	            }
+	        }
+	        d = Infinity;
+
+	        // At most 32 iteration
+	        for (var i = 0; i < 32; i++) {
+	            if (interval < EPSILON_NUMERIC) {
+	                break;
+	            }
+	            prev = t - interval;
+	            next = t + interval;
+	            // t - interval
+	            _v1[0] = cubicAt(x0, x1, x2, x3, prev);
+	            _v1[1] = cubicAt(y0, y1, y2, y3, prev);
+
+	            d1 = v2DistSquare(_v1, _v0);
+
+	            if (prev >= 0 && d1 < d) {
+	                t = prev;
+	                d = d1;
+	            }
+	            else {
+	                // t + interval
+	                _v2[0] = cubicAt(x0, x1, x2, x3, next);
+	                _v2[1] = cubicAt(y0, y1, y2, y3, next);
+	                d2 = v2DistSquare(_v2, _v0);
+
+	                if (next <= 1 && d2 < d) {
+	                    t = next;
+	                    d = d2;
+	                }
+	                else {
+	                    interval *= 0.5;
+	                }
+	            }
+	        }
+	        // t
+	        if (out) {
+	            out[0] = cubicAt(x0, x1, x2, x3, t);
+	            out[1] = cubicAt(y0, y1, y2, y3, t);
+	        }
+	        // console.log(interval, i);
+	        return mathSqrt(d);
+	    }
+
+	    /**
+	     * 计算二次方贝塞尔值
+	     * @param  {number} p0
+	     * @param  {number} p1
+	     * @param  {number} p2
+	     * @param  {number} t
+	     * @return {number}
+	     */
+	    function quadraticAt(p0, p1, p2, t) {
+	        var onet = 1 - t;
+	        return onet * (onet * p0 + 2 * t * p1) + t * t * p2;
+	    }
+
+	    /**
+	     * 计算二次方贝塞尔导数值
+	     * @param  {number} p0
+	     * @param  {number} p1
+	     * @param  {number} p2
+	     * @param  {number} t
+	     * @return {number}
+	     */
+	    function quadraticDerivativeAt(p0, p1, p2, t) {
+	        return 2 * ((1 - t) * (p1 - p0) + t * (p2 - p1));
+	    }
+
+	    /**
+	     * 计算二次方贝塞尔方程根
+	     * @param  {number} p0
+	     * @param  {number} p1
+	     * @param  {number} p2
+	     * @param  {number} t
+	     * @param  {Array.<number>} roots
+	     * @return {number} 有效根数目
+	     */
+	    function quadraticRootAt(p0, p1, p2, val, roots) {
+	        var a = p0 - 2 * p1 + p2;
+	        var b = 2 * (p1 - p0);
+	        var c = p0 - val;
+
+	        var n = 0;
+	        if (isAroundZero(a)) {
+	            if (isNotAroundZero(b)) {
+	                var t1 = -c / b;
+	                if (t1 >= 0 && t1 <= 1) {
+	                    roots[n++] = t1;
+	                }
+	            }
+	        }
+	        else {
+	            var disc = b * b - 4 * a * c;
+	            if (isAroundZero(disc)) {
+	                var t1 = -b / (2 * a);
+	                if (t1 >= 0 && t1 <= 1) {
+	                    roots[n++] = t1;
+	                }
+	            }
+	            else if (disc > 0) {
+	                var discSqrt = mathSqrt(disc);
+	                var t1 = (-b + discSqrt) / (2 * a);
+	                var t2 = (-b - discSqrt) / (2 * a);
+	                if (t1 >= 0 && t1 <= 1) {
+	                    roots[n++] = t1;
+	                }
+	                if (t2 >= 0 && t2 <= 1) {
+	                    roots[n++] = t2;
+	                }
+	            }
+	        }
+	        return n;
+	    }
+
+	    /**
+	     * 计算二次贝塞尔方程极限值
+	     * @memberOf module:zrender/core/curve
+	     * @param  {number} p0
+	     * @param  {number} p1
+	     * @param  {number} p2
+	     * @return {number}
+	     */
+	    function quadraticExtremum(p0, p1, p2) {
+	        var divider = p0 + p2 - 2 * p1;
+	        if (divider === 0) {
+	            // p1 is center of p0 and p2
+	            return 0.5;
+	        }
+	        else {
+	            return (p0 - p1) / divider;
+	        }
+	    }
+
+	    /**
+	     * 细分二次贝塞尔曲线
+	     * @memberOf module:zrender/core/curve
+	     * @param  {number} p0
+	     * @param  {number} p1
+	     * @param  {number} p2
+	     * @param  {number} t
+	     * @param  {Array.<number>} out
+	     */
+	    function quadraticSubdivide(p0, p1, p2, t, out) {
+	        var p01 = (p1 - p0) * t + p0;
+	        var p12 = (p2 - p1) * t + p1;
+	        var p012 = (p12 - p01) * t + p01;
+
+	        // Seg0
+	        out[0] = p0;
+	        out[1] = p01;
+	        out[2] = p012;
+
+	        // Seg1
+	        out[3] = p012;
+	        out[4] = p12;
+	        out[5] = p2;
+	    }
+
+	    /**
+	     * 投射点到二次贝塞尔曲线上，返回投射距离。
+	     * 投射点有可能会有一个或者多个，这里只返回其中距离最短的一个。
+	     * @param {number} x0
+	     * @param {number} y0
+	     * @param {number} x1
+	     * @param {number} y1
+	     * @param {number} x2
+	     * @param {number} y2
+	     * @param {number} x
+	     * @param {number} y
+	     * @param {Array.<number>} out 投射点
+	     * @return {number}
+	     */
+	    function quadraticProjectPoint(
+	        x0, y0, x1, y1, x2, y2,
+	        x, y, out
+	    ) {
+	        // http://pomax.github.io/bezierinfo/#projections
+	        var t;
+	        var interval = 0.005;
+	        var d = Infinity;
+
+	        _v0[0] = x;
+	        _v0[1] = y;
+
+	        // 先粗略估计一下可能的最小距离的 t 值
+	        // PENDING
+	        for (var _t = 0; _t < 1; _t += 0.05) {
+	            _v1[0] = quadraticAt(x0, x1, x2, _t);
+	            _v1[1] = quadraticAt(y0, y1, y2, _t);
+	            var d1 = v2DistSquare(_v0, _v1);
+	            if (d1 < d) {
+	                t = _t;
+	                d = d1;
+	            }
+	        }
+	        d = Infinity;
+
+	        // At most 32 iteration
+	        for (var i = 0; i < 32; i++) {
+	            if (interval < EPSILON_NUMERIC) {
+	                break;
+	            }
+	            var prev = t - interval;
+	            var next = t + interval;
+	            // t - interval
+	            _v1[0] = quadraticAt(x0, x1, x2, prev);
+	            _v1[1] = quadraticAt(y0, y1, y2, prev);
+
+	            var d1 = v2DistSquare(_v1, _v0);
+
+	            if (prev >= 0 && d1 < d) {
+	                t = prev;
+	                d = d1;
+	            }
+	            else {
+	                // t + interval
+	                _v2[0] = quadraticAt(x0, x1, x2, next);
+	                _v2[1] = quadraticAt(y0, y1, y2, next);
+	                var d2 = v2DistSquare(_v2, _v0);
+	                if (next <= 1 && d2 < d) {
+	                    t = next;
+	                    d = d2;
+	                }
+	                else {
+	                    interval *= 0.5;
+	                }
+	            }
+	        }
+	        // t
+	        if (out) {
+	            out[0] = quadraticAt(x0, x1, x2, t);
+	            out[1] = quadraticAt(y0, y1, y2, t);
+	        }
+	        // console.log(interval, i);
+	        return mathSqrt(d);
+	    }
+
+	    module.exports = {
+
+	        cubicAt: cubicAt,
+
+	        cubicDerivativeAt: cubicDerivativeAt,
+
+	        cubicRootAt: cubicRootAt,
+
+	        cubicExtrema: cubicExtrema,
+
+	        cubicSubdivide: cubicSubdivide,
+
+	        cubicProjectPoint: cubicProjectPoint,
+
+	        quadraticAt: quadraticAt,
+
+	        quadraticDerivativeAt: quadraticDerivativeAt,
+
+	        quadraticRootAt: quadraticRootAt,
+
+	        quadraticExtremum: quadraticExtremum,
+
+	        quadraticSubdivide: quadraticSubdivide,
+
+	        quadraticProjectPoint: quadraticProjectPoint
+	    };
+
+
+/***/ },
+/* 51 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @author Yi Shen(https://github.com/pissang)
+	 */
+
+
+	    var vec2 = __webpack_require__(10);
+	    var curve = __webpack_require__(50);
+
+	    var bbox = {};
+	    var mathMin = Math.min;
+	    var mathMax = Math.max;
+	    var mathSin = Math.sin;
+	    var mathCos = Math.cos;
+
+	    var start = vec2.create();
+	    var end = vec2.create();
+	    var extremity = vec2.create();
+
+	    var PI2 = Math.PI * 2;
+	    /**
+	     * 从顶点数组中计算出最小包围盒，写入`min`和`max`中
+	     * @module zrender/core/bbox
+	     * @param {Array<Object>} points 顶点数组
+	     * @param {number} min
+	     * @param {number} max
+	     */
+	    bbox.fromPoints = function(points, min, max) {
+	        if (points.length === 0) {
+	            return;
+	        }
+	        var p = points[0];
+	        var left = p[0];
+	        var right = p[0];
+	        var top = p[1];
+	        var bottom = p[1];
+	        var i;
+
+	        for (i = 1; i < points.length; i++) {
+	            p = points[i];
+	            left = mathMin(left, p[0]);
+	            right = mathMax(right, p[0]);
+	            top = mathMin(top, p[1]);
+	            bottom = mathMax(bottom, p[1]);
+	        }
+
+	        min[0] = left;
+	        min[1] = top;
+	        max[0] = right;
+	        max[1] = bottom;
+	    };
+
+	    /**
+	     * @memberOf module:zrender/core/bbox
+	     * @param {number} x0
+	     * @param {number} y0
+	     * @param {number} x1
+	     * @param {number} y1
+	     * @param {Array.<number>} min
+	     * @param {Array.<number>} max
+	     */
+	    bbox.fromLine = function (x0, y0, x1, y1, min, max) {
+	        min[0] = mathMin(x0, x1);
+	        min[1] = mathMin(y0, y1);
+	        max[0] = mathMax(x0, x1);
+	        max[1] = mathMax(y0, y1);
+	    };
+
+	    var xDim = [];
+	    var yDim = [];
+	    /**
+	     * 从三阶贝塞尔曲线(p0, p1, p2, p3)中计算出最小包围盒，写入`min`和`max`中
+	     * @memberOf module:zrender/core/bbox
+	     * @param {number} x0
+	     * @param {number} y0
+	     * @param {number} x1
+	     * @param {number} y1
+	     * @param {number} x2
+	     * @param {number} y2
+	     * @param {number} x3
+	     * @param {number} y3
+	     * @param {Array.<number>} min
+	     * @param {Array.<number>} max
+	     */
+	    bbox.fromCubic = function(
+	        x0, y0, x1, y1, x2, y2, x3, y3, min, max
+	    ) {
+	        var cubicExtrema = curve.cubicExtrema;
+	        var cubicAt = curve.cubicAt;
+	        var i;
+	        var n = cubicExtrema(x0, x1, x2, x3, xDim);
+	        min[0] = Infinity;
+	        min[1] = Infinity;
+	        max[0] = -Infinity;
+	        max[1] = -Infinity;
+
+	        for (i = 0; i < n; i++) {
+	            var x = cubicAt(x0, x1, x2, x3, xDim[i]);
+	            min[0] = mathMin(x, min[0]);
+	            max[0] = mathMax(x, max[0]);
+	        }
+	        n = cubicExtrema(y0, y1, y2, y3, yDim);
+	        for (i = 0; i < n; i++) {
+	            var y = cubicAt(y0, y1, y2, y3, yDim[i]);
+	            min[1] = mathMin(y, min[1]);
+	            max[1] = mathMax(y, max[1]);
+	        }
+
+	        min[0] = mathMin(x0, min[0]);
+	        max[0] = mathMax(x0, max[0]);
+	        min[0] = mathMin(x3, min[0]);
+	        max[0] = mathMax(x3, max[0]);
+
+	        min[1] = mathMin(y0, min[1]);
+	        max[1] = mathMax(y0, max[1]);
+	        min[1] = mathMin(y3, min[1]);
+	        max[1] = mathMax(y3, max[1]);
+	    };
+
+	    /**
+	     * 从二阶贝塞尔曲线(p0, p1, p2)中计算出最小包围盒，写入`min`和`max`中
+	     * @memberOf module:zrender/core/bbox
+	     * @param {number} x0
+	     * @param {number} y0
+	     * @param {number} x1
+	     * @param {number} y1
+	     * @param {number} x2
+	     * @param {number} y2
+	     * @param {Array.<number>} min
+	     * @param {Array.<number>} max
+	     */
+	    bbox.fromQuadratic = function(x0, y0, x1, y1, x2, y2, min, max) {
+	        var quadraticExtremum = curve.quadraticExtremum;
+	        var quadraticAt = curve.quadraticAt;
+	        // Find extremities, where derivative in x dim or y dim is zero
+	        var tx =
+	            mathMax(
+	                mathMin(quadraticExtremum(x0, x1, x2), 1), 0
+	            );
+	        var ty =
+	            mathMax(
+	                mathMin(quadraticExtremum(y0, y1, y2), 1), 0
+	            );
+
+	        var x = quadraticAt(x0, x1, x2, tx);
+	        var y = quadraticAt(y0, y1, y2, ty);
+
+	        min[0] = mathMin(x0, x2, x);
+	        min[1] = mathMin(y0, y2, y);
+	        max[0] = mathMax(x0, x2, x);
+	        max[1] = mathMax(y0, y2, y);
+	    };
+
+	    /**
+	     * 从圆弧中计算出最小包围盒，写入`min`和`max`中
+	     * @method
+	     * @memberOf module:zrender/core/bbox
+	     * @param {number} x
+	     * @param {number} y
+	     * @param {number} rx
+	     * @param {number} ry
+	     * @param {number} startAngle
+	     * @param {number} endAngle
+	     * @param {number} anticlockwise
+	     * @param {Array.<number>} min
+	     * @param {Array.<number>} max
+	     */
+	    bbox.fromArc = function (
+	        x, y, rx, ry, startAngle, endAngle, anticlockwise, min, max
+	    ) {
+	        var vec2Min = vec2.min;
+	        var vec2Max = vec2.max;
+
+	        var diff = Math.abs(startAngle - endAngle);
+
+
+	        if (diff % PI2 < 1e-4 && diff > 1e-4) {
+	            // Is a circle
+	            min[0] = x - rx;
+	            min[1] = y - ry;
+	            max[0] = x + rx;
+	            max[1] = y + ry;
+	            return;
+	        }
+
+	        start[0] = mathCos(startAngle) * rx + x;
+	        start[1] = mathSin(startAngle) * ry + y;
+
+	        end[0] = mathCos(endAngle) * rx + x;
+	        end[1] = mathSin(endAngle) * ry + y;
+
+	        vec2Min(min, start, end);
+	        vec2Max(max, start, end);
+
+	        // Thresh to [0, Math.PI * 2]
+	        startAngle = startAngle % (PI2);
+	        if (startAngle < 0) {
+	            startAngle = startAngle + PI2;
+	        }
+	        endAngle = endAngle % (PI2);
+	        if (endAngle < 0) {
+	            endAngle = endAngle + PI2;
+	        }
+
+	        if (startAngle > endAngle && !anticlockwise) {
+	            endAngle += PI2;
+	        }
+	        else if (startAngle < endAngle && anticlockwise) {
+	            startAngle += PI2;
+	        }
+	        if (anticlockwise) {
+	            var tmp = endAngle;
+	            endAngle = startAngle;
+	            startAngle = tmp;
+	        }
+
+	        // var number = 0;
+	        // var step = (anticlockwise ? -Math.PI : Math.PI) / 2;
+	        for (var angle = 0; angle < endAngle; angle += Math.PI / 2) {
+	            if (angle > startAngle) {
+	                extremity[0] = mathCos(angle) * rx + x;
+	                extremity[1] = mathSin(angle) * ry + y;
+
+	                vec2Min(min, extremity, min);
+	                vec2Max(max, extremity, max);
+	            }
+	        }
+	    };
+
+	    module.exports = bbox;
+
+
+
+/***/ },
+/* 52 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var CMD = __webpack_require__(49).CMD;
+	    var line = __webpack_require__(53);
+	    var cubic = __webpack_require__(54);
+	    var quadratic = __webpack_require__(55);
+	    var arc = __webpack_require__(56);
+	    var normalizeRadian = __webpack_require__(57).normalizeRadian;
+	    var curve = __webpack_require__(50);
+
+	    var windingLine = __webpack_require__(58);
+
+	    var containStroke = line.containStroke;
+
+	    var PI2 = Math.PI * 2;
+
+	    var EPSILON = 1e-4;
+
+	    function isAroundEqual(a, b) {
+	        return Math.abs(a - b) < EPSILON;
+	    }
+
+	    // 临时数组
+	    var roots = [-1, -1, -1];
+	    var extrema = [-1, -1];
+
+	    function swapExtrema() {
+	        var tmp = extrema[0];
+	        extrema[0] = extrema[1];
+	        extrema[1] = tmp;
+	    }
+
+	    function windingCubic(x0, y0, x1, y1, x2, y2, x3, y3, x, y) {
+	        // Quick reject
+	        if (
+	            (y > y0 && y > y1 && y > y2 && y > y3)
+	            || (y < y0 && y < y1 && y < y2 && y < y3)
+	        ) {
+	            return 0;
+	        }
+	        var nRoots = curve.cubicRootAt(y0, y1, y2, y3, y, roots);
+	        if (nRoots === 0) {
+	            return 0;
+	        }
+	        else {
+	            var w = 0;
+	            var nExtrema = -1;
+	            var y0_, y1_;
+	            for (var i = 0; i < nRoots; i++) {
+	                var t = roots[i];
+
+	                // Avoid winding error when intersection point is the connect point of two line of polygon
+	                var unit = (t === 0 || t === 1) ? 0.5 : 1;
+
+	                var x_ = curve.cubicAt(x0, x1, x2, x3, t);
+	                if (x_ < x) { // Quick reject
+	                    continue;
+	                }
+	                if (nExtrema < 0) {
+	                    nExtrema = curve.cubicExtrema(y0, y1, y2, y3, extrema);
+	                    if (extrema[1] < extrema[0] && nExtrema > 1) {
+	                        swapExtrema();
+	                    }
+	                    y0_ = curve.cubicAt(y0, y1, y2, y3, extrema[0]);
+	                    if (nExtrema > 1) {
+	                        y1_ = curve.cubicAt(y0, y1, y2, y3, extrema[1]);
+	                    }
+	                }
+	                if (nExtrema == 2) {
+	                    // 分成三段单调函数
+	                    if (t < extrema[0]) {
+	                        w += y0_ < y0 ? unit : -unit;
+	                    }
+	                    else if (t < extrema[1]) {
+	                        w += y1_ < y0_ ? unit : -unit;
+	                    }
+	                    else {
+	                        w += y3 < y1_ ? unit : -unit;
+	                    }
+	                }
+	                else {
+	                    // 分成两段单调函数
+	                    if (t < extrema[0]) {
+	                        w += y0_ < y0 ? unit : -unit;
+	                    }
+	                    else {
+	                        w += y3 < y0_ ? unit : -unit;
+	                    }
+	                }
+	            }
+	            return w;
+	        }
+	    }
+
+	    function windingQuadratic(x0, y0, x1, y1, x2, y2, x, y) {
+	        // Quick reject
+	        if (
+	            (y > y0 && y > y1 && y > y2)
+	            || (y < y0 && y < y1 && y < y2)
+	        ) {
+	            return 0;
+	        }
+	        var nRoots = curve.quadraticRootAt(y0, y1, y2, y, roots);
+	        if (nRoots === 0) {
+	            return 0;
+	        }
+	        else {
+	            var t = curve.quadraticExtremum(y0, y1, y2);
+	            if (t >= 0 && t <= 1) {
+	                var w = 0;
+	                var y_ = curve.quadraticAt(y0, y1, y2, t);
+	                for (var i = 0; i < nRoots; i++) {
+	                    // Remove one endpoint.
+	                    var unit = (roots[i] === 0 || roots[i] === 1) ? 0.5 : 1;
+
+	                    var x_ = curve.quadraticAt(x0, x1, x2, roots[i]);
+	                    if (x_ < x) {   // Quick reject
+	                        continue;
+	                    }
+	                    if (roots[i] < t) {
+	                        w += y_ < y0 ? unit : -unit;
+	                    }
+	                    else {
+	                        w += y2 < y_ ? unit : -unit;
+	                    }
+	                }
+	                return w;
+	            }
+	            else {
+	                // Remove one endpoint.
+	                var unit = (roots[0] === 0 || roots[0] === 1) ? 0.5 : 1;
+
+	                var x_ = curve.quadraticAt(x0, x1, x2, roots[0]);
+	                if (x_ < x) {   // Quick reject
+	                    return 0;
+	                }
+	                return y2 < y0 ? unit : -unit;
+	            }
+	        }
+	    }
+
+	    // TODO
+	    // Arc 旋转
+	    function windingArc(
+	        cx, cy, r, startAngle, endAngle, anticlockwise, x, y
+	    ) {
+	        y -= cy;
+	        if (y > r || y < -r) {
+	            return 0;
+	        }
+	        var tmp = Math.sqrt(r * r - y * y);
+	        roots[0] = -tmp;
+	        roots[1] = tmp;
+
+	        var diff = Math.abs(startAngle - endAngle);
+	        if (diff < 1e-4) {
+	            return 0;
+	        }
+	        if (diff % PI2 < 1e-4) {
+	            // Is a circle
+	            startAngle = 0;
+	            endAngle = PI2;
+	            var dir = anticlockwise ? 1 : -1;
+	            if (x >= roots[0] + cx && x <= roots[1] + cx) {
+	                return dir;
+	            } else {
+	                return 0;
+	            }
+	        }
+
+	        if (anticlockwise) {
+	            var tmp = startAngle;
+	            startAngle = normalizeRadian(endAngle);
+	            endAngle = normalizeRadian(tmp);
+	        }
+	        else {
+	            startAngle = normalizeRadian(startAngle);
+	            endAngle = normalizeRadian(endAngle);
+	        }
+	        if (startAngle > endAngle) {
+	            endAngle += PI2;
+	        }
+
+	        var w = 0;
+	        for (var i = 0; i < 2; i++) {
+	            var x_ = roots[i];
+	            if (x_ + cx > x) {
+	                var angle = Math.atan2(y, x_);
+	                var dir = anticlockwise ? 1 : -1;
+	                if (angle < 0) {
+	                    angle = PI2 + angle;
+	                }
+	                if (
+	                    (angle >= startAngle && angle <= endAngle)
+	                    || (angle + PI2 >= startAngle && angle + PI2 <= endAngle)
+	                ) {
+	                    if (angle > Math.PI / 2 && angle < Math.PI * 1.5) {
+	                        dir = -dir;
+	                    }
+	                    w += dir;
+	                }
+	            }
+	        }
+	        return w;
+	    }
+
+	    function containPath(data, lineWidth, isStroke, x, y) {
+	        var w = 0;
+	        var xi = 0;
+	        var yi = 0;
+	        var x0 = 0;
+	        var y0 = 0;
+
+	        for (var i = 0; i < data.length;) {
+	            var cmd = data[i++];
+	            // Begin a new subpath
+	            if (cmd === CMD.M && i > 1) {
+	                // Close previous subpath
+	                if (!isStroke) {
+	                    w += windingLine(xi, yi, x0, y0, x, y);
+	                }
+	                // 如果被任何一个 subpath 包含
+	                // if (w !== 0) {
+	                //     return true;
+	                // }
+	            }
+
+	            if (i == 1) {
+	                // 如果第一个命令是 L, C, Q
+	                // 则 previous point 同绘制命令的第一个 point
+	                //
+	                // 第一个命令为 Arc 的情况下会在后面特殊处理
+	                xi = data[i];
+	                yi = data[i + 1];
+
+	                x0 = xi;
+	                y0 = yi;
+	            }
+
+	            switch (cmd) {
+	                case CMD.M:
+	                    // moveTo 命令重新创建一个新的 subpath, 并且更新新的起点
+	                    // 在 closePath 的时候使用
+	                    x0 = data[i++];
+	                    y0 = data[i++];
+	                    xi = x0;
+	                    yi = y0;
+	                    break;
+	                case CMD.L:
+	                    if (isStroke) {
+	                        if (containStroke(xi, yi, data[i], data[i + 1], lineWidth, x, y)) {
+	                            return true;
+	                        }
+	                    }
+	                    else {
+	                        // NOTE 在第一个命令为 L, C, Q 的时候会计算出 NaN
+	                        w += windingLine(xi, yi, data[i], data[i + 1], x, y) || 0;
+	                    }
+	                    xi = data[i++];
+	                    yi = data[i++];
+	                    break;
+	                case CMD.C:
+	                    if (isStroke) {
+	                        if (cubic.containStroke(xi, yi,
+	                            data[i++], data[i++], data[i++], data[i++], data[i], data[i + 1],
+	                            lineWidth, x, y
+	                        )) {
+	                            return true;
+	                        }
+	                    }
+	                    else {
+	                        w += windingCubic(
+	                            xi, yi,
+	                            data[i++], data[i++], data[i++], data[i++], data[i], data[i + 1],
+	                            x, y
+	                        ) || 0;
+	                    }
+	                    xi = data[i++];
+	                    yi = data[i++];
+	                    break;
+	                case CMD.Q:
+	                    if (isStroke) {
+	                        if (quadratic.containStroke(xi, yi,
+	                            data[i++], data[i++], data[i], data[i + 1],
+	                            lineWidth, x, y
+	                        )) {
+	                            return true;
+	                        }
+	                    }
+	                    else {
+	                        w += windingQuadratic(
+	                            xi, yi,
+	                            data[i++], data[i++], data[i], data[i + 1],
+	                            x, y
+	                        ) || 0;
+	                    }
+	                    xi = data[i++];
+	                    yi = data[i++];
+	                    break;
+	                case CMD.A:
+	                    // TODO Arc 判断的开销比较大
+	                    var cx = data[i++];
+	                    var cy = data[i++];
+	                    var rx = data[i++];
+	                    var ry = data[i++];
+	                    var theta = data[i++];
+	                    var dTheta = data[i++];
+	                    // TODO Arc 旋转
+	                    var psi = data[i++];
+	                    var anticlockwise = 1 - data[i++];
+	                    var x1 = Math.cos(theta) * rx + cx;
+	                    var y1 = Math.sin(theta) * ry + cy;
+	                    // 不是直接使用 arc 命令
+	                    if (i > 1) {
+	                        w += windingLine(xi, yi, x1, y1, x, y);
+	                    }
+	                    else {
+	                        // 第一个命令起点还未定义
+	                        x0 = x1;
+	                        y0 = y1;
+	                    }
+	                    // zr 使用scale来模拟椭圆, 这里也对x做一定的缩放
+	                    var _x = (x - cx) * ry / rx + cx;
+	                    if (isStroke) {
+	                        if (arc.containStroke(
+	                            cx, cy, ry, theta, theta + dTheta, anticlockwise,
+	                            lineWidth, _x, y
+	                        )) {
+	                            return true;
+	                        }
+	                    }
+	                    else {
+	                        w += windingArc(
+	                            cx, cy, ry, theta, theta + dTheta, anticlockwise,
+	                            _x, y
+	                        );
+	                    }
+	                    xi = Math.cos(theta + dTheta) * rx + cx;
+	                    yi = Math.sin(theta + dTheta) * ry + cy;
+	                    break;
+	                case CMD.R:
+	                    x0 = xi = data[i++];
+	                    y0 = yi = data[i++];
+	                    var width = data[i++];
+	                    var height = data[i++];
+	                    var x1 = x0 + width;
+	                    var y1 = y0 + height;
+	                    if (isStroke) {
+	                        if (containStroke(x0, y0, x1, y0, lineWidth, x, y)
+	                          || containStroke(x1, y0, x1, y1, lineWidth, x, y)
+	                          || containStroke(x1, y1, x0, y1, lineWidth, x, y)
+	                          || containStroke(x0, y1, x0, y0, lineWidth, x, y)
+	                        ) {
+	                            return true;
+	                        }
+	                    }
+	                    else {
+	                        // FIXME Clockwise ?
+	                        w += windingLine(x1, y0, x1, y1, x, y);
+	                        w += windingLine(x0, y1, x0, y0, x, y);
+	                    }
+	                    break;
+	                case CMD.Z:
+	                    if (isStroke) {
+	                        if (containStroke(
+	                            xi, yi, x0, y0, lineWidth, x, y
+	                        )) {
+	                            return true;
+	                        }
+	                    }
+	                    else {
+	                        // Close a subpath
+	                        w += windingLine(xi, yi, x0, y0, x, y);
+	                        // 如果被任何一个 subpath 包含
+	                        // FIXME subpaths may overlap
+	                        // if (w !== 0) {
+	                        //     return true;
+	                        // }
+	                    }
+	                    xi = x0;
+	                    yi = y0;
+	                    break;
+	            }
+	        }
+	        if (!isStroke && !isAroundEqual(yi, y0)) {
+	            w += windingLine(xi, yi, x0, y0, x, y) || 0;
+	        }
+	        return w !== 0;
+	    }
+
+	    module.exports = {
+	        contain: function (pathData, x, y) {
+	            return containPath(pathData, 0, false, x, y);
+	        },
+
+	        containStroke: function (pathData, lineWidth, x, y) {
+	            return containPath(pathData, lineWidth, true, x, y);
+	        }
+	    };
+
+
+/***/ },
+/* 53 */
+/***/ function(module, exports) {
+
+	
+	    module.exports = {
+	        /**
+	         * 线段包含判断
+	         * @param  {number}  x0
+	         * @param  {number}  y0
+	         * @param  {number}  x1
+	         * @param  {number}  y1
+	         * @param  {number}  lineWidth
+	         * @param  {number}  x
+	         * @param  {number}  y
+	         * @return {boolean}
+	         */
+	        containStroke: function (x0, y0, x1, y1, lineWidth, x, y) {
+	            if (lineWidth === 0) {
+	                return false;
+	            }
+	            var _l = lineWidth;
+	            var _a = 0;
+	            var _b = x0;
+	            // Quick reject
+	            if (
+	                (y > y0 + _l && y > y1 + _l)
+	                || (y < y0 - _l && y < y1 - _l)
+	                || (x > x0 + _l && x > x1 + _l)
+	                || (x < x0 - _l && x < x1 - _l)
+	            ) {
+	                return false;
+	            }
+
+	            if (x0 !== x1) {
+	                _a = (y0 - y1) / (x0 - x1);
+	                _b = (x0 * y1 - x1 * y0) / (x0 - x1) ;
+	            }
+	            else {
+	                return Math.abs(x - x0) <= _l / 2;
+	            }
+	            var tmp = _a * x - y + _b;
+	            var _s = tmp * tmp / (_a * _a + 1);
+	            return _s <= _l / 2 * _l / 2;
+	        }
+	    };
+
+
+/***/ },
+/* 54 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var curve = __webpack_require__(50);
+
+	    module.exports = {
+	        /**
+	         * 三次贝塞尔曲线描边包含判断
+	         * @param  {number}  x0
+	         * @param  {number}  y0
+	         * @param  {number}  x1
+	         * @param  {number}  y1
+	         * @param  {number}  x2
+	         * @param  {number}  y2
+	         * @param  {number}  x3
+	         * @param  {number}  y3
+	         * @param  {number}  lineWidth
+	         * @param  {number}  x
+	         * @param  {number}  y
+	         * @return {boolean}
+	         */
+	        containStroke: function(x0, y0, x1, y1, x2, y2, x3, y3, lineWidth, x, y) {
+	            if (lineWidth === 0) {
+	                return false;
+	            }
+	            var _l = lineWidth;
+	            // Quick reject
+	            if (
+	                (y > y0 + _l && y > y1 + _l && y > y2 + _l && y > y3 + _l)
+	                || (y < y0 - _l && y < y1 - _l && y < y2 - _l && y < y3 - _l)
+	                || (x > x0 + _l && x > x1 + _l && x > x2 + _l && x > x3 + _l)
+	                || (x < x0 - _l && x < x1 - _l && x < x2 - _l && x < x3 - _l)
+	            ) {
+	                return false;
+	            }
+	            var d = curve.cubicProjectPoint(
+	                x0, y0, x1, y1, x2, y2, x3, y3,
+	                x, y, null
+	            );
+	            return d <= _l / 2;
+	        }
+	    };
+
+
+/***/ },
+/* 55 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var curve = __webpack_require__(50);
+
+	    module.exports = {
+	        /**
+	         * 二次贝塞尔曲线描边包含判断
+	         * @param  {number}  x0
+	         * @param  {number}  y0
+	         * @param  {number}  x1
+	         * @param  {number}  y1
+	         * @param  {number}  x2
+	         * @param  {number}  y2
+	         * @param  {number}  lineWidth
+	         * @param  {number}  x
+	         * @param  {number}  y
+	         * @return {boolean}
+	         */
+	        containStroke: function (x0, y0, x1, y1, x2, y2, lineWidth, x, y) {
+	            if (lineWidth === 0) {
+	                return false;
+	            }
+	            var _l = lineWidth;
+	            // Quick reject
+	            if (
+	                (y > y0 + _l && y > y1 + _l && y > y2 + _l)
+	                || (y < y0 - _l && y < y1 - _l && y < y2 - _l)
+	                || (x > x0 + _l && x > x1 + _l && x > x2 + _l)
+	                || (x < x0 - _l && x < x1 - _l && x < x2 - _l)
+	            ) {
+	                return false;
+	            }
+	            var d = curve.quadraticProjectPoint(
+	                x0, y0, x1, y1, x2, y2,
+	                x, y, null
+	            );
+	            return d <= _l / 2;
+	        }
+	    };
+
+
+/***/ },
+/* 56 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var normalizeRadian = __webpack_require__(57).normalizeRadian;
+	    var PI2 = Math.PI * 2;
+
+	    module.exports = {
+	        /**
+	         * 圆弧描边包含判断
+	         * @param  {number}  cx
+	         * @param  {number}  cy
+	         * @param  {number}  r
+	         * @param  {number}  startAngle
+	         * @param  {number}  endAngle
+	         * @param  {boolean}  anticlockwise
+	         * @param  {number} lineWidth
+	         * @param  {number}  x
+	         * @param  {number}  y
+	         * @return {Boolean}
+	         */
+	        containStroke: function (
+	            cx, cy, r, startAngle, endAngle, anticlockwise,
+	            lineWidth, x, y
+	        ) {
+
+	            if (lineWidth === 0) {
+	                return false;
+	            }
+	            var _l = lineWidth;
+
+	            x -= cx;
+	            y -= cy;
+	            var d = Math.sqrt(x * x + y * y);
+
+	            if ((d - _l > r) || (d + _l < r)) {
+	                return false;
+	            }
+	            if (Math.abs(startAngle - endAngle) % PI2 < 1e-4) {
+	                // Is a circle
+	                return true;
+	            }
+	            if (anticlockwise) {
+	                var tmp = startAngle;
+	                startAngle = normalizeRadian(endAngle);
+	                endAngle = normalizeRadian(tmp);
+	            } else {
+	                startAngle = normalizeRadian(startAngle);
+	                endAngle = normalizeRadian(endAngle);
+	            }
+	            if (startAngle > endAngle) {
+	                endAngle += PI2;
+	            }
+
+	            var angle = Math.atan2(y, x);
+	            if (angle < 0) {
+	                angle += PI2;
+	            }
+	            return (angle >= startAngle && angle <= endAngle)
+	                || (angle + PI2 >= startAngle && angle + PI2 <= endAngle);
+	        }
+	    };
+
+
+/***/ },
+/* 57 */
+/***/ function(module, exports) {
+
+	
+
+	    var PI2 = Math.PI * 2;
+	    module.exports = {
+	        normalizeRadian: function(angle) {
+	            angle %= PI2;
+	            if (angle < 0) {
+	                angle += PI2;
+	            }
+	            return angle;
+	        }
+	    };
+
+
+/***/ },
+/* 58 */
+/***/ function(module, exports) {
+
+	
+	    module.exports = function windingLine(x0, y0, x1, y1, x, y) {
+	        if ((y > y0 && y > y1) || (y < y0 && y < y1)) {
+	            return 0;
+	        }
+	        // Ignore horizontal line
+	        if (y1 === y0) {
+	            return 0;
+	        }
+	        var dir = y1 < y0 ? 1 : -1;
+	        var t = (y - y0) / (y1 - y0);
+
+	        // Avoid winding error when intersection point is the connect point of two line of polygon
+	        if (t === 1 || t === 0) {
+	            dir = y1 < y0 ? 0.5 : -0.5;
+	        }
+
+	        var x_ = t * (x1 - x0) + x0;
+
+	        return x_ > x ? dir : 0;
+	    };
+
+
+/***/ },
+/* 59 */
+/***/ function(module, exports) {
+
+	
+
+	    var Pattern = function (image, repeat) {
+	        this.image = image;
+	        this.repeat = repeat;
+
+	        // Can be cloned
+	        this.type = 'pattern';
+	    };
+
+	    Pattern.prototype.getCanvasPattern = function (ctx) {
+
+	        return this._canvasPattern
+	            || (this._canvasPattern = ctx.createPattern(this.image, this.repeat));
+	    };
+
+	    module.exports = Pattern;
+
+
+/***/ },
+/* 60 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var CMD = __webpack_require__(49).CMD;
+	    var vec2 = __webpack_require__(10);
+	    var v2ApplyTransform = vec2.applyTransform;
+
+	    var points = [[], [], []];
+	    var mathSqrt = Math.sqrt;
+	    var mathAtan2 = Math.atan2;
+	    function transformPath(path, m) {
+	        var data = path.data;
+	        var cmd;
+	        var nPoint;
+	        var i;
+	        var j;
+	        var k;
+	        var p;
+
+	        var M = CMD.M;
+	        var C = CMD.C;
+	        var L = CMD.L;
+	        var R = CMD.R;
+	        var A = CMD.A;
+	        var Q = CMD.Q;
+
+	        for (i = 0, j = 0; i < data.length;) {
+	            cmd = data[i++];
+	            j = i;
+	            nPoint = 0;
+
+	            switch (cmd) {
+	                case M:
+	                    nPoint = 1;
+	                    break;
+	                case L:
+	                    nPoint = 1;
+	                    break;
+	                case C:
+	                    nPoint = 3;
+	                    break;
+	                case Q:
+	                    nPoint = 2;
+	                    break;
+	                case A:
+	                    var x = m[4];
+	                    var y = m[5];
+	                    var sx = mathSqrt(m[0] * m[0] + m[1] * m[1]);
+	                    var sy = mathSqrt(m[2] * m[2] + m[3] * m[3]);
+	                    var angle = mathAtan2(-m[1] / sy, m[0] / sx);
+	                    // cx
+	                    data[i++] += x;
+	                    // cy
+	                    data[i++] += y;
+	                    // Scale rx and ry
+	                    // FIXME Assume psi is 0 here
+	                    data[i++] *= sx;
+	                    data[i++] *= sy;
+
+	                    // Start angle
+	                    data[i++] += angle;
+	                    // end angle
+	                    data[i++] += angle;
+	                    // FIXME psi
+	                    i += 2;
+	                    j = i;
+	                    break;
+	                case R:
+	                    // x0, y0
+	                    p[0] = data[i++];
+	                    p[1] = data[i++];
+	                    v2ApplyTransform(p, p, m);
+	                    data[j++] = p[0];
+	                    data[j++] = p[1];
+	                    // x1, y1
+	                    p[0] += data[i++];
+	                    p[1] += data[i++];
+	                    v2ApplyTransform(p, p, m);
+	                    data[j++] = p[0];
+	                    data[j++] = p[1];
+	            }
+
+	            for (k = 0; k < nPoint; k++) {
+	                var p = points[k];
+	                p[0] = data[i++];
+	                p[1] = data[i++];
+
+	                v2ApplyTransform(p, p, m);
+	                // Write back
+	                data[j++] = p[0];
+	                data[j++] = p[1];
+	            }
+	        }
+	    }
+
+	    module.exports = transformPath;
+
+
+/***/ },
+/* 61 */
+/***/ function(module, exports) {
+
+	
+
+	    /**
+	     * @param {Array.<Object>} colorStops
+	     */
+	    var Gradient = function (colorStops) {
+
+	        this.colorStops = colorStops || [];
+	    };
+
+	    Gradient.prototype = {
+
+	        constructor: Gradient,
+
+	        addColorStop: function (offset, color) {
+	            this.colorStops.push({
+
+	                offset: offset,
+
+	                color: color
+	            });
+	        }
+	    };
+
+	    module.exports = Gradient;
+
+
+/***/ },
+/* 62 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * Image element
+	 * @module zrender/graphic/Image
+	 */
+
+
+
+	    var Displayable = __webpack_require__(46);
+	    var BoundingRect = __webpack_require__(9);
+	    var zrUtil = __webpack_require__(4);
+
+	    var LRU = __webpack_require__(63);
+	    var globalImageCache = new LRU(50);
+	    /**
+	     * @alias zrender/graphic/Image
+	     * @extends module:zrender/graphic/Displayable
+	     * @constructor
+	     * @param {Object} opts
+	     */
+	    function ZImage(opts) {
+	        Displayable.call(this, opts);
+	    }
+
+	    ZImage.prototype = {
+
+	        constructor: ZImage,
+
+	        type: 'image',
+
+	        brush: function (ctx, prevEl) {
+	            var style = this.style;
+	            var src = style.image;
+	            var image;
+
+	            // Must bind each time
+	            style.bind(ctx, this, prevEl);
+
+	            // style.image is a url string
+	            if (typeof src === 'string') {
+	                image = this._image;
+	            }
+	            // style.image is an HTMLImageElement or HTMLCanvasElement or Canvas
+	            else {
+	                image = src;
+	            }
+	            // FIXME Case create many images with src
+	            if (!image && src) {
+	                // Try get from global image cache
+	                var cachedImgObj = globalImageCache.get(src);
+	                if (!cachedImgObj) {
+	                    // Create a new image
+	                    image = new Image();
+	                    image.onload = function () {
+	                        image.onload = null;
+	                        for (var i = 0; i < cachedImgObj.pending.length; i++) {
+	                            cachedImgObj.pending[i].dirty();
+	                        }
+	                    };
+	                    cachedImgObj = {
+	                        image: image,
+	                        pending: [this]
+	                    };
+	                    image.src = src;
+	                    globalImageCache.put(src, cachedImgObj);
+	                    this._image = image;
+	                    return;
+	                }
+	                else {
+	                    image = cachedImgObj.image;
+	                    this._image = image;
+	                    // Image is not complete finish, add to pending list
+	                    if (!image.width || !image.height) {
+	                        cachedImgObj.pending.push(this);
+	                        return;
+	                    }
+	                }
+	            }
+
+	            if (image) {
+	                // 图片已经加载完成
+	                // if (image.nodeName.toUpperCase() == 'IMG') {
+	                //     if (!image.complete) {
+	                //         return;
+	                //     }
+	                // }
+	                // Else is canvas
+
+	                var width = style.width || image.width;
+	                var height = style.height || image.height;
+	                var x = style.x || 0;
+	                var y = style.y || 0;
+	                // 图片加载失败
+	                if (!image.width || !image.height) {
+	                    return;
+	                }
+
+	                // 设置transform
+	                this.setTransform(ctx);
+
+
+	                if (style.sWidth && style.sHeight) {
+	                    var sx = style.sx || 0;
+	                    var sy = style.sy || 0;
+	                    ctx.drawImage(
+	                        image,
+	                        sx, sy, style.sWidth, style.sHeight,
+	                        x, y, width, height
+	                    );
+	                }
+	                else if (style.sx && style.sy) {
+	                    var sx = style.sx;
+	                    var sy = style.sy;
+	                    var sWidth = width - sx;
+	                    var sHeight = height - sy;
+	                    ctx.drawImage(
+	                        image,
+	                        sx, sy, sWidth, sHeight,
+	                        x, y, width, height
+	                    );
+	                }
+	                else {
+	                    ctx.drawImage(image, x, y, width, height);
+	                }
+
+	                // 如果没设置宽和高的话自动根据图片宽高设置
+	                if (style.width == null) {
+	                    style.width = width;
+	                }
+	                if (style.height == null) {
+	                    style.height = height;
+	                }
+
+	                this.restoreTransform(ctx);
+
+	                // Draw rect text
+	                if (style.text != null) {
+	                    this.drawRectText(ctx, this.getBoundingRect());
+	                }
+
+	            }
+	        },
+
+	        getBoundingRect: function () {
+	            var style = this.style;
+	            if (! this._rect) {
+	                this._rect = new BoundingRect(
+	                    style.x || 0, style.y || 0, style.width || 0, style.height || 0
+	                );
+	            }
+	            return this._rect;
+	        }
+	    };
+
+	    zrUtil.inherits(ZImage, Displayable);
+
+	    module.exports = ZImage;
+
+
+/***/ },
+/* 63 */
+/***/ function(module, exports) {
+
+	// Simple LRU cache use doubly linked list
+	// @module zrender/core/LRU
+
+
+	    /**
+	     * Simple double linked list. Compared with array, it has O(1) remove operation.
+	     * @constructor
+	     */
+	    var LinkedList = function() {
+
+	        /**
+	         * @type {module:zrender/core/LRU~Entry}
+	         */
+	        this.head = null;
+
+	        /**
+	         * @type {module:zrender/core/LRU~Entry}
+	         */
+	        this.tail = null;
+
+	        this._len = 0;
+	    };
+
+	    var linkedListProto = LinkedList.prototype;
+	    /**
+	     * Insert a new value at the tail
+	     * @param  {} val
+	     * @return {module:zrender/core/LRU~Entry}
+	     */
+	    linkedListProto.insert = function(val) {
+	        var entry = new Entry(val);
+	        this.insertEntry(entry);
+	        return entry;
+	    };
+
+	    /**
+	     * Insert an entry at the tail
+	     * @param  {module:zrender/core/LRU~Entry} entry
+	     */
+	    linkedListProto.insertEntry = function(entry) {
+	        if (!this.head) {
+	            this.head = this.tail = entry;
+	        }
+	        else {
+	            this.tail.next = entry;
+	            entry.prev = this.tail;
+	            this.tail = entry;
+	        }
+	        this._len++;
+	    };
+
+	    /**
+	     * Remove entry.
+	     * @param  {module:zrender/core/LRU~Entry} entry
+	     */
+	    linkedListProto.remove = function(entry) {
+	        var prev = entry.prev;
+	        var next = entry.next;
+	        if (prev) {
+	            prev.next = next;
+	        }
+	        else {
+	            // Is head
+	            this.head = next;
+	        }
+	        if (next) {
+	            next.prev = prev;
+	        }
+	        else {
+	            // Is tail
+	            this.tail = prev;
+	        }
+	        entry.next = entry.prev = null;
+	        this._len--;
+	    };
+
+	    /**
+	     * @return {number}
+	     */
+	    linkedListProto.len = function() {
+	        return this._len;
+	    };
+
+	    /**
+	     * @constructor
+	     * @param {} val
+	     */
+	    var Entry = function(val) {
+	        /**
+	         * @type {}
+	         */
+	        this.value = val;
+
+	        /**
+	         * @type {module:zrender/core/LRU~Entry}
+	         */
+	        this.next;
+
+	        /**
+	         * @type {module:zrender/core/LRU~Entry}
+	         */
+	        this.prev;
+	    };
+
+	    /**
+	     * LRU Cache
+	     * @constructor
+	     * @alias module:zrender/core/LRU
+	     */
+	    var LRU = function(maxSize) {
+
+	        this._list = new LinkedList();
+
+	        this._map = {};
+
+	        this._maxSize = maxSize || 10;
+	    };
+
+	    var LRUProto = LRU.prototype;
+
+	    /**
+	     * @param  {string} key
+	     * @param  {} value
+	     */
+	    LRUProto.put = function(key, value) {
+	        var list = this._list;
+	        var map = this._map;
+	        if (map[key] == null) {
+	            var len = list.len();
+	            if (len >= this._maxSize && len > 0) {
+	                // Remove the least recently used
+	                var leastUsedEntry = list.head;
+	                list.remove(leastUsedEntry);
+	                delete map[leastUsedEntry.key];
+	            }
+
+	            var entry = list.insert(value);
+	            entry.key = key;
+	            map[key] = entry;
+	        }
+	    };
+
+	    /**
+	     * @param  {string} key
+	     * @return {}
+	     */
+	    LRUProto.get = function(key) {
+	        var entry = this._map[key];
+	        var list = this._list;
+	        if (entry != null) {
+	            // Put the latest used entry in the tail
+	            if (entry !== list.tail) {
+	                list.remove(entry);
+	                list.insertEntry(entry);
+	            }
+
+	            return entry.value;
+	        }
+	    };
+
+	    /**
+	     * Clear the cache
+	     */
+	    LRUProto.clear = function() {
+	        this._list.clear();
+	        this._map = {};
+	    };
+
+	    module.exports = LRU;
+
+
+/***/ },
+/* 64 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * Text element
+	 * @module zrender/graphic/Text
+	 *
+	 * TODO Wrapping
+	 *
+	 * Text not support gradient
+	 */
+
+
+
+	    var Displayable = __webpack_require__(46);
+	    var zrUtil = __webpack_require__(4);
+	    var textContain = __webpack_require__(8);
+
+	    /**
+	     * @alias zrender/graphic/Text
+	     * @extends module:zrender/graphic/Displayable
+	     * @constructor
+	     * @param {Object} opts
+	     */
+	    var Text = function (opts) {
+	        Displayable.call(this, opts);
+	    };
+
+	    Text.prototype = {
+
+	        constructor: Text,
+
+	        type: 'text',
+
+	        brush: function (ctx, prevEl) {
+	            var style = this.style;
+	            var x = style.x || 0;
+	            var y = style.y || 0;
+	            // Convert to string
+	            var text = style.text;
+
+	            // Convert to string
+	            text != null && (text += '');
+
+	            // Always bind style
+	            style.bind(ctx, this, prevEl);
+
+	            if (text) {
+
+	                this.setTransform(ctx);
+
+	                var textBaseline;
+	                var textAlign = style.textAlign;
+	                var font = style.textFont || style.font;
+	                if (style.textVerticalAlign) {
+	                    var rect = textContain.getBoundingRect(
+	                        text, font, style.textAlign, 'top'
+	                    );
+	                    // Ignore textBaseline
+	                    textBaseline = 'middle';
+	                    switch (style.textVerticalAlign) {
+	                        case 'middle':
+	                            y -= rect.height / 2 - rect.lineHeight / 2;
+	                            break;
+	                        case 'bottom':
+	                            y -= rect.height - rect.lineHeight / 2;
+	                            break;
+	                        default:
+	                            y += rect.lineHeight / 2;
+	                    }
+	                }
+	                else {
+	                    textBaseline = style.textBaseline;
+	                }
+
+	                ctx.font = font;
+	                ctx.textAlign = textAlign || 'left';
+	                // Use canvas default left textAlign. Giving invalid value will cause state not change
+	                if (ctx.textAlign !== textAlign) {
+	                    ctx.textAlign = 'left';
+	                }
+	                ctx.textBaseline = textBaseline || 'alphabetic';
+	                // Use canvas default alphabetic baseline
+	                if (ctx.textBaseline !== textBaseline) {
+	                    ctx.textBaseline = 'alphabetic';
+	                }
+
+	                var lineHeight = textContain.measureText('国', ctx.font).width;
+
+	                var textLines = text.split('\n');
+	                for (var i = 0; i < textLines.length; i++) {
+	                    style.hasFill() && ctx.fillText(textLines[i], x, y);
+	                    style.hasStroke() && ctx.strokeText(textLines[i], x, y);
+	                    y += lineHeight;
+	                }
+
+	                this.restoreTransform(ctx);
+	            }
+	        },
+
+	        getBoundingRect: function () {
+	            if (!this._rect) {
+	                var style = this.style;
+	                var textVerticalAlign = style.textVerticalAlign;
+	                var rect = textContain.getBoundingRect(
+	                    style.text + '', style.textFont || style.font, style.textAlign,
+	                    textVerticalAlign ? 'top' : style.textBaseline
+	                );
+	                switch (textVerticalAlign) {
+	                    case 'middle':
+	                        rect.y -= rect.height / 2;
+	                        break;
+	                    case 'bottom':
+	                        rect.y -= rect.height;
+	                        break;
+	                }
+	                rect.x += style.x || 0;
+	                rect.y += style.y || 0;
+	                this._rect = rect;
+	            }
+	            return this._rect;
+	        }
+	    };
+
+	    zrUtil.inherits(Text, Displayable);
+
+	    module.exports = Text;
+
+
+/***/ },
+/* 65 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+	/**
+	 * 圆形
+	 * @module zrender/shape/Circle
+	 */
+
+
+
+	    module.exports = __webpack_require__(45).extend({
+
+	        type: 'circle',
+
+	        shape: {
+	            cx: 0,
+	            cy: 0,
+	            r: 0
+	        },
+
+
+	        buildPath : function (ctx, shape, inBundle) {
+	            // Better stroking in ShapeBundle
+	            // Always do it may have performence issue ( fill may be 2x more cost)
+	            if (inBundle) {
+	                ctx.moveTo(shape.cx + shape.r, shape.cy);
+	            }
+	            // Better stroking in ShapeBundle
+	            // ctx.moveTo(shape.cx + shape.r, shape.cy);
+	            ctx.arc(shape.cx, shape.cy, shape.r, 0, Math.PI * 2, true);
+	        }
+	    });
+
+
+
+/***/ },
+/* 66 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * 扇形
+	 * @module zrender/graphic/shape/Sector
+	 */
+
+	// FIXME clockwise seems wrong
+
+
+	    module.exports = __webpack_require__(45).extend({
+
+	        type: 'sector',
+
+	        shape: {
+
+	            cx: 0,
+
+	            cy: 0,
+
+	            r0: 0,
+
+	            r: 0,
+
+	            startAngle: 0,
+
+	            endAngle: Math.PI * 2,
+
+	            clockwise: true
+	        },
+
+	        buildPath: function (ctx, shape) {
+
+	            var x = shape.cx;
+	            var y = shape.cy;
+	            var r0 = Math.max(shape.r0 || 0, 0);
+	            var r = Math.max(shape.r, 0);
+	            var startAngle = shape.startAngle;
+	            var endAngle = shape.endAngle;
+	            var clockwise = shape.clockwise;
+
+	            var unitX = Math.cos(startAngle);
+	            var unitY = Math.sin(startAngle);
+
+	            ctx.moveTo(unitX * r0 + x, unitY * r0 + y);
+
+	            ctx.lineTo(unitX * r + x, unitY * r + y);
+
+	            ctx.arc(x, y, r, startAngle, endAngle, !clockwise);
+
+	            ctx.lineTo(
+	                Math.cos(endAngle) * r0 + x,
+	                Math.sin(endAngle) * r0 + y
+	            );
+
+	            if (r0 !== 0) {
+	                ctx.arc(x, y, r0, endAngle, startAngle, clockwise);
+	            }
+
+	            ctx.closePath();
+	        }
+	    });
+
+
+
+/***/ },
+/* 67 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * 圆环
+	 * @module zrender/graphic/shape/Ring
+	 */
+
+
+	    module.exports = __webpack_require__(45).extend({
+
+	        type: 'ring',
+
+	        shape: {
+	            cx: 0,
+	            cy: 0,
+	            r: 0,
+	            r0: 0
+	        },
+
+	        buildPath: function (ctx, shape) {
+	            var x = shape.cx;
+	            var y = shape.cy;
+	            var PI2 = Math.PI * 2;
+	            ctx.moveTo(x + shape.r, y);
+	            ctx.arc(x, y, shape.r, 0, PI2, false);
+	            ctx.moveTo(x + shape.r0, y);
+	            ctx.arc(x, y, shape.r0, 0, PI2, true);
+	        }
+	    });
+
+
+
+/***/ },
+/* 68 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * 多边形
+	 * @module zrender/shape/Polygon
+	 */
+
+
+	    var polyHelper = __webpack_require__(69);
+
+	    module.exports = __webpack_require__(45).extend({
+	        
+	        type: 'polygon',
+
+	        shape: {
+	            points: null,
+
+	            smooth: false,
+
+	            smoothConstraint: null
+	        },
+
+	        buildPath: function (ctx, shape) {
+	            polyHelper.buildPath(ctx, shape, true);
+	        }
+	    });
+
+
+/***/ },
+/* 69 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var smoothSpline = __webpack_require__(70);
+	    var smoothBezier = __webpack_require__(71);
+
+	    module.exports = {
+	        buildPath: function (ctx, shape, closePath) {
+	            var points = shape.points;
+	            var smooth = shape.smooth;
+	            if (points && points.length >= 2) {
+	                if (smooth && smooth !== 'spline') {
+	                    var controlPoints = smoothBezier(
+	                        points, smooth, closePath, shape.smoothConstraint
+	                    );
+
+	                    ctx.moveTo(points[0][0], points[0][1]);
+	                    var len = points.length;
+	                    for (var i = 0; i < (closePath ? len : len - 1); i++) {
+	                        var cp1 = controlPoints[i * 2];
+	                        var cp2 = controlPoints[i * 2 + 1];
+	                        var p = points[(i + 1) % len];
+	                        ctx.bezierCurveTo(
+	                            cp1[0], cp1[1], cp2[0], cp2[1], p[0], p[1]
+	                        );
+	                    }
+	                }
+	                else {
+	                    if (smooth === 'spline') {
+	                        points = smoothSpline(points, closePath);
+	                    }
+
+	                    ctx.moveTo(points[0][0], points[0][1]);
+	                    for (var i = 1, l = points.length; i < l; i++) {
+	                        ctx.lineTo(points[i][0], points[i][1]);
+	                    }
+	                }
+
+	                closePath && ctx.closePath();
+	            }
+	        }
+	    };
+
+
+/***/ },
+/* 70 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * Catmull-Rom spline 插值折线
+	 * @module zrender/shape/util/smoothSpline
+	 * @author pissang (https://www.github.com/pissang)
+	 *         Kener (@Kener-林峰, kener.linfeng@gmail.com)
+	 *         errorrik (errorrik@gmail.com)
+	 */
+
+	    var vec2 = __webpack_require__(10);
+
+	    /**
+	     * @inner
+	     */
+	    function interpolate(p0, p1, p2, p3, t, t2, t3) {
+	        var v0 = (p2 - p0) * 0.5;
+	        var v1 = (p3 - p1) * 0.5;
+	        return (2 * (p1 - p2) + v0 + v1) * t3
+	                + (-3 * (p1 - p2) - 2 * v0 - v1) * t2
+	                + v0 * t + p1;
+	    }
+
+	    /**
+	     * @alias module:zrender/shape/util/smoothSpline
+	     * @param {Array} points 线段顶点数组
+	     * @param {boolean} isLoop
+	     * @return {Array}
+	     */
+	    module.exports = function (points, isLoop) {
+	        var len = points.length;
+	        var ret = [];
+
+	        var distance = 0;
+	        for (var i = 1; i < len; i++) {
+	            distance += vec2.distance(points[i - 1], points[i]);
+	        }
+
+	        var segs = distance / 2;
+	        segs = segs < len ? len : segs;
+	        for (var i = 0; i < segs; i++) {
+	            var pos = i / (segs - 1) * (isLoop ? len : len - 1);
+	            var idx = Math.floor(pos);
+
+	            var w = pos - idx;
+
+	            var p0;
+	            var p1 = points[idx % len];
+	            var p2;
+	            var p3;
+	            if (!isLoop) {
+	                p0 = points[idx === 0 ? idx : idx - 1];
+	                p2 = points[idx > len - 2 ? len - 1 : idx + 1];
+	                p3 = points[idx > len - 3 ? len - 1 : idx + 2];
+	            }
+	            else {
+	                p0 = points[(idx - 1 + len) % len];
+	                p2 = points[(idx + 1) % len];
+	                p3 = points[(idx + 2) % len];
+	            }
+
+	            var w2 = w * w;
+	            var w3 = w * w2;
+
+	            ret.push([
+	                interpolate(p0[0], p1[0], p2[0], p3[0], w, w2, w3),
+	                interpolate(p0[1], p1[1], p2[1], p3[1], w, w2, w3)
+	            ]);
+	        }
+	        return ret;
+	    };
+
+
+
+/***/ },
+/* 71 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * 贝塞尔平滑曲线
+	 * @module zrender/shape/util/smoothBezier
+	 * @author pissang (https://www.github.com/pissang)
+	 *         Kener (@Kener-林峰, kener.linfeng@gmail.com)
+	 *         errorrik (errorrik@gmail.com)
+	 */
+
+
+	    var vec2 = __webpack_require__(10);
+	    var v2Min = vec2.min;
+	    var v2Max = vec2.max;
+	    var v2Scale = vec2.scale;
+	    var v2Distance = vec2.distance;
+	    var v2Add = vec2.add;
+
+	    /**
+	     * 贝塞尔平滑曲线
+	     * @alias module:zrender/shape/util/smoothBezier
+	     * @param {Array} points 线段顶点数组
+	     * @param {number} smooth 平滑等级, 0-1
+	     * @param {boolean} isLoop
+	     * @param {Array} constraint 将计算出来的控制点约束在一个包围盒内
+	     *                           比如 [[0, 0], [100, 100]], 这个包围盒会与
+	     *                           整个折线的包围盒做一个并集用来约束控制点。
+	     * @param {Array} 计算出来的控制点数组
+	     */
+	    module.exports = function (points, smooth, isLoop, constraint) {
+	        var cps = [];
+
+	        var v = [];
+	        var v1 = [];
+	        var v2 = [];
+	        var prevPoint;
+	        var nextPoint;
+
+	        var min, max;
+	        if (constraint) {
+	            min = [Infinity, Infinity];
+	            max = [-Infinity, -Infinity];
+	            for (var i = 0, len = points.length; i < len; i++) {
+	                v2Min(min, min, points[i]);
+	                v2Max(max, max, points[i]);
+	            }
+	            // 与指定的包围盒做并集
+	            v2Min(min, min, constraint[0]);
+	            v2Max(max, max, constraint[1]);
+	        }
+
+	        for (var i = 0, len = points.length; i < len; i++) {
+	            var point = points[i];
+
+	            if (isLoop) {
+	                prevPoint = points[i ? i - 1 : len - 1];
+	                nextPoint = points[(i + 1) % len];
+	            }
+	            else {
+	                if (i === 0 || i === len - 1) {
+	                    cps.push(vec2.clone(points[i]));
+	                    continue;
+	                }
+	                else {
+	                    prevPoint = points[i - 1];
+	                    nextPoint = points[i + 1];
+	                }
+	            }
+
+	            vec2.sub(v, nextPoint, prevPoint);
+
+	            // use degree to scale the handle length
+	            v2Scale(v, v, smooth);
+
+	            var d0 = v2Distance(point, prevPoint);
+	            var d1 = v2Distance(point, nextPoint);
+	            var sum = d0 + d1;
+	            if (sum !== 0) {
+	                d0 /= sum;
+	                d1 /= sum;
+	            }
+
+	            v2Scale(v1, v, -d0);
+	            v2Scale(v2, v, d1);
+	            var cp0 = v2Add([], point, v1);
+	            var cp1 = v2Add([], point, v2);
+	            if (constraint) {
+	                v2Max(cp0, cp0, min);
+	                v2Min(cp0, cp0, max);
+	                v2Max(cp1, cp1, min);
+	                v2Min(cp1, cp1, max);
+	            }
+	            cps.push(cp0);
+	            cps.push(cp1);
+	        }
+
+	        if (isLoop) {
+	            cps.push(cps.shift());
+	        }
+
+	        return cps;
+	    };
+
+
+
+/***/ },
+/* 72 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @module zrender/graphic/shape/Polyline
+	 */
+
+
+	    var polyHelper = __webpack_require__(69);
+
+	    module.exports = __webpack_require__(45).extend({
+	        
+	        type: 'polyline',
+
+	        shape: {
+	            points: null,
+
+	            smooth: false,
+
+	            smoothConstraint: null
+	        },
+
+	        style: {
+	            stroke: '#000',
+
+	            fill: null
+	        },
+
+	        buildPath: function (ctx, shape) {
+	            polyHelper.buildPath(ctx, shape, false);
+	        }
+	    });
+
+
+/***/ },
+/* 73 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * 矩形
+	 * @module zrender/graphic/shape/Rect
+	 */
+
+
+	    var roundRectHelper = __webpack_require__(74);
+
+	    module.exports = __webpack_require__(45).extend({
+
+	        type: 'rect',
+
+	        shape: {
+	            // 左上、右上、右下、左下角的半径依次为r1、r2、r3、r4
+	            // r缩写为1         相当于 [1, 1, 1, 1]
+	            // r缩写为[1]       相当于 [1, 1, 1, 1]
+	            // r缩写为[1, 2]    相当于 [1, 2, 1, 2]
+	            // r缩写为[1, 2, 3] 相当于 [1, 2, 3, 2]
+	            r: 0,
+
+	            x: 0,
+	            y: 0,
+	            width: 0,
+	            height: 0
+	        },
+
+	        buildPath: function (ctx, shape) {
+	            var x = shape.x;
+	            var y = shape.y;
+	            var width = shape.width;
+	            var height = shape.height;
+	            if (!shape.r) {
+	                ctx.rect(x, y, width, height);
+	            }
+	            else {
+	                roundRectHelper.buildPath(ctx, shape);
+	            }
+	            ctx.closePath();
+	            return;
+	        }
+	    });
+
+
+
+/***/ },
+/* 74 */
+/***/ function(module, exports) {
+
+	
+
+	    module.exports = {
+	        buildPath: function (ctx, shape) {
+	            var x = shape.x;
+	            var y = shape.y;
+	            var width = shape.width;
+	            var height = shape.height;
+	            var r = shape.r;
+	            var r1;
+	            var r2;
+	            var r3;
+	            var r4;
+
+	            // Convert width and height to positive for better borderRadius
+	            if (width < 0) {
+	                x = x + width;
+	                width = -width;
+	            }
+	            if (height < 0) {
+	                y = y + height;
+	                height = -height;
+	            }
+
+	            if (typeof r === 'number') {
+	                r1 = r2 = r3 = r4 = r;
+	            }
+	            else if (r instanceof Array) {
+	                if (r.length === 1) {
+	                    r1 = r2 = r3 = r4 = r[0];
+	                }
+	                else if (r.length === 2) {
+	                    r1 = r3 = r[0];
+	                    r2 = r4 = r[1];
+	                }
+	                else if (r.length === 3) {
+	                    r1 = r[0];
+	                    r2 = r4 = r[1];
+	                    r3 = r[2];
+	                }
+	                else {
+	                    r1 = r[0];
+	                    r2 = r[1];
+	                    r3 = r[2];
+	                    r4 = r[3];
+	                }
+	            }
+	            else {
+	                r1 = r2 = r3 = r4 = 0;
+	            }
+
+	            var total;
+	            if (r1 + r2 > width) {
+	                total = r1 + r2;
+	                r1 *= width / total;
+	                r2 *= width / total;
+	            }
+	            if (r3 + r4 > width) {
+	                total = r3 + r4;
+	                r3 *= width / total;
+	                r4 *= width / total;
+	            }
+	            if (r2 + r3 > height) {
+	                total = r2 + r3;
+	                r2 *= height / total;
+	                r3 *= height / total;
+	            }
+	            if (r1 + r4 > height) {
+	                total = r1 + r4;
+	                r1 *= height / total;
+	                r4 *= height / total;
+	            }
+	            ctx.moveTo(x + r1, y);
+	            ctx.lineTo(x + width - r2, y);
+	            r2 !== 0 && ctx.quadraticCurveTo(
+	                x + width, y, x + width, y + r2
+	            );
+	            ctx.lineTo(x + width, y + height - r3);
+	            r3 !== 0 && ctx.quadraticCurveTo(
+	                x + width, y + height, x + width - r3, y + height
+	            );
+	            ctx.lineTo(x + r4, y + height);
+	            r4 !== 0 && ctx.quadraticCurveTo(
+	                x, y + height, x, y + height - r4
+	            );
+	            ctx.lineTo(x, y + r1);
+	            r1 !== 0 && ctx.quadraticCurveTo(x, y, x + r1, y);
+	        }
+	    };
+
+
+/***/ },
+/* 75 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * 直线
+	 * @module zrender/graphic/shape/Line
+	 */
+
+	    module.exports = __webpack_require__(45).extend({
+
+	        type: 'line',
+
+	        shape: {
+	            // Start point
+	            x1: 0,
+	            y1: 0,
+	            // End point
+	            x2: 0,
+	            y2: 0,
+
+	            percent: 1
+	        },
+
+	        style: {
+	            stroke: '#000',
+	            fill: null
+	        },
+
+	        buildPath: function (ctx, shape) {
+	            var x1 = shape.x1;
+	            var y1 = shape.y1;
+	            var x2 = shape.x2;
+	            var y2 = shape.y2;
+	            var percent = shape.percent;
+
+	            if (percent === 0) {
+	                return;
+	            }
+
+	            ctx.moveTo(x1, y1);
+
+	            if (percent < 1) {
+	                x2 = x1 * (1 - percent) + x2 * percent;
+	                y2 = y1 * (1 - percent) + y2 * percent;
+	            }
+	            ctx.lineTo(x2, y2);
+	        },
+
+	        /**
+	         * Get point at percent
+	         * @param  {number} percent
+	         * @return {Array.<number>}
+	         */
+	        pointAt: function (p) {
+	            var shape = this.shape;
+	            return [
+	                shape.x1 * (1 - p) + shape.x2 * p,
+	                shape.y1 * (1 - p) + shape.y2 * p
+	            ];
+	        }
+	    });
+
+
+
+/***/ },
+/* 76 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+	/**
+	 * 贝塞尔曲线
+	 * @module zrender/shape/BezierCurve
+	 */
+
+
+	    var curveTool = __webpack_require__(50);
+	    var vec2 = __webpack_require__(10);
+	    var quadraticSubdivide = curveTool.quadraticSubdivide;
+	    var cubicSubdivide = curveTool.cubicSubdivide;
+	    var quadraticAt = curveTool.quadraticAt;
+	    var cubicAt = curveTool.cubicAt;
+	    var quadraticDerivativeAt = curveTool.quadraticDerivativeAt;
+	    var cubicDerivativeAt = curveTool.cubicDerivativeAt;
+
+	    var out = [];
+
+	    function someVectorAt(shape, t, isTangent) {
+	        var cpx2 = shape.cpx2;
+	        var cpy2 = shape.cpy2;
+	        if (cpx2 === null || cpy2 === null) {
+	            return [
+	                (isTangent ? cubicDerivativeAt : cubicAt)(shape.x1, shape.cpx1, shape.cpx2, shape.x2, t),
+	                (isTangent ? cubicDerivativeAt : cubicAt)(shape.y1, shape.cpy1, shape.cpy2, shape.y2, t)
+	            ];
+	        }
+	        else {
+	            return [
+	                (isTangent ? quadraticDerivativeAt : quadraticAt)(shape.x1, shape.cpx1, shape.x2, t),
+	                (isTangent ? quadraticDerivativeAt : quadraticAt)(shape.y1, shape.cpy1, shape.y2, t)
+	            ];
+	        }
+	    }
+	    module.exports = __webpack_require__(45).extend({
+
+	        type: 'bezier-curve',
+
+	        shape: {
+	            x1: 0,
+	            y1: 0,
+	            x2: 0,
+	            y2: 0,
+	            cpx1: 0,
+	            cpy1: 0,
+	            // cpx2: 0,
+	            // cpy2: 0
+
+	            // Curve show percent, for animating
+	            percent: 1
+	        },
+
+	        style: {
+	            stroke: '#000',
+	            fill: null
+	        },
+
+	        buildPath: function (ctx, shape) {
+	            var x1 = shape.x1;
+	            var y1 = shape.y1;
+	            var x2 = shape.x2;
+	            var y2 = shape.y2;
+	            var cpx1 = shape.cpx1;
+	            var cpy1 = shape.cpy1;
+	            var cpx2 = shape.cpx2;
+	            var cpy2 = shape.cpy2;
+	            var percent = shape.percent;
+	            if (percent === 0) {
+	                return;
+	            }
+
+	            ctx.moveTo(x1, y1);
+
+	            if (cpx2 == null || cpy2 == null) {
+	                if (percent < 1) {
+	                    quadraticSubdivide(
+	                        x1, cpx1, x2, percent, out
+	                    );
+	                    cpx1 = out[1];
+	                    x2 = out[2];
+	                    quadraticSubdivide(
+	                        y1, cpy1, y2, percent, out
+	                    );
+	                    cpy1 = out[1];
+	                    y2 = out[2];
+	                }
+
+	                ctx.quadraticCurveTo(
+	                    cpx1, cpy1,
+	                    x2, y2
+	                );
+	            }
+	            else {
+	                if (percent < 1) {
+	                    cubicSubdivide(
+	                        x1, cpx1, cpx2, x2, percent, out
+	                    );
+	                    cpx1 = out[1];
+	                    cpx2 = out[2];
+	                    x2 = out[3];
+	                    cubicSubdivide(
+	                        y1, cpy1, cpy2, y2, percent, out
+	                    );
+	                    cpy1 = out[1];
+	                    cpy2 = out[2];
+	                    y2 = out[3];
+	                }
+	                ctx.bezierCurveTo(
+	                    cpx1, cpy1,
+	                    cpx2, cpy2,
+	                    x2, y2
+	                );
+	            }
+	        },
+
+	        /**
+	         * Get point at percent
+	         * @param  {number} t
+	         * @return {Array.<number>}
+	         */
+	        pointAt: function (t) {
+	            return someVectorAt(this.shape, t, false);
+	        },
+
+	        /**
+	         * Get tangent at percent
+	         * @param  {number} t
+	         * @return {Array.<number>}
+	         */
+	        tangentAt: function (t) {
+	            var p = someVectorAt(this.shape, t, true);
+	            return vec2.normalize(p, p);
+	        }
+	    });
+
+
+
+/***/ },
+/* 77 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * 圆弧
+	 * @module zrender/graphic/shape/Arc
+	 */
+	 
+
+	    module.exports = __webpack_require__(45).extend({
+
+	        type: 'arc',
+
+	        shape: {
+
+	            cx: 0,
+
+	            cy: 0,
+
+	            r: 0,
+
+	            startAngle: 0,
+
+	            endAngle: Math.PI * 2,
+
+	            clockwise: true
+	        },
+
+	        style: {
+
+	            stroke: '#000',
+
+	            fill: null
+	        },
+
+	        buildPath: function (ctx, shape) {
+
+	            var x = shape.cx;
+	            var y = shape.cy;
+	            var r = Math.max(shape.r, 0);
+	            var startAngle = shape.startAngle;
+	            var endAngle = shape.endAngle;
+	            var clockwise = shape.clockwise;
+
+	            var unitX = Math.cos(startAngle);
+	            var unitY = Math.sin(startAngle);
+
+	            ctx.moveTo(unitX * r + x, unitY * r + y);
+	            ctx.arc(x, y, r, startAngle, endAngle, !clockwise);
+	        }
+	    });
+
+
+/***/ },
+/* 78 */
+/***/ function(module, exports, __webpack_require__) {
+
+	// CompoundPath to improve performance
+
+
+	    var Path = __webpack_require__(45);
+	    module.exports = Path.extend({
+
+	        type: 'compound',
+
+	        shape: {
+
+	            paths: null
+	        },
+
+	        _updatePathDirty: function () {
+	            var dirtyPath = this.__dirtyPath;
+	            var paths = this.shape.paths;
+	            for (var i = 0; i < paths.length; i++) {
+	                // Mark as dirty if any subpath is dirty
+	                dirtyPath = dirtyPath || paths[i].__dirtyPath;
+	            }
+	            this.__dirtyPath = dirtyPath;
+	            this.__dirty = this.__dirty || dirtyPath;
+	        },
+
+	        beforeBrush: function () {
+	            this._updatePathDirty();
+	            var paths = this.shape.paths || [];
+	            var scale = this.getGlobalScale();
+	            // Update path scale
+	            for (var i = 0; i < paths.length; i++) {
+	                paths[i].path.setScale(scale[0], scale[1]);
+	            }
+	        },
+
+	        buildPath: function (ctx, shape) {
+	            var paths = shape.paths || [];
+	            for (var i = 0; i < paths.length; i++) {
+	                paths[i].buildPath(ctx, paths[i].shape, true);
+	            }
+	        },
+
+	        afterBrush: function () {
+	            var paths = this.shape.paths;
+	            for (var i = 0; i < paths.length; i++) {
+	                paths[i].__dirtyPath = false;
+	            }
+	        },
+
+	        getBoundingRect: function () {
+	            this._updatePathDirty();
+	            return Path.prototype.getBoundingRect.call(this);
+	        }
+	    });
+
+
+/***/ },
+/* 79 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var zrUtil = __webpack_require__(4);
+
+	    var Gradient = __webpack_require__(61);
+
+	    /**
+	     * x, y, x2, y2 are all percent from 0 to 1
+	     * @param {number} [x=0]
+	     * @param {number} [y=0]
+	     * @param {number} [x2=1]
+	     * @param {number} [y2=0]
+	     * @param {Array.<Object>} colorStops
+	     * @param {boolean} [globalCoord=false]
+	     */
+	    var LinearGradient = function (x, y, x2, y2, colorStops, globalCoord) {
+	        this.x = x == null ? 0 : x;
+
+	        this.y = y == null ? 0 : y;
+
+	        this.x2 = x2 == null ? 1 : x2;
+
+	        this.y2 = y2 == null ? 0 : y2;
+
+	        // Can be cloned
+	        this.type = 'linear';
+
+	        // If use global coord
+	        this.global = globalCoord || false;
+
+	        Gradient.call(this, colorStops);
+	    };
+
+	    LinearGradient.prototype = {
+
+	        constructor: LinearGradient
+	    };
+
+	    zrUtil.inherits(LinearGradient, Gradient);
+
+	    module.exports = LinearGradient;
+
+
+/***/ },
+/* 80 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var zrUtil = __webpack_require__(4);
+
+	    var Gradient = __webpack_require__(61);
+
+	    /**
+	     * x, y, r are all percent from 0 to 1
+	     * @param {number} [x=0.5]
+	     * @param {number} [y=0.5]
+	     * @param {number} [r=0.5]
+	     * @param {Array.<Object>} [colorStops]
+	     * @param {boolean} [globalCoord=false]
+	     */
+	    var RadialGradient = function (x, y, r, colorStops, globalCoord) {
+	        this.x = x == null ? 0.5 : x;
+
+	        this.y = y == null ? 0.5 : y;
+
+	        this.r = r == null ? 0.5 : r;
+
+	        // Can be cloned
+	        this.type = 'radial';
+
+	        // If use global coord
+	        this.global = globalCoord || false;
+
+	        Gradient.call(this, colorStops);
+	    };
+
+	    RadialGradient.prototype = {
+
+	        constructor: RadialGradient
+	    };
+
+	    zrUtil.inherits(RadialGradient, Gradient);
+
+	    module.exports = RadialGradient;
+
+
+/***/ },
+/* 81 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/*!
+	 * ZRender, a high performance 2d drawing library.
+	 *
+	 * Copyright (c) 2013, Baidu Inc.
+	 * All rights reserved.
+	 *
+	 * LICENSE
+	 * https://github.com/ecomfe/zrender/blob/master/LICENSE.txt
+	 */
+	// Global defines
+
+	    var guid = __webpack_require__(32);
+	    var env = __webpack_require__(2);
+
+	    var Handler = __webpack_require__(82);
+	    var Storage = __webpack_require__(84);
+	    var Animation = __webpack_require__(86);
+	    var HandlerProxy = __webpack_require__(89);
+
+	    var useVML = !env.canvasSupported;
+
+	    var painterCtors = {
+	        canvas: __webpack_require__(91)
+	    };
+
+	    var instances = {};    // ZRender实例map索引
+
+	    var zrender = {};
+	    /**
+	     * @type {string}
+	     */
+	    zrender.version = '3.1.2';
+
+	    /**
+	     * Initializing a zrender instance
+	     * @param {HTMLElement} dom
+	     * @param {Object} opts
+	     * @param {string} [opts.renderer='canvas'] 'canvas' or 'svg'
+	     * @param {number} [opts.devicePixelRatio]
+	     * @return {module:zrender/ZRender}
+	     */
+	    zrender.init = function(dom, opts) {
+	        var zr = new ZRender(guid(), dom, opts);
+	        instances[zr.id] = zr;
+	        return zr;
+	    };
+
+	    /**
+	     * Dispose zrender instance
+	     * @param {module:zrender/ZRender} zr
+	     */
+	    zrender.dispose = function (zr) {
+	        if (zr) {
+	            zr.dispose();
+	        }
+	        else {
+	            for (var key in instances) {
+	                instances[key].dispose();
+	            }
+	            instances = {};
+	        }
+
+	        return zrender;
+	    };
+
+	    /**
+	     * Get zrender instance by id
+	     * @param {string} id zrender instance id
+	     * @return {module:zrender/ZRender}
+	     */
+	    zrender.getInstance = function (id) {
+	        return instances[id];
+	    };
+
+	    zrender.registerPainter = function (name, Ctor) {
+	        painterCtors[name] = Ctor;
+	    };
+
+	    function delInstance(id) {
+	        delete instances[id];
+	    }
+
+	    /**
+	     * @module zrender/ZRender
+	     */
+	    /**
+	     * @constructor
+	     * @alias module:zrender/ZRender
+	     * @param {string} id
+	     * @param {HTMLDomElement} dom
+	     * @param {Object} opts
+	     * @param {string} [opts.renderer='canvas'] 'canvas' or 'svg'
+	     * @param {number} [opts.devicePixelRatio]
+	     */
+	    var ZRender = function(id, dom, opts) {
+
+	        opts = opts || {};
+
+	        /**
+	         * @type {HTMLDomElement}
+	         */
+	        this.dom = dom;
+
+	        /**
+	         * @type {string}
+	         */
+	        this.id = id;
+
+	        var self = this;
+	        var storage = new Storage();
+
+	        var rendererType = opts.renderer;
+	        if (useVML) {
+	            if (!painterCtors.vml) {
+	                throw new Error('You need to require \'zrender/vml/vml\' to support IE8');
+	            }
+	            rendererType = 'vml';
+	        }
+	        else if (!rendererType || !painterCtors[rendererType]) {
+	            rendererType = 'canvas';
+	        }
+	        var painter = new painterCtors[rendererType](dom, storage, opts);
+
+	        this.storage = storage;
+	        this.painter = painter;
+
+	        var handerProxy = !env.node ? new HandlerProxy(painter.getViewportRoot()) : null;
+	        this.handler = new Handler(storage, painter, handerProxy);
+
+	        /**
+	         * @type {module:zrender/animation/Animation}
+	         */
+	        this.animation = new Animation({
+	            stage: {
+	                update: function () {
+	                    if (self._needsRefresh) {
+	                        self.refreshImmediately();
+	                    }
+	                    if (self._needsRefreshHover) {
+	                        self.refreshHoverImmediately();
+	                    }
+	                }
+	            }
+	        });
+	        this.animation.start();
+
+	        /**
+	         * @type {boolean}
+	         * @private
+	         */
+	        this._needsRefresh;
+
+	        // 修改 storage.delFromMap, 每次删除元素之前删除动画
+	        // FIXME 有点ugly
+	        var oldDelFromMap = storage.delFromMap;
+	        var oldAddToMap = storage.addToMap;
+
+	        storage.delFromMap = function (elId) {
+	            var el = storage.get(elId);
+
+	            oldDelFromMap.call(storage, elId);
+
+	            el && el.removeSelfFromZr(self);
+	        };
+
+	        storage.addToMap = function (el) {
+	            oldAddToMap.call(storage, el);
+
+	            el.addSelfToZr(self);
+	        };
+	    };
+
+	    ZRender.prototype = {
+
+	        constructor: ZRender,
+	        /**
+	         * 获取实例唯一标识
+	         * @return {string}
+	         */
+	        getId: function () {
+	            return this.id;
+	        },
+
+	        /**
+	         * 添加元素
+	         * @param  {module:zrender/Element} el
+	         */
+	        add: function (el) {
+	            this.storage.addRoot(el);
+	            this._needsRefresh = true;
+	        },
+
+	        /**
+	         * 删除元素
+	         * @param  {module:zrender/Element} el
+	         */
+	        remove: function (el) {
+	            this.storage.delRoot(el);
+	            this._needsRefresh = true;
+	        },
+
+	        /**
+	         * Change configuration of layer
+	         * @param {string} zLevel
+	         * @param {Object} config
+	         * @param {string} [config.clearColor=0] Clear color
+	         * @param {string} [config.motionBlur=false] If enable motion blur
+	         * @param {number} [config.lastFrameAlpha=0.7] Motion blur factor. Larger value cause longer trailer
+	        */
+	        configLayer: function (zLevel, config) {
+	            this.painter.configLayer(zLevel, config);
+	            this._needsRefresh = true;
+	        },
+
+	        /**
+	         * Repaint the canvas immediately
+	         */
+	        refreshImmediately: function () {
+	            // Clear needsRefresh ahead to avoid something wrong happens in refresh
+	            // Or it will cause zrender refreshes again and again.
+	            this._needsRefresh = false;
+	            this.painter.refresh();
+	            /**
+	             * Avoid trigger zr.refresh in Element#beforeUpdate hook
+	             */
+	            this._needsRefresh = false;
+	        },
+
+	        /**
+	         * Mark and repaint the canvas in the next frame of browser
+	         */
+	        refresh: function() {
+	            this._needsRefresh = true;
+	        },
+
+	        /**
+	         * Add element to hover layer
+	         * @param  {module:zrender/Element} el
+	         * @param {Object} style
+	         */
+	        addHover: function (el, style) {
+	            if (this.painter.addHover) {
+	                this.painter.addHover(el, style);
+	                this.refreshHover();
+	            }
+	        },
+
+	        /**
+	         * Add element from hover layer
+	         * @param  {module:zrender/Element} el
+	         */
+	        removeHover: function (el) {
+	            if (this.painter.removeHover) {
+	                this.painter.removeHover(el);
+	                this.refreshHover();
+	            }
+	        },
+
+	        /**
+	         * Clear all hover elements in hover layer
+	         * @param  {module:zrender/Element} el
+	         */
+	        clearHover: function () {
+	            if (this.painter.clearHover) {
+	                this.painter.clearHover();
+	                this.refreshHover();
+	            }
+	        },
+
+	        /**
+	         * Refresh hover in next frame
+	         */
+	        refreshHover: function () {
+	            this._needsRefreshHover = true;
+	        },
+
+	        /**
+	         * Refresh hover immediately
+	         */
+	        refreshHoverImmediately: function () {
+	            this._needsRefreshHover = false;
+	            this.painter.refreshHover && this.painter.refreshHover();
+	        },
+
+	        /**
+	         * Resize the canvas.
+	         * Should be invoked when container size is changed
+	         */
+	        resize: function() {
+	            this.painter.resize();
+	            this.handler.resize();
+	        },
+
+	        /**
+	         * Stop and clear all animation immediately
+	         */
+	        clearAnimation: function () {
+	            this.animation.clear();
+	        },
+
+	        /**
+	         * Get container width
+	         */
+	        getWidth: function() {
+	            return this.painter.getWidth();
+	        },
+
+	        /**
+	         * Get container height
+	         */
+	        getHeight: function() {
+	            return this.painter.getHeight();
+	        },
+
+	        /**
+	         * Export the canvas as Base64 URL
+	         * @param {string} type
+	         * @param {string} [backgroundColor='#fff']
+	         * @return {string} Base64 URL
+	         */
+	        // toDataURL: function(type, backgroundColor) {
+	        //     return this.painter.getRenderedCanvas({
+	        //         backgroundColor: backgroundColor
+	        //     }).toDataURL(type);
+	        // },
+
+	        /**
+	         * Converting a path to image.
+	         * It has much better performance of drawing image rather than drawing a vector path.
+	         * @param {module:zrender/graphic/Path} e
+	         * @param {number} width
+	         * @param {number} height
+	         */
+	        pathToImage: function(e, width, height) {
+	            var id = guid();
+	            return this.painter.pathToImage(id, e, width, height);
+	        },
+
+	        /**
+	         * Set default cursor
+	         * @param {string} [cursorStyle='default'] 例如 crosshair
+	         */
+	        setCursorStyle: function (cursorStyle) {
+	            this.handler.setCursorStyle(cursorStyle);
+	        },
+
+	        /**
+	         * Bind event
+	         *
+	         * @param {string} eventName Event name
+	         * @param {Function} eventHandler Handler function
+	         * @param {Object} [context] Context object
+	         */
+	        on: function(eventName, eventHandler, context) {
+	            this.handler.on(eventName, eventHandler, context);
+	        },
+
+	        /**
+	         * Unbind event
+	         * @param {string} eventName Event name
+	         * @param {Function} [eventHandler] Handler function
+	         */
+	        off: function(eventName, eventHandler) {
+	            this.handler.off(eventName, eventHandler);
+	        },
+
+	        /**
+	         * Trigger event manually
+	         *
+	         * @param {string} eventName Event name
+	         * @param {event=} event Event object
+	         */
+	        trigger: function (eventName, event) {
+	            this.handler.trigger(eventName, event);
+	        },
+
+
+	        /**
+	         * Clear all objects and the canvas.
+	         */
+	        clear: function () {
+	            this.storage.delRoot();
+	            this.painter.clear();
+	        },
+
+	        /**
+	         * Dispose self.
+	         */
+	        dispose: function () {
+	            this.animation.stop();
+
+	            this.clear();
+	            this.storage.dispose();
+	            this.painter.dispose();
+	            this.handler.dispose();
+
+	            this.animation =
+	            this.storage =
+	            this.painter =
+	            this.handler = null;
+
+	            delInstance(this.id);
+	        }
+	    };
+
+	    module.exports = zrender;
+
+
+
+/***/ },
+/* 82 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+	/**
+	 * Handler
+	 * @module zrender/Handler
+	 * @author Kener (@Kener-林峰, kener.linfeng@gmail.com)
+	 *         errorrik (errorrik@gmail.com)
+	 *         pissang (shenyi.914@gmail.com)
+	 */
+
+
+	    var util = __webpack_require__(4);
+	    var Draggable = __webpack_require__(83);
+
+	    var Eventful = __webpack_require__(33);
+
+	    function makeEventPacket(eveType, target, event) {
+	        return {
+	            type: eveType,
+	            event: event,
+	            target: target,
+	            cancelBubble: false,
+	            offsetX: event.zrX,
+	            offsetY: event.zrY,
+	            gestureEvent: event.gestureEvent,
+	            pinchX: event.pinchX,
+	            pinchY: event.pinchY,
+	            pinchScale: event.pinchScale,
+	            wheelDelta: event.zrDelta
+	        };
+	    }
+
+	    function EmptyProxy () {}
+	    EmptyProxy.prototype.dispose = function () {};
+
+	    var handlerNames = [
+	        'click', 'dblclick', 'mousewheel', 'mouseout',
+	        'mouseup', 'mousedown', 'mousemove'
+	    ];
+	    /**
+	     * @alias module:zrender/Handler
+	     * @constructor
+	     * @extends module:zrender/mixin/Eventful
+	     * @param {HTMLElement} root Main HTML element for painting.
+	     * @param {module:zrender/Storage} storage Storage instance.
+	     * @param {module:zrender/Painter} painter Painter instance.
+	     */
+	    var Handler = function(storage, painter, proxy) {
+	        Eventful.call(this);
+
+	        this.storage = storage;
+
+	        this.painter = painter;
+
+	        proxy = proxy || new EmptyProxy();
+	        /**
+	         * Proxy of event. can be Dom, WebGLSurface, etc.
+	         */
+	        this.proxy = proxy;
+
+	        // Attach handler
+	        proxy.handler = this;
+
+	        /**
+	         * @private
+	         * @type {boolean}
+	         */
+	        this._hovered;
+
+	        /**
+	         * @private
+	         * @type {Date}
+	         */
+	        this._lastTouchMoment;
+
+	        /**
+	         * @private
+	         * @type {number}
+	         */
+	        this._lastX;
+
+	        /**
+	         * @private
+	         * @type {number}
+	         */
+	        this._lastY;
+
+
+	        Draggable.call(this);
+
+	        util.each(handlerNames, function (name) {
+	            proxy.on && proxy.on(name, this[name], this);
+	        }, this);
+	    };
+
+	    Handler.prototype = {
+
+	        constructor: Handler,
+
+	        mousemove: function (event) {
+	            var x = event.zrX;
+	            var y = event.zrY;
+
+	            var hovered = this.findHover(x, y, null);
+	            var lastHovered = this._hovered;
+	            var proxy = this.proxy;
+
+	            this._hovered = hovered;
+
+	            proxy.setCursor && proxy.setCursor(hovered ? hovered.cursor : 'default');
+
+	            // Mouse out on previous hovered element
+	            if (lastHovered && hovered !== lastHovered && lastHovered.__zr) {
+	                this.dispatchToElement(lastHovered, 'mouseout', event);
+	            }
+
+	            // Mouse moving on one element
+	            this.dispatchToElement(hovered, 'mousemove', event);
+
+	            // Mouse over on a new element
+	            if (hovered && hovered !== lastHovered) {
+	                this.dispatchToElement(hovered, 'mouseover', event);
+	            }
+	        },
+
+	        mouseout: function (event) {
+	            this.dispatchToElement(this._hovered, 'mouseout', event);
+
+	            this.trigger('globalout', {
+	                event: event
+	            });
+	        },
+
+	        /**
+	         * Resize
+	         */
+	        resize: function (event) {
+	            this._hovered = null;
+	        },
+
+	        /**
+	         * Dispatch event
+	         * @param {string} eventName
+	         * @param {event=} eventArgs
+	         */
+	        dispatch: function (eventName, eventArgs) {
+	            var handler = this[eventName];
+	            handler && handler.call(this, eventArgs);
+	        },
+
+	        /**
+	         * Dispose
+	         */
+	        dispose: function () {
+
+	            this.proxy.dispose();
+
+	            this.storage =
+	            this.proxy =
+	            this.painter = null;
+	        },
+
+	        /**
+	         * 设置默认的cursor style
+	         * @param {string} [cursorStyle='default'] 例如 crosshair
+	         */
+	        setCursorStyle: function (cursorStyle) {
+	            var proxy = this.proxy;
+	            proxy.setCursor && proxy.setCursor(cursorStyle);
+	        },
+
+	        /**
+	         * 事件分发代理
+	         *
+	         * @private
+	         * @param {Object} targetEl 目标图形元素
+	         * @param {string} eventName 事件名称
+	         * @param {Object} event 事件对象
+	         */
+	        dispatchToElement: function (targetEl, eventName, event) {
+	            var eventHandler = 'on' + eventName;
+	            var eventPacket = makeEventPacket(eventName, targetEl, event);
+
+	            var el = targetEl;
+
+	            while (el) {
+	                el[eventHandler]
+	                    && (eventPacket.cancelBubble = el[eventHandler].call(el, eventPacket));
+
+	                el.trigger(eventName, eventPacket);
+
+	                el = el.parent;
+
+	                if (eventPacket.cancelBubble) {
+	                    break;
+	                }
+	            }
+
+	            if (!eventPacket.cancelBubble) {
+	                // 冒泡到顶级 zrender 对象
+	                this.trigger(eventName, eventPacket);
+	                // 分发事件到用户自定义层
+	                // 用户有可能在全局 click 事件中 dispose，所以需要判断下 painter 是否存在
+	                this.painter && this.painter.eachOtherLayer(function (layer) {
+	                    if (typeof(layer[eventHandler]) == 'function') {
+	                        layer[eventHandler].call(layer, eventPacket);
+	                    }
+	                    if (layer.trigger) {
+	                        layer.trigger(eventName, eventPacket);
+	                    }
+	                });
+	            }
+	        },
+
+	        /**
+	         * @private
+	         * @param {number} x
+	         * @param {number} y
+	         * @param {module:zrender/graphic/Displayable} exclude
+	         * @method
+	         */
+	        findHover: function(x, y, exclude) {
+	            var list = this.storage.getDisplayList();
+	            for (var i = list.length - 1; i >= 0 ; i--) {
+	                if (!list[i].silent
+	                 && list[i] !== exclude
+	                 // getDisplayList may include ignored item in VML mode
+	                 && !list[i].ignore
+	                 && isHover(list[i], x, y)) {
+	                    return list[i];
+	                }
+	            }
+	        }
+	    };
+
+	    // Common handlers
+	    util.each(['click', 'mousedown', 'mouseup', 'mousewheel', 'dblclick'], function (name) {
+	        Handler.prototype[name] = function (event) {
+	            // Find hover again to avoid click event is dispatched manually. Or click is triggered without mouseover
+	            var hovered = this.findHover(event.zrX, event.zrY, null);
+
+	            if (name === 'mousedown') {
+	                this._downel = hovered;
+	                // In case click triggered before mouseup
+	                this._upel = hovered;
+	            }
+	            else if (name === 'mosueup') {
+	                this._upel = hovered;
+	            }
+	            else if (name === 'click') {
+	                if (this._downel !== this._upel) {
+	                    return;
+	                }
+	            }
+
+	            this.dispatchToElement(hovered, name, event);
+	        };
+	    });
+
+	    function isHover(displayable, x, y) {
+	        if (displayable[displayable.rectHover ? 'rectContain' : 'contain'](x, y)) {
+	            var el = displayable;
+	            while (el) {
+	                // If ancestor is silent or clipped by ancestor
+	                if (el.silent || (el.clipPath && !el.clipPath.contain(x, y)))  {
+	                    return false;
+	                }
+	                el = el.parent;
+	            }
+	            return true;
+	        }
+
+	        return false;
+	    }
+
+	    util.mixin(Handler, Eventful);
+	    util.mixin(Handler, Draggable);
+
+	    module.exports = Handler;
+
+
+/***/ },
+/* 83 */
+/***/ function(module, exports) {
+
+	// TODO Draggable for group
+	// FIXME Draggable on element which has parent rotation or scale
+
+	    function Draggable() {
+
+	        this.on('mousedown', this._dragStart, this);
+	        this.on('mousemove', this._drag, this);
+	        this.on('mouseup', this._dragEnd, this);
+	        this.on('globalout', this._dragEnd, this);
+	        // this._dropTarget = null;
+	        // this._draggingTarget = null;
+
+	        // this._x = 0;
+	        // this._y = 0;
+	    }
+
+	    Draggable.prototype = {
+
+	        constructor: Draggable,
+
+	        _dragStart: function (e) {
+	            var draggingTarget = e.target;
+	            if (draggingTarget && draggingTarget.draggable) {
+	                this._draggingTarget = draggingTarget;
+	                draggingTarget.dragging = true;
+	                this._x = e.offsetX;
+	                this._y = e.offsetY;
+
+	                this.dispatchToElement(draggingTarget, 'dragstart', e.event);
+	            }
+	        },
+
+	        _drag: function (e) {
+	            var draggingTarget = this._draggingTarget;
+	            if (draggingTarget) {
+
+	                var x = e.offsetX;
+	                var y = e.offsetY;
+
+	                var dx = x - this._x;
+	                var dy = y - this._y;
+	                this._x = x;
+	                this._y = y;
+
+	                draggingTarget.drift(dx, dy, e);
+	                this.dispatchToElement(draggingTarget, 'drag', e.event);
+
+	                var dropTarget = this.findHover(x, y, draggingTarget);
+	                var lastDropTarget = this._dropTarget;
+	                this._dropTarget = dropTarget;
+
+	                if (draggingTarget !== dropTarget) {
+	                    if (lastDropTarget && dropTarget !== lastDropTarget) {
+	                        this.dispatchToElement(lastDropTarget, 'dragleave', e.event);
+	                    }
+	                    if (dropTarget && dropTarget !== lastDropTarget) {
+	                        this.dispatchToElement(dropTarget, 'dragenter', e.event);
+	                    }
+	                }
+	            }
+	        },
+
+	        _dragEnd: function (e) {
+	            var draggingTarget = this._draggingTarget;
+
+	            if (draggingTarget) {
+	                draggingTarget.dragging = false;
+	            }
+
+	            this.dispatchToElement(draggingTarget, 'dragend', e.event);
+
+	            if (this._dropTarget) {
+	                this.dispatchToElement(this._dropTarget, 'drop', e.event);
+	            }
+
+	            this._draggingTarget = null;
+	            this._dropTarget = null;
+	        }
+
+	    };
+
+	    module.exports = Draggable;
+
+
+/***/ },
+/* 84 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+	/**
+	 * Storage内容仓库模块
+	 * @module zrender/Storage
+	 * @author Kener (@Kener-林峰, kener.linfeng@gmail.com)
+	 * @author errorrik (errorrik@gmail.com)
+	 * @author pissang (https://github.com/pissang/)
+	 */
+
+
+	    var util = __webpack_require__(4);
+	    var env = __webpack_require__(2);
+
+	    var Group = __webpack_require__(30);
+
+	    // Use timsort because in most case elements are partially sorted
+	    // https://jsfiddle.net/pissang/jr4x7mdm/8/
+	    var timsort = __webpack_require__(85);
+
+	    function shapeCompareFunc(a, b) {
+	        if (a.zlevel === b.zlevel) {
+	            if (a.z === b.z) {
+	                // if (a.z2 === b.z2) {
+	                //     // FIXME Slow has renderidx compare
+	                //     // http://stackoverflow.com/questions/20883421/sorting-in-javascript-should-every-compare-function-have-a-return-0-statement
+	                //     // https://github.com/v8/v8/blob/47cce544a31ed5577ffe2963f67acb4144ee0232/src/js/array.js#L1012
+	                //     return a.__renderidx - b.__renderidx;
+	                // }
+	                return a.z2 - b.z2;
+	            }
+	            return a.z - b.z;
+	        }
+	        return a.zlevel - b.zlevel;
+	    }
+	    /**
+	     * 内容仓库 (M)
+	     * @alias module:zrender/Storage
+	     * @constructor
+	     */
+	    var Storage = function () {
+	        // 所有常规形状，id索引的map
+	        this._elements = {};
+
+	        this._roots = [];
+
+	        this._displayList = [];
+
+	        this._displayListLen = 0;
+	    };
+
+	    Storage.prototype = {
+
+	        constructor: Storage,
+
+	        /**
+	         * @param  {Function} cb
+	         *
+	         */
+	        traverse: function (cb, context) {
+	            for (var i = 0; i < this._roots.length; i++) {
+	                this._roots[i].traverse(cb, context);
+	            }
+	        },
+
+	        /**
+	         * 返回所有图形的绘制队列
+	         * @param {boolean} [update=false] 是否在返回前更新该数组
+	         * @param {boolean} [includeIgnore=false] 是否包含 ignore 的数组, 在 update 为 true 的时候有效
+	         *
+	         * 详见{@link module:zrender/graphic/Displayable.prototype.updateDisplayList}
+	         * @return {Array.<module:zrender/graphic/Displayable>}
+	         */
+	        getDisplayList: function (update, includeIgnore) {
+	            includeIgnore = includeIgnore || false;
+	            if (update) {
+	                this.updateDisplayList(includeIgnore);
+	            }
+	            return this._displayList;
+	        },
+
+	        /**
+	         * 更新图形的绘制队列。
+	         * 每次绘制前都会调用，该方法会先深度优先遍历整个树，更新所有Group和Shape的变换并且把所有可见的Shape保存到数组中，
+	         * 最后根据绘制的优先级（zlevel > z > 插入顺序）排序得到绘制队列
+	         * @param {boolean} [includeIgnore=false] 是否包含 ignore 的数组
+	         */
+	        updateDisplayList: function (includeIgnore) {
+	            this._displayListLen = 0;
+	            var roots = this._roots;
+	            var displayList = this._displayList;
+	            for (var i = 0, len = roots.length; i < len; i++) {
+	                this._updateAndAddDisplayable(roots[i], null, includeIgnore);
+	            }
+	            displayList.length = this._displayListLen;
+
+	            // for (var i = 0, len = displayList.length; i < len; i++) {
+	            //     displayList[i].__renderidx = i;
+	            // }
+
+	            // displayList.sort(shapeCompareFunc);
+	            env.canvasSupported && timsort(displayList, shapeCompareFunc);
+	        },
+
+	        _updateAndAddDisplayable: function (el, clipPaths, includeIgnore) {
+
+	            if (el.ignore && !includeIgnore) {
+	                return;
+	            }
+
+	            el.beforeUpdate();
+
+	            if (el.__dirty) {
+
+	                el.update();
+
+	            }
+
+	            el.afterUpdate();
+
+	            var clipPath = el.clipPath;
+	            if (clipPath) {
+	                // clipPath 的变换是基于 group 的变换
+	                clipPath.parent = el;
+	                clipPath.updateTransform();
+
+	                // FIXME 效率影响
+	                if (clipPaths) {
+	                    clipPaths = clipPaths.slice();
+	                    clipPaths.push(clipPath);
+	                }
+	                else {
+	                    clipPaths = [clipPath];
+	                }
+	            }
+
+	            if (el.isGroup) {
+	                var children = el._children;
+
+	                for (var i = 0; i < children.length; i++) {
+	                    var child = children[i];
+
+	                    // Force to mark as dirty if group is dirty
+	                    // FIXME __dirtyPath ?
+	                    if (el.__dirty) {
+	                        child.__dirty = true;
+	                    }
+
+	                    this._updateAndAddDisplayable(child, clipPaths, includeIgnore);
+	                }
+
+	                // Mark group clean here
+	                el.__dirty = false;
+
+	            }
+	            else {
+	                el.__clipPaths = clipPaths;
+
+	                this._displayList[this._displayListLen++] = el;
+	            }
+	        },
+
+	        /**
+	         * 添加图形(Shape)或者组(Group)到根节点
+	         * @param {module:zrender/Element} el
+	         */
+	        addRoot: function (el) {
+	            // Element has been added
+	            if (this._elements[el.id]) {
+	                return;
+	            }
+
+	            if (el instanceof Group) {
+	                el.addChildrenToStorage(this);
+	            }
+
+	            this.addToMap(el);
+	            this._roots.push(el);
+	        },
+
+	        /**
+	         * 删除指定的图形(Shape)或者组(Group)
+	         * @param {string|Array.<string>} [elId] 如果为空清空整个Storage
+	         */
+	        delRoot: function (elId) {
+	            if (elId == null) {
+	                // 不指定elId清空
+	                for (var i = 0; i < this._roots.length; i++) {
+	                    var root = this._roots[i];
+	                    if (root instanceof Group) {
+	                        root.delChildrenFromStorage(this);
+	                    }
+	                }
+
+	                this._elements = {};
+	                this._roots = [];
+	                this._displayList = [];
+	                this._displayListLen = 0;
+
+	                return;
+	            }
+
+	            if (elId instanceof Array) {
+	                for (var i = 0, l = elId.length; i < l; i++) {
+	                    this.delRoot(elId[i]);
+	                }
+	                return;
+	            }
+
+	            var el;
+	            if (typeof(elId) == 'string') {
+	                el = this._elements[elId];
+	            }
+	            else {
+	                el = elId;
+	            }
+
+	            var idx = util.indexOf(this._roots, el);
+	            if (idx >= 0) {
+	                this.delFromMap(el.id);
+	                this._roots.splice(idx, 1);
+	                if (el instanceof Group) {
+	                    el.delChildrenFromStorage(this);
+	                }
+	            }
+	        },
+
+	        addToMap: function (el) {
+	            if (el instanceof Group) {
+	                el.__storage = this;
+	            }
+	            el.dirty();
+
+	            this._elements[el.id] = el;
+
+	            return this;
+	        },
+
+	        get: function (elId) {
+	            return this._elements[elId];
+	        },
+
+	        delFromMap: function (elId) {
+	            var elements = this._elements;
+	            var el = elements[elId];
+	            if (el) {
+	                delete elements[elId];
+	                if (el instanceof Group) {
+	                    el.__storage = null;
+	                }
+	            }
+
+	            return this;
+	        },
+
+	        /**
+	         * 清空并且释放Storage
+	         */
+	        dispose: function () {
+	            this._elements =
+	            this._renderList =
+	            this._roots = null;
+	        },
+
+	        displayableSortFunc: shapeCompareFunc
+	    };
+
+	    module.exports = Storage;
+
+
+
+/***/ },
+/* 85 */
+/***/ function(module, exports) {
+
+	// https://github.com/mziccard/node-timsort
+
+	    var DEFAULT_MIN_MERGE = 32;
+
+	    var DEFAULT_MIN_GALLOPING = 7;
+
+	    var DEFAULT_TMP_STORAGE_LENGTH = 256;
+
+	    function minRunLength(n) {
+	        var r = 0;
+
+	        while (n >= DEFAULT_MIN_MERGE) {
+	            r |= n & 1;
+	            n >>= 1;
+	        }
+
+	        return n + r;
+	    }
+
+	    function makeAscendingRun(array, lo, hi, compare) {
+	        var runHi = lo + 1;
+
+	        if (runHi === hi) {
+	            return 1;
+	        }
+
+	        if (compare(array[runHi++], array[lo]) < 0) {
+	            while (runHi < hi && compare(array[runHi], array[runHi - 1]) < 0) {
+	                runHi++;
+	            }
+
+	            reverseRun(array, lo, runHi);
+	        }
+	        else {
+	            while (runHi < hi && compare(array[runHi], array[runHi - 1]) >= 0) {
+	                runHi++;
+	            }
+	        }
+
+	        return runHi - lo;
+	    }
+
+	    function reverseRun(array, lo, hi) {
+	        hi--;
+
+	        while (lo < hi) {
+	            var t = array[lo];
+	            array[lo++] = array[hi];
+	            array[hi--] = t;
+	        }
+	    }
+
+	    function binaryInsertionSort(array, lo, hi, start, compare) {
+	        if (start === lo) {
+	            start++;
+	        }
+
+	        for (; start < hi; start++) {
+	            var pivot = array[start];
+
+	            var left = lo;
+	            var right = start;
+	            var mid;
+
+	            while (left < right) {
+	                mid = left + right >>> 1;
+
+	                if (compare(pivot, array[mid]) < 0) {
+	                    right = mid;
+	                }
+	                else {
+	                    left = mid + 1;
+	                }
+	            }
+
+	            var n = start - left;
+
+	            switch (n) {
+	                case 3:
+	                    array[left + 3] = array[left + 2];
+
+	                case 2:
+	                    array[left + 2] = array[left + 1];
+
+	                case 1:
+	                    array[left + 1] = array[left];
+	                    break;
+	                default:
+	                    while (n > 0) {
+	                        array[left + n] = array[left + n - 1];
+	                        n--;
+	                    }
+	            }
+
+	            array[left] = pivot;
+	        }
+	    }
+
+	    function gallopLeft(value, array, start, length, hint, compare) {
+	        var lastOffset = 0;
+	        var maxOffset = 0;
+	        var offset = 1;
+
+	        if (compare(value, array[start + hint]) > 0) {
+	            maxOffset = length - hint;
+
+	            while (offset < maxOffset && compare(value, array[start + hint + offset]) > 0) {
+	                lastOffset = offset;
+	                offset = (offset << 1) + 1;
+
+	                if (offset <= 0) {
+	                    offset = maxOffset;
+	                }
+	            }
+
+	            if (offset > maxOffset) {
+	                offset = maxOffset;
+	            }
+
+	            lastOffset += hint;
+	            offset += hint;
+	        }
+	        else {
+	            maxOffset = hint + 1;
+	            while (offset < maxOffset && compare(value, array[start + hint - offset]) <= 0) {
+	                lastOffset = offset;
+	                offset = (offset << 1) + 1;
+
+	                if (offset <= 0) {
+	                    offset = maxOffset;
+	                }
+	            }
+	            if (offset > maxOffset) {
+	                offset = maxOffset;
+	            }
+
+	            var tmp = lastOffset;
+	            lastOffset = hint - offset;
+	            offset = hint - tmp;
+	        }
+
+	        lastOffset++;
+	        while (lastOffset < offset) {
+	            var m = lastOffset + (offset - lastOffset >>> 1);
+
+	            if (compare(value, array[start + m]) > 0) {
+	                lastOffset = m + 1;
+	            }
+	            else {
+	                offset = m;
+	            }
+	        }
+	        return offset;
+	    }
+
+	    function gallopRight(value, array, start, length, hint, compare) {
+	        var lastOffset = 0;
+	        var maxOffset = 0;
+	        var offset = 1;
+
+	        if (compare(value, array[start + hint]) < 0) {
+	            maxOffset = hint + 1;
+
+	            while (offset < maxOffset && compare(value, array[start + hint - offset]) < 0) {
+	                lastOffset = offset;
+	                offset = (offset << 1) + 1;
+
+	                if (offset <= 0) {
+	                    offset = maxOffset;
+	                }
+	            }
+
+	            if (offset > maxOffset) {
+	                offset = maxOffset;
+	            }
+
+	            var tmp = lastOffset;
+	            lastOffset = hint - offset;
+	            offset = hint - tmp;
+	        }
+	        else {
+	            maxOffset = length - hint;
+
+	            while (offset < maxOffset && compare(value, array[start + hint + offset]) >= 0) {
+	                lastOffset = offset;
+	                offset = (offset << 1) + 1;
+
+	                if (offset <= 0) {
+	                    offset = maxOffset;
+	                }
+	            }
+
+	            if (offset > maxOffset) {
+	                offset = maxOffset;
+	            }
+
+	            lastOffset += hint;
+	            offset += hint;
+	        }
+
+	        lastOffset++;
+
+	        while (lastOffset < offset) {
+	            var m = lastOffset + (offset - lastOffset >>> 1);
+
+	            if (compare(value, array[start + m]) < 0) {
+	                offset = m;
+	            }
+	            else {
+	                lastOffset = m + 1;
+	            }
+	        }
+
+	        return offset;
+	    }
+
+	    function TimSort(array, compare) {
+	        var minGallop = DEFAULT_MIN_GALLOPING;
+	        var length = 0;
+	        var tmpStorageLength = DEFAULT_TMP_STORAGE_LENGTH;
+	        var stackLength = 0;
+	        var runStart;
+	        var runLength;
+	        var stackSize = 0;
+
+	        length = array.length;
+
+	        if (length < 2 * DEFAULT_TMP_STORAGE_LENGTH) {
+	            tmpStorageLength = length >>> 1;
+	        }
+
+	        var tmp = [];
+
+	        stackLength = length < 120 ? 5 : length < 1542 ? 10 : length < 119151 ? 19 : 40;
+
+	        runStart = [];
+	        runLength = [];
+
+	        function pushRun(_runStart, _runLength) {
+	            runStart[stackSize] = _runStart;
+	            runLength[stackSize] = _runLength;
+	            stackSize += 1;
+	        }
+
+	        function mergeRuns() {
+	            while (stackSize > 1) {
+	                var n = stackSize - 2;
+
+	                if (n >= 1 && runLength[n - 1] <= runLength[n] + runLength[n + 1] || n >= 2 && runLength[n - 2] <= runLength[n] + runLength[n - 1]) {
+	                    if (runLength[n - 1] < runLength[n + 1]) {
+	                        n--;
+	                    }
+	                }
+	                else if (runLength[n] > runLength[n + 1]) {
+	                    break;
+	                }
+	                mergeAt(n);
+	            }
+	        }
+
+	        function forceMergeRuns() {
+	            while (stackSize > 1) {
+	                var n = stackSize - 2;
+
+	                if (n > 0 && runLength[n - 1] < runLength[n + 1]) {
+	                    n--;
+	                }
+
+	                mergeAt(n);
+	            }
+	        }
+
+	        function mergeAt(i) {
+	            var start1 = runStart[i];
+	            var length1 = runLength[i];
+	            var start2 = runStart[i + 1];
+	            var length2 = runLength[i + 1];
+
+	            runLength[i] = length1 + length2;
+
+	            if (i === stackSize - 3) {
+	                runStart[i + 1] = runStart[i + 2];
+	                runLength[i + 1] = runLength[i + 2];
+	            }
+
+	            stackSize--;
+
+	            var k = gallopRight(array[start2], array, start1, length1, 0, compare);
+	            start1 += k;
+	            length1 -= k;
+
+	            if (length1 === 0) {
+	                return;
+	            }
+
+	            length2 = gallopLeft(array[start1 + length1 - 1], array, start2, length2, length2 - 1, compare);
+
+	            if (length2 === 0) {
+	                return;
+	            }
+
+	            if (length1 <= length2) {
+	                mergeLow(start1, length1, start2, length2);
+	            }
+	            else {
+	                mergeHigh(start1, length1, start2, length2);
+	            }
+	        }
+
+	        function mergeLow(start1, length1, start2, length2) {
+	            var i = 0;
+
+	            for (i = 0; i < length1; i++) {
+	                tmp[i] = array[start1 + i];
+	            }
+
+	            var cursor1 = 0;
+	            var cursor2 = start2;
+	            var dest = start1;
+
+	            array[dest++] = array[cursor2++];
+
+	            if (--length2 === 0) {
+	                for (i = 0; i < length1; i++) {
+	                    array[dest + i] = tmp[cursor1 + i];
+	                }
+	                return;
+	            }
+
+	            if (length1 === 1) {
+	                for (i = 0; i < length2; i++) {
+	                    array[dest + i] = array[cursor2 + i];
+	                }
+	                array[dest + length2] = tmp[cursor1];
+	                return;
+	            }
+
+	            var _minGallop = minGallop;
+	            var count1, count2, exit;
+
+	            while (1) {
+	                count1 = 0;
+	                count2 = 0;
+	                exit = false;
+
+	                do {
+	                    if (compare(array[cursor2], tmp[cursor1]) < 0) {
+	                        array[dest++] = array[cursor2++];
+	                        count2++;
+	                        count1 = 0;
+
+	                        if (--length2 === 0) {
+	                            exit = true;
+	                            break;
+	                        }
+	                    }
+	                    else {
+	                        array[dest++] = tmp[cursor1++];
+	                        count1++;
+	                        count2 = 0;
+	                        if (--length1 === 1) {
+	                            exit = true;
+	                            break;
+	                        }
+	                    }
+	                } while ((count1 | count2) < _minGallop);
+
+	                if (exit) {
+	                    break;
+	                }
+
+	                do {
+	                    count1 = gallopRight(array[cursor2], tmp, cursor1, length1, 0, compare);
+
+	                    if (count1 !== 0) {
+	                        for (i = 0; i < count1; i++) {
+	                            array[dest + i] = tmp[cursor1 + i];
+	                        }
+
+	                        dest += count1;
+	                        cursor1 += count1;
+	                        length1 -= count1;
+	                        if (length1 <= 1) {
+	                            exit = true;
+	                            break;
+	                        }
+	                    }
+
+	                    array[dest++] = array[cursor2++];
+
+	                    if (--length2 === 0) {
+	                        exit = true;
+	                        break;
+	                    }
+
+	                    count2 = gallopLeft(tmp[cursor1], array, cursor2, length2, 0, compare);
+
+	                    if (count2 !== 0) {
+	                        for (i = 0; i < count2; i++) {
+	                            array[dest + i] = array[cursor2 + i];
+	                        }
+
+	                        dest += count2;
+	                        cursor2 += count2;
+	                        length2 -= count2;
+
+	                        if (length2 === 0) {
+	                            exit = true;
+	                            break;
+	                        }
+	                    }
+	                    array[dest++] = tmp[cursor1++];
+
+	                    if (--length1 === 1) {
+	                        exit = true;
+	                        break;
+	                    }
+
+	                    _minGallop--;
+	                } while (count1 >= DEFAULT_MIN_GALLOPING || count2 >= DEFAULT_MIN_GALLOPING);
+
+	                if (exit) {
+	                    break;
+	                }
+
+	                if (_minGallop < 0) {
+	                    _minGallop = 0;
+	                }
+
+	                _minGallop += 2;
+	            }
+
+	            minGallop = _minGallop;
+
+	            minGallop < 1 && (minGallop = 1);
+
+	            if (length1 === 1) {
+	                for (i = 0; i < length2; i++) {
+	                    array[dest + i] = array[cursor2 + i];
+	                }
+	                array[dest + length2] = tmp[cursor1];
+	            }
+	            else if (length1 === 0) {
+	                throw new Error();
+	                // throw new Error('mergeLow preconditions were not respected');
+	            }
+	            else {
+	                for (i = 0; i < length1; i++) {
+	                    array[dest + i] = tmp[cursor1 + i];
+	                }
+	            }
+	        }
+
+	        function mergeHigh (start1, length1, start2, length2) {
+	            var i = 0;
+
+	            for (i = 0; i < length2; i++) {
+	                tmp[i] = array[start2 + i];
+	            }
+
+	            var cursor1 = start1 + length1 - 1;
+	            var cursor2 = length2 - 1;
+	            var dest = start2 + length2 - 1;
+	            var customCursor = 0;
+	            var customDest = 0;
+
+	            array[dest--] = array[cursor1--];
+
+	            if (--length1 === 0) {
+	                customCursor = dest - (length2 - 1);
+
+	                for (i = 0; i < length2; i++) {
+	                    array[customCursor + i] = tmp[i];
+	                }
+
+	                return;
+	            }
+
+	            if (length2 === 1) {
+	                dest -= length1;
+	                cursor1 -= length1;
+	                customDest = dest + 1;
+	                customCursor = cursor1 + 1;
+
+	                for (i = length1 - 1; i >= 0; i--) {
+	                    array[customDest + i] = array[customCursor + i];
+	                }
+
+	                array[dest] = tmp[cursor2];
+	                return;
+	            }
+
+	            var _minGallop = minGallop;
+
+	            while (true) {
+	                var count1 = 0;
+	                var count2 = 0;
+	                var exit = false;
+
+	                do {
+	                    if (compare(tmp[cursor2], array[cursor1]) < 0) {
+	                        array[dest--] = array[cursor1--];
+	                        count1++;
+	                        count2 = 0;
+	                        if (--length1 === 0) {
+	                            exit = true;
+	                            break;
+	                        }
+	                    }
+	                    else {
+	                        array[dest--] = tmp[cursor2--];
+	                        count2++;
+	                        count1 = 0;
+	                        if (--length2 === 1) {
+	                            exit = true;
+	                            break;
+	                        }
+	                    }
+	                } while ((count1 | count2) < _minGallop);
+
+	                if (exit) {
+	                    break;
+	                }
+
+	                do {
+	                    count1 = length1 - gallopRight(tmp[cursor2], array, start1, length1, length1 - 1, compare);
+
+	                    if (count1 !== 0) {
+	                        dest -= count1;
+	                        cursor1 -= count1;
+	                        length1 -= count1;
+	                        customDest = dest + 1;
+	                        customCursor = cursor1 + 1;
+
+	                        for (i = count1 - 1; i >= 0; i--) {
+	                            array[customDest + i] = array[customCursor + i];
+	                        }
+
+	                        if (length1 === 0) {
+	                            exit = true;
+	                            break;
+	                        }
+	                    }
+
+	                    array[dest--] = tmp[cursor2--];
+
+	                    if (--length2 === 1) {
+	                        exit = true;
+	                        break;
+	                    }
+
+	                    count2 = length2 - gallopLeft(array[cursor1], tmp, 0, length2, length2 - 1, compare);
+
+	                    if (count2 !== 0) {
+	                        dest -= count2;
+	                        cursor2 -= count2;
+	                        length2 -= count2;
+	                        customDest = dest + 1;
+	                        customCursor = cursor2 + 1;
+
+	                        for (i = 0; i < count2; i++) {
+	                            array[customDest + i] = tmp[customCursor + i];
+	                        }
+
+	                        if (length2 <= 1) {
+	                            exit = true;
+	                            break;
+	                        }
+	                    }
+
+	                    array[dest--] = array[cursor1--];
+
+	                    if (--length1 === 0) {
+	                        exit = true;
+	                        break;
+	                    }
+
+	                    _minGallop--;
+	                } while (count1 >= DEFAULT_MIN_GALLOPING || count2 >= DEFAULT_MIN_GALLOPING);
+
+	                if (exit) {
+	                    break;
+	                }
+
+	                if (_minGallop < 0) {
+	                    _minGallop = 0;
+	                }
+
+	                _minGallop += 2;
+	            }
+
+	            minGallop = _minGallop;
+
+	            if (minGallop < 1) {
+	                minGallop = 1;
+	            }
+
+	            if (length2 === 1) {
+	                dest -= length1;
+	                cursor1 -= length1;
+	                customDest = dest + 1;
+	                customCursor = cursor1 + 1;
+
+	                for (i = length1 - 1; i >= 0; i--) {
+	                    array[customDest + i] = array[customCursor + i];
+	                }
+
+	                array[dest] = tmp[cursor2];
+	            }
+	            else if (length2 === 0) {
+	                throw new Error();
+	                // throw new Error('mergeHigh preconditions were not respected');
+	            }
+	            else {
+	                customCursor = dest - (length2 - 1);
+	                for (i = 0; i < length2; i++) {
+	                    array[customCursor + i] = tmp[i];
+	                }
+	            }
+	        }
+
+	        this.mergeRuns = mergeRuns;
+	        this.forceMergeRuns = forceMergeRuns;
+	        this.pushRun = pushRun;
+	    }
+
+	    function sort(array, compare, lo, hi) {
+	        if (!lo) {
+	            lo = 0;
+	        }
+	        if (!hi) {
+	            hi = array.length;
+	        }
+
+	        var remaining = hi - lo;
+
+	        if (remaining < 2) {
+	            return;
+	        }
+
+	        var runLength = 0;
+
+	        if (remaining < DEFAULT_MIN_MERGE) {
+	            runLength = makeAscendingRun(array, lo, hi, compare);
+	            binaryInsertionSort(array, lo, hi, lo + runLength, compare);
+	            return;
+	        }
+
+	        var ts = new TimSort(array, compare);
+
+	        var minRun = minRunLength(remaining);
+
+	        do {
+	            runLength = makeAscendingRun(array, lo, hi, compare);
+	            if (runLength < minRun) {
+	                var force = remaining;
+	                if (force > minRun) {
+	                    force = minRun;
+	                }
+
+	                binaryInsertionSort(array, lo, lo + force, lo + runLength, compare);
+	                runLength = force;
+	            }
+
+	            ts.pushRun(lo, runLength);
+	            ts.mergeRuns();
+
+	            remaining -= runLength;
+	            lo += runLength;
+	        } while (remaining !== 0);
+
+	        ts.forceMergeRuns();
+	    }
+
+	    module.exports = sort;
+
+
+/***/ },
+/* 86 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+	/**
+	 * 动画主类, 调度和管理所有动画控制器
+	 *
+	 * @module zrender/animation/Animation
+	 * @author pissang(https://github.com/pissang)
+	 */
+	// TODO Additive animation
+	// http://iosoteric.com/additive-animations-animatewithduration-in-ios-8/
+	// https://developer.apple.com/videos/wwdc2014/#236
+
+
+	    var util = __webpack_require__(4);
+	    var Dispatcher = __webpack_require__(87).Dispatcher;
+
+	    var requestAnimationFrame = __webpack_require__(88);
+
+	    var Animator = __webpack_require__(36);
+	    /**
+	     * @typedef {Object} IZRenderStage
+	     * @property {Function} update
+	     */
+
+	    /**
+	     * @alias module:zrender/animation/Animation
+	     * @constructor
+	     * @param {Object} [options]
+	     * @param {Function} [options.onframe]
+	     * @param {IZRenderStage} [options.stage]
+	     * @example
+	     *     var animation = new Animation();
+	     *     var obj = {
+	     *         x: 100,
+	     *         y: 100
+	     *     };
+	     *     animation.animate(node.position)
+	     *         .when(1000, {
+	     *             x: 500,
+	     *             y: 500
+	     *         })
+	     *         .when(2000, {
+	     *             x: 100,
+	     *             y: 100
+	     *         })
+	     *         .start('spline');
+	     */
+	    var Animation = function (options) {
+
+	        options = options || {};
+
+	        this.stage = options.stage || {};
+
+	        this.onframe = options.onframe || function() {};
+
+	        // private properties
+	        this._clips = [];
+
+	        this._running = false;
+
+	        this._time = 0;
+
+	        Dispatcher.call(this);
+	    };
+
+	    Animation.prototype = {
+
+	        constructor: Animation,
+	        /**
+	         * 添加 clip
+	         * @param {module:zrender/animation/Clip} clip
+	         */
+	        addClip: function (clip) {
+	            this._clips.push(clip);
+	        },
+	        /**
+	         * 添加 animator
+	         * @param {module:zrender/animation/Animator} animator
+	         */
+	        addAnimator: function (animator) {
+	            animator.animation = this;
+	            var clips = animator.getClips();
+	            for (var i = 0; i < clips.length; i++) {
+	                this.addClip(clips[i]);
+	            }
+	        },
+	        /**
+	         * 删除动画片段
+	         * @param {module:zrender/animation/Clip} clip
+	         */
+	        removeClip: function(clip) {
+	            var idx = util.indexOf(this._clips, clip);
+	            if (idx >= 0) {
+	                this._clips.splice(idx, 1);
+	            }
+	        },
+
+	        /**
+	         * 删除动画片段
+	         * @param {module:zrender/animation/Animator} animator
+	         */
+	        removeAnimator: function (animator) {
+	            var clips = animator.getClips();
+	            for (var i = 0; i < clips.length; i++) {
+	                this.removeClip(clips[i]);
+	            }
+	            animator.animation = null;
+	        },
+
+	        _update: function() {
+
+	            var time = new Date().getTime();
+	            var delta = time - this._time;
+	            var clips = this._clips;
+	            var len = clips.length;
+
+	            var deferredEvents = [];
+	            var deferredClips = [];
+	            for (var i = 0; i < len; i++) {
+	                var clip = clips[i];
+	                var e = clip.step(time);
+	                // Throw out the events need to be called after
+	                // stage.update, like destroy
+	                if (e) {
+	                    deferredEvents.push(e);
+	                    deferredClips.push(clip);
+	                }
+	            }
+
+	            // Remove the finished clip
+	            for (var i = 0; i < len;) {
+	                if (clips[i]._needsRemove) {
+	                    clips[i] = clips[len - 1];
+	                    clips.pop();
+	                    len--;
+	                }
+	                else {
+	                    i++;
+	                }
+	            }
+
+	            len = deferredEvents.length;
+	            for (var i = 0; i < len; i++) {
+	                deferredClips[i].fire(deferredEvents[i]);
+	            }
+
+	            this._time = time;
+
+	            this.onframe(delta);
+
+	            this.trigger('frame', delta);
+
+	            if (this.stage.update) {
+	                this.stage.update();
+	            }
+	        },
+	        /**
+	         * 开始运行动画
+	         */
+	        start: function () {
+	            var self = this;
+
+	            this._running = true;
+
+	            function step() {
+	                if (self._running) {
+
+	                    requestAnimationFrame(step);
+
+	                    self._update();
+	                }
+	            }
+
+	            this._time = new Date().getTime();
+	            requestAnimationFrame(step);
+	        },
+	        /**
+	         * 停止运行动画
+	         */
+	        stop: function () {
+	            this._running = false;
+	        },
+	        /**
+	         * 清除所有动画片段
+	         */
+	        clear: function () {
+	            this._clips = [];
+	        },
+	        /**
+	         * 对一个目标创建一个animator对象，可以指定目标中的属性使用动画
+	         * @param  {Object} target
+	         * @param  {Object} options
+	         * @param  {boolean} [options.loop=false] 是否循环播放动画
+	         * @param  {Function} [options.getter=null]
+	         *         如果指定getter函数，会通过getter函数取属性值
+	         * @param  {Function} [options.setter=null]
+	         *         如果指定setter函数，会通过setter函数设置属性值
+	         * @return {module:zrender/animation/Animation~Animator}
+	         */
+	        animate: function (target, options) {
+	            options = options || {};
+	            var animator = new Animator(
+	                target,
+	                options.loop,
+	                options.getter,
+	                options.setter
+	            );
+
+	            return animator;
+	        }
+	    };
+
+	    util.mixin(Animation, Dispatcher);
+
+	    module.exports = Animation;
+
+
+
+/***/ },
+/* 87 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+	/**
+	 * 事件辅助类
+	 * @module zrender/core/event
+	 * @author Kener (@Kener-林峰, kener.linfeng@gmail.com)
+	 */
+
+
+	    var Eventful = __webpack_require__(33);
+
+	    var isDomLevel2 = (typeof window !== 'undefined') && !!window.addEventListener;
+
+	    function getBoundingClientRect(el) {
+	        // BlackBerry 5, iOS 3 (original iPhone) don't have getBoundingRect
+	        return el.getBoundingClientRect ? el.getBoundingClientRect() : {left: 0, top: 0};
+	    }
+
+	    function clientToLocal(el, e, out) {
+	        // clientX/clientY is according to view port.
+	        var box = getBoundingClientRect(el);
+	        out = out || {};
+	        out.zrX = e.clientX - box.left;
+	        out.zrY = e.clientY - box.top;
+	        return out;
+	    }
+
+	    /**
+	     * 如果存在第三方嵌入的一些dom触发的事件，或touch事件，需要转换一下事件坐标
+	     */
+	    function normalizeEvent(el, e) {
+
+	        e = e || window.event;
+
+	        if (e.zrX != null) {
+	            return e;
+	        }
+
+	        var eventType = e.type;
+	        var isTouch = eventType && eventType.indexOf('touch') >= 0;
+
+	        if (!isTouch) {
+	            clientToLocal(el, e, e);
+	            e.zrDelta = (e.wheelDelta) ? e.wheelDelta / 120 : -(e.detail || 0) / 3;
+	        }
+	        else {
+	            var touch = eventType != 'touchend'
+	                ? e.targetTouches[0]
+	                : e.changedTouches[0];
+	            touch && clientToLocal(el, touch, e);
+	        }
+
+	        return e;
+	    }
+
+	    function addEventListener(el, name, handler) {
+	        if (isDomLevel2) {
+	            el.addEventListener(name, handler);
+	        }
+	        else {
+	            el.attachEvent('on' + name, handler);
+	        }
+	    }
+
+	    function removeEventListener(el, name, handler) {
+	        if (isDomLevel2) {
+	            el.removeEventListener(name, handler);
+	        }
+	        else {
+	            el.detachEvent('on' + name, handler);
+	        }
+	    }
+
+	    /**
+	     * 停止冒泡和阻止默认行为
+	     * @memberOf module:zrender/core/event
+	     * @method
+	     * @param {Event} e : event对象
+	     */
+	    var stop = isDomLevel2
+	        ? function (e) {
+	            e.preventDefault();
+	            e.stopPropagation();
+	            e.cancelBubble = true;
+	        }
+	        : function (e) {
+	            e.returnValue = false;
+	            e.cancelBubble = true;
+	        };
+
+	    module.exports = {
+	        clientToLocal: clientToLocal,
+	        normalizeEvent: normalizeEvent,
+	        addEventListener: addEventListener,
+	        removeEventListener: removeEventListener,
+
+	        stop: stop,
+	        // 做向上兼容
+	        Dispatcher: Eventful
+	    };
+
+
+
+/***/ },
+/* 88 */
+/***/ function(module, exports) {
+
+	
+
+	    module.exports = (typeof window !== 'undefined' &&
+	                                    (window.requestAnimationFrame
+	                                    || window.msRequestAnimationFrame
+	                                    || window.mozRequestAnimationFrame
+	                                    || window.webkitRequestAnimationFrame))
+	                                || function (func) {
+	                                    setTimeout(func, 16);
+	                                };
+
+
+
+/***/ },
+/* 89 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var eventTool = __webpack_require__(87);
+	    var zrUtil = __webpack_require__(4);
+	    var Eventful = __webpack_require__(33);
+	    var env = __webpack_require__(2);
+	    var GestureMgr = __webpack_require__(90);
+
+	    var addEventListener = eventTool.addEventListener;
+	    var removeEventListener = eventTool.removeEventListener;
+	    var normalizeEvent = eventTool.normalizeEvent;
+
+	    var TOUCH_CLICK_DELAY = 300;
+
+	    var mouseHandlerNames = [
+	        'click', 'dblclick', 'mousewheel', 'mouseout',
+	        'mouseup', 'mousedown', 'mousemove'
+	    ];
+
+	    var touchHandlerNames = [
+	        'touchstart', 'touchend', 'touchmove'
+	    ];
+
+	    function eventNameFix(name) {
+	        return (name === 'mousewheel' && env.browser.firefox) ? 'DOMMouseScroll' : name;
+	    }
+
+	    function processGesture(proxy, event, stage) {
+	        var gestureMgr = proxy._gestureMgr;
+
+	        stage === 'start' && gestureMgr.clear();
+
+	        var gestureInfo = gestureMgr.recognize(
+	            event,
+	            proxy.handler.findHover(event.zrX, event.zrY, null),
+	            proxy.dom
+	        );
+
+	        stage === 'end' && gestureMgr.clear();
+
+	        if (gestureInfo) {
+	            // eventTool.stop(event);
+	            var type = gestureInfo.type;
+	            event.gestureEvent = type;
+
+	            proxy.handler.dispatchToElement(gestureInfo.target, type, gestureInfo.event);
+	        }
+	    }
+
+	    /**
+	     * Prevent mouse event from being dispatched after Touch Events action
+	     * @see <https://github.com/deltakosh/handjs/blob/master/src/hand.base.js>
+	     * 1. Mobile browsers dispatch mouse events 300ms after touchend.
+	     * 2. Chrome for Android dispatch mousedown for long-touch about 650ms
+	     * Result: Blocking Mouse Events for 700ms.
+	     */
+	    function setTouchTimer(instance) {
+	        instance._touching = true;
+	        clearTimeout(instance._touchTimer);
+	        instance._touchTimer = setTimeout(function () {
+	            instance._touching = false;
+	        }, 700);
+	    }
+
+	    function useTouchEvent() {
+	        return env.touchEventsSupported;
+	    }
+
+	    var domHandlers = {
+	        /**
+	         * Mouse move handler
+	         * @inner
+	         * @param {Event} event
+	         */
+	        mousemove: function (event) {
+	            event = normalizeEvent(this.dom, event);
+
+	            this.trigger('mousemove', event);
+	        },
+
+	        /**
+	         * Mouse out handler
+	         * @inner
+	         * @param {Event} event
+	         */
+	        mouseout: function (event) {
+	            event = normalizeEvent(this.dom, event);
+
+	            var element = event.toElement || event.relatedTarget;
+	            if (element != this.dom) {
+	                while (element && element.nodeType != 9) {
+	                    // 忽略包含在root中的dom引起的mouseOut
+	                    if (element === this.dom) {
+	                        return;
+	                    }
+
+	                    element = element.parentNode;
+	                }
+	            }
+
+	            this.trigger('mouseout', event);
+	        },
+
+	        /**
+	         * Touch开始响应函数
+	         * @inner
+	         * @param {Event} event
+	         */
+	        touchstart: function (event) {
+	            // Default mouse behaviour should not be disabled here.
+	            // For example, page may needs to be slided.
+
+	            event = normalizeEvent(this.dom, event);
+
+	            this._lastTouchMoment = new Date();
+
+	            processGesture(this, event, 'start');
+
+	            // 平板补充一次findHover
+	            // this._mobileFindFixed(event);
+	            // Trigger mousemove and mousedown
+	            domHandlers.mousemove.call(this, event);
+
+	            domHandlers.mousedown.call(this, event);
+
+	            setTouchTimer(this);
+	        },
+
+	        /**
+	         * Touch移动响应函数
+	         * @inner
+	         * @param {Event} event
+	         */
+	        touchmove: function (event) {
+
+	            event = normalizeEvent(this.dom, event);
+
+	            processGesture(this, event, 'change');
+
+	            // Mouse move should always be triggered no matter whether
+	            // there is gestrue event, because mouse move and pinch may
+	            // be used at the same time.
+	            domHandlers.mousemove.call(this, event);
+
+	            setTouchTimer(this);
+	        },
+
+	        /**
+	         * Touch结束响应函数
+	         * @inner
+	         * @param {Event} event
+	         */
+	        touchend: function (event) {
+
+	            event = normalizeEvent(this.dom, event);
+
+	            processGesture(this, event, 'end');
+
+	            domHandlers.mouseup.call(this, event);
+
+	            // click event should always be triggered no matter whether
+	            // there is gestrue event. System click can not be prevented.
+	            if (+new Date() - this._lastTouchMoment < TOUCH_CLICK_DELAY) {
+	                domHandlers.click.call(this, event);
+	            }
+
+	            setTouchTimer(this);
+	        }
+	    };
+
+	    // Common handlers
+	    zrUtil.each(['click', 'mousedown', 'mouseup', 'mousewheel', 'dblclick'], function (name) {
+	        domHandlers[name] = function (event) {
+	            event = normalizeEvent(this.dom, event);
+	            this.trigger(name, event);
+	        };
+	    });
+
+	    /**
+	     * 为控制类实例初始化dom 事件处理函数
+	     *
+	     * @inner
+	     * @param {module:zrender/Handler} instance 控制类实例
+	     */
+	    function initDomHandler(instance) {
+	        for (var i = 0; i < touchHandlerNames.length; i++) {
+	            var name = touchHandlerNames[i];
+	            instance._handlers[name] = zrUtil.bind(domHandlers[name], instance);
+	        }
+
+	        for (var i = 0; i < mouseHandlerNames.length; i++) {
+	            var name = mouseHandlerNames[i];
+	            instance._handlers[name] = makeMouseHandler(domHandlers[name], instance);
+	        }
+
+	        function makeMouseHandler(fn, instance) {
+	            return function () {
+	                if (instance._touching) {
+	                    return;
+	                }
+	                return fn.apply(instance, arguments);
+	            };
+	        }
+	    }
+
+
+	    function HandlerDomProxy(dom) {
+	        Eventful.call(this);
+
+	        this.dom = dom;
+
+	        /**
+	         * @private
+	         * @type {boolean}
+	         */
+	        this._touching = false;
+
+	        /**
+	         * @private
+	         * @type {number}
+	         */
+	        this._touchTimer;
+
+	        /**
+	         * @private
+	         * @type {module:zrender/core/GestureMgr}
+	         */
+	        this._gestureMgr = new GestureMgr();
+
+	        this._handlers = {};
+
+	        initDomHandler(this);
+
+	        if (useTouchEvent()) {
+	            mountHandlers(touchHandlerNames, this);
+
+	            // Handler of 'mouseout' event is needed in touch mode, which will be mounted below.
+	            // addEventListener(root, 'mouseout', this._mouseoutHandler);
+	        }
+
+	        // Considering some devices that both enable touch and mouse event (like MS Surface
+	        // and lenovo X240, @see #2350), we make mouse event be always listened, otherwise
+	        // mouse event can not be handle in those devices.
+	        mountHandlers(mouseHandlerNames, this);
+
+	        function mountHandlers(handlerNames, instance) {
+	            zrUtil.each(handlerNames, function (name) {
+	                addEventListener(dom, eventNameFix(name), instance._handlers[name]);
+	            }, instance);
+	        }
+	    }
+
+	    var handlerDomProxyProto = HandlerDomProxy.prototype;
+	    handlerDomProxyProto.dispose = function () {
+	        var handlerNames = mouseHandlerNames.concat(touchHandlerNames);
+
+	        for (var i = 0; i < handlerNames.length; i++) {
+	            var name = handlerNames[i];
+	            removeEventListener(this.dom, eventNameFix(name), this._handlers[name]);
+	        }
+	    };
+
+	    handlerDomProxyProto.setCursor = function (cursorStyle) {
+	        this.dom.style.cursor = cursorStyle || 'default';
+	    };
+
+	    zrUtil.mixin(HandlerDomProxy, Eventful);
+
+	    module.exports = HandlerDomProxy;
+
+
+/***/ },
+/* 90 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+	/**
+	 * Only implements needed gestures for mobile.
+	 */
+
+
+	    var eventUtil = __webpack_require__(87);
+
+	    var GestureMgr = function () {
+
+	        /**
+	         * @private
+	         * @type {Array.<Object>}
+	         */
+	        this._track = [];
+	    };
+
+	    GestureMgr.prototype = {
+
+	        constructor: GestureMgr,
+
+	        recognize: function (event, target, root) {
+	            this._doTrack(event, target, root);
+	            return this._recognize(event);
+	        },
+
+	        clear: function () {
+	            this._track.length = 0;
+	            return this;
+	        },
+
+	        _doTrack: function (event, target, root) {
+	            var touches = event.touches;
+
+	            if (!touches) {
+	                return;
+	            }
+
+	            var trackItem = {
+	                points: [],
+	                touches: [],
+	                target: target,
+	                event: event
+	            };
+
+	            for (var i = 0, len = touches.length; i < len; i++) {
+	                var touch = touches[i];
+	                var pos = eventUtil.clientToLocal(root, touch);
+	                trackItem.points.push([pos.zrX, pos.zrY]);
+	                trackItem.touches.push(touch);
+	            }
+
+	            this._track.push(trackItem);
+	        },
+
+	        _recognize: function (event) {
+	            for (var eventName in recognizers) {
+	                if (recognizers.hasOwnProperty(eventName)) {
+	                    var gestureInfo = recognizers[eventName](this._track, event);
+	                    if (gestureInfo) {
+	                        return gestureInfo;
+	                    }
+	                }
+	            }
+	        }
+	    };
+
+	    function dist(pointPair) {
+	        var dx = pointPair[1][0] - pointPair[0][0];
+	        var dy = pointPair[1][1] - pointPair[0][1];
+
+	        return Math.sqrt(dx * dx + dy * dy);
+	    }
+
+	    function center(pointPair) {
+	        return [
+	            (pointPair[0][0] + pointPair[1][0]) / 2,
+	            (pointPair[0][1] + pointPair[1][1]) / 2
+	        ];
+	    }
+
+	    var recognizers = {
+
+	        pinch: function (track, event) {
+	            var trackLen = track.length;
+
+	            if (!trackLen) {
+	                return;
+	            }
+
+	            var pinchEnd = (track[trackLen - 1] || {}).points;
+	            var pinchPre = (track[trackLen - 2] || {}).points || pinchEnd;
+
+	            if (pinchPre
+	                && pinchPre.length > 1
+	                && pinchEnd
+	                && pinchEnd.length > 1
+	            ) {
+	                var pinchScale = dist(pinchEnd) / dist(pinchPre);
+	                !isFinite(pinchScale) && (pinchScale = 1);
+
+	                event.pinchScale = pinchScale;
+
+	                var pinchCenter = center(pinchEnd);
+	                event.pinchX = pinchCenter[0];
+	                event.pinchY = pinchCenter[1];
+
+	                return {
+	                    type: 'pinch',
+	                    target: track[0].target,
+	                    event: event
+	                };
+	            }
+	        }
+
+	        // Only pinch currently.
+	    };
+
+	    module.exports = GestureMgr;
+
+
+
+/***/ },
+/* 91 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+	/**
+	 * Default canvas painter
+	 * @module zrender/Painter
+	 * @author Kener (@Kener-林峰, kener.linfeng@gmail.com)
+	 *         errorrik (errorrik@gmail.com)
+	 *         pissang (https://www.github.com/pissang)
+	 */
+	 
+
+	    var config = __webpack_require__(41);
+	    var util = __webpack_require__(4);
+	    var log = __webpack_require__(40);
+	    var BoundingRect = __webpack_require__(9);
+	    var timsort = __webpack_require__(85);
+
+	    var Layer = __webpack_require__(92);
+
+	    var requestAnimationFrame = __webpack_require__(88);
+
+	    // PENDIGN
+	    // Layer exceeds MAX_PROGRESSIVE_LAYER_NUMBER may have some problem when flush directly second time.
+	    //
+	    // Maximum progressive layer. When exceeding this number. All elements will be drawed in the last layer.
+	    var MAX_PROGRESSIVE_LAYER_NUMBER = 5;
+
+	    function parseInt10(val) {
+	        return parseInt(val, 10);
+	    }
+
+	    function isLayerValid(layer) {
+	        if (!layer) {
+	            return false;
+	        }
+
+	        if (layer.isBuildin) {
+	            return true;
+	        }
+
+	        if (typeof(layer.resize) !== 'function'
+	            || typeof(layer.refresh) !== 'function'
+	        ) {
+	            return false;
+	        }
+
+	        return true;
+	    }
+
+	    function preProcessLayer(layer) {
+	        layer.__unusedCount++;
+	    }
+
+	    function postProcessLayer(layer) {
+	        if (layer.__unusedCount == 1) {
+	            layer.clear();
+	        }
+	    }
+
+	    var tmpRect = new BoundingRect(0, 0, 0, 0);
+	    var viewRect = new BoundingRect(0, 0, 0, 0);
+	    function isDisplayableCulled(el, width, height) {
+	        tmpRect.copy(el.getBoundingRect());
+	        if (el.transform) {
+	            tmpRect.applyTransform(el.transform);
+	        }
+	        viewRect.width = width;
+	        viewRect.height = height;
+	        return !tmpRect.intersect(viewRect);
+	    }
+
+	    function isClipPathChanged(clipPaths, prevClipPaths) {
+	        if (clipPaths == prevClipPaths) { // Can both be null or undefined
+	            return false;
+	        }
+
+	        if (!clipPaths || !prevClipPaths || (clipPaths.length !== prevClipPaths.length)) {
+	            return true;
+	        }
+	        for (var i = 0; i < clipPaths.length; i++) {
+	            if (clipPaths[i] !== prevClipPaths[i]) {
+	                return true;
+	            }
+	        }
+	    }
+
+	    function doClip(clipPaths, ctx) {
+	        for (var i = 0; i < clipPaths.length; i++) {
+	            var clipPath = clipPaths[i];
+	            var m;
+	            if (clipPath.transform) {
+	                m = clipPath.transform;
+	                ctx.transform(
+	                    m[0], m[1],
+	                    m[2], m[3],
+	                    m[4], m[5]
+	                );
+	            }
+	            var path = clipPath.path;
+	            path.beginPath(ctx);
+	            clipPath.buildPath(path, clipPath.shape);
+	            ctx.clip();
+	            // Transform back
+	            if (clipPath.transform) {
+	                m = clipPath.invTransform;
+	                ctx.transform(
+	                    m[0], m[1],
+	                    m[2], m[3],
+	                    m[4], m[5]
+	                );
+	            }
+	        }
+	    }
+
+	    function createRoot(width, height) {
+	        var domRoot = document.createElement('div');
+	        var domRootStyle = domRoot.style;
+
+	        // domRoot.onselectstart = returnFalse; // 避免页面选中的尴尬
+	        domRootStyle.position = 'relative';
+	        domRootStyle.overflow = 'hidden';
+	        domRootStyle.width = width + 'px';
+	        domRootStyle.height = height + 'px';
+	        return domRoot;
+	    }
+
+	    /**
+	     * @alias module:zrender/Painter
+	     * @constructor
+	     * @param {HTMLElement} root 绘图容器
+	     * @param {module:zrender/Storage} storage
+	     * @param {Ojbect} opts
+	     */
+	    var Painter = function (root, storage, opts) {
+	        // In node environment using node-canvas
+	        var singleCanvas = !root.nodeName // In node ?
+	            || root.nodeName.toUpperCase() === 'CANVAS';
+
+	        opts = opts || {};
+
+	        /**
+	         * @type {number}
+	         */
+	        this.dpr = opts.devicePixelRatio || config.devicePixelRatio;
+	        /**
+	         * @type {boolean}
+	         * @private
+	         */
+	        this._singleCanvas = singleCanvas;
+	        /**
+	         * 绘图容器
+	         * @type {HTMLElement}
+	         */
+	        this.root = root;
+
+	        var rootStyle = root.style;
+
+	        if (rootStyle) {
+	            rootStyle['-webkit-tap-highlight-color'] = 'transparent';
+	            rootStyle['-webkit-user-select'] =
+	            rootStyle['user-select'] =
+	            rootStyle['-webkit-touch-callout'] = 'none';
+
+	            root.innerHTML = '';
+	        }
+
+	        /**
+	         * @type {module:zrender/Storage}
+	         */
+	        this.storage = storage;
+
+	        /**
+	         * @type {Array.<number>}
+	         * @private
+	         */
+	        var zlevelList = this._zlevelList = [];
+
+	        /**
+	         * @type {Object.<string, module:zrender/Layer>}
+	         * @private
+	         */
+	        var layers = this._layers = {};
+
+	        /**
+	         * @type {Object.<string, Object>}
+	         * @type {private}
+	         */
+	        this._layerConfig = {};
+
+	        if (!singleCanvas) {
+	            this._width = this._getWidth();
+	            this._height = this._getHeight();
+
+	            var domRoot = this._domRoot = createRoot(
+	                this._width, this._height
+	            );
+	            root.appendChild(domRoot);
+	        }
+	        else {
+	            // Use canvas width and height directly
+	            var width = root.width;
+	            var height = root.height;
+	            this._width = width;
+	            this._height = height;
+
+	            // Create layer if only one given canvas
+	            // Device pixel ratio is fixed to 1 because given canvas has its specified width and height
+	            var mainLayer = new Layer(root, this, 1);
+	            mainLayer.initContext();
+	            // FIXME Use canvas width and height
+	            // mainLayer.resize(width, height);
+	            layers[0] = mainLayer;
+	            zlevelList.push(0);
+	        }
+
+	        this.pathToImage = this._createPathToImage();
+
+	        // Layers for progressive rendering
+	        this._progressiveLayers = [];
+
+	        /**
+	         * @type {module:zrender/Layer}
+	         * @private
+	         */
+	        this._hoverlayer;
+
+	        this._hoverElements = [];
+	    };
+
+	    Painter.prototype = {
+
+	        constructor: Painter,
+
+	        /**
+	         * If painter use a single canvas
+	         * @return {boolean}
+	         */
+	        isSingleCanvas: function () {
+	            return this._singleCanvas;
+	        },
+	        /**
+	         * @return {HTMLDivElement}
+	         */
+	        getViewportRoot: function () {
+	            return this._singleCanvas ? this._layers[0].dom : this._domRoot;
+	        },
+
+	        /**
+	         * 刷新
+	         * @param {boolean} [paintAll=false] 强制绘制所有displayable
+	         */
+	        refresh: function (paintAll) {
+
+	            var list = this.storage.getDisplayList(true);
+
+	            var zlevelList = this._zlevelList;
+
+	            this._paintList(list, paintAll);
+
+	            // Paint custum layers
+	            for (var i = 0; i < zlevelList.length; i++) {
+	                var z = zlevelList[i];
+	                var layer = this._layers[z];
+	                if (!layer.isBuildin && layer.refresh) {
+	                    layer.refresh();
+	                }
+	            }
+
+	            this.refreshHover();
+
+	            if (this._progressiveLayers.length) {
+	                this._startProgessive();
+	            }
+
+	            return this;
+	        },
+
+	        addHover: function (el, hoverStyle) {
+	            if (el.__hoverMir) {
+	                return;
+	            }
+	            var elMirror = new el.constructor({
+	                style: el.style,
+	                shape: el.shape
+	            });
+	            elMirror.__from = el;
+	            el.__hoverMir = elMirror;
+	            elMirror.setStyle(hoverStyle);
+	            this._hoverElements.push(elMirror);
+	        },
+
+	        removeHover: function (el) {
+	            var elMirror = el.__hoverMir;
+	            var hoverElements = this._hoverElements;
+	            var idx = util.indexOf(hoverElements, elMirror);
+	            if (idx >= 0) {
+	                hoverElements.splice(idx, 1);
+	            }
+	            el.__hoverMir = null;
+	        },
+
+	        clearHover: function (el) {
+	            var hoverElements = this._hoverElements;
+	            for (var i = 0; i < hoverElements.length; i++) {
+	                var from = hoverElements[i].__from;
+	                if (from) {
+	                    from.__hoverMir = null;
+	                }
+	            }
+	            hoverElements.length = 0;
+	        },
+
+	        refreshHover: function () {
+	            var hoverElements = this._hoverElements;
+	            var len = hoverElements.length;
+	            var hoverLayer = this._hoverlayer;
+	            hoverLayer && hoverLayer.clear();
+
+	            if (!len) {
+	                return;
+	            }
+	            timsort(hoverElements, this.storage.displayableSortFunc);
+
+	            // Use a extream large zlevel
+	            // FIXME?
+	            if (!hoverLayer) {
+	                hoverLayer = this._hoverlayer = this.getLayer(1e5);
+	            }
+
+	            var scope = {};
+	            hoverLayer.ctx.save();
+	            for (var i = 0; i < len;) {
+	                var el = hoverElements[i];
+	                var originalEl = el.__from;
+	                // Original el is removed
+	                // PENDING
+	                if (!(originalEl && originalEl.__zr)) {
+	                    hoverElements.splice(i, 1);
+	                    originalEl.__hoverMir = null;
+	                    len--;
+	                    continue;
+	                }
+	                i++;
+
+	                // Use transform
+	                // FIXME style and shape ?
+	                if (!originalEl.invisible) {
+	                    el.transform = originalEl.transform;
+	                    el.invTransform = originalEl.invTransform;
+	                    el.__clipPaths = originalEl.__clipPaths;
+	                    // el.
+	                    this._doPaintEl(el, hoverLayer, true, scope);
+	                }
+	            }
+	            hoverLayer.ctx.restore();
+	        },
+
+	        _startProgessive: function () {
+	            var self = this;
+
+	            if (!self._furtherProgressive) {
+	                return;
+	            }
+
+	            // Use a token to stop progress steps triggered by
+	            // previous zr.refresh calling.
+	            var token = self._progressiveToken = +new Date();
+
+	            self._progress++;
+	            requestAnimationFrame(step);
+
+	            function step() {
+	                // In case refreshed or disposed
+	                if (token === self._progressiveToken && self.storage) {
+
+	                    self._doPaintList(self.storage.getDisplayList());
+
+	                    if (self._furtherProgressive) {
+	                        self._progress++;
+	                        requestAnimationFrame(step);
+	                    }
+	                    else {
+	                        self._progressiveToken = -1;
+	                    }
+	                }
+	            }
+	        },
+
+	        _clearProgressive: function () {
+	            this._progressiveToken = -1;
+	            this._progress = 0;
+	            util.each(this._progressiveLayers, function (layer) {
+	                layer.__dirty && layer.clear();
+	            });
+	        },
+
+	        _paintList: function (list, paintAll) {
+
+	            if (paintAll == null) {
+	                paintAll = false;
+	            }
+
+	            this._updateLayerStatus(list);
+
+	            this._clearProgressive();
+
+	            this.eachBuildinLayer(preProcessLayer);
+
+	            this._doPaintList(list, paintAll);
+
+	            this.eachBuildinLayer(postProcessLayer);
+	        },
+
+	        _doPaintList: function (list, paintAll) {
+	            var currentLayer;
+	            var currentZLevel;
+	            var ctx;
+
+	            // var invTransform = [];
+	            var scope;
+
+	            var progressiveLayerIdx = 0;
+	            var currentProgressiveLayer;
+
+	            var width = this._width;
+	            var height = this._height;
+	            var layerProgress;
+	            var frame = this._progress;
+	            function flushProgressiveLayer(layer) {
+	                ctx.save();
+	                ctx.globalAlpha = 1;
+	                ctx.shadowBlur = 0;
+	                // Avoid layer don't clear in next progressive frame
+	                currentLayer.__dirty = true;
+	                ctx.drawImage(layer.dom, 0, 0, width, height);
+	                ctx.restore();
+
+	                currentLayer.ctx.restore();
+	            }
+
+	            for (var i = 0, l = list.length; i < l; i++) {
+	                var el = list[i];
+	                var elZLevel = this._singleCanvas ? 0 : el.zlevel;
+
+	                var elFrame = el.__frame;
+
+	                // Flush at current context
+	                // PENDING
+	                if (elFrame < 0 && currentProgressiveLayer) {
+	                    flushProgressiveLayer(currentProgressiveLayer);
+	                    currentProgressiveLayer = null;
+	                }
+
+	                // Change draw layer
+	                if (currentZLevel !== elZLevel) {
+	                    if (ctx) {
+	                        ctx.restore();
+	                    }
+
+	                    // Reset scope
+	                    scope = {};
+
+	                    // Only 0 zlevel if only has one canvas
+	                    currentZLevel = elZLevel;
+	                    currentLayer = this.getLayer(currentZLevel);
+
+	                    if (!currentLayer.isBuildin) {
+	                        log(
+	                            'ZLevel ' + currentZLevel
+	                            + ' has been used by unkown layer ' + currentLayer.id
+	                        );
+	                    }
+
+	                    ctx = currentLayer.ctx;
+	                    ctx.save();
+
+	                    // Reset the count
+	                    currentLayer.__unusedCount = 0;
+
+	                    if (currentLayer.__dirty || paintAll) {
+	                        currentLayer.clear();
+	                    }
+	                }
+
+	                if (!(currentLayer.__dirty || paintAll)) {
+	                    continue;
+	                }
+	                if (elFrame >= 0) {
+	                    // Progressive layer changed
+	                    if (!currentProgressiveLayer) {
+	                        currentProgressiveLayer = this._progressiveLayers[
+	                            Math.min(progressiveLayerIdx++, MAX_PROGRESSIVE_LAYER_NUMBER - 1)
+	                        ];
+
+	                        currentProgressiveLayer.ctx.save();
+	                        currentProgressiveLayer.renderScope = {};
+
+	                        if (currentProgressiveLayer
+	                            && (currentProgressiveLayer.__progress > currentProgressiveLayer.__maxProgress)
+	                        ) {
+	                            // flushProgressiveLayer(currentProgressiveLayer);
+	                            // Quick jump all progressive elements
+	                            // All progressive element are not dirty, jump over and flush directly
+	                            i = currentProgressiveLayer.__nextIdxNotProg - 1;
+	                            // currentProgressiveLayer = null;
+	                            continue;
+	                        }
+
+	                        layerProgress = currentProgressiveLayer.__progress;
+
+	                        if (!currentProgressiveLayer.__dirty) {
+	                            // Keep rendering
+	                            frame = layerProgress;
+	                        }
+
+	                        currentProgressiveLayer.__progress = frame + 1;
+	                    }
+
+	                    if (elFrame === frame) {
+	                        this._doPaintEl(el, currentProgressiveLayer, true, currentProgressiveLayer.renderScope);
+	                    }
+	                }
+	                else {
+	                    this._doPaintEl(el, currentLayer, paintAll, scope);
+	                }
+
+	                el.__dirty = false;
+	            }
+
+	            if (currentProgressiveLayer) {
+	                flushProgressiveLayer(currentProgressiveLayer);
+	            }
+
+	            // Restore the lastLayer ctx
+	            ctx && ctx.restore();
+	            // If still has clipping state
+	            // if (scope.prevElClipPaths) {
+	            //     ctx.restore();
+	            // }
+
+	            this._furtherProgressive = false;
+	            util.each(this._progressiveLayers, function (layer) {
+	                if (layer.__maxProgress >= layer.__progress) {
+	                    this._furtherProgressive = true;
+	                }
+	            }, this);
+	        },
+
+	        _doPaintEl: function (el, currentLayer, forcePaint, scope) {
+	            var ctx = currentLayer.ctx;
+
+	            if (
+	                (currentLayer.__dirty || forcePaint)
+	                // Ignore invisible element
+	                && !el.invisible
+	                // Ignore transparent element
+	                && el.style.opacity !== 0
+	                // Ignore scale 0 element, in some environment like node-canvas
+	                // Draw a scale 0 element can cause all following draw wrong
+	                && el.scale[0] && el.scale[1]
+	                // Ignore culled element
+	                && !(el.culling && isDisplayableCulled(el, this._width, this._height))
+	            ) {
+
+	                var clipPaths = el.__clipPaths;
+
+	                // Optimize when clipping on group with several elements
+	                if (scope.prevClipLayer !== currentLayer
+	                    || isClipPathChanged(clipPaths, scope.prevElClipPaths)
+	                ) {
+	                    // If has previous clipping state, restore from it
+	                    if (scope.prevElClipPaths) {
+	                        scope.prevClipLayer.ctx.restore();
+	                        scope.prevClipLayer = scope.prevElClipPaths = null;
+
+	                        // Reset prevEl since context has been restored
+	                        scope.prevEl = null;
+	                    }
+	                    // New clipping state
+	                    if (clipPaths) {
+	                        ctx.save();
+	                        doClip(clipPaths, ctx);
+	                        scope.prevClipLayer = currentLayer;
+	                        scope.prevElClipPaths = clipPaths;
+	                    }
+	                }
+	                el.beforeBrush && el.beforeBrush(ctx);
+
+	                el.brush(ctx, scope.prevEl || null);
+	                scope.prevEl = el;
+
+	                el.afterBrush && el.afterBrush(ctx);
+	            }
+	        },
+
+	        /**
+	         * 获取 zlevel 所在层，如果不存在则会创建一个新的层
+	         * @param {number} zlevel
+	         * @return {module:zrender/Layer}
+	         */
+	        getLayer: function (zlevel) {
+	            if (this._singleCanvas) {
+	                return this._layers[0];
+	            }
+
+	            var layer = this._layers[zlevel];
+	            if (!layer) {
+	                // Create a new layer
+	                layer = new Layer('zr_' + zlevel, this, this.dpr);
+	                layer.isBuildin = true;
+
+	                if (this._layerConfig[zlevel]) {
+	                    util.merge(layer, this._layerConfig[zlevel], true);
+	                }
+
+	                this.insertLayer(zlevel, layer);
+
+	                // Context is created after dom inserted to document
+	                // Or excanvas will get 0px clientWidth and clientHeight
+	                layer.initContext();
+	            }
+
+	            return layer;
+	        },
+
+	        insertLayer: function (zlevel, layer) {
+
+	            var layersMap = this._layers;
+	            var zlevelList = this._zlevelList;
+	            var len = zlevelList.length;
+	            var prevLayer = null;
+	            var i = -1;
+	            var domRoot = this._domRoot;
+
+	            if (layersMap[zlevel]) {
+	                log('ZLevel ' + zlevel + ' has been used already');
+	                return;
+	            }
+	            // Check if is a valid layer
+	            if (!isLayerValid(layer)) {
+	                log('Layer of zlevel ' + zlevel + ' is not valid');
+	                return;
+	            }
+
+	            if (len > 0 && zlevel > zlevelList[0]) {
+	                for (i = 0; i < len - 1; i++) {
+	                    if (
+	                        zlevelList[i] < zlevel
+	                        && zlevelList[i + 1] > zlevel
+	                    ) {
+	                        break;
+	                    }
+	                }
+	                prevLayer = layersMap[zlevelList[i]];
+	            }
+	            zlevelList.splice(i + 1, 0, zlevel);
+
+	            if (prevLayer) {
+	                var prevDom = prevLayer.dom;
+	                if (prevDom.nextSibling) {
+	                    domRoot.insertBefore(
+	                        layer.dom,
+	                        prevDom.nextSibling
+	                    );
+	                }
+	                else {
+	                    domRoot.appendChild(layer.dom);
+	                }
+	            }
+	            else {
+	                if (domRoot.firstChild) {
+	                    domRoot.insertBefore(layer.dom, domRoot.firstChild);
+	                }
+	                else {
+	                    domRoot.appendChild(layer.dom);
+	                }
+	            }
+
+	            layersMap[zlevel] = layer;
+	        },
+
+	        // Iterate each layer
+	        eachLayer: function (cb, context) {
+	            var zlevelList = this._zlevelList;
+	            var z;
+	            var i;
+	            for (i = 0; i < zlevelList.length; i++) {
+	                z = zlevelList[i];
+	                cb.call(context, this._layers[z], z);
+	            }
+	        },
+
+	        // Iterate each buildin layer
+	        eachBuildinLayer: function (cb, context) {
+	            var zlevelList = this._zlevelList;
+	            var layer;
+	            var z;
+	            var i;
+	            for (i = 0; i < zlevelList.length; i++) {
+	                z = zlevelList[i];
+	                layer = this._layers[z];
+	                if (layer.isBuildin) {
+	                    cb.call(context, layer, z);
+	                }
+	            }
+	        },
+
+	        // Iterate each other layer except buildin layer
+	        eachOtherLayer: function (cb, context) {
+	            var zlevelList = this._zlevelList;
+	            var layer;
+	            var z;
+	            var i;
+	            for (i = 0; i < zlevelList.length; i++) {
+	                z = zlevelList[i];
+	                layer = this._layers[z];
+	                if (! layer.isBuildin) {
+	                    cb.call(context, layer, z);
+	                }
+	            }
+	        },
+
+	        /**
+	         * 获取所有已创建的层
+	         * @param {Array.<module:zrender/Layer>} [prevLayer]
+	         */
+	        getLayers: function () {
+	            return this._layers;
+	        },
+
+	        _updateLayerStatus: function (list) {
+
+	            var layers = this._layers;
+	            var progressiveLayers = this._progressiveLayers;
+
+	            var elCountsLastFrame = {};
+	            var progressiveElCountsLastFrame = {};
+
+	            this.eachBuildinLayer(function (layer, z) {
+	                elCountsLastFrame[z] = layer.elCount;
+	                layer.elCount = 0;
+	                layer.__dirty = false;
+	            });
+
+	            util.each(progressiveLayers, function (layer, idx) {
+	                progressiveElCountsLastFrame[idx] = layer.elCount;
+	                layer.elCount = 0;
+	                layer.__dirty = false;
+	            });
+
+	            var progressiveLayerCount = 0;
+	            var currentProgressiveLayer;
+	            var lastProgressiveKey;
+	            var frameCount = 0;
+	            for (var i = 0, l = list.length; i < l; i++) {
+	                var el = list[i];
+	                var zlevel = this._singleCanvas ? 0 : el.zlevel;
+	                var layer = layers[zlevel];
+	                var elProgress = el.progressive;
+	                if (layer) {
+	                    layer.elCount++;
+	                    layer.__dirty = layer.__dirty || el.__dirty;
+	                }
+
+	                /////// Update progressive
+	                if (elProgress >= 0) {
+	                    // Fix wrong progressive sequence problem.
+	                    if (lastProgressiveKey !== elProgress) {
+	                        lastProgressiveKey = elProgress;
+	                        frameCount++;
+	                    }
+	                    var elFrame = el.__frame = frameCount - 1;
+	                    if (!currentProgressiveLayer) {
+	                        var idx = Math.min(progressiveLayerCount, MAX_PROGRESSIVE_LAYER_NUMBER - 1);
+	                        currentProgressiveLayer = progressiveLayers[idx];
+	                        if (!currentProgressiveLayer) {
+	                            currentProgressiveLayer = progressiveLayers[idx] = new Layer(
+	                                'progressive', this, this.dpr
+	                            );
+	                            currentProgressiveLayer.initContext();
+	                        }
+	                        currentProgressiveLayer.__maxProgress = 0;
+	                    }
+	                    currentProgressiveLayer.__dirty = currentProgressiveLayer.__dirty || el.__dirty;
+	                    currentProgressiveLayer.elCount++;
+
+	                    currentProgressiveLayer.__maxProgress = Math.max(
+	                        currentProgressiveLayer.__maxProgress, elFrame
+	                    );
+
+	                    if (currentProgressiveLayer.__maxProgress >= currentProgressiveLayer.__progress) {
+	                        // Should keep rendering this  layer because progressive rendering is not finished yet
+	                        layer.__dirty = true;
+	                    }
+	                }
+	                else {
+	                    el.__frame = -1;
+
+	                    if (currentProgressiveLayer) {
+	                        currentProgressiveLayer.__nextIdxNotProg = i;
+	                        progressiveLayerCount++;
+	                        currentProgressiveLayer = null;
+	                    }
+	                }
+	            }
+
+	            if (currentProgressiveLayer) {
+	                progressiveLayerCount++;
+	                currentProgressiveLayer.__nextIdxNotProg = i;
+	            }
+
+	            // 层中的元素数量有发生变化
+	            this.eachBuildinLayer(function (layer, z) {
+	                if (elCountsLastFrame[z] !== layer.elCount) {
+	                    layer.__dirty = true;
+	                }
+	            });
+
+	            progressiveLayers.length = Math.min(progressiveLayerCount, MAX_PROGRESSIVE_LAYER_NUMBER);
+	            util.each(progressiveLayers, function (layer, idx) {
+	                if (progressiveElCountsLastFrame[idx] !== layer.elCount) {
+	                    el.__dirty = true;
+	                }
+	                if (layer.__dirty) {
+	                    layer.__progress = 0;
+	                }
+	            });
+	        },
+
+	        /**
+	         * 清除hover层外所有内容
+	         */
+	        clear: function () {
+	            this.eachBuildinLayer(this._clearLayer);
+	            return this;
+	        },
+
+	        _clearLayer: function (layer) {
+	            layer.clear();
+	        },
+
+	        /**
+	         * 修改指定zlevel的绘制参数
+	         *
+	         * @param {string} zlevel
+	         * @param {Object} config 配置对象
+	         * @param {string} [config.clearColor=0] 每次清空画布的颜色
+	         * @param {string} [config.motionBlur=false] 是否开启动态模糊
+	         * @param {number} [config.lastFrameAlpha=0.7]
+	         *                 在开启动态模糊的时候使用，与上一帧混合的alpha值，值越大尾迹越明显
+	         */
+	        configLayer: function (zlevel, config) {
+	            if (config) {
+	                var layerConfig = this._layerConfig;
+	                if (!layerConfig[zlevel]) {
+	                    layerConfig[zlevel] = config;
+	                }
+	                else {
+	                    util.merge(layerConfig[zlevel], config, true);
+	                }
+
+	                var layer = this._layers[zlevel];
+
+	                if (layer) {
+	                    util.merge(layer, layerConfig[zlevel], true);
+	                }
+	            }
+	        },
+
+	        /**
+	         * 删除指定层
+	         * @param {number} zlevel 层所在的zlevel
+	         */
+	        delLayer: function (zlevel) {
+	            var layers = this._layers;
+	            var zlevelList = this._zlevelList;
+	            var layer = layers[zlevel];
+	            if (!layer) {
+	                return;
+	            }
+	            layer.dom.parentNode.removeChild(layer.dom);
+	            delete layers[zlevel];
+
+	            zlevelList.splice(util.indexOf(zlevelList, zlevel), 1);
+	        },
+
+	        /**
+	         * 区域大小变化后重绘
+	         */
+	        resize: function (width, height) {
+	            var domRoot = this._domRoot;
+	            // FIXME Why ?
+	            domRoot.style.display = 'none';
+
+	            width = width || this._getWidth();
+	            height = height || this._getHeight();
+
+	            domRoot.style.display = '';
+
+	            // 优化没有实际改变的resize
+	            if (this._width != width || height != this._height) {
+	                domRoot.style.width = width + 'px';
+	                domRoot.style.height = height + 'px';
+
+	                for (var id in this._layers) {
+	                    this._layers[id].resize(width, height);
+	                }
+
+	                this.refresh(true);
+	            }
+
+	            this._width = width;
+	            this._height = height;
+
+	            return this;
+	        },
+
+	        /**
+	         * 清除单独的一个层
+	         * @param {number} zlevel
+	         */
+	        clearLayer: function (zlevel) {
+	            var layer = this._layers[zlevel];
+	            if (layer) {
+	                layer.clear();
+	            }
+	        },
+
+	        /**
+	         * 释放
+	         */
+	        dispose: function () {
+	            this.root.innerHTML = '';
+
+	            this.root =
+	            this.storage =
+
+	            this._domRoot =
+	            this._layers = null;
+	        },
+
+	        /**
+	         * Get canvas which has all thing rendered
+	         * @param {Object} opts
+	         * @param {string} [opts.backgroundColor]
+	         */
+	        getRenderedCanvas: function (opts) {
+	            opts = opts || {};
+	            if (this._singleCanvas) {
+	                return this._layers[0].dom;
+	            }
+
+	            var imageLayer = new Layer('image', this, opts.pixelRatio || this.dpr);
+	            imageLayer.initContext();
+
+	            imageLayer.clearColor = opts.backgroundColor;
+	            imageLayer.clear();
+
+	            var displayList = this.storage.getDisplayList(true);
+
+	            var scope = {};
+	            for (var i = 0; i < displayList.length; i++) {
+	                var el = displayList[i];
+	                this._doPaintEl(el, imageLayer, true, scope);
+	            }
+
+	            return imageLayer.dom;
+	        },
+	        /**
+	         * 获取绘图区域宽度
+	         */
+	        getWidth: function () {
+	            return this._width;
+	        },
+
+	        /**
+	         * 获取绘图区域高度
+	         */
+	        getHeight: function () {
+	            return this._height;
+	        },
+
+	        _getWidth: function () {
+	            var root = this.root;
+	            var stl = document.defaultView.getComputedStyle(root);
+
+	            // FIXME Better way to get the width and height when element has not been append to the document
+	            return ((root.clientWidth || parseInt10(stl.width) || parseInt10(root.style.width))
+	                    - (parseInt10(stl.paddingLeft) || 0)
+	                    - (parseInt10(stl.paddingRight) || 0)) | 0;
+	        },
+
+	        _getHeight: function () {
+	            var root = this.root;
+	            var stl = document.defaultView.getComputedStyle(root);
+
+	            return ((root.clientHeight || parseInt10(stl.height) || parseInt10(root.style.height))
+	                    - (parseInt10(stl.paddingTop) || 0)
+	                    - (parseInt10(stl.paddingBottom) || 0)) | 0;
+	        },
+
+	        _pathToImage: function (id, path, width, height, dpr) {
+	            var canvas = document.createElement('canvas');
+	            var ctx = canvas.getContext('2d');
+
+	            canvas.width = width * dpr;
+	            canvas.height = height * dpr;
+
+	            ctx.clearRect(0, 0, width * dpr, height * dpr);
+
+	            var pathTransform = {
+	                position: path.position,
+	                rotation: path.rotation,
+	                scale: path.scale
+	            };
+	            path.position = [0, 0, 0];
+	            path.rotation = 0;
+	            path.scale = [1, 1];
+	            if (path) {
+	                path.brush(ctx);
+	            }
+
+	            var ImageShape = __webpack_require__(62);
+	            var imgShape = new ImageShape({
+	                id: id,
+	                style: {
+	                    x: 0,
+	                    y: 0,
+	                    image: canvas
+	                }
+	            });
+
+	            if (pathTransform.position != null) {
+	                imgShape.position = path.position = pathTransform.position;
+	            }
+
+	            if (pathTransform.rotation != null) {
+	                imgShape.rotation = path.rotation = pathTransform.rotation;
+	            }
+
+	            if (pathTransform.scale != null) {
+	                imgShape.scale = path.scale = pathTransform.scale;
+	            }
+
+	            return imgShape;
+	        },
+
+	        _createPathToImage: function () {
+	            var me = this;
+
+	            return function (id, e, width, height) {
+	                return me._pathToImage(
+	                    id, e, width, height, me.dpr
+	                );
+	            };
+	        }
+	    };
+
+	    module.exports = Painter;
+
+
+
+/***/ },
+/* 92 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @module zrender/Layer
+	 * @author pissang(https://www.github.com/pissang)
+	 */
+
+
+	    var util = __webpack_require__(4);
+	    var config = __webpack_require__(41);
+	    var Style = __webpack_require__(47);
+	    var Pattern = __webpack_require__(59);
+
+	    function returnFalse() {
+	        return false;
+	    }
+
+	    /**
+	     * 创建dom
+	     *
+	     * @inner
+	     * @param {string} id dom id 待用
+	     * @param {string} type dom type，such as canvas, div etc.
+	     * @param {Painter} painter painter instance
+	     * @param {number} number
+	     */
+	    function createDom(id, type, painter, dpr) {
+	        var newDom = document.createElement(type);
+	        var width = painter.getWidth();
+	        var height = painter.getHeight();
+
+	        var newDomStyle = newDom.style;
+	        // 没append呢，请原谅我这样写，清晰~
+	        newDomStyle.position = 'absolute';
+	        newDomStyle.left = 0;
+	        newDomStyle.top = 0;
+	        newDomStyle.width = width + 'px';
+	        newDomStyle.height = height + 'px';
+	        newDom.width = width * dpr;
+	        newDom.height = height * dpr;
+
+	        // id不作为索引用，避免可能造成的重名，定义为私有属性
+	        newDom.setAttribute('data-zr-dom-id', id);
+	        return newDom;
+	    }
+
+	    /**
+	     * @alias module:zrender/Layer
+	     * @constructor
+	     * @extends module:zrender/mixin/Transformable
+	     * @param {string} id
+	     * @param {module:zrender/Painter} painter
+	     * @param {number} [dpr]
+	     */
+	    var Layer = function(id, painter, dpr) {
+	        var dom;
+	        dpr = dpr || config.devicePixelRatio;
+	        if (typeof id === 'string') {
+	            dom = createDom(id, 'canvas', painter, dpr);
+	        }
+	        // Not using isDom because in node it will return false
+	        else if (util.isObject(id)) {
+	            dom = id;
+	            id = dom.id;
+	        }
+	        this.id = id;
+	        this.dom = dom;
+
+	        var domStyle = dom.style;
+	        if (domStyle) { // Not in node
+	            dom.onselectstart = returnFalse; // 避免页面选中的尴尬
+	            domStyle['-webkit-user-select'] = 'none';
+	            domStyle['user-select'] = 'none';
+	            domStyle['-webkit-touch-callout'] = 'none';
+	            domStyle['-webkit-tap-highlight-color'] = 'rgba(0,0,0,0)';
+	        }
+
+	        this.domBack = null;
+	        this.ctxBack = null;
+
+	        this.painter = painter;
+
+	        this.config = null;
+
+	        // Configs
+	        /**
+	         * 每次清空画布的颜色
+	         * @type {string}
+	         * @default 0
+	         */
+	        this.clearColor = 0;
+	        /**
+	         * 是否开启动态模糊
+	         * @type {boolean}
+	         * @default false
+	         */
+	        this.motionBlur = false;
+	        /**
+	         * 在开启动态模糊的时候使用，与上一帧混合的alpha值，值越大尾迹越明显
+	         * @type {number}
+	         * @default 0.7
+	         */
+	        this.lastFrameAlpha = 0.7;
+
+	        /**
+	         * Layer dpr
+	         * @type {number}
+	         */
+	        this.dpr = dpr;
+	    };
+
+	    Layer.prototype = {
+
+	        constructor: Layer,
+
+	        elCount: 0,
+
+	        __dirty: true,
+
+	        initContext: function () {
+	            this.ctx = this.dom.getContext('2d');
+
+	            var dpr = this.dpr;
+	            if (dpr != 1) {
+	                this.ctx.scale(dpr, dpr);
+	            }
+	        },
+
+	        createBackBuffer: function () {
+	            var dpr = this.dpr;
+
+	            this.domBack = createDom('back-' + this.id, 'canvas', this.painter, dpr);
+	            this.ctxBack = this.domBack.getContext('2d');
+
+	            if (dpr != 1) {
+	                this.ctxBack.scale(dpr, dpr);
+	            }
+	        },
+
+	        /**
+	         * @param  {number} width
+	         * @param  {number} height
+	         */
+	        resize: function (width, height) {
+	            var dpr = this.dpr;
+
+	            var dom = this.dom;
+	            var domStyle = dom.style;
+	            var domBack = this.domBack;
+
+	            domStyle.width = width + 'px';
+	            domStyle.height = height + 'px';
+
+	            dom.width = width * dpr;
+	            dom.height = height * dpr;
+
+	            if (dpr != 1) {
+	                this.ctx.scale(dpr, dpr);
+	            }
+
+	            if (domBack) {
+	                domBack.width = width * dpr;
+	                domBack.height = height * dpr;
+
+	                if (dpr != 1) {
+	                    this.ctxBack.scale(dpr, dpr);
+	                }
+	            }
+	        },
+
+	        /**
+	         * 清空该层画布
+	         * @param {boolean} clearAll Clear all with out motion blur
+	         */
+	        clear: function (clearAll) {
+	            var dom = this.dom;
+	            var ctx = this.ctx;
+	            var width = dom.width;
+	            var height = dom.height;
+
+	            var clearColor = this.clearColor;
+	            var haveMotionBLur = this.motionBlur && !clearAll;
+	            var lastFrameAlpha = this.lastFrameAlpha;
+
+	            var dpr = this.dpr;
+
+	            if (haveMotionBLur) {
+	                if (!this.domBack) {
+	                    this.createBackBuffer();
+	                }
+
+	                this.ctxBack.globalCompositeOperation = 'copy';
+	                this.ctxBack.drawImage(
+	                    dom, 0, 0,
+	                    width / dpr,
+	                    height / dpr
+	                );
+	            }
+
+	            ctx.clearRect(0, 0, width / dpr, height / dpr);
+	            if (clearColor) {
+	                var clearColorGradientOrPattern;
+	                // Gradient
+	                if (clearColor.colorStops) {
+	                    // Cache canvas gradient
+	                    clearColorGradientOrPattern = clearColor.__canvasGradient || Style.getGradient(ctx, clearColor, {
+	                        x: 0,
+	                        y: 0,
+	                        width: width / dpr,
+	                        height: height / dpr
+	                    });
+
+	                    clearColor.__canvasGradient = clearColorGradientOrPattern;
+	                }
+	                // Pattern
+	                else if (clearColor.image) {
+	                    clearColorGradientOrPattern = Pattern.prototype.getCanvasPattern.call(clearColor, ctx);
+	                }
+	                ctx.save();
+	                ctx.fillStyle = clearColorGradientOrPattern || clearColor;
+	                ctx.fillRect(0, 0, width / dpr, height / dpr);
+	                ctx.restore();
+	            }
+
+	            if (haveMotionBLur) {
+	                var domBack = this.domBack;
+	                ctx.save();
+	                ctx.globalAlpha = lastFrameAlpha;
+	                ctx.drawImage(domBack, 0, 0, width / dpr, height / dpr);
+	                ctx.restore();
+	            }
+	        }
+	    };
+
+	    module.exports = Layer;
+
+
+/***/ },
+/* 93 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var graphic = __webpack_require__(43);
+	    var zrUtil = __webpack_require__(4);
+	    var PI = Math.PI;
+	    /**
+	     * @param {module:echarts/ExtensionAPI} api
+	     * @param {Object} [opts]
+	     * @param {string} [opts.text]
+	     * @param {string} [opts.color]
+	     * @param {string} [opts.textColor]
+	     * @return {module:zrender/Element}
+	     */
+	    module.exports = function (api, opts) {
+	        opts = opts || {};
+	        zrUtil.defaults(opts, {
+	            text: 'loading',
+	            color: '#c23531',
+	            textColor: '#000',
+	            maskColor: 'rgba(255, 255, 255, 0.8)',
+	            zlevel: 0
+	        });
+	        var mask = new graphic.Rect({
+	            style: {
+	                fill: opts.maskColor
+	            },
+	            zlevel: opts.zlevel,
+	            z: 10000
+	        });
+	        var arc = new graphic.Arc({
+	            shape: {
+	                startAngle: -PI / 2,
+	                endAngle: -PI / 2 + 0.1,
+	                r: 10
+	            },
+	            style: {
+	                stroke: opts.color,
+	                lineCap: 'round',
+	                lineWidth: 5
+	            },
+	            zlevel: opts.zlevel,
+	            z: 10001
+	        });
+	        var labelRect = new graphic.Rect({
+	            style: {
+	                fill: 'none',
+	                text: opts.text,
+	                textPosition: 'right',
+	                textDistance: 10,
+	                textFill: opts.textColor
+	            },
+	            zlevel: opts.zlevel,
+	            z: 10001
+	        });
+
+	        arc.animateShape(true)
+	            .when(1000, {
+	                endAngle: PI * 3 / 2
+	            })
+	            .start('circularInOut');
+	        arc.animateShape(true)
+	            .when(1000, {
+	                startAngle: PI * 3 / 2
+	            })
+	            .delay(300)
+	            .start('circularInOut');
+
+	        var group = new graphic.Group();
+	        group.add(arc);
+	        group.add(labelRect);
+	        group.add(mask);
+	        // Inject resize
+	        group.resize = function () {
+	            var cx = api.getWidth() / 2;
+	            var cy = api.getHeight() / 2;
+	            arc.setShape({
+	                cx: cx,
+	                cy: cy
+	            });
+	            var r = arc.shape.r;
+	            labelRect.setShape({
+	                x: cx - r,
+	                y: cy - r,
+	                width: r * 2,
+	                height: r * 2
+	            });
+
+	            mask.setShape({
+	                x: 0,
+	                y: 0,
+	                width: api.getWidth(),
+	                height: api.getHeight()
+	            });
+	        };
+	        group.resize();
+	        return group;
+	    };
+
+
+/***/ },
+/* 94 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+	    var Gradient = __webpack_require__(61);
+	    module.exports = function (ecModel) {
+	        function encodeColor(seriesModel) {
+	            var colorAccessPath = (seriesModel.visualColorAccessPath || 'itemStyle.normal.color').split('.');
+	            var data = seriesModel.getData();
+	            var color = seriesModel.get(colorAccessPath) // Set in itemStyle
+	                || seriesModel.getColorFromPalette(seriesModel.get('name'));  // Default color
+
+	            // FIXME Set color function or use the platte color
+	            data.setVisual('color', color);
+
+	            // Only visible series has each data be visual encoded
+	            if (!ecModel.isSeriesFiltered(seriesModel)) {
+	                if (typeof color === 'function' && !(color instanceof Gradient)) {
+	                    data.each(function (idx) {
+	                        data.setItemVisual(
+	                            idx, 'color', color(seriesModel.getDataParams(idx))
+	                        );
+	                    });
+	                }
+
+	                // itemStyle in each data item
+	                data.each(function (idx) {
+	                    var itemModel = data.getItemModel(idx);
+	                    var color = itemModel.get(colorAccessPath, true);
+	                    if (color != null) {
+	                        data.setItemVisual(idx, 'color', color);
+	                    }
+	                });
+	            }
+	        }
+	        ecModel.eachRawSeries(encodeColor);
+	    };
+
+
+/***/ },
+/* 95 */
+/***/ function(module, exports, __webpack_require__) {
+
+	// Compatitable with 2.0
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var compatStyle = __webpack_require__(96);
+
+	    function get(opt, path) {
+	        path = path.split(',');
+	        var obj = opt;
+	        for (var i = 0; i < path.length; i++) {
+	            obj = obj && obj[path[i]];
+	            if (obj == null) {
+	                break;
+	            }
+	        }
+	        return obj;
+	    }
+
+	    function set(opt, path, val, overwrite) {
+	        path = path.split(',');
+	        var obj = opt;
+	        var key;
+	        for (var i = 0; i < path.length - 1; i++) {
+	            key = path[i];
+	            if (obj[key] == null) {
+	                obj[key] = {};
+	            }
+	            obj = obj[key];
+	        }
+	        if (overwrite || obj[path[i]] == null) {
+	            obj[path[i]] = val;
+	        }
+	    }
+
+	    function compatLayoutProperties(option) {
+	        each(LAYOUT_PROPERTIES, function (prop) {
+	            if (prop[0] in option && !(prop[1] in option)) {
+	                option[prop[1]] = option[prop[0]];
+	            }
+	        });
+	    }
+
+	    var LAYOUT_PROPERTIES = [
+	        ['x', 'left'], ['y', 'top'], ['x2', 'right'], ['y2', 'bottom']
+	    ];
+
+	    var COMPATITABLE_COMPONENTS = [
+	        'grid', 'geo', 'parallel', 'legend', 'toolbox', 'title', 'visualMap', 'dataZoom', 'timeline'
+	    ];
+
+	    var COMPATITABLE_SERIES = [
+	        'bar', 'boxplot', 'candlestick', 'chord', 'effectScatter',
+	        'funnel', 'gauge', 'lines', 'graph', 'heatmap', 'line', 'map', 'parallel',
+	        'pie', 'radar', 'sankey', 'scatter', 'treemap'
+	    ];
+
+	    var each = zrUtil.each;
+
+	    module.exports = function (option) {
+	        each(option.series, function (seriesOpt) {
+	            if (!zrUtil.isObject(seriesOpt)) {
+	                return;
+	            }
+
+	            var seriesType = seriesOpt.type;
+
+	            compatStyle(seriesOpt);
+
+	            if (seriesType === 'pie' || seriesType === 'gauge') {
+	                if (seriesOpt.clockWise != null) {
+	                    seriesOpt.clockwise = seriesOpt.clockWise;
+	                }
+	            }
+	            if (seriesType === 'gauge') {
+	                var pointerColor = get(seriesOpt, 'pointer.color');
+	                pointerColor != null
+	                    && set(seriesOpt, 'itemStyle.normal.color', pointerColor);
+	            }
+
+	            for (var i = 0; i < COMPATITABLE_SERIES.length; i++) {
+	                if (COMPATITABLE_SERIES[i] === seriesOpt.type) {
+	                    compatLayoutProperties(seriesOpt);
+	                    break;
+	                }
+	            }
+	        });
+
+	        // dataRange has changed to visualMap
+	        if (option.dataRange) {
+	            option.visualMap = option.dataRange;
+	        }
+
+	        each(COMPATITABLE_COMPONENTS, function (componentName) {
+	            var options = option[componentName];
+	            if (options) {
+	                if (!zrUtil.isArray(options)) {
+	                    options = [options];
+	                }
+	                each(options, function (option) {
+	                    compatLayoutProperties(option);
+	                });
+	            }
+	        });
+	    };
+
+
+/***/ },
+/* 96 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+
+	    var POSSIBLE_STYLES = [
+	        'areaStyle', 'lineStyle', 'nodeStyle', 'linkStyle',
+	        'chordStyle', 'label', 'labelLine'
+	    ];
+
+	    function compatItemStyle(opt) {
+	        var itemStyleOpt = opt && opt.itemStyle;
+	        if (itemStyleOpt) {
+	            zrUtil.each(POSSIBLE_STYLES, function (styleName) {
+	                var normalItemStyleOpt = itemStyleOpt.normal;
+	                var emphasisItemStyleOpt = itemStyleOpt.emphasis;
+	                if (normalItemStyleOpt && normalItemStyleOpt[styleName]) {
+	                    opt[styleName] = opt[styleName] || {};
+	                    if (!opt[styleName].normal) {
+	                        opt[styleName].normal = normalItemStyleOpt[styleName];
+	                    }
+	                    else {
+	                        zrUtil.merge(opt[styleName].normal, normalItemStyleOpt[styleName]);
+	                    }
+	                    normalItemStyleOpt[styleName] = null;
+	                }
+	                if (emphasisItemStyleOpt && emphasisItemStyleOpt[styleName]) {
+	                    opt[styleName] = opt[styleName] || {};
+	                    if (!opt[styleName].emphasis) {
+	                        opt[styleName].emphasis = emphasisItemStyleOpt[styleName];
+	                    }
+	                    else {
+	                        zrUtil.merge(opt[styleName].emphasis, emphasisItemStyleOpt[styleName]);
+	                    }
+	                    emphasisItemStyleOpt[styleName] = null;
+	                }
+	            });
+	        }
+	    }
+
+	    module.exports = function (seriesOpt) {
+	        if (!seriesOpt) {
+	            return;
+	        }
+	        compatItemStyle(seriesOpt);
+	        compatItemStyle(seriesOpt.markPoint);
+	        compatItemStyle(seriesOpt.markLine);
+	        var data = seriesOpt.data;
+	        if (data) {
+	            for (var i = 0; i < data.length; i++) {
+	                compatItemStyle(data[i]);
+	            }
+	            // mark point data
+	            var markPoint = seriesOpt.markPoint;
+	            if (markPoint && markPoint.data) {
+	                var mpData = markPoint.data;
+	                for (var i = 0; i < mpData.length; i++) {
+	                    compatItemStyle(mpData[i]);
+	                }
+	            }
+	            // mark line data
+	            var markLine = seriesOpt.markLine;
+	            if (markLine && markLine.data) {
+	                var mlData = markLine.data;
+	                for (var i = 0; i < mlData.length; i++) {
+	                    if (zrUtil.isArray(mlData[i])) {
+	                        compatItemStyle(mlData[i][0]);
+	                        compatItemStyle(mlData[i][1]);
+	                    }
+	                    else {
+	                        compatItemStyle(mlData[i]);
+	                    }
+	                }
+	            }
+	        }
+	    };
+
+
+/***/ },
+/* 97 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/* WEBPACK VAR INJECTION */(function(global) {/**
+	 * List for data storage
+	 * @module echarts/data/List
+	 */
+
+
+	    var UNDEFINED = 'undefined';
+	    var globalObj = typeof window === 'undefined' ? global : window;
+	    var Float64Array = typeof globalObj.Float64Array === UNDEFINED
+	        ? Array : globalObj.Float64Array;
+	    var Int32Array = typeof globalObj.Int32Array === UNDEFINED
+	        ? Array : globalObj.Int32Array;
+
+	    var dataCtors = {
+	        'float': Float64Array,
+	        'int': Int32Array,
+	        // Ordinal data type can be string or int
+	        'ordinal': Array,
+	        'number': Array,
+	        'time': Array
+	    };
+
+	    var Model = __webpack_require__(12);
+	    var DataDiffer = __webpack_require__(98);
+
+	    var zrUtil = __webpack_require__(4);
+	    var modelUtil = __webpack_require__(5);
+	    var isObject = zrUtil.isObject;
+
+	    var TRANSFERABLE_PROPERTIES = [
+	        'stackedOn', 'hasItemOption', '_nameList', '_idList', '_rawData'
+	    ];
+
+	    var transferProperties = function (a, b) {
+	        zrUtil.each(TRANSFERABLE_PROPERTIES.concat(b.__wrappedMethods || []), function (propName) {
+	            if (b.hasOwnProperty(propName)) {
+	                a[propName] = b[propName];
+	            }
+	        });
+
+	        a.__wrappedMethods = b.__wrappedMethods;
+	    };
+
+	    /**
+	     * @constructor
+	     * @alias module:echarts/data/List
+	     *
+	     * @param {Array.<string>} dimensions
+	     *        Dimensions should be concrete names like x, y, z, lng, lat, angle, radius
+	     * @param {module:echarts/model/Model} hostModel
+	     */
+	    var List = function (dimensions, hostModel) {
+
+	        dimensions = dimensions || ['x', 'y'];
+
+	        var dimensionInfos = {};
+	        var dimensionNames = [];
+	        for (var i = 0; i < dimensions.length; i++) {
+	            var dimensionName;
+	            var dimensionInfo = {};
+	            if (typeof dimensions[i] === 'string') {
+	                dimensionName = dimensions[i];
+	                dimensionInfo = {
+	                    name: dimensionName,
+	                    stackable: false,
+	                    // Type can be 'float', 'int', 'number'
+	                    // Default is number, Precision of float may not enough
+	                    type: 'number'
+	                };
+	            }
+	            else {
+	                dimensionInfo = dimensions[i];
+	                dimensionName = dimensionInfo.name;
+	                dimensionInfo.type = dimensionInfo.type || 'number';
+	            }
+	            dimensionNames.push(dimensionName);
+	            dimensionInfos[dimensionName] = dimensionInfo;
+	        }
+	        /**
+	         * @readOnly
+	         * @type {Array.<string>}
+	         */
+	        this.dimensions = dimensionNames;
+
+	        /**
+	         * Infomation of each data dimension, like data type.
+	         * @type {Object}
+	         */
+	        this._dimensionInfos = dimensionInfos;
+
+	        /**
+	         * @type {module:echarts/model/Model}
+	         */
+	        this.hostModel = hostModel;
+
+	        /**
+	         * @type {module:echarts/model/Model}
+	         */
+	        this.dataType;
+
+	        /**
+	         * Indices stores the indices of data subset after filtered.
+	         * This data subset will be used in chart.
+	         * @type {Array.<number>}
+	         * @readOnly
+	         */
+	        this.indices = [];
+
+	        /**
+	         * Data storage
+	         * @type {Object.<key, TypedArray|Array>}
+	         * @private
+	         */
+	        this._storage = {};
+
+	        /**
+	         * @type {Array.<string>}
+	         */
+	        this._nameList = [];
+	        /**
+	         * @type {Array.<string>}
+	         */
+	        this._idList = [];
+	        /**
+	         * Models of data option is stored sparse for optimizing memory cost
+	         * @type {Array.<module:echarts/model/Model>}
+	         * @private
+	         */
+	        this._optionModels = [];
+
+	        /**
+	         * @param {module:echarts/data/List}
+	         */
+	        this.stackedOn = null;
+
+	        /**
+	         * Global visual properties after visual coding
+	         * @type {Object}
+	         * @private
+	         */
+	        this._visual = {};
+
+	        /**
+	         * Globel layout properties.
+	         * @type {Object}
+	         * @private
+	         */
+	        this._layout = {};
+
+	        /**
+	         * Item visual properties after visual coding
+	         * @type {Array.<Object>}
+	         * @private
+	         */
+	        this._itemVisuals = [];
+
+	        /**
+	         * Item layout properties after layout
+	         * @type {Array.<Object>}
+	         * @private
+	         */
+	        this._itemLayouts = [];
+
+	        /**
+	         * Graphic elemnents
+	         * @type {Array.<module:zrender/Element>}
+	         * @private
+	         */
+	        this._graphicEls = [];
+
+	        /**
+	         * @type {Array.<Array|Object>}
+	         * @private
+	         */
+	        this._rawData;
+
+	        /**
+	         * @type {Object}
+	         * @private
+	         */
+	        this._extent;
+	    };
+
+	    var listProto = List.prototype;
+
+	    listProto.type = 'list';
+	    /**
+	     * If each data item has it's own option
+	     * @type {boolean}
+	     */
+	    listProto.hasItemOption = true;
+
+	    /**
+	     * Get dimension name
+	     * @param {string|number} dim
+	     *        Dimension can be concrete names like x, y, z, lng, lat, angle, radius
+	     *        Or a ordinal number. For example getDimensionInfo(0) will return 'x' or 'lng' or 'radius'
+	     * @return {string} Concrete dim name.
+	     */
+	    listProto.getDimension = function (dim) {
+	        if (!isNaN(dim)) {
+	            dim = this.dimensions[dim] || dim;
+	        }
+	        return dim;
+	    };
+	    /**
+	     * Get type and stackable info of particular dimension
+	     * @param {string|number} dim
+	     *        Dimension can be concrete names like x, y, z, lng, lat, angle, radius
+	     *        Or a ordinal number. For example getDimensionInfo(0) will return 'x' or 'lng' or 'radius'
+	     */
+	    listProto.getDimensionInfo = function (dim) {
+	        return zrUtil.clone(this._dimensionInfos[this.getDimension(dim)]);
+	    };
+
+	    /**
+	     * Initialize from data
+	     * @param {Array.<Object|number|Array>} data
+	     * @param {Array.<string>} [nameList]
+	     * @param {Function} [dimValueGetter] (dataItem, dimName, dataIndex, dimIndex) => number
+	     */
+	    listProto.initData = function (data, nameList, dimValueGetter) {
+	        data = data || [];
+
+	        if (true) {
+	            if (!zrUtil.isArray(data)) {
+	                throw new Error('Invalid data.');
+	            }
+	        }
+
+	        this._rawData = data;
+
+	        // Clear
+	        var storage = this._storage = {};
+	        var indices = this.indices = [];
+
+	        var dimensions = this.dimensions;
+	        var size = data.length;
+	        var dimensionInfoMap = this._dimensionInfos;
+
+	        var idList = [];
+	        var nameRepeatCount = {};
+
+	        nameList = nameList || [];
+
+	        // Init storage
+	        for (var i = 0; i < dimensions.length; i++) {
+	            var dimInfo = dimensionInfoMap[dimensions[i]];
+	            var DataCtor = dataCtors[dimInfo.type];
+	            storage[dimensions[i]] = new DataCtor(size);
+	        }
+
+	        var self = this;
+	        if (!dimValueGetter) {
+	            self.hasItemOption = false;
+	        }
+	        // Default dim value getter
+	        dimValueGetter = dimValueGetter || function (dataItem, dimName, dataIndex, dimIndex) {
+	            var value = modelUtil.getDataItemValue(dataItem);
+	            // If any dataItem is like { value: 10 }
+	            if (modelUtil.isDataItemOption(dataItem)) {
+	                self.hasItemOption = true;
+	            }
+	            return modelUtil.converDataValue(
+	                (value instanceof Array)
+	                    ? value[dimIndex]
+	                    // If value is a single number or something else not array.
+	                    : value,
+	                dimensionInfoMap[dimName]
+	            );
+	        };
+
+	        for (var idx = 0; idx < data.length; idx++) {
+	            var dataItem = data[idx];
+	            // Each data item is value
+	            // [1, 2]
+	            // 2
+	            // Bar chart, line chart which uses category axis
+	            // only gives the 'y' value. 'x' value is the indices of cateogry
+	            // Use a tempValue to normalize the value to be a (x, y) value
+
+	            // Store the data by dimensions
+	            for (var k = 0; k < dimensions.length; k++) {
+	                var dim = dimensions[k];
+	                var dimStorage = storage[dim];
+	                // PENDING NULL is empty or zero
+	                dimStorage[idx] = dimValueGetter(dataItem, dim, idx, k);
+	            }
+
+	            indices.push(idx);
+	        }
+
+	        // Use the name in option and create id
+	        for (var i = 0; i < data.length; i++) {
+	            if (!nameList[i]) {
+	                if (data[i] && data[i].name != null) {
+	                    nameList[i] = data[i].name;
+	                }
+	            }
+	            var name = nameList[i] || '';
+	            // Try using the id in option
+	            var id = data[i] && data[i].id;
+
+	            if (!id && name) {
+	                // Use name as id and add counter to avoid same name
+	                nameRepeatCount[name] = nameRepeatCount[name] || 0;
+	                id = name;
+	                if (nameRepeatCount[name] > 0) {
+	                    id += '__ec__' + nameRepeatCount[name];
+	                }
+	                nameRepeatCount[name]++;
+	            }
+	            id && (idList[i] = id);
+	        }
+
+	        this._nameList = nameList;
+	        this._idList = idList;
+	    };
+
+	    /**
+	     * @return {number}
+	     */
+	    listProto.count = function () {
+	        return this.indices.length;
+	    };
+
+	    /**
+	     * Get value. Return NaN if idx is out of range.
+	     * @param {string} dim Dim must be concrete name.
+	     * @param {number} idx
+	     * @param {boolean} stack
+	     * @return {number}
+	     */
+	    listProto.get = function (dim, idx, stack) {
+	        var storage = this._storage;
+	        var dataIndex = this.indices[idx];
+
+	        // If value not exists
+	        if (dataIndex == null) {
+	            return NaN;
+	        }
+
+	        var value = storage[dim] && storage[dim][dataIndex];
+	        // FIXME ordinal data type is not stackable
+	        if (stack) {
+	            var dimensionInfo = this._dimensionInfos[dim];
+	            if (dimensionInfo && dimensionInfo.stackable) {
+	                var stackedOn = this.stackedOn;
+	                while (stackedOn) {
+	                    // Get no stacked data of stacked on
+	                    var stackedValue = stackedOn.get(dim, idx);
+	                    // Considering positive stack, negative stack and empty data
+	                    if ((value >= 0 && stackedValue > 0)  // Positive stack
+	                        || (value <= 0 && stackedValue < 0) // Negative stack
+	                    ) {
+	                        value += stackedValue;
+	                    }
+	                    stackedOn = stackedOn.stackedOn;
+	                }
+	            }
+	        }
+	        return value;
+	    };
+
+	    /**
+	     * Get value for multi dimensions.
+	     * @param {Array.<string>} [dimensions] If ignored, using all dimensions.
+	     * @param {number} idx
+	     * @param {boolean} stack
+	     * @return {number}
+	     */
+	    listProto.getValues = function (dimensions, idx, stack) {
+	        var values = [];
+
+	        if (!zrUtil.isArray(dimensions)) {
+	            stack = idx;
+	            idx = dimensions;
+	            dimensions = this.dimensions;
+	        }
+
+	        for (var i = 0, len = dimensions.length; i < len; i++) {
+	            values.push(this.get(dimensions[i], idx, stack));
+	        }
+
+	        return values;
+	    };
+
+	    /**
+	     * If value is NaN. Inlcuding '-'
+	     * @param {string} dim
+	     * @param {number} idx
+	     * @return {number}
+	     */
+	    listProto.hasValue = function (idx) {
+	        var dimensions = this.dimensions;
+	        var dimensionInfos = this._dimensionInfos;
+	        for (var i = 0, len = dimensions.length; i < len; i++) {
+	            if (
+	                // Ordinal type can be string or number
+	                dimensionInfos[dimensions[i]].type !== 'ordinal'
+	                && isNaN(this.get(dimensions[i], idx))
+	            ) {
+	                return false;
+	            }
+	        }
+	        return true;
+	    };
+
+	    /**
+	     * Get extent of data in one dimension
+	     * @param {string} dim
+	     * @param {boolean} stack
+	     */
+	    listProto.getDataExtent = function (dim, stack) {
+	        dim = this.getDimension(dim);
+	        var dimData = this._storage[dim];
+	        var dimInfo = this.getDimensionInfo(dim);
+	        stack = (dimInfo && dimInfo.stackable) && stack;
+	        var dimExtent = (this._extent || (this._extent = {}))[dim + (!!stack)];
+	        var value;
+	        if (dimExtent) {
+	            return dimExtent;
+	        }
+	        // var dimInfo = this._dimensionInfos[dim];
+	        if (dimData) {
+	            var min = Infinity;
+	            var max = -Infinity;
+	            // var isOrdinal = dimInfo.type === 'ordinal';
+	            for (var i = 0, len = this.count(); i < len; i++) {
+	                value = this.get(dim, i, stack);
+	                // FIXME
+	                // if (isOrdinal && typeof value === 'string') {
+	                //     value = zrUtil.indexOf(dimData, value);
+	                // }
+	                value < min && (min = value);
+	                value > max && (max = value);
+	            }
+	            return (this._extent[dim + !!stack] = [min, max]);
+	        }
+	        else {
+	            return [Infinity, -Infinity];
+	        }
+	    };
+
+	    /**
+	     * Get sum of data in one dimension
+	     * @param {string} dim
+	     * @param {boolean} stack
+	     */
+	    listProto.getSum = function (dim, stack) {
+	        var dimData = this._storage[dim];
+	        var sum = 0;
+	        if (dimData) {
+	            for (var i = 0, len = this.count(); i < len; i++) {
+	                var value = this.get(dim, i, stack);
+	                if (!isNaN(value)) {
+	                    sum += value;
+	                }
+	            }
+	        }
+	        return sum;
+	    };
+
+	    /**
+	     * Retreive the index with given value
+	     * @param {number} idx
+	     * @param {number} value
+	     * @return {number}
+	     */
+	    // FIXME Precision of float value
+	    listProto.indexOf = function (dim, value) {
+	        var storage = this._storage;
+	        var dimData = storage[dim];
+	        var indices = this.indices;
+
+	        if (dimData) {
+	            for (var i = 0, len = indices.length; i < len; i++) {
+	                var rawIndex = indices[i];
+	                if (dimData[rawIndex] === value) {
+	                    return i;
+	                }
+	            }
+	        }
+	        return -1;
+	    };
+
+	    /**
+	     * Retreive the index with given name
+	     * @param {number} idx
+	     * @param {number} name
+	     * @return {number}
+	     */
+	    listProto.indexOfName = function (name) {
+	        var indices = this.indices;
+	        var nameList = this._nameList;
+
+	        for (var i = 0, len = indices.length; i < len; i++) {
+	            var rawIndex = indices[i];
+	            if (nameList[rawIndex] === name) {
+	                return i;
+	            }
+	        }
+
+	        return -1;
+	    };
+
+	    /**
+	     * Retreive the index with given raw data index
+	     * @param {number} idx
+	     * @param {number} name
+	     * @return {number}
+	     */
+	    listProto.indexOfRawIndex = function (rawIndex) {
+	        // Indices are ascending
+	        var indices = this.indices;
+	        var left = 0;
+	        var right = indices.length - 1;
+	        while (left <= right) {
+	            var mid = (left + right) / 2 | 0;
+	            if (indices[mid] < rawIndex) {
+	                left = mid + 1;
+	            }
+	            else if (indices[mid] > rawIndex) {
+	                right = mid - 1;
+	            }
+	            else {
+	                return mid;
+	            }
+	        }
+	        return -1;
+	    };
+
+	    /**
+	     * Retreive the index of nearest value
+	     * @param {string} dim
+	     * @param {number} value
+	     * @param {boolean} stack If given value is after stacked
+	     * @param {number} [maxDistance=Infinity]
+	     * @return {number}
+	     */
+	    listProto.indexOfNearest = function (dim, value, stack, maxDistance) {
+	        var storage = this._storage;
+	        var dimData = storage[dim];
+
+	        if (maxDistance == null) {
+	            maxDistance = Infinity;
+	        }
+
+	        var nearestIdx = -1;
+	        if (dimData) {
+	            var minDist = Number.MAX_VALUE;
+	            for (var i = 0, len = this.count(); i < len; i++) {
+	                var diff = value - this.get(dim, i, stack);
+	                var dist = Math.abs(diff);
+	                if (
+	                    diff <= maxDistance
+	                    && (dist < minDist
+	                        // For the case of two data are same on xAxis, which has sequence data.
+	                        // Show the nearest index
+	                        // https://github.com/ecomfe/echarts/issues/2869
+	                        || (dist === minDist && diff > 0)
+	                    )
+	                ) {
+	                    minDist = dist;
+	                    nearestIdx = i;
+	                }
+	            }
+	        }
+	        return nearestIdx;
+	    };
+
+	    /**
+	     * Get raw data index
+	     * @param {number} idx
+	     * @return {number}
+	     */
+	    listProto.getRawIndex = function (idx) {
+	        var rawIdx = this.indices[idx];
+	        return rawIdx == null ? -1 : rawIdx;
+	    };
+
+	    /**
+	     * Get raw data item
+	     * @param {number} idx
+	     * @return {number}
+	     */
+	    listProto.getRawDataItem = function (idx) {
+	        return this._rawData[this.getRawIndex(idx)];
+	    };
+
+	    /**
+	     * @param {number} idx
+	     * @param {boolean} [notDefaultIdx=false]
+	     * @return {string}
+	     */
+	    listProto.getName = function (idx) {
+	        return this._nameList[this.indices[idx]] || '';
+	    };
+
+	    /**
+	     * @param {number} idx
+	     * @param {boolean} [notDefaultIdx=false]
+	     * @return {string}
+	     */
+	    listProto.getId = function (idx) {
+	        return this._idList[this.indices[idx]] || (this.getRawIndex(idx) + '');
+	    };
+
+
+	    function normalizeDimensions(dimensions) {
+	        if (!zrUtil.isArray(dimensions)) {
+	            dimensions = [dimensions];
+	        }
+	        return dimensions;
+	    }
+
+	    /**
+	     * Data iteration
+	     * @param {string|Array.<string>}
+	     * @param {Function} cb
+	     * @param {boolean} [stack=false]
+	     * @param {*} [context=this]
+	     *
+	     * @example
+	     *  list.each('x', function (x, idx) {});
+	     *  list.each(['x', 'y'], function (x, y, idx) {});
+	     *  list.each(function (idx) {})
+	     */
+	    listProto.each = function (dims, cb, stack, context) {
+	        if (typeof dims === 'function') {
+	            context = stack;
+	            stack = cb;
+	            cb = dims;
+	            dims = [];
+	        }
+
+	        dims = zrUtil.map(normalizeDimensions(dims), this.getDimension, this);
+
+	        var value = [];
+	        var dimSize = dims.length;
+	        var indices = this.indices;
+
+	        context = context || this;
+
+	        for (var i = 0; i < indices.length; i++) {
+	            // Simple optimization
+	            switch (dimSize) {
+	                case 0:
+	                    cb.call(context, i);
+	                    break;
+	                case 1:
+	                    cb.call(context, this.get(dims[0], i, stack), i);
+	                    break;
+	                case 2:
+	                    cb.call(context, this.get(dims[0], i, stack), this.get(dims[1], i, stack), i);
+	                    break;
+	                default:
+	                    for (var k = 0; k < dimSize; k++) {
+	                        value[k] = this.get(dims[k], i, stack);
+	                    }
+	                    // Index
+	                    value[k] = i;
+	                    cb.apply(context, value);
+	            }
+	        }
+	    };
+
+	    /**
+	     * Data filter
+	     * @param {string|Array.<string>}
+	     * @param {Function} cb
+	     * @param {boolean} [stack=false]
+	     * @param {*} [context=this]
+	     */
+	    listProto.filterSelf = function (dimensions, cb, stack, context) {
+	        if (typeof dimensions === 'function') {
+	            context = stack;
+	            stack = cb;
+	            cb = dimensions;
+	            dimensions = [];
+	        }
+
+	        dimensions = zrUtil.map(
+	            normalizeDimensions(dimensions), this.getDimension, this
+	        );
+
+	        var newIndices = [];
+	        var value = [];
+	        var dimSize = dimensions.length;
+	        var indices = this.indices;
+
+	        context = context || this;
+
+	        for (var i = 0; i < indices.length; i++) {
+	            var keep;
+	            // Simple optimization
+	            if (dimSize === 1) {
+	                keep = cb.call(
+	                    context, this.get(dimensions[0], i, stack), i
+	                );
+	            }
+	            else {
+	                for (var k = 0; k < dimSize; k++) {
+	                    value[k] = this.get(dimensions[k], i, stack);
+	                }
+	                value[k] = i;
+	                keep = cb.apply(context, value);
+	            }
+	            if (keep) {
+	                newIndices.push(indices[i]);
+	            }
+	        }
+
+	        this.indices = newIndices;
+
+	        // Reset data extent
+	        this._extent = {};
+
+	        return this;
+	    };
+
+	    /**
+	     * Data mapping to a plain array
+	     * @param {string|Array.<string>} [dimensions]
+	     * @param {Function} cb
+	     * @param {boolean} [stack=false]
+	     * @param {*} [context=this]
+	     * @return {Array}
+	     */
+	    listProto.mapArray = function (dimensions, cb, stack, context) {
+	        if (typeof dimensions === 'function') {
+	            context = stack;
+	            stack = cb;
+	            cb = dimensions;
+	            dimensions = [];
+	        }
+
+	        var result = [];
+	        this.each(dimensions, function () {
+	            result.push(cb && cb.apply(this, arguments));
+	        }, stack, context);
+	        return result;
+	    };
+
+	    function cloneListForMapAndSample(original, excludeDimensions) {
+	        var allDimensions = original.dimensions;
+	        var list = new List(
+	            zrUtil.map(allDimensions, original.getDimensionInfo, original),
+	            original.hostModel
+	        );
+	        // FIXME If needs stackedOn, value may already been stacked
+	        transferProperties(list, original);
+
+	        var storage = list._storage = {};
+	        var originalStorage = original._storage;
+	        // Init storage
+	        for (var i = 0; i < allDimensions.length; i++) {
+	            var dim = allDimensions[i];
+	            var dimStore = originalStorage[dim];
+	            if (zrUtil.indexOf(excludeDimensions, dim) >= 0) {
+	                storage[dim] = new dimStore.constructor(
+	                    originalStorage[dim].length
+	                );
+	            }
+	            else {
+	                // Direct reference for other dimensions
+	                storage[dim] = originalStorage[dim];
+	            }
+	        }
+	        return list;
+	    }
+
+	    /**
+	     * Data mapping to a new List with given dimensions
+	     * @param {string|Array.<string>} dimensions
+	     * @param {Function} cb
+	     * @param {boolean} [stack=false]
+	     * @param {*} [context=this]
+	     * @return {Array}
+	     */
+	    listProto.map = function (dimensions, cb, stack, context) {
+	        dimensions = zrUtil.map(
+	            normalizeDimensions(dimensions), this.getDimension, this
+	        );
+
+	        var list = cloneListForMapAndSample(this, dimensions);
+	        // Following properties are all immutable.
+	        // So we can reference to the same value
+	        var indices = list.indices = this.indices;
+
+	        var storage = list._storage;
+
+	        var tmpRetValue = [];
+	        this.each(dimensions, function () {
+	            var idx = arguments[arguments.length - 1];
+	            var retValue = cb && cb.apply(this, arguments);
+	            if (retValue != null) {
+	                // a number
+	                if (typeof retValue === 'number') {
+	                    tmpRetValue[0] = retValue;
+	                    retValue = tmpRetValue;
+	                }
+	                for (var i = 0; i < retValue.length; i++) {
+	                    var dim = dimensions[i];
+	                    var dimStore = storage[dim];
+	                    var rawIdx = indices[idx];
+	                    if (dimStore) {
+	                        dimStore[rawIdx] = retValue[i];
+	                    }
+	                }
+	            }
+	        }, stack, context);
+
+	        return list;
+	    };
+
+	    /**
+	     * Large data down sampling on given dimension
+	     * @param {string} dimension
+	     * @param {number} rate
+	     * @param {Function} sampleValue
+	     * @param {Function} sampleIndex Sample index for name and id
+	     */
+	    listProto.downSample = function (dimension, rate, sampleValue, sampleIndex) {
+	        var list = cloneListForMapAndSample(this, [dimension]);
+	        var storage = this._storage;
+	        var targetStorage = list._storage;
+
+	        var originalIndices = this.indices;
+	        var indices = list.indices = [];
+
+	        var frameValues = [];
+	        var frameIndices = [];
+	        var frameSize = Math.floor(1 / rate);
+
+	        var dimStore = targetStorage[dimension];
+	        var len = this.count();
+	        // Copy data from original data
+	        for (var i = 0; i < storage[dimension].length; i++) {
+	            targetStorage[dimension][i] = storage[dimension][i];
+	        }
+	        for (var i = 0; i < len; i += frameSize) {
+	            // Last frame
+	            if (frameSize > len - i) {
+	                frameSize = len - i;
+	                frameValues.length = frameSize;
+	            }
+	            for (var k = 0; k < frameSize; k++) {
+	                var idx = originalIndices[i + k];
+	                frameValues[k] = dimStore[idx];
+	                frameIndices[k] = idx;
+	            }
+	            var value = sampleValue(frameValues);
+	            var idx = frameIndices[sampleIndex(frameValues, value) || 0];
+	            // Only write value on the filtered data
+	            dimStore[idx] = value;
+	            indices.push(idx);
+	        }
+
+	        return list;
+	    };
+
+	    /**
+	     * Get model of one data item.
+	     *
+	     * @param {number} idx
+	     */
+	    // FIXME Model proxy ?
+	    listProto.getItemModel = function (idx) {
+	        var hostModel = this.hostModel;
+	        idx = this.indices[idx];
+	        return new Model(this._rawData[idx], hostModel, hostModel && hostModel.ecModel);
+	    };
+
+	    /**
+	     * Create a data differ
+	     * @param {module:echarts/data/List} otherList
+	     * @return {module:echarts/data/DataDiffer}
+	     */
+	    listProto.diff = function (otherList) {
+	        var idList = this._idList;
+	        var otherIdList = otherList && otherList._idList;
+	        return new DataDiffer(
+	            otherList ? otherList.indices : [], this.indices, function (idx) {
+	                return otherIdList[idx] || (idx + '');
+	            }, function (idx) {
+	                return idList[idx] || (idx + '');
+	            }
+	        );
+	    };
+	    /**
+	     * Get visual property.
+	     * @param {string} key
+	     */
+	    listProto.getVisual = function (key) {
+	        var visual = this._visual;
+	        return visual && visual[key];
+	    };
+
+	    /**
+	     * Set visual property
+	     * @param {string|Object} key
+	     * @param {*} [value]
+	     *
+	     * @example
+	     *  setVisual('color', color);
+	     *  setVisual({
+	     *      'color': color
+	     *  });
+	     */
+	    listProto.setVisual = function (key, val) {
+	        if (isObject(key)) {
+	            for (var name in key) {
+	                if (key.hasOwnProperty(name)) {
+	                    this.setVisual(name, key[name]);
+	                }
+	            }
+	            return;
+	        }
+	        this._visual = this._visual || {};
+	        this._visual[key] = val;
+	    };
+
+	    /**
+	     * Set layout property.
+	     * @param {string} key
+	     * @param {*} [val]
+	     */
+	    listProto.setLayout = function (key, val) {
+	        if (isObject(key)) {
+	            for (var name in key) {
+	                if (key.hasOwnProperty(name)) {
+	                    this.setLayout(name, key[name]);
+	                }
+	            }
+	            return;
+	        }
+	        this._layout[key] = val;
+	    };
+
+	    /**
+	     * Get layout property.
+	     * @param  {string} key.
+	     * @return {*}
+	     */
+	    listProto.getLayout = function (key) {
+	        return this._layout[key];
+	    };
+
+	    /**
+	     * Get layout of single data item
+	     * @param {number} idx
+	     */
+	    listProto.getItemLayout = function (idx) {
+	        return this._itemLayouts[idx];
+	    };
+
+	    /**
+	     * Set layout of single data item
+	     * @param {number} idx
+	     * @param {Object} layout
+	     * @param {boolean=} [merge=false]
+	     */
+	    listProto.setItemLayout = function (idx, layout, merge) {
+	        this._itemLayouts[idx] = merge
+	            ? zrUtil.extend(this._itemLayouts[idx] || {}, layout)
+	            : layout;
+	    };
+
+	    /**
+	     * Clear all layout of single data item
+	     */
+	    listProto.clearItemLayouts = function () {
+	        this._itemLayouts.length = 0;
+	    };
+
+	    /**
+	     * Get visual property of single data item
+	     * @param {number} idx
+	     * @param {string} key
+	     * @param {boolean} ignoreParent
+	     */
+	    listProto.getItemVisual = function (idx, key, ignoreParent) {
+	        var itemVisual = this._itemVisuals[idx];
+	        var val = itemVisual && itemVisual[key];
+	        if (val == null && !ignoreParent) {
+	            // Use global visual property
+	            return this.getVisual(key);
+	        }
+	        return val;
+	    };
+
+	    /**
+	     * Set visual property of single data item
+	     *
+	     * @param {number} idx
+	     * @param {string|Object} key
+	     * @param {*} [value]
+	     *
+	     * @example
+	     *  setItemVisual(0, 'color', color);
+	     *  setItemVisual(0, {
+	     *      'color': color
+	     *  });
+	     */
+	    listProto.setItemVisual = function (idx, key, value) {
+	        var itemVisual = this._itemVisuals[idx] || {};
+	        this._itemVisuals[idx] = itemVisual;
+
+	        if (isObject(key)) {
+	            for (var name in key) {
+	                if (key.hasOwnProperty(name)) {
+	                    itemVisual[name] = key[name];
+	                }
+	            }
+	            return;
+	        }
+	        itemVisual[key] = value;
+	    };
+
+	    /**
+	     * Clear itemVisuals and list visual.
+	     */
+	    listProto.clearAllVisual = function () {
+	        this._visual = {};
+	        this._itemVisuals = [];
+	    };
+
+	    var setItemDataAndSeriesIndex = function (child) {
+	        child.seriesIndex = this.seriesIndex;
+	        child.dataIndex = this.dataIndex;
+	        child.dataType = this.dataType;
+	    };
+	    /**
+	     * Set graphic element relative to data. It can be set as null
+	     * @param {number} idx
+	     * @param {module:zrender/Element} [el]
+	     */
+	    listProto.setItemGraphicEl = function (idx, el) {
+	        var hostModel = this.hostModel;
+
+	        if (el) {
+	            // Add data index and series index for indexing the data by element
+	            // Useful in tooltip
+	            el.dataIndex = idx;
+	            el.dataType = this.dataType;
+	            el.seriesIndex = hostModel && hostModel.seriesIndex;
+	            if (el.type === 'group') {
+	                el.traverse(setItemDataAndSeriesIndex, el);
+	            }
+	        }
+
+	        this._graphicEls[idx] = el;
+	    };
+
+	    /**
+	     * @param {number} idx
+	     * @return {module:zrender/Element}
+	     */
+	    listProto.getItemGraphicEl = function (idx) {
+	        return this._graphicEls[idx];
+	    };
+
+	    /**
+	     * @param {Function} cb
+	     * @param {*} context
+	     */
+	    listProto.eachItemGraphicEl = function (cb, context) {
+	        zrUtil.each(this._graphicEls, function (el, idx) {
+	            if (el) {
+	                cb && cb.call(context, el, idx);
+	            }
+	        });
+	    };
+
+	    /**
+	     * Shallow clone a new list except visual and layout properties, and graph elements.
+	     * New list only change the indices.
+	     */
+	    listProto.cloneShallow = function () {
+	        var dimensionInfoList = zrUtil.map(this.dimensions, this.getDimensionInfo, this);
+	        var list = new List(dimensionInfoList, this.hostModel);
+
+	        // FIXME
+	        list._storage = this._storage;
+
+	        transferProperties(list, this);
+
+
+	        // Clone will not change the data extent and indices
+	        list.indices = this.indices.slice();
+
+	        if (this._extent) {
+	            list._extent = zrUtil.extend({}, this._extent);
+	        }
+
+	        return list;
+	    };
+
+	    /**
+	     * Wrap some method to add more feature
+	     * @param {string} methodName
+	     * @param {Function} injectFunction
+	     */
+	    listProto.wrapMethod = function (methodName, injectFunction) {
+	        var originalMethod = this[methodName];
+	        if (typeof originalMethod !== 'function') {
+	            return;
+	        }
+	        this.__wrappedMethods = this.__wrappedMethods || [];
+	        this.__wrappedMethods.push(methodName);
+	        this[methodName] = function () {
+	            var res = originalMethod.apply(this, arguments);
+	            return injectFunction.apply(this, [res].concat(zrUtil.slice(arguments)));
+	        };
+	    };
+
+	    // Methods that create a new list based on this list should be listed here.
+	    // Notice that those method should `RETURN` the new list.
+	    listProto.TRANSFERABLE_METHODS = ['cloneShallow', 'downSample', 'map'];
+	    // Methods that change indices of this list should be listed here.
+	    listProto.CHANGABLE_METHODS = ['filterSelf'];
+
+	    module.exports = List;
+
+	/* WEBPACK VAR INJECTION */}.call(exports, (function() { return this; }())))
+
+/***/ },
+/* 98 */
+/***/ function(module, exports) {
+
+	'use strict';
+
+
+	    function defaultKeyGetter(item) {
+	        return item;
+	    }
+
+	    function DataDiffer(oldArr, newArr, oldKeyGetter, newKeyGetter) {
+	        this._old = oldArr;
+	        this._new = newArr;
+
+	        this._oldKeyGetter = oldKeyGetter || defaultKeyGetter;
+	        this._newKeyGetter = newKeyGetter || defaultKeyGetter;
+	    }
+
+	    DataDiffer.prototype = {
+
+	        constructor: DataDiffer,
+
+	        /**
+	         * Callback function when add a data
+	         */
+	        add: function (func) {
+	            this._add = func;
+	            return this;
+	        },
+
+	        /**
+	         * Callback function when update a data
+	         */
+	        update: function (func) {
+	            this._update = func;
+	            return this;
+	        },
+
+	        /**
+	         * Callback function when remove a data
+	         */
+	        remove: function (func) {
+	            this._remove = func;
+	            return this;
+	        },
+
+	        execute: function () {
+	            var oldArr = this._old;
+	            var newArr = this._new;
+	            var oldKeyGetter = this._oldKeyGetter;
+	            var newKeyGetter = this._newKeyGetter;
+
+	            var oldDataIndexMap = {};
+	            var newDataIndexMap = {};
+	            var oldDataKeyArr = [];
+	            var newDataKeyArr = [];
+	            var i;
+
+	            initIndexMap(oldArr, oldDataIndexMap, oldDataKeyArr, oldKeyGetter);
+	            initIndexMap(newArr, newDataIndexMap, newDataKeyArr, newKeyGetter);
+
+	            // Travel by inverted order to make sure order consistency
+	            // when duplicate keys exists (consider newDataIndex.pop() below).
+	            // For performance consideration, these code below do not look neat.
+	            for (i = 0; i < oldArr.length; i++) {
+	                var key = oldDataKeyArr[i];
+	                var idx = newDataIndexMap[key];
+
+	                // idx can never be empty array here. see 'set null' logic below.
+	                if (idx != null) {
+	                    // Consider there is duplicate key (for example, use dataItem.name as key).
+	                    // We should make sure every item in newArr and oldArr can be visited.
+	                    var len = idx.length;
+	                    if (len) {
+	                        len === 1 && (newDataIndexMap[key] = null);
+	                        idx = idx.unshift();
+	                    }
+	                    else {
+	                        newDataIndexMap[key] = null;
+	                    }
+	                    this._update && this._update(idx, i);
+	                }
+	                else {
+	                    this._remove && this._remove(i);
+	                }
+	            }
+
+	            for (var i = 0; i < newDataKeyArr.length; i++) {
+	                var key = newDataKeyArr[i];
+	                if (newDataIndexMap.hasOwnProperty(key)) {
+	                    var idx = newDataIndexMap[key];
+	                    if (idx == null) {
+	                        continue;
+	                    }
+	                    // idx can never be empty array here. see 'set null' logic above.
+	                    if (!idx.length) {
+	                        this._add && this._add(idx);
+	                    }
+	                    else {
+	                        for (var j = 0, len = idx.length; j < len; j++) {
+	                            this._add && this._add(idx[j]);
+	                        }
+	                    }
+	                }
+	            }
+	        }
+	    };
+
+	    function initIndexMap(arr, map, keyArr, keyGetter) {
+	        for (var i = 0; i < arr.length; i++) {
+	            var key = keyGetter(arr[i], i);
+	            var existence = map[key];
+	            if (existence == null) {
+	                keyArr.push(key);
+	                map[key] = i;
+	            }
+	            else {
+	                if (!existence.length) {
+	                    map[key] = existence = [existence];
+	                }
+	                existence.push(i);
+	            }
+	        }
+	    }
+
+	    module.exports = DataDiffer;
+
+
+/***/ },
+/* 99 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+	    var echarts = __webpack_require__(1);
+	    var PRIORITY = echarts.PRIORITY;
+
+	    __webpack_require__(100);
+	    __webpack_require__(103);
+
+	    echarts.registerVisual(zrUtil.curry(
+	        __webpack_require__(109), 'line', 'circle', 'line'
+	    ));
+	    echarts.registerLayout(zrUtil.curry(
+	        __webpack_require__(110), 'line'
+	    ));
+
+	    // Down sample after filter
+	    echarts.registerProcessor(PRIORITY.PROCESSOR.STATISTIC, zrUtil.curry(
+	        __webpack_require__(111), 'line'
+	    ));
+
+	    // In case developer forget to include grid component
+	    __webpack_require__(112);
+
+
+/***/ },
+/* 100 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var createListFromArray = __webpack_require__(101);
+	    var SeriesModel = __webpack_require__(28);
+
+	    module.exports = SeriesModel.extend({
+
+	        type: 'series.line',
+
+	        dependencies: ['grid', 'polar'],
+
+	        getInitialData: function (option, ecModel) {
+	            if (true) {
+	                var coordSys = option.coordinateSystem;
+	                if (coordSys !== 'polar' && coordSys !== 'cartesian2d') {
+	                    throw new Error('Line not support coordinateSystem besides cartesian and polar');
+	                }
+	            }
+	            return createListFromArray(option.data, this, ecModel);
+	        },
+
+	        defaultOption: {
+	            zlevel: 0,                  // 一级层叠
+	            z: 2,                       // 二级层叠
+	            coordinateSystem: 'cartesian2d',
+	            legendHoverLink: true,
+
+	            hoverAnimation: true,
+	            // stack: null
+	            xAxisIndex: 0,
+	            yAxisIndex: 0,
+
+	            polarIndex: 0,
+
+	            // If clip the overflow value
+	            clipOverflow: true,
+
+	            label: {
+	                normal: {
+	                    position: 'top'
+	                }
+	            },
+	            // itemStyle: {
+	            //     normal: {},
+	            //     emphasis: {}
+	            // },
+	            lineStyle: {
+	                normal: {
+	                    width: 2,
+	                    type: 'solid'
+	                }
+	            },
+	            // areaStyle: {},
+	            // false, 'start', 'end', 'middle'
+	            step: false,
+
+	            // Disabled if step is true
+	            smooth: false,
+	            smoothMonotone: null,
+	            // 拐点图形类型
+	            symbol: 'emptyCircle',
+	            // 拐点图形大小
+	            symbolSize: 4,
+	            // 拐点图形旋转控制
+	            symbolRotate: null,
+
+	            // 是否显示 symbol, 只有在 tooltip hover 的时候显示
+	            showSymbol: true,
+	            // 标志图形默认只有主轴显示（随主轴标签间隔隐藏策略）
+	            showAllSymbol: false,
+
+	            // 是否连接断点
+	            connectNulls: false,
+
+	            // 数据过滤，'average', 'max', 'min', 'sum'
+	            sampling: 'none',
+
+	            animationEasing: 'linear',
+
+	            // Disable progressive
+	            progressive: 0,
+	            hoverLayerThreshold: Infinity
+	        }
+	    });
+
+
+/***/ },
+/* 101 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var List = __webpack_require__(97);
+	    var completeDimensions = __webpack_require__(102);
+	    var zrUtil = __webpack_require__(4);
+	    var modelUtil = __webpack_require__(5);
+	    var CoordinateSystem = __webpack_require__(26);
+	    var getDataItemValue = modelUtil.getDataItemValue;
+	    var converDataValue = modelUtil.converDataValue;
+
+	    function firstDataNotNull(data) {
+	        var i = 0;
+	        while (i < data.length && data[i] == null) {
+	            i++;
+	        }
+	        return data[i];
+	    }
+	    function ifNeedCompleteOrdinalData(data) {
+	        var sampleItem = firstDataNotNull(data);
+	        return sampleItem != null
+	            && !zrUtil.isArray(getDataItemValue(sampleItem));
+	    }
+
+	    /**
+	     * Helper function to create a list from option data
+	     */
+	    function createListFromArray(data, seriesModel, ecModel) {
+	        // If data is undefined
+	        data = data || [];
+
+	        if (true) {
+	            if (!zrUtil.isArray(data)) {
+	                throw new Error('Invalid data.');
+	            }
+	        }
+
+	        var coordSysName = seriesModel.get('coordinateSystem');
+	        var creator = creators[coordSysName];
+	        var registeredCoordSys = CoordinateSystem.get(coordSysName);
+	        // FIXME
+	        var axesInfo = creator && creator(data, seriesModel, ecModel);
+	        var dimensions = axesInfo && axesInfo.dimensions;
+	        if (!dimensions) {
+	            // Get dimensions from registered coordinate system
+	            dimensions = (registeredCoordSys && registeredCoordSys.dimensions) || ['x', 'y'];
+	            dimensions = completeDimensions(dimensions, data, dimensions.concat(['value']));
+	        }
+	        var categoryIndex = axesInfo ? axesInfo.categoryIndex : -1;
+
+	        var list = new List(dimensions, seriesModel);
+
+	        var nameList = createNameList(axesInfo, data);
+
+	        var categories = {};
+	        var dimValueGetter = (categoryIndex >= 0 && ifNeedCompleteOrdinalData(data))
+	            ? function (itemOpt, dimName, dataIndex, dimIndex) {
+	                // If any dataItem is like { value: 10 }
+	                if (modelUtil.isDataItemOption(itemOpt)) {
+	                    list.hasItemOption = true;
+	                }
+
+	                // Use dataIndex as ordinal value in categoryAxis
+	                return dimIndex === categoryIndex
+	                    ? dataIndex
+	                    : converDataValue(getDataItemValue(itemOpt), dimensions[dimIndex]);
+	            }
+	            : function (itemOpt, dimName, dataIndex, dimIndex) {
+	                var value = getDataItemValue(itemOpt);
+	                var val = converDataValue(value && value[dimIndex], dimensions[dimIndex]);
+	                // If any dataItem is like { value: 10 }
+	                if (modelUtil.isDataItemOption(itemOpt)) {
+	                    list.hasItemOption = true;
+	                }
+
+	                var categoryAxesModels = axesInfo && axesInfo.categoryAxesModels;
+	                if (categoryAxesModels && categoryAxesModels[dimName]) {
+	                    // If given value is a category string
+	                    if (typeof val === 'string') {
+	                        // Lazy get categories
+	                        categories[dimName] = categories[dimName]
+	                            || categoryAxesModels[dimName].getCategories();
+	                        val = zrUtil.indexOf(categories[dimName], val);
+	                        if (val < 0 && !isNaN(val)) {
+	                            // In case some one write '1', '2' istead of 1, 2
+	                            val = +val;
+	                        }
+	                    }
+	                }
+	                return val;
+	            };
+
+	        list.hasItemOption = false;
+	        list.initData(data, nameList, dimValueGetter);
+
+	        return list;
+	    }
+
+	    function isStackable(axisType) {
+	        return axisType !== 'category' && axisType !== 'time';
+	    }
+
+	    function getDimTypeByAxis(axisType) {
+	        return axisType === 'category'
+	            ? 'ordinal'
+	            : axisType === 'time'
+	            ? 'time'
+	            : 'float';
+	    }
+
+	    /**
+	     * Creaters for each coord system.
+	     */
+	    var creators = {
+
+	        cartesian2d: function (data, seriesModel, ecModel) {
+	            var xAxisModel = ecModel.getComponent('xAxis', seriesModel.get('xAxisIndex'));
+	            var yAxisModel = ecModel.getComponent('yAxis', seriesModel.get('yAxisIndex'));
+
+	            if (true) {
+	                if (!xAxisModel) {
+	                    throw new Error('xAxis "' + seriesModel.get('xAxisIndex') + '" not found');
+	                }
+	                if (!yAxisModel) {
+	                    throw new Error('yAxis "' + seriesModel.get('yAxisIndex') + '" not found');
+	                }
+	            }
+
+	            var xAxisType = xAxisModel.get('type');
+	            var yAxisType = yAxisModel.get('type');
+
+	            var dimensions = [
+	                {
+	                    name: 'x',
+	                    type: getDimTypeByAxis(xAxisType),
+	                    stackable: isStackable(xAxisType)
+	                },
+	                {
+	                    name: 'y',
+	                    // If two category axes
+	                    type: getDimTypeByAxis(yAxisType),
+	                    stackable: isStackable(yAxisType)
+	                }
+	            ];
+
+	            var isXAxisCateogry = xAxisType === 'category';
+	            var isYAxisCategory = yAxisType === 'category';
+
+	            completeDimensions(dimensions, data, ['x', 'y', 'z']);
+
+	            var categoryAxesModels = {};
+	            if (isXAxisCateogry) {
+	                categoryAxesModels.x = xAxisModel;
+	            }
+	            if (isYAxisCategory) {
+	                categoryAxesModels.y = yAxisModel;
+	            }
+	            return {
+	                dimensions: dimensions,
+	                categoryIndex: isXAxisCateogry ? 0 : (isYAxisCategory ? 1 : -1),
+	                categoryAxesModels: categoryAxesModels
+	            };
+	        },
+
+	        polar: function (data, seriesModel, ecModel) {
+	            var polarIndex = seriesModel.get('polarIndex') || 0;
+
+	            var axisFinder = function (axisModel) {
+	                return axisModel.get('polarIndex') === polarIndex;
+	            };
+
+	            var angleAxisModel = ecModel.findComponents({
+	                mainType: 'angleAxis', filter: axisFinder
+	            })[0];
+	            var radiusAxisModel = ecModel.findComponents({
+	                mainType: 'radiusAxis', filter: axisFinder
+	            })[0];
+
+	            if (true) {
+	                if (!angleAxisModel) {
+	                    throw new Error('angleAxis option not found');
+	                }
+	                if (!radiusAxisModel) {
+	                    throw new Error('radiusAxis option not found');
+	                }
+	            }
+
+	            var radiusAxisType = radiusAxisModel.get('type');
+	            var angleAxisType = angleAxisModel.get('type');
+
+	            var dimensions = [
+	                {
+	                    name: 'radius',
+	                    type: getDimTypeByAxis(radiusAxisType),
+	                    stackable: isStackable(radiusAxisType)
+	                },
+	                {
+	                    name: 'angle',
+	                    type: getDimTypeByAxis(angleAxisType),
+	                    stackable: isStackable(angleAxisType)
+	                }
+	            ];
+	            var isAngleAxisCateogry = angleAxisType === 'category';
+	            var isRadiusAxisCateogry = radiusAxisType === 'category';
+
+	            completeDimensions(dimensions, data, ['radius', 'angle', 'value']);
+
+	            var categoryAxesModels = {};
+	            if (isRadiusAxisCateogry) {
+	                categoryAxesModels.radius = radiusAxisModel;
+	            }
+	            if (isAngleAxisCateogry) {
+	                categoryAxesModels.angle = angleAxisModel;
+	            }
+	            return {
+	                dimensions: dimensions,
+	                categoryIndex: isAngleAxisCateogry ? 1 : (isRadiusAxisCateogry ? 0 : -1),
+	                categoryAxesModels: categoryAxesModels
+	            };
+	        },
+
+	        geo: function (data, seriesModel, ecModel) {
+	            // TODO Region
+	            // 多个散点图系列在同一个地区的时候
+	            return {
+	                dimensions: completeDimensions([
+	                    {name: 'lng'},
+	                    {name: 'lat'}
+	                ], data, ['lng', 'lat', 'value'])
+	            };
+	        }
+	    };
+
+	    function createNameList(result, data) {
+	        var nameList = [];
+
+	        var categoryDim = result && result.dimensions[result.categoryIndex];
+	        var categoryAxisModel;
+	        if (categoryDim) {
+	            categoryAxisModel = result.categoryAxesModels[categoryDim.name];
+	        }
+
+	        if (categoryAxisModel) {
+	            // FIXME Two category axis
+	            var categories = categoryAxisModel.getCategories();
+	            if (categories) {
+	                var dataLen = data.length;
+	                // Ordered data is given explicitly like
+	                // [[3, 0.2], [1, 0.3], [2, 0.15]]
+	                // or given scatter data,
+	                // pick the category
+	                if (zrUtil.isArray(data[0]) && data[0].length > 1) {
+	                    nameList = [];
+	                    for (var i = 0; i < dataLen; i++) {
+	                        nameList[i] = categories[data[i][result.categoryIndex || 0]];
+	                    }
+	                }
+	                else {
+	                    nameList = categories.slice(0);
+	                }
+	            }
+	        }
+
+	        return nameList;
+	    }
+
+	    module.exports = createListFromArray;
+
+
+
+/***/ },
+/* 102 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * Complete dimensions by data (guess dimension).
+	 */
+
+
+	    var zrUtil = __webpack_require__(4);
+
+	    /**
+	     * Complete the dimensions array guessed from the data structure.
+	     * @param  {Array.<string>} dimensions      Necessary dimensions, like ['x', 'y']
+	     * @param  {Array} data                     Data list. [[1, 2, 3], [2, 3, 4]]
+	     * @param  {Array.<string>} defaultNames    Default names to fill not necessary dimensions, like ['value']
+	     * @param  {string} extraPrefix             Prefix of name when filling the left dimensions.
+	     * @return {Array.<string>}
+	     */
+	    function completeDimensions(dimensions, data, defaultNames, extraPrefix) {
+	        if (!data) {
+	            return dimensions;
+	        }
+
+	        var value0 = retrieveValue(data[0]);
+	        var dimSize = zrUtil.isArray(value0) && value0.length || 1;
+
+	        defaultNames = defaultNames || [];
+	        extraPrefix = extraPrefix || 'extra';
+	        for (var i = 0; i < dimSize; i++) {
+	            if (!dimensions[i]) {
+	                var name = defaultNames[i] || (extraPrefix + (i - defaultNames.length));
+	                dimensions[i] = guessOrdinal(data, i)
+	                    ? {type: 'ordinal', name: name}
+	                    : name;
+	            }
+	        }
+
+	        return dimensions;
+	    }
+
+	    // The rule should not be complex, otherwise user might not
+	    // be able to known where the data is wrong.
+	    var guessOrdinal = completeDimensions.guessOrdinal = function (data, dimIndex) {
+	        for (var i = 0, len = data.length; i < len; i++) {
+	            var value = retrieveValue(data[i]);
+
+	            if (!zrUtil.isArray(value)) {
+	                return false;
+	            }
+
+	            var value = value[dimIndex];
+	            if (value != null && isFinite(value)) {
+	                return false;
+	            }
+	            else if (zrUtil.isString(value) && value !== '-') {
+	                return true;
+	            }
+	        }
+	        return false;
+	    };
+
+	    function retrieveValue(o) {
+	        return zrUtil.isArray(o) ? o : zrUtil.isObject(o) ? o.value: o;
+	    }
+
+	    module.exports = completeDimensions;
+
+
+
+/***/ },
+/* 103 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+	// FIXME step not support polar
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var SymbolDraw = __webpack_require__(104);
+	    var Symbol = __webpack_require__(105);
+	    var lineAnimationDiff = __webpack_require__(107);
+	    var graphic = __webpack_require__(43);
+
+	    var polyHelper = __webpack_require__(108);
+
+	    var ChartView = __webpack_require__(42);
+
+	    function isPointsSame(points1, points2) {
+	        if (points1.length !== points2.length) {
+	            return;
+	        }
+	        for (var i = 0; i < points1.length; i++) {
+	            var p1 = points1[i];
+	            var p2 = points2[i];
+	            if (p1[0] !== p2[0] || p1[1] !== p2[1]) {
+	                return;
+	            }
+	        }
+	        return true;
+	    }
+
+	    function getSmooth(smooth) {
+	        return typeof (smooth) === 'number' ? smooth : (smooth ? 0.3 : 0);
+	    }
+
+	    function getAxisExtentWithGap(axis) {
+	        var extent = axis.getGlobalExtent();
+	        if (axis.onBand) {
+	            // Remove extra 1px to avoid line miter in clipped edge
+	            var halfBandWidth = axis.getBandWidth() / 2 - 1;
+	            var dir = extent[1] > extent[0] ? 1 : -1;
+	            extent[0] += dir * halfBandWidth;
+	            extent[1] -= dir * halfBandWidth;
+	        }
+	        return extent;
+	    }
+
+	    function sign(val) {
+	        return val >= 0 ? 1 : -1;
+	    }
+	    /**
+	     * @param {module:echarts/coord/cartesian/Cartesian2D|module:echarts/coord/polar/Polar} coordSys
+	     * @param {module:echarts/data/List} data
+	     * @param {Array.<Array.<number>>} points
+	     * @private
+	     */
+	    function getStackedOnPoints(coordSys, data) {
+	        var baseAxis = coordSys.getBaseAxis();
+	        var valueAxis = coordSys.getOtherAxis(baseAxis);
+	        var valueStart = baseAxis.onZero
+	            ? 0 : valueAxis.scale.getExtent()[0];
+
+	        var valueDim = valueAxis.dim;
+
+	        var baseDataOffset = valueDim === 'x' || valueDim === 'radius' ? 1 : 0;
+
+	        return data.mapArray([valueDim], function (val, idx) {
+	            var stackedOnSameSign;
+	            var stackedOn = data.stackedOn;
+	            // Find first stacked value with same sign
+	            while (stackedOn &&
+	                sign(stackedOn.get(valueDim, idx)) === sign(val)
+	            ) {
+	                stackedOnSameSign = stackedOn;
+	                break;
+	            }
+	            var stackedData = [];
+	            stackedData[baseDataOffset] = data.get(baseAxis.dim, idx);
+	            stackedData[1 - baseDataOffset] = stackedOnSameSign
+	                ? stackedOnSameSign.get(valueDim, idx, true) : valueStart;
+
+	            return coordSys.dataToPoint(stackedData);
+	        }, true);
+	    }
+
+	    function queryDataIndex(data, payload) {
+	        if (payload.dataIndex != null) {
+	            return payload.dataIndex;
+	        }
+	        else if (payload.name != null) {
+	            return data.indexOfName(payload.name);
+	        }
+	    }
+
+	    function createGridClipShape(cartesian, hasAnimation, seriesModel) {
+	        var xExtent = getAxisExtentWithGap(cartesian.getAxis('x'));
+	        var yExtent = getAxisExtentWithGap(cartesian.getAxis('y'));
+	        var isHorizontal = cartesian.getBaseAxis().isHorizontal();
+
+	        var x = Math.min(xExtent[0], xExtent[1]);
+	        var y = Math.min(yExtent[0], yExtent[1]);
+	        var width = Math.max(xExtent[0], xExtent[1]) - x;
+	        var height = Math.max(yExtent[0], yExtent[1]) - y;
+	        var lineWidth = seriesModel.get('lineStyle.normal.width') || 2;
+	        // Expand clip shape to avoid clipping when line value exceeds axis
+	        var expandSize = seriesModel.get('clipOverflow') ? lineWidth / 2 : Math.max(width, height);
+	        if (isHorizontal) {
+	            y -= expandSize;
+	            height += expandSize * 2;
+	        }
+	        else {
+	            x -= expandSize;
+	            width += expandSize * 2;
+	        }
+
+	        var clipPath = new graphic.Rect({
+	            shape: {
+	                x: x,
+	                y: y,
+	                width: width,
+	                height: height
+	            }
+	        });
+
+	        if (hasAnimation) {
+	            clipPath.shape[isHorizontal ? 'width' : 'height'] = 0;
+	            graphic.initProps(clipPath, {
+	                shape: {
+	                    width: width,
+	                    height: height
+	                }
+	            }, seriesModel);
+	        }
+
+	        return clipPath;
+	    }
+
+	    function createPolarClipShape(polar, hasAnimation, seriesModel) {
+	        var angleAxis = polar.getAngleAxis();
+	        var radiusAxis = polar.getRadiusAxis();
+
+	        var radiusExtent = radiusAxis.getExtent();
+	        var angleExtent = angleAxis.getExtent();
+
+	        var RADIAN = Math.PI / 180;
+
+	        var clipPath = new graphic.Sector({
+	            shape: {
+	                cx: polar.cx,
+	                cy: polar.cy,
+	                r0: radiusExtent[0],
+	                r: radiusExtent[1],
+	                startAngle: -angleExtent[0] * RADIAN,
+	                endAngle: -angleExtent[1] * RADIAN,
+	                clockwise: angleAxis.inverse
+	            }
+	        });
+
+	        if (hasAnimation) {
+	            clipPath.shape.endAngle = -angleExtent[0] * RADIAN;
+	            graphic.initProps(clipPath, {
+	                shape: {
+	                    endAngle: -angleExtent[1] * RADIAN
+	                }
+	            }, seriesModel);
+	        }
+
+	        return clipPath;
+	    }
+
+	    function createClipShape(coordSys, hasAnimation, seriesModel) {
+	        return coordSys.type === 'polar'
+	            ? createPolarClipShape(coordSys, hasAnimation, seriesModel)
+	            : createGridClipShape(coordSys, hasAnimation, seriesModel);
+	    }
+
+	    function turnPointsIntoStep(points, coordSys, stepTurnAt) {
+	        var baseAxis = coordSys.getBaseAxis();
+	        var baseIndex = baseAxis.dim === 'x' || baseAxis.dim === 'radius' ? 0 : 1;
+
+	        var stepPoints = [];
+	        for (var i = 0; i < points.length - 1; i++) {
+	            var nextPt = points[i + 1];
+	            var pt = points[i];
+	            stepPoints.push(pt);
+
+	            var stepPt = [];
+	            switch (stepTurnAt) {
+	                case 'end':
+	                    stepPt[baseIndex] = nextPt[baseIndex];
+	                    stepPt[1 - baseIndex] = pt[1 - baseIndex];
+	                    // default is start
+	                    stepPoints.push(stepPt);
+	                    break;
+	                case 'middle':
+	                    // default is start
+	                    var middle = (pt[baseIndex] + nextPt[baseIndex]) / 2;
+	                    var stepPt2 = [];
+	                    stepPt[baseIndex] = stepPt2[baseIndex] = middle;
+	                    stepPt[1 - baseIndex] = pt[1 - baseIndex];
+	                    stepPt2[1 - baseIndex] = nextPt[1 - baseIndex];
+	                    stepPoints.push(stepPt);
+	                    stepPoints.push(stepPt2);
+	                    break;
+	                default:
+	                    stepPt[baseIndex] = pt[baseIndex];
+	                    stepPt[1 - baseIndex] = nextPt[1 - baseIndex];
+	                    // default is start
+	                    stepPoints.push(stepPt);
+	            }
+	        }
+	        // Last points
+	        points[i] && stepPoints.push(points[i]);
+	        return stepPoints;
+	    }
+
+	    function clamp(number, extent) {
+	        return Math.max(Math.min(number, extent[1]), extent[0]);
+	    }
+
+	    function getVisualGradient(data, coordSys) {
+	        var visualMetaList = data.getVisual('visualMeta');
+	        if (!visualMetaList || !visualMetaList.length) {
+	            return;
+	        }
+
+	        var visualMeta;
+	        for (var i = visualMetaList.length - 1; i >= 0; i--) {
+	            // Can only be x or y
+	            if (visualMetaList[i].dimension < 2) {
+	                visualMeta = visualMetaList[i];
+	                break;
+	            }
+	        }
+	        if (!visualMeta || coordSys.type !== 'cartesian2d') {
+	            if (true) {
+	                console.warn('Visual map on line style only support x or y dimension.');
+	            }
+	            return;
+	        }
+	        var dimension = visualMeta.dimension;
+	        var dimName = data.dimensions[dimension];
+	        var dataExtent = data.getDataExtent(dimName);
+
+	        var stops = visualMeta.stops;
+
+	        var colorStops = [];
+	        if (stops[0].interval) {
+	            stops.sort(function (a, b) {
+	                return a.interval[0] - b.interval[0];
+	            });
+	        }
+
+	        var firstStop = stops[0];
+	        var lastStop = stops[stops.length - 1];
+	        // Interval can be infinity in piecewise case
+	        var min = firstStop.interval ? clamp(firstStop.interval[0], dataExtent) : firstStop.value;
+	        var max = lastStop.interval ? clamp(lastStop.interval[1], dataExtent) : lastStop.value;
+	        var stopsSpan = max - min;
+
+	        // In the piecewise case data out of visual range
+	        // ----dataMin----dataMax-----visualMin----visualMax
+	        if (stopsSpan === 0) {
+	            return data.getItemVisual(0, 'color');
+	        }
+	        for (var i = 0; i < stops.length; i++) {
+	            // Piecewise
+	            if (stops[i].interval) {
+	                if (stops[i].interval[1] === stops[i].interval[0]) {
+	                    continue;
+	                }
+	                colorStops.push({
+	                    // Make sure offset is between 0 and 1
+	                    offset: (clamp(stops[i].interval[0], dataExtent) - min) / stopsSpan,
+	                    color: stops[i].color
+	                }, {
+	                    offset: (clamp(stops[i].interval[1], dataExtent) - min) / stopsSpan,
+	                    color: stops[i].color
+	                });
+	            }
+	            // Continous
+	            else {
+	                // if (i > 0 && stops[i].value === stops[i - 1].value) {
+	                //     continue;
+	                // }
+	                colorStops.push({
+	                    offset: (stops[i].value - min) / stopsSpan,
+	                    color: stops[i].color
+	                });
+	            }
+	        }
+	        var gradient = new graphic.LinearGradient(
+	            0, 0, 0, 0, colorStops, true
+	        );
+	        var axis = coordSys.getAxis(dimName);
+
+	        var start = Math.round(axis.toGlobalCoord(axis.dataToCoord(min)));
+	        var end = Math.round(axis.toGlobalCoord(axis.dataToCoord(max)));
+	        // zrUtil.each(colorStops, function (colorStop) {
+	        //     // Make sure each offset has rounded px to avoid not sharp edge
+	        //     colorStop.offset = (Math.round(colorStop.offset * (end - start) + start) - start) / (end - start);
+	        // });
+
+	        gradient[dimName] = start;
+	        gradient[dimName + '2'] = end;
+
+	        return gradient;
+	    }
+
+	    module.exports = ChartView.extend({
+
+	        type: 'line',
+
+	        init: function () {
+	            var lineGroup = new graphic.Group();
+
+	            var symbolDraw = new SymbolDraw();
+	            this.group.add(symbolDraw.group);
+
+	            this._symbolDraw = symbolDraw;
+	            this._lineGroup = lineGroup;
+	        },
+
+	        render: function (seriesModel, ecModel, api) {
+	            var coordSys = seriesModel.coordinateSystem;
+	            var group = this.group;
+	            var data = seriesModel.getData();
+	            var lineStyleModel = seriesModel.getModel('lineStyle.normal');
+	            var areaStyleModel = seriesModel.getModel('areaStyle.normal');
+
+	            var points = data.mapArray(data.getItemLayout, true);
+
+	            var isCoordSysPolar = coordSys.type === 'polar';
+	            var prevCoordSys = this._coordSys;
+
+	            var symbolDraw = this._symbolDraw;
+	            var polyline = this._polyline;
+	            var polygon = this._polygon;
+
+	            var lineGroup = this._lineGroup;
+
+	            var hasAnimation = seriesModel.get('animation');
+
+	            var isAreaChart = !areaStyleModel.isEmpty();
+	            var stackedOnPoints = getStackedOnPoints(coordSys, data);
+
+	            var showSymbol = seriesModel.get('showSymbol');
+
+	            var isSymbolIgnore = showSymbol && !isCoordSysPolar && !seriesModel.get('showAllSymbol')
+	                && this._getSymbolIgnoreFunc(data, coordSys);
+
+	            // Remove temporary symbols
+	            var oldData = this._data;
+	            oldData && oldData.eachItemGraphicEl(function (el, idx) {
+	                if (el.__temp) {
+	                    group.remove(el);
+	                    oldData.setItemGraphicEl(idx, null);
+	                }
+	            });
+
+	            // Remove previous created symbols if showSymbol changed to false
+	            if (!showSymbol) {
+	                symbolDraw.remove();
+	            }
+
+	            group.add(lineGroup);
+
+	            // FIXME step not support polar
+	            var step = !isCoordSysPolar && seriesModel.get('step');
+	            // Initialization animation or coordinate system changed
+	            if (
+	                !(polyline && prevCoordSys.type === coordSys.type && step === this._step)
+	            ) {
+	                showSymbol && symbolDraw.updateData(data, isSymbolIgnore);
+
+	                if (step) {
+	                    // TODO If stacked series is not step
+	                    points = turnPointsIntoStep(points, coordSys, step);
+	                    stackedOnPoints = turnPointsIntoStep(stackedOnPoints, coordSys, step);
+	                }
+
+	                polyline = this._newPolyline(points, coordSys, hasAnimation);
+	                if (isAreaChart) {
+	                    polygon = this._newPolygon(
+	                        points, stackedOnPoints,
+	                        coordSys, hasAnimation
+	                    );
+	                }
+	                lineGroup.setClipPath(createClipShape(coordSys, true, seriesModel));
+	            }
+	            else {
+	                if (isAreaChart && !polygon) {
+	                    // If areaStyle is added
+	                    polygon = this._newPolygon(
+	                        points, stackedOnPoints,
+	                        coordSys, hasAnimation
+	                    );
+	                }
+	                else if (polygon && !isAreaChart) {
+	                    // If areaStyle is removed
+	                    lineGroup.remove(polygon);
+	                    polygon = this._polygon = null;
+	                }
+
+	                // Update clipPath
+	                lineGroup.setClipPath(createClipShape(coordSys, false, seriesModel));
+
+	                // Always update, or it is wrong in the case turning on legend
+	                // because points are not changed
+	                showSymbol && symbolDraw.updateData(data, isSymbolIgnore);
+
+	                // Stop symbol animation and sync with line points
+	                // FIXME performance?
+	                data.eachItemGraphicEl(function (el) {
+	                    el.stopAnimation(true);
+	                });
+
+	                // In the case data zoom triggerred refreshing frequently
+	                // Data may not change if line has a category axis. So it should animate nothing
+	                if (!isPointsSame(this._stackedOnPoints, stackedOnPoints)
+	                    || !isPointsSame(this._points, points)
+	                ) {
+	                    if (hasAnimation) {
+	                        this._updateAnimation(
+	                            data, stackedOnPoints, coordSys, api, step
+	                        );
+	                    }
+	                    else {
+	                        polyline.setShape({
+	                            points: points
+	                        });
+	                        polygon && polygon.setShape({
+	                            points: points,
+	                            stackedOnPoints: stackedOnPoints
+	                        });
+	                    }
+	                }
+	            }
+
+	            var visualColor = getVisualGradient(data, coordSys) || data.getVisual('color');
+	            polyline.useStyle(zrUtil.defaults(
+	                // Use color in lineStyle first
+	                lineStyleModel.getLineStyle(),
+	                {
+	                    fill: 'none',
+	                    stroke: visualColor,
+	                    lineJoin: 'bevel'
+	                }
+	            ));
+
+	            var smooth = seriesModel.get('smooth');
+	            smooth = getSmooth(seriesModel.get('smooth'));
+	            polyline.setShape({
+	                smooth: smooth,
+	                smoothMonotone: seriesModel.get('smoothMonotone'),
+	                connectNulls: seriesModel.get('connectNulls')
+	            });
+
+	            if (polygon) {
+	                var stackedOn = data.stackedOn;
+	                var stackedOnSmooth = 0;
+
+	                polygon.useStyle(zrUtil.defaults(
+	                    areaStyleModel.getAreaStyle(),
+	                    {
+	                        fill: visualColor,
+	                        opacity: 0.7,
+	                        lineJoin: 'bevel'
+	                    }
+	                ));
+
+	                if (stackedOn) {
+	                    var stackedOnSeries = stackedOn.hostModel;
+	                    stackedOnSmooth = getSmooth(stackedOnSeries.get('smooth'));
+	                }
+
+	                polygon.setShape({
+	                    smooth: smooth,
+	                    stackedOnSmooth: stackedOnSmooth,
+	                    smoothMonotone: seriesModel.get('smoothMonotone'),
+	                    connectNulls: seriesModel.get('connectNulls')
+	                });
+	            }
+
+	            this._data = data;
+	            // Save the coordinate system for transition animation when data changed
+	            this._coordSys = coordSys;
+	            this._stackedOnPoints = stackedOnPoints;
+	            this._points = points;
+	            this._step = step;
+	        },
+
+	        highlight: function (seriesModel, ecModel, api, payload) {
+	            var data = seriesModel.getData();
+	            var dataIndex = queryDataIndex(data, payload);
+
+	            if (!(dataIndex instanceof Array) && dataIndex != null && dataIndex >= 0) {
+	                var symbol = data.getItemGraphicEl(dataIndex);
+	                if (!symbol) {
+	                    // Create a temporary symbol if it is not exists
+	                    var pt = data.getItemLayout(dataIndex);
+	                    symbol = new Symbol(data, dataIndex);
+	                    symbol.position = pt;
+	                    symbol.setZ(
+	                        seriesModel.get('zlevel'),
+	                        seriesModel.get('z')
+	                    );
+	                    symbol.ignore = isNaN(pt[0]) || isNaN(pt[1]);
+	                    symbol.__temp = true;
+	                    data.setItemGraphicEl(dataIndex, symbol);
+
+	                    // Stop scale animation
+	                    symbol.stopSymbolAnimation(true);
+
+	                    this.group.add(symbol);
+	                }
+	                symbol.highlight();
+	            }
+	            else {
+	                // Highlight whole series
+	                ChartView.prototype.highlight.call(
+	                    this, seriesModel, ecModel, api, payload
+	                );
+	            }
+	        },
+
+	        downplay: function (seriesModel, ecModel, api, payload) {
+	            var data = seriesModel.getData();
+	            var dataIndex = queryDataIndex(data, payload);
+	            if (dataIndex != null && dataIndex >= 0) {
+	                var symbol = data.getItemGraphicEl(dataIndex);
+	                if (symbol) {
+	                    if (symbol.__temp) {
+	                        data.setItemGraphicEl(dataIndex, null);
+	                        this.group.remove(symbol);
+	                    }
+	                    else {
+	                        symbol.downplay();
+	                    }
+	                }
+	            }
+	            else {
+	                // Downplay whole series
+	                ChartView.prototype.downplay.call(
+	                    this, seriesModel, ecModel, api, payload
+	                );
+	            }
+	        },
+
+	        /**
+	         * @param {module:zrender/container/Group} group
+	         * @param {Array.<Array.<number>>} points
+	         * @private
+	         */
+	        _newPolyline: function (points) {
+	            var polyline = this._polyline;
+	            // Remove previous created polyline
+	            if (polyline) {
+	                this._lineGroup.remove(polyline);
+	            }
+
+	            polyline = new polyHelper.Polyline({
+	                shape: {
+	                    points: points
+	                },
+	                silent: true,
+	                z2: 10
+	            });
+
+	            this._lineGroup.add(polyline);
+
+	            this._polyline = polyline;
+
+	            return polyline;
+	        },
+
+	        /**
+	         * @param {module:zrender/container/Group} group
+	         * @param {Array.<Array.<number>>} stackedOnPoints
+	         * @param {Array.<Array.<number>>} points
+	         * @private
+	         */
+	        _newPolygon: function (points, stackedOnPoints) {
+	            var polygon = this._polygon;
+	            // Remove previous created polygon
+	            if (polygon) {
+	                this._lineGroup.remove(polygon);
+	            }
+
+	            polygon = new polyHelper.Polygon({
+	                shape: {
+	                    points: points,
+	                    stackedOnPoints: stackedOnPoints
+	                },
+	                silent: true
+	            });
+
+	            this._lineGroup.add(polygon);
+
+	            this._polygon = polygon;
+	            return polygon;
+	        },
+	        /**
+	         * @private
+	         */
+	        _getSymbolIgnoreFunc: function (data, coordSys) {
+	            var categoryAxis = coordSys.getAxesByScale('ordinal')[0];
+	            // `getLabelInterval` is provided by echarts/component/axis
+	            if (categoryAxis && categoryAxis.isLabelIgnored) {
+	                return zrUtil.bind(categoryAxis.isLabelIgnored, categoryAxis);
+	            }
+	        },
+
+	        /**
+	         * @private
+	         */
+	        // FIXME Two value axis
+	        _updateAnimation: function (data, stackedOnPoints, coordSys, api, step) {
+	            var polyline = this._polyline;
+	            var polygon = this._polygon;
+	            var seriesModel = data.hostModel;
+
+	            var diff = lineAnimationDiff(
+	                this._data, data,
+	                this._stackedOnPoints, stackedOnPoints,
+	                this._coordSys, coordSys
+	            );
+
+	            var current = diff.current;
+	            var stackedOnCurrent = diff.stackedOnCurrent;
+	            var next = diff.next;
+	            var stackedOnNext = diff.stackedOnNext;
+	            if (step) {
+	                // TODO If stacked series is not step
+	                current = turnPointsIntoStep(diff.current, coordSys, step);
+	                stackedOnCurrent = turnPointsIntoStep(diff.stackedOnCurrent, coordSys, step);
+	                next = turnPointsIntoStep(diff.next, coordSys, step);
+	                stackedOnNext = turnPointsIntoStep(diff.stackedOnNext, coordSys, step);
+	            }
+	            polyline.shape.__points = diff.current;
+	            polyline.shape.points = current;
+
+	            graphic.updateProps(polyline, {
+	                shape: {
+	                    points: next
+	                }
+	            }, seriesModel);
+
+	            if (polygon) {
+	                polygon.setShape({
+	                    points: current,
+	                    stackedOnPoints: stackedOnCurrent
+	                });
+	                graphic.updateProps(polygon, {
+	                    shape: {
+	                        points: next,
+	                        stackedOnPoints: stackedOnNext,
+	                        __points: diff.next
+	                    }
+	                }, seriesModel);
+	            }
+
+	            var updatedDataInfo = [];
+	            var diffStatus = diff.status;
+
+	            for (var i = 0; i < diffStatus.length; i++) {
+	                var cmd = diffStatus[i].cmd;
+	                if (cmd === '=') {
+	                    var el = data.getItemGraphicEl(diffStatus[i].idx1);
+	                    if (el) {
+	                        updatedDataInfo.push({
+	                            el: el,
+	                            ptIdx: i    // Index of points
+	                        });
+	                    }
+	                }
+	            }
+
+	            if (polyline.animators && polyline.animators.length) {
+	                polyline.animators[0].during(function () {
+	                    for (var i = 0; i < updatedDataInfo.length; i++) {
+	                        var el = updatedDataInfo[i].el;
+	                        el.attr('position', polyline.shape.__points[updatedDataInfo[i].ptIdx]);
+	                    }
+	                });
+	            }
+	        },
+
+	        remove: function (ecModel) {
+	            var group = this.group;
+	            var oldData = this._data;
+	            this._lineGroup.removeAll();
+	            this._symbolDraw.remove(true);
+	            // Remove temporary created elements when highlighting
+	            oldData && oldData.eachItemGraphicEl(function (el, idx) {
+	                if (el.__temp) {
+	                    group.remove(el);
+	                    oldData.setItemGraphicEl(idx, null);
+	                }
+	            });
+
+	            this._polyline =
+	            this._polygon =
+	            this._coordSys =
+	            this._points =
+	            this._stackedOnPoints =
+	            this._data = null;
+	        }
+	    });
+
+
+/***/ },
+/* 104 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @module echarts/chart/helper/SymbolDraw
+	 */
+
+
+	    var graphic = __webpack_require__(43);
+	    var Symbol = __webpack_require__(105);
+
+	    /**
+	     * @constructor
+	     * @alias module:echarts/chart/helper/SymbolDraw
+	     * @param {module:zrender/graphic/Group} [symbolCtor]
+	     */
+	    function SymbolDraw(symbolCtor) {
+	        this.group = new graphic.Group();
+
+	        this._symbolCtor = symbolCtor || Symbol;
+	    }
+
+	    var symbolDrawProto = SymbolDraw.prototype;
+
+	    function symbolNeedsDraw(data, idx, isIgnore) {
+	        var point = data.getItemLayout(idx);
+	        return point && !isNaN(point[0]) && !isNaN(point[1]) && !(isIgnore && isIgnore(idx))
+	                    && data.getItemVisual(idx, 'symbol') !== 'none';
+	    }
+	    /**
+	     * Update symbols draw by new data
+	     * @param {module:echarts/data/List} data
+	     * @param {Array.<boolean>} [isIgnore]
+	     */
+	    symbolDrawProto.updateData = function (data, isIgnore) {
+	        var group = this.group;
+	        var seriesModel = data.hostModel;
+	        var oldData = this._data;
+
+	        var SymbolCtor = this._symbolCtor;
+
+	        var seriesScope = {
+	            itemStyle: seriesModel.getModel('itemStyle.normal').getItemStyle(['color']),
+	            hoverItemStyle: seriesModel.getModel('itemStyle.emphasis').getItemStyle(),
+	            symbolRotate: seriesModel.get('symbolRotate'),
+	            symbolOffset: seriesModel.get('symbolOffset'),
+	            hoverAnimation: seriesModel.get('hoverAnimation'),
+
+	            labelModel: seriesModel.getModel('label.normal'),
+	            hoverLabelModel: seriesModel.getModel('label.emphasis')
+	        };
+
+	        data.diff(oldData)
+	            .add(function (newIdx) {
+	                var point = data.getItemLayout(newIdx);
+	                if (symbolNeedsDraw(data, newIdx, isIgnore)) {
+	                    var symbolEl = new SymbolCtor(data, newIdx, seriesScope);
+	                    symbolEl.attr('position', point);
+	                    data.setItemGraphicEl(newIdx, symbolEl);
+	                    group.add(symbolEl);
+	                }
+	            })
+	            .update(function (newIdx, oldIdx) {
+	                var symbolEl = oldData.getItemGraphicEl(oldIdx);
+	                var point = data.getItemLayout(newIdx);
+	                if (!symbolNeedsDraw(data, newIdx, isIgnore)) {
+	                    group.remove(symbolEl);
+	                    return;
+	                }
+	                if (!symbolEl) {
+	                    symbolEl = new SymbolCtor(data, newIdx);
+	                    symbolEl.attr('position', point);
+	                }
+	                else {
+	                    symbolEl.updateData(data, newIdx, seriesScope);
+	                    graphic.updateProps(symbolEl, {
+	                        position: point
+	                    }, seriesModel);
+	                }
+
+	                // Add back
+	                group.add(symbolEl);
+
+	                data.setItemGraphicEl(newIdx, symbolEl);
+	            })
+	            .remove(function (oldIdx) {
+	                var el = oldData.getItemGraphicEl(oldIdx);
+	                el && el.fadeOut(function () {
+	                    group.remove(el);
+	                });
+	            })
+	            .execute();
+
+	        this._data = data;
+	    };
+
+	    symbolDrawProto.updateLayout = function () {
+	        var data = this._data;
+	        if (data) {
+	            // Not use animation
+	            data.eachItemGraphicEl(function (el, idx) {
+	                var point = data.getItemLayout(idx);
+	                el.attr('position', point);
+	            });
+	        }
+	    };
+
+	    symbolDrawProto.remove = function (enableAnimation) {
+	        var group = this.group;
+	        var data = this._data;
+	        if (data) {
+	            if (enableAnimation) {
+	                data.eachItemGraphicEl(function (el) {
+	                    el.fadeOut(function () {
+	                        group.remove(el);
+	                    });
+	                });
+	            }
+	            else {
+	                group.removeAll();
+	            }
+	        }
+	    };
+
+	    module.exports = SymbolDraw;
+
+
+/***/ },
+/* 105 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @module echarts/chart/helper/Symbol
+	 */
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var symbolUtil = __webpack_require__(106);
+	    var graphic = __webpack_require__(43);
+	    var numberUtil = __webpack_require__(7);
+
+	    function normalizeSymbolSize(symbolSize) {
+	        if (!(symbolSize instanceof Array)) {
+	            symbolSize = [+symbolSize, +symbolSize];
+	        }
+	        return symbolSize;
+	    }
+
+	    /**
+	     * @constructor
+	     * @alias {module:echarts/chart/helper/Symbol}
+	     * @param {module:echarts/data/List} data
+	     * @param {number} idx
+	     * @extends {module:zrender/graphic/Group}
+	     */
+	    function Symbol(data, idx, seriesScope) {
+	        graphic.Group.call(this);
+
+	        this.updateData(data, idx, seriesScope);
+	    }
+
+	    var symbolProto = Symbol.prototype;
+
+	    function driftSymbol(dx, dy) {
+	        this.parent.drift(dx, dy);
+	    }
+
+	    symbolProto._createSymbol = function (symbolType, data, idx) {
+	        // Remove paths created before
+	        this.removeAll();
+
+	        var seriesModel = data.hostModel;
+	        var color = data.getItemVisual(idx, 'color');
+
+	        var symbolPath = symbolUtil.createSymbol(
+	            symbolType, -0.5, -0.5, 1, 1, color
+	        );
+
+	        symbolPath.attr({
+	            z2: 100,
+	            culling: true,
+	            scale: [0, 0]
+	        });
+	        // Rewrite drift method
+	        symbolPath.drift = driftSymbol;
+
+	        var size = normalizeSymbolSize(data.getItemVisual(idx, 'symbolSize'));
+
+	        graphic.initProps(symbolPath, {
+	            scale: size
+	        }, seriesModel, idx);
+
+	        this._symbolType = symbolType;
+
+	        this.add(symbolPath);
+	    };
+
+	    /**
+	     * Stop animation
+	     * @param {boolean} toLastFrame
+	     */
+	    symbolProto.stopSymbolAnimation = function (toLastFrame) {
+	        this.childAt(0).stopAnimation(toLastFrame);
+	    };
+
+	    /**
+	     * Get scale(aka, current symbol size).
+	     * Including the change caused by animation
+	     */
+	    symbolProto.getScale = function () {
+	        return this.childAt(0).scale;
+	    };
+
+	    /**
+	     * Highlight symbol
+	     */
+	    symbolProto.highlight = function () {
+	        this.childAt(0).trigger('emphasis');
+	    };
+
+	    /**
+	     * Downplay symbol
+	     */
+	    symbolProto.downplay = function () {
+	        this.childAt(0).trigger('normal');
+	    };
+
+	    /**
+	     * @param {number} zlevel
+	     * @param {number} z
+	     */
+	    symbolProto.setZ = function (zlevel, z) {
+	        var symbolPath = this.childAt(0);
+	        symbolPath.zlevel = zlevel;
+	        symbolPath.z = z;
+	    };
+
+	    symbolProto.setDraggable = function (draggable) {
+	        var symbolPath = this.childAt(0);
+	        symbolPath.draggable = draggable;
+	        symbolPath.cursor = draggable ? 'move' : 'pointer';
+	    };
+
+	    /**
+	     * Update symbol properties
+	     * @param  {module:echarts/data/List} data
+	     * @param  {number} idx
+	     */
+	    symbolProto.updateData = function (data, idx, seriesScope) {
+	        this.silent = false;
+
+	        var symbolType = data.getItemVisual(idx, 'symbol') || 'circle';
+	        var seriesModel = data.hostModel;
+	        var symbolSize = normalizeSymbolSize(data.getItemVisual(idx, 'symbolSize'));
+	        if (symbolType !== this._symbolType) {
+	            this._createSymbol(symbolType, data, idx);
+	        }
+	        else {
+	            var symbolPath = this.childAt(0);
+	            graphic.updateProps(symbolPath, {
+	                scale: symbolSize
+	            }, seriesModel, idx);
+	        }
+	        this._updateCommon(data, idx, symbolSize, seriesScope);
+
+	        this._seriesModel = seriesModel;
+	    };
+
+	    // Update common properties
+	    var normalStyleAccessPath = ['itemStyle', 'normal'];
+	    var emphasisStyleAccessPath = ['itemStyle', 'emphasis'];
+	    var normalLabelAccessPath = ['label', 'normal'];
+	    var emphasisLabelAccessPath = ['label', 'emphasis'];
+
+	    symbolProto._updateCommon = function (data, idx, symbolSize, seriesScope) {
+	        var symbolPath = this.childAt(0);
+	        var seriesModel = data.hostModel;
+	        var color = data.getItemVisual(idx, 'color');
+
+	        // Reset style
+	        if (symbolPath.type !== 'image') {
+	            symbolPath.useStyle({
+	                strokeNoScale: true
+	            });
+	        }
+
+	        seriesScope = seriesScope || null;
+
+	        var itemStyle = seriesScope && seriesScope.itemStyle;
+	        var hoverItemStyle = seriesScope && seriesScope.hoverItemStyle;
+	        var symbolRotate = seriesScope && seriesScope.symbolRotate;
+	        var symbolOffset = seriesScope && seriesScope.symbolOffset;
+	        var labelModel = seriesScope && seriesScope.labelModel;
+	        var hoverLabelModel = seriesScope && seriesScope.hoverLabelModel;
+	        var hoverAnimation = seriesScope && seriesScope.hoverAnimation;
+
+	        if (!seriesScope || data.hasItemOption) {
+	            var itemModel = data.getItemModel(idx);
+
+	            // Color must be excluded.
+	            // Because symbol provide setColor individually to set fill and stroke
+	            itemStyle = itemModel.getModel(normalStyleAccessPath).getItemStyle(['color']);
+	            hoverItemStyle = itemModel.getModel(emphasisStyleAccessPath).getItemStyle();
+
+	            symbolRotate = itemModel.getShallow('symbolRotate');
+	            symbolOffset = itemModel.getShallow('symbolOffset');
+
+	            labelModel = itemModel.getModel(normalLabelAccessPath);
+	            hoverLabelModel = itemModel.getModel(emphasisLabelAccessPath);
+	            hoverAnimation = itemModel.getShallow('hoverAnimation');
+	        }
+	        else {
+	            hoverItemStyle = zrUtil.extend({}, hoverItemStyle);
+	        }
+
+	        var elStyle = symbolPath.style;
+
+	        symbolPath.rotation = (symbolRotate || 0) * Math.PI / 180 || 0;
+
+	        if (symbolOffset) {
+	            symbolPath.attr('position', [
+	                numberUtil.parsePercent(symbolOffset[0], symbolSize[0]),
+	                numberUtil.parsePercent(symbolOffset[1], symbolSize[1])
+	            ]);
+	        }
+
+	        // PENDING setColor before setStyle!!!
+	        symbolPath.setColor(color);
+
+	        symbolPath.setStyle(itemStyle);
+
+	        var opacity = data.getItemVisual(idx, 'opacity');
+	        if (opacity != null) {
+	            elStyle.opacity = opacity;
+	        }
+
+	        // Get last value dim
+	        var dimensions = data.dimensions.slice();
+	        var valueDim;
+	        var dataType;
+	        while (dimensions.length && (
+	            valueDim = dimensions.pop(),
+	            dataType = data.getDimensionInfo(valueDim).type,
+	            dataType === 'ordinal' || dataType === 'time'
+	        )) {} // jshint ignore:line
+
+	        if (valueDim != null && labelModel.getShallow('show')) {
+	            graphic.setText(elStyle, labelModel, color);
+	            elStyle.text = zrUtil.retrieve(
+	                seriesModel.getFormattedLabel(idx, 'normal'),
+	                data.get(valueDim, idx)
+	            );
+	        }
+	        else {
+	            elStyle.text = '';
+	        }
+
+	        if (valueDim != null && hoverLabelModel.getShallow('show')) {
+	            graphic.setText(hoverItemStyle, hoverLabelModel, color);
+	            hoverItemStyle.text = zrUtil.retrieve(
+	                seriesModel.getFormattedLabel(idx, 'emphasis'),
+	                data.get(valueDim, idx)
+	            );
+	        }
+	        else {
+	            hoverItemStyle.text = '';
+	        }
+
+	        var size = normalizeSymbolSize(data.getItemVisual(idx, 'symbolSize'));
+
+	        symbolPath.off('mouseover')
+	            .off('mouseout')
+	            .off('emphasis')
+	            .off('normal');
+
+	        graphic.setHoverStyle(symbolPath, hoverItemStyle);
+
+	        if (hoverAnimation && seriesModel.ifEnableAnimation()) {
+	            var onEmphasis = function() {
+	                var ratio = size[1] / size[0];
+	                this.animateTo({
+	                    scale: [
+	                        Math.max(size[0] * 1.1, size[0] + 3),
+	                        Math.max(size[1] * 1.1, size[1] + 3 * ratio)
+	                    ]
+	                }, 400, 'elasticOut');
+	            };
+	            var onNormal = function() {
+	                this.animateTo({
+	                    scale: size
+	                }, 400, 'elasticOut');
+	            };
+	            symbolPath.on('mouseover', onEmphasis)
+	                .on('mouseout', onNormal)
+	                .on('emphasis', onEmphasis)
+	                .on('normal', onNormal);
+	        }
+	    };
+
+	    symbolProto.fadeOut = function (cb) {
+	        var symbolPath = this.childAt(0);
+	        // Avoid mistaken hover when fading out
+	        this.silent = true;
+	        // Not show text when animating
+	        symbolPath.style.text = '';
+	        graphic.updateProps(symbolPath, {
+	            scale: [0, 0]
+	        }, this._seriesModel, this.dataIndex, cb);
+	    };
+
+	    zrUtil.inherits(Symbol, graphic.Group);
+
+	    module.exports = Symbol;
+
+
+/***/ },
+/* 106 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+	// Symbol factory
+
+
+	    var graphic = __webpack_require__(43);
+	    var BoundingRect = __webpack_require__(9);
+
+	    /**
+	     * Triangle shape
+	     * @inner
+	     */
+	    var Triangle = graphic.extendShape({
+	        type: 'triangle',
+	        shape: {
+	            cx: 0,
+	            cy: 0,
+	            width: 0,
+	            height: 0
+	        },
+	        buildPath: function (path, shape) {
+	            var cx = shape.cx;
+	            var cy = shape.cy;
+	            var width = shape.width / 2;
+	            var height = shape.height / 2;
+	            path.moveTo(cx, cy - height);
+	            path.lineTo(cx + width, cy + height);
+	            path.lineTo(cx - width, cy + height);
+	            path.closePath();
+	        }
+	    });
+	    /**
+	     * Diamond shape
+	     * @inner
+	     */
+	    var Diamond = graphic.extendShape({
+	        type: 'diamond',
+	        shape: {
+	            cx: 0,
+	            cy: 0,
+	            width: 0,
+	            height: 0
+	        },
+	        buildPath: function (path, shape) {
+	            var cx = shape.cx;
+	            var cy = shape.cy;
+	            var width = shape.width / 2;
+	            var height = shape.height / 2;
+	            path.moveTo(cx, cy - height);
+	            path.lineTo(cx + width, cy);
+	            path.lineTo(cx, cy + height);
+	            path.lineTo(cx - width, cy);
+	            path.closePath();
+	        }
+	    });
+
+	    /**
+	     * Pin shape
+	     * @inner
+	     */
+	    var Pin = graphic.extendShape({
+	        type: 'pin',
+	        shape: {
+	            // x, y on the cusp
+	            x: 0,
+	            y: 0,
+	            width: 0,
+	            height: 0
+	        },
+
+	        buildPath: function (path, shape) {
+	            var x = shape.x;
+	            var y = shape.y;
+	            var w = shape.width / 5 * 3;
+	            // Height must be larger than width
+	            var h = Math.max(w, shape.height);
+	            var r = w / 2;
+
+	            // Dist on y with tangent point and circle center
+	            var dy = r * r / (h - r);
+	            var cy = y - h + r + dy;
+	            var angle = Math.asin(dy / r);
+	            // Dist on x with tangent point and circle center
+	            var dx = Math.cos(angle) * r;
+
+	            var tanX = Math.sin(angle);
+	            var tanY = Math.cos(angle);
+
+	            path.arc(
+	                x, cy, r,
+	                Math.PI - angle,
+	                Math.PI * 2 + angle
+	            );
+
+	            var cpLen = r * 0.6;
+	            var cpLen2 = r * 0.7;
+	            path.bezierCurveTo(
+	                x + dx - tanX * cpLen, cy + dy + tanY * cpLen,
+	                x, y - cpLen2,
+	                x, y
+	            );
+	            path.bezierCurveTo(
+	                x, y - cpLen2,
+	                x - dx + tanX * cpLen, cy + dy + tanY * cpLen,
+	                x - dx, cy + dy
+	            );
+	            path.closePath();
+	        }
+	    });
+
+	    /**
+	     * Arrow shape
+	     * @inner
+	     */
+	    var Arrow = graphic.extendShape({
+
+	        type: 'arrow',
+
+	        shape: {
+	            x: 0,
+	            y: 0,
+	            width: 0,
+	            height: 0
+	        },
+
+	        buildPath: function (ctx, shape) {
+	            var height = shape.height;
+	            var width = shape.width;
+	            var x = shape.x;
+	            var y = shape.y;
+	            var dx = width / 3 * 2;
+	            ctx.moveTo(x, y);
+	            ctx.lineTo(x + dx, y + height);
+	            ctx.lineTo(x, y + height / 4 * 3);
+	            ctx.lineTo(x - dx, y + height);
+	            ctx.lineTo(x, y);
+	            ctx.closePath();
+	        }
+	    });
+
+	    /**
+	     * Map of path contructors
+	     * @type {Object.<string, module:zrender/graphic/Path>}
+	     */
+	    var symbolCtors = {
+	        line: graphic.Line,
+
+	        rect: graphic.Rect,
+
+	        roundRect: graphic.Rect,
+
+	        square: graphic.Rect,
+
+	        circle: graphic.Circle,
+
+	        diamond: Diamond,
+
+	        pin: Pin,
+
+	        arrow: Arrow,
+
+	        triangle: Triangle
+	    };
+
+	    var symbolShapeMakers = {
+
+	        line: function (x, y, w, h, shape) {
+	            // FIXME
+	            shape.x1 = x;
+	            shape.y1 = y + h / 2;
+	            shape.x2 = x + w;
+	            shape.y2 = y + h / 2;
+	        },
+
+	        rect: function (x, y, w, h, shape) {
+	            shape.x = x;
+	            shape.y = y;
+	            shape.width = w;
+	            shape.height = h;
+	        },
+
+	        roundRect: function (x, y, w, h, shape) {
+	            shape.x = x;
+	            shape.y = y;
+	            shape.width = w;
+	            shape.height = h;
+	            shape.r = Math.min(w, h) / 4;
+	        },
+
+	        square: function (x, y, w, h, shape) {
+	            var size = Math.min(w, h);
+	            shape.x = x;
+	            shape.y = y;
+	            shape.width = size;
+	            shape.height = size;
+	        },
+
+	        circle: function (x, y, w, h, shape) {
+	            // Put circle in the center of square
+	            shape.cx = x + w / 2;
+	            shape.cy = y + h / 2;
+	            shape.r = Math.min(w, h) / 2;
+	        },
+
+	        diamond: function (x, y, w, h, shape) {
+	            shape.cx = x + w / 2;
+	            shape.cy = y + h / 2;
+	            shape.width = w;
+	            shape.height = h;
+	        },
+
+	        pin: function (x, y, w, h, shape) {
+	            shape.x = x + w / 2;
+	            shape.y = y + h / 2;
+	            shape.width = w;
+	            shape.height = h;
+	        },
+
+	        arrow: function (x, y, w, h, shape) {
+	            shape.x = x + w / 2;
+	            shape.y = y + h / 2;
+	            shape.width = w;
+	            shape.height = h;
+	        },
+
+	        triangle: function (x, y, w, h, shape) {
+	            shape.cx = x + w / 2;
+	            shape.cy = y + h / 2;
+	            shape.width = w;
+	            shape.height = h;
+	        }
+	    };
+
+	    var symbolBuildProxies = {};
+	    for (var name in symbolCtors) {
+	        symbolBuildProxies[name] = new symbolCtors[name]();
+	    }
+
+	    var Symbol = graphic.extendShape({
+
+	        type: 'symbol',
+
+	        shape: {
+	            symbolType: '',
+	            x: 0,
+	            y: 0,
+	            width: 0,
+	            height: 0
+	        },
+
+	        beforeBrush: function () {
+	            var style = this.style;
+	            var shape = this.shape;
+	            // FIXME
+	            if (shape.symbolType === 'pin' && style.textPosition === 'inside') {
+	                style.textPosition = ['50%', '40%'];
+	                style.textAlign = 'center';
+	                style.textVerticalAlign = 'middle';
+	            }
+	        },
+
+	        buildPath: function (ctx, shape, inBundle) {
+	            var symbolType = shape.symbolType;
+	            var proxySymbol = symbolBuildProxies[symbolType];
+	            if (shape.symbolType !== 'none') {
+	                if (!proxySymbol) {
+	                    // Default rect
+	                    symbolType = 'rect';
+	                    proxySymbol = symbolBuildProxies[symbolType];
+	                }
+	                symbolShapeMakers[symbolType](
+	                    shape.x, shape.y, shape.width, shape.height, proxySymbol.shape
+	                );
+	                proxySymbol.buildPath(ctx, proxySymbol.shape, inBundle);
+	            }
+	        }
+	    });
+
+	    // Provide setColor helper method to avoid determine if set the fill or stroke outside
+	    var symbolPathSetColor = function (color) {
+	        if (this.type !== 'image') {
+	            var symbolStyle = this.style;
+	            var symbolShape = this.shape;
+	            if (symbolShape && symbolShape.symbolType === 'line') {
+	                symbolStyle.stroke = color;
+	            }
+	            else if (this.__isEmptyBrush) {
+	                symbolStyle.stroke = color;
+	                symbolStyle.fill = '#fff';
+	            }
+	            else {
+	                // FIXME 判断图形默认是填充还是描边，使用 onlyStroke ?
+	                symbolStyle.fill && (symbolStyle.fill = color);
+	                symbolStyle.stroke && (symbolStyle.stroke = color);
+	            }
+	            this.dirty(false);
+	        }
+	    };
+
+	    var symbolUtil = {
+	        /**
+	         * Create a symbol element with given symbol configuration: shape, x, y, width, height, color
+	         * @param {string} symbolType
+	         * @param {number} x
+	         * @param {number} y
+	         * @param {number} w
+	         * @param {number} h
+	         * @param {string} color
+	         */
+	        createSymbol: function (symbolType, x, y, w, h, color) {
+	            var isEmpty = symbolType.indexOf('empty') === 0;
+	            if (isEmpty) {
+	                symbolType = symbolType.substr(5, 1).toLowerCase() + symbolType.substr(6);
+	            }
+	            var symbolPath;
+
+	            if (symbolType.indexOf('image://') === 0) {
+	                symbolPath = new graphic.Image({
+	                    style: {
+	                        image: symbolType.slice(8),
+	                        x: x,
+	                        y: y,
+	                        width: w,
+	                        height: h
+	                    }
+	                });
+	            }
+	            else if (symbolType.indexOf('path://') === 0) {
+	                symbolPath = graphic.makePath(symbolType.slice(7), {}, new BoundingRect(x, y, w, h));
+	            }
+	            else {
+	                symbolPath = new Symbol({
+	                    shape: {
+	                        symbolType: symbolType,
+	                        x: x,
+	                        y: y,
+	                        width: w,
+	                        height: h
+	                    }
+	                });
+	            }
+
+	            symbolPath.__isEmptyBrush = isEmpty;
+
+	            symbolPath.setColor = symbolPathSetColor;
+
+	            symbolPath.setColor(color);
+
+	            return symbolPath;
+	        }
+	    };
+
+	    module.exports = symbolUtil;
+
+
+/***/ },
+/* 107 */
+/***/ function(module, exports) {
+
+	
+
+	    // var arrayDiff = require('zrender/lib/core/arrayDiff');
+	    // 'zrender/core/arrayDiff' has been used before, but it did
+	    // not do well in performance when roam with fixed dataZoom window.
+
+	    function sign(val) {
+	        return val >= 0 ? 1 : -1;
+	    }
+
+	    function getStackedOnPoint(coordSys, data, idx) {
+	        var baseAxis = coordSys.getBaseAxis();
+	        var valueAxis = coordSys.getOtherAxis(baseAxis);
+	        var valueStart = baseAxis.onZero
+	            ? 0 : valueAxis.scale.getExtent()[0];
+
+	        var valueDim = valueAxis.dim;
+	        var baseDataOffset = valueDim === 'x' || valueDim === 'radius' ? 1 : 0;
+
+	        var stackedOnSameSign;
+	        var stackedOn = data.stackedOn;
+	        var val = data.get(valueDim, idx);
+	        // Find first stacked value with same sign
+	        while (stackedOn &&
+	            sign(stackedOn.get(valueDim, idx)) === sign(val)
+	        ) {
+	            stackedOnSameSign = stackedOn;
+	            break;
+	        }
+	        var stackedData = [];
+	        stackedData[baseDataOffset] = data.get(baseAxis.dim, idx);
+	        stackedData[1 - baseDataOffset] = stackedOnSameSign
+	            ? stackedOnSameSign.get(valueDim, idx, true) : valueStart;
+
+	        return coordSys.dataToPoint(stackedData);
+	    }
+
+	    // function convertToIntId(newIdList, oldIdList) {
+	    //     // Generate int id instead of string id.
+	    //     // Compare string maybe slow in score function of arrDiff
+
+	    //     // Assume id in idList are all unique
+	    //     var idIndicesMap = {};
+	    //     var idx = 0;
+	    //     for (var i = 0; i < newIdList.length; i++) {
+	    //         idIndicesMap[newIdList[i]] = idx;
+	    //         newIdList[i] = idx++;
+	    //     }
+	    //     for (var i = 0; i < oldIdList.length; i++) {
+	    //         var oldId = oldIdList[i];
+	    //         // Same with newIdList
+	    //         if (idIndicesMap[oldId]) {
+	    //             oldIdList[i] = idIndicesMap[oldId];
+	    //         }
+	    //         else {
+	    //             oldIdList[i] = idx++;
+	    //         }
+	    //     }
+	    // }
+
+	    function diffData(oldData, newData) {
+	        var diffResult = [];
+
+	        newData.diff(oldData)
+	            .add(function (idx) {
+	                diffResult.push({cmd: '+', idx: idx});
+	            })
+	            .update(function (newIdx, oldIdx) {
+	                diffResult.push({cmd: '=', idx: oldIdx, idx1: newIdx});
+	            })
+	            .remove(function (idx) {
+	                diffResult.push({cmd: '-', idx: idx});
+	            })
+	            .execute();
+
+	        return diffResult;
+	    }
+
+	    module.exports = function (
+	        oldData, newData,
+	        oldStackedOnPoints, newStackedOnPoints,
+	        oldCoordSys, newCoordSys
+	    ) {
+	        var diff = diffData(oldData, newData);
+
+	        // var newIdList = newData.mapArray(newData.getId);
+	        // var oldIdList = oldData.mapArray(oldData.getId);
+
+	        // convertToIntId(newIdList, oldIdList);
+
+	        // // FIXME One data ?
+	        // diff = arrayDiff(oldIdList, newIdList);
+
+	        var currPoints = [];
+	        var nextPoints = [];
+	        // Points for stacking base line
+	        var currStackedPoints = [];
+	        var nextStackedPoints = [];
+
+	        var status = [];
+	        var sortedIndices = [];
+	        var rawIndices = [];
+	        var dims = newCoordSys.dimensions;
+	        for (var i = 0; i < diff.length; i++) {
+	            var diffItem = diff[i];
+	            var pointAdded = true;
+
+	            // FIXME, animation is not so perfect when dataZoom window moves fast
+	            // Which is in case remvoing or add more than one data in the tail or head
+	            switch (diffItem.cmd) {
+	                case '=':
+	                    var currentPt = oldData.getItemLayout(diffItem.idx);
+	                    var nextPt = newData.getItemLayout(diffItem.idx1);
+	                    // If previous data is NaN, use next point directly
+	                    if (isNaN(currentPt[0]) || isNaN(currentPt[1])) {
+	                        currentPt = nextPt.slice();
+	                    }
+	                    currPoints.push(currentPt);
+	                    nextPoints.push(nextPt);
+
+	                    currStackedPoints.push(oldStackedOnPoints[diffItem.idx]);
+	                    nextStackedPoints.push(newStackedOnPoints[diffItem.idx1]);
+
+	                    rawIndices.push(newData.getRawIndex(diffItem.idx1));
+	                    break;
+	                case '+':
+	                    var idx = diffItem.idx;
+	                    currPoints.push(
+	                        oldCoordSys.dataToPoint([
+	                            newData.get(dims[0], idx, true), newData.get(dims[1], idx, true)
+	                        ])
+	                    );
+
+	                    nextPoints.push(newData.getItemLayout(idx).slice());
+
+	                    currStackedPoints.push(
+	                        getStackedOnPoint(oldCoordSys, newData, idx)
+	                    );
+	                    nextStackedPoints.push(newStackedOnPoints[idx]);
+
+	                    rawIndices.push(newData.getRawIndex(idx));
+	                    break;
+	                case '-':
+	                    var idx = diffItem.idx;
+	                    var rawIndex = oldData.getRawIndex(idx);
+	                    // Data is replaced. In the case of dynamic data queue
+	                    // FIXME FIXME FIXME
+	                    if (rawIndex !== idx) {
+	                        currPoints.push(oldData.getItemLayout(idx));
+	                        nextPoints.push(newCoordSys.dataToPoint([
+	                            oldData.get(dims[0], idx, true), oldData.get(dims[1], idx, true)
+	                        ]));
+
+	                        currStackedPoints.push(oldStackedOnPoints[idx]);
+	                        nextStackedPoints.push(
+	                            getStackedOnPoint(
+	                                newCoordSys, oldData, idx
+	                            )
+	                        );
+
+	                        rawIndices.push(rawIndex);
+	                    }
+	                    else {
+	                        pointAdded = false;
+	                    }
+	            }
+
+	            // Original indices
+	            if (pointAdded) {
+	                status.push(diffItem);
+	                sortedIndices.push(sortedIndices.length);
+	            }
+	        }
+
+	        // Diff result may be crossed if all items are changed
+	        // Sort by data index
+	        sortedIndices.sort(function (a, b) {
+	            return rawIndices[a] - rawIndices[b];
+	        });
+
+	        var sortedCurrPoints = [];
+	        var sortedNextPoints = [];
+
+	        var sortedCurrStackedPoints = [];
+	        var sortedNextStackedPoints = [];
+
+	        var sortedStatus = [];
+	        for (var i = 0; i < sortedIndices.length; i++) {
+	            var idx = sortedIndices[i];
+	            sortedCurrPoints[i] = currPoints[idx];
+	            sortedNextPoints[i] = nextPoints[idx];
+
+	            sortedCurrStackedPoints[i] = currStackedPoints[idx];
+	            sortedNextStackedPoints[i] = nextStackedPoints[idx];
+
+	            sortedStatus[i] = status[idx];
+	        }
+
+	        return {
+	            current: sortedCurrPoints,
+	            next: sortedNextPoints,
+
+	            stackedOnCurrent: sortedCurrStackedPoints,
+	            stackedOnNext: sortedNextStackedPoints,
+
+	            status: sortedStatus
+	        };
+	    };
+
+
+/***/ },
+/* 108 */
+/***/ function(module, exports, __webpack_require__) {
+
+	// Poly path support NaN point
+
+
+	    var Path = __webpack_require__(45);
+	    var vec2 = __webpack_require__(10);
+
+	    var vec2Min = vec2.min;
+	    var vec2Max = vec2.max;
+
+	    var scaleAndAdd = vec2.scaleAndAdd;
+	    var v2Copy = vec2.copy;
+
+	    // Temporary variable
+	    var v = [];
+	    var cp0 = [];
+	    var cp1 = [];
+
+	    function isPointNull(p) {
+	        return isNaN(p[0]) || isNaN(p[1]);
+	    }
+
+	    function drawSegment(
+	        ctx, points, start, segLen, allLen,
+	        dir, smoothMin, smoothMax, smooth, smoothMonotone, connectNulls
+	    ) {
+	        var prevIdx = 0;
+	        var idx = start;
+	        for (var k = 0; k < segLen; k++) {
+	            var p = points[idx];
+	            if (idx >= allLen || idx < 0) {
+	                break;
+	            }
+	            if (isPointNull(p)) {
+	                if (connectNulls) {
+	                    idx += dir;
+	                    continue;
+	                }
+	                break;
+	            }
+
+	            if (idx === start) {
+	                ctx[dir > 0 ? 'moveTo' : 'lineTo'](p[0], p[1]);
+	                v2Copy(cp0, p);
+	            }
+	            else {
+	                if (smooth > 0) {
+	                    var nextIdx = idx + dir;
+	                    var nextP = points[nextIdx];
+	                    if (connectNulls) {
+	                        // Find next point not null
+	                        while (nextP && isPointNull(points[nextIdx])) {
+	                            nextIdx += dir;
+	                            nextP = points[nextIdx];
+	                        }
+	                    }
+
+	                    var ratioNextSeg = 0.5;
+	                    var prevP = points[prevIdx];
+	                    var nextP = points[nextIdx];
+	                    // Last point
+	                    if (!nextP || isPointNull(nextP)) {
+	                        v2Copy(cp1, p);
+	                    }
+	                    else {
+	                        // If next data is null in not connect case
+	                        if (isPointNull(nextP) && !connectNulls) {
+	                            nextP = p;
+	                        }
+
+	                        vec2.sub(v, nextP, prevP);
+
+	                        var lenPrevSeg;
+	                        var lenNextSeg;
+	                        if (smoothMonotone === 'x' || smoothMonotone === 'y') {
+	                            var dim = smoothMonotone === 'x' ? 0 : 1;
+	                            lenPrevSeg = Math.abs(p[dim] - prevP[dim]);
+	                            lenNextSeg = Math.abs(p[dim] - nextP[dim]);
+	                        }
+	                        else {
+	                            lenPrevSeg = vec2.dist(p, prevP);
+	                            lenNextSeg = vec2.dist(p, nextP);
+	                        }
+
+	                        // Use ratio of seg length
+	                        ratioNextSeg = lenNextSeg / (lenNextSeg + lenPrevSeg);
+
+	                        scaleAndAdd(cp1, p, v, -smooth * (1 - ratioNextSeg));
+	                    }
+	                    // Smooth constraint
+	                    vec2Min(cp0, cp0, smoothMax);
+	                    vec2Max(cp0, cp0, smoothMin);
+	                    vec2Min(cp1, cp1, smoothMax);
+	                    vec2Max(cp1, cp1, smoothMin);
+
+	                    ctx.bezierCurveTo(
+	                        cp0[0], cp0[1],
+	                        cp1[0], cp1[1],
+	                        p[0], p[1]
+	                    );
+	                    // cp0 of next segment
+	                    scaleAndAdd(cp0, p, v, smooth * ratioNextSeg);
+	                }
+	                else {
+	                    ctx.lineTo(p[0], p[1]);
+	                }
+	            }
+
+	            prevIdx = idx;
+	            idx += dir;
+	        }
+
+	        return k;
+	    }
+
+	    function getBoundingBox(points, smoothConstraint) {
+	        var ptMin = [Infinity, Infinity];
+	        var ptMax = [-Infinity, -Infinity];
+	        if (smoothConstraint) {
+	            for (var i = 0; i < points.length; i++) {
+	                var pt = points[i];
+	                if (pt[0] < ptMin[0]) { ptMin[0] = pt[0]; }
+	                if (pt[1] < ptMin[1]) { ptMin[1] = pt[1]; }
+	                if (pt[0] > ptMax[0]) { ptMax[0] = pt[0]; }
+	                if (pt[1] > ptMax[1]) { ptMax[1] = pt[1]; }
+	            }
+	        }
+	        return {
+	            min: smoothConstraint ? ptMin : ptMax,
+	            max: smoothConstraint ? ptMax : ptMin
+	        };
+	    }
+
+	    module.exports = {
+
+	        Polyline: Path.extend({
+
+	            type: 'ec-polyline',
+
+	            shape: {
+	                points: [],
+
+	                smooth: 0,
+
+	                smoothConstraint: true,
+
+	                smoothMonotone: null,
+
+	                connectNulls: false
+	            },
+
+	            style: {
+	                fill: null,
+
+	                stroke: '#000'
+	            },
+
+	            buildPath: function (ctx, shape) {
+	                var points = shape.points;
+
+	                var i = 0;
+	                var len = points.length;
+
+	                var result = getBoundingBox(points, shape.smoothConstraint);
+
+	                if (shape.connectNulls) {
+	                    // Must remove first and last null values avoid draw error in polygon
+	                    for (; len > 0; len--) {
+	                        if (!isPointNull(points[len - 1])) {
+	                            break;
+	                        }
+	                    }
+	                    for (; i < len; i++) {
+	                        if (!isPointNull(points[i])) {
+	                            break;
+	                        }
+	                    }
+	                }
+	                while (i < len) {
+	                    i += drawSegment(
+	                        ctx, points, i, len, len,
+	                        1, result.min, result.max, shape.smooth,
+	                        shape.smoothMonotone, shape.connectNulls
+	                    ) + 1;
+	                }
+	            }
+	        }),
+
+	        Polygon: Path.extend({
+
+	            type: 'ec-polygon',
+
+	            shape: {
+	                points: [],
+
+	                // Offset between stacked base points and points
+	                stackedOnPoints: [],
+
+	                smooth: 0,
+
+	                stackedOnSmooth: 0,
+
+	                smoothConstraint: true,
+
+	                smoothMonotone: null,
+
+	                connectNulls: false
+	            },
+
+	            buildPath: function (ctx, shape) {
+	                var points = shape.points;
+	                var stackedOnPoints = shape.stackedOnPoints;
+
+	                var i = 0;
+	                var len = points.length;
+	                var smoothMonotone = shape.smoothMonotone;
+	                var bbox = getBoundingBox(points, shape.smoothConstraint);
+	                var stackedOnBBox = getBoundingBox(stackedOnPoints, shape.smoothConstraint);
+
+	                if (shape.connectNulls) {
+	                    // Must remove first and last null values avoid draw error in polygon
+	                    for (; len > 0; len--) {
+	                        if (!isPointNull(points[len - 1])) {
+	                            break;
+	                        }
+	                    }
+	                    for (; i < len; i++) {
+	                        if (!isPointNull(points[i])) {
+	                            break;
+	                        }
+	                    }
+	                }
+	                while (i < len) {
+	                    var k = drawSegment(
+	                        ctx, points, i, len, len,
+	                        1, bbox.min, bbox.max, shape.smooth,
+	                        smoothMonotone, shape.connectNulls
+	                    );
+	                    drawSegment(
+	                        ctx, stackedOnPoints, i + k - 1, k, len,
+	                        -1, stackedOnBBox.min, stackedOnBBox.max, shape.stackedOnSmooth,
+	                        smoothMonotone, shape.connectNulls
+	                    );
+	                    i += k + 1;
+
+	                    ctx.closePath();
+	                }
+	            }
+	        })
+	    };
+
+
+/***/ },
+/* 109 */
+/***/ function(module, exports) {
+
+	
+
+	    module.exports = function (seriesType, defaultSymbolType, legendSymbol, ecModel, api) {
+
+	        // Encoding visual for all series include which is filtered for legend drawing
+	        ecModel.eachRawSeriesByType(seriesType, function (seriesModel) {
+	            var data = seriesModel.getData();
+
+	            var symbolType = seriesModel.get('symbol') || defaultSymbolType;
+	            var symbolSize = seriesModel.get('symbolSize');
+
+	            data.setVisual({
+	                legendSymbol: legendSymbol || symbolType,
+	                symbol: symbolType,
+	                symbolSize: symbolSize
+	            });
+
+	            // Only visible series has each data be visual encoded
+	            if (!ecModel.isSeriesFiltered(seriesModel)) {
+	                if (typeof symbolSize === 'function') {
+	                    data.each(function (idx) {
+	                        var rawValue = seriesModel.getRawValue(idx);
+	                        // FIXME
+	                        var params = seriesModel.getDataParams(idx);
+	                        data.setItemVisual(idx, 'symbolSize', symbolSize(rawValue, params));
+	                    });
+	                }
+	                data.each(function (idx) {
+	                    var itemModel = data.getItemModel(idx);
+	                    var itemSymbolType = itemModel.getShallow('symbol', true);
+	                    var itemSymbolSize = itemModel.getShallow('symbolSize', true);
+	                    // If has item symbol
+	                    if (itemSymbolType != null) {
+	                        data.setItemVisual(idx, 'symbol', itemSymbolType);
+	                    }
+	                    if (itemSymbolSize != null) {
+	                        // PENDING Transform symbolSize ?
+	                        data.setItemVisual(idx, 'symbolSize', itemSymbolSize);
+	                    }
+	                });
+	            }
+	        });
+	    };
+
+
+/***/ },
+/* 110 */
+/***/ function(module, exports) {
+
+	
+
+	    module.exports = function (seriesType, ecModel) {
+	        ecModel.eachSeriesByType(seriesType, function (seriesModel) {
+	            var data = seriesModel.getData();
+	            var coordSys = seriesModel.coordinateSystem;
+
+	            if (coordSys) {
+	                var dims = coordSys.dimensions;
+
+	                if (coordSys.type === 'singleAxis') {
+	                    data.each(dims[0], function (x, idx) {
+	                        // Also {Array.<number>}, not undefined to avoid if...else... statement
+	                        data.setItemLayout(idx, isNaN(x) ? [NaN, NaN] : coordSys.dataToPoint(x));
+	                    });
+	                }
+	                else {
+	                    data.each(dims, function (x, y, idx) {
+	                        // Also {Array.<number>}, not undefined to avoid if...else... statement
+	                        data.setItemLayout(
+	                            idx, (isNaN(x) || isNaN(y)) ? [NaN, NaN] : coordSys.dataToPoint([x, y])
+	                        );
+	                    }, true);
+	                }
+	            }
+	        });
+	    };
+
+
+/***/ },
+/* 111 */
+/***/ function(module, exports) {
+
+	
+	    var samplers = {
+	        average: function (frame) {
+	            var sum = 0;
+	            var count = 0;
+	            for (var i = 0; i < frame.length; i++) {
+	                if (!isNaN(frame[i])) {
+	                    sum += frame[i];
+	                    count++;
+	                }
+	            }
+	            // Return NaN if count is 0
+	            return count === 0 ? NaN : sum / count;
+	        },
+	        sum: function (frame) {
+	            var sum = 0;
+	            for (var i = 0; i < frame.length; i++) {
+	                // Ignore NaN
+	                sum += frame[i] || 0;
+	            }
+	            return sum;
+	        },
+	        max: function (frame) {
+	            var max = -Infinity;
+	            for (var i = 0; i < frame.length; i++) {
+	                frame[i] > max && (max = frame[i]);
+	            }
+	            return max;
+	        },
+	        min: function (frame) {
+	            var min = Infinity;
+	            for (var i = 0; i < frame.length; i++) {
+	                frame[i] < min && (min = frame[i]);
+	            }
+	            return min;
+	        },
+	        // TODO
+	        // Median
+	        nearest: function (frame) {
+	            return frame[0];
+	        }
+	    };
+
+	    var indexSampler = function (frame, value) {
+	        return Math.round(frame.length / 2);
+	    };
+	    module.exports = function (seriesType, ecModel, api) {
+	        ecModel.eachSeriesByType(seriesType, function (seriesModel) {
+	            var data = seriesModel.getData();
+	            var sampling = seriesModel.get('sampling');
+	            var coordSys = seriesModel.coordinateSystem;
+	            // Only cartesian2d support down sampling
+	            if (coordSys.type === 'cartesian2d' && sampling) {
+	                var baseAxis = coordSys.getBaseAxis();
+	                var valueAxis = coordSys.getOtherAxis(baseAxis);
+	                var extent = baseAxis.getExtent();
+	                // Coordinste system has been resized
+	                var size = extent[1] - extent[0];
+	                var rate = Math.round(data.count() / size);
+	                if (rate > 1) {
+	                    var sampler;
+	                    if (typeof sampling === 'string') {
+	                        sampler = samplers[sampling];
+	                    }
+	                    else if (typeof sampling === 'function') {
+	                        sampler = sampling;
+	                    }
+	                    if (sampler) {
+	                        data = data.downSample(
+	                            valueAxis.dim, 1 / rate, sampler, indexSampler
+	                        );
+	                        seriesModel.setData(data);
+	                    }
+	                }
+	            }
+	        }, this);
+	    };
+
+
+/***/ },
+/* 112 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var graphic = __webpack_require__(43);
+	    var zrUtil = __webpack_require__(4);
+
+	    __webpack_require__(113);
+
+	    __webpack_require__(130);
+
+	    // Grid view
+	    __webpack_require__(1).extendComponentView({
+
+	        type: 'grid',
+
+	        render: function (gridModel, ecModel) {
+	            this.group.removeAll();
+	            if (gridModel.get('show')) {
+	                this.group.add(new graphic.Rect({
+	                    shape:gridModel.coordinateSystem.getRect(),
+	                    style: zrUtil.defaults({
+	                        fill: gridModel.get('backgroundColor')
+	                    }, gridModel.getItemStyle()),
+	                    silent: true
+	                }));
+	            }
+	        }
+	    });
+
+
+/***/ },
+/* 113 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * Grid is a region which contains at most 4 cartesian systems
+	 *
+	 * TODO Default cartesian
+	 */
+	var factory = exports;
+
+	    var layout = __webpack_require__(21);
+	    var axisHelper = __webpack_require__(114);
+
+	    var zrUtil = __webpack_require__(4);
+	    var Cartesian2D = __webpack_require__(120);
+	    var Axis2D = __webpack_require__(122);
+
+	    var each = zrUtil.each;
+
+	    var ifAxisCrossZero = axisHelper.ifAxisCrossZero;
+	    var niceScaleExtent = axisHelper.niceScaleExtent;
+
+	    // 依赖 GridModel, AxisModel 做预处理
+	    __webpack_require__(125);
+
+	    /**
+	     * Check if the axis is used in the specified grid
+	     * @inner
+	     */
+	    function isAxisUsedInTheGrid(axisModel, gridModel, ecModel) {
+	        return ecModel.getComponent('grid', axisModel.get('gridIndex')) === gridModel;
+	    }
+
+	    function getLabelUnionRect(axis) {
+	        var axisModel = axis.model;
+	        var labels = axisModel.getFormattedLabels();
+	        var rect;
+	        var step = 1;
+	        var labelCount = labels.length;
+	        if (labelCount > 40) {
+	            // Simple optimization for large amount of labels
+	            step = Math.ceil(labelCount / 40);
+	        }
+	        for (var i = 0; i < labelCount; i += step) {
+	            if (!axis.isLabelIgnored(i)) {
+	                var singleRect = axisModel.getTextRect(labels[i]);
+	                // FIXME consider label rotate
+	                rect ? rect.union(singleRect) : (rect = singleRect);
+	            }
+	        }
+	        return rect;
+	    }
+
+	    function Grid(gridModel, ecModel, api) {
+	        /**
+	         * @type {Object.<string, module:echarts/coord/cartesian/Cartesian2D>}
+	         * @private
+	         */
+	        this._coordsMap = {};
+
+	        /**
+	         * @type {Array.<module:echarts/coord/cartesian/Cartesian>}
+	         * @private
+	         */
+	        this._coordsList = [];
+
+	        /**
+	         * @type {Object.<string, module:echarts/coord/cartesian/Axis2D>}
+	         * @private
+	         */
+	        this._axesMap = {};
+
+	        /**
+	         * @type {Array.<module:echarts/coord/cartesian/Axis2D>}
+	         * @private
+	         */
+	        this._axesList = [];
+
+	        this._initCartesian(gridModel, ecModel, api);
+
+	        this._model = gridModel;
+	    }
+
+	    var gridProto = Grid.prototype;
+
+	    gridProto.type = 'grid';
+
+	    gridProto.getRect = function () {
+	        return this._rect;
+	    };
+
+	    gridProto.update = function (ecModel, api) {
+
+	        var axesMap = this._axesMap;
+
+	        this._updateScale(ecModel, this._model);
+
+	        function ifAxisCanNotOnZero(otherAxisDim) {
+	            var axes = axesMap[otherAxisDim];
+	            for (var idx in axes) {
+	                var axis = axes[idx];
+	                if (axis && (axis.type === 'category' || !ifAxisCrossZero(axis))) {
+	                    return true;
+	                }
+	            }
+	            return false;
+	        }
+
+	        each(axesMap.x, function (xAxis) {
+	            niceScaleExtent(xAxis, xAxis.model);
+	        });
+	        each(axesMap.y, function (yAxis) {
+	            niceScaleExtent(yAxis, yAxis.model);
+	        });
+	        // Fix configuration
+	        each(axesMap.x, function (xAxis) {
+	            // onZero can not be enabled in these two situations
+	            // 1. When any other axis is a category axis
+	            // 2. When any other axis not across 0 point
+	            if (ifAxisCanNotOnZero('y')) {
+	                xAxis.onZero = false;
+	            }
+	        });
+	        each(axesMap.y, function (yAxis) {
+	            if (ifAxisCanNotOnZero('x')) {
+	                yAxis.onZero = false;
+	            }
+	        });
+
+	        // Resize again if containLabel is enabled
+	        // FIXME It may cause getting wrong grid size in data processing stage
+	        this.resize(this._model, api);
+	    };
+
+	    /**
+	     * Resize the grid
+	     * @param {module:echarts/coord/cartesian/GridModel} gridModel
+	     * @param {module:echarts/ExtensionAPI} api
+	     */
+	    gridProto.resize = function (gridModel, api) {
+
+	        var gridRect = layout.getLayoutRect(
+	            gridModel.getBoxLayoutParams(), {
+	                width: api.getWidth(),
+	                height: api.getHeight()
+	            });
+
+	        this._rect = gridRect;
+
+	        var axesList = this._axesList;
+
+	        adjustAxes();
+
+	        // Minus label size
+	        if (gridModel.get('containLabel')) {
+	            each(axesList, function (axis) {
+	                if (!axis.model.get('axisLabel.inside')) {
+	                    var labelUnionRect = getLabelUnionRect(axis);
+	                    if (labelUnionRect) {
+	                        var dim = axis.isHorizontal() ? 'height' : 'width';
+	                        var margin = axis.model.get('axisLabel.margin');
+	                        gridRect[dim] -= labelUnionRect[dim] + margin;
+	                        if (axis.position === 'top') {
+	                            gridRect.y += labelUnionRect.height + margin;
+	                        }
+	                        else if (axis.position === 'left')  {
+	                            gridRect.x += labelUnionRect.width + margin;
+	                        }
+	                    }
+	                }
+	            });
+
+	            adjustAxes();
+	        }
+
+	        function adjustAxes() {
+	            each(axesList, function (axis) {
+	                var isHorizontal = axis.isHorizontal();
+	                var extent = isHorizontal ? [0, gridRect.width] : [0, gridRect.height];
+	                var idx = axis.inverse ? 1 : 0;
+	                axis.setExtent(extent[idx], extent[1 - idx]);
+	                updateAxisTransfrom(axis, isHorizontal ? gridRect.x : gridRect.y);
+	            });
+	        }
+	    };
+
+	    /**
+	     * @param {string} axisType
+	     * @param {ndumber} [axisIndex]
+	     */
+	    gridProto.getAxis = function (axisType, axisIndex) {
+	        var axesMapOnDim = this._axesMap[axisType];
+	        if (axesMapOnDim != null) {
+	            if (axisIndex == null) {
+	                // Find first axis
+	                for (var name in axesMapOnDim) {
+	                    return axesMapOnDim[name];
+	                }
+	            }
+	            return axesMapOnDim[axisIndex];
+	        }
+	    };
+
+	    gridProto.getCartesian = function (xAxisIndex, yAxisIndex) {
+	        if (xAxisIndex != null && yAxisIndex != null) {
+	            var key = 'x' + xAxisIndex + 'y' + yAxisIndex;
+	            return this._coordsMap[key];
+	        }
+	        else {
+	            // When only xAxisIndex or yAxisIndex given, find its first cartesian.
+	            for (var i = 0, coordList = this._coordsList; i < coordList.length; i++) {
+	                if (coordList[i].getAxis('x').index === xAxisIndex
+	                    || coordList[i].getAxis('y').index === yAxisIndex
+	                ) {
+	                    return coordList[i];
+	                }
+	            }
+	        }
+	    };
+
+	    /**
+	     * Initialize cartesian coordinate systems
+	     * @private
+	     */
+	    gridProto._initCartesian = function (gridModel, ecModel, api) {
+	        var axisPositionUsed = {
+	            left: false,
+	            right: false,
+	            top: false,
+	            bottom: false
+	        };
+
+	        var axesMap = {
+	            x: {},
+	            y: {}
+	        };
+	        var axesCount = {
+	            x: 0,
+	            y: 0
+	        };
+
+	        /// Create axis
+	        ecModel.eachComponent('xAxis', createAxisCreator('x'), this);
+	        ecModel.eachComponent('yAxis', createAxisCreator('y'), this);
+
+	        if (!axesCount.x || !axesCount.y) {
+	            // Roll back when there no either x or y axis
+	            this._axesMap = {};
+	            this._axesList = [];
+	            return;
+	        }
+
+	        this._axesMap = axesMap;
+
+	        /// Create cartesian2d
+	        each(axesMap.x, function (xAxis, xAxisIndex) {
+	            each(axesMap.y, function (yAxis, yAxisIndex) {
+	                var key = 'x' + xAxisIndex + 'y' + yAxisIndex;
+	                var cartesian = new Cartesian2D(key);
+
+	                cartesian.grid = this;
+
+	                this._coordsMap[key] = cartesian;
+	                this._coordsList.push(cartesian);
+
+	                cartesian.addAxis(xAxis);
+	                cartesian.addAxis(yAxis);
+	            }, this);
+	        }, this);
+
+	        function createAxisCreator(axisType) {
+	            return function (axisModel, idx) {
+	                if (!isAxisUsedInTheGrid(axisModel, gridModel, ecModel)) {
+	                    return;
+	                }
+
+	                var axisPosition = axisModel.get('position');
+	                if (axisType === 'x') {
+	                    // Fix position
+	                    if (axisPosition !== 'top' && axisPosition !== 'bottom') {
+	                        // Default bottom of X
+	                        axisPosition = 'bottom';
+	                        if (axisPositionUsed[axisPosition]) {
+	                            axisPosition = axisPosition === 'top' ? 'bottom' : 'top';
+	                        }
+	                    }
+	                }
+	                else {
+	                    // Fix position
+	                    if (axisPosition !== 'left' && axisPosition !== 'right') {
+	                        // Default left of Y
+	                        axisPosition = 'left';
+	                        if (axisPositionUsed[axisPosition]) {
+	                            axisPosition = axisPosition === 'left' ? 'right' : 'left';
+	                        }
+	                    }
+	                }
+	                axisPositionUsed[axisPosition] = true;
+
+	                var axis = new Axis2D(
+	                    axisType, axisHelper.createScaleByModel(axisModel),
+	                    [0, 0],
+	                    axisModel.get('type'),
+	                    axisPosition
+	                );
+
+	                var isCategory = axis.type === 'category';
+	                axis.onBand = isCategory && axisModel.get('boundaryGap');
+	                axis.inverse = axisModel.get('inverse');
+
+	                axis.onZero = axisModel.get('axisLine.onZero');
+
+	                // Inject axis into axisModel
+	                axisModel.axis = axis;
+
+	                // Inject axisModel into axis
+	                axis.model = axisModel;
+
+	                // Inject grid info axis
+	                axis.grid = this;
+
+	                // Index of axis, can be used as key
+	                axis.index = idx;
+
+	                this._axesList.push(axis);
+
+	                axesMap[axisType][idx] = axis;
+	                axesCount[axisType]++;
+	            };
+	        }
+	    };
+
+	    /**
+	     * Update cartesian properties from series
+	     * @param  {module:echarts/model/Option} option
+	     * @private
+	     */
+	    gridProto._updateScale = function (ecModel, gridModel) {
+	        // Reset scale
+	        zrUtil.each(this._axesList, function (axis) {
+	            axis.scale.setExtent(Infinity, -Infinity);
+	        });
+	        ecModel.eachSeries(function (seriesModel) {
+	            if (seriesModel.get('coordinateSystem') === 'cartesian2d') {
+	                var xAxisIndex = seriesModel.get('xAxisIndex');
+	                var yAxisIndex = seriesModel.get('yAxisIndex');
+
+	                var xAxisModel = ecModel.getComponent('xAxis', xAxisIndex);
+	                var yAxisModel = ecModel.getComponent('yAxis', yAxisIndex);
+
+	                if (!isAxisUsedInTheGrid(xAxisModel, gridModel, ecModel)
+	                    || !isAxisUsedInTheGrid(yAxisModel, gridModel, ecModel)
+	                 ) {
+	                    return;
+	                }
+
+	                var cartesian = this.getCartesian(xAxisIndex, yAxisIndex);
+	                var data = seriesModel.getData();
+	                var xAxis = cartesian.getAxis('x');
+	                var yAxis = cartesian.getAxis('y');
+
+	                if (data.type === 'list') {
+	                    unionExtent(data, xAxis, seriesModel);
+	                    unionExtent(data, yAxis, seriesModel);
+	                }
+	            }
+	        }, this);
+
+	        function unionExtent(data, axis, seriesModel) {
+	            each(seriesModel.coordDimToDataDim(axis.dim), function (dim) {
+	                axis.scale.unionExtent(data.getDataExtent(
+	                    dim, axis.scale.type !== 'ordinal'
+	                ));
+	            });
+	        }
+	    };
+
+	    /**
+	     * @inner
+	     */
+	    function updateAxisTransfrom(axis, coordBase) {
+	        var axisExtent = axis.getExtent();
+	        var axisExtentSum = axisExtent[0] + axisExtent[1];
+
+	        // Fast transform
+	        axis.toGlobalCoord = axis.dim === 'x'
+	            ? function (coord) {
+	                return coord + coordBase;
+	            }
+	            : function (coord) {
+	                return axisExtentSum - coord + coordBase;
+	            };
+	        axis.toLocalCoord = axis.dim === 'x'
+	            ? function (coord) {
+	                return coord - coordBase;
+	            }
+	            : function (coord) {
+	                return axisExtentSum - coord + coordBase;
+	            };
+	    }
+
+	    Grid.create = function (ecModel, api) {
+	        var grids = [];
+	        ecModel.eachComponent('grid', function (gridModel, idx) {
+	            var grid = new Grid(gridModel, ecModel, api);
+	            grid.name = 'grid_' + idx;
+	            grid.resize(gridModel, api);
+
+	            gridModel.coordinateSystem = grid;
+
+	            grids.push(grid);
+	        });
+
+	        // Inject the coordinateSystems into seriesModel
+	        ecModel.eachSeries(function (seriesModel) {
+	            if (seriesModel.get('coordinateSystem') !== 'cartesian2d') {
+	                return;
+	            }
+	            var xAxisIndex = seriesModel.get('xAxisIndex');
+	            var yAxisIndex = seriesModel.get('yAxisIndex');
+	            var xAxisModel = ecModel.getComponent('xAxis', xAxisIndex);
+
+	            if (true) {
+	                var yAxisModel = ecModel.getComponent('yAxis', yAxisIndex);
+	                if (xAxisModel.get('gridIndex') !== yAxisModel.get('gridIndex')) {
+	                    throw new Error('xAxis and yAxis must use the same grid');
+	                }
+	            }
+	            var grid = grids[xAxisModel.get('gridIndex')];
+	            seriesModel.coordinateSystem = grid.getCartesian(xAxisIndex, yAxisIndex);
+	        });
+
+	        return grids;
+	    };
+
+	    // For deciding which dimensions to use when creating list data
+	    Grid.dimensions = Cartesian2D.prototype.dimensions;
+
+	    __webpack_require__(26).register('cartesian2d', Grid);
+
+	    module.exports = Grid;
+
+
+/***/ },
+/* 114 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var OrdinalScale = __webpack_require__(115);
+	    var IntervalScale = __webpack_require__(117);
+	    __webpack_require__(118);
+	    __webpack_require__(119);
+	    var Scale = __webpack_require__(116);
+
+	    var numberUtil = __webpack_require__(7);
+	    var zrUtil = __webpack_require__(4);
+	    var textContain = __webpack_require__(8);
+	    var axisHelper = {};
+
+	    /**
+	     * Get axis scale extent before niced.
+	     */
+	    axisHelper.getScaleExtent = function (axis, model) {
+	        var scale = axis.scale;
+	        var originalExtent = scale.getExtent();
+	        var span = originalExtent[1] - originalExtent[0];
+	        if (scale.type === 'ordinal') {
+	            // If series has no data, scale extent may be wrong
+	            if (!isFinite(span)) {
+	                return [0, 0];
+	            }
+	            else {
+	                return originalExtent;
+	            }
+	        }
+	        var min = model.getMin ? model.getMin() : model.get('min');
+	        var max = model.getMax ? model.getMax() : model.get('max');
+	        var crossZero = model.getNeedCrossZero
+	            ? model.getNeedCrossZero() : !model.get('scale');
+	        var boundaryGap = model.get('boundaryGap');
+	        if (!zrUtil.isArray(boundaryGap)) {
+	            boundaryGap = [boundaryGap || 0, boundaryGap || 0];
+	        }
+	        boundaryGap[0] = numberUtil.parsePercent(boundaryGap[0], 1);
+	        boundaryGap[1] = numberUtil.parsePercent(boundaryGap[1], 1);
+	        var fixMin = true;
+	        var fixMax = true;
+	        // Add boundary gap
+	        if (min == null) {
+	            min = originalExtent[0] - boundaryGap[0] * span;
+	            fixMin = false;
+	        }
+	        if (max == null) {
+	            max = originalExtent[1] + boundaryGap[1] * span;
+	            fixMax = false;
+	        }
+	        if (min === 'dataMin') {
+	            min = originalExtent[0];
+	        }
+	        if (max === 'dataMax') {
+	            max = originalExtent[1];
+	        }
+	        // Evaluate if axis needs cross zero
+	        if (crossZero) {
+	            // Axis is over zero and min is not set
+	            if (min > 0 && max > 0 && !fixMin) {
+	                min = 0;
+	            }
+	            // Axis is under zero and max is not set
+	            if (min < 0 && max < 0 && !fixMax) {
+	                max = 0;
+	            }
+	        }
+	        return [min, max];
+	    };
+
+	    axisHelper.niceScaleExtent = function (axis, model) {
+	        var scale = axis.scale;
+	        var extent = axisHelper.getScaleExtent(axis, model);
+	        var fixMin = (model.getMin ? model.getMin() : model.get('min')) != null;
+	        var fixMax = (model.getMax ? model.getMax() : model.get('max')) != null;
+	        var splitNumber = model.get('splitNumber');
+	        scale.setExtent(extent[0], extent[1]);
+	        scale.niceExtent(splitNumber, fixMin, fixMax);
+
+	        // Use minInterval to constraint the calculated interval.
+	        // If calculated interval is less than minInterval. increase the interval quantity until
+	        // it is larger than minInterval.
+	        // For example:
+	        //  minInterval is 1, calculated interval is 0.2, so increase it to be 1. In this way we can get
+	        //  an integer axis.
+	        var minInterval = model.get('minInterval');
+	        if (isFinite(minInterval) && !fixMin && !fixMax && scale.type === 'interval') {
+	            var interval = scale.getInterval();
+	            var intervalScale = Math.max(Math.abs(interval), minInterval) / interval;
+	            // while (interval < minInterval) {
+	            //     var quantity = numberUtil.quantity(interval);
+	            //     interval = quantity * 10;
+	            //     scaleQuantity *= 10;
+	            // }
+	            extent = scale.getExtent();
+	            scale.setExtent(intervalScale * extent[0], extent[1] * intervalScale);
+	            scale.niceExtent(splitNumber);
+	        }
+
+	        // If some one specified the min, max. And the default calculated interval
+	        // is not good enough. He can specify the interval. It is often appeared
+	        // in angle axis with angle 0 - 360. Interval calculated in interval scale is hard
+	        // to be 60.
+	        // FIXME
+	        var interval = model.get('interval');
+	        if (interval != null) {
+	            scale.setInterval && scale.setInterval(interval);
+	        }
+	    };
+
+	    /**
+	     * @param {module:echarts/model/Model} model
+	     * @param {string} [axisType] Default retrieve from model.type
+	     * @return {module:echarts/scale/*}
+	     */
+	    axisHelper.createScaleByModel = function(model, axisType) {
+	        axisType = axisType || model.get('type');
+	        if (axisType) {
+	            switch (axisType) {
+	                // Buildin scale
+	                case 'category':
+	                    return new OrdinalScale(
+	                        model.getCategories(), [Infinity, -Infinity]
+	                    );
+	                case 'value':
+	                    return new IntervalScale();
+	                // Extended scale, like time and log
+	                default:
+	                    return (Scale.getClass(axisType) || IntervalScale).create(model);
+	            }
+	        }
+	    };
+
+	    /**
+	     * Check if the axis corss 0
+	     */
+	    axisHelper.ifAxisCrossZero = function (axis) {
+	        var dataExtent = axis.scale.getExtent();
+	        var min = dataExtent[0];
+	        var max = dataExtent[1];
+	        return !((min > 0 && max > 0) || (min < 0 && max < 0));
+	    };
+
+	    /**
+	     * @param {Array.<number>} tickCoords In axis self coordinate.
+	     * @param {Array.<string>} labels
+	     * @param {string} font
+	     * @param {boolean} isAxisHorizontal
+	     * @return {number}
+	     */
+	    axisHelper.getAxisLabelInterval = function (tickCoords, labels, font, isAxisHorizontal) {
+	        // FIXME
+	        // 不同角的axis和label，不只是horizontal和vertical.
+
+	        var textSpaceTakenRect;
+	        var autoLabelInterval = 0;
+	        var accumulatedLabelInterval = 0;
+
+	        var step = 1;
+	        if (labels.length > 40) {
+	            // Simple optimization for large amount of labels
+	            step = Math.floor(labels.length / 40);
+	        }
+
+	        for (var i = 0; i < tickCoords.length; i += step) {
+	            var tickCoord = tickCoords[i];
+	            var rect = textContain.getBoundingRect(
+	                labels[i], font, 'center', 'top'
+	            );
+	            rect[isAxisHorizontal ? 'x' : 'y'] += tickCoord;
+	            // FIXME Magic number 1.5
+	            rect[isAxisHorizontal ? 'width' : 'height'] *= 1.3;
+	            if (!textSpaceTakenRect) {
+	                textSpaceTakenRect = rect.clone();
+	            }
+	            // There is no space for current label;
+	            else if (textSpaceTakenRect.intersect(rect)) {
+	                accumulatedLabelInterval++;
+	                autoLabelInterval = Math.max(autoLabelInterval, accumulatedLabelInterval);
+	            }
+	            else {
+	                textSpaceTakenRect.union(rect);
+	                // Reset
+	                accumulatedLabelInterval = 0;
+	            }
+	        }
+	        if (autoLabelInterval === 0 && step > 1) {
+	            return step;
+	        }
+	        return (autoLabelInterval + 1) * step - 1;
+	    };
+
+	    /**
+	     * @param {Object} axis
+	     * @param {Function} labelFormatter
+	     * @return {Array.<string>}
+	     */
+	    axisHelper.getFormattedLabels = function (axis, labelFormatter) {
+	        var scale = axis.scale;
+	        var labels = scale.getTicksLabels();
+	        var ticks = scale.getTicks();
+	        if (typeof labelFormatter === 'string') {
+	            labelFormatter = (function (tpl) {
+	                return function (val) {
+	                    return tpl.replace('{value}', val);
+	                };
+	            })(labelFormatter);
+	            return zrUtil.map(labels, labelFormatter);
+	        }
+	        else if (typeof labelFormatter === 'function') {
+	            return zrUtil.map(ticks, function (tick, idx) {
+	                return labelFormatter(
+	                    axis.type === 'category' ? scale.getLabel(tick) : tick,
+	                    idx
+	                );
+	            }, this);
+	        }
+	        else {
+	            return labels;
+	        }
+	    };
+
+	    module.exports = axisHelper;
+
+
+/***/ },
+/* 115 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * Linear continuous scale
+	 * @module echarts/coord/scale/Ordinal
+	 *
+	 * http://en.wikipedia.org/wiki/Level_of_measurement
+	 */
+
+	// FIXME only one data
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var Scale = __webpack_require__(116);
+
+	    var scaleProto = Scale.prototype;
+
+	    var OrdinalScale = Scale.extend({
+
+	        type: 'ordinal',
+
+	        init: function (data, extent) {
+	            this._data = data;
+	            this._extent = extent || [0, data.length - 1];
+	        },
+
+	        parse: function (val) {
+	            return typeof val === 'string'
+	                ? zrUtil.indexOf(this._data, val)
+	                // val might be float.
+	                : Math.round(val);
+	        },
+
+	        contain: function (rank) {
+	            rank = this.parse(rank);
+	            return scaleProto.contain.call(this, rank)
+	                && this._data[rank] != null;
+	        },
+
+	        /**
+	         * Normalize given rank or name to linear [0, 1]
+	         * @param {number|string} [val]
+	         * @return {number}
+	         */
+	        normalize: function (val) {
+	            return scaleProto.normalize.call(this, this.parse(val));
+	        },
+
+	        scale: function (val) {
+	            return Math.round(scaleProto.scale.call(this, val));
+	        },
+
+	        /**
+	         * @return {Array}
+	         */
+	        getTicks: function () {
+	            var ticks = [];
+	            var extent = this._extent;
+	            var rank = extent[0];
+
+	            while (rank <= extent[1]) {
+	                ticks.push(rank);
+	                rank++;
+	            }
+
+	            return ticks;
+	        },
+
+	        /**
+	         * Get item on rank n
+	         * @param {number} n
+	         * @return {string}
+	         */
+	        getLabel: function (n) {
+	            return this._data[n];
+	        },
+
+	        /**
+	         * @return {number}
+	         */
+	        count: function () {
+	            return this._extent[1] - this._extent[0] + 1;
+	        },
+
+	        niceTicks: zrUtil.noop,
+	        niceExtent: zrUtil.noop
+	    });
+
+	    /**
+	     * @return {module:echarts/scale/Time}
+	     */
+	    OrdinalScale.create = function () {
+	        return new OrdinalScale();
+	    };
+
+	    module.exports = OrdinalScale;
+
+
+/***/ },
+/* 116 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * // Scale class management
+	 * @module echarts/scale/Scale
+	 */
+
+
+	    var clazzUtil = __webpack_require__(13);
+
+	    function Scale() {
+	        /**
+	         * Extent
+	         * @type {Array.<number>}
+	         * @protected
+	         */
+	        this._extent = [Infinity, -Infinity];
+
+	        /**
+	         * Step is calculated in adjustExtent
+	         * @type {Array.<number>}
+	         * @protected
+	         */
+	        this._interval = 0;
+
+	        this.init && this.init.apply(this, arguments);
+	    }
+
+	    var scaleProto = Scale.prototype;
+
+	    /**
+	     * Parse input val to valid inner number.
+	     * @param {*} val
+	     * @return {number}
+	     */
+	    scaleProto.parse = function (val) {
+	        // Notice: This would be a trap here, If the implementation
+	        // of this method depends on extent, and this method is used
+	        // before extent set (like in dataZoom), it would be wrong.
+	        // Nevertheless, parse does not depend on extent generally.
+	        return val;
+	    };
+
+	    scaleProto.contain = function (val) {
+	        var extent = this._extent;
+	        return val >= extent[0] && val <= extent[1];
+	    };
+
+	    /**
+	     * Normalize value to linear [0, 1], return 0.5 if extent span is 0
+	     * @param {number} val
+	     * @return {number}
+	     */
+	    scaleProto.normalize = function (val) {
+	        var extent = this._extent;
+	        if (extent[1] === extent[0]) {
+	            return 0.5;
+	        }
+	        return (val - extent[0]) / (extent[1] - extent[0]);
+	    };
+
+	    /**
+	     * Scale normalized value
+	     * @param {number} val
+	     * @return {number}
+	     */
+	    scaleProto.scale = function (val) {
+	        var extent = this._extent;
+	        return val * (extent[1] - extent[0]) + extent[0];
+	    };
+
+	    /**
+	     * Set extent from data
+	     * @param {Array.<number>} other
+	     */
+	    scaleProto.unionExtent = function (other) {
+	        var extent = this._extent;
+	        other[0] < extent[0] && (extent[0] = other[0]);
+	        other[1] > extent[1] && (extent[1] = other[1]);
+	        // not setExtent because in log axis it may transformed to power
+	        // this.setExtent(extent[0], extent[1]);
+	    };
+
+	    /**
+	     * Get extent
+	     * @return {Array.<number>}
+	     */
+	    scaleProto.getExtent = function () {
+	        return this._extent.slice();
+	    };
+
+	    /**
+	     * Set extent
+	     * @param {number} start
+	     * @param {number} end
+	     */
+	    scaleProto.setExtent = function (start, end) {
+	        var thisExtent = this._extent;
+	        if (!isNaN(start)) {
+	            thisExtent[0] = start;
+	        }
+	        if (!isNaN(end)) {
+	            thisExtent[1] = end;
+	        }
+	    };
+
+	    /**
+	     * @return {Array.<string>}
+	     */
+	    scaleProto.getTicksLabels = function () {
+	        var labels = [];
+	        var ticks = this.getTicks();
+	        for (var i = 0; i < ticks.length; i++) {
+	            labels.push(this.getLabel(ticks[i]));
+	        }
+	        return labels;
+	    };
+
+	    clazzUtil.enableClassExtend(Scale);
+	    clazzUtil.enableClassManagement(Scale, {
+	        registerWhenExtend: true
+	    });
+
+	    module.exports = Scale;
+
+
+/***/ },
+/* 117 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * Interval scale
+	 * @module echarts/scale/Interval
+	 */
+
+
+
+	    var numberUtil = __webpack_require__(7);
+	    var formatUtil = __webpack_require__(6);
+	    var Scale = __webpack_require__(116);
+
+	    var mathFloor = Math.floor;
+	    var mathCeil = Math.ceil;
+	    /**
+	     * @alias module:echarts/coord/scale/Interval
+	     * @constructor
+	     */
+	    var IntervalScale = Scale.extend({
+
+	        type: 'interval',
+
+	        _interval: 0,
+
+	        setExtent: function (start, end) {
+	            var thisExtent = this._extent;
+	            //start,end may be a Number like '25',so...
+	            if (!isNaN(start)) {
+	                thisExtent[0] = parseFloat(start);
+	            }
+	            if (!isNaN(end)) {
+	                thisExtent[1] = parseFloat(end);
+	            }
+	        },
+
+	        unionExtent: function (other) {
+	            var extent = this._extent;
+	            other[0] < extent[0] && (extent[0] = other[0]);
+	            other[1] > extent[1] && (extent[1] = other[1]);
+
+	            // unionExtent may called by it's sub classes
+	            IntervalScale.prototype.setExtent.call(this, extent[0], extent[1]);
+	        },
+	        /**
+	         * Get interval
+	         */
+	        getInterval: function () {
+	            if (!this._interval) {
+	                this.niceTicks();
+	            }
+	            return this._interval;
+	        },
+
+	        /**
+	         * Set interval
+	         */
+	        setInterval: function (interval) {
+	            this._interval = interval;
+	            // Dropped auto calculated niceExtent and use user setted extent
+	            // We assume user wan't to set both interval, min, max to get a better result
+	            this._niceExtent = this._extent.slice();
+	        },
+
+	        /**
+	         * @return {Array.<number>}
+	         */
+	        getTicks: function () {
+	            if (!this._interval) {
+	                this.niceTicks();
+	            }
+	            var interval = this._interval;
+	            var extent = this._extent;
+	            var ticks = [];
+
+	            // Consider this case: using dataZoom toolbox, zoom and zoom.
+	            var safeLimit = 10000;
+
+	            if (interval) {
+	                var niceExtent = this._niceExtent;
+	                if (extent[0] < niceExtent[0]) {
+	                    ticks.push(extent[0]);
+	                }
+	                var tick = niceExtent[0];
+	                while (tick <= niceExtent[1]) {
+	                    ticks.push(tick);
+	                    // Avoid rounding error
+	                    tick = numberUtil.round(tick + interval);
+	                    if (ticks.length > safeLimit) {
+	                        return [];
+	                    }
+	                }
+	                if (extent[1] > niceExtent[1]) {
+	                    ticks.push(extent[1]);
+	                }
+	            }
+
+	            return ticks;
+	        },
+
+	        /**
+	         * @return {Array.<string>}
+	         */
+	        getTicksLabels: function () {
+	            var labels = [];
+	            var ticks = this.getTicks();
+	            for (var i = 0; i < ticks.length; i++) {
+	                labels.push(this.getLabel(ticks[i]));
+	            }
+	            return labels;
+	        },
+
+	        /**
+	         * @param {number} n
+	         * @return {number}
+	         */
+	        getLabel: function (data) {
+	            return formatUtil.addCommas(data);
+	        },
+
+	        /**
+	         * Update interval and extent of intervals for nice ticks
+	         *
+	         * @param {number} [splitNumber = 5] Desired number of ticks
+	         */
+	        niceTicks: function (splitNumber) {
+	            splitNumber = splitNumber || 5;
+	            var extent = this._extent;
+	            var span = extent[1] - extent[0];
+	            if (!isFinite(span)) {
+	                return;
+	            }
+	            // User may set axis min 0 and data are all negative
+	            // FIXME If it needs to reverse ?
+	            if (span < 0) {
+	                span = -span;
+	                extent.reverse();
+	            }
+
+	            // From "Nice Numbers for Graph Labels" of Graphic Gems
+	            // var niceSpan = numberUtil.nice(span, false);
+	            var step = numberUtil.nice(span / splitNumber, true);
+
+	            // Niced extent inside original extent
+	            var niceExtent = [
+	                numberUtil.round(mathCeil(extent[0] / step) * step),
+	                numberUtil.round(mathFloor(extent[1] / step) * step)
+	            ];
+
+	            this._interval = step;
+	            this._niceExtent = niceExtent;
+	        },
+
+	        /**
+	         * Nice extent.
+	         * @param {number} [splitNumber = 5] Given approx tick number
+	         * @param {boolean} [fixMin=false]
+	         * @param {boolean} [fixMax=false]
+	         */
+	        niceExtent: function (splitNumber, fixMin, fixMax) {
+	            var extent = this._extent;
+	            // If extent start and end are same, expand them
+	            if (extent[0] === extent[1]) {
+	                if (extent[0] !== 0) {
+	                    // Expand extent
+	                    var expandSize = extent[0];
+	                    // In the fowllowing case
+	                    //      Axis has been fixed max 100
+	                    //      Plus data are all 100 and axis extent are [100, 100].
+	                    // Extend to the both side will cause expanded max is larger than fixed max.
+	                    // So only expand to the smaller side.
+	                    if (!fixMax) {
+	                        extent[1] += expandSize / 2;
+	                        extent[0] -= expandSize / 2;
+	                    }
+	                    else {
+	                        extent[0] -= expandSize / 2;
+	                    }
+	                }
+	                else {
+	                    extent[1] = 1;
+	                }
+	            }
+	            var span = extent[1] - extent[0];
+	            // If there are no data and extent are [Infinity, -Infinity]
+	            if (!isFinite(span)) {
+	                extent[0] = 0;
+	                extent[1] = 1;
+	            }
+
+	            this.niceTicks(splitNumber);
+
+	            // var extent = this._extent;
+	            var interval = this._interval;
+
+	            if (!fixMin) {
+	                extent[0] = numberUtil.round(mathFloor(extent[0] / interval) * interval);
+	            }
+	            if (!fixMax) {
+	                extent[1] = numberUtil.round(mathCeil(extent[1] / interval) * interval);
+	            }
+	        }
+	    });
+
+	    /**
+	     * @return {module:echarts/scale/Time}
+	     */
+	    IntervalScale.create = function () {
+	        return new IntervalScale();
+	    };
+
+	    module.exports = IntervalScale;
+
+
+
+/***/ },
+/* 118 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * Interval scale
+	 * @module echarts/coord/scale/Time
+	 */
+
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var numberUtil = __webpack_require__(7);
+	    var formatUtil = __webpack_require__(6);
+
+	    var IntervalScale = __webpack_require__(117);
+
+	    var intervalScaleProto = IntervalScale.prototype;
+
+	    var mathCeil = Math.ceil;
+	    var mathFloor = Math.floor;
+	    var ONE_SECOND = 1000;
+	    var ONE_MINUTE = ONE_SECOND * 60;
+	    var ONE_HOUR = ONE_MINUTE * 60;
+	    var ONE_DAY = ONE_HOUR * 24;
+
+	    // FIXME 公用？
+	    var bisect = function (a, x, lo, hi) {
+	        while (lo < hi) {
+	            var mid = lo + hi >>> 1;
+	            if (a[mid][2] < x) {
+	                lo = mid + 1;
+	            }
+	            else {
+	                hi  = mid;
+	            }
+	        }
+	        return lo;
+	    };
+
+	    /**
+	     * @alias module:echarts/coord/scale/Time
+	     * @constructor
+	     */
+	    var TimeScale = IntervalScale.extend({
+	        type: 'time',
+
+	        // Overwrite
+	        getLabel: function (val) {
+	            var stepLvl = this._stepLvl;
+
+	            var date = new Date(val);
+
+	            return formatUtil.formatTime(stepLvl[0], date);
+	        },
+
+	        // Overwrite
+	        niceExtent: function (approxTickNum, fixMin, fixMax) {
+	            var extent = this._extent;
+	            // If extent start and end are same, expand them
+	            if (extent[0] === extent[1]) {
+	                // Expand extent
+	                extent[0] -= ONE_DAY;
+	                extent[1] += ONE_DAY;
+	            }
+	            // If there are no data and extent are [Infinity, -Infinity]
+	            if (extent[1] === -Infinity && extent[0] === Infinity) {
+	                var d = new Date();
+	                extent[1] = new Date(d.getFullYear(), d.getMonth(), d.getDate());
+	                extent[0] = extent[1] - ONE_DAY;
+	            }
+
+	            this.niceTicks(approxTickNum);
+
+	            // var extent = this._extent;
+	            var interval = this._interval;
+
+	            if (!fixMin) {
+	                extent[0] = numberUtil.round(mathFloor(extent[0] / interval) * interval);
+	            }
+	            if (!fixMax) {
+	                extent[1] = numberUtil.round(mathCeil(extent[1] / interval) * interval);
+	            }
+	        },
+
+	        // Overwrite
+	        niceTicks: function (approxTickNum) {
+	            approxTickNum = approxTickNum || 10;
+
+	            var extent = this._extent;
+	            var span = extent[1] - extent[0];
+	            var approxInterval = span / approxTickNum;
+	            var scaleLevelsLen = scaleLevels.length;
+	            var idx = bisect(scaleLevels, approxInterval, 0, scaleLevelsLen);
+
+	            var level = scaleLevels[Math.min(idx, scaleLevelsLen - 1)];
+	            var interval = level[2];
+	            // Same with interval scale if span is much larger than 1 year
+	            if (level[0] === 'year') {
+	                var yearSpan = span / interval;
+
+	                // From "Nice Numbers for Graph Labels" of Graphic Gems
+	                // var niceYearSpan = numberUtil.nice(yearSpan, false);
+	                var yearStep = numberUtil.nice(yearSpan / approxTickNum, true);
+
+	                interval *= yearStep;
+	            }
+
+	            var niceExtent = [
+	                mathCeil(extent[0] / interval) * interval,
+	                mathFloor(extent[1] / interval) * interval
+	            ];
+
+	            this._stepLvl = level;
+	            // Interval will be used in getTicks
+	            this._interval = interval;
+	            this._niceExtent = niceExtent;
+	        },
+
+	        parse: function (val) {
+	            // val might be float.
+	            return +numberUtil.parseDate(val);
+	        }
+	    });
+
+	    zrUtil.each(['contain', 'normalize'], function (methodName) {
+	        TimeScale.prototype[methodName] = function (val) {
+	            return intervalScaleProto[methodName].call(this, this.parse(val));
+	        };
+	    });
+
+	    // Steps from d3
+	    var scaleLevels = [
+	        // Format       step    interval
+	        ['hh:mm:ss',    1,      ONE_SECOND],           // 1s
+	        ['hh:mm:ss',    5,      ONE_SECOND * 5],       // 5s
+	        ['hh:mm:ss',    10,     ONE_SECOND * 10],      // 10s
+	        ['hh:mm:ss',    15,     ONE_SECOND * 15],      // 15s
+	        ['hh:mm:ss',    30,     ONE_SECOND * 30],      // 30s
+	        ['hh:mm\nMM-dd',1,      ONE_MINUTE],          // 1m
+	        ['hh:mm\nMM-dd',5,      ONE_MINUTE * 5],      // 5m
+	        ['hh:mm\nMM-dd',10,     ONE_MINUTE * 10],     // 10m
+	        ['hh:mm\nMM-dd',15,     ONE_MINUTE * 15],     // 15m
+	        ['hh:mm\nMM-dd',30,     ONE_MINUTE * 30],     // 30m
+	        ['hh:mm\nMM-dd',1,      ONE_HOUR],        // 1h
+	        ['hh:mm\nMM-dd',2,      ONE_HOUR * 2],    // 2h
+	        ['hh:mm\nMM-dd',6,      ONE_HOUR * 6],    // 6h
+	        ['hh:mm\nMM-dd',12,     ONE_HOUR * 12],   // 12h
+	        ['MM-dd\nyyyy', 1,      ONE_DAY],   // 1d
+	        ['week',        7,      ONE_DAY * 7],        // 7d
+	        ['month',       1,      ONE_DAY * 31],       // 1M
+	        ['quarter',     3,      ONE_DAY * 380 / 4],  // 3M
+	        ['half-year',   6,      ONE_DAY * 380 / 2],  // 6M
+	        ['year',        1,      ONE_DAY * 380]       // 1Y
+	    ];
+
+	    /**
+	     * @return {module:echarts/scale/Time}
+	     */
+	    TimeScale.create = function () {
+	        return new TimeScale();
+	    };
+
+	    module.exports = TimeScale;
+
+
+/***/ },
+/* 119 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * Log scale
+	 * @module echarts/scale/Log
+	 */
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var Scale = __webpack_require__(116);
+	    var numberUtil = __webpack_require__(7);
+
+	    // Use some method of IntervalScale
+	    var IntervalScale = __webpack_require__(117);
+
+	    var scaleProto = Scale.prototype;
+	    var intervalScaleProto = IntervalScale.prototype;
+
+	    var mathFloor = Math.floor;
+	    var mathCeil = Math.ceil;
+	    var mathPow = Math.pow;
+
+	    var LOG_BASE = 10;
+	    var mathLog = Math.log;
+
+	    var LogScale = Scale.extend({
+
+	        type: 'log',
+
+	        /**
+	         * @return {Array.<number>}
+	         */
+	        getTicks: function () {
+	            return zrUtil.map(intervalScaleProto.getTicks.call(this), function (val) {
+	                return numberUtil.round(mathPow(LOG_BASE, val));
+	            });
+	        },
+
+	        /**
+	         * @param {number} val
+	         * @return {string}
+	         */
+	        getLabel: intervalScaleProto.getLabel,
+
+	        /**
+	         * @param  {number} val
+	         * @return {number}
+	         */
+	        scale: function (val) {
+	            val = scaleProto.scale.call(this, val);
+	            return mathPow(LOG_BASE, val);
+	        },
+
+	        /**
+	         * @param {number} start
+	         * @param {number} end
+	         */
+	        setExtent: function (start, end) {
+	            start = mathLog(start) / mathLog(LOG_BASE);
+	            end = mathLog(end) / mathLog(LOG_BASE);
+	            intervalScaleProto.setExtent.call(this, start, end);
+	        },
+
+	        /**
+	         * @return {number} end
+	         */
+	        getExtent: function () {
+	            var extent = scaleProto.getExtent.call(this);
+	            extent[0] = mathPow(LOG_BASE, extent[0]);
+	            extent[1] = mathPow(LOG_BASE, extent[1]);
+	            return extent;
+	        },
+
+	        /**
+	         * @param  {Array.<number>} extent
+	         */
+	        unionExtent: function (extent) {
+	            extent[0] = mathLog(extent[0]) / mathLog(LOG_BASE);
+	            extent[1] = mathLog(extent[1]) / mathLog(LOG_BASE);
+	            scaleProto.unionExtent.call(this, extent);
+	        },
+
+	        /**
+	         * Update interval and extent of intervals for nice ticks
+	         * @param  {number} [approxTickNum = 10] Given approx tick number
+	         */
+	        niceTicks: function (approxTickNum) {
+	            approxTickNum = approxTickNum || 10;
+	            var extent = this._extent;
+	            var span = extent[1] - extent[0];
+	            if (span === Infinity || span <= 0) {
+	                return;
+	            }
+
+	            var interval = mathPow(10, mathFloor(mathLog(span / approxTickNum) / Math.LN10));
+	            var err = approxTickNum / span * interval;
+
+	            // Filter ticks to get closer to the desired count.
+	            if (err <= 0.5) {
+	                interval *= 10;
+	            }
+	            var niceExtent = [
+	                numberUtil.round(mathCeil(extent[0] / interval) * interval),
+	                numberUtil.round(mathFloor(extent[1] / interval) * interval)
+	            ];
+
+	            this._interval = interval;
+	            this._niceExtent = niceExtent;
+	        },
+
+	        /**
+	         * Nice extent.
+	         * @param {number} [approxTickNum = 10] Given approx tick number
+	         * @param {boolean} [fixMin=false]
+	         * @param {boolean} [fixMax=false]
+	         */
+	        niceExtent: intervalScaleProto.niceExtent
+	    });
+
+	    zrUtil.each(['contain', 'normalize'], function (methodName) {
+	        LogScale.prototype[methodName] = function (val) {
+	            val = mathLog(val) / mathLog(LOG_BASE);
+	            return scaleProto[methodName].call(this, val);
+	        };
+	    });
+
+	    LogScale.create = function () {
+	        return new LogScale();
+	    };
+
+	    module.exports = LogScale;
+
+
+/***/ },
+/* 120 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var Cartesian = __webpack_require__(121);
+
+	    function Cartesian2D(name) {
+
+	        Cartesian.call(this, name);
+	    }
+
+	    Cartesian2D.prototype = {
+
+	        constructor: Cartesian2D,
+
+	        type: 'cartesian2d',
+
+	        /**
+	         * @type {Array.<string>}
+	         * @readOnly
+	         */
+	        dimensions: ['x', 'y'],
+
+	        /**
+	         * Base axis will be used on stacking.
+	         *
+	         * @return {module:echarts/coord/cartesian/Axis2D}
+	         */
+	        getBaseAxis: function () {
+	            return this.getAxesByScale('ordinal')[0]
+	                || this.getAxesByScale('time')[0]
+	                || this.getAxis('x');
+	        },
+
+	        /**
+	         * If contain point
+	         * @param {Array.<number>} point
+	         * @return {boolean}
+	         */
+	        containPoint: function (point) {
+	            var axisX = this.getAxis('x');
+	            var axisY = this.getAxis('y');
+	            return axisX.contain(axisX.toLocalCoord(point[0]))
+	                && axisY.contain(axisY.toLocalCoord(point[1]));
+	        },
+
+	        /**
+	         * If contain data
+	         * @param {Array.<number>} data
+	         * @return {boolean}
+	         */
+	        containData: function (data) {
+	            return this.getAxis('x').containData(data[0])
+	                && this.getAxis('y').containData(data[1]);
+	        },
+
+	        /**
+	         * Convert series data to an array of points
+	         * @param {module:echarts/data/List} data
+	         * @param {boolean} stack
+	         * @return {Array}
+	         *  Return array of points. For example:
+	         *  `[[10, 10], [20, 20], [30, 30]]`
+	         */
+	        dataToPoints: function (data, stack) {
+	            return data.mapArray(['x', 'y'], function (x, y) {
+	                return this.dataToPoint([x, y]);
+	            }, stack, this);
+	        },
+
+	        /**
+	         * @param {Array.<number>} data
+	         * @param {boolean} [clamp=false]
+	         * @return {Array.<number>}
+	         */
+	        dataToPoint: function (data, clamp) {
+	            var xAxis = this.getAxis('x');
+	            var yAxis = this.getAxis('y');
+	            return [
+	                xAxis.toGlobalCoord(xAxis.dataToCoord(data[0], clamp)),
+	                yAxis.toGlobalCoord(yAxis.dataToCoord(data[1], clamp))
+	            ];
+	        },
+
+	        /**
+	         * @param {Array.<number>} point
+	         * @param {boolean} [clamp=false]
+	         * @return {Array.<number>}
+	         */
+	        pointToData: function (point, clamp) {
+	            var xAxis = this.getAxis('x');
+	            var yAxis = this.getAxis('y');
+	            return [
+	                xAxis.coordToData(xAxis.toLocalCoord(point[0]), clamp),
+	                yAxis.coordToData(yAxis.toLocalCoord(point[1]), clamp)
+	            ];
+	        },
+
+	        /**
+	         * Get other axis
+	         * @param {module:echarts/coord/cartesian/Axis2D} axis
+	         */
+	        getOtherAxis: function (axis) {
+	            return this.getAxis(axis.dim === 'x' ? 'y' : 'x');
+	        }
+	    };
+
+	    zrUtil.inherits(Cartesian2D, Cartesian);
+
+	    module.exports = Cartesian2D;
+
+
+/***/ },
+/* 121 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+	/**
+	 * Cartesian coordinate system
+	 * @module  echarts/coord/Cartesian
+	 *
+	 */
+
+
+	    var zrUtil = __webpack_require__(4);
+
+	    function dimAxisMapper(dim) {
+	        return this._axes[dim];
+	    }
+
+	    /**
+	     * @alias module:echarts/coord/Cartesian
+	     * @constructor
+	     */
+	    var Cartesian = function (name) {
+	        this._axes = {};
+
+	        this._dimList = [];
+
+	        /**
+	         * @type {string}
+	         */
+	        this.name = name || '';
+	    };
+
+	    Cartesian.prototype = {
+
+	        constructor: Cartesian,
+
+	        type: 'cartesian',
+
+	        /**
+	         * Get axis
+	         * @param  {number|string} dim
+	         * @return {module:echarts/coord/Cartesian~Axis}
+	         */
+	        getAxis: function (dim) {
+	            return this._axes[dim];
+	        },
+
+	        /**
+	         * Get axes list
+	         * @return {Array.<module:echarts/coord/Cartesian~Axis>}
+	         */
+	        getAxes: function () {
+	            return zrUtil.map(this._dimList, dimAxisMapper, this);
+	        },
+
+	        /**
+	         * Get axes list by given scale type
+	         */
+	        getAxesByScale: function (scaleType) {
+	            scaleType = scaleType.toLowerCase();
+	            return zrUtil.filter(
+	                this.getAxes(),
+	                function (axis) {
+	                    return axis.scale.type === scaleType;
+	                }
+	            );
+	        },
+
+	        /**
+	         * Add axis
+	         * @param {module:echarts/coord/Cartesian.Axis}
+	         */
+	        addAxis: function (axis) {
+	            var dim = axis.dim;
+
+	            this._axes[dim] = axis;
+
+	            this._dimList.push(dim);
+	        },
+
+	        /**
+	         * Convert data to coord in nd space
+	         * @param {Array.<number>|Object.<string, number>} val
+	         * @return {Array.<number>|Object.<string, number>}
+	         */
+	        dataToCoord: function (val) {
+	            return this._dataCoordConvert(val, 'dataToCoord');
+	        },
+
+	        /**
+	         * Convert coord in nd space to data
+	         * @param  {Array.<number>|Object.<string, number>} val
+	         * @return {Array.<number>|Object.<string, number>}
+	         */
+	        coordToData: function (val) {
+	            return this._dataCoordConvert(val, 'coordToData');
+	        },
+
+	        _dataCoordConvert: function (input, method) {
+	            var dimList = this._dimList;
+
+	            var output = input instanceof Array ? [] : {};
+
+	            for (var i = 0; i < dimList.length; i++) {
+	                var dim = dimList[i];
+	                var axis = this._axes[dim];
+
+	                output[dim] = axis[method](input[dim]);
+	            }
+
+	            return output;
+	        }
+	    };
+
+	    module.exports = Cartesian;
+
+
+/***/ },
+/* 122 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+	    var Axis = __webpack_require__(123);
+	    var axisLabelInterval = __webpack_require__(124);
+
+	    /**
+	     * Extend axis 2d
+	     * @constructor module:echarts/coord/cartesian/Axis2D
+	     * @extends {module:echarts/coord/cartesian/Axis}
+	     * @param {string} dim
+	     * @param {*} scale
+	     * @param {Array.<number>} coordExtent
+	     * @param {string} axisType
+	     * @param {string} position
+	     */
+	    var Axis2D = function (dim, scale, coordExtent, axisType, position) {
+	        Axis.call(this, dim, scale, coordExtent);
+	        /**
+	         * Axis type
+	         *  - 'category'
+	         *  - 'value'
+	         *  - 'time'
+	         *  - 'log'
+	         * @type {string}
+	         */
+	        this.type = axisType || 'value';
+
+	        /**
+	         * Axis position
+	         *  - 'top'
+	         *  - 'bottom'
+	         *  - 'left'
+	         *  - 'right'
+	         */
+	        this.position = position || 'bottom';
+	    };
+
+	    Axis2D.prototype = {
+
+	        constructor: Axis2D,
+
+	        /**
+	         * Index of axis, can be used as key
+	         */
+	        index: 0,
+	        /**
+	         * If axis is on the zero position of the other axis
+	         * @type {boolean}
+	         */
+	        onZero: false,
+
+	        /**
+	         * Axis model
+	         * @param {module:echarts/coord/cartesian/AxisModel}
+	         */
+	        model: null,
+
+	        isHorizontal: function () {
+	            var position = this.position;
+	            return position === 'top' || position === 'bottom';
+	        },
+
+	        getGlobalExtent: function () {
+	            var ret = this.getExtent();
+	            ret[0] = this.toGlobalCoord(ret[0]);
+	            ret[1] = this.toGlobalCoord(ret[1]);
+	            return ret;
+	        },
+
+	        /**
+	         * @return {number}
+	         */
+	        getLabelInterval: function () {
+	            var labelInterval = this._labelInterval;
+	            if (!labelInterval) {
+	                labelInterval = this._labelInterval = axisLabelInterval(this);
+	            }
+	            return labelInterval;
+	        },
+
+	        /**
+	         * If label is ignored.
+	         * Automatically used when axis is category and label can not be all shown
+	         * @param  {number}  idx
+	         * @return {boolean}
+	         */
+	        isLabelIgnored: function (idx) {
+	            if (this.type === 'category') {
+	                var labelInterval = this.getLabelInterval();
+	                return ((typeof labelInterval === 'function')
+	                    && !labelInterval(idx, this.scale.getLabel(idx)))
+	                    || idx % (labelInterval + 1);
+	            }
+	        },
+
+	        /**
+	         * Transform global coord to local coord,
+	         * i.e. var localCoord = axis.toLocalCoord(80);
+	         * designate by module:echarts/coord/cartesian/Grid.
+	         * @type {Function}
+	         */
+	        toLocalCoord: null,
+
+	        /**
+	         * Transform global coord to local coord,
+	         * i.e. var globalCoord = axis.toLocalCoord(40);
+	         * designate by module:echarts/coord/cartesian/Grid.
+	         * @type {Function}
+	         */
+	        toGlobalCoord: null
+
+	    };
+	    zrUtil.inherits(Axis2D, Axis);
+
+	    module.exports = Axis2D;
+
+
+/***/ },
+/* 123 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var numberUtil = __webpack_require__(7);
+	    var linearMap = numberUtil.linearMap;
+	    var zrUtil = __webpack_require__(4);
+
+	    function fixExtentWithBands(extent, nTick) {
+	        var size = extent[1] - extent[0];
+	        var len = nTick;
+	        var margin = size / len / 2;
+	        extent[0] += margin;
+	        extent[1] -= margin;
+	    }
+
+	    var normalizedExtent = [0, 1];
+	    /**
+	     * @name module:echarts/coord/CartesianAxis
+	     * @constructor
+	     */
+	    var Axis = function (dim, scale, extent) {
+
+	        /**
+	         * Axis dimension. Such as 'x', 'y', 'z', 'angle', 'radius'
+	         * @type {string}
+	         */
+	        this.dim = dim;
+
+	        /**
+	         * Axis scale
+	         * @type {module:echarts/coord/scale/*}
+	         */
+	        this.scale = scale;
+
+	        /**
+	         * @type {Array.<number>}
+	         * @private
+	         */
+	        this._extent = extent || [0, 0];
+
+	        /**
+	         * @type {boolean}
+	         */
+	        this.inverse = false;
+
+	        /**
+	         * Usually true when axis has a ordinal scale
+	         * @type {boolean}
+	         */
+	        this.onBand = false;
+	    };
+
+	    Axis.prototype = {
+
+	        constructor: Axis,
+
+	        /**
+	         * If axis extent contain given coord
+	         * @param {number} coord
+	         * @return {boolean}
+	         */
+	        contain: function (coord) {
+	            var extent = this._extent;
+	            var min = Math.min(extent[0], extent[1]);
+	            var max = Math.max(extent[0], extent[1]);
+	            return coord >= min && coord <= max;
+	        },
+
+	        /**
+	         * If axis extent contain given data
+	         * @param {number} data
+	         * @return {boolean}
+	         */
+	        containData: function (data) {
+	            return this.contain(this.dataToCoord(data));
+	        },
+
+	        /**
+	         * Get coord extent.
+	         * @return {Array.<number>}
+	         */
+	        getExtent: function () {
+	            var ret = this._extent.slice();
+	            return ret;
+	        },
+
+	        /**
+	         * Get precision used for formatting
+	         * @param {Array.<number>} [dataExtent]
+	         * @return {number}
+	         */
+	        getPixelPrecision: function (dataExtent) {
+	            return numberUtil.getPixelPrecision(
+	                dataExtent || this.scale.getExtent(),
+	                this._extent
+	            );
+	        },
+
+	        /**
+	         * Set coord extent
+	         * @param {number} start
+	         * @param {number} end
+	         */
+	        setExtent: function (start, end) {
+	            var extent = this._extent;
+	            extent[0] = start;
+	            extent[1] = end;
+	        },
+
+	        /**
+	         * Convert data to coord. Data is the rank if it has a ordinal scale
+	         * @param {number} data
+	         * @param  {boolean} clamp
+	         * @return {number}
+	         */
+	        dataToCoord: function (data, clamp) {
+	            var extent = this._extent;
+	            var scale = this.scale;
+	            data = scale.normalize(data);
+
+	            if (this.onBand && scale.type === 'ordinal') {
+	                extent = extent.slice();
+	                fixExtentWithBands(extent, scale.count());
+	            }
+
+	            return linearMap(data, normalizedExtent, extent, clamp);
+	        },
+
+	        /**
+	         * Convert coord to data. Data is the rank if it has a ordinal scale
+	         * @param {number} coord
+	         * @param  {boolean} clamp
+	         * @return {number}
+	         */
+	        coordToData: function (coord, clamp) {
+	            var extent = this._extent;
+	            var scale = this.scale;
+
+	            if (this.onBand && scale.type === 'ordinal') {
+	                extent = extent.slice();
+	                fixExtentWithBands(extent, scale.count());
+	            }
+
+	            var t = linearMap(coord, extent, normalizedExtent, clamp);
+
+	            return this.scale.scale(t);
+	        },
+	        /**
+	         * @return {Array.<number>}
+	         */
+	        getTicksCoords: function (alignWithLabel) {
+	            if (this.onBand && !alignWithLabel) {
+	                var bands = this.getBands();
+	                var coords = [];
+	                for (var i = 0; i < bands.length; i++) {
+	                    coords.push(bands[i][0]);
+	                }
+	                if (bands[i - 1]) {
+	                    coords.push(bands[i - 1][1]);
+	                }
+	                return coords;
+	            }
+	            else {
+	                return zrUtil.map(this.scale.getTicks(), this.dataToCoord, this);
+	            }
+	        },
+
+	        /**
+	         * Coords of labels are on the ticks or on the middle of bands
+	         * @return {Array.<number>}
+	         */
+	        getLabelsCoords: function () {
+	            return zrUtil.map(this.scale.getTicks(), this.dataToCoord, this);
+	        },
+
+	        /**
+	         * Get bands.
+	         *
+	         * If axis has labels [1, 2, 3, 4]. Bands on the axis are
+	         * |---1---|---2---|---3---|---4---|.
+	         *
+	         * @return {Array}
+	         */
+	         // FIXME Situation when labels is on ticks
+	        getBands: function () {
+	            var extent = this.getExtent();
+	            var bands = [];
+	            var len = this.scale.count();
+	            var start = extent[0];
+	            var end = extent[1];
+	            var span = end - start;
+
+	            for (var i = 0; i < len; i++) {
+	                bands.push([
+	                    span * i / len + start,
+	                    span * (i + 1) / len + start
+	                ]);
+	            }
+	            return bands;
+	        },
+
+	        /**
+	         * Get width of band
+	         * @return {number}
+	         */
+	        getBandWidth: function () {
+	            var axisExtent = this._extent;
+	            var dataExtent = this.scale.getExtent();
+
+	            var len = dataExtent[1] - dataExtent[0] + (this.onBand ? 1 : 0);
+	            // Fix #2728, avoid NaN when only one data.
+	            len === 0 && (len = 1);
+
+	            var size = Math.abs(axisExtent[1] - axisExtent[0]);
+
+	            return Math.abs(size) / len;
+	        }
+	    };
+
+	    module.exports = Axis;
+
+
+/***/ },
+/* 124 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+	/**
+	 * Helper function for axisLabelInterval calculation
+	 */
+
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var axisHelper = __webpack_require__(114);
+
+	    module.exports = function (axis) {
+	        var axisModel = axis.model;
+	        var labelModel = axisModel.getModel('axisLabel');
+	        var labelInterval = labelModel.get('interval');
+	        if (!(axis.type === 'category' && labelInterval === 'auto')) {
+	            return labelInterval === 'auto' ? 0 : labelInterval;
+	        }
+
+	        return axisHelper.getAxisLabelInterval(
+	            zrUtil.map(axis.scale.getTicks(), axis.dataToCoord, axis),
+	            axisModel.getFormattedLabels(),
+	            labelModel.getModel('textStyle').getFont(),
+	            axis.isHorizontal()
+	        );
+	    };
+
+
+/***/ },
+/* 125 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+	// Grid 是在有直角坐标系的时候必须要存在的
+	// 所以这里也要被 Cartesian2D 依赖
+
+
+	    __webpack_require__(126);
+	    var ComponentModel = __webpack_require__(19);
+
+	    module.exports = ComponentModel.extend({
+
+	        type: 'grid',
+
+	        dependencies: ['xAxis', 'yAxis'],
+
+	        layoutMode: 'box',
+
+	        /**
+	         * @type {module:echarts/coord/cartesian/Grid}
+	         */
+	        coordinateSystem: null,
+
+	        defaultOption: {
+	            show: false,
+	            zlevel: 0,
+	            z: 0,
+	            left: '10%',
+	            top: 60,
+	            right: '10%',
+	            bottom: 60,
+	            // If grid size contain label
+	            containLabel: false,
+	            // width: {totalWidth} - left - right,
+	            // height: {totalHeight} - top - bottom,
+	            backgroundColor: 'rgba(0,0,0,0)',
+	            borderWidth: 1,
+	            borderColor: '#ccc'
+	        }
+	    });
+
+
+/***/ },
+/* 126 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var ComponentModel = __webpack_require__(19);
+	    var zrUtil = __webpack_require__(4);
+	    var axisModelCreator = __webpack_require__(127);
+
+	    var AxisModel = ComponentModel.extend({
+
+	        type: 'cartesian2dAxis',
+
+	        /**
+	         * @type {module:echarts/coord/cartesian/Axis2D}
+	         */
+	        axis: null,
+
+	        /**
+	         * @override
+	         */
+	        init: function () {
+	            AxisModel.superApply(this, 'init', arguments);
+	            this._resetRange();
+	        },
+
+	        /**
+	         * @override
+	         */
+	        mergeOption: function () {
+	            AxisModel.superApply(this, 'mergeOption', arguments);
+	            this._resetRange();
+	        },
+
+	        /**
+	         * @override
+	         */
+	        restoreData: function () {
+	            AxisModel.superApply(this, 'restoreData', arguments);
+	            this._resetRange();
+	        },
+
+	        /**
+	         * @public
+	         * @param {number} rangeStart
+	         * @param {number} rangeEnd
+	         */
+	        setRange: function (rangeStart, rangeEnd) {
+	            this.option.rangeStart = rangeStart;
+	            this.option.rangeEnd = rangeEnd;
+	        },
+
+	        /**
+	         * @public
+	         * @return {Array.<number|string|Date>}
+	         */
+	        getMin: function () {
+	            var option = this.option;
+	            return option.rangeStart != null ? option.rangeStart : option.min;
+	        },
+
+	        /**
+	         * @public
+	         * @return {Array.<number|string|Date>}
+	         */
+	        getMax: function () {
+	            var option = this.option;
+	            return option.rangeEnd != null ? option.rangeEnd : option.max;
+	        },
+
+	        /**
+	         * @public
+	         * @return {boolean}
+	         */
+	        getNeedCrossZero: function () {
+	            var option = this.option;
+	            return (option.rangeStart != null || option.rangeEnd != null)
+	                ? false : !option.scale;
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _resetRange: function () {
+	            // rangeStart and rangeEnd is readonly.
+	            this.option.rangeStart = this.option.rangeEnd = null;
+	        }
+
+	    });
+
+	    function getAxisType(axisDim, option) {
+	        // Default axis with data is category axis
+	        return option.type || (option.data ? 'category' : 'value');
+	    }
+
+	    zrUtil.merge(AxisModel.prototype, __webpack_require__(129));
+
+	    var extraOption = {
+	        gridIndex: 0,
+
+	        // Offset is for multiple axis on the same position
+	        offset: 0
+	    };
+
+	    axisModelCreator('x', AxisModel, getAxisType, extraOption);
+	    axisModelCreator('y', AxisModel, getAxisType, extraOption);
+
+	    module.exports = AxisModel;
+
+
+/***/ },
+/* 127 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var axisDefault = __webpack_require__(128);
+	    var zrUtil = __webpack_require__(4);
+	    var ComponentModel = __webpack_require__(19);
+	    var layout = __webpack_require__(21);
+
+	    // FIXME axisType is fixed ?
+	    var AXIS_TYPES = ['value', 'category', 'time', 'log'];
+
+	    /**
+	     * Generate sub axis model class
+	     * @param {string} axisName 'x' 'y' 'radius' 'angle' 'parallel'
+	     * @param {module:echarts/model/Component} BaseAxisModelClass
+	     * @param {Function} axisTypeDefaulter
+	     * @param {Object} [extraDefaultOption]
+	     */
+	    module.exports = function (axisName, BaseAxisModelClass, axisTypeDefaulter, extraDefaultOption) {
+
+	        zrUtil.each(AXIS_TYPES, function (axisType) {
+
+	            BaseAxisModelClass.extend({
+
+	                type: axisName + 'Axis.' + axisType,
+
+	                mergeDefaultAndTheme: function (option, ecModel) {
+	                    var layoutMode = this.layoutMode;
+	                    var inputPositionParams = layoutMode
+	                        ? layout.getLayoutParams(option) : {};
+
+	                    var themeModel = ecModel.getTheme();
+	                    zrUtil.merge(option, themeModel.get(axisType + 'Axis'));
+	                    zrUtil.merge(option, this.getDefaultOption());
+
+	                    option.type = axisTypeDefaulter(axisName, option);
+
+	                    if (layoutMode) {
+	                        layout.mergeLayoutParam(option, inputPositionParams, layoutMode);
+	                    }
+	                },
+
+	                defaultOption: zrUtil.mergeAll(
+	                    [
+	                        {},
+	                        axisDefault[axisType + 'Axis'],
+	                        extraDefaultOption
+	                    ],
+	                    true
+	                )
+	            });
+	        });
+
+	        ComponentModel.registerSubTypeDefaulter(
+	            axisName + 'Axis',
+	            zrUtil.curry(axisTypeDefaulter, axisName)
+	        );
+	    };
+
+
+/***/ },
+/* 128 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+
+	    var defaultOption = {
+	        show: true,
+	        zlevel: 0,                  // 一级层叠
+	        z: 0,                       // 二级层叠
+	        // 反向坐标轴
+	        inverse: false,
+
+	        // 坐标轴名字，默认为空
+	        name: '',
+	        // 坐标轴名字位置，支持'start' | 'middle' | 'end'
+	        nameLocation: 'end',
+	        // 坐标轴名字旋转，degree。
+	        nameRotate: null, // Adapt to axis rotate, when nameLocation is 'middle'.
+	        nameTruncate: {
+	            maxWidth: null,
+	            ellipsis: '...',
+	            placeholder: '.'
+	        },
+	        // 坐标轴文字样式，默认取全局样式
+	        nameTextStyle: {},
+	        // 文字与轴线距离
+	        nameGap: 15,
+
+	        silent: false, // Default false to support tooltip.
+	        triggerEvent: false, // Default false to avoid legacy user event listener fail.
+
+	        tooltip: {
+	            show: false
+	        },
+
+	        // 坐标轴线
+	        axisLine: {
+	            // 默认显示，属性show控制显示与否
+	            show: true,
+	            onZero: true,
+	            // 属性lineStyle控制线条样式
+	            lineStyle: {
+	                color: '#333',
+	                width: 1,
+	                type: 'solid'
+	            }
+	        },
+	        // 坐标轴小标记
+	        axisTick: {
+	            // 属性show控制显示与否，默认显示
+	            show: true,
+	            // 控制小标记是否在grid里
+	            inside: false,
+	            // 属性length控制线长
+	            length: 5,
+	            // 属性lineStyle控制线条样式
+	            lineStyle: {
+	                width: 1
+	            }
+	        },
+	        // 坐标轴文本标签，详见axis.axisLabel
+	        axisLabel: {
+	            show: true,
+	            // 控制文本标签是否在grid里
+	            inside: false,
+	            rotate: 0,
+	            margin: 8,
+	            // formatter: null,
+	            // 其余属性默认使用全局文本样式，详见TEXTSTYLE
+	            textStyle: {
+	                fontSize: 12
+	            }
+	        },
+	        // 分隔线
+	        splitLine: {
+	            // 默认显示，属性show控制显示与否
+	            show: true,
+	            // 属性lineStyle（详见lineStyle）控制线条样式
+	            lineStyle: {
+	                color: ['#ccc'],
+	                width: 1,
+	                type: 'solid'
+	            }
+	        },
+	        // 分隔区域
+	        splitArea: {
+	            // 默认不显示，属性show控制显示与否
+	            show: false,
+	            // 属性areaStyle（详见areaStyle）控制区域样式
+	            areaStyle: {
+	                color: ['rgba(250,250,250,0.3)','rgba(200,200,200,0.3)']
+	            }
+	        }
+	    };
+
+	    var categoryAxis = zrUtil.merge({
+	        // 类目起始和结束两端空白策略
+	        boundaryGap: true,
+	        // splitArea: {
+	            // show: false
+	        // },
+	        splitLine: {
+	            show: false
+	        },
+	        // 坐标轴小标记
+	        axisTick: {
+	            // If tick is align with label when boundaryGap is true
+	            // Default with axisTick
+	            alignWithLabel: false,
+	            interval: 'auto'
+	        },
+	        // 坐标轴文本标签，详见axis.axisLabel
+	        axisLabel: {
+	            interval: 'auto'
+	        }
+	    }, defaultOption);
+
+	    var valueAxis = zrUtil.merge({
+	        // 数值起始和结束两端空白策略
+	        boundaryGap: [0, 0],
+	        // 最小值, 设置成 'dataMin' 则从数据中计算最小值
+	        // min: null,
+	        // 最大值，设置成 'dataMax' 则从数据中计算最大值
+	        // max: null,
+	        // Readonly prop, specifies start value of the range when using data zoom.
+	        // rangeStart: null
+	        // Readonly prop, specifies end value of the range when using data zoom.
+	        // rangeEnd: null
+	        // 脱离0值比例，放大聚焦到最终_min，_max区间
+	        // scale: false,
+	        // 分割段数，默认为5
+	        splitNumber: 5
+	        // Minimum interval
+	        // minInterval: null
+	    }, defaultOption);
+
+	    // FIXME
+	    var timeAxis = zrUtil.defaults({
+	        scale: true,
+	        min: 'dataMin',
+	        max: 'dataMax'
+	    }, valueAxis);
+	    var logAxis = zrUtil.defaults({}, valueAxis);
+	    logAxis.scale = true;
+
+	    module.exports = {
+	        categoryAxis: categoryAxis,
+	        valueAxis: valueAxis,
+	        timeAxis: timeAxis,
+	        logAxis: logAxis
+	    };
+
+
+/***/ },
+/* 129 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+	    var axisHelper = __webpack_require__(114);
+
+	    function getName(obj) {
+	        if (zrUtil.isObject(obj) && obj.value != null) {
+	            return obj.value;
+	        }
+	        else {
+	            return obj;
+	        }
+	    }
+	    /**
+	     * Get categories
+	     */
+	    function getCategories() {
+	        return this.get('type') === 'category'
+	            && zrUtil.map(this.get('data'), getName);
+	    }
+
+	    /**
+	     * Format labels
+	     * @return {Array.<string>}
+	     */
+	    function getFormattedLabels() {
+	        return axisHelper.getFormattedLabels(
+	            this.axis,
+	            this.get('axisLabel.formatter')
+	        );
+	    }
+
+	    module.exports = {
+
+	        getFormattedLabels: getFormattedLabels,
+
+	        getCategories: getCategories
+	    };
+
+
+/***/ },
+/* 130 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+	// TODO boundaryGap
+
+
+	    __webpack_require__(126);
+
+	    __webpack_require__(131);
+
+
+/***/ },
+/* 131 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+	    var graphic = __webpack_require__(43);
+	    var AxisBuilder = __webpack_require__(132);
+	    var ifIgnoreOnTick = AxisBuilder.ifIgnoreOnTick;
+	    var getInterval = AxisBuilder.getInterval;
+
+	    var axisBuilderAttrs = [
+	        'axisLine', 'axisLabel', 'axisTick', 'axisName'
+	    ];
+	    var selfBuilderAttrs = [
+	        'splitArea', 'splitLine'
+	    ];
+
+	    // function getAlignWithLabel(model, axisModel) {
+	    //     var alignWithLabel = model.get('alignWithLabel');
+	    //     if (alignWithLabel === 'auto') {
+	    //         alignWithLabel = axisModel.get('axisTick.alignWithLabel');
+	    //     }
+	    //     return alignWithLabel;
+	    // }
+
+	    var AxisView = __webpack_require__(1).extendComponentView({
+
+	        type: 'axis',
+
+	        render: function (axisModel, ecModel) {
+
+	            this.group.removeAll();
+
+	            var oldAxisGroup = this._axisGroup;
+	            this._axisGroup = new graphic.Group();
+
+	            this.group.add(this._axisGroup);
+
+	            if (!axisModel.get('show')) {
+	                return;
+	            }
+
+	            var gridModel = ecModel.getComponent('grid', axisModel.get('gridIndex'));
+
+	            var layout = layoutAxis(gridModel, axisModel);
+
+	            var axisBuilder = new AxisBuilder(axisModel, layout);
+
+	            zrUtil.each(axisBuilderAttrs, axisBuilder.add, axisBuilder);
+
+	            this._axisGroup.add(axisBuilder.getGroup());
+
+	            zrUtil.each(selfBuilderAttrs, function (name) {
+	                if (axisModel.get(name + '.show')) {
+	                    this['_' + name](axisModel, gridModel, layout.labelInterval);
+	                }
+	            }, this);
+
+	            graphic.groupTransition(oldAxisGroup, this._axisGroup, axisModel);
+	        },
+
+	        /**
+	         * @param {module:echarts/coord/cartesian/AxisModel} axisModel
+	         * @param {module:echarts/coord/cartesian/GridModel} gridModel
+	         * @param {number|Function} labelInterval
+	         * @private
+	         */
+	        _splitLine: function (axisModel, gridModel, labelInterval) {
+	            var axis = axisModel.axis;
+
+	            var splitLineModel = axisModel.getModel('splitLine');
+	            var lineStyleModel = splitLineModel.getModel('lineStyle');
+	            var lineColors = lineStyleModel.get('color');
+
+	            var lineInterval = getInterval(splitLineModel, labelInterval);
+
+	            lineColors = zrUtil.isArray(lineColors) ? lineColors : [lineColors];
+
+	            var gridRect = gridModel.coordinateSystem.getRect();
+	            var isHorizontal = axis.isHorizontal();
+
+	            var lineCount = 0;
+
+	            var ticksCoords = axis.getTicksCoords(
+	                // splitLineModel.get('alignWithLabel')
+	            );
+	            var ticks = axis.scale.getTicks();
+
+	            var p1 = [];
+	            var p2 = [];
+	            // Simple optimization
+	            // Batching the lines if color are the same
+	            var lineStyle = lineStyleModel.getLineStyle();
+	            for (var i = 0; i < ticksCoords.length; i++) {
+	                if (ifIgnoreOnTick(axis, i, lineInterval)) {
+	                    continue;
+	                }
+
+	                var tickCoord = axis.toGlobalCoord(ticksCoords[i]);
+
+	                if (isHorizontal) {
+	                    p1[0] = tickCoord;
+	                    p1[1] = gridRect.y;
+	                    p2[0] = tickCoord;
+	                    p2[1] = gridRect.y + gridRect.height;
+	                }
+	                else {
+	                    p1[0] = gridRect.x;
+	                    p1[1] = tickCoord;
+	                    p2[0] = gridRect.x + gridRect.width;
+	                    p2[1] = tickCoord;
+	                }
+
+	                var colorIndex = (lineCount++) % lineColors.length;
+	                this._axisGroup.add(new graphic.Line(graphic.subPixelOptimizeLine({
+	                    anid: 'line_' + ticks[i],
+
+	                    shape: {
+	                        x1: p1[0],
+	                        y1: p1[1],
+	                        x2: p2[0],
+	                        y2: p2[1]
+	                    },
+	                    style: zrUtil.defaults({
+	                        stroke: lineColors[colorIndex]
+	                    }, lineStyle),
+	                    silent: true
+	                })));
+	            }
+	        },
+
+	        /**
+	         * @param {module:echarts/coord/cartesian/AxisModel} axisModel
+	         * @param {module:echarts/coord/cartesian/GridModel} gridModel
+	         * @param {number|Function} labelInterval
+	         * @private
+	         */
+	        _splitArea: function (axisModel, gridModel, labelInterval) {
+	            var axis = axisModel.axis;
+
+	            var splitAreaModel = axisModel.getModel('splitArea');
+	            var areaStyleModel = splitAreaModel.getModel('areaStyle');
+	            var areaColors = areaStyleModel.get('color');
+
+	            var gridRect = gridModel.coordinateSystem.getRect();
+
+	            var ticksCoords = axis.getTicksCoords(
+	                // splitAreaModel.get('alignWithLabel')
+	            );
+	            var ticks = axis.scale.getTicks();
+
+	            var prevX = axis.toGlobalCoord(ticksCoords[0]);
+	            var prevY = axis.toGlobalCoord(ticksCoords[0]);
+
+	            var count = 0;
+
+	            var areaInterval = getInterval(splitAreaModel, labelInterval);
+
+	            var areaStyle = areaStyleModel.getAreaStyle();
+	            areaColors = zrUtil.isArray(areaColors) ? areaColors : [areaColors];
+
+	            for (var i = 1; i < ticksCoords.length; i++) {
+	                if (ifIgnoreOnTick(axis, i, areaInterval)) {
+	                    continue;
+	                }
+
+	                var tickCoord = axis.toGlobalCoord(ticksCoords[i]);
+
+	                var x;
+	                var y;
+	                var width;
+	                var height;
+	                if (axis.isHorizontal()) {
+	                    x = prevX;
+	                    y = gridRect.y;
+	                    width = tickCoord - x;
+	                    height = gridRect.height;
+	                }
+	                else {
+	                    x = gridRect.x;
+	                    y = prevY;
+	                    width = gridRect.width;
+	                    height = tickCoord - y;
+	                }
+
+	                var colorIndex = (count++) % areaColors.length;
+	                this._axisGroup.add(new graphic.Rect({
+	                    anid: 'area_' + ticks[i],
+
+	                    shape: {
+	                        x: x,
+	                        y: y,
+	                        width: width,
+	                        height: height
+	                    },
+	                    style: zrUtil.defaults({
+	                        fill: areaColors[colorIndex]
+	                    }, areaStyle),
+	                    silent: true
+	                }));
+
+	                prevX = x + width;
+	                prevY = y + height;
+	            }
+	        }
+	    });
+
+	    AxisView.extend({
+	        type: 'xAxis'
+	    });
+	    AxisView.extend({
+	        type: 'yAxis'
+	    });
+
+	    /**
+	     * @inner
+	     */
+	    function layoutAxis(gridModel, axisModel) {
+	        var grid = gridModel.coordinateSystem;
+	        var axis = axisModel.axis;
+	        var layout = {};
+
+	        var rawAxisPosition = axis.position;
+	        var axisPosition = axis.onZero ? 'onZero' : rawAxisPosition;
+	        var axisDim = axis.dim;
+
+	        // [left, right, top, bottom]
+	        var rect = grid.getRect();
+	        var rectBound = [rect.x, rect.x + rect.width, rect.y, rect.y + rect.height];
+
+	        var axisOffset = axisModel.get('offset') || 0;
+
+	        var posMap = {
+	            x: { top: rectBound[2] - axisOffset, bottom: rectBound[3] + axisOffset },
+	            y: { left: rectBound[0] - axisOffset, right: rectBound[1] + axisOffset }
+	        };
+
+	        posMap.x.onZero = Math.max(Math.min(getZero('y'), posMap.x.bottom), posMap.x.top);
+	        posMap.y.onZero = Math.max(Math.min(getZero('x'), posMap.y.right), posMap.y.left);
+
+	        function getZero(dim, val) {
+	            var theAxis = grid.getAxis(dim);
+	            return theAxis.toGlobalCoord(theAxis.dataToCoord(0));
+	        }
+
+	        // Axis position
+	        layout.position = [
+	            axisDim === 'y' ? posMap.y[axisPosition] : rectBound[0],
+	            axisDim === 'x' ? posMap.x[axisPosition] : rectBound[3]
+	        ];
+
+	        // Axis rotation
+	        layout.rotation = Math.PI / 2 * (axisDim === 'x' ? 0 : 1);
+
+	        // Tick and label direction, x y is axisDim
+	        var dirMap = {top: -1, bottom: 1, left: -1, right: 1};
+
+	        layout.labelDirection = layout.tickDirection = layout.nameDirection = dirMap[rawAxisPosition];
+	        if (axis.onZero) {
+	            layout.labelOffset = posMap[axisDim][rawAxisPosition] - posMap[axisDim].onZero;
+	        }
+
+	        if (axisModel.getModel('axisTick').get('inside')) {
+	            layout.tickDirection = -layout.tickDirection;
+	        }
+	        if (axisModel.getModel('axisLabel').get('inside')) {
+	            layout.labelDirection = -layout.labelDirection;
+	        }
+
+	        // Special label rotation
+	        var labelRotation = axisModel.getModel('axisLabel').get('rotate');
+	        layout.labelRotation = axisPosition === 'top' ? -labelRotation : labelRotation;
+
+	        // label interval when auto mode.
+	        layout.labelInterval = axis.getLabelInterval();
+
+	        // Over splitLine and splitArea
+	        layout.z2 = 1;
+
+	        return layout;
+	    }
+
+
+/***/ },
+/* 132 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+	    var formatUtil = __webpack_require__(6);
+	    var graphic = __webpack_require__(43);
+	    var Model = __webpack_require__(12);
+	    var numberUtil = __webpack_require__(7);
+	    var remRadian = numberUtil.remRadian;
+	    var isRadianAroundZero = numberUtil.isRadianAroundZero;
+	    var vec2 = __webpack_require__(10);
+	    var v2ApplyTransform = vec2.applyTransform;
+	    var retrieve = zrUtil.retrieve;
+
+	    var PI = Math.PI;
+
+	    function makeAxisEventDataBase(axisModel) {
+	        var eventData = {
+	            componentType: axisModel.mainType
+	        };
+	        eventData[axisModel.mainType + 'Index'] = axisModel.componentIndex;
+	        return eventData;
+	    }
+
+	    /**
+	     * A final axis is translated and rotated from a "standard axis".
+	     * So opt.position and opt.rotation is required.
+	     *
+	     * A standard axis is and axis from [0, 0] to [0, axisExtent[1]],
+	     * for example: (0, 0) ------------> (0, 50)
+	     *
+	     * nameDirection or tickDirection or labelDirection is 1 means tick
+	     * or label is below the standard axis, whereas is -1 means above
+	     * the standard axis. labelOffset means offset between label and axis,
+	     * which is useful when 'onZero', where axisLabel is in the grid and
+	     * label in outside grid.
+	     *
+	     * Tips: like always,
+	     * positive rotation represents anticlockwise, and negative rotation
+	     * represents clockwise.
+	     * The direction of position coordinate is the same as the direction
+	     * of screen coordinate.
+	     *
+	     * Do not need to consider axis 'inverse', which is auto processed by
+	     * axis extent.
+	     *
+	     * @param {module:zrender/container/Group} group
+	     * @param {Object} axisModel
+	     * @param {Object} opt Standard axis parameters.
+	     * @param {Array.<number>} opt.position [x, y]
+	     * @param {number} opt.rotation by radian
+	     * @param {number} [opt.nameDirection=1] 1 or -1 Used when nameLocation is 'middle'.
+	     * @param {number} [opt.tickDirection=1] 1 or -1
+	     * @param {number} [opt.labelDirection=1] 1 or -1
+	     * @param {number} [opt.labelOffset=0] Usefull when onZero.
+	     * @param {string} [opt.axisLabelShow] default get from axisModel.
+	     * @param {string} [opt.axisName] default get from axisModel.
+	     * @param {number} [opt.axisNameAvailableWidth]
+	     * @param {number} [opt.labelRotation] by degree, default get from axisModel.
+	     * @param {number} [opt.labelInterval] Default label interval when label
+	     *                                     interval from model is null or 'auto'.
+	     * @param {number} [opt.strokeContainThreshold] Default label interval when label
+	     */
+	    var AxisBuilder = function (axisModel, opt) {
+
+	        /**
+	         * @readOnly
+	         */
+	        this.opt = opt;
+
+	        /**
+	         * @readOnly
+	         */
+	        this.axisModel = axisModel;
+
+	        // Default value
+	        zrUtil.defaults(
+	            opt,
+	            {
+	                labelOffset: 0,
+	                nameDirection: 1,
+	                tickDirection: 1,
+	                labelDirection: 1,
+	                silent: true
+	            }
+	        );
+
+	        /**
+	         * @readOnly
+	         */
+	        this.group = new graphic.Group();
+
+	        // FIXME Not use a seperate text group?
+	        var dumbGroup = new graphic.Group({
+	            position: opt.position.slice(),
+	            rotation: opt.rotation
+	        });
+
+	        // this.group.add(dumbGroup);
+	        // this._dumbGroup = dumbGroup;
+
+	        dumbGroup.updateTransform();
+	        this._transform = dumbGroup.transform;
+
+	        this._dumbGroup = dumbGroup;
+	    };
+
+	    AxisBuilder.prototype = {
+
+	        constructor: AxisBuilder,
+
+	        hasBuilder: function (name) {
+	            return !!builders[name];
+	        },
+
+	        add: function (name) {
+	            builders[name].call(this);
+	        },
+
+	        getGroup: function () {
+	            return this.group;
+	        }
+
+	    };
+
+	    var builders = {
+
+	        /**
+	         * @private
+	         */
+	        axisLine: function () {
+	            var opt = this.opt;
+	            var axisModel = this.axisModel;
+
+	            if (!axisModel.get('axisLine.show')) {
+	                return;
+	            }
+
+	            var extent = this.axisModel.axis.getExtent();
+
+	            var matrix = this._transform;
+	            var pt1 = [extent[0], 0];
+	            var pt2 = [extent[1], 0];
+	            if (matrix) {
+	                v2ApplyTransform(pt1, pt1, matrix);
+	                v2ApplyTransform(pt2, pt2, matrix);
+	            }
+
+	            this.group.add(new graphic.Line(graphic.subPixelOptimizeLine({
+
+	                // Id for animation
+	                anid: 'line',
+
+	                shape: {
+	                    x1: pt1[0],
+	                    y1: pt1[1],
+	                    x2: pt2[0],
+	                    y2: pt2[1]
+	                },
+	                style: zrUtil.extend(
+	                    {lineCap: 'round'},
+	                    axisModel.getModel('axisLine.lineStyle').getLineStyle()
+	                ),
+	                strokeContainThreshold: opt.strokeContainThreshold || 5,
+	                silent: true,
+	                z2: 1
+	            })));
+	        },
+
+	        /**
+	         * @private
+	         */
+	        axisTick: function () {
+	            var axisModel = this.axisModel;
+
+	            if (!axisModel.get('axisTick.show')) {
+	                return;
+	            }
+
+	            var axis = axisModel.axis;
+	            var tickModel = axisModel.getModel('axisTick');
+	            var opt = this.opt;
+
+	            var lineStyleModel = tickModel.getModel('lineStyle');
+	            var tickLen = tickModel.get('length');
+
+	            var tickInterval = getInterval(tickModel, opt.labelInterval);
+	            var ticksCoords = axis.getTicksCoords(tickModel.get('alignWithLabel'));
+	            var ticks = axis.scale.getTicks();
+
+	            var pt1 = [];
+	            var pt2 = [];
+	            var matrix = this._transform;
+
+	            for (var i = 0; i < ticksCoords.length; i++) {
+	                // Only ordinal scale support tick interval
+	                if (ifIgnoreOnTick(axis, i, tickInterval)) {
+	                     continue;
+	                }
+
+	                var tickCoord = ticksCoords[i];
+
+	                pt1[0] = tickCoord;
+	                pt1[1] = 0;
+	                pt2[0] = tickCoord;
+	                pt2[1] = opt.tickDirection * tickLen;
+
+	                if (matrix) {
+	                    v2ApplyTransform(pt1, pt1, matrix);
+	                    v2ApplyTransform(pt2, pt2, matrix);
+	                }
+	                // Tick line, Not use group transform to have better line draw
+	                this.group.add(new graphic.Line(graphic.subPixelOptimizeLine({
+
+	                    // Id for animation
+	                    anid: 'tick_' + ticks[i],
+
+	                    shape: {
+	                        x1: pt1[0],
+	                        y1: pt1[1],
+	                        x2: pt2[0],
+	                        y2: pt2[1]
+	                    },
+	                    style: zrUtil.defaults(
+	                        lineStyleModel.getLineStyle(),
+	                        {
+	                            stroke: axisModel.get('axisLine.lineStyle.color')
+	                        }
+	                    ),
+	                    z2: 2,
+	                    silent: true
+	                })));
+	            }
+	        },
+
+	        /**
+	         * @param {module:echarts/coord/cartesian/AxisModel} axisModel
+	         * @param {module:echarts/coord/cartesian/GridModel} gridModel
+	         * @private
+	         */
+	        axisLabel: function () {
+	            var opt = this.opt;
+	            var axisModel = this.axisModel;
+	            var show = retrieve(opt.axisLabelShow, axisModel.get('axisLabel.show'));
+
+	            if (!show) {
+	                return;
+	            }
+
+	            var axis = axisModel.axis;
+	            var labelModel = axisModel.getModel('axisLabel');
+	            var textStyleModel = labelModel.getModel('textStyle');
+	            var labelMargin = labelModel.get('margin');
+	            var ticks = axis.scale.getTicks();
+	            var labels = axisModel.getFormattedLabels();
+
+	            // Special label rotate.
+	            var labelRotation = retrieve(opt.labelRotation, labelModel.get('rotate')) || 0;
+	            // To radian.
+	            labelRotation = labelRotation * PI / 180;
+
+	            var labelLayout = innerTextLayout(opt, labelRotation, opt.labelDirection);
+	            var categoryData = axisModel.get('data');
+
+	            var textEls = [];
+	            var silent = isSilent(axisModel);
+	            var triggerEvent = axisModel.get('triggerEvent');
+
+	            for (var i = 0; i < ticks.length; i++) {
+	                if (ifIgnoreOnTick(axis, i, opt.labelInterval)) {
+	                     continue;
+	                }
+
+	                var itemTextStyleModel = textStyleModel;
+	                if (categoryData && categoryData[i] && categoryData[i].textStyle) {
+	                    itemTextStyleModel = new Model(
+	                        categoryData[i].textStyle, textStyleModel, axisModel.ecModel
+	                    );
+	                }
+	                var textColor = itemTextStyleModel.getTextColor()
+	                    || axisModel.get('axisLine.lineStyle.color');
+
+	                var tickCoord = axis.dataToCoord(ticks[i]);
+	                var pos = [
+	                    tickCoord,
+	                    opt.labelOffset + opt.labelDirection * labelMargin
+	                ];
+	                var labelBeforeFormat = axis.scale.getLabel(ticks[i]);
+
+	                var textEl = new graphic.Text({
+
+	                    // Id for animation
+	                    anid: 'label_' + ticks[i],
+
+	                    style: {
+	                        text: labels[i],
+	                        textAlign: itemTextStyleModel.get('align', true) || labelLayout.textAlign,
+	                        textVerticalAlign: itemTextStyleModel.get('baseline', true) || labelLayout.verticalAlign,
+	                        textFont: itemTextStyleModel.getFont(),
+	                        fill: typeof textColor === 'function' ? textColor(labelBeforeFormat) : textColor
+	                    },
+	                    position: pos,
+	                    rotation: labelLayout.rotation,
+	                    silent: silent,
+	                    z2: 10
+	                });
+
+	                // Pack data for mouse event
+	                if (triggerEvent) {
+	                    textEl.eventData = makeAxisEventDataBase(axisModel);
+	                    textEl.eventData.targetType = 'axisLabel';
+	                    textEl.eventData.value = labelBeforeFormat;
+	                }
+
+
+	                // FIXME
+	                this._dumbGroup.add(textEl);
+	                textEl.updateTransform();
+
+	                textEls.push(textEl);
+	                this.group.add(textEl);
+
+	                textEl.decomposeTransform();
+	            }
+
+	            function isTwoLabelOverlapped(current, next) {
+	                var firstRect = current && current.getBoundingRect().clone();
+	                var nextRect = next && next.getBoundingRect().clone();
+	                if (firstRect && nextRect) {
+	                    firstRect.applyTransform(current.getLocalTransform());
+	                    nextRect.applyTransform(next.getLocalTransform());
+	                    return firstRect.intersect(nextRect);
+	                }
+	            }
+	            if (axis.type !== 'category') {
+	                // If min or max are user set, we need to check
+	                // If the tick on min(max) are overlap on their neighbour tick
+	                // If they are overlapped, we need to hide the min(max) tick label
+	                if (axisModel.getMin ? axisModel.getMin() : axisModel.get('min')) {
+	                    var firstLabel = textEls[0];
+	                    var nextLabel = textEls[1];
+	                    if (isTwoLabelOverlapped(firstLabel, nextLabel)) {
+	                        firstLabel.ignore = true;
+	                    }
+	                }
+	                if (axisModel.getMax ? axisModel.getMax() : axisModel.get('max')) {
+	                    var lastLabel = textEls[textEls.length - 1];
+	                    var prevLabel = textEls[textEls.length - 2];
+	                    if (isTwoLabelOverlapped(prevLabel, lastLabel)) {
+	                        lastLabel.ignore = true;
+	                    }
+	                }
+	            }
+	        },
+
+	        /**
+	         * @private
+	         */
+	        axisName: function () {
+	            var opt = this.opt;
+	            var axisModel = this.axisModel;
+	            var name = retrieve(opt.axisName, axisModel.get('name'));
+
+	            if (!name) {
+	                return;
+	            }
+
+	            var nameLocation = axisModel.get('nameLocation');
+	            var nameDirection = opt.nameDirection;
+	            var textStyleModel = axisModel.getModel('nameTextStyle');
+	            var gap = axisModel.get('nameGap') || 0;
+
+	            var extent = this.axisModel.axis.getExtent();
+	            var gapSignal = extent[0] > extent[1] ? -1 : 1;
+	            var pos = [
+	                nameLocation === 'start'
+	                    ? extent[0] - gapSignal * gap
+	                    : nameLocation === 'end'
+	                    ? extent[1] + gapSignal * gap
+	                    : (extent[0] + extent[1]) / 2, // 'middle'
+	                // Reuse labelOffset.
+	                nameLocation === 'middle' ? opt.labelOffset + nameDirection * gap : 0
+	            ];
+
+	            var labelLayout;
+
+	            var nameRotation = axisModel.get('nameRotate');
+	            if (nameRotation != null) {
+	                nameRotation = nameRotation * PI / 180; // To radian.
+	            }
+
+	            var axisNameAvailableWidth;
+
+	            if (nameLocation === 'middle') {
+	                labelLayout = innerTextLayout(
+	                    opt,
+	                    nameRotation != null ? nameRotation : opt.rotation, // Adapt to axis.
+	                    nameDirection
+	                );
+	            }
+	            else {
+	                labelLayout = endTextLayout(
+	                    opt, nameLocation, nameRotation || 0, extent
+	                );
+
+	                axisNameAvailableWidth = opt.axisNameAvailableWidth;
+	                if (axisNameAvailableWidth != null) {
+	                    axisNameAvailableWidth = Math.abs(
+	                        axisNameAvailableWidth / Math.sin(labelLayout.rotation)
+	                    );
+	                    !isFinite(axisNameAvailableWidth) && (axisNameAvailableWidth = null);
+	                }
+	            }
+
+	            var textFont = textStyleModel.getFont();
+
+	            var truncateOpt = axisModel.get('nameTruncate', true) || {};
+	            var ellipsis = truncateOpt.ellipsis;
+	            var maxWidth = retrieve(truncateOpt.maxWidth, axisNameAvailableWidth);
+	            var truncatedText = (ellipsis != null && maxWidth != null)
+	                ? formatUtil.truncateText(
+	                    name, maxWidth, textFont, ellipsis,
+	                    {minChar: 2, placeholder: truncateOpt.placeholder}
+	                )
+	                : name;
+
+	            var tooltipOpt = axisModel.get('tooltip', true);
+
+	            var mainType = axisModel.mainType;
+	            var formatterParams = {
+	                componentType: mainType,
+	                name: name,
+	                $vars: ['name']
+	            };
+	            formatterParams[mainType + 'Index'] = axisModel.componentIndex;
+
+	            var textEl = new graphic.Text({
+
+	                // Id for animation
+	                anid: 'name',
+
+	                __fullText: name,
+	                __truncatedText: truncatedText,
+
+	                style: {
+	                    text: truncatedText,
+	                    textFont: textFont,
+	                    fill: textStyleModel.getTextColor()
+	                        || axisModel.get('axisLine.lineStyle.color'),
+	                    textAlign: labelLayout.textAlign,
+	                    textVerticalAlign: labelLayout.verticalAlign
+	                },
+	                position: pos,
+	                rotation: labelLayout.rotation,
+	                silent: isSilent(axisModel),
+	                z2: 1,
+	                tooltip: (tooltipOpt && tooltipOpt.show)
+	                    ? zrUtil.extend({
+	                        content: name,
+	                        formatter: function () {
+	                            return name;
+	                        },
+	                        formatterParams: formatterParams
+	                    }, tooltipOpt)
+	                    : null
+	            });
+
+	            if (axisModel.get('triggerEvent')) {
+	                textEl.eventData = makeAxisEventDataBase(axisModel);
+	                textEl.eventData.targetType = 'axisName';
+	                textEl.eventData.name = name;
+	            }
+
+	            // FIXME
+	            this._dumbGroup.add(textEl);
+	            textEl.updateTransform();
+
+	            this.group.add(textEl);
+
+	            textEl.decomposeTransform();
+	        }
+
+	    };
+
+	    /**
+	     * @inner
+	     */
+	    function innerTextLayout(opt, textRotation, direction) {
+	        var rotationDiff = remRadian(textRotation - opt.rotation);
+	        var textAlign;
+	        var verticalAlign;
+
+	        if (isRadianAroundZero(rotationDiff)) { // Label is parallel with axis line.
+	            verticalAlign = direction > 0 ? 'top' : 'bottom';
+	            textAlign = 'center';
+	        }
+	        else if (isRadianAroundZero(rotationDiff - PI)) { // Label is inverse parallel with axis line.
+	            verticalAlign = direction > 0 ? 'bottom' : 'top';
+	            textAlign = 'center';
+	        }
+	        else {
+	            verticalAlign = 'middle';
+
+	            if (rotationDiff > 0 && rotationDiff < PI) {
+	                textAlign = direction > 0 ? 'right' : 'left';
+	            }
+	            else {
+	                textAlign = direction > 0 ? 'left' : 'right';
+	            }
+	        }
+
+	        return {
+	            rotation: rotationDiff,
+	            textAlign: textAlign,
+	            verticalAlign: verticalAlign
+	        };
+	    }
+
+	    /**
+	     * @inner
+	     */
+	    function endTextLayout(opt, textPosition, textRotate, extent) {
+	        var rotationDiff = remRadian(textRotate - opt.rotation);
+	        var textAlign;
+	        var verticalAlign;
+	        var inverse = extent[0] > extent[1];
+	        var onLeft = (textPosition === 'start' && !inverse)
+	            || (textPosition !== 'start' && inverse);
+
+	        if (isRadianAroundZero(rotationDiff - PI / 2)) {
+	            verticalAlign = onLeft ? 'bottom' : 'top';
+	            textAlign = 'center';
+	        }
+	        else if (isRadianAroundZero(rotationDiff - PI * 1.5)) {
+	            verticalAlign = onLeft ? 'top' : 'bottom';
+	            textAlign = 'center';
+	        }
+	        else {
+	            verticalAlign = 'middle';
+	            if (rotationDiff < PI * 1.5 && rotationDiff > PI / 2) {
+	                textAlign = onLeft ? 'left' : 'right';
+	            }
+	            else {
+	                textAlign = onLeft ? 'right' : 'left';
+	            }
+	        }
+
+	        return {
+	            rotation: rotationDiff,
+	            textAlign: textAlign,
+	            verticalAlign: verticalAlign
+	        };
+	    }
+
+	    /**
+	     * @inner
+	     */
+	    function isSilent(axisModel) {
+	        var tooltipOpt = axisModel.get('tooltip');
+	        return axisModel.get('silent')
+	            // Consider mouse cursor, add these restrictions.
+	            || !(
+	                axisModel.get('triggerEvent') || (tooltipOpt && tooltipOpt.show)
+	            );
+	    }
+
+	    /**
+	     * @static
+	     */
+	    var ifIgnoreOnTick = AxisBuilder.ifIgnoreOnTick = function (axis, i, interval) {
+	        var rawTick;
+	        var scale = axis.scale;
+	        return scale.type === 'ordinal'
+	            && (
+	                typeof interval === 'function'
+	                    ? (
+	                        rawTick = scale.getTicks()[i],
+	                        !interval(rawTick, scale.getLabel(rawTick))
+	                    )
+	                    : i % (interval + 1)
+	            );
+	    };
+
+	    /**
+	     * @static
+	     */
+	    var getInterval = AxisBuilder.getInterval = function (model, labelInterval) {
+	        var interval = model.get('interval');
+	        if (interval == null || interval == 'auto') {
+	            interval = labelInterval;
+	        }
+	        return interval;
+	    };
+
+	    module.exports = AxisBuilder;
+
+
+
+/***/ },
+/* 133 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+
+	    __webpack_require__(113);
+
+	    __webpack_require__(134);
+	    __webpack_require__(135);
+
+	    var barLayoutGrid = __webpack_require__(137);
+	    var echarts = __webpack_require__(1);
+
+	    echarts.registerLayout(zrUtil.curry(barLayoutGrid, 'bar'));
+	    // Visual coding for legend
+	    echarts.registerVisual(function (ecModel) {
+	        ecModel.eachSeriesByType('bar', function (seriesModel) {
+	            var data = seriesModel.getData();
+	            data.setVisual('legendSymbol', 'roundRect');
+	        });
+	    });
+
+	    // In case developer forget to include grid component
+	    __webpack_require__(112);
+
+
+/***/ },
+/* 134 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var SeriesModel = __webpack_require__(28);
+	    var createListFromArray = __webpack_require__(101);
+
+	    module.exports = SeriesModel.extend({
+
+	        type: 'series.bar',
+
+	        dependencies: ['grid', 'polar'],
+
+	        getInitialData: function (option, ecModel) {
+	            if (true) {
+	                var coordSys = option.coordinateSystem;
+	                if (coordSys !== 'cartesian2d') {
+	                    throw new Error('Bar only support cartesian2d coordinateSystem');
+	                }
+	            }
+	            return createListFromArray(option.data, this, ecModel);
+	        },
+
+	        getMarkerPosition: function (value) {
+	            var coordSys = this.coordinateSystem;
+	            if (coordSys) {
+	                // PENDING if clamp ?
+	                var pt = coordSys.dataToPoint(value, true);
+	                var data = this.getData();
+	                var offset = data.getLayout('offset');
+	                var size = data.getLayout('size');
+	                var offsetIndex = coordSys.getBaseAxis().isHorizontal() ? 0 : 1;
+	                pt[offsetIndex] += offset + size / 2;
+	                return pt;
+	            }
+	            return [NaN, NaN];
+	        },
+
+	        brushSelector: 'rect',
+
+	        defaultOption: {
+	            zlevel: 0,                  // 一级层叠
+	            z: 2,                       // 二级层叠
+	            coordinateSystem: 'cartesian2d',
+	            legendHoverLink: true,
+	            // stack: null
+
+	            // Cartesian coordinate system
+	            xAxisIndex: 0,
+	            yAxisIndex: 0,
+
+	            // 最小高度改为0
+	            barMinHeight: 0,
+
+	            // barMaxWidth: null,
+	            // 默认自适应
+	            // barWidth: null,
+	            // 柱间距离，默认为柱形宽度的30%，可设固定值
+	            // barGap: '30%',
+	            // 类目间柱形距离，默认为类目间距的20%，可设固定值
+	            // barCategoryGap: '20%',
+	            // label: {
+	            //     normal: {
+	            //         show: false
+	            //     }
+	            // },
+	            itemStyle: {
+	                normal: {
+	                    // color: '各异'
+	                },
+	                emphasis: {}
+	            }
+	        }
+	    });
+
+
+/***/ },
+/* 135 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var graphic = __webpack_require__(43);
+
+	    zrUtil.extend(__webpack_require__(12).prototype, __webpack_require__(136));
+
+	    function fixLayoutWithLineWidth(layout, lineWidth) {
+	        var signX = layout.width > 0 ? 1 : -1;
+	        var signY = layout.height > 0 ? 1 : -1;
+	        // In case width or height are too small.
+	        lineWidth = Math.min(lineWidth, Math.abs(layout.width), Math.abs(layout.height));
+	        layout.x += signX * lineWidth / 2;
+	        layout.y += signY * lineWidth / 2;
+	        layout.width -= signX * lineWidth;
+	        layout.height -= signY * lineWidth;
+	    }
+
+	    module.exports = __webpack_require__(1).extendChartView({
+
+	        type: 'bar',
+
+	        render: function (seriesModel, ecModel, api) {
+	            var coordinateSystemType = seriesModel.get('coordinateSystem');
+
+	            if (coordinateSystemType === 'cartesian2d') {
+	                this._renderOnCartesian(seriesModel, ecModel, api);
+	            }
+
+	            return this.group;
+	        },
+
+	        _renderOnCartesian: function (seriesModel, ecModel, api) {
+	            var group = this.group;
+	            var data = seriesModel.getData();
+	            var oldData = this._data;
+
+	            var cartesian = seriesModel.coordinateSystem;
+	            var baseAxis = cartesian.getBaseAxis();
+	            var isHorizontal = baseAxis.isHorizontal();
+
+	            var enableAnimation = seriesModel.get('animation');
+
+	            var barBorderWidthQuery = ['itemStyle', 'normal', 'barBorderWidth'];
+
+	            function createRect(dataIndex, isUpdate) {
+	                var layout = data.getItemLayout(dataIndex);
+	                var lineWidth = data.getItemModel(dataIndex).get(barBorderWidthQuery) || 0;
+	                fixLayoutWithLineWidth(layout, lineWidth);
+
+	                var rect = new graphic.Rect({
+	                    shape: zrUtil.extend({}, layout)
+	                });
+	                // Animation
+	                if (enableAnimation) {
+	                    var rectShape = rect.shape;
+	                    var animateProperty = isHorizontal ? 'height' : 'width';
+	                    var animateTarget = {};
+	                    rectShape[animateProperty] = 0;
+	                    animateTarget[animateProperty] = layout[animateProperty];
+	                    graphic[isUpdate? 'updateProps' : 'initProps'](rect, {
+	                        shape: animateTarget
+	                    }, seriesModel, dataIndex);
+	                }
+	                return rect;
+	            }
+	            data.diff(oldData)
+	                .add(function (dataIndex) {
+	                    // 空数据
+	                    if (!data.hasValue(dataIndex)) {
+	                        return;
+	                    }
+
+	                    var rect = createRect(dataIndex);
+
+	                    data.setItemGraphicEl(dataIndex, rect);
+
+	                    group.add(rect);
+
+	                })
+	                .update(function (newIndex, oldIndex) {
+	                    var rect = oldData.getItemGraphicEl(oldIndex);
+	                    // 空数据
+	                    if (!data.hasValue(newIndex)) {
+	                        group.remove(rect);
+	                        return;
+	                    }
+	                    if (!rect) {
+	                        rect = createRect(newIndex, true);
+	                    }
+
+	                    var layout = data.getItemLayout(newIndex);
+	                    var lineWidth = data.getItemModel(newIndex).get(barBorderWidthQuery) || 0;
+	                    fixLayoutWithLineWidth(layout, lineWidth);
+
+	                    graphic.updateProps(rect, {
+	                        shape: layout
+	                    }, seriesModel, newIndex);
+
+	                    data.setItemGraphicEl(newIndex, rect);
+
+	                    // Add back
+	                    group.add(rect);
+	                })
+	                .remove(function (idx) {
+	                    var rect = oldData.getItemGraphicEl(idx);
+	                    if (rect) {
+	                        // Not show text when animating
+	                        rect.style.text = '';
+	                        graphic.updateProps(rect, {
+	                            shape: {
+	                                width: 0
+	                            }
+	                        }, seriesModel, idx, function () {
+	                            group.remove(rect);
+	                        });
+	                    }
+	                })
+	                .execute();
+
+	            this._updateStyle(seriesModel, data, isHorizontal);
+
+	            this._data = data;
+	        },
+
+	        _updateStyle: function (seriesModel, data, isHorizontal) {
+	            function setLabel(style, model, color, labelText, labelPositionOutside) {
+	                graphic.setText(style, model, color);
+	                style.text = labelText;
+	                if (style.textPosition === 'outside') {
+	                    style.textPosition = labelPositionOutside;
+	                }
+	            }
+
+	            data.eachItemGraphicEl(function (rect, idx) {
+	                var itemModel = data.getItemModel(idx);
+	                var color = data.getItemVisual(idx, 'color');
+	                var opacity = data.getItemVisual(idx, 'opacity');
+	                var layout = data.getItemLayout(idx);
+	                var itemStyleModel = itemModel.getModel('itemStyle.normal');
+
+	                var hoverStyle = itemModel.getModel('itemStyle.emphasis').getBarItemStyle();
+
+	                rect.setShape('r', itemStyleModel.get('barBorderRadius') || 0);
+
+	                rect.useStyle(zrUtil.defaults(
+	                    {
+	                        fill: color,
+	                        opacity: opacity
+	                    },
+	                    itemStyleModel.getBarItemStyle()
+	                ));
+
+	                var labelPositionOutside = isHorizontal
+	                    ? (layout.height > 0 ? 'bottom' : 'top')
+	                    : (layout.width > 0 ? 'left' : 'right');
+
+	                var labelModel = itemModel.getModel('label.normal');
+	                var hoverLabelModel = itemModel.getModel('label.emphasis');
+	                var rectStyle = rect.style;
+	                if (labelModel.get('show')) {
+	                    setLabel(
+	                        rectStyle, labelModel, color,
+	                        zrUtil.retrieve(
+	                            seriesModel.getFormattedLabel(idx, 'normal'),
+	                            seriesModel.getRawValue(idx)
+	                        ),
+	                        labelPositionOutside
+	                    );
+	                }
+	                else {
+	                    rectStyle.text = '';
+	                }
+	                if (hoverLabelModel.get('show')) {
+	                    setLabel(
+	                        hoverStyle, hoverLabelModel, color,
+	                        zrUtil.retrieve(
+	                            seriesModel.getFormattedLabel(idx, 'emphasis'),
+	                            seriesModel.getRawValue(idx)
+	                        ),
+	                        labelPositionOutside
+	                    );
+	                }
+	                else {
+	                    hoverStyle.text = '';
+	                }
+	                graphic.setHoverStyle(rect, hoverStyle);
+	            });
+	        },
+
+	        remove: function (ecModel, api) {
+	            var group = this.group;
+	            if (ecModel.get('animation')) {
+	                if (this._data) {
+	                    this._data.eachItemGraphicEl(function (el) {
+	                        // Not show text when animating
+	                        el.style.text = '';
+	                        graphic.updateProps(el, {
+	                            shape: {
+	                                width: 0
+	                            }
+	                        }, ecModel, el.dataIndex, function () {
+	                            group.remove(el);
+	                        });
+	                    });
+	                }
+	            }
+	            else {
+	                group.removeAll();
+	            }
+	        }
+	    });
+
+
+/***/ },
+/* 136 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+
+	    var getBarItemStyle = __webpack_require__(15)(
+	        [
+	            ['fill', 'color'],
+	            ['stroke', 'borderColor'],
+	            ['lineWidth', 'borderWidth'],
+	            // Compatitable with 2
+	            ['stroke', 'barBorderColor'],
+	            ['lineWidth', 'barBorderWidth'],
+	            ['opacity'],
+	            ['shadowBlur'],
+	            ['shadowOffsetX'],
+	            ['shadowOffsetY'],
+	            ['shadowColor']
+	        ]
+	    );
+	    module.exports = {
+	        getBarItemStyle: function (excludes) {
+	            var style = getBarItemStyle.call(this, excludes);
+	            if (this.getBorderLineDash) {
+	                var lineDash = this.getBorderLineDash();
+	                lineDash && (style.lineDash = lineDash);
+	            }
+	            return style;
+	        }
+	    };
+
+
+/***/ },
+/* 137 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var numberUtil = __webpack_require__(7);
+	    var parsePercent = numberUtil.parsePercent;
+
+	    function getSeriesStackId(seriesModel) {
+	        return seriesModel.get('stack') || '__ec_stack_' + seriesModel.seriesIndex;
+	    }
+
+	    function getAxisKey(axis) {
+	        return axis.dim + axis.index;
+	    }
+
+	    function calBarWidthAndOffset(barSeries, api) {
+	        // Columns info on each category axis. Key is cartesian name
+	        var columnsMap = {};
+
+	        zrUtil.each(barSeries, function (seriesModel, idx) {
+	            var data = seriesModel.getData();
+	            var cartesian = seriesModel.coordinateSystem;
+
+	            var baseAxis = cartesian.getBaseAxis();
+	            var axisExtent = baseAxis.getExtent();
+	            var bandWidth = baseAxis.type === 'category'
+	                ? baseAxis.getBandWidth()
+	                : (Math.abs(axisExtent[1] - axisExtent[0]) / data.count());
+
+	            var columnsOnAxis = columnsMap[getAxisKey(baseAxis)] || {
+	                bandWidth: bandWidth,
+	                remainedWidth: bandWidth,
+	                autoWidthCount: 0,
+	                categoryGap: '20%',
+	                gap: '30%',
+	                stacks: {}
+	            };
+	            var stacks = columnsOnAxis.stacks;
+	            columnsMap[getAxisKey(baseAxis)] = columnsOnAxis;
+
+	            var stackId = getSeriesStackId(seriesModel);
+
+	            if (!stacks[stackId]) {
+	                columnsOnAxis.autoWidthCount++;
+	            }
+	            stacks[stackId] = stacks[stackId] || {
+	                width: 0,
+	                maxWidth: 0
+	            };
+
+	            var barWidth = parsePercent(
+	                seriesModel.get('barWidth'), bandWidth
+	            );
+	            var barMaxWidth = parsePercent(
+	                seriesModel.get('barMaxWidth'), bandWidth
+	            );
+	            var barGap = seriesModel.get('barGap');
+	            var barCategoryGap = seriesModel.get('barCategoryGap');
+	            // TODO
+	            if (barWidth && !stacks[stackId].width) {
+	                barWidth = Math.min(columnsOnAxis.remainedWidth, barWidth);
+	                stacks[stackId].width = barWidth;
+	                columnsOnAxis.remainedWidth -= barWidth;
+	            }
+
+	            barMaxWidth && (stacks[stackId].maxWidth = barMaxWidth);
+	            (barGap != null) && (columnsOnAxis.gap = barGap);
+	            (barCategoryGap != null) && (columnsOnAxis.categoryGap = barCategoryGap);
+	        });
+
+	        var result = {};
+
+	        zrUtil.each(columnsMap, function (columnsOnAxis, coordSysName) {
+
+	            result[coordSysName] = {};
+
+	            var stacks = columnsOnAxis.stacks;
+	            var bandWidth = columnsOnAxis.bandWidth;
+	            var categoryGap = parsePercent(columnsOnAxis.categoryGap, bandWidth);
+	            var barGapPercent = parsePercent(columnsOnAxis.gap, 1);
+
+	            var remainedWidth = columnsOnAxis.remainedWidth;
+	            var autoWidthCount = columnsOnAxis.autoWidthCount;
+	            var autoWidth = (remainedWidth - categoryGap)
+	                / (autoWidthCount + (autoWidthCount - 1) * barGapPercent);
+	            autoWidth = Math.max(autoWidth, 0);
+
+	            // Find if any auto calculated bar exceeded maxBarWidth
+	            zrUtil.each(stacks, function (column, stack) {
+	                var maxWidth = column.maxWidth;
+	                if (!column.width && maxWidth && maxWidth < autoWidth) {
+	                    maxWidth = Math.min(maxWidth, remainedWidth);
+	                    remainedWidth -= maxWidth;
+	                    column.width = maxWidth;
+	                    autoWidthCount--;
+	                }
+	            });
+
+	            // Recalculate width again
+	            autoWidth = (remainedWidth - categoryGap)
+	                / (autoWidthCount + (autoWidthCount - 1) * barGapPercent);
+	            autoWidth = Math.max(autoWidth, 0);
+
+	            var widthSum = 0;
+	            var lastColumn;
+	            zrUtil.each(stacks, function (column, idx) {
+	                if (!column.width) {
+	                    column.width = autoWidth;
+	                }
+	                lastColumn = column;
+	                widthSum += column.width * (1 + barGapPercent);
+	            });
+	            if (lastColumn) {
+	                widthSum -= lastColumn.width * barGapPercent;
+	            }
+
+	            var offset = -widthSum / 2;
+	            zrUtil.each(stacks, function (column, stackId) {
+	                result[coordSysName][stackId] = result[coordSysName][stackId] || {
+	                    offset: offset,
+	                    width: column.width
+	                };
+
+	                offset += column.width * (1 + barGapPercent);
+	            });
+	        });
+
+	        return result;
+	    }
+
+	    /**
+	     * @param {string} seriesType
+	     * @param {module:echarts/model/Global} ecModel
+	     * @param {module:echarts/ExtensionAPI} api
+	     */
+	    function barLayoutGrid(seriesType, ecModel, api) {
+
+	        var barWidthAndOffset = calBarWidthAndOffset(
+	            zrUtil.filter(
+	                ecModel.getSeriesByType(seriesType),
+	                function (seriesModel) {
+	                    return !ecModel.isSeriesFiltered(seriesModel)
+	                        && seriesModel.coordinateSystem
+	                        && seriesModel.coordinateSystem.type === 'cartesian2d';
+	                }
+	            )
+	        );
+
+	        var lastStackCoords = {};
+
+	        ecModel.eachSeriesByType(seriesType, function (seriesModel) {
+
+	            var data = seriesModel.getData();
+	            var cartesian = seriesModel.coordinateSystem;
+	            var baseAxis = cartesian.getBaseAxis();
+
+	            var stackId = getSeriesStackId(seriesModel);
+	            var columnLayoutInfo = barWidthAndOffset[getAxisKey(baseAxis)][stackId];
+	            var columnOffset = columnLayoutInfo.offset;
+	            var columnWidth = columnLayoutInfo.width;
+	            var valueAxis = cartesian.getOtherAxis(baseAxis);
+
+	            var barMinHeight = seriesModel.get('barMinHeight') || 0;
+
+	            var valueAxisStart = baseAxis.onZero
+	                ? valueAxis.toGlobalCoord(valueAxis.dataToCoord(0))
+	                : valueAxis.getGlobalExtent()[0];
+
+	            var coords = cartesian.dataToPoints(data, true);
+	            lastStackCoords[stackId] = lastStackCoords[stackId] || [];
+
+	            data.setLayout({
+	                offset: columnOffset,
+	                size: columnWidth
+	            });
+	            data.each(valueAxis.dim, function (value, idx) {
+	                // 空数据
+	                if (isNaN(value)) {
+	                    return;
+	                }
+	                if (!lastStackCoords[stackId][idx]) {
+	                    lastStackCoords[stackId][idx] = {
+	                        // Positive stack
+	                        p: valueAxisStart,
+	                        // Negative stack
+	                        n: valueAxisStart
+	                    };
+	                }
+	                var sign = value >= 0 ? 'p' : 'n';
+	                var coord = coords[idx];
+	                var lastCoord = lastStackCoords[stackId][idx][sign];
+	                var x, y, width, height;
+	                if (valueAxis.isHorizontal()) {
+	                    x = lastCoord;
+	                    y = coord[1] + columnOffset;
+	                    width = coord[0] - lastCoord;
+	                    height = columnWidth;
+
+	                    if (Math.abs(width) < barMinHeight) {
+	                        width = (width < 0 ? -1 : 1) * barMinHeight;
+	                    }
+	                    lastStackCoords[stackId][idx][sign] += width;
+	                }
+	                else {
+	                    x = coord[0] + columnOffset;
+	                    y = lastCoord;
+	                    width = columnWidth;
+	                    height = coord[1] - lastCoord;
+	                    if (Math.abs(height) < barMinHeight) {
+	                        // Include zero to has a positive bar
+	                        height = (height <= 0 ? -1 : 1) * barMinHeight;
+	                    }
+	                    lastStackCoords[stackId][idx][sign] += height;
+	                }
+
+	                data.setItemLayout(idx, {
+	                    x: x,
+	                    y: y,
+	                    width: width,
+	                    height: height
+	                });
+	            }, true);
+
+	        }, this);
+	    }
+
+	    module.exports = barLayoutGrid;
+
+
+/***/ },
+/* 138 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+	    var echarts = __webpack_require__(1);
+
+	    __webpack_require__(139);
+	    __webpack_require__(141);
+
+	    __webpack_require__(142)('pie', [{
+	        type: 'pieToggleSelect',
+	        event: 'pieselectchanged',
+	        method: 'toggleSelected'
+	    }, {
+	        type: 'pieSelect',
+	        event: 'pieselected',
+	        method: 'select'
+	    }, {
+	        type: 'pieUnSelect',
+	        event: 'pieunselected',
+	        method: 'unSelect'
+	    }]);
+
+	    echarts.registerVisual(zrUtil.curry(__webpack_require__(143), 'pie'));
+
+	    echarts.registerLayout(zrUtil.curry(
+	        __webpack_require__(144), 'pie'
+	    ));
+
+	    echarts.registerProcessor(zrUtil.curry(__webpack_require__(146), 'pie'));
+
+
+/***/ },
+/* 139 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var List = __webpack_require__(97);
+	    var zrUtil = __webpack_require__(4);
+	    var modelUtil = __webpack_require__(5);
+	    var completeDimensions = __webpack_require__(102);
+
+	    var dataSelectableMixin = __webpack_require__(140);
+
+	    var PieSeries = __webpack_require__(1).extendSeriesModel({
+
+	        type: 'series.pie',
+
+	        // Overwrite
+	        init: function (option) {
+	            PieSeries.superApply(this, 'init', arguments);
+
+	            // Enable legend selection for each data item
+	            // Use a function instead of direct access because data reference may changed
+	            this.legendDataProvider = function () {
+	                return this._dataBeforeProcessed;
+	            };
+
+	            this.updateSelectedMap(option.data);
+
+	            this._defaultLabelLine(option);
+	        },
+
+	        // Overwrite
+	        mergeOption: function (newOption) {
+	            PieSeries.superCall(this, 'mergeOption', newOption);
+	            this.updateSelectedMap(this.option.data);
+	        },
+
+	        getInitialData: function (option, ecModel) {
+	            var dimensions = completeDimensions(['value'], option.data);
+	            var list = new List(dimensions, this);
+	            list.initData(option.data);
+	            return list;
+	        },
+
+	        // Overwrite
+	        getDataParams: function (dataIndex) {
+	            var data = this._data;
+	            var params = PieSeries.superCall(this, 'getDataParams', dataIndex);
+	            var sum = data.getSum('value');
+	            // FIXME toFixed?
+	            //
+	            // Percent is 0 if sum is 0
+	            params.percent = !sum ? 0 : +(data.get('value', dataIndex) / sum * 100).toFixed(2);
+
+	            params.$vars.push('percent');
+	            return params;
+	        },
+
+	        _defaultLabelLine: function (option) {
+	            // Extend labelLine emphasis
+	            modelUtil.defaultEmphasis(option.labelLine, ['show']);
+
+	            var labelLineNormalOpt = option.labelLine.normal;
+	            var labelLineEmphasisOpt = option.labelLine.emphasis;
+	            // Not show label line if `label.normal.show = false`
+	            labelLineNormalOpt.show = labelLineNormalOpt.show
+	                && option.label.normal.show;
+	            labelLineEmphasisOpt.show = labelLineEmphasisOpt.show
+	                && option.label.emphasis.show;
+	        },
+
+	        defaultOption: {
+	            zlevel: 0,
+	            z: 2,
+	            legendHoverLink: true,
+
+	            hoverAnimation: true,
+	            // 默认全局居中
+	            center: ['50%', '50%'],
+	            radius: [0, '75%'],
+	            // 默认顺时针
+	            clockwise: true,
+	            startAngle: 90,
+	            // 最小角度改为0
+	            minAngle: 0,
+	            // 选中是扇区偏移量
+	            selectedOffset: 10,
+
+	            // If use strategy to avoid label overlapping
+	            avoidLabelOverlap: true,
+	            // 选择模式，默认关闭，可选single，multiple
+	            // selectedMode: false,
+	            // 南丁格尔玫瑰图模式，'radius'（半径） | 'area'（面积）
+	            // roseType: null,
+
+	            label: {
+	                normal: {
+	                    // If rotate around circle
+	                    rotate: false,
+	                    show: true,
+	                    // 'outer', 'inside', 'center'
+	                    position: 'outer'
+	                    // formatter: 标签文本格式器，同Tooltip.formatter，不支持异步回调
+	                    // textStyle: null      // 默认使用全局文本样式，详见TEXTSTYLE
+	                    // distance: 当position为inner时有效，为label位置到圆心的距离与圆半径(环状图为内外半径和)的比例系数
+	                },
+	                emphasis: {}
+	            },
+	            // Enabled when label.normal.position is 'outer'
+	            labelLine: {
+	                normal: {
+	                    show: true,
+	                    // 引导线两段中的第一段长度
+	                    length: 15,
+	                    // 引导线两段中的第二段长度
+	                    length2: 15,
+	                    smooth: false,
+	                    lineStyle: {
+	                        // color: 各异,
+	                        width: 1,
+	                        type: 'solid'
+	                    }
+	                }
+	            },
+	            itemStyle: {
+	                normal: {
+	                    borderWidth: 1
+	                },
+	                emphasis: {}
+	            },
+
+	            animationEasing: 'cubicOut',
+
+	            data: []
+	        }
+	    });
+
+	    zrUtil.mixin(PieSeries, dataSelectableMixin);
+
+	    module.exports = PieSeries;
+
+
+/***/ },
+/* 140 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * Data selectable mixin for chart series.
+	 * To eanble data select, option of series must have `selectedMode`.
+	 * And each data item will use `selected` to toggle itself selected status
+	 *
+	 * @module echarts/chart/helper/DataSelectable
+	 */
+
+
+	    var zrUtil = __webpack_require__(4);
+
+	    module.exports = {
+
+	        updateSelectedMap: function (targetList) {
+	            this._selectTargetMap = zrUtil.reduce(targetList || [], function (targetMap, target) {
+	                targetMap[target.name] = target;
+	                return targetMap;
+	            }, {});
+	        },
+	        /**
+	         * @param {string} name
+	         */
+	        // PENGING If selectedMode is null ?
+	        select: function (name) {
+	            var targetMap = this._selectTargetMap;
+	            var target = targetMap[name];
+	            var selectedMode = this.get('selectedMode');
+	            if (selectedMode === 'single') {
+	                zrUtil.each(targetMap, function (target) {
+	                    target.selected = false;
+	                });
+	            }
+	            target && (target.selected = true);
+	        },
+
+	        /**
+	         * @param {string} name
+	         */
+	        unSelect: function (name) {
+	            var target = this._selectTargetMap[name];
+	            // var selectedMode = this.get('selectedMode');
+	            // selectedMode !== 'single' && target && (target.selected = false);
+	            target && (target.selected = false);
+	        },
+
+	        /**
+	         * @param {string} name
+	         */
+	        toggleSelected: function (name) {
+	            var target = this._selectTargetMap[name];
+	            if (target != null) {
+	                this[target.selected ? 'unSelect' : 'select'](name);
+	                return target.selected;
+	            }
+	        },
+
+	        /**
+	         * @param {string} name
+	         */
+	        isSelected: function (name) {
+	            var target = this._selectTargetMap[name];
+	            return target && target.selected;
+	        }
+	    };
+
+
+/***/ },
+/* 141 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var graphic = __webpack_require__(43);
+	    var zrUtil = __webpack_require__(4);
+
+	    /**
+	     * @param {module:echarts/model/Series} seriesModel
+	     * @param {boolean} hasAnimation
+	     * @inner
+	     */
+	    function updateDataSelected(uid, seriesModel, hasAnimation, api) {
+	        var data = seriesModel.getData();
+	        var dataIndex = this.dataIndex;
+	        var name = data.getName(dataIndex);
+	        var selectedOffset = seriesModel.get('selectedOffset');
+
+	        api.dispatchAction({
+	            type: 'pieToggleSelect',
+	            from: uid,
+	            name: name,
+	            seriesId: seriesModel.id
+	        });
+
+	        data.each(function (idx) {
+	            toggleItemSelected(
+	                data.getItemGraphicEl(idx),
+	                data.getItemLayout(idx),
+	                seriesModel.isSelected(data.getName(idx)),
+	                selectedOffset,
+	                hasAnimation
+	            );
+	        });
+	    }
+
+	    /**
+	     * @param {module:zrender/graphic/Sector} el
+	     * @param {Object} layout
+	     * @param {boolean} isSelected
+	     * @param {number} selectedOffset
+	     * @param {boolean} hasAnimation
+	     * @inner
+	     */
+	    function toggleItemSelected(el, layout, isSelected, selectedOffset, hasAnimation) {
+	        var midAngle = (layout.startAngle + layout.endAngle) / 2;
+
+	        var dx = Math.cos(midAngle);
+	        var dy = Math.sin(midAngle);
+
+	        var offset = isSelected ? selectedOffset : 0;
+	        var position = [dx * offset, dy * offset];
+
+	        hasAnimation
+	            // animateTo will stop revious animation like update transition
+	            ? el.animate()
+	                .when(200, {
+	                    position: position
+	                })
+	                .start('bounceOut')
+	            : el.attr('position', position);
+	    }
+
+	    /**
+	     * Piece of pie including Sector, Label, LabelLine
+	     * @constructor
+	     * @extends {module:zrender/graphic/Group}
+	     */
+	    function PiePiece(data, idx) {
+
+	        graphic.Group.call(this);
+
+	        var sector = new graphic.Sector({
+	            z2: 2
+	        });
+	        var polyline = new graphic.Polyline();
+	        var text = new graphic.Text();
+	        this.add(sector);
+	        this.add(polyline);
+	        this.add(text);
+
+	        this.updateData(data, idx, true);
+
+	        // Hover to change label and labelLine
+	        function onEmphasis() {
+	            polyline.ignore = polyline.hoverIgnore;
+	            text.ignore = text.hoverIgnore;
+	        }
+	        function onNormal() {
+	            polyline.ignore = polyline.normalIgnore;
+	            text.ignore = text.normalIgnore;
+	        }
+	        this.on('emphasis', onEmphasis)
+	            .on('normal', onNormal)
+	            .on('mouseover', onEmphasis)
+	            .on('mouseout', onNormal);
+	    }
+
+	    var piePieceProto = PiePiece.prototype;
+
+	    function getLabelStyle(data, idx, state, labelModel, labelPosition) {
+	        var textStyleModel = labelModel.getModel('textStyle');
+	        var isLabelInside = labelPosition === 'inside' || labelPosition === 'inner';
+	        return {
+	            fill: textStyleModel.getTextColor()
+	                || (isLabelInside ? '#fff' : data.getItemVisual(idx, 'color')),
+	            opacity: data.getItemVisual(idx, 'opacity'),
+	            textFont: textStyleModel.getFont(),
+	            text: zrUtil.retrieve(
+	                data.hostModel.getFormattedLabel(idx, state), data.getName(idx)
+	            )
+	        };
+	    }
+
+	    piePieceProto.updateData = function (data, idx, firstCreate) {
+
+	        var sector = this.childAt(0);
+
+	        var seriesModel = data.hostModel;
+	        var itemModel = data.getItemModel(idx);
+	        var layout = data.getItemLayout(idx);
+	        var sectorShape = zrUtil.extend({}, layout);
+	        sectorShape.label = null;
+	        if (firstCreate) {
+	            sector.setShape(sectorShape);
+	            sector.shape.endAngle = layout.startAngle;
+	            graphic.updateProps(sector, {
+	                shape: {
+	                    endAngle: layout.endAngle
+	                }
+	            }, seriesModel, idx);
+	        }
+	        else {
+	            graphic.updateProps(sector, {
+	                shape: sectorShape
+	            }, seriesModel, idx);
+	        }
+
+	        // Update common style
+	        var itemStyleModel = itemModel.getModel('itemStyle');
+	        var visualColor = data.getItemVisual(idx, 'color');
+
+	        sector.useStyle(
+	            zrUtil.defaults(
+	                {
+	                    lineJoin: 'bevel',
+	                    fill: visualColor
+	                },
+	                itemStyleModel.getModel('normal').getItemStyle()
+	            )
+	        );
+	        sector.hoverStyle = itemStyleModel.getModel('emphasis').getItemStyle();
+
+	        // Toggle selected
+	        toggleItemSelected(
+	            this,
+	            data.getItemLayout(idx),
+	            itemModel.get('selected'),
+	            seriesModel.get('selectedOffset'),
+	            seriesModel.get('animation')
+	        );
+
+	        function onEmphasis() {
+	            // Sector may has animation of updating data. Force to move to the last frame
+	            // Or it may stopped on the wrong shape
+	            sector.stopAnimation(true);
+	            sector.animateTo({
+	                shape: {
+	                    r: layout.r + 10
+	                }
+	            }, 300, 'elasticOut');
+	        }
+	        function onNormal() {
+	            sector.stopAnimation(true);
+	            sector.animateTo({
+	                shape: {
+	                    r: layout.r
+	                }
+	            }, 300, 'elasticOut');
+	        }
+	        sector.off('mouseover').off('mouseout').off('emphasis').off('normal');
+	        if (itemModel.get('hoverAnimation') && seriesModel.ifEnableAnimation()) {
+	            sector
+	                .on('mouseover', onEmphasis)
+	                .on('mouseout', onNormal)
+	                .on('emphasis', onEmphasis)
+	                .on('normal', onNormal);
+	        }
+
+	        this._updateLabel(data, idx);
+
+	        graphic.setHoverStyle(this);
+	    };
+
+	    piePieceProto._updateLabel = function (data, idx) {
+
+	        var labelLine = this.childAt(1);
+	        var labelText = this.childAt(2);
+
+	        var seriesModel = data.hostModel;
+	        var itemModel = data.getItemModel(idx);
+	        var layout = data.getItemLayout(idx);
+	        var labelLayout = layout.label;
+	        var visualColor = data.getItemVisual(idx, 'color');
+
+	        graphic.updateProps(labelLine, {
+	            shape: {
+	                points: labelLayout.linePoints || [
+	                    [labelLayout.x, labelLayout.y], [labelLayout.x, labelLayout.y], [labelLayout.x, labelLayout.y]
+	                ]
+	            }
+	        }, seriesModel, idx);
+
+	        graphic.updateProps(labelText, {
+	            style: {
+	                x: labelLayout.x,
+	                y: labelLayout.y
+	            }
+	        }, seriesModel, idx);
+	        labelText.attr({
+	            style: {
+	                textVerticalAlign: labelLayout.verticalAlign,
+	                textAlign: labelLayout.textAlign,
+	                textFont: labelLayout.font
+	            },
+	            rotation: labelLayout.rotation,
+	            origin: [labelLayout.x, labelLayout.y],
+	            z2: 10
+	        });
+
+	        var labelModel = itemModel.getModel('label.normal');
+	        var labelHoverModel = itemModel.getModel('label.emphasis');
+	        var labelLineModel = itemModel.getModel('labelLine.normal');
+	        var labelLineHoverModel = itemModel.getModel('labelLine.emphasis');
+	        var labelPosition = labelModel.get('position') || labelHoverModel.get('position');
+
+	        labelText.setStyle(getLabelStyle(data, idx, 'normal', labelModel, labelPosition));
+
+	        labelText.ignore = labelText.normalIgnore = !labelModel.get('show');
+	        labelText.hoverIgnore = !labelHoverModel.get('show');
+
+	        labelLine.ignore = labelLine.normalIgnore = !labelLineModel.get('show');
+	        labelLine.hoverIgnore = !labelLineHoverModel.get('show');
+
+	        // Default use item visual color
+	        labelLine.setStyle({
+	            stroke: visualColor,
+	            opacity: data.getItemVisual(idx, 'opacity')
+	        });
+	        labelLine.setStyle(labelLineModel.getModel('lineStyle').getLineStyle());
+
+	        labelText.hoverStyle = getLabelStyle(data, idx, 'emphasis', labelHoverModel, labelPosition);
+	        labelLine.hoverStyle = labelLineHoverModel.getModel('lineStyle').getLineStyle();
+
+	        var smooth = labelLineModel.get('smooth');
+	        if (smooth && smooth === true) {
+	            smooth = 0.4;
+	        }
+	        labelLine.setShape({
+	            smooth: smooth
+	        });
+	    };
+
+	    zrUtil.inherits(PiePiece, graphic.Group);
+
+
+	    // Pie view
+	    var Pie = __webpack_require__(42).extend({
+
+	        type: 'pie',
+
+	        init: function () {
+	            var sectorGroup = new graphic.Group();
+	            this._sectorGroup = sectorGroup;
+	        },
+
+	        render: function (seriesModel, ecModel, api, payload) {
+	            if (payload && (payload.from === this.uid)) {
+	                return;
+	            }
+
+	            var data = seriesModel.getData();
+	            var oldData = this._data;
+	            var group = this.group;
+
+	            var hasAnimation = ecModel.get('animation');
+	            var isFirstRender = !oldData;
+
+	            var onSectorClick = zrUtil.curry(
+	                updateDataSelected, this.uid, seriesModel, hasAnimation, api
+	            );
+
+	            var selectedMode = seriesModel.get('selectedMode');
+
+	            data.diff(oldData)
+	                .add(function (idx) {
+	                    var piePiece = new PiePiece(data, idx);
+	                    if (isFirstRender) {
+	                        piePiece.eachChild(function (child) {
+	                            child.stopAnimation(true);
+	                        });
+	                    }
+
+	                    selectedMode && piePiece.on('click', onSectorClick);
+
+	                    data.setItemGraphicEl(idx, piePiece);
+
+	                    group.add(piePiece);
+	                })
+	                .update(function (newIdx, oldIdx) {
+	                    var piePiece = oldData.getItemGraphicEl(oldIdx);
+
+	                    piePiece.updateData(data, newIdx);
+
+	                    piePiece.off('click');
+	                    selectedMode && piePiece.on('click', onSectorClick);
+	                    group.add(piePiece);
+	                    data.setItemGraphicEl(newIdx, piePiece);
+	                })
+	                .remove(function (idx) {
+	                    var piePiece = oldData.getItemGraphicEl(idx);
+	                    group.remove(piePiece);
+	                })
+	                .execute();
+
+	            if (hasAnimation && isFirstRender && data.count() > 0) {
+	                var shape = data.getItemLayout(0);
+	                var r = Math.max(api.getWidth(), api.getHeight()) / 2;
+
+	                var removeClipPath = zrUtil.bind(group.removeClipPath, group);
+	                group.setClipPath(this._createClipPath(
+	                    shape.cx, shape.cy, r, shape.startAngle, shape.clockwise, removeClipPath, seriesModel
+	                ));
+	            }
+
+	            this._data = data;
+	        },
+
+	        _createClipPath: function (
+	            cx, cy, r, startAngle, clockwise, cb, seriesModel
+	        ) {
+	            var clipPath = new graphic.Sector({
+	                shape: {
+	                    cx: cx,
+	                    cy: cy,
+	                    r0: 0,
+	                    r: r,
+	                    startAngle: startAngle,
+	                    endAngle: startAngle,
+	                    clockwise: clockwise
+	                }
+	            });
+
+	            graphic.initProps(clipPath, {
+	                shape: {
+	                    endAngle: startAngle + (clockwise ? 1 : -1) * Math.PI * 2
+	                }
+	            }, seriesModel, cb);
+
+	            return clipPath;
+	        }
+	    });
+
+	    module.exports = Pie;
+
+
+/***/ },
+/* 142 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+	    var echarts = __webpack_require__(1);
+	    var zrUtil = __webpack_require__(4);
+	    module.exports = function (seriesType, actionInfos) {
+	        zrUtil.each(actionInfos, function (actionInfo) {
+	            actionInfo.update = 'updateView';
+	            /**
+	             * @payload
+	             * @property {string} seriesName
+	             * @property {string} name
+	             */
+	            echarts.registerAction(actionInfo, function (payload, ecModel) {
+	                var selected = {};
+	                ecModel.eachComponent(
+	                    {mainType: 'series', subType: seriesType, query: payload},
+	                    function (seriesModel) {
+	                        if (seriesModel[actionInfo.method]) {
+	                            seriesModel[actionInfo.method](payload.name);
+	                        }
+	                        var data = seriesModel.getData();
+	                        // Create selected map
+	                        data.each(function (idx) {
+	                            var name = data.getName(idx);
+	                            selected[name] = seriesModel.isSelected(name) || false;
+	                        });
+	                    }
+	                );
+	                return {
+	                    name: payload.name,
+	                    selected: selected
+	                };
+	            });
+	        });
+	    };
+
+
+/***/ },
+/* 143 */
+/***/ function(module, exports) {
+
+	// Pick color from palette for each data item
+
+
+	    module.exports = function (seriesType, ecModel) {
+	        // Pie and funnel may use diferrent scope
+	        var paletteScope = {};
+	        ecModel.eachRawSeriesByType(seriesType, function (seriesModel) {
+	            var dataAll = seriesModel.getRawData();
+	            var idxMap = {};
+	            if (!ecModel.isSeriesFiltered(seriesModel)) {
+	                var data = seriesModel.getData();
+	                data.each(function (idx) {
+	                    var rawIdx = data.getRawIndex(idx);
+	                    idxMap[rawIdx] = idx;
+	                });
+	                dataAll.each(function (rawIdx) {
+	                    // FIXME Performance
+	                    var itemModel = dataAll.getItemModel(rawIdx);
+	                    var filteredIdx = idxMap[rawIdx];
+	                    // If series.itemStyle.normal.color is a function. itemVisual may be encoded
+	                    var singleDataColor = data.getItemVisual(filteredIdx, 'color', true);
+
+	                    if (!singleDataColor) {
+	                        var color = itemModel.get('itemStyle.normal.color')
+	                            || seriesModel.getColorFromPalette(dataAll.getName(rawIdx), paletteScope);
+	                        // Legend may use the visual info in data before processed
+	                        dataAll.setItemVisual(rawIdx, 'color', color);
+	                        data.setItemVisual(filteredIdx, 'color', color);
+	                    }
+	                    else {
+	                        // Set data all color for legend
+	                        dataAll.setItemVisual(rawIdx, 'color', singleDataColor);
+	                    }
+	                });
+	            }
+	        });
+	    };
+
+
+/***/ },
+/* 144 */
+/***/ function(module, exports, __webpack_require__) {
+
+	// TODO minAngle
+
+
+
+	    var numberUtil = __webpack_require__(7);
+	    var parsePercent = numberUtil.parsePercent;
+	    var labelLayout = __webpack_require__(145);
+	    var zrUtil = __webpack_require__(4);
+
+	    var PI2 = Math.PI * 2;
+	    var RADIAN = Math.PI / 180;
+
+	    module.exports = function (seriesType, ecModel, api, payload) {
+	        ecModel.eachSeriesByType(seriesType, function (seriesModel) {
+	            var center = seriesModel.get('center');
+	            var radius = seriesModel.get('radius');
+
+	            if (!zrUtil.isArray(radius)) {
+	                radius = [0, radius];
+	            }
+	            if (!zrUtil.isArray(center)) {
+	                center = [center, center];
+	            }
+
+	            var width = api.getWidth();
+	            var height = api.getHeight();
+	            var size = Math.min(width, height);
+	            var cx = parsePercent(center[0], width);
+	            var cy = parsePercent(center[1], height);
+	            var r0 = parsePercent(radius[0], size / 2);
+	            var r = parsePercent(radius[1], size / 2);
+
+	            var data = seriesModel.getData();
+
+	            var startAngle = -seriesModel.get('startAngle') * RADIAN;
+
+	            var minAngle = seriesModel.get('minAngle') * RADIAN;
+
+	            var sum = data.getSum('value');
+	            // Sum may be 0
+	            var unitRadian = Math.PI / (sum || data.count()) * 2;
+
+	            var clockwise = seriesModel.get('clockwise');
+
+	            var roseType = seriesModel.get('roseType');
+
+	            // [0...max]
+	            var extent = data.getDataExtent('value');
+	            extent[0] = 0;
+
+	            // In the case some sector angle is smaller than minAngle
+	            var restAngle = PI2;
+	            var valueSumLargerThanMinAngle = 0;
+
+	            var currentAngle = startAngle;
+
+	            var dir = clockwise ? 1 : -1;
+	            data.each('value', function (value, idx) {
+	                var angle;
+	                // FIXME 兼容 2.0 但是 roseType 是 area 的时候才是这样？
+	                if (roseType !== 'area') {
+	                    angle = sum === 0 ? unitRadian : (value * unitRadian);
+	                }
+	                else {
+	                    angle = PI2 / (data.count() || 1);
+	                }
+
+	                if (angle < minAngle) {
+	                    angle = minAngle;
+	                    restAngle -= minAngle;
+	                }
+	                else {
+	                    valueSumLargerThanMinAngle += value;
+	                }
+
+	                var endAngle = currentAngle + dir * angle;
+	                data.setItemLayout(idx, {
+	                    angle: angle,
+	                    startAngle: currentAngle,
+	                    endAngle: endAngle,
+	                    clockwise: clockwise,
+	                    cx: cx,
+	                    cy: cy,
+	                    r0: r0,
+	                    r: roseType
+	                        ? numberUtil.linearMap(value, extent, [r0, r])
+	                        : r
+	                });
+
+	                currentAngle = endAngle;
+	            }, true);
+
+	            // Some sector is constrained by minAngle
+	            // Rest sectors needs recalculate angle
+	            if (restAngle < PI2) {
+	                // Average the angle if rest angle is not enough after all angles is
+	                // Constrained by minAngle
+	                if (restAngle <= 1e-3) {
+	                    var angle = PI2 / data.count();
+	                    data.each(function (idx) {
+	                        var layout = data.getItemLayout(idx);
+	                        layout.startAngle = startAngle + dir * idx * angle;
+	                        layout.endAngle = startAngle + dir * (idx + 1) * angle;
+	                    });
+	                }
+	                else {
+	                    unitRadian = restAngle / valueSumLargerThanMinAngle;
+	                    currentAngle = startAngle;
+	                    data.each('value', function (value, idx) {
+	                        var layout = data.getItemLayout(idx);
+	                        var angle = layout.angle === minAngle
+	                            ? minAngle : value * unitRadian;
+	                        layout.startAngle = currentAngle;
+	                        layout.endAngle = currentAngle + dir * angle;
+	                        currentAngle += angle;
+	                    });
+	                }
+	            }
+
+	            labelLayout(seriesModel, r, width, height);
+	        });
+	    };
+
+
+/***/ },
+/* 145 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+	// FIXME emphasis label position is not same with normal label position
+
+
+	    var textContain = __webpack_require__(8);
+
+	    function adjustSingleSide(list, cx, cy, r, dir, viewWidth, viewHeight) {
+	        list.sort(function (a, b) {
+	            return a.y - b.y;
+	        });
+
+	        // 压
+	        function shiftDown(start, end, delta, dir) {
+	            for (var j = start; j < end; j++) {
+	                list[j].y += delta;
+	                if (j > start
+	                    && j + 1 < end
+	                    && list[j + 1].y > list[j].y + list[j].height
+	                ) {
+	                    shiftUp(j, delta / 2);
+	                    return;
+	                }
+	            }
+
+	            shiftUp(end - 1, delta / 2);
+	        }
+
+	        // 弹
+	        function shiftUp(end, delta) {
+	            for (var j = end; j >= 0; j--) {
+	                list[j].y -= delta;
+	                if (j > 0
+	                    && list[j].y > list[j - 1].y + list[j - 1].height
+	                ) {
+	                    break;
+	                }
+	            }
+	        }
+
+	        function changeX(list, isDownList, cx, cy, r, dir) {
+	            var lastDeltaX = dir > 0
+	                ? isDownList                // 右侧
+	                    ? Number.MAX_VALUE      // 下
+	                    : 0                     // 上
+	                : isDownList                // 左侧
+	                    ? Number.MAX_VALUE      // 下
+	                    : 0;                    // 上
+
+	            for (var i = 0, l = list.length; i < l; i++) {
+	                // Not change x for center label
+	                if (list[i].position === 'center') {
+	                    continue;
+	                }
+	                var deltaY = Math.abs(list[i].y - cy);
+	                var length = list[i].len;
+	                var length2 = list[i].len2;
+	                var deltaX = (deltaY < r + length)
+	                    ? Math.sqrt(
+	                          (r + length + length2) * (r + length + length2)
+	                          - deltaY * deltaY
+	                      )
+	                    : Math.abs(list[i].x - cx);
+	                if (isDownList && deltaX >= lastDeltaX) {
+	                    // 右下，左下
+	                    deltaX = lastDeltaX - 10;
+	                }
+	                if (!isDownList && deltaX <= lastDeltaX) {
+	                    // 右上，左上
+	                    deltaX = lastDeltaX + 10;
+	                }
+
+	                list[i].x = cx + deltaX * dir;
+	                lastDeltaX = deltaX;
+	            }
+	        }
+
+	        var lastY = 0;
+	        var delta;
+	        var len = list.length;
+	        var upList = [];
+	        var downList = [];
+	        for (var i = 0; i < len; i++) {
+	            delta = list[i].y - lastY;
+	            if (delta < 0) {
+	                shiftDown(i, len, -delta, dir);
+	            }
+	            lastY = list[i].y + list[i].height;
+	        }
+	        if (viewHeight - lastY < 0) {
+	            shiftUp(len - 1, lastY - viewHeight);
+	        }
+	        for (var i = 0; i < len; i++) {
+	            if (list[i].y >= cy) {
+	                downList.push(list[i]);
+	            }
+	            else {
+	                upList.push(list[i]);
+	            }
+	        }
+	        changeX(upList, false, cx, cy, r, dir);
+	        changeX(downList, true, cx, cy, r, dir);
+	    }
+
+	    function avoidOverlap(labelLayoutList, cx, cy, r, viewWidth, viewHeight) {
+	        var leftList = [];
+	        var rightList = [];
+	        for (var i = 0; i < labelLayoutList.length; i++) {
+	            if (labelLayoutList[i].x < cx) {
+	                leftList.push(labelLayoutList[i]);
+	            }
+	            else {
+	                rightList.push(labelLayoutList[i]);
+	            }
+	        }
+
+	        adjustSingleSide(rightList, cx, cy, r, 1, viewWidth, viewHeight);
+	        adjustSingleSide(leftList, cx, cy, r, -1, viewWidth, viewHeight);
+
+	        for (var i = 0; i < labelLayoutList.length; i++) {
+	            var linePoints = labelLayoutList[i].linePoints;
+	            if (linePoints) {
+	                var dist = linePoints[1][0] - linePoints[2][0];
+	                if (labelLayoutList[i].x < cx) {
+	                    linePoints[2][0] = labelLayoutList[i].x + 3;
+	                }
+	                else {
+	                    linePoints[2][0] = labelLayoutList[i].x - 3;
+	                }
+	                linePoints[1][1] = linePoints[2][1] = labelLayoutList[i].y;
+	                linePoints[1][0] = linePoints[2][0] + dist;
+	            }
+	        }
+	    }
+
+	    module.exports = function (seriesModel, r, viewWidth, viewHeight) {
+	        var data = seriesModel.getData();
+	        var labelLayoutList = [];
+	        var cx;
+	        var cy;
+	        var hasLabelRotate = false;
+
+	        data.each(function (idx) {
+	            var layout = data.getItemLayout(idx);
+
+	            var itemModel = data.getItemModel(idx);
+	            var labelModel = itemModel.getModel('label.normal');
+	            // Use position in normal or emphasis
+	            var labelPosition = labelModel.get('position') || itemModel.get('label.emphasis.position');
+
+	            var labelLineModel = itemModel.getModel('labelLine.normal');
+	            var labelLineLen = labelLineModel.get('length');
+	            var labelLineLen2 = labelLineModel.get('length2');
+
+	            var midAngle = (layout.startAngle + layout.endAngle) / 2;
+	            var dx = Math.cos(midAngle);
+	            var dy = Math.sin(midAngle);
+
+	            var textX;
+	            var textY;
+	            var linePoints;
+	            var textAlign;
+
+	            cx = layout.cx;
+	            cy = layout.cy;
+
+	            var isLabelInside = labelPosition === 'inside' || labelPosition === 'inner';
+	            if (labelPosition === 'center') {
+	                textX = layout.cx;
+	                textY = layout.cy;
+	                textAlign = 'center';
+	            }
+	            else {
+	                var x1 = (isLabelInside ? (layout.r + layout.r0) / 2 * dx : layout.r * dx) + cx;
+	                var y1 = (isLabelInside ? (layout.r + layout.r0) / 2 * dy : layout.r * dy) + cy;
+
+	                textX = x1 + dx * 3;
+	                textY = y1 + dy * 3;
+
+	                if (!isLabelInside) {
+	                    // For roseType
+	                    var x2 = x1 + dx * (labelLineLen + r - layout.r);
+	                    var y2 = y1 + dy * (labelLineLen + r - layout.r);
+	                    var x3 = x2 + ((dx < 0 ? -1 : 1) * labelLineLen2);
+	                    var y3 = y2;
+
+	                    textX = x3 + (dx < 0 ? -5 : 5);
+	                    textY = y3;
+	                    linePoints = [[x1, y1], [x2, y2], [x3, y3]];
+	                }
+
+	                textAlign = isLabelInside ? 'center' : (dx > 0 ? 'left' : 'right');
+	            }
+	            var font = labelModel.getModel('textStyle').getFont();
+
+	            var labelRotate = labelModel.get('rotate')
+	                ? (dx < 0 ? -midAngle + Math.PI : -midAngle) : 0;
+	            var text = seriesModel.getFormattedLabel(idx, 'normal')
+	                        || data.getName(idx);
+	            var textRect = textContain.getBoundingRect(
+	                text, font, textAlign, 'top'
+	            );
+	            hasLabelRotate = !!labelRotate;
+	            layout.label = {
+	                x: textX,
+	                y: textY,
+	                position: labelPosition,
+	                height: textRect.height,
+	                len: labelLineLen,
+	                len2: labelLineLen2,
+	                linePoints: linePoints,
+	                textAlign: textAlign,
+	                verticalAlign: 'middle',
+	                font: font,
+	                rotation: labelRotate
+	            };
+
+	            // Not layout the inside label
+	            if (!isLabelInside) {
+	                labelLayoutList.push(layout.label);
+	            }
+	        });
+	        if (!hasLabelRotate && seriesModel.get('avoidLabelOverlap')) {
+	            avoidOverlap(labelLayoutList, cx, cy, r, viewWidth, viewHeight);
+	        }
+	    };
+
+
+/***/ },
+/* 146 */
+/***/ function(module, exports) {
+
+	
+	    module.exports = function (seriesType, ecModel) {
+	        var legendModels = ecModel.findComponents({
+	            mainType: 'legend'
+	        });
+	        if (!legendModels || !legendModels.length) {
+	            return;
+	        }
+	        ecModel.eachSeriesByType(seriesType, function (series) {
+	            var data = series.getData();
+	            data.filterSelf(function (idx) {
+	                var name = data.getName(idx);
+	                // If in any legend component the status is not selected.
+	                for (var i = 0; i < legendModels.length; i++) {
+	                    if (!legendModels[i].isSelected(name)) {
+	                        return false;
+	                    }
+	                }
+	                return true;
+	            }, this);
+	        }, this);
+	    };
+
+
+/***/ },
+/* 147 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+	    var echarts = __webpack_require__(1);
+
+	    __webpack_require__(148);
+	    __webpack_require__(149);
+
+	    echarts.registerVisual(zrUtil.curry(
+	        __webpack_require__(109), 'scatter', 'circle', null
+	    ));
+	    echarts.registerLayout(zrUtil.curry(
+	        __webpack_require__(110), 'scatter'
+	    ));
+
+	    // In case developer forget to include grid component
+	    __webpack_require__(112);
+
+
+/***/ },
+/* 148 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var createListFromArray = __webpack_require__(101);
+	    var SeriesModel = __webpack_require__(28);
+
+	    module.exports = SeriesModel.extend({
+
+	        type: 'series.scatter',
+
+	        dependencies: ['grid', 'polar'],
+
+	        getInitialData: function (option, ecModel) {
+	            var list = createListFromArray(option.data, this, ecModel);
+	            return list;
+	        },
+
+	        brushSelector: 'point',
+
+	        defaultOption: {
+	            coordinateSystem: 'cartesian2d',
+	            zlevel: 0,
+	            z: 2,
+	            legendHoverLink: true,
+
+	            hoverAnimation: true,
+	            // Cartesian coordinate system
+	            xAxisIndex: 0,
+	            yAxisIndex: 0,
+
+	            // Polar coordinate system
+	            polarIndex: 0,
+
+	            // Geo coordinate system
+	            geoIndex: 0,
+
+	            // symbol: null,        // 图形类型
+	            symbolSize: 10,          // 图形大小，半宽（半径）参数，当图形为方向或菱形则总宽度为symbolSize * 2
+	            // symbolRotate: null,  // 图形旋转控制
+
+	            large: false,
+	            // Available when large is true
+	            largeThreshold: 2000,
+
+	            // label: {
+	                // normal: {
+	                    // show: false
+	                    // distance: 5,
+	                    // formatter: 标签文本格式器，同Tooltip.formatter，不支持异步回调
+	                    // position: 默认自适应，水平布局为'top'，垂直布局为'right'，可选为
+	                    //           'inside'|'left'|'right'|'top'|'bottom'
+	                    // textStyle: null      // 默认使用全局文本样式，详见TEXTSTYLE
+	            //     }
+	            // },
+	            itemStyle: {
+	                normal: {
+	                    opacity: 0.8
+	                    // color: 各异
+	                }
+	            }
+	        }
+
+	    });
+
+
+/***/ },
+/* 149 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var SymbolDraw = __webpack_require__(104);
+	    var LargeSymbolDraw = __webpack_require__(150);
+
+	    __webpack_require__(1).extendChartView({
+
+	        type: 'scatter',
+
+	        init: function () {
+	            this._normalSymbolDraw = new SymbolDraw();
+	            this._largeSymbolDraw = new LargeSymbolDraw();
+	        },
+
+	        render: function (seriesModel, ecModel, api) {
+	            var data = seriesModel.getData();
+	            var largeSymbolDraw = this._largeSymbolDraw;
+	            var normalSymbolDraw = this._normalSymbolDraw;
+	            var group = this.group;
+
+	            var symbolDraw = seriesModel.get('large') && data.count() > seriesModel.get('largeThreshold')
+	                ? largeSymbolDraw : normalSymbolDraw;
+
+	            this._symbolDraw = symbolDraw;
+	            symbolDraw.updateData(data);
+	            group.add(symbolDraw.group);
+
+	            group.remove(
+	                symbolDraw === largeSymbolDraw
+	                ? normalSymbolDraw.group : largeSymbolDraw.group
+	            );
+	        },
+
+	        updateLayout: function (seriesModel) {
+	            this._symbolDraw.updateLayout(seriesModel);
+	        },
+
+	        remove: function (ecModel, api) {
+	            this._symbolDraw && this._symbolDraw.remove(api, true);
+	        }
+	    });
+
+
+/***/ },
+/* 150 */
+/***/ function(module, exports, __webpack_require__) {
+
+	// TODO Batch by color
+
+
+
+	    var graphic = __webpack_require__(43);
+	    var symbolUtil = __webpack_require__(106);
+
+	    var LargeSymbolPath = graphic.extendShape({
+
+	        shape: {
+	            points: null,
+	            sizes: null
+	        },
+
+	        symbolProxy: null,
+
+	        buildPath: function (path, shape) {
+	            var points = shape.points;
+	            var sizes = shape.sizes;
+
+	            var symbolProxy = this.symbolProxy;
+	            var symbolProxyShape = symbolProxy.shape;
+	            for (var i = 0; i < points.length; i++) {
+	                var pt = points[i];
+	                var size = sizes[i];
+	                if (size[0] < 4) {
+	                    // Optimize for small symbol
+	                    path.rect(
+	                        pt[0] - size[0] / 2, pt[1] - size[1] / 2,
+	                        size[0], size[1]
+	                    );
+	                }
+	                else {
+	                    symbolProxyShape.x = pt[0] - size[0] / 2;
+	                    symbolProxyShape.y = pt[1] - size[1] / 2;
+	                    symbolProxyShape.width = size[0];
+	                    symbolProxyShape.height = size[1];
+
+	                    symbolProxy.buildPath(path, symbolProxyShape, true);
+	                }
+	            }
+	        },
+
+	        findDataIndex: function (x, y) {
+	            var shape = this.shape;
+	            var points = shape.points;
+	            var sizes = shape.sizes;
+
+	            // Not consider transform
+	            // Treat each element as a rect
+	            // top down traverse
+	            for (var i = points.length - 1; i >= 0; i--) {
+	                var pt = points[i];
+	                var size = sizes[i];
+	                var x0 = pt[0] - size[0] / 2;
+	                var y0 = pt[1] - size[1] / 2;
+	                if (x >= x0 && y >= y0 && x <= x0 + size[0] && y <= y0 + size[1]) {
+	                    // i is dataIndex
+	                    return i;
+	                }
+	            }
+
+	            return -1;
+	        }
+	    });
+
+	    function LargeSymbolDraw() {
+	        this.group = new graphic.Group();
+
+	        this._symbolEl = new LargeSymbolPath({
+	            // rectHover: true,
+	            // cursor: 'default'
+	        });
+	    }
+
+	    var largeSymbolProto = LargeSymbolDraw.prototype;
+
+	    /**
+	     * Update symbols draw by new data
+	     * @param {module:echarts/data/List} data
+	     */
+	    largeSymbolProto.updateData = function (data) {
+	        this.group.removeAll();
+
+	        var symbolEl = this._symbolEl;
+
+	        var seriesModel = data.hostModel;
+
+	        symbolEl.setShape({
+	            points: data.mapArray(data.getItemLayout),
+	            sizes: data.mapArray(
+	                function (idx) {
+	                    var size = data.getItemVisual(idx, 'symbolSize');
+	                    if (!(size instanceof Array)) {
+	                        size = [size, size];
+	                    }
+	                    return size;
+	                }
+	            )
+	        });
+
+	        // Create symbolProxy to build path for each data
+	        symbolEl.symbolProxy = symbolUtil.createSymbol(
+	            data.getVisual('symbol'), 0, 0, 0, 0
+	        );
+	        // Use symbolProxy setColor method
+	        symbolEl.setColor = symbolEl.symbolProxy.setColor;
+
+	        symbolEl.useStyle(
+	            seriesModel.getModel('itemStyle.normal').getItemStyle(['color'])
+	        );
+
+	        var visualColor = data.getVisual('color');
+	        if (visualColor) {
+	            symbolEl.setColor(visualColor);
+	        }
+
+	        // Enable tooltip
+	        // PENDING May have performance issue when path is extremely large
+	        symbolEl.seriesIndex = seriesModel.seriesIndex;
+	        symbolEl.on('mousemove', function (e) {
+	            symbolEl.dataIndex = null;
+	            var dataIndex = symbolEl.findDataIndex(e.offsetX, e.offsetY);
+	            if (dataIndex > 0) {
+	                // Provide dataIndex for tooltip
+	                symbolEl.dataIndex = dataIndex;
+	            }
+	        });
+
+	        // Add back
+	        this.group.add(symbolEl);
+	    };
+
+	    largeSymbolProto.updateLayout = function (seriesModel) {
+	        var data = seriesModel.getData();
+	        this._symbolEl.setShape({
+	            points: data.mapArray(data.getItemLayout)
+	        });
+	    };
+
+	    largeSymbolProto.remove = function () {
+	        this.group.removeAll();
+	    };
+
+	    module.exports = LargeSymbolDraw;
+
+
+/***/ },
+/* 151 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+	    var echarts = __webpack_require__(1);
+
+	    // Must use radar component
+	    __webpack_require__(152);
+
+	    __webpack_require__(157);
+	    __webpack_require__(158);
+
+	    echarts.registerVisual(zrUtil.curry(__webpack_require__(143), 'radar'));
+	    echarts.registerVisual(zrUtil.curry(
+	        __webpack_require__(109), 'radar', 'circle', null
+	    ));
+	    echarts.registerLayout(__webpack_require__(159));
+
+	    echarts.registerProcessor(
+	        zrUtil.curry(__webpack_require__(146), 'radar')
+	    );
+
+	    echarts.registerPreprocessor(__webpack_require__(160));
+
+
+/***/ },
+/* 152 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    __webpack_require__(153);
+	    __webpack_require__(155);
+
+	    __webpack_require__(156);
+
+
+/***/ },
+/* 153 */
+/***/ function(module, exports, __webpack_require__) {
+
+	// TODO clockwise
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var IndicatorAxis = __webpack_require__(154);
+	    var IntervalScale = __webpack_require__(117);
+	    var numberUtil = __webpack_require__(7);
+	    var axisHelper = __webpack_require__(114);
+
+	    function Radar(radarModel, ecModel, api) {
+
+	        this._model = radarModel;
+	        /**
+	         * Radar dimensions
+	         * @type {Array.<string>}
+	         */
+	        this.dimensions = [];
+
+	        this._indicatorAxes = zrUtil.map(radarModel.getIndicatorModels(), function (indicatorModel, idx) {
+	            var dim = 'indicator_' + idx;
+	            var indicatorAxis = new IndicatorAxis(dim, new IntervalScale());
+	            indicatorAxis.name = indicatorModel.get('name');
+	            // Inject model and axis
+	            indicatorAxis.model = indicatorModel;
+	            indicatorModel.axis = indicatorAxis;
+	            this.dimensions.push(dim);
+	            return indicatorAxis;
+	        }, this);
+
+	        this.resize(radarModel, api);
+
+	        /**
+	         * @type {number}
+	         * @readOnly
+	         */
+	        this.cx;
+	        /**
+	         * @type {number}
+	         * @readOnly
+	         */
+	        this.cy;
+	        /**
+	         * @type {number}
+	         * @readOnly
+	         */
+	        this.r;
+	        /**
+	         * @type {number}
+	         * @readOnly
+	         */
+	        this.startAngle;
+	    }
+
+	    Radar.prototype.getIndicatorAxes = function () {
+	        return this._indicatorAxes;
+	    };
+
+	    Radar.prototype.dataToPoint = function (value, indicatorIndex) {
+	        var indicatorAxis = this._indicatorAxes[indicatorIndex];
+
+	        return this.coordToPoint(indicatorAxis.dataToCoord(value), indicatorIndex);
+	    };
+
+	    Radar.prototype.coordToPoint = function (coord, indicatorIndex) {
+	        var indicatorAxis = this._indicatorAxes[indicatorIndex];
+	        var angle = indicatorAxis.angle;
+	        var x = this.cx + coord * Math.cos(angle);
+	        var y = this.cy - coord * Math.sin(angle);
+	        return [x, y];
+	    };
+
+	    Radar.prototype.pointToData = function (pt) {
+	        var dx = pt[0] - this.cx;
+	        var dy = pt[1] - this.cy;
+	        var radius = Math.sqrt(dx * dx + dy * dy);
+	        dx /= radius;
+	        dy /= radius;
+
+	        var radian = Math.atan2(-dy, dx);
+
+	        // Find the closest angle
+	        // FIXME index can calculated directly
+	        var minRadianDiff = Infinity;
+	        var closestAxis;
+	        var closestAxisIdx = -1;
+	        for (var i = 0; i < this._indicatorAxes.length; i++) {
+	            var indicatorAxis = this._indicatorAxes[i];
+	            var diff = Math.abs(radian - indicatorAxis.angle);
+	            if (diff < minRadianDiff) {
+	                closestAxis = indicatorAxis;
+	                closestAxisIdx = i;
+	                minRadianDiff = diff;
+	            }
+	        }
+
+	        return [closestAxisIdx, +(closestAxis && closestAxis.coodToData(radius))];
+	    };
+
+	    Radar.prototype.resize = function (radarModel, api) {
+	        var center = radarModel.get('center');
+	        var viewWidth = api.getWidth();
+	        var viewHeight = api.getHeight();
+	        var viewSize = Math.min(viewWidth, viewHeight) / 2;
+	        this.cx = numberUtil.parsePercent(center[0], viewWidth);
+	        this.cy = numberUtil.parsePercent(center[1], viewHeight);
+
+	        this.startAngle = radarModel.get('startAngle') * Math.PI / 180;
+
+	        this.r = numberUtil.parsePercent(radarModel.get('radius'), viewSize);
+
+	        zrUtil.each(this._indicatorAxes, function (indicatorAxis, idx) {
+	            indicatorAxis.setExtent(0, this.r);
+	            var angle = (this.startAngle + idx * Math.PI * 2 / this._indicatorAxes.length);
+	            // Normalize to [-PI, PI]
+	            angle = Math.atan2(Math.sin(angle), Math.cos(angle));
+	            indicatorAxis.angle = angle;
+	        }, this);
+	    };
+
+	    Radar.prototype.update = function (ecModel, api) {
+	        var indicatorAxes = this._indicatorAxes;
+	        var radarModel = this._model;
+	        zrUtil.each(indicatorAxes, function (indicatorAxis) {
+	            indicatorAxis.scale.setExtent(Infinity, -Infinity);
+	        });
+	        ecModel.eachSeriesByType('radar', function (radarSeries, idx) {
+	            if (radarSeries.get('coordinateSystem') !== 'radar'
+	                || ecModel.getComponent('radar', radarSeries.get('radarIndex')) !== radarModel
+	            ) {
+	                return;
+	            }
+	            var data = radarSeries.getData();
+	            zrUtil.each(indicatorAxes, function (indicatorAxis) {
+	                indicatorAxis.scale.unionExtent(data.getDataExtent(indicatorAxis.dim));
+	            });
+	        }, this);
+
+	        var splitNumber = radarModel.get('splitNumber');
+
+	        function increaseInterval(interval) {
+	            var exp10 = Math.pow(10, Math.floor(Math.log(interval) / Math.LN10));
+	            // Increase interval
+	            var f = interval / exp10;
+	            if (f === 2) {
+	                f = 5;
+	            }
+	            else { // f is 2 or 5
+	                f *= 2;
+	            }
+	            return f * exp10;
+	        }
+	        // Force all the axis fixing the maxSplitNumber.
+	        zrUtil.each(indicatorAxes, function (indicatorAxis, idx) {
+	            var rawExtent = axisHelper.getScaleExtent(indicatorAxis, indicatorAxis.model);
+	            axisHelper.niceScaleExtent(indicatorAxis, indicatorAxis.model);
+
+	            var axisModel = indicatorAxis.model;
+	            var scale = indicatorAxis.scale;
+	            var fixedMin = axisModel.get('min');
+	            var fixedMax = axisModel.get('max');
+	            var interval = scale.getInterval();
+
+	            if (fixedMin != null && fixedMax != null) {
+	                // User set min, max, divide to get new interval
+	                // FIXME precision
+	                scale.setInterval(
+	                    (fixedMax - fixedMin) / splitNumber
+	                );
+	            }
+	            else if (fixedMin != null) {
+	                var max;
+	                // User set min, expand extent on the other side
+	                do {
+	                    max = fixedMin + interval * splitNumber;
+	                    scale.setExtent(+fixedMin, max);
+	                    // Interval must been set after extent
+	                    // FIXME
+	                    scale.setInterval(interval);
+
+	                    interval = increaseInterval(interval);
+	                } while (max < rawExtent[1] && isFinite(max) && isFinite(rawExtent[1]));
+	            }
+	            else if (fixedMax != null) {
+	                var min;
+	                // User set min, expand extent on the other side
+	                do {
+	                    min = fixedMax - interval * splitNumber;
+	                    scale.setExtent(min, +fixedMax);
+	                    scale.setInterval(interval);
+	                    interval = increaseInterval(interval);
+	                } while (min > rawExtent[0] && isFinite(min) && isFinite(rawExtent[0]));
+	            }
+	            else {
+	                var nicedSplitNumber = scale.getTicks().length - 1;
+	                if (nicedSplitNumber > splitNumber) {
+	                    interval = increaseInterval(interval);
+	                }
+	                // PENDING
+	                var center = Math.round((rawExtent[0] + rawExtent[1]) / 2 / interval) * interval;
+	                var halfSplitNumber = Math.round(splitNumber / 2);
+	                scale.setExtent(
+	                    numberUtil.round(center - halfSplitNumber * interval),
+	                    numberUtil.round(center + (splitNumber - halfSplitNumber) * interval)
+	                );
+	                scale.setInterval(interval);
+	            }
+	        });
+	    };
+
+	    /**
+	     * Radar dimensions is based on the data
+	     * @type {Array}
+	     */
+	    Radar.dimensions = [];
+
+	    Radar.create = function (ecModel, api) {
+	        var radarList = [];
+	        ecModel.eachComponent('radar', function (radarModel) {
+	            var radar = new Radar(radarModel, ecModel, api);
+	            radarList.push(radar);
+	            radarModel.coordinateSystem = radar;
+	        });
+	        ecModel.eachSeriesByType('radar', function (radarSeries) {
+	            if (radarSeries.get('coordinateSystem') === 'radar') {
+	                // Inject coordinate system
+	                radarSeries.coordinateSystem = radarList[radarSeries.get('radarIndex') || 0];
+	            }
+	        });
+	        return radarList;
+	    };
+
+	    __webpack_require__(26).register('radar', Radar);
+	    module.exports = Radar;
+
+
+/***/ },
+/* 154 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+	    var Axis = __webpack_require__(123);
+
+	    function IndicatorAxis(dim, scale, radiusExtent) {
+	        Axis.call(this, dim, scale, radiusExtent);
+
+	        /**
+	         * Axis type
+	         *  - 'category'
+	         *  - 'value'
+	         *  - 'time'
+	         *  - 'log'
+	         * @type {string}
+	         */
+	        this.type = 'value';
+
+	        this.angle = 0;
+
+	        /**
+	         * Indicator name
+	         * @type {string}
+	         */
+	        this.name = '';
+	        /**
+	         * @type {module:echarts/model/Model}
+	         */
+	        this.model;
+	    }
+
+	    zrUtil.inherits(IndicatorAxis, Axis);
+
+	    module.exports = IndicatorAxis;
+
+
+/***/ },
+/* 155 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+
+	    var axisDefault = __webpack_require__(128);
+	    var valueAxisDefault = axisDefault.valueAxis;
+	    var Model = __webpack_require__(12);
+	    var zrUtil = __webpack_require__(4);
+
+	    var axisModelCommonMixin = __webpack_require__(129);
+
+	    function defaultsShow(opt, show) {
+	        return zrUtil.defaults({
+	            show: show
+	        }, opt);
+	    }
+
+	    var RadarModel = __webpack_require__(1).extendComponentModel({
+
+	        type: 'radar',
+
+	        optionUpdated: function () {
+	            var boundaryGap = this.get('boundaryGap');
+	            var splitNumber = this.get('splitNumber');
+	            var scale = this.get('scale');
+	            var axisLine = this.get('axisLine');
+	            var axisTick = this.get('axisTick');
+	            var axisLabel = this.get('axisLabel');
+	            var nameTextStyle = this.get('name.textStyle');
+	            var showName = this.get('name.show');
+	            var nameFormatter = this.get('name.formatter');
+	            var nameGap = this.get('nameGap');
+	            var indicatorModels = zrUtil.map(this.get('indicator') || [], function (indicatorOpt) {
+	                // PENDING
+	                if (indicatorOpt.max != null && indicatorOpt.max > 0) {
+	                    indicatorOpt.min = 0;
+	                }
+	                else if (indicatorOpt.min != null && indicatorOpt.min < 0) {
+	                    indicatorOpt.max = 0;
+	                }
+	                // Use same configuration
+	                indicatorOpt = zrUtil.merge(zrUtil.clone(indicatorOpt), {
+	                    boundaryGap: boundaryGap,
+	                    splitNumber: splitNumber,
+	                    scale: scale,
+	                    axisLine: axisLine,
+	                    axisTick: axisTick,
+	                    axisLabel: axisLabel,
+	                    // Competitable with 2 and use text
+	                    name: indicatorOpt.text,
+	                    nameLocation: 'end',
+	                    nameGap: nameGap,
+	                    // min: 0,
+	                    nameTextStyle: nameTextStyle
+	                }, false);
+	                if (!showName) {
+	                    indicatorOpt.name = '';
+	                }
+	                if (typeof nameFormatter === 'string') {
+	                    indicatorOpt.name = nameFormatter.replace('{value}', indicatorOpt.name);
+	                }
+	                else if (typeof nameFormatter === 'function') {
+	                    indicatorOpt.name = nameFormatter(
+	                        indicatorOpt.name, indicatorOpt
+	                    );
+	                }
+	                return zrUtil.extend(
+	                    new Model(indicatorOpt, null, this.ecModel),
+	                    axisModelCommonMixin
+	                );
+	            }, this);
+	            this.getIndicatorModels = function () {
+	                return indicatorModels;
+	            };
+	        },
+
+	        defaultOption: {
+
+	            zlevel: 0,
+
+	            z: 0,
+
+	            center: ['50%', '50%'],
+
+	            radius: '75%',
+
+	            startAngle: 90,
+
+	            name: {
+	                show: true
+	                // formatter: null
+	                // textStyle: {}
+	            },
+
+	            boundaryGap: [0, 0],
+
+	            splitNumber: 5,
+
+	            nameGap: 15,
+
+	            scale: false,
+
+	            // Polygon or circle
+	            shape: 'polygon',
+
+	            axisLine: zrUtil.merge(
+	                {
+	                    lineStyle: {
+	                        color: '#bbb'
+	                    }
+	                },
+	                valueAxisDefault.axisLine
+	            ),
+	            axisLabel: defaultsShow(valueAxisDefault.axisLabel, false),
+	            axisTick: defaultsShow(valueAxisDefault.axisTick, false),
+	            splitLine: defaultsShow(valueAxisDefault.splitLine, true),
+	            splitArea: defaultsShow(valueAxisDefault.splitArea, true),
+
+	            // {text, min, max}
+	            indicator: []
+	        }
+	    });
+
+	    module.exports = RadarModel;
+
+
+/***/ },
+/* 156 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var AxisBuilder = __webpack_require__(132);
+	    var zrUtil = __webpack_require__(4);
+	    var graphic = __webpack_require__(43);
+
+	    var axisBuilderAttrs = [
+	        'axisLine', 'axisLabel', 'axisTick', 'axisName'
+	    ];
+
+	    module.exports = __webpack_require__(1).extendComponentView({
+
+	        type: 'radar',
+
+	        render: function (radarModel, ecModel, api) {
+	            var group = this.group;
+	            group.removeAll();
+
+	            this._buildAxes(radarModel);
+	            this._buildSplitLineAndArea(radarModel);
+	        },
+
+	        _buildAxes: function (radarModel) {
+	            var radar = radarModel.coordinateSystem;
+	            var indicatorAxes = radar.getIndicatorAxes();
+	            var axisBuilders = zrUtil.map(indicatorAxes, function (indicatorAxis) {
+	                var axisBuilder = new AxisBuilder(indicatorAxis.model, {
+	                    position: [radar.cx, radar.cy],
+	                    rotation: indicatorAxis.angle,
+	                    labelDirection: -1,
+	                    tickDirection: -1,
+	                    nameDirection: 1
+	                });
+	                return axisBuilder;
+	            });
+
+	            zrUtil.each(axisBuilders, function (axisBuilder) {
+	                zrUtil.each(axisBuilderAttrs, axisBuilder.add, axisBuilder);
+	                this.group.add(axisBuilder.getGroup());
+	            }, this);
+	        },
+
+	        _buildSplitLineAndArea: function (radarModel) {
+	            var radar = radarModel.coordinateSystem;
+	            var splitNumber = radarModel.get('splitNumber');
+	            var indicatorAxes = radar.getIndicatorAxes();
+	            if (!indicatorAxes.length) {
+	                return;
+	            }
+	            var shape = radarModel.get('shape');
+	            var splitLineModel = radarModel.getModel('splitLine');
+	            var splitAreaModel = radarModel.getModel('splitArea');
+	            var lineStyleModel = splitLineModel.getModel('lineStyle');
+	            var areaStyleModel = splitAreaModel.getModel('areaStyle');
+
+	            var showSplitLine = splitLineModel.get('show');
+	            var showSplitArea = splitAreaModel.get('show');
+	            var splitLineColors = lineStyleModel.get('color');
+	            var splitAreaColors = areaStyleModel.get('color');
+
+	            splitLineColors = zrUtil.isArray(splitLineColors) ? splitLineColors : [splitLineColors];
+	            splitAreaColors = zrUtil.isArray(splitAreaColors) ? splitAreaColors : [splitAreaColors];
+
+	            var splitLines = [];
+	            var splitAreas = [];
+
+	            function getColorIndex(areaOrLine, areaOrLineColorList, idx) {
+	                var colorIndex = idx % areaOrLineColorList.length;
+	                areaOrLine[colorIndex] = areaOrLine[colorIndex] || [];
+	                return colorIndex;
+	            }
+
+	            if (shape === 'circle') {
+	                var ticksRadius = indicatorAxes[0].getTicksCoords();
+	                var cx = radar.cx;
+	                var cy = radar.cy;
+	                for (var i = 0; i < ticksRadius.length; i++) {
+	                    if (showSplitLine) {
+	                        var colorIndex = getColorIndex(splitLines, splitLineColors, i);
+	                        splitLines[colorIndex].push(new graphic.Circle({
+	                            shape: {
+	                                cx: cx,
+	                                cy: cy,
+	                                r: ticksRadius[i]
+	                            }
+	                        }));
+	                    }
+	                    if (showSplitArea && i < ticksRadius.length - 1) {
+	                        var colorIndex = getColorIndex(splitAreas, splitAreaColors, i);
+	                        splitAreas[colorIndex].push(new graphic.Ring({
+	                            shape: {
+	                                cx: cx,
+	                                cy: cy,
+	                                r0: ticksRadius[i],
+	                                r: ticksRadius[i + 1]
+	                            }
+	                        }));
+	                    }
+	                }
+	            }
+	            // Polyyon
+	            else {
+	                var axesTicksPoints = zrUtil.map(indicatorAxes, function (indicatorAxis, idx) {
+	                    var ticksCoords = indicatorAxis.getTicksCoords();
+	                    return zrUtil.map(ticksCoords, function (tickCoord) {
+	                        return radar.coordToPoint(tickCoord, idx);
+	                    });
+	                });
+
+	                var prevPoints = [];
+	                for (var i = 0; i <= splitNumber; i++) {
+	                    var points = [];
+	                    for (var j = 0; j < indicatorAxes.length; j++) {
+	                        points.push(axesTicksPoints[j][i]);
+	                    }
+	                    // Close
+	                    points.push(points[0].slice());
+	                    if (showSplitLine) {
+	                        var colorIndex = getColorIndex(splitLines, splitLineColors, i);
+	                        splitLines[colorIndex].push(new graphic.Polyline({
+	                            shape: {
+	                                points: points
+	                            }
+	                        }));
+	                    }
+	                    if (showSplitArea && prevPoints) {
+	                        var colorIndex = getColorIndex(splitAreas, splitAreaColors, i - 1);
+	                        splitAreas[colorIndex].push(new graphic.Polygon({
+	                            shape: {
+	                                points: points.concat(prevPoints)
+	                            }
+	                        }));
+	                    }
+	                    prevPoints = points.slice().reverse();
+	                }
+	            }
+
+	            var lineStyle = lineStyleModel.getLineStyle();
+	            var areaStyle = areaStyleModel.getAreaStyle();
+	            // Add splitArea before splitLine
+	            zrUtil.each(splitAreas, function (splitAreas, idx) {
+	                this.group.add(graphic.mergePath(
+	                    splitAreas, {
+	                        style: zrUtil.defaults({
+	                            stroke: 'none',
+	                            fill: splitAreaColors[idx % splitAreaColors.length]
+	                        }, areaStyle),
+	                        silent: true
+	                    }
+	                ));
+	            }, this);
+
+	            zrUtil.each(splitLines, function (splitLines, idx) {
+	                this.group.add(graphic.mergePath(
+	                    splitLines, {
+	                        style: zrUtil.defaults({
+	                            fill: 'none',
+	                            stroke: splitLineColors[idx % splitLineColors.length]
+	                        }, lineStyle),
+	                        silent: true
+	                    }
+	                ));
+	            }, this);
+
+	        }
+	    });
+
+
+/***/ },
+/* 157 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var SeriesModel = __webpack_require__(28);
+	    var List = __webpack_require__(97);
+	    var completeDimensions = __webpack_require__(102);
+	    var zrUtil = __webpack_require__(4);
+
+	    var RadarSeries = SeriesModel.extend({
+
+	        type: 'series.radar',
+
+	        dependencies: ['radar'],
+
+
+	        // Overwrite
+	        init: function (option) {
+	            RadarSeries.superApply(this, 'init', arguments);
+
+	            // Enable legend selection for each data item
+	            // Use a function instead of direct access because data reference may changed
+	            this.legendDataProvider = function () {
+	                return this._dataBeforeProcessed;
+	            };
+	        },
+
+	        getInitialData: function (option, ecModel) {
+	            var data = option.data || [];
+	            var dimensions = completeDimensions(
+	                [], data, [], 'indicator_'
+	            );
+	            var list = new List(dimensions, this);
+	            list.initData(data);
+	            return list;
+	        },
+
+	        formatTooltip: function (dataIndex) {
+	            var value = this.getRawValue(dataIndex);
+	            var coordSys = this.coordinateSystem;
+	            var indicatorAxes = coordSys.getIndicatorAxes();
+	            return (this._data.getName(dataIndex) == '' ? this.name : this._data.getName(dataIndex)) + '<br/>'
+	                + zrUtil.map(indicatorAxes, function (axis, idx) {
+	                    return axis.name + ' : ' + value[idx];
+	                }).join('<br />');
+	        },
+
+	        defaultOption: {
+	            zlevel: 0,
+	            z: 2,
+	            coordinateSystem: 'radar',
+	            legendHoverLink: true,
+	            radarIndex: 0,
+	            lineStyle: {
+	                normal: {
+	                    width: 2,
+	                    type: 'solid'
+	                }
+	            },
+	            label: {
+	                normal: {
+	                    position: 'top'
+	                }
+	            },
+	            // areaStyle: {
+	            // },
+	            // itemStyle: {}
+	            symbol: 'emptyCircle',
+	            symbolSize: 4
+	            // symbolRotate: null
+	        }
+	    });
+
+	    module.exports = RadarSeries;
+
+
+/***/ },
+/* 158 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var graphic = __webpack_require__(43);
+	    var zrUtil = __webpack_require__(4);
+	    var symbolUtil = __webpack_require__(106);
+
+	    function normalizeSymbolSize(symbolSize) {
+	        if (!zrUtil.isArray(symbolSize)) {
+	            symbolSize = [+symbolSize, +symbolSize];
+	        }
+	        return symbolSize;
+	    }
+	    module.exports = __webpack_require__(1).extendChartView({
+	        type: 'radar',
+
+	        render: function (seriesModel, ecModel, api) {
+	            var polar = seriesModel.coordinateSystem;
+	            var group = this.group;
+
+	            var data = seriesModel.getData();
+	            var oldData = this._data;
+
+	            function createSymbol(data, idx) {
+	                var symbolType = data.getItemVisual(idx, 'symbol') || 'circle';
+	                var color = data.getItemVisual(idx, 'color');
+	                if (symbolType === 'none') {
+	                    return;
+	                }
+	                var symbolPath = symbolUtil.createSymbol(
+	                    symbolType, -0.5, -0.5, 1, 1, color
+	                );
+	                symbolPath.attr({
+	                    style: {
+	                        strokeNoScale: true
+	                    },
+	                    z2: 100,
+	                    scale: normalizeSymbolSize(data.getItemVisual(idx, 'symbolSize'))
+	                });
+	                return symbolPath;
+	            }
+
+	            function updateSymbols(oldPoints, newPoints, symbolGroup, data, idx, isInit) {
+	                // Simply rerender all
+	                symbolGroup.removeAll();
+	                for (var i = 0; i < newPoints.length - 1; i++) {
+	                    var symbolPath = createSymbol(data, idx);
+	                    if (symbolPath) {
+	                        symbolPath.__dimIdx = i;
+	                        if (oldPoints[i]) {
+	                            symbolPath.attr('position', oldPoints[i]);
+	                            graphic[isInit ? 'initProps' : 'updateProps'](
+	                                symbolPath, {
+	                                    position: newPoints[i]
+	                                }, seriesModel, idx
+	                            );
+	                        }
+	                        else {
+	                            symbolPath.attr('position', newPoints[i]);
+	                        }
+	                        symbolGroup.add(symbolPath);
+	                    }
+	                }
+	            }
+
+	            function getInitialPoints(points) {
+	                return zrUtil.map(points, function (pt) {
+	                    return [polar.cx, polar.cy];
+	                });
+	            }
+	            data.diff(oldData)
+	                .add(function (idx) {
+	                    var points = data.getItemLayout(idx);
+	                    if (!points) {
+	                        return;
+	                    }
+	                    var polygon = new graphic.Polygon();
+	                    var polyline = new graphic.Polyline();
+	                    var target = {
+	                        shape: {
+	                            points: points
+	                        }
+	                    };
+	                    polygon.shape.points = getInitialPoints(points);
+	                    polyline.shape.points = getInitialPoints(points);
+	                    graphic.initProps(polygon, target, seriesModel, idx);
+	                    graphic.initProps(polyline, target, seriesModel, idx);
+
+	                    var itemGroup = new graphic.Group();
+	                    var symbolGroup = new graphic.Group();
+	                    itemGroup.add(polyline);
+	                    itemGroup.add(polygon);
+	                    itemGroup.add(symbolGroup);
+
+	                    updateSymbols(
+	                        polyline.shape.points, points, symbolGroup, data, idx, true
+	                    );
+
+	                    data.setItemGraphicEl(idx, itemGroup);
+	                })
+	                .update(function (newIdx, oldIdx) {
+	                    var itemGroup = oldData.getItemGraphicEl(oldIdx);
+	                    var polyline = itemGroup.childAt(0);
+	                    var polygon = itemGroup.childAt(1);
+	                    var symbolGroup = itemGroup.childAt(2);
+	                    var target = {
+	                        shape: {
+	                            points: data.getItemLayout(newIdx)
+	                        }
+	                    };
+	                    if (!target.shape.points) {
+	                        return;
+	                    }
+	                    updateSymbols(
+	                        polyline.shape.points, target.shape.points, symbolGroup, data, newIdx, false
+	                    );
+
+	                    graphic.updateProps(polyline, target, seriesModel);
+	                    graphic.updateProps(polygon, target, seriesModel);
+
+	                    data.setItemGraphicEl(newIdx, itemGroup);
+	                })
+	                .remove(function (idx) {
+	                    group.remove(oldData.getItemGraphicEl(idx));
+	                })
+	                .execute();
+
+	            data.eachItemGraphicEl(function (itemGroup, idx) {
+	                var itemModel = data.getItemModel(idx);
+	                var polyline = itemGroup.childAt(0);
+	                var polygon = itemGroup.childAt(1);
+	                var symbolGroup = itemGroup.childAt(2);
+	                var color = data.getItemVisual(idx, 'color');
+
+	                group.add(itemGroup);
+
+	                polyline.useStyle(
+	                    zrUtil.defaults(
+	                        itemModel.getModel('lineStyle.normal').getLineStyle(),
+	                        {
+	                            fill: 'none',
+	                            stroke: color
+	                        }
+	                    )
+	                );
+	                polyline.hoverStyle = itemModel.getModel('lineStyle.emphasis').getLineStyle();
+
+	                var areaStyleModel = itemModel.getModel('areaStyle.normal');
+	                var hoverAreaStyleModel = itemModel.getModel('areaStyle.emphasis');
+	                var polygonIgnore = areaStyleModel.isEmpty() && areaStyleModel.parentModel.isEmpty();
+	                var hoverPolygonIgnore = hoverAreaStyleModel.isEmpty() && hoverAreaStyleModel.parentModel.isEmpty();
+
+	                hoverPolygonIgnore = hoverPolygonIgnore && polygonIgnore;
+	                polygon.ignore = polygonIgnore;
+
+	                polygon.useStyle(
+	                    zrUtil.defaults(
+	                        areaStyleModel.getAreaStyle(),
+	                        {
+	                            fill: color,
+	                            opacity: 0.7
+	                        }
+	                    )
+	                );
+	                polygon.hoverStyle = hoverAreaStyleModel.getAreaStyle();
+
+	                var itemStyle = itemModel.getModel('itemStyle.normal').getItemStyle(['color']);
+	                var itemHoverStyle = itemModel.getModel('itemStyle.emphasis').getItemStyle();
+	                var labelModel = itemModel.getModel('label.normal');
+	                var labelHoverModel = itemModel.getModel('label.emphasis');
+	                symbolGroup.eachChild(function (symbolPath) {
+	                    symbolPath.setStyle(itemStyle);
+	                    symbolPath.hoverStyle = zrUtil.clone(itemHoverStyle);
+
+	                    var defaultText = data.get(data.dimensions[symbolPath.__dimIdx], idx);
+	                    graphic.setText(symbolPath.style, labelModel, color);
+	                    symbolPath.setStyle({
+	                        text: labelModel.get('show') ? zrUtil.retrieve(
+	                            seriesModel.getFormattedLabel(
+	                                idx, 'normal', null, symbolPath.__dimIdx
+	                            ),
+	                            defaultText
+	                        ) : ''
+	                    });
+
+	                    graphic.setText(symbolPath.hoverStyle, labelHoverModel, color);
+	                    symbolPath.hoverStyle.text = labelHoverModel.get('show') ? zrUtil.retrieve(
+	                        seriesModel.getFormattedLabel(
+	                            idx, 'emphasis', null, symbolPath.__dimIdx
+	                        ),
+	                        defaultText
+	                    ) : '';
+	                });
+
+	                function onEmphasis() {
+	                    polygon.attr('ignore', hoverPolygonIgnore);
+	                }
+
+	                function onNormal() {
+	                    polygon.attr('ignore', polygonIgnore);
+	                }
+
+	                itemGroup.off('mouseover').off('mouseout').off('normal').off('emphasis');
+	                itemGroup.on('emphasis', onEmphasis)
+	                    .on('mouseover', onEmphasis)
+	                    .on('normal', onNormal)
+	                    .on('mouseout', onNormal);
+
+	                graphic.setHoverStyle(itemGroup);
+	            });
+
+	            this._data = data;
+	        },
+
+	        remove: function () {
+	            this.group.removeAll();
+	            this._data = null;
+	        }
+	    });
+
+
+/***/ },
+/* 159 */
+/***/ function(module, exports) {
+
+	
+
+	    module.exports = function (ecModel) {
+	        ecModel.eachSeriesByType('radar', function (seriesModel) {
+	            var data = seriesModel.getData();
+	            var points = [];
+	            var coordSys = seriesModel.coordinateSystem;
+	            if (!coordSys) {
+	                return;
+	            }
+
+	            function pointsConverter(val, idx) {
+	                points[idx] = points[idx] || [];
+	                points[idx][i] = coordSys.dataToPoint(val, i);
+	            }
+	            for (var i = 0; i < coordSys.getIndicatorAxes().length; i++) {
+	                var dim = data.dimensions[i];
+	                data.each(dim, pointsConverter);
+	            }
+
+	            data.each(function (idx) {
+	                // Close polygon
+	                points[idx][0] && points[idx].push(points[idx][0].slice());
+	                data.setItemLayout(idx, points[idx]);
+	            });
+	        });
+	    };
+
+
+/***/ },
+/* 160 */
+/***/ function(module, exports, __webpack_require__) {
+
+	// Backward compat for radar chart in 2
+
+
+	    var zrUtil = __webpack_require__(4);
+
+	    module.exports = function (option) {
+	        var polarOptArr = option.polar;
+	        if (polarOptArr) {
+	            if (!zrUtil.isArray(polarOptArr)) {
+	                polarOptArr = [polarOptArr];
+	            }
+	            var polarNotRadar = [];
+	            zrUtil.each(polarOptArr, function (polarOpt, idx) {
+	                if (polarOpt.indicator) {
+	                    if (polarOpt.type && !polarOpt.shape) {
+	                        polarOpt.shape = polarOpt.type;
+	                    }
+	                    option.radar = option.radar || [];
+	                    if (!zrUtil.isArray(option.radar)) {
+	                        option.radar = [option.radar];
+	                    }
+	                    option.radar.push(polarOpt);
+	                }
+	                else {
+	                    polarNotRadar.push(polarOpt);
+	                }
+	            });
+	            option.polar = polarNotRadar;
+	        }
+	        zrUtil.each(option.series, function (seriesOpt) {
+	            if (seriesOpt.type === 'radar' && seriesOpt.polarIndex) {
+	                seriesOpt.radarIndex = seriesOpt.polarIndex;
+	            }
+	        });
+	    };
+
+
+/***/ },
+/* 161 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var echarts = __webpack_require__(1);
+	    var PRIORITY = echarts.PRIORITY;
+
+	    __webpack_require__(162);
+
+	    __webpack_require__(172);
+
+	    __webpack_require__(176);
+
+	    __webpack_require__(163);
+
+	    echarts.registerLayout(__webpack_require__(178));
+
+	    echarts.registerVisual(__webpack_require__(179));
+
+	    echarts.registerProcessor(PRIORITY.PROCESSOR.STATISTIC, __webpack_require__(180));
+
+	    echarts.registerPreprocessor(__webpack_require__(181));
+
+	    __webpack_require__(142)('map', [{
+	        type: 'mapToggleSelect',
+	        event: 'mapselectchanged',
+	        method: 'toggleSelected'
+	    }, {
+	        type: 'mapSelect',
+	        event: 'mapselected',
+	        method: 'select'
+	    }, {
+	        type: 'mapUnSelect',
+	        event: 'mapunselected',
+	        method: 'unSelect'
+	    }]);
+
+
+/***/ },
+/* 162 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var List = __webpack_require__(97);
+	    var SeriesModel = __webpack_require__(28);
+	    var zrUtil = __webpack_require__(4);
+	    var completeDimensions = __webpack_require__(102);
+
+	    var formatUtil = __webpack_require__(6);
+	    var encodeHTML = formatUtil.encodeHTML;
+	    var addCommas = formatUtil.addCommas;
+
+	    var dataSelectableMixin = __webpack_require__(140);
+
+	    var geoCreator = __webpack_require__(163);
+
+	    var MapSeries = SeriesModel.extend({
+
+	        type: 'series.map',
+
+	        layoutMode: 'box',
+
+	        /**
+	         * Only first map series of same mapType will drawMap
+	         * @type {boolean}
+	         */
+	        needsDrawMap: false,
+
+	        /**
+	         * Group of all map series with same mapType
+	         * @type {boolean}
+	         */
+	        seriesGroup: [],
+
+	        init: function (option) {
+
+	            option = this._fillOption(option, option.map);
+	            this.option = option;
+
+	            MapSeries.superApply(this, 'init', arguments);
+
+	            this.updateSelectedMap(option.data);
+	        },
+
+	        getInitialData: function (option) {
+	            var dimensions = completeDimensions(['value'], option.data || []);
+
+	            var list = new List(dimensions, this);
+
+	            list.initData(option.data);
+
+	            return list;
+	        },
+
+	        mergeOption: function (newOption) {
+	            if (newOption.data) {
+	                newOption = this._fillOption(newOption, this.option.map);
+	            }
+
+	            MapSeries.superCall(this, 'mergeOption', newOption);
+
+	            this.updateSelectedMap(this.option.data);
+	        },
+
+	        _fillOption: function (option, mapName) {
+	            // Shallow clone
+	            option = zrUtil.extend({}, option);
+
+	            option.data = geoCreator.getFilledRegions(option.data, mapName);
+
+	            return option;
+	        },
+
+	        getRawValue: function (dataIndex) {
+	            // Use value stored in data instead because it is calculated from multiple series
+	            // FIXME Provide all value of multiple series ?
+	            return this._data.get('value', dataIndex);
+	        },
+
+	        /**
+	         * Get model of region
+	         * @param  {string} name
+	         * @return {module:echarts/model/Model}
+	         */
+	        getRegionModel: function (regionName) {
+	            var data = this.getData();
+	            return data.getItemModel(data.indexOfName(regionName));
+	        },
+
+	        /**
+	         * Map tooltip formatter
+	         *
+	         * @param {number} dataIndex
+	         */
+	        formatTooltip: function (dataIndex) {
+	            // FIXME orignalData and data is a bit confusing
+	            var data = this.getData();
+	            var formattedValue = addCommas(this.getRawValue(dataIndex));
+	            var name = data.getName(dataIndex);
+
+	            var seriesGroup = this.seriesGroup;
+	            var seriesNames = [];
+	            for (var i = 0; i < seriesGroup.length; i++) {
+	                var otherIndex = seriesGroup[i].originalData.indexOfName(name);
+	                if (!isNaN(seriesGroup[i].originalData.get('value', otherIndex))) {
+	                    seriesNames.push(
+	                        encodeHTML(seriesGroup[i].name)
+	                    );
+	                }
+	            }
+
+	            return seriesNames.join(', ') + '<br />'
+	                + name + ' : ' + formattedValue;
+	        },
+
+	        defaultOption: {
+	            // 一级层叠
+	            zlevel: 0,
+	            // 二级层叠
+	            z: 2,
+	            coordinateSystem: 'geo',
+	            // 各省的 map 暂时都用中文
+	            map: 'china',
+
+	            // 'center' | 'left' | 'right' | 'x%' | {number}
+	            left: 'center',
+	            // 'center' | 'top' | 'bottom' | 'x%' | {number}
+	            top: 'center',
+	            // right
+	            // bottom
+	            // width:
+	            // height
+
+	            // Aspect is width / height. Inited to be geoJson bbox aspect
+	            // This parameter is used for scale this aspect
+	            aspectScale: 0.75,
+
+	            ///// Layout with center and size
+	            // If you wan't to put map in a fixed size box with right aspect ratio
+	            // This two properties may more conveninet
+	            // layoutCenter: [50%, 50%]
+	            // layoutSize: 100
+
+
+	            // 数值合并方式，默认加和，可选为：
+	            // 'sum' | 'average' | 'max' | 'min'
+	            // mapValueCalculation: 'sum',
+	            // 地图数值计算结果小数精度
+	            // mapValuePrecision: 0,
+
+
+	            // 显示图例颜色标识（系列标识的小圆点），图例开启时有效
+	            showLegendSymbol: true,
+	            // 选择模式，默认关闭，可选single，multiple
+	            // selectedMode: false,
+	            dataRangeHoverLink: true,
+	            // 是否开启缩放及漫游模式
+	            // roam: false,
+
+	            // Default on center of map
+	            center: null,
+
+	            zoom: 1,
+
+	            scaleLimit: null,
+
+	            label: {
+	                normal: {
+	                    show: false,
+	                    textStyle: {
+	                        color: '#000'
+	                    }
+	                },
+	                emphasis: {
+	                    show: true,
+	                    textStyle: {
+	                        color: 'rgb(100,0,0)'
+	                    }
+	                }
+	            },
+	            // scaleLimit: null,
+	            itemStyle: {
+	                normal: {
+	                    // color: 各异,
+	                    borderWidth: 0.5,
+	                    borderColor: '#444',
+	                    areaColor: '#eee'
+	                },
+	                // 也是选中样式
+	                emphasis: {
+	                    areaColor: 'rgba(255,215,0,0.8)'
+	                }
+	            }
+	        },
+
+	        setZoom: function (zoom) {
+	            this.option.zoom = zoom;
+	        },
+
+	        setCenter: function (center) {
+	            this.option.center = center;
+	        }
+	    });
+
+	    zrUtil.mixin(MapSeries, dataSelectableMixin);
+
+	    module.exports = MapSeries;
+
+
+/***/ },
+/* 163 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var Geo = __webpack_require__(164);
+
+	    var layout = __webpack_require__(21);
+	    var zrUtil = __webpack_require__(4);
+	    var numberUtil = __webpack_require__(7);
+
+	    var mapDataStores = {};
+
+	    /**
+	     * Resize method bound to the geo
+	     * @param {module:echarts/coord/geo/GeoModel|module:echarts/chart/map/MapModel} geoModel
+	     * @param {module:echarts/ExtensionAPI} api
+	     */
+	    function resizeGeo (geoModel, api) {
+	        var rect = this.getBoundingRect();
+
+	        var boxLayoutOption;
+
+	        var center = geoModel.get('layoutCenter');
+	        var size = geoModel.get('layoutSize');
+
+	        var viewWidth = api.getWidth();
+	        var viewHeight = api.getHeight();
+
+	        var aspectScale = geoModel.get('aspectScale') || 0.75;
+	        var aspect = rect.width / rect.height * aspectScale;
+
+	        var useCenterAndSize = false;
+	        if (center && size) {
+	            center = [
+	                numberUtil.parsePercent(center[0], viewWidth),
+	                numberUtil.parsePercent(center[1], viewHeight)
+	            ];
+	            size = numberUtil.parsePercent(size, Math.min(viewWidth, viewHeight));
+
+	            if (!isNaN(center[0]) && !isNaN(center[1]) && !isNaN(size)) {
+	                useCenterAndSize = true;
+	            }
+	            else {
+	                if (true) {
+	                    console.warn('Given layoutCenter or layoutSize data are invalid. Use left/top/width/height instead.');
+	                }
+	            }
+	        }
+
+	        var viewRect;
+	        if (useCenterAndSize) {
+	            var viewRect = {};
+	            if (aspect > 1) {
+	                // Width is same with size
+	                viewRect.width = size;
+	                viewRect.height = size / aspect;
+	            }
+	            else {
+	                viewRect.height = size;
+	                viewRect.width = size * aspect;
+	            }
+	            viewRect.y = center[1] - viewRect.height / 2;
+	            viewRect.x = center[0] - viewRect.width / 2;
+	        }
+	        else {
+	            // Use left/top/width/height
+	            boxLayoutOption = geoModel.getBoxLayoutParams();
+
+	            // 0.75 rate
+	            boxLayoutOption.aspect = aspect;
+
+	            viewRect = layout.getLayoutRect(boxLayoutOption, {
+	                width: viewWidth,
+	                height: viewHeight
+	            });
+	        }
+
+	        this.setViewRect(viewRect.x, viewRect.y, viewRect.width, viewRect.height);
+
+	        this.setCenter(geoModel.get('center'));
+	        this.setZoom(geoModel.get('zoom'));
+	    }
+
+	    /**
+	     * @param {module:echarts/coord/Geo} geo
+	     * @param {module:echarts/model/Model} model
+	     * @inner
+	     */
+	    function setGeoCoords(geo, model) {
+	        zrUtil.each(model.get('geoCoord'), function (geoCoord, name) {
+	            geo.addGeoCoord(name, geoCoord);
+	        });
+	    }
+
+	    if (true) {
+	        var mapNotExistsError = function (name) {
+	            console.error('Map ' + name + ' not exists. You can download map file on http://echarts.baidu.com/download-map.html');
+	        };
+	    }
+
+	    var geoCreator = {
+
+	        // For deciding which dimensions to use when creating list data
+	        dimensions: Geo.prototype.dimensions,
+
+	        create: function (ecModel, api) {
+	            var geoList = [];
+
+	            // FIXME Create each time may be slow
+	            ecModel.eachComponent('geo', function (geoModel, idx) {
+	                var name = geoModel.get('map');
+	                var mapData = mapDataStores[name];
+	                if (true) {
+	                    if (!mapData) {
+	                        mapNotExistsError(name);
+	                    }
+	                }
+	                var geo = new Geo(
+	                    name + idx, name,
+	                    mapData && mapData.geoJson, mapData && mapData.specialAreas,
+	                    geoModel.get('nameMap')
+	                );
+	                geo.zoomLimit = geoModel.get('scaleLimit');
+	                geoList.push(geo);
+
+	                setGeoCoords(geo, geoModel);
+
+	                geoModel.coordinateSystem = geo;
+	                geo.model = geoModel;
+
+	                // Inject resize method
+	                geo.resize = resizeGeo;
+
+	                geo.resize(geoModel, api);
+	            });
+
+	            ecModel.eachSeries(function (seriesModel) {
+	                var coordSys = seriesModel.get('coordinateSystem');
+	                if (coordSys === 'geo') {
+	                    var geoIndex = seriesModel.get('geoIndex') || 0;
+	                    seriesModel.coordinateSystem = geoList[geoIndex];
+	                }
+	            });
+
+	            // If has map series
+	            var mapModelGroupBySeries = {};
+
+	            ecModel.eachSeriesByType('map', function (seriesModel) {
+	                var mapType = seriesModel.get('map');
+
+	                mapModelGroupBySeries[mapType] = mapModelGroupBySeries[mapType] || [];
+
+	                mapModelGroupBySeries[mapType].push(seriesModel);
+	            });
+
+	            zrUtil.each(mapModelGroupBySeries, function (mapSeries, mapType) {
+	                var mapData = mapDataStores[mapType];
+	                if (true) {
+	                    if (!mapData) {
+	                        mapNotExistsError(mapSeries[0].get('map'));
+	                    }
+	                }
+
+	                var nameMapList = zrUtil.map(mapSeries, function (singleMapSeries) {
+	                    return singleMapSeries.get('nameMap');
+	                });
+	                var geo = new Geo(
+	                    mapType, mapType,
+	                    mapData && mapData.geoJson, mapData && mapData.specialAreas,
+	                    zrUtil.mergeAll(nameMapList)
+	                );
+	                geo.zoomLimit = zrUtil.retrieve.apply(null, zrUtil.map(mapSeries, function (singleMapSeries) {
+	                    return singleMapSeries.get('scaleLimit');
+	                }));
+	                geoList.push(geo);
+
+	                // Inject resize method
+	                geo.resize = resizeGeo;
+
+	                geo.resize(mapSeries[0], api);
+
+	                zrUtil.each(mapSeries, function (singleMapSeries) {
+	                    singleMapSeries.coordinateSystem = geo;
+
+	                    setGeoCoords(geo, singleMapSeries);
+	                });
+	            });
+
+	            return geoList;
+	        },
+
+	        /**
+	         * @param {string} mapName
+	         * @param {Object|string} geoJson
+	         * @param {Object} [specialAreas]
+	         *
+	         * @example
+	         *     $.get('USA.json', function (geoJson) {
+	         *         echarts.registerMap('USA', geoJson);
+	         *         // Or
+	         *         echarts.registerMap('USA', {
+	         *             geoJson: geoJson,
+	         *             specialAreas: {}
+	         *         })
+	         *     });
+	         */
+	        registerMap: function (mapName, geoJson, specialAreas) {
+	            if (geoJson.geoJson && !geoJson.features) {
+	                specialAreas = geoJson.specialAreas;
+	                geoJson = geoJson.geoJson;
+	            }
+	            if (typeof geoJson === 'string') {
+	                geoJson = (typeof JSON !== 'undefined' && JSON.parse)
+	                    ? JSON.parse(geoJson) : (new Function('return (' + geoJson + ');'))();
+	            }
+	            mapDataStores[mapName] = {
+	                geoJson: geoJson,
+	                specialAreas: specialAreas
+	            };
+	        },
+
+	        /**
+	         * @param {string} mapName
+	         * @return {Object}
+	         */
+	        getMap: function (mapName) {
+	            return mapDataStores[mapName];
+	        },
+
+	        /**
+	         * Fill given regions array
+	         * @param  {Array.<Object>} originRegionArr
+	         * @param  {string} mapName
+	         * @return {Array}
+	         */
+	        getFilledRegions: function (originRegionArr, mapName) {
+	            // Not use the original
+	            var regionsArr = (originRegionArr || []).slice();
+
+	            var map = geoCreator.getMap(mapName);
+	            var geoJson = map && map.geoJson;
+	            if (!geoJson) {
+	                if (true) {
+	                    mapNotExistsError(mapName);
+	                }
+	                return originRegionArr;
+	            }
+
+	            var dataNameMap = {};
+	            var features = geoJson.features;
+	            for (var i = 0; i < regionsArr.length; i++) {
+	                dataNameMap[regionsArr[i].name] = regionsArr[i];
+	            }
+
+	            for (var i = 0; i < features.length; i++) {
+	                var name = features[i].properties.name;
+	                if (!dataNameMap[name]) {
+	                    regionsArr.push({
+	                        name: name
+	                    });
+	                }
+	            }
+	            return regionsArr;
+	        }
+	    };
+
+	    // Inject methods into echarts
+	    var echarts = __webpack_require__(1);
+
+	    echarts.registerMap = geoCreator.registerMap;
+
+	    echarts.getMap = geoCreator.getMap;
+
+	    // TODO
+	    echarts.loadMap = function () {};
+
+	    echarts.registerCoordinateSystem('geo', geoCreator);
+
+	    module.exports = geoCreator;
+
+
+/***/ },
+/* 164 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var parseGeoJson = __webpack_require__(165);
+
+	    var zrUtil = __webpack_require__(4);
+
+	    var BoundingRect = __webpack_require__(9);
+
+	    var View = __webpack_require__(168);
+
+
+	    // Geo fix functions
+	    var geoFixFuncs = [
+	        __webpack_require__(169),
+	        __webpack_require__(170),
+	        __webpack_require__(171)
+	    ];
+
+	    /**
+	     * [Geo description]
+	     * @param {string} name Geo name
+	     * @param {string} map Map type
+	     * @param {Object} geoJson
+	     * @param {Object} [specialAreas]
+	     *        Specify the positioned areas by left, top, width, height
+	     * @param {Object.<string, string>} [nameMap]
+	     *        Specify name alias
+	     */
+	    function Geo(name, map, geoJson, specialAreas, nameMap) {
+
+	        View.call(this, name);
+
+	        /**
+	         * Map type
+	         * @type {string}
+	         */
+	        this.map = map;
+
+	        this._nameCoordMap = {};
+
+	        this.loadGeoJson(geoJson, specialAreas, nameMap);
+	    }
+
+	    Geo.prototype = {
+
+	        constructor: Geo,
+
+	        type: 'geo',
+
+	        /**
+	         * @param {Array.<string>}
+	         * @readOnly
+	         */
+	        dimensions: ['lng', 'lat'],
+
+	        /**
+	         * If contain given lng,lat coord
+	         * @param {Array.<number>}
+	         * @readOnly
+	         */
+	        containCoord: function (coord) {
+	            var regions = this.regions;
+	            for (var i = 0; i < regions.length; i++) {
+	                if (regions[i].contain(coord)) {
+	                    return true;
+	                }
+	            }
+	            return false;
+	        },
+	        /**
+	         * @param {Object} geoJson
+	         * @param {Object} [specialAreas]
+	         *        Specify the positioned areas by left, top, width, height
+	         * @param {Object.<string, string>} [nameMap]
+	         *        Specify name alias
+	         */
+	        loadGeoJson: function (geoJson, specialAreas, nameMap) {
+	            // https://jsperf.com/try-catch-performance-overhead
+	            try {
+	                this.regions = geoJson ? parseGeoJson(geoJson) : [];
+	            }
+	            catch (e) {
+	                throw 'Invalid geoJson format\n' + e;
+	            }
+	            specialAreas = specialAreas || {};
+	            nameMap = nameMap || {};
+	            var regions = this.regions;
+	            var regionsMap = {};
+	            for (var i = 0; i < regions.length; i++) {
+	                var regionName = regions[i].name;
+	                // Try use the alias in nameMap
+	                regionName = nameMap[regionName] || regionName;
+	                regions[i].name = regionName;
+
+	                regionsMap[regionName] = regions[i];
+	                // Add geoJson
+	                this.addGeoCoord(regionName, regions[i].center);
+
+	                // Some area like Alaska in USA map needs to be tansformed
+	                // to look better
+	                var specialArea = specialAreas[regionName];
+	                if (specialArea) {
+	                    regions[i].transformTo(
+	                        specialArea.left, specialArea.top, specialArea.width, specialArea.height
+	                    );
+	                }
+	            }
+
+	            this._regionsMap = regionsMap;
+
+	            this._rect = null;
+
+	            zrUtil.each(geoFixFuncs, function (fixFunc) {
+	                fixFunc(this);
+	            }, this);
+	        },
+
+	        // Overwrite
+	        transformTo: function (x, y, width, height) {
+	            var rect = this.getBoundingRect();
+
+	            rect = rect.clone();
+	            // Longitute is inverted
+	            rect.y = -rect.y - rect.height;
+
+	            var viewTransform = this._viewTransform;
+
+	            viewTransform.transform = rect.calculateTransform(
+	                new BoundingRect(x, y, width, height)
+	            );
+
+	            viewTransform.decomposeTransform();
+
+	            var scale = viewTransform.scale;
+	            scale[1] = -scale[1];
+
+	            viewTransform.updateTransform();
+
+	            this._updateTransform();
+	        },
+
+	        /**
+	         * @param {string} name
+	         * @return {module:echarts/coord/geo/Region}
+	         */
+	        getRegion: function (name) {
+	            return this._regionsMap[name];
+	        },
+
+	        getRegionByCoord: function (coord) {
+	            var regions = this.regions;
+	            for (var i = 0; i < regions.length; i++) {
+	                if (regions[i].contain(coord)) {
+	                    return regions[i];
+	                }
+	            }
+	        },
+
+	        /**
+	         * Add geoCoord for indexing by name
+	         * @param {string} name
+	         * @param {Array.<number>} geoCoord
+	         */
+	        addGeoCoord: function (name, geoCoord) {
+	            this._nameCoordMap[name] = geoCoord;
+	        },
+
+	        /**
+	         * Get geoCoord by name
+	         * @param {string} name
+	         * @return {Array.<number>}
+	         */
+	        getGeoCoord: function (name) {
+	            return this._nameCoordMap[name];
+	        },
+
+	        // Overwrite
+	        getBoundingRect: function () {
+	            if (this._rect) {
+	                return this._rect;
+	            }
+	            var rect;
+
+	            var regions = this.regions;
+	            for (var i = 0; i < regions.length; i++) {
+	                var regionRect = regions[i].getBoundingRect();
+	                rect = rect || regionRect.clone();
+	                rect.union(regionRect);
+	            }
+	            // FIXME Always return new ?
+	            return (this._rect = rect || new BoundingRect(0, 0, 0, 0));
+	        },
+
+	        /**
+	         * Convert series data to a list of points
+	         * @param {module:echarts/data/List} data
+	         * @param {boolean} stack
+	         * @return {Array}
+	         *  Return list of points. For example:
+	         *  `[[10, 10], [20, 20], [30, 30]]`
+	         */
+	        dataToPoints: function (data) {
+	            var item = [];
+	            return data.mapArray(['lng', 'lat'], function (lon, lat) {
+	                item[0] = lon;
+	                item[1] = lat;
+	                return this.dataToPoint(item);
+	            }, this);
+	        },
+
+	        // Overwrite
+	        /**
+	         * @param {string|Array.<number>} data
+	         * @return {Array.<number>}
+	         */
+	        dataToPoint: function (data) {
+	            if (typeof data === 'string') {
+	                // Map area name to geoCoord
+	                data = this.getGeoCoord(data);
+	            }
+	            if (data) {
+	                return View.prototype.dataToPoint.call(this, data);
+	            }
+	        }
+	    };
+
+	    zrUtil.mixin(Geo, View);
+
+	    module.exports = Geo;
+
+
+/***/ },
+/* 165 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * Parse and decode geo json
+	 * @module echarts/coord/geo/parseGeoJson
+	 */
+
+
+	    var zrUtil = __webpack_require__(4);
+
+	    var Region = __webpack_require__(166);
+
+	    function decode(json) {
+	        if (!json.UTF8Encoding) {
+	            return json;
+	        }
+	        var features = json.features;
+
+	        for (var f = 0; f < features.length; f++) {
+	            var feature = features[f];
+	            var geometry = feature.geometry;
+	            var coordinates = geometry.coordinates;
+	            var encodeOffsets = geometry.encodeOffsets;
+
+	            for (var c = 0; c < coordinates.length; c++) {
+	                var coordinate = coordinates[c];
+
+	                if (geometry.type === 'Polygon') {
+	                    coordinates[c] = decodePolygon(
+	                        coordinate,
+	                        encodeOffsets[c]
+	                    );
+	                }
+	                else if (geometry.type === 'MultiPolygon') {
+	                    for (var c2 = 0; c2 < coordinate.length; c2++) {
+	                        var polygon = coordinate[c2];
+	                        coordinate[c2] = decodePolygon(
+	                            polygon,
+	                            encodeOffsets[c][c2]
+	                        );
+	                    }
+	                }
+	            }
+	        }
+	        // Has been decoded
+	        json.UTF8Encoding = false;
+	        return json;
+	    }
+
+	    function decodePolygon(coordinate, encodeOffsets) {
+	        var result = [];
+	        var prevX = encodeOffsets[0];
+	        var prevY = encodeOffsets[1];
+
+	        for (var i = 0; i < coordinate.length; i += 2) {
+	            var x = coordinate.charCodeAt(i) - 64;
+	            var y = coordinate.charCodeAt(i + 1) - 64;
+	            // ZigZag decoding
+	            x = (x >> 1) ^ (-(x & 1));
+	            y = (y >> 1) ^ (-(y & 1));
+	            // Delta deocding
+	            x += prevX;
+	            y += prevY;
+
+	            prevX = x;
+	            prevY = y;
+	            // Dequantize
+	            result.push([x / 1024, y / 1024]);
+	        }
+
+	        return result;
+	    }
+
+	    /**
+	     * @inner
+	     */
+	    function flattern2D(array) {
+	        var ret = [];
+	        for (var i = 0; i < array.length; i++) {
+	            for (var k = 0; k < array[i].length; k++) {
+	                ret.push(array[i][k]);
+	            }
+	        }
+	        return ret;
+	    }
+
+	    /**
+	     * @alias module:echarts/coord/geo/parseGeoJson
+	     * @param {Object} geoJson
+	     * @return {module:zrender/container/Group}
+	     */
+	    module.exports = function (geoJson) {
+
+	        decode(geoJson);
+
+	        return zrUtil.map(zrUtil.filter(geoJson.features, function (featureObj) {
+	            // Output of mapshaper may have geometry null
+	            return featureObj.geometry && featureObj.properties;
+	        }), function (featureObj) {
+	            var properties = featureObj.properties;
+	            var geometry = featureObj.geometry;
+
+	            var coordinates = geometry.coordinates;
+
+	            if (geometry.type === 'MultiPolygon') {
+	                coordinates = flattern2D(coordinates);
+	            }
+
+	            return new Region(
+	                properties.name,
+	                coordinates,
+	                properties.cp
+	            );
+	        });
+	    };
+
+
+/***/ },
+/* 166 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @module echarts/coord/geo/Region
+	 */
+
+
+	    var polygonContain = __webpack_require__(167);
+
+	    var BoundingRect = __webpack_require__(9);
+
+	    var bbox = __webpack_require__(51);
+	    var vec2 = __webpack_require__(10);
+
+	    /**
+	     * @param {string} name
+	     * @param {Array} contours
+	     * @param {Array.<number>} cp
+	     */
+	    function Region(name, contours, cp) {
+
+	        /**
+	         * @type {string}
+	         * @readOnly
+	         */
+	        this.name = name;
+
+	        /**
+	         * @type {Array.<Array>}
+	         * @readOnly
+	         */
+	        this.contours = contours;
+
+	        if (!cp) {
+	            var rect = this.getBoundingRect();
+	            cp = [
+	                rect.x + rect.width / 2,
+	                rect.y + rect.height / 2
+	            ];
+	        }
+	        else {
+	            cp = [cp[0], cp[1]];
+	        }
+	        /**
+	         * @type {Array.<number>}
+	         */
+	        this.center = cp;
+	    }
+
+	    Region.prototype = {
+
+	        constructor: Region,
+
+	        /**
+	         * @return {module:zrender/core/BoundingRect}
+	         */
+	        getBoundingRect: function () {
+	            var rect = this._rect;
+	            if (rect) {
+	                return rect;
+	            }
+
+	            var MAX_NUMBER = Number.MAX_VALUE;
+	            var min = [MAX_NUMBER, MAX_NUMBER];
+	            var max = [-MAX_NUMBER, -MAX_NUMBER];
+	            var min2 = [];
+	            var max2 = [];
+	            var contours = this.contours;
+	            for (var i = 0; i < contours.length; i++) {
+	                bbox.fromPoints(contours[i], min2, max2);
+	                vec2.min(min, min, min2);
+	                vec2.max(max, max, max2);
+	            }
+	            // No data
+	            if (i === 0) {
+	                min[0] = min[1] = max[0] = max[1] = 0;
+	            }
+
+	            return (this._rect = new BoundingRect(
+	                min[0], min[1], max[0] - min[0], max[1] - min[1]
+	            ));
+	        },
+
+	        /**
+	         * @param {<Array.<number>} coord
+	         * @return {boolean}
+	         */
+	        contain: function (coord) {
+	            var rect = this.getBoundingRect();
+	            var contours = this.contours;
+	            if (rect.contain(coord[0], coord[1])) {
+	                for (var i = 0, len = contours.length; i < len; i++) {
+	                    if (polygonContain.contain(contours[i], coord[0], coord[1])) {
+	                        return true;
+	                    }
+	                }
+	            }
+	            return false;
+	        },
+
+	        transformTo: function (x, y, width, height) {
+	            var rect = this.getBoundingRect();
+	            var aspect = rect.width / rect.height;
+	            if (!width) {
+	                width = aspect * height;
+	            }
+	            else if (!height) {
+	                height = width / aspect ;
+	            }
+	            var target = new BoundingRect(x, y, width, height);
+	            var transform = rect.calculateTransform(target);
+	            var contours = this.contours;
+	            for (var i = 0; i < contours.length; i++) {
+	                for (var p = 0; p < contours[i].length; p++) {
+	                    vec2.applyTransform(contours[i][p], contours[i][p], transform);
+	                }
+	            }
+	            rect = this._rect;
+	            rect.copy(target);
+	            // Update center
+	            this.center = [
+	                rect.x + rect.width / 2,
+	                rect.y + rect.height / 2
+	            ];
+	        }
+	    };
+
+	    module.exports = Region;
+
+
+/***/ },
+/* 167 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var windingLine = __webpack_require__(58);
+
+	    var EPSILON = 1e-8;
+
+	    function isAroundEqual(a, b) {
+	        return Math.abs(a - b) < EPSILON;
+	    }
+
+	    function contain(points, x, y) {
+	        var w = 0;
+	        var p = points[0];
+
+	        if (!p) {
+	            return false;
+	        }
+
+	        for (var i = 1; i < points.length; i++) {
+	            var p2 = points[i];
+	            w += windingLine(p[0], p[1], p2[0], p2[1], x, y);
+	            p = p2;
+	        }
+
+	        // Close polygon
+	        var p0 = points[0];
+	        if (!isAroundEqual(p[0], p0[0]) || !isAroundEqual(p[1], p0[1])) {
+	            w += windingLine(p[0], p[1], p0[0], p0[1], x, y);
+	        }
+
+	        return w !== 0;
+	    }
+
+
+	    module.exports = {
+	        contain: contain
+	    };
+
+
+/***/ },
+/* 168 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * Simple view coordinate system
+	 * Mapping given x, y to transformd view x, y
+	 */
+
+
+	    var vector = __webpack_require__(10);
+	    var matrix = __webpack_require__(11);
+
+	    var Transformable = __webpack_require__(34);
+	    var zrUtil = __webpack_require__(4);
+
+	    var BoundingRect = __webpack_require__(9);
+
+	    var v2ApplyTransform = vector.applyTransform;
+
+	    // Dummy transform node
+	    function TransformDummy() {
+	        Transformable.call(this);
+	    }
+	    zrUtil.mixin(TransformDummy, Transformable);
+
+	    function View(name) {
+	        /**
+	         * @type {string}
+	         */
+	        this.name = name;
+
+	        /**
+	         * @type {Object}
+	         */
+	        this.zoomLimit;
+
+	        Transformable.call(this);
+
+	        this._roamTransform = new TransformDummy();
+
+	        this._viewTransform = new TransformDummy();
+
+	        this._center;
+	        this._zoom;
+	    }
+
+	    View.prototype = {
+
+	        constructor: View,
+
+	        type: 'view',
+
+	        /**
+	         * @param {Array.<string>}
+	         * @readOnly
+	         */
+	        dimensions: ['x', 'y'],
+
+	        /**
+	         * Set bounding rect
+	         * @param {number} x
+	         * @param {number} y
+	         * @param {number} width
+	         * @param {number} height
+	         */
+
+	        // PENDING to getRect
+	        setBoundingRect: function (x, y, width, height) {
+	            this._rect = new BoundingRect(x, y, width, height);
+	            return this._rect;
+	        },
+
+	        /**
+	         * @return {module:zrender/core/BoundingRect}
+	         */
+	        // PENDING to getRect
+	        getBoundingRect: function () {
+	            return this._rect;
+	        },
+
+	        /**
+	         * @param {number} x
+	         * @param {number} y
+	         * @param {number} width
+	         * @param {number} height
+	         */
+	        setViewRect: function (x, y, width, height) {
+	            width = width;
+	            height = height;
+	            this.transformTo(x, y, width, height);
+	            this._viewRect = new BoundingRect(x, y, width, height);
+	        },
+
+	        /**
+	         * Transformed to particular position and size
+	         * @param {number} x
+	         * @param {number} y
+	         * @param {number} width
+	         * @param {number} height
+	         */
+	        transformTo: function (x, y, width, height) {
+	            var rect = this.getBoundingRect();
+	            var viewTransform = this._viewTransform;
+
+	            viewTransform.transform = rect.calculateTransform(
+	                new BoundingRect(x, y, width, height)
+	            );
+
+	            viewTransform.decomposeTransform();
+
+	            this._updateTransform();
+	        },
+
+	        /**
+	         * Set center of view
+	         * @param {Array.<number>} [centerCoord]
+	         */
+	        setCenter: function (centerCoord) {
+	            if (!centerCoord) {
+	                return;
+	            }
+	            this._center = centerCoord;
+
+	            this._updateCenterAndZoom();
+	        },
+
+	        /**
+	         * @param {number} zoom
+	         */
+	        setZoom: function (zoom) {
+	            zoom = zoom || 1;
+
+	            var zoomLimit = this.zoomLimit;
+	            if (zoomLimit) {
+	                if (zoomLimit.max != null) {
+	                    zoom = Math.min(zoomLimit.max, zoom);
+	                }
+	                if (zoomLimit.min != null) {
+	                    zoom = Math.max(zoomLimit.min, zoom);
+	                }
+	            }
+	            this._zoom = zoom;
+
+	            this._updateCenterAndZoom();
+	        },
+
+	        /**
+	         * Get default center without roam
+	         */
+	        getDefaultCenter: function () {
+	            // Rect before any transform
+	            var rawRect = this.getBoundingRect();
+	            var cx = rawRect.x + rawRect.width / 2;
+	            var cy = rawRect.y + rawRect.height / 2;
+
+	            return [cx, cy];
+	        },
+
+	        getCenter: function () {
+	            return this._center || this.getDefaultCenter();
+	        },
+
+	        getZoom: function () {
+	            return this._zoom || 1;
+	        },
+
+	        /**
+	         * @return {Array.<number}
+	         */
+	        getRoamTransform: function () {
+	            return this._roamTransform;
+	        },
+
+	        _updateCenterAndZoom: function () {
+	            // Must update after view transform updated
+	            var viewTransformMatrix = this._viewTransform.getLocalTransform();
+	            var roamTransform = this._roamTransform;
+	            var defaultCenter = this.getDefaultCenter();
+	            var center = this.getCenter();
+	            var zoom = this.getZoom();
+
+	            center = vector.applyTransform([], center, viewTransformMatrix);
+	            defaultCenter = vector.applyTransform([], defaultCenter, viewTransformMatrix);
+
+	            roamTransform.origin = center;
+	            roamTransform.position = [
+	                defaultCenter[0] - center[0],
+	                defaultCenter[1] - center[1]
+	            ];
+	            roamTransform.scale = [zoom, zoom];
+
+	            this._updateTransform();
+	        },
+
+	        /**
+	         * Update transform from roam and mapLocation
+	         * @private
+	         */
+	        _updateTransform: function () {
+	            var roamTransform = this._roamTransform;
+	            var viewTransform = this._viewTransform;
+
+	            viewTransform.parent = roamTransform;
+	            roamTransform.updateTransform();
+	            viewTransform.updateTransform();
+
+	            viewTransform.transform
+	                && matrix.copy(this.transform || (this.transform = []), viewTransform.transform);
+
+	            if (this.transform) {
+	                this.invTransform = this.invTransform || [];
+	                matrix.invert(this.invTransform, this.transform);
+	            }
+	            else {
+	                this.invTransform = null;
+	            }
+	            this.decomposeTransform();
+	        },
+
+	        /**
+	         * @return {module:zrender/core/BoundingRect}
+	         */
+	        getViewRect: function () {
+	            return this._viewRect;
+	        },
+
+	        /**
+	         * Get view rect after roam transform
+	         * @return {module:zrender/core/BoundingRect}
+	         */
+	        getViewRectAfterRoam: function () {
+	            var rect = this.getBoundingRect().clone();
+	            rect.applyTransform(this.transform);
+	            return rect;
+	        },
+
+	        /**
+	         * Convert a single (lon, lat) data item to (x, y) point.
+	         * @param {Array.<number>} data
+	         * @return {Array.<number>}
+	         */
+	        dataToPoint: function (data) {
+	            var transform = this.transform;
+	            return transform
+	                ? v2ApplyTransform([], data, transform)
+	                : [data[0], data[1]];
+	        },
+
+	        /**
+	         * Convert a (x, y) point to (lon, lat) data
+	         * @param {Array.<number>} point
+	         * @return {Array.<number>}
+	         */
+	        pointToData: function (point) {
+	            var invTransform = this.invTransform;
+	            return invTransform
+	                ? v2ApplyTransform([], point, invTransform)
+	                : [point[0], point[1]];
+	        }
+
+	        /**
+	         * @return {number}
+	         */
+	        // getScalarScale: function () {
+	        //     // Use determinant square root of transform to mutiply scalar
+	        //     var m = this.transform;
+	        //     var det = Math.sqrt(Math.abs(m[0] * m[3] - m[2] * m[1]));
+	        //     return det;
+	        // }
+	    };
+
+	    zrUtil.mixin(View, Transformable);
+
+	    module.exports = View;
+
+
+/***/ },
+/* 169 */
+/***/ function(module, exports, __webpack_require__) {
+
+	// Fix for 南海诸岛
+
+
+	    var Region = __webpack_require__(166);
+
+	    var geoCoord = [126, 25];
+
+	    var points = [
+	        [[0,3.5],[7,11.2],[15,11.9],[30,7],[42,0.7],[52,0.7],
+	         [56,7.7],[59,0.7],[64,0.7],[64,0],[5,0],[0,3.5]],
+	        [[13,16.1],[19,14.7],[16,21.7],[11,23.1],[13,16.1]],
+	        [[12,32.2],[14,38.5],[15,38.5],[13,32.2],[12,32.2]],
+	        [[16,47.6],[12,53.2],[13,53.2],[18,47.6],[16,47.6]],
+	        [[6,64.4],[8,70],[9,70],[8,64.4],[6,64.4]],
+	        [[23,82.6],[29,79.8],[30,79.8],[25,82.6],[23,82.6]],
+	        [[37,70.7],[43,62.3],[44,62.3],[39,70.7],[37,70.7]],
+	        [[48,51.1],[51,45.5],[53,45.5],[50,51.1],[48,51.1]],
+	        [[51,35],[51,28.7],[53,28.7],[53,35],[51,35]],
+	        [[52,22.4],[55,17.5],[56,17.5],[53,22.4],[52,22.4]],
+	        [[58,12.6],[62,7],[63,7],[60,12.6],[58,12.6]],
+	        [[0,3.5],[0,93.1],[64,93.1],[64,0],[63,0],[63,92.4],
+	         [1,92.4],[1,3.5],[0,3.5]]
+	    ];
+	    for (var i = 0; i < points.length; i++) {
+	        for (var k = 0; k < points[i].length; k++) {
+	            points[i][k][0] /= 10.5;
+	            points[i][k][1] /= -10.5 / 0.75;
+
+	            points[i][k][0] += geoCoord[0];
+	            points[i][k][1] += geoCoord[1];
+	        }
+	    }
+	    module.exports = function (geo) {
+	        if (geo.map === 'china') {
+	            geo.regions.push(new Region(
+	                '南海诸岛', points, geoCoord
+	            ));
+	        }
+	    };
+
+
+/***/ },
+/* 170 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+
+	    var coordsOffsetMap = {
+	        '南海诸岛' : [32, 80],
+	        // 全国
+	        '广东': [0, -10],
+	        '香港': [10, 5],
+	        '澳门': [-10, 10],
+	        //'北京': [-10, 0],
+	        '天津': [5, 5]
+	    };
+
+	    module.exports = function (geo) {
+	        zrUtil.each(geo.regions, function (region) {
+	            var coordFix = coordsOffsetMap[region.name];
+	            if (coordFix) {
+	                var cp = region.center;
+	                cp[0] += coordFix[0] / 10.5;
+	                cp[1] += -coordFix[1] / (10.5 / 0.75);
+	            }
+	        });
+	    };
+
+
+/***/ },
+/* 171 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+
+	    var geoCoordMap = {
+	        'Russia': [100, 60],
+	        'United States of America': [-99, 38]
+	    };
+
+	    module.exports = function (geo) {
+	        zrUtil.each(geo.regions, function (region) {
+	            var geoCoord = geoCoordMap[region.name];
+	            if (geoCoord) {
+	                var cp = region.center;
+	                cp[0] = geoCoord[0];
+	                cp[1] = geoCoord[1];
+	            }
+	        });
+	    };
+
+
+/***/ },
+/* 172 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    // var zrUtil = require('zrender/lib/core/util');
+	    var graphic = __webpack_require__(43);
+
+	    var MapDraw = __webpack_require__(173);
+
+	    __webpack_require__(1).extendChartView({
+
+	        type: 'map',
+
+	        render: function (mapModel, ecModel, api, payload) {
+	            // Not render if it is an toggleSelect action from self
+	            if (payload && payload.type === 'mapToggleSelect'
+	                && payload.from === this.uid
+	            ) {
+	                return;
+	            }
+
+	            var group = this.group;
+	            group.removeAll();
+	            // Not update map if it is an roam action from self
+	            if (!(payload && payload.type === 'geoRoam'
+	                && payload.component === 'series'
+	                && payload.name === mapModel.name)) {
+
+	                if (mapModel.needsDrawMap) {
+	                    var mapDraw = this._mapDraw || new MapDraw(api, true);
+	                    group.add(mapDraw.group);
+
+	                    mapDraw.draw(mapModel, ecModel, api, this, payload);
+
+	                    this._mapDraw = mapDraw;
+	                }
+	                else {
+	                    // Remove drawed map
+	                    this._mapDraw && this._mapDraw.remove();
+	                    this._mapDraw = null;
+	                }
+	            }
+	            else {
+	                var mapDraw = this._mapDraw;
+	                mapDraw && group.add(mapDraw.group);
+	            }
+
+	            mapModel.get('showLegendSymbol') && ecModel.getComponent('legend')
+	                && this._renderSymbols(mapModel, ecModel, api);
+	        },
+
+	        remove: function () {
+	            this._mapDraw && this._mapDraw.remove();
+	            this._mapDraw = null;
+	            this.group.removeAll();
+	        },
+
+	        _renderSymbols: function (mapModel, ecModel, api) {
+	            var originalData = mapModel.originalData;
+	            var group = this.group;
+
+	            originalData.each('value', function (value, idx) {
+	                if (isNaN(value)) {
+	                    return;
+	                }
+
+	                var layout = originalData.getItemLayout(idx);
+
+	                if (!layout || !layout.point) {
+	                    // Not exists in map
+	                    return;
+	                }
+
+	                var point = layout.point;
+	                var offset = layout.offset;
+
+	                var circle = new graphic.Circle({
+	                    style: {
+	                        // Because the special of map draw.
+	                        // Which needs statistic of multiple series and draw on one map.
+	                        // And each series also need a symbol with legend color
+	                        //
+	                        // Layout and visual are put one the different data
+	                        fill: mapModel.getData().getVisual('color')
+	                    },
+	                    shape: {
+	                        cx: point[0] + offset * 9,
+	                        cy: point[1],
+	                        r: 3
+	                    },
+	                    silent: true,
+	                    z2: 10
+	                });
+
+	                // First data on the same region
+	                if (!offset) {
+	                    var fullData = mapModel.mainSeries.getData();
+	                    var name = originalData.getName(idx);
+	                    var labelText = name;
+	                    var fullIndex = fullData.indexOfName(name);
+
+	                    var itemModel = originalData.getItemModel(idx);
+	                    var labelModel = itemModel.getModel('label.normal');
+	                    var hoverLabelModel = itemModel.getModel('label.emphasis');
+
+	                    var textStyleModel = labelModel.getModel('textStyle');
+	                    var hoverTextStyleModel = hoverLabelModel.getModel('textStyle');
+
+	                    var polygonGroups = fullData.getItemGraphicEl(fullIndex);
+	                    circle.setStyle({
+	                        textPosition: 'bottom'
+	                    });
+
+	                    var onEmphasis = function () {
+	                        circle.setStyle({
+	                            text: hoverLabelModel.get('show') ? labelText : '',
+	                            textFill: hoverTextStyleModel.getTextColor(),
+	                            textFont: hoverTextStyleModel.getFont()
+	                        });
+	                    };
+
+	                    var onNormal = function () {
+	                        circle.setStyle({
+	                            text: labelModel.get('show') ? labelText : '',
+	                            textFill: textStyleModel.getTextColor(),
+	                            textFont: textStyleModel.getFont()
+	                        });
+	                    };
+
+	                    polygonGroups.on('mouseover', onEmphasis)
+	                        .on('mouseout', onNormal)
+	                        .on('emphasis', onEmphasis)
+	                        .on('normal', onNormal);
+
+	                    onNormal();
+	                }
+
+	                group.add(circle);
+	            });
+	        }
+	    });
+
+
+/***/ },
+/* 173 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @module echarts/component/helper/MapDraw
+	 */
+
+
+	    var RoamController = __webpack_require__(174);
+	    var graphic = __webpack_require__(43);
+	    var zrUtil = __webpack_require__(4);
+
+	    function getFixedItemStyle(model, scale) {
+	        var itemStyle = model.getItemStyle();
+	        var areaColor = model.get('areaColor');
+	        if (areaColor) {
+	            itemStyle.fill = areaColor;
+	        }
+
+	        return itemStyle;
+	    }
+
+	    function updateMapSelectHandler(mapOrGeoModel, group, api, fromView) {
+	        group.off('click');
+	        mapOrGeoModel.get('selectedMode')
+	            && group.on('click', function (e) {
+	                var el = e.target;
+	                while (!el.__region) {
+	                    el = el.parent;
+	                }
+	                if (!el) {
+	                    return;
+	                }
+
+	                var region = el.__region;
+	                var action = {
+	                    type: (mapOrGeoModel.mainType === 'geo' ? 'geo' : 'map') + 'ToggleSelect',
+	                    name: region.name,
+	                    from: fromView.uid
+	                };
+	                action[mapOrGeoModel.mainType + 'Id'] = mapOrGeoModel.id;
+
+	                api.dispatchAction(action);
+
+	                updateMapSelected(mapOrGeoModel, group);
+	            });
+	    }
+
+	    function updateMapSelected(mapOrGeoModel, group) {
+	        // FIXME
+	        group.eachChild(function (otherRegionEl) {
+	            if (otherRegionEl.__region) {
+	                otherRegionEl.trigger(mapOrGeoModel.isSelected(otherRegionEl.__region.name) ? 'emphasis' : 'normal');
+	            }
+	        });
+	    }
+
+	    /**
+	     * @alias module:echarts/component/helper/MapDraw
+	     * @param {module:echarts/ExtensionAPI} api
+	     * @param {boolean} updateGroup
+	     */
+	    function MapDraw(api, updateGroup) {
+
+	        var group = new graphic.Group();
+
+	        /**
+	         * @type {module:echarts/component/helper/RoamController}
+	         * @private
+	         */
+	        this._controller = new RoamController(
+	            api.getZr(), updateGroup ? group : null, null
+	        );
+
+	        /**
+	         * @type {module:zrender/container/Group}
+	         * @readOnly
+	         */
+	        this.group = group;
+
+	        /**
+	         * @type {boolean}
+	         * @private
+	         */
+	        this._updateGroup = updateGroup;
+	    }
+
+	    MapDraw.prototype = {
+
+	        constructor: MapDraw,
+
+	        draw: function (mapOrGeoModel, ecModel, api, fromView, payload) {
+
+	            // geoModel has no data
+	            var data = mapOrGeoModel.getData && mapOrGeoModel.getData();
+
+	            var geo = mapOrGeoModel.coordinateSystem;
+
+	            var group = this.group;
+
+	            var scale = geo.scale;
+	            var groupNewProp = {
+	                position: geo.position,
+	                scale: scale
+	            };
+
+	            // No animation when first draw or in action
+	            if (!group.childAt(0) || payload) {
+	                group.attr(groupNewProp);
+	            }
+	            else {
+	                graphic.updateProps(group, groupNewProp, mapOrGeoModel);
+	            }
+
+	            group.removeAll();
+
+	            var itemStyleAccessPath = ['itemStyle', 'normal'];
+	            var hoverItemStyleAccessPath = ['itemStyle', 'emphasis'];
+	            var labelAccessPath = ['label', 'normal'];
+	            var hoverLabelAccessPath = ['label', 'emphasis'];
+
+	            zrUtil.each(geo.regions, function (region) {
+
+	                var regionGroup = new graphic.Group();
+	                var compoundPath = new graphic.CompoundPath({
+	                    shape: {
+	                        paths: []
+	                    }
+	                });
+	                regionGroup.add(compoundPath);
+
+	                var regionModel = mapOrGeoModel.getRegionModel(region.name) || mapOrGeoModel;
+
+	                var itemStyleModel = regionModel.getModel(itemStyleAccessPath);
+	                var hoverItemStyleModel = regionModel.getModel(hoverItemStyleAccessPath);
+	                var itemStyle = getFixedItemStyle(itemStyleModel, scale);
+	                var hoverItemStyle = getFixedItemStyle(hoverItemStyleModel, scale);
+
+	                var labelModel = regionModel.getModel(labelAccessPath);
+	                var hoverLabelModel = regionModel.getModel(hoverLabelAccessPath);
+
+	                var dataIdx;
+	                // Use the itemStyle in data if has data
+	                if (data) {
+	                    dataIdx = data.indexOfName(region.name);
+	                    // Only visual color of each item will be used. It can be encoded by dataRange
+	                    // But visual color of series is used in symbol drawing
+	                    //
+	                    // Visual color for each series is for the symbol draw
+	                    var visualColor = data.getItemVisual(dataIdx, 'color', true);
+	                    if (visualColor) {
+	                        itemStyle.fill = visualColor;
+	                    }
+	                }
+
+	                var textStyleModel = labelModel.getModel('textStyle');
+	                var hoverTextStyleModel = hoverLabelModel.getModel('textStyle');
+
+	                zrUtil.each(region.contours, function (contour) {
+
+	                    var polygon = new graphic.Polygon({
+	                        shape: {
+	                            points: contour
+	                        }
+	                    });
+
+	                    compoundPath.shape.paths.push(polygon);
+	                });
+
+	                compoundPath.setStyle(itemStyle);
+	                compoundPath.style.strokeNoScale = true;
+	                compoundPath.culling = true;
+	                // Label
+	                var showLabel = labelModel.get('show');
+	                var hoverShowLabel = hoverLabelModel.get('show');
+
+	                var isDataNaN = data && isNaN(data.get('value', dataIdx));
+	                var itemLayout = data && data.getItemLayout(dataIdx);
+	                // In the following cases label will be drawn
+	                // 1. In map series and data value is NaN
+	                // 2. In geo component
+	                // 4. Region has no series legendSymbol, which will be add a showLabel flag in mapSymbolLayout
+	                if (
+	                    (!data || isDataNaN && (showLabel || hoverShowLabel))
+	                 || (itemLayout && itemLayout.showLabel)
+	                 ) {
+	                    var query = data ? dataIdx : region.name;
+	                    var formattedStr = mapOrGeoModel.getFormattedLabel(query, 'normal');
+	                    var hoverFormattedStr = mapOrGeoModel.getFormattedLabel(query, 'emphasis');
+	                    var text = new graphic.Text({
+	                        style: {
+	                            text: showLabel ? (formattedStr || region.name) : '',
+	                            fill: textStyleModel.getTextColor(),
+	                            textFont: textStyleModel.getFont(),
+	                            textAlign: 'center',
+	                            textVerticalAlign: 'middle'
+	                        },
+	                        hoverStyle: {
+	                            text: hoverShowLabel ? (hoverFormattedStr || region.name) : '',
+	                            fill: hoverTextStyleModel.getTextColor(),
+	                            textFont: hoverTextStyleModel.getFont()
+	                        },
+	                        position: region.center.slice(),
+	                        scale: [1 / scale[0], 1 / scale[1]],
+	                        z2: 10,
+	                        silent: true
+	                    });
+
+	                    regionGroup.add(text);
+	                }
+
+	                // setItemGraphicEl, setHoverStyle after all polygons and labels
+	                // are added to the rigionGroup
+	                if (data) {
+	                    data.setItemGraphicEl(dataIdx, regionGroup);
+	                }
+	                else {
+	                    var regionModel = mapOrGeoModel.getRegionModel(region.name);
+	                    // Package custom mouse event for geo component
+	                    compoundPath.eventData = {
+	                        componentType: 'geo',
+	                        geoIndex: mapOrGeoModel.componentIndex,
+	                        name: region.name,
+	                        region: (regionModel && regionModel.option) || {}
+	                    };
+	                }
+
+	                regionGroup.__region = region;
+
+	                graphic.setHoverStyle(regionGroup, hoverItemStyle);
+
+	                group.add(regionGroup);
+	            });
+
+	            this._updateController(mapOrGeoModel, ecModel, api);
+
+	            updateMapSelectHandler(mapOrGeoModel, group, api, fromView);
+
+	            updateMapSelected(mapOrGeoModel, group);
+	        },
+
+	        remove: function () {
+	            this.group.removeAll();
+	            this._controller.dispose();
+	        },
+
+	        _updateController: function (mapOrGeoModel, ecModel, api) {
+	            var geo = mapOrGeoModel.coordinateSystem;
+	            var controller = this._controller;
+	            controller.zoomLimit = mapOrGeoModel.get('scaleLimit');
+	            // Update zoom from model
+	            controller.zoom = geo.getZoom();
+	            // roamType is will be set default true if it is null
+	            controller.enable(mapOrGeoModel.get('roam') || false);
+	            var mainType = mapOrGeoModel.mainType;
+
+	            function makeActionBase() {
+	                var action = {
+	                    type: 'geoRoam',
+	                    componentType: mainType
+	                };
+	                action[mainType + 'Id'] = mapOrGeoModel.id;
+	                return action;
+	            }
+	            controller.off('pan')
+	                .on('pan', function (dx, dy) {
+	                    api.dispatchAction(zrUtil.extend(makeActionBase(), {
+	                        dx: dx,
+	                        dy: dy
+	                    }));
+	                });
+	            controller.off('zoom')
+	                .on('zoom', function (zoom, mouseX, mouseY) {
+	                    api.dispatchAction(zrUtil.extend(makeActionBase(), {
+	                        zoom: zoom,
+	                        originX: mouseX,
+	                        originY: mouseY
+	                    }));
+
+	                    if (this._updateGroup) {
+	                        var group = this.group;
+	                        var scale = group.scale;
+	                        group.traverse(function (el) {
+	                            if (el.type === 'text') {
+	                                el.attr('scale', [1 / scale[0], 1 / scale[1]]);
+	                            }
+	                        });
+	                    }
+	                }, this);
+
+	            controller.rectProvider = function () {
+	                return geo.getViewRectAfterRoam();
+	            };
+	        }
+	    };
+
+	    module.exports = MapDraw;
+
+
+/***/ },
+/* 174 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @module echarts/component/helper/RoamController
+	 */
+
+
+
+	    var Eventful = __webpack_require__(33);
+	    var zrUtil = __webpack_require__(4);
+	    var eventTool = __webpack_require__(87);
+	    var interactionMutex = __webpack_require__(175);
+
+	    function mousedown(e) {
+	        if (e.target && e.target.draggable) {
+	            return;
+	        }
+
+	        var x = e.offsetX;
+	        var y = e.offsetY;
+	        var rect = this.rectProvider && this.rectProvider();
+	        if (rect && rect.contain(x, y)) {
+	            this._x = x;
+	            this._y = y;
+	            this._dragging = true;
+	        }
+	    }
+
+	    function mousemove(e) {
+	        if (!this._dragging) {
+	            return;
+	        }
+
+	        eventTool.stop(e.event);
+
+	        if (e.gestureEvent !== 'pinch') {
+
+	            if (interactionMutex.isTaken(this._zr, 'globalPan')) {
+	                return;
+	            }
+
+	            var x = e.offsetX;
+	            var y = e.offsetY;
+
+	            var dx = x - this._x;
+	            var dy = y - this._y;
+
+	            this._x = x;
+	            this._y = y;
+
+	            var target = this.target;
+
+	            if (target) {
+	                var pos = target.position;
+	                pos[0] += dx;
+	                pos[1] += dy;
+	                target.dirty();
+	            }
+
+	            eventTool.stop(e.event);
+	            this.trigger('pan', dx, dy);
+	        }
+	    }
+
+	    function mouseup(e) {
+	        this._dragging = false;
+	    }
+
+	    function mousewheel(e) {
+	        // Convenience:
+	        // Mac and VM Windows on Mac: scroll up: zoom out.
+	        // Windows: scroll up: zoom in.
+	        var zoomDelta = e.wheelDelta > 0 ? 1.1 : 1 / 1.1;
+	        zoom.call(this, e, zoomDelta, e.offsetX, e.offsetY);
+	    }
+
+	    function pinch(e) {
+	        if (interactionMutex.isTaken(this._zr, 'globalPan')) {
+	            return;
+	        }
+	        var zoomDelta = e.pinchScale > 1 ? 1.1 : 1 / 1.1;
+	        zoom.call(this, e, zoomDelta, e.pinchX, e.pinchY);
+	    }
+
+	    function zoom(e, zoomDelta, zoomX, zoomY) {
+	        var rect = this.rectProvider && this.rectProvider();
+
+	        if (rect && rect.contain(zoomX, zoomY)) {
+	            // When mouse is out of roamController rect,
+	            // default befavoius should be be disabled, otherwise
+	            // page sliding is disabled, contrary to expectation.
+	            eventTool.stop(e.event);
+
+	            var target = this.target;
+	            var zoomLimit = this.zoomLimit;
+
+	            if (target) {
+	                var pos = target.position;
+	                var scale = target.scale;
+
+	                var newZoom = this.zoom = this.zoom || 1;
+	                newZoom *= zoomDelta;
+	                if (zoomLimit) {
+	                    var zoomMin = zoomLimit.min || 0;
+	                    var zoomMax = zoomLimit.max || Infinity;
+	                    newZoom = Math.max(
+	                        Math.min(zoomMax, newZoom),
+	                        zoomMin
+	                    );
+	                }
+	                var zoomScale = newZoom / this.zoom;
+	                this.zoom = newZoom;
+	                // Keep the mouse center when scaling
+	                pos[0] -= (zoomX - pos[0]) * (zoomScale - 1);
+	                pos[1] -= (zoomY - pos[1]) * (zoomScale - 1);
+	                scale[0] *= zoomScale;
+	                scale[1] *= zoomScale;
+
+	                target.dirty();
+	            }
+
+	            this.trigger('zoom', zoomDelta, zoomX, zoomY);
+	        }
+	    }
+
+	    /**
+	     * @alias module:echarts/component/helper/RoamController
+	     * @constructor
+	     * @mixin {module:zrender/mixin/Eventful}
+	     *
+	     * @param {module:zrender/zrender~ZRender} zr
+	     * @param {module:zrender/Element} target
+	     * @param {Function} [rectProvider]
+	     */
+	    function RoamController(zr, target, rectProvider) {
+
+	        /**
+	         * @type {module:zrender/Element}
+	         */
+	        this.target = target;
+
+	        /**
+	         * @type {Function}
+	         */
+	        this.rectProvider = rectProvider;
+
+	        /**
+	         * { min: 1, max: 2 }
+	         * @type {Object}
+	         */
+	        this.zoomLimit;
+
+	        /**
+	         * @type {number}
+	         */
+	        this.zoom;
+	        /**
+	         * @type {module:zrender}
+	         */
+	        this._zr = zr;
+
+	        // Avoid two roamController bind the same handler
+	        var bind = zrUtil.bind;
+	        var mousedownHandler = bind(mousedown, this);
+	        var mousemoveHandler = bind(mousemove, this);
+	        var mouseupHandler = bind(mouseup, this);
+	        var mousewheelHandler = bind(mousewheel, this);
+	        var pinchHandler = bind(pinch, this);
+
+	        Eventful.call(this);
+
+	        /**
+	         * Notice: only enable needed types. For example, if 'zoom'
+	         * is not needed, 'zoom' should not be enabled, otherwise
+	         * default mousewheel behaviour (scroll page) will be disabled.
+	         *
+	         * @param  {boolean|string} [controlType=true] Specify the control type,
+	         *                          which can be null/undefined or true/false
+	         *                          or 'pan/move' or 'zoom'/'scale'
+	         */
+	        this.enable = function (controlType) {
+	            // Disable previous first
+	            this.disable();
+
+	            if (controlType == null) {
+	                controlType = true;
+	            }
+
+	            if (controlType === true || (controlType === 'move' || controlType === 'pan')) {
+	                zr.on('mousedown', mousedownHandler);
+	                zr.on('mousemove', mousemoveHandler);
+	                zr.on('mouseup', mouseupHandler);
+	            }
+	            if (controlType === true || (controlType === 'scale' || controlType === 'zoom')) {
+	                zr.on('mousewheel', mousewheelHandler);
+	                zr.on('pinch', pinchHandler);
+	            }
+	        };
+
+	        this.disable = function () {
+	            zr.off('mousedown', mousedownHandler);
+	            zr.off('mousemove', mousemoveHandler);
+	            zr.off('mouseup', mouseupHandler);
+	            zr.off('mousewheel', mousewheelHandler);
+	            zr.off('pinch', pinchHandler);
+	        };
+
+	        this.dispose = this.disable;
+
+	        this.isDragging = function () {
+	            return this._dragging;
+	        };
+
+	        this.isPinching = function () {
+	            return this._pinching;
+	        };
+	    }
+
+	    zrUtil.mixin(RoamController, Eventful);
+
+	    module.exports = RoamController;
+
+
+/***/ },
+/* 175 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var ATTR = '\0_ec_interaction_mutex';
+
+	    var interactionMutex = {
+
+	        take: function (zr, resourceKey, userKey) {
+	            var store = getStore(zr);
+	            store[resourceKey] = userKey;
+	        },
+
+	        release: function (zr, resourceKey, userKey) {
+	            var store = getStore(zr);
+	            var uKey = store[resourceKey];
+
+	            if (uKey === userKey) {
+	                store[resourceKey] = null;
+	            }
+	        },
+
+	        isTaken: function (zr, resourceKey) {
+	            return !!getStore(zr)[resourceKey];
+	        }
+	    };
+
+	    function getStore(zr) {
+	        return zr[ATTR] || (zr[ATTR] = {});
+	    }
+
+	    /**
+	     * payload: {
+	     *     type: 'takeGlobalCursor',
+	     *     key: 'dataZoomSelect', or 'brush', or ...,
+	     *         If no userKey, release global cursor.
+	     * }
+	     */
+	    __webpack_require__(1).registerAction(
+	        {type: 'takeGlobalCursor', event: 'globalCursorTaken', update: 'update'},
+	        function () {}
+	    );
+
+	    module.exports = interactionMutex;
+
+
+/***/ },
+/* 176 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+	    var roamHelper = __webpack_require__(177);
+
+	    var echarts = __webpack_require__(1);
+
+	    /**
+	     * @payload
+	     * @property {string} [componentType=series]
+	     * @property {number} [dx]
+	     * @property {number} [dy]
+	     * @property {number} [zoom]
+	     * @property {number} [originX]
+	     * @property {number} [originY]
+	     */
+	    echarts.registerAction({
+	        type: 'geoRoam',
+	        event: 'geoRoam',
+	        update: 'updateLayout'
+	    }, function (payload, ecModel) {
+	        var componentType = payload.componentType || 'series';
+
+	        ecModel.eachComponent(
+	            { mainType: componentType, query: payload },
+	            function (componentModel) {
+	                var geo = componentModel.coordinateSystem;
+	                if (geo.type !== 'geo') {
+	                    return;
+	                }
+
+	                var res = roamHelper.updateCenterAndZoom(
+	                    geo, payload, componentModel.get('scaleLimit')
+	                );
+
+	                componentModel.setCenter
+	                    && componentModel.setCenter(res.center);
+
+	                componentModel.setZoom
+	                    && componentModel.setZoom(res.zoom);
+
+	                // All map series with same `map` use the same geo coordinate system
+	                // So the center and zoom must be in sync. Include the series not selected by legend
+	                if (componentType === 'series') {
+	                    zrUtil.each(componentModel.seriesGroup, function (seriesModel) {
+	                        seriesModel.setCenter(res.center);
+	                        seriesModel.setZoom(res.zoom);
+	                    });
+	                }
+	            }
+	        );
+	    });
+
+
+/***/ },
+/* 177 */
+/***/ function(module, exports) {
+
+	
+
+	    var roamHelper = {};
+
+	    /**
+	     * @param {module:echarts/coord/View} view
+	     * @param {Object} payload
+	     * @param {Object} [zoomLimit]
+	     */
+	    roamHelper.updateCenterAndZoom = function (
+	        view, payload, zoomLimit
+	    ) {
+	        var previousZoom = view.getZoom();
+	        var center = view.getCenter();
+	        var zoom = payload.zoom;
+
+	        var point = view.dataToPoint(center);
+
+	        if (payload.dx != null && payload.dy != null) {
+	            point[0] -= payload.dx;
+	            point[1] -= payload.dy;
+
+	            var center = view.pointToData(point);
+	            view.setCenter(center);
+	        }
+	        if (zoom != null) {
+	            if (zoomLimit) {
+	                var zoomMin = zoomLimit.min || 0;
+	                var zoomMax = zoomLimit.max || Infinity;
+	                zoom = Math.max(
+	                    Math.min(previousZoom * zoom, zoomMax),
+	                    zoomMin
+	                ) / previousZoom;
+	            }
+
+	            // Zoom on given point(originX, originY)
+	            view.scale[0] *= zoom;
+	            view.scale[1] *= zoom;
+	            var position = view.position;
+	            var fixX = (payload.originX - position[0]) * (zoom - 1);
+	            var fixY = (payload.originY - position[1]) * (zoom - 1);
+
+	            position[0] -= fixX;
+	            position[1] -= fixY;
+
+	            view.updateTransform();
+	            // Get the new center
+	            var center = view.pointToData(point);
+	            view.setCenter(center);
+	            view.setZoom(zoom * previousZoom);
+	        }
+
+	        return {
+	            center: view.getCenter(),
+	            zoom: view.getZoom()
+	        };
+	    };
+
+	    module.exports = roamHelper;
+
+
+/***/ },
+/* 178 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+
+	    module.exports = function (ecModel) {
+
+	        var processedMapType = {};
+
+	        ecModel.eachSeriesByType('map', function (mapSeries) {
+	            var mapType = mapSeries.get('map');
+	            if (processedMapType[mapType]) {
+	                return;
+	            }
+
+	            var mapSymbolOffsets = {};
+
+	            zrUtil.each(mapSeries.seriesGroup, function (subMapSeries) {
+	                var geo = subMapSeries.coordinateSystem;
+	                var data = subMapSeries.originalData;
+	                if (subMapSeries.get('showLegendSymbol') && ecModel.getComponent('legend')) {
+	                    data.each('value', function (value, idx) {
+	                        var name = data.getName(idx);
+	                        var region = geo.getRegion(name);
+
+	                        // No region or no value
+	                        // In MapSeries data regions will be filled with NaN
+	                        // If they are not in the series.data array.
+	                        // So here must validate if value is NaN
+	                        if (!region || isNaN(value)) {
+	                            return;
+	                        }
+
+	                        var offset = mapSymbolOffsets[name] || 0;
+
+	                        var point = geo.dataToPoint(region.center);
+
+	                        mapSymbolOffsets[name] = offset + 1;
+
+	                        data.setItemLayout(idx, {
+	                            point: point,
+	                            offset: offset
+	                        });
+	                    });
+	                }
+	            });
+
+	            // Show label of those region not has legendSymbol(which is offset 0)
+	            var data = mapSeries.getData();
+	            data.each(function (idx) {
+	                var name = data.getName(idx);
+	                var layout = data.getItemLayout(idx) || {};
+	                layout.showLabel = !mapSymbolOffsets[name];
+	                data.setItemLayout(idx, layout);
+	            });
+
+	            processedMapType[mapType] = true;
+	        });
+	    };
+
+
+/***/ },
+/* 179 */
+/***/ function(module, exports) {
+
+	
+	    module.exports = function (ecModel) {
+	        ecModel.eachSeriesByType('map', function (seriesModel) {
+	            var colorList = seriesModel.get('color');
+	            var itemStyleModel = seriesModel.getModel('itemStyle.normal');
+
+	            var areaColor = itemStyleModel.get('areaColor');
+	            var color = itemStyleModel.get('color')
+	                || colorList[seriesModel.seriesIndex % colorList.length];
+
+	            seriesModel.getData().setVisual({
+	                'areaColor': areaColor,
+	                'color': color
+	            });
+	        });
+	    };
+
+
+/***/ },
+/* 180 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+
+	    // FIXME 公用？
+	    /**
+	     * @param {Array.<module:echarts/data/List>} datas
+	     * @param {string} statisticType 'average' 'sum'
+	     * @inner
+	     */
+	    function dataStatistics(datas, statisticType) {
+	        var dataNameMap = {};
+	        var dims = ['value'];
+
+	        for (var i = 0; i < datas.length; i++) {
+	            datas[i].each(dims, function (value, idx) {
+	                var name = datas[i].getName(idx);
+	                dataNameMap[name] = dataNameMap[name] || [];
+	                if (!isNaN(value)) {
+	                    dataNameMap[name].push(value);
+	                }
+	            });
+	        }
+
+	        return datas[0].map(dims, function (value, idx) {
+	            var name = datas[0].getName(idx);
+	            var sum = 0;
+	            var min = Infinity;
+	            var max = -Infinity;
+	            var len = dataNameMap[name].length;
+	            for (var i = 0; i < len; i++) {
+	                min = Math.min(min, dataNameMap[name][i]);
+	                max = Math.max(max, dataNameMap[name][i]);
+	                sum += dataNameMap[name][i];
+	            }
+	            var result;
+	            if (statisticType === 'min') {
+	                result = min;
+	            }
+	            else if (statisticType === 'max') {
+	                result = max;
+	            }
+	            else if (statisticType === 'average') {
+	                result = sum / len;
+	            }
+	            else {
+	                result = sum;
+	            }
+	            return len === 0 ? NaN : result;
+	        });
+	    }
+
+	    module.exports = function (ecModel) {
+	        var seriesGroupByMapType = {};
+	        ecModel.eachSeriesByType('map', function (seriesModel) {
+	            var mapType = seriesModel.get('map');
+	            seriesGroupByMapType[mapType] = seriesGroupByMapType[mapType] || [];
+	            seriesGroupByMapType[mapType].push(seriesModel);
+	        });
+
+	        zrUtil.each(seriesGroupByMapType, function (seriesList, mapType) {
+	            var data = dataStatistics(
+	                zrUtil.map(seriesList, function (seriesModel) {
+	                    return seriesModel.getData();
+	                }),
+	                seriesList[0].get('mapValueCalculation')
+	            );
+
+	            for (var i = 0; i < seriesList.length; i++) {
+	                seriesList[i].originalData = seriesList[i].getData();
+	            }
+
+	            // FIXME Put where?
+	            for (var i = 0; i < seriesList.length; i++) {
+	                seriesList[i].seriesGroup = seriesList;
+	                seriesList[i].needsDrawMap = i === 0;
+
+	                seriesList[i].setData(data.cloneShallow());
+	                seriesList[i].mainSeries = seriesList[0];
+	            }
+	        });
+	    };
+
+
+/***/ },
+/* 181 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+
+	    module.exports = function (option) {
+	        // Save geoCoord
+	        var mapSeries = [];
+	        zrUtil.each(option.series, function (seriesOpt) {
+	            if (seriesOpt.type === 'map') {
+	                mapSeries.push(seriesOpt);
+	            }
+	        });
+
+	        zrUtil.each(mapSeries, function (seriesOpt) {
+	            seriesOpt.map = seriesOpt.map || seriesOpt.mapType;
+	            // Put x, y, width, height, x2, y2 in the top level
+	            zrUtil.defaults(seriesOpt, seriesOpt.mapLocation);
+	        });
+	    };
+
+
+/***/ },
+/* 182 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var echarts = __webpack_require__(1);
+
+	    __webpack_require__(183);
+	    __webpack_require__(186);
+	    __webpack_require__(190);
+
+	    echarts.registerVisual(__webpack_require__(191));
+
+	    echarts.registerLayout(__webpack_require__(193));
+
+
+/***/ },
+/* 183 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var SeriesModel = __webpack_require__(28);
+	    var Tree = __webpack_require__(184);
+	    var zrUtil = __webpack_require__(4);
+	    var Model = __webpack_require__(12);
+	    var formatUtil = __webpack_require__(6);
+	    var encodeHTML = formatUtil.encodeHTML;
+	    var addCommas = formatUtil.addCommas;
+
+
+	    module.exports = SeriesModel.extend({
+
+	        type: 'series.treemap',
+
+	        dependencies: ['grid', 'polar'],
+
+	        /**
+	         * @type {module:echarts/data/Tree~Node}
+	         */
+	        _viewRoot: null,
+
+	        defaultOption: {
+	            // Disable progressive rendering
+	            progressive: 0,
+	            hoverLayerThreshold: Infinity,
+	            // center: ['50%', '50%'],          // not supported in ec3.
+	            // size: ['80%', '80%'],            // deprecated, compatible with ec2.
+	            left: 'center',
+	            top: 'middle',
+	            right: null,
+	            bottom: null,
+	            width: '80%',
+	            height: '80%',
+	            sort: true,                         // Can be null or false or true
+	                                                // (order by desc default, asc not supported yet (strange effect))
+	            clipWindow: 'origin',               // Size of clipped window when zooming. 'origin' or 'fullscreen'
+	            squareRatio: 0.5 * (1 + Math.sqrt(5)), // golden ratio
+	            leafDepth: null,                    // Nodes on depth from root are regarded as leaves.
+	                                                // Count from zero (zero represents only view root).
+	            drillDownIcon: '▶',                 // Use html character temporarily because it is complicated
+	                                                // to align specialized icon. ▷▶❒❐▼✚
+	            visualDimension: 0,                 // Can be 0, 1, 2, 3.
+	            zoomToNodeRatio: 0.32 * 0.32,       // Be effective when using zoomToNode. Specify the proportion of the
+	                                                // target node area in the view area.
+	            roam: true,                         // true, false, 'scale' or 'zoom', 'move'.
+	            nodeClick: 'zoomToNode',            // Leaf node click behaviour: 'zoomToNode', 'link', false.
+	                                                // If leafDepth is set and clicking a node which has children but
+	                                                // be on left depth, the behaviour would be changing root. Otherwise
+	                                                // use behavious defined above.
+	            animation: true,
+	            animationDurationUpdate: 900,
+	            animationEasing: 'quinticInOut',
+	            breadcrumb: {
+	                show: true,
+	                height: 22,
+	                left: 'center',
+	                top: 'bottom',
+	                // right
+	                // bottom
+	                emptyItemWidth: 25,             // Width of empty node.
+	                itemStyle: {
+	                    normal: {
+	                        color: 'rgba(0,0,0,0.7)', //'#5793f3',
+	                        borderColor: 'rgba(255,255,255,0.7)',
+	                        borderWidth: 1,
+	                        shadowColor: 'rgba(150,150,150,1)',
+	                        shadowBlur: 3,
+	                        shadowOffsetX: 0,
+	                        shadowOffsetY: 0,
+	                        textStyle: {
+	                            color: '#fff'
+	                        }
+	                    },
+	                    emphasis: {
+	                        textStyle: {}
+	                    }
+	                }
+	            },
+	            label: {
+	                normal: {
+	                    show: true,
+	                    position: 'inside', // Can be [5, '5%'] or position stirng like 'insideTopLeft', ...
+	                    textStyle: {
+	                        color: '#fff',
+	                        ellipsis: true
+	                    }
+	                }
+	            },
+	            itemStyle: {
+	                normal: {
+	                    color: null,            // Can be 'none' if not necessary.
+	                    colorAlpha: null,       // Can be 'none' if not necessary.
+	                    colorSaturation: null,  // Can be 'none' if not necessary.
+	                    borderWidth: 0,
+	                    gapWidth: 0,
+	                    borderColor: '#fff',
+	                    borderColorSaturation: null // If specified, borderColor will be ineffective, and the
+	                                                // border color is evaluated by color of current node and
+	                                                // borderColorSaturation.
+	                },
+	                emphasis: {
+
+	                }
+	            },
+	            color: [],                  // + treemapSeries.color should not be modified. Please only modified
+	                                        // level[n].color (if necessary).
+	                                        // + Specify color list of each level. level[0].color would be global
+	                                        // color list if not specified. (see method `setDefault`).
+	                                        // + But set as a empty array to forbid fetch color from global palette
+	                                        // when using nodeModel.get('color'), otherwise nodes on deep level
+	                                        // will always has color palette set and are not able to inherit color
+	                                        // from parent node.
+	                                        // + TreemapSeries.color can not be set as 'none', otherwise effect
+	                                        // legend color fetching (see seriesColor.js).
+	            colorAlpha: null,           // Array. Specify color alpha range of each level, like [0.2, 0.8]
+	            colorSaturation: null,      // Array. Specify color saturation of each level, like [0.2, 0.5]
+	            colorMappingBy: 'index',    // 'value' or 'index' or 'id'.
+	            visibleMin: 10,             // If area less than this threshold (unit: pixel^2), node will not
+	                                        // be rendered. Only works when sort is 'asc' or 'desc'.
+	            childrenVisibleMin: null,   // If area of a node less than this threshold (unit: pixel^2),
+	                                        // grandchildren will not show.
+	                                        // Why grandchildren? If not grandchildren but children,
+	                                        // some siblings show children and some not,
+	                                        // the appearance may be mess and not consistent,
+	            levels: []                  // Each item: {
+	                                        //     visibleMin, itemStyle, visualDimension, label
+	                                        // }
+	            // data: {
+	            //      value: [],
+	            //      children: [],
+	            //      link: 'http://xxx.xxx.xxx',
+	            //      target: 'blank' or 'self'
+	            // }
+	        },
+
+	        /**
+	         * @override
+	         */
+	        getInitialData: function (option, ecModel) {
+	            var data = option.data || [];
+	            var rootName = option.name;
+	            rootName == null && (rootName = option.name);
+
+	            // Create a virtual root.
+	            var root = {name: rootName, children: option.data};
+	            var value0 = (data[0] || {}).value;
+
+	            completeTreeValue(root, zrUtil.isArray(value0) ? value0.length : -1);
+
+	            // FIXME
+	            // sereis.mergeOption 的 getInitData是否放在merge后，从而能直接获取merege后的结果而非手动判断。
+	            var levels = option.levels || [];
+
+	            levels = option.levels = setDefault(levels, ecModel);
+
+	            // Make sure always a new tree is created when setOption,
+	            // in TreemapView, we check whether oldTree === newTree
+	            // to choose mappings approach among old shapes and new shapes.
+	            return Tree.createTree(root, this, levels).data;
+	        },
+
+	        optionUpdated: function () {
+	            this.resetViewRoot();
+	        },
+
+	        /**
+	         * @override
+	         * @param {number} dataIndex
+	         * @param {boolean} [mutipleSeries=false]
+	         */
+	        formatTooltip: function (dataIndex) {
+	            var data = this.getData();
+	            var value = this.getRawValue(dataIndex);
+	            var formattedValue = zrUtil.isArray(value)
+	                ? addCommas(value[0]) : addCommas(value);
+	            var name = data.getName(dataIndex);
+
+	            return encodeHTML(name) + ': ' + formattedValue;
+	        },
+
+	        /**
+	         * Add tree path to tooltip param
+	         *
+	         * @override
+	         * @param {number} dataIndex
+	         * @return {Object}
+	         */
+	        getDataParams: function (dataIndex) {
+	            var params = SeriesModel.prototype.getDataParams.apply(this, arguments);
+
+	            var data = this.getData();
+	            var node = data.tree.getNodeByDataIndex(dataIndex);
+	            var treePathInfo = params.treePathInfo = [];
+
+	            while (node) {
+	                var nodeDataIndex = node.dataIndex;
+	                treePathInfo.push({
+	                    name: node.name,
+	                    dataIndex: nodeDataIndex,
+	                    value: this.getRawValue(nodeDataIndex)
+	                });
+	                node = node.parentNode;
+	            }
+
+	            treePathInfo.reverse();
+
+	            return params;
+	        },
+
+	        /**
+	         * @public
+	         * @param {Object} layoutInfo {
+	         *                                x: containerGroup x
+	         *                                y: containerGroup y
+	         *                                width: containerGroup width
+	         *                                height: containerGroup height
+	         *                            }
+	         */
+	        setLayoutInfo: function (layoutInfo) {
+	            /**
+	             * @readOnly
+	             * @type {Object}
+	             */
+	            this.layoutInfo = this.layoutInfo || {};
+	            zrUtil.extend(this.layoutInfo, layoutInfo);
+	        },
+
+	        /**
+	         * @param  {string} id
+	         * @return {number} index
+	         */
+	        mapIdToIndex: function (id) {
+	            // A feature is implemented:
+	            // index is monotone increasing with the sequence of
+	            // input id at the first time.
+	            // This feature can make sure that each data item and its
+	            // mapped color have the same index between data list and
+	            // color list at the beginning, which is useful for user
+	            // to adjust data-color mapping.
+
+	            /**
+	             * @private
+	             * @type {Object}
+	             */
+	            var idIndexMap = this._idIndexMap;
+
+	            if (!idIndexMap) {
+	                idIndexMap = this._idIndexMap = {};
+	                /**
+	                 * @private
+	                 * @type {number}
+	                 */
+	                this._idIndexMapCount = 0;
+	            }
+
+	            var index = idIndexMap[id];
+	            if (index == null) {
+	                idIndexMap[id] = index = this._idIndexMapCount++;
+	            }
+
+	            return index;
+	        },
+
+	        getViewRoot: function () {
+	            return this._viewRoot;
+	        },
+
+	        /**
+	         * @param {module:echarts/data/Tree~Node} [viewRoot]
+	         */
+	        resetViewRoot: function (viewRoot) {
+	            viewRoot
+	                ? (this._viewRoot = viewRoot)
+	                : (viewRoot = this._viewRoot);
+
+	            var root = this.getData().tree.root;
+
+	            if (!viewRoot
+	                || (viewRoot !== root && !root.contains(viewRoot))
+	            ) {
+	                this._viewRoot = root;
+	            }
+	        }
+	    });
+
+	    /**
+	     * @param {Object} dataNode
+	     */
+	    function completeTreeValue(dataNode, arrValueLength) {
+	        // Postorder travel tree.
+	        // If value of none-leaf node is not set,
+	        // calculate it by suming up the value of all children.
+	        var sum = 0;
+
+	        zrUtil.each(dataNode.children, function (child) {
+
+	            completeTreeValue(child, arrValueLength);
+
+	            var childValue = child.value;
+	            zrUtil.isArray(childValue) && (childValue = childValue[0]);
+
+	            sum += childValue;
+	        });
+
+	        var thisValue = dataNode.value;
+
+	        if (arrValueLength >= 0) {
+	            if (!zrUtil.isArray(thisValue)) {
+	                dataNode.value = new Array(arrValueLength);
+	            }
+	            else {
+	                thisValue = thisValue[0];
+	            }
+	        }
+
+	        if (thisValue == null || isNaN(thisValue)) {
+	            thisValue = sum;
+	        }
+	        // Value should not less than 0.
+	        if (thisValue < 0) {
+	            thisValue = 0;
+	        }
+
+	        arrValueLength >= 0
+	            ? (dataNode.value[0] = thisValue)
+	            : (dataNode.value = thisValue);
+	    }
+
+	    /**
+	     * set default to level configuration
+	     */
+	    function setDefault(levels, ecModel) {
+	        var globalColorList = ecModel.get('color');
+
+	        if (!globalColorList) {
+	            return;
+	        }
+
+	        levels = levels || [];
+	        var hasColorDefine;
+	        zrUtil.each(levels, function (levelDefine) {
+	            var model = new Model(levelDefine);
+	            var modelColor = model.get('color');
+
+	            if (model.get('itemStyle.normal.color')
+	                || (modelColor && modelColor !== 'none')
+	            ) {
+	                hasColorDefine = true;
+	            }
+	        });
+
+	        if (!hasColorDefine) {
+	            var level0 = levels[0] || (levels[0] = {});
+	            level0.color = globalColorList.slice();
+	        }
+
+	        return levels;
+	    }
+
+
+
+/***/ },
+/* 184 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * Tree data structure
+	 *
+	 * @module echarts/data/Tree
+	 */
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var Model = __webpack_require__(12);
+	    var List = __webpack_require__(97);
+	    var linkList = __webpack_require__(185);
+	    var completeDimensions = __webpack_require__(102);
+
+	    /**
+	     * @constructor module:echarts/data/Tree~TreeNode
+	     * @param {string} name
+	     * @param {module:echarts/data/Tree} hostTree
+	     */
+	    var TreeNode = function (name, hostTree) {
+	        /**
+	         * @type {string}
+	         */
+	        this.name = name || '';
+
+	        /**
+	         * Depth of node
+	         *
+	         * @type {number}
+	         * @readOnly
+	         */
+	        this.depth = 0;
+
+	        /**
+	         * Height of the subtree rooted at this node.
+	         * @type {number}
+	         * @readOnly
+	         */
+	        this.height = 0;
+
+	        /**
+	         * @type {module:echarts/data/Tree~TreeNode}
+	         * @readOnly
+	         */
+	        this.parentNode = null;
+
+	        /**
+	         * Reference to list item.
+	         * Do not persistent dataIndex outside,
+	         * besause it may be changed by list.
+	         * If dataIndex -1,
+	         * this node is logical deleted (filtered) in list.
+	         *
+	         * @type {Object}
+	         * @readOnly
+	         */
+	        this.dataIndex = -1;
+
+	        /**
+	         * @type {Array.<module:echarts/data/Tree~TreeNode>}
+	         * @readOnly
+	         */
+	        this.children = [];
+
+	        /**
+	         * @type {Array.<module:echarts/data/Tree~TreeNode>}
+	         * @pubilc
+	         */
+	        this.viewChildren = [];
+
+	        /**
+	         * @type {moduel:echarts/data/Tree}
+	         * @readOnly
+	         */
+	        this.hostTree = hostTree;
+	    };
+
+	    TreeNode.prototype = {
+
+	        constructor: TreeNode,
+
+	        /**
+	         * The node is removed.
+	         * @return {boolean} is removed.
+	         */
+	        isRemoved: function () {
+	            return this.dataIndex < 0;
+	        },
+
+	        /**
+	         * Travel this subtree (include this node).
+	         * Usage:
+	         *    node.eachNode(function () { ... }); // preorder
+	         *    node.eachNode('preorder', function () { ... }); // preorder
+	         *    node.eachNode('postorder', function () { ... }); // postorder
+	         *    node.eachNode(
+	         *        {order: 'postorder', attr: 'viewChildren'},
+	         *        function () { ... }
+	         *    ); // postorder
+	         *
+	         * @param {(Object|string)} options If string, means order.
+	         * @param {string=} options.order 'preorder' or 'postorder'
+	         * @param {string=} options.attr 'children' or 'viewChildren'
+	         * @param {Function} cb If in preorder and return false,
+	         *                      its subtree will not be visited.
+	         * @param {Object} [context]
+	         */
+	        eachNode: function (options, cb, context) {
+	            if (typeof options === 'function') {
+	                context = cb;
+	                cb = options;
+	                options = null;
+	            }
+
+	            options = options || {};
+	            if (zrUtil.isString(options)) {
+	                options = {order: options};
+	            }
+
+	            var order = options.order || 'preorder';
+	            var children = this[options.attr || 'children'];
+
+	            var suppressVisitSub;
+	            order === 'preorder' && (suppressVisitSub = cb.call(context, this));
+
+	            for (var i = 0; !suppressVisitSub && i < children.length; i++) {
+	                children[i].eachNode(options, cb, context);
+	            }
+
+	            order === 'postorder' && cb.call(context, this);
+	        },
+
+	        /**
+	         * Update depth and height of this subtree.
+	         *
+	         * @param  {number} depth
+	         */
+	        updateDepthAndHeight: function (depth) {
+	            var height = 0;
+	            this.depth = depth;
+	            for (var i = 0; i < this.children.length; i++) {
+	                var child = this.children[i];
+	                child.updateDepthAndHeight(depth + 1);
+	                if (child.height > height) {
+	                    height = child.height;
+	                }
+	            }
+	            this.height = height + 1;
+	        },
+
+	        /**
+	         * @param  {string} id
+	         * @return {module:echarts/data/Tree~TreeNode}
+	         */
+	        getNodeById: function (id) {
+	            if (this.getId() === id) {
+	                return this;
+	            }
+	            for (var i = 0, children = this.children, len = children.length; i < len; i++) {
+	                var res = children[i].getNodeById(id);
+	                if (res) {
+	                    return res;
+	                }
+	            }
+	        },
+
+	        /**
+	         * @param {module:echarts/data/Tree~TreeNode} node
+	         * @return {boolean}
+	         */
+	        contains: function (node) {
+	            if (node === this) {
+	                return true;
+	            }
+	            for (var i = 0, children = this.children, len = children.length; i < len; i++) {
+	                var res = children[i].contains(node);
+	                if (res) {
+	                    return res;
+	                }
+	            }
+	        },
+
+	        /**
+	         * @param {boolean} includeSelf Default false.
+	         * @return {Array.<module:echarts/data/Tree~TreeNode>} order: [root, child, grandchild, ...]
+	         */
+	        getAncestors: function (includeSelf) {
+	            var ancestors = [];
+	            var node = includeSelf ? this : this.parentNode;
+	            while (node) {
+	                ancestors.push(node);
+	                node = node.parentNode;
+	            }
+	            ancestors.reverse();
+	            return ancestors;
+	        },
+
+	        /**
+	         * @param {string|Array=} [dimension='value'] Default 'value'. can be 0, 1, 2, 3
+	         * @return {number} Value.
+	         */
+	        getValue: function (dimension) {
+	            var data = this.hostTree.data;
+	            return data.get(data.getDimension(dimension || 'value'), this.dataIndex);
+	        },
+
+	        /**
+	         * @param {Object} layout
+	         * @param {boolean=} [merge=false]
+	         */
+	        setLayout: function (layout, merge) {
+	            this.dataIndex >= 0
+	                && this.hostTree.data.setItemLayout(this.dataIndex, layout, merge);
+	        },
+
+	        /**
+	         * @return {Object} layout
+	         */
+	        getLayout: function () {
+	            return this.hostTree.data.getItemLayout(this.dataIndex);
+	        },
+
+	        /**
+	         * @param {string} path
+	         * @return {module:echarts/model/Model}
+	         */
+	        getModel: function (path) {
+	            if (this.dataIndex < 0) {
+	                return;
+	            }
+	            var hostTree = this.hostTree;
+	            var itemModel = hostTree.data.getItemModel(this.dataIndex);
+	            var levelModel = this.getLevelModel();
+
+	            return itemModel.getModel(path, (levelModel || hostTree.hostModel).getModel(path));
+	        },
+
+	        /**
+	         * @return {module:echarts/model/Model}
+	         */
+	        getLevelModel: function () {
+	            return (this.hostTree.levelModels || [])[this.depth];
+	        },
+
+	        /**
+	         * @example
+	         *  setItemVisual('color', color);
+	         *  setItemVisual({
+	         *      'color': color
+	         *  });
+	         */
+	        setVisual: function (key, value) {
+	            this.dataIndex >= 0
+	                && this.hostTree.data.setItemVisual(this.dataIndex, key, value);
+	        },
+
+	        /**
+	         * Get item visual
+	         */
+	        getVisual: function (key, ignoreParent) {
+	            return this.hostTree.data.getItemVisual(this.dataIndex, key, ignoreParent);
+	        },
+
+	        /**
+	         * @public
+	         * @return {number}
+	         */
+	        getRawIndex: function () {
+	            return this.hostTree.data.getRawIndex(this.dataIndex);
+	        },
+
+	        /**
+	         * @public
+	         * @return {string}
+	         */
+	        getId: function () {
+	            return this.hostTree.data.getId(this.dataIndex);
+	        }
+	    };
+
+	    /**
+	     * @constructor
+	     * @alias module:echarts/data/Tree
+	     * @param {module:echarts/model/Model} hostModel
+	     * @param {Array.<Object>} levelOptions
+	     */
+	    function Tree(hostModel, levelOptions) {
+	        /**
+	         * @type {module:echarts/data/Tree~TreeNode}
+	         * @readOnly
+	         */
+	        this.root;
+
+	        /**
+	         * @type {module:echarts/data/List}
+	         * @readOnly
+	         */
+	        this.data;
+
+	        /**
+	         * Index of each item is the same as the raw index of coresponding list item.
+	         * @private
+	         * @type {Array.<module:echarts/data/Tree~TreeNode}
+	         */
+	        this._nodes = [];
+
+	        /**
+	         * @private
+	         * @readOnly
+	         * @type {module:echarts/model/Model}
+	         */
+	        this.hostModel = hostModel;
+
+	        /**
+	         * @private
+	         * @readOnly
+	         * @type {Array.<module:echarts/model/Model}
+	         */
+	        this.levelModels = zrUtil.map(levelOptions || [], function (levelDefine) {
+	            return new Model(levelDefine, hostModel, hostModel.ecModel);
+	        });
+	    }
+
+	    Tree.prototype = {
+
+	        constructor: Tree,
+
+	        type: 'tree',
+
+	        /**
+	         * Travel this subtree (include this node).
+	         * Usage:
+	         *    node.eachNode(function () { ... }); // preorder
+	         *    node.eachNode('preorder', function () { ... }); // preorder
+	         *    node.eachNode('postorder', function () { ... }); // postorder
+	         *    node.eachNode(
+	         *        {order: 'postorder', attr: 'viewChildren'},
+	         *        function () { ... }
+	         *    ); // postorder
+	         *
+	         * @param {(Object|string)} options If string, means order.
+	         * @param {string=} options.order 'preorder' or 'postorder'
+	         * @param {string=} options.attr 'children' or 'viewChildren'
+	         * @param {Function} cb
+	         * @param {Object}   [context]
+	         */
+	        eachNode: function(options, cb, context) {
+	            this.root.eachNode(options, cb, context);
+	        },
+
+	        /**
+	         * @param {number} dataIndex
+	         * @return {module:echarts/data/Tree~TreeNode}
+	         */
+	        getNodeByDataIndex: function (dataIndex) {
+	            var rawIndex = this.data.getRawIndex(dataIndex);
+	            return this._nodes[rawIndex];
+	        },
+
+	        /**
+	         * @param {string} name
+	         * @return {module:echarts/data/Tree~TreeNode}
+	         */
+	        getNodeByName: function (name) {
+	            return this.root.getNodeByName(name);
+	        },
+
+	        /**
+	         * Update item available by list,
+	         * when list has been performed options like 'filterSelf' or 'map'.
+	         */
+	        update: function () {
+	            var data = this.data;
+	            var nodes = this._nodes;
+
+	            for (var i = 0, len = nodes.length; i < len; i++) {
+	                nodes[i].dataIndex = -1;
+	            }
+
+	            for (var i = 0, len = data.count(); i < len; i++) {
+	                nodes[data.getRawIndex(i)].dataIndex = i;
+	            }
+	        },
+
+	        /**
+	         * Clear all layouts
+	         */
+	        clearLayouts: function () {
+	            this.data.clearItemLayouts();
+	        }
+	    };
+
+	    /**
+	     * data node format:
+	     * {
+	     *     name: ...
+	     *     value: ...
+	     *     children: [
+	     *         {
+	     *             name: ...
+	     *             value: ...
+	     *             children: ...
+	     *         },
+	     *         ...
+	     *     ]
+	     * }
+	     *
+	     * @static
+	     * @param {Objec} dataRoot Root node.
+	     * @param {module:echarts/model/Model} hostModel
+	     * @param {Array.<Object>} levelOptions
+	     * @return module:echarts/data/Tree
+	     */
+	    Tree.createTree = function (dataRoot, hostModel, levelOptions) {
+
+	        var tree = new Tree(hostModel, levelOptions);
+	        var listData = [];
+
+	        buildHierarchy(dataRoot);
+
+	        function buildHierarchy(dataNode, parentNode) {
+	            listData.push(dataNode);
+
+	            var node = new TreeNode(dataNode.name, tree);
+	            parentNode
+	                ? addChild(node, parentNode)
+	                : (tree.root = node);
+
+	            tree._nodes.push(node);
+
+	            var children = dataNode.children;
+	            if (children) {
+	                for (var i = 0; i < children.length; i++) {
+	                    buildHierarchy(children[i], node);
+	                }
+	            }
+	        }
+
+	        tree.root.updateDepthAndHeight(0);
+
+	        var dimensions = completeDimensions([{name: 'value'}], listData);
+	        var list = new List(dimensions, hostModel);
+	        list.initData(listData);
+
+	        linkList({
+	            mainData: list,
+	            struct: tree,
+	            structAttr: 'tree'
+	        });
+
+	        tree.update();
+
+	        return tree;
+	    };
+
+	    /**
+	     * It is needed to consider the mess of 'list', 'hostModel' when creating a TreeNote,
+	     * so this function is not ready and not necessary to be public.
+	     *
+	     * @param {(module:echarts/data/Tree~TreeNode|Object)} child
+	     */
+	    function addChild(child, node) {
+	        var children = node.children;
+	        if (child.parentNode === node) {
+	            return;
+	        }
+
+	        children.push(child);
+	        child.parentNode = node;
+	    }
+
+	    module.exports = Tree;
+
+
+/***/ },
+/* 185 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * Link lists and struct (graph or tree)
+	 */
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var each = zrUtil.each;
+
+	    var DATAS = '\0__link_datas';
+	    var MAIN_DATA = '\0__link_mainData';
+
+	    // Caution:
+	    // In most case, either list or its shallow clones (see list.cloneShallow)
+	    // is active in echarts process. So considering heap memory consumption,
+	    // we do not clone tree or graph, but share them among list and its shallow clones.
+	    // But in some rare case, we have to keep old list (like do animation in chart). So
+	    // please take care that both the old list and the new list share the same tree/graph.
+
+	    /**
+	     * @param {Object} opt
+	     * @param {module:echarts/data/List} opt.mainData
+	     * @param {Object} [opt.struct] For example, instance of Graph or Tree.
+	     * @param {string} [opt.structAttr] designation: list[structAttr] = struct;
+	     * @param {Object} [opt.datas] {dataType: data},
+	     *                 like: {node: nodeList, edge: edgeList}.
+	     *                 Should contain mainData.
+	     * @param {Object} [opt.datasAttr] {dataType: attr},
+	     *                 designation: struct[datasAttr[dataType]] = list;
+	     */
+	    function linkList(opt) {
+	        var mainData = opt.mainData;
+	        var datas = opt.datas;
+
+	        if (!datas) {
+	            datas = {main: mainData};
+	            opt.datasAttr = {main: 'data'};
+	        }
+	        opt.datas = opt.mainData = null;
+
+	        linkAll(mainData, datas, opt);
+
+	        // Porxy data original methods.
+	        each(datas, function (data) {
+	            each(mainData.TRANSFERABLE_METHODS, function (methodName) {
+	                data.wrapMethod(methodName, zrUtil.curry(transferInjection, opt));
+	            });
+
+	        });
+
+	        // Beyond transfer, additional features should be added to `cloneShallow`.
+	        mainData.wrapMethod('cloneShallow', zrUtil.curry(cloneShallowInjection, opt));
+
+	        // Only mainData trigger change, because struct.update may trigger
+	        // another changable methods, which may bring about dead lock.
+	        each(mainData.CHANGABLE_METHODS, function (methodName) {
+	            mainData.wrapMethod(methodName, zrUtil.curry(changeInjection, opt));
+	        });
+
+	        // Make sure datas contains mainData.
+	        zrUtil.assert(datas[mainData.dataType] === mainData);
+	    }
+
+	    function transferInjection(opt, res) {
+	        if (isMainData(this)) {
+	            // Transfer datas to new main data.
+	            var datas = zrUtil.extend({}, this[DATAS]);
+	            datas[this.dataType] = res;
+	            linkAll(res, datas, opt);
+	        }
+	        else {
+	            // Modify the reference in main data to point newData.
+	            linkSingle(res, this.dataType, this[MAIN_DATA], opt);
+	        }
+	        return res;
+	    }
+
+	    function changeInjection(opt, res) {
+	        opt.struct && opt.struct.update(this);
+	        return res;
+	    }
+
+	    function cloneShallowInjection(opt, res) {
+	        // cloneShallow, which brings about some fragilities, may be inappropriate
+	        // to be exposed as an API. So for implementation simplicity we can make
+	        // the restriction that cloneShallow of not-mainData should not be invoked
+	        // outside, but only be invoked here.
+	        each(res[DATAS], function (data, dataType) {
+	            data !== res && linkSingle(data.cloneShallow(), dataType, res, opt);
+	        });
+	        return res;
+	    }
+
+	    /**
+	     * Supplement method to List.
+	     *
+	     * @public
+	     * @param {string} [dataType] If not specified, return mainData.
+	     * @return {module:echarts/data/List}
+	     */
+	    function getLinkedData(dataType) {
+	        var mainData = this[MAIN_DATA];
+	        return (dataType == null || mainData == null)
+	            ? mainData
+	            : mainData[DATAS][dataType];
+	    }
+
+	    function isMainData(data) {
+	        return data[MAIN_DATA] === data;
+	    }
+
+	    function linkAll(mainData, datas, opt) {
+	        mainData[DATAS] = {};
+	        each(datas, function (data, dataType) {
+	            linkSingle(data, dataType, mainData, opt);
+	        });
+	    }
+
+	    function linkSingle(data, dataType, mainData, opt) {
+	        mainData[DATAS][dataType] = data;
+	        data[MAIN_DATA] = mainData;
+	        data.dataType = dataType;
+
+	        if (opt.struct) {
+	            data[opt.structAttr] = opt.struct;
+	            opt.struct[opt.datasAttr[dataType]] = data;
+	        }
+
+	        // Supplement method.
+	        data.getLinkedData = getLinkedData;
+	    }
+
+	    module.exports = linkList;
+
+
+/***/ },
+/* 186 */
+/***/ function(module, exports, __webpack_require__) {
+
+	 
+
+	    var zrUtil = __webpack_require__(4);
+	    var graphic = __webpack_require__(43);
+	    var DataDiffer = __webpack_require__(98);
+	    var helper = __webpack_require__(187);
+	    var Breadcrumb = __webpack_require__(188);
+	    var RoamController = __webpack_require__(174);
+	    var BoundingRect = __webpack_require__(9);
+	    var matrix = __webpack_require__(11);
+	    var animationUtil = __webpack_require__(189);
+	    var bind = zrUtil.bind;
+	    var Group = graphic.Group;
+	    var Rect = graphic.Rect;
+	    var each = zrUtil.each;
+
+	    var DRAG_THRESHOLD = 3;
+	    var PATH_LABEL_NORMAL = ['label', 'normal'];
+	    var PATH_LABEL_EMPHASIS = ['label', 'emphasis'];
+	    var Z_BASE = 10; // Should bigger than every z.
+	    var Z_BG = 1;
+	    var Z_CONTENT = 2;
+
+	    module.exports = __webpack_require__(1).extendChartView({
+
+	        type: 'treemap',
+
+	        /**
+	         * @override
+	         */
+	        init: function (o, api) {
+
+	            /**
+	             * @private
+	             * @type {module:zrender/container/Group}
+	             */
+	            this._containerGroup;
+
+	            /**
+	             * @private
+	             * @type {Object.<string, Array.<module:zrender/container/Group>>}
+	             */
+	            this._storage = createStorage();
+
+	            /**
+	             * @private
+	             * @type {module:echarts/data/Tree}
+	             */
+	            this._oldTree;
+
+	            /**
+	             * @private
+	             * @type {module:echarts/chart/treemap/Breadcrumb}
+	             */
+	            this._breadcrumb;
+
+	            /**
+	             * @private
+	             * @type {module:echarts/component/helper/RoamController}
+	             */
+	            this._controller;
+
+	            /**
+	             * 'ready', 'animating'
+	             * @private
+	             */
+	            this._state = 'ready';
+
+	            /**
+	             * @private
+	             * @type {boolean}
+	             */
+	            this._mayClick;
+	        },
+
+	        /**
+	         * @override
+	         */
+	        render: function (seriesModel, ecModel, api, payload) {
+
+	            var models = ecModel.findComponents({
+	                mainType: 'series', subType: 'treemap', query: payload
+	            });
+	            if (zrUtil.indexOf(models, seriesModel) < 0) {
+	                return;
+	            }
+
+	            this.seriesModel = seriesModel;
+	            this.api = api;
+	            this.ecModel = ecModel;
+
+	            var targetInfo = helper.retrieveTargetInfo(payload, seriesModel);
+	            var payloadType = payload && payload.type;
+	            var layoutInfo = seriesModel.layoutInfo;
+	            var isInit = !this._oldTree;
+	            var thisStorage = this._storage;
+
+	            // Mark new root when action is treemapRootToNode.
+	            var reRoot = (payloadType === 'treemapRootToNode' && targetInfo && thisStorage)
+	                ? {
+	                    rootNodeGroup: thisStorage.nodeGroup[targetInfo.node.getRawIndex()],
+	                    direction: payload.direction
+	                }
+	                : null;
+
+	            var containerGroup = this._giveContainerGroup(layoutInfo);
+
+	            var renderResult = this._doRender(containerGroup, seriesModel, reRoot);
+	            (
+	                !isInit && (
+	                    !payloadType
+	                    || payloadType === 'treemapZoomToNode'
+	                    || payloadType === 'treemapRootToNode'
+	                )
+	            )
+	                ? this._doAnimation(containerGroup, renderResult, seriesModel, reRoot)
+	                : renderResult.renderFinally();
+
+	            this._resetController(api);
+
+	            this._renderBreadcrumb(seriesModel, api, targetInfo);
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _giveContainerGroup: function (layoutInfo) {
+	            var containerGroup = this._containerGroup;
+	            if (!containerGroup) {
+	                // FIXME
+	                // 加一层containerGroup是为了clip，但是现在clip功能并没有实现。
+	                containerGroup = this._containerGroup = new Group();
+	                this._initEvents(containerGroup);
+	                this.group.add(containerGroup);
+	            }
+	            containerGroup.attr('position', [layoutInfo.x, layoutInfo.y]);
+
+	            return containerGroup;
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _doRender: function (containerGroup, seriesModel, reRoot) {
+	            var thisTree = seriesModel.getData().tree;
+	            var oldTree = this._oldTree;
+
+	            // Clear last shape records.
+	            var lastsForAnimation = createStorage();
+	            var thisStorage = createStorage();
+	            var oldStorage = this._storage;
+	            var willInvisibleEls = [];
+	            var doRenderNode = zrUtil.curry(
+	                renderNode, seriesModel,
+	                thisStorage, oldStorage, reRoot,
+	                lastsForAnimation, willInvisibleEls
+	            );
+
+	            // Notice: when thisTree and oldTree are the same tree (see list.cloneShadow),
+	            // the oldTree is actually losted, so we can not find all of the old graphic
+	            // elements from tree. So we use this stragegy: make element storage, move
+	            // from old storage to new storage, clear old storage.
+
+	            dualTravel(
+	                thisTree.root ? [thisTree.root] : [],
+	                (oldTree && oldTree.root) ? [oldTree.root] : [],
+	                containerGroup,
+	                thisTree === oldTree || !oldTree,
+	                0
+	            );
+
+	            // Process all removing.
+	            var willDeleteEls = clearStorage(oldStorage);
+
+	            this._oldTree = thisTree;
+	            this._storage = thisStorage;
+
+	            return {
+	                lastsForAnimation: lastsForAnimation,
+	                willDeleteEls: willDeleteEls,
+	                renderFinally: renderFinally
+	            };
+
+	            function dualTravel(thisViewChildren, oldViewChildren, parentGroup, sameTree, depth) {
+	                // When 'render' is triggered by action,
+	                // 'this' and 'old' may be the same tree,
+	                // we use rawIndex in that case.
+	                if (sameTree) {
+	                    oldViewChildren = thisViewChildren;
+	                    each(thisViewChildren, function (child, index) {
+	                        !child.isRemoved() && processNode(index, index);
+	                    });
+	                }
+	                // Diff hierarchically (diff only in each subtree, but not whole).
+	                // because, consistency of view is important.
+	                else {
+	                    (new DataDiffer(oldViewChildren, thisViewChildren, getKey, getKey))
+	                        .add(processNode)
+	                        .update(processNode)
+	                        .remove(zrUtil.curry(processNode, null))
+	                        .execute();
+	                }
+
+	                function getKey(node) {
+	                    // Identify by name or raw index.
+	                    return node.getId();
+	                }
+
+	                function processNode(newIndex, oldIndex) {
+	                    var thisNode = newIndex != null ? thisViewChildren[newIndex] : null;
+	                    var oldNode = oldIndex != null ? oldViewChildren[oldIndex] : null;
+
+	                    var group = doRenderNode(thisNode, oldNode, parentGroup, depth);
+
+	                    group && dualTravel(
+	                        thisNode && thisNode.viewChildren || [],
+	                        oldNode && oldNode.viewChildren || [],
+	                        group,
+	                        sameTree,
+	                        depth + 1
+	                    );
+	                }
+	            }
+
+	            function clearStorage(storage) {
+	                var willDeleteEls = createStorage();
+	                storage && each(storage, function (store, storageName) {
+	                    var delEls = willDeleteEls[storageName];
+	                    each(store, function (el) {
+	                        el && (delEls.push(el), el.__tmWillDelete = 1);
+	                    });
+	                });
+	                return willDeleteEls;
+	            }
+
+	            function renderFinally() {
+	                each(willDeleteEls, function (els) {
+	                    each(els, function (el) {
+	                        el.parent && el.parent.remove(el);
+	                    });
+	                });
+	                each(willInvisibleEls, function (el) {
+	                    el.invisible = true;
+	                    // Setting invisible is for optimizing, so no need to set dirty,
+	                    // just mark as invisible.
+	                    el.dirty();
+	                });
+	            }
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _doAnimation: function (containerGroup, renderResult, seriesModel, reRoot) {
+	            if (!seriesModel.get('animation')) {
+	                return;
+	            }
+
+	            var duration = seriesModel.get('animationDurationUpdate');
+	            var easing = seriesModel.get('animationEasing');
+	            var animationWrap = animationUtil.createWrap();
+
+	            // Make delete animations.
+	            each(renderResult.willDeleteEls, function (store, storageName) {
+	                each(store, function (el, rawIndex) {
+	                    if (el.invisible) {
+	                        return;
+	                    }
+
+	                    var parent = el.parent; // Always has parent, and parent is nodeGroup.
+	                    var target;
+
+	                    if (reRoot && reRoot.direction === 'drillDown') {
+	                        target = parent === reRoot.rootNodeGroup
+	                            // This is the content element of view root.
+	                            // Only `content` will enter this branch, because
+	                            // `background` and `nodeGroup` will not be deleted.
+	                            ? {
+	                                shape: {
+	                                    x: 0,
+	                                    y: 0,
+	                                    width: parent.__tmNodeWidth,
+	                                    height: parent.__tmNodeHeight
+	                                },
+	                                style: {
+	                                    opacity: 0
+	                                }
+	                            }
+	                            // Others.
+	                            : {style: {opacity: 0}};
+	                    }
+	                    else {
+	                        var targetX = 0;
+	                        var targetY = 0;
+
+	                        if (!parent.__tmWillDelete) {
+	                            // Let node animate to right-bottom corner, cooperating with fadeout,
+	                            // which is appropriate for user understanding.
+	                            // Divided by 2 for reRoot rolling up effect.
+	                            targetX = parent.__tmNodeWidth / 2;
+	                            targetY = parent.__tmNodeHeight / 2;
+	                        }
+
+	                        target = storageName === 'nodeGroup'
+	                            ? {position: [targetX, targetY], style: {opacity: 0}}
+	                            : {
+	                                shape: {x: targetX, y: targetY, width: 0, height: 0},
+	                                style: {opacity: 0}
+	                            };
+	                    }
+
+	                    target && animationWrap.add(el, target, duration, easing);
+	                });
+	            });
+
+	            // Make other animations
+	            each(this._storage, function (store, storageName) {
+	                each(store, function (el, rawIndex) {
+	                    var last = renderResult.lastsForAnimation[storageName][rawIndex];
+	                    var target = {};
+
+	                    if (!last) {
+	                        return;
+	                    }
+
+	                    if (storageName === 'nodeGroup') {
+	                        if (last.old) {
+	                            target.position = el.position.slice();
+	                            el.attr('position', last.old);
+	                        }
+	                    }
+	                    else {
+	                        if (last.old) {
+	                            target.shape = zrUtil.extend({}, el.shape);
+	                            el.setShape(last.old);
+	                        }
+
+	                        if (last.fadein) {
+	                            el.setStyle('opacity', 0);
+	                            target.style = {opacity: 1};
+	                        }
+	                        // When animation is stopped for succedent animation starting,
+	                        // el.style.opacity might not be 1
+	                        else if (el.style.opacity !== 1) {
+	                            target.style = {opacity: 1};
+	                        }
+	                    }
+
+	                    animationWrap.add(el, target, duration, easing);
+	                });
+	            }, this);
+
+	            this._state = 'animating';
+
+	            animationWrap
+	                .done(bind(function () {
+	                    this._state = 'ready';
+	                    renderResult.renderFinally();
+	                }, this))
+	                .start();
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _resetController: function (api) {
+	            var controller = this._controller;
+
+	            // Init controller.
+	            if (!controller) {
+	                controller = this._controller = new RoamController(api.getZr());
+	                controller.enable(this.seriesModel.get('roam'));
+	                controller.on('pan', bind(this._onPan, this));
+	                controller.on('zoom', bind(this._onZoom, this));
+	            }
+
+	            var rect = new BoundingRect(0, 0, api.getWidth(), api.getHeight());
+	            controller.rectProvider = function () {
+	                return rect;
+	            };
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _clearController: function () {
+	            var controller = this._controller;
+	            if (controller) {
+	                controller.off('pan').off('zoom');
+	                controller = null;
+	            }
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _onPan: function (dx, dy) {
+	            this._mayClick = false;
+
+	            if (this._state !== 'animating'
+	                && (Math.abs(dx) > DRAG_THRESHOLD || Math.abs(dy) > DRAG_THRESHOLD)
+	            ) {
+	                // These param must not be cached.
+	                var root = this.seriesModel.getData().tree.root;
+
+	                if (!root) {
+	                    return;
+	                }
+
+	                var rootLayout = root.getLayout();
+
+	                if (!rootLayout) {
+	                    return;
+	                }
+
+	                this.api.dispatchAction({
+	                    type: 'treemapMove',
+	                    from: this.uid,
+	                    seriesId: this.seriesModel.id,
+	                    rootRect: {
+	                        x: rootLayout.x + dx, y: rootLayout.y + dy,
+	                        width: rootLayout.width, height: rootLayout.height
+	                    }
+	                });
+	            }
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _onZoom: function (scale, mouseX, mouseY) {
+	            this._mayClick = false;
+
+	            if (this._state !== 'animating') {
+	                // These param must not be cached.
+	                var root = this.seriesModel.getData().tree.root;
+
+	                if (!root) {
+	                    return;
+	                }
+
+	                var rootLayout = root.getLayout();
+
+	                if (!rootLayout) {
+	                    return;
+	                }
+
+	                var rect = new BoundingRect(
+	                    rootLayout.x, rootLayout.y, rootLayout.width, rootLayout.height
+	                );
+	                var layoutInfo = this.seriesModel.layoutInfo;
+
+	                // Transform mouse coord from global to containerGroup.
+	                mouseX -= layoutInfo.x;
+	                mouseY -= layoutInfo.y;
+
+	                // Scale root bounding rect.
+	                var m = matrix.create();
+	                matrix.translate(m, m, [-mouseX, -mouseY]);
+	                matrix.scale(m, m, [scale, scale]);
+	                matrix.translate(m, m, [mouseX, mouseY]);
+
+	                rect.applyTransform(m);
+
+	                this.api.dispatchAction({
+	                    type: 'treemapRender',
+	                    from: this.uid,
+	                    seriesId: this.seriesModel.id,
+	                    rootRect: {
+	                        x: rect.x, y: rect.y,
+	                        width: rect.width, height: rect.height
+	                    }
+	                });
+	            }
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _initEvents: function (containerGroup) {
+	            // FIXME
+	            // 不用click以及silent的原因是，animate时视图设置silent true来避免click生效，
+	            // 但是animate中，按下鼠标，animate结束后（silent设回为false）松开鼠标，
+	            // 还是会触发click，期望是不触发。
+
+	            // Mousedown occurs when drag start, and mouseup occurs when drag end,
+	            // click event should not be triggered in that case.
+
+	            containerGroup.on('mousedown', function (e) {
+	                this._state === 'ready' && (this._mayClick = true);
+	            }, this);
+	            containerGroup.on('mouseup', function (e) {
+	                if (this._mayClick) {
+	                    this._mayClick = false;
+	                    this._state === 'ready' && onClick.call(this, e);
+	                }
+	            }, this);
+
+	            function onClick(e) {
+	                var nodeClick = this.seriesModel.get('nodeClick', true);
+
+	                if (!nodeClick) {
+	                    return;
+	                }
+
+	                var targetInfo = this.findTarget(e.offsetX, e.offsetY);
+
+	                if (!targetInfo) {
+	                    return;
+	                }
+
+	                var node = targetInfo.node;
+	                if (node.getLayout().isLeafRoot) {
+	                    this._rootToNode(targetInfo);
+	                }
+	                else {
+	                    if (nodeClick === 'zoomToNode') {
+	                        this._zoomToNode(targetInfo);
+	                    }
+	                    else if (nodeClick === 'link') {
+	                        var itemModel = node.hostTree.data.getItemModel(node.dataIndex);
+	                        var link = itemModel.get('link', true);
+	                        var linkTarget = itemModel.get('target', true) || 'blank';
+	                        link && window.open(link, linkTarget);
+	                    }
+	                }
+	            }
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _renderBreadcrumb: function (seriesModel, api, targetInfo) {
+	            if (!targetInfo) {
+	                // Find breadcrumb tail on center of containerGroup.
+	                targetInfo = this.findTarget(api.getWidth() / 2, api.getHeight() / 2);
+
+	                if (!targetInfo) {
+	                    targetInfo = {node: seriesModel.getData().tree.root};
+	                }
+	            }
+
+	            (this._breadcrumb || (this._breadcrumb = new Breadcrumb(this.group, bind(onSelect, this))))
+	                .render(seriesModel, api, targetInfo.node);
+
+	            function onSelect(node) {
+	                if (this._state !== 'animating') {
+	                    helper.aboveViewRoot(seriesModel.getViewRoot(), node)
+	                        ? this._rootToNode({node: node})
+	                        : this._zoomToNode({node: node});
+	                }
+	            }
+	        },
+
+	        /**
+	         * @override
+	         */
+	        remove: function () {
+	            this._clearController();
+	            this._containerGroup && this._containerGroup.removeAll();
+	            this._storage = createStorage();
+	            this._state = 'ready';
+	            this._breadcrumb && this._breadcrumb.remove();
+	        },
+
+	        dispose: function () {
+	            this._clearController();
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _zoomToNode: function (targetInfo) {
+	            this.api.dispatchAction({
+	                type: 'treemapZoomToNode',
+	                from: this.uid,
+	                seriesId: this.seriesModel.id,
+	                targetNode: targetInfo.node
+	            });
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _rootToNode: function (targetInfo) {
+	            this.api.dispatchAction({
+	                type: 'treemapRootToNode',
+	                from: this.uid,
+	                seriesId: this.seriesModel.id,
+	                targetNode: targetInfo.node
+	            });
+	        },
+
+	        /**
+	         * @public
+	         * @param {number} x Global coord x.
+	         * @param {number} y Global coord y.
+	         * @return {Object} info If not found, return undefined;
+	         * @return {number} info.node Target node.
+	         * @return {number} info.offsetX x refer to target node.
+	         * @return {number} info.offsetY y refer to target node.
+	         */
+	        findTarget: function (x, y) {
+	            var targetInfo;
+	            var viewRoot = this.seriesModel.getViewRoot();
+
+	            viewRoot.eachNode({attr: 'viewChildren', order: 'preorder'}, function (node) {
+	                var bgEl = this._storage.background[node.getRawIndex()];
+	                // If invisible, there might be no element.
+	                if (bgEl) {
+	                    var point = bgEl.transformCoordToLocal(x, y);
+	                    var shape = bgEl.shape;
+
+	                    // For performance consideration, dont use 'getBoundingRect'.
+	                    if (shape.x <= point[0]
+	                        && point[0] <= shape.x + shape.width
+	                        && shape.y <= point[1]
+	                        && point[1] <= shape.y + shape.height
+	                    ) {
+	                        targetInfo = {node: node, offsetX: point[0], offsetY: point[1]};
+	                    }
+	                    else {
+	                        return false; // Suppress visit subtree.
+	                    }
+	                }
+	            }, this);
+
+	            return targetInfo;
+	        }
+
+	    });
+
+	    /**
+	     * @inner
+	     */
+	    function createStorage() {
+	        return {nodeGroup: [], background: [], content: []};
+	    }
+
+	    /**
+	     * @inner
+	     * @return Return undefined means do not travel further.
+	     */
+	    function renderNode(
+	        seriesModel, thisStorage, oldStorage, reRoot,
+	        lastsForAnimation, willInvisibleEls,
+	        thisNode, oldNode, parentGroup, depth
+	    ) {
+	        // Whether under viewRoot.
+	        if (!thisNode) {
+	            // Deleting nodes will be performed finally. This method just find
+	            // element from old storage, or create new element, set them to new
+	            // storage, and set styles.
+	            return;
+	        }
+
+	        var thisLayout = thisNode.getLayout();
+
+	        if (!thisLayout || !thisLayout.isInView) {
+	            return;
+	        }
+
+	        var thisWidth = thisLayout.width;
+	        var thisHeight = thisLayout.height;
+	        var thisInvisible = thisLayout.invisible;
+
+	        var thisRawIndex = thisNode.getRawIndex();
+	        var oldRawIndex = oldNode && oldNode.getRawIndex();
+
+	        // Node group
+	        var group = giveGraphic('nodeGroup', Group);
+
+	        if (!group) {
+	            return;
+	        }
+
+	        parentGroup.add(group);
+	        // x,y are not set when el is above view root.
+	        group.attr('position', [thisLayout.x || 0, thisLayout.y || 0]);
+	        group.__tmNodeWidth = thisWidth;
+	        group.__tmNodeHeight = thisHeight;
+
+	        if (thisLayout.isAboveViewRoot) {
+	            return group;
+	        }
+
+	        // Background
+	        var bg = giveGraphic('background', Rect, depth, Z_BG);
+	        if (bg) {
+	            bg.setShape({x: 0, y: 0, width: thisWidth, height: thisHeight});
+	            updateStyle(bg, function () {
+	                bg.setStyle('fill', thisNode.getVisual('borderColor', true));
+	            });
+	            group.add(bg);
+	        }
+
+	        var thisViewChildren = thisNode.viewChildren;
+
+	        // No children, render content.
+	        if (!thisViewChildren || !thisViewChildren.length) {
+	            var content = giveGraphic('content', Rect, depth, Z_CONTENT);
+	            content && renderContent(group);
+	        }
+
+	        return group;
+
+	        // ----------------------------
+	        // | Procedures in renderNode |
+	        // ----------------------------
+
+	        function renderContent(group) {
+	            // For tooltip.
+	            content.dataIndex = thisNode.dataIndex;
+	            content.seriesIndex = seriesModel.seriesIndex;
+
+	            var borderWidth = thisLayout.borderWidth;
+	            var contentWidth = Math.max(thisWidth - 2 * borderWidth, 0);
+	            var contentHeight = Math.max(thisHeight - 2 * borderWidth, 0);
+
+	            content.culling = true;
+	            content.setShape({
+	                x: borderWidth,
+	                y: borderWidth,
+	                width: contentWidth,
+	                height: contentHeight
+	            });
+
+	            var visualColor = thisNode.getVisual('color', true);
+	            updateStyle(content, function () {
+	                var normalStyle = {fill: visualColor};
+	                var emphasisStyle = thisNode.getModel('itemStyle.emphasis').getItemStyle();
+
+	                prepareText(normalStyle, emphasisStyle, visualColor, contentWidth, contentHeight);
+
+	                content.setStyle(normalStyle);
+	                graphic.setHoverStyle(content, emphasisStyle);
+	            });
+
+	            group.add(content);
+	        }
+
+	        function updateStyle(element, cb) {
+	            if (!thisInvisible) {
+	                // If invisible, do not set visual, otherwise the element will
+	                // change immediately before animation. We think it is OK to
+	                // remain its origin color when moving out of the view window.
+	                cb();
+
+	                if (!element.__tmWillVisible) {
+	                    element.invisible = false;
+	                }
+	            }
+	            else {
+	                // Delay invisible setting utill animation finished,
+	                // avoid element vanish suddenly before animation.
+	                !element.invisible && willInvisibleEls.push(element);
+	            }
+	        }
+
+	        function prepareText(normalStyle, emphasisStyle, visualColor, contentWidth, contentHeight) {
+	            var nodeModel = thisNode.getModel();
+	            var text = nodeModel.get('name');
+	            if (thisLayout.isLeafRoot) {
+	                var iconChar = seriesModel.get('drillDownIcon', true);
+	                text = iconChar ? iconChar + ' ' + text : test;
+	            }
+
+	            setText(
+	                text, normalStyle, nodeModel, PATH_LABEL_NORMAL,
+	                visualColor, contentWidth, contentHeight
+	            );
+	            setText(
+	                text, emphasisStyle, nodeModel, PATH_LABEL_EMPHASIS,
+	                visualColor, contentWidth, contentHeight
+	            );
+	        }
+
+	        function setText(text, style, nodeModel, labelPath, visualColor, contentWidth, contentHeight) {
+	            var labelModel = nodeModel.getModel(labelPath);
+	            var labelTextStyleModel = labelModel.getModel('textStyle');
+
+	            graphic.setText(style, labelModel, visualColor);
+
+	            // text.align and text.baseline is not included by graphic.setText,
+	            // because in most cases the two attributes are not exposed to user,
+	            // except in treemap.
+	            style.textAlign = labelTextStyleModel.get('align');
+	            style.textVerticalAlign = labelTextStyleModel.get('baseline');
+
+	            var textRect = labelTextStyleModel.getTextRect(text);
+	            if (!labelModel.getShallow('show') || textRect.height > contentHeight) {
+	                style.text = '';
+	            }
+	            else if (textRect.width > contentWidth) {
+	                style.text = labelTextStyleModel.get('ellipsis')
+	                    ? labelTextStyleModel.truncateText(
+	                        text, contentWidth, null, {minChar: 2}
+	                    )
+	                    : '';
+	            }
+	            else {
+	                style.text = text;
+	            }
+	        }
+
+	        function giveGraphic(storageName, Ctor, depth, z) {
+	            var element = oldRawIndex != null && oldStorage[storageName][oldRawIndex];
+	            var lasts = lastsForAnimation[storageName];
+
+	            if (element) {
+	                // Remove from oldStorage
+	                oldStorage[storageName][oldRawIndex] = null;
+	                prepareAnimationWhenHasOld(lasts, element, storageName);
+	            }
+	            // If invisible and no old element, do not create new element (for optimizing).
+	            else if (!thisInvisible) {
+	                element = new Ctor({z: calculateZ(depth, z)});
+	                element.__tmDepth = depth;
+	                element.__tmStorageName = storageName;
+	                prepareAnimationWhenNoOld(lasts, element, storageName);
+	            }
+
+	            // Set to thisStorage
+	            return (thisStorage[storageName][thisRawIndex] = element);
+	        }
+
+	        function prepareAnimationWhenHasOld(lasts, element, storageName) {
+	            var lastCfg = lasts[thisRawIndex] = {};
+	            lastCfg.old = storageName === 'nodeGroup'
+	                ? element.position.slice()
+	                : zrUtil.extend({}, element.shape);
+	        }
+
+	        // If a element is new, we need to find the animation start point carefully,
+	        // otherwise it will looks strange when 'zoomToNode'.
+	        function prepareAnimationWhenNoOld(lasts, element, storageName) {
+	            var lastCfg = lasts[thisRawIndex] = {};
+	            var parentNode = thisNode.parentNode;
+
+	            if (parentNode && (!reRoot || reRoot.direction === 'drillDown')) {
+	                var parentOldX = 0;
+	                var parentOldY = 0;
+
+	                // New nodes appear from right-bottom corner in 'zoomToNode' animation.
+	                // For convenience, get old bounding rect from background.
+	                var parentOldBg = lastsForAnimation.background[parentNode.getRawIndex()];
+	                if (!reRoot && parentOldBg && parentOldBg.old) {
+	                    parentOldX = parentOldBg.old.width;
+	                    parentOldY = parentOldBg.old.height;
+	                }
+
+	                // When no parent old shape found, its parent is new too,
+	                // so we can just use {x:0, y:0}.
+	                lastCfg.old = storageName === 'nodeGroup'
+	                    ? [0, parentOldY]
+	                    : {x: parentOldX, y: parentOldY, width: 0, height: 0};
+	            }
+
+	            // Fade in, user can be aware that these nodes are new.
+	            lastCfg.fadein = storageName !== 'nodeGroup';
+	        }
+	    }
+
+	    // We can not set all backgroud with the same z, Because the behaviour of
+	    // drill down and roll up differ background creation sequence from tree
+	    // hierarchy sequence, which cause that lowser background element overlap
+	    // upper ones. So we calculate z based on depth.
+	    // Moreover, we try to shrink down z interval to [0, 1] to avoid that
+	    // treemap with large z overlaps other components.
+	    function calculateZ(depth, zInLevel) {
+	        var zb = depth * Z_BASE + zInLevel;
+	        return (zb - 1) / zb;
+	    }
+
+
+
+/***/ },
+/* 187 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+
+	    var helper = {
+
+	        retrieveTargetInfo: function (payload, seriesModel) {
+	            if (payload
+	                && (
+	                    payload.type === 'treemapZoomToNode'
+	                    || payload.type === 'treemapRootToNode'
+	                )
+	            ) {
+	                var root = seriesModel.getData().tree.root;
+	                var targetNode = payload.targetNode;
+	                if (targetNode && root.contains(targetNode)) {
+	                    return {node: targetNode};
+	                }
+
+	                var targetNodeId = payload.targetNodeId;
+	                if (targetNodeId != null && (targetNode = root.getNodeById(targetNodeId))) {
+	                    return {node: targetNode};
+	                }
+	            }
+	        },
+
+	        // Not includes the given node at the last item.
+	        getPathToRoot: function (node) {
+	            var path = [];
+	            while (node) {
+	                node = node.parentNode;
+	                node && path.push(node);
+	            }
+	            return path.reverse();
+	        },
+
+	        aboveViewRoot: function (viewRoot, node) {
+	            var viewPath = helper.getPathToRoot(viewRoot);
+	            return zrUtil.indexOf(viewPath, node) >= 0;
+	        }
+	    };
+
+	    module.exports = helper;
+
+
+/***/ },
+/* 188 */
+/***/ function(module, exports, __webpack_require__) {
+
+	 
+
+	    var graphic = __webpack_require__(43);
+	    var layout = __webpack_require__(21);
+	    var zrUtil = __webpack_require__(4);
+
+	    var TEXT_PADDING = 8;
+	    var ITEM_GAP = 8;
+	    var ARRAY_LENGTH = 5;
+
+	    function Breadcrumb(containerGroup, onSelect) {
+	        /**
+	         * @private
+	         * @type {module:zrender/container/Group}
+	         */
+	        this.group = new graphic.Group();
+
+	        containerGroup.add(this.group);
+
+	        /**
+	         * @private
+	         * @type {Function}
+	         */
+	        this._onSelect = onSelect || zrUtil.noop;
+	    }
+
+	    Breadcrumb.prototype = {
+
+	        constructor: Breadcrumb,
+
+	        render: function (seriesModel, api, targetNode) {
+	            var model = seriesModel.getModel('breadcrumb');
+	            var thisGroup = this.group;
+
+	            thisGroup.removeAll();
+
+	            if (!model.get('show') || !targetNode) {
+	                return;
+	            }
+
+	            var normalStyleModel = model.getModel('itemStyle.normal');
+	            // var emphasisStyleModel = model.getModel('itemStyle.emphasis');
+	            var textStyleModel = normalStyleModel.getModel('textStyle');
+
+	            var layoutParam = {
+	                pos: {
+	                    left: model.get('left'),
+	                    right: model.get('right'),
+	                    top: model.get('top'),
+	                    bottom: model.get('bottom')
+	                },
+	                box: {
+	                    width: api.getWidth(),
+	                    height: api.getHeight()
+	                },
+	                emptyItemWidth: model.get('emptyItemWidth'),
+	                totalWidth: 0,
+	                renderList: []
+	            };
+
+	            this._prepare(
+	                model, targetNode, layoutParam, textStyleModel
+	            );
+	            this._renderContent(
+	                model, targetNode, layoutParam, normalStyleModel, textStyleModel
+	            );
+
+	            layout.positionGroup(thisGroup, layoutParam.pos, layoutParam.box);
+	        },
+
+	        /**
+	         * Prepare render list and total width
+	         * @private
+	         */
+	        _prepare: function (model, targetNode, layoutParam, textStyleModel) {
+	            for (var node = targetNode; node; node = node.parentNode) {
+	                var text = node.getModel().get('name');
+	                var textRect = textStyleModel.getTextRect(text);
+	                var itemWidth = Math.max(
+	                    textRect.width + TEXT_PADDING * 2,
+	                    layoutParam.emptyItemWidth
+	                );
+	                layoutParam.totalWidth += itemWidth + ITEM_GAP;
+	                layoutParam.renderList.push({node: node, text: text, width: itemWidth});
+	            }
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _renderContent: function (
+	            model, targetNode, layoutParam, normalStyleModel, textStyleModel
+	        ) {
+	            // Start rendering.
+	            var lastX = 0;
+	            var emptyItemWidth = layoutParam.emptyItemWidth;
+	            var height = model.get('height');
+	            var availableSize = layout.getAvailableSize(layoutParam.pos, layoutParam.box);
+	            var totalWidth = layoutParam.totalWidth;
+	            var renderList = layoutParam.renderList;
+
+	            for (var i = renderList.length - 1; i >= 0; i--) {
+	                var item = renderList[i];
+	                var itemWidth = item.width;
+	                var text = item.text;
+
+	                // Hdie text and shorten width if necessary.
+	                if (totalWidth > availableSize.width) {
+	                    totalWidth -= itemWidth - emptyItemWidth;
+	                    itemWidth = emptyItemWidth;
+	                    text = '';
+	                }
+
+	                this.group.add(new graphic.Polygon({
+	                    shape: {
+	                        points: makeItemPoints(
+	                            lastX, 0, itemWidth, height,
+	                            i === renderList.length - 1, i === 0
+	                        )
+	                    },
+	                    style: zrUtil.defaults(
+	                        normalStyleModel.getItemStyle(),
+	                        {
+	                            lineJoin: 'bevel',
+	                            text: text,
+	                            textFill: textStyleModel.getTextColor(),
+	                            textFont: textStyleModel.getFont()
+	                        }
+	                    ),
+	                    z: 10,
+	                    onclick: zrUtil.bind(this._onSelect, this, item.node)
+	                }));
+
+	                lastX += itemWidth + ITEM_GAP;
+	            }
+	        },
+
+	        /**
+	         * @override
+	         */
+	        remove: function () {
+	            this.group.removeAll();
+	        }
+	    };
+
+	    function makeItemPoints(x, y, itemWidth, itemHeight, head, tail) {
+	        var points = [
+	            [head ? x : x - ARRAY_LENGTH, y],
+	            [x + itemWidth, y],
+	            [x + itemWidth, y + itemHeight],
+	            [head ? x : x - ARRAY_LENGTH, y + itemHeight]
+	        ];
+	        !tail && points.splice(2, 0, [x + itemWidth + ARRAY_LENGTH, y + itemHeight / 2]);
+	        !head && points.push([x, y + itemHeight / 2]);
+	        return points;
+	    }
+
+	    module.exports = Breadcrumb;
+
+
+/***/ },
+/* 189 */
+/***/ function(module, exports, __webpack_require__) {
+
+	 
+
+	    var zrUtil = __webpack_require__(4);
+
+	    /**
+	     * @param {number} [time=500] Time in ms
+	     * @param {string} [easing='linear']
+	     * @param {number} [delay=0]
+	     * @param {Function} [callback]
+	     *
+	     * @example
+	     *  // Animate position
+	     *  animation
+	     *      .createWrap()
+	     *      .add(el1, {position: [10, 10]})
+	     *      .add(el2, {shape: {width: 500}, style: {fill: 'red'}}, 400)
+	     *      .done(function () { // done })
+	     *      .start('cubicOut');
+	     */
+	    function createWrap() {
+
+	        var storage = [];
+	        var elExistsMap = {};
+	        var doneCallback;
+
+	        return {
+
+	            /**
+	             * Caution: a el can only be added once, otherwise 'done'
+	             * might not be called. This method checks this (by el.id),
+	             * suppresses adding and returns false when existing el found.
+	             *
+	             * @param {modele:zrender/Element} el
+	             * @param {Object} target
+	             * @param {number} [time=500]
+	             * @param {number} [delay=0]
+	             * @param {string} [easing='linear']
+	             * @return {boolean} Whether adding succeeded.
+	             *
+	             * @example
+	             *     add(el, target, time, delay, easing);
+	             *     add(el, target, time, easing);
+	             *     add(el, target, time);
+	             *     add(el, target);
+	             */
+	            add: function (el, target, time, delay, easing) {
+	                if (zrUtil.isString(delay)) {
+	                    easing = delay;
+	                    delay = 0;
+	                }
+
+	                if (elExistsMap[el.id]) {
+	                    return false;
+	                }
+	                elExistsMap[el.id] = 1;
+
+	                storage.push(
+	                    {el: el, target: target, time: time, delay: delay, easing: easing}
+	                );
+
+	                return true;
+	            },
+
+	            /**
+	             * Only execute when animation finished. Will not execute when any
+	             * of 'stop' or 'stopAnimation' called.
+	             *
+	             * @param {Function} callback
+	             */
+	            done: function (callback) {
+	                doneCallback = callback;
+	                return this;
+	            },
+
+	            /**
+	             * Will stop exist animation firstly.
+	             */
+	            start: function () {
+	                var count = storage.length;
+
+	                for (var i = 0, len = storage.length; i < len; i++) {
+	                    var item = storage[i];
+	                    item.el.animateTo(item.target, item.time, item.delay, item.easing, done);
+	                }
+
+	                return this;
+
+	                function done() {
+	                    count--;
+	                    if (!count) {
+	                        storage.length = 0;
+	                        elExistsMap = {};
+	                        doneCallback && doneCallback();
+	                    }
+	                }
+	            }
+	        };
+	    }
+
+	    module.exports = {createWrap: createWrap};
+
+
+/***/ },
+/* 190 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @file Treemap action
+	 */
+
+
+	    var echarts = __webpack_require__(1);
+	    var helper = __webpack_require__(187);
+
+	    var noop = function () {};
+
+	    var actionTypes = [
+	        'treemapZoomToNode',
+	        'treemapRender',
+	        'treemapMove'
+	    ];
+
+	    for (var i = 0; i < actionTypes.length; i++) {
+	        echarts.registerAction({type: actionTypes[i], update: 'updateView'}, noop);
+	    }
+
+	    echarts.registerAction(
+	        {type: 'treemapRootToNode', update: 'updateView'},
+	        function (payload, ecModel) {
+
+	            ecModel.eachComponent(
+	                {mainType: 'series', subType: 'treemap', query: payload},
+	                handleRootToNode
+	            );
+
+	            function handleRootToNode(model, index) {
+	                var targetInfo = helper.retrieveTargetInfo(payload, model);
+
+	                if (targetInfo) {
+	                    var originViewRoot = model.getViewRoot();
+	                    if (originViewRoot) {
+	                        payload.direction = helper.aboveViewRoot(originViewRoot, targetInfo.node)
+	                            ? 'rollUp' : 'drillDown';
+	                    }
+	                    model.resetViewRoot(targetInfo.node);
+	                }
+	            }
+	        }
+	    );
+
+
+
+/***/ },
+/* 191 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var VisualMapping = __webpack_require__(192);
+	    var zrColor = __webpack_require__(39);
+	    var zrUtil = __webpack_require__(4);
+	    var isArray = zrUtil.isArray;
+
+	    var ITEM_STYLE_NORMAL = 'itemStyle.normal';
+
+	    module.exports = function (ecModel, api, payload) {
+
+	        var condition = {mainType: 'series', subType: 'treemap', query: payload};
+	        ecModel.eachComponent(condition, function (seriesModel) {
+
+	            var tree = seriesModel.getData().tree;
+	            var root = tree.root;
+	            var seriesItemStyleModel = seriesModel.getModel(ITEM_STYLE_NORMAL);
+
+	            if (root.isRemoved()) {
+	                return;
+	            }
+
+	            var levelItemStyles = zrUtil.map(tree.levelModels, function (levelModel) {
+	                return levelModel ? levelModel.get(ITEM_STYLE_NORMAL) : null;
+	            });
+
+	            travelTree(
+	                root, // Visual should calculate from tree root but not view root.
+	                {},
+	                levelItemStyles,
+	                seriesItemStyleModel,
+	                seriesModel.getViewRoot().getAncestors(),
+	                seriesModel
+	            );
+	        });
+	    };
+
+	    function travelTree(
+	        node, designatedVisual, levelItemStyles, seriesItemStyleModel,
+	        viewRootAncestors, seriesModel
+	    ) {
+	        var nodeModel = node.getModel();
+	        var nodeLayout = node.getLayout();
+
+	        // Optimize
+	        if (!nodeLayout || nodeLayout.invisible || !nodeLayout.isInView) {
+	            return;
+	        }
+
+	        var nodeItemStyleModel = node.getModel(ITEM_STYLE_NORMAL);
+	        var levelItemStyle = levelItemStyles[node.depth];
+	        var visuals = buildVisuals(
+	            nodeItemStyleModel, designatedVisual, levelItemStyle, seriesItemStyleModel
+	        );
+
+	        // calculate border color
+	        var borderColor = nodeItemStyleModel.get('borderColor');
+	        var borderColorSaturation = nodeItemStyleModel.get('borderColorSaturation');
+	        var thisNodeColor;
+	        if (borderColorSaturation != null) {
+	            // For performance, do not always execute 'calculateColor'.
+	            thisNodeColor = calculateColor(visuals, node);
+	            borderColor = calculateBorderColor(borderColorSaturation, thisNodeColor);
+	        }
+	        node.setVisual('borderColor', borderColor);
+
+	        var viewChildren = node.viewChildren;
+	        if (!viewChildren || !viewChildren.length) {
+	            thisNodeColor = calculateColor(visuals, node);
+	            // Apply visual to this node.
+	            node.setVisual('color', thisNodeColor);
+	        }
+	        else {
+	            var mapping = buildVisualMapping(
+	                node, nodeModel, nodeLayout, nodeItemStyleModel, visuals, viewChildren
+	            );
+	            // Designate visual to children.
+	            zrUtil.each(viewChildren, function (child, index) {
+	                // If higher than viewRoot, only ancestors of viewRoot is needed to visit.
+	                if (child.depth >= viewRootAncestors.length
+	                    || child === viewRootAncestors[child.depth]
+	                ) {
+	                    var childVisual = mapVisual(
+	                        nodeModel, visuals, child, index, mapping, seriesModel
+	                    );
+	                    travelTree(
+	                        child, childVisual, levelItemStyles, seriesItemStyleModel,
+	                        viewRootAncestors, seriesModel
+	                    );
+	                }
+	            });
+	        }
+	    }
+
+	    function buildVisuals(
+	        nodeItemStyleModel, designatedVisual, levelItemStyle, seriesItemStyleModel
+	    ) {
+	        var visuals = zrUtil.extend({}, designatedVisual);
+
+	        zrUtil.each(['color', 'colorAlpha', 'colorSaturation'], function (visualName) {
+	            // Priority: thisNode > thisLevel > parentNodeDesignated > seriesModel
+	            var val = nodeItemStyleModel.get(visualName, true); // Ignore parent
+	            val == null && levelItemStyle && (val = levelItemStyle[visualName]);
+	            val == null && (val = designatedVisual[visualName]);
+	            val == null && (val = seriesItemStyleModel.get(visualName));
+
+	            val != null && (visuals[visualName] = val);
+	        });
+
+	        return visuals;
+	    }
+
+	    function calculateColor(visuals) {
+	        var color = getValueVisualDefine(visuals, 'color');
+
+	        if (color) {
+	            var colorAlpha = getValueVisualDefine(visuals, 'colorAlpha');
+	            var colorSaturation = getValueVisualDefine(visuals, 'colorSaturation');
+	            if (colorSaturation) {
+	                color = zrColor.modifyHSL(color, null, null, colorSaturation);
+	            }
+	            if (colorAlpha) {
+	                color = zrColor.modifyAlpha(color, colorAlpha);
+	            }
+
+	            return color;
+	        }
+	    }
+
+	    function calculateBorderColor(borderColorSaturation, thisNodeColor) {
+	        return thisNodeColor != null
+	             ? zrColor.modifyHSL(thisNodeColor, null, null, borderColorSaturation)
+	             : null;
+	    }
+
+	    function getValueVisualDefine(visuals, name) {
+	        var value = visuals[name];
+	        if (value != null && value !== 'none') {
+	            return value;
+	        }
+	    }
+
+	    function buildVisualMapping(
+	        node, nodeModel, nodeLayout, nodeItemStyleModel, visuals, viewChildren
+	    ) {
+	        if (!viewChildren || !viewChildren.length) {
+	            return;
+	        }
+
+	        var rangeVisual = getRangeVisual(nodeModel, 'color')
+	            || (
+	                visuals.color != null
+	                && visuals.color !== 'none'
+	                && (
+	                    getRangeVisual(nodeModel, 'colorAlpha')
+	                    || getRangeVisual(nodeModel, 'colorSaturation')
+	                )
+	            );
+
+	        if (!rangeVisual) {
+	            return;
+	        }
+
+	        var colorMappingBy = nodeModel.get('colorMappingBy');
+	        var opt = {
+	            type: rangeVisual.name,
+	            dataExtent: nodeLayout.dataExtent,
+	            visual: rangeVisual.range
+	        };
+	        if (opt.type === 'color'
+	            && (colorMappingBy === 'index' || colorMappingBy === 'id')
+	        ) {
+	            opt.mappingMethod = 'category';
+	            opt.loop = true;
+	            // categories is ordinal, so do not set opt.categories.
+	        }
+	        else {
+	            opt.mappingMethod = 'linear';
+	        }
+
+	        var mapping = new VisualMapping(opt);
+	        mapping.__drColorMappingBy = colorMappingBy;
+
+	        return mapping;
+	    }
+
+	    // Notice: If we dont have the attribute 'colorRange', but only use
+	    // attribute 'color' to represent both concepts of 'colorRange' and 'color',
+	    // (It means 'colorRange' when 'color' is Array, means 'color' when not array),
+	    // this problem will be encountered:
+	    // If a level-1 node dont have children, and its siblings has children,
+	    // and colorRange is set on level-1, then the node can not be colored.
+	    // So we separate 'colorRange' and 'color' to different attributes.
+	    function getRangeVisual(nodeModel, name) {
+	        // 'colorRange', 'colorARange', 'colorSRange'.
+	        // If not exsits on this node, fetch from levels and series.
+	        var range = nodeModel.get(name);
+	        return (isArray(range) && range.length) ? {name: name, range: range} : null;
+	    }
+
+	    function mapVisual(nodeModel, visuals, child, index, mapping, seriesModel) {
+	        var childVisuals = zrUtil.extend({}, visuals);
+
+	        if (mapping) {
+	            var mappingType = mapping.type;
+	            var colorMappingBy = mappingType === 'color' && mapping.__drColorMappingBy;
+	            var value =
+	                colorMappingBy === 'index'
+	                ? index
+	                : colorMappingBy === 'id'
+	                ? seriesModel.mapIdToIndex(child.getId())
+	                : child.getValue(nodeModel.get('visualDimension'));
+
+	            childVisuals[mappingType] = mapping.mapValueToVisual(value);
+	        }
+
+	        return childVisuals;
+	    }
+
+
+
+/***/ },
+/* 192 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @file Visual mapping.
+	 */
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var zrColor = __webpack_require__(39);
+	    var linearMap = __webpack_require__(7).linearMap;
+	    var each = zrUtil.each;
+	    var isObject = zrUtil.isObject;
+
+	    var CATEGORY_DEFAULT_VISUAL_INDEX = -1;
+
+	    /**
+	     * @param {Object} option
+	     * @param {string} [option.type] See visualHandlers.
+	     * @param {string} [option.mappingMethod] 'linear' or 'piecewise' or 'category' or 'fixed'
+	     * @param {Array.<number>=} [option.dataExtent] [minExtent, maxExtent],
+	     *                                              required when mappingMethod is 'linear'
+	     * @param {Array.<Object>=} [option.pieceList] [
+	     *                                             {value: someValue},
+	     *                                             {interval: [min1, max1], visual: {...}},
+	     *                                             {interval: [min2, max2]}
+	     *                                             ],
+	     *                                            required when mappingMethod is 'piecewise'.
+	     *                                            Visual for only each piece can be specified.
+	     * @param {Array.<string|Object>=} [option.categories] ['cate1', 'cate2']
+	     *                                            required when mappingMethod is 'category'.
+	     *                                            If no option.categories, categories is set
+	     *                                            as [0, 1, 2, ...].
+	     * @param {boolean} [option.loop=false] Whether loop mapping when mappingMethod is 'category'.
+	     * @param {(Array|Object|*)} [option.visual]  Visual data.
+	     *                                            when mappingMethod is 'category',
+	     *                                            visual data can be array or object
+	     *                                            (like: {cate1: '#222', none: '#fff'})
+	     *                                            or primary types (which represents
+	     *                                            defualt category visual), otherwise visual
+	     *                                            can be array or primary (which will be
+	     *                                            normalized to array).
+	     *
+	     */
+	    var VisualMapping = function (option) {
+	        var mappingMethod = option.mappingMethod;
+	        var visualType = option.type;
+
+	        /**
+	         * @readOnly
+	         * @type {Object}
+	         */
+	        var thisOption = this.option = zrUtil.clone(option);
+
+	        /**
+	         * @readOnly
+	         * @type {string}
+	         */
+	        this.type = visualType;
+
+	        /**
+	         * @readOnly
+	         * @type {string}
+	         */
+	        this.mappingMethod = mappingMethod;
+
+	        /**
+	         * @private
+	         * @type {Function}
+	         */
+	        this._normalizeData = normalizers[mappingMethod];
+
+	        var visualHandler = visualHandlers[visualType];
+
+	        /**
+	         * @public
+	         * @type {Function}
+	         */
+	        this.applyVisual = visualHandler.applyVisual;
+
+	        /**
+	         * @public
+	         * @type {Function}
+	         */
+	        this.getColorMapper = visualHandler.getColorMapper;
+
+	        /**
+	         * @private
+	         * @type {Function}
+	         */
+	        this._doMap = visualHandler._doMap[mappingMethod];
+
+	        if (mappingMethod === 'piecewise') {
+	            normalizeVisualRange(thisOption);
+	            preprocessForPiecewise(thisOption);
+	        }
+	        else if (mappingMethod === 'category') {
+	            thisOption.categories
+	                ? preprocessForSpecifiedCategory(thisOption)
+	                // categories is ordinal when thisOption.categories not specified,
+	                // which need no more preprocess except normalize visual.
+	                : normalizeVisualRange(thisOption, true);
+	        }
+	        else { // mappingMethod === 'linear' or 'fixed'
+	            zrUtil.assert(mappingMethod !== 'linear' || thisOption.dataExtent);
+	            normalizeVisualRange(thisOption);
+	        }
+	    };
+
+	    VisualMapping.prototype = {
+
+	        constructor: VisualMapping,
+
+	        mapValueToVisual: function (value) {
+	            var normalized = this._normalizeData(value);
+	            return this._doMap(normalized, value);
+	        },
+
+	        getNormalizer: function () {
+	            return zrUtil.bind(this._normalizeData, this);
+	        }
+	    };
+
+	    var visualHandlers = VisualMapping.visualHandlers = {
+
+	        color: {
+
+	            applyVisual: makeApplyVisual('color'),
+
+	            /**
+	             * Create a mapper function
+	             * @return {Function}
+	             */
+	            getColorMapper: function () {
+	                var thisOption = this.option;
+	                var parsedVisual = zrUtil.map(thisOption.visual, zrColor.parse);
+
+	                return zrUtil.bind(
+	                    thisOption.mappingMethod === 'category'
+	                        ? function (value, isNormalized) {
+	                            !isNormalized && (value = this._normalizeData(value));
+	                            return doMapCategory(this, value);
+	                        }
+	                        : function (value, isNormalized, out) {
+	                            // If output rgb array
+	                            // which will be much faster and useful in pixel manipulation
+	                            var returnRGBArray = !!out;
+	                            !isNormalized && (value = this._normalizeData(value));
+	                            out = zrColor.fastMapToColor(value, parsedVisual, out);
+	                            return returnRGBArray ? out : zrUtil.stringify(out, 'rgba');
+	                        },
+	                    this
+	                );
+	            },
+
+	            _doMap: {
+	                linear: function (normalized) {
+	                    return zrColor.mapToColor(normalized, this.option.visual);
+	                },
+	                category: doMapCategory,
+	                piecewise: function (normalized, value) {
+	                    var result = getSpecifiedVisual.call(this, value);
+	                    if (result == null) {
+	                        result = zrColor.mapToColor(normalized, this.option.visual);
+	                    }
+	                    return result;
+	                },
+	                fixed: doMapFixed
+	            }
+	        },
+
+	        colorHue: makePartialColorVisualHandler(function (color, value) {
+	            return zrColor.modifyHSL(color, value);
+	        }),
+
+	        colorSaturation: makePartialColorVisualHandler(function (color, value) {
+	            return zrColor.modifyHSL(color, null, value);
+	        }),
+
+	        colorLightness: makePartialColorVisualHandler(function (color, value) {
+	            return zrColor.modifyHSL(color, null, null, value);
+	        }),
+
+	        colorAlpha: makePartialColorVisualHandler(function (color, value) {
+	            return zrColor.modifyAlpha(color, value);
+	        }),
+
+	        opacity: {
+	            applyVisual: makeApplyVisual('opacity'),
+	            _doMap: makeDoMap([0, 1])
+	        },
+
+	        symbol: {
+	            applyVisual: function (value, getter, setter) {
+	                var symbolCfg = this.mapValueToVisual(value);
+	                if (zrUtil.isString(symbolCfg)) {
+	                    setter('symbol', symbolCfg);
+	                }
+	                else if (isObject(symbolCfg)) {
+	                    for (var name in symbolCfg) {
+	                        if (symbolCfg.hasOwnProperty(name)) {
+	                            setter(name, symbolCfg[name]);
+	                        }
+	                    }
+	                }
+	            },
+	            _doMap: {
+	                linear: doMapToArray,
+	                category: doMapCategory,
+	                piecewise: function (normalized, value) {
+	                    var result = getSpecifiedVisual.call(this, value);
+	                    if (result == null) {
+	                        result = doMapToArray.call(this, normalized);
+	                    }
+	                    return result;
+	                },
+	                fixed: doMapFixed
+	            }
+	        },
+
+	        symbolSize: {
+	            applyVisual: makeApplyVisual('symbolSize'),
+	            _doMap: makeDoMap([0, 1])
+	        }
+	    };
+
+
+	    function preprocessForPiecewise(thisOption) {
+	        var pieceList = thisOption.pieceList;
+	        thisOption.hasSpecialVisual = false;
+
+	        zrUtil.each(pieceList, function (piece, index) {
+	            piece.originIndex = index;
+	            // piece.visual is "result visual value" but not
+	            // a visual range, so it does not need to be normalized.
+	            if (piece.visual != null) {
+	                thisOption.hasSpecialVisual = true;
+	            }
+	        });
+	    }
+
+	    function preprocessForSpecifiedCategory(thisOption) {
+	        // Hash categories.
+	        var categories = thisOption.categories;
+	        var visual = thisOption.visual;
+
+	        var categoryMap = thisOption.categoryMap = {};
+	        each(categories, function (cate, index) {
+	            categoryMap[cate] = index;
+	        });
+
+	        // Process visual map input.
+	        if (!zrUtil.isArray(visual)) {
+	            var visualArr = [];
+
+	            if (zrUtil.isObject(visual)) {
+	                each(visual, function (v, cate) {
+	                    var index = categoryMap[cate];
+	                    visualArr[index != null ? index : CATEGORY_DEFAULT_VISUAL_INDEX] = v;
+	                });
+	            }
+	            else { // Is primary type, represents default visual.
+	                visualArr[CATEGORY_DEFAULT_VISUAL_INDEX] = visual;
+	            }
+
+	            visual = thisOption.visual = visualArr;
+	        }
+
+	        // Remove categories that has no visual,
+	        // then we can mapping them to CATEGORY_DEFAULT_VISUAL_INDEX.
+	        for (var i = categories.length - 1; i >= 0; i--) {
+	            if (visual[i] == null) {
+	                delete categoryMap[categories[i]];
+	                categories.pop();
+	            }
+	        }
+	    }
+
+	    function normalizeVisualRange(thisOption, isCategory) {
+	        var visual = thisOption.visual;
+	        var visualArr = [];
+
+	        if (zrUtil.isObject(visual)) {
+	            each(visual, function (v) {
+	                visualArr.push(v);
+	            });
+	        }
+	        else if (visual != null) {
+	            visualArr.push(visual);
+	        }
+
+	        var doNotNeedPair = {color: 1, symbol: 1};
+
+	        if (!isCategory
+	            && visualArr.length === 1
+	            && !(thisOption.type in doNotNeedPair)
+	        ) {
+	            // Do not care visualArr.length === 0, which is illegal.
+	            visualArr[1] = visualArr[0];
+	        }
+
+	        thisOption.visual = visualArr;
+	    }
+
+	    function makePartialColorVisualHandler(applyValue) {
+	        return {
+	            applyVisual: function (value, getter, setter) {
+	                value = this.mapValueToVisual(value);
+	                // Must not be array value
+	                setter('color', applyValue(getter('color'), value));
+	            },
+	            _doMap: makeDoMap([0, 1])
+	        };
+	    }
+
+	    function doMapToArray(arr, normalized) {
+	        var visual = this.option.visual;
+	        return visual[
+	            Math.round(linearMap(normalized, [0, 1], [0, visual.length - 1], true))
+	        ] || {};
+	    }
+
+	    function makeApplyVisual(visualType) {
+	        return function (value, getter, setter) {
+	            setter(visualType, this.mapValueToVisual(value));
+	        };
+	    }
+
+	    function doMapCategory(normalized) {
+	        var visual = this.option.visual;
+	        return visual[
+	            (this.option.loop && normalized !== CATEGORY_DEFAULT_VISUAL_INDEX)
+	                ? normalized % visual.length
+	                : normalized
+	        ];
+	    }
+
+	    function doMapFixed() {
+	        return this.option.visual[0];
+	    }
+
+	    function makeDoMap(sourceExtent) {
+	        return {
+	            linear: function (normalized) {
+	                return linearMap(normalized, sourceExtent, this.option.visual, true);
+	            },
+	            category: doMapCategory,
+	            piecewise: function (normalized, value) {
+	                var result = getSpecifiedVisual.call(this, value);
+	                if (result == null) {
+	                    result = linearMap(normalized, sourceExtent, this.option.visual, true);
+	                }
+	                return result;
+	            },
+	            fixed: doMapFixed
+	        };
+	    }
+
+	    function getSpecifiedVisual(value) {
+	        var thisOption = this.option;
+	        var pieceList = thisOption.pieceList;
+	        if (thisOption.hasSpecialVisual) {
+	            var pieceIndex = VisualMapping.findPieceIndex(value, pieceList);
+	            var piece = pieceList[pieceIndex];
+	            if (piece && piece.visual) {
+	                return piece.visual[this.type];
+	            }
+	        }
+	    }
+
+
+	    /**
+	     * Normalizers by mapping methods.
+	     */
+	    var normalizers = {
+
+	        linear: function (value) {
+	            return linearMap(value, this.option.dataExtent, [0, 1], true);
+	        },
+
+	        piecewise: function (value) {
+	            var pieceList = this.option.pieceList;
+	            var pieceIndex = VisualMapping.findPieceIndex(value, pieceList, true);
+	            if (pieceIndex != null) {
+	                return linearMap(pieceIndex, [0, pieceList.length - 1], [0, 1], true);
+	            }
+	        },
+
+	        category: function (value) {
+	            var index = this.option.categories
+	                ? this.option.categoryMap[value]
+	                : value; // ordinal
+	            return index == null ? CATEGORY_DEFAULT_VISUAL_INDEX : index;
+	        },
+
+	        fixed: zrUtil.noop
+	    };
+
+
+
+	    /**
+	     * @public
+	     */
+	    VisualMapping.addVisualHandler = function (name, handler) {
+	        visualHandlers[name] = handler;
+	    };
+
+	    /**
+	     * @public
+	     */
+	    VisualMapping.isValidType = function (visualType) {
+	        return visualHandlers.hasOwnProperty(visualType);
+	    };
+
+	    /**
+	     * Convinent method.
+	     * Visual can be Object or Array or primary type.
+	     *
+	     * @public
+	     */
+	    VisualMapping.eachVisual = function (visual, callback, context) {
+	        if (zrUtil.isObject(visual)) {
+	            zrUtil.each(visual, callback, context);
+	        }
+	        else {
+	            callback.call(context, visual);
+	        }
+	    };
+
+	    VisualMapping.mapVisual = function (visual, callback, context) {
+	        var isPrimary;
+	        var newVisual = zrUtil.isArray(visual)
+	            ? []
+	            : zrUtil.isObject(visual)
+	            ? {}
+	            : (isPrimary = true, null);
+
+	        VisualMapping.eachVisual(visual, function (v, key) {
+	            var newVal = callback.call(context, v, key);
+	            isPrimary ? (newVisual = newVal) : (newVisual[key] = newVal);
+	        });
+	        return newVisual;
+	    };
+
+	    /**
+	     * @public
+	     * @param {Object} obj
+	     * @return {Oject} new object containers visual values.
+	     *                 If no visuals, return null.
+	     */
+	    VisualMapping.retrieveVisuals = function (obj) {
+	        var ret = {};
+	        var hasVisual;
+
+	        obj && each(visualHandlers, function (h, visualType) {
+	            if (obj.hasOwnProperty(visualType)) {
+	                ret[visualType] = obj[visualType];
+	                hasVisual = true;
+	            }
+	        });
+
+	        return hasVisual ? ret : null;
+	    };
+
+	    /**
+	     * Give order to visual types, considering colorSaturation, colorAlpha depends on color.
+	     *
+	     * @public
+	     * @param {(Object|Array)} visualTypes If Object, like: {color: ..., colorSaturation: ...}
+	     *                                     IF Array, like: ['color', 'symbol', 'colorSaturation']
+	     * @return {Array.<string>} Sorted visual types.
+	     */
+	    VisualMapping.prepareVisualTypes = function (visualTypes) {
+	        if (isObject(visualTypes)) {
+	            var types = [];
+	            each(visualTypes, function (item, type) {
+	                types.push(type);
+	            });
+	            visualTypes = types;
+	        }
+	        else if (zrUtil.isArray(visualTypes)) {
+	            visualTypes = visualTypes.slice();
+	        }
+	        else {
+	            return [];
+	        }
+
+	        visualTypes.sort(function (type1, type2) {
+	            // color should be front of colorSaturation, colorAlpha, ...
+	            // symbol and symbolSize do not matter.
+	            return (type2 === 'color' && type1 !== 'color' && type1.indexOf('color') === 0)
+	                ? 1 : -1;
+	        });
+
+	        return visualTypes;
+	    };
+
+	    /**
+	     * 'color', 'colorSaturation', 'colorAlpha', ... are depends on 'color'.
+	     * Other visuals are only depends on themself.
+	     *
+	     * @public
+	     * @param {string} visualType1
+	     * @param {string} visualType2
+	     * @return {boolean}
+	     */
+	    VisualMapping.dependsOn = function (visualType1, visualType2) {
+	        return visualType2 === 'color'
+	            ? !!(visualType1 && visualType1.indexOf(visualType2) === 0)
+	            : visualType1 === visualType2;
+	    };
+
+	    /**
+	     * @param {number} value
+	     * @param {Array.<Object>} pieceList [{value: ..., interval: [min, max]}, ...]
+	     *                         Always from small to big.
+	     * @param {boolean} [findClosestWhenOutside=false]
+	     * @return {number} index
+	     */
+	    VisualMapping.findPieceIndex = function (value, pieceList, findClosestWhenOutside) {
+	        var possibleI;
+	        var abs = Infinity;
+
+	        // value has the higher priority.
+	        for (var i = 0, len = pieceList.length; i < len; i++) {
+	            var pieceValue = pieceList[i].value;
+	            if (pieceValue != null) {
+	                if (pieceValue === value) {
+	                    return i;
+	                }
+	                findClosestWhenOutside && updatePossible(pieceValue, i);
+	            }
+	        }
+
+	        for (var i = 0, len = pieceList.length; i < len; i++) {
+	            var piece = pieceList[i];
+	            var interval = piece.interval;
+	            var close = piece.close;
+
+	            if (interval) {
+	                if (interval[0] === -Infinity) {
+	                    if (littleThan(close[1], value, interval[1])) {
+	                        return i;
+	                    }
+	                }
+	                else if (interval[1] === Infinity) {
+	                    if (littleThan(close[0], interval[0], value)) {
+	                        return i;
+	                    }
+	                }
+	                else if (
+	                    littleThan(close[0], interval[0], value)
+	                    && littleThan(close[1], value, interval[1])
+	                ) {
+	                    return i;
+	                }
+	                findClosestWhenOutside && updatePossible(interval[0], i);
+	                findClosestWhenOutside && updatePossible(interval[1], i);
+	            }
+	        }
+
+	        if (findClosestWhenOutside) {
+	            return value === Infinity
+	                ? pieceList.length - 1
+	                : value === -Infinity
+	                ? 0
+	                : possibleI;
+	        }
+
+	        function updatePossible(val, index) {
+	            var newAbs = Math.abs(val - value);
+	            if (newAbs < abs) {
+	                abs = newAbs;
+	                possibleI = index;
+	            }
+	        }
+
+	    };
+
+	    function littleThan(close, a, b) {
+	        return close ? a <= b : a < b;
+	    }
+
+	    module.exports = VisualMapping;
+
+
+
+/***/ },
+/* 193 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+	    var numberUtil = __webpack_require__(7);
+	    var layout = __webpack_require__(21);
+	    var helper = __webpack_require__(187);
+	    var BoundingRect = __webpack_require__(9);
+	    var helper = __webpack_require__(187);
+
+	    var mathMax = Math.max;
+	    var mathMin = Math.min;
+	    var parsePercent = numberUtil.parsePercent;
+	    var retrieveValue = zrUtil.retrieve;
+	    var each = zrUtil.each;
+
+	    /**
+	     * @public
+	     */
+	    function update(ecModel, api, payload) {
+	        // Layout result in each node:
+	        // {x, y, width, height, area, borderWidth}
+	        var condition = {mainType: 'series', subType: 'treemap', query: payload};
+	        ecModel.eachComponent(condition, function (seriesModel) {
+
+	            var ecWidth = api.getWidth();
+	            var ecHeight = api.getHeight();
+	            var seriesOption = seriesModel.option;
+
+	            var size = seriesOption.size || []; // Compatible with ec2.
+	            var containerWidth = parsePercent(
+	                retrieveValue(seriesOption.width, size[0]),
+	                ecWidth
+	            );
+	            var containerHeight = parsePercent(
+	                retrieveValue(seriesOption.height, size[1]),
+	                ecHeight
+	            );
+
+	            var layoutInfo = layout.getLayoutRect(
+	                seriesModel.getBoxLayoutParams(),
+	                {
+	                    width: api.getWidth(),
+	                    height: api.getHeight()
+	                }
+	            );
+
+	            // Fetch payload info.
+	            var payloadType = payload && payload.type;
+	            var targetInfo = helper.retrieveTargetInfo(payload, seriesModel);
+	            var rootRect = (payloadType === 'treemapRender' || payloadType === 'treemapMove')
+	                ? payload.rootRect : null;
+	            var viewRoot = seriesModel.getViewRoot();
+	            var viewAbovePath = helper.getPathToRoot(viewRoot);
+
+	            if (payloadType !== 'treemapMove') {
+	                var rootSize = payloadType === 'treemapZoomToNode'
+	                    ? estimateRootSize(
+	                        seriesModel, targetInfo, viewRoot, containerWidth, containerHeight
+	                    )
+	                    : rootRect
+	                    ? [rootRect.width, rootRect.height]
+	                    : [containerWidth, containerHeight];
+
+	                var sort = seriesOption.sort;
+	                if (sort && sort !== 'asc' && sort !== 'desc') {
+	                    sort = 'desc';
+	                }
+	                var options = {
+	                    squareRatio: seriesOption.squareRatio,
+	                    sort: sort,
+	                    leafDepth: seriesOption.leafDepth
+	                };
+
+	                // layout should be cleared because using updateView but not update.
+	                viewRoot.hostTree.clearLayouts();
+
+	                // TODO
+	                // optimize: if out of view clip, do not layout.
+	                // But take care that if do not render node out of view clip,
+	                // how to calculate start po
+
+	                var viewRootLayout = {
+	                    x: 0, y: 0,
+	                    width: rootSize[0], height: rootSize[1],
+	                    area: rootSize[0] * rootSize[1]
+	                };
+	                viewRoot.setLayout(viewRootLayout);
+
+	                squarify(viewRoot, options, false, 0);
+	                // Supplement layout.
+	                var viewRootLayout = viewRoot.getLayout();
+	                each(viewAbovePath, function (node, index) {
+	                    var childValue = (viewAbovePath[index + 1] || viewRoot).getValue();
+	                    node.setLayout(zrUtil.extend(
+	                        {dataExtent: [childValue, childValue], borderWidth: 0},
+	                        viewRootLayout
+	                    ));
+	                });
+	            }
+
+	            var treeRoot = seriesModel.getData().tree.root;
+
+	            treeRoot.setLayout(
+	                calculateRootPosition(layoutInfo, rootRect, targetInfo),
+	                true
+	            );
+
+	            seriesModel.setLayoutInfo(layoutInfo);
+
+	            // FIXME
+	            // 现在没有clip功能，暂时取ec高宽。
+	            prunning(
+	                treeRoot,
+	                // Transform to base element coordinate system.
+	                new BoundingRect(-layoutInfo.x, -layoutInfo.y, ecWidth, ecHeight),
+	                viewAbovePath,
+	                viewRoot,
+	                0
+	            );
+	        });
+	    }
+
+	    /**
+	     * Layout treemap with squarify algorithm.
+	     * @see https://graphics.ethz.ch/teaching/scivis_common/Literature/squarifiedTreeMaps.pdf
+	     * @see https://github.com/mbostock/d3/blob/master/src/layout/treemap.js
+	     *
+	     * @protected
+	     * @param {module:echarts/data/Tree~TreeNode} node
+	     * @param {Object} options
+	     * @param {string} options.sort 'asc' or 'desc'
+	     * @param {number} options.squareRatio
+	     * @param {boolean} hideChildren
+	     * @param {number} depth
+	     */
+	    function squarify(node, options, hideChildren, depth) {
+	        var width;
+	        var height;
+
+	        if (node.isRemoved()) {
+	            return;
+	        }
+
+	        var thisLayout = node.getLayout();
+	        width = thisLayout.width;
+	        height = thisLayout.height;
+
+	        // Considering border and gap
+	        var itemStyleModel = node.getModel('itemStyle.normal');
+	        var borderWidth = itemStyleModel.get('borderWidth');
+	        var halfGapWidth = itemStyleModel.get('gapWidth') / 2;
+	        var layoutOffset = borderWidth - halfGapWidth;
+	        var nodeModel = node.getModel();
+
+	        node.setLayout({borderWidth: borderWidth}, true);
+
+	        width = mathMax(width - 2 * layoutOffset, 0);
+	        height = mathMax(height - 2 * layoutOffset, 0);
+
+	        var totalArea = width * height;
+	        var viewChildren = initChildren(
+	            node, nodeModel, totalArea, options, hideChildren, depth
+	        );
+
+	        if (!viewChildren.length) {
+	            return;
+	        }
+
+	        var rect = {x: layoutOffset, y: layoutOffset, width: width, height: height};
+	        var rowFixedLength = mathMin(width, height);
+	        var best = Infinity; // the best row score so far
+	        var row = [];
+	        row.area = 0;
+
+	        for (var i = 0, len = viewChildren.length; i < len;) {
+	            var child = viewChildren[i];
+
+	            row.push(child);
+	            row.area += child.getLayout().area;
+	            var score = worst(row, rowFixedLength, options.squareRatio);
+
+	            // continue with this orientation
+	            if (score <= best) {
+	                i++;
+	                best = score;
+	            }
+	            // abort, and try a different orientation
+	            else {
+	                row.area -= row.pop().getLayout().area;
+	                position(row, rowFixedLength, rect, halfGapWidth, false);
+	                rowFixedLength = mathMin(rect.width, rect.height);
+	                row.length = row.area = 0;
+	                best = Infinity;
+	            }
+	        }
+
+	        if (row.length) {
+	            position(row, rowFixedLength, rect, halfGapWidth, true);
+	        }
+
+	        if (!hideChildren) {
+	            var childrenVisibleMin = nodeModel.get('childrenVisibleMin');
+	            if (childrenVisibleMin != null && totalArea < childrenVisibleMin) {
+	                hideChildren = true;
+	            }
+	        }
+
+	        for (var i = 0, len = viewChildren.length; i < len; i++) {
+	            squarify(viewChildren[i], options, hideChildren, depth + 1);
+	        }
+	    }
+
+	    /**
+	     * Set area to each child, and calculate data extent for visual coding.
+	     */
+	    function initChildren(node, nodeModel, totalArea, options, hideChildren, depth) {
+	        var viewChildren = node.children || [];
+	        var orderBy = options.sort;
+	        orderBy !== 'asc' && orderBy !== 'desc' && (orderBy = null);
+
+	        var overLeafDepth = options.leafDepth != null && options.leafDepth <= depth;
+
+	        // leafDepth has higher priority.
+	        if (hideChildren && !overLeafDepth) {
+	            return (node.viewChildren = []);
+	        }
+
+	        // Sort children, order by desc.
+	        viewChildren = zrUtil.filter(viewChildren, function (child) {
+	            return !child.isRemoved();
+	        });
+
+	        sort(viewChildren, orderBy);
+
+	        var info = statistic(nodeModel, viewChildren, orderBy);
+
+	        if (info.sum === 0) {
+	            return (node.viewChildren = []);
+	        }
+
+	        info.sum = filterByThreshold(nodeModel, totalArea, info.sum, orderBy, viewChildren);
+
+	        if (info.sum === 0) {
+	            return (node.viewChildren = []);
+	        }
+
+	        // Set area to each child.
+	        for (var i = 0, len = viewChildren.length; i < len; i++) {
+	            var area = viewChildren[i].getValue() / info.sum * totalArea;
+	            // Do not use setLayout({...}, true), because it is needed to clear last layout.
+	            viewChildren[i].setLayout({area: area});
+	        }
+
+	        if (overLeafDepth) {
+	            viewChildren.length && node.setLayout({isLeafRoot: true}, true);
+	            viewChildren.length = 0;
+	        }
+
+	        node.viewChildren = viewChildren;
+	        node.setLayout({dataExtent: info.dataExtent}, true);
+
+	        return viewChildren;
+	    }
+
+	    /**
+	     * Consider 'visibleMin'. Modify viewChildren and get new sum.
+	     */
+	    function filterByThreshold(nodeModel, totalArea, sum, orderBy, orderedChildren) {
+
+	        // visibleMin is not supported yet when no option.sort.
+	        if (!orderBy) {
+	            return sum;
+	        }
+
+	        var visibleMin = nodeModel.get('visibleMin');
+	        var len = orderedChildren.length;
+	        var deletePoint = len;
+
+	        // Always travel from little value to big value.
+	        for (var i = len - 1; i >= 0; i--) {
+	            var value = orderedChildren[
+	                orderBy === 'asc' ? len - i - 1 : i
+	            ].getValue();
+
+	            if (value / sum * totalArea < visibleMin) {
+	                deletePoint = i;
+	                sum -= value;
+	            }
+	        }
+
+	        orderBy === 'asc'
+	            ? orderedChildren.splice(0, len - deletePoint)
+	            : orderedChildren.splice(deletePoint, len - deletePoint);
+
+	        return sum;
+	    }
+
+	    /**
+	     * Sort
+	     */
+	    function sort(viewChildren, orderBy) {
+	        if (orderBy) {
+	            viewChildren.sort(function (a, b) {
+	                return orderBy === 'asc'
+	                    ?  a.getValue() - b.getValue() : b.getValue() - a.getValue();
+	            });
+	        }
+	        return viewChildren;
+	    }
+
+	    /**
+	     * Statistic
+	     */
+	    function statistic(nodeModel, children, orderBy) {
+	        // Calculate sum.
+	        var sum = 0;
+	        for (var i = 0, len = children.length; i < len; i++) {
+	            sum += children[i].getValue();
+	        }
+
+	        // Statistic data extent for latter visual coding.
+	        // Notice: data extent should be calculate based on raw children
+	        // but not filtered view children, otherwise visual mapping will not
+	        // be stable when zoom (where children is filtered by visibleMin).
+
+	        var dimension = nodeModel.get('visualDimension');
+	        var dataExtent;
+
+	        // The same as area dimension.
+	        if (!children || !children.length) {
+	            dataExtent = [NaN, NaN];
+	        }
+	        else if (dimension === 'value' && orderBy) {
+	            dataExtent = [
+	                children[children.length - 1].getValue(),
+	                children[0].getValue()
+	            ];
+	            orderBy === 'asc' && dataExtent.reverse();
+	        }
+	        // Other dimension.
+	        else {
+	            var dataExtent = [Infinity, -Infinity];
+	            each(children, function (child) {
+	                var value = child.getValue(dimension);
+	                value < dataExtent[0] && (dataExtent[0] = value);
+	                value > dataExtent[1] && (dataExtent[1] = value);
+	            });
+	        }
+
+	        return {sum: sum, dataExtent: dataExtent};
+	    }
+
+	    /**
+	     * Computes the score for the specified row,
+	     * as the worst aspect ratio.
+	     */
+	    function worst(row, rowFixedLength, ratio) {
+	        var areaMax = 0;
+	        var areaMin = Infinity;
+
+	        for (var i = 0, area, len = row.length; i < len; i++) {
+	            area = row[i].getLayout().area;
+	            if (area) {
+	                area < areaMin && (areaMin = area);
+	                area > areaMax && (areaMax = area);
+	            }
+	        }
+
+	        var squareArea = row.area * row.area;
+	        var f = rowFixedLength * rowFixedLength * ratio;
+
+	        return squareArea
+	            ? mathMax(
+	                (f * areaMax) / squareArea,
+	                squareArea / (f * areaMin)
+	            )
+	            : Infinity;
+	    }
+
+	    /**
+	     * Positions the specified row of nodes. Modifies `rect`.
+	     */
+	    function position(row, rowFixedLength, rect, halfGapWidth, flush) {
+	        // When rowFixedLength === rect.width,
+	        // it is horizontal subdivision,
+	        // rowFixedLength is the width of the subdivision,
+	        // rowOtherLength is the height of the subdivision,
+	        // and nodes will be positioned from left to right.
+
+	        // wh[idx0WhenH] means: when horizontal,
+	        //      wh[idx0WhenH] => wh[0] => 'width'.
+	        //      xy[idx1WhenH] => xy[1] => 'y'.
+	        var idx0WhenH = rowFixedLength === rect.width ? 0 : 1;
+	        var idx1WhenH = 1 - idx0WhenH;
+	        var xy = ['x', 'y'];
+	        var wh = ['width', 'height'];
+
+	        var last = rect[xy[idx0WhenH]];
+	        var rowOtherLength = rowFixedLength
+	            ? row.area / rowFixedLength : 0;
+
+	        if (flush || rowOtherLength > rect[wh[idx1WhenH]]) {
+	            rowOtherLength = rect[wh[idx1WhenH]]; // over+underflow
+	        }
+	        for (var i = 0, rowLen = row.length; i < rowLen; i++) {
+	            var node = row[i];
+	            var nodeLayout = {};
+	            var step = rowOtherLength
+	                ? node.getLayout().area / rowOtherLength : 0;
+
+	            var wh1 = nodeLayout[wh[idx1WhenH]] = mathMax(rowOtherLength - 2 * halfGapWidth, 0);
+
+	            // We use Math.max/min to avoid negative width/height when considering gap width.
+	            var remain = rect[xy[idx0WhenH]] + rect[wh[idx0WhenH]] - last;
+	            var modWH = (i === rowLen - 1 || remain < step) ? remain : step;
+	            var wh0 = nodeLayout[wh[idx0WhenH]] = mathMax(modWH - 2 * halfGapWidth, 0);
+
+	            nodeLayout[xy[idx1WhenH]] = rect[xy[idx1WhenH]] + mathMin(halfGapWidth, wh1 / 2);
+	            nodeLayout[xy[idx0WhenH]] = last + mathMin(halfGapWidth, wh0 / 2);
+
+	            last += modWH;
+	            node.setLayout(nodeLayout, true);
+	        }
+
+	        rect[xy[idx1WhenH]] += rowOtherLength;
+	        rect[wh[idx1WhenH]] -= rowOtherLength;
+	    }
+
+	    // Return [containerWidth, containerHeight] as defualt.
+	    function estimateRootSize(seriesModel, targetInfo, viewRoot, containerWidth, containerHeight) {
+	        // If targetInfo.node exists, we zoom to the node,
+	        // so estimate whold width and heigth by target node.
+	        var currNode = (targetInfo || {}).node;
+	        var defaultSize = [containerWidth, containerHeight];
+
+	        if (!currNode || currNode === viewRoot) {
+	            return defaultSize;
+	        }
+
+	        var parent;
+	        var viewArea = containerWidth * containerHeight;
+	        var area = viewArea * seriesModel.option.zoomToNodeRatio;
+
+	        while (parent = currNode.parentNode) { // jshint ignore:line
+	            var sum = 0;
+	            var siblings = parent.children;
+
+	            for (var i = 0, len = siblings.length; i < len; i++) {
+	                sum += siblings[i].getValue();
+	            }
+	            var currNodeValue = currNode.getValue();
+	            if (currNodeValue === 0) {
+	                return defaultSize;
+	            }
+	            area *= sum / currNodeValue;
+
+	            var borderWidth = parent.getModel('itemStyle.normal').get('borderWidth');
+
+	            if (isFinite(borderWidth)) {
+	                // Considering border, suppose aspect ratio is 1.
+	                area += 4 * borderWidth * borderWidth + 4 * borderWidth * Math.pow(area, 0.5);
+	            }
+
+	            area > numberUtil.MAX_SAFE_INTEGER && (area = numberUtil.MAX_SAFE_INTEGER);
+
+	            currNode = parent;
+	        }
+
+	        area < viewArea && (area = viewArea);
+	        var scale = Math.pow(area / viewArea, 0.5);
+
+	        return [containerWidth * scale, containerHeight * scale];
+	    }
+
+	    // Root postion base on coord of containerGroup
+	    function calculateRootPosition(layoutInfo, rootRect, targetInfo) {
+	        if (rootRect) {
+	            return {x: rootRect.x, y: rootRect.y};
+	        }
+
+	        var defaultPosition = {x: 0, y: 0};
+	        if (!targetInfo) {
+	            return defaultPosition;
+	        }
+
+	        // If targetInfo is fetched by 'retrieveTargetInfo',
+	        // old tree and new tree are the same tree,
+	        // so the node still exists and we can visit it.
+
+	        var targetNode = targetInfo.node;
+	        var layout = targetNode.getLayout();
+
+	        if (!layout) {
+	            return defaultPosition;
+	        }
+
+	        // Transform coord from local to container.
+	        var targetCenter = [layout.width / 2, layout.height / 2];
+	        var node = targetNode;
+	        while (node) {
+	            var nodeLayout = node.getLayout();
+	            targetCenter[0] += nodeLayout.x;
+	            targetCenter[1] += nodeLayout.y;
+	            node = node.parentNode;
+	        }
+
+	        return {
+	            x: layoutInfo.width / 2 - targetCenter[0],
+	            y: layoutInfo.height / 2 - targetCenter[1]
+	        };
+	    }
+
+	    // Mark nodes visible for prunning when visual coding and rendering.
+	    // Prunning depends on layout and root position, so we have to do it after layout.
+	    function prunning(node, clipRect, viewAbovePath, viewRoot, depth) {
+	        var nodeLayout = node.getLayout();
+	        var nodeInViewAbovePath = viewAbovePath[depth];
+	        var isAboveViewRoot = nodeInViewAbovePath && nodeInViewAbovePath === node;
+
+	        if (
+	            (nodeInViewAbovePath && !isAboveViewRoot)
+	            || (depth === viewAbovePath.length && node !== viewRoot)
+	        ) {
+	            return;
+	        }
+
+	        node.setLayout({
+	            // isInView means: viewRoot sub tree + viewAbovePath
+	            isInView: true,
+	            // invisible only means: outside view clip so that the node can not
+	            // see but still layout for animation preparation but not render.
+	            invisible: !isAboveViewRoot && !clipRect.intersect(nodeLayout),
+	            isAboveViewRoot: isAboveViewRoot
+	        }, true);
+
+	        // Transform to child coordinate.
+	        var childClipRect = new BoundingRect(
+	            clipRect.x - nodeLayout.x,
+	            clipRect.y - nodeLayout.y,
+	            clipRect.width,
+	            clipRect.height
+	        );
+
+	        each(node.viewChildren || [], function (child) {
+	            prunning(child, childClipRect, viewAbovePath, viewRoot, depth + 1);
+	        });
+	    }
+
+	    module.exports = update;
+
+
+/***/ },
+/* 194 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var echarts = __webpack_require__(1);
+	    var zrUtil = __webpack_require__(4);
+
+	    __webpack_require__(195);
+	    __webpack_require__(198);
+
+	    __webpack_require__(203);
+
+	    echarts.registerProcessor(__webpack_require__(204));
+
+	    echarts.registerVisual(zrUtil.curry(
+	        __webpack_require__(109), 'graph', 'circle', null
+	    ));
+	    echarts.registerVisual(__webpack_require__(205));
+	    echarts.registerVisual(__webpack_require__(206));
+
+	    echarts.registerLayout(__webpack_require__(207));
+	    echarts.registerLayout(__webpack_require__(210));
+	    echarts.registerLayout(__webpack_require__(212));
+
+	    // Graph view coordinate system
+	    echarts.registerCoordinateSystem('graphView', {
+	        create: __webpack_require__(214)
+	    });
+
+
+/***/ },
+/* 195 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var List = __webpack_require__(97);
+	    var zrUtil = __webpack_require__(4);
+	    var modelUtil = __webpack_require__(5);
+	    var Model = __webpack_require__(12);
+
+	    var createGraphFromNodeEdge = __webpack_require__(196);
+
+	    var GraphSeries = __webpack_require__(1).extendSeriesModel({
+
+	        type: 'series.graph',
+
+	        init: function (option) {
+	            GraphSeries.superApply(this, 'init', arguments);
+
+	            // Provide data for legend select
+	            this.legendDataProvider = function () {
+	                return this._categoriesData;
+	            };
+
+	            this.fillDataTextStyle(option.edges || option.links);
+
+	            this._updateCategoriesData();
+	        },
+
+	        mergeOption: function (option) {
+	            GraphSeries.superApply(this, 'mergeOption', arguments);
+
+	            this.fillDataTextStyle(option.edges || option.links);
+
+	            this._updateCategoriesData();
+	        },
+
+	        mergeDefaultAndTheme: function (option) {
+	            GraphSeries.superApply(this, 'mergeDefaultAndTheme', arguments);
+	            modelUtil.defaultEmphasis(option.edgeLabel, modelUtil.LABEL_OPTIONS);
+	        },
+
+	        getInitialData: function (option, ecModel) {
+	            var edges = option.edges || option.links || [];
+	            var nodes = option.data || option.nodes || [];
+	            var self = this;
+
+	            if (nodes && edges) {
+	                return createGraphFromNodeEdge(nodes, edges, this, true, beforeLink).data;
+	            }
+
+	            function beforeLink(nodeData, edgeData) {
+	                // Overwrite nodeData.getItemModel to
+	                nodeData.wrapMethod('getItemModel', function (model) {
+	                    var categoriesModels = self._categoriesModels;
+	                    var categoryIdx = model.getShallow('category');
+	                    var categoryModel = categoriesModels[categoryIdx];
+	                    if (categoryModel) {
+	                        categoryModel.parentModel = model.parentModel;
+	                        model.parentModel = categoryModel;
+	                    }
+	                    return model;
+	                });
+
+	                var edgeLabelModel = self.getModel('edgeLabel');
+	                var wrappedGetEdgeModel = function (path, parentModel) {
+	                    var pathArr = (path || '').split('.');
+	                    if (pathArr[0] === 'label') {
+	                        parentModel = parentModel
+	                            || edgeLabelModel.getModel(pathArr.slice(1));
+	                    }
+	                    var model = Model.prototype.getModel.call(this, pathArr, parentModel);
+	                    model.getModel = wrappedGetEdgeModel;
+	                    return model;
+	                };
+	                edgeData.wrapMethod('getItemModel', function (model) {
+	                    // FIXME Wrap get method ?
+	                    model.getModel = wrappedGetEdgeModel;
+	                    return model;
+	                });
+	            }
+	        },
+
+	        /**
+	         * @return {module:echarts/data/Graph}
+	         */
+	        getGraph: function () {
+	            return this.getData().graph;
+	        },
+
+	        /**
+	         * @return {module:echarts/data/List}
+	         */
+	        getEdgeData: function () {
+	            return this.getGraph().edgeData;
+	        },
+
+	        /**
+	         * @return {module:echarts/data/List}
+	         */
+	        getCategoriesData: function () {
+	            return this._categoriesData;
+	        },
+
+	        /**
+	         * @override
+	         */
+	        formatTooltip: function (dataIndex, multipleSeries, dataType) {
+	            if (dataType === 'edge') {
+	                var nodeData = this.getData();
+	                var params = this.getDataParams(dataIndex, dataType);
+	                var edge = nodeData.graph.getEdgeByIndex(dataIndex);
+	                var sourceName = nodeData.getName(edge.node1.dataIndex);
+	                var targetName = nodeData.getName(edge.node2.dataIndex);
+	                var html = sourceName + ' > ' + targetName;
+	                if (params.value) {
+	                    html += ' : ' + params.value;
+	                }
+	                return html;
+	            }
+	            else { // dataType === 'node' or empty
+	                return GraphSeries.superApply(this, 'formatTooltip', arguments);
+	            }
+	        },
+
+	        _updateCategoriesData: function () {
+	            var categories = zrUtil.map(this.option.categories || [], function (category) {
+	                // Data must has value
+	                return category.value != null ? category : zrUtil.extend({
+	                    value: 0
+	                }, category);
+	            });
+	            var categoriesData = new List(['value'], this);
+	            categoriesData.initData(categories);
+
+	            this._categoriesData = categoriesData;
+
+	            this._categoriesModels = categoriesData.mapArray(function (idx) {
+	                return categoriesData.getItemModel(idx, true);
+	            });
+	        },
+
+	        setZoom: function (zoom) {
+	            this.option.zoom = zoom;
+	        },
+
+	        setCenter: function (center) {
+	            this.option.center = center;
+	        },
+
+	        defaultOption: {
+	            zlevel: 0,
+	            z: 2,
+
+	            coordinateSystem: 'view',
+
+	            // Default option for all coordinate systems
+	            xAxisIndex: 0,
+	            yAxisIndex: 0,
+	            polarIndex: 0,
+	            geoIndex: 0,
+
+	            legendHoverLink: true,
+
+	            hoverAnimation: true,
+
+	            layout: null,
+
+	            focusNodeAdjacency: false,
+
+	            // Configuration of force
+	            force: {
+	                initLayout: null,
+	                repulsion: 50,
+	                gravity: 0.1,
+	                edgeLength: 30,
+
+	                layoutAnimation: true
+	            },
+
+	            left: 'center',
+	            top: 'center',
+	            // right: null,
+	            // bottom: null,
+	            // width: '80%',
+	            // height: '80%',
+
+	            symbol: 'circle',
+	            symbolSize: 10,
+
+	            edgeSymbol: ['none', 'none'],
+	            edgeSymbolSize: 10,
+	            edgeLabel: {
+	                normal: {
+	                    position: 'middle'
+	                },
+	                emphasis: {}
+	            },
+
+	            draggable: false,
+
+	            roam: false,
+
+	            // Default on center of graph
+	            center: null,
+
+	            zoom: 1,
+	            // Symbol size scale ratio in roam
+	            nodeScaleRatio: 0.6,
+
+	            // categories: [],
+
+	            // data: []
+	            // Or
+	            // nodes: []
+	            //
+	            // links: []
+	            // Or
+	            // edges: []
+
+	            label: {
+	                normal: {
+	                    show: false,
+	                    formatter: '{b}'
+	                },
+	                emphasis: {
+	                    show: true
+	                }
+	            },
+
+	            itemStyle: {
+	                normal: {},
+	                emphasis: {}
+	            },
+
+	            lineStyle: {
+	                normal: {
+	                    color: '#aaa',
+	                    width: 1,
+	                    curveness: 0,
+	                    opacity: 0.5
+	                },
+	                emphasis: {}
+	            }
+	        }
+	    });
+
+	    module.exports = GraphSeries;
+
+
+/***/ },
+/* 196 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var List = __webpack_require__(97);
+	    var Graph = __webpack_require__(197);
+	    var linkList = __webpack_require__(185);
+	    var completeDimensions = __webpack_require__(102);
+	    var CoordinateSystem = __webpack_require__(26);
+	    var zrUtil = __webpack_require__(4);
+	    var createListFromArray = __webpack_require__(101);
+
+	    module.exports = function (nodes, edges, hostModel, directed, beforeLink) {
+	        var graph = new Graph(directed);
+	        for (var i = 0; i < nodes.length; i++) {
+	            graph.addNode(zrUtil.retrieve(
+	                // Id, name, dataIndex
+	                nodes[i].id, nodes[i].name, i
+	            ), i);
+	        }
+
+	        var linkNameList = [];
+	        var validEdges = [];
+	        for (var i = 0; i < edges.length; i++) {
+	            var link = edges[i];
+	            var source = link.source;
+	            var target = link.target;
+	            // addEdge may fail when source or target not exists
+	            if (graph.addEdge(source, target, i)) {
+	                validEdges.push(link);
+	                linkNameList.push(zrUtil.retrieve(link.id, source + ' > ' + target));
+	            }
+	        }
+
+	        var coordSys = hostModel.get('coordinateSystem');
+	        var nodeData;
+	        if (coordSys === 'cartesian2d' || coordSys === 'polar') {
+	            nodeData = createListFromArray(nodes, hostModel, hostModel.ecModel);
+	        }
+	        else {
+	            // FIXME
+	            var coordSysCtor = CoordinateSystem.get(coordSys);
+	            // FIXME
+	            var dimensionNames = completeDimensions(
+	                ((coordSysCtor && coordSysCtor.type !== 'view') ? (coordSysCtor.dimensions || []) : []).concat(['value']),
+	                nodes
+	            );
+	            nodeData = new List(dimensionNames, hostModel);
+	            nodeData.initData(nodes);
+	        }
+
+	        var edgeData = new List(['value'], hostModel);
+	        edgeData.initData(validEdges, linkNameList);
+
+	        beforeLink && beforeLink(nodeData, edgeData);
+
+	        linkList({
+	            mainData: nodeData,
+	            struct: graph,
+	            structAttr: 'graph',
+	            datas: {node: nodeData, edge: edgeData},
+	            datasAttr: {node: 'data', edge: 'edgeData'}
+	        });
+
+	        // Update dataIndex of nodes and edges because invalid edge may be removed
+	        graph.update();
+
+	        return graph;
+	    };
+
+
+/***/ },
+/* 197 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+	/**
+	 * Graph data structure
+	 *
+	 * @module echarts/data/Graph
+	 * @author Yi Shen(https://www.github.com/pissang)
+	 */
+
+
+	    var zrUtil = __webpack_require__(4);
+
+	    /**
+	     * @alias module:echarts/data/Graph
+	     * @constructor
+	     * @param {boolean} directed
+	     */
+	    var Graph = function(directed) {
+	        /**
+	         * 是否是有向图
+	         * @type {boolean}
+	         * @private
+	         */
+	        this._directed = directed || false;
+
+	        /**
+	         * @type {Array.<module:echarts/data/Graph.Node>}
+	         * @readOnly
+	         */
+	        this.nodes = [];
+
+	        /**
+	         * @type {Array.<module:echarts/data/Graph.Edge>}
+	         * @readOnly
+	         */
+	        this.edges = [];
+
+	        /**
+	         * @type {Object.<string, module:echarts/data/Graph.Node>}
+	         * @private
+	         */
+	        this._nodesMap = {};
+	        /**
+	         * @type {Object.<string, module:echarts/data/Graph.Edge>}
+	         * @private
+	         */
+	        this._edgesMap = {};
+
+	        /**
+	         * @type {module:echarts/data/List}
+	         * @readOnly
+	         */
+	        this.data;
+
+	        /**
+	         * @type {module:echarts/data/List}
+	         * @readOnly
+	         */
+	        this.edgeData;
+	    };
+
+	    var graphProto = Graph.prototype;
+	    /**
+	     * @type {string}
+	     */
+	    graphProto.type = 'graph';
+
+	    /**
+	     * If is directed graph
+	     * @return {boolean}
+	     */
+	    graphProto.isDirected = function () {
+	        return this._directed;
+	    };
+
+	    /**
+	     * Add a new node
+	     * @param {string} id
+	     * @param {number} [dataIndex]
+	     */
+	    graphProto.addNode = function (id, dataIndex) {
+	        id = id || ('' + dataIndex);
+
+	        var nodesMap = this._nodesMap;
+
+	        if (nodesMap[id]) {
+	            return;
+	        }
+
+	        var node = new Node(id, dataIndex);
+	        node.hostGraph = this;
+
+	        this.nodes.push(node);
+
+	        nodesMap[id] = node;
+	        return node;
+	    };
+
+	    /**
+	     * Get node by data index
+	     * @param  {number} dataIndex
+	     * @return {module:echarts/data/Graph~Node}
+	     */
+	    graphProto.getNodeByIndex = function (dataIndex) {
+	        var rawIdx = this.data.getRawIndex(dataIndex);
+	        return this.nodes[rawIdx];
+	    };
+	    /**
+	     * Get node by id
+	     * @param  {string} id
+	     * @return {module:echarts/data/Graph.Node}
+	     */
+	    graphProto.getNodeById = function (id) {
+	        return this._nodesMap[id];
+	    };
+
+	    /**
+	     * Add a new edge
+	     * @param {number|string|module:echarts/data/Graph.Node} n1
+	     * @param {number|string|module:echarts/data/Graph.Node} n2
+	     * @param {number} [dataIndex=-1]
+	     * @return {module:echarts/data/Graph.Edge}
+	     */
+	    graphProto.addEdge = function (n1, n2, dataIndex) {
+	        var nodesMap = this._nodesMap;
+	        var edgesMap = this._edgesMap;
+
+	        // PNEDING
+	        if (typeof n1 === 'number') {
+	            n1 = this.nodes[n1];
+	        }
+	        if (typeof n2 === 'number') {
+	            n2 = this.nodes[n2];
+	        }
+
+	        if (!(n1 instanceof Node)) {
+	            n1 = nodesMap[n1];
+	        }
+	        if (!(n2 instanceof Node)) {
+	            n2 = nodesMap[n2];
+	        }
+	        if (!n1 || !n2) {
+	            return;
+	        }
+
+	        var key = n1.id + '-' + n2.id;
+	        // PENDING
+	        if (edgesMap[key]) {
+	            return;
+	        }
+
+	        var edge = new Edge(n1, n2, dataIndex);
+	        edge.hostGraph = this;
+
+	        if (this._directed) {
+	            n1.outEdges.push(edge);
+	            n2.inEdges.push(edge);
+	        }
+	        n1.edges.push(edge);
+	        if (n1 !== n2) {
+	            n2.edges.push(edge);
+	        }
+
+	        this.edges.push(edge);
+	        edgesMap[key] = edge;
+
+	        return edge;
+	    };
+
+	    /**
+	     * Get edge by data index
+	     * @param  {number} dataIndex
+	     * @return {module:echarts/data/Graph~Node}
+	     */
+	    graphProto.getEdgeByIndex = function (dataIndex) {
+	        var rawIdx = this.edgeData.getRawIndex(dataIndex);
+	        return this.edges[rawIdx];
+	    };
+	    /**
+	     * Get edge by two linked nodes
+	     * @param  {module:echarts/data/Graph.Node|string} n1
+	     * @param  {module:echarts/data/Graph.Node|string} n2
+	     * @return {module:echarts/data/Graph.Edge}
+	     */
+	    graphProto.getEdge = function (n1, n2) {
+	        if (n1 instanceof Node) {
+	            n1 = n1.id;
+	        }
+	        if (n2 instanceof Node) {
+	            n2 = n2.id;
+	        }
+
+	        var edgesMap = this._edgesMap;
+
+	        if (this._directed) {
+	            return edgesMap[n1 + '-' + n2];
+	        } else {
+	            return edgesMap[n1 + '-' + n2]
+	                || edgesMap[n2 + '-' + n1];
+	        }
+	    };
+
+	    /**
+	     * Iterate all nodes
+	     * @param  {Function} cb
+	     * @param  {*} [context]
+	     */
+	    graphProto.eachNode = function (cb, context) {
+	        var nodes = this.nodes;
+	        var len = nodes.length;
+	        for (var i = 0; i < len; i++) {
+	            if (nodes[i].dataIndex >= 0) {
+	                cb.call(context, nodes[i], i);
+	            }
+	        }
+	    };
+
+	    /**
+	     * Iterate all edges
+	     * @param  {Function} cb
+	     * @param  {*} [context]
+	     */
+	    graphProto.eachEdge = function (cb, context) {
+	        var edges = this.edges;
+	        var len = edges.length;
+	        for (var i = 0; i < len; i++) {
+	            if (edges[i].dataIndex >= 0
+	                && edges[i].node1.dataIndex >= 0
+	                && edges[i].node2.dataIndex >= 0
+	            ) {
+	                cb.call(context, edges[i], i);
+	            }
+	        }
+	    };
+
+	    /**
+	     * Breadth first traverse
+	     * @param {Function} cb
+	     * @param {module:echarts/data/Graph.Node} startNode
+	     * @param {string} [direction='none'] 'none'|'in'|'out'
+	     * @param {*} [context]
+	     */
+	    graphProto.breadthFirstTraverse = function (
+	        cb, startNode, direction, context
+	    ) {
+	        if (!(startNode instanceof Node)) {
+	            startNode = this._nodesMap[startNode];
+	        }
+	        if (!startNode) {
+	            return;
+	        }
+
+	        var edgeType = direction === 'out'
+	            ? 'outEdges' : (direction === 'in' ? 'inEdges' : 'edges');
+
+	        for (var i = 0; i < this.nodes.length; i++) {
+	            this.nodes[i].__visited = false;
+	        }
+
+	        if (cb.call(context, startNode, null)) {
+	            return;
+	        }
+
+	        var queue = [startNode];
+	        while (queue.length) {
+	            var currentNode = queue.shift();
+	            var edges = currentNode[edgeType];
+
+	            for (var i = 0; i < edges.length; i++) {
+	                var e = edges[i];
+	                var otherNode = e.node1 === currentNode
+	                    ? e.node2 : e.node1;
+	                if (!otherNode.__visited) {
+	                    if (cb.call(otherNode, otherNode, currentNode)) {
+	                        // Stop traversing
+	                        return;
+	                    }
+	                    queue.push(otherNode);
+	                    otherNode.__visited = true;
+	                }
+	            }
+	        }
+	    };
+
+	    // TODO
+	    // graphProto.depthFirstTraverse = function (
+	    //     cb, startNode, direction, context
+	    // ) {
+
+	    // };
+
+	    // Filter update
+	    graphProto.update = function () {
+	        var data = this.data;
+	        var edgeData = this.edgeData;
+	        var nodes = this.nodes;
+	        var edges = this.edges;
+
+	        for (var i = 0, len = nodes.length; i < len; i++) {
+	            nodes[i].dataIndex = -1;
+	        }
+	        for (var i = 0, len = data.count(); i < len; i++) {
+	            nodes[data.getRawIndex(i)].dataIndex = i;
+	        }
+
+	        edgeData.filterSelf(function (idx) {
+	            var edge = edges[edgeData.getRawIndex(idx)];
+	            return edge.node1.dataIndex >= 0 && edge.node2.dataIndex >= 0;
+	        });
+
+	        // Update edge
+	        for (var i = 0, len = edges.length; i < len; i++) {
+	            edges[i].dataIndex = -1;
+	        }
+	        for (var i = 0, len = edgeData.count(); i < len; i++) {
+	            edges[edgeData.getRawIndex(i)].dataIndex = i;
+	        }
+	    };
+
+	    /**
+	     * @return {module:echarts/data/Graph}
+	     */
+	    graphProto.clone = function () {
+	        var graph = new Graph(this._directed);
+	        var nodes = this.nodes;
+	        var edges = this.edges;
+	        for (var i = 0; i < nodes.length; i++) {
+	            graph.addNode(nodes[i].id, nodes[i].dataIndex);
+	        }
+	        for (var i = 0; i < edges.length; i++) {
+	            var e = edges[i];
+	            graph.addEdge(e.node1.id, e.node2.id, e.dataIndex);
+	        }
+	        return graph;
+	    };
+
+
+	    /**
+	     * @alias module:echarts/data/Graph.Node
+	     */
+	    function Node(id, dataIndex) {
+	        /**
+	        * @type {string}
+	        */
+	        this.id = id == null ? '' : id;
+
+	        /**
+	        * @type {Array.<module:echarts/data/Graph.Edge>}
+	        */
+	        this.inEdges = [];
+	        /**
+	        * @type {Array.<module:echarts/data/Graph.Edge>}
+	        */
+	        this.outEdges = [];
+	        /**
+	        * @type {Array.<module:echarts/data/Graph.Edge>}
+	        */
+	        this.edges = [];
+	        /**
+	         * @type {module:echarts/data/Graph}
+	         */
+	        this.hostGraph;
+
+	        /**
+	         * @type {number}
+	         */
+	        this.dataIndex = dataIndex == null ? -1 : dataIndex;
+	    }
+
+	    Node.prototype = {
+
+	        constructor: Node,
+
+	        /**
+	         * @return {number}
+	         */
+	        degree: function () {
+	            return this.edges.length;
+	        },
+
+	        /**
+	         * @return {number}
+	         */
+	        inDegree: function () {
+	            return this.inEdges.length;
+	        },
+
+	        /**
+	        * @return {number}
+	        */
+	        outDegree: function () {
+	            return this.outEdges.length;
+	        },
+
+	        /**
+	         * @param {string} [path]
+	         * @return {module:echarts/model/Model}
+	         */
+	        getModel: function (path) {
+	            if (this.dataIndex < 0) {
+	                return;
+	            }
+	            var graph = this.hostGraph;
+	            var itemModel = graph.data.getItemModel(this.dataIndex);
+
+	            return itemModel.getModel(path);
+	        }
+	    };
+
+	    /**
+	     * 图边
+	     * @alias module:echarts/data/Graph.Edge
+	     * @param {module:echarts/data/Graph.Node} n1
+	     * @param {module:echarts/data/Graph.Node} n2
+	     * @param {number} [dataIndex=-1]
+	     */
+	    function Edge(n1, n2, dataIndex) {
+
+	        /**
+	         * 节点1，如果是有向图则为源节点
+	         * @type {module:echarts/data/Graph.Node}
+	         */
+	        this.node1 = n1;
+
+	        /**
+	         * 节点2，如果是有向图则为目标节点
+	         * @type {module:echarts/data/Graph.Node}
+	         */
+	        this.node2 = n2;
+
+	        this.dataIndex = dataIndex == null ? -1 : dataIndex;
+	    }
+
+	    /**
+	     * @param {string} [path]
+	     * @return {module:echarts/model/Model}
+	     */
+	     Edge.prototype.getModel = function (path) {
+	        if (this.dataIndex < 0) {
+	            return;
+	        }
+	        var graph = this.hostGraph;
+	        var itemModel = graph.edgeData.getItemModel(this.dataIndex);
+
+	        return itemModel.getModel(path);
+	    };
+
+	    var createGraphDataProxyMixin = function (hostName, dataName) {
+	        return {
+	            /**
+	             * @param {string=} [dimension='value'] Default 'value'. can be 'a', 'b', 'c', 'd', 'e'.
+	             * @return {number}
+	             */
+	            getValue: function (dimension) {
+	                var data = this[hostName][dataName];
+	                return data.get(data.getDimension(dimension || 'value'), this.dataIndex);
+	            },
+
+	            /**
+	             * @param {Object|string} key
+	             * @param {*} [value]
+	             */
+	            setVisual: function (key, value) {
+	                this.dataIndex >= 0
+	                    && this[hostName][dataName].setItemVisual(this.dataIndex, key, value);
+	            },
+
+	            /**
+	             * @param {string} key
+	             * @return {boolean}
+	             */
+	            getVisual: function (key, ignoreParent) {
+	                return this[hostName][dataName].getItemVisual(this.dataIndex, key, ignoreParent);
+	            },
+
+	            /**
+	             * @param {Object} layout
+	             * @return {boolean} [merge=false]
+	             */
+	            setLayout: function (layout, merge) {
+	                this.dataIndex >= 0
+	                    && this[hostName][dataName].setItemLayout(this.dataIndex, layout, merge);
+	            },
+
+	            /**
+	             * @return {Object}
+	             */
+	            getLayout: function () {
+	                return this[hostName][dataName].getItemLayout(this.dataIndex);
+	            },
+
+	            /**
+	             * @return {module:zrender/Element}
+	             */
+	            getGraphicEl: function () {
+	                return this[hostName][dataName].getItemGraphicEl(this.dataIndex);
+	            },
+
+	            /**
+	             * @return {number}
+	             */
+	            getRawIndex: function () {
+	                return this[hostName][dataName].getRawIndex(this.dataIndex);
+	            }
+	        };
+	    };
+
+	    zrUtil.mixin(Node, createGraphDataProxyMixin('hostGraph', 'data'));
+	    zrUtil.mixin(Edge, createGraphDataProxyMixin('hostGraph', 'edgeData'));
+
+	    Graph.Node = Node;
+	    Graph.Edge = Edge;
+
+	    module.exports = Graph;
+
+
+/***/ },
+/* 198 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+
+	    var SymbolDraw = __webpack_require__(104);
+	    var LineDraw = __webpack_require__(199);
+	    var RoamController = __webpack_require__(174);
+
+	    var graphic = __webpack_require__(43);
+	    var adjustEdge = __webpack_require__(202);
+	    var zrUtil = __webpack_require__(4);
+
+	    var nodeOpacityPath = ['itemStyle', 'normal', 'opacity'];
+	    var lineOpacityPath = ['lineStyle', 'normal', 'opacity'];
+
+	    function getItemOpacity(item, opacityPath) {
+	        return item.getVisual('opacity') || item.getModel().get(opacityPath);
+	    }
+
+	    __webpack_require__(1).extendChartView({
+
+	        type: 'graph',
+
+	        init: function (ecModel, api) {
+	            var symbolDraw = new SymbolDraw();
+	            var lineDraw = new LineDraw();
+	            var group = this.group;
+
+	            var controller = new RoamController(api.getZr(), group);
+
+	            group.add(symbolDraw.group);
+	            group.add(lineDraw.group);
+
+	            this._symbolDraw = symbolDraw;
+	            this._lineDraw = lineDraw;
+	            this._controller = controller;
+
+	            this._firstRender = true;
+	        },
+
+	        render: function (seriesModel, ecModel, api) {
+	            var coordSys = seriesModel.coordinateSystem;
+
+	            this._model = seriesModel;
+	            this._nodeScaleRatio = seriesModel.get('nodeScaleRatio');
+
+	            var symbolDraw = this._symbolDraw;
+	            var lineDraw = this._lineDraw;
+
+	            var group = this.group;
+
+	            if (coordSys.type === 'view') {
+	                var groupNewProp = {
+	                    position: coordSys.position,
+	                    scale: coordSys.scale
+	                };
+	                if (this._firstRender) {
+	                    group.attr(groupNewProp);
+	                }
+	                else {
+	                    graphic.updateProps(group, groupNewProp, seriesModel);
+	                }
+	            }
+	            // Fix edge contact point with node
+	            adjustEdge(seriesModel.getGraph(), this._getNodeGlobalScale(seriesModel));
+
+	            var data = seriesModel.getData();
+	            symbolDraw.updateData(data);
+
+	            var edgeData = seriesModel.getEdgeData();
+	            lineDraw.updateData(edgeData);
+
+	            this._updateNodeAndLinkScale();
+
+	            this._updateController(seriesModel, api);
+
+	            clearTimeout(this._layoutTimeout);
+	            var forceLayout = seriesModel.forceLayout;
+	            var layoutAnimation = seriesModel.get('force.layoutAnimation');
+	            if (forceLayout) {
+	                this._startForceLayoutIteration(forceLayout, layoutAnimation);
+	            }
+	            data.eachItemGraphicEl(function (el, idx) {
+	                var itemModel = data.getItemModel(idx);
+	                // Update draggable
+	                el.off('drag').off('dragend');
+	                var draggable = data.getItemModel(idx).get('draggable');
+	                if (draggable) {
+	                    el.on('drag', function () {
+	                        if (forceLayout) {
+	                            forceLayout.warmUp();
+	                            !this._layouting
+	                                && this._startForceLayoutIteration(forceLayout, layoutAnimation);
+	                            forceLayout.setFixed(idx);
+	                            // Write position back to layout
+	                            data.setItemLayout(idx, el.position);
+	                        }
+	                    }, this).on('dragend', function () {
+	                        if (forceLayout) {
+	                            forceLayout.setUnfixed(idx);
+	                        }
+	                    }, this);
+	                }
+	                el.setDraggable(draggable && forceLayout);
+
+	                el.off('mouseover', this._focusNodeAdjacency);
+	                el.off('mouseout', this._unfocusAll);
+	                if (itemModel.get('focusNodeAdjacency')) {
+	                    el.on('mouseover', this._focusNodeAdjacency, this);
+	                    el.on('mouseout', this._unfocusAll, this);
+	                }
+	            }, this);
+
+	            this._firstRender = false;
+	        },
+
+	        _focusNodeAdjacency: function (e) {
+	            var data = this._model.getData();
+	            var graph = data.graph;
+	            var el = e.target;
+	            var dataIndex = el.dataIndex;
+	            var dataType = el.dataType;
+
+	            function fadeOutItem(item, opacityPath) {
+	                var opacity = getItemOpacity(item, opacityPath);
+	                var el = item.getGraphicEl();
+	                if (opacity == null) {
+	                    opacity = 1;
+	                }
+
+	                el.traverse(function (child) {
+	                    child.trigger('normal');
+	                    if (child.type !== 'group') {
+	                        child.setStyle('opacity', opacity * 0.1);
+	                    }
+	                });
+	            }
+
+	            function fadeInItem(item, opacityPath) {
+	                var opacity = getItemOpacity(item, opacityPath);
+	                var el = item.getGraphicEl();
+
+	                el.traverse(function (child) {
+	                    child.trigger('emphasis');
+	                    if (child.type !== 'group') {
+	                        child.setStyle('opacity', opacity);
+	                    }
+	                });
+	            }
+	            if (dataIndex !== null && dataType !== 'edge') {
+	                graph.eachNode(function (node) {
+	                    fadeOutItem(node, nodeOpacityPath);
+	                });
+	                graph.eachEdge(function (edge) {
+	                    fadeOutItem(edge, lineOpacityPath);
+	                });
+
+	                var node = graph.getNodeByIndex(dataIndex);
+	                fadeInItem(node, nodeOpacityPath);
+	                zrUtil.each(node.edges, function (edge) {
+	                    if (edge.dataIndex < 0) {
+	                        return;
+	                    }
+	                    fadeInItem(edge, lineOpacityPath);
+	                    fadeInItem(edge.node1, nodeOpacityPath);
+	                    fadeInItem(edge.node2, nodeOpacityPath);
+	                });
+	            }
+	        },
+
+	        _unfocusAll: function () {
+	            var data = this._model.getData();
+	            var graph = data.graph;
+	            graph.eachNode(function (node) {
+	                var opacity = getItemOpacity(node, nodeOpacityPath);
+	                node.getGraphicEl().traverse(function (child) {
+	                    child.trigger('normal');
+	                    if (child.type !== 'group') {
+	                        child.setStyle('opacity', opacity);
+	                    }
+	                });
+	            });
+	            graph.eachEdge(function (edge) {
+	                var opacity = getItemOpacity(edge, lineOpacityPath);
+	                edge.getGraphicEl().traverse(function (child) {
+	                    child.trigger('normal');
+	                    if (child.type !== 'group') {
+	                        child.setStyle('opacity', opacity);
+	                    }
+	                });
+	            });
+	        },
+
+	        _startForceLayoutIteration: function (forceLayout, layoutAnimation) {
+	            var self = this;
+	            (function step() {
+	                forceLayout.step(function (stopped) {
+	                    self.updateLayout(self._model);
+	                    (self._layouting = !stopped) && (
+	                        layoutAnimation
+	                            ? (self._layoutTimeout = setTimeout(step, 16))
+	                            : step()
+	                    );
+	                });
+	            })();
+	        },
+
+	        _updateController: function (seriesModel, api) {
+	            var controller = this._controller;
+	            var group = this.group;
+	            controller.rectProvider = function () {
+	                var rect = group.getBoundingRect();
+	                rect.applyTransform(group.transform);
+	                return rect;
+	            };
+	            if (seriesModel.coordinateSystem.type !== 'view') {
+	                controller.disable();
+	                return;
+	            }
+	            controller.enable(seriesModel.get('roam'));
+	            controller.zoomLimit = seriesModel.get('scaleLimit');
+	            // Update zoom from model
+	            controller.zoom = seriesModel.coordinateSystem.getZoom();
+
+	            controller
+	                .off('pan')
+	                .off('zoom')
+	                .on('pan', function (dx, dy) {
+	                    api.dispatchAction({
+	                        seriesId: seriesModel.id,
+	                        type: 'graphRoam',
+	                        dx: dx,
+	                        dy: dy
+	                    });
+	                })
+	                .on('zoom', function (zoom, mouseX, mouseY) {
+	                    api.dispatchAction({
+	                        seriesId: seriesModel.id,
+	                        type: 'graphRoam',
+	                        zoom:  zoom,
+	                        originX: mouseX,
+	                        originY: mouseY
+	                    });
+	                    this._updateNodeAndLinkScale();
+	                    adjustEdge(seriesModel.getGraph(), this._getNodeGlobalScale(seriesModel));
+	                    this._lineDraw.updateLayout();
+	                }, this);
+	        },
+
+	        _updateNodeAndLinkScale: function () {
+	            var seriesModel = this._model;
+	            var data = seriesModel.getData();
+
+	            var nodeScale = this._getNodeGlobalScale(seriesModel);
+	            var invScale = [nodeScale, nodeScale];
+
+	            data.eachItemGraphicEl(function (el, idx) {
+	                el.attr('scale', invScale);
+	            });
+	        },
+
+	        _getNodeGlobalScale: function (seriesModel) {
+	            var coordSys = seriesModel.coordinateSystem;
+	            if (coordSys.type !== 'view') {
+	                return 1;
+	            }
+
+	            var nodeScaleRatio = this._nodeScaleRatio;
+
+	            var groupScale = coordSys.scale;
+	            var groupZoom = (groupScale && groupScale[0]) || 1;
+	            // Scale node when zoom changes
+	            var roamZoom = coordSys.getZoom();
+	            var nodeScale = (roamZoom - 1) * nodeScaleRatio + 1;
+
+	            return nodeScale / groupZoom;
+	        },
+
+	        updateLayout: function (seriesModel) {
+	            adjustEdge(seriesModel.getGraph(), this._getNodeGlobalScale(seriesModel));
+
+	            this._symbolDraw.updateLayout();
+	            this._lineDraw.updateLayout();
+	        },
+
+	        remove: function (ecModel, api) {
+	            this._symbolDraw && this._symbolDraw.remove();
+	            this._lineDraw && this._lineDraw.remove();
+	        }
+	    });
+
+
+/***/ },
+/* 199 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @module echarts/chart/helper/LineDraw
+	 */
+
+
+	    var graphic = __webpack_require__(43);
+	    var LineGroup = __webpack_require__(200);
+
+
+	    function isPointNaN(pt) {
+	        return isNaN(pt[0]) || isNaN(pt[1]);
+	    }
+	    function lineNeedsDraw(pts) {
+	        return !isPointNaN(pts[0]) && !isPointNaN(pts[1]);
+	    }
+	    /**
+	     * @alias module:echarts/component/marker/LineDraw
+	     * @constructor
+	     */
+	    function LineDraw(ctor) {
+	        this._ctor = ctor || LineGroup;
+	        this.group = new graphic.Group();
+	    }
+
+	    var lineDrawProto = LineDraw.prototype;
+
+	    /**
+	     * @param {module:echarts/data/List} lineData
+	     */
+	    lineDrawProto.updateData = function (lineData) {
+
+	        var oldLineData = this._lineData;
+	        var group = this.group;
+	        var LineCtor = this._ctor;
+
+	        var hostModel = lineData.hostModel;
+
+	        var seriesScope = {
+	            lineStyle: hostModel.getModel('lineStyle.normal').getLineStyle(),
+	            hoverLineStyle: hostModel.getModel('lineStyle.emphasis').getLineStyle(),
+	            labelModel: hostModel.getModel('label.normal'),
+	            hoverLabelModel: hostModel.getModel('label.emphasis')
+	        };
+
+	        lineData.diff(oldLineData)
+	            .add(function (idx) {
+	                if (!lineNeedsDraw(lineData.getItemLayout(idx))) {
+	                    return;
+	                }
+	                var lineGroup = new LineCtor(lineData, idx, seriesScope);
+
+	                lineData.setItemGraphicEl(idx, lineGroup);
+
+	                group.add(lineGroup);
+	            })
+	            .update(function (newIdx, oldIdx) {
+	                var lineGroup = oldLineData.getItemGraphicEl(oldIdx);
+	                if (!lineNeedsDraw(lineData.getItemLayout(newIdx))) {
+	                    group.remove(lineGroup);
+	                    return;
+	                }
+
+	                if (!lineGroup) {
+	                    lineGroup = new LineCtor(lineData, newIdx, seriesScope);
+	                }
+	                else {
+	                    lineGroup.updateData(lineData, newIdx, seriesScope);
+	                }
+
+	                lineData.setItemGraphicEl(newIdx, lineGroup);
+
+	                group.add(lineGroup);
+	            })
+	            .remove(function (idx) {
+	                group.remove(oldLineData.getItemGraphicEl(idx));
+	            })
+	            .execute();
+
+	        this._lineData = lineData;
+	    };
+
+	    lineDrawProto.updateLayout = function () {
+	        var lineData = this._lineData;
+	        lineData.eachItemGraphicEl(function (el, idx) {
+	            el.updateLayout(lineData, idx);
+	        }, this);
+	    };
+
+	    lineDrawProto.remove = function () {
+	        this.group.removeAll();
+	    };
+
+	    module.exports = LineDraw;
+
+
+/***/ },
+/* 200 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @module echarts/chart/helper/Line
+	 */
+
+
+	    var symbolUtil = __webpack_require__(106);
+	    var vector = __webpack_require__(10);
+	    // var matrix = require('zrender/lib/core/matrix');
+	    var LinePath = __webpack_require__(201);
+	    var graphic = __webpack_require__(43);
+	    var zrUtil = __webpack_require__(4);
+	    var numberUtil = __webpack_require__(7);
+
+	    var SYMBOL_CATEGORIES = ['fromSymbol', 'toSymbol'];
+	    function makeSymbolTypeKey(symbolCategory) {
+	        return '_' + symbolCategory + 'Type';
+	    }
+	    /**
+	     * @inner
+	     */
+	    function createSymbol(name, lineData, idx) {
+	        var color = lineData.getItemVisual(idx, 'color');
+	        var symbolType = lineData.getItemVisual(idx, name);
+	        var symbolSize = lineData.getItemVisual(idx, name + 'Size');
+
+	        if (!symbolType || symbolType === 'none') {
+	            return;
+	        }
+
+	        if (!zrUtil.isArray(symbolSize)) {
+	            symbolSize = [symbolSize, symbolSize];
+	        }
+	        var symbolPath = symbolUtil.createSymbol(
+	            symbolType, -symbolSize[0] / 2, -symbolSize[1] / 2,
+	            symbolSize[0], symbolSize[1], color
+	        );
+	        symbolPath.name = name;
+
+	        return symbolPath;
+	    }
+
+	    function createLine(points) {
+	        var line = new LinePath({
+	            name: 'line'
+	        });
+	        setLinePoints(line.shape, points);
+	        return line;
+	    }
+
+	    function setLinePoints(targetShape, points) {
+	        var p1 = points[0];
+	        var p2 = points[1];
+	        var cp1 = points[2];
+	        targetShape.x1 = p1[0];
+	        targetShape.y1 = p1[1];
+	        targetShape.x2 = p2[0];
+	        targetShape.y2 = p2[1];
+	        targetShape.percent = 1;
+
+	        if (cp1) {
+	            targetShape.cpx1 = cp1[0];
+	            targetShape.cpy1 = cp1[1];
+	        }
+	    }
+
+	    function updateSymbolAndLabelBeforeLineUpdate () {
+	        var lineGroup = this;
+	        var symbolFrom = lineGroup.childOfName('fromSymbol');
+	        var symbolTo = lineGroup.childOfName('toSymbol');
+	        var label = lineGroup.childOfName('label');
+	        // Quick reject
+	        if (!symbolFrom && !symbolTo && label.ignore) {
+	            return;
+	        }
+
+	        var invScale = 1;
+	        var parentNode = this.parent;
+	        while (parentNode) {
+	            if (parentNode.scale) {
+	                invScale /= parentNode.scale[0];
+	            }
+	            parentNode = parentNode.parent;
+	        }
+
+	        var line = lineGroup.childOfName('line');
+	        // If line not changed
+	        // FIXME Parent scale changed
+	        if (!this.__dirty && !line.__dirty) {
+	            return;
+	        }
+
+	        var percent = line.shape.percent;
+	        var fromPos = line.pointAt(0);
+	        var toPos = line.pointAt(percent);
+
+	        var d = vector.sub([], toPos, fromPos);
+	        vector.normalize(d, d);
+
+	        if (symbolFrom) {
+	            symbolFrom.attr('position', fromPos);
+	            var tangent = line.tangentAt(0);
+	            symbolFrom.attr('rotation', Math.PI / 2 - Math.atan2(
+	                tangent[1], tangent[0]
+	            ));
+	            symbolFrom.attr('scale', [invScale * percent, invScale * percent]);
+	        }
+	        if (symbolTo) {
+	            symbolTo.attr('position', toPos);
+	            var tangent = line.tangentAt(1);
+	            symbolTo.attr('rotation', -Math.PI / 2 - Math.atan2(
+	                tangent[1], tangent[0]
+	            ));
+	            symbolTo.attr('scale', [invScale * percent, invScale * percent]);
+	        }
+
+	        if (!label.ignore) {
+	            label.attr('position', toPos);
+
+	            var textPosition;
+	            var textAlign;
+	            var textVerticalAlign;
+
+	            var distance = 5 * invScale;
+	            // End
+	            if (label.__position === 'end') {
+	                textPosition = [d[0] * distance + toPos[0], d[1] * distance + toPos[1]];
+	                textAlign = d[0] > 0.8 ? 'left' : (d[0] < -0.8 ? 'right' : 'center');
+	                textVerticalAlign = d[1] > 0.8 ? 'top' : (d[1] < -0.8 ? 'bottom' : 'middle');
+	            }
+	            // Middle
+	            else if (label.__position === 'middle') {
+	                var halfPercent = percent / 2;
+	                var tangent = line.tangentAt(halfPercent);
+	                var n = [tangent[1], -tangent[0]];
+	                var cp = line.pointAt(halfPercent);
+	                if (n[1] > 0) {
+	                    n[0] = -n[0];
+	                    n[1] = -n[1];
+	                }
+	                textPosition = [cp[0] + n[0] * distance, cp[1] + n[1] * distance];
+	                textAlign = 'center';
+	                textVerticalAlign = 'bottom';
+	                var rotation = -Math.atan2(tangent[1], tangent[0]);
+	                if (toPos[0] < fromPos[0]) {
+	                    rotation = Math.PI + rotation;
+	                }
+	                label.attr('rotation', rotation);
+	            }
+	            // Start
+	            else {
+	                textPosition = [-d[0] * distance + fromPos[0], -d[1] * distance + fromPos[1]];
+	                textAlign = d[0] > 0.8 ? 'right' : (d[0] < -0.8 ? 'left' : 'center');
+	                textVerticalAlign = d[1] > 0.8 ? 'bottom' : (d[1] < -0.8 ? 'top' : 'middle');
+	            }
+	            label.attr({
+	                style: {
+	                    // Use the user specified text align and baseline first
+	                    textVerticalAlign: label.__verticalAlign || textVerticalAlign,
+	                    textAlign: label.__textAlign || textAlign
+	                },
+	                position: textPosition,
+	                scale: [invScale, invScale]
+	            });
+	        }
+	    }
+
+	    /**
+	     * @constructor
+	     * @extends {module:zrender/graphic/Group}
+	     * @alias {module:echarts/chart/helper/Line}
+	     */
+	    function Line(lineData, idx, seriesScope) {
+	        graphic.Group.call(this);
+
+	        this._createLine(lineData, idx, seriesScope);
+	    }
+
+	    var lineProto = Line.prototype;
+
+	    // Update symbol position and rotation
+	    lineProto.beforeUpdate = updateSymbolAndLabelBeforeLineUpdate;
+
+	    lineProto._createLine = function (lineData, idx, seriesScope) {
+	        var seriesModel = lineData.hostModel;
+	        var linePoints = lineData.getItemLayout(idx);
+
+	        var line = createLine(linePoints);
+	        line.shape.percent = 0;
+	        graphic.initProps(line, {
+	            shape: {
+	                percent: 1
+	            }
+	        }, seriesModel, idx);
+
+	        this.add(line);
+
+	        var label = new graphic.Text({
+	            name: 'label'
+	        });
+	        this.add(label);
+
+	        zrUtil.each(SYMBOL_CATEGORIES, function (symbolCategory) {
+	            var symbol = createSymbol(symbolCategory, lineData, idx);
+	            // symbols must added after line to make sure
+	            // it will be updated after line#update.
+	            // Or symbol position and rotation update in line#beforeUpdate will be one frame slow
+	            this.add(symbol);
+	            this[makeSymbolTypeKey(symbolCategory)] = lineData.getItemVisual(idx, symbolCategory);
+	        }, this);
+
+	        this._updateCommonStl(lineData, idx, seriesScope);
+	    };
+
+	    lineProto.updateData = function (lineData, idx, seriesScope) {
+	        var seriesModel = lineData.hostModel;
+
+	        var line = this.childOfName('line');
+	        var linePoints = lineData.getItemLayout(idx);
+	        var target = {
+	            shape: {}
+	        };
+	        setLinePoints(target.shape, linePoints);
+	        graphic.updateProps(line, target, seriesModel, idx);
+
+	        zrUtil.each(SYMBOL_CATEGORIES, function (symbolCategory) {
+	            var symbolType = lineData.getItemVisual(idx, symbolCategory);
+	            var key = makeSymbolTypeKey(symbolCategory);
+	            // Symbol changed
+	            if (this[key] !== symbolType) {
+	                this.remove(this.childOfName(symbolCategory));
+	                var symbol = createSymbol(symbolCategory, lineData, idx);
+	                this.add(symbol);
+	            }
+	            this[key] = symbolType;
+	        }, this);
+
+	        this._updateCommonStl(lineData, idx, seriesScope);
+	    };
+
+	    lineProto._updateCommonStl = function (lineData, idx, seriesScope) {
+	        var seriesModel = lineData.hostModel;
+
+	        var line = this.childOfName('line');
+
+	        var lineStyle = seriesScope && seriesScope.lineStyle;
+	        var hoverLineStyle = seriesScope && seriesScope.hoverLineStyle;
+	        var labelModel = seriesScope && seriesScope.labelModel;
+	        var hoverLabelModel = seriesScope && seriesScope.hoverLabelModel;
+
+	        // Optimization for large dataset
+	        if (!seriesScope || lineData.hasItemOption) {
+	            var itemModel = lineData.getItemModel(idx);
+
+	            lineStyle = itemModel.getModel('lineStyle.normal').getLineStyle();
+	            hoverLineStyle = itemModel.getModel('lineStyle.emphasis').getLineStyle();
+
+	            labelModel = itemModel.getModel('label.normal');
+	            hoverLabelModel = itemModel.getModel('label.emphasis');
+	        }
+
+	        var visualColor = lineData.getItemVisual(idx, 'color');
+	        if (isNaN(defaultText)) {
+	            // Use name
+	            defaultText = lineData.getName(idx);
+	        }
+	        line.useStyle(zrUtil.defaults(
+	            {
+	                strokeNoScale: true,
+	                fill: 'none',
+	                stroke: visualColor
+	            },
+	            lineStyle
+	        ));
+	        line.hoverStyle = hoverLineStyle;
+
+	        var showLabel = labelModel.getShallow('show');
+	        var hoverShowLabel = hoverLabelModel.getShallow('show');
+	        var defaultText;
+	        var label = this.childOfName('label');
+	        var defaultLabelColor;
+	        if (showLabel || hoverShowLabel) {
+	            defaultText = numberUtil.round(seriesModel.getRawValue(idx));
+	            defaultLabelColor = visualColor || '#000';
+	        }
+	        // label.afterUpdate = lineAfterUpdate;
+	        if (showLabel) {
+	            var textStyleModel = labelModel.getModel('textStyle');
+	            label.setStyle({
+	                text: zrUtil.retrieve(
+	                        seriesModel.getFormattedLabel(idx, 'normal', lineData.dataType),
+	                        defaultText
+	                    ),
+	                textFont: textStyleModel.getFont(),
+	                fill: textStyleModel.getTextColor() || defaultLabelColor
+	            });
+
+	            label.__textAlign = textStyleModel.get('align');
+	            label.__verticalAlign = textStyleModel.get('baseline');
+	            label.__position = labelModel.get('position');
+	        }
+	        else {
+	            label.setStyle('text', '');
+	        }
+	        if (hoverShowLabel) {
+	            var textStyleHoverModel = hoverLabelModel.getModel('textStyle');
+
+	            label.hoverStyle = {
+	                text: zrUtil.retrieve(
+	                        seriesModel.getFormattedLabel(idx, 'emphasis', lineData.dataType),
+	                        defaultText
+	                    ),
+	                textFont: textStyleHoverModel.getFont(),
+	                fill: textStyleHoverModel.getTextColor() || defaultLabelColor
+	            };
+	        }
+	        else {
+	            label.hoverStyle = {
+	                text: ''
+	            };
+	        }
+
+	        label.ignore = !showLabel && !hoverShowLabel;
+
+	        graphic.setHoverStyle(this);
+	    };
+
+	    lineProto.updateLayout = function (lineData, idx) {
+	        this.setLinePoints(lineData.getItemLayout(idx));
+	    };
+
+	    lineProto.setLinePoints = function (points) {
+	        var linePath = this.childOfName('line');
+	        setLinePoints(linePath.shape, points);
+	        linePath.dirty();
+	    };
+
+	    zrUtil.inherits(Line, graphic.Group);
+
+	    module.exports = Line;
+
+
+/***/ },
+/* 201 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * Line path for bezier and straight line draw
+	 */
+
+	    var graphic = __webpack_require__(43);
+	    var vec2 = __webpack_require__(10);
+
+	    var straightLineProto = graphic.Line.prototype;
+	    var bezierCurveProto = graphic.BezierCurve.prototype;
+
+	    function isLine(shape) {
+	        return shape.cpx1 == null || shape.cpy1 == null;
+	    }
+
+	    module.exports = graphic.extendShape({
+
+	        type: 'ec-line',
+
+	        style: {
+	            stroke: '#000',
+	            fill: null
+	        },
+
+	        shape: {
+	            x1: 0,
+	            y1: 0,
+	            x2: 0,
+	            y2: 0,
+	            percent: 1,
+	            cpx1: null,
+	            cpy1: null
+	        },
+
+	        buildPath: function (ctx, shape) {
+	            (isLine(shape) ? straightLineProto : bezierCurveProto).buildPath(ctx, shape);
+	        },
+
+	        pointAt: function (t) {
+	            return isLine(this.shape)
+	                ? straightLineProto.pointAt.call(this, t)
+	                : bezierCurveProto.pointAt.call(this, t);
+	        },
+
+	        tangentAt: function (t) {
+	            var shape = this.shape;
+	            var p = isLine(shape)
+	                ? [shape.x2 - shape.x1, shape.y2 - shape.y1]
+	                : bezierCurveProto.tangentAt.call(this, t);
+	            return vec2.normalize(p, p);
+	        }
+	    });
+
+
+/***/ },
+/* 202 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var curveTool = __webpack_require__(50);
+	    var vec2 = __webpack_require__(10);
+
+	    var v1 = [];
+	    var v2 = [];
+	    var v3 = [];
+	    var quadraticAt = curveTool.quadraticAt;
+	    var v2DistSquare = vec2.distSquare;
+	    var mathAbs = Math.abs;
+	    function intersectCurveCircle(curvePoints, center, radius) {
+	        var p0 = curvePoints[0];
+	        var p1 = curvePoints[1];
+	        var p2 = curvePoints[2];
+
+	        var d = Infinity;
+	        var t;
+	        var radiusSquare = radius * radius;
+	        var interval = 0.1;
+
+	        for (var _t = 0.1; _t <= 0.9; _t += 0.1) {
+	            v1[0] = quadraticAt(p0[0], p1[0], p2[0], _t);
+	            v1[1] = quadraticAt(p0[1], p1[1], p2[1], _t);
+	            var diff = mathAbs(v2DistSquare(v1, center) - radiusSquare);
+	            if (diff < d) {
+	                d = diff;
+	                t = _t;
+	            }
+	        }
+
+	        // Assume the segment is monotone，Find root through Bisection method
+	        // At most 32 iteration
+	        for (var i = 0; i < 32; i++) {
+	            // var prev = t - interval;
+	            var next = t + interval;
+	            // v1[0] = quadraticAt(p0[0], p1[0], p2[0], prev);
+	            // v1[1] = quadraticAt(p0[1], p1[1], p2[1], prev);
+	            v2[0] = quadraticAt(p0[0], p1[0], p2[0], t);
+	            v2[1] = quadraticAt(p0[1], p1[1], p2[1], t);
+	            v3[0] = quadraticAt(p0[0], p1[0], p2[0], next);
+	            v3[1] = quadraticAt(p0[1], p1[1], p2[1], next);
+
+	            var diff = v2DistSquare(v2, center) - radiusSquare;
+	            if (mathAbs(diff) < 1e-2) {
+	                break;
+	            }
+
+	            // var prevDiff = v2DistSquare(v1, center) - radiusSquare;
+	            var nextDiff = v2DistSquare(v3, center) - radiusSquare;
+
+	            interval /= 2;
+	            if (diff < 0) {
+	                if (nextDiff >= 0) {
+	                    t = t + interval;
+	                }
+	                else {
+	                    t = t - interval;
+	                }
+	            }
+	            else {
+	                if (nextDiff >= 0) {
+	                    t = t - interval;
+	                }
+	                else {
+	                    t = t + interval;
+	                }
+	            }
+	        }
+
+	        return t;
+	    }
+	    // Adjust edge to avoid
+	    module.exports = function (graph, scale) {
+	        var tmp0 = [];
+	        var quadraticSubdivide = curveTool.quadraticSubdivide;
+	        var pts = [[], [], []];
+	        var pts2 = [[], []];
+	        var v = [];
+	        scale /= 2;
+
+	        graph.eachEdge(function (edge, idx) {
+	            var linePoints = edge.getLayout();
+	            var fromSymbol = edge.getVisual('fromSymbol');
+	            var toSymbol = edge.getVisual('toSymbol');
+
+	            if (!linePoints.__original) {
+	                linePoints.__original = [
+	                    vec2.clone(linePoints[0]),
+	                    vec2.clone(linePoints[1])
+	                ];
+	                if (linePoints[2]) {
+	                    linePoints.__original.push(vec2.clone(linePoints[2]));
+	                }
+	            }
+	            var originalPoints = linePoints.__original;
+	            // Quadratic curve
+	            if (linePoints[2] != null) {
+	                vec2.copy(pts[0], originalPoints[0]);
+	                vec2.copy(pts[1], originalPoints[2]);
+	                vec2.copy(pts[2], originalPoints[1]);
+	                if (fromSymbol && fromSymbol != 'none') {
+	                    var symbolSize = edge.node1.getVisual('symbolSize');
+	                    if (symbolSize instanceof Array) {
+	                        symbolSize = (symbolSize[0] + symbolSize[1]) / 2;
+	                    }
+	                    var t = intersectCurveCircle(pts, originalPoints[0], symbolSize * scale);
+	                    // Subdivide and get the second
+	                    quadraticSubdivide(pts[0][0], pts[1][0], pts[2][0], t, tmp0);
+	                    pts[0][0] = tmp0[3];
+	                    pts[1][0] = tmp0[4];
+	                    quadraticSubdivide(pts[0][1], pts[1][1], pts[2][1], t, tmp0);
+	                    pts[0][1] = tmp0[3];
+	                    pts[1][1] = tmp0[4];
+	                }
+	                if (toSymbol && toSymbol != 'none') {
+	                    var symbolSize = edge.node1.getVisual('symbolSize');
+	                    if (symbolSize instanceof Array) {
+	                        symbolSize = (symbolSize[0] + symbolSize[1]) / 2;
+	                    }
+	                    var t = intersectCurveCircle(pts, originalPoints[1], symbolSize * scale);
+	                    // Subdivide and get the first
+	                    quadraticSubdivide(pts[0][0], pts[1][0], pts[2][0], t, tmp0);
+	                    pts[1][0] = tmp0[1];
+	                    pts[2][0] = tmp0[2];
+	                    quadraticSubdivide(pts[0][1], pts[1][1], pts[2][1], t, tmp0);
+	                    pts[1][1] = tmp0[1];
+	                    pts[2][1] = tmp0[2];
+	                }
+	                // Copy back to layout
+	                vec2.copy(linePoints[0], pts[0]);
+	                vec2.copy(linePoints[1], pts[2]);
+	                vec2.copy(linePoints[2], pts[1]);
+	            }
+	            // Line
+	            else {
+	                vec2.copy(pts2[0], originalPoints[0]);
+	                vec2.copy(pts2[1], originalPoints[1]);
+
+	                vec2.sub(v, pts2[1], pts2[0]);
+	                vec2.normalize(v, v);
+	                if (fromSymbol && fromSymbol != 'none') {
+	                    vec2.scaleAndAdd(pts2[0], pts2[0], v, edge.node1.getVisual('symbolSize') * scale);
+	                }
+	                if (toSymbol && toSymbol != 'none') {
+	                    vec2.scaleAndAdd(pts2[1], pts2[1], v, -edge.node2.getVisual('symbolSize') * scale);
+	                }
+	                vec2.copy(linePoints[0], pts2[0]);
+	                vec2.copy(linePoints[1], pts2[1]);
+	            }
+	        });
+	    };
+
+
+/***/ },
+/* 203 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var echarts = __webpack_require__(1);
+	    var roamHelper = __webpack_require__(177);
+
+	    var actionInfo = {
+	        type: 'graphRoam',
+	        event: 'graphRoam',
+	        update: 'none'
+	    };
+
+	    /**
+	     * @payload
+	     * @property {string} name Series name
+	     * @property {number} [dx]
+	     * @property {number} [dy]
+	     * @property {number} [zoom]
+	     * @property {number} [originX]
+	     * @property {number} [originY]
+	     */
+
+	    echarts.registerAction(actionInfo, function (payload, ecModel) {
+	        ecModel.eachComponent({mainType: 'series', query: payload}, function (seriesModel) {
+	            var coordSys = seriesModel.coordinateSystem;
+
+	            var res = roamHelper.updateCenterAndZoom(coordSys, payload);
+
+	            seriesModel.setCenter
+	                && seriesModel.setCenter(res.center);
+
+	            seriesModel.setZoom
+	                && seriesModel.setZoom(res.zoom);
+	        });
+	    });
+
+
+/***/ },
+/* 204 */
+/***/ function(module, exports) {
+
+	
+
+	    module.exports = function (ecModel) {
+	        var legendModels = ecModel.findComponents({
+	            mainType: 'legend'
+	        });
+	        if (!legendModels || !legendModels.length) {
+	            return;
+	        }
+	        ecModel.eachSeriesByType('graph', function (graphSeries) {
+	            var categoriesData = graphSeries.getCategoriesData();
+	            var graph = graphSeries.getGraph();
+	            var data = graph.data;
+
+	            var categoryNames = categoriesData.mapArray(categoriesData.getName);
+
+	            data.filterSelf(function (idx) {
+	                var model = data.getItemModel(idx);
+	                var category = model.getShallow('category');
+	                if (category != null) {
+	                    if (typeof category === 'number') {
+	                        category = categoryNames[category];
+	                    }
+	                    // If in any legend component the status is not selected.
+	                    for (var i = 0; i < legendModels.length; i++) {
+	                        if (!legendModels[i].isSelected(category)) {
+	                            return false;
+	                        }
+	                    }
+	                }
+	                return true;
+	            });
+	        }, this);
+	    };
+
+
+/***/ },
+/* 205 */
+/***/ function(module, exports) {
+
+	
+
+	    module.exports = function (ecModel) {
+	        ecModel.eachSeriesByType('graph', function (seriesModel) {
+	            var categoriesData = seriesModel.getCategoriesData();
+	            var data = seriesModel.getData();
+
+	            var categoryNameIdxMap = {};
+
+	            categoriesData.each(function (idx) {
+	                var name = categoriesData.getName(idx);
+	                categoryNameIdxMap[name] = idx;
+
+	                var itemModel = categoriesData.getItemModel(idx);
+	                var color = itemModel.get('itemStyle.normal.color')
+	                    || seriesModel.getColorFromPalette(name);
+	                categoriesData.setItemVisual(idx, 'color', color);
+	            });
+
+	            // Assign category color to visual
+	            if (categoriesData.count()) {
+	                data.each(function (idx) {
+	                    var model = data.getItemModel(idx);
+	                    var category = model.getShallow('category');
+	                    if (category != null) {
+	                        if (typeof category === 'string') {
+	                            category = categoryNameIdxMap[category];
+	                        }
+	                        if (!data.getItemVisual(idx, 'color', true)) {
+	                            data.setItemVisual(
+	                                idx, 'color',
+	                                categoriesData.getItemVisual(category, 'color')
+	                            );
+	                        }
+	                    }
+	                });
+	            }
+	        });
+	    };
+
+
+/***/ },
+/* 206 */
+/***/ function(module, exports) {
+
+	
+
+	    function normalize(a) {
+	        if (!(a instanceof Array)) {
+	            a = [a, a];
+	        }
+	        return a;
+	    }
+	    module.exports = function (ecModel) {
+	        ecModel.eachSeriesByType('graph', function (seriesModel) {
+	            var graph = seriesModel.getGraph();
+	            var edgeData = seriesModel.getEdgeData();
+	            var symbolType = normalize(seriesModel.get('edgeSymbol'));
+	            var symbolSize = normalize(seriesModel.get('edgeSymbolSize'));
+
+	            edgeData.setVisual('fromSymbol', symbolType && symbolType[0]);
+	            edgeData.setVisual('toSymbol', symbolType && symbolType[1]);
+	            edgeData.setVisual('fromSymbolSize', symbolSize && symbolSize[0]);
+	            edgeData.setVisual('toSymbolSize', symbolSize && symbolSize[1]);
+	            edgeData.setVisual('color', seriesModel.get('lineStyle.normal.color'));
+
+	            edgeData.each(function (idx) {
+	                var itemModel = edgeData.getItemModel(idx);
+	                var edge = graph.getEdgeByIndex(idx);
+	                var symbolType = normalize(itemModel.getShallow('symbol', true));
+	                var symbolSize = normalize(itemModel.getShallow('symbolSize', true));
+	                // Edge visual must after node visual
+	                var color = itemModel.get('lineStyle.normal.color');
+	                switch (color) {
+	                    case 'source':
+	                        color = edge.node1.getVisual('color');
+	                        break;
+	                    case 'target':
+	                        color = edge.node2.getVisual('color');
+	                        break;
+	                }
+
+	                symbolType[0] && edge.setVisual('fromSymbol', symbolType[0]);
+	                symbolType[1] && edge.setVisual('toSymbol', symbolType[1]);
+	                symbolSize[0] && edge.setVisual('fromSymbolSize', symbolSize[0]);
+	                symbolSize[1] && edge.setVisual('toSymbolSize', symbolSize[1]);
+
+	                edge.setVisual('color', color);
+	            });
+	        });
+	    };
+
+
+/***/ },
+/* 207 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var simpleLayoutHelper = __webpack_require__(208);
+	    var simpleLayoutEdge = __webpack_require__(209);
+	    module.exports = function (ecModel, api) {
+	        ecModel.eachSeriesByType('graph', function (seriesModel) {
+	            var layout = seriesModel.get('layout');
+	            var coordSys = seriesModel.coordinateSystem;
+	            if (coordSys && coordSys.type !== 'view') {
+	                var data = seriesModel.getData();
+	                data.each(coordSys.dimensions, function (x, y, idx) {
+	                    if (!isNaN(x) && !isNaN(y)) {
+	                        data.setItemLayout(idx, coordSys.dataToPoint([x, y]));
+	                    }
+	                    else {
+	                        // Also {Array.<number>}, not undefined to avoid if...else... statement
+	                        data.setItemLayout(idx, [NaN, NaN]);
+	                    }
+	                });
+
+	                simpleLayoutEdge(data.graph);
+	            }
+	            else if (!layout || layout === 'none') {
+	                simpleLayoutHelper(seriesModel);
+	            }
+	        });
+	    };
+
+
+/***/ },
+/* 208 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var simpleLayoutEdge = __webpack_require__(209);
+
+	    module.exports = function (seriesModel) {
+	        var coordSys = seriesModel.coordinateSystem;
+	        if (coordSys && coordSys.type !== 'view') {
+	            return;
+	        }
+	        var graph = seriesModel.getGraph();
+
+	        graph.eachNode(function (node) {
+	            var model = node.getModel();
+	            node.setLayout([+model.get('x'), +model.get('y')]);
+	        });
+
+	        simpleLayoutEdge(graph);
+	    };
+
+
+/***/ },
+/* 209 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+	    var vec2 = __webpack_require__(10);
+	    module.exports = function (graph) {
+	        graph.eachEdge(function (edge) {
+	            var curveness = edge.getModel().get('lineStyle.normal.curveness') || 0;
+	            var p1 = vec2.clone(edge.node1.getLayout());
+	            var p2 = vec2.clone(edge.node2.getLayout());
+	            var points = [p1, p2];
+	            if (curveness > 0) {
+	                points.push([
+	                    (p1[0] + p2[0]) / 2 - (p1[1] - p2[1]) * curveness,
+	                    (p1[1] + p2[1]) / 2 - (p2[0] - p1[0]) * curveness
+	                ]);
+	            }
+	            edge.setLayout(points);
+	        });
+	    };
+
+
+/***/ },
+/* 210 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+	    var circularLayoutHelper = __webpack_require__(211);
+	    module.exports = function (ecModel) {
+	        ecModel.eachSeriesByType('graph', function (seriesModel) {
+	            if (seriesModel.get('layout') === 'circular') {
+	                circularLayoutHelper(seriesModel);
+	            }
+	        });
+	    };
+
+
+/***/ },
+/* 211 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+	    var vec2 = __webpack_require__(10);
+	    module.exports = function (seriesModel) {
+	        var coordSys = seriesModel.coordinateSystem;
+	        if (coordSys && coordSys.type !== 'view') {
+	            return;
+	        }
+
+	        var rect = coordSys.getBoundingRect();
+
+	        var nodeData = seriesModel.getData();
+	        var graph = nodeData.graph;
+
+	        var angle = 0;
+	        var sum = nodeData.getSum('value');
+	        var unitAngle = Math.PI * 2 / (sum || nodeData.count());
+
+	        var cx = rect.width / 2 + rect.x;
+	        var cy = rect.height / 2 + rect.y;
+
+	        var r = Math.min(rect.width, rect.height) / 2;
+
+	        graph.eachNode(function (node) {
+	            var value = node.getValue('value');
+
+	            angle += unitAngle * (sum ? value : 2) / 2;
+
+	            node.setLayout([
+	                r * Math.cos(angle) + cx,
+	                r * Math.sin(angle) + cy
+	            ]);
+
+	            angle += unitAngle * (sum ? value : 2) / 2;
+	        });
+
+	        graph.eachEdge(function (edge) {
+	            var curveness = edge.getModel().get('lineStyle.normal.curveness') || 0;
+	            var p1 = vec2.clone(edge.node1.getLayout());
+	            var p2 = vec2.clone(edge.node2.getLayout());
+	            var cp1;
+	            var x12 = (p1[0] + p2[0]) / 2;
+	            var y12 = (p1[1] + p2[1]) / 2;
+	            if (curveness > 0) {
+	                curveness *= 3;
+	                cp1 = [
+	                    cx * curveness + x12 * (1 - curveness),
+	                    cy * curveness + y12 * (1 - curveness)
+	                ];
+	            }
+	            edge.setLayout([p1, p2, cp1]);
+	        });
+	    };
+
+
+/***/ },
+/* 212 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var forceHelper = __webpack_require__(213);
+	    var numberUtil = __webpack_require__(7);
+	    var simpleLayoutHelper = __webpack_require__(208);
+	    var circularLayoutHelper = __webpack_require__(211);
+	    var vec2 = __webpack_require__(10);
+
+	    module.exports = function (ecModel) {
+	        ecModel.eachSeriesByType('graph', function (graphSeries) {
+	            var coordSys = graphSeries.coordinateSystem;
+	            if (coordSys && coordSys.type !== 'view') {
+	                return;
+	            }
+	            if (graphSeries.get('layout') === 'force') {
+	                var preservedPoints = graphSeries.preservedPoints || {};
+	                var graph = graphSeries.getGraph();
+	                var nodeData = graph.data;
+	                var edgeData = graph.edgeData;
+	                var forceModel = graphSeries.getModel('force');
+	                var initLayout = forceModel.get('initLayout');
+	                if (graphSeries.preservedPoints) {
+	                    nodeData.each(function (idx) {
+	                        var id = nodeData.getId(idx);
+	                        nodeData.setItemLayout(idx, preservedPoints[id] || [NaN, NaN]);
+	                    });
+	                }
+	                else if (!initLayout || initLayout === 'none') {
+	                    simpleLayoutHelper(graphSeries);
+	                }
+	                else if (initLayout === 'circular') {
+	                    circularLayoutHelper(graphSeries);
+	                }
+
+	                var nodeDataExtent = nodeData.getDataExtent('value');
+	                // var edgeDataExtent = edgeData.getDataExtent('value');
+	                var repulsion = forceModel.get('repulsion');
+	                var edgeLength = forceModel.get('edgeLength');
+	                var nodes = nodeData.mapArray('value', function (value, idx) {
+	                    var point = nodeData.getItemLayout(idx);
+	                    // var w = numberUtil.linearMap(value, nodeDataExtent, [0, 50]);
+	                    var rep = numberUtil.linearMap(value, nodeDataExtent, [0, repulsion]) || (repulsion / 2);
+	                    return {
+	                        w: rep,
+	                        rep: rep,
+	                        p: (!point || isNaN(point[0]) || isNaN(point[1])) ? null : point
+	                    };
+	                });
+	                var edges = edgeData.mapArray('value', function (value, idx) {
+	                    var edge = graph.getEdgeByIndex(idx);
+	                    // var w = numberUtil.linearMap(value, edgeDataExtent, [0, 100]);
+	                    return {
+	                        n1: nodes[edge.node1.dataIndex],
+	                        n2: nodes[edge.node2.dataIndex],
+	                        d: edgeLength,
+	                        curveness: edge.getModel().get('lineStyle.normal.curveness') || 0
+	                    };
+	                });
+
+	                var coordSys = graphSeries.coordinateSystem;
+	                var rect = coordSys.getBoundingRect();
+	                var forceInstance = forceHelper(nodes, edges, {
+	                    rect: rect,
+	                    gravity: forceModel.get('gravity')
+	                });
+	                var oldStep = forceInstance.step;
+	                forceInstance.step = function (cb) {
+	                    for (var i = 0, l = nodes.length; i < l; i++) {
+	                        if (nodes[i].fixed) {
+	                            // Write back to layout instance
+	                            vec2.copy(nodes[i].p, graph.getNodeByIndex(i).getLayout());
+	                        }
+	                    }
+	                    oldStep(function (nodes, edges, stopped) {
+	                        for (var i = 0, l = nodes.length; i < l; i++) {
+	                            if (!nodes[i].fixed) {
+	                                graph.getNodeByIndex(i).setLayout(nodes[i].p);
+	                            }
+	                            preservedPoints[nodeData.getId(i)] = nodes[i].p;
+	                        }
+	                        for (var i = 0, l = edges.length; i < l; i++) {
+	                            var e = edges[i];
+	                            var edge = graph.getEdgeByIndex(i);
+	                            var p1 = e.n1.p;
+	                            var p2 = e.n2.p;
+	                            var points = edge.getLayout();
+	                            points = points ? points.slice() : [];
+	                            points[0] = points[0] || [];
+	                            points[1] = points[1] || [];
+	                            vec2.copy(points[0], p1);
+	                            vec2.copy(points[1], p2);
+	                            if (e.curveness > 0) {
+	                                points[2] = [
+	                                    (p1[0] + p2[0]) / 2 - (p1[1] - p2[1]) * e.curveness,
+	                                    (p1[1] + p2[1]) / 2 - (p2[0] - p1[0]) * e.curveness
+	                                ];
+	                            }
+	                            edge.setLayout(points);
+	                        }
+	                        // Update layout
+
+	                        cb && cb(stopped);
+	                    });
+	                };
+	                graphSeries.forceLayout = forceInstance;
+	                graphSeries.preservedPoints = preservedPoints;
+
+	                // Step to get the layout
+	                forceInstance.step();
+	            }
+	            else {
+	                // Remove prev injected forceLayout instance
+	                graphSeries.forceLayout = null;
+	            }
+	        });
+	    };
+
+
+/***/ },
+/* 213 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var vec2 = __webpack_require__(10);
+	    var scaleAndAdd = vec2.scaleAndAdd;
+
+	    // function adjacentNode(n, e) {
+	    //     return e.n1 === n ? e.n2 : e.n1;
+	    // }
+
+	    module.exports = function (nodes, edges, opts) {
+	        var rect = opts.rect;
+	        var width = rect.width;
+	        var height = rect.height;
+	        var center = [rect.x + width / 2, rect.y + height / 2];
+	        // var scale = opts.scale || 1;
+	        var gravity = opts.gravity == null ? 0.1 : opts.gravity;
+
+	        // for (var i = 0; i < edges.length; i++) {
+	        //     var e = edges[i];
+	        //     var n1 = e.n1;
+	        //     var n2 = e.n2;
+	        //     n1.edges = n1.edges || [];
+	        //     n2.edges = n2.edges || [];
+	        //     n1.edges.push(e);
+	        //     n2.edges.push(e);
+	        // }
+	        // Init position
+	        for (var i = 0; i < nodes.length; i++) {
+	            var n = nodes[i];
+	            if (!n.p) {
+	                // Use the position from first adjecent node with defined position
+	                // Or use a random position
+	                // From d3
+	                // if (n.edges) {
+	                //     var j = -1;
+	                //     while (++j < n.edges.length) {
+	                //         var e = n.edges[j];
+	                //         var other = adjacentNode(n, e);
+	                //         if (other.p) {
+	                //             n.p = vec2.clone(other.p);
+	                //             break;
+	                //         }
+	                //     }
+	                // }
+	                // if (!n.p) {
+	                    n.p = vec2.create(
+	                        width * (Math.random() - 0.5) + center[0],
+	                        height * (Math.random() - 0.5) + center[1]
+	                    );
+	                // }
+	            }
+	            n.pp = vec2.clone(n.p);
+	            n.edges = null;
+	        }
+
+	        // Formula in 'Graph Drawing by Force-directed Placement'
+	        // var k = scale * Math.sqrt(width * height / nodes.length);
+	        // var k2 = k * k;
+
+	        var friction = 0.6;
+
+	        return {
+	            warmUp: function () {
+	                friction = 0.5;
+	            },
+
+	            setFixed: function (idx) {
+	                nodes[idx].fixed = true;
+	            },
+
+	            setUnfixed: function (idx) {
+	                nodes[idx].fixed = false;
+	            },
+
+	            step: function (cb) {
+	                var v12 = [];
+	                var nLen = nodes.length;
+	                for (var i = 0; i < edges.length; i++) {
+	                    var e = edges[i];
+	                    var n1 = e.n1;
+	                    var n2 = e.n2;
+
+	                    vec2.sub(v12, n2.p, n1.p);
+	                    var d = vec2.len(v12) - e.d;
+	                    var w = n2.w / (n1.w + n2.w);
+	                    vec2.normalize(v12, v12);
+
+	                    !n1.fixed && scaleAndAdd(n1.p, n1.p, v12, w * d * friction);
+	                    !n2.fixed && scaleAndAdd(n2.p, n2.p, v12, -(1 - w) * d * friction);
+	                }
+	                // Gravity
+	                for (var i = 0; i < nLen; i++) {
+	                    var n = nodes[i];
+	                    if (!n.fixed) {
+	                        vec2.sub(v12, center, n.p);
+	                        // var d = vec2.len(v12);
+	                        // vec2.scale(v12, v12, 1 / d);
+	                        // var gravityFactor = gravity;
+	                        vec2.scaleAndAdd(n.p, n.p, v12, gravity * friction);
+	                    }
+	                }
+
+	                // Repulsive
+	                // PENDING
+	                for (var i = 0; i < nLen; i++) {
+	                    var n1 = nodes[i];
+	                    for (var j = i + 1; j < nLen; j++) {
+	                        var n2 = nodes[j];
+	                        vec2.sub(v12, n2.p, n1.p);
+	                        var d = vec2.len(v12);
+	                        if (d === 0) {
+	                            // Random repulse
+	                            vec2.set(v12, Math.random() - 0.5, Math.random() - 0.5);
+	                            d = 1;
+	                        }
+	                        var repFact = (n1.rep + n2.rep) / d / d;
+	                        !n1.fixed && scaleAndAdd(n1.pp, n1.pp, v12, repFact);
+	                        !n2.fixed && scaleAndAdd(n2.pp, n2.pp, v12, -repFact);
+	                    }
+	                }
+	                var v = [];
+	                for (var i = 0; i < nLen; i++) {
+	                    var n = nodes[i];
+	                    if (!n.fixed) {
+	                        vec2.sub(v, n.p, n.pp);
+	                        vec2.scaleAndAdd(n.p, n.p, v, friction);
+	                        vec2.copy(n.pp, n.p);
+	                    }
+	                }
+
+	                friction = friction * 0.992;
+
+	                cb && cb(nodes, edges, friction < 0.01);
+	            }
+	        };
+	    };
+
+
+/***/ },
+/* 214 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+	    // FIXME Where to create the simple view coordinate system
+	    var View = __webpack_require__(168);
+	    var layout = __webpack_require__(21);
+	    var bbox = __webpack_require__(51);
+
+	    function getViewRect(seriesModel, api, aspect) {
+	        var option = seriesModel.getBoxLayoutParams();
+	        option.aspect = aspect;
+	        return layout.getLayoutRect(option, {
+	            width: api.getWidth(),
+	            height: api.getHeight()
+	        });
+	    }
+
+	    module.exports = function (ecModel, api) {
+	        var viewList = [];
+	        ecModel.eachSeriesByType('graph', function (seriesModel) {
+	            var coordSysType = seriesModel.get('coordinateSystem');
+	            if (!coordSysType || coordSysType === 'view') {
+	                var viewCoordSys = new View();
+	                viewList.push(viewCoordSys);
+
+	                var data = seriesModel.getData();
+	                var positions = data.mapArray(function (idx) {
+	                    var itemModel = data.getItemModel(idx);
+	                    return [+itemModel.get('x'), +itemModel.get('y')];
+	                });
+
+	                var min = [];
+	                var max = [];
+
+	                bbox.fromPoints(positions, min, max);
+
+	                // If width or height is 0
+	                if (max[0] - min[0] === 0) {
+	                    max[0] += 1;
+	                    min[0] -= 1;
+	                }
+	                if (max[1] - min[1] === 0) {
+	                    max[1] += 1;
+	                    min[1] -= 1;
+	                }
+	                var aspect = (max[0] - min[0]) / (max[1] - min[1]);
+	                // FIXME If get view rect after data processed?
+	                var viewRect = getViewRect(seriesModel, api, aspect);
+	                // Position may be NaN, use view rect instead
+	                if (isNaN(aspect)) {
+	                    min = [viewRect.x, viewRect.y];
+	                    max = [viewRect.x + viewRect.width, viewRect.y + viewRect.height];
+	                }
+
+	                var bbWidth = max[0] - min[0];
+	                var bbHeight = max[1] - min[1];
+
+	                var viewWidth = viewRect.width;
+	                var viewHeight = viewRect.height;
+
+	                viewCoordSys = seriesModel.coordinateSystem = new View();
+	                viewCoordSys.zoomLimit = seriesModel.get('scaleLimit');
+
+	                viewCoordSys.setBoundingRect(
+	                    min[0], min[1], bbWidth, bbHeight
+	                );
+	                viewCoordSys.setViewRect(
+	                    viewRect.x, viewRect.y, viewWidth, viewHeight
+	                );
+
+	                // Update roam info
+	                viewCoordSys.setCenter(seriesModel.get('center'));
+	                viewCoordSys.setZoom(seriesModel.get('zoom'));
+	            }
+	        });
+	        return viewList;
+	    };
+
+
+/***/ },
+/* 215 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+	    __webpack_require__(216);
+	    __webpack_require__(217);
+
+
+/***/ },
+/* 216 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var List = __webpack_require__(97);
+	    var SeriesModel = __webpack_require__(28);
+	    var zrUtil = __webpack_require__(4);
+
+	    var GaugeSeries = SeriesModel.extend({
+
+	        type: 'series.gauge',
+
+	        getInitialData: function (option, ecModel) {
+	            var list = new List(['value'], this);
+	            var dataOpt = option.data || [];
+	            if (!zrUtil.isArray(dataOpt)) {
+	                dataOpt = [dataOpt];
+	            }
+	            // Only use the first data item
+	            list.initData(dataOpt);
+	            return list;
+	        },
+
+	        defaultOption: {
+	            zlevel: 0,
+	            z: 2,
+	            // 默认全局居中
+	            center: ['50%', '50%'],
+	            legendHoverLink: true,
+	            radius: '75%',
+	            startAngle: 225,
+	            endAngle: -45,
+	            clockwise: true,
+	            // 最小值
+	            min: 0,
+	            // 最大值
+	            max: 100,
+	            // 分割段数，默认为10
+	            splitNumber: 10,
+	            // 坐标轴线
+	            axisLine: {
+	                // 默认显示，属性show控制显示与否
+	                show: true,
+	                lineStyle: {       // 属性lineStyle控制线条样式
+	                    color: [[0.2, '#91c7ae'], [0.8, '#63869e'], [1, '#c23531']],
+	                    width: 30
+	                }
+	            },
+	            // 分隔线
+	            splitLine: {
+	                // 默认显示，属性show控制显示与否
+	                show: true,
+	                // 属性length控制线长
+	                length: 30,
+	                // 属性lineStyle（详见lineStyle）控制线条样式
+	                lineStyle: {
+	                    color: '#eee',
+	                    width: 2,
+	                    type: 'solid'
+	                }
+	            },
+	            // 坐标轴小标记
+	            axisTick: {
+	                // 属性show控制显示与否，默认不显示
+	                show: true,
+	                // 每份split细分多少段
+	                splitNumber: 5,
+	                // 属性length控制线长
+	                length: 8,
+	                // 属性lineStyle控制线条样式
+	                lineStyle: {
+	                    color: '#eee',
+	                    width: 1,
+	                    type: 'solid'
+	                }
+	            },
+	            axisLabel: {
+	                show: true,
+	                distance: 5,
+	                // formatter: null,
+	                textStyle: {       // 其余属性默认使用全局文本样式，详见TEXTSTYLE
+	                    color: 'auto'
+	                }
+	            },
+	            pointer: {
+	                show: true,
+	                length: '80%',
+	                width: 8
+	            },
+	            itemStyle: {
+	                normal: {
+	                    color: 'auto'
+	                }
+	            },
+	            title: {
+	                show: true,
+	                // x, y，单位px
+	                offsetCenter: [0, '-40%'],
+	                // 其余属性默认使用全局文本样式，详见TEXTSTYLE
+	                textStyle: {
+	                    color: '#333',
+	                    fontSize: 15
+	                }
+	            },
+	            detail: {
+	                show: true,
+	                backgroundColor: 'rgba(0,0,0,0)',
+	                borderWidth: 0,
+	                borderColor: '#ccc',
+	                width: 100,
+	                height: 40,
+	                // x, y，单位px
+	                offsetCenter: [0, '40%'],
+	                // formatter: null,
+	                // 其余属性默认使用全局文本样式，详见TEXTSTYLE
+	                textStyle: {
+	                    color: 'auto',
+	                    fontSize: 30
+	                }
+	            }
+	        }
+	    });
+
+	    module.exports = GaugeSeries;
+
+
+/***/ },
+/* 217 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var PointerPath = __webpack_require__(218);
+
+	    var graphic = __webpack_require__(43);
+	    var numberUtil = __webpack_require__(7);
+	    var parsePercent = numberUtil.parsePercent;
+
+	    function parsePosition(seriesModel, api) {
+	        var center = seriesModel.get('center');
+	        var width = api.getWidth();
+	        var height = api.getHeight();
+	        var size = Math.min(width, height);
+	        var cx = parsePercent(center[0], api.getWidth());
+	        var cy = parsePercent(center[1], api.getHeight());
+	        var r = parsePercent(seriesModel.get('radius'), size / 2);
+
+	        return {
+	            cx: cx,
+	            cy: cy,
+	            r: r
+	        };
+	    }
+
+	    function formatLabel(label, labelFormatter) {
+	        if (labelFormatter) {
+	            if (typeof labelFormatter === 'string') {
+	                label = labelFormatter.replace('{value}', label);
+	            }
+	            else if (typeof labelFormatter === 'function') {
+	                label = labelFormatter(label);
+	            }
+	        }
+
+	        return label;
+	    }
+
+	    var PI2 = Math.PI * 2;
+
+	    var GaugeView = __webpack_require__(42).extend({
+
+	        type: 'gauge',
+
+	        render: function (seriesModel, ecModel, api) {
+
+	            this.group.removeAll();
+
+	            var colorList = seriesModel.get('axisLine.lineStyle.color');
+	            var posInfo = parsePosition(seriesModel, api);
+
+	            this._renderMain(
+	                seriesModel, ecModel, api, colorList, posInfo
+	            );
+	        },
+
+	        _renderMain: function (seriesModel, ecModel, api, colorList, posInfo) {
+	            var group = this.group;
+
+	            var axisLineModel = seriesModel.getModel('axisLine');
+	            var lineStyleModel = axisLineModel.getModel('lineStyle');
+
+	            var clockwise = seriesModel.get('clockwise');
+	            var startAngle = -seriesModel.get('startAngle') / 180 * Math.PI;
+	            var endAngle = -seriesModel.get('endAngle') / 180 * Math.PI;
+
+	            var angleRangeSpan = (endAngle - startAngle) % PI2;
+
+	            var prevEndAngle = startAngle;
+	            var axisLineWidth = lineStyleModel.get('width');
+
+	            for (var i = 0; i < colorList.length; i++) {
+	                // Clamp
+	                var percent = Math.min(Math.max(colorList[i][0], 0), 1);
+	                var endAngle = startAngle + angleRangeSpan * percent;
+	                var sector = new graphic.Sector({
+	                    shape: {
+	                        startAngle: prevEndAngle,
+	                        endAngle: endAngle,
+	                        cx: posInfo.cx,
+	                        cy: posInfo.cy,
+	                        clockwise: clockwise,
+	                        r0: posInfo.r - axisLineWidth,
+	                        r: posInfo.r
+	                    },
+	                    silent: true
+	                });
+
+	                sector.setStyle({
+	                    fill: colorList[i][1]
+	                });
+
+	                sector.setStyle(lineStyleModel.getLineStyle(
+	                    // Because we use sector to simulate arc
+	                    // so the properties for stroking are useless
+	                    ['color', 'borderWidth', 'borderColor']
+	                ));
+
+	                group.add(sector);
+
+	                prevEndAngle = endAngle;
+	            }
+
+	            var getColor = function (percent) {
+	                // Less than 0
+	                if (percent <= 0) {
+	                    return colorList[0][1];
+	                }
+	                for (var i = 0; i < colorList.length; i++) {
+	                    if (colorList[i][0] >= percent
+	                        && (i === 0 ? 0 : colorList[i - 1][0]) < percent
+	                    ) {
+	                        return colorList[i][1];
+	                    }
+	                }
+	                // More than 1
+	                return colorList[i - 1][1];
+	            };
+
+	            if (!clockwise) {
+	                var tmp = startAngle;
+	                startAngle = endAngle;
+	                endAngle = tmp;
+	            }
+
+	            this._renderTicks(
+	                seriesModel, ecModel, api, getColor, posInfo,
+	                startAngle, endAngle, clockwise
+	            );
+
+	            this._renderPointer(
+	                seriesModel, ecModel, api, getColor, posInfo,
+	                startAngle, endAngle, clockwise
+	            );
+
+	            this._renderTitle(
+	                seriesModel, ecModel, api, getColor, posInfo
+	            );
+	            this._renderDetail(
+	                seriesModel, ecModel, api, getColor, posInfo
+	            );
+	        },
+
+	        _renderTicks: function (
+	            seriesModel, ecModel, api, getColor, posInfo,
+	            startAngle, endAngle, clockwise
+	        ) {
+	            var group = this.group;
+	            var cx = posInfo.cx;
+	            var cy = posInfo.cy;
+	            var r = posInfo.r;
+
+	            var minVal = seriesModel.get('min');
+	            var maxVal = seriesModel.get('max');
+
+	            var splitLineModel = seriesModel.getModel('splitLine');
+	            var tickModel = seriesModel.getModel('axisTick');
+	            var labelModel = seriesModel.getModel('axisLabel');
+
+	            var splitNumber = seriesModel.get('splitNumber');
+	            var subSplitNumber = tickModel.get('splitNumber');
+
+	            var splitLineLen = parsePercent(
+	                splitLineModel.get('length'), r
+	            );
+	            var tickLen = parsePercent(
+	                tickModel.get('length'), r
+	            );
+
+	            var angle = startAngle;
+	            var step = (endAngle - startAngle) / splitNumber;
+	            var subStep = step / subSplitNumber;
+
+	            var splitLineStyle = splitLineModel.getModel('lineStyle').getLineStyle();
+	            var tickLineStyle = tickModel.getModel('lineStyle').getLineStyle();
+	            var textStyleModel = labelModel.getModel('textStyle');
+
+	            for (var i = 0; i <= splitNumber; i++) {
+	                var unitX = Math.cos(angle);
+	                var unitY = Math.sin(angle);
+	                // Split line
+	                if (splitLineModel.get('show')) {
+	                    var splitLine = new graphic.Line({
+	                        shape: {
+	                            x1: unitX * r + cx,
+	                            y1: unitY * r + cy,
+	                            x2: unitX * (r - splitLineLen) + cx,
+	                            y2: unitY * (r - splitLineLen) + cy
+	                        },
+	                        style: splitLineStyle,
+	                        silent: true
+	                    });
+	                    if (splitLineStyle.stroke === 'auto') {
+	                        splitLine.setStyle({
+	                            stroke: getColor(i / splitNumber)
+	                        });
+	                    }
+
+	                    group.add(splitLine);
+	                }
+
+	                // Label
+	                if (labelModel.get('show')) {
+	                    var label = formatLabel(
+	                        numberUtil.round(i / splitNumber * (maxVal - minVal) + minVal),
+	                        labelModel.get('formatter')
+	                    );
+	                    var distance = labelModel.get('distance');
+
+	                    var text = new graphic.Text({
+	                        style: {
+	                            text: label,
+	                            x: unitX * (r - splitLineLen - distance) + cx,
+	                            y: unitY * (r - splitLineLen - distance) + cy,
+	                            fill: textStyleModel.getTextColor(),
+	                            textFont: textStyleModel.getFont(),
+	                            textVerticalAlign: unitY < -0.4 ? 'top' : (unitY > 0.4 ? 'bottom' : 'middle'),
+	                            textAlign: unitX < -0.4 ? 'left' : (unitX > 0.4 ? 'right' : 'center')
+	                        },
+	                        silent: true
+	                    });
+	                    if (text.style.fill === 'auto') {
+	                        text.setStyle({
+	                            fill: getColor(i / splitNumber)
+	                        });
+	                    }
+
+	                    group.add(text);
+	                }
+
+	                // Axis tick
+	                if (tickModel.get('show') && i !== splitNumber) {
+	                    for (var j = 0; j <= subSplitNumber; j++) {
+	                        var unitX = Math.cos(angle);
+	                        var unitY = Math.sin(angle);
+	                        var tickLine = new graphic.Line({
+	                            shape: {
+	                                x1: unitX * r + cx,
+	                                y1: unitY * r + cy,
+	                                x2: unitX * (r - tickLen) + cx,
+	                                y2: unitY * (r - tickLen) + cy
+	                            },
+	                            silent: true,
+	                            style: tickLineStyle
+	                        });
+
+	                        if (tickLineStyle.stroke === 'auto') {
+	                            tickLine.setStyle({
+	                                stroke: getColor((i + j / subSplitNumber) / splitNumber)
+	                            });
+	                        }
+
+	                        group.add(tickLine);
+	                        angle += subStep;
+	                    }
+	                    angle -= subStep;
+	                }
+	                else {
+	                    angle += step;
+	                }
+	            }
+	        },
+
+	        _renderPointer: function (
+	            seriesModel, ecModel, api, getColor, posInfo,
+	            startAngle, endAngle, clockwise
+	        ) {
+	            var valueExtent = [+seriesModel.get('min'), +seriesModel.get('max')];
+	            var angleExtent = [startAngle, endAngle];
+
+	            if (!clockwise) {
+	                angleExtent = angleExtent.reverse();
+	            }
+
+	            var data = seriesModel.getData();
+	            var oldData = this._data;
+
+	            var group = this.group;
+
+	            data.diff(oldData)
+	                .add(function (idx) {
+	                    var pointer = new PointerPath({
+	                        shape: {
+	                            angle: startAngle
+	                        }
+	                    });
+
+	                    graphic.updateProps(pointer, {
+	                        shape: {
+	                            angle: numberUtil.linearMap(data.get('value', idx), valueExtent, angleExtent, true)
+	                        }
+	                    }, seriesModel);
+
+	                    group.add(pointer);
+	                    data.setItemGraphicEl(idx, pointer);
+	                })
+	                .update(function (newIdx, oldIdx) {
+	                    var pointer = oldData.getItemGraphicEl(oldIdx);
+
+	                    graphic.updateProps(pointer, {
+	                        shape: {
+	                            angle: numberUtil.linearMap(data.get('value', newIdx), valueExtent, angleExtent, true)
+	                        }
+	                    }, seriesModel);
+
+	                    group.add(pointer);
+	                    data.setItemGraphicEl(newIdx, pointer);
+	                })
+	                .remove(function (idx) {
+	                    var pointer = oldData.getItemGraphicEl(idx);
+	                    group.remove(pointer);
+	                })
+	                .execute();
+
+	            data.eachItemGraphicEl(function (pointer, idx) {
+	                var itemModel = data.getItemModel(idx);
+	                var pointerModel = itemModel.getModel('pointer');
+
+	                pointer.setShape({
+	                    x: posInfo.cx,
+	                    y: posInfo.cy,
+	                    width: parsePercent(
+	                        pointerModel.get('width'), posInfo.r
+	                    ),
+	                    r: parsePercent(pointerModel.get('length'), posInfo.r)
+	                });
+
+	                pointer.useStyle(itemModel.getModel('itemStyle.normal').getItemStyle());
+
+	                if (pointer.style.fill === 'auto') {
+	                    pointer.setStyle('fill', getColor(
+	                        (data.get('value', idx) - valueExtent[0]) / (valueExtent[1] - valueExtent[0])
+	                    ));
+	                }
+
+	                graphic.setHoverStyle(
+	                    pointer, itemModel.getModel('itemStyle.emphasis').getItemStyle()
+	                );
+	            });
+
+	            this._data = data;
+	        },
+
+	        _renderTitle: function (
+	            seriesModel, ecModel, api, getColor, posInfo
+	        ) {
+	            var titleModel = seriesModel.getModel('title');
+	            if (titleModel.get('show')) {
+	                var textStyleModel = titleModel.getModel('textStyle');
+	                var offsetCenter = titleModel.get('offsetCenter');
+	                var x = posInfo.cx + parsePercent(offsetCenter[0], posInfo.r);
+	                var y = posInfo.cy + parsePercent(offsetCenter[1], posInfo.r);
+	                var text = new graphic.Text({
+	                    style: {
+	                        x: x,
+	                        y: y,
+	                        // FIXME First data name ?
+	                        text: seriesModel.getData().getName(0),
+	                        fill: textStyleModel.getTextColor(),
+	                        textFont: textStyleModel.getFont(),
+	                        textAlign: 'center',
+	                        textVerticalAlign: 'middle'
+	                    }
+	                });
+	                this.group.add(text);
+	            }
+	        },
+
+	        _renderDetail: function (
+	            seriesModel, ecModel, api, getColor, posInfo
+	        ) {
+	            var detailModel = seriesModel.getModel('detail');
+	            var minVal = seriesModel.get('min');
+	            var maxVal = seriesModel.get('max');
+	            if (detailModel.get('show')) {
+	                var textStyleModel = detailModel.getModel('textStyle');
+	                var offsetCenter = detailModel.get('offsetCenter');
+	                var x = posInfo.cx + parsePercent(offsetCenter[0], posInfo.r);
+	                var y = posInfo.cy + parsePercent(offsetCenter[1], posInfo.r);
+	                var width = parsePercent(detailModel.get('width'), posInfo.r);
+	                var height = parsePercent(detailModel.get('height'), posInfo.r);
+	                var value = seriesModel.getData().get('value', 0);
+	                var rect = new graphic.Rect({
+	                    shape: {
+	                        x: x - width / 2,
+	                        y: y - height / 2,
+	                        width: width,
+	                        height: height
+	                    },
+	                    style: {
+	                        text: formatLabel(
+	                            // FIXME First data name ?
+	                            value, detailModel.get('formatter')
+	                        ),
+	                        fill: detailModel.get('backgroundColor'),
+	                        textFill: textStyleModel.getTextColor(),
+	                        textFont: textStyleModel.getFont()
+	                    }
+	                });
+	                if (rect.style.textFill === 'auto') {
+	                    rect.setStyle('textFill', getColor(
+	                        numberUtil.linearMap(value, [minVal, maxVal], [0, 1], true)
+	                    ));
+	                }
+	                rect.setStyle(detailModel.getItemStyle(['color']));
+	                this.group.add(rect);
+	            }
+	        }
+	    });
+
+	    module.exports = GaugeView;
+
+
+/***/ },
+/* 218 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    module.exports = __webpack_require__(45).extend({
+
+	        type: 'echartsGaugePointer',
+
+	        shape: {
+	            angle: 0,
+
+	            width: 10,
+
+	            r: 10,
+
+	            x: 0,
+
+	            y: 0
+	        },
+
+	        buildPath: function (ctx, shape) {
+	            var mathCos = Math.cos;
+	            var mathSin = Math.sin;
+
+	            var r = shape.r;
+	            var width = shape.width;
+	            var angle = shape.angle;
+	            var x = shape.x - mathCos(angle) * width * (width >= r / 3 ? 1 : 2);
+	            var y = shape.y - mathSin(angle) * width * (width >= r / 3 ? 1 : 2);
+
+	            angle = shape.angle - Math.PI / 2;
+	            ctx.moveTo(x, y);
+	            ctx.lineTo(
+	                shape.x + mathCos(angle) * width,
+	                shape.y + mathSin(angle) * width
+	            );
+	            ctx.lineTo(
+	                shape.x + mathCos(shape.angle) * r,
+	                shape.y + mathSin(shape.angle) * r
+	            );
+	            ctx.lineTo(
+	                shape.x - mathCos(angle) * width,
+	                shape.y - mathSin(angle) * width
+	            );
+	            ctx.lineTo(x, y);
+	            return;
+	        }
+	    });
+
+
+/***/ },
+/* 219 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+	    var echarts = __webpack_require__(1);
+
+	    __webpack_require__(220);
+	    __webpack_require__(221);
+
+	    echarts.registerVisual(zrUtil.curry(__webpack_require__(143), 'funnel'));
+	    echarts.registerLayout(__webpack_require__(222));
+
+	    echarts.registerProcessor(zrUtil.curry(__webpack_require__(146), 'funnel'));
+
+
+/***/ },
+/* 220 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var List = __webpack_require__(97);
+	    var modelUtil = __webpack_require__(5);
+	    var completeDimensions = __webpack_require__(102);
+
+	    var FunnelSeries = __webpack_require__(1).extendSeriesModel({
+
+	        type: 'series.funnel',
+
+	        init: function (option) {
+	            FunnelSeries.superApply(this, 'init', arguments);
+
+	            // Enable legend selection for each data item
+	            // Use a function instead of direct access because data reference may changed
+	            this.legendDataProvider = function () {
+	                return this._dataBeforeProcessed;
+	            };
+	            // Extend labelLine emphasis
+	            this._defaultLabelLine(option);
+	        },
+
+	        getInitialData: function (option, ecModel) {
+	            var dimensions = completeDimensions(['value'], option.data);
+	            var list = new List(dimensions, this);
+	            list.initData(option.data);
+	            return list;
+	        },
+
+	        _defaultLabelLine: function (option) {
+	            // Extend labelLine emphasis
+	            modelUtil.defaultEmphasis(option.labelLine, ['show']);
+
+	            var labelLineNormalOpt = option.labelLine.normal;
+	            var labelLineEmphasisOpt = option.labelLine.emphasis;
+	            // Not show label line if `label.normal.show = false`
+	            labelLineNormalOpt.show = labelLineNormalOpt.show
+	                && option.label.normal.show;
+	            labelLineEmphasisOpt.show = labelLineEmphasisOpt.show
+	                && option.label.emphasis.show;
+	        },
+
+	        defaultOption: {
+	            zlevel: 0,                  // 一级层叠
+	            z: 2,                       // 二级层叠
+	            legendHoverLink: true,
+	            left: 80,
+	            top: 60,
+	            right: 80,
+	            bottom: 60,
+	            // width: {totalWidth} - left - right,
+	            // height: {totalHeight} - top - bottom,
+
+	            // 默认取数据最小最大值
+	            // min: 0,
+	            // max: 100,
+	            minSize: '0%',
+	            maxSize: '100%',
+	            sort: 'descending', // 'ascending', 'descending'
+	            gap: 0,
+	            funnelAlign: 'center',
+	            label: {
+	                normal: {
+	                    show: true,
+	                    position: 'outer'
+	                    // formatter: 标签文本格式器，同Tooltip.formatter，不支持异步回调
+	                    // textStyle: null      // 默认使用全局文本样式，详见TEXTSTYLE
+	                },
+	                emphasis: {
+	                    show: true
+	                }
+	            },
+	            labelLine: {
+	                normal: {
+	                    show: true,
+	                    length: 20,
+	                    lineStyle: {
+	                        // color: 各异,
+	                        width: 1,
+	                        type: 'solid'
+	                    }
+	                },
+	                emphasis: {}
+	            },
+	            itemStyle: {
+	                normal: {
+	                    // color: 各异,
+	                    borderColor: '#fff',
+	                    borderWidth: 1
+	                },
+	                emphasis: {
+	                    // color: 各异,
+	                }
+	            }
+	        }
+	    });
+
+	    module.exports = FunnelSeries;
+
+
+/***/ },
+/* 221 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var graphic = __webpack_require__(43);
+	    var zrUtil = __webpack_require__(4);
+
+	    /**
+	     * Piece of pie including Sector, Label, LabelLine
+	     * @constructor
+	     * @extends {module:zrender/graphic/Group}
+	     */
+	    function FunnelPiece(data, idx) {
+
+	        graphic.Group.call(this);
+
+	        var polygon = new graphic.Polygon();
+	        var labelLine = new graphic.Polyline();
+	        var text = new graphic.Text();
+	        this.add(polygon);
+	        this.add(labelLine);
+	        this.add(text);
+
+	        this.updateData(data, idx, true);
+
+	        // Hover to change label and labelLine
+	        function onEmphasis() {
+	            labelLine.ignore = labelLine.hoverIgnore;
+	            text.ignore = text.hoverIgnore;
+	        }
+	        function onNormal() {
+	            labelLine.ignore = labelLine.normalIgnore;
+	            text.ignore = text.normalIgnore;
+	        }
+	        this.on('emphasis', onEmphasis)
+	            .on('normal', onNormal)
+	            .on('mouseover', onEmphasis)
+	            .on('mouseout', onNormal);
+	    }
+
+	    var funnelPieceProto = FunnelPiece.prototype;
+
+	    function getLabelStyle(data, idx, state, labelModel) {
+	        var textStyleModel = labelModel.getModel('textStyle');
+	        var position = labelModel.get('position');
+	        var isLabelInside = position === 'inside' || position === 'inner' || position === 'center';
+	        return {
+	            fill: textStyleModel.getTextColor()
+	                || (isLabelInside ? '#fff' : data.getItemVisual(idx, 'color')),
+	            textFont: textStyleModel.getFont(),
+	            text: zrUtil.retrieve(
+	                data.hostModel.getFormattedLabel(idx, state),
+	                data.getName(idx)
+	            )
+	        };
+	    }
+
+	    var opacityAccessPath = ['itemStyle', 'normal', 'opacity'];
+	    funnelPieceProto.updateData = function (data, idx, firstCreate) {
+
+	        var polygon = this.childAt(0);
+
+	        var seriesModel = data.hostModel;
+	        var itemModel = data.getItemModel(idx);
+	        var layout = data.getItemLayout(idx);
+	        var opacity = data.getItemModel(idx).get(opacityAccessPath);
+	        opacity = opacity == null ? 1 : opacity;
+
+	        // Reset style
+	        polygon.useStyle({});
+
+	        if (firstCreate) {
+	            polygon.setShape({
+	                points: layout.points
+	            });
+	            polygon.setStyle({ opacity : 0 });
+	            graphic.initProps(polygon, {
+	                style: {
+	                    opacity: opacity
+	                }
+	            }, seriesModel, idx);
+	        }
+	        else {
+	            graphic.updateProps(polygon, {
+	                style: {
+	                    opacity: opacity
+	                },
+	                shape: {
+	                    points: layout.points
+	                }
+	            }, seriesModel, idx);
+	        }
+
+	        // Update common style
+	        var itemStyleModel = itemModel.getModel('itemStyle');
+	        var visualColor = data.getItemVisual(idx, 'color');
+
+	        polygon.setStyle(
+	            zrUtil.defaults(
+	                {
+	                    lineJoin: 'round',
+	                    fill: visualColor
+	                },
+	                itemStyleModel.getModel('normal').getItemStyle(['opacity'])
+	            )
+	        );
+	        polygon.hoverStyle = itemStyleModel.getModel('emphasis').getItemStyle();
+
+	        this._updateLabel(data, idx);
+
+	        graphic.setHoverStyle(this);
+	    };
+
+	    funnelPieceProto._updateLabel = function (data, idx) {
+
+	        var labelLine = this.childAt(1);
+	        var labelText = this.childAt(2);
+
+	        var seriesModel = data.hostModel;
+	        var itemModel = data.getItemModel(idx);
+	        var layout = data.getItemLayout(idx);
+	        var labelLayout = layout.label;
+	        var visualColor = data.getItemVisual(idx, 'color');
+
+	        graphic.updateProps(labelLine, {
+	            shape: {
+	                points: labelLayout.linePoints || labelLayout.linePoints
+	            }
+	        }, seriesModel, idx);
+
+	        graphic.updateProps(labelText, {
+	            style: {
+	                x: labelLayout.x,
+	                y: labelLayout.y
+	            }
+	        }, seriesModel, idx);
+	        labelText.attr({
+	            style: {
+	                textAlign: labelLayout.textAlign,
+	                textVerticalAlign: labelLayout.verticalAlign,
+	                textFont: labelLayout.font
+	            },
+	            rotation: labelLayout.rotation,
+	            origin: [labelLayout.x, labelLayout.y],
+	            z2: 10
+	        });
+
+	        var labelModel = itemModel.getModel('label.normal');
+	        var labelHoverModel = itemModel.getModel('label.emphasis');
+	        var labelLineModel = itemModel.getModel('labelLine.normal');
+	        var labelLineHoverModel = itemModel.getModel('labelLine.emphasis');
+
+	        labelText.setStyle(getLabelStyle(data, idx, 'normal', labelModel));
+
+	        labelText.ignore = labelText.normalIgnore = !labelModel.get('show');
+	        labelText.hoverIgnore = !labelHoverModel.get('show');
+
+	        labelLine.ignore = labelLine.normalIgnore = !labelLineModel.get('show');
+	        labelLine.hoverIgnore = !labelLineHoverModel.get('show');
+
+	        // Default use item visual color
+	        labelLine.setStyle({
+	            stroke: visualColor
+	        });
+	        labelLine.setStyle(labelLineModel.getModel('lineStyle').getLineStyle());
+
+	        labelText.hoverStyle = getLabelStyle(data, idx, 'emphasis', labelHoverModel);
+	        labelLine.hoverStyle = labelLineHoverModel.getModel('lineStyle').getLineStyle();
+	    };
+
+	    zrUtil.inherits(FunnelPiece, graphic.Group);
+
+
+	    var Funnel = __webpack_require__(42).extend({
+
+	        type: 'funnel',
+
+	        render: function (seriesModel, ecModel, api) {
+	            var data = seriesModel.getData();
+	            var oldData = this._data;
+
+	            var group = this.group;
+
+	            data.diff(oldData)
+	                .add(function (idx) {
+	                    var funnelPiece = new FunnelPiece(data, idx);
+
+	                    data.setItemGraphicEl(idx, funnelPiece);
+
+	                    group.add(funnelPiece);
+	                })
+	                .update(function (newIdx, oldIdx) {
+	                    var piePiece = oldData.getItemGraphicEl(oldIdx);
+
+	                    piePiece.updateData(data, newIdx);
+
+	                    group.add(piePiece);
+	                    data.setItemGraphicEl(newIdx, piePiece);
+	                })
+	                .remove(function (idx) {
+	                    var piePiece = oldData.getItemGraphicEl(idx);
+	                    group.remove(piePiece);
+	                })
+	                .execute();
+
+	            this._data = data;
+	        },
+
+	        remove: function () {
+	            this.group.removeAll();
+	            this._data = null;
+	        }
+	    });
+
+	    module.exports = Funnel;
+
+
+/***/ },
+/* 222 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var layout = __webpack_require__(21);
+	    var number = __webpack_require__(7);
+
+	    var parsePercent = number.parsePercent;
+
+	    function getViewRect(seriesModel, api) {
+	        return layout.getLayoutRect(
+	            seriesModel.getBoxLayoutParams(), {
+	                width: api.getWidth(),
+	                height: api.getHeight()
+	            }
+	        );
+	    }
+
+	    function getSortedIndices(data, sort) {
+	        var valueArr = data.mapArray('value', function (val) {
+	            return val;
+	        });
+	        var indices = [];
+	        var isAscending = sort === 'ascending';
+	        for (var i = 0, len = data.count(); i < len; i++) {
+	            indices[i] = i;
+	        }
+	        indices.sort(function (a, b) {
+	            return isAscending ? valueArr[a] - valueArr[b] : valueArr[b] - valueArr[a];
+	        });
+	        return indices;
+	    }
+
+	    function labelLayout (data) {
+	        data.each(function (idx) {
+	            var itemModel = data.getItemModel(idx);
+	            var labelModel = itemModel.getModel('label.normal');
+	            var labelPosition = labelModel.get('position');
+
+	            var labelLineModel = itemModel.getModel('labelLine.normal');
+
+	            var layout = data.getItemLayout(idx);
+	            var points = layout.points;
+
+	            var isLabelInside = labelPosition === 'inner'
+	                || labelPosition === 'inside' || labelPosition === 'center';
+
+	            var textAlign;
+	            var textX;
+	            var textY;
+	            var linePoints;
+
+	            if (isLabelInside) {
+	                textX = (points[0][0] + points[1][0] + points[2][0] + points[3][0]) / 4;
+	                textY = (points[0][1] + points[1][1] + points[2][1] + points[3][1]) / 4;
+	                textAlign = 'center';
+	                linePoints = [
+	                    [textX, textY], [textX, textY]
+	                ];
+	            }
+	            else {
+	                var x1;
+	                var y1;
+	                var x2;
+	                var labelLineLen = labelLineModel.get('length');
+	                if (labelPosition === 'left') {
+	                    // Left side
+	                    x1 = (points[3][0] + points[0][0]) / 2;
+	                    y1 = (points[3][1] + points[0][1]) / 2;
+	                    x2 = x1 - labelLineLen;
+	                    textX = x2 - 5;
+	                    textAlign = 'right';
+	                }
+	                else {
+	                    // Right side
+	                    x1 = (points[1][0] + points[2][0]) / 2;
+	                    y1 = (points[1][1] + points[2][1]) / 2;
+	                    x2 = x1 + labelLineLen;
+	                    textX = x2 + 5;
+	                    textAlign = 'left';
+	                }
+	                var y2 = y1;
+
+	                linePoints = [[x1, y1], [x2, y2]];
+	                textY = y2;
+	            }
+
+	            layout.label = {
+	                linePoints: linePoints,
+	                x: textX,
+	                y: textY,
+	                verticalAlign: 'middle',
+	                textAlign: textAlign,
+	                inside: isLabelInside
+	            };
+	        });
+	    }
+
+	    module.exports = function (ecModel, api, payload) {
+	        ecModel.eachSeriesByType('funnel', function (seriesModel) {
+	            var data = seriesModel.getData();
+	            var sort = seriesModel.get('sort');
+	            var viewRect = getViewRect(seriesModel, api);
+	            var indices = getSortedIndices(data, sort);
+
+	            var sizeExtent = [
+	                parsePercent(seriesModel.get('minSize'), viewRect.width),
+	                parsePercent(seriesModel.get('maxSize'), viewRect.width)
+	            ];
+	            var dataExtent = data.getDataExtent('value');
+	            var min = seriesModel.get('min');
+	            var max = seriesModel.get('max');
+	            if (min == null) {
+	                min = Math.min(dataExtent[0], 0);
+	            }
+	            if (max == null) {
+	                max = dataExtent[1];
+	            }
+
+	            var funnelAlign = seriesModel.get('funnelAlign');
+	            var gap = seriesModel.get('gap');
+	            var itemHeight = (viewRect.height - gap * (data.count() - 1)) / data.count();
+
+	            var y = viewRect.y;
+
+	            var getLinePoints = function (idx, offY) {
+	                // End point index is data.count() and we assign it 0
+	                var val = data.get('value', idx) || 0;
+	                var itemWidth = number.linearMap(val, [min, max], sizeExtent, true);
+	                var x0;
+	                switch (funnelAlign) {
+	                    case 'left':
+	                        x0 = viewRect.x;
+	                        break;
+	                    case 'center':
+	                        x0 = viewRect.x + (viewRect.width - itemWidth) / 2;
+	                        break;
+	                    case 'right':
+	                        x0 = viewRect.x + viewRect.width - itemWidth;
+	                        break;
+	                }
+	                return [
+	                    [x0, offY],
+	                    [x0 + itemWidth, offY]
+	                ];
+	            };
+
+	            if (sort === 'ascending') {
+	                // From bottom to top
+	                itemHeight = -itemHeight;
+	                gap = -gap;
+	                y += viewRect.height;
+	                indices = indices.reverse();
+	            }
+
+	            for (var i = 0; i < indices.length; i++) {
+	                var idx = indices[i];
+	                var nextIdx = indices[i + 1];
+	                var start = getLinePoints(idx, y);
+	                var end = getLinePoints(nextIdx, y + itemHeight);
+
+	                y += itemHeight + gap;
+
+	                data.setItemLayout(idx, {
+	                    points: start.concat(end.slice().reverse())
+	                });
+	            }
+
+	            labelLayout(data);
+	        });
+	    };
+
+
+/***/ },
+/* 223 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var echarts = __webpack_require__(1);
+
+	    __webpack_require__(224);
+
+	    __webpack_require__(235);
+	    __webpack_require__(236);
+
+	    echarts.registerVisual(__webpack_require__(237));
+
+
+
+/***/ },
+/* 224 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    __webpack_require__(225);
+	    __webpack_require__(228);
+	    __webpack_require__(230);
+
+	    var echarts = __webpack_require__(1);
+	    var zrUtil = __webpack_require__(4);
+
+	    var CLICK_THRESHOLD = 5; // > 4
+
+	    // Parallel view
+	    echarts.extendComponentView({
+	        type: 'parallel',
+
+	        render: function (parallelModel, ecModel, api) {
+	            var zr = api.getZr();
+
+	            if (!this.__onMouseDown) {
+	                // FIXME
+	                // click: mousemove check. otherwise confilct with drag brush.
+	                var mousedownPoint;
+	                zr.on('mousedown', this.__onMouseDown = function (e) {
+	                    mousedownPoint = [e.offsetX, e.offsetY];
+	                });
+	                zr.on('mouseup', this.__onMouseUp = function (e) {
+	                    var point = [e.offsetX, e.offsetY];
+	                    var dist = Math.pow(mousedownPoint[0] - point[0], 2)
+	                        + Math.pow(mousedownPoint[1] - point[1], 2);
+
+	                    if (!parallelModel.get('axisExpandable') || dist > CLICK_THRESHOLD) {
+	                        return;
+	                    }
+
+	                    var coordSys = parallelModel.coordinateSystem;
+	                    var closestDim = coordSys.findClosestAxisDim(point);
+	                    if (closestDim) {
+	                        var axisIndex = zrUtil.indexOf(coordSys.dimensions, closestDim);
+	                        api.dispatchAction({
+	                            type: 'parallelAxisExpand',
+	                            axisExpandCenter: axisIndex
+	                        });
+	                    }
+	                });
+	            }
+	        },
+
+	        dispose: function (ecModel, api) {
+	            api.getZr().off(this.__onMouseDown);
+	            api.getZr().off(this.__onMouseUp);
+	        }
+	    });
+
+	    echarts.registerPreprocessor(
+	        __webpack_require__(234)
+	    );
+
+
+
+/***/ },
+/* 225 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * Parallel coordinate system creater.
+	 */
+
+
+	    var Parallel = __webpack_require__(226);
+
+	    function create(ecModel, api) {
+	        var coordSysList = [];
+
+	        ecModel.eachComponent('parallel', function (parallelModel, idx) {
+	            var coordSys = new Parallel(parallelModel, ecModel, api);
+
+	            coordSys.name = 'parallel_' + idx;
+	            coordSys.resize(parallelModel, api);
+
+	            parallelModel.coordinateSystem = coordSys;
+	            coordSys.model = parallelModel;
+
+	            coordSysList.push(coordSys);
+	        });
+
+	        // Inject the coordinateSystems into seriesModel
+	        ecModel.eachSeries(function (seriesModel) {
+	            if (seriesModel.get('coordinateSystem') === 'parallel') {
+	                var parallelIndex = seriesModel.get('parallelIndex');
+	                seriesModel.coordinateSystem = coordSysList[parallelIndex];
+	            }
+	        });
+
+	        return coordSysList;
+	    }
+
+	    __webpack_require__(26).register('parallel', {create: create});
+
+
+
+/***/ },
+/* 226 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * Parallel Coordinates
+	 * <https://en.wikipedia.org/wiki/Parallel_coordinates>
+	 */
+
+
+	    var layout = __webpack_require__(21);
+	    var axisHelper = __webpack_require__(114);
+	    var zrUtil = __webpack_require__(4);
+	    var ParallelAxis = __webpack_require__(227);
+	    var graphic = __webpack_require__(43);
+	    var matrix = __webpack_require__(11);
+
+	    var each = zrUtil.each;
+
+	    var PI = Math.PI;
+
+	    function Parallel(parallelModel, ecModel, api) {
+
+	        /**
+	         * key: dimension
+	         * @type {Object.<string, module:echarts/coord/parallel/Axis>}
+	         * @private
+	         */
+	        this._axesMap = {};
+
+	        /**
+	         * key: dimension
+	         * value: {position: [], rotation, }
+	         * @type {Object.<string, Object>}
+	         * @private
+	         */
+	        this._axesLayout = {};
+
+	        /**
+	         * Always follow axis order.
+	         * @type {Array.<string>}
+	         * @readOnly
+	         */
+	        this.dimensions = parallelModel.dimensions;
+
+	        /**
+	         * @type {module:zrender/core/BoundingRect}
+	         */
+	        this._rect;
+
+	        /**
+	         * @type {module:echarts/coord/parallel/ParallelModel}
+	         */
+	        this._model = parallelModel;
+
+	        this._init(parallelModel, ecModel, api);
+	    }
+
+	    Parallel.prototype = {
+
+	        type: 'parallel',
+
+	        constructor: Parallel,
+
+	        /**
+	         * Initialize cartesian coordinate systems
+	         * @private
+	         */
+	        _init: function (parallelModel, ecModel, api) {
+
+	            var dimensions = parallelModel.dimensions;
+	            var parallelAxisIndex = parallelModel.parallelAxisIndex;
+
+	            each(dimensions, function (dim, idx) {
+
+	                var axisIndex = parallelAxisIndex[idx];
+	                var axisModel = ecModel.getComponent('parallelAxis', axisIndex);
+
+	                var axis = this._axesMap[dim] = new ParallelAxis(
+	                    dim,
+	                    axisHelper.createScaleByModel(axisModel),
+	                    [0, 0],
+	                    axisModel.get('type'),
+	                    axisIndex
+	                );
+
+	                var isCategory = axis.type === 'category';
+	                axis.onBand = isCategory && axisModel.get('boundaryGap');
+	                axis.inverse = axisModel.get('inverse');
+
+	                // Inject axis into axisModel
+	                axisModel.axis = axis;
+
+	                // Inject axisModel into axis
+	                axis.model = axisModel;
+	            }, this);
+	        },
+
+	        /**
+	         * Update axis scale after data processed
+	         * @param  {module:echarts/model/Global} ecModel
+	         * @param  {module:echarts/ExtensionAPI} api
+	         */
+	        update: function (ecModel, api) {
+	            this._updateAxesFromSeries(this._model, ecModel);
+	        },
+
+	        /**
+	         * Update properties from series
+	         * @private
+	         */
+	        _updateAxesFromSeries: function (parallelModel, ecModel) {
+	            ecModel.eachSeries(function (seriesModel) {
+
+	                if (!parallelModel.contains(seriesModel, ecModel)) {
+	                    return;
+	                }
+
+	                var data = seriesModel.getData();
+
+	                each(this.dimensions, function (dim) {
+	                    var axis = this._axesMap[dim];
+	                    axis.scale.unionExtent(data.getDataExtent(dim));
+	                    axisHelper.niceScaleExtent(axis, axis.model);
+	                }, this);
+	            }, this);
+	        },
+
+	        /**
+	         * Resize the parallel coordinate system.
+	         * @param {module:echarts/coord/parallel/ParallelModel} parallelModel
+	         * @param {module:echarts/ExtensionAPI} api
+	         */
+	        resize: function (parallelModel, api) {
+	            this._rect = layout.getLayoutRect(
+	                parallelModel.getBoxLayoutParams(),
+	                {
+	                    width: api.getWidth(),
+	                    height: api.getHeight()
+	                }
+	            );
+
+	            this._layoutAxes(parallelModel);
+	        },
+
+	        /**
+	         * @return {module:zrender/core/BoundingRect}
+	         */
+	        getRect: function () {
+	            return this._rect;
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _layoutAxes: function (parallelModel) {
+	            var rect = this._rect;
+	            var layout = parallelModel.get('layout');
+	            var axes = this._axesMap;
+	            var dimensions = this.dimensions;
+
+	            var size = [rect.width, rect.height];
+	            var sizeIdx = layout === 'horizontal' ? 0 : 1;
+	            var layoutLength = size[sizeIdx];
+	            var axisLength = size[1 - sizeIdx];
+	            var axisExtent = [0, axisLength];
+
+	            each(axes, function (axis) {
+	                var idx = axis.inverse ? 1 : 0;
+	                axis.setExtent(axisExtent[idx], axisExtent[1 - idx]);
+	            });
+
+	            var axisExpandable = parallelModel.get('axisExpandable');
+	            var axisExpandWidth = parallelModel.get('axisExpandWidth');
+	            var axisExpandCenter = parallelModel.get('axisExpandCenter');
+	            var axisExpandCount = parallelModel.get('axisExpandCount') || 0;
+	            var axisExpandWindow;
+
+	            if (axisExpandCenter != null) {
+	                // Clamp
+	                var left = Math.max(0, Math.floor(axisExpandCenter - (axisExpandCount - 1) / 2));
+	                var right = left + axisExpandCount - 1;
+	                if (right >= dimensions.length) {
+	                    right = dimensions.length - 1;
+	                    left = Math.max(0, Math.floor(right - axisExpandCount + 1));
+	                }
+	                axisExpandWindow = [left, right];
+	            }
+
+	            var calcPos = (axisExpandable && axisExpandWindow && axisExpandWidth)
+	                ? function (axisIndex, layoutLength, axisCount) {
+	                    var peekIntervalCount = axisExpandWindow[1] - axisExpandWindow[0];
+	                    var otherWidth = (
+	                        layoutLength - axisExpandWidth * peekIntervalCount
+	                    ) / (axisCount - 1 - peekIntervalCount);
+
+	                    var position;
+
+	                    if (axisIndex < axisExpandWindow[0]) {
+	                        position = (axisIndex - 1) * otherWidth;
+	                    }
+	                    else if (axisIndex <= axisExpandWindow[1]) {
+	                        position = axisExpandWindow[0] * otherWidth
+	                            + (axisIndex - axisExpandWindow[0]) * axisExpandWidth;
+	                    }
+	                    else if (axisIndex === axisCount - 1) {
+	                        position = layoutLength;
+	                    }
+	                    else {
+	                        position = axisExpandWindow[0] * otherWidth
+	                            + peekIntervalCount * axisExpandWidth
+	                            + (axisIndex - axisExpandWindow[1]) * otherWidth;
+	                    }
+
+	                    return {
+	                        position: position,
+	                        axisNameAvailableWidth: (
+	                            axisExpandWindow[0] < axisIndex && axisIndex < axisExpandWindow[1]
+	                        ) ? axisExpandWidth : otherWidth
+	                    };
+	                }
+	                : function (axisIndex, layoutLength, axisCount) {
+	                    var step = layoutLength / (axisCount - 1);
+	                    return {
+	                        position: step * axisIndex,
+	                        axisNameAvailableWidth: step
+	                    };
+	                };
+
+	            each(dimensions, function (dim, idx) {
+	                var posInfo = calcPos(idx, layoutLength, dimensions.length);
+
+	                var positionTable = {
+	                    horizontal: {
+	                        x: posInfo.position,
+	                        y: axisLength
+	                    },
+	                    vertical: {
+	                        x: 0,
+	                        y: posInfo.position
+	                    }
+	                };
+	                var rotationTable = {
+	                    horizontal: PI / 2,
+	                    vertical: 0
+	                };
+
+	                var position = [
+	                    positionTable[layout].x + rect.x,
+	                    positionTable[layout].y + rect.y
+	                ];
+
+	                var rotation = rotationTable[layout];
+	                var transform = matrix.create();
+	                matrix.rotate(transform, transform, rotation);
+	                matrix.translate(transform, transform, position);
+
+	                // TODO
+	                // tick等排布信息。
+
+	                // TODO
+	                // 根据axis order 更新 dimensions顺序。
+
+	                this._axesLayout[dim] = {
+	                    position: position,
+	                    rotation: rotation,
+	                    transform: transform,
+	                    axisNameAvailableWidth: posInfo.axisNameAvailableWidth,
+	                    tickDirection: 1,
+	                    labelDirection: 1,
+	                    axisExpandWindow: axisExpandWindow
+	                };
+	            }, this);
+	        },
+
+	        /**
+	         * Get axis by dim.
+	         * @param {string} dim
+	         * @return {module:echarts/coord/parallel/ParallelAxis} [description]
+	         */
+	        getAxis: function (dim) {
+	            return this._axesMap[dim];
+	        },
+
+	        /**
+	         * Convert a dim value of a single item of series data to Point.
+	         * @param {*} value
+	         * @param {string} dim
+	         * @return {Array}
+	         */
+	        dataToPoint: function (value, dim) {
+	            return this.axisCoordToPoint(
+	                this._axesMap[dim].dataToCoord(value),
+	                dim
+	            );
+	        },
+
+	        /**
+	         * Travel data for one time, get activeState of each data item.
+	         * @param {module:echarts/data/List} data
+	         * @param {Functio} cb param: {string} activeState 'active' or 'inactive' or 'normal'
+	         *                            {number} dataIndex
+	         * @param {Object} context
+	         */
+	        eachActiveState: function (data, callback, context) {
+	            var dimensions = this.dimensions;
+	            var axesMap = this._axesMap;
+	            var hasActiveSet = this.hasAxisbrushed();
+
+	            for (var i = 0, len = data.count(); i < len; i++) {
+	                var values = data.getValues(dimensions, i);
+	                var activeState;
+
+	                if (!hasActiveSet) {
+	                    activeState = 'normal';
+	                }
+	                else {
+	                    activeState = 'active';
+	                    for (var j = 0, lenj = dimensions.length; j < lenj; j++) {
+	                        var dimName = dimensions[j];
+	                        var state = axesMap[dimName].model.getActiveState(values[j], j);
+
+	                        if (state === 'inactive') {
+	                            activeState = 'inactive';
+	                            break;
+	                        }
+	                    }
+	                }
+
+	                callback.call(context, activeState, i);
+	            }
+	        },
+
+	        /**
+	         * Whether has any activeSet.
+	         * @return {boolean}
+	         */
+	        hasAxisbrushed: function () {
+	            var dimensions = this.dimensions;
+	            var axesMap = this._axesMap;
+	            var hasActiveSet = false;
+
+	            for (var j = 0, lenj = dimensions.length; j < lenj; j++) {
+	                if (axesMap[dimensions[j]].model.getActiveState() !== 'normal') {
+	                    hasActiveSet = true;
+	                }
+	            }
+
+	            return hasActiveSet;
+	        },
+
+	        /**
+	         * Convert coords of each axis to Point.
+	         *  Return point. For example: [10, 20]
+	         * @param {Array.<number>} coords
+	         * @param {string} dim
+	         * @return {Array.<number>}
+	         */
+	        axisCoordToPoint: function (coord, dim) {
+	            var axisLayout = this._axesLayout[dim];
+	            return graphic.applyTransform([coord, 0], axisLayout.transform);
+	        },
+
+	        /**
+	         * Get axis layout.
+	         */
+	        getAxisLayout: function (dim) {
+	            return zrUtil.clone(this._axesLayout[dim]);
+	        },
+
+	        findClosestAxisDim: function (point) {
+	            var axisDim;
+	            var minDist = Infinity;
+
+	            zrUtil.each(this._axesLayout, function (axisLayout, dim) {
+	                var localPoint = graphic.applyTransform(point, axisLayout.transform, true);
+	                var extent = this._axesMap[dim].getExtent();
+
+	                if (localPoint[0] < extent[0] || localPoint[0] > extent[1]) {
+	                    return;
+	                }
+
+	                var dist = Math.abs(localPoint[1]);
+	                if (dist < minDist) {
+	                    minDist = dist;
+	                    axisDim = dim;
+	                }
+	            }, this);
+
+	            return axisDim;
+	        }
+
+	    };
+
+	    module.exports = Parallel;
+
+
+/***/ },
+/* 227 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+	    var Axis = __webpack_require__(123);
+
+	    /**
+	     * @constructor module:echarts/coord/parallel/ParallelAxis
+	     * @extends {module:echarts/coord/Axis}
+	     * @param {string} dim
+	     * @param {*} scale
+	     * @param {Array.<number>} coordExtent
+	     * @param {string} axisType
+	     */
+	    var ParallelAxis = function (dim, scale, coordExtent, axisType, axisIndex) {
+
+	        Axis.call(this, dim, scale, coordExtent);
+
+	        /**
+	         * Axis type
+	         *  - 'category'
+	         *  - 'value'
+	         *  - 'time'
+	         *  - 'log'
+	         * @type {string}
+	         */
+	        this.type = axisType || 'value';
+
+	        /**
+	         * @type {number}
+	         * @readOnly
+	         */
+	        this.axisIndex = axisIndex;
+	    };
+
+	    ParallelAxis.prototype = {
+
+	        constructor: ParallelAxis,
+
+	        /**
+	         * Axis model
+	         * @param {module:echarts/coord/parallel/AxisModel}
+	         */
+	        model: null
+
+	    };
+
+	    zrUtil.inherits(ParallelAxis, Axis);
+
+	    module.exports = ParallelAxis;
+
+
+/***/ },
+/* 228 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+	    var Component = __webpack_require__(19);
+
+	    __webpack_require__(229);
+
+	    Component.extend({
+
+	        type: 'parallel',
+
+	        dependencies: ['parallelAxis'],
+
+	        /**
+	         * @type {module:echarts/coord/parallel/Parallel}
+	         */
+	        coordinateSystem: null,
+
+	        /**
+	         * Each item like: 'dim0', 'dim1', 'dim2', ...
+	         * @type {Array.<string>}
+	         * @readOnly
+	         */
+	        dimensions: null,
+
+	        /**
+	         * Coresponding to dimensions.
+	         * @type {Array.<number>}
+	         * @readOnly
+	         */
+	        parallelAxisIndex: null,
+
+	        layoutMode: 'box',
+
+	        defaultOption: {
+	            zlevel: 0,
+	            z: 0,
+	            left: 80,
+	            top: 60,
+	            right: 80,
+	            bottom: 60,
+	            // width: {totalWidth} - left - right,
+	            // height: {totalHeight} - top - bottom,
+
+	            layout: 'horizontal',      // 'horizontal' or 'vertical'
+
+	            // FIXME
+	            // naming?
+	            axisExpandable: false,
+	            axisExpandCenter: null,
+	            axisExpandCount: 0,
+	            axisExpandWidth: 50,      // FIXME '10%' ?
+
+	            parallelAxisDefault: null
+	        },
+
+	        /**
+	         * @override
+	         */
+	        init: function () {
+	            Component.prototype.init.apply(this, arguments);
+
+	            this.mergeOption({});
+	        },
+
+	        /**
+	         * @override
+	         */
+	        mergeOption: function (newOption) {
+	            var thisOption = this.option;
+
+	            newOption && zrUtil.merge(thisOption, newOption, true);
+
+	            this._initDimensions();
+	        },
+
+	        /**
+	         * Whether series or axis is in this coordinate system.
+	         * @param {module:echarts/model/Series|module:echarts/coord/parallel/AxisModel} model
+	         * @param {module:echarts/model/Global} ecModel
+	         */
+	        contains: function (model, ecModel) {
+	            var parallelIndex = model.get('parallelIndex');
+	            return parallelIndex != null
+	                && ecModel.getComponent('parallel', parallelIndex) === this;
+	        },
+
+	        setAxisExpand: function (opt) {
+	            zrUtil.each(
+	                ['axisExpandable', 'axisExpandCenter', 'axisExpandCount', 'axisExpandWidth'],
+	                function (name) {
+	                    if (opt.hasOwnProperty(name)) {
+	                        this.option[name] = opt[name];
+	                    }
+	                },
+	                this
+	            );
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _initDimensions: function () {
+	            var dimensions = this.dimensions = [];
+	            var parallelAxisIndex = this.parallelAxisIndex = [];
+
+	            var axisModels = zrUtil.filter(this.dependentModels.parallelAxis, function (axisModel) {
+	                // Can not use this.contains here, because
+	                // initialization has not been completed yet.
+	                return axisModel.get('parallelIndex') === this.componentIndex;
+	            });
+
+	            zrUtil.each(axisModels, function (axisModel) {
+	                dimensions.push('dim' + axisModel.get('dim'));
+	                parallelAxisIndex.push(axisModel.componentIndex);
+	            });
+	        }
+
+	    });
+
+
+
+/***/ },
+/* 229 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var ComponentModel = __webpack_require__(19);
+	    var zrUtil = __webpack_require__(4);
+	    var makeStyleMapper = __webpack_require__(15);
+	    var axisModelCreator = __webpack_require__(127);
+	    var numberUtil = __webpack_require__(7);
+
+	    var AxisModel = ComponentModel.extend({
+
+	        type: 'baseParallelAxis',
+
+	        /**
+	         * @type {module:echarts/coord/parallel/Axis}
+	         */
+	        axis: null,
+
+	        /**
+	         * @type {Array.<Array.<number>}
+	         * @readOnly
+	         */
+	        activeIntervals: [],
+
+	        /**
+	         * @return {Object}
+	         */
+	        getAreaSelectStyle: function () {
+	            return makeStyleMapper(
+	                [
+	                    ['fill', 'color'],
+	                    ['lineWidth', 'borderWidth'],
+	                    ['stroke', 'borderColor'],
+	                    ['width', 'width'],
+	                    ['opacity', 'opacity']
+	                ]
+	            ).call(this.getModel('areaSelectStyle'));
+	        },
+
+	        /**
+	         * The code of this feature is put on AxisModel but not ParallelAxis,
+	         * because axisModel can be alive after echarts updating but instance of
+	         * ParallelAxis having been disposed. this._activeInterval should be kept
+	         * when action dispatched (i.e. legend click).
+	         *
+	         * @param {Array.<Array<number>>} intervals interval.length === 0
+	         *                                          means set all active.
+	         * @public
+	         */
+	        setActiveIntervals: function (intervals) {
+	            var activeIntervals = this.activeIntervals = zrUtil.clone(intervals);
+
+	            // Normalize
+	            if (activeIntervals) {
+	                for (var i = activeIntervals.length - 1; i >= 0; i--) {
+	                    numberUtil.asc(activeIntervals[i]);
+	                }
+	            }
+	        },
+
+	        /**
+	         * @param {number|string} [value] When attempting to detect 'no activeIntervals set',
+	         *                         value can not be input.
+	         * @return {string} 'normal': no activeIntervals set,
+	         *                  'active',
+	         *                  'inactive'.
+	         * @public
+	         */
+	        getActiveState: function (value) {
+	            var activeIntervals = this.activeIntervals;
+
+	            if (!activeIntervals.length) {
+	                return 'normal';
+	            }
+
+	            if (value == null) {
+	                return 'inactive';
+	            }
+
+	            for (var i = 0, len = activeIntervals.length; i < len; i++) {
+	                if (activeIntervals[i][0] <= value && value <= activeIntervals[i][1]) {
+	                    return 'active';
+	                }
+	            }
+	            return 'inactive';
+	        }
+
+	    });
+
+	    var defaultOption = {
+
+	        type: 'value',
+
+	        /**
+	         * @type {Array.<number>}
+	         */
+	        dim: null, // 0, 1, 2, ...
+
+	        parallelIndex: null,
+
+	        areaSelectStyle: {
+	            width: 20,
+	            borderWidth: 1,
+	            borderColor: 'rgba(160,197,232)',
+	            color: 'rgba(160,197,232)',
+	            opacity: 0.3
+	        },
+
+	        realtime: true, // Whether realtime update view when select.
+
+	        z: 10
+	    };
+
+	    zrUtil.merge(AxisModel.prototype, __webpack_require__(129));
+
+	    function getAxisType(axisName, option) {
+	        return option.type || (option.data ? 'category' : 'value');
+	    }
+
+	    axisModelCreator('parallel', AxisModel, getAxisType, defaultOption);
+
+	    module.exports = AxisModel;
+
+
+/***/ },
+/* 230 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    __webpack_require__(225);
+	    __webpack_require__(231);
+	    __webpack_require__(232);
+
+
+
+/***/ },
+/* 231 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var echarts = __webpack_require__(1);
+
+	    /**
+	     * @payload
+	     * @property {string} parallelAxisId
+	     * @property {Array.<Array.<number>>} intervals
+	     */
+	    var actionInfo = {
+	        type: 'axisAreaSelect',
+	        event: 'axisAreaSelected',
+	        update: 'updateVisual'
+	    };
+	    echarts.registerAction(actionInfo, function (payload, ecModel) {
+	        ecModel.eachComponent(
+	            {mainType: 'parallelAxis', query: payload},
+	            function (parallelAxisModel) {
+	                parallelAxisModel.axis.model.setActiveIntervals(payload.intervals);
+	            }
+	        );
+	    });
+
+	    /**
+	     * @payload
+	     */
+	    echarts.registerAction('parallelAxisExpand', function (payload, ecModel) {
+	        ecModel.eachComponent(
+	            {mainType: 'parallel', query: payload},
+	            function (parallelModel) {
+	                parallelModel.setAxisExpand(payload);
+	            }
+	        );
+
+	    });
+
+
+/***/ },
+/* 232 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+	    var AxisBuilder = __webpack_require__(132);
+	    var BrushController = __webpack_require__(233);
+	    var graphic = __webpack_require__(43);
+
+	    var elementList = ['axisLine', 'axisLabel', 'axisTick', 'axisName'];
+
+	    var AxisView = __webpack_require__(1).extendComponentView({
+
+	        type: 'parallelAxis',
+
+	        /**
+	         * @override
+	         */
+	        init: function (ecModel, api) {
+	            AxisView.superApply(this, 'init', arguments);
+
+	            /**
+	             * @type {module:echarts/component/helper/BrushController}
+	             */
+	            (this._brushController = new BrushController(api.getZr()))
+	                .on('brush', zrUtil.bind(this._onBrush, this));
+	        },
+
+	        /**
+	         * @override
+	         */
+	        render: function (axisModel, ecModel, api, payload) {
+	            if (fromAxisAreaSelect(axisModel, ecModel, payload)) {
+	                return;
+	            }
+
+	            this.axisModel = axisModel;
+	            this.api = api;
+
+	            this.group.removeAll();
+
+	            var oldAxisGroup = this._axisGroup;
+	            this._axisGroup = new graphic.Group();
+	            this.group.add(this._axisGroup);
+
+	            if (!axisModel.get('show')) {
+	                return;
+	            }
+
+	            var coordSys = ecModel.getComponent(
+	                'parallel', axisModel.get('parallelIndex')
+	            ).coordinateSystem;
+
+	            var areaSelectStyle = axisModel.getAreaSelectStyle();
+	            var areaWidth = areaSelectStyle.width;
+
+	            var dim = axisModel.axis.dim;
+	            var axisLayout = coordSys.getAxisLayout(dim);
+
+	            // Fetch from axisModel by default.
+	            var axisLabelShow;
+	            var axisIndex = zrUtil.indexOf(coordSys.dimensions, dim);
+
+	            var axisExpandWindow = axisLayout.axisExpandWindow;
+	            if (axisExpandWindow
+	                && (axisIndex <= axisExpandWindow[0] || axisIndex >= axisExpandWindow[1])
+	            ) {
+	                axisLabelShow = false;
+	            }
+
+	            var builderOpt = zrUtil.extend(
+	                {
+	                    axisLabelShow: axisLabelShow,
+	                    strokeContainThreshold: areaWidth
+	                },
+	                axisLayout
+	            );
+
+	            var axisBuilder = new AxisBuilder(axisModel, builderOpt);
+
+	            zrUtil.each(elementList, axisBuilder.add, axisBuilder);
+
+	            this._axisGroup.add(axisBuilder.getGroup());
+
+	            this._refreshBrushController(builderOpt, areaSelectStyle, axisModel, areaWidth);
+
+	            graphic.groupTransition(oldAxisGroup, this._axisGroup, axisModel);
+	        },
+
+	        _refreshBrushController: function (builderOpt, areaSelectStyle, axisModel, areaWidth) {
+	            // After filtering, axis may change, select area needs to be update.
+	            var axis = axisModel.axis;
+	            var coverInfoList = zrUtil.map(axisModel.activeIntervals, function (interval) {
+	                return {
+	                    brushType: 'lineX',
+	                    panelId: 'pl',
+	                    range: [
+	                        axis.dataToCoord(interval[0], true),
+	                        axis.dataToCoord(interval[1], true)
+	                    ]
+	                };
+	            });
+
+	            var extent = axis.getExtent();
+	            var extra = 30; // Arbitrary value.
+	            var rect = {
+	                x: extent[0] - extra,
+	                y: -areaWidth / 2,
+	                width: extent[1] - extent[0] + 2 * extra,
+	                height: areaWidth
+	            };
+
+	            this._brushController
+	                .mount({
+	                    enableGlobalPan: true,
+	                    rotation: builderOpt.rotation,
+	                    position: builderOpt.position
+	                })
+	                .setPanels([{
+	                    panelId: 'pl',
+	                    rect: rect
+	                }])
+	                .enableBrush({
+	                    brushType: 'lineX',
+	                    brushStyle: areaSelectStyle,
+	                    removeOnClick: true
+	                })
+	                .updateCovers(coverInfoList);
+	        },
+
+	        _onBrush: function (coverInfoList, opt) {
+	            // Do not cache these object, because the mey be changed.
+	            var axisModel = this.axisModel;
+	            var axis = axisModel.axis;
+
+	            var intervals = zrUtil.map(coverInfoList, function (coverInfo) {
+	                return [
+	                    axis.coordToData(coverInfo.range[0], true),
+	                    axis.coordToData(coverInfo.range[1], true)
+	                ];
+	            });
+
+	            // If realtime is true, action is not dispatched on drag end, because
+	            // the drag end emits the same params with the last drag move event,
+	            // and may have some delay when using touch pad.
+	            if (!axisModel.option.realtime === opt.isEnd || opt.removeOnClick) { // jshint ignore:line
+	                this.api.dispatchAction({
+	                    type: 'axisAreaSelect',
+	                    parallelAxisId: axisModel.id,
+	                    intervals: intervals
+	                });
+	            }
+	        },
+
+	        /**
+	         * @override
+	         */
+	        dispose: function () {
+	            this._brushController.dispose();
+	        }
+	    });
+
+	    function fromAxisAreaSelect(axisModel, ecModel, payload) {
+	        return payload
+	            && payload.type === 'axisAreaSelect'
+	            && ecModel.findComponents(
+	                {mainType: 'parallelAxis', query: payload}
+	            )[0] === axisModel;
+	    }
+
+	    module.exports = AxisView;
+
+
+/***/ },
+/* 233 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * Box selection tool.
+	 *
+	 * @module echarts/component/helper/BrushController
+	 */
+
+
+
+	    var Eventful = __webpack_require__(33);
+	    var zrUtil = __webpack_require__(4);
+	    var graphic = __webpack_require__(43);
+	    var interactionMutex = __webpack_require__(175);
+	    var DataDiffer = __webpack_require__(98);
+
+	    var curry = zrUtil.curry;
+	    var each = zrUtil.each;
+	    var map = zrUtil.map;
+	    var mathMin = Math.min;
+	    var mathMax = Math.max;
+	    var mathPow = Math.pow;
+
+	    var COVER_Z = 10000;
+	    var UNSELECT_THRESHOLD = 6;
+	    var MIN_RESIZE_LINE_WIDTH = 6;
+	    var MUTEX_RESOURCE_KEY = 'globalPan';
+
+	    var DIRECTION_MAP = {
+	        w: [0, 0],
+	        e: [0, 1],
+	        n: [1, 0],
+	        s: [1, 1]
+	    };
+	    var CURSOR_MAP = {
+	        w: 'ew',
+	        e: 'ew',
+	        n: 'ns',
+	        s: 'ns',
+	        ne: 'nesw',
+	        sw: 'nesw',
+	        nw: 'nwse',
+	        se: 'nwse'
+	    };
+	    var DEFAULT_BRUSH_OPT = {
+	        brushStyle: {
+	            lineWidth: 2,
+	            stroke: 'rgba(0,0,0,0.3)',
+	            fill: 'rgba(0,0,0,0.1)'
+	        },
+	        transformable: true,
+	        brushMode: 'single',
+	        removeOnClick: false
+	    };
+
+	    var baseUID = 0;
+
+	    /**
+	     * @alias module:echarts/component/helper/BrushController
+	     * @constructor
+	     * @mixin {module:zrender/mixin/Eventful}
+	     * @event module:echarts/component/helper/BrushController#brush
+	     *        params:
+	     *            areas: Array.<Array>, coord relates to container group,
+	     *                                    If no container specified, to global.
+	     *            opt {
+	     *                isEnd: boolean,
+	     *                removeOnClick: boolean
+	     *            }
+	     *
+	     * @param {module:zrender/zrender~ZRender} zr
+	     */
+	    function BrushController(zr) {
+
+	        if (true) {
+	            zrUtil.assert(zr);
+	        }
+
+	        Eventful.call(this);
+
+	        /**
+	         * @type {module:zrender/zrender~ZRender}
+	         * @private
+	         */
+	        this._zr = zr;
+
+	        /**
+	         * @type {module:zrender/container/Group}
+	         * @readOnly
+	         */
+	        this.group = new graphic.Group();
+
+	        /**
+	         * Only for drawing (after enabledBrush).
+	         * @private
+	         * @type {string}
+	         */
+	        this._brushType;
+
+	        /**
+	         * Only for drawing (after enabledBrush).
+	         * @private
+	         * @type {Object}
+	         */
+	        this._brushOption;
+
+	        /**
+	         * @private
+	         * @type {Object}
+	         */
+	        this._panels;
+
+	        /**
+	         * @private
+	         * @type {Array.<nubmer>}
+	         */
+	        this._track = [];
+
+	        /**
+	         * @private
+	         * @type {boolean}
+	         */
+	        this._dragging;
+
+	        /**
+	         * @private
+	         * @type {Array}
+	         */
+	        this._covers = [];
+
+	        /**
+	         * @private
+	         * @type {moudule:zrender/container/Group}
+	         */
+	        this._creatingCover;
+
+	        /**
+	         * true means global panel
+	         * @private
+	         * @type {module:zrender/container/Group|boolean}
+	         */
+	        this._creatingPanel;
+
+	        /**
+	         * @private
+	         * @type {boolean}
+	         */
+	        this._enableGlobalPan;
+
+	        /**
+	         * @private
+	         * @type {boolean}
+	         */
+	        if (true) {
+	            this._mounted;
+	        }
+
+	        /**
+	         * @private
+	         * @type {string}
+	         */
+	        this._uid = 'brushController_' + baseUID++;
+
+	        /**
+	         * @private
+	         * @type {Object}
+	         */
+	        this._handlers = {};
+	        each(mouseHandlers, function (handler, eventName) {
+	            this._handlers[eventName] = zrUtil.bind(handler, this);
+	        }, this);
+	    }
+
+	    BrushController.prototype = {
+
+	        constructor: BrushController,
+
+	        /**
+	         * If set to null/undefined/false, select disabled.
+	         * @param {Object} brushOption
+	         * @param {string|boolean} brushOption.brushType 'line', 'rect', 'polygon' or false
+	         *                          If pass false/null/undefined, disable brush.
+	         * @param {number} [brushOption.brushMode='single'] 'single' or 'multiple'
+	         * @param {boolean} [brushOption.transformable=true]
+	         * @param {boolean} [brushOption.removeOnClick=false]
+	         * @param {Object} [brushOption.brushStyle]
+	         * @param {number} [brushOption.brushStyle.width]
+	         * @param {number} [brushOption.brushStyle.lineWidth]
+	         * @param {string} [brushOption.brushStyle.stroke]
+	         * @param {string} [brushOption.brushStyle.fill]
+	         */
+	        enableBrush: function (brushOption) {
+	            if (true) {
+	                zrUtil.assert(this._mounted);
+	            }
+
+	            this._brushType && doDisableBrush(this);
+	            brushOption.brushType && doEnableBrush(this, brushOption);
+
+	            return this;
+	        },
+
+	        /**
+	         * @param {Array.<Object>} panelOpts If not pass, it is global brush.
+	         *        Each items: {panelId, rect}
+	         */
+	        setPanels: function (panelOpts) {
+	            var oldPanels = this._panels || {};
+	            var newPanels = this._panels = panelOpts && panelOpts.length && {};
+	            var thisGroup = this.group;
+
+	            newPanels && each(panelOpts, function (panelOpt) {
+	                var panelId = panelOpt.panelId;
+	                var panel = oldPanels[panelId];
+	                if (!panel) {
+	                    panel = new graphic.Rect({
+	                        silent: true,
+	                        invisible: true
+	                    });
+	                    thisGroup.add(panel);
+	                }
+	                panel.attr('shape', panelOpt.rect);
+	                panel.__brushPanelId = panelId;
+	                newPanels[panelId] = panel;
+	                oldPanels[panelId] = null;
+	            });
+
+	            each(oldPanels, function (panel) {
+	                panel && thisGroup.remove(panel);
+	            });
+
+	            return this;
+	        },
+
+	        /**
+	         * @param {Object} [opt]
+	         * @return {boolean} [opt.enableGlobalPan=false]
+	         * @return {boolean} [opt.position=[0, 0]]
+	         * @return {boolean} [opt.rotation=0]
+	         * @return {boolean} [opt.scale=[1, 1]]
+	         */
+	        mount: function (opt) {
+	            opt = opt || {};
+
+	            if (true) {
+	                this._mounted = true; // should be at first.
+	            }
+
+	            this._enableGlobalPan = opt.enableGlobalPan;
+
+	            var thisGroup = this.group;
+	            this._zr.add(thisGroup);
+
+	            thisGroup.attr({
+	                position: opt.position || [0, 0],
+	                rotation: opt.rotation || 0,
+	                scale: opt.scale || [1, 1]
+	            });
+
+	            return this;
+	        },
+
+	        eachCover: function (cb, context) {
+	            each(this._covers, cb, context);
+	        },
+
+	        /**
+	         * Update covers.
+	         * @param {Array.<Object>} brushOptionList Like:
+	         *        [
+	         *            {id: 'xx', brushType: 'line', range: [23, 44], brushStyle, transformable},
+	         *            {id: 'yy', brushType: 'rect', range: [[23, 44], [23, 54]]},
+	         *            ...
+	         *        ]
+	         *        `brushType` is required in each cover info.
+	         *        `id` is not mandatory.
+	         *        `brushStyle`, `transformable` is not mandatory, use DEFAULT_BRUSH_OPT by default.
+	         *        If brushOptionList is null/undefined, all covers removed.
+	         */
+	        updateCovers: function (brushOptionList) {
+	            if (true) {
+	                zrUtil.assert(this._mounted);
+	            }
+
+	            brushOptionList = zrUtil.map(brushOptionList, function (brushOption) {
+	                return zrUtil.merge(zrUtil.clone(DEFAULT_BRUSH_OPT), brushOption, true);
+	            });
+
+	            var tmpIdPrefix = '\0-brush-index-';
+	            var oldCovers = this._covers;
+	            var newCovers = this._covers = [];
+	            var controller = this;
+	            var creatingCover = this._creatingCover;
+
+	            (new DataDiffer(oldCovers, brushOptionList, oldGetKey, getKey))
+	                .add(addOrUpdate)
+	                .update(addOrUpdate)
+	                .remove(remove)
+	                .execute();
+
+	            return this;
+
+	            function getKey(brushOption, index) {
+	                return (brushOption.id != null ? brushOption.id : tmpIdPrefix + index)
+	                    + '-' + brushOption.brushType;
+	            }
+
+	            function oldGetKey(cover, index) {
+	                return getKey(cover.__brushOption, index);
+	            }
+
+	            function addOrUpdate(newIndex, oldIndex) {
+	                var newBrushOption = brushOptionList[newIndex];
+	                // Consider setOption in event listener of brushSelect,
+	                // where updating cover when creating should be forbiden.
+	                if (oldIndex != null && oldCovers[oldIndex] === creatingCover) {
+	                    newCovers[newIndex] = oldCovers[oldIndex];
+	                }
+	                else {
+	                    var cover = newCovers[newIndex] = oldIndex != null
+	                        ? (
+	                            oldCovers[oldIndex].__brushOption = newBrushOption,
+	                            oldCovers[oldIndex]
+	                        )
+	                        : endCreating(controller, createCover(controller, newBrushOption));
+	                    updateCoverAfterCreation(controller, cover);
+	                }
+	            }
+
+	            function remove(oldIndex) {
+	                if (oldCovers[oldIndex] !== creatingCover) {
+	                    controller.group.remove(oldCovers[oldIndex]);
+	                }
+	            }
+	        },
+
+	        unmount: function () {
+	            this.enableBrush(false);
+
+	            // container may 'removeAll' outside.
+	            clearCovers(this);
+	            this._zr.remove(this.group);
+
+	            if (true) {
+	                this._mounted = false; // should be at last.
+	            }
+
+	            return this;
+	        },
+
+	        dispose: function () {
+	            this.unmount();
+	            this.off();
+	        }
+	    };
+
+	    zrUtil.mixin(BrushController, Eventful);
+
+
+	    function doEnableBrush(controller, brushOption) {
+	        var zr = controller._zr;
+
+	        // Consider roam, which takes globalPan too.
+	        if (!controller._enableGlobalPan) {
+	            interactionMutex.take(zr, MUTEX_RESOURCE_KEY, controller._uid);
+	        }
+
+	        each(controller._handlers, function (handler, eventName) {
+	            zr.on(eventName, handler);
+	        });
+
+	        controller._brushType = brushOption.brushType;
+	        controller._brushOption = zrUtil.merge(zrUtil.clone(DEFAULT_BRUSH_OPT), brushOption, true);
+	    }
+
+	    function doDisableBrush(controller) {
+	        var zr = controller._zr;
+
+	        interactionMutex.release(zr, MUTEX_RESOURCE_KEY, controller._uid);
+
+	        each(controller._handlers, function (handler, eventName) {
+	            zr.off(eventName, handler);
+	        });
+
+	        controller._brushType = controller._brushOption = null;
+	    }
+
+	    function createCover(controller, brushOption) {
+	        var cover = coverRenderers[brushOption.brushType].createCover(controller, brushOption);
+	        updateZ(cover);
+	        cover.__brushOption = brushOption;
+	        controller.group.add(cover);
+	        return cover;
+	    }
+
+	    function endCreating(controller, creatingCover) {
+	        var coverRenderer = getCoverRenderer(creatingCover);
+	        if (coverRenderer.endCreating) {
+	            coverRenderer.endCreating(controller, creatingCover);
+	            updateZ(creatingCover);
+	        }
+	        return creatingCover;
+	    }
+
+	    function updateCoverShape(controller, cover) {
+	        var brushOption = cover.__brushOption;
+	        getCoverRenderer(cover).updateCoverShape(
+	            controller, cover, brushOption.range, brushOption
+	        );
+	    }
+
+	    function updateZ(group) {
+	        group.traverse(function (el) {
+	            el.z = COVER_Z;
+	            el.z2 = COVER_Z; // Consider in given container.
+	        });
+	    }
+
+	    function updateCoverAfterCreation(controller, cover) {
+	        getCoverRenderer(cover).updateCommon(controller, cover);
+	        updateCoverShape(controller, cover);
+	    }
+
+	    function getCoverRenderer(cover) {
+	        return coverRenderers[cover.__brushOption.brushType];
+	    }
+
+	    function getPanelByPoint(controller, x, y) {
+	        var panels = controller._panels;
+	        if (!panels) {
+	            return true; // Global panel
+	        }
+	        var panel;
+	        each(panels, function (pn) {
+	            pn.contain(x, y) && (panel = pn);
+	        });
+	        return panel;
+	    }
+
+	    function getPanelByCover(controller, cover) {
+	        var panels = controller._panels;
+	        if (!panels) {
+	            return true; // Global panel
+	        }
+	        var panelId = cover.__brushOption.panelId;
+	        // User may give cover without coord sys info,
+	        // which is then treated as global panel.
+	        return panelId != null ? panels[panelId] : true;
+	    }
+
+	    function clearCovers(controller) {
+	        var covers = controller._covers;
+	        var originalLength = covers.length;
+	        each(covers, function (cover) {
+	            controller.group.remove(cover);
+	        }, controller);
+	        covers.length = 0;
+
+	        return !!originalLength;
+	    }
+
+	    function trigger(controller, opt) {
+	        var areas = map(controller._covers, function (cover) {
+	            var brushOption = cover.__brushOption;
+	            var range = zrUtil.clone(brushOption.range);
+
+	            return {
+	                brushType: brushOption.brushType,
+	                panelId: brushOption.panelId,
+	                range: range
+	            };
+	        });
+
+	        controller.trigger('brush', areas, {
+	            isEnd: !!opt.isEnd,
+	            removeOnClick: !!opt.removeOnClick
+	        });
+	    }
+
+	    function shouldShowCover(controller) {
+	        var track = controller._track;
+
+	        if (!track.length) {
+	            return false;
+	        }
+
+	        var p2 = track[track.length - 1];
+	        var p1 = track[0];
+	        var dx = p2[0] - p1[0];
+	        var dy = p2[1] - p1[1];
+	        var dist = mathPow(dx * dx + dy * dy, 0.5);
+
+	        return dist > UNSELECT_THRESHOLD;
+	    }
+
+	    function getTrackEnds(track) {
+	        var tail = track.length - 1;
+	        tail < 0 && (tail = 0);
+	        return [track[0], track[tail]];
+	    }
+
+	    function createBaseRectCover(doDrift, controller, brushOption, edgeNames) {
+	        var cover = new graphic.Group();
+
+	        cover.add(new graphic.Rect({
+	            name: 'main',
+	            style: makeStyle(brushOption),
+	            silent: true,
+	            draggable: true,
+	            cursor: 'move',
+	            drift: curry(doDrift, controller, cover, 'nswe'),
+	            ondragend: curry(trigger, controller, {isEnd: true})
+	        }));
+
+	        each(
+	            edgeNames,
+	            function (name) {
+	                cover.add(new graphic.Rect({
+	                    name: name,
+	                    style: {opacity: 0},
+	                    draggable: true,
+	                    silent: true,
+	                    invisible: true,
+	                    drift: curry(doDrift, controller, cover, name),
+	                    ondragend: curry(trigger, controller, {isEnd: true})
+	                }));
+	            }
+	        );
+
+	        return cover;
+	    }
+
+	    function updateBaseRect(controller, cover, localRange, brushOption) {
+	        var lineWidth = brushOption.brushStyle.lineWidth || 0;
+	        var handleSize = mathMax(lineWidth, MIN_RESIZE_LINE_WIDTH);
+	        var x = localRange[0][0];
+	        var y = localRange[1][0];
+	        var xa = x - lineWidth / 2;
+	        var ya = y - lineWidth / 2;
+	        var x2 = localRange[0][1];
+	        var y2 = localRange[1][1];
+	        var x2a = x2 - handleSize + lineWidth / 2;
+	        var y2a = y2 - handleSize + lineWidth / 2;
+	        var width = x2 - x;
+	        var height = y2 - y;
+	        var widtha = width + lineWidth;
+	        var heighta = height + lineWidth;
+
+	        updateRectShape(controller, cover, 'main', x, y, width, height);
+
+	        if (brushOption.transformable) {
+	            updateRectShape(controller, cover, 'w', xa, ya, handleSize, heighta);
+	            updateRectShape(controller, cover, 'e', x2a, ya, handleSize, heighta);
+	            updateRectShape(controller, cover, 'n', xa, ya, widtha, handleSize);
+	            updateRectShape(controller, cover, 's', xa, y2a, widtha, handleSize);
+
+	            updateRectShape(controller, cover, 'nw', xa, ya, handleSize, handleSize);
+	            updateRectShape(controller, cover, 'ne', x2a, ya, handleSize, handleSize);
+	            updateRectShape(controller, cover, 'sw', xa, y2a, handleSize, handleSize);
+	            updateRectShape(controller, cover, 'se', x2a, y2a, handleSize, handleSize);
+	        }
+	    }
+
+	    function updateCommon(controller, cover) {
+	        var brushOption = cover.__brushOption;
+	        var transformable = brushOption.transformable;
+
+	        var mainEl = cover.childAt(0);
+	        mainEl.useStyle(makeStyle(brushOption));
+	        mainEl.attr({
+	            silent: !transformable,
+	            cursor: transformable ? 'move' : 'default'
+	        });
+
+	        each(
+	            ['w', 'e', 'n', 's', 'se', 'sw', 'ne', 'nw'],
+	            function (name) {
+	                var el = cover.childOfName(name);
+	                var globalDir = getGlobalDirection(controller, name);
+
+	                el && el.attr({
+	                    silent: !transformable,
+	                    invisible: !transformable,
+	                    cursor: transformable ? CURSOR_MAP[globalDir] + '-resize' : null
+	                });
+	            }
+	        );
+	    }
+
+	    function updateRectShape(controller, cover, name, x, y, w, h) {
+	        var el = cover.childOfName(name);
+	        el && el.setShape(pointsToRect(
+	            clipByPanel(controller, cover, [[x, y], [x + w, y + h]])
+	        ));
+	    }
+
+	    function makeStyle(brushOption) {
+	        return zrUtil.defaults({strokeNoScale: true}, brushOption.brushStyle);
+	    }
+
+	    function formatRectRange(x, y, x2, y2) {
+	        var min = [mathMin(x, x2), mathMin(y, y2)];
+	        var max = [mathMax(x, x2), mathMax(y, y2)];
+
+	        return [
+	            [min[0], max[0]], // x range
+	            [min[1], max[1]] // y range
+	        ];
+	    }
+
+	    function getTransform(controller) {
+	        return graphic.getTransform(controller.group);
+	    }
+
+	    function getGlobalDirection(controller, localDirection) {
+	        if (localDirection.length > 1) {
+	            localDirection = localDirection.split('');
+	            var globalDir = [
+	                getGlobalDirection(controller, localDirection[0]),
+	                getGlobalDirection(controller, localDirection[1])
+	            ];
+	            (globalDir[0] === 'e' || globalDir[0] === 'w') && globalDir.reverse();
+	            return globalDir.join('');
+	        }
+	        else {
+	            var map = {w: 'left', e: 'right', n: 'top', s: 'bottom'};
+	            var inverseMap = {left: 'w', right: 'e', top: 'n', bottom: 's'};
+	            var globalDir = graphic.transformDirection(
+	                map[localDirection], getTransform(controller)
+	            );
+	            return inverseMap[globalDir];
+	        }
+	    }
+
+	    function driftRect(toRectRange, fromRectRange, controller, cover, name, dx, dy, e) {
+	        var brushOption = cover.__brushOption;
+	        var rectRange = toRectRange(brushOption.range);
+	        var localDelta = toLocalDelta(controller, dx, dy);
+
+	        each(name.split(''), function (namePart) {
+	            var ind = DIRECTION_MAP[namePart];
+	            rectRange[ind[0]][ind[1]] += localDelta[ind[0]];
+	        });
+
+	        brushOption.range = fromRectRange(formatRectRange(
+	            rectRange[0][0], rectRange[1][0], rectRange[0][1], rectRange[1][1]
+	        ));
+
+	        updateCoverAfterCreation(controller, cover);
+	        trigger(controller, {isEnd: false});
+	    }
+
+	    function driftPolygon(controller, cover, dx, dy, e) {
+	        var range = cover.__brushOption.range;
+	        var localDelta = toLocalDelta(controller, dx, dy);
+
+	        each(range, function (point) {
+	            point[0] += localDelta[0];
+	            point[1] += localDelta[1];
+	        });
+
+	        updateCoverAfterCreation(controller, cover);
+	        trigger(controller, {isEnd: false});
+	    }
+
+	    function toLocalDelta(controller, dx, dy) {
+	        var thisGroup = controller.group;
+	        var localD = thisGroup.transformCoordToLocal(dx, dy);
+	        var localZero = thisGroup.transformCoordToLocal(0, 0);
+
+	        return [localD[0] - localZero[0], localD[1] - localZero[1]];
+	    }
+
+	    function clipByPanel(controller, cover, data) {
+	        var panel = getPanelByCover(controller, cover);
+	        if (panel === true) { // Global panel
+	            return zrUtil.clone(data);
+	        }
+
+	        var panelRect = panel.getBoundingRect();
+
+	        return zrUtil.map(data, function (point) {
+	            var x = point[0];
+	            x = mathMax(x, panelRect.x);
+	            x = mathMin(x, panelRect.x + panelRect.width);
+	            var y = point[1];
+	            y = mathMax(y, panelRect.y);
+	            y = mathMin(y, panelRect.y + panelRect.height);
+	            return [x, y];
+	        });
+	    }
+
+	    function pointsToRect(points) {
+	        var xmin = mathMin(points[0][0], points[1][0]);
+	        var ymin = mathMin(points[0][1], points[1][1]);
+	        var xmax = mathMax(points[0][0], points[1][0]);
+	        var ymax = mathMax(points[0][1], points[1][1]);
+
+	        return {
+	            x: xmin,
+	            y: ymin,
+	            width: xmax - xmin,
+	            height: ymax - ymin
+	        };
+	    }
+
+	    function resetCursor(controller, e) {
+	        var x = e.offsetX;
+	        var y = e.offsetY;
+	        var zr = controller._zr;
+
+	        if (controller._brushType) { // If active
+	            var panels = controller._panels;
+	            var covers = controller._covers;
+	            var inCover;
+
+	            for (var i = 0; i < covers.length; i++) {
+	                if (coverRenderers[covers[i].__brushOption.brushType].contain(covers[i], x, y)) {
+	                    inCover = true;
+	                    break;
+	                }
+	            }
+
+	            if (!inCover) {
+	                if (panels) { // Brush on panels
+	                    each(panels, function (panel) {
+	                        panel.contain(x, y) && zr.setCursorStyle('crosshair');
+	                    });
+	                }
+	                else { // Global brush
+	                    zr.setCursorStyle('crosshair');
+	                }
+	            }
+	        }
+	    }
+
+	    function preventDefault(e) {
+	        var rawE = e.event;
+	        rawE.preventDefault && rawE.preventDefault();
+	    }
+
+	    function mainShapeContain(cover, x, y) {
+	        return cover.childOfName('main').contain(x, y);
+	    }
+
+	    function updateCoverByMouse(controller, e, isEnd) {
+	        var x = e.offsetX;
+	        var y = e.offsetY;
+	        var creatingCover = controller._creatingCover;
+	        var panel = controller._creatingPanel;
+	        var thisBrushOption = controller._brushOption;
+	        var eventParams;
+
+	        controller._track.push(controller.group.transformCoordToLocal(x, y));
+
+	        if (shouldShowCover(controller) || creatingCover) {
+
+	            if (panel && !creatingCover) {
+	                thisBrushOption.brushMode === 'single' && clearCovers(controller);
+	                var brushOption = zrUtil.clone(thisBrushOption);
+	                brushOption.panelId = panel === true ? null : panel.__brushPanelId;
+	                creatingCover = controller._creatingCover = createCover(controller, brushOption);
+	                controller._covers.push(creatingCover);
+	            }
+
+	            if (creatingCover) {
+	                var coverRenderer = coverRenderers[controller._brushType];
+	                var coverBrushOption = creatingCover.__brushOption;
+
+	                coverBrushOption.range = coverRenderer.getCreatingRange(
+	                    clipByPanel(controller, creatingCover, controller._track)
+	                );
+
+	                if (isEnd) {
+	                    endCreating(controller, creatingCover);
+	                    coverRenderer.updateCommon(controller, creatingCover);
+	                }
+
+	                updateCoverShape(controller, creatingCover);
+
+	                eventParams = {isEnd: isEnd};
+	            }
+	        }
+	        else if (
+	            isEnd
+	            && thisBrushOption.brushMode === 'single'
+	            && thisBrushOption.removeOnClick
+	        ) {
+	            // Help user to remove covers easily, only by a tiny drag, in 'single' mode.
+	            // But a single click do not clear covers, because user may have casual
+	            // clicks (for example, click on other component and do not expect covers
+	            // disappear).
+	            // Only some cover removed, trigger action, but not every click trigger action.
+	            if (getPanelByPoint(controller, x, y) && clearCovers(controller)) {
+	                eventParams = {isEnd: isEnd, removeOnClick: true};
+	            }
+	        }
+
+	        return eventParams;
+	    }
+
+	    var mouseHandlers = {
+
+	        mousedown: function (e) {
+	            if (this._dragging) {
+	                // In case some browser do not support globalOut,
+	                // and release mose out side the browser.
+	                handleDragEnd.call(this, e);
+	            }
+	            else if (!e.target || !e.target.draggable) {
+
+	                preventDefault(e);
+
+	                var x = e.offsetX;
+	                var y = e.offsetY;
+
+	                this._creatingCover = null;
+	                var panel = this._creatingPanel = getPanelByPoint(this, x, y);
+
+	                if (panel) {
+	                    this._dragging = true;
+	                    this._track = [this.group.transformCoordToLocal(x, y)];
+	                }
+	            }
+	        },
+
+	        mousemove: function (e) {
+	            // set Cursor
+	            resetCursor(this, e);
+
+	            if (this._dragging) {
+
+	                preventDefault(e);
+
+	                var eventParams = updateCoverByMouse(this, e, false);
+
+	                eventParams && trigger(this, eventParams);
+	            }
+	        },
+
+	        mouseup: handleDragEnd //,
+
+	        // FIXME
+	        // in tooltip, globalout should not be triggered.
+	        // globalout: handleDragEnd
+	    };
+
+	    function handleDragEnd(e) {
+	        if (this._dragging) {
+
+	            preventDefault(e);
+
+	            var eventParams = updateCoverByMouse(this, e, true);
+
+	            this._dragging = false;
+	            this._track = [];
+	            this._creatingCover = null;
+
+	            // trigger event shoule be at final, after procedure will be nested.
+	            eventParams && trigger(this, eventParams);
+	        }
+	    }
+
+	    /**
+	     * key: brushType
+	     * @type {Object}
+	     */
+	    var coverRenderers = {
+
+	        lineX: getLineRenderer(0),
+
+	        lineY: getLineRenderer(1),
+
+	        rect: {
+	            createCover: function (controller, brushOption) {
+	                return createBaseRectCover(
+	                    curry(
+	                        driftRect,
+	                        function (range) {
+	                            return range;
+	                        },
+	                        function (range) {
+	                            return range;
+	                        }
+	                    ),
+	                    controller,
+	                    brushOption,
+	                    ['w', 'e', 'n', 's', 'se', 'sw', 'ne', 'nw']
+	                );
+	            },
+	            getCreatingRange: function (localTrack) {
+	                var ends = getTrackEnds(localTrack);
+	                return formatRectRange(ends[1][0], ends[1][1], ends[0][0], ends[0][1]);
+	            },
+	            updateCoverShape: function (controller, cover, localRange, brushOption) {
+	                updateBaseRect(controller, cover, localRange, brushOption);
+	            },
+	            updateCommon: updateCommon,
+	            contain: mainShapeContain
+	        },
+
+	        polygon: {
+	            createCover: function (controller, brushOption) {
+	                var cover = new graphic.Group();
+
+	                // Do not use graphic.Polygon because graphic.Polyline do not close the
+	                // border of the shape when drawing, which is a better experience for user.
+	                cover.add(new graphic.Polyline({
+	                    name: 'main',
+	                    style: makeStyle(brushOption),
+	                    silent: true
+	                }));
+
+	                return cover;
+	            },
+	            getCreatingRange: function (localTrack) {
+	                return localTrack;
+	            },
+	            endCreating: function (controller, cover) {
+	                cover.remove(cover.childAt(0));
+	                // Use graphic.Polygon close the shape.
+	                cover.add(new graphic.Polygon({
+	                    name: 'main',
+	                    draggable: true,
+	                    drift: curry(driftPolygon, controller, cover),
+	                    ondragend: curry(trigger, controller, {isEnd: true})
+	                }));
+	            },
+	            updateCoverShape: function (controller, cover, localRange, brushOption) {
+	                cover.childAt(0).setShape({
+	                    points: clipByPanel(controller, cover, localRange)
+	                });
+	            },
+	            updateCommon: updateCommon,
+	            contain: mainShapeContain
+	        }
+	    };
+
+	    function getLineRenderer(xyIndex) {
+	        return {
+	            createCover: function (controller, brushOption) {
+	                return createBaseRectCover(
+	                    curry(
+	                        driftRect,
+	                        function (range) {
+	                            var rectRange = [range, [0, 100]];
+	                            xyIndex && rectRange.reverse();
+	                            return rectRange;
+	                        },
+	                        function (rectRange) {
+	                            return rectRange[xyIndex];
+	                        }
+	                    ),
+	                    controller,
+	                    brushOption,
+	                    [['w', 'e'], ['n', 's']][xyIndex]
+	                );
+	            },
+	            getCreatingRange: function (localTrack) {
+	                var ends = getTrackEnds(localTrack);
+	                var min = mathMin(ends[0][xyIndex], ends[1][xyIndex]);
+	                var max = mathMax(ends[0][xyIndex], ends[1][xyIndex]);
+
+	                return [min, max];
+	            },
+	            updateCoverShape: function (controller, cover, localRange, brushOption) {
+	                var brushWidth = brushOption.brushStyle.width;
+	                var otherExtent;
+	                // If brushWidth not specified, fit the panel.
+	                if (brushWidth == null) {
+	                    var panel = getPanelByCover(controller, cover);
+	                    var base = 0;
+	                    if (panel !== true) {
+	                        var rect = panel.getBoundingRect();
+	                        brushWidth = xyIndex ? rect.width : rect.height;
+	                        base = xyIndex ? rect.x : rect.y;
+	                    }
+	                    // FIXME
+	                    // do not support global panel yet.
+	                    otherExtent = [base, base + (brushWidth || 0)];
+	                }
+	                else {
+	                    otherExtent = [-brushWidth / 2, brushWidth / 2];
+	                }
+	                var rectRange = [localRange, otherExtent];
+	                xyIndex && rectRange.reverse();
+
+	                updateBaseRect(controller, cover, rectRange, brushOption);
+	            },
+	            updateCommon: updateCommon,
+	            contain: mainShapeContain
+	        };
+	    }
+
+	    module.exports = BrushController;
+
+
+/***/ },
+/* 234 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+	    var modelUtil = __webpack_require__(5);
+
+	    module.exports = function (option) {
+	        createParallelIfNeeded(option);
+	        mergeAxisOptionFromParallel(option);
+	    };
+
+	    /**
+	     * Create a parallel coordinate if not exists.
+	     * @inner
+	     */
+	    function createParallelIfNeeded(option) {
+	        if (option.parallel) {
+	            return;
+	        }
+
+	        var hasParallelSeries = false;
+
+	        zrUtil.each(option.series, function (seriesOpt) {
+	            if (seriesOpt && seriesOpt.type === 'parallel') {
+	                hasParallelSeries = true;
+	            }
+	        });
+
+	        if (hasParallelSeries) {
+	            option.parallel = [{}];
+	        }
+	    }
+
+	    /**
+	     * Merge aixs definition from parallel option (if exists) to axis option.
+	     * @inner
+	     */
+	    function mergeAxisOptionFromParallel(option) {
+	        var axes = modelUtil.normalizeToArray(option.parallelAxis);
+
+	        zrUtil.each(axes, function (axisOption) {
+	            if (!zrUtil.isObject(axisOption)) {
+	                return;
+	            }
+
+	            var parallelIndex = axisOption.parallelIndex || 0;
+	            var parallelOption = modelUtil.normalizeToArray(option.parallel)[parallelIndex];
+
+	            if (parallelOption && parallelOption.parallelAxisDefault) {
+	                zrUtil.merge(axisOption, parallelOption.parallelAxisDefault, false);
+	            }
+	        });
+	    }
+
+
+
+/***/ },
+/* 235 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var List = __webpack_require__(97);
+	    var zrUtil = __webpack_require__(4);
+	    var SeriesModel = __webpack_require__(28);
+	    var completeDimensions = __webpack_require__(102);
+
+	    module.exports = SeriesModel.extend({
+
+	        type: 'series.parallel',
+
+	        dependencies: ['parallel'],
+
+	        getInitialData: function (option, ecModel) {
+	            var parallelModel = ecModel.getComponent(
+	                'parallel', this.get('parallelIndex')
+	            );
+	            var parallelAxisIndices = parallelModel.parallelAxisIndex;
+
+	            var rawData = option.data;
+	            var modelDims = parallelModel.dimensions;
+
+	            var dataDims = generateDataDims(modelDims, rawData);
+
+	            var dataDimsInfo = zrUtil.map(dataDims, function (dim, dimIndex) {
+
+	                var modelDimsIndex = zrUtil.indexOf(modelDims, dim);
+	                var axisModel = modelDimsIndex >= 0 && ecModel.getComponent(
+	                    'parallelAxis', parallelAxisIndices[modelDimsIndex]
+	                );
+
+	                if (axisModel && axisModel.get('type') === 'category') {
+	                    translateCategoryValue(axisModel, dim, rawData);
+	                    return {name: dim, type: 'ordinal'};
+	                }
+	                else if (modelDimsIndex < 0) {
+	                    return completeDimensions.guessOrdinal(rawData, dimIndex)
+	                        ? {name: dim, type: 'ordinal'}
+	                        : dim;
+	                }
+	                else {
+	                    return dim;
+	                }
+	            });
+
+	            var list = new List(dataDimsInfo, this);
+	            list.initData(rawData);
+
+	            // Anication is forbiden in progressive data mode.
+	            if (this.option.progressive) {
+	                this.option.animation = false;
+	            }
+
+	            return list;
+	        },
+
+	        /**
+	         * User can get data raw indices on 'axisAreaSelected' event received.
+	         *
+	         * @public
+	         * @param {string} activeState 'active' or 'inactive' or 'normal'
+	         * @return {Array.<number>} Raw indices
+	         */
+	        getRawIndicesByActiveState: function (activeState) {
+	            var coordSys = this.coordinateSystem;
+	            var data = this.getData();
+	            var indices = [];
+
+	            coordSys.eachActiveState(data, function (theActiveState, dataIndex) {
+	                if (activeState === theActiveState) {
+	                    indices.push(data.getRawIndex(dataIndex));
+	                }
+	            });
+
+	            return indices;
+	        },
+
+	        defaultOption: {
+	            zlevel: 0,                  // 一级层叠
+	            z: 2,                       // 二级层叠
+
+	            coordinateSystem: 'parallel',
+	            parallelIndex: 0,
+
+	            label: {
+	                normal: {
+	                    show: false
+	                },
+	                emphasis: {
+	                    show: false
+	                }
+	            },
+
+	            inactiveOpacity: 0.05,
+	            activeOpacity: 1,
+
+	            lineStyle: {
+	                normal: {
+	                    width: 1,
+	                    opacity: 0.45,
+	                    type: 'solid'
+	                }
+	            },
+	            progressive: false, // 100
+	            smooth: false,
+
+	            animationEasing: 'linear'
+	        }
+	    });
+
+	    function translateCategoryValue(axisModel, dim, rawData) {
+	        var axisData = axisModel.get('data');
+	        var numberDim = convertDimNameToNumber(dim);
+
+	        if (axisData && axisData.length) {
+	            zrUtil.each(rawData, function (dataItem) {
+	                if (!dataItem) {
+	                    return;
+	                }
+	                // FIXME
+	                // time consuming, should use hash?
+	                var index = zrUtil.indexOf(axisData, dataItem[numberDim]);
+	                dataItem[numberDim] = index >= 0 ? index : NaN;
+	            });
+	        }
+	        // FIXME
+	        // 如果没有设置axis data, 应自动算出，或者提示。
+	    }
+
+	    function convertDimNameToNumber(dimName) {
+	        return +dimName.replace('dim', '');
+	    }
+
+	    function generateDataDims(modelDims, rawData) {
+	        // parallelModel.dimension should not be regarded as data
+	        // dimensions. Consider dimensions = ['dim4', 'dim2', 'dim6'];
+
+	        // We detect max dim by parallelModel.dimensions and fist
+	        // item in rawData arbitrarily.
+	        var maxDimNum = 0;
+	        zrUtil.each(modelDims, function (dimName) {
+	            var numberDim = convertDimNameToNumber(dimName);
+	            numberDim > maxDimNum && (maxDimNum = numberDim);
+	        });
+
+	        var firstItem = rawData[0];
+	        if (firstItem && firstItem.length - 1 > maxDimNum) {
+	            maxDimNum = firstItem.length - 1;
+	        }
+
+	        var dataDims = [];
+	        for (var i = 0; i <= maxDimNum; i++) {
+	            dataDims.push('dim' + i);
+	        }
+
+	        return dataDims;
+	    }
+
+
+/***/ },
+/* 236 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var graphic = __webpack_require__(43);
+	    var zrUtil = __webpack_require__(4);
+
+	    var SMOOTH = 0.3;
+
+	    var ParallelView = __webpack_require__(42).extend({
+
+	        type: 'parallel',
+
+	        init: function () {
+
+	            /**
+	             * @type {module:zrender/container/Group}
+	             * @private
+	             */
+	            this._dataGroup = new graphic.Group();
+
+	            this.group.add(this._dataGroup);
+
+	            /**
+	             * @type {module:echarts/data/List}
+	             */
+	            this._data;
+	        },
+
+	        /**
+	         * @override
+	         */
+	        render: function (seriesModel, ecModel, api, payload) {
+	            this._renderForNormal(seriesModel);
+	            // this[
+	            //     seriesModel.option.progressive
+	            //         ? '_renderForProgressive'
+	            //         : '_renderForNormal'
+	            // ](seriesModel);
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _renderForNormal: function (seriesModel) {
+	            var dataGroup = this._dataGroup;
+	            var data = seriesModel.getData();
+	            var oldData = this._data;
+	            var coordSys = seriesModel.coordinateSystem;
+	            var dimensions = coordSys.dimensions;
+	            var option = seriesModel.option;
+	            var smooth = option.smooth ? SMOOTH : null;
+
+	            // Consider switch between progressive and not.
+	            // oldData && oldData.__plProgressive && dataGroup.removeAll();
+
+	            data.diff(oldData)
+	                .add(add)
+	                .update(update)
+	                .remove(remove)
+	                .execute();
+
+	            // Update style
+	            updateElCommon(data, smooth);
+
+	            // First create
+	            if (!this._data) {
+	                var clipPath = createGridClipShape(
+	                    coordSys, seriesModel, function () {
+	                        // Callback will be invoked immediately if there is no animation
+	                        setTimeout(function () {
+	                            dataGroup.removeClipPath();
+	                        });
+	                    }
+	                );
+	                dataGroup.setClipPath(clipPath);
+	            }
+
+	            this._data = data;
+
+	            function add(newDataIndex) {
+	                addEl(data, dataGroup, newDataIndex, dimensions, coordSys, null, smooth);
+	            }
+
+	            function update(newDataIndex, oldDataIndex) {
+	                var line = oldData.getItemGraphicEl(oldDataIndex);
+	                var points = createLinePoints(data, newDataIndex, dimensions, coordSys);
+	                data.setItemGraphicEl(newDataIndex, line);
+	                graphic.updateProps(line, {shape: {points: points}}, seriesModel, newDataIndex);
+	            }
+
+	            function remove(oldDataIndex) {
+	                var line = oldData.getItemGraphicEl(oldDataIndex);
+	                dataGroup.remove(line);
+	            }
+
+	        },
+
+	        /**
+	         * @private
+	         */
+	        // _renderForProgressive: function (seriesModel) {
+	        //     var dataGroup = this._dataGroup;
+	        //     var data = seriesModel.getData();
+	        //     var oldData = this._data;
+	        //     var coordSys = seriesModel.coordinateSystem;
+	        //     var dimensions = coordSys.dimensions;
+	        //     var option = seriesModel.option;
+	        //     var progressive = option.progressive;
+	        //     var smooth = option.smooth ? SMOOTH : null;
+
+	        //     // In progressive animation is disabled, so use simple data diff,
+	        //     // which effects performance less.
+	        //     // (Typically performance for data with length 7000+ like:
+	        //     // simpleDiff: 60ms, addEl: 184ms,
+	        //     // in RMBP 2.4GHz intel i7, OSX 10.9 chrome 50.0.2661.102 (64-bit))
+	        //     if (simpleDiff(oldData, data, dimensions)) {
+	        //         dataGroup.removeAll();
+	        //         data.each(function (dataIndex) {
+	        //             addEl(data, dataGroup, dataIndex, dimensions, coordSys);
+	        //         });
+	        //     }
+
+	        //     updateElCommon(data, progressive, smooth);
+
+	        //     // Consider switch between progressive and not.
+	        //     data.__plProgressive = true;
+	        //     this._data = data;
+	        // },
+
+	        /**
+	         * @override
+	         */
+	        remove: function () {
+	            this._dataGroup && this._dataGroup.removeAll();
+	            this._data = null;
+	        }
+	    });
+
+	    function createGridClipShape(coordSys, seriesModel, cb) {
+	        var parallelModel = coordSys.model;
+	        var rect = coordSys.getRect();
+	        var rectEl = new graphic.Rect({
+	            shape: {
+	                x: rect.x,
+	                y: rect.y,
+	                width: rect.width,
+	                height: rect.height
+	            }
+	        });
+
+	        var dim = parallelModel.get('layout') === 'horizontal' ? 'width' : 'height';
+	        rectEl.setShape(dim, 0);
+	        graphic.initProps(rectEl, {
+	            shape: {
+	                width: rect.width,
+	                height: rect.height
+	            }
+	        }, seriesModel, cb);
+	        return rectEl;
+	    }
+
+	    function createLinePoints(data, dataIndex, dimensions, coordSys) {
+	        var points = [];
+	        for (var i = 0; i < dimensions.length; i++) {
+	            var dimName = dimensions[i];
+	            var value = data.get(dimName, dataIndex);
+	            if (!isEmptyValue(value, coordSys.getAxis(dimName).type)) {
+	                points.push(coordSys.dataToPoint(value, dimName));
+	            }
+	        }
+	        return points;
+	    }
+
+	    function addEl(data, dataGroup, dataIndex, dimensions, coordSys) {
+	        var points = createLinePoints(data, dataIndex, dimensions, coordSys);
+	        var line = new graphic.Polyline({
+	            shape: {points: points},
+	            silent: true,
+	            z2: 10
+	        });
+	        dataGroup.add(line);
+	        data.setItemGraphicEl(dataIndex, line);
+	    }
+
+	    function updateElCommon(data, smooth) {
+	        var seriesStyleModel = data.hostModel.getModel('lineStyle.normal');
+	        var lineStyle = seriesStyleModel.getLineStyle();
+	        data.eachItemGraphicEl(function (line, dataIndex) {
+	            if (data.hasItemOption) {
+	                var itemModel = data.getItemModel(dataIndex);
+	                var lineStyleModel = itemModel.getModel('lineStyle.normal', seriesStyleModel);
+	                lineStyle = lineStyleModel.getLineStyle();
+	            }
+
+	            line.useStyle(zrUtil.extend(
+	                lineStyle,
+	                {
+	                    fill: null,
+	                    stroke: data.getItemVisual(dataIndex, 'color'),
+	                    opacity: data.getItemVisual(dataIndex, 'opacity')
+	                }
+	            ));
+	            line.shape.smooth = smooth;
+	        });
+	    }
+
+	    // function simpleDiff(oldData, newData, dimensions) {
+	    //     var oldLen;
+	    //     if (!oldData
+	    //         || !oldData.__plProgressive
+	    //         || (oldLen = oldData.count()) !== newData.count()
+	    //     ) {
+	    //         return true;
+	    //     }
+
+	    //     var dimLen = dimensions.length;
+	    //     for (var i = 0; i < oldLen; i++) {
+	    //         for (var j = 0; j < dimLen; j++) {
+	    //             if (oldData.get(dimensions[j], i) !== newData.get(dimensions[j], i)) {
+	    //                 return true;
+	    //             }
+	    //         }
+	    //     }
+
+	    //     return false;
+	    // }
+
+	    // FIXME
+	    // 公用方法?
+	    function isEmptyValue(val, axisType) {
+	        return axisType === 'category'
+	            ? val == null
+	            : (val == null || isNaN(val)); // axisType === 'value'
+	    }
+
+	    module.exports = ParallelView;
+
+
+/***/ },
+/* 237 */
+/***/ function(module, exports) {
+
+	
+
+	    module.exports = function (ecModel) {
+
+	        ecModel.eachSeriesByType('parallel', function (seriesModel) {
+
+	            var itemStyleModel = seriesModel.getModel('itemStyle.normal');
+	            var lineStyleModel = seriesModel.getModel('lineStyle.normal');
+	            var globalColors = ecModel.get('color');
+
+	            var color = lineStyleModel.get('color')
+	                || itemStyleModel.get('color')
+	                || globalColors[seriesModel.seriesIndex % globalColors.length];
+	            var inactiveOpacity = seriesModel.get('inactiveOpacity');
+	            var activeOpacity = seriesModel.get('activeOpacity');
+	            var lineStyle = seriesModel.getModel('lineStyle.normal').getLineStyle();
+
+	            var coordSys = seriesModel.coordinateSystem;
+	            var data = seriesModel.getData();
+
+	            var opacityMap = {
+	                normal: lineStyle.opacity,
+	                active: activeOpacity,
+	                inactive: inactiveOpacity
+	            };
+
+	            coordSys.eachActiveState(data, function (activeState, dataIndex) {
+	                data.setItemVisual(dataIndex, 'opacity', opacityMap[activeState]);
+	            });
+
+	            data.setVisual('color', color);
+	        });
+	    };
+
+
+/***/ },
+/* 238 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var echarts = __webpack_require__(1);
+
+	    __webpack_require__(239);
+	    __webpack_require__(240);
+	    echarts.registerLayout(__webpack_require__(241));
+	    echarts.registerVisual(__webpack_require__(243));
+
+
+/***/ },
+/* 239 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var SeriesModel = __webpack_require__(28);
+	    var createGraphFromNodeEdge = __webpack_require__(196);
+
+	    var SankeySeries = SeriesModel.extend({
+
+	        type: 'series.sankey',
+
+	        layoutInfo: null,
+
+	        getInitialData: function (option, ecModel) {
+	            var links = option.edges || option.links;
+	            var nodes = option.data || option.nodes;
+	            if (nodes && links) {
+	                var graph = createGraphFromNodeEdge(nodes, links, this, true);
+	                return graph.data;
+	            }
+	        },
+
+	        /**
+	         * @return {module:echarts/data/Graph}
+	         */
+	        getGraph: function () {
+	            return this.getData().graph;
+	        },
+
+	        /**
+	         * return {module:echarts/data/List}
+	         */
+	        getEdgeData: function() {
+	            return this.getGraph().edgeData;
+	        },
+
+	        /**
+	         * @override
+	         */
+	        formatTooltip: function (dataIndex, multipleSeries, dataType) {
+	            if (dataType === 'edge') {
+	                var params = this.getDataParams(dataIndex, dataType);
+	                var rawDataOpt = params.data;
+	                var html = rawDataOpt.source + ' -- ' + rawDataOpt.target;
+	                if (params.value) {
+	                    html += ' : ' + params.value;
+	                }
+	                return html;
+	            }
+	            else {
+	                return SankeySeries.superCall(this, 'formatTooltip', dataIndex, multipleSeries);
+	            }
+	            // dataType === 'node' or empty do not show tooltip by default.
+	        },
+
+	        defaultOption: {
+	            zlevel: 0,
+	            z: 2,
+
+	            coordinateSystem: 'view',
+
+	            layout : null,
+
+	            // the position of the whole view
+	            left: '5%',
+	            top: '5%',
+	            right: '20%',
+	            bottom: '5%',
+
+	            // the dx of the node
+	            nodeWidth: 20,
+
+	            // the distance between two nodes
+	            nodeGap: 8,
+
+	            // the number of iterations to change the position of the node
+	            layoutIterations: 32,
+
+	            label: {
+	                normal: {
+	                    show: true,
+	                    position: 'right',
+	                    textStyle: {
+	                        color: '#000',
+	                        fontSize: 12
+	                    }
+	                },
+	                emphasis: {
+	                    show: true
+	                }
+	            },
+
+	            itemStyle: {
+	                normal: {
+	                    borderWidth: 1,
+	                    borderColor: '#333'
+	                }
+	            },
+
+	            lineStyle: {
+	                normal: {
+	                    color: '#314656',
+	                    opacity: 0.2,
+	                    curveness: 0.5
+	                },
+	                emphasis: {
+	                    opacity: 0.6
+	                }
+	            },
+
+	            animationEasing: 'linear',
+
+	            animationDuration: 1000
+	        }
+
+	    });
+
+	    module.exports = SankeySeries;
+
+
+/***/ },
+/* 240 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var graphic = __webpack_require__(43);
+	    var zrUtil = __webpack_require__(4);
+
+	    var SankeyShape = graphic.extendShape({
+	        shape: {
+	            x1: 0, y1: 0,
+	            x2: 0, y2: 0,
+	            cpx1: 0, cpy1: 0,
+	            cpx2: 0, cpy2: 0,
+
+	            extent: 0
+	        },
+
+	        buildPath: function (ctx, shape) {
+	            var halfExtent = shape.extent / 2;
+	            ctx.moveTo(shape.x1, shape.y1 - halfExtent);
+	            ctx.bezierCurveTo(
+	                shape.cpx1, shape.cpy1 - halfExtent,
+	                shape.cpx2, shape.cpy2 - halfExtent,
+	                shape.x2, shape.y2 - halfExtent
+	            );
+	            ctx.lineTo(shape.x2, shape.y2 + halfExtent);
+	            ctx.bezierCurveTo(
+	                shape.cpx2, shape.cpy2 + halfExtent,
+	                shape.cpx1, shape.cpy1 + halfExtent,
+	                shape.x1, shape.y1 + halfExtent
+	            );
+	            ctx.closePath();
+	        }
+	    });
+
+	    module.exports = __webpack_require__(1).extendChartView({
+
+	        type: 'sankey',
+
+	        /**
+	         * @private
+	         * @type {module:echarts/chart/sankey/SankeySeries}
+	         */
+	        _model: null,
+
+	        render: function(seriesModel, ecModel, api) {
+	            var graph = seriesModel.getGraph();
+	            var group = this.group;
+	            var layoutInfo = seriesModel.layoutInfo;
+	            var nodeData = seriesModel.getData();
+	            var edgeData = seriesModel.getData('edge');
+
+	            this._model = seriesModel;
+
+	            group.removeAll();
+
+	            group.position = [layoutInfo.x, layoutInfo.y];
+
+	            // generate a rect  for each node
+	            graph.eachNode(function (node) {
+	                var layout = node.getLayout();
+	                var itemModel = node.getModel();
+	                var labelModel = itemModel.getModel('label.normal');
+	                var textStyleModel = labelModel.getModel('textStyle');
+	                var labelHoverModel = itemModel.getModel('label.emphasis');
+	                var textStyleHoverModel = labelHoverModel.getModel('textStyle');
+
+	                var rect = new graphic.Rect({
+	                    shape: {
+	                        x: layout.x,
+	                        y: layout.y,
+	                        width: node.getLayout().dx,
+	                        height: node.getLayout().dy
+	                    },
+	                    style: {
+	                        // Get formatted label in label.normal option. Use node id if it is not specified
+	                        text: labelModel.get('show')
+	                            ? seriesModel.getFormattedLabel(node.dataIndex, 'normal') || node.id
+	                            // Use empty string to hide the label
+	                            : '',
+	                        textFont: textStyleModel.getFont(),
+	                        textFill: textStyleModel.getTextColor(),
+	                        textPosition: labelModel.get('position')
+	                    }
+	                });
+
+	                rect.setStyle(zrUtil.defaults(
+	                    {
+	                        fill: node.getVisual('color')
+	                    },
+	                    itemModel.getModel('itemStyle.normal').getItemStyle()
+	                ));
+
+	                graphic.setHoverStyle(rect, zrUtil.extend(
+	                    node.getModel('itemStyle.emphasis'),
+	                    {
+	                        text: labelHoverModel.get('show')
+	                            ? seriesModel.getFormattedLabel(node.dataIndex, 'emphasis') || node.id
+	                            : '',
+	                        textFont: textStyleHoverModel.getFont(),
+	                        textFill: textStyleHoverModel.getTextColor(),
+	                        textPosition: labelHoverModel.get('position')
+	                    }
+	                ));
+
+	                group.add(rect);
+
+	                nodeData.setItemGraphicEl(node.dataIndex, rect);
+
+	                rect.dataType = 'node';
+	            });
+
+	            // generate a bezire Curve for each edge
+	            graph.eachEdge(function (edge) {
+	                var curve = new SankeyShape();
+
+	                curve.dataIndex = edge.dataIndex;
+	                curve.seriesIndex = seriesModel.seriesIndex;
+	                curve.dataType = 'edge';
+
+	                var lineStyleModel = edge.getModel('lineStyle.normal');
+	                var curvature = lineStyleModel.get('curveness');
+	                var n1Layout = edge.node1.getLayout();
+	                var n2Layout = edge.node2.getLayout();
+	                var edgeLayout = edge.getLayout();
+
+	                curve.shape.extent = Math.max(1, edgeLayout.dy);
+
+	                var x1 = n1Layout.x + n1Layout.dx;
+	                var y1 = n1Layout.y + edgeLayout.sy + edgeLayout.dy / 2;
+	                var x2 = n2Layout.x;
+	                var y2 = n2Layout.y + edgeLayout.ty + edgeLayout.dy / 2;
+	                var cpx1 = x1 * (1 - curvature) + x2 * curvature;
+	                var cpy1 = y1;
+	                var cpx2 = x1 * curvature + x2 * (1 - curvature);
+	                var cpy2 = y2;
+
+	                curve.setShape({
+	                    x1: x1,
+	                    y1: y1,
+	                    x2: x2,
+	                    y2: y2,
+	                    cpx1: cpx1,
+	                    cpy1: cpy1,
+	                    cpx2: cpx2,
+	                    cpy2: cpy2
+	                });
+
+	                curve.setStyle(lineStyleModel.getItemStyle());
+	                // Special color, use source node color or target node color
+	                switch (curve.style.fill) {
+	                    case 'source':
+	                        curve.style.fill = edge.node1.getVisual('color');
+	                        break;
+	                    case 'target':
+	                        curve.style.fill = edge.node2.getVisual('color');
+	                        break;
+	                    default:
+	                }
+
+	                graphic.setHoverStyle(curve, edge.getModel('lineStyle.emphasis').getItemStyle());
+
+	                group.add(curve);
+
+	                edgeData.setItemGraphicEl(edge.dataIndex, curve);
+	            });
+	            if (!this._data && seriesModel.get('animation')) {
+	                group.setClipPath(createGridClipShape(group.getBoundingRect(), seriesModel, function () {
+	                    group.removeClipPath();
+	                }));
+	            }
+	            this._data = seriesModel.getData();
+	        }
+	    });
+
+	    //add animation to the view
+	    function createGridClipShape(rect, seriesModel, cb) {
+	        var rectEl = new graphic.Rect({
+	            shape: {
+	                x: rect.x - 10,
+	                y: rect.y - 10,
+	                width: 0,
+	                height: rect.height + 20
+	            }
+	        });
+	        graphic.initProps(rectEl, {
+	            shape: {
+	                width: rect.width + 20,
+	                height: rect.height + 20
+	            }
+	        }, seriesModel, cb);
+
+	        return rectEl;
+	    }
+
+
+/***/ },
+/* 241 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var layout = __webpack_require__(21);
+	    var nest = __webpack_require__(242);
+	    var zrUtil = __webpack_require__(4);
+
+	    module.exports = function (ecModel, api, payload) {
+
+	        ecModel.eachSeriesByType('sankey', function (seriesModel) {
+
+	            var nodeWidth = seriesModel.get('nodeWidth');
+	            var nodeGap = seriesModel.get('nodeGap');
+
+	            var layoutInfo = getViewRect(seriesModel, api);
+
+	            seriesModel.layoutInfo = layoutInfo;
+
+	            var width = layoutInfo.width;
+	            var height = layoutInfo.height;
+
+	            var graph = seriesModel.getGraph();
+
+	            var nodes = graph.nodes;
+	            var edges = graph.edges;
+
+	            computeNodeValues(nodes);
+
+	            var filteredNodes = nodes.filter(function (node) {
+	                return node.getLayout().value === 0;
+	            });
+
+	            var iterations = filteredNodes.length !== 0
+	                ? 0 : seriesModel.get('layoutIterations');
+
+	            layoutSankey(nodes, edges, nodeWidth, nodeGap, width, height, iterations);
+	        });
+	    };
+
+	    /**
+	     * get the layout position of the whole view.
+	     */
+	    function getViewRect(seriesModel, api) {
+	        return layout.getLayoutRect(
+	            seriesModel.getBoxLayoutParams(), {
+	                width: api.getWidth(),
+	                height: api.getHeight()
+	            }
+	        );
+	    }
+
+	    function layoutSankey(nodes, edges, nodeWidth, nodeGap, width, height, iterations) {
+	        computeNodeBreadths(nodes, nodeWidth, width);
+	        computeNodeDepths(nodes, edges, height, nodeGap, iterations);
+	        computeEdgeDepths(nodes);
+	    }
+
+	    /**
+	     * compute the value of each node by summing the associated edge's value.
+	     * @param {module:echarts/data/Graph~Node} nodes
+	     */
+	    function computeNodeValues(nodes) {
+	        zrUtil.each(nodes, function (node) {
+	            var value1 = sum(node.outEdges, getEdgeValue);
+	            var value2 = sum(node.inEdges, getEdgeValue);
+	            var value = Math.max(value1, value2);
+	            node.setLayout({value: value}, true);
+	        });
+	    }
+
+	    /**
+	     * compute the x-position for each node.
+	     * @param {module:echarts/data/Graph~Node} nodes
+	     * @param  {number} nodeWidth
+	     * @param  {number} width
+	     */
+	    function computeNodeBreadths(nodes, nodeWidth, width) {
+	        var remainNodes = nodes;
+	        var nextNode = null;
+	        var x = 0;
+	        var kx = 0;
+
+	        while (remainNodes.length) {
+	            nextNode = [];
+
+	            for (var i = 0, len = remainNodes.length; i < len; i++) {
+	                var node = remainNodes[i];
+	                node.setLayout({x: x}, true);
+	                node.setLayout({dx: nodeWidth}, true);
+
+	                for (var j = 0, lenj = node.outEdges.length; j < lenj; j++) {
+	                    nextNode.push(node.outEdges[j].node2);
+	                }
+	            }
+	            remainNodes = nextNode;
+	            ++x;
+	        }
+
+	        moveSinksRight(nodes, x);
+	        kx = (width - nodeWidth) / (x - 1);
+
+	        scaleNodeBreadths(nodes, kx);
+	    }
+
+	    /**
+	     * all the node without outEgdes are assigned maximum breadth and
+	     * be aligned in the last column.
+	     * @param {module:echarts/data/Graph~Node} nodes
+	     * @param {number} x
+	     */
+	    function moveSinksRight(nodes, x) {
+	        zrUtil.each(nodes, function (node) {
+	            if(!node.outEdges.length) {
+	                node.setLayout({x: x-1}, true);
+	            }
+	        });
+	    }
+
+	    /**
+	     * scale node x-position to the width.
+	     * @param {module:echarts/data/Graph~Node} nodes
+	     * @param {number} kx
+	     */
+	    function scaleNodeBreadths(nodes, kx) {
+	        zrUtil.each(nodes, function(node) {
+	            var nodeX = node.getLayout().x * kx;
+	            node.setLayout({x: nodeX}, true);
+	        });
+	    }
+
+	    /**
+	     * using Gauss-Seidel iterations method to compute the node depth(y-position).
+	     * @param {module:echarts/data/Graph~Node} nodes
+	     * @param {module:echarts/data/Graph~Edge} edges
+	     * @param {number} height
+	     * @param {numbber} nodeGap
+	     * @param {number} iterations
+	     */
+	    function computeNodeDepths(nodes, edges, height, nodeGap, iterations) {
+	        var nodesByBreadth = nest()
+	            .key(function (d) {
+	                return d.getLayout().x;
+	            })
+	            .sortKeys(ascending)
+	            .entries(nodes)
+	            .map(function (d) {
+	                return d.values;
+	            });
+
+	        initializeNodeDepth(nodes, nodesByBreadth, edges, height, nodeGap);
+	        resolveCollisions(nodesByBreadth, nodeGap, height);
+
+	        for (var alpha = 1; iterations > 0; iterations--) {
+	            alpha *= 0.99;
+	            relaxRightToLeft(nodesByBreadth, alpha);
+	            resolveCollisions(nodesByBreadth, nodeGap, height);
+	            relaxLeftToRight(nodesByBreadth, alpha);
+	            resolveCollisions(nodesByBreadth, nodeGap, height);
+	        }
+	    }
+
+	    /**
+	     * compute the original y-position for each node.
+	     * @param {module:echarts/data/Graph~Node} nodes
+	     * @param {Array.<Array.<module:echarts/data/Graph~Node>>} nodesByBreadth
+	     * @param {module:echarts/data/Graph~Edge} edges
+	     * @param {number} height
+	     * @param {number} nodeGap
+	     */
+	    function initializeNodeDepth(nodes, nodesByBreadth, edges, height, nodeGap) {
+	        var kyArray = [];
+	        zrUtil.each(nodesByBreadth, function (nodes) {
+	            var n = nodes.length;
+	            var sum = 0;
+	            zrUtil.each(nodes, function (node) {
+	                sum += node.getLayout().value;
+	            });
+	            var ky = (height - (n-1) * nodeGap) / sum;
+	            kyArray.push(ky);
+	        });
+	        kyArray.sort(function (a, b) {
+	            return a - b;
+	        });
+	        var ky0 = kyArray[0];
+
+	        zrUtil.each(nodesByBreadth, function (nodes) {
+	            zrUtil.each(nodes, function (node, i) {
+	                node.setLayout({y: i}, true);
+	                var nodeDy = node.getLayout().value * ky0;
+	                node.setLayout({dy: nodeDy}, true);
+	            });
+	        });
+
+	        zrUtil.each(edges, function (edge) {
+	            var edgeDy = +edge.getValue() * ky0;
+	            edge.setLayout({dy: edgeDy}, true);
+	        });
+	    }
+
+	    /**
+	     * resolve the collision of initialized depth.
+	     * @param {Array.<Array.<module:echarts/data/Graph~Node>>} nodesByBreadth
+	     * @param {number} nodeGap
+	     * @param {number} height
+	     */
+	    function resolveCollisions(nodesByBreadth, nodeGap, height) {
+	        zrUtil.each(nodesByBreadth, function (nodes) {
+	            var node;
+	            var dy;
+	            var y0 = 0;
+	            var n = nodes.length;
+	            var i;
+
+	            nodes.sort(ascendingDepth);
+
+	            for (i = 0; i < n; i++) {
+	                node = nodes[i];
+	                dy = y0 - node.getLayout().y;
+	                if(dy > 0) {
+	                    var nodeY = node.getLayout().y + dy;
+	                    node.setLayout({y: nodeY}, true);
+	                }
+	                y0 = node.getLayout().y + node.getLayout().dy + nodeGap;
+	            }
+
+	            // if the bottommost node goes outside the biunds, push it back up
+	            dy = y0 - nodeGap - height;
+	            if (dy > 0) {
+	                var nodeY = node.getLayout().y -dy;
+	                node.setLayout({y: nodeY}, true);
+	                y0 = node.getLayout().y;
+	                for (i = n - 2; i >= 0; --i) {
+	                    node = nodes[i];
+	                    dy = node.getLayout().y + node.getLayout().dy + nodeGap - y0;
+	                    if (dy > 0) {
+	                        nodeY = node.getLayout().y - dy;
+	                        node.setLayout({y: nodeY}, true);
+	                    }
+	                    y0 = node.getLayout().y;
+	                }
+	            }
+	        });
+	    }
+
+	    /**
+	     * change the y-position of the nodes, except most the right side nodes.
+	     * @param {Array.<Array.<module:echarts/data/Graph~Node>>} nodesByBreadth
+	     * @param {number} alpha
+	     */
+	    function relaxRightToLeft(nodesByBreadth, alpha) {
+	        zrUtil.each(nodesByBreadth.slice().reverse(), function (nodes) {
+	            zrUtil.each(nodes, function (node) {
+	                if (node.outEdges.length) {
+	                    var y = sum(node.outEdges, weightedTarget) / sum(node.outEdges, getEdgeValue);
+	                    var nodeY = node.getLayout().y + (y - center(node)) * alpha;
+	                    node.setLayout({y: nodeY}, true);
+	                }
+	            });
+	        });
+	    }
+
+	    function weightedTarget(edge) {
+	        return center(edge.node2) * edge.getValue();
+	    }
+
+	    /**
+	     * change the y-position of the nodes, except most the left side nodes.
+	     * @param {Array.<Array.<module:echarts/data/Graph~Node>>} nodesByBreadth
+	     * @param {number} alpha
+	     */
+	    function relaxLeftToRight(nodesByBreadth, alpha) {
+	        zrUtil.each(nodesByBreadth, function (nodes) {
+	            zrUtil.each(nodes, function (node) {
+	                if (node.inEdges.length) {
+	                    var y = sum(node.inEdges, weightedSource) / sum(node.inEdges, getEdgeValue);
+	                    var nodeY = node.getLayout().y + (y - center(node)) * alpha;
+	                    node.setLayout({y: nodeY}, true);
+	                }
+	            });
+	        });
+	    }
+
+	    function weightedSource(edge) {
+	        return center(edge.node1) * edge.getValue();
+	    }
+
+	    /**
+	     * compute the depth(y-position) of each edge.
+	     * @param {module:echarts/data/Graph~Node} nodes
+	     */
+	    function computeEdgeDepths(nodes) {
+	        zrUtil.each(nodes, function (node) {
+	            node.outEdges.sort(ascendingTargetDepth);
+	            node.inEdges.sort(ascendingSourceDepth);
+	        });
+	        zrUtil.each(nodes, function (node) {
+	            var sy = 0;
+	            var ty = 0;
+	            zrUtil.each(node.outEdges, function (edge) {
+	                edge.setLayout({sy: sy}, true);
+	                sy += edge.getLayout().dy;
+	            });
+	            zrUtil.each(node.inEdges, function (edge) {
+	                edge.setLayout({ty: ty}, true);
+	                ty += edge.getLayout().dy;
+	            });
+	        });
+	    }
+
+	    function ascendingTargetDepth(a, b) {
+	        return a.node2.getLayout().y - b.node2.getLayout().y;
+	    }
+
+	    function ascendingSourceDepth(a, b) {
+	        return a.node1.getLayout().y - b.node1.getLayout().y;
+	    }
+
+	    function sum(array, f) {
+	        var s = 0;
+	        var n = array.length;
+	        var a;
+	        var i = -1;
+	        if (arguments.length === 1) {
+	            while (++i < n) {
+	                a = +array[i];
+	                if (!isNaN(a)) {
+	                    s += a;
+	                }
+	            }
+	        }
+	        else {
+	            while (++i < n) {
+	                a = +f.call(array, array[i], i);
+	                if(!isNaN(a)) {
+	                    s += a;
+	                }
+	            }
+	        }
+	        return s;
+	    }
+
+	    function center(node) {
+	        return node.getLayout().y + node.getLayout().dy / 2;
+	    }
+
+	    function ascendingDepth(a, b) {
+	        return a.getLayout().y - b.getLayout().y;
+	    }
+
+	    function ascending(a, b) {
+	        return a < b ? -1 : a > b ? 1 : a == b ? 0 : NaN;
+	    }
+
+	    function getEdgeValue(edge) {
+	        return edge.getValue();
+	    }
+
+
+
+/***/ },
+/* 242 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+
+	    /**
+	     * nest helper used to group by the array.
+	     * can specified the keys and sort the keys.
+	     */
+	    function nest() {
+
+	        var keysFunction = [];
+	        var sortKeysFunction = [];
+
+	        /**
+	         * map an Array into the mapObject.
+	         * @param {Array} array
+	         * @param {number} depth
+	         */
+	        function map(array, depth) {
+	            if (depth >= keysFunction.length) {
+	                return array;
+	            }
+	            var i = -1;
+	            var n = array.length;
+	            var keyFunction = keysFunction[depth++];
+	            var mapObject = {};
+	            var valuesByKey = {};
+
+	            while (++i < n) {
+	                var keyValue = keyFunction(array[i]);
+	                var values = valuesByKey[keyValue];
+
+	                if (values) {
+	                    values.push(array[i]);
+	                }
+	                else {
+	                    valuesByKey[keyValue] = [array[i]];
+	                }
+	            }
+
+	            zrUtil.each(valuesByKey, function (value, key) {
+	                mapObject[key] = map(value, depth);
+	            });
+
+	            return mapObject;
+	        }
+
+	        /**
+	         * transform the Map Object to multidimensional Array
+	         * @param {Object} map
+	         * @param {number} depth
+	         */
+	        function entriesMap(mapObject, depth) {
+	            if (depth >= keysFunction.length) {
+	                return mapObject;
+	            }
+	            var array = [];
+	            var sortKeyFunction = sortKeysFunction[depth++];
+
+	            zrUtil.each(mapObject, function (value, key) {
+	                array.push({
+	                    key: key, values: entriesMap(value, depth)
+	                });
+	            });
+
+	            if (sortKeyFunction) {
+	                return array.sort(function (a, b) {
+	                    return sortKeyFunction(a.key, b.key);
+	                });
+	            }
+	            else {
+	                return array;
+	            }
+	        }
+
+	        return {
+	            /**
+	             * specified the key to groupby the arrays.
+	             * users can specified one more keys.
+	             * @param {Function} d
+	             */
+	            key: function (d) {
+	                keysFunction.push(d);
+	                return this;
+	            },
+
+	            /**
+	             * specified the comparator to sort the keys
+	             * @param {Function} order
+	             */
+	            sortKeys: function (order) {
+	                sortKeysFunction[keysFunction.length - 1] = order;
+	                return this;
+	            },
+
+	            /**
+	             * the array to be grouped by.
+	             * @param {Array} array
+	             */
+	            entries: function (array) {
+	                return entriesMap(map(array, 0), 0);
+	            }
+	        };
+	    }
+	    module.exports = nest;
+
+
+/***/ },
+/* 243 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var VisualMapping = __webpack_require__(192);
+
+	    module.exports = function (ecModel, payload) {
+	        ecModel.eachSeriesByType('sankey', function (seriesModel) {
+	            var graph = seriesModel.getGraph();
+	            var nodes = graph.nodes;
+
+	            nodes.sort(function (a, b) {
+	                return a.getLayout().value - b.getLayout().value;
+	            });
+
+	            var minValue = nodes[0].getLayout().value;
+	            var maxValue = nodes[nodes.length - 1].getLayout().value;
+
+	            nodes.forEach(function (node) {
+	                var mapping = new VisualMapping({
+	                    type: 'color',
+	                    mappingMethod: 'linear',
+	                    dataExtent: [minValue, maxValue],
+	                    visual: seriesModel.get('color')
+	                });
+
+	                var mapValueToColor = mapping.mapValueToVisual(node.getLayout().value);
+	                node.setVisual('color', mapValueToColor);
+	                // If set itemStyle.normal.color
+	                var itemModel = node.getModel();
+	                var customColor = itemModel.get('itemStyle.normal.color');
+	                if (customColor != null) {
+	                    node.setVisual('color', customColor);
+	                }
+	            });
+
+	        }) ;
+	    };
+
+
+/***/ },
+/* 244 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var echarts = __webpack_require__(1);
+
+	    __webpack_require__(245);
+	    __webpack_require__(248);
+
+	    echarts.registerVisual(__webpack_require__(249));
+	    echarts.registerLayout(__webpack_require__(250));
+
+
+
+/***/ },
+/* 245 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var SeriesModel = __webpack_require__(28);
+	    var whiskerBoxCommon = __webpack_require__(246);
+
+	    var BoxplotSeries = SeriesModel.extend({
+
+	        type: 'series.boxplot',
+
+	        dependencies: ['xAxis', 'yAxis', 'grid'],
+
+	        // TODO
+	        // box width represents group size, so dimension should have 'size'.
+
+	        /**
+	         * @see <https://en.wikipedia.org/wiki/Box_plot>
+	         * The meanings of 'min' and 'max' depend on user,
+	         * and echarts do not need to know it.
+	         * @readOnly
+	         */
+	        valueDimensions: ['min', 'Q1', 'median', 'Q3', 'max'],
+
+	        /**
+	         * @type {Array.<string>}
+	         * @readOnly
+	         */
+	        dimensions: null,
+
+	        /**
+	         * @override
+	         */
+	        defaultOption: {
+	            zlevel: 0,                  // 一级层叠
+	            z: 2,                       // 二级层叠
+	            coordinateSystem: 'cartesian2d',
+	            legendHoverLink: true,
+
+	            hoverAnimation: true,
+
+	            xAxisIndex: 0,
+	            yAxisIndex: 0,
+
+	            layout: null,               // 'horizontal' or 'vertical'
+	            boxWidth: [7, 50],       // [min, max] can be percent of band width.
+
+	            itemStyle: {
+	                normal: {
+	                    color: '#fff',
+	                    borderWidth: 1
+	                },
+	                emphasis: {
+	                    borderWidth: 2,
+	                    shadowBlur: 5,
+	                    shadowOffsetX: 2,
+	                    shadowOffsetY: 2,
+	                    shadowColor: 'rgba(0,0,0,0.4)'
+	                }
+	            },
+
+	            animationEasing: 'elasticOut',
+	            animationDuration: 800
+	        }
+	    });
+
+	    zrUtil.mixin(BoxplotSeries, whiskerBoxCommon.seriesModelMixin, true);
+
+	    module.exports = BoxplotSeries;
+
+
+
+/***/ },
+/* 246 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var List = __webpack_require__(97);
+	    var completeDimensions = __webpack_require__(102);
+	    var WhiskerBoxDraw = __webpack_require__(247);
+	    var zrUtil = __webpack_require__(4);
+
+	    function getItemValue(item) {
+	        return item.value == null ? item : item.value;
+	    }
+
+	    var seriesModelMixin = {
+
+	        /**
+	         * @private
+	         * @type {string}
+	         */
+	        _baseAxisDim: null,
+
+	        /**
+	         * @override
+	         */
+	        getInitialData: function (option, ecModel) {
+	            // When both types of xAxis and yAxis are 'value', layout is
+	            // needed to be specified by user. Otherwise, layout can be
+	            // judged by which axis is category.
+
+	            var categories;
+
+	            var xAxisModel = ecModel.getComponent('xAxis', this.get('xAxisIndex'));
+	            var yAxisModel = ecModel.getComponent('yAxis', this.get('yAxisIndex'));
+	            var xAxisType = xAxisModel.get('type');
+	            var yAxisType = yAxisModel.get('type');
+	            var addOrdinal;
+
+	            // FIXME
+	            // 考虑时间轴
+
+	            if (xAxisType === 'category') {
+	                option.layout = 'horizontal';
+	                categories = xAxisModel.getCategories();
+	                addOrdinal = true;
+	            }
+	            else if (yAxisType  === 'category') {
+	                option.layout = 'vertical';
+	                categories = yAxisModel.getCategories();
+	                addOrdinal = true;
+	            }
+	            else {
+	                option.layout = option.layout || 'horizontal';
+	            }
+
+	            this._baseAxisDim = option.layout === 'horizontal' ? 'x' : 'y';
+
+	            var data = option.data;
+	            var dimensions = this.dimensions = ['base'].concat(this.valueDimensions);
+	            completeDimensions(dimensions, data);
+
+	            var list = new List(dimensions, this);
+	            list.initData(data, categories ? categories.slice() : null, function (dataItem, dimName, idx, dimIdx) {
+	                var value = getItemValue(dataItem);
+	                return addOrdinal ? (dimName === 'base' ? idx : value[dimIdx - 1]) : value[dimIdx];
+	            });
+
+	            return list;
+	        },
+
+	        /**
+	         * Used by Gird.
+	         * @param {string} axisDim 'x' or 'y'
+	         * @return {Array.<string>} dimensions on the axis.
+	         */
+	        coordDimToDataDim: function (axisDim) {
+	            var dims = this.valueDimensions.slice();
+	            var baseDim = ['base'];
+	            var map = {
+	                horizontal: {x: baseDim, y: dims},
+	                vertical: {x: dims, y: baseDim}
+	            };
+	            return map[this.get('layout')][axisDim];
+	        },
+
+	        /**
+	         * @override
+	         * @param {string|number} dataDim
+	         * @return {string} coord dimension
+	         */
+	        dataDimToCoordDim: function (dataDim) {
+	            var dim;
+
+	            zrUtil.each(['x', 'y'], function (coordDim, index) {
+	                var dataDims = this.coordDimToDataDim(coordDim);
+	                if (zrUtil.indexOf(dataDims, dataDim) >= 0) {
+	                    dim = coordDim;
+	                }
+	            }, this);
+
+	            return dim;
+	        },
+
+	        /**
+	         * If horizontal, base axis is x, otherwise y.
+	         * @override
+	         */
+	        getBaseAxis: function () {
+	            var dim = this._baseAxisDim;
+	            return this.ecModel.getComponent(dim + 'Axis', this.get(dim + 'AxisIndex')).axis;
+	        }
+	    };
+
+	    var viewMixin = {
+
+	        init: function () {
+	            /**
+	             * Old data.
+	             * @private
+	             * @type {module:echarts/chart/helper/WhiskerBoxDraw}
+	             */
+	            var whiskerBoxDraw = this._whiskerBoxDraw = new WhiskerBoxDraw(
+	                this.getStyleUpdater()
+	            );
+	            this.group.add(whiskerBoxDraw.group);
+	        },
+
+	        render: function (seriesModel, ecModel, api) {
+	            this._whiskerBoxDraw.updateData(seriesModel.getData());
+	        },
+
+	        remove: function (ecModel) {
+	            this._whiskerBoxDraw.remove();
+	        }
+	    };
+
+	    module.exports = {
+	        seriesModelMixin: seriesModelMixin,
+	        viewMixin: viewMixin
+	    };
+
+
+/***/ },
+/* 247 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @module echarts/chart/helper/Symbol
+	 */
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var graphic = __webpack_require__(43);
+	    var Path = __webpack_require__(45);
+
+	    var WhiskerPath = Path.extend({
+
+	        type: 'whiskerInBox',
+
+	        shape: {},
+
+	        buildPath: function (ctx, shape) {
+	            for (var i in shape) {
+	                if (i.indexOf('ends') === 0) {
+	                    var pts = shape[i];
+	                    ctx.moveTo(pts[0][0], pts[0][1]);
+	                    ctx.lineTo(pts[1][0], pts[1][1]);
+	                }
+	            }
+	        }
+	    });
+
+	    /**
+	     * @constructor
+	     * @alias {module:echarts/chart/helper/WhiskerBox}
+	     * @param {module:echarts/data/List} data
+	     * @param {number} idx
+	     * @param {Function} styleUpdater
+	     * @param {boolean} isInit
+	     * @extends {module:zrender/graphic/Group}
+	     */
+	    function WhiskerBox(data, idx, styleUpdater, isInit) {
+	        graphic.Group.call(this);
+
+	        /**
+	         * @type {number}
+	         * @readOnly
+	         */
+	        this.bodyIndex;
+
+	        /**
+	         * @type {number}
+	         * @readOnly
+	         */
+	        this.whiskerIndex;
+
+	        /**
+	         * @type {Function}
+	         */
+	        this.styleUpdater = styleUpdater;
+
+	        this._createContent(data, idx, isInit);
+
+	        this.updateData(data, idx, isInit);
+
+	        /**
+	         * Last series model.
+	         * @type {module:echarts/model/Series}
+	         */
+	        this._seriesModel;
+	    }
+
+	    var whiskerBoxProto = WhiskerBox.prototype;
+
+	    whiskerBoxProto._createContent = function (data, idx, isInit) {
+	        var itemLayout = data.getItemLayout(idx);
+	        var constDim = itemLayout.chartLayout === 'horizontal' ? 1 : 0;
+	        var count = 0;
+
+	        // Whisker element.
+	        this.add(new graphic.Polygon({
+	            shape: {
+	                points: isInit
+	                    ? transInit(itemLayout.bodyEnds, constDim, itemLayout)
+	                    : itemLayout.bodyEnds
+	            },
+	            style: {strokeNoScale: true},
+	            z2: 100
+	        }));
+	        this.bodyIndex = count++;
+
+	        // Box element.
+	        var whiskerEnds = zrUtil.map(itemLayout.whiskerEnds, function (ends) {
+	            return isInit ? transInit(ends, constDim, itemLayout) : ends;
+	        });
+	        this.add(new WhiskerPath({
+	            shape: makeWhiskerEndsShape(whiskerEnds),
+	            style: {strokeNoScale: true},
+	            z2: 100
+	        }));
+	        this.whiskerIndex = count++;
+	    };
+
+	    function transInit(points, dim, itemLayout) {
+	        return zrUtil.map(points, function (point) {
+	            point = point.slice();
+	            point[dim] = itemLayout.initBaseline;
+	            return point;
+	        });
+	    }
+
+	    function makeWhiskerEndsShape(whiskerEnds) {
+	        // zr animation only support 2-dim array.
+	        var shape = {};
+	        zrUtil.each(whiskerEnds, function (ends, i) {
+	            shape['ends' + i] = ends;
+	        });
+	        return shape;
+	    }
+
+	    /**
+	     * Update symbol properties
+	     * @param  {module:echarts/data/List} data
+	     * @param  {number} idx
+	     */
+	    whiskerBoxProto.updateData = function (data, idx, isInit) {
+	        var seriesModel = this._seriesModel = data.hostModel;
+	        var itemLayout = data.getItemLayout(idx);
+	        var updateMethod = graphic[isInit ? 'initProps' : 'updateProps'];
+	        // this.childAt(this.bodyIndex).stopAnimation(true);
+	        // this.childAt(this.whiskerIndex).stopAnimation(true);
+	        updateMethod(
+	            this.childAt(this.bodyIndex),
+	            {shape: {points: itemLayout.bodyEnds}},
+	            seriesModel, idx
+	        );
+	        updateMethod(
+	            this.childAt(this.whiskerIndex),
+	            {shape: makeWhiskerEndsShape(itemLayout.whiskerEnds)},
+	            seriesModel, idx
+	        );
+
+	        this.styleUpdater.call(null, this, data, idx);
+	    };
+
+	    zrUtil.inherits(WhiskerBox, graphic.Group);
+
+
+	    /**
+	     * @constructor
+	     * @alias module:echarts/chart/helper/WhiskerBoxDraw
+	     */
+	    function WhiskerBoxDraw(styleUpdater) {
+	        this.group = new graphic.Group();
+	        this.styleUpdater = styleUpdater;
+	    }
+
+	    var whiskerBoxDrawProto = WhiskerBoxDraw.prototype;
+
+	    /**
+	     * Update symbols draw by new data
+	     * @param {module:echarts/data/List} data
+	     */
+	    whiskerBoxDrawProto.updateData = function (data) {
+	        var group = this.group;
+	        var oldData = this._data;
+	        var styleUpdater = this.styleUpdater;
+
+	        data.diff(oldData)
+	            .add(function (newIdx) {
+	                if (data.hasValue(newIdx)) {
+	                    var symbolEl = new WhiskerBox(data, newIdx, styleUpdater, true);
+	                    data.setItemGraphicEl(newIdx, symbolEl);
+	                    group.add(symbolEl);
+	                }
+	            })
+	            .update(function (newIdx, oldIdx) {
+	                var symbolEl = oldData.getItemGraphicEl(oldIdx);
+
+	                // Empty data
+	                if (!data.hasValue(newIdx)) {
+	                    group.remove(symbolEl);
+	                    return;
+	                }
+
+	                if (!symbolEl) {
+	                    symbolEl = new WhiskerBox(data, newIdx, styleUpdater);
+	                }
+	                else {
+	                    symbolEl.updateData(data, newIdx);
+	                }
+
+	                // Add back
+	                group.add(symbolEl);
+
+	                data.setItemGraphicEl(newIdx, symbolEl);
+	            })
+	            .remove(function (oldIdx) {
+	                var el = oldData.getItemGraphicEl(oldIdx);
+	                el && group.remove(el);
+	            })
+	            .execute();
+
+	        this._data = data;
+	    };
+
+	    /**
+	     * Remove symbols.
+	     * @param {module:echarts/data/List} data
+	     */
+	    whiskerBoxDrawProto.remove = function () {
+	        var group = this.group;
+	        var data = this._data;
+	        this._data = null;
+	        data && data.eachItemGraphicEl(function (el) {
+	            el && group.remove(el);
+	        });
+	    };
+
+	    module.exports = WhiskerBoxDraw;
+
+
+/***/ },
+/* 248 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var ChartView = __webpack_require__(42);
+	    var graphic = __webpack_require__(43);
+	    var whiskerBoxCommon = __webpack_require__(246);
+
+	    var BoxplotView = ChartView.extend({
+
+	        type: 'boxplot',
+
+	        getStyleUpdater: function () {
+	            return updateStyle;
+	        }
+	    });
+
+	    zrUtil.mixin(BoxplotView, whiskerBoxCommon.viewMixin, true);
+
+	    // Update common properties
+	    var normalStyleAccessPath = ['itemStyle', 'normal'];
+	    var emphasisStyleAccessPath = ['itemStyle', 'emphasis'];
+
+	    function updateStyle(itemGroup, data, idx) {
+	        var itemModel = data.getItemModel(idx);
+	        var normalItemStyleModel = itemModel.getModel(normalStyleAccessPath);
+	        var borderColor = data.getItemVisual(idx, 'color');
+
+	        // Exclude borderColor.
+	        var itemStyle = normalItemStyleModel.getItemStyle(['borderColor']);
+
+	        var whiskerEl = itemGroup.childAt(itemGroup.whiskerIndex);
+	        whiskerEl.style.set(itemStyle);
+	        whiskerEl.style.stroke = borderColor;
+	        whiskerEl.dirty();
+
+	        var bodyEl = itemGroup.childAt(itemGroup.bodyIndex);
+	        bodyEl.style.set(itemStyle);
+	        bodyEl.style.stroke = borderColor;
+	        bodyEl.dirty();
+
+	        var hoverStyle = itemModel.getModel(emphasisStyleAccessPath).getItemStyle();
+	        graphic.setHoverStyle(itemGroup, hoverStyle);
+	    }
+
+	    module.exports = BoxplotView;
+
+
+
+/***/ },
+/* 249 */
+/***/ function(module, exports) {
+
+	
+
+	    var borderColorQuery = ['itemStyle', 'normal', 'borderColor'];
+
+	    module.exports = function (ecModel, api) {
+
+	        var globalColors = ecModel.get('color');
+
+	        ecModel.eachRawSeriesByType('boxplot', function (seriesModel) {
+
+	            var defaulColor = globalColors[seriesModel.seriesIndex % globalColors.length];
+	            var data = seriesModel.getData();
+
+	            data.setVisual({
+	                legendSymbol: 'roundRect',
+	                // Use name 'color' but not 'borderColor' for legend usage and
+	                // visual coding from other component like dataRange.
+	                color: seriesModel.get(borderColorQuery) || defaulColor
+	            });
+
+	            // Only visible series has each data be visual encoded
+	            if (!ecModel.isSeriesFiltered(seriesModel)) {
+	                data.each(function (idx) {
+	                    var itemModel = data.getItemModel(idx);
+	                    data.setItemVisual(
+	                        idx,
+	                        {color: itemModel.get(borderColorQuery, true)}
+	                    );
+	                });
+	            }
+	        });
+
+	    };
+
+
+/***/ },
+/* 250 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+	    var numberUtil = __webpack_require__(7);
+	    var parsePercent = numberUtil.parsePercent;
+	    var each = zrUtil.each;
+
+	    module.exports = function (ecModel) {
+
+	        var groupResult = groupSeriesByAxis(ecModel);
+
+	        each(groupResult, function (groupItem) {
+	            var seriesModels = groupItem.seriesModels;
+
+	            if (!seriesModels.length) {
+	                return;
+	            }
+
+	            calculateBase(groupItem);
+
+	            each(seriesModels, function (seriesModel, idx) {
+	                layoutSingleSeries(
+	                    seriesModel,
+	                    groupItem.boxOffsetList[idx],
+	                    groupItem.boxWidthList[idx]
+	                );
+	            });
+	        });
+	    };
+
+	    /**
+	     * Group series by axis.
+	     */
+	    function groupSeriesByAxis(ecModel) {
+	        var result = [];
+	        var axisList = [];
+
+	        ecModel.eachSeriesByType('boxplot', function (seriesModel) {
+	            var baseAxis = seriesModel.getBaseAxis();
+	            var idx = zrUtil.indexOf(axisList, baseAxis);
+
+	            if (idx < 0) {
+	                idx = axisList.length;
+	                axisList[idx] = baseAxis;
+	                result[idx] = {axis: baseAxis, seriesModels: []};
+	            }
+
+	            result[idx].seriesModels.push(seriesModel);
+	        });
+
+	        return result;
+	    }
+
+	    /**
+	     * Calculate offset and box width for each series.
+	     */
+	    function calculateBase(groupItem) {
+	        var extent;
+	        var baseAxis = groupItem.axis;
+	        var seriesModels = groupItem.seriesModels;
+	        var seriesCount = seriesModels.length;
+
+	        var boxWidthList = groupItem.boxWidthList = [];
+	        var boxOffsetList = groupItem.boxOffsetList = [];
+	        var boundList = [];
+
+	        var bandWidth;
+	        if (baseAxis.type === 'category') {
+	            bandWidth = baseAxis.getBandWidth();
+	        }
+	        else {
+	            var maxDataCount = 0;
+	            each(seriesModels, function (seriesModel) {
+	                maxDataCount = Math.max(maxDataCount, seriesModel.getData().count());
+	            });
+	            extent = baseAxis.getExtent(),
+	            Math.abs(extent[1] - extent[0]) / maxDataCount;
+	        }
+
+	        each(seriesModels, function (seriesModel) {
+	            var boxWidthBound = seriesModel.get('boxWidth');
+	            if (!zrUtil.isArray(boxWidthBound)) {
+	                boxWidthBound = [boxWidthBound, boxWidthBound];
+	            }
+	            boundList.push([
+	                parsePercent(boxWidthBound[0], bandWidth) || 0,
+	                parsePercent(boxWidthBound[1], bandWidth) || 0
+	            ]);
+	        });
+
+	        var availableWidth = bandWidth * 0.8 - 2;
+	        var boxGap = availableWidth / seriesCount * 0.3;
+	        var boxWidth = (availableWidth - boxGap * (seriesCount - 1)) / seriesCount;
+	        var base = boxWidth / 2 - availableWidth / 2;
+
+	        each(seriesModels, function (seriesModel, idx) {
+	            boxOffsetList.push(base);
+	            base += boxGap + boxWidth;
+
+	            boxWidthList.push(
+	                Math.min(Math.max(boxWidth, boundList[idx][0]), boundList[idx][1])
+	            );
+	        });
+	    }
+
+	    /**
+	     * Calculate points location for each series.
+	     */
+	    function layoutSingleSeries(seriesModel, offset, boxWidth) {
+	        var coordSys = seriesModel.coordinateSystem;
+	        var data = seriesModel.getData();
+	        var dimensions = seriesModel.dimensions;
+	        var chartLayout = seriesModel.get('layout');
+	        var halfWidth = boxWidth / 2;
+
+	        data.each(dimensions, function () {
+	            var args = arguments;
+	            var dimLen = dimensions.length;
+	            var axisDimVal = args[0];
+	            var idx = args[dimLen];
+	            var variableDim = chartLayout === 'horizontal' ? 0 : 1;
+	            var constDim = 1 - variableDim;
+
+	            var median = getPoint(args[3]);
+	            var end1 = getPoint(args[1]);
+	            var end5 = getPoint(args[5]);
+	            var whiskerEnds = [
+	                [end1, getPoint(args[2])],
+	                [end5, getPoint(args[4])]
+	            ];
+	            layEndLine(end1);
+	            layEndLine(end5);
+	            layEndLine(median);
+
+	            var bodyEnds = [];
+	            addBodyEnd(whiskerEnds[0][1], 0);
+	            addBodyEnd(whiskerEnds[1][1], 1);
+
+	            data.setItemLayout(idx, {
+	                chartLayout: chartLayout,
+	                initBaseline: median[constDim],
+	                median: median,
+	                bodyEnds: bodyEnds,
+	                whiskerEnds: whiskerEnds
+	            });
+
+	            function getPoint(val) {
+	                var p = [];
+	                p[variableDim] = axisDimVal;
+	                p[constDim] = val;
+	                var point;
+	                if (isNaN(axisDimVal) || isNaN(val)) {
+	                    point = [NaN, NaN];
+	                }
+	                else {
+	                    point = coordSys.dataToPoint(p);
+	                    point[variableDim] += offset;
+	                }
+	                return point;
+	            }
+
+	            function addBodyEnd(point, start) {
+	                var point1 = point.slice();
+	                var point2 = point.slice();
+	                point1[variableDim] += halfWidth;
+	                point2[variableDim] -= halfWidth;
+	                start
+	                    ? bodyEnds.push(point1, point2)
+	                    : bodyEnds.push(point2, point1);
+	            }
+
+	            function layEndLine(endCenter) {
+	                var line = [endCenter.slice(), endCenter.slice()];
+	                line[0][variableDim] -= halfWidth;
+	                line[1][variableDim] += halfWidth;
+	                whiskerEnds.push(line);
+	            }
+	        });
+	    }
+
+
+
+/***/ },
+/* 251 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var echarts = __webpack_require__(1);
+
+	    __webpack_require__(252);
+	    __webpack_require__(253);
+
+	    echarts.registerPreprocessor(
+	        __webpack_require__(254)
+	    );
+
+	    echarts.registerVisual(__webpack_require__(255));
+	    echarts.registerLayout(__webpack_require__(256));
+
+
+
+/***/ },
+/* 252 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var SeriesModel = __webpack_require__(28);
+	    var whiskerBoxCommon = __webpack_require__(246);
+	    var formatUtil = __webpack_require__(6);
+	    var encodeHTML = formatUtil.encodeHTML;
+	    var addCommas = formatUtil.addCommas;
+
+	    var CandlestickSeries = SeriesModel.extend({
+
+	        type: 'series.candlestick',
+
+	        dependencies: ['xAxis', 'yAxis', 'grid'],
+
+	        /**
+	         * @readOnly
+	         */
+	        valueDimensions: ['open', 'close', 'lowest', 'highest'],
+
+	        /**
+	         * @type {Array.<string>}
+	         * @readOnly
+	         */
+	        dimensions: null,
+
+	        /**
+	         * @override
+	         */
+	        defaultOption: {
+	            zlevel: 0,                  // 一级层叠
+	            z: 2,                       // 二级层叠
+	            coordinateSystem: 'cartesian2d',
+	            legendHoverLink: true,
+
+	            hoverAnimation: true,
+
+	            xAxisIndex: 0,
+	            yAxisIndex: 0,
+
+	            layout: null, // 'horizontal' or 'vertical'
+
+	            itemStyle: {
+	                normal: {
+	                    color: '#c23531', // 阳线 positive
+	                    color0: '#314656', // 阴线 negative     '#c23531', '#314656'
+	                    borderWidth: 1,
+	                    // FIXME
+	                    // ec2中使用的是lineStyle.color 和 lineStyle.color0
+	                    borderColor: '#c23531',
+	                    borderColor0: '#314656'
+	                },
+	                emphasis: {
+	                    borderWidth: 2
+	                }
+	            },
+
+	            animationUpdate: false,
+	            animationEasing: 'linear',
+	            animationDuration: 300
+	        },
+
+	        /**
+	         * Get dimension for shadow in dataZoom
+	         * @return {string} dimension name
+	         */
+	        getShadowDim: function () {
+	            return 'open';
+	        },
+
+	        /**
+	         * @override
+	         */
+	        formatTooltip: function (dataIndex, mutipleSeries) {
+	            // It rearly use mutiple candlestick series in one cartesian,
+	            // so only consider one series in this default tooltip.
+	            var valueHTMLArr = zrUtil.map(this.valueDimensions, function (dim) {
+	                return dim + ': ' + addCommas(this._data.get(dim, dataIndex));
+	            }, this);
+
+	            return encodeHTML(this.name) + '<br />' + valueHTMLArr.join('<br />');
+	        },
+
+	        brushSelector: function (itemLayout, selectors) {
+	            return selectors.rect(itemLayout.brushRect);
+	        }
+
+	    });
+
+	    zrUtil.mixin(CandlestickSeries, whiskerBoxCommon.seriesModelMixin, true);
+
+	    module.exports = CandlestickSeries;
+
+
+
+/***/ },
+/* 253 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var ChartView = __webpack_require__(42);
+	    var graphic = __webpack_require__(43);
+	    var whiskerBoxCommon = __webpack_require__(246);
+
+	    var CandlestickView = ChartView.extend({
+
+	        type: 'candlestick',
+
+	        getStyleUpdater: function () {
+	            return updateStyle;
+	        }
+
+	    });
+
+	    zrUtil.mixin(CandlestickView, whiskerBoxCommon.viewMixin, true);
+
+	    // Update common properties
+	    var normalStyleAccessPath = ['itemStyle', 'normal'];
+	    var emphasisStyleAccessPath = ['itemStyle', 'emphasis'];
+
+	    function updateStyle(itemGroup, data, idx) {
+	        var itemModel = data.getItemModel(idx);
+	        var normalItemStyleModel = itemModel.getModel(normalStyleAccessPath);
+	        var color = data.getItemVisual(idx, 'color');
+	        var borderColor = data.getItemVisual(idx, 'borderColor') || color;
+
+	        // Color must be excluded.
+	        // Because symbol provide setColor individually to set fill and stroke
+	        var itemStyle = normalItemStyleModel.getItemStyle(
+	            ['color', 'color0', 'borderColor', 'borderColor0']
+	        );
+
+	        var whiskerEl = itemGroup.childAt(itemGroup.whiskerIndex);
+	        whiskerEl.useStyle(itemStyle);
+	        whiskerEl.style.stroke = borderColor;
+
+	        var bodyEl = itemGroup.childAt(itemGroup.bodyIndex);
+	        bodyEl.useStyle(itemStyle);
+	        bodyEl.style.fill = color;
+	        bodyEl.style.stroke = borderColor;
+
+	        var hoverStyle = itemModel.getModel(emphasisStyleAccessPath).getItemStyle();
+	        graphic.setHoverStyle(itemGroup, hoverStyle);
+	    }
+
+
+	    module.exports = CandlestickView;
+
+
+
+/***/ },
+/* 254 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+
+	    module.exports = function (option) {
+	        if (!option || !zrUtil.isArray(option.series)) {
+	            return;
+	        }
+
+	        // Translate 'k' to 'candlestick'.
+	        zrUtil.each(option.series, function (seriesItem) {
+	            if (zrUtil.isObject(seriesItem) && seriesItem.type === 'k') {
+	                seriesItem.type = 'candlestick';
+	            }
+	        });
+	    };
+
+
+
+/***/ },
+/* 255 */
+/***/ function(module, exports) {
+
+	
+
+	    var positiveBorderColorQuery = ['itemStyle', 'normal', 'borderColor'];
+	    var negativeBorderColorQuery = ['itemStyle', 'normal', 'borderColor0'];
+	    var positiveColorQuery = ['itemStyle', 'normal', 'color'];
+	    var negativeColorQuery = ['itemStyle', 'normal', 'color0'];
+
+	    module.exports = function (ecModel, api) {
+
+	        ecModel.eachRawSeriesByType('candlestick', function (seriesModel) {
+
+	            var data = seriesModel.getData();
+
+	            data.setVisual({
+	                legendSymbol: 'roundRect'
+	            });
+
+	            // Only visible series has each data be visual encoded
+	            if (!ecModel.isSeriesFiltered(seriesModel)) {
+	                data.each(function (idx) {
+	                    var itemModel = data.getItemModel(idx);
+	                    var sign = data.getItemLayout(idx).sign;
+
+	                    data.setItemVisual(
+	                        idx,
+	                        {
+	                            color: itemModel.get(
+	                                sign > 0 ? positiveColorQuery : negativeColorQuery
+	                            ),
+	                            borderColor: itemModel.get(
+	                                sign > 0 ? positiveBorderColorQuery : negativeBorderColorQuery
+	                            )
+	                        }
+	                    );
+	                });
+	            }
+	        });
+
+	    };
+
+
+/***/ },
+/* 256 */
+/***/ function(module, exports) {
+
+	
+
+	    var CANDLE_MIN_WIDTH = 2;
+	    var CANDLE_MIN_NICE_WIDTH = 5;
+	    var GPA_MIN = 4;
+
+	    module.exports = function (ecModel) {
+
+	        ecModel.eachSeriesByType('candlestick', function (seriesModel) {
+
+	            var coordSys = seriesModel.coordinateSystem;
+	            var data = seriesModel.getData();
+	            var dimensions = seriesModel.dimensions;
+	            var chartLayout = seriesModel.get('layout');
+
+	            var candleWidth = calculateCandleWidth(seriesModel, data);
+
+	            data.each(dimensions, function () {
+	                var args = arguments;
+	                var dimLen = dimensions.length;
+	                var axisDimVal = args[0];
+	                var idx = args[dimLen];
+	                var variableDim = chartLayout === 'horizontal' ? 0 : 1;
+	                var constDim = 1 - variableDim;
+
+	                var openVal = args[1];
+	                var closeVal = args[2];
+	                var lowestVal = args[3];
+	                var highestVal = args[4];
+
+	                var ocLow = Math.min(openVal, closeVal);
+	                var ocHigh = Math.max(openVal, closeVal);
+
+	                var ocLowPoint = getPoint(ocLow);
+	                var ocHighPoint = getPoint(ocHigh);
+	                var lowestPoint = getPoint(lowestVal);
+	                var highestPoint = getPoint(highestVal);
+
+	                var whiskerEnds = [
+	                    [highestPoint, ocHighPoint],
+	                    [lowestPoint, ocLowPoint]
+	                ];
+
+	                var bodyEnds = [];
+	                addBodyEnd(ocHighPoint, 0);
+	                addBodyEnd(ocLowPoint, 1);
+
+	                data.setItemLayout(idx, {
+	                    chartLayout: chartLayout,
+	                    sign: openVal > closeVal ? -1 : openVal < closeVal ? 1 : 0,
+	                    initBaseline: openVal > closeVal
+	                        ? ocHighPoint[constDim] : ocLowPoint[constDim], // open point.
+	                    bodyEnds: bodyEnds,
+	                    whiskerEnds: whiskerEnds,
+	                    brushRect: makeBrushRect()
+	                });
+
+	                function getPoint(val) {
+	                    var p = [];
+	                    p[variableDim] = axisDimVal;
+	                    p[constDim] = val;
+	                    return (isNaN(axisDimVal) || isNaN(val))
+	                        ? [NaN, NaN]
+	                        : coordSys.dataToPoint(p);
+	                }
+
+	                function addBodyEnd(point, start) {
+	                    var point1 = point.slice();
+	                    var point2 = point.slice();
+	                    point1[variableDim] += candleWidth / 2;
+	                    point2[variableDim] -= candleWidth / 2;
+	                    start
+	                        ? bodyEnds.push(point1, point2)
+	                        : bodyEnds.push(point2, point1);
+	                }
+
+	                function makeBrushRect() {
+	                    var pmin = getPoint(Math.min(openVal, closeVal, lowestVal, highestVal));
+	                    var pmax = getPoint(Math.max(openVal, closeVal, lowestVal, highestVal));
+
+	                    pmin[variableDim] -= candleWidth / 2;
+	                    pmax[variableDim] -= candleWidth / 2;
+
+	                    return {
+	                        x: pmin[0],
+	                        y: pmin[1],
+	                        width: constDim ? candleWidth : pmax[0] - pmin[0],
+	                        height: constDim ? pmax[1] - pmin[1] : candleWidth
+	                    };
+	                }
+
+	            }, true);
+	        });
+	    };
+
+	    function calculateCandleWidth(seriesModel, data) {
+	        var baseAxis = seriesModel.getBaseAxis();
+	        var extent;
+
+	        var bandWidth = baseAxis.type === 'category'
+	            ? baseAxis.getBandWidth()
+	            : (
+	                extent = baseAxis.getExtent(),
+	                Math.abs(extent[1] - extent[0]) / data.count()
+	            );
+
+	        // Half band width is perfect when space is enouph, otherwise
+	        // try not to be smaller than CANDLE_MIN_NICE_WIDTH (and only
+	        // gap is compressed), otherwise ensure not to be smaller than
+	        // CANDLE_MIN_WIDTH in spite of overlap.
+
+	        return bandWidth / 2 - 2 > CANDLE_MIN_NICE_WIDTH // "- 2" is minus border width
+	            ? bandWidth / 2 - 2
+	            : bandWidth - CANDLE_MIN_NICE_WIDTH > GPA_MIN
+	            ? CANDLE_MIN_NICE_WIDTH
+	            : Math.max(bandWidth - GPA_MIN, CANDLE_MIN_WIDTH);
+	    }
+
+
+
+/***/ },
+/* 257 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+	    var echarts = __webpack_require__(1);
+
+	    __webpack_require__(258);
+	    __webpack_require__(259);
+
+	    echarts.registerVisual(zrUtil.curry(
+	        __webpack_require__(109), 'effectScatter', 'circle', null
+	    ));
+	    echarts.registerLayout(zrUtil.curry(
+	        __webpack_require__(110), 'effectScatter'
+	    ));
+
+
+/***/ },
+/* 258 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var createListFromArray = __webpack_require__(101);
+	    var SeriesModel = __webpack_require__(28);
+
+	    module.exports = SeriesModel.extend({
+
+	        type: 'series.effectScatter',
+
+	        dependencies: ['grid', 'polar'],
+
+	        getInitialData: function (option, ecModel) {
+	            var list = createListFromArray(option.data, this, ecModel);
+	            return list;
+	        },
+
+	        brushSelector: 'point',
+
+	        defaultOption: {
+	            coordinateSystem: 'cartesian2d',
+	            zlevel: 0,
+	            z: 2,
+	            legendHoverLink: true,
+
+	            effectType: 'ripple',
+
+	            // When to show the effect, option: 'render'|'emphasis'
+	            showEffectOn: 'render',
+
+	            // Ripple effect config
+	            rippleEffect: {
+	                period: 4,
+	                // Scale of ripple
+	                scale: 2.5,
+	                // Brush type can be fill or stroke
+	                brushType: 'fill'
+	            },
+
+	            // Cartesian coordinate system
+	            xAxisIndex: 0,
+	            yAxisIndex: 0,
+
+	            // Polar coordinate system
+	            polarIndex: 0,
+
+	            // Geo coordinate system
+	            geoIndex: 0,
+
+	            // symbol: null,        // 图形类型
+	            symbolSize: 10          // 图形大小，半宽（半径）参数，当图形为方向或菱形则总宽度为symbolSize * 2
+	            // symbolRotate: null,  // 图形旋转控制
+
+	            // large: false,
+	            // Available when large is true
+	            // largeThreshold: 2000,
+
+	            // itemStyle: {
+	            //     normal: {
+	            //         opacity: 1
+	            //     }
+	            // }
+	        }
+
+	    });
+
+
+/***/ },
+/* 259 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var SymbolDraw = __webpack_require__(104);
+	    var EffectSymbol = __webpack_require__(260);
+
+	    __webpack_require__(1).extendChartView({
+
+	        type: 'effectScatter',
+
+	        init: function () {
+	            this._symbolDraw = new SymbolDraw(EffectSymbol);
+	        },
+
+	        render: function (seriesModel, ecModel, api) {
+	            var data = seriesModel.getData();
+	            var effectSymbolDraw = this._symbolDraw;
+	            effectSymbolDraw.updateData(data);
+	            this.group.add(effectSymbolDraw.group);
+	        },
+
+	        updateLayout: function () {
+	            this._symbolDraw.updateLayout();
+	        },
+
+	        remove: function (ecModel, api) {
+	            this._symbolDraw && this._symbolDraw.remove(api);
+	        }
+	    });
+
+
+/***/ },
+/* 260 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * Symbol with ripple effect
+	 * @module echarts/chart/helper/EffectSymbol
+	 */
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var symbolUtil = __webpack_require__(106);
+	    var graphic = __webpack_require__(43);
+	    var numberUtil = __webpack_require__(7);
+	    var Symbol = __webpack_require__(105);
+	    var Group = graphic.Group;
+
+	    var EFFECT_RIPPLE_NUMBER = 3;
+
+	    function normalizeSymbolSize(symbolSize) {
+	        if (!zrUtil.isArray(symbolSize)) {
+	            symbolSize = [+symbolSize, +symbolSize];
+	        }
+	        return symbolSize;
+	    }
+
+	    function updateRipplePath(rippleGroup, effectCfg) {
+	        rippleGroup.eachChild(function (ripplePath) {
+	            ripplePath.attr({
+	                z: effectCfg.z,
+	                zlevel: effectCfg.zlevel,
+	                style: {
+	                    stroke: effectCfg.brushType === 'stroke' ? effectCfg.color : null,
+	                    fill: effectCfg.brushType === 'fill' ? effectCfg.color : null
+	                }
+	            });
+	        });
+	    }
+	    /**
+	     * @constructor
+	     * @param {module:echarts/data/List} data
+	     * @param {number} idx
+	     * @extends {module:zrender/graphic/Group}
+	     */
+	    function EffectSymbol(data, idx) {
+	        Group.call(this);
+
+	        var symbol = new Symbol(data, idx);
+	        var rippleGroup = new Group();
+	        this.add(symbol);
+	        this.add(rippleGroup);
+
+	        rippleGroup.beforeUpdate = function () {
+	            this.attr(symbol.getScale());
+	        };
+	        this.updateData(data, idx);
+	    }
+
+	    var effectSymbolProto = EffectSymbol.prototype;
+
+	    effectSymbolProto.stopEffectAnimation = function () {
+	        this.childAt(1).removeAll();
+	    };
+
+	    effectSymbolProto.startEffectAnimation = function (effectCfg) {
+	        var symbolType = effectCfg.symbolType;
+	        var color = effectCfg.color;
+	        var rippleGroup = this.childAt(1);
+
+	        for (var i = 0; i < EFFECT_RIPPLE_NUMBER; i++) {
+	            var ripplePath = symbolUtil.createSymbol(
+	                symbolType, -0.5, -0.5, 1, 1, color
+	            );
+	            ripplePath.attr({
+	                style: {
+	                    strokeNoScale: true
+	                },
+	                z2: 99,
+	                silent: true,
+	                scale: [1, 1]
+	            });
+
+	            var delay = -i / EFFECT_RIPPLE_NUMBER * effectCfg.period + effectCfg.effectOffset;
+	            // TODO Configurable effectCfg.period
+	            ripplePath.animate('', true)
+	                .when(effectCfg.period, {
+	                    scale: [effectCfg.rippleScale, effectCfg.rippleScale]
+	                })
+	                .delay(delay)
+	                .start();
+	            ripplePath.animateStyle(true)
+	                .when(effectCfg.period, {
+	                    opacity: 0
+	                })
+	                .delay(delay)
+	                .start();
+
+	            rippleGroup.add(ripplePath);
+	        }
+
+	        updateRipplePath(rippleGroup, effectCfg);
+	    };
+
+	    /**
+	     * Update effect symbol
+	     */
+	    effectSymbolProto.updateEffectAnimation = function (effectCfg) {
+	        var oldEffectCfg = this._effectCfg;
+	        var rippleGroup = this.childAt(1);
+
+	        // Must reinitialize effect if following configuration changed
+	        var DIFFICULT_PROPS = ['symbolType', 'period', 'rippleScale'];
+	        for (var i = 0; i < DIFFICULT_PROPS; i++) {
+	            var propName = DIFFICULT_PROPS[i];
+	            if (oldEffectCfg[propName] !== effectCfg[propName]) {
+	                this.stopEffectAnimation();
+	                this.startEffectAnimation(effectCfg);
+	                return;
+	            }
+	        }
+
+	        updateRipplePath(rippleGroup, effectCfg);
+	    };
+
+	    /**
+	     * Highlight symbol
+	     */
+	    effectSymbolProto.highlight = function () {
+	        this.trigger('emphasis');
+	    };
+
+	    /**
+	     * Downplay symbol
+	     */
+	    effectSymbolProto.downplay = function () {
+	        this.trigger('normal');
+	    };
+
+	    /**
+	     * Update symbol properties
+	     * @param  {module:echarts/data/List} data
+	     * @param  {number} idx
+	     */
+	    effectSymbolProto.updateData = function (data, idx) {
+	        var seriesModel = data.hostModel;
+
+	        this.childAt(0).updateData(data, idx);
+
+	        var rippleGroup = this.childAt(1);
+	        var itemModel = data.getItemModel(idx);
+	        var symbolType = data.getItemVisual(idx, 'symbol');
+	        var symbolSize = normalizeSymbolSize(data.getItemVisual(idx, 'symbolSize'));
+	        var color = data.getItemVisual(idx, 'color');
+
+	        rippleGroup.attr('scale', symbolSize);
+
+	        rippleGroup.traverse(function (ripplePath) {
+	            ripplePath.attr({
+	                fill: color
+	            });
+	        });
+
+	        var symbolOffset = itemModel.getShallow('symbolOffset');
+	        if (symbolOffset) {
+	            var pos = rippleGroup.position;
+	            pos[0] = numberUtil.parsePercent(symbolOffset[0], symbolSize[0]);
+	            pos[1] = numberUtil.parsePercent(symbolOffset[1], symbolSize[1]);
+	        }
+	        rippleGroup.rotation = (itemModel.getShallow('symbolRotate') || 0) * Math.PI / 180 || 0;
+
+	        var effectCfg = {};
+
+	        effectCfg.showEffectOn = seriesModel.get('showEffectOn');
+	        effectCfg.rippleScale = itemModel.get('rippleEffect.scale');
+	        effectCfg.brushType = itemModel.get('rippleEffect.brushType');
+	        effectCfg.period = itemModel.get('rippleEffect.period') * 1000;
+	        effectCfg.effectOffset = idx / data.count();
+	        effectCfg.z = itemModel.getShallow('z') || 0;
+	        effectCfg.zlevel = itemModel.getShallow('zlevel') || 0;
+	        effectCfg.symbolType = symbolType;
+	        effectCfg.color = color;
+
+	        this.off('mouseover').off('mouseout').off('emphasis').off('normal');
+
+	        if (effectCfg.showEffectOn === 'render') {
+	            this._effectCfg
+	                ? this.updateEffectAnimation(effectCfg)
+	                : this.startEffectAnimation(effectCfg);
+
+	            this._effectCfg = effectCfg;
+	        }
+	        else {
+	            // Not keep old effect config
+	            this._effectCfg = null;
+
+	            this.stopEffectAnimation();
+	            var symbol = this.childAt(0);
+	            var onEmphasis = function () {
+	                symbol.trigger('emphasis');
+	                if (effectCfg.showEffectOn !== 'render') {
+	                    this.startEffectAnimation(effectCfg);
+	                }
+	            };
+	            var onNormal = function () {
+	                symbol.trigger('normal');
+	                if (effectCfg.showEffectOn !== 'render') {
+	                    this.stopEffectAnimation();
+	                }
+	            };
+	            this.on('mouseover', onEmphasis, this)
+	                .on('mouseout', onNormal, this)
+	                .on('emphasis', onEmphasis, this)
+	                .on('normal', onNormal, this);
+	        }
+
+	        this._effectCfg = effectCfg;
+	    };
+
+	    effectSymbolProto.fadeOut = function (cb) {
+	        this.off('mouseover').off('mouseout').off('emphasis').off('normal');
+	        cb && cb();
+	    };
+
+	    zrUtil.inherits(EffectSymbol, Group);
+
+	    module.exports = EffectSymbol;
+
+
+/***/ },
+/* 261 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    __webpack_require__(262);
+	    __webpack_require__(263);
+
+	    var echarts = __webpack_require__(1);
+	    echarts.registerLayout(
+	        __webpack_require__(268)
+	    );
+
+
+/***/ },
+/* 262 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var SeriesModel = __webpack_require__(28);
+	    var List = __webpack_require__(97);
+	    var zrUtil = __webpack_require__(4);
+	    var CoordinateSystem = __webpack_require__(26);
+
+	    // Convert [ [{coord: []}, {coord: []}] ]
+	    // to [ { coords: [[]] } ]
+	    function preprocessOption (seriesOpt) {
+	        var data = seriesOpt.data;
+	        if (data && data[0] && data[0][0] && data[0][0].coord) {
+	            if (true) {
+	                console.warn('Lines data configuration has been changed to'
+	                    + ' { coords:[[1,2],[2,3]] }');
+	            }
+	            seriesOpt.data = zrUtil.map(data, function (itemOpt) {
+	                var coords = [
+	                    itemOpt[0].coord, itemOpt[1].coord
+	                ];
+	                var target = {
+	                    coords: coords
+	                };
+	                if (itemOpt[0].name) {
+	                    target.fromName = itemOpt[0].name;
+	                }
+	                if (itemOpt[1].name) {
+	                    target.toName = itemOpt[1].name;
+	                }
+	                return zrUtil.mergeAll([target, itemOpt[0], itemOpt[1]]);
+	            });
+	        }
+	    }
+
+	    var LinesSeries = SeriesModel.extend({
+
+	        type: 'series.lines',
+
+	        dependencies: ['grid', 'polar'],
+
+	        visualColorAccessPath: 'lineStyle.normal.color',
+
+	        init: function (option) {
+	            // Not using preprocessor because mergeOption may not have series.type
+	            preprocessOption(option);
+
+	            LinesSeries.superApply(this, 'init', arguments);
+	        },
+
+	        mergeOption: function (option) {
+	            preprocessOption(option);
+
+	            LinesSeries.superApply(this, 'mergeOption', arguments);
+	        },
+
+	        getInitialData: function (option, ecModel) {
+	            if (true) {
+	                var CoordSys = CoordinateSystem.get(option.coordinateSystem);
+	                if (!CoordSys) {
+	                    throw new Error('Unkown coordinate system ' + option.coordinateSystem);
+	                }
+	            }
+
+	            var lineData = new List(['value'], this);
+	            lineData.hasItemOption = false;
+	            lineData.initData(option.data, [], function (dataItem, dimName, dataIndex, dimIndex) {
+	                // dataItem is simply coords
+	                if (dataItem instanceof Array) {
+	                    return NaN;
+	                }
+	                else {
+	                    lineData.hasItemOption = true;
+	                    var value = dataItem.value;
+	                    if (value) {
+	                        return value instanceof Array ? value[dimIndex] : value;
+	                    }
+	                }
+	            });
+
+	            return lineData;
+	        },
+
+	        formatTooltip: function (dataIndex) {
+	            var data = this.getData();
+	            var itemModel = data.getItemModel(dataIndex);
+	            var name = itemModel.get('name');
+	            if (name) {
+	                return name;
+	            }
+	            var fromName = itemModel.get('fromName');
+	            var toName = itemModel.get('toName');
+	            return fromName + ' > ' + toName;
+	        },
+
+	        defaultOption: {
+	            coordinateSystem: 'geo',
+	            zlevel: 0,
+	            z: 2,
+	            legendHoverLink: true,
+
+	            hoverAnimation: true,
+	            // Cartesian coordinate system
+	            xAxisIndex: 0,
+	            yAxisIndex: 0,
+
+	            // Geo coordinate system
+	            geoIndex: 0,
+
+	            effect: {
+	                show: false,
+	                period: 4,
+	                // Animation delay. support callback
+	                // delay: 0,
+	                // If move with constant speed px/sec
+	                // period will be ignored if this property is > 0,
+	                constantSpeed: 0,
+	                symbol: 'circle',
+	                symbolSize: 3,
+	                loop: true,
+	                // Length of trail, 0 - 1
+	                trailLength: 0.2
+	                // Same with lineStyle.normal.color
+	                // color
+	            },
+
+	            large: false,
+	            // Available when large is true
+	            largeThreshold: 2000,
+
+	            // If lines are polyline
+	            // polyline not support curveness, label, animation
+	            polyline: false,
+
+	            label: {
+	                normal: {
+	                    show: false,
+	                    position: 'end'
+	                    // distance: 5,
+	                    // formatter: 标签文本格式器，同Tooltip.formatter，不支持异步回调
+	                }
+	            },
+
+	            lineStyle: {
+	                normal: {
+	                    opacity: 0.5
+	                }
+	            }
+	        }
+	    });
+
+
+/***/ },
+/* 263 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var LineDraw = __webpack_require__(199);
+	    var EffectLine = __webpack_require__(264);
+	    var Line = __webpack_require__(200);
+	    var Polyline = __webpack_require__(265);
+	    var EffectPolyline = __webpack_require__(266);
+	    var LargeLineDraw = __webpack_require__(267);
+
+	    __webpack_require__(1).extendChartView({
+
+	        type: 'lines',
+
+	        init: function () {},
+
+	        render: function (seriesModel, ecModel, api) {
+	            var data = seriesModel.getData();
+	            var lineDraw = this._lineDraw;
+
+	            var hasEffect = seriesModel.get('effect.show');
+	            var isPolyline = seriesModel.get('polyline');
+	            var isLarge = seriesModel.get('large') && data.count() >= seriesModel.get('largeThreshold');
+
+	            if (true) {
+	                if (hasEffect && isLarge) {
+	                    console.warn('Large lines not support effect');
+	                }
+	            }
+	            if (hasEffect !== this._hasEffet || isPolyline !== this._isPolyline || isLarge !== this._isLarge) {
+	                if (lineDraw) {
+	                    lineDraw.remove();
+	                }
+	                lineDraw = this._lineDraw = isLarge
+	                    ? new LargeLineDraw()
+	                    : new LineDraw(
+	                        isPolyline
+	                            ? (hasEffect ? EffectPolyline : Polyline)
+	                            : (hasEffect ? EffectLine : Line)
+	                    );
+	                this._hasEffet = hasEffect;
+	                this._isPolyline = isPolyline;
+	                this._isLarge = isLarge;
+	            }
+
+	            var zlevel = seriesModel.get('zlevel');
+	            var trailLength = seriesModel.get('effect.trailLength');
+
+	            var zr = api.getZr();
+	            // Avoid the drag cause ghost shadow
+	            // FIXME Better way ?
+	            zr.painter.getLayer(zlevel).clear(true);
+	            // Config layer with motion blur
+	            if (this._lastZlevel != null) {
+	                zr.configLayer(this._lastZlevel, {
+	                    motionBlur: false
+	                });
+	            }
+	            if (hasEffect && trailLength) {
+	                if (true) {
+	                    var notInIndividual = false;
+	                    ecModel.eachSeries(function (otherSeriesModel) {
+	                        if (otherSeriesModel !== seriesModel && otherSeriesModel.get('zlevel') === zlevel) {
+	                            notInIndividual = true;
+	                        }
+	                    });
+	                    notInIndividual && console.warn('Lines with trail effect should have an individual zlevel');
+	                }
+
+	                zr.configLayer(zlevel, {
+	                    motionBlur: true,
+	                    lastFrameAlpha: Math.max(Math.min(trailLength / 10 + 0.9, 1), 0)
+	                });
+	            }
+
+	            this.group.add(lineDraw.group);
+
+	            lineDraw.updateData(data);
+
+	            this._lastZlevel = zlevel;
+	        },
+
+	        updateLayout: function (seriesModel, ecModel, api) {
+	            this._lineDraw.updateLayout(seriesModel);
+	            // Not use motion when dragging or zooming
+	            var zr = api.getZr();
+	            zr.painter.getLayer(this._lastZlevel).clear(true);
+	        },
+
+	        remove: function (ecModel, api) {
+	            this._lineDraw && this._lineDraw.remove(api, true);
+	        }
+	    });
+
+
+/***/ },
+/* 264 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * Provide effect for line
+	 * @module echarts/chart/helper/EffectLine
+	 */
+
+
+	    var graphic = __webpack_require__(43);
+	    var Line = __webpack_require__(200);
+	    var zrUtil = __webpack_require__(4);
+	    var symbolUtil = __webpack_require__(106);
+	    var vec2 = __webpack_require__(10);
+
+	    var curveUtil = __webpack_require__(50);
+
+	    /**
+	     * @constructor
+	     * @extends {module:zrender/graphic/Group}
+	     * @alias {module:echarts/chart/helper/Line}
+	     */
+	    function EffectLine(lineData, idx, seriesScope) {
+	        graphic.Group.call(this);
+
+	        this.add(this.createLine(lineData, idx, seriesScope));
+
+	        this._updateEffectSymbol(lineData, idx);
+	    }
+
+	    var effectLineProto = EffectLine.prototype;
+
+	    effectLineProto.createLine = function (lineData, idx, seriesScope) {
+	        return new Line(lineData, idx, seriesScope);
+	    };
+
+	    effectLineProto._updateEffectSymbol = function (lineData, idx) {
+	        var itemModel = lineData.getItemModel(idx);
+	        var effectModel = itemModel.getModel('effect');
+	        var size = effectModel.get('symbolSize');
+	        var symbolType = effectModel.get('symbol');
+	        if (!zrUtil.isArray(size)) {
+	            size = [size, size];
+	        }
+	        var color = effectModel.get('color') || lineData.getItemVisual(idx, 'color');
+	        var symbol = this.childAt(1);
+
+	        if (this._symbolType !== symbolType) {
+	            // Remove previous
+	            this.remove(symbol);
+
+	            symbol = symbolUtil.createSymbol(
+	                symbolType, -0.5, -0.5, 1, 1, color
+	            );
+	            symbol.z2 = 100;
+	            symbol.culling = true;
+
+	            this.add(symbol);
+	        }
+
+	        // Symbol may be removed if loop is false
+	        if (!symbol) {
+	            return;
+	        }
+
+	        // Shadow color is same with color in default
+	        symbol.setStyle('shadowColor', color);
+	        symbol.setStyle(effectModel.getItemStyle(['color']));
+
+	        symbol.attr('scale', size);
+
+	        symbol.setColor(color);
+	        symbol.attr('scale', size);
+
+	        this._symbolType = symbolType;
+
+	        this._updateEffectAnimation(lineData, effectModel, idx);
+	    };
+
+	    effectLineProto._updateEffectAnimation = function (lineData, effectModel, idx) {
+
+	        var symbol = this.childAt(1);
+	        if (!symbol) {
+	            return;
+	        }
+
+	        var self = this;
+
+	        var points = lineData.getItemLayout(idx);
+
+	        var period = effectModel.get('period') * 1000;
+	        var loop = effectModel.get('loop');
+	        var constantSpeed = effectModel.get('constantSpeed');
+	        var delayExpr = effectModel.get('delay') || function (idx) {
+	            return idx / lineData.count() * period / 3;
+	        };
+	        var isDelayFunc = typeof delayExpr === 'function';
+
+	        // Ignore when updating
+	        symbol.ignore = true;
+
+	        this.updateAnimationPoints(symbol, points);
+
+	        if (constantSpeed > 0) {
+	            period = this.getLineLength(symbol) / constantSpeed * 1000;
+	        }
+
+	        if (period !== this._period || loop !== this._loop) {
+
+	            symbol.stopAnimation();
+
+	            var delay = delayExpr;
+	            if (isDelayFunc) {
+	                delay = delayExpr(idx);
+	            }
+	            if (symbol.__t > 0) {
+	                delay = -period * symbol.__t;
+	            }
+	            symbol.__t = 0;
+	            var animator = symbol.animate('', loop)
+	                .when(period, {
+	                    __t: 1
+	                })
+	                .delay(delay)
+	                .during(function () {
+	                    self.updateSymbolPosition(symbol);
+	                });
+	            if (!loop) {
+	                animator.done(function () {
+	                    self.remove(symbol);
+	                });
+	            }
+	            animator.start();
+	        }
+
+	        this._period = period;
+	        this._loop = loop;
+	    };
+
+	    effectLineProto.getLineLength = function (symbol) {
+	        // Not so accurate
+	        return (vec2.dist(symbol.__p1, symbol.__cp1)
+	            + vec2.dist(symbol.__cp1, symbol.__p2));
+	    };
+
+	    effectLineProto.updateAnimationPoints = function (symbol, points) {
+	        symbol.__p1 = points[0];
+	        symbol.__p2 = points[1];
+	        symbol.__cp1 = points[2] || [
+	            (points[0][0] + points[1][0]) / 2,
+	            (points[0][1] + points[1][1]) / 2
+	        ];
+	    };
+
+	    effectLineProto.updateData = function (lineData, idx, seriesScope) {
+	        this.childAt(0).updateData(lineData, idx, seriesScope);
+	        this._updateEffectSymbol(lineData, idx);
+	    };
+
+	    effectLineProto.updateSymbolPosition = function (symbol) {
+	        var p1 = symbol.__p1;
+	        var p2 = symbol.__p2;
+	        var cp1 = symbol.__cp1;
+	        var t = symbol.__t;
+	        var pos = symbol.position;
+	        var quadraticAt = curveUtil.quadraticAt;
+	        var quadraticDerivativeAt = curveUtil.quadraticDerivativeAt;
+	        pos[0] = quadraticAt(p1[0], cp1[0], p2[0], t);
+	        pos[1] = quadraticAt(p1[1], cp1[1], p2[1], t);
+
+	        // Tangent
+	        var tx = quadraticDerivativeAt(p1[0], cp1[0], p2[0], t);
+	        var ty = quadraticDerivativeAt(p1[1], cp1[1], p2[1], t);
+
+	        symbol.rotation = -Math.atan2(ty, tx) - Math.PI / 2;
+
+	        symbol.ignore = false;
+	    };
+
+
+	    effectLineProto.updateLayout = function (lineData, idx) {
+	        this.childAt(0).updateLayout(lineData, idx);
+
+	        var effectModel = lineData.getItemModel(idx).getModel('effect');
+	        this._updateEffectAnimation(lineData, effectModel, idx);
+	    };
+
+	    zrUtil.inherits(EffectLine, graphic.Group);
+
+	    module.exports = EffectLine;
+
+
+/***/ },
+/* 265 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @module echarts/chart/helper/Line
+	 */
+
+
+	    var graphic = __webpack_require__(43);
+	    var zrUtil = __webpack_require__(4);
+
+	    /**
+	     * @constructor
+	     * @extends {module:zrender/graphic/Group}
+	     * @alias {module:echarts/chart/helper/Polyline}
+	     */
+	    function Polyline(lineData, idx, seriesScope) {
+	        graphic.Group.call(this);
+
+	        this._createPolyline(lineData, idx, seriesScope);
+	    }
+
+	    var polylineProto = Polyline.prototype;
+
+	    polylineProto._createPolyline = function (lineData, idx, seriesScope) {
+	        // var seriesModel = lineData.hostModel;
+	        var points = lineData.getItemLayout(idx);
+
+	        var line = new graphic.Polyline({
+	            shape: {
+	                points: points
+	            }
+	        });
+
+	        this.add(line);
+
+	        this._updateCommonStl(lineData, idx, seriesScope);
+	    };
+
+	    polylineProto.updateData = function (lineData, idx, seriesScope) {
+	        var seriesModel = lineData.hostModel;
+
+	        var line = this.childAt(0);
+	        var target = {
+	            shape: {
+	                points: lineData.getItemLayout(idx)
+	            }
+	        };
+	        graphic.updateProps(line, target, seriesModel, idx);
+
+	        this._updateCommonStl(lineData, idx, seriesScope);
+	    };
+
+	    polylineProto._updateCommonStl = function (lineData, idx, seriesScope) {
+	        var line = this.childAt(0);
+	        var itemModel = lineData.getItemModel(idx);
+
+	        var visualColor = lineData.getItemVisual(idx, 'color');
+
+	        var lineStyle = seriesScope && seriesScope.lineStyle;
+	        var hoverLineStyle = seriesScope && seriesScope.hoverLineStyle;
+
+	        if (!seriesScope || lineData.hasItemOption) {
+	            lineStyle = itemModel.getModel('lineStyle.normal').getLineStyle();
+	            hoverLineStyle = itemModel.getModel('lineStyle.emphasis').getLineStyle();
+	        }
+	        line.useStyle(zrUtil.defaults(
+	            {
+	                strokeNoScale: true,
+	                fill: 'none',
+	                stroke: visualColor
+	            },
+	            lineStyle
+	        ));
+	        line.hoverStyle = hoverLineStyle;
+
+	        graphic.setHoverStyle(this);
+	    };
+
+	    polylineProto.updateLayout = function (lineData, idx) {
+	        var polyline = this.childAt(0);
+	        polyline.setShape('points', lineData.getItemLayout(idx));
+	    };
+
+	    zrUtil.inherits(Polyline, graphic.Group);
+
+	    module.exports = Polyline;
+
+
+/***/ },
+/* 266 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * Provide effect for line
+	 * @module echarts/chart/helper/EffectLine
+	 */
+
+
+	    var Polyline = __webpack_require__(265);
+	    var zrUtil = __webpack_require__(4);
+	    var EffectLine = __webpack_require__(264);
+	    var vec2 = __webpack_require__(10);
+
+	    /**
+	     * @constructor
+	     * @extends {module:echarts/chart/helper/EffectLine}
+	     * @alias {module:echarts/chart/helper/Polyline}
+	     */
+	    function EffectPolyline(lineData, idx, seriesScope) {
+	        EffectLine.call(this, lineData, idx, seriesScope);
+	        this._lastFrame = 0;
+	        this._lastFramePercent = 0;
+	    }
+
+	    var effectPolylineProto = EffectPolyline.prototype;
+
+	    // Overwrite
+	    effectPolylineProto.createLine = function (lineData, idx, seriesScope) {
+	        return new Polyline(lineData, idx, seriesScope);
+	    };
+
+	    // Overwrite
+	    effectPolylineProto.updateAnimationPoints = function (symbol, points) {
+	        this._points = points;
+	        var accLenArr = [0];
+	        var len = 0;
+	        for (var i = 1; i < points.length; i++) {
+	            var p1 = points[i - 1];
+	            var p2 = points[i];
+	            len += vec2.dist(p1, p2);
+	            accLenArr.push(len);
+	        }
+	        if (len === 0) {
+	            return;
+	        }
+
+	        for (var i = 0; i < accLenArr.length; i++) {
+	            accLenArr[i] /= len;
+	        }
+	        this._offsets = accLenArr;
+	        this._length = len;
+	    };
+
+	    // Overwrite
+	    effectPolylineProto.getLineLength = function (symbol) {
+	        return this._length;
+	    };
+
+	    // Overwrite
+	    effectPolylineProto.updateSymbolPosition = function (symbol) {
+	        var t = symbol.__t;
+	        var points = this._points;
+	        var offsets = this._offsets;
+	        var len = points.length;
+
+	        if (!offsets) {
+	            // Has length 0
+	            return;
+	        }
+
+	        var lastFrame = this._lastFrame;
+	        var frame;
+
+	        if (t < this._lastFramePercent) {
+	            // Start from the next frame
+	            // PENDING start from lastFrame ?
+	            var start = Math.min(lastFrame + 1, len - 1);
+	            for (frame = start; frame >= 0; frame--) {
+	                if (offsets[frame] <= t) {
+	                    break;
+	                }
+	            }
+	            // PENDING really need to do this ?
+	            frame = Math.min(frame, len - 2);
+	        }
+	        else {
+	            for (var frame = lastFrame; frame < len; frame++) {
+	                if (offsets[frame] > t) {
+	                    break;
+	                }
+	            }
+	            frame = Math.min(frame - 1, len - 2);
+	        }
+
+	        vec2.lerp(
+	            symbol.position, points[frame], points[frame + 1],
+	            (t - offsets[frame]) / (offsets[frame + 1] - offsets[frame])
+	        );
+
+	        this._lastFrame = frame;
+	        this._lastFramePercent = t;
+
+	        symbol.ignore = false;
+	    };
+
+	    zrUtil.inherits(EffectPolyline, EffectLine);
+
+	    module.exports = EffectPolyline;
+
+
+/***/ },
+/* 267 */
+/***/ function(module, exports, __webpack_require__) {
+
+	// TODO Batch by color
+
+
+
+	    var graphic = __webpack_require__(43);
+
+	    var quadraticContain = __webpack_require__(55);
+	    var lineContain = __webpack_require__(53);
+
+	    var LargeLineShape = graphic.extendShape({
+	        shape: {
+	            polyline: false,
+
+	            segs: []
+	        },
+
+	        buildPath: function (path, shape) {
+	            var segs = shape.segs;
+	            var isPolyline = shape.polyline;
+
+	            for (var i = 0; i < segs.length; i++) {
+	                var seg = segs[i];
+	                if (isPolyline) {
+	                    path.moveTo(seg[0][0], seg[0][1]);
+	                    for (var j = 1; j < seg.length; j++) {
+	                        path.lineTo(seg[j][0], seg[j][1]);
+	                    }
+	                }
+	                else {
+	                    path.moveTo(seg[0][0], seg[0][1]);
+	                    if (seg.length > 2) {
+	                        path.quadraticCurveTo(seg[2][0], seg[2][1], seg[1][0], seg[1][1]);
+	                    }
+	                    else {
+	                        path.lineTo(seg[1][0], seg[1][1]);
+	                    }
+	                }
+	            }
+	        },
+
+	        findDataIndex: function (x, y) {
+	            var shape = this.shape;
+	            var segs = shape.segs;
+	            var isPolyline = shape.polyline;
+	            var lineWidth = Math.max(this.style.lineWidth, 1);
+
+	            // Not consider transform
+	            for (var i = 0; i < segs.length; i++) {
+	                var seg = segs[i];
+	                if (isPolyline) {
+	                    for (var j = 1; j < seg.length; j++) {
+	                        if (lineContain.containStroke(
+	                            seg[j - 1][0], seg[j - 1][1], seg[j][0], seg[j][1], lineWidth, x, y
+	                        )) {
+	                            return i;
+	                        }
+	                    }
+	                }
+	                else {
+	                    if (seg.length > 2) {
+	                        if (quadraticContain.containStroke(
+	                            seg[0][0], seg[0][1], seg[2][0], seg[2][1], seg[1][0], seg[1][1], lineWidth, x, y
+	                        )) {
+	                            return i;
+	                        }
+	                    }
+	                    else {
+	                        if (lineContain.containStroke(
+	                            seg[0][0], seg[0][1], seg[1][0], seg[1][1], lineWidth, x, y
+	                        )) {
+	                            return i;
+	                        }
+	                    }
+	                }
+	            }
+
+	            return -1;
+	        }
+	    });
+
+	    function LargeLineDraw() {
+	        this.group = new graphic.Group();
+
+	        this._lineEl = new LargeLineShape();
+	    }
+
+	    var largeLineProto = LargeLineDraw.prototype;
+
+	    /**
+	     * Update symbols draw by new data
+	     * @param {module:echarts/data/List} data
+	     */
+	    largeLineProto.updateData = function (data) {
+	        this.group.removeAll();
+
+	        var lineEl = this._lineEl;
+
+	        var seriesModel = data.hostModel;
+
+	        lineEl.setShape({
+	            segs: data.mapArray(data.getItemLayout),
+	            polyline: seriesModel.get('polyline')
+	        });
+
+	        lineEl.useStyle(
+	            seriesModel.getModel('lineStyle.normal').getLineStyle()
+	        );
+
+	        var visualColor = data.getVisual('color');
+	        if (visualColor) {
+	            lineEl.setStyle('stroke', visualColor);
+	        }
+	        lineEl.setStyle('fill');
+
+	        // Enable tooltip
+	        // PENDING May have performance issue when path is extremely large
+	        lineEl.seriesIndex = seriesModel.seriesIndex;
+	        lineEl.on('mousemove', function (e) {
+	            lineEl.dataIndex = null;
+	            var dataIndex = lineEl.findDataIndex(e.offsetX, e.offsetY);
+	            if (dataIndex > 0) {
+	                // Provide dataIndex for tooltip
+	                lineEl.dataIndex = dataIndex;
+	            }
+	        });
+
+	        // Add back
+	        this.group.add(lineEl);
+	    };
+
+	    largeLineProto.updateLayout = function (seriesModel) {
+	        var data = seriesModel.getData();
+	        this._lineEl.setShape({
+	            segs: data.mapArray(data.getItemLayout)
+	        });
+	    };
+
+	    largeLineProto.remove = function () {
+	        this.group.removeAll();
+	    };
+
+	    module.exports = LargeLineDraw;
+
+
+/***/ },
+/* 268 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    module.exports = function (ecModel) {
+	        ecModel.eachSeriesByType('lines', function (seriesModel) {
+	            var coordSys = seriesModel.coordinateSystem;
+	            var lineData = seriesModel.getData();
+
+	            // FIXME Use data dimensions ?
+	            lineData.each(function (idx) {
+	                var itemModel = lineData.getItemModel(idx);
+	                // TODO Support pure array
+	                var coords = (itemModel.option instanceof Array) ?
+	                    itemModel.option : itemModel.get('coords');
+
+	                if (true) {
+	                    if (!(coords instanceof Array && coords.length > 0 && coords[0] instanceof Array)) {
+	                        throw new Error('Invalid coords ' + JSON.stringify(coords) + '. Lines must have 2d coords array in data item.');
+	                    }
+	                }
+	                var pts = [];
+
+	                if (seriesModel.get('polyline')) {
+	                    for (var i = 0; i < coords.length; i++) {
+	                        pts.push(coordSys.dataToPoint(coords[i]));
+	                    }
+	                }
+	                else {
+	                    pts[0] = coordSys.dataToPoint(coords[0]);
+	                    pts[1] = coordSys.dataToPoint(coords[1]);
+
+	                    var curveness = itemModel.get('lineStyle.normal.curveness');
+	                    if (curveness > 0) {
+	                        pts[2] = [
+	                            (pts[0][0] + pts[1][0]) / 2 - (pts[0][1] - pts[1][1]) * curveness,
+	                            (pts[0][1] + pts[1][1]) / 2 - (pts[1][0] - pts[0][0]) * curveness
+	                        ];
+	                    }
+	                }
+	                lineData.setItemLayout(idx, pts);
+	            });
+	        });
+	    };
+
+
+/***/ },
+/* 269 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    __webpack_require__(270);
+	    __webpack_require__(271);
+
+
+/***/ },
+/* 270 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var SeriesModel = __webpack_require__(28);
+	    var createListFromArray = __webpack_require__(101);
+
+	    module.exports = SeriesModel.extend({
+	        type: 'series.heatmap',
+
+	        getInitialData: function (option, ecModel) {
+	            return createListFromArray(option.data, this, ecModel);
+	        },
+
+	        defaultOption: {
+
+	            // Cartesian2D or geo
+	            coordinateSystem: 'cartesian2d',
+
+	            zlevel: 0,
+
+	            z: 2,
+
+	            // Cartesian coordinate system
+	            xAxisIndex: 0,
+	            yAxisIndex: 0,
+
+	            // Geo coordinate system
+	            geoIndex: 0,
+
+	            blurSize: 30,
+
+	            pointSize: 20,
+
+	            maxOpacity: 1,
+
+	            minOpacity: 0
+	        }
+	    });
+
+
+/***/ },
+/* 271 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var graphic = __webpack_require__(43);
+	    var HeatmapLayer = __webpack_require__(272);
+	    var zrUtil = __webpack_require__(4);
+
+	    function getIsInPiecewiseRange(dataExtent, pieceList, selected) {
+	        var dataSpan = dataExtent[1] - dataExtent[0];
+	        pieceList = zrUtil.map(pieceList, function (piece) {
+	            return {
+	                interval: [
+	                    (piece.interval[0] - dataExtent[0]) / dataSpan,
+	                    (piece.interval[1] - dataExtent[0]) / dataSpan
+	                ]
+	            };
+	        });
+	        var len = pieceList.length;
+	        var lastIndex = 0;
+	        return function (val) {
+	            // Try to find in the location of the last found
+	            for (var i = lastIndex; i < len; i++) {
+	                var interval = pieceList[i].interval;
+	                if (interval[0] <= val && val <= interval[1]) {
+	                    lastIndex = i;
+	                    break;
+	                }
+	            }
+	            if (i === len) { // Not found, back interation
+	                for (var i = lastIndex - 1; i >= 0; i--) {
+	                    var interval = pieceList[i].interval;
+	                    if (interval[0] <= val && val <= interval[1]) {
+	                        lastIndex = i;
+	                        break;
+	                    }
+	                }
+	            }
+	            return i >= 0 && i < len && selected[i];
+	        };
+	    }
+
+	    function getIsInContinuousRange(dataExtent, range) {
+	        var dataSpan = dataExtent[1] - dataExtent[0];
+	        range = [
+	            (range[0] - dataExtent[0]) / dataSpan,
+	            (range[1] - dataExtent[0]) / dataSpan
+	        ];
+	        return function (val) {
+	            return val >= range[0] && val <= range[1];
+	        };
+	    }
+
+	    function isGeoCoordSys(coordSys) {
+	        var dimensions = coordSys.dimensions;
+	        // Not use coorSys.type === 'geo' because coordSys maybe extended
+	        return dimensions[0] === 'lng' && dimensions[1] === 'lat';
+	    }
+
+	    module.exports = __webpack_require__(1).extendChartView({
+
+	        type: 'heatmap',
+
+	        render: function (seriesModel, ecModel, api) {
+	            var visualMapOfThisSeries;
+	            ecModel.eachComponent('visualMap', function (visualMap) {
+	                visualMap.eachTargetSeries(function (targetSeries) {
+	                    if (targetSeries === seriesModel) {
+	                        visualMapOfThisSeries = visualMap;
+	                    }
+	                });
+	            });
+
+	            if (true) {
+	                if (!visualMapOfThisSeries) {
+	                    throw new Error('Heatmap must use with visualMap');
+	                }
+	            }
+
+	            this.group.removeAll();
+	            var coordSys = seriesModel.coordinateSystem;
+	            if (coordSys.type === 'cartesian2d') {
+	                this._renderOnCartesian(coordSys, seriesModel, api);
+	            }
+	            else if (isGeoCoordSys(coordSys)) {
+	                this._renderOnGeo(
+	                    coordSys, seriesModel, visualMapOfThisSeries, api
+	                );
+	            }
+	        },
+
+	        _renderOnCartesian: function (cartesian, seriesModel, api) {
+	            var xAxis = cartesian.getAxis('x');
+	            var yAxis = cartesian.getAxis('y');
+	            var group = this.group;
+
+	            if (true) {
+	                if (!(xAxis.type === 'category' && yAxis.type === 'category')) {
+	                    throw new Error('Heatmap on cartesian must have two category axes');
+	                }
+	                if (!(xAxis.onBand && yAxis.onBand)) {
+	                    throw new Error('Heatmap on cartesian must have two axes with boundaryGap true');
+	                }
+	            }
+
+	            var width = xAxis.getBandWidth();
+	            var height = yAxis.getBandWidth();
+
+	            var data = seriesModel.getData();
+
+	            var itemStyleQuery = 'itemStyle.normal';
+	            var hoverItemStyleQuery = 'itemStyle.emphasis';
+	            var labelQuery = 'label.normal';
+	            var hoverLabelQuery = 'label.emphasis';
+	            var style = seriesModel.getModel(itemStyleQuery).getItemStyle(['color']);
+	            var hoverStl = seriesModel.getModel(hoverItemStyleQuery).getItemStyle();
+	            var labelModel = seriesModel.getModel('label.normal');
+	            var hoverLabelModel = seriesModel.getModel('label.emphasis');
+
+	            data.each(['x', 'y', 'z'], function (x, y, z, idx) {
+	                var itemModel = data.getItemModel(idx);
+	                var point = cartesian.dataToPoint([x, y]);
+	                // Ignore empty data
+	                if (isNaN(z)) {
+	                    return;
+	                }
+	                var rect = new graphic.Rect({
+	                    shape: {
+	                        x: point[0] - width / 2,
+	                        y: point[1] - height / 2,
+	                        width: width,
+	                        height: height
+	                    },
+	                    style: {
+	                        fill: data.getItemVisual(idx, 'color'),
+	                        opacity: data.getItemVisual(idx, 'opacity')
+	                    }
+	                });
+	                // Optimization for large datset
+	                if (data.hasItemOption) {
+	                    style = itemModel.getModel(itemStyleQuery).getItemStyle(['color']);
+	                    hoverStl = itemModel.getModel(hoverItemStyleQuery).getItemStyle();
+	                    labelModel = itemModel.getModel(labelQuery);
+	                    hoverLabelModel = itemModel.getModel(hoverLabelQuery);
+	                }
+
+	                var rawValue = seriesModel.getRawValue(idx);
+	                var defaultText = '-';
+	                if (rawValue && rawValue[2] != null) {
+	                    defaultText = rawValue[2];
+	                }
+	                if (labelModel.getShallow('show')) {
+	                    graphic.setText(style, labelModel);
+	                    style.text = seriesModel.getFormattedLabel(idx, 'normal') || defaultText;
+	                }
+	                if (hoverLabelModel.getShallow('show')) {
+	                    graphic.setText(hoverStl, hoverLabelModel);
+	                    hoverStl.text = seriesModel.getFormattedLabel(idx, 'emphasis') || defaultText;
+	                }
+
+	                rect.setStyle(style);
+
+	                graphic.setHoverStyle(rect, data.hasItemOption ? hoverStl : zrUtil.extend({}, hoverStl));
+
+	                group.add(rect);
+	                data.setItemGraphicEl(idx, rect);
+	            });
+	        },
+
+	        _renderOnGeo: function (geo, seriesModel, visualMapModel, api) {
+	            var inRangeVisuals = visualMapModel.targetVisuals.inRange;
+	            var outOfRangeVisuals = visualMapModel.targetVisuals.outOfRange;
+	            // if (!visualMapping) {
+	            //     throw new Error('Data range must have color visuals');
+	            // }
+
+	            var data = seriesModel.getData();
+	            var hmLayer = this._hmLayer || (this._hmLayer || new HeatmapLayer());
+	            hmLayer.blurSize = seriesModel.get('blurSize');
+	            hmLayer.pointSize = seriesModel.get('pointSize');
+	            hmLayer.minOpacity = seriesModel.get('minOpacity');
+	            hmLayer.maxOpacity = seriesModel.get('maxOpacity');
+
+	            var rect = geo.getViewRect().clone();
+	            var roamTransform = geo.getRoamTransform().transform;
+	            rect.applyTransform(roamTransform);
+
+	            // Clamp on viewport
+	            var x = Math.max(rect.x, 0);
+	            var y = Math.max(rect.y, 0);
+	            var x2 = Math.min(rect.width + rect.x, api.getWidth());
+	            var y2 = Math.min(rect.height + rect.y, api.getHeight());
+	            var width = x2 - x;
+	            var height = y2 - y;
+
+	            var points = data.mapArray(['lng', 'lat', 'value'], function (lng, lat, value) {
+	                var pt = geo.dataToPoint([lng, lat]);
+	                pt[0] -= x;
+	                pt[1] -= y;
+	                pt.push(value);
+	                return pt;
+	            });
+
+	            var dataExtent = visualMapModel.getExtent();
+	            var isInRange = visualMapModel.type === 'visualMap.continuous'
+	                ? getIsInContinuousRange(dataExtent, visualMapModel.option.range)
+	                : getIsInPiecewiseRange(
+	                    dataExtent, visualMapModel.getPieceList(), visualMapModel.option.selected
+	                );
+
+	            hmLayer.update(
+	                points, width, height,
+	                inRangeVisuals.color.getNormalizer(),
+	                {
+	                    inRange: inRangeVisuals.color.getColorMapper(),
+	                    outOfRange: outOfRangeVisuals.color.getColorMapper()
+	                },
+	                isInRange
+	            );
+	            var img = new graphic.Image({
+	                style: {
+	                    width: width,
+	                    height: height,
+	                    x: x,
+	                    y: y,
+	                    image: hmLayer.canvas
+	                },
+	                silent: true
+	            });
+	            this.group.add(img);
+	        }
+	    });
+
+
+/***/ },
+/* 272 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @file defines echarts Heatmap Chart
+	 * @author Ovilia (me@zhangwenli.com)
+	 * Inspired by https://github.com/mourner/simpleheat
+	 *
+	 * @module
+	 */
+
+
+	    var GRADIENT_LEVELS = 256;
+	    var zrUtil = __webpack_require__(4);
+
+	    /**
+	     * Heatmap Chart
+	     *
+	     * @class
+	     */
+	    function Heatmap() {
+	        var canvas = zrUtil.createCanvas();
+	        this.canvas = canvas;
+
+	        this.blurSize = 30;
+	        this.pointSize = 20;
+
+	        this.maxOpacity = 1;
+	        this.minOpacity = 0;
+
+	        this._gradientPixels = {};
+	    }
+
+	    Heatmap.prototype = {
+	        /**
+	         * Renders Heatmap and returns the rendered canvas
+	         * @param {Array} data array of data, each has x, y, value
+	         * @param {number} width canvas width
+	         * @param {number} height canvas height
+	         */
+	        update: function(data, width, height, normalize, colorFunc, isInRange) {
+	            var brush = this._getBrush();
+	            var gradientInRange = this._getGradient(data, colorFunc, 'inRange');
+	            var gradientOutOfRange = this._getGradient(data, colorFunc, 'outOfRange');
+	            var r = this.pointSize + this.blurSize;
+
+	            var canvas = this.canvas;
+	            var ctx = canvas.getContext('2d');
+	            var len = data.length;
+	            canvas.width = width;
+	            canvas.height = height;
+	            for (var i = 0; i < len; ++i) {
+	                var p = data[i];
+	                var x = p[0];
+	                var y = p[1];
+	                var value = p[2];
+
+	                // calculate alpha using value
+	                var alpha = normalize(value);
+
+	                // draw with the circle brush with alpha
+	                ctx.globalAlpha = alpha;
+	                ctx.drawImage(brush, x - r, y - r);
+	            }
+
+	            // colorize the canvas using alpha value and set with gradient
+	            var imageData = ctx.getImageData(0, 0, canvas.width, canvas.height);
+	            var pixels = imageData.data;
+	            var offset = 0;
+	            var pixelLen = pixels.length;
+	            var minOpacity = this.minOpacity;
+	            var maxOpacity = this.maxOpacity;
+	            var diffOpacity = maxOpacity - minOpacity;
+
+	            while(offset < pixelLen) {
+	                var alpha = pixels[offset + 3] / 256;
+	                var gradientOffset = Math.floor(alpha * (GRADIENT_LEVELS - 1)) * 4;
+	                // Simple optimize to ignore the empty data
+	                if (alpha > 0) {
+	                    var gradient = isInRange(alpha) ? gradientInRange : gradientOutOfRange;
+	                    // Any alpha > 0 will be mapped to [minOpacity, maxOpacity]
+	                    alpha > 0 && (alpha = alpha * diffOpacity + minOpacity);
+	                    pixels[offset++] = gradient[gradientOffset];
+	                    pixels[offset++] = gradient[gradientOffset + 1];
+	                    pixels[offset++] = gradient[gradientOffset + 2];
+	                    pixels[offset++] = gradient[gradientOffset + 3] * alpha * 256;
+	                }
+	                else {
+	                    offset += 4;
+	                }
+	            }
+	            ctx.putImageData(imageData, 0, 0);
+
+	            return canvas;
+	        },
+
+	        /**
+	         * get canvas of a black circle brush used for canvas to draw later
+	         * @private
+	         * @returns {Object} circle brush canvas
+	         */
+	        _getBrush: function() {
+	            var brushCanvas = this._brushCanvas || (this._brushCanvas = zrUtil.createCanvas());
+	            // set brush size
+	            var r = this.pointSize + this.blurSize;
+	            var d = r * 2;
+	            brushCanvas.width = d;
+	            brushCanvas.height = d;
+
+	            var ctx = brushCanvas.getContext('2d');
+	            ctx.clearRect(0, 0, d, d);
+
+	            // in order to render shadow without the distinct circle,
+	            // draw the distinct circle in an invisible place,
+	            // and use shadowOffset to draw shadow in the center of the canvas
+	            ctx.shadowOffsetX = d;
+	            ctx.shadowBlur = this.blurSize;
+	            // draw the shadow in black, and use alpha and shadow blur to generate
+	            // color in color map
+	            ctx.shadowColor = '#000';
+
+	            // draw circle in the left to the canvas
+	            ctx.beginPath();
+	            ctx.arc(-r, r, this.pointSize, 0, Math.PI * 2, true);
+	            ctx.closePath();
+	            ctx.fill();
+	            return brushCanvas;
+	        },
+
+	        /**
+	         * get gradient color map
+	         * @private
+	         */
+	        _getGradient: function (data, colorFunc, state) {
+	            var gradientPixels = this._gradientPixels;
+	            var pixelsSingleState = gradientPixels[state] || (gradientPixels[state] = new Uint8ClampedArray(256 * 4));
+	            var color = [];
+	            var off = 0;
+	            for (var i = 0; i < 256; i++) {
+	                colorFunc[state](i / 255, true, color);
+	                pixelsSingleState[off++] = color[0];
+	                pixelsSingleState[off++] = color[1];
+	                pixelsSingleState[off++] = color[2];
+	                pixelsSingleState[off++] = color[3];
+	            }
+	            return pixelsSingleState;
+	        }
+	    };
+
+	    module.exports = Heatmap;
+
+
+
+/***/ },
+/* 273 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * Legend component entry file8
+	 */
+
+
+	    __webpack_require__(274);
+	    __webpack_require__(275);
+	    __webpack_require__(276);
+
+	    var echarts = __webpack_require__(1);
+	    // Series Filter
+	    echarts.registerProcessor(__webpack_require__(278));
+
+
+/***/ },
+/* 274 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var Model = __webpack_require__(12);
+
+	    var LegendModel = __webpack_require__(1).extendComponentModel({
+
+	        type: 'legend',
+
+	        dependencies: ['series'],
+
+	        layoutMode: {
+	            type: 'box',
+	            ignoreSize: true
+	        },
+
+	        init: function (option, parentModel, ecModel) {
+	            this.mergeDefaultAndTheme(option, ecModel);
+
+	            option.selected = option.selected || {};
+	        },
+
+	        mergeOption: function (option) {
+	            LegendModel.superCall(this, 'mergeOption', option);
+	        },
+
+	        optionUpdated: function () {
+	            this._updateData(this.ecModel);
+
+	            var legendData = this._data;
+
+	            // If selectedMode is single, try to select one
+	            if (legendData[0] && this.get('selectedMode') === 'single') {
+	                var hasSelected = false;
+	                // If has any selected in option.selected
+	                for (var i = 0; i < legendData.length; i++) {
+	                    var name = legendData[i].get('name');
+	                    if (this.isSelected(name)) {
+	                        // Force to unselect others
+	                        this.select(name);
+	                        hasSelected = true;
+	                        break;
+	                    }
+	                }
+	                // Try select the first if selectedMode is single
+	                !hasSelected && this.select(legendData[0].get('name'));
+	            }
+	        },
+
+	        _updateData: function (ecModel) {
+	            var legendData = zrUtil.map(this.get('data') || [], function (dataItem) {
+	                // Can be string or number
+	                if (typeof dataItem === 'string' || typeof dataItem === 'number') {
+	                    dataItem = {
+	                        name: dataItem
+	                    };
+	                }
+	                return new Model(dataItem, this, this.ecModel);
+	            }, this);
+	            this._data = legendData;
+
+	            var availableNames = zrUtil.map(ecModel.getSeries(), function (series) {
+	                return series.name;
+	            });
+	            ecModel.eachSeries(function (seriesModel) {
+	                if (seriesModel.legendDataProvider) {
+	                    var data = seriesModel.legendDataProvider();
+	                    availableNames = availableNames.concat(data.mapArray(data.getName));
+	                }
+	            });
+	            /**
+	             * @type {Array.<string>}
+	             * @private
+	             */
+	            this._availableNames = availableNames;
+	        },
+
+	        /**
+	         * @return {Array.<module:echarts/model/Model>}
+	         */
+	        getData: function () {
+	            return this._data;
+	        },
+
+	        /**
+	         * @param {string} name
+	         */
+	        select: function (name) {
+	            var selected = this.option.selected;
+	            var selectedMode = this.get('selectedMode');
+	            if (selectedMode === 'single') {
+	                var data = this._data;
+	                zrUtil.each(data, function (dataItem) {
+	                    selected[dataItem.get('name')] = false;
+	                });
+	            }
+	            selected[name] = true;
+	        },
+
+	        /**
+	         * @param {string} name
+	         */
+	        unSelect: function (name) {
+	            if (this.get('selectedMode') !== 'single') {
+	                this.option.selected[name] = false;
+	            }
+	        },
+
+	        /**
+	         * @param {string} name
+	         */
+	        toggleSelected: function (name) {
+	            var selected = this.option.selected;
+	            // Default is true
+	            if (!(name in selected)) {
+	                selected[name] = true;
+	            }
+	            this[selected[name] ? 'unSelect' : 'select'](name);
+	        },
+
+	        /**
+	         * @param {string} name
+	         */
+	        isSelected: function (name) {
+	            var selected = this.option.selected;
+	            return !((name in selected) && !selected[name])
+	                && zrUtil.indexOf(this._availableNames, name) >= 0;
+	        },
+
+	        defaultOption: {
+	            // 一级层叠
+	            zlevel: 0,
+	            // 二级层叠
+	            z: 4,
+	            show: true,
+
+	            // 布局方式，默认为水平布局，可选为：
+	            // 'horizontal' | 'vertical'
+	            orient: 'horizontal',
+
+	            left: 'center',
+	            // right: 'center',
+
+	            top: 'top',
+	            // bottom: 'top',
+
+	            // 水平对齐
+	            // 'auto' | 'left' | 'right'
+	            // 默认为 'auto', 根据 x 的位置判断是左对齐还是右对齐
+	            align: 'auto',
+
+	            backgroundColor: 'rgba(0,0,0,0)',
+	            // 图例边框颜色
+	            borderColor: '#ccc',
+	            // 图例边框线宽，单位px，默认为0（无边框）
+	            borderWidth: 0,
+	            // 图例内边距，单位px，默认各方向内边距为5，
+	            // 接受数组分别设定上右下左边距，同css
+	            padding: 5,
+	            // 各个item之间的间隔，单位px，默认为10，
+	            // 横向布局时为水平间隔，纵向布局时为纵向间隔
+	            itemGap: 10,
+	            // 图例图形宽度
+	            itemWidth: 25,
+	            // 图例图形高度
+	            itemHeight: 14,
+
+	            // 图例关闭时候的颜色
+	            inactiveColor: '#ccc',
+
+	            textStyle: {
+	                // 图例文字颜色
+	                color: '#333'
+	            },
+	            // formatter: '',
+	            // 选择模式，默认开启图例开关
+	            selectedMode: true,
+	            // 配置默认选中状态，可配合LEGEND.SELECTED事件做动态数据载入
+	            // selected: null,
+	            // 图例内容（详见legend.data，数组中每一项代表一个item
+	            // data: [],
+
+	            // Tooltip 相关配置
+	            tooltip: {
+	                show: false
+	            }
+	        }
+	    });
+
+	    module.exports = LegendModel;
+
+
+/***/ },
+/* 275 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @file Legend action
+	 */
+
+
+	    var echarts = __webpack_require__(1);
+	    var zrUtil = __webpack_require__(4);
+
+	    function legendSelectActionHandler(methodName, payload, ecModel) {
+	        var selectedMap = {};
+	        var isToggleSelect = methodName === 'toggleSelected';
+	        var isSelected;
+	        // Update all legend components
+	        ecModel.eachComponent('legend', function (legendModel) {
+	            if (isToggleSelect && isSelected != null) {
+	                // Force other legend has same selected status
+	                // Or the first is toggled to true and other are toggled to false
+	                // In the case one legend has some item unSelected in option. And if other legend
+	                // doesn't has the item, they will assume it is selected.
+	                legendModel[isSelected ? 'select' : 'unSelect'](payload.name);
+	            }
+	            else {
+	                legendModel[methodName](payload.name);
+	                isSelected = legendModel.isSelected(payload.name);
+	            }
+	            var legendData = legendModel.getData();
+	            zrUtil.each(legendData, function (model) {
+	                var name = model.get('name');
+	                // Wrap element
+	                if (name === '\n' || name === '') {
+	                    return;
+	                }
+	                var isItemSelected = legendModel.isSelected(name);
+	                if (name in selectedMap) {
+	                    // Unselected if any legend is unselected
+	                    selectedMap[name] = selectedMap[name] && isItemSelected;
+	                }
+	                else {
+	                    selectedMap[name] = isItemSelected;
+	                }
+	            });
+	        });
+	        // Return the event explicitly
+	        return {
+	            name: payload.name,
+	            selected: selectedMap
+	        };
+	    }
+	    /**
+	     * @event legendToggleSelect
+	     * @type {Object}
+	     * @property {string} type 'legendToggleSelect'
+	     * @property {string} [from]
+	     * @property {string} name Series name or data item name
+	     */
+	    echarts.registerAction(
+	        'legendToggleSelect', 'legendselectchanged',
+	        zrUtil.curry(legendSelectActionHandler, 'toggleSelected')
+	    );
+
+	    /**
+	     * @event legendSelect
+	     * @type {Object}
+	     * @property {string} type 'legendSelect'
+	     * @property {string} name Series name or data item name
+	     */
+	    echarts.registerAction(
+	        'legendSelect', 'legendselected',
+	        zrUtil.curry(legendSelectActionHandler, 'select')
+	    );
+
+	    /**
+	     * @event legendUnSelect
+	     * @type {Object}
+	     * @property {string} type 'legendUnSelect'
+	     * @property {string} name Series name or data item name
+	     */
+	    echarts.registerAction(
+	        'legendUnSelect', 'legendunselected',
+	        zrUtil.curry(legendSelectActionHandler, 'unSelect')
+	    );
+
+
+/***/ },
+/* 276 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+	    var symbolCreator = __webpack_require__(106);
+	    var graphic = __webpack_require__(43);
+	    var listComponentHelper = __webpack_require__(277);
+
+	    var curry = zrUtil.curry;
+
+	    function dispatchSelectAction(name, api) {
+	        api.dispatchAction({
+	            type: 'legendToggleSelect',
+	            name: name
+	        });
+	    }
+
+	    function dispatchHighlightAction(seriesModel, dataName, api) {
+	        // If element hover will move to a hoverLayer.
+	        var el = api.getZr().storage.getDisplayList()[0];
+	        if (!(el && el.useHoverLayer)) {
+	            seriesModel.get('legendHoverLink') && api.dispatchAction({
+	                type: 'highlight',
+	                seriesName: seriesModel.name,
+	                name: dataName
+	            });
+	        }
+	    }
+
+	    function dispatchDownplayAction(seriesModel, dataName, api) {
+	        // If element hover will move to a hoverLayer.
+	        var el = api.getZr().storage.getDisplayList()[0];
+	        if (!(el && el.useHoverLayer)) {
+	            seriesModel.get('legendHoverLink') && api.dispatchAction({
+	                type: 'downplay',
+	                seriesName: seriesModel.name,
+	                name: dataName
+	            });
+	        }
+	    }
+
+	    module.exports = __webpack_require__(1).extendComponentView({
+
+	        type: 'legend',
+
+	        init: function () {
+	            this._symbolTypeStore = {};
+	        },
+
+	        render: function (legendModel, ecModel, api) {
+	            var group = this.group;
+	            group.removeAll();
+
+	            if (!legendModel.get('show')) {
+	                return;
+	            }
+
+	            var selectMode = legendModel.get('selectedMode');
+	            var itemAlign = legendModel.get('align');
+
+	            if (itemAlign === 'auto') {
+	                itemAlign = (legendModel.get('left') === 'right'
+	                    && legendModel.get('orient') === 'vertical')
+	                    ? 'right' : 'left';
+	            }
+
+	            var legendDrawedMap = {};
+
+	            zrUtil.each(legendModel.getData(), function (itemModel) {
+	                var name = itemModel.get('name');
+
+	                // Use empty string or \n as a newline string
+	                if (name === '' || name === '\n') {
+	                    group.add(new graphic.Group({
+	                        newline: true
+	                    }));
+	                    return;
+	                }
+
+	                var seriesModel = ecModel.getSeriesByName(name)[0];
+
+	                if (legendDrawedMap[name]) {
+	                    // Have been drawed
+	                    return;
+	                }
+
+	                // Series legend
+	                if (seriesModel) {
+	                    var data = seriesModel.getData();
+	                    var color = data.getVisual('color');
+
+	                    // If color is a callback function
+	                    if (typeof color === 'function') {
+	                        // Use the first data
+	                        color = color(seriesModel.getDataParams(0));
+	                    }
+
+	                    // Using rect symbol defaultly
+	                    var legendSymbolType = data.getVisual('legendSymbol') || 'roundRect';
+	                    var symbolType = data.getVisual('symbol');
+
+	                    var itemGroup = this._createItem(
+	                        name, itemModel, legendModel,
+	                        legendSymbolType, symbolType,
+	                        itemAlign, color,
+	                        selectMode
+	                    );
+
+	                    itemGroup.on('click', curry(dispatchSelectAction, name, api))
+	                        .on('mouseover', curry(dispatchHighlightAction, seriesModel, '', api))
+	                        .on('mouseout', curry(dispatchDownplayAction, seriesModel, '', api));
+
+	                    legendDrawedMap[name] = true;
+	                }
+	                else {
+	                    // Data legend of pie, funnel
+	                    ecModel.eachRawSeries(function (seriesModel) {
+	                        // In case multiple series has same data name
+	                        if (legendDrawedMap[name]) {
+	                            return;
+	                        }
+	                        if (seriesModel.legendDataProvider) {
+	                            var data = seriesModel.legendDataProvider();
+	                            var idx = data.indexOfName(name);
+	                            if (idx < 0) {
+	                                return;
+	                            }
+
+	                            var color = data.getItemVisual(idx, 'color');
+
+	                            var legendSymbolType = 'roundRect';
+
+	                            var itemGroup = this._createItem(
+	                                name, itemModel, legendModel,
+	                                legendSymbolType, null,
+	                                itemAlign, color,
+	                                selectMode
+	                            );
+
+	                            itemGroup.on('click', curry(dispatchSelectAction, name, api))
+	                                // FIXME Should not specify the series name
+	                                .on('mouseover', curry(dispatchHighlightAction, seriesModel, name, api))
+	                                .on('mouseout', curry(dispatchDownplayAction, seriesModel, name, api));
+
+	                            legendDrawedMap[name] = true;
+	                        }
+	                    }, this);
+	                }
+
+	                if (true) {
+	                    if (!legendDrawedMap[name]) {
+	                        console.warn(name + ' series not exists. Legend data should be same with series name or data name.');
+	                    }
+	                }
+	            }, this);
+
+	            listComponentHelper.layout(group, legendModel, api);
+	            // Render background after group is layout
+	            // FIXME
+	            listComponentHelper.addBackground(group, legendModel);
+	        },
+
+	        _createItem: function (
+	            name, itemModel, legendModel,
+	            legendSymbolType, symbolType,
+	            itemAlign, color, selectMode
+	        ) {
+	            var itemWidth = legendModel.get('itemWidth');
+	            var itemHeight = legendModel.get('itemHeight');
+	            var inactiveColor = legendModel.get('inactiveColor');
+
+	            var isSelected = legendModel.isSelected(name);
+	            var itemGroup = new graphic.Group();
+
+	            var textStyleModel = itemModel.getModel('textStyle');
+
+	            var itemIcon = itemModel.get('icon');
+
+	            var tooltipModel = itemModel.getModel('tooltip');
+
+	            // Use user given icon first
+	            legendSymbolType = itemIcon || legendSymbolType;
+	            itemGroup.add(symbolCreator.createSymbol(
+	                legendSymbolType, 0, 0, itemWidth, itemHeight, isSelected ? color : inactiveColor
+	            ));
+
+	            // Compose symbols
+	            // PENDING
+	            if (!itemIcon && symbolType
+	                // At least show one symbol, can't be all none
+	                && ((symbolType !== legendSymbolType) || symbolType == 'none')
+	            ) {
+	                var size = itemHeight * 0.8;
+	                if (symbolType === 'none') {
+	                    symbolType = 'circle';
+	                }
+	                // Put symbol in the center
+	                itemGroup.add(symbolCreator.createSymbol(
+	                    symbolType, (itemWidth - size) / 2, (itemHeight - size) / 2, size, size,
+	                    isSelected ? color : inactiveColor
+	                ));
+	            }
+
+	            // Text
+	            var textX = itemAlign === 'left' ? itemWidth + 5 : -5;
+	            var textAlign = itemAlign;
+
+	            var formatter = legendModel.get('formatter');
+	            var content = name;
+	            if (typeof formatter === 'string' && formatter) {
+	                content = formatter.replace('{name}', name);
+	            }
+	            else if (typeof formatter === 'function') {
+	                content = formatter(name);
+	            }
+
+	            var text = new graphic.Text({
+	                style: {
+	                    text: content,
+	                    x: textX,
+	                    y: itemHeight / 2,
+	                    fill: isSelected ? textStyleModel.getTextColor() : inactiveColor,
+	                    textFont: textStyleModel.getFont(),
+	                    textAlign: textAlign,
+	                    textVerticalAlign: 'middle'
+	                }
+	            });
+	            itemGroup.add(text);
+
+	            // Add a invisible rect to increase the area of mouse hover
+	            var hitRect = new graphic.Rect({
+	                shape: itemGroup.getBoundingRect(),
+	                invisible: true,
+	                tooltip: tooltipModel.get('show') ? zrUtil.extend({
+	                    content: name,
+	                    // Defaul formatter
+	                    formatter: function () {
+	                        return name;
+	                    },
+	                    formatterParams: {
+	                        componentType: 'legend',
+	                        legendIndex: legendModel.componentIndex,
+	                        name: name,
+	                        $vars: ['name']
+	                    }
+	                }, tooltipModel.option) : null
+	            });
+	            itemGroup.add(hitRect);
+
+	            itemGroup.eachChild(function (child) {
+	                child.silent = true;
+	            });
+
+	            hitRect.silent = !selectMode;
+
+
+
+	            this.group.add(itemGroup);
+
+	            graphic.setHoverStyle(itemGroup);
+
+	            return itemGroup;
+	        }
+	    });
+
+
+/***/ },
+/* 277 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+	    // List layout
+	    var layout = __webpack_require__(21);
+	    var formatUtil = __webpack_require__(6);
+	    var graphic = __webpack_require__(43);
+
+	    function positionGroup(group, model, api) {
+	        layout.positionGroup(
+	            group, model.getBoxLayoutParams(),
+	            {
+	                width: api.getWidth(),
+	                height: api.getHeight()
+	            },
+	            model.get('padding')
+	        );
+	    }
+
+	    module.exports = {
+	        /**
+	         * Layout list like component.
+	         * It will box layout each items in group of component and then position the whole group in the viewport
+	         * @param {module:zrender/group/Group} group
+	         * @param {module:echarts/model/Component} componentModel
+	         * @param {module:echarts/ExtensionAPI}
+	         */
+	        layout: function (group, componentModel, api) {
+	            var rect = layout.getLayoutRect(componentModel.getBoxLayoutParams(), {
+	                width: api.getWidth(),
+	                height: api.getHeight()
+	            }, componentModel.get('padding'));
+	            layout.box(
+	                componentModel.get('orient'),
+	                group,
+	                componentModel.get('itemGap'),
+	                rect.width,
+	                rect.height
+	            );
+
+	            positionGroup(group, componentModel, api);
+	        },
+
+	        addBackground: function (group, componentModel) {
+	            var padding = formatUtil.normalizeCssArray(
+	                componentModel.get('padding')
+	            );
+	            var boundingRect = group.getBoundingRect();
+	            var style = componentModel.getItemStyle(['color', 'opacity']);
+	            style.fill = componentModel.get('backgroundColor');
+	            var rect = new graphic.Rect({
+	                shape: {
+	                    x: boundingRect.x - padding[3],
+	                    y: boundingRect.y - padding[0],
+	                    width: boundingRect.width + padding[1] + padding[3],
+	                    height: boundingRect.height + padding[0] + padding[2]
+	                },
+	                style: style,
+	                silent: true,
+	                z2: -1
+	            });
+	            graphic.subPixelOptimizeRect(rect);
+
+	            group.add(rect);
+	        }
+	    };
+
+
+/***/ },
+/* 278 */
+/***/ function(module, exports) {
+
+	
+	   module.exports = function (ecModel) {
+	        var legendModels = ecModel.findComponents({
+	            mainType: 'legend'
+	        });
+	        if (legendModels && legendModels.length) {
+	            ecModel.filterSeries(function (series) {
+	                // If in any legend component the status is not selected.
+	                // Because in legend series is assumed selected when it is not in the legend data.
+	                for (var i = 0; i < legendModels.length; i++) {
+	                    if (!legendModels[i].isSelected(series.name)) {
+	                        return false;
+	                    }
+	                }
+	                return true;
+	            });
+	        }
+	    };
+
+
+/***/ },
+/* 279 */
+/***/ function(module, exports, __webpack_require__) {
+
+	// FIXME Better way to pack data in graphic element
+
+
+	    __webpack_require__(280);
+
+	    __webpack_require__(281);
+
+	    // Show tip action
+	    /**
+	     * @action
+	     * @property {string} type
+	     * @property {number} seriesIndex
+	     * @property {number} dataIndex
+	     * @property {number} [x]
+	     * @property {number} [y]
+	     */
+	    __webpack_require__(1).registerAction(
+	        {
+	            type: 'showTip',
+	            event: 'showTip',
+	            update: 'none'
+	        },
+	        // noop
+	        function () {}
+	    );
+	    // Hide tip action
+	    __webpack_require__(1).registerAction(
+	        {
+	            type: 'hideTip',
+	            event: 'hideTip',
+	            update: 'none'
+	        },
+	        // noop
+	        function () {}
+	    );
+
+
+/***/ },
+/* 280 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    __webpack_require__(1).extendComponentModel({
+
+	        type: 'tooltip',
+
+	        defaultOption: {
+	            zlevel: 0,
+
+	            z: 8,
+
+	            show: true,
+
+	            // tooltip主体内容
+	            showContent: true,
+
+	            // 触发类型，默认数据触发，见下图，可选为：'item' ¦ 'axis'
+	            trigger: 'item',
+
+	            // 触发条件，支持 'click' | 'mousemove'
+	            triggerOn: 'mousemove',
+
+	            // 是否永远显示 content
+	            alwaysShowContent: false,
+
+	            // 位置 {Array} | {Function}
+	            // position: null
+
+	            // 内容格式器：{string}（Template） ¦ {Function}
+	            // formatter: null
+
+	            showDelay: 0,
+
+	            // 隐藏延迟，单位ms
+	            hideDelay: 100,
+
+	            // 动画变换时间，单位s
+	            transitionDuration: 0.4,
+
+	            enterable: false,
+
+	            // 提示背景颜色，默认为透明度为0.7的黑色
+	            backgroundColor: 'rgba(50,50,50,0.7)',
+
+	            // 提示边框颜色
+	            borderColor: '#333',
+
+	            // 提示边框圆角，单位px，默认为4
+	            borderRadius: 4,
+
+	            // 提示边框线宽，单位px，默认为0（无边框）
+	            borderWidth: 0,
+
+	            // 提示内边距，单位px，默认各方向内边距为5，
+	            // 接受数组分别设定上右下左边距，同css
+	            padding: 5,
+
+	            // Extra css text
+	            extraCssText: '',
+
+	            // 坐标轴指示器，坐标轴触发有效
+	            axisPointer: {
+	                // 默认为直线
+	                // 可选为：'line' | 'shadow' | 'cross'
+	                type: 'line',
+
+	                // type 为 line 的时候有效，指定 tooltip line 所在的轴，可选
+	                // 可选 'x' | 'y' | 'angle' | 'radius' | 'auto'
+	                // 默认 'auto'，会选择类型为 cateogry 的轴，对于双数值轴，笛卡尔坐标系会默认选择 x 轴
+	                // 极坐标系会默认选择 angle 轴
+	                axis: 'auto',
+
+	                animation: true,
+	                animationDurationUpdate: 200,
+	                animationEasingUpdate: 'exponentialOut',
+
+	                // 直线指示器样式设置
+	                lineStyle: {
+	                    color: '#555',
+	                    width: 1,
+	                    type: 'solid'
+	                },
+
+	                crossStyle: {
+	                    color: '#555',
+	                    width: 1,
+	                    type: 'dashed',
+
+	                    // TODO formatter
+	                    textStyle: {}
+	                },
+
+	                // 阴影指示器样式设置
+	                shadowStyle: {
+	                    color: 'rgba(150,150,150,0.3)'
+	                }
+	            },
+	            textStyle: {
+	                color: '#fff',
+	                fontSize: 14
+	            }
+	        }
+	    });
+
+
+/***/ },
+/* 281 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var TooltipContent = __webpack_require__(282);
+	    var graphic = __webpack_require__(43);
+	    var zrUtil = __webpack_require__(4);
+	    var formatUtil = __webpack_require__(6);
+	    var numberUtil = __webpack_require__(7);
+	    var parsePercent = numberUtil.parsePercent;
+	    var env = __webpack_require__(2);
+	    var Model = __webpack_require__(12);
+
+	    function dataEqual(a, b) {
+	        if (!a || !b) {
+	            return false;
+	        }
+	        var round = numberUtil.round;
+	        return round(a[0]) === round(b[0])
+	            && round(a[1]) === round(b[1]);
+	    }
+	    /**
+	     * @inner
+	     */
+	    function makeLineShape(x1, y1, x2, y2) {
+	        return {
+	            x1: x1,
+	            y1: y1,
+	            x2: x2,
+	            y2: y2
+	        };
+	    }
+
+	    /**
+	     * @inner
+	     */
+	    function makeRectShape(x, y, width, height) {
+	        return {
+	            x: x,
+	            y: y,
+	            width: width,
+	            height: height
+	        };
+	    }
+
+	    /**
+	     * @inner
+	     */
+	    function makeSectorShape(cx, cy, r0, r, startAngle, endAngle) {
+	        return {
+	            cx: cx,
+	            cy: cy,
+	            r0: r0,
+	            r: r,
+	            startAngle: startAngle,
+	            endAngle: endAngle,
+	            clockwise: true
+	        };
+	    }
+
+	    function refixTooltipPosition(x, y, el, viewWidth, viewHeight) {
+	        var width = el.clientWidth;
+	        var height = el.clientHeight;
+	        var gap = 20;
+
+	        if (x + width + gap > viewWidth) {
+	            x -= width + gap;
+	        }
+	        else {
+	            x += gap;
+	        }
+	        if (y + height + gap > viewHeight) {
+	            y -= height + gap;
+	        }
+	        else {
+	            y += gap;
+	        }
+	        return [x, y];
+	    }
+
+	    function calcTooltipPosition(position, rect, dom) {
+	        var domWidth = dom.clientWidth;
+	        var domHeight = dom.clientHeight;
+	        var gap = 5;
+	        var x = 0;
+	        var y = 0;
+	        var rectWidth = rect.width;
+	        var rectHeight = rect.height;
+	        switch (position) {
+	            case 'inside':
+	                x = rect.x + rectWidth / 2 - domWidth / 2;
+	                y = rect.y + rectHeight / 2 - domHeight / 2;
+	                break;
+	            case 'top':
+	                x = rect.x + rectWidth / 2 - domWidth / 2;
+	                y = rect.y - domHeight - gap;
+	                break;
+	            case 'bottom':
+	                x = rect.x + rectWidth / 2 - domWidth / 2;
+	                y = rect.y + rectHeight + gap;
+	                break;
+	            case 'left':
+	                x = rect.x - domWidth - gap;
+	                y = rect.y + rectHeight / 2 - domHeight / 2;
+	                break;
+	            case 'right':
+	                x = rect.x + rectWidth + gap;
+	                y = rect.y + rectHeight / 2 - domHeight / 2;
+	        }
+	        return [x, y];
+	    }
+
+	    /**
+	     * @param  {string|Function|Array.<number>} positionExpr
+	     * @param  {number} x Mouse x
+	     * @param  {number} y Mouse y
+	     * @param  {module:echarts/component/tooltip/TooltipContent} content
+	     * @param  {Object|<Array.<Object>} params
+	     * @param  {module:zrender/Element} el target element
+	     * @param  {module:echarts/ExtensionAPI} api
+	     * @return {Array.<number>}
+	     */
+	    function updatePosition(positionExpr, x, y, content, params, el, api) {
+	        var viewWidth = api.getWidth();
+	        var viewHeight = api.getHeight();
+
+	        var rect = el && el.getBoundingRect().clone();
+	        el && rect.applyTransform(el.transform);
+	        if (typeof positionExpr === 'function') {
+	            // Callback of position can be an array or a string specify the position
+	            positionExpr = positionExpr([x, y], params, content.el, rect);
+	        }
+
+	        if (zrUtil.isArray(positionExpr)) {
+	            x = parsePercent(positionExpr[0], viewWidth);
+	            y = parsePercent(positionExpr[1], viewHeight);
+	        }
+	        // Specify tooltip position by string 'top' 'bottom' 'left' 'right' around graphic element
+	        else if (typeof positionExpr === 'string' && el) {
+	            var pos = calcTooltipPosition(
+	                positionExpr, rect, content.el
+	            );
+	            x = pos[0];
+	            y = pos[1];
+	        }
+	        else {
+	            var pos = refixTooltipPosition(
+	                x, y, content.el, viewWidth, viewHeight
+	            );
+	            x = pos[0];
+	            y = pos[1];
+	        }
+
+	        content.moveTo(x, y);
+	    }
+
+	    function ifSeriesSupportAxisTrigger(seriesModel) {
+	        var coordSys = seriesModel.coordinateSystem;
+	        var trigger = seriesModel.get('tooltip.trigger', true);
+	        // Ignore series use item tooltip trigger and series coordinate system is not cartesian or
+	        return !(!coordSys
+	            || (coordSys.type !== 'cartesian2d' && coordSys.type !== 'polar' && coordSys.type !== 'singleAxis')
+	            || trigger === 'item');
+	    }
+
+	    __webpack_require__(1).extendComponentView({
+
+	        type: 'tooltip',
+
+	        _axisPointers: {},
+
+	        init: function (ecModel, api) {
+	            if (env.node) {
+	                return;
+	            }
+	            var tooltipContent = new TooltipContent(api.getDom(), api);
+	            this._tooltipContent = tooltipContent;
+
+	            api.on('showTip', this._manuallyShowTip, this);
+	            api.on('hideTip', this._manuallyHideTip, this);
+	        },
+
+	        render: function (tooltipModel, ecModel, api) {
+	            if (env.node) {
+	                return;
+	            }
+
+	            // Reset
+	            this.group.removeAll();
+
+	            /**
+	             * @type {Object}
+	             * @private
+	             */
+	            this._axisPointers = {};
+
+	            /**
+	             * @private
+	             * @type {module:echarts/component/tooltip/TooltipModel}
+	             */
+	            this._tooltipModel = tooltipModel;
+
+	            /**
+	             * @private
+	             * @type {module:echarts/model/Global}
+	             */
+	            this._ecModel = ecModel;
+
+	            /**
+	             * @private
+	             * @type {module:echarts/ExtensionAPI}
+	             */
+	            this._api = api;
+
+	            /**
+	             * @type {Object}
+	             * @private
+	             */
+	            this._lastHover = {
+	                // data
+	                // payloadBatch
+	            };
+
+	            var tooltipContent = this._tooltipContent;
+	            tooltipContent.update();
+	            tooltipContent.enterable = tooltipModel.get('enterable');
+	            this._alwaysShowContent = tooltipModel.get('alwaysShowContent');
+
+	            /**
+	             * @type {Object.<string, Array>}
+	             */
+	            this._seriesGroupByAxis = this._prepareAxisTriggerData(
+	                tooltipModel, ecModel
+	            );
+
+	            var crossText = this._crossText;
+	            if (crossText) {
+	                this.group.add(crossText);
+	            }
+
+	            // Try to keep the tooltip show when refreshing
+	            if (this._lastX != null && this._lastY != null) {
+	                var self = this;
+	                clearTimeout(this._refreshUpdateTimeout);
+	                this._refreshUpdateTimeout = setTimeout(function () {
+	                    // Show tip next tick after other charts are rendered
+	                    // In case highlight action has wrong result
+	                    // FIXME
+	                    self._manuallyShowTip({
+	                        x: self._lastX,
+	                        y: self._lastY
+	                    });
+	                });
+	            }
+
+	            var zr = this._api.getZr();
+	            zr.off('click', this._tryShow);
+	            zr.off('mousemove', this._mousemove);
+	            zr.off('mouseout', this._hide);
+	            zr.off('globalout', this._hide);
+	            if (tooltipModel.get('triggerOn') === 'click') {
+	                zr.on('click', this._tryShow, this);
+	            }
+	            else {
+	                zr.on('mousemove', this._mousemove, this);
+	                zr.on('mouseout', this._hide, this);
+	                zr.on('globalout', this._hide, this);
+	            }
+	        },
+
+	        _mousemove: function (e) {
+	            var showDelay = this._tooltipModel.get('showDelay');
+	            var self = this;
+	            clearTimeout(this._showTimeout);
+	            if (showDelay > 0) {
+	                this._showTimeout = setTimeout(function () {
+	                    self._tryShow(e);
+	                }, showDelay);
+	            }
+	            else {
+	                this._tryShow(e);
+	            }
+	        },
+
+	        /**
+	         * Show tip manually by
+	         *  dispatchAction({
+	         *      type: 'showTip',
+	         *      x: 10,
+	         *      y: 10
+	         *  });
+	         * Or
+	         *  dispatchAction({
+	         *      type: 'showTip',
+	         *      seriesIndex: 0,
+	         *      dataIndex: 1
+	         *  });
+	         *
+	         *  TODO Batch
+	         */
+	        _manuallyShowTip: function (event) {
+	            // From self
+	            if (event.from === this.uid) {
+	                return;
+	            }
+
+	            var ecModel = this._ecModel;
+	            var seriesIndex = event.seriesIndex;
+	            var dataIndex = event.dataIndex;
+	            var seriesModel = ecModel.getSeriesByIndex(seriesIndex);
+	            var api = this._api;
+
+	            if (event.x == null || event.y == null) {
+	                if (!seriesModel) {
+	                    // Find the first series can use axis trigger
+	                    ecModel.eachSeries(function (_series) {
+	                        if (ifSeriesSupportAxisTrigger(_series) && !seriesModel) {
+	                            seriesModel = _series;
+	                        }
+	                    });
+	                }
+	                if (seriesModel) {
+	                    var data = seriesModel.getData();
+	                    if (dataIndex == null) {
+	                        dataIndex = data.indexOfName(event.name);
+	                    }
+	                    var el = data.getItemGraphicEl(dataIndex);
+	                    var cx, cy;
+	                    // Try to get the point in coordinate system
+	                    var coordSys = seriesModel.coordinateSystem;
+	                    if (coordSys && coordSys.dataToPoint) {
+	                        var point = coordSys.dataToPoint(
+	                            data.getValues(
+	                                zrUtil.map(coordSys.dimensions, function (dim) {
+	                                    return seriesModel.coordDimToDataDim(dim)[0];
+	                                }), dataIndex, true
+	                            )
+	                        );
+	                        cx = point && point[0];
+	                        cy = point && point[1];
+	                    }
+	                    else if (el) {
+	                        // Use graphic bounding rect
+	                        var rect = el.getBoundingRect().clone();
+	                        rect.applyTransform(el.transform);
+	                        cx = rect.x + rect.width / 2;
+	                        cy = rect.y + rect.height / 2;
+	                    }
+	                    if (cx != null && cy != null) {
+	                        this._tryShow({
+	                            offsetX: cx,
+	                            offsetY: cy,
+	                            target: el,
+	                            event: {}
+	                        });
+	                    }
+	                }
+	            }
+	            else {
+	                var el = api.getZr().handler.findHover(event.x, event.y);
+	                this._tryShow({
+	                    offsetX: event.x,
+	                    offsetY: event.y,
+	                    target: el,
+	                    event: {}
+	                });
+	            }
+	        },
+
+	        _manuallyHideTip: function (e) {
+	            if (e.from === this.uid) {
+	                return;
+	            }
+
+	            this._hide();
+	        },
+
+	        _prepareAxisTriggerData: function (tooltipModel, ecModel) {
+	            // Prepare data for axis trigger
+	            var seriesGroupByAxis = {};
+	            ecModel.eachSeries(function (seriesModel) {
+	                if (ifSeriesSupportAxisTrigger(seriesModel)) {
+	                    var coordSys = seriesModel.coordinateSystem;
+	                    var baseAxis;
+	                    var key;
+
+	                    // Only cartesian2d, polar and single support axis trigger
+	                    if (coordSys.type === 'cartesian2d') {
+	                        // FIXME `axisPointer.axis` is not baseAxis
+	                        baseAxis = coordSys.getBaseAxis();
+	                        key = baseAxis.dim + baseAxis.index;
+	                    }
+	                    else if (coordSys.type === 'singleAxis') {
+	                        baseAxis = coordSys.getAxis();
+	                        key = baseAxis.dim + baseAxis.type;
+	                    }
+	                    else {
+	                        baseAxis = coordSys.getBaseAxis();
+	                        key = baseAxis.dim + coordSys.name;
+	                    }
+
+	                    seriesGroupByAxis[key] = seriesGroupByAxis[key] || {
+	                        coordSys: [],
+	                        series: []
+	                    };
+	                    seriesGroupByAxis[key].coordSys.push(coordSys);
+	                    seriesGroupByAxis[key].series.push(seriesModel);
+	                }
+	            }, this);
+
+	            return seriesGroupByAxis;
+	        },
+
+	        /**
+	         * mousemove handler
+	         * @param {Object} e
+	         * @private
+	         */
+	        _tryShow: function (e) {
+	            var el = e.target;
+	            var tooltipModel = this._tooltipModel;
+	            var globalTrigger = tooltipModel.get('trigger');
+	            var ecModel = this._ecModel;
+	            var api = this._api;
+
+	            if (!tooltipModel) {
+	                return;
+	            }
+
+	            // Save mouse x, mouse y. So we can try to keep showing the tip if chart is refreshed
+	            this._lastX = e.offsetX;
+	            this._lastY = e.offsetY;
+
+	            // Always show item tooltip if mouse is on the element with dataIndex
+	            if (el && el.dataIndex != null) {
+	                // Use dataModel in element if possible
+	                // Used when mouseover on a element like markPoint or edge
+	                // In which case, the data is not main data in series.
+	                var dataModel = el.dataModel || ecModel.getSeriesByIndex(el.seriesIndex);
+	                var dataIndex = el.dataIndex;
+	                var itemModel = dataModel.getData().getItemModel(dataIndex);
+	                // Series or single data may use item trigger when global is axis trigger
+	                if ((itemModel.get('tooltip.trigger') || globalTrigger) === 'axis') {
+	                    this._showAxisTooltip(tooltipModel, ecModel, e);
+	                }
+	                else {
+	                    // Reset ticket
+	                    this._ticket = '';
+	                    // If either single data or series use item trigger
+	                    this._hideAxisPointer();
+	                    // Reset last hover and dispatch downplay action
+	                    this._resetLastHover();
+
+	                    this._showItemTooltipContent(dataModel, dataIndex, el.dataType, e);
+	                }
+
+	                api.dispatchAction({
+	                    type: 'showTip',
+	                    from: this.uid,
+	                    dataIndex: el.dataIndex,
+	                    seriesIndex: el.seriesIndex
+	                });
+	            }
+	            // Tooltip provided directly. Like legend
+	            else if (el && el.tooltip) {
+	                var tooltipOpt = el.tooltip;
+	                if (typeof tooltipOpt === 'string') {
+	                    var content = tooltipOpt;
+	                    tooltipOpt = {
+	                        content: content,
+	                        // Fixed formatter
+	                        formatter: content
+	                    };
+	                }
+	                var subTooltipModel = new Model(tooltipOpt, tooltipModel);
+	                var defaultHtml = subTooltipModel.get('content');
+	                var asyncTicket = Math.random();
+	                this._showTooltipContent(
+	                    // TODO params
+	                    subTooltipModel, defaultHtml, subTooltipModel.get('formatterParams') || {},
+	                    asyncTicket, e.offsetX, e.offsetY, el, api
+	                );
+	            }
+	            else {
+	                if (globalTrigger === 'item') {
+	                    this._hide();
+	                }
+	                else {
+	                    // Try show axis tooltip
+	                    this._showAxisTooltip(tooltipModel, ecModel, e);
+	                }
+
+	                // Action of cross pointer
+	                // other pointer types will trigger action in _dispatchAndShowSeriesTooltipContent method
+	                if (tooltipModel.get('axisPointer.type') === 'cross') {
+	                    api.dispatchAction({
+	                        type: 'showTip',
+	                        from: this.uid,
+	                        x: e.offsetX,
+	                        y: e.offsetY
+	                    });
+	                }
+	            }
+	        },
+
+	        /**
+	         * Show tooltip on axis
+	         * @param {module:echarts/component/tooltip/TooltipModel} tooltipModel
+	         * @param {module:echarts/model/Global} ecModel
+	         * @param {Object} e
+	         * @private
+	         */
+	        _showAxisTooltip: function (tooltipModel, ecModel, e) {
+	            var axisPointerModel = tooltipModel.getModel('axisPointer');
+	            var axisPointerType = axisPointerModel.get('type');
+
+	            if (axisPointerType === 'cross') {
+	                var el = e.target;
+	                if (el && el.dataIndex != null) {
+	                    var seriesModel = ecModel.getSeriesByIndex(el.seriesIndex);
+	                    var dataIndex = el.dataIndex;
+	                    this._showItemTooltipContent(seriesModel, dataIndex, el.dataType, e);
+	                }
+	            }
+
+	            this._showAxisPointer();
+	            var allNotShow = true;
+	            zrUtil.each(this._seriesGroupByAxis, function (seriesCoordSysSameAxis) {
+	                // Try show the axis pointer
+	                var allCoordSys = seriesCoordSysSameAxis.coordSys;
+	                var coordSys = allCoordSys[0];
+
+	                // If mouse position is not in the grid or polar
+	                var point = [e.offsetX, e.offsetY];
+
+	                if (!coordSys.containPoint(point)) {
+	                    // Hide axis pointer
+	                    this._hideAxisPointer(coordSys.name);
+	                    return;
+	                }
+
+	                allNotShow = false;
+	                // Make sure point is discrete on cateogry axis
+	                var dimensions = coordSys.dimensions;
+	                var value = coordSys.pointToData(point, true);
+	                point = coordSys.dataToPoint(value);
+	                var baseAxis = coordSys.getBaseAxis();
+	                var axisType = axisPointerModel.get('axis');
+	                if (axisType === 'auto') {
+	                    axisType = baseAxis.dim;
+	                }
+
+	                var contentNotChange = false;
+	                var lastHover = this._lastHover;
+	                if (axisPointerType === 'cross') {
+	                    // If hover data not changed
+	                    // Possible when two axes are all category
+	                    if (dataEqual(lastHover.data, value)) {
+	                        contentNotChange = true;
+	                    }
+	                    lastHover.data = value;
+	                }
+	                else {
+	                    var valIndex = zrUtil.indexOf(dimensions, axisType);
+
+	                    // If hover data not changed on the axis dimension
+	                    if (lastHover.data === value[valIndex]) {
+	                        contentNotChange = true;
+	                    }
+	                    lastHover.data = value[valIndex];
+	                }
+
+	                if (coordSys.type === 'cartesian2d' && !contentNotChange) {
+	                    this._showCartesianPointer(
+	                        axisPointerModel, coordSys, axisType, point
+	                    );
+	                }
+	                else if (coordSys.type === 'polar' && !contentNotChange) {
+	                    this._showPolarPointer(
+	                        axisPointerModel, coordSys, axisType, point
+	                    );
+	                }
+	                else if (coordSys.type === 'singleAxis' && !contentNotChange) {
+	                    this._showSinglePointer(
+	                        axisPointerModel, coordSys, axisType, point
+	                    );
+	                }
+
+	                if (axisPointerType !== 'cross') {
+	                    this._dispatchAndShowSeriesTooltipContent(
+	                        coordSys, seriesCoordSysSameAxis.series, point, value, contentNotChange
+	                    );
+	                }
+	            }, this);
+
+	            if (!this._tooltipModel.get('show')) {
+	                this._hideAxisPointer();
+	            }
+
+	            if (allNotShow) {
+	                this._hide();
+	            }
+	        },
+
+	        /**
+	         * Show tooltip on axis of cartesian coordinate
+	         * @param {module:echarts/model/Model} axisPointerModel
+	         * @param {module:echarts/coord/cartesian/Cartesian2D} cartesians
+	         * @param {string} axisType
+	         * @param {Array.<number>} point
+	         * @private
+	         */
+	        _showCartesianPointer: function (axisPointerModel, cartesian, axisType, point) {
+	            var self = this;
+
+	            var axisPointerType = axisPointerModel.get('type');
+	            var baseAxis = cartesian.getBaseAxis();
+	            var moveAnimation = axisPointerType !== 'cross'
+	                && baseAxis.type === 'category'
+	                && baseAxis.getBandWidth() > 20;
+
+	            if (axisPointerType === 'cross') {
+	                moveGridLine('x', point, cartesian.getAxis('y').getGlobalExtent());
+	                moveGridLine('y', point, cartesian.getAxis('x').getGlobalExtent());
+
+	                this._updateCrossText(cartesian, point, axisPointerModel);
+	            }
+	            else {
+	                var otherAxis = cartesian.getAxis(axisType === 'x' ? 'y' : 'x');
+	                var otherExtent = otherAxis.getGlobalExtent();
+
+	                if (cartesian.type === 'cartesian2d') {
+	                    (axisPointerType === 'line' ? moveGridLine : moveGridShadow)(
+	                        axisType, point, otherExtent
+	                    );
+	                }
+	            }
+
+	            /**
+	             * @inner
+	             */
+	            function moveGridLine(axisType, point, otherExtent) {
+	                var targetShape = axisType === 'x'
+	                    ? makeLineShape(point[0], otherExtent[0], point[0], otherExtent[1])
+	                    : makeLineShape(otherExtent[0], point[1], otherExtent[1], point[1]);
+
+	                var pointerEl = self._getPointerElement(
+	                    cartesian, axisPointerModel, axisType, targetShape
+	                );
+	                graphic.subPixelOptimizeLine({
+	                    shape: targetShape,
+	                    style: pointerEl.style
+	                });
+
+	                moveAnimation
+	                    ? graphic.updateProps(pointerEl, {
+	                        shape: targetShape
+	                    }, axisPointerModel)
+	                    :  pointerEl.attr({
+	                        shape: targetShape
+	                    });
+	            }
+
+	            /**
+	             * @inner
+	             */
+	            function moveGridShadow(axisType, point, otherExtent) {
+	                var axis = cartesian.getAxis(axisType);
+	                var bandWidth = axis.getBandWidth();
+	                var span = otherExtent[1] - otherExtent[0];
+	                var targetShape = axisType === 'x'
+	                    ? makeRectShape(point[0] - bandWidth / 2, otherExtent[0], bandWidth, span)
+	                    : makeRectShape(otherExtent[0], point[1] - bandWidth / 2, span, bandWidth);
+
+	                var pointerEl = self._getPointerElement(
+	                    cartesian, axisPointerModel, axisType, targetShape
+	                );
+	                moveAnimation
+	                    ? graphic.updateProps(pointerEl, {
+	                        shape: targetShape
+	                    }, axisPointerModel)
+	                    :  pointerEl.attr({
+	                        shape: targetShape
+	                    });
+	            }
+	        },
+
+	        _showSinglePointer: function (axisPointerModel, single, axisType, point) {
+	            var self = this;
+	            var axisPointerType = axisPointerModel.get('type');
+	            var moveAnimation = axisPointerType !== 'cross' && single.getBaseAxis().type === 'category';
+	            var rect = single.getRect();
+	            var otherExtent = [rect.y, rect.y + rect.height];
+
+	            moveSingleLine(axisType, point, otherExtent);
+
+	            /**
+	             * @inner
+	             */
+	            function moveSingleLine(axisType, point, otherExtent) {
+	                var axis = single.getAxis();
+	                var orient = axis.orient;
+
+	                var targetShape = orient === 'horizontal'
+	                    ? makeLineShape(point[0], otherExtent[0], point[0], otherExtent[1])
+	                    : makeLineShape(otherExtent[0], point[1], otherExtent[1], point[1]);
+
+	                var pointerEl = self._getPointerElement(
+	                    single, axisPointerModel, axisType, targetShape
+	                );
+	                moveAnimation
+	                    ? graphic.updateProps(pointerEl, {
+	                        shape: targetShape
+	                    }, axisPointerModel)
+	                    :  pointerEl.attr({
+	                        shape: targetShape
+	                    });
+	            }
+
+	        },
+
+	        /**
+	         * Show tooltip on axis of polar coordinate
+	         * @param {module:echarts/model/Model} axisPointerModel
+	         * @param {Array.<module:echarts/coord/polar/Polar>} polar
+	         * @param {string} axisType
+	         * @param {Array.<number>} point
+	         */
+	        _showPolarPointer: function (axisPointerModel, polar, axisType, point) {
+	            var self = this;
+
+	            var axisPointerType = axisPointerModel.get('type');
+
+	            var angleAxis = polar.getAngleAxis();
+	            var radiusAxis = polar.getRadiusAxis();
+
+	            var moveAnimation = axisPointerType !== 'cross'
+	                && polar.getBaseAxis().type === 'category';
+
+	            if (axisPointerType === 'cross') {
+	                movePolarLine('angle', point, radiusAxis.getExtent());
+	                movePolarLine('radius', point, angleAxis.getExtent());
+
+	                this._updateCrossText(polar, point, axisPointerModel);
+	            }
+	            else {
+	                var otherAxis = polar.getAxis(axisType === 'radius' ? 'angle' : 'radius');
+	                var otherExtent = otherAxis.getExtent();
+
+	                (axisPointerType === 'line' ? movePolarLine : movePolarShadow)(
+	                    axisType, point, otherExtent
+	                );
+	            }
+	            /**
+	             * @inner
+	             */
+	            function movePolarLine(axisType, point, otherExtent) {
+	                var mouseCoord = polar.pointToCoord(point);
+
+	                var targetShape;
+
+	                if (axisType === 'angle') {
+	                    var p1 = polar.coordToPoint([otherExtent[0], mouseCoord[1]]);
+	                    var p2 = polar.coordToPoint([otherExtent[1], mouseCoord[1]]);
+	                    targetShape = makeLineShape(p1[0], p1[1], p2[0], p2[1]);
+	                }
+	                else {
+	                    targetShape = {
+	                        cx: polar.cx,
+	                        cy: polar.cy,
+	                        r: mouseCoord[0]
+	                    };
+	                }
+
+	                var pointerEl = self._getPointerElement(
+	                    polar, axisPointerModel, axisType, targetShape
+	                );
+
+	                moveAnimation
+	                    ? graphic.updateProps(pointerEl, {
+	                        shape: targetShape
+	                    }, axisPointerModel)
+	                    :  pointerEl.attr({
+	                        shape: targetShape
+	                    });
+	            }
+
+	            /**
+	             * @inner
+	             */
+	            function movePolarShadow(axisType, point, otherExtent) {
+	                var axis = polar.getAxis(axisType);
+	                var bandWidth = axis.getBandWidth();
+
+	                var mouseCoord = polar.pointToCoord(point);
+
+	                var targetShape;
+
+	                var radian = Math.PI / 180;
+
+	                if (axisType === 'angle') {
+	                    targetShape = makeSectorShape(
+	                        polar.cx, polar.cy,
+	                        otherExtent[0], otherExtent[1],
+	                        // In ECharts y is negative if angle is positive
+	                        (-mouseCoord[1] - bandWidth / 2) * radian,
+	                        (-mouseCoord[1] + bandWidth / 2) * radian
+	                    );
+	                }
+	                else {
+	                    targetShape = makeSectorShape(
+	                        polar.cx, polar.cy,
+	                        mouseCoord[0] - bandWidth / 2,
+	                        mouseCoord[0] + bandWidth / 2,
+	                        0, Math.PI * 2
+	                    );
+	                }
+
+	                var pointerEl = self._getPointerElement(
+	                    polar, axisPointerModel, axisType, targetShape
+	                );
+	                moveAnimation
+	                    ? graphic.updateProps(pointerEl, {
+	                        shape: targetShape
+	                    }, axisPointerModel)
+	                    :  pointerEl.attr({
+	                        shape: targetShape
+	                    });
+	            }
+	        },
+
+	        _updateCrossText: function (coordSys, point, axisPointerModel) {
+	            var crossStyleModel = axisPointerModel.getModel('crossStyle');
+	            var textStyleModel = crossStyleModel.getModel('textStyle');
+
+	            var tooltipModel = this._tooltipModel;
+
+	            var text = this._crossText;
+	            if (!text) {
+	                text = this._crossText = new graphic.Text({
+	                    style: {
+	                        textAlign: 'left',
+	                        textVerticalAlign: 'bottom'
+	                    }
+	                });
+	                this.group.add(text);
+	            }
+
+	            var value = coordSys.pointToData(point);
+
+	            var dims = coordSys.dimensions;
+	            value = zrUtil.map(value, function (val, idx) {
+	                var axis = coordSys.getAxis(dims[idx]);
+	                if (axis.type === 'category' || axis.type === 'time') {
+	                    val = axis.scale.getLabel(val);
+	                }
+	                else {
+	                    val = formatUtil.addCommas(
+	                        val.toFixed(axis.getPixelPrecision())
+	                    );
+	                }
+	                return val;
+	            });
+
+	            text.setStyle({
+	                fill: textStyleModel.getTextColor() || crossStyleModel.get('color'),
+	                textFont: textStyleModel.getFont(),
+	                text: value.join(', '),
+	                x: point[0] + 5,
+	                y: point[1] - 5
+	            });
+	            text.z = tooltipModel.get('z');
+	            text.zlevel = tooltipModel.get('zlevel');
+	        },
+
+	        _getPointerElement: function (coordSys, pointerModel, axisType, initShape) {
+	            var tooltipModel = this._tooltipModel;
+	            var z = tooltipModel.get('z');
+	            var zlevel = tooltipModel.get('zlevel');
+	            var axisPointers = this._axisPointers;
+	            var coordSysName = coordSys.name;
+	            axisPointers[coordSysName] = axisPointers[coordSysName] || {};
+	            if (axisPointers[coordSysName][axisType]) {
+	                return axisPointers[coordSysName][axisType];
+	            }
+
+	            // Create if not exists
+	            var pointerType = pointerModel.get('type');
+	            var styleModel = pointerModel.getModel(pointerType + 'Style');
+	            var isShadow = pointerType === 'shadow';
+	            var style = styleModel[isShadow ? 'getAreaStyle' : 'getLineStyle']();
+
+	            var elementType = coordSys.type === 'polar'
+	                ? (isShadow ? 'Sector' : (axisType === 'radius' ? 'Circle' : 'Line'))
+	                : (isShadow ? 'Rect' : 'Line');
+
+	            isShadow ? (style.stroke = null) : (style.fill = null);
+
+	            var el = axisPointers[coordSysName][axisType] = new graphic[elementType]({
+	                style: style,
+	                z: z,
+	                zlevel: zlevel,
+	                silent: true,
+	                shape: initShape
+	            });
+
+	            this.group.add(el);
+	            return el;
+	        },
+
+	        /**
+	         * Dispatch actions and show tooltip on series
+	         * @param {Array.<module:echarts/model/Series>} seriesList
+	         * @param {Array.<number>} point
+	         * @param {Array.<number>} value
+	         * @param {boolean} contentNotChange
+	         * @param {Object} e
+	         */
+	        _dispatchAndShowSeriesTooltipContent: function (
+	            coordSys, seriesList, point, value, contentNotChange
+	        ) {
+
+	            var rootTooltipModel = this._tooltipModel;
+
+	            var baseAxis = coordSys.getBaseAxis();
+	            var baseDimIndex = baseAxis.dim === 'x' || baseAxis.dim === 'radius' ? 0 : 1;
+
+	            var payloadBatch = zrUtil.map(seriesList, function (series) {
+	                return {
+	                    seriesIndex: series.seriesIndex,
+	                    dataIndex: series.getAxisTooltipDataIndex
+	                        ? series.getAxisTooltipDataIndex(series.coordDimToDataDim(baseAxis.dim), value, baseAxis)
+	                        : series.getData().indexOfNearest(
+	                            series.coordDimToDataDim(baseAxis.dim)[0],
+	                            value[baseDimIndex],
+	                            // Add a threshold to avoid find the wrong dataIndex when data length is not same
+	                            false, baseAxis.type === 'category' ? 0.5 : null
+	                        )
+	                };
+	            });
+
+	            var lastHover = this._lastHover;
+	            var api = this._api;
+	            // Dispatch downplay action
+	            if (lastHover.payloadBatch && !contentNotChange) {
+	                api.dispatchAction({
+	                    type: 'downplay',
+	                    batch: lastHover.payloadBatch
+	                });
+	            }
+	            // Dispatch highlight action
+	            if (!contentNotChange) {
+	                api.dispatchAction({
+	                    type: 'highlight',
+	                    batch: payloadBatch
+	                });
+	                lastHover.payloadBatch = payloadBatch;
+	            }
+	            // Dispatch showTip action
+	            api.dispatchAction({
+	                type: 'showTip',
+	                dataIndex: payloadBatch[0].dataIndex,
+	                seriesIndex: payloadBatch[0].seriesIndex,
+	                from: this.uid
+	            });
+
+	            if (baseAxis && rootTooltipModel.get('showContent') && rootTooltipModel.get('show')) {
+	                var paramsList = zrUtil.map(seriesList, function (series, index) {
+	                    return series.getDataParams(payloadBatch[index].dataIndex);
+	                });
+
+	                if (!contentNotChange) {
+	                    // Update html content
+	                    var firstDataIndex = payloadBatch[0].dataIndex;
+
+	                    // Default tooltip content
+	                    // FIXME
+	                    // (1) shold be the first data which has name?
+	                    // (2) themeRiver, firstDataIndex is array, and first line is unnecessary.
+	                    var firstLine = baseAxis.type === 'time'
+	                        ? baseAxis.scale.getLabel(value[baseDimIndex])
+	                        : seriesList[0].getData().getName(firstDataIndex);
+	                    var defaultHtml = (firstLine ? firstLine + '<br />' : '')
+	                        + zrUtil.map(seriesList, function (series, index) {
+	                            return series.formatTooltip(payloadBatch[index].dataIndex, true);
+	                        }).join('<br />');
+
+	                    var asyncTicket = 'axis_' + coordSys.name + '_' + firstDataIndex;
+
+	                    this._showTooltipContent(
+	                        rootTooltipModel, defaultHtml, paramsList, asyncTicket,
+	                        point[0], point[1], null, api
+	                    );
+	                }
+	                else {
+	                    updatePosition(
+	                        rootTooltipModel.get('position'), point[0], point[1],
+	                        this._tooltipContent, paramsList, null, api
+	                    );
+	                }
+	            }
+	        },
+
+	        /**
+	         * Show tooltip on item
+	         * @param {module:echarts/model/Series} seriesModel
+	         * @param {number} dataIndex
+	         * @param {string} dataType
+	         * @param {Object} e
+	         */
+	        _showItemTooltipContent: function (seriesModel, dataIndex, dataType, e) {
+	            // FIXME Graph data
+	            var api = this._api;
+	            var data = seriesModel.getData(dataType);
+	            var itemModel = data.getItemModel(dataIndex);
+
+	            var tooltipOpt = itemModel.get('tooltip', true);
+	            if (typeof tooltipOpt === 'string') {
+	                // In each data item tooltip can be simply write:
+	                // {
+	                //  value: 10,
+	                //  tooltip: 'Something you need to know'
+	                // }
+	                var tooltipContent = tooltipOpt;
+	                tooltipOpt = {
+	                    formatter: tooltipContent
+	                };
+	            }
+	            var rootTooltipModel = this._tooltipModel;
+	            var seriesTooltipModel = seriesModel.getModel(
+	                'tooltip', rootTooltipModel
+	            );
+	            var tooltipModel = new Model(tooltipOpt, seriesTooltipModel, seriesTooltipModel.ecModel);
+
+	            var params = seriesModel.getDataParams(dataIndex, dataType);
+	            var defaultHtml = seriesModel.formatTooltip(dataIndex, false, dataType);
+
+	            var asyncTicket = 'item_' + seriesModel.name + '_' + dataIndex;
+
+	            this._showTooltipContent(
+	                tooltipModel, defaultHtml, params, asyncTicket,
+	                e.offsetX, e.offsetY, e.target, api
+	            );
+	        },
+
+	        _showTooltipContent: function (
+	            tooltipModel, defaultHtml, params, asyncTicket, x, y, target, api
+	        ) {
+	            // Reset ticket
+	            this._ticket = '';
+
+	            if (tooltipModel.get('showContent') && tooltipModel.get('show')) {
+	                var tooltipContent = this._tooltipContent;
+
+	                var formatter = tooltipModel.get('formatter');
+	                var positionExpr = tooltipModel.get('position');
+	                var html = defaultHtml;
+
+	                if (formatter) {
+	                    if (typeof formatter === 'string') {
+	                        html = formatUtil.formatTpl(formatter, params);
+	                    }
+	                    else if (typeof formatter === 'function') {
+	                        var self = this;
+	                        var ticket = asyncTicket;
+	                        var callback = function (cbTicket, html) {
+	                            if (cbTicket === self._ticket) {
+	                                tooltipContent.setContent(html);
+
+	                                updatePosition(
+	                                    positionExpr, x, y,
+	                                    tooltipContent, params, target, api
+	                                );
+	                            }
+	                        };
+	                        self._ticket = ticket;
+	                        html = formatter(params, ticket, callback);
+	                    }
+	                }
+
+	                tooltipContent.show(tooltipModel);
+	                tooltipContent.setContent(html);
+
+	                updatePosition(
+	                    positionExpr, x, y,
+	                    tooltipContent, params, target, api
+	                );
+	            }
+	        },
+
+	        /**
+	         * Show axis pointer
+	         * @param {string} [coordSysName]
+	         */
+	        _showAxisPointer: function (coordSysName) {
+	            if (coordSysName) {
+	                var axisPointers = this._axisPointers[coordSysName];
+	                axisPointers && zrUtil.each(axisPointers, function (el) {
+	                    el.show();
+	                });
+	            }
+	            else {
+	                this.group.eachChild(function (child) {
+	                    child.show();
+	                });
+	                this.group.show();
+	            }
+	        },
+
+	        _resetLastHover: function () {
+	            var lastHover = this._lastHover;
+	            if (lastHover.payloadBatch) {
+	                this._api.dispatchAction({
+	                    type: 'downplay',
+	                    batch: lastHover.payloadBatch
+	                });
+	            }
+	            // Reset lastHover
+	            this._lastHover = {};
+	        },
+	        /**
+	         * Hide axis pointer
+	         * @param {string} [coordSysName]
+	         */
+	        _hideAxisPointer: function (coordSysName) {
+	            if (coordSysName) {
+	                var axisPointers = this._axisPointers[coordSysName];
+	                axisPointers && zrUtil.each(axisPointers, function (el) {
+	                    el.hide();
+	                });
+	            }
+	            else {
+	                if (this.group.children().length) {
+	                    this.group.hide();
+	                }
+	            }
+	        },
+
+	        _hide: function () {
+	            clearTimeout(this._showTimeout);
+
+	            this._hideAxisPointer();
+	            this._resetLastHover();
+	            if (!this._alwaysShowContent) {
+	                this._tooltipContent.hideLater(this._tooltipModel.get('hideDelay'));
+	            }
+
+	            this._api.dispatchAction({
+	                type: 'hideTip',
+	                from: this.uid
+	            });
+
+	            this._lastX = this._lastY = null;
+	        },
+
+	        dispose: function (ecModel, api) {
+	            if (env.node) {
+	                return;
+	            }
+	            var zr = api.getZr();
+	            this._tooltipContent.hide();
+
+	            zr.off('click', this._tryShow);
+	            zr.off('mousemove', this._mousemove);
+	            zr.off('mouseout', this._hide);
+	            zr.off('globalout', this._hide);
+
+	            api.off('showTip', this._manuallyShowTip);
+	            api.off('hideTip', this._manuallyHideTip);
+	        }
+	    });
+
+
+/***/ },
+/* 282 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @module echarts/component/tooltip/TooltipContent
+	 */
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var zrColor = __webpack_require__(39);
+	    var eventUtil = __webpack_require__(87);
+	    var formatUtil = __webpack_require__(6);
+	    var each = zrUtil.each;
+	    var toCamelCase = formatUtil.toCamelCase;
+	    var env = __webpack_require__(2);
+
+	    var vendors = ['', '-webkit-', '-moz-', '-o-'];
+
+	    var gCssText = 'position:absolute;display:block;border-style:solid;white-space:nowrap;z-index:9999999;';
+
+	    /**
+	     * @param {number} duration
+	     * @return {string}
+	     * @inner
+	     */
+	    function assembleTransition(duration) {
+	        var transitionCurve = 'cubic-bezier(0.23, 1, 0.32, 1)';
+	        var transitionText = 'left ' + duration + 's ' + transitionCurve + ','
+	                            + 'top ' + duration + 's ' + transitionCurve;
+	        return zrUtil.map(vendors, function (vendorPrefix) {
+	            return vendorPrefix + 'transition:' + transitionText;
+	        }).join(';');
+	    }
+
+	    /**
+	     * @param {Object} textStyle
+	     * @return {string}
+	     * @inner
+	     */
+	    function assembleFont(textStyleModel) {
+	        var cssText = [];
+
+	        var fontSize = textStyleModel.get('fontSize');
+	        var color = textStyleModel.getTextColor();
+
+	        color && cssText.push('color:' + color);
+
+	        cssText.push('font:' + textStyleModel.getFont());
+
+	        fontSize &&
+	            cssText.push('line-height:' + Math.round(fontSize * 3 / 2) + 'px');
+
+	        each(['decoration', 'align'], function (name) {
+	            var val = textStyleModel.get(name);
+	            val && cssText.push('text-' + name + ':' + val);
+	        });
+
+	        return cssText.join(';');
+	    }
+
+	    /**
+	     * @param {Object} tooltipModel
+	     * @return {string}
+	     * @inner
+	     */
+	    function assembleCssText(tooltipModel) {
+
+	        tooltipModel = tooltipModel;
+
+	        var cssText = [];
+
+	        var transitionDuration = tooltipModel.get('transitionDuration');
+	        var backgroundColor = tooltipModel.get('backgroundColor');
+	        var textStyleModel = tooltipModel.getModel('textStyle');
+	        var padding = tooltipModel.get('padding');
+
+	        // Animation transition
+	        transitionDuration &&
+	            cssText.push(assembleTransition(transitionDuration));
+
+	        if (backgroundColor) {
+	            if (env.canvasSupported) {
+	                cssText.push('background-Color:' + backgroundColor);
+	            }
+	            else {
+	                // for ie
+	                cssText.push(
+	                    'background-Color:#' + zrColor.toHex(backgroundColor)
+	                );
+	                cssText.push('filter:alpha(opacity=70)');
+	            }
+	        }
+
+	        // Border style
+	        each(['width', 'color', 'radius'], function (name) {
+	            var borderName = 'border-' + name;
+	            var camelCase = toCamelCase(borderName);
+	            var val = tooltipModel.get(camelCase);
+	            val != null &&
+	                cssText.push(borderName + ':' + val + (name === 'color' ? '' : 'px'));
+	        });
+
+	        // Text style
+	        cssText.push(assembleFont(textStyleModel));
+
+	        // Padding
+	        if (padding != null) {
+	            cssText.push('padding:' + formatUtil.normalizeCssArray(padding).join('px ') + 'px');
+	        }
+
+	        return cssText.join(';') + ';';
+	    }
+
+	    /**
+	     * @alias module:echarts/component/tooltip/TooltipContent
+	     * @constructor
+	     */
+	    function TooltipContent(container, api) {
+	        var el = document.createElement('div');
+	        var zr = api.getZr();
+
+	        this.el = el;
+
+	        this._x = api.getWidth() / 2;
+	        this._y = api.getHeight() / 2;
+
+	        container.appendChild(el);
+
+	        this._container = container;
+
+	        this._show = false;
+
+	        /**
+	         * @private
+	         */
+	        this._hideTimeout;
+
+	        var self = this;
+	        el.onmouseenter = function () {
+	            // clear the timeout in hideLater and keep showing tooltip
+	            if (self.enterable) {
+	                clearTimeout(self._hideTimeout);
+	                self._show = true;
+	            }
+	            self._inContent = true;
+	        };
+	        el.onmousemove = function (e) {
+	            if (!self.enterable) {
+	                // Try trigger zrender event to avoid mouse
+	                // in and out shape too frequently
+	                var handler = zr.handler;
+	                eventUtil.normalizeEvent(container, e);
+	                handler.dispatch('mousemove', e);
+	            }
+	        };
+	        el.onmouseleave = function () {
+	            if (self.enterable) {
+	                if (self._show) {
+	                    self.hideLater(self._hideDelay);
+	                }
+	            }
+	            self._inContent = false;
+	        };
+
+	        compromiseMobile(el, container);
+	    }
+
+	    function compromiseMobile(tooltipContentEl, container) {
+	        // Prevent default behavior on mobile. For example,
+	        // default pinch gesture will cause browser zoom.
+	        // We do not preventing event on tooltip contnet el,
+	        // because user may need customization in tooltip el.
+	        eventUtil.addEventListener(container, 'touchstart', preventDefault);
+	        eventUtil.addEventListener(container, 'touchmove', preventDefault);
+	        eventUtil.addEventListener(container, 'touchend', preventDefault);
+
+	        function preventDefault(e) {
+	            if (contains(e.target)) {
+	                e.preventDefault();
+	            }
+	        }
+
+	        function contains(targetEl) {
+	            while (targetEl && targetEl !== container) {
+	                if (targetEl === tooltipContentEl) {
+	                    return true;
+	                }
+	                targetEl = targetEl.parentNode;
+	            }
+	        }
+	    }
+
+	    TooltipContent.prototype = {
+
+	        constructor: TooltipContent,
+
+	        enterable: true,
+
+	        /**
+	         * Update when tooltip is rendered
+	         */
+	        update: function () {
+	            var container = this._container;
+	            var stl = container.currentStyle
+	                || document.defaultView.getComputedStyle(container);
+	            var domStyle = container.style;
+	            if (domStyle.position !== 'absolute' && stl.position !== 'absolute') {
+	                domStyle.position = 'relative';
+	            }
+	            // Hide the tooltip
+	            // PENDING
+	            // this.hide();
+	        },
+
+	        show: function (tooltipModel) {
+	            clearTimeout(this._hideTimeout);
+	            var el = this.el;
+
+	            el.style.cssText = gCssText + assembleCssText(tooltipModel)
+	                // http://stackoverflow.com/questions/21125587/css3-transition-not-working-in-chrome-anymore
+	                + ';left:' + this._x + 'px;top:' + this._y + 'px;'
+	                + (tooltipModel.get('extraCssText') || '');
+
+	            el.style.display = el.innerHTML ?  'block' : 'none';
+
+	            this._show = true;
+	        },
+
+	        setContent: function (content) {
+	            var el = this.el;
+	            el.innerHTML = content;
+	            el.style.display = content ? 'block' : 'none';
+	        },
+
+	        moveTo: function (x, y) {
+	            var style = this.el.style;
+	            style.left = x + 'px';
+	            style.top = y + 'px';
+
+	            this._x = x;
+	            this._y = y;
+	        },
+
+	        hide: function () {
+	            this.el.style.display = 'none';
+	            this._show = false;
+	        },
+
+	        // showLater: function ()
+
+	        hideLater: function (time) {
+	            if (this._show && !(this._inContent && this.enterable)) {
+	                if (time) {
+	                    this._hideDelay = time;
+	                    // Set show false to avoid invoke hideLater mutiple times
+	                    this._show = false;
+	                    this._hideTimeout = setTimeout(zrUtil.bind(this.hide, this), time);
+	                }
+	                else {
+	                    this.hide();
+	                }
+	            }
+	        },
+
+	        isShow: function () {
+	            return this._show;
+	        }
+	    };
+
+	    module.exports = TooltipContent;
+
+
+/***/ },
+/* 283 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    __webpack_require__(284);
+	    __webpack_require__(290);
+	    __webpack_require__(292);
+
+	    // Polar view
+	    __webpack_require__(1).extendComponentView({
+	        type: 'polar'
+	    });
+
+
+/***/ },
+/* 284 */
+/***/ function(module, exports, __webpack_require__) {
+
+	// TODO Axis scale
+
+
+	    var Polar = __webpack_require__(285);
+	    var numberUtil = __webpack_require__(7);
+
+	    var axisHelper = __webpack_require__(114);
+	    var niceScaleExtent = axisHelper.niceScaleExtent;
+
+	    // 依赖 PolarModel 做预处理
+	    __webpack_require__(288);
+
+	    /**
+	     * Resize method bound to the polar
+	     * @param {module:echarts/coord/polar/PolarModel} polarModel
+	     * @param {module:echarts/ExtensionAPI} api
+	     */
+	    function resizePolar(polarModel, api) {
+	        var center = polarModel.get('center');
+	        var radius = polarModel.get('radius');
+	        var width = api.getWidth();
+	        var height = api.getHeight();
+	        var parsePercent = numberUtil.parsePercent;
+
+	        this.cx = parsePercent(center[0], width);
+	        this.cy = parsePercent(center[1], height);
+
+	        var radiusAxis = this.getRadiusAxis();
+	        var size = Math.min(width, height) / 2;
+	        // var idx = radiusAxis.inverse ? 1 : 0;
+	        radiusAxis.setExtent(0, parsePercent(radius, size));
+	    }
+
+	    /**
+	     * Update polar
+	     */
+	    function updatePolarScale(ecModel, api) {
+	        var polar = this;
+	        var angleAxis = polar.getAngleAxis();
+	        var radiusAxis = polar.getRadiusAxis();
+	        // Reset scale
+	        angleAxis.scale.setExtent(Infinity, -Infinity);
+	        radiusAxis.scale.setExtent(Infinity, -Infinity);
+
+	        ecModel.eachSeries(function (seriesModel) {
+	            if (seriesModel.coordinateSystem === polar) {
+	                var data = seriesModel.getData();
+	                radiusAxis.scale.unionExtent(
+	                    data.getDataExtent('radius', radiusAxis.type !== 'category')
+	                );
+	                angleAxis.scale.unionExtent(
+	                    data.getDataExtent('angle', angleAxis.type !== 'category')
+	                );
+	            }
+	        });
+
+	        niceScaleExtent(angleAxis, angleAxis.model);
+	        niceScaleExtent(radiusAxis, radiusAxis.model);
+
+	        // Fix extent of category angle axis
+	        if (angleAxis.type === 'category' && !angleAxis.onBand) {
+	            var extent = angleAxis.getExtent();
+	            var diff = 360 / angleAxis.scale.count();
+	            angleAxis.inverse ? (extent[1] += diff) : (extent[1] -= diff);
+	            angleAxis.setExtent(extent[0], extent[1]);
+	        }
+	    }
+
+	    /**
+	     * Set common axis properties
+	     * @param {module:echarts/coord/polar/AngleAxis|module:echarts/coord/polar/RadiusAxis}
+	     * @param {module:echarts/coord/polar/AxisModel}
+	     * @inner
+	     */
+	    function setAxis(axis, axisModel) {
+	        axis.type = axisModel.get('type');
+	        axis.scale = axisHelper.createScaleByModel(axisModel);
+	        axis.onBand = axisModel.get('boundaryGap') && axis.type === 'category';
+
+	        // FIXME Radius axis not support inverse axis
+	        if (axisModel.mainType === 'angleAxis') {
+	            var startAngle = axisModel.get('startAngle');
+	            axis.inverse = axisModel.get('inverse') ^ axisModel.get('clockwise');
+	            axis.setExtent(startAngle, startAngle + (axis.inverse ? -360 : 360));
+	        }
+
+	        // Inject axis instance
+	        axisModel.axis = axis;
+	        axis.model = axisModel;
+	    }
+
+
+	    var polarCreator = {
+
+	        dimensions: Polar.prototype.dimensions,
+
+	        create: function (ecModel, api) {
+	            var polarList = [];
+	            ecModel.eachComponent('polar', function (polarModel, idx) {
+	                var polar = new Polar(idx);
+	                // Inject resize and update method
+	                polar.resize = resizePolar;
+	                polar.update = updatePolarScale;
+
+	                var radiusAxis = polar.getRadiusAxis();
+	                var angleAxis = polar.getAngleAxis();
+
+	                var radiusAxisModel = polarModel.findAxisModel('radiusAxis');
+	                var angleAxisModel = polarModel.findAxisModel('angleAxis');
+
+	                setAxis(radiusAxis, radiusAxisModel);
+	                setAxis(angleAxis, angleAxisModel);
+
+	                polar.resize(polarModel, api);
+	                polarList.push(polar);
+
+	                polarModel.coordinateSystem = polar;
+	            });
+	            // Inject coordinateSystem to series
+	            ecModel.eachSeries(function (seriesModel) {
+	                if (seriesModel.get('coordinateSystem') === 'polar') {
+	                    seriesModel.coordinateSystem = polarList[seriesModel.get('polarIndex')];
+	                }
+	            });
+
+	            return polarList;
+	        }
+	    };
+
+	    __webpack_require__(26).register('polar', polarCreator);
+
+
+/***/ },
+/* 285 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+	/**
+	 * @module echarts/coord/polar/Polar
+	 */
+
+
+	    var RadiusAxis = __webpack_require__(286);
+	    var AngleAxis = __webpack_require__(287);
+
+	    /**
+	     * @alias {module:echarts/coord/polar/Polar}
+	     * @constructor
+	     * @param {string} name
+	     */
+	    var Polar = function (name) {
+
+	        /**
+	         * @type {string}
+	         */
+	        this.name = name || '';
+
+	        /**
+	         * x of polar center
+	         * @type {number}
+	         */
+	        this.cx = 0;
+
+	        /**
+	         * y of polar center
+	         * @type {number}
+	         */
+	        this.cy = 0;
+
+	        /**
+	         * @type {module:echarts/coord/polar/RadiusAxis}
+	         * @private
+	         */
+	        this._radiusAxis = new RadiusAxis();
+
+	        /**
+	         * @type {module:echarts/coord/polar/AngleAxis}
+	         * @private
+	         */
+	        this._angleAxis = new AngleAxis();
+	    };
+
+	    Polar.prototype = {
+
+	        constructor: Polar,
+
+	        type: 'polar',
+
+	        /**
+	         * @param {Array.<string>}
+	         * @readOnly
+	         */
+	        dimensions: ['radius', 'angle'],
+
+	        /**
+	         * If contain coord
+	         * @param {Array.<number>} point
+	         * @return {boolean}
+	         */
+	        containPoint: function (point) {
+	            var coord = this.pointToCoord(point);
+	            return this._radiusAxis.contain(coord[0])
+	                && this._angleAxis.contain(coord[1]);
+	        },
+
+	        /**
+	         * If contain data
+	         * @param {Array.<number>} data
+	         * @return {boolean}
+	         */
+	        containData: function (data) {
+	            return this._radiusAxis.containData(data[0])
+	                && this._angleAxis.containData(data[1]);
+	        },
+
+	        /**
+	         * @param {string} axisType
+	         * @return {module:echarts/coord/polar/AngleAxis|module:echarts/coord/polar/RadiusAxis}
+	         */
+	        getAxis: function (axisType) {
+	            return this['_' + axisType + 'Axis'];
+	        },
+
+	        /**
+	         * Get axes by type of scale
+	         * @param {string} scaleType
+	         * @return {module:echarts/coord/polar/AngleAxis|module:echarts/coord/polar/RadiusAxis}
+	         */
+	        getAxesByScale: function (scaleType) {
+	            var axes = [];
+	            var angleAxis = this._angleAxis;
+	            var radiusAxis = this._radiusAxis;
+	            angleAxis.scale.type === scaleType && axes.push(angleAxis);
+	            radiusAxis.scale.type === scaleType && axes.push(radiusAxis);
+
+	            return axes;
+	        },
+
+	        /**
+	         * @return {module:echarts/coord/polar/AngleAxis}
+	         */
+	        getAngleAxis: function () {
+	            return this._angleAxis;
+	        },
+
+	        /**
+	         * @return {module:echarts/coord/polar/RadiusAxis}
+	         */
+	        getRadiusAxis: function () {
+	            return this._radiusAxis;
+	        },
+
+	        /**
+	         * @param {module:echarts/coord/polar/Axis}
+	         * @return {module:echarts/coord/polar/Axis}
+	         */
+	        getOtherAxis: function (axis) {
+	            var angleAxis = this._angleAxis;
+	            return axis === angleAxis ? this._radiusAxis : angleAxis;
+	        },
+
+	        /**
+	         * Base axis will be used on stacking.
+	         *
+	         * @return {module:echarts/coord/polar/Axis}
+	         */
+	        getBaseAxis: function () {
+	            return this.getAxesByScale('ordinal')[0]
+	                || this.getAxesByScale('time')[0]
+	                || this.getAngleAxis();
+	        },
+
+	        /**
+	         * Convert series data to a list of (x, y) points
+	         * @param {module:echarts/data/List} data
+	         * @return {Array}
+	         *  Return list of coordinates. For example:
+	         *  `[[10, 10], [20, 20], [30, 30]]`
+	         */
+	        dataToPoints: function (data) {
+	            return data.mapArray(this.dimensions, function (radius, angle) {
+	                return this.dataToPoint([radius, angle]);
+	            }, this);
+	        },
+
+	        /**
+	         * Convert a single data item to (x, y) point.
+	         * Parameter data is an array which the first element is radius and the second is angle
+	         * @param {Array.<number>} data
+	         * @param {boolean} [clamp=false]
+	         * @return {Array.<number>}
+	         */
+	        dataToPoint: function (data, clamp) {
+	            return this.coordToPoint([
+	                this._radiusAxis.dataToRadius(data[0], clamp),
+	                this._angleAxis.dataToAngle(data[1], clamp)
+	            ]);
+	        },
+
+	        /**
+	         * Convert a (x, y) point to data
+	         * @param {Array.<number>} point
+	         * @param {boolean} [clamp=false]
+	         * @return {Array.<number>}
+	         */
+	        pointToData: function (point, clamp) {
+	            var coord = this.pointToCoord(point);
+	            return [
+	                this._radiusAxis.radiusToData(coord[0], clamp),
+	                this._angleAxis.angleToData(coord[1], clamp)
+	            ];
+	        },
+
+	        /**
+	         * Convert a (x, y) point to (radius, angle) coord
+	         * @param {Array.<number>} point
+	         * @return {Array.<number>}
+	         */
+	        pointToCoord: function (point) {
+	            var dx = point[0] - this.cx;
+	            var dy = point[1] - this.cy;
+	            var angleAxis = this.getAngleAxis();
+	            var extent = angleAxis.getExtent();
+	            var minAngle = Math.min(extent[0], extent[1]);
+	            var maxAngle = Math.max(extent[0], extent[1]);
+	            // Fix fixed extent in polarCreator
+	            // FIXME
+	            angleAxis.inverse
+	                ? (minAngle = maxAngle - 360)
+	                : (maxAngle = minAngle + 360);
+
+	            var radius = Math.sqrt(dx * dx + dy * dy);
+	            dx /= radius;
+	            dy /= radius;
+
+	            var radian = Math.atan2(-dy, dx) / Math.PI * 180;
+
+	            // move to angleExtent
+	            var dir = radian < minAngle ? 1 : -1;
+	            while (radian < minAngle || radian > maxAngle) {
+	                radian += dir * 360;
+	            }
+
+	            return [radius, radian];
+	        },
+
+	        /**
+	         * Convert a (radius, angle) coord to (x, y) point
+	         * @param {Array.<number>} coord
+	         * @return {Array.<number>}
+	         */
+	        coordToPoint: function (coord) {
+	            var radius = coord[0];
+	            var radian = coord[1] / 180 * Math.PI;
+	            var x = Math.cos(radian) * radius + this.cx;
+	            // Inverse the y
+	            var y = -Math.sin(radian) * radius + this.cy;
+
+	            return [x, y];
+	        }
+	    };
+
+	    module.exports = Polar;
+
+
+/***/ },
+/* 286 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var Axis = __webpack_require__(123);
+
+	    function RadiusAxis(scale, radiusExtent) {
+
+	        Axis.call(this, 'radius', scale, radiusExtent);
+
+	        /**
+	         * Axis type
+	         *  - 'category'
+	         *  - 'value'
+	         *  - 'time'
+	         *  - 'log'
+	         * @type {string}
+	         */
+	        this.type = 'category';
+	    }
+
+	    RadiusAxis.prototype = {
+
+	        constructor: RadiusAxis,
+
+	        dataToRadius: Axis.prototype.dataToCoord,
+
+	        radiusToData: Axis.prototype.coordToData
+	    };
+
+	    zrUtil.inherits(RadiusAxis, Axis);
+
+	    module.exports = RadiusAxis;
+
+
+/***/ },
+/* 287 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var Axis = __webpack_require__(123);
+
+	    function AngleAxis(scale, angleExtent) {
+
+	        angleExtent = angleExtent || [0, 360];
+
+	        Axis.call(this, 'angle', scale, angleExtent);
+
+	        /**
+	         * Axis type
+	         *  - 'category'
+	         *  - 'value'
+	         *  - 'time'
+	         *  - 'log'
+	         * @type {string}
+	         */
+	        this.type = 'category';
+	    }
+
+	    AngleAxis.prototype = {
+
+	        constructor: AngleAxis,
+
+	        dataToAngle: Axis.prototype.dataToCoord,
+
+	        angleToData: Axis.prototype.coordToData
+	    };
+
+	    zrUtil.inherits(AngleAxis, Axis);
+
+	    module.exports = AngleAxis;
+
+
+/***/ },
+/* 288 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    __webpack_require__(289);
+
+	    __webpack_require__(1).extendComponentModel({
+
+	        type: 'polar',
+
+	        dependencies: ['polarAxis', 'angleAxis'],
+
+	        /**
+	         * @type {module:echarts/coord/polar/Polar}
+	         */
+	        coordinateSystem: null,
+
+	        /**
+	         * @param {string} axisType
+	         * @return {module:echarts/coord/polar/AxisModel}
+	         */
+	        findAxisModel: function (axisType) {
+	            var angleAxisModel;
+	            var ecModel = this.ecModel;
+	            ecModel.eachComponent(axisType, function (axisModel) {
+	                if (ecModel.getComponent(
+	                        'polar', axisModel.getShallow('polarIndex')
+	                    ) === this) {
+	                    angleAxisModel = axisModel;
+	                }
+	            }, this);
+	            return angleAxisModel;
+	        },
+
+	        defaultOption: {
+
+	            zlevel: 0,
+
+	            z: 0,
+
+	            center: ['50%', '50%'],
+
+	            radius: '80%'
+	        }
+	    });
+
+
+/***/ },
+/* 289 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var ComponentModel = __webpack_require__(19);
+	    var axisModelCreator = __webpack_require__(127);
+
+	    var PolarAxisModel = ComponentModel.extend({
+	        type: 'polarAxis',
+	        /**
+	         * @type {module:echarts/coord/polar/AngleAxis|module:echarts/coord/polar/RadiusAxis}
+	         */
+	        axis: null
+	    });
+
+	    zrUtil.merge(PolarAxisModel.prototype, __webpack_require__(129));
+
+	    var polarAxisDefaultExtendedOption = {
+	        angle: {
+	            polarIndex: 0,
+
+	            startAngle: 90,
+
+	            clockwise: true,
+
+	            splitNumber: 12,
+
+	            axisLabel: {
+	                rotate: false
+	            }
+	        },
+	        radius: {
+	            polarIndex: 0,
+
+	            splitNumber: 5
+	        }
+	    };
+
+	    function getAxisType(axisDim, option) {
+	        // Default axis with data is category axis
+	        return option.type || (option.data ? 'category' : 'value');
+	    }
+
+	    axisModelCreator('angle', PolarAxisModel, getAxisType, polarAxisDefaultExtendedOption.angle);
+	    axisModelCreator('radius', PolarAxisModel, getAxisType, polarAxisDefaultExtendedOption.radius);
+
+
+
+/***/ },
+/* 290 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    __webpack_require__(284);
+
+	    __webpack_require__(291);
+
+
+/***/ },
+/* 291 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var graphic = __webpack_require__(43);
+	    var Model = __webpack_require__(12);
+
+	    var elementList = ['axisLine', 'axisLabel', 'axisTick', 'splitLine', 'splitArea'];
+
+	    function getAxisLineShape(polar, r0, r, angle) {
+	        var start = polar.coordToPoint([r0, angle]);
+	        var end = polar.coordToPoint([r, angle]);
+
+	        return {
+	            x1: start[0],
+	            y1: start[1],
+	            x2: end[0],
+	            y2: end[1]
+	        };
+	    }
+	    __webpack_require__(1).extendComponentView({
+
+	        type: 'angleAxis',
+
+	        render: function (angleAxisModel, ecModel) {
+	            this.group.removeAll();
+	            if (!angleAxisModel.get('show')) {
+	                return;
+	            }
+
+	            var polarModel = ecModel.getComponent('polar', angleAxisModel.get('polarIndex'));
+	            var angleAxis = angleAxisModel.axis;
+	            var polar = polarModel.coordinateSystem;
+	            var radiusExtent = polar.getRadiusAxis().getExtent();
+	            var ticksAngles = angleAxis.getTicksCoords();
+
+	            if (angleAxis.type !== 'category') {
+	                // Remove the last tick which will overlap the first tick
+	                ticksAngles.pop();
+	            }
+
+	            zrUtil.each(elementList, function (name) {
+	                if (angleAxisModel.get(name +'.show')) {
+	                    this['_' + name](angleAxisModel, polar, ticksAngles, radiusExtent);
+	                }
+	            }, this);
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _axisLine: function (angleAxisModel, polar, ticksAngles, radiusExtent) {
+	            var lineStyleModel = angleAxisModel.getModel('axisLine.lineStyle');
+
+	            var circle = new graphic.Circle({
+	                shape: {
+	                    cx: polar.cx,
+	                    cy: polar.cy,
+	                    r: radiusExtent[1]
+	                },
+	                style: lineStyleModel.getLineStyle(),
+	                z2: 1,
+	                silent: true
+	            });
+	            circle.style.fill = null;
+
+	            this.group.add(circle);
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _axisTick: function (angleAxisModel, polar, ticksAngles, radiusExtent) {
+	            var tickModel = angleAxisModel.getModel('axisTick');
+
+	            var tickLen = (tickModel.get('inside') ? -1 : 1) * tickModel.get('length');
+
+	            var lines = zrUtil.map(ticksAngles, function (tickAngle) {
+	                return new graphic.Line({
+	                    shape: getAxisLineShape(polar, radiusExtent[1], radiusExtent[1] + tickLen, tickAngle)
+	                });
+	            });
+	            this.group.add(graphic.mergePath(
+	                lines, {
+	                    style: zrUtil.defaults(
+	                        tickModel.getModel('lineStyle').getLineStyle(),
+	                        {
+	                            stroke: angleAxisModel.get('axisLine.lineStyle.color')
+	                        }
+	                    )
+	                }
+	            ));
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _axisLabel: function (angleAxisModel, polar, ticksAngles, radiusExtent) {
+	            var axis = angleAxisModel.axis;
+
+	            var categoryData = angleAxisModel.get('data');
+
+	            var labelModel = angleAxisModel.getModel('axisLabel');
+	            var axisTextStyleModel = labelModel.getModel('textStyle');
+
+	            var labels = angleAxisModel.getFormattedLabels();
+
+	            var labelMargin = labelModel.get('margin');
+	            var labelsAngles = axis.getLabelsCoords();
+
+	            // Use length of ticksAngles because it may remove the last tick to avoid overlapping
+	            for (var i = 0; i < ticksAngles.length; i++) {
+	                var r = radiusExtent[1];
+	                var p = polar.coordToPoint([r + labelMargin, labelsAngles[i]]);
+	                var cx = polar.cx;
+	                var cy = polar.cy;
+
+	                var labelTextAlign = Math.abs(p[0] - cx) / r < 0.3
+	                    ? 'center' : (p[0] > cx ? 'left' : 'right');
+	                var labelTextBaseline = Math.abs(p[1] - cy) / r < 0.3
+	                    ? 'middle' : (p[1] > cy ? 'top' : 'bottom');
+
+	                var textStyleModel = axisTextStyleModel;
+	                if (categoryData && categoryData[i] && categoryData[i].textStyle) {
+	                    textStyleModel = new Model(
+	                        categoryData[i].textStyle, axisTextStyleModel
+	                    );
+	                }
+	                this.group.add(new graphic.Text({
+	                    style: {
+	                        x: p[0],
+	                        y: p[1],
+	                        fill: textStyleModel.getTextColor() || angleAxisModel.get('axisLine.lineStyle.color'),
+	                        text: labels[i],
+	                        textAlign: labelTextAlign,
+	                        textVerticalAlign: labelTextBaseline,
+	                        textFont: textStyleModel.getFont()
+	                    },
+	                    silent: true
+	                }));
+	            }
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _splitLine: function (angleAxisModel, polar, ticksAngles, radiusExtent) {
+	            var splitLineModel = angleAxisModel.getModel('splitLine');
+	            var lineStyleModel = splitLineModel.getModel('lineStyle');
+	            var lineColors = lineStyleModel.get('color');
+	            var lineCount = 0;
+
+	            lineColors = lineColors instanceof Array ? lineColors : [lineColors];
+
+	            var splitLines = [];
+
+	            for (var i = 0; i < ticksAngles.length; i++) {
+	                var colorIndex = (lineCount++) % lineColors.length;
+	                splitLines[colorIndex] = splitLines[colorIndex] || [];
+	                splitLines[colorIndex].push(new graphic.Line({
+	                    shape: getAxisLineShape(polar, radiusExtent[0], radiusExtent[1], ticksAngles[i])
+	                }));
+	            }
+
+	            // Simple optimization
+	            // Batching the lines if color are the same
+	            for (var i = 0; i < splitLines.length; i++) {
+	                this.group.add(graphic.mergePath(splitLines[i], {
+	                    style: zrUtil.defaults({
+	                        stroke: lineColors[i % lineColors.length]
+	                    }, lineStyleModel.getLineStyle()),
+	                    silent: true,
+	                    z: angleAxisModel.get('z')
+	                }));
+	            }
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _splitArea: function (angleAxisModel, polar, ticksAngles, radiusExtent) {
+
+	            var splitAreaModel = angleAxisModel.getModel('splitArea');
+	            var areaStyleModel = splitAreaModel.getModel('areaStyle');
+	            var areaColors = areaStyleModel.get('color');
+	            var lineCount = 0;
+
+	            areaColors = areaColors instanceof Array ? areaColors : [areaColors];
+
+	            var splitAreas = [];
+
+	            var RADIAN = Math.PI / 180;
+	            var prevAngle = -ticksAngles[0] * RADIAN;
+	            var r0 = Math.min(radiusExtent[0], radiusExtent[1]);
+	            var r1 = Math.max(radiusExtent[0], radiusExtent[1]);
+
+	            var clockwise = angleAxisModel.get('clockwise');
+
+	            for (var i = 1; i < ticksAngles.length; i++) {
+	                var colorIndex = (lineCount++) % areaColors.length;
+	                splitAreas[colorIndex] = splitAreas[colorIndex] || [];
+	                splitAreas[colorIndex].push(new graphic.Sector({
+	                    shape: {
+	                        cx: polar.cx,
+	                        cy: polar.cy,
+	                        r0: r0,
+	                        r: r1,
+	                        startAngle: prevAngle,
+	                        endAngle: -ticksAngles[i] * RADIAN,
+	                        clockwise: clockwise
+	                    },
+	                    silent: true
+	                }));
+	                prevAngle = -ticksAngles[i] * RADIAN;
+	            }
+
+	            // Simple optimization
+	            // Batching the lines if color are the same
+	            for (var i = 0; i < splitAreas.length; i++) {
+	                this.group.add(graphic.mergePath(splitAreas[i], {
+	                    style: zrUtil.defaults({
+	                        fill: areaColors[i % areaColors.length]
+	                    }, areaStyleModel.getAreaStyle()),
+	                    silent: true
+	                }));
+	            }
+	        }
+	    });
+
+
+/***/ },
+/* 292 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    __webpack_require__(284);
+
+	    __webpack_require__(293);
+
+
+/***/ },
+/* 293 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var graphic = __webpack_require__(43);
+	    var AxisBuilder = __webpack_require__(132);
+
+	    var axisBuilderAttrs = [
+	        'axisLine', 'axisLabel', 'axisTick', 'axisName'
+	    ];
+	    var selfBuilderAttrs = [
+	        'splitLine', 'splitArea'
+	    ];
+
+	    __webpack_require__(1).extendComponentView({
+
+	        type: 'radiusAxis',
+
+	        render: function (radiusAxisModel, ecModel) {
+	            this.group.removeAll();
+	            if (!radiusAxisModel.get('show')) {
+	                return;
+	            }
+	            var polarModel = ecModel.getComponent('polar', radiusAxisModel.get('polarIndex'));
+	            var angleAxis = polarModel.coordinateSystem.getAngleAxis();
+	            var radiusAxis = radiusAxisModel.axis;
+	            var polar = polarModel.coordinateSystem;
+	            var ticksCoords = radiusAxis.getTicksCoords();
+	            var axisAngle = angleAxis.getExtent()[0];
+	            var radiusExtent = radiusAxis.getExtent();
+
+	            var layout = layoutAxis(polar, radiusAxisModel, axisAngle);
+	            var axisBuilder = new AxisBuilder(radiusAxisModel, layout);
+	            zrUtil.each(axisBuilderAttrs, axisBuilder.add, axisBuilder);
+	            this.group.add(axisBuilder.getGroup());
+
+	            zrUtil.each(selfBuilderAttrs, function (name) {
+	                if (radiusAxisModel.get(name +'.show')) {
+	                    this['_' + name](radiusAxisModel, polar, axisAngle, radiusExtent, ticksCoords);
+	                }
+	            }, this);
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _splitLine: function (radiusAxisModel, polar, axisAngle, radiusExtent, ticksCoords) {
+	            var splitLineModel = radiusAxisModel.getModel('splitLine');
+	            var lineStyleModel = splitLineModel.getModel('lineStyle');
+	            var lineColors = lineStyleModel.get('color');
+	            var lineCount = 0;
+
+	            lineColors = lineColors instanceof Array ? lineColors : [lineColors];
+
+	            var splitLines = [];
+
+	            for (var i = 0; i < ticksCoords.length; i++) {
+	                var colorIndex = (lineCount++) % lineColors.length;
+	                splitLines[colorIndex] = splitLines[colorIndex] || [];
+	                splitLines[colorIndex].push(new graphic.Circle({
+	                    shape: {
+	                        cx: polar.cx,
+	                        cy: polar.cy,
+	                        r: ticksCoords[i]
+	                    },
+	                    silent: true
+	                }));
+	            }
+
+	            // Simple optimization
+	            // Batching the lines if color are the same
+	            for (var i = 0; i < splitLines.length; i++) {
+	                this.group.add(graphic.mergePath(splitLines[i], {
+	                    style: zrUtil.defaults({
+	                        stroke: lineColors[i % lineColors.length],
+	                        fill: null
+	                    }, lineStyleModel.getLineStyle()),
+	                    silent: true
+	                }));
+	            }
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _splitArea: function (radiusAxisModel, polar, axisAngle, radiusExtent, ticksCoords) {
+
+	            var splitAreaModel = radiusAxisModel.getModel('splitArea');
+	            var areaStyleModel = splitAreaModel.getModel('areaStyle');
+	            var areaColors = areaStyleModel.get('color');
+	            var lineCount = 0;
+
+	            areaColors = areaColors instanceof Array ? areaColors : [areaColors];
+
+	            var splitAreas = [];
+
+	            var prevRadius = ticksCoords[0];
+	            for (var i = 1; i < ticksCoords.length; i++) {
+	                var colorIndex = (lineCount++) % areaColors.length;
+	                splitAreas[colorIndex] = splitAreas[colorIndex] || [];
+	                splitAreas[colorIndex].push(new graphic.Sector({
+	                    shape: {
+	                        cx: polar.cx,
+	                        cy: polar.cy,
+	                        r0: prevRadius,
+	                        r: ticksCoords[i],
+	                        startAngle: 0,
+	                        endAngle: Math.PI * 2
+	                    },
+	                    silent: true
+	                }));
+	                prevRadius = ticksCoords[i];
+	            }
+
+	            // Simple optimization
+	            // Batching the lines if color are the same
+	            for (var i = 0; i < splitAreas.length; i++) {
+	                this.group.add(graphic.mergePath(splitAreas[i], {
+	                    style: zrUtil.defaults({
+	                        fill: areaColors[i % areaColors.length]
+	                    }, areaStyleModel.getAreaStyle()),
+	                    silent: true
+	                }));
+	            }
+	        }
+	    });
+
+	    /**
+	     * @inner
+	     */
+	    function layoutAxis(polar, radiusAxisModel, axisAngle) {
+	        return {
+	            position: [polar.cx, polar.cy],
+	            rotation: axisAngle / 180 * Math.PI,
+	            labelDirection: -1,
+	            tickDirection: -1,
+	            nameDirection: 1,
+	            labelRotation: radiusAxisModel.getModel('axisLabel').get('rotate'),
+	            // Over splitLine and splitArea
+	            z2: 1
+	        };
+	    }
+
+
+/***/ },
+/* 294 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    __webpack_require__(295);
+
+	    __webpack_require__(163);
+
+	    __webpack_require__(296);
+
+	    __webpack_require__(176);
+
+	    var echarts = __webpack_require__(1);
+	    var zrUtil = __webpack_require__(4);
+
+	    function makeAction(method, actionInfo) {
+	        actionInfo.update = 'updateView';
+	        echarts.registerAction(actionInfo, function (payload, ecModel) {
+	            var selected = {};
+
+	            ecModel.eachComponent(
+	                { mainType: 'geo', query: payload},
+	                function (geoModel) {
+	                    geoModel[method](payload.name);
+	                    var geo = geoModel.coordinateSystem;
+	                    zrUtil.each(geo.regions, function (region) {
+	                        selected[region.name] = geoModel.isSelected(region.name) || false;
+	                    });
+	                }
+	            );
+
+	            return {
+	                selected: selected,
+	                name: payload.name
+	            }
+	        });
+	    }
+
+	    makeAction('toggleSelected', {
+	        type: 'geoToggleSelect',
+	        event: 'geoselectchanged'
+	    });
+	    makeAction('select', {
+	        type: 'geoSelect',
+	        event: 'geoselected'
+	    });
+	    makeAction('unSelect', {
+	        type: 'geoUnSelect',
+	        event: 'geounselected'
+	    });
+
+
+/***/ },
+/* 295 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	    var modelUtil = __webpack_require__(5);
+	    var ComponentModel = __webpack_require__(19);
+	    var Model = __webpack_require__(12);
+	    var zrUtil = __webpack_require__(4);
+
+	    var selectableMixin = __webpack_require__(140);
+
+	    var geoCreator = __webpack_require__(163);
+
+	    var GeoModel = ComponentModel.extend({
+
+	        type: 'geo',
+
+	        /**
+	         * @type {module:echarts/coord/geo/Geo}
+	         */
+	        coordinateSystem: null,
+
+	        layoutMode: 'box',
+
+	        init: function (option) {
+	            ComponentModel.prototype.init.apply(this, arguments);
+
+	            // Default label emphasis `position` and `show`
+	            modelUtil.defaultEmphasis(
+	                option.label, ['position', 'show', 'textStyle', 'distance', 'formatter']
+	            );
+	        },
+
+	        optionUpdated: function () {
+	            var option = this.option;
+	            var self = this;
+
+	            option.regions = geoCreator.getFilledRegions(option.regions, option.map);
+
+	            this._optionModelMap = zrUtil.reduce(option.regions || [], function (obj, regionOpt) {
+	                if (regionOpt.name) {
+	                    obj[regionOpt.name] = new Model(regionOpt, self);
+	                }
+	                return obj;
+	            }, {});
+
+	            this.updateSelectedMap(option.regions);
+	        },
+
+	        defaultOption: {
+
+	            zlevel: 0,
+
+	            z: 0,
+
+	            show: true,
+
+	            left: 'center',
+
+	            top: 'center',
+
+
+	            // width:,
+	            // height:,
+	            // right
+	            // bottom
+
+	            // Aspect is width / height. Inited to be geoJson bbox aspect
+	            // This parameter is used for scale this aspect
+	            aspectScale: 0.75,
+
+	            ///// Layout with center and size
+	            // If you wan't to put map in a fixed size box with right aspect ratio
+	            // This two properties may more conveninet
+	            // layoutCenter: [50%, 50%]
+	            // layoutSize: 100
+
+
+	            silent: false,
+
+	            // Map type
+	            map: '',
+
+	            // Default on center of map
+	            center: null,
+
+	            zoom: 1,
+
+	            scaleLimit: null,
+
+	            // selectedMode: false
+
+	            label: {
+	                normal: {
+	                    show: false,
+	                    textStyle: {
+	                        color: '#000'
+	                    }
+	                },
+	                emphasis: {
+	                    show: true,
+	                    textStyle: {
+	                        color: 'rgb(100,0,0)'
+	                    }
+	                }
+	            },
+
+	            itemStyle: {
+	                normal: {
+	                    // color: 各异,
+	                    borderWidth: 0.5,
+	                    borderColor: '#444',
+	                    color: '#eee'
+	                },
+	                emphasis: {                 // 也是选中样式
+	                    color: 'rgba(255,215,0,0.8)'
+	                }
+	            },
+
+	            regions: []
+	        },
+
+	        /**
+	         * Get model of region
+	         * @param  {string} name
+	         * @return {module:echarts/model/Model}
+	         */
+	        getRegionModel: function (name) {
+	            return this._optionModelMap[name];
+	        },
+
+	        /**
+	         * Format label
+	         * @param {string} name Region name
+	         * @param {string} [status='normal'] 'normal' or 'emphasis'
+	         * @return {string}
+	         */
+	        getFormattedLabel: function (name, status) {
+	            var formatter = this.get('label.' + status + '.formatter');
+	            var params = {
+	                name: name
+	            };
+	            if (typeof formatter === 'function') {
+	                params.status = status;
+	                return formatter(params);
+	            }
+	            else if (typeof formatter === 'string') {
+	                return formatter.replace('{a}', params.seriesName);
+	            }
+	        },
+
+	        setZoom: function (zoom) {
+	            this.option.zoom = zoom;
+	        },
+
+	        setCenter: function (center) {
+	            this.option.center = center;
+	        }
+	    });
+
+	    zrUtil.mixin(GeoModel, selectableMixin);
+
+	    module.exports = GeoModel;
+
+
+/***/ },
+/* 296 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var MapDraw = __webpack_require__(173);
+
+	    module.exports = __webpack_require__(1).extendComponentView({
+
+	        type: 'geo',
+
+	        init: function (ecModel, api) {
+	            var mapDraw = new MapDraw(api, true);
+	            this._mapDraw = mapDraw;
+
+	            this.group.add(mapDraw.group);
+	        },
+
+	        render: function (geoModel, ecModel, api, payload) {
+	            // Not render if it is an toggleSelect action from self
+	            if (payload && payload.type === 'geoToggleSelect'
+	                && payload.from === this.uid
+	            ) {
+	                return;
+	            }
+
+	            var mapDraw = this._mapDraw;
+	            if (geoModel.get('show')) {
+	                mapDraw.draw(geoModel, ecModel, api, this, payload);
+	            }
+	            else {
+	                this._mapDraw.group.removeAll();
+	            }
+
+	            this.group.silent = geoModel.get('silent');
+	        }
+	    });
+
+
+/***/ },
+/* 297 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    __webpack_require__(298);
+	    __webpack_require__(301);
+	    __webpack_require__(302);
+
+	    var echarts = __webpack_require__(1);
+
+	    echarts.extendComponentView({
+	        type: 'single'
+	    });
+
+
+
+/***/ },
+/* 298 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * Single coordinate system creator.
+	 */
+
+
+	    var Single = __webpack_require__(299);
+
+	    /**
+	     * Create single coordinate system and inject it into seriesModel.
+	     *
+	     * @param {module:echarts/model/Global} ecModel
+	     * @param {module:echarts/ExtensionAPI} api
+	     * @return {Array.<module:echarts/coord/single/Single>}
+	     */
+	    function create(ecModel, api) {
+	        var singles = [];
+
+	        ecModel.eachComponent('singleAxis', function(axisModel, idx) {
+
+	            var single = new Single(axisModel, ecModel, api);
+	            single.name = 'single_' + idx;
+	            single.resize(axisModel, api);
+	            axisModel.coordinateSystem = single;
+	            singles.push(single);
+
+	        });
+
+	        ecModel.eachSeries(function (seriesModel) {
+	            if (seriesModel.get('coordinateSystem') === 'singleAxis') {
+	                var singleAxisIndex = seriesModel.get('singleAxisIndex') || 0;
+	                var axisModel = ecModel.getComponent('singleAxis', singleAxisIndex);
+	                seriesModel.coordinateSystem = axisModel.coordinateSystem;
+	            }
+	        });
+
+	        return singles;
+	    }
+
+	    __webpack_require__(26).register('single', {
+	        create: create,
+	        dimensions: Single.prototype.dimensions
+	    });
+
+
+/***/ },
+/* 299 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * Single coordinates system.
+	 */
+
+
+	    var SingleAxis = __webpack_require__(300);
+	    var axisHelper = __webpack_require__(114);
+	    var layout = __webpack_require__(21);
+
+	    /**
+	     * Create a single coordinates system.
+	     *
+	     * @param {module:echarts/coord/single/AxisModel} axisModel
+	     * @param {module:echarts/model/Global} ecModel
+	     * @param {module:echarts/ExtensionAPI} api
+	     */
+	    function Single(axisModel, ecModel, api) {
+
+	        /**
+	         * @type {string}
+	         * @readOnly
+	         */
+	        this.dimension = 'x';
+
+	        /**
+	         * Add it just for draw tooltip.
+	         *
+	         * @type {Array.<string>}
+	         * @readOnly
+	         */
+	        this.dimensions = ['x'];
+
+	        /**
+	         * @private
+	         * @type {module:echarts/coord/single/SingleAxis}.
+	         */
+	        this._axis = null;
+
+	        /**
+	         * @private
+	         * @type {module:zrender/core/BoundingRect}
+	         */
+	        this._rect;
+
+	        this._init(axisModel, ecModel, api);
+
+	        /**
+	         * @type {module:echarts/coord/single/AxisModel}
+	         */
+	        this._model = axisModel;
+	    }
+
+	    Single.prototype = {
+
+	        type: 'singleAxis',
+
+	        constructor: Single,
+
+	        /**
+	         * Initialize single coordinate system.
+	         *
+	         * @param  {module:echarts/coord/single/AxisModel} axisModel
+	         * @param  {module:echarts/model/Global} ecModel
+	         * @param  {module:echarts/ExtensionAPI} api
+	         * @private
+	         */
+	        _init: function (axisModel, ecModel, api) {
+
+	            var dim = this.dimension;
+
+	            var axis = new SingleAxis(
+	                dim,
+	                axisHelper.createScaleByModel(axisModel),
+	                [0, 0],
+	                axisModel.get('type'),
+	                axisModel.get('position')
+	            );
+
+	            var isCategory = axis.type === 'category';
+	            axis.onBand = isCategory && axisModel.get('boundaryGap');
+	            axis.inverse = axisModel.get('inverse');
+	            axis.orient = axisModel.get('orient');
+
+	            axisModel.axis = axis;
+	            axis.model = axisModel;
+	            this._axis = axis;
+	        },
+
+	        /**
+	         * Update axis scale after data processed
+	         * @param  {module:echarts/model/Global} ecModel
+	         * @param  {module:echarts/ExtensionAPI} api
+	         */
+	        update: function (ecModel, api) {
+	            this._updateAxisFromSeries(ecModel);
+	        },
+
+	        /**
+	         * Update the axis extent from series.
+	         *
+	         * @param  {module:echarts/model/Global} ecModel
+	         * @private
+	         */
+	        _updateAxisFromSeries: function (ecModel) {
+
+	            ecModel.eachSeries(function (seriesModel) {
+
+	                var data = seriesModel.getData();
+	                var dim = this.dimension;
+	                this._axis.scale.unionExtent(
+	                    data.getDataExtent(seriesModel.coordDimToDataDim(dim))
+	                );
+	                axisHelper.niceScaleExtent(this._axis, this._axis.model);
+	            }, this);
+	        },
+
+	        /**
+	         * Resize the single coordinate system.
+	         *
+	         * @param  {module:echarts/coord/single/AxisModel} axisModel
+	         * @param  {module:echarts/ExtensionAPI} api
+	         */
+	        resize: function (axisModel, api) {
+	            this._rect = layout.getLayoutRect(
+	                {
+	                    left: axisModel.get('left'),
+	                    top: axisModel.get('top'),
+	                    right: axisModel.get('right'),
+	                    bottom: axisModel.get('bottom'),
+	                    width: axisModel.get('width'),
+	                    height: axisModel.get('height')
+	                },
+	                {
+	                    width: api.getWidth(),
+	                    height: api.getHeight()
+	                }
+	            );
+
+	            this._adjustAxis();
+	        },
+
+	        /**
+	         * @return {module:zrender/core/BoundingRect}
+	         */
+	        getRect: function () {
+	            return this._rect;
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _adjustAxis: function () {
+
+	            var rect = this._rect;
+	            var axis = this._axis;
+
+	            var isHorizontal = axis.isHorizontal();
+	            var extent = isHorizontal ? [0, rect.width] : [0, rect.height];
+	            var idx =  axis.reverse ? 1 : 0;
+
+	            axis.setExtent(extent[idx], extent[1 - idx]);
+
+	            this._updateAxisTransform(axis, isHorizontal ? rect.x : rect.y);
+
+	        },
+
+	        /**
+	         * @param  {module:echarts/coord/single/SingleAxis} axis
+	         * @param  {number} coordBase
+	         */
+	        _updateAxisTransform: function (axis, coordBase) {
+
+	            var axisExtent = axis.getExtent();
+	            var extentSum = axisExtent[0] + axisExtent[1];
+	            var isHorizontal = axis.isHorizontal();
+
+	            axis.toGlobalCoord = isHorizontal ?
+	                function (coord) {
+	                    return coord + coordBase;
+	                } :
+	                function (coord) {
+	                    return extentSum - coord + coordBase;
+	                };
+
+	            axis.toLocalCoord = isHorizontal ?
+	                function (coord) {
+	                    return coord - coordBase;
+	                } :
+	                function (coord) {
+	                    return extentSum - coord + coordBase;
+	                };
+	        },
+
+	        /**
+	         * Get axis.
+	         *
+	         * @return {module:echarts/coord/single/SingleAxis}
+	         */
+	        getAxis: function () {
+	            return this._axis;
+	        },
+
+	        /**
+	         * Get axis, add it just for draw tooltip.
+	         *
+	         * @return {[type]} [description]
+	         */
+	        getBaseAxis: function () {
+	            return this._axis;
+	        },
+
+	        /**
+	         * If contain point.
+	         *
+	         * @param  {Array.<number>} point
+	         * @return {boolean}
+	         */
+	        containPoint: function (point) {
+	            var rect = this.getRect();
+	            var axis = this.getAxis();
+	            var orient = axis.orient;
+	            if (orient === 'horizontal') {
+	                return axis.contain(axis.toLocalCoord(point[0]))
+	                && (point[1] >= rect.y && point[1] <= (rect.y + rect.height));
+	            }
+	            else {
+	                return axis.contain(axis.toLocalCoord(point[1]))
+	                && (point[0] >= rect.y && point[0] <= (rect.y + rect.height));
+	            }
+	        },
+
+	        /**
+	         * @param {Array.<number>} point
+	         * @return {Array.<number>}
+	         */
+	        pointToData: function (point) {
+	            var axis = this.getAxis();
+	            return [axis.coordToData(axis.toLocalCoord(
+	                point[axis.orient === 'horizontal' ? 0 : 1]
+	            ))];
+	        },
+
+	        /**
+	         * Convert the series data to concrete point.
+	         *
+	         * @param  {number|Array.<number>} val
+	         * @return {Array.<number>}
+	         */
+	        dataToPoint: function (val) {
+	            var axis = this.getAxis();
+	            var rect = this.getRect();
+	            var pt = [];
+	            var idx = axis.orient === 'horizontal' ? 0 : 1;
+	            pt[idx] = axis.toGlobalCoord(axis.dataToCoord(+val));
+	            pt[1 - idx] = idx === 0 ? (rect.y + rect.height / 2) : (rect.x + rect.width / 2);
+	            return pt;
+	        }
+	    };
+
+	    module.exports = Single;
+
+
+
+/***/ },
+/* 300 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+	    var Axis = __webpack_require__(123);
+	    var axisHelper = __webpack_require__(114);
+
+	    /**
+	     * @constructor  module:echarts/coord/single/SingleAxis
+	     * @extends {module:echarts/coord/Axis}
+	     * @param {string} dim
+	     * @param {*} scale
+	     * @param {Array.<number>} coordExtent
+	     * @param {string} axisType
+	     * @param {string} position
+	     */
+	    var SingleAxis = function (dim, scale, coordExtent, axisType, position) {
+
+	        Axis.call(this, dim, scale, coordExtent);
+
+	        /**
+	         * Axis type
+	         * - 'category'
+	         * - 'value'
+	         * - 'time'
+	         * - 'log'
+	         * @type {string}
+	         */
+	        this.type = axisType || 'value';
+
+	        /**
+	         * Axis position
+	         *  - 'top'
+	         *  - 'bottom'
+	         *  - 'left'
+	         *  - 'right'
+	         *  @type {string}
+	         */
+	        this.position = position || 'bottom';
+
+	        /**
+	         * Axis orient
+	         *  - 'horizontal'
+	         *  - 'vertical'
+	         * @type {[type]}
+	         */
+	        this.orient = null;
+
+	        /**
+	         * @type {number}
+	         */
+	        this._labelInterval = null;
+
+	    };
+
+	    SingleAxis.prototype = {
+
+	        constructor: SingleAxis,
+
+	        /**
+	         * Axis model
+	         * @type {module:echarts/coord/single/AxisModel}
+	         */
+	        model: null,
+
+	        /**
+	         * Judge the orient of the axis.
+	         * @return {boolean}
+	         */
+	        isHorizontal: function () {
+	            var position = this.position;
+	            return position === 'top' || position === 'bottom';
+
+	        },
+
+	        /**
+	         * Get interval of the axis label.
+	         * @return {number}
+	         */
+	        getLabelInterval: function () {
+	            var labelInterval = this._labelInterval;
+	            if (!labelInterval) {
+	                var axisModel = this.model;
+	                var labelModel = axisModel.getModel('axisLabel');
+	                var interval = labelModel.get('interval');
+	                if (!(this.type === 'category' && interval === 'auto')) {
+
+	                    labelInterval = this._labelInterval = interval === 'auto' ? 0 : interval;
+	                    return labelInterval;
+	                }
+	                labelInterval = this._labelInterval =
+	                    axisHelper.getAxisLabelInterval(
+	                        zrUtil.map(this.scale.getTicks(), this.dataToCoord, this),
+	                        axisModel.getFormattedLabels(),
+	                        labelModel.getModel('textStyle').getFont(),
+	                        this.isHorizontal()
+	                    );
+	            }
+	            return labelInterval;
+	        },
+
+	        /**
+	         * Convert the local coord(processed by dataToCoord())
+	         * to global coord(concrete pixel coord).
+	         * designated by module:echarts/coord/single/Single.
+	         * @type {Function}
+	         */
+	        toGlobalCoord: null,
+
+	        /**
+	         * Convert the global coord to local coord.
+	         * designated by module:echarts/coord/single/Single.
+	         * @type {Function}
+	         */
+	        toLocalCoord: null
+
+	    };
+
+	    zrUtil.inherits(SingleAxis, Axis);
+
+	    module.exports = SingleAxis;
+
+
+/***/ },
+/* 301 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var AxisBuilder = __webpack_require__(132);
+	    var zrUtil =  __webpack_require__(4);
+	    var graphic = __webpack_require__(43);
+	    var getInterval = AxisBuilder.getInterval;
+	    var ifIgnoreOnTick = AxisBuilder.ifIgnoreOnTick;
+
+	    var axisBuilderAttrs = [
+	        'axisLine', 'axisLabel', 'axisTick', 'axisName'
+	    ];
+
+	    var selfBuilderAttr = 'splitLine'; 
+
+	    var AxisView = __webpack_require__(1).extendComponentView({
+
+	        type: 'singleAxis',
+
+	        render: function (axisModel, ecModel) {
+
+	            var group = this.group;
+
+	            group.removeAll();
+
+	            var layout =  axisLayout(axisModel);
+
+	            var axisBuilder = new AxisBuilder(axisModel, layout);
+
+	            zrUtil.each(axisBuilderAttrs, axisBuilder.add, axisBuilder);
+
+	            group.add(axisBuilder.getGroup());
+
+	            if (axisModel.get(selfBuilderAttr + '.show')) {
+	                this['_' + selfBuilderAttr](axisModel, layout.labelInterval);
+	            }
+	        },
+
+	        _splitLine: function(axisModel, labelInterval) {
+	            var axis = axisModel.axis;
+	            var splitLineModel = axisModel.getModel('splitLine');
+	            var lineStyleModel = splitLineModel.getModel('lineStyle');
+	            var lineWidth = lineStyleModel.get('width');
+	            var lineColors = lineStyleModel.get('color');
+	            var lineInterval = getInterval(splitLineModel, labelInterval);
+
+	            lineColors = lineColors instanceof Array ? lineColors : [lineColors];
+
+	            var gridRect = axisModel.coordinateSystem.getRect();
+	            var isHorizontal = axis.isHorizontal();
+
+	            var splitLines = [];
+	            var lineCount = 0;
+
+	            var ticksCoords = axis.getTicksCoords();
+
+	            var p1 = [];
+	            var p2 = [];
+
+	            for (var i = 0; i < ticksCoords.length; ++i) {
+	                if (ifIgnoreOnTick(axis, i, lineInterval)) {
+	                    continue;
+	                }
+	                var tickCoord = axis.toGlobalCoord(ticksCoords[i]);
+	                if (isHorizontal) {
+	                    p1[0] = tickCoord;
+	                    p1[1] = gridRect.y;
+	                    p2[0] = tickCoord;
+	                    p2[1] = gridRect.y + gridRect.height;
+	                }
+	                else {
+	                    p1[0] = gridRect.x;
+	                    p1[1] = tickCoord;
+	                    p2[0] = gridRect.x + gridRect.width;
+	                    p2[1] = tickCoord;
+	                }
+	                var colorIndex = (lineCount++) % lineColors.length;
+	                splitLines[colorIndex] = splitLines[colorIndex] || [];
+	                splitLines[colorIndex].push(new graphic.Line(
+	                    graphic.subPixelOptimizeLine({
+	                        shape: {
+	                            x1: p1[0],
+	                            y1: p1[1],
+	                            x2: p2[0],
+	                            y2: p2[1]
+	                        },
+	                        style: {
+	                            lineWidth: lineWidth
+	                        },
+	                        silent: true
+	                    })));
+	            }
+
+	            for (var i = 0; i < splitLines.length; ++i) {
+	                this.group.add(graphic.mergePath(splitLines[i], {
+	                    style: {
+	                        stroke: lineColors[i % lineColors.length],
+	                        lineDash: lineStyleModel.getLineDash(),
+	                        lineWidth: lineWidth
+	                    },
+	                    silent: true
+	                }));
+	            }
+	        }
+	    });
+
+	    function axisLayout(axisModel) {
+
+	        var single = axisModel.coordinateSystem;
+	        var axis = axisModel.axis;
+	        var layout = {};
+
+	        var axisPosition = axis.position;
+	        var orient = axis.orient;
+
+	        var rect = single.getRect();
+	        var rectBound = [rect.x, rect.x + rect.width, rect.y, rect.y + rect.height];
+
+	        var positionMap = {
+	            horizontal: {top: rectBound[2], bottom: rectBound[3]},
+	            vertical: {left: rectBound[0], right: rectBound[1]}
+	        };
+
+	        layout.position = [
+	            orient === 'vertical' 
+	                ? positionMap.vertical[axisPosition] 
+	                : rectBound[0],
+	            orient === 'horizontal' 
+	                ? positionMap.horizontal[axisPosition] 
+	                : rectBound[3]
+	        ];
+
+	        var r = {horizontal: 0, vertical: 1};
+	        layout.rotation = Math.PI / 2 * r[orient];
+
+	        var directionMap = {top: -1, bottom: 1, right: 1, left: -1};
+
+	        layout.labelDirection = layout.tickDirection  
+	            = layout.nameDirection 
+	            = directionMap[axisPosition];
+
+	        if (axisModel.getModel('axisTick').get('inside')) {
+	            layout.tickDirection = -layout.tickDirection;
+	        }
+
+	        if (axisModel.getModel('axisLabel').get('inside')) {
+	            layout.labelDirection = -layout.labelDirection;
+	        }
+
+	        var labelRotation = axisModel.getModel('axisLabel').get('rotate');
+	        layout.labelRotation = axisPosition === 'top' ? -labelRotation : labelRotation;
+
+	        layout.labelInterval = axis.getLabelInterval();
+
+	        layout.z2 = 1;
+
+	        return layout;
+	    }
+
+	    module.exports = AxisView;
+	    
+
+
+/***/ },
+/* 302 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var ComponentModel = __webpack_require__(19);
+	    var axisModelCreator = __webpack_require__(127);
+	    var zrUtil =  __webpack_require__(4);
+
+	    var AxisModel = ComponentModel.extend({
+
+	        type: 'singleAxis',
+
+	        layoutMode: 'box',
+
+	        /**
+	         * @type {module:echarts/coord/single/SingleAxis}
+	         */
+	        axis: null,
+
+	        /**
+	         * @type {module:echarts/coord/single/Single}
+	         */
+	        coordinateSystem: null
+
+	    });
+
+	    var defaultOption = {
+
+	        left: '5%',
+	        top: '5%',
+	        right: '5%',
+	        bottom: '5%',
+
+	        type: 'value',
+
+	        position: 'bottom',
+
+	        orient: 'horizontal',
+
+	        axisLine: {
+	            show: true,
+	            lineStyle: {
+	                width: 2,
+	                type: 'solid'
+	            }
+	        },
+
+	        axisTick: {
+	            show: true,
+	            length: 6,
+	            lineStyle: {
+	                width: 2
+	            }
+	        },
+
+	        axisLabel: {
+	            show: true,
+	            interval: 'auto'
+	        },
+
+	        splitLine: {
+	            show: true,
+	            lineStyle: {
+	                type: 'dashed',
+	                opacity: 0.2
+	            }
+	        }
+	    };
+
+	    function getAxisType(axisName, option) {
+	        return option.type || (option.data ? 'category' : 'value');
+	    }
+
+	    zrUtil.merge(AxisModel.prototype, __webpack_require__(129));
+
+	    axisModelCreator('single', AxisModel, getAxisType, defaultOption);
+
+	    module.exports = AxisModel;
+
+
+/***/ },
+/* 303 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * Brush component entry
+	 */
+
+
+	    __webpack_require__(1).registerPreprocessor(
+	        __webpack_require__(304)
+	    );
+
+	    __webpack_require__(305);
+	    __webpack_require__(310);
+	    __webpack_require__(311);
+	    __webpack_require__(312);
+
+	    __webpack_require__(313);
+
+
+
+/***/ },
+/* 304 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @file brush preprocessor
+	 */
+
+
+	    var zrUtil = __webpack_require__(4);
+
+	    var DEFAULT_TOOLBOX_BTNS = ['rect', 'polygon', 'keep', 'clear'];
+
+	    module.exports = function (option, isNew) {
+	        var brushComponents = option && option.brush;
+	        if (!zrUtil.isArray(brushComponents)) {
+	            brushComponents = brushComponents ? [brushComponents] : [];
+	        }
+
+	        if (!brushComponents.length) {
+	            return;
+	        }
+
+	        var brushComponentSpecifiedBtns = [];
+
+	        zrUtil.each(brushComponents, function (brushOpt) {
+	            var tbs = brushOpt.hasOwnProperty('toolbox')
+	                ? brushOpt.toolbox : [];
+
+	            if (tbs instanceof Array) {
+	                brushComponentSpecifiedBtns = brushComponentSpecifiedBtns.concat(tbs);
+	            }
+	        });
+
+	        var toolbox = option && option.toolbox;
+
+	        if (zrUtil.isArray(toolbox)) {
+	            toolbox = toolbox[0];
+	        }
+	        if (!toolbox) {
+	            toolbox = {feature: {}};
+	            option.toolbox = [toolbox];
+	        }
+
+	        var toolboxFeature = (toolbox.feature || (toolbox.feature = {}));
+	        var toolboxBrush = toolboxFeature.brush || (toolboxFeature.brush = {});
+	        var brushTypes = toolboxBrush.type || (toolboxBrush.type = []);
+
+	        brushTypes.push.apply(brushTypes, brushComponentSpecifiedBtns);
+
+	        removeDuplicate(brushTypes);
+
+	        if (isNew && !brushTypes.length) {
+	            brushTypes.push.apply(brushTypes, DEFAULT_TOOLBOX_BTNS);
+	        }
+	    };
+
+	    function removeDuplicate(arr) {
+	        var map = {};
+	        zrUtil.each(arr, function (val) {
+	            map[val] = 1;
+	        });
+	        arr.length = 0;
+	        zrUtil.each(map, function (flag, val) {
+	            arr.push(val);
+	        });
+	    }
+
+
+
+/***/ },
+/* 305 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @file Brush visual coding.
+	 */
+
+
+	    var echarts = __webpack_require__(1);
+	    var visualSolution = __webpack_require__(306);
+	    var zrUtil = __webpack_require__(4);
+	    var BoundingRect = __webpack_require__(9);
+	    var selector = __webpack_require__(307);
+	    var throttle = __webpack_require__(308);
+	    var brushHelper = __webpack_require__(309);
+
+	    var STATE_LIST = ['inBrush', 'outOfBrush'];
+	    var DISPATCH_METHOD = '__ecBrushSelect';
+	    var DISPATCH_FLAG = '__ecInBrushSelectEvent';
+	    var PRIORITY_BRUSH = echarts.PRIORITY.VISUAL.BRUSH;
+
+	    /**
+	     * Layout for visual, the priority higher than other layout, and before brush visual.
+	     */
+	    echarts.registerLayout(PRIORITY_BRUSH, function (ecModel, api, payload) {
+	        ecModel.eachComponent({mainType: 'brush'}, function (brushModel) {
+
+	            payload && payload.type === 'takeGlobalCursor' && brushModel.setBrushOption(
+	                payload.key === 'brush' ? payload.brushOption : {brushType: false}
+	            );
+
+	            brushModel.coordInfoList = brushHelper.makeCoordInfoList(brushModel.option, ecModel);
+
+	            brushHelper.parseInputRanges(brushModel, ecModel);
+	        });
+	    });
+
+	    /**
+	     * Register the visual encoding if this modules required.
+	     */
+	    echarts.registerVisual(PRIORITY_BRUSH, function (ecModel, api, payload) {
+
+	        var brushSelected = [];
+	        var throttleType;
+	        var throttleDelay;
+
+	        ecModel.eachComponent({mainType: 'brush'}, function (brushModel, brushIndex) {
+
+	            var thisBrushSelected = {
+	                brushId: brushModel.id,
+	                brushIndex: brushIndex,
+	                brushName: brushModel.name,
+	                areas: zrUtil.clone(brushModel.areas),
+	                selected: []
+	            };
+	            // Every brush component exists in event params, convenient
+	            // for user to find by index.
+	            brushSelected.push(thisBrushSelected);
+
+	            var brushOption = brushModel.option;
+	            var brushLink = brushOption.brushLink;
+	            var linkedSeriesMap = [];
+	            var selectedDataIndexForLink = [];
+	            var rangeInfoBySeries = [];
+	            var hasBrushExists = 0;
+
+	            if (!brushIndex) { // Only the first throttle setting works.
+	                throttleType = brushOption.throttleType;
+	                throttleDelay = brushOption.throttleDelay;
+	            }
+
+	            // Add boundingRect and selectors to range.
+	            var areas = zrUtil.map(brushModel.areas, function (area) {
+	                return bindSelector(
+	                    zrUtil.defaults(
+	                        {boundingRect: boundingRectBuilders[area.brushType](area)},
+	                        area
+	                    )
+	                );
+	            });
+
+	            var visualMappings = visualSolution.createVisualMappings(
+	                brushModel.option, STATE_LIST, function (mappingOption) {
+	                    mappingOption.mappingMethod = 'fixed';
+	                }
+	            );
+
+	            zrUtil.isArray(brushLink) && zrUtil.each(brushLink, function (seriesIndex) {
+	                linkedSeriesMap[seriesIndex] = 1;
+	            });
+
+	            function linkOthers(seriesIndex) {
+	                return brushLink === 'all' || linkedSeriesMap[seriesIndex];
+	            }
+
+	            // If no supported brush or no brush on the series,
+	            // all visuals should be in original state.
+	            function brushed(rangeInfoList) {
+	                return !!rangeInfoList.length;
+	            }
+
+	            /**
+	             * Logic for each series: (If the logic has to be modified one day, do it carefully!)
+	             *
+	             * ( brushed ┬ && ┬hasBrushExist ┬ && linkOthers  ) => StepA: ┬record, ┬ StepB: ┬visualByRecord.
+	             *   !brushed┘    ├hasBrushExist ┤                            └nothing,┘        ├visualByRecord.
+	             *                └!hasBrushExist┘                                              └nothing.
+	             * ( !brushed  && ┬hasBrushExist ┬ && linkOthers  ) => StepA:  nothing,  StepB: ┬visualByRecord.
+	             *                └!hasBrushExist┘                                              └nothing.
+	             * ( brushed ┬ &&                     !linkOthers ) => StepA:  nothing,  StepB: ┬visualByCheck.
+	             *   !brushed┘                                                                  └nothing.
+	             * ( !brushed  &&                     !linkOthers ) => StepA:  nothing,  StepB:  nothing.
+	             */
+
+	            // Step A
+	            ecModel.eachSeries(function (seriesModel, seriesIndex) {
+	                var rangeInfoList = rangeInfoBySeries[seriesIndex] = [];
+
+	                seriesModel.subType === 'parallel'
+	                    ? stepAParallel(seriesModel, seriesIndex, rangeInfoList)
+	                    : stepAOthers(seriesModel, seriesIndex, rangeInfoList);
+	            });
+
+	            function stepAParallel(seriesModel, seriesIndex) {
+	                var coordSys = seriesModel.coordinateSystem;
+	                hasBrushExists |= coordSys.hasAxisbrushed();
+
+	                linkOthers(seriesIndex) && coordSys.eachActiveState(
+	                    seriesModel.getData(),
+	                    function (activeState, dataIndex) {
+	                        activeState === 'active' && (selectedDataIndexForLink[dataIndex] = 1);
+	                    }
+	                );
+	            }
+
+	            function stepAOthers(seriesModel, seriesIndex, rangeInfoList) {
+	                var selectorsByBrushType = getSelectorsByBrushType(seriesModel);
+	                if (!selectorsByBrushType || brushModelNotControll(brushModel, seriesIndex)) {
+	                    return;
+	                }
+
+	                zrUtil.each(areas, function (area) {
+	                    selectorsByBrushType[area.brushType]
+	                        && brushHelper.controlSeries(area, brushModel, seriesModel)
+	                        && rangeInfoList.push(area);
+	                    hasBrushExists |= brushed(rangeInfoList);
+	                });
+
+	                if (linkOthers(seriesIndex) && brushed(rangeInfoList)) {
+	                    var data = seriesModel.getData();
+	                    data.each(function (dataIndex) {
+	                        if (checkInRange(selectorsByBrushType, rangeInfoList, data, dataIndex)) {
+	                            selectedDataIndexForLink[dataIndex] = 1;
+	                        }
+	                    });
+	                }
+	            }
+
+	            // Step B
+	            ecModel.eachSeries(function (seriesModel, seriesIndex) {
+	                var seriesBrushSelected = {
+	                    seriesId: seriesModel.id,
+	                    seriesIndex: seriesIndex,
+	                    seriesName: seriesModel.name,
+	                    dataIndex: []
+	                };
+	                // Every series exists in event params, convenient
+	                // for user to find series by seriesIndex.
+	                thisBrushSelected.selected.push(seriesBrushSelected);
+
+	                var selectorsByBrushType = getSelectorsByBrushType(seriesModel);
+	                var rangeInfoList = rangeInfoBySeries[seriesIndex];
+
+	                var data = seriesModel.getData();
+	                var getValueState = linkOthers(seriesIndex)
+	                    ? function (dataIndex) {
+	                        return selectedDataIndexForLink[dataIndex]
+	                            ? (seriesBrushSelected.dataIndex.push(data.getRawIndex(dataIndex)), 'inBrush')
+	                            : 'outOfBrush';
+	                    }
+	                    : function (dataIndex) {
+	                        return checkInRange(selectorsByBrushType, rangeInfoList, data, dataIndex)
+	                            ? (seriesBrushSelected.dataIndex.push(data.getRawIndex(dataIndex)), 'inBrush')
+	                            : 'outOfBrush';
+	                    };
+
+	                // If no supported brush or no brush, all visuals are in original state.
+	                (linkOthers(seriesIndex) ? hasBrushExists : brushed(rangeInfoList))
+	                    && visualSolution.applyVisual(
+	                        STATE_LIST, visualMappings, data, getValueState
+	                    );
+	            });
+
+	        });
+
+	        dispatchAction(api, throttleType, throttleDelay, brushSelected, payload);
+	    });
+
+	    function dispatchAction(api, throttleType, throttleDelay, brushSelected, payload) {
+	        // This event will not be triggered when `setOpion`, otherwise dead lock may
+	        // triggered when do `setOption` in event listener, which we do not find
+	        // satisfactory way to solve yet. Some considered resolutions:
+	        // (a) Diff with prevoius selected data ant only trigger event when changed.
+	        // But store previous data and diff precisely (i.e., not only by dataIndex, but
+	        // also detect value changes in selected data) might bring complexity or fragility.
+	        // (b) Use spectial param like `silent` to suppress event triggering.
+	        // But such kind of volatile param may be weird in `setOption`.
+	        if (!payload) {
+	            return;
+	        }
+
+	        var zr = api.getZr();
+	        if (zr[DISPATCH_FLAG]) {
+	            return;
+	        }
+
+	        if (!zr[DISPATCH_METHOD]) {
+	            zr[DISPATCH_METHOD] = doDispatch;
+	        }
+
+	        var fn = throttle.createOrUpdate(zr, DISPATCH_METHOD, throttleDelay, throttleType);
+
+	        fn(api, brushSelected);
+	    }
+
+	    function doDispatch(api, brushSelected) {
+	        if (!api.isDisposed()) {
+	            var zr = api.getZr();
+	            zr[DISPATCH_FLAG] = true;
+	            api.dispatchAction({
+	                type: 'brushSelect',
+	                batch: brushSelected
+	            });
+	            zr[DISPATCH_FLAG] = false;
+	        }
+	    }
+
+	    function checkInRange(selectorsByBrushType, rangeInfoList, data, dataIndex) {
+	        var itemLayout = data.getItemLayout(dataIndex);
+	        for (var i = 0, len = rangeInfoList.length; i < len; i++) {
+	            var area = rangeInfoList[i];
+	            if (selectorsByBrushType[area.brushType](
+	                itemLayout, area.selectors, area
+	            )) {
+	                return true;
+	            }
+	        }
+	    }
+
+	    function getSelectorsByBrushType(seriesModel) {
+	        var brushSelector = seriesModel.brushSelector;
+	        if (zrUtil.isString(brushSelector)) {
+	            var sels = [];
+	            zrUtil.each(selector, function (selectorsByElementType, brushType) {
+	                sels[brushType] = selectorsByElementType[brushSelector];
+	            });
+	            return sels;
+	        }
+	        else if (zrUtil.isFunction(brushSelector)) {
+	            var bSelector = {};
+	            zrUtil.each(selector, function (sel, brushType) {
+	                bSelector[brushType] = brushSelector;
+	            });
+	            return bSelector;
+	        }
+	        return brushSelector;
+	    }
+
+	    function brushModelNotControll(brushModel, seriesIndex) {
+	        var seriesIndices = brushModel.option.seriesIndex;
+	        return seriesIndices != null
+	            && seriesIndices !== 'all'
+	            && (
+	                zrUtil.isArray(seriesIndices)
+	                ? zrUtil.indexOf(seriesIndices, seriesIndex) < 0
+	                : seriesIndex !== seriesIndices
+	            );
+	    }
+
+	    function bindSelector(area) {
+	        var selectors = area.selectors = {};
+	        zrUtil.each(selector[area.brushType], function (selFn, elType) {
+	            // Do not use function binding or curry for performance.
+	            selectors[elType] = function (itemLayout) {
+	                return selFn(itemLayout, selectors, area);
+	            };
+	        });
+	        return area;
+	    }
+
+	    var boundingRectBuilders = {
+
+	        lineX: zrUtil.noop,
+
+	        lineY: zrUtil.noop,
+
+	        rect: function (area) {
+	            return getBoundingRectFromMinMax(area.range);
+	        },
+
+	        polygon: function (area) {
+	            var minMax;
+	            var range = area.range;
+
+	            for (var i = 0, len = range.length; i < len; i++) {
+	                minMax = minMax || [[Infinity, -Infinity], [Infinity, -Infinity]];
+	                var rg = range[i];
+	                rg[0] < minMax[0][0] && (minMax[0][0] = rg[0]);
+	                rg[0] > minMax[0][1] && (minMax[0][1] = rg[0]);
+	                rg[1] < minMax[1][0] && (minMax[1][0] = rg[1]);
+	                rg[1] > minMax[1][1] && (minMax[1][1] = rg[1]);
+	            }
+
+	            return minMax && getBoundingRectFromMinMax(minMax);
+	        }
+	    };
+
+	    function getBoundingRectFromMinMax(minMax) {
+	        return new BoundingRect(
+	            minMax[0][0],
+	            minMax[1][0],
+	            minMax[0][1] - minMax[0][0],
+	            minMax[1][1] - minMax[1][0]
+	        );
+	    }
+
+
+
+/***/ },
+/* 306 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @file Visual solution, for consistent option specification.
+	 */
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var VisualMapping = __webpack_require__(192);
+	    var each = zrUtil.each;
+
+	    function hasKeys(obj) {
+	        if (obj) {
+	            for (var name in obj){
+	                if (obj.hasOwnProperty(name)) {
+	                    return true;
+	                }
+	            }
+	        }
+	    }
+
+	    var visualSolution = {
+
+	        /**
+	         * @param {Object} option
+	         * @param {Array.<string>} stateList
+	         * @param {Function} [supplementVisualOption]
+	         * @return {Object} visualMappings <state, <visualType, module:echarts/visual/VisualMapping>>
+	         */
+	        createVisualMappings: function (option, stateList, supplementVisualOption) {
+	            var visualMappings = {};
+
+	            each(stateList, function (state) {
+	                var mappings = visualMappings[state] = createMappings();
+
+	                each(option[state], function (visualData, visualType) {
+	                    if (!VisualMapping.isValidType(visualType)) {
+	                        return;
+	                    }
+	                    var mappingOption = {
+	                        type: visualType,
+	                        visual: visualData
+	                    };
+	                    supplementVisualOption && supplementVisualOption(mappingOption, state);
+	                    mappings[visualType] = new VisualMapping(mappingOption);
+
+	                    // Prepare a alpha for opacity, for some case that opacity
+	                    // is not supported, such as rendering using gradient color.
+	                    if (visualType === 'opacity') {
+	                        mappingOption = zrUtil.clone(mappingOption);
+	                        mappingOption.type = 'colorAlpha';
+	                        mappings.__hidden.__alphaForOpacity = new VisualMapping(mappingOption);
+	                    }
+	                });
+	            });
+
+	            return visualMappings;
+
+	            function createMappings() {
+	                var Creater = function () {};
+	                // Make sure hidden fields will not be visited by
+	                // object iteration (with hasOwnProperty checking).
+	                Creater.prototype.__hidden = Creater.prototype;
+	                var obj = new Creater();
+	                return obj;
+	            }
+	        },
+
+	        /**
+	         * @param {Object} thisOption
+	         * @param {Object} newOption
+	         * @param {Array.<string>} keys
+	         */
+	        replaceVisualOption: function (thisOption, newOption, keys) {
+	            // Visual attributes merge is not supported, otherwise it
+	            // brings overcomplicated merge logic. See #2853. So if
+	            // newOption has anyone of these keys, all of these keys
+	            // will be reset. Otherwise, all keys remain.
+	            var has;
+	            zrUtil.each(keys, function (key) {
+	                if (newOption.hasOwnProperty(key) && hasKeys(newOption[key])) {
+	                    has = true;
+	                }
+	            });
+	            has && zrUtil.each(keys, function (key) {
+	                if (newOption.hasOwnProperty(key) && hasKeys(newOption[key])) {
+	                    thisOption[key] = zrUtil.clone(newOption[key]);
+	                }
+	                else {
+	                    delete thisOption[key];
+	                }
+	            });
+	        },
+
+	        /**
+	         * @param {Array.<string>} stateList
+	         * @param {Object} visualMappings <state, Object.<visualType, module:echarts/visual/VisualMapping>>
+	         * @param {module:echarts/data/List} list
+	         * @param {Function} getValueState param: valueOrIndex, return: state.
+	         * @param {object} [scope] Scope for getValueState
+	         * @param {string} [dimension] Concrete dimension, if used.
+	         */
+	        applyVisual: function (stateList, visualMappings, data, getValueState, scope, dimension) {
+	            var visualTypesMap = {};
+	            zrUtil.each(stateList, function (state) {
+	                var visualTypes = VisualMapping.prepareVisualTypes(visualMappings[state]);
+	                visualTypesMap[state] = visualTypes;
+	            });
+
+	            var dataIndex;
+
+	            function getVisual(key) {
+	                return data.getItemVisual(dataIndex, key);
+	            }
+
+	            function setVisual(key, value) {
+	                data.setItemVisual(dataIndex, key, value);
+	            }
+
+	            if (dimension == null) {
+	                data.each(eachItem, true);
+	            }
+	            else {
+	                data.each([dimension], eachItem, true);
+	            }
+
+	            function eachItem(valueOrIndex, index) {
+	                dataIndex = dimension == null ? valueOrIndex : index;
+	                var valueState = getValueState.call(scope, valueOrIndex);
+	                var mappings = visualMappings[valueState];
+	                var visualTypes = visualTypesMap[valueState];
+
+	                for (var i = 0, len = visualTypes.length; i < len; i++) {
+	                    var type = visualTypes[i];
+	                    mappings[type] && mappings[type].applyVisual(
+	                        valueOrIndex, getVisual, setVisual
+	                    );
+	                }
+	            }
+	        }
+	    };
+
+	    module.exports = visualSolution;
+
+
+
+/***/ },
+/* 307 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var polygonContain = __webpack_require__(167).contain;
+	    var BoundingRect = __webpack_require__(9);
+
+	    // Key of the first level is brushType: `line`, `rect`, `polygon`.
+	    // Key of the second level is chart element type: `point`, `rect`.
+	    // See moudule:echarts/component/helper/BrushController
+	    // function param:
+	    //      {Object} itemLayout fetch from data.getItemLayout(dataIndex)
+	    //      {Object} selectors {point: selector, rect: selector, ...}
+	    //      {Object} area {range: [[], [], ..], boudingRect}
+	    // function return:
+	    //      {boolean} Whether in the given brush.
+	    var selector = {
+	        lineX: getLineSelectors(0),
+	        lineY: getLineSelectors(1),
+	        rect: {
+	            point: function (itemLayout, selectors, area) {
+	                return area.boundingRect.contain(itemLayout[0], itemLayout[1]);
+	            },
+	            rect: function (itemLayout, selectors, area) {
+	                return area.boundingRect.intersect(makeBoundingRect(itemLayout));
+	            }
+	        },
+	        polygon: {
+	            point: function (itemLayout, selectors, area) {
+	                return area.boundingRect.contain(itemLayout[0], itemLayout[1])
+	                    && polygonContain(area.range, itemLayout[0], itemLayout[1]);
+	            },
+	            rect: function (itemLayout, selectors, area) {
+	                // FIXME
+	                // 随意写的，没有考察过效率。
+	                var points = area.range;
+
+	                if (points.length <= 1) {
+	                    return false;
+	                }
+
+	                var x = itemLayout.x;
+	                var y = itemLayout.y;
+	                var width = itemLayout.width;
+	                var height = itemLayout.height;
+	                var p = points[0];
+
+	                if (polygonContain(points, x, y)
+	                    || polygonContain(points, x + width, y)
+	                    || polygonContain(points, x, y + height)
+	                    || polygonContain(points, x + width, y + height)
+	                    || makeBoundingRect(itemLayout).contain(p[0], p[1])
+	                    || lineIntersectPolygon(x, y, x + width, y, points)
+	                    || lineIntersectPolygon(x, y, x, y + height, points)
+	                    || lineIntersectPolygon(x + width, y, x + width, y + height, points)
+	                    || lineIntersectPolygon(x, y + height, x + width, y + height, points)
+	                ) {
+	                    return true;
+	                }
+	            }
+	        }
+	    };
+
+	    function getLineSelectors(xyIndex) {
+	        var xy = ['x', 'y'];
+	        var wh = ['width', 'height'];
+
+	        return {
+	            point: function (itemLayout, selectors, area) {
+	                var range = area.range;
+	                var p = itemLayout[xyIndex];
+	                return inLineRange(p, range);
+	            },
+	            rect: function (itemLayout, selectors, area) {
+	                var range = area.range;
+	                return inLineRange(itemLayout[xy[xyIndex]], range)
+	                    || inLineRange(itemLayout[xy[xyIndex]] + itemLayout[wh[xyIndex]], range);
+	            }
+	        };
+	    }
+
+	    function inLineRange(p, range) {
+	        return range[0] <= p && p <= range[1];
+	    }
+
+	    // FIXME
+	    // 随意写的，没考察过效率。
+	    function lineIntersectPolygon(lx, ly, l2x, l2y, points) {
+	        for (var i = 0, p2 = points[points.length - 1]; i < points.length; i++) {
+	            var p = points[i];
+	            if (lineIntersect(lx, ly, l2x, l2y, p[0], p[1], p2[0], p2[1])) {
+	                return true;
+	            }
+	            p2 = p;
+	        }
+	    }
+
+	    // Code from <http://blog.csdn.net/rickliuxiao/article/details/6259322> with some fix.
+	    // See <https://en.wikipedia.org/wiki/Line%E2%80%93line_intersection>
+	    function lineIntersect(a1x, a1y, a2x, a2y, b1x, b1y, b2x, b2y) {
+	        var delta = determinant(a2x - a1x, b1x - b2x, a2y - a1y, b1y - b2y);
+	        if (nearZero(delta)) { // parallel
+	            return false;
+	        }
+	        var namenda = determinant(b1x - a1x, b1x - b2x, b1y - a1y, b1y - b2y) / delta;
+	        if (namenda < 0 || namenda > 1) {
+	            return false;
+	        }
+	        var miu = determinant(a2x - a1x, b1x - a1x, a2y - a1y, b1y - a1y) / delta;
+	        if (miu < 0 || miu > 1) {
+	            return false;
+	        }
+	        return true;
+	    }
+
+	    function nearZero(val) {
+	        return val <= (1e-6) && val >= -(1e-6);
+	    }
+
+	    function determinant(v1, v2, v3, v4) {
+	        return v1 * v4 - v2 * v3;
+	    }
+
+	    function makeBoundingRect(itemLayout) {
+	        var x = itemLayout.x;
+	        var y = itemLayout.y;
+	        var width = itemLayout.width;
+	        var height = itemLayout.height;
+
+	        // width and height might be negative.
+	        if (width < 0) {
+	            x = x + width;
+	            width = -width;
+	        }
+	        if (height < 0) {
+	            y = y + height;
+	            height = -height;
+	        }
+	        return new BoundingRect(x, y, width, height);
+	    }
+
+	    module.exports = selector;
+
+
+
+/***/ },
+/* 308 */
+/***/ function(module, exports) {
+
+	
+
+	    var lib = {};
+
+	    var ORIGIN_METHOD = '\0__throttleOriginMethod';
+	    var RATE = '\0__throttleRate';
+	    var THROTTLE_TYPE = '\0__throttleType';
+
+	    /**
+	     * @public
+	     * @param {(Function)} fn
+	     * @param {number} [delay=0] Unit: ms.
+	     * @param {boolean} [debounce=false]
+	     *        true: If call interval less than `delay`, only the last call works.
+	     *        false: If call interval less than `delay, call works on fixed rate.
+	     * @return {(Function)} throttled fn.
+	     */
+	    lib.throttle = function (fn, delay, debounce) {
+
+	        var currCall;
+	        var lastCall = 0;
+	        var lastExec = 0;
+	        var timer = null;
+	        var diff;
+	        var scope;
+	        var args;
+
+	        delay = delay || 0;
+
+	        function exec() {
+	            lastExec = (new Date()).getTime();
+	            timer = null;
+	            fn.apply(scope, args || []);
+	        }
+
+	        var cb = function () {
+	            currCall = (new Date()).getTime();
+	            scope = this;
+	            args = arguments;
+	            diff = currCall - (debounce ? lastCall : lastExec) - delay;
+
+	            clearTimeout(timer);
+
+	            if (debounce) {
+	                timer = setTimeout(exec, delay);
+	            }
+	            else {
+	                if (diff >= 0) {
+	                    exec();
+	                }
+	                else {
+	                    timer = setTimeout(exec, -diff);
+	                }
+	            }
+
+	            lastCall = currCall;
+	        };
+
+	        /**
+	         * Clear throttle.
+	         * @public
+	         */
+	        cb.clear = function () {
+	            if (timer) {
+	                clearTimeout(timer);
+	                timer = null;
+	            }
+	        };
+
+	        return cb;
+	    };
+
+	    /**
+	     * Create throttle method or update throttle rate.
+	     *
+	     * @example
+	     * ComponentView.prototype.render = function () {
+	     *     ...
+	     *     throttle.createOrUpdate(
+	     *         this,
+	     *         '_dispatchAction',
+	     *         this.model.get('throttle'),
+	     *         'fixRate'
+	     *     );
+	     * };
+	     * ComponentView.prototype.remove = function () {
+	     *     throttle.clear(this, '_dispatchAction');
+	     * };
+	     * ComponentView.prototype.dispose = function () {
+	     *     throttle.clear(this, '_dispatchAction');
+	     * };
+	     *
+	     * @public
+	     * @param {Object} obj
+	     * @param {string} fnAttr
+	     * @param {number} [rate]
+	     * @param {string} [throttleType='fixRate'] 'fixRate' or 'debounce'
+	     * @return {Function} throttled function.
+	     */
+	    lib.createOrUpdate = function (obj, fnAttr, rate, throttleType) {
+	        var fn = obj[fnAttr];
+
+	        if (!fn) {
+	            return;
+	        }
+
+	        var originFn = fn[ORIGIN_METHOD] || fn;
+	        var lastThrottleType = fn[THROTTLE_TYPE];
+	        var lastRate = fn[RATE];
+
+	        if (lastRate !== rate || lastThrottleType !== throttleType) {
+	            if (rate == null || !throttleType) {
+	                return (obj[fnAttr] = originFn);
+	            }
+
+	            fn = obj[fnAttr] = lib.throttle(
+	                originFn, rate, throttleType === 'debounce'
+	            );
+	            fn[ORIGIN_METHOD] = originFn;
+	            fn[THROTTLE_TYPE] = throttleType;
+	            fn[RATE] = rate;
+	        }
+
+	        return fn;
+	    };
+
+	    /**
+	     * Clear throttle. Example see throttle.createOrUpdate.
+	     *
+	     * @public
+	     * @param {Object} obj
+	     * @param {string} fnAttr
+	     */
+	    lib.clear = function (obj, fnAttr) {
+	        var fn = obj[fnAttr];
+	        if (fn && fn[ORIGIN_METHOD]) {
+	            obj[fnAttr] = fn[ORIGIN_METHOD];
+	        }
+	    };
+
+	    module.exports = lib;
+
+
+
+/***/ },
+/* 309 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+	    var graphic = __webpack_require__(43);
+
+	    var each = zrUtil.each;
+
+	    var helper = {};
+
+	    var COMPONENT_NAMES = ['geo', 'xAxis', 'yAxis'];
+	    var PANEL_ID_SPLIT = '--';
+	    var COORD_CONVERTS = ['dataToPoint', 'pointToData'];
+
+	    helper.parseOutputRanges = function (areas, coordInfoList, ecModel, rangesCoordInfo) {
+	        each(areas, function (area, index) {
+	            var panelId = area.panelId;
+
+	            if (panelId) {
+	                panelId = panelId.split(PANEL_ID_SPLIT);
+
+	                area[panelId[0] + 'Index'] = +panelId[1];
+
+	                var coordInfo = findCoordInfo(area, coordInfoList);
+	                area.coordRange = coordConvert[area.brushType](
+	                    1, coordInfo, area.range
+	                );
+	                rangesCoordInfo && (rangesCoordInfo[index] = coordInfo);
+	            }
+	        });
+	    };
+
+	    helper.parseInputRanges = function (brushModel, ecModel) {
+	        each(brushModel.areas, function (area) {
+	            var coordInfo = findCoordInfo(area, brushModel.coordInfoList);
+
+	            if (true) {
+	                zrUtil.assert(
+	                    !coordInfo || coordInfo === true || area.coordRange,
+	                    'coordRange must be specified when coord index specified.'
+	                );
+	                zrUtil.assert(
+	                    !coordInfo || coordInfo !== true || area.range,
+	                    'range must be specified.'
+	                );
+	            }
+
+	            area.range = area.range || [];
+
+	            // convert coordRange to global range and set panelId.
+	            if (coordInfo && coordInfo !== true) {
+	                area.range = coordConvert[area.brushType](
+	                    0, coordInfo, area.coordRange
+	                );
+	                area.panelId = coordInfo.panelId;
+	            }
+	        });
+	    };
+
+	    helper.makePanelOpts = function (coordInfoList) {
+	        var panelOpts = [];
+
+	        each(coordInfoList, function (coordInfo) {
+	            var coordSys = coordInfo.coordSys;
+	            var rect;
+
+	            if (coordInfo.geoIndex >= 0) {
+	                rect = coordSys.getBoundingRect().clone();
+	                // geo roam and zoom transform
+	                rect.applyTransform(graphic.getTransform(coordSys));
+	            }
+	            else { // xAxis or yAxis
+	                // grid is not Transformable.
+	                rect = coordSys.grid.getRect().clone();
+	            }
+
+	            panelOpts.push({panelId: coordInfo.panelId, rect: rect});
+	        });
+
+	        return panelOpts;
+	    };
+
+	    /**
+	     * @param {Object} option {xAxisIndex, yAxisIndex, geoIndex}
+	     * @param {module:echarts/model/Global} ecModel
+	     * @return {Array.<Obejct>} coordInfoList
+	     */
+	    helper.makeCoordInfoList = function (option, ecModel) {
+	        var coordInfoList = [];
+
+	        each(COMPONENT_NAMES, function (componentName) {
+	            var componentIndices = option[componentName + 'Index'];
+	            if (componentIndices == null || componentIndices === 'none') {
+	                return;
+	            }
+	            if (componentIndices !== 'all' && !zrUtil.isArray(componentIndices)) {
+	                componentIndices = [componentIndices];
+	            }
+
+	            ecModel.eachComponent({mainType: componentName}, function (componentModel, index) {
+	                if (componentIndices !== 'all' && zrUtil.indexOf(componentIndices, index) < 0) {
+	                    return;
+	                }
+
+	                var grid;
+	                var coordSys;
+
+	                (componentName === 'xAxis' || componentName === 'yAxis')
+	                    ? (grid = componentModel.axis.grid)
+	                    : (coordSys = componentModel.coordinateSystem); // geo
+
+	                var coordInfo;
+
+	                // Check duplicate and find cartesian when tranval to yAxis.
+	                for (var i = 0, len = coordInfoList.length; i < len; i++) {
+	                    var cInfo = coordInfoList[i];
+	                    if (true) {
+	                        zrUtil.assert(
+	                            cInfo[componentName + 'Index'] != index,
+	                            'Coord should not be defined duplicately: ' + componentName + index
+	                        );
+	                    }
+	                    // CoordSys is always required for `rect brush` or `polygon brush`.
+	                    // If both xAxisIndex and yAxisIndex specified, fetch cartesian by them.
+	                    if (componentName === 'yAxis' && !cInfo.yAxis && cInfo.xAxis) {
+	                        var aCoordSys = grid.getCartesian(cInfo.xAxisIndex, index);
+	                        if (aCoordSys) { // The yAxis and xAxis are in the same cartesian.
+	                            coordSys = aCoordSys;
+	                            coordInfo = cInfo;
+	                            break;
+	                        }
+	                    }
+	                }
+
+	                !coordInfo && coordInfoList.push(coordInfo = {});
+
+	                coordInfo[componentName] = componentModel;
+	                coordInfo[componentName + 'Index'] = index;
+	                // If both xAxisIndex and yAxisIndex specified, panelId only use yAxisIndex,
+	                // which is enough to index panel.
+	                coordInfo.panelId = componentName + PANEL_ID_SPLIT + index;
+	                coordInfo.coordSys = coordSys
+	                    // If only xAxisIndex or only yAxisIndex specified, find its first cartesian.
+	                    || grid.getCartesian(coordInfo.xAxisIndex, coordInfo.yAxisIndex);
+
+	                coordInfo.coordSys
+	                    ? (coordInfoList[componentName + 'Has'] = true)
+	                    : coordInfoList.pop(); // If a coordInfo exists originally, existance of coordSys is ensured.
+	            });
+	        });
+
+	        return coordInfoList;
+	    };
+
+	    helper.controlSeries = function (area, brushModel, seriesModel) {
+	        // Check whether area is bound in coord, and series do not belong to that coord.
+	        // If do not do this check, some brush (like lineX) will controll all axes.
+	        var coordInfo = findCoordInfo(area, brushModel.coordInfoList);
+	        return coordInfo === true || (coordInfo && coordInfo.coordSys === seriesModel.coordinateSystem);
+	    };
+
+	    function formatMinMax(minMax) {
+	        minMax[0] > minMax[1] && minMax.reverse();
+	        return minMax;
+	    }
+
+	    /**
+	     * If return Object, a coord found.
+	     * If reutrn true, global found.
+	     * Otherwise nothing found.
+	     *
+	     * @param {Object} area {<componentName>Index}
+	     * @param {Array} coordInfoList
+	     * @return {Obejct|boolean}
+	     */
+	    function findCoordInfo(area, coordInfoList) {
+	        var isGlobal = true;
+	        for (var j = 0; j < COMPONENT_NAMES.length; j++) {
+	            var indexAttr = COMPONENT_NAMES[j] + 'Index';
+	            if (area[indexAttr] >= 0) {
+	                isGlobal = false;
+	                for (var i = 0; i < coordInfoList.length; i++) {
+	                    if (coordInfoList[i][indexAttr] === area[indexAttr]) {
+	                        return coordInfoList[i];
+	                    }
+	                }
+	            }
+	        }
+	        return isGlobal;
+	    }
+
+	    function axisConvert(axisName, to, coordInfo, coordRange) {
+	        var axis = coordInfo.coordSys.getAxis(axisName);
+
+	        if (true) {
+	            zrUtil.assert(axis, 'line brush is only available in cartesian (grid).');
+	        }
+
+	        return formatMinMax(zrUtil.map([0, 1], function (i) {
+	            return to
+	                ? axis.coordToData(axis.toLocalCoord(coordRange[i]))
+	                : axis.toGlobalCoord(axis.dataToCoord(coordRange[i]));
+	        }));
+	    }
+
+	    var coordConvert = {
+
+	        lineX: zrUtil.curry(axisConvert, 'x'),
+
+	        lineY: zrUtil.curry(axisConvert, 'y'),
+
+	        rect: function (to, coordInfo, coordRange) {
+	            var coordSys = coordInfo.coordSys;
+	            var xminymin = coordSys[COORD_CONVERTS[to]]([coordRange[0][0], coordRange[1][0]]);
+	            var xmaxymax = coordSys[COORD_CONVERTS[to]]([coordRange[0][1], coordRange[1][1]]);
+	            return [
+	                formatMinMax([xminymin[0], xmaxymax[0]]),
+	                formatMinMax([xminymin[1], xmaxymax[1]])
+	            ];
+	        },
+
+	        polygon: function (to, coordInfo, coordRange) {
+	            var coordSys = coordInfo.coordSys;
+	            return zrUtil.map(coordRange, coordSys[COORD_CONVERTS[to]], coordSys);
+	        }
+	    };
+
+	    module.exports = helper;
+
+
+
+/***/ },
+/* 310 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @file Brush model
+	 */
+
+
+	    var echarts = __webpack_require__(1);
+	    var zrUtil = __webpack_require__(4);
+	    var visualSolution = __webpack_require__(306);
+	    var Model = __webpack_require__(12);
+
+	    var DEFAULT_OUT_OF_BRUSH_COLOR = ['#ddd'];
+
+	    var BrushModel = echarts.extendComponentModel({
+
+	        type: 'brush',
+
+	        dependencies: ['geo', 'grid', 'xAxis', 'yAxis', 'parallel', 'series'],
+
+	        /**
+	         * @protected
+	         */
+	        defaultOption: {
+	            // inBrush: null,
+	            // outOfBrush: null,
+	            toolbox: null,          // Default value see preprocessor.
+	            brushLink: null,        // Series indices array, broadcast using dataIndex.
+	                                    // or 'all', which means all series. 'none' or null means no series.
+	            seriesIndex: 'all',     // seriesIndex array, specify series controlled by this brush component.
+	            geoIndex: null,         //
+	            xAxisIndex: null,
+	            yAxisIndex: null,
+
+	            brushType: 'rect',      // Default brushType, see BrushController.
+	            brushMode: 'single',    // Default brushMode, 'single' or 'multiple'
+	            transformable: true,    // Default transformable.
+	            brushStyle: {           // Default brushStyle
+	                borderWidth: 1,
+	                color: 'rgba(120,140,180,0.3)',
+	                borderColor: 'rgba(120,140,180,0.8)',
+	                width: null         // do not use bursh width in line brush, but fetch from grid.
+	            },
+
+	            throttleType: 'fixRate',// Throttle in brushSelected event. 'fixRate' or 'debounce'.
+	                                    // If null, no throttle. Valid only in the first brush component
+	            throttleDelay: 0,       // Unit: ms, 0 means every event will be triggered.
+
+	            // FIXME
+	            // 试验效果
+	            removeOnClick: true
+	        },
+
+	        /**
+	         * @readOnly
+	         * @type {Array.<Object>}
+	         */
+	        areas: [],
+
+	        /**
+	         * Current activated brush type.
+	         * If null, brush is inactived.
+	         * see module:echarts/component/helper/BrushController
+	         * @readOnly
+	         * @type {string}
+	         */
+	        brushType: null,
+
+	        /**
+	         * Current brush opt.
+	         * see module:echarts/component/helper/BrushController
+	         * @readOnly
+	         * @type {Object}
+	         */
+	        brushOption: {},
+
+	        /**
+	         * @readOnly
+	         * @type {Array.<Object>}
+	         */
+	        coordInfoList: [],
+
+	        optionUpdated: function (newOption, isInit) {
+	            var thisOption = this.option;
+
+	            !isInit && visualSolution.replaceVisualOption(
+	                thisOption, newOption, ['inBrush', 'outOfBrush']
+	            );
+
+	            thisOption.inBrush = thisOption.inBrush || {};
+	            // Always give default visual, consider setOption at the second time.
+	            thisOption.outOfBrush = thisOption.outOfBrush || {color: DEFAULT_OUT_OF_BRUSH_COLOR};
+	        },
+
+	        /**
+	         * If ranges is null/undefined, range state remain.
+	         *
+	         * @param {Array.<Object>} [ranges]
+	         */
+	        setAreas: function (areas) {
+	            if (true) {
+	                zrUtil.assert(zrUtil.isArray(areas));
+	                zrUtil.each(areas, function (area) {
+	                    zrUtil.assert(area.brushType, 'Illegal areas');
+	                });
+	            }
+
+	            // If ranges is null/undefined, range state remain.
+	            // This helps user to dispatchAction({type: 'brush'}) with no areas
+	            // set but just want to get the current brush select info from a `brush` event.
+	            if (!areas) {
+	                return;
+	            }
+
+	            this.areas = zrUtil.map(areas, function (area) {
+	                return this._mergeBrushOption(area);
+	            }, this);
+	        },
+
+	        /**
+	         * see module:echarts/component/helper/BrushController
+	         * @param {Object} brushOption
+	         */
+	        setBrushOption: function (brushOption) {
+	            this.brushOption = this._mergeBrushOption(brushOption);
+	            this.brushType = this.brushOption.brushType;
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _mergeBrushOption: function (brushOption) {
+	            var option = this.option;
+	            return zrUtil.merge(
+	                {
+	                    brushType: option.brushType,
+	                    brushMode: option.brushMode,
+	                    transformable: option.transformable,
+	                    brushStyle: new Model(option.brushStyle).getItemStyle(),
+	                    removeOnClick: option.removeOnClick
+	                },
+	                brushOption,
+	                true
+	            );
+	        }
+
+	    });
+
+	    module.exports = BrushModel;
+
+
+
+/***/ },
+/* 311 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+	    var BrushController = __webpack_require__(233);
+	    var echarts = __webpack_require__(1);
+	    var brushHelper = __webpack_require__(309);
+
+	    module.exports = echarts.extendComponentView({
+
+	        type: 'brush',
+
+	        init: function (ecModel, api) {
+
+	            /**
+	             * @readOnly
+	             * @type {module:echarts/model/Global}
+	             */
+	            this.ecModel = ecModel;
+
+	            /**
+	             * @readOnly
+	             * @type {module:echarts/ExtensionAPI}
+	             */
+	            this.api = api;
+
+	            /**
+	             * @readOnly
+	             * @type {module:echarts/component/brush/BrushModel}
+	             */
+	            this.model;
+
+	            /**
+	             * @private
+	             * @type {module:echarts/component/helper/BrushController}
+	             */
+	            (this._brushController = new BrushController(api.getZr()))
+	                .on('brush', zrUtil.bind(this._onBrush, this))
+	                .mount();
+	        },
+
+	        /**
+	         * @override
+	         */
+	        render: function (brushModel) {
+	            this.model = brushModel;
+	            return updateController.apply(this, arguments);
+	        },
+
+	        /**
+	         * @override
+	         */
+	        updateView: updateController,
+
+	        /**
+	         * @override
+	         */
+	        updateLayout: updateController,
+
+	        /**
+	         * @override
+	         */
+	        updateVisual: updateController,
+
+	        /**
+	         * @override
+	         */
+	        dispose: function () {
+	            this._brushController.dispose();
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _onBrush: function (areas, opt) {
+	            var modelId = this.model.id;
+
+	            brushHelper.parseOutputRanges(areas, this.model.coordInfoList, this.ecModel);
+
+	            // Action is not dispatched on drag end, because the drag end
+	            // emits the same params with the last drag move event, and
+	            // may have some delay when using touch pad, which makes
+	            // animation not smooth (when using debounce).
+	            (!opt.isEnd || opt.removeOnClick) && this.api.dispatchAction({
+	                type: 'brush',
+	                brushId: modelId,
+	                areas: zrUtil.clone(areas),
+	                $from: modelId
+	            });
+	        }
+
+	    });
+
+	    function updateController(brushModel, ecModel, api, payload) {
+	        // Do not update controller when drawing.
+	        (!payload || payload.$from !== brushModel.id) && this._brushController
+	            .setPanels(brushHelper.makePanelOpts(brushModel.coordInfoList))
+	            .enableBrush(brushModel.brushOption)
+	            .updateCovers(brushModel.areas.slice());
+	    }
+
+
+
+/***/ },
+/* 312 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @file Brush action
+	 */
+
+
+	    var echarts = __webpack_require__(1);
+
+	    /**
+	     * payload: {
+	     *      brushIndex: number, or,
+	     *      brushId: string, or,
+	     *      brushName: string,
+	     *      globalRanges: Array
+	     * }
+	     */
+	    echarts.registerAction(
+	         {type: 'brush', event: 'brush', update: 'updateView'},
+	        function (payload, ecModel) {
+	            ecModel.eachComponent({mainType: 'brush', query: payload}, function (brushModel) {
+	                brushModel.setAreas(payload.areas);
+	            });
+	        }
+	    );
+
+	    /**
+	     * payload: {
+	     *      brushComponents: [
+	     *          {
+	     *              brushId,
+	     *              brushIndex,
+	     *              brushName,
+	     *              series: [
+	     *                  {
+	     *                      seriesId,
+	     *                      seriesIndex,
+	     *                      seriesName,
+	     *                      rawIndices: [21, 34, ...]
+	     *                  },
+	     *                  ...
+	     *              ]
+	     *          },
+	     *          ...
+	     *      ]
+	     * }
+	     */
+	    echarts.registerAction(
+	         {type: 'brushSelect', event: 'brushSelected', update: 'none'},
+	        function () {}
+	    );
+
+
+/***/ },
+/* 313 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var featureManager = __webpack_require__(314);
+	    var zrUtil = __webpack_require__(4);
+
+	    function Brush(model, ecModel, api) {
+	        this.model = model;
+	        this.ecModel = ecModel;
+	        this.api = api;
+
+	        /**
+	         * @private
+	         * @type {string}
+	         */
+	        this._brushType;
+
+	        /**
+	         * @private
+	         * @type {string}
+	         */
+	        this._brushMode;
+	    }
+
+	    Brush.defaultOption = {
+	        show: true,
+	        type: ['rect', 'polygon', 'lineX', 'lineY', 'keep', 'clear'],
+	        icon: {
+	            rect: 'M7.3,34.7 M0.4,10V-0.2h9.8 M89.6,10V-0.2h-9.8 M0.4,60v10.2h9.8 M89.6,60v10.2h-9.8 M12.3,22.4V10.5h13.1 M33.6,10.5h7.8 M49.1,10.5h7.8 M77.5,22.4V10.5h-13 M12.3,31.1v8.2 M77.7,31.1v8.2 M12.3,47.6v11.9h13.1 M33.6,59.5h7.6 M49.1,59.5 h7.7 M77.5,47.6v11.9h-13', // jshint ignore:line
+	            polygon: 'M55.2,34.9c1.7,0,3.1,1.4,3.1,3.1s-1.4,3.1-3.1,3.1 s-3.1-1.4-3.1-3.1S53.5,34.9,55.2,34.9z M50.4,51c1.7,0,3.1,1.4,3.1,3.1c0,1.7-1.4,3.1-3.1,3.1c-1.7,0-3.1-1.4-3.1-3.1 C47.3,52.4,48.7,51,50.4,51z M55.6,37.1l1.5-7.8 M60.1,13.5l1.6-8.7l-7.8,4 M59,19l-1,5.3 M24,16.1l6.4,4.9l6.4-3.3 M48.5,11.6 l-5.9,3.1 M19.1,12.8L9.7,5.1l1.1,7.7 M13.4,29.8l1,7.3l6.6,1.6 M11.6,18.4l1,6.1 M32.8,41.9 M26.6,40.4 M27.3,40.2l6.1,1.6 M49.9,52.1l-5.6-7.6l-4.9-1.2', // jshint ignore:line
+	            lineX: 'M15.2,30 M19.7,15.6V1.9H29 M34.8,1.9H40.4 M55.3,15.6V1.9H45.9 M19.7,44.4V58.1H29 M34.8,58.1H40.4 M55.3,44.4 V58.1H45.9 M12.5,20.3l-9.4,9.6l9.6,9.8 M3.1,29.9h16.5 M62.5,20.3l9.4,9.6L62.3,39.7 M71.9,29.9H55.4', // jshint ignore:line
+	            lineY: 'M38.8,7.7 M52.7,12h13.2v9 M65.9,26.6V32 M52.7,46.3h13.2v-9 M24.9,12H11.8v9 M11.8,26.6V32 M24.9,46.3H11.8v-9 M48.2,5.1l-9.3-9l-9.4,9.2 M38.9-3.9V12 M48.2,53.3l-9.3,9l-9.4-9.2 M38.9,62.3V46.4', // jshint ignore:line
+	            keep: 'M4,10.5V1h10.3 M20.7,1h6.1 M33,1h6.1 M55.4,10.5V1H45.2 M4,17.3v6.6 M55.6,17.3v6.6 M4,30.5V40h10.3 M20.7,40 h6.1 M33,40h6.1 M55.4,30.5V40H45.2 M21,18.9h62.9v48.6H21V18.9z', // jshint ignore:line
+	            clear: 'M22,14.7l30.9,31 M52.9,14.7L22,45.7 M4.7,16.8V4.2h13.1 M26,4.2h7.8 M41.6,4.2h7.8 M70.3,16.8V4.2H57.2 M4.7,25.9v8.6 M70.3,25.9v8.6 M4.7,43.2v12.6h13.1 M26,55.8h7.8 M41.6,55.8h7.8 M70.3,43.2v12.6H57.2' // jshint ignore:line
+	        },
+	        title: {
+	            rect: '矩形选择',
+	            polygon: '圈选',
+	            lineX: '横向选择',
+	            lineY: '纵向选择',
+	            keep: '保持选择',
+	            clear: '清除选择'
+	        }
+	    };
+
+	    var proto = Brush.prototype;
+
+	    proto.render =
+	    proto.updateView =
+	    proto.updateLayout = function (featureModel, ecModel, api) {
+	        var brushType;
+	        var brushMode;
+	        var isBrushed;
+
+	        ecModel.eachComponent({mainType: 'brush'}, function (brushModel) {
+	            brushType = brushModel.brushType;
+	            brushMode = brushModel.brushOption.brushMode || 'single';
+	            isBrushed |= brushModel.areas.length;
+	        });
+	        this._brushType = brushType;
+	        this._brushMode = brushMode;
+
+	        zrUtil.each(featureModel.get('type', true), function (type) {
+	            featureModel.setIconStatus(
+	                type,
+	                (
+	                    type === 'keep'
+	                    ? brushMode === 'multiple'
+	                    : type === 'clear'
+	                    ? isBrushed
+	                    : type === brushType
+	                ) ? 'emphasis' : 'normal'
+	            );
+	        });
+	    };
+
+	    proto.getIcons = function () {
+	        var model = this.model;
+	        var availableIcons = model.get('icon', true);
+	        var icons = {};
+	        zrUtil.each(model.get('type', true), function (type) {
+	            if (availableIcons[type]) {
+	                icons[type] = availableIcons[type];
+	            }
+	        });
+	        return icons;
+	    };
+
+	    proto.onclick = function (ecModel, api, type) {
+	        var api = this.api;
+	        var brushType = this._brushType;
+	        var brushMode = this._brushMode;
+
+	        if (type === 'clear') {
+	            api.dispatchAction({
+	                type: 'brush',
+	                // Clear all areas of all brush components.
+	                areas: []
+	            });
+	        }
+	        else {
+	            api.dispatchAction({
+	                type: 'takeGlobalCursor',
+	                key: 'brush',
+	                brushOption: {
+	                    brushType: type === 'keep'
+	                        ? brushType
+	                        : (brushType === type ? false : type),
+	                    brushMode: type === 'keep'
+	                        ? (brushMode === 'multiple' ? 'single' : 'multiple')
+	                        : brushMode
+	                }
+	            });
+	        }
+	    };
+
+	    featureManager.register('brush', Brush);
+
+	    module.exports = Brush;
+
+
+/***/ },
+/* 314 */
+/***/ function(module, exports) {
+
+	'use strict';
+
+
+	    var features = {};
+
+	    module.exports = {
+	        register: function (name, ctor) {
+	            features[name] = ctor;
+	        },
+
+	        get: function (name) {
+	            return features[name];
+	        }
+	    };
+
+
+/***/ },
+/* 315 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var echarts = __webpack_require__(1);
+	    var graphic = __webpack_require__(43);
+	    var layout = __webpack_require__(21);
+
+	    // Model
+	    echarts.extendComponentModel({
+
+	        type: 'title',
+
+	        layoutMode: {type: 'box', ignoreSize: true},
+
+	        defaultOption: {
+	            // 一级层叠
+	            zlevel: 0,
+	            // 二级层叠
+	            z: 6,
+	            show: true,
+
+	            text: '',
+	            // 超链接跳转
+	            // link: null,
+	            // 仅支持self | blank
+	            target: 'blank',
+	            subtext: '',
+
+	            // 超链接跳转
+	            // sublink: null,
+	            // 仅支持self | blank
+	            subtarget: 'blank',
+
+	            // 'center' ¦ 'left' ¦ 'right'
+	            // ¦ {number}（x坐标，单位px）
+	            left: 0,
+	            // 'top' ¦ 'bottom' ¦ 'center'
+	            // ¦ {number}（y坐标，单位px）
+	            top: 0,
+
+	            // 水平对齐
+	            // 'auto' | 'left' | 'right' | 'center'
+	            // 默认根据 left 的位置判断是左对齐还是右对齐
+	            // textAlign: null
+	            //
+	            // 垂直对齐
+	            // 'auto' | 'top' | 'bottom' | 'middle'
+	            // 默认根据 top 位置判断是上对齐还是下对齐
+	            // textBaseline: null
+
+	            backgroundColor: 'rgba(0,0,0,0)',
+
+	            // 标题边框颜色
+	            borderColor: '#ccc',
+
+	            // 标题边框线宽，单位px，默认为0（无边框）
+	            borderWidth: 0,
+
+	            // 标题内边距，单位px，默认各方向内边距为5，
+	            // 接受数组分别设定上右下左边距，同css
+	            padding: 5,
+
+	            // 主副标题纵向间隔，单位px，默认为10，
+	            itemGap: 10,
+	            textStyle: {
+	                fontSize: 18,
+	                fontWeight: 'bolder',
+	                color: '#333'
+	            },
+	            subtextStyle: {
+	                color: '#aaa'
+	            }
+	        }
+	    });
+
+	    // View
+	    echarts.extendComponentView({
+
+	        type: 'title',
+
+	        render: function (titleModel, ecModel, api) {
+	            this.group.removeAll();
+
+	            if (!titleModel.get('show')) {
+	                return;
+	            }
+
+	            var group = this.group;
+
+	            var textStyleModel = titleModel.getModel('textStyle');
+	            var subtextStyleModel = titleModel.getModel('subtextStyle');
+
+	            var textAlign = titleModel.get('textAlign');
+	            var textBaseline = titleModel.get('textBaseline');
+
+	            var textEl = new graphic.Text({
+	                style: {
+	                    text: titleModel.get('text'),
+	                    textFont: textStyleModel.getFont(),
+	                    fill: textStyleModel.getTextColor()
+	                },
+	                z2: 10
+	            });
+
+	            var textRect = textEl.getBoundingRect();
+
+	            var subText = titleModel.get('subtext');
+	            var subTextEl = new graphic.Text({
+	                style: {
+	                    text: subText,
+	                    textFont: subtextStyleModel.getFont(),
+	                    fill: subtextStyleModel.getTextColor(),
+	                    y: textRect.height + titleModel.get('itemGap'),
+	                    textBaseline: 'top'
+	                },
+	                z2: 10
+	            });
+
+	            var link = titleModel.get('link');
+	            var sublink = titleModel.get('sublink');
+
+	            textEl.silent = !link;
+	            subTextEl.silent = !sublink;
+
+	            if (link) {
+	                textEl.on('click', function () {
+	                    window.open(link, '_' + titleModel.get('target'));
+	                });
+	            }
+	            if (sublink) {
+	                subTextEl.on('click', function () {
+	                    window.open(sublink, '_' + titleModel.get('subtarget'));
+	                });
+	            }
+
+	            group.add(textEl);
+	            subText && group.add(subTextEl);
+	            // If no subText, but add subTextEl, there will be an empty line.
+
+	            var groupRect = group.getBoundingRect();
+	            var layoutOption = titleModel.getBoxLayoutParams();
+	            layoutOption.width = groupRect.width;
+	            layoutOption.height = groupRect.height;
+	            var layoutRect = layout.getLayoutRect(
+	                layoutOption, {
+	                    width: api.getWidth(),
+	                    height: api.getHeight()
+	                }, titleModel.get('padding')
+	            );
+	            // Adjust text align based on position
+	            if (!textAlign) {
+	                // Align left if title is on the left. center and right is same
+	                textAlign = titleModel.get('left') || titleModel.get('right');
+	                if (textAlign === 'middle') {
+	                    textAlign = 'center';
+	                }
+	                // Adjust layout by text align
+	                if (textAlign === 'right') {
+	                    layoutRect.x += layoutRect.width;
+	                }
+	                else if (textAlign === 'center') {
+	                    layoutRect.x += layoutRect.width / 2;
+	                }
+	            }
+	            if (!textBaseline) {
+	                textBaseline = titleModel.get('top') || titleModel.get('bottom');
+	                if (textBaseline === 'center') {
+	                    textBaseline = 'middle';
+	                }
+	                if (textBaseline === 'bottom') {
+	                    layoutRect.y += layoutRect.height;
+	                }
+	                else if (textBaseline === 'middle') {
+	                    layoutRect.y += layoutRect.height / 2;
+	                }
+
+	                textBaseline = textBaseline || 'top';
+	            }
+
+	            group.attr('position', [layoutRect.x, layoutRect.y]);
+	            var alignStyle = {
+	                textAlign: textAlign,
+	                textVerticalAlign: textBaseline
+	            };
+	            textEl.setStyle(alignStyle);
+	            subTextEl.setStyle(alignStyle);
+
+	            // Render background
+	            // Get groupRect again because textAlign has been changed
+	            groupRect = group.getBoundingRect();
+	            var padding = layoutRect.margin;
+	            var style = titleModel.getItemStyle(['color', 'opacity']);
+	            style.fill = titleModel.get('backgroundColor');
+	            var rect = new graphic.Rect({
+	                shape: {
+	                    x: groupRect.x - padding[3],
+	                    y: groupRect.y - padding[0],
+	                    width: groupRect.width + padding[1] + padding[3],
+	                    height: groupRect.height + padding[0] + padding[2]
+	                },
+	                style: style,
+	                silent: true
+	            });
+	            graphic.subPixelOptimizeRect(rect);
+
+	            group.add(rect);
+	        }
+	    });
+
+
+/***/ },
+/* 316 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * DataZoom component entry
+	 */
+
+
+	    __webpack_require__(317);
+
+	    __webpack_require__(318);
+	    __webpack_require__(320);
+
+	    __webpack_require__(321);
+	    __webpack_require__(322);
+
+	    __webpack_require__(324);
+	    __webpack_require__(325);
+
+	    __webpack_require__(327);
+	    __webpack_require__(328);
+
+
+
+/***/ },
+/* 317 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    __webpack_require__(19).registerSubTypeDefaulter('dataZoom', function (option) {
+	        // Default 'slider' when no type specified.
+	        return 'slider';
+	    });
+
+
+
+/***/ },
+/* 318 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @file Data zoom model
+	 */
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var env = __webpack_require__(2);
+	    var echarts = __webpack_require__(1);
+	    var modelUtil = __webpack_require__(5);
+	    var AxisProxy = __webpack_require__(319);
+	    var each = zrUtil.each;
+	    var eachAxisDim = modelUtil.eachAxisDim;
+
+	    var DataZoomModel = echarts.extendComponentModel({
+
+	        type: 'dataZoom',
+
+	        dependencies: [
+	            'xAxis', 'yAxis', 'zAxis', 'radiusAxis', 'angleAxis', 'series'
+	        ],
+
+	        /**
+	         * @protected
+	         */
+	        defaultOption: {
+	            zlevel: 0,
+	            z: 4,                   // Higher than normal component (z: 2).
+	            orient: null,           // Default auto by axisIndex. Possible value: 'horizontal', 'vertical'.
+	            xAxisIndex: null,       // Default the first horizontal category axis.
+	            yAxisIndex: null,       // Default the first vertical category axis.
+	            angleAxisIndex: null,
+	            radiusAxisIndex: null,
+	            filterMode: 'filter',   // Possible values: 'filter' or 'empty'.
+	                                    // 'filter': data items which are out of window will be removed.
+	                                    //           This option is applicable when filtering outliers.
+	                                    // 'empty': data items which are out of window will be set to empty.
+	                                    //          This option is applicable when user should not neglect
+	                                    //          that there are some data items out of window.
+	                                    // Taking line chart as an example, line will be broken in
+	                                    // the filtered points when filterModel is set to 'empty', but
+	                                    // be connected when set to 'filter'.
+
+	            throttle: null,         // Dispatch action by the fixed rate, avoid frequency.
+	                                    // default 100. Do not throttle when use null/undefined.
+	                                    // If animation === true and animationDurationUpdate > 0,
+	                                    // default value is 100, otherwise 20.
+	            start: 0,               // Start percent. 0 ~ 100
+	            end: 100,               // End percent. 0 ~ 100
+	            startValue: null,       // Start value. If startValue specified, start is ignored.
+	            endValue: null          // End value. If endValue specified, end is ignored.
+	        },
+
+	        /**
+	         * @override
+	         */
+	        init: function (option, parentModel, ecModel) {
+
+	            /**
+	             * key like x_0, y_1
+	             * @private
+	             * @type {Object}
+	             */
+	            this._dataIntervalByAxis = {};
+
+	            /**
+	             * @private
+	             */
+	            this._dataInfo = {};
+
+	            /**
+	             * key like x_0, y_1
+	             * @private
+	             */
+	            this._axisProxies = {};
+
+	            /**
+	             * @readOnly
+	             */
+	            this.textStyleModel;
+
+	            /**
+	             * @private
+	             */
+	            this._autoThrottle = true;
+
+	            var rawOption = retrieveRaw(option);
+
+	            this.mergeDefaultAndTheme(option, ecModel);
+
+	            this.doInit(rawOption);
+	        },
+
+	        /**
+	         * @override
+	         */
+	        mergeOption: function (newOption) {
+	            var rawOption = retrieveRaw(newOption);
+
+	            //FIX #2591
+	            zrUtil.merge(this.option, newOption, true);
+
+	            this.doInit(rawOption);
+	        },
+
+	        /**
+	         * @protected
+	         */
+	        doInit: function (rawOption) {
+	            var thisOption = this.option;
+
+	            // Disable realtime view update if canvas is not supported.
+	            if (!env.canvasSupported) {
+	                thisOption.realtime = false;
+	            }
+
+	            this._setDefaultThrottle(rawOption);
+
+	            processRangeProp('start', 'startValue', rawOption, thisOption);
+	            processRangeProp('end', 'endValue', rawOption, thisOption);
+
+	            this.textStyleModel = this.getModel('textStyle');
+
+	            this._resetTarget();
+
+	            this._giveAxisProxies();
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _giveAxisProxies: function () {
+	            var axisProxies = this._axisProxies;
+
+	            this.eachTargetAxis(function (dimNames, axisIndex, dataZoomModel, ecModel) {
+	                var axisModel = this.dependentModels[dimNames.axis][axisIndex];
+
+	                // If exists, share axisProxy with other dataZoomModels.
+	                var axisProxy = axisModel.__dzAxisProxy || (
+	                    // Use the first dataZoomModel as the main model of axisProxy.
+	                    axisModel.__dzAxisProxy = new AxisProxy(
+	                        dimNames.name, axisIndex, this, ecModel
+	                    )
+	                );
+	                // FIXME
+	                // dispose __dzAxisProxy
+
+	                axisProxies[dimNames.name + '_' + axisIndex] = axisProxy;
+	            }, this);
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _resetTarget: function () {
+	            var thisOption = this.option;
+
+	            var autoMode = this._judgeAutoMode();
+
+	            eachAxisDim(function (dimNames) {
+	                var axisIndexName = dimNames.axisIndex;
+	                thisOption[axisIndexName] = modelUtil.normalizeToArray(
+	                    thisOption[axisIndexName]
+	                );
+	            }, this);
+
+	            if (autoMode === 'axisIndex') {
+	                this._autoSetAxisIndex();
+	            }
+	            else if (autoMode === 'orient') {
+	                this._autoSetOrient();
+	            }
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _judgeAutoMode: function () {
+	            // Auto set only works for setOption at the first time.
+	            // The following is user's reponsibility. So using merged
+	            // option is OK.
+	            var thisOption = this.option;
+
+	            var hasIndexSpecified = false;
+	            eachAxisDim(function (dimNames) {
+	                // When user set axisIndex as a empty array, we think that user specify axisIndex
+	                // but do not want use auto mode. Because empty array may be encountered when
+	                // some error occured.
+	                if (thisOption[dimNames.axisIndex] != null) {
+	                    hasIndexSpecified = true;
+	                }
+	            }, this);
+
+	            var orient = thisOption.orient;
+
+	            if (orient == null && hasIndexSpecified) {
+	                return 'orient';
+	            }
+	            else if (!hasIndexSpecified) {
+	                if (orient == null) {
+	                    thisOption.orient = 'horizontal';
+	                }
+	                return 'axisIndex';
+	            }
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _autoSetAxisIndex: function () {
+	            var autoAxisIndex = true;
+	            var orient = this.get('orient', true);
+	            var thisOption = this.option;
+
+	            if (autoAxisIndex) {
+	                // Find axis that parallel to dataZoom as default.
+	                var dimNames = orient === 'vertical'
+	                    ? {dim: 'y', axisIndex: 'yAxisIndex', axis: 'yAxis'}
+	                    : {dim: 'x', axisIndex: 'xAxisIndex', axis: 'xAxis'};
+
+	                if (this.dependentModels[dimNames.axis].length) {
+	                    thisOption[dimNames.axisIndex] = [0];
+	                    autoAxisIndex = false;
+	                }
+	            }
+
+	            if (autoAxisIndex) {
+	                // Find the first category axis as default. (consider polar)
+	                eachAxisDim(function (dimNames) {
+	                    if (!autoAxisIndex) {
+	                        return;
+	                    }
+	                    var axisIndices = [];
+	                    var axisModels = this.dependentModels[dimNames.axis];
+	                    if (axisModels.length && !axisIndices.length) {
+	                        for (var i = 0, len = axisModels.length; i < len; i++) {
+	                            if (axisModels[i].get('type') === 'category') {
+	                                axisIndices.push(i);
+	                            }
+	                        }
+	                    }
+	                    thisOption[dimNames.axisIndex] = axisIndices;
+	                    if (axisIndices.length) {
+	                        autoAxisIndex = false;
+	                    }
+	                }, this);
+	            }
+
+	            if (autoAxisIndex) {
+	                // FIXME
+	                // 这里是兼容ec2的写法（没指定xAxisIndex和yAxisIndex时把scatter和双数值轴折柱纳入dataZoom控制），
+	                // 但是实际是否需要Grid.js#getScaleByOption来判断（考虑time，log等axis type）？
+
+	                // If both dataZoom.xAxisIndex and dataZoom.yAxisIndex is not specified,
+	                // dataZoom component auto adopts series that reference to
+	                // both xAxis and yAxis which type is 'value'.
+	                this.ecModel.eachSeries(function (seriesModel) {
+	                    if (this._isSeriesHasAllAxesTypeOf(seriesModel, 'value')) {
+	                        eachAxisDim(function (dimNames) {
+	                            var axisIndices = thisOption[dimNames.axisIndex];
+	                            var axisIndex = seriesModel.get(dimNames.axisIndex);
+	                            if (zrUtil.indexOf(axisIndices, axisIndex) < 0) {
+	                                axisIndices.push(axisIndex);
+	                            }
+	                        });
+	                    }
+	                }, this);
+	            }
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _autoSetOrient: function () {
+	            var dim;
+
+	            // Find the first axis
+	            this.eachTargetAxis(function (dimNames) {
+	                !dim && (dim = dimNames.name);
+	            }, this);
+
+	            this.option.orient = dim === 'y' ? 'vertical' : 'horizontal';
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _isSeriesHasAllAxesTypeOf: function (seriesModel, axisType) {
+	            // FIXME
+	            // 需要series的xAxisIndex和yAxisIndex都首先自动设置上。
+	            // 例如series.type === scatter时。
+
+	            var is = true;
+	            eachAxisDim(function (dimNames) {
+	                var seriesAxisIndex = seriesModel.get(dimNames.axisIndex);
+	                var axisModel = this.dependentModels[dimNames.axis][seriesAxisIndex];
+
+	                if (!axisModel || axisModel.get('type') !== axisType) {
+	                    is = false;
+	                }
+	            }, this);
+	            return is;
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _setDefaultThrottle: function (rawOption) {
+	            // When first time user set throttle, auto throttle ends.
+	            if (rawOption.hasOwnProperty('throttle')) {
+	                this._autoThrottle = false;
+	            }
+	            if (this._autoThrottle) {
+	                var globalOption = this.ecModel.option;
+	                this.option.throttle =
+	                    (globalOption.animation && globalOption.animationDurationUpdate > 0)
+	                    ? 100 : 20;
+	            }
+	        },
+
+	        /**
+	         * @public
+	         */
+	        getFirstTargetAxisModel: function () {
+	            var firstAxisModel;
+	            eachAxisDim(function (dimNames) {
+	                if (firstAxisModel == null) {
+	                    var indices = this.get(dimNames.axisIndex);
+	                    if (indices.length) {
+	                        firstAxisModel = this.dependentModels[dimNames.axis][indices[0]];
+	                    }
+	                }
+	            }, this);
+
+	            return firstAxisModel;
+	        },
+
+	        /**
+	         * @public
+	         * @param {Function} callback param: axisModel, dimNames, axisIndex, dataZoomModel, ecModel
+	         */
+	        eachTargetAxis: function (callback, context) {
+	            var ecModel = this.ecModel;
+	            eachAxisDim(function (dimNames) {
+	                each(
+	                    this.get(dimNames.axisIndex),
+	                    function (axisIndex) {
+	                        callback.call(context, dimNames, axisIndex, this, ecModel);
+	                    },
+	                    this
+	                );
+	            }, this);
+	        },
+
+	        getAxisProxy: function (dimName, axisIndex) {
+	            return this._axisProxies[dimName + '_' + axisIndex];
+	        },
+
+	        /**
+	         * If not specified, set to undefined.
+	         *
+	         * @public
+	         * @param {Object} opt
+	         * @param {number} [opt.start]
+	         * @param {number} [opt.end]
+	         * @param {number} [opt.startValue]
+	         * @param {number} [opt.endValue]
+	         */
+	        setRawRange: function (opt) {
+	            each(['start', 'end', 'startValue', 'endValue'], function (name) {
+	                // If any of those prop is null/undefined, we should alos set
+	                // them, because only one pair between start/end and
+	                // startValue/endValue can work.
+	                this.option[name] = opt[name];
+	            }, this);
+	        },
+
+	        /**
+	         * @public
+	         * @return {Array.<number>} [startPercent, endPercent]
+	         */
+	        getPercentRange: function () {
+	            var axisProxy = this.findRepresentativeAxisProxy();
+	            if (axisProxy) {
+	                return axisProxy.getDataPercentWindow();
+	            }
+	        },
+
+	        /**
+	         * @public
+	         * For example, chart.getModel().getComponent('dataZoom').getValueRange('y', 0);
+	         *
+	         * @param {string} [axisDimName]
+	         * @param {number} [axisIndex]
+	         * @return {Array.<number>} [startValue, endValue]
+	         */
+	        getValueRange: function (axisDimName, axisIndex) {
+	            if (axisDimName == null && axisIndex == null) {
+	                var axisProxy = this.findRepresentativeAxisProxy();
+	                if (axisProxy) {
+	                    return axisProxy.getDataValueWindow();
+	                }
+	            }
+	            else {
+	                return this.getAxisProxy(axisDimName, axisIndex).getDataValueWindow();
+	            }
+	        },
+
+	        /**
+	         * @public
+	         * @return {module:echarts/component/dataZoom/AxisProxy}
+	         */
+	        findRepresentativeAxisProxy: function () {
+	            // Find the first hosted axisProxy
+	            var axisProxies = this._axisProxies;
+	            for (var key in axisProxies) {
+	                if (axisProxies.hasOwnProperty(key) && axisProxies[key].hostedBy(this)) {
+	                    return axisProxies[key];
+	                }
+	            }
+
+	            // If no hosted axis find not hosted axisProxy.
+	            // Consider this case: dataZoomModel1 and dataZoomModel2 control the same axis,
+	            // and the option.start or option.end settings are different. The percentRange
+	            // should follow axisProxy.
+	            // (We encounter this problem in toolbox data zoom.)
+	            for (var key in axisProxies) {
+	                if (axisProxies.hasOwnProperty(key) && !axisProxies[key].hostedBy(this)) {
+	                    return axisProxies[key];
+	                }
+	            }
+	        }
+
+	    });
+
+	    function retrieveRaw(option) {
+	        var ret = {};
+	        each(
+	            ['start', 'end', 'startValue', 'endValue', 'throttle'],
+	            function (name) {
+	                option.hasOwnProperty(name) && (ret[name] = option[name]);
+	            }
+	        );
+	        return ret;
+	    }
+
+	    function processRangeProp(percentProp, valueProp, rawOption, thisOption) {
+	        // start/end has higher priority over startValue/endValue,
+	        // but we should make chart.setOption({endValue: 1000}) effective,
+	        // rather than chart.setOption({endValue: 1000, end: null}).
+	        if (rawOption[valueProp] != null && rawOption[percentProp] == null) {
+	            thisOption[percentProp] = null;
+	        }
+	        // Otherwise do nothing and use the merge result.
+	    }
+
+	    module.exports = DataZoomModel;
+
+
+
+/***/ },
+/* 319 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @file Axis operator
+	 */
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var numberUtil = __webpack_require__(7);
+	    var each = zrUtil.each;
+	    var asc = numberUtil.asc;
+
+	    /**
+	     * Operate single axis.
+	     * One axis can only operated by one axis operator.
+	     * Different dataZoomModels may be defined to operate the same axis.
+	     * (i.e. 'inside' data zoom and 'slider' data zoom components)
+	     * So dataZoomModels share one axisProxy in that case.
+	     *
+	     * @class
+	     */
+	    var AxisProxy = function (dimName, axisIndex, dataZoomModel, ecModel) {
+
+	        /**
+	         * @private
+	         * @type {string}
+	         */
+	        this._dimName = dimName;
+
+	        /**
+	         * @private
+	         */
+	        this._axisIndex = axisIndex;
+
+	        /**
+	         * @private
+	         * @type {Array.<number>}
+	         */
+	        this._valueWindow;
+
+	        /**
+	         * @private
+	         * @type {Array.<number>}
+	         */
+	        this._percentWindow;
+
+	        /**
+	         * @private
+	         * @type {Array.<number>}
+	         */
+	        this._dataExtent;
+
+	        /**
+	         * @readOnly
+	         * @type {module: echarts/model/Global}
+	         */
+	        this.ecModel = ecModel;
+
+	        /**
+	         * @private
+	         * @type {module: echarts/component/dataZoom/DataZoomModel}
+	         */
+	        this._dataZoomModel = dataZoomModel;
+	    };
+
+	    AxisProxy.prototype = {
+
+	        constructor: AxisProxy,
+
+	        /**
+	         * Whether the axisProxy is hosted by dataZoomModel.
+	         *
+	         * @public
+	         * @param {module: echarts/component/dataZoom/DataZoomModel} dataZoomModel
+	         * @return {boolean}
+	         */
+	        hostedBy: function (dataZoomModel) {
+	            return this._dataZoomModel === dataZoomModel;
+	        },
+
+	        /**
+	         * @return {Array.<number>}
+	         */
+	        getDataExtent: function () {
+	            return this._dataExtent.slice();
+	        },
+
+	        /**
+	         * @return {Array.<number>}
+	         */
+	        getDataValueWindow: function () {
+	            return this._valueWindow.slice();
+	        },
+
+	        /**
+	         * @return {Array.<number>}
+	         */
+	        getDataPercentWindow: function () {
+	            return this._percentWindow.slice();
+	        },
+
+	        /**
+	         * @public
+	         * @param {number} axisIndex
+	         * @return {Array} seriesModels
+	         */
+	        getTargetSeriesModels: function () {
+	            var seriesModels = [];
+
+	            this.ecModel.eachSeries(function (seriesModel) {
+	                // Legacy problem: some one wrote xAxisIndex as [0] following the wrong way in example.
+	                if (this._axisIndex === +seriesModel.get(this._dimName + 'AxisIndex')) {
+	                    seriesModels.push(seriesModel);
+	                }
+	            }, this);
+
+	            return seriesModels;
+	        },
+
+	        getAxisModel: function () {
+	            return this.ecModel.getComponent(this._dimName + 'Axis', this._axisIndex);
+	        },
+
+	        getOtherAxisModel: function () {
+	            var axisDim = this._dimName;
+	            var ecModel = this.ecModel;
+	            var axisModel = this.getAxisModel();
+	            var isCartesian = axisDim === 'x' || axisDim === 'y';
+	            var otherAxisDim;
+	            var coordSysIndexName;
+	            if (isCartesian) {
+	                coordSysIndexName = 'gridIndex';
+	                otherAxisDim = axisDim === 'x' ? 'y' : 'x';
+	            }
+	            else {
+	                coordSysIndexName = 'polarIndex';
+	                otherAxisDim = axisDim === 'angle' ? 'radius' : 'angle';
+	            }
+	            var foundOtherAxisModel;
+	            ecModel.eachComponent(otherAxisDim + 'Axis', function (otherAxisModel) {
+	                if ((otherAxisModel.get(coordSysIndexName) || 0)
+	                    === (axisModel.get(coordSysIndexName) || 0)
+	                ) {
+	                    foundOtherAxisModel = otherAxisModel;
+	                }
+	            });
+	            return foundOtherAxisModel;
+	        },
+
+	        /**
+	         * Notice: reset should not be called before series.restoreData() called,
+	         * so it is recommanded to be called in "process stage" but not "model init
+	         * stage".
+	         *
+	         * @param {module: echarts/component/dataZoom/DataZoomModel} dataZoomModel
+	         */
+	        reset: function (dataZoomModel) {
+	            if (dataZoomModel !== this._dataZoomModel) {
+	                return;
+	            }
+
+	            // Culculate data window and data extent, and record them.
+	            var dataExtent = this._dataExtent = calculateDataExtent(
+	                this._dimName, this.getTargetSeriesModels()
+	            );
+	            var dataWindow = calculateDataWindow(
+	                dataZoomModel.option, dataExtent, this
+	            );
+	            this._valueWindow = dataWindow.valueWindow;
+	            this._percentWindow = dataWindow.percentWindow;
+
+	            // Update axis setting then.
+	            setAxisModel(this);
+	        },
+
+	        /**
+	         * @param {module: echarts/component/dataZoom/DataZoomModel} dataZoomModel
+	         */
+	        restore: function (dataZoomModel) {
+	            if (dataZoomModel !== this._dataZoomModel) {
+	                return;
+	            }
+
+	            this._valueWindow = this._percentWindow = null;
+	            setAxisModel(this, true);
+	        },
+
+	        /**
+	         * @param {module: echarts/component/dataZoom/DataZoomModel} dataZoomModel
+	         */
+	        filterData: function (dataZoomModel) {
+	            if (dataZoomModel !== this._dataZoomModel) {
+	                return;
+	            }
+
+	            var axisDim = this._dimName;
+	            var seriesModels = this.getTargetSeriesModels();
+	            var filterMode = dataZoomModel.get('filterMode');
+	            var valueWindow = this._valueWindow;
+
+	            // FIXME
+	            // Toolbox may has dataZoom injected. And if there are stacked bar chart
+	            // with NaN data, NaN will be filtered and stack will be wrong.
+	            // So we need to force the mode to be set empty.
+	            // In fect, it is not a big deal that do not support filterMode-'filter'
+	            // when using toolbox#dataZoom, utill tooltip#dataZoom support "single axis
+	            // selection" some day, which might need "adapt to data extent on the
+	            // otherAxis", which is disabled by filterMode-'empty'.
+	            var otherAxisModel = this.getOtherAxisModel();
+	            if (dataZoomModel.get('$fromToolbox')
+	                && otherAxisModel
+	                && otherAxisModel.get('type') === 'category'
+	            ) {
+	                filterMode = 'empty';
+	            }
+
+	            // Process series data
+	            each(seriesModels, function (seriesModel) {
+	                var seriesData = seriesModel.getData();
+
+	                seriesData && each(seriesModel.coordDimToDataDim(axisDim), function (dim) {
+	                    if (filterMode === 'empty') {
+	                        seriesModel.setData(
+	                            seriesData.map(dim, function (value) {
+	                                return !isInWindow(value) ? NaN : value;
+	                            })
+	                        );
+	                    }
+	                    else {
+	                        seriesData.filterSelf(dim, isInWindow);
+	                    }
+	                });
+	            });
+
+	            function isInWindow(value) {
+	                return value >= valueWindow[0] && value <= valueWindow[1];
+	            }
+	        }
+	    };
+
+	    function calculateDataExtent(axisDim, seriesModels) {
+	        var dataExtent = [Infinity, -Infinity];
+
+	        each(seriesModels, function (seriesModel) {
+	            var seriesData = seriesModel.getData();
+	            if (seriesData) {
+	                each(seriesModel.coordDimToDataDim(axisDim), function (dim) {
+	                    var seriesExtent = seriesData.getDataExtent(dim);
+	                    seriesExtent[0] < dataExtent[0] && (dataExtent[0] = seriesExtent[0]);
+	                    seriesExtent[1] > dataExtent[1] && (dataExtent[1] = seriesExtent[1]);
+	                });
+	            }
+	        }, this);
+
+	        return dataExtent;
+	    }
+
+	    function calculateDataWindow(opt, dataExtent, axisProxy) {
+	        var axisModel = axisProxy.getAxisModel();
+	        var scale = axisModel.axis.scale;
+	        var percentExtent = [0, 100];
+	        var percentWindow = [
+	            opt.start,
+	            opt.end
+	        ];
+	        var valueWindow = [];
+
+	        // In percent range is used and axis min/max/scale is set,
+	        // window should be based on min/max/0, but should not be
+	        // based on the extent of filtered data.
+	        dataExtent = dataExtent.slice();
+	        fixExtendByAxis(dataExtent, axisModel, scale);
+
+	        each(['startValue', 'endValue'], function (prop) {
+	            valueWindow.push(
+	                opt[prop] != null
+	                    ? scale.parse(opt[prop])
+	                    : null
+	            );
+	        });
+
+	        // Normalize bound.
+	        each([0, 1], function (idx) {
+	            var boundValue = valueWindow[idx];
+	            var boundPercent = percentWindow[idx];
+
+	            // start/end has higher priority over startValue/endValue,
+	            // because start/end can be consistent among different type
+	            // of axis but startValue/endValue not.
+
+	            if (boundPercent != null || boundValue == null) {
+	                if (boundPercent == null) {
+	                    boundPercent = percentExtent[idx];
+	                }
+	                // Use scale.parse to math round for category or time axis.
+	                boundValue = scale.parse(numberUtil.linearMap(
+	                    boundPercent, percentExtent, dataExtent, true
+	                ));
+	            }
+	            else { // boundPercent == null && boundValue != null
+	                boundPercent = numberUtil.linearMap(
+	                    boundValue, dataExtent, percentExtent, true
+	                );
+	            }
+	            // valueWindow[idx] = round(boundValue);
+	            // percentWindow[idx] = round(boundPercent);
+	            valueWindow[idx] = boundValue;
+	            percentWindow[idx] = boundPercent;
+	        });
+
+	        return {
+	            valueWindow: asc(valueWindow),
+	            percentWindow: asc(percentWindow)
+	        };
+	    }
+
+	    function fixExtendByAxis(dataExtent, axisModel, scale) {
+	        each(['min', 'max'], function (minMax, index) {
+	            var axisMax = axisModel.get(minMax, true);
+	            // Consider 'dataMin', 'dataMax'
+	            if (axisMax != null && (axisMax + '').toLowerCase() !== 'data' + minMax) {
+	                dataExtent[index] = scale.parse(axisMax);
+	            }
+	        });
+
+	        if (!axisModel.get('scale', true)) {
+	            dataExtent[0] > 0 && (dataExtent[0] = 0);
+	            dataExtent[1] < 0 && (dataExtent[1] = 0);
+	        }
+
+	        return dataExtent;
+	    }
+
+	    function setAxisModel(axisProxy, isRestore) {
+	        var axisModel = axisProxy.getAxisModel();
+
+	        var percentWindow = axisProxy._percentWindow;
+	        var valueWindow = axisProxy._valueWindow;
+
+	        if (!percentWindow) {
+	            return;
+	        }
+
+	        var isFull = isRestore || (percentWindow[0] === 0 && percentWindow[1] === 100);
+	        // [0, 500]: arbitrary value, guess axis extent.
+	        var precision = !isRestore && numberUtil.getPixelPrecision(valueWindow, [0, 500]);
+	        // toFixed() digits argument must be between 0 and 20
+	        var invalidPrecision = !isRestore && !(precision < 20 && precision >= 0);
+
+	        var useOrigin = isRestore || isFull || invalidPrecision;
+
+	        axisModel.setRange && axisModel.setRange(
+	            useOrigin ? null : +valueWindow[0].toFixed(precision),
+	            useOrigin ? null : +valueWindow[1].toFixed(precision)
+	        );
+	    }
+
+	    module.exports = AxisProxy;
+
+
+
+/***/ },
+/* 320 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var ComponentView = __webpack_require__(29);
+
+	    module.exports = ComponentView.extend({
+
+	        type: 'dataZoom',
+
+	        render: function (dataZoomModel, ecModel, api, payload) {
+	            this.dataZoomModel = dataZoomModel;
+	            this.ecModel = ecModel;
+	            this.api = api;
+	        },
+
+	        /**
+	         * Find the first target coordinate system.
+	         *
+	         * @protected
+	         * @return {Object} {
+	         *                   cartesians: [
+	         *                       {model: coord0, axisModels: [axis1, axis3], coordIndex: 1},
+	         *                       {model: coord1, axisModels: [axis0, axis2], coordIndex: 0},
+	         *                       ...
+	         *                   ],  // cartesians must not be null/undefined.
+	         *                   polars: [
+	         *                       {model: coord0, axisModels: [axis4], coordIndex: 0},
+	         *                       ...
+	         *                   ],  // polars must not be null/undefined.
+	         *                   axisModels: [axis0, axis1, axis2, axis3, axis4]
+	         *                       // axisModels must not be null/undefined.
+	         *                  }
+	         */
+	        getTargetInfo: function () {
+	            var dataZoomModel = this.dataZoomModel;
+	            var ecModel = this.ecModel;
+	            var cartesians = [];
+	            var polars = [];
+	            var axisModels = [];
+
+	            dataZoomModel.eachTargetAxis(function (dimNames, axisIndex) {
+	                var axisModel = ecModel.getComponent(dimNames.axis, axisIndex);
+	                if (axisModel) {
+	                    axisModels.push(axisModel);
+
+	                    var gridIndex = axisModel.get('gridIndex');
+	                    var polarIndex = axisModel.get('polarIndex');
+
+	                    if (gridIndex != null) {
+	                        var coordModel = ecModel.getComponent('grid', gridIndex);
+	                        save(coordModel, axisModel, cartesians, gridIndex);
+	                    }
+	                    else if (polarIndex != null) {
+	                        var coordModel = ecModel.getComponent('polar', polarIndex);
+	                        save(coordModel, axisModel, polars, polarIndex);
+	                    }
+	                }
+	            }, this);
+
+	            function save(coordModel, axisModel, store, coordIndex) {
+	                var item;
+	                for (var i = 0; i < store.length; i++) {
+	                    if (store[i].model === coordModel) {
+	                        item = store[i];
+	                        break;
+	                    }
+	                }
+	                if (!item) {
+	                    store.push(item = {
+	                        model: coordModel, axisModels: [], coordIndex: coordIndex
+	                    });
+	                }
+	                item.axisModels.push(axisModel);
+	            }
+
+	            return {
+	                cartesians: cartesians,
+	                polars: polars,
+	                axisModels: axisModels
+	            };
+	        }
+
+	    });
+
+
+
+/***/ },
+/* 321 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @file Data zoom model
+	 */
+
+
+	    var DataZoomModel = __webpack_require__(318);
+
+	    var SliderZoomModel = DataZoomModel.extend({
+
+	        type: 'dataZoom.slider',
+
+	        layoutMode: 'box',
+
+	        /**
+	         * @protected
+	         */
+	        defaultOption: {
+	            show: true,
+
+	            // ph => placeholder. Using placehoder here because
+	            // deault value can only be drived in view stage.
+	            right: 'ph',  // Default align to grid rect.
+	            top: 'ph',    // Default align to grid rect.
+	            width: 'ph',  // Default align to grid rect.
+	            height: 'ph', // Default align to grid rect.
+	            left: null,   // Default align to grid rect.
+	            bottom: null, // Default align to grid rect.
+
+	            backgroundColor: 'rgba(47,69,84,0)',    // Background of slider zoom component.
+	            // dataBackgroundColor: '#ddd',         // Background coor of data shadow and border of box,
+	                                                    // highest priority, remain for compatibility of
+	                                                    // previous version, but not recommended any more.
+	            dataBackground: {
+	                lineStyle: {
+	                    color: '#2f4554',
+	                    width: 0.5,
+	                    opacity: 0.3
+	                },
+	                areaStyle: {
+	                    color: 'rgba(47,69,84,0.3)',
+	                    opacity: 0.3
+	                }
+	            },
+	            borderColor: '#ddd',                    // border color of the box. For compatibility,
+	                                                    // if dataBackgroundColor is set, borderColor
+	                                                    // is ignored.
+
+	            fillerColor: 'rgba(167,183,204,0.4)',     // Color of selected area.
+	            // handleColor: 'rgba(89,170,216,0.95)',     // Color of handle.
+	            // handleIcon: 'path://M4.9,17.8c0-1.4,4.5-10.5,5.5-12.4c0-0.1,0.6-1.1,0.9-1.1c0.4,0,0.9,1,0.9,1.1c1.1,2.2,5.4,11,5.4,12.4v17.8c0,1.5-0.6,2.1-1.3,2.1H6.1c-0.7,0-1.3-0.6-1.3-2.1V17.8z',
+	            handleIcon: 'M8.2,13.6V3.9H6.3v9.7H3.1v14.9h3.3v9.7h1.8v-9.7h3.3V13.6H8.2z M9.7,24.4H4.8v-1.4h4.9V24.4z M9.7,19.1H4.8v-1.4h4.9V19.1z',
+	            // Percent of the slider height
+	            handleSize: '100%',
+
+	            handleStyle: {
+	                color: '#a7b7cc'
+	            },
+
+	            labelPrecision: null,
+	            labelFormatter: null,
+	            showDetail: true,
+	            showDataShadow: 'auto',                 // Default auto decision.
+	            realtime: true,
+	            zoomLock: false,                        // Whether disable zoom.
+	            textStyle: {
+	                color: '#333'
+	            }
+	        }
+
+	    });
+
+	    module.exports = SliderZoomModel;
+
+
+
+/***/ },
+/* 322 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+	    var graphic = __webpack_require__(43);
+	    var throttle = __webpack_require__(308);
+	    var DataZoomView = __webpack_require__(320);
+	    var Rect = graphic.Rect;
+	    var numberUtil = __webpack_require__(7);
+	    var linearMap = numberUtil.linearMap;
+	    var layout = __webpack_require__(21);
+	    var sliderMove = __webpack_require__(323);
+	    var asc = numberUtil.asc;
+	    var bind = zrUtil.bind;
+	    // var mathMax = Math.max;
+	    var each = zrUtil.each;
+
+	    // Constants
+	    var DEFAULT_LOCATION_EDGE_GAP = 7;
+	    var DEFAULT_FRAME_BORDER_WIDTH = 1;
+	    var DEFAULT_FILLER_SIZE = 30;
+	    var HORIZONTAL = 'horizontal';
+	    var VERTICAL = 'vertical';
+	    var LABEL_GAP = 5;
+	    var SHOW_DATA_SHADOW_SERIES_TYPE = ['line', 'bar', 'candlestick', 'scatter'];
+
+	    var SliderZoomView = DataZoomView.extend({
+
+	        type: 'dataZoom.slider',
+
+	        init: function (ecModel, api) {
+
+	            /**
+	             * @private
+	             * @type {Object}
+	             */
+	            this._displayables = {};
+
+	            /**
+	             * @private
+	             * @type {string}
+	             */
+	            this._orient;
+
+	            /**
+	             * [0, 100]
+	             * @private
+	             */
+	            this._range;
+
+	            /**
+	             * [coord of the first handle, coord of the second handle]
+	             * @private
+	             */
+	            this._handleEnds;
+
+	            /**
+	             * [length, thick]
+	             * @private
+	             * @type {Array.<number>}
+	             */
+	            this._size;
+
+	            /**
+	             * @private
+	             * @type {number}
+	             */
+	            this._handleWidth;
+
+	            /**
+	             * @private
+	             * @type {number}
+	             */
+	            this._handleHeight;
+
+	            /**
+	             * @private
+	             */
+	            this._location;
+
+	            /**
+	             * @private
+	             */
+	            this._dragging;
+
+	            /**
+	             * @private
+	             */
+	            this._dataShadowInfo;
+
+	            this.api = api;
+	        },
+
+	        /**
+	         * @override
+	         */
+	        render: function (dataZoomModel, ecModel, api, payload) {
+	            SliderZoomView.superApply(this, 'render', arguments);
+
+	            throttle.createOrUpdate(
+	                this,
+	                '_dispatchZoomAction',
+	                this.dataZoomModel.get('throttle'),
+	                'fixRate'
+	            );
+
+	            this._orient = dataZoomModel.get('orient');
+
+	            if (this.dataZoomModel.get('show') === false) {
+	                this.group.removeAll();
+	                return;
+	            }
+
+	            // Notice: this._resetInterval() should not be executed when payload.type
+	            // is 'dataZoom', origin this._range should be maintained, otherwise 'pan'
+	            // or 'zoom' info will be missed because of 'throttle' of this.dispatchAction,
+	            if (!payload || payload.type !== 'dataZoom' || payload.from !== this.uid) {
+	                this._buildView();
+	            }
+
+	            this._updateView();
+	        },
+
+	        /**
+	         * @override
+	         */
+	        remove: function () {
+	            SliderZoomView.superApply(this, 'remove', arguments);
+	            throttle.clear(this, '_dispatchZoomAction');
+	        },
+
+	        /**
+	         * @override
+	         */
+	        dispose: function () {
+	            SliderZoomView.superApply(this, 'dispose', arguments);
+	            throttle.clear(this, '_dispatchZoomAction');
+	        },
+
+	        _buildView: function () {
+	            var thisGroup = this.group;
+
+	            thisGroup.removeAll();
+
+	            this._resetLocation();
+	            this._resetInterval();
+
+	            var barGroup = this._displayables.barGroup = new graphic.Group();
+
+	            this._renderBackground();
+
+	            this._renderHandle();
+
+	            this._renderDataShadow();
+
+	            thisGroup.add(barGroup);
+
+	            this._positionGroup();
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _resetLocation: function () {
+	            var dataZoomModel = this.dataZoomModel;
+	            var api = this.api;
+
+	            // If some of x/y/width/height are not specified,
+	            // auto-adapt according to target grid.
+	            var coordRect = this._findCoordRect();
+	            var ecSize = {width: api.getWidth(), height: api.getHeight()};
+	            // Default align by coordinate system rect.
+	            var positionInfo = this._orient === HORIZONTAL
+	                ? {
+	                    // Why using 'right', because right should be used in vertical,
+	                    // and it is better to be consistent for dealing with position param merge.
+	                    right: ecSize.width - coordRect.x - coordRect.width,
+	                    top: (ecSize.height - DEFAULT_FILLER_SIZE - DEFAULT_LOCATION_EDGE_GAP),
+	                    width: coordRect.width,
+	                    height: DEFAULT_FILLER_SIZE
+	                }
+	                : { // vertical
+	                    right: DEFAULT_LOCATION_EDGE_GAP,
+	                    top: coordRect.y,
+	                    width: DEFAULT_FILLER_SIZE,
+	                    height: coordRect.height
+	                };
+
+	            // Do not write back to option and replace value 'ph', because
+	            // the 'ph' value should be recalculated when resize.
+	            var layoutParams = layout.getLayoutParams(dataZoomModel.option);
+
+	            // Replace the placeholder value.
+	            zrUtil.each(['right', 'top', 'width', 'height'], function (name) {
+	                if (layoutParams[name] === 'ph') {
+	                    layoutParams[name] = positionInfo[name];
+	                }
+	            });
+
+	            var layoutRect = layout.getLayoutRect(
+	                layoutParams,
+	                ecSize,
+	                dataZoomModel.padding
+	            );
+
+	            this._location = {x: layoutRect.x, y: layoutRect.y};
+	            this._size = [layoutRect.width, layoutRect.height];
+	            this._orient === VERTICAL && this._size.reverse();
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _positionGroup: function () {
+	            var thisGroup = this.group;
+	            var location = this._location;
+	            var orient = this._orient;
+
+	            // Just use the first axis to determine mapping.
+	            var targetAxisModel = this.dataZoomModel.getFirstTargetAxisModel();
+	            var inverse = targetAxisModel && targetAxisModel.get('inverse');
+
+	            var barGroup = this._displayables.barGroup;
+	            var otherAxisInverse = (this._dataShadowInfo || {}).otherAxisInverse;
+
+	            // Transform barGroup.
+	            barGroup.attr(
+	                (orient === HORIZONTAL && !inverse)
+	                ? {scale: otherAxisInverse ? [1, 1] : [1, -1]}
+	                : (orient === HORIZONTAL && inverse)
+	                ? {scale: otherAxisInverse ? [-1, 1] : [-1, -1]}
+	                : (orient === VERTICAL && !inverse)
+	                ? {scale: otherAxisInverse ? [1, -1] : [1, 1], rotation: Math.PI / 2}
+	                // Dont use Math.PI, considering shadow direction.
+	                : {scale: otherAxisInverse ? [-1, -1] : [-1, 1], rotation: Math.PI / 2}
+	            );
+
+	            // Position barGroup
+	            var rect = thisGroup.getBoundingRect([barGroup]);
+	            thisGroup.attr('position', [location.x - rect.x, location.y - rect.y]);
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _getViewExtent: function () {
+	            return [0, this._size[0]];
+	        },
+
+	        _renderBackground : function () {
+	            var dataZoomModel = this.dataZoomModel;
+	            var size = this._size;
+
+	            this._displayables.barGroup.add(new Rect({
+	                silent: true,
+	                shape: {
+	                    x: 0, y: 0, width: size[0], height: size[1]
+	                },
+	                style: {
+	                    fill: dataZoomModel.get('backgroundColor')
+	                },
+	                z2: -40
+	            }));
+	        },
+
+	        _renderDataShadow: function () {
+	            var info = this._dataShadowInfo = this._prepareDataShadowInfo();
+
+	            if (!info) {
+	                return;
+	            }
+
+	            var size = this._size;
+	            var seriesModel = info.series;
+	            var data = seriesModel.getRawData();
+	            var otherDim = seriesModel.getShadowDim
+	                ? seriesModel.getShadowDim() // @see candlestick
+	                : info.otherDim;
+
+	            var otherDataExtent = data.getDataExtent(otherDim);
+	            // Nice extent.
+	            var otherOffset = (otherDataExtent[1] - otherDataExtent[0]) * 0.3;
+	            otherDataExtent = [
+	                otherDataExtent[0] - otherOffset,
+	                otherDataExtent[1] + otherOffset
+	            ];
+	            var otherShadowExtent = [0, size[1]];
+
+	            var thisShadowExtent = [0, size[0]];
+
+	            var areaPoints = [[size[0], 0], [0, 0]];
+	            var linePoints = [];
+	            var step = thisShadowExtent[1] / (data.count() - 1);
+	            var thisCoord = 0;
+
+	            // Optimize for large data shadow
+	            var stride = Math.round(data.count() / size[0]);
+	            data.each([otherDim], function (value, index) {
+	                if (stride > 0 && (index % stride)) {
+	                    thisCoord += step;
+	                    return;
+	                }
+	                // FIXME
+	                // 应该使用统计的空判断？还是在list里进行空判断？
+	                var otherCoord = (value == null || isNaN(value) || value === '')
+	                    ? null
+	                    : linearMap(value, otherDataExtent, otherShadowExtent, true);
+	                if (otherCoord != null) {
+	                    areaPoints.push([thisCoord, otherCoord]);
+	                    linePoints.push([thisCoord, otherCoord]);
+	                }
+
+	                thisCoord += step;
+	            });
+
+	            var dataZoomModel = this.dataZoomModel;
+	            // var dataBackgroundModel = dataZoomModel.getModel('dataBackground');
+	            this._displayables.barGroup.add(new graphic.Polygon({
+	                shape: {points: areaPoints},
+	                style: zrUtil.defaults(
+	                    {fill: dataZoomModel.get('dataBackgroundColor')},
+	                    dataZoomModel.getModel('dataBackground.areaStyle').getAreaStyle()
+	                ),
+	                silent: true,
+	                z2: -20
+	            }));
+	            this._displayables.barGroup.add(new graphic.Polyline({
+	                shape: {points: linePoints},
+	                style: dataZoomModel.getModel('dataBackground.lineStyle').getLineStyle(),
+	                silent: true,
+	                z2: -19
+	            }));
+	        },
+
+	        _prepareDataShadowInfo: function () {
+	            var dataZoomModel = this.dataZoomModel;
+	            var showDataShadow = dataZoomModel.get('showDataShadow');
+
+	            if (showDataShadow === false) {
+	                return;
+	            }
+
+	            // Find a representative series.
+	            var result;
+	            var ecModel = this.ecModel;
+
+	            dataZoomModel.eachTargetAxis(function (dimNames, axisIndex) {
+	                var seriesModels = dataZoomModel
+	                    .getAxisProxy(dimNames.name, axisIndex)
+	                    .getTargetSeriesModels();
+
+	                zrUtil.each(seriesModels, function (seriesModel) {
+	                    if (result) {
+	                        return;
+	                    }
+
+	                    if (showDataShadow !== true && zrUtil.indexOf(
+	                            SHOW_DATA_SHADOW_SERIES_TYPE, seriesModel.get('type')
+	                        ) < 0
+	                    ) {
+	                        return;
+	                    }
+
+	                    var otherDim = getOtherDim(dimNames.name);
+
+	                    var thisAxis = ecModel.getComponent(dimNames.axis, axisIndex).axis;
+
+	                    result = {
+	                        thisAxis: thisAxis,
+	                        series: seriesModel,
+	                        thisDim: dimNames.name,
+	                        otherDim: otherDim,
+	                        otherAxisInverse: seriesModel
+	                            .coordinateSystem.getOtherAxis(thisAxis).inverse
+	                    };
+
+	                }, this);
+
+	            }, this);
+
+	            return result;
+	        },
+
+	        _renderHandle: function () {
+	            var displaybles = this._displayables;
+	            var handles = displaybles.handles = [];
+	            var handleLabels = displaybles.handleLabels = [];
+	            var barGroup = this._displayables.barGroup;
+	            var size = this._size;
+	            var dataZoomModel = this.dataZoomModel;
+
+	            barGroup.add(displaybles.filler = new Rect({
+	                draggable: true,
+	                cursor: 'move',
+	                drift: bind(this._onDragMove, this, 'all'),
+	                ondragstart: bind(this._showDataInfo, this, true),
+	                ondragend: bind(this._onDragEnd, this),
+	                onmouseover: bind(this._showDataInfo, this, true),
+	                onmouseout: bind(this._showDataInfo, this, false),
+	                style: {
+	                    fill: dataZoomModel.get('fillerColor'),
+	                    textPosition : 'inside'
+	                }
+	            }));
+
+	            // Frame border.
+	            barGroup.add(new Rect(graphic.subPixelOptimizeRect({
+	                silent: true,
+	                shape: {
+	                    x: 0,
+	                    y: 0,
+	                    width: size[0],
+	                    height: size[1]
+	                },
+	                style: {
+	                    stroke: dataZoomModel.get('dataBackgroundColor')
+	                        || dataZoomModel.get('borderColor'),
+	                    lineWidth: DEFAULT_FRAME_BORDER_WIDTH,
+	                    fill: 'rgba(0,0,0,0)'
+	                }
+	            })));
+
+	            var iconStr = dataZoomModel.get('handleIcon');
+	            each([0, 1], function (handleIndex) {
+	                var path = graphic.makePath(iconStr, {
+	                    style: {
+	                        strokeNoScale: true
+	                    },
+	                    rectHover: true,
+	                    cursor: this._orient === 'vertical' ? 'ns-resize' : 'ew-resize',
+	                    draggable: true,
+	                    drift: bind(this._onDragMove, this, handleIndex),
+	                    ondragend: bind(this._onDragEnd, this),
+	                    onmouseover: bind(this._showDataInfo, this, true),
+	                    onmouseout: bind(this._showDataInfo, this, false)
+	                }, {
+	                    x: -0.5,
+	                    y: 0,
+	                    width: 1,
+	                    height: 1
+	                }, 'center');
+
+	                var bRect = path.getBoundingRect();
+	                this._handleHeight = numberUtil.parsePercent(dataZoomModel.get('handleSize'), this._size[1]);
+	                this._handleWidth = bRect.width / bRect.height * this._handleHeight;
+
+	                path.setStyle(dataZoomModel.getModel('handleStyle').getItemStyle());
+	                var handleColor = dataZoomModel.get('handleColor');
+	                // Compatitable with previous version
+	                if (handleColor != null) {
+	                    path.style.fill = handleColor;
+	                }
+
+	                barGroup.add(handles[handleIndex] = path);
+
+	                var textStyleModel = dataZoomModel.textStyleModel;
+
+	                this.group.add(
+	                    handleLabels[handleIndex] = new graphic.Text({
+	                    silent: true,
+	                    invisible: true,
+	                    style: {
+	                        x: 0, y: 0, text: '',
+	                        textVerticalAlign: 'middle',
+	                        textAlign: 'center',
+	                        fill: textStyleModel.getTextColor(),
+	                        textFont: textStyleModel.getFont()
+	                    },
+	                    z2: 10
+	                }));
+
+	            }, this);
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _resetInterval: function () {
+	            var range = this._range = this.dataZoomModel.getPercentRange();
+	            var viewExtent = this._getViewExtent();
+
+	            this._handleEnds = [
+	                linearMap(range[0], [0, 100], viewExtent, true),
+	                linearMap(range[1], [0, 100], viewExtent, true)
+	            ];
+	        },
+
+	        /**
+	         * @private
+	         * @param {(number|string)} handleIndex 0 or 1 or 'all'
+	         * @param {number} dx
+	         * @param {number} dy
+	         */
+	        _updateInterval: function (handleIndex, delta) {
+	            var handleEnds = this._handleEnds;
+	            var viewExtend = this._getViewExtent();
+
+	            sliderMove(
+	                delta,
+	                handleEnds,
+	                viewExtend,
+	                (handleIndex === 'all' || this.dataZoomModel.get('zoomLock'))
+	                    ? 'rigid' : 'cross',
+	                handleIndex
+	            );
+
+	            this._range = asc([
+	                linearMap(handleEnds[0], viewExtend, [0, 100], true),
+	                linearMap(handleEnds[1], viewExtend, [0, 100], true)
+	            ]);
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _updateView: function () {
+	            var displaybles = this._displayables;
+	            var handleEnds = this._handleEnds;
+	            var handleInterval = asc(handleEnds.slice());
+	            var size = this._size;
+
+	            each([0, 1], function (handleIndex) {
+	                // Handles
+	                var handle = displaybles.handles[handleIndex];
+	                var handleHeight = this._handleHeight;
+	                handle.attr({
+	                    scale: [handleHeight, handleHeight],
+	                    position: [handleEnds[handleIndex], size[1] / 2 - handleHeight / 2]
+	                });
+	            }, this);
+
+	            // Filler
+	            displaybles.filler.setShape({
+	                x: handleInterval[0],
+	                y: 0,
+	                width: handleInterval[1] - handleInterval[0],
+	                height: size[1]
+	            });
+
+	            this._updateDataInfo();
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _updateDataInfo: function () {
+	            var dataZoomModel = this.dataZoomModel;
+	            var displaybles = this._displayables;
+	            var handleLabels = displaybles.handleLabels;
+	            var orient = this._orient;
+	            var labelTexts = ['', ''];
+
+	            // FIXME
+	            // date型，支持formatter，autoformatter（ec2 date.getAutoFormatter）
+	            if (dataZoomModel.get('showDetail')) {
+	                var dataInterval;
+	                var axis;
+	                dataZoomModel.eachTargetAxis(function (dimNames, axisIndex) {
+	                    // Using dataInterval of the first axis.
+	                    if (!dataInterval) {
+	                        dataInterval = dataZoomModel
+	                            .getAxisProxy(dimNames.name, axisIndex)
+	                            .getDataValueWindow();
+	                        axis = this.ecModel.getComponent(dimNames.axis, axisIndex).axis;
+	                    }
+	                }, this);
+
+	                if (dataInterval) {
+	                    labelTexts = [
+	                        this._formatLabel(dataInterval[0], axis),
+	                        this._formatLabel(dataInterval[1], axis)
+	                    ];
+	                }
+	            }
+
+	            var orderedHandleEnds = asc(this._handleEnds.slice());
+
+	            setLabel.call(this, 0);
+	            setLabel.call(this, 1);
+
+	            function setLabel(handleIndex) {
+	                // Label
+	                // Text should not transform by barGroup.
+	                // Ignore handlers transform
+	                var barTransform = graphic.getTransform(
+	                    displaybles.handles[handleIndex].parent, this.group
+	                );
+	                var direction = graphic.transformDirection(
+	                    handleIndex === 0 ? 'right' : 'left', barTransform
+	                );
+	                var offset = this._handleWidth / 2 + LABEL_GAP;
+	                var textPoint = graphic.applyTransform(
+	                    [
+	                        orderedHandleEnds[handleIndex] + (handleIndex === 0 ? -offset : offset),
+	                        this._size[1] / 2
+	                    ],
+	                    barTransform
+	                );
+	                handleLabels[handleIndex].setStyle({
+	                    x: textPoint[0],
+	                    y: textPoint[1],
+	                    textVerticalAlign: orient === HORIZONTAL ? 'middle' : direction,
+	                    textAlign: orient === HORIZONTAL ? direction : 'center',
+	                    text: labelTexts[handleIndex]
+	                });
+	            }
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _formatLabel: function (value, axis) {
+	            var dataZoomModel = this.dataZoomModel;
+	            var labelFormatter = dataZoomModel.get('labelFormatter');
+	            if (zrUtil.isFunction(labelFormatter)) {
+	                return labelFormatter(value);
+	            }
+
+	            var labelPrecision = dataZoomModel.get('labelPrecision');
+	            if (labelPrecision == null || labelPrecision === 'auto') {
+	                labelPrecision = axis.getPixelPrecision();
+	            }
+
+	            value = (value == null && isNaN(value))
+	                ? ''
+	                // FIXME Glue code
+	                : (axis.type === 'category' || axis.type === 'time')
+	                    ? axis.scale.getLabel(Math.round(value))
+	                    // param of toFixed should less then 20.
+	                    : value.toFixed(Math.min(labelPrecision, 20));
+
+	            if (zrUtil.isString(labelFormatter)) {
+	                value = labelFormatter.replace('{value}', value);
+	            }
+
+	            return value;
+	        },
+
+	        /**
+	         * @private
+	         * @param {boolean} showOrHide true: show, false: hide
+	         */
+	        _showDataInfo: function (showOrHide) {
+	            // Always show when drgging.
+	            showOrHide = this._dragging || showOrHide;
+
+	            var handleLabels = this._displayables.handleLabels;
+	            handleLabels[0].attr('invisible', !showOrHide);
+	            handleLabels[1].attr('invisible', !showOrHide);
+	        },
+
+	        _onDragMove: function (handleIndex, dx, dy) {
+	            this._dragging = true;
+
+	            // Transform dx, dy to bar coordination.
+	            var vertex = this._applyBarTransform([dx, dy], true);
+
+	            this._updateInterval(handleIndex, vertex[0]);
+	            this._updateView();
+
+	            if (this.dataZoomModel.get('realtime')) {
+	                this._dispatchZoomAction();
+	            }
+	        },
+
+	        _onDragEnd: function () {
+	            this._dragging = false;
+	            this._showDataInfo(false);
+	            this._dispatchZoomAction();
+	        },
+
+	        /**
+	         * This action will be throttled.
+	         * @private
+	         */
+	        _dispatchZoomAction: function () {
+	            var range = this._range;
+
+	            this.api.dispatchAction({
+	                type: 'dataZoom',
+	                from: this.uid,
+	                dataZoomId: this.dataZoomModel.id,
+	                start: range[0],
+	                end: range[1]
+	            });
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _applyBarTransform: function (vertex, inverse) {
+	            var barTransform = this._displayables.barGroup.getLocalTransform();
+	            return graphic.applyTransform(vertex, barTransform, inverse);
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _findCoordRect: function () {
+	            // Find the grid coresponding to the first axis referred by dataZoom.
+	            var targetInfo = this.getTargetInfo();
+
+	            // FIXME
+	            // 判断是catesian还是polar
+	            var rect;
+	            if (targetInfo.cartesians.length) {
+	                rect = targetInfo.cartesians[0].model.coordinateSystem.getRect();
+	            }
+	            else { // Polar
+	                // FIXME
+	                // 暂时随便写的
+	                var width = this.api.getWidth();
+	                var height = this.api.getHeight();
+	                rect = {
+	                    x: width * 0.2,
+	                    y: height * 0.2,
+	                    width: width * 0.6,
+	                    height: height * 0.6
+	                };
+	            }
+
+	            return rect;
+	        }
+
+	    });
+
+	    function getOtherDim(thisDim) {
+	        // FIXME
+	        // 这个逻辑和getOtherAxis里一致，但是写在这里是否不好
+	        return thisDim === 'x' ? 'y' : 'x';
+	    }
+
+	    module.exports = SliderZoomView;
+
+
+
+/***/ },
+/* 323 */
+/***/ function(module, exports) {
+
+	
+
+	    /**
+	     * Calculate slider move result.
+	     *
+	     * @param {number} delta Move length.
+	     * @param {Array.<number>} handleEnds handleEnds[0] and be bigger then handleEnds[1].
+	     *                                    handleEnds will be modified in this method.
+	     * @param {Array.<number>} extent handleEnds is restricted by extent.
+	     *                                extent[0] should less or equals than extent[1].
+	     * @param {string} mode 'rigid': Math.abs(handleEnds[0] - handleEnds[1]) remain unchanged,
+	     *                      'cross' handleEnds[0] can be bigger then handleEnds[1],
+	     *                      'push' handleEnds[0] can not be bigger then handleEnds[1],
+	     *                              when they touch, one push other.
+	     * @param {number} handleIndex If mode is 'rigid', handleIndex is not required.
+	     * @param {Array.<number>} The input handleEnds.
+	     */
+	    module.exports = function (delta, handleEnds, extent, mode, handleIndex) {
+	        if (!delta) {
+	            return handleEnds;
+	        }
+
+	        if (mode === 'rigid') {
+	            delta = getRealDelta(delta, handleEnds, extent);
+	            handleEnds[0] += delta;
+	            handleEnds[1] += delta;
+	        }
+	        else {
+	            delta = getRealDelta(delta, handleEnds[handleIndex], extent);
+	            handleEnds[handleIndex] += delta;
+
+	            if (mode === 'push' && handleEnds[0] > handleEnds[1]) {
+	                handleEnds[1 - handleIndex] = handleEnds[handleIndex];
+	            }
+	        }
+
+	        return handleEnds;
+
+	        function getRealDelta(delta, handleEnds, extent) {
+	            var handleMinMax = !handleEnds.length
+	                ? [handleEnds, handleEnds]
+	                : handleEnds.slice();
+	            handleEnds[0] > handleEnds[1] && handleMinMax.reverse();
+
+	            if (delta < 0 && handleMinMax[0] + delta < extent[0]) {
+	                delta = extent[0] - handleMinMax[0];
+	            }
+	            if (delta > 0 && handleMinMax[1] + delta > extent[1]) {
+	                delta = extent[1] - handleMinMax[1];
+	            }
+	            return delta;
+	        }
+	    };
+
+
+/***/ },
+/* 324 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @file Data zoom model
+	 */
+
+
+	    module.exports = __webpack_require__(318).extend({
+
+	        type: 'dataZoom.inside',
+
+	        /**
+	         * @protected
+	         */
+	        defaultOption: {
+	            zoomLock: false // Whether disable zoom but only pan.
+	        }
+	    });
+
+
+/***/ },
+/* 325 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var DataZoomView = __webpack_require__(320);
+	    var zrUtil = __webpack_require__(4);
+	    var sliderMove = __webpack_require__(323);
+	    var roams = __webpack_require__(326);
+	    var bind = zrUtil.bind;
+
+	    var InsideZoomView = DataZoomView.extend({
+
+	        type: 'dataZoom.inside',
+
+	        /**
+	         * @override
+	         */
+	        init: function (ecModel, api) {
+	            /**
+	             * 'throttle' is used in this.dispatchAction, so we save range
+	             * to avoid missing some 'pan' info.
+	             * @private
+	             * @type {Array.<number>}
+	             */
+	            this._range;
+	        },
+
+	        /**
+	         * @override
+	         */
+	        render: function (dataZoomModel, ecModel, api, payload) {
+	            InsideZoomView.superApply(this, 'render', arguments);
+
+	            // Notice: origin this._range should be maintained, and should not be re-fetched
+	            // from dataZoomModel when payload.type is 'dataZoom', otherwise 'pan' or 'zoom'
+	            // info will be missed because of 'throttle' of this.dispatchAction.
+	            if (roams.shouldRecordRange(payload, dataZoomModel.id)) {
+	                this._range = dataZoomModel.getPercentRange();
+	            }
+
+	            // Reset controllers.
+	            var coordInfoList = this.getTargetInfo().cartesians;
+	            var allCoordIds = zrUtil.map(coordInfoList, function (coordInfo) {
+	                return roams.generateCoordId(coordInfo.model);
+	            });
+
+	            zrUtil.each(coordInfoList, function (coordInfo) {
+	                var coordModel = coordInfo.model;
+	                roams.register(
+	                    api,
+	                    {
+	                        coordId: roams.generateCoordId(coordModel),
+	                        allCoordIds: allCoordIds,
+	                        coordinateSystem: coordModel.coordinateSystem,
+	                        dataZoomId: dataZoomModel.id,
+	                        throttleRate: dataZoomModel.get('throttle', true),
+	                        panGetRange: bind(this._onPan, this, coordInfo),
+	                        zoomGetRange: bind(this._onZoom, this, coordInfo)
+	                    }
+	                );
+	            }, this);
+
+	            // TODO
+	            // polar支持
+	        },
+
+	        /**
+	         * @override
+	         */
+	        dispose: function () {
+	            roams.unregister(this.api, this.dataZoomModel.id);
+	            InsideZoomView.superApply(this, 'dispose', arguments);
+	            this._range = null;
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _onPan: function (coordInfo, controller, dx, dy) {
+	            return (
+	                this._range = panCartesian(
+	                    [dx, dy], this._range, controller, coordInfo
+	                )
+	            );
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _onZoom: function (coordInfo, controller, scale, mouseX, mouseY) {
+	            var dataZoomModel = this.dataZoomModel;
+
+	            if (dataZoomModel.option.zoomLock) {
+	                return this._range;
+	            }
+
+	            return (
+	                this._range = scaleCartesian(
+	                    1 / scale, [mouseX, mouseY], this._range,
+	                    controller, coordInfo, dataZoomModel
+	                )
+	            );
+	        }
+
+	    });
+
+	    function panCartesian(pixelDeltas, range, controller, coordInfo) {
+	        range = range.slice();
+
+	        // Calculate transform by the first axis.
+	        var axisModel = coordInfo.axisModels[0];
+	        if (!axisModel) {
+	            return;
+	        }
+
+	        var directionInfo = getDirectionInfo(pixelDeltas, axisModel, controller);
+
+	        var percentDelta = directionInfo.signal
+	            * (range[1] - range[0])
+	            * directionInfo.pixel / directionInfo.pixelLength;
+
+	        sliderMove(
+	            percentDelta,
+	            range,
+	            [0, 100],
+	            'rigid'
+	        );
+
+	        return range;
+	    }
+
+	    function scaleCartesian(scale, mousePoint, range, controller, coordInfo, dataZoomModel) {
+	        range = range.slice();
+
+	        // Calculate transform by the first axis.
+	        var axisModel = coordInfo.axisModels[0];
+	        if (!axisModel) {
+	            return;
+	        }
+
+	        var directionInfo = getDirectionInfo(mousePoint, axisModel, controller);
+
+	        var mouse = directionInfo.pixel - directionInfo.pixelStart;
+	        var percentPoint = mouse / directionInfo.pixelLength * (range[1] - range[0]) + range[0];
+
+	        scale = Math.max(scale, 0);
+	        range[0] = (range[0] - percentPoint) * scale + percentPoint;
+	        range[1] = (range[1] - percentPoint) * scale + percentPoint;
+
+	        return fixRange(range);
+	    }
+
+	    function getDirectionInfo(xy, axisModel, controller) {
+	        var axis = axisModel.axis;
+	        var rect = controller.rectProvider();
+	        var ret = {};
+
+	        if (axis.dim === 'x') {
+	            ret.pixel = xy[0];
+	            ret.pixelLength = rect.width;
+	            ret.pixelStart = rect.x;
+	            ret.signal = axis.inverse ? 1 : -1;
+	        }
+	        else { // axis.dim === 'y'
+	            ret.pixel = xy[1];
+	            ret.pixelLength = rect.height;
+	            ret.pixelStart = rect.y;
+	            ret.signal = axis.inverse ? -1 : 1;
+	        }
+
+	        return ret;
+	    }
+
+	    function fixRange(range) {
+	        // Clamp, using !(<= or >=) to handle NaN.
+	        // jshint ignore:start
+	        var bound = [0, 100];
+	        !(range[0] <= bound[1]) && (range[0] = bound[1]);
+	        !(range[1] <= bound[1]) && (range[1] = bound[1]);
+	        !(range[0] >= bound[0]) && (range[0] = bound[0]);
+	        !(range[1] >= bound[0]) && (range[1] = bound[0]);
+	        // jshint ignore:end
+
+	        return range;
+	    }
+
+	    module.exports = InsideZoomView;
+
+
+/***/ },
+/* 326 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @file Roam controller manager.
+	 */
+
+
+	    // Only create one roam controller for each coordinate system.
+	    // one roam controller might be refered by two inside data zoom
+	    // components (for example, one for x and one for y). When user
+	    // pan or zoom, only dispatch one action for those data zoom
+	    // components.
+
+	    var zrUtil = __webpack_require__(4);
+	    var RoamController = __webpack_require__(174);
+	    var throttle = __webpack_require__(308);
+	    var curry = zrUtil.curry;
+
+	    var ATTR = '\0_ec_dataZoom_roams';
+
+	    var roams = {
+
+	        /**
+	         * @public
+	         * @param {module:echarts/ExtensionAPI} api
+	         * @param {Object} dataZoomInfo
+	         * @param {string} dataZoomInfo.coordId
+	         * @param {Object} dataZoomInfo.coordinateSystem
+	         * @param {Array.<string>} dataZoomInfo.allCoordIds
+	         * @param {string} dataZoomInfo.dataZoomId
+	         * @param {number} dataZoomInfo.throttleRate
+	         * @param {Function} dataZoomInfo.panGetRange
+	         * @param {Function} dataZoomInfo.zoomGetRange
+	         */
+	        register: function (api, dataZoomInfo) {
+	            var store = giveStore(api);
+	            var theDataZoomId = dataZoomInfo.dataZoomId;
+	            var theCoordId = dataZoomInfo.coordId;
+
+	            // Do clean when a dataZoom changes its target coordnate system.
+	            zrUtil.each(store, function (record, coordId) {
+	                var dataZoomInfos = record.dataZoomInfos;
+	                if (dataZoomInfos[theDataZoomId]
+	                    && zrUtil.indexOf(dataZoomInfo.allCoordIds, theCoordId) < 0
+	                ) {
+	                    delete dataZoomInfos[theDataZoomId];
+	                    record.count--;
+	                }
+	            });
+
+	            cleanStore(store);
+
+	            var record = store[theCoordId];
+
+	            // Create if needed.
+	            if (!record) {
+	                record = store[theCoordId] = {
+	                    coordId: theCoordId,
+	                    dataZoomInfos: {},
+	                    count: 0
+	                };
+	                record.controller = createController(api, dataZoomInfo, record);
+	                record.dispatchAction = zrUtil.curry(dispatchAction, api);
+	            }
+
+	            // Consider resize, area should be always updated.
+	            var rect = dataZoomInfo.coordinateSystem.getRect().clone();
+	            record.controller.rectProvider = function () {
+	                return rect;
+	            };
+
+	            // Update throttle.
+	            throttle.createOrUpdate(
+	                record,
+	                'dispatchAction',
+	                dataZoomInfo.throttleRate,
+	                'fixRate'
+	            );
+
+	            // Update reference of dataZoom.
+	            !(record.dataZoomInfos[theDataZoomId]) && record.count++;
+	            record.dataZoomInfos[theDataZoomId] = dataZoomInfo;
+	        },
+
+	        /**
+	         * @public
+	         * @param {module:echarts/ExtensionAPI} api
+	         * @param {string} dataZoomId
+	         */
+	        unregister: function (api, dataZoomId) {
+	            var store = giveStore(api);
+
+	            zrUtil.each(store, function (record) {
+	                var dataZoomInfos = record.dataZoomInfos;
+	                if (dataZoomInfos[dataZoomId]) {
+	                    delete dataZoomInfos[dataZoomId];
+	                    record.count--;
+	                }
+	            });
+
+	            cleanStore(store);
+	        },
+
+	        /**
+	         * @public
+	         */
+	        shouldRecordRange: function (payload, dataZoomId) {
+	            if (payload && payload.type === 'dataZoom' && payload.batch) {
+	                for (var i = 0, len = payload.batch.length; i < len; i++) {
+	                    if (payload.batch[i].dataZoomId === dataZoomId) {
+	                        return false;
+	                    }
+	                }
+	            }
+	            return true;
+	        },
+
+	        /**
+	         * @public
+	         */
+	        generateCoordId: function (coordModel) {
+	            return coordModel.type + '\0_' + coordModel.id;
+	        }
+	    };
+
+	    /**
+	     * Key: coordId, value: {dataZoomInfos: [], count, controller}
+	     * @type {Array.<Object>}
+	     */
+	    function giveStore(api) {
+	        // Mount store on zrender instance, so that we do not
+	        // need to worry about dispose.
+	        var zr = api.getZr();
+	        return zr[ATTR] || (zr[ATTR] = {});
+	    }
+
+	    function createController(api, dataZoomInfo, newRecord) {
+	        var controller = new RoamController(api.getZr());
+	        controller.enable();
+	        controller.on('pan', curry(onPan, newRecord));
+	        controller.on('zoom', curry(onZoom, newRecord));
+
+	        return controller;
+	    }
+
+	    function cleanStore(store) {
+	        zrUtil.each(store, function (record, coordId) {
+	            if (!record.count) {
+	                record.controller.off('pan').off('zoom');
+	                delete store[coordId];
+	            }
+	        });
+	    }
+
+	    function onPan(record, dx, dy) {
+	        wrapAndDispatch(record, function (info) {
+	            return info.panGetRange(record.controller, dx, dy);
+	        });
+	    }
+
+	    function onZoom(record, scale, mouseX, mouseY) {
+	        wrapAndDispatch(record, function (info) {
+	            return info.zoomGetRange(record.controller, scale, mouseX, mouseY);
+	        });
+	    }
+
+	    function wrapAndDispatch(record, getRange) {
+	        var batch = [];
+
+	        zrUtil.each(record.dataZoomInfos, function (info) {
+	            var range = getRange(info);
+	            range && batch.push({
+	                dataZoomId: info.dataZoomId,
+	                start: range[0],
+	                end: range[1]
+	            });
+	        });
+
+	        record.dispatchAction(batch);
+	    }
+
+	    /**
+	     * This action will be throttled.
+	     */
+	    function dispatchAction(api, batch) {
+	        api.dispatchAction({
+	            type: 'dataZoom',
+	            batch: batch
+	        });
+	    }
+
+	    module.exports = roams;
+
+
+
+/***/ },
+/* 327 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @file Data zoom processor
+	 */
+
+
+	    var echarts = __webpack_require__(1);
+
+	    echarts.registerProcessor(function (ecModel, api) {
+
+	        ecModel.eachComponent('dataZoom', function (dataZoomModel) {
+	            // We calculate window and reset axis here but not in model
+	            // init stage and not after action dispatch handler, because
+	            // reset should be called after seriesData.restoreData.
+	            dataZoomModel.eachTargetAxis(resetSingleAxis);
+
+	            // Caution: data zoom filtering is order sensitive when using
+	            // percent range and no min/max/scale set on axis.
+	            // For example, we have dataZoom definition:
+	            // [
+	            //      {xAxisIndex: 0, start: 30, end: 70},
+	            //      {yAxisIndex: 0, start: 20, end: 80}
+	            // ]
+	            // In this case, [20, 80] of y-dataZoom should be based on data
+	            // that have filtered by x-dataZoom using range of [30, 70],
+	            // but should not be based on full raw data. Thus sliding
+	            // x-dataZoom will change both ranges of xAxis and yAxis,
+	            // while sliding y-dataZoom will only change the range of yAxis.
+	            // So we should filter x-axis after reset x-axis immediately,
+	            // and then reset y-axis and filter y-axis.
+	            dataZoomModel.eachTargetAxis(filterSingleAxis);
+	        });
+
+	        ecModel.eachComponent('dataZoom', function (dataZoomModel) {
+	            // Fullfill all of the range props so that user
+	            // is able to get them from chart.getOption().
+	            var axisProxy = dataZoomModel.findRepresentativeAxisProxy();
+	            var percentRange = axisProxy.getDataPercentWindow();
+	            var valueRange = axisProxy.getDataValueWindow();
+
+	            dataZoomModel.setRawRange({
+	                start: percentRange[0],
+	                end: percentRange[1],
+	                startValue: valueRange[0],
+	                endValue: valueRange[1]
+	            });
+	        });
+	    });
+
+	    function resetSingleAxis(dimNames, axisIndex, dataZoomModel) {
+	        dataZoomModel.getAxisProxy(dimNames.name, axisIndex).reset(dataZoomModel);
+	    }
+
+	    function filterSingleAxis(dimNames, axisIndex, dataZoomModel) {
+	        dataZoomModel.getAxisProxy(dimNames.name, axisIndex).filterData(dataZoomModel);
+	    }
+
+
+
+
+/***/ },
+/* 328 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @file Data zoom action
+	 */
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var modelUtil = __webpack_require__(5);
+	    var echarts = __webpack_require__(1);
+
+
+	    echarts.registerAction('dataZoom', function (payload, ecModel) {
+
+	        var linkedNodesFinder = modelUtil.createLinkedNodesFinder(
+	            zrUtil.bind(ecModel.eachComponent, ecModel, 'dataZoom'),
+	            modelUtil.eachAxisDim,
+	            function (model, dimNames) {
+	                return model.get(dimNames.axisIndex);
+	            }
+	        );
+
+	        var effectedModels = [];
+
+	        ecModel.eachComponent(
+	            {mainType: 'dataZoom', query: payload},
+	            function (model, index) {
+	                effectedModels.push.apply(
+	                    effectedModels, linkedNodesFinder(model).nodes
+	                );
+	            }
+	        );
+
+	        zrUtil.each(effectedModels, function (dataZoomModel, index) {
+	            dataZoomModel.setRawRange({
+	                start: payload.start,
+	                end: payload.end,
+	                startValue: payload.startValue,
+	                endValue: payload.endValue
+	            });
+	        });
+
+	    });
+
+
+
+/***/ },
+/* 329 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * visualMap component entry
+	 */
+
+
+	    __webpack_require__(330);
+	    __webpack_require__(341);
+
+
+
+/***/ },
+/* 330 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * DataZoom component entry
+	 */
+
+
+	    __webpack_require__(1).registerPreprocessor(
+	        __webpack_require__(331)
+	    );
+
+	    __webpack_require__(332);
+	    __webpack_require__(333);
+	    __webpack_require__(334);
+	    __webpack_require__(337);
+	    __webpack_require__(340);
+
+
+
+/***/ },
+/* 331 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @file VisualMap preprocessor
+	 */
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var each = zrUtil.each;
+
+	    module.exports = function (option) {
+	        var visualMap = option && option.visualMap;
+
+	        if (!zrUtil.isArray(visualMap)) {
+	            visualMap = visualMap ? [visualMap] : [];
+	        }
+
+	        each(visualMap, function (opt) {
+	            if (!opt) {
+	                return;
+	            }
+
+	            // rename splitList to pieces
+	            if (has(opt, 'splitList') && !has(opt, 'pieces')) {
+	                opt.pieces = opt.splitList;
+	                delete opt.splitList;
+	            }
+
+	            var pieces = opt.pieces;
+	            if (pieces && zrUtil.isArray(pieces)) {
+	                each(pieces, function (piece) {
+	                    if (zrUtil.isObject(piece)) {
+	                        if (has(piece, 'start') && !has(piece, 'min')) {
+	                            piece.min = piece.start;
+	                        }
+	                        if (has(piece, 'end') && !has(piece, 'max')) {
+	                            piece.max = piece.end;
+	                        }
+	                    }
+	                });
+	            }
+	        });
+	    };
+
+	    function has(obj, name) {
+	        return obj && obj.hasOwnProperty && obj.hasOwnProperty(name);
+	    }
+
+
+
+/***/ },
+/* 332 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    __webpack_require__(19).registerSubTypeDefaulter('visualMap', function (option) {
+	        // Compatible with ec2, when splitNumber === 0, continuous visualMap will be used.
+	        return (
+	                !option.categories
+	                && (
+	                    !(
+	                        option.pieces
+	                            ? option.pieces.length > 0
+	                            : option.splitNumber > 0
+	                    )
+	                    || option.calculable
+	                )
+	            )
+	            ? 'continuous' : 'piecewise';
+	    });
+
+
+
+/***/ },
+/* 333 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @file Data range visual coding.
+	 */
+
+
+	    var echarts = __webpack_require__(1);
+	    var visualSolution = __webpack_require__(306);
+	    var VisualMapping = __webpack_require__(192);
+
+	    echarts.registerVisual(echarts.PRIORITY.VISUAL.COMPONENT, function (ecModel) {
+	        ecModel.eachComponent('visualMap', function (visualMapModel) {
+	            processSingleVisualMap(visualMapModel, ecModel);
+	        });
+
+	        prepareVisualMeta(ecModel);
+	    });
+
+	    function processSingleVisualMap(visualMapModel, ecModel) {
+	        visualMapModel.eachTargetSeries(function (seriesModel) {
+	            var data = seriesModel.getData();
+
+	            visualSolution.applyVisual(
+	                visualMapModel.stateList,
+	                visualMapModel.targetVisuals,
+	                data,
+	                visualMapModel.getValueState,
+	                visualMapModel,
+	                visualMapModel.getDataDimension(data)
+	            );
+	        });
+	    }
+
+	    // Only support color.
+	    function prepareVisualMeta(ecModel) {
+	        ecModel.eachSeries(function (seriesModel) {
+	            var data = seriesModel.getData();
+	            var visualMetaList = [];
+
+	            ecModel.eachComponent('visualMap', function (visualMapModel) {
+	                if (visualMapModel.isTargetSeries(seriesModel)) {
+	                    var visualMeta = {};
+	                    visualMetaList.push(visualMeta);
+	                    visualMeta.stops = visualMapModel.getStops(seriesModel, getColorVisual);
+	                    visualMeta.dimension = visualMapModel.getDataDimension(data);
+	                }
+	            });
+
+	            // console.log(JSON.stringify(visualMetaList.map(a => a.stops)));
+	            seriesModel.getData().setVisual('visualMeta', visualMetaList);
+	        });
+	    }
+
+	    // FIXME
+	    // performance and export for heatmap?
+	    function getColorVisual(visualMapModel, value, valueState) {
+	        var mappings = visualMapModel.targetVisuals[valueState];
+	        var visualTypes = VisualMapping.prepareVisualTypes(mappings);
+	        var resultVisual = {};
+
+	        for (var i = 0, len = visualTypes.length; i < len; i++) {
+	            var type = visualTypes[i];
+	            var mapping = mappings[
+	                type === 'colorAlpha' ? '__alphaForOpacity' : type
+	            ];
+	            mapping && mapping.applyVisual(value, getVisual, setVisual);
+	        }
+
+	        return resultVisual.color;
+
+	        function getVisual(key) {
+	            return resultVisual[key];
+	        }
+
+	        function setVisual(key, value) {
+	            resultVisual[key] = value;
+	        }
+	    }
+
+
+
+
+/***/ },
+/* 334 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @file Data zoom model
+	 */
+
+
+	    var VisualMapModel = __webpack_require__(335);
+	    var zrUtil = __webpack_require__(4);
+	    var numberUtil = __webpack_require__(7);
+
+	    // Constant
+	    var DEFAULT_BAR_BOUND = [20, 140];
+
+	    var ContinuousModel = VisualMapModel.extend({
+
+	        type: 'visualMap.continuous',
+
+	        /**
+	         * @protected
+	         */
+	        defaultOption: {
+	            align: 'auto',          // 'auto', 'left', 'right', 'top', 'bottom'
+	            calculable: false,      // This prop effect default component type determine,
+	                                    // See echarts/component/visualMap/typeDefaulter.
+	            range: null,            // selected range. In default case `range` is [min, max]
+	                                    // and can auto change along with modification of min max,
+	                                    // util use specifid a range.
+	            realtime: true,         // Whether realtime update.
+	            itemHeight: null,       // The length of the range control edge.
+	            itemWidth: null,        // The length of the other side.
+	            hoverLink: true,        // Enable hover highlight.
+	            hoverLinkDataSize: null,// The size of hovered data.
+	            hoverLinkOnHandle: true // Whether trigger hoverLink when hover handle.
+	        },
+
+	        /**
+	         * @override
+	         */
+	        optionUpdated: function (newOption, isInit) {
+	            ContinuousModel.superApply(this, 'optionUpdated', arguments);
+
+	            this.resetTargetSeries();
+	            this.resetExtent();
+
+	            this.resetVisual(function (mappingOption) {
+	                mappingOption.mappingMethod = 'linear';
+	                mappingOption.dataExtent = this.getExtent();
+	            });
+
+	            this._resetRange();
+	        },
+
+	        /**
+	         * @protected
+	         * @override
+	         */
+	        resetItemSize: function () {
+	            ContinuousModel.superApply(this, 'resetItemSize', arguments);
+
+	            var itemSize = this.itemSize;
+
+	            this._orient === 'horizontal' && itemSize.reverse();
+
+	            (itemSize[0] == null || isNaN(itemSize[0])) && (itemSize[0] = DEFAULT_BAR_BOUND[0]);
+	            (itemSize[1] == null || isNaN(itemSize[1])) && (itemSize[1] = DEFAULT_BAR_BOUND[1]);
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _resetRange: function () {
+	            var dataExtent = this.getExtent();
+	            var range = this.option.range;
+
+	            if (!range || range.auto) {
+	                // `range` should always be array (so we dont use other
+	                // value like 'auto') for user-friend. (consider getOption).
+	                dataExtent.auto = 1;
+	                this.option.range = dataExtent;
+	            }
+	            else if (zrUtil.isArray(range)) {
+	                if (range[0] > range[1]) {
+	                    range.reverse();
+	                }
+	                range[0] = Math.max(range[0], dataExtent[0]);
+	                range[1] = Math.min(range[1], dataExtent[1]);
+	            }
+	        },
+
+	        /**
+	         * @protected
+	         * @override
+	         */
+	        completeVisualOption: function () {
+	            VisualMapModel.prototype.completeVisualOption.apply(this, arguments);
+
+	            zrUtil.each(this.stateList, function (state) {
+	                var symbolSize = this.option.controller[state].symbolSize;
+	                if (symbolSize && symbolSize[0] !== symbolSize[1]) {
+	                    symbolSize[0] = 0; // For good looking.
+	                }
+	            }, this);
+	        },
+
+	        /**
+	         * @override
+	         */
+	        setSelected: function (selected) {
+	            this.option.range = selected.slice();
+	            this._resetRange();
+	        },
+
+	        /**
+	         * @public
+	         */
+	        getSelected: function () {
+	            var dataExtent = this.getExtent();
+
+	            var dataInterval = numberUtil.asc(
+	                (this.get('range') || []).slice()
+	            );
+
+	            // Clamp
+	            dataInterval[0] > dataExtent[1] && (dataInterval[0] = dataExtent[1]);
+	            dataInterval[1] > dataExtent[1] && (dataInterval[1] = dataExtent[1]);
+	            dataInterval[0] < dataExtent[0] && (dataInterval[0] = dataExtent[0]);
+	            dataInterval[1] < dataExtent[0] && (dataInterval[1] = dataExtent[0]);
+
+	            return dataInterval;
+	        },
+
+	        /**
+	         * @override
+	         */
+	        getValueState: function (value) {
+	            var range = this.option.range;
+	            var dataExtent = this.getExtent();
+
+	            // When range[0] === dataExtent[0], any value larger than dataExtent[0] maps to 'inRange'.
+	            // range[1] is processed likewise.
+	            return (
+	                (range[0] <= dataExtent[0] || range[0] <= value)
+	                && (range[1] >= dataExtent[1] || value <= range[1])
+	            ) ? 'inRange' : 'outOfRange';
+	        },
+
+	        /**
+	         * @params {Array.<number>} range target value: range[0] <= value && value <= range[1]
+	         * @return {Array.<Object>} [{seriesId, dataIndices: <Array.<number>>}, ...]
+	         */
+	        findTargetDataIndices: function (range) {
+	            var result = [];
+
+	            this.eachTargetSeries(function (seriesModel) {
+	                var dataIndices = [];
+	                var data = seriesModel.getData();
+
+	                data.each(this.getDataDimension(data), function (value, dataIndex) {
+	                    range[0] <= value && value <= range[1] && dataIndices.push(dataIndex);
+	                }, true, this);
+
+	                result.push({seriesId: seriesModel.id, dataIndex: dataIndices});
+	            }, this);
+
+	            return result;
+	        },
+
+	        getStops: function (seriesModel, getColorVisual) {
+	            var result = [];
+	            insertStopList(this, 'outOfRange', this.getExtent(), result);
+	            insertStopList(this, 'inRange', this.option.range.slice(), result);
+
+	            zrUtil.each(result, function (item) {
+	                item.color = getColorVisual(this, item.value, item.valueState);
+	            }, this);
+
+	            return result;
+	        }
+
+	    });
+
+	    function getColorStopValues(visualMapModel, valueState, dataExtent) {
+	        var mapping = visualMapModel.targetVisuals[valueState].color;
+
+	        if (!mapping) {
+	            return dataExtent.slice();
+	        }
+
+	        var count = mapping.option.visual.length;
+
+	        if (count <= 1 || dataExtent[0] === dataExtent[1]) {
+	            return dataExtent.slice();
+	        }
+
+	        // We only use linear mappping for color, so we can do inverse mapping:
+	        var step = (dataExtent[1] - dataExtent[0]) / (count - 1);
+	        var value = dataExtent[0];
+	        var stopValues = [];
+	        for (var i = 0; i < count && value < dataExtent[1]; i++) {
+	            stopValues.push(value);
+	            value += step;
+	        }
+	        stopValues.push(dataExtent[1]);
+
+	        return stopValues;
+	    }
+
+	    function insertStopList(visualMapModel, valueState, dataExtent, result) {
+	        var stops = getColorStopValues(visualMapModel, valueState, dataExtent);
+
+	        zrUtil.each(stops, function (val) {
+	            var stop = {value: val, valueState: valueState};
+	            var inRange = 0;
+	            for (var i = 0; i < result.length; i++) {
+	                // Format to: outOfRange -- inRange -- outOfRange.
+	                inRange |= result[i].valueState === 'inRange';
+	                if (val < result[i].value) {
+	                    result.splice(i, 0, stop);
+	                    return;
+	                }
+	                inRange && (result[i].valueState = 'inRange');
+	            }
+	            result.push(stop);
+	        });
+	    }
+
+	    module.exports = ContinuousModel;
+
+
+
+/***/ },
+/* 335 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @file Controller visual map model
+	 */
+
+
+	    var echarts = __webpack_require__(1);
+	    var zrUtil = __webpack_require__(4);
+	    var env = __webpack_require__(2);
+	    var visualDefault = __webpack_require__(336);
+	    var VisualMapping = __webpack_require__(192);
+	    var visualSolution = __webpack_require__(306);
+	    var mapVisual = VisualMapping.mapVisual;
+	    var modelUtil = __webpack_require__(5);
+	    var eachVisual = VisualMapping.eachVisual;
+	    var numberUtil = __webpack_require__(7);
+	    var isArray = zrUtil.isArray;
+	    var each = zrUtil.each;
+	    var asc = numberUtil.asc;
+	    var linearMap = numberUtil.linearMap;
+	    var noop = zrUtil.noop;
+
+	    var DEFAULT_COLOR = ['#f6efa6', '#d88273', '#bf444c'];
+
+	    var VisualMapModel = echarts.extendComponentModel({
+
+	        type: 'visualMap',
+
+	        dependencies: ['series'],
+
+	        /**
+	         * @readOnly
+	         * @type {Array.<string>}
+	         */
+	        stateList: ['inRange', 'outOfRange'],
+
+	        /**
+	         * @readOnly
+	         * @type {Array.<string>}
+	         */
+	        replacableOptionKeys: [
+	            'inRange', 'outOfRange', 'target', 'controller', 'color'
+	        ],
+
+	        /**
+	         * [lowerBound, upperBound]
+	         *
+	         * @readOnly
+	         * @type {Array.<number>}
+	         */
+	        dataBound: [-Infinity, Infinity],
+
+	        /**
+	         * @readOnly
+	         * @type {string|Object}
+	         */
+	        layoutMode: {type: 'box', ignoreSize: true},
+
+	        /**
+	         * @protected
+	         */
+	        defaultOption: {
+	            show: true,
+
+	            zlevel: 0,
+	            z: 4,
+
+	            seriesIndex: null,       // 所控制的series indices，默认所有有value的series.
+
+	                                    // set min: 0, max: 200, only for campatible with ec2.
+	                                    // In fact min max should not have default value.
+	            min: 0,                 // min value, must specified if pieces is not specified.
+	            max: 200,               // max value, must specified if pieces is not specified.
+
+	            dimension: null,
+	            inRange: null,          // 'color', 'colorHue', 'colorSaturation', 'colorLightness', 'colorAlpha',
+	                                    // 'symbol', 'symbolSize'
+	            outOfRange: null,       // 'color', 'colorHue', 'colorSaturation',
+	                                    // 'colorLightness', 'colorAlpha',
+	                                    // 'symbol', 'symbolSize'
+
+	            left: 0,                // 'center' ¦ 'left' ¦ 'right' ¦ {number} (px)
+	            right: null,            // The same as left.
+	            top: null,              // 'top' ¦ 'bottom' ¦ 'center' ¦ {number} (px)
+	            bottom: 0,              // The same as top.
+
+	            itemWidth: null,
+	            itemHeight: null,
+	            inverse: false,
+	            orient: 'vertical',        // 'horizontal' ¦ 'vertical'
+
+	            backgroundColor: 'rgba(0,0,0,0)',
+	            borderColor: '#ccc',       // 值域边框颜色
+	            contentColor: '#5793f3',
+	            inactiveColor: '#aaa',
+	            borderWidth: 0,            // 值域边框线宽，单位px，默认为0（无边框）
+	            padding: 5,                // 值域内边距，单位px，默认各方向内边距为5，
+	                                       // 接受数组分别设定上右下左边距，同css
+	            textGap: 10,               //
+	            precision: 0,              // 小数精度，默认为0，无小数点
+	            color: null,               //颜色（deprecated，兼容ec2，顺序同pieces，不同于inRange/outOfRange）
+
+	            formatter: null,
+	            text: null,                // 文本，如['高', '低']，兼容ec2，text[0]对应高值，text[1]对应低值
+	            textStyle: {
+	                color: '#333'          // 值域文字颜色
+	            }
+	        },
+
+	        /**
+	         * @protected
+	         */
+	        init: function (option, parentModel, ecModel) {
+
+	            /**
+	             * @private
+	             * @type {Array.<number>}
+	             */
+	            this._dataExtent;
+
+	            /**
+	             * @readOnly
+	             */
+	            this.targetVisuals = {};
+
+	            /**
+	             * @readOnly
+	             */
+	            this.controllerVisuals = {};
+
+	            /**
+	             * @readOnly
+	             */
+	            this.textStyleModel;
+
+	            /**
+	             * [width, height]
+	             * @readOnly
+	             * @type {Array.<number>}
+	             */
+	            this.itemSize;
+
+	            this.mergeDefaultAndTheme(option, ecModel);
+	        },
+
+	        /**
+	         * @protected
+	         */
+	        optionUpdated: function (newOption, isInit) {
+	            var thisOption = this.option;
+
+	            // FIXME
+	            // necessary?
+	            // Disable realtime view update if canvas is not supported.
+	            if (!env.canvasSupported) {
+	                thisOption.realtime = false;
+	            }
+
+	            !isInit && visualSolution.replaceVisualOption(
+	                thisOption, newOption, this.replacableOptionKeys
+	            );
+
+	            this.textStyleModel = this.getModel('textStyle');
+
+	            this.resetItemSize();
+
+	            this.completeVisualOption();
+	        },
+
+	        /**
+	         * @protected
+	         */
+	        resetVisual: function (supplementVisualOption) {
+	            var stateList = this.stateList;
+	            supplementVisualOption = zrUtil.bind(supplementVisualOption, this);
+
+	            this.controllerVisuals = visualSolution.createVisualMappings(
+	                this.option.controller, stateList, supplementVisualOption
+	            );
+	            this.targetVisuals = visualSolution.createVisualMappings(
+	                this.option.target, stateList, supplementVisualOption
+	            );
+	        },
+
+
+	        /**
+	         * @protected
+	         */
+	        resetTargetSeries: function () {
+	            var thisOption = this.option;
+	            var allSeriesIndex = thisOption.seriesIndex == null;
+	            thisOption.seriesIndex = allSeriesIndex
+	                ? [] : modelUtil.normalizeToArray(thisOption.seriesIndex);
+
+	            allSeriesIndex && this.ecModel.eachSeries(function (seriesModel, index) {
+	                thisOption.seriesIndex.push(index);
+	            });
+	        },
+
+	        /**
+	         * @public
+	         */
+	        eachTargetSeries: function (callback, context) {
+	            zrUtil.each(this.option.seriesIndex, function (seriesIndex) {
+	                callback.call(context, this.ecModel.getSeriesByIndex(seriesIndex));
+	            }, this);
+	        },
+
+	        /**
+	         * @pubilc
+	         */
+	        isTargetSeries: function (seriesModel) {
+	            var is = false;
+	            this.eachTargetSeries(function (model) {
+	                model === seriesModel && (is = true);
+	            });
+	            return is;
+	        },
+
+	        /**
+	         * @example
+	         * this.formatValueText(someVal); // format single numeric value to text.
+	         * this.formatValueText(someVal, true); // format single category value to text.
+	         * this.formatValueText([min, max]); // format numeric min-max to text.
+	         * this.formatValueText([this.dataBound[0], max]); // using data lower bound.
+	         * this.formatValueText([min, this.dataBound[1]]); // using data upper bound.
+	         *
+	         * @param {number|Array.<number>} value Real value, or this.dataBound[0 or 1].
+	         * @param {boolean} [isCategory=false] Only available when value is number.
+	         * @param {Array.<string>} edgeSymbols Open-close symbol when value is interval.
+	         * @return {string}
+	         * @protected
+	         */
+	        formatValueText: function(value, isCategory, edgeSymbols) {
+	            var option = this.option;
+	            var precision = option.precision;
+	            var dataBound = this.dataBound;
+	            var formatter = option.formatter;
+	            var isMinMax;
+	            var textValue;
+	            edgeSymbols = edgeSymbols || ['<', '>'];
+
+	            if (zrUtil.isArray(value)) {
+	                value = value.slice();
+	                isMinMax = true;
+	            }
+
+	            textValue = isCategory
+	                ? value
+	                : (isMinMax
+	                    ? [toFixed(value[0]), toFixed(value[1])]
+	                    : toFixed(value)
+	                );
+
+	            if (zrUtil.isString(formatter)) {
+	                return formatter
+	                    .replace('{value}', isMinMax ? textValue[0] : textValue)
+	                    .replace('{value2}', isMinMax ? textValue[1] : textValue);
+	            }
+	            else if (zrUtil.isFunction(formatter)) {
+	                return isMinMax
+	                    ? formatter(value[0], value[1])
+	                    : formatter(value);
+	            }
+
+	            if (isMinMax) {
+	                if (value[0] === dataBound[0]) {
+	                    return edgeSymbols[0] + ' ' + textValue[1];
+	                }
+	                else if (value[1] === dataBound[1]) {
+	                    return edgeSymbols[1] + ' ' + textValue[0];
+	                }
+	                else {
+	                    return textValue[0] + ' - ' + textValue[1];
+	                }
+	            }
+	            else { // Format single value (includes category case).
+	                return textValue;
+	            }
+
+	            function toFixed(val) {
+	                return val === dataBound[0]
+	                    ? 'min'
+	                    : val === dataBound[1]
+	                    ? 'max'
+	                    : (+val).toFixed(precision);
+	            }
+	        },
+
+	        /**
+	         * @protected
+	         */
+	        resetExtent: function () {
+	            var thisOption = this.option;
+
+	            // Can not calculate data extent by data here.
+	            // Because series and data may be modified in processing stage.
+	            // So we do not support the feature "auto min/max".
+
+	            var extent = asc([thisOption.min, thisOption.max]);
+
+	            this._dataExtent = extent;
+	        },
+
+	        /**
+	         * @public
+	         * @param {module:echarts/data/List} list
+	         * @return {string} Concrete dimention. If return null/undefined,
+	         *                  no dimension used.
+	         */
+	        getDataDimension: function (list) {
+	            var optDim = this.option.dimension;
+	            return optDim != null
+	                ? optDim : list.dimensions.length - 1;
+	        },
+
+	        /**
+	         * @public
+	         * @override
+	         */
+	        getExtent: function () {
+	            return this._dataExtent.slice();
+	        },
+
+	        /**
+	         * @protected
+	         */
+	        completeVisualOption: function () {
+	            var thisOption = this.option;
+	            var base = {inRange: thisOption.inRange, outOfRange: thisOption.outOfRange};
+
+	            var target = thisOption.target || (thisOption.target = {});
+	            var controller = thisOption.controller || (thisOption.controller = {});
+
+	            zrUtil.merge(target, base); // Do not override
+	            zrUtil.merge(controller, base); // Do not override
+
+	            var isCategory = this.isCategory();
+
+	            completeSingle.call(this, target);
+	            completeSingle.call(this, controller);
+	            completeInactive.call(this, target, 'inRange', 'outOfRange');
+	            // completeInactive.call(this, target, 'outOfRange', 'inRange');
+	            completeController.call(this, controller);
+
+	            function completeSingle(base) {
+	                // Compatible with ec2 dataRange.color.
+	                // The mapping order of dataRange.color is: [high value, ..., low value]
+	                // whereas inRange.color and outOfRange.color is [low value, ..., high value]
+	                // Notice: ec2 has no inverse.
+	                if (isArray(thisOption.color)
+	                    // If there has been inRange: {symbol: ...}, adding color is a mistake.
+	                    // So adding color only when no inRange defined.
+	                    && !base.inRange
+	                ) {
+	                    base.inRange = {color: thisOption.color.slice().reverse()};
+	                }
+
+	                // Compatible with previous logic, always give a defautl color, otherwise
+	                // simple config with no inRange and outOfRange will not work.
+	                // Originally we use visualMap.color as the default color, but setOption at
+	                // the second time the default color will be erased. So we change to use
+	                // constant DEFAULT_COLOR.
+	                // If user do not want the defualt color, set inRange: {color: null}.
+	                base.inRange = base.inRange || {color: DEFAULT_COLOR};
+
+	                // If using shortcut like: {inRange: 'symbol'}, complete default value.
+	                each(this.stateList, function (state) {
+	                    var visualType = base[state];
+
+	                    if (zrUtil.isString(visualType)) {
+	                        var defa = visualDefault.get(visualType, 'active', isCategory);
+	                        if (defa) {
+	                            base[state] = {};
+	                            base[state][visualType] = defa;
+	                        }
+	                        else {
+	                            // Mark as not specified.
+	                            delete base[state];
+	                        }
+	                    }
+	                }, this);
+	            }
+
+	            function completeInactive(base, stateExist, stateAbsent) {
+	                var optExist = base[stateExist];
+	                var optAbsent = base[stateAbsent];
+
+	                if (optExist && !optAbsent) {
+	                    optAbsent = base[stateAbsent] = {};
+	                    each(optExist, function (visualData, visualType) {
+	                        if (!VisualMapping.isValidType(visualType)) {
+	                            return;
+	                        }
+
+	                        var defa = visualDefault.get(visualType, 'inactive', isCategory);
+
+	                        if (defa != null) {
+	                            optAbsent[visualType] = defa;
+
+	                            // Compatibable with ec2:
+	                            // Only inactive color to rgba(0,0,0,0) can not
+	                            // make label transparent, so use opacity also.
+	                            if (visualType === 'color'
+	                                && !optAbsent.hasOwnProperty('opacity')
+	                                && !optAbsent.hasOwnProperty('colorAlpha')
+	                            ) {
+	                                optAbsent.opacity = [0, 0];
+	                            }
+	                        }
+	                    });
+	                }
+	            }
+
+	            function completeController(controller) {
+	                var symbolExists = (controller.inRange || {}).symbol
+	                    || (controller.outOfRange || {}).symbol;
+	                var symbolSizeExists = (controller.inRange || {}).symbolSize
+	                    || (controller.outOfRange || {}).symbolSize;
+	                var inactiveColor = this.get('inactiveColor');
+
+	                each(this.stateList, function (state) {
+
+	                    var itemSize = this.itemSize;
+	                    var visuals = controller[state];
+
+	                    // Set inactive color for controller if no other color
+	                    // attr (like colorAlpha) specified.
+	                    if (!visuals) {
+	                        visuals = controller[state] = {
+	                            color: isCategory ? inactiveColor : [inactiveColor]
+	                        };
+	                    }
+
+	                    // Consistent symbol and symbolSize if not specified.
+	                    if (visuals.symbol == null) {
+	                        visuals.symbol = symbolExists
+	                            && zrUtil.clone(symbolExists)
+	                            || (isCategory ? 'roundRect' : ['roundRect']);
+	                    }
+	                    if (visuals.symbolSize == null) {
+	                        visuals.symbolSize = symbolSizeExists
+	                            && zrUtil.clone(symbolSizeExists)
+	                            || (isCategory ? itemSize[0] : [itemSize[0], itemSize[0]]);
+	                    }
+
+	                    // Filter square and none.
+	                    visuals.symbol = mapVisual(visuals.symbol, function (symbol) {
+	                        return (symbol === 'none' || symbol === 'square') ? 'roundRect' : symbol;
+	                    });
+
+	                    // Normalize symbolSize
+	                    var symbolSize = visuals.symbolSize;
+
+	                    if (symbolSize != null) {
+	                        var max = -Infinity;
+	                        // symbolSize can be object when categories defined.
+	                        eachVisual(symbolSize, function (value) {
+	                            value > max && (max = value);
+	                        });
+	                        visuals.symbolSize = mapVisual(symbolSize, function (value) {
+	                            return linearMap(value, [0, max], [0, itemSize[0]], true);
+	                        });
+	                    }
+
+	                }, this);
+	            }
+	        },
+
+	        /**
+	         * @protected
+	         */
+	        resetItemSize: function () {
+	            this.itemSize = [
+	                parseFloat(this.get('itemWidth')),
+	                parseFloat(this.get('itemHeight'))
+	            ];
+	        },
+
+	        /**
+	         * @public
+	         */
+	        isCategory: function () {
+	            return !!this.option.categories;
+	        },
+
+	        /**
+	         * @public
+	         * @abstract
+	         */
+	        setSelected: noop,
+
+	        /**
+	         * @public
+	         * @abstract
+	         * @param {*|module:echarts/data/List} valueOrData
+	         * @param {number} dataIndex
+	         * @return {string} state See this.stateList
+	         */
+	        getValueState: noop
+
+	    });
+
+	    module.exports = VisualMapModel;
+
+
+
+/***/ },
+/* 336 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @file Visual mapping.
+	 */
+
+
+	    var zrUtil = __webpack_require__(4);
+
+	    var visualDefault = {
+
+	        /**
+	         * @public
+	         */
+	        get: function (visualType, key, isCategory) {
+	            var value = zrUtil.clone(
+	                (defaultOption[visualType] || {})[key]
+	            );
+
+	            return isCategory
+	                ? (zrUtil.isArray(value) ? value[value.length - 1] : value)
+	                : value;
+	        }
+
+	    };
+
+	    var defaultOption = {
+
+	        color: {
+	            active: ['#006edd', '#e0ffff'],
+	            inactive: ['rgba(0,0,0,0)']
+	        },
+
+	        colorHue: {
+	            active: [0, 360],
+	            inactive: [0, 0]
+	        },
+
+	        colorSaturation: {
+	            active: [0.3, 1],
+	            inactive: [0, 0]
+	        },
+
+	        colorLightness: {
+	            active: [0.9, 0.5],
+	            inactive: [0, 0]
+	        },
+
+	        colorAlpha: {
+	            active: [0.3, 1],
+	            inactive: [0, 0]
+	        },
+
+	        opacity: {
+	            active: [0.3, 1],
+	            inactive: [0, 0]
+	        },
+
+	        symbol: {
+	            active: ['circle', 'roundRect', 'diamond'],
+	            inactive: ['none']
+	        },
+
+	        symbolSize: {
+	            active: [10, 50],
+	            inactive: [0, 0]
+	        }
+	    };
+
+	    module.exports = visualDefault;
+
+
+
+
+/***/ },
+/* 337 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var VisualMapView = __webpack_require__(338);
+	    var graphic = __webpack_require__(43);
+	    var zrUtil = __webpack_require__(4);
+	    var numberUtil = __webpack_require__(7);
+	    var sliderMove = __webpack_require__(323);
+	    var LinearGradient = __webpack_require__(79);
+	    var helper = __webpack_require__(339);
+	    var modelUtil = __webpack_require__(5);
+
+	    var linearMap = numberUtil.linearMap;
+	    var each = zrUtil.each;
+	    var mathMin = Math.min;
+	    var mathMax = Math.max;
+
+	    // Arbitrary value
+	    var HOVER_LINK_SIZE = 12;
+	    var HOVER_LINK_OUT = 6;
+
+	    // Notice:
+	    // Any "interval" should be by the order of [low, high].
+	    // "handle0" (handleIndex === 0) maps to
+	    // low data value: this._dataInterval[0] and has low coord.
+	    // "handle1" (handleIndex === 1) maps to
+	    // high data value: this._dataInterval[1] and has high coord.
+	    // The logic of transform is implemented in this._createBarGroup.
+
+	    var ContinuousView = VisualMapView.extend({
+
+	        type: 'visualMap.continuous',
+
+	        /**
+	         * @override
+	         */
+	        init: function () {
+
+	            ContinuousView.superApply(this, 'init', arguments);
+
+	            /**
+	             * @private
+	             */
+	            this._shapes = {};
+
+	            /**
+	             * @private
+	             */
+	            this._dataInterval = [];
+
+	            /**
+	             * @private
+	             */
+	            this._handleEnds = [];
+
+	            /**
+	             * @private
+	             */
+	            this._orient;
+
+	            /**
+	             * @private
+	             */
+	            this._useHandle;
+
+	            /**
+	             * @private
+	             */
+	            this._hoverLinkDataIndices = [];
+
+	            /**
+	             * @private
+	             */
+	            this._dragging;
+
+	            /**
+	             * @private
+	             */
+	            this._hovering;
+	        },
+
+	        /**
+	         * @protected
+	         * @override
+	         */
+	        doRender: function (visualMapModel, ecModel, api, payload) {
+	            if (!payload || payload.type !== 'selectDataRange' || payload.from !== this.uid) {
+	                this._buildView();
+	            }
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _buildView: function () {
+	            this.group.removeAll();
+
+	            var visualMapModel = this.visualMapModel;
+	            var thisGroup = this.group;
+
+	            this._orient = visualMapModel.get('orient');
+	            this._useHandle = visualMapModel.get('calculable');
+
+	            this._resetInterval();
+
+	            this._renderBar(thisGroup);
+
+	            var dataRangeText = visualMapModel.get('text');
+	            this._renderEndsText(thisGroup, dataRangeText, 0);
+	            this._renderEndsText(thisGroup, dataRangeText, 1);
+
+	            // Do this for background size calculation.
+	            this._updateView(true);
+
+	            // After updating view, inner shapes is built completely,
+	            // and then background can be rendered.
+	            this.renderBackground(thisGroup);
+
+	            // Real update view
+	            this._updateView();
+
+	            this._enableHoverLinkToSeries();
+	            this._enableHoverLinkFromSeries();
+
+	            this.positionGroup(thisGroup);
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _renderEndsText: function (group, dataRangeText, endsIndex) {
+	            if (!dataRangeText) {
+	                return;
+	            }
+
+	            // Compatible with ec2, text[0] map to high value, text[1] map low value.
+	            var text = dataRangeText[1 - endsIndex];
+	            text = text != null ? text + '' : '';
+
+	            var visualMapModel = this.visualMapModel;
+	            var textGap = visualMapModel.get('textGap');
+	            var itemSize = visualMapModel.itemSize;
+
+	            var barGroup = this._shapes.barGroup;
+	            var position = this._applyTransform(
+	                [
+	                    itemSize[0] / 2,
+	                    endsIndex === 0 ? -textGap : itemSize[1] + textGap
+	                ],
+	                barGroup
+	            );
+	            var align = this._applyTransform(
+	                endsIndex === 0 ? 'bottom' : 'top',
+	                barGroup
+	            );
+	            var orient = this._orient;
+	            var textStyleModel = this.visualMapModel.textStyleModel;
+
+	            this.group.add(new graphic.Text({
+	                style: {
+	                    x: position[0],
+	                    y: position[1],
+	                    textVerticalAlign: orient === 'horizontal' ? 'middle' : align,
+	                    textAlign: orient === 'horizontal' ? align : 'center',
+	                    text: text,
+	                    textFont: textStyleModel.getFont(),
+	                    fill: textStyleModel.getTextColor()
+	                }
+	            }));
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _renderBar: function (targetGroup) {
+	            var visualMapModel = this.visualMapModel;
+	            var shapes = this._shapes;
+	            var itemSize = visualMapModel.itemSize;
+	            var orient = this._orient;
+	            var useHandle = this._useHandle;
+	            var itemAlign = helper.getItemAlign(visualMapModel, this.api, itemSize);
+	            var barGroup = shapes.barGroup = this._createBarGroup(itemAlign);
+
+	            // Bar
+	            barGroup.add(shapes.outOfRange = createPolygon());
+	            barGroup.add(shapes.inRange = createPolygon(
+	                null,
+	                useHandle ? 'move' : null,
+	                zrUtil.bind(this._dragHandle, this, 'all', false),
+	                zrUtil.bind(this._dragHandle, this, 'all', true)
+	            ));
+
+	            var textRect = visualMapModel.textStyleModel.getTextRect('国');
+	            var textSize = mathMax(textRect.width, textRect.height);
+
+	            // Handle
+	            if (useHandle) {
+	                shapes.handleThumbs = [];
+	                shapes.handleLabels = [];
+	                shapes.handleLabelPoints = [];
+
+	                this._createHandle(barGroup, 0, itemSize, textSize, orient, itemAlign);
+	                this._createHandle(barGroup, 1, itemSize, textSize, orient, itemAlign);
+	            }
+
+	            this._createIndicator(barGroup, itemSize, textSize, orient);
+
+	            targetGroup.add(barGroup);
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _createHandle: function (barGroup, handleIndex, itemSize, textSize, orient) {
+	            var onDrift = zrUtil.bind(this._dragHandle, this, handleIndex, false);
+	            var onDragEnd = zrUtil.bind(this._dragHandle, this, handleIndex, true);
+	            var handleThumb = createPolygon(
+	                createHandlePoints(handleIndex, textSize),
+	                'move',
+	                onDrift,
+	                onDragEnd
+	            );
+	            handleThumb.position[0] = itemSize[0];
+	            barGroup.add(handleThumb);
+
+	            // Text is always horizontal layout but should not be effected by
+	            // transform (orient/inverse). So label is built separately but not
+	            // use zrender/graphic/helper/RectText, and is located based on view
+	            // group (according to handleLabelPoint) but not barGroup.
+	            var textStyleModel = this.visualMapModel.textStyleModel;
+	            var handleLabel = new graphic.Text({
+	                draggable: true,
+	                drift: onDrift,
+	                ondragend: onDragEnd,
+	                style: {
+	                    x: 0, y: 0, text: '',
+	                    textFont: textStyleModel.getFont(),
+	                    fill: textStyleModel.getTextColor()
+	                }
+	            });
+	            this.group.add(handleLabel);
+
+	            var handleLabelPoint = [
+	                orient === 'horizontal'
+	                    ? textSize / 2
+	                    : textSize * 1.5,
+	                orient === 'horizontal'
+	                    ? (handleIndex === 0 ? -(textSize * 1.5) : (textSize * 1.5))
+	                    : (handleIndex === 0 ? -textSize / 2 : textSize / 2)
+	            ];
+
+	            var shapes = this._shapes;
+	            shapes.handleThumbs[handleIndex] = handleThumb;
+	            shapes.handleLabelPoints[handleIndex] = handleLabelPoint;
+	            shapes.handleLabels[handleIndex] = handleLabel;
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _createIndicator: function (barGroup, itemSize, textSize, orient) {
+	            var indicator = createPolygon([[0, 0]], 'move');
+	            indicator.position[0] = itemSize[0];
+	            indicator.attr({invisible: true, silent: true});
+	            barGroup.add(indicator);
+
+	            var textStyleModel = this.visualMapModel.textStyleModel;
+	            var indicatorLabel = new graphic.Text({
+	                silent: true,
+	                invisible: true,
+	                style: {
+	                    x: 0, y: 0, text: '',
+	                    textFont: textStyleModel.getFont(),
+	                    fill: textStyleModel.getTextColor()
+	                }
+	            });
+	            this.group.add(indicatorLabel);
+
+	            var indicatorLabelPoint = [
+	                orient === 'horizontal' ? textSize / 2 : HOVER_LINK_OUT + 3,
+	                0
+	            ];
+
+	            var shapes = this._shapes;
+	            shapes.indicator = indicator;
+	            shapes.indicatorLabel = indicatorLabel;
+	            shapes.indicatorLabelPoint = indicatorLabelPoint;
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _dragHandle: function (handleIndex, isEnd, dx, dy) {
+	            if (!this._useHandle) {
+	                return;
+	            }
+
+	            this._dragging = !isEnd;
+
+	            if (!isEnd) {
+	                // Transform dx, dy to bar coordination.
+	                var vertex = this._applyTransform([dx, dy], this._shapes.barGroup, true);
+	                this._updateInterval(handleIndex, vertex[1]);
+
+	                // Considering realtime, update view should be executed
+	                // before dispatch action.
+	                this._updateView();
+	            }
+
+	            // dragEnd do not dispatch action when realtime.
+	            if (isEnd === !this.visualMapModel.get('realtime')) { // jshint ignore:line
+	                this.api.dispatchAction({
+	                    type: 'selectDataRange',
+	                    from: this.uid,
+	                    visualMapId: this.visualMapModel.id,
+	                    selected: this._dataInterval.slice()
+	                });
+	            }
+
+	            if (isEnd) {
+	                !this._hovering && this._clearHoverLinkToSeries();
+	            }
+	            else if (useHoverLinkOnHandle(this.visualMapModel)) {
+	                this._doHoverLinkToSeries(this._handleEnds[handleIndex], false);
+	            }
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _resetInterval: function () {
+	            var visualMapModel = this.visualMapModel;
+
+	            var dataInterval = this._dataInterval = visualMapModel.getSelected();
+	            var dataExtent = visualMapModel.getExtent();
+	            var sizeExtent = [0, visualMapModel.itemSize[1]];
+
+	            this._handleEnds = [
+	                linearMap(dataInterval[0], dataExtent, sizeExtent, true),
+	                linearMap(dataInterval[1], dataExtent, sizeExtent, true)
+	            ];
+	        },
+
+	        /**
+	         * @private
+	         * @param {(number|string)} handleIndex 0 or 1 or 'all'
+	         * @param {number} dx
+	         * @param {number} dy
+	         */
+	        _updateInterval: function (handleIndex, delta) {
+	            delta = delta || 0;
+	            var visualMapModel = this.visualMapModel;
+	            var handleEnds = this._handleEnds;
+
+	            sliderMove(
+	                delta,
+	                handleEnds,
+	                [0, visualMapModel.itemSize[1]],
+	                handleIndex === 'all' ? 'rigid' : 'push',
+	                handleIndex
+	            );
+	            var dataExtent = visualMapModel.getExtent();
+	            var sizeExtent = [0, visualMapModel.itemSize[1]];
+	            // Update data interval.
+	            this._dataInterval = [
+	                linearMap(handleEnds[0], sizeExtent, dataExtent, true),
+	                linearMap(handleEnds[1], sizeExtent, dataExtent, true)
+	            ];
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _updateView: function (forSketch) {
+	            var visualMapModel = this.visualMapModel;
+	            var dataExtent = visualMapModel.getExtent();
+	            var shapes = this._shapes;
+
+	            var outOfRangeHandleEnds = [0, visualMapModel.itemSize[1]];
+	            var inRangeHandleEnds = forSketch ? outOfRangeHandleEnds : this._handleEnds;
+
+	            var visualInRange = this._createBarVisual(
+	                this._dataInterval, dataExtent, inRangeHandleEnds, 'inRange'
+	            );
+	            var visualOutOfRange = this._createBarVisual(
+	                dataExtent, dataExtent, outOfRangeHandleEnds, 'outOfRange'
+	            );
+
+	            shapes.inRange
+	                .setStyle({
+	                    fill: visualInRange.barColor,
+	                    opacity: visualInRange.opacity
+	                })
+	                .setShape('points', visualInRange.barPoints);
+	            shapes.outOfRange
+	                .setStyle({
+	                    fill: visualOutOfRange.barColor,
+	                    opacity: visualOutOfRange.opacity
+	                })
+	                .setShape('points', visualOutOfRange.barPoints);
+
+	            this._updateHandle(inRangeHandleEnds, visualInRange);
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _createBarVisual: function (dataInterval, dataExtent, handleEnds, forceState) {
+	            var opts = {
+	                forceState: forceState,
+	                convertOpacityToAlpha: true
+	            };
+	            var colorStops = this._makeColorGradient(dataInterval, opts);
+
+	            var symbolSizes = [
+	                this.getControllerVisual(dataInterval[0], 'symbolSize', opts),
+	                this.getControllerVisual(dataInterval[1], 'symbolSize', opts)
+	            ];
+	            var barPoints = this._createBarPoints(handleEnds, symbolSizes);
+
+	            return {
+	                barColor: new LinearGradient(0, 0, 1, 1, colorStops),
+	                barPoints: barPoints,
+	                handlesColor: [
+	                    colorStops[0].color,
+	                    colorStops[colorStops.length - 1].color
+	                ]
+	            };
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _makeColorGradient: function (dataInterval, opts) {
+	            // Considering colorHue, which is not linear, so we have to sample
+	            // to calculate gradient color stops, but not only caculate head
+	            // and tail.
+	            var sampleNumber = 100; // Arbitrary value.
+	            var colorStops = [];
+	            var step = (dataInterval[1] - dataInterval[0]) / sampleNumber;
+
+	            colorStops.push({
+	                color: this.getControllerVisual(dataInterval[0], 'color', opts),
+	                offset: 0
+	            });
+
+	            for (var i = 1; i < sampleNumber; i++) {
+	                var currValue = dataInterval[0] + step * i;
+	                if (currValue > dataInterval[1]) {
+	                    break;
+	                }
+	                colorStops.push({
+	                    color: this.getControllerVisual(currValue, 'color', opts),
+	                    offset: i / sampleNumber
+	                });
+	            }
+
+	            colorStops.push({
+	                color: this.getControllerVisual(dataInterval[1], 'color', opts),
+	                offset: 1
+	            });
+
+	            return colorStops;
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _createBarPoints: function (handleEnds, symbolSizes) {
+	            var itemSize = this.visualMapModel.itemSize;
+
+	            return [
+	                [itemSize[0] - symbolSizes[0], handleEnds[0]],
+	                [itemSize[0], handleEnds[0]],
+	                [itemSize[0], handleEnds[1]],
+	                [itemSize[0] - symbolSizes[1], handleEnds[1]]
+	            ];
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _createBarGroup: function (itemAlign) {
+	            var orient = this._orient;
+	            var inverse = this.visualMapModel.get('inverse');
+
+	            return new graphic.Group(
+	                (orient === 'horizontal' && !inverse)
+	                ? {scale: itemAlign === 'bottom' ? [1, 1] : [-1, 1], rotation: Math.PI / 2}
+	                : (orient === 'horizontal' && inverse)
+	                ? {scale: itemAlign === 'bottom' ? [-1, 1] : [1, 1], rotation: -Math.PI / 2}
+	                : (orient === 'vertical' && !inverse)
+	                ? {scale: itemAlign === 'left' ? [1, -1] : [-1, -1]}
+	                : {scale: itemAlign === 'left' ? [1, 1] : [-1, 1]}
+	            );
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _updateHandle: function (handleEnds, visualInRange) {
+	            if (!this._useHandle) {
+	                return;
+	            }
+
+	            var shapes = this._shapes;
+	            var visualMapModel = this.visualMapModel;
+	            var handleThumbs = shapes.handleThumbs;
+	            var handleLabels = shapes.handleLabels;
+
+	            each([0, 1], function (handleIndex) {
+	                var handleThumb = handleThumbs[handleIndex];
+	                handleThumb.setStyle('fill', visualInRange.handlesColor[handleIndex]);
+	                handleThumb.position[1] = handleEnds[handleIndex];
+
+	                // Update handle label position.
+	                var textPoint = graphic.applyTransform(
+	                    shapes.handleLabelPoints[handleIndex],
+	                    graphic.getTransform(handleThumb, this.group)
+	                );
+	                handleLabels[handleIndex].setStyle({
+	                    x: textPoint[0],
+	                    y: textPoint[1],
+	                    text: visualMapModel.formatValueText(this._dataInterval[handleIndex]),
+	                    textVerticalAlign: 'middle',
+	                    textAlign: this._applyTransform(
+	                        this._orient === 'horizontal'
+	                            ? (handleIndex === 0 ? 'bottom' : 'top')
+	                            : 'left',
+	                        shapes.barGroup
+	                    )
+	                });
+	            }, this);
+	        },
+
+	        /**
+	         * @private
+	         * @param {number} cursorValue
+	         * @param {number} textValue
+	         * @param {string} [rangeSymbol]
+	         * @param {number} [halfHoverLinkSize]
+	         */
+	        _showIndicator: function (cursorValue, textValue, rangeSymbol, halfHoverLinkSize) {
+	            var visualMapModel = this.visualMapModel;
+	            var dataExtent = visualMapModel.getExtent();
+	            var itemSize = visualMapModel.itemSize;
+	            var sizeExtent = [0, itemSize[1]];
+	            var pos = linearMap(cursorValue, dataExtent, sizeExtent, true);
+
+	            var shapes = this._shapes;
+	            var indicator = shapes.indicator;
+	            if (!indicator) {
+	                return;
+	            }
+
+	            indicator.position[1] = pos;
+	            indicator.attr('invisible', false);
+	            indicator.setShape('points', createIndicatorPoints(
+	                !!rangeSymbol, halfHoverLinkSize, pos, itemSize[1]
+	            ));
+
+	            var opts = {convertOpacityToAlpha: true};
+	            var color = this.getControllerVisual(cursorValue, 'color', opts);
+	            indicator.setStyle('fill', color);
+
+	            // Update handle label position.
+	            var textPoint = graphic.applyTransform(
+	                shapes.indicatorLabelPoint,
+	                graphic.getTransform(indicator, this.group)
+	            );
+
+	            var indicatorLabel = shapes.indicatorLabel;
+	            indicatorLabel.attr('invisible', false);
+	            var align = this._applyTransform('left', shapes.barGroup);
+	            var orient = this._orient;
+	            indicatorLabel.setStyle({
+	                text: (rangeSymbol ? rangeSymbol : '') + visualMapModel.formatValueText(textValue),
+	                textVerticalAlign: orient === 'horizontal' ? align : 'middle',
+	                textAlign: orient === 'horizontal' ? 'center' : align,
+	                x: textPoint[0],
+	                y: textPoint[1]
+	            });
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _enableHoverLinkToSeries: function () {
+	            var self = this;
+	            this._shapes.barGroup
+
+	                .on('mousemove', function (e) {
+	                    self._hovering = true;
+
+	                    if (!self._dragging) {
+	                        var itemSize = self.visualMapModel.itemSize;
+	                        var pos = self._applyTransform(
+	                            [e.offsetX, e.offsetY], self._shapes.barGroup, true, true
+	                        );
+	                        // For hover link show when hover handle, which might be
+	                        // below or upper than sizeExtent.
+	                        pos[1] = mathMin(mathMax(0, pos[1]), itemSize[1]);
+
+	                        self._doHoverLinkToSeries(
+	                            pos[1],
+	                            0 <= pos[0] && pos[0] <= itemSize[0]
+	                        );
+	                    }
+	                })
+
+	                .on('mouseout', function () {
+	                    // When mouse is out of handle, hoverLink still need
+	                    // to be displayed when realtime is set as false.
+	                    self._hovering = false;
+	                    !self._dragging && self._clearHoverLinkToSeries();
+	                });
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _enableHoverLinkFromSeries: function () {
+	            var zr = this.api.getZr();
+
+	            if (this.visualMapModel.option.hoverLink) {
+	                zr.on('mouseover', this._hoverLinkFromSeriesMouseOver, this);
+	                zr.on('mouseout', this._hideIndicator, this);
+	            }
+	            else {
+	                this._clearHoverLinkFromSeries();
+	            }
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _doHoverLinkToSeries: function (cursorPos, hoverOnBar) {
+	            var visualMapModel = this.visualMapModel;
+	            var itemSize = visualMapModel.itemSize;
+
+	            if (!visualMapModel.option.hoverLink) {
+	                return;
+	            }
+
+	            var sizeExtent = [0, itemSize[1]];
+	            var dataExtent = visualMapModel.getExtent();
+
+	            // For hover link show when hover handle, which might be below or upper than sizeExtent.
+	            cursorPos = mathMin(mathMax(sizeExtent[0], cursorPos), sizeExtent[1]);
+
+	            var halfHoverLinkSize = getHalfHoverLinkSize(visualMapModel, dataExtent, sizeExtent);
+	            var hoverRange = [cursorPos - halfHoverLinkSize, cursorPos + halfHoverLinkSize];
+	            var cursorValue = linearMap(cursorPos, sizeExtent, dataExtent, true);
+	            var valueRange = [
+	                linearMap(hoverRange[0], sizeExtent, dataExtent, true),
+	                linearMap(hoverRange[1], sizeExtent, dataExtent, true)
+	            ];
+	            // Consider data range is out of visualMap range, see test/visualMap-continuous.html,
+	            // where china and india has very large population.
+	            hoverRange[0] < sizeExtent[0] && (valueRange[0] = -Infinity);
+	            hoverRange[1] > sizeExtent[1] && (valueRange[1] = Infinity);
+
+	            // Do not show indicator when mouse is over handle,
+	            // otherwise labels overlap, especially when dragging.
+	            if (hoverOnBar) {
+	                if (valueRange[0] === -Infinity) {
+	                    this._showIndicator(cursorValue, valueRange[1], '< ', halfHoverLinkSize);
+	                }
+	                else if (valueRange[1] === Infinity) {
+	                    this._showIndicator(cursorValue, valueRange[0], '> ', halfHoverLinkSize);
+	                }
+	                else {
+	                    this._showIndicator(cursorValue, cursorValue, '≈ ', halfHoverLinkSize);
+	                }
+	            }
+
+	            // When realtime is set as false, handles, which are in barGroup,
+	            // also trigger hoverLink, which help user to realize where they
+	            // focus on when dragging. (see test/heatmap-large.html)
+	            // When realtime is set as true, highlight will not show when hover
+	            // handle, because the label on handle, which displays a exact value
+	            // but not range, might mislead users.
+	            var oldBatch = this._hoverLinkDataIndices;
+	            var newBatch = [];
+	            if (hoverOnBar || useHoverLinkOnHandle(visualMapModel)) {
+	                newBatch = this._hoverLinkDataIndices = visualMapModel.findTargetDataIndices(valueRange);
+	            }
+
+	            var resultBatches = modelUtil.compressBatches(oldBatch, newBatch);
+	            this._dispatchHighDown('downplay', resultBatches[0]);
+	            this._dispatchHighDown('highlight', resultBatches[1]);
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _hoverLinkFromSeriesMouseOver: function (e) {
+	            var el = e.target;
+
+	            if (!el || el.dataIndex == null) {
+	                return;
+	            }
+
+	            var dataModel = el.dataModel || this.ecModel.getSeriesByIndex(el.seriesIndex);
+	            var data = dataModel.getData(el.dataType);
+	            var dim = data.getDimension(this.visualMapModel.getDataDimension(data));
+	            var value = data.get(dim, el.dataIndex, true);
+
+	            if (!isNaN(value)) {
+	                this._showIndicator(value, value);
+	            }
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _hideIndicator: function () {
+	            var shapes = this._shapes;
+	            shapes.indicator && shapes.indicator.attr('invisible', true);
+	            shapes.indicatorLabel && shapes.indicatorLabel.attr('invisible', true);
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _clearHoverLinkToSeries: function () {
+	            this._hideIndicator();
+
+	            var indices = this._hoverLinkDataIndices;
+
+	            this._dispatchHighDown('downplay', indices);
+
+	            indices.length = 0;
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _clearHoverLinkFromSeries: function () {
+	            this._hideIndicator();
+
+	            var zr = this.api.getZr();
+	            zr.off('mouseover', this._hoverLinkFromSeriesMouseOver);
+	            zr.off('mouseout', this._hideIndicator);
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _applyTransform: function (vertex, element, inverse, global) {
+	            var transform = graphic.getTransform(element, global ? null : this.group);
+
+	            return graphic[
+	                zrUtil.isArray(vertex) ? 'applyTransform' : 'transformDirection'
+	            ](vertex, transform, inverse);
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _dispatchHighDown: function (type, batch) {
+	            batch && batch.length && this.api.dispatchAction({
+	                type: type,
+	                batch: batch
+	            });
+	        },
+
+	        /**
+	         * @override
+	         */
+	        dispose: function () {
+	            this._clearHoverLinkFromSeries();
+	            this._clearHoverLinkToSeries();
+	        },
+
+	        /**
+	         * @override
+	         */
+	        remove: function () {
+	            this._clearHoverLinkFromSeries();
+	            this._clearHoverLinkToSeries();
+	        }
+
+	    });
+
+	    function createPolygon(points, cursor, onDrift, onDragEnd) {
+	        return new graphic.Polygon({
+	            shape: {points: points},
+	            draggable: !!onDrift,
+	            cursor: cursor,
+	            drift: onDrift,
+	            ondragend: onDragEnd
+	        });
+	    }
+
+	    function createHandlePoints(handleIndex, textSize) {
+	        return handleIndex === 0
+	            ? [[0, 0], [textSize, 0], [textSize, -textSize]]
+	            : [[0, 0], [textSize, 0], [textSize, textSize]];
+	    }
+
+	    function createIndicatorPoints(isRange, halfHoverLinkSize, pos, extentMax) {
+	        return isRange
+	            ? [ // indicate range
+	                [0, -mathMin(halfHoverLinkSize, mathMax(pos, 0))],
+	                [HOVER_LINK_OUT, 0],
+	                [0, mathMin(halfHoverLinkSize, mathMax(extentMax - pos, 0))]
+	            ]
+	            : [ // indicate single value
+	                [0, 0], [5, -5], [5, 5]
+	            ];
+	    }
+
+	    function getHalfHoverLinkSize(visualMapModel, dataExtent, sizeExtent) {
+	        var halfHoverLinkSize = HOVER_LINK_SIZE / 2;
+	        var hoverLinkDataSize = visualMapModel.get('hoverLinkDataSize');
+	        if (hoverLinkDataSize) {
+	            halfHoverLinkSize = linearMap(hoverLinkDataSize, dataExtent, sizeExtent, true) / 2;
+	        }
+	        return halfHoverLinkSize;
+	    }
+
+	    function useHoverLinkOnHandle(visualMapModel) {
+	        return !visualMapModel.get('realtime') && visualMapModel.get('hoverLinkOnHandle');
+	    }
+
+	    module.exports = ContinuousView;
+
+
+
+/***/ },
+/* 338 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+	    var graphic = __webpack_require__(43);
+	    var formatUtil = __webpack_require__(6);
+	    var layout = __webpack_require__(21);
+	    var echarts = __webpack_require__(1);
+	    var VisualMapping = __webpack_require__(192);
+
+	    module.exports = echarts.extendComponentView({
+
+	        type: 'visualMap',
+
+	        /**
+	         * @readOnly
+	         * @type {Object}
+	         */
+	        autoPositionValues: {left: 1, right: 1, top: 1, bottom: 1},
+
+	        init: function (ecModel, api) {
+	            /**
+	             * @readOnly
+	             * @type {module:echarts/model/Global}
+	             */
+	            this.ecModel = ecModel;
+
+	            /**
+	             * @readOnly
+	             * @type {module:echarts/ExtensionAPI}
+	             */
+	            this.api = api;
+
+	            /**
+	             * @readOnly
+	             * @type {module:echarts/component/visualMap/visualMapModel}
+	             */
+	            this.visualMapModel;
+	        },
+
+	        /**
+	         * @protected
+	         */
+	        render: function (visualMapModel, ecModel, api, payload) {
+	            this.visualMapModel = visualMapModel;
+
+	            if (visualMapModel.get('show') === false) {
+	                this.group.removeAll();
+	                return;
+	            }
+
+	            this.doRender.apply(this, arguments);
+	        },
+
+	        /**
+	         * @protected
+	         */
+	        renderBackground: function (group) {
+	            var visualMapModel = this.visualMapModel;
+	            var padding = formatUtil.normalizeCssArray(visualMapModel.get('padding') || 0);
+	            var rect = group.getBoundingRect();
+
+	            group.add(new graphic.Rect({
+	                z2: -1, // Lay background rect on the lowest layer.
+	                silent: true,
+	                shape: {
+	                    x: rect.x - padding[3],
+	                    y: rect.y - padding[0],
+	                    width: rect.width + padding[3] + padding[1],
+	                    height: rect.height + padding[0] + padding[2]
+	                },
+	                style: {
+	                    fill: visualMapModel.get('backgroundColor'),
+	                    stroke: visualMapModel.get('borderColor'),
+	                    lineWidth: visualMapModel.get('borderWidth')
+	                }
+	            }));
+	        },
+
+	        /**
+	         * @protected
+	         * @param {number} targetValue
+	         * @param {string=} visualCluster Only can be 'color' 'opacity' 'symbol' 'symbolSize'
+	         * @param {Object} [opts]
+	         * @param {string=} [opts.forceState] Specify state, instead of using getValueState method.
+	         * @param {string=} [opts.convertOpacityToAlpha=false] For color gradient in controller widget.
+	         * @return {*} Visual value.
+	         */
+	        getControllerVisual: function (targetValue, visualCluster, opts) {
+	            opts = opts || {};
+
+	            var forceState = opts.forceState;
+	            var visualMapModel = this.visualMapModel;
+	            var visualObj = {};
+
+	            // Default values.
+	            if (visualCluster === 'symbol') {
+	                visualObj.symbol = visualMapModel.get('itemSymbol');
+	            }
+	            if (visualCluster === 'color') {
+	                var defaultColor = visualMapModel.get('contentColor');
+	                visualObj.color = defaultColor;
+	            }
+
+	            function getter(key) {
+	                return visualObj[key];
+	            }
+
+	            function setter(key, value) {
+	                visualObj[key] = value;
+	            }
+
+	            var mappings = visualMapModel.controllerVisuals[
+	                forceState || visualMapModel.getValueState(targetValue)
+	            ];
+	            var visualTypes = VisualMapping.prepareVisualTypes(mappings);
+
+	            zrUtil.each(visualTypes, function (type) {
+	                var visualMapping = mappings[type];
+	                if (opts.convertOpacityToAlpha && type === 'opacity') {
+	                    type = 'colorAlpha';
+	                    visualMapping = mappings.__alphaForOpacity;
+	                }
+	                if (VisualMapping.dependsOn(type, visualCluster)) {
+	                    visualMapping && visualMapping.applyVisual(
+	                        targetValue, getter, setter
+	                    );
+	                }
+	            });
+
+	            return visualObj[visualCluster];
+	        },
+
+	        /**
+	         * @protected
+	         */
+	        positionGroup: function (group) {
+	            var model = this.visualMapModel;
+	            var api = this.api;
+
+	            layout.positionGroup(
+	                group,
+	                model.getBoxLayoutParams(),
+	                {width: api.getWidth(), height: api.getHeight()}
+	            );
+	        },
+
+	        /**
+	         * @protected
+	         * @abstract
+	         */
+	        doRender: zrUtil.noop
+
+	    });
+
+
+
+/***/ },
+/* 339 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var layout = __webpack_require__(21);
+
+	    var helper = {
+
+	        /**
+	         * @param {module:echarts/component/visualMap/VisualMapModel} visualMapModel\
+	         * @param {module:echarts/ExtensionAPI} api
+	         * @param {Array.<number>} itemSize always [short, long]
+	         * @return {string} 'left' or 'right' or 'top' or 'bottom'
+	         */
+	        getItemAlign: function (visualMapModel, api, itemSize) {
+	            var modelOption = visualMapModel.option;
+	            var itemAlign = modelOption.align;
+
+	            if (itemAlign != null && itemAlign !== 'auto') {
+	                return itemAlign;
+	            }
+
+	            // Auto decision align.
+	            var ecSize = {width: api.getWidth(), height: api.getHeight()};
+	            var realIndex = modelOption.orient === 'horizontal' ? 1 : 0;
+
+	            var paramsSet = [
+	                ['left', 'right', 'width'],
+	                ['top', 'bottom', 'height']
+	            ];
+	            var reals = paramsSet[realIndex];
+	            var fakeValue = [0, null, 10];
+
+	            var layoutInput = {};
+	            for (var i = 0; i < 3; i++) {
+	                layoutInput[paramsSet[1 - realIndex][i]] = fakeValue[i];
+	                layoutInput[reals[i]] = i === 2 ? itemSize[0] : modelOption[reals[i]];
+	            }
+
+	            var rParam = [['x', 'width', 3], ['y', 'height', 0]][realIndex];
+	            var rect = layout.getLayoutRect(layoutInput, ecSize, modelOption.padding);
+
+	            return reals[
+	                (rect.margin[rParam[2]] || 0) + rect[rParam[0]] + rect[rParam[1]] * 0.5
+	                    < ecSize[rParam[1]] * 0.5 ? 0 : 1
+	            ];
+	        }
+
+	    };
+
+
+	    module.exports = helper;
+
+
+
+/***/ },
+/* 340 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @file Data range action
+	 */
+
+
+	    var echarts = __webpack_require__(1);
+
+	    var actionInfo = {
+	        type: 'selectDataRange',
+	        event: 'dataRangeSelected',
+	        // FIXME use updateView appears wrong
+	        update: 'update'
+	    };
+
+	    echarts.registerAction(actionInfo, function (payload, ecModel) {
+
+	        ecModel.eachComponent({mainType: 'visualMap', query: payload}, function (model) {
+	            model.setSelected(payload.selected);
+	        });
+
+	    });
+
+
+
+/***/ },
+/* 341 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * DataZoom component entry
+	 */
+
+
+	    __webpack_require__(1).registerPreprocessor(
+	        __webpack_require__(331)
+	    );
+
+	    __webpack_require__(332);
+	    __webpack_require__(333);
+	    __webpack_require__(342);
+	    __webpack_require__(343);
+	    __webpack_require__(340);
+
+
+
+/***/ },
+/* 342 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var VisualMapModel = __webpack_require__(335);
+	    var zrUtil = __webpack_require__(4);
+	    var VisualMapping = __webpack_require__(192);
+
+	    var PiecewiseModel = VisualMapModel.extend({
+
+	        type: 'visualMap.piecewise',
+
+	        /**
+	         * Order Rule:
+	         *
+	         * option.categories / option.pieces / option.text / option.selected:
+	         *     If !option.inverse,
+	         *     Order when vertical: ['top', ..., 'bottom'].
+	         *     Order when horizontal: ['left', ..., 'right'].
+	         *     If option.inverse, the meaning of
+	         *     the order should be reversed.
+	         *
+	         * this._pieceList:
+	         *     The order is always [low, ..., high].
+	         *
+	         * Mapping from location to low-high:
+	         *     If !option.inverse
+	         *     When vertical, top is high.
+	         *     When horizontal, right is high.
+	         *     If option.inverse, reverse.
+	         */
+
+	        /**
+	         * @protected
+	         */
+	        defaultOption: {
+	            selected: null,             // Object. If not specified, means selected.
+	                                        // When pieces and splitNumber: {'0': true, '5': true}
+	                                        // When categories: {'cate1': false, 'cate3': true}
+	                                        // When selected === false, means all unselected.
+	            align: 'auto',              // 'auto', 'left', 'right'
+	            itemWidth: 20,              // When put the controller vertically, it is the length of
+	                                        // horizontal side of each item. Otherwise, vertical side.
+	            itemHeight: 14,             // When put the controller vertically, it is the length of
+	                                        // vertical side of each item. Otherwise, horizontal side.
+	            itemSymbol: 'roundRect',
+	            pieceList: null,            // Each item is Object, with some of those attrs:
+	                                        // {min, max, lt, gt, lte, gte, value,
+	                                        // color, colorSaturation, colorAlpha, opacity,
+	                                        // symbol, symbolSize}, which customize the range or visual
+	                                        // coding of the certain piece. Besides, see "Order Rule".
+	            categories: null,           // category names, like: ['some1', 'some2', 'some3'].
+	                                        // Attr min/max are ignored when categories set. See "Order Rule"
+	            splitNumber: 5,             // If set to 5, auto split five pieces equally.
+	                                        // If set to 0 and component type not set, component type will be
+	                                        // determined as "continuous". (It is less reasonable but for ec2
+	                                        // compatibility, see echarts/component/visualMap/typeDefaulter)
+	            selectedMode: 'multiple',   // Can be 'multiple' or 'single'.
+	            itemGap: 10,                // The gap between two items, in px.
+	            hoverLink: true             // Enable hover highlight.
+	        },
+
+	        /**
+	         * @override
+	         */
+	        optionUpdated: function (newOption, isInit) {
+	            PiecewiseModel.superApply(this, 'optionUpdated', arguments);
+
+	            /**
+	             * The order is always [low, ..., high].
+	             * [{text: string, interval: Array.<number>}, ...]
+	             * @private
+	             * @type {Array.<Object>}
+	             */
+	            this._pieceList = [];
+
+	            this.resetTargetSeries();
+	            this.resetExtent();
+
+	            /**
+	             * 'pieces', 'categories', 'splitNumber'
+	             * @type {string}
+	             */
+	            var mode = this._mode = this._determineMode();
+
+	            resetMethods[this._mode].call(this);
+
+	            this._resetSelected(newOption, isInit);
+
+	            var categories = this.option.categories;
+
+	            this.resetVisual(function (mappingOption, state) {
+	                if (mode === 'categories') {
+	                    mappingOption.mappingMethod = 'category';
+	                    mappingOption.categories = zrUtil.clone(categories);
+	                }
+	                else {
+	                    mappingOption.dataExtent = this.getExtent();
+	                    mappingOption.mappingMethod = 'piecewise';
+	                    mappingOption.pieceList = zrUtil.map(this._pieceList, function (piece) {
+	                        var piece = zrUtil.clone(piece);
+	                        if (state !== 'inRange') {
+	                            piece.visual = null;
+	                        }
+	                        return piece;
+	                    });
+	                }
+	            });
+	        },
+
+	        _resetSelected: function (newOption, isInit) {
+	            var thisOption = this.option;
+	            var pieceList = this._pieceList;
+
+	            // Selected do not merge but all override.
+	            var selected = (isInit ? thisOption : newOption).selected || {};
+	            thisOption.selected = selected;
+
+	            // Consider 'not specified' means true.
+	            zrUtil.each(pieceList, function (piece, index) {
+	                var key = this.getSelectedMapKey(piece);
+	                if (!(key in selected)) {
+	                    selected[key] = true;
+	                }
+	            }, this);
+
+	            if (thisOption.selectedMode === 'single') {
+	                // Ensure there is only one selected.
+	                var hasSel = false;
+
+	                zrUtil.each(pieceList, function (piece, index) {
+	                    var key = this.getSelectedMapKey(piece);
+	                    if (selected[key]) {
+	                        hasSel
+	                            ? (selected[key] = false)
+	                            : (hasSel = true);
+	                    }
+	                }, this);
+	            }
+	            // thisOption.selectedMode === 'multiple', default: all selected.
+	        },
+
+	        /**
+	         * @public
+	         */
+	        getSelectedMapKey: function (piece) {
+	            return this._mode === 'categories'
+	                ? piece.value + '' : piece.index + '';
+	        },
+
+	        /**
+	         * @public
+	         */
+	        getPieceList: function () {
+	            return this._pieceList;
+	        },
+
+	        /**
+	         * @private
+	         * @return {string}
+	         */
+	        _determineMode: function () {
+	            var option = this.option;
+
+	            return option.pieces && option.pieces.length > 0
+	                ? 'pieces'
+	                : this.option.categories
+	                ? 'categories'
+	                : 'splitNumber';
+	        },
+
+	        /**
+	         * @public
+	         * @override
+	         */
+	        setSelected: function (selected) {
+	            this.option.selected = zrUtil.clone(selected);
+	        },
+
+	        /**
+	         * @public
+	         * @override
+	         */
+	        getValueState: function (value) {
+	            var index = VisualMapping.findPieceIndex(value, this._pieceList);
+
+	            return index != null
+	                ? (this.option.selected[this.getSelectedMapKey(this._pieceList[index])]
+	                    ? 'inRange' : 'outOfRange'
+	                )
+	                : 'outOfRange';
+	        },
+
+	        /**
+	         * @public
+	         * @params {number} pieceIndex piece index in visualMapModel.getPieceList()
+	         * @return {Array.<Object>} [{seriesId, dataIndices: <Array.<number>>}, ...]
+	         */
+	        findTargetDataIndices: function (pieceIndex) {
+	            var result = [];
+
+	            this.eachTargetSeries(function (seriesModel) {
+	                var dataIndices = [];
+	                var data = seriesModel.getData();
+
+	                data.each(this.getDataDimension(data), function (value, dataIndex) {
+	                    // Should always base on model pieceList, because it is order sensitive.
+	                    var pIdx = VisualMapping.findPieceIndex(value, this._pieceList);
+	                    pIdx === pieceIndex && dataIndices.push(dataIndex);
+	                }, true, this);
+
+	                result.push({seriesId: seriesModel.id, dataIndex: dataIndices});
+	            }, this);
+
+	            return result;
+	        },
+
+	        /**
+	         * @private
+	         */
+	        getRepresentValue: function (piece) {
+	            var representValue;
+	            if (this.isCategory()) {
+	                representValue = piece.value;
+	            }
+	            else {
+	                if (piece.value != null) {
+	                    representValue = piece.value;
+	                }
+	                else {
+	                    var pieceInterval = piece.interval || [];
+	                    representValue = (pieceInterval[0] + pieceInterval[1]) / 2;
+	                }
+	            }
+	            return representValue;
+	        },
+
+	        getStops: function (seriesModel, getColorVisual) {
+	            var result = [];
+	            var model = this;
+
+	            var curr = -Infinity;
+	            zrUtil.each(this._pieceList, function (piece) {
+	                // Do not support category yet.
+	                var interval = piece.interval;
+	                if (interval) {
+	                    interval[0] > curr && setPiece({
+	                        interval: [curr, interval[0]],
+	                        valueState: 'outOfRange'
+	                    });
+	                    setPiece({
+	                        interval: interval.slice(),
+	                        valueState: this.getValueState((interval[0] + interval[1]) / 2)
+	                    });
+	                    curr = interval[1];
+	                }
+	            }, this);
+
+	            return result;
+
+	            function setPiece(piece) {
+	                result.push(piece);
+	                piece.color = getColorVisual(
+	                    model, model.getRepresentValue(piece), piece.valueState
+	                );
+	            }
+	        }
+
+	    });
+
+	    /**
+	     * Key is this._mode
+	     * @type {Object}
+	     * @this {module:echarts/component/viusalMap/PiecewiseMode}
+	     */
+	    var resetMethods = {
+
+	        splitNumber: function () {
+	            var thisOption = this.option;
+	            var pieceList = this._pieceList;
+	            var precision = thisOption.precision;
+	            var dataExtent = this.getExtent();
+	            var splitNumber = thisOption.splitNumber;
+	            splitNumber = Math.max(parseInt(splitNumber, 10), 1);
+	            thisOption.splitNumber = splitNumber;
+
+	            var splitStep = (dataExtent[1] - dataExtent[0]) / splitNumber;
+	            // Precision auto-adaption
+	            while (+splitStep.toFixed(precision) !== splitStep && precision < 5) {
+	                precision++;
+	            }
+	            thisOption.precision = precision;
+	            splitStep = +splitStep.toFixed(precision);
+
+	            for (var i = 0, curr = dataExtent[0]; i < splitNumber; i++, curr += splitStep) {
+	                var max = i === splitNumber - 1 ? dataExtent[1] : (curr + splitStep);
+
+	                pieceList.push({
+	                    index: i,
+	                    interval: [curr, max],
+	                    close: [1, 1]
+	                });
+	            }
+
+	            normalizePieces(pieceList);
+
+	            zrUtil.each(pieceList, function (piece) {
+	                piece.text = this.formatValueText(piece.interval);
+	            }, this);
+	        },
+
+	        categories: function () {
+	            var thisOption = this.option;
+	            zrUtil.each(thisOption.categories, function (cate) {
+	                // FIXME category模式也使用pieceList，但在visualMapping中不是使用pieceList。
+	                // 是否改一致。
+	                this._pieceList.push({
+	                    text: this.formatValueText(cate, true),
+	                    value: cate
+	                });
+	            }, this);
+
+	            // See "Order Rule".
+	            normalizeReverse(thisOption, this._pieceList);
+	        },
+
+	        pieces: function () {
+	            var thisOption = this.option;
+	            var pieceList = this._pieceList;
+
+	            zrUtil.each(thisOption.pieces, function (pieceListItem, index) {
+
+	                if (!zrUtil.isObject(pieceListItem)) {
+	                    pieceListItem = {value: pieceListItem};
+	                }
+
+	                var item = {text: '', index: index};
+
+	                if (pieceListItem.label != null) {
+	                    item.text = pieceListItem.label;
+	                }
+
+	                if (pieceListItem.hasOwnProperty('value')) {
+	                    var value = item.value = pieceListItem.value;
+	                    item.interval = [value, value];
+	                    item.close = [1, 1];
+	                }
+	                else {
+	                    // `min` `max` is legacy option.
+	                    // `lt` `gt` `lte` `gte` is recommanded.
+	                    var interval = item.interval = [];
+	                    var close = item.close = [0, 0];
+
+	                    var closeList = [1, 0, 1];
+	                    var infinityList = [-Infinity, Infinity];
+
+	                    var useMinMax = [];
+	                    for (var lg = 0; lg < 2; lg++) {
+	                        var names = [['gte', 'gt', 'min'], ['lte', 'lt', 'max']][lg];
+	                        for (var i = 0; i < 3 && interval[lg] == null; i++) {
+	                            interval[lg] = pieceListItem[names[i]];
+	                            close[lg] = closeList[i];
+	                            useMinMax[lg] = i === 2;
+	                        }
+	                        interval[lg] == null && (interval[lg] = infinityList[lg]);
+	                    }
+	                    useMinMax[0] && interval[1] === Infinity && (close[0] = 0);
+	                    useMinMax[1] && interval[0] === -Infinity && (close[1] = 0);
+
+	                    if (true) {
+	                        if (interval[0] > interval[1]) {
+	                            console.warn(
+	                                'Piece ' + index + 'is illegal: ' + interval
+	                                + ' lower bound should not greater then uppper bound.'
+	                            );
+	                        }
+	                    }
+
+	                    if (interval[0] === interval[1] && close[0] && close[1]) {
+	                        // Consider: [{min: 5, max: 5, visual: {...}}, {min: 0, max: 5}],
+	                        // we use value to lift the priority when min === max
+	                        item.value = interval[0];
+	                    }
+	                }
+
+	                item.visual = VisualMapping.retrieveVisuals(pieceListItem);
+
+	                pieceList.push(item);
+
+	            }, this);
+
+	            // See "Order Rule".
+	            normalizeReverse(thisOption, pieceList);
+	            // Only pieces
+	            normalizePieces(pieceList);
+
+	            zrUtil.each(pieceList, function (piece) {
+	                var close = piece.close;
+	                var edgeSymbols = [['<', '≤'][close[1]], ['>', '≥'][close[0]]];
+	                piece.text = piece.text || this.formatValueText(
+	                    piece.value != null ? piece.value : piece.interval,
+	                    false,
+	                    edgeSymbols
+	                );
+	            }, this);
+	        }
+	    };
+
+	    function normalizeReverse(thisOption, pieceList) {
+	        var inverse = thisOption.inverse;
+	        if (thisOption.orient === 'vertical' ? !inverse : inverse) {
+	             pieceList.reverse();
+	        }
+	    }
+
+	    // Reorder, remove duplicate, which are needed when using gradient.
+	    // Not applicable for categories.
+	    function normalizePieces(pieceList) {
+	        pieceList.sort(function (a, b) {
+	            return littleThan(a, b) ? -1 : 1;
+	        });
+
+	        var curr = -Infinity;
+	        for (var i = 0; i < pieceList.length; i++) {
+	            var interval = pieceList[i].interval;
+	            var close = pieceList[i].close;
+	            for (var lg = 0; lg < 2; lg++) {
+	                if (interval[lg] < curr) {
+	                    interval[lg] = curr;
+	                    close[lg] = 1 - lg;
+	                }
+	                curr = interval[lg];
+	            }
+	        }
+	        // console.log(JSON.stringify(pieceList.map(a => a.interval)));
+
+	        function littleThan(piece, standard, lg) {
+	            lg = lg || 0;
+	            return piece.interval[lg] < standard.interval[lg]
+	                || (
+	                    piece.interval[lg] === standard.interval[lg]
+	                    && (
+	                        +piece.close[lg] > standard.close[lg]
+	                        || littleThan(piece, standard, 1)
+	                    )
+	                );
+	        }
+	    }
+
+	    module.exports = PiecewiseModel;
+
+
+/***/ },
+/* 343 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var VisualMapView = __webpack_require__(338);
+	    var zrUtil = __webpack_require__(4);
+	    var graphic = __webpack_require__(43);
+	    var symbolCreators = __webpack_require__(106);
+	    var layout = __webpack_require__(21);
+	    var helper = __webpack_require__(339);
+
+	    var PiecewiseVisualMapView = VisualMapView.extend({
+
+	        type: 'visualMap.piecewise',
+
+	        /**
+	         * @protected
+	         * @override
+	         */
+	        doRender: function () {
+	            var thisGroup = this.group;
+
+	            thisGroup.removeAll();
+
+	            var visualMapModel = this.visualMapModel;
+	            var textGap = visualMapModel.get('textGap');
+	            var textStyleModel = visualMapModel.textStyleModel;
+	            var textFont = textStyleModel.getFont();
+	            var textFill = textStyleModel.getTextColor();
+	            var itemAlign = this._getItemAlign();
+	            var itemSize = visualMapModel.itemSize;
+
+	            var viewData = this._getViewData();
+	            var showLabel = !viewData.endsText;
+	            var showEndsText = !showLabel;
+
+	            showEndsText && this._renderEndsText(thisGroup, viewData.endsText[0], itemSize);
+
+	            zrUtil.each(viewData.viewPieceList, renderItem, this);
+
+	            showEndsText && this._renderEndsText(thisGroup, viewData.endsText[1], itemSize);
+
+	            layout.box(
+	                visualMapModel.get('orient'), thisGroup, visualMapModel.get('itemGap')
+	            );
+
+	            this.renderBackground(thisGroup);
+
+	            this.positionGroup(thisGroup);
+
+	            function renderItem(item) {
+	                var piece = item.piece;
+
+	                var itemGroup = new graphic.Group();
+	                itemGroup.onclick = zrUtil.bind(this._onItemClick, this, piece);
+
+	                this._enableHoverLink(itemGroup, item.indexInModelPieceList);
+
+	                var representValue = visualMapModel.getRepresentValue(piece);
+
+	                this._createItemSymbol(
+	                    itemGroup, representValue, [0, 0, itemSize[0], itemSize[1]]
+	                );
+
+	                if (showLabel) {
+	                    var visualState = this.visualMapModel.getValueState(representValue);
+
+	                    itemGroup.add(new graphic.Text({
+	                        style: {
+	                            x: itemAlign === 'right' ? -textGap : itemSize[0] + textGap,
+	                            y: itemSize[1] / 2,
+	                            text: piece.text,
+	                            textVerticalAlign: 'middle',
+	                            textAlign: itemAlign,
+	                            textFont: textFont,
+	                            fill: textFill,
+	                            opacity: visualState === 'outOfRange' ? 0.5 : 1
+	                        }
+	                    }));
+	                }
+
+	                thisGroup.add(itemGroup);
+	            }
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _enableHoverLink: function (itemGroup, pieceIndex) {
+	            itemGroup
+	                .on('mouseover', zrUtil.bind(onHoverLink, this, 'highlight'))
+	                .on('mouseout', zrUtil.bind(onHoverLink, this, 'downplay'));
+
+	            function onHoverLink(method) {
+	                var visualMapModel = this.visualMapModel;
+
+	                visualMapModel.option.hoverLink && this.api.dispatchAction({
+	                    type: method,
+	                    batch: visualMapModel.findTargetDataIndices(pieceIndex)
+	                });
+	            }
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _getItemAlign: function () {
+	            var visualMapModel = this.visualMapModel;
+	            var modelOption = visualMapModel.option;
+
+	            if (modelOption.orient === 'vertical') {
+	                return helper.getItemAlign(
+	                    visualMapModel, this.api, visualMapModel.itemSize
+	                );
+	            }
+	            else { // horizontal, most case left unless specifying right.
+	                var align = modelOption.align;
+	                if (!align || align === 'auto') {
+	                    align = 'left';
+	                }
+	                return align;
+	            }
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _renderEndsText: function (group, text, itemSize) {
+	            if (!text) {
+	                return;
+	            }
+
+	            var itemGroup = new graphic.Group();
+	            var textStyleModel = this.visualMapModel.textStyleModel;
+
+	            itemGroup.add(new graphic.Text({
+	                style: {
+	                    x: itemSize[0] / 2,
+	                    y: itemSize[1] / 2,
+	                    textVerticalAlign: 'middle',
+	                    textAlign: 'center',
+	                    text: text,
+	                    textFont: textStyleModel.getFont(),
+	                    fill: textStyleModel.getTextColor()
+	                }
+	            }));
+
+	            group.add(itemGroup);
+	        },
+
+	        /**
+	         * @private
+	         * @return {Object} {peiceList, endsText} The order is the same as screen pixel order.
+	         */
+	        _getViewData: function () {
+	            var visualMapModel = this.visualMapModel;
+
+	            var viewPieceList = zrUtil.map(visualMapModel.getPieceList(), function (piece, index) {
+	                return {piece: piece, indexInModelPieceList: index};
+	            });
+	            var endsText = visualMapModel.get('text');
+
+	            // Consider orient and inverse.
+	            var orient = visualMapModel.get('orient');
+	            var inverse = visualMapModel.get('inverse');
+
+	            // Order of model pieceList is always [low, ..., high]
+	            if (orient === 'horizontal' ? inverse : !inverse) {
+	                viewPieceList.reverse();
+	            }
+	            // Origin order of endsText is [high, low]
+	            else if (endsText) {
+	                endsText = endsText.slice().reverse();
+	            }
+
+	            return {viewPieceList: viewPieceList, endsText: endsText};
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _createItemSymbol: function (group, representValue, shapeParam) {
+	            group.add(symbolCreators.createSymbol(
+	                this.getControllerVisual(representValue, 'symbol'),
+	                shapeParam[0], shapeParam[1], shapeParam[2], shapeParam[3],
+	                this.getControllerVisual(representValue, 'color')
+	            ));
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _onItemClick: function (piece) {
+	            var visualMapModel = this.visualMapModel;
+	            var option = visualMapModel.option;
+	            var selected = zrUtil.clone(option.selected);
+	            var newKey = visualMapModel.getSelectedMapKey(piece);
+
+	            if (option.selectedMode === 'single') {
+	                selected[newKey] = true;
+	                zrUtil.each(selected, function (o, key) {
+	                    selected[key] = key === newKey;
+	                });
+	            }
+	            else {
+	                selected[newKey] = !selected[newKey];
+	            }
+
+	            this.api.dispatchAction({
+	                type: 'selectDataRange',
+	                from: this.uid,
+	                visualMapId: this.visualMapModel.id,
+	                selected: selected
+	            });
+	        }
+	    });
+
+	    module.exports = PiecewiseVisualMapView;
+
+
+
+/***/ },
+/* 344 */
+/***/ function(module, exports, __webpack_require__) {
+
+	// HINT Markpoint can't be used too much
+
+
+	    __webpack_require__(345);
+	    __webpack_require__(347);
+
+	    __webpack_require__(1).registerPreprocessor(function (opt) {
+	        // Make sure markPoint component is enabled
+	        opt.markPoint = opt.markPoint || {};
+	    });
+
+
+/***/ },
+/* 345 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    module.exports = __webpack_require__(346).extend({
+
+	        type: 'markPoint',
+
+	        defaultOption: {
+	            zlevel: 0,
+	            z: 5,
+	            symbol: 'pin',
+	            symbolSize: 50,
+	            //symbolRotate: 0,
+	            //symbolOffset: [0, 0]
+	            tooltip: {
+	                trigger: 'item'
+	            },
+	            label: {
+	                normal: {
+	                    show: true,
+	                    position: 'inside'
+	                },
+	                emphasis: {
+	                    show: true
+	                }
+	            },
+	            itemStyle: {
+	                normal: {
+	                    borderWidth: 2
+	                }
+	            }
+	        }
+	    });
+
+
+/***/ },
+/* 346 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var modelUtil = __webpack_require__(5);
+	    var zrUtil = __webpack_require__(4);
+	    var env = __webpack_require__(2);
+
+	    var formatUtil = __webpack_require__(6);
+	    var addCommas = formatUtil.addCommas;
+	    var encodeHTML = formatUtil.encodeHTML;
+
+	    function fillLabel(opt) {
+	        modelUtil.defaultEmphasis(
+	            opt.label,
+	            modelUtil.LABEL_OPTIONS
+	        );
+	    }
+	    var MarkerModel = __webpack_require__(1).extendComponentModel({
+
+	        type: 'marker',
+
+	        dependencies: ['series', 'grid', 'polar', 'geo'],
+	        /**
+	         * @overrite
+	         */
+	        init: function (option, parentModel, ecModel, extraOpt) {
+
+	            if (true) {
+	                if (this.type === 'marker') {
+	                    throw new Error('Marker component is abstract component. Use markLine, markPoint, markArea instead.');
+	                }
+	            }
+	            this.mergeDefaultAndTheme(option, ecModel);
+	            this.mergeOption(option, ecModel, extraOpt.createdBySelf, true);
+	        },
+
+	        /**
+	         * @return {boolean}
+	         */
+	        ifEnableAnimation: function () {
+	            if (env.node) {
+	                return false;
+	            }
+
+	            var hostSeries = this.__hostSeries;
+	            return this.getShallow('animation') && hostSeries && hostSeries.ifEnableAnimation();
+	        },
+
+	        mergeOption: function (newOpt, ecModel, createdBySelf, isInit) {
+	            var MarkerModel = this.constructor;
+	            var modelPropName = this.mainType + 'Model';
+	            if (!createdBySelf) {
+	                ecModel.eachSeries(function (seriesModel) {
+
+	                    var markerOpt = seriesModel.get(this.mainType);
+
+	                    var markerModel = seriesModel[modelPropName];
+	                    if (!markerOpt || !markerOpt.data) {
+	                        seriesModel[modelPropName] = null;
+	                        return;
+	                    }
+	                    if (!markerModel) {
+	                        if (isInit) {
+	                            // Default label emphasis `position` and `show`
+	                            fillLabel(markerOpt);
+	                        }
+	                        zrUtil.each(markerOpt.data, function (item) {
+	                            // FIXME Overwrite fillLabel method ?
+	                            if (item instanceof Array) {
+	                                fillLabel(item[0]);
+	                                fillLabel(item[1]);
+	                            }
+	                            else {
+	                                fillLabel(item);
+	                            }
+	                        });
+	                        var opt = {
+	                            mainType: this.mainType,
+	                            // Use the same series index and name
+	                            seriesIndex: seriesModel.seriesIndex,
+	                            name: seriesModel.name,
+	                            createdBySelf: true
+	                        };
+	                        markerModel = new MarkerModel(
+	                            markerOpt, this, ecModel, opt
+	                        );
+	                        markerModel.__hostSeries = seriesModel;
+	                    }
+	                    else {
+	                        markerModel.mergeOption(markerOpt, ecModel, true);
+	                    }
+	                    seriesModel[modelPropName] = markerModel;
+	                }, this);
+	            }
+	        },
+
+	        formatTooltip: function (dataIndex) {
+	            var data = this.getData();
+	            var value = this.getRawValue(dataIndex);
+	            var formattedValue = zrUtil.isArray(value)
+	                ? zrUtil.map(value, addCommas).join(', ') : addCommas(value);
+	            var name = data.getName(dataIndex);
+	            var html = this.name;
+	            if (value != null || name) {
+	                html += '<br />';
+	            }
+	            if (name) {
+	                html += encodeHTML(name);
+	                if (value != null) {
+	                    html += ' : ';
+	                }
+	            }
+	            if (value != null) {
+	                html += formattedValue;
+	            }
+	            return html;
+	        },
+
+	        getData: function () {
+	            return this._data;
+	        },
+
+	        setData: function (data) {
+	            this._data = data;
+	        }
+	    });
+
+	    zrUtil.mixin(MarkerModel, modelUtil.dataFormatMixin);
+
+	    module.exports = MarkerModel;
+
+
+/***/ },
+/* 347 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var SymbolDraw = __webpack_require__(104);
+	    var zrUtil = __webpack_require__(4);
+	    var numberUtil = __webpack_require__(7);
+
+	    var List = __webpack_require__(97);
+
+	    var markerHelper = __webpack_require__(348);
+
+	    function updateMarkerLayout(mpData, seriesModel, api) {
+	        var coordSys = seriesModel.coordinateSystem;
+	        mpData.each(function (idx) {
+	            var itemModel = mpData.getItemModel(idx);
+	            var point;
+	            var xPx = numberUtil.parsePercent(itemModel.get('x'), api.getWidth());
+	            var yPx = numberUtil.parsePercent(itemModel.get('y'), api.getHeight());
+	            if (!isNaN(xPx) && !isNaN(yPx)) {
+	                point = [xPx, yPx];
+	            }
+	            // Chart like bar may have there own marker positioning logic
+	            else if (seriesModel.getMarkerPosition) {
+	                // Use the getMarkerPoisition
+	                point = seriesModel.getMarkerPosition(
+	                    mpData.getValues(mpData.dimensions, idx)
+	                );
+	            }
+	            else if (coordSys) {
+	                var x = mpData.get(coordSys.dimensions[0], idx);
+	                var y = mpData.get(coordSys.dimensions[1], idx);
+	                point = coordSys.dataToPoint([x, y]);
+
+	            }
+
+	            // Use x, y if has any
+	            if (!isNaN(xPx)) {
+	                point[0] = xPx;
+	            }
+	            if (!isNaN(yPx)) {
+	                point[1] = yPx;
+	            }
+
+	            mpData.setItemLayout(idx, point);
+	        });
+	    }
+
+	    __webpack_require__(349).extend({
+
+	        type: 'markPoint',
+
+	        updateLayout: function (markPointModel, ecModel, api) {
+	            ecModel.eachSeries(function (seriesModel) {
+	                var mpModel = seriesModel.markPointModel;
+	                if (mpModel) {
+	                    updateMarkerLayout(mpModel.getData(), seriesModel, api);
+	                    this.markerGroupMap[seriesModel.name].updateLayout(mpModel);
+	                }
+	            }, this);
+	        },
+
+	        renderSeries: function (seriesModel, mpModel, ecModel, api) {
+	            var coordSys = seriesModel.coordinateSystem;
+	            var seriesName = seriesModel.name;
+	            var seriesData = seriesModel.getData();
+
+	            var symbolDrawMap = this.markerGroupMap;
+	            var symbolDraw = symbolDrawMap[seriesName];
+	            if (!symbolDraw) {
+	                symbolDraw = symbolDrawMap[seriesName] = new SymbolDraw();
+	            }
+
+	            var mpData = createList(coordSys, seriesModel, mpModel);
+
+	            // FIXME
+	            mpModel.setData(mpData);
+
+	            updateMarkerLayout(mpModel.getData(), seriesModel, api);
+
+	            mpData.each(function (idx) {
+	                var itemModel = mpData.getItemModel(idx);
+	                var symbolSize = itemModel.getShallow('symbolSize');
+	                if (typeof symbolSize === 'function') {
+	                    // FIXME 这里不兼容 ECharts 2.x，2.x 貌似参数是整个数据？
+	                    symbolSize = symbolSize(
+	                        mpModel.getRawValue(idx), mpModel.getDataParams(idx)
+	                    );
+	                }
+	                mpData.setItemVisual(idx, {
+	                    symbolSize: symbolSize,
+	                    color: itemModel.get('itemStyle.normal.color')
+	                        || seriesData.getVisual('color'),
+	                    symbol: itemModel.getShallow('symbol')
+	                });
+	            });
+
+	            // TODO Text are wrong
+	            symbolDraw.updateData(mpData);
+	            this.group.add(symbolDraw.group);
+
+	            // Set host model for tooltip
+	            // FIXME
+	            mpData.eachItemGraphicEl(function (el) {
+	                el.traverse(function (child) {
+	                    child.dataModel = mpModel;
+	                });
+	            });
+
+	            symbolDraw.__keep = true;
+
+	            symbolDraw.group.silent = mpModel.get('silent') || seriesModel.get('silent');
+	        }
+	    });
+
+	    /**
+	     * @inner
+	     * @param {module:echarts/coord/*} [coordSys]
+	     * @param {module:echarts/model/Series} seriesModel
+	     * @param {module:echarts/model/Model} mpModel
+	     */
+	    function createList(coordSys, seriesModel, mpModel) {
+	        var coordDimsInfos;
+	        if (coordSys) {
+	            coordDimsInfos = zrUtil.map(coordSys && coordSys.dimensions, function (coordDim) {
+	                var info = seriesModel.getData().getDimensionInfo(
+	                    seriesModel.coordDimToDataDim(coordDim)[0]
+	                ) || {}; // In map series data don't have lng and lat dimension. Fallback to same with coordSys
+	                info.name = coordDim;
+	                return info;
+	            });
+	        }
+	        else {
+	            coordDimsInfos =[{
+	                name: 'value',
+	                type: 'float'
+	            }];
+	        }
+
+	        var mpData = new List(coordDimsInfos, mpModel);
+	        var dataOpt = zrUtil.map(mpModel.get('data'), zrUtil.curry(
+	                markerHelper.dataTransform, seriesModel
+	            ));
+	        if (coordSys) {
+	            dataOpt = zrUtil.filter(
+	                dataOpt, zrUtil.curry(markerHelper.dataFilter, coordSys)
+	            );
+	        }
+
+	        mpData.initData(dataOpt, null,
+	            coordSys ? markerHelper.dimValueGetter : function (item) {
+	                return item.value;
+	            }
+	        );
+	        return mpData;
+	    }
+
+
+
+/***/ },
+/* 348 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+	    var numberUtil = __webpack_require__(7);
+	    var indexOf = zrUtil.indexOf;
+
+	    function hasXOrY(item) {
+	        return !(isNaN(parseFloat(item.x)) && isNaN(parseFloat(item.y)));
+	    }
+
+	    function hasXAndY(item) {
+	        return !isNaN(parseFloat(item.x)) && !isNaN(parseFloat(item.y));
+	    }
+
+	    function getPrecision(data, valueAxisDim, dataIndex) {
+	        var precision = -1;
+	        do {
+	            precision = Math.max(
+	                numberUtil.getPrecision(data.get(
+	                    valueAxisDim, dataIndex
+	                )),
+	                precision
+	            );
+	            data = data.stackedOn;
+	        } while (data);
+
+	        return precision;
+	    }
+
+	    function markerTypeCalculatorWithExtent(
+	        mlType, data, otherDataDim, targetDataDim, otherCoordIndex, targetCoordIndex
+	    ) {
+	        var coordArr = [];
+	        var value = numCalculate(data, targetDataDim, mlType);
+
+	        var dataIndex = data.indexOfNearest(targetDataDim, value, true);
+	        coordArr[otherCoordIndex] = data.get(otherDataDim, dataIndex, true);
+	        coordArr[targetCoordIndex] = data.get(targetDataDim, dataIndex, true);
+
+	        var precision = getPrecision(data, targetDataDim, dataIndex);
+	        if (precision >= 0) {
+	            coordArr[targetCoordIndex] = +coordArr[targetCoordIndex].toFixed(precision);
+	        }
+
+	        return coordArr;
+	    }
+
+	    var curry = zrUtil.curry;
+	    // TODO Specified percent
+	    var markerTypeCalculator = {
+	        /**
+	         * @method
+	         * @param {module:echarts/data/List} data
+	         * @param {string} baseAxisDim
+	         * @param {string} valueAxisDim
+	         */
+	        min: curry(markerTypeCalculatorWithExtent, 'min'),
+	        /**
+	         * @method
+	         * @param {module:echarts/data/List} data
+	         * @param {string} baseAxisDim
+	         * @param {string} valueAxisDim
+	         */
+	        max: curry(markerTypeCalculatorWithExtent, 'max'),
+
+	        /**
+	         * @method
+	         * @param {module:echarts/data/List} data
+	         * @param {string} baseAxisDim
+	         * @param {string} valueAxisDim
+	         */
+	        average: curry(markerTypeCalculatorWithExtent, 'average')
+	    };
+
+	    /**
+	     * Transform markPoint data item to format used in List by do the following
+	     * 1. Calculate statistic like `max`, `min`, `average`
+	     * 2. Convert `item.xAxis`, `item.yAxis` to `item.coord` array
+	     * @param  {module:echarts/model/Series} seriesModel
+	     * @param  {module:echarts/coord/*} [coordSys]
+	     * @param  {Object} item
+	     * @return {Object}
+	     */
+	    var dataTransform = function (seriesModel, item) {
+	        var data = seriesModel.getData();
+	        var coordSys = seriesModel.coordinateSystem;
+
+	        // 1. If not specify the position with pixel directly
+	        // 2. If `coord` is not a data array. Which uses `xAxis`,
+	        // `yAxis` to specify the coord on each dimension
+
+	        // parseFloat first because item.x and item.y can be percent string like '20%'
+	        if (item && !hasXAndY(item) && !zrUtil.isArray(item.coord) && coordSys) {
+	            var dims = coordSys.dimensions;
+	            var axisInfo = getAxisInfo(item, data, coordSys, seriesModel);
+
+	            // Clone the option
+	            // Transform the properties xAxis, yAxis, radiusAxis, angleAxis, geoCoord to value
+	            item = zrUtil.clone(item);
+
+	            if (item.type
+	                && markerTypeCalculator[item.type]
+	                && axisInfo.baseAxis && axisInfo.valueAxis
+	            ) {
+	                var otherCoordIndex = indexOf(dims, axisInfo.baseAxis.dim);
+	                var targetCoordIndex = indexOf(dims, axisInfo.valueAxis.dim);
+
+	                item.coord = markerTypeCalculator[item.type](
+	                    data, axisInfo.baseDataDim, axisInfo.valueDataDim,
+	                    otherCoordIndex, targetCoordIndex
+	                );
+	                // Force to use the value of calculated value.
+	                item.value = item.coord[targetCoordIndex];
+	            }
+	            else {
+	                // FIXME Only has one of xAxis and yAxis.
+	                var coord = [
+	                    item.xAxis != null ? item.xAxis : item.radiusAxis,
+	                    item.yAxis != null ? item.yAxis : item.angleAxis
+	                ];
+	                // Each coord support max, min, average
+	                for (var i = 0; i < 2; i++) {
+	                    if (markerTypeCalculator[coord[i]]) {
+	                        var dataDim = seriesModel.coordDimToDataDim(dims[i])[0];
+	                        coord[i] = numCalculate(data, dataDim, coord[i]);
+	                    }
+	                }
+	                item.coord = coord;
+	            }
+	        }
+	        return item;
+	    };
+
+	    var getAxisInfo = function (item, data, coordSys, seriesModel) {
+	        var ret = {};
+
+	        if (item.valueIndex != null || item.valueDim != null) {
+	            ret.valueDataDim = item.valueIndex != null
+	                ? data.getDimension(item.valueIndex) : item.valueDim;
+	            ret.valueAxis = coordSys.getAxis(seriesModel.dataDimToCoordDim(ret.valueDataDim));
+	            ret.baseAxis = coordSys.getOtherAxis(ret.valueAxis);
+	            ret.baseDataDim = seriesModel.coordDimToDataDim(ret.baseAxis.dim)[0];
+	        }
+	        else {
+	            ret.baseAxis = seriesModel.getBaseAxis();
+	            ret.valueAxis = coordSys.getOtherAxis(ret.baseAxis);
+	            ret.baseDataDim = seriesModel.coordDimToDataDim(ret.baseAxis.dim)[0];
+	            ret.valueDataDim = seriesModel.coordDimToDataDim(ret.valueAxis.dim)[0];
+	        }
+
+	        return ret;
+	    };
+
+	    /**
+	     * Filter data which is out of coordinateSystem range
+	     * [dataFilter description]
+	     * @param  {module:echarts/coord/*} [coordSys]
+	     * @param  {Object} item
+	     * @return {boolean}
+	     */
+	    var dataFilter = function (coordSys, item) {
+	        // Alwalys return true if there is no coordSys
+	        return (coordSys && coordSys.containData && item.coord && !hasXOrY(item))
+	            ? coordSys.containData(item.coord) : true;
+	    };
+
+	    var dimValueGetter = function (item, dimName, dataIndex, dimIndex) {
+	        // x, y, radius, angle
+	        if (dimIndex < 2) {
+	            return item.coord && item.coord[dimIndex];
+	        }
+	        return item.value;
+	    };
+
+	    var numCalculate = function (data, valueDataDim, type) {
+	        if (type === 'average') {
+	            var sum = 0;
+	            var count = 0;
+	            data.each(valueDataDim, function (val, idx) {
+	                if (!isNaN(val)) {
+	                    sum += val;
+	                    count++;
+	                }
+	            }, true);
+	            return sum / count;
+	        }
+	        else {
+	            return data.getDataExtent(valueDataDim, true)[type === 'max' ? 1 : 0];
+	        }
+	    };
+
+	    module.exports = {
+	        dataTransform: dataTransform,
+	        dataFilter: dataFilter,
+	        dimValueGetter: dimValueGetter,
+	        getAxisInfo: getAxisInfo,
+	        numCalculate: numCalculate
+	    };
+
+
+/***/ },
+/* 349 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    module.exports = __webpack_require__(1).extendComponentView({
+
+	        type: 'marker',
+
+	        init: function () {
+	            /**
+	             * Markline grouped by series
+	             * @private
+	             * @type {Object}
+	             */
+	            this.markerGroupMap = {};
+	        },
+
+	        render: function (markerModel, ecModel, api) {
+	            var markerGroupMap = this.markerGroupMap;
+	            for (var name in markerGroupMap) {
+	                markerGroupMap[name].__keep = false;
+	            }
+
+	            var markerModelKey = this.type + 'Model';
+	            ecModel.eachSeries(function (seriesModel) {
+	                var markerModel = seriesModel[markerModelKey];
+	                markerModel && this.renderSeries(seriesModel, markerModel, ecModel, api);
+	            }, this);
+
+	            for (var name in markerGroupMap) {
+	                if (!markerGroupMap[name].__keep) {
+	                    this.group.remove(markerGroupMap[name].group);
+	                }
+	            }
+	        },
+
+	        renderSeries: function () {}
+	    });
+
+
+/***/ },
+/* 350 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    __webpack_require__(351);
+	    __webpack_require__(352);
+
+	    __webpack_require__(1).registerPreprocessor(function (opt) {
+	        // Make sure markLine component is enabled
+	        opt.markLine = opt.markLine || {};
+	    });
+
+
+/***/ },
+/* 351 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    module.exports = __webpack_require__(346).extend({
+
+	        type: 'markLine',
+
+	        defaultOption: {
+	            zlevel: 0,
+	            z: 5,
+
+	            symbol: ['circle', 'arrow'],
+	            symbolSize: [8, 16],
+
+	            //symbolRotate: 0,
+
+	            precision: 2,
+	            tooltip: {
+	                trigger: 'item'
+	            },
+	            label: {
+	                normal: {
+	                    show: true,
+	                    position: 'end'
+	                },
+	                emphasis: {
+	                    show: true
+	                }
+	            },
+	            lineStyle: {
+	                normal: {
+	                    type: 'dashed'
+	                },
+	                emphasis: {
+	                    width: 3
+	                }
+	            },
+	            animationEasing: 'linear'
+	        }
+	    });
+
+
+/***/ },
+/* 352 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+	    var List = __webpack_require__(97);
+	    var numberUtil = __webpack_require__(7);
+
+	    var markerHelper = __webpack_require__(348);
+
+	    var LineDraw = __webpack_require__(199);
+
+	    var markLineTransform = function (seriesModel, coordSys, mlModel, item) {
+	        var data = seriesModel.getData();
+	        // Special type markLine like 'min', 'max', 'average'
+	        var mlType = item.type;
+
+	        if (!zrUtil.isArray(item)
+	            && (
+	                mlType === 'min' || mlType === 'max' || mlType === 'average'
+	                // In case
+	                // data: [{
+	                //   yAxis: 10
+	                // }]
+	                || (item.xAxis != null || item.yAxis != null)
+	            )
+	        ) {
+	            var valueAxis;
+	            var valueDataDim;
+	            var value;
+
+	            if (item.yAxis != null || item.xAxis != null) {
+	                valueDataDim = item.yAxis != null ? 'y' : 'x';
+	                valueAxis = coordSys.getAxis(valueDataDim);
+
+	                value = zrUtil.retrieve(item.yAxis, item.xAxis);
+	            }
+	            else {
+	                var axisInfo = markerHelper.getAxisInfo(item, data, coordSys, seriesModel);
+	                valueDataDim = axisInfo.valueDataDim;
+	                valueAxis = axisInfo.valueAxis;
+	                value = markerHelper.numCalculate(data, valueDataDim, mlType);
+	            }
+	            var valueIndex = valueDataDim === 'x' ? 0 : 1;
+	            var baseIndex = 1 - valueIndex;
+
+	            var mlFrom = zrUtil.clone(item);
+	            var mlTo = {};
+
+	            mlFrom.type = null;
+
+	            mlFrom.coord = [];
+	            mlTo.coord = [];
+	            mlFrom.coord[baseIndex] = -Infinity;
+	            mlTo.coord[baseIndex] = Infinity;
+
+	            var precision = mlModel.get('precision');
+	            if (precision >= 0) {
+	                value = +value.toFixed(precision);
+	            }
+
+	            mlFrom.coord[valueIndex] = mlTo.coord[valueIndex] = value;
+
+	            item = [mlFrom, mlTo, { // Extra option for tooltip and label
+	                type: mlType,
+	                valueIndex: item.valueIndex,
+	                // Force to use the value of calculated value.
+	                value: value
+	            }];
+	        }
+
+	        item = [
+	            markerHelper.dataTransform(seriesModel, item[0]),
+	            markerHelper.dataTransform(seriesModel, item[1]),
+	            zrUtil.extend({}, item[2])
+	        ];
+
+	        // Avoid line data type is extended by from(to) data type
+	        item[2].type = item[2].type || '';
+
+	        // Merge from option and to option into line option
+	        zrUtil.merge(item[2], item[0]);
+	        zrUtil.merge(item[2], item[1]);
+
+	        return item;
+	    };
+
+	    function isInifinity(val) {
+	        return !isNaN(val) && !isFinite(val);
+	    }
+
+	    // If a markLine has one dim
+	    function ifMarkLineHasOnlyDim(dimIndex, fromCoord, toCoord, coordSys) {
+	        var otherDimIndex = 1 - dimIndex;
+	        var dimName = coordSys.dimensions[dimIndex];
+	        return isInifinity(fromCoord[otherDimIndex]) && isInifinity(toCoord[otherDimIndex])
+	            && fromCoord[dimIndex] === toCoord[dimIndex] && coordSys.getAxis(dimName).containData(fromCoord[dimIndex]);
+	    }
+
+	    function markLineFilter(coordSys, item) {
+	        if (coordSys.type === 'cartesian2d') {
+	            var fromCoord = item[0].coord;
+	            var toCoord = item[1].coord;
+	            // In case
+	            // {
+	            //  markLine: {
+	            //    data: [{ yAxis: 2 }]
+	            //  }
+	            // }
+	            if (
+	                fromCoord && toCoord &&
+	                (ifMarkLineHasOnlyDim(1, fromCoord, toCoord, coordSys)
+	                || ifMarkLineHasOnlyDim(0, fromCoord, toCoord, coordSys))
+	            ) {
+	                return true;
+	            }
+	        }
+	        return markerHelper.dataFilter(coordSys, item[0])
+	            && markerHelper.dataFilter(coordSys, item[1]);
+	    }
+
+	    function updateSingleMarkerEndLayout(
+	        data, idx, isFrom, seriesModel, api
+	    ) {
+	        var coordSys = seriesModel.coordinateSystem;
+	        var itemModel = data.getItemModel(idx);
+
+	        var point;
+	        var xPx = numberUtil.parsePercent(itemModel.get('x'), api.getWidth());
+	        var yPx = numberUtil.parsePercent(itemModel.get('y'), api.getHeight());
+	        if (!isNaN(xPx) && !isNaN(yPx)) {
+	            point = [xPx, yPx];
+	        }
+	        else {
+	            // Chart like bar may have there own marker positioning logic
+	            if (seriesModel.getMarkerPosition) {
+	                // Use the getMarkerPoisition
+	                point = seriesModel.getMarkerPosition(
+	                    data.getValues(data.dimensions, idx)
+	                );
+	            }
+	            else {
+	                var dims = coordSys.dimensions;
+	                var x = data.get(dims[0], idx);
+	                var y = data.get(dims[1], idx);
+	                point = coordSys.dataToPoint([x, y]);
+	            }
+	            // Expand line to the edge of grid if value on one axis is Inifnity
+	            // In case
+	            //  markLine: {
+	            //    data: [{
+	            //      yAxis: 2
+	            //      // or
+	            //      type: 'average'
+	            //    }]
+	            //  }
+	            if (coordSys.type === 'cartesian2d') {
+	                var xAxis = coordSys.getAxis('x');
+	                var yAxis = coordSys.getAxis('y');
+	                var dims = coordSys.dimensions;
+	                if (isInifinity(data.get(dims[0], idx))) {
+	                    point[0] = xAxis.toGlobalCoord(xAxis.getExtent()[isFrom ? 0 : 1]);
+	                }
+	                else if (isInifinity(data.get(dims[1], idx))) {
+	                    point[1] = yAxis.toGlobalCoord(yAxis.getExtent()[isFrom ? 0 : 1]);
+	                }
+	            }
+
+	            // Use x, y if has any
+	            if (!isNaN(xPx)) {
+	                point[0] = xPx;
+	            }
+	            if (!isNaN(yPx)) {
+	                point[1] = yPx;
+	            }
+	        }
+
+	        data.setItemLayout(idx, point);
+	    }
+
+	    __webpack_require__(349).extend({
+
+	        type: 'markLine',
+
+	        updateLayout: function (markLineModel, ecModel, api) {
+	            ecModel.eachSeries(function (seriesModel) {
+	                var mlModel = seriesModel.markLineModel;
+	                if (mlModel) {
+	                    var mlData = mlModel.getData();
+	                    var fromData = mlModel.__from;
+	                    var toData = mlModel.__to;
+	                    // Update visual and layout of from symbol and to symbol
+	                    fromData.each(function (idx) {
+	                        updateSingleMarkerEndLayout(fromData, idx, true, seriesModel, api);
+	                        updateSingleMarkerEndLayout(toData, idx, false, seriesModel, api);
+	                    });
+	                    // Update layout of line
+	                    mlData.each(function (idx) {
+	                        mlData.setItemLayout(idx, [
+	                            fromData.getItemLayout(idx),
+	                            toData.getItemLayout(idx)
+	                        ]);
+	                    });
+
+	                    this.markerGroupMap[seriesModel.name].updateLayout();
+
+	                }
+	            }, this);
+	        },
+
+	        renderSeries: function (seriesModel, mlModel, ecModel, api) {
+	            var coordSys = seriesModel.coordinateSystem;
+	            var seriesName = seriesModel.name;
+	            var seriesData = seriesModel.getData();
+
+	            var lineDrawMap = this.markerGroupMap;
+	            var lineDraw = lineDrawMap[seriesName];
+	            if (!lineDraw) {
+	                lineDraw = lineDrawMap[seriesName] = new LineDraw();
+	            }
+	            this.group.add(lineDraw.group);
+
+	            var mlData = createList(coordSys, seriesModel, mlModel);
+
+	            var fromData = mlData.from;
+	            var toData = mlData.to;
+	            var lineData = mlData.line;
+
+	            mlModel.__from = fromData;
+	            mlModel.__to = toData;
+	            // Line data for tooltip and formatter
+	            mlModel.setData(lineData);
+
+	            var symbolType = mlModel.get('symbol');
+	            var symbolSize = mlModel.get('symbolSize');
+	            if (!zrUtil.isArray(symbolType)) {
+	                symbolType = [symbolType, symbolType];
+	            }
+	            if (typeof symbolSize === 'number') {
+	                symbolSize = [symbolSize, symbolSize];
+	            }
+
+	            // Update visual and layout of from symbol and to symbol
+	            mlData.from.each(function (idx) {
+	                updateDataVisualAndLayout(fromData, idx, true);
+	                updateDataVisualAndLayout(toData, idx, false);
+	            });
+
+	            // Update visual and layout of line
+	            lineData.each(function (idx) {
+	                var lineColor = lineData.getItemModel(idx).get('lineStyle.normal.color');
+	                lineData.setItemVisual(idx, {
+	                    color: lineColor || fromData.getItemVisual(idx, 'color')
+	                });
+	                lineData.setItemLayout(idx, [
+	                    fromData.getItemLayout(idx),
+	                    toData.getItemLayout(idx)
+	                ]);
+
+	                lineData.setItemVisual(idx, {
+	                    'fromSymbolSize': fromData.getItemVisual(idx, 'symbolSize'),
+	                    'fromSymbol': fromData.getItemVisual(idx, 'symbol'),
+	                    'toSymbolSize': toData.getItemVisual(idx, 'symbolSize'),
+	                    'toSymbol': toData.getItemVisual(idx, 'symbol')
+	                });
+	            });
+
+	            lineDraw.updateData(lineData);
+
+	            // Set host model for tooltip
+	            // FIXME
+	            mlData.line.eachItemGraphicEl(function (el, idx) {
+	                el.traverse(function (child) {
+	                    child.dataModel = mlModel;
+	                });
+	            });
+
+	            function updateDataVisualAndLayout(data, idx, isFrom) {
+	                var itemModel = data.getItemModel(idx);
+
+	                updateSingleMarkerEndLayout(
+	                    data, idx, isFrom, seriesModel, api
+	                );
+
+	                data.setItemVisual(idx, {
+	                    symbolSize: itemModel.get('symbolSize') || symbolSize[isFrom ? 0 : 1],
+	                    symbol: itemModel.get('symbol', true) || symbolType[isFrom ? 0 : 1],
+	                    color: itemModel.get('itemStyle.normal.color') || seriesData.getVisual('color')
+	                });
+	            }
+
+	            lineDraw.__keep = true;
+
+	            lineDraw.group.silent = mlModel.get('silent') || seriesModel.get('silent');
+	        }
+	    });
+
+	    /**
+	     * @inner
+	     * @param {module:echarts/coord/*} coordSys
+	     * @param {module:echarts/model/Series} seriesModel
+	     * @param {module:echarts/model/Model} mpModel
+	     */
+	    function createList(coordSys, seriesModel, mlModel) {
+
+	        var coordDimsInfos;
+	        if (coordSys) {
+	            coordDimsInfos = zrUtil.map(coordSys && coordSys.dimensions, function (coordDim) {
+	                var info = seriesModel.getData().getDimensionInfo(
+	                    seriesModel.coordDimToDataDim(coordDim)[0]
+	                ) || {}; // In map series data don't have lng and lat dimension. Fallback to same with coordSys
+	                info.name = coordDim;
+	                return info;
+	            });
+	        }
+	        else {
+	            coordDimsInfos =[{
+	                name: 'value',
+	                type: 'float'
+	            }];
+	        }
+
+	        var fromData = new List(coordDimsInfos, mlModel);
+	        var toData = new List(coordDimsInfos, mlModel);
+	        // No dimensions
+	        var lineData = new List([], mlModel);
+
+	        var optData = zrUtil.map(mlModel.get('data'), zrUtil.curry(
+	            markLineTransform, seriesModel, coordSys, mlModel
+	        ));
+	        if (coordSys) {
+	            optData = zrUtil.filter(
+	                optData, zrUtil.curry(markLineFilter, coordSys)
+	            );
+	        }
+	        var dimValueGetter = coordSys ? markerHelper.dimValueGetter : function (item) {
+	            return item.value;
+	        };
+	        fromData.initData(
+	            zrUtil.map(optData, function (item) { return item[0]; }),
+	            null, dimValueGetter
+	        );
+	        toData.initData(
+	            zrUtil.map(optData, function (item) { return item[1]; }),
+	            null, dimValueGetter
+	        );
+	        lineData.initData(
+	            zrUtil.map(optData, function (item) { return item[2]; })
+	        );
+	        lineData.hasItemOption = true;
+	        return {
+	            from: fromData,
+	            to: toData,
+	            line: lineData
+	        };
+	    }
+
+
+/***/ },
+/* 353 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    __webpack_require__(354);
+	    __webpack_require__(355);
+
+	    __webpack_require__(1).registerPreprocessor(function (opt) {
+	        // Make sure markArea component is enabled
+	        opt.markArea = opt.markArea || {};
+	    });
+
+
+/***/ },
+/* 354 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    module.exports = __webpack_require__(346).extend({
+
+	        type: 'markArea',
+
+	        defaultOption: {
+	            zlevel: 0,
+	            // PENDING
+	            z: 1,
+	            tooltip: {
+	                trigger: 'item'
+	            },
+	            // markArea should fixed on the coordinate system
+	            animation: false,
+	            label: {
+	                normal: {
+	                    show: true,
+	                    position: 'top'
+	                },
+	                emphasis: {
+	                    show: true,
+	                    position: 'top'
+	                }
+	            },
+	            itemStyle: {
+	                normal: {
+	                    // color and borderColor default to use color from series
+	                    // color: 'auto'
+	                    // borderColor: 'auto'
+	                    borderWidth: 0
+	                }
+	            }
+	        }
+	    });
+
+
+/***/ },
+/* 355 */
+/***/ function(module, exports, __webpack_require__) {
+
+	// TODO Better on polar
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var List = __webpack_require__(97);
+	    var numberUtil = __webpack_require__(7);
+	    var graphic = __webpack_require__(43);
+	    var colorUtil = __webpack_require__(39);
+
+	    var markerHelper = __webpack_require__(348);
+
+	    var markAreaTransform = function (seriesModel, coordSys, maModel, item) {
+	        var lt = markerHelper.dataTransform(seriesModel, item[0]);
+	        var rb = markerHelper.dataTransform(seriesModel, item[1]);
+	        var retrieve = zrUtil.retrieve;
+
+	        // FIXME make sure lt is less than rb
+	        var ltCoord = lt.coord;
+	        var rbCoord = rb.coord;
+	        ltCoord[0] = retrieve(ltCoord[0], -Infinity);
+	        ltCoord[1] = retrieve(ltCoord[1], -Infinity);
+
+	        rbCoord[0] = retrieve(rbCoord[0], Infinity);
+	        rbCoord[1] = retrieve(rbCoord[1], Infinity);
+
+	        // Merge option into one
+	        var result = zrUtil.mergeAll([{}, lt, rb]);
+
+	        result.coord = [
+	            lt.coord, rb.coord
+	        ];
+	        result.x0 = lt.x;
+	        result.y0 = lt.y;
+	        result.x1 = rb.x;
+	        result.y1 = rb.y;
+	        return result;
+	    };
+
+	    function isInifinity(val) {
+	        return !isNaN(val) && !isFinite(val);
+	    }
+
+	    // If a markArea has one dim
+	    function ifMarkLineHasOnlyDim(dimIndex, fromCoord, toCoord, coordSys) {
+	        var otherDimIndex = 1 - dimIndex;
+	        return isInifinity(fromCoord[otherDimIndex]) && isInifinity(toCoord[otherDimIndex]);
+	    }
+
+	    function markAreaFilter(coordSys, item) {
+	        var fromCoord = item.coord[0];
+	        var toCoord = item.coord[1];
+	        if (coordSys.type === 'cartesian2d') {
+	            // In case
+	            // {
+	            //  markArea: {
+	            //    data: [{ yAxis: 2 }]
+	            //  }
+	            // }
+	            if (
+	                fromCoord && toCoord &&
+	                (ifMarkLineHasOnlyDim(1, fromCoord, toCoord, coordSys)
+	                || ifMarkLineHasOnlyDim(0, fromCoord, toCoord, coordSys))
+	            ) {
+	                return true;
+	            }
+	        }
+	        return markerHelper.dataFilter(coordSys, {
+	                coord: fromCoord,
+	                x: item.x0,
+	                y: item.y0
+	            })
+	            || markerHelper.dataFilter(coordSys, {
+	                coord: toCoord,
+	                x: item.x1,
+	                y: item.y1
+	            });
+	    }
+
+	    // dims can be ['x0', 'y0'], ['x1', 'y1'], ['x0', 'y1'], ['x1', 'y0']
+	    function getSingleMarkerEndPoint(data, idx, dims, seriesModel, api) {
+	        var coordSys = seriesModel.coordinateSystem;
+	        var itemModel = data.getItemModel(idx);
+
+	        var point;
+	        var xPx = numberUtil.parsePercent(itemModel.get(dims[0]), api.getWidth());
+	        var yPx = numberUtil.parsePercent(itemModel.get(dims[1]), api.getHeight());
+	        if (!isNaN(xPx) && !isNaN(yPx)) {
+	            point = [xPx, yPx];
+	        }
+	        else {
+	            // Chart like bar may have there own marker positioning logic
+	            if (seriesModel.getMarkerPosition) {
+	                // Use the getMarkerPoisition
+	                point = seriesModel.getMarkerPosition(
+	                    data.getValues(dims, idx)
+	                );
+	            }
+	            else {
+	                var x = data.get(dims[0], idx);
+	                var y = data.get(dims[1], idx);
+	                point = coordSys.dataToPoint([x, y], true);
+	            }
+	            if (coordSys.type === 'cartesian2d') {
+	                var xAxis = coordSys.getAxis('x');
+	                var yAxis = coordSys.getAxis('y');
+	                var x = data.get(dims[0], idx);
+	                var y = data.get(dims[1], idx);
+	                if (isInifinity(x)) {
+	                    point[0] = xAxis.toGlobalCoord(xAxis.getExtent()[dims[0] === 'x0' ? 0 : 1]);
+	                }
+	                else if (isInifinity(y)) {
+	                    point[1] = yAxis.toGlobalCoord(yAxis.getExtent()[dims[1] === 'y0' ? 0 : 1]);
+	                }
+	            }
+
+	            // Use x, y if has any
+	            if (!isNaN(xPx)) {
+	                point[0] = xPx;
+	            }
+	            if (!isNaN(yPx)) {
+	                point[1] = yPx;
+	            }
+	        }
+
+	        return point;
+	    }
+
+	    var dimPermutations = [['x0', 'y0'], ['x1', 'y0'], ['x1', 'y1'], ['x0', 'y1']];
+
+	    __webpack_require__(349).extend({
+
+	        type: 'markArea',
+
+	        updateLayout: function (markAreaModel, ecModel, api) {
+	            ecModel.eachSeries(function (seriesModel) {
+	                var maModel = seriesModel.markAreaModel;
+	                if (maModel) {
+	                    var areaData = maModel.getData();
+	                    areaData.each(function (idx) {
+	                        var points = zrUtil.map(dimPermutations, function (dim) {
+	                            return getSingleMarkerEndPoint(areaData, idx, dim, seriesModel, api);
+	                        });
+	                        // Layout
+	                        areaData.setItemLayout(idx, points);
+	                        var el = areaData.getItemGraphicEl(idx);
+	                        el.setShape('points', points);
+	                    });
+	                }
+	            }, this);
+	        },
+
+	        renderSeries: function (seriesModel, maModel, ecModel, api) {
+	            var coordSys = seriesModel.coordinateSystem;
+	            var seriesName = seriesModel.name;
+	            var seriesData = seriesModel.getData();
+
+	            var areaGroupMap = this.markerGroupMap;
+	            var polygonGroup = areaGroupMap[seriesName];
+	            if (!polygonGroup) {
+	                polygonGroup = areaGroupMap[seriesName] = {
+	                    group: new graphic.Group()
+	                };
+	            }
+	            this.group.add(polygonGroup.group);
+	            polygonGroup.__keep = true;
+
+	            var areaData = createList(coordSys, seriesModel, maModel);
+
+	            // Line data for tooltip and formatter
+	            maModel.setData(areaData);
+
+	            // Update visual and layout of line
+	            areaData.each(function (idx) {
+	                // Layout
+	                areaData.setItemLayout(idx, zrUtil.map(dimPermutations, function (dim) {
+	                    return getSingleMarkerEndPoint(areaData, idx, dim, seriesModel, api);
+	                }));
+
+	                // Visual
+	                areaData.setItemVisual(idx, {
+	                    color: seriesData.getVisual('color')
+	                });
+	            });
+
+
+	            areaData.diff(polygonGroup.__data)
+	                .add(function (idx) {
+	                    var polygon = new graphic.Polygon({
+	                        shape: {
+	                            points: areaData.getItemLayout(idx)
+	                        }
+	                    });
+	                    areaData.setItemGraphicEl(idx, polygon);
+	                    polygonGroup.group.add(polygon);
+	                })
+	                .update(function (newIdx, oldIdx) {
+	                    var polygon = polygonGroup.__data.getItemGraphicEl(oldIdx);
+	                    graphic.updateProps(polygon, {
+	                        shape: {
+	                            points: areaData.getItemLayout(newIdx)
+	                        }
+	                    }, maModel, newIdx);
+	                    polygonGroup.group.add(polygon);
+	                    areaData.setItemGraphicEl(newIdx, polygon);
+	                })
+	                .remove(function (idx) {
+	                    var polygon = polygonGroup.__data.getItemGraphicEl(idx);
+	                    polygonGroup.group.remove(polygon);
+	                })
+	                .execute();
+
+	            areaData.eachItemGraphicEl(function (polygon, idx) {
+	                var itemModel = areaData.getItemModel(idx);
+	                var labelModel = itemModel.getModel('label.normal');
+	                var labelHoverModel = itemModel.getModel('label.emphasis');
+	                var color = areaData.getItemVisual(idx, 'color');
+	                polygon.useStyle(
+	                    zrUtil.defaults(
+	                        itemModel.getModel('itemStyle.normal').getItemStyle(),
+	                        {
+	                            fill: colorUtil.modifyAlpha(color, 0.4),
+	                            stroke: color
+	                        }
+	                    )
+	                );
+
+	                polygon.hoverStyle = itemModel.getModel('itemStyle.normal').getItemStyle();
+
+	                var defaultValue = areaData.getName(idx) || '';
+	                var textColor = color || polygon.style.fill;
+	                graphic.setText(polygon.style, labelModel, textColor);
+	                polygon.style.text = zrUtil.retrieve(
+	                    maModel.getFormattedLabel(idx, 'normal'),
+	                    defaultValue
+	                );
+
+	                graphic.setText(polygon.hoverStyle, labelHoverModel, textColor);
+	                polygon.hoverStyle.text = zrUtil.retrieve(
+	                    maModel.getFormattedLabel(idx, 'emphasis'),
+	                    defaultValue
+	                );
+
+	                graphic.setHoverStyle(polygon, {});
+
+	                polygon.dataModel = maModel;
+	            });
+
+	            polygonGroup.__data = areaData;
+
+	            polygonGroup.group.silent = maModel.get('silent') || seriesModel.get('silent');
+	        }
+	    });
+
+	    /**
+	     * @inner
+	     * @param {module:echarts/coord/*} coordSys
+	     * @param {module:echarts/model/Series} seriesModel
+	     * @param {module:echarts/model/Model} mpModel
+	     */
+	    function createList(coordSys, seriesModel, maModel) {
+
+	        var coordDimsInfos;
+	        var areaData;
+	        var dims = ['x0', 'y0', 'x1', 'y1'];
+	        if (coordSys) {
+	            coordDimsInfos = zrUtil.map(coordSys && coordSys.dimensions, function (coordDim) {
+	                var info = seriesModel.getData().getDimensionInfo(
+	                    seriesModel.coordDimToDataDim(coordDim)[0]
+	                ) || {}; // In map series data don't have lng and lat dimension. Fallback to same with coordSys
+	                info.name = coordDim;
+	                return info;
+	            });
+	            areaData = new List(zrUtil.map(dims, function (dim, idx) {
+	                return {
+	                    name: dim,
+	                    type: coordDimsInfos[idx % 2].type
+	                };
+	            }), maModel);
+	        }
+	        else {
+	            coordDimsInfos =[{
+	                name: 'value',
+	                type: 'float'
+	            }];
+	            areaData = new List(coordDimsInfos, maModel);
+	        }
+
+	        var optData = zrUtil.map(maModel.get('data'), zrUtil.curry(
+	            markAreaTransform, seriesModel, coordSys, maModel
+	        ));
+	        if (coordSys) {
+	            optData = zrUtil.filter(
+	                optData, zrUtil.curry(markAreaFilter, coordSys)
+	            );
+	        }
+
+	        var dimValueGetter = coordSys ? function (item, dimName, dataIndex, dimIndex) {
+	            return item.coord[Math.floor(dimIndex / 2)][dimIndex % 2];
+	        } : function (item) {
+	            return item.value;
+	        };
+	        areaData.initData(optData, null, dimValueGetter);
+	        areaData.hasItemOption = true;
+	        return areaData;
+	    }
+
+
+/***/ },
+/* 356 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * DataZoom component entry
+	 */
+
+
+	    var echarts = __webpack_require__(1);
+
+	    echarts.registerPreprocessor(__webpack_require__(357));
+
+	    __webpack_require__(358);
+	    __webpack_require__(359);
+	    __webpack_require__(360);
+	    __webpack_require__(362);
+
+
+
+/***/ },
+/* 357 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @file Timeline preprocessor
+	 */
+
+
+	    var zrUtil = __webpack_require__(4);
+
+	    module.exports = function (option) {
+	        var timelineOpt = option && option.timeline;
+
+	        if (!zrUtil.isArray(timelineOpt)) {
+	            timelineOpt = timelineOpt ? [timelineOpt] : [];
+	        }
+
+	        zrUtil.each(timelineOpt, function (opt) {
+	            if (!opt) {
+	                return;
+	            }
+
+	            compatibleEC2(opt);
+	        });
+	    };
+
+	    function compatibleEC2(opt) {
+	        var type = opt.type;
+
+	        var ec2Types = {'number': 'value', 'time': 'time'};
+
+	        // Compatible with ec2
+	        if (ec2Types[type]) {
+	            opt.axisType = ec2Types[type];
+	            delete opt.type;
+	        }
+
+	        transferItem(opt);
+
+	        if (has(opt, 'controlPosition')) {
+	            var controlStyle = opt.controlStyle || (opt.controlStyle = {});
+	            if (!has(controlStyle, 'position')) {
+	                controlStyle.position = opt.controlPosition;
+	            }
+	            if (controlStyle.position === 'none' && !has(controlStyle, 'show')) {
+	                controlStyle.show = false;
+	                delete controlStyle.position;
+	            }
+	            delete opt.controlPosition;
+	        }
+
+	        zrUtil.each(opt.data || [], function (dataItem) {
+	            if (zrUtil.isObject(dataItem) && !zrUtil.isArray(dataItem)) {
+	                if (!has(dataItem, 'value') && has(dataItem, 'name')) {
+	                    // In ec2, using name as value.
+	                    dataItem.value = dataItem.name;
+	                }
+	                transferItem(dataItem);
+	            }
+	        });
+	    }
+
+	    function transferItem(opt) {
+	        var itemStyle = opt.itemStyle || (opt.itemStyle = {});
+
+	        var itemStyleEmphasis = itemStyle.emphasis || (itemStyle.emphasis = {});
+
+	        // Transfer label out
+	        var label = opt.label || (opt.label || {});
+	        var labelNormal = label.normal || (label.normal = {});
+	        var excludeLabelAttr = {normal: 1, emphasis: 1};
+
+	        zrUtil.each(label, function (value, name) {
+	            if (!excludeLabelAttr[name] && !has(labelNormal, name)) {
+	                labelNormal[name] = value;
+	            }
+	        });
+
+	        if (itemStyleEmphasis.label && !has(label, 'emphasis')) {
+	            label.emphasis = itemStyleEmphasis.label;
+	            delete itemStyleEmphasis.label;
+	        }
+	    }
+
+	    function has(obj, attr) {
+	        return obj.hasOwnProperty(attr);
+	    }
+
+
+
+/***/ },
+/* 358 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    __webpack_require__(19).registerSubTypeDefaulter('timeline', function () {
+	        // Only slider now.
+	        return 'slider';
+	    });
+
+
+
+/***/ },
+/* 359 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @file Timeilne action
+	 */
+
+
+	    var echarts = __webpack_require__(1);
+
+	    echarts.registerAction(
+
+	        {type: 'timelineChange', event: 'timelineChanged', update: 'prepareAndUpdate'},
+
+	        function (payload, ecModel) {
+
+	            var timelineModel = ecModel.getComponent('timeline');
+	            if (timelineModel && payload.currentIndex != null) {
+	                timelineModel.setCurrentIndex(payload.currentIndex);
+
+	                if (!timelineModel.get('loop', true) && timelineModel.isIndexMax()) {
+	                    timelineModel.setPlayState(false);
+	                }
+	            }
+
+	            ecModel.resetOption('timeline');
+	        }
+	    );
+
+	    echarts.registerAction(
+
+	        {type: 'timelinePlayChange', event: 'timelinePlayChanged', update: 'update'},
+
+	        function (payload, ecModel) {
+	            var timelineModel = ecModel.getComponent('timeline');
+	            if (timelineModel && payload.playState != null) {
+	                timelineModel.setPlayState(payload.playState);
+	            }
+	        }
+	    );
+
+
+
+/***/ },
+/* 360 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @file Silder timeline model
+	 */
+
+
+	    var TimelineModel = __webpack_require__(361);
+	    var zrUtil = __webpack_require__(4);
+	    var modelUtil = __webpack_require__(5);
+
+	    var SliderTimelineModel = TimelineModel.extend({
+
+	        type: 'timeline.slider',
+
+	        /**
+	         * @protected
+	         */
+	        defaultOption: {
+
+	            backgroundColor: 'rgba(0,0,0,0)',   // 时间轴背景颜色
+	            borderColor: '#ccc',               // 时间轴边框颜色
+	            borderWidth: 0,                    // 时间轴边框线宽，单位px，默认为0（无边框）
+
+	            orient: 'horizontal',              // 'vertical'
+	            inverse: false,
+
+	            tooltip: {                          // boolean or Object
+	                trigger: 'item'                 // data item may also have tootip attr.
+	            },
+
+	            symbol: 'emptyCircle',
+	            symbolSize: 10,
+
+	            lineStyle: {
+	                show: true,
+	                width: 2,
+	                color: '#304654'
+	            },
+	            label: {                            // 文本标签
+	                position: 'auto',           // auto left right top bottom
+	                                            // When using number, label position is not
+	                                            // restricted by viewRect.
+	                                            // positive: right/bottom, negative: left/top
+	                normal: {
+	                    show: true,
+	                    interval: 'auto',
+	                    rotate: 0,
+	                    // formatter: null,
+	                    textStyle: {                // 其余属性默认使用全局文本样式，详见TEXTSTYLE
+	                        color: '#304654'
+	                    }
+	                },
+	                emphasis: {
+	                    show: true,
+	                    textStyle: {                // 其余属性默认使用全局文本样式，详见TEXTSTYLE
+	                        color: '#c23531'
+	                    }
+	                }
+	            },
+	            itemStyle: {
+	                normal: {
+	                    color: '#304654',
+	                    borderWidth: 1
+	                },
+	                emphasis: {
+	                    color: '#c23531'
+	                }
+	            },
+
+	            checkpointStyle: {
+	                symbol: 'circle',
+	                symbolSize: 13,
+	                color: '#c23531',
+	                borderWidth: 5,
+	                borderColor: 'rgba(194,53,49, 0.5)',
+	                animation: true,
+	                animationDuration: 300,
+	                animationEasing: 'quinticInOut'
+	            },
+
+	            controlStyle: {
+	                show: true,
+	                showPlayBtn: true,
+	                showPrevBtn: true,
+	                showNextBtn: true,
+	                itemSize: 22,
+	                itemGap: 12,
+	                position: 'left',  // 'left' 'right' 'top' 'bottom'
+	                playIcon: 'path://M31.6,53C17.5,53,6,41.5,6,27.4S17.5,1.8,31.6,1.8C45.7,1.8,57.2,13.3,57.2,27.4S45.7,53,31.6,53z M31.6,3.3 C18.4,3.3,7.5,14.1,7.5,27.4c0,13.3,10.8,24.1,24.1,24.1C44.9,51.5,55.7,40.7,55.7,27.4C55.7,14.1,44.9,3.3,31.6,3.3z M24.9,21.3 c0-2.2,1.6-3.1,3.5-2l10.5,6.1c1.899,1.1,1.899,2.9,0,4l-10.5,6.1c-1.9,1.1-3.5,0.2-3.5-2V21.3z', // jshint ignore:line
+	                stopIcon: 'path://M30.9,53.2C16.8,53.2,5.3,41.7,5.3,27.6S16.8,2,30.9,2C45,2,56.4,13.5,56.4,27.6S45,53.2,30.9,53.2z M30.9,3.5C17.6,3.5,6.8,14.4,6.8,27.6c0,13.3,10.8,24.1,24.101,24.1C44.2,51.7,55,40.9,55,27.6C54.9,14.4,44.1,3.5,30.9,3.5z M36.9,35.8c0,0.601-0.4,1-0.9,1h-1.3c-0.5,0-0.9-0.399-0.9-1V19.5c0-0.6,0.4-1,0.9-1H36c0.5,0,0.9,0.4,0.9,1V35.8z M27.8,35.8 c0,0.601-0.4,1-0.9,1h-1.3c-0.5,0-0.9-0.399-0.9-1V19.5c0-0.6,0.4-1,0.9-1H27c0.5,0,0.9,0.4,0.9,1L27.8,35.8L27.8,35.8z', // jshint ignore:line
+	                nextIcon: 'path://M18.6,50.8l22.5-22.5c0.2-0.2,0.3-0.4,0.3-0.7c0-0.3-0.1-0.5-0.3-0.7L18.7,4.4c-0.1-0.1-0.2-0.3-0.2-0.5 c0-0.4,0.3-0.8,0.8-0.8c0.2,0,0.5,0.1,0.6,0.3l23.5,23.5l0,0c0.2,0.2,0.3,0.4,0.3,0.7c0,0.3-0.1,0.5-0.3,0.7l-0.1,0.1L19.7,52 c-0.1,0.1-0.3,0.2-0.5,0.2c-0.4,0-0.8-0.3-0.8-0.8C18.4,51.2,18.5,51,18.6,50.8z', // jshint ignore:line
+	                prevIcon: 'path://M43,52.8L20.4,30.3c-0.2-0.2-0.3-0.4-0.3-0.7c0-0.3,0.1-0.5,0.3-0.7L42.9,6.4c0.1-0.1,0.2-0.3,0.2-0.5 c0-0.4-0.3-0.8-0.8-0.8c-0.2,0-0.5,0.1-0.6,0.3L18.3,28.8l0,0c-0.2,0.2-0.3,0.4-0.3,0.7c0,0.3,0.1,0.5,0.3,0.7l0.1,0.1L41.9,54 c0.1,0.1,0.3,0.2,0.5,0.2c0.4,0,0.8-0.3,0.8-0.8C43.2,53.2,43.1,53,43,52.8z', // jshint ignore:line
+	                normal: {
+	                    color: '#304654',
+	                    borderColor: '#304654',
+	                    borderWidth: 1
+	                },
+	                emphasis: {
+	                    color: '#c23531',
+	                    borderColor: '#c23531',
+	                    borderWidth: 2
+	                }
+	            },
+	            data: []
+	        }
+
+	    });
+
+	    zrUtil.mixin(SliderTimelineModel, modelUtil.dataFormatMixin);
+
+	    module.exports = SliderTimelineModel;
+
+
+/***/ },
+/* 361 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @file Timeline model
+	 */
+
+
+	    var ComponentModel = __webpack_require__(19);
+	    var List = __webpack_require__(97);
+	    var zrUtil = __webpack_require__(4);
+	    var modelUtil = __webpack_require__(5);
+
+	    var TimelineModel = ComponentModel.extend({
+
+	        type: 'timeline',
+
+	        layoutMode: 'box',
+
+	        /**
+	         * @protected
+	         */
+	        defaultOption: {
+
+	            zlevel: 0,                  // 一级层叠
+	            z: 4,                       // 二级层叠
+	            show: true,
+
+	            axisType: 'time',  // 模式是时间类型，支持 value, category
+
+	            realtime: true,
+
+	            left: '20%',
+	            top: null,
+	            right: '20%',
+	            bottom: 0,
+	            width: null,
+	            height: 40,
+	            padding: 5,
+
+	            controlPosition: 'left',           // 'left' 'right' 'top' 'bottom' 'none'
+	            autoPlay: false,
+	            rewind: false,                     // 反向播放
+	            loop: true,
+	            playInterval: 2000,                // 播放时间间隔，单位ms
+
+	            currentIndex: 0,
+
+	            itemStyle: {
+	                normal: {},
+	                emphasis: {}
+	            },
+	            label: {
+	                normal: {
+	                    textStyle: {
+	                        color: '#000'
+	                    }
+	                },
+	                emphasis: {}
+	            },
+
+	            data: []
+	        },
+
+	        /**
+	         * @override
+	         */
+	        init: function (option, parentModel, ecModel) {
+
+	            /**
+	             * @private
+	             * @type {module:echarts/data/List}
+	             */
+	            this._data;
+
+	            /**
+	             * @private
+	             * @type {Array.<string>}
+	             */
+	            this._names;
+
+	            this.mergeDefaultAndTheme(option, ecModel);
+	            this._initData();
+	        },
+
+	        /**
+	         * @override
+	         */
+	        mergeOption: function (option) {
+	            TimelineModel.superApply(this, 'mergeOption', arguments);
+	            this._initData();
+	        },
+
+	        /**
+	         * @param {number} [currentIndex]
+	         */
+	        setCurrentIndex: function (currentIndex) {
+	            if (currentIndex == null) {
+	                currentIndex = this.option.currentIndex;
+	            }
+	            var count = this._data.count();
+
+	            if (this.option.loop) {
+	                currentIndex = (currentIndex % count + count) % count;
+	            }
+	            else {
+	                currentIndex >= count && (currentIndex = count - 1);
+	                currentIndex < 0 && (currentIndex = 0);
+	            }
+
+	            this.option.currentIndex = currentIndex;
+	        },
+
+	        /**
+	         * @return {number} currentIndex
+	         */
+	        getCurrentIndex: function () {
+	            return this.option.currentIndex;
+	        },
+
+	        /**
+	         * @return {boolean}
+	         */
+	        isIndexMax: function () {
+	            return this.getCurrentIndex() >= this._data.count() - 1;
+	        },
+
+	        /**
+	         * @param {boolean} state true: play, false: stop
+	         */
+	        setPlayState: function (state) {
+	            this.option.autoPlay = !!state;
+	        },
+
+	        /**
+	         * @return {boolean} true: play, false: stop
+	         */
+	        getPlayState: function () {
+	            return !!this.option.autoPlay;
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _initData: function () {
+	            var thisOption = this.option;
+	            var dataArr = thisOption.data || [];
+	            var axisType = thisOption.axisType;
+	            var names = this._names = [];
+
+	            if (axisType === 'category') {
+	                var idxArr = [];
+	                zrUtil.each(dataArr, function (item, index) {
+	                    var value = modelUtil.getDataItemValue(item);
+	                    var newItem;
+
+	                    if (zrUtil.isObject(item)) {
+	                        newItem = zrUtil.clone(item);
+	                        newItem.value = index;
+	                    }
+	                    else {
+	                        newItem = index;
+	                    }
+
+	                    idxArr.push(newItem);
+
+	                    if (!zrUtil.isString(value) && (value == null || isNaN(value))) {
+	                        value = '';
+	                    }
+
+	                    names.push(value + '');
+	                });
+	                dataArr = idxArr;
+	            }
+
+	            var dimType = ({category: 'ordinal', time: 'time'})[axisType] || 'number';
+
+	            var data = this._data = new List([{name: 'value', type: dimType}], this);
+
+	            data.initData(dataArr, names);
+	        },
+
+	        getData: function () {
+	            return this._data;
+	        },
+
+	        /**
+	         * @public
+	         * @return {Array.<string>} categoreis
+	         */
+	        getCategories: function () {
+	            if (this.get('axisType') === 'category') {
+	                return this._names.slice();
+	            }
+	        }
+
+	    });
+
+	    module.exports = TimelineModel;
+
+
+/***/ },
+/* 362 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @file Silder timeline view
+	 */
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var graphic = __webpack_require__(43);
+	    var layout = __webpack_require__(21);
+	    var TimelineView = __webpack_require__(363);
+	    var TimelineAxis = __webpack_require__(364);
+	    var symbolUtil = __webpack_require__(106);
+	    var axisHelper = __webpack_require__(114);
+	    var BoundingRect = __webpack_require__(9);
+	    var matrix = __webpack_require__(11);
+	    var numberUtil = __webpack_require__(7);
+	    var formatUtil = __webpack_require__(6);
+	    var encodeHTML = formatUtil.encodeHTML;
+
+	    var bind = zrUtil.bind;
+	    var each = zrUtil.each;
+
+	    var PI = Math.PI;
+
+	    module.exports = TimelineView.extend({
+
+	        type: 'timeline.slider',
+
+	        init: function (ecModel, api) {
+
+	            this.api = api;
+
+	            /**
+	             * @private
+	             * @type {module:echarts/component/timeline/TimelineAxis}
+	             */
+	            this._axis;
+
+	            /**
+	             * @private
+	             * @type {module:zrender/core/BoundingRect}
+	             */
+	            this._viewRect;
+
+	            /**
+	             * @type {number}
+	             */
+	            this._timer;
+
+	            /**
+	             * @type {module:zrende/Element}
+	             */
+	            this._currentPointer;
+
+	            /**
+	             * @type {module:zrender/container/Group}
+	             */
+	            this._mainGroup;
+
+	            /**
+	             * @type {module:zrender/container/Group}
+	             */
+	            this._labelGroup;
+	        },
+
+	        /**
+	         * @override
+	         */
+	        render: function (timelineModel, ecModel, api, payload) {
+	            this.model = timelineModel;
+	            this.api = api;
+	            this.ecModel = ecModel;
+
+	            this.group.removeAll();
+
+	            if (timelineModel.get('show', true)) {
+
+	                var layoutInfo = this._layout(timelineModel, api);
+	                var mainGroup = this._createGroup('mainGroup');
+	                var labelGroup = this._createGroup('labelGroup');
+
+	                /**
+	                 * @private
+	                 * @type {module:echarts/component/timeline/TimelineAxis}
+	                 */
+	                var axis = this._axis = this._createAxis(layoutInfo, timelineModel);
+
+	                timelineModel.formatTooltip = function (dataIndex) {
+	                    return encodeHTML(axis.scale.getLabel(dataIndex));
+	                };
+
+	                each(
+	                    ['AxisLine', 'AxisTick', 'Control', 'CurrentPointer'],
+	                    function (name) {
+	                        this['_render' + name](layoutInfo, mainGroup, axis, timelineModel);
+	                    },
+	                    this
+	                );
+
+	                this._renderAxisLabel(layoutInfo, labelGroup, axis, timelineModel);
+
+	                this._position(layoutInfo, timelineModel);
+	            }
+
+	            this._doPlayStop();
+	        },
+
+	        /**
+	         * @override
+	         */
+	        remove: function () {
+	            this._clearTimer();
+	            this.group.removeAll();
+	        },
+
+	        /**
+	         * @override
+	         */
+	        dispose: function () {
+	            this._clearTimer();
+	        },
+
+	        _layout: function (timelineModel, api) {
+	            var labelPosOpt = timelineModel.get('label.normal.position');
+	            var orient = timelineModel.get('orient');
+	            var viewRect = getViewRect(timelineModel, api);
+	            // Auto label offset.
+	            if (labelPosOpt == null || labelPosOpt === 'auto') {
+	                labelPosOpt = orient === 'horizontal'
+	                    ? ((viewRect.y + viewRect.height / 2) < api.getHeight() / 2 ? '-' : '+')
+	                    : ((viewRect.x + viewRect.width / 2) < api.getWidth() / 2 ? '+' : '-');
+	            }
+	            else if (isNaN(labelPosOpt)) {
+	                labelPosOpt = ({
+	                    horizontal: {top: '-', bottom: '+'},
+	                    vertical: {left: '-', right: '+'}
+	                })[orient][labelPosOpt];
+	            }
+
+	            // FIXME
+	            // 暂没有实现用户传入
+	            // var labelAlign = timelineModel.get('label.normal.textStyle.align');
+	            // var labelBaseline = timelineModel.get('label.normal.textStyle.baseline');
+	            var labelAlignMap = {
+	                horizontal: 'center',
+	                vertical: (labelPosOpt >= 0 || labelPosOpt === '+') ? 'left' : 'right'
+	            };
+
+	            var labelBaselineMap = {
+	                horizontal: (labelPosOpt >= 0 || labelPosOpt === '+') ? 'top' : 'bottom',
+	                vertical: 'middle'
+	            };
+	            var rotationMap = {
+	                horizontal: 0,
+	                vertical: PI / 2
+	            };
+
+	            // Position
+	            var mainLength = orient === 'vertical' ? viewRect.height : viewRect.width;
+
+	            var controlModel = timelineModel.getModel('controlStyle');
+	            var showControl = controlModel.get('show');
+	            var controlSize = showControl ? controlModel.get('itemSize') : 0;
+	            var controlGap = showControl ? controlModel.get('itemGap') : 0;
+	            var sizePlusGap = controlSize + controlGap;
+
+	            // Special label rotate.
+	            var labelRotation = timelineModel.get('label.normal.rotate') || 0;
+	            labelRotation = labelRotation * PI / 180; // To radian.
+
+	            var playPosition;
+	            var prevBtnPosition;
+	            var nextBtnPosition;
+	            var axisExtent;
+	            var controlPosition = controlModel.get('position', true);
+	            var showControl = controlModel.get('show', true);
+	            var showPlayBtn = showControl && controlModel.get('showPlayBtn', true);
+	            var showPrevBtn = showControl && controlModel.get('showPrevBtn', true);
+	            var showNextBtn = showControl && controlModel.get('showNextBtn', true);
+	            var xLeft = 0;
+	            var xRight = mainLength;
+
+	            // position[0] means left, position[1] means middle.
+	            if (controlPosition === 'left' || controlPosition === 'bottom') {
+	                showPlayBtn && (playPosition = [0, 0], xLeft += sizePlusGap);
+	                showPrevBtn && (prevBtnPosition = [xLeft, 0], xLeft += sizePlusGap);
+	                showNextBtn && (nextBtnPosition = [xRight - controlSize, 0], xRight -= sizePlusGap);
+	            }
+	            else { // 'top' 'right'
+	                showPlayBtn && (playPosition = [xRight - controlSize, 0], xRight -= sizePlusGap);
+	                showPrevBtn && (prevBtnPosition = [0, 0], xLeft += sizePlusGap);
+	                showNextBtn && (nextBtnPosition = [xRight - controlSize, 0], xRight -= sizePlusGap);
+	            }
+	            axisExtent = [xLeft, xRight];
+
+	            if (timelineModel.get('inverse')) {
+	                axisExtent.reverse();
+	            }
+
+	            return {
+	                viewRect: viewRect,
+	                mainLength: mainLength,
+	                orient: orient,
+
+	                rotation: rotationMap[orient],
+	                labelRotation: labelRotation,
+	                labelPosOpt: labelPosOpt,
+	                labelAlign: labelAlignMap[orient],
+	                labelBaseline: labelBaselineMap[orient],
+
+	                // Based on mainGroup.
+	                playPosition: playPosition,
+	                prevBtnPosition: prevBtnPosition,
+	                nextBtnPosition: nextBtnPosition,
+	                axisExtent: axisExtent,
+
+	                controlSize: controlSize,
+	                controlGap: controlGap
+	            };
+	        },
+
+	        _position: function (layoutInfo, timelineModel) {
+	            // Position is be called finally, because bounding rect is needed for
+	            // adapt content to fill viewRect (auto adapt offset).
+
+	            // Timeline may be not all in the viewRect when 'offset' is specified
+	            // as a number, because it is more appropriate that label aligns at
+	            // 'offset' but not the other edge defined by viewRect.
+
+	            var mainGroup = this._mainGroup;
+	            var labelGroup = this._labelGroup;
+
+	            var viewRect = layoutInfo.viewRect;
+	            if (layoutInfo.orient === 'vertical') {
+	                // transfrom to horizontal, inverse rotate by left-top point.
+	                var m = matrix.create();
+	                var rotateOriginX = viewRect.x;
+	                var rotateOriginY = viewRect.y + viewRect.height;
+	                matrix.translate(m, m, [-rotateOriginX, -rotateOriginY]);
+	                matrix.rotate(m, m, -PI / 2);
+	                matrix.translate(m, m, [rotateOriginX, rotateOriginY]);
+	                viewRect = viewRect.clone();
+	                viewRect.applyTransform(m);
+	            }
+
+	            var viewBound = getBound(viewRect);
+	            var mainBound = getBound(mainGroup.getBoundingRect());
+	            var labelBound = getBound(labelGroup.getBoundingRect());
+
+	            var mainPosition = mainGroup.position;
+	            var labelsPosition = labelGroup.position;
+
+	            labelsPosition[0] = mainPosition[0] = viewBound[0][0];
+
+	            var labelPosOpt = layoutInfo.labelPosOpt;
+
+	            if (isNaN(labelPosOpt)) { // '+' or '-'
+	                var mainBoundIdx = labelPosOpt === '+' ? 0 : 1;
+	                toBound(mainPosition, mainBound, viewBound, 1, mainBoundIdx);
+	                toBound(labelsPosition, labelBound, viewBound, 1, 1 - mainBoundIdx);
+	            }
+	            else {
+	                var mainBoundIdx = labelPosOpt >= 0 ? 0 : 1;
+	                toBound(mainPosition, mainBound, viewBound, 1, mainBoundIdx);
+	                labelsPosition[1] = mainPosition[1] + labelPosOpt;
+	            }
+
+	            mainGroup.attr('position', mainPosition);
+	            labelGroup.attr('position', labelsPosition);
+	            mainGroup.rotation = labelGroup.rotation = layoutInfo.rotation;
+
+	            setOrigin(mainGroup);
+	            setOrigin(labelGroup);
+
+	            function setOrigin(targetGroup) {
+	                var pos = targetGroup.position;
+	                targetGroup.origin = [
+	                    viewBound[0][0] - pos[0],
+	                    viewBound[1][0] - pos[1]
+	                ];
+	            }
+
+	            function getBound(rect) {
+	                // [[xmin, xmax], [ymin, ymax]]
+	                return [
+	                    [rect.x, rect.x + rect.width],
+	                    [rect.y, rect.y + rect.height]
+	                ];
+	            }
+
+	            function toBound(fromPos, from, to, dimIdx, boundIdx) {
+	                fromPos[dimIdx] += to[dimIdx][boundIdx] - from[dimIdx][boundIdx];
+	            }
+	        },
+
+	        _createAxis: function (layoutInfo, timelineModel) {
+	            var data = timelineModel.getData();
+	            var axisType = timelineModel.get('axisType');
+
+	            var scale = axisHelper.createScaleByModel(timelineModel, axisType);
+	            var dataExtent = data.getDataExtent('value');
+	            scale.setExtent(dataExtent[0], dataExtent[1]);
+	            this._customizeScale(scale, data);
+	            scale.niceTicks();
+
+	            var axis = new TimelineAxis('value', scale, layoutInfo.axisExtent, axisType);
+	            axis.model = timelineModel;
+
+	            return axis;
+	        },
+
+	        _customizeScale: function (scale, data) {
+
+	            scale.getTicks = function () {
+	                return data.mapArray(['value'], function (value) {
+	                    return value;
+	                });
+	            };
+
+	            scale.getTicksLabels = function () {
+	                return zrUtil.map(this.getTicks(), scale.getLabel, scale);
+	            };
+	        },
+
+	        _createGroup: function (name) {
+	            var newGroup = this['_' + name] = new graphic.Group();
+	            this.group.add(newGroup);
+	            return newGroup;
+	        },
+
+	        _renderAxisLine: function (layoutInfo, group, axis, timelineModel) {
+	            var axisExtent = axis.getExtent();
+
+	            if (!timelineModel.get('lineStyle.show')) {
+	                return;
+	            }
+
+	            group.add(new graphic.Line({
+	                shape: {
+	                    x1: axisExtent[0], y1: 0,
+	                    x2: axisExtent[1], y2: 0
+	                },
+	                style: zrUtil.extend(
+	                    {lineCap: 'round'},
+	                    timelineModel.getModel('lineStyle').getLineStyle()
+	                ),
+	                silent: true,
+	                z2: 1
+	            }));
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _renderAxisTick: function (layoutInfo, group, axis, timelineModel) {
+	            var data = timelineModel.getData();
+	            var ticks = axis.scale.getTicks();
+
+	            each(ticks, function (value, dataIndex) {
+
+	                var tickCoord = axis.dataToCoord(value);
+	                var itemModel = data.getItemModel(dataIndex);
+	                var itemStyleModel = itemModel.getModel('itemStyle.normal');
+	                var hoverStyleModel = itemModel.getModel('itemStyle.emphasis');
+	                var symbolOpt = {
+	                    position: [tickCoord, 0],
+	                    onclick: bind(this._changeTimeline, this, dataIndex)
+	                };
+	                var el = giveSymbol(itemModel, itemStyleModel, group, symbolOpt);
+	                graphic.setHoverStyle(el, hoverStyleModel.getItemStyle());
+
+	                if (itemModel.get('tooltip')) {
+	                    el.dataIndex = dataIndex;
+	                    el.dataModel = timelineModel;
+	                }
+	                else {
+	                    el.dataIndex = el.dataModel = null;
+	                }
+
+	            }, this);
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _renderAxisLabel: function (layoutInfo, group, axis, timelineModel) {
+	            var labelModel = timelineModel.getModel('label.normal');
+
+	            if (!labelModel.get('show')) {
+	                return;
+	            }
+
+	            var data = timelineModel.getData();
+	            var ticks = axis.scale.getTicks();
+	            var labels = axisHelper.getFormattedLabels(
+	                axis, labelModel.get('formatter')
+	            );
+	            var labelInterval = axis.getLabelInterval();
+
+	            each(ticks, function (tick, dataIndex) {
+	                if (axis.isLabelIgnored(dataIndex, labelInterval)) {
+	                    return;
+	                }
+
+	                var itemModel = data.getItemModel(dataIndex);
+	                var itemTextStyleModel = itemModel.getModel('label.normal.textStyle');
+	                var hoverTextStyleModel = itemModel.getModel('label.emphasis.textStyle');
+	                var tickCoord = axis.dataToCoord(tick);
+	                var textEl = new graphic.Text({
+	                    style: {
+	                        text: labels[dataIndex],
+	                        textAlign: layoutInfo.labelAlign,
+	                        textVerticalAlign: layoutInfo.labelBaseline,
+	                        textFont: itemTextStyleModel.getFont(),
+	                        fill: itemTextStyleModel.getTextColor()
+	                    },
+	                    position: [tickCoord, 0],
+	                    rotation: layoutInfo.labelRotation - layoutInfo.rotation,
+	                    onclick: bind(this._changeTimeline, this, dataIndex),
+	                    silent: false
+	                });
+
+	                group.add(textEl);
+	                graphic.setHoverStyle(textEl, hoverTextStyleModel.getItemStyle());
+
+	            }, this);
+	        },
+
+	        /**
+	         * @private
+	         */
+	        _renderControl: function (layoutInfo, group, axis, timelineModel) {
+	            var controlSize = layoutInfo.controlSize;
+	            var rotation = layoutInfo.rotation;
+
+	            var itemStyle = timelineModel.getModel('controlStyle.normal').getItemStyle();
+	            var hoverStyle = timelineModel.getModel('controlStyle.emphasis').getItemStyle();
+	            var rect = [0, -controlSize / 2, controlSize, controlSize];
+	            var playState = timelineModel.getPlayState();
+	            var inverse = timelineModel.get('inverse', true);
+
+	            makeBtn(
+	                layoutInfo.nextBtnPosition,
+	                'controlStyle.nextIcon',
+	                bind(this._changeTimeline, this, inverse ? '-' : '+')
+	            );
+	            makeBtn(
+	                layoutInfo.prevBtnPosition,
+	                'controlStyle.prevIcon',
+	                bind(this._changeTimeline, this, inverse ? '+' : '-')
+	            );
+	            makeBtn(
+	                layoutInfo.playPosition,
+	                'controlStyle.' + (playState ? 'stopIcon' : 'playIcon'),
+	                bind(this._handlePlayClick, this, !playState),
+	                true
+	            );
+
+	            function makeBtn(position, iconPath, onclick, willRotate) {
+	                if (!position) {
+	                    return;
+	                }
+	                var opt = {
+	                    position: position,
+	                    origin: [controlSize / 2, 0],
+	                    rotation: willRotate ? -rotation : 0,
+	                    rectHover: true,
+	                    style: itemStyle,
+	                    onclick: onclick
+	                };
+	                var btn = makeIcon(timelineModel, iconPath, rect, opt);
+	                group.add(btn);
+	                graphic.setHoverStyle(btn, hoverStyle);
+	            }
+	        },
+
+	        _renderCurrentPointer: function (layoutInfo, group, axis, timelineModel) {
+	            var data = timelineModel.getData();
+	            var currentIndex = timelineModel.getCurrentIndex();
+	            var pointerModel = data.getItemModel(currentIndex).getModel('checkpointStyle');
+	            var me = this;
+
+	            var callback = {
+	                onCreate: function (pointer) {
+	                    pointer.draggable = true;
+	                    pointer.drift = bind(me._handlePointerDrag, me);
+	                    pointer.ondragend = bind(me._handlePointerDragend, me);
+	                    pointerMoveTo(pointer, currentIndex, axis, timelineModel, true);
+	                },
+	                onUpdate: function (pointer) {
+	                    pointerMoveTo(pointer, currentIndex, axis, timelineModel);
+	                }
+	            };
+
+	            // Reuse when exists, for animation and drag.
+	            this._currentPointer = giveSymbol(
+	                pointerModel, pointerModel, this._mainGroup, {}, this._currentPointer, callback
+	            );
+	        },
+
+	        _handlePlayClick: function (nextState) {
+	            this._clearTimer();
+	            this.api.dispatchAction({
+	                type: 'timelinePlayChange',
+	                playState: nextState,
+	                from: this.uid
+	            });
+	        },
+
+	        _handlePointerDrag: function (dx, dy, e) {
+	            this._clearTimer();
+	            this._pointerChangeTimeline([e.offsetX, e.offsetY]);
+	        },
+
+	        _handlePointerDragend: function (e) {
+	            this._pointerChangeTimeline([e.offsetX, e.offsetY], true);
+	        },
+
+	        _pointerChangeTimeline: function (mousePos, trigger) {
+	            var toCoord = this._toAxisCoord(mousePos)[0];
+
+	            var axis = this._axis;
+	            var axisExtent = numberUtil.asc(axis.getExtent().slice());
+
+	            toCoord > axisExtent[1] && (toCoord = axisExtent[1]);
+	            toCoord < axisExtent[0] && (toCoord = axisExtent[0]);
+
+	            this._currentPointer.position[0] = toCoord;
+	            this._currentPointer.dirty();
+
+	            var targetDataIndex = this._findNearestTick(toCoord);
+	            var timelineModel = this.model;
+
+	            if (trigger || (
+	                targetDataIndex !== timelineModel.getCurrentIndex()
+	                && timelineModel.get('realtime')
+	            )) {
+	                this._changeTimeline(targetDataIndex);
+	            }
+	        },
+
+	        _doPlayStop: function () {
+	            this._clearTimer();
+
+	            if (this.model.getPlayState()) {
+	                this._timer = setTimeout(
+	                    bind(handleFrame, this),
+	                    this.model.get('playInterval')
+	                );
+	            }
+
+	            function handleFrame() {
+	                // Do not cache
+	                var timelineModel = this.model;
+	                this._changeTimeline(
+	                    timelineModel.getCurrentIndex()
+	                    + (timelineModel.get('rewind', true) ? -1 : 1)
+	                );
+	            }
+	        },
+
+	        _toAxisCoord: function (vertex) {
+	            var trans = this._mainGroup.getLocalTransform();
+	            return graphic.applyTransform(vertex, trans, true);
+	        },
+
+	        _findNearestTick: function (axisCoord) {
+	            var data = this.model.getData();
+	            var dist = Infinity;
+	            var targetDataIndex;
+	            var axis = this._axis;
+
+	            data.each(['value'], function (value, dataIndex) {
+	                var coord = axis.dataToCoord(value);
+	                var d = Math.abs(coord - axisCoord);
+	                if (d < dist) {
+	                    dist = d;
+	                    targetDataIndex = dataIndex;
+	                }
+	            });
+
+	            return targetDataIndex;
+	        },
+
+	        _clearTimer: function () {
+	            if (this._timer) {
+	                clearTimeout(this._timer);
+	                this._timer = null;
+	            }
+	        },
+
+	        _changeTimeline: function (nextIndex) {
+	            var currentIndex = this.model.getCurrentIndex();
+
+	            if (nextIndex === '+') {
+	                nextIndex = currentIndex + 1;
+	            }
+	            else if (nextIndex === '-') {
+	                nextIndex = currentIndex - 1;
+	            }
+
+	            this.api.dispatchAction({
+	                type: 'timelineChange',
+	                currentIndex: nextIndex,
+	                from: this.uid
+	            });
+	        }
+
+	    });
+
+	    function getViewRect(model, api) {
+	        return layout.getLayoutRect(
+	            model.getBoxLayoutParams(),
+	            {
+	                width: api.getWidth(),
+	                height: api.getHeight()
+	            },
+	            model.get('padding')
+	        );
+	    }
+
+	    function makeIcon(timelineModel, objPath, rect, opts) {
+	        var icon = graphic.makePath(
+	            timelineModel.get(objPath).replace(/^path:\/\//, ''),
+	            zrUtil.clone(opts || {}),
+	            new BoundingRect(rect[0], rect[1], rect[2], rect[3]),
+	            'center'
+	        );
+
+	        return icon;
+	    }
+
+	    /**
+	     * Create symbol or update symbol
+	     */
+	    function giveSymbol(hostModel, itemStyleModel, group, opt, symbol, callback) {
+	        var symbolType = hostModel.get('symbol');
+	        var color = itemStyleModel.get('color');
+	        var symbolSize = hostModel.get('symbolSize');
+	        var halfSymbolSize = symbolSize / 2;
+	        var itemStyle = itemStyleModel.getItemStyle(['color', 'symbol', 'symbolSize']);
+
+	        if (!symbol) {
+	            symbol = symbolUtil.createSymbol(
+	                symbolType, -halfSymbolSize, -halfSymbolSize, symbolSize, symbolSize, color
+	            );
+	            group.add(symbol);
+	            callback && callback.onCreate(symbol);
+	        }
+	        else {
+	            symbol.setStyle(itemStyle);
+	            symbol.setColor(color);
+	            group.add(symbol); // Group may be new, also need to add.
+	            callback && callback.onUpdate(symbol);
+	        }
+
+	        opt = zrUtil.merge({
+	            rectHover: true,
+	            style: itemStyle,
+	            z2: 100
+	        }, opt, true);
+
+	        symbol.attr(opt);
+
+	        return symbol;
+	    }
+
+	    function pointerMoveTo(pointer, dataIndex, axis, timelineModel, noAnimation) {
+	        if (pointer.dragging) {
+	            return;
+	        }
+
+	        var pointerModel = timelineModel.getModel('checkpointStyle');
+	        var toCoord = axis.dataToCoord(timelineModel.getData().get(['value'], dataIndex));
+
+	        if (noAnimation || !pointerModel.get('animation', true)) {
+	            pointer.attr({position: [toCoord, 0]});
+	        }
+	        else {
+	            pointer.stopAnimation(true);
+	            pointer.animateTo(
+	                {position: [toCoord, 0]},
+	                pointerModel.get('animationDuration', true),
+	                pointerModel.get('animationEasing', true)
+	            );
+	        }
+	    }
+
+
+
+/***/ },
+/* 363 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @file Timeline view
+	 */
+
+
+	    // var zrUtil = require('zrender/lib/core/util');
+	    // var graphic = require('../../util/graphic');
+	    var ComponentView = __webpack_require__(29);
+
+	    module.exports = ComponentView.extend({
+
+	        type: 'timeline'
+	    });
+
+
+
+/***/ },
+/* 364 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var zrUtil = __webpack_require__(4);
+	    var Axis = __webpack_require__(123);
+	    var axisHelper = __webpack_require__(114);
+
+	    /**
+	     * Extend axis 2d
+	     * @constructor module:echarts/coord/cartesian/Axis2D
+	     * @extends {module:echarts/coord/cartesian/Axis}
+	     * @param {string} dim
+	     * @param {*} scale
+	     * @param {Array.<number>} coordExtent
+	     * @param {string} axisType
+	     * @param {string} position
+	     */
+	    var TimelineAxis = function (dim, scale, coordExtent, axisType) {
+
+	        Axis.call(this, dim, scale, coordExtent);
+
+	        /**
+	         * Axis type
+	         *  - 'category'
+	         *  - 'value'
+	         *  - 'time'
+	         *  - 'log'
+	         * @type {string}
+	         */
+	        this.type = axisType || 'value';
+
+	        /**
+	         * @private
+	         * @type {number}
+	         */
+	        this._autoLabelInterval;
+
+	        /**
+	         * Axis model
+	         * @param {module:echarts/component/TimelineModel}
+	         */
+	        this.model = null;
+	    };
+
+	    TimelineAxis.prototype = {
+
+	        constructor: TimelineAxis,
+
+	        /**
+	         * @public
+	         * @return {number}
+	         */
+	        getLabelInterval: function () {
+	            var timelineModel = this.model;
+	            var labelModel = timelineModel.getModel('label.normal');
+	            var labelInterval = labelModel.get('interval');
+
+	            if (labelInterval != null && labelInterval != 'auto') {
+	                return labelInterval;
+	            }
+
+	            var labelInterval = this._autoLabelInterval;
+
+	            if (!labelInterval) {
+	                labelInterval = this._autoLabelInterval = axisHelper.getAxisLabelInterval(
+	                    zrUtil.map(this.scale.getTicks(), this.dataToCoord, this),
+	                    axisHelper.getFormattedLabels(this, labelModel.get('formatter')),
+	                    labelModel.getModel('textStyle').getFont(),
+	                    timelineModel.get('orient') === 'horizontal'
+	                );
+	            }
+
+	            return labelInterval;
+	        },
+
+	        /**
+	         * If label is ignored.
+	         * Automatically used when axis is category and label can not be all shown
+	         * @public
+	         * @param  {number} idx
+	         * @return {boolean}
+	         */
+	        isLabelIgnored: function (idx) {
+	            if (this.type === 'category') {
+	                var labelInterval = this.getLabelInterval();
+	                return ((typeof labelInterval === 'function')
+	                    && !labelInterval(idx, this.scale.getLabel(idx)))
+	                    || idx % (labelInterval + 1);
+	            }
+	        }
+
+	    };
+
+	    zrUtil.inherits(TimelineAxis, Axis);
+
+	    module.exports = TimelineAxis;
+
+
+/***/ },
+/* 365 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    __webpack_require__(366);
+	    __webpack_require__(367);
+
+	    __webpack_require__(369);
+	    __webpack_require__(370);
+	    __webpack_require__(371);
+	    __webpack_require__(372);
+	    __webpack_require__(377);
+
+
+/***/ },
+/* 366 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var featureManager = __webpack_require__(314);
+	    var zrUtil = __webpack_require__(4);
+
+	    var ToolboxModel = __webpack_require__(1).extendComponentModel({
+
+	        type: 'toolbox',
+
+	        layoutMode: {
+	            type: 'box',
+	            ignoreSize: true
+	        },
+
+	        mergeDefaultAndTheme: function (option) {
+	            ToolboxModel.superApply(this, 'mergeDefaultAndTheme', arguments);
+
+	            zrUtil.each(this.option.feature, function (featureOpt, featureName) {
+	                var Feature = featureManager.get(featureName);
+	                Feature && zrUtil.merge(featureOpt, Feature.defaultOption);
+	            });
+	        },
+
+	        defaultOption: {
+
+	            show: true,
+
+	            z: 6,
+
+	            zlevel: 0,
+
+	            orient: 'horizontal',
+
+	            left: 'right',
+
+	            top: 'top',
+
+	            // right
+	            // bottom
+
+	            backgroundColor: 'transparent',
+
+	            borderColor: '#ccc',
+
+	            borderWidth: 0,
+
+	            padding: 5,
+
+	            itemSize: 15,
+
+	            itemGap: 8,
+
+	            showTitle: true,
+
+	            iconStyle: {
+	                normal: {
+	                    borderColor: '#666',
+	                    color: 'none'
+	                },
+	                emphasis: {
+	                    borderColor: '#3E98C5'
+	                }
+	            }
+	            // textStyle: {},
+
+	            // feature
+	        }
+	    });
+
+	    module.exports = ToolboxModel;
+
+
+/***/ },
+/* 367 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/* WEBPACK VAR INJECTION */(function(process) {
+
+	    var featureManager = __webpack_require__(314);
+	    var zrUtil = __webpack_require__(4);
+	    var graphic = __webpack_require__(43);
+	    var Model = __webpack_require__(12);
+	    var DataDiffer = __webpack_require__(98);
+	    var listComponentHelper = __webpack_require__(277);
+	    var textContain = __webpack_require__(8);
+
+	    module.exports = __webpack_require__(1).extendComponentView({
+
+	        type: 'toolbox',
+
+	        render: function (toolboxModel, ecModel, api, payload) {
+	            var group = this.group;
+	            group.removeAll();
+
+	            if (!toolboxModel.get('show')) {
+	                return;
+	            }
+
+	            var itemSize = +toolboxModel.get('itemSize');
+	            var featureOpts = toolboxModel.get('feature') || {};
+	            var features = this._features || (this._features = {});
+
+	            var featureNames = [];
+	            zrUtil.each(featureOpts, function (opt, name) {
+	                featureNames.push(name);
+	            });
+
+	            (new DataDiffer(this._featureNames || [], featureNames))
+	                .add(process)
+	                .update(process)
+	                .remove(zrUtil.curry(process, null))
+	                .execute();
+
+	            // Keep for diff.
+	            this._featureNames = featureNames;
+
+	            function process(newIndex, oldIndex) {
+	                var featureName = featureNames[newIndex];
+	                var oldName = featureNames[oldIndex];
+	                var featureOpt = featureOpts[featureName];
+	                var featureModel = new Model(featureOpt, toolboxModel, toolboxModel.ecModel);
+	                var feature;
+
+	                if (featureName && !oldName) { // Create
+	                    if (isUserFeatureName(featureName)) {
+	                        feature = {
+	                            model: featureModel,
+	                            onclick: featureModel.option.onclick,
+	                            featureName: featureName
+	                        };
+	                    }
+	                    else {
+	                        var Feature = featureManager.get(featureName);
+	                        if (!Feature) {
+	                            return;
+	                        }
+	                        feature = new Feature(featureModel, ecModel, api);
+	                    }
+	                    features[featureName] = feature;
+	                }
+	                else {
+	                    feature = features[oldName];
+	                    // If feature does not exsit.
+	                    if (!feature) {
+	                        return;
+	                    }
+	                    feature.model = featureModel;
+	                    feature.ecModel = ecModel;
+	                    feature.api = api;
+	                }
+
+	                if (!featureName && oldName) {
+	                    feature.dispose && feature.dispose(ecModel, api);
+	                    return;
+	                }
+
+	                if (!featureModel.get('show') || feature.unusable) {
+	                    feature.remove && feature.remove(ecModel, api);
+	                    return;
+	                }
+
+	                createIconPaths(featureModel, feature, featureName);
+
+	                featureModel.setIconStatus = function (iconName, status) {
+	                    var option = this.option;
+	                    var iconPaths = this.iconPaths;
+	                    option.iconStatus = option.iconStatus || {};
+	                    option.iconStatus[iconName] = status;
+	                    // FIXME
+	                    iconPaths[iconName] && iconPaths[iconName].trigger(status);
+	                };
+
+	                if (feature.render) {
+	                    feature.render(featureModel, ecModel, api, payload);
+	                }
+	            }
+
+	            function createIconPaths(featureModel, feature, featureName) {
+	                var iconStyleModel = featureModel.getModel('iconStyle');
+
+	                // If one feature has mutiple icon. they are orginaized as
+	                // {
+	                //     icon: {
+	                //         foo: '',
+	                //         bar: ''
+	                //     },
+	                //     title: {
+	                //         foo: '',
+	                //         bar: ''
+	                //     }
+	                // }
+	                var icons = feature.getIcons ? feature.getIcons() : featureModel.get('icon');
+	                var titles = featureModel.get('title') || {};
+	                if (typeof icons === 'string') {
+	                    var icon = icons;
+	                    var title = titles;
+	                    icons = {};
+	                    titles = {};
+	                    icons[featureName] = icon;
+	                    titles[featureName] = title;
+	                }
+	                var iconPaths = featureModel.iconPaths = {};
+	                zrUtil.each(icons, function (icon, iconName) {
+	                    var normalStyle = iconStyleModel.getModel('normal').getItemStyle();
+	                    var hoverStyle = iconStyleModel.getModel('emphasis').getItemStyle();
+
+	                    var style = {
+	                        x: -itemSize / 2,
+	                        y: -itemSize / 2,
+	                        width: itemSize,
+	                        height: itemSize
+	                    };
+	                    var path = icon.indexOf('image://') === 0
+	                        ? (
+	                            style.image = icon.slice(8),
+	                            new graphic.Image({style: style})
+	                        )
+	                        : graphic.makePath(
+	                            icon.replace('path://', ''),
+	                            {
+	                                style: normalStyle,
+	                                hoverStyle: hoverStyle,
+	                                rectHover: true
+	                            },
+	                            style,
+	                            'center'
+	                        );
+
+	                    graphic.setHoverStyle(path);
+
+	                    if (toolboxModel.get('showTitle')) {
+	                        path.__title = titles[iconName];
+	                        path.on('mouseover', function () {
+	                                path.setStyle({
+	                                    text: titles[iconName],
+	                                    textPosition: hoverStyle.textPosition || 'bottom',
+	                                    textFill: hoverStyle.fill || hoverStyle.stroke || '#000',
+	                                    textAlign: hoverStyle.textAlign || 'center'
+	                                });
+	                            })
+	                            .on('mouseout', function () {
+	                                path.setStyle({
+	                                    textFill: null
+	                                });
+	                            });
+	                    }
+	                    path.trigger(featureModel.get('iconStatus.' + iconName) || 'normal');
+
+	                    group.add(path);
+	                    path.on('click', zrUtil.bind(
+	                        feature.onclick, feature, ecModel, api, iconName
+	                    ));
+
+	                    iconPaths[iconName] = path;
+	                });
+	            }
+
+	            listComponentHelper.layout(group, toolboxModel, api);
+	            // Render background after group is layout
+	            // FIXME
+	            listComponentHelper.addBackground(group, toolboxModel);
+
+	            // Adjust icon title positions to avoid them out of screen
+	            group.eachChild(function (icon) {
+	                var titleText = icon.__title;
+	                var hoverStyle = icon.hoverStyle;
+	                // May be background element
+	                if (hoverStyle && titleText) {
+	                    var rect = textContain.getBoundingRect(
+	                        titleText, hoverStyle.font
+	                    );
+	                    var offsetX = icon.position[0] + group.position[0];
+	                    var offsetY = icon.position[1] + group.position[1] + itemSize;
+
+	                    var needPutOnTop = false;
+	                    if (offsetY + rect.height > api.getHeight()) {
+	                        hoverStyle.textPosition = 'top';
+	                        needPutOnTop = true;
+	                    }
+	                    var topOffset = needPutOnTop ? (-5 - rect.height) : (itemSize + 8);
+	                    if (offsetX + rect.width /  2 > api.getWidth()) {
+	                        hoverStyle.textPosition = ['100%', topOffset];
+	                        hoverStyle.textAlign = 'right';
+	                    }
+	                    else if (offsetX - rect.width / 2 < 0) {
+	                        hoverStyle.textPosition = [0, topOffset];
+	                        hoverStyle.textAlign = 'left';
+	                    }
+	                }
+	            });
+	        },
+
+	        updateView: function (toolboxModel, ecModel, api, payload) {
+	            zrUtil.each(this._features, function (feature) {
+	                feature.updateView && feature.updateView(feature.model, ecModel, api, payload);
+	            });
+	        },
+
+	        updateLayout: function (toolboxModel, ecModel, api, payload) {
+	            zrUtil.each(this._features, function (feature) {
+	                feature.updateLayout && feature.updateLayout(feature.model, ecModel, api, payload);
+	            });
+	        },
+
+	        remove: function (ecModel, api) {
+	            zrUtil.each(this._features, function (feature) {
+	                feature.remove && feature.remove(ecModel, api);
+	            });
+	            this.group.removeAll();
+	        },
+
+	        dispose: function (ecModel, api) {
+	            zrUtil.each(this._features, function (feature) {
+	                feature.dispose && feature.dispose(ecModel, api);
+	            });
+	        }
+	    });
+
+	    function isUserFeatureName(featureName) {
+	        return featureName.indexOf('my') === 0;
+	    }
+
+
+	/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(368)))
+
+/***/ },
+/* 368 */
+/***/ function(module, exports) {
+
+	// shim for using process in browser
+
+	var process = module.exports = {};
+	var queue = [];
+	var draining = false;
+	var currentQueue;
+	var queueIndex = -1;
+
+	function cleanUpNextTick() {
+	    draining = false;
+	    if (currentQueue.length) {
+	        queue = currentQueue.concat(queue);
+	    } else {
+	        queueIndex = -1;
+	    }
+	    if (queue.length) {
+	        drainQueue();
+	    }
+	}
+
+	function drainQueue() {
+	    if (draining) {
+	        return;
+	    }
+	    var timeout = setTimeout(cleanUpNextTick);
+	    draining = true;
+
+	    var len = queue.length;
+	    while(len) {
+	        currentQueue = queue;
+	        queue = [];
+	        while (++queueIndex < len) {
+	            if (currentQueue) {
+	                currentQueue[queueIndex].run();
+	            }
+	        }
+	        queueIndex = -1;
+	        len = queue.length;
+	    }
+	    currentQueue = null;
+	    draining = false;
+	    clearTimeout(timeout);
+	}
+
+	process.nextTick = function (fun) {
+	    var args = new Array(arguments.length - 1);
+	    if (arguments.length > 1) {
+	        for (var i = 1; i < arguments.length; i++) {
+	            args[i - 1] = arguments[i];
+	        }
+	    }
+	    queue.push(new Item(fun, args));
+	    if (queue.length === 1 && !draining) {
+	        setTimeout(drainQueue, 0);
+	    }
+	};
+
+	// v8 likes predictible objects
+	function Item(fun, array) {
+	    this.fun = fun;
+	    this.array = array;
+	}
+	Item.prototype.run = function () {
+	    this.fun.apply(null, this.array);
+	};
+	process.title = 'browser';
+	process.browser = true;
+	process.env = {};
+	process.argv = [];
+	process.version = ''; // empty string to avoid regexp issues
+	process.versions = {};
+
+	function noop() {}
+
+	process.on = noop;
+	process.addListener = noop;
+	process.once = noop;
+	process.off = noop;
+	process.removeListener = noop;
+	process.removeAllListeners = noop;
+	process.emit = noop;
+
+	process.binding = function (name) {
+	    throw new Error('process.binding is not supported');
+	};
+
+	process.cwd = function () { return '/' };
+	process.chdir = function (dir) {
+	    throw new Error('process.chdir is not supported');
+	};
+	process.umask = function() { return 0; };
+
+
+/***/ },
+/* 369 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var env = __webpack_require__(2);
+
+	    function SaveAsImage (model) {
+	        this.model = model;
+	    }
+
+	    SaveAsImage.defaultOption = {
+	        show: true,
+	        icon: 'M4.7,22.9L29.3,45.5L54.7,23.4M4.6,43.6L4.6,58L53.8,58L53.8,43.6M29.2,45.1L29.2,0',
+	        title: '保存为图片',
+	        type: 'png',
+	        // Default use option.backgroundColor
+	        // backgroundColor: '#fff',
+	        name: '',
+	        excludeComponents: ['toolbox'],
+	        pixelRatio: 1,
+	        lang: ['右键另存为图片']
+	    };
+
+	    SaveAsImage.prototype.unusable = !env.canvasSupported;
+
+	    var proto = SaveAsImage.prototype;
+
+	    proto.onclick = function (ecModel, api) {
+	        var model = this.model;
+	        var title = model.get('name') || ecModel.get('title.0.text') || 'echarts';
+	        var $a = document.createElement('a');
+	        var type = model.get('type', true) || 'png';
+	        $a.download = title + '.' + type;
+	        $a.target = '_blank';
+	        var url = api.getConnectedDataURL({
+	            type: type,
+	            backgroundColor: model.get('backgroundColor', true)
+	                || ecModel.get('backgroundColor') || '#fff',
+	            excludeComponents: model.get('excludeComponents'),
+	            pixelRatio: model.get('pixelRatio')
+	        });
+	        $a.href = url;
+	        // Chrome and Firefox
+	        if (typeof MouseEvent === 'function') {
+	            var evt = new MouseEvent('click', {
+	                view: window,
+	                bubbles: true,
+	                cancelable: false
+	            });
+	            $a.dispatchEvent(evt);
+	        }
+	        // IE
+	        else {
+	            var lang = model.get('lang');
+	            var html = ''
+	                + '<body style="margin:0;">'
+	                + '<img src="' + url + '" style="max-width:100%;" title="' + ((lang && lang[0]) || '') + '" />'
+	                + '</body>';
+	            var tab = window.open();
+	            tab.document.write(html);
+	        }
+	    };
+
+	    __webpack_require__(314).register(
+	        'saveAsImage', SaveAsImage
+	    );
+
+	    module.exports = SaveAsImage;
+
+
+/***/ },
+/* 370 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var zrUtil = __webpack_require__(4);
+
+	    function MagicType(model) {
+	        this.model = model;
+	    }
+
+	    MagicType.defaultOption = {
+	        show: true,
+	        type: [],
+	        // Icon group
+	        icon: {
+	            line: 'M4.1,28.9h7.1l9.3-22l7.4,38l9.7-19.7l3,12.8h14.9M4.1,58h51.4',
+	            bar: 'M6.7,22.9h10V48h-10V22.9zM24.9,13h10v35h-10V13zM43.2,2h10v46h-10V2zM3.1,58h53.7',
+	            stack: 'M8.2,38.4l-8.4,4.1l30.6,15.3L60,42.5l-8.1-4.1l-21.5,11L8.2,38.4z M51.9,30l-8.1,4.2l-13.4,6.9l-13.9-6.9L8.2,30l-8.4,4.2l8.4,4.2l22.2,11l21.5-11l8.1-4.2L51.9,30z M51.9,21.7l-8.1,4.2L35.7,30l-5.3,2.8L24.9,30l-8.4-4.1l-8.3-4.2l-8.4,4.2L8.2,30l8.3,4.2l13.9,6.9l13.4-6.9l8.1-4.2l8.1-4.1L51.9,21.7zM30.4,2.2L-0.2,17.5l8.4,4.1l8.3,4.2l8.4,4.2l5.5,2.7l5.3-2.7l8.1-4.2l8.1-4.2l8.1-4.1L30.4,2.2z', // jshint ignore:line
+	            tiled: 'M2.3,2.2h22.8V25H2.3V2.2z M35,2.2h22.8V25H35V2.2zM2.3,35h22.8v22.8H2.3V35z M35,35h22.8v22.8H35V35z'
+	        },
+	        title: {
+	            line: '切换为折线图',
+	            bar: '切换为柱状图',
+	            stack: '切换为堆叠',
+	            tiled: '切换为平铺'
+	        },
+	        option: {},
+	        seriesIndex: {}
+	    };
+
+	    var proto = MagicType.prototype;
+
+	    proto.getIcons = function () {
+	        var model = this.model;
+	        var availableIcons = model.get('icon');
+	        var icons = {};
+	        zrUtil.each(model.get('type'), function (type) {
+	            if (availableIcons[type]) {
+	                icons[type] = availableIcons[type];
+	            }
+	        });
+	        return icons;
+	    };
+
+	    var seriesOptGenreator = {
+	        'line': function (seriesType, seriesId, seriesModel, model) {
+	            if (seriesType === 'bar') {
+	                return zrUtil.merge({
+	                    id: seriesId,
+	                    type: 'line',
+	                    // Preserve data related option
+	                    data: seriesModel.get('data'),
+	                    stack: seriesModel.get('stack'),
+	                    markPoint: seriesModel.get('markPoint'),
+	                    markLine: seriesModel.get('markLine')
+	                }, model.get('option.line') || {}, true);
+	            }
+	        },
+	        'bar': function (seriesType, seriesId, seriesModel, model) {
+	            if (seriesType === 'line') {
+	                return zrUtil.merge({
+	                    id: seriesId,
+	                    type: 'bar',
+	                    // Preserve data related option
+	                    data: seriesModel.get('data'),
+	                    stack: seriesModel.get('stack'),
+	                    markPoint: seriesModel.get('markPoint'),
+	                    markLine: seriesModel.get('markLine')
+	                }, model.get('option.bar') || {}, true);
+	            }
+	        },
+	        'stack': function (seriesType, seriesId, seriesModel, model) {
+	            if (seriesType === 'line' || seriesType === 'bar') {
+	                return zrUtil.merge({
+	                    id: seriesId,
+	                    stack: '__ec_magicType_stack__'
+	                }, model.get('option.stack') || {}, true);
+	            }
+	        },
+	        'tiled': function (seriesType, seriesId, seriesModel, model) {
+	            if (seriesType === 'line' || seriesType === 'bar') {
+	                return zrUtil.merge({
+	                    id: seriesId,
+	                    stack: ''
+	                }, model.get('option.tiled') || {}, true);
+	            }
+	        }
+	    };
+
+	    var radioTypes = [
+	        ['line', 'bar'],
+	        ['stack', 'tiled']
+	    ];
+
+	    proto.onclick = function (ecModel, api, type) {
+	        var model = this.model;
+	        var seriesIndex = model.get('seriesIndex.' + type);
+	        // Not supported magicType
+	        if (!seriesOptGenreator[type]) {
+	            return;
+	        }
+	        var newOption = {
+	            series: []
+	        };
+	        var generateNewSeriesTypes = function (seriesModel) {
+	            var seriesType = seriesModel.subType;
+	            var seriesId = seriesModel.id;
+	            var newSeriesOpt = seriesOptGenreator[type](
+	                seriesType, seriesId, seriesModel, model
+	            );
+	            if (newSeriesOpt) {
+	                // PENDING If merge original option?
+	                zrUtil.defaults(newSeriesOpt, seriesModel.option);
+	                newOption.series.push(newSeriesOpt);
+	            }
+	            // Modify boundaryGap
+	            var coordSys = seriesModel.coordinateSystem;
+	            if (coordSys && coordSys.type === 'cartesian2d' && (type === 'line' || type === 'bar')) {
+	                var categoryAxis = coordSys.getAxesByScale('ordinal')[0];
+	                if (categoryAxis) {
+	                    var axisDim = categoryAxis.dim;
+	                    var axisIndex = seriesModel.get(axisDim + 'AxisIndex');
+	                    var axisKey = axisDim + 'Axis';
+	                    newOption[axisKey] = newOption[axisKey] || [];
+	                    for (var i = 0; i <= axisIndex; i++) {
+	                        newOption[axisKey][axisIndex] = newOption[axisKey][axisIndex] || {};
+	                    }
+	                    newOption[axisKey][axisIndex].boundaryGap = type === 'bar' ? true : false;
+	                }
+	            }
+	        };
+
+	        zrUtil.each(radioTypes, function (radio) {
+	            if (zrUtil.indexOf(radio, type) >= 0) {
+	                zrUtil.each(radio, function (item) {
+	                    model.setIconStatus(item, 'normal');
+	                });
+	            }
+	        });
+
+	        model.setIconStatus(type, 'emphasis');
+
+	        ecModel.eachComponent(
+	            {
+	                mainType: 'series',
+	                query: seriesIndex == null ? null : {
+	                    seriesIndex: seriesIndex
+	                }
+	            }, generateNewSeriesTypes
+	        );
+	        api.dispatchAction({
+	            type: 'changeMagicType',
+	            currentType: type,
+	            newOption: newOption
+	        });
+	    };
+
+	    var echarts = __webpack_require__(1);
+	    echarts.registerAction({
+	        type: 'changeMagicType',
+	        event: 'magicTypeChanged',
+	        update: 'prepareAndUpdate'
+	    }, function (payload, ecModel) {
+	        ecModel.mergeOption(payload.newOption);
+	    });
+
+	    __webpack_require__(314).register('magicType', MagicType);
+
+	    module.exports = MagicType;
+
+
+/***/ },
+/* 371 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @module echarts/component/toolbox/feature/DataView
+	 */
+
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var eventTool = __webpack_require__(87);
+
+
+	    var BLOCK_SPLITER = new Array(60).join('-');
+	    var ITEM_SPLITER = '\t';
+	    /**
+	     * Group series into two types
+	     *  1. on category axis, like line, bar
+	     *  2. others, like scatter, pie
+	     * @param {module:echarts/model/Global} ecModel
+	     * @return {Object}
+	     * @inner
+	     */
+	    function groupSeries(ecModel) {
+	        var seriesGroupByCategoryAxis = {};
+	        var otherSeries = [];
+	        var meta = [];
+	        ecModel.eachRawSeries(function (seriesModel) {
+	            var coordSys = seriesModel.coordinateSystem;
+
+	            if (coordSys && (coordSys.type === 'cartesian2d' || coordSys.type === 'polar')) {
+	                var baseAxis = coordSys.getBaseAxis();
+	                if (baseAxis.type === 'category') {
+	                    var key = baseAxis.dim + '_' + baseAxis.index;
+	                    if (!seriesGroupByCategoryAxis[key]) {
+	                        seriesGroupByCategoryAxis[key] = {
+	                            categoryAxis: baseAxis,
+	                            valueAxis: coordSys.getOtherAxis(baseAxis),
+	                            series: []
+	                        };
+	                        meta.push({
+	                            axisDim: baseAxis.dim,
+	                            axisIndex: baseAxis.index
+	                        });
+	                    }
+	                    seriesGroupByCategoryAxis[key].series.push(seriesModel);
+	                }
+	                else {
+	                    otherSeries.push(seriesModel);
+	                }
+	            }
+	            else {
+	                otherSeries.push(seriesModel);
+	            }
+	        });
+
+	        return {
+	            seriesGroupByCategoryAxis: seriesGroupByCategoryAxis,
+	            other: otherSeries,
+	            meta: meta
+	        };
+	    }
+
+	    /**
+	     * Assemble content of series on cateogory axis
+	     * @param {Array.<module:echarts/model/Series>} series
+	     * @return {string}
+	     * @inner
+	     */
+	    function assembleSeriesWithCategoryAxis(series) {
+	        var tables = [];
+	        zrUtil.each(series, function (group, key) {
+	            var categoryAxis = group.categoryAxis;
+	            var valueAxis = group.valueAxis;
+	            var valueAxisDim = valueAxis.dim;
+
+	            var headers = [' '].concat(zrUtil.map(group.series, function (series) {
+	                return series.name;
+	            }));
+	            var columns = [categoryAxis.model.getCategories()];
+	            zrUtil.each(group.series, function (series) {
+	                columns.push(series.getRawData().mapArray(valueAxisDim, function (val) {
+	                    return val;
+	                }));
+	            });
+	            // Assemble table content
+	            var lines = [headers.join(ITEM_SPLITER)];
+	            for (var i = 0; i < columns[0].length; i++) {
+	                var items = [];
+	                for (var j = 0; j < columns.length; j++) {
+	                    items.push(columns[j][i]);
+	                }
+	                lines.push(items.join(ITEM_SPLITER));
+	            }
+	            tables.push(lines.join('\n'));
+	        });
+	        return tables.join('\n\n' +  BLOCK_SPLITER + '\n\n');
+	    }
+
+	    /**
+	     * Assemble content of other series
+	     * @param {Array.<module:echarts/model/Series>} series
+	     * @return {string}
+	     * @inner
+	     */
+	    function assembleOtherSeries(series) {
+	        return zrUtil.map(series, function (series) {
+	            var data = series.getRawData();
+	            var lines = [series.name];
+	            var vals = [];
+	            data.each(data.dimensions, function () {
+	                var argLen = arguments.length;
+	                var dataIndex = arguments[argLen - 1];
+	                var name = data.getName(dataIndex);
+	                for (var i = 0; i < argLen - 1; i++) {
+	                    vals[i] = arguments[i];
+	                }
+	                lines.push((name ? (name + ITEM_SPLITER) : '') + vals.join(ITEM_SPLITER));
+	            });
+	            return lines.join('\n');
+	        }).join('\n\n' + BLOCK_SPLITER + '\n\n');
+	    }
+
+	    /**
+	     * @param {module:echarts/model/Global}
+	     * @return {string}
+	     * @inner
+	     */
+	    function getContentFromModel(ecModel) {
+
+	        var result = groupSeries(ecModel);
+
+	        return {
+	            value: zrUtil.filter([
+	                    assembleSeriesWithCategoryAxis(result.seriesGroupByCategoryAxis),
+	                    assembleOtherSeries(result.other)
+	                ], function (str) {
+	                    return str.replace(/[\n\t\s]/g, '');
+	                }).join('\n\n' + BLOCK_SPLITER + '\n\n'),
+
+	            meta: result.meta
+	        };
+	    }
+
+
+	    function trim(str) {
+	        return str.replace(/^\s\s*/, '').replace(/\s\s*$/, '');
+	    }
+	    /**
+	     * If a block is tsv format
+	     */
+	    function isTSVFormat(block) {
+	        // Simple method to find out if a block is tsv format
+	        var firstLine = block.slice(0, block.indexOf('\n'));
+	        if (firstLine.indexOf(ITEM_SPLITER) >= 0) {
+	            return true;
+	        }
+	    }
+
+	    var itemSplitRegex = new RegExp('[' + ITEM_SPLITER + ']+', 'g');
+	    /**
+	     * @param {string} tsv
+	     * @return {Array.<Object>}
+	     */
+	    function parseTSVContents(tsv) {
+	        var tsvLines = tsv.split(/\n+/g);
+	        var headers = trim(tsvLines.shift()).split(itemSplitRegex);
+
+	        var categories = [];
+	        var series = zrUtil.map(headers, function (header) {
+	            return {
+	                name: header,
+	                data: []
+	            };
+	        });
+	        for (var i = 0; i < tsvLines.length; i++) {
+	            var items = trim(tsvLines[i]).split(itemSplitRegex);
+	            categories.push(items.shift());
+	            for (var j = 0; j < items.length; j++) {
+	                series[j] && (series[j].data[i] = items[j]);
+	            }
+	        }
+	        return {
+	            series: series,
+	            categories: categories
+	        };
+	    }
+
+	    /**
+	     * @param {string} str
+	     * @return {Array.<Object>}
+	     * @inner
+	     */
+	    function parseListContents(str) {
+	        var lines = str.split(/\n+/g);
+	        var seriesName = trim(lines.shift());
+
+	        var data = [];
+	        for (var i = 0; i < lines.length; i++) {
+	            var items = trim(lines[i]).split(itemSplitRegex);
+	            var name = '';
+	            var value;
+	            var hasName = false;
+	            if (isNaN(items[0])) { // First item is name
+	                hasName = true;
+	                name = items[0];
+	                items = items.slice(1);
+	                data[i] = {
+	                    name: name,
+	                    value: []
+	                };
+	                value = data[i].value;
+	            }
+	            else {
+	                value = data[i] = [];
+	            }
+	            for (var j = 0; j < items.length; j++) {
+	                value.push(+items[j]);
+	            }
+	            if (value.length === 1) {
+	                hasName ? (data[i].value = value[0]) : (data[i] = value[0]);
+	            }
+	        }
+
+	        return {
+	            name: seriesName,
+	            data: data
+	        };
+	    }
+
+	    /**
+	     * @param {string} str
+	     * @param {Array.<Object>} blockMetaList
+	     * @return {Object}
+	     * @inner
+	     */
+	    function parseContents(str, blockMetaList) {
+	        var blocks = str.split(new RegExp('\n*' + BLOCK_SPLITER + '\n*', 'g'));
+	        var newOption = {
+	            series: []
+	        };
+	        zrUtil.each(blocks, function (block, idx) {
+	            if (isTSVFormat(block)) {
+	                var result = parseTSVContents(block);
+	                var blockMeta = blockMetaList[idx];
+	                var axisKey = blockMeta.axisDim + 'Axis';
+
+	                if (blockMeta) {
+	                    newOption[axisKey] = newOption[axisKey] || [];
+	                    newOption[axisKey][blockMeta.axisIndex] = {
+	                        data: result.categories
+	                    };
+	                    newOption.series = newOption.series.concat(result.series);
+	                }
+	            }
+	            else {
+	                var result = parseListContents(block);
+	                newOption.series.push(result);
+	            }
+	        });
+	        return newOption;
+	    }
+
+	    /**
+	     * @alias {module:echarts/component/toolbox/feature/DataView}
+	     * @constructor
+	     * @param {module:echarts/model/Model} model
+	     */
+	    function DataView(model) {
+
+	        this._dom = null;
+
+	        this.model = model;
+	    }
+
+	    DataView.defaultOption = {
+	        show: true,
+	        readOnly: false,
+	        optionToContent: null,
+	        contentToOption: null,
+
+	        icon: 'M17.5,17.3H33 M17.5,17.3H33 M45.4,29.5h-28 M11.5,2v56H51V14.8L38.4,2H11.5z M38.4,2.2v12.7H51 M45.4,41.7h-28',
+	        title: '数据视图',
+	        lang: ['数据视图', '关闭', '刷新'],
+	        backgroundColor: '#fff',
+	        textColor: '#000',
+	        textareaColor: '#fff',
+	        textareaBorderColor: '#333',
+	        buttonColor: '#c23531',
+	        buttonTextColor: '#fff'
+	    };
+
+	    DataView.prototype.onclick = function (ecModel, api) {
+	        var container = api.getDom();
+	        var model = this.model;
+	        if (this._dom) {
+	            container.removeChild(this._dom);
+	        }
+	        var root = document.createElement('div');
+	        root.style.cssText = 'position:absolute;left:5px;top:5px;bottom:5px;right:5px;';
+	        root.style.backgroundColor = model.get('backgroundColor') || '#fff';
+
+	        // Create elements
+	        var header = document.createElement('h4');
+	        var lang = model.get('lang') || [];
+	        header.innerHTML = lang[0] || model.get('title');
+	        header.style.cssText = 'margin: 10px 20px;';
+	        header.style.color = model.get('textColor');
+
+	        var viewMain = document.createElement('div');
+	        var textarea = document.createElement('textarea');
+	        viewMain.style.cssText = 'display:block;width:100%;overflow:hidden;';
+
+	        var optionToContent = model.get('optionToContent');
+	        var contentToOption = model.get('contentToOption');
+	        var result = getContentFromModel(ecModel);
+	        if (typeof optionToContent === 'function') {
+	            var htmlOrDom = optionToContent(api.getOption());
+	            if (typeof htmlOrDom === 'string') {
+	                viewMain.innerHTML = htmlOrDom;
+	            }
+	            else if (zrUtil.isDom(htmlOrDom)) {
+	                viewMain.appendChild(htmlOrDom);
+	            }
+	        }
+	        else {
+	            // Use default textarea
+	            viewMain.appendChild(textarea);
+	            textarea.readOnly = model.get('readOnly');
+	            textarea.style.cssText = 'width:100%;height:100%;font-family:monospace;font-size:14px;line-height:1.6rem;';
+	            textarea.style.color = model.get('textColor');
+	            textarea.style.borderColor = model.get('textareaBorderColor');
+	            textarea.style.backgroundColor = model.get('textareaColor');
+	            textarea.value = result.value;
+	        }
+
+	        var blockMetaList = result.meta;
+
+	        var buttonContainer = document.createElement('div');
+	        buttonContainer.style.cssText = 'position:absolute;bottom:0;left:0;right:0;';
+
+	        var buttonStyle = 'float:right;margin-right:20px;border:none;'
+	            + 'cursor:pointer;padding:2px 5px;font-size:12px;border-radius:3px';
+	        var closeButton = document.createElement('div');
+	        var refreshButton = document.createElement('div');
+
+	        buttonStyle += ';background-color:' + model.get('buttonColor');
+	        buttonStyle += ';color:' + model.get('buttonTextColor');
+
+	        var self = this;
+
+	        function close() {
+	            container.removeChild(root);
+	            self._dom = null;
+	        }
+	        eventTool.addEventListener(closeButton, 'click', close);
+
+	        eventTool.addEventListener(refreshButton, 'click', function () {
+	            var newOption;
+	            try {
+	                if (typeof contentToOption === 'function') {
+	                    newOption = contentToOption(viewMain, api.getOption());
+	                }
+	                else {
+	                    newOption = parseContents(textarea.value, blockMetaList);
+	                }
+	            }
+	            catch (e) {
+	                close();
+	                throw new Error('Data view format error ' + e);
+	            }
+	            if (newOption) {
+	                api.dispatchAction({
+	                    type: 'changeDataView',
+	                    newOption: newOption
+	                });
+	            }
+
+	            close();
+	        });
+
+	        closeButton.innerHTML = lang[1];
+	        refreshButton.innerHTML = lang[2];
+	        refreshButton.style.cssText = buttonStyle;
+	        closeButton.style.cssText = buttonStyle;
+
+	        !model.get('readOnly') && buttonContainer.appendChild(refreshButton);
+	        buttonContainer.appendChild(closeButton);
+
+	        // http://stackoverflow.com/questions/6637341/use-tab-to-indent-in-textarea
+	        eventTool.addEventListener(textarea, 'keydown', function (e) {
+	            if ((e.keyCode || e.which) === 9) {
+	                // get caret position/selection
+	                var val = this.value;
+	                var start = this.selectionStart;
+	                var end = this.selectionEnd;
+
+	                // set textarea value to: text before caret + tab + text after caret
+	                this.value = val.substring(0, start) + ITEM_SPLITER + val.substring(end);
+
+	                // put caret at right position again
+	                this.selectionStart = this.selectionEnd = start + 1;
+
+	                // prevent the focus lose
+	                eventTool.stop(e);
+	            }
+	        });
+
+	        root.appendChild(header);
+	        root.appendChild(viewMain);
+	        root.appendChild(buttonContainer);
+
+	        viewMain.style.height = (container.clientHeight - 80) + 'px';
+
+	        container.appendChild(root);
+	        this._dom = root;
+	    };
+
+	    DataView.prototype.remove = function (ecModel, api) {
+	        this._dom && api.getDom().removeChild(this._dom);
+	    };
+
+	    DataView.prototype.dispose = function (ecModel, api) {
+	        this.remove(ecModel, api);
+	    };
+
+	    /**
+	     * @inner
+	     */
+	    function tryMergeDataOption(newData, originalData) {
+	        return zrUtil.map(newData, function (newVal, idx) {
+	            var original = originalData && originalData[idx];
+	            if (zrUtil.isObject(original) && !zrUtil.isArray(original)) {
+	                if (zrUtil.isObject(newVal) && !zrUtil.isArray(newVal)) {
+	                    newVal = newVal.value;
+	                }
+	                // Original data has option
+	                return zrUtil.defaults({
+	                    value: newVal
+	                }, original);
+	            }
+	            else {
+	                return newVal;
+	            }
+	        });
+	    }
+
+	    __webpack_require__(314).register('dataView', DataView);
+
+	    __webpack_require__(1).registerAction({
+	        type: 'changeDataView',
+	        event: 'dataViewChanged',
+	        update: 'prepareAndUpdate'
+	    }, function (payload, ecModel) {
+	        var newSeriesOptList = [];
+	        zrUtil.each(payload.newOption.series, function (seriesOpt) {
+	            var seriesModel = ecModel.getSeriesByName(seriesOpt.name)[0];
+	            if (!seriesModel) {
+	                // New created series
+	                // Geuss the series type
+	                newSeriesOptList.push(zrUtil.extend({
+	                    // Default is scatter
+	                    type: 'scatter'
+	                }, seriesOpt));
+	            }
+	            else {
+	                var originalData = seriesModel.get('data');
+	                newSeriesOptList.push({
+	                    name: seriesOpt.name,
+	                    data: tryMergeDataOption(seriesOpt.data, originalData)
+	                });
+	            }
+	        });
+
+	        ecModel.mergeOption(zrUtil.defaults({
+	            series: newSeriesOptList
+	        }, payload.newOption));
+	    });
+
+	    module.exports = DataView;
+
+
+/***/ },
+/* 372 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var BrushController = __webpack_require__(233);
+	    var brushHelper = __webpack_require__(309);
+	    var history = __webpack_require__(373);
+
+	    var each = zrUtil.each;
+
+	    // Use dataZoomSelect
+	    __webpack_require__(374);
+
+	    // Spectial component id start with \0ec\0, see echarts/model/Global.js~hasInnerId
+	    var DATA_ZOOM_ID_BASE = '\0_ec_\0toolbox-dataZoom_';
+
+	    function DataZoom(model, ecModel, api) {
+
+	        /**
+	         * @private
+	         * @type {module:echarts/component/helper/BrushController}
+	         */
+	        (this._brushController = new BrushController(api.getZr()))
+	            .on('brush', zrUtil.bind(this._onBrush, this))
+	            .mount();
+
+	        /**
+	         * @private
+	         * @type {boolean}
+	         */
+	        this._isZoomActive;
+	    }
+
+	    DataZoom.defaultOption = {
+	        show: true,
+	        // Icon group
+	        icon: {
+	            zoom: 'M0,13.5h26.9 M13.5,26.9V0 M32.1,13.5H58V58H13.5 V32.1',
+	            back: 'M22,1.4L9.9,13.5l12.3,12.3 M10.3,13.5H54.9v44.6 H10.3v-26'
+	        },
+	        title: {
+	            zoom: '区域缩放',
+	            back: '区域缩放还原'
+	        }
+	    };
+
+	    var proto = DataZoom.prototype;
+
+	    proto.render = function (featureModel, ecModel, api, payload) {
+	        this.model = featureModel;
+	        this.ecModel = ecModel;
+	        this.api = api;
+
+	        updateZoomBtnStatus(featureModel, ecModel, this, payload);
+	        updateBackBtnStatus(featureModel, ecModel);
+	    };
+
+	    proto.onclick = function (ecModel, api, type) {
+	        handlers[type].call(this);
+	    };
+
+	    proto.remove = function (ecModel, api) {
+	        this._brushController.unmount();
+	    };
+
+	    proto.dispose = function (ecModel, api) {
+	        this._brushController.dispose();
+	    };
+
+	    /**
+	     * @private
+	     */
+	    var handlers = {
+
+	        zoom: function () {
+	            var nextActive = !this._isZoomActive;
+
+	            this.api.dispatchAction({
+	                type: 'takeGlobalCursor',
+	                key: 'dataZoomSelect',
+	                dataZoomSelectActive: nextActive
+	            });
+	        },
+
+	        back: function () {
+	            this._dispatchZoomAction(history.pop(this.ecModel));
+	        }
+	    };
+
+	    /**
+	     * @private
+	     */
+	    proto._onBrush = function (areas, opt) {
+	        if (!opt.isEnd || !areas.length) {
+	            return;
+	        }
+	        var snapshot = {};
+	        var ecModel = this.ecModel;
+
+	        this._brushController.updateCovers([]); // remove cover
+
+	        var coordInfoList = brushHelper.makeCoordInfoList(
+	            retrieveAxisSetting(this.model.option), ecModel
+	        );
+	        var rangesCoordInfoList = [];
+	        brushHelper.parseOutputRanges(areas, coordInfoList, ecModel, rangesCoordInfoList);
+
+	        var area = areas[0]; // dataZoom can not multiple area.
+	        var coordInfo = rangesCoordInfoList[0];
+	        var coordRange = area.coordRange;
+	        var brushType = area.brushType;
+
+	        if (coordInfo && coordRange) {
+	            if (brushType === 'rect') {
+	                setBatch('xAxis', coordRange[0], coordInfo);
+	                setBatch('yAxis', coordRange[1], coordInfo);
+	            }
+	            else {
+	                var axisNames = {lineX: 'xAxis', lineY: 'yAxis'};
+	                setBatch(axisNames[brushType], coordRange, coordInfo);
+	            }
+	        }
+
+	        history.push(ecModel, snapshot);
+
+	        this._dispatchZoomAction(snapshot);
+
+	        function setBatch(axisName, minMax, coordInfo) {
+	            var dataZoomModel = findDataZoom(axisName, coordInfo[axisName], ecModel);
+	            if (dataZoomModel) {
+	                snapshot[dataZoomModel.id] = {
+	                    dataZoomId: dataZoomModel.id,
+	                    startValue: minMax[0],
+	                    endValue: minMax[1]
+	                };
+	            }
+	        }
+
+	        function findDataZoom(axisName, axisModel, ecModel) {
+	            var dataZoomModel;
+	            ecModel.eachComponent(
+	                {mainType: 'dataZoom', subType: 'select'},
+	                function (dzModel, dataZoomIndex) {
+	                    var axisIndex = dzModel.get(axisName + 'Index');
+	                    if (axisIndex != null
+	                        && ecModel.getComponent(axisName, axisIndex) === axisModel
+	                    ) {
+	                        dataZoomModel = dzModel;
+	                    }
+	                }
+	            );
+	            return dataZoomModel;
+	        }
+	    };
+
+	    /**
+	     * @private
+	     */
+	    proto._dispatchZoomAction = function (snapshot) {
+	        var batch = [];
+
+	        // Convert from hash map to array.
+	        each(snapshot, function (batchItem, dataZoomId) {
+	            batch.push(zrUtil.clone(batchItem));
+	        });
+
+	        batch.length && this.api.dispatchAction({
+	            type: 'dataZoom',
+	            from: this.uid,
+	            batch: batch
+	        });
+	    };
+
+	    function retrieveAxisSetting(option) {
+	        var setting = {};
+	        // Compatible with previous setting: null => all axis, false => no axis.
+	        zrUtil.each(['xAxisIndex', 'yAxisIndex'], function (name) {
+	            setting[name] = option[name];
+	            setting[name] == null && (setting[name] = 'all');
+	            (setting[name] === false || setting[name] === 'none') && (setting[name] = []);
+	        });
+	        return setting;
+	    }
+
+	    function updateBackBtnStatus(featureModel, ecModel) {
+	        featureModel.setIconStatus(
+	            'back',
+	            history.count(ecModel) > 1 ? 'emphasis' : 'normal'
+	        );
+	    }
+
+	    function updateZoomBtnStatus(featureModel, ecModel, view, payload) {
+	        var zoomActive = view._isZoomActive;
+
+	        if (payload && payload.type === 'takeGlobalCursor') {
+	            zoomActive = payload.key === 'dataZoomSelect'
+	                ? payload.dataZoomSelectActive : false;
+	        }
+
+	        view._isZoomActive = zoomActive;
+
+	        featureModel.setIconStatus('zoom', zoomActive ? 'emphasis' : 'normal');
+
+	        var coordInfoList = brushHelper.makeCoordInfoList(
+	            retrieveAxisSetting(featureModel.option), ecModel
+	        );
+	        var brushType = (coordInfoList.xAxisHas && !coordInfoList.yAxisHas)
+	            ? 'lineX'
+	            : (!coordInfoList.xAxisHas && coordInfoList.yAxisHas)
+	            ? 'lineY'
+	            : 'rect';
+
+	        view._brushController
+	            .setPanels(brushHelper.makePanelOpts(coordInfoList))
+	            .enableBrush(
+	                zoomActive
+	                ? {
+	                    brushType: brushType,
+	                    brushStyle: { // FIXME user customized?
+	                        lineWidth: 0,
+	                        // stroke: '#333',
+	                        fill: 'rgba(0,0,0,0.2)'
+	                    }
+	                }
+	                : false
+	            );
+	    }
+
+
+	    __webpack_require__(314).register('dataZoom', DataZoom);
+
+
+	    // Create special dataZoom option for select
+	    __webpack_require__(1).registerPreprocessor(function (option) {
+	        if (!option) {
+	            return;
+	        }
+
+	        var dataZoomOpts = option.dataZoom || (option.dataZoom = []);
+	        if (!zrUtil.isArray(dataZoomOpts)) {
+	            option.dataZoom = dataZoomOpts = [dataZoomOpts];
+	        }
+
+	        var toolboxOpt = option.toolbox;
+	        if (toolboxOpt) {
+	            // Assume there is only one toolbox
+	            if (zrUtil.isArray(toolboxOpt)) {
+	                toolboxOpt = toolboxOpt[0];
+	            }
+
+	            if (toolboxOpt && toolboxOpt.feature) {
+	                var dataZoomOpt = toolboxOpt.feature.dataZoom;
+	                addForAxis('xAxis', dataZoomOpt);
+	                addForAxis('yAxis', dataZoomOpt);
+	            }
+	        }
+
+	        function addForAxis(axisName, dataZoomOpt) {
+	            if (!dataZoomOpt) {
+	                return;
+	            }
+
+	            // Try not to modify model, because it is not merged yet.
+	            var axisIndicesName = axisName + 'Index';
+	            var givenAxisIndices = dataZoomOpt[axisIndicesName];
+	            if (givenAxisIndices != null
+	                && givenAxisIndices != 'all'
+	                && !zrUtil.isArray(givenAxisIndices)
+	            ) {
+	                givenAxisIndices = (givenAxisIndices === false || givenAxisIndices === 'none') ? [] : [givenAxisIndices];
+	            }
+
+	            forEachComponent(axisName, function (axisOpt, axisIndex) {
+	                if (givenAxisIndices != null
+	                    && givenAxisIndices != 'all'
+	                    && zrUtil.indexOf(givenAxisIndices, axisIndex) === -1
+	                ) {
+	                    return;
+	                }
+	                var newOpt = {
+	                    type: 'select',
+	                    $fromToolbox: true,
+	                    // Id for merge mapping.
+	                    id: DATA_ZOOM_ID_BASE + axisName + axisIndex
+	                };
+	                // FIXME
+	                // Only support one axis now.
+	                newOpt[axisIndicesName] = axisIndex;
+	                dataZoomOpts.push(newOpt);
+	            });
+	        }
+
+	        function forEachComponent(mainType, cb) {
+	            var opts = option[mainType];
+	            if (!zrUtil.isArray(opts)) {
+	                opts = opts ? [opts] : [];
+	            }
+	            each(opts, cb);
+	        }
+	    });
+
+	    module.exports = DataZoom;
+
+
+/***/ },
+/* 373 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @file History manager.
+	 */
+
+
+	    var zrUtil = __webpack_require__(4);
+	    var each = zrUtil.each;
+
+	    var ATTR = '\0_ec_hist_store';
+
+	    var history = {
+
+	        /**
+	         * @public
+	         * @param {module:echarts/model/Global} ecModel
+	         * @param {Object} newSnapshot {dataZoomId, batch: [payloadInfo, ...]}
+	         */
+	        push: function (ecModel, newSnapshot) {
+	            var store = giveStore(ecModel);
+
+	            // If previous dataZoom can not be found,
+	            // complete an range with current range.
+	            each(newSnapshot, function (batchItem, dataZoomId) {
+	                var i = store.length - 1;
+	                for (; i >= 0; i--) {
+	                    var snapshot = store[i];
+	                    if (snapshot[dataZoomId]) {
+	                        break;
+	                    }
+	                }
+	                if (i < 0) {
+	                    // No origin range set, create one by current range.
+	                    var dataZoomModel = ecModel.queryComponents(
+	                        {mainType: 'dataZoom', subType: 'select', id: dataZoomId}
+	                    )[0];
+	                    if (dataZoomModel) {
+	                        var percentRange = dataZoomModel.getPercentRange();
+	                        store[0][dataZoomId] = {
+	                            dataZoomId: dataZoomId,
+	                            start: percentRange[0],
+	                            end: percentRange[1]
+	                        };
+	                    }
+	                }
+	            });
+
+	            store.push(newSnapshot);
+	        },
+
+	        /**
+	         * @public
+	         * @param {module:echarts/model/Global} ecModel
+	         * @return {Object} snapshot
+	         */
+	        pop: function (ecModel) {
+	            var store = giveStore(ecModel);
+	            var head = store[store.length - 1];
+	            store.length > 1 && store.pop();
+
+	            // Find top for all dataZoom.
+	            var snapshot = {};
+	            each(head, function (batchItem, dataZoomId) {
+	                for (var i = store.length - 1; i >= 0; i--) {
+	                    var batchItem = store[i][dataZoomId];
+	                    if (batchItem) {
+	                        snapshot[dataZoomId] = batchItem;
+	                        break;
+	                    }
+	                }
+	            });
+
+	            return snapshot;
+	        },
+
+	        /**
+	         * @public
+	         */
+	        clear: function (ecModel) {
+	            ecModel[ATTR] = null;
+	        },
+
+	        /**
+	         * @public
+	         * @param {module:echarts/model/Global} ecModel
+	         * @return {number} records. always >= 1.
+	         */
+	        count: function (ecModel) {
+	            return giveStore(ecModel).length;
+	        }
+
+	    };
+
+	    /**
+	     * [{key: dataZoomId, value: {dataZoomId, range}}, ...]
+	     * History length of each dataZoom may be different.
+	     * this._history[0] is used to store origin range.
+	     * @type {Array.<Object>}
+	     */
+	    function giveStore(ecModel) {
+	        var store = ecModel[ATTR];
+	        if (!store) {
+	            store = ecModel[ATTR] = [{}];
+	        }
+	        return store;
+	    }
+
+	    module.exports = history;
+
+
+
+/***/ },
+/* 374 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * DataZoom component entry
+	 */
+
+
+	    __webpack_require__(317);
+
+	    __webpack_require__(318);
+	    __webpack_require__(320);
+
+	    __webpack_require__(375);
+	    __webpack_require__(376);
+
+	    __webpack_require__(327);
+	    __webpack_require__(328);
+
+
+
+/***/ },
+/* 375 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * @file Data zoom model
+	 */
+
+
+	    var DataZoomModel = __webpack_require__(318);
+
+	    module.exports = DataZoomModel.extend({
+
+	        type: 'dataZoom.select'
+
+	    });
+
+
+
+/***/ },
+/* 376 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    module.exports = __webpack_require__(320).extend({
+
+	        type: 'dataZoom.select'
+
+	    });
+
+
+
+/***/ },
+/* 377 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+
+	    var history = __webpack_require__(373);
+
+	    function Restore(model) {
+	        this.model = model;
+	    }
+
+	    Restore.defaultOption = {
+	        show: true,
+	        icon: 'M3.8,33.4 M47,18.9h9.8V8.7 M56.3,20.1 C52.1,9,40.5,0.6,26.8,2.1C12.6,3.7,1.6,16.2,2.1,30.6 M13,41.1H3.1v10.2 M3.7,39.9c4.2,11.1,15.8,19.5,29.5,18 c14.2-1.6,25.2-14.1,24.7-28.5',
+	        title: '还原'
+	    };
+
+	    var proto = Restore.prototype;
+
+	    proto.onclick = function (ecModel, api, type) {
+	        history.clear(ecModel);
+
+	        api.dispatchAction({
+	            type: 'restore',
+	            from: this.uid
+	        });
+	    };
+
+
+	    __webpack_require__(314).register('restore', Restore);
+
+
+	    __webpack_require__(1).registerAction(
+	        {type: 'restore', event: 'restore', update: 'prepareAndUpdate'},
+	        function (payload, ecModel) {
+	            ecModel.resetOption('recreate');
+	        }
+	    );
+
+	    module.exports = Restore;
+
+
+/***/ },
+/* 378 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+	    __webpack_require__(379);
+	    __webpack_require__(81).registerPainter('vml', __webpack_require__(381));
+
+
+/***/ },
+/* 379 */
+/***/ function(module, exports, __webpack_require__) {
+
+	// http://www.w3.org/TR/NOTE-VML
+	// TODO Use proxy like svg instead of overwrite brush methods
+
+
+	if (!__webpack_require__(2).canvasSupported) {
+	    var vec2 = __webpack_require__(10);
+	    var BoundingRect = __webpack_require__(9);
+	    var CMD = __webpack_require__(49).CMD;
+	    var colorTool = __webpack_require__(39);
+	    var textContain = __webpack_require__(8);
+	    var RectText = __webpack_require__(48);
+	    var Displayable = __webpack_require__(46);
+	    var ZImage = __webpack_require__(62);
+	    var Text = __webpack_require__(64);
+	    var Path = __webpack_require__(45);
+
+	    var Gradient = __webpack_require__(61);
+
+	    var vmlCore = __webpack_require__(380);
+
+	    var round = Math.round;
+	    var sqrt = Math.sqrt;
+	    var abs = Math.abs;
+	    var cos = Math.cos;
+	    var sin = Math.sin;
+	    var mathMax = Math.max;
+
+	    var applyTransform = vec2.applyTransform;
+
+	    var comma = ',';
+	    var imageTransformPrefix = 'progid:DXImageTransform.Microsoft';
+
+	    var Z = 21600;
+	    var Z2 = Z / 2;
+
+	    var ZLEVEL_BASE = 100000;
+	    var Z_BASE = 1000;
+
+	    var initRootElStyle = function (el) {
+	        el.style.cssText = 'position:absolute;left:0;top:0;width:1px;height:1px;';
+	        el.coordsize = Z + ','  + Z;
+	        el.coordorigin = '0,0';
+	    };
+
+	    var encodeHtmlAttribute = function (s) {
+	        return String(s).replace(/&/g, '&amp;').replace(/"/g, '&quot;');
+	    };
+
+	    var rgb2Str = function (r, g, b) {
+	        return 'rgb(' + [r, g, b].join(',') + ')';
+	    };
+
+	    var append = function (parent, child) {
+	        if (child && parent && child.parentNode !== parent) {
+	            parent.appendChild(child);
+	        }
+	    };
+
+	    var remove = function (parent, child) {
+	        if (child && parent && child.parentNode === parent) {
+	            parent.removeChild(child);
+	        }
+	    };
+
+	    var getZIndex = function (zlevel, z, z2) {
+	        // z 的取值范围为 [0, 1000]
+	        return (parseFloat(zlevel) || 0) * ZLEVEL_BASE + (parseFloat(z) || 0) * Z_BASE + z2;
+	    };
+
+	    var parsePercent = function (value, maxValue) {
+	        if (typeof value === 'string') {
+	            if (value.lastIndexOf('%') >= 0) {
+	                return parseFloat(value) / 100 * maxValue;
+	            }
+	            return parseFloat(value);
+	        }
+	        return value;
+	    };
+
+	    /***************************************************
+	     * PATH
+	     **************************************************/
+
+	    var setColorAndOpacity = function (el, color, opacity) {
+	        var colorArr = colorTool.parse(color);
+	        opacity = +opacity;
+	        if (isNaN(opacity)) {
+	            opacity = 1;
+	        }
+	        if (colorArr) {
+	            el.color = rgb2Str(colorArr[0], colorArr[1], colorArr[2]);
+	            el.opacity = opacity * colorArr[3];
+	        }
+	    };
+
+	    var getColorAndAlpha = function (color) {
+	        var colorArr = colorTool.parse(color);
+	        return [
+	            rgb2Str(colorArr[0], colorArr[1], colorArr[2]),
+	            colorArr[3]
+	        ];
+	    };
+
+	    var updateFillNode = function (el, style, zrEl) {
+	        // TODO pattern
+	        var fill = style.fill;
+	        if (fill != null) {
+	            // Modified from excanvas
+	            if (fill instanceof Gradient) {
+	                var gradientType;
+	                var angle = 0;
+	                var focus = [0, 0];
+	                // additional offset
+	                var shift = 0;
+	                // scale factor for offset
+	                var expansion = 1;
+	                var rect = zrEl.getBoundingRect();
+	                var rectWidth = rect.width;
+	                var rectHeight = rect.height;
+	                if (fill.type === 'linear') {
+	                    gradientType = 'gradient';
+	                    var transform = zrEl.transform;
+	                    var p0 = [fill.x * rectWidth, fill.y * rectHeight];
+	                    var p1 = [fill.x2 * rectWidth, fill.y2 * rectHeight];
+	                    if (transform) {
+	                        applyTransform(p0, p0, transform);
+	                        applyTransform(p1, p1, transform);
+	                    }
+	                    var dx = p1[0] - p0[0];
+	                    var dy = p1[1] - p0[1];
+	                    angle = Math.atan2(dx, dy) * 180 / Math.PI;
+	                    // The angle should be a non-negative number.
+	                    if (angle < 0) {
+	                        angle += 360;
+	                    }
+
+	                    // Very small angles produce an unexpected result because they are
+	                    // converted to a scientific notation string.
+	                    if (angle < 1e-6) {
+	                        angle = 0;
+	                    }
+	                }
+	                else {
+	                    gradientType = 'gradientradial';
+	                    var p0 = [fill.x * rectWidth, fill.y * rectHeight];
+	                    var transform = zrEl.transform;
+	                    var scale = zrEl.scale;
+	                    var width = rectWidth;
+	                    var height = rectHeight;
+	                    focus = [
+	                        // Percent in bounding rect
+	                        (p0[0] - rect.x) / width,
+	                        (p0[1] - rect.y) / height
+	                    ];
+	                    if (transform) {
+	                        applyTransform(p0, p0, transform);
+	                    }
+
+	                    width /= scale[0] * Z;
+	                    height /= scale[1] * Z;
+	                    var dimension = mathMax(width, height);
+	                    shift = 2 * 0 / dimension;
+	                    expansion = 2 * fill.r / dimension - shift;
+	                }
+
+	                // We need to sort the color stops in ascending order by offset,
+	                // otherwise IE won't interpret it correctly.
+	                var stops = fill.colorStops.slice();
+	                stops.sort(function(cs1, cs2) {
+	                    return cs1.offset - cs2.offset;
+	                });
+
+	                var length = stops.length;
+	                // Color and alpha list of first and last stop
+	                var colorAndAlphaList = [];
+	                var colors = [];
+	                for (var i = 0; i < length; i++) {
+	                    var stop = stops[i];
+	                    var colorAndAlpha = getColorAndAlpha(stop.color);
+	                    colors.push(stop.offset * expansion + shift + ' ' + colorAndAlpha[0]);
+	                    if (i === 0 || i === length - 1) {
+	                        colorAndAlphaList.push(colorAndAlpha);
+	                    }
+	                }
+
+	                if (length >= 2) {
+	                    var color1 = colorAndAlphaList[0][0];
+	                    var color2 = colorAndAlphaList[1][0];
+	                    var opacity1 = colorAndAlphaList[0][1] * style.opacity;
+	                    var opacity2 = colorAndAlphaList[1][1] * style.opacity;
+
+	                    el.type = gradientType;
+	                    el.method = 'none';
+	                    el.focus = '100%';
+	                    el.angle = angle;
+	                    el.color = color1;
+	                    el.color2 = color2;
+	                    el.colors = colors.join(',');
+	                    // When colors attribute is used, the meanings of opacity and o:opacity2
+	                    // are reversed.
+	                    el.opacity = opacity2;
+	                    // FIXME g_o_:opacity ?
+	                    el.opacity2 = opacity1;
+	                }
+	                if (gradientType === 'radial') {
+	                    el.focusposition = focus.join(',');
+	                }
+	            }
+	            else {
+	                // FIXME Change from Gradient fill to color fill
+	                setColorAndOpacity(el, fill, style.opacity);
+	            }
+	        }
+	    };
+
+	    var updateStrokeNode = function (el, style) {
+	        // if (style.lineJoin != null) {
+	        //     el.joinstyle = style.lineJoin;
+	        // }
+	        // if (style.miterLimit != null) {
+	        //     el.miterlimit = style.miterLimit * Z;
+	        // }
+	        // if (style.lineCap != null) {
+	        //     el.endcap = style.lineCap;
+	        // }
+	        if (style.lineDash != null) {
+	            el.dashstyle = style.lineDash.join(' ');
+	        }
+	        if (style.stroke != null && !(style.stroke instanceof Gradient)) {
+	            setColorAndOpacity(el, style.stroke, style.opacity);
+	        }
+	    };
+
+	    var updateFillAndStroke = function (vmlEl, type, style, zrEl) {
+	        var isFill = type == 'fill';
+	        var el = vmlEl.getElementsByTagName(type)[0];
+	        // Stroke must have lineWidth
+	        if (style[type] != null && style[type] !== 'none' && (isFill || (!isFill && style.lineWidth))) {
+	            vmlEl[isFill ? 'filled' : 'stroked'] = 'true';
+	            // FIXME Remove before updating, or set `colors` will throw error
+	            if (style[type] instanceof Gradient) {
+	                remove(vmlEl, el);
+	            }
+	            if (!el) {
+	                el = vmlCore.createNode(type);
+	            }
+
+	            isFill ? updateFillNode(el, style, zrEl) : updateStrokeNode(el, style);
+	            append(vmlEl, el);
+	        }
+	        else {
+	            vmlEl[isFill ? 'filled' : 'stroked'] = 'false';
+	            remove(vmlEl, el);
+	        }
+	    };
+
+	    var points = [[], [], []];
+	    var pathDataToString = function (data, m) {
+	        var M = CMD.M;
+	        var C = CMD.C;
+	        var L = CMD.L;
+	        var A = CMD.A;
+	        var Q = CMD.Q;
+
+	        var str = [];
+	        var nPoint;
+	        var cmdStr;
+	        var cmd;
+	        var i;
+	        var xi;
+	        var yi;
+	        for (i = 0; i < data.length;) {
+	            cmd = data[i++];
+	            cmdStr = '';
+	            nPoint = 0;
+	            switch (cmd) {
+	                case M:
+	                    cmdStr = ' m ';
+	                    nPoint = 1;
+	                    xi = data[i++];
+	                    yi = data[i++];
+	                    points[0][0] = xi;
+	                    points[0][1] = yi;
+	                    break;
+	                case L:
+	                    cmdStr = ' l ';
+	                    nPoint = 1;
+	                    xi = data[i++];
+	                    yi = data[i++];
+	                    points[0][0] = xi;
+	                    points[0][1] = yi;
+	                    break;
+	                case Q:
+	                case C:
+	                    cmdStr = ' c ';
+	                    nPoint = 3;
+	                    var x1 = data[i++];
+	                    var y1 = data[i++];
+	                    var x2 = data[i++];
+	                    var y2 = data[i++];
+	                    var x3;
+	                    var y3;
+	                    if (cmd === Q) {
+	                        // Convert quadratic to cubic using degree elevation
+	                        x3 = x2;
+	                        y3 = y2;
+	                        x2 = (x2 + 2 * x1) / 3;
+	                        y2 = (y2 + 2 * y1) / 3;
+	                        x1 = (xi + 2 * x1) / 3;
+	                        y1 = (yi + 2 * y1) / 3;
+	                    }
+	                    else {
+	                        x3 = data[i++];
+	                        y3 = data[i++];
+	                    }
+	                    points[0][0] = x1;
+	                    points[0][1] = y1;
+	                    points[1][0] = x2;
+	                    points[1][1] = y2;
+	                    points[2][0] = x3;
+	                    points[2][1] = y3;
+
+	                    xi = x3;
+	                    yi = y3;
+	                    break;
+	                case A:
+	                    var x = 0;
+	                    var y = 0;
+	                    var sx = 1;
+	                    var sy = 1;
+	                    var angle = 0;
+	                    if (m) {
+	                        // Extract SRT from matrix
+	                        x = m[4];
+	                        y = m[5];
+	                        sx = sqrt(m[0] * m[0] + m[1] * m[1]);
+	                        sy = sqrt(m[2] * m[2] + m[3] * m[3]);
+	                        angle = Math.atan2(-m[1] / sy, m[0] / sx);
+	                    }
+
+	                    var cx = data[i++];
+	                    var cy = data[i++];
+	                    var rx = data[i++];
+	                    var ry = data[i++];
+	                    var startAngle = data[i++] + angle;
+	                    var endAngle = data[i++] + startAngle + angle;
+	                    // FIXME
+	                    // var psi = data[i++];
+	                    i++;
+	                    var clockwise = data[i++];
+
+	                    var x0 = cx + cos(startAngle) * rx;
+	                    var y0 = cy + sin(startAngle) * ry;
+
+	                    var x1 = cx + cos(endAngle) * rx;
+	                    var y1 = cy + sin(endAngle) * ry;
+
+	                    var type = clockwise ? ' wa ' : ' at ';
+	                    if (Math.abs(x0 - x1) < 1e-10) {
+	                        // IE won't render arches drawn counter clockwise if x0 == x1.
+	                        if (Math.abs(endAngle - startAngle) > 1e-2) {
+	                            // Offset x0 by 1/80 of a pixel. Use something
+	                            // that can be represented in binary
+	                            if (clockwise) {
+	                                x0 += 270 / Z;
+	                            }
+	                        }
+	                        else {
+	                            // Avoid case draw full circle
+	                            if (Math.abs(y0 - cy) < 1e-10) {
+	                                if ((clockwise && x0 < cx) || (!clockwise && x0 > cx)) {
+	                                    y1 -= 270 / Z;
+	                                }
+	                                else {
+	                                    y1 += 270 / Z;
+	                                }
+	                            }
+	                            else if ((clockwise && y0 < cy) || (!clockwise && y0 > cy)) {
+	                                x1 += 270 / Z;
+	                            }
+	                            else {
+	                                x1 -= 270 / Z;
+	                            }
+	                        }
+	                    }
+	                    str.push(
+	                        type,
+	                        round(((cx - rx) * sx + x) * Z - Z2), comma,
+	                        round(((cy - ry) * sy + y) * Z - Z2), comma,
+	                        round(((cx + rx) * sx + x) * Z - Z2), comma,
+	                        round(((cy + ry) * sy + y) * Z - Z2), comma,
+	                        round((x0 * sx + x) * Z - Z2), comma,
+	                        round((y0 * sy + y) * Z - Z2), comma,
+	                        round((x1 * sx + x) * Z - Z2), comma,
+	                        round((y1 * sy + y) * Z - Z2)
+	                    );
+
+	                    xi = x1;
+	                    yi = y1;
+	                    break;
+	                case CMD.R:
+	                    var p0 = points[0];
+	                    var p1 = points[1];
+	                    // x0, y0
+	                    p0[0] = data[i++];
+	                    p0[1] = data[i++];
+	                    // x1, y1
+	                    p1[0] = p0[0] + data[i++];
+	                    p1[1] = p0[1] + data[i++];
+
+	                    if (m) {
+	                        applyTransform(p0, p0, m);
+	                        applyTransform(p1, p1, m);
+	                    }
+
+	                    p0[0] = round(p0[0] * Z - Z2);
+	                    p1[0] = round(p1[0] * Z - Z2);
+	                    p0[1] = round(p0[1] * Z - Z2);
+	                    p1[1] = round(p1[1] * Z - Z2);
+	                    str.push(
+	                        // x0, y0
+	                        ' m ', p0[0], comma, p0[1],
+	                        // x1, y0
+	                        ' l ', p1[0], comma, p0[1],
+	                        // x1, y1
+	                        ' l ', p1[0], comma, p1[1],
+	                        // x0, y1
+	                        ' l ', p0[0], comma, p1[1]
+	                    );
+	                    break;
+	                case CMD.Z:
+	                    // FIXME Update xi, yi
+	                    str.push(' x ');
+	            }
+
+	            if (nPoint > 0) {
+	                str.push(cmdStr);
+	                for (var k = 0; k < nPoint; k++) {
+	                    var p = points[k];
+
+	                    m && applyTransform(p, p, m);
+	                    // 不 round 会非常慢
+	                    str.push(
+	                        round(p[0] * Z - Z2), comma, round(p[1] * Z - Z2),
+	                        k < nPoint - 1 ? comma : ''
+	                    );
+	                }
+	            }
+	        }
+
+	        return str.join('');
+	    };
+
+	    // Rewrite the original path method
+	    Path.prototype.brushVML = function (vmlRoot) {
+	        var style = this.style;
+
+	        var vmlEl = this._vmlEl;
+	        if (!vmlEl) {
+	            vmlEl = vmlCore.createNode('shape');
+	            initRootElStyle(vmlEl);
+
+	            this._vmlEl = vmlEl;
+	        }
+
+	        updateFillAndStroke(vmlEl, 'fill', style, this);
+	        updateFillAndStroke(vmlEl, 'stroke', style, this);
+
+	        var m = this.transform;
+	        var needTransform = m != null;
+	        var strokeEl = vmlEl.getElementsByTagName('stroke')[0];
+	        if (strokeEl) {
+	            var lineWidth = style.lineWidth;
+	            // Get the line scale.
+	            // Determinant of this.m_ means how much the area is enlarged by the
+	            // transformation. So its square root can be used as a scale factor
+	            // for width.
+	            if (needTransform && !style.strokeNoScale) {
+	                var det = m[0] * m[3] - m[1] * m[2];
+	                lineWidth *= sqrt(abs(det));
+	            }
+	            strokeEl.weight = lineWidth + 'px';
+	        }
+
+	        var path = this.path;
+	        if (this.__dirtyPath) {
+	            path.beginPath();
+	            this.buildPath(path, this.shape);
+	            path.toStatic();
+	            this.__dirtyPath = false;
+	        }
+
+	        vmlEl.path = pathDataToString(path.data, this.transform);
+
+	        vmlEl.style.zIndex = getZIndex(this.zlevel, this.z, this.z2);
+
+	        // Append to root
+	        append(vmlRoot, vmlEl);
+
+	        // Text
+	        if (style.text) {
+	            this.drawRectText(vmlRoot, this.getBoundingRect());
+	        }
+	        else {
+	            this.removeRectText(vmlRoot);
+	        }
+	    };
+
+	    Path.prototype.onRemove = function (vmlRoot) {
+	        remove(vmlRoot, this._vmlEl);
+	        this.removeRectText(vmlRoot);
+	    };
+
+	    Path.prototype.onAdd = function (vmlRoot) {
+	        append(vmlRoot, this._vmlEl);
+	        this.appendRectText(vmlRoot);
+	    };
+
+	    /***************************************************
+	     * IMAGE
+	     **************************************************/
+	    var isImage = function (img) {
+	        // FIXME img instanceof Image 如果 img 是一个字符串的时候，IE8 下会报错
+	        return (typeof img === 'object') && img.tagName && img.tagName.toUpperCase() === 'IMG';
+	        // return img instanceof Image;
+	    };
+
+	    // Rewrite the original path method
+	    ZImage.prototype.brushVML = function (vmlRoot) {
+	        var style = this.style;
+	        var image = style.image;
+
+	        // Image original width, height
+	        var ow;
+	        var oh;
+
+	        if (isImage(image)) {
+	            var src = image.src;
+	            if (src === this._imageSrc) {
+	                ow = this._imageWidth;
+	                oh = this._imageHeight;
+	            }
+	            else {
+	                var imageRuntimeStyle = image.runtimeStyle;
+	                var oldRuntimeWidth = imageRuntimeStyle.width;
+	                var oldRuntimeHeight = imageRuntimeStyle.height;
+	                imageRuntimeStyle.width = 'auto';
+	                imageRuntimeStyle.height = 'auto';
+
+	                // get the original size
+	                ow = image.width;
+	                oh = image.height;
+
+	                // and remove overides
+	                imageRuntimeStyle.width = oldRuntimeWidth;
+	                imageRuntimeStyle.height = oldRuntimeHeight;
+
+	                // Caching image original width, height and src
+	                this._imageSrc = src;
+	                this._imageWidth = ow;
+	                this._imageHeight = oh;
+	            }
+	            image = src;
+	        }
+	        else {
+	            if (image === this._imageSrc) {
+	                ow = this._imageWidth;
+	                oh = this._imageHeight;
+	            }
+	        }
+	        if (!image) {
+	            return;
+	        }
+
+	        var x = style.x || 0;
+	        var y = style.y || 0;
+
+	        var dw = style.width;
+	        var dh = style.height;
+
+	        var sw = style.sWidth;
+	        var sh = style.sHeight;
+	        var sx = style.sx || 0;
+	        var sy = style.sy || 0;
+
+	        var hasCrop = sw && sh;
+
+	        var vmlEl = this._vmlEl;
+	        if (!vmlEl) {
+	            // FIXME 使用 group 在 left, top 都不是 0 的时候就无法显示了。
+	            // vmlEl = vmlCore.createNode('group');
+	            vmlEl = vmlCore.doc.createElement('div');
+	            initRootElStyle(vmlEl);
+
+	            this._vmlEl = vmlEl;
+	        }
+
+	        var vmlElStyle = vmlEl.style;
+	        var hasRotation = false;
+	        var m;
+	        var scaleX = 1;
+	        var scaleY = 1;
+	        if (this.transform) {
+	            m = this.transform;
+	            scaleX = sqrt(m[0] * m[0] + m[1] * m[1]);
+	            scaleY = sqrt(m[2] * m[2] + m[3] * m[3]);
+
+	            hasRotation = m[1] || m[2];
+	        }
+	        if (hasRotation) {
+	            // If filters are necessary (rotation exists), create them
+	            // filters are bog-slow, so only create them if abbsolutely necessary
+	            // The following check doesn't account for skews (which don't exist
+	            // in the canvas spec (yet) anyway.
+	            // From excanvas
+	            var p0 = [x, y];
+	            var p1 = [x + dw, y];
+	            var p2 = [x, y + dh];
+	            var p3 = [x + dw, y + dh];
+	            applyTransform(p0, p0, m);
+	            applyTransform(p1, p1, m);
+	            applyTransform(p2, p2, m);
+	            applyTransform(p3, p3, m);
+
+	            var maxX = mathMax(p0[0], p1[0], p2[0], p3[0]);
+	            var maxY = mathMax(p0[1], p1[1], p2[1], p3[1]);
+
+	            var transformFilter = [];
+	            transformFilter.push('M11=', m[0] / scaleX, comma,
+	                        'M12=', m[2] / scaleY, comma,
+	                        'M21=', m[1] / scaleX, comma,
+	                        'M22=', m[3] / scaleY, comma,
+	                        'Dx=', round(x * scaleX + m[4]), comma,
+	                        'Dy=', round(y * scaleY + m[5]));
+
+	            vmlElStyle.padding = '0 ' + round(maxX) + 'px ' + round(maxY) + 'px 0';
+	            // FIXME DXImageTransform 在 IE11 的兼容模式下不起作用
+	            vmlElStyle.filter = imageTransformPrefix + '.Matrix('
+	                + transformFilter.join('') + ', SizingMethod=clip)';
+
+	        }
+	        else {
+	            if (m) {
+	                x = x * scaleX + m[4];
+	                y = y * scaleY + m[5];
+	            }
+	            vmlElStyle.filter = '';
+	            vmlElStyle.left = round(x) + 'px';
+	            vmlElStyle.top = round(y) + 'px';
+	        }
+
+	        var imageEl = this._imageEl;
+	        var cropEl = this._cropEl;
+
+	        if (!imageEl) {
+	            imageEl = vmlCore.doc.createElement('div');
+	            this._imageEl = imageEl;
+	        }
+	        var imageELStyle = imageEl.style;
+	        if (hasCrop) {
+	            // Needs know image original width and height
+	            if (! (ow && oh)) {
+	                var tmpImage = new Image();
+	                var self = this;
+	                tmpImage.onload = function () {
+	                    tmpImage.onload = null;
+	                    ow = tmpImage.width;
+	                    oh = tmpImage.height;
+	                    // Adjust image width and height to fit the ratio destinationSize / sourceSize
+	                    imageELStyle.width = round(scaleX * ow * dw / sw) + 'px';
+	                    imageELStyle.height = round(scaleY * oh * dh / sh) + 'px';
+
+	                    // Caching image original width, height and src
+	                    self._imageWidth = ow;
+	                    self._imageHeight = oh;
+	                    self._imageSrc = image;
+	                };
+	                tmpImage.src = image;
+	            }
+	            else {
+	                imageELStyle.width = round(scaleX * ow * dw / sw) + 'px';
+	                imageELStyle.height = round(scaleY * oh * dh / sh) + 'px';
+	            }
+
+	            if (! cropEl) {
+	                cropEl = vmlCore.doc.createElement('div');
+	                cropEl.style.overflow = 'hidden';
+	                this._cropEl = cropEl;
+	            }
+	            var cropElStyle = cropEl.style;
+	            cropElStyle.width = round((dw + sx * dw / sw) * scaleX);
+	            cropElStyle.height = round((dh + sy * dh / sh) * scaleY);
+	            cropElStyle.filter = imageTransformPrefix + '.Matrix(Dx='
+	                    + (-sx * dw / sw * scaleX) + ',Dy=' + (-sy * dh / sh * scaleY) + ')';
+
+	            if (! cropEl.parentNode) {
+	                vmlEl.appendChild(cropEl);
+	            }
+	            if (imageEl.parentNode != cropEl) {
+	                cropEl.appendChild(imageEl);
+	            }
+	        }
+	        else {
+	            imageELStyle.width = round(scaleX * dw) + 'px';
+	            imageELStyle.height = round(scaleY * dh) + 'px';
+
+	            vmlEl.appendChild(imageEl);
+
+	            if (cropEl && cropEl.parentNode) {
+	                vmlEl.removeChild(cropEl);
+	                this._cropEl = null;
+	            }
+	        }
+
+	        var filterStr = '';
+	        var alpha = style.opacity;
+	        if (alpha < 1) {
+	            filterStr += '.Alpha(opacity=' + round(alpha * 100) + ') ';
+	        }
+	        filterStr += imageTransformPrefix + '.AlphaImageLoader(src=' + image + ', SizingMethod=scale)';
+
+	        imageELStyle.filter = filterStr;
+
+	        vmlEl.style.zIndex = getZIndex(this.zlevel, this.z, this.z2);
+
+	        // Append to root
+	        append(vmlRoot, vmlEl);
+
+	        // Text
+	        if (style.text) {
+	            this.drawRectText(vmlRoot, this.getBoundingRect());
+	        }
+	    };
+
+	    ZImage.prototype.onRemove = function (vmlRoot) {
+	        remove(vmlRoot, this._vmlEl);
+
+	        this._vmlEl = null;
+	        this._cropEl = null;
+	        this._imageEl = null;
+
+	        this.removeRectText(vmlRoot);
+	    };
+
+	    ZImage.prototype.onAdd = function (vmlRoot) {
+	        append(vmlRoot, this._vmlEl);
+	        this.appendRectText(vmlRoot);
+	    };
+
+
+	    /***************************************************
+	     * TEXT
+	     **************************************************/
+
+	    var DEFAULT_STYLE_NORMAL = 'normal';
+
+	    var fontStyleCache = {};
+	    var fontStyleCacheCount = 0;
+	    var MAX_FONT_CACHE_SIZE = 100;
+	    var fontEl = document.createElement('div');
+
+	    var getFontStyle = function (fontString) {
+	        var fontStyle = fontStyleCache[fontString];
+	        if (!fontStyle) {
+	            // Clear cache
+	            if (fontStyleCacheCount > MAX_FONT_CACHE_SIZE) {
+	                fontStyleCacheCount = 0;
+	                fontStyleCache = {};
+	            }
+
+	            var style = fontEl.style;
+	            var fontFamily;
+	            try {
+	                style.font = fontString;
+	                fontFamily = style.fontFamily.split(',')[0];
+	            }
+	            catch (e) {
+	            }
+
+	            fontStyle = {
+	                style: style.fontStyle || DEFAULT_STYLE_NORMAL,
+	                variant: style.fontVariant || DEFAULT_STYLE_NORMAL,
+	                weight: style.fontWeight || DEFAULT_STYLE_NORMAL,
+	                size: parseFloat(style.fontSize || 12) | 0,
+	                family: fontFamily || 'Microsoft YaHei'
+	            };
+
+	            fontStyleCache[fontString] = fontStyle;
+	            fontStyleCacheCount++;
+	        }
+	        return fontStyle;
+	    };
+
+	    var textMeasureEl;
+	    // Overwrite measure text method
+	    textContain.measureText = function (text, textFont) {
+	        var doc = vmlCore.doc;
+	        if (!textMeasureEl) {
+	            textMeasureEl = doc.createElement('div');
+	            textMeasureEl.style.cssText = 'position:absolute;top:-20000px;left:0;'
+	                + 'padding:0;margin:0;border:none;white-space:pre;';
+	            vmlCore.doc.body.appendChild(textMeasureEl);
+	        }
+
+	        try {
+	            textMeasureEl.style.font = textFont;
+	        } catch (ex) {
+	            // Ignore failures to set to invalid font.
+	        }
+	        textMeasureEl.innerHTML = '';
+	        // Don't use innerHTML or innerText because they allow markup/whitespace.
+	        textMeasureEl.appendChild(doc.createTextNode(text));
+	        return {
+	            width: textMeasureEl.offsetWidth
+	        };
+	    };
+
+	    var tmpRect = new BoundingRect();
+
+	    var drawRectText = function (vmlRoot, rect, textRect, fromTextEl) {
+
+	        var style = this.style;
+	        var text = style.text;
+	        if (!text) {
+	            return;
+	        }
+
+	        var x;
+	        var y;
+	        var align = style.textAlign;
+	        var fontStyle = getFontStyle(style.textFont);
+	        // FIXME encodeHtmlAttribute ?
+	        var font = fontStyle.style + ' ' + fontStyle.variant + ' ' + fontStyle.weight + ' '
+	            + fontStyle.size + 'px "' + fontStyle.family + '"';
+
+	        var baseline = style.textBaseline;
+	        var verticalAlign = style.textVerticalAlign;
+
+	        textRect = textRect || textContain.getBoundingRect(text, font, align, baseline);
+
+	        // Transform rect to view space
+	        var m = this.transform;
+	        // Ignore transform for text in other element
+	        if (m && !fromTextEl) {
+	            tmpRect.copy(rect);
+	            tmpRect.applyTransform(m);
+	            rect = tmpRect;
+	        }
+
+	        if (!fromTextEl) {
+	            var textPosition = style.textPosition;
+	            var distance = style.textDistance;
+	            // Text position represented by coord
+	            if (textPosition instanceof Array) {
+	                x = rect.x + parsePercent(textPosition[0], rect.width);
+	                y = rect.y + parsePercent(textPosition[1], rect.height);
+
+	                align = align || 'left';
+	                baseline = baseline || 'top';
+	            }
+	            else {
+	                var res = textContain.adjustTextPositionOnRect(
+	                    textPosition, rect, textRect, distance
+	                );
+	                x = res.x;
+	                y = res.y;
+
+	                // Default align and baseline when has textPosition
+	                align = align || res.textAlign;
+	                baseline = baseline || res.textBaseline;
+	            }
+	        }
+	        else {
+	            x = rect.x;
+	            y = rect.y;
+	        }
+	        if (verticalAlign) {
+	            switch (verticalAlign) {
+	                case 'middle':
+	                    y -= textRect.height / 2;
+	                    break;
+	                case 'bottom':
+	                    y -= textRect.height;
+	                    break;
+	                // 'top'
+	            }
+	            // Ignore baseline
+	            baseline = 'top';
+	        }
+
+	        var fontSize = fontStyle.size;
+	        // 1.75 is an arbitrary number, as there is no info about the text baseline
+	        switch (baseline) {
+	            case 'hanging':
+	            case 'top':
+	                y += fontSize / 1.75;
+	                break;
+	            case 'middle':
+	                break;
+	            default:
+	            // case null:
+	            // case 'alphabetic':
+	            // case 'ideographic':
+	            // case 'bottom':
+	                y -= fontSize / 2.25;
+	                break;
+	        }
+	        switch (align) {
+	            case 'left':
+	                break;
+	            case 'center':
+	                x -= textRect.width / 2;
+	                break;
+	            case 'right':
+	                x -= textRect.width;
+	                break;
+	            // case 'end':
+	                // align = elementStyle.direction == 'ltr' ? 'right' : 'left';
+	                // break;
+	            // case 'start':
+	                // align = elementStyle.direction == 'rtl' ? 'right' : 'left';
+	                // break;
+	            // default:
+	            //     align = 'left';
+	        }
+
+	        var createNode = vmlCore.createNode;
+
+	        var textVmlEl = this._textVmlEl;
+	        var pathEl;
+	        var textPathEl;
+	        var skewEl;
+	        if (!textVmlEl) {
+	            textVmlEl = createNode('line');
+	            pathEl = createNode('path');
+	            textPathEl = createNode('textpath');
+	            skewEl = createNode('skew');
+
+	            // FIXME Why here is not cammel case
+	            // Align 'center' seems wrong
+	            textPathEl.style['v-text-align'] = 'left';
+
+	            initRootElStyle(textVmlEl);
+
+	            pathEl.textpathok = true;
+	            textPathEl.on = true;
+
+	            textVmlEl.from = '0 0';
+	            textVmlEl.to = '1000 0.05';
+
+	            append(textVmlEl, skewEl);
+	            append(textVmlEl, pathEl);
+	            append(textVmlEl, textPathEl);
+
+	            this._textVmlEl = textVmlEl;
+	        }
+	        else {
+	            // 这里是在前面 appendChild 保证顺序的前提下
+	            skewEl = textVmlEl.firstChild;
+	            pathEl = skewEl.nextSibling;
+	            textPathEl = pathEl.nextSibling;
+	        }
+
+	        var coords = [x, y];
+	        var textVmlElStyle = textVmlEl.style;
+	        // Ignore transform for text in other element
+	        if (m && fromTextEl) {
+	            applyTransform(coords, coords, m);
+
+	            skewEl.on = true;
+
+	            skewEl.matrix = m[0].toFixed(3) + comma + m[2].toFixed(3) + comma +
+	            m[1].toFixed(3) + comma + m[3].toFixed(3) + ',0,0';
+
+	            // Text position
+	            skewEl.offset = (round(coords[0]) || 0) + ',' + (round(coords[1]) || 0);
+	            // Left top point as origin
+	            skewEl.origin = '0 0';
+
+	            textVmlElStyle.left = '0px';
+	            textVmlElStyle.top = '0px';
+	        }
+	        else {
+	            skewEl.on = false;
+	            textVmlElStyle.left = round(x) + 'px';
+	            textVmlElStyle.top = round(y) + 'px';
+	        }
+
+	        textPathEl.string = encodeHtmlAttribute(text);
+	        // TODO
+	        try {
+	            textPathEl.style.font = font;
+	        }
+	        // Error font format
+	        catch (e) {}
+
+	        updateFillAndStroke(textVmlEl, 'fill', {
+	            fill: fromTextEl ? style.fill : style.textFill,
+	            opacity: style.opacity
+	        }, this);
+	        updateFillAndStroke(textVmlEl, 'stroke', {
+	            stroke: fromTextEl ? style.stroke : style.textStroke,
+	            opacity: style.opacity,
+	            lineDash: style.lineDash
+	        }, this);
+
+	        textVmlEl.style.zIndex = getZIndex(this.zlevel, this.z, this.z2);
+
+	        // Attached to root
+	        append(vmlRoot, textVmlEl);
+	    };
+
+	    var removeRectText = function (vmlRoot) {
+	        remove(vmlRoot, this._textVmlEl);
+	        this._textVmlEl = null;
+	    };
+
+	    var appendRectText = function (vmlRoot) {
+	        append(vmlRoot, this._textVmlEl);
+	    };
+
+	    var list = [RectText, Displayable, ZImage, Path, Text];
+
+	    // In case Displayable has been mixed in RectText
+	    for (var i = 0; i < list.length; i++) {
+	        var proto = list[i].prototype;
+	        proto.drawRectText = drawRectText;
+	        proto.removeRectText = removeRectText;
+	        proto.appendRectText = appendRectText;
+	    }
+
+	    Text.prototype.brushVML = function (vmlRoot) {
+	        var style = this.style;
+	        if (style.text) {
+	            this.drawRectText(vmlRoot, {
+	                x: style.x || 0, y: style.y || 0,
+	                width: 0, height: 0
+	            }, this.getBoundingRect(), true);
+	        }
+	        else {
+	            this.removeRectText(vmlRoot);
+	        }
+	    };
+
+	    Text.prototype.onRemove = function (vmlRoot) {
+	        this.removeRectText(vmlRoot);
+	    };
+
+	    Text.prototype.onAdd = function (vmlRoot) {
+	        this.appendRectText(vmlRoot);
+	    };
+	}
+
+
+/***/ },
+/* 380 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	if (!__webpack_require__(2).canvasSupported) {
+	    var urn = 'urn:schemas-microsoft-com:vml';
+
+	    var createNode;
+	    var win = window;
+	    var doc = win.document;
+
+	    var vmlInited = false;
+
+	    try {
+	        !doc.namespaces.zrvml && doc.namespaces.add('zrvml', urn);
+	        createNode = function (tagName) {
+	            return doc.createElement('<zrvml:' + tagName + ' class="zrvml">');
+	        };
+	    }
+	    catch (e) {
+	        createNode = function (tagName) {
+	            return doc.createElement('<' + tagName + ' xmlns="' + urn + '" class="zrvml">');
+	        };
+	    }
+
+	    // From raphael
+	    var initVML = function () {
+	        if (vmlInited) {
+	            return;
+	        }
+	        vmlInited = true;
+
+	        var styleSheets = doc.styleSheets;
+	        if (styleSheets.length < 31) {
+	            doc.createStyleSheet().addRule('.zrvml', 'behavior:url(#default#VML)');
+	        }
+	        else {
+	            // http://msdn.microsoft.com/en-us/library/ms531194%28VS.85%29.aspx
+	            styleSheets[0].addRule('.zrvml', 'behavior:url(#default#VML)');
+	        }
+	    };
+
+	    // Not useing return to avoid error when converting to CommonJS module
+	    module.exports = {
+	        doc: doc,
+	        initVML: initVML,
+	        createNode: createNode
+	    };
+	}
+
+
+/***/ },
+/* 381 */
+/***/ function(module, exports, __webpack_require__) {
+
+	/**
+	 * VML Painter.
+	 *
+	 * @module zrender/vml/Painter
+	 */
+
+
+
+	    var zrLog = __webpack_require__(40);
+	    var vmlCore = __webpack_require__(380);
+
+	    function parseInt10(val) {
+	        return parseInt(val, 10);
+	    }
+
+	    /**
+	     * @alias module:zrender/vml/Painter
+	     */
+	    function VMLPainter(root, storage) {
+
+	        vmlCore.initVML();
+
+	        this.root = root;
+
+	        this.storage = storage;
+
+	        var vmlViewport = document.createElement('div');
+
+	        var vmlRoot = document.createElement('div');
+
+	        vmlViewport.style.cssText = 'display:inline-block;overflow:hidden;position:relative;width:300px;height:150px;';
+
+	        vmlRoot.style.cssText = 'position:absolute;left:0;top:0;';
+
+	        root.appendChild(vmlViewport);
+
+	        this._vmlRoot = vmlRoot;
+	        this._vmlViewport = vmlViewport;
+
+	        this.resize();
+
+	        // Modify storage
+	        var oldDelFromMap = storage.delFromMap;
+	        var oldAddToMap = storage.addToMap;
+	        storage.delFromMap = function (elId) {
+	            var el = storage.get(elId);
+
+	            oldDelFromMap.call(storage, elId);
+
+	            if (el) {
+	                el.onRemove && el.onRemove(vmlRoot);
+	            }
+	        };
+
+	        storage.addToMap = function (el) {
+	            // Displayable already has a vml node
+	            el.onAdd && el.onAdd(vmlRoot);
+
+	            oldAddToMap.call(storage, el);
+	        };
+
+	        this._firstPaint = true;
+	    }
+
+	    VMLPainter.prototype = {
+
+	        constructor: VMLPainter,
+
+	        /**
+	         * @return {HTMLDivElement}
+	         */
+	        getViewportRoot: function () {
+	            return this._vmlViewport;
+	        },
+
+	        /**
+	         * 刷新
+	         */
+	        refresh: function () {
+
+	            var list = this.storage.getDisplayList(true, true);
+
+	            this._paintList(list);
+	        },
+
+	        _paintList: function (list) {
+	            var vmlRoot = this._vmlRoot;
+	            for (var i = 0; i < list.length; i++) {
+	                var el = list[i];
+	                if (el.invisible || el.ignore) {
+	                    if (!el.__alreadyNotVisible) {
+	                        el.onRemove(vmlRoot);
+	                    }
+	                    // Set as already invisible
+	                    el.__alreadyNotVisible = true;
+	                }
+	                else {
+	                    if (el.__alreadyNotVisible) {
+	                        el.onAdd(vmlRoot);
+	                    }
+	                    el.__alreadyNotVisible = false;
+	                    if (el.__dirty) {
+	                        el.beforeBrush && el.beforeBrush();
+	                        (el.brushVML || el.brush).call(el, vmlRoot);
+	                        el.afterBrush && el.afterBrush();
+	                    }
+	                }
+	                el.__dirty = false;
+	            }
+
+	            if (this._firstPaint) {
+	                // Detached from document at first time
+	                // to avoid page refreshing too many times
+
+	                // FIXME 如果每次都先 removeChild 可能会导致一些填充和描边的效果改变
+	                this._vmlViewport.appendChild(vmlRoot);
+	                this._firstPaint = false;
+	            }
+	        },
+
+	        resize: function () {
+	            var width = this._getWidth();
+	            var height = this._getHeight();
+
+	            if (this._width != width && this._height != height) {
+	                this._width = width;
+	                this._height = height;
+
+	                var vmlViewportStyle = this._vmlViewport.style;
+	                vmlViewportStyle.width = width + 'px';
+	                vmlViewportStyle.height = height + 'px';
+	            }
+	        },
+
+	        dispose: function () {
+	            this.root.innerHTML = '';
+
+	            this._vmlRoot =
+	            this._vmlViewport =
+	            this.storage = null;
+	        },
+
+	        getWidth: function () {
+	            return this._width;
+	        },
+
+	        getHeight: function () {
+	            return this._height;
+	        },
+
+	        clear: function () {
+	            this.root.removeChild(this.vmlViewport);
+	        },
+
+	        _getWidth: function () {
+	            var root = this.root;
+	            var stl = root.currentStyle;
+
+	            return ((root.clientWidth || parseInt10(stl.width))
+	                    - parseInt10(stl.paddingLeft)
+	                    - parseInt10(stl.paddingRight)) | 0;
+	        },
+
+	        _getHeight: function () {
+	            var root = this.root;
+	            var stl = root.currentStyle;
+
+	            return ((root.clientHeight || parseInt10(stl.height))
+	                    - parseInt10(stl.paddingTop)
+	                    - parseInt10(stl.paddingBottom)) | 0;
+	        }
+	    };
+
+	    // Not supported methods
+	    function createMethodNotSupport(method) {
+	        return function () {
+	            zrLog('In IE8.0 VML mode painter not support method "' + method + '"');
+	        };
+	    }
+
+	    var notSupportedMethods = [
+	        'getLayer', 'insertLayer', 'eachLayer', 'eachBuildinLayer', 'eachOtherLayer', 'getLayers',
+	        'modLayer', 'delLayer', 'clearLayer', 'toDataURL', 'pathToImage'
+	    ];
+
+	    for (var i = 0; i < notSupportedMethods.length; i++) {
+	        var name = notSupportedMethods[i];
+	        VMLPainter.prototype[name] = createMethodNotSupport(name);
+	    }
+
+	    module.exports = VMLPainter;
+
+
+/***/ }
+/******/ ])
+});
+;
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/global.js b/pluss-wap-page/src/main/resources/static/resources/js/global.js
new file mode 100644
index 0000000..5d19ebe
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/global.js
@@ -0,0 +1,18 @@
+var version = "1.6.35";	//资源文件的版本号，每次发布或者升级都需改变此版本号
+/**
+ * 加了版本号码的js引用
+ * url js的url
+*/
+function require(url){
+	document.writeln('<script type="text/javascript" src="'+ resourcePath + '/' + url + '?version=' + version + '" charset="utf-8"><\/script>');
+}
+
+/**
+ * 加了版本号码的css引用
+ * url css的url3
+*/
+function requireCss(url){
+	document.writeln('<link type="text/css" rel="stylesheet" href="' + resourcePath + '/' + url + '?version=' + version + '" />');
+	
+}
+require("js/third-party/jquery/jquery-1.11.0.min.js");	//jquery.js
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/iscroll.js b/pluss-wap-page/src/main/resources/static/resources/js/iscroll.js
new file mode 100644
index 0000000..8bd2b8d
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/iscroll.js
@@ -0,0 +1,2011 @@
+/*! iScroll v5.1.3 ~ (c) 2008-2014 Matteo Spinelli ~ http://cubiq.org/license */
+(function (window, document, Math) {
+var rAF = window.requestAnimationFrame	||
+	window.webkitRequestAnimationFrame	||
+	window.mozRequestAnimationFrame		||
+	window.oRequestAnimationFrame		||
+	window.msRequestAnimationFrame		||
+	function (callback) { window.setTimeout(callback, 1000 / 60); };
+
+var utils = (function () {
+	var me = {};
+
+	var _elementStyle = document.createElement('div').style;
+	var _vendor = (function () {
+		var vendors = ['t', 'webkitT', 'MozT', 'msT', 'OT'],
+			transform,
+			i = 0,
+			l = vendors.length;
+
+		for ( ; i < l; i++ ) {
+			transform = vendors[i] + 'ransform';
+			if ( transform in _elementStyle ) return vendors[i].substr(0, vendors[i].length-1);
+		}
+
+		return false;
+	})();
+
+	function _prefixStyle (style) {
+		if ( _vendor === false ) return false;
+		if ( _vendor === '' ) return style;
+		return _vendor + style.charAt(0).toUpperCase() + style.substr(1);
+	}
+
+	me.getTime = Date.now || function getTime () { return new Date().getTime(); };
+
+	me.extend = function (target, obj) {
+		for ( var i in obj ) {
+			target[i] = obj[i];
+		}
+	};
+
+	me.addEvent = function (el, type, fn, capture) {
+		el.addEventListener(type, fn, !!capture);
+	};
+
+	me.removeEvent = function (el, type, fn, capture) {
+		el.removeEventListener(type, fn, !!capture);
+	};
+
+	me.prefixPointerEvent = function (pointerEvent) {
+		return window.MSPointerEvent ? 
+			'MSPointer' + pointerEvent.charAt(9).toUpperCase() + pointerEvent.substr(10):
+			pointerEvent;
+	};
+
+	me.momentum = function (current, start, time, lowerMargin, wrapperSize, deceleration) {
+		var distance = current - start,
+			speed = Math.abs(distance) / time,
+			destination,
+			duration;
+
+		deceleration = deceleration === undefined ? 0.0006 : deceleration;
+
+		destination = current + ( speed * speed ) / ( 2 * deceleration ) * ( distance < 0 ? -1 : 1 );
+		duration = speed / deceleration;
+
+		if ( destination < lowerMargin ) {
+			destination = wrapperSize ? lowerMargin - ( wrapperSize / 2.5 * ( speed / 8 ) ) : lowerMargin;
+			distance = Math.abs(destination - current);
+			duration = distance / speed;
+		} else if ( destination > 0 ) {
+			destination = wrapperSize ? wrapperSize / 2.5 * ( speed / 8 ) : 0;
+			distance = Math.abs(current) + destination;
+			duration = distance / speed;
+		}
+
+		return {
+			destination: Math.round(destination),
+			duration: duration
+		};
+	};
+
+	var _transform = _prefixStyle('transform');
+
+	me.extend(me, {
+		hasTransform: _transform !== false,
+		hasPerspective: _prefixStyle('perspective') in _elementStyle,
+		hasTouch: 'ontouchstart' in window,
+		hasPointer: window.PointerEvent || window.MSPointerEvent, // IE10 is prefixed
+		hasTransition: _prefixStyle('transition') in _elementStyle
+	});
+
+	// This should find all Android browsers lower than build 535.19 (both stock browser and webview)
+	me.isBadAndroid = /Android /.test(window.navigator.appVersion) && !(/Chrome\/\d/.test(window.navigator.appVersion));
+
+	me.extend(me.style = {}, {
+		transform: _transform,
+		transitionTimingFunction: _prefixStyle('transitionTimingFunction'),
+		transitionDuration: _prefixStyle('transitionDuration'),
+		transitionDelay: _prefixStyle('transitionDelay'),
+		transformOrigin: _prefixStyle('transformOrigin')
+	});
+
+	me.hasClass = function (e, c) {
+		var re = new RegExp("(^|\\s)" + c + "(\\s|$)");
+		return re.test(e.className);
+	};
+
+	me.addClass = function (e, c) {
+		if ( me.hasClass(e, c) ) {
+			return;
+		}
+
+		var newclass = e.className.split(' ');
+		newclass.push(c);
+		e.className = newclass.join(' ');
+	};
+
+	me.removeClass = function (e, c) {
+		if ( !me.hasClass(e, c) ) {
+			return;
+		}
+
+		var re = new RegExp("(^|\\s)" + c + "(\\s|$)", 'g');
+		e.className = e.className.replace(re, ' ');
+	};
+
+	me.offset = function (el) {
+		var left = -el.offsetLeft,
+			top = -el.offsetTop;
+
+		// jshint -W084
+		while (el = el.offsetParent) {
+			left -= el.offsetLeft;
+			top -= el.offsetTop;
+		}
+		// jshint +W084
+
+		return {
+			left: left,
+			top: top
+		};
+	};
+
+	me.preventDefaultException = function (el, exceptions) {
+		for ( var i in exceptions ) {
+			if ( exceptions[i].test(el[i]) ) {
+				return true;
+			}
+		}
+
+		return false;
+	};
+
+	me.extend(me.eventType = {}, {
+		touchstart: 1,
+		touchmove: 1,
+		touchend: 1,
+
+		mousedown: 2,
+		mousemove: 2,
+		mouseup: 2,
+
+		pointerdown: 3,
+		pointermove: 3,
+		pointerup: 3,
+
+		MSPointerDown: 3,
+		MSPointerMove: 3,
+		MSPointerUp: 3
+	});
+
+	me.extend(me.ease = {}, {
+		quadratic: {
+			style: 'cubic-bezier(0.25, 0.46, 0.45, 0.94)',
+			fn: function (k) {
+				return k * ( 2 - k );
+			}
+		},
+		circular: {
+			style: 'cubic-bezier(0.1, 0.57, 0.1, 1)',	// Not properly "circular" but this looks better, it should be (0.075, 0.82, 0.165, 1)
+			fn: function (k) {
+				return Math.sqrt( 1 - ( --k * k ) );
+			}
+		},
+		back: {
+			style: 'cubic-bezier(0.175, 0.885, 0.32, 1.275)',
+			fn: function (k) {
+				var b = 4;
+				return ( k = k - 1 ) * k * ( ( b + 1 ) * k + b ) + 1;
+			}
+		},
+		bounce: {
+			style: '',
+			fn: function (k) {
+				if ( ( k /= 1 ) < ( 1 / 2.75 ) ) {
+					return 7.5625 * k * k;
+				} else if ( k < ( 2 / 2.75 ) ) {
+					return 7.5625 * ( k -= ( 1.5 / 2.75 ) ) * k + 0.75;
+				} else if ( k < ( 2.5 / 2.75 ) ) {
+					return 7.5625 * ( k -= ( 2.25 / 2.75 ) ) * k + 0.9375;
+				} else {
+					return 7.5625 * ( k -= ( 2.625 / 2.75 ) ) * k + 0.984375;
+				}
+			}
+		},
+		elastic: {
+			style: '',
+			fn: function (k) {
+				var f = 0.22,
+					e = 0.4;
+
+				if ( k === 0 ) { return 0; }
+				if ( k == 1 ) { return 1; }
+
+				return ( e * Math.pow( 2, - 10 * k ) * Math.sin( ( k - f / 4 ) * ( 2 * Math.PI ) / f ) + 1 );
+			}
+		}
+	});
+
+	me.tap = function (e, eventName) {
+		var ev = document.createEvent('Event');
+		ev.initEvent(eventName, true, true);
+		ev.pageX = e.pageX;
+		ev.pageY = e.pageY;
+		e.target.dispatchEvent(ev);
+	};
+
+	me.click = function (e) {
+		var target = e.target,
+			ev;
+
+		if ( !(/(SELECT|INPUT|TEXTAREA)/i).test(target.tagName) ) {
+			ev = document.createEvent('MouseEvents');
+			ev.initMouseEvent('click', true, true, e.view, 1,
+				target.screenX, target.screenY, target.clientX, target.clientY,
+				e.ctrlKey, e.altKey, e.shiftKey, e.metaKey,
+				0, null);
+
+			ev._constructed = true;
+			target.dispatchEvent(ev);
+		}
+	};
+
+	return me;
+})();
+
+function IScroll (el, options) {
+	this.wrapper = typeof el == 'string' ? document.querySelector(el) : el;
+	this.scroller = this.wrapper.children[0];
+	this.scrollerStyle = this.scroller.style;		// cache style for better performance
+
+	this.options = {
+
+		resizeScrollbars: true,
+
+		mouseWheelSpeed: 20,
+
+		snapThreshold: 0.334,
+
+// INSERT POINT: OPTIONS 
+
+		startX: 0,
+		startY: 0,
+		scrollY: true,
+		directionLockThreshold: 5,
+		momentum: true,
+
+		bounce: true,
+		bounceTime: 600,
+		bounceEasing: '',
+
+		preventDefault: true,
+		preventDefaultException: { tagName: /^(INPUT|TEXTAREA|BUTTON|SELECT)$/ },
+
+		HWCompositing: true,
+		useTransition: true,
+		useTransform: true
+	};
+
+	for ( var i in options ) {
+		this.options[i] = options[i];
+	}
+
+	// Normalize options
+	this.translateZ = this.options.HWCompositing && utils.hasPerspective ? ' translateZ(0)' : '';
+
+	this.options.useTransition = utils.hasTransition && this.options.useTransition;
+	this.options.useTransform = utils.hasTransform && this.options.useTransform;
+
+	this.options.eventPassthrough = this.options.eventPassthrough === true ? 'vertical' : this.options.eventPassthrough;
+	this.options.preventDefault = !this.options.eventPassthrough && this.options.preventDefault;
+
+	// If you want eventPassthrough I have to lock one of the axes
+	this.options.scrollY = this.options.eventPassthrough == 'vertical' ? false : this.options.scrollY;
+	this.options.scrollX = this.options.eventPassthrough == 'horizontal' ? false : this.options.scrollX;
+
+	// With eventPassthrough we also need lockDirection mechanism
+	this.options.freeScroll = this.options.freeScroll && !this.options.eventPassthrough;
+	this.options.directionLockThreshold = this.options.eventPassthrough ? 0 : this.options.directionLockThreshold;
+
+	this.options.bounceEasing = typeof this.options.bounceEasing == 'string' ? utils.ease[this.options.bounceEasing] || utils.ease.circular : this.options.bounceEasing;
+
+	this.options.resizePolling = this.options.resizePolling === undefined ? 60 : this.options.resizePolling;
+
+	if ( this.options.tap === true ) {
+		this.options.tap = 'tap';
+	}
+
+	if ( this.options.shrinkScrollbars == 'scale' ) {
+		this.options.useTransition = false;
+	}
+
+	this.options.invertWheelDirection = this.options.invertWheelDirection ? -1 : 1;
+
+// INSERT POINT: NORMALIZATION
+
+	// Some defaults	
+	this.x = 0;
+	this.y = 0;
+	this.directionX = 0;
+	this.directionY = 0;
+	this._events = {};
+
+// INSERT POINT: DEFAULTS
+
+	this._init();
+	this.refresh();
+
+	this.scrollTo(this.options.startX, this.options.startY);
+	this.enable();
+}
+
+IScroll.prototype = {
+	version: '5.1.3',
+
+	_init: function () {
+		this._initEvents();
+
+		if ( this.options.scrollbars || this.options.indicators ) {
+			this._initIndicators();
+		}
+
+		if ( this.options.mouseWheel ) {
+			this._initWheel();
+		}
+
+		if ( this.options.snap ) {
+			this._initSnap();
+		}
+
+		if ( this.options.keyBindings ) {
+			this._initKeys();
+		}
+
+// INSERT POINT: _init
+
+	},
+
+	destroy: function () {
+		this._initEvents(true);
+
+		this._execEvent('destroy');
+	},
+
+	_transitionEnd: function (e) {
+		if ( e.target != this.scroller || !this.isInTransition ) {
+			return;
+		}
+
+		this._transitionTime();
+		if ( !this.resetPosition(this.options.bounceTime) ) {
+			this.isInTransition = false;
+			this._execEvent('scrollEnd');
+		}
+	},
+
+	_start: function (e) {
+		// React to left mouse button only
+		if ( utils.eventType[e.type] != 1 ) {
+			if ( e.button !== 0 ) {
+				return;
+			}
+		}
+
+		if ( !this.enabled || (this.initiated && utils.eventType[e.type] !== this.initiated) ) {
+			return;
+		}
+
+		if ( this.options.preventDefault && !utils.isBadAndroid && !utils.preventDefaultException(e.target, this.options.preventDefaultException) ) {
+			e.preventDefault();
+		}
+
+		var point = e.touches ? e.touches[0] : e,
+			pos;
+
+		this.initiated	= utils.eventType[e.type];
+		this.moved		= false;
+		this.distX		= 0;
+		this.distY		= 0;
+		this.directionX = 0;
+		this.directionY = 0;
+		this.directionLocked = 0;
+
+		this._transitionTime();
+
+		this.startTime = utils.getTime();
+
+		if ( this.options.useTransition && this.isInTransition ) {
+			this.isInTransition = false;
+			pos = this.getComputedPosition();
+			this._translate(Math.round(pos.x), Math.round(pos.y));
+			this._execEvent('scrollEnd');
+		} else if ( !this.options.useTransition && this.isAnimating ) {
+			this.isAnimating = false;
+			this._execEvent('scrollEnd');
+		}
+
+		this.startX    = this.x;
+		this.startY    = this.y;
+		this.absStartX = this.x;
+		this.absStartY = this.y;
+		this.pointX    = point.pageX;
+		this.pointY    = point.pageY;
+
+		this._execEvent('beforeScrollStart');
+	},
+
+	_move: function (e) {
+		if ( !this.enabled || utils.eventType[e.type] !== this.initiated ) {
+			return;
+		}
+
+		if ( this.options.preventDefault ) {	// increases performance on Android? TODO: check!
+			e.preventDefault();
+		}
+
+		var point		= e.touches ? e.touches[0] : e,
+			deltaX		= point.pageX - this.pointX,
+			deltaY		= point.pageY - this.pointY,
+			timestamp	= utils.getTime(),
+			newX, newY,
+			absDistX, absDistY;
+
+		this.pointX		= point.pageX;
+		this.pointY		= point.pageY;
+
+		this.distX		+= deltaX;
+		this.distY		+= deltaY;
+		absDistX		= Math.abs(this.distX);
+		absDistY		= Math.abs(this.distY);
+
+		// We need to move at least 10 pixels for the scrolling to initiate
+		if ( timestamp - this.endTime > 300 && (absDistX < 10 && absDistY < 10) ) {
+			return;
+		}
+
+		// If you are scrolling in one direction lock the other
+		if ( !this.directionLocked && !this.options.freeScroll ) {
+			if ( absDistX > absDistY + this.options.directionLockThreshold ) {
+				this.directionLocked = 'h';		// lock horizontally
+			} else if ( absDistY >= absDistX + this.options.directionLockThreshold ) {
+				this.directionLocked = 'v';		// lock vertically
+			} else {
+				this.directionLocked = 'n';		// no lock
+			}
+		}
+
+		if ( this.directionLocked == 'h' ) {
+			if ( this.options.eventPassthrough == 'vertical' ) {
+				e.preventDefault();
+			} else if ( this.options.eventPassthrough == 'horizontal' ) {
+				this.initiated = false;
+				return;
+			}
+
+			deltaY = 0;
+		} else if ( this.directionLocked == 'v' ) {
+			if ( this.options.eventPassthrough == 'horizontal' ) {
+				e.preventDefault();
+			} else if ( this.options.eventPassthrough == 'vertical' ) {
+				this.initiated = false;
+				return;
+			}
+
+			deltaX = 0;
+		}
+
+		deltaX = this.hasHorizontalScroll ? deltaX : 0;
+		deltaY = this.hasVerticalScroll ? deltaY : 0;
+
+		newX = this.x + deltaX;
+		newY = this.y + deltaY;
+
+		// Slow down if outside of the boundaries
+		if ( newX > 0 || newX < this.maxScrollX ) {
+			newX = this.options.bounce ? this.x + deltaX / 3 : newX > 0 ? 0 : this.maxScrollX;
+		}
+		if ( newY > 0 || newY < this.maxScrollY ) {
+			newY = this.options.bounce ? this.y + deltaY / 3 : newY > 0 ? 0 : this.maxScrollY;
+		}
+
+		this.directionX = deltaX > 0 ? -1 : deltaX < 0 ? 1 : 0;
+		this.directionY = deltaY > 0 ? -1 : deltaY < 0 ? 1 : 0;
+
+		if ( !this.moved ) {
+			this._execEvent('scrollStart');
+		}
+
+		this.moved = true;
+
+		this._translate(newX, newY);
+
+/* REPLACE START: _move */
+
+		if ( timestamp - this.startTime > 300 ) {
+			this.startTime = timestamp;
+			this.startX = this.x;
+			this.startY = this.y;
+		}
+
+/* REPLACE END: _move */
+
+	},
+
+	_end: function (e) {
+		if ( !this.enabled || utils.eventType[e.type] !== this.initiated ) {
+			return;
+		}
+
+		if ( this.options.preventDefault && !utils.preventDefaultException(e.target, this.options.preventDefaultException) ) {
+			e.preventDefault();
+		}
+
+		var point = e.changedTouches ? e.changedTouches[0] : e,
+			momentumX,
+			momentumY,
+			duration = utils.getTime() - this.startTime,
+			newX = Math.round(this.x),
+			newY = Math.round(this.y),
+			distanceX = Math.abs(newX - this.startX),
+			distanceY = Math.abs(newY - this.startY),
+			time = 0,
+			easing = '';
+
+		this.isInTransition = 0;
+		this.initiated = 0;
+		this.endTime = utils.getTime();
+
+		// reset if we are outside of the boundaries
+		if ( this.resetPosition(this.options.bounceTime) ) {
+			return;
+		}
+
+		this.scrollTo(newX, newY);	// ensures that the last position is rounded
+
+		// we scrolled less than 10 pixels
+		if ( !this.moved ) {
+			if ( this.options.tap ) {
+				utils.tap(e, this.options.tap);
+			}
+
+			if ( this.options.click ) {
+				utils.click(e);
+			}
+
+			this._execEvent('scrollCancel');
+			return;
+		}
+
+		if ( this._events.flick && duration < 200 && distanceX < 100 && distanceY < 100 ) {
+			this._execEvent('flick');
+			return;
+		}
+
+		// start momentum animation if needed
+		if ( this.options.momentum && duration < 300 ) {
+			momentumX = this.hasHorizontalScroll ? utils.momentum(this.x, this.startX, duration, this.maxScrollX, this.options.bounce ? this.wrapperWidth : 0, this.options.deceleration) : { destination: newX, duration: 0 };
+			momentumY = this.hasVerticalScroll ? utils.momentum(this.y, this.startY, duration, this.maxScrollY, this.options.bounce ? this.wrapperHeight : 0, this.options.deceleration) : { destination: newY, duration: 0 };
+			newX = momentumX.destination;
+			newY = momentumY.destination;
+			time = Math.max(momentumX.duration, momentumY.duration);
+			this.isInTransition = 1;
+		}
+
+
+		if ( this.options.snap ) {
+			var snap = this._nearestSnap(newX, newY);
+			this.currentPage = snap;
+			time = this.options.snapSpeed || Math.max(
+					Math.max(
+						Math.min(Math.abs(newX - snap.x), 1000),
+						Math.min(Math.abs(newY - snap.y), 1000)
+					), 300);
+			newX = snap.x;
+			newY = snap.y;
+
+			this.directionX = 0;
+			this.directionY = 0;
+			easing = this.options.bounceEasing;
+		}
+
+// INSERT POINT: _end
+
+		if ( newX != this.x || newY != this.y ) {
+			// change easing function when scroller goes out of the boundaries
+			if ( newX > 0 || newX < this.maxScrollX || newY > 0 || newY < this.maxScrollY ) {
+				easing = utils.ease.quadratic;
+			}
+
+			this.scrollTo(newX, newY, time, easing);
+			return;
+		}
+
+		this._execEvent('scrollEnd');
+	},
+
+	_resize: function () {
+		var that = this;
+
+		clearTimeout(this.resizeTimeout);
+
+		this.resizeTimeout = setTimeout(function () {
+			that.refresh();
+		}, this.options.resizePolling);
+	},
+
+	resetPosition: function (time) {
+		var x = this.x,
+			y = this.y;
+
+		time = time || 0;
+
+		if ( !this.hasHorizontalScroll || this.x > 0 ) {
+			x = 0;
+		} else if ( this.x < this.maxScrollX ) {
+			x = this.maxScrollX;
+		}
+
+		if ( !this.hasVerticalScroll || this.y > 0 ) {
+			y = 0;
+		} else if ( this.y < this.maxScrollY ) {
+			y = this.maxScrollY;
+		}
+
+		if ( x == this.x && y == this.y ) {
+			return false;
+		}
+
+		this.scrollTo(x, y, time, this.options.bounceEasing);
+
+		return true;
+	},
+
+	disable: function () {
+		this.enabled = false;
+	},
+
+	enable: function () {
+		this.enabled = true;
+	},
+
+	refresh: function () {
+		var rf = this.wrapper.offsetHeight;		// Force reflow
+
+		this.wrapperWidth	= this.wrapper.clientWidth;
+		this.wrapperHeight	= this.wrapper.clientHeight;
+
+/* REPLACE START: refresh */
+
+		this.scrollerWidth	= this.scroller.offsetWidth;
+		this.scrollerHeight	= this.scroller.offsetHeight;
+
+		this.maxScrollX		= this.wrapperWidth - this.scrollerWidth;
+		this.maxScrollY		= this.wrapperHeight - this.scrollerHeight;
+
+/* REPLACE END: refresh */
+
+		this.hasHorizontalScroll	= this.options.scrollX && this.maxScrollX < 0;
+		this.hasVerticalScroll		= this.options.scrollY && this.maxScrollY < 0;
+
+		if ( !this.hasHorizontalScroll ) {
+			this.maxScrollX = 0;
+			this.scrollerWidth = this.wrapperWidth;
+		}
+
+		if ( !this.hasVerticalScroll ) {
+			this.maxScrollY = 0;
+			this.scrollerHeight = this.wrapperHeight;
+		}
+
+		this.endTime = 0;
+		this.directionX = 0;
+		this.directionY = 0;
+
+		this.wrapperOffset = utils.offset(this.wrapper);
+
+		this._execEvent('refresh');
+
+		this.resetPosition();
+
+// INSERT POINT: _refresh
+
+	},
+
+	on: function (type, fn) {
+		if ( !this._events[type] ) {
+			this._events[type] = [];
+		}
+
+		this._events[type].push(fn);
+	},
+
+	off: function (type, fn) {
+		if ( !this._events[type] ) {
+			return;
+		}
+
+		var index = this._events[type].indexOf(fn);
+
+		if ( index > -1 ) {
+			this._events[type].splice(index, 1);
+		}
+	},
+
+	_execEvent: function (type) {
+		if ( !this._events[type] ) {
+			return;
+		}
+
+		var i = 0,
+			l = this._events[type].length;
+
+		if ( !l ) {
+			return;
+		}
+
+		for ( ; i < l; i++ ) {
+			this._events[type][i].apply(this, [].slice.call(arguments, 1));
+		}
+	},
+
+	scrollBy: function (x, y, time, easing) {
+		x = this.x + x;
+		y = this.y + y;
+		time = time || 0;
+
+		this.scrollTo(x, y, time, easing);
+	},
+
+	scrollTo: function (x, y, time, easing) {
+		easing = easing || utils.ease.circular;
+
+		this.isInTransition = this.options.useTransition && time > 0;
+
+		if ( !time || (this.options.useTransition && easing.style) ) {
+			this._transitionTimingFunction(easing.style);
+			this._transitionTime(time);
+			this._translate(x, y);
+		} else {
+			this._animate(x, y, time, easing.fn);
+		}
+	},
+
+	scrollToElement: function (el, time, offsetX, offsetY, easing) {
+		el = el.nodeType ? el : this.scroller.querySelector(el);
+
+		if ( !el ) {
+			return;
+		}
+
+		var pos = utils.offset(el);
+
+		pos.left -= this.wrapperOffset.left;
+		pos.top  -= this.wrapperOffset.top;
+
+		// if offsetX/Y are true we center the element to the screen
+		if ( offsetX === true ) {
+			offsetX = Math.round(el.offsetWidth / 2 - this.wrapper.offsetWidth / 2);
+		}
+		if ( offsetY === true ) {
+			offsetY = Math.round(el.offsetHeight / 2 - this.wrapper.offsetHeight / 2);
+		}
+
+		pos.left -= offsetX || 0;
+		pos.top  -= offsetY || 0;
+
+		pos.left = pos.left > 0 ? 0 : pos.left < this.maxScrollX ? this.maxScrollX : pos.left;
+		pos.top  = pos.top  > 0 ? 0 : pos.top  < this.maxScrollY ? this.maxScrollY : pos.top;
+
+		time = time === undefined || time === null || time === 'auto' ? Math.max(Math.abs(this.x-pos.left), Math.abs(this.y-pos.top)) : time;
+
+		this.scrollTo(pos.left, pos.top, time, easing);
+	},
+
+	_transitionTime: function (time) {
+		time = time || 0;
+
+		this.scrollerStyle[utils.style.transitionDuration] = time + 'ms';
+
+		if ( !time && utils.isBadAndroid ) {
+			this.scrollerStyle[utils.style.transitionDuration] = '0.001s';
+		}
+
+
+		if ( this.indicators ) {
+			for ( var i = this.indicators.length; i--; ) {
+				this.indicators[i].transitionTime(time);
+			}
+		}
+
+
+// INSERT POINT: _transitionTime
+
+	},
+
+	_transitionTimingFunction: function (easing) {
+		this.scrollerStyle[utils.style.transitionTimingFunction] = easing;
+
+
+		if ( this.indicators ) {
+			for ( var i = this.indicators.length; i--; ) {
+				this.indicators[i].transitionTimingFunction(easing);
+			}
+		}
+
+
+// INSERT POINT: _transitionTimingFunction
+
+	},
+
+	_translate: function (x, y) {
+		if ( this.options.useTransform ) {
+
+/* REPLACE START: _translate */
+
+			this.scrollerStyle[utils.style.transform] = 'translate(' + x + 'px,' + y + 'px)' + this.translateZ;
+
+/* REPLACE END: _translate */
+
+		} else {
+			x = Math.round(x);
+			y = Math.round(y);
+			this.scrollerStyle.left = x + 'px';
+			this.scrollerStyle.top = y + 'px';
+		}
+
+		this.x = x;
+		this.y = y;
+
+
+	if ( this.indicators ) {
+		for ( var i = this.indicators.length; i--; ) {
+			this.indicators[i].updatePosition();
+		}
+	}
+
+
+// INSERT POINT: _translate
+
+	},
+
+	_initEvents: function (remove) {
+		var eventType = remove ? utils.removeEvent : utils.addEvent,
+			target = this.options.bindToWrapper ? this.wrapper : window;
+
+		eventType(window, 'orientationchange', this);
+		eventType(window, 'resize', this);
+
+		if ( this.options.click ) {
+			eventType(this.wrapper, 'click', this, true);
+		}
+
+		if ( !this.options.disableMouse ) {
+			eventType(this.wrapper, 'mousedown', this);
+			eventType(target, 'mousemove', this);
+			eventType(target, 'mousecancel', this);
+			eventType(target, 'mouseup', this);
+		}
+
+		if ( utils.hasPointer && !this.options.disablePointer ) {
+			eventType(this.wrapper, utils.prefixPointerEvent('pointerdown'), this);
+			eventType(target, utils.prefixPointerEvent('pointermove'), this);
+			eventType(target, utils.prefixPointerEvent('pointercancel'), this);
+			eventType(target, utils.prefixPointerEvent('pointerup'), this);
+		}
+
+		if ( utils.hasTouch && !this.options.disableTouch ) {
+			eventType(this.wrapper, 'touchstart', this);
+			eventType(target, 'touchmove', this);
+			eventType(target, 'touchcancel', this);
+			eventType(target, 'touchend', this);
+		}
+
+		eventType(this.scroller, 'transitionend', this);
+		eventType(this.scroller, 'webkitTransitionEnd', this);
+		eventType(this.scroller, 'oTransitionEnd', this);
+		eventType(this.scroller, 'MSTransitionEnd', this);
+	},
+
+	getComputedPosition: function () {
+		var matrix = window.getComputedStyle(this.scroller, null),
+			x, y;
+
+		if ( this.options.useTransform ) {
+			matrix = matrix[utils.style.transform].split(')')[0].split(', ');
+			x = +(matrix[12] || matrix[4]);
+			y = +(matrix[13] || matrix[5]);
+		} else {
+			x = +matrix.left.replace(/[^-\d.]/g, '');
+			y = +matrix.top.replace(/[^-\d.]/g, '');
+		}
+
+		return { x: x, y: y };
+	},
+
+	_initIndicators: function () {
+		var interactive = this.options.interactiveScrollbars,
+			customStyle = typeof this.options.scrollbars != 'string',
+			indicators = [],
+			indicator;
+
+		var that = this;
+
+		this.indicators = [];
+
+		if ( this.options.scrollbars ) {
+			// Vertical scrollbar
+			if ( this.options.scrollY ) {
+				indicator = {
+					el: createDefaultScrollbar('v', interactive, this.options.scrollbars),
+					interactive: interactive,
+					defaultScrollbars: true,
+					customStyle: customStyle,
+					resize: this.options.resizeScrollbars,
+					shrink: this.options.shrinkScrollbars,
+					fade: this.options.fadeScrollbars,
+					listenX: false
+				};
+
+				this.wrapper.appendChild(indicator.el);
+				indicators.push(indicator);
+			}
+
+			// Horizontal scrollbar
+			if ( this.options.scrollX ) {
+				indicator = {
+					el: createDefaultScrollbar('h', interactive, this.options.scrollbars),
+					interactive: interactive,
+					defaultScrollbars: true,
+					customStyle: customStyle,
+					resize: this.options.resizeScrollbars,
+					shrink: this.options.shrinkScrollbars,
+					fade: this.options.fadeScrollbars,
+					listenY: false
+				};
+
+				this.wrapper.appendChild(indicator.el);
+				indicators.push(indicator);
+			}
+		}
+
+		if ( this.options.indicators ) {
+			// TODO: check concat compatibility
+			indicators = indicators.concat(this.options.indicators);
+		}
+
+		for ( var i = indicators.length; i--; ) {
+			this.indicators.push( new Indicator(this, indicators[i]) );
+		}
+
+		// TODO: check if we can use array.map (wide compatibility and performance issues)
+		function _indicatorsMap (fn) {
+			for ( var i = that.indicators.length; i--; ) {
+				fn.call(that.indicators[i]);
+			}
+		}
+
+		if ( this.options.fadeScrollbars ) {
+			this.on('scrollEnd', function () {
+				_indicatorsMap(function () {
+					this.fade();
+				});
+			});
+
+			this.on('scrollCancel', function () {
+				_indicatorsMap(function () {
+					this.fade();
+				});
+			});
+
+			this.on('scrollStart', function () {
+				_indicatorsMap(function () {
+					this.fade(1);
+				});
+			});
+
+			this.on('beforeScrollStart', function () {
+				_indicatorsMap(function () {
+					this.fade(1, true);
+				});
+			});
+		}
+
+
+		this.on('refresh', function () {
+			_indicatorsMap(function () {
+				this.refresh();
+			});
+		});
+
+		this.on('destroy', function () {
+			_indicatorsMap(function () {
+				this.destroy();
+			});
+
+			delete this.indicators;
+		});
+	},
+
+	_initWheel: function () {
+		utils.addEvent(this.wrapper, 'wheel', this);
+		utils.addEvent(this.wrapper, 'mousewheel', this);
+		utils.addEvent(this.wrapper, 'DOMMouseScroll', this);
+
+		this.on('destroy', function () {
+			utils.removeEvent(this.wrapper, 'wheel', this);
+			utils.removeEvent(this.wrapper, 'mousewheel', this);
+			utils.removeEvent(this.wrapper, 'DOMMouseScroll', this);
+		});
+	},
+
+	_wheel: function (e) {
+		if ( !this.enabled ) {
+			return;
+		}
+
+		e.preventDefault();
+		e.stopPropagation();
+
+		var wheelDeltaX, wheelDeltaY,
+			newX, newY,
+			that = this;
+
+		if ( this.wheelTimeout === undefined ) {
+			that._execEvent('scrollStart');
+		}
+
+		// Execute the scrollEnd event after 400ms the wheel stopped scrolling
+		clearTimeout(this.wheelTimeout);
+		this.wheelTimeout = setTimeout(function () {
+			that._execEvent('scrollEnd');
+			that.wheelTimeout = undefined;
+		}, 400);
+
+		if ( 'deltaX' in e ) {
+			if (e.deltaMode === 1) {
+				wheelDeltaX = -e.deltaX * this.options.mouseWheelSpeed;
+				wheelDeltaY = -e.deltaY * this.options.mouseWheelSpeed;
+			} else {
+				wheelDeltaX = -e.deltaX;
+				wheelDeltaY = -e.deltaY;
+			}
+		} else if ( 'wheelDeltaX' in e ) {
+			wheelDeltaX = e.wheelDeltaX / 120 * this.options.mouseWheelSpeed;
+			wheelDeltaY = e.wheelDeltaY / 120 * this.options.mouseWheelSpeed;
+		} else if ( 'wheelDelta' in e ) {
+			wheelDeltaX = wheelDeltaY = e.wheelDelta / 120 * this.options.mouseWheelSpeed;
+		} else if ( 'detail' in e ) {
+			wheelDeltaX = wheelDeltaY = -e.detail / 3 * this.options.mouseWheelSpeed;
+		} else {
+			return;
+		}
+
+		wheelDeltaX *= this.options.invertWheelDirection;
+		wheelDeltaY *= this.options.invertWheelDirection;
+
+		if ( !this.hasVerticalScroll ) {
+			wheelDeltaX = wheelDeltaY;
+			wheelDeltaY = 0;
+		}
+
+		if ( this.options.snap ) {
+			newX = this.currentPage.pageX;
+			newY = this.currentPage.pageY;
+
+			if ( wheelDeltaX > 0 ) {
+				newX--;
+			} else if ( wheelDeltaX < 0 ) {
+				newX++;
+			}
+
+			if ( wheelDeltaY > 0 ) {
+				newY--;
+			} else if ( wheelDeltaY < 0 ) {
+				newY++;
+			}
+
+			this.goToPage(newX, newY);
+
+			return;
+		}
+
+		newX = this.x + Math.round(this.hasHorizontalScroll ? wheelDeltaX : 0);
+		newY = this.y + Math.round(this.hasVerticalScroll ? wheelDeltaY : 0);
+
+		if ( newX > 0 ) {
+			newX = 0;
+		} else if ( newX < this.maxScrollX ) {
+			newX = this.maxScrollX;
+		}
+
+		if ( newY > 0 ) {
+			newY = 0;
+		} else if ( newY < this.maxScrollY ) {
+			newY = this.maxScrollY;
+		}
+
+		this.scrollTo(newX, newY, 0);
+
+// INSERT POINT: _wheel
+	},
+
+	_initSnap: function () {
+		this.currentPage = {};
+
+		if ( typeof this.options.snap == 'string' ) {
+			this.options.snap = this.scroller.querySelectorAll(this.options.snap);
+		}
+
+		this.on('refresh', function () {
+			var i = 0, l,
+				m = 0, n,
+				cx, cy,
+				x = 0, y,
+				stepX = this.options.snapStepX || this.wrapperWidth,
+				stepY = this.options.snapStepY || this.wrapperHeight,
+				el;
+
+			this.pages = [];
+
+			if ( !this.wrapperWidth || !this.wrapperHeight || !this.scrollerWidth || !this.scrollerHeight ) {
+				return;
+			}
+
+			if ( this.options.snap === true ) {
+				cx = Math.round( stepX / 2 );
+				cy = Math.round( stepY / 2 );
+
+				while ( x > -this.scrollerWidth ) {
+					this.pages[i] = [];
+					l = 0;
+					y = 0;
+
+					while ( y > -this.scrollerHeight ) {
+						this.pages[i][l] = {
+							x: Math.max(x, this.maxScrollX),
+							y: Math.max(y, this.maxScrollY),
+							width: stepX,
+							height: stepY,
+							cx: x - cx,
+							cy: y - cy
+						};
+
+						y -= stepY;
+						l++;
+					}
+
+					x -= stepX;
+					i++;
+				}
+			} else {
+				el = this.options.snap;
+				l = el.length;
+				n = -1;
+
+				for ( ; i < l; i++ ) {
+					if ( i === 0 || el[i].offsetLeft <= el[i-1].offsetLeft ) {
+						m = 0;
+						n++;
+					}
+
+					if ( !this.pages[m] ) {
+						this.pages[m] = [];
+					}
+
+					x = Math.max(-el[i].offsetLeft, this.maxScrollX);
+					y = Math.max(-el[i].offsetTop, this.maxScrollY);
+					cx = x - Math.round(el[i].offsetWidth / 2);
+					cy = y - Math.round(el[i].offsetHeight / 2);
+
+					this.pages[m][n] = {
+						x: x,
+						y: y,
+						width: el[i].offsetWidth,
+						height: el[i].offsetHeight,
+						cx: cx,
+						cy: cy
+					};
+
+					if ( x > this.maxScrollX ) {
+						m++;
+					}
+				}
+			}
+
+			this.goToPage(this.currentPage.pageX || 0, this.currentPage.pageY || 0, 0);
+
+			// Update snap threshold if needed
+			if ( this.options.snapThreshold % 1 === 0 ) {
+				this.snapThresholdX = this.options.snapThreshold;
+				this.snapThresholdY = this.options.snapThreshold;
+			} else {
+				this.snapThresholdX = Math.round(this.pages[this.currentPage.pageX][this.currentPage.pageY].width * this.options.snapThreshold);
+				this.snapThresholdY = Math.round(this.pages[this.currentPage.pageX][this.currentPage.pageY].height * this.options.snapThreshold);
+			}
+		});
+
+		this.on('flick', function () {
+			var time = this.options.snapSpeed || Math.max(
+					Math.max(
+						Math.min(Math.abs(this.x - this.startX), 1000),
+						Math.min(Math.abs(this.y - this.startY), 1000)
+					), 300);
+
+			this.goToPage(
+				this.currentPage.pageX + this.directionX,
+				this.currentPage.pageY + this.directionY,
+				time
+			);
+		});
+	},
+
+	_nearestSnap: function (x, y) {
+		if ( !this.pages.length ) {
+			return { x: 0, y: 0, pageX: 0, pageY: 0 };
+		}
+
+		var i = 0,
+			l = this.pages.length,
+			m = 0;
+
+		// Check if we exceeded the snap threshold
+		if ( Math.abs(x - this.absStartX) < this.snapThresholdX &&
+			Math.abs(y - this.absStartY) < this.snapThresholdY ) {
+			return this.currentPage;
+		}
+
+		if ( x > 0 ) {
+			x = 0;
+		} else if ( x < this.maxScrollX ) {
+			x = this.maxScrollX;
+		}
+
+		if ( y > 0 ) {
+			y = 0;
+		} else if ( y < this.maxScrollY ) {
+			y = this.maxScrollY;
+		}
+
+		for ( ; i < l; i++ ) {
+			if ( x >= this.pages[i][0].cx ) {
+				x = this.pages[i][0].x;
+				break;
+			}
+		}
+
+		l = this.pages[i].length;
+
+		for ( ; m < l; m++ ) {
+			if ( y >= this.pages[0][m].cy ) {
+				y = this.pages[0][m].y;
+				break;
+			}
+		}
+
+		if ( i == this.currentPage.pageX ) {
+			i += this.directionX;
+
+			if ( i < 0 ) {
+				i = 0;
+			} else if ( i >= this.pages.length ) {
+				i = this.pages.length - 1;
+			}
+
+			x = this.pages[i][0].x;
+		}
+
+		if ( m == this.currentPage.pageY ) {
+			m += this.directionY;
+
+			if ( m < 0 ) {
+				m = 0;
+			} else if ( m >= this.pages[0].length ) {
+				m = this.pages[0].length - 1;
+			}
+
+			y = this.pages[0][m].y;
+		}
+
+		return {
+			x: x,
+			y: y,
+			pageX: i,
+			pageY: m
+		};
+	},
+
+	goToPage: function (x, y, time, easing) {
+		easing = easing || this.options.bounceEasing;
+
+		if ( x >= this.pages.length ) {
+			x = this.pages.length - 1;
+		} else if ( x < 0 ) {
+			x = 0;
+		}
+
+		if ( y >= this.pages[x].length ) {
+			y = this.pages[x].length - 1;
+		} else if ( y < 0 ) {
+			y = 0;
+		}
+
+		var posX = this.pages[x][y].x,
+			posY = this.pages[x][y].y;
+
+		time = time === undefined ? this.options.snapSpeed || Math.max(
+			Math.max(
+				Math.min(Math.abs(posX - this.x), 1000),
+				Math.min(Math.abs(posY - this.y), 1000)
+			), 300) : time;
+
+		this.currentPage = {
+			x: posX,
+			y: posY,
+			pageX: x,
+			pageY: y
+		};
+
+		this.scrollTo(posX, posY, time, easing);
+	},
+
+	next: function (time, easing) {
+		var x = this.currentPage.pageX,
+			y = this.currentPage.pageY;
+
+		x++;
+
+		if ( x >= this.pages.length && this.hasVerticalScroll ) {
+			x = 0;
+			y++;
+		}
+
+		this.goToPage(x, y, time, easing);
+	},
+
+	prev: function (time, easing) {
+		var x = this.currentPage.pageX,
+			y = this.currentPage.pageY;
+
+		x--;
+
+		if ( x < 0 && this.hasVerticalScroll ) {
+			x = 0;
+			y--;
+		}
+
+		this.goToPage(x, y, time, easing);
+	},
+
+	_initKeys: function (e) {
+		// default key bindings
+		var keys = {
+			pageUp: 33,
+			pageDown: 34,
+			end: 35,
+			home: 36,
+			left: 37,
+			up: 38,
+			right: 39,
+			down: 40
+		};
+		var i;
+
+		// if you give me characters I give you keycode
+		if ( typeof this.options.keyBindings == 'object' ) {
+			for ( i in this.options.keyBindings ) {
+				if ( typeof this.options.keyBindings[i] == 'string' ) {
+					this.options.keyBindings[i] = this.options.keyBindings[i].toUpperCase().charCodeAt(0);
+				}
+			}
+		} else {
+			this.options.keyBindings = {};
+		}
+
+		for ( i in keys ) {
+			this.options.keyBindings[i] = this.options.keyBindings[i] || keys[i];
+		}
+
+		utils.addEvent(window, 'keydown', this);
+
+		this.on('destroy', function () {
+			utils.removeEvent(window, 'keydown', this);
+		});
+	},
+
+	_key: function (e) {
+		if ( !this.enabled ) {
+			return;
+		}
+
+		var snap = this.options.snap,	// we are using this alot, better to cache it
+			newX = snap ? this.currentPage.pageX : this.x,
+			newY = snap ? this.currentPage.pageY : this.y,
+			now = utils.getTime(),
+			prevTime = this.keyTime || 0,
+			acceleration = 0.250,
+			pos;
+
+		if ( this.options.useTransition && this.isInTransition ) {
+			pos = this.getComputedPosition();
+
+			this._translate(Math.round(pos.x), Math.round(pos.y));
+			this.isInTransition = false;
+		}
+
+		this.keyAcceleration = now - prevTime < 200 ? Math.min(this.keyAcceleration + acceleration, 50) : 0;
+
+		switch ( e.keyCode ) {
+			case this.options.keyBindings.pageUp:
+				if ( this.hasHorizontalScroll && !this.hasVerticalScroll ) {
+					newX += snap ? 1 : this.wrapperWidth;
+				} else {
+					newY += snap ? 1 : this.wrapperHeight;
+				}
+				break;
+			case this.options.keyBindings.pageDown:
+				if ( this.hasHorizontalScroll && !this.hasVerticalScroll ) {
+					newX -= snap ? 1 : this.wrapperWidth;
+				} else {
+					newY -= snap ? 1 : this.wrapperHeight;
+				}
+				break;
+			case this.options.keyBindings.end:
+				newX = snap ? this.pages.length-1 : this.maxScrollX;
+				newY = snap ? this.pages[0].length-1 : this.maxScrollY;
+				break;
+			case this.options.keyBindings.home:
+				newX = 0;
+				newY = 0;
+				break;
+			case this.options.keyBindings.left:
+				newX += snap ? -1 : 5 + this.keyAcceleration>>0;
+				break;
+			case this.options.keyBindings.up:
+				newY += snap ? 1 : 5 + this.keyAcceleration>>0;
+				break;
+			case this.options.keyBindings.right:
+				newX -= snap ? -1 : 5 + this.keyAcceleration>>0;
+				break;
+			case this.options.keyBindings.down:
+				newY -= snap ? 1 : 5 + this.keyAcceleration>>0;
+				break;
+			default:
+				return;
+		}
+
+		if ( snap ) {
+			this.goToPage(newX, newY);
+			return;
+		}
+
+		if ( newX > 0 ) {
+			newX = 0;
+			this.keyAcceleration = 0;
+		} else if ( newX < this.maxScrollX ) {
+			newX = this.maxScrollX;
+			this.keyAcceleration = 0;
+		}
+
+		if ( newY > 0 ) {
+			newY = 0;
+			this.keyAcceleration = 0;
+		} else if ( newY < this.maxScrollY ) {
+			newY = this.maxScrollY;
+			this.keyAcceleration = 0;
+		}
+
+		this.scrollTo(newX, newY, 0);
+
+		this.keyTime = now;
+	},
+
+	_animate: function (destX, destY, duration, easingFn) {
+		var that = this,
+			startX = this.x,
+			startY = this.y,
+			startTime = utils.getTime(),
+			destTime = startTime + duration;
+
+		function step () {
+			var now = utils.getTime(),
+				newX, newY,
+				easing;
+
+			if ( now >= destTime ) {
+				that.isAnimating = false;
+				that._translate(destX, destY);
+
+				if ( !that.resetPosition(that.options.bounceTime) ) {
+					that._execEvent('scrollEnd');
+				}
+
+				return;
+			}
+
+			now = ( now - startTime ) / duration;
+			easing = easingFn(now);
+			newX = ( destX - startX ) * easing + startX;
+			newY = ( destY - startY ) * easing + startY;
+			that._translate(newX, newY);
+
+			if ( that.isAnimating ) {
+				rAF(step);
+			}
+		}
+
+		this.isAnimating = true;
+		step();
+	},
+	handleEvent: function (e) {
+		switch ( e.type ) {
+			case 'touchstart':
+			case 'pointerdown':
+			case 'MSPointerDown':
+			case 'mousedown':
+				this._start(e);
+				break;
+			case 'touchmove':
+			case 'pointermove':
+			case 'MSPointerMove':
+			case 'mousemove':
+				this._move(e);
+				break;
+			case 'touchend':
+			case 'pointerup':
+			case 'MSPointerUp':
+			case 'mouseup':
+			case 'touchcancel':
+			case 'pointercancel':
+			case 'MSPointerCancel':
+			case 'mousecancel':
+				this._end(e);
+				break;
+			case 'orientationchange':
+			case 'resize':
+				this._resize();
+				break;
+			case 'transitionend':
+			case 'webkitTransitionEnd':
+			case 'oTransitionEnd':
+			case 'MSTransitionEnd':
+				this._transitionEnd(e);
+				break;
+			case 'wheel':
+			case 'DOMMouseScroll':
+			case 'mousewheel':
+				this._wheel(e);
+				break;
+			case 'keydown':
+				this._key(e);
+				break;
+			case 'click':
+				if ( !e._constructed ) {
+					e.preventDefault();
+					e.stopPropagation();
+				}
+				break;
+		}
+	}
+};
+function createDefaultScrollbar (direction, interactive, type) {
+	var scrollbar = document.createElement('div'),
+		indicator = document.createElement('div');
+
+	if ( type === true ) {
+		scrollbar.style.cssText = 'position:absolute;z-index:9999';
+		indicator.style.cssText = '-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;position:absolute;background:rgba(0,0,0,0.5);border:1px solid rgba(255,255,255,0.9);border-radius:3px';
+	}
+
+	indicator.className = 'iScrollIndicator';
+
+	if ( direction == 'h' ) {
+		if ( type === true ) {
+			scrollbar.style.cssText += ';height:7px;left:2px;right:2px;bottom:0';
+			indicator.style.height = '100%';
+		}
+		scrollbar.className = 'iScrollHorizontalScrollbar';
+	} else {
+		if ( type === true ) {
+			scrollbar.style.cssText += ';width:7px;bottom:2px;top:2px;right:1px';
+			indicator.style.width = '100%';
+		}
+		scrollbar.className = 'iScrollVerticalScrollbar';
+	}
+
+	scrollbar.style.cssText += ';overflow:hidden';
+
+	if ( !interactive ) {
+		scrollbar.style.pointerEvents = 'none';
+	}
+
+	scrollbar.appendChild(indicator);
+
+	return scrollbar;
+}
+
+function Indicator (scroller, options) {
+	this.wrapper = typeof options.el == 'string' ? document.querySelector(options.el) : options.el;
+	this.wrapperStyle = this.wrapper.style;
+	this.indicator = this.wrapper.children[0];
+	this.indicatorStyle = this.indicator.style;
+	this.scroller = scroller;
+
+	this.options = {
+		listenX: true,
+		listenY: true,
+		interactive: false,
+		resize: true,
+		defaultScrollbars: false,
+		shrink: false,
+		fade: false,
+		speedRatioX: 0,
+		speedRatioY: 0
+	};
+
+	for ( var i in options ) {
+		this.options[i] = options[i];
+	}
+
+	this.sizeRatioX = 1;
+	this.sizeRatioY = 1;
+	this.maxPosX = 0;
+	this.maxPosY = 0;
+
+	if ( this.options.interactive ) {
+		if ( !this.options.disableTouch ) {
+			utils.addEvent(this.indicator, 'touchstart', this);
+			utils.addEvent(window, 'touchend', this);
+		}
+		if ( !this.options.disablePointer ) {
+			utils.addEvent(this.indicator, utils.prefixPointerEvent('pointerdown'), this);
+			utils.addEvent(window, utils.prefixPointerEvent('pointerup'), this);
+		}
+		if ( !this.options.disableMouse ) {
+			utils.addEvent(this.indicator, 'mousedown', this);
+			utils.addEvent(window, 'mouseup', this);
+		}
+	}
+
+	if ( this.options.fade ) {
+		this.wrapperStyle[utils.style.transform] = this.scroller.translateZ;
+		this.wrapperStyle[utils.style.transitionDuration] = utils.isBadAndroid ? '0.001s' : '0ms';
+		this.wrapperStyle.opacity = '0';
+	}
+}
+
+Indicator.prototype = {
+	handleEvent: function (e) {
+		switch ( e.type ) {
+			case 'touchstart':
+			case 'pointerdown':
+			case 'MSPointerDown':
+			case 'mousedown':
+				this._start(e);
+				break;
+			case 'touchmove':
+			case 'pointermove':
+			case 'MSPointerMove':
+			case 'mousemove':
+				this._move(e);
+				break;
+			case 'touchend':
+			case 'pointerup':
+			case 'MSPointerUp':
+			case 'mouseup':
+			case 'touchcancel':
+			case 'pointercancel':
+			case 'MSPointerCancel':
+			case 'mousecancel':
+				this._end(e);
+				break;
+		}
+	},
+
+	destroy: function () {
+		if ( this.options.interactive ) {
+			utils.removeEvent(this.indicator, 'touchstart', this);
+			utils.removeEvent(this.indicator, utils.prefixPointerEvent('pointerdown'), this);
+			utils.removeEvent(this.indicator, 'mousedown', this);
+
+			utils.removeEvent(window, 'touchmove', this);
+			utils.removeEvent(window, utils.prefixPointerEvent('pointermove'), this);
+			utils.removeEvent(window, 'mousemove', this);
+
+			utils.removeEvent(window, 'touchend', this);
+			utils.removeEvent(window, utils.prefixPointerEvent('pointerup'), this);
+			utils.removeEvent(window, 'mouseup', this);
+		}
+
+		if ( this.options.defaultScrollbars ) {
+			this.wrapper.parentNode.removeChild(this.wrapper);
+		}
+	},
+
+	_start: function (e) {
+		var point = e.touches ? e.touches[0] : e;
+
+		e.preventDefault();
+		e.stopPropagation();
+
+		this.transitionTime();
+
+		this.initiated = true;
+		this.moved = false;
+		this.lastPointX	= point.pageX;
+		this.lastPointY	= point.pageY;
+
+		this.startTime	= utils.getTime();
+
+		if ( !this.options.disableTouch ) {
+			utils.addEvent(window, 'touchmove', this);
+		}
+		if ( !this.options.disablePointer ) {
+			utils.addEvent(window, utils.prefixPointerEvent('pointermove'), this);
+		}
+		if ( !this.options.disableMouse ) {
+			utils.addEvent(window, 'mousemove', this);
+		}
+
+		this.scroller._execEvent('beforeScrollStart');
+	},
+
+	_move: function (e) {
+		var point = e.touches ? e.touches[0] : e,
+			deltaX, deltaY,
+			newX, newY,
+			timestamp = utils.getTime();
+
+		if ( !this.moved ) {
+			this.scroller._execEvent('scrollStart');
+		}
+
+		this.moved = true;
+
+		deltaX = point.pageX - this.lastPointX;
+		this.lastPointX = point.pageX;
+
+		deltaY = point.pageY - this.lastPointY;
+		this.lastPointY = point.pageY;
+
+		newX = this.x + deltaX;
+		newY = this.y + deltaY;
+
+		this._pos(newX, newY);
+
+// INSERT POINT: indicator._move
+
+		e.preventDefault();
+		e.stopPropagation();
+	},
+
+	_end: function (e) {
+		if ( !this.initiated ) {
+			return;
+		}
+
+		this.initiated = false;
+
+		e.preventDefault();
+		e.stopPropagation();
+
+		utils.removeEvent(window, 'touchmove', this);
+		utils.removeEvent(window, utils.prefixPointerEvent('pointermove'), this);
+		utils.removeEvent(window, 'mousemove', this);
+
+		if ( this.scroller.options.snap ) {
+			var snap = this.scroller._nearestSnap(this.scroller.x, this.scroller.y);
+
+			var time = this.options.snapSpeed || Math.max(
+					Math.max(
+						Math.min(Math.abs(this.scroller.x - snap.x), 1000),
+						Math.min(Math.abs(this.scroller.y - snap.y), 1000)
+					), 300);
+
+			if ( this.scroller.x != snap.x || this.scroller.y != snap.y ) {
+				this.scroller.directionX = 0;
+				this.scroller.directionY = 0;
+				this.scroller.currentPage = snap;
+				this.scroller.scrollTo(snap.x, snap.y, time, this.scroller.options.bounceEasing);
+			}
+		}
+
+		if ( this.moved ) {
+			this.scroller._execEvent('scrollEnd');
+		}
+	},
+
+	transitionTime: function (time) {
+		time = time || 0;
+		this.indicatorStyle[utils.style.transitionDuration] = time + 'ms';
+
+		if ( !time && utils.isBadAndroid ) {
+			this.indicatorStyle[utils.style.transitionDuration] = '0.001s';
+		}
+	},
+
+	transitionTimingFunction: function (easing) {
+		this.indicatorStyle[utils.style.transitionTimingFunction] = easing;
+	},
+
+	refresh: function () {
+		this.transitionTime();
+
+		if ( this.options.listenX && !this.options.listenY ) {
+			this.indicatorStyle.display = this.scroller.hasHorizontalScroll ? 'block' : 'none';
+		} else if ( this.options.listenY && !this.options.listenX ) {
+			this.indicatorStyle.display = this.scroller.hasVerticalScroll ? 'block' : 'none';
+		} else {
+			this.indicatorStyle.display = this.scroller.hasHorizontalScroll || this.scroller.hasVerticalScroll ? 'block' : 'none';
+		}
+
+		if ( this.scroller.hasHorizontalScroll && this.scroller.hasVerticalScroll ) {
+			utils.addClass(this.wrapper, 'iScrollBothScrollbars');
+			utils.removeClass(this.wrapper, 'iScrollLoneScrollbar');
+
+			if ( this.options.defaultScrollbars && this.options.customStyle ) {
+				if ( this.options.listenX ) {
+					this.wrapper.style.right = '8px';
+				} else {
+					this.wrapper.style.bottom = '8px';
+				}
+			}
+		} else {
+			utils.removeClass(this.wrapper, 'iScrollBothScrollbars');
+			utils.addClass(this.wrapper, 'iScrollLoneScrollbar');
+
+			if ( this.options.defaultScrollbars && this.options.customStyle ) {
+				if ( this.options.listenX ) {
+					this.wrapper.style.right = '2px';
+				} else {
+					this.wrapper.style.bottom = '2px';
+				}
+			}
+		}
+
+		var r = this.wrapper.offsetHeight;	// force refresh
+
+		if ( this.options.listenX ) {
+			this.wrapperWidth = this.wrapper.clientWidth;
+			if ( this.options.resize ) {
+				this.indicatorWidth = Math.max(Math.round(this.wrapperWidth * this.wrapperWidth / (this.scroller.scrollerWidth || this.wrapperWidth || 1)), 8);
+				this.indicatorStyle.width = this.indicatorWidth + 'px';
+			} else {
+				this.indicatorWidth = this.indicator.clientWidth;
+			}
+
+			this.maxPosX = this.wrapperWidth - this.indicatorWidth;
+
+			if ( this.options.shrink == 'clip' ) {
+				this.minBoundaryX = -this.indicatorWidth + 8;
+				this.maxBoundaryX = this.wrapperWidth - 8;
+			} else {
+				this.minBoundaryX = 0;
+				this.maxBoundaryX = this.maxPosX;
+			}
+
+			this.sizeRatioX = this.options.speedRatioX || (this.scroller.maxScrollX && (this.maxPosX / this.scroller.maxScrollX));	
+		}
+
+		if ( this.options.listenY ) {
+			this.wrapperHeight = this.wrapper.clientHeight;
+			if ( this.options.resize ) {
+				this.indicatorHeight = Math.max(Math.round(this.wrapperHeight * this.wrapperHeight / (this.scroller.scrollerHeight || this.wrapperHeight || 1)), 8);
+				this.indicatorStyle.height = this.indicatorHeight + 'px';
+			} else {
+				this.indicatorHeight = this.indicator.clientHeight;
+			}
+
+			this.maxPosY = this.wrapperHeight - this.indicatorHeight;
+
+			if ( this.options.shrink == 'clip' ) {
+				this.minBoundaryY = -this.indicatorHeight + 8;
+				this.maxBoundaryY = this.wrapperHeight - 8;
+			} else {
+				this.minBoundaryY = 0;
+				this.maxBoundaryY = this.maxPosY;
+			}
+
+			this.maxPosY = this.wrapperHeight - this.indicatorHeight;
+			this.sizeRatioY = this.options.speedRatioY || (this.scroller.maxScrollY && (this.maxPosY / this.scroller.maxScrollY));
+		}
+
+		this.updatePosition();
+	},
+
+	updatePosition: function () {
+		var x = this.options.listenX && Math.round(this.sizeRatioX * this.scroller.x) || 0,
+			y = this.options.listenY && Math.round(this.sizeRatioY * this.scroller.y) || 0;
+
+		if ( !this.options.ignoreBoundaries ) {
+			if ( x < this.minBoundaryX ) {
+				if ( this.options.shrink == 'scale' ) {
+					this.width = Math.max(this.indicatorWidth + x, 8);
+					this.indicatorStyle.width = this.width + 'px';
+				}
+				x = this.minBoundaryX;
+			} else if ( x > this.maxBoundaryX ) {
+				if ( this.options.shrink == 'scale' ) {
+					this.width = Math.max(this.indicatorWidth - (x - this.maxPosX), 8);
+					this.indicatorStyle.width = this.width + 'px';
+					x = this.maxPosX + this.indicatorWidth - this.width;
+				} else {
+					x = this.maxBoundaryX;
+				}
+			} else if ( this.options.shrink == 'scale' && this.width != this.indicatorWidth ) {
+				this.width = this.indicatorWidth;
+				this.indicatorStyle.width = this.width + 'px';
+			}
+
+			if ( y < this.minBoundaryY ) {
+				if ( this.options.shrink == 'scale' ) {
+					this.height = Math.max(this.indicatorHeight + y * 3, 8);
+					this.indicatorStyle.height = this.height + 'px';
+				}
+				y = this.minBoundaryY;
+			} else if ( y > this.maxBoundaryY ) {
+				if ( this.options.shrink == 'scale' ) {
+					this.height = Math.max(this.indicatorHeight - (y - this.maxPosY) * 3, 8);
+					this.indicatorStyle.height = this.height + 'px';
+					y = this.maxPosY + this.indicatorHeight - this.height;
+				} else {
+					y = this.maxBoundaryY;
+				}
+			} else if ( this.options.shrink == 'scale' && this.height != this.indicatorHeight ) {
+				this.height = this.indicatorHeight;
+				this.indicatorStyle.height = this.height + 'px';
+			}
+		}
+
+		this.x = x;
+		this.y = y;
+
+		if ( this.scroller.options.useTransform ) {
+			this.indicatorStyle[utils.style.transform] = 'translate(' + x + 'px,' + y + 'px)' + this.scroller.translateZ;
+		} else {
+			this.indicatorStyle.left = x + 'px';
+			this.indicatorStyle.top = y + 'px';
+		}
+	},
+
+	_pos: function (x, y) {
+		if ( x < 0 ) {
+			x = 0;
+		} else if ( x > this.maxPosX ) {
+			x = this.maxPosX;
+		}
+
+		if ( y < 0 ) {
+			y = 0;
+		} else if ( y > this.maxPosY ) {
+			y = this.maxPosY;
+		}
+
+		x = this.options.listenX ? Math.round(x / this.sizeRatioX) : this.scroller.x;
+		y = this.options.listenY ? Math.round(y / this.sizeRatioY) : this.scroller.y;
+
+		this.scroller.scrollTo(x, y);
+	},
+
+	fade: function (val, hold) {
+		if ( hold && !this.visible ) {
+			return;
+		}
+
+		clearTimeout(this.fadeTimeout);
+		this.fadeTimeout = null;
+
+		var time = val ? 250 : 500,
+			delay = val ? 0 : 300;
+
+		val = val ? '1' : '0';
+
+		this.wrapperStyle[utils.style.transitionDuration] = time + 'ms';
+
+		this.fadeTimeout = setTimeout((function (val) {
+			this.wrapperStyle.opacity = val;
+			this.visible = +val;
+		}).bind(this, val), delay);
+	}
+};
+
+IScroll.utils = utils;
+
+if ( typeof module != 'undefined' && module.exports ) {
+	module.exports = IScroll;
+} else {
+	window.IScroll = IScroll;
+}
+
+})(window, document, Math);
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/jquery-weui.min.js b/pluss-wap-page/src/main/resources/static/resources/js/jquery-weui.min.js
new file mode 100644
index 0000000..fbced60
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/jquery-weui.min.js
@@ -0,0 +1,6450 @@
+/** 
+* jQuery WeUI V1.2.1 
+* By 言川
+* http://lihongxun945.github.io/jquery-weui/
+ */
+/* global $:true */
+/* global WebKitCSSMatrix:true */
+
+(function($) {
+  "use strict";
+
+  $.fn.transitionEnd = function(callback) {
+    var events = ['webkitTransitionEnd', 'transitionend', 'oTransitionEnd', 'MSTransitionEnd', 'msTransitionEnd'],
+      i, dom = this;
+
+    function fireCallBack(e) {
+      /*jshint validthis:true */
+      if (e.target !== this) return;
+      callback.call(this, e);
+      for (i = 0; i < events.length; i++) {
+        dom.off(events[i], fireCallBack);
+      }
+    }
+    if (callback) {
+      for (i = 0; i < events.length; i++) {
+        dom.on(events[i], fireCallBack);
+      }
+    }
+    return this;
+  };
+
+  $.support = (function() {
+    var support = {
+      touch: !!(('ontouchstart' in window) || window.DocumentTouch && document instanceof window.DocumentTouch)
+    };
+    return support;
+  })();
+
+  $.touchEvents = {
+    start: $.support.touch ? 'touchstart' : 'mousedown',
+    move: $.support.touch ? 'touchmove' : 'mousemove',
+    end: $.support.touch ? 'touchend' : 'mouseup'
+  };
+
+  $.getTouchPosition = function(e) {
+    e = e.originalEvent || e; //jquery wrap the originevent
+    if(e.type === 'touchstart' || e.type === 'touchmove' || e.type === 'touchend') {
+      return {
+        x: e.targetTouches[0].pageX,
+        y: e.targetTouches[0].pageY
+      };
+    } else {
+      return {
+        x: e.pageX,
+        y: e.pageY
+      };
+    }
+  };
+
+  $.fn.scrollHeight = function() {
+    return this[0].scrollHeight;
+  };
+
+  $.fn.transform = function(transform) {
+    for (var i = 0; i < this.length; i++) {
+      var elStyle = this[i].style;
+      elStyle.webkitTransform = elStyle.MsTransform = elStyle.msTransform = elStyle.MozTransform = elStyle.OTransform = elStyle.transform = transform;
+    }
+    return this;
+  };
+  $.fn.transition = function(duration) {
+    if (typeof duration !== 'string') {
+      duration = duration + 'ms';
+    }
+    for (var i = 0; i < this.length; i++) {
+      var elStyle = this[i].style;
+      elStyle.webkitTransitionDuration = elStyle.MsTransitionDuration = elStyle.msTransitionDuration = elStyle.MozTransitionDuration = elStyle.OTransitionDuration = elStyle.transitionDuration = duration;
+    }
+    return this;
+  };
+
+  $.getTranslate = function (el, axis) {
+    var matrix, curTransform, curStyle, transformMatrix;
+
+    // automatic axis detection
+    if (typeof axis === 'undefined') {
+      axis = 'x';
+    }
+
+    curStyle = window.getComputedStyle(el, null);
+    if (window.WebKitCSSMatrix) {
+      // Some old versions of Webkit choke when 'none' is passed; pass
+      // empty string instead in this case
+      transformMatrix = new WebKitCSSMatrix(curStyle.webkitTransform === 'none' ? '' : curStyle.webkitTransform);
+    }
+    else {
+      transformMatrix = curStyle.MozTransform || curStyle.OTransform || curStyle.MsTransform || curStyle.msTransform  || curStyle.transform || curStyle.getPropertyValue('transform').replace('translate(', 'matrix(1, 0, 0, 1,');
+      matrix = transformMatrix.toString().split(',');
+    }
+
+    if (axis === 'x') {
+      //Latest Chrome and webkits Fix
+      if (window.WebKitCSSMatrix)
+        curTransform = transformMatrix.m41;
+      //Crazy IE10 Matrix
+      else if (matrix.length === 16)
+        curTransform = parseFloat(matrix[12]);
+      //Normal Browsers
+      else
+        curTransform = parseFloat(matrix[4]);
+    }
+    if (axis === 'y') {
+      //Latest Chrome and webkits Fix
+      if (window.WebKitCSSMatrix)
+        curTransform = transformMatrix.m42;
+      //Crazy IE10 Matrix
+      else if (matrix.length === 16)
+        curTransform = parseFloat(matrix[13]);
+      //Normal Browsers
+      else
+        curTransform = parseFloat(matrix[5]);
+    }
+
+    return curTransform || 0;
+  };
+  $.requestAnimationFrame = function (callback) {
+    if (window.requestAnimationFrame) return window.requestAnimationFrame(callback);
+    else if (window.webkitRequestAnimationFrame) return window.webkitRequestAnimationFrame(callback);
+    else if (window.mozRequestAnimationFrame) return window.mozRequestAnimationFrame(callback);
+    else {
+      return window.setTimeout(callback, 1000 / 60);
+    }
+  };
+
+  $.cancelAnimationFrame = function (id) {
+    if (window.cancelAnimationFrame) return window.cancelAnimationFrame(id);
+    else if (window.webkitCancelAnimationFrame) return window.webkitCancelAnimationFrame(id);
+    else if (window.mozCancelAnimationFrame) return window.mozCancelAnimationFrame(id);
+    else {
+      return window.clearTimeout(id);
+    }  
+  };
+
+  $.fn.join = function(arg) {
+    return this.toArray().join(arg);
+  }
+})($);
+
+/*===========================
+  Template7 Template engine
+  ===========================*/
+/* global $:true */
+/* jshint unused:false */
+/* jshint forin:false */
++function ($) {
+  "use strict";
+  $.Template7 = $.t7 = (function () {
+    function isArray(arr) {
+      return Object.prototype.toString.apply(arr) === '[object Array]';
+    }
+    function isObject(obj) {
+      return obj instanceof Object;
+    }
+    function isFunction(func) {
+      return typeof func === 'function';
+    }
+    var cache = {};
+    function helperToSlices(string) {
+      var helperParts = string.replace(/[{}#}]/g, '').split(' ');
+      var slices = [];
+      var shiftIndex, i, j;
+      for (i = 0; i < helperParts.length; i++) {
+        var part = helperParts[i];
+        if (i === 0) slices.push(part);
+        else {
+          if (part.indexOf('"') === 0) {
+            // Plain String
+            if (part.match(/"/g).length === 2) {
+              // One word string
+              slices.push(part);
+            }
+            else {
+              // Find closed Index
+              shiftIndex = 0;
+              for (j = i + 1; j < helperParts.length; j++) {
+                part += ' ' + helperParts[j];
+                if (helperParts[j].indexOf('"') >= 0) {
+                  shiftIndex = j;
+                  slices.push(part);
+                  break;
+                }
+              }
+              if (shiftIndex) i = shiftIndex;
+            }
+          }
+          else {
+            if (part.indexOf('=') > 0) {
+              // Hash
+              var hashParts = part.split('=');
+              var hashName = hashParts[0];
+              var hashContent = hashParts[1];
+              if (hashContent.match(/"/g).length !== 2) {
+                shiftIndex = 0;
+                for (j = i + 1; j < helperParts.length; j++) {
+                  hashContent += ' ' + helperParts[j];
+                  if (helperParts[j].indexOf('"') >= 0) {
+                    shiftIndex = j;
+                    break;
+                  }
+                }
+                if (shiftIndex) i = shiftIndex;
+              }
+              var hash = [hashName, hashContent.replace(/"/g,'')];
+              slices.push(hash);
+            }
+            else {
+              // Plain variable
+              slices.push(part);
+            }
+          }
+        }
+      }
+      return slices;
+    }
+    function stringToBlocks(string) {
+      var blocks = [], i, j, k;
+      if (!string) return [];
+      var _blocks = string.split(/({{[^{^}]*}})/);
+      for (i = 0; i < _blocks.length; i++) {
+        var block = _blocks[i];
+        if (block === '') continue;
+        if (block.indexOf('{{') < 0) {
+          blocks.push({
+            type: 'plain',
+            content: block
+          });
+        }
+        else {
+          if (block.indexOf('{/') >= 0) {
+            continue;
+          }
+          if (block.indexOf('{#') < 0 && block.indexOf(' ') < 0 && block.indexOf('else') < 0) {
+            // Simple variable
+            blocks.push({
+              type: 'variable',
+              contextName: block.replace(/[{}]/g, '')
+            });
+            continue;
+          }
+          // Helpers
+          var helperSlices = helperToSlices(block);
+          var helperName = helperSlices[0];
+          var helperContext = [];
+          var helperHash = {};
+          for (j = 1; j < helperSlices.length; j++) {
+            var slice = helperSlices[j];
+            if (isArray(slice)) {
+              // Hash
+              helperHash[slice[0]] = slice[1] === 'false' ? false : slice[1];
+            }
+            else {
+              helperContext.push(slice);
+            }
+          }
+
+          if (block.indexOf('{#') >= 0) {
+            // Condition/Helper
+            var helperStartIndex = i;
+            var helperContent = '';
+            var elseContent = '';
+            var toSkip = 0;
+            var shiftIndex;
+            var foundClosed = false, foundElse = false, foundClosedElse = false, depth = 0;
+            for (j = i + 1; j < _blocks.length; j++) {
+              if (_blocks[j].indexOf('{{#') >= 0) {
+                depth ++;
+              }
+              if (_blocks[j].indexOf('{{/') >= 0) {
+                depth --;
+              }
+              if (_blocks[j].indexOf('{{#' + helperName) >= 0) {
+                helperContent += _blocks[j];
+                if (foundElse) elseContent += _blocks[j];
+                toSkip ++;
+              }
+              else if (_blocks[j].indexOf('{{/' + helperName) >= 0) {
+                if (toSkip > 0) {
+                  toSkip--;
+                  helperContent += _blocks[j];
+                  if (foundElse) elseContent += _blocks[j];
+                }
+                else {
+                  shiftIndex = j;
+                  foundClosed = true;
+                  break;
+                }
+              }
+              else if (_blocks[j].indexOf('else') >= 0 && depth === 0) {
+                foundElse = true;
+              }
+              else {
+                if (!foundElse) helperContent += _blocks[j];
+                if (foundElse) elseContent += _blocks[j];
+              }
+
+            }
+            if (foundClosed) {
+              if (shiftIndex) i = shiftIndex;
+              blocks.push({
+                type: 'helper',
+                helperName: helperName,
+                contextName: helperContext,
+                content: helperContent,
+                inverseContent: elseContent,
+                hash: helperHash
+              });
+            }
+          }
+          else if (block.indexOf(' ') > 0) {
+            blocks.push({
+              type: 'helper',
+              helperName: helperName,
+              contextName: helperContext,
+              hash: helperHash
+            });
+          }
+        }
+      }
+      return blocks;
+    }
+    var Template7 = function (template) {
+      var t = this;
+      t.template = template;
+
+      function getCompileFn(block, depth) {
+        if (block.content) return compile(block.content, depth);
+        else return function () {return ''; };
+      }
+      function getCompileInverse(block, depth) {
+        if (block.inverseContent) return compile(block.inverseContent, depth);
+        else return function () {return ''; };
+      }
+      function getCompileVar(name, ctx) {
+        var variable, parts, levelsUp = 0, initialCtx = ctx;
+        if (name.indexOf('../') === 0) {
+          levelsUp = name.split('../').length - 1;
+          var newDepth = ctx.split('_')[1] - levelsUp;
+          ctx = 'ctx_' + (newDepth >= 1 ? newDepth : 1);
+          parts = name.split('../')[levelsUp].split('.');
+        }
+        else if (name.indexOf('@global') === 0) {
+          ctx = '$.Template7.global';
+          parts = name.split('@global.')[1].split('.');
+        }
+        else if (name.indexOf('@root') === 0) {
+          ctx = 'ctx_1';
+          parts = name.split('@root.')[1].split('.');
+        }
+        else {
+          parts = name.split('.');
+        }
+        variable = ctx;
+        for (var i = 0; i < parts.length; i++) {
+          var part = parts[i];
+          if (part.indexOf('@') === 0) {
+            if (i > 0) {
+              variable += '[(data && data.' + part.replace('@', '') + ')]';
+            }
+            else {
+              variable = '(data && data.' + name.replace('@', '') + ')';
+            }
+          }
+          else {
+            if (isFinite(part)) {
+              variable += '[' + part + ']';
+            }
+            else {
+              if (part.indexOf('this') === 0) {
+                variable = part.replace('this', ctx);
+              }
+              else {
+                variable += '.' + part;       
+              }
+            }
+          }
+        }
+
+        return variable;
+      }
+      function getCompiledArguments(contextArray, ctx) {
+        var arr = [];
+        for (var i = 0; i < contextArray.length; i++) {
+          if (contextArray[i].indexOf('"') === 0) arr.push(contextArray[i]);
+          else {
+            arr.push(getCompileVar(contextArray[i], ctx));
+          }
+        }
+        return arr.join(', ');
+      }
+      function compile(template, depth) {
+        depth = depth || 1;
+        template = template || t.template;
+        if (typeof template !== 'string') {
+          throw new Error('Template7: Template must be a string');
+        }
+        var blocks = stringToBlocks(template);
+        if (blocks.length === 0) {
+          return function () { return ''; };
+        }
+        var ctx = 'ctx_' + depth;
+        var resultString = '(function (' + ctx + ', data) {\n';
+        if (depth === 1) {
+          resultString += 'function isArray(arr){return Object.prototype.toString.apply(arr) === \'[object Array]\';}\n';
+          resultString += 'function isFunction(func){return (typeof func === \'function\');}\n';
+          resultString += 'function c(val, ctx) {if (typeof val !== "undefined") {if (isFunction(val)) {return val.call(ctx);} else return val;} else return "";}\n';
+        }
+        resultString += 'var r = \'\';\n';
+        var i, j, context;
+        for (i = 0; i < blocks.length; i++) {
+          var block = blocks[i];
+          // Plain block
+          if (block.type === 'plain') {
+            resultString += 'r +=\'' + (block.content).replace(/\r/g, '\\r').replace(/\n/g, '\\n').replace(/'/g, '\\' + '\'') + '\';';
+            continue;
+          }
+          var variable, compiledArguments;
+          // Variable block
+          if (block.type === 'variable') {
+            variable = getCompileVar(block.contextName, ctx);
+            resultString += 'r += c(' + variable + ', ' + ctx + ');';
+          }
+          // Helpers block
+          if (block.type === 'helper') {
+            if (block.helperName in t.helpers) {
+              compiledArguments = getCompiledArguments(block.contextName, ctx);
+              resultString += 'r += ($.Template7.helpers.' + block.helperName + ').call(' + ctx + ', ' + (compiledArguments && (compiledArguments + ', ')) +'{hash:' + JSON.stringify(block.hash) + ', data: data || {}, fn: ' + getCompileFn(block, depth+1) + ', inverse: ' + getCompileInverse(block, depth+1) + ', root: ctx_1});';
+            }
+            else {
+              if (block.contextName.length > 0) {
+                throw new Error('Template7: Missing helper: "' + block.helperName + '"');
+              }
+              else {
+                variable = getCompileVar(block.helperName, ctx);
+                resultString += 'if (' + variable + ') {';
+                resultString += 'if (isArray(' + variable + ')) {';
+                resultString += 'r += ($.Template7.helpers.each).call(' + ctx + ', ' + variable + ', {hash:' + JSON.stringify(block.hash) + ', data: data || {}, fn: ' + getCompileFn(block, depth+1) + ', inverse: ' + getCompileInverse(block, depth+1) + ', root: ctx_1});';
+                resultString += '}else {';
+                resultString += 'r += ($.Template7.helpers.with).call(' + ctx + ', ' + variable + ', {hash:' + JSON.stringify(block.hash) + ', data: data || {}, fn: ' + getCompileFn(block, depth+1) + ', inverse: ' + getCompileInverse(block, depth+1) + ', root: ctx_1});';
+                resultString += '}}';
+              }
+            }
+          }
+        }
+        resultString += '\nreturn r;})';
+        return eval.call(window, resultString);
+      }
+      t.compile = function (template) {
+        if (!t.compiled) {
+          t.compiled = compile(template);
+        }
+        return t.compiled;
+      };
+    };
+    Template7.prototype = {
+      options: {},
+      helpers: {
+        'if': function (context, options) {
+          if (isFunction(context)) { context = context.call(this); }
+          if (context) {
+            return options.fn(this, options.data);
+          }
+          else {
+            return options.inverse(this, options.data);
+          }
+        },
+        'unless': function (context, options) {
+          if (isFunction(context)) { context = context.call(this); }
+          if (!context) {
+            return options.fn(this, options.data);
+          }
+          else {
+            return options.inverse(this, options.data);
+          }
+        },
+        'each': function (context, options) {
+          var ret = '', i = 0;
+          if (isFunction(context)) { context = context.call(this); }
+          if (isArray(context)) {
+            if (options.hash.reverse) {
+              context = context.reverse();
+            }
+            for (i = 0; i < context.length; i++) {
+              ret += options.fn(context[i], {first: i === 0, last: i === context.length - 1, index: i});
+            }
+            if (options.hash.reverse) {
+              context = context.reverse();
+            }
+          }
+          else {
+            for (var key in context) {
+              i++;
+              ret += options.fn(context[key], {key: key});
+            }
+          }
+          if (i > 0) return ret;
+          else return options.inverse(this);
+        },
+        'with': function (context, options) {
+          if (isFunction(context)) { context = context.call(this); }
+          return options.fn(context);
+        },
+        'join': function (context, options) {
+          if (isFunction(context)) { context = context.call(this); }
+          return context.join(options.hash.delimiter || options.hash.delimeter);
+        },
+        'js': function (expression, options) {
+          var func;
+          if (expression.indexOf('return')>=0) {
+            func = '(function(){'+expression+'})';
+          }
+          else {
+            func = '(function(){return ('+expression+')})';
+          }
+          return eval.call(this, func).call(this);
+        },
+        'js_compare': function (expression, options) {
+          var func;
+          if (expression.indexOf('return')>=0) {
+            func = '(function(){'+expression+'})';
+          }
+          else {
+            func = '(function(){return ('+expression+')})';
+          }
+          var condition = eval.call(this, func).call(this);
+          if (condition) {
+            return options.fn(this, options.data);
+          }
+          else {
+            return options.inverse(this, options.data);   
+          }
+        }
+      }
+    };
+    var t7 = function (template, data) {
+      if (arguments.length === 2) {
+        var instance = new Template7(template);
+        var rendered = instance.compile()(data);
+        instance = null;
+        return (rendered);
+      }
+      else return new Template7(template);
+    };
+    t7.registerHelper = function (name, fn) {
+      Template7.prototype.helpers[name] = fn;
+    };
+    t7.unregisterHelper = function (name) {
+      Template7.prototype.helpers[name] = undefined;  
+      delete Template7.prototype.helpers[name];
+    };
+
+    t7.compile = function (template, options) {
+      var instance = new Template7(template, options);
+      return instance.compile();
+    };
+
+    t7.options = Template7.prototype.options;
+    t7.helpers = Template7.prototype.helpers;
+    return t7;
+  })();
+}($);
+
+/*! Hammer.JS - v2.0.8 - 2016-04-23
+ * http://hammerjs.github.io/
+ *
+ * Copyright (c) 2016 Jorik Tangelder;
+ * Licensed under the MIT license */
+(function(window, document, exportName, undefined) {
+  'use strict';
+
+var VENDOR_PREFIXES = ['', 'webkit', 'Moz', 'MS', 'ms', 'o'];
+var TEST_ELEMENT = document.createElement('div');
+
+var TYPE_FUNCTION = 'function';
+
+var round = Math.round;
+var abs = Math.abs;
+var now = Date.now;
+
+/**
+ * set a timeout with a given scope
+ * @param {Function} fn
+ * @param {Number} timeout
+ * @param {Object} context
+ * @returns {number}
+ */
+function setTimeoutContext(fn, timeout, context) {
+    return setTimeout(bindFn(fn, context), timeout);
+}
+
+/**
+ * if the argument is an array, we want to execute the fn on each entry
+ * if it aint an array we don't want to do a thing.
+ * this is used by all the methods that accept a single and array argument.
+ * @param {*|Array} arg
+ * @param {String} fn
+ * @param {Object} [context]
+ * @returns {Boolean}
+ */
+function invokeArrayArg(arg, fn, context) {
+    if (Array.isArray(arg)) {
+        each(arg, context[fn], context);
+        return true;
+    }
+    return false;
+}
+
+/**
+ * walk objects and arrays
+ * @param {Object} obj
+ * @param {Function} iterator
+ * @param {Object} context
+ */
+function each(obj, iterator, context) {
+    var i;
+
+    if (!obj) {
+        return;
+    }
+
+    if (obj.forEach) {
+        obj.forEach(iterator, context);
+    } else if (obj.length !== undefined) {
+        i = 0;
+        while (i < obj.length) {
+            iterator.call(context, obj[i], i, obj);
+            i++;
+        }
+    } else {
+        for (i in obj) {
+            obj.hasOwnProperty(i) && iterator.call(context, obj[i], i, obj);
+        }
+    }
+}
+
+/**
+ * wrap a method with a deprecation warning and stack trace
+ * @param {Function} method
+ * @param {String} name
+ * @param {String} message
+ * @returns {Function} A new function wrapping the supplied method.
+ */
+function deprecate(method, name, message) {
+    var deprecationMessage = 'DEPRECATED METHOD: ' + name + '\n' + message + ' AT \n';
+    return function() {
+        var e = new Error('get-stack-trace');
+        var stack = e && e.stack ? e.stack.replace(/^[^\(]+?[\n$]/gm, '')
+            .replace(/^\s+at\s+/gm, '')
+            .replace(/^Object.<anonymous>\s*\(/gm, '{anonymous}()@') : 'Unknown Stack Trace';
+
+        var log = window.console && (window.console.warn || window.console.log);
+        if (log) {
+            log.call(window.console, deprecationMessage, stack);
+        }
+        return method.apply(this, arguments);
+    };
+}
+
+/**
+ * extend object.
+ * means that properties in dest will be overwritten by the ones in src.
+ * @param {Object} target
+ * @param {...Object} objects_to_assign
+ * @returns {Object} target
+ */
+var assign;
+if (typeof Object.assign !== 'function') {
+    assign = function assign(target) {
+        if (target === undefined || target === null) {
+            throw new TypeError('Cannot convert undefined or null to object');
+        }
+
+        var output = Object(target);
+        for (var index = 1; index < arguments.length; index++) {
+            var source = arguments[index];
+            if (source !== undefined && source !== null) {
+                for (var nextKey in source) {
+                    if (source.hasOwnProperty(nextKey)) {
+                        output[nextKey] = source[nextKey];
+                    }
+                }
+            }
+        }
+        return output;
+    };
+} else {
+    assign = Object.assign;
+}
+
+/**
+ * extend object.
+ * means that properties in dest will be overwritten by the ones in src.
+ * @param {Object} dest
+ * @param {Object} src
+ * @param {Boolean} [merge=false]
+ * @returns {Object} dest
+ */
+var extend = deprecate(function extend(dest, src, merge) {
+    var keys = Object.keys(src);
+    var i = 0;
+    while (i < keys.length) {
+        if (!merge || (merge && dest[keys[i]] === undefined)) {
+            dest[keys[i]] = src[keys[i]];
+        }
+        i++;
+    }
+    return dest;
+}, 'extend', 'Use `assign`.');
+
+/**
+ * merge the values from src in the dest.
+ * means that properties that exist in dest will not be overwritten by src
+ * @param {Object} dest
+ * @param {Object} src
+ * @returns {Object} dest
+ */
+var merge = deprecate(function merge(dest, src) {
+    return extend(dest, src, true);
+}, 'merge', 'Use `assign`.');
+
+/**
+ * simple class inheritance
+ * @param {Function} child
+ * @param {Function} base
+ * @param {Object} [properties]
+ */
+function inherit(child, base, properties) {
+    var baseP = base.prototype,
+        childP;
+
+    childP = child.prototype = Object.create(baseP);
+    childP.constructor = child;
+    childP._super = baseP;
+
+    if (properties) {
+        assign(childP, properties);
+    }
+}
+
+/**
+ * simple function bind
+ * @param {Function} fn
+ * @param {Object} context
+ * @returns {Function}
+ */
+function bindFn(fn, context) {
+    return function boundFn() {
+        return fn.apply(context, arguments);
+    };
+}
+
+/**
+ * let a boolean value also be a function that must return a boolean
+ * this first item in args will be used as the context
+ * @param {Boolean|Function} val
+ * @param {Array} [args]
+ * @returns {Boolean}
+ */
+function boolOrFn(val, args) {
+    if (typeof val == TYPE_FUNCTION) {
+        return val.apply(args ? args[0] || undefined : undefined, args);
+    }
+    return val;
+}
+
+/**
+ * use the val2 when val1 is undefined
+ * @param {*} val1
+ * @param {*} val2
+ * @returns {*}
+ */
+function ifUndefined(val1, val2) {
+    return (val1 === undefined) ? val2 : val1;
+}
+
+/**
+ * addEventListener with multiple events at once
+ * @param {EventTarget} target
+ * @param {String} types
+ * @param {Function} handler
+ */
+function addEventListeners(target, types, handler) {
+    each(splitStr(types), function(type) {
+        target.addEventListener(type, handler, false);
+    });
+}
+
+/**
+ * removeEventListener with multiple events at once
+ * @param {EventTarget} target
+ * @param {String} types
+ * @param {Function} handler
+ */
+function removeEventListeners(target, types, handler) {
+    each(splitStr(types), function(type) {
+        target.removeEventListener(type, handler, false);
+    });
+}
+
+/**
+ * find if a node is in the given parent
+ * @method hasParent
+ * @param {HTMLElement} node
+ * @param {HTMLElement} parent
+ * @return {Boolean} found
+ */
+function hasParent(node, parent) {
+    while (node) {
+        if (node == parent) {
+            return true;
+        }
+        node = node.parentNode;
+    }
+    return false;
+}
+
+/**
+ * small indexOf wrapper
+ * @param {String} str
+ * @param {String} find
+ * @returns {Boolean} found
+ */
+function inStr(str, find) {
+    return str.indexOf(find) > -1;
+}
+
+/**
+ * split string on whitespace
+ * @param {String} str
+ * @returns {Array} words
+ */
+function splitStr(str) {
+    return str.trim().split(/\s+/g);
+}
+
+/**
+ * find if a array contains the object using indexOf or a simple polyFill
+ * @param {Array} src
+ * @param {String} find
+ * @param {String} [findByKey]
+ * @return {Boolean|Number} false when not found, or the index
+ */
+function inArray(src, find, findByKey) {
+    if (src.indexOf && !findByKey) {
+        return src.indexOf(find);
+    } else {
+        var i = 0;
+        while (i < src.length) {
+            if ((findByKey && src[i][findByKey] == find) || (!findByKey && src[i] === find)) {
+                return i;
+            }
+            i++;
+        }
+        return -1;
+    }
+}
+
+/**
+ * convert array-like objects to real arrays
+ * @param {Object} obj
+ * @returns {Array}
+ */
+function toArray(obj) {
+    return Array.prototype.slice.call(obj, 0);
+}
+
+/**
+ * unique array with objects based on a key (like 'id') or just by the array's value
+ * @param {Array} src [{id:1},{id:2},{id:1}]
+ * @param {String} [key]
+ * @param {Boolean} [sort=False]
+ * @returns {Array} [{id:1},{id:2}]
+ */
+function uniqueArray(src, key, sort) {
+    var results = [];
+    var values = [];
+    var i = 0;
+
+    while (i < src.length) {
+        var val = key ? src[i][key] : src[i];
+        if (inArray(values, val) < 0) {
+            results.push(src[i]);
+        }
+        values[i] = val;
+        i++;
+    }
+
+    if (sort) {
+        if (!key) {
+            results = results.sort();
+        } else {
+            results = results.sort(function sortUniqueArray(a, b) {
+                return a[key] > b[key];
+            });
+        }
+    }
+
+    return results;
+}
+
+/**
+ * get the prefixed property
+ * @param {Object} obj
+ * @param {String} property
+ * @returns {String|Undefined} prefixed
+ */
+function prefixed(obj, property) {
+    var prefix, prop;
+    var camelProp = property[0].toUpperCase() + property.slice(1);
+
+    var i = 0;
+    while (i < VENDOR_PREFIXES.length) {
+        prefix = VENDOR_PREFIXES[i];
+        prop = (prefix) ? prefix + camelProp : property;
+
+        if (prop in obj) {
+            return prop;
+        }
+        i++;
+    }
+    return undefined;
+}
+
+/**
+ * get a unique id
+ * @returns {number} uniqueId
+ */
+var _uniqueId = 1;
+function uniqueId() {
+    return _uniqueId++;
+}
+
+/**
+ * get the window object of an element
+ * @param {HTMLElement} element
+ * @returns {DocumentView|Window}
+ */
+function getWindowForElement(element) {
+    var doc = element.ownerDocument || element;
+    return (doc.defaultView || doc.parentWindow || window);
+}
+
+var MOBILE_REGEX = /mobile|tablet|ip(ad|hone|od)|android/i;
+
+var SUPPORT_TOUCH = ('ontouchstart' in window);
+var SUPPORT_POINTER_EVENTS = prefixed(window, 'PointerEvent') !== undefined;
+var SUPPORT_ONLY_TOUCH = SUPPORT_TOUCH && MOBILE_REGEX.test(navigator.userAgent);
+
+var INPUT_TYPE_TOUCH = 'touch';
+var INPUT_TYPE_PEN = 'pen';
+var INPUT_TYPE_MOUSE = 'mouse';
+var INPUT_TYPE_KINECT = 'kinect';
+
+var COMPUTE_INTERVAL = 25;
+
+var INPUT_START = 1;
+var INPUT_MOVE = 2;
+var INPUT_END = 4;
+var INPUT_CANCEL = 8;
+
+var DIRECTION_NONE = 1;
+var DIRECTION_LEFT = 2;
+var DIRECTION_RIGHT = 4;
+var DIRECTION_UP = 8;
+var DIRECTION_DOWN = 16;
+
+var DIRECTION_HORIZONTAL = DIRECTION_LEFT | DIRECTION_RIGHT;
+var DIRECTION_VERTICAL = DIRECTION_UP | DIRECTION_DOWN;
+var DIRECTION_ALL = DIRECTION_HORIZONTAL | DIRECTION_VERTICAL;
+
+var PROPS_XY = ['x', 'y'];
+var PROPS_CLIENT_XY = ['clientX', 'clientY'];
+
+/**
+ * create new input type manager
+ * @param {Manager} manager
+ * @param {Function} callback
+ * @returns {Input}
+ * @constructor
+ */
+function Input(manager, callback) {
+    var self = this;
+    this.manager = manager;
+    this.callback = callback;
+    this.element = manager.element;
+    this.target = manager.options.inputTarget;
+
+    // smaller wrapper around the handler, for the scope and the enabled state of the manager,
+    // so when disabled the input events are completely bypassed.
+    this.domHandler = function(ev) {
+        if (boolOrFn(manager.options.enable, [manager])) {
+            self.handler(ev);
+        }
+    };
+
+    this.init();
+
+}
+
+Input.prototype = {
+    /**
+     * should handle the inputEvent data and trigger the callback
+     * @virtual
+     */
+    handler: function() { },
+
+    /**
+     * bind the events
+     */
+    init: function() {
+        this.evEl && addEventListeners(this.element, this.evEl, this.domHandler);
+        this.evTarget && addEventListeners(this.target, this.evTarget, this.domHandler);
+        this.evWin && addEventListeners(getWindowForElement(this.element), this.evWin, this.domHandler);
+    },
+
+    /**
+     * unbind the events
+     */
+    destroy: function() {
+        this.evEl && removeEventListeners(this.element, this.evEl, this.domHandler);
+        this.evTarget && removeEventListeners(this.target, this.evTarget, this.domHandler);
+        this.evWin && removeEventListeners(getWindowForElement(this.element), this.evWin, this.domHandler);
+    }
+};
+
+/**
+ * create new input type manager
+ * called by the Manager constructor
+ * @param {Hammer} manager
+ * @returns {Input}
+ */
+function createInputInstance(manager) {
+    var Type;
+    var inputClass = manager.options.inputClass;
+
+    if (inputClass) {
+        Type = inputClass;
+    } else if (SUPPORT_POINTER_EVENTS) {
+        Type = PointerEventInput;
+    } else if (SUPPORT_ONLY_TOUCH) {
+        Type = TouchInput;
+    } else if (!SUPPORT_TOUCH) {
+        Type = MouseInput;
+    } else {
+        Type = TouchMouseInput;
+    }
+    return new (Type)(manager, inputHandler);
+}
+
+/**
+ * handle input events
+ * @param {Manager} manager
+ * @param {String} eventType
+ * @param {Object} input
+ */
+function inputHandler(manager, eventType, input) {
+    var pointersLen = input.pointers.length;
+    var changedPointersLen = input.changedPointers.length;
+    var isFirst = (eventType & INPUT_START && (pointersLen - changedPointersLen === 0));
+    var isFinal = (eventType & (INPUT_END | INPUT_CANCEL) && (pointersLen - changedPointersLen === 0));
+
+    input.isFirst = !!isFirst;
+    input.isFinal = !!isFinal;
+
+    if (isFirst) {
+        manager.session = {};
+    }
+
+    // source event is the normalized value of the domEvents
+    // like 'touchstart, mouseup, pointerdown'
+    input.eventType = eventType;
+
+    // compute scale, rotation etc
+    computeInputData(manager, input);
+
+    // emit secret event
+    manager.emit('hammer.input', input);
+
+    manager.recognize(input);
+    manager.session.prevInput = input;
+}
+
+/**
+ * extend the data with some usable properties like scale, rotate, velocity etc
+ * @param {Object} manager
+ * @param {Object} input
+ */
+function computeInputData(manager, input) {
+    var session = manager.session;
+    var pointers = input.pointers;
+    var pointersLength = pointers.length;
+
+    // store the first input to calculate the distance and direction
+    if (!session.firstInput) {
+        session.firstInput = simpleCloneInputData(input);
+    }
+
+    // to compute scale and rotation we need to store the multiple touches
+    if (pointersLength > 1 && !session.firstMultiple) {
+        session.firstMultiple = simpleCloneInputData(input);
+    } else if (pointersLength === 1) {
+        session.firstMultiple = false;
+    }
+
+    var firstInput = session.firstInput;
+    var firstMultiple = session.firstMultiple;
+    var offsetCenter = firstMultiple ? firstMultiple.center : firstInput.center;
+
+    var center = input.center = getCenter(pointers);
+    input.timeStamp = now();
+    input.deltaTime = input.timeStamp - firstInput.timeStamp;
+
+    input.angle = getAngle(offsetCenter, center);
+    input.distance = getDistance(offsetCenter, center);
+
+    computeDeltaXY(session, input);
+    input.offsetDirection = getDirection(input.deltaX, input.deltaY);
+
+    var overallVelocity = getVelocity(input.deltaTime, input.deltaX, input.deltaY);
+    input.overallVelocityX = overallVelocity.x;
+    input.overallVelocityY = overallVelocity.y;
+    input.overallVelocity = (abs(overallVelocity.x) > abs(overallVelocity.y)) ? overallVelocity.x : overallVelocity.y;
+
+    input.scale = firstMultiple ? getScale(firstMultiple.pointers, pointers) : 1;
+    input.rotation = firstMultiple ? getRotation(firstMultiple.pointers, pointers) : 0;
+
+    input.maxPointers = !session.prevInput ? input.pointers.length : ((input.pointers.length >
+        session.prevInput.maxPointers) ? input.pointers.length : session.prevInput.maxPointers);
+
+    computeIntervalInputData(session, input);
+
+    // find the correct target
+    var target = manager.element;
+    if (hasParent(input.srcEvent.target, target)) {
+        target = input.srcEvent.target;
+    }
+    input.target = target;
+}
+
+function computeDeltaXY(session, input) {
+    var center = input.center;
+    var offset = session.offsetDelta || {};
+    var prevDelta = session.prevDelta || {};
+    var prevInput = session.prevInput || {};
+
+    if (input.eventType === INPUT_START || prevInput.eventType === INPUT_END) {
+        prevDelta = session.prevDelta = {
+            x: prevInput.deltaX || 0,
+            y: prevInput.deltaY || 0
+        };
+
+        offset = session.offsetDelta = {
+            x: center.x,
+            y: center.y
+        };
+    }
+
+    input.deltaX = prevDelta.x + (center.x - offset.x);
+    input.deltaY = prevDelta.y + (center.y - offset.y);
+}
+
+/**
+ * velocity is calculated every x ms
+ * @param {Object} session
+ * @param {Object} input
+ */
+function computeIntervalInputData(session, input) {
+    var last = session.lastInterval || input,
+        deltaTime = input.timeStamp - last.timeStamp,
+        velocity, velocityX, velocityY, direction;
+
+    if (input.eventType != INPUT_CANCEL && (deltaTime > COMPUTE_INTERVAL || last.velocity === undefined)) {
+        var deltaX = input.deltaX - last.deltaX;
+        var deltaY = input.deltaY - last.deltaY;
+
+        var v = getVelocity(deltaTime, deltaX, deltaY);
+        velocityX = v.x;
+        velocityY = v.y;
+        velocity = (abs(v.x) > abs(v.y)) ? v.x : v.y;
+        direction = getDirection(deltaX, deltaY);
+
+        session.lastInterval = input;
+    } else {
+        // use latest velocity info if it doesn't overtake a minimum period
+        velocity = last.velocity;
+        velocityX = last.velocityX;
+        velocityY = last.velocityY;
+        direction = last.direction;
+    }
+
+    input.velocity = velocity;
+    input.velocityX = velocityX;
+    input.velocityY = velocityY;
+    input.direction = direction;
+}
+
+/**
+ * create a simple clone from the input used for storage of firstInput and firstMultiple
+ * @param {Object} input
+ * @returns {Object} clonedInputData
+ */
+function simpleCloneInputData(input) {
+    // make a simple copy of the pointers because we will get a reference if we don't
+    // we only need clientXY for the calculations
+    var pointers = [];
+    var i = 0;
+    while (i < input.pointers.length) {
+        pointers[i] = {
+            clientX: round(input.pointers[i].clientX),
+            clientY: round(input.pointers[i].clientY)
+        };
+        i++;
+    }
+
+    return {
+        timeStamp: now(),
+        pointers: pointers,
+        center: getCenter(pointers),
+        deltaX: input.deltaX,
+        deltaY: input.deltaY
+    };
+}
+
+/**
+ * get the center of all the pointers
+ * @param {Array} pointers
+ * @return {Object} center contains `x` and `y` properties
+ */
+function getCenter(pointers) {
+    var pointersLength = pointers.length;
+
+    // no need to loop when only one touch
+    if (pointersLength === 1) {
+        return {
+            x: round(pointers[0].clientX),
+            y: round(pointers[0].clientY)
+        };
+    }
+
+    var x = 0, y = 0, i = 0;
+    while (i < pointersLength) {
+        x += pointers[i].clientX;
+        y += pointers[i].clientY;
+        i++;
+    }
+
+    return {
+        x: round(x / pointersLength),
+        y: round(y / pointersLength)
+    };
+}
+
+/**
+ * calculate the velocity between two points. unit is in px per ms.
+ * @param {Number} deltaTime
+ * @param {Number} x
+ * @param {Number} y
+ * @return {Object} velocity `x` and `y`
+ */
+function getVelocity(deltaTime, x, y) {
+    return {
+        x: x / deltaTime || 0,
+        y: y / deltaTime || 0
+    };
+}
+
+/**
+ * get the direction between two points
+ * @param {Number} x
+ * @param {Number} y
+ * @return {Number} direction
+ */
+function getDirection(x, y) {
+    if (x === y) {
+        return DIRECTION_NONE;
+    }
+
+    if (abs(x) >= abs(y)) {
+        return x < 0 ? DIRECTION_LEFT : DIRECTION_RIGHT;
+    }
+    return y < 0 ? DIRECTION_UP : DIRECTION_DOWN;
+}
+
+/**
+ * calculate the absolute distance between two points
+ * @param {Object} p1 {x, y}
+ * @param {Object} p2 {x, y}
+ * @param {Array} [props] containing x and y keys
+ * @return {Number} distance
+ */
+function getDistance(p1, p2, props) {
+    if (!props) {
+        props = PROPS_XY;
+    }
+    var x = p2[props[0]] - p1[props[0]],
+        y = p2[props[1]] - p1[props[1]];
+
+    return Math.sqrt((x * x) + (y * y));
+}
+
+/**
+ * calculate the angle between two coordinates
+ * @param {Object} p1
+ * @param {Object} p2
+ * @param {Array} [props] containing x and y keys
+ * @return {Number} angle
+ */
+function getAngle(p1, p2, props) {
+    if (!props) {
+        props = PROPS_XY;
+    }
+    var x = p2[props[0]] - p1[props[0]],
+        y = p2[props[1]] - p1[props[1]];
+    return Math.atan2(y, x) * 180 / Math.PI;
+}
+
+/**
+ * calculate the rotation degrees between two pointersets
+ * @param {Array} start array of pointers
+ * @param {Array} end array of pointers
+ * @return {Number} rotation
+ */
+function getRotation(start, end) {
+    return getAngle(end[1], end[0], PROPS_CLIENT_XY) + getAngle(start[1], start[0], PROPS_CLIENT_XY);
+}
+
+/**
+ * calculate the scale factor between two pointersets
+ * no scale is 1, and goes down to 0 when pinched together, and bigger when pinched out
+ * @param {Array} start array of pointers
+ * @param {Array} end array of pointers
+ * @return {Number} scale
+ */
+function getScale(start, end) {
+    return getDistance(end[0], end[1], PROPS_CLIENT_XY) / getDistance(start[0], start[1], PROPS_CLIENT_XY);
+}
+
+var MOUSE_INPUT_MAP = {
+    mousedown: INPUT_START,
+    mousemove: INPUT_MOVE,
+    mouseup: INPUT_END
+};
+
+var MOUSE_ELEMENT_EVENTS = 'mousedown';
+var MOUSE_WINDOW_EVENTS = 'mousemove mouseup';
+
+/**
+ * Mouse events input
+ * @constructor
+ * @extends Input
+ */
+function MouseInput() {
+    this.evEl = MOUSE_ELEMENT_EVENTS;
+    this.evWin = MOUSE_WINDOW_EVENTS;
+
+    this.pressed = false; // mousedown state
+
+    Input.apply(this, arguments);
+}
+
+inherit(MouseInput, Input, {
+    /**
+     * handle mouse events
+     * @param {Object} ev
+     */
+    handler: function MEhandler(ev) {
+        var eventType = MOUSE_INPUT_MAP[ev.type];
+
+        // on start we want to have the left mouse button down
+        if (eventType & INPUT_START && ev.button === 0) {
+            this.pressed = true;
+        }
+
+        if (eventType & INPUT_MOVE && ev.which !== 1) {
+            eventType = INPUT_END;
+        }
+
+        // mouse must be down
+        if (!this.pressed) {
+            return;
+        }
+
+        if (eventType & INPUT_END) {
+            this.pressed = false;
+        }
+
+        this.callback(this.manager, eventType, {
+            pointers: [ev],
+            changedPointers: [ev],
+            pointerType: INPUT_TYPE_MOUSE,
+            srcEvent: ev
+        });
+    }
+});
+
+var POINTER_INPUT_MAP = {
+    pointerdown: INPUT_START,
+    pointermove: INPUT_MOVE,
+    pointerup: INPUT_END,
+    pointercancel: INPUT_CANCEL,
+    pointerout: INPUT_CANCEL
+};
+
+// in IE10 the pointer types is defined as an enum
+var IE10_POINTER_TYPE_ENUM = {
+    2: INPUT_TYPE_TOUCH,
+    3: INPUT_TYPE_PEN,
+    4: INPUT_TYPE_MOUSE,
+    5: INPUT_TYPE_KINECT // see https://twitter.com/jacobrossi/status/480596438489890816
+};
+
+var POINTER_ELEMENT_EVENTS = 'pointerdown';
+var POINTER_WINDOW_EVENTS = 'pointermove pointerup pointercancel';
+
+// IE10 has prefixed support, and case-sensitive
+if (window.MSPointerEvent && !window.PointerEvent) {
+    POINTER_ELEMENT_EVENTS = 'MSPointerDown';
+    POINTER_WINDOW_EVENTS = 'MSPointerMove MSPointerUp MSPointerCancel';
+}
+
+/**
+ * Pointer events input
+ * @constructor
+ * @extends Input
+ */
+function PointerEventInput() {
+    this.evEl = POINTER_ELEMENT_EVENTS;
+    this.evWin = POINTER_WINDOW_EVENTS;
+
+    Input.apply(this, arguments);
+
+    this.store = (this.manager.session.pointerEvents = []);
+}
+
+inherit(PointerEventInput, Input, {
+    /**
+     * handle mouse events
+     * @param {Object} ev
+     */
+    handler: function PEhandler(ev) {
+        var store = this.store;
+        var removePointer = false;
+
+        var eventTypeNormalized = ev.type.toLowerCase().replace('ms', '');
+        var eventType = POINTER_INPUT_MAP[eventTypeNormalized];
+        var pointerType = IE10_POINTER_TYPE_ENUM[ev.pointerType] || ev.pointerType;
+
+        var isTouch = (pointerType == INPUT_TYPE_TOUCH);
+
+        // get index of the event in the store
+        var storeIndex = inArray(store, ev.pointerId, 'pointerId');
+
+        // start and mouse must be down
+        if (eventType & INPUT_START && (ev.button === 0 || isTouch)) {
+            if (storeIndex < 0) {
+                store.push(ev);
+                storeIndex = store.length - 1;
+            }
+        } else if (eventType & (INPUT_END | INPUT_CANCEL)) {
+            removePointer = true;
+        }
+
+        // it not found, so the pointer hasn't been down (so it's probably a hover)
+        if (storeIndex < 0) {
+            return;
+        }
+
+        // update the event in the store
+        store[storeIndex] = ev;
+
+        this.callback(this.manager, eventType, {
+            pointers: store,
+            changedPointers: [ev],
+            pointerType: pointerType,
+            srcEvent: ev
+        });
+
+        if (removePointer) {
+            // remove from the store
+            store.splice(storeIndex, 1);
+        }
+    }
+});
+
+var SINGLE_TOUCH_INPUT_MAP = {
+    touchstart: INPUT_START,
+    touchmove: INPUT_MOVE,
+    touchend: INPUT_END,
+    touchcancel: INPUT_CANCEL
+};
+
+var SINGLE_TOUCH_TARGET_EVENTS = 'touchstart';
+var SINGLE_TOUCH_WINDOW_EVENTS = 'touchstart touchmove touchend touchcancel';
+
+/**
+ * Touch events input
+ * @constructor
+ * @extends Input
+ */
+function SingleTouchInput() {
+    this.evTarget = SINGLE_TOUCH_TARGET_EVENTS;
+    this.evWin = SINGLE_TOUCH_WINDOW_EVENTS;
+    this.started = false;
+
+    Input.apply(this, arguments);
+}
+
+inherit(SingleTouchInput, Input, {
+    handler: function TEhandler(ev) {
+        var type = SINGLE_TOUCH_INPUT_MAP[ev.type];
+
+        // should we handle the touch events?
+        if (type === INPUT_START) {
+            this.started = true;
+        }
+
+        if (!this.started) {
+            return;
+        }
+
+        var touches = normalizeSingleTouches.call(this, ev, type);
+
+        // when done, reset the started state
+        if (type & (INPUT_END | INPUT_CANCEL) && touches[0].length - touches[1].length === 0) {
+            this.started = false;
+        }
+
+        this.callback(this.manager, type, {
+            pointers: touches[0],
+            changedPointers: touches[1],
+            pointerType: INPUT_TYPE_TOUCH,
+            srcEvent: ev
+        });
+    }
+});
+
+/**
+ * @this {TouchInput}
+ * @param {Object} ev
+ * @param {Number} type flag
+ * @returns {undefined|Array} [all, changed]
+ */
+function normalizeSingleTouches(ev, type) {
+    var all = toArray(ev.touches);
+    var changed = toArray(ev.changedTouches);
+
+    if (type & (INPUT_END | INPUT_CANCEL)) {
+        all = uniqueArray(all.concat(changed), 'identifier', true);
+    }
+
+    return [all, changed];
+}
+
+var TOUCH_INPUT_MAP = {
+    touchstart: INPUT_START,
+    touchmove: INPUT_MOVE,
+    touchend: INPUT_END,
+    touchcancel: INPUT_CANCEL
+};
+
+var TOUCH_TARGET_EVENTS = 'touchstart touchmove touchend touchcancel';
+
+/**
+ * Multi-user touch events input
+ * @constructor
+ * @extends Input
+ */
+function TouchInput() {
+    this.evTarget = TOUCH_TARGET_EVENTS;
+    this.targetIds = {};
+
+    Input.apply(this, arguments);
+}
+
+inherit(TouchInput, Input, {
+    handler: function MTEhandler(ev) {
+        var type = TOUCH_INPUT_MAP[ev.type];
+        var touches = getTouches.call(this, ev, type);
+        if (!touches) {
+            return;
+        }
+
+        this.callback(this.manager, type, {
+            pointers: touches[0],
+            changedPointers: touches[1],
+            pointerType: INPUT_TYPE_TOUCH,
+            srcEvent: ev
+        });
+    }
+});
+
+/**
+ * @this {TouchInput}
+ * @param {Object} ev
+ * @param {Number} type flag
+ * @returns {undefined|Array} [all, changed]
+ */
+function getTouches(ev, type) {
+    var allTouches = toArray(ev.touches);
+    var targetIds = this.targetIds;
+
+    // when there is only one touch, the process can be simplified
+    if (type & (INPUT_START | INPUT_MOVE) && allTouches.length === 1) {
+        targetIds[allTouches[0].identifier] = true;
+        return [allTouches, allTouches];
+    }
+
+    var i,
+        targetTouches,
+        changedTouches = toArray(ev.changedTouches),
+        changedTargetTouches = [],
+        target = this.target;
+
+    // get target touches from touches
+    targetTouches = allTouches.filter(function(touch) {
+        return hasParent(touch.target, target);
+    });
+
+    // collect touches
+    if (type === INPUT_START) {
+        i = 0;
+        while (i < targetTouches.length) {
+            targetIds[targetTouches[i].identifier] = true;
+            i++;
+        }
+    }
+
+    // filter changed touches to only contain touches that exist in the collected target ids
+    i = 0;
+    while (i < changedTouches.length) {
+        if (targetIds[changedTouches[i].identifier]) {
+            changedTargetTouches.push(changedTouches[i]);
+        }
+
+        // cleanup removed touches
+        if (type & (INPUT_END | INPUT_CANCEL)) {
+            delete targetIds[changedTouches[i].identifier];
+        }
+        i++;
+    }
+
+    if (!changedTargetTouches.length) {
+        return;
+    }
+
+    return [
+        // merge targetTouches with changedTargetTouches so it contains ALL touches, including 'end' and 'cancel'
+        uniqueArray(targetTouches.concat(changedTargetTouches), 'identifier', true),
+        changedTargetTouches
+    ];
+}
+
+/**
+ * Combined touch and mouse input
+ *
+ * Touch has a higher priority then mouse, and while touching no mouse events are allowed.
+ * This because touch devices also emit mouse events while doing a touch.
+ *
+ * @constructor
+ * @extends Input
+ */
+
+var DEDUP_TIMEOUT = 2500;
+var DEDUP_DISTANCE = 25;
+
+function TouchMouseInput() {
+    Input.apply(this, arguments);
+
+    var handler = bindFn(this.handler, this);
+    this.touch = new TouchInput(this.manager, handler);
+    this.mouse = new MouseInput(this.manager, handler);
+
+    this.primaryTouch = null;
+    this.lastTouches = [];
+}
+
+inherit(TouchMouseInput, Input, {
+    /**
+     * handle mouse and touch events
+     * @param {Hammer} manager
+     * @param {String} inputEvent
+     * @param {Object} inputData
+     */
+    handler: function TMEhandler(manager, inputEvent, inputData) {
+        var isTouch = (inputData.pointerType == INPUT_TYPE_TOUCH),
+            isMouse = (inputData.pointerType == INPUT_TYPE_MOUSE);
+
+        if (isMouse && inputData.sourceCapabilities && inputData.sourceCapabilities.firesTouchEvents) {
+            return;
+        }
+
+        // when we're in a touch event, record touches to  de-dupe synthetic mouse event
+        if (isTouch) {
+            recordTouches.call(this, inputEvent, inputData);
+        } else if (isMouse && isSyntheticEvent.call(this, inputData)) {
+            return;
+        }
+
+        this.callback(manager, inputEvent, inputData);
+    },
+
+    /**
+     * remove the event listeners
+     */
+    destroy: function destroy() {
+        this.touch.destroy();
+        this.mouse.destroy();
+    }
+});
+
+function recordTouches(eventType, eventData) {
+    if (eventType & INPUT_START) {
+        this.primaryTouch = eventData.changedPointers[0].identifier;
+        setLastTouch.call(this, eventData);
+    } else if (eventType & (INPUT_END | INPUT_CANCEL)) {
+        setLastTouch.call(this, eventData);
+    }
+}
+
+function setLastTouch(eventData) {
+    var touch = eventData.changedPointers[0];
+
+    if (touch.identifier === this.primaryTouch) {
+        var lastTouch = {x: touch.clientX, y: touch.clientY};
+        this.lastTouches.push(lastTouch);
+        var lts = this.lastTouches;
+        var removeLastTouch = function() {
+            var i = lts.indexOf(lastTouch);
+            if (i > -1) {
+                lts.splice(i, 1);
+            }
+        };
+        setTimeout(removeLastTouch, DEDUP_TIMEOUT);
+    }
+}
+
+function isSyntheticEvent(eventData) {
+    var x = eventData.srcEvent.clientX, y = eventData.srcEvent.clientY;
+    for (var i = 0; i < this.lastTouches.length; i++) {
+        var t = this.lastTouches[i];
+        var dx = Math.abs(x - t.x), dy = Math.abs(y - t.y);
+        if (dx <= DEDUP_DISTANCE && dy <= DEDUP_DISTANCE) {
+            return true;
+        }
+    }
+    return false;
+}
+
+var PREFIXED_TOUCH_ACTION = prefixed(TEST_ELEMENT.style, 'touchAction');
+var NATIVE_TOUCH_ACTION = PREFIXED_TOUCH_ACTION !== undefined;
+
+// magical touchAction value
+var TOUCH_ACTION_COMPUTE = 'compute';
+var TOUCH_ACTION_AUTO = 'auto';
+var TOUCH_ACTION_MANIPULATION = 'manipulation'; // not implemented
+var TOUCH_ACTION_NONE = 'none';
+var TOUCH_ACTION_PAN_X = 'pan-x';
+var TOUCH_ACTION_PAN_Y = 'pan-y';
+var TOUCH_ACTION_MAP = getTouchActionProps();
+
+/**
+ * Touch Action
+ * sets the touchAction property or uses the js alternative
+ * @param {Manager} manager
+ * @param {String} value
+ * @constructor
+ */
+function TouchAction(manager, value) {
+    this.manager = manager;
+    this.set(value);
+}
+
+TouchAction.prototype = {
+    /**
+     * set the touchAction value on the element or enable the polyfill
+     * @param {String} value
+     */
+    set: function(value) {
+        // find out the touch-action by the event handlers
+        if (value == TOUCH_ACTION_COMPUTE) {
+            value = this.compute();
+        }
+
+        if (NATIVE_TOUCH_ACTION && this.manager.element.style && TOUCH_ACTION_MAP[value]) {
+            this.manager.element.style[PREFIXED_TOUCH_ACTION] = value;
+        }
+        this.actions = value.toLowerCase().trim();
+    },
+
+    /**
+     * just re-set the touchAction value
+     */
+    update: function() {
+        this.set(this.manager.options.touchAction);
+    },
+
+    /**
+     * compute the value for the touchAction property based on the recognizer's settings
+     * @returns {String} value
+     */
+    compute: function() {
+        var actions = [];
+        each(this.manager.recognizers, function(recognizer) {
+            if (boolOrFn(recognizer.options.enable, [recognizer])) {
+                actions = actions.concat(recognizer.getTouchAction());
+            }
+        });
+        return cleanTouchActions(actions.join(' '));
+    },
+
+    /**
+     * this method is called on each input cycle and provides the preventing of the browser behavior
+     * @param {Object} input
+     */
+    preventDefaults: function(input) {
+        var srcEvent = input.srcEvent;
+        var direction = input.offsetDirection;
+
+        // if the touch action did prevented once this session
+        if (this.manager.session.prevented) {
+            srcEvent.preventDefault();
+            return;
+        }
+
+        var actions = this.actions;
+        var hasNone = inStr(actions, TOUCH_ACTION_NONE) && !TOUCH_ACTION_MAP[TOUCH_ACTION_NONE];
+        var hasPanY = inStr(actions, TOUCH_ACTION_PAN_Y) && !TOUCH_ACTION_MAP[TOUCH_ACTION_PAN_Y];
+        var hasPanX = inStr(actions, TOUCH_ACTION_PAN_X) && !TOUCH_ACTION_MAP[TOUCH_ACTION_PAN_X];
+
+        if (hasNone) {
+            //do not prevent defaults if this is a tap gesture
+
+            var isTapPointer = input.pointers.length === 1;
+            var isTapMovement = input.distance < 2;
+            var isTapTouchTime = input.deltaTime < 250;
+
+            if (isTapPointer && isTapMovement && isTapTouchTime) {
+                return;
+            }
+        }
+
+        if (hasPanX && hasPanY) {
+            // `pan-x pan-y` means browser handles all scrolling/panning, do not prevent
+            return;
+        }
+
+        if (hasNone ||
+            (hasPanY && direction & DIRECTION_HORIZONTAL) ||
+            (hasPanX && direction & DIRECTION_VERTICAL)) {
+            return this.preventSrc(srcEvent);
+        }
+    },
+
+    /**
+     * call preventDefault to prevent the browser's default behavior (scrolling in most cases)
+     * @param {Object} srcEvent
+     */
+    preventSrc: function(srcEvent) {
+        this.manager.session.prevented = true;
+        srcEvent.preventDefault();
+    }
+};
+
+/**
+ * when the touchActions are collected they are not a valid value, so we need to clean things up. *
+ * @param {String} actions
+ * @returns {*}
+ */
+function cleanTouchActions(actions) {
+    // none
+    if (inStr(actions, TOUCH_ACTION_NONE)) {
+        return TOUCH_ACTION_NONE;
+    }
+
+    var hasPanX = inStr(actions, TOUCH_ACTION_PAN_X);
+    var hasPanY = inStr(actions, TOUCH_ACTION_PAN_Y);
+
+    // if both pan-x and pan-y are set (different recognizers
+    // for different directions, e.g. horizontal pan but vertical swipe?)
+    // we need none (as otherwise with pan-x pan-y combined none of these
+    // recognizers will work, since the browser would handle all panning
+    if (hasPanX && hasPanY) {
+        return TOUCH_ACTION_NONE;
+    }
+
+    // pan-x OR pan-y
+    if (hasPanX || hasPanY) {
+        return hasPanX ? TOUCH_ACTION_PAN_X : TOUCH_ACTION_PAN_Y;
+    }
+
+    // manipulation
+    if (inStr(actions, TOUCH_ACTION_MANIPULATION)) {
+        return TOUCH_ACTION_MANIPULATION;
+    }
+
+    return TOUCH_ACTION_AUTO;
+}
+
+function getTouchActionProps() {
+    if (!NATIVE_TOUCH_ACTION) {
+        return false;
+    }
+    var touchMap = {};
+    var cssSupports = window.CSS && window.CSS.supports;
+    ['auto', 'manipulation', 'pan-y', 'pan-x', 'pan-x pan-y', 'none'].forEach(function(val) {
+
+        // If css.supports is not supported but there is native touch-action assume it supports
+        // all values. This is the case for IE 10 and 11.
+        touchMap[val] = cssSupports ? window.CSS.supports('touch-action', val) : true;
+    });
+    return touchMap;
+}
+
+/**
+ * Recognizer flow explained; *
+ * All recognizers have the initial state of POSSIBLE when a input session starts.
+ * The definition of a input session is from the first input until the last input, with all it's movement in it. *
+ * Example session for mouse-input: mousedown -> mousemove -> mouseup
+ *
+ * On each recognizing cycle (see Manager.recognize) the .recognize() method is executed
+ * which determines with state it should be.
+ *
+ * If the recognizer has the state FAILED, CANCELLED or RECOGNIZED (equals ENDED), it is reset to
+ * POSSIBLE to give it another change on the next cycle.
+ *
+ *               Possible
+ *                  |
+ *            +-----+---------------+
+ *            |                     |
+ *      +-----+-----+               |
+ *      |           |               |
+ *   Failed      Cancelled          |
+ *                          +-------+------+
+ *                          |              |
+ *                      Recognized       Began
+ *                                         |
+ *                                      Changed
+ *                                         |
+ *                                  Ended/Recognized
+ */
+var STATE_POSSIBLE = 1;
+var STATE_BEGAN = 2;
+var STATE_CHANGED = 4;
+var STATE_ENDED = 8;
+var STATE_RECOGNIZED = STATE_ENDED;
+var STATE_CANCELLED = 16;
+var STATE_FAILED = 32;
+
+/**
+ * Recognizer
+ * Every recognizer needs to extend from this class.
+ * @constructor
+ * @param {Object} options
+ */
+function Recognizer(options) {
+    this.options = assign({}, this.defaults, options || {});
+
+    this.id = uniqueId();
+
+    this.manager = null;
+
+    // default is enable true
+    this.options.enable = ifUndefined(this.options.enable, true);
+
+    this.state = STATE_POSSIBLE;
+
+    this.simultaneous = {};
+    this.requireFail = [];
+}
+
+Recognizer.prototype = {
+    /**
+     * @virtual
+     * @type {Object}
+     */
+    defaults: {},
+
+    /**
+     * set options
+     * @param {Object} options
+     * @return {Recognizer}
+     */
+    set: function(options) {
+        assign(this.options, options);
+
+        // also update the touchAction, in case something changed about the directions/enabled state
+        this.manager && this.manager.touchAction.update();
+        return this;
+    },
+
+    /**
+     * recognize simultaneous with an other recognizer.
+     * @param {Recognizer} otherRecognizer
+     * @returns {Recognizer} this
+     */
+    recognizeWith: function(otherRecognizer) {
+        if (invokeArrayArg(otherRecognizer, 'recognizeWith', this)) {
+            return this;
+        }
+
+        var simultaneous = this.simultaneous;
+        otherRecognizer = getRecognizerByNameIfManager(otherRecognizer, this);
+        if (!simultaneous[otherRecognizer.id]) {
+            simultaneous[otherRecognizer.id] = otherRecognizer;
+            otherRecognizer.recognizeWith(this);
+        }
+        return this;
+    },
+
+    /**
+     * drop the simultaneous link. it doesnt remove the link on the other recognizer.
+     * @param {Recognizer} otherRecognizer
+     * @returns {Recognizer} this
+     */
+    dropRecognizeWith: function(otherRecognizer) {
+        if (invokeArrayArg(otherRecognizer, 'dropRecognizeWith', this)) {
+            return this;
+        }
+
+        otherRecognizer = getRecognizerByNameIfManager(otherRecognizer, this);
+        delete this.simultaneous[otherRecognizer.id];
+        return this;
+    },
+
+    /**
+     * recognizer can only run when an other is failing
+     * @param {Recognizer} otherRecognizer
+     * @returns {Recognizer} this
+     */
+    requireFailure: function(otherRecognizer) {
+        if (invokeArrayArg(otherRecognizer, 'requireFailure', this)) {
+            return this;
+        }
+
+        var requireFail = this.requireFail;
+        otherRecognizer = getRecognizerByNameIfManager(otherRecognizer, this);
+        if (inArray(requireFail, otherRecognizer) === -1) {
+            requireFail.push(otherRecognizer);
+            otherRecognizer.requireFailure(this);
+        }
+        return this;
+    },
+
+    /**
+     * drop the requireFailure link. it does not remove the link on the other recognizer.
+     * @param {Recognizer} otherRecognizer
+     * @returns {Recognizer} this
+     */
+    dropRequireFailure: function(otherRecognizer) {
+        if (invokeArrayArg(otherRecognizer, 'dropRequireFailure', this)) {
+            return this;
+        }
+
+        otherRecognizer = getRecognizerByNameIfManager(otherRecognizer, this);
+        var index = inArray(this.requireFail, otherRecognizer);
+        if (index > -1) {
+            this.requireFail.splice(index, 1);
+        }
+        return this;
+    },
+
+    /**
+     * has require failures boolean
+     * @returns {boolean}
+     */
+    hasRequireFailures: function() {
+        return this.requireFail.length > 0;
+    },
+
+    /**
+     * if the recognizer can recognize simultaneous with an other recognizer
+     * @param {Recognizer} otherRecognizer
+     * @returns {Boolean}
+     */
+    canRecognizeWith: function(otherRecognizer) {
+        return !!this.simultaneous[otherRecognizer.id];
+    },
+
+    /**
+     * You should use `tryEmit` instead of `emit` directly to check
+     * that all the needed recognizers has failed before emitting.
+     * @param {Object} input
+     */
+    emit: function(input) {
+        var self = this;
+        var state = this.state;
+
+        function emit(event) {
+            self.manager.emit(event, input);
+        }
+
+        // 'panstart' and 'panmove'
+        if (state < STATE_ENDED) {
+            emit(self.options.event + stateStr(state));
+        }
+
+        emit(self.options.event); // simple 'eventName' events
+
+        if (input.additionalEvent) { // additional event(panleft, panright, pinchin, pinchout...)
+            emit(input.additionalEvent);
+        }
+
+        // panend and pancancel
+        if (state >= STATE_ENDED) {
+            emit(self.options.event + stateStr(state));
+        }
+    },
+
+    /**
+     * Check that all the require failure recognizers has failed,
+     * if true, it emits a gesture event,
+     * otherwise, setup the state to FAILED.
+     * @param {Object} input
+     */
+    tryEmit: function(input) {
+        if (this.canEmit()) {
+            return this.emit(input);
+        }
+        // it's failing anyway
+        this.state = STATE_FAILED;
+    },
+
+    /**
+     * can we emit?
+     * @returns {boolean}
+     */
+    canEmit: function() {
+        var i = 0;
+        while (i < this.requireFail.length) {
+            if (!(this.requireFail[i].state & (STATE_FAILED | STATE_POSSIBLE))) {
+                return false;
+            }
+            i++;
+        }
+        return true;
+    },
+
+    /**
+     * update the recognizer
+     * @param {Object} inputData
+     */
+    recognize: function(inputData) {
+        // make a new copy of the inputData
+        // so we can change the inputData without messing up the other recognizers
+        var inputDataClone = assign({}, inputData);
+
+        // is is enabled and allow recognizing?
+        if (!boolOrFn(this.options.enable, [this, inputDataClone])) {
+            this.reset();
+            this.state = STATE_FAILED;
+            return;
+        }
+
+        // reset when we've reached the end
+        if (this.state & (STATE_RECOGNIZED | STATE_CANCELLED | STATE_FAILED)) {
+            this.state = STATE_POSSIBLE;
+        }
+
+        this.state = this.process(inputDataClone);
+
+        // the recognizer has recognized a gesture
+        // so trigger an event
+        if (this.state & (STATE_BEGAN | STATE_CHANGED | STATE_ENDED | STATE_CANCELLED)) {
+            this.tryEmit(inputDataClone);
+        }
+    },
+
+    /**
+     * return the state of the recognizer
+     * the actual recognizing happens in this method
+     * @virtual
+     * @param {Object} inputData
+     * @returns {Const} STATE
+     */
+    process: function(inputData) { }, // jshint ignore:line
+
+    /**
+     * return the preferred touch-action
+     * @virtual
+     * @returns {Array}
+     */
+    getTouchAction: function() { },
+
+    /**
+     * called when the gesture isn't allowed to recognize
+     * like when another is being recognized or it is disabled
+     * @virtual
+     */
+    reset: function() { }
+};
+
+/**
+ * get a usable string, used as event postfix
+ * @param {Const} state
+ * @returns {String} state
+ */
+function stateStr(state) {
+    if (state & STATE_CANCELLED) {
+        return 'cancel';
+    } else if (state & STATE_ENDED) {
+        return 'end';
+    } else if (state & STATE_CHANGED) {
+        return 'move';
+    } else if (state & STATE_BEGAN) {
+        return 'start';
+    }
+    return '';
+}
+
+/**
+ * direction cons to string
+ * @param {Const} direction
+ * @returns {String}
+ */
+function directionStr(direction) {
+    if (direction == DIRECTION_DOWN) {
+        return 'down';
+    } else if (direction == DIRECTION_UP) {
+        return 'up';
+    } else if (direction == DIRECTION_LEFT) {
+        return 'left';
+    } else if (direction == DIRECTION_RIGHT) {
+        return 'right';
+    }
+    return '';
+}
+
+/**
+ * get a recognizer by name if it is bound to a manager
+ * @param {Recognizer|String} otherRecognizer
+ * @param {Recognizer} recognizer
+ * @returns {Recognizer}
+ */
+function getRecognizerByNameIfManager(otherRecognizer, recognizer) {
+    var manager = recognizer.manager;
+    if (manager) {
+        return manager.get(otherRecognizer);
+    }
+    return otherRecognizer;
+}
+
+/**
+ * This recognizer is just used as a base for the simple attribute recognizers.
+ * @constructor
+ * @extends Recognizer
+ */
+function AttrRecognizer() {
+    Recognizer.apply(this, arguments);
+}
+
+inherit(AttrRecognizer, Recognizer, {
+    /**
+     * @namespace
+     * @memberof AttrRecognizer
+     */
+    defaults: {
+        /**
+         * @type {Number}
+         * @default 1
+         */
+        pointers: 1
+    },
+
+    /**
+     * Used to check if it the recognizer receives valid input, like input.distance > 10.
+     * @memberof AttrRecognizer
+     * @param {Object} input
+     * @returns {Boolean} recognized
+     */
+    attrTest: function(input) {
+        var optionPointers = this.options.pointers;
+        return optionPointers === 0 || input.pointers.length === optionPointers;
+    },
+
+    /**
+     * Process the input and return the state for the recognizer
+     * @memberof AttrRecognizer
+     * @param {Object} input
+     * @returns {*} State
+     */
+    process: function(input) {
+        var state = this.state;
+        var eventType = input.eventType;
+
+        var isRecognized = state & (STATE_BEGAN | STATE_CHANGED);
+        var isValid = this.attrTest(input);
+
+        // on cancel input and we've recognized before, return STATE_CANCELLED
+        if (isRecognized && (eventType & INPUT_CANCEL || !isValid)) {
+            return state | STATE_CANCELLED;
+        } else if (isRecognized || isValid) {
+            if (eventType & INPUT_END) {
+                return state | STATE_ENDED;
+            } else if (!(state & STATE_BEGAN)) {
+                return STATE_BEGAN;
+            }
+            return state | STATE_CHANGED;
+        }
+        return STATE_FAILED;
+    }
+});
+
+/**
+ * Pan
+ * Recognized when the pointer is down and moved in the allowed direction.
+ * @constructor
+ * @extends AttrRecognizer
+ */
+function PanRecognizer() {
+    AttrRecognizer.apply(this, arguments);
+
+    this.pX = null;
+    this.pY = null;
+}
+
+inherit(PanRecognizer, AttrRecognizer, {
+    /**
+     * @namespace
+     * @memberof PanRecognizer
+     */
+    defaults: {
+        event: 'pan',
+        threshold: 10,
+        pointers: 1,
+        direction: DIRECTION_ALL
+    },
+
+    getTouchAction: function() {
+        var direction = this.options.direction;
+        var actions = [];
+        if (direction & DIRECTION_HORIZONTAL) {
+            actions.push(TOUCH_ACTION_PAN_Y);
+        }
+        if (direction & DIRECTION_VERTICAL) {
+            actions.push(TOUCH_ACTION_PAN_X);
+        }
+        return actions;
+    },
+
+    directionTest: function(input) {
+        var options = this.options;
+        var hasMoved = true;
+        var distance = input.distance;
+        var direction = input.direction;
+        var x = input.deltaX;
+        var y = input.deltaY;
+
+        // lock to axis?
+        if (!(direction & options.direction)) {
+            if (options.direction & DIRECTION_HORIZONTAL) {
+                direction = (x === 0) ? DIRECTION_NONE : (x < 0) ? DIRECTION_LEFT : DIRECTION_RIGHT;
+                hasMoved = x != this.pX;
+                distance = Math.abs(input.deltaX);
+            } else {
+                direction = (y === 0) ? DIRECTION_NONE : (y < 0) ? DIRECTION_UP : DIRECTION_DOWN;
+                hasMoved = y != this.pY;
+                distance = Math.abs(input.deltaY);
+            }
+        }
+        input.direction = direction;
+        return hasMoved && distance > options.threshold && direction & options.direction;
+    },
+
+    attrTest: function(input) {
+        return AttrRecognizer.prototype.attrTest.call(this, input) &&
+            (this.state & STATE_BEGAN || (!(this.state & STATE_BEGAN) && this.directionTest(input)));
+    },
+
+    emit: function(input) {
+
+        this.pX = input.deltaX;
+        this.pY = input.deltaY;
+
+        var direction = directionStr(input.direction);
+
+        if (direction) {
+            input.additionalEvent = this.options.event + direction;
+        }
+        this._super.emit.call(this, input);
+    }
+});
+
+/**
+ * Pinch
+ * Recognized when two or more pointers are moving toward (zoom-in) or away from each other (zoom-out).
+ * @constructor
+ * @extends AttrRecognizer
+ */
+function PinchRecognizer() {
+    AttrRecognizer.apply(this, arguments);
+}
+
+inherit(PinchRecognizer, AttrRecognizer, {
+    /**
+     * @namespace
+     * @memberof PinchRecognizer
+     */
+    defaults: {
+        event: 'pinch',
+        threshold: 0,
+        pointers: 2
+    },
+
+    getTouchAction: function() {
+        return [TOUCH_ACTION_NONE];
+    },
+
+    attrTest: function(input) {
+        return this._super.attrTest.call(this, input) &&
+            (Math.abs(input.scale - 1) > this.options.threshold || this.state & STATE_BEGAN);
+    },
+
+    emit: function(input) {
+        if (input.scale !== 1) {
+            var inOut = input.scale < 1 ? 'in' : 'out';
+            input.additionalEvent = this.options.event + inOut;
+        }
+        this._super.emit.call(this, input);
+    }
+});
+
+/**
+ * Press
+ * Recognized when the pointer is down for x ms without any movement.
+ * @constructor
+ * @extends Recognizer
+ */
+function PressRecognizer() {
+    Recognizer.apply(this, arguments);
+
+    this._timer = null;
+    this._input = null;
+}
+
+inherit(PressRecognizer, Recognizer, {
+    /**
+     * @namespace
+     * @memberof PressRecognizer
+     */
+    defaults: {
+        event: 'press',
+        pointers: 1,
+        time: 251, // minimal time of the pointer to be pressed
+        threshold: 9 // a minimal movement is ok, but keep it low
+    },
+
+    getTouchAction: function() {
+        return [TOUCH_ACTION_AUTO];
+    },
+
+    process: function(input) {
+        var options = this.options;
+        var validPointers = input.pointers.length === options.pointers;
+        var validMovement = input.distance < options.threshold;
+        var validTime = input.deltaTime > options.time;
+
+        this._input = input;
+
+        // we only allow little movement
+        // and we've reached an end event, so a tap is possible
+        if (!validMovement || !validPointers || (input.eventType & (INPUT_END | INPUT_CANCEL) && !validTime)) {
+            this.reset();
+        } else if (input.eventType & INPUT_START) {
+            this.reset();
+            this._timer = setTimeoutContext(function() {
+                this.state = STATE_RECOGNIZED;
+                this.tryEmit();
+            }, options.time, this);
+        } else if (input.eventType & INPUT_END) {
+            return STATE_RECOGNIZED;
+        }
+        return STATE_FAILED;
+    },
+
+    reset: function() {
+        clearTimeout(this._timer);
+    },
+
+    emit: function(input) {
+        if (this.state !== STATE_RECOGNIZED) {
+            return;
+        }
+
+        if (input && (input.eventType & INPUT_END)) {
+            this.manager.emit(this.options.event + 'up', input);
+        } else {
+            this._input.timeStamp = now();
+            this.manager.emit(this.options.event, this._input);
+        }
+    }
+});
+
+/**
+ * Rotate
+ * Recognized when two or more pointer are moving in a circular motion.
+ * @constructor
+ * @extends AttrRecognizer
+ */
+function RotateRecognizer() {
+    AttrRecognizer.apply(this, arguments);
+}
+
+inherit(RotateRecognizer, AttrRecognizer, {
+    /**
+     * @namespace
+     * @memberof RotateRecognizer
+     */
+    defaults: {
+        event: 'rotate',
+        threshold: 0,
+        pointers: 2
+    },
+
+    getTouchAction: function() {
+        return [TOUCH_ACTION_NONE];
+    },
+
+    attrTest: function(input) {
+        return this._super.attrTest.call(this, input) &&
+            (Math.abs(input.rotation) > this.options.threshold || this.state & STATE_BEGAN);
+    }
+});
+
+/**
+ * Swipe
+ * Recognized when the pointer is moving fast (velocity), with enough distance in the allowed direction.
+ * @constructor
+ * @extends AttrRecognizer
+ */
+function SwipeRecognizer() {
+    AttrRecognizer.apply(this, arguments);
+}
+
+inherit(SwipeRecognizer, AttrRecognizer, {
+    /**
+     * @namespace
+     * @memberof SwipeRecognizer
+     */
+    defaults: {
+        event: 'swipe',
+        threshold: 10,
+        velocity: 0.3,
+        direction: DIRECTION_HORIZONTAL | DIRECTION_VERTICAL,
+        pointers: 1
+    },
+
+    getTouchAction: function() {
+        return PanRecognizer.prototype.getTouchAction.call(this);
+    },
+
+    attrTest: function(input) {
+        var direction = this.options.direction;
+        var velocity;
+
+        if (direction & (DIRECTION_HORIZONTAL | DIRECTION_VERTICAL)) {
+            velocity = input.overallVelocity;
+        } else if (direction & DIRECTION_HORIZONTAL) {
+            velocity = input.overallVelocityX;
+        } else if (direction & DIRECTION_VERTICAL) {
+            velocity = input.overallVelocityY;
+        }
+
+        return this._super.attrTest.call(this, input) &&
+            direction & input.offsetDirection &&
+            input.distance > this.options.threshold &&
+            input.maxPointers == this.options.pointers &&
+            abs(velocity) > this.options.velocity && input.eventType & INPUT_END;
+    },
+
+    emit: function(input) {
+        var direction = directionStr(input.offsetDirection);
+        if (direction) {
+            this.manager.emit(this.options.event + direction, input);
+        }
+
+        this.manager.emit(this.options.event, input);
+    }
+});
+
+/**
+ * A tap is ecognized when the pointer is doing a small tap/click. Multiple taps are recognized if they occur
+ * between the given interval and position. The delay option can be used to recognize multi-taps without firing
+ * a single tap.
+ *
+ * The eventData from the emitted event contains the property `tapCount`, which contains the amount of
+ * multi-taps being recognized.
+ * @constructor
+ * @extends Recognizer
+ */
+function TapRecognizer() {
+    Recognizer.apply(this, arguments);
+
+    // previous time and center,
+    // used for tap counting
+    this.pTime = false;
+    this.pCenter = false;
+
+    this._timer = null;
+    this._input = null;
+    this.count = 0;
+}
+
+inherit(TapRecognizer, Recognizer, {
+    /**
+     * @namespace
+     * @memberof PinchRecognizer
+     */
+    defaults: {
+        event: 'tap',
+        pointers: 1,
+        taps: 1,
+        interval: 300, // max time between the multi-tap taps
+        time: 250, // max time of the pointer to be down (like finger on the screen)
+        threshold: 9, // a minimal movement is ok, but keep it low
+        posThreshold: 10 // a multi-tap can be a bit off the initial position
+    },
+
+    getTouchAction: function() {
+        return [TOUCH_ACTION_MANIPULATION];
+    },
+
+    process: function(input) {
+        var options = this.options;
+
+        var validPointers = input.pointers.length === options.pointers;
+        var validMovement = input.distance < options.threshold;
+        var validTouchTime = input.deltaTime < options.time;
+
+        this.reset();
+
+        if ((input.eventType & INPUT_START) && (this.count === 0)) {
+            return this.failTimeout();
+        }
+
+        // we only allow little movement
+        // and we've reached an end event, so a tap is possible
+        if (validMovement && validTouchTime && validPointers) {
+            if (input.eventType != INPUT_END) {
+                return this.failTimeout();
+            }
+
+            var validInterval = this.pTime ? (input.timeStamp - this.pTime < options.interval) : true;
+            var validMultiTap = !this.pCenter || getDistance(this.pCenter, input.center) < options.posThreshold;
+
+            this.pTime = input.timeStamp;
+            this.pCenter = input.center;
+
+            if (!validMultiTap || !validInterval) {
+                this.count = 1;
+            } else {
+                this.count += 1;
+            }
+
+            this._input = input;
+
+            // if tap count matches we have recognized it,
+            // else it has began recognizing...
+            var tapCount = this.count % options.taps;
+            if (tapCount === 0) {
+                // no failing requirements, immediately trigger the tap event
+                // or wait as long as the multitap interval to trigger
+                if (!this.hasRequireFailures()) {
+                    return STATE_RECOGNIZED;
+                } else {
+                    this._timer = setTimeoutContext(function() {
+                        this.state = STATE_RECOGNIZED;
+                        this.tryEmit();
+                    }, options.interval, this);
+                    return STATE_BEGAN;
+                }
+            }
+        }
+        return STATE_FAILED;
+    },
+
+    failTimeout: function() {
+        this._timer = setTimeoutContext(function() {
+            this.state = STATE_FAILED;
+        }, this.options.interval, this);
+        return STATE_FAILED;
+    },
+
+    reset: function() {
+        clearTimeout(this._timer);
+    },
+
+    emit: function() {
+        if (this.state == STATE_RECOGNIZED) {
+            this._input.tapCount = this.count;
+            this.manager.emit(this.options.event, this._input);
+        }
+    }
+});
+
+/**
+ * Simple way to create a manager with a default set of recognizers.
+ * @param {HTMLElement} element
+ * @param {Object} [options]
+ * @constructor
+ */
+function Hammer(element, options) {
+    options = options || {};
+    options.recognizers = ifUndefined(options.recognizers, Hammer.defaults.preset);
+    return new Manager(element, options);
+}
+
+/**
+ * @const {string}
+ */
+Hammer.VERSION = '2.0.8';
+
+/**
+ * default settings
+ * @namespace
+ */
+Hammer.defaults = {
+    /**
+     * set if DOM events are being triggered.
+     * But this is slower and unused by simple implementations, so disabled by default.
+     * @type {Boolean}
+     * @default false
+     */
+    domEvents: false,
+
+    /**
+     * The value for the touchAction property/fallback.
+     * When set to `compute` it will magically set the correct value based on the added recognizers.
+     * @type {String}
+     * @default compute
+     */
+    touchAction: TOUCH_ACTION_COMPUTE,
+
+    /**
+     * @type {Boolean}
+     * @default true
+     */
+    enable: true,
+
+    /**
+     * EXPERIMENTAL FEATURE -- can be removed/changed
+     * Change the parent input target element.
+     * If Null, then it is being set the to main element.
+     * @type {Null|EventTarget}
+     * @default null
+     */
+    inputTarget: null,
+
+    /**
+     * force an input class
+     * @type {Null|Function}
+     * @default null
+     */
+    inputClass: null,
+
+    /**
+     * Default recognizer setup when calling `Hammer()`
+     * When creating a new Manager these will be skipped.
+     * @type {Array}
+     */
+    preset: [
+        // RecognizerClass, options, [recognizeWith, ...], [requireFailure, ...]
+        [RotateRecognizer, {enable: false}],
+        [PinchRecognizer, {enable: false}, ['rotate']],
+        [SwipeRecognizer, {direction: DIRECTION_HORIZONTAL}],
+        [PanRecognizer, {direction: DIRECTION_HORIZONTAL}, ['swipe']],
+        [TapRecognizer],
+        [TapRecognizer, {event: 'doubletap', taps: 2}, ['tap']],
+        [PressRecognizer]
+    ],
+
+    /**
+     * Some CSS properties can be used to improve the working of Hammer.
+     * Add them to this method and they will be set when creating a new Manager.
+     * @namespace
+     */
+    cssProps: {
+        /**
+         * Disables text selection to improve the dragging gesture. Mainly for desktop browsers.
+         * @type {String}
+         * @default 'none'
+         */
+        userSelect: 'none',
+
+        /**
+         * Disable the Windows Phone grippers when pressing an element.
+         * @type {String}
+         * @default 'none'
+         */
+        touchSelect: 'none',
+
+        /**
+         * Disables the default callout shown when you touch and hold a touch target.
+         * On iOS, when you touch and hold a touch target such as a link, Safari displays
+         * a callout containing information about the link. This property allows you to disable that callout.
+         * @type {String}
+         * @default 'none'
+         */
+        touchCallout: 'none',
+
+        /**
+         * Specifies whether zooming is enabled. Used by IE10>
+         * @type {String}
+         * @default 'none'
+         */
+        contentZooming: 'none',
+
+        /**
+         * Specifies that an entire element should be draggable instead of its contents. Mainly for desktop browsers.
+         * @type {String}
+         * @default 'none'
+         */
+        userDrag: 'none',
+
+        /**
+         * Overrides the highlight color shown when the user taps a link or a JavaScript
+         * clickable element in iOS. This property obeys the alpha value, if specified.
+         * @type {String}
+         * @default 'rgba(0,0,0,0)'
+         */
+        tapHighlightColor: 'rgba(0,0,0,0)'
+    }
+};
+
+var STOP = 1;
+var FORCED_STOP = 2;
+
+/**
+ * Manager
+ * @param {HTMLElement} element
+ * @param {Object} [options]
+ * @constructor
+ */
+function Manager(element, options) {
+    this.options = assign({}, Hammer.defaults, options || {});
+
+    this.options.inputTarget = this.options.inputTarget || element;
+
+    this.handlers = {};
+    this.session = {};
+    this.recognizers = [];
+    this.oldCssProps = {};
+
+    this.element = element;
+    this.input = createInputInstance(this);
+    this.touchAction = new TouchAction(this, this.options.touchAction);
+
+    toggleCssProps(this, true);
+
+    each(this.options.recognizers, function(item) {
+        var recognizer = this.add(new (item[0])(item[1]));
+        item[2] && recognizer.recognizeWith(item[2]);
+        item[3] && recognizer.requireFailure(item[3]);
+    }, this);
+}
+
+Manager.prototype = {
+    /**
+     * set options
+     * @param {Object} options
+     * @returns {Manager}
+     */
+    set: function(options) {
+        assign(this.options, options);
+
+        // Options that need a little more setup
+        if (options.touchAction) {
+            this.touchAction.update();
+        }
+        if (options.inputTarget) {
+            // Clean up existing event listeners and reinitialize
+            this.input.destroy();
+            this.input.target = options.inputTarget;
+            this.input.init();
+        }
+        return this;
+    },
+
+    /**
+     * stop recognizing for this session.
+     * This session will be discarded, when a new [input]start event is fired.
+     * When forced, the recognizer cycle is stopped immediately.
+     * @param {Boolean} [force]
+     */
+    stop: function(force) {
+        this.session.stopped = force ? FORCED_STOP : STOP;
+    },
+
+    /**
+     * run the recognizers!
+     * called by the inputHandler function on every movement of the pointers (touches)
+     * it walks through all the recognizers and tries to detect the gesture that is being made
+     * @param {Object} inputData
+     */
+    recognize: function(inputData) {
+        var session = this.session;
+        if (session.stopped) {
+            return;
+        }
+
+        // run the touch-action polyfill
+        this.touchAction.preventDefaults(inputData);
+
+        var recognizer;
+        var recognizers = this.recognizers;
+
+        // this holds the recognizer that is being recognized.
+        // so the recognizer's state needs to be BEGAN, CHANGED, ENDED or RECOGNIZED
+        // if no recognizer is detecting a thing, it is set to `null`
+        var curRecognizer = session.curRecognizer;
+
+        // reset when the last recognizer is recognized
+        // or when we're in a new session
+        if (!curRecognizer || (curRecognizer && curRecognizer.state & STATE_RECOGNIZED)) {
+            curRecognizer = session.curRecognizer = null;
+        }
+
+        var i = 0;
+        while (i < recognizers.length) {
+            recognizer = recognizers[i];
+
+            // find out if we are allowed try to recognize the input for this one.
+            // 1.   allow if the session is NOT forced stopped (see the .stop() method)
+            // 2.   allow if we still haven't recognized a gesture in this session, or the this recognizer is the one
+            //      that is being recognized.
+            // 3.   allow if the recognizer is allowed to run simultaneous with the current recognized recognizer.
+            //      this can be setup with the `recognizeWith()` method on the recognizer.
+            if (session.stopped !== FORCED_STOP && ( // 1
+                    !curRecognizer || recognizer == curRecognizer || // 2
+                    recognizer.canRecognizeWith(curRecognizer))) { // 3
+                recognizer.recognize(inputData);
+            } else {
+                recognizer.reset();
+            }
+
+            // if the recognizer has been recognizing the input as a valid gesture, we want to store this one as the
+            // current active recognizer. but only if we don't already have an active recognizer
+            if (!curRecognizer && recognizer.state & (STATE_BEGAN | STATE_CHANGED | STATE_ENDED)) {
+                curRecognizer = session.curRecognizer = recognizer;
+            }
+            i++;
+        }
+    },
+
+    /**
+     * get a recognizer by its event name.
+     * @param {Recognizer|String} recognizer
+     * @returns {Recognizer|Null}
+     */
+    get: function(recognizer) {
+        if (recognizer instanceof Recognizer) {
+            return recognizer;
+        }
+
+        var recognizers = this.recognizers;
+        for (var i = 0; i < recognizers.length; i++) {
+            if (recognizers[i].options.event == recognizer) {
+                return recognizers[i];
+            }
+        }
+        return null;
+    },
+
+    /**
+     * add a recognizer to the manager
+     * existing recognizers with the same event name will be removed
+     * @param {Recognizer} recognizer
+     * @returns {Recognizer|Manager}
+     */
+    add: function(recognizer) {
+        if (invokeArrayArg(recognizer, 'add', this)) {
+            return this;
+        }
+
+        // remove existing
+        var existing = this.get(recognizer.options.event);
+        if (existing) {
+            this.remove(existing);
+        }
+
+        this.recognizers.push(recognizer);
+        recognizer.manager = this;
+
+        this.touchAction.update();
+        return recognizer;
+    },
+
+    /**
+     * remove a recognizer by name or instance
+     * @param {Recognizer|String} recognizer
+     * @returns {Manager}
+     */
+    remove: function(recognizer) {
+        if (invokeArrayArg(recognizer, 'remove', this)) {
+            return this;
+        }
+
+        recognizer = this.get(recognizer);
+
+        // let's make sure this recognizer exists
+        if (recognizer) {
+            var recognizers = this.recognizers;
+            var index = inArray(recognizers, recognizer);
+
+            if (index !== -1) {
+                recognizers.splice(index, 1);
+                this.touchAction.update();
+            }
+        }
+
+        return this;
+    },
+
+    /**
+     * bind event
+     * @param {String} events
+     * @param {Function} handler
+     * @returns {EventEmitter} this
+     */
+    on: function(events, handler) {
+        if (events === undefined) {
+            return;
+        }
+        if (handler === undefined) {
+            return;
+        }
+
+        var handlers = this.handlers;
+        each(splitStr(events), function(event) {
+            handlers[event] = handlers[event] || [];
+            handlers[event].push(handler);
+        });
+        return this;
+    },
+
+    /**
+     * unbind event, leave emit blank to remove all handlers
+     * @param {String} events
+     * @param {Function} [handler]
+     * @returns {EventEmitter} this
+     */
+    off: function(events, handler) {
+        if (events === undefined) {
+            return;
+        }
+
+        var handlers = this.handlers;
+        each(splitStr(events), function(event) {
+            if (!handler) {
+                delete handlers[event];
+            } else {
+                handlers[event] && handlers[event].splice(inArray(handlers[event], handler), 1);
+            }
+        });
+        return this;
+    },
+
+    /**
+     * emit event to the listeners
+     * @param {String} event
+     * @param {Object} data
+     */
+    emit: function(event, data) {
+        // we also want to trigger dom events
+        if (this.options.domEvents) {
+            triggerDomEvent(event, data);
+        }
+
+        // no handlers, so skip it all
+        var handlers = this.handlers[event] && this.handlers[event].slice();
+        if (!handlers || !handlers.length) {
+            return;
+        }
+
+        data.type = event;
+        data.preventDefault = function() {
+            data.srcEvent.preventDefault();
+        };
+
+        var i = 0;
+        while (i < handlers.length) {
+            handlers[i](data);
+            i++;
+        }
+    },
+
+    /**
+     * destroy the manager and unbinds all events
+     * it doesn't unbind dom events, that is the user own responsibility
+     */
+    destroy: function() {
+        this.element && toggleCssProps(this, false);
+
+        this.handlers = {};
+        this.session = {};
+        this.input.destroy();
+        this.element = null;
+    }
+};
+
+/**
+ * add/remove the css properties as defined in manager.options.cssProps
+ * @param {Manager} manager
+ * @param {Boolean} add
+ */
+function toggleCssProps(manager, add) {
+    var element = manager.element;
+    if (!element.style) {
+        return;
+    }
+    var prop;
+    each(manager.options.cssProps, function(value, name) {
+        prop = prefixed(element.style, name);
+        if (add) {
+            manager.oldCssProps[prop] = element.style[prop];
+            element.style[prop] = value;
+        } else {
+            element.style[prop] = manager.oldCssProps[prop] || '';
+        }
+    });
+    if (!add) {
+        manager.oldCssProps = {};
+    }
+}
+
+/**
+ * trigger dom event
+ * @param {String} event
+ * @param {Object} data
+ */
+function triggerDomEvent(event, data) {
+    var gestureEvent = document.createEvent('Event');
+    gestureEvent.initEvent(event, true, true);
+    gestureEvent.gesture = data;
+    data.target.dispatchEvent(gestureEvent);
+}
+
+assign(Hammer, {
+    INPUT_START: INPUT_START,
+    INPUT_MOVE: INPUT_MOVE,
+    INPUT_END: INPUT_END,
+    INPUT_CANCEL: INPUT_CANCEL,
+
+    STATE_POSSIBLE: STATE_POSSIBLE,
+    STATE_BEGAN: STATE_BEGAN,
+    STATE_CHANGED: STATE_CHANGED,
+    STATE_ENDED: STATE_ENDED,
+    STATE_RECOGNIZED: STATE_RECOGNIZED,
+    STATE_CANCELLED: STATE_CANCELLED,
+    STATE_FAILED: STATE_FAILED,
+
+    DIRECTION_NONE: DIRECTION_NONE,
+    DIRECTION_LEFT: DIRECTION_LEFT,
+    DIRECTION_RIGHT: DIRECTION_RIGHT,
+    DIRECTION_UP: DIRECTION_UP,
+    DIRECTION_DOWN: DIRECTION_DOWN,
+    DIRECTION_HORIZONTAL: DIRECTION_HORIZONTAL,
+    DIRECTION_VERTICAL: DIRECTION_VERTICAL,
+    DIRECTION_ALL: DIRECTION_ALL,
+
+    Manager: Manager,
+    Input: Input,
+    TouchAction: TouchAction,
+
+    TouchInput: TouchInput,
+    MouseInput: MouseInput,
+    PointerEventInput: PointerEventInput,
+    TouchMouseInput: TouchMouseInput,
+    SingleTouchInput: SingleTouchInput,
+
+    Recognizer: Recognizer,
+    AttrRecognizer: AttrRecognizer,
+    Tap: TapRecognizer,
+    Pan: PanRecognizer,
+    Swipe: SwipeRecognizer,
+    Pinch: PinchRecognizer,
+    Rotate: RotateRecognizer,
+    Press: PressRecognizer,
+
+    on: addEventListeners,
+    off: removeEventListeners,
+    each: each,
+    merge: merge,
+    extend: extend,
+    assign: assign,
+    inherit: inherit,
+    bindFn: bindFn,
+    prefixed: prefixed
+});
+
+// this prevents errors when Hammer is loaded in the presence of an AMD
+//  style loader but by script tag, not by the loader.
+var freeGlobal = (typeof window !== 'undefined' ? window : (typeof self !== 'undefined' ? self : {})); // jshint ignore:line
+freeGlobal.Hammer = Hammer;
+
+if (typeof define === 'function' && define.amd) {
+    define(function() {
+        return Hammer;
+    });
+} else if (typeof module != 'undefined' && module.exports) {
+    module.exports = Hammer;
+} else {
+    window[exportName] = Hammer;
+}
+
+})(window, document, 'Hammer');
+
++ function($) {
+  "use strict";
+
+  var defaults;
+  
+  $.modal = function(params, onOpen) {
+    params = $.extend({}, defaults, params);
+
+
+    var buttons = params.buttons;
+
+    var buttonsHtml = buttons.map(function(d, i) {
+      return '<a href="javascript:;" class="weui-dialog__btn ' + (d.className || "") + '">' + d.text + '</a>';
+    }).join("");
+
+    var tpl = '<div class="weui-dialog">' +
+                '<div class="weui-dialog__hd"><strong class="weui-dialog__title">' + params.title + '</strong></div>' +
+                ( params.text ? '<div class="weui-dialog__bd">'+params.text+'</div>' : '')+
+                '<div class="weui-dialog__ft">' + buttonsHtml + '</div>' +
+              '</div>';
+    
+    var dialog = $.openModal(tpl, onOpen);
+
+    dialog.find(".weui-dialog__btn").each(function(i, e) {
+      var el = $(e);
+      el.click(function() {
+        //先关闭对话框，再调用回调函数
+        if(params.autoClose) $.closeModal();
+
+        if(buttons[i].onClick) {
+          buttons[i].onClick.call(dialog);
+        }
+      });
+    });
+
+    return dialog;
+  };
+
+  $.openModal = function(tpl, onOpen) {
+    var mask = $("<div class='weui-mask'></div>").appendTo(document.body);
+    mask.show();
+
+    var dialog = $(tpl).appendTo(document.body);
+ 
+    if (onOpen) {
+      dialog.transitionEnd(function () {
+        onOpen.call(dialog);
+      });
+    }   
+
+    dialog.show();
+    mask.addClass("weui-mask--visible");
+    dialog.addClass("weui-dialog--visible");
+
+
+    return dialog;
+  }
+
+  $.closeModal = function() {
+    $(".weui-mask--visible").removeClass("weui-mask--visible").transitionEnd(function() {
+      $(this).remove();
+    });
+    $(".weui-dialog--visible").removeClass("weui-dialog--visible").transitionEnd(function() {
+      $(this).remove();
+    });
+  };
+
+  $.alert = function(text, title, onOK) {
+    var config;
+    if (typeof text === 'object') {
+      config = text;
+    } else {
+      if (typeof title === 'function') {
+        onOK = arguments[1];
+        title = undefined;
+      }
+
+      config = {
+        text: text,
+        title: title,
+        onOK: onOK
+      }
+    }
+    return $.modal({
+      text: config.text,
+      title: config.title,
+      buttons: [{
+        text: defaults.buttonOK,
+        className: "primary",
+        onClick: config.onOK
+      }]
+    });
+  }
+
+  $.confirm = function(text, title, onOK, onCancel) {
+    var config;
+    if (typeof text === 'object') {
+      config = text
+    } else {
+      if (typeof title === 'function') {
+        onCancel = arguments[2];
+        onOK = arguments[1];
+        title = undefined;
+      }
+
+      config = {
+        text: text,
+        title: title,
+        onOK: onOK,
+        onCancel: onCancel
+      }
+    }
+    return $.modal({
+      text: config.text,
+      title: config.title,
+      buttons: [
+      {
+        text: defaults.buttonCancel,
+        className: "default",
+        onClick: config.onCancel
+      },
+      {
+        text: defaults.buttonOK,
+        className: "primary",
+        onClick: config.onOK
+      }]
+    });
+  };
+
+  //如果参数过多，建议通过 config 对象进行配置，而不是传入多个参数。
+  $.prompt = function(text, title, onOK, onCancel, input) {
+    var config;
+    if (typeof text === 'object') {
+      config = text;
+    } else {
+      if (typeof title === 'function') {
+        input = arguments[3];
+        onCancel = arguments[2];
+        onOK = arguments[1];
+        title = undefined;
+      }
+      config = {
+        text: text,
+        title: title,
+        input: input,
+        onOK: onOK,
+        onCancel: onCancel,
+        empty: false  //allow empty
+      }
+    }
+
+    var modal = $.modal({
+      text: '<p class="weui-prompt-text">'+(config.text || '')+'</p><input type="text" class="weui-input weui-prompt-input" id="weui-prompt-input" value="' + (config.input || '') + '" />',
+      title: config.title,
+      autoClose: false,
+      buttons: [
+      {
+        text: defaults.buttonCancel,
+        className: "default",
+        onClick: function () {
+          $.closeModal();
+          config.onCancel && config.onCancel.call(modal);
+        }
+      },
+      {
+        text: defaults.buttonOK,
+        className: "primary",
+        onClick: function() {
+          var input = $("#weui-prompt-input").val();
+          if (!config.empty && (input === "" || input === null)) {
+            modal.find('.weui-prompt-input').focus()[0].select();
+            return false;
+          }
+          $.closeModal();
+          config.onOK && config.onOK.call(modal, input);
+        }
+      }]
+    }, function () {
+      this.find('.weui-prompt-input').focus()[0].select();
+    });
+
+    return modal;
+  };
+
+  //如果参数过多，建议通过 config 对象进行配置，而不是传入多个参数。
+  $.login = function(text, title, onOK, onCancel, username, password) {
+    var config;
+    if (typeof text === 'object') {
+      config = text;
+    } else {
+      if (typeof title === 'function') {
+        password = arguments[4];
+        username = arguments[3];
+        onCancel = arguments[2];
+        onOK = arguments[1];
+        title = undefined;
+      }
+      config = {
+        text: text,
+        title: title,
+        username: username,
+        password: password,
+        onOK: onOK,
+        onCancel: onCancel
+      }
+    }
+
+    var modal = $.modal({
+      text: '<p class="weui-prompt-text">'+(config.text || '')+'</p>' +
+            '<input type="text" class="weui-input weui-prompt-input" id="weui-prompt-username" value="' + (config.username || '') + '" placeholder="输入用户名" />' +
+            '<input type="password" class="weui-input weui-prompt-input" id="weui-prompt-password" value="' + (config.password || '') + '" placeholder="输入密码" />',
+      title: config.title,
+      autoClose: false,
+      buttons: [
+      {
+        text: defaults.buttonCancel,
+        className: "default",
+        onClick: function () {
+          $.closeModal();
+          config.onCancel && config.onCancel.call(modal);
+        }
+      }, {
+        text: defaults.buttonOK,
+        className: "primary",
+        onClick: function() {
+          var username = $("#weui-prompt-username").val();
+          var password = $("#weui-prompt-password").val();
+          if (!config.empty && (username === "" || username === null)) {
+            modal.find('#weui-prompt-username').focus()[0].select();
+            return false;
+          }
+          if (!config.empty && (password === "" || password === null)) {
+            modal.find('#weui-prompt-password').focus()[0].select();
+            return false;
+          }
+          $.closeModal();
+          config.onOK && config.onOK.call(modal, username, password);
+        }
+      }]
+    }, function () {
+      this.find('#weui-prompt-username').focus()[0].select();
+    });
+
+    return modal;
+  };
+
+  defaults = $.modal.prototype.defaults = {
+    title: "提示",
+    text: undefined,
+    buttonOK: "确定",
+    buttonCancel: "取消",
+    buttons: [{
+      text: "确定",
+      className: "primary"
+    }],
+    autoClose: true //点击按钮自动关闭对话框，如果你不希望点击按钮就关闭对话框，可以把这个设置为false
+  };
+
+}($);
+
++ function($) {
+  "use strict";
+
+  var defaults;
+  
+  var show = function(html, className) {
+    className = className || "";
+    var mask = $("<div class='weui-mask_transparent'></div>").appendTo(document.body);
+
+    var tpl = '<div class="weui-toast ' + className + '">' + html + '</div>';
+    var dialog = $(tpl).appendTo(document.body);
+
+    dialog.addClass("weui-toast--visible");
+    dialog.show();
+  };
+
+  var hide = function(callback) {
+    $(".weui-mask_transparent").remove();
+    var done = false;
+    var $el = $(".weui-toast--visible").removeClass("weui-toast--visible").transitionEnd(function() {
+      var $this = $(this);
+      $this.remove();
+      callback && callback();
+      done = true
+    });
+
+    setTimeout(function () {
+      if (!done) {
+        $el.remove()
+        callback && callback();
+      }
+    }, 1000)
+  }
+
+  $.toast = function(text, style, callback) {
+    if(typeof style === "function") {
+      callback = style;
+    }
+    var className, iconClassName = 'weui-icon-success-no-circle';
+    var duration = toastDefaults.duration;
+    if(style == "cancel") {
+      className = "weui-toast_cancel";
+      iconClassName = 'weui-icon-cancel'
+    } else if(style == "forbidden") {
+      className = "weui-toast--forbidden";
+      iconClassName = 'weui-icon-warn'
+    } else if(style == "text") {
+      className = "weui-toast--text";
+    } else if(typeof style === typeof 1) {
+      duration = style
+    }
+    show('<i class="' + iconClassName + ' weui-icon_toast"></i><p class="weui-toast_content">' + (text || "已经完成") + '</p>', className);
+
+    setTimeout(function() {
+      hide(callback);
+    }, duration);
+  }
+
+  $.showLoading = function(text) {
+    var html = '<div class="weui_loading">';
+    html += '<i class="weui-loading weui-icon_toast"></i>';
+    html += '</div>';
+    html += '<p class="weui-toast_content">' + (text || "数据加载中") + '</p>';
+    show(html, 'weui_loading_toast');
+  }
+
+  $.hideLoading = function() {
+    hide();
+  }
+
+  var toastDefaults = $.toast.prototype.defaults = {
+    duration: 2500
+  }
+
+}($);
+
++ function($) {
+  "use strict";
+
+  var defaults;
+  
+  var show = function(params) {
+
+    var mask = $("<div class='weui-mask weui-actions_mask'></div>").appendTo(document.body);
+
+    var actions = params.actions || [];
+
+    var actionsHtml = actions.map(function(d, i) {
+      return '<div class="weui-actionsheet__cell ' + (d.className || "") + '">' + d.text + '</div>';
+    }).join("");
+
+    var titleHtml = "";
+    
+    if (params.title) {
+      titleHtml = '<div class="weui-actionsheet__title"><p class="weui-actionsheet__title-text">' + params.title + '</p></div>';
+    }
+
+    var tpl = '<div class="weui-actionsheet " id="weui-actionsheet">'+
+                titleHtml +
+                '<div class="weui-actionsheet__menu">'+
+                actionsHtml +
+                '</div>'+
+                '<div class="weui-actionsheet__action">'+
+                  '<div class="weui-actionsheet__cell weui-actionsheet_cancel">取消</div>'+
+                  '</div>'+
+                '</div>';
+    var dialog = $(tpl).appendTo(document.body);
+
+    dialog.find(".weui-actionsheet__menu .weui-actionsheet__cell, .weui-actionsheet__action .weui-actionsheet__cell").each(function(i, e) {
+      $(e).click(function() {
+        $.closeActions();
+        params.onClose && params.onClose();
+        if(actions[i] && actions[i].onClick) {
+          actions[i].onClick();
+        }
+      })
+    });
+
+    mask.show();
+    dialog.show();
+    mask.addClass("weui-mask--visible");
+    dialog.addClass("weui-actionsheet_toggle");
+  };
+
+  var hide = function() {
+    $(".weui-mask").removeClass("weui-mask--visible").transitionEnd(function() {
+      $(this).remove();
+    });
+    $(".weui-actionsheet").removeClass("weui-actionsheet_toggle").transitionEnd(function() {
+      $(this).remove();
+    });
+  }
+
+  $.actions = function(params) {
+    params = $.extend({}, defaults, params);
+    show(params);
+  }
+
+  $.closeActions = function() {
+    hide();
+  }
+
+  $(document).on("click", ".weui-actions_mask", function() {
+    $.closeActions();
+  });
+
+  var defaults = $.actions.prototype.defaults = {
+    title: undefined,
+    onClose: undefined,
+    /*actions: [{
+      text: "菜单",
+      className: "color-danger",
+      onClick: function() {
+        console.log(1);
+      }
+    },{
+      text: "菜单2",
+      className: "color-success",
+      onClick: function() {
+        console.log(2);
+      }
+    }]*/
+  }
+
+}($);
+
+/* ===============================================================================
+************   Pull to refreh ************
+=============================================================================== */
+/* global $:true */
+
++function ($) {
+  "use strict";
+
+  var PTR = function(el, opt) {
+    if (typeof opt === typeof function () {}) {
+      opt = {
+        onRefresh: opt
+      }
+    }
+    if (typeof opt === typeof 'a') {
+      opt = undefined
+    }
+    this.opt = $.extend(PTR.defaults, opt || {});
+    this.container = $(el);
+    this.attachEvents();
+  }
+
+  PTR.defaults = {
+    distance: 50,
+    onRefresh: undefined,
+    onPull: undefined
+  }
+
+  PTR.prototype.touchStart = function(e) {
+    if(this.container.hasClass("refreshing")) return;
+    var p = $.getTouchPosition(e);
+    this.start = p;
+    this.diffX = this.diffY = 0;
+  };
+
+  PTR.prototype.touchMove= function(e) {
+    if(this.container.hasClass("refreshing")) return;
+    if(!this.start) return false;
+    if(this.container.scrollTop() > 0) return;
+    var p = $.getTouchPosition(e);
+    this.diffX = p.x - this.start.x;
+    this.diffY = p.y - this.start.y;
+    if (Math.abs(this.diffX) > Math.abs(this.diffY)) return true; // 说明是左右方向的拖动
+    if(this.diffY < 0) return;
+    this.container.addClass("touching");
+    e.preventDefault();
+    e.stopPropagation();
+    this.diffY = Math.pow(this.diffY, 0.75);
+    this.container.css("transform", "translate3d(0, "+this.diffY+"px, 0)");
+    this.triggerPull(this.diffY)
+  };
+  PTR.prototype.touchEnd = function() {
+    this.start = false;
+    if(this.diffY <= 0 || this.container.hasClass("refreshing")) return;
+    this.container.removeClass("touching");
+    this.container.removeClass("pull-down pull-up");
+    this.container.css("transform", "");
+    if(Math.abs(this.diffY) <= this.opt.distance) {
+    } else {
+      this.triggerPullToRefresh();
+    }
+  };
+
+  PTR.prototype.triggerPullToRefresh = function() {
+    this.triggerPull(this.opt.distance)
+    this.container.removeClass('pull-up').addClass("refreshing");
+    if (this.opt.onRefresh) {
+      this.opt.onRefresh.call(this)
+    }
+    this.container.trigger("pull-to-refresh");
+  }
+
+  PTR.prototype.triggerPull = function(diffY) {
+
+    if(diffY < this.opt.distance) {
+      this.container.removeClass("pull-up").addClass("pull-down");
+    } else {
+      this.container.removeClass("pull-down").addClass("pull-up");
+    }
+
+    if (this.opt.onPull) {
+      this.opt.onPull.call(this, Math.floor(diffY / this.opt.distance * 100))
+    }
+    this.container.trigger("pull");
+  }
+
+  PTR.prototype.pullToRefreshDone = function() {
+    this.container.removeClass("refreshing");
+  }
+
+  PTR.prototype.attachEvents = function() {
+    var el = this.container;
+    el.addClass("weui-pull-to-refresh");
+    el.on($.touchEvents.start, $.proxy(this.touchStart, this));
+    el.on($.touchEvents.move, $.proxy(this.touchMove, this));
+    el.on($.touchEvents.end, $.proxy(this.touchEnd, this));
+  };
+
+  var pullToRefreshDone = function(el) {
+    $(el).removeClass("refreshing");
+  }
+
+  $.fn.pullToRefresh = function(opt) {
+    return this.each(function() {
+      var $this = $(this)
+      var ptr = $this.data('ptr')
+      if (!ptr) $this.data('ptr', ptr = new PTR(this, opt))
+      if (typeof opt === typeof 'a') {
+        ptr[opt].call(ptr)
+      }
+    });
+  }
+
+  $.fn.pullToRefreshDone = function() {
+    return this.each(function() {
+      pullToRefreshDone(this);
+    });
+  }
+
+}($);
+
+/* ===============================================================================
+************   Infinite ************
+=============================================================================== */
+/* global $:true */
++function ($) {
+  "use strict";
+
+  // fix https://github.com/lihongxun945/jquery-weui/issues/442
+  // chrome will always return 0, when use document.body.scrollTop
+  // https://stackoverflow.com/questions/43717316/google-chrome-document-body-scrolltop-always-returns-0
+  var getOffset = function (container) {
+    var tagName = container[0].tagName.toUpperCase()
+    var scrollTop 
+    if (tagName === 'BODY' || tagName === 'HTML') {
+      scrollTop = container.scrollTop() || $(window).scrollTop()
+    } else {
+      scrollTop = container.scrollTop()
+    }
+    var offset = container.scrollHeight() - ($(window).height() + scrollTop)
+    console.log(offset)
+    return offset
+  }
+
+  var Infinite = function(el, distance) {
+    this.container = $(el);
+    this.container.data("infinite", this);
+    this.distance = distance || 50;
+    this.attachEvents();
+  }
+
+  Infinite.prototype.scroll = function() {
+    var container = this.container;
+    this._check();
+  }
+
+  Infinite.prototype.attachEvents = function(off) {
+    var el = this.container;
+    var scrollContainer = (el[0].tagName.toUpperCase() === "BODY" ? $(document) : el);
+    scrollContainer[off ? "off" : "on"]("scroll", $.proxy(this.scroll, this));
+  };
+  Infinite.prototype.detachEvents = function(off) {
+    this.attachEvents(true);
+  }
+  Infinite.prototype._check = function() {
+    var offset = getOffset(this.container);
+    if(Math.abs(offset) <= this.distance) {
+      this.container.trigger("infinite");
+    }
+  }
+
+  var infinite = function(el) {
+    attachEvents(el);
+  }
+
+  $.fn.infinite = function(distance) {
+    return this.each(function() {
+      new Infinite(this, distance);
+    });
+  }
+  $.fn.destroyInfinite = function() {
+    return this.each(function() {
+      var infinite = $(this).data("infinite");
+      if(infinite && infinite.detachEvents) infinite.detachEvents();
+    });
+  }
+
+}($);
+
+/* global $:true */
++function ($) {
+  "use strict";
+
+  var ITEM_ON = "weui-bar__item--on";
+
+  var showTab = function(a) {
+    var $a = $(a);
+    if($a.hasClass(ITEM_ON)) return;
+    var href = $a.attr("href");
+
+    if(!/^#/.test(href)) return ;
+
+    $a.parent().find("."+ITEM_ON).removeClass(ITEM_ON);
+    $a.addClass(ITEM_ON);
+
+    var bd = $a.parents(".weui-tab").find(".weui-tab__bd");
+
+    bd.find(".weui-tab__bd-item--active").removeClass("weui-tab__bd-item--active");
+
+    $(href).addClass("weui-tab__bd-item--active");
+  }
+
+  $.showTab = showTab;
+
+  $(document).on("click", ".weui-navbar__item, .weui-tabbar__item", function(e) {
+    var $a = $(e.currentTarget);
+    var href = $a.attr("href");
+    if($a.hasClass(ITEM_ON)) return;
+    if(!/^#/.test(href)) return;
+
+    e.preventDefault();
+
+    showTab($a);
+  });
+
+}($);
+
+/* global $:true */
++ function($) {
+  "use strict";
+
+  $(document).on("click touchstart", ".weui-search-bar__label", function(e) {
+    $(e.target).parents(".weui-search-bar").addClass("weui-search-bar_focusing").find('input').focus();
+  }) 
+  /*
+  .on("blur", ".weui-search-bar__input", function(e) {
+    var $input = $(e.target);
+    if(!$input.val()) $input.parents(".weui-search-bar").removeClass("weui-search-bar_focusing");
+  })
+  */
+  .on("click", ".weui-search-bar__cancel-btn", function(e) {
+    var $input = $(e.target).parents(".weui-search-bar").removeClass("weui-search-bar_focusing").find(".weui-search-bar__input").val("").blur();
+  })
+  .on("click", ".weui-icon-clear", function(e) {
+    var $input = $(e.target).parents(".weui-search-bar").find(".weui-search-bar__input").val("").focus();
+  });
+
+}($);
+
+/*===========================
+Device/OS Detection
+===========================*/
+/* global $:true */
+;(function ($) {
+    "use strict";
+    var device = {};
+    var ua = navigator.userAgent;
+
+    var android = ua.match(/(Android);?[\s\/]+([\d.]+)?/);
+    var ipad = ua.match(/(iPad).*OS\s([\d_]+)/);
+    var ipod = ua.match(/(iPod)(.*OS\s([\d_]+))?/);
+    var iphone = !ipad && ua.match(/(iPhone\sOS)\s([\d_]+)/);
+
+    device.ios = device.android = device.iphone = device.ipad = device.androidChrome = false;
+    
+    // Android
+    if (android) {
+        device.os = 'android';
+        device.osVersion = android[2];
+        device.android = true;
+        device.androidChrome = ua.toLowerCase().indexOf('chrome') >= 0;
+    }
+    if (ipad || iphone || ipod) {
+        device.os = 'ios';
+        device.ios = true;
+    }
+    // iOS
+    if (iphone && !ipod) {
+        device.osVersion = iphone[2].replace(/_/g, '.');
+        device.iphone = true;
+    }
+    if (ipad) {
+        device.osVersion = ipad[2].replace(/_/g, '.');
+        device.ipad = true;
+    }
+    if (ipod) {
+        device.osVersion = ipod[3] ? ipod[3].replace(/_/g, '.') : null;
+        device.iphone = true;
+    }
+    // iOS 8+ changed UA
+    if (device.ios && device.osVersion && ua.indexOf('Version/') >= 0) {
+        if (device.osVersion.split('.')[0] === '10') {
+            device.osVersion = ua.toLowerCase().split('version/')[1].split(' ')[0];
+        }
+    }
+
+    // Webview
+    device.webView = (iphone || ipad || ipod) && ua.match(/.*AppleWebKit(?!.*Safari)/i);
+        
+    // Minimal UI
+    if (device.os && device.os === 'ios') {
+        var osVersionArr = device.osVersion.split('.');
+        device.minimalUi = !device.webView &&
+                            (ipod || iphone) &&
+                            (osVersionArr[0] * 1 === 7 ? osVersionArr[1] * 1 >= 1 : osVersionArr[0] * 1 > 7) &&
+                            $('meta[name="viewport"]').length > 0 && $('meta[name="viewport"]').attr('content').indexOf('minimal-ui') >= 0;
+    }
+
+    // Check for status bar and fullscreen app mode
+    var windowWidth = $(window).width();
+    var windowHeight = $(window).height();
+    device.statusBar = false;
+    if (device.webView && (windowWidth * windowHeight === screen.width * screen.height)) {
+        device.statusBar = true;
+    }
+    else {
+        device.statusBar = false;
+    }
+
+    // Classes
+    var classNames = [];
+
+    // Pixel Ratio
+    device.pixelRatio = window.devicePixelRatio || 1;
+    classNames.push('pixel-ratio-' + Math.floor(device.pixelRatio));
+    if (device.pixelRatio >= 2) {
+        classNames.push('retina');
+    }
+
+    // OS classes
+    if (device.os) {
+        classNames.push(device.os, device.os + '-' + device.osVersion.split('.')[0], device.os + '-' + device.osVersion.replace(/\./g, '-'));
+        if (device.os === 'ios') {
+            var major = parseInt(device.osVersion.split('.')[0], 10);
+            for (var i = major - 1; i >= 6; i--) {
+                classNames.push('ios-gt-' + i);
+            }
+        }
+        
+    }
+    // Status bar classes
+    if (device.statusBar) {
+        classNames.push('with-statusbar-overlay');
+    }
+    else {
+        $('html').removeClass('with-statusbar-overlay');
+    }
+
+    // Add html classes
+    if (classNames.length > 0) $('html').addClass(classNames.join(' '));
+
+    $.device = device;
+})($);
+
+/*======================================================
+************   Picker   ************
+======================================================*/
+/* global $:true */
+/* jshint unused:false */
+/* jshint multistr:true */
++ function($) {
+  "use strict";
+  var Picker = function (params) {
+      var p = this;
+      var defaults = {
+          updateValuesOnMomentum: false,
+          updateValuesOnTouchmove: true,
+          rotateEffect: false,
+          momentumRatio: 7,
+          freeMode: false,
+          // Common settings
+          scrollToInput: true,
+          inputReadOnly: true,
+          toolbar: true,
+          toolbarCloseText: '完成',
+          title: '请选择',
+          toolbarTemplate: '<div class="toolbar">\
+          <div class="toolbar-inner">\
+          <a href="javascript:;" class="picker-button close-picker">{{closeText}}</a>\
+          <h1 class="title">{{title}}</h1>\
+          </div>\
+          </div>',
+      };
+      params = params || {};
+      for (var def in defaults) {
+          if (typeof params[def] === 'undefined') {
+              params[def] = defaults[def];
+          }
+      }
+      p.params = params;
+      p.cols = [];
+      p.initialized = false;
+      
+      // Inline flag
+      p.inline = p.params.container ? true : false;
+
+      // 3D Transforms origin bug, only on safari
+      var originBug = $.device.ios || (navigator.userAgent.toLowerCase().indexOf('safari') >= 0 && navigator.userAgent.toLowerCase().indexOf('chrome') < 0) && !$.device.android;
+
+      // Should be converted to popover
+      function isPopover() {
+          var toPopover = false;
+          if (!p.params.convertToPopover && !p.params.onlyInPopover) return toPopover;
+          if (!p.inline && p.params.input) {
+              if (p.params.onlyInPopover) toPopover = true;
+              else {
+                  if ($.device.ios) {
+                      toPopover = $.device.ipad ? true : false;
+                  }
+                  else {
+                      if ($(window).width() >= 768) toPopover = true;
+                  }
+              }
+          } 
+          return toPopover; 
+      }
+      function inPopover() {
+          if (p.opened && p.container && p.container.length > 0 && p.container.parents('.popover').length > 0) return true;
+          else return false;
+      }
+
+      // Value
+      p.setValue = function (arrValues, transition) {
+          var valueIndex = 0;
+          for (var i = 0; i < p.cols.length; i++) {
+              if (p.cols[i] && !p.cols[i].divider) {
+                  p.cols[i].setValue(arrValues[valueIndex], transition);
+                  valueIndex++;
+              }
+          }
+      };
+      p.updateValue = function () {
+          var newValue = [];
+          var newDisplayValue = [];
+          for (var i = 0; i < p.cols.length; i++) {
+              if (!p.cols[i].divider) {
+                  newValue.push(p.cols[i].value);
+                  newDisplayValue.push(p.cols[i].displayValue);
+              }
+          }
+          if (newValue.indexOf(undefined) >= 0) {
+              return;
+          }
+          p.value = newValue;
+          p.displayValue = newDisplayValue;
+          if (p.params.onChange) {
+              p.params.onChange(p, p.value, p.displayValue);
+          }
+          if (p.input && p.input.length > 0) {
+              $(p.input).val(p.params.formatValue ? p.params.formatValue(p, p.value, p.displayValue) : p.value.join(' '));
+              $(p.input).trigger('change');
+          }
+      };
+
+      // Columns Handlers
+      p.initPickerCol = function (colElement, updateItems) {
+          var colContainer = $(colElement);
+          var colIndex = colContainer.index();
+          var col = p.cols[colIndex];
+          if (col.divider) return;
+          col.container = colContainer;
+          col.wrapper = col.container.find('.picker-items-col-wrapper');
+          col.items = col.wrapper.find('.picker-item');
+          
+          var i, j;
+          var wrapperHeight, itemHeight, itemsHeight, minTranslate, maxTranslate;
+          col.replaceValues = function (values, displayValues) {
+              col.destroyEvents();
+              col.values = values;
+              col.displayValues = displayValues;
+              var newItemsHTML = p.columnHTML(col, true);
+              col.wrapper.html(newItemsHTML);
+              col.items = col.wrapper.find('.picker-item');
+              col.calcSize();
+              col.setValue(col.values[0] || '', 0, true);
+              col.initEvents();
+          };
+          col.calcSize = function () {
+              if (!col.values.length) return;
+              if (p.params.rotateEffect) {
+                  col.container.removeClass('picker-items-col-absolute');
+                  if (!col.width) col.container.css({width:''});
+              }
+              var colWidth, colHeight;
+              colWidth = 0;
+              colHeight = col.container[0].offsetHeight;
+              wrapperHeight = col.wrapper[0].offsetHeight;
+              itemHeight = col.items[0].offsetHeight;
+              itemsHeight = itemHeight * col.items.length;
+              minTranslate = colHeight / 2 - itemsHeight + itemHeight / 2;
+              maxTranslate = colHeight / 2 - itemHeight / 2;    
+              if (col.width) {
+                  colWidth = col.width;
+                  if (parseInt(colWidth, 10) === colWidth) colWidth = colWidth + 'px';
+                  col.container.css({width: colWidth});
+              }
+              if (p.params.rotateEffect) {
+                  if (!col.width) {
+                      col.items.each(function () {
+                          var item = $(this);
+                          item.css({width:'auto'});
+                          colWidth = Math.max(colWidth, item[0].offsetWidth);
+                          item.css({width:''});
+                      });
+                      col.container.css({width: (colWidth + 2) + 'px'});
+                  }
+                  col.container.addClass('picker-items-col-absolute');
+              }
+          };
+          col.calcSize();
+          
+          col.wrapper.transform('translate3d(0,' + maxTranslate + 'px,0)').transition(0);
+
+
+          var activeIndex = 0;
+          var animationFrameId;
+
+          // Set Value Function
+          col.setValue = function (newValue, transition, valueCallbacks) {
+              if (typeof transition === 'undefined') transition = '';
+              var newActiveIndex = col.wrapper.find('.picker-item[data-picker-value="' + newValue + '"]').index();
+              if(typeof newActiveIndex === 'undefined' || newActiveIndex === -1) {
+                  col.value = col.displayValue = newValue;
+                  return;
+              }
+              var newTranslate = -newActiveIndex * itemHeight + maxTranslate;
+              // Update wrapper
+              col.wrapper.transition(transition);
+              col.wrapper.transform('translate3d(0,' + (newTranslate) + 'px,0)');
+                  
+              // Watch items
+              if (p.params.updateValuesOnMomentum && col.activeIndex && col.activeIndex !== newActiveIndex ) {
+                  $.cancelAnimationFrame(animationFrameId);
+                  col.wrapper.transitionEnd(function(){
+                      $.cancelAnimationFrame(animationFrameId);
+                  });
+                  updateDuringScroll();
+              }
+
+              // Update items
+              col.updateItems(newActiveIndex, newTranslate, transition, valueCallbacks);
+          };
+
+          col.updateItems = function (activeIndex, translate, transition, valueCallbacks) {
+              if (typeof translate === 'undefined') {
+                  translate = $.getTranslate(col.wrapper[0], 'y');
+              }
+              if(typeof activeIndex === 'undefined') activeIndex = -Math.round((translate - maxTranslate)/itemHeight);
+              if (activeIndex < 0) activeIndex = 0;
+              if (activeIndex >= col.items.length) activeIndex = col.items.length - 1;
+              var previousActiveIndex = col.activeIndex;
+              col.activeIndex = activeIndex;
+              /*
+              col.wrapper.find('.picker-selected, .picker-after-selected, .picker-before-selected').removeClass('picker-selected picker-after-selected picker-before-selected');
+
+              col.items.transition(transition);
+              var selectedItem = col.items.eq(activeIndex).addClass('picker-selected').transform('');
+              var prevItems = selectedItem.prevAll().addClass('picker-before-selected');
+              var nextItems = selectedItem.nextAll().addClass('picker-after-selected');
+              */
+              //去掉 .picker-after-selected, .picker-before-selected 以提高性能
+              col.wrapper.find('.picker-selected').removeClass('picker-selected');
+              if (p.params.rotateEffect) {
+                col.items.transition(transition);
+              }
+              var selectedItem = col.items.eq(activeIndex).addClass('picker-selected').transform('');
+
+              if (valueCallbacks || typeof valueCallbacks === 'undefined') {
+                  // Update values
+                  col.value = selectedItem.attr('data-picker-value');
+                  col.displayValue = col.displayValues ? col.displayValues[activeIndex] : col.value;
+                  // On change callback
+                  if (previousActiveIndex !== activeIndex) {
+                      if (col.onChange) {
+                          col.onChange(p, col.value, col.displayValue);
+                      }
+                      p.updateValue();
+                  }
+              }
+                  
+              // Set 3D rotate effect
+              if (!p.params.rotateEffect) {
+                  return;
+              }
+              var percentage = (translate - (Math.floor((translate - maxTranslate)/itemHeight) * itemHeight + maxTranslate)) / itemHeight;
+              
+              col.items.each(function () {
+                  var item = $(this);
+                  var itemOffsetTop = item.index() * itemHeight;
+                  var translateOffset = maxTranslate - translate;
+                  var itemOffset = itemOffsetTop - translateOffset;
+                  var percentage = itemOffset / itemHeight;
+
+                  var itemsFit = Math.ceil(col.height / itemHeight / 2) + 1;
+                  
+                  var angle = (-18*percentage);
+                  if (angle > 180) angle = 180;
+                  if (angle < -180) angle = -180;
+                  // Far class
+                  if (Math.abs(percentage) > itemsFit) item.addClass('picker-item-far');
+                  else item.removeClass('picker-item-far');
+                  // Set transform
+                  item.transform('translate3d(0, ' + (-translate + maxTranslate) + 'px, ' + (originBug ? -110 : 0) + 'px) rotateX(' + angle + 'deg)');
+              });
+          };
+
+          function updateDuringScroll() {
+              animationFrameId = $.requestAnimationFrame(function () {
+                  col.updateItems(undefined, undefined, 0);
+                  updateDuringScroll();
+              });
+          }
+
+          // Update items on init
+          if (updateItems) col.updateItems(0, maxTranslate, 0);
+
+          var allowItemClick = true;
+          var isTouched, isMoved, touchStartY, touchCurrentY, touchStartTime, touchEndTime, startTranslate, returnTo, currentTranslate, prevTranslate, velocityTranslate, velocityTime;
+          function handleTouchStart (e) {
+              if (isMoved || isTouched) return;
+              e.preventDefault();
+              isTouched = true;
+              var position = $.getTouchPosition(e);
+              touchStartY = touchCurrentY = position.y;
+              touchStartTime = (new Date()).getTime();
+              
+              allowItemClick = true;
+              startTranslate = currentTranslate = $.getTranslate(col.wrapper[0], 'y');
+          }
+          function handleTouchMove (e) {
+              if (!isTouched) return;
+              e.preventDefault();
+              allowItemClick = false;
+              var position = $.getTouchPosition(e);
+              touchCurrentY = position.y;
+              if (!isMoved) {
+                  // First move
+                  $.cancelAnimationFrame(animationFrameId);
+                  isMoved = true;
+                  startTranslate = currentTranslate = $.getTranslate(col.wrapper[0], 'y');
+                  col.wrapper.transition(0);
+              }
+              e.preventDefault();
+
+              var diff = touchCurrentY - touchStartY;
+              currentTranslate = startTranslate + diff;
+              returnTo = undefined;
+
+              // Normalize translate
+              if (currentTranslate < minTranslate) {
+                  currentTranslate = minTranslate - Math.pow(minTranslate - currentTranslate, 0.8);
+                  returnTo = 'min';
+              }
+              if (currentTranslate > maxTranslate) {
+                  currentTranslate = maxTranslate + Math.pow(currentTranslate - maxTranslate, 0.8);
+                  returnTo = 'max';
+              }
+              // Transform wrapper
+              col.wrapper.transform('translate3d(0,' + currentTranslate + 'px,0)');
+
+              // Update items
+              col.updateItems(undefined, currentTranslate, 0, p.params.updateValuesOnTouchmove);
+              
+              // Calc velocity
+              velocityTranslate = currentTranslate - prevTranslate || currentTranslate;
+              velocityTime = (new Date()).getTime();
+              prevTranslate = currentTranslate;
+          }
+          function handleTouchEnd (e) {
+              if (!isTouched || !isMoved) {
+                  isTouched = isMoved = false;
+                  return;
+              }
+              isTouched = isMoved = false;
+              col.wrapper.transition('');
+              if (returnTo) {
+                  if (returnTo === 'min') {
+                      col.wrapper.transform('translate3d(0,' + minTranslate + 'px,0)');
+                  }
+                  else col.wrapper.transform('translate3d(0,' + maxTranslate + 'px,0)');
+              }
+              touchEndTime = new Date().getTime();
+              var velocity, newTranslate;
+              if (touchEndTime - touchStartTime > 300) {
+                  newTranslate = currentTranslate;
+              }
+              else {
+                  velocity = Math.abs(velocityTranslate / (touchEndTime - velocityTime));
+                  newTranslate = currentTranslate + velocityTranslate * p.params.momentumRatio;
+              }
+
+              newTranslate = Math.max(Math.min(newTranslate, maxTranslate), minTranslate);
+
+              // Active Index
+              var activeIndex = -Math.floor((newTranslate - maxTranslate)/itemHeight);
+
+              // Normalize translate
+              if (!p.params.freeMode) newTranslate = -activeIndex * itemHeight + maxTranslate;
+
+              // Transform wrapper
+              col.wrapper.transform('translate3d(0,' + (parseInt(newTranslate,10)) + 'px,0)');
+
+              // Update items
+              col.updateItems(activeIndex, newTranslate, '', true);
+
+              // Watch items
+              if (p.params.updateValuesOnMomentum) {
+                  updateDuringScroll();
+                  col.wrapper.transitionEnd(function(){
+                      $.cancelAnimationFrame(animationFrameId);
+                  });
+              }
+
+              // Allow click
+              setTimeout(function () {
+                  allowItemClick = true;
+              }, 100);
+          }
+
+          function handleClick(e) {
+              if (!allowItemClick) return;
+              $.cancelAnimationFrame(animationFrameId);
+              /*jshint validthis:true */
+              var value = $(this).attr('data-picker-value');
+              col.setValue(value);
+          }
+
+          col.initEvents = function (detach) {
+              var method = detach ? 'off' : 'on';
+              col.container[method]($.touchEvents.start, handleTouchStart);
+              col.container[method]($.touchEvents.move, handleTouchMove);
+              col.container[method]($.touchEvents.end, handleTouchEnd);
+              col.items[method]('click', handleClick);
+          };
+          col.destroyEvents = function () {
+              col.initEvents(true);
+          };
+
+          col.container[0].f7DestroyPickerCol = function () {
+              col.destroyEvents();
+          };
+
+          col.initEvents();
+
+      };
+      p.destroyPickerCol = function (colContainer) {
+          colContainer = $(colContainer);
+          if ('f7DestroyPickerCol' in colContainer[0]) colContainer[0].f7DestroyPickerCol();
+      };
+      // Resize cols
+      function resizeCols() {
+          if (!p.opened) return;
+          for (var i = 0; i < p.cols.length; i++) {
+              if (!p.cols[i].divider) {
+                  p.cols[i].calcSize();
+                  p.cols[i].setValue(p.cols[i].value, 0, false);
+              }
+          }
+      }
+      $(window).on('resize', resizeCols);
+
+      // HTML Layout
+      p.columnHTML = function (col, onlyItems) {
+          var columnItemsHTML = '';
+          var columnHTML = '';
+          if (col.divider) {
+              columnHTML += '<div class="picker-items-col picker-items-col-divider ' + (col.textAlign ? 'picker-items-col-' + col.textAlign : '') + ' ' + (col.cssClass || '') + '">' + col.content + '</div>';
+          }
+          else {
+              for (var j = 0; j < col.values.length; j++) {
+                  columnItemsHTML += '<div class="picker-item" data-picker-value="' + col.values[j] + '">' + (col.displayValues ? col.displayValues[j] : col.values[j]) + '</div>';
+              }
+              columnHTML += '<div class="picker-items-col ' + (col.textAlign ? 'picker-items-col-' + col.textAlign : '') + ' ' + (col.cssClass || '') + '"><div class="picker-items-col-wrapper">' + columnItemsHTML + '</div></div>';
+          }
+          return onlyItems ? columnItemsHTML : columnHTML;
+      };
+      p.layout = function () {
+          var pickerHTML = '';
+          var pickerClass = '';
+          var i;
+          p.cols = [];
+          var colsHTML = '';
+          for (i = 0; i < p.params.cols.length; i++) {
+              var col = p.params.cols[i];
+              colsHTML += p.columnHTML(p.params.cols[i]);
+              p.cols.push(col);
+          }
+          pickerClass = 'weui-picker-modal picker-columns ' + (p.params.cssClass || '') + (p.params.rotateEffect ? ' picker-3d' : '') + (p.params.cols.length === 1 ? ' picker-columns-single' : '');
+          pickerHTML =
+              '<div class="' + (pickerClass) + '">' +
+                  (p.params.toolbar ? p.params.toolbarTemplate.replace(/{{closeText}}/g, p.params.toolbarCloseText).replace(/{{title}}/g, p.params.title) : '') +
+                  '<div class="picker-modal-inner picker-items">' +
+                      colsHTML +
+                      '<div class="picker-center-highlight"></div>' +
+                  '</div>' +
+              '</div>';
+              
+          p.pickerHTML = pickerHTML;    
+      };
+
+      // Input Events
+      function openOnInput(e) {
+          e.preventDefault();
+          if (p.opened) return;
+          p.open();
+          if (p.params.scrollToInput && !isPopover()) {
+              var pageContent = p.input.parents('.content');
+              if (pageContent.length === 0) return;
+
+              var paddingTop = parseInt(pageContent.css('padding-top'), 10),
+                  paddingBottom = parseInt(pageContent.css('padding-bottom'), 10),
+                  pageHeight = pageContent[0].offsetHeight - paddingTop - p.container.height(),
+                  pageScrollHeight = pageContent[0].scrollHeight - paddingTop - p.container.height(),
+                  newPaddingBottom;
+              var inputTop = p.input.offset().top - paddingTop + p.input[0].offsetHeight;
+              if (inputTop > pageHeight) {
+                  var scrollTop = pageContent.scrollTop() + inputTop - pageHeight;
+                  if (scrollTop + pageHeight > pageScrollHeight) {
+                      newPaddingBottom = scrollTop + pageHeight - pageScrollHeight + paddingBottom;
+                      if (pageHeight === pageScrollHeight) {
+                          newPaddingBottom = p.container.height();
+                      }
+                      pageContent.css({'padding-bottom': (newPaddingBottom) + 'px'});
+                  }
+                  pageContent.scrollTop(scrollTop, 300);
+              }
+          }
+      }
+      function closeOnHTMLClick(e) {
+          if (inPopover()) return;
+          if (p.input && p.input.length > 0) {
+              if (e.target !== p.input[0] && $(e.target).parents('.weui-picker-modal').length === 0) p.close();
+          }
+          else {
+              if ($(e.target).parents('.weui-picker-modal').length === 0) p.close();   
+          }
+      }
+
+      if (p.params.input) {
+          p.input = $(p.params.input);
+          if (p.input.length > 0) {
+              if (p.params.inputReadOnly) p.input.prop('readOnly', true);
+              if (!p.inline) {
+                  p.input.on('click', openOnInput);    
+              }
+              if (p.params.inputReadOnly) {
+                  p.input.on('focus mousedown', function (e) {
+                      e.preventDefault();
+                  });
+              }
+          }
+              
+      }
+      
+      if (!p.inline) $('html').on('click', closeOnHTMLClick);
+
+      // Open
+      function onPickerClose() {
+          p.opened = false;
+          if (p.input && p.input.length > 0) p.input.parents('.page-content').css({'padding-bottom': ''});
+          if (p.params.onClose) p.params.onClose(p);
+
+          // Destroy events
+          p.container.find('.picker-items-col').each(function () {
+              p.destroyPickerCol(this);
+          });
+      }
+
+      p.opened = false;
+      p.open = function () {
+          var toPopover = isPopover();
+
+          if (!p.opened) {
+
+              // Layout
+              p.layout();
+
+              // Append
+              if (toPopover) {
+                  p.pickerHTML = '<div class="popover popover-picker-columns"><div class="popover-inner">' + p.pickerHTML + '</div></div>';
+                  p.popover = $.popover(p.pickerHTML, p.params.input, true);
+                  p.container = $(p.popover).find('.weui-picker-modal');
+                  $(p.popover).on('close', function () {
+                      onPickerClose();
+                  });
+              }
+              else if (p.inline) {
+                  p.container = $(p.pickerHTML);
+                  p.container.addClass('picker-modal-inline');
+                  $(p.params.container).append(p.container);
+              }
+              else {
+                  p.container = $($.openPicker(p.pickerHTML));
+                  $(p.container)
+                  .on('close', function () {
+                      onPickerClose();
+                  });
+              }
+
+              // Store picker instance
+              p.container[0].f7Picker = p;
+
+              // Init Events
+              p.container.find('.picker-items-col').each(function () {
+                  var updateItems = true;
+                  if ((!p.initialized && p.params.value) || (p.initialized && p.value)) updateItems = false;
+                  p.initPickerCol(this, updateItems);
+              });
+              
+              // Set value
+              if (!p.initialized) {
+                  if (p.params.value) {
+                      p.setValue(p.params.value, 0);
+                  }
+              }
+              else {
+                  if (p.value) p.setValue(p.value, 0);
+              }
+          }
+
+          // Set flag
+          p.opened = true;
+          p.initialized = true;
+
+          if (p.params.onOpen) p.params.onOpen(p);
+      };
+
+      // Close
+      p.close = function (force) {
+          if (!p.opened || p.inline) return;
+          if (inPopover()) {
+              $.closePicker(p.popover);
+              return;
+          }
+          else {
+              $.closePicker(p.container);
+              return;
+          }
+      };
+
+      // Destroy
+      p.destroy = function () {
+          p.close();
+          if (p.params.input && p.input.length > 0) {
+              p.input.off('click focus', openOnInput);
+              $(p.input).data('picker', null);
+          }
+          $('html').off('click', closeOnHTMLClick);
+          $(window).off('resize', resizeCols);
+      };
+
+      if (p.inline) {
+          p.open();
+      }
+
+      return p;
+  };
+
+  $(document).on("click", ".close-picker", function() {
+    var pickerToClose = $('.weui-picker-modal.weui-picker-modal-visible');
+    if (pickerToClose.length > 0) {
+      $.closePicker(pickerToClose);
+    }
+  });
+
+  //修复picker会滚动页面的bug
+  $(document).on($.touchEvents.move, ".picker-modal-inner", function(e) {
+    e.preventDefault();
+  });
+
+
+  $.openPicker = function(tpl, className, callback) {
+
+    if(typeof className === "function") {
+      callback = className;
+      className = undefined;
+    }
+
+    $.closePicker();
+
+    var container = $("<div class='weui-picker-container "+ (className || "") + "'></div>").appendTo(document.body);
+    container.show();
+
+    container.addClass("weui-picker-container-visible");
+
+    //关于布局的问题，如果直接放在body上，则做动画的时候会撑开body高度而导致滚动条变化。
+    var dialog = $(tpl).appendTo(container);
+    
+    dialog.width(); //通过取一次CSS值，强制浏览器不能把上下两行代码合并执行，因为合并之后会导致无法出现动画。
+
+    dialog.addClass("weui-picker-modal-visible");
+
+    callback && container.on("close", callback);
+
+    return dialog;
+  }
+
+  $.updatePicker = function(tpl) {
+    var container = $(".weui-picker-container-visible");
+    if(!container[0]) return false;
+
+    container.html("");
+
+    var dialog = $(tpl).appendTo(container);
+
+    dialog.addClass("weui-picker-modal-visible");
+
+    return dialog;
+  }
+
+  $.closePicker = function(container, callback) {
+    if(typeof container === "function") callback = container;
+    $(".weui-picker-modal-visible").removeClass("weui-picker-modal-visible").transitionEnd(function() {
+      $(this).parent().remove();
+      callback && callback();
+    }).trigger("close");
+  };
+
+  $.fn.picker = function(params) {
+    var args = arguments;
+    return this.each(function() {
+      if(!this) return;
+      var $this = $(this);
+      
+      var picker = $this.data("picker");
+      if(!picker) {
+        params = $.extend({ input: this }, params || {}) // https://github.com/lihongxun945/jquery-weui/issues/432
+        var inputValue = $this.val();
+        if(params.value === undefined && inputValue !== "") {
+          params.value = (params.cols && params.cols.length > 1) ? inputValue.split(" ") : [inputValue];
+        }
+        var p = $.extend({input: this}, params);
+        picker = new Picker(p);
+        $this.data("picker", picker);
+      }
+      if(typeof params === typeof "a") {
+        picker[params].apply(picker, Array.prototype.slice.call(args, 1));
+      }
+    });
+  };
+}($);
+
+/* global $:true */
++ function($) {
+  "use strict";
+
+  var defaults;
+
+  var selects = [];
+
+  var Select = function(input, config) {
+
+    var self = this;
+    this.config = config;
+
+    //init empty data
+    this.data = {
+      values: '',
+      titles: '',
+      origins: [],
+      length: 0
+    };
+
+    this.$input = $(input);
+    this.$input.prop("readOnly", true);
+
+    this.initConfig();
+
+    config = this.config;
+
+    this.$input.click($.proxy(this.open, this));
+    selects.push(this)
+  }
+
+  Select.prototype.initConfig = function() {
+    this.config = $.extend({}, defaults, this.config);
+
+    var config = this.config;
+
+    if(!config.items || !config.items.length) return;
+
+    config.items = config.items.map(function(d, i) {
+      if(typeof d == typeof "a") {
+        return {
+          title: d,
+          value: d
+        };
+      }
+
+      return d;
+    });
+
+
+    this.tpl = $.t7.compile("<div class='weui-picker-modal weui-select-modal'>" + config.toolbarTemplate + (config.multi ? config.checkboxTemplate : config.radioTemplate) + "</div>");
+
+    if(config.input !== undefined) this.$input.val(config.input);
+
+    this.parseInitValue();
+
+    this._init = true;
+  }
+
+  Select.prototype.updateInputValue = function(values, titles) {
+    var v, t;
+    if(this.config.multi) {
+      v = values.join(this.config.split);
+      t = titles.join(this.config.split);
+    } else {
+      v = values[0];
+      t = titles[0];
+    }
+
+    //caculate origin data
+    var origins = [];
+
+    this.config.items.forEach(function(d) {
+      values.each(function(i, dd) {
+        if(d.value == dd) origins.push(d);
+      });
+    });
+
+    this.$input.val(t).data("values", v);
+    this.$input.attr("value", t).attr("data-values", v);
+
+    var data = {
+      values: v,
+      titles: t,
+      valuesArray: values,
+      titlesArray: titles,
+      origins: origins,
+      length: origins.length
+    };
+    this.data = data;
+    this.$input.trigger("change", data);
+    this.config.onChange && this.config.onChange.call(this, data);
+  }
+
+  Select.prototype.parseInitValue = function() {
+    var value = this.$input.val();
+    var items = this.config.items;
+
+    //如果input为空，只有在第一次初始化的时候才保留默认选择。因为后来就是用户自己取消了全部选择，不能再为他选中默认值。
+    if( !this._init && (value === undefined || value == null || value === "")) return;
+
+    var titles = this.config.multi ? value.split(this.config.split) : [value];
+    for(var i=0;i<items.length;i++) {
+      items[i].checked = false;
+      for(var j=0;j<titles.length;j++) {
+        if(items[i].title === titles[j]) {
+          items[i].checked = true;
+        }
+      }
+    }
+  }
+
+  Select.prototype._bind = function(dialog) {
+    var self = this,
+        config = this.config;
+    dialog.on("change", function(e) {
+      var checked = dialog.find("input:checked");
+      var values = checked.map(function() {
+        return $(this).val();
+      });
+      var titles = checked.map(function() {
+        return $(this).data("title");
+      });
+      self.updateInputValue(values, titles);
+
+      if(config.autoClose && !config.multi) self.close();
+    })
+    .trigger('change')
+    .on("click", ".close-select", function() {
+      self.close();
+    });
+  }
+
+  //更新数据
+  Select.prototype.update = function(config) {
+    this.config = $.extend({}, this.config, config);
+    this.initConfig();
+    if(this._open) {
+      this._bind($.updatePicker(this.getHTML()));
+    }
+  }
+  
+  Select.prototype.open = function(values, titles) {
+
+    if(this._open) return;
+
+    // open picker 会默认关掉其他的，但是 onClose 不会被调用，所以这里先关掉其他select
+    for (var i = 0; i < selects.length; i++ ) {
+      var s = selects[i];
+      if (s === this) continue;
+      if (s._open) {
+        if(!s.close()) return false; // 其他的select由于某些条件限制关闭失败。
+      }
+    }
+
+    this.parseInitValue();
+
+    var config = this.config;
+
+    var dialog = this.dialog = $.openPicker(this.getHTML());
+    
+    this._bind(dialog);
+
+    this._open = true;
+    if(config.onOpen) config.onOpen(this);
+  }
+
+  Select.prototype.close = function(callback, force) {
+    if (!this._open) return false;
+    var self = this,
+        beforeClose = this.config.beforeClose;
+
+    if(typeof callback === typeof true) {
+      force === callback;
+    }
+    if(!force) {
+      if(beforeClose && typeof beforeClose === 'function' && beforeClose.call(this, this.data.values, this.data.titles) === false) {
+        return false
+      }
+      if(this.config.multi) {
+        if(this.config.min !== undefined && this.data.length < this.config.min) {
+          $.toast("请至少选择"+this.config.min+"个", "text");
+          return false
+        }
+        if(this.config.max !== undefined && this.data.length > this.config.max) {
+          $.toast("最多只能选择"+this.config.max+"个", "text");
+          return false
+        }
+      }
+    }
+    $.closePicker(function() {
+      self.onClose();
+      callback && callback();
+    });
+
+    return true
+  }
+
+  Select.prototype.onClose = function() {
+    this._open = false;
+    if(this.config.onClose) this.config.onClose(this);
+  }
+
+  Select.prototype.getHTML = function(callback) {
+    var config = this.config;
+    return this.tpl({
+      items: config.items,
+      title: config.title,
+      closeText: config.closeText
+    })
+  }
+
+
+  $.fn.select = function(params, args) {
+
+    return this.each(function() {
+      var $this = $(this);
+      if(!$this.data("weui-select")) $this.data("weui-select", new Select(this, params));
+
+      var select = $this.data("weui-select");
+
+      if(typeof params === typeof "a") select[params].call(select, args);
+
+      return select;
+    });
+  }
+
+  defaults = $.fn.select.prototype.defaults = {
+    items: [],
+    input: undefined, //输入框的初始值
+    title: "请选择",
+    multi: false,
+    closeText: "确定",
+    autoClose: true, //是否选择完成后自动关闭，只有单选模式下才有效
+    onChange: undefined, //function
+    beforeClose: undefined, // function 关闭之前，如果返回false则阻止关闭
+    onClose: undefined, //function
+    onOpen: undefined, //function
+    split: ",",  //多选模式下的分隔符
+    min: undefined, //多选模式下可用，最少选择数
+    max: undefined, //单选模式下可用，最多选择数
+    toolbarTemplate: '<div class="toolbar">\
+      <div class="toolbar-inner">\
+      <a href="javascript:;" class="picker-button close-select">{{closeText}}</a>\
+      <h1 class="title">{{title}}</h1>\
+      </div>\
+      </div>',
+    radioTemplate:
+      '<div class="weui-cells weui-cells_radio">\
+        {{#items}}\
+        <label class="weui-cell weui-check_label" for="weui-select-id-{{this.title}}">\
+          <div class="weui-cell__bd weui-cell_primary">\
+            <p>{{this.title}}</p>\
+          </div>\
+          <div class="weui-cell__ft">\
+            <input type="radio" class="weui-check" name="weui-select" id="weui-select-id-{{this.title}}" value="{{this.value}}" {{#if this.checked}}checked="checked"{{/if}} data-title="{{this.title}}">\
+            <span class="weui-icon-checked"></span>\
+          </div>\
+        </label>\
+        {{/items}}\
+      </div>',
+    checkboxTemplate:
+      '<div class="weui-cells weui-cells_checkbox">\
+        {{#items}}\
+        <label class="weui-cell weui-check_label" for="weui-select-id-{{this.title}}">\
+          <div class="weui-cell__bd weui-cell_primary">\
+            <p>{{this.title}}</p>\
+          </div>\
+          <div class="weui-cell__ft">\
+            <input type="checkbox" class="weui-check" name="weui-select" id="weui-select-id-{{this.title}}" value="{{this.value}}" {{#if this.checked}}checked="checked"{{/if}} data-title="{{this.title}}" >\
+            <span class="weui-icon-checked"></span>\
+          </div>\
+        </label>\
+        {{/items}}\
+      </div>',
+  }
+
+}($);
+
+/*======================================================
+************   Calendar   ************
+======================================================*/
+/* global $:true */
+/*jshint unused: false*/
++function ($) {
+  "use strict";
+  var rtl = false;
+  var defaults;
+  var isSameDate = function (a, b) {
+    var a = new Date(a),
+      b = new Date(b);
+    return a.getFullYear() === b.getFullYear() && a.getMonth() === b.getMonth() && a.getDate() === b.getDate()
+  }
+  var Calendar = function (params) {
+      var p = this;
+      params = params || {};
+      for (var def in defaults) {
+          if (typeof params[def] === 'undefined') {
+              params[def] = defaults[def];
+          }
+      }
+      p.params = params;
+      p.initialized = false;
+
+      // Inline flag
+      p.inline = p.params.container ? true : false;
+
+      // Is horizontal
+      p.isH = p.params.direction === 'horizontal';
+
+      // RTL inverter
+      var inverter = p.isH ? (rtl ? -1 : 1) : 1;
+
+      // Animating flag
+      p.animating = false;
+
+      // Should be converted to popover
+      function isPopover() {
+          var toPopover = false;
+          if (!p.params.convertToPopover && !p.params.onlyInPopover) return toPopover;
+          if (!p.inline && p.params.input) {
+              if (p.params.onlyInPopover) toPopover = true;
+              else {
+                  if ($.device.ios) {
+                      toPopover = $.device.ipad ? true : false;
+                  }
+                  else {
+                      if ($(window).width() >= 768) toPopover = true;
+                  }
+              }
+          } 
+          return toPopover; 
+      }
+      function inPopover() {
+          if (p.opened && p.container && p.container.length > 0 && p.container.parents('.popover').length > 0) return true;
+          else return false;
+      }
+
+      // Format date
+      function formatDate(date) {
+          date = new Date(date);
+          var year = date.getFullYear();
+          var month = date.getMonth();
+          var month1 = month + 1;
+          var day = date.getDate();
+          var weekDay = date.getDay();
+          return p.params.dateFormat
+              .replace(/yyyy/g, year)
+              .replace(/yy/g, (year + '').substring(2))
+              .replace(/mm/g, month1 < 10 ? '0' + month1 : month1)
+              .replace(/m/g, month1)
+              .replace(/MM/g, p.params.monthNames[month])
+              .replace(/M/g, p.params.monthNamesShort[month])
+              .replace(/dd/g, day < 10 ? '0' + day : day)
+              .replace(/d/g, day)
+              .replace(/DD/g, p.params.dayNames[weekDay])
+              .replace(/D/g, p.params.dayNamesShort[weekDay]);
+      }
+
+
+      // Value
+      p.addValue = function (value) {
+          if (p.params.multiple) {
+              if (!p.value) p.value = [];
+              var inValuesIndex;
+              for (var i = 0; i < p.value.length; i++) {
+                  if (isSameDate(value, p.value[i])) {
+                      inValuesIndex = i;
+                  }
+              }
+              if (typeof inValuesIndex === 'undefined') {
+                  p.value.push(value);
+              }
+              else {
+                  p.value.splice(inValuesIndex, 1);
+              }
+              p.updateValue();
+          }
+          else {
+              p.value = [value];
+              p.updateValue();
+          }
+      };
+      p.setValue = function (arrValues) {
+        var date = new Date(arrValues[0]);
+        p.setYearMonth(date.getFullYear(), date.getMonth());
+        p.addValue(+ date);
+      };
+      p.updateValue = function () {
+          p.wrapper.find('.picker-calendar-day-selected').removeClass('picker-calendar-day-selected');
+          var i, inputValue;
+          for (i = 0; i < p.value.length; i++) {
+              var valueDate = new Date(p.value[i]);
+              p.wrapper.find('.picker-calendar-day[data-date="' + valueDate.getFullYear() + '-' + valueDate.getMonth() + '-' + valueDate.getDate() + '"]').addClass('picker-calendar-day-selected');
+          }
+          if (p.params.onChange) {
+            p.params.onChange(p, p.value.map(formatDate), p.value.map(function (d) {
+              return + new Date(typeof d === typeof 'a' ? d.split(/\D/).filter(function (a) { return !!a; }).join("-") : d);
+            }));
+          }
+          if (p.input && p.input.length > 0) {
+              if (p.params.formatValue) inputValue = p.params.formatValue(p, p.value);
+              else {
+                  inputValue = [];
+                  for (i = 0; i < p.value.length; i++) {
+                      inputValue.push(formatDate(p.value[i]));
+                  }
+                  inputValue = inputValue.join(', ');
+              } 
+              $(p.input).val(inputValue);
+              $(p.input).trigger('change');
+          }
+      };
+
+      // Columns Handlers
+      p.initCalendarEvents = function () {
+          var col;
+          var allowItemClick = true;
+          var isTouched, isMoved, touchStartX, touchStartY, touchCurrentX, touchCurrentY, touchStartTime, touchEndTime, startTranslate, currentTranslate, wrapperWidth, wrapperHeight, percentage, touchesDiff, isScrolling;
+          function handleTouchStart (e) {
+              if (isMoved || isTouched) return;
+              // e.preventDefault();
+              isTouched = true;
+              var position = $.getTouchPosition(e);
+              touchStartX = touchCurrentY = position.x;
+              touchStartY = touchCurrentY = position.y;
+              touchStartTime = (new Date()).getTime();
+              percentage = 0;
+              allowItemClick = true;
+              isScrolling = undefined;
+              startTranslate = currentTranslate = p.monthsTranslate;
+          }
+          function handleTouchMove (e) {
+              if (!isTouched) return;
+              var position = $.getTouchPosition(e);
+              touchCurrentX = position.x;
+              touchCurrentY = position.y;
+              if (typeof isScrolling === 'undefined') {
+                  isScrolling = !!(isScrolling || Math.abs(touchCurrentY - touchStartY) > Math.abs(touchCurrentX - touchStartX));
+              }
+              if (p.isH && isScrolling) {
+                  isTouched = false;
+                  return;
+              }
+              e.preventDefault();
+              if (p.animating) {
+                  isTouched = false;
+                  return;   
+              }
+              allowItemClick = false;
+              if (!isMoved) {
+                  // First move
+                  isMoved = true;
+                  wrapperWidth = p.wrapper[0].offsetWidth;
+                  wrapperHeight = p.wrapper[0].offsetHeight;
+                  p.wrapper.transition(0);
+              }
+              e.preventDefault();
+
+              touchesDiff = p.isH ? touchCurrentX - touchStartX : touchCurrentY - touchStartY;
+              percentage = touchesDiff/(p.isH ? wrapperWidth : wrapperHeight);
+              currentTranslate = (p.monthsTranslate * inverter + percentage) * 100;
+
+              // Transform wrapper
+              p.wrapper.transform('translate3d(' + (p.isH ? currentTranslate : 0) + '%, ' + (p.isH ? 0 : currentTranslate) + '%, 0)');
+
+          }
+          function handleTouchEnd (e) {
+              if (!isTouched || !isMoved) {
+                  isTouched = isMoved = false;
+                  return;
+              }
+              isTouched = isMoved = false;
+              
+              touchEndTime = new Date().getTime();
+              if (touchEndTime - touchStartTime < 300) {
+                  if (Math.abs(touchesDiff) < 10) {
+                      p.resetMonth();
+                  }
+                  else if (touchesDiff >= 10) {
+                      if (rtl) p.nextMonth();
+                      else p.prevMonth();
+                  }
+                  else {
+                      if (rtl) p.prevMonth();
+                      else p.nextMonth();   
+                  }
+              }
+              else {
+                  if (percentage <= -0.5) {
+                      if (rtl) p.prevMonth();
+                      else p.nextMonth();
+                  }
+                  else if (percentage >= 0.5) {
+                      if (rtl) p.nextMonth();
+                      else p.prevMonth();
+                  }
+                  else {
+                      p.resetMonth();
+                  }
+              }
+
+              // Allow click
+              setTimeout(function () {
+                  allowItemClick = true;
+              }, 100);
+          }
+
+          function handleDayClick(e) {
+              if (!allowItemClick) return;
+              var day = $(e.target).parents('.picker-calendar-day');
+              if (day.length === 0 && $(e.target).hasClass('picker-calendar-day')) {
+                  day = $(e.target);
+              }
+              if (day.length === 0) return;
+              // if (day.hasClass('picker-calendar-day-selected') && !p.params.multiple) return;
+              if (day.hasClass('picker-calendar-day-disabled')) return;
+              if (day.hasClass('picker-calendar-day-next')) p.nextMonth();
+              if (day.hasClass('picker-calendar-day-prev')) p.prevMonth();
+              var dateYear = day.attr('data-year');
+              var dateMonth = day.attr('data-month');
+              var dateDay = day.attr('data-day');
+              if (p.params.onDayClick) {
+                  p.params.onDayClick(p, day[0], dateYear, dateMonth, dateDay);
+              }
+              p.addValue(new Date(dateYear, dateMonth, dateDay).getTime());
+              if (p.params.closeOnSelect && !p.params.multiple) p.close();
+          }
+
+          p.container.find('.picker-calendar-prev-month').on('click', p.prevMonth);
+          p.container.find('.picker-calendar-next-month').on('click', p.nextMonth);
+          p.container.find('.picker-calendar-prev-year').on('click', p.prevYear);
+          p.container.find('.picker-calendar-next-year').on('click', p.nextYear);
+          p.wrapper.on('click', handleDayClick);
+          if (p.params.touchMove) {
+              p.wrapper.on($.touchEvents.start, handleTouchStart);
+              p.wrapper.on($.touchEvents.move, handleTouchMove);
+              p.wrapper.on($.touchEvents.end, handleTouchEnd);
+          }
+              
+          p.container[0].f7DestroyCalendarEvents = function () {
+              p.container.find('.picker-calendar-prev-month').off('click', p.prevMonth);
+              p.container.find('.picker-calendar-next-month').off('click', p.nextMonth);
+              p.container.find('.picker-calendar-prev-year').off('click', p.prevYear);
+              p.container.find('.picker-calendar-next-year').off('click', p.nextYear);
+              p.wrapper.off('click', handleDayClick);
+              if (p.params.touchMove) {
+                  p.wrapper.off($.touchEvents.start, handleTouchStart);
+                  p.wrapper.off($.touchEvents.move, handleTouchMove);
+                  p.wrapper.off($.touchEvents.end, handleTouchEnd);
+              }
+          };
+          
+
+      };
+      p.destroyCalendarEvents = function (colContainer) {
+          if ('f7DestroyCalendarEvents' in p.container[0]) p.container[0].f7DestroyCalendarEvents();
+      };
+
+      // Calendar Methods
+      p.daysInMonth = function (date) {
+          var d = new Date(date);
+          return new Date(d.getFullYear(), d.getMonth() + 1, 0).getDate();
+      };
+      p.monthHTML = function (date, offset) {
+          date = new Date(date);
+          var year = date.getFullYear(),
+              month = date.getMonth(),
+              day = date.getDate();
+          if (offset === 'next') {
+              if (month === 11) date = new Date(year + 1, 0);
+              else date = new Date(year, month + 1, 1);
+          }
+          if (offset === 'prev') {
+              if (month === 0) date = new Date(year - 1, 11);
+              else date = new Date(year, month - 1, 1);
+          }
+          if (offset === 'next' || offset === 'prev') {
+              month = date.getMonth();
+              year = date.getFullYear();
+          }
+          var daysInPrevMonth = p.daysInMonth(new Date(date.getFullYear(), date.getMonth()).getTime() - 10 * 24 * 60 * 60 * 1000),
+              daysInMonth = p.daysInMonth(date),
+              firstDayOfMonthIndex = new Date(date.getFullYear(), date.getMonth()).getDay();
+          if (firstDayOfMonthIndex === 0) firstDayOfMonthIndex = 7;
+          
+          var dayDate, currentValues = [], i, j,
+              rows = 6, cols = 7,
+              monthHTML = '',
+              dayIndex = 0 + (p.params.firstDay - 1),    
+              today = new Date().setHours(0,0,0,0),
+              minDate = p.params.minDate ? new Date(p.params.minDate).getTime() : null,
+              maxDate = p.params.maxDate ? new Date(p.params.maxDate).getTime() : null;
+
+          if (p.value && p.value.length) {
+              for (i = 0; i < p.value.length; i++) {
+                  currentValues.push(new Date(p.value[i]).setHours(0,0,0,0));
+              }
+          }
+              
+          for (i = 1; i <= rows; i++) {
+              var rowHTML = '';
+              var row = i;
+              for (j = 1; j <= cols; j++) {
+                  var col = j;
+                  dayIndex ++;
+                  var dayNumber = dayIndex - firstDayOfMonthIndex;
+                  var addClass = '';
+                  if (dayNumber < 0) {
+                      dayNumber = daysInPrevMonth + dayNumber + 1;
+                      addClass += ' picker-calendar-day-prev';
+                      dayDate = new Date(month - 1 < 0 ? year - 1 : year, month - 1 < 0 ? 11 : month - 1, dayNumber).getTime();
+                  }
+                  else {
+                      dayNumber = dayNumber + 1;
+                      if (dayNumber > daysInMonth) {
+                          dayNumber = dayNumber - daysInMonth;
+                          addClass += ' picker-calendar-day-next';
+                          dayDate = new Date(month + 1 > 11 ? year + 1 : year, month + 1 > 11 ? 0 : month + 1, dayNumber).getTime();
+                      }
+                      else {
+                          dayDate = new Date(year, month, dayNumber).getTime();    
+                      }
+                  }
+                  // Today
+                  if (dayDate === today) addClass += ' picker-calendar-day-today';
+                  // Selected
+                  if (currentValues.indexOf(dayDate) >= 0) addClass += ' picker-calendar-day-selected';
+                  // Weekend
+                  if (p.params.weekendDays.indexOf(col - 1) >= 0) {
+                      addClass += ' picker-calendar-day-weekend';
+                  }
+                  // Disabled
+                  if ((minDate && dayDate < minDate) || (maxDate && dayDate > maxDate)) {
+                      addClass += ' picker-calendar-day-disabled';   
+                  }
+
+                  dayDate = new Date(dayDate);
+                  var dayYear = dayDate.getFullYear();
+                  var dayMonth = dayDate.getMonth();
+                  rowHTML += '<div data-year="' + dayYear + '" data-month="' + dayMonth + '" data-day="' + dayNumber + '" class="picker-calendar-day' + (addClass) + '" data-date="' + (dayYear + '-' + dayMonth + '-' + dayNumber) + '"><span>'+dayNumber+'</span></div>';
+              }
+              monthHTML += '<div class="picker-calendar-row">' + rowHTML + '</div>';
+          }
+          monthHTML = '<div class="picker-calendar-month" data-year="' + year + '" data-month="' + month + '">' + monthHTML + '</div>';
+          return monthHTML;
+      };
+      p.animating = false;
+      p.updateCurrentMonthYear = function (dir) {
+          if (typeof dir === 'undefined') {
+              p.currentMonth = parseInt(p.months.eq(1).attr('data-month'), 10);
+              p.currentYear = parseInt(p.months.eq(1).attr('data-year'), 10);   
+          }
+          else {
+              p.currentMonth = parseInt(p.months.eq(dir === 'next' ? (p.months.length - 1) : 0).attr('data-month'), 10);
+              p.currentYear = parseInt(p.months.eq(dir === 'next' ? (p.months.length - 1) : 0).attr('data-year'), 10);
+          }
+          p.container.find('.current-month-value').text(p.params.monthNames[p.currentMonth]);
+          p.container.find('.current-year-value').text(p.currentYear);
+              
+      };
+      p.onMonthChangeStart = function (dir) {
+          p.updateCurrentMonthYear(dir);
+          p.months.removeClass('picker-calendar-month-current picker-calendar-month-prev picker-calendar-month-next');
+          var currentIndex = dir === 'next' ? p.months.length - 1 : 0;
+
+          p.months.eq(currentIndex).addClass('picker-calendar-month-current');
+          p.months.eq(dir === 'next' ? currentIndex - 1 : currentIndex + 1).addClass(dir === 'next' ? 'picker-calendar-month-prev' : 'picker-calendar-month-next');
+
+          if (p.params.onMonthYearChangeStart) {
+              p.params.onMonthYearChangeStart(p, p.currentYear, p.currentMonth);
+          }
+      };
+      p.onMonthChangeEnd = function (dir, rebuildBoth) {
+          p.animating = false;
+          var nextMonthHTML, prevMonthHTML, newMonthHTML;
+          p.wrapper.find('.picker-calendar-month:not(.picker-calendar-month-prev):not(.picker-calendar-month-current):not(.picker-calendar-month-next)').remove();
+          
+          if (typeof dir === 'undefined') {
+              dir = 'next';
+              rebuildBoth = true;
+          }
+          if (!rebuildBoth) {
+              newMonthHTML = p.monthHTML(new Date(p.currentYear, p.currentMonth), dir);
+          }
+          else {
+              p.wrapper.find('.picker-calendar-month-next, .picker-calendar-month-prev').remove();
+              prevMonthHTML = p.monthHTML(new Date(p.currentYear, p.currentMonth), 'prev');
+              nextMonthHTML = p.monthHTML(new Date(p.currentYear, p.currentMonth), 'next');
+          }
+          if (dir === 'next' || rebuildBoth) {
+              p.wrapper.append(newMonthHTML || nextMonthHTML);
+          }
+          if (dir === 'prev' || rebuildBoth) {
+              p.wrapper.prepend(newMonthHTML || prevMonthHTML);
+          }
+          p.months = p.wrapper.find('.picker-calendar-month');
+          p.setMonthsTranslate(p.monthsTranslate);
+          if (p.params.onMonthAdd) {
+              p.params.onMonthAdd(p, dir === 'next' ? p.months.eq(p.months.length - 1)[0] : p.months.eq(0)[0]);
+          }
+          if (p.params.onMonthYearChangeEnd) {
+              p.params.onMonthYearChangeEnd(p, p.currentYear, p.currentMonth);
+          }
+      };
+      p.setMonthsTranslate = function (translate) {
+          translate = translate || p.monthsTranslate || 0;
+          if (typeof p.monthsTranslate === 'undefined') p.monthsTranslate = translate;
+          p.months.removeClass('picker-calendar-month-current picker-calendar-month-prev picker-calendar-month-next');
+          var prevMonthTranslate = -(translate + 1) * 100 * inverter;
+          var currentMonthTranslate = -translate * 100 * inverter;
+          var nextMonthTranslate = -(translate - 1) * 100 * inverter;
+          p.months.eq(0).transform('translate3d(' + (p.isH ? prevMonthTranslate : 0) + '%, ' + (p.isH ? 0 : prevMonthTranslate) + '%, 0)').addClass('picker-calendar-month-prev');
+          p.months.eq(1).transform('translate3d(' + (p.isH ? currentMonthTranslate : 0) + '%, ' + (p.isH ? 0 : currentMonthTranslate) + '%, 0)').addClass('picker-calendar-month-current');
+          p.months.eq(2).transform('translate3d(' + (p.isH ? nextMonthTranslate : 0) + '%, ' + (p.isH ? 0 : nextMonthTranslate) + '%, 0)').addClass('picker-calendar-month-next');
+      };
+      p.nextMonth = function (transition) {
+          if (typeof transition === 'undefined' || typeof transition === 'object') {
+              transition = '';
+              if (!p.params.animate) transition = 0;
+          }
+          var nextMonth = parseInt(p.months.eq(p.months.length - 1).attr('data-month'), 10);
+          var nextYear = parseInt(p.months.eq(p.months.length - 1).attr('data-year'), 10);
+          var nextDate = new Date(nextYear, nextMonth);
+          var nextDateTime = nextDate.getTime();
+          var transitionEndCallback = p.animating ? false : true;
+          if (p.params.maxDate) {
+              if (nextDateTime > new Date(p.params.maxDate).getTime()) {
+                  return p.resetMonth();
+              }
+          }
+          p.monthsTranslate --;
+          if (nextMonth === p.currentMonth) {
+              var nextMonthTranslate = -(p.monthsTranslate) * 100 * inverter;
+              var nextMonthHTML = $(p.monthHTML(nextDateTime, 'next')).transform('translate3d(' + (p.isH ? nextMonthTranslate : 0) + '%, ' + (p.isH ? 0 : nextMonthTranslate) + '%, 0)').addClass('picker-calendar-month-next');
+              p.wrapper.append(nextMonthHTML[0]);
+              p.months = p.wrapper.find('.picker-calendar-month');
+              if (p.params.onMonthAdd) {
+                  p.params.onMonthAdd(p, p.months.eq(p.months.length - 1)[0]);
+              }
+          }
+          p.animating = true;
+          p.onMonthChangeStart('next');
+          var translate = (p.monthsTranslate * 100) * inverter;
+
+          p.wrapper.transition(transition).transform('translate3d(' + (p.isH ? translate : 0) + '%, ' + (p.isH ? 0 : translate) + '%, 0)');
+          if (transitionEndCallback) {
+              p.wrapper.transitionEnd(function () {
+                  p.onMonthChangeEnd('next');
+              });
+          }
+          if (!p.params.animate) {
+              p.onMonthChangeEnd('next');
+          }
+      };
+      p.prevMonth = function (transition) {
+          if (typeof transition === 'undefined' || typeof transition === 'object') {
+              transition = '';
+              if (!p.params.animate) transition = 0;
+          }
+          var prevMonth = parseInt(p.months.eq(0).attr('data-month'), 10);
+          var prevYear = parseInt(p.months.eq(0).attr('data-year'), 10);
+          var prevDate = new Date(prevYear, prevMonth + 1, -1);
+          var prevDateTime = prevDate.getTime();
+          var transitionEndCallback = p.animating ? false : true;
+          if (p.params.minDate) {
+              if (prevDateTime < new Date(p.params.minDate).getTime()) {
+                  return p.resetMonth();
+              }
+          }
+          p.monthsTranslate ++;
+          if (prevMonth === p.currentMonth) {
+              var prevMonthTranslate = -(p.monthsTranslate) * 100 * inverter;
+              var prevMonthHTML = $(p.monthHTML(prevDateTime, 'prev')).transform('translate3d(' + (p.isH ? prevMonthTranslate : 0) + '%, ' + (p.isH ? 0 : prevMonthTranslate) + '%, 0)').addClass('picker-calendar-month-prev');
+              p.wrapper.prepend(prevMonthHTML[0]);
+              p.months = p.wrapper.find('.picker-calendar-month');
+              if (p.params.onMonthAdd) {
+                  p.params.onMonthAdd(p, p.months.eq(0)[0]);
+              }
+          }
+          p.animating = true;
+          p.onMonthChangeStart('prev');
+          var translate = (p.monthsTranslate * 100) * inverter;
+          p.wrapper.transition(transition).transform('translate3d(' + (p.isH ? translate : 0) + '%, ' + (p.isH ? 0 : translate) + '%, 0)');
+          if (transitionEndCallback) {
+              p.wrapper.transitionEnd(function () {
+                  p.onMonthChangeEnd('prev');
+              });
+          }
+          if (!p.params.animate) {
+              p.onMonthChangeEnd('prev');
+          }
+      };
+      p.resetMonth = function (transition) {
+          if (typeof transition === 'undefined') transition = '';
+          var translate = (p.monthsTranslate * 100) * inverter;
+          p.wrapper.transition(transition).transform('translate3d(' + (p.isH ? translate : 0) + '%, ' + (p.isH ? 0 : translate) + '%, 0)');
+      };
+      p.setYearMonth = function (year, month, transition) {
+          if (typeof year === 'undefined') year = p.currentYear;
+          if (typeof month === 'undefined') month = p.currentMonth;
+          if (typeof transition === 'undefined' || typeof transition === 'object') {
+              transition = '';
+              if (!p.params.animate) transition = 0;
+          }
+          var targetDate;
+          if (year < p.currentYear) {
+              targetDate = new Date(year, month + 1, -1).getTime();
+          }
+          else {
+              targetDate = new Date(year, month).getTime();
+          }
+          if (p.params.maxDate && targetDate > new Date(p.params.maxDate).getTime()) {
+              return false;
+          }
+          if (p.params.minDate && targetDate < new Date(p.params.minDate).getTime()) {
+              return false;
+          }
+          var currentDate = new Date(p.currentYear, p.currentMonth).getTime();
+          var dir = targetDate > currentDate ? 'next' : 'prev';
+          var newMonthHTML = p.monthHTML(new Date(year, month));
+          p.monthsTranslate = p.monthsTranslate || 0;
+          var prevTranslate = p.monthsTranslate;
+          var monthTranslate, wrapperTranslate;
+          var transitionEndCallback = p.animating ? false : true;
+          if (targetDate > currentDate) {
+              // To next
+              p.monthsTranslate --;
+              if (!p.animating) p.months.eq(p.months.length - 1).remove();
+              p.wrapper.append(newMonthHTML);
+              p.months = p.wrapper.find('.picker-calendar-month');
+              monthTranslate = -(prevTranslate - 1) * 100 * inverter;
+              p.months.eq(p.months.length - 1).transform('translate3d(' + (p.isH ? monthTranslate : 0) + '%, ' + (p.isH ? 0 : monthTranslate) + '%, 0)').addClass('picker-calendar-month-next');
+          }
+          else {
+              // To prev
+              p.monthsTranslate ++;
+              if (!p.animating) p.months.eq(0).remove();
+              p.wrapper.prepend(newMonthHTML);
+              p.months = p.wrapper.find('.picker-calendar-month');
+              monthTranslate = -(prevTranslate + 1) * 100 * inverter;
+              p.months.eq(0).transform('translate3d(' + (p.isH ? monthTranslate : 0) + '%, ' + (p.isH ? 0 : monthTranslate) + '%, 0)').addClass('picker-calendar-month-prev');
+          }
+          if (p.params.onMonthAdd) {
+              p.params.onMonthAdd(p, dir === 'next' ? p.months.eq(p.months.length - 1)[0] : p.months.eq(0)[0]);
+          }
+          p.animating = true;
+          p.onMonthChangeStart(dir);
+          wrapperTranslate = (p.monthsTranslate * 100) * inverter;
+          p.wrapper.transition(transition).transform('translate3d(' + (p.isH ? wrapperTranslate : 0) + '%, ' + (p.isH ? 0 : wrapperTranslate) + '%, 0)');
+          if (transitionEndCallback) {
+             p.wrapper.transitionEnd(function () {
+                  p.onMonthChangeEnd(dir, true);
+              }); 
+          }
+          if (!p.params.animate) {
+              p.onMonthChangeEnd(dir);
+          }
+      };
+      p.nextYear = function () {
+          p.setYearMonth(p.currentYear + 1);
+      };
+      p.prevYear = function () {
+          p.setYearMonth(p.currentYear - 1);
+      };
+      
+
+      // HTML Layout
+      p.layout = function () {
+          var pickerHTML = '';
+          var pickerClass = '';
+          var i;
+          
+          var layoutDate = p.value && p.value.length ? p.value[0] : new Date().setHours(0,0,0,0);
+          var prevMonthHTML = p.monthHTML(layoutDate, 'prev');
+          var currentMonthHTML = p.monthHTML(layoutDate);
+          var nextMonthHTML = p.monthHTML(layoutDate, 'next');
+          var monthsHTML = '<div class="picker-calendar-months"><div class="picker-calendar-months-wrapper">' + (prevMonthHTML + currentMonthHTML + nextMonthHTML) + '</div></div>';
+          // Week days header
+          var weekHeaderHTML = '';
+          if (p.params.weekHeader) {
+              for (i = 0; i < 7; i++) {
+                  var weekDayIndex = (i + p.params.firstDay > 6) ? (i - 7 + p.params.firstDay) : (i + p.params.firstDay);
+                  var dayName = p.params.dayNamesShort[weekDayIndex];
+                  weekHeaderHTML += '<div class="picker-calendar-week-day ' + ((p.params.weekendDays.indexOf(weekDayIndex) >= 0) ? 'picker-calendar-week-day-weekend' : '') + '"> ' + dayName + '</div>';
+                  
+              }
+              weekHeaderHTML = '<div class="picker-calendar-week-days">' + weekHeaderHTML + '</div>';
+          }
+          pickerClass = 'weui-picker-calendar ' + (p.params.cssClass || '');
+          if(!p.inline) pickerClass = 'weui-picker-modal ' + pickerClass;
+          var toolbarHTML = p.params.toolbar ? p.params.toolbarTemplate.replace(/{{closeText}}/g, p.params.toolbarCloseText) : '';
+          if (p.params.toolbar) {
+              toolbarHTML = p.params.toolbarTemplate
+                  .replace(/{{closeText}}/g, p.params.toolbarCloseText)
+                  .replace(/{{monthPicker}}/g, (p.params.monthPicker ? p.params.monthPickerTemplate : ''))
+                  .replace(/{{yearPicker}}/g, (p.params.yearPicker ? p.params.yearPickerTemplate : ''));
+          }
+
+          pickerHTML =
+              '<div class="' + (pickerClass) + '">' +
+                  toolbarHTML +
+                  '<div class="picker-modal-inner">' +
+                      weekHeaderHTML +
+                      monthsHTML +
+                  '</div>' +
+              '</div>';
+              
+              
+          p.pickerHTML = pickerHTML;    
+      };
+
+      // Input Events
+      function openOnInput(e) {
+          e.preventDefault();
+          if (p.opened) return;
+          p.open();
+          if (p.params.scrollToInput && !isPopover()) {
+              var pageContent = p.input.parents('.page-content');
+              if (pageContent.length === 0) return;
+
+              var paddingTop = parseInt(pageContent.css('padding-top'), 10),
+                  paddingBottom = parseInt(pageContent.css('padding-bottom'), 10),
+                  pageHeight = pageContent[0].offsetHeight - paddingTop - p.container.height(),
+                  pageScrollHeight = pageContent[0].scrollHeight - paddingTop - p.container.height(),
+                  newPaddingBottom;
+
+              var inputTop = p.input.offset().top - paddingTop + p.input[0].offsetHeight;
+              if (inputTop > pageHeight) {
+                  var scrollTop = pageContent.scrollTop() + inputTop - pageHeight;
+                  if (scrollTop + pageHeight > pageScrollHeight) {
+                      newPaddingBottom = scrollTop + pageHeight - pageScrollHeight + paddingBottom;
+                      if (pageHeight === pageScrollHeight) {
+                          newPaddingBottom = p.container.height();
+                      }
+                      pageContent.css({'padding-bottom': (newPaddingBottom) + 'px'});
+                  }
+                  pageContent.scrollTop(scrollTop, 300);
+              }
+          }
+      }
+      function closeOnHTMLClick(e) {
+          if (inPopover()) return;
+          if (p.input && p.input.length > 0) {
+              if (e.target !== p.input[0] && $(e.target).parents('.weui-picker-modal').length === 0) p.close();
+          }
+          else {
+              if ($(e.target).parents('.weui-picker-modal').length === 0) p.close();   
+          }
+      }
+
+      if (p.params.input) {
+          p.input = $(p.params.input);
+          if (p.input.length > 0) {
+              if (p.params.inputReadOnly) p.input.prop('readOnly', true);
+              if (!p.inline) {
+                  p.input.on('click', openOnInput);    
+              }
+              if (p.params.inputReadOnly) {
+                  p.input.on('focus mousedown', function (e) {
+                      e.preventDefault();
+                  });
+              }
+          }
+              
+      }
+      
+      //iphone 上无法正确触发 click，会导致点击外面无法关闭
+      if (!p.inline) $(document).on('click touchend', closeOnHTMLClick);
+
+      // Open
+      function onPickerClose() {
+          p.opened = false;
+          if (p.input && p.input.length > 0) p.input.parents('.page-content').css({'padding-bottom': ''});
+          if (p.params.onClose) p.params.onClose(p);
+
+          // Destroy events
+          p.destroyCalendarEvents();
+      }
+
+      p.opened = false;
+      p.open = function () {
+          var toPopover = isPopover() && false;
+          var updateValue = false;
+          if (!p.opened) {
+              // Set date value
+              if (!p.value) {
+                  if (p.params.value) {
+                      p.value = p.params.value;
+                      updateValue = true;
+                  }
+              }
+
+              // Layout
+              p.layout();
+
+              // Append
+              if (toPopover) {
+                  p.pickerHTML = '<div class="popover popover-picker-calendar"><div class="popover-inner">' + p.pickerHTML + '</div></div>';
+                  p.popover = $.popover(p.pickerHTML, p.params.input, true);
+                  p.container = $(p.popover).find('.weui-picker-modal');
+                  $(p.popover).on('close', function () {
+                      onPickerClose();
+                  });
+              }
+              else if (p.inline) {
+                  p.container = $(p.pickerHTML);
+                  p.container.addClass('picker-modal-inline');
+                  $(p.params.container).append(p.container);
+              }
+              else {
+                  p.container = $($.openPicker(p.pickerHTML));
+                  $(p.container)
+                  .on('close', function () {
+                      onPickerClose();
+                  });
+              }
+
+              // Store calendar instance
+              p.container[0].f7Calendar = p;
+              p.wrapper = p.container.find('.picker-calendar-months-wrapper');
+
+              // Months
+              p.months = p.wrapper.find('.picker-calendar-month');
+
+              // Update current month and year
+              p.updateCurrentMonthYear();
+
+              // Set initial translate
+              p.monthsTranslate = 0;
+              p.setMonthsTranslate();
+
+              // Init events
+              p.initCalendarEvents();
+
+              // Update input value
+              if (updateValue) p.updateValue();
+              
+          }
+
+          // Set flag
+          p.opened = true;
+          p.initialized = true;
+          if (p.params.onMonthAdd) {
+              p.months.each(function () {
+                  p.params.onMonthAdd(p, this);
+              });
+          }
+          if (p.params.onOpen) p.params.onOpen(p);
+      };
+
+      // Close
+      p.close = function () {
+          if (!p.opened || p.inline) return;
+          p.animating = false;  //有可能还有动画没做完，因此animating设置还没改。
+          if (inPopover()) {
+              $.closePicker(p.popover);
+              return;
+          }
+          else {
+              $.closePicker(p.container);
+              return;
+          }
+      };
+
+      // Destroy
+      p.destroy = function () {
+          p.close();
+          if (p.params.input && p.input.length > 0) {
+              p.input.off('click focus', openOnInput);
+              p.input.data("calendar", null);
+          }
+          $('html').off('click', closeOnHTMLClick);
+      };
+
+      if (p.inline) {
+          p.open();
+      }
+
+      return p;
+  };
+
+  var format = function(d) {
+    return d < 10 ? "0"+d : d;
+  }
+
+
+  $.fn.calendar = function (params, args) {
+      params = params || {};
+      return this.each(function() {
+        var $this = $(this);
+        if(!$this[0]) return;
+        var p = {};
+        if($this[0].tagName.toUpperCase() === "INPUT") {
+          p.input = $this;
+        } else {
+          p.container = $this;
+        }
+
+        var calendar = $this.data("calendar");
+
+        if(!calendar) {
+          if(typeof params === typeof "a") {
+          } else {
+            if(!params.value && $this.val()) params.value = [$this.val()];
+            //默认显示今天
+            if(!params.value) {
+              var today = new Date();
+              params.value = [today.getFullYear() + "/" + format(today.getMonth() + 1) + "/" + format(today.getDate())];
+            }
+            calendar = $this.data("calendar", new Calendar($.extend(p, params)));
+          }
+        }
+
+        if(typeof params === typeof "a") {
+          calendar[params].call(calendar, args);
+        }
+      });
+  };
+
+  defaults = $.fn.calendar.prototype.defaults = {
+    value: undefined, // 通过JS赋值，注意是数组
+    monthNames: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月'],
+    monthNamesShort: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月'],
+    dayNames: ['周日', '周一', '周二', '周三', '周四', '周五', '周六'],
+    dayNamesShort: ['周日', '周一', '周二', '周三', '周四', '周五', '周六'],
+    firstDay: 1, // First day of the week, Monday
+    weekendDays: [0, 6], // Sunday and Saturday
+    multiple: false,
+    dateFormat: 'yyyy/mm/dd',
+    direction: 'horizontal', // or 'vertical'
+    minDate: null,
+    maxDate: null,
+    touchMove: true,
+    animate: true,
+    closeOnSelect: true,
+    monthPicker: true,
+    monthPickerTemplate: 
+        '<div class="picker-calendar-month-picker">' +
+            '<a href="javascript:;" class="link icon-only picker-calendar-prev-month"><i class="icon icon-prev"></i></a>' +
+            '<div class="current-month-value"></div>' +
+            '<a href="javascript:;" class="link icon-only picker-calendar-next-month"><i class="icon icon-next"></i></a>' +
+        '</div>',
+    yearPicker: true,
+    yearPickerTemplate: 
+        '<div class="picker-calendar-year-picker">' +
+            '<a href="javascript:;" class="link icon-only picker-calendar-prev-year"><i class="icon icon-prev"></i></a>' +
+            '<span class="current-year-value"></span>' +
+            '<a href="javascript:;" class="link icon-only picker-calendar-next-year"><i class="icon icon-next"></i></a>' +
+        '</div>',
+    weekHeader: true,
+    // Common settings
+    scrollToInput: true,
+    inputReadOnly: true,
+    convertToPopover: true,
+    onlyInPopover: false,
+    toolbar: true,
+    toolbarCloseText: 'Done',
+    toolbarTemplate: 
+        '<div class="toolbar">' +
+            '<div class="toolbar-inner">' +
+                '{{yearPicker}}' +
+                '{{monthPicker}}' +
+                // '<a href="#" class="link close-picker">{{closeText}}</a>' +
+            '</div>' +
+        '</div>',
+    /* Callbacks
+    onMonthAdd
+    onChange
+    onOpen
+    onClose
+    onDayClick
+    onMonthYearChangeStart
+    onMonthYearChangeEnd
+    */
+  };
+
+}($);
+
+/* global $:true */
+/* jshint unused:false*/
+
++ function($) {
+  "use strict";
+
+
+  var defaults;
+
+  var formatNumber = function (n) {
+    return n < 10 ? "0" + n : n;
+  }
+
+  var Datetime = function(input, params) {
+    this.input = $(input);
+    this.params = params || {};
+
+    this.initMonthes = params.monthes
+
+    this.initYears = params.years
+
+    var p = $.extend({}, params, this.getConfig());
+    $(this.input).picker(p);
+  }
+
+  Datetime.prototype = {
+    getDays : function(max) {
+      var days = [];
+      for(var i=1; i<= (max||31);i++) {
+        days.push(i < 10 ? "0"+i : i);
+      }
+      return days;
+    },
+
+    getDaysByMonthAndYear : function(month, year) {
+      var int_d = new Date(year, parseInt(month)+1-1, 1);
+      var d = new Date(int_d - 1);
+      return this.getDays(d.getDate());
+    },
+    getConfig: function() {
+      var today = new Date(),
+          params = this.params,
+          self = this,
+          lastValidValues;
+
+      var config = {
+        rotateEffect: false,  //为了性能
+        cssClass: 'datetime-picker',
+
+        value: [today.getFullYear(), formatNumber(today.getMonth()+1), formatNumber(today.getDate()), formatNumber(today.getHours()), (formatNumber(today.getMinutes()))],
+
+        onChange: function (picker, values, displayValues) {
+          var cols = picker.cols;
+          var days = self.getDaysByMonthAndYear(values[1], values[0]);
+          var currentValue = values[2];
+          if(currentValue > days.length) currentValue = days.length;
+          picker.cols[4].setValue(currentValue);
+
+          //check min and max
+          var current = new Date(values[0]+'-'+values[1]+'-'+values[2]);
+          var valid = true;
+          if(params.min) {
+            var min = new Date(typeof params.min === "function" ? params.min() : params.min);
+
+            if(current < +min) {
+              picker.setValue(lastValidValues);
+              valid = false;
+            } 
+          }
+          if(params.max) {
+            var max = new Date(typeof params.max === "function" ? params.max() : params.max);
+            if(current > +max) {
+              picker.setValue(lastValidValues);
+              valid = false;
+            }
+          }
+
+          valid && (lastValidValues = values);
+
+          if (self.params.onChange) {
+            self.params.onChange.apply(this, arguments);
+          }
+        },
+
+        formatValue: function (p, values, displayValues) {
+          return self.params.format(p, values, displayValues);
+        },
+
+        cols: [
+          {
+            values: this.initYears
+          },
+          {
+            divider: true,  // 这是一个分隔符
+            content: params.yearSplit
+          },
+          {
+            values: this.initMonthes
+          },
+          {
+            divider: true,  // 这是一个分隔符
+            content: params.monthSplit
+          },
+          {
+            values: (function () {
+              var dates = [];
+              for (var i=1; i<=31; i++) dates.push(formatNumber(i));
+              return dates;
+            })()
+          },
+          
+        ]
+      }
+
+      if (params.dateSplit) {
+        config.cols.push({
+          divider: true,
+          content: params.dateSplit
+        })
+      }
+
+      config.cols.push({
+        divider: true,
+        content: params.datetimeSplit
+      })
+
+      var times = self.params.times();
+      if (times && times.length) {
+        config.cols = config.cols.concat(times);
+      }
+
+      var inputValue = this.input.val();
+      if(inputValue) config.value = params.parse(inputValue);
+      if(this.params.value) {
+        this.input.val(this.params.value);
+        config.value = params.parse(this.params.value);
+      }
+
+      return config;
+    }
+  }
+
+  $.fn.datetimePicker = function(params) {
+    params = $.extend({}, defaults, params);
+    return this.each(function() {
+      if(!this) return;
+      var $this = $(this);
+      var datetime = $this.data("datetime");
+      if(!datetime) $this.data("datetime", new Datetime(this, params));
+      return datetime;
+    });
+  };
+
+  defaults = $.fn.datetimePicker.prototype.defaults = {
+    input: undefined, // 默认值
+    min: undefined, // YYYY-MM-DD 最大最小值只比较年月日，不比较时分秒
+    max: undefined,  // YYYY-MM-DD
+    yearSplit: '-',
+    monthSplit: '-',
+    dateSplit: '',  // 默认为空
+    datetimeSplit: ' ',  // 日期和时间之间的分隔符，不可为空
+    monthes: ('01 02 03 04 05 06 07 08 09 10 11 12').split(' '),
+    years: (function () {
+      var arr = [];
+      for (var i = 1950; i <= 2030; i++) { arr.push(i); }
+      return arr;
+    })(),
+    times: function () {
+      return [  // 自定义的时间
+        {
+          values: (function () {
+            var hours = [];
+            for (var i=0; i<24; i++) hours.push(formatNumber(i));
+            return hours;
+          })()
+        },
+        {
+          divider: true,  // 这是一个分隔符
+          content: ':'
+        },
+        {
+          values: (function () {
+            var minutes = [];
+            for (var i=0; i<60; i++) minutes.push(formatNumber(i));
+            return minutes;
+          })()
+        }
+      ];
+    },
+    format: function (p, values) { // 数组转换成字符串
+      return p.cols.map(function (col) {
+        return col.value || col.content;
+      }).join('');
+    },
+    parse: function (str) {
+      // 把字符串转换成数组，用来解析初始值
+      // 如果你的定制的初始值格式无法被这个默认函数解析，请自定义这个函数。比如你的时间是 '子时' 那么默认情况这个'时'会被当做分隔符而导致错误，所以你需要自己定义parse函数
+      // 默认兼容的分隔符
+      var t = str.split(this.datetimeSplit);
+      return t[0].split(/\D/).concat(t[1].split(/:|时|分|秒/)).filter(function (d) {
+        return !!d;
+      })
+    }
+  }
+
+}($);
+
+/*======================================================
+************   Picker   ************
+======================================================*/
+/* global $:true */
+
++ function($) {
+  "use strict";
+
+
+  //Popup 和 picker 之类的不要共用一个弹出方法，因为这样会导致 在 popup 中再弹出 picker 的时候会有问题。
+
+  $.openPopup = function(popup, className) {
+
+    $.closePopup();
+
+    popup = $(popup);
+    popup.show();
+    popup.width();
+    popup.addClass("weui-popup__container--visible");
+    var modal = popup.find(".weui-popup__modal");
+    modal.width();
+    modal.transitionEnd(function() {
+      modal.trigger("open");
+    });
+  }
+
+
+  $.closePopup = function(container, remove) {
+    container = $(container || ".weui-popup__container--visible");
+    container.find('.weui-popup__modal').transitionEnd(function() {
+      var $this = $(this);
+      $this.trigger("close");
+      container.hide();
+      remove && container.remove();
+    })
+    container.removeClass("weui-popup__container--visible")
+  };
+
+
+  $(document).on("click", ".close-popup, .weui-popup__overlay", function() {
+    $.closePopup();
+  })
+  .on("click", ".open-popup", function() {
+    $($(this).data("target")).popup();
+  })
+  .on("click", ".weui-popup__container", function(e) {
+    if($(e.target).hasClass("weui-popup__container")) $.closePopup();
+  })
+
+  $.fn.popup = function() {
+    return this.each(function() {
+      $.openPopup(this);
+    });
+  };
+
+}($);
+
+/* ===============================================================================
+************   Notification ************
+=============================================================================== */
+/* global $:true */
++function ($) {
+  "use strict";
+
+  var noti, defaults, timeout, start, diffX, diffY;
+
+  var touchStart = function(e) {
+    var p = $.getTouchPosition(e);
+    start = p;
+    diffX = diffY = 0;
+    noti.addClass("touching");
+  };
+  var touchMove = function(e) {
+    if(!start) return false;
+    e.preventDefault();
+    e.stopPropagation();
+    var p = $.getTouchPosition(e);
+    diffX = p.x - start.x;
+    diffY = p.y - start.y;
+    if(diffY > 0) {
+      diffY = Math.sqrt(diffY);
+    }
+
+    noti.css("transform", "translate3d(0, "+diffY+"px, 0)");
+  };
+  var touchEnd = function() {
+    noti.removeClass("touching");
+    noti.attr("style", "");
+    if(diffY < 0 && (Math.abs(diffY) > noti.height()*0.38)) {
+      $.closeNotification();
+    }
+
+    if(Math.abs(diffX) <= 1 && Math.abs(diffY) <= 1) {
+      noti.trigger("noti-click");
+    }
+
+    start = false;
+  };
+
+  var attachEvents = function(el) {
+    el.on($.touchEvents.start, touchStart);
+    el.on($.touchEvents.move, touchMove);
+    el.on($.touchEvents.end, touchEnd);
+  };
+
+  $.notification = $.noti = function(params) {
+    params = $.extend({}, defaults, params);
+    noti = $(".weui-notification");
+    if(!noti[0]) { // create a new notification
+      noti = $('<div class="weui-notification"></div>').appendTo(document.body);
+      attachEvents(noti);
+    }
+
+    noti.off("noti-click"); //the click event is not correct sometime: it will trigger when user is draging.
+    if(params.onClick) noti.on("noti-click", function() {
+      params.onClick(params.data);
+    });
+
+    noti.html($.t7.compile(params.tpl)(params));
+
+    noti.show();
+
+    noti.addClass("weui-notification--in");
+    noti.data("params", params);
+
+    var startTimeout = function() {
+      if(timeout) {
+        clearTimeout(timeout);
+        timeout = null;
+      }
+
+      timeout = setTimeout(function() {
+        if(noti.hasClass("weui-notification--touching")) {
+          startTimeout();
+        } else {
+          $.closeNotification();
+        }
+      }, params.time);
+    };
+
+    startTimeout();
+
+  };
+
+  $.closeNotification = function() {
+    timeout && clearTimeout(timeout);
+    timeout = null;
+    var noti = $(".weui-notification").removeClass("weui-notification--in").transitionEnd(function() {
+      $(this).remove();
+    });
+
+    if(noti[0]) {
+      var params = $(".weui-notification").data("params");
+      if(params && params.onClose) {
+        params.onClose(params.data);
+      }
+    }
+  };
+
+  defaults = $.noti.prototype.defaults = {
+    title: undefined,
+    text: undefined,
+    media: undefined,
+    time: 4000,
+    onClick: undefined,
+    onClose: undefined,
+    data: undefined,
+    tpl:  '<div class="weui-notification__inner">' +
+            '{{#if media}}<div class="weui-notification__media">{{media}}</div>{{/if}}' +
+            '<div class="weui-notification__content">' +
+            '{{#if title}}<div class="weui-notification__title">{{title}}</div>{{/if}}' +
+            '{{#if text}}<div class="weui-notification__text">{{text}}</div>{{/if}}' +
+            '</div>' +
+            '<div class="weui-notification__handle-bar"></div>' +
+          '</div>'
+  };
+
+}($);
+
++ function($) {
+  "use strict";
+
+  var timeout;
+
+  $.toptip = function(text, duration, type) {
+    if(!text) return;
+    if(typeof duration === typeof "a") {
+      type = duration;
+      duration = undefined;
+    }
+    duration = duration || 3000;
+    var className = type ? 'bg-' + type : 'bg-danger';
+    var $t = $('.weui-toptips').remove();
+    $t = $('<div class="weui-toptips"></div>').appendTo(document.body);
+    $t.html(text);
+    $t[0].className = 'weui-toptips ' + className
+
+    clearTimeout(timeout);
+
+    if(!$t.hasClass('weui-toptips_visible')) {
+      $t.show().width();
+      $t.addClass('weui-toptips_visible');
+    }
+
+    timeout = setTimeout(function() {
+      $t.removeClass('weui-toptips_visible').transitionEnd(function() {
+        $t.remove();
+      });
+    }, duration);
+  }
+}($);
+
+/* global $:true */
++ function($) {
+  "use strict";
+  var Slider = function (container, arg) {
+    this.container = $(container);
+    this.handler = this.container.find('.weui-slider__handler')
+    this.track = this.container.find('.weui-slider__track')
+    this.value = this.container.find('.weui-slider-box__value')
+    this.bind()
+    if (typeof arg === 'function') {
+      this.callback = arg
+    }
+  }
+
+  Slider.prototype.bind = function () {
+    this.container
+      .on($.touchEvents.start, $.proxy(this.touchStart, this))
+      .on($.touchEvents.end, $.proxy(this.touchEnd, this));
+    $(document.body).on($.touchEvents.move, $.proxy(this.touchMove, this)) // move even outside container
+  }
+
+  Slider.prototype.touchStart = function (e) {
+    e.preventDefault()
+    this.start = $.getTouchPosition(e)
+    this.width = this.container.find('.weui-slider__inner').width()
+    this.left = parseInt(this.container.find('.weui-slider__handler').css('left'))
+    this.touching = true
+  }
+
+  Slider.prototype.touchMove = function (e) {
+    if (!this.touching) return true
+    var p = $.getTouchPosition(e)
+    var distance = p.x - this.start.x
+    var left = distance + this.left
+    var per = parseInt(left / this.width * 100)
+    if (per < 0) per = 0
+    if (per > 100) per = 100
+    this.handler.css('left', per + '%')
+    this.track.css('width', per + '%')
+    this.value.text(per)
+    this.callback && this.callback.call(this, per)
+    this.container.trigger('change', per)
+  }
+
+  Slider.prototype.touchEnd = function (e) {
+    this.touching = false
+  }
+
+  $.fn.slider = function (arg) {
+    this.each(function () {
+      var $this = $(this)
+      var slider = $this.data('slider')
+      if (slider) return slider;
+      else $this.data('slider', new Slider(this, arg))
+    })
+  }
+}($);
+
+/* ===============================================================================
+************   Swipeout ************
+=============================================================================== */
+/* global $:true */
+
++function ($) {
+  "use strict";
+
+  var cache = [];
+  var TOUCHING = 'swipeout-touching'
+
+  var Swipeout = function(el) {
+    this.container = $(el);
+    this.mover = this.container.find('>.weui-cell__bd')
+    this.attachEvents();
+    cache.push(this)
+  }
+
+  Swipeout.prototype.touchStart = function(e) {
+    var p = $.getTouchPosition(e);
+    this.container.addClass(TOUCHING);
+    this.start = p;
+    this.startX = 0;
+    this.startTime = + new Date;
+    var transform =  this.mover.css('transform').match(/-?[\d\.]+/g)
+    if (transform && transform.length) this.startX = parseInt(transform[4])
+    this.diffX = this.diffY = 0;
+    this._closeOthers()
+    this.limit = this.container.find('>.weui-cell__ft').width() || 68; // 因为有的时候初始化的时候元素是隐藏的（比如在对话框内），所以在touchstart的时候计算宽度而不是初始化的时候
+  };
+
+  Swipeout.prototype.touchMove= function(e) {
+    if(!this.start) return true;
+    var p = $.getTouchPosition(e);
+    this.diffX = p.x - this.start.x;
+    this.diffY = p.y - this.start.y;
+    if (Math.abs(this.diffX) < Math.abs(this.diffY)) { // 说明是上下方向在拖动
+      this.close()
+      this.start = false
+      return true;
+    }
+    e.preventDefault();
+    e.stopPropagation();
+    var x = this.diffX + this.startX
+    if (x > 0) x = 0;
+    if (Math.abs(x) > this.limit) x = - (Math.pow(-(x+this.limit), .7) + this.limit)
+    this.mover.css("transform", "translate3d("+x+"px, 0, 0)");
+  };
+  Swipeout.prototype.touchEnd = function() {
+    if (!this.start) return true;
+    this.start = false;
+    var x = this.diffX + this.startX
+    var t = new Date - this.startTime;
+    if (this.diffX < -5 && t < 200) { // 向左快速滑动，则打开
+      this.open()
+    } else if (this.diffX >= 0 && t < 200) { // 向右快速滑动，或者单击,则关闭
+      this.close()
+    } else if (x > 0 || -x <= this.limit / 2) {
+      this.close()
+    } else {
+      this.open()
+    }
+  };
+
+
+  Swipeout.prototype.close = function() {
+    this.container.removeClass(TOUCHING);
+    this.mover.css("transform", "translate3d(0, 0, 0)");
+    this.container.trigger('swipeout-close');
+  }
+
+  Swipeout.prototype.open = function() {
+    this.container.removeClass(TOUCHING);
+    this._closeOthers()
+    this.mover.css("transform", "translate3d(" + (-this.limit) + "px, 0, 0)");
+    this.container.trigger('swipeout-open');
+  }
+
+  Swipeout.prototype.attachEvents = function() {
+    var el = this.mover;
+    el.on($.touchEvents.start, $.proxy(this.touchStart, this));
+    el.on($.touchEvents.move, $.proxy(this.touchMove, this));
+    el.on($.touchEvents.end, $.proxy(this.touchEnd, this));
+  }
+  Swipeout.prototype._closeOthers = function() {
+    //close others
+    var self = this
+    cache.forEach(function (s) {
+      if (s !== self) s.close()
+    })
+  }
+
+  var swipeout = function(el) {
+    return new Swipeout(el);
+  };
+
+  $.fn.swipeout = function (arg) {
+    return this.each(function() {
+      var $this = $(this)
+      var s = $this.data('swipeout') || swipeout(this);
+      $this.data('swipeout', s);
+
+      if (typeof arg === typeof 'a') {
+        s[arg]()
+      }
+    });
+  }
+
+  $('.weui-cell_swiped').swipeout() // auto init
+}($);
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/jquery.mCustomScrollbar.concat.min.js b/pluss-wap-page/src/main/resources/static/resources/js/jquery.mCustomScrollbar.concat.min.js
new file mode 100644
index 0000000..f23925a
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/jquery.mCustomScrollbar.concat.min.js
@@ -0,0 +1,4 @@
+/*mousewheel*/
+(function(a){function d(b){var c=b||window.event,d=[].slice.call(arguments,1),e=0,f=!0,g=0,h=0;return b=a.event.fix(c),b.type="mousewheel",c.wheelDelta&&(e=c.wheelDelta/120),c.detail&&(e=-c.detail/3),h=e,c.axis!==undefined&&c.axis===c.HORIZONTAL_AXIS&&(h=0,g=-1*e),c.wheelDeltaY!==undefined&&(h=c.wheelDeltaY/120),c.wheelDeltaX!==undefined&&(g=-1*c.wheelDeltaX/120),d.unshift(b,e,g,h),(a.event.dispatch||a.event.handle).apply(this,d)}var b=["DOMMouseScroll","mousewheel"];if(a.event.fixHooks)for(var c=b.length;c;)a.event.fixHooks[b[--c]]=a.event.mouseHooks;a.event.special.mousewheel={setup:function(){if(this.addEventListener)for(var a=b.length;a;)this.addEventListener(b[--a],d,!1);else this.onmousewheel=d},teardown:function(){if(this.removeEventListener)for(var a=b.length;a;)this.removeEventListener(b[--a],d,!1);else this.onmousewheel=null}},a.fn.extend({mousewheel:function(a){return a?this.bind("mousewheel",a):this.trigger("mousewheel")},unmousewheel:function(a){return this.unbind("mousewheel",a)}})})(jQuery);
+/*custom scrollbar*/
+(function(c){var b={init:function(e){var f={set_width:false,set_height:false,horizontalScroll:false,scrollInertia:950,mouseWheel:true,mouseWheelPixels:"auto",autoDraggerLength:true,autoHideScrollbar:false,snapAmount:null,snapOffset:0,scrollButtons:{enable:false,scrollType:"continuous",scrollSpeed:"auto",scrollAmount:40},advanced:{updateOnBrowserResize:true,updateOnContentResize:false,autoExpandHorizontalScroll:false,autoScrollOnFocus:true,normalizeMouseWheelDelta:false},contentTouchScroll:true,callbacks:{onScrollStart:function(){},onScroll:function(){},onTotalScroll:function(){},onTotalScrollBack:function(){},onTotalScrollOffset:0,onTotalScrollBackOffset:0,whileScrolling:function(){}},theme:"light"},e=c.extend(true,f,e);return this.each(function(){var m=c(this);if(e.set_width){m.css("width",e.set_width)}if(e.set_height){m.css("height",e.set_height)}if(!c(document).data("mCustomScrollbar-index")){c(document).data("mCustomScrollbar-index","1")}else{var t=parseInt(c(document).data("mCustomScrollbar-index"));c(document).data("mCustomScrollbar-index",t+1)}m.wrapInner("<div class='mCustomScrollBox mCS-"+e.theme+"' id='mCSB_"+c(document).data("mCustomScrollbar-index")+"' style='position:relative; height:100%;max-width:100%;' />").addClass("mCustomScrollbar _mCS_"+c(document).data("mCustomScrollbar-index"));var g=m.children(".mCustomScrollBox");if(e.horizontalScroll){g.addClass("mCSB_horizontal").wrapInner("<div class='mCSB_h_wrapper' style='position:relative; left:0; width:999999px;' />");var k=g.children(".mCSB_h_wrapper");k.wrapInner("<div class='mCSB_container' style='position:absolute; left:0;' />").children(".mCSB_container").css({width:k.children().outerWidth(),position:"relative"}).unwrap()}else{g.wrapInner("<div class='mCSB_container' style='position:relative; top:0;' />")}var o=g.children(".mCSB_container");if(c.support.touch){o.addClass("mCS_touch")}o.after("<div class='mCSB_scrollTools' style='position:absolute;'><div class='mCSB_draggerContainer'><div class='mCSB_dragger' style='position:absolute;' oncontextmenu='return false;'><div class='mCSB_dragger_bar' style='position:relative;'></div></div><div class='mCSB_draggerRail'></div></div></div>");var l=g.children(".mCSB_scrollTools"),h=l.children(".mCSB_draggerContainer"),q=h.children(".mCSB_dragger");if(e.horizontalScroll){q.data("minDraggerWidth",q.width())}else{q.data("minDraggerHeight",q.height())}if(e.scrollButtons.enable){if(e.horizontalScroll){l.prepend("<a class='mCSB_buttonLeft' oncontextmenu='return false;'></a>").append("<a class='mCSB_buttonRight' oncontextmenu='return false;'></a>")}else{l.prepend("<a class='mCSB_buttonUp' oncontextmenu='return false;'></a>").append("<a class='mCSB_buttonDown' oncontextmenu='return false;'></a>")}}g.bind("scroll",function(){if(!m.is(".mCS_disabled")){g.scrollTop(0).scrollLeft(0)}});m.data({mCS_Init:true,mCustomScrollbarIndex:c(document).data("mCustomScrollbar-index"),horizontalScroll:e.horizontalScroll,scrollInertia:e.scrollInertia,scrollEasing:"mcsEaseOut",mouseWheel:e.mouseWheel,mouseWheelPixels:e.mouseWheelPixels,autoDraggerLength:e.autoDraggerLength,autoHideScrollbar:e.autoHideScrollbar,snapAmount:e.snapAmount,snapOffset:e.snapOffset,scrollButtons_enable:e.scrollButtons.enable,scrollButtons_scrollType:e.scrollButtons.scrollType,scrollButtons_scrollSpeed:e.scrollButtons.scrollSpeed,scrollButtons_scrollAmount:e.scrollButtons.scrollAmount,autoExpandHorizontalScroll:e.advanced.autoExpandHorizontalScroll,autoScrollOnFocus:e.advanced.autoScrollOnFocus,normalizeMouseWheelDelta:e.advanced.normalizeMouseWheelDelta,contentTouchScroll:e.contentTouchScroll,onScrollStart_Callback:e.callbacks.onScrollStart,onScroll_Callback:e.callbacks.onScroll,onTotalScroll_Callback:e.callbacks.onTotalScroll,onTotalScrollBack_Callback:e.callbacks.onTotalScrollBack,onTotalScroll_Offset:e.callbacks.onTotalScrollOffset,onTotalScrollBack_Offset:e.callbacks.onTotalScrollBackOffset,whileScrolling_Callback:e.callbacks.whileScrolling,bindEvent_scrollbar_drag:false,bindEvent_content_touch:false,bindEvent_scrollbar_click:false,bindEvent_mousewheel:false,bindEvent_buttonsContinuous_y:false,bindEvent_buttonsContinuous_x:false,bindEvent_buttonsPixels_y:false,bindEvent_buttonsPixels_x:false,bindEvent_focusin:false,bindEvent_autoHideScrollbar:false,mCSB_buttonScrollRight:false,mCSB_buttonScrollLeft:false,mCSB_buttonScrollDown:false,mCSB_buttonScrollUp:false});if(e.horizontalScroll){if(m.css("max-width")!=="none"){if(!e.advanced.updateOnContentResize){e.advanced.updateOnContentResize=true}}}else{if(m.css("max-height")!=="none"){var s=false,r=parseInt(m.css("max-height"));if(m.css("max-height").indexOf("%")>=0){s=r,r=m.parent().height()*s/100}m.css("overflow","hidden");g.css("max-height",r)}}m.mCustomScrollbar("update");if(e.advanced.updateOnBrowserResize){var i,j=c(window).width(),u=c(window).height();c(window).bind("resize."+m.data("mCustomScrollbarIndex"),function(){if(i){clearTimeout(i)}i=setTimeout(function(){if(!m.is(".mCS_disabled")&&!m.is(".mCS_destroyed")){var w=c(window).width(),v=c(window).height();if(j!==w||u!==v){if(m.css("max-height")!=="none"&&s){g.css("max-height",m.parent().height()*s/100)}m.mCustomScrollbar("update");j=w;u=v}}},150)})}if(e.advanced.updateOnContentResize){var p;if(e.horizontalScroll){var n=o.outerWidth()}else{var n=o.outerHeight()}p=setInterval(function(){if(e.horizontalScroll){if(e.advanced.autoExpandHorizontalScroll){o.css({position:"absolute",width:"auto"}).wrap("<div class='mCSB_h_wrapper' style='position:relative; left:0; width:999999px;' />").css({width:o.outerWidth(),position:"relative"}).unwrap()}var v=o.outerWidth()}else{var v=o.outerHeight()}if(v!=n){m.mCustomScrollbar("update");n=v}},300)}})},update:function(){var n=c(this),k=n.children(".mCustomScrollBox"),q=k.children(".mCSB_container");q.removeClass("mCS_no_scrollbar");n.removeClass("mCS_disabled mCS_destroyed");k.scrollTop(0).scrollLeft(0);var y=k.children(".mCSB_scrollTools"),o=y.children(".mCSB_draggerContainer"),m=o.children(".mCSB_dragger");if(n.data("horizontalScroll")){var A=y.children(".mCSB_buttonLeft"),t=y.children(".mCSB_buttonRight"),f=k.width();if(n.data("autoExpandHorizontalScroll")){q.css({position:"absolute",width:"auto"}).wrap("<div class='mCSB_h_wrapper' style='position:relative; left:0; width:999999px;' />").css({width:q.outerWidth(),position:"relative"}).unwrap()}var z=q.outerWidth()}else{var w=y.children(".mCSB_buttonUp"),g=y.children(".mCSB_buttonDown"),r=k.height(),i=q.outerHeight()}if(i>r&&!n.data("horizontalScroll")){y.css("display","block");var s=o.height();if(n.data("autoDraggerLength")){var u=Math.round(r/i*s),l=m.data("minDraggerHeight");if(u<=l){m.css({height:l})}else{if(u>=s-10){var p=s-10;m.css({height:p})}else{m.css({height:u})}}m.children(".mCSB_dragger_bar").css({"line-height":m.height()+"px"})}var B=m.height(),x=(i-r)/(s-B);n.data("scrollAmount",x).mCustomScrollbar("scrolling",k,q,o,m,w,g,A,t);var D=Math.abs(q.position().top);n.mCustomScrollbar("scrollTo",D,{scrollInertia:0,trigger:"internal"})}else{if(z>f&&n.data("horizontalScroll")){y.css("display","block");var h=o.width();if(n.data("autoDraggerLength")){var j=Math.round(f/z*h),C=m.data("minDraggerWidth");if(j<=C){m.css({width:C})}else{if(j>=h-10){var e=h-10;m.css({width:e})}else{m.css({width:j})}}}var v=m.width(),x=(z-f)/(h-v);n.data("scrollAmount",x).mCustomScrollbar("scrolling",k,q,o,m,w,g,A,t);var D=Math.abs(q.position().left);n.mCustomScrollbar("scrollTo",D,{scrollInertia:0,trigger:"internal"})}else{k.unbind("mousewheel focusin");if(n.data("horizontalScroll")){m.add(q).css("left",0)}else{m.add(q).css("top",0)}y.css("display","none");q.addClass("mCS_no_scrollbar");n.data({bindEvent_mousewheel:false,bindEvent_focusin:false})}}},scrolling:function(h,p,m,j,w,e,A,v){var k=c(this);if(!k.data("bindEvent_scrollbar_drag")){var n,o;if(c.support.msPointer){j.bind("MSPointerDown",function(H){H.preventDefault();k.data({on_drag:true});j.addClass("mCSB_dragger_onDrag");var G=c(this),J=G.offset(),F=H.originalEvent.pageX-J.left,I=H.originalEvent.pageY-J.top;if(F<G.width()&&F>0&&I<G.height()&&I>0){n=I;o=F}});c(document).bind("MSPointerMove."+k.data("mCustomScrollbarIndex"),function(H){H.preventDefault();if(k.data("on_drag")){var G=j,J=G.offset(),F=H.originalEvent.pageX-J.left,I=H.originalEvent.pageY-J.top;D(n,o,I,F)}}).bind("MSPointerUp."+k.data("mCustomScrollbarIndex"),function(x){k.data({on_drag:false});j.removeClass("mCSB_dragger_onDrag")})}else{j.bind("mousedown touchstart",function(H){H.preventDefault();H.stopImmediatePropagation();var G=c(this),K=G.offset(),F,J;if(H.type==="touchstart"){var I=H.originalEvent.touches[0]||H.originalEvent.changedTouches[0];F=I.pageX-K.left;J=I.pageY-K.top}else{k.data({on_drag:true});j.addClass("mCSB_dragger_onDrag");F=H.pageX-K.left;J=H.pageY-K.top}if(F<G.width()&&F>0&&J<G.height()&&J>0){n=J;o=F}}).bind("touchmove",function(H){H.preventDefault();H.stopImmediatePropagation();var K=H.originalEvent.touches[0]||H.originalEvent.changedTouches[0],G=c(this),J=G.offset(),F=K.pageX-J.left,I=K.pageY-J.top;D(n,o,I,F)});c(document).bind("mousemove."+k.data("mCustomScrollbarIndex"),function(H){if(k.data("on_drag")){var G=j,J=G.offset(),F=H.pageX-J.left,I=H.pageY-J.top;D(n,o,I,F)}}).bind("mouseup."+k.data("mCustomScrollbarIndex"),function(x){k.data({on_drag:false});j.removeClass("mCSB_dragger_onDrag")})}k.data({bindEvent_scrollbar_drag:true})}function D(G,H,I,F){if(k.data("horizontalScroll")){k.mCustomScrollbar("scrollTo",(j.position().left-(H))+F,{moveDragger:true,trigger:"internal"})}else{k.mCustomScrollbar("scrollTo",(j.position().top-(G))+I,{moveDragger:true,trigger:"internal"})}}if(c.support.touch&&k.data("contentTouchScroll")){if(!k.data("bindEvent_content_touch")){var l,B,r,s,u,C,E;p.bind("touchstart",function(x){x.stopImmediatePropagation();l=x.originalEvent.touches[0]||x.originalEvent.changedTouches[0];B=c(this);r=B.offset();u=l.pageX-r.left;s=l.pageY-r.top;C=s;E=u});p.bind("touchmove",function(x){x.preventDefault();x.stopImmediatePropagation();l=x.originalEvent.touches[0]||x.originalEvent.changedTouches[0];B=c(this).parent();r=B.offset();u=l.pageX-r.left;s=l.pageY-r.top;if(k.data("horizontalScroll")){k.mCustomScrollbar("scrollTo",E-u,{trigger:"internal"})}else{k.mCustomScrollbar("scrollTo",C-s,{trigger:"internal"})}})}}if(!k.data("bindEvent_scrollbar_click")){m.bind("click",function(F){var x=(F.pageY-m.offset().top)*k.data("scrollAmount"),y=c(F.target);if(k.data("horizontalScroll")){x=(F.pageX-m.offset().left)*k.data("scrollAmount")}if(y.hasClass("mCSB_draggerContainer")||y.hasClass("mCSB_draggerRail")){k.mCustomScrollbar("scrollTo",x,{trigger:"internal",scrollEasing:"draggerRailEase"})}});k.data({bindEvent_scrollbar_click:true})}if(k.data("mouseWheel")){if(!k.data("bindEvent_mousewheel")){h.bind("mousewheel",function(H,J){var G,F=k.data("mouseWheelPixels"),x=Math.abs(p.position().top),I=j.position().top,y=m.height()-j.height();if(k.data("normalizeMouseWheelDelta")){if(J<0){J=-1}else{J=1}}if(F==="auto"){F=100+Math.round(k.data("scrollAmount")/2)}if(k.data("horizontalScroll")){I=j.position().left;y=m.width()-j.width();x=Math.abs(p.position().left)}if((J>0&&I!==0)||(J<0&&I!==y)){H.preventDefault();H.stopImmediatePropagation()}G=x-(J*F);k.mCustomScrollbar("scrollTo",G,{trigger:"internal"})});k.data({bindEvent_mousewheel:true})}}if(k.data("scrollButtons_enable")){if(k.data("scrollButtons_scrollType")==="pixels"){if(k.data("horizontalScroll")){v.add(A).unbind("mousedown touchstart MSPointerDown mouseup MSPointerUp mouseout MSPointerOut touchend",i,g);k.data({bindEvent_buttonsContinuous_x:false});if(!k.data("bindEvent_buttonsPixels_x")){v.bind("click",function(x){x.preventDefault();q(Math.abs(p.position().left)+k.data("scrollButtons_scrollAmount"))});A.bind("click",function(x){x.preventDefault();q(Math.abs(p.position().left)-k.data("scrollButtons_scrollAmount"))});k.data({bindEvent_buttonsPixels_x:true})}}else{e.add(w).unbind("mousedown touchstart MSPointerDown mouseup MSPointerUp mouseout MSPointerOut touchend",i,g);k.data({bindEvent_buttonsContinuous_y:false});if(!k.data("bindEvent_buttonsPixels_y")){e.bind("click",function(x){x.preventDefault();q(Math.abs(p.position().top)+k.data("scrollButtons_scrollAmount"))});w.bind("click",function(x){x.preventDefault();q(Math.abs(p.position().top)-k.data("scrollButtons_scrollAmount"))});k.data({bindEvent_buttonsPixels_y:true})}}function q(x){if(!j.data("preventAction")){j.data("preventAction",true);k.mCustomScrollbar("scrollTo",x,{trigger:"internal"})}}}else{if(k.data("horizontalScroll")){v.add(A).unbind("click");k.data({bindEvent_buttonsPixels_x:false});if(!k.data("bindEvent_buttonsContinuous_x")){v.bind("mousedown touchstart MSPointerDown",function(y){y.preventDefault();var x=z();k.data({mCSB_buttonScrollRight:setInterval(function(){k.mCustomScrollbar("scrollTo",Math.abs(p.position().left)+x,{trigger:"internal",scrollEasing:"easeOutCirc"})},17)})});var i=function(x){x.preventDefault();clearInterval(k.data("mCSB_buttonScrollRight"))};v.bind("mouseup touchend MSPointerUp mouseout MSPointerOut",i);A.bind("mousedown touchstart MSPointerDown",function(y){y.preventDefault();var x=z();k.data({mCSB_buttonScrollLeft:setInterval(function(){k.mCustomScrollbar("scrollTo",Math.abs(p.position().left)-x,{trigger:"internal",scrollEasing:"easeOutCirc"})},17)})});var g=function(x){x.preventDefault();clearInterval(k.data("mCSB_buttonScrollLeft"))};A.bind("mouseup touchend MSPointerUp mouseout MSPointerOut",g);k.data({bindEvent_buttonsContinuous_x:true})}}else{e.add(w).unbind("click");k.data({bindEvent_buttonsPixels_y:false});if(!k.data("bindEvent_buttonsContinuous_y")){e.bind("mousedown touchstart MSPointerDown",function(y){y.preventDefault();var x=z();k.data({mCSB_buttonScrollDown:setInterval(function(){k.mCustomScrollbar("scrollTo",Math.abs(p.position().top)+x,{trigger:"internal",scrollEasing:"easeOutCirc"})},17)})});var t=function(x){x.preventDefault();clearInterval(k.data("mCSB_buttonScrollDown"))};e.bind("mouseup touchend MSPointerUp mouseout MSPointerOut",t);w.bind("mousedown touchstart MSPointerDown",function(y){y.preventDefault();var x=z();k.data({mCSB_buttonScrollUp:setInterval(function(){k.mCustomScrollbar("scrollTo",Math.abs(p.position().top)-x,{trigger:"internal",scrollEasing:"easeOutCirc"})},17)})});var f=function(x){x.preventDefault();clearInterval(k.data("mCSB_buttonScrollUp"))};w.bind("mouseup touchend MSPointerUp mouseout MSPointerOut",f);k.data({bindEvent_buttonsContinuous_y:true})}}function z(){var x=k.data("scrollButtons_scrollSpeed");if(k.data("scrollButtons_scrollSpeed")==="auto"){x=Math.round((k.data("scrollInertia")+100)/40)}return x}}}if(k.data("autoScrollOnFocus")){if(!k.data("bindEvent_focusin")){h.bind("focusin",function(){h.scrollTop(0).scrollLeft(0);var x=c(document.activeElement);if(x.is("input,textarea,select,button,a[tabindex],area,object")){var G=p.position().top,y=x.position().top,F=h.height()-x.outerHeight();if(k.data("horizontalScroll")){G=p.position().left;y=x.position().left;F=h.width()-x.outerWidth()}if(G+y<0||G+y>F){k.mCustomScrollbar("scrollTo",y,{trigger:"internal"})}}});k.data({bindEvent_focusin:true})}}if(k.data("autoHideScrollbar")){if(!k.data("bindEvent_autoHideScrollbar")){h.bind("mouseenter",function(x){h.addClass("mCS-mouse-over");d.showScrollbar.call(h.children(".mCSB_scrollTools"))}).bind("mouseleave touchend",function(x){h.removeClass("mCS-mouse-over");if(x.type==="mouseleave"){d.hideScrollbar.call(h.children(".mCSB_scrollTools"))}});k.data({bindEvent_autoHideScrollbar:true})}}},scrollTo:function(e,f){var i=c(this),o={moveDragger:false,trigger:"external",callbacks:true,scrollInertia:i.data("scrollInertia"),scrollEasing:i.data("scrollEasing")},f=c.extend(o,f),p,g=i.children(".mCustomScrollBox"),k=g.children(".mCSB_container"),r=g.children(".mCSB_scrollTools"),j=r.children(".mCSB_draggerContainer"),h=j.children(".mCSB_dragger"),t=draggerSpeed=f.scrollInertia,q,s,m,l;if(!k.hasClass("mCS_no_scrollbar")){i.data({mCS_trigger:f.trigger});if(i.data("mCS_Init")){f.callbacks=false}if(e||e===0){if(typeof(e)==="number"){if(f.moveDragger){p=e;if(i.data("horizontalScroll")){e=h.position().left*i.data("scrollAmount")}else{e=h.position().top*i.data("scrollAmount")}draggerSpeed=0}else{p=e/i.data("scrollAmount")}}else{if(typeof(e)==="string"){var v;if(e==="top"){v=0}else{if(e==="bottom"&&!i.data("horizontalScroll")){v=k.outerHeight()-g.height()}else{if(e==="left"){v=0}else{if(e==="right"&&i.data("horizontalScroll")){v=k.outerWidth()-g.width()}else{if(e==="first"){v=i.find(".mCSB_container").find(":first")}else{if(e==="last"){v=i.find(".mCSB_container").find(":last")}else{v=i.find(e)}}}}}}if(v.length===1){if(i.data("horizontalScroll")){e=v.position().left}else{e=v.position().top}p=e/i.data("scrollAmount")}else{p=e=v}}}if(i.data("horizontalScroll")){if(i.data("onTotalScrollBack_Offset")){s=-i.data("onTotalScrollBack_Offset")}if(i.data("onTotalScroll_Offset")){l=g.width()-k.outerWidth()+i.data("onTotalScroll_Offset")}if(p<0){p=e=0;clearInterval(i.data("mCSB_buttonScrollLeft"));if(!s){q=true}}else{if(p>=j.width()-h.width()){p=j.width()-h.width();e=g.width()-k.outerWidth();clearInterval(i.data("mCSB_buttonScrollRight"));if(!l){m=true}}else{e=-e}}var n=i.data("snapAmount");if(n){e=Math.round(e/n)*n-i.data("snapOffset")}d.mTweenAxis.call(this,h[0],"left",Math.round(p),draggerSpeed,f.scrollEasing);d.mTweenAxis.call(this,k[0],"left",Math.round(e),t,f.scrollEasing,{onStart:function(){if(f.callbacks&&!i.data("mCS_tweenRunning")){u("onScrollStart")}if(i.data("autoHideScrollbar")){d.showScrollbar.call(r)}},onUpdate:function(){if(f.callbacks){u("whileScrolling")}},onComplete:function(){if(f.callbacks){u("onScroll");if(q||(s&&k.position().left>=s)){u("onTotalScrollBack")}if(m||(l&&k.position().left<=l)){u("onTotalScroll")}}h.data("preventAction",false);i.data("mCS_tweenRunning",false);if(i.data("autoHideScrollbar")){if(!g.hasClass("mCS-mouse-over")){d.hideScrollbar.call(r)}}}})}else{if(i.data("onTotalScrollBack_Offset")){s=-i.data("onTotalScrollBack_Offset")}if(i.data("onTotalScroll_Offset")){l=g.height()-k.outerHeight()+i.data("onTotalScroll_Offset")}if(p<0){p=e=0;clearInterval(i.data("mCSB_buttonScrollUp"));if(!s){q=true}}else{if(p>=j.height()-h.height()){p=j.height()-h.height();e=g.height()-k.outerHeight();clearInterval(i.data("mCSB_buttonScrollDown"));if(!l){m=true}}else{e=-e}}var n=i.data("snapAmount");if(n){e=Math.round(e/n)*n-i.data("snapOffset")}d.mTweenAxis.call(this,h[0],"top",Math.round(p),draggerSpeed,f.scrollEasing);d.mTweenAxis.call(this,k[0],"top",Math.round(e),t,f.scrollEasing,{onStart:function(){if(f.callbacks&&!i.data("mCS_tweenRunning")){u("onScrollStart")}if(i.data("autoHideScrollbar")){d.showScrollbar.call(r)}},onUpdate:function(){if(f.callbacks){u("whileScrolling")}},onComplete:function(){if(f.callbacks){u("onScroll");if(q||(s&&k.position().top>=s)){u("onTotalScrollBack")}if(m||(l&&k.position().top<=l)){u("onTotalScroll")}}h.data("preventAction",false);i.data("mCS_tweenRunning",false);if(i.data("autoHideScrollbar")){if(!g.hasClass("mCS-mouse-over")){d.hideScrollbar.call(r)}}}})}if(i.data("mCS_Init")){i.data({mCS_Init:false})}}}function u(w){this.mcs={top:k.position().top,left:k.position().left,draggerTop:h.position().top,draggerLeft:h.position().left,topPct:Math.round((100*Math.abs(k.position().top))/Math.abs(k.outerHeight()-g.height())),leftPct:Math.round((100*Math.abs(k.position().left))/Math.abs(k.outerWidth()-g.width()))};switch(w){case"onScrollStart":i.data("mCS_tweenRunning",true).data("onScrollStart_Callback").call(i,this.mcs);break;case"whileScrolling":i.data("whileScrolling_Callback").call(i,this.mcs);break;case"onScroll":i.data("onScroll_Callback").call(i,this.mcs);break;case"onTotalScrollBack":i.data("onTotalScrollBack_Callback").call(i,this.mcs);break;case"onTotalScroll":i.data("onTotalScroll_Callback").call(i,this.mcs);break}}},stop:function(){var g=c(this),e=g.children().children(".mCSB_container"),f=g.children().children().children().children(".mCSB_dragger");d.mTweenAxisStop.call(this,e[0]);d.mTweenAxisStop.call(this,f[0])},disable:function(e){var j=c(this),f=j.children(".mCustomScrollBox"),h=f.children(".mCSB_container"),g=f.children(".mCSB_scrollTools"),i=g.children().children(".mCSB_dragger");f.unbind("mousewheel focusin mouseenter mouseleave touchend");h.unbind("touchstart touchmove");if(e){if(j.data("horizontalScroll")){i.add(h).css("left",0)}else{i.add(h).css("top",0)}}g.css("display","none");h.addClass("mCS_no_scrollbar");j.data({bindEvent_mousewheel:false,bindEvent_focusin:false,bindEvent_content_touch:false,bindEvent_autoHideScrollbar:false}).addClass("mCS_disabled")},destroy:function(){var e=c(this);e.removeClass("mCustomScrollbar _mCS_"+e.data("mCustomScrollbarIndex")).addClass("mCS_destroyed").children().children(".mCSB_container").unwrap().children().unwrap().siblings(".mCSB_scrollTools").remove();c(document).unbind("mousemove."+e.data("mCustomScrollbarIndex")+" mouseup."+e.data("mCustomScrollbarIndex")+" MSPointerMove."+e.data("mCustomScrollbarIndex")+" MSPointerUp."+e.data("mCustomScrollbarIndex"));c(window).unbind("resize."+e.data("mCustomScrollbarIndex"))}},d={showScrollbar:function(){this.stop().animate({opacity:1},"fast")},hideScrollbar:function(){this.stop().animate({opacity:0},"fast")},mTweenAxis:function(g,i,h,f,o,y){var y=y||{},v=y.onStart||function(){},p=y.onUpdate||function(){},w=y.onComplete||function(){};var n=t(),l,j=0,r=g.offsetTop,s=g.style;if(i==="left"){r=g.offsetLeft}var m=h-r;q();e();function t(){if(window.performance&&window.performance.now){return window.performance.now()}else{if(window.performance&&window.performance.webkitNow){return window.performance.webkitNow()}else{if(Date.now){return Date.now()}else{return new Date().getTime()}}}}function x(){if(!j){v.call()}j=t()-n;u();if(j>=g._time){g._time=(j>g._time)?j+l-(j-g._time):j+l-1;if(g._time<j+1){g._time=j+1}}if(g._time<f){g._id=_request(x)}else{w.call()}}function u(){if(f>0){g.currVal=k(g._time,r,m,f,o);s[i]=Math.round(g.currVal)+"px"}else{s[i]=h+"px"}p.call()}function e(){l=1000/60;g._time=j+l;_request=(!window.requestAnimationFrame)?function(z){u();return setTimeout(z,0.01)}:window.requestAnimationFrame;g._id=_request(x)}function q(){if(g._id==null){return}if(!window.requestAnimationFrame){clearTimeout(g._id)}else{window.cancelAnimationFrame(g._id)}g._id=null}function k(B,A,F,E,C){switch(C){case"linear":return F*B/E+A;break;case"easeOutQuad":B/=E;return -F*B*(B-2)+A;break;case"easeInOutQuad":B/=E/2;if(B<1){return F/2*B*B+A}B--;return -F/2*(B*(B-2)-1)+A;break;case"easeOutCubic":B/=E;B--;return F*(B*B*B+1)+A;break;case"easeOutQuart":B/=E;B--;return -F*(B*B*B*B-1)+A;break;case"easeOutQuint":B/=E;B--;return F*(B*B*B*B*B+1)+A;break;case"easeOutCirc":B/=E;B--;return F*Math.sqrt(1-B*B)+A;break;case"easeOutSine":return F*Math.sin(B/E*(Math.PI/2))+A;break;case"easeOutExpo":return F*(-Math.pow(2,-10*B/E)+1)+A;break;case"mcsEaseOut":var D=(B/=E)*B,z=D*B;return A+F*(0.499999999999997*z*D+-2.5*D*D+5.5*z+-6.5*D+4*B);break;case"draggerRailEase":B/=E/2;if(B<1){return F/2*B*B*B+A}B-=2;return F/2*(B*B*B+2)+A;break}}},mTweenAxisStop:function(e){if(e._id==null){return}if(!window.requestAnimationFrame){clearTimeout(e._id)}else{window.cancelAnimationFrame(e._id)}e._id=null},rafPolyfill:function(){var f=["ms","moz","webkit","o"],e=f.length;while(--e>-1&&!window.requestAnimationFrame){window.requestAnimationFrame=window[f[e]+"RequestAnimationFrame"];window.cancelAnimationFrame=window[f[e]+"CancelAnimationFrame"]||window[f[e]+"CancelRequestAnimationFrame"]}}};d.rafPolyfill.call();c.support.touch=!!("ontouchstart" in window);c.support.msPointer=window.navigator.msPointerEnabled;var a=("https:"==document.location.protocol)?"https:":"http:";c.event.special.mousewheel||document.write('<script src="'+a+'//cdnjs.cloudflare.com/ajax/libs/jquery-mousewheel/3.0.6/jquery.mousewheel.min.js"><\/script>');c.fn.mCustomScrollbar=function(e){if(b[e]){return b[e].apply(this,Array.prototype.slice.call(arguments,1))}else{if(typeof e==="object"||!e){return b.init.apply(this,arguments)}else{c.error("Method "+e+" does not exist")}}}})(jQuery);
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/jquery.min.js b/pluss-wap-page/src/main/resources/static/resources/js/jquery.min.js
new file mode 100644
index 0000000..16ad06c
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/jquery.min.js
@@ -0,0 +1,4 @@
+/*! jQuery v1.7.2 jquery.com | jquery.org/license */
+(function(a,b){function cy(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cu(a){if(!cj[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){ck||(ck=c.createElement("iframe"),ck.frameBorder=ck.width=ck.height=0),b.appendChild(ck);if(!cl||!ck.createElement)cl=(ck.contentWindow||ck.contentDocument).document,cl.write((f.support.boxModel?"<!doctype html>":"")+"<html><body>"),cl.close();d=cl.createElement(a),cl.body.appendChild(d),e=f.css(d,"display"),b.removeChild(ck)}cj[a]=e}return cj[a]}function ct(a,b){var c={};f.each(cp.concat.apply([],cp.slice(0,b)),function(){c[this]=a});return c}function cs(){cq=b}function cr(){setTimeout(cs,0);return cq=f.now()}function ci(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ch(){try{return new a.XMLHttpRequest}catch(b){}}function cb(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g<i;g++){if(g===1)for(h in a.converters)typeof h=="string"&&(e[h.toLowerCase()]=a.converters[h]);l=k,k=d[g];if(k==="*")k=l;else if(l!=="*"&&l!==k){m=l+" "+k,n=e[m]||e["* "+k];if(!n){p=b;for(o in e){j=o.split(" ");if(j[0]===l||j[0]==="*"){p=e[j[1]+" "+k];if(p){o=e[o],o===!0?n=p:p===!0&&(n=o);break}}}}!n&&!p&&f.error("No conversion from "+m.replace(" "," to ")),n!==!0&&(c=n?n(c):p(o(c)))}}return c}function ca(a,c,d){var e=a.contents,f=a.dataTypes,g=a.responseFields,h,i,j,k;for(i in g)i in d&&(c[g[i]]=d[i]);while(f[0]==="*")f.shift(),h===b&&(h=a.mimeType||c.getResponseHeader("content-type"));if(h)for(i in e)if(e[i]&&e[i].test(h)){f.unshift(i);break}if(f[0]in d)j=f[0];else{for(i in d){if(!f[0]||a.converters[i+" "+f[0]]){j=i;break}k||(k=i)}j=j||k}if(j){j!==f[0]&&f.unshift(j);return d[j]}}function b_(a,b,c,d){if(f.isArray(b))f.each(b,function(b,e){c||bD.test(a)?d(a,e):b_(a+"["+(typeof e=="object"?b:"")+"]",e,c,d)});else if(!c&&f.type(b)==="object")for(var e in b)b_(a+"["+e+"]",b[e],c,d);else d(a,b)}function b$(a,c){var d,e,g=f.ajaxSettings.flatOptions||{};for(d in c)c[d]!==b&&((g[d]?a:e||(e={}))[d]=c[d]);e&&f.extend(!0,a,e)}function bZ(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h=a[f],i=0,j=h?h.length:0,k=a===bS,l;for(;i<j&&(k||!l);i++)l=h[i](c,d,e),typeof l=="string"&&(!k||g[l]?l=b:(c.dataTypes.unshift(l),l=bZ(a,c,d,e,l,g)));(k||!l)&&!g["*"]&&(l=bZ(a,c,d,e,"*",g));return l}function bY(a){return function(b,c){typeof b!="string"&&(c=b,b="*");if(f.isFunction(c)){var d=b.toLowerCase().split(bO),e=0,g=d.length,h,i,j;for(;e<g;e++)h=d[e],j=/^\+/.test(h),j&&(h=h.substr(1)||"*"),i=a[h]=a[h]||[],i[j?"unshift":"push"](c)}}}function bB(a,b,c){var d=b==="width"?a.offsetWidth:a.offsetHeight,e=b==="width"?1:0,g=4;if(d>0){if(c!=="border")for(;e<g;e+=2)c||(d-=parseFloat(f.css(a,"padding"+bx[e]))||0),c==="margin"?d+=parseFloat(f.css(a,c+bx[e]))||0:d-=parseFloat(f.css(a,"border"+bx[e]+"Width"))||0;return d+"px"}d=by(a,b);if(d<0||d==null)d=a.style[b];if(bt.test(d))return d;d=parseFloat(d)||0;if(c)for(;e<g;e+=2)d+=parseFloat(f.css(a,"padding"+bx[e]))||0,c!=="padding"&&(d+=parseFloat(f.css(a,"border"+bx[e]+"Width"))||0),c==="margin"&&(d+=parseFloat(f.css(a,c+bx[e]))||0);return d+"px"}function bo(a){var b=c.createElement("div");bh.appendChild(b),b.innerHTML=a.outerHTML;return b.firstChild}function bn(a){var b=(a.nodeName||"").toLowerCase();b==="input"?bm(a):b!=="script"&&typeof a.getElementsByTagName!="undefined"&&f.grep(a.getElementsByTagName("input"),bm)}function bm(a){if(a.type==="checkbox"||a.type==="radio")a.defaultChecked=a.checked}function bl(a){return typeof a.getElementsByTagName!="undefined"?a.getElementsByTagName("*"):typeof a.querySelectorAll!="undefined"?a.querySelectorAll("*"):[]}function bk(a,b){var c;b.nodeType===1&&(b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase(),c==="object"?b.outerHTML=a.outerHTML:c!=="input"||a.type!=="checkbox"&&a.type!=="radio"?c==="option"?b.selected=a.defaultSelected:c==="input"||c==="textarea"?b.defaultValue=a.defaultValue:c==="script"&&b.text!==a.text&&(b.text=a.text):(a.checked&&(b.defaultChecked=b.checked=a.checked),b.value!==a.value&&(b.value=a.value)),b.removeAttribute(f.expando),b.removeAttribute("_submit_attached"),b.removeAttribute("_change_attached"))}function bj(a,b){if(b.nodeType===1&&!!f.hasData(a)){var c,d,e,g=f._data(a),h=f._data(b,g),i=g.events;if(i){delete h.handle,h.events={};for(c in i)for(d=0,e=i[c].length;d<e;d++)f.event.add(b,c,i[c][d])}h.data&&(h.data=f.extend({},h.data))}}function bi(a,b){return f.nodeName(a,"table")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function U(a){var b=V.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}function T(a,b,c){b=b||0;if(f.isFunction(b))return f.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return f.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var d=f.grep(a,function(a){return a.nodeType===1});if(O.test(b))return f.filter(b,d,!c);b=f.filter(b,d)}return f.grep(a,function(a,d){return f.inArray(a,b)>=0===c})}function S(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function K(){return!0}function J(){return!1}function n(a,b,c){var d=b+"defer",e=b+"queue",g=b+"mark",h=f._data(a,d);h&&(c==="queue"||!f._data(a,e))&&(c==="mark"||!f._data(a,g))&&setTimeout(function(){!f._data(a,e)&&!f._data(a,g)&&(f.removeData(a,d,!0),h.fire())},0)}function m(a){for(var b in a){if(b==="data"&&f.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function l(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(k,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNumeric(d)?+d:j.test(d)?f.parseJSON(d):d}catch(g){}f.data(a,c,d)}else d=b}return d}function h(a){var b=g[a]={},c,d;a=a.split(/\s+/);for(c=0,d=a.length;c<d;c++)b[a[c]]=!0;return b}var c=a.document,d=a.navigator,e=a.location,f=function(){function J(){if(!e.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(J,1);return}e.ready()}}var e=function(a,b){return new e.fn.init(a,b,h)},f=a.jQuery,g=a.$,h,i=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,n=/^[\],:{}\s]*$/,o=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,p=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,q=/(?:^|:|,)(?:\s*\[)+/g,r=/(webkit)[ \/]([\w.]+)/,s=/(opera)(?:.*version)?[ \/]([\w.]+)/,t=/(msie) ([\w.]+)/,u=/(mozilla)(?:.*? rv:([\w.]+))?/,v=/-([a-z]|[0-9])/ig,w=/^-ms-/,x=function(a,b){return(b+"").toUpperCase()},y=d.userAgent,z,A,B,C=Object.prototype.toString,D=Object.prototype.hasOwnProperty,E=Array.prototype.push,F=Array.prototype.slice,G=String.prototype.trim,H=Array.prototype.indexOf,I={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=m.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.7.2",length:0,size:function(){return this.length},toArray:function(){return F.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?E.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),A.add(a);return this},eq:function(a){a=+a;return a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(F.apply(this,arguments),"slice",F.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:E,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j<k;j++)if((a=arguments[j])!=null)for(c in a){d=i[c],f=a[c];if(i===f)continue;l&&f&&(e.isPlainObject(f)||(g=e.isArray(f)))?(g?(g=!1,h=d&&e.isArray(d)?d:[]):h=d&&e.isPlainObject(d)?d:{},i[c]=e.extend(l,h,f)):f!==b&&(i[c]=f)}return i},e.extend({noConflict:function(b){a.$===e&&(a.$=g),b&&a.jQuery===e&&(a.jQuery=f);return e},isReady:!1,readyWait:1,holdReady:function(a){a?e.readyWait++:e.ready(!0)},ready:function(a){if(a===!0&&!--e.readyWait||a!==!0&&!e.isReady){if(!c.body)return setTimeout(e.ready,1);e.isReady=!0;if(a!==!0&&--e.readyWait>0)return;A.fireWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").off("ready")}},bindReady:function(){if(!A){A=e.Callbacks("once memory");if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",B,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",B),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&J()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a!=null&&a==a.window},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return a==null?String(a):I[C.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;try{if(a.constructor&&!D.call(a,"constructor")&&!D.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||D.call(a,d)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw new Error(a)},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(n.test(b.replace(o,"@").replace(p,"]").replace(q,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(c){if(typeof c!="string"||!c)return null;var d,f;try{a.DOMParser?(f=new DOMParser,d=f.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(g){d=b}(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&e.error("Invalid XML: "+c);return d},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(w,"ms-").replace(v,x)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g<h;)if(c.apply(a[g++],d)===!1)break}else if(i){for(f in a)if(c.call(a[f],f,a[f])===!1)break}else for(;g<h;)if(c.call(a[g],g,a[g++])===!1)break;return a},trim:G?function(a){return a==null?"":G.call(a)}:function(a){return a==null?"":(a+"").replace(k,"").replace(l,"")},makeArray:function(a,b){var c=b||[];if(a!=null){var d=e.type(a);a.length==null||d==="string"||d==="function"||d==="regexp"||e.isWindow(a)?E.call(c,a):e.merge(c,a)}return c},inArray:function(a,b,c){var d;if(b){if(H)return H.call(b,a,c);d=b.length,c=c?c<0?Math.max(0,d+c):c:0;for(;c<d;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,c){var d=a.length,e=0;if(typeof c.length=="number")for(var f=c.length;e<f;e++)a[d++]=c[e];else while(c[e]!==b)a[d++]=c[e++];a.length=d;return a},grep:function(a,b,c){var d=[],e;c=!!c;for(var f=0,g=a.length;f<g;f++)e=!!b(a[f],f),c!==e&&d.push(a[f]);return d},map:function(a,c,d){var f,g,h=[],i=0,j=a.length,k=a instanceof e||j!==b&&typeof j=="number"&&(j>0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i<j;i++)f=c(a[i],i,d),f!=null&&(h[h.length]=f);else for(g in a)f=c(a[g],g,d),f!=null&&(h[h.length]=f);return h.concat.apply([],h)},guid:1,proxy:function(a,c){if(typeof c=="string"){var d=a[c];c=a,a=d}if(!e.isFunction(a))return b;var f=F.call(arguments,2),g=function(){return a.apply(c,f.concat(F.call(arguments)))};g.guid=a.guid=a.guid||g.guid||e.guid++;return g},access:function(a,c,d,f,g,h,i){var j,k=d==null,l=0,m=a.length;if(d&&typeof d=="object"){for(l in d)e.access(a,c,l,d[l],1,h,f);g=1}else if(f!==b){j=i===b&&e.isFunction(f),k&&(j?(j=c,c=function(a,b,c){return j.call(e(a),c)}):(c.call(a,f),c=null));if(c)for(;l<m;l++)c(a[l],d,j?f.call(a[l],l,c(a[l],d)):f,i);g=1}return g?a:k?c.call(a):m?c(a[0],d):h},now:function(){return(new Date).getTime()},uaMatch:function(a){a=a.toLowerCase();var b=r.exec(a)||s.exec(a)||t.exec(a)||a.indexOf("compatible")<0&&u.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},sub:function(){function a(b,c){return new a.fn.init(b,c)}e.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function(d,f){f&&f instanceof e&&!(f instanceof a)&&(f=a(f));return e.fn.init.call(this,d,f,b)},a.fn.init.prototype=a.fn;var b=a(c);return a},browser:{}}),e.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){I["[object "+b+"]"]=b.toLowerCase()}),z=e.uaMatch(y),z.browser&&(e.browser[z.browser]=!0,e.browser.version=z.version),e.browser.webkit&&(e.browser.safari=!0),j.test(" ")&&(k=/^[\s\xA0]+/,l=/[\s\xA0]+$/),h=e(c),c.addEventListener?B=function(){c.removeEventListener("DOMContentLoaded",B,!1),e.ready()}:c.attachEvent&&(B=function(){c.readyState==="complete"&&(c.detachEvent("onreadystatechange",B),e.ready())});return e}(),g={};f.Callbacks=function(a){a=a?g[a]||h(a):{};var c=[],d=[],e,i,j,k,l,m,n=function(b){var d,e,g,h,i;for(d=0,e=b.length;d<e;d++)g=b[d],h=f.type(g),h==="array"?n(g):h==="function"&&(!a.unique||!p.has(g))&&c.push(g)},o=function(b,f){f=f||[],e=!a.memory||[b,f],i=!0,j=!0,m=k||0,k=0,l=c.length;for(;c&&m<l;m++)if(c[m].apply(b,f)===!1&&a.stopOnFalse){e=!0;break}j=!1,c&&(a.once?e===!0?p.disable():c=[]:d&&d.length&&(e=d.shift(),p.fireWith(e[0],e[1])))},p={add:function(){if(c){var a=c.length;n(arguments),j?l=c.length:e&&e!==!0&&(k=a,o(e[0],e[1]))}return this},remove:function(){if(c){var b=arguments,d=0,e=b.length;for(;d<e;d++)for(var f=0;f<c.length;f++)if(b[d]===c[f]){j&&f<=l&&(l--,f<=m&&m--),c.splice(f--,1);if(a.unique)break}}return this},has:function(a){if(c){var b=0,d=c.length;for(;b<d;b++)if(a===c[b])return!0}return!1},empty:function(){c=[];return this},disable:function(){c=d=e=b;return this},disabled:function(){return!c},lock:function(){d=b,(!e||e===!0)&&p.disable();return this},locked:function(){return!d},fireWith:function(b,c){d&&(j?a.once||d.push([b,c]):(!a.once||!e)&&o(b,c));return this},fire:function(){p.fireWith(this,arguments);return this},fired:function(){return!!i}};return p};var i=[].slice;f.extend({Deferred:function(a){var b=f.Callbacks("once memory"),c=f.Callbacks("once memory"),d=f.Callbacks("memory"),e="pending",g={resolve:b,reject:c,notify:d},h={done:b.add,fail:c.add,progress:d.add,state:function(){return e},isResolved:b.fired,isRejected:c.fired,then:function(a,b,c){i.done(a).fail(b).progress(c);return this},always:function(){i.done.apply(i,arguments).fail.apply(i,arguments);return this},pipe:function(a,b,c){return f.Deferred(function(d){f.each({done:[a,"resolve"],fail:[b,"reject"],progress:[c,"notify"]},function(a,b){var c=b[0],e=b[1],g;f.isFunction(c)?i[a](function(){g=c.apply(this,arguments),g&&f.isFunction(g.promise)?g.promise().then(d.resolve,d.reject,d.notify):d[e+"With"](this===i?d:this,[g])}):i[a](d[e])})}).promise()},promise:function(a){if(a==null)a=h;else for(var b in h)a[b]=h[b];return a}},i=h.promise({}),j;for(j in g)i[j]=g[j].fire,i[j+"With"]=g[j].fireWith;i.done(function(){e="resolved"},c.disable,d.lock).fail(function(){e="rejected"},b.disable,d.lock),a&&a.call(i,i);return i},when:function(a){function m(a){return function(b){e[a]=arguments.length>1?i.call(arguments,0):b,j.notifyWith(k,e)}}function l(a){return function(c){b[a]=arguments.length>1?i.call(arguments,0):c,--g||j.resolveWith(j,b)}}var b=i.call(arguments,0),c=0,d=b.length,e=Array(d),g=d,h=d,j=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred(),k=j.promise();if(d>1){for(;c<d;c++)b[c]&&b[c].promise&&f.isFunction(b[c].promise)?b[c].promise().then(l(c),j.reject,m(c)):--g;g||j.resolveWith(j,b)}else j!==a&&j.resolveWith(j,d?[a]:[]);return k}}),f.support=function(){var b,d,e,g,h,i,j,k,l,m,n,o,p=c.createElement("div"),q=c.documentElement;p.setAttribute("className","t"),p.innerHTML="   <link/><table></table><a href='/a' style='top:1px;float:left;opacity:.55;'>a</a><input type='checkbox'/>",d=p.getElementsByTagName("*"),e=p.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=p.getElementsByTagName("input")[0],b={leadingWhitespace:p.firstChild.nodeType===3,tbody:!p.getElementsByTagName("tbody").length,htmlSerialize:!!p.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:p.className!=="t",enctype:!!c.createElement("form").enctype,html5Clone:c.createElement("nav").cloneNode(!0).outerHTML!=="<:nav></:nav>",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,pixelMargin:!0},f.boxModel=b.boxModel=c.compatMode==="CSS1Compat",i.checked=!0,b.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,b.optDisabled=!h.disabled;try{delete p.test}catch(r){b.deleteExpando=!1}!p.addEventListener&&p.attachEvent&&p.fireEvent&&(p.attachEvent("onclick",function(){b.noCloneEvent=!1}),p.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),b.radioValue=i.value==="t",i.setAttribute("checked","checked"),i.setAttribute("name","t"),p.appendChild(i),j=c.createDocumentFragment(),j.appendChild(p.lastChild),b.checkClone=j.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=i.checked,j.removeChild(i),j.appendChild(p);if(p.attachEvent)for(n in{submit:1,change:1,focusin:1})m="on"+n,o=m in p,o||(p.setAttribute(m,"return;"),o=typeof p[m]=="function"),b[n+"Bubbles"]=o;j.removeChild(p),j=g=h=p=i=null,f(function(){var d,e,g,h,i,j,l,m,n,q,r,s,t,u=c.getElementsByTagName("body")[0];!u||(m=1,t="padding:0;margin:0;border:",r="position:absolute;top:0;left:0;width:1px;height:1px;",s=t+"0;visibility:hidden;",n="style='"+r+t+"5px solid #000;",q="<div "+n+"display:block;'><div style='"+t+"0;display:block;overflow:hidden;'></div></div>"+"<table "+n+"' cellpadding='0' cellspacing='0'>"+"<tr><td></td></tr></table>",d=c.createElement("div"),d.style.cssText=s+"width:0;height:0;position:static;top:0;margin-top:"+m+"px",u.insertBefore(d,u.firstChild),p=c.createElement("div"),d.appendChild(p),p.innerHTML="<table><tr><td style='"+t+"0;display:none'></td><td>t</td></tr></table>",k=p.getElementsByTagName("td"),o=k[0].offsetHeight===0,k[0].style.display="",k[1].style.display="none",b.reliableHiddenOffsets=o&&k[0].offsetHeight===0,a.getComputedStyle&&(p.innerHTML="",l=c.createElement("div"),l.style.width="0",l.style.marginRight="0",p.style.width="2px",p.appendChild(l),b.reliableMarginRight=(parseInt((a.getComputedStyle(l,null)||{marginRight:0}).marginRight,10)||0)===0),typeof p.style.zoom!="undefined"&&(p.innerHTML="",p.style.width=p.style.padding="1px",p.style.border=0,p.style.overflow="hidden",p.style.display="inline",p.style.zoom=1,b.inlineBlockNeedsLayout=p.offsetWidth===3,p.style.display="block",p.style.overflow="visible",p.innerHTML="<div style='width:5px;'></div>",b.shrinkWrapBlocks=p.offsetWidth!==3),p.style.cssText=r+s,p.innerHTML=q,e=p.firstChild,g=e.firstChild,i=e.nextSibling.firstChild.firstChild,j={doesNotAddBorder:g.offsetTop!==5,doesAddBorderForTableAndCells:i.offsetTop===5},g.style.position="fixed",g.style.top="20px",j.fixedPosition=g.offsetTop===20||g.offsetTop===15,g.style.position=g.style.top="",e.style.overflow="hidden",e.style.position="relative",j.subtractsBorderForOverflowNotVisible=g.offsetTop===-5,j.doesNotIncludeMarginInBodyOffset=u.offsetTop!==m,a.getComputedStyle&&(p.style.marginTop="1%",b.pixelMargin=(a.getComputedStyle(p,null)||{marginTop:0}).marginTop!=="1%"),typeof d.style.zoom!="undefined"&&(d.style.zoom=1),u.removeChild(d),l=p=d=null,f.extend(b,j))});return b}();var j=/^(?:\{.*\}|\[.*\])$/,k=/([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!m(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g,h,i,j=f.expando,k=typeof c=="string",l=a.nodeType,m=l?f.cache:a,n=l?a[j]:a[j]&&j,o=c==="events";if((!n||!m[n]||!o&&!e&&!m[n].data)&&k&&d===b)return;n||(l?a[j]=n=++f.uuid:n=j),m[n]||(m[n]={},l||(m[n].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?m[n]=f.extend(m[n],c):m[n].data=f.extend(m[n].data,c);g=h=m[n],e||(h.data||(h.data={}),h=h.data),d!==b&&(h[f.camelCase(c)]=d);if(o&&!h[c])return g.events;k?(i=h[c],i==null&&(i=h[f.camelCase(c)])):i=h;return i}},removeData:function(a,b,c){if(!!f.acceptData(a)){var d,e,g,h=f.expando,i=a.nodeType,j=i?f.cache:a,k=i?a[h]:h;if(!j[k])return;if(b){d=c?j[k]:j[k].data;if(d){f.isArray(b)||(b in d?b=[b]:(b=f.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,g=b.length;e<g;e++)delete d[b[e]];if(!(c?m:f.isEmptyObject)(d))return}}if(!c){delete j[k].data;if(!m(j[k]))return}f.support.deleteExpando||!j.setInterval?delete j[k]:j[k]=null,i&&(f.support.deleteExpando?delete a[h]:a.removeAttribute?a.removeAttribute(h):a[h]=null)}},_data:function(a,b,c){return f.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=f.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),f.fn.extend({data:function(a,c){var d,e,g,h,i,j=this[0],k=0,m=null;if(a===b){if(this.length){m=f.data(j);if(j.nodeType===1&&!f._data(j,"parsedAttrs")){g=j.attributes;for(i=g.length;k<i;k++)h=g[k].name,h.indexOf("data-")===0&&(h=f.camelCase(h.substring(5)),l(j,h,m[h]));f._data(j,"parsedAttrs",!0)}}return m}if(typeof a=="object")return this.each(function(){f.data(this,a)});d=a.split(".",2),d[1]=d[1]?"."+d[1]:"",e=d[1]+"!";return f.access(this,function(c){if(c===b){m=this.triggerHandler("getData"+e,[d[0]]),m===b&&j&&(m=f.data(j,a),m=l(j,a,m));return m===b&&d[1]?this.data(d[0]):m}d[1]=c,this.each(function(){var b=f(this);b.triggerHandler("setData"+e,d),f.data(this,a,c),b.triggerHandler("changeData"+e,d)})},null,c,arguments.length>1,null,!1)},removeData:function(a){return this.each(function(){f.removeData(this,a)})}}),f.extend({_mark:function(a,b){a&&(b=(b||"fx")+"mark",f._data(a,b,(f._data(a,b)||0)+1))},_unmark:function(a,b,c){a!==!0&&(c=b,b=a,a=!1);if(b){c=c||"fx";var d=c+"mark",e=a?0:(f._data(b,d)||1)-1;e?f._data(b,d,e):(f.removeData(b,d,!0),n(b,c,"mark"))}},queue:function(a,b,c){var d;if(a){b=(b||"fx")+"queue",d=f._data(a,b),c&&(!d||f.isArray(c)?d=f._data(a,b,f.makeArray(c)):d.push(c));return d||[]}},dequeue:function(a,b){b=b||"fx";var c=f.queue(a,b),d=c.shift(),e={};d==="inprogress"&&(d=c.shift()),d&&(b==="fx"&&c.unshift("inprogress"),f._data(a,b+".run",e),d.call(a,function(){f.dequeue(a,b)},e)),c.length||(f.removeData(a,b+"queue "+b+".run",!0),n(a,b,"queue"))}}),f.fn.extend({queue:function(a,c){var d=2;typeof a!="string"&&(c=a,a="fx",d--);if(arguments.length<d)return f.queue(this[0],a);return c===b?this:this.each(function(){var b=f.queue(this,a,c);a==="fx"&&b[0]!=="inprogress"&&f.dequeue(this,a)})},dequeue:function(a){return this.each(function(){f.dequeue(this,a)})},delay:function(a,b){a=f.fx?f.fx.speeds[a]||a:a,b=b||"fx";return this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,c){function m(){--h||d.resolveWith(e,[e])}typeof a!="string"&&(c=a,a=b),a=a||"fx";var d=f.Deferred(),e=this,g=e.length,h=1,i=a+"defer",j=a+"queue",k=a+"mark",l;while(g--)if(l=f.data(e[g],i,b,!0)||(f.data(e[g],j,b,!0)||f.data(e[g],k,b,!0))&&f.data(e[g],i,f.Callbacks("once memory"),!0))h++,l.add(m);m();return d.promise(c)}});var o=/[\n\t\r]/g,p=/\s+/,q=/\r/g,r=/^(?:button|input)$/i,s=/^(?:button|input|object|select|textarea)$/i,t=/^a(?:rea)?$/i,u=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,v=f.support.getSetAttribute,w,x,y;f.fn.extend({attr:function(a,b){return f.access(this,f.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){f.removeAttr(this,a)})},prop:function(a,b){return f.access(this,f.prop,a,b,arguments.length>1)},removeProp:function(a){a=f.propFix[a]||a;return this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,g,h,i;if(f.isFunction(a))return this.each(function(b){f(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(p);for(c=0,d=this.length;c<d;c++){e=this[c];if(e.nodeType===1)if(!e.className&&b.length===1)e.className=a;else{g=" "+e.className+" ";for(h=0,i=b.length;h<i;h++)~g.indexOf(" "+b[h]+" ")||(g+=b[h]+" ");e.className=f.trim(g)}}}return this},removeClass:function(a){var c,d,e,g,h,i,j;if(f.isFunction(a))return this.each(function(b){f(this).removeClass(a.call(this,b,this.className))});if(a&&typeof a=="string"||a===b){c=(a||"").split(p);for(d=0,e=this.length;d<e;d++){g=this[d];if(g.nodeType===1&&g.className)if(a){h=(" "+g.className+" ").replace(o," ");for(i=0,j=c.length;i<j;i++)h=h.replace(" "+c[i]+" "," ");g.className=f.trim(h)}else g.className=""}}return this},toggleClass:function(a,b){var c=typeof a,d=typeof b=="boolean";if(f.isFunction(a))return this.each(function(c){f(this).toggleClass(a.call(this,c,this.className,b),b)});return this.each(function(){if(c==="string"){var e,g=0,h=f(this),i=b,j=a.split(p);while(e=j[g++])i=d?i:!h.hasClass(e),h[i?"addClass":"removeClass"](e)}else if(c==="undefined"||c==="boolean")this.className&&f._data(this,"__className__",this.className),this.className=this.className||a===!1?"":f._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ",c=0,d=this.length;for(;c<d;c++)if(this[c].nodeType===1&&(" "+this[c].className+" ").replace(o," ").indexOf(b)>-1)return!0;return!1},val:function(a){var c,d,e,g=this[0];{if(!!arguments.length){e=f.isFunction(a);return this.each(function(d){var g=f(this),h;if(this.nodeType===1){e?h=a.call(this,d,g.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.type]||f.valHooks[this.nodeName.toLowerCase()];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}if(g){c=f.valHooks[g.type]||f.valHooks[g.nodeName.toLowerCase()];if(c&&"get"in c&&(d=c.get(g,"value"))!==b)return d;d=g.value;return typeof d=="string"?d.replace(q,""):d==null?"":d}}}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,g=a.selectedIndex,h=[],i=a.options,j=a.type==="select-one";if(g<0)return null;c=j?g:0,d=j?g+1:i.length;for(;c<d;c++){e=i[c];if(e.selected&&(f.support.optDisabled?!e.disabled:e.getAttribute("disabled")===null)&&(!e.parentNode.disabled||!f.nodeName(e.parentNode,"optgroup"))){b=f(e).val();if(j)return b;h.push(b)}}if(j&&!h.length&&i.length)return f(i[g]).val();return h},set:function(a,b){var c=f.makeArray(b);f(a).find("option").each(function(){this.selected=f.inArray(f(this).val(),c)>=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attr:function(a,c,d,e){var g,h,i,j=a.nodeType;if(!!a&&j!==3&&j!==8&&j!==2){if(e&&c in f.attrFn)return f(a)[c](d);if(typeof a.getAttribute=="undefined")return f.prop(a,c,d);i=j!==1||!f.isXMLDoc(a),i&&(c=c.toLowerCase(),h=f.attrHooks[c]||(u.test(c)?x:w));if(d!==b){if(d===null){f.removeAttr(a,c);return}if(h&&"set"in h&&i&&(g=h.set(a,d,c))!==b)return g;a.setAttribute(c,""+d);return d}if(h&&"get"in h&&i&&(g=h.get(a,c))!==null)return g;g=a.getAttribute(c);return g===null?b:g}},removeAttr:function(a,b){var c,d,e,g,h,i=0;if(b&&a.nodeType===1){d=b.toLowerCase().split(p),g=d.length;for(;i<g;i++)e=d[i],e&&(c=f.propFix[e]||e,h=u.test(e),h||f.attr(a,e,""),a.removeAttribute(v?e:c),h&&c in a&&(a[c]=!1))}},attrHooks:{type:{set:function(a,b){if(r.test(a.nodeName)&&a.parentNode)f.error("type property can't be changed");else if(!f.support.radioValue&&b==="radio"&&f.nodeName(a,"input")){var c=a.value;a.setAttribute("type",b),c&&(a.value=c);return b}}},value:{get:function(a,b){if(w&&f.nodeName(a,"button"))return w.get(a,b);return b in a?a.value:null},set:function(a,b,c){if(w&&f.nodeName(a,"button"))return w.set(a,b,c);a.value=b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e,g,h,i=a.nodeType;if(!!a&&i!==3&&i!==8&&i!==2){h=i!==1||!f.isXMLDoc(a),h&&(c=f.propFix[c]||c,g=f.propHooks[c]);return d!==b?g&&"set"in g&&(e=g.set(a,d,c))!==b?e:a[c]=d:g&&"get"in g&&(e=g.get(a,c))!==null?e:a[c]}},propHooks:{tabIndex:{get:function(a){var c=a.getAttributeNode("tabindex");return c&&c.specified?parseInt(c.value,10):s.test(a.nodeName)||t.test(a.nodeName)&&a.href?0:b}}}}),f.attrHooks.tabindex=f.propHooks.tabIndex,x={get:function(a,c){var d,e=f.prop(a,c);return e===!0||typeof e!="boolean"&&(d=a.getAttributeNode(c))&&d.nodeValue!==!1?c.toLowerCase():b},set:function(a,b,c){var d;b===!1?f.removeAttr(a,c):(d=f.propFix[c]||c,d in a&&(a[d]=!0),a.setAttribute(c,c.toLowerCase()));return c}},v||(y={name:!0,id:!0,coords:!0},w=f.valHooks.button={get:function(a,c){var d;d=a.getAttributeNode(c);return d&&(y[c]?d.nodeValue!=="":d.specified)?d.nodeValue:b},set:function(a,b,d){var e=a.getAttributeNode(d);e||(e=c.createAttribute(d),a.setAttributeNode(e));return e.nodeValue=b+""}},f.attrHooks.tabindex.set=w.set,f.each(["width","height"],function(a,b){f.attrHooks[b]=f.extend(f.attrHooks[b],{set:function(a,c){if(c===""){a.setAttribute(b,"auto");return c}}})}),f.attrHooks.contenteditable={get:w.get,set:function(a,b,c){b===""&&(b="false"),w.set(a,b,c)}}),f.support.hrefNormalized||f.each(["href","src","width","height"],function(a,c){f.attrHooks[c]=f.extend(f.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),f.support.style||(f.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=""+b}}),f.support.optSelected||(f.propHooks.selected=f.extend(f.propHooks.selected,{get:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex);return null}})),f.support.enctype||(f.propFix.enctype="encoding"),f.support.checkOn||f.each(["radio","checkbox"],function(){f.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),f.each(["radio","checkbox"],function(){f.valHooks[this]=f.extend(f.valHooks[this],{set:function(a,b){if(f.isArray(b))return a.checked=f.inArray(f(a).val(),b)>=0}})});var z=/^(?:textarea|input|select)$/i,A=/^([^\.]*)?(?:\.(.+))?$/,B=/(?:^|\s)hover(\.\S+)?\b/,C=/^key/,D=/^(?:mouse|contextmenu)|click/,E=/^(?:focusinfocus|focusoutblur)$/,F=/^(\w*)(?:#([\w\-]+))?(?:\.([\w\-]+))?$/,G=function(
+a){var b=F.exec(a);b&&(b[1]=(b[1]||"").toLowerCase(),b[3]=b[3]&&new RegExp("(?:^|\\s)"+b[3]+"(?:\\s|$)"));return b},H=function(a,b){var c=a.attributes||{};return(!b[1]||a.nodeName.toLowerCase()===b[1])&&(!b[2]||(c.id||{}).value===b[2])&&(!b[3]||b[3].test((c["class"]||{}).value))},I=function(a){return f.event.special.hover?a:a.replace(B,"mouseenter$1 mouseleave$1")};f.event={add:function(a,c,d,e,g){var h,i,j,k,l,m,n,o,p,q,r,s;if(!(a.nodeType===3||a.nodeType===8||!c||!d||!(h=f._data(a)))){d.handler&&(p=d,d=p.handler,g=p.selector),d.guid||(d.guid=f.guid++),j=h.events,j||(h.events=j={}),i=h.handle,i||(h.handle=i=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.dispatch.apply(i.elem,arguments):b},i.elem=a),c=f.trim(I(c)).split(" ");for(k=0;k<c.length;k++){l=A.exec(c[k])||[],m=l[1],n=(l[2]||"").split(".").sort(),s=f.event.special[m]||{},m=(g?s.delegateType:s.bindType)||m,s=f.event.special[m]||{},o=f.extend({type:m,origType:l[1],data:e,handler:d,guid:d.guid,selector:g,quick:g&&G(g),namespace:n.join(".")},p),r=j[m];if(!r){r=j[m]=[],r.delegateCount=0;if(!s.setup||s.setup.call(a,e,n,i)===!1)a.addEventListener?a.addEventListener(m,i,!1):a.attachEvent&&a.attachEvent("on"+m,i)}s.add&&(s.add.call(a,o),o.handler.guid||(o.handler.guid=d.guid)),g?r.splice(r.delegateCount++,0,o):r.push(o),f.event.global[m]=!0}a=null}},global:{},remove:function(a,b,c,d,e){var g=f.hasData(a)&&f._data(a),h,i,j,k,l,m,n,o,p,q,r,s;if(!!g&&!!(o=g.events)){b=f.trim(I(b||"")).split(" ");for(h=0;h<b.length;h++){i=A.exec(b[h])||[],j=k=i[1],l=i[2];if(!j){for(j in o)f.event.remove(a,j+b[h],c,d,!0);continue}p=f.event.special[j]||{},j=(d?p.delegateType:p.bindType)||j,r=o[j]||[],m=r.length,l=l?new RegExp("(^|\\.)"+l.split(".").sort().join("\\.(?:.*\\.)?")+"(\\.|$)"):null;for(n=0;n<r.length;n++)s=r[n],(e||k===s.origType)&&(!c||c.guid===s.guid)&&(!l||l.test(s.namespace))&&(!d||d===s.selector||d==="**"&&s.selector)&&(r.splice(n--,1),s.selector&&r.delegateCount--,p.remove&&p.remove.call(a,s));r.length===0&&m!==r.length&&((!p.teardown||p.teardown.call(a,l)===!1)&&f.removeEvent(a,j,g.handle),delete o[j])}f.isEmptyObject(o)&&(q=g.handle,q&&(q.elem=null),f.removeData(a,["events","handle"],!0))}},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(c,d,e,g){if(!e||e.nodeType!==3&&e.nodeType!==8){var h=c.type||c,i=[],j,k,l,m,n,o,p,q,r,s;if(E.test(h+f.event.triggered))return;h.indexOf("!")>=0&&(h=h.slice(0,-1),k=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.shift(),i.sort());if((!e||f.event.customEvent[h])&&!f.event.global[h])return;c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.isTrigger=!0,c.exclusive=k,c.namespace=i.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)"):null,o=h.indexOf(":")<0?"on"+h:"";if(!e){j=f.cache;for(l in j)j[l].events&&j[l].events[h]&&f.event.trigger(c,d,j[l].handle.elem,!0);return}c.result=b,c.target||(c.target=e),d=d!=null?f.makeArray(d):[],d.unshift(c),p=f.event.special[h]||{};if(p.trigger&&p.trigger.apply(e,d)===!1)return;r=[[e,p.bindType||h]];if(!g&&!p.noBubble&&!f.isWindow(e)){s=p.delegateType||h,m=E.test(s+h)?e:e.parentNode,n=null;for(;m;m=m.parentNode)r.push([m,s]),n=m;n&&n===e.ownerDocument&&r.push([n.defaultView||n.parentWindow||a,s])}for(l=0;l<r.length&&!c.isPropagationStopped();l++)m=r[l][0],c.type=r[l][1],q=(f._data(m,"events")||{})[c.type]&&f._data(m,"handle"),q&&q.apply(m,d),q=o&&m[o],q&&f.acceptData(m)&&q.apply(m,d)===!1&&c.preventDefault();c.type=h,!g&&!c.isDefaultPrevented()&&(!p._default||p._default.apply(e.ownerDocument,d)===!1)&&(h!=="click"||!f.nodeName(e,"a"))&&f.acceptData(e)&&o&&e[h]&&(h!=="focus"&&h!=="blur"||c.target.offsetWidth!==0)&&!f.isWindow(e)&&(n=e[o],n&&(e[o]=null),f.event.triggered=h,e[h](),f.event.triggered=b,n&&(e[o]=n));return c.result}},dispatch:function(c){c=f.event.fix(c||a.event);var d=(f._data(this,"events")||{})[c.type]||[],e=d.delegateCount,g=[].slice.call(arguments,0),h=!c.exclusive&&!c.namespace,i=f.event.special[c.type]||{},j=[],k,l,m,n,o,p,q,r,s,t,u;g[0]=c,c.delegateTarget=this;if(!i.preDispatch||i.preDispatch.call(this,c)!==!1){if(e&&(!c.button||c.type!=="click")){n=f(this),n.context=this.ownerDocument||this;for(m=c.target;m!=this;m=m.parentNode||this)if(m.disabled!==!0){p={},r=[],n[0]=m;for(k=0;k<e;k++)s=d[k],t=s.selector,p[t]===b&&(p[t]=s.quick?H(m,s.quick):n.is(t)),p[t]&&r.push(s);r.length&&j.push({elem:m,matches:r})}}d.length>e&&j.push({elem:this,matches:d.slice(e)});for(k=0;k<j.length&&!c.isPropagationStopped();k++){q=j[k],c.currentTarget=q.elem;for(l=0;l<q.matches.length&&!c.isImmediatePropagationStopped();l++){s=q.matches[l];if(h||!c.namespace&&!s.namespace||c.namespace_re&&c.namespace_re.test(s.namespace))c.data=s.data,c.handleObj=s,o=((f.event.special[s.origType]||{}).handle||s.handler).apply(q.elem,g),o!==b&&(c.result=o,o===!1&&(c.preventDefault(),c.stopPropagation()))}}i.postDispatch&&i.postDispatch.call(this,c);return c.result}},props:"attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){a.which==null&&(a.which=b.charCode!=null?b.charCode:b.keyCode);return a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,d){var e,f,g,h=d.button,i=d.fromElement;a.pageX==null&&d.clientX!=null&&(e=a.target.ownerDocument||c,f=e.documentElement,g=e.body,a.pageX=d.clientX+(f&&f.scrollLeft||g&&g.scrollLeft||0)-(f&&f.clientLeft||g&&g.clientLeft||0),a.pageY=d.clientY+(f&&f.scrollTop||g&&g.scrollTop||0)-(f&&f.clientTop||g&&g.clientTop||0)),!a.relatedTarget&&i&&(a.relatedTarget=i===a.target?d.toElement:i),!a.which&&h!==b&&(a.which=h&1?1:h&2?3:h&4?2:0);return a}},fix:function(a){if(a[f.expando])return a;var d,e,g=a,h=f.event.fixHooks[a.type]||{},i=h.props?this.props.concat(h.props):this.props;a=f.Event(g);for(d=i.length;d;)e=i[--d],a[e]=g[e];a.target||(a.target=g.srcElement||c),a.target.nodeType===3&&(a.target=a.target.parentNode),a.metaKey===b&&(a.metaKey=a.ctrlKey);return h.filter?h.filter(a,g):a},special:{ready:{setup:f.bindReady},load:{noBubble:!0},focus:{delegateType:"focusin"},blur:{delegateType:"focusout"},beforeunload:{setup:function(a,b,c){f.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}},simulate:function(a,b,c,d){var e=f.extend(new f.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?f.event.trigger(e,null,b):f.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},f.event.handle=f.event.dispatch,f.removeEvent=c.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){a.detachEvent&&a.detachEvent("on"+b,c)},f.Event=function(a,b){if(!(this instanceof f.Event))return new f.Event(a,b);a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?K:J):this.type=a,b&&f.extend(this,b),this.timeStamp=a&&a.timeStamp||f.now(),this[f.expando]=!0},f.Event.prototype={preventDefault:function(){this.isDefaultPrevented=K;var a=this.originalEvent;!a||(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){this.isPropagationStopped=K;var a=this.originalEvent;!a||(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=K,this.stopPropagation()},isDefaultPrevented:J,isPropagationStopped:J,isImmediatePropagationStopped:J},f.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){f.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c=this,d=a.relatedTarget,e=a.handleObj,g=e.selector,h;if(!d||d!==c&&!f.contains(c,d))a.type=e.origType,h=e.handler.apply(this,arguments),a.type=b;return h}}}),f.support.submitBubbles||(f.event.special.submit={setup:function(){if(f.nodeName(this,"form"))return!1;f.event.add(this,"click._submit keypress._submit",function(a){var c=a.target,d=f.nodeName(c,"input")||f.nodeName(c,"button")?c.form:b;d&&!d._submit_attached&&(f.event.add(d,"submit._submit",function(a){a._submit_bubble=!0}),d._submit_attached=!0)})},postDispatch:function(a){a._submit_bubble&&(delete a._submit_bubble,this.parentNode&&!a.isTrigger&&f.event.simulate("submit",this.parentNode,a,!0))},teardown:function(){if(f.nodeName(this,"form"))return!1;f.event.remove(this,"._submit")}}),f.support.changeBubbles||(f.event.special.change={setup:function(){if(z.test(this.nodeName)){if(this.type==="checkbox"||this.type==="radio")f.event.add(this,"propertychange._change",function(a){a.originalEvent.propertyName==="checked"&&(this._just_changed=!0)}),f.event.add(this,"click._change",function(a){this._just_changed&&!a.isTrigger&&(this._just_changed=!1,f.event.simulate("change",this,a,!0))});return!1}f.event.add(this,"beforeactivate._change",function(a){var b=a.target;z.test(b.nodeName)&&!b._change_attached&&(f.event.add(b,"change._change",function(a){this.parentNode&&!a.isSimulated&&!a.isTrigger&&f.event.simulate("change",this.parentNode,a,!0)}),b._change_attached=!0)})},handle:function(a){var b=a.target;if(this!==b||a.isSimulated||a.isTrigger||b.type!=="radio"&&b.type!=="checkbox")return a.handleObj.handler.apply(this,arguments)},teardown:function(){f.event.remove(this,"._change");return z.test(this.nodeName)}}),f.support.focusinBubbles||f.each({focus:"focusin",blur:"focusout"},function(a,b){var d=0,e=function(a){f.event.simulate(b,a.target,f.event.fix(a),!0)};f.event.special[b]={setup:function(){d++===0&&c.addEventListener(a,e,!0)},teardown:function(){--d===0&&c.removeEventListener(a,e,!0)}}}),f.fn.extend({on:function(a,c,d,e,g){var h,i;if(typeof a=="object"){typeof c!="string"&&(d=d||c,c=b);for(i in a)this.on(i,c,d,a[i],g);return this}d==null&&e==null?(e=c,d=c=b):e==null&&(typeof c=="string"?(e=d,d=b):(e=d,d=c,c=b));if(e===!1)e=J;else if(!e)return this;g===1&&(h=e,e=function(a){f().off(a);return h.apply(this,arguments)},e.guid=h.guid||(h.guid=f.guid++));return this.each(function(){f.event.add(this,a,e,d,c)})},one:function(a,b,c,d){return this.on(a,b,c,d,1)},off:function(a,c,d){if(a&&a.preventDefault&&a.handleObj){var e=a.handleObj;f(a.delegateTarget).off(e.namespace?e.origType+"."+e.namespace:e.origType,e.selector,e.handler);return this}if(typeof a=="object"){for(var g in a)this.off(g,c,a[g]);return this}if(c===!1||typeof c=="function")d=c,c=b;d===!1&&(d=J);return this.each(function(){f.event.remove(this,a,d,c)})},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},live:function(a,b,c){f(this.context).on(a,this.selector,b,c);return this},die:function(a,b){f(this.context).off(a,this.selector||"**",b);return this},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return arguments.length==1?this.off(a,"**"):this.off(b,a,c)},trigger:function(a,b){return this.each(function(){f.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0])return f.event.trigger(a,b,this[0],!0)},toggle:function(a){var b=arguments,c=a.guid||f.guid++,d=0,e=function(c){var e=(f._data(this,"lastToggle"+a.guid)||0)%d;f._data(this,"lastToggle"+a.guid,e+1),c.preventDefault();return b[e].apply(this,arguments)||!1};e.guid=c;while(d<b.length)b[d++].guid=c;return this.click(e)},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}}),f.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){f.fn[b]=function(a,c){c==null&&(c=a,a=null);return arguments.length>0?this.on(b,null,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0),C.test(b)&&(f.event.fixHooks[b]=f.event.keyHooks),D.test(b)&&(f.event.fixHooks[b]=f.event.mouseHooks)}),function(){function x(a,b,c,e,f,g){for(var h=0,i=e.length;h<i;h++){var j=e[h];if(j){var k=!1;j=j[a];while(j){if(j[d]===c){k=e[j.sizset];break}if(j.nodeType===1){g||(j[d]=c,j.sizset=h);if(typeof b!="string"){if(j===b){k=!0;break}}else if(m.filter(b,[j]).length>0){k=j;break}}j=j[a]}e[h]=k}}}function w(a,b,c,e,f,g){for(var h=0,i=e.length;h<i;h++){var j=e[h];if(j){var k=!1;j=j[a];while(j){if(j[d]===c){k=e[j.sizset];break}j.nodeType===1&&!g&&(j[d]=c,j.sizset=h);if(j.nodeName.toLowerCase()===b){k=j;break}j=j[a]}e[h]=k}}}var a=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d="sizcache"+(Math.random()+"").replace(".",""),e=0,g=Object.prototype.toString,h=!1,i=!0,j=/\\/g,k=/\r\n/g,l=/\W/;[0,0].sort(function(){i=!1;return 0});var m=function(b,d,e,f){e=e||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return e;var i,j,k,l,n,q,r,t,u=!0,v=m.isXML(d),w=[],x=b;do{a.exec(""),i=a.exec(x);if(i){x=i[3],w.push(i[1]);if(i[2]){l=i[3];break}}}while(i);if(w.length>1&&p.exec(b))if(w.length===2&&o.relative[w[0]])j=y(w[0]+w[1],d,f);else{j=o.relative[w[0]]?[d]:m(w.shift(),d);while(w.length)b=w.shift(),o.relative[b]&&(b+=w.shift()),j=y(b,j,f)}else{!f&&w.length>1&&d.nodeType===9&&!v&&o.match.ID.test(w[0])&&!o.match.ID.test(w[w.length-1])&&(n=m.find(w.shift(),d,v),d=n.expr?m.filter(n.expr,n.set)[0]:n.set[0]);if(d){n=f?{expr:w.pop(),set:s(f)}:m.find(w.pop(),w.length===1&&(w[0]==="~"||w[0]==="+")&&d.parentNode?d.parentNode:d,v),j=n.expr?m.filter(n.expr,n.set):n.set,w.length>0?k=s(j):u=!1;while(w.length)q=w.pop(),r=q,o.relative[q]?r=w.pop():q="",r==null&&(r=d),o.relative[q](k,r,v)}else k=w=[]}k||(k=j),k||m.error(q||b);if(g.call(k)==="[object Array]")if(!u)e.push.apply(e,k);else if(d&&d.nodeType===1)for(t=0;k[t]!=null;t++)k[t]&&(k[t]===!0||k[t].nodeType===1&&m.contains(d,k[t]))&&e.push(j[t]);else for(t=0;k[t]!=null;t++)k[t]&&k[t].nodeType===1&&e.push(j[t]);else s(k,e);l&&(m(l,h,e,f),m.uniqueSort(e));return e};m.uniqueSort=function(a){if(u){h=i,a.sort(u);if(h)for(var b=1;b<a.length;b++)a[b]===a[b-1]&&a.splice(b--,1)}return a},m.matches=function(a,b){return m(a,null,null,b)},m.matchesSelector=function(a,b){return m(b,null,null,[a]).length>0},m.find=function(a,b,c){var d,e,f,g,h,i;if(!a)return[];for(e=0,f=o.order.length;e<f;e++){h=o.order[e];if(g=o.leftMatch[h].exec(a)){i=g[1],g.splice(1,1);if(i.substr(i.length-1)!=="\\"){g[1]=(g[1]||"").replace(j,""),d=o.find[h](g,b,c);if(d!=null){a=a.replace(o.match[h],"");break}}}}d||(d=typeof b.getElementsByTagName!="undefined"?b.getElementsByTagName("*"):[]);return{set:d,expr:a}},m.filter=function(a,c,d,e){var f,g,h,i,j,k,l,n,p,q=a,r=[],s=c,t=c&&c[0]&&m.isXML(c[0]);while(a&&c.length){for(h in o.filter)if((f=o.leftMatch[h].exec(a))!=null&&f[2]){k=o.filter[h],l=f[1],g=!1,f.splice(1,1);if(l.substr(l.length-1)==="\\")continue;s===r&&(r=[]);if(o.preFilter[h]){f=o.preFilter[h](f,s,d,r,e,t);if(!f)g=i=!0;else if(f===!0)continue}if(f)for(n=0;(j=s[n])!=null;n++)j&&(i=k(j,f,n,s),p=e^i,d&&i!=null?p?g=!0:s[n]=!1:p&&(r.push(j),g=!0));if(i!==b){d||(s=r),a=a.replace(o.match[h],"");if(!g)return[];break}}if(a===q)if(g==null)m.error(a);else break;q=a}return s},m.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)};var n=m.getText=function(a){var b,c,d=a.nodeType,e="";if(d){if(d===1||d===9||d===11){if(typeof a.textContent=="string")return a.textContent;if(typeof a.innerText=="string")return a.innerText.replace(k,"");for(a=a.firstChild;a;a=a.nextSibling)e+=n(a)}else if(d===3||d===4)return a.nodeValue}else for(b=0;c=a[b];b++)c.nodeType!==8&&(e+=n(c));return e},o=m.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(a){return a.getAttribute("href")},type:function(a){return a.getAttribute("type")}},relative:{"+":function(a,b){var c=typeof b=="string",d=c&&!l.test(b),e=c&&!d;d&&(b=b.toLowerCase());for(var f=0,g=a.length,h;f<g;f++)if(h=a[f]){while((h=h.previousSibling)&&h.nodeType!==1);a[f]=e||h&&h.nodeName.toLowerCase()===b?h||!1:h===b}e&&m.filter(b,a,!0)},">":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!l.test(b)){b=b.toLowerCase();for(;e<f;e++){c=a[e];if(c){var g=c.parentNode;a[e]=g.nodeName.toLowerCase()===b?g:!1}}}else{for(;e<f;e++)c=a[e],c&&(a[e]=d?c.parentNode:c.parentNode===b);d&&m.filter(b,a,!0)}},"":function(a,b,c){var d,f=e++,g=x;typeof b=="string"&&!l.test(b)&&(b=b.toLowerCase(),d=b,g=w),g("parentNode",b,f,a,d,c)},"~":function(a,b,c){var d,f=e++,g=x;typeof b=="string"&&!l.test(b)&&(b=b.toLowerCase(),d=b,g=w),g("previousSibling",b,f,a,d,c)}},find:{ID:function(a,b,c){if(typeof b.getElementById!="undefined"&&!c){var d=b.getElementById(a[1]);return d&&d.parentNode?[d]:[]}},NAME:function(a,b){if(typeof b.getElementsByName!="undefined"){var c=[],d=b.getElementsByName(a[1]);for(var e=0,f=d.length;e<f;e++)d[e].getAttribute("name")===a[1]&&c.push(d[e]);return c.length===0?null:c}},TAG:function(a,b){if(typeof b.getElementsByTagName!="undefined")return b.getElementsByTagName(a[1])}},preFilter:{CLASS:function(a,b,c,d,e,f){a=" "+a[1].replace(j,"")+" ";if(f)return a;for(var g=0,h;(h=b[g])!=null;g++)h&&(e^(h.className&&(" "+h.className+" ").replace(/[\t\n\r]/g," ").indexOf(a)>=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(j,"")},TAG:function(a,b){return a[1].replace(j,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||m.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&m.error(a[0]);a[0]=e++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(j,"");!f&&o.attrMap[g]&&(a[1]=o.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(j,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=m(b[3],null,null,c);else{var g=m.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(o.match.POS.test(b[0])||o.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!m(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return b<c[3]-0},gt:function(a,b,c){return b>c[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=o.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||n([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h<i;h++)if(g[h]===a)return!1;return!0}m.error(e)},CHILD:function(a,b){var c,e,f,g,h,i,j,k=b[1],l=a;switch(k){case"only":case"first":while(l=l.previousSibling)if(l.nodeType===1)return!1;if(k==="first")return!0;l=a;case"last":while(l=l.nextSibling)if(l.nodeType===1)return!1;return!0;case"nth":c=b[2],e=b[3];if(c===1&&e===0)return!0;f=b[0],g=a.parentNode;if(g&&(g[d]!==f||!a.nodeIndex)){i=0;for(l=g.firstChild;l;l=l.nextSibling)l.nodeType===1&&(l.nodeIndex=++i);g[d]=f}j=a.nodeIndex-e;return c===0?j===0:j%c===0&&j/c>=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||!!a.nodeName&&a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=m.attr?m.attr(a,c):o.attrHandle[c]?o.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":!f&&m.attr?d!=null:f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=o.setFilters[e];if(f)return f(a,c,b,d)}}},p=o.match.POS,q=function(a,b){return"\\"+(b-0+1)};for(var r in o.match)o.match[r]=new RegExp(o.match[r].source+/(?![^\[]*\])(?![^\(]*\))/.source),o.leftMatch[r]=new RegExp(/(^(?:.|\r|\n)*?)/.source+o.match[r].source.replace(/\\(\d+)/g,q));o.match.globalPOS=p;var s=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(t){s=function(a,b){var c=0,d=b||[];if(g.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var e=a.length;c<e;c++)d.push(a[c]);else for(;a[c];c++)d.push(a[c]);return d}}var u,v;c.documentElement.compareDocumentPosition?u=function(a,b){if(a===b){h=!0;return 0}if(!a.compareDocumentPosition||!b.compareDocumentPosition)return a.compareDocumentPosition?-1:1;return a.compareDocumentPosition(b)&4?-1:1}:(u=function(a,b){if(a===b){h=!0;return 0}if(a.sourceIndex&&b.sourceIndex)return a.sourceIndex-b.sourceIndex;var c,d,e=[],f=[],g=a.parentNode,i=b.parentNode,j=g;if(g===i)return v(a,b);if(!g)return-1;if(!i)return 1;while(j)e.unshift(j),j=j.parentNode;j=i;while(j)f.unshift(j),j=j.parentNode;c=e.length,d=f.length;for(var k=0;k<c&&k<d;k++)if(e[k]!==f[k])return v(e[k],f[k]);return k===c?v(a,f[k],-1):v(e[k],b,1)},v=function(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}),function(){var a=c.createElement("div"),d="script"+(new Date).getTime(),e=c.documentElement;a.innerHTML="<a name='"+d+"'/>",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(o.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},o.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(o.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(o.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=m,b=c.createElement("div"),d="__sizzle__";b.innerHTML="<p class='TEST'></p>";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){m=function(b,e,f,g){e=e||c;if(!g&&!m.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return s(e.getElementsByTagName(b),f);if(h[2]&&o.find.CLASS&&e.getElementsByClassName)return s(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return s([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return s([],f);if(i.id===h[3])return s([i],f)}try{return s(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var k=e,l=e.getAttribute("id"),n=l||d,p=e.parentNode,q=/^\s*[+~]/.test(b);l?n=n.replace(/'/g,"\\$&"):e.setAttribute("id",n),q&&p&&(e=e.parentNode);try{if(!q||p)return s(e.querySelectorAll("[id='"+n+"'] "+b),f)}catch(r){}finally{l||k.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)m[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}m.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!m.isXML(a))try{if(e||!o.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return m(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="<div class='test e'></div><div class='test'></div>";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;o.order.splice(1,0,"CLASS"),o.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?m.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?m.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:m.contains=function(){return!1},m.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var y=function(a,b,c){var d,e=[],f="",g=b.nodeType?[b]:b;while(d=o.match.PSEUDO.exec(a))f+=d[0],a=a.replace(o.match.PSEUDO,"");a=o.relative[a]?a+"*":a;for(var h=0,i=g.length;h<i;h++)m(a,g[h],e,c);return m.filter(f,e)};m.attr=f.attr,m.selectors.attrMap={},f.find=m,f.expr=m.selectors,f.expr[":"]=f.expr.filters,f.unique=m.uniqueSort,f.text=m.getText,f.isXMLDoc=m.isXML,f.contains=m.contains}();var L=/Until$/,M=/^(?:parents|prevUntil|prevAll)/,N=/,/,O=/^.[^:#\[\.,]*$/,P=Array.prototype.slice,Q=f.expr.match.globalPOS,R={children:!0,contents:!0,next:!0,prev:!0};f.fn.extend({find:function(a){var b=this,c,d;if(typeof a!="string")return f(a).filter(function(){for(c=0,d=b.length;c<d;c++)if(f.contains(b[c],this))return!0});var e=this.pushStack("","find",a),g,h,i;for(c=0,d=this.length;c<d;c++){g=e.length,f.find(a,this[c],e);if(c>0)for(h=g;h<e.length;h++)for(i=0;i<g;i++)if(e[i]===e[h]){e.splice(h--,1);break}}return e},has:function(a){var b=f(a);return this.filter(function(){for(var a=0,c=b.length;a<c;a++)if(f.contains(this,b[a]))return!0})},not:function(a){return this.pushStack(T(this,a,!1),"not",a)},filter:function(a){return this.pushStack(T(this,a,!0),"filter",a)},is:function(a){return!!a&&(typeof a=="string"?Q.test(a)?f(a,this.context).index(this[0])>=0:f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h=1;while(g&&g.ownerDocument&&g!==b){for(d=0;d<a.length;d++)f(g).is(a[d])&&c.push({selector:a[d],elem:g,level:h});g=g.parentNode,h++}return c}var i=Q.test(a)||typeof a!="string"?f(a,b||this.context):0;for(d=0,e=this.length;d<e;d++){g=this[d];while(g){if(i?i.index(g)>-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a)return this[0]&&this[0].parentNode?this.prevAll().length:-1;if(typeof a=="string")return f.inArray(this[0],f(a));return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(S(c[0])||S(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c);L.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!R[a]?f.unique(e):e,(this.length>1||N.test(d))&&M.test(a)&&(e=e.reverse());return this.pushStack(e,a,P.call(arguments).join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var V="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",W=/ jQuery\d+="(?:\d+|null)"/g,X=/^\s+/,Y=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,Z=/<([\w:]+)/,$=/<tbody/i,_=/<|&#?\w+;/,ba=/<(?:script|style)/i,bb=/<(?:script|object|embed|option|style)/i,bc=new RegExp("<(?:"+V+")[\\s/>]","i"),bd=/checked\s*(?:[^=]|=\s*.checked.)/i,be=/\/(java|ecma)script/i,bf=/^\s*<!(?:\[CDATA\[|\-\-)/,bg={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]},bh=U(c);bg.optgroup=bg.option,bg.tbody=bg.tfoot=bg.colgroup=bg.caption=bg.thead,bg.th=bg.td,f.support.htmlSerialize||(bg._default=[1,"div<div>","</div>"]),f.fn.extend({text:function(a){return f.access(this,function(a){return a===b?f.text(this):this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a))},null,a,arguments.length)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=f.isFunction(a);return this.each(function(c){f(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f
+.clean(arguments);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f.clean(arguments));return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){return f.access(this,function(a){var c=this[0]||{},d=0,e=this.length;if(a===b)return c.nodeType===1?c.innerHTML.replace(W,""):null;if(typeof a=="string"&&!ba.test(a)&&(f.support.leadingWhitespace||!X.test(a))&&!bg[(Z.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Y,"<$1></$2>");try{for(;d<e;d++)c=this[d]||{},c.nodeType===1&&(f.cleanData(c.getElementsByTagName("*")),c.innerHTML=a);c=0}catch(g){}}c&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(a){if(this[0]&&this[0].parentNode){if(f.isFunction(a))return this.each(function(b){var c=f(this),d=c.html();c.replaceWith(a.call(this,b,d))});typeof a!="string"&&(a=f(a).detach());return this.each(function(){var b=this.nextSibling,c=this.parentNode;f(this).remove(),b?f(b).before(a):f(c).append(a)})}return this.length?this.pushStack(f(f.isFunction(a)?a():a),"replaceWith",a):this},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,d){var e,g,h,i,j=a[0],k=[];if(!f.support.checkClone&&arguments.length===3&&typeof j=="string"&&bd.test(j))return this.each(function(){f(this).domManip(a,c,d,!0)});if(f.isFunction(j))return this.each(function(e){var g=f(this);a[0]=j.call(this,e,c?g.html():b),g.domManip(a,c,d)});if(this[0]){i=j&&j.parentNode,f.support.parentNode&&i&&i.nodeType===11&&i.childNodes.length===this.length?e={fragment:i}:e=f.buildFragment(a,this,k),h=e.fragment,h.childNodes.length===1?g=h=h.firstChild:g=h.firstChild;if(g){c=c&&f.nodeName(g,"tr");for(var l=0,m=this.length,n=m-1;l<m;l++)d.call(c?bi(this[l],g):this[l],e.cacheable||m>1&&l<n?f.clone(h,!0,!0):h)}k.length&&f.each(k,function(a,b){b.src?f.ajax({type:"GET",global:!1,url:b.src,async:!1,dataType:"script"}):f.globalEval((b.text||b.textContent||b.innerHTML||"").replace(bf,"/*$0*/")),b.parentNode&&b.parentNode.removeChild(b)})}return this}}),f.buildFragment=function(a,b,d){var e,g,h,i,j=a[0];b&&b[0]&&(i=b[0].ownerDocument||b[0]),i.createDocumentFragment||(i=c),a.length===1&&typeof j=="string"&&j.length<512&&i===c&&j.charAt(0)==="<"&&!bb.test(j)&&(f.support.checkClone||!bd.test(j))&&(f.support.html5Clone||!bc.test(j))&&(g=!0,h=f.fragments[j],h&&h!==1&&(e=h)),e||(e=i.createDocumentFragment(),f.clean(a,i,e,d)),g&&(f.fragments[j]=h?e:1);return{fragment:e,cacheable:g}},f.fragments={},f.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){f.fn[a]=function(c){var d=[],e=f(c),g=this.length===1&&this[0].parentNode;if(g&&g.nodeType===11&&g.childNodes.length===1&&e.length===1){e[b](this[0]);return this}for(var h=0,i=e.length;h<i;h++){var j=(h>0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d,e,g,h=f.support.html5Clone||f.isXMLDoc(a)||!bc.test("<"+a.nodeName+">")?a.cloneNode(!0):bo(a);if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bk(a,h),d=bl(a),e=bl(h);for(g=0;d[g];++g)e[g]&&bk(d[g],e[g])}if(b){bj(a,h);if(c){d=bl(a),e=bl(h);for(g=0;d[g];++g)bj(d[g],e[g])}}d=e=null;return h},clean:function(a,b,d,e){var g,h,i,j=[];b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);for(var k=0,l;(l=a[k])!=null;k++){typeof l=="number"&&(l+="");if(!l)continue;if(typeof l=="string")if(!_.test(l))l=b.createTextNode(l);else{l=l.replace(Y,"<$1></$2>");var m=(Z.exec(l)||["",""])[1].toLowerCase(),n=bg[m]||bg._default,o=n[0],p=b.createElement("div"),q=bh.childNodes,r;b===c?bh.appendChild(p):U(b).appendChild(p),p.innerHTML=n[1]+l+n[2];while(o--)p=p.lastChild;if(!f.support.tbody){var s=$.test(l),t=m==="table"&&!s?p.firstChild&&p.firstChild.childNodes:n[1]==="<table>"&&!s?p.childNodes:[];for(i=t.length-1;i>=0;--i)f.nodeName(t[i],"tbody")&&!t[i].childNodes.length&&t[i].parentNode.removeChild(t[i])}!f.support.leadingWhitespace&&X.test(l)&&p.insertBefore(b.createTextNode(X.exec(l)[0]),p.firstChild),l=p.childNodes,p&&(p.parentNode.removeChild(p),q.length>0&&(r=q[q.length-1],r&&r.parentNode&&r.parentNode.removeChild(r)))}var u;if(!f.support.appendChecked)if(l[0]&&typeof (u=l.length)=="number")for(i=0;i<u;i++)bn(l[i]);else bn(l);l.nodeType?j.push(l):j=f.merge(j,l)}if(d){g=function(a){return!a.type||be.test(a.type)};for(k=0;j[k];k++){h=j[k];if(e&&f.nodeName(h,"script")&&(!h.type||be.test(h.type)))e.push(h.parentNode?h.parentNode.removeChild(h):h);else{if(h.nodeType===1){var v=f.grep(h.getElementsByTagName("script"),g);j.splice.apply(j,[k+1,0].concat(v))}d.appendChild(h)}}}return j},cleanData:function(a){var b,c,d=f.cache,e=f.event.special,g=f.support.deleteExpando;for(var h=0,i;(i=a[h])!=null;h++){if(i.nodeName&&f.noData[i.nodeName.toLowerCase()])continue;c=i[f.expando];if(c){b=d[c];if(b&&b.events){for(var j in b.events)e[j]?f.event.remove(i,j):f.removeEvent(i,j,b.handle);b.handle&&(b.handle.elem=null)}g?delete i[f.expando]:i.removeAttribute&&i.removeAttribute(f.expando),delete d[c]}}}});var bp=/alpha\([^)]*\)/i,bq=/opacity=([^)]*)/,br=/([A-Z]|^ms)/g,bs=/^[\-+]?(?:\d*\.)?\d+$/i,bt=/^-?(?:\d*\.)?\d+(?!px)[^\d\s]+$/i,bu=/^([\-+])=([\-+.\de]+)/,bv=/^margin/,bw={position:"absolute",visibility:"hidden",display:"block"},bx=["Top","Right","Bottom","Left"],by,bz,bA;f.fn.css=function(a,c){return f.access(this,function(a,c,d){return d!==b?f.style(a,c,d):f.css(a,c)},a,c,arguments.length>1)},f.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=by(a,"opacity");return c===""?"1":c}return a.style.opacity}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":f.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!!a&&a.nodeType!==3&&a.nodeType!==8&&!!a.style){var g,h,i=f.camelCase(c),j=a.style,k=f.cssHooks[i];c=f.cssProps[i]||i;if(d===b){if(k&&"get"in k&&(g=k.get(a,!1,e))!==b)return g;return j[c]}h=typeof d,h==="string"&&(g=bu.exec(d))&&(d=+(g[1]+1)*+g[2]+parseFloat(f.css(a,c)),h="number");if(d==null||h==="number"&&isNaN(d))return;h==="number"&&!f.cssNumber[i]&&(d+="px");if(!k||!("set"in k)||(d=k.set(a,d))!==b)try{j[c]=d}catch(l){}}},css:function(a,c,d){var e,g;c=f.camelCase(c),g=f.cssHooks[c],c=f.cssProps[c]||c,c==="cssFloat"&&(c="float");if(g&&"get"in g&&(e=g.get(a,!0,d))!==b)return e;if(by)return by(a,c)},swap:function(a,b,c){var d={},e,f;for(f in b)d[f]=a.style[f],a.style[f]=b[f];e=c.call(a);for(f in b)a.style[f]=d[f];return e}}),f.curCSS=f.css,c.defaultView&&c.defaultView.getComputedStyle&&(bz=function(a,b){var c,d,e,g,h=a.style;b=b.replace(br,"-$1").toLowerCase(),(d=a.ownerDocument.defaultView)&&(e=d.getComputedStyle(a,null))&&(c=e.getPropertyValue(b),c===""&&!f.contains(a.ownerDocument.documentElement,a)&&(c=f.style(a,b))),!f.support.pixelMargin&&e&&bv.test(b)&&bt.test(c)&&(g=h.width,h.width=c,c=e.width,h.width=g);return c}),c.documentElement.currentStyle&&(bA=function(a,b){var c,d,e,f=a.currentStyle&&a.currentStyle[b],g=a.style;f==null&&g&&(e=g[b])&&(f=e),bt.test(f)&&(c=g.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),g.left=b==="fontSize"?"1em":f,f=g.pixelLeft+"px",g.left=c,d&&(a.runtimeStyle.left=d));return f===""?"auto":f}),by=bz||bA,f.each(["height","width"],function(a,b){f.cssHooks[b]={get:function(a,c,d){if(c)return a.offsetWidth!==0?bB(a,b,d):f.swap(a,bw,function(){return bB(a,b,d)})},set:function(a,b){return bs.test(b)?b+"px":b}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return bq.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=f.isNumeric(b)?"alpha(opacity="+b*100+")":"",g=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&f.trim(g.replace(bp,""))===""){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bp.test(g)?g.replace(bp,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){return f.swap(a,{display:"inline-block"},function(){return b?by(a,"margin-right"):a.style.marginRight})}})}),f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style&&a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)}),f.each({margin:"",padding:"",border:"Width"},function(a,b){f.cssHooks[a+b]={expand:function(c){var d,e=typeof c=="string"?c.split(" "):[c],f={};for(d=0;d<4;d++)f[a+bx[d]+b]=e[d]||e[d-2]||e[0];return f}}});var bC=/%20/g,bD=/\[\]$/,bE=/\r?\n/g,bF=/#.*$/,bG=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bH=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bI=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,bJ=/^(?:GET|HEAD)$/,bK=/^\/\//,bL=/\?/,bM=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,bN=/^(?:select|textarea)/i,bO=/\s+/,bP=/([?&])_=[^&]*/,bQ=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bR=f.fn.load,bS={},bT={},bU,bV,bW=["*/"]+["*"];try{bU=e.href}catch(bX){bU=c.createElement("a"),bU.href="",bU=bU.href}bV=bQ.exec(bU.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bR)return bR.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("<div>").append(c.replace(bM,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bN.test(this.nodeName)||bH.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bE,"\r\n")}}):{name:b.name,value:c.replace(bE,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.on(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?b$(a,f.ajaxSettings):(b=a,a=f.ajaxSettings),b$(a,b);return a},ajaxSettings:{url:bU,isLocal:bI.test(bV[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded; charset=UTF-8",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":bW},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:bY(bS),ajaxTransport:bY(bT),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a>0?4:0;var o,r,u,w=c,x=l?ca(d,v,l):b,y,z;if(a>=200&&a<300||a===304){if(d.ifModified){if(y=v.getResponseHeader("Last-Modified"))f.lastModified[k]=y;if(z=v.getResponseHeader("Etag"))f.etag[k]=z}if(a===304)w="notmodified",o=!0;else try{r=cb(d,x),w="success",o=!0}catch(A){w="parsererror",u=A}}else{u=w;if(!w||a)w="error",a<0&&(a=0)}v.status=a,v.statusText=""+(c||w),o?h.resolveWith(e,[r,w,v]):h.rejectWith(e,[v,w,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.fireWith(e,[v,w]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f.Callbacks("once memory"),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bG.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.add,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bF,"").replace(bK,bV[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bO),d.crossDomain==null&&(r=bQ.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bV[1]&&r[2]==bV[2]&&(r[3]||(r[1]==="http:"?80:443))==(bV[3]||(bV[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),bZ(bS,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bJ.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bL.test(d.url)?"&":"?")+d.data,delete d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bP,"$1_="+x);d.url=y+(y===d.url?(bL.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", "+bW+"; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=bZ(bT,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){if(s<2)w(-1,z);else throw z}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)b_(g,a[g],c,e);return d.join("&").replace(bC,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var cc=f.now(),cd=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+cc++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=typeof b.data=="string"&&/^application\/x\-www\-form\-urlencoded/.test(b.contentType);if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(cd.test(b.url)||e&&cd.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(cd,l),b.url===j&&(e&&(k=k.replace(cd,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var ce=a.ActiveXObject?function(){for(var a in cg)cg[a](0,1)}:!1,cf=0,cg;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ch()||ci()}:ch,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,ce&&delete cg[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n);try{m.text=h.responseText}catch(a){}try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cf,ce&&(cg||(cg={},f(a).unload(ce)),cg[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var cj={},ck,cl,cm=/^(?:toggle|show|hide)$/,cn=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,co,cp=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cq;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(ct("show",3),a,b,c);for(var g=0,h=this.length;g<h;g++)d=this[g],d.style&&(e=d.style.display,!f._data(d,"olddisplay")&&e==="none"&&(e=d.style.display=""),(e===""&&f.css(d,"display")==="none"||!f.contains(d.ownerDocument.documentElement,d))&&f._data(d,"olddisplay",cu(d.nodeName)));for(g=0;g<h;g++){d=this[g];if(d.style){e=d.style.display;if(e===""||e==="none")d.style.display=f._data(d,"olddisplay")||""}}return this},hide:function(a,b,c){if(a||a===0)return this.animate(ct("hide",3),a,b,c);var d,e,g=0,h=this.length;for(;g<h;g++)d=this[g],d.style&&(e=f.css(d,"display"),e!=="none"&&!f._data(d,"olddisplay")&&f._data(d,"olddisplay",e));for(g=0;g<h;g++)this[g].style&&(this[g].style.display="none");return this},_toggle:f.fn.toggle,toggle:function(a,b,c){var d=typeof a=="boolean";f.isFunction(a)&&f.isFunction(b)?this._toggle.apply(this,arguments):a==null||d?this.each(function(){var b=d?a:f(this).is(":hidden");f(this)[b?"show":"hide"]()}):this.animate(ct("toggle",3),a,b,c);return this},fadeTo:function(a,b,c,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){function g(){e.queue===!1&&f._mark(this);var b=f.extend({},e),c=this.nodeType===1,d=c&&f(this).is(":hidden"),g,h,i,j,k,l,m,n,o,p,q;b.animatedProperties={};for(i in a){g=f.camelCase(i),i!==g&&(a[g]=a[i],delete a[i]);if((k=f.cssHooks[g])&&"expand"in k){l=k.expand(a[g]),delete a[g];for(i in l)i in a||(a[i]=l[i])}}for(g in a){h=a[g],f.isArray(h)?(b.animatedProperties[g]=h[1],h=a[g]=h[0]):b.animatedProperties[g]=b.specialEasing&&b.specialEasing[g]||b.easing||"swing";if(h==="hide"&&d||h==="show"&&!d)return b.complete.call(this);c&&(g==="height"||g==="width")&&(b.overflow=[this.style.overflow,this.style.overflowX,this.style.overflowY],f.css(this,"display")==="inline"&&f.css(this,"float")==="none"&&(!f.support.inlineBlockNeedsLayout||cu(this.nodeName)==="inline"?this.style.display="inline-block":this.style.zoom=1))}b.overflow!=null&&(this.style.overflow="hidden");for(i in a)j=new f.fx(this,b,i),h=a[i],cm.test(h)?(q=f._data(this,"toggle"+i)||(h==="toggle"?d?"show":"hide":0),q?(f._data(this,"toggle"+i,q==="show"?"hide":"show"),j[q]()):j[h]()):(m=cn.exec(h),n=j.cur(),m?(o=parseFloat(m[2]),p=m[3]||(f.cssNumber[i]?"":"px"),p!=="px"&&(f.style(this,i,(o||1)+p),n=(o||1)/j.cur()*n,f.style(this,i,n+p)),m[1]&&(o=(m[1]==="-="?-1:1)*o+n),j.custom(n,o,p)):j.custom(n,h,""));return!0}var e=f.speed(b,c,d);if(f.isEmptyObject(a))return this.each(e.complete,[!1]);a=f.extend({},a);return e.queue===!1?this.each(g):this.queue(e.queue,g)},stop:function(a,c,d){typeof a!="string"&&(d=c,c=a,a=b),c&&a!==!1&&this.queue(a||"fx",[]);return this.each(function(){function h(a,b,c){var e=b[c];f.removeData(a,c,!0),e.stop(d)}var b,c=!1,e=f.timers,g=f._data(this);d||f._unmark(!0,this);if(a==null)for(b in g)g[b]&&g[b].stop&&b.indexOf(".run")===b.length-4&&h(this,g,b);else g[b=a+".run"]&&g[b].stop&&h(this,g,b);for(b=e.length;b--;)e[b].elem===this&&(a==null||e[b].queue===a)&&(d?e[b](!0):e[b].saveState(),c=!0,e.splice(b,1));(!d||!c)&&f.dequeue(this,a)})}}),f.each({slideDown:ct("show",1),slideUp:ct("hide",1),slideToggle:ct("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){f.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),f.extend({speed:function(a,b,c){var d=a&&typeof a=="object"?f.extend({},a):{complete:c||!c&&b||f.isFunction(a)&&a,duration:a,easing:c&&b||b&&!f.isFunction(b)&&b};d.duration=f.fx.off?0:typeof d.duration=="number"?d.duration:d.duration in f.fx.speeds?f.fx.speeds[d.duration]:f.fx.speeds._default;if(d.queue==null||d.queue===!0)d.queue="fx";d.old=d.complete,d.complete=function(a){f.isFunction(d.old)&&d.old.call(this),d.queue?f.dequeue(this,d.queue):a!==!1&&f._unmark(this)};return d},easing:{linear:function(a){return a},swing:function(a){return-Math.cos(a*Math.PI)/2+.5}},timers:[],fx:function(a,b,c){this.options=b,this.elem=a,this.prop=c,b.orig=b.orig||{}}}),f.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this),(f.fx.step[this.prop]||f.fx.step._default)(this)},cur:function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];var a,b=f.css(this.elem,this.prop);return isNaN(a=parseFloat(b))?!b||b==="auto"?0:b:a},custom:function(a,c,d){function h(a){return e.step(a)}var e=this,g=f.fx;this.startTime=cq||cr(),this.end=c,this.now=this.start=a,this.pos=this.state=0,this.unit=d||this.unit||(f.cssNumber[this.prop]?"":"px"),h.queue=this.options.queue,h.elem=this.elem,h.saveState=function(){f._data(e.elem,"fxshow"+e.prop)===b&&(e.options.hide?f._data(e.elem,"fxshow"+e.prop,e.start):e.options.show&&f._data(e.elem,"fxshow"+e.prop,e.end))},h()&&f.timers.push(h)&&!co&&(co=setInterval(g.tick,g.interval))},show:function(){var a=f._data(this.elem,"fxshow"+this.prop);this.options.orig[this.prop]=a||f.style(this.elem,this.prop),this.options.show=!0,a!==b?this.custom(this.cur(),a):this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur()),f(this.elem).show()},hide:function(){this.options.orig[this.prop]=f._data(this.elem,"fxshow"+this.prop)||f.style(this.elem,this.prop),this.options.hide=!0,this.custom(this.cur(),0)},step:function(a){var b,c,d,e=cq||cr(),g=!0,h=this.elem,i=this.options;if(a||e>=i.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),i.animatedProperties[this.prop]=!0;for(b in i.animatedProperties)i.animatedProperties[b]!==!0&&(g=!1);if(g){i.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){h.style["overflow"+b]=i.overflow[a]}),i.hide&&f(h).hide();if(i.hide||i.show)for(b in i.animatedProperties)f.style(h,b,i.orig[b]),f.removeData(h,"fxshow"+b,!0),f.removeData(h,"toggle"+b,!0);d=i.complete,d&&(i.complete=!1,d.call(h))}return!1}i.duration==Infinity?this.now=e:(c=e-this.startTime,this.state=c/i.duration,this.pos=f.easing[i.animatedProperties[this.prop]](this.state,c,0,1,i.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){var a,b=f.timers,c=0;for(;c<b.length;c++)a=b[c],!a()&&b[c]===a&&b.splice(c--,1);b.length||f.fx.stop()},interval:13,stop:function(){clearInterval(co),co=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){f.style(a.elem,"opacity",a.now)},_default:function(a){a.elem.style&&a.elem.style[a.prop]!=null?a.elem.style[a.prop]=a.now+a.unit:a.elem[a.prop]=a.now}}}),f.each(cp.concat.apply([],cp),function(a,b){b.indexOf("margin")&&(f.fx.step[b]=function(a){f.style(a.elem,b,Math.max(0,a.now)+a.unit)})}),f.expr&&f.expr.filters&&(f.expr.filters.animated=function(a){return f.grep(f.timers,function(b){return a===b.elem}).length});var cv,cw=/^t(?:able|d|h)$/i,cx=/^(?:body|html)$/i;"getBoundingClientRect"in c.documentElement?cv=function(a,b,c,d){try{d=a.getBoundingClientRect()}catch(e){}if(!d||!f.contains(c,a))return d?{top:d.top,left:d.left}:{top:0,left:0};var g=b.body,h=cy(b),i=c.clientTop||g.clientTop||0,j=c.clientLeft||g.clientLeft||0,k=h.pageYOffset||f.support.boxModel&&c.scrollTop||g.scrollTop,l=h.pageXOffset||f.support.boxModel&&c.scrollLeft||g.scrollLeft,m=d.top+k-i,n=d.left+l-j;return{top:m,left:n}}:cv=function(a,b,c){var d,e=a.offsetParent,g=a,h=b.body,i=b.defaultView,j=i?i.getComputedStyle(a,null):a.currentStyle,k=a.offsetTop,l=a.offsetLeft;while((a=a.parentNode)&&a!==h&&a!==c){if(f.support.fixedPosition&&j.position==="fixed")break;d=i?i.getComputedStyle(a,null):a.currentStyle,k-=a.scrollTop,l-=a.scrollLeft,a===e&&(k+=a.offsetTop,l+=a.offsetLeft,f.support.doesNotAddBorder&&(!f.support.doesAddBorderForTableAndCells||!cw.test(a.nodeName))&&(k+=parseFloat(d.borderTopWidth)||0,l+=parseFloat(d.borderLeftWidth)||0),g=e,e=a.offsetParent),f.support.subtractsBorderForOverflowNotVisible&&d.overflow!=="visible"&&(k+=parseFloat(d.borderTopWidth)||0,l+=parseFloat(d.borderLeftWidth)||0),j=d}if(j.position==="relative"||j.position==="static")k+=h.offsetTop,l+=h.offsetLeft;f.support.fixedPosition&&j.position==="fixed"&&(k+=Math.max(c.scrollTop,h.scrollTop),l+=Math.max(c.scrollLeft,h.scrollLeft));return{top:k,left:l}},f.fn.offset=function(a){if(arguments.length)return a===b?this:this.each(function(b){f.offset.setOffset(this,a,b)});var c=this[0],d=c&&c.ownerDocument;if(!d)return null;if(c===d.body)return f.offset.bodyOffset(c);return cv(c,d,d.documentElement)},f.offset={bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;f.support.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(f.css(a,"marginTop"))||0,c+=parseFloat(f.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var d=f.css(a,"position");d==="static"&&(a.style.position="relative");var e=f(a),g=e.offset(),h=f.css(a,"top"),i=f.css(a,"left"),j=(d==="absolute"||d==="fixed")&&f.inArray("auto",[h,i])>-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cx.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cx.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,c){var d=/Y/.test(c);f.fn[a]=function(e){return f.access(this,function(a,e,g){var h=cy(a);if(g===b)return h?c in h?h[c]:f.support.boxModel&&h.document.documentElement[e]||h.document.body[e]:a[e];h?h.scrollTo(d?f(h).scrollLeft():g,d?g:f(h).scrollTop()):a[e]=g},a,e,arguments.length,null)}}),f.each({Height:"height",Width:"width"},function(a,c){var d="client"+a,e="scroll"+a,g="offset"+a;f.fn["inner"+a]=function(){var a=this[0];return a?a.style?parseFloat(f.css(a,c,"padding")):this[c]():null},f.fn["outer"+a]=function(a){var b=this[0];return b?b.style?parseFloat(f.css(b,c,a?"margin":"border")):this[c]():null},f.fn[c]=function(a){return f.access(this,function(a,c,h){var i,j,k,l;if(f.isWindow(a)){i=a.document,j=i.documentElement[d];return f.support.boxModel&&j||i.body&&i.body[d]||j}if(a.nodeType===9){i=a.documentElement;if(i[d]>=i[e])return i[d];return Math.max(a.body[e],i[e],a.body[g],i[g])}if(h===b){k=f.css(a,c),l=parseFloat(k);return f.isNumeric(l)?l:k}f(a).css(c,h)},c,a,arguments.length,null)}}),a.jQuery=a.$=f,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return f})})(window);
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/jquery.nicescroll.min.js b/pluss-wap-page/src/main/resources/static/resources/js/jquery.nicescroll.min.js
new file mode 100644
index 0000000..1174962
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/jquery.nicescroll.min.js
@@ -0,0 +1,120 @@
+/* jquery.nicescroll 3.6.8 InuYaksa*2015 MIT http://nicescroll.areaaperta.com */(function(f){"function"===typeof define&&define.amd?define(["jquery"],f):"object"===typeof exports?module.exports=f(require("jquery")):f(jQuery)})(function(f){var B=!1,F=!1,O=0,P=2E3,A=0,J=["webkit","ms","moz","o"],v=window.requestAnimationFrame||!1,w=window.cancelAnimationFrame||!1;if(!v)for(var Q in J){var G=J[Q];if(v=window[G+"RequestAnimationFrame"]){w=window[G+"CancelAnimationFrame"]||window[G+"CancelRequestAnimationFrame"];break}}var x=window.MutationObserver||window.WebKitMutationObserver||
+!1,K={zindex:"auto",cursoropacitymin:1,cursoropacitymax:1,cursorcolor:"#424242",cursorwidth:"6px",cursorborder:"1px solid #fff",cursorborderradius:"5px",scrollspeed:60,mousescrollstep:24,touchbehavior:!1,hwacceleration:!0,usetransition:!0,boxzoom:!1,dblclickzoom:!0,gesturezoom:!0,grabcursorenabled:!0,autohidemode:!0,background:"",iframeautoresize:!0,cursorminheight:32,preservenativescrolling:!0,railoffset:!1,railhoffset:!1,bouncescroll:!0,spacebarenabled:!0,railpadding:{top:0,right:0,left:0,bottom:0},
+disableoutline:!0,horizrailenabled:!0,railalign:"right",railvalign:"bottom",enabletranslate3d:!0,enablemousewheel:!0,enablekeyboard:!0,smoothscroll:!0,sensitiverail:!0,enablemouselockapi:!0,cursorfixedheight:!1,directionlockdeadzone:6,hidecursordelay:400,nativeparentscrolling:!0,enablescrollonselection:!0,overflowx:!0,overflowy:!0,cursordragspeed:.3,rtlmode:"auto",cursordragontouch:!1,oneaxismousemode:"auto",scriptpath:function(){var f=document.getElementsByTagName("script"),f=f.length?f[f.length-
+1].src.split("?")[0]:"";return 0<f.split("/").length?f.split("/").slice(0,-1).join("/")+"/":""}(),preventmultitouchscrolling:!0,disablemutationobserver:!1},H=!1,R=function(){if(H)return H;var f=document.createElement("DIV"),c=f.style,k=navigator.userAgent,l=navigator.platform,d={haspointerlock:"pointerLockElement"in document||"webkitPointerLockElement"in document||"mozPointerLockElement"in document};d.isopera="opera"in window;d.isopera12=d.isopera&&"getUserMedia"in navigator;d.isoperamini="[object OperaMini]"===
+Object.prototype.toString.call(window.operamini);d.isie="all"in document&&"attachEvent"in f&&!d.isopera;d.isieold=d.isie&&!("msInterpolationMode"in c);d.isie7=d.isie&&!d.isieold&&(!("documentMode"in document)||7==document.documentMode);d.isie8=d.isie&&"documentMode"in document&&8==document.documentMode;d.isie9=d.isie&&"performance"in window&&9==document.documentMode;d.isie10=d.isie&&"performance"in window&&10==document.documentMode;d.isie11="msRequestFullscreen"in f&&11<=document.documentMode;d.isieedge12=
+navigator.userAgent.match(/Edge\/12\./);d.isieedge="msOverflowStyle"in f;d.ismodernie=d.isie11||d.isieedge;d.isie9mobile=/iemobile.9/i.test(k);d.isie9mobile&&(d.isie9=!1);d.isie7mobile=!d.isie9mobile&&d.isie7&&/iemobile/i.test(k);d.ismozilla="MozAppearance"in c;d.iswebkit="WebkitAppearance"in c;d.ischrome="chrome"in window;d.ischrome38=d.ischrome&&"touchAction"in c;d.ischrome22=!d.ischrome38&&d.ischrome&&d.haspointerlock;d.ischrome26=!d.ischrome38&&d.ischrome&&"transition"in c;d.cantouch="ontouchstart"in
+document.documentElement||"ontouchstart"in window;d.hasw3ctouch=(window.PointerEvent||!1)&&(0<navigator.MaxTouchPoints||0<navigator.msMaxTouchPoints);d.hasmstouch=!d.hasw3ctouch&&(window.MSPointerEvent||!1);d.ismac=/^mac$/i.test(l);d.isios=d.cantouch&&/iphone|ipad|ipod/i.test(l);d.isios4=d.isios&&!("seal"in Object);d.isios7=d.isios&&"webkitHidden"in document;d.isios8=d.isios&&"hidden"in document;d.isandroid=/android/i.test(k);d.haseventlistener="addEventListener"in f;d.trstyle=!1;d.hastransform=!1;
+d.hastranslate3d=!1;d.transitionstyle=!1;d.hastransition=!1;d.transitionend=!1;l=["transform","msTransform","webkitTransform","MozTransform","OTransform"];for(k=0;k<l.length;k++)if(void 0!==c[l[k]]){d.trstyle=l[k];break}d.hastransform=!!d.trstyle;d.hastransform&&(c[d.trstyle]="translate3d(1px,2px,3px)",d.hastranslate3d=/translate3d/.test(c[d.trstyle]));d.transitionstyle=!1;d.prefixstyle="";d.transitionend=!1;for(var l="transition webkitTransition msTransition MozTransition OTransition OTransition KhtmlTransition".split(" "),
+q=" -webkit- -ms- -moz- -o- -o -khtml-".split(" "),t="transitionend webkitTransitionEnd msTransitionEnd transitionend otransitionend oTransitionEnd KhtmlTransitionEnd".split(" "),k=0;k<l.length;k++)if(l[k]in c){d.transitionstyle=l[k];d.prefixstyle=q[k];d.transitionend=t[k];break}d.ischrome26&&(d.prefixstyle=q[1]);d.hastransition=d.transitionstyle;a:{k=["grab","-webkit-grab","-moz-grab"];if(d.ischrome&&!d.ischrome38||d.isie)k=[];for(l=0;l<k.length;l++)if(q=k[l],c.cursor=q,c.cursor==q){c=q;break a}c=
+"url(//patriciaportfolio.googlecode.com/files/openhand.cur),n-resize"}d.cursorgrabvalue=c;d.hasmousecapture="setCapture"in f;d.hasMutationObserver=!1!==x;return H=d},S=function(h,c){function k(){var b=a.doc.css(e.trstyle);return b&&"matrix"==b.substr(0,6)?b.replace(/^.*\((.*)\)$/g,"$1").replace(/px/g,"").split(/, +/):!1}function l(){var b=a.win;if("zIndex"in b)return b.zIndex();for(;0<b.length&&9!=b[0].nodeType;){var g=b.css("zIndex");if(!isNaN(g)&&0!=g)return parseInt(g);b=b.parent()}return!1}function d(b,
+g,u){g=b.css(g);b=parseFloat(g);return isNaN(b)?(b=z[g]||0,u=3==b?u?a.win.outerHeight()-a.win.innerHeight():a.win.outerWidth()-a.win.innerWidth():1,a.isie8&&b&&(b+=1),u?b:0):b}function q(b,g,u,c){a._bind(b,g,function(a){a=a?a:window.event;var c={original:a,target:a.target||a.srcElement,type:"wheel",deltaMode:"MozMousePixelScroll"==a.type?0:1,deltaX:0,deltaZ:0,preventDefault:function(){a.preventDefault?a.preventDefault():a.returnValue=!1;return!1},stopImmediatePropagation:function(){a.stopImmediatePropagation?
+a.stopImmediatePropagation():a.cancelBubble=!0}};"mousewheel"==g?(a.wheelDeltaX&&(c.deltaX=-.025*a.wheelDeltaX),a.wheelDeltaY&&(c.deltaY=-.025*a.wheelDeltaY),c.deltaY||c.deltaX||(c.deltaY=-.025*a.wheelDelta)):c.deltaY=a.detail;return u.call(b,c)},c)}function t(b,g,c){var d,e;0==b.deltaMode?(d=-Math.floor(a.opt.mousescrollstep/54*b.deltaX),e=-Math.floor(a.opt.mousescrollstep/54*b.deltaY)):1==b.deltaMode&&(d=-Math.floor(b.deltaX*a.opt.mousescrollstep),e=-Math.floor(b.deltaY*a.opt.mousescrollstep));
+g&&a.opt.oneaxismousemode&&0==d&&e&&(d=e,e=0,c&&(0>d?a.getScrollLeft()>=a.page.maxw:0>=a.getScrollLeft())&&(e=d,d=0));a.isrtlmode&&(d=-d);d&&(a.scrollmom&&a.scrollmom.stop(),a.lastdeltax+=d,a.debounced("mousewheelx",function(){var b=a.lastdeltax;a.lastdeltax=0;a.rail.drag||a.doScrollLeftBy(b)},15));if(e){if(a.opt.nativeparentscrolling&&c&&!a.ispage&&!a.zoomactive)if(0>e){if(a.getScrollTop()>=a.page.maxh)return!0}else if(0>=a.getScrollTop())return!0;a.scrollmom&&a.scrollmom.stop();a.lastdeltay+=e;
+a.synched("mousewheely",function(){var b=a.lastdeltay;a.lastdeltay=0;a.rail.drag||a.doScrollBy(b)},15)}b.stopImmediatePropagation();return b.preventDefault()}var a=this;this.version="3.6.8";this.name="nicescroll";this.me=c;this.opt={doc:f("body"),win:!1};f.extend(this.opt,K);this.opt.snapbackspeed=80;if(h)for(var r in a.opt)void 0!==h[r]&&(a.opt[r]=h[r]);a.opt.disablemutationobserver&&(x=!1);this.iddoc=(this.doc=a.opt.doc)&&this.doc[0]?this.doc[0].id||"":"";this.ispage=/^BODY|HTML/.test(a.opt.win?
+a.opt.win[0].nodeName:this.doc[0].nodeName);this.haswrapper=!1!==a.opt.win;this.win=a.opt.win||(this.ispage?f(window):this.doc);this.docscroll=this.ispage&&!this.haswrapper?f(window):this.win;this.body=f("body");this.iframe=this.isfixed=this.viewport=!1;this.isiframe="IFRAME"==this.doc[0].nodeName&&"IFRAME"==this.win[0].nodeName;this.istextarea="TEXTAREA"==this.win[0].nodeName;this.forcescreen=!1;this.canshowonmouseevent="scroll"!=a.opt.autohidemode;this.page=this.view=this.onzoomout=this.onzoomin=
+this.onscrollcancel=this.onscrollend=this.onscrollstart=this.onclick=this.ongesturezoom=this.onkeypress=this.onmousewheel=this.onmousemove=this.onmouseup=this.onmousedown=!1;this.scroll={x:0,y:0};this.scrollratio={x:0,y:0};this.cursorheight=20;this.scrollvaluemax=0;if("auto"==this.opt.rtlmode){r=this.win[0]==window?this.body:this.win;var p=r.css("writing-mode")||r.css("-webkit-writing-mode")||r.css("-ms-writing-mode")||r.css("-moz-writing-mode");"horizontal-tb"==p||"lr-tb"==p||""==p?(this.isrtlmode=
+"rtl"==r.css("direction"),this.isvertical=!1):(this.isrtlmode="vertical-rl"==p||"tb"==p||"tb-rl"==p||"rl-tb"==p,this.isvertical="vertical-rl"==p||"tb"==p||"tb-rl"==p)}else this.isrtlmode=!0===this.opt.rtlmode,this.isvertical=!1;this.observerbody=this.observerremover=this.observer=this.scrollmom=this.scrollrunning=!1;do this.id="ascrail"+P++;while(document.getElementById(this.id));this.hasmousefocus=this.hasfocus=this.zoomactive=this.zoom=this.selectiondrag=this.cursorfreezed=this.cursor=this.rail=
+!1;this.visibility=!0;this.hidden=this.locked=this.railslocked=!1;this.cursoractive=!0;this.wheelprevented=!1;this.overflowx=a.opt.overflowx;this.overflowy=a.opt.overflowy;this.nativescrollingarea=!1;this.checkarea=0;this.events=[];this.saved={};this.delaylist={};this.synclist={};this.lastdeltay=this.lastdeltax=0;this.detected=R();var e=f.extend({},this.detected);this.ishwscroll=(this.canhwscroll=e.hastransform&&a.opt.hwacceleration)&&a.haswrapper;this.hasreversehr=this.isrtlmode?this.isvertical?
+!(e.iswebkit||e.isie||e.isie11):!(e.iswebkit||e.isie&&!e.isie10&&!e.isie11):!1;this.istouchcapable=!1;e.cantouch||!e.hasw3ctouch&&!e.hasmstouch?!e.cantouch||e.isios||e.isandroid||!e.iswebkit&&!e.ismozilla||(this.istouchcapable=!0):this.istouchcapable=!0;a.opt.enablemouselockapi||(e.hasmousecapture=!1,e.haspointerlock=!1);this.debounced=function(b,g,c){a&&(a.delaylist[b]||(g.call(a),a.delaylist[b]={h:v(function(){a.delaylist[b].fn.call(a);a.delaylist[b]=!1},c)}),a.delaylist[b].fn=g)};var I=!1;this.synched=
+function(b,g){a.synclist[b]=g;(function(){I||(v(function(){if(a){I=!1;for(var b in a.synclist){var g=a.synclist[b];g&&g.call(a);a.synclist[b]=!1}}}),I=!0)})();return b};this.unsynched=function(b){a.synclist[b]&&(a.synclist[b]=!1)};this.css=function(b,g){for(var c in g)a.saved.css.push([b,c,b.css(c)]),b.css(c,g[c])};this.scrollTop=function(b){return void 0===b?a.getScrollTop():a.setScrollTop(b)};this.scrollLeft=function(b){return void 0===b?a.getScrollLeft():a.setScrollLeft(b)};var D=function(a,g,
+c,d,e,f,k){this.st=a;this.ed=g;this.spd=c;this.p1=d||0;this.p2=e||1;this.p3=f||0;this.p4=k||1;this.ts=(new Date).getTime();this.df=this.ed-this.st};D.prototype={B2:function(a){return 3*a*a*(1-a)},B3:function(a){return 3*a*(1-a)*(1-a)},B4:function(a){return(1-a)*(1-a)*(1-a)},getNow:function(){var a=1-((new Date).getTime()-this.ts)/this.spd,g=this.B2(a)+this.B3(a)+this.B4(a);return 0>a?this.ed:this.st+Math.round(this.df*g)},update:function(a,g){this.st=this.getNow();this.ed=a;this.spd=g;this.ts=(new Date).getTime();
+this.df=this.ed-this.st;return this}};if(this.ishwscroll){this.doc.translate={x:0,y:0,tx:"0px",ty:"0px"};e.hastranslate3d&&e.isios&&this.doc.css("-webkit-backface-visibility","hidden");this.getScrollTop=function(b){if(!b){if(b=k())return 16==b.length?-b[13]:-b[5];if(a.timerscroll&&a.timerscroll.bz)return a.timerscroll.bz.getNow()}return a.doc.translate.y};this.getScrollLeft=function(b){if(!b){if(b=k())return 16==b.length?-b[12]:-b[4];if(a.timerscroll&&a.timerscroll.bh)return a.timerscroll.bh.getNow()}return a.doc.translate.x};
+this.notifyScrollEvent=function(a){var g=document.createEvent("UIEvents");g.initUIEvent("scroll",!1,!0,window,1);g.niceevent=!0;a.dispatchEvent(g)};var y=this.isrtlmode?1:-1;e.hastranslate3d&&a.opt.enabletranslate3d?(this.setScrollTop=function(b,g){a.doc.translate.y=b;a.doc.translate.ty=-1*b+"px";a.doc.css(e.trstyle,"translate3d("+a.doc.translate.tx+","+a.doc.translate.ty+",0px)");g||a.notifyScrollEvent(a.win[0])},this.setScrollLeft=function(b,g){a.doc.translate.x=b;a.doc.translate.tx=b*y+"px";a.doc.css(e.trstyle,
+"translate3d("+a.doc.translate.tx+","+a.doc.translate.ty+",0px)");g||a.notifyScrollEvent(a.win[0])}):(this.setScrollTop=function(b,g){a.doc.translate.y=b;a.doc.translate.ty=-1*b+"px";a.doc.css(e.trstyle,"translate("+a.doc.translate.tx+","+a.doc.translate.ty+")");g||a.notifyScrollEvent(a.win[0])},this.setScrollLeft=function(b,g){a.doc.translate.x=b;a.doc.translate.tx=b*y+"px";a.doc.css(e.trstyle,"translate("+a.doc.translate.tx+","+a.doc.translate.ty+")");g||a.notifyScrollEvent(a.win[0])})}else this.getScrollTop=
+function(){return a.docscroll.scrollTop()},this.setScrollTop=function(b){return setTimeout(function(){a&&a.docscroll.scrollTop(b)},1)},this.getScrollLeft=function(){return a.hasreversehr?a.detected.ismozilla?a.page.maxw-Math.abs(a.docscroll.scrollLeft()):a.page.maxw-a.docscroll.scrollLeft():a.docscroll.scrollLeft()},this.setScrollLeft=function(b){return setTimeout(function(){if(a)return a.hasreversehr&&(b=a.detected.ismozilla?-(a.page.maxw-b):a.page.maxw-b),a.docscroll.scrollLeft(b)},1)};this.getTarget=
+function(a){return a?a.target?a.target:a.srcElement?a.srcElement:!1:!1};this.hasParent=function(a,g){if(!a)return!1;for(var c=a.target||a.srcElement||a||!1;c&&c.id!=g;)c=c.parentNode||!1;return!1!==c};var z={thin:1,medium:3,thick:5};this.getDocumentScrollOffset=function(){return{top:window.pageYOffset||document.documentElement.scrollTop,left:window.pageXOffset||document.documentElement.scrollLeft}};this.getOffset=function(){if(a.isfixed){var b=a.win.offset(),g=a.getDocumentScrollOffset();b.top-=g.top;
+b.left-=g.left;return b}b=a.win.offset();if(!a.viewport)return b;g=a.viewport.offset();return{top:b.top-g.top,left:b.left-g.left}};this.updateScrollBar=function(b){var g,c,e;if(a.ishwscroll)a.rail.css({height:a.win.innerHeight()-(a.opt.railpadding.top+a.opt.railpadding.bottom)}),a.railh&&a.railh.css({width:a.win.innerWidth()-(a.opt.railpadding.left+a.opt.railpadding.right)});else{var f=a.getOffset();g=f.top;c=f.left-(a.opt.railpadding.left+a.opt.railpadding.right);g+=d(a.win,"border-top-width",!0);
+c+=a.rail.align?a.win.outerWidth()-d(a.win,"border-right-width")-a.rail.width:d(a.win,"border-left-width");if(e=a.opt.railoffset)e.top&&(g+=e.top),e.left&&(c+=e.left);a.railslocked||a.rail.css({top:g,left:c,height:(b?b.h:a.win.innerHeight())-(a.opt.railpadding.top+a.opt.railpadding.bottom)});a.zoom&&a.zoom.css({top:g+1,left:1==a.rail.align?c-20:c+a.rail.width+4});if(a.railh&&!a.railslocked){g=f.top;c=f.left;if(e=a.opt.railhoffset)e.top&&(g+=e.top),e.left&&(c+=e.left);b=a.railh.align?g+d(a.win,"border-top-width",
+!0)+a.win.innerHeight()-a.railh.height:g+d(a.win,"border-top-width",!0);c+=d(a.win,"border-left-width");a.railh.css({top:b-(a.opt.railpadding.top+a.opt.railpadding.bottom),left:c,width:a.railh.width})}}};this.doRailClick=function(b,g,c){var d;a.railslocked||(a.cancelEvent(b),g?(g=c?a.doScrollLeft:a.doScrollTop,d=c?(b.pageX-a.railh.offset().left-a.cursorwidth/2)*a.scrollratio.x:(b.pageY-a.rail.offset().top-a.cursorheight/2)*a.scrollratio.y,g(d)):(g=c?a.doScrollLeftBy:a.doScrollBy,d=c?a.scroll.x:a.scroll.y,
+b=c?b.pageX-a.railh.offset().left:b.pageY-a.rail.offset().top,c=c?a.view.w:a.view.h,g(d>=b?c:-c)))};a.hasanimationframe=v;a.hascancelanimationframe=w;a.hasanimationframe?a.hascancelanimationframe||(w=function(){a.cancelAnimationFrame=!0}):(v=function(a){return setTimeout(a,15-Math.floor(+new Date/1E3)%16)},w=clearTimeout);this.init=function(){a.saved.css=[];if(e.isie7mobile||e.isoperamini)return!0;e.hasmstouch&&a.css(a.ispage?f("html"):a.win,{_touchaction:"none"});var b=e.ismodernie||e.isie10?{"-ms-overflow-style":"none"}:
+{"overflow-y":"hidden"};a.zindex="auto";a.zindex=a.ispage||"auto"!=a.opt.zindex?a.opt.zindex:l()||"auto";!a.ispage&&"auto"!=a.zindex&&a.zindex>A&&(A=a.zindex);a.isie&&0==a.zindex&&"auto"==a.opt.zindex&&(a.zindex="auto");if(!a.ispage||!e.cantouch&&!e.isieold&&!e.isie9mobile){var c=a.docscroll;a.ispage&&(c=a.haswrapper?a.win:a.doc);e.isie9mobile||a.css(c,b);a.ispage&&e.isie7&&("BODY"==a.doc[0].nodeName?a.css(f("html"),{"overflow-y":"hidden"}):"HTML"==a.doc[0].nodeName&&a.css(f("body"),b));!e.isios||
+a.ispage||a.haswrapper||a.css(f("body"),{"-webkit-overflow-scrolling":"touch"});var d=f(document.createElement("div"));d.css({position:"relative",top:0,"float":"right",width:a.opt.cursorwidth,height:0,"background-color":a.opt.cursorcolor,border:a.opt.cursorborder,"background-clip":"padding-box","-webkit-border-radius":a.opt.cursorborderradius,"-moz-border-radius":a.opt.cursorborderradius,"border-radius":a.opt.cursorborderradius});d.hborder=parseFloat(d.outerHeight()-d.innerHeight());d.addClass("nicescroll-cursors");
+a.cursor=d;var m=f(document.createElement("div"));m.attr("id",a.id);m.addClass("nicescroll-rails nicescroll-rails-vr");var k,h,p=["left","right","top","bottom"],L;for(L in p)h=p[L],(k=a.opt.railpadding[h])?m.css("padding-"+h,k+"px"):a.opt.railpadding[h]=0;m.append(d);m.width=Math.max(parseFloat(a.opt.cursorwidth),d.outerWidth());m.css({width:m.width+"px",zIndex:a.zindex,background:a.opt.background,cursor:"default"});m.visibility=!0;m.scrollable=!0;m.align="left"==a.opt.railalign?0:1;a.rail=m;d=a.rail.drag=
+!1;!a.opt.boxzoom||a.ispage||e.isieold||(d=document.createElement("div"),a.bind(d,"click",a.doZoom),a.bind(d,"mouseenter",function(){a.zoom.css("opacity",a.opt.cursoropacitymax)}),a.bind(d,"mouseleave",function(){a.zoom.css("opacity",a.opt.cursoropacitymin)}),a.zoom=f(d),a.zoom.css({cursor:"pointer",zIndex:a.zindex,backgroundImage:"url("+a.opt.scriptpath+"zoomico.png)",height:18,width:18,backgroundPosition:"0px 0px"}),a.opt.dblclickzoom&&a.bind(a.win,"dblclick",a.doZoom),e.cantouch&&a.opt.gesturezoom&&
+(a.ongesturezoom=function(b){1.5<b.scale&&a.doZoomIn(b);.8>b.scale&&a.doZoomOut(b);return a.cancelEvent(b)},a.bind(a.win,"gestureend",a.ongesturezoom)));a.railh=!1;var n;a.opt.horizrailenabled&&(a.css(c,{overflowX:"hidden"}),d=f(document.createElement("div")),d.css({position:"absolute",top:0,height:a.opt.cursorwidth,width:0,backgroundColor:a.opt.cursorcolor,border:a.opt.cursorborder,backgroundClip:"padding-box","-webkit-border-radius":a.opt.cursorborderradius,"-moz-border-radius":a.opt.cursorborderradius,
+"border-radius":a.opt.cursorborderradius}),e.isieold&&d.css("overflow","hidden"),d.wborder=parseFloat(d.outerWidth()-d.innerWidth()),d.addClass("nicescroll-cursors"),a.cursorh=d,n=f(document.createElement("div")),n.attr("id",a.id+"-hr"),n.addClass("nicescroll-rails nicescroll-rails-hr"),n.height=Math.max(parseFloat(a.opt.cursorwidth),d.outerHeight()),n.css({height:n.height+"px",zIndex:a.zindex,background:a.opt.background}),n.append(d),n.visibility=!0,n.scrollable=!0,n.align="top"==a.opt.railvalign?
+0:1,a.railh=n,a.railh.drag=!1);a.ispage?(m.css({position:"fixed",top:0,height:"100%"}),m.align?m.css({right:0}):m.css({left:0}),a.body.append(m),a.railh&&(n.css({position:"fixed",left:0,width:"100%"}),n.align?n.css({bottom:0}):n.css({top:0}),a.body.append(n))):(a.ishwscroll?("static"==a.win.css("position")&&a.css(a.win,{position:"relative"}),c="HTML"==a.win[0].nodeName?a.body:a.win,f(c).scrollTop(0).scrollLeft(0),a.zoom&&(a.zoom.css({position:"absolute",top:1,right:0,"margin-right":m.width+4}),c.append(a.zoom)),
+m.css({position:"absolute",top:0}),m.align?m.css({right:0}):m.css({left:0}),c.append(m),n&&(n.css({position:"absolute",left:0,bottom:0}),n.align?n.css({bottom:0}):n.css({top:0}),c.append(n))):(a.isfixed="fixed"==a.win.css("position"),c=a.isfixed?"fixed":"absolute",a.isfixed||(a.viewport=a.getViewport(a.win[0])),a.viewport&&(a.body=a.viewport,0==/fixed|absolute/.test(a.viewport.css("position"))&&a.css(a.viewport,{position:"relative"})),m.css({position:c}),a.zoom&&a.zoom.css({position:c}),a.updateScrollBar(),
+a.body.append(m),a.zoom&&a.body.append(a.zoom),a.railh&&(n.css({position:c}),a.body.append(n))),e.isios&&a.css(a.win,{"-webkit-tap-highlight-color":"rgba(0,0,0,0)","-webkit-touch-callout":"none"}),e.isie&&a.opt.disableoutline&&a.win.attr("hideFocus","true"),e.iswebkit&&a.opt.disableoutline&&a.win.css("outline","none"));!1===a.opt.autohidemode?(a.autohidedom=!1,a.rail.css({opacity:a.opt.cursoropacitymax}),a.railh&&a.railh.css({opacity:a.opt.cursoropacitymax})):!0===a.opt.autohidemode||"leave"===a.opt.autohidemode?
+(a.autohidedom=f().add(a.rail),e.isie8&&(a.autohidedom=a.autohidedom.add(a.cursor)),a.railh&&(a.autohidedom=a.autohidedom.add(a.railh)),a.railh&&e.isie8&&(a.autohidedom=a.autohidedom.add(a.cursorh))):"scroll"==a.opt.autohidemode?(a.autohidedom=f().add(a.rail),a.railh&&(a.autohidedom=a.autohidedom.add(a.railh))):"cursor"==a.opt.autohidemode?(a.autohidedom=f().add(a.cursor),a.railh&&(a.autohidedom=a.autohidedom.add(a.cursorh))):"hidden"==a.opt.autohidemode&&(a.autohidedom=!1,a.hide(),a.railslocked=
+!1);if(e.isie9mobile)a.scrollmom=new M(a),a.onmangotouch=function(){var b=a.getScrollTop(),c=a.getScrollLeft();if(b==a.scrollmom.lastscrolly&&c==a.scrollmom.lastscrollx)return!0;var g=b-a.mangotouch.sy,d=c-a.mangotouch.sx;if(0!=Math.round(Math.sqrt(Math.pow(d,2)+Math.pow(g,2)))){var e=0>g?-1:1,f=0>d?-1:1,u=+new Date;a.mangotouch.lazy&&clearTimeout(a.mangotouch.lazy);80<u-a.mangotouch.tm||a.mangotouch.dry!=e||a.mangotouch.drx!=f?(a.scrollmom.stop(),a.scrollmom.reset(c,b),a.mangotouch.sy=b,a.mangotouch.ly=
+b,a.mangotouch.sx=c,a.mangotouch.lx=c,a.mangotouch.dry=e,a.mangotouch.drx=f,a.mangotouch.tm=u):(a.scrollmom.stop(),a.scrollmom.update(a.mangotouch.sx-d,a.mangotouch.sy-g),a.mangotouch.tm=u,g=Math.max(Math.abs(a.mangotouch.ly-b),Math.abs(a.mangotouch.lx-c)),a.mangotouch.ly=b,a.mangotouch.lx=c,2<g&&(a.mangotouch.lazy=setTimeout(function(){a.mangotouch.lazy=!1;a.mangotouch.dry=0;a.mangotouch.drx=0;a.mangotouch.tm=0;a.scrollmom.doMomentum(30)},100)))}},m=a.getScrollTop(),n=a.getScrollLeft(),a.mangotouch=
+{sy:m,ly:m,dry:0,sx:n,lx:n,drx:0,lazy:!1,tm:0},a.bind(a.docscroll,"scroll",a.onmangotouch);else{if(e.cantouch||a.istouchcapable||a.opt.touchbehavior||e.hasmstouch){a.scrollmom=new M(a);a.ontouchstart=function(b){if(b.pointerType&&2!=b.pointerType&&"touch"!=b.pointerType)return!1;a.hasmoving=!1;if(!a.railslocked){var c;if(e.hasmstouch)for(c=b.target?b.target:!1;c;){var g=f(c).getNiceScroll();if(0<g.length&&g[0].me==a.me)break;if(0<g.length)return!1;if("DIV"==c.nodeName&&c.id==a.id)break;c=c.parentNode?
+c.parentNode:!1}a.cancelScroll();if((c=a.getTarget(b))&&/INPUT/i.test(c.nodeName)&&/range/i.test(c.type))return a.stopPropagation(b);!("clientX"in b)&&"changedTouches"in b&&(b.clientX=b.changedTouches[0].clientX,b.clientY=b.changedTouches[0].clientY);a.forcescreen&&(g=b,b={original:b.original?b.original:b},b.clientX=g.screenX,b.clientY=g.screenY);a.rail.drag={x:b.clientX,y:b.clientY,sx:a.scroll.x,sy:a.scroll.y,st:a.getScrollTop(),sl:a.getScrollLeft(),pt:2,dl:!1};if(a.ispage||!a.opt.directionlockdeadzone)a.rail.drag.dl=
+"f";else{var g=f(window).width(),d=f(window).height(),d=Math.max(0,Math.max(document.body.scrollHeight,document.documentElement.scrollHeight)-d),g=Math.max(0,Math.max(document.body.scrollWidth,document.documentElement.scrollWidth)-g);a.rail.drag.ck=!a.rail.scrollable&&a.railh.scrollable?0<d?"v":!1:a.rail.scrollable&&!a.railh.scrollable?0<g?"h":!1:!1;a.rail.drag.ck||(a.rail.drag.dl="f")}a.opt.touchbehavior&&a.isiframe&&e.isie&&(g=a.win.position(),a.rail.drag.x+=g.left,a.rail.drag.y+=g.top);a.hasmoving=
+!1;a.lastmouseup=!1;a.scrollmom.reset(b.clientX,b.clientY);if(!e.cantouch&&!this.istouchcapable&&!b.pointerType){if(!c||!/INPUT|SELECT|TEXTAREA/i.test(c.nodeName))return!a.ispage&&e.hasmousecapture&&c.setCapture(),a.opt.touchbehavior?(c.onclick&&!c._onclick&&(c._onclick=c.onclick,c.onclick=function(b){if(a.hasmoving)return!1;c._onclick.call(this,b)}),a.cancelEvent(b)):a.stopPropagation(b);/SUBMIT|CANCEL|BUTTON/i.test(f(c).attr("type"))&&(pc={tg:c,click:!1},a.preventclick=pc)}}};a.ontouchend=function(b){if(!a.rail.drag)return!0;
+if(2==a.rail.drag.pt){if(b.pointerType&&2!=b.pointerType&&"touch"!=b.pointerType)return!1;a.scrollmom.doMomentum();a.rail.drag=!1;if(a.hasmoving&&(a.lastmouseup=!0,a.hideCursor(),e.hasmousecapture&&document.releaseCapture(),!e.cantouch))return a.cancelEvent(b)}else if(1==a.rail.drag.pt)return a.onmouseup(b)};var q=a.opt.touchbehavior&&a.isiframe&&!e.hasmousecapture;a.ontouchmove=function(b,c){if(!a.rail.drag||b.targetTouches&&a.opt.preventmultitouchscrolling&&1<b.targetTouches.length||b.pointerType&&
+2!=b.pointerType&&"touch"!=b.pointerType)return!1;if(2==a.rail.drag.pt){if(e.cantouch&&e.isios&&void 0===b.original)return!0;a.hasmoving=!0;a.preventclick&&!a.preventclick.click&&(a.preventclick.click=a.preventclick.tg.onclick||!1,a.preventclick.tg.onclick=a.onpreventclick);b=f.extend({original:b},b);"changedTouches"in b&&(b.clientX=b.changedTouches[0].clientX,b.clientY=b.changedTouches[0].clientY);if(a.forcescreen){var g=b;b={original:b.original?b.original:b};b.clientX=g.screenX;b.clientY=g.screenY}var d,
+g=d=0;q&&!c&&(d=a.win.position(),g=-d.left,d=-d.top);var u=b.clientY+d;d=u-a.rail.drag.y;var m=b.clientX+g,k=m-a.rail.drag.x,h=a.rail.drag.st-d;a.ishwscroll&&a.opt.bouncescroll?0>h?h=Math.round(h/2):h>a.page.maxh&&(h=a.page.maxh+Math.round((h-a.page.maxh)/2)):(0>h&&(u=h=0),h>a.page.maxh&&(h=a.page.maxh,u=0));var l;a.railh&&a.railh.scrollable&&(l=a.isrtlmode?k-a.rail.drag.sl:a.rail.drag.sl-k,a.ishwscroll&&a.opt.bouncescroll?0>l?l=Math.round(l/2):l>a.page.maxw&&(l=a.page.maxw+Math.round((l-a.page.maxw)/
+2)):(0>l&&(m=l=0),l>a.page.maxw&&(l=a.page.maxw,m=0)));g=!1;if(a.rail.drag.dl)g=!0,"v"==a.rail.drag.dl?l=a.rail.drag.sl:"h"==a.rail.drag.dl&&(h=a.rail.drag.st);else{d=Math.abs(d);var k=Math.abs(k),C=a.opt.directionlockdeadzone;if("v"==a.rail.drag.ck){if(d>C&&k<=.3*d)return a.rail.drag=!1,!0;k>C&&(a.rail.drag.dl="f",f("body").scrollTop(f("body").scrollTop()))}else if("h"==a.rail.drag.ck){if(k>C&&d<=.3*k)return a.rail.drag=!1,!0;d>C&&(a.rail.drag.dl="f",f("body").scrollLeft(f("body").scrollLeft()))}}a.synched("touchmove",
+function(){a.rail.drag&&2==a.rail.drag.pt&&(a.prepareTransition&&a.prepareTransition(0),a.rail.scrollable&&a.setScrollTop(h),a.scrollmom.update(m,u),a.railh&&a.railh.scrollable?(a.setScrollLeft(l),a.showCursor(h,l)):a.showCursor(h),e.isie10&&document.selection.clear())});e.ischrome&&a.istouchcapable&&(g=!1);if(g)return a.cancelEvent(b)}else if(1==a.rail.drag.pt)return a.onmousemove(b)}}a.onmousedown=function(b,c){if(!a.rail.drag||1==a.rail.drag.pt){if(a.railslocked)return a.cancelEvent(b);a.cancelScroll();
+a.rail.drag={x:b.clientX,y:b.clientY,sx:a.scroll.x,sy:a.scroll.y,pt:1,hr:!!c};var g=a.getTarget(b);!a.ispage&&e.hasmousecapture&&g.setCapture();a.isiframe&&!e.hasmousecapture&&(a.saved.csspointerevents=a.doc.css("pointer-events"),a.css(a.doc,{"pointer-events":"none"}));a.hasmoving=!1;return a.cancelEvent(b)}};a.onmouseup=function(b){if(a.rail.drag){if(1!=a.rail.drag.pt)return!0;e.hasmousecapture&&document.releaseCapture();a.isiframe&&!e.hasmousecapture&&a.doc.css("pointer-events",a.saved.csspointerevents);
+a.rail.drag=!1;a.hasmoving&&a.triggerScrollEnd();return a.cancelEvent(b)}};a.onmousemove=function(b){if(a.rail.drag){if(1==a.rail.drag.pt){if(e.ischrome&&0==b.which)return a.onmouseup(b);a.cursorfreezed=!0;a.hasmoving=!0;if(a.rail.drag.hr){a.scroll.x=a.rail.drag.sx+(b.clientX-a.rail.drag.x);0>a.scroll.x&&(a.scroll.x=0);var c=a.scrollvaluemaxw;a.scroll.x>c&&(a.scroll.x=c)}else a.scroll.y=a.rail.drag.sy+(b.clientY-a.rail.drag.y),0>a.scroll.y&&(a.scroll.y=0),c=a.scrollvaluemax,a.scroll.y>c&&(a.scroll.y=
+c);a.synched("mousemove",function(){a.rail.drag&&1==a.rail.drag.pt&&(a.showCursor(),a.rail.drag.hr?a.hasreversehr?a.doScrollLeft(a.scrollvaluemaxw-Math.round(a.scroll.x*a.scrollratio.x),a.opt.cursordragspeed):a.doScrollLeft(Math.round(a.scroll.x*a.scrollratio.x),a.opt.cursordragspeed):a.doScrollTop(Math.round(a.scroll.y*a.scrollratio.y),a.opt.cursordragspeed))});return a.cancelEvent(b)}}else a.checkarea=0};if(e.cantouch||a.opt.touchbehavior)a.onpreventclick=function(b){if(a.preventclick)return a.preventclick.tg.onclick=
+a.preventclick.click,a.preventclick=!1,a.cancelEvent(b)},a.bind(a.win,"mousedown",a.ontouchstart),a.onclick=e.isios?!1:function(b){return a.lastmouseup?(a.lastmouseup=!1,a.cancelEvent(b)):!0},a.opt.grabcursorenabled&&e.cursorgrabvalue&&(a.css(a.ispage?a.doc:a.win,{cursor:e.cursorgrabvalue}),a.css(a.rail,{cursor:e.cursorgrabvalue}));else{var r=function(b){if(a.selectiondrag){if(b){var c=a.win.outerHeight();b=b.pageY-a.selectiondrag.top;0<b&&b<c&&(b=0);b>=c&&(b-=c);a.selectiondrag.df=b}0!=a.selectiondrag.df&&
+(a.doScrollBy(2*-Math.floor(a.selectiondrag.df/6)),a.debounced("doselectionscroll",function(){r()},50))}};a.hasTextSelected="getSelection"in document?function(){return 0<document.getSelection().rangeCount}:"selection"in document?function(){return"None"!=document.selection.type}:function(){return!1};a.onselectionstart=function(b){a.ispage||(a.selectiondrag=a.win.offset())};a.onselectionend=function(b){a.selectiondrag=!1};a.onselectiondrag=function(b){a.selectiondrag&&a.hasTextSelected()&&a.debounced("selectionscroll",
+function(){r(b)},250)}}e.hasw3ctouch?(a.css(a.rail,{"touch-action":"none"}),a.css(a.cursor,{"touch-action":"none"}),a.bind(a.win,"pointerdown",a.ontouchstart),a.bind(document,"pointerup",a.ontouchend),a.bind(document,"pointermove",a.ontouchmove)):e.hasmstouch?(a.css(a.rail,{"-ms-touch-action":"none"}),a.css(a.cursor,{"-ms-touch-action":"none"}),a.bind(a.win,"MSPointerDown",a.ontouchstart),a.bind(document,"MSPointerUp",a.ontouchend),a.bind(document,"MSPointerMove",a.ontouchmove),a.bind(a.cursor,"MSGestureHold",
+function(a){a.preventDefault()}),a.bind(a.cursor,"contextmenu",function(a){a.preventDefault()})):this.istouchcapable&&(a.bind(a.win,"touchstart",a.ontouchstart),a.bind(document,"touchend",a.ontouchend),a.bind(document,"touchcancel",a.ontouchend),a.bind(document,"touchmove",a.ontouchmove));if(a.opt.cursordragontouch||!e.cantouch&&!a.opt.touchbehavior)a.rail.css({cursor:"default"}),a.railh&&a.railh.css({cursor:"default"}),a.jqbind(a.rail,"mouseenter",function(){if(!a.ispage&&!a.win.is(":visible"))return!1;
+a.canshowonmouseevent&&a.showCursor();a.rail.active=!0}),a.jqbind(a.rail,"mouseleave",function(){a.rail.active=!1;a.rail.drag||a.hideCursor()}),a.opt.sensitiverail&&(a.bind(a.rail,"click",function(b){a.doRailClick(b,!1,!1)}),a.bind(a.rail,"dblclick",function(b){a.doRailClick(b,!0,!1)}),a.bind(a.cursor,"click",function(b){a.cancelEvent(b)}),a.bind(a.cursor,"dblclick",function(b){a.cancelEvent(b)})),a.railh&&(a.jqbind(a.railh,"mouseenter",function(){if(!a.ispage&&!a.win.is(":visible"))return!1;a.canshowonmouseevent&&
+a.showCursor();a.rail.active=!0}),a.jqbind(a.railh,"mouseleave",function(){a.rail.active=!1;a.rail.drag||a.hideCursor()}),a.opt.sensitiverail&&(a.bind(a.railh,"click",function(b){a.doRailClick(b,!1,!0)}),a.bind(a.railh,"dblclick",function(b){a.doRailClick(b,!0,!0)}),a.bind(a.cursorh,"click",function(b){a.cancelEvent(b)}),a.bind(a.cursorh,"dblclick",function(b){a.cancelEvent(b)})));e.cantouch||a.opt.touchbehavior?(a.bind(e.hasmousecapture?a.win:document,"mouseup",a.ontouchend),a.bind(document,"mousemove",
+a.ontouchmove),a.onclick&&a.bind(document,"click",a.onclick),a.opt.cursordragontouch?(a.bind(a.cursor,"mousedown",a.onmousedown),a.bind(a.cursor,"mouseup",a.onmouseup),a.cursorh&&a.bind(a.cursorh,"mousedown",function(b){a.onmousedown(b,!0)}),a.cursorh&&a.bind(a.cursorh,"mouseup",a.onmouseup)):(a.bind(a.rail,"mousedown",function(a){a.preventDefault()}),a.railh&&a.bind(a.railh,"mousedown",function(a){a.preventDefault()}))):(a.bind(e.hasmousecapture?a.win:document,"mouseup",a.onmouseup),a.bind(document,
+"mousemove",a.onmousemove),a.onclick&&a.bind(document,"click",a.onclick),a.bind(a.cursor,"mousedown",a.onmousedown),a.bind(a.cursor,"mouseup",a.onmouseup),a.railh&&(a.bind(a.cursorh,"mousedown",function(b){a.onmousedown(b,!0)}),a.bind(a.cursorh,"mouseup",a.onmouseup)),!a.ispage&&a.opt.enablescrollonselection&&(a.bind(a.win[0],"mousedown",a.onselectionstart),a.bind(document,"mouseup",a.onselectionend),a.bind(a.cursor,"mouseup",a.onselectionend),a.cursorh&&a.bind(a.cursorh,"mouseup",a.onselectionend),
+a.bind(document,"mousemove",a.onselectiondrag)),a.zoom&&(a.jqbind(a.zoom,"mouseenter",function(){a.canshowonmouseevent&&a.showCursor();a.rail.active=!0}),a.jqbind(a.zoom,"mouseleave",function(){a.rail.active=!1;a.rail.drag||a.hideCursor()})));a.opt.enablemousewheel&&(a.isiframe||a.mousewheel(e.isie&&a.ispage?document:a.win,a.onmousewheel),a.mousewheel(a.rail,a.onmousewheel),a.railh&&a.mousewheel(a.railh,a.onmousewheelhr));a.ispage||e.cantouch||/HTML|^BODY/.test(a.win[0].nodeName)||(a.win.attr("tabindex")||
+a.win.attr({tabindex:O++}),a.jqbind(a.win,"focus",function(b){B=a.getTarget(b).id||!0;a.hasfocus=!0;a.canshowonmouseevent&&a.noticeCursor()}),a.jqbind(a.win,"blur",function(b){B=!1;a.hasfocus=!1}),a.jqbind(a.win,"mouseenter",function(b){F=a.getTarget(b).id||!0;a.hasmousefocus=!0;a.canshowonmouseevent&&a.noticeCursor()}),a.jqbind(a.win,"mouseleave",function(){F=!1;a.hasmousefocus=!1;a.rail.drag||a.hideCursor()}))}a.onkeypress=function(b){if(a.railslocked&&0==a.page.maxh)return!0;b=b?b:window.e;var c=
+a.getTarget(b);if(c&&/INPUT|TEXTAREA|SELECT|OPTION/.test(c.nodeName)&&(!c.getAttribute("type")&&!c.type||!/submit|button|cancel/i.tp)||f(c).attr("contenteditable"))return!0;if(a.hasfocus||a.hasmousefocus&&!B||a.ispage&&!B&&!F){c=b.keyCode;if(a.railslocked&&27!=c)return a.cancelEvent(b);var g=b.ctrlKey||!1,d=b.shiftKey||!1,e=!1;switch(c){case 38:case 63233:a.doScrollBy(72);e=!0;break;case 40:case 63235:a.doScrollBy(-72);e=!0;break;case 37:case 63232:a.railh&&(g?a.doScrollLeft(0):a.doScrollLeftBy(72),
+e=!0);break;case 39:case 63234:a.railh&&(g?a.doScrollLeft(a.page.maxw):a.doScrollLeftBy(-72),e=!0);break;case 33:case 63276:a.doScrollBy(a.view.h);e=!0;break;case 34:case 63277:a.doScrollBy(-a.view.h);e=!0;break;case 36:case 63273:a.railh&&g?a.doScrollPos(0,0):a.doScrollTo(0);e=!0;break;case 35:case 63275:a.railh&&g?a.doScrollPos(a.page.maxw,a.page.maxh):a.doScrollTo(a.page.maxh);e=!0;break;case 32:a.opt.spacebarenabled&&(d?a.doScrollBy(a.view.h):a.doScrollBy(-a.view.h),e=!0);break;case 27:a.zoomactive&&
+(a.doZoom(),e=!0)}if(e)return a.cancelEvent(b)}};a.opt.enablekeyboard&&a.bind(document,e.isopera&&!e.isopera12?"keypress":"keydown",a.onkeypress);a.bind(document,"keydown",function(b){b.ctrlKey&&(a.wheelprevented=!0)});a.bind(document,"keyup",function(b){b.ctrlKey||(a.wheelprevented=!1)});a.bind(window,"blur",function(b){a.wheelprevented=!1});a.bind(window,"resize",a.lazyResize);a.bind(window,"orientationchange",a.lazyResize);a.bind(window,"load",a.lazyResize);if(e.ischrome&&!a.ispage&&!a.haswrapper){var t=
+a.win.attr("style"),m=parseFloat(a.win.css("width"))+1;a.win.css("width",m);a.synched("chromefix",function(){a.win.attr("style",t)})}a.onAttributeChange=function(b){a.lazyResize(a.isieold?250:30)};a.isie11||!1===x||(a.observerbody=new x(function(b){b.forEach(function(b){if("attributes"==b.type)return f("body").hasClass("modal-open")&&f("body").hasClass("modal-dialog")&&!f.contains(f(".modal-dialog")[0],a.doc[0])?a.hide():a.show()});if(document.body.scrollHeight!=a.page.maxh)return a.lazyResize(30)}),
+a.observerbody.observe(document.body,{childList:!0,subtree:!0,characterData:!1,attributes:!0,attributeFilter:["class"]}));a.ispage||a.haswrapper||(!1!==x?(a.observer=new x(function(b){b.forEach(a.onAttributeChange)}),a.observer.observe(a.win[0],{childList:!0,characterData:!1,attributes:!0,subtree:!1}),a.observerremover=new x(function(b){b.forEach(function(b){if(0<b.removedNodes.length)for(var c in b.removedNodes)if(a&&b.removedNodes[c]==a.win[0])return a.remove()})}),a.observerremover.observe(a.win[0].parentNode,
+{childList:!0,characterData:!1,attributes:!1,subtree:!1})):(a.bind(a.win,e.isie&&!e.isie9?"propertychange":"DOMAttrModified",a.onAttributeChange),e.isie9&&a.win[0].attachEvent("onpropertychange",a.onAttributeChange),a.bind(a.win,"DOMNodeRemoved",function(b){b.target==a.win[0]&&a.remove()})));!a.ispage&&a.opt.boxzoom&&a.bind(window,"resize",a.resizeZoom);a.istextarea&&(a.bind(a.win,"keydown",a.lazyResize),a.bind(a.win,"mouseup",a.lazyResize));a.lazyResize(30)}if("IFRAME"==this.doc[0].nodeName){var N=
+function(){a.iframexd=!1;var c;try{c="contentDocument"in this?this.contentDocument:this.contentWindow.document}catch(g){a.iframexd=!0,c=!1}if(a.iframexd)return"console"in window&&console.log("NiceScroll error: policy restriced iframe"),!0;a.forcescreen=!0;a.isiframe&&(a.iframe={doc:f(c),html:a.doc.contents().find("html")[0],body:a.doc.contents().find("body")[0]},a.getContentSize=function(){return{w:Math.max(a.iframe.html.scrollWidth,a.iframe.body.scrollWidth),h:Math.max(a.iframe.html.scrollHeight,
+a.iframe.body.scrollHeight)}},a.docscroll=f(a.iframe.body));if(!e.isios&&a.opt.iframeautoresize&&!a.isiframe){a.win.scrollTop(0);a.doc.height("");var d=Math.max(c.getElementsByTagName("html")[0].scrollHeight,c.body.scrollHeight);a.doc.height(d)}a.lazyResize(30);e.isie7&&a.css(f(a.iframe.html),b);a.css(f(a.iframe.body),b);e.isios&&a.haswrapper&&a.css(f(c.body),{"-webkit-transform":"translate3d(0,0,0)"});"contentWindow"in this?a.bind(this.contentWindow,"scroll",a.onscroll):a.bind(c,"scroll",a.onscroll);
+a.opt.enablemousewheel&&a.mousewheel(c,a.onmousewheel);a.opt.enablekeyboard&&a.bind(c,e.isopera?"keypress":"keydown",a.onkeypress);if(e.cantouch||a.opt.touchbehavior)a.bind(c,"mousedown",a.ontouchstart),a.bind(c,"mousemove",function(b){return a.ontouchmove(b,!0)}),a.opt.grabcursorenabled&&e.cursorgrabvalue&&a.css(f(c.body),{cursor:e.cursorgrabvalue});a.bind(c,"mouseup",a.ontouchend);a.zoom&&(a.opt.dblclickzoom&&a.bind(c,"dblclick",a.doZoom),a.ongesturezoom&&a.bind(c,"gestureend",a.ongesturezoom))};
+this.doc[0].readyState&&"complete"==this.doc[0].readyState&&setTimeout(function(){N.call(a.doc[0],!1)},500);a.bind(this.doc,"load",N)}};this.showCursor=function(b,c){a.cursortimeout&&(clearTimeout(a.cursortimeout),a.cursortimeout=0);if(a.rail){a.autohidedom&&(a.autohidedom.stop().css({opacity:a.opt.cursoropacitymax}),a.cursoractive=!0);a.rail.drag&&1==a.rail.drag.pt||(void 0!==b&&!1!==b&&(a.scroll.y=Math.round(1*b/a.scrollratio.y)),void 0!==c&&(a.scroll.x=Math.round(1*c/a.scrollratio.x)));a.cursor.css({height:a.cursorheight,
+top:a.scroll.y});if(a.cursorh){var d=a.hasreversehr?a.scrollvaluemaxw-a.scroll.x:a.scroll.x;!a.rail.align&&a.rail.visibility?a.cursorh.css({width:a.cursorwidth,left:d+a.rail.width}):a.cursorh.css({width:a.cursorwidth,left:d});a.cursoractive=!0}a.zoom&&a.zoom.stop().css({opacity:a.opt.cursoropacitymax})}};this.hideCursor=function(b){a.cursortimeout||!a.rail||!a.autohidedom||a.hasmousefocus&&"leave"==a.opt.autohidemode||(a.cursortimeout=setTimeout(function(){a.rail.active&&a.showonmouseevent||(a.autohidedom.stop().animate({opacity:a.opt.cursoropacitymin}),
+a.zoom&&a.zoom.stop().animate({opacity:a.opt.cursoropacitymin}),a.cursoractive=!1);a.cursortimeout=0},b||a.opt.hidecursordelay))};this.noticeCursor=function(b,c,d){a.showCursor(c,d);a.rail.active||a.hideCursor(b)};this.getContentSize=a.ispage?function(){return{w:Math.max(document.body.scrollWidth,document.documentElement.scrollWidth),h:Math.max(document.body.scrollHeight,document.documentElement.scrollHeight)}}:a.haswrapper?function(){return{w:a.doc.outerWidth()+parseInt(a.win.css("paddingLeft"))+
+parseInt(a.win.css("paddingRight")),h:a.doc.outerHeight()+parseInt(a.win.css("paddingTop"))+parseInt(a.win.css("paddingBottom"))}}:function(){return{w:a.docscroll[0].scrollWidth,h:a.docscroll[0].scrollHeight}};this.onResize=function(b,c){if(!a||!a.win)return!1;if(!a.haswrapper&&!a.ispage){if("none"==a.win.css("display"))return a.visibility&&a.hideRail().hideRailHr(),!1;a.hidden||a.visibility||a.showRail().showRailHr()}var d=a.page.maxh,e=a.page.maxw,f=a.view.h,k=a.view.w;a.view={w:a.ispage?a.win.width():
+parseInt(a.win[0].clientWidth),h:a.ispage?a.win.height():parseInt(a.win[0].clientHeight)};a.page=c?c:a.getContentSize();a.page.maxh=Math.max(0,a.page.h-a.view.h);a.page.maxw=Math.max(0,a.page.w-a.view.w);if(a.page.maxh==d&&a.page.maxw==e&&a.view.w==k&&a.view.h==f){if(a.ispage)return a;d=a.win.offset();if(a.lastposition&&(e=a.lastposition,e.top==d.top&&e.left==d.left))return a;a.lastposition=d}0==a.page.maxh?(a.hideRail(),a.scrollvaluemax=0,a.scroll.y=0,a.scrollratio.y=0,a.cursorheight=0,a.setScrollTop(0),
+a.rail&&(a.rail.scrollable=!1)):(a.page.maxh-=a.opt.railpadding.top+a.opt.railpadding.bottom,a.rail.scrollable=!0);0==a.page.maxw?(a.hideRailHr(),a.scrollvaluemaxw=0,a.scroll.x=0,a.scrollratio.x=0,a.cursorwidth=0,a.setScrollLeft(0),a.railh&&(a.railh.scrollable=!1)):(a.page.maxw-=a.opt.railpadding.left+a.opt.railpadding.right,a.railh&&(a.railh.scrollable=a.opt.horizrailenabled));a.railslocked=a.locked||0==a.page.maxh&&0==a.page.maxw;if(a.railslocked)return a.ispage||a.updateScrollBar(a.view),!1;a.hidden||
+a.visibility?!a.railh||a.hidden||a.railh.visibility||a.showRailHr():a.showRail().showRailHr();a.istextarea&&a.win.css("resize")&&"none"!=a.win.css("resize")&&(a.view.h-=20);a.cursorheight=Math.min(a.view.h,Math.round(a.view.h/a.page.h*a.view.h));a.cursorheight=a.opt.cursorfixedheight?a.opt.cursorfixedheight:Math.max(a.opt.cursorminheight,a.cursorheight);a.cursorwidth=Math.min(a.view.w,Math.round(a.view.w/a.page.w*a.view.w));a.cursorwidth=a.opt.cursorfixedheight?a.opt.cursorfixedheight:Math.max(a.opt.cursorminheight,
+a.cursorwidth);a.scrollvaluemax=a.view.h-a.cursorheight-a.cursor.hborder-(a.opt.railpadding.top+a.opt.railpadding.bottom);a.railh&&(a.railh.width=0<a.page.maxh?a.view.w-a.rail.width:a.view.w,a.scrollvaluemaxw=a.railh.width-a.cursorwidth-a.cursorh.wborder-(a.opt.railpadding.left+a.opt.railpadding.right));a.ispage||a.updateScrollBar(a.view);a.scrollratio={x:a.page.maxw/a.scrollvaluemaxw,y:a.page.maxh/a.scrollvaluemax};a.getScrollTop()>a.page.maxh?a.doScrollTop(a.page.maxh):(a.scroll.y=Math.round(a.getScrollTop()*
+(1/a.scrollratio.y)),a.scroll.x=Math.round(a.getScrollLeft()*(1/a.scrollratio.x)),a.cursoractive&&a.noticeCursor());a.scroll.y&&0==a.getScrollTop()&&a.doScrollTo(Math.floor(a.scroll.y*a.scrollratio.y));return a};this.resize=a.onResize;this.hlazyresize=0;this.lazyResize=function(b){a.haswrapper||a.hide();a.hlazyresize&&clearTimeout(a.hlazyresize);a.hlazyresize=setTimeout(function(){a&&a.show().resize()},240);return a};this.jqbind=function(b,c,d){a.events.push({e:b,n:c,f:d,q:!0});f(b).bind(c,d)};this.mousewheel=
+function(b,c,d){b="jquery"in b?b[0]:b;if("onwheel"in document.createElement("div"))a._bind(b,"wheel",c,d||!1);else{var e=void 0!==document.onmousewheel?"mousewheel":"DOMMouseScroll";q(b,e,c,d||!1);"DOMMouseScroll"==e&&q(b,"MozMousePixelScroll",c,d||!1)}};e.haseventlistener?(this.bind=function(b,c,d,e){a._bind("jquery"in b?b[0]:b,c,d,e||!1)},this._bind=function(b,c,d,e){a.events.push({e:b,n:c,f:d,b:e,q:!1});b.addEventListener(c,d,e||!1)},this.cancelEvent=function(a){if(!a)return!1;a=a.original?a.original:
+a;a.cancelable&&a.preventDefault();a.stopPropagation();a.preventManipulation&&a.preventManipulation();return!1},this.stopPropagation=function(a){if(!a)return!1;a=a.original?a.original:a;a.stopPropagation();return!1},this._unbind=function(a,c,d,e){a.removeEventListener(c,d,e)}):(this.bind=function(b,c,d,e){var f="jquery"in b?b[0]:b;a._bind(f,c,function(b){(b=b||window.event||!1)&&b.srcElement&&(b.target=b.srcElement);"pageY"in b||(b.pageX=b.clientX+document.documentElement.scrollLeft,b.pageY=b.clientY+
+document.documentElement.scrollTop);return!1===d.call(f,b)||!1===e?a.cancelEvent(b):!0})},this._bind=function(b,c,d,e){a.events.push({e:b,n:c,f:d,b:e,q:!1});b.attachEvent?b.attachEvent("on"+c,d):b["on"+c]=d},this.cancelEvent=function(a){a=window.event||!1;if(!a)return!1;a.cancelBubble=!0;a.cancel=!0;return a.returnValue=!1},this.stopPropagation=function(a){a=window.event||!1;if(!a)return!1;a.cancelBubble=!0;return!1},this._unbind=function(a,c,d,e){a.detachEvent?a.detachEvent("on"+c,d):a["on"+c]=!1});
+this.unbindAll=function(){for(var b=0;b<a.events.length;b++){var c=a.events[b];c.q?c.e.unbind(c.n,c.f):a._unbind(c.e,c.n,c.f,c.b)}};this.showRail=function(){0==a.page.maxh||!a.ispage&&"none"==a.win.css("display")||(a.visibility=!0,a.rail.visibility=!0,a.rail.css("display","block"));return a};this.showRailHr=function(){if(!a.railh)return a;0==a.page.maxw||!a.ispage&&"none"==a.win.css("display")||(a.railh.visibility=!0,a.railh.css("display","block"));return a};this.hideRail=function(){a.visibility=
+!1;a.rail.visibility=!1;a.rail.css("display","none");return a};this.hideRailHr=function(){if(!a.railh)return a;a.railh.visibility=!1;a.railh.css("display","none");return a};this.show=function(){a.hidden=!1;a.railslocked=!1;return a.showRail().showRailHr()};this.hide=function(){a.hidden=!0;a.railslocked=!0;return a.hideRail().hideRailHr()};this.toggle=function(){return a.hidden?a.show():a.hide()};this.remove=function(){a.stop();a.cursortimeout&&clearTimeout(a.cursortimeout);for(var b in a.delaylist)a.delaylist[b]&&
+w(a.delaylist[b].h);a.doZoomOut();a.unbindAll();e.isie9&&a.win[0].detachEvent("onpropertychange",a.onAttributeChange);!1!==a.observer&&a.observer.disconnect();!1!==a.observerremover&&a.observerremover.disconnect();!1!==a.observerbody&&a.observerbody.disconnect();a.events=null;a.cursor&&a.cursor.remove();a.cursorh&&a.cursorh.remove();a.rail&&a.rail.remove();a.railh&&a.railh.remove();a.zoom&&a.zoom.remove();for(b=0;b<a.saved.css.length;b++){var c=a.saved.css[b];c[0].css(c[1],void 0===c[2]?"":c[2])}a.saved=
+!1;a.me.data("__nicescroll","");var d=f.nicescroll;d.each(function(b){if(this&&this.id===a.id){delete d[b];for(var c=++b;c<d.length;c++,b++)d[b]=d[c];d.length--;d.length&&delete d[d.length]}});for(var k in a)a[k]=null,delete a[k];a=null};this.scrollstart=function(b){this.onscrollstart=b;return a};this.scrollend=function(b){this.onscrollend=b;return a};this.scrollcancel=function(b){this.onscrollcancel=b;return a};this.zoomin=function(b){this.onzoomin=b;return a};this.zoomout=function(b){this.onzoomout=
+b;return a};this.isScrollable=function(a){a=a.target?a.target:a;if("OPTION"==a.nodeName)return!0;for(;a&&1==a.nodeType&&!/^BODY|HTML/.test(a.nodeName);){var c=f(a),c=c.css("overflowY")||c.css("overflowX")||c.css("overflow")||"";if(/scroll|auto/.test(c))return a.clientHeight!=a.scrollHeight;a=a.parentNode?a.parentNode:!1}return!1};this.getViewport=function(a){for(a=a&&a.parentNode?a.parentNode:!1;a&&1==a.nodeType&&!/^BODY|HTML/.test(a.nodeName);){var c=f(a);if(/fixed|absolute/.test(c.css("position")))return c;
+var d=c.css("overflowY")||c.css("overflowX")||c.css("overflow")||"";if(/scroll|auto/.test(d)&&a.clientHeight!=a.scrollHeight||0<c.getNiceScroll().length)return c;a=a.parentNode?a.parentNode:!1}return!1};this.triggerScrollEnd=function(){if(a.onscrollend){var b=a.getScrollLeft(),c=a.getScrollTop();a.onscrollend.call(a,{type:"scrollend",current:{x:b,y:c},end:{x:b,y:c}})}};this.onmousewheel=function(b){if(!a.wheelprevented){if(a.railslocked)return a.debounced("checkunlock",a.resize,250),!0;if(a.rail.drag)return a.cancelEvent(b);
+"auto"==a.opt.oneaxismousemode&&0!=b.deltaX&&(a.opt.oneaxismousemode=!1);if(a.opt.oneaxismousemode&&0==b.deltaX&&!a.rail.scrollable)return a.railh&&a.railh.scrollable?a.onmousewheelhr(b):!0;var c=+new Date,d=!1;a.opt.preservenativescrolling&&a.checkarea+600<c&&(a.nativescrollingarea=a.isScrollable(b),d=!0);a.checkarea=c;if(a.nativescrollingarea)return!0;if(b=t(b,!1,d))a.checkarea=0;return b}};this.onmousewheelhr=function(b){if(!a.wheelprevented){if(a.railslocked||!a.railh.scrollable)return!0;if(a.rail.drag)return a.cancelEvent(b);
+var c=+new Date,d=!1;a.opt.preservenativescrolling&&a.checkarea+600<c&&(a.nativescrollingarea=a.isScrollable(b),d=!0);a.checkarea=c;return a.nativescrollingarea?!0:a.railslocked?a.cancelEvent(b):t(b,!0,d)}};this.stop=function(){a.cancelScroll();a.scrollmon&&a.scrollmon.stop();a.cursorfreezed=!1;a.scroll.y=Math.round(a.getScrollTop()*(1/a.scrollratio.y));a.noticeCursor();return a};this.getTransitionSpeed=function(b){b=Math.min(Math.round(10*a.opt.scrollspeed),Math.round(b/20*a.opt.scrollspeed));return 20<
+b?b:0};a.opt.smoothscroll?a.ishwscroll&&e.hastransition&&a.opt.usetransition&&a.opt.smoothscroll?(this.prepareTransition=function(b,c){var d=c?20<b?b:0:a.getTransitionSpeed(b),f=d?e.prefixstyle+"transform "+d+"ms ease-out":"";a.lasttransitionstyle&&a.lasttransitionstyle==f||(a.lasttransitionstyle=f,a.doc.css(e.transitionstyle,f));return d},this.doScrollLeft=function(b,c){var d=a.scrollrunning?a.newscrolly:a.getScrollTop();a.doScrollPos(b,d,c)},this.doScrollTop=function(b,c){var d=a.scrollrunning?
+a.newscrollx:a.getScrollLeft();a.doScrollPos(d,b,c)},this.doScrollPos=function(b,c,d){var f=a.getScrollTop(),k=a.getScrollLeft();(0>(a.newscrolly-f)*(c-f)||0>(a.newscrollx-k)*(b-k))&&a.cancelScroll();0==a.opt.bouncescroll&&(0>c?c=0:c>a.page.maxh&&(c=a.page.maxh),0>b?b=0:b>a.page.maxw&&(b=a.page.maxw));if(a.scrollrunning&&b==a.newscrollx&&c==a.newscrolly)return!1;a.newscrolly=c;a.newscrollx=b;a.newscrollspeed=d||!1;if(a.timer)return!1;a.timer=setTimeout(function(){var d=a.getScrollTop(),f=a.getScrollLeft(),
+k=Math.round(Math.sqrt(Math.pow(b-f,2)+Math.pow(c-d,2))),k=a.newscrollspeed&&1<a.newscrollspeed?a.newscrollspeed:a.getTransitionSpeed(k);a.newscrollspeed&&1>=a.newscrollspeed&&(k*=a.newscrollspeed);a.prepareTransition(k,!0);a.timerscroll&&a.timerscroll.tm&&clearInterval(a.timerscroll.tm);0<k&&(!a.scrollrunning&&a.onscrollstart&&a.onscrollstart.call(a,{type:"scrollstart",current:{x:f,y:d},request:{x:b,y:c},end:{x:a.newscrollx,y:a.newscrolly},speed:k}),e.transitionend?a.scrollendtrapped||(a.scrollendtrapped=
+!0,a.bind(a.doc,e.transitionend,a.onScrollTransitionEnd,!1)):(a.scrollendtrapped&&clearTimeout(a.scrollendtrapped),a.scrollendtrapped=setTimeout(a.onScrollTransitionEnd,k)),a.timerscroll={bz:new D(d,a.newscrolly,k,0,0,.58,1),bh:new D(f,a.newscrollx,k,0,0,.58,1)},a.cursorfreezed||(a.timerscroll.tm=setInterval(function(){a.showCursor(a.getScrollTop(),a.getScrollLeft())},60)));a.synched("doScroll-set",function(){a.timer=0;a.scrollendtrapped&&(a.scrollrunning=!0);a.setScrollTop(a.newscrolly);a.setScrollLeft(a.newscrollx);
+if(!a.scrollendtrapped)a.onScrollTransitionEnd()})},50)},this.cancelScroll=function(){if(!a.scrollendtrapped)return!0;var b=a.getScrollTop(),c=a.getScrollLeft();a.scrollrunning=!1;e.transitionend||clearTimeout(e.transitionend);a.scrollendtrapped=!1;a._unbind(a.doc[0],e.transitionend,a.onScrollTransitionEnd);a.prepareTransition(0);a.setScrollTop(b);a.railh&&a.setScrollLeft(c);a.timerscroll&&a.timerscroll.tm&&clearInterval(a.timerscroll.tm);a.timerscroll=!1;a.cursorfreezed=!1;a.showCursor(b,c);return a},
+this.onScrollTransitionEnd=function(){a.scrollendtrapped&&a._unbind(a.doc[0],e.transitionend,a.onScrollTransitionEnd);a.scrollendtrapped=!1;a.prepareTransition(0);a.timerscroll&&a.timerscroll.tm&&clearInterval(a.timerscroll.tm);a.timerscroll=!1;var b=a.getScrollTop(),c=a.getScrollLeft();a.setScrollTop(b);a.railh&&a.setScrollLeft(c);a.noticeCursor(!1,b,c);a.cursorfreezed=!1;0>b?b=0:b>a.page.maxh&&(b=a.page.maxh);0>c?c=0:c>a.page.maxw&&(c=a.page.maxw);if(b!=a.newscrolly||c!=a.newscrollx)return a.doScrollPos(c,
+b,a.opt.snapbackspeed);a.onscrollend&&a.scrollrunning&&a.triggerScrollEnd();a.scrollrunning=!1}):(this.doScrollLeft=function(b,c){var d=a.scrollrunning?a.newscrolly:a.getScrollTop();a.doScrollPos(b,d,c)},this.doScrollTop=function(b,c){var d=a.scrollrunning?a.newscrollx:a.getScrollLeft();a.doScrollPos(d,b,c)},this.doScrollPos=function(b,c,d){function e(){if(a.cancelAnimationFrame)return!0;a.scrollrunning=!0;if(p=1-p)return a.timer=v(e)||1;var b=0,c,d,f=d=a.getScrollTop();if(a.dst.ay){f=a.bzscroll?
+a.dst.py+a.bzscroll.getNow()*a.dst.ay:a.newscrolly;c=f-d;if(0>c&&f<a.newscrolly||0<c&&f>a.newscrolly)f=a.newscrolly;a.setScrollTop(f);f==a.newscrolly&&(b=1)}else b=1;d=c=a.getScrollLeft();if(a.dst.ax){d=a.bzscroll?a.dst.px+a.bzscroll.getNow()*a.dst.ax:a.newscrollx;c=d-c;if(0>c&&d<a.newscrollx||0<c&&d>a.newscrollx)d=a.newscrollx;a.setScrollLeft(d);d==a.newscrollx&&(b+=1)}else b+=1;2==b?(a.timer=0,a.cursorfreezed=!1,a.bzscroll=!1,a.scrollrunning=!1,0>f?f=0:f>a.page.maxh&&(f=Math.max(0,a.page.maxh)),
+0>d?d=0:d>a.page.maxw&&(d=a.page.maxw),d!=a.newscrollx||f!=a.newscrolly?a.doScrollPos(d,f):a.onscrollend&&a.triggerScrollEnd()):a.timer=v(e)||1}c=void 0===c||!1===c?a.getScrollTop(!0):c;if(a.timer&&a.newscrolly==c&&a.newscrollx==b)return!0;a.timer&&w(a.timer);a.timer=0;var f=a.getScrollTop(),k=a.getScrollLeft();(0>(a.newscrolly-f)*(c-f)||0>(a.newscrollx-k)*(b-k))&&a.cancelScroll();a.newscrolly=c;a.newscrollx=b;a.bouncescroll&&a.rail.visibility||(0>a.newscrolly?a.newscrolly=0:a.newscrolly>a.page.maxh&&
+(a.newscrolly=a.page.maxh));a.bouncescroll&&a.railh.visibility||(0>a.newscrollx?a.newscrollx=0:a.newscrollx>a.page.maxw&&(a.newscrollx=a.page.maxw));a.dst={};a.dst.x=b-k;a.dst.y=c-f;a.dst.px=k;a.dst.py=f;var h=Math.round(Math.sqrt(Math.pow(a.dst.x,2)+Math.pow(a.dst.y,2)));a.dst.ax=a.dst.x/h;a.dst.ay=a.dst.y/h;var l=0,n=h;0==a.dst.x?(l=f,n=c,a.dst.ay=1,a.dst.py=0):0==a.dst.y&&(l=k,n=b,a.dst.ax=1,a.dst.px=0);h=a.getTransitionSpeed(h);d&&1>=d&&(h*=d);a.bzscroll=0<h?a.bzscroll?a.bzscroll.update(n,h):
+new D(l,n,h,0,1,0,1):!1;if(!a.timer){(f==a.page.maxh&&c>=a.page.maxh||k==a.page.maxw&&b>=a.page.maxw)&&a.checkContentSize();var p=1;a.cancelAnimationFrame=!1;a.timer=1;a.onscrollstart&&!a.scrollrunning&&a.onscrollstart.call(a,{type:"scrollstart",current:{x:k,y:f},request:{x:b,y:c},end:{x:a.newscrollx,y:a.newscrolly},speed:h});e();(f==a.page.maxh&&c>=f||k==a.page.maxw&&b>=k)&&a.checkContentSize();a.noticeCursor()}},this.cancelScroll=function(){a.timer&&w(a.timer);a.timer=0;a.bzscroll=!1;a.scrollrunning=
+!1;return a}):(this.doScrollLeft=function(b,c){var d=a.getScrollTop();a.doScrollPos(b,d,c)},this.doScrollTop=function(b,c){var d=a.getScrollLeft();a.doScrollPos(d,b,c)},this.doScrollPos=function(b,c,d){var e=b>a.page.maxw?a.page.maxw:b;0>e&&(e=0);var f=c>a.page.maxh?a.page.maxh:c;0>f&&(f=0);a.synched("scroll",function(){a.setScrollTop(f);a.setScrollLeft(e)})},this.cancelScroll=function(){});this.doScrollBy=function(b,c){var d=0,d=c?Math.floor((a.scroll.y-b)*a.scrollratio.y):(a.timer?a.newscrolly:
+a.getScrollTop(!0))-b;if(a.bouncescroll){var e=Math.round(a.view.h/2);d<-e?d=-e:d>a.page.maxh+e&&(d=a.page.maxh+e)}a.cursorfreezed=!1;e=a.getScrollTop(!0);if(0>d&&0>=e)return a.noticeCursor();if(d>a.page.maxh&&e>=a.page.maxh)return a.checkContentSize(),a.noticeCursor();a.doScrollTop(d)};this.doScrollLeftBy=function(b,c){var d=0,d=c?Math.floor((a.scroll.x-b)*a.scrollratio.x):(a.timer?a.newscrollx:a.getScrollLeft(!0))-b;if(a.bouncescroll){var e=Math.round(a.view.w/2);d<-e?d=-e:d>a.page.maxw+e&&(d=a.page.maxw+
+e)}a.cursorfreezed=!1;e=a.getScrollLeft(!0);if(0>d&&0>=e||d>a.page.maxw&&e>=a.page.maxw)return a.noticeCursor();a.doScrollLeft(d)};this.doScrollTo=function(b,c){a.cursorfreezed=!1;a.doScrollTop(b)};this.checkContentSize=function(){var b=a.getContentSize();b.h==a.page.h&&b.w==a.page.w||a.resize(!1,b)};a.onscroll=function(b){a.rail.drag||a.cursorfreezed||a.synched("scroll",function(){a.scroll.y=Math.round(a.getScrollTop()*(1/a.scrollratio.y));a.railh&&(a.scroll.x=Math.round(a.getScrollLeft()*(1/a.scrollratio.x)));
+a.noticeCursor()})};a.bind(a.docscroll,"scroll",a.onscroll);this.doZoomIn=function(b){if(!a.zoomactive){a.zoomactive=!0;a.zoomrestore={style:{}};var c="position top left zIndex backgroundColor marginTop marginBottom marginLeft marginRight".split(" "),d=a.win[0].style,k;for(k in c){var h=c[k];a.zoomrestore.style[h]=void 0!==d[h]?d[h]:""}a.zoomrestore.style.width=a.win.css("width");a.zoomrestore.style.height=a.win.css("height");a.zoomrestore.padding={w:a.win.outerWidth()-a.win.width(),h:a.win.outerHeight()-
+a.win.height()};e.isios4&&(a.zoomrestore.scrollTop=f(window).scrollTop(),f(window).scrollTop(0));a.win.css({position:e.isios4?"absolute":"fixed",top:0,left:0,zIndex:A+100,margin:0});c=a.win.css("backgroundColor");(""==c||/transparent|rgba\(0, 0, 0, 0\)|rgba\(0,0,0,0\)/.test(c))&&a.win.css("backgroundColor","#fff");a.rail.css({zIndex:A+101});a.zoom.css({zIndex:A+102});a.zoom.css("backgroundPosition","0px -18px");a.resizeZoom();a.onzoomin&&a.onzoomin.call(a);return a.cancelEvent(b)}};this.doZoomOut=
+function(b){if(a.zoomactive)return a.zoomactive=!1,a.win.css("margin",""),a.win.css(a.zoomrestore.style),e.isios4&&f(window).scrollTop(a.zoomrestore.scrollTop),a.rail.css({"z-index":a.zindex}),a.zoom.css({"z-index":a.zindex}),a.zoomrestore=!1,a.zoom.css("backgroundPosition","0px 0px"),a.onResize(),a.onzoomout&&a.onzoomout.call(a),a.cancelEvent(b)};this.doZoom=function(b){return a.zoomactive?a.doZoomOut(b):a.doZoomIn(b)};this.resizeZoom=function(){if(a.zoomactive){var b=a.getScrollTop();a.win.css({width:f(window).width()-
+a.zoomrestore.padding.w+"px",height:f(window).height()-a.zoomrestore.padding.h+"px"});a.onResize();a.setScrollTop(Math.min(a.page.maxh,b))}};this.init();f.nicescroll.push(this)},M=function(f){var c=this;this.nc=f;this.steptime=this.lasttime=this.speedy=this.speedx=this.lasty=this.lastx=0;this.snapy=this.snapx=!1;this.demuly=this.demulx=0;this.lastscrolly=this.lastscrollx=-1;this.timer=this.chky=this.chkx=0;this.time=function(){return+new Date};this.reset=function(f,h){c.stop();var d=c.time();c.steptime=
+0;c.lasttime=d;c.speedx=0;c.speedy=0;c.lastx=f;c.lasty=h;c.lastscrollx=-1;c.lastscrolly=-1};this.update=function(f,h){var d=c.time();c.steptime=d-c.lasttime;c.lasttime=d;var d=h-c.lasty,q=f-c.lastx,t=c.nc.getScrollTop(),a=c.nc.getScrollLeft(),t=t+d,a=a+q;c.snapx=0>a||a>c.nc.page.maxw;c.snapy=0>t||t>c.nc.page.maxh;c.speedx=q;c.speedy=d;c.lastx=f;c.lasty=h};this.stop=function(){c.nc.unsynched("domomentum2d");c.timer&&clearTimeout(c.timer);c.timer=0;c.lastscrollx=-1;c.lastscrolly=-1};this.doSnapy=function(f,
+h){var d=!1;0>h?(h=0,d=!0):h>c.nc.page.maxh&&(h=c.nc.page.maxh,d=!0);0>f?(f=0,d=!0):f>c.nc.page.maxw&&(f=c.nc.page.maxw,d=!0);d?c.nc.doScrollPos(f,h,c.nc.opt.snapbackspeed):c.nc.triggerScrollEnd()};this.doMomentum=function(f){var h=c.time(),d=f?h+f:c.lasttime;f=c.nc.getScrollLeft();var q=c.nc.getScrollTop(),t=c.nc.page.maxh,a=c.nc.page.maxw;c.speedx=0<a?Math.min(60,c.speedx):0;c.speedy=0<t?Math.min(60,c.speedy):0;d=d&&60>=h-d;if(0>q||q>t||0>f||f>a)d=!1;f=c.speedx&&d?c.speedx:!1;if(c.speedy&&d&&c.speedy||
+f){var r=Math.max(16,c.steptime);50<r&&(f=r/50,c.speedx*=f,c.speedy*=f,r=50);c.demulxy=0;c.lastscrollx=c.nc.getScrollLeft();c.chkx=c.lastscrollx;c.lastscrolly=c.nc.getScrollTop();c.chky=c.lastscrolly;var p=c.lastscrollx,e=c.lastscrolly,v=function(){var d=600<c.time()-h?.04:.02;c.speedx&&(p=Math.floor(c.lastscrollx-c.speedx*(1-c.demulxy)),c.lastscrollx=p,0>p||p>a)&&(d=.1);c.speedy&&(e=Math.floor(c.lastscrolly-c.speedy*(1-c.demulxy)),c.lastscrolly=e,0>e||e>t)&&(d=.1);c.demulxy=Math.min(1,c.demulxy+
+d);c.nc.synched("domomentum2d",function(){c.speedx&&(c.nc.getScrollLeft(),c.chkx=p,c.nc.setScrollLeft(p));c.speedy&&(c.nc.getScrollTop(),c.chky=e,c.nc.setScrollTop(e));c.timer||(c.nc.hideCursor(),c.doSnapy(p,e))});1>c.demulxy?c.timer=setTimeout(v,r):(c.stop(),c.nc.hideCursor(),c.doSnapy(p,e))};v()}else c.doSnapy(c.nc.getScrollLeft(),c.nc.getScrollTop())}},y=f.fn.scrollTop;f.cssHooks.pageYOffset={get:function(h,c,k){return(c=f.data(h,"__nicescroll")||!1)&&c.ishwscroll?c.getScrollTop():y.call(h)},set:function(h,
+c){var k=f.data(h,"__nicescroll")||!1;k&&k.ishwscroll?k.setScrollTop(parseInt(c)):y.call(h,c);return this}};f.fn.scrollTop=function(h){if(void 0===h){var c=this[0]?f.data(this[0],"__nicescroll")||!1:!1;return c&&c.ishwscroll?c.getScrollTop():y.call(this)}return this.each(function(){var c=f.data(this,"__nicescroll")||!1;c&&c.ishwscroll?c.setScrollTop(parseInt(h)):y.call(f(this),h)})};var z=f.fn.scrollLeft;f.cssHooks.pageXOffset={get:function(h,c,k){return(c=f.data(h,"__nicescroll")||!1)&&c.ishwscroll?
+c.getScrollLeft():z.call(h)},set:function(h,c){var k=f.data(h,"__nicescroll")||!1;k&&k.ishwscroll?k.setScrollLeft(parseInt(c)):z.call(h,c);return this}};f.fn.scrollLeft=function(h){if(void 0===h){var c=this[0]?f.data(this[0],"__nicescroll")||!1:!1;return c&&c.ishwscroll?c.getScrollLeft():z.call(this)}return this.each(function(){var c=f.data(this,"__nicescroll")||!1;c&&c.ishwscroll?c.setScrollLeft(parseInt(h)):z.call(f(this),h)})};var E=function(h){var c=this;this.length=0;this.name="nicescrollarray";
+this.each=function(d){f.each(c,d);return c};this.push=function(d){c[c.length]=d;c.length++};this.eq=function(d){return c[d]};if(h)for(var k=0;k<h.length;k++){var l=f.data(h[k],"__nicescroll")||!1;l&&(this[this.length]=l,this.length++)}return this};(function(f,c,k){for(var l=0;l<c.length;l++)k(f,c[l])})(E.prototype,"show hide toggle onResize resize remove stop doScrollPos".split(" "),function(f,c){f[c]=function(){var f=arguments;return this.each(function(){this[c].apply(this,f)})}});f.fn.getNiceScroll=
+function(h){return void 0===h?new E(this):this[h]&&f.data(this[h],"__nicescroll")||!1};f.expr[":"].nicescroll=function(h){return void 0!==f.data(h,"__nicescroll")};f.fn.niceScroll=function(h,c){void 0!==c||"object"!=typeof h||"jquery"in h||(c=h,h=!1);c=f.extend({},c);var k=new E;void 0===c&&(c={});h&&(c.doc=f(h),c.win=f(this));var l=!("doc"in c);l||"win"in c||(c.win=f(this));this.each(function(){var d=f(this).data("__nicescroll")||!1;d||(c.doc=l?f(this):c.doc,d=new S(c,f(this)),f(this).data("__nicescroll",
+d));k.push(d)});return 1==k.length?k[0]:k};window.NiceScroll={getjQuery:function(){return f}};f.nicescroll||(f.nicescroll=new E,f.nicescroll.options=K)});
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/jquery.pagination.js b/pluss-wap-page/src/main/resources/static/resources/js/jquery.pagination.js
new file mode 100644
index 0000000..642e933
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/jquery.pagination.js
@@ -0,0 +1,256 @@
+/**
+ * pagination.js 1.5.1
+ * A jQuery plugin to provide simple yet fully customisable pagination.
+ * @version 1.5.1
+ * @author mss
+ * @url https://github.com/Maxiaoxiang/jQuery-plugins
+ *
+ * @调用方法
+ * $(selector).pagination(option, callback);
+ * -此处callback是初始化调用，option里的callback是点击页码后调用
+ * 
+ * -- example --
+ * $(selector).pagination({
+ *     ... // 配置参数
+ *     callback: function(api) {
+ *         console.log('点击页码调用该回调'); //切换页码时执行一次回调
+ *     }
+ * }, function(){
+ *     console.log('初始化'); //插件初始化时调用该方法，比如请求第一次接口来初始化分页配置
+ * });
+ */
+;
+(function (factory) {
+    if (typeof define === "function" && (define.amd || define.cmd) && !jQuery) {
+        // AMD或CMD
+        define(["jquery"], factory);
+    } else if (typeof module === 'object' && module.exports) {
+        // Node/CommonJS
+        module.exports = function (root, jQuery) {
+            if (jQuery === undefined) {
+                if (typeof window !== 'undefined') {
+                    jQuery = require('jquery');
+                } else {
+                    jQuery = require('jquery')(root);
+                }
+            }
+            factory(jQuery);
+            return jQuery;
+        };
+    } else {
+        //Browser globals
+        factory(jQuery);
+    }
+}(function ($) {
+
+    //配置参数
+    var defaults = {
+        totalData: 0, //数据总条数
+        showData: 0, //每页显示的条数
+        pageCount: 9, //总页数,默认为9
+        current: 1, //当前第几页
+        prevCls: 'prev', //上一页class
+        nextCls: 'next', //下一页class
+        prevContent: '<', //上一页内容
+        nextContent: '>', //下一页内容
+        activeCls: 'active', //当前页选中状态
+        coping: false, //首页和尾页
+        isHide: false, //当前页数为0页或者1页时不显示分页
+        homePage: '', //首页节点内容
+        endPage: '', //尾页节点内容
+        keepShowPN: false, //是否一直显示上一页下一页
+        mode: 'unfixed', //分页模式，unfixed：不固定页码数量，fixed：固定页码数量
+        count: 4, //mode为unfixed时显示当前选中页前后页数，mode为fixed显示页码总数
+        jump: false, //跳转到指定页数
+        jumpIptCls: 'jump-ipt', //文本框内容
+        jumpBtnCls: 'jump-btn', //跳转按钮
+        jumpBtn: '跳转', //跳转按钮文本
+        callback: function () {} //回调
+    };
+
+    var Pagination = function (element, options) {
+        //全局变量
+        var opts = options, //配置
+            current, //当前页
+            $document = $(document),
+            $obj = $(element); //容器
+
+        /**
+         * 设置总页数
+         * @param {int} page 页码
+         * @return opts.pageCount 总页数配置
+         */
+        this.setPageCount = function (page) {
+            return opts.pageCount = page;
+        };
+
+        /**
+         * 获取总页数
+         * 如果配置了总条数和每页显示条数，将会自动计算总页数并略过总页数配置，反之
+         * @return {int} 总页数
+         */
+        this.getPageCount = function () {
+            return opts.totalData && opts.showData ? Math.ceil(parseInt(opts.totalData) / opts.showData) : opts.pageCount;
+        };
+
+        /**
+         * 获取当前页
+         * @return {int} 当前页码
+         */
+        this.getCurrent = function () {
+            return current;
+        };
+
+        /**
+         * 填充数据
+         * @param {int} 页码
+         */
+        this.filling = function (index) {
+            var html = '';
+            current = parseInt(index) || parseInt(opts.current); //当前页码
+            var pageCount = this.getPageCount(); //获取的总页数
+            switch (opts.mode) { //配置模式
+                case 'fixed': //固定按钮模式
+                    html += '<a href="javascript:;" class="' + opts.prevCls + '">' + opts.prevContent + '</a>';
+                    if (opts.coping) {
+                        var home = opts.coping && opts.homePage ? opts.homePage : '1';
+                        html += '<a href="javascript:;" data-page="1">' + home + '</a>';
+                    }
+                    var start = current > opts.count - 1 ? current + opts.count - 1 > pageCount ? current - (opts.count - (pageCount - current)) : current - 2 : 1;
+                    var end = current + opts.count - 1 > pageCount ? pageCount : start + opts.count;
+                    for (; start <= end; start++) {
+                        if (start != current) {
+                            html += '<a href="javascript:;" data-page="' + start + '">' + start + '</a>';
+                        } else {
+                            html += '<span class="' + opts.activeCls + '">' + start + '</span>';
+                        }
+                    }
+                    if (opts.coping) {
+                        var _end = opts.coping && opts.endPage ? opts.endPage : pageCount;
+                        html += '<a href="javascript:;" data-page="' + pageCount + '">' + _end + '</a>';
+                    }
+                    html += '<a href="javascript:;" class="' + opts.nextCls + '">' + opts.nextContent + '</a>';
+                    break;
+                case 'unfixed': //不固定按钮模式
+                    if (opts.keepShowPN || current > 1) { //上一页
+                        html += '<a href="javascript:;" class="' + opts.prevCls + '">' + opts.prevContent + '</a>';
+                    } else {
+                        if (opts.keepShowPN == false) {
+                            $obj.find('.' + opts.prevCls) && $obj.find('.' + opts.prevCls).remove();
+                        }
+                    }
+                    if (current >= opts.count + 2 && current != 1 && pageCount != opts.count) {
+                        var home = opts.coping && opts.homePage ? opts.homePage : '1';
+                        html += opts.coping ? '<a href="javascript:;" data-page="1">' + home + '</a><span>...</span>' : '';
+                    }
+                    var start = (current - opts.count) <= 1 ? 1 : (current - opts.count);
+                    var end = (current + opts.count) >= pageCount ? pageCount : (current + opts.count);
+                    for (; start <= end; start++) {
+                        if (start <= pageCount && start >= 1) {
+                            if (start != current) {
+                                html += '<a href="javascript:;" data-page="' + start + '">' + start + '</a>';
+                            } else {
+                                html += '<span class="' + opts.activeCls + '">' + start + '</span>';
+                            }
+                        }
+                    }
+                    if (current + opts.count < pageCount && current >= 1 && pageCount > opts.count) {
+                        var end = opts.coping && opts.endPage ? opts.endPage : pageCount;
+                        html += opts.coping ? '<span>...</span><a href="javascript:;" data-page="' + pageCount + '">' + end + '</a>' : '';
+                    }
+                    if (opts.keepShowPN || current < pageCount) { //下一页
+                        html += '<a href="javascript:;" class="' + opts.nextCls + '">' + opts.nextContent + '</a>';
+                    } else {
+                        if (opts.keepShowPN == false) {
+                            $obj.find('.' + opts.nextCls) && $obj.find('.' + opts.nextCls).remove();
+                        }
+                    }
+                    break;
+                case 'easy': //简单模式
+                    break;
+                default:
+            }
+            html += opts.jump ? '<span>到第</span><input type="text" class="' + opts.jumpIptCls + '"><span>页</span><a href="javascript:;" class="' + opts.jumpBtnCls + '">' + opts.jumpBtn + '</a>' : '';
+            $obj.empty().html(html);
+        };
+
+        //绑定事件
+        this.eventBind = function () {
+            var that = this;
+            var pageCount = that.getPageCount(); //总页数
+            var index = 1;
+            $obj.off().on('click', 'a', function () {
+                if ($(this).hasClass(opts.nextCls)) {
+                    if ($obj.find('.' + opts.activeCls).text() >= pageCount) {
+                        $(this).addClass('disabled');
+                        return false;
+                    } else {
+                        index = parseInt($obj.find('.' + opts.activeCls).text()) + 1;
+                    }
+                } else if ($(this).hasClass(opts.prevCls)) {
+                    if ($obj.find('.' + opts.activeCls).text() <= 1) {
+                        $(this).addClass('disabled');
+                        return false;
+                    } else {
+                        index = parseInt($obj.find('.' + opts.activeCls).text()) - 1;
+                    }
+                } else if ($(this).hasClass(opts.jumpBtnCls)) {
+                    if ($obj.find('.' + opts.jumpIptCls).val() !== '') {
+                        index = parseInt($obj.find('.' + opts.jumpIptCls).val());
+                    } else {
+                        return;
+                    }
+                } else {
+                    index = parseInt($(this).data('page'));
+                }
+                that.filling(index);
+                typeof opts.callback === 'function' && opts.callback(that);
+            });
+            //输入跳转的页码
+            $obj.on('input propertychange', '.' + opts.jumpIptCls, function () {
+                var $this = $(this);
+                var val = $this.val();
+                var reg = /[^\d]/g;
+                if (reg.test(val)) $this.val(val.replace(reg, ''));
+                (parseInt(val) > pageCount) && $this.val(pageCount);
+                if (parseInt(val) === 0) $this.val(1); //最小值为1
+            });
+            //回车跳转指定页码
+            $document.keydown(function (e) {
+                if (e.keyCode == 13 && $obj.find('.' + opts.jumpIptCls).val()) {
+                    var index = parseInt($obj.find('.' + opts.jumpIptCls).val());
+                    that.filling(index);
+                    typeof opts.callback === 'function' && opts.callback(that);
+                }
+            });
+        };
+
+        //初始化
+        this.init = function () {
+            this.filling(opts.current);
+            this.eventBind();
+            if (opts.isHide && this.getPageCount() == '1' || this.getPageCount() == '0') {
+                $obj.hide();
+            } else {
+                $obj.show();
+            }
+        };
+        this.init();
+    };
+
+    $.fn.pagination = function (parameter, callback) {
+        if (typeof parameter == 'function') { //重载
+            callback = parameter;
+            parameter = {};
+        } else {
+            parameter = parameter || {};
+            callback = callback || function () {};
+        }
+        var options = $.extend({}, defaults, parameter);
+        return this.each(function () {
+            var pagination = new Pagination(this, options);
+            callback(pagination);
+        });
+    };
+
+}));
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/jquery.qrcode.js b/pluss-wap-page/src/main/resources/static/resources/js/jquery.qrcode.js
new file mode 100644
index 0000000..d329934
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/jquery.qrcode.js
@@ -0,0 +1,89 @@
+(function( $ ){
+	$.fn.qrcode = function(options) {
+		// if options is string, 
+		if( typeof options === 'string' ){
+			options	= { text: options };
+		}
+
+		// set default values
+		// typeNumber < 1 for automatic calculation
+		options	= $.extend( {}, {
+			render		: "canvas",
+			width		: 256,
+			height		: 256,
+			typeNumber	: -1,
+			correctLevel	: QRErrorCorrectLevel.H,
+                        background      : "#ffffff",
+                        foreground      : "#000000"
+		}, options);
+
+		var createCanvas	= function(){
+			// create the qrcode itself
+			var qrcode	= new QRCode(options.typeNumber, options.correctLevel);
+			qrcode.addData(options.text);
+			qrcode.make();
+
+			// create canvas element
+			var canvas	= document.createElement('canvas');
+			canvas.width	= options.width;
+			canvas.height	= options.height;
+			var ctx		= canvas.getContext('2d');
+
+			// compute tileW/tileH based on options.width/options.height
+			var tileW	= options.width  / qrcode.getModuleCount();
+			var tileH	= options.height / qrcode.getModuleCount();
+
+			// draw in the canvas
+			for( var row = 0; row < qrcode.getModuleCount(); row++ ){
+				for( var col = 0; col < qrcode.getModuleCount(); col++ ){
+					ctx.fillStyle = qrcode.isDark(row, col) ? options.foreground : options.background;
+					var w = (Math.ceil((col+1)*tileW) - Math.floor(col*tileW));
+					var h = (Math.ceil((row+1)*tileH) - Math.floor(row*tileH));
+					ctx.fillRect(Math.round(col*tileW),Math.round(row*tileH), w, h);  
+				}	
+			}
+			// return just built canvas
+			return canvas;
+		}
+
+		// from Jon-Carlos Rivera (https://github.com/imbcmdth)
+		var createTable	= function(){
+			// create the qrcode itself
+			var qrcode	= new QRCode(options.typeNumber, options.correctLevel);
+			qrcode.addData(options.text);
+			qrcode.make();
+			
+			// create table element
+			var $table	= $('<table></table>')
+				.css("width", options.width+"px")
+				.css("height", options.height+"px")
+				.css("border", "0px")
+				.css("border-collapse", "collapse")
+				.css('background-color', options.background);
+		  
+			// compute tileS percentage
+			var tileW	= options.width / qrcode.getModuleCount();
+			var tileH	= options.height / qrcode.getModuleCount();
+
+			// draw in the table
+			for(var row = 0; row < qrcode.getModuleCount(); row++ ){
+				var $row = $('<tr></tr>').css('height', tileH+"px").appendTo($table);
+				
+				for(var col = 0; col < qrcode.getModuleCount(); col++ ){
+					$('<td></td>')
+						.css('width', tileW+"px")
+						.css('background-color', qrcode.isDark(row, col) ? options.foreground : options.background)
+						.appendTo($row);
+				}	
+			}
+			// return just built canvas
+			return $table;
+		}
+  
+
+		return this.each(function(){
+			var element	= options.render == "canvas" ? createCanvas() : createTable();
+			$(element).appendTo(this);
+		});
+	};
+})( jQuery );
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/jquery.slimscroll.min.js b/pluss-wap-page/src/main/resources/static/resources/js/jquery.slimscroll.min.js
new file mode 100644
index 0000000..26220d6
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/jquery.slimscroll.min.js
@@ -0,0 +1,16 @@
+/*! Copyright (c) 2011 Piotr Rochala (http://rocha.la)
+ * Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php)
+ * and GPL (http://www.opensource.org/licenses/gpl-license.php) licenses.
+ *
+ * Version: 1.3.0
+ *
+ */
+(function(f){jQuery.fn.extend({slimScroll:function(h){var a=f.extend({width:"auto",height:"250px",size:"7px",color:"#000",position:"right",distance:"1px",start:"top",opacity:0.4,alwaysVisible:!1,disableFadeOut:!1,railVisible:!1,railColor:"#333",railOpacity:0.2,railDraggable:!0,railClass:"slimScrollRail",barClass:"slimScrollBar",wrapperClass:"slimScrollDiv",allowPageScroll:!1,wheelStep:20,touchScrollStep:200,borderRadius:"7px",railBorderRadius:"7px"},h);this.each(function(){function r(d){if(s){d=d||
+window.event;var c=0;d.wheelDelta&&(c=-d.wheelDelta/120);d.detail&&(c=d.detail/3);f(d.target||d.srcTarget||d.srcElement).closest("."+a.wrapperClass).is(b.parent())&&m(c,!0);d.preventDefault&&!k&&d.preventDefault();k||(d.returnValue=!1)}}function m(d,f,h){k=!1;var e=d,g=b.outerHeight()-c.outerHeight();f&&(e=parseInt(c.css("top"))+d*parseInt(a.wheelStep)/100*c.outerHeight(),e=Math.min(Math.max(e,0),g),e=0<d?Math.ceil(e):Math.floor(e),c.css({top:e+"px"}));l=parseInt(c.css("top"))/(b.outerHeight()-c.outerHeight());
+e=l*(b[0].scrollHeight-b.outerHeight());h&&(e=d,d=e/b[0].scrollHeight*b.outerHeight(),d=Math.min(Math.max(d,0),g),c.css({top:d+"px"}));b.scrollTop(e);b.trigger("slimscrolling",~~e);v();p()}function C(){window.addEventListener?(this.addEventListener("DOMMouseScroll",r,!1),this.addEventListener("mousewheel",r,!1),this.addEventListener("MozMousePixelScroll",r,!1)):document.attachEvent("onmousewheel",r)}function w(){u=Math.max(b.outerHeight()/b[0].scrollHeight*b.outerHeight(),D);c.css({height:u+"px"});
+var a=u==b.outerHeight()?"none":"block";c.css({display:a})}function v(){w();clearTimeout(A);l==~~l?(k=a.allowPageScroll,B!=l&&b.trigger("slimscroll",0==~~l?"top":"bottom")):k=!1;B=l;u>=b.outerHeight()?k=!0:(c.stop(!0,!0).fadeIn("fast"),a.railVisible&&g.stop(!0,!0).fadeIn("fast"))}function p(){a.alwaysVisible||(A=setTimeout(function(){a.disableFadeOut&&s||(x||y)||(c.fadeOut("slow"),g.fadeOut("slow"))},1E3))}var s,x,y,A,z,u,l,B,D=30,k=!1,b=f(this);if(b.parent().hasClass(a.wrapperClass)){var n=b.scrollTop(),
+c=b.parent().find("."+a.barClass),g=b.parent().find("."+a.railClass);w();if(f.isPlainObject(h)){if("height"in h&&"auto"==h.height){b.parent().css("height","auto");b.css("height","auto");var q=b.parent().parent().height();b.parent().css("height",q);b.css("height",q)}if("scrollTo"in h)n=parseInt(a.scrollTo);else if("scrollBy"in h)n+=parseInt(a.scrollBy);else if("destroy"in h){c.remove();g.remove();b.unwrap();return}m(n,!1,!0)}}else{a.height="auto"==a.height?b.parent().height():a.height;n=f("<div></div>").addClass(a.wrapperClass).css({position:"relative",
+overflow:"hidden",width:a.width,height:a.height});b.css({overflow:"hidden",width:a.width,height:a.height});var g=f("<div></div>").addClass(a.railClass).css({width:a.size,height:"100%",position:"absolute",top:0,display:a.alwaysVisible&&a.railVisible?"block":"none","border-radius":a.railBorderRadius,background:a.railColor,opacity:a.railOpacity,zIndex:90}),c=f("<div></div>").addClass(a.barClass).css({background:a.color,width:a.size,position:"absolute",top:0,opacity:a.opacity,display:a.alwaysVisible?
+"block":"none","border-radius":a.borderRadius,BorderRadius:a.borderRadius,MozBorderRadius:a.borderRadius,WebkitBorderRadius:a.borderRadius,zIndex:99}),q="right"==a.position?{right:a.distance}:{left:a.distance};g.css(q);c.css(q);b.wrap(n);b.parent().append(c);b.parent().append(g);a.railDraggable&&c.bind("mousedown",function(a){var b=f(document);y=!0;t=parseFloat(c.css("top"));pageY=a.pageY;b.bind("mousemove.slimscroll",function(a){currTop=t+a.pageY-pageY;c.css("top",currTop);m(0,c.position().top,!1)});
+b.bind("mouseup.slimscroll",function(a){y=!1;p();b.unbind(".slimscroll")});return!1}).bind("selectstart.slimscroll",function(a){a.stopPropagation();a.preventDefault();return!1});g.hover(function(){v()},function(){p()});c.hover(function(){x=!0},function(){x=!1});b.hover(function(){s=!0;v();p()},function(){s=!1;p()});b.bind("touchstart",function(a,b){a.originalEvent.touches.length&&(z=a.originalEvent.touches[0].pageY)});b.bind("touchmove",function(b){k||b.originalEvent.preventDefault();b.originalEvent.touches.length&&
+(m((z-b.originalEvent.touches[0].pageY)/a.touchScrollStep,!0),z=b.originalEvent.touches[0].pageY)});w();"bottom"===a.start?(c.css({top:b.outerHeight()-c.outerHeight()}),m(0,!0)):"top"!==a.start&&(m(f(a.start).position().top,null,!0),a.alwaysVisible||c.hide());C()}});return this}});jQuery.fn.extend({slimscroll:jQuery.fn.slimScroll})})(jQuery);
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/json2.js b/pluss-wap-page/src/main/resources/static/resources/js/json2.js
new file mode 100644
index 0000000..2dbf60d
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/json2.js
@@ -0,0 +1,487 @@
+/*
+    http://www.JSON.org/json2.js
+    2011-10-19
+
+    Public Domain.
+
+    NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK.
+
+    See http://www.JSON.org/js.html
+
+
+    This code should be minified before deployment.
+    See http://javascript.crockford.com/jsmin.html
+
+    USE YOUR OWN COPY. IT IS EXTREMELY UNWISE TO LOAD CODE FROM SERVERS YOU DO
+    NOT CONTROL.
+
+
+    This file creates a global JSON object containing two methods: stringify
+    and parse.
+
+        JSON.stringify(value, replacer, space)
+            value       any JavaScript value, usually an object or array.
+
+            replacer    an optional parameter that determines how object
+                        values are stringified for objects. It can be a
+                        function or an array of strings.
+
+            space       an optional parameter that specifies the indentation
+                        of nested structures. If it is omitted, the text will
+                        be packed without extra whitespace. If it is a number,
+                        it will specify the number of spaces to indent at each
+                        level. If it is a string (such as '\t' or '&nbsp;'),
+                        it contains the characters used to indent at each level.
+
+            This method produces a JSON text from a JavaScript value.
+
+            When an object value is found, if the object contains a toJSON
+            method, its toJSON method will be called and the result will be
+            stringified. A toJSON method does not serialize: it returns the
+            value represented by the name/value pair that should be serialized,
+            or undefined if nothing should be serialized. The toJSON method
+            will be passed the key associated with the value, and this will be
+            bound to the value
+
+            For example, this would serialize Dates as ISO strings.
+
+                Date.prototype.toJSON = function (key) {
+                    function f(n) {
+                        // Format integers to have at least two digits.
+                        return n < 10 ? '0' + n : n;
+                    }
+
+                    return this.getUTCFullYear()   + '-' +
+                         f(this.getUTCMonth() + 1) + '-' +
+                         f(this.getUTCDate())      + 'T' +
+                         f(this.getUTCHours())     + ':' +
+                         f(this.getUTCMinutes())   + ':' +
+                         f(this.getUTCSeconds())   + 'Z';
+                };
+
+            You can provide an optional replacer method. It will be passed the
+            key and value of each member, with this bound to the containing
+            object. The value that is returned from your method will be
+            serialized. If your method returns undefined, then the member will
+            be excluded from the serialization.
+
+            If the replacer parameter is an array of strings, then it will be
+            used to select the members to be serialized. It filters the results
+            such that only members with keys listed in the replacer array are
+            stringified.
+
+            Values that do not have JSON representations, such as undefined or
+            functions, will not be serialized. Such values in objects will be
+            dropped; in arrays they will be replaced with null. You can use
+            a replacer function to replace those with JSON values.
+            JSON.stringify(undefined) returns undefined.
+
+            The optional space parameter produces a stringification of the
+            value that is filled with line breaks and indentation to make it
+            easier to read.
+
+            If the space parameter is a non-empty string, then that string will
+            be used for indentation. If the space parameter is a number, then
+            the indentation will be that many spaces.
+
+            Example:
+
+            text = JSON.stringify(['e', {pluribus: 'unum'}]);
+            // text is '["e",{"pluribus":"unum"}]'
+
+
+            text = JSON.stringify(['e', {pluribus: 'unum'}], null, '\t');
+            // text is '[\n\t"e",\n\t{\n\t\t"pluribus": "unum"\n\t}\n]'
+
+            text = JSON.stringify([new Date()], function (key, value) {
+                return this[key] instanceof Date ?
+                    'Date(' + this[key] + ')' : value;
+            });
+            // text is '["Date(---current time---)"]'
+
+
+        JSON.parse(text, reviver)
+            This method parses a JSON text to produce an object or array.
+            It can throw a SyntaxError exception.
+
+            The optional reviver parameter is a function that can filter and
+            transform the results. It receives each of the keys and values,
+            and its return value is used instead of the original value.
+            If it returns what it received, then the structure is not modified.
+            If it returns undefined then the member is deleted.
+
+            Example:
+
+            // Parse the text. Values that look like ISO date strings will
+            // be converted to Date objects.
+
+            myData = JSON.parse(text, function (key, value) {
+                var a;
+                if (typeof value === 'string') {
+                    a =
+/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2}(?:\.\d*)?)Z$/.exec(value);
+                    if (a) {
+                        return new Date(Date.UTC(+a[1], +a[2] - 1, +a[3], +a[4],
+                            +a[5], +a[6]));
+                    }
+                }
+                return value;
+            });
+
+            myData = JSON.parse('["Date(09/09/2001)"]', function (key, value) {
+                var d;
+                if (typeof value === 'string' &&
+                        value.slice(0, 5) === 'Date(' &&
+                        value.slice(-1) === ')') {
+                    d = new Date(value.slice(5, -1));
+                    if (d) {
+                        return d;
+                    }
+                }
+                return value;
+            });
+
+
+    This is a reference implementation. You are free to copy, modify, or
+    redistribute.
+*/
+
+/*jslint evil: true, regexp: true */
+
+/*members "", "\b", "\t", "\n", "\f", "\r", "\"", JSON, "\\", apply,
+    call, charCodeAt, getUTCDate, getUTCFullYear, getUTCHours,
+    getUTCMinutes, getUTCMonth, getUTCSeconds, hasOwnProperty, join,
+    lastIndex, length, parse, prototype, push, replace, slice, stringify,
+    test, toJSON, toString, valueOf
+*/
+
+
+// Create a JSON object only if one does not already exist. We create the
+// methods in a closure to avoid creating global variables.
+
+var JSON;
+if (!JSON) {
+    JSON = {};
+}
+
+(function () {
+    'use strict';
+
+    function f(n) {
+        // Format integers to have at least two digits.
+        return n < 10 ? '0' + n : n;
+    }
+
+    if (typeof Date.prototype.toJSON !== 'function') {
+
+        Date.prototype.toJSON = function (key) {
+
+            return isFinite(this.valueOf())
+                ? this.getUTCFullYear()     + '-' +
+                    f(this.getUTCMonth() + 1) + '-' +
+                    f(this.getUTCDate())      + 'T' +
+                    f(this.getUTCHours())     + ':' +
+                    f(this.getUTCMinutes())   + ':' +
+                    f(this.getUTCSeconds())   + 'Z'
+                : null;
+        };
+
+        String.prototype.toJSON      =
+            Number.prototype.toJSON  =
+            Boolean.prototype.toJSON = function (key) {
+                return this.valueOf();
+            };
+    }
+
+    var cx = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
+        escapable = /[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
+        gap,
+        indent,
+        meta = {    // table of character substitutions
+            '\b': '\\b',
+            '\t': '\\t',
+            '\n': '\\n',
+            '\f': '\\f',
+            '\r': '\\r',
+            '"' : '\\"',
+            '\\': '\\\\'
+        },
+        rep;
+
+
+    function quote(string) {
+
+// If the string contains no control characters, no quote characters, and no
+// backslash characters, then we can safely slap some quotes around it.
+// Otherwise we must also replace the offending characters with safe escape
+// sequences.
+
+        escapable.lastIndex = 0;
+        return escapable.test(string) ? '"' + string.replace(escapable, function (a) {
+            var c = meta[a];
+            return typeof c === 'string'
+                ? c
+                : '\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
+        }) + '"' : '"' + string + '"';
+    }
+
+
+    function str(key, holder) {
+
+// Produce a string from holder[key].
+
+        var i,          // The loop counter.
+            k,          // The member key.
+            v,          // The member value.
+            length,
+            mind = gap,
+            partial,
+            value = holder[key];
+
+// If the value has a toJSON method, call it to obtain a replacement value.
+
+        if (value && typeof value === 'object' &&
+                typeof value.toJSON === 'function') {
+            value = value.toJSON(key);
+        }
+
+// If we were called with a replacer function, then call the replacer to
+// obtain a replacement value.
+
+        if (typeof rep === 'function') {
+            value = rep.call(holder, key, value);
+        }
+
+// What happens next depends on the value's type.
+
+        switch (typeof value) {
+        case 'string':
+            return quote(value);
+
+        case 'number':
+
+// JSON numbers must be finite. Encode non-finite numbers as null.
+
+            return isFinite(value) ? String(value) : 'null';
+
+        case 'boolean':
+        case 'null':
+
+// If the value is a boolean or null, convert it to a string. Note:
+// typeof null does not produce 'null'. The case is included here in
+// the remote chance that this gets fixed someday.
+
+            return String(value);
+
+// If the type is 'object', we might be dealing with an object or an array or
+// null.
+
+        case 'object':
+
+// Due to a specification blunder in ECMAScript, typeof null is 'object',
+// so watch out for that case.
+
+            if (!value) {
+                return 'null';
+            }
+
+// Make an array to hold the partial results of stringifying this object value.
+
+            gap += indent;
+            partial = [];
+
+// Is the value an array?
+
+            if (Object.prototype.toString.apply(value) === '[object Array]') {
+
+// The value is an array. Stringify every element. Use null as a placeholder
+// for non-JSON values.
+
+                length = value.length;
+                for (i = 0; i < length; i += 1) {
+                    partial[i] = str(i, value) || 'null';
+                }
+
+// Join all of the elements together, separated with commas, and wrap them in
+// brackets.
+
+                v = partial.length === 0
+                    ? '[]'
+                    : gap
+                    ? '[\n' + gap + partial.join(',\n' + gap) + '\n' + mind + ']'
+                    : '[' + partial.join(',') + ']';
+                gap = mind;
+                return v;
+            }
+
+// If the replacer is an array, use it to select the members to be stringified.
+
+            if (rep && typeof rep === 'object') {
+                length = rep.length;
+                for (i = 0; i < length; i += 1) {
+                    if (typeof rep[i] === 'string') {
+                        k = rep[i];
+                        v = str(k, value);
+                        if (v) {
+                            partial.push(quote(k) + (gap ? ': ' : ':') + v);
+                        }
+                    }
+                }
+            } else {
+
+// Otherwise, iterate through all of the keys in the object.
+
+                for (k in value) {
+                    if (Object.prototype.hasOwnProperty.call(value, k)) {
+                        v = str(k, value);
+                        if (v) {
+                            partial.push(quote(k) + (gap ? ': ' : ':') + v);
+                        }
+                    }
+                }
+            }
+
+// Join all of the member texts together, separated with commas,
+// and wrap them in braces.
+
+            v = partial.length === 0
+                ? '{}'
+                : gap
+                ? '{\n' + gap + partial.join(',\n' + gap) + '\n' + mind + '}'
+                : '{' + partial.join(',') + '}';
+            gap = mind;
+            return v;
+        }
+    }
+
+// If the JSON object does not yet have a stringify method, give it one.
+
+    if (typeof JSON.stringify !== 'function') {
+        JSON.stringify = function (value, replacer, space) {
+
+// The stringify method takes a value and an optional replacer, and an optional
+// space parameter, and returns a JSON text. The replacer can be a function
+// that can replace values, or an array of strings that will select the keys.
+// A default replacer method can be provided. Use of the space parameter can
+// produce text that is more easily readable.
+
+            var i;
+            gap = '';
+            indent = '';
+
+// If the space parameter is a number, make an indent string containing that
+// many spaces.
+
+            if (typeof space === 'number') {
+                for (i = 0; i < space; i += 1) {
+                    indent += ' ';
+                }
+
+// If the space parameter is a string, it will be used as the indent string.
+
+            } else if (typeof space === 'string') {
+                indent = space;
+            }
+
+// If there is a replacer, it must be a function or an array.
+// Otherwise, throw an error.
+
+            rep = replacer;
+            if (replacer && typeof replacer !== 'function' &&
+                    (typeof replacer !== 'object' ||
+                    typeof replacer.length !== 'number')) {
+                throw new Error('JSON.stringify');
+            }
+
+// Make a fake root object containing our value under the key of ''.
+// Return the result of stringifying the value.
+
+            return str('', {'': value});
+        };
+    }
+
+
+// If the JSON object does not yet have a parse method, give it one.
+
+    if (typeof JSON.parse !== 'function') {
+        JSON.parse = function (text, reviver) {
+
+// The parse method takes a text and an optional reviver function, and returns
+// a JavaScript value if the text is a valid JSON text.
+
+            var j;
+
+            function walk(holder, key) {
+
+// The walk method is used to recursively walk the resulting structure so
+// that modifications can be made.
+
+                var k, v, value = holder[key];
+                if (value && typeof value === 'object') {
+                    for (k in value) {
+                        if (Object.prototype.hasOwnProperty.call(value, k)) {
+                            v = walk(value, k);
+                            if (v !== undefined) {
+                                value[k] = v;
+                            } else {
+                                delete value[k];
+                            }
+                        }
+                    }
+                }
+                return reviver.call(holder, key, value);
+            }
+
+
+// Parsing happens in four stages. In the first stage, we replace certain
+// Unicode characters with escape sequences. JavaScript handles many characters
+// incorrectly, either silently deleting them, or treating them as line endings.
+
+            text = String(text);
+            cx.lastIndex = 0;
+            if (cx.test(text)) {
+                text = text.replace(cx, function (a) {
+                    return '\\u' +
+                        ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
+                });
+            }
+
+// In the second stage, we run the text against regular expressions that look
+// for non-JSON patterns. We are especially concerned with '()' and 'new'
+// because they can cause invocation, and '=' because it can cause mutation.
+// But just to be safe, we want to reject all unexpected forms.
+
+// We split the second stage into 4 regexp operations in order to work around
+// crippling inefficiencies in IE's and Safari's regexp engines. First we
+// replace the JSON backslash pairs with '@' (a non-JSON character). Second, we
+// replace all simple value tokens with ']' characters. Third, we delete all
+// open brackets that follow a colon or comma or that begin the text. Finally,
+// we look to see that the remaining characters are only whitespace or ']' or
+// ',' or ':' or '{' or '}'. If that is so, then the text is safe for eval.
+
+            if (/^[\],:{}\s]*$/
+                    .test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@')
+                        .replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']')
+                        .replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
+
+// In the third stage we use the eval function to compile the text into a
+// JavaScript structure. The '{' operator is subject to a syntactic ambiguity
+// in JavaScript: it can begin a block or an object literal. We wrap the text
+// in parens to eliminate the ambiguity.
+
+                j = eval('(' + text + ')');
+
+// In the optional fourth stage, we recursively walk the new structure, passing
+// each name/value pair to a reviver function for possible transformation.
+
+                return typeof reviver === 'function'
+                    ? walk({'': j}, '')
+                    : j;
+            }
+
+// If the text is not JSON parseable, then a SyntaxError is thrown.
+
+            throw new SyntaxError('JSON.parse');
+        };
+    }
+}());
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/lay/laydialog.min.js b/pluss-wap-page/src/main/resources/static/resources/js/lay/laydialog.min.js
new file mode 100644
index 0000000..1c1835b
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/lay/laydialog.min.js
@@ -0,0 +1,117 @@
+/**
+ @Name：layer v3.1.0 Web弹层组件
+ @Author：贤心
+ @Site：http://layer.layui.com
+ @License：MIT
+	 zxh  修改适合I B P S平台的控件
+     1、优化了弹窗iframe传值的。
+     2、增加按钮图标、按钮样式等处理
+     3、修改了alert，confirm等弹窗传值
+     4、增加快捷键的支持，btn.hotKey,监听问题未能很好解决
+     5、layer与原来的layui的冲突修改名字 laydialog
+     6、修正 office控件被遮挡不住的问题
+     7、紧急修复在最新版 Chrome（61.0.3163.79）下遮罩层出现的奇异花屏现象
+ 
+ */!function(t,e){"use strict"
+var i,a,n=t.layui&&layui.define,o={getPath:function(){var t=document.scripts,e=t[t.length-1],i=e.src
+if(!e.getAttribute("merge"))return i.substring(0,i.lastIndexOf("/")+1)}(),config:{},end:{},minIndex:0,minLeft:[],btn:[{label:"&#x786E;&#x5B9A;"},{label:"&#x53D6;&#x6D88;"}],type:["dialog","page","iframe","loading","tips"],getStyle:function(e,i){var a=e.currentStyle?e.currentStyle:t.getComputedStyle(e,null)
+return a[a.getPropertyValue?"getPropertyValue":"getAttribute"](i)},link:function(i,a,n){if(l.path){var s=document.getElementsByTagName("head")[0],c=document.createElement("link")
+"string"==typeof a&&(n=a)
+var r=(n||i).replace(/\.|\//g,""),d="layuicss-"+r,f=0
+c.rel="stylesheet",c.href=l.path+i,c.id=d,document.getElementById(d)||s.appendChild(c),"function"==typeof a&&!function u(){return++f>80?t.console&&console.error("laydialog.css: Invalid"):(1989===parseInt(o.getStyle(document.getElementById(d),"width"))?a():setTimeout(u,100),e)}()}}},l={v:"3.1.0",ie:function(){var e=navigator.userAgent.toLowerCase()
+return t.ActiveXObject||"ActiveXObject"in t?(e.match(/msie\s(\d+)/)||[])[1]||"11":!1}(),index:t.laydialog&&t.laydialog.v?1e5:0,path:o.getPath,config:function(t,e){return t=t||{},l.cache=o.config=i.extend({},o.config,t),l.path=o.config.path||l.path,"string"==typeof t.extend&&(t.extend=[t.extend]),o.config.path&&l.ready(),t.extend?(n?layui.addcss("modules/laydialog/"+t.extend):o.link("theme/"+t.extend),this):this},ready:function(t){var e="laydialog",i="",a=(n?"modules/laydialog/":"theme/")+"default/laydialog.css?v="+l.v+i
+return n?layui.addcss(a,t,e):o.link(a,t,e),this},alert:function(){var t=arguments,a={},n={btn:[{label:"&#x786E;&#x5B9A;",iconCls:"btn btn-primary",hotkey:13,action:function(t,e){"function"==typeof t.config.callback&&t.config.callback(!0),l.close(e)}}],closeBtn:!1,callback:null}
+return a="object"==typeof t[0]?i.extend(!0,n,t[0]):i.extend(!0,n,{content:t[0],callback:e!==t[1]?t[1]:null}),l.open(a)},confirm:function(){var t=arguments,e={},a={content:null,btn:[{label:"&#x786E;&#x5B9A;",iconCls:"btn btn-primary",hotkey:13,action:function(t,e){"function"==typeof t.config.callback&&t.config.callback(!0),l.close(e)}},{label:"&#x53D6;&#x6D88;",iconCls:"btn btn-default",hotkey:27,action:function(t,e){"function"==typeof t.config.callback&&t.config.callback(!1),l.close(e)}}],closeBtn:!1,callback:null}
+if("object"==typeof t[0]){var n=t[0]
+n.btn&&(a.btn[0].label=n.btn[0].label,a.btn[1].label=n.btn[1].label,n.btn=a.btn),e=i.extend({},a,n)}else{var o="&#x4FE1;&#x606F;",s=null,c=[{label:"&#x786E;&#x5B9A;",iconCls:"btn btn-primary",hotkey:13,action:function(t,e){"function"==typeof t.config.callback&&t.config.callback(!0),l.close(e)}},{label:"&#x53D6;&#x6D88;",iconCls:"btn btn-default",hotkey:27,action:function(t,e){"function"==typeof t.config.callback&&t.config.callback(!1),l.close(e)}}]
+2==t.length&&("function"==typeof t[1]&&(s=t[1]),"string"==typeof t[1]&&(o=t[1])),3==t.length&&("function"==typeof t[1]&&(s=t[1]),"string"==typeof t[1]&&(o=t[1]),"function"==typeof t[2]&&(s=t[2])),4==t.length&&("function"==typeof t[1]&&(s=t[1]),"string"==typeof t[1]&&(o=t[1]),"function"==typeof t[2]&&(s=t[2]),t[3]&&(c=[{label:"&#x5426;",iconCls:"btn btn-primary",hotkey:27,action:function(t,e){"function"==typeof t.config.callback&&t.config.callback(!1),l.close(e)}},{label:"&#x662F;",iconCls:"btn btn-default",hotkey:13,action:function(t,e){"function"==typeof t.config.callback&&t.config.callback(!0),l.close(e)}}])),e=i.extend(!0,a,{content:t[0],callback:s,title:o,btn:c,closeBtn:!1})}return l.open(e)},msg:function(t,a,n){var s="function"==typeof a,r=o.config.skin,d=(r?r+" "+r+"-msg":"")||"layui-laydialog-msg",f=c.anim.length-1
+return s&&(n=a),l.open(i.extend({content:t,time:3e3,shade:!1,skin:d,title:!1,closeBtn:!1,btn:!1,resize:!1,end:n},s&&!o.config.skin?{skin:d+" layui-laydialog-hui",anim:f}:function(){return a=a||{},(-1===a.icon||a.icon===e&&!o.config.skin)&&(a.skin=d+" "+(a.skin||"layui-laydialog-hui")),a}()))},load:function(t,e){return l.open(i.extend({type:3,icon:t||0,resize:!1},e))},tips:function(t,e,a){return l.open(i.extend({type:4,content:[t,e],closeBtn:!1,time:3e3,shade:!1,resize:!1,fixed:!1,maxWidth:210},a))}},s=function(t){var e=this
+e.index=++l.index,e.config=i.extend({},e.config,o.config,t),document.body?e.creat():setTimeout(function(){e.creat()},30)}
+s.pt=s.prototype
+var c=["layui-laydialog",".layui-laydialog-title",".layui-laydialog-main",".layui-laydialog-dialog","layui-laydialog-iframe","layui-laydialog-content","layui-laydialog-btn","layui-laydialog-close"]
+c.anim=["laydialog-anim-00","laydialog-anim-01","laydialog-anim-02","laydialog-anim-03","laydialog-anim-04","laydialog-anim-05","laydialog-anim-06"],s.pt.config={type:0,shade:.3,fixed:!0,move:c[1],title:"&#x4FE1;&#x606F;",offset:"auto",area:"auto",closeBtn:1,time:0,zIndex:19891014,maxWidth:360,anim:0,isOutAnim:!0,icon:-1,moveType:1,resize:!0,scrollbar:!0,tips:2,registeredButtonHotkeys:{}},s.pt.newGuid=function(){return"xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g,function(t){var e=16*Math.random()|0,i="x"===t?e:3&e|8
+return i.toString(16)})},s.pt.vessel=function(t,a){var n=this,l=n.index,s=n.config,r=s.zIndex+l,d="object"==typeof s.title,f=s.maxmin&&(1===s.type||2===s.type),u=s.title?'<div class="layui-laydialog-title" style="'+(d?s.title[1]:"")+'">'+(d?s.title[0]:s.title)+"</div>":""
+return s.zIndex=r,a([s.shade?'<div class="layui-laydialog-shade" id="layui-laydialog-shade'+l+'" times="'+l+'" style="'+("z-index:"+(r-1)+"; ")+'"></div>':"",'<div class="'+c[0]+(" layui-laydialog-"+o.type[s.type])+(0!=s.type&&2!=s.type||s.shade?"":" layui-laydialog-border")+" "+(s.skin||"")+'" id="'+c[0]+l+'" type="'+o.type[s.type]+'" times="'+l+'" showtime="'+s.time+'" conType="'+(t?"object":"string")+'" style="z-index: '+r+"; width:"+s.area[0]+";height:"+s.area[1]+(s.fixed?"":";position:absolute;")+'">'+(t&&2!=s.type?"":u)+'<div id="'+(s.id||"")+'" class="layui-laydialog-content'+(0==s.type&&-1!==s.icon?" layui-laydialog-padding":"")+(3==s.type?" layui-laydialog-loading"+s.icon:"")+'">'+(0==s.type&&-1!==s.icon?'<i class="layui-laydialog-ico layui-laydialog-ico'+s.icon+'"></i>':"")+(1==s.type&&t?"":s.content||"")+'</div><span class="layui-laydialog-setwin">'+function(){var t=f?'<a class="layui-laydialog-min" href="javascript:;"><cite></cite></a><a class="layui-laydialog-ico layui-laydialog-max" href="javascript:;"></a>':""
+return s.closeBtn&&(t+='<a class="layui-laydialog-ico '+c[7]+" "+c[7]+(s.title?s.closeBtn:4==s.type?"1":"2")+'" href="javascript:;"></a>'),t}()+"</span>"+(s.btn?function(){var t,i="",a=""
+"string"==typeof s.btn&&(s.btn=[s.btn])
+for(var o=0,l=s.btn.length;l>o;o++)a=s.btn[o].id?s.btn[o].id:n.newGuid()+"btn",t=s.btn[o].iconCls?s.btn[o].iconCls:0==o?"btn btn-primary":"btn btn-default",i+='<a id="'+a+'" class="'+c[6]+o+" "+t+(s.btn[o].hide?" hidden":"")+'">'+s.btn[o].label+"</a>",e!==s.btn[o].hotkey&&(s.registeredButtonHotkeys[s.btn[o].hotkey]=a)
+return'<div class="'+c[6]+" layui-laydialog-btn-"+(s.btnAlign||"")+'">'+i+"</div>"}():"")+(s.resize?'<span class="layui-laydialog-resize"></span>':"")+"</div>"],u,i('<div class="layui-laydialog-move"></div>')),n},s.pt.creat=function(){var t=this,e=t.config,n=t.index,s=e.content,r="object"==typeof s,d=i("body")
+if(!e.id||!i("#"+e.id)[0]){switch("string"==typeof e.area&&(e.area="auto"===e.area?["",""]:[e.area,""]),e.shift&&(e.anim=e.shift),6==l.ie&&(e.fixed=!1),e.type){case 0:e.btn="btn"in e?e.btn:o.btn[0],l.closeAll("dialog")
+break
+case 2:var s=e.content=r?e.content:[e.content||"http://www.ddjd.com","auto"]
+e.content='<iframe scrolling="'+(e.content[1]||"auto")+'" allowtransparency="true" id="'+c[4]+n+'" name="'+c[4]+n+'" onload="this.className=\'\';" class="layui-laydialog-load" frameborder="0" src="'+e.content[0]+'"></iframe>'
+break
+case 3:delete e.title,delete e.closeBtn,-1===e.icon&&0===e.icon,l.closeAll("loading")
+break
+case 4:r||(e.content=[e.content,"body"]),e.follow=e.content[1],e.content=e.content[0]+'<i class="layui-laydialog-TipsG"></i>',delete e.title,e.tips="object"==typeof e.tips?e.tips:[e.tips,!0],e.tipsMore||l.closeAll("tips")}if(t.vessel(r,function(a,l,f){d.append(a[0]),r?function(){2==e.type||4==e.type?function(){i("body").append(a[1])}():function(){s.parents("."+c[0])[0]||(s.data("display",s.css("display")).show().addClass("layui-laydialog-wrap").wrap(a[1]),i("#"+c[0]+n).find("."+c[5]).before(l))}()}():d.append(a[1]),i(".layui-laydialog-move")[0]||d.append(o.moveElem=f),t.laydialogo=i("#"+c[0]+n),e.scrollbar||c.html.css("overflow","hidden").attr("laydialog-full",n)}).auto(n),i("#layui-laydialog-shade"+t.index).css({"background-color":e.shade[1]||"#000",opacity:e.shade[0]||e.shade}),i(document).off("keydown",o.enter).on("keydown",o.enter),t.laydialogo.on("keydown",function(t){i(document).off("keydown",o.enter)}),2==e.type&&6==l.ie&&t.laydialogo.find("iframe").attr("src",s[0]),4==e.type?t.tips():t.offset(),e.fixed&&a.on("resize",function(){t.offset(),(/^\d+%$/.test(e.area[0])||/^\d+%$/.test(e.area[1]))&&t.auto(n),4==e.type&&t.tips()}),e.time<=0||setTimeout(function(){l.close(t.index)},e.time),2==e.type){var f=i("#"+c[4]+n),u=f[0]
+u.dialog=t,u.dialog.config=t.config,u.dialog.callback=t.config.callback,u.dialog.params=t.config.params,u.close=function(e){e||(e=t.index),l.close(e)}}if(t.move().back(),c.anim[e.anim]){var y="laydialog-anim "+c.anim[e.anim]
+t.laydialogo.addClass(y).one("webkitAnimationEnd mozAnimationEnd MSAnimationEnd oanimationend animationend",function(){i(this).removeClass(y)})}e.isOutAnim&&t.laydialogo.data("isOutAnim",!0)}},s.pt.auto=function(t){var e=this,n=e.config,o=i("#"+c[0]+t)
+""===n.area[0]&&n.maxWidth>0&&(l.ie&&l.ie<8&&n.btn&&o.width(o.innerWidth()),o.outerWidth()>n.maxWidth&&o.width(n.maxWidth))
+var s=[o.innerWidth(),o.innerHeight()],r=o.find(c[1]).outerHeight()||0,d=o.find("."+c[6]).outerHeight()||0,f=function(t){t=o.find(t),t.height(s[1]-r-d-2*(0|parseFloat(t.css("padding-top"))))}
+switch(n.type){case 2:f("iframe")
+break
+default:""===n.area[1]?n.maxHeight>0&&o.outerHeight()>n.maxHeight?(s[1]=n.maxHeight,f("."+c[5])):n.fixed&&s[1]>=a.height()&&(s[1]=a.height(),f("."+c[5])):f("."+c[5])}return e},s.pt.offset=function(){var t=this,e=t.config,i=t.laydialogo,n=[i.outerWidth(),i.outerHeight()],o="object"==typeof e.offset
+t.offsetTop=(a.height()-n[1])/2,t.offsetLeft=(a.width()-n[0])/2,o?(t.offsetTop=e.offset[0],t.offsetLeft=e.offset[1]||t.offsetLeft):"auto"!==e.offset&&("t"===e.offset?t.offsetTop=0:"r"===e.offset?t.offsetLeft=a.width()-n[0]:"b"===e.offset?t.offsetTop=a.height()-n[1]:"l"===e.offset?t.offsetLeft=0:"lt"===e.offset?(t.offsetTop=0,t.offsetLeft=0):"lb"===e.offset?(t.offsetTop=a.height()-n[1],t.offsetLeft=0):"rt"===e.offset?(t.offsetTop=0,t.offsetLeft=a.width()-n[0]):"rb"===e.offset?(t.offsetTop=a.height()-n[1],t.offsetLeft=a.width()-n[0]):t.offsetTop=e.offset),e.fixed||(t.offsetTop=/%$/.test(t.offsetTop)?a.height()*parseFloat(t.offsetTop)/100:parseFloat(t.offsetTop),t.offsetLeft=/%$/.test(t.offsetLeft)?a.width()*parseFloat(t.offsetLeft)/100:parseFloat(t.offsetLeft),t.offsetTop+=a.scrollTop(),t.offsetLeft+=a.scrollLeft()),i.attr("minLeft")&&(t.offsetTop=a.height()-(i.find(c[1]).outerHeight()||0),t.offsetLeft=i.css("left")),i.css({top:t.offsetTop,left:t.offsetLeft})},s.pt.tips=function(){var t=this,e=t.config,n=t.laydialogo,o=[n.outerWidth(),n.outerHeight()],l=i(e.follow)
+l[0]||(l=i("body"))
+var s={width:l.outerWidth(),height:l.outerHeight(),top:l.offset().top,left:l.offset().left},r=n.find(".layui-laydialog-TipsG"),d=e.tips[0]
+e.tips[1]||r.remove(),s.autoLeft=function(){s.left+o[0]-a.width()>0?(s.tipLeft=s.left+s.width-o[0],r.css({right:12,left:"auto"})):s.tipLeft=s.left},s.where=[function(){s.autoLeft(),s.tipTop=s.top-o[1]-10,r.removeClass("layui-laydialog-TipsB").addClass("layui-laydialog-TipsT").css("border-right-color",e.tips[1])},function(){s.tipLeft=s.left+s.width+10,s.tipTop=s.top,r.removeClass("layui-laydialog-TipsL").addClass("layui-laydialog-TipsR").css("border-bottom-color",e.tips[1])},function(){s.autoLeft(),s.tipTop=s.top+s.height+10,r.removeClass("layui-laydialog-TipsT").addClass("layui-laydialog-TipsB").css("border-right-color",e.tips[1])},function(){s.tipLeft=s.left-o[0]-10,s.tipTop=s.top,r.removeClass("layui-laydialog-TipsR").addClass("layui-laydialog-TipsL").css("border-bottom-color",e.tips[1])}],s.where[d-1](),1===d?s.top-(a.scrollTop()+o[1]+16)<0&&s.where[2]():2===d?a.width()-(s.left+s.width+o[0]+16)>0||s.where[3]():3===d?s.top-a.scrollTop()+s.height+o[1]+16-a.height()>0&&s.where[0]():4===d&&o[0]+16-s.left>0&&s.where[1](),n.find("."+c[5]).css({"background-color":e.tips[1],"padding-right":e.closeBtn?"30px":""}),n.css({left:s.tipLeft-(e.fixed?a.scrollLeft():0),top:s.tipTop-(e.fixed?a.scrollTop():0)})},s.pt.move=function(){var t=this,e=t.config,n=i(document),s=t.laydialogo,c=s.find(e.move),r=s.find(".layui-laydialog-resize"),d={}
+return e.move&&c.css("cursor","move"),c.on("mousedown",function(t){t.preventDefault(),e.move&&(d.moveStart=!0,d.offset=[t.clientX-parseFloat(s.css("left")),t.clientY-parseFloat(s.css("top"))],o.moveElem.css("cursor","move").show())}),r.on("mousedown",function(t){t.preventDefault(),d.resizeStart=!0,d.offset=[t.clientX,t.clientY],d.area=[s.outerWidth(),s.outerHeight()],o.moveElem.css("cursor","se-resize").show()}),n.on("mousemove",function(i){if(d.moveStart){var n=i.clientX-d.offset[0],o=i.clientY-d.offset[1],c="fixed"===s.css("position")
+if(i.preventDefault(),d.stX=c?0:a.scrollLeft(),d.stY=c?0:a.scrollTop(),!e.moveOut){var r=a.width()-s.outerWidth()+d.stX,f=a.height()-s.outerHeight()+d.stY
+n<d.stX&&(n=d.stX),n>r&&(n=r),o<d.stY&&(o=d.stY),o>f&&(o=f)}s.css({left:n,top:o})}if(e.resize&&d.resizeStart){var n=i.clientX-d.offset[0],o=i.clientY-d.offset[1]
+i.preventDefault(),l.style(t.index,{width:d.area[0]+n,height:d.area[1]+o}),d.isResize=!0,e.resizing&&e.resizing(s)}}).on("mouseup",function(t){d.moveStart&&(delete d.moveStart,o.moveElem.hide(),e.moveEnd&&e.moveEnd(s)),d.resizeStart&&(delete d.resizeStart,o.moveElem.hide())}),t},s.pt.back=function(){function t(){var t=s.cancel&&s.cancel(a.index,n)
+t===!1||l.close(a.index)}var a=this,n=a.laydialogo,s=a.config
+a.openlaydialog(),s.success&&(2==s.type?n.find("iframe").on("load",function(){s.success(n,a.index)}):s.success(n,a.index)),6==l.ie&&a.IE6(n),n.find("."+c[6]).children("a").on("click",function(t){var e=i(this).index(),n=s.btn[e].action
+"function"==typeof n&&n.call(this,a,a.index,s.btn[e],t)}),n.find("."+c[7]).on("click",t),s.shadeClose&&i("#layui-laydialog-shade"+a.index).on("click",function(){l.close(a.index)}),n.find(".layui-laydialog-min").on("click",function(){var t=s.min&&s.min(n)
+t===!1||l.min(a.index,s)}),n.find(".layui-laydialog-max").on("click",function(){i(this).hasClass("layui-laydialog-maxmin")?(l.restore(a.index),s.restore&&s.restore(n)):(l.full(a.index,s),setTimeout(function(){s.full&&s.full(n)},100))}),s.registeredButtonHotkeys&&i(document).on("keyup",{dialog:this},function(t){var a=t.data.dialog
+if(a){var n=a.config
+if(e!==n.registeredButtonHotkeys[t.which]){var o=i("#"+n.registeredButtonHotkeys[t.which])
+!o.prop("disabled")&&o.focus().trigger("click")}}}),s.end&&(o.end[a.index]=s.end)},o.reselect=function(){i.each(i("select"),function(t,e){var a=i(this)
+a.parents("."+c[0])[0]||1==a.attr("laydialog")&&i("."+c[0]).length<1&&a.removeAttr("laydialog").show(),a=null})},s.pt.IE6=function(t){i("select").each(function(t,e){var a=i(this)
+a.parents("."+c[0])[0]||"none"===a.css("display")||a.attr({laydialog:"1"}).hide(),a=null})},s.pt.openlaydialog=function(){var t=this
+l.zIndex=t.config.zIndex,l.setTop=function(t){var e=function(){l.zIndex++,t.css("z-index",l.zIndex+1)}
+return l.zIndex=parseInt(t[0].style.zIndex),t.on("mousedown",e),l.zIndex}},o.record=function(t){var e=[t.width(),t.height(),t.position().top,t.position().left+parseFloat(t.css("margin-left"))]
+t.find(".layui-laydialog-max").addClass("layui-laydialog-maxmin"),t.attr({area:e})},o.rescollbar=function(t){c.html.attr("laydialog-full")==t&&(c.html[0].style.removeProperty?c.html[0].style.removeProperty("overflow"):c.html[0].style.removeAttribute("overflow"),c.html.removeAttr("laydialog-full"))},t.laydialog=l,l.getChildFrameWindow=function(t){return t=t||i("."+c[4]).attr("times"),i("#"+c[0]+t).find("iframe")[0].contentWindow},l.getChildFrame=function(t,e){return e=e||i("."+c[4]).attr("times"),i("#"+c[0]+e).find("iframe").contents().find(t)},l.getFrameIndex=function(t){return i("#"+t).parents("."+c[4]).attr("times")},l.iframeAuto=function(t){if(t){var e=l.getChildFrame("html",t).outerHeight(),a=i("#"+c[0]+t),n=a.find(c[1]).outerHeight()||0,o=a.find("."+c[6]).outerHeight()||0
+a.css({height:e+n+o}),a.find("iframe").css({height:e})}},l.iframeSrc=function(t,e){i("#"+c[0]+t).find("iframe").attr("src",e)},l.style=function(t,e,a){var n=i("#"+c[0]+t),l=n.find(".layui-laydialog-content"),s=n.attr("type"),r=n.find(c[1]).outerHeight()||0,d=n.find("."+c[6]).outerHeight()||0
+n.attr("minLeft")
+s!==o.type[3]&&s!==o.type[4]&&(a||(parseFloat(e.width)<=260&&(e.width=260),parseFloat(e.height)-r-d<=64&&(e.height=64+r+d)),n.css(e),d=n.find("."+c[6]).outerHeight(),s===o.type[2]?n.find("iframe").css({height:parseFloat(e.height)-r-d}):l.css({height:parseFloat(e.height)-r-d-parseFloat(l.css("padding-top"))-parseFloat(l.css("padding-bottom"))}))},l.min=function(t,e){var n=i("#"+c[0]+t),s=n.find(c[1]).outerHeight()||50,r=n.attr("minLeft")||181*o.minIndex+"px",d=n.css("position")
+o.record(n),o.minLeft[0]&&(r=o.minLeft[0],o.minLeft.shift()),n.attr("position",d),l.style(t,{width:180,height:s,left:r,top:a.height()-s,position:"fixed",overflow:"hidden"},!0),n.find(".layui-laydialog-min").hide(),"page"===n.attr("type")&&n.find(c[4]).hide(),o.rescollbar(t),n.attr("minLeft")||o.minIndex++,n.attr("minLeft",r)},l.restore=function(t){var e=i("#"+c[0]+t),a=e.attr("area").split(",")
+e.attr("type")
+l.style(t,{width:parseFloat(a[0]),height:parseFloat(a[1]),top:parseFloat(a[2]),left:parseFloat(a[3]),position:e.attr("position"),overflow:"visible"},!0),e.find(".layui-laydialog-max").removeClass("layui-laydialog-maxmin"),e.find(".layui-laydialog-min").show(),"page"===e.attr("type")&&e.find(c[4]).show(),o.rescollbar(t)},l.full=function(t){var e,n=i("#"+c[0]+t)
+o.record(n),c.html.attr("laydialog-full")||c.html.css("overflow","hidden").attr("laydialog-full",t),clearTimeout(e),e=setTimeout(function(){var e="fixed"===n.css("position")
+l.style(t,{top:e?0:a.scrollTop(),left:e?0:a.scrollLeft(),width:a.width(),height:a.height()},!0),n.find(".layui-laydialog-min").hide()},100)},l.title=function(t,e){var a=i("#"+c[0]+(e||l.index)).find(c[1])
+a.html(t)},l.close=function(t){var e=i("#"+c[0]+t),a=e.attr("type"),n="laydialog-anim-close"
+if(e[0]){var s="layui-laydialog-wrap",r=function(){if(a===o.type[1]&&"object"===e.attr("conType")){e.children(":not(."+c[5]+")").remove()
+for(var n=e.find("."+s),l=0;2>l;l++)n.unwrap()
+n.css("display",n.data("display")).removeClass(s)}else{if(a===o.type[2])try{var r=i("#"+c[4]+t)[0]
+r.contentWindow.document.write(""),r.contentWindow.close(),e.find("."+c[5])[0].removeChild(r)}catch(d){}e[0].innerHTML="",e.remove()}"function"==typeof o.end[t]&&o.end[t](),delete o.end[t]
+try{i("#laydialog_iframe"+c[4]+t).remove()}catch(d){}}
+e.data("isOutAnim")&&e.addClass("laydialog-anim "+n),i("#layui-laydialog-moves, #layui-laydialog-shade"+t).remove(),6==l.ie&&o.reselect(),o.rescollbar(t),e.attr("minLeft")&&(o.minIndex--,o.minLeft.push(e.attr("minLeft"))),l.ie&&l.ie<10||!e.data("isOutAnim")?r():setTimeout(function(){r()},200)}},l.closeAll=function(t){i.each(i("."+c[0]),function(){var e=i(this),a=t?e.attr("type")===t:1
+a&&l.close(e.attr("times")),a=null})}
+var r=l.cache||{},d=function(t){return r.skin?" "+r.skin+" "+r.skin+"-"+t:""}
+l.prompt=function(t,e){var n=""
+if(t=t||{},"function"==typeof t&&(e=t),t.area){var o=t.area
+n='style="width: '+o[0]+"; height: "+o[1]+';"',delete t.area}var s,c=2==t.formType?'<textarea class="layui-laydialog-input"'+n+">"+(t.value||"")+"</textarea>":function(){return'<input type="'+(1==t.formType?"password":"text")+'" class="layui-laydialog-input" value="'+(t.value||"")+'">'}(),r=t.success
+return delete t.success,l.open(i.extend({type:1,btn:[{label:"&#x786E;&#x5B9A;",iconCls:"btn btn-primary",action:function(t,e){t.config.yes(e)}},{label:"&#x53D6;&#x6D88;",iconCls:"btn btn-default",action:function(t,e){"function"==typeof t.config.callback&&t.config.callback(!1),l.close(e)}}],content:c,skin:"layui-laydialog-prompt"+d("prompt"),maxWidth:a.width(),success:function(t){s=t.find(".layui-laydialog-input"),s.focus(),"function"==typeof r&&r(t)},resize:!1,yes:function(i){var a=s.val()
+""===a?s.focus():a.length>(t.maxlength||500)?l.tips("&#x6700;&#x591A;&#x8F93;&#x5165;"+(t.maxlength||500)+"&#x4E2A;&#x5B57;&#x6570;",s,{tips:1}):e&&e(a,i,s)}},t))},l.tab=function(t){t=t||{}
+var e=t.tab||{},a="layui-this",n=t.success
+return delete t.success,l.open(i.extend({type:1,skin:"layui-laydialog-tab"+d("tab"),resize:!1,title:function(){var t=e.length,i=1,n=""
+if(t>0)for(n='<span class="'+a+'">'+e[0].title+"</span>";t>i;i++)n+="<span>"+e[i].title+"</span>"
+return n}(),content:'<ul class="layui-laydialog-tabmain">'+function(){var t=e.length,i=1,n=""
+if(t>0)for(n='<li class="layui-laydialog-tabli '+a+'">'+(e[0].content||"no content")+"</li>";t>i;i++)n+='<li class="layui-laydialog-tabli">'+(e[i].content||"no  content")+"</li>"
+return n}()+"</ul>",success:function(e){var o=e.find(".layui-laydialog-title").children(),l=e.find(".layui-laydialog-tabmain").children()
+o.on("mousedown",function(e){e.stopPropagation?e.stopPropagation():e.cancelBubble=!0
+var n=i(this),o=n.index()
+n.addClass(a).siblings().removeClass(a),l.eq(o).show().siblings().hide(),"function"==typeof t.change&&t.change(o)}),"function"==typeof n&&n(e)}},t))},l.photos=function(a,n,o){function s(t,i,a){var n=new Image
+return n.src=t,n.complete?i(n):(n.onload=function(){n.onload=null,i(n)},n.onerror=function(t){n.onerror=null,a(t)},e)}var c={}
+if(a=a||{},a.photos){var r=a.photos.constructor===Object,f=r?a.photos:{},u=f.data||[],y=f.start||0
+c.imgIndex=(0|y)+1,a.img=a.img||"img"
+var g=a.success
+if(delete a.success,r){if(0===u.length)return l.msg("&#x6CA1;&#x6709;&#x56FE;&#x7247;")}else{var p=i(a.photos),h=function(){u=[],p.find(a.img).each(function(t){var e=i(this)
+e.attr("laydialog-index",t),u.push({alt:e.attr("alt"),pid:e.attr("laydialog-pid"),src:e.attr("laydialog-src")||e.attr("src"),thumb:e.attr("src")})})}
+if(h(),0===u.length)return
+if(n||p.on("click",a.img,function(){var t=i(this),e=t.attr("laydialog-index")
+l.photos(i.extend(a,{photos:{start:e,data:u,tab:a.tab},full:a.full}),!0),h()}),!n)return}c.imgprev=function(t){c.imgIndex--,c.imgIndex<1&&(c.imgIndex=u.length),c.tabimg(t)},c.imgnext=function(t,e){c.imgIndex++,c.imgIndex>u.length&&(c.imgIndex=1,e)||c.tabimg(t)},c.keyup=function(t){if(!c.end){var e=t.keyCode
+t.preventDefault(),37===e?c.imgprev(!0):39===e?c.imgnext(!0):27===e&&l.close(c.index)}},c.tabimg=function(t){return u.length<=1?e:(f.start=c.imgIndex-1,l.close(c.index),l.photos(a,!0,t))},c.event=function(){c.bigimg.hover(function(){c.imgsee.show()},function(){c.imgsee.hide()}),c.bigimg.find(".layui-laydialog-imgprev").on("click",function(t){t.preventDefault(),c.imgprev()}),c.bigimg.find(".layui-laydialog-imgnext").on("click",function(t){t.preventDefault(),c.imgnext()}),i(document).on("keyup",c.keyup)},c.loadi=l.load(1,{shade:"shade"in a?!1:.9,scrollbar:!1}),s(u[y].src,function(e){l.close(c.loadi),c.index=l.open(i.extend({type:1,id:"layui-laydialog-photos",area:function(){var n=[e.width,e.height],o=[i(t).width()-100,i(t).height()-100]
+if(!a.full&&(n[0]>o[0]||n[1]>o[1])){var l=[n[0]/o[0],n[1]/o[1]]
+l[0]>l[1]?(n[0]=n[0]/l[0],n[1]=n[1]/l[0]):l[0]<l[1]&&(n[0]=n[0]/l[1],n[1]=n[1]/l[1])}return[n[0]+"px",n[1]+"px"]}(),title:!1,shade:.9,shadeClose:!0,closeBtn:!1,move:".layui-laydialog-phimg img",moveType:1,scrollbar:!1,moveOut:!0,isOutAnim:!1,skin:"layui-laydialog-photos"+d("photos"),content:'<div class="layui-laydialog-phimg"><img src="'+u[y].src+'" alt="'+(u[y].alt||"")+'" laydialog-pid="'+u[y].pid+'"><div class="layui-laydialog-imgsee">'+(u.length>1?'<span class="layui-laydialog-imguide"><a href="javascript:;" class="layui-laydialog-iconext layui-laydialog-imgprev"></a><a href="javascript:;" class="layui-laydialog-iconext layui-laydialog-imgnext"></a></span>':"")+'<div class="layui-laydialog-imgbar" style="display:'+(o?"block":"")+'"><span class="layui-laydialog-imgtit"><a href="javascript:;">'+(u[y].alt||"")+"</a><em>"+c.imgIndex+"/"+u.length+"</em></span></div></div></div>",success:function(t,e){c.bigimg=t.find(".layui-laydialog-phimg"),c.imgsee=t.find(".layui-laydialog-imguide,.layui-laydialog-imgbar"),c.event(t),a.tab&&a.tab(u[y],t),"function"==typeof g&&g(t)},end:function(){c.end=!0,i(document).off("keyup",c.keyup)}},a))},function(){l.close(c.loadi),l.msg("&#x5F53;&#x524D;&#x56FE;&#x7247;&#x5730;&#x5740;&#x5F02;&#x5E38;<br>&#x662F;&#x5426;&#x7EE7;&#x7EED;&#x67E5;&#x770B;&#x4E0B;&#x4E00;&#x5F20;&#xFF1F;",{time:3e4,btn:["&#x4E0B;&#x4E00;&#x5F20;","&#x4E0D;&#x770B;&#x4E86;"],yes:function(){u.length>1&&c.imgnext(!0,!0)}})})}},o.run=function(e){i=e,a=i(t),c.html=i("html"),l.open=function(t){var e=new s(t)
+return e.index}},t.layui&&layui.define?(l.ready(),layui.define("jquery",function(e){l.path=layui.cache.dir,o.run(layui.$),t.laydialog=l,e("laydialog",l)})):"function"==typeof define&&define.amd?define(["jquery"],function(){return o.run(t.jQuery),l}):function(){o.run(t.jQuery),l.ready()}()}(window)
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/lay/modules/carousel.js b/pluss-wap-page/src/main/resources/static/resources/js/lay/modules/carousel.js
new file mode 100644
index 0000000..2be2c8c
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/lay/modules/carousel.js
@@ -0,0 +1,2 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ ;layui.define("jquery",function(e){"use strict";var i=layui.$,n=(layui.hint(),layui.device(),{config:{},set:function(e){var n=this;return n.config=i.extend({},n.config,e),n},on:function(e,i){return layui.onevent.call(this,t,e,i)}}),t="carousel",a="layui-this",l=">*[carousel-item]>*",o="layui-carousel-left",r="layui-carousel-right",d="layui-carousel-prev",s="layui-carousel-next",u="layui-carousel-arrow",c="layui-carousel-ind",m=function(e){var t=this;t.config=i.extend({},t.config,n.config,e),t.render()};m.prototype.config={width:"600px",height:"280px",full:!1,arrow:"hover",indicator:"inside",autoplay:!0,interval:3e3,anim:"",trigger:"click",index:0},m.prototype.render=function(){var e=this,n=e.config;n.elem=i(n.elem),n.elem[0]&&(e.elemItem=n.elem.find(l),n.index<0&&(n.index=0),n.index>=e.elemItem.length&&(n.index=e.elemItem.length-1),n.interval<800&&(n.interval=800),n.full?n.elem.css({position:"fixed",width:"100%",height:"100%",zIndex:9999}):n.elem.css({width:n.width,height:n.height}),n.elem.attr("lay-anim",n.anim),e.elemItem.eq(n.index).addClass(a),e.elemItem.length<=1||(e.indicator(),e.arrow(),e.autoplay(),e.events()))},m.prototype.reload=function(e){var n=this;clearInterval(n.timer),n.config=i.extend({},n.config,e),n.render()},m.prototype.prevIndex=function(){var e=this,i=e.config,n=i.index-1;return n<0&&(n=e.elemItem.length-1),n},m.prototype.nextIndex=function(){var e=this,i=e.config,n=i.index+1;return n>=e.elemItem.length&&(n=0),n},m.prototype.addIndex=function(e){var i=this,n=i.config;e=e||1,n.index=n.index+e,n.index>=i.elemItem.length&&(n.index=0)},m.prototype.subIndex=function(e){var i=this,n=i.config;e=e||1,n.index=n.index-e,n.index<0&&(n.index=i.elemItem.length-1)},m.prototype.autoplay=function(){var e=this,i=e.config;i.autoplay&&(e.timer=setInterval(function(){e.slide()},i.interval))},m.prototype.arrow=function(){var e=this,n=e.config,t=i(['<button class="layui-icon '+u+'" lay-type="sub">'+("updown"===n.anim?"&#xe619;":"&#xe603;")+"</button>",'<button class="layui-icon '+u+'" lay-type="add">'+("updown"===n.anim?"&#xe61a;":"&#xe602;")+"</button>"].join(""));n.elem.attr("lay-arrow",n.arrow),n.elem.find("."+u)[0]&&n.elem.find("."+u).remove(),n.elem.append(t),t.on("click",function(){var n=i(this),t=n.attr("lay-type");e.slide(t)})},m.prototype.indicator=function(){var e=this,n=e.config,t=e.elemInd=i(['<div class="'+c+'"><ul>',function(){var i=[];return layui.each(e.elemItem,function(e){i.push("<li"+(n.index===e?' class="layui-this"':"")+"></li>")}),i.join("")}(),"</ul></div>"].join(""));n.elem.attr("lay-indicator",n.indicator),n.elem.find("."+c)[0]&&n.elem.find("."+c).remove(),n.elem.append(t),"updown"===n.anim&&t.css("margin-top",-(t.height()/2)),t.find("li").on("hover"===n.trigger?"mouseover":n.trigger,function(){var t=i(this),a=t.index();a>n.index?e.slide("add",a-n.index):a<n.index&&e.slide("sub",n.index-a)})},m.prototype.slide=function(e,i){var n=this,l=n.elemItem,u=n.config,c=u.index,m=u.elem.attr("lay-filter");n.haveSlide||("sub"===e?(n.subIndex(i),l.eq(u.index).addClass(d),setTimeout(function(){l.eq(c).addClass(r),l.eq(u.index).addClass(r)},50)):(n.addIndex(i),l.eq(u.index).addClass(s),setTimeout(function(){l.eq(c).addClass(o),l.eq(u.index).addClass(o)},50)),setTimeout(function(){l.removeClass(a+" "+d+" "+s+" "+o+" "+r),l.eq(u.index).addClass(a),n.haveSlide=!1},300),n.elemInd.find("li").eq(u.index).addClass(a).siblings().removeClass(a),n.haveSlide=!0,layui.event.call(this,t,"change("+m+")",{index:u.index,prevIndex:c,item:l.eq(u.index)}))},m.prototype.events=function(){var e=this,i=e.config;i.elem.data("haveEvents")||(i.elem.on("mouseenter",function(){clearInterval(e.timer)}).on("mouseleave",function(){e.autoplay()}),i.elem.data("haveEvents",!0))},n.render=function(e){var i=new m(e);return i},e(t,n)});
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/lay/modules/code.js b/pluss-wap-page/src/main/resources/static/resources/js/lay/modules/code.js
new file mode 100644
index 0000000..b33f9d6
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/lay/modules/code.js
@@ -0,0 +1,2 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ ;layui.define("jquery",function(e){"use strict";var a=layui.$,l="http://www.layui.com/doc/modules/code.html";e("code",function(e){var t=[];e=e||{},e.elem=a(e.elem||".layui-code"),e.about=!("about"in e)||e.about,e.elem.each(function(){t.push(this)}),layui.each(t.reverse(),function(t,i){var c=a(i),o=c.html();(c.attr("lay-encode")||e.encode)&&(o=o.replace(/&(?!#?[a-zA-Z0-9]+;)/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/'/g,"&#39;").replace(/"/g,"&quot;")),c.html('<ol class="layui-code-ol"><li>'+o.replace(/[\r\t\n]+/g,"</li><li>")+"</li></ol>"),c.find(">.layui-code-h3")[0]||c.prepend('<h3 class="layui-code-h3">'+(c.attr("lay-title")||e.title||"code")+(e.about?'<a href="'+l+'" target="_blank">layui.code</a>':"")+"</h3>");var d=c.find(">.layui-code-ol");c.addClass("layui-box layui-code-view"),(c.attr("lay-skin")||e.skin)&&c.addClass("layui-code-"+(c.attr("lay-skin")||e.skin)),(d.find("li").length/100|0)>0&&d.css("margin-left",(d.find("li").length/100|0)+"px"),(c.attr("lay-height")||e.height)&&d.css("max-height",c.attr("lay-height")||e.height)})})}).addcss("modules/code.css","skincodecss");
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/lay/modules/colorpicker.js b/pluss-wap-page/src/main/resources/static/resources/js/lay/modules/colorpicker.js
new file mode 100644
index 0000000..fd99bf8
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/lay/modules/colorpicker.js
@@ -0,0 +1,2 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ ;layui.define("jquery",function(e){"use strict";var i=layui.jquery,o={config:{},index:layui.colorpicker?layui.colorpicker.index+1e4:0,set:function(e){var o=this;return o.config=i.extend({},o.config,e),o},on:function(e,i){return layui.onevent.call(this,"colorpicker",e,i)}},r=function(){var e=this,i=e.config;return{config:i}},t="colorpicker",n="layui-show",l="layui-colorpicker",c=".layui-colorpicker-main",a="layui-icon-down",s="layui-icon-close",f="layui-colorpicker-trigger-span",d="layui-colorpicker-trigger-i",u="layui-colorpicker-side",p="layui-colorpicker-side-slider",g="layui-colorpicker-basis",v="layui-colorpicker-alpha-bgcolor",h="layui-colorpicker-alpha-slider",m="layui-colorpicker-basis-cursor",b="layui-colorpicker-main-input",k=function(e){var i={h:0,s:0,b:0},o=Math.min(e.r,e.g,e.b),r=Math.max(e.r,e.g,e.b),t=r-o;return i.b=r,i.s=0!=r?255*t/r:0,0!=i.s?e.r==r?i.h=(e.g-e.b)/t:e.g==r?i.h=2+(e.b-e.r)/t:i.h=4+(e.r-e.g)/t:i.h=-1,r==o&&(i.h=0),i.h*=60,i.h<0&&(i.h+=360),i.s*=100/255,i.b*=100/255,i},y=function(e){var e=e.indexOf("#")>-1?e.substring(1):e;if(3==e.length){var i=e.split("");e=i[0]+i[0]+i[1]+i[1]+i[2]+i[2]}e=parseInt(e,16);var o={r:e>>16,g:(65280&e)>>8,b:255&e};return k(o)},x=function(e){var i={},o=e.h,r=255*e.s/100,t=255*e.b/100;if(0==r)i.r=i.g=i.b=t;else{var n=t,l=(255-r)*t/255,c=(n-l)*(o%60)/60;360==o&&(o=0),o<60?(i.r=n,i.b=l,i.g=l+c):o<120?(i.g=n,i.b=l,i.r=n-c):o<180?(i.g=n,i.r=l,i.b=l+c):o<240?(i.b=n,i.r=l,i.g=n-c):o<300?(i.b=n,i.g=l,i.r=l+c):o<360?(i.r=n,i.g=l,i.b=n-c):(i.r=0,i.g=0,i.b=0)}return{r:Math.round(i.r),g:Math.round(i.g),b:Math.round(i.b)}},C=function(e){var o=x(e),r=[o.r.toString(16),o.g.toString(16),o.b.toString(16)];return i.each(r,function(e,i){1==i.length&&(r[e]="0"+i)}),r.join("")},P=function(e){var i=/[0-9]{1,3}/g,o=e.match(i)||[];return{r:o[0],g:o[1],b:o[2]}},B=i(window),w=i(document),D=function(e){var r=this;r.index=++o.index,r.config=i.extend({},r.config,o.config,e),r.render()};D.prototype.config={color:"",size:null,alpha:!1,format:"hex",predefine:!1,colors:["#009688","#5FB878","#1E9FFF","#FF5722","#FFB800","#01AAED","#999","#c00","#ff8c00","#ffd700","#90ee90","#00ced1","#1e90ff","#c71585","rgb(0, 186, 189)","rgb(255, 120, 0)","rgb(250, 212, 0)","#393D49","rgba(0,0,0,.5)","rgba(255, 69, 0, 0.68)","rgba(144, 240, 144, 0.5)","rgba(31, 147, 255, 0.73)"]},D.prototype.render=function(){var e=this,o=e.config,r=i(['<div class="layui-unselect layui-colorpicker">',"<span "+("rgb"==o.format&&o.alpha?'class="layui-colorpicker-trigger-bgcolor"':"")+">",'<span class="layui-colorpicker-trigger-span" ','lay-type="'+("rgb"==o.format?o.alpha?"rgba":"torgb":"")+'" ','style="'+function(){var e="";return o.color?(e=o.color,(o.color.match(/[0-9]{1,3}/g)||[]).length>3&&(o.alpha&&"rgb"==o.format||(e="#"+C(k(P(o.color))))),"background: "+e):e}()+'">','<i class="layui-icon layui-colorpicker-trigger-i '+(o.color?a:s)+'"></i>',"</span>","</span>","</div>"].join("")),t=i(o.elem);o.size&&r.addClass("layui-colorpicker-"+o.size),t.addClass("layui-inline").html(e.elemColorBox=r),e.color=e.elemColorBox.find("."+f)[0].style.background,e.events()},D.prototype.renderPicker=function(){var e=this,o=e.config,r=e.elemColorBox[0],t=e.elemPicker=i(['<div id="layui-colorpicker'+e.index+'" data-index="'+e.index+'" class="layui-anim layui-anim-upbit layui-colorpicker-main">','<div class="layui-colorpicker-main-wrapper">','<div class="layui-colorpicker-basis">','<div class="layui-colorpicker-basis-white"></div>','<div class="layui-colorpicker-basis-black"></div>','<div class="layui-colorpicker-basis-cursor"></div>',"</div>",'<div class="layui-colorpicker-side">','<div class="layui-colorpicker-side-slider"></div>',"</div>","</div>",'<div class="layui-colorpicker-main-alpha '+(o.alpha?n:"")+'">','<div class="layui-colorpicker-alpha-bgcolor">','<div class="layui-colorpicker-alpha-slider"></div>',"</div>","</div>",function(){if(o.predefine){var e=['<div class="layui-colorpicker-main-pre">'];return layui.each(o.colors,function(i,o){e.push(['<div class="layui-colorpicker-pre'+((o.match(/[0-9]{1,3}/g)||[]).length>3?" layui-colorpicker-pre-isalpha":"")+'">','<div style="background:'+o+'"></div>',"</div>"].join(""))}),e.push("</div>"),e.join("")}return""}(),'<div class="layui-colorpicker-main-input">','<div class="layui-inline">','<input type="text" class="layui-input">',"</div>",'<div class="layui-btn-container">','<button class="layui-btn layui-btn-primary layui-btn-sm" colorpicker-events="clear">清空</button>','<button class="layui-btn layui-btn-sm" colorpicker-events="confirm">确定</button>',"</div","</div>","</div>"].join(""));e.elemColorBox.find("."+f)[0];i(c)[0]&&i(c).data("index")==e.index?e.removePicker(D.thisElemInd):(e.removePicker(D.thisElemInd),i("body").append(t)),D.thisElemInd=e.index,D.thisColor=r.style.background,e.position(),e.pickerEvents()},D.prototype.removePicker=function(e){var o=this;o.config;return i("#layui-colorpicker"+(e||o.index)).remove(),o},D.prototype.position=function(){var e=this,i=e.config,o=e.bindElem||e.elemColorBox[0],r=e.elemPicker[0],t=o.getBoundingClientRect(),n=r.offsetWidth,l=r.offsetHeight,c=function(e){return e=e?"scrollLeft":"scrollTop",document.body[e]|document.documentElement[e]},a=function(e){return document.documentElement[e?"clientWidth":"clientHeight"]},s=5,f=t.left,d=t.bottom;f-=(n-o.offsetWidth)/2,d+=s,f+n+s>a("width")?f=a("width")-n-s:f<s&&(f=s),d+l+s>a()&&(d=t.top>l?t.top-l:a()-l,d-=2*s),i.position&&(r.style.position=i.position),r.style.left=f+("fixed"===i.position?0:c(1))+"px",r.style.top=d+("fixed"===i.position?0:c())+"px"},D.prototype.val=function(){var e=this,i=(e.config,e.elemColorBox.find("."+f)),o=e.elemPicker.find("."+b),r=i[0],t=r.style.backgroundColor;if(t){var n=k(P(t)),l=i.attr("lay-type");if(e.select(n.h,n.s,n.b),"torgb"===l&&o.find("input").val(t),"rgba"===l){var c=P(t);if(3==(t.match(/[0-9]{1,3}/g)||[]).length)o.find("input").val("rgba("+c.r+", "+c.g+", "+c.b+", 1)"),e.elemPicker.find("."+h).css("left",280);else{o.find("input").val(t);var a=280*t.slice(t.lastIndexOf(",")+1,t.length-1);e.elemPicker.find("."+h).css("left",a)}e.elemPicker.find("."+v)[0].style.background="linear-gradient(to right, rgba("+c.r+", "+c.g+", "+c.b+", 0), rgb("+c.r+", "+c.g+", "+c.b+"))"}}else e.select(0,100,100),o.find("input").val(""),e.elemPicker.find("."+v)[0].style.background="",e.elemPicker.find("."+h).css("left",280)},D.prototype.side=function(){var e=this,o=e.config,r=e.elemColorBox.find("."+f),t=r.attr("lay-type"),n=e.elemPicker.find("."+u),l=e.elemPicker.find("."+p),c=e.elemPicker.find("."+g),y=e.elemPicker.find("."+m),C=e.elemPicker.find("."+v),w=e.elemPicker.find("."+h),D=l[0].offsetTop/180*360,E=100-(y[0].offsetTop+3)/180*100,H=(y[0].offsetLeft+3)/260*100,W=Math.round(w[0].offsetLeft/280*100)/100,j=e.elemColorBox.find("."+d),F=e.elemPicker.find(".layui-colorpicker-pre").children("div"),L=function(i,n,l,c){e.select(i,n,l);var f=x({h:i,s:n,b:l});if(j.addClass(a).removeClass(s),r[0].style.background="rgb("+f.r+", "+f.g+", "+f.b+")","torgb"===t&&e.elemPicker.find("."+b).find("input").val("rgb("+f.r+", "+f.g+", "+f.b+")"),"rgba"===t){var d=0;d=280*c,w.css("left",d),e.elemPicker.find("."+b).find("input").val("rgba("+f.r+", "+f.g+", "+f.b+", "+c+")"),r[0].style.background="rgba("+f.r+", "+f.g+", "+f.b+", "+c+")",C[0].style.background="linear-gradient(to right, rgba("+f.r+", "+f.g+", "+f.b+", 0), rgb("+f.r+", "+f.g+", "+f.b+"))"}o.change&&o.change(e.elemPicker.find("."+b).find("input").val())},M=i(['<div class="layui-auxiliar-moving" id="LAY-colorpicker-moving"></div'].join("")),Y=function(e){i("#LAY-colorpicker-moving")[0]||i("body").append(M),M.on("mousemove",e),M.on("mouseup",function(){M.remove()}).on("mouseleave",function(){M.remove()})};l.on("mousedown",function(e){var i=this.offsetTop,o=e.clientY,r=function(e){var r=i+(e.clientY-o),t=n[0].offsetHeight;r<0&&(r=0),r>t&&(r=t);var l=r/180*360;D=l,L(l,H,E,W),e.preventDefault()};Y(r),e.preventDefault()}),n.on("click",function(e){var o=e.clientY-i(this).offset().top;o<0&&(o=0),o>this.offsetHeight&&(o=this.offsetHeight);var r=o/180*360;D=r,L(r,H,E,W),e.preventDefault()}),y.on("mousedown",function(e){var i=this.offsetTop,o=this.offsetLeft,r=e.clientY,t=e.clientX,n=function(e){var n=i+(e.clientY-r),l=o+(e.clientX-t),a=c[0].offsetHeight-3,s=c[0].offsetWidth-3;n<-3&&(n=-3),n>a&&(n=a),l<-3&&(l=-3),l>s&&(l=s);var f=(l+3)/260*100,d=100-(n+3)/180*100;E=d,H=f,L(D,f,d,W),e.preventDefault()};layui.stope(e),Y(n),e.preventDefault()}),c.on("mousedown",function(e){var o=e.clientY-i(this).offset().top-3+B.scrollTop(),r=e.clientX-i(this).offset().left-3+B.scrollLeft();o<-3&&(o=-3),o>this.offsetHeight-3&&(o=this.offsetHeight-3),r<-3&&(r=-3),r>this.offsetWidth-3&&(r=this.offsetWidth-3);var t=(r+3)/260*100,n=100-(o+3)/180*100;E=n,H=t,L(D,t,n,W),e.preventDefault(),y.trigger(e,"mousedown")}),w.on("mousedown",function(e){var i=this.offsetLeft,o=e.clientX,r=function(e){var r=i+(e.clientX-o),t=C[0].offsetWidth;r<0&&(r=0),r>t&&(r=t);var n=Math.round(r/280*100)/100;W=n,L(D,H,E,n),e.preventDefault()};Y(r),e.preventDefault()}),C.on("click",function(e){var o=e.clientX-i(this).offset().left;o<0&&(o=0),o>this.offsetWidth&&(o=this.offsetWidth);var r=Math.round(o/280*100)/100;W=r,L(D,H,E,r),e.preventDefault()}),F.each(function(){i(this).on("click",function(){i(this).parent(".layui-colorpicker-pre").addClass("selected").siblings().removeClass("selected");var e,o=this.style.backgroundColor,r=k(P(o)),t=o.slice(o.lastIndexOf(",")+1,o.length-1);D=r.h,H=r.s,E=r.b,3==(o.match(/[0-9]{1,3}/g)||[]).length&&(t=1),W=t,e=280*t,L(r.h,r.s,r.b,t)})})},D.prototype.select=function(e,i,o,r){var t=this,n=(t.config,C({h:e,s:100,b:100})),l=C({h:e,s:i,b:o}),c=e/360*180,a=180-o/100*180-3,s=i/100*260-3;t.elemPicker.find("."+p).css("top",c),t.elemPicker.find("."+g)[0].style.background="#"+n,t.elemPicker.find("."+m).css({top:a,left:s}),"change"!==r&&t.elemPicker.find("."+b).find("input").val("#"+l)},D.prototype.pickerEvents=function(){var e=this,o=e.config,r=e.elemColorBox.find("."+f),t=e.elemPicker.find("."+b+" input"),n={clear:function(i){r[0].style.background="",e.elemColorBox.find("."+d).removeClass(a).addClass(s),e.color="",o.done&&o.done(""),e.removePicker()},confirm:function(i,n){var l=t.val(),c=l,f={};if(l.indexOf(",")>-1){if(f=k(P(l)),e.select(f.h,f.s,f.b),r[0].style.background=c="#"+C(f),(l.match(/[0-9]{1,3}/g)||[]).length>3&&"rgba"===r.attr("lay-type")){var u=280*l.slice(l.lastIndexOf(",")+1,l.length-1);e.elemPicker.find("."+h).css("left",u),r[0].style.background=l,c=l}}else f=y(l),r[0].style.background=c="#"+C(f),e.elemColorBox.find("."+d).removeClass(s).addClass(a);return"change"===n?(e.select(f.h,f.s,f.b,n),void(o.change&&o.change(c))):(e.color=l,o.done&&o.done(l),void e.removePicker())}};e.elemPicker.on("click","*[colorpicker-events]",function(){var e=i(this),o=e.attr("colorpicker-events");n[o]&&n[o].call(this,e)}),t.on("keyup",function(e){var o=i(this);n.confirm.call(this,o,13===e.keyCode?null:"change")})},D.prototype.events=function(){var e=this,o=e.config,r=e.elemColorBox.find("."+f);e.elemColorBox.on("click",function(){e.renderPicker(),i(c)[0]&&(e.val(),e.side())}),o.elem[0]&&!e.elemColorBox[0].eventHandler&&(w.on("click",function(o){if(!i(o.target).hasClass(l)&&!i(o.target).parents("."+l)[0]&&!i(o.target).hasClass(c.replace(/\./g,""))&&!i(o.target).parents(c)[0]&&e.elemPicker){if(e.color){var t=k(P(e.color));e.select(t.h,t.s,t.b)}else e.elemColorBox.find("."+d).removeClass(a).addClass(s);r[0].style.background=e.color||"",e.removePicker()}}),B.on("resize",function(){return!(!e.elemPicker||!i(c)[0])&&void e.position()}),e.elemColorBox[0].eventHandler=!0)},o.render=function(e){var i=new D(e);return r.call(i)},e(t,o)});
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/lay/modules/element.js b/pluss-wap-page/src/main/resources/static/resources/js/lay/modules/element.js
new file mode 100644
index 0000000..ac628df
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/lay/modules/element.js
@@ -0,0 +1,2 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ ;layui.define("jquery",function(t){"use strict";var a=layui.$,i=(layui.hint(),layui.device()),e="element",l="layui-this",n="layui-show",s=function(){this.config={}};s.prototype.set=function(t){var i=this;return a.extend(!0,i.config,t),i},s.prototype.on=function(t,a){return layui.onevent.call(this,e,t,a)},s.prototype.tabAdd=function(t,i){var e=".layui-tab-title",l=a(".layui-tab[lay-filter="+t+"]"),n=l.children(e),s=n.children(".layui-tab-bar"),o=l.children(".layui-tab-content"),r='<li lay-id="'+(i.id||"")+'"'+(i.attr?' lay-attr="'+i.attr+'"':"")+">"+(i.title||"unnaming")+"</li>";return s[0]?s.before(r):n.append(r),o.append('<div class="layui-tab-item">'+(i.content||"")+"</div>"),f.hideTabMore(!0),f.tabAuto(),this},s.prototype.tabDelete=function(t,i){var e=".layui-tab-title",l=a(".layui-tab[lay-filter="+t+"]"),n=l.children(e),s=n.find('>li[lay-id="'+i+'"]');return f.tabDelete(null,s),this},s.prototype.tabChange=function(t,i){var e=".layui-tab-title",l=a(".layui-tab[lay-filter="+t+"]"),n=l.children(e),s=n.find('>li[lay-id="'+i+'"]');return f.tabClick.call(s[0],null,null,s),this},s.prototype.tab=function(t){t=t||{},b.on("click",t.headerElem,function(i){var e=a(this).index();f.tabClick.call(this,i,e,null,t)})},s.prototype.progress=function(t,i){var e="layui-progress",l=a("."+e+"[lay-filter="+t+"]"),n=l.find("."+e+"-bar"),s=n.find("."+e+"-text");return n.css("width",i),s.text(i),this};var o=".layui-nav",r="layui-nav-item",c="layui-nav-bar",u="layui-nav-tree",d="layui-nav-child",y="layui-nav-more",h="layui-anim layui-anim-upbit",f={tabClick:function(t,i,s,o){o=o||{};var r=s||a(this),i=i||r.parent().children("li").index(r),c=o.headerElem?r.parent():r.parents(".layui-tab").eq(0),u=o.bodyElem?a(o.bodyElem):c.children(".layui-tab-content").children(".layui-tab-item"),d=r.find("a"),y=c.attr("lay-filter");"javascript:;"!==d.attr("href")&&"_blank"===d.attr("target")||(r.addClass(l).siblings().removeClass(l),u.eq(i).addClass(n).siblings().removeClass(n)),layui.event.call(this,e,"tab("+y+")",{elem:c,index:i})},tabDelete:function(t,i){var n=i||a(this).parent(),s=n.index(),o=n.parents(".layui-tab").eq(0),r=o.children(".layui-tab-content").children(".layui-tab-item"),c=o.attr("lay-filter");n.hasClass(l)&&(n.next()[0]?f.tabClick.call(n.next()[0],null,s+1):n.prev()[0]&&f.tabClick.call(n.prev()[0],null,s-1)),n.remove(),r.eq(s).remove(),setTimeout(function(){f.tabAuto()},50),layui.event.call(this,e,"tabDelete("+c+")",{elem:o,index:s})},tabAuto:function(){var t="layui-tab-more",e="layui-tab-bar",l="layui-tab-close",n=this;a(".layui-tab").each(function(){var s=a(this),o=s.children(".layui-tab-title"),r=(s.children(".layui-tab-content").children(".layui-tab-item"),'lay-stope="tabmore"'),c=a('<span class="layui-unselect layui-tab-bar" '+r+"><i "+r+' class="layui-icon">&#xe61a;</i></span>');if(n===window&&8!=i.ie&&f.hideTabMore(!0),s.attr("lay-allowClose")&&o.find("li").each(function(){var t=a(this);if(!t.find("."+l)[0]){var i=a('<i class="layui-icon layui-unselect '+l+'">&#x1006;</i>');i.on("click",f.tabDelete),t.append(i)}}),"string"!=typeof s.attr("lay-unauto"))if(o.prop("scrollWidth")>o.outerWidth()+1){if(o.find("."+e)[0])return;o.append(c),s.attr("overflow",""),c.on("click",function(a){o[this.title?"removeClass":"addClass"](t),this.title=this.title?"":"收缩"})}else o.find("."+e).remove(),s.removeAttr("overflow")})},hideTabMore:function(t){var i=a(".layui-tab-title");t!==!0&&"tabmore"===a(t.target).attr("lay-stope")||(i.removeClass("layui-tab-more"),i.find(".layui-tab-bar").attr("title",""))},clickThis:function(){var t=a(this),i=t.parents(o),n=i.attr("lay-filter"),s=t.parent(),c=t.siblings("."+d),y="string"==typeof s.attr("lay-unselect");"javascript:;"!==t.attr("href")&&"_blank"===t.attr("target")||y||c[0]||(i.find("."+l).removeClass(l),s.addClass(l)),i.hasClass(u)&&(c.removeClass(h),c[0]&&(s["none"===c.css("display")?"addClass":"removeClass"](r+"ed"),"all"===i.attr("lay-shrink")&&s.siblings().removeClass(r+"ed"))),layui.event.call(this,e,"nav("+n+")",t)},collapse:function(){var t=a(this),i=t.find(".layui-colla-icon"),l=t.siblings(".layui-colla-content"),s=t.parents(".layui-collapse").eq(0),o=s.attr("lay-filter"),r="none"===l.css("display");if("string"==typeof s.attr("lay-accordion")){var c=s.children(".layui-colla-item").children("."+n);c.siblings(".layui-colla-title").children(".layui-colla-icon").html("&#xe602;"),c.removeClass(n)}l[r?"addClass":"removeClass"](n),i.html(r?"&#xe61a;":"&#xe602;"),layui.event.call(this,e,"collapse("+o+")",{title:t,content:l,show:r})}};s.prototype.init=function(t,e){var l=function(){return e?'[lay-filter="'+e+'"]':""}(),s={tab:function(){f.tabAuto.call({})},nav:function(){var t=200,e={},s={},p={},b=function(l,o,r){var c=a(this),f=c.find("."+d);o.hasClass(u)?l.css({top:c.position().top,height:c.children("a").outerHeight(),opacity:1}):(f.addClass(h),l.css({left:c.position().left+parseFloat(c.css("marginLeft")),top:c.position().top+c.height()-l.height()}),e[r]=setTimeout(function(){l.css({width:c.width(),opacity:1})},i.ie&&i.ie<10?0:t),clearTimeout(p[r]),"block"===f.css("display")&&clearTimeout(s[r]),s[r]=setTimeout(function(){f.addClass(n),c.find("."+y).addClass(y+"d")},300))};a(o+l).each(function(i){var l=a(this),o=a('<span class="'+c+'"></span>'),h=l.find("."+r);l.find("."+c)[0]||(l.append(o),h.on("mouseenter",function(){b.call(this,o,l,i)}).on("mouseleave",function(){l.hasClass(u)||(clearTimeout(s[i]),s[i]=setTimeout(function(){l.find("."+d).removeClass(n),l.find("."+y).removeClass(y+"d")},300))}),l.on("mouseleave",function(){clearTimeout(e[i]),p[i]=setTimeout(function(){l.hasClass(u)?o.css({height:0,top:o.position().top+o.height()/2,opacity:0}):o.css({width:0,left:o.position().left+o.width()/2,opacity:0})},t)})),h.find("a").each(function(){var t=a(this),i=(t.parent(),t.siblings("."+d));i[0]&&!t.children("."+y)[0]&&t.append('<span class="'+y+'"></span>'),t.off("click",f.clickThis).on("click",f.clickThis)})})},breadcrumb:function(){var t=".layui-breadcrumb";a(t+l).each(function(){var t=a(this),i="lay-separator",e=t.attr(i)||"/",l=t.find("a");l.next("span["+i+"]")[0]||(l.each(function(t){t!==l.length-1&&a(this).after("<span "+i+">"+e+"</span>")}),t.css("visibility","visible"))})},progress:function(){var t="layui-progress";a("."+t+l).each(function(){var i=a(this),e=i.find(".layui-progress-bar"),l=e.attr("lay-percent");e.css("width",function(){return/^.+\/.+$/.test(l)?100*new Function("return "+l)()+"%":l}()),i.attr("lay-showPercent")&&setTimeout(function(){e.html('<span class="'+t+'-text">'+l+"</span>")},350)})},collapse:function(){var t="layui-collapse";a("."+t+l).each(function(){var t=a(this).find(".layui-colla-item");t.each(function(){var t=a(this),i=t.find(".layui-colla-title"),e=t.find(".layui-colla-content"),l="none"===e.css("display");i.find(".layui-colla-icon").remove(),i.append('<i class="layui-icon layui-colla-icon">'+(l?"&#xe602;":"&#xe61a;")+"</i>"),i.off("click",f.collapse).on("click",f.collapse)})})}};return s[t]?s[t]():layui.each(s,function(t,a){a()})},s.prototype.render=s.prototype.init;var p=new s,b=a(document);p.render();var v=".layui-tab-title li";b.on("click",v,f.tabClick),b.on("click",f.hideTabMore),a(window).on("resize",f.tabAuto),t(e,p)});
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/lay/modules/flow.js b/pluss-wap-page/src/main/resources/static/resources/js/lay/modules/flow.js
new file mode 100644
index 0000000..8a80c05
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/lay/modules/flow.js
@@ -0,0 +1,2 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ ;layui.define("jquery",function(e){"use strict";var l=layui.$,o=function(e){},t='<i class="layui-anim layui-anim-rotate layui-anim-loop layui-icon ">&#xe63e;</i>';o.prototype.load=function(e){var o,i,n,r,a=this,c=0;e=e||{};var f=l(e.elem);if(f[0]){var m=l(e.scrollElem||document),u=e.mb||50,s=!("isAuto"in e)||e.isAuto,v=e.end||"没有更多了",y=e.scrollElem&&e.scrollElem!==document,d="<cite>加载更多</cite>",h=l('<div class="layui-flow-more"><a href="javascript:;">'+d+"</a></div>");f.find(".layui-flow-more")[0]||f.append(h);var p=function(e,t){e=l(e),h.before(e),t=0==t||null,t?h.html(v):h.find("a").html(d),i=t,o=null,n&&n()},g=function(){o=!0,h.find("a").html(t),"function"==typeof e.done&&e.done(++c,p)};if(g(),h.find("a").on("click",function(){l(this);i||o||g()}),e.isLazyimg)var n=a.lazyimg({elem:e.elem+" img",scrollElem:e.scrollElem});return s?(m.on("scroll",function(){var e=l(this),t=e.scrollTop();r&&clearTimeout(r),i||(r=setTimeout(function(){var i=y?e.height():l(window).height(),n=y?e.prop("scrollHeight"):document.documentElement.scrollHeight;n-t-i<=u&&(o||g())},100))}),a):a}},o.prototype.lazyimg=function(e){var o,t=this,i=0;e=e||{};var n=l(e.scrollElem||document),r=e.elem||"img",a=e.scrollElem&&e.scrollElem!==document,c=function(e,l){var o=n.scrollTop(),r=o+l,c=a?function(){return e.offset().top-n.offset().top+o}():e.offset().top;if(c>=o&&c<=r&&!e.attr("src")){var m=e.attr("lay-src");layui.img(m,function(){var l=t.lazyimg.elem.eq(i);e.attr("src",m).removeAttr("lay-src"),l[0]&&f(l),i++})}},f=function(e,o){var f=a?(o||n).height():l(window).height(),m=n.scrollTop(),u=m+f;if(t.lazyimg.elem=l(r),e)c(e,f);else for(var s=0;s<t.lazyimg.elem.length;s++){var v=t.lazyimg.elem.eq(s),y=a?function(){return v.offset().top-n.offset().top+m}():v.offset().top;if(c(v,f),i=s,y>u)break}};if(f(),!o){var m;n.on("scroll",function(){var e=l(this);m&&clearTimeout(m),m=setTimeout(function(){f(null,e)},50)}),o=!0}return f},e("flow",new o)});
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/lay/modules/form.js b/pluss-wap-page/src/main/resources/static/resources/js/lay/modules/form.js
new file mode 100644
index 0000000..daa8ce5
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/lay/modules/form.js
@@ -0,0 +1,2 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ ;layui.define("layer",function(e){"use strict";var t=layui.$,i=layui.layer,a=layui.hint(),n=layui.device(),l="form",r=".layui-form",s="layui-this",o="layui-hide",c="layui-disabled",u=function(){this.config={verify:{required:[/[\S]+/,"必填项不能为空"],phone:[/^1\d{10}$/,"请输入正确的手机号"],email:[/^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/,"邮箱格式不正确"],url:[/(^#)|(^http(s*):\/\/[^\s]+\.[^\s]+)/,"链接格式不正确"],number:function(e){if(!e||isNaN(e))return"只能填写数字"},date:[/^(\d{4})[-\/](\d{1}|0\d{1}|1[0-2])([-\/](\d{1}|0\d{1}|[1-2][0-9]|3[0-1]))*$/,"日期格式不正确"],identity:[/(^\d{15}$)|(^\d{17}(x|X|\d)$)/,"请输入正确的身份证号"]}}};u.prototype.set=function(e){var i=this;return t.extend(!0,i.config,e),i},u.prototype.verify=function(e){var i=this;return t.extend(!0,i.config.verify,e),i},u.prototype.on=function(e,t){return layui.onevent.call(this,l,e,t)},u.prototype.val=function(e,i){var a=t(r+'[lay-filter="'+e+'"]');a.each(function(e,a){var n=t(this);layui.each(i,function(e,t){var i,a=n.find('[name="'+e+'"]');a[0]&&(i=a[0].type,"checkbox"===i?a[0].checked=t:"radio"===i?a.each(function(){this.value===t&&(this.checked=!0)}):a.val(t))})}),f.render(null,e)},u.prototype.render=function(e,i){var n=this,u=t(r+function(){return i?'[lay-filter="'+i+'"]':""}()),d={select:function(){var e,i="请选择",a="layui-form-select",n="layui-select-title",r="layui-select-none",d="",f=u.find("select"),v=function(i,l){t(i.target).parent().hasClass(n)&&!l||(t("."+a).removeClass(a+"ed "+a+"up"),e&&d&&e.val(d)),e=null},y=function(i,u,f){var y,p=t(this),m=i.find("."+n),k=m.find("input"),x=i.find("dl"),g=x.children("dd"),b=this.selectedIndex;if(!u){var C=function(){var e=i.offset().top+i.outerHeight()+5-h.scrollTop(),t=x.outerHeight();b=p[0].selectedIndex,i.addClass(a+"ed"),g.removeClass(o),y=null,g.eq(b).addClass(s).siblings().removeClass(s),e+t>h.height()&&e>=t&&i.addClass(a+"up"),$()},w=function(e){i.removeClass(a+"ed "+a+"up"),k.blur(),y=null,e||T(k.val(),function(e){var i=p[0].selectedIndex;e&&(d=t(p[0].options[i]).html(),0===i&&d===k.attr("placeholder")&&(d=""),k.val(d||""))})},$=function(){var e=x.children("dd."+s);if(e[0]){var t=e.position().top,i=x.height(),a=e.height();t>i&&x.scrollTop(t+x.scrollTop()-i+a-5),t<0&&x.scrollTop(t+x.scrollTop()-5)}};m.on("click",function(e){i.hasClass(a+"ed")?w():(v(e,!0),C()),x.find("."+r).remove()}),m.find(".layui-edge").on("click",function(){k.focus()}),k.on("keyup",function(e){var t=e.keyCode;9===t&&C()}).on("keydown",function(e){var t=e.keyCode;9===t&&w();var i=function(t,a){var n,l;e.preventDefault();var r=function(){var e=x.children("dd."+s);if(x.children("dd."+o)[0]&&"next"===t){var i=x.children("dd:not(."+o+",."+c+")"),n=i.eq(0).index();if(n>=0&&n<e.index()&&!i.hasClass(s))return i.eq(0).prev()[0]?i.eq(0).prev():x.children(":last")}return a&&a[0]?a:y&&y[0]?y:e}();return l=r[t](),n=r[t]("dd:not(."+o+")"),l[0]?(y=r[t](),n[0]&&!n.hasClass(c)||!y[0]?(n.addClass(s).siblings().removeClass(s),void $()):i(t,y)):y=null};38===t&&i("prev"),40===t&&i("next"),13===t&&(e.preventDefault(),x.children("dd."+s).trigger("click"))});var T=function(e,i,a){var n=0;layui.each(g,function(){var i=t(this),l=i.text(),r=l.indexOf(e)===-1;(""===e||"blur"===a?e!==l:r)&&n++,"keyup"===a&&i[r?"addClass":"removeClass"](o)});var l=n===g.length;return i(l),l},j=function(e){var t=this.value,i=e.keyCode;return 9!==i&&13!==i&&37!==i&&38!==i&&39!==i&&40!==i&&(T(t,function(e){e?x.find("."+r)[0]||x.append('<p class="'+r+'">无匹配项</p>'):x.find("."+r).remove()},"keyup"),""===t&&x.find("."+r).remove(),void $())};f&&k.on("keyup",j).on("blur",function(i){var a=p[0].selectedIndex;e=k,d=t(p[0].options[a]).html(),0===a&&d===k.attr("placeholder")&&(d=""),setTimeout(function(){T(k.val(),function(e){d||k.val("")},"blur")},200)}),g.on("click",function(){var e=t(this),a=e.attr("lay-value"),n=p.attr("lay-filter");return!e.hasClass(c)&&(e.hasClass("layui-select-tips")?k.val(""):(k.val(e.text()),e.addClass(s)),e.siblings().removeClass(s),p.val(a).removeClass("layui-form-danger"),layui.event.call(this,l,"select("+n+")",{elem:p[0],value:a,othis:i}),w(!0),!1)}),i.find("dl>dt").on("click",function(e){return!1}),t(document).off("click",v).on("click",v)}};f.each(function(e,l){var r=t(this),o=r.next("."+a),u=this.disabled,d=l.value,f=t(l.options[l.selectedIndex]),v=l.options[0];if("string"==typeof r.attr("lay-ignore"))return r.show();var h="string"==typeof r.attr("lay-search"),p=v?v.value?i:v.innerHTML||i:i,m=t(['<div class="'+(h?"":"layui-unselect ")+a,(u?" layui-select-disabled":"")+'">','<div class="'+n+'">','<input type="text" placeholder="'+p+'" '+('value="'+(d?f.html():"")+'"')+(h?"":" readonly")+' class="layui-input'+(h?"":" layui-unselect")+(u?" "+c:"")+'">','<i class="layui-edge"></i></div>','<dl class="layui-anim layui-anim-upbit'+(r.find("optgroup")[0]?" layui-select-group":"")+'">',function(e){var t=[];return layui.each(e,function(e,a){0!==e||a.value?"optgroup"===a.tagName.toLowerCase()?t.push("<dt>"+a.label+"</dt>"):t.push('<dd lay-value="'+a.value+'" class="'+(d===a.value?s:"")+(a.disabled?" "+c:"")+'">'+a.innerHTML+"</dd>"):t.push('<dd lay-value="" class="layui-select-tips">'+(a.innerHTML||i)+"</dd>")}),0===t.length&&t.push('<dd lay-value="" class="'+c+'">没有选项</dd>'),t.join("")}(r.find("*"))+"</dl>","</div>"].join(""));o[0]&&o.remove(),r.after(m),y.call(this,m,u,h)})},checkbox:function(){var e={checkbox:["layui-form-checkbox","layui-form-checked","checkbox"],_switch:["layui-form-switch","layui-form-onswitch","switch"]},i=u.find("input[type=checkbox]"),a=function(e,i){var a=t(this);e.on("click",function(){var t=a.attr("lay-filter"),n=(a.attr("lay-text")||"").split("|");a[0].disabled||(a[0].checked?(a[0].checked=!1,e.removeClass(i[1]).find("em").text(n[1])):(a[0].checked=!0,e.addClass(i[1]).find("em").text(n[0])),layui.event.call(a[0],l,i[2]+"("+t+")",{elem:a[0],value:a[0].value,othis:e}))})};i.each(function(i,n){var l=t(this),r=l.attr("lay-skin"),s=(l.attr("lay-text")||"").split("|"),o=this.disabled;"switch"===r&&(r="_"+r);var u=e[r]||e.checkbox;if("string"==typeof l.attr("lay-ignore"))return l.show();var d=l.next("."+u[0]),f=t(['<div class="layui-unselect '+u[0],n.checked?" "+u[1]:"",o?" layui-checkbox-disbaled "+c:"",'"',r?' lay-skin="'+r+'"':"",">",function(){var e=n.title.replace(/\s/g,""),t={checkbox:[e?"<span>"+n.title+"</span>":"",'<i class="layui-icon layui-icon-ok"></i>'].join(""),_switch:"<em>"+((n.checked?s[0]:s[1])||"")+"</em><i></i>"};return t[r]||t.checkbox}(),"</div>"].join(""));d[0]&&d.remove(),l.after(f),a.call(this,f,u)})},radio:function(){var e="layui-form-radio",i=["&#xe643;","&#xe63f;"],a=u.find("input[type=radio]"),n=function(a){var n=t(this),s="layui-anim-scaleSpring";a.on("click",function(){var o=n[0].name,c=n.parents(r),u=n.attr("lay-filter"),d=c.find("input[name="+o.replace(/(\.|#|\[|\])/g,"\\$1")+"]");n[0].disabled||(layui.each(d,function(){var a=t(this).next("."+e);this.checked=!1,a.removeClass(e+"ed"),a.find(".layui-icon").removeClass(s).html(i[1])}),n[0].checked=!0,a.addClass(e+"ed"),a.find(".layui-icon").addClass(s).html(i[0]),layui.event.call(n[0],l,"radio("+u+")",{elem:n[0],value:n[0].value,othis:a}))})};a.each(function(a,l){var r=t(this),s=r.next("."+e),o=this.disabled;if("string"==typeof r.attr("lay-ignore"))return r.show();s[0]&&s.remove();var u=t(['<div class="layui-unselect '+e,l.checked?" "+e+"ed":"",(o?" layui-radio-disbaled "+c:"")+'">','<i class="layui-anim layui-icon">'+i[l.checked?0:1]+"</i>","<div>"+function(){var e=l.title||"";return"string"==typeof r.next().attr("lay-radio")&&(e=r.next().html(),r.next().remove()),e}()+"</div>","</div>"].join(""));r.after(u),n.call(this,u)})}};return e?d[e]?d[e]():a.error("不支持的"+e+"表单渲染"):layui.each(d,function(e,t){t()}),n};var d=function(){var e=t(this),a=f.config.verify,s=null,o="layui-form-danger",c={},u=e.parents(r),d=u.find("*[lay-verify]"),v=e.parents("form")[0],h=u.find("input,select,textarea"),y=e.attr("lay-filter");if(layui.each(d,function(e,l){var r=t(this),c=r.attr("lay-verify").split("|"),u=r.attr("lay-verType"),d=r.val();if(r.removeClass(o),layui.each(c,function(e,t){var c,f="",v="function"==typeof a[t];if(a[t]){var c=v?f=a[t](d,l):!a[t][0].test(d);if(f=f||a[t][1],c)return"tips"===u?i.tips(f,function(){return"string"==typeof r.attr("lay-ignore")||"select"!==l.tagName.toLowerCase()&&!/^checkbox|radio$/.test(l.type)?r:r.next()}(),{tips:1}):"alert"===u?i.alert(f,{title:"提示",shadeClose:!0}):i.msg(f,{icon:5,shift:6}),n.android||n.ios||l.focus(),r.addClass(o),s=!0}}),s)return s}),s)return!1;var p={};return layui.each(h,function(e,t){if(t.name=(t.name||"").replace(/^\s*|\s*&/,""),t.name){if(/^.*\[\]$/.test(t.name)){var i=t.name.match(/^(.*)\[\]$/g)[0];p[i]=0|p[i],t.name=t.name.replace(/^(.*)\[\]$/,"$1["+p[i]++ +"]")}/^checkbox|radio$/.test(t.type)&&!t.checked||(c[t.name]=t.value)}}),layui.event.call(this,l,"submit("+y+")",{elem:this,form:v,field:c})},f=new u,v=t(document),h=t(window);f.render(),v.on("reset",r,function(){var e=t(this).attr("lay-filter");setTimeout(function(){f.render(null,e)},50)}),v.on("submit",r,d).on("click","*[lay-submit]",d),e(l,f)});
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/lay/modules/jquery.js b/pluss-wap-page/src/main/resources/static/resources/js/lay/modules/jquery.js
new file mode 100644
index 0000000..242696a
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/lay/modules/jquery.js
@@ -0,0 +1,5 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ ;!function(e,t){"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(e,t){function n(e){var t=!!e&&"length"in e&&e.length,n=pe.type(e);return"function"!==n&&!pe.isWindow(e)&&("array"===n||0===t||"number"==typeof t&&t>0&&t-1 in e)}function r(e,t,n){if(pe.isFunction(t))return pe.grep(e,function(e,r){return!!t.call(e,r,e)!==n});if(t.nodeType)return pe.grep(e,function(e){return e===t!==n});if("string"==typeof t){if(Ce.test(t))return pe.filter(t,e,n);t=pe.filter(t,e)}return pe.grep(e,function(e){return pe.inArray(e,t)>-1!==n})}function i(e,t){do e=e[t];while(e&&1!==e.nodeType);return e}function o(e){var t={};return pe.each(e.match(De)||[],function(e,n){t[n]=!0}),t}function a(){re.addEventListener?(re.removeEventListener("DOMContentLoaded",s),e.removeEventListener("load",s)):(re.detachEvent("onreadystatechange",s),e.detachEvent("onload",s))}function s(){(re.addEventListener||"load"===e.event.type||"complete"===re.readyState)&&(a(),pe.ready())}function u(e,t,n){if(void 0===n&&1===e.nodeType){var r="data-"+t.replace(_e,"-$1").toLowerCase();if(n=e.getAttribute(r),"string"==typeof n){try{n="true"===n||"false"!==n&&("null"===n?null:+n+""===n?+n:qe.test(n)?pe.parseJSON(n):n)}catch(i){}pe.data(e,t,n)}else n=void 0}return n}function l(e){var t;for(t in e)if(("data"!==t||!pe.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}function c(e,t,n,r){if(He(e)){var i,o,a=pe.expando,s=e.nodeType,u=s?pe.cache:e,l=s?e[a]:e[a]&&a;if(l&&u[l]&&(r||u[l].data)||void 0!==n||"string"!=typeof t)return l||(l=s?e[a]=ne.pop()||pe.guid++:a),u[l]||(u[l]=s?{}:{toJSON:pe.noop}),"object"!=typeof t&&"function"!=typeof t||(r?u[l]=pe.extend(u[l],t):u[l].data=pe.extend(u[l].data,t)),o=u[l],r||(o.data||(o.data={}),o=o.data),void 0!==n&&(o[pe.camelCase(t)]=n),"string"==typeof t?(i=o[t],null==i&&(i=o[pe.camelCase(t)])):i=o,i}}function f(e,t,n){if(He(e)){var r,i,o=e.nodeType,a=o?pe.cache:e,s=o?e[pe.expando]:pe.expando;if(a[s]){if(t&&(r=n?a[s]:a[s].data)){pe.isArray(t)?t=t.concat(pe.map(t,pe.camelCase)):t in r?t=[t]:(t=pe.camelCase(t),t=t in r?[t]:t.split(" ")),i=t.length;for(;i--;)delete r[t[i]];if(n?!l(r):!pe.isEmptyObject(r))return}(n||(delete a[s].data,l(a[s])))&&(o?pe.cleanData([e],!0):fe.deleteExpando||a!=a.window?delete a[s]:a[s]=void 0)}}}function d(e,t,n,r){var i,o=1,a=20,s=r?function(){return r.cur()}:function(){return pe.css(e,t,"")},u=s(),l=n&&n[3]||(pe.cssNumber[t]?"":"px"),c=(pe.cssNumber[t]||"px"!==l&&+u)&&Me.exec(pe.css(e,t));if(c&&c[3]!==l){l=l||c[3],n=n||[],c=+u||1;do o=o||".5",c/=o,pe.style(e,t,c+l);while(o!==(o=s()/u)&&1!==o&&--a)}return n&&(c=+c||+u||0,i=n[1]?c+(n[1]+1)*n[2]:+n[2],r&&(r.unit=l,r.start=c,r.end=i)),i}function p(e){var t=ze.split("|"),n=e.createDocumentFragment();if(n.createElement)for(;t.length;)n.createElement(t.pop());return n}function h(e,t){var n,r,i=0,o="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):void 0;if(!o)for(o=[],n=e.childNodes||e;null!=(r=n[i]);i++)!t||pe.nodeName(r,t)?o.push(r):pe.merge(o,h(r,t));return void 0===t||t&&pe.nodeName(e,t)?pe.merge([e],o):o}function g(e,t){for(var n,r=0;null!=(n=e[r]);r++)pe._data(n,"globalEval",!t||pe._data(t[r],"globalEval"))}function m(e){Be.test(e.type)&&(e.defaultChecked=e.checked)}function y(e,t,n,r,i){for(var o,a,s,u,l,c,f,d=e.length,y=p(t),v=[],x=0;x<d;x++)if(a=e[x],a||0===a)if("object"===pe.type(a))pe.merge(v,a.nodeType?[a]:a);else if(Ue.test(a)){for(u=u||y.appendChild(t.createElement("div")),l=(We.exec(a)||["",""])[1].toLowerCase(),f=Xe[l]||Xe._default,u.innerHTML=f[1]+pe.htmlPrefilter(a)+f[2],o=f[0];o--;)u=u.lastChild;if(!fe.leadingWhitespace&&$e.test(a)&&v.push(t.createTextNode($e.exec(a)[0])),!fe.tbody)for(a="table"!==l||Ve.test(a)?"<table>"!==f[1]||Ve.test(a)?0:u:u.firstChild,o=a&&a.childNodes.length;o--;)pe.nodeName(c=a.childNodes[o],"tbody")&&!c.childNodes.length&&a.removeChild(c);for(pe.merge(v,u.childNodes),u.textContent="";u.firstChild;)u.removeChild(u.firstChild);u=y.lastChild}else v.push(t.createTextNode(a));for(u&&y.removeChild(u),fe.appendChecked||pe.grep(h(v,"input"),m),x=0;a=v[x++];)if(r&&pe.inArray(a,r)>-1)i&&i.push(a);else if(s=pe.contains(a.ownerDocument,a),u=h(y.appendChild(a),"script"),s&&g(u),n)for(o=0;a=u[o++];)Ie.test(a.type||"")&&n.push(a);return u=null,y}function v(){return!0}function x(){return!1}function b(){try{return re.activeElement}catch(e){}}function w(e,t,n,r,i,o){var a,s;if("object"==typeof t){"string"!=typeof n&&(r=r||n,n=void 0);for(s in t)w(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),i===!1)i=x;else if(!i)return e;return 1===o&&(a=i,i=function(e){return pe().off(e),a.apply(this,arguments)},i.guid=a.guid||(a.guid=pe.guid++)),e.each(function(){pe.event.add(this,t,i,r,n)})}function T(e,t){return pe.nodeName(e,"table")&&pe.nodeName(11!==t.nodeType?t:t.firstChild,"tr")?e.getElementsByTagName("tbody")[0]||e.appendChild(e.ownerDocument.createElement("tbody")):e}function C(e){return e.type=(null!==pe.find.attr(e,"type"))+"/"+e.type,e}function E(e){var t=it.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function N(e,t){if(1===t.nodeType&&pe.hasData(e)){var n,r,i,o=pe._data(e),a=pe._data(t,o),s=o.events;if(s){delete a.handle,a.events={};for(n in s)for(r=0,i=s[n].length;r<i;r++)pe.event.add(t,n,s[n][r])}a.data&&(a.data=pe.extend({},a.data))}}function k(e,t){var n,r,i;if(1===t.nodeType){if(n=t.nodeName.toLowerCase(),!fe.noCloneEvent&&t[pe.expando]){i=pe._data(t);for(r in i.events)pe.removeEvent(t,r,i.handle);t.removeAttribute(pe.expando)}"script"===n&&t.text!==e.text?(C(t).text=e.text,E(t)):"object"===n?(t.parentNode&&(t.outerHTML=e.outerHTML),fe.html5Clone&&e.innerHTML&&!pe.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):"input"===n&&Be.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):"option"===n?t.defaultSelected=t.selected=e.defaultSelected:"input"!==n&&"textarea"!==n||(t.defaultValue=e.defaultValue)}}function S(e,t,n,r){t=oe.apply([],t);var i,o,a,s,u,l,c=0,f=e.length,d=f-1,p=t[0],g=pe.isFunction(p);if(g||f>1&&"string"==typeof p&&!fe.checkClone&&rt.test(p))return e.each(function(i){var o=e.eq(i);g&&(t[0]=p.call(this,i,o.html())),S(o,t,n,r)});if(f&&(l=y(t,e[0].ownerDocument,!1,e,r),i=l.firstChild,1===l.childNodes.length&&(l=i),i||r)){for(s=pe.map(h(l,"script"),C),a=s.length;c<f;c++)o=l,c!==d&&(o=pe.clone(o,!0,!0),a&&pe.merge(s,h(o,"script"))),n.call(e[c],o,c);if(a)for(u=s[s.length-1].ownerDocument,pe.map(s,E),c=0;c<a;c++)o=s[c],Ie.test(o.type||"")&&!pe._data(o,"globalEval")&&pe.contains(u,o)&&(o.src?pe._evalUrl&&pe._evalUrl(o.src):pe.globalEval((o.text||o.textContent||o.innerHTML||"").replace(ot,"")));l=i=null}return e}function A(e,t,n){for(var r,i=t?pe.filter(t,e):e,o=0;null!=(r=i[o]);o++)n||1!==r.nodeType||pe.cleanData(h(r)),r.parentNode&&(n&&pe.contains(r.ownerDocument,r)&&g(h(r,"script")),r.parentNode.removeChild(r));return e}function D(e,t){var n=pe(t.createElement(e)).appendTo(t.body),r=pe.css(n[0],"display");return n.detach(),r}function j(e){var t=re,n=lt[e];return n||(n=D(e,t),"none"!==n&&n||(ut=(ut||pe("<iframe frameborder='0' width='0' height='0'/>")).appendTo(t.documentElement),t=(ut[0].contentWindow||ut[0].contentDocument).document,t.write(),t.close(),n=D(e,t),ut.detach()),lt[e]=n),n}function L(e,t){return{get:function(){return e()?void delete this.get:(this.get=t).apply(this,arguments)}}}function H(e){if(e in Et)return e;for(var t=e.charAt(0).toUpperCase()+e.slice(1),n=Ct.length;n--;)if(e=Ct[n]+t,e in Et)return e}function q(e,t){for(var n,r,i,o=[],a=0,s=e.length;a<s;a++)r=e[a],r.style&&(o[a]=pe._data(r,"olddisplay"),n=r.style.display,t?(o[a]||"none"!==n||(r.style.display=""),""===r.style.display&&Re(r)&&(o[a]=pe._data(r,"olddisplay",j(r.nodeName)))):(i=Re(r),(n&&"none"!==n||!i)&&pe._data(r,"olddisplay",i?n:pe.css(r,"display"))));for(a=0;a<s;a++)r=e[a],r.style&&(t&&"none"!==r.style.display&&""!==r.style.display||(r.style.display=t?o[a]||"":"none"));return e}function _(e,t,n){var r=bt.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function F(e,t,n,r,i){for(var o=n===(r?"border":"content")?4:"width"===t?1:0,a=0;o<4;o+=2)"margin"===n&&(a+=pe.css(e,n+Oe[o],!0,i)),r?("content"===n&&(a-=pe.css(e,"padding"+Oe[o],!0,i)),"margin"!==n&&(a-=pe.css(e,"border"+Oe[o]+"Width",!0,i))):(a+=pe.css(e,"padding"+Oe[o],!0,i),"padding"!==n&&(a+=pe.css(e,"border"+Oe[o]+"Width",!0,i)));return a}function M(t,n,r){var i=!0,o="width"===n?t.offsetWidth:t.offsetHeight,a=ht(t),s=fe.boxSizing&&"border-box"===pe.css(t,"boxSizing",!1,a);if(re.msFullscreenElement&&e.top!==e&&t.getClientRects().length&&(o=Math.round(100*t.getBoundingClientRect()[n])),o<=0||null==o){if(o=gt(t,n,a),(o<0||null==o)&&(o=t.style[n]),ft.test(o))return o;i=s&&(fe.boxSizingReliable()||o===t.style[n]),o=parseFloat(o)||0}return o+F(t,n,r||(s?"border":"content"),i,a)+"px"}function O(e,t,n,r,i){return new O.prototype.init(e,t,n,r,i)}function R(){return e.setTimeout(function(){Nt=void 0}),Nt=pe.now()}function P(e,t){var n,r={height:e},i=0;for(t=t?1:0;i<4;i+=2-t)n=Oe[i],r["margin"+n]=r["padding"+n]=e;return t&&(r.opacity=r.width=e),r}function B(e,t,n){for(var r,i=($.tweeners[t]||[]).concat($.tweeners["*"]),o=0,a=i.length;o<a;o++)if(r=i[o].call(n,t,e))return r}function W(e,t,n){var r,i,o,a,s,u,l,c,f=this,d={},p=e.style,h=e.nodeType&&Re(e),g=pe._data(e,"fxshow");n.queue||(s=pe._queueHooks(e,"fx"),null==s.unqueued&&(s.unqueued=0,u=s.empty.fire,s.empty.fire=function(){s.unqueued||u()}),s.unqueued++,f.always(function(){f.always(function(){s.unqueued--,pe.queue(e,"fx").length||s.empty.fire()})})),1===e.nodeType&&("height"in t||"width"in t)&&(n.overflow=[p.overflow,p.overflowX,p.overflowY],l=pe.css(e,"display"),c="none"===l?pe._data(e,"olddisplay")||j(e.nodeName):l,"inline"===c&&"none"===pe.css(e,"float")&&(fe.inlineBlockNeedsLayout&&"inline"!==j(e.nodeName)?p.zoom=1:p.display="inline-block")),n.overflow&&(p.overflow="hidden",fe.shrinkWrapBlocks()||f.always(function(){p.overflow=n.overflow[0],p.overflowX=n.overflow[1],p.overflowY=n.overflow[2]}));for(r in t)if(i=t[r],St.exec(i)){if(delete t[r],o=o||"toggle"===i,i===(h?"hide":"show")){if("show"!==i||!g||void 0===g[r])continue;h=!0}d[r]=g&&g[r]||pe.style(e,r)}else l=void 0;if(pe.isEmptyObject(d))"inline"===("none"===l?j(e.nodeName):l)&&(p.display=l);else{g?"hidden"in g&&(h=g.hidden):g=pe._data(e,"fxshow",{}),o&&(g.hidden=!h),h?pe(e).show():f.done(function(){pe(e).hide()}),f.done(function(){var t;pe._removeData(e,"fxshow");for(t in d)pe.style(e,t,d[t])});for(r in d)a=B(h?g[r]:0,r,f),r in g||(g[r]=a.start,h&&(a.end=a.start,a.start="width"===r||"height"===r?1:0))}}function I(e,t){var n,r,i,o,a;for(n in e)if(r=pe.camelCase(n),i=t[r],o=e[n],pe.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),a=pe.cssHooks[r],a&&"expand"in a){o=a.expand(o),delete e[r];for(n in o)n in e||(e[n]=o[n],t[n]=i)}else t[r]=i}function $(e,t,n){var r,i,o=0,a=$.prefilters.length,s=pe.Deferred().always(function(){delete u.elem}),u=function(){if(i)return!1;for(var t=Nt||R(),n=Math.max(0,l.startTime+l.duration-t),r=n/l.duration||0,o=1-r,a=0,u=l.tweens.length;a<u;a++)l.tweens[a].run(o);return s.notifyWith(e,[l,o,n]),o<1&&u?n:(s.resolveWith(e,[l]),!1)},l=s.promise({elem:e,props:pe.extend({},t),opts:pe.extend(!0,{specialEasing:{},easing:pe.easing._default},n),originalProperties:t,originalOptions:n,startTime:Nt||R(),duration:n.duration,tweens:[],createTween:function(t,n){var r=pe.Tween(e,l.opts,t,n,l.opts.specialEasing[t]||l.opts.easing);return l.tweens.push(r),r},stop:function(t){var n=0,r=t?l.tweens.length:0;if(i)return this;for(i=!0;n<r;n++)l.tweens[n].run(1);return t?(s.notifyWith(e,[l,1,0]),s.resolveWith(e,[l,t])):s.rejectWith(e,[l,t]),this}}),c=l.props;for(I(c,l.opts.specialEasing);o<a;o++)if(r=$.prefilters[o].call(l,e,c,l.opts))return pe.isFunction(r.stop)&&(pe._queueHooks(l.elem,l.opts.queue).stop=pe.proxy(r.stop,r)),r;return pe.map(c,B,l),pe.isFunction(l.opts.start)&&l.opts.start.call(e,l),pe.fx.timer(pe.extend(u,{elem:e,anim:l,queue:l.opts.queue})),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always)}function z(e){return pe.attr(e,"class")||""}function X(e){return function(t,n){"string"!=typeof t&&(n=t,t="*");var r,i=0,o=t.toLowerCase().match(De)||[];if(pe.isFunction(n))for(;r=o[i++];)"+"===r.charAt(0)?(r=r.slice(1)||"*",(e[r]=e[r]||[]).unshift(n)):(e[r]=e[r]||[]).push(n)}}function U(e,t,n,r){function i(s){var u;return o[s]=!0,pe.each(e[s]||[],function(e,s){var l=s(t,n,r);return"string"!=typeof l||a||o[l]?a?!(u=l):void 0:(t.dataTypes.unshift(l),i(l),!1)}),u}var o={},a=e===Qt;return i(t.dataTypes[0])||!o["*"]&&i("*")}function V(e,t){var n,r,i=pe.ajaxSettings.flatOptions||{};for(r in t)void 0!==t[r]&&((i[r]?e:n||(n={}))[r]=t[r]);return n&&pe.extend(!0,e,n),e}function Y(e,t,n){for(var r,i,o,a,s=e.contents,u=e.dataTypes;"*"===u[0];)u.shift(),void 0===i&&(i=e.mimeType||t.getResponseHeader("Content-Type"));if(i)for(a in s)if(s[a]&&s[a].test(i)){u.unshift(a);break}if(u[0]in n)o=u[0];else{for(a in n){if(!u[0]||e.converters[a+" "+u[0]]){o=a;break}r||(r=a)}o=o||r}if(o)return o!==u[0]&&u.unshift(o),n[o]}function J(e,t,n,r){var i,o,a,s,u,l={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)l[a.toLowerCase()]=e.converters[a];for(o=c.shift();o;)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!u&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u=o,o=c.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(a=l[u+" "+o]||l["* "+o],!a)for(i in l)if(s=i.split(" "),s[1]===o&&(a=l[u+" "+s[0]]||l["* "+s[0]])){a===!0?a=l[i]:l[i]!==!0&&(o=s[0],c.unshift(s[1]));break}if(a!==!0)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(f){return{state:"parsererror",error:a?f:"No conversion from "+u+" to "+o}}}return{state:"success",data:t}}function G(e){return e.style&&e.style.display||pe.css(e,"display")}function K(e){for(;e&&1===e.nodeType;){if("none"===G(e)||"hidden"===e.type)return!0;e=e.parentNode}return!1}function Q(e,t,n,r){var i;if(pe.isArray(t))pe.each(t,function(t,i){n||rn.test(e)?r(e,i):Q(e+"["+("object"==typeof i&&null!=i?t:"")+"]",i,n,r)});else if(n||"object"!==pe.type(t))r(e,t);else for(i in t)Q(e+"["+i+"]",t[i],n,r)}function Z(){try{return new e.XMLHttpRequest}catch(t){}}function ee(){try{return new e.ActiveXObject("Microsoft.XMLHTTP")}catch(t){}}function te(e){return pe.isWindow(e)?e:9===e.nodeType&&(e.defaultView||e.parentWindow)}var ne=[],re=e.document,ie=ne.slice,oe=ne.concat,ae=ne.push,se=ne.indexOf,ue={},le=ue.toString,ce=ue.hasOwnProperty,fe={},de="1.12.3",pe=function(e,t){return new pe.fn.init(e,t)},he=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,ge=/^-ms-/,me=/-([\da-z])/gi,ye=function(e,t){return t.toUpperCase()};pe.fn=pe.prototype={jquery:de,constructor:pe,selector:"",length:0,toArray:function(){return ie.call(this)},get:function(e){return null!=e?e<0?this[e+this.length]:this[e]:ie.call(this)},pushStack:function(e){var t=pe.merge(this.constructor(),e);return t.prevObject=this,t.context=this.context,t},each:function(e){return pe.each(this,e)},map:function(e){return this.pushStack(pe.map(this,function(t,n){return e.call(t,n,t)}))},slice:function(){return this.pushStack(ie.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(n>=0&&n<t?[this[n]]:[])},end:function(){return this.prevObject||this.constructor()},push:ae,sort:ne.sort,splice:ne.splice},pe.extend=pe.fn.extend=function(){var e,t,n,r,i,o,a=arguments[0]||{},s=1,u=arguments.length,l=!1;for("boolean"==typeof a&&(l=a,a=arguments[s]||{},s++),"object"==typeof a||pe.isFunction(a)||(a={}),s===u&&(a=this,s--);s<u;s++)if(null!=(i=arguments[s]))for(r in i)e=a[r],n=i[r],a!==n&&(l&&n&&(pe.isPlainObject(n)||(t=pe.isArray(n)))?(t?(t=!1,o=e&&pe.isArray(e)?e:[]):o=e&&pe.isPlainObject(e)?e:{},a[r]=pe.extend(l,o,n)):void 0!==n&&(a[r]=n));return a},pe.extend({expando:"jQuery"+(de+Math.random()).replace(/\D/g,""),isReady:!0,error:function(e){throw new Error(e)},noop:function(){},isFunction:function(e){return"function"===pe.type(e)},isArray:Array.isArray||function(e){return"array"===pe.type(e)},isWindow:function(e){return null!=e&&e==e.window},isNumeric:function(e){var t=e&&e.toString();return!pe.isArray(e)&&t-parseFloat(t)+1>=0},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},isPlainObject:function(e){var t;if(!e||"object"!==pe.type(e)||e.nodeType||pe.isWindow(e))return!1;try{if(e.constructor&&!ce.call(e,"constructor")&&!ce.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(n){return!1}if(!fe.ownFirst)for(t in e)return ce.call(e,t);for(t in e);return void 0===t||ce.call(e,t)},type:function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?ue[le.call(e)]||"object":typeof e},globalEval:function(t){t&&pe.trim(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(ge,"ms-").replace(me,ye)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t){var r,i=0;if(n(e))for(r=e.length;i<r&&t.call(e[i],i,e[i])!==!1;i++);else for(i in e)if(t.call(e[i],i,e[i])===!1)break;return e},trim:function(e){return null==e?"":(e+"").replace(he,"")},makeArray:function(e,t){var r=t||[];return null!=e&&(n(Object(e))?pe.merge(r,"string"==typeof e?[e]:e):ae.call(r,e)),r},inArray:function(e,t,n){var r;if(t){if(se)return se.call(t,e,n);for(r=t.length,n=n?n<0?Math.max(0,r+n):n:0;n<r;n++)if(n in t&&t[n]===e)return n}return-1},merge:function(e,t){for(var n=+t.length,r=0,i=e.length;r<n;)e[i++]=t[r++];if(n!==n)for(;void 0!==t[r];)e[i++]=t[r++];return e.length=i,e},grep:function(e,t,n){for(var r,i=[],o=0,a=e.length,s=!n;o<a;o++)r=!t(e[o],o),r!==s&&i.push(e[o]);return i},map:function(e,t,r){var i,o,a=0,s=[];if(n(e))for(i=e.length;a<i;a++)o=t(e[a],a,r),null!=o&&s.push(o);else for(a in e)o=t(e[a],a,r),null!=o&&s.push(o);return oe.apply([],s)},guid:1,proxy:function(e,t){var n,r,i;if("string"==typeof t&&(i=e[t],t=e,e=i),pe.isFunction(e))return n=ie.call(arguments,2),r=function(){return e.apply(t||this,n.concat(ie.call(arguments)))},r.guid=e.guid=e.guid||pe.guid++,r},now:function(){return+new Date},support:fe}),"function"==typeof Symbol&&(pe.fn[Symbol.iterator]=ne[Symbol.iterator]),pe.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(e,t){ue["[object "+t+"]"]=t.toLowerCase()});var ve=function(e){function t(e,t,n,r){var i,o,a,s,u,l,f,p,h=t&&t.ownerDocument,g=t?t.nodeType:9;if(n=n||[],"string"!=typeof e||!e||1!==g&&9!==g&&11!==g)return n;if(!r&&((t?t.ownerDocument||t:B)!==H&&L(t),t=t||H,_)){if(11!==g&&(l=ye.exec(e)))if(i=l[1]){if(9===g){if(!(a=t.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(h&&(a=h.getElementById(i))&&R(t,a)&&a.id===i)return n.push(a),n}else{if(l[2])return Q.apply(n,t.getElementsByTagName(e)),n;if((i=l[3])&&w.getElementsByClassName&&t.getElementsByClassName)return Q.apply(n,t.getElementsByClassName(i)),n}if(w.qsa&&!X[e+" "]&&(!F||!F.test(e))){if(1!==g)h=t,p=e;else if("object"!==t.nodeName.toLowerCase()){for((s=t.getAttribute("id"))?s=s.replace(xe,"\\$&"):t.setAttribute("id",s=P),f=N(e),o=f.length,u=de.test(s)?"#"+s:"[id='"+s+"']";o--;)f[o]=u+" "+d(f[o]);p=f.join(","),h=ve.test(e)&&c(t.parentNode)||t}if(p)try{return Q.apply(n,h.querySelectorAll(p)),n}catch(m){}finally{s===P&&t.removeAttribute("id")}}}return S(e.replace(se,"$1"),t,n,r)}function n(){function e(n,r){return t.push(n+" ")>T.cacheLength&&delete e[t.shift()],e[n+" "]=r}var t=[];return e}function r(e){return e[P]=!0,e}function i(e){var t=H.createElement("div");try{return!!e(t)}catch(n){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function o(e,t){for(var n=e.split("|"),r=n.length;r--;)T.attrHandle[n[r]]=t}function a(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&(~t.sourceIndex||V)-(~e.sourceIndex||V);if(r)return r;if(n)for(;n=n.nextSibling;)if(n===t)return-1;return e?1:-1}function s(e){return function(t){var n=t.nodeName.toLowerCase();return"input"===n&&t.type===e}}function u(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function l(e){return r(function(t){return t=+t,r(function(n,r){for(var i,o=e([],n.length,t),a=o.length;a--;)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}function c(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}function f(){}function d(e){for(var t=0,n=e.length,r="";t<n;t++)r+=e[t].value;return r}function p(e,t,n){var r=t.dir,i=n&&"parentNode"===r,o=I++;return t.first?function(t,n,o){for(;t=t[r];)if(1===t.nodeType||i)return e(t,n,o)}:function(t,n,a){var s,u,l,c=[W,o];if(a){for(;t=t[r];)if((1===t.nodeType||i)&&e(t,n,a))return!0}else for(;t=t[r];)if(1===t.nodeType||i){if(l=t[P]||(t[P]={}),u=l[t.uniqueID]||(l[t.uniqueID]={}),(s=u[r])&&s[0]===W&&s[1]===o)return c[2]=s[2];if(u[r]=c,c[2]=e(t,n,a))return!0}}}function h(e){return e.length>1?function(t,n,r){for(var i=e.length;i--;)if(!e[i](t,n,r))return!1;return!0}:e[0]}function g(e,n,r){for(var i=0,o=n.length;i<o;i++)t(e,n[i],r);return r}function m(e,t,n,r,i){for(var o,a=[],s=0,u=e.length,l=null!=t;s<u;s++)(o=e[s])&&(n&&!n(o,r,i)||(a.push(o),l&&t.push(s)));return a}function y(e,t,n,i,o,a){return i&&!i[P]&&(i=y(i)),o&&!o[P]&&(o=y(o,a)),r(function(r,a,s,u){var l,c,f,d=[],p=[],h=a.length,y=r||g(t||"*",s.nodeType?[s]:s,[]),v=!e||!r&&t?y:m(y,d,e,s,u),x=n?o||(r?e:h||i)?[]:a:v;if(n&&n(v,x,s,u),i)for(l=m(x,p),i(l,[],s,u),c=l.length;c--;)(f=l[c])&&(x[p[c]]=!(v[p[c]]=f));if(r){if(o||e){if(o){for(l=[],c=x.length;c--;)(f=x[c])&&l.push(v[c]=f);o(null,x=[],l,u)}for(c=x.length;c--;)(f=x[c])&&(l=o?ee(r,f):d[c])>-1&&(r[l]=!(a[l]=f))}}else x=m(x===a?x.splice(h,x.length):x),o?o(null,a,x,u):Q.apply(a,x)})}function v(e){for(var t,n,r,i=e.length,o=T.relative[e[0].type],a=o||T.relative[" "],s=o?1:0,u=p(function(e){return e===t},a,!0),l=p(function(e){return ee(t,e)>-1},a,!0),c=[function(e,n,r){var i=!o&&(r||n!==A)||((t=n).nodeType?u(e,n,r):l(e,n,r));return t=null,i}];s<i;s++)if(n=T.relative[e[s].type])c=[p(h(c),n)];else{if(n=T.filter[e[s].type].apply(null,e[s].matches),n[P]){for(r=++s;r<i&&!T.relative[e[r].type];r++);return y(s>1&&h(c),s>1&&d(e.slice(0,s-1).concat({value:" "===e[s-2].type?"*":""})).replace(se,"$1"),n,s<r&&v(e.slice(s,r)),r<i&&v(e=e.slice(r)),r<i&&d(e))}c.push(n)}return h(c)}function x(e,n){var i=n.length>0,o=e.length>0,a=function(r,a,s,u,l){var c,f,d,p=0,h="0",g=r&&[],y=[],v=A,x=r||o&&T.find.TAG("*",l),b=W+=null==v?1:Math.random()||.1,w=x.length;for(l&&(A=a===H||a||l);h!==w&&null!=(c=x[h]);h++){if(o&&c){for(f=0,a||c.ownerDocument===H||(L(c),s=!_);d=e[f++];)if(d(c,a||H,s)){u.push(c);break}l&&(W=b)}i&&((c=!d&&c)&&p--,r&&g.push(c))}if(p+=h,i&&h!==p){for(f=0;d=n[f++];)d(g,y,a,s);if(r){if(p>0)for(;h--;)g[h]||y[h]||(y[h]=G.call(u));y=m(y)}Q.apply(u,y),l&&!r&&y.length>0&&p+n.length>1&&t.uniqueSort(u)}return l&&(W=b,A=v),g};return i?r(a):a}var b,w,T,C,E,N,k,S,A,D,j,L,H,q,_,F,M,O,R,P="sizzle"+1*new Date,B=e.document,W=0,I=0,$=n(),z=n(),X=n(),U=function(e,t){return e===t&&(j=!0),0},V=1<<31,Y={}.hasOwnProperty,J=[],G=J.pop,K=J.push,Q=J.push,Z=J.slice,ee=function(e,t){for(var n=0,r=e.length;n<r;n++)if(e[n]===t)return n;return-1},te="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",ne="[\\x20\\t\\r\\n\\f]",re="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",ie="\\["+ne+"*("+re+")(?:"+ne+"*([*^$|!~]?=)"+ne+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+re+"))|)"+ne+"*\\]",oe=":("+re+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+ie+")*)|.*)\\)|)",ae=new RegExp(ne+"+","g"),se=new RegExp("^"+ne+"+|((?:^|[^\\\\])(?:\\\\.)*)"+ne+"+$","g"),ue=new RegExp("^"+ne+"*,"+ne+"*"),le=new RegExp("^"+ne+"*([>+~]|"+ne+")"+ne+"*"),ce=new RegExp("="+ne+"*([^\\]'\"]*?)"+ne+"*\\]","g"),fe=new RegExp(oe),de=new RegExp("^"+re+"$"),pe={ID:new RegExp("^#("+re+")"),CLASS:new RegExp("^\\.("+re+")"),TAG:new RegExp("^("+re+"|[*])"),ATTR:new RegExp("^"+ie),PSEUDO:new RegExp("^"+oe),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+ne+"*(even|odd|(([+-]|)(\\d*)n|)"+ne+"*(?:([+-]|)"+ne+"*(\\d+)|))"+ne+"*\\)|)","i"),bool:new RegExp("^(?:"+te+")$","i"),needsContext:new RegExp("^"+ne+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+ne+"*((?:-\\d)?\\d*)"+ne+"*\\)|)(?=[^-]|$)","i")},he=/^(?:input|select|textarea|button)$/i,ge=/^h\d$/i,me=/^[^{]+\{\s*\[native \w/,ye=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ve=/[+~]/,xe=/'|\\/g,be=new RegExp("\\\\([\\da-f]{1,6}"+ne+"?|("+ne+")|.)","ig"),we=function(e,t,n){var r="0x"+t-65536;return r!==r||n?t:r<0?String.fromCharCode(r+65536):String.fromCharCode(r>>10|55296,1023&r|56320)},Te=function(){L()};try{Q.apply(J=Z.call(B.childNodes),B.childNodes),J[B.childNodes.length].nodeType}catch(Ce){Q={apply:J.length?function(e,t){K.apply(e,Z.call(t))}:function(e,t){for(var n=e.length,r=0;e[n++]=t[r++];);e.length=n-1}}}w=t.support={},E=t.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return!!t&&"HTML"!==t.nodeName},L=t.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:B;return r!==H&&9===r.nodeType&&r.documentElement?(H=r,q=H.documentElement,_=!E(H),(n=H.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",Te,!1):n.attachEvent&&n.attachEvent("onunload",Te)),w.attributes=i(function(e){return e.className="i",!e.getAttribute("className")}),w.getElementsByTagName=i(function(e){return e.appendChild(H.createComment("")),!e.getElementsByTagName("*").length}),w.getElementsByClassName=me.test(H.getElementsByClassName),w.getById=i(function(e){return q.appendChild(e).id=P,!H.getElementsByName||!H.getElementsByName(P).length}),w.getById?(T.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&_){var n=t.getElementById(e);return n?[n]:[]}},T.filter.ID=function(e){var t=e.replace(be,we);return function(e){return e.getAttribute("id")===t}}):(delete T.find.ID,T.filter.ID=function(e){var t=e.replace(be,we);return function(e){var n="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return n&&n.value===t}}),T.find.TAG=w.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):w.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){for(;n=o[i++];)1===n.nodeType&&r.push(n);return r}return o},T.find.CLASS=w.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&_)return t.getElementsByClassName(e)},M=[],F=[],(w.qsa=me.test(H.querySelectorAll))&&(i(function(e){q.appendChild(e).innerHTML="<a id='"+P+"'></a><select id='"+P+"-\r\\' msallowcapture=''><option selected=''></option></select>",e.querySelectorAll("[msallowcapture^='']").length&&F.push("[*^$]="+ne+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||F.push("\\["+ne+"*(?:value|"+te+")"),e.querySelectorAll("[id~="+P+"-]").length||F.push("~="),e.querySelectorAll(":checked").length||F.push(":checked"),e.querySelectorAll("a#"+P+"+*").length||F.push(".#.+[+~]")}),i(function(e){var t=H.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&F.push("name"+ne+"*[*^$|!~]?="),e.querySelectorAll(":enabled").length||F.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),F.push(",.*:")})),(w.matchesSelector=me.test(O=q.matches||q.webkitMatchesSelector||q.mozMatchesSelector||q.oMatchesSelector||q.msMatchesSelector))&&i(function(e){w.disconnectedMatch=O.call(e,"div"),O.call(e,"[s!='']:x"),M.push("!=",oe)}),F=F.length&&new RegExp(F.join("|")),M=M.length&&new RegExp(M.join("|")),t=me.test(q.compareDocumentPosition),R=t||me.test(q.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)for(;t=t.parentNode;)if(t===e)return!0;return!1},U=t?function(e,t){if(e===t)return j=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n?n:(n=(e.ownerDocument||e)===(t.ownerDocument||t)?e.compareDocumentPosition(t):1,1&n||!w.sortDetached&&t.compareDocumentPosition(e)===n?e===H||e.ownerDocument===B&&R(B,e)?-1:t===H||t.ownerDocument===B&&R(B,t)?1:D?ee(D,e)-ee(D,t):0:4&n?-1:1)}:function(e,t){if(e===t)return j=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,s=[e],u=[t];if(!i||!o)return e===H?-1:t===H?1:i?-1:o?1:D?ee(D,e)-ee(D,t):0;if(i===o)return a(e,t);for(n=e;n=n.parentNode;)s.unshift(n);for(n=t;n=n.parentNode;)u.unshift(n);for(;s[r]===u[r];)r++;return r?a(s[r],u[r]):s[r]===B?-1:u[r]===B?1:0},H):H},t.matches=function(e,n){return t(e,null,null,n)},t.matchesSelector=function(e,n){if((e.ownerDocument||e)!==H&&L(e),n=n.replace(ce,"='$1']"),w.matchesSelector&&_&&!X[n+" "]&&(!M||!M.test(n))&&(!F||!F.test(n)))try{var r=O.call(e,n);if(r||w.disconnectedMatch||e.document&&11!==e.document.nodeType)return r}catch(i){}return t(n,H,null,[e]).length>0},t.contains=function(e,t){return(e.ownerDocument||e)!==H&&L(e),R(e,t)},t.attr=function(e,t){(e.ownerDocument||e)!==H&&L(e);var n=T.attrHandle[t.toLowerCase()],r=n&&Y.call(T.attrHandle,t.toLowerCase())?n(e,t,!_):void 0;return void 0!==r?r:w.attributes||!_?e.getAttribute(t):(r=e.getAttributeNode(t))&&r.specified?r.value:null},t.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},t.uniqueSort=function(e){var t,n=[],r=0,i=0;if(j=!w.detectDuplicates,D=!w.sortStable&&e.slice(0),e.sort(U),j){for(;t=e[i++];)t===e[i]&&(r=n.push(i));for(;r--;)e.splice(n[r],1)}return D=null,e},C=t.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=C(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r++];)n+=C(t);return n},T=t.selectors={cacheLength:50,createPseudo:r,match:pe,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(be,we),e[3]=(e[3]||e[4]||e[5]||"").replace(be,we),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||t.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&t.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return pe.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&fe.test(n)&&(t=N(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(be,we).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=$[e+" "];return t||(t=new RegExp("(^|"+ne+")"+e+"("+ne+"|$)"))&&$(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(e,n,r){return function(i){var o=t.attr(i,e);return null==o?"!="===n:!n||(o+="","="===n?o===r:"!="===n?o!==r:"^="===n?r&&0===o.indexOf(r):"*="===n?r&&o.indexOf(r)>-1:"$="===n?r&&o.slice(-r.length)===r:"~="===n?(" "+o.replace(ae," ")+" ").indexOf(r)>-1:"|="===n&&(o===r||o.slice(0,r.length+1)===r+"-"))}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,u){var l,c,f,d,p,h,g=o!==a?"nextSibling":"previousSibling",m=t.parentNode,y=s&&t.nodeName.toLowerCase(),v=!u&&!s,x=!1;if(m){if(o){for(;g;){for(d=t;d=d[g];)if(s?d.nodeName.toLowerCase()===y:1===d.nodeType)return!1;h=g="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?m.firstChild:m.lastChild],a&&v){for(d=m,f=d[P]||(d[P]={}),c=f[d.uniqueID]||(f[d.uniqueID]={}),
+l=c[e]||[],p=l[0]===W&&l[1],x=p&&l[2],d=p&&m.childNodes[p];d=++p&&d&&d[g]||(x=p=0)||h.pop();)if(1===d.nodeType&&++x&&d===t){c[e]=[W,p,x];break}}else if(v&&(d=t,f=d[P]||(d[P]={}),c=f[d.uniqueID]||(f[d.uniqueID]={}),l=c[e]||[],p=l[0]===W&&l[1],x=p),x===!1)for(;(d=++p&&d&&d[g]||(x=p=0)||h.pop())&&((s?d.nodeName.toLowerCase()!==y:1!==d.nodeType)||!++x||(v&&(f=d[P]||(d[P]={}),c=f[d.uniqueID]||(f[d.uniqueID]={}),c[e]=[W,x]),d!==t)););return x-=i,x===r||x%r===0&&x/r>=0}}},PSEUDO:function(e,n){var i,o=T.pseudos[e]||T.setFilters[e.toLowerCase()]||t.error("unsupported pseudo: "+e);return o[P]?o(n):o.length>1?(i=[e,e,"",n],T.setFilters.hasOwnProperty(e.toLowerCase())?r(function(e,t){for(var r,i=o(e,n),a=i.length;a--;)r=ee(e,i[a]),e[r]=!(t[r]=i[a])}):function(e){return o(e,0,i)}):o}},pseudos:{not:r(function(e){var t=[],n=[],i=k(e.replace(se,"$1"));return i[P]?r(function(e,t,n,r){for(var o,a=i(e,null,r,[]),s=e.length;s--;)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,r,o){return t[0]=e,i(t,null,o,n),t[0]=null,!n.pop()}}),has:r(function(e){return function(n){return t(e,n).length>0}}),contains:r(function(e){return e=e.replace(be,we),function(t){return(t.textContent||t.innerText||C(t)).indexOf(e)>-1}}),lang:r(function(e){return de.test(e||"")||t.error("unsupported lang: "+e),e=e.replace(be,we).toLowerCase(),function(t){var n;do if(n=_?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang"))return n=n.toLowerCase(),n===e||0===n.indexOf(e+"-");while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===q},focus:function(e){return e===H.activeElement&&(!H.hasFocus||H.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!T.pseudos.empty(e)},header:function(e){return ge.test(e.nodeName)},input:function(e){return he.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:l(function(){return[0]}),last:l(function(e,t){return[t-1]}),eq:l(function(e,t,n){return[n<0?n+t:n]}),even:l(function(e,t){for(var n=0;n<t;n+=2)e.push(n);return e}),odd:l(function(e,t){for(var n=1;n<t;n+=2)e.push(n);return e}),lt:l(function(e,t,n){for(var r=n<0?n+t:n;--r>=0;)e.push(r);return e}),gt:l(function(e,t,n){for(var r=n<0?n+t:n;++r<t;)e.push(r);return e})}},T.pseudos.nth=T.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})T.pseudos[b]=s(b);for(b in{submit:!0,reset:!0})T.pseudos[b]=u(b);return f.prototype=T.filters=T.pseudos,T.setFilters=new f,N=t.tokenize=function(e,n){var r,i,o,a,s,u,l,c=z[e+" "];if(c)return n?0:c.slice(0);for(s=e,u=[],l=T.preFilter;s;){r&&!(i=ue.exec(s))||(i&&(s=s.slice(i[0].length)||s),u.push(o=[])),r=!1,(i=le.exec(s))&&(r=i.shift(),o.push({value:r,type:i[0].replace(se," ")}),s=s.slice(r.length));for(a in T.filter)!(i=pe[a].exec(s))||l[a]&&!(i=l[a](i))||(r=i.shift(),o.push({value:r,type:a,matches:i}),s=s.slice(r.length));if(!r)break}return n?s.length:s?t.error(e):z(e,u).slice(0)},k=t.compile=function(e,t){var n,r=[],i=[],o=X[e+" "];if(!o){for(t||(t=N(e)),n=t.length;n--;)o=v(t[n]),o[P]?r.push(o):i.push(o);o=X(e,x(i,r)),o.selector=e}return o},S=t.select=function(e,t,n,r){var i,o,a,s,u,l="function"==typeof e&&e,f=!r&&N(e=l.selector||e);if(n=n||[],1===f.length){if(o=f[0]=f[0].slice(0),o.length>2&&"ID"===(a=o[0]).type&&w.getById&&9===t.nodeType&&_&&T.relative[o[1].type]){if(t=(T.find.ID(a.matches[0].replace(be,we),t)||[])[0],!t)return n;l&&(t=t.parentNode),e=e.slice(o.shift().value.length)}for(i=pe.needsContext.test(e)?0:o.length;i--&&(a=o[i],!T.relative[s=a.type]);)if((u=T.find[s])&&(r=u(a.matches[0].replace(be,we),ve.test(o[0].type)&&c(t.parentNode)||t))){if(o.splice(i,1),e=r.length&&d(o),!e)return Q.apply(n,r),n;break}}return(l||k(e,f))(r,t,!_,n,!t||ve.test(e)&&c(t.parentNode)||t),n},w.sortStable=P.split("").sort(U).join("")===P,w.detectDuplicates=!!j,L(),w.sortDetached=i(function(e){return 1&e.compareDocumentPosition(H.createElement("div"))}),i(function(e){return e.innerHTML="<a href='#'></a>","#"===e.firstChild.getAttribute("href")})||o("type|href|height|width",function(e,t,n){if(!n)return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),w.attributes&&i(function(e){return e.innerHTML="<input/>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||o("value",function(e,t,n){if(!n&&"input"===e.nodeName.toLowerCase())return e.defaultValue}),i(function(e){return null==e.getAttribute("disabled")})||o(te,function(e,t,n){var r;if(!n)return e[t]===!0?t.toLowerCase():(r=e.getAttributeNode(t))&&r.specified?r.value:null}),t}(e);pe.find=ve,pe.expr=ve.selectors,pe.expr[":"]=pe.expr.pseudos,pe.uniqueSort=pe.unique=ve.uniqueSort,pe.text=ve.getText,pe.isXMLDoc=ve.isXML,pe.contains=ve.contains;var xe=function(e,t,n){for(var r=[],i=void 0!==n;(e=e[t])&&9!==e.nodeType;)if(1===e.nodeType){if(i&&pe(e).is(n))break;r.push(e)}return r},be=function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},we=pe.expr.match.needsContext,Te=/^<([\w-]+)\s*\/?>(?:<\/\1>|)$/,Ce=/^.[^:#\[\.,]*$/;pe.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?pe.find.matchesSelector(r,e)?[r]:[]:pe.find.matches(e,pe.grep(t,function(e){return 1===e.nodeType}))},pe.fn.extend({find:function(e){var t,n=[],r=this,i=r.length;if("string"!=typeof e)return this.pushStack(pe(e).filter(function(){for(t=0;t<i;t++)if(pe.contains(r[t],this))return!0}));for(t=0;t<i;t++)pe.find(e,r[t],n);return n=this.pushStack(i>1?pe.unique(n):n),n.selector=this.selector?this.selector+" "+e:e,n},filter:function(e){return this.pushStack(r(this,e||[],!1))},not:function(e){return this.pushStack(r(this,e||[],!0))},is:function(e){return!!r(this,"string"==typeof e&&we.test(e)?pe(e):e||[],!1).length}});var Ee,Ne=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,ke=pe.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||Ee,"string"==typeof e){if(r="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:Ne.exec(e),!r||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof pe?t[0]:t,pe.merge(this,pe.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:re,!0)),Te.test(r[1])&&pe.isPlainObject(t))for(r in t)pe.isFunction(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}if(i=re.getElementById(r[2]),i&&i.parentNode){if(i.id!==r[2])return Ee.find(e);this.length=1,this[0]=i}return this.context=re,this.selector=e,this}return e.nodeType?(this.context=this[0]=e,this.length=1,this):pe.isFunction(e)?"undefined"!=typeof n.ready?n.ready(e):e(pe):(void 0!==e.selector&&(this.selector=e.selector,this.context=e.context),pe.makeArray(e,this))};ke.prototype=pe.fn,Ee=pe(re);var Se=/^(?:parents|prev(?:Until|All))/,Ae={children:!0,contents:!0,next:!0,prev:!0};pe.fn.extend({has:function(e){var t,n=pe(e,this),r=n.length;return this.filter(function(){for(t=0;t<r;t++)if(pe.contains(this,n[t]))return!0})},closest:function(e,t){for(var n,r=0,i=this.length,o=[],a=we.test(e)||"string"!=typeof e?pe(e,t||this.context):0;r<i;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(n.nodeType<11&&(a?a.index(n)>-1:1===n.nodeType&&pe.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(o.length>1?pe.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?pe.inArray(this[0],pe(e)):pe.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(pe.uniqueSort(pe.merge(this.get(),pe(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),pe.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return xe(e,"parentNode")},parentsUntil:function(e,t,n){return xe(e,"parentNode",n)},next:function(e){return i(e,"nextSibling")},prev:function(e){return i(e,"previousSibling")},nextAll:function(e){return xe(e,"nextSibling")},prevAll:function(e){return xe(e,"previousSibling")},nextUntil:function(e,t,n){return xe(e,"nextSibling",n)},prevUntil:function(e,t,n){return xe(e,"previousSibling",n)},siblings:function(e){return be((e.parentNode||{}).firstChild,e)},children:function(e){return be(e.firstChild)},contents:function(e){return pe.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:pe.merge([],e.childNodes)}},function(e,t){pe.fn[e]=function(n,r){var i=pe.map(this,t,n);return"Until"!==e.slice(-5)&&(r=n),r&&"string"==typeof r&&(i=pe.filter(r,i)),this.length>1&&(Ae[e]||(i=pe.uniqueSort(i)),Se.test(e)&&(i=i.reverse())),this.pushStack(i)}});var De=/\S+/g;pe.Callbacks=function(e){e="string"==typeof e?o(e):pe.extend({},e);var t,n,r,i,a=[],s=[],u=-1,l=function(){for(i=e.once,r=t=!0;s.length;u=-1)for(n=s.shift();++u<a.length;)a[u].apply(n[0],n[1])===!1&&e.stopOnFalse&&(u=a.length,n=!1);e.memory||(n=!1),t=!1,i&&(a=n?[]:"")},c={add:function(){return a&&(n&&!t&&(u=a.length-1,s.push(n)),function r(t){pe.each(t,function(t,n){pe.isFunction(n)?e.unique&&c.has(n)||a.push(n):n&&n.length&&"string"!==pe.type(n)&&r(n)})}(arguments),n&&!t&&l()),this},remove:function(){return pe.each(arguments,function(e,t){for(var n;(n=pe.inArray(t,a,n))>-1;)a.splice(n,1),n<=u&&u--}),this},has:function(e){return e?pe.inArray(e,a)>-1:a.length>0},empty:function(){return a&&(a=[]),this},disable:function(){return i=s=[],a=n="",this},disabled:function(){return!a},lock:function(){return i=!0,n||c.disable(),this},locked:function(){return!!i},fireWith:function(e,n){return i||(n=n||[],n=[e,n.slice?n.slice():n],s.push(n),t||l()),this},fire:function(){return c.fireWith(this,arguments),this},fired:function(){return!!r}};return c},pe.extend({Deferred:function(e){var t=[["resolve","done",pe.Callbacks("once memory"),"resolved"],["reject","fail",pe.Callbacks("once memory"),"rejected"],["notify","progress",pe.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return pe.Deferred(function(n){pe.each(t,function(t,o){var a=pe.isFunction(e[t])&&e[t];i[o[1]](function(){var e=a&&a.apply(this,arguments);e&&pe.isFunction(e.promise)?e.promise().progress(n.notify).done(n.resolve).fail(n.reject):n[o[0]+"With"](this===r?n.promise():this,a?[e]:arguments)})}),e=null}).promise()},promise:function(e){return null!=e?pe.extend(e,r):r}},i={};return r.pipe=r.then,pe.each(t,function(e,o){var a=o[2],s=o[3];r[o[1]]=a.add,s&&a.add(function(){n=s},t[1^e][2].disable,t[2][2].lock),i[o[0]]=function(){return i[o[0]+"With"](this===i?r:this,arguments),this},i[o[0]+"With"]=a.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t,n,r,i=0,o=ie.call(arguments),a=o.length,s=1!==a||e&&pe.isFunction(e.promise)?a:0,u=1===s?e:pe.Deferred(),l=function(e,n,r){return function(i){n[e]=this,r[e]=arguments.length>1?ie.call(arguments):i,r===t?u.notifyWith(n,r):--s||u.resolveWith(n,r)}};if(a>1)for(t=new Array(a),n=new Array(a),r=new Array(a);i<a;i++)o[i]&&pe.isFunction(o[i].promise)?o[i].promise().progress(l(i,n,t)).done(l(i,r,o)).fail(u.reject):--s;return s||u.resolveWith(r,o),u.promise()}});var je;pe.fn.ready=function(e){return pe.ready.promise().done(e),this},pe.extend({isReady:!1,readyWait:1,holdReady:function(e){e?pe.readyWait++:pe.ready(!0)},ready:function(e){(e===!0?--pe.readyWait:pe.isReady)||(pe.isReady=!0,e!==!0&&--pe.readyWait>0||(je.resolveWith(re,[pe]),pe.fn.triggerHandler&&(pe(re).triggerHandler("ready"),pe(re).off("ready"))))}}),pe.ready.promise=function(t){if(!je)if(je=pe.Deferred(),"complete"===re.readyState||"loading"!==re.readyState&&!re.documentElement.doScroll)e.setTimeout(pe.ready);else if(re.addEventListener)re.addEventListener("DOMContentLoaded",s),e.addEventListener("load",s);else{re.attachEvent("onreadystatechange",s),e.attachEvent("onload",s);var n=!1;try{n=null==e.frameElement&&re.documentElement}catch(r){}n&&n.doScroll&&!function i(){if(!pe.isReady){try{n.doScroll("left")}catch(t){return e.setTimeout(i,50)}a(),pe.ready()}}()}return je.promise(t)},pe.ready.promise();var Le;for(Le in pe(fe))break;fe.ownFirst="0"===Le,fe.inlineBlockNeedsLayout=!1,pe(function(){var e,t,n,r;n=re.getElementsByTagName("body")[0],n&&n.style&&(t=re.createElement("div"),r=re.createElement("div"),r.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",n.appendChild(r).appendChild(t),"undefined"!=typeof t.style.zoom&&(t.style.cssText="display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1",fe.inlineBlockNeedsLayout=e=3===t.offsetWidth,e&&(n.style.zoom=1)),n.removeChild(r))}),function(){var e=re.createElement("div");fe.deleteExpando=!0;try{delete e.test}catch(t){fe.deleteExpando=!1}e=null}();var He=function(e){var t=pe.noData[(e.nodeName+" ").toLowerCase()],n=+e.nodeType||1;return(1===n||9===n)&&(!t||t!==!0&&e.getAttribute("classid")===t)},qe=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,_e=/([A-Z])/g;pe.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(e){return e=e.nodeType?pe.cache[e[pe.expando]]:e[pe.expando],!!e&&!l(e)},data:function(e,t,n){return c(e,t,n)},removeData:function(e,t){return f(e,t)},_data:function(e,t,n){return c(e,t,n,!0)},_removeData:function(e,t){return f(e,t,!0)}}),pe.fn.extend({data:function(e,t){var n,r,i,o=this[0],a=o&&o.attributes;if(void 0===e){if(this.length&&(i=pe.data(o),1===o.nodeType&&!pe._data(o,"parsedAttrs"))){for(n=a.length;n--;)a[n]&&(r=a[n].name,0===r.indexOf("data-")&&(r=pe.camelCase(r.slice(5)),u(o,r,i[r])));pe._data(o,"parsedAttrs",!0)}return i}return"object"==typeof e?this.each(function(){pe.data(this,e)}):arguments.length>1?this.each(function(){pe.data(this,e,t)}):o?u(o,e,pe.data(o,e)):void 0},removeData:function(e){return this.each(function(){pe.removeData(this,e)})}}),pe.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=pe._data(e,t),n&&(!r||pe.isArray(n)?r=pe._data(e,t,pe.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=pe.queue(e,t),r=n.length,i=n.shift(),o=pe._queueHooks(e,t),a=function(){pe.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,a,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return pe._data(e,n)||pe._data(e,n,{empty:pe.Callbacks("once memory").add(function(){pe._removeData(e,t+"queue"),pe._removeData(e,n)})})}}),pe.fn.extend({queue:function(e,t){var n=2;return"string"!=typeof e&&(t=e,e="fx",n--),arguments.length<n?pe.queue(this[0],e):void 0===t?this:this.each(function(){var n=pe.queue(this,e,t);pe._queueHooks(this,e),"fx"===e&&"inprogress"!==n[0]&&pe.dequeue(this,e)})},dequeue:function(e){return this.each(function(){pe.dequeue(this,e)})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,t){var n,r=1,i=pe.Deferred(),o=this,a=this.length,s=function(){--r||i.resolveWith(o,[o])};for("string"!=typeof e&&(t=e,e=void 0),e=e||"fx";a--;)n=pe._data(o[a],e+"queueHooks"),n&&n.empty&&(r++,n.empty.add(s));return s(),i.promise(t)}}),function(){var e;fe.shrinkWrapBlocks=function(){if(null!=e)return e;e=!1;var t,n,r;return n=re.getElementsByTagName("body")[0],n&&n.style?(t=re.createElement("div"),r=re.createElement("div"),r.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",n.appendChild(r).appendChild(t),"undefined"!=typeof t.style.zoom&&(t.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:1px;width:1px;zoom:1",t.appendChild(re.createElement("div")).style.width="5px",e=3!==t.offsetWidth),n.removeChild(r),e):void 0}}();var Fe=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,Me=new RegExp("^(?:([+-])=|)("+Fe+")([a-z%]*)$","i"),Oe=["Top","Right","Bottom","Left"],Re=function(e,t){return e=t||e,"none"===pe.css(e,"display")||!pe.contains(e.ownerDocument,e)},Pe=function(e,t,n,r,i,o,a){var s=0,u=e.length,l=null==n;if("object"===pe.type(n)){i=!0;for(s in n)Pe(e,t,s,n[s],!0,o,a)}else if(void 0!==r&&(i=!0,pe.isFunction(r)||(a=!0),l&&(a?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(pe(e),n)})),t))for(;s<u;s++)t(e[s],n,a?r:r.call(e[s],s,t(e[s],n)));return i?e:l?t.call(e):u?t(e[0],n):o},Be=/^(?:checkbox|radio)$/i,We=/<([\w:-]+)/,Ie=/^$|\/(?:java|ecma)script/i,$e=/^\s+/,ze="abbr|article|aside|audio|bdi|canvas|data|datalist|details|dialog|figcaption|figure|footer|header|hgroup|main|mark|meter|nav|output|picture|progress|section|summary|template|time|video";!function(){var e=re.createElement("div"),t=re.createDocumentFragment(),n=re.createElement("input");e.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",fe.leadingWhitespace=3===e.firstChild.nodeType,fe.tbody=!e.getElementsByTagName("tbody").length,fe.htmlSerialize=!!e.getElementsByTagName("link").length,fe.html5Clone="<:nav></:nav>"!==re.createElement("nav").cloneNode(!0).outerHTML,n.type="checkbox",n.checked=!0,t.appendChild(n),fe.appendChecked=n.checked,e.innerHTML="<textarea>x</textarea>",fe.noCloneChecked=!!e.cloneNode(!0).lastChild.defaultValue,t.appendChild(e),n=re.createElement("input"),n.setAttribute("type","radio"),n.setAttribute("checked","checked"),n.setAttribute("name","t"),e.appendChild(n),fe.checkClone=e.cloneNode(!0).cloneNode(!0).lastChild.checked,fe.noCloneEvent=!!e.addEventListener,e[pe.expando]=1,fe.attributes=!e.getAttribute(pe.expando)}();var Xe={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:fe.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]};Xe.optgroup=Xe.option,Xe.tbody=Xe.tfoot=Xe.colgroup=Xe.caption=Xe.thead,Xe.th=Xe.td;var Ue=/<|&#?\w+;/,Ve=/<tbody/i;!function(){var t,n,r=re.createElement("div");for(t in{submit:!0,change:!0,focusin:!0})n="on"+t,(fe[t]=n in e)||(r.setAttribute(n,"t"),fe[t]=r.attributes[n].expando===!1);r=null}();var Ye=/^(?:input|select|textarea)$/i,Je=/^key/,Ge=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,Ke=/^(?:focusinfocus|focusoutblur)$/,Qe=/^([^.]*)(?:\.(.+)|)/;pe.event={global:{},add:function(e,t,n,r,i){var o,a,s,u,l,c,f,d,p,h,g,m=pe._data(e);if(m){for(n.handler&&(u=n,n=u.handler,i=u.selector),n.guid||(n.guid=pe.guid++),(a=m.events)||(a=m.events={}),(c=m.handle)||(c=m.handle=function(e){return"undefined"==typeof pe||e&&pe.event.triggered===e.type?void 0:pe.event.dispatch.apply(c.elem,arguments)},c.elem=e),t=(t||"").match(De)||[""],s=t.length;s--;)o=Qe.exec(t[s])||[],p=g=o[1],h=(o[2]||"").split(".").sort(),p&&(l=pe.event.special[p]||{},p=(i?l.delegateType:l.bindType)||p,l=pe.event.special[p]||{},f=pe.extend({type:p,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&pe.expr.match.needsContext.test(i),namespace:h.join(".")},u),(d=a[p])||(d=a[p]=[],d.delegateCount=0,l.setup&&l.setup.call(e,r,h,c)!==!1||(e.addEventListener?e.addEventListener(p,c,!1):e.attachEvent&&e.attachEvent("on"+p,c))),l.add&&(l.add.call(e,f),f.handler.guid||(f.handler.guid=n.guid)),i?d.splice(d.delegateCount++,0,f):d.push(f),pe.event.global[p]=!0);e=null}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,d,p,h,g,m=pe.hasData(e)&&pe._data(e);if(m&&(c=m.events)){for(t=(t||"").match(De)||[""],l=t.length;l--;)if(s=Qe.exec(t[l])||[],p=g=s[1],h=(s[2]||"").split(".").sort(),p){for(f=pe.event.special[p]||{},p=(r?f.delegateType:f.bindType)||p,d=c[p]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),u=o=d.length;o--;)a=d[o],!i&&g!==a.origType||n&&n.guid!==a.guid||s&&!s.test(a.namespace)||r&&r!==a.selector&&("**"!==r||!a.selector)||(d.splice(o,1),a.selector&&d.delegateCount--,f.remove&&f.remove.call(e,a));u&&!d.length&&(f.teardown&&f.teardown.call(e,h,m.handle)!==!1||pe.removeEvent(e,p,m.handle),delete c[p])}else for(p in c)pe.event.remove(e,p+t[l],n,r,!0);pe.isEmptyObject(c)&&(delete m.handle,pe._removeData(e,"events"))}},trigger:function(t,n,r,i){var o,a,s,u,l,c,f,d=[r||re],p=ce.call(t,"type")?t.type:t,h=ce.call(t,"namespace")?t.namespace.split("."):[];if(s=c=r=r||re,3!==r.nodeType&&8!==r.nodeType&&!Ke.test(p+pe.event.triggered)&&(p.indexOf(".")>-1&&(h=p.split("."),p=h.shift(),h.sort()),a=p.indexOf(":")<0&&"on"+p,t=t[pe.expando]?t:new pe.Event(p,"object"==typeof t&&t),t.isTrigger=i?2:3,t.namespace=h.join("."),t.rnamespace=t.namespace?new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,t.result=void 0,t.target||(t.target=r),n=null==n?[t]:pe.makeArray(n,[t]),l=pe.event.special[p]||{},i||!l.trigger||l.trigger.apply(r,n)!==!1)){if(!i&&!l.noBubble&&!pe.isWindow(r)){for(u=l.delegateType||p,Ke.test(u+p)||(s=s.parentNode);s;s=s.parentNode)d.push(s),c=s;c===(r.ownerDocument||re)&&d.push(c.defaultView||c.parentWindow||e)}for(f=0;(s=d[f++])&&!t.isPropagationStopped();)t.type=f>1?u:l.bindType||p,o=(pe._data(s,"events")||{})[t.type]&&pe._data(s,"handle"),o&&o.apply(s,n),o=a&&s[a],o&&o.apply&&He(s)&&(t.result=o.apply(s,n),t.result===!1&&t.preventDefault());if(t.type=p,!i&&!t.isDefaultPrevented()&&(!l._default||l._default.apply(d.pop(),n)===!1)&&He(r)&&a&&r[p]&&!pe.isWindow(r)){c=r[a],c&&(r[a]=null),pe.event.triggered=p;try{r[p]()}catch(g){}pe.event.triggered=void 0,c&&(r[a]=c)}return t.result}},dispatch:function(e){e=pe.event.fix(e);var t,n,r,i,o,a=[],s=ie.call(arguments),u=(pe._data(this,"events")||{})[e.type]||[],l=pe.event.special[e.type]||{};if(s[0]=e,e.delegateTarget=this,!l.preDispatch||l.preDispatch.call(this,e)!==!1){for(a=pe.event.handlers.call(this,e,u),t=0;(i=a[t++])&&!e.isPropagationStopped();)for(e.currentTarget=i.elem,n=0;(o=i.handlers[n++])&&!e.isImmediatePropagationStopped();)e.rnamespace&&!e.rnamespace.test(o.namespace)||(e.handleObj=o,e.data=o.data,r=((pe.event.special[o.origType]||{}).handle||o.handler).apply(i.elem,s),void 0!==r&&(e.result=r)===!1&&(e.preventDefault(),e.stopPropagation()));return l.postDispatch&&l.postDispatch.call(this,e),e.result}},handlers:function(e,t){var n,r,i,o,a=[],s=t.delegateCount,u=e.target;if(s&&u.nodeType&&("click"!==e.type||isNaN(e.button)||e.button<1))for(;u!=this;u=u.parentNode||this)if(1===u.nodeType&&(u.disabled!==!0||"click"!==e.type)){for(r=[],n=0;n<s;n++)o=t[n],i=o.selector+" ",void 0===r[i]&&(r[i]=o.needsContext?pe(i,this).index(u)>-1:pe.find(i,this,null,[u]).length),r[i]&&r.push(o);r.length&&a.push({elem:u,handlers:r})}return s<t.length&&a.push({elem:this,handlers:t.slice(s)}),a},fix:function(e){if(e[pe.expando])return e;var t,n,r,i=e.type,o=e,a=this.fixHooks[i];for(a||(this.fixHooks[i]=a=Ge.test(i)?this.mouseHooks:Je.test(i)?this.keyHooks:{}),r=a.props?this.props.concat(a.props):this.props,e=new pe.Event(o),t=r.length;t--;)n=r[t],e[n]=o[n];return e.target||(e.target=o.srcElement||re),3===e.target.nodeType&&(e.target=e.target.parentNode),e.metaKey=!!e.metaKey,a.filter?a.filter(e,o):e},props:"altKey bubbles cancelable ctrlKey currentTarget detail eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return null==e.which&&(e.which=null!=t.charCode?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,t){var n,r,i,o=t.button,a=t.fromElement;return null==e.pageX&&null!=t.clientX&&(r=e.target.ownerDocument||re,i=r.documentElement,n=r.body,e.pageX=t.clientX+(i&&i.scrollLeft||n&&n.scrollLeft||0)-(i&&i.clientLeft||n&&n.clientLeft||0),e.pageY=t.clientY+(i&&i.scrollTop||n&&n.scrollTop||0)-(i&&i.clientTop||n&&n.clientTop||0)),!e.relatedTarget&&a&&(e.relatedTarget=a===e.target?t.toElement:a),e.which||void 0===o||(e.which=1&o?1:2&o?3:4&o?2:0),e}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==b()&&this.focus)try{return this.focus(),!1}catch(e){}},delegateType:"focusin"},blur:{trigger:function(){if(this===b()&&this.blur)return this.blur(),!1},delegateType:"focusout"},click:{trigger:function(){if(pe.nodeName(this,"input")&&"checkbox"===this.type&&this.click)return this.click(),!1},_default:function(e){return pe.nodeName(e.target,"a")}},beforeunload:{postDispatch:function(e){void 0!==e.result&&e.originalEvent&&(e.originalEvent.returnValue=e.result)}}},simulate:function(e,t,n){var r=pe.extend(new pe.Event,n,{type:e,isSimulated:!0});pe.event.trigger(r,null,t),r.isDefaultPrevented()&&n.preventDefault()}},pe.removeEvent=re.removeEventListener?function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n)}:function(e,t,n){var r="on"+t;e.detachEvent&&("undefined"==typeof e[r]&&(e[r]=null),e.detachEvent(r,n))},pe.Event=function(e,t){return this instanceof pe.Event?(e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||void 0===e.defaultPrevented&&e.returnValue===!1?v:x):this.type=e,t&&pe.extend(this,t),this.timeStamp=e&&e.timeStamp||pe.now(),void(this[pe.expando]=!0)):new pe.Event(e,t)},pe.Event.prototype={constructor:pe.Event,isDefaultPrevented:x,isPropagationStopped:x,isImmediatePropagationStopped:x,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=v,e&&(e.preventDefault?e.preventDefault():e.returnValue=!1)},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=v,e&&!this.isSimulated&&(e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0)},stopImmediatePropagation:function(){var e=this.originalEvent;this.isImmediatePropagationStopped=v,e&&e.stopImmediatePropagation&&e.stopImmediatePropagation(),this.stopPropagation()}},pe.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(e,t){pe.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,o=e.handleObj;return i&&(i===r||pe.contains(r,i))||(e.type=o.origType,n=o.handler.apply(this,arguments),e.type=t),n}}}),fe.submit||(pe.event.special.submit={setup:function(){return!pe.nodeName(this,"form")&&void pe.event.add(this,"click._submit keypress._submit",function(e){var t=e.target,n=pe.nodeName(t,"input")||pe.nodeName(t,"button")?pe.prop(t,"form"):void 0;n&&!pe._data(n,"submit")&&(pe.event.add(n,"submit._submit",function(e){e._submitBubble=!0}),pe._data(n,"submit",!0))})},postDispatch:function(e){e._submitBubble&&(delete e._submitBubble,this.parentNode&&!e.isTrigger&&pe.event.simulate("submit",this.parentNode,e))},teardown:function(){return!pe.nodeName(this,"form")&&void pe.event.remove(this,"._submit")}}),fe.change||(pe.event.special.change={setup:function(){return Ye.test(this.nodeName)?("checkbox"!==this.type&&"radio"!==this.type||(pe.event.add(this,"propertychange._change",function(e){"checked"===e.originalEvent.propertyName&&(this._justChanged=!0)}),pe.event.add(this,"click._change",function(e){this._justChanged&&!e.isTrigger&&(this._justChanged=!1),pe.event.simulate("change",this,e)})),!1):void pe.event.add(this,"beforeactivate._change",function(e){var t=e.target;Ye.test(t.nodeName)&&!pe._data(t,"change")&&(pe.event.add(t,"change._change",function(e){!this.parentNode||e.isSimulated||e.isTrigger||pe.event.simulate("change",this.parentNode,e)}),pe._data(t,"change",!0))})},handle:function(e){var t=e.target;if(this!==t||e.isSimulated||e.isTrigger||"radio"!==t.type&&"checkbox"!==t.type)return e.handleObj.handler.apply(this,arguments)},teardown:function(){return pe.event.remove(this,"._change"),!Ye.test(this.nodeName)}}),fe.focusin||pe.each({focus:"focusin",blur:"focusout"},function(e,t){var n=function(e){pe.event.simulate(t,e.target,pe.event.fix(e))};pe.event.special[t]={setup:function(){var r=this.ownerDocument||this,i=pe._data(r,t);i||r.addEventListener(e,n,!0),pe._data(r,t,(i||0)+1)},teardown:function(){var r=this.ownerDocument||this,i=pe._data(r,t)-1;i?pe._data(r,t,i):(r.removeEventListener(e,n,!0),pe._removeData(r,t))}}}),pe.fn.extend({on:function(e,t,n,r){return w(this,e,t,n,r)},one:function(e,t,n,r){return w(this,e,t,n,r,1)},off:function(e,t,n){var r,i;if(e&&e.preventDefault&&e.handleObj)return r=e.handleObj,pe(e.delegateTarget).off(r.namespace?r.origType+"."+r.namespace:r.origType,r.selector,r.handler),this;if("object"==typeof e){for(i in e)this.off(i,t,e[i]);return this}return t!==!1&&"function"!=typeof t||(n=t,t=void 0),n===!1&&(n=x),this.each(function(){pe.event.remove(this,e,n,t)})},trigger:function(e,t){return this.each(function(){pe.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];if(n)return pe.event.trigger(e,t,n,!0)}});var Ze=/ jQuery\d+="(?:null|\d+)"/g,et=new RegExp("<(?:"+ze+")[\\s/>]","i"),tt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi,nt=/<script|<style|<link/i,rt=/checked\s*(?:[^=]|=\s*.checked.)/i,it=/^true\/(.*)/,ot=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,at=p(re),st=at.appendChild(re.createElement("div"));pe.extend({htmlPrefilter:function(e){return e.replace(tt,"<$1></$2>")},clone:function(e,t,n){var r,i,o,a,s,u=pe.contains(e.ownerDocument,e);if(fe.html5Clone||pe.isXMLDoc(e)||!et.test("<"+e.nodeName+">")?o=e.cloneNode(!0):(st.innerHTML=e.outerHTML,st.removeChild(o=st.firstChild)),!(fe.noCloneEvent&&fe.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||pe.isXMLDoc(e)))for(r=h(o),s=h(e),a=0;null!=(i=s[a]);++a)r[a]&&k(i,r[a]);if(t)if(n)for(s=s||h(e),r=r||h(o),a=0;null!=(i=s[a]);a++)N(i,r[a]);else N(e,o);return r=h(o,"script"),r.length>0&&g(r,!u&&h(e,"script")),r=s=i=null,o},cleanData:function(e,t){for(var n,r,i,o,a=0,s=pe.expando,u=pe.cache,l=fe.attributes,c=pe.event.special;null!=(n=e[a]);a++)if((t||He(n))&&(i=n[s],o=i&&u[i])){if(o.events)for(r in o.events)c[r]?pe.event.remove(n,r):pe.removeEvent(n,r,o.handle);u[i]&&(delete u[i],l||"undefined"==typeof n.removeAttribute?n[s]=void 0:n.removeAttribute(s),ne.push(i))}}}),pe.fn.extend({domManip:S,detach:function(e){return A(this,e,!0)},remove:function(e){return A(this,e)},text:function(e){return Pe(this,function(e){return void 0===e?pe.text(this):this.empty().append((this[0]&&this[0].ownerDocument||re).createTextNode(e))},null,e,arguments.length)},append:function(){return S(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=T(this,e);t.appendChild(e)}})},prepend:function(){return S(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=T(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return S(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return S(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},empty:function(){for(var e,t=0;null!=(e=this[t]);t++){for(1===e.nodeType&&pe.cleanData(h(e,!1));e.firstChild;)e.removeChild(e.firstChild);e.options&&pe.nodeName(e,"select")&&(e.options.length=0)}return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map(function(){return pe.clone(this,e,t)})},html:function(e){return Pe(this,function(e){var t=this[0]||{},n=0,r=this.length;if(void 0===e)return 1===t.nodeType?t.innerHTML.replace(Ze,""):void 0;if("string"==typeof e&&!nt.test(e)&&(fe.htmlSerialize||!et.test(e))&&(fe.leadingWhitespace||!$e.test(e))&&!Xe[(We.exec(e)||["",""])[1].toLowerCase()]){e=pe.htmlPrefilter(e);try{for(;n<r;n++)t=this[n]||{},1===t.nodeType&&(pe.cleanData(h(t,!1)),t.innerHTML=e);t=0}catch(i){}}t&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var e=[];return S(this,arguments,function(t){var n=this.parentNode;pe.inArray(this,e)<0&&(pe.cleanData(h(this)),
+n&&n.replaceChild(t,this))},e)}}),pe.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){pe.fn[e]=function(e){for(var n,r=0,i=[],o=pe(e),a=o.length-1;r<=a;r++)n=r===a?this:this.clone(!0),pe(o[r])[t](n),ae.apply(i,n.get());return this.pushStack(i)}});var ut,lt={HTML:"block",BODY:"block"},ct=/^margin/,ft=new RegExp("^("+Fe+")(?!px)[a-z%]+$","i"),dt=function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];i=n.apply(e,r||[]);for(o in t)e.style[o]=a[o];return i},pt=re.documentElement;!function(){function t(){var t,c,f=re.documentElement;f.appendChild(u),l.style.cssText="-webkit-box-sizing:border-box;box-sizing:border-box;position:relative;display:block;margin:auto;border:1px;padding:1px;top:1%;width:50%",n=i=s=!1,r=a=!0,e.getComputedStyle&&(c=e.getComputedStyle(l),n="1%"!==(c||{}).top,s="2px"===(c||{}).marginLeft,i="4px"===(c||{width:"4px"}).width,l.style.marginRight="50%",r="4px"===(c||{marginRight:"4px"}).marginRight,t=l.appendChild(re.createElement("div")),t.style.cssText=l.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:0",t.style.marginRight=t.style.width="0",l.style.width="1px",a=!parseFloat((e.getComputedStyle(t)||{}).marginRight),l.removeChild(t)),l.style.display="none",o=0===l.getClientRects().length,o&&(l.style.display="",l.innerHTML="<table><tr><td></td><td>t</td></tr></table>",t=l.getElementsByTagName("td"),t[0].style.cssText="margin:0;border:0;padding:0;display:none",o=0===t[0].offsetHeight,o&&(t[0].style.display="",t[1].style.display="none",o=0===t[0].offsetHeight)),f.removeChild(u)}var n,r,i,o,a,s,u=re.createElement("div"),l=re.createElement("div");l.style&&(l.style.cssText="float:left;opacity:.5",fe.opacity="0.5"===l.style.opacity,fe.cssFloat=!!l.style.cssFloat,l.style.backgroundClip="content-box",l.cloneNode(!0).style.backgroundClip="",fe.clearCloneStyle="content-box"===l.style.backgroundClip,u=re.createElement("div"),u.style.cssText="border:0;width:8px;height:0;top:0;left:-9999px;padding:0;margin-top:1px;position:absolute",l.innerHTML="",u.appendChild(l),fe.boxSizing=""===l.style.boxSizing||""===l.style.MozBoxSizing||""===l.style.WebkitBoxSizing,pe.extend(fe,{reliableHiddenOffsets:function(){return null==n&&t(),o},boxSizingReliable:function(){return null==n&&t(),i},pixelMarginRight:function(){return null==n&&t(),r},pixelPosition:function(){return null==n&&t(),n},reliableMarginRight:function(){return null==n&&t(),a},reliableMarginLeft:function(){return null==n&&t(),s}}))}();var ht,gt,mt=/^(top|right|bottom|left)$/;e.getComputedStyle?(ht=function(t){var n=t.ownerDocument.defaultView;return n&&n.opener||(n=e),n.getComputedStyle(t)},gt=function(e,t,n){var r,i,o,a,s=e.style;return n=n||ht(e),a=n?n.getPropertyValue(t)||n[t]:void 0,""!==a&&void 0!==a||pe.contains(e.ownerDocument,e)||(a=pe.style(e,t)),n&&!fe.pixelMarginRight()&&ft.test(a)&&ct.test(t)&&(r=s.width,i=s.minWidth,o=s.maxWidth,s.minWidth=s.maxWidth=s.width=a,a=n.width,s.width=r,s.minWidth=i,s.maxWidth=o),void 0===a?a:a+""}):pt.currentStyle&&(ht=function(e){return e.currentStyle},gt=function(e,t,n){var r,i,o,a,s=e.style;return n=n||ht(e),a=n?n[t]:void 0,null==a&&s&&s[t]&&(a=s[t]),ft.test(a)&&!mt.test(t)&&(r=s.left,i=e.runtimeStyle,o=i&&i.left,o&&(i.left=e.currentStyle.left),s.left="fontSize"===t?"1em":a,a=s.pixelLeft+"px",s.left=r,o&&(i.left=o)),void 0===a?a:a+""||"auto"});var yt=/alpha\([^)]*\)/i,vt=/opacity\s*=\s*([^)]*)/i,xt=/^(none|table(?!-c[ea]).+)/,bt=new RegExp("^("+Fe+")(.*)$","i"),wt={position:"absolute",visibility:"hidden",display:"block"},Tt={letterSpacing:"0",fontWeight:"400"},Ct=["Webkit","O","Moz","ms"],Et=re.createElement("div").style;pe.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=gt(e,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":fe.cssFloat?"cssFloat":"styleFloat"},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,a,s=pe.camelCase(t),u=e.style;if(t=pe.cssProps[s]||(pe.cssProps[s]=H(s)||s),a=pe.cssHooks[t]||pe.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(e,!1,r))?i:u[t];if(o=typeof n,"string"===o&&(i=Me.exec(n))&&i[1]&&(n=d(e,t,i),o="number"),null!=n&&n===n&&("number"===o&&(n+=i&&i[3]||(pe.cssNumber[s]?"":"px")),fe.clearCloneStyle||""!==n||0!==t.indexOf("background")||(u[t]="inherit"),!(a&&"set"in a&&void 0===(n=a.set(e,n,r)))))try{u[t]=n}catch(l){}}},css:function(e,t,n,r){var i,o,a,s=pe.camelCase(t);return t=pe.cssProps[s]||(pe.cssProps[s]=H(s)||s),a=pe.cssHooks[t]||pe.cssHooks[s],a&&"get"in a&&(o=a.get(e,!0,n)),void 0===o&&(o=gt(e,t,r)),"normal"===o&&t in Tt&&(o=Tt[t]),""===n||n?(i=parseFloat(o),n===!0||isFinite(i)?i||0:o):o}}),pe.each(["height","width"],function(e,t){pe.cssHooks[t]={get:function(e,n,r){if(n)return xt.test(pe.css(e,"display"))&&0===e.offsetWidth?dt(e,wt,function(){return M(e,t,r)}):M(e,t,r)},set:function(e,n,r){var i=r&&ht(e);return _(e,n,r?F(e,t,r,fe.boxSizing&&"border-box"===pe.css(e,"boxSizing",!1,i),i):0)}}}),fe.opacity||(pe.cssHooks.opacity={get:function(e,t){return vt.test((t&&e.currentStyle?e.currentStyle.filter:e.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":t?"1":""},set:function(e,t){var n=e.style,r=e.currentStyle,i=pe.isNumeric(t)?"alpha(opacity="+100*t+")":"",o=r&&r.filter||n.filter||"";n.zoom=1,(t>=1||""===t)&&""===pe.trim(o.replace(yt,""))&&n.removeAttribute&&(n.removeAttribute("filter"),""===t||r&&!r.filter)||(n.filter=yt.test(o)?o.replace(yt,i):o+" "+i)}}),pe.cssHooks.marginRight=L(fe.reliableMarginRight,function(e,t){if(t)return dt(e,{display:"inline-block"},gt,[e,"marginRight"])}),pe.cssHooks.marginLeft=L(fe.reliableMarginLeft,function(e,t){if(t)return(parseFloat(gt(e,"marginLeft"))||(pe.contains(e.ownerDocument,e)?e.getBoundingClientRect().left-dt(e,{marginLeft:0},function(){return e.getBoundingClientRect().left}):0))+"px"}),pe.each({margin:"",padding:"",border:"Width"},function(e,t){pe.cssHooks[e+t]={expand:function(n){for(var r=0,i={},o="string"==typeof n?n.split(" "):[n];r<4;r++)i[e+Oe[r]+t]=o[r]||o[r-2]||o[0];return i}},ct.test(e)||(pe.cssHooks[e+t].set=_)}),pe.fn.extend({css:function(e,t){return Pe(this,function(e,t,n){var r,i,o={},a=0;if(pe.isArray(t)){for(r=ht(e),i=t.length;a<i;a++)o[t[a]]=pe.css(e,t[a],!1,r);return o}return void 0!==n?pe.style(e,t,n):pe.css(e,t)},e,t,arguments.length>1)},show:function(){return q(this,!0)},hide:function(){return q(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){Re(this)?pe(this).show():pe(this).hide()})}}),pe.Tween=O,O.prototype={constructor:O,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||pe.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(pe.cssNumber[n]?"":"px")},cur:function(){var e=O.propHooks[this.prop];return e&&e.get?e.get(this):O.propHooks._default.get(this)},run:function(e){var t,n=O.propHooks[this.prop];return this.options.duration?this.pos=t=pe.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):O.propHooks._default.set(this),this}},O.prototype.init.prototype=O.prototype,O.propHooks={_default:{get:function(e){var t;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(t=pe.css(e.elem,e.prop,""),t&&"auto"!==t?t:0)},set:function(e){pe.fx.step[e.prop]?pe.fx.step[e.prop](e):1!==e.elem.nodeType||null==e.elem.style[pe.cssProps[e.prop]]&&!pe.cssHooks[e.prop]?e.elem[e.prop]=e.now:pe.style(e.elem,e.prop,e.now+e.unit)}}},O.propHooks.scrollTop=O.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},pe.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},pe.fx=O.prototype.init,pe.fx.step={};var Nt,kt,St=/^(?:toggle|show|hide)$/,At=/queueHooks$/;pe.Animation=pe.extend($,{tweeners:{"*":[function(e,t){var n=this.createTween(e,t);return d(n.elem,e,Me.exec(t),n),n}]},tweener:function(e,t){pe.isFunction(e)?(t=e,e=["*"]):e=e.match(De);for(var n,r=0,i=e.length;r<i;r++)n=e[r],$.tweeners[n]=$.tweeners[n]||[],$.tweeners[n].unshift(t)},prefilters:[W],prefilter:function(e,t){t?$.prefilters.unshift(e):$.prefilters.push(e)}}),pe.speed=function(e,t,n){var r=e&&"object"==typeof e?pe.extend({},e):{complete:n||!n&&t||pe.isFunction(e)&&e,duration:e,easing:n&&t||t&&!pe.isFunction(t)&&t};return r.duration=pe.fx.off?0:"number"==typeof r.duration?r.duration:r.duration in pe.fx.speeds?pe.fx.speeds[r.duration]:pe.fx.speeds._default,null!=r.queue&&r.queue!==!0||(r.queue="fx"),r.old=r.complete,r.complete=function(){pe.isFunction(r.old)&&r.old.call(this),r.queue&&pe.dequeue(this,r.queue)},r},pe.fn.extend({fadeTo:function(e,t,n,r){return this.filter(Re).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(e,t,n,r){var i=pe.isEmptyObject(e),o=pe.speed(t,n,r),a=function(){var t=$(this,pe.extend({},e),o);(i||pe._data(this,"finish"))&&t.stop(!0)};return a.finish=a,i||o.queue===!1?this.each(a):this.queue(o.queue,a)},stop:function(e,t,n){var r=function(e){var t=e.stop;delete e.stop,t(n)};return"string"!=typeof e&&(n=t,t=e,e=void 0),t&&e!==!1&&this.queue(e||"fx",[]),this.each(function(){var t=!0,i=null!=e&&e+"queueHooks",o=pe.timers,a=pe._data(this);if(i)a[i]&&a[i].stop&&r(a[i]);else for(i in a)a[i]&&a[i].stop&&At.test(i)&&r(a[i]);for(i=o.length;i--;)o[i].elem!==this||null!=e&&o[i].queue!==e||(o[i].anim.stop(n),t=!1,o.splice(i,1));!t&&n||pe.dequeue(this,e)})},finish:function(e){return e!==!1&&(e=e||"fx"),this.each(function(){var t,n=pe._data(this),r=n[e+"queue"],i=n[e+"queueHooks"],o=pe.timers,a=r?r.length:0;for(n.finish=!0,pe.queue(this,e,[]),i&&i.stop&&i.stop.call(this,!0),t=o.length;t--;)o[t].elem===this&&o[t].queue===e&&(o[t].anim.stop(!0),o.splice(t,1));for(t=0;t<a;t++)r[t]&&r[t].finish&&r[t].finish.call(this);delete n.finish})}}),pe.each(["toggle","show","hide"],function(e,t){var n=pe.fn[t];pe.fn[t]=function(e,r,i){return null==e||"boolean"==typeof e?n.apply(this,arguments):this.animate(P(t,!0),e,r,i)}}),pe.each({slideDown:P("show"),slideUp:P("hide"),slideToggle:P("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,t){pe.fn[e]=function(e,n,r){return this.animate(t,e,n,r)}}),pe.timers=[],pe.fx.tick=function(){var e,t=pe.timers,n=0;for(Nt=pe.now();n<t.length;n++)e=t[n],e()||t[n]!==e||t.splice(n--,1);t.length||pe.fx.stop(),Nt=void 0},pe.fx.timer=function(e){pe.timers.push(e),e()?pe.fx.start():pe.timers.pop()},pe.fx.interval=13,pe.fx.start=function(){kt||(kt=e.setInterval(pe.fx.tick,pe.fx.interval))},pe.fx.stop=function(){e.clearInterval(kt),kt=null},pe.fx.speeds={slow:600,fast:200,_default:400},pe.fn.delay=function(t,n){return t=pe.fx?pe.fx.speeds[t]||t:t,n=n||"fx",this.queue(n,function(n,r){var i=e.setTimeout(n,t);r.stop=function(){e.clearTimeout(i)}})},function(){var e,t=re.createElement("input"),n=re.createElement("div"),r=re.createElement("select"),i=r.appendChild(re.createElement("option"));n=re.createElement("div"),n.setAttribute("className","t"),n.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",e=n.getElementsByTagName("a")[0],t.setAttribute("type","checkbox"),n.appendChild(t),e=n.getElementsByTagName("a")[0],e.style.cssText="top:1px",fe.getSetAttribute="t"!==n.className,fe.style=/top/.test(e.getAttribute("style")),fe.hrefNormalized="/a"===e.getAttribute("href"),fe.checkOn=!!t.value,fe.optSelected=i.selected,fe.enctype=!!re.createElement("form").enctype,r.disabled=!0,fe.optDisabled=!i.disabled,t=re.createElement("input"),t.setAttribute("value",""),fe.input=""===t.getAttribute("value"),t.value="t",t.setAttribute("type","radio"),fe.radioValue="t"===t.value}();var Dt=/\r/g,jt=/[\x20\t\r\n\f]+/g;pe.fn.extend({val:function(e){var t,n,r,i=this[0];{if(arguments.length)return r=pe.isFunction(e),this.each(function(n){var i;1===this.nodeType&&(i=r?e.call(this,n,pe(this).val()):e,null==i?i="":"number"==typeof i?i+="":pe.isArray(i)&&(i=pe.map(i,function(e){return null==e?"":e+""})),t=pe.valHooks[this.type]||pe.valHooks[this.nodeName.toLowerCase()],t&&"set"in t&&void 0!==t.set(this,i,"value")||(this.value=i))});if(i)return t=pe.valHooks[i.type]||pe.valHooks[i.nodeName.toLowerCase()],t&&"get"in t&&void 0!==(n=t.get(i,"value"))?n:(n=i.value,"string"==typeof n?n.replace(Dt,""):null==n?"":n)}}}),pe.extend({valHooks:{option:{get:function(e){var t=pe.find.attr(e,"value");return null!=t?t:pe.trim(pe.text(e)).replace(jt," ")}},select:{get:function(e){for(var t,n,r=e.options,i=e.selectedIndex,o="select-one"===e.type||i<0,a=o?null:[],s=o?i+1:r.length,u=i<0?s:o?i:0;u<s;u++)if(n=r[u],(n.selected||u===i)&&(fe.optDisabled?!n.disabled:null===n.getAttribute("disabled"))&&(!n.parentNode.disabled||!pe.nodeName(n.parentNode,"optgroup"))){if(t=pe(n).val(),o)return t;a.push(t)}return a},set:function(e,t){for(var n,r,i=e.options,o=pe.makeArray(t),a=i.length;a--;)if(r=i[a],pe.inArray(pe.valHooks.option.get(r),o)>-1)try{r.selected=n=!0}catch(s){r.scrollHeight}else r.selected=!1;return n||(e.selectedIndex=-1),i}}}}),pe.each(["radio","checkbox"],function(){pe.valHooks[this]={set:function(e,t){if(pe.isArray(t))return e.checked=pe.inArray(pe(e).val(),t)>-1}},fe.checkOn||(pe.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})});var Lt,Ht,qt=pe.expr.attrHandle,_t=/^(?:checked|selected)$/i,Ft=fe.getSetAttribute,Mt=fe.input;pe.fn.extend({attr:function(e,t){return Pe(this,pe.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){pe.removeAttr(this,e)})}}),pe.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return"undefined"==typeof e.getAttribute?pe.prop(e,t,n):(1===o&&pe.isXMLDoc(e)||(t=t.toLowerCase(),i=pe.attrHooks[t]||(pe.expr.match.bool.test(t)?Ht:Lt)),void 0!==n?null===n?void pe.removeAttr(e,t):i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:(e.setAttribute(t,n+""),n):i&&"get"in i&&null!==(r=i.get(e,t))?r:(r=pe.find.attr(e,t),null==r?void 0:r))},attrHooks:{type:{set:function(e,t){if(!fe.radioValue&&"radio"===t&&pe.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,r,i=0,o=t&&t.match(De);if(o&&1===e.nodeType)for(;n=o[i++];)r=pe.propFix[n]||n,pe.expr.match.bool.test(n)?Mt&&Ft||!_t.test(n)?e[r]=!1:e[pe.camelCase("default-"+n)]=e[r]=!1:pe.attr(e,n,""),e.removeAttribute(Ft?n:r)}}),Ht={set:function(e,t,n){return t===!1?pe.removeAttr(e,n):Mt&&Ft||!_t.test(n)?e.setAttribute(!Ft&&pe.propFix[n]||n,n):e[pe.camelCase("default-"+n)]=e[n]=!0,n}},pe.each(pe.expr.match.bool.source.match(/\w+/g),function(e,t){var n=qt[t]||pe.find.attr;Mt&&Ft||!_t.test(t)?qt[t]=function(e,t,r){var i,o;return r||(o=qt[t],qt[t]=i,i=null!=n(e,t,r)?t.toLowerCase():null,qt[t]=o),i}:qt[t]=function(e,t,n){if(!n)return e[pe.camelCase("default-"+t)]?t.toLowerCase():null}}),Mt&&Ft||(pe.attrHooks.value={set:function(e,t,n){return pe.nodeName(e,"input")?void(e.defaultValue=t):Lt&&Lt.set(e,t,n)}}),Ft||(Lt={set:function(e,t,n){var r=e.getAttributeNode(n);if(r||e.setAttributeNode(r=e.ownerDocument.createAttribute(n)),r.value=t+="","value"===n||t===e.getAttribute(n))return t}},qt.id=qt.name=qt.coords=function(e,t,n){var r;if(!n)return(r=e.getAttributeNode(t))&&""!==r.value?r.value:null},pe.valHooks.button={get:function(e,t){var n=e.getAttributeNode(t);if(n&&n.specified)return n.value},set:Lt.set},pe.attrHooks.contenteditable={set:function(e,t,n){Lt.set(e,""!==t&&t,n)}},pe.each(["width","height"],function(e,t){pe.attrHooks[t]={set:function(e,n){if(""===n)return e.setAttribute(t,"auto"),n}}})),fe.style||(pe.attrHooks.style={get:function(e){return e.style.cssText||void 0},set:function(e,t){return e.style.cssText=t+""}});var Ot=/^(?:input|select|textarea|button|object)$/i,Rt=/^(?:a|area)$/i;pe.fn.extend({prop:function(e,t){return Pe(this,pe.prop,e,t,arguments.length>1)},removeProp:function(e){return e=pe.propFix[e]||e,this.each(function(){try{this[e]=void 0,delete this[e]}catch(t){}})}}),pe.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&pe.isXMLDoc(e)||(t=pe.propFix[t]||t,i=pe.propHooks[t]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=pe.find.attr(e,"tabindex");return t?parseInt(t,10):Ot.test(e.nodeName)||Rt.test(e.nodeName)&&e.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),fe.hrefNormalized||pe.each(["href","src"],function(e,t){pe.propHooks[t]={get:function(e){return e.getAttribute(t,4)}}}),fe.optSelected||(pe.propHooks.selected={get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),pe.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){pe.propFix[this.toLowerCase()]=this}),fe.enctype||(pe.propFix.enctype="encoding");var Pt=/[\t\r\n\f]/g;pe.fn.extend({addClass:function(e){var t,n,r,i,o,a,s,u=0;if(pe.isFunction(e))return this.each(function(t){pe(this).addClass(e.call(this,t,z(this)))});if("string"==typeof e&&e)for(t=e.match(De)||[];n=this[u++];)if(i=z(n),r=1===n.nodeType&&(" "+i+" ").replace(Pt," ")){for(a=0;o=t[a++];)r.indexOf(" "+o+" ")<0&&(r+=o+" ");s=pe.trim(r),i!==s&&pe.attr(n,"class",s)}return this},removeClass:function(e){var t,n,r,i,o,a,s,u=0;if(pe.isFunction(e))return this.each(function(t){pe(this).removeClass(e.call(this,t,z(this)))});if(!arguments.length)return this.attr("class","");if("string"==typeof e&&e)for(t=e.match(De)||[];n=this[u++];)if(i=z(n),r=1===n.nodeType&&(" "+i+" ").replace(Pt," ")){for(a=0;o=t[a++];)for(;r.indexOf(" "+o+" ")>-1;)r=r.replace(" "+o+" "," ");s=pe.trim(r),i!==s&&pe.attr(n,"class",s)}return this},toggleClass:function(e,t){var n=typeof e;return"boolean"==typeof t&&"string"===n?t?this.addClass(e):this.removeClass(e):pe.isFunction(e)?this.each(function(n){pe(this).toggleClass(e.call(this,n,z(this),t),t)}):this.each(function(){var t,r,i,o;if("string"===n)for(r=0,i=pe(this),o=e.match(De)||[];t=o[r++];)i.hasClass(t)?i.removeClass(t):i.addClass(t);else void 0!==e&&"boolean"!==n||(t=z(this),t&&pe._data(this,"__className__",t),pe.attr(this,"class",t||e===!1?"":pe._data(this,"__className__")||""))})},hasClass:function(e){var t,n,r=0;for(t=" "+e+" ";n=this[r++];)if(1===n.nodeType&&(" "+z(n)+" ").replace(Pt," ").indexOf(t)>-1)return!0;return!1}}),pe.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(e,t){pe.fn[t]=function(e,n){return arguments.length>0?this.on(t,null,e,n):this.trigger(t)}}),pe.fn.extend({hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}});var Bt=e.location,Wt=pe.now(),It=/\?/,$t=/(,)|(\[|{)|(}|])|"(?:[^"\\\r\n]|\\["\\\/bfnrt]|\\u[\da-fA-F]{4})*"\s*:?|true|false|null|-?(?!0\d)\d+(?:\.\d+|)(?:[eE][+-]?\d+|)/g;pe.parseJSON=function(t){if(e.JSON&&e.JSON.parse)return e.JSON.parse(t+"");var n,r=null,i=pe.trim(t+"");return i&&!pe.trim(i.replace($t,function(e,t,i,o){return n&&t&&(r=0),0===r?e:(n=i||t,r+=!o-!i,"")}))?Function("return "+i)():pe.error("Invalid JSON: "+t)},pe.parseXML=function(t){var n,r;if(!t||"string"!=typeof t)return null;try{e.DOMParser?(r=new e.DOMParser,n=r.parseFromString(t,"text/xml")):(n=new e.ActiveXObject("Microsoft.XMLDOM"),n.async="false",n.loadXML(t))}catch(i){n=void 0}return n&&n.documentElement&&!n.getElementsByTagName("parsererror").length||pe.error("Invalid XML: "+t),n};var zt=/#.*$/,Xt=/([?&])_=[^&]*/,Ut=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Vt=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Yt=/^(?:GET|HEAD)$/,Jt=/^\/\//,Gt=/^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,Kt={},Qt={},Zt="*/".concat("*"),en=Bt.href,tn=Gt.exec(en.toLowerCase())||[];pe.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:en,type:"GET",isLocal:Vt.test(tn[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Zt,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":pe.parseJSON,"text xml":pe.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?V(V(e,pe.ajaxSettings),t):V(pe.ajaxSettings,e)},ajaxPrefilter:X(Kt),ajaxTransport:X(Qt),ajax:function(t,n){function r(t,n,r,i){var o,f,v,x,w,C=n;2!==b&&(b=2,u&&e.clearTimeout(u),c=void 0,s=i||"",T.readyState=t>0?4:0,o=t>=200&&t<300||304===t,r&&(x=Y(d,T,r)),x=J(d,x,T,o),o?(d.ifModified&&(w=T.getResponseHeader("Last-Modified"),w&&(pe.lastModified[a]=w),w=T.getResponseHeader("etag"),w&&(pe.etag[a]=w)),204===t||"HEAD"===d.type?C="nocontent":304===t?C="notmodified":(C=x.state,f=x.data,v=x.error,o=!v)):(v=C,!t&&C||(C="error",t<0&&(t=0))),T.status=t,T.statusText=(n||C)+"",o?g.resolveWith(p,[f,C,T]):g.rejectWith(p,[T,C,v]),T.statusCode(y),y=void 0,l&&h.trigger(o?"ajaxSuccess":"ajaxError",[T,d,o?f:v]),m.fireWith(p,[T,C]),l&&(h.trigger("ajaxComplete",[T,d]),--pe.active||pe.event.trigger("ajaxStop")))}"object"==typeof t&&(n=t,t=void 0),n=n||{};var i,o,a,s,u,l,c,f,d=pe.ajaxSetup({},n),p=d.context||d,h=d.context&&(p.nodeType||p.jquery)?pe(p):pe.event,g=pe.Deferred(),m=pe.Callbacks("once memory"),y=d.statusCode||{},v={},x={},b=0,w="canceled",T={readyState:0,getResponseHeader:function(e){var t;if(2===b){if(!f)for(f={};t=Ut.exec(s);)f[t[1].toLowerCase()]=t[2];t=f[e.toLowerCase()]}return null==t?null:t},getAllResponseHeaders:function(){return 2===b?s:null},setRequestHeader:function(e,t){var n=e.toLowerCase();return b||(e=x[n]=x[n]||e,v[e]=t),this},overrideMimeType:function(e){return b||(d.mimeType=e),this},statusCode:function(e){var t;if(e)if(b<2)for(t in e)y[t]=[y[t],e[t]];else T.always(e[T.status]);return this},abort:function(e){var t=e||w;return c&&c.abort(t),r(0,t),this}};if(g.promise(T).complete=m.add,T.success=T.done,T.error=T.fail,d.url=((t||d.url||en)+"").replace(zt,"").replace(Jt,tn[1]+"//"),d.type=n.method||n.type||d.method||d.type,d.dataTypes=pe.trim(d.dataType||"*").toLowerCase().match(De)||[""],null==d.crossDomain&&(i=Gt.exec(d.url.toLowerCase()),d.crossDomain=!(!i||i[1]===tn[1]&&i[2]===tn[2]&&(i[3]||("http:"===i[1]?"80":"443"))===(tn[3]||("http:"===tn[1]?"80":"443")))),d.data&&d.processData&&"string"!=typeof d.data&&(d.data=pe.param(d.data,d.traditional)),U(Kt,d,n,T),2===b)return T;l=pe.event&&d.global,l&&0===pe.active++&&pe.event.trigger("ajaxStart"),d.type=d.type.toUpperCase(),d.hasContent=!Yt.test(d.type),a=d.url,d.hasContent||(d.data&&(a=d.url+=(It.test(a)?"&":"?")+d.data,delete d.data),d.cache===!1&&(d.url=Xt.test(a)?a.replace(Xt,"$1_="+Wt++):a+(It.test(a)?"&":"?")+"_="+Wt++)),d.ifModified&&(pe.lastModified[a]&&T.setRequestHeader("If-Modified-Since",pe.lastModified[a]),pe.etag[a]&&T.setRequestHeader("If-None-Match",pe.etag[a])),(d.data&&d.hasContent&&d.contentType!==!1||n.contentType)&&T.setRequestHeader("Content-Type",d.contentType),T.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+("*"!==d.dataTypes[0]?", "+Zt+"; q=0.01":""):d.accepts["*"]);for(o in d.headers)T.setRequestHeader(o,d.headers[o]);if(d.beforeSend&&(d.beforeSend.call(p,T,d)===!1||2===b))return T.abort();w="abort";for(o in{success:1,error:1,complete:1})T[o](d[o]);if(c=U(Qt,d,n,T)){if(T.readyState=1,l&&h.trigger("ajaxSend",[T,d]),2===b)return T;d.async&&d.timeout>0&&(u=e.setTimeout(function(){T.abort("timeout")},d.timeout));try{b=1,c.send(v,r)}catch(C){if(!(b<2))throw C;r(-1,C)}}else r(-1,"No Transport");return T},getJSON:function(e,t,n){return pe.get(e,t,n,"json")},getScript:function(e,t){return pe.get(e,void 0,t,"script")}}),pe.each(["get","post"],function(e,t){pe[t]=function(e,n,r,i){return pe.isFunction(n)&&(i=i||r,r=n,n=void 0),pe.ajax(pe.extend({url:e,type:t,dataType:i,data:n,success:r},pe.isPlainObject(e)&&e))}}),pe._evalUrl=function(e){return pe.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,"throws":!0})},pe.fn.extend({wrapAll:function(e){if(pe.isFunction(e))return this.each(function(t){pe(this).wrapAll(e.call(this,t))});if(this[0]){var t=pe(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){for(var e=this;e.firstChild&&1===e.firstChild.nodeType;)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return pe.isFunction(e)?this.each(function(t){pe(this).wrapInner(e.call(this,t))}):this.each(function(){var t=pe(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=pe.isFunction(e);return this.each(function(n){pe(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){pe.nodeName(this,"body")||pe(this).replaceWith(this.childNodes)}).end()}}),pe.expr.filters.hidden=function(e){return fe.reliableHiddenOffsets()?e.offsetWidth<=0&&e.offsetHeight<=0&&!e.getClientRects().length:K(e)},pe.expr.filters.visible=function(e){return!pe.expr.filters.hidden(e)};var nn=/%20/g,rn=/\[\]$/,on=/\r?\n/g,an=/^(?:submit|button|image|reset|file)$/i,sn=/^(?:input|select|textarea|keygen)/i;pe.param=function(e,t){var n,r=[],i=function(e,t){t=pe.isFunction(t)?t():null==t?"":t,r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};if(void 0===t&&(t=pe.ajaxSettings&&pe.ajaxSettings.traditional),pe.isArray(e)||e.jquery&&!pe.isPlainObject(e))pe.each(e,function(){i(this.name,this.value)});else for(n in e)Q(n,e[n],t,i);return r.join("&").replace(nn,"+")},pe.fn.extend({serialize:function(){return pe.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=pe.prop(this,"elements");return e?pe.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!pe(this).is(":disabled")&&sn.test(this.nodeName)&&!an.test(e)&&(this.checked||!Be.test(e))}).map(function(e,t){var n=pe(this).val();return null==n?null:pe.isArray(n)?pe.map(n,function(e){return{name:t.name,value:e.replace(on,"\r\n")}}):{name:t.name,value:n.replace(on,"\r\n")}}).get()}}),pe.ajaxSettings.xhr=void 0!==e.ActiveXObject?function(){return this.isLocal?ee():re.documentMode>8?Z():/^(get|post|head|put|delete|options)$/i.test(this.type)&&Z()||ee()}:Z;var un=0,ln={},cn=pe.ajaxSettings.xhr();e.attachEvent&&e.attachEvent("onunload",function(){for(var e in ln)ln[e](void 0,!0)}),fe.cors=!!cn&&"withCredentials"in cn,cn=fe.ajax=!!cn,cn&&pe.ajaxTransport(function(t){if(!t.crossDomain||fe.cors){var n;return{send:function(r,i){var o,a=t.xhr(),s=++un;if(a.open(t.type,t.url,t.async,t.username,t.password),t.xhrFields)for(o in t.xhrFields)a[o]=t.xhrFields[o];t.mimeType&&a.overrideMimeType&&a.overrideMimeType(t.mimeType),t.crossDomain||r["X-Requested-With"]||(r["X-Requested-With"]="XMLHttpRequest");for(o in r)void 0!==r[o]&&a.setRequestHeader(o,r[o]+"");a.send(t.hasContent&&t.data||null),n=function(e,r){var o,u,l;if(n&&(r||4===a.readyState))if(delete ln[s],n=void 0,a.onreadystatechange=pe.noop,r)4!==a.readyState&&a.abort();else{l={},o=a.status,"string"==typeof a.responseText&&(l.text=a.responseText);try{u=a.statusText}catch(c){u=""}o||!t.isLocal||t.crossDomain?1223===o&&(o=204):o=l.text?200:404}l&&i(o,u,l,a.getAllResponseHeaders())},t.async?4===a.readyState?e.setTimeout(n):a.onreadystatechange=ln[s]=n:n()},abort:function(){n&&n(void 0,!0)}}}}),pe.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return pe.globalEval(e),e}}}),pe.ajaxPrefilter("script",function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET",e.global=!1)}),pe.ajaxTransport("script",function(e){if(e.crossDomain){var t,n=re.head||pe("head")[0]||re.documentElement;return{send:function(r,i){t=re.createElement("script"),t.async=!0,e.scriptCharset&&(t.charset=e.scriptCharset),t.src=e.url,t.onload=t.onreadystatechange=function(e,n){(n||!t.readyState||/loaded|complete/.test(t.readyState))&&(t.onload=t.onreadystatechange=null,t.parentNode&&t.parentNode.removeChild(t),t=null,n||i(200,"success"))},n.insertBefore(t,n.firstChild)},abort:function(){t&&t.onload(void 0,!0)}}}});var fn=[],dn=/(=)\?(?=&|$)|\?\?/;pe.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=fn.pop()||pe.expando+"_"+Wt++;return this[e]=!0,e}}),pe.ajaxPrefilter("json jsonp",function(t,n,r){var i,o,a,s=t.jsonp!==!1&&(dn.test(t.url)?"url":"string"==typeof t.data&&0===(t.contentType||"").indexOf("application/x-www-form-urlencoded")&&dn.test(t.data)&&"data");if(s||"jsonp"===t.dataTypes[0])return i=t.jsonpCallback=pe.isFunction(t.jsonpCallback)?t.jsonpCallback():t.jsonpCallback,s?t[s]=t[s].replace(dn,"$1"+i):t.jsonp!==!1&&(t.url+=(It.test(t.url)?"&":"?")+t.jsonp+"="+i),t.converters["script json"]=function(){return a||pe.error(i+" was not called"),a[0]},t.dataTypes[0]="json",o=e[i],e[i]=function(){a=arguments},r.always(function(){void 0===o?pe(e).removeProp(i):e[i]=o,t[i]&&(t.jsonpCallback=n.jsonpCallback,fn.push(i)),a&&pe.isFunction(o)&&o(a[0]),a=o=void 0}),"script"}),pe.parseHTML=function(e,t,n){if(!e||"string"!=typeof e)return null;"boolean"==typeof t&&(n=t,t=!1),t=t||re;var r=Te.exec(e),i=!n&&[];return r?[t.createElement(r[1])]:(r=y([e],t,i),i&&i.length&&pe(i).remove(),pe.merge([],r.childNodes))};var pn=pe.fn.load;return pe.fn.load=function(e,t,n){if("string"!=typeof e&&pn)return pn.apply(this,arguments);var r,i,o,a=this,s=e.indexOf(" ");return s>-1&&(r=pe.trim(e.slice(s,e.length)),e=e.slice(0,s)),pe.isFunction(t)?(n=t,t=void 0):t&&"object"==typeof t&&(i="POST"),a.length>0&&pe.ajax({url:e,type:i||"GET",dataType:"html",data:t}).done(function(e){o=arguments,a.html(r?pe("<div>").append(pe.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},pe.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){pe.fn[t]=function(e){return this.on(t,e)}}),pe.expr.filters.animated=function(e){return pe.grep(pe.timers,function(t){return e===t.elem}).length},pe.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l,c=pe.css(e,"position"),f=pe(e),d={};"static"===c&&(e.style.position="relative"),s=f.offset(),o=pe.css(e,"top"),u=pe.css(e,"left"),l=("absolute"===c||"fixed"===c)&&pe.inArray("auto",[o,u])>-1,l?(r=f.position(),a=r.top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),pe.isFunction(t)&&(t=t.call(e,n,pe.extend({},s))),null!=t.top&&(d.top=t.top-s.top+a),null!=t.left&&(d.left=t.left-s.left+i),"using"in t?t.using.call(e,d):f.css(d)}},pe.fn.extend({offset:function(e){if(arguments.length)return void 0===e?this:this.each(function(t){pe.offset.setOffset(this,e,t)});var t,n,r={top:0,left:0},i=this[0],o=i&&i.ownerDocument;if(o)return t=o.documentElement,pe.contains(t,i)?("undefined"!=typeof i.getBoundingClientRect&&(r=i.getBoundingClientRect()),n=te(o),{top:r.top+(n.pageYOffset||t.scrollTop)-(t.clientTop||0),left:r.left+(n.pageXOffset||t.scrollLeft)-(t.clientLeft||0)}):r},position:function(){if(this[0]){var e,t,n={top:0,left:0},r=this[0];return"fixed"===pe.css(r,"position")?t=r.getBoundingClientRect():(e=this.offsetParent(),t=this.offset(),pe.nodeName(e[0],"html")||(n=e.offset()),n.top+=pe.css(e[0],"borderTopWidth",!0),n.left+=pe.css(e[0],"borderLeftWidth",!0)),{top:t.top-n.top-pe.css(r,"marginTop",!0),left:t.left-n.left-pe.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){
+for(var e=this.offsetParent;e&&!pe.nodeName(e,"html")&&"static"===pe.css(e,"position");)e=e.offsetParent;return e||pt})}}),pe.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,t){var n=/Y/.test(t);pe.fn[e]=function(r){return Pe(this,function(e,r,i){var o=te(e);return void 0===i?o?t in o?o[t]:o.document.documentElement[r]:e[r]:void(o?o.scrollTo(n?pe(o).scrollLeft():i,n?i:pe(o).scrollTop()):e[r]=i)},e,r,arguments.length,null)}}),pe.each(["top","left"],function(e,t){pe.cssHooks[t]=L(fe.pixelPosition,function(e,n){if(n)return n=gt(e,t),ft.test(n)?pe(e).position()[t]+"px":n})}),pe.each({Height:"height",Width:"width"},function(e,t){pe.each({padding:"inner"+e,content:t,"":"outer"+e},function(n,r){pe.fn[r]=function(r,i){var o=arguments.length&&(n||"boolean"!=typeof r),a=n||(r===!0||i===!0?"margin":"border");return Pe(this,function(t,n,r){var i;return pe.isWindow(t)?t.document.documentElement["client"+e]:9===t.nodeType?(i=t.documentElement,Math.max(t.body["scroll"+e],i["scroll"+e],t.body["offset"+e],i["offset"+e],i["client"+e])):void 0===r?pe.css(t,n,a):pe.style(t,n,r,a)},t,o?r:void 0,o,null)}})}),pe.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)}}),pe.fn.size=function(){return this.length},pe.fn.andSelf=pe.fn.addBack,layui.define(function(e){layui.$=pe,e("jquery",pe)}),pe});
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/lay/modules/laydate.js b/pluss-wap-page/src/main/resources/static/resources/js/lay/modules/laydate.js
new file mode 100644
index 0000000..ae0a591
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/lay/modules/laydate.js
@@ -0,0 +1,2 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ ;!function(){"use strict";var e=window.layui&&layui.define,t={getPath:function(){var e=document.currentScript?document.currentScript.src:function(){for(var e,t=document.scripts,n=t.length-1,a=n;a>0;a--)if("interactive"===t[a].readyState){e=t[a].src;break}return e||t[n].src}();return e.substring(0,e.lastIndexOf("/")+1)}(),getStyle:function(e,t){var n=e.currentStyle?e.currentStyle:window.getComputedStyle(e,null);return n[n.getPropertyValue?"getPropertyValue":"getAttribute"](t)},link:function(e,a,i){if(n.path){var r=document.getElementsByTagName("head")[0],o=document.createElement("link");"string"==typeof a&&(i=a);var s=(i||e).replace(/\.|\//g,""),l="layuicss-"+s,d=0;o.rel="stylesheet",o.href=n.path+e,o.id=l,document.getElementById(l)||r.appendChild(o),"function"==typeof a&&!function c(){return++d>80?window.console&&console.error("laydate.css: Invalid"):void(1989===parseInt(t.getStyle(document.getElementById(l),"width"))?a():setTimeout(c,100))}()}}},n={v:"5.0.9",config:{},index:window.laydate&&window.laydate.v?1e5:0,path:t.getPath,set:function(e){var t=this;return t.config=w.extend({},t.config,e),t},ready:function(a){var i="laydate",r="",o=(e?"modules/laydate/":"theme/")+"default/laydate.css?v="+n.v+r;return e?layui.addcss(o,a,i):t.link(o,a,i),this}},a=function(){var e=this;return{hint:function(t){e.hint.call(e,t)},config:e.config}},i="laydate",r=".layui-laydate",o="layui-this",s="laydate-disabled",l="开始日期超出了结束日期<br>建议重新选择",d=[100,2e5],c="layui-laydate-static",m="layui-laydate-list",u="laydate-selected",h="layui-laydate-hint",y="laydate-day-prev",f="laydate-day-next",p="layui-laydate-footer",g=".laydate-btns-confirm",v="laydate-time-text",D=".laydate-btns-time",T=function(e){var t=this;t.index=++n.index,t.config=w.extend({},t.config,n.config,e),n.ready(function(){t.init()})},w=function(e){return new C(e)},C=function(e){for(var t=0,n="object"==typeof e?[e]:(this.selector=e,document.querySelectorAll(e||null));t<n.length;t++)this.push(n[t])};C.prototype=[],C.prototype.constructor=C,w.extend=function(){var e=1,t=arguments,n=function(e,t){e=e||(t.constructor===Array?[]:{});for(var a in t)e[a]=t[a]&&t[a].constructor===Object?n(e[a],t[a]):t[a];return e};for(t[0]="object"==typeof t[0]?t[0]:{};e<t.length;e++)"object"==typeof t[e]&&n(t[0],t[e]);return t[0]},w.ie=function(){var e=navigator.userAgent.toLowerCase();return!!(window.ActiveXObject||"ActiveXObject"in window)&&((e.match(/msie\s(\d+)/)||[])[1]||"11")}(),w.stope=function(e){e=e||window.event,e.stopPropagation?e.stopPropagation():e.cancelBubble=!0},w.each=function(e,t){var n,a=this;if("function"!=typeof t)return a;if(e=e||[],e.constructor===Object){for(n in e)if(t.call(e[n],n,e[n]))break}else for(n=0;n<e.length&&!t.call(e[n],n,e[n]);n++);return a},w.digit=function(e,t,n){var a="";e=String(e),t=t||2;for(var i=e.length;i<t;i++)a+="0";return e<Math.pow(10,t)?a+(0|e):e},w.elem=function(e,t){var n=document.createElement(e);return w.each(t||{},function(e,t){n.setAttribute(e,t)}),n},C.addStr=function(e,t){return e=e.replace(/\s+/," "),t=t.replace(/\s+/," ").split(" "),w.each(t,function(t,n){new RegExp("\\b"+n+"\\b").test(e)||(e=e+" "+n)}),e.replace(/^\s|\s$/,"")},C.removeStr=function(e,t){return e=e.replace(/\s+/," "),t=t.replace(/\s+/," ").split(" "),w.each(t,function(t,n){var a=new RegExp("\\b"+n+"\\b");a.test(e)&&(e=e.replace(a,""))}),e.replace(/\s+/," ").replace(/^\s|\s$/,"")},C.prototype.find=function(e){var t=this,n=0,a=[],i="object"==typeof e;return this.each(function(r,o){for(var s=i?[e]:o.querySelectorAll(e||null);n<s.length;n++)a.push(s[n]);t.shift()}),i||(t.selector=(t.selector?t.selector+" ":"")+e),w.each(a,function(e,n){t.push(n)}),t},C.prototype.each=function(e){return w.each.call(this,this,e)},C.prototype.addClass=function(e,t){return this.each(function(n,a){a.className=C[t?"removeStr":"addStr"](a.className,e)})},C.prototype.removeClass=function(e){return this.addClass(e,!0)},C.prototype.hasClass=function(e){var t=!1;return this.each(function(n,a){new RegExp("\\b"+e+"\\b").test(a.className)&&(t=!0)}),t},C.prototype.attr=function(e,t){var n=this;return void 0===t?function(){if(n.length>0)return n[0].getAttribute(e)}():n.each(function(n,a){a.setAttribute(e,t)})},C.prototype.removeAttr=function(e){return this.each(function(t,n){n.removeAttribute(e)})},C.prototype.html=function(e){return this.each(function(t,n){n.innerHTML=e})},C.prototype.val=function(e){return this.each(function(t,n){n.value=e})},C.prototype.append=function(e){return this.each(function(t,n){"object"==typeof e?n.appendChild(e):n.innerHTML=n.innerHTML+e})},C.prototype.remove=function(e){return this.each(function(t,n){e?n.removeChild(e):n.parentNode.removeChild(n)})},C.prototype.on=function(e,t){return this.each(function(n,a){a.attachEvent?a.attachEvent("on"+e,function(e){e.target=e.srcElement,t.call(a,e)}):a.addEventListener(e,t,!1)})},C.prototype.off=function(e,t){return this.each(function(n,a){a.detachEvent?a.detachEvent("on"+e,t):a.removeEventListener(e,t,!1)})},T.isLeapYear=function(e){return e%4===0&&e%100!==0||e%400===0},T.prototype.config={type:"date",range:!1,format:"yyyy-MM-dd",value:null,isInitValue:!0,min:"1900-1-1",max:"2099-12-31",trigger:"focus",show:!1,showBottom:!0,btns:["clear","now","confirm"],lang:"cn",theme:"default",position:null,calendar:!1,mark:{},zIndex:null,done:null,change:null},T.prototype.lang=function(){var e=this,t=e.config,n={cn:{weeks:["日","一","二","三","四","五","六"],time:["时","分","秒"],timeTips:"选择时间",startTime:"开始时间",endTime:"结束时间",dateTips:"返回日期",month:["一","二","三","四","五","六","七","八","九","十","十一","十二"],tools:{confirm:"确定",clear:"清空",now:"现在"}},en:{weeks:["Su","Mo","Tu","We","Th","Fr","Sa"],time:["Hours","Minutes","Seconds"],timeTips:"Select Time",startTime:"Start Time",endTime:"End Time",dateTips:"Select Date",month:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],tools:{confirm:"Confirm",clear:"Clear",now:"Now"}}};return n[t.lang]||n.cn},T.prototype.init=function(){var e=this,t=e.config,n="yyyy|y|MM|M|dd|d|HH|H|mm|m|ss|s",a="static"===t.position,i={year:"yyyy",month:"yyyy-MM",date:"yyyy-MM-dd",time:"HH:mm:ss",datetime:"yyyy-MM-dd HH:mm:ss"};t.elem=w(t.elem),t.eventElem=w(t.eventElem),t.elem[0]&&(t.range===!0&&(t.range="-"),t.format===i.date&&(t.format=i[t.type]),e.format=t.format.match(new RegExp(n+"|.","g"))||[],e.EXP_IF="",e.EXP_SPLIT="",w.each(e.format,function(t,a){var i=new RegExp(n).test(a)?"\\d{"+function(){return new RegExp(n).test(e.format[0===t?t+1:t-1]||"")?/^yyyy|y$/.test(a)?4:a.length:/^yyyy$/.test(a)?"1,4":/^y$/.test(a)?"1,308":"1,2"}()+"}":"\\"+a;e.EXP_IF=e.EXP_IF+i,e.EXP_SPLIT=e.EXP_SPLIT+"("+i+")"}),e.EXP_IF=new RegExp("^"+(t.range?e.EXP_IF+"\\s\\"+t.range+"\\s"+e.EXP_IF:e.EXP_IF)+"$"),e.EXP_SPLIT=new RegExp("^"+e.EXP_SPLIT+"$",""),e.isInput(t.elem[0])||"focus"===t.trigger&&(t.trigger="click"),t.elem.attr("lay-key")||(t.elem.attr("lay-key",e.index),t.eventElem.attr("lay-key",e.index)),t.mark=w.extend({},t.calendar&&"cn"===t.lang?{"0-1-1":"元旦","0-2-14":"情人","0-3-8":"妇女","0-3-12":"植树","0-4-1":"愚人","0-5-1":"劳动","0-5-4":"青年","0-6-1":"儿童","0-9-10":"教师","0-9-18":"国耻","0-10-1":"国庆","0-12-25":"圣诞"}:{},t.mark),w.each(["min","max"],function(e,n){var a=[],i=[];if("number"==typeof t[n]){var r=t[n],o=(new Date).getTime(),s=864e5,l=new Date(r?r<s?o+r*s:r:o);a=[l.getFullYear(),l.getMonth()+1,l.getDate()],r<s||(i=[l.getHours(),l.getMinutes(),l.getSeconds()])}else a=(t[n].match(/\d+-\d+-\d+/)||[""])[0].split("-"),i=(t[n].match(/\d+:\d+:\d+/)||[""])[0].split(":");t[n]={year:0|a[0]||(new Date).getFullYear(),month:a[1]?(0|a[1])-1:(new Date).getMonth(),date:0|a[2]||(new Date).getDate(),hours:0|i[0],minutes:0|i[1],seconds:0|i[2]}}),e.elemID="layui-laydate"+t.elem.attr("lay-key"),(t.show||a)&&e.render(),a||e.events(),t.value&&t.isInitValue&&(t.value.constructor===Date?e.setValue(e.parse(0,e.systemDate(t.value))):e.setValue(t.value)))},T.prototype.render=function(){var e=this,t=e.config,n=e.lang(),a="static"===t.position,i=e.elem=w.elem("div",{id:e.elemID,"class":["layui-laydate",t.range?" layui-laydate-range":"",a?" "+c:"",t.theme&&"default"!==t.theme&&!/^#/.test(t.theme)?" laydate-theme-"+t.theme:""].join("")}),r=e.elemMain=[],o=e.elemHeader=[],s=e.elemCont=[],l=e.table=[],d=e.footer=w.elem("div",{"class":p});if(t.zIndex&&(i.style.zIndex=t.zIndex),w.each(new Array(2),function(e){if(!t.range&&e>0)return!0;var a=w.elem("div",{"class":"layui-laydate-header"}),i=[function(){var e=w.elem("i",{"class":"layui-icon laydate-icon laydate-prev-y"});return e.innerHTML="&#xe65a;",e}(),function(){var e=w.elem("i",{"class":"layui-icon laydate-icon laydate-prev-m"});return e.innerHTML="&#xe603;",e}(),function(){var e=w.elem("div",{"class":"laydate-set-ym"}),t=w.elem("span"),n=w.elem("span");return e.appendChild(t),e.appendChild(n),e}(),function(){var e=w.elem("i",{"class":"layui-icon laydate-icon laydate-next-m"});return e.innerHTML="&#xe602;",e}(),function(){var e=w.elem("i",{"class":"layui-icon laydate-icon laydate-next-y"});return e.innerHTML="&#xe65b;",e}()],d=w.elem("div",{"class":"layui-laydate-content"}),c=w.elem("table"),m=w.elem("thead"),u=w.elem("tr");w.each(i,function(e,t){a.appendChild(t)}),m.appendChild(u),w.each(new Array(6),function(e){var t=c.insertRow(0);w.each(new Array(7),function(a){if(0===e){var i=w.elem("th");i.innerHTML=n.weeks[a],u.appendChild(i)}t.insertCell(a)})}),c.insertBefore(m,c.children[0]),d.appendChild(c),r[e]=w.elem("div",{"class":"layui-laydate-main laydate-main-list-"+e}),r[e].appendChild(a),r[e].appendChild(d),o.push(i),s.push(d),l.push(c)}),w(d).html(function(){var e=[],i=[];return"datetime"===t.type&&e.push('<span lay-type="datetime" class="laydate-btns-time">'+n.timeTips+"</span>"),w.each(t.btns,function(e,r){var o=n.tools[r]||"btn";t.range&&"now"===r||(a&&"clear"===r&&(o="cn"===t.lang?"重置":"Reset"),i.push('<span lay-type="'+r+'" class="laydate-btns-'+r+'">'+o+"</span>"))}),e.push('<div class="laydate-footer-btns">'+i.join("")+"</div>"),e.join("")}()),w.each(r,function(e,t){i.appendChild(t)}),t.showBottom&&i.appendChild(d),/^#/.test(t.theme)){var m=w.elem("style"),u=["#{{id}} .layui-laydate-header{background-color:{{theme}};}","#{{id}} .layui-this{background-color:{{theme}} !important;}"].join("").replace(/{{id}}/g,e.elemID).replace(/{{theme}}/g,t.theme);"styleSheet"in m?(m.setAttribute("type","text/css"),m.styleSheet.cssText=u):m.innerHTML=u,w(i).addClass("laydate-theme-molv"),i.appendChild(m)}e.remove(T.thisElemDate),a?t.elem.append(i):(document.body.appendChild(i),e.position()),e.checkDate().calendar(),e.changeEvent(),T.thisElemDate=e.elemID,"function"==typeof t.ready&&t.ready(w.extend({},t.dateTime,{month:t.dateTime.month+1}))},T.prototype.remove=function(e){var t=this,n=(t.config,w("#"+(e||t.elemID)));return n.hasClass(c)||t.checkDate(function(){n.remove()}),t},T.prototype.position=function(){var e=this,t=e.config,n=e.bindElem||t.elem[0],a=n.getBoundingClientRect(),i=e.elem.offsetWidth,r=e.elem.offsetHeight,o=function(e){return e=e?"scrollLeft":"scrollTop",document.body[e]|document.documentElement[e]},s=function(e){return document.documentElement[e?"clientWidth":"clientHeight"]},l=5,d=a.left,c=a.bottom;d+i+l>s("width")&&(d=s("width")-i-l),c+r+l>s()&&(c=a.top>r?a.top-r:s()-r,c-=2*l),t.position&&(e.elem.style.position=t.position),e.elem.style.left=d+("fixed"===t.position?0:o(1))+"px",e.elem.style.top=c+("fixed"===t.position?0:o())+"px"},T.prototype.hint=function(e){var t=this,n=(t.config,w.elem("div",{"class":h}));t.elem&&(n.innerHTML=e||"",w(t.elem).find("."+h).remove(),t.elem.appendChild(n),clearTimeout(t.hinTimer),t.hinTimer=setTimeout(function(){w(t.elem).find("."+h).remove()},3e3))},T.prototype.getAsYM=function(e,t,n){return n?t--:t++,t<0&&(t=11,e--),t>11&&(t=0,e++),[e,t]},T.prototype.systemDate=function(e){var t=e||new Date;return{year:t.getFullYear(),month:t.getMonth(),date:t.getDate(),hours:e?e.getHours():0,minutes:e?e.getMinutes():0,seconds:e?e.getSeconds():0}},T.prototype.checkDate=function(e){var t,a,i=this,r=(new Date,i.config),o=r.dateTime=r.dateTime||i.systemDate(),s=i.bindElem||r.elem[0],l=(i.isInput(s)?"val":"html",i.isInput(s)?s.value:"static"===r.position?"":s.innerHTML),c=function(e){e.year>d[1]&&(e.year=d[1],a=!0),e.month>11&&(e.month=11,a=!0),e.hours>23&&(e.hours=0,a=!0),e.minutes>59&&(e.minutes=0,e.hours++,a=!0),e.seconds>59&&(e.seconds=0,e.minutes++,a=!0),t=n.getEndDate(e.month+1,e.year),e.date>t&&(e.date=t,a=!0)},m=function(e,t,n){var o=["startTime","endTime"];t=(t.match(i.EXP_SPLIT)||[]).slice(1),n=n||0,r.range&&(i[o[n]]=i[o[n]]||{}),w.each(i.format,function(s,l){var c=parseFloat(t[s]);t[s].length<l.length&&(a=!0),/yyyy|y/.test(l)?(c<d[0]&&(c=d[0],a=!0),e.year=c):/MM|M/.test(l)?(c<1&&(c=1,a=!0),e.month=c-1):/dd|d/.test(l)?(c<1&&(c=1,a=!0),e.date=c):/HH|H/.test(l)?(c<1&&(c=0,a=!0),e.hours=c,r.range&&(i[o[n]].hours=c)):/mm|m/.test(l)?(c<1&&(c=0,a=!0),e.minutes=c,r.range&&(i[o[n]].minutes=c)):/ss|s/.test(l)&&(c<1&&(c=0,a=!0),e.seconds=c,r.range&&(i[o[n]].seconds=c))}),c(e)};return"limit"===e?(c(o),i):(l=l||r.value,"string"==typeof l&&(l=l.replace(/\s+/g," ").replace(/^\s|\s$/g,"")),i.startState&&!i.endState&&(delete i.startState,i.endState=!0),"string"==typeof l&&l?i.EXP_IF.test(l)?r.range?(l=l.split(" "+r.range+" "),i.startDate=i.startDate||i.systemDate(),i.endDate=i.endDate||i.systemDate(),r.dateTime=w.extend({},i.startDate),w.each([i.startDate,i.endDate],function(e,t){m(t,l[e],e)})):m(o,l):(i.hint("日期格式不合法<br>必须遵循下述格式：<br>"+(r.range?r.format+" "+r.range+" "+r.format:r.format)+"<br>已为你重置"),a=!0):l&&l.constructor===Date?r.dateTime=i.systemDate(l):(r.dateTime=i.systemDate(),delete i.startState,delete i.endState,delete i.startDate,delete i.endDate,delete i.startTime,delete i.endTime),c(o),a&&l&&i.setValue(r.range?i.endDate?i.parse():"":i.parse()),e&&e(),i)},T.prototype.mark=function(e,t){var n,a=this,i=a.config;return w.each(i.mark,function(e,a){var i=e.split("-");i[0]!=t[0]&&0!=i[0]||i[1]!=t[1]&&0!=i[1]||i[2]!=t[2]||(n=a||t[2])}),n&&e.html('<span class="laydate-day-mark">'+n+"</span>"),a},T.prototype.limit=function(e,t,n,a){var i,r=this,o=r.config,l={},d=o[n>41?"endDate":"dateTime"],c=w.extend({},d,t||{});return w.each({now:c,min:o.min,max:o.max},function(e,t){l[e]=r.newDate(w.extend({year:t.year,month:t.month,date:t.date},function(){var e={};return w.each(a,function(n,a){e[a]=t[a]}),e}())).getTime()}),i=l.now<l.min||l.now>l.max,e&&e[i?"addClass":"removeClass"](s),i},T.prototype.calendar=function(e){var t,a,i,r=this,s=r.config,l=e||s.dateTime,c=new Date,m=r.lang(),u="date"!==s.type&&"datetime"!==s.type,h=e?1:0,y=w(r.table[h]).find("td"),f=w(r.elemHeader[h][2]).find("span");if(l.year<d[0]&&(l.year=d[0],r.hint("最低只能支持到公元"+d[0]+"年")),l.year>d[1]&&(l.year=d[1],r.hint("最高只能支持到公元"+d[1]+"年")),r.firstDate||(r.firstDate=w.extend({},l)),c.setFullYear(l.year,l.month,1),t=c.getDay(),a=n.getEndDate(l.month||12,l.year),i=n.getEndDate(l.month+1,l.year),w.each(y,function(e,n){var d=[l.year,l.month],c=0;n=w(n),n.removeAttr("class"),e<t?(c=a-t+e,n.addClass("laydate-day-prev"),d=r.getAsYM(l.year,l.month,"sub")):e>=t&&e<i+t?(c=e-t,s.range||c+1===l.date&&n.addClass(o)):(c=e-i-t,n.addClass("laydate-day-next"),d=r.getAsYM(l.year,l.month)),d[1]++,d[2]=c+1,n.attr("lay-ymd",d.join("-")).html(d[2]),r.mark(n,d).limit(n,{year:d[0],month:d[1]-1,date:d[2]},e)}),w(f[0]).attr("lay-ym",l.year+"-"+(l.month+1)),w(f[1]).attr("lay-ym",l.year+"-"+(l.month+1)),"cn"===s.lang?(w(f[0]).attr("lay-type","year").html(l.year+"年"),w(f[1]).attr("lay-type","month").html(l.month+1+"月")):(w(f[0]).attr("lay-type","month").html(m.month[l.month]),w(f[1]).attr("lay-type","year").html(l.year)),u&&(s.range&&(e?r.endDate=r.endDate||{year:l.year+("year"===s.type?1:0),month:l.month+("month"===s.type?0:-1)}:r.startDate=r.startDate||{year:l.year,month:l.month},e&&(r.listYM=[[r.startDate.year,r.startDate.month+1],[r.endDate.year,r.endDate.month+1]],r.list(s.type,0).list(s.type,1),"time"===s.type?r.setBtnStatus("时间",w.extend({},r.systemDate(),r.startTime),w.extend({},r.systemDate(),r.endTime)):r.setBtnStatus(!0))),s.range||(r.listYM=[[l.year,l.month+1]],r.list(s.type,0))),s.range&&!e){var p=r.getAsYM(l.year,l.month);r.calendar(w.extend({},l,{year:p[0],month:p[1]}))}return s.range||r.limit(w(r.footer).find(g),null,0,["hours","minutes","seconds"]),s.range&&e&&!u&&r.stampRange(),r},T.prototype.list=function(e,t){var n=this,a=n.config,i=a.dateTime,r=n.lang(),l=a.range&&"date"!==a.type&&"datetime"!==a.type,d=w.elem("ul",{"class":m+" "+{year:"laydate-year-list",month:"laydate-month-list",time:"laydate-time-list"}[e]}),c=n.elemHeader[t],u=w(c[2]).find("span"),h=n.elemCont[t||0],y=w(h).find("."+m)[0],f="cn"===a.lang,p=f?"年":"",T=n.listYM[t]||{},C=["hours","minutes","seconds"],x=["startTime","endTime"][t];if(T[0]<1&&(T[0]=1),"year"===e){var M,b=M=T[0]-7;b<1&&(b=M=1),w.each(new Array(15),function(e){var i=w.elem("li",{"lay-ym":M}),r={year:M};M==T[0]&&w(i).addClass(o),i.innerHTML=M+p,d.appendChild(i),M<n.firstDate.year?(r.month=a.min.month,r.date=a.min.date):M>=n.firstDate.year&&(r.month=a.max.month,r.date=a.max.date),n.limit(w(i),r,t),M++}),w(u[f?0:1]).attr("lay-ym",M-8+"-"+T[1]).html(b+p+" - "+(M-1+p))}else if("month"===e)w.each(new Array(12),function(e){var i=w.elem("li",{"lay-ym":e}),s={year:T[0],month:e};e+1==T[1]&&w(i).addClass(o),i.innerHTML=r.month[e]+(f?"月":""),d.appendChild(i),T[0]<n.firstDate.year?s.date=a.min.date:T[0]>=n.firstDate.year&&(s.date=a.max.date),n.limit(w(i),s,t)}),w(u[f?0:1]).attr("lay-ym",T[0]+"-"+T[1]).html(T[0]+p);else if("time"===e){var E=function(){w(d).find("ol").each(function(e,a){w(a).find("li").each(function(a,i){n.limit(w(i),[{hours:a},{hours:n[x].hours,minutes:a},{hours:n[x].hours,minutes:n[x].minutes,seconds:a}][e],t,[["hours"],["hours","minutes"],["hours","minutes","seconds"]][e])})}),a.range||n.limit(w(n.footer).find(g),n[x],0,["hours","minutes","seconds"])};a.range?n[x]||(n[x]={hours:0,minutes:0,seconds:0}):n[x]=i,w.each([24,60,60],function(e,t){var a=w.elem("li"),i=["<p>"+r.time[e]+"</p><ol>"];w.each(new Array(t),function(t){i.push("<li"+(n[x][C[e]]===t?' class="'+o+'"':"")+">"+w.digit(t,2)+"</li>")}),a.innerHTML=i.join("")+"</ol>",d.appendChild(a)}),E()}if(y&&h.removeChild(y),h.appendChild(d),"year"===e||"month"===e)w(n.elemMain[t]).addClass("laydate-ym-show"),w(d).find("li").on("click",function(){var r=0|w(this).attr("lay-ym");if(!w(this).hasClass(s)){if(0===t)i[e]=r,l&&(n.startDate[e]=r),n.limit(w(n.footer).find(g),null,0);else if(l)n.endDate[e]=r;else{var c="year"===e?n.getAsYM(r,T[1]-1,"sub"):n.getAsYM(T[0],r,"sub");w.extend(i,{year:c[0],month:c[1]})}"year"===a.type||"month"===a.type?(w(d).find("."+o).removeClass(o),w(this).addClass(o),"month"===a.type&&"year"===e&&(n.listYM[t][0]=r,l&&(n[["startDate","endDate"][t]].year=r),n.list("month",t))):(n.checkDate("limit").calendar(),n.closeList()),n.setBtnStatus(),a.range||n.done(null,"change"),w(n.footer).find(D).removeClass(s)}});else{var S=w.elem("span",{"class":v}),k=function(){w(d).find("ol").each(function(e){var t=this,a=w(t).find("li");t.scrollTop=30*(n[x][C[e]]-2),t.scrollTop<=0&&a.each(function(e,n){if(!w(this).hasClass(s))return t.scrollTop=30*(e-2),!0})})},H=w(c[2]).find("."+v);k(),S.innerHTML=a.range?[r.startTime,r.endTime][t]:r.timeTips,w(n.elemMain[t]).addClass("laydate-time-show"),H[0]&&H.remove(),c[2].appendChild(S),w(d).find("ol").each(function(e){var t=this;w(t).find("li").on("click",function(){var r=0|this.innerHTML;w(this).hasClass(s)||(a.range?n[x][C[e]]=r:i[C[e]]=r,w(t).find("."+o).removeClass(o),w(this).addClass(o),E(),k(),(n.endDate||"time"===a.type)&&n.done(null,"change"),n.setBtnStatus())})})}return n},T.prototype.listYM=[],T.prototype.closeList=function(){var e=this;e.config;w.each(e.elemCont,function(t,n){w(this).find("."+m).remove(),w(e.elemMain[t]).removeClass("laydate-ym-show laydate-time-show")}),w(e.elem).find("."+v).remove()},T.prototype.setBtnStatus=function(e,t,n){var a,i=this,r=i.config,o=w(i.footer).find(g),d=r.range&&"date"!==r.type&&"time"!==r.type;d&&(t=t||i.startDate,n=n||i.endDate,a=i.newDate(t).getTime()>i.newDate(n).getTime(),i.limit(null,t)||i.limit(null,n)?o.addClass(s):o[a?"addClass":"removeClass"](s),e&&a&&i.hint("string"==typeof e?l.replace(/日期/g,e):l))},T.prototype.parse=function(e,t){var n=this,a=n.config,i=t||(e?w.extend({},n.endDate,n.endTime):a.range?w.extend({},n.startDate,n.startTime):a.dateTime),r=n.format.concat();return w.each(r,function(e,t){/yyyy|y/.test(t)?r[e]=w.digit(i.year,t.length):/MM|M/.test(t)?r[e]=w.digit(i.month+1,t.length):/dd|d/.test(t)?r[e]=w.digit(i.date,t.length):/HH|H/.test(t)?r[e]=w.digit(i.hours,t.length):/mm|m/.test(t)?r[e]=w.digit(i.minutes,t.length):/ss|s/.test(t)&&(r[e]=w.digit(i.seconds,t.length))}),a.range&&!e?r.join("")+" "+a.range+" "+n.parse(1):r.join("")},T.prototype.newDate=function(e){return e=e||{},new Date(e.year||1,e.month||0,e.date||1,e.hours||0,e.minutes||0,e.seconds||0)},T.prototype.setValue=function(e){var t=this,n=t.config,a=t.bindElem||n.elem[0],i=t.isInput(a)?"val":"html";return"static"===n.position||w(a)[i](e||""),this},T.prototype.stampRange=function(){var e,t,n=this,a=n.config,i=w(n.elem).find("td");if(a.range&&!n.endDate&&w(n.footer).find(g).addClass(s),n.endDate)return e=n.newDate({year:n.startDate.year,month:n.startDate.month,date:n.startDate.date}).getTime(),t=n.newDate({year:n.endDate.year,month:n.endDate.month,date:n.endDate.date}).getTime(),e>t?n.hint(l):void w.each(i,function(a,i){var r=w(i).attr("lay-ymd").split("-"),s=n.newDate({year:r[0],month:r[1]-1,date:r[2]}).getTime();w(i).removeClass(u+" "+o),s!==e&&s!==t||w(i).addClass(w(i).hasClass(y)||w(i).hasClass(f)?u:o),s>e&&s<t&&w(i).addClass(u)})},T.prototype.done=function(e,t){var n=this,a=n.config,i=w.extend({},n.startDate?w.extend(n.startDate,n.startTime):a.dateTime),r=w.extend({},w.extend(n.endDate,n.endTime));return w.each([i,r],function(e,t){"month"in t&&w.extend(t,{month:t.month+1})}),e=e||[n.parse(),i,r],"function"==typeof a[t||"done"]&&a[t||"done"].apply(a,e),n},T.prototype.choose=function(e){var t=this,n=t.config,a=n.dateTime,i=w(t.elem).find("td"),r=e.attr("lay-ymd").split("-"),l=function(e){new Date;e&&w.extend(a,r),n.range&&(t.startDate?w.extend(t.startDate,r):t.startDate=w.extend({},r,t.startTime),t.startYMD=r)};if(r={year:0|r[0],month:(0|r[1])-1,date:0|r[2]},!e.hasClass(s))if(n.range){if(w.each(["startTime","endTime"],function(e,n){t[n]=t[n]||{hours:0,minutes:0,seconds:0}}),t.endState)l(),delete t.endState,delete t.endDate,t.startState=!0,i.removeClass(o+" "+u),e.addClass(o);else if(t.startState){if(e.addClass(o),t.endDate?w.extend(t.endDate,r):t.endDate=w.extend({},r,t.endTime),t.newDate(r).getTime()<t.newDate(t.startYMD).getTime()){var d=w.extend({},t.endDate,{hours:t.startDate.hours,minutes:t.startDate.minutes,seconds:t.startDate.seconds});w.extend(t.endDate,t.startDate,{hours:t.endDate.hours,minutes:t.endDate.minutes,seconds:t.endDate.seconds}),t.startDate=d}n.showBottom||t.done(),t.stampRange(),t.endState=!0,t.done(null,"change")}else e.addClass(o),l(),t.startState=!0;w(t.footer).find(g)[t.endDate?"removeClass":"addClass"](s)}else"static"===n.position?(l(!0),t.calendar().done().done(null,"change")):"date"===n.type?(l(!0),t.setValue(t.parse()).remove().done()):"datetime"===n.type&&(l(!0),t.calendar().done(null,"change"))},T.prototype.tool=function(e,t){var n=this,a=n.config,i=a.dateTime,r="static"===a.position,o={datetime:function(){w(e).hasClass(s)||(n.list("time",0),a.range&&n.list("time",1),w(e).attr("lay-type","date").html(n.lang().dateTips))},date:function(){n.closeList(),w(e).attr("lay-type","datetime").html(n.lang().timeTips)},clear:function(){n.setValue("").remove(),r&&(w.extend(i,n.firstDate),n.calendar()),a.range&&(delete n.startState,delete n.endState,delete n.endDate,delete n.startTime,delete n.endTime),n.done(["",{},{}])},now:function(){var e=new Date;w.extend(i,n.systemDate(),{hours:e.getHours(),minutes:e.getMinutes(),seconds:e.getSeconds()}),n.setValue(n.parse()).remove(),r&&n.calendar(),n.done()},confirm:function(){if(a.range){if(!n.endDate)return n.hint("请先选择日期范围");if(w(e).hasClass(s))return n.hint("time"===a.type?l.replace(/日期/g,"时间"):l)}else if(w(e).hasClass(s))return n.hint("不在有效日期或时间范围内");n.done(),n.setValue(n.parse()).remove()}};o[t]&&o[t]()},T.prototype.change=function(e){var t=this,n=t.config,a=n.dateTime,i=n.range&&("year"===n.type||"month"===n.type),r=t.elemCont[e||0],o=t.listYM[e],s=function(s){var l=["startDate","endDate"][e],d=w(r).find(".laydate-year-list")[0],c=w(r).find(".laydate-month-list")[0];return d&&(o[0]=s?o[0]-15:o[0]+15,t.list("year",e)),c&&(s?o[0]--:o[0]++,t.list("month",e)),(d||c)&&(w.extend(a,{year:o[0]}),i&&(t[l].year=o[0]),n.range||t.done(null,"change"),t.setBtnStatus(),n.range||t.limit(w(t.footer).find(g),{year:o[0]})),d||c};return{prevYear:function(){s("sub")||(a.year--,t.checkDate("limit").calendar(),n.range||t.done(null,"change"))},prevMonth:function(){var e=t.getAsYM(a.year,a.month,"sub");w.extend(a,{year:e[0],month:e[1]}),t.checkDate("limit").calendar(),n.range||t.done(null,"change")},nextMonth:function(){var e=t.getAsYM(a.year,a.month);w.extend(a,{year:e[0],month:e[1]}),t.checkDate("limit").calendar(),n.range||t.done(null,"change")},nextYear:function(){s()||(a.year++,t.checkDate("limit").calendar(),n.range||t.done(null,"change"))}}},T.prototype.changeEvent=function(){var e=this;e.config;w(e.elem).on("click",function(e){w.stope(e)}),w.each(e.elemHeader,function(t,n){w(n[0]).on("click",function(n){e.change(t).prevYear()}),w(n[1]).on("click",function(n){e.change(t).prevMonth()}),w(n[2]).find("span").on("click",function(n){var a=w(this),i=a.attr("lay-ym"),r=a.attr("lay-type");i&&(i=i.split("-"),e.listYM[t]=[0|i[0],0|i[1]],e.list(r,t),w(e.footer).find(D).addClass(s))}),w(n[3]).on("click",function(n){e.change(t).nextMonth()}),w(n[4]).on("click",function(n){e.change(t).nextYear()})}),w.each(e.table,function(t,n){var a=w(n).find("td");a.on("click",function(){e.choose(w(this))})}),w(e.footer).find("span").on("click",function(){var t=w(this).attr("lay-type");e.tool(this,t)})},T.prototype.isInput=function(e){return/input|textarea/.test(e.tagName.toLocaleLowerCase())},T.prototype.events=function(){var e=this,t=e.config,n=function(n,a){n.on(t.trigger,function(){a&&(e.bindElem=this),e.render()})};t.elem[0]&&!t.elem[0].eventHandler&&(n(t.elem,"bind"),n(t.eventElem),w(document).on("click",function(n){n.target!==t.elem[0]&&n.target!==t.eventElem[0]&&n.target!==w(t.closeStop)[0]&&e.remove()}).on("keydown",function(t){13===t.keyCode&&w("#"+e.elemID)[0]&&e.elemID===T.thisElem&&(t.preventDefault(),w(e.footer).find(g)[0].click())}),w(window).on("resize",function(){return!(!e.elem||!w(r)[0])&&void e.position()}),t.elem[0].eventHandler=!0)},n.render=function(e){var t=new T(e);return a.call(t)},n.getEndDate=function(e,t){var n=new Date;return n.setFullYear(t||n.getFullYear(),e||n.getMonth()+1,1),new Date(n.getTime()-864e5).getDate()},window.lay=window.lay||w,e?(n.ready(),layui.define(function(e){n.path=layui.cache.dir,e(i,n)})):"function"==typeof define&&define.amd?define(function(){return n}):function(){n.ready(),window.laydate=n}()}();
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/lay/modules/layedit.js b/pluss-wap-page/src/main/resources/static/resources/js/lay/modules/layedit.js
new file mode 100644
index 0000000..96caa11
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/lay/modules/layedit.js
@@ -0,0 +1,2 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ ;layui.define(["layer","form"],function(t){"use strict";var e=layui.$,i=layui.layer,a=layui.form,l=(layui.hint(),layui.device()),n="layedit",o="layui-show",r="layui-disabled",c=function(){var t=this;t.index=0,t.config={tool:["strong","italic","underline","del","|","left","center","right","|","link","unlink","face","image"],hideTool:[],height:280}};c.prototype.set=function(t){var i=this;return e.extend(!0,i.config,t),i},c.prototype.on=function(t,e){return layui.onevent(n,t,e)},c.prototype.build=function(t,i){i=i||{};var a=this,n=a.config,r="layui-layedit",c=e("string"==typeof t?"#"+t:t),u="LAY_layedit_"+ ++a.index,d=c.next("."+r),y=e.extend({},n,i),f=function(){var t=[],e={};return layui.each(y.hideTool,function(t,i){e[i]=!0}),layui.each(y.tool,function(i,a){C[a]&&!e[a]&&t.push(C[a])}),t.join("")}(),m=e(['<div class="'+r+'">','<div class="layui-unselect layui-layedit-tool">'+f+"</div>",'<div class="layui-layedit-iframe">','<iframe id="'+u+'" name="'+u+'" textarea="'+t+'" frameborder="0"></iframe>',"</div>","</div>"].join(""));return l.ie&&l.ie<8?c.removeClass("layui-hide").addClass(o):(d[0]&&d.remove(),s.call(a,m,c[0],y),c.addClass("layui-hide").after(m),a.index)},c.prototype.getContent=function(t){var e=u(t);if(e[0])return d(e[0].document.body.innerHTML)},c.prototype.getText=function(t){var i=u(t);if(i[0])return e(i[0].document.body).text()},c.prototype.setContent=function(t,i,a){var l=u(t);l[0]&&(a?e(l[0].document.body).append(i):e(l[0].document.body).html(i),layedit.sync(t))},c.prototype.sync=function(t){var i=u(t);if(i[0]){var a=e("#"+i[1].attr("textarea"));a.val(d(i[0].document.body.innerHTML))}},c.prototype.getSelection=function(t){var e=u(t);if(e[0]){var i=m(e[0].document);return document.selection?i.text:i.toString()}};var s=function(t,i,a){var l=this,n=t.find("iframe");n.css({height:a.height}).on("load",function(){var o=n.contents(),r=n.prop("contentWindow"),c=o.find("head"),s=e(["<style>","*{margin: 0; padding: 0;}","body{padding: 10px; line-height: 20px; overflow-x: hidden; word-wrap: break-word; font: 14px Helvetica Neue,Helvetica,PingFang SC,Microsoft YaHei,Tahoma,Arial,sans-serif; -webkit-box-sizing: border-box !important; -moz-box-sizing: border-box !important; box-sizing: border-box !important;}","a{color:#01AAED; text-decoration:none;}a:hover{color:#c00}","p{margin-bottom: 10px;}","img{display: inline-block; border: none; vertical-align: middle;}","pre{margin: 10px 0; padding: 10px; line-height: 20px; border: 1px solid #ddd; border-left-width: 6px; background-color: #F2F2F2; color: #333; font-family: Courier New; font-size: 12px;}","</style>"].join("")),u=o.find("body");c.append(s),u.attr("contenteditable","true").css({"min-height":a.height}).html(i.value||""),y.apply(l,[r,n,i,a]),g.call(l,r,t,a)})},u=function(t){var i=e("#LAY_layedit_"+t),a=i.prop("contentWindow");return[a,i]},d=function(t){return 8==l.ie&&(t=t.replace(/<.+>/g,function(t){return t.toLowerCase()})),t},y=function(t,a,n,o){var r=t.document,c=e(r.body);c.on("keydown",function(t){var e=t.keyCode;if(13===e){var a=m(r),l=p(a),n=l.parentNode;if("pre"===n.tagName.toLowerCase()){if(t.shiftKey)return;return i.msg("请暂时用shift+enter"),!1}r.execCommand("formatBlock",!1,"<p>")}}),e(n).parents("form").on("submit",function(){var t=c.html();8==l.ie&&(t=t.replace(/<.+>/g,function(t){return t.toLowerCase()})),n.value=t}),c.on("paste",function(e){r.execCommand("formatBlock",!1,"<p>"),setTimeout(function(){f.call(t,c),n.value=c.html()},100)})},f=function(t){var i=this;i.document;t.find("*[style]").each(function(){var t=this.style.textAlign;this.removeAttribute("style"),e(this).css({"text-align":t||""})}),t.find("table").addClass("layui-table"),t.find("script,link").remove()},m=function(t){return t.selection?t.selection.createRange():t.getSelection().getRangeAt(0)},p=function(t){return t.endContainer||t.parentElement().childNodes[0]},v=function(t,i,a){var l=this.document,n=document.createElement(t);for(var o in i)n.setAttribute(o,i[o]);if(n.removeAttribute("text"),l.selection){var r=a.text||i.text;if("a"===t&&!r)return;r&&(n.innerHTML=r),a.pasteHTML(e(n).prop("outerHTML")),a.select()}else{var r=a.toString()||i.text;if("a"===t&&!r)return;r&&(n.innerHTML=r),a.deleteContents(),a.insertNode(n)}},h=function(t,i){var a=this.document,l="layedit-tool-active",n=p(m(a)),o=function(e){return t.find(".layedit-tool-"+e)};i&&i[i.hasClass(l)?"removeClass":"addClass"](l),t.find(">i").removeClass(l),o("unlink").addClass(r),e(n).parents().each(function(){var t=this.tagName.toLowerCase(),e=this.style.textAlign;"b"!==t&&"strong"!==t||o("b").addClass(l),"i"!==t&&"em"!==t||o("i").addClass(l),"u"===t&&o("u").addClass(l),"strike"===t&&o("d").addClass(l),"p"===t&&("center"===e?o("center").addClass(l):"right"===e?o("right").addClass(l):o("left").addClass(l)),"a"===t&&(o("link").addClass(l),o("unlink").removeClass(r))})},g=function(t,a,l){var n=t.document,o=e(n.body),c={link:function(i){var a=p(i),l=e(a).parent();b.call(o,{href:l.attr("href"),target:l.attr("target")},function(e){var a=l[0];"A"===a.tagName?a.href=e.url:v.call(t,"a",{target:e.target,href:e.url,text:e.url},i)})},unlink:function(t){n.execCommand("unlink")},face:function(e){x.call(this,function(i){v.call(t,"img",{src:i.src,alt:i.alt},e)})},image:function(a){var n=this;layui.use("upload",function(o){var r=l.uploadImage||{};o.render({url:r.url,method:r.type,elem:e(n).find("input")[0],done:function(e){0==e.code?(e.data=e.data||{},v.call(t,"img",{src:e.data.src,alt:e.data.title},a)):i.msg(e.msg||"上传失败")}})})},code:function(e){k.call(o,function(i){v.call(t,"pre",{text:i.code,"lay-lang":i.lang},e)})},help:function(){i.open({type:2,title:"帮助",area:["600px","380px"],shadeClose:!0,shade:.1,skin:"layui-layer-msg",content:["http://www.layui.com/about/layedit/help.html","no"]})}},s=a.find(".layui-layedit-tool"),u=function(){var i=e(this),a=i.attr("layedit-event"),l=i.attr("lay-command");if(!i.hasClass(r)){o.focus();var u=m(n);u.commonAncestorContainer;l?(n.execCommand(l),/justifyLeft|justifyCenter|justifyRight/.test(l)&&n.execCommand("formatBlock",!1,"<p>"),setTimeout(function(){o.focus()},10)):c[a]&&c[a].call(this,u),h.call(t,s,i)}},d=/image/;s.find(">i").on("mousedown",function(){var t=e(this),i=t.attr("layedit-event");d.test(i)||u.call(this)}).on("click",function(){var t=e(this),i=t.attr("layedit-event");d.test(i)&&u.call(this)}),o.on("click",function(){h.call(t,s),i.close(x.index)})},b=function(t,e){var l=this,n=i.open({type:1,id:"LAY_layedit_link",area:"350px",shade:.05,shadeClose:!0,moveType:1,title:"超链接",skin:"layui-layer-msg",content:['<ul class="layui-form" style="margin: 15px;">','<li class="layui-form-item">','<label class="layui-form-label" style="width: 60px;">URL</label>','<div class="layui-input-block" style="margin-left: 90px">','<input name="url" lay-verify="url" value="'+(t.href||"")+'" autofocus="true" autocomplete="off" class="layui-input">',"</div>","</li>",'<li class="layui-form-item">','<label class="layui-form-label" style="width: 60px;">打开方式</label>','<div class="layui-input-block" style="margin-left: 90px">','<input type="radio" name="target" value="_self" class="layui-input" title="当前窗口"'+("_self"!==t.target&&t.target?"":"checked")+">",'<input type="radio" name="target" value="_blank" class="layui-input" title="新窗口" '+("_blank"===t.target?"checked":"")+">","</div>","</li>",'<li class="layui-form-item" style="text-align: center;">','<button type="button" lay-submit lay-filter="layedit-link-yes" class="layui-btn"> 确定 </button>','<button style="margin-left: 20px;" type="button" class="layui-btn layui-btn-primary"> 取消 </button>',"</li>","</ul>"].join(""),success:function(t,n){var o="submit(layedit-link-yes)";a.render("radio"),t.find(".layui-btn-primary").on("click",function(){i.close(n),l.focus()}),a.on(o,function(t){i.close(b.index),e&&e(t.field)})}});b.index=n},x=function(t){var a=function(){var t=["[微笑]","[嘻嘻]","[哈哈]","[可爱]","[可怜]","[挖鼻]","[吃惊]","[害羞]","[挤眼]","[闭嘴]","[鄙视]","[爱你]","[泪]","[偷笑]","[亲亲]","[生病]","[太开心]","[白眼]","[右哼哼]","[左哼哼]","[嘘]","[衰]","[委屈]","[吐]","[哈欠]","[抱抱]","[怒]","[疑问]","[馋嘴]","[拜拜]","[思考]","[汗]","[困]","[睡]","[钱]","[失望]","[酷]","[色]","[哼]","[鼓掌]","[晕]","[悲伤]","[抓狂]","[黑线]","[阴险]","[怒骂]","[互粉]","[心]","[伤心]","[猪头]","[熊猫]","[兔子]","[ok]","[耶]","[good]","[NO]","[赞]","[来]","[弱]","[草泥马]","[神马]","[囧]","[浮云]","[给力]","[围观]","[威武]","[奥特曼]","[礼物]","[钟]","[话筒]","[蜡烛]","[蛋糕]"],e={};return layui.each(t,function(t,i){e[i]=layui.cache.dir+"images/face/"+t+".gif"}),e}();return x.hide=x.hide||function(t){"face"!==e(t.target).attr("layedit-event")&&i.close(x.index)},x.index=i.tips(function(){var t=[];return layui.each(a,function(e,i){t.push('<li title="'+e+'"><img src="'+i+'" alt="'+e+'"></li>')}),'<ul class="layui-clear">'+t.join("")+"</ul>"}(),this,{tips:1,time:0,skin:"layui-box layui-util-face",maxWidth:500,success:function(l,n){l.css({marginTop:-4,marginLeft:-10}).find(".layui-clear>li").on("click",function(){t&&t({src:a[this.title],alt:this.title}),i.close(n)}),e(document).off("click",x.hide).on("click",x.hide)}})},k=function(t){var e=this,l=i.open({type:1,id:"LAY_layedit_code",area:"550px",shade:.05,shadeClose:!0,moveType:1,title:"插入代码",skin:"layui-layer-msg",content:['<ul class="layui-form layui-form-pane" style="margin: 15px;">','<li class="layui-form-item">','<label class="layui-form-label">请选择语言</label>','<div class="layui-input-block">','<select name="lang">','<option value="JavaScript">JavaScript</option>','<option value="HTML">HTML</option>','<option value="CSS">CSS</option>','<option value="Java">Java</option>','<option value="PHP">PHP</option>','<option value="C#">C#</option>','<option value="Python">Python</option>','<option value="Ruby">Ruby</option>','<option value="Go">Go</option>',"</select>","</div>","</li>",'<li class="layui-form-item layui-form-text">','<label class="layui-form-label">代码</label>','<div class="layui-input-block">','<textarea name="code" lay-verify="required" autofocus="true" class="layui-textarea" style="height: 200px;"></textarea>',"</div>","</li>",'<li class="layui-form-item" style="text-align: center;">','<button type="button" lay-submit lay-filter="layedit-code-yes" class="layui-btn"> 确定 </button>','<button style="margin-left: 20px;" type="button" class="layui-btn layui-btn-primary"> 取消 </button>',"</li>","</ul>"].join(""),success:function(l,n){var o="submit(layedit-code-yes)";a.render("select"),l.find(".layui-btn-primary").on("click",function(){i.close(n),e.focus()}),a.on(o,function(e){i.close(k.index),t&&t(e.field)})}});k.index=l},C={html:'<i class="layui-icon layedit-tool-html" title="HTML源代码" lay-command="html" layedit-event="html"">&#xe64b;</i><span class="layedit-tool-mid"></span>',strong:'<i class="layui-icon layedit-tool-b" title="加粗" lay-command="Bold" layedit-event="b"">&#xe62b;</i>',italic:'<i class="layui-icon layedit-tool-i" title="斜体" lay-command="italic" layedit-event="i"">&#xe644;</i>',underline:'<i class="layui-icon layedit-tool-u" title="下划线" lay-command="underline" layedit-event="u"">&#xe646;</i>',del:'<i class="layui-icon layedit-tool-d" title="删除线" lay-command="strikeThrough" layedit-event="d"">&#xe64f;</i>',"|":'<span class="layedit-tool-mid"></span>',left:'<i class="layui-icon layedit-tool-left" title="左对齐" lay-command="justifyLeft" layedit-event="left"">&#xe649;</i>',center:'<i class="layui-icon layedit-tool-center" title="居中对齐" lay-command="justifyCenter" layedit-event="center"">&#xe647;</i>',right:'<i class="layui-icon layedit-tool-right" title="右对齐" lay-command="justifyRight" layedit-event="right"">&#xe648;</i>',link:'<i class="layui-icon layedit-tool-link" title="插入链接" layedit-event="link"">&#xe64c;</i>',unlink:'<i class="layui-icon layedit-tool-unlink layui-disabled" title="清除链接" lay-command="unlink" layedit-event="unlink"">&#xe64d;</i>',face:'<i class="layui-icon layedit-tool-face" title="表情" layedit-event="face"">&#xe650;</i>',image:'<i class="layui-icon layedit-tool-image" title="图片" layedit-event="image">&#xe64a;<input type="file" name="file"></i>',code:'<i class="layui-icon layedit-tool-code" title="插入代码" layedit-event="code">&#xe64e;</i>',help:'<i class="layui-icon layedit-tool-help" title="帮助" layedit-event="help">&#xe607;</i>'},w=new c;t(n,w)});
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/lay/modules/layer.js b/pluss-wap-page/src/main/resources/static/resources/js/lay/modules/layer.js
new file mode 100644
index 0000000..c6d5378
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/lay/modules/layer.js
@@ -0,0 +1,2 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ ;!function(e,t){"use strict";var i,n,a=e.layui&&layui.define,o={getPath:function(){var e=document.currentScript?document.currentScript.src:function(){for(var e,t=document.scripts,i=t.length-1,n=i;n>0;n--)if("interactive"===t[n].readyState){e=t[n].src;break}return e||t[i].src}();return e.substring(0,e.lastIndexOf("/")+1)}(),config:{},end:{},minIndex:0,minLeft:[],btn:["&#x786E;&#x5B9A;","&#x53D6;&#x6D88;"],type:["dialog","page","iframe","loading","tips"],getStyle:function(t,i){var n=t.currentStyle?t.currentStyle:e.getComputedStyle(t,null);return n[n.getPropertyValue?"getPropertyValue":"getAttribute"](i)},link:function(t,i,n){if(r.path){var a=document.getElementsByTagName("head")[0],s=document.createElement("link");"string"==typeof i&&(n=i);var l=(n||t).replace(/\.|\//g,""),f="layuicss-"+l,c=0;s.rel="stylesheet",s.href=r.path+t,s.id=f,document.getElementById(f)||a.appendChild(s),"function"==typeof i&&!function u(){return++c>80?e.console&&console.error("layer.css: Invalid"):void(1989===parseInt(o.getStyle(document.getElementById(f),"width"))?i():setTimeout(u,100))}()}}},r={v:"3.1.1",ie:function(){var t=navigator.userAgent.toLowerCase();return!!(e.ActiveXObject||"ActiveXObject"in e)&&((t.match(/msie\s(\d+)/)||[])[1]||"11")}(),index:e.layer&&e.layer.v?1e5:0,path:o.getPath,config:function(e,t){return e=e||{},r.cache=o.config=i.extend({},o.config,e),r.path=o.config.path||r.path,"string"==typeof e.extend&&(e.extend=[e.extend]),o.config.path&&r.ready(),e.extend?(a?layui.addcss("modules/layer/"+e.extend):o.link("theme/"+e.extend),this):this},ready:function(e){var t="layer",i="",n=(a?"modules/layer/":"theme/")+"default/layer.css?v="+r.v+i;return a?layui.addcss(n,e,t):o.link(n,e,t),this},alert:function(e,t,n){var a="function"==typeof t;return a&&(n=t),r.open(i.extend({content:e,yes:n},a?{}:t))},confirm:function(e,t,n,a){var s="function"==typeof t;return s&&(a=n,n=t),r.open(i.extend({content:e,btn:o.btn,yes:n,btn2:a},s?{}:t))},msg:function(e,n,a){var s="function"==typeof n,f=o.config.skin,c=(f?f+" "+f+"-msg":"")||"layui-layer-msg",u=l.anim.length-1;return s&&(a=n),r.open(i.extend({content:e,time:3e3,shade:!1,skin:c,title:!1,closeBtn:!1,btn:!1,resize:!1,end:a},s&&!o.config.skin?{skin:c+" layui-layer-hui",anim:u}:function(){return n=n||{},(n.icon===-1||n.icon===t&&!o.config.skin)&&(n.skin=c+" "+(n.skin||"layui-layer-hui")),n}()))},load:function(e,t){return r.open(i.extend({type:3,icon:e||0,resize:!1,shade:.01},t))},tips:function(e,t,n){return r.open(i.extend({type:4,content:[e,t],closeBtn:!1,time:3e3,shade:!1,resize:!1,fixed:!1,maxWidth:210},n))}},s=function(e){var t=this;t.index=++r.index,t.config=i.extend({},t.config,o.config,e),document.body?t.creat():setTimeout(function(){t.creat()},30)};s.pt=s.prototype;var l=["layui-layer",".layui-layer-title",".layui-layer-main",".layui-layer-dialog","layui-layer-iframe","layui-layer-content","layui-layer-btn","layui-layer-close"];l.anim=["layer-anim-00","layer-anim-01","layer-anim-02","layer-anim-03","layer-anim-04","layer-anim-05","layer-anim-06"],s.pt.config={type:0,shade:.3,fixed:!0,move:l[1],title:"&#x4FE1;&#x606F;",offset:"auto",area:"auto",closeBtn:1,time:0,zIndex:19891014,maxWidth:360,anim:0,isOutAnim:!0,icon:-1,moveType:1,resize:!0,scrollbar:!0,tips:2},s.pt.vessel=function(e,t){var n=this,a=n.index,r=n.config,s=r.zIndex+a,f="object"==typeof r.title,c=r.maxmin&&(1===r.type||2===r.type),u=r.title?'<div class="layui-layer-title" style="'+(f?r.title[1]:"")+'">'+(f?r.title[0]:r.title)+"</div>":"";return r.zIndex=s,t([r.shade?'<div class="layui-layer-shade" id="layui-layer-shade'+a+'" times="'+a+'" style="'+("z-index:"+(s-1)+"; ")+'"></div>':"",'<div class="'+l[0]+(" layui-layer-"+o.type[r.type])+(0!=r.type&&2!=r.type||r.shade?"":" layui-layer-border")+" "+(r.skin||"")+'" id="'+l[0]+a+'" type="'+o.type[r.type]+'" times="'+a+'" showtime="'+r.time+'" conType="'+(e?"object":"string")+'" style="z-index: '+s+"; width:"+r.area[0]+";height:"+r.area[1]+(r.fixed?"":";position:absolute;")+'">'+(e&&2!=r.type?"":u)+'<div id="'+(r.id||"")+'" class="layui-layer-content'+(0==r.type&&r.icon!==-1?" layui-layer-padding":"")+(3==r.type?" layui-layer-loading"+r.icon:"")+'">'+(0==r.type&&r.icon!==-1?'<i class="layui-layer-ico layui-layer-ico'+r.icon+'"></i>':"")+(1==r.type&&e?"":r.content||"")+'</div><span class="layui-layer-setwin">'+function(){var e=c?'<a class="layui-layer-min" href="javascript:;"><cite></cite></a><a class="layui-layer-ico layui-layer-max" href="javascript:;"></a>':"";return r.closeBtn&&(e+='<a class="layui-layer-ico '+l[7]+" "+l[7]+(r.title?r.closeBtn:4==r.type?"1":"2")+'" href="javascript:;"></a>'),e}()+"</span>"+(r.btn?function(){var e="";"string"==typeof r.btn&&(r.btn=[r.btn]);for(var t=0,i=r.btn.length;t<i;t++)e+='<a class="'+l[6]+t+'">'+r.btn[t]+"</a>";return'<div class="'+l[6]+" layui-layer-btn-"+(r.btnAlign||"")+'">'+e+"</div>"}():"")+(r.resize?'<span class="layui-layer-resize"></span>':"")+"</div>"],u,i('<div class="layui-layer-move"></div>')),n},s.pt.creat=function(){var e=this,t=e.config,a=e.index,s=t.content,f="object"==typeof s,c=i("body");if(!t.id||!i("#"+t.id)[0]){switch("string"==typeof t.area&&(t.area="auto"===t.area?["",""]:[t.area,""]),t.shift&&(t.anim=t.shift),6==r.ie&&(t.fixed=!1),t.type){case 0:t.btn="btn"in t?t.btn:o.btn[0],r.closeAll("dialog");break;case 2:var s=t.content=f?t.content:[t.content||"","auto"];t.content='<iframe scrolling="'+(t.content[1]||"auto")+'" allowtransparency="true" id="'+l[4]+a+'" name="'+l[4]+a+'" onload="this.className=\'\';" class="layui-layer-load" frameborder="0" src="'+t.content[0]+'"></iframe>';break;case 3:delete t.title,delete t.closeBtn,t.icon===-1&&0===t.icon,r.closeAll("loading");break;case 4:f||(t.content=[t.content,"body"]),t.follow=t.content[1],t.content=t.content[0]+'<i class="layui-layer-TipsG"></i>',delete t.title,t.tips="object"==typeof t.tips?t.tips:[t.tips,!0],t.tipsMore||r.closeAll("tips")}if(e.vessel(f,function(n,r,u){c.append(n[0]),f?function(){2==t.type||4==t.type?function(){i("body").append(n[1])}():function(){s.parents("."+l[0])[0]||(s.data("display",s.css("display")).show().addClass("layui-layer-wrap").wrap(n[1]),i("#"+l[0]+a).find("."+l[5]).before(r))}()}():c.append(n[1]),i(".layui-layer-move")[0]||c.append(o.moveElem=u),e.layero=i("#"+l[0]+a),t.scrollbar||l.html.css("overflow","hidden").attr("layer-full",a)}).auto(a),i("#layui-layer-shade"+e.index).css({"background-color":t.shade[1]||"#000",opacity:t.shade[0]||t.shade}),2==t.type&&6==r.ie&&e.layero.find("iframe").attr("src",s[0]),4==t.type?e.tips():e.offset(),t.fixed&&n.on("resize",function(){e.offset(),(/^\d+%$/.test(t.area[0])||/^\d+%$/.test(t.area[1]))&&e.auto(a),4==t.type&&e.tips()}),t.time<=0||setTimeout(function(){r.close(e.index)},t.time),e.move().callback(),l.anim[t.anim]){var u="layer-anim "+l.anim[t.anim];e.layero.addClass(u).one("webkitAnimationEnd mozAnimationEnd MSAnimationEnd oanimationend animationend",function(){i(this).removeClass(u)})}t.isOutAnim&&e.layero.data("isOutAnim",!0)}},s.pt.auto=function(e){var t=this,a=t.config,o=i("#"+l[0]+e);""===a.area[0]&&a.maxWidth>0&&(r.ie&&r.ie<8&&a.btn&&o.width(o.innerWidth()),o.outerWidth()>a.maxWidth&&o.width(a.maxWidth));var s=[o.innerWidth(),o.innerHeight()],f=o.find(l[1]).outerHeight()||0,c=o.find("."+l[6]).outerHeight()||0,u=function(e){e=o.find(e),e.height(s[1]-f-c-2*(0|parseFloat(e.css("padding-top"))))};switch(a.type){case 2:u("iframe");break;default:""===a.area[1]?a.maxHeight>0&&o.outerHeight()>a.maxHeight?(s[1]=a.maxHeight,u("."+l[5])):a.fixed&&s[1]>=n.height()&&(s[1]=n.height(),u("."+l[5])):u("."+l[5])}return t},s.pt.offset=function(){var e=this,t=e.config,i=e.layero,a=[i.outerWidth(),i.outerHeight()],o="object"==typeof t.offset;e.offsetTop=(n.height()-a[1])/2,e.offsetLeft=(n.width()-a[0])/2,o?(e.offsetTop=t.offset[0],e.offsetLeft=t.offset[1]||e.offsetLeft):"auto"!==t.offset&&("t"===t.offset?e.offsetTop=0:"r"===t.offset?e.offsetLeft=n.width()-a[0]:"b"===t.offset?e.offsetTop=n.height()-a[1]:"l"===t.offset?e.offsetLeft=0:"lt"===t.offset?(e.offsetTop=0,e.offsetLeft=0):"lb"===t.offset?(e.offsetTop=n.height()-a[1],e.offsetLeft=0):"rt"===t.offset?(e.offsetTop=0,e.offsetLeft=n.width()-a[0]):"rb"===t.offset?(e.offsetTop=n.height()-a[1],e.offsetLeft=n.width()-a[0]):e.offsetTop=t.offset),t.fixed||(e.offsetTop=/%$/.test(e.offsetTop)?n.height()*parseFloat(e.offsetTop)/100:parseFloat(e.offsetTop),e.offsetLeft=/%$/.test(e.offsetLeft)?n.width()*parseFloat(e.offsetLeft)/100:parseFloat(e.offsetLeft),e.offsetTop+=n.scrollTop(),e.offsetLeft+=n.scrollLeft()),i.attr("minLeft")&&(e.offsetTop=n.height()-(i.find(l[1]).outerHeight()||0),e.offsetLeft=i.css("left")),i.css({top:e.offsetTop,left:e.offsetLeft})},s.pt.tips=function(){var e=this,t=e.config,a=e.layero,o=[a.outerWidth(),a.outerHeight()],r=i(t.follow);r[0]||(r=i("body"));var s={width:r.outerWidth(),height:r.outerHeight(),top:r.offset().top,left:r.offset().left},f=a.find(".layui-layer-TipsG"),c=t.tips[0];t.tips[1]||f.remove(),s.autoLeft=function(){s.left+o[0]-n.width()>0?(s.tipLeft=s.left+s.width-o[0],f.css({right:12,left:"auto"})):s.tipLeft=s.left},s.where=[function(){s.autoLeft(),s.tipTop=s.top-o[1]-10,f.removeClass("layui-layer-TipsB").addClass("layui-layer-TipsT").css("border-right-color",t.tips[1])},function(){s.tipLeft=s.left+s.width+10,s.tipTop=s.top,f.removeClass("layui-layer-TipsL").addClass("layui-layer-TipsR").css("border-bottom-color",t.tips[1])},function(){s.autoLeft(),s.tipTop=s.top+s.height+10,f.removeClass("layui-layer-TipsT").addClass("layui-layer-TipsB").css("border-right-color",t.tips[1])},function(){s.tipLeft=s.left-o[0]-10,s.tipTop=s.top,f.removeClass("layui-layer-TipsR").addClass("layui-layer-TipsL").css("border-bottom-color",t.tips[1])}],s.where[c-1](),1===c?s.top-(n.scrollTop()+o[1]+16)<0&&s.where[2]():2===c?n.width()-(s.left+s.width+o[0]+16)>0||s.where[3]():3===c?s.top-n.scrollTop()+s.height+o[1]+16-n.height()>0&&s.where[0]():4===c&&o[0]+16-s.left>0&&s.where[1](),a.find("."+l[5]).css({"background-color":t.tips[1],"padding-right":t.closeBtn?"30px":""}),a.css({left:s.tipLeft-(t.fixed?n.scrollLeft():0),top:s.tipTop-(t.fixed?n.scrollTop():0)})},s.pt.move=function(){var e=this,t=e.config,a=i(document),s=e.layero,l=s.find(t.move),f=s.find(".layui-layer-resize"),c={};return t.move&&l.css("cursor","move"),l.on("mousedown",function(e){e.preventDefault(),t.move&&(c.moveStart=!0,c.offset=[e.clientX-parseFloat(s.css("left")),e.clientY-parseFloat(s.css("top"))],o.moveElem.css("cursor","move").show())}),f.on("mousedown",function(e){e.preventDefault(),c.resizeStart=!0,c.offset=[e.clientX,e.clientY],c.area=[s.outerWidth(),s.outerHeight()],o.moveElem.css("cursor","se-resize").show()}),a.on("mousemove",function(i){if(c.moveStart){var a=i.clientX-c.offset[0],o=i.clientY-c.offset[1],l="fixed"===s.css("position");if(i.preventDefault(),c.stX=l?0:n.scrollLeft(),c.stY=l?0:n.scrollTop(),!t.moveOut){var f=n.width()-s.outerWidth()+c.stX,u=n.height()-s.outerHeight()+c.stY;a<c.stX&&(a=c.stX),a>f&&(a=f),o<c.stY&&(o=c.stY),o>u&&(o=u)}s.css({left:a,top:o})}if(t.resize&&c.resizeStart){var a=i.clientX-c.offset[0],o=i.clientY-c.offset[1];i.preventDefault(),r.style(e.index,{width:c.area[0]+a,height:c.area[1]+o}),c.isResize=!0,t.resizing&&t.resizing(s)}}).on("mouseup",function(e){c.moveStart&&(delete c.moveStart,o.moveElem.hide(),t.moveEnd&&t.moveEnd(s)),c.resizeStart&&(delete c.resizeStart,o.moveElem.hide())}),e},s.pt.callback=function(){function e(){var e=a.cancel&&a.cancel(t.index,n);e===!1||r.close(t.index)}var t=this,n=t.layero,a=t.config;t.openLayer(),a.success&&(2==a.type?n.find("iframe").on("load",function(){a.success(n,t.index)}):a.success(n,t.index)),6==r.ie&&t.IE6(n),n.find("."+l[6]).children("a").on("click",function(){var e=i(this).index();if(0===e)a.yes?a.yes(t.index,n):a.btn1?a.btn1(t.index,n):r.close(t.index);else{var o=a["btn"+(e+1)]&&a["btn"+(e+1)](t.index,n);o===!1||r.close(t.index)}}),n.find("."+l[7]).on("click",e),a.shadeClose&&i("#layui-layer-shade"+t.index).on("click",function(){r.close(t.index)}),n.find(".layui-layer-min").on("click",function(){var e=a.min&&a.min(n);e===!1||r.min(t.index,a)}),n.find(".layui-layer-max").on("click",function(){i(this).hasClass("layui-layer-maxmin")?(r.restore(t.index),a.restore&&a.restore(n)):(r.full(t.index,a),setTimeout(function(){a.full&&a.full(n)},100))}),a.end&&(o.end[t.index]=a.end)},o.reselect=function(){i.each(i("select"),function(e,t){var n=i(this);n.parents("."+l[0])[0]||1==n.attr("layer")&&i("."+l[0]).length<1&&n.removeAttr("layer").show(),n=null})},s.pt.IE6=function(e){i("select").each(function(e,t){var n=i(this);n.parents("."+l[0])[0]||"none"===n.css("display")||n.attr({layer:"1"}).hide(),n=null})},s.pt.openLayer=function(){var e=this;r.zIndex=e.config.zIndex,r.setTop=function(e){var t=function(){r.zIndex++,e.css("z-index",r.zIndex+1)};return r.zIndex=parseInt(e[0].style.zIndex),e.on("mousedown",t),r.zIndex}},o.record=function(e){var t=[e.width(),e.height(),e.position().top,e.position().left+parseFloat(e.css("margin-left"))];e.find(".layui-layer-max").addClass("layui-layer-maxmin"),e.attr({area:t})},o.rescollbar=function(e){l.html.attr("layer-full")==e&&(l.html[0].style.removeProperty?l.html[0].style.removeProperty("overflow"):l.html[0].style.removeAttribute("overflow"),l.html.removeAttr("layer-full"))},e.layer=r,r.getChildFrame=function(e,t){return t=t||i("."+l[4]).attr("times"),i("#"+l[0]+t).find("iframe").contents().find(e)},r.getFrameIndex=function(e){return i("#"+e).parents("."+l[4]).attr("times")},r.iframeAuto=function(e){if(e){var t=r.getChildFrame("html",e).outerHeight(),n=i("#"+l[0]+e),a=n.find(l[1]).outerHeight()||0,o=n.find("."+l[6]).outerHeight()||0;n.css({height:t+a+o}),n.find("iframe").css({height:t})}},r.iframeSrc=function(e,t){i("#"+l[0]+e).find("iframe").attr("src",t)},r.style=function(e,t,n){var a=i("#"+l[0]+e),r=a.find(".layui-layer-content"),s=a.attr("type"),f=a.find(l[1]).outerHeight()||0,c=a.find("."+l[6]).outerHeight()||0;a.attr("minLeft");s!==o.type[3]&&s!==o.type[4]&&(n||(parseFloat(t.width)<=260&&(t.width=260),parseFloat(t.height)-f-c<=64&&(t.height=64+f+c)),a.css(t),c=a.find("."+l[6]).outerHeight(),s===o.type[2]?a.find("iframe").css({height:parseFloat(t.height)-f-c}):r.css({height:parseFloat(t.height)-f-c-parseFloat(r.css("padding-top"))-parseFloat(r.css("padding-bottom"))}))},r.min=function(e,t){var a=i("#"+l[0]+e),s=a.find(l[1]).outerHeight()||0,f=a.attr("minLeft")||181*o.minIndex+"px",c=a.css("position");o.record(a),o.minLeft[0]&&(f=o.minLeft[0],o.minLeft.shift()),a.attr("position",c),r.style(e,{width:180,height:s,left:f,top:n.height()-s,position:"fixed",overflow:"hidden"},!0),a.find(".layui-layer-min").hide(),"page"===a.attr("type")&&a.find(l[4]).hide(),o.rescollbar(e),a.attr("minLeft")||o.minIndex++,a.attr("minLeft",f)},r.restore=function(e){var t=i("#"+l[0]+e),n=t.attr("area").split(",");t.attr("type");r.style(e,{width:parseFloat(n[0]),height:parseFloat(n[1]),top:parseFloat(n[2]),left:parseFloat(n[3]),position:t.attr("position"),overflow:"visible"},!0),t.find(".layui-layer-max").removeClass("layui-layer-maxmin"),t.find(".layui-layer-min").show(),"page"===t.attr("type")&&t.find(l[4]).show(),o.rescollbar(e)},r.full=function(e){var t,a=i("#"+l[0]+e);o.record(a),l.html.attr("layer-full")||l.html.css("overflow","hidden").attr("layer-full",e),clearTimeout(t),t=setTimeout(function(){var t="fixed"===a.css("position");r.style(e,{top:t?0:n.scrollTop(),left:t?0:n.scrollLeft(),width:n.width(),height:n.height()},!0),a.find(".layui-layer-min").hide()},100)},r.title=function(e,t){var n=i("#"+l[0]+(t||r.index)).find(l[1]);n.html(e)},r.close=function(e){var t=i("#"+l[0]+e),n=t.attr("type"),a="layer-anim-close";if(t[0]){var s="layui-layer-wrap",f=function(){if(n===o.type[1]&&"object"===t.attr("conType")){t.children(":not(."+l[5]+")").remove();for(var a=t.find("."+s),r=0;r<2;r++)a.unwrap();a.css("display",a.data("display")).removeClass(s)}else{if(n===o.type[2])try{var f=i("#"+l[4]+e)[0];f.contentWindow.document.write(""),f.contentWindow.close(),t.find("."+l[5])[0].removeChild(f)}catch(c){}t[0].innerHTML="",t.remove()}"function"==typeof o.end[e]&&o.end[e](),delete o.end[e]};t.data("isOutAnim")&&t.addClass("layer-anim "+a),i("#layui-layer-moves, #layui-layer-shade"+e).remove(),6==r.ie&&o.reselect(),o.rescollbar(e),t.attr("minLeft")&&(o.minIndex--,o.minLeft.push(t.attr("minLeft"))),r.ie&&r.ie<10||!t.data("isOutAnim")?f():setTimeout(function(){f()},200)}},r.closeAll=function(e){i.each(i("."+l[0]),function(){var t=i(this),n=e?t.attr("type")===e:1;n&&r.close(t.attr("times")),n=null})};var f=r.cache||{},c=function(e){return f.skin?" "+f.skin+" "+f.skin+"-"+e:""};r.prompt=function(e,t){var a="";if(e=e||{},"function"==typeof e&&(t=e),e.area){var o=e.area;a='style="width: '+o[0]+"; height: "+o[1]+';"',delete e.area}var s,l=2==e.formType?'<textarea class="layui-layer-input"'+a+"></textarea>":function(){return'<input type="'+(1==e.formType?"password":"text")+'" class="layui-layer-input">'}(),f=e.success;return delete e.success,r.open(i.extend({type:1,btn:["&#x786E;&#x5B9A;","&#x53D6;&#x6D88;"],content:l,skin:"layui-layer-prompt"+c("prompt"),maxWidth:n.width(),success:function(t){s=t.find(".layui-layer-input"),s.val(e.value||"").focus(),"function"==typeof f&&f(t)},resize:!1,yes:function(i){var n=s.val();""===n?s.focus():n.length>(e.maxlength||500)?r.tips("&#x6700;&#x591A;&#x8F93;&#x5165;"+(e.maxlength||500)+"&#x4E2A;&#x5B57;&#x6570;",s,{tips:1}):t&&t(n,i,s)}},e))},r.tab=function(e){e=e||{};var t=e.tab||{},n="layui-this",a=e.success;return delete e.success,r.open(i.extend({type:1,skin:"layui-layer-tab"+c("tab"),resize:!1,title:function(){var e=t.length,i=1,a="";if(e>0)for(a='<span class="'+n+'">'+t[0].title+"</span>";i<e;i++)a+="<span>"+t[i].title+"</span>";return a}(),content:'<ul class="layui-layer-tabmain">'+function(){var e=t.length,i=1,a="";if(e>0)for(a='<li class="layui-layer-tabli '+n+'">'+(t[0].content||"no content")+"</li>";i<e;i++)a+='<li class="layui-layer-tabli">'+(t[i].content||"no  content")+"</li>";return a}()+"</ul>",success:function(t){var o=t.find(".layui-layer-title").children(),r=t.find(".layui-layer-tabmain").children();o.on("mousedown",function(t){t.stopPropagation?t.stopPropagation():t.cancelBubble=!0;var a=i(this),o=a.index();a.addClass(n).siblings().removeClass(n),r.eq(o).show().siblings().hide(),"function"==typeof e.change&&e.change(o)}),"function"==typeof a&&a(t)}},e))},r.photos=function(t,n,a){function o(e,t,i){var n=new Image;return n.src=e,n.complete?t(n):(n.onload=function(){n.onload=null,t(n)},void(n.onerror=function(e){n.onerror=null,i(e)}))}var s={};if(t=t||{},t.photos){var l=t.photos.constructor===Object,f=l?t.photos:{},u=f.data||[],d=f.start||0;s.imgIndex=(0|d)+1,t.img=t.img||"img";var y=t.success;if(delete t.success,l){if(0===u.length)return r.msg("&#x6CA1;&#x6709;&#x56FE;&#x7247;")}else{var p=i(t.photos),h=function(){u=[],p.find(t.img).each(function(e){var t=i(this);t.attr("layer-index",e),u.push({alt:t.attr("alt"),pid:t.attr("layer-pid"),src:t.attr("layer-src")||t.attr("src"),thumb:t.attr("src")})})};if(h(),0===u.length)return;if(n||p.on("click",t.img,function(){var e=i(this),n=e.attr("layer-index");r.photos(i.extend(t,{photos:{start:n,data:u,tab:t.tab},full:t.full}),!0),h()}),!n)return}s.imgprev=function(e){s.imgIndex--,s.imgIndex<1&&(s.imgIndex=u.length),s.tabimg(e)},s.imgnext=function(e,t){s.imgIndex++,s.imgIndex>u.length&&(s.imgIndex=1,t)||s.tabimg(e)},s.keyup=function(e){if(!s.end){var t=e.keyCode;e.preventDefault(),37===t?s.imgprev(!0):39===t?s.imgnext(!0):27===t&&r.close(s.index)}},s.tabimg=function(e){if(!(u.length<=1))return f.start=s.imgIndex-1,r.close(s.index),r.photos(t,!0,e)},s.event=function(){s.bigimg.hover(function(){s.imgsee.show()},function(){s.imgsee.hide()}),s.bigimg.find(".layui-layer-imgprev").on("click",function(e){e.preventDefault(),s.imgprev()}),s.bigimg.find(".layui-layer-imgnext").on("click",function(e){e.preventDefault(),s.imgnext()}),i(document).on("keyup",s.keyup)},s.loadi=r.load(1,{shade:!("shade"in t)&&.9,scrollbar:!1}),o(u[d].src,function(n){r.close(s.loadi),s.index=r.open(i.extend({type:1,id:"layui-layer-photos",area:function(){var a=[n.width,n.height],o=[i(e).width()-100,i(e).height()-100];if(!t.full&&(a[0]>o[0]||a[1]>o[1])){var r=[a[0]/o[0],a[1]/o[1]];r[0]>r[1]?(a[0]=a[0]/r[0],a[1]=a[1]/r[0]):r[0]<r[1]&&(a[0]=a[0]/r[1],a[1]=a[1]/r[1])}return[a[0]+"px",a[1]+"px"]}(),title:!1,shade:.9,shadeClose:!0,closeBtn:!1,move:".layui-layer-phimg img",moveType:1,scrollbar:!1,moveOut:!0,isOutAnim:!1,skin:"layui-layer-photos"+c("photos"),content:'<div class="layui-layer-phimg"><img src="'+u[d].src+'" alt="'+(u[d].alt||"")+'" layer-pid="'+u[d].pid+'"><div class="layui-layer-imgsee">'+(u.length>1?'<span class="layui-layer-imguide"><a href="javascript:;" class="layui-layer-iconext layui-layer-imgprev"></a><a href="javascript:;" class="layui-layer-iconext layui-layer-imgnext"></a></span>':"")+'<div class="layui-layer-imgbar" style="display:'+(a?"block":"")+'"><span class="layui-layer-imgtit"><a href="javascript:;">'+(u[d].alt||"")+"</a><em>"+s.imgIndex+"/"+u.length+"</em></span></div></div></div>",success:function(e,i){s.bigimg=e.find(".layui-layer-phimg"),s.imgsee=e.find(".layui-layer-imguide,.layui-layer-imgbar"),s.event(e),t.tab&&t.tab(u[d],e),"function"==typeof y&&y(e)},end:function(){s.end=!0,i(document).off("keyup",s.keyup)}},t))},function(){r.close(s.loadi),r.msg("&#x5F53;&#x524D;&#x56FE;&#x7247;&#x5730;&#x5740;&#x5F02;&#x5E38;<br>&#x662F;&#x5426;&#x7EE7;&#x7EED;&#x67E5;&#x770B;&#x4E0B;&#x4E00;&#x5F20;&#xFF1F;",{time:3e4,btn:["&#x4E0B;&#x4E00;&#x5F20;","&#x4E0D;&#x770B;&#x4E86;"],yes:function(){u.length>1&&s.imgnext(!0,!0)}})})}},o.run=function(t){i=t,n=i(e),l.html=i("html"),r.open=function(e){var t=new s(e);return t.index}},e.layui&&layui.define?(r.ready(),layui.define("jquery",function(t){r.path=layui.cache.dir,o.run(layui.$),e.layer=r,t("layer",r)})):"function"==typeof define&&define.amd?define(["jquery"],function(){return o.run(e.jQuery),r}):function(){o.run(e.jQuery),r.ready()}()}(window);
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/lay/modules/laypage.js b/pluss-wap-page/src/main/resources/static/resources/js/lay/modules/laypage.js
new file mode 100644
index 0000000..fd07fda
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/lay/modules/laypage.js
@@ -0,0 +1,2 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ ;layui.define(function(e){"use strict";var a=document,t="getElementById",n="getElementsByTagName",i="laypage",r="layui-disabled",u=function(e){var a=this;a.config=e||{},a.config.index=++s.index,a.render(!0)};u.prototype.type=function(){var e=this.config;if("object"==typeof e.elem)return void 0===e.elem.length?2:3},u.prototype.view=function(){var e=this,a=e.config,t=a.groups="groups"in a?0|a.groups:5;a.layout="object"==typeof a.layout?a.layout:["prev","page","next"],a.count=0|a.count,a.curr=0|a.curr||1,a.limits="object"==typeof a.limits?a.limits:[10,20,30,40,50],a.limit=0|a.limit||10,a.pages=Math.ceil(a.count/a.limit)||1,a.curr>a.pages&&(a.curr=a.pages),t<0?t=1:t>a.pages&&(t=a.pages),a.prev="prev"in a?a.prev:"&#x4E0A;&#x4E00;&#x9875;",a.next="next"in a?a.next:"&#x4E0B;&#x4E00;&#x9875;";var n=a.pages>t?Math.ceil((a.curr+(t>1?1:0))/(t>0?t:1)):1,i={prev:function(){return a.prev?'<a href="javascript:;" class="layui-laypage-prev'+(1==a.curr?" "+r:"")+'" data-page="'+(a.curr-1)+'">'+a.prev+"</a>":""}(),page:function(){var e=[];if(a.count<1)return"";n>1&&a.first!==!1&&0!==t&&e.push('<a href="javascript:;" class="layui-laypage-first" data-page="1"  title="&#x9996;&#x9875;">'+(a.first||1)+"</a>");var i=Math.floor((t-1)/2),r=n>1?a.curr-i:1,u=n>1?function(){var e=a.curr+(t-i-1);return e>a.pages?a.pages:e}():t;for(u-r<t-1&&(r=u-t+1),a.first!==!1&&r>2&&e.push('<span class="layui-laypage-spr">&#x2026;</span>');r<=u;r++)r===a.curr?e.push('<span class="layui-laypage-curr"><em class="layui-laypage-em" '+(/^#/.test(a.theme)?'style="background-color:'+a.theme+';"':"")+"></em><em>"+r+"</em></span>"):e.push('<a href="javascript:;" data-page="'+r+'">'+r+"</a>");return a.pages>t&&a.pages>u&&a.last!==!1&&(u+1<a.pages&&e.push('<span class="layui-laypage-spr">&#x2026;</span>'),0!==t&&e.push('<a href="javascript:;" class="layui-laypage-last" title="&#x5C3E;&#x9875;"  data-page="'+a.pages+'">'+(a.last||a.pages)+"</a>")),e.join("")}(),next:function(){return a.next?'<a href="javascript:;" class="layui-laypage-next'+(a.curr==a.pages?" "+r:"")+'" data-page="'+(a.curr+1)+'">'+a.next+"</a>":""}(),count:'<span class="layui-laypage-count">共 '+a.count+" 条</span>",limit:function(){var e=['<span class="layui-laypage-limits"><select lay-ignore>'];return layui.each(a.limits,function(t,n){e.push('<option value="'+n+'"'+(n===a.limit?"selected":"")+">"+n+" 条/页</option>")}),e.join("")+"</select></span>"}(),refresh:['<a href="javascript:;" data-page="'+a.curr+'" class="layui-laypage-refresh">','<i class="layui-icon layui-icon-refresh"></i>',"</a>"].join(""),skip:function(){return['<span class="layui-laypage-skip">&#x5230;&#x7B2C;','<input type="text" min="1" value="'+a.curr+'" class="layui-input">','&#x9875;<button type="button" class="layui-laypage-btn">&#x786e;&#x5b9a;</button>',"</span>"].join("")}()};return['<div class="layui-box layui-laypage layui-laypage-'+(a.theme?/^#/.test(a.theme)?"molv":a.theme:"default")+'" id="layui-laypage-'+a.index+'">',function(){var e=[];return layui.each(a.layout,function(a,t){i[t]&&e.push(i[t])}),e.join("")}(),"</div>"].join("")},u.prototype.jump=function(e,a){if(e){var t=this,i=t.config,r=e.children,u=e[n]("button")[0],l=e[n]("input")[0],p=e[n]("select")[0],c=function(){var e=0|l.value.replace(/\s|\D/g,"");e&&(i.curr=e,t.render())};if(a)return c();for(var o=0,y=r.length;o<y;o++)"a"===r[o].nodeName.toLowerCase()&&s.on(r[o],"click",function(){var e=0|this.getAttribute("data-page");e<1||e>i.pages||(i.curr=e,t.render())});p&&s.on(p,"change",function(){var e=this.value;i.curr*e>i.count&&(i.curr=Math.ceil(i.count/e)),i.limit=e,t.render()}),u&&s.on(u,"click",function(){c()})}},u.prototype.skip=function(e){if(e){var a=this,t=e[n]("input")[0];t&&s.on(t,"keyup",function(t){var n=this.value,i=t.keyCode;/^(37|38|39|40)$/.test(i)||(/\D/.test(n)&&(this.value=n.replace(/\D/,"")),13===i&&a.jump(e,!0))})}},u.prototype.render=function(e){var n=this,i=n.config,r=n.type(),u=n.view();2===r?i.elem&&(i.elem.innerHTML=u):3===r?i.elem.html(u):a[t](i.elem)&&(a[t](i.elem).innerHTML=u),i.jump&&i.jump(i,e);var s=a[t]("layui-laypage-"+i.index);n.jump(s),i.hash&&!e&&(location.hash="!"+i.hash+"="+i.curr),n.skip(s)};var s={render:function(e){var a=new u(e);return a.index},index:layui.laypage?layui.laypage.index+1e4:0,on:function(e,a,t){return e.attachEvent?e.attachEvent("on"+a,function(a){a.target=a.srcElement,t.call(e,a)}):e.addEventListener(a,t,!1),this}};e(i,s)});
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/lay/modules/laytpl.js b/pluss-wap-page/src/main/resources/static/resources/js/lay/modules/laytpl.js
new file mode 100644
index 0000000..d482d4e
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/lay/modules/laytpl.js
@@ -0,0 +1,2 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ ;layui.define(function(e){"use strict";var r={open:"{{",close:"}}"},c={exp:function(e){return new RegExp(e,"g")},query:function(e,c,t){var o=["#([\\s\\S])+?","([^{#}])*?"][e||0];return n((c||"")+r.open+o+r.close+(t||""))},escape:function(e){return String(e||"").replace(/&(?!#?[a-zA-Z0-9]+;)/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/'/g,"&#39;").replace(/"/g,"&quot;")},error:function(e,r){var c="Laytpl Error：";return"object"==typeof console&&console.error(c+e+"\n"+(r||"")),c+e}},n=c.exp,t=function(e){this.tpl=e};t.pt=t.prototype,window.errors=0,t.pt.parse=function(e,t){var o=this,p=e,a=n("^"+r.open+"#",""),l=n(r.close+"$","");e=e.replace(/\s+|\r|\t|\n/g," ").replace(n(r.open+"#"),r.open+"# ").replace(n(r.close+"}"),"} "+r.close).replace(/\\/g,"\\\\").replace(n(r.open+"!(.+?)!"+r.close),function(e){return e=e.replace(n("^"+r.open+"!"),"").replace(n("!"+r.close),"").replace(n(r.open+"|"+r.close),function(e){return e.replace(/(.)/g,"\\$1")})}).replace(/(?="|')/g,"\\").replace(c.query(),function(e){return e=e.replace(a,"").replace(l,""),'";'+e.replace(/\\/g,"")+';view+="'}).replace(c.query(1),function(e){var c='"+(';return e.replace(/\s/g,"")===r.open+r.close?"":(e=e.replace(n(r.open+"|"+r.close),""),/^=/.test(e)&&(e=e.replace(/^=/,""),c='"+_escape_('),c+e.replace(/\\/g,"")+')+"')}),e='"use strict";var view = "'+e+'";return view;';try{return o.cache=e=new Function("d, _escape_",e),e(t,c.escape)}catch(u){return delete o.cache,c.error(u,p)}},t.pt.render=function(e,r){var n,t=this;return e?(n=t.cache?t.cache(e,c.escape):t.parse(t.tpl,e),r?void r(n):n):c.error("no data")};var o=function(e){return"string"!=typeof e?c.error("Template not found"):new t(e)};o.config=function(e){e=e||{};for(var c in e)r[c]=e[c]},o.v="1.2.0",e("laytpl",o)});
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/lay/modules/mobile.js b/pluss-wap-page/src/main/resources/static/resources/js/lay/modules/mobile.js
new file mode 100644
index 0000000..35cfdf0
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/lay/modules/mobile.js
@@ -0,0 +1,2 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ ;layui.define(function(i){i("layui.mobile",layui.v)});layui.define(function(e){"use strict";var r={open:"{{",close:"}}"},c={exp:function(e){return new RegExp(e,"g")},query:function(e,c,t){var o=["#([\\s\\S])+?","([^{#}])*?"][e||0];return n((c||"")+r.open+o+r.close+(t||""))},escape:function(e){return String(e||"").replace(/&(?!#?[a-zA-Z0-9]+;)/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/'/g,"&#39;").replace(/"/g,"&quot;")},error:function(e,r){var c="Laytpl Error：";return"object"==typeof console&&console.error(c+e+"\n"+(r||"")),c+e}},n=c.exp,t=function(e){this.tpl=e};t.pt=t.prototype,window.errors=0,t.pt.parse=function(e,t){var o=this,p=e,a=n("^"+r.open+"#",""),l=n(r.close+"$","");e=e.replace(/\s+|\r|\t|\n/g," ").replace(n(r.open+"#"),r.open+"# ").replace(n(r.close+"}"),"} "+r.close).replace(/\\/g,"\\\\").replace(n(r.open+"!(.+?)!"+r.close),function(e){return e=e.replace(n("^"+r.open+"!"),"").replace(n("!"+r.close),"").replace(n(r.open+"|"+r.close),function(e){return e.replace(/(.)/g,"\\$1")})}).replace(/(?="|')/g,"\\").replace(c.query(),function(e){return e=e.replace(a,"").replace(l,""),'";'+e.replace(/\\/g,"")+';view+="'}).replace(c.query(1),function(e){var c='"+(';return e.replace(/\s/g,"")===r.open+r.close?"":(e=e.replace(n(r.open+"|"+r.close),""),/^=/.test(e)&&(e=e.replace(/^=/,""),c='"+_escape_('),c+e.replace(/\\/g,"")+')+"')}),e='"use strict";var view = "'+e+'";return view;';try{return o.cache=e=new Function("d, _escape_",e),e(t,c.escape)}catch(u){return delete o.cache,c.error(u,p)}},t.pt.render=function(e,r){var n,t=this;return e?(n=t.cache?t.cache(e,c.escape):t.parse(t.tpl,e),r?void r(n):n):c.error("no data")};var o=function(e){return"string"!=typeof e?c.error("Template not found"):new t(e)};o.config=function(e){e=e||{};for(var c in e)r[c]=e[c]},o.v="1.2.0",e("laytpl",o)});layui.define(function(e){"use strict";var t=(window,document),i="querySelectorAll",n="getElementsByClassName",a=function(e){return t[i](e)},s={type:0,shade:!0,shadeClose:!0,fixed:!0,anim:"scale"},l={extend:function(e){var t=JSON.parse(JSON.stringify(s));for(var i in e)t[i]=e[i];return t},timer:{},end:{}};l.touch=function(e,t){e.addEventListener("click",function(e){t.call(this,e)},!1)};var o=0,r=["layui-m-layer"],d=function(e){var t=this;t.config=l.extend(e),t.view()};d.prototype.view=function(){var e=this,i=e.config,s=t.createElement("div");e.id=s.id=r[0]+o,s.setAttribute("class",r[0]+" "+r[0]+(i.type||0)),s.setAttribute("index",o);var l=function(){var e="object"==typeof i.title;return i.title?'<h3 style="'+(e?i.title[1]:"")+'">'+(e?i.title[0]:i.title)+"</h3>":""}(),d=function(){"string"==typeof i.btn&&(i.btn=[i.btn]);var e,t=(i.btn||[]).length;return 0!==t&&i.btn?(e='<span yes type="1">'+i.btn[0]+"</span>",2===t&&(e='<span no type="0">'+i.btn[1]+"</span>"+e),'<div class="layui-m-layerbtn">'+e+"</div>"):""}();if(i.fixed||(i.top=i.hasOwnProperty("top")?i.top:100,i.style=i.style||"",i.style+=" top:"+(t.body.scrollTop+i.top)+"px"),2===i.type&&(i.content='<i></i><i class="layui-m-layerload"></i><i></i><p>'+(i.content||"")+"</p>"),i.skin&&(i.anim="up"),"msg"===i.skin&&(i.shade=!1),s.innerHTML=(i.shade?"<div "+("string"==typeof i.shade?'style="'+i.shade+'"':"")+' class="layui-m-layershade"></div>':"")+'<div class="layui-m-layermain" '+(i.fixed?"":'style="position:static;"')+'><div class="layui-m-layersection"><div class="layui-m-layerchild '+(i.skin?"layui-m-layer-"+i.skin+" ":"")+(i.className?i.className:"")+" "+(i.anim?"layui-m-anim-"+i.anim:"")+'" '+(i.style?'style="'+i.style+'"':"")+">"+l+'<div class="layui-m-layercont">'+i.content+"</div>"+d+"</div></div></div>",!i.type||2===i.type){var y=t[n](r[0]+i.type),u=y.length;u>=1&&c.close(y[0].getAttribute("index"))}document.body.appendChild(s);var m=e.elem=a("#"+e.id)[0];i.success&&i.success(m),e.index=o++,e.action(i,m)},d.prototype.action=function(e,t){var i=this;e.time&&(l.timer[i.index]=setTimeout(function(){c.close(i.index)},1e3*e.time));var a=function(){var t=this.getAttribute("type");0==t?(e.no&&e.no(),c.close(i.index)):e.yes?e.yes(i.index):c.close(i.index)};if(e.btn)for(var s=t[n]("layui-m-layerbtn")[0].children,o=s.length,r=0;r<o;r++)l.touch(s[r],a);if(e.shade&&e.shadeClose){var d=t[n]("layui-m-layershade")[0];l.touch(d,function(){c.close(i.index,e.end)})}e.end&&(l.end[i.index]=e.end)};var c={v:"2.0 m",index:o,open:function(e){var t=new d(e||{});return t.index},close:function(e){var i=a("#"+r[0]+e)[0];i&&(i.innerHTML="",t.body.removeChild(i),clearTimeout(l.timer[e]),delete l.timer[e],"function"==typeof l.end[e]&&l.end[e](),delete l.end[e])},closeAll:function(){for(var e=t[n](r[0]),i=0,a=e.length;i<a;i++)c.close(0|e[0].getAttribute("index"))}};e("layer-mobile",c)});layui.define(function(t){var e=function(){function t(t){return null==t?String(t):J[W.call(t)]||"object"}function e(e){return"function"==t(e)}function n(t){return null!=t&&t==t.window}function r(t){return null!=t&&t.nodeType==t.DOCUMENT_NODE}function i(e){return"object"==t(e)}function o(t){return i(t)&&!n(t)&&Object.getPrototypeOf(t)==Object.prototype}function a(t){var e=!!t&&"length"in t&&t.length,r=T.type(t);return"function"!=r&&!n(t)&&("array"==r||0===e||"number"==typeof e&&e>0&&e-1 in t)}function s(t){return A.call(t,function(t){return null!=t})}function u(t){return t.length>0?T.fn.concat.apply([],t):t}function c(t){return t.replace(/::/g,"/").replace(/([A-Z]+)([A-Z][a-z])/g,"$1_$2").replace(/([a-z\d])([A-Z])/g,"$1_$2").replace(/_/g,"-").toLowerCase()}function l(t){return t in F?F[t]:F[t]=new RegExp("(^|\\s)"+t+"(\\s|$)")}function f(t,e){return"number"!=typeof e||k[c(t)]?e:e+"px"}function h(t){var e,n;return $[t]||(e=L.createElement(t),L.body.appendChild(e),n=getComputedStyle(e,"").getPropertyValue("display"),e.parentNode.removeChild(e),"none"==n&&(n="block"),$[t]=n),$[t]}function p(t){return"children"in t?D.call(t.children):T.map(t.childNodes,function(t){if(1==t.nodeType)return t})}function d(t,e){var n,r=t?t.length:0;for(n=0;n<r;n++)this[n]=t[n];this.length=r,this.selector=e||""}function m(t,e,n){for(j in e)n&&(o(e[j])||Q(e[j]))?(o(e[j])&&!o(t[j])&&(t[j]={}),Q(e[j])&&!Q(t[j])&&(t[j]=[]),m(t[j],e[j],n)):e[j]!==E&&(t[j]=e[j])}function v(t,e){return null==e?T(t):T(t).filter(e)}function g(t,n,r,i){return e(n)?n.call(t,r,i):n}function y(t,e,n){null==n?t.removeAttribute(e):t.setAttribute(e,n)}function x(t,e){var n=t.className||"",r=n&&n.baseVal!==E;return e===E?r?n.baseVal:n:void(r?n.baseVal=e:t.className=e)}function b(t){try{return t?"true"==t||"false"!=t&&("null"==t?null:+t+""==t?+t:/^[\[\{]/.test(t)?T.parseJSON(t):t):t}catch(e){return t}}function w(t,e){e(t);for(var n=0,r=t.childNodes.length;n<r;n++)w(t.childNodes[n],e)}var E,j,T,S,C,N,O=[],P=O.concat,A=O.filter,D=O.slice,L=window.document,$={},F={},k={"column-count":1,columns:1,"font-weight":1,"line-height":1,opacity:1,"z-index":1,zoom:1},M=/^\s*<(\w+|!)[^>]*>/,R=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,z=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,Z=/^(?:body|html)$/i,q=/([A-Z])/g,H=["val","css","html","text","data","width","height","offset"],I=["after","prepend","before","append"],V=L.createElement("table"),_=L.createElement("tr"),B={tr:L.createElement("tbody"),tbody:V,thead:V,tfoot:V,td:_,th:_,"*":L.createElement("div")},U=/complete|loaded|interactive/,X=/^[\w-]*$/,J={},W=J.toString,Y={},G=L.createElement("div"),K={tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},Q=Array.isArray||function(t){return t instanceof Array};return Y.matches=function(t,e){if(!e||!t||1!==t.nodeType)return!1;var n=t.matches||t.webkitMatchesSelector||t.mozMatchesSelector||t.oMatchesSelector||t.matchesSelector;if(n)return n.call(t,e);var r,i=t.parentNode,o=!i;return o&&(i=G).appendChild(t),r=~Y.qsa(i,e).indexOf(t),o&&G.removeChild(t),r},C=function(t){return t.replace(/-+(.)?/g,function(t,e){return e?e.toUpperCase():""})},N=function(t){return A.call(t,function(e,n){return t.indexOf(e)==n})},Y.fragment=function(t,e,n){var r,i,a;return R.test(t)&&(r=T(L.createElement(RegExp.$1))),r||(t.replace&&(t=t.replace(z,"<$1></$2>")),e===E&&(e=M.test(t)&&RegExp.$1),e in B||(e="*"),a=B[e],a.innerHTML=""+t,r=T.each(D.call(a.childNodes),function(){a.removeChild(this)})),o(n)&&(i=T(r),T.each(n,function(t,e){H.indexOf(t)>-1?i[t](e):i.attr(t,e)})),r},Y.Z=function(t,e){return new d(t,e)},Y.isZ=function(t){return t instanceof Y.Z},Y.init=function(t,n){var r;if(!t)return Y.Z();if("string"==typeof t)if(t=t.trim(),"<"==t[0]&&M.test(t))r=Y.fragment(t,RegExp.$1,n),t=null;else{if(n!==E)return T(n).find(t);r=Y.qsa(L,t)}else{if(e(t))return T(L).ready(t);if(Y.isZ(t))return t;if(Q(t))r=s(t);else if(i(t))r=[t],t=null;else if(M.test(t))r=Y.fragment(t.trim(),RegExp.$1,n),t=null;else{if(n!==E)return T(n).find(t);r=Y.qsa(L,t)}}return Y.Z(r,t)},T=function(t,e){return Y.init(t,e)},T.extend=function(t){var e,n=D.call(arguments,1);return"boolean"==typeof t&&(e=t,t=n.shift()),n.forEach(function(n){m(t,n,e)}),t},Y.qsa=function(t,e){var n,r="#"==e[0],i=!r&&"."==e[0],o=r||i?e.slice(1):e,a=X.test(o);return t.getElementById&&a&&r?(n=t.getElementById(o))?[n]:[]:1!==t.nodeType&&9!==t.nodeType&&11!==t.nodeType?[]:D.call(a&&!r&&t.getElementsByClassName?i?t.getElementsByClassName(o):t.getElementsByTagName(e):t.querySelectorAll(e))},T.contains=L.documentElement.contains?function(t,e){return t!==e&&t.contains(e)}:function(t,e){for(;e&&(e=e.parentNode);)if(e===t)return!0;return!1},T.type=t,T.isFunction=e,T.isWindow=n,T.isArray=Q,T.isPlainObject=o,T.isEmptyObject=function(t){var e;for(e in t)return!1;return!0},T.isNumeric=function(t){var e=Number(t),n=typeof t;return null!=t&&"boolean"!=n&&("string"!=n||t.length)&&!isNaN(e)&&isFinite(e)||!1},T.inArray=function(t,e,n){return O.indexOf.call(e,t,n)},T.camelCase=C,T.trim=function(t){return null==t?"":String.prototype.trim.call(t)},T.uuid=0,T.support={},T.expr={},T.noop=function(){},T.map=function(t,e){var n,r,i,o=[];if(a(t))for(r=0;r<t.length;r++)n=e(t[r],r),null!=n&&o.push(n);else for(i in t)n=e(t[i],i),null!=n&&o.push(n);return u(o)},T.each=function(t,e){var n,r;if(a(t)){for(n=0;n<t.length;n++)if(e.call(t[n],n,t[n])===!1)return t}else for(r in t)if(e.call(t[r],r,t[r])===!1)return t;return t},T.grep=function(t,e){return A.call(t,e)},window.JSON&&(T.parseJSON=JSON.parse),T.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(t,e){J["[object "+e+"]"]=e.toLowerCase()}),T.fn={constructor:Y.Z,length:0,forEach:O.forEach,reduce:O.reduce,push:O.push,sort:O.sort,splice:O.splice,indexOf:O.indexOf,concat:function(){var t,e,n=[];for(t=0;t<arguments.length;t++)e=arguments[t],n[t]=Y.isZ(e)?e.toArray():e;return P.apply(Y.isZ(this)?this.toArray():this,n)},map:function(t){return T(T.map(this,function(e,n){return t.call(e,n,e)}))},slice:function(){return T(D.apply(this,arguments))},ready:function(t){return U.test(L.readyState)&&L.body?t(T):L.addEventListener("DOMContentLoaded",function(){t(T)},!1),this},get:function(t){return t===E?D.call(this):this[t>=0?t:t+this.length]},toArray:function(){return this.get()},size:function(){return this.length},remove:function(){return this.each(function(){null!=this.parentNode&&this.parentNode.removeChild(this)})},each:function(t){return O.every.call(this,function(e,n){return t.call(e,n,e)!==!1}),this},filter:function(t){return e(t)?this.not(this.not(t)):T(A.call(this,function(e){return Y.matches(e,t)}))},add:function(t,e){return T(N(this.concat(T(t,e))))},is:function(t){return this.length>0&&Y.matches(this[0],t)},not:function(t){var n=[];if(e(t)&&t.call!==E)this.each(function(e){t.call(this,e)||n.push(this)});else{var r="string"==typeof t?this.filter(t):a(t)&&e(t.item)?D.call(t):T(t);this.forEach(function(t){r.indexOf(t)<0&&n.push(t)})}return T(n)},has:function(t){return this.filter(function(){return i(t)?T.contains(this,t):T(this).find(t).size()})},eq:function(t){return t===-1?this.slice(t):this.slice(t,+t+1)},first:function(){var t=this[0];return t&&!i(t)?t:T(t)},last:function(){var t=this[this.length-1];return t&&!i(t)?t:T(t)},find:function(t){var e,n=this;return e=t?"object"==typeof t?T(t).filter(function(){var t=this;return O.some.call(n,function(e){return T.contains(e,t)})}):1==this.length?T(Y.qsa(this[0],t)):this.map(function(){return Y.qsa(this,t)}):T()},closest:function(t,e){var n=[],i="object"==typeof t&&T(t);return this.each(function(o,a){for(;a&&!(i?i.indexOf(a)>=0:Y.matches(a,t));)a=a!==e&&!r(a)&&a.parentNode;a&&n.indexOf(a)<0&&n.push(a)}),T(n)},parents:function(t){for(var e=[],n=this;n.length>0;)n=T.map(n,function(t){if((t=t.parentNode)&&!r(t)&&e.indexOf(t)<0)return e.push(t),t});return v(e,t)},parent:function(t){return v(N(this.pluck("parentNode")),t)},children:function(t){return v(this.map(function(){return p(this)}),t)},contents:function(){return this.map(function(){return this.contentDocument||D.call(this.childNodes)})},siblings:function(t){return v(this.map(function(t,e){return A.call(p(e.parentNode),function(t){return t!==e})}),t)},empty:function(){return this.each(function(){this.innerHTML=""})},pluck:function(t){return T.map(this,function(e){return e[t]})},show:function(){return this.each(function(){"none"==this.style.display&&(this.style.display=""),"none"==getComputedStyle(this,"").getPropertyValue("display")&&(this.style.display=h(this.nodeName))})},replaceWith:function(t){return this.before(t).remove()},wrap:function(t){var n=e(t);if(this[0]&&!n)var r=T(t).get(0),i=r.parentNode||this.length>1;return this.each(function(e){T(this).wrapAll(n?t.call(this,e):i?r.cloneNode(!0):r)})},wrapAll:function(t){if(this[0]){T(this[0]).before(t=T(t));for(var e;(e=t.children()).length;)t=e.first();T(t).append(this)}return this},wrapInner:function(t){var n=e(t);return this.each(function(e){var r=T(this),i=r.contents(),o=n?t.call(this,e):t;i.length?i.wrapAll(o):r.append(o)})},unwrap:function(){return this.parent().each(function(){T(this).replaceWith(T(this).children())}),this},clone:function(){return this.map(function(){return this.cloneNode(!0)})},hide:function(){return this.css("display","none")},toggle:function(t){return this.each(function(){var e=T(this);(t===E?"none"==e.css("display"):t)?e.show():e.hide()})},prev:function(t){return T(this.pluck("previousElementSibling")).filter(t||"*")},next:function(t){return T(this.pluck("nextElementSibling")).filter(t||"*")},html:function(t){return 0 in arguments?this.each(function(e){var n=this.innerHTML;T(this).empty().append(g(this,t,e,n))}):0 in this?this[0].innerHTML:null},text:function(t){return 0 in arguments?this.each(function(e){var n=g(this,t,e,this.textContent);this.textContent=null==n?"":""+n}):0 in this?this.pluck("textContent").join(""):null},attr:function(t,e){var n;return"string"!=typeof t||1 in arguments?this.each(function(n){if(1===this.nodeType)if(i(t))for(j in t)y(this,j,t[j]);else y(this,t,g(this,e,n,this.getAttribute(t)))}):0 in this&&1==this[0].nodeType&&null!=(n=this[0].getAttribute(t))?n:E},removeAttr:function(t){return this.each(function(){1===this.nodeType&&t.split(" ").forEach(function(t){y(this,t)},this)})},prop:function(t,e){return t=K[t]||t,1 in arguments?this.each(function(n){this[t]=g(this,e,n,this[t])}):this[0]&&this[0][t]},removeProp:function(t){return t=K[t]||t,this.each(function(){delete this[t]})},data:function(t,e){var n="data-"+t.replace(q,"-$1").toLowerCase(),r=1 in arguments?this.attr(n,e):this.attr(n);return null!==r?b(r):E},val:function(t){return 0 in arguments?(null==t&&(t=""),this.each(function(e){this.value=g(this,t,e,this.value)})):this[0]&&(this[0].multiple?T(this[0]).find("option").filter(function(){return this.selected}).pluck("value"):this[0].value)},offset:function(t){if(t)return this.each(function(e){var n=T(this),r=g(this,t,e,n.offset()),i=n.offsetParent().offset(),o={top:r.top-i.top,left:r.left-i.left};"static"==n.css("position")&&(o.position="relative"),n.css(o)});if(!this.length)return null;if(L.documentElement!==this[0]&&!T.contains(L.documentElement,this[0]))return{top:0,left:0};var e=this[0].getBoundingClientRect();return{left:e.left+window.pageXOffset,top:e.top+window.pageYOffset,width:Math.round(e.width),height:Math.round(e.height)}},css:function(e,n){if(arguments.length<2){var r=this[0];if("string"==typeof e){if(!r)return;return r.style[C(e)]||getComputedStyle(r,"").getPropertyValue(e)}if(Q(e)){if(!r)return;var i={},o=getComputedStyle(r,"");return T.each(e,function(t,e){i[e]=r.style[C(e)]||o.getPropertyValue(e)}),i}}var a="";if("string"==t(e))n||0===n?a=c(e)+":"+f(e,n):this.each(function(){this.style.removeProperty(c(e))});else for(j in e)e[j]||0===e[j]?a+=c(j)+":"+f(j,e[j])+";":this.each(function(){this.style.removeProperty(c(j))});return this.each(function(){this.style.cssText+=";"+a})},index:function(t){return t?this.indexOf(T(t)[0]):this.parent().children().indexOf(this[0])},hasClass:function(t){return!!t&&O.some.call(this,function(t){return this.test(x(t))},l(t))},addClass:function(t){return t?this.each(function(e){if("className"in this){S=[];var n=x(this),r=g(this,t,e,n);r.split(/\s+/g).forEach(function(t){T(this).hasClass(t)||S.push(t)},this),S.length&&x(this,n+(n?" ":"")+S.join(" "))}}):this},removeClass:function(t){return this.each(function(e){if("className"in this){if(t===E)return x(this,"");S=x(this),g(this,t,e,S).split(/\s+/g).forEach(function(t){S=S.replace(l(t)," ")}),x(this,S.trim())}})},toggleClass:function(t,e){return t?this.each(function(n){var r=T(this),i=g(this,t,n,x(this));i.split(/\s+/g).forEach(function(t){(e===E?!r.hasClass(t):e)?r.addClass(t):r.removeClass(t)})}):this},scrollTop:function(t){if(this.length){var e="scrollTop"in this[0];return t===E?e?this[0].scrollTop:this[0].pageYOffset:this.each(e?function(){this.scrollTop=t}:function(){this.scrollTo(this.scrollX,t)})}},scrollLeft:function(t){if(this.length){var e="scrollLeft"in this[0];return t===E?e?this[0].scrollLeft:this[0].pageXOffset:this.each(e?function(){this.scrollLeft=t}:function(){this.scrollTo(t,this.scrollY)})}},position:function(){if(this.length){var t=this[0],e=this.offsetParent(),n=this.offset(),r=Z.test(e[0].nodeName)?{top:0,left:0}:e.offset();return n.top-=parseFloat(T(t).css("margin-top"))||0,n.left-=parseFloat(T(t).css("margin-left"))||0,r.top+=parseFloat(T(e[0]).css("border-top-width"))||0,r.left+=parseFloat(T(e[0]).css("border-left-width"))||0,{top:n.top-r.top,left:n.left-r.left}}},offsetParent:function(){return this.map(function(){for(var t=this.offsetParent||L.body;t&&!Z.test(t.nodeName)&&"static"==T(t).css("position");)t=t.offsetParent;return t})}},T.fn.detach=T.fn.remove,["width","height"].forEach(function(t){var e=t.replace(/./,function(t){return t[0].toUpperCase()});T.fn[t]=function(i){var o,a=this[0];return i===E?n(a)?a["inner"+e]:r(a)?a.documentElement["scroll"+e]:(o=this.offset())&&o[t]:this.each(function(e){a=T(this),a.css(t,g(this,i,e,a[t]()))})}}),I.forEach(function(e,n){var r=n%2;T.fn[e]=function(){var e,i,o=T.map(arguments,function(n){var r=[];return e=t(n),"array"==e?(n.forEach(function(t){return t.nodeType!==E?r.push(t):T.zepto.isZ(t)?r=r.concat(t.get()):void(r=r.concat(Y.fragment(t)))}),r):"object"==e||null==n?n:Y.fragment(n)}),a=this.length>1;return o.length<1?this:this.each(function(t,e){i=r?e:e.parentNode,e=0==n?e.nextSibling:1==n?e.firstChild:2==n?e:null;var s=T.contains(L.documentElement,i);o.forEach(function(t){if(a)t=t.cloneNode(!0);else if(!i)return T(t).remove();i.insertBefore(t,e),s&&w(t,function(t){if(!(null==t.nodeName||"SCRIPT"!==t.nodeName.toUpperCase()||t.type&&"text/javascript"!==t.type||t.src)){var e=t.ownerDocument?t.ownerDocument.defaultView:window;e.eval.call(e,t.innerHTML)}})})})},T.fn[r?e+"To":"insert"+(n?"Before":"After")]=function(t){return T(t)[e](this),this}}),Y.Z.prototype=d.prototype=T.fn,Y.uniq=N,Y.deserializeValue=b,T.zepto=Y,T}();!function(t){function e(t){return t._zid||(t._zid=h++)}function n(t,n,o,a){if(n=r(n),n.ns)var s=i(n.ns);return(v[e(t)]||[]).filter(function(t){return t&&(!n.e||t.e==n.e)&&(!n.ns||s.test(t.ns))&&(!o||e(t.fn)===e(o))&&(!a||t.sel==a)})}function r(t){var e=(""+t).split(".");return{e:e[0],ns:e.slice(1).sort().join(" ")}}function i(t){return new RegExp("(?:^| )"+t.replace(" "," .* ?")+"(?: |$)")}function o(t,e){return t.del&&!y&&t.e in x||!!e}function a(t){return b[t]||y&&x[t]||t}function s(n,i,s,u,l,h,p){var d=e(n),m=v[d]||(v[d]=[]);i.split(/\s/).forEach(function(e){if("ready"==e)return t(document).ready(s);var i=r(e);i.fn=s,i.sel=l,i.e in b&&(s=function(e){var n=e.relatedTarget;if(!n||n!==this&&!t.contains(this,n))return i.fn.apply(this,arguments)}),i.del=h;var d=h||s;i.proxy=function(t){if(t=c(t),!t.isImmediatePropagationStopped()){t.data=u;var e=d.apply(n,t._args==f?[t]:[t].concat(t._args));return e===!1&&(t.preventDefault(),t.stopPropagation()),e}},i.i=m.length,m.push(i),"addEventListener"in n&&n.addEventListener(a(i.e),i.proxy,o(i,p))})}function u(t,r,i,s,u){var c=e(t);(r||"").split(/\s/).forEach(function(e){n(t,e,i,s).forEach(function(e){delete v[c][e.i],"removeEventListener"in t&&t.removeEventListener(a(e.e),e.proxy,o(e,u))})})}function c(e,n){return!n&&e.isDefaultPrevented||(n||(n=e),t.each(T,function(t,r){var i=n[t];e[t]=function(){return this[r]=w,i&&i.apply(n,arguments)},e[r]=E}),e.timeStamp||(e.timeStamp=Date.now()),(n.defaultPrevented!==f?n.defaultPrevented:"returnValue"in n?n.returnValue===!1:n.getPreventDefault&&n.getPreventDefault())&&(e.isDefaultPrevented=w)),e}function l(t){var e,n={originalEvent:t};for(e in t)j.test(e)||t[e]===f||(n[e]=t[e]);return c(n,t)}var f,h=1,p=Array.prototype.slice,d=t.isFunction,m=function(t){return"string"==typeof t},v={},g={},y="onfocusin"in window,x={focus:"focusin",blur:"focusout"},b={mouseenter:"mouseover",mouseleave:"mouseout"};g.click=g.mousedown=g.mouseup=g.mousemove="MouseEvents",t.event={add:s,remove:u},t.proxy=function(n,r){var i=2 in arguments&&p.call(arguments,2);if(d(n)){var o=function(){return n.apply(r,i?i.concat(p.call(arguments)):arguments)};return o._zid=e(n),o}if(m(r))return i?(i.unshift(n[r],n),t.proxy.apply(null,i)):t.proxy(n[r],n);throw new TypeError("expected function")},t.fn.bind=function(t,e,n){return this.on(t,e,n)},t.fn.unbind=function(t,e){return this.off(t,e)},t.fn.one=function(t,e,n,r){return this.on(t,e,n,r,1)};var w=function(){return!0},E=function(){return!1},j=/^([A-Z]|returnValue$|layer[XY]$|webkitMovement[XY]$)/,T={preventDefault:"isDefaultPrevented",stopImmediatePropagation:"isImmediatePropagationStopped",stopPropagation:"isPropagationStopped"};t.fn.delegate=function(t,e,n){return this.on(e,t,n)},t.fn.undelegate=function(t,e,n){return this.off(e,t,n)},t.fn.live=function(e,n){return t(document.body).delegate(this.selector,e,n),this},t.fn.die=function(e,n){return t(document.body).undelegate(this.selector,e,n),this},t.fn.on=function(e,n,r,i,o){var a,c,h=this;return e&&!m(e)?(t.each(e,function(t,e){h.on(t,n,r,e,o)}),h):(m(n)||d(i)||i===!1||(i=r,r=n,n=f),i!==f&&r!==!1||(i=r,r=f),i===!1&&(i=E),h.each(function(f,h){o&&(a=function(t){return u(h,t.type,i),i.apply(this,arguments)}),n&&(c=function(e){var r,o=t(e.target).closest(n,h).get(0);if(o&&o!==h)return r=t.extend(l(e),{currentTarget:o,liveFired:h}),(a||i).apply(o,[r].concat(p.call(arguments,1)))}),s(h,e,i,r,n,c||a)}))},t.fn.off=function(e,n,r){var i=this;return e&&!m(e)?(t.each(e,function(t,e){i.off(t,n,e)}),i):(m(n)||d(r)||r===!1||(r=n,n=f),r===!1&&(r=E),i.each(function(){u(this,e,r,n)}))},t.fn.trigger=function(e,n){return e=m(e)||t.isPlainObject(e)?t.Event(e):c(e),e._args=n,this.each(function(){e.type in x&&"function"==typeof this[e.type]?this[e.type]():"dispatchEvent"in this?this.dispatchEvent(e):t(this).triggerHandler(e,n)})},t.fn.triggerHandler=function(e,r){var i,o;return this.each(function(a,s){i=l(m(e)?t.Event(e):e),i._args=r,i.target=s,t.each(n(s,e.type||e),function(t,e){if(o=e.proxy(i),i.isImmediatePropagationStopped())return!1})}),o},"focusin focusout focus blur load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select keydown keypress keyup error".split(" ").forEach(function(e){t.fn[e]=function(t){return 0 in arguments?this.bind(e,t):this.trigger(e)}}),t.Event=function(t,e){m(t)||(e=t,t=e.type);var n=document.createEvent(g[t]||"Events"),r=!0;if(e)for(var i in e)"bubbles"==i?r=!!e[i]:n[i]=e[i];return n.initEvent(t,r,!0),c(n)}}(e),function(t){function e(e,n,r){var i=t.Event(n);return t(e).trigger(i,r),!i.isDefaultPrevented()}function n(t,n,r,i){if(t.global)return e(n||x,r,i)}function r(e){e.global&&0===t.active++&&n(e,null,"ajaxStart")}function i(e){e.global&&!--t.active&&n(e,null,"ajaxStop")}function o(t,e){var r=e.context;return e.beforeSend.call(r,t,e)!==!1&&n(e,r,"ajaxBeforeSend",[t,e])!==!1&&void n(e,r,"ajaxSend",[t,e])}function a(t,e,r,i){var o=r.context,a="success";r.success.call(o,t,a,e),i&&i.resolveWith(o,[t,a,e]),n(r,o,"ajaxSuccess",[e,r,t]),u(a,e,r)}function s(t,e,r,i,o){var a=i.context;i.error.call(a,r,e,t),o&&o.rejectWith(a,[r,e,t]),n(i,a,"ajaxError",[r,i,t||e]),u(e,r,i)}function u(t,e,r){var o=r.context;r.complete.call(o,e,t),n(r,o,"ajaxComplete",[e,r]),i(r)}function c(t,e,n){if(n.dataFilter==l)return t;var r=n.context;return n.dataFilter.call(r,t,e)}function l(){}function f(t){return t&&(t=t.split(";",2)[0]),t&&(t==T?"html":t==j?"json":w.test(t)?"script":E.test(t)&&"xml")||"text"}function h(t,e){return""==e?t:(t+"&"+e).replace(/[&?]{1,2}/,"?")}function p(e){e.processData&&e.data&&"string"!=t.type(e.data)&&(e.data=t.param(e.data,e.traditional)),!e.data||e.type&&"GET"!=e.type.toUpperCase()&&"jsonp"!=e.dataType||(e.url=h(e.url,e.data),e.data=void 0)}function d(e,n,r,i){return t.isFunction(n)&&(i=r,r=n,n=void 0),t.isFunction(r)||(i=r,r=void 0),{url:e,data:n,success:r,dataType:i}}function m(e,n,r,i){var o,a=t.isArray(n),s=t.isPlainObject(n);t.each(n,function(n,u){o=t.type(u),i&&(n=r?i:i+"["+(s||"object"==o||"array"==o?n:"")+"]"),!i&&a?e.add(u.name,u.value):"array"==o||!r&&"object"==o?m(e,u,r,n):e.add(n,u)})}var v,g,y=+new Date,x=window.document,b=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,w=/^(?:text|application)\/javascript/i,E=/^(?:text|application)\/xml/i,j="application/json",T="text/html",S=/^\s*$/,C=x.createElement("a");C.href=window.location.href,t.active=0,t.ajaxJSONP=function(e,n){if(!("type"in e))return t.ajax(e);var r,i,u=e.jsonpCallback,c=(t.isFunction(u)?u():u)||"Zepto"+y++,l=x.createElement("script"),f=window[c],h=function(e){t(l).triggerHandler("error",e||"abort")},p={abort:h};return n&&n.promise(p),t(l).on("load error",function(o,u){clearTimeout(i),t(l).off().remove(),"error"!=o.type&&r?a(r[0],p,e,n):s(null,u||"error",p,e,n),window[c]=f,r&&t.isFunction(f)&&f(r[0]),f=r=void 0}),o(p,e)===!1?(h("abort"),p):(window[c]=function(){r=arguments},l.src=e.url.replace(/\?(.+)=\?/,"?$1="+c),x.head.appendChild(l),e.timeout>0&&(i=setTimeout(function(){h("timeout")},e.timeout)),p)},t.ajaxSettings={type:"GET",beforeSend:l,success:l,error:l,complete:l,context:null,global:!0,xhr:function(){return new window.XMLHttpRequest},accepts:{script:"text/javascript, application/javascript, application/x-javascript",json:j,xml:"application/xml, text/xml",html:T,text:"text/plain"},crossDomain:!1,timeout:0,processData:!0,cache:!0,dataFilter:l},t.ajax=function(e){var n,i,u=t.extend({},e||{}),d=t.Deferred&&t.Deferred();for(v in t.ajaxSettings)void 0===u[v]&&(u[v]=t.ajaxSettings[v]);r(u),u.crossDomain||(n=x.createElement("a"),n.href=u.url,n.href=n.href,u.crossDomain=C.protocol+"//"+C.host!=n.protocol+"//"+n.host),u.url||(u.url=window.location.toString()),(i=u.url.indexOf("#"))>-1&&(u.url=u.url.slice(0,i)),p(u);var m=u.dataType,y=/\?.+=\?/.test(u.url);if(y&&(m="jsonp"),u.cache!==!1&&(e&&e.cache===!0||"script"!=m&&"jsonp"!=m)||(u.url=h(u.url,"_="+Date.now())),"jsonp"==m)return y||(u.url=h(u.url,u.jsonp?u.jsonp+"=?":u.jsonp===!1?"":"callback=?")),t.ajaxJSONP(u,d);var b,w=u.accepts[m],E={},j=function(t,e){E[t.toLowerCase()]=[t,e]},T=/^([\w-]+:)\/\//.test(u.url)?RegExp.$1:window.location.protocol,N=u.xhr(),O=N.setRequestHeader;if(d&&d.promise(N),u.crossDomain||j("X-Requested-With","XMLHttpRequest"),j("Accept",w||"*/*"),(w=u.mimeType||w)&&(w.indexOf(",")>-1&&(w=w.split(",",2)[0]),N.overrideMimeType&&N.overrideMimeType(w)),(u.contentType||u.contentType!==!1&&u.data&&"GET"!=u.type.toUpperCase())&&j("Content-Type",u.contentType||"application/x-www-form-urlencoded"),u.headers)for(g in u.headers)j(g,u.headers[g]);if(N.setRequestHeader=j,N.onreadystatechange=function(){if(4==N.readyState){N.onreadystatechange=l,clearTimeout(b);var e,n=!1;if(N.status>=200&&N.status<300||304==N.status||0==N.status&&"file:"==T){if(m=m||f(u.mimeType||N.getResponseHeader("content-type")),"arraybuffer"==N.responseType||"blob"==N.responseType)e=N.response;else{e=N.responseText;try{e=c(e,m,u),"script"==m?(0,eval)(e):"xml"==m?e=N.responseXML:"json"==m&&(e=S.test(e)?null:t.parseJSON(e))}catch(r){n=r}if(n)return s(n,"parsererror",N,u,d)}a(e,N,u,d)}else s(N.statusText||null,N.status?"error":"abort",N,u,d)}},o(N,u)===!1)return N.abort(),s(null,"abort",N,u,d),N;var P=!("async"in u)||u.async;if(N.open(u.type,u.url,P,u.username,u.password),u.xhrFields)for(g in u.xhrFields)N[g]=u.xhrFields[g];for(g in E)O.apply(N,E[g]);return u.timeout>0&&(b=setTimeout(function(){N.onreadystatechange=l,N.abort(),s(null,"timeout",N,u,d)},u.timeout)),N.send(u.data?u.data:null),N},t.get=function(){return t.ajax(d.apply(null,arguments))},t.post=function(){var e=d.apply(null,arguments);return e.type="POST",t.ajax(e)},t.getJSON=function(){var e=d.apply(null,arguments);return e.dataType="json",t.ajax(e)},t.fn.load=function(e,n,r){if(!this.length)return this;var i,o=this,a=e.split(/\s/),s=d(e,n,r),u=s.success;return a.length>1&&(s.url=a[0],i=a[1]),s.success=function(e){o.html(i?t("<div>").html(e.replace(b,"")).find(i):e),u&&u.apply(o,arguments)},t.ajax(s),this};var N=encodeURIComponent;t.param=function(e,n){var r=[];return r.add=function(e,n){t.isFunction(n)&&(n=n()),null==n&&(n=""),this.push(N(e)+"="+N(n))},m(r,e,n),r.join("&").replace(/%20/g,"+")}}(e),function(t){t.fn.serializeArray=function(){var e,n,r=[],i=function(t){return t.forEach?t.forEach(i):void r.push({name:e,value:t})};return this[0]&&t.each(this[0].elements,function(r,o){n=o.type,e=o.name,e&&"fieldset"!=o.nodeName.toLowerCase()&&!o.disabled&&"submit"!=n&&"reset"!=n&&"button"!=n&&"file"!=n&&("radio"!=n&&"checkbox"!=n||o.checked)&&i(t(o).val())}),r},t.fn.serialize=function(){var t=[];return this.serializeArray().forEach(function(e){t.push(encodeURIComponent(e.name)+"="+encodeURIComponent(e.value))}),t.join("&")},t.fn.submit=function(e){if(0 in arguments)this.bind("submit",e);else if(this.length){var n=t.Event("submit");this.eq(0).trigger(n),n.isDefaultPrevented()||this.get(0).submit()}return this}}(e),function(){try{getComputedStyle(void 0)}catch(t){var e=getComputedStyle;window.getComputedStyle=function(t,n){try{return e(t,n)}catch(r){return null}}}}(),t("zepto",e)});layui.define(["layer-mobile","zepto"],function(e){"use strict";var t=layui.zepto,a=layui["layer-mobile"],i=(layui.device(),"layui-upload-enter"),n="layui-upload-iframe",r={icon:2,shift:6},o={file:"文件",video:"视频",audio:"音频"};a.msg=function(e){return a.open({content:e||"",skin:"msg",time:2})};var s=function(e){this.options=e};s.prototype.init=function(){var e=this,a=e.options,r=t("body"),s=t(a.elem||".layui-upload-file"),u=t('<iframe id="'+n+'" class="'+n+'" name="'+n+'"></iframe>');return t("#"+n)[0]||r.append(u),s.each(function(r,s){s=t(s);var u='<form target="'+n+'" method="'+(a.method||"post")+'" key="set-mine" enctype="multipart/form-data" action="'+(a.url||"")+'"></form>',l=s.attr("lay-type")||a.type;a.unwrap||(u='<div class="layui-box layui-upload-button">'+u+'<span class="layui-upload-icon"><i class="layui-icon">&#xe608;</i>'+(s.attr("lay-title")||a.title||"上传"+(o[l]||"图片"))+"</span></div>"),u=t(u),a.unwrap||u.on("dragover",function(e){e.preventDefault(),t(this).addClass(i)}).on("dragleave",function(){t(this).removeClass(i)}).on("drop",function(){t(this).removeClass(i)}),s.parent("form").attr("target")===n&&(a.unwrap?s.unwrap():(s.parent().next().remove(),s.unwrap().unwrap())),s.wrap(u),s.off("change").on("change",function(){e.action(this,l)})})},s.prototype.action=function(e,i){var o=this,s=o.options,u=e.value,l=t(e),p=l.attr("lay-ext")||s.ext||"";if(u){switch(i){case"file":if(p&&!RegExp("\\w\\.("+p+")$","i").test(escape(u)))return a.msg("不支持该文件格式",r),e.value="";break;case"video":if(!RegExp("\\w\\.("+(p||"avi|mp4|wma|rmvb|rm|flash|3gp|flv")+")$","i").test(escape(u)))return a.msg("不支持该视频格式",r),e.value="";break;case"audio":if(!RegExp("\\w\\.("+(p||"mp3|wav|mid")+")$","i").test(escape(u)))return a.msg("不支持该音频格式",r),e.value="";break;default:if(!RegExp("\\w\\.("+(p||"jpg|png|gif|bmp|jpeg")+")$","i").test(escape(u)))return a.msg("不支持该图片格式",r),e.value=""}s.before&&s.before(e),l.parent().submit();var c=t("#"+n),f=setInterval(function(){var t;try{t=c.contents().find("body").text()}catch(i){a.msg("上传接口存在跨域",r),clearInterval(f)}if(t){clearInterval(f),c.contents().find("body").html("");try{t=JSON.parse(t)}catch(i){return t={},a.msg("请对上传接口返回JSON字符",r)}"function"==typeof s.success&&s.success(t,e)}},30);e.value=""}},e("upload-mobile",function(e){var t=new s(e=e||{});t.init()})});layui.define(function(i){i("layim-mobile",layui.v)});layui["layui.mobile"]||layui.config({base:layui.cache.dir+"lay/modules/mobile/"}).extend({"layer-mobile":"layer-mobile",zepto:"zepto","upload-mobile":"upload-mobile","layim-mobile":"layim-mobile"}),layui.define(["layer-mobile","zepto","layim-mobile"],function(l){l("mobile",{layer:layui["layer-mobile"],layim:layui["layim-mobile"]})});
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/lay/modules/rate.js b/pluss-wap-page/src/main/resources/static/resources/js/lay/modules/rate.js
new file mode 100644
index 0000000..762fb3a
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/lay/modules/rate.js
@@ -0,0 +1,2 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ ;layui.define("jquery",function(e){"use strict";var a=layui.jquery,i={config:{},index:layui.rate?layui.rate.index+1e4:0,set:function(e){var i=this;return i.config=a.extend({},i.config,e),i},on:function(e,a){return layui.onevent.call(this,n,e,a)}},l=function(){var e=this,a=e.config;return{setvalue:function(a){e.setvalue.call(e,a)},config:a}},n="rate",t="layui-rate",o="layui-icon-rate",s="layui-icon-rate-solid",u="layui-icon-rate-half",r="layui-icon-rate-solid layui-icon-rate-half",c="layui-icon-rate-solid layui-icon-rate",f="layui-icon-rate layui-icon-rate-half",v=function(e){var l=this;l.index=++i.index,l.config=a.extend({},l.config,i.config,e),l.render()};v.prototype.config={length:5,text:!1,readonly:!1,half:!1,value:0,theme:""},v.prototype.render=function(){var e=this,i=e.config,l=i.theme?'style="color: '+i.theme+';"':"";i.elem=a(i.elem),parseInt(i.value)!==i.value&&(i.half||(i.value=Math.ceil(i.value)-i.value<.5?Math.ceil(i.value):Math.floor(i.value)));for(var n='<ul class="layui-rate" '+(i.readonly?"readonly":"")+">",u=1;u<=i.length;u++){var r='<li class="layui-inline"><i class="layui-icon '+(u>Math.floor(i.value)?o:s)+'" '+l+"></i></li>";i.half&&parseInt(i.value)!==i.value&&u==Math.ceil(i.value)?n=n+'<li><i class="layui-icon layui-icon-rate-half" '+l+"></i></li>":n+=r}n+="</ul>"+(i.text?'<span class="layui-inline">'+i.value+"星":"")+"</span>";var c=i.elem,f=c.next("."+t);f[0]&&f.remove(),e.elemTemp=a(n),i.span=e.elemTemp.next("span"),i.setText&&i.setText(i.value),c.html(e.elemTemp),c.addClass("layui-inline"),i.readonly||e.action()},v.prototype.setvalue=function(e){var a=this,i=a.config;i.value=e,a.render()},v.prototype.action=function(){var e=this,i=e.config,l=e.elemTemp,n=l.find("i").width();l.children("li").each(function(e){var t=e+1,v=a(this);v.on("click",function(e){if(i.value=t,i.half){var o=e.pageX-a(this).offset().left;o<=n/2&&(i.value=i.value-.5)}i.text&&l.next("span").text(i.value+"星"),i.choose&&i.choose(i.value),i.setText&&i.setText(i.value)}),v.on("mousemove",function(e){if(l.find("i").each(function(){a(this).addClass(o).removeClass(r)}),l.find("i:lt("+t+")").each(function(){a(this).addClass(s).removeClass(f)}),i.half){var c=e.pageX-a(this).offset().left;c<=n/2&&v.children("i").addClass(u).removeClass(s)}}),v.on("mouseleave",function(){l.find("i").each(function(){a(this).addClass(o).removeClass(r)}),l.find("i:lt("+Math.floor(i.value)+")").each(function(){a(this).addClass(s).removeClass(f)}),i.half&&parseInt(i.value)!==i.value&&l.children("li:eq("+Math.floor(i.value)+")").children("i").addClass(u).removeClass(c)})})},v.prototype.events=function(){var e=this;e.config},i.render=function(e){var a=new v(e);return l.call(a)},e(n,i)});
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/lay/modules/slider.js b/pluss-wap-page/src/main/resources/static/resources/js/lay/modules/slider.js
new file mode 100644
index 0000000..446378d
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/lay/modules/slider.js
@@ -0,0 +1,2 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ ;layui.define("jquery",function(e){"use strict";var i=layui.jquery,t={config:{},index:layui.slider?layui.slider.index+1e4:0,set:function(e){var t=this;return t.config=i.extend({},t.config,e),t},on:function(e,i){return layui.onevent.call(this,n,e,i)}},a=function(){var e=this,i=e.config;return{setValue:function(i,t){return e.slide("set",i,t||0)},config:i}},n="slider",l="layui-disabled",s="layui-slider",r="layui-slider-bar",o="layui-slider-wrap",u="layui-slider-wrap-btn",d="layui-slider-tips",v="layui-slider-input",c="layui-slider-input-txt",m="layui-slider-input-btn",p="layui-slider-hover",f=function(e){var a=this;a.index=++t.index,a.config=i.extend({},a.config,t.config,e),a.render()};f.prototype.config={type:"default",min:0,max:100,value:0,step:1,showstep:!1,tips:!0,input:!1,range:!1,height:200,disabled:!1,theme:"#009688"},f.prototype.render=function(){var e=this,t=e.config;if(t.step<1&&(t.step=1),t.max<t.min&&(t.max=t.min+t.step),t.range){t.value="object"==typeof t.value?t.value:[t.min,t.value];var a=Math.min(t.value[0],t.value[1]),n=Math.max(t.value[0],t.value[1]);t.value[0]=a>t.min?a:t.min,t.value[1]=n>t.min?n:t.min,t.value[0]=t.value[0]>t.max?t.max:t.value[0],t.value[1]=t.value[1]>t.max?t.max:t.value[1];var r=Math.floor((t.value[0]-t.min)/(t.max-t.min)*100),v=Math.floor((t.value[1]-t.min)/(t.max-t.min)*100),m=v-r+"%";r+="%",v+="%"}else{"object"==typeof t.value&&(t.value=Math.min.apply(null,t.value)),t.value<t.min&&(t.value=t.min),t.value>t.max&&(t.value=t.max);var m=Math.floor((t.value-t.min)/(t.max-t.min)*100)+"%"}var p=t.disabled?"#c2c2c2":t.theme,f='<div class="layui-slider '+("vertical"===t.type?"layui-slider-vertical":"")+'">'+(t.tips?'<div class="layui-slider-tips"></div>':"")+'<div class="layui-slider-bar" style="background:'+p+"; "+("vertical"===t.type?"height":"width")+":"+m+";"+("vertical"===t.type?"bottom":"left")+":"+(r||0)+';"></div><div class="layui-slider-wrap" style="'+("vertical"===t.type?"bottom":"left")+":"+(r||m)+';"><div class="layui-slider-wrap-btn" style="border: 2px solid '+p+';"></div></div>'+(t.range?'<div class="layui-slider-wrap" style="'+("vertical"===t.type?"bottom":"left")+":"+v+';"><div class="layui-slider-wrap-btn" style="border: 2px solid '+p+';"></div></div>':"")+"</div>",h=i(t.elem),y=h.next("."+s);if(y[0]&&y.remove(),e.elemTemp=i(f),t.range?(e.elemTemp.find("."+o).eq(0).data("value",t.value[0]),e.elemTemp.find("."+o).eq(1).data("value",t.value[1])):e.elemTemp.find("."+o).data("value",t.value),h.html(e.elemTemp),"vertical"===t.type&&e.elemTemp.height(t.height+"px"),t.showstep){for(var g=(t.max-t.min)/t.step,b="",x=1;x<g+1;x++){var T=100*x/g;T<100&&(b+='<div class="layui-slider-step" style="'+("vertical"===t.type?"bottom":"left")+":"+T+'%"></div>')}e.elemTemp.append(b)}if(t.input&&!t.range){var w=i('<div class="layui-slider-input layui-input"><div class="layui-slider-input-txt"><input type="text" class="layui-input"></div><div class="layui-slider-input-btn"><i class="layui-icon layui-icon-up"></i><i class="layui-icon layui-icon-down"></i></div></div>');h.css("position","relative"),h.append(w),h.find("."+c).children("input").val(t.value),"vertical"===t.type?w.css({left:0,top:-48}):e.elemTemp.css("margin-right",w.outerWidth()+15)}t.disabled?(e.elemTemp.addClass(l),e.elemTemp.find("."+u).addClass(l)):e.slide(),e.elemTemp.find("."+u).on("mouseover",function(){var a="vertical"===t.type?t.height:e.elemTemp[0].offsetWidth,n=e.elemTemp.find("."+o),l="vertical"===t.type?a-i(this).parent()[0].offsetTop-n.height():i(this).parent()[0].offsetLeft,s=l/a*100,r=i(this).parent().data("value"),u=t.setTips?t.setTips(r):r;e.elemTemp.find("."+d).html(u),"vertical"===t.type?e.elemTemp.find("."+d).css({bottom:s+"%","margin-bottom":"20px",display:"inline-block"}):e.elemTemp.find("."+d).css({left:s+"%",display:"inline-block"})}).on("mouseout",function(){e.elemTemp.find("."+d).css("display","none")})},f.prototype.slide=function(e,t,a){var n=this,l=n.config,s=n.elemTemp,f=function(){return"vertical"===l.type?l.height:s[0].offsetWidth},h=s.find("."+o),y=s.next("."+v),g=y.children("."+c).children("input").val(),b=100/((l.max-l.min)/Math.ceil(l.step)),x=function(e,i){e=Math.ceil(e)*b>100?Math.ceil(e)*b:Math.round(e)*b,e=e>100?100:e,h.eq(i).css("vertical"===l.type?"bottom":"left",e+"%");var t=T(h[0].offsetLeft),a=l.range?T(h[1].offsetLeft):0;"vertical"===l.type?(s.find("."+d).css({bottom:e+"%","margin-bottom":"20px"}),t=T(f()-h[0].offsetTop-h.height()),a=l.range?T(f()-h[1].offsetTop-h.height()):0):s.find("."+d).css("left",e+"%"),t=t>100?100:t,a=a>100?100:a;var n=Math.min(t,a),o=Math.abs(t-a);"vertical"===l.type?s.find("."+r).css({height:o+"%",bottom:n+"%"}):s.find("."+r).css({width:o+"%",left:n+"%"});var u=l.min+Math.round((l.max-l.min)*e/100);if(g=u,y.children("."+c).children("input").val(g),h.eq(i).data("value",u),u=l.setTips?l.setTips(u):u,s.find("."+d).html(u),l.range){var v=[h.eq(0).data("value"),h.eq(1).data("value")];v[0]>v[1]&&v.reverse()}l.change&&l.change(l.range?v:u)},T=function(e){var i=e/f()*100/b,t=Math.round(i)*b;return e==f()&&(t=Math.ceil(i)*b),t},w=i(['<div class="layui-auxiliar-moving" id="LAY-slider-moving"></div'].join("")),M=function(e,t){var a=function(){t&&t(),w.remove()};i("#LAY-slider-moving")[0]||i("body").append(w),w.on("mousemove",e),w.on("mouseup",a).on("mouseleave",a)};if("set"===e)return x(t,a);s.find("."+u).each(function(e){var t=i(this);t.on("mousedown",function(i){i=i||window.event;var a=t.parent()[0].offsetLeft,n=i.clientX;"vertical"===l.type&&(a=f()-t.parent()[0].offsetTop-h.height(),n=i.clientY);var r=function(i){i=i||window.event;var r=a+("vertical"===l.type?n-i.clientY:i.clientX-n);r<0&&(r=0),r>f()&&(r=f());var o=r/f()*100/b;x(o,e),t.addClass(p),s.find("."+d).show(),i.preventDefault()},o=function(){t.removeClass(p),s.find("."+d).hide()};M(r,o)})}),s.on("click",function(e){var t=i("."+u);if(!t.is(event.target)&&0===t.has(event.target).length&&t.length){var a,n="vertical"===l.type?f()-e.clientY+i(this).offset().top:e.clientX-i(this).offset().left;n<0&&(n=0),n>f()&&(n=f());var s=n/f()*100/b;a=l.range?"vertical"===l.type?Math.abs(n-parseInt(i(h[0]).css("bottom")))>Math.abs(n-parseInt(i(h[1]).css("bottom")))?1:0:Math.abs(n-h[0].offsetLeft)>Math.abs(n-h[1].offsetLeft)?1:0:0,x(s,a),e.preventDefault()}}),y.hover(function(){var e=i(this);e.children("."+m).fadeIn("fast")},function(){var e=i(this);e.children("."+m).fadeOut("fast")}),y.children("."+m).children("i").each(function(e){i(this).on("click",function(){g=1==e?g-l.step<l.min?l.min:Number(g)-l.step:Number(g)+l.step>l.max?l.max:Number(g)+l.step;var i=(g-l.min)/(l.max-l.min)*100/b;x(i,0)})});var q=function(){var e=this.value;e=isNaN(e)?0:e,e=e<l.min?l.min:e,e=e>l.max?l.max:e,this.value=e;var i=(e-l.min)/(l.max-l.min)*100/b;x(i,0)};y.children("."+c).children("input").on("keydown",function(e){13===e.keyCode&&(e.preventDefault(),q.call(this))}).on("change",q)},f.prototype.events=function(){var e=this;e.config},t.render=function(e){var i=new f(e);return a.call(i)},e(n,t)});
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/lay/modules/table.js b/pluss-wap-page/src/main/resources/static/resources/js/lay/modules/table.js
new file mode 100644
index 0000000..e9217db
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/lay/modules/table.js
@@ -0,0 +1,2 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ ;layui.define(["laytpl","laypage","layer","form","util"],function(e){"use strict";var t=layui.$,i=layui.laytpl,a=layui.laypage,l=layui.layer,n=layui.form,o=(layui.util,layui.hint()),r=layui.device(),d={config:{checkName:"LAY_CHECKED",indexName:"LAY_TABLE_INDEX"},cache:{},index:layui.table?layui.table.index+1e4:0,set:function(e){var i=this;return i.config=t.extend({},i.config,e),i},on:function(e,t){return layui.onevent.call(this,u,e,t)}},c=function(){var e=this,t=e.config,i=t.id||t.index;return i&&(c.that[i]=e,c.config[i]=t),{reload:function(t){e.reload.call(e,t)},setColsWidth:function(){e.setColsWidth.call(e)},resize:function(){e.resize.call(e)},config:t}},s=function(e){var t=c.config[e];return t||o.error("The ID option was not found in the table instance"),t||null},u="table",h=".layui-table",y="layui-hide",f="layui-none",p="layui-table-view",v=".layui-table-tool",m=".layui-table-box",g=".layui-table-init",b=".layui-table-header",x=".layui-table-body",k=".layui-table-main",C=".layui-table-fixed",w=".layui-table-fixed-l",T=".layui-table-fixed-r",A=".layui-table-total",L=".layui-table-page",S=".layui-table-sort",N="layui-table-edit",W="layui-table-hover",_=function(e){var t='{{#if(item2.colspan){}} colspan="{{item2.colspan}}"{{#} if(item2.rowspan){}} rowspan="{{item2.rowspan}}"{{#}}}';return e=e||{},['<table cellspacing="0" cellpadding="0" border="0" class="layui-table" ','{{# if(d.data.skin){ }}lay-skin="{{d.data.skin}}"{{# } }} {{# if(d.data.size){ }}lay-size="{{d.data.size}}"{{# } }} {{# if(d.data.even){ }}lay-even{{# } }}>',"<thead>","{{# layui.each(d.data.cols, function(i1, item1){ }}","<tr>","{{# layui.each(item1, function(i2, item2){ }}",'{{# if(item2.fixed && item2.fixed !== "right"){ left = true; } }}','{{# if(item2.fixed === "right"){ right = true; } }}',function(){return e.fixed&&"right"!==e.fixed?'{{# if(item2.fixed && item2.fixed !== "right"){ }}':"right"===e.fixed?'{{# if(item2.fixed === "right"){ }}':""}(),"{{# var isSort = !(item2.colGroup) && item2.sort; }}",'<th data-field="{{ item2.field||i2 }}" data-key="{{d.index}}-{{i1}}-{{i2}}" {{# if( item2.parentKey){ }}data-parentkey="{{ item2.parentKey }}"{{# } }} {{# if(item2.minWidth){ }}data-minwidth="{{item2.minWidth}}"{{# } }} '+t+' {{# if(item2.unresize || item2.colGroup){ }}data-unresize="true"{{# } }} class="{{# if(item2.hide){ }}layui-hide{{# } }}{{# if(isSort){ }} layui-unselect{{# } }}{{# if(!item2.field){ }} layui-table-col-special{{# } }}">','<div class="layui-table-cell laytable-cell-',"{{# if(item2.colGroup){ }}","group","{{# } else { }}","{{d.index}}-{{i1}}-{{i2}}",'{{# if(item2.type !== "normal"){ }}'," laytable-cell-{{ item2.type }}","{{# } }}","{{# } }}",'" {{#if(item2.align){}}align="{{item2.align}}"{{#}}}>','{{# if(item2.type === "checkbox"){ }}','<input type="checkbox" name="layTableCheckbox" lay-skin="primary" lay-filter="layTableAllChoose" {{# if(item2[d.data.checkName]){ }}checked{{# }; }}>',"{{# } else { }}",'<span>{{item2.title||""}}</span>',"{{# if(isSort){ }}",'<span class="layui-table-sort layui-inline"><i class="layui-edge layui-table-sort-asc" title="升序"></i><i class="layui-edge layui-table-sort-desc" title="降序"></i></span>',"{{# } }}","{{# } }}","</div>","</th>",e.fixed?"{{# }; }}":"","{{# }); }}","</tr>","{{# }); }}","</thead>","</table>"].join("")},E=['<table cellspacing="0" cellpadding="0" border="0" class="layui-table" ','{{# if(d.data.skin){ }}lay-skin="{{d.data.skin}}"{{# } }} {{# if(d.data.size){ }}lay-size="{{d.data.size}}"{{# } }} {{# if(d.data.even){ }}lay-even{{# } }}>',"<tbody></tbody>","</table>"].join(""),z=['<div class="layui-form layui-border-box {{d.VIEW_CLASS}}" lay-filter="LAY-table-{{d.index}}" lay-id="{{ d.data.id }}" style="{{# if(d.data.width){ }}width:{{d.data.width}}px;{{# } }} {{# if(d.data.height){ }}height:{{d.data.height}}px;{{# } }}">',"{{# if(d.data.toolbar){ }}",'<div class="layui-table-tool">','<div class="layui-table-tool-temp"></div>','<div class="layui-table-tool-self"></div>',"</div>","{{# } }}",'<div class="layui-table-box">',"{{# if(d.data.loading){ }}",'<div class="layui-table-init" style="background-color: #fff;">','<i class="layui-icon layui-icon-loading layui-icon"></i>',"</div>","{{# } }}","{{# var left, right; }}",'<div class="layui-table-header">',_(),"</div>",'<div class="layui-table-body layui-table-main">',E,"</div>","{{# if(left){ }}",'<div class="layui-table-fixed layui-table-fixed-l">','<div class="layui-table-header">',_({fixed:!0}),"</div>",'<div class="layui-table-body">',E,"</div>","</div>","{{# }; }}","{{# if(right){ }}",'<div class="layui-table-fixed layui-table-fixed-r">','<div class="layui-table-header">',_({fixed:"right"}),'<div class="layui-table-mend"></div>',"</div>",'<div class="layui-table-body">',E,"</div>","</div>","{{# }; }}","</div>","{{# if(d.data.totalRow){ }}",'<div class="layui-table-total">','<table cellspacing="0" cellpadding="0" border="0" class="layui-table" ','{{# if(d.data.skin){ }}lay-skin="{{d.data.skin}}"{{# } }} {{# if(d.data.size){ }}lay-size="{{d.data.size}}"{{# } }} {{# if(d.data.even){ }}lay-even{{# } }}>','<tbody><tr><td><div class="layui-table-cell" style="visibility: hidden;">Total</div></td></tr></tbody>',"</table>","</div>","{{# } }}","{{# if(d.data.page){ }}",'<div class="layui-table-page">','<div id="layui-table-page{{d.index}}"></div>',"</div>","{{# } }}","<style>","{{# layui.each(d.data.cols, function(i1, item1){","layui.each(item1, function(i2, item2){ }}",".laytable-cell-{{d.index}}-{{i1}}-{{i2}}{ ","{{# if(item2.width){ }}","width: {{item2.width}}px;","{{# } }}"," }","{{# });","}); }}","</style>","</div>"].join(""),H=t(window),R=t(document),F=function(e){var i=this;i.index=++d.index,i.config=t.extend({},i.config,d.config,e),i.render()};F.prototype.config={limit:10,loading:!0,cellMinWidth:60,defaultToolbar:["filter","exports","print"],autoSort:!0,text:{none:"无数据"}},F.prototype.render=function(){var e=this,a=e.config;if(a.elem=t(a.elem),a.where=a.where||{},a.id=a.id||a.elem.attr("id")||e.index,a.request=t.extend({pageName:"page",limitName:"limit"},a.request),a.response=t.extend({statusName:"code",statusCode:0,msgName:"msg",dataName:"data",countName:"count"},a.response),"object"==typeof a.page&&(a.limit=a.page.limit||a.limit,a.limits=a.page.limits||a.limits,e.page=a.page.curr=a.page.curr||1,delete a.page.elem,delete a.page.jump),!a.elem[0])return e;a.height&&/^full-\d+$/.test(a.height)&&(e.fullHeightGap=a.height.split("-")[1],a.height=H.height()-e.fullHeightGap),e.setInit();var l=a.elem,n=l.next("."+p),o=e.elem=t(i(z).render({VIEW_CLASS:p,data:a,index:e.index}));if(a.index=e.index,n[0]&&n.remove(),l.after(o),e.layTool=o.find(v),e.layBox=o.find(m),e.layHeader=o.find(b),e.layMain=o.find(k),e.layBody=o.find(x),e.layFixed=o.find(C),e.layFixLeft=o.find(w),e.layFixRight=o.find(T),e.layTotal=o.find(A),e.layPage=o.find(L),e.renderToolbar(),e.fullSize(),a.cols.length>1){var r=e.layFixed.find(b).find("th");r.height(e.layHeader.height()-1-parseFloat(r.css("padding-top"))-parseFloat(r.css("padding-bottom")))}e.pullData(e.page),e.events()},F.prototype.initOpts=function(e){var t=this,i=(t.config,{checkbox:48,radio:48,space:15,numbers:40});e.checkbox&&(e.type="checkbox"),e.space&&(e.type="space"),e.type||(e.type="normal"),"normal"!==e.type&&(e.unresize=!0,e.width=e.width||i[e.type])},F.prototype.setInit=function(e){var t=this,i=t.config;return i.clientWidth=i.width||function(){var e=function(t){var a,l;t=t||i.elem.parent(),a=t.width();try{l="none"===t.css("display")}catch(n){}return!t[0]||a&&!l?a:e(t.parent())};return e()}(),"width"===e?i.clientWidth:void layui.each(i.cols,function(e,a){layui.each(a,function(l,n){if(!n)return void a.splice(l,1);if(n.key=e+"-"+l,n.hide=n.hide||!1,n.colGroup||n.colspan>1){var o=0;layui.each(i.cols[e+1],function(t,i){i.HAS_PARENT||o>1&&o==n.colspan||(i.HAS_PARENT=!0,i.parentKey=e+"-"+l,o+=parseInt(i.colspan>1?i.colspan:1))}),n.colGroup=!0}t.initOpts(n)})})},F.prototype.renderToolbar=function(){var e=this,a=e.config,l=['<div class="layui-inline" lay-event="add"><i class="layui-icon layui-icon-add-1"></i></div>','<div class="layui-inline" lay-event="update"><i class="layui-icon layui-icon-edit"></i></div>','<div class="layui-inline" lay-event="delete"><i class="layui-icon layui-icon-delete"></i></div>'].join(""),n=e.layTool.find(".layui-table-tool-temp");if("default"===a.toolbar)n.html(l);else if("string"==typeof a.toolbar){var o=t(a.toolbar).html()||"";o&&n.html(i(o).render(a))}var r={filter:{title:"筛选列",layEvent:"LAYTABLE_COLS",icon:"layui-icon-cols"},exports:{title:"导出",layEvent:"LAYTABLE_EXPORT",icon:"layui-icon-export"},print:{title:"打印",layEvent:"LAYTABLE_PRINT",icon:"layui-icon-print"}},d=[];"object"==typeof a.defaultToolbar&&layui.each(a.defaultToolbar,function(e,t){var i=r[t];i&&d.push('<div class="layui-inline" title="'+i.title+'" lay-event="'+i.layEvent+'"><i class="layui-icon '+i.icon+'"></i></div>')}),e.layTool.find(".layui-table-tool-self").html(d.join(""))},F.prototype.setParentCol=function(e,t){var i=this,a=i.config,l=i.layHeader.find('th[data-key="'+a.index+"-"+t+'"]'),n=parseInt(l.attr("colspan"))||0;if(l[0]){var o=t.split("-"),r=a.cols[o[0]][o[1]];e?n--:n++,l.attr("colspan",n),l[n<1?"addClass":"removeClass"](y),r.colspan=n,r.hide=n<1;var d=l.data("parentkey");d&&i.setParentCol(e,d)}},F.prototype.setColsPatch=function(){var e=this,t=e.config;layui.each(t.cols,function(t,i){layui.each(i,function(t,i){i.hide&&e.setParentCol(i.hide,i.parentKey)})})},F.prototype.setColsWidth=function(){var e=this,t=e.config,i=0,a=0,l=0,n=0,o=e.setInit("width");e.eachCols(function(e,t){t.hide||i++}),o=o-function(){return"line"===t.skin||"nob"===t.skin?2:i+1}()-e.getScrollWidth(e.layMain[0])-1;var r=function(e){layui.each(t.cols,function(i,r){layui.each(r,function(i,d){var c=0,s=d.minWidth||t.cellMinWidth;return d?void(d.colGroup||d.hide||(e?l&&l<s&&(a--,c=s):(c=d.width||0,/\d+%$/.test(c)?(c=Math.floor(parseFloat(c)/100*o),c<s&&(c=s)):c||(d.width=c=0,a++)),d.hide&&(c=0),n+=c)):void r.splice(i,1)})}),o>n&&a&&(l=(o-n)/a)};r(),r(!0),e.autoColNums=a,e.eachCols(function(i,a){var n=a.minWidth||t.cellMinWidth;a.colGroup||a.hide||(0===a.width?e.getCssRule(t.index+"-"+a.key,function(e){e.style.width=Math.floor(l>=n?l:n)+"px"}):/\d+%$/.test(a.width)&&e.getCssRule(t.index+"-"+a.key,function(e){e.style.width=Math.floor(parseFloat(a.width)/100*o)+"px"}))});var d=e.layMain.width()-e.getScrollWidth(e.layMain[0])-e.layMain.children("table").outerWidth();if(e.autoColNums&&d>=-i&&d<=i){var c=function(t){var i;return t=t||e.layHeader.eq(0).find("thead th:last-child"),i=t.data("field"),!i&&t.prev()[0]?c(t.prev()):t},s=c(),u=s.data("key");e.getCssRule(u,function(t){var i=t.style.width||s.outerWidth();t.style.width=parseFloat(i)+d+"px",e.layMain.height()-e.layMain.prop("clientHeight")>0&&(t.style.width=parseFloat(t.style.width)-1+"px")})}e.loading(!0)},F.prototype.resize=function(){var e=this;e.fullSize(),e.setColsWidth(),e.scrollPatch()},F.prototype.reload=function(e){var i=this;i.config.data&&i.config.data.constructor===Array&&delete i.config.data,i.config=t.extend({},i.config,e),i.render()},F.prototype.page=1,F.prototype.pullData=function(e){var i=this,a=i.config,l=a.request,n=a.response,o=function(){"object"==typeof a.initSort&&i.sort(a.initSort.field,a.initSort.type)};if(i.startTime=(new Date).getTime(),a.url){var r={};r[l.pageName]=e,r[l.limitName]=a.limit;var d=t.extend(r,a.where);a.contentType&&0==a.contentType.indexOf("application/json")&&(d=JSON.stringify(d)),t.ajax({type:a.method||"get",url:a.url,contentType:a.contentType,data:d,dataType:"json",headers:a.headers||{},success:function(t){"function"==typeof a.parseData&&(t=a.parseData(t)||t),t[n.statusName]!=n.statusCode?(i.renderForm(),i.layMain.html('<div class="'+f+'">'+(t[n.msgName]||"返回的数据不符合规范，正确的成功状态码 ("+n.statusName+") 应为："+n.statusCode)+"</div>")):(i.renderData(t,e,t[n.countName]),o(),a.time=(new Date).getTime()-i.startTime+" ms"),i.setColsWidth(),"function"==typeof a.done&&a.done(t,e,t[n.countName])},error:function(e,t){i.layMain.html('<div class="'+f+'">数据接口请求异常：'+t+"</div>"),i.renderForm(),i.setColsWidth()}})}else if(a.data&&a.data.constructor===Array){var c={},s=e*a.limit-a.limit;c[n.dataName]=a.data.concat().splice(s,a.limit),c[n.countName]=a.data.length,i.renderData(c,e,a.data.length),o(),i.setColsWidth(),"function"==typeof a.done&&a.done(c,e,c[n.countName])}},F.prototype.eachCols=function(e){var t=this;return d.eachCols(null,e,t.config.cols),t},F.prototype.renderData=function(e,n,o,r){var c=this,s=c.config,u=e[s.response.dataName]||[],h=[],p=[],v=[],m=function(){var e;return!r&&c.sortKey?c.sort(c.sortKey.field,c.sortKey.sort,!0):(layui.each(u,function(a,l){var o=[],u=[],f=[],m=a+s.limit*(n-1)+1;0!==l.length&&(r||(l[d.config.indexName]=a),c.eachCols(function(n,r){var c=r.field||n,h=s.index+"-"+r.key,p=l[c];if(void 0!==p&&null!==p||(p=""),!r.colGroup){var v=['<td data-field="'+c+'" data-key="'+h+'" '+function(){var e=[];return r.edit&&e.push('data-edit="'+r.edit+'"'),r.align&&e.push('align="'+r.align+'"'),r.templet&&e.push('data-content="'+p+'"'),r.toolbar&&e.push('data-off="true"'),r.event&&e.push('lay-event="'+r.event+'"'),r.style&&e.push('style="'+r.style+'"'),r.minWidth&&e.push('data-minwidth="'+r.minWidth+'"'),e.join(" ")}()+' class="'+function(){var e=[];return r.hide&&e.push(y),r.field||e.push("layui-table-col-special"),e.join(" ")}()+'">','<div class="layui-table-cell laytable-cell-'+function(){return"normal"===r.type?h:h+" laytable-cell-"+r.type}()+'">'+function(){var n=t.extend(!0,{LAY_INDEX:m},l),o=d.config.checkName;switch(r.type){case"checkbox":return'<input type="checkbox" name="layTableCheckbox" lay-skin="primary" '+function(){return r[o]?(l[o]=r[o],r[o]?"checked":""):n[o]?"checked":""}()+">";case"radio":return n[o]&&(e=a),'<input type="radio" name="layTableRadio_'+s.index+'" '+(n[o]?"checked":"")+' lay-type="layTableRadio">';case"numbers":return m}return r.toolbar?i(t(r.toolbar).html()||"").render(n):r.templet?function(){return"function"==typeof r.templet?r.templet(n):i(t(r.templet).html()||String(p)).render(n)}():p}(),"</div></td>"].join("");o.push(v),r.fixed&&"right"!==r.fixed&&u.push(v),"right"===r.fixed&&f.push(v)}}),h.push('<tr data-index="'+a+'">'+o.join("")+"</tr>"),p.push('<tr data-index="'+a+'">'+u.join("")+"</tr>"),v.push('<tr data-index="'+a+'">'+f.join("")+"</tr>"))}),c.layBody.scrollTop(0),c.layMain.find("."+f).remove(),c.layMain.find("tbody").html(h.join("")),c.layFixLeft.find("tbody").html(p.join("")),c.layFixRight.find("tbody").html(v.join("")),c.renderForm(),"number"==typeof e&&c.setThisRowChecked(e),c.syncCheckAll(),c.haveInit?c.scrollPatch():setTimeout(function(){c.scrollPatch()},50),c.haveInit=!0,l.close(c.tipsIndex),s.HAS_SET_COLS_PATCH||c.setColsPatch(),void(s.HAS_SET_COLS_PATCH=!0))};return c.key=s.id||s.index,d.cache[c.key]=u,c.layPage[0==o||0===u.length&&1==n?"addClass":"removeClass"](y),r?m():0===u.length?(c.renderForm(),c.layFixed.remove(),c.layMain.find("tbody").html(""),c.layMain.find("."+f).remove(),c.layMain.append('<div class="'+f+'">'+s.text.none+"</div>")):(m(),c.renderTotal(u),void(s.page&&(s.page=t.extend({elem:"layui-table-page"+s.index,count:o,limit:s.limit,limits:s.limits||[10,20,30,40,50,60,70,80,90],groups:3,layout:["prev","page","next","skip","count","limit"],prev:'<i class="layui-icon">&#xe603;</i>',next:'<i class="layui-icon">&#xe602;</i>',jump:function(e,t){t||(c.page=e.curr,s.limit=e.limit,c.loading(),c.pullData(e.curr))}},s.page),s.page.count=o,a.render(s.page))))},F.prototype.renderTotal=function(e){var t=this,i=t.config,a={};if(i.totalRow){layui.each(e,function(e,i){0!==i.length&&t.eachCols(function(e,t){var l=t.field||e,n=i[l];t.totalRow&&(a[l]=(a[l]||0)+(parseFloat(n)||0))})});var l=[];t.eachCols(function(e,t){var n=t.field||e,o=['<td data-field="'+n+'" data-key="'+i.index+"-"+t.key+'" '+function(){var e=[];return t.align&&e.push('align="'+t.align+'"'),t.style&&e.push('style="'+t.style+'"'),t.minWidth&&e.push('data-minwidth="'+t.minWidth+'"'),e.join(" ")}()+' class="'+function(){var e=[];return t.hide&&e.push(y),t.field||e.push("layui-table-col-special"),e.join(" ")}()+'">','<div class="layui-table-cell laytable-cell-'+function(){var e=i.index+"-"+t.key;return"normal"===t.type?e:e+" laytable-cell-"+t.type}()+'">'+function(){var e=t.totalRowText||"";return t.totalRow?parseFloat(a[n]).toFixed(2)||e:e}(),"</div></td>"].join("");l.push(o)}),t.layTotal.find("tbody").html("<tr>"+l.join("")+"</tr>")}},F.prototype.getColElem=function(e,t){var i=this,a=i.config;return e.eq(0).find(".laytable-cell-"+(a.index+"-"+t)+":eq(0)")},F.prototype.renderForm=function(e){n.render(e,"LAY-table-"+this.index)},F.prototype.setThisRowChecked=function(e){var t=this,i=(t.config,"layui-table-click"),a=t.layBody.find('tr[data-index="'+e+'"]');a.addClass(i).siblings("tr").removeClass(i)},F.prototype.sort=function(e,i,a,l){var n,r,c=this,s={},h=c.config,y=h.elem.attr("lay-filter"),f=d.cache[c.key];"string"==typeof e&&c.layHeader.find("th").each(function(i,a){var l=t(this),o=l.data("field");if(o===e)return e=l,n=o,!1});try{var n=n||e.data("field"),p=e.data("key");if(c.sortKey&&!a&&n===c.sortKey.field&&i===c.sortKey.sort)return;var v=c.layHeader.find("th .laytable-cell-"+p).find(S);c.layHeader.find("th").find(S).removeAttr("lay-sort"),v.attr("lay-sort",i||null),c.layFixed.find("th")}catch(m){return o.error("Table modules: Did not match to field")}c.sortKey={field:n,sort:i},h.autoSort&&("asc"===i?r=layui.sort(f,n):"desc"===i?r=layui.sort(f,n,!0):(r=layui.sort(f,d.config.indexName),delete c.sortKey)),s[h.response.dataName]=r||f,c.renderData(s,c.page,c.count,!0),l&&layui.event.call(e,u,"sort("+y+")",{field:n,type:i})},F.prototype.loading=function(e){var i=this,a=i.config;a.loading&&(e?(i.layInit&&i.layInit.remove(),delete i.layInit,i.layBox.find(g).remove()):(i.layInit=t(['<div class="layui-table-init">','<i class="layui-icon layui-icon-loading layui-icon"></i>',"</div>"].join("")),i.layBox.append(i.layInit)))},F.prototype.setCheckData=function(e,t){var i=this,a=i.config,l=d.cache[i.key];l[e]&&l[e].constructor!==Array&&(l[e][a.checkName]=t)},F.prototype.syncCheckAll=function(){var e=this,t=e.config,i=e.layHeader.find('input[name="layTableCheckbox"]'),a=function(i){return e.eachCols(function(e,a){"checkbox"===a.type&&(a[t.checkName]=i)}),i};i[0]&&(d.checkStatus(e.key).isAll?(i[0].checked||(i.prop("checked",!0),e.renderForm("checkbox")),a(!0)):(i[0].checked&&(i.prop("checked",!1),e.renderForm("checkbox")),a(!1)))},F.prototype.getCssRule=function(e,t){var i=this,a=i.elem.find("style")[0],l=a.sheet||a.styleSheet||{},n=l.cssRules||l.rules;layui.each(n,function(i,a){if(a.selectorText===".laytable-cell-"+e)return t(a),!0})},F.prototype.fullSize=function(){var e,t=this,i=t.config,a=i.height;t.fullHeightGap&&(a=H.height()-t.fullHeightGap,a<135&&(a=135),t.elem.css("height",a)),a&&(e=parseFloat(a)-(t.layHeader.outerHeight()||38),i.toolbar&&(e-=t.layTool.outerHeight()||50),i.totalRow&&(e-=t.layTotal.outerHeight()||40),i.page&&(e=e-(t.layPage.outerHeight()||41)-2),t.layMain.css("height",e))},F.prototype.getScrollWidth=function(e){var t=0;return e?t=e.offsetWidth-e.clientWidth:(e=document.createElement("div"),e.style.width="100px",e.style.height="100px",e.style.overflowY="scroll",document.body.appendChild(e),t=e.offsetWidth-e.clientWidth,document.body.removeChild(e)),t},F.prototype.scrollPatch=function(){var e=this,i=e.layMain.children("table"),a=e.layMain.width()-e.layMain.prop("clientWidth"),l=e.layMain.height()-e.layMain.prop("clientHeight"),n=(e.getScrollWidth(e.layMain[0]),i.outerWidth()-e.layMain.width()),o=function(e){if(a&&l){if(e=e.eq(0),!e.find(".layui-table-patch")[0]){var i=t('<th class="layui-table-patch"><div class="layui-table-cell"></div></th>');i.find("div").css({width:a}),e.find("tr").append(i)}}else e.find(".layui-table-patch").remove()};o(e.layHeader),o(e.layTotal);var r=e.layMain.height(),d=r-l;e.layFixed.find(x).css("height",i.height()>=d?d:"auto"),e.layFixRight[n>0?"removeClass":"addClass"](y),e.layFixRight.css("right",a-1)},F.prototype.events=function(){var e,a=this,o=a.config,c=t("body"),s={},h=a.layHeader.find("th"),f=".layui-table-cell",p=o.elem.attr("lay-filter");a.layTool.on("click","*[lay-event]",function(e){var i=t(this),c=i.attr("lay-event"),s=function(e){var l=t(e.list),n=t('<ul class="layui-table-tool-panel"></ul>');n.html(l),o.height&&n.css("max-height",o.height-(a.layTool.outerHeight()||50)),i.find(".layui-table-tool-panel")[0]||i.append(n),a.renderForm(),n.on("click",function(e){layui.stope(e)}),e.done&&e.done(n,l)};switch(layui.stope(e),R.trigger("table.tool.panel.remove"),l.close(a.tipsIndex),c){case"LAYTABLE_COLS":s({list:function(){var e=[];return a.eachCols(function(t,i){i.field&&"normal"==i.type&&e.push('<li><input type="checkbox" name="'+i.field+'" data-key="'+i.key+'" data-parentkey="'+(i.parentKey||"")+'" lay-skin="primary" '+(i.hide?"":"checked")+' title="'+(i.title||i.field)+'" lay-filter="LAY_TABLE_TOOL_COLS"></li>')}),e.join("")}(),done:function(){n.on("checkbox(LAY_TABLE_TOOL_COLS)",function(e){var i=t(e.elem),l=this.checked,n=i.data("key"),r=i.data("parentkey");layui.each(o.cols,function(e,t){layui.each(t,function(t,i){if(e+"-"+t===n){var d=i.hide;i.hide=!l,a.elem.find('*[data-key="'+o.index+"-"+n+'"]')[l?"removeClass":"addClass"](y),d!=i.hide&&a.setParentCol(!l,r),a.resize()}})})})}});break;case"LAYTABLE_EXPORT":r.ie?l.tips("导出功能不支持 IE，请用 Chrome 等高级浏览器导出",this,{tips:3}):s({list:function(){return['<li data-type="csv">导出到 Csv 文件</li>','<li data-type="xls">导出到 Excel 文件</li>'].join("")}(),done:function(e,i){i.on("click",function(){var e=t(this).data("type");d.exportFile(o.id,null,e)})}});break;case"LAYTABLE_PRINT":var h=window.open("打印窗口","_blank"),f=["<style>","body{font-size: 12px; color: #666;}","table{width: 100%; border-collapse: collapse; border-spacing: 0;}","th,td{line-height: 20px; padding: 9px 15px; border: 1px solid #ccc; text-align: left; font-size: 12px; color: #666;}","a{color: #666; text-decoration:none;}","*.layui-hide{display: none}","</style>"].join(""),v=t(a.layHeader.html());v.append(a.layMain.find("table").html()),v.find("th.layui-table-patch").remove(),v.find(".layui-table-col-special").remove(),h.document.write(f+v.prop("outerHTML")),h.document.close(),h.print(),h.close()}layui.event.call(this,u,"toolbar("+p+")",t.extend({event:c,config:o},{}))}),h.on("mousemove",function(e){var i=t(this),a=i.offset().left,l=e.clientX-a;i.data("unresize")||s.resizeStart||(s.allowResize=i.width()-l<=10,c.css("cursor",s.allowResize?"col-resize":""))}).on("mouseleave",function(){t(this);s.resizeStart||c.css("cursor","")}).on("mousedown",function(e){var i=t(this);if(s.allowResize){var l=i.data("key");e.preventDefault(),s.resizeStart=!0,s.offset=[e.clientX,e.clientY],a.getCssRule(l,function(e){var t=e.style.width||i.outerWidth();s.rule=e,s.ruleWidth=parseFloat(t),s.minWidth=i.data("minwidth")||o.cellMinWidth})}}),R.on("mousemove",function(t){if(s.resizeStart){if(t.preventDefault(),s.rule){var i=s.ruleWidth+t.clientX-s.offset[0];i<s.minWidth&&(i=s.minWidth),s.rule.style.width=i+"px",l.close(a.tipsIndex)}e=1}}).on("mouseup",function(t){s.resizeStart&&(s={},c.css("cursor",""),a.scrollPatch()),2===e&&(e=null)}),h.on("click",function(i){var l,n=t(this),o=n.find(S),r=o.attr("lay-sort");return o[0]&&1!==e?(l="asc"===r?"desc":"desc"===r?null:"asc",void a.sort(n,l,null,!0)):e=2}).find(S+" .layui-edge ").on("click",function(e){var i=t(this),l=i.index(),n=i.parents("th").eq(0).data("field");layui.stope(e),0===l?a.sort(n,"asc",null,!0):a.sort(n,"desc",null,!0)});var v=function(e){var l=t(this),n=l.parents("tr").eq(0).data("index"),o=a.layBody.find('tr[data-index="'+n+'"]'),r=d.cache[a.key][n];return t.extend({tr:o,data:d.clearCacheKey(r),del:function(){d.cache[a.key][n]=[],o.remove(),a.scrollPatch()},update:function(e){e=e||{},layui.each(e,function(e,l){if(e in r){var n,d=o.children('td[data-field="'+e+'"]');r[e]=l,a.eachCols(function(t,i){i.field==e&&i.templet&&(n=i.templet)}),d.children(f).html(function(){return n?function(){return"function"==typeof n?n(r):i(t(n).html()||l).render(r)}():l}()),d.data("content",l)}})}},e)};a.elem.on("click",'input[name="layTableCheckbox"]+',function(){var e=t(this).prev(),i=a.layBody.find('input[name="layTableCheckbox"]'),l=e.parents("tr").eq(0).data("index"),n=e[0].checked,o="layTableAllChoose"===e.attr("lay-filter");o?(i.each(function(e,t){t.checked=n,a.setCheckData(e,n)}),a.syncCheckAll(),a.renderForm("checkbox")):(a.setCheckData(l,n),a.syncCheckAll()),layui.event.call(e[0],u,"checkbox("+p+")",v.call(e[0],{checked:n,type:o?"all":"one"}))}),a.elem.on("click",'input[lay-type="layTableRadio"]+',function(){var e=t(this).prev(),i=e[0].checked,l=d.cache[a.key],n=e.parents("tr").eq(0).data("index");layui.each(l,function(e,t){n===e?t.LAY_CHECKED=!0:delete t.LAY_CHECKED}),a.setThisRowChecked(n),layui.event.call(this,u,"radio("+p+")",v.call(this,{checked:i}))}),a.layBody.on("mouseenter","tr",function(){var e=t(this),i=e.index();a.layBody.find("tr:eq("+i+")").addClass(W)}).on("mouseleave","tr",function(){var e=t(this),i=e.index();a.layBody.find("tr:eq("+i+")").removeClass(W)}).on("click","tr",function(){m.call(this,"row")}).on("dblclick","tr",function(){m.call(this,"rowDouble")});var m=function(e){var i=t(this);layui.event.call(this,u,e+"("+p+")",v.call(i.children("td")[0]))};a.layBody.on("change","."+N,function(){var e=t(this),i=this.value,l=e.parent().data("field"),n=e.parents("tr").eq(0).data("index"),o=d.cache[a.key][n];o[l]=i,layui.event.call(this,u,"edit("+p+")",v.call(this,{value:i,field:l}))}).on("blur","."+N,function(){var e,l=t(this),n=l.parent().data("field"),o=l.parents("tr").eq(0).data("index"),r=d.cache[a.key][o];a.eachCols(function(t,i){i.field==n&&i.templet&&(e=i.templet)}),l.siblings(f).html(function(a){return e?function(){return"function"==typeof e?e(r):i(t(e).html()||this.value).render(r)}():a}(this.value)),l.parent().data("content",this.value),l.remove()}),a.layBody.on("click","td",function(e){var i=t(this),a=(i.data("field"),i.data("edit")),l=i.children(f);if(!i.data("off")&&a){var n=t('<input class="layui-input '+N+'">');return n[0].value=i.data("content")||l.text(),i.find("."+N)[0]||i.append(n),n.focus(),void layui.stope(e)}}).on("mouseenter","td",function(){b.call(this)}).on("mouseleave","td",function(){b.call(this,"hide")});var g="layui-table-grid-down",b=function(e){var i=t(this),a=i.children(f);if(e)i.find(".layui-table-grid-down").remove();else if(a.prop("scrollWidth")>a.outerWidth()){if(a.find("."+g)[0])return;i.append('<div class="'+g+'"><i class="layui-icon layui-icon-down"></i></div>')}};a.layBody.on("click","."+g,function(e){var i=t(this),n=i.parent(),d=n.children(f);a.tipsIndex=l.tips(['<div class="layui-table-tips-main" style="margin-top: -'+(d.height()+16)+"px;"+function(){return"sm"===o.size?"padding: 4px 15px; font-size: 12px;":"lg"===o.size?"padding: 14px 15px;":""}()+'">',d.html(),"</div>",'<i class="layui-icon layui-table-tips-c layui-icon-close"></i>'].join(""),d[0],{tips:[3,""],time:-1,anim:-1,maxWidth:r.ios||r.android?300:a.elem.width()/2,isOutAnim:!1,skin:"layui-table-tips",success:function(e,t){e.find(".layui-table-tips-c").on("click",function(){l.close(t)})}}),layui.stope(e)}),a.layBody.on("click","*[lay-event]",function(){var e=t(this),i=e.parents("tr").eq(0).data("index");layui.event.call(this,u,"tool("+p+")",v.call(this,{event:e.attr("lay-event")})),a.setThisRowChecked(i)}),a.layMain.on("scroll",function(){var e=t(this),i=e.scrollLeft(),n=e.scrollTop();a.layHeader.scrollLeft(i),a.layTotal.scrollLeft(i),a.layFixed.find(x).scrollTop(n),l.close(a.tipsIndex)}),R.on("click",function(){R.trigger("table.remove.tool.panel")}),R.on("table.remove.tool.panel",function(){t(".layui-table-tool-panel").remove()}),H.on("resize",function(){a.resize()})},d.init=function(e,i){i=i||{};var a=this,l=t(e?'table[lay-filter="'+e+'"]':h+"[lay-data]"),n="Table element property lay-data configuration item has a syntax error: ";return l.each(function(){var a=t(this),l=a.attr("lay-data");try{l=new Function("return "+l)()}catch(r){o.error(n+l)}var c=[],s=t.extend({elem:this,cols:[],data:[],skin:a.attr("lay-skin"),size:a.attr("lay-size"),even:"string"==typeof a.attr("lay-even")},d.config,i,l);e&&a.hide(),a.find("thead>tr").each(function(e){s.cols[e]=[],t(this).children().each(function(i){var a=t(this),l=a.attr("lay-data");try{l=new Function("return "+l)()}catch(r){return o.error(n+l)}var d=t.extend({title:a.text(),colspan:a.attr("colspan")||0,rowspan:a.attr("rowspan")||0},l);d.colspan<2&&c.push(d),s.cols[e].push(d)})}),a.find("tbody>tr").each(function(e){var i=t(this),a={};i.children("td").each(function(e,i){var l=t(this),n=l.data("field");if(n)return a[n]=l.html()}),layui.each(c,function(e,t){var l=i.children("td").eq(e);a[t.field]=l.html()}),s.data[e]=a}),d.render(s)}),a},c.that={},c.config={},d.eachCols=function(e,i,a){var l=c.config[e]||{},n=[],o=0;a=t.extend(!0,[],a||l.cols),layui.each(a,function(e,t){layui.each(t,function(t,i){if(i.colGroup){var l=0;o++,i.CHILD_COLS=[],layui.each(a[e+1],function(e,t){t.PARENT_COL_INDEX||l>1&&l==i.colspan||(t.PARENT_COL_INDEX=o,i.CHILD_COLS.push(t),l+=parseInt(t.colspan>1?t.colspan:1))})}i.PARENT_COL_INDEX||n.push(i)})});var r=function(e){layui.each(e||n,function(e,t){return t.CHILD_COLS?r(t.CHILD_COLS):void("function"==typeof i&&i(e,t))})};r()},d.checkStatus=function(e){var t=0,i=0,a=[],l=d.cache[e]||[];return layui.each(l,function(e,l){return l.constructor===Array?void i++:void(l[d.config.checkName]&&(t++,a.push(d.clearCacheKey(l))))}),{data:a,isAll:!!l.length&&t===l.length-i}},d.exportFile=function(e,t,i){t=t||d.clearCacheKey(d.cache[e]),i=i||"csv";var a=c.config[e]||{},l={csv:"text/csv",xls:"application/vnd.ms-excel"}[i],n=document.createElement("a");return r.ie?o.error("IE_NOT_SUPPORT_EXPORTS"):(n.href="data:"+l+";charset=utf-8,\ufeff"+encodeURIComponent(function(){var i=[],a=[];return layui.each(t,function(t,l){var n=[];"object"==typeof e?(layui.each(e,function(e,a){0==t&&i.push(a||"")}),layui.each(d.clearCacheKey(l),function(e,t){n.push(t)})):d.eachCols(e,function(e,a){a.field&&"normal"==a.type&&!a.hide&&(0==t&&i.push(a.title||""),n.push(l[a.field]))}),a.push(n.join(","))}),i.join(",")+"\r\n"+a.join("\r\n")}()),n.download=(a.title||"table_"+(a.index||""))+"."+i,document.body.appendChild(n),n.click(),void document.body.removeChild(n))},d.resize=function(e){if(e){var t=s(e);if(!t)return;c.that[e].resize()}else layui.each(c.that,function(){this.resize()})},d.reload=function(e,i){i=i||{};var a=s(e);if(a)return i.data&&i.data.constructor===Array&&delete a.data,d.render(t.extend(!0,{},a,i))},d.render=function(e){var t=new F(e);return c.call(t)},d.clearCacheKey=function(e){return e=t.extend({},e),delete e[d.config.checkName],delete e[d.config.indexName],e},d.init(),e(u,d)});
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/lay/modules/tree.js b/pluss-wap-page/src/main/resources/static/resources/js/lay/modules/tree.js
new file mode 100644
index 0000000..e8c053d
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/lay/modules/tree.js
@@ -0,0 +1,2 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ ;layui.define("jquery",function(e){"use strict";var o=layui.$,a=layui.hint(),i="layui-tree-enter",r=function(e){this.options=e},t={arrow:["&#xe623;","&#xe625;"],checkbox:["&#xe626;","&#xe627;"],radio:["&#xe62b;","&#xe62a;"],branch:["&#xe622;","&#xe624;"],leaf:"&#xe621;"};r.prototype.init=function(e){var o=this;e.addClass("layui-box layui-tree"),o.options.skin&&e.addClass("layui-tree-skin-"+o.options.skin),o.tree(e),o.on(e)},r.prototype.tree=function(e,a){var i=this,r=i.options,n=a||r.nodes;layui.each(n,function(a,n){var l=n.children&&n.children.length>0,c=o('<ul class="'+(n.spread?"layui-show":"")+'"></ul>'),s=o(["<li "+(n.spread?'data-spread="'+n.spread+'"':"")+">",function(){return l?'<i class="layui-icon layui-tree-spread">'+(n.spread?t.arrow[1]:t.arrow[0])+"</i>":""}(),function(){return r.check?'<i class="layui-icon layui-tree-check">'+("checkbox"===r.check?t.checkbox[0]:"radio"===r.check?t.radio[0]:"")+"</i>":""}(),function(){return'<a href="'+(n.href||"javascript:;")+'" '+(r.target&&n.href?'target="'+r.target+'"':"")+">"+('<i class="layui-icon layui-tree-'+(l?"branch":"leaf")+'">'+(l?n.spread?t.branch[1]:t.branch[0]:t.leaf)+"</i>")+("<cite>"+(n.name||"未命名")+"</cite></a>")}(),"</li>"].join(""));l&&(s.append(c),i.tree(c,n.children)),e.append(s),"function"==typeof r.click&&i.click(s,n),i.spread(s,n),r.drag&&i.drag(s,n)})},r.prototype.click=function(e,o){var a=this,i=a.options;e.children("a").on("click",function(e){layui.stope(e),i.click(o)})},r.prototype.spread=function(e,o){var a=this,i=(a.options,e.children(".layui-tree-spread")),r=e.children("ul"),n=e.children("a"),l=function(){e.data("spread")?(e.data("spread",null),r.removeClass("layui-show"),i.html(t.arrow[0]),n.find(".layui-icon").html(t.branch[0])):(e.data("spread",!0),r.addClass("layui-show"),i.html(t.arrow[1]),n.find(".layui-icon").html(t.branch[1]))};r[0]&&(i.on("click",l),n.on("dblclick",l))},r.prototype.on=function(e){var a=this,r=a.options,t="layui-tree-drag";e.find("i").on("selectstart",function(e){return!1}),r.drag&&o(document).on("mousemove",function(e){var i=a.move;if(i.from){var r=(i.to,o('<div class="layui-box '+t+'"></div>'));e.preventDefault(),o("."+t)[0]||o("body").append(r);var n=o("."+t)[0]?o("."+t):r;n.addClass("layui-show").html(i.from.elem.children("a").html()),n.css({left:e.pageX+10,top:e.pageY+10})}}).on("mouseup",function(){var e=a.move;e.from&&(e.from.elem.children("a").removeClass(i),e.to&&e.to.elem.children("a").removeClass(i),a.move={},o("."+t).remove())})},r.prototype.move={},r.prototype.drag=function(e,a){var r=this,t=(r.options,e.children("a")),n=function(){var t=o(this),n=r.move;n.from&&(n.to={item:a,elem:e},t.addClass(i))};t.on("mousedown",function(){var o=r.move;o.from={item:a,elem:e}}),t.on("mouseenter",n).on("mousemove",n).on("mouseleave",function(){var e=o(this),a=r.move;a.from&&(delete a.to,e.removeClass(i))})},e("tree",function(e){var i=new r(e=e||{}),t=o(e.elem);return t[0]?void i.init(t):a.error("layui.tree 没有找到"+e.elem+"元素")})});
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/lay/modules/upload.js b/pluss-wap-page/src/main/resources/static/resources/js/lay/modules/upload.js
new file mode 100644
index 0000000..404d534
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/lay/modules/upload.js
@@ -0,0 +1,2 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ ;layui.define("layer",function(e){"use strict";var i=layui.$,t=layui.layer,n=layui.hint(),a=layui.device(),o={config:{},set:function(e){var t=this;return t.config=i.extend({},t.config,e),t},on:function(e,i){return layui.onevent.call(this,r,e,i)}},l=function(){var e=this;return{upload:function(i){e.upload.call(e,i)},config:e.config}},r="upload",u="layui-upload-file",c="layui-upload-form",f="layui-upload-iframe",s="layui-upload-choose",p=function(e){var t=this;t.config=i.extend({},t.config,o.config,e),t.render()};p.prototype.config={accept:"images",exts:"",auto:!0,bindAction:"",url:"",field:"file",method:"post",data:{},drag:!0,size:0,number:0,multiple:!1},p.prototype.render=function(e){var t=this,e=t.config;e.elem=i(e.elem),e.bindAction=i(e.bindAction),t.file(),t.events()},p.prototype.file=function(){var e=this,t=e.config,n=e.elemFile=i(['<input class="'+u+'" type="file" accept="'+t.acceptMime+'" name="'+t.field+'"',t.multiple?" multiple":"",">"].join("")),o=t.elem.next();(o.hasClass(u)||o.hasClass(c))&&o.remove(),a.ie&&a.ie<10&&t.elem.wrap('<div class="layui-upload-wrap"></div>'),e.isFile()?(e.elemFile=t.elem,t.field=t.elem[0].name):t.elem.after(n),a.ie&&a.ie<10&&e.initIE()},p.prototype.initIE=function(){var e=this,t=e.config,n=i('<iframe id="'+f+'" class="'+f+'" name="'+f+'" frameborder="0"></iframe>'),a=i(['<form target="'+f+'" class="'+c+'" method="post" key="set-mine" enctype="multipart/form-data" action="'+t.url+'">',"</form>"].join(""));i("#"+f)[0]||i("body").append(n),t.elem.next().hasClass(c)||(e.elemFile.wrap(a),t.elem.next("."+c).append(function(){var e=[];return layui.each(t.data,function(i,t){t="function"==typeof t?t():t,e.push('<input type="hidden" name="'+i+'" value="'+t+'">')}),e.join("")}()))},p.prototype.msg=function(e){return t.msg(e,{icon:2,shift:6})},p.prototype.isFile=function(){var e=this.config.elem[0];if(e)return"input"===e.tagName.toLocaleLowerCase()&&"file"===e.type},p.prototype.preview=function(e){var i=this;window.FileReader&&layui.each(i.chooseFiles,function(i,t){var n=new FileReader;n.readAsDataURL(t),n.onload=function(){e&&e(i,t,this.result)}})},p.prototype.upload=function(e,t){var n,o=this,l=o.config,r=o.elemFile[0],u=function(){var t=0,n=0,a=e||o.files||o.chooseFiles||r.files,u=function(){l.multiple&&t+n===o.fileLength&&"function"==typeof l.allDone&&l.allDone({total:o.fileLength,successful:t,aborted:n})};layui.each(a,function(e,a){var r=new FormData;r.append(l.field,a),layui.each(l.data,function(e,i){i="function"==typeof i?i():i,r.append(e,i)}),i.ajax({url:l.url,type:"post",data:r,contentType:!1,processData:!1,dataType:"json",headers:l.headers||{},success:function(i){t++,d(e,i),u()},error:function(){n++,o.msg("请求上传接口出现异常"),m(e),u()}})})},c=function(){var e=i("#"+f);o.elemFile.parent().submit(),clearInterval(p.timer),p.timer=setInterval(function(){var i,t=e.contents().find("body");try{i=t.text()}catch(n){o.msg("获取上传后的响应信息出现异常"),clearInterval(p.timer),m()}i&&(clearInterval(p.timer),t.html(""),d(0,i))},30)},d=function(e,i){if(o.elemFile.next("."+s).remove(),r.value="","object"!=typeof i)try{i=JSON.parse(i)}catch(t){return i={},o.msg("请对上传接口返回有效JSON")}"function"==typeof l.done&&l.done(i,e||0,function(e){o.upload(e)})},m=function(e){l.auto&&(r.value=""),"function"==typeof l.error&&l.error(e||0,function(e){o.upload(e)})},h=l.exts,v=function(){var i=[];return layui.each(e||o.chooseFiles,function(e,t){i.push(t.name)}),i}(),g={preview:function(e){o.preview(e)},upload:function(e,i){var t={};t[e]=i,o.upload(t)},pushFile:function(){return o.files=o.files||{},layui.each(o.chooseFiles,function(e,i){o.files[e]=i}),o.files},resetFile:function(e,i,t){var n=new File([i],t);o.files=o.files||{},o.files[e]=n}},y=function(){if("choose"!==t&&!l.auto||(l.choose&&l.choose(g),"choose"!==t))return l.before&&l.before(g),a.ie?a.ie>9?u():c():void u()};if(v=0===v.length?r.value.match(/[^\/\\]+\..+/g)||[]||"":v,0!==v.length){switch(l.accept){case"file":if(h&&!RegExp("\\w\\.("+h+")$","i").test(escape(v)))return o.msg("选择的文件中包含不支持的格式"),r.value="";break;case"video":if(!RegExp("\\w\\.("+(h||"avi|mp4|wma|rmvb|rm|flash|3gp|flv")+")$","i").test(escape(v)))return o.msg("选择的视频中包含不支持的格式"),r.value="";break;case"audio":if(!RegExp("\\w\\.("+(h||"mp3|wav|mid")+")$","i").test(escape(v)))return o.msg("选择的音频中包含不支持的格式"),r.value="";break;default:if(layui.each(v,function(e,i){RegExp("\\w\\.("+(h||"jpg|png|gif|bmp|jpeg$")+")","i").test(escape(i))||(n=!0)}),n)return o.msg("选择的图片中包含不支持的格式"),r.value=""}if(o.fileLength=function(){var i=0,t=e||o.files||o.chooseFiles||r.files;return layui.each(t,function(){i++}),i}(),l.number&&o.fileLength>l.number)return o.msg("同时最多只能上传的数量为："+l.number);if(l.size>0&&!(a.ie&&a.ie<10)){var F;if(layui.each(o.chooseFiles,function(e,i){if(i.size>1024*l.size){var t=l.size/1024;t=t>=1?t.toFixed(2)+"MB":l.size+"KB",r.value="",F=t}}),F)return o.msg("文件不能超过"+F)}y()}},p.prototype.events=function(){var e=this,t=e.config,o=function(i){e.chooseFiles={},layui.each(i,function(i,t){var n=(new Date).getTime();e.chooseFiles[n+"-"+i]=t})},l=function(i,n){var a=e.elemFile,o=i.length>1?i.length+"个文件":(i[0]||{}).name||a[0].value.match(/[^\/\\]+\..+/g)||[]||"";a.next().hasClass(s)&&a.next().remove(),e.upload(null,"choose"),e.isFile()||t.choose||a.after('<span class="layui-inline '+s+'">'+o+"</span>")};t.elem.off("upload.start").on("upload.start",function(){var a=i(this),o=a.attr("lay-data");if(o)try{o=new Function("return "+o)(),e.config=i.extend({},t,o)}catch(l){n.error("Upload element property lay-data configuration item has a syntax error: "+o)}e.config.item=a,e.elemFile[0].click()}),a.ie&&a.ie<10||t.elem.off("upload.over").on("upload.over",function(){var e=i(this);e.attr("lay-over","")}).off("upload.leave").on("upload.leave",function(){var e=i(this);e.removeAttr("lay-over")}).off("upload.drop").on("upload.drop",function(n,a){var r=i(this),u=a.originalEvent.dataTransfer.files||[];r.removeAttr("lay-over"),o(u),t.auto?e.upload(u):l(u)}),e.elemFile.off("upload.change").on("upload.change",function(){var i=this.files||[];o(i),t.auto?e.upload():l(i)}),t.bindAction.off("upload.action").on("upload.action",function(){e.upload()}),t.elem.data("haveEvents")||(e.elemFile.on("change",function(){i(this).trigger("upload.change")}),t.elem.on("click",function(){e.isFile()||i(this).trigger("upload.start")}),t.drag&&t.elem.on("dragover",function(e){e.preventDefault(),i(this).trigger("upload.over")}).on("dragleave",function(e){i(this).trigger("upload.leave")}).on("drop",function(e){e.preventDefault(),i(this).trigger("upload.drop",e)}),t.bindAction.on("click",function(){i(this).trigger("upload.action")}),t.elem.data("haveEvents",!0))},o.render=function(e){var i=new p(e);return l.call(i)},e(r,o)});
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/lay/modules/util.js b/pluss-wap-page/src/main/resources/static/resources/js/lay/modules/util.js
new file mode 100644
index 0000000..8d38508
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/lay/modules/util.js
@@ -0,0 +1,2 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ ;layui.define("jquery",function(t){"use strict";var e=layui.$,i={fixbar:function(t){var i,a,n="layui-fixbar",r="layui-fixbar-top",o=e(document),l=e("body");t=e.extend({showHeight:200},t),t.bar1=t.bar1===!0?"&#xe606;":t.bar1,t.bar2=t.bar2===!0?"&#xe607;":t.bar2,t.bgcolor=t.bgcolor?"background-color:"+t.bgcolor:"";var c=[t.bar1,t.bar2,"&#xe604;"],g=e(['<ul class="'+n+'">',t.bar1?'<li class="layui-icon" lay-type="bar1" style="'+t.bgcolor+'">'+c[0]+"</li>":"",t.bar2?'<li class="layui-icon" lay-type="bar2" style="'+t.bgcolor+'">'+c[1]+"</li>":"",'<li class="layui-icon '+r+'" lay-type="top" style="'+t.bgcolor+'">'+c[2]+"</li>","</ul>"].join("")),s=g.find("."+r),u=function(){var e=o.scrollTop();e>=t.showHeight?i||(s.show(),i=1):i&&(s.hide(),i=0)};e("."+n)[0]||("object"==typeof t.css&&g.css(t.css),l.append(g),u(),g.find("li").on("click",function(){var i=e(this),a=i.attr("lay-type");"top"===a&&e("html,body").animate({scrollTop:0},200),t.click&&t.click.call(this,a)}),o.on("scroll",function(){clearTimeout(a),a=setTimeout(function(){u()},100)}))},countdown:function(t,e,i){var a=this,n="function"==typeof e,r=new Date(t).getTime(),o=new Date(!e||n?(new Date).getTime():e).getTime(),l=r-o,c=[Math.floor(l/864e5),Math.floor(l/36e5)%24,Math.floor(l/6e4)%60,Math.floor(l/1e3)%60];n&&(i=e);var g=setTimeout(function(){a.countdown(t,o+1e3,i)},1e3);return i&&i(l>0?c:[0,0,0,0],e,g),l<=0&&clearTimeout(g),g},timeAgo:function(t,e){var i=this,a=[[],[]],n=(new Date).getTime()-new Date(t).getTime();return n>6912e5?(n=new Date(t),a[0][0]=i.digit(n.getFullYear(),4),a[0][1]=i.digit(n.getMonth()+1),a[0][2]=i.digit(n.getDate()),e||(a[1][0]=i.digit(n.getHours()),a[1][1]=i.digit(n.getMinutes()),a[1][2]=i.digit(n.getSeconds())),a[0].join("-")+" "+a[1].join(":")):n>=864e5?(n/1e3/60/60/24|0)+"天前":n>=36e5?(n/1e3/60/60|0)+"小时前":n>=12e4?(n/1e3/60|0)+"分钟前":n<0?"未来":"刚刚"},digit:function(t,e){var i="";t=String(t),e=e||2;for(var a=t.length;a<e;a++)i+="0";return t<Math.pow(10,e)?i+(0|t):t},toDateString:function(t,e){var i=this,a=new Date(t||new Date),n=[i.digit(a.getFullYear(),4),i.digit(a.getMonth()+1),i.digit(a.getDate())],r=[i.digit(a.getHours()),i.digit(a.getMinutes()),i.digit(a.getSeconds())];return e=e||"yyyy-MM-dd HH:mm:ss",e.replace(/yyyy/g,n[0]).replace(/MM/g,n[1]).replace(/dd/g,n[2]).replace(/HH/g,r[0]).replace(/mm/g,r[1]).replace(/ss/g,r[2])},escape:function(t){return String(t||"").replace(/&(?!#?[a-zA-Z0-9]+;)/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/'/g,"&#39;").replace(/"/g,"&quot;")}};!function(t,e,i){"$:nomunge";function a(){n=e[l](function(){r.each(function(){var e=t(this),i=e.width(),a=e.height(),n=t.data(this,g);(i!==n.w||a!==n.h)&&e.trigger(c,[n.w=i,n.h=a])}),a()},o[s])}var n,r=t([]),o=t.resize=t.extend(t.resize,{}),l="setTimeout",c="resize",g=c+"-special-event",s="delay",u="throttleWindow";o[s]=250,o[u]=!0,t.event.special[c]={setup:function(){if(!o[u]&&this[l])return!1;var e=t(this);r=r.add(e),t.data(this,g,{w:e.width(),h:e.height()}),1===r.length&&a()},teardown:function(){if(!o[u]&&this[l])return!1;var e=t(this);r=r.not(e),e.removeData(g),r.length||clearTimeout(n)},add:function(e){function a(e,a,r){var o=t(this),l=t.data(this,g)||{};l.w=a!==i?a:o.width(),l.h=r!==i?r:o.height(),n.apply(this,arguments)}if(!o[u]&&this[l])return!1;var n;return t.isFunction(e)?(n=e,a):(n=e.handler,void(e.handler=a))}}}(e,window),t("util",i)});
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/layui.js b/pluss-wap-page/src/main/resources/static/resources/js/layui.js
new file mode 100644
index 0000000..5c611e2
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/layui.js
@@ -0,0 +1,230 @@
+/** layui-v2.4.5 MIT License By https://www.layui.com */ ;
+! function(e) {
+	"use strict";
+	var t = document,
+		o = {
+			modules: {},
+			status: {},
+			timeout: 10,
+			event: {}
+		},
+		n = function() {
+			this.v = "2.4.5"
+		},
+		r = function() {
+			var e = t.currentScript ? t.currentScript.src : function() {
+				for(var e, o = t.scripts, n = o.length - 1, r = n; r > 0; r--)
+					if("interactive" === o[r].readyState) {
+						e = o[r].src;
+						break
+					}
+				return e || o[n].src
+			}();
+			return e.substring(0, e.lastIndexOf("/") + 1)
+		}(),
+		i = function(t) {
+			e.console && console.error && console.error("Layui hint: " + t)
+		},
+		a = "undefined" != typeof opera && "[object Opera]" === opera.toString(),
+		u = {
+			layer: "modules/layer",
+			laydate: "modules/laydate",
+			laypage: "modules/laypage",
+			laytpl: "modules/laytpl",
+			layim: "modules/layim",
+			layedit: "modules/layedit",
+			form: "modules/form",
+			upload: "modules/upload",
+			tree: "modules/tree",
+			table: "modules/table",
+			element: "modules/element",
+			rate: "modules/rate",
+			colorpicker: "modules/colorpicker",
+			slider: "modules/slider",
+			carousel: "modules/carousel",
+			flow: "modules/flow",
+			util: "modules/util",
+			code: "modules/code",
+			jquery: "modules/jquery",
+			mobile: "modules/mobile",
+			"layui.all": "../layui.all"
+		};
+	n.prototype.cache = o, n.prototype.define = function(e, t) {
+		var n = this,
+			r = "function" == typeof e,
+			i = function() {
+				var e = function(e, t) {
+					layui[e] = t, o.status[e] = !0
+				};
+				return "function" == typeof t && t(function(n, r) {
+					e(n, r), o.callback[n] = function() {
+						t(e)
+					}
+				}), this
+			};
+		return r && (t = e, e = []), layui["layui.all"] || !layui["layui.all"] && layui["layui.mobile"] ? i.call(n) : (n.use(e, i), n)
+	}, n.prototype.use = function(e, n, l) {
+		function s(e, t) {
+			var n = "PLaySTATION 3" === navigator.platform ? /^complete$/ : /^(complete|loaded)$/;
+			("load" === e.type || n.test((e.currentTarget || e.srcElement).readyState)) && (o.modules[f] = t, d.removeChild(v), function r() {
+				return ++m > 1e3 * o.timeout / 4 ? i(f + " is not a valid module") : void(o.status[f] ? c() : setTimeout(r, 4))
+			}())
+		}
+
+		function c() {
+			l.push(layui[f]), e.length > 1 ? y.use(e.slice(1), n, l) : "function" == typeof n && n.apply(layui, l)
+		}
+		var y = this,
+			p = o.dir = o.dir ? o.dir : r,
+			d = t.getElementsByTagName("head")[0];
+		e = "string" == typeof e ? [e] : e, window.jQuery && jQuery.fn.on && (y.each(e, function(t, o) {
+			"jquery" === o && e.splice(t, 1)
+		}), layui.jquery = layui.$ = jQuery);
+		var f = e[0],
+			m = 0;
+		if(l = l || [], o.host = o.host || (p.match(/\/\/([\s\S]+?)\//) || ["//" + location.host + "/"])[0], 0 === e.length || layui["layui.all"] && u[f] || !layui["layui.all"] && layui["layui.mobile"] && u[f]) return c(), y;
+		if(o.modules[f]) ! function g() {
+			return ++m > 1e3 * o.timeout / 4 ? i(f + " is not a valid module") : void("string" == typeof o.modules[f] && o.status[f] ? c() : setTimeout(g, 4))
+		}();
+		else {
+			var v = t.createElement("script"),
+				h = (u[f] ? p + "lay/" : /^\{\/\}/.test(y.modules[f]) ? "" : o.base || "") + (y.modules[f] || f) + ".js";
+			h = h.replace(/^\{\/\}/, ""), v.async = !0, v.charset = "utf-8", v.src = h + function() {
+				var e = o.version === !0 ? o.v || (new Date).getTime() : o.version || "";
+				return e ? "?v=" + e : ""
+			}(), d.appendChild(v), !v.attachEvent || v.attachEvent.toString && v.attachEvent.toString().indexOf("[native code") < 0 || a ? v.addEventListener("load", function(e) {
+				s(e, h)
+			}, !1) : v.attachEvent("onreadystatechange", function(e) {
+				s(e, h)
+			}), o.modules[f] = h
+		}
+		return y
+	}, n.prototype.getStyle = function(t, o) {
+		var n = t.currentStyle ? t.currentStyle : e.getComputedStyle(t, null);
+		return n[n.getPropertyValue ? "getPropertyValue" : "getAttribute"](o)
+	}, n.prototype.link = function(e, n, r) {
+		var a = this,
+			u = t.createElement("link"),
+			l = t.getElementsByTagName("head")[0];
+		"string" == typeof n && (r = n);
+		var s = (r || e).replace(/\.|\//g, ""),
+			c = u.id = "layuicss-" + s,
+			y = 0;
+		return u.rel = "stylesheet", u.href = e + (o.debug ? "?v=" + (new Date).getTime() : ""), u.media = "all", t.getElementById(c) || l.appendChild(u), "function" != typeof n ? a : (function p() {
+			return ++y > 1e3 * o.timeout / 100 ? i(e + " timeout") : void(1989 === parseInt(a.getStyle(t.getElementById(c), "width")) ? function() {
+				n()
+			}() : setTimeout(p, 100))
+		}(), a)
+	}, o.callback = {}, n.prototype.factory = function(e) {
+		if(layui[e]) return "function" == typeof o.callback[e] ? o.callback[e] : null
+	}, n.prototype.addcss = function(e, t, n) {
+		return layui.link(resourcePath+"/css/" + e, t, n)
+	}, n.prototype.img = function(e, t, o) {
+		var n = new Image;
+		return n.src = e, n.complete ? t(n) : (n.onload = function() {
+			n.onload = null, "function" == typeof t && t(n)
+		}, void(n.onerror = function(e) {
+			n.onerror = null, "function" == typeof o && o(e)
+		}))
+	}, n.prototype.config = function(e) {
+		e = e || {};
+		for(var t in e) o[t] = e[t];
+		return this
+	}, n.prototype.modules = function() {
+		var e = {};
+		for(var t in u) e[t] = u[t];
+		return e
+	}(), n.prototype.extend = function(e) {
+		var t = this;
+		e = e || {};
+		for(var o in e) t[o] || t.modules[o] ? i("模块名 " + o + " 已被占用") : t.modules[o] = e[o];
+		return t
+	}, n.prototype.router = function(e) {
+		var t = this,
+			e = e || location.hash,
+			o = {
+				path: [],
+				search: {},
+				hash: (e.match(/[^#](#.*$)/) || [])[1] || ""
+			};
+		return /^#\//.test(e) ? (e = e.replace(/^#\//, ""), o.href = "/" + e, e = e.replace(/([^#])(#.*$)/, "$1").split("/") || [], t.each(e, function(e, t) {
+			/^\w+=/.test(t) ? function() {
+				t = t.split("="), o.search[t[0]] = t[1]
+			}() : o.path.push(t)
+		}), o) : o
+	}, n.prototype.data = function(t, o, n) {
+		if(t = t || "layui", n = n || localStorage, e.JSON && e.JSON.parse) {
+			if(null === o) return delete n[t];
+			o = "object" == typeof o ? o : {
+				key: o
+			};
+			try {
+				var r = JSON.parse(n[t])
+			} catch(i) {
+				var r = {}
+			}
+			return "value" in o && (r[o.key] = o.value), o.remove && delete r[o.key], n[t] = JSON.stringify(r), o.key ? r[o.key] : r
+		}
+	}, n.prototype.sessionData = function(e, t) {
+		return this.data(e, t, sessionStorage)
+	}, n.prototype.device = function(t) {
+		var o = navigator.userAgent.toLowerCase(),
+			n = function(e) {
+				var t = new RegExp(e + "/([^\\s\\_\\-]+)");
+				return e = (o.match(t) || [])[1], e || !1
+			},
+			r = {
+				os: function() {
+					return /windows/.test(o) ? "windows" : /linux/.test(o) ? "linux" : /iphone|ipod|ipad|ios/.test(o) ? "ios" : /mac/.test(o) ? "mac" : void 0
+				}(),
+				ie: function() {
+					return !!(e.ActiveXObject || "ActiveXObject" in e) && ((o.match(/msie\s(\d+)/) || [])[1] || "11")
+				}(),
+				weixin: n("micromessenger")
+			};
+		return t && !r[t] && (r[t] = n(t)), r.android = /android/.test(o), r.ios = "ios" === r.os, r
+	}, n.prototype.hint = function() {
+		return {
+			error: i
+		}
+	}, n.prototype.each = function(e, t) {
+		var o, n = this;
+		if("function" != typeof t) return n;
+		if(e = e || [], e.constructor === Object) {
+			for(o in e)
+				if(t.call(e[o], o, e[o])) break
+		} else
+			for(o = 0; o < e.length && !t.call(e[o], o, e[o]); o++);
+		return n
+	}, n.prototype.sort = function(e, t, o) {
+		var n = JSON.parse(JSON.stringify(e || []));
+		return t ? (n.sort(function(e, o) {
+			var n = /^-?\d+$/,
+				r = e[t],
+				i = o[t];
+			return n.test(r) && (r = parseFloat(r)), n.test(i) && (i = parseFloat(i)), r && !i ? 1 : !r && i ? -1 : r > i ? 1 : r < i ? -1 : 0
+		}), o && n.reverse(), n) : n
+	}, n.prototype.stope = function(t) {
+		t = t || e.event;
+		try {
+			t.stopPropagation()
+		} catch(o) {
+			t.cancelBubble = !0
+		}
+	}, n.prototype.onevent = function(e, t, o) {
+		return "string" != typeof e || "function" != typeof o ? this : n.event(e, t, null, o)
+	}, n.prototype.event = n.event = function(e, t, n, r) {
+		var i = this,
+			a = null,
+			u = t.match(/\((.*)\)$/) || [],
+			l = (e + "." + t).replace(u[0], ""),
+			s = u[1] || "",
+			c = function(e, t) {
+				var o = t && t.call(i, n);
+				o === !1 && null === a && (a = !1)
+			};
+		return r ? (o.event[l] = o.event[l] || {}, o.event[l][s] = [r], this) : (layui.each(o.event[l], function(e, t) {
+			return "{*}" === s ? void layui.each(t, c) : ("" === e && layui.each(t, c), void(s && e === s && layui.each(t, c)))
+		}), a)
+	}, e.layui = new n
+}(window);
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/map.js b/pluss-wap-page/src/main/resources/static/resources/js/map.js
new file mode 100644
index 0000000..f8826aa
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/map.js
@@ -0,0 +1,114 @@
+
+    //创建和初始化地图函数：
+    function initMap(){
+        createMap();//创建地图
+        setMapEvent();//设置地图事件
+        addMapControl();//向地图添加控件
+        addMarker();//向地图中添加marker
+        addPolyline();//向地图中添加线
+    }
+    
+    //创建地图函数：
+    function createMap(){
+        var map = new BMap.Map("dituContent");//在百度地图容器中创建一个地图
+        var point = new BMap.Point(112.863407,28.248991);//定义一个中心点坐标
+        map.centerAndZoom(point,18);//设定地图的中心点和坐标并将地图显示在地图容器中
+        window.map = map;//将map变量存储在全局
+    }
+    
+    //地图事件设置函数：
+    function setMapEvent(){
+        map.enableDragging();//启用地图拖拽事件，默认启用(可不写)
+        map.enableScrollWheelZoom();//启用地图滚轮放大缩小
+        map.enableDoubleClickZoom();//启用鼠标双击放大，默认启用(可不写)
+        map.enableKeyboard();//启用键盘上下左右键移动地图
+    }
+    
+    //地图控件添加函数：
+    function addMapControl(){
+        //向地图中添加缩放控件
+	var ctrl_nav = new BMap.NavigationControl({anchor:BMAP_ANCHOR_TOP_LEFT,type:BMAP_NAVIGATION_CONTROL_ZOOM});
+	map.addControl(ctrl_nav);
+        //向地图中添加缩略图控件
+	var ctrl_ove = new BMap.OverviewMapControl({anchor:BMAP_ANCHOR_BOTTOM_RIGHT,isOpen:0});
+	map.addControl(ctrl_ove);
+        //向地图中添加比例尺控件
+	var ctrl_sca = new BMap.ScaleControl({anchor:BMAP_ANCHOR_BOTTOM_RIGHT});
+	map.addControl(ctrl_sca);
+    }
+    
+    //标注点数组
+    var markerArr = [{title:"青山路6号金鹰文化创意园",content:"湖南智来教育科技有限公司",point:"112.863407|28.248991",isOpen:0,icon:{w:23,h:25,l:69,t:21,x:9,lb:12}}
+		 ];
+    //创建marker
+    function addMarker(){
+        for(var i=0;i<markerArr.length;i++){
+            var json = markerArr[i];
+            var p0 = json.point.split("|")[0];
+            var p1 = json.point.split("|")[1];
+            var point = new BMap.Point(p0,p1);
+			var iconImg = createIcon(json.icon);
+            var marker = new BMap.Marker(point,{icon:iconImg});
+			var iw = createInfoWindow(i);
+			var label = new BMap.Label(json.title,{"offset":new BMap.Size(json.icon.lb-json.icon.x+10,-20)});
+			marker.setLabel(label);
+            map.addOverlay(marker);
+            label.setStyle({
+                        borderColor:"#808080",
+                        color:"#333",
+                        cursor:"pointer"
+            });
+			
+			(function(){
+				var index = i;
+				var _iw = createInfoWindow(i);
+				var _marker = marker;
+				_marker.addEventListener("click",function(){
+				    this.openInfoWindow(_iw);
+			    });
+			    _iw.addEventListener("open",function(){
+				    _marker.getLabel().hide();
+			    })
+			    _iw.addEventListener("close",function(){
+				    _marker.getLabel().show();
+			    })
+				label.addEventListener("click",function(){
+				    _marker.openInfoWindow(_iw);
+			    })
+				if(!!json.isOpen){
+					label.hide();
+					_marker.openInfoWindow(_iw);
+				}
+			})()
+        }
+    }
+    //创建InfoWindow
+    function createInfoWindow(i){
+        var json = markerArr[i];
+        var iw = new BMap.InfoWindow("<b class='iw_poi_title' title='" + json.title + "'>" + json.title + "</b><div class='iw_poi_content'>"+json.content+"</div>");
+        return iw;
+    }
+    //创建一个Icon
+    function createIcon(json){
+        var icon = new BMap.Icon("http://map.baidu.com/image/us_mk_icon.png", new BMap.Size(json.w,json.h),{imageOffset: new BMap.Size(-json.l,-json.t),infoWindowOffset:new BMap.Size(json.lb+5,1),offset:new BMap.Size(json.x,json.h)})
+        return icon;
+    }
+//标注线数组
+    var plPoints = [{style:"solid",weight:3,color:"#f00",opacity:0.4,points:["117.308003|31.703753","117.307581|31.703515"]}
+		 ];
+    //向地图中添加线函数
+    function addPolyline(){
+		for(var i=0;i<plPoints.length;i++){
+			var json = plPoints[i];
+			var points = [];
+			for(var j=0;j<json.points.length;j++){
+				var p1 = json.points[j].split("|")[0];
+				var p2 = json.points[j].split("|")[1];
+				points.push(new BMap.Point(p1,p2));
+			}
+			var line = new BMap.Polyline(points,{strokeStyle:json.style,strokeWeight:json.weight,strokeColor:json.color,strokeOpacity:json.opacity});
+			map.addOverlay(line);
+		}
+	}
+    
+    initMap();//创建和初始化地图
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/merchant/merchant.js b/pluss-wap-page/src/main/resources/static/resources/js/merchant/merchant.js
new file mode 100644
index 0000000..5cf5d3d
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/merchant/merchant.js
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/mescroll.js b/pluss-wap-page/src/main/resources/static/resources/js/mescroll.js
new file mode 100644
index 0000000..99c84fc
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/mescroll.js
@@ -0,0 +1,666 @@
+/*
+ * mescroll -- 精致的下拉刷新和上拉加载js框架  ( a great JS framework for pull-refresh and pull-up-loading )
+ * version 1.1.6
+ * 2017-08-27
+ * https://github.com/mescroll/mescroll.git
+ * http://www.mescroll.com
+ * author: wenju < mescroll@qq.com > 文举
+ */
+
+;(function (name, definition) {
+  // 检测上下文环境是否为AMD或CMD
+  var hasDefine = typeof define === 'function',
+  // 检查上下文环境是否为Node
+    hasExports = typeof module !== 'undefined' && module.exports;
+
+  if (hasDefine) {
+    // AMD环境或CMD环境
+    define(definition);
+  } else if (hasExports) {
+    // 定义为普通Node模块
+    module.exports = definition();
+  } else {
+    // 将模块的执行结果挂在window变量中，在浏览器中this指向window对象
+    this[name] = definition();
+  }
+})('MeScroll', function () {
+  function MeScroll(mescrollId, options) {
+    this.scrollDom = document.getElementById(mescrollId); //MeScroll的滑动区域
+    this.options = options || {}; //配置
+
+    this.isDownScrolling = false; //是否在执行下拉刷新的回调
+    this.isUpScrolling = false; //是否在执行上拉加载的回调
+
+    //初始化下拉刷新
+    this.initDownScroll();
+    //初始化上拉加载,则初始化
+    this.initUpScroll();
+
+    //自动加载
+    var me = this;
+    setTimeout(function() { //待主线程执行完毕再执行,避免new MeScroll未初始化,在回调获取不到mescroll的实例
+      if(me.optDown.auto) { //默认true 以下拉刷新的方式自动加载第一页数据
+        if(me.optDown.autoShowLoading) {
+          me.triggerDownScroll(); //显示下拉进度,执行下拉回调
+        } else {
+          me.optDown.callback && me.optDown.callback(me); //不显示下拉进度,直接执行下拉回调
+        }
+      }
+
+      me.optUp.auto && me.triggerUpScroll(); //默认false
+    }, 30); //需让me.optDown.inited和me.optUp.inited先执行
+  }
+  /*配置参数:下拉刷新*/
+  MeScroll.prototype.extendDownScroll = function(optDown) {
+    //是否为ios设备;
+    var isIOS = !!navigator.userAgent.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/); //ios终端
+    //下拉刷新的配置
+    MeScroll.extend(optDown, {
+      use: true, //是否启用下拉刷新; 默认true
+      auto: true, //是否在初始化完毕之后自动执行下拉刷新的回调; 默认true
+      autoShowLoading: false, //如果设置auto=true(在初始化完毕之后自动执行下拉刷新的回调),那么是否显示下拉刷新的进度; 默认false
+      isLock: false, //是否锁定下拉刷新,默认false;
+      isBoth: false, //下拉刷新时,如果滑动到列表底部是否可以同时触发上拉加载;默认false,两者不可同时触发;
+      offset: 80, //在列表顶部,下拉大于80px,松手即可触发下拉刷新的回调
+      outOffsetRate: 0.2, //在列表顶部,下拉的距离大于offset时,改变下拉区域高度比例;值越接近0,高度变化越小,表现为越往下越难拉
+      minAngle: 45, //触发下拉最少要偏移的角度(滑动的轨迹与水平线的锐角值),取值区间  [0,90];默认45度,即向下滑动的角度大于45度(方位角为45°~145°及225°~315°)则触发下拉;而小于45度,将不触发下拉,避免与左右滑动的轮播等组件冲突;<br/>注意:没有必要配置超出[0,90]区间的值,否则角度限制无效; 因为假设配置60, 生效的方位角就是60°到120° 和 240°到300°的范围;
+      mustToTop: !isIOS, //是否必须滑动到顶部才能下拉;因为列表回弹效果(-webkit-overflow-scrolling:touch)是iOS专属样式,所以iOS默认false,其他为true;
+      hardwareClass: "mescroll-hardware", //硬件加速样式;解决iOS下拉因隐藏进度条而闪屏的问题,参见mescroll.css
+      warpClass: "mescroll-downwarp", //下拉刷新的布局容器样式,参见mescroll.css
+      resetClass: "mescroll-downwarp-reset", //下拉刷新高度重置的动画,参见mescroll.css
+      htmlContent: '<p class="downwarp-progress"></p><p class="downwarp-tip">下拉刷新 </p>', //布局内容
+      inited: function(mescroll, downwarp) {
+        //下拉刷新初始化完毕的回调
+        mescroll.downTipDom = downwarp.getElementsByClassName("downwarp-tip")[0];
+        mescroll.downProgressDom = downwarp.getElementsByClassName("downwarp-progress")[0];
+      },
+      inOffset: function(mescroll) {
+        //下拉的距离进入offset范围内那一刻的回调
+        if(mescroll.downTipDom) mescroll.downTipDom.innerHTML = "下拉刷新";
+        if(mescroll.downProgressDom) mescroll.downProgressDom.classList.remove("mescroll-rotate");
+      },
+      outOffset: function(mescroll) {
+        //下拉的距离大于offset那一刻的回调
+        if(mescroll.downTipDom) mescroll.downTipDom.innerHTML = "释放更新";
+      },
+      onMoving: function(mescroll, rate, downHight) {
+        //下拉过程中的回调,滑动过程一直在执行; rate下拉区域当前高度与指定距离的比值(inOffset: rate<1; outOffset: rate>=1); downHight当前下拉区域的高度
+        if(mescroll.downProgressDom) {
+          var progress = 360 * rate;
+          mescroll.downProgressDom.style.webkitTransform = "rotate(" + progress + "deg)";
+          mescroll.downProgressDom.style.transform = "rotate(" + progress + "deg)";
+        }
+      },
+      beforeLoading: function(mescroll, downwarp) {
+        //准备触发下拉刷新的回调
+        return false; //如果return true,将不触发showLoading和callback回调; 常用来完全自定义下拉刷新, 参考案例【淘宝 v6.8.0】
+      },
+      showLoading: function(mescroll) {
+        //显示下拉刷新进度的回调
+        if(mescroll.downTipDom) mescroll.downTipDom.innerHTML = "加载中 ...";
+        if(mescroll.downProgressDom) mescroll.downProgressDom.classList.add("mescroll-rotate");
+      },
+      callback: function(mescroll) {
+        //下拉刷新的回调;默认重置上拉加载列表为第一页
+        mescroll.resetUpScroll();
+      }
+    })
+  }
+
+  /*配置参数:上拉加载*/
+  MeScroll.prototype.extendUpScroll = function(optUp) {
+    //是否为PC端,如果是scrollbar端,默认自定义滚动条
+    var isPC = typeof window.orientation == 'undefined' ;
+    //上拉加载的配置
+    MeScroll.extend(optUp, {
+      use: true, //是否启用上拉加载; 默认true
+      auto: false, //是否在初始化完毕之后自动执行上拉加载的回调; 默认false
+      isLock: false, //是否锁定上拉加载,默认false;当列表没有更多数据时会自动锁定不可上拉;在endSuccess如果检查到有下一页数据,则会自动解锁true
+      isBoth: false, //上拉加载时,如果滑动到列表顶部是否可以同时触发下拉刷新;默认false,两者不可同时触发;
+      callback: null, //上拉加载的回调;function(page,mescroll){ }
+      page: {
+        num: 0, //当前页码,默认0,回调之前会加1,即callback(page)会从1开始
+        size: 10, //每页数据的数量
+        time: null //加载第一页数据服务器返回的时间; 防止用户翻页时,后台新增了数据从而导致下一页数据重复;
+      },
+      noMoreSize: 5, //如果列表已无数据,可设置列表的总数量要大于5条才显示无更多数据;避免列表数据过少(比如只有一条数据),显示无更多数据会不好看
+      offset: 100, //列表滚动到距离底部小于100px,即可触发上拉加载的回调
+      toTop: {
+        //回到顶部按钮,需配置src才显示
+        src: null, //图片路径,默认null;
+        offset: 1000, //列表滚动多少距离才显示回到顶部按钮,默认1000
+        warpClass: "mescroll-totop", //按钮样式,参见mescroll.css
+        showClass: "mescroll-fade-in", //显示样式,参见mescroll.css
+        hideClass: "mescroll-fade-out", //隐藏样式,参见mescroll.css
+        duration: 300 //回到顶部的动画时长,默认300ms
+      },
+      loadFull: {
+        use: false, //列表数据过少,不足以滑动触发上拉加载,是否自动加载下一页,直到满屏或者无更多数据为止;默认false,因为可通过调高page.size避免这个情况
+        delay: 500 //延时执行的毫秒数; 延时是为了保证列表数据或占位的图片都已初始化完成,且下拉刷新上拉加载中区域动画已执行完毕;
+      },
+      empty: {
+        //列表第一页无任何数据时,显示的空提示布局; 需配置warpId或clearEmptyId才生效;
+        warpId: null, //父布局的id; 如果此项有值,将不使用clearEmptyId的值;
+        icon: null, //图标路径
+        tip: "暂无相关数据~", //提示
+        btntext: "", //按钮
+        btnClick: null //点击按钮的回调
+      },
+      clearId: null, //加载第一页时需清空数据的列表id; 如果此项有值,将不使用clearEmptyId的值;
+      clearEmptyId: null, //相当于同时设置了clearId和empty.warpId; 简化写法;
+      hardwareClass: "mescroll-hardware", //硬件加速样式,动画更流畅,参见mescroll.css
+      warpClass: "mescroll-upwarp", //上拉加载的布局容器样式,参见mescroll.css
+      htmlLoading: '<p class="upwarp-progress mescroll-rotate"></p><p class="upwarp-tip">加载中..</p>', //上拉加载中的布局
+      htmlNodata: '<p class="upwarp-nodata">-- END --</p>', //无数据的布局
+      inited: function(mescroll, upwarp) {
+        //初始化完毕的回调,可缓存dom 比如 mescroll.upProgressDom = upwarp.getElementsByClassName("upwarp-progress")[0];
+      },
+      showLoading: function(mescroll, upwarp) {
+        //上拉加载中.. mescroll.upProgressDom.style.display = "block" 不通过此方式显示,因为ios快速滑动到底部,进度条会无法及时渲染
+        upwarp.innerHTML = mescroll.optUp.htmlLoading;
+      },
+      showNoMore: function(mescroll, upwarp) {
+        //无更多数据
+        upwarp.innerHTML = mescroll.optUp.htmlNodata;
+      },
+      onScroll: null, //列表滑动监听,默认null; 例如 onScroll: function(mescroll, y){ }; //y为列表当前滚动条的位置
+      scrollbar: {
+        use: isPC, //默认只在PC端自定义滚动条样式
+        barClass: "mescroll-bar"
+      }
+    })
+  }
+
+  /*配置参数*/
+  MeScroll.extend = function(userOption, defaultOption) {
+    if(!userOption) return defaultOption;
+    for(key in defaultOption) {
+      if(userOption[key] == null) {
+        userOption[key] = defaultOption[key];
+      } else if(typeof userOption[key] == "object") {
+        MeScroll.extend(userOption[key], defaultOption[key]); //深度匹配
+      }
+    }
+    return userOption;
+  }
+
+  /*-------初始化下拉刷新-------*/
+  MeScroll.prototype.initDownScroll = function() {
+    var me = this;
+
+    //配置参数
+    me.optDown = me.options.down || {};
+    //可配置不使用下拉刷新
+    if(me.optDown.use == false) return;
+    //具体参数配置
+    me.extendDownScroll(me.optDown);
+
+    //在页面中加入下拉布局
+    me.downwarp = document.createElement("div");
+    me.downwarp.className = me.optDown.warpClass;
+    me.downwarp.innerHTML = '<div class="downwarp-content">' + me.optDown.htmlContent + '</div>';
+    me.scrollDom.insertBefore(me.downwarp, me.scrollDom.firstChild);
+
+    //鼠标或手指的按下事件
+    me.scrollDom.addEventListener("touchstart", touchstartEvent); //移动端手指事件
+    me.scrollDom.addEventListener("mousedown", touchstartEvent); //PC端鼠标事件
+    function touchstartEvent(e) {
+      if(me.isScrollTo) e.preventDefault(); //如果列表执行滑动事件,则阻止事件,优先执行scrollTo方法
+      me.startTop = me.scrollDom.scrollTop; //此时列表到顶部的距离,鼠标或手指离开时制空,避免直接触发move事件;
+      if(me.optDown.mustToTop) {
+        me.startY = e.touches ? e.touches[0].pageY : e.clientY; //如果列表必须滑动到顶部才能下拉,则记录此时第一个手指距离列表顶部的距离
+      }
+    }
+
+    //鼠标或手指的滑动事件
+    me.scrollDom.addEventListener("touchmove", touchmoveEvent); //移动端手指事件
+    me.scrollDom.addEventListener("mousemove", touchmoveEvent); //PC端鼠标事件
+    function touchmoveEvent(e) {
+      //列表在顶部且不在加载中
+      if(me.startTop != null && me.scrollDom.scrollTop <= 0 && !me.isDownScrolling && (!me.isUpScrolling || (me.isUpScrolling && me.optUp.isBoth)) && !me.optDown.isLock) {
+
+        //是否列表必须滑动到顶部才能下拉
+        if(me.optDown.mustToTop && me.startTop > 0) return;
+
+        var curX = e.touches ? e.touches[0].pageX : e.clientX; //当前第一个手指距离列表顶部的距离x
+        var curY = e.touches ? e.touches[0].pageY : e.clientY; //当前第一个手指距离列表顶部的距离y
+
+        if(!me.preX) me.preX = curX; //设置上次移动的距离x
+        if(!me.preY) me.preY = curY; //设置上次移动的距离y
+
+        //计算两点之间的角度
+        var x = Math.abs(me.preX - curX);
+        var y = Math.abs(me.preY - curY);
+        var z = Math.sqrt(x*x + y*y);
+
+        var diff = curY - me.preY; //和上次比,移动的距离 (大于0向下,小于0向上)
+        me.preX = curX; //记录本次curX的值
+        me.preY = curY; //记录本次curY的值
+
+        if(z!=0){
+          var angle=Math.asin(y / z) / Math.PI*180; //角度区间 [0,90]
+          if(angle < me.optDown.minAngle) return; //如果小于配置的角度,则不往下执行 -- 1.1.6版本加入的配置
+        }
+
+        if(!me.startY && !me.optDown.mustToTop) me.startY = curY; //记住列表滚动到0的位置时,手指距离顶部的距离,在touchend重置
+        var moveY = curY - me.startY; //和起点比,移动的距离,大于0向下拉
+
+        //向下拉
+        if(moveY > 0) {
+          e.preventDefault(); //阻止浏览器默认的滚动,避免与下面me.downwarp.style.height混合,而导致界面抖动
+          if(!me.downHight) me.downHight = 0; //下拉区域的高度
+          // 下拉距离  < 指定距离
+          if(me.downHight < me.optDown.offset) {
+            if(me.movetype != 1) {
+              me.movetype = 1; //加入标记,保证只执行一次
+              me.optDown.inOffset(me); //进入指定距离范围内那一刻的回调,只执行一次
+              me.downwarp.classList.remove(me.optDown.resetClass); //移除高度重置的动画
+              me.scrollDom.classList.add(me.optDown.hardwareClass); //开启硬件加速,解决iOS下拉因隐藏进度条而闪屏的问题
+              me.scrollDom.style.webkitOverflowScrolling = "auto"; //取消列表回弹效果,避免与下面me.downwarp.style.height混合,而导致界面抖动闪屏
+              me.isMoveDown = true; //标记下拉区域高度改变,在touchend重置回来
+            }
+            me.downHight += diff;
+
+            // 指定距离  <= 下拉距离
+          } else {
+            if(me.movetype != 2) {
+              me.movetype = 2; //加入标记,保证只执行一次
+              me.optDown.outOffset(me); //下拉超过指定距离那一刻的回调,只执行一次
+              me.downwarp.classList.remove(me.optDown.resetClass); //移除高度重置的动画
+              me.scrollDom.classList.add(me.optDown.hardwareClass); //开启硬件加速,解决iOS下拉因隐藏进度条而闪屏的问题
+              me.scrollDom.style.webkitOverflowScrolling = "auto"; //取消列表回弹效果,避免与下面me.downwarp.style.height混合,而导致界面抖动闪屏
+              me.isMoveDown = true; //标记下拉区域高度改变,在touchend重置回来
+            }
+            if(diff > 0) { //向下拉
+              me.downHight += diff * me.optDown.outOffsetRate; //越往下,高度变化越小
+            } else { //向上收
+              me.downHight += diff; //向上收回高度,则向上滑多少收多少高度
+            }
+          }
+
+          me.downwarp.style.height = me.downHight + "px"; //实时更新下拉区域高度
+          var rate = me.downHight / me.optDown.offset; //下拉区域当前高度与指定距离的比值
+          me.optDown.onMoving(me, rate, me.downHight); //下拉过程中的回调,一直在执行
+        }
+      }
+    }
+
+    //鼠标或手指的离开事件
+    me.scrollDom.addEventListener("touchend", touchendEvent); //移动端手指事件
+    me.scrollDom.addEventListener("mouseup", touchendEvent); //PC端鼠标抬起事件
+    me.scrollDom.addEventListener("mouseleave", touchendEvent); //PC端鼠标离开事件
+    function touchendEvent(e) {
+      //如果下拉区域高度已改变,则需重置回来
+      if(me.isMoveDown) {
+        if(me.downHight >= me.optDown.offset) {
+          //符合触发刷新的条件
+          me.triggerDownScroll();
+        } else {
+          //不符合的话 则重置
+          me.downwarp.classList.add(me.optDown.resetClass); //加入高度重置的动画,过渡平滑
+          me.downHight = 0;
+          me.downwarp.style.height = 0;
+        }
+        me.scrollDom.style.webkitOverflowScrolling = "touch";
+        me.scrollDom.classList.remove(me.optDown.hardwareClass);
+        me.movetype = 0;
+        me.isMoveDown = false;
+      }
+      me.startY = 0;
+      me.preX = 0;
+      me.preY = 0;
+      me.startTop = null;
+    }
+
+    //初始化完毕的回调
+    setTimeout(function() { //待主线程执行完毕再执行,避免new MeScroll未初始化,在回调获取不到mescroll的实例
+      me.optDown.inited(me, me.downwarp);
+    }, 0)
+  }
+
+  /*触发下拉刷新*/
+  MeScroll.prototype.triggerDownScroll = function() {
+    if(!this.optDown.beforeLoading(this, this.downwarp)) { //准备触发下拉的回调,return true则处于完全自定义状态;默认return false;
+      this.showDownScroll(); //下拉刷新中...
+      this.optDown.callback && this.optDown.callback(this); //执行回调,联网加载数据
+    }
+  }
+
+  /*显示下拉进度布局*/
+  MeScroll.prototype.showDownScroll = function() {
+    this.isDownScrolling = true; //标记下拉中
+    this.optDown.showLoading(this); //下拉刷新中...
+    this.downHight = this.optDown.offset; //更新下拉区域高度
+    this.downwarp.classList.add(this.optDown.resetClass); //加入高度重置的动画,过渡平滑
+    this.downwarp.style.height = this.optDown.offset + "px"; //调整下拉区域高度
+  }
+
+  /*结束下拉刷新*/
+  MeScroll.prototype.endDownScroll = function() {
+    this.downHight = 0;
+    this.downwarp.style.height = 0;
+    this.isDownScrolling = false;
+  }
+
+  /*锁定下拉刷新:isLock=ture,null锁定;isLock=false解锁*/
+  MeScroll.prototype.lockDownScroll = function(isLock) {
+    if(isLock == null) isLock = true;
+    this.optDown.isLock = isLock;
+  }
+
+  /*-------初始化上拉加载-------*/
+  MeScroll.prototype.initUpScroll = function() {
+    var me = this;
+
+    //配置参数
+    me.optUp = me.options.up || {};
+    //可配置不使用上拉加载
+    if(me.optUp.use == false) return;
+    //具体参数配置
+    me.extendUpScroll(me.optUp);
+
+    //自定义滚动条 (默认只在PC端设置)
+    if(me.optUp.scrollbar.use) me.scrollDom.classList.add(me.optUp.scrollbar.barClass);
+
+    //在页面中加入下拉布局
+    me.upwarp = document.createElement("div");
+    me.upwarp.className = me.optUp.warpClass;
+    me.scrollDom.appendChild(me.upwarp);
+
+    //滚动监听
+    me.scrollDom.addEventListener("scroll", function() {
+      //列表内容顶部卷去的高度(含列表边框)
+      var scrollTop = me.scrollDom.scrollTop;
+
+      //如果没有在加载中
+      if(!me.isUpScrolling && (!me.isDownScrolling || (me.isDownScrolling && me.optDown.isBoth))) {
+        //clientHeight 列表高度(内容+内边距),不含列表边框
+        //scrollHeight 列表内容撑开的高度
+        if(!me.optUp.isLock) {
+          var toBottom = me.scrollDom.scrollHeight - me.scrollDom.clientHeight - scrollTop; //滚动条距离底部的距离
+          if(toBottom <= me.optUp.offset) {
+            //如果滚动条距离底部指定范围内了,则执行上拉加载回调
+            me.triggerUpScroll();
+          }
+        }
+
+        //顶部按钮的显示隐藏
+        if(me.optUp.toTop.src) {
+          if(scrollTop >= me.optUp.toTop.offset) {
+            me.showTopBtn();
+          } else {
+            me.hideTopBtn();
+          }
+        }
+      }
+
+      //滑动监听
+      me.optUp.onScroll&&me.optUp.onScroll(me, scrollTop);
+    });
+
+    //初始化完毕的回调
+    setTimeout(function() { //待主线程执行完毕再执行,避免new MeScroll未初始化,在回调获取不到mescroll的实例
+      me.optUp.inited(me, me.upwarp);
+    }, 0)
+  }
+
+  /*触发上拉加载*/
+  MeScroll.prototype.triggerUpScroll = function() {
+    this.showUpScroll(); //上拉加载中...
+    this.optUp.page.num++; //预先加一页,如果失败则减回
+    this.optUp.callback && this.optUp.callback(this.optUp.page, this); //执行回调,联网加载数据
+  }
+
+  /*显示上拉加载中*/
+  MeScroll.prototype.showUpScroll = function() {
+    this.isUpScrolling = true; //标记上拉加载中
+    this.upwarp.classList.add(this.optUp.hardwareClass); //添加硬件加速样式,使动画更流畅
+    this.upwarp.style.visibility = "visible"; //显示上拉加载区域
+    this.optUp.showLoading(this, this.upwarp); //加载中...
+  }
+
+  /*显示上拉无更多数据*/
+  MeScroll.prototype.showNoMore = function() {
+    this.upwarp.style.visibility = "visible"; //显示上拉加载区域
+    this.optUp.isLock = true; //锁定不可上拉
+    this.optUp.showNoMore(this, this.upwarp); //无更多数据
+  }
+
+  /*隐藏上拉区域*/
+  MeScroll.prototype.hideUpScroll = function() {
+    this.upwarp.style.visibility = "hidden"; /*代替display: none,列表快速滑动到底部能及时显示*/
+    this.upwarp.classList.remove(this.optUp.hardwareClass); //移除硬件加速样式
+  }
+
+  /*结束上拉加载*/
+  MeScroll.prototype.endUpScroll = function(isShowNoMore) {
+    if(isShowNoMore != null) { //isShowNoMore=null,不处理下拉状态
+      if(isShowNoMore) {
+        this.showNoMore(); //isShowNoMore=true,显示无更多数据
+      } else {
+        this.hideUpScroll(); //isShowNoMore=false,隐藏上拉加载
+      }
+    }
+    this.isUpScrolling = false; //标记结束上拉加载
+  }
+
+  /*重置上拉加载列表为第一页
+   *isShowLoading 是否显示进度布局;
+   * 1.默认null,不传参,则显示上拉加载的进度布局
+   * 2.传参true, 则显示下拉刷新的进度布局
+   * 3.传参false,则不显示上拉和下拉的进度 (常用于静默更新列表数据)
+   */
+  MeScroll.prototype.resetUpScroll = function(isShowLoading) {
+    if(this.optUp && this.optUp.use) {
+      var page = this.optUp.page;
+      this.prePageNum = page.num; //缓存重置前的页码,加载失败可退回
+      this.prePageTime = page.time; //缓存重置前的时间,加载失败可退回
+      page.num = 1; //重置为第一页
+      page.time = null; //重置时间为空
+      if(!this.isDownScrolling&&isShowLoading!=false) {//如果不是下拉刷新触发的resetUpScroll并且不配置列表静默更新,则显示进度;
+        if(isShowLoading==null) {
+          this.removeEmpty(); //移除空布局
+          this.clearDataList();//先清空列表数据,才能显示到上拉加载的布局
+          this.showUpScroll(); //不传参,默认显示上拉加载的进度布局
+        } else {
+          this.showDownScroll(); //传true,显示下拉刷新的进度布局,不清空列表
+        }
+      }
+      this.optUp.callback && this.optUp.callback(page, this); //执行上拉回调
+    }
+  }
+
+  /*清空上拉加载的数据列表*/
+  MeScroll.prototype.clearDataList = function() {
+    var listId = this.optUp.clearId || this.optUp.clearEmptyId; //优先使用clearId
+    if(listId) {
+      var listDom = document.getElementById(listId);
+      if(listDom) listDom.innerHTML = "";
+    }
+  }
+
+  /*回调成功
+   *结束下拉刷新 meScroll.endSuccess();无参;
+   *结束上拉加载 meScroll.endSuccess(dataSize, systime); 必须传dataSize:联网获取到的数据条数;用于判断列表是否还有数据.如果不传则仅隐藏加载中的状态;  systime:第一页的系统时间 (可空)
+   */
+  MeScroll.prototype.endSuccess = function(dataSize, systime) {
+    //结束下拉刷新
+    if(this.isDownScrolling) this.endDownScroll();
+
+    //结束上拉加载
+    if(this.optUp.use) {
+      var pageNum = this.optUp.page.num; //当前页码
+      var pageSize = this.optUp.page.size; //每页长度
+
+      if(pageNum == 1) this.clearDataList(); //如果是第一页,自动清空第一页列表数据
+
+      var isShowNoMore; //是否已无更多数据
+      if(dataSize != null) {
+        if(dataSize < pageSize) {
+          //返回的数据不满一页时,则说明已无更多数据
+          this.optUp.isLock = true;
+          if(dataSize == 0 && pageNum == 1) {
+            //如果第一页无任何数据且配置了空布局
+            isShowNoMore = false;
+            this.showEmpty();
+          } else {
+            //总列表数少于配置的数量,则不显示无更多数据
+            var allDataSize = (pageNum - 1) * pageSize + dataSize;
+            if(allDataSize < this.optUp.noMoreSize) {
+              isShowNoMore = false;
+            } else {
+              isShowNoMore = true;
+            }
+            this.removeEmpty(); //移除空布局
+          }
+        } else {
+          //还有下一页
+          isShowNoMore = false;
+          this.optUp.isLock = false;
+          this.removeEmpty(); //移除空布局
+        }
+      }
+
+      //设置加载列表数据第一页的时间
+      if(pageNum == 1 && systime) this.optUp.page.time = systime;
+
+      //隐藏上拉
+      this.endUpScroll(isShowNoMore);
+
+      //检查是否满屏自动加载下一页
+      this.loadFull();
+    }
+  }
+
+  /*回调失败,结束下拉刷新和上拉加载*/
+  MeScroll.prototype.endErr = function() {
+    //结束下拉,回调失败重置回原来的页码和时间
+    if(this.isDownScrolling) {
+      var page = this.optUp.page;
+      if(page && this.prePageNum) {
+        page.num = this.prePageNum;
+        page.time = this.prePageTime;
+      }
+      this.endDownScroll();
+    }
+    //结束上拉,回调失败重置回原来的页码
+    if(this.isUpScrolling) {
+      this.optUp.page.num--;
+      this.endUpScroll(false);
+    }
+  }
+
+  /*检查如果加载的数据过少,无法触发上拉加载时,则自动加载下一页,直到满屏或者没有更多数据
+   此方法最好在列表的数据加载完成之后调用,以便计算列表内容高度的准确性*/
+  MeScroll.prototype.loadFull = function() {
+    var me = this;
+    if(me.optUp.loadFull.use && !me.optUp.isLock && me.scrollDom.scrollHeight <= me.scrollDom.clientHeight) {
+      setTimeout(function() {
+        //延时之后,还需再判断一下高度,因为可能有些图片在延时期间加载完毕撑开高度
+        if(me.scrollDom.scrollHeight <= me.scrollDom.clientHeight) me.triggerUpScroll();
+      }, me.optUp.loadFull.delay)
+    }
+  }
+
+  /*锁定上拉加载:isLock=ture,null锁定;isLock=false解锁*/
+  MeScroll.prototype.lockUpScroll = function(isLock) {
+    if(isLock == null) isLock = true;
+    this.optUp.isLock = isLock;
+  }
+
+  /*--------无任何数据的空布局--------*/
+  MeScroll.prototype.showEmpty = function() {
+    var me = this;
+    var optEmpty = me.optUp.empty; //空布局的配置
+    var warpId = optEmpty.warpId || me.optUp.clearEmptyId; //优先使用warpId
+    if(warpId == null) return;
+    var emptyWarp = document.getElementById(warpId) //要显示空布局的位置
+    if(emptyWarp) {
+      me.removeEmpty(); //先移除,避免重复加入
+      //初始化无任何数据的空布局
+      var str = '';
+      if(optEmpty.icon) str += '<img class="empty-icon" src="' + optEmpty.icon + '"/>'; //图标
+      if(optEmpty.tip) str += '<p class="empty-tip">' + optEmpty.tip + '</p>'; //提示
+      if(optEmpty.btntext) str += '<p class="empty-btn">' + optEmpty.btntext + '</p>'; //按钮
+      me.emptyDom = document.createElement("div");
+      me.emptyDom.className = 'mescroll-empty';
+      me.emptyDom.innerHTML = str;
+      emptyWarp.appendChild(me.emptyDom);
+      if(optEmpty.btnClick) { //点击按钮的回调
+        var emptyBtn = me.emptyDom.getElementsByClassName("empty-btn")[0];
+        emptyBtn.onclick = function() {
+          optEmpty.btnClick();
+        }
+      }
+    }
+  }
+  /*移除空布局*/
+  MeScroll.prototype.removeEmpty = function() {
+    if(this.emptyDom) {
+      var parentDom = this.emptyDom.parentNode;
+      if(parentDom) parentDom.removeChild(this.emptyDom);
+      this.emptyDom = null;
+    }
+  }
+
+  /*--------回到顶部的按钮--------*/
+  MeScroll.prototype.showTopBtn = function() {
+    if(!this.topBtnShow) {
+      this.topBtnShow = true; //标记显示
+      var me = this;
+      var optTop = me.optUp.toTop; //回到顶部的配置
+      if(me.toTopBtn == null) {
+        //未加入按钮,则加入
+        me.toTopBtn = document.createElement("img");
+        me.toTopBtn.className = optTop.warpClass;
+        me.toTopBtn.src = optTop.src;
+        me.toTopBtn.onclick = function() {
+          me.scrollTo(0, me.optUp.toTop.duration); //置顶
+        }
+        document.body.appendChild(me.toTopBtn); //加在body上,避免加在me.scrollDom在使用硬件加速样式时会使fixed失效
+      }
+      //显示--淡入动画
+      me.toTopBtn.classList.remove(optTop.hideClass);
+      me.toTopBtn.classList.add(optTop.showClass);
+    }
+  }
+  /*隐藏回到顶部的按钮*/
+  MeScroll.prototype.hideTopBtn = function() {
+    if(this.topBtnShow && this.toTopBtn) {
+      this.topBtnShow = false;
+      this.toTopBtn.classList.remove(this.optUp.toTop.showClass);
+      this.toTopBtn.classList.add(this.optUp.toTop.hideClass);
+    }
+  }
+
+  /*滑动列表到指定位置--带缓冲效果 (y=0回到顶部;如果要滚动到底部可以传一个较大的值,比如99999);t时长,单位ms,默认300*/
+  MeScroll.prototype.scrollTo = function(y, t) {
+    t = t || 300; //时长 300ms
+    var rate = 20; //周期 20ms
+    var count = t / rate; //次数
+    var me = this;
+    var maxY = me.scrollDom.scrollHeight - me.scrollDom.clientHeight; //y的最大值
+    if(y < 0) y = 0; //不可小于0
+    if(y > maxY) y = maxY; //不可超过最大值
+    var diff = me.scrollDom.scrollTop - y; //差值 (可能为负值)
+    if(diff == 0) return;
+    var step = diff / count; //步长
+    me.isScrollTo = true; //标记在滑动中,阻止列表的触摸事件
+    var i = 0; //计数
+    var scrollTimer = window.setInterval(function() {
+      if(i < count) {
+        if(i == count - 1) {
+          me.scrollDom.scrollTop = y; //最后一次直接设置y,避免计算误差
+        } else {
+          me.scrollDom.scrollTop -= step;
+        }
+        i++;
+      } else {
+        me.isScrollTo = false;
+        window.clearInterval(scrollTimer);
+      }
+    }, rate);
+  }
+
+  return MeScroll
+});
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/mobileSelect.js b/pluss-wap-page/src/main/resources/static/resources/js/mobileSelect.js
new file mode 100644
index 0000000..fe3dbab
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/mobileSelect.js
@@ -0,0 +1,677 @@
+/*!
+ * mobileSelect.js
+ * (c) 2017-present onlyhom
+ * Released under the MIT License.
+ */
+
+(function() {
+	function getClass(dom,string) {
+		return dom.getElementsByClassName(string);
+	}
+	//构造器
+	function MobileSelect(config) {
+		this.mobileSelect;
+		this.wheelsData = config.wheels;
+		this.jsonType =  false;
+		this.cascadeJsonData = [];
+		this.displayJson = []; 
+		this.cascade = false;
+		this.startY;
+		this.moveEndY;
+		this.moveY;
+		this.oldMoveY;
+		this.offset = 0;
+		this.offsetSum = 0;
+		this.oversizeBorder;
+		this.curDistance = [];
+		this.clickStatus = false;
+		this.isPC = true;
+		this.init(config);
+	}
+	MobileSelect.prototype = {
+		constructor: MobileSelect,
+		init: function(config){
+			var _this = this; 
+			_this.keyMap = config.keyMap ? config.keyMap : {id:'id', value:'value', childs:'childs'};
+			_this.checkDataType();
+			_this.renderWheels(_this.wheelsData, config.cancelBtnText, config.ensureBtnText);
+			_this.trigger = document.querySelector(config.trigger);
+			if(!_this.trigger){
+				console.error('mobileSelect has been successfully installed, but no trigger found on your page.');
+				return false;
+			}
+			_this.wheel = getClass(_this.mobileSelect,'wheel');
+			_this.slider = getClass(_this.mobileSelect,'selectContainer'); 
+			_this.wheels = _this.mobileSelect.querySelector('.wheels');
+			_this.liHeight = _this.mobileSelect.querySelector('li').offsetHeight;
+			_this.ensureBtn = _this.mobileSelect.querySelector('.ensure');
+			_this.cancelBtn = _this.mobileSelect.querySelector('.cancel');
+			_this.grayLayer = _this.mobileSelect.querySelector('.grayLayer');
+			_this.popUp = _this.mobileSelect.querySelector('.content');
+			_this.callback = config.callback ? config.callback : function(){};
+			_this.transitionEnd = config.transitionEnd ? config.transitionEnd : function(){};
+			_this.initPosition = config.position ? config.position : [];
+			_this.titleText = config.title ? config.title : '';
+			_this.connector = config.connector ? config.connector : ' ';
+			_this.trigger.style.cursor='pointer';
+			_this.setStyle(config);
+			_this.setTitle(_this.titleText);
+			_this.checkIsPC();
+			_this.checkCascade();
+			if (_this.cascade) {
+				_this.initCascade();
+			}
+			//定位 初始位置
+			if(_this.initPosition.length < _this.slider.length){
+				var diff = _this.slider.length - _this.initPosition.length;
+				for(var i=0; i<diff; i++){
+					_this.initPosition.push(0);
+				}
+			}
+
+			_this.setCurDistance(_this.initPosition);
+			_this.addListenerAll();
+
+			//按钮监听
+			_this.cancelBtn.addEventListener('click',function(){
+			_this.mobileSelect.classList.remove('mobileSelect-show');
+		    });
+
+		    _this.ensureBtn.addEventListener('click',function(){
+				_this.mobileSelect.classList.remove('mobileSelect-show');
+				var tempValue ='';
+		    	for(var i=0; i<_this.wheel.length; i++){
+		    		i==_this.wheel.length-1 ? tempValue += _this.getInnerHtml(i) : tempValue += _this.getInnerHtml(i) + _this.connector;
+		    	}
+		    	_this.trigger.innerHTML = tempValue;
+		    	_this.callback(_this.getIndexArr(),_this.getValue());
+		    });
+
+		    _this.trigger.addEventListener('click',function(){
+		    	_this.mobileSelect.classList.add('mobileSelect-show');
+		    });
+		    _this.grayLayer.addEventListener('click',function(){
+		    	_this.mobileSelect.classList.remove('mobileSelect-show');
+		    });
+		    _this.popUp.addEventListener('click',function(){
+		    	event.stopPropagation(); 
+		    });
+
+			_this.fixRowStyle(); //修正列数
+		},
+
+		setTitle: function(string){
+			var _this = this;
+			_this.titleText = string;
+			_this.mobileSelect.querySelector('.title').innerHTML = _this.titleText;
+		},
+
+		setStyle: function(config){
+			var _this = this;
+			if(config.ensureBtnColor){
+				_this.ensureBtn.style.color = config.ensureBtnColor;
+			}
+			if(config.cancelBtnColor){
+				_this.cancelBtn.style.color = config.cancelBtnColor;
+			}
+			if(config.titleColor){
+				_this.title = _this.mobileSelect.querySelector('.title');
+				_this.title.style.color = config.titleColor;
+			}
+			if(config.textColor){
+				_this.panel = _this.mobileSelect.querySelector('.panel');
+				_this.panel.style.color = config.textColor;
+			}
+			if(config.titleBgColor){
+				_this.btnBar = _this.mobileSelect.querySelector('.btnBar');
+				_this.btnBar.style.backgroundColor = config.titleBgColor;
+			}
+			if(config.bgColor){
+				_this.panel = _this.mobileSelect.querySelector('.panel');
+				_this.shadowMask = _this.mobileSelect.querySelector('.shadowMask');
+				_this.panel.style.backgroundColor = config.bgColor;
+				_this.shadowMask.style.background = 'linear-gradient(to bottom, '+ config.bgColor + ', rgba(255, 255, 255, 0), '+ config.bgColor + ')';
+			}
+		},
+
+		checkIsPC: function(){
+			var _this = this;
+		    var sUserAgent = navigator.userAgent.toLowerCase();
+		    var bIsIpad = sUserAgent.match(/ipad/i) == "ipad";
+		    var bIsIphoneOs = sUserAgent.match(/iphone os/i) == "iphone os";
+		    var bIsMidp = sUserAgent.match(/midp/i) == "midp";
+		    var bIsUc7 = sUserAgent.match(/rv:1.2.3.4/i) == "rv:1.2.3.4";
+		    var bIsUc = sUserAgent.match(/ucweb/i) == "ucweb";
+		    var bIsAndroid = sUserAgent.match(/android/i) == "android";
+		    var bIsCE = sUserAgent.match(/windows ce/i) == "windows ce";
+		    var bIsWM = sUserAgent.match(/windows mobile/i) == "windows mobile";
+		    if ((bIsIphoneOs || bIsMidp || bIsUc7 || bIsUc || bIsAndroid || bIsCE || bIsWM)) {
+		        _this.isPC = false;
+		    }
+		},
+
+		show: function(){
+		    this.mobileSelect.classList.add('mobileSelect-show');	
+		},
+
+		renderWheels: function(wheelsData, cancelBtnText, ensureBtnText){
+			var _this = this;
+			var cancelText = cancelBtnText ? cancelBtnText : '取消';
+			var ensureText = ensureBtnText ? ensureBtnText : '确认';
+			_this.mobileSelect = document.createElement("div");
+			_this.mobileSelect.className = "mobileSelect";
+			_this.mobileSelect.innerHTML = 
+		    	'<div class="grayLayer"></div>'+
+		        '<div class="content">'+
+		            '<div class="btnBar">'+
+		                '<div class="fixWidth">'+
+		                    '<div class="cancel">'+ cancelText +'</div>'+
+		                    '<div class="title"></div>'+
+		                    '<div class="ensure">'+ ensureText +'</div>'+
+		                '</div>'+
+		            '</div>'+
+		            '<div class="panel">'+
+		                '<div class="fixWidth">'+
+		                	'<div class="wheels">'+
+			                '</div>'+
+		                    '<div class="selectLine"></div>'+
+		                    '<div class="shadowMask"></div>'+
+		                '</div>'+
+		            '</div>'+
+		        '</div>';
+		    document.body.appendChild(_this.mobileSelect);
+
+			//根据数据长度来渲染
+
+			var tempHTML='';
+			for(var i=0; i<wheelsData.length; i++){ 
+			//列
+				tempHTML += '<div class="wheel"><ul class="selectContainer">';
+				if(_this.jsonType){
+					for(var j=0; j<wheelsData[i].data.length; j++){ 
+					//行
+						tempHTML += '<li data-id="'+wheelsData[i].data[j][_this.keyMap.id]+'">'+wheelsData[i].data[j][_this.keyMap.value]+'</li>';
+					}
+				}else{
+					for(var j=0; j<wheelsData[i].data.length; j++){ 
+					//行
+						tempHTML += '<li>'+wheelsData[i].data[j]+'</li>';
+					}
+				}
+				tempHTML += '</ul></div>';
+			}
+			_this.mobileSelect.querySelector('.wheels').innerHTML = tempHTML;
+		},
+
+		addListenerAll: function(){
+			var _this = this;
+			for(var i=0; i<_this.slider.length; i++){
+				//手势监听
+				(function (i) {
+					_this.addListenerWheel(_this.wheel[i], i);
+					_this.addListenerLi(i);
+				})(i);
+			}
+		},
+
+		addListenerWheel: function(theWheel, index){
+			var _this = this;
+			theWheel.addEventListener('touchstart', function () {
+				_this.touch(event, this.firstChild, index);
+			},false);
+			theWheel.addEventListener('touchend', function () {
+				_this.touch(event, this.firstChild, index);
+			},false);
+			theWheel.addEventListener('touchmove', function () {
+				_this.touch(event, this.firstChild, index);
+			},false);
+
+			if(_this.isPC){
+				//如果是PC端则再增加拖拽监听 方便调试
+				theWheel.addEventListener('mousedown', function () {
+					_this.dragClick(event, this.firstChild, index);
+				},false);
+				theWheel.addEventListener('mousemove', function () {
+					_this.dragClick(event, this.firstChild, index);
+				},false);
+				theWheel.addEventListener('mouseup', function () {
+					_this.dragClick(event, this.firstChild, index);
+				},true); 
+			}
+		},
+
+		addListenerLi:function(sliderIndex){
+			var _this = this;
+			var curWheelLi = _this.slider[sliderIndex].getElementsByTagName('li');
+			for(var j=0; j<curWheelLi.length;j++){
+				(function (j) {
+					curWheelLi[j].addEventListener('click',function(){
+						_this.singleClick(this, j, sliderIndex);
+					},false);
+				})(j);
+			}
+		},
+
+		checkDataType: function(){ 
+			var _this = this;
+			if(typeof(_this.wheelsData[0].data[0])=='object'){
+				_this.jsonType = true;
+			}
+		},
+
+		checkCascade: function(){
+			var _this = this;
+			if(_this.jsonType){ 
+				var node = _this.wheelsData[0].data;
+				for(var i=0; i<node.length; i++){
+					if(_this.keyMap.childs in node[i] && node[i][_this.keyMap.childs].length > 0){
+						_this.cascade = true;
+						_this.cascadeJsonData = _this.wheelsData[0].data;
+						break;
+					}
+				}
+			}else{
+				_this.cascade = false;
+			}
+		},
+
+		generateArrData: function (targetArr) {
+			var tempArr = [];
+			var keyMap_id = this.keyMap.id;
+			var keyMap_value = this.keyMap.value;
+			for(var i=0; i<targetArr.length; i++){
+				var tempObj = {}; 
+				tempObj[keyMap_id] = targetArr[i][this.keyMap.id];
+				tempObj[keyMap_value] = targetArr[i][this.keyMap.value];
+				tempArr.push(tempObj);	
+			}
+			return tempArr;
+		},
+
+		initCascade: function(){
+			var _this = this;
+			_this.displayJson.push(_this.generateArrData(_this.cascadeJsonData));
+			if(_this.initPosition.length>0){
+				_this.initDeepCount = 0;
+				_this.initCheckArrDeep(_this.cascadeJsonData[_this.initPosition[0]]);
+			}else{
+				_this.checkArrDeep(_this.cascadeJsonData[0]);
+			}
+			_this.reRenderWheels();
+		},
+
+		initCheckArrDeep: function (parent) {
+			var _this = this;
+			if(parent){
+				if (_this.keyMap.childs in parent && parent[_this.keyMap.childs].length > 0) {
+					_this.displayJson.push(_this.generateArrData(parent[_this.keyMap.childs])); 
+					_this.initDeepCount++;
+					var nextNode = parent[_this.keyMap.childs][_this.initPosition[_this.initDeepCount]];
+					if(nextNode){
+						_this.initCheckArrDeep(nextNode);
+					}else{
+						_this.checkArrDeep(parent[_this.keyMap.childs][0]);
+					}
+				}
+			}
+		},
+
+		checkArrDeep: function (parent) { 
+			//检测子节点深度  修改 displayJson
+			var _this = this;
+			if(parent){
+				if (_this.keyMap.childs in parent && parent[_this.keyMap.childs].length > 0) {
+					_this.displayJson.push(_this.generateArrData(parent[_this.keyMap.childs])); //生成子节点数组
+					_this.checkArrDeep(parent[_this.keyMap.childs][0]);//检测下一个子节点
+				}
+			}
+		},
+
+		checkRange: function(index, posIndexArr){
+			var _this = this;
+			var deleteNum = _this.displayJson.length-1-index;
+			for(var i=0; i<deleteNum; i++){
+				_this.displayJson.pop(); //修改 displayJson
+			}
+			var resultNode;
+			for (var i = 0; i <= index; i++){
+				if (i == 0)
+					resultNode = _this.cascadeJsonData[posIndexArr[0]];
+				else {
+					resultNode = resultNode[_this.keyMap.childs][posIndexArr[i]];
+				}
+			}
+			_this.checkArrDeep(resultNode);
+			//console.log(_this.displayJson);
+			_this.reRenderWheels();
+			_this.fixRowStyle();
+			_this.setCurDistance(_this.resetPostion(index, posIndexArr));
+		},
+
+		resetPostion: function(index, posIndexArr){
+			var _this = this;
+			var tempPosArr = posIndexArr;
+			var tempCount;
+			if(_this.slider.length > posIndexArr.length){ 
+				tempCount = _this.slider.length - posIndexArr.length;
+				for(var i=0; i<tempCount; i++){  
+					tempPosArr.push(0);
+				}
+			}else if(_this.slider.length < posIndexArr.length){
+				tempCount = posIndexArr.length - _this.slider.length;
+				for(var i=0; i<tempCount; i++){
+					tempPosArr.pop();
+				}	
+			}
+			for(var i=index+1; i< tempPosArr.length; i++){
+				tempPosArr[i] = 0;
+			} 
+			return tempPosArr;
+		},
+
+		reRenderWheels: function(){
+			var _this = this;
+			//删除多余的wheel
+			if(_this.wheel.length > _this.displayJson.length){
+				var count = _this.wheel.length - _this.displayJson.length;
+				for(var i=0; i<count; i++){
+					_this.wheels.removeChild(_this.wheel[_this.wheel.length-1]);
+				}
+			}
+			for(var i=0; i<_this.displayJson.length; i++){ 
+			//列
+				(function (i) {
+					var tempHTML='';
+					if(_this.wheel[i]){
+						//console.log('插入Li');
+						for(var j=0; j<_this.displayJson[i].length; j++){ 
+						//行
+							tempHTML += '<li data-id="'+_this.displayJson[i][j][_this.keyMap.id]+'">'+_this.displayJson[i][j][_this.keyMap.value]+'</li>';
+						}
+						_this.slider[i].innerHTML = tempHTML;
+
+					}else{
+						var tempWheel = document.createElement("div");
+						tempWheel.className = "wheel";
+						tempHTML = '<ul class="selectContainer">';
+						for(var j=0; j<_this.displayJson[i].length; j++){ 
+						//行
+							tempHTML += '<li data-id="'+_this.displayJson[i][j][_this.keyMap.id]+'">'+_this.displayJson[i][j][_this.keyMap.value]+'</li>';
+						}
+						tempHTML += '</ul>';
+						tempWheel.innerHTML = tempHTML;
+
+						_this.addListenerWheel(tempWheel, i);
+				    	_this.wheels.appendChild(tempWheel); 
+					}
+					_this.addListenerLi(i);
+				})(i);
+			}
+		},
+
+		updateWheels:function(data){
+			var _this = this;
+			if(_this.cascade){
+				_this.cascadeJsonData = data;
+				_this.displayJson = [];
+				_this.initCascade();
+				if(_this.initPosition.length < _this.slider.length){
+					var diff = _this.slider.length - _this.initPosition.length;
+					for(var i=0; i<diff; i++){
+						_this.initPosition.push(0);
+					}
+				}
+				_this.setCurDistance(_this.initPosition);
+				_this.fixRowStyle();
+			}
+		},
+
+		updateWheel: function(sliderIndex, data){
+			var _this = this;
+			var tempHTML='';
+	    	if(_this.cascade){
+	    		console.error('级联格式不支持updateWheel(),请使用updateWheels()更新整个数据源');
+				return false;
+	    	}
+	    	else if(_this.jsonType){
+				for(var j=0; j<data.length; j++){
+					tempHTML += '<li data-id="'+data[j][_this.keyMap.id]+'">'+data[j][_this.keyMap.value]+'</li>';
+				}
+				_this.wheelsData[sliderIndex] = {data: data};
+	    	}else{
+				for(var j=0; j<data.length; j++){
+					tempHTML += '<li>'+data[j]+'</li>';
+				}
+				_this.wheelsData[sliderIndex] = data;
+	    	}
+			_this.slider[sliderIndex].innerHTML = tempHTML;
+			_this.addListenerLi(sliderIndex);
+		},
+
+		fixRowStyle: function(){
+			var _this = this;
+			var width = (100/_this.wheel.length).toFixed(2);
+			for(var i=0; i<_this.wheel.length; i++){
+				_this.wheel[i].style.width = width+'%';
+			}
+		},
+
+	    getIndex: function(distance){
+	        return Math.round((2*this.liHeight-distance)/this.liHeight);
+	    },
+
+	    getIndexArr: function(){
+	    	var _this = this;
+	    	var temp = [];
+	    	for(var i=0; i<_this.curDistance.length; i++){
+	    		temp.push(_this.getIndex(_this.curDistance[i]));
+	    	}
+	    	return temp;
+	    },
+
+	    getValue: function(){
+	    	var _this = this;
+	    	var temp = [];
+	    	var positionArr = _this.getIndexArr();
+	    	if(_this.cascade){
+		    	for(var i=0; i<_this.wheel.length; i++){
+		    		temp.push(_this.displayJson[i][positionArr[i]]);
+		    	}
+	    	}
+	    	else if(_this.jsonType){
+		    	for(var i=0; i<_this.curDistance.length; i++){
+		    		temp.push(_this.wheelsData[i].data[_this.getIndex(_this.curDistance[i])]);
+		    	}
+	    	}else{
+		    	for(var i=0; i<_this.curDistance.length; i++){
+		    		temp.push(_this.getInnerHtml(i));
+		    	}
+	    	}
+	    	return temp;
+	    },
+
+	    calcDistance: function(index){
+			return 2*this.liHeight-index*this.liHeight;
+	    },
+
+	    setCurDistance: function(indexArr){
+	    	var _this = this;
+	    	var temp = [];
+	    	for(var i=0; i<_this.slider.length; i++){
+	    		temp.push(_this.calcDistance(indexArr[i]));
+	    		_this.movePosition(_this.slider[i],temp[i]);
+	    	}
+	    	_this.curDistance = temp;
+	    },
+
+	    fixPosition: function(distance){
+	        return -(this.getIndex(distance)-2)*this.liHeight;
+	    },
+
+	    movePosition: function(theSlider, distance){
+	        theSlider.style.webkitTransform = 'translate3d(0,' + distance + 'px, 0)';
+	        theSlider.style.transform = 'translate3d(0,' + distance + 'px, 0)';
+	    },
+
+	    locatePostion: function(index, posIndex){
+	    	this.curDistance[index] = this.calcDistance(posIndex);
+	    	this.movePosition(this.slider[index],this.curDistance[index]);
+	    },
+
+	    updateCurDistance: function(theSlider, index){
+	        this.curDistance[index] = parseInt(theSlider.style.transform.split(',')[1]);
+	    },
+
+	    getDistance:function(theSlider){
+	    	return parseInt(theSlider.style.transform.split(',')[1]);
+	    },
+
+	    getInnerHtml: function(sliderIndex){
+	    	var _this = this;
+	    	var index = _this.getIndex(_this.curDistance[sliderIndex]);
+	    	return _this.slider[sliderIndex].getElementsByTagName('li')[index].innerHTML;
+	    },
+
+	    touch: function(event, theSlider, index){
+	    	var _this = this;
+	    	event = event || window.event;
+	    	switch(event.type){
+	    		case "touchstart":
+			        _this.startY = event.touches[0].clientY;
+			        _this.oldMoveY = _this.startY;
+	    			break;
+
+	    		case "touchend":
+
+			        _this.moveEndY = event.changedTouches[0].clientY;
+			        _this.offsetSum = _this.moveEndY - _this.startY;
+
+					//修正位置
+			        _this.updateCurDistance(theSlider, index);
+			        _this.curDistance[index] = _this.fixPosition(_this.curDistance[index]);
+			        _this.movePosition(theSlider, _this.curDistance[index]);
+			        _this.oversizeBorder = -(theSlider.getElementsByTagName('li').length-3)*_this.liHeight; 
+
+
+			        //反弹
+			        if(_this.curDistance[index] + _this.offsetSum > 2*_this.liHeight){
+			            _this.curDistance[index] = 2*_this.liHeight;
+			            setTimeout(function(){
+			                _this.movePosition(theSlider, _this.curDistance[index]);
+			            }, 100);
+
+			        }else if(_this.curDistance[index] + _this.offsetSum < _this.oversizeBorder){
+			            _this.curDistance[index] = _this.oversizeBorder;
+			            setTimeout(function(){
+			                _this.movePosition(theSlider, _this.curDistance[index]);
+			            }, 100);
+			        }
+
+
+			        _this.transitionEnd(_this.getIndexArr(),_this.getValue());
+
+			        if(_this.cascade){
+				        var tempPosArr = _this.getIndexArr();
+				        tempPosArr[index] = _this.getIndex(_this.curDistance[index]);
+			        	_this.checkRange(index, tempPosArr);
+			        }
+
+	    			break;
+
+	    		case "touchmove":
+			        event.preventDefault();
+			        _this.moveY = event.touches[0].clientY;
+			        _this.offset = _this.moveY - _this.oldMoveY;
+
+			        _this.updateCurDistance(theSlider, index);
+			        _this.curDistance[index] = _this.curDistance[index] + _this.offset;
+			        _this.movePosition(theSlider, _this.curDistance[index]);
+			        _this.oldMoveY = _this.moveY;
+	    			break;
+	    	}
+	    },
+
+	    dragClick: function(event, theSlider, index){
+	    	var _this = this;
+	    	event = event || window.event;
+	    	switch(event.type){
+	    		case "mousedown":
+			        _this.startY = event.clientY;
+			        _this.oldMoveY = _this.startY;
+			        _this.clickStatus = true;
+	    			break;
+
+	    		case "mouseup":
+
+			        _this.moveEndY = event.clientY;
+			        _this.offsetSum = _this.moveEndY - _this.startY;
+
+					//修正位置
+			        _this.updateCurDistance(theSlider, index);
+			        _this.curDistance[index] = _this.fixPosition(_this.curDistance[index]);
+			        _this.movePosition(theSlider, _this.curDistance[index]);
+			        _this.oversizeBorder = -(theSlider.getElementsByTagName('li').length-3)*_this.liHeight; 
+
+
+			        //反弹
+			        if(_this.curDistance[index] + _this.offsetSum > 2*_this.liHeight){
+			            _this.curDistance[index] = 2*_this.liHeight;
+			            setTimeout(function(){
+			                _this.movePosition(theSlider, _this.curDistance[index]);
+			            }, 100);
+
+			        }else if(_this.curDistance[index] + _this.offsetSum < _this.oversizeBorder){
+			            _this.curDistance[index] = _this.oversizeBorder;
+			            setTimeout(function(){
+			                _this.movePosition(theSlider, _this.curDistance[index]);
+			            }, 100);
+			        }
+
+			        _this.clickStatus = false;
+			        _this.transitionEnd(_this.getIndexArr(),_this.getValue());
+			        if(_this.cascade){
+				        var tempPosArr = _this.getIndexArr();
+				        tempPosArr[index] = _this.getIndex(_this.curDistance[index]);
+			        	_this.checkRange(index, tempPosArr);
+			        }
+	    			break;
+
+	    		case "mousemove":
+			        event.preventDefault();
+			        if(_this.clickStatus){
+				        _this.moveY = event.clientY;
+				        _this.offset = _this.moveY - _this.oldMoveY;
+				        _this.updateCurDistance(theSlider, index);
+				        _this.curDistance[index] = _this.curDistance[index] + _this.offset;
+				        _this.movePosition(theSlider, _this.curDistance[index]);
+				        _this.oldMoveY = _this.moveY;
+			        }
+	    			break;
+	    	}
+	    },
+
+	    singleClick: function(theLi, index, sliderIndex){
+	    	var _this = this;
+	        if(_this.cascade){
+		        var tempPosArr = _this.getIndexArr();
+		        tempPosArr[sliderIndex] = index;
+	        	_this.checkRange(sliderIndex, tempPosArr);
+
+	        }else{
+		        _this.curDistance[sliderIndex] = (2-index)*_this.liHeight;
+		        _this.movePosition(theLi.parentNode, _this.curDistance[sliderIndex]);
+	        }
+	    }
+
+	};
+
+	if (typeof exports == "object") {
+		module.exports = MobileSelect;
+	} else if (typeof define == "function" && define.amd) {
+		define([], function () {
+			return MobileSelect;
+		})
+	} else {
+		window.MobileSelect = MobileSelect;
+	}
+})();
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/nicescroll.min.js b/pluss-wap-page/src/main/resources/static/resources/js/nicescroll.min.js
new file mode 100644
index 0000000..c3f8cbb
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/nicescroll.min.js
@@ -0,0 +1,334 @@
+/* jquery.nicescroll v3.7.6 InuYaksa - MIT - https://nicescroll.areaaperta.com */
+!function(e){"function"==typeof define&&define.amd?define(["jquery"],e):"object"==typeof exports?module.exports=e(require("jquery")):e(jQuery)}(function(e){"use strict"
+function o(){var e=c.currentScript||function(){var e=c.getElementsByTagName("script")
+return e.length?e[e.length-1]:!1}(),o=e?e.src.split("?")[0]:""
+return o.split("/").length>0?o.split("/").slice(0,-1).join("/")+"/":""}function t(e,o,t){for(var r=0,i=o.length;i>r;r++)t(e,o[r])}var r=!1,i=!1,s=0,n=2e3,l=0,a=e,c=document,d=window,u=a(d),h=[],p=d.requestAnimationFrame||d.webkitRequestAnimationFrame||d.mozRequestAnimationFrame||!1,m=d.cancelAnimationFrame||d.webkitCancelAnimationFrame||d.mozCancelAnimationFrame||!1
+if(p)d.cancelAnimationFrame||(m=function(e){})
+else{var f=0
+p=function(e,o){var t=(new Date).getTime(),r=Math.max(0,16-(t-f)),i=d.setTimeout(function(){e(t+r)},r)
+return f=t+r,i},m=function(e){d.clearTimeout(e)}}var g=d.MutationObserver||d.WebKitMutationObserver||!1,v=Date.now||function(){return(new Date).getTime()},w={zindex:"auto",cursoropacitymin:0,cursoropacitymax:1,cursorcolor:"#424242",cursorwidth:"6px",cursorborder:"1px solid #fff",cursorborderradius:"5px",scrollspeed:40,mousescrollstep:27,touchbehavior:!1,emulatetouch:!1,hwacceleration:!0,usetransition:!0,boxzoom:!1,dblclickzoom:!0,gesturezoom:!0,grabcursorenabled:!0,autohidemode:!0,background:"",iframeautoresize:!0,cursorminheight:32,preservenativescrolling:!0,railoffset:!1,railhoffset:!1,bouncescroll:!0,spacebarenabled:!0,railpadding:{top:0,right:0,left:0,bottom:0},disableoutline:!0,horizrailenabled:!0,railalign:"right",railvalign:"bottom",enabletranslate3d:!0,enablemousewheel:!0,enablekeyboard:!0,smoothscroll:!0,sensitiverail:!0,enablemouselockapi:!0,cursorfixedheight:!1,directionlockdeadzone:6,hidecursordelay:400,nativeparentscrolling:!0,enablescrollonselection:!0,overflowx:!0,overflowy:!0,cursordragspeed:.3,rtlmode:"auto",cursordragontouch:!1,oneaxismousemode:"auto",scriptpath:o(),preventmultitouchscrolling:!0,disablemutationobserver:!1,enableobserver:!0,scrollbarid:!1},b=!1,y=function(){function e(){var e=["grab","-webkit-grab","-moz-grab"];(s.ischrome&&!s.ischrome38||s.isie)&&(e=[])
+for(var o=0,r=e.length;r>o;o++){var i=e[o]
+if(t.cursor=i,t.cursor==i)return i}return"url(https://cdnjs.cloudflare.com/ajax/libs/slider-pro/1.3.0/css/images/openhand.cur),n-resize"}if(b)return b
+var o=c.createElement("DIV"),t=o.style,r=navigator.userAgent,i=navigator.platform,s={}
+return s.haspointerlock="pointerLockElement"in c||"webkitPointerLockElement"in c||"mozPointerLockElement"in c,s.isopera="opera"in d,s.isopera12=s.isopera&&"getUserMedia"in navigator,s.isoperamini="[object OperaMini]"===Object.prototype.toString.call(d.operamini),s.isie="all"in c&&"attachEvent"in o&&!s.isopera,s.isieold=s.isie&&!("msInterpolationMode"in t),s.isie7=s.isie&&!s.isieold&&(!("documentMode"in c)||7===c.documentMode),s.isie8=s.isie&&"documentMode"in c&&8===c.documentMode,s.isie9=s.isie&&"performance"in d&&9===c.documentMode,s.isie10=s.isie&&"performance"in d&&10===c.documentMode,s.isie11="msRequestFullscreen"in o&&c.documentMode>=11,s.ismsedge="msCredentials"in d,s.ismozilla="MozAppearance"in t,s.iswebkit=!s.ismsedge&&"WebkitAppearance"in t,s.ischrome=s.iswebkit&&"chrome"in d,s.ischrome38=s.ischrome&&"touchAction"in t,s.ischrome22=!s.ischrome38&&s.ischrome&&s.haspointerlock,s.ischrome26=!s.ischrome38&&s.ischrome&&"transition"in t,s.cantouch="ontouchstart"in c.documentElement||"ontouchstart"in d,s.hasw3ctouch=(d.PointerEvent||!1)&&(navigator.maxTouchPoints>0||navigator.msMaxTouchPoints>0),s.hasmstouch=!s.hasw3ctouch&&(d.MSPointerEvent||!1),s.ismac=/^mac$/i.test(i),s.isios=s.cantouch&&/iphone|ipad|ipod/i.test(i),s.isios4=s.isios&&!("seal"in Object),s.isios7=s.isios&&"webkitHidden"in c,s.isios8=s.isios&&"hidden"in c,s.isios10=s.isios&&d.Proxy,s.isandroid=/android/i.test(r),s.haseventlistener="addEventListener"in o,s.trstyle=!1,s.hastransform=!1,s.hastranslate3d=!1,s.transitionstyle=!1,s.hastransition=!1,s.transitionend=!1,s.trstyle="transform",s.hastransform="transform"in t||function(){for(var e=["msTransform","webkitTransform","MozTransform","OTransform"],o=0,r=e.length;r>o;o++)if(void 0!==t[e[o]]){s.trstyle=e[o]
+break}s.hastransform=!!s.trstyle}(),s.hastransform&&(t[s.trstyle]="translate3d(1px,2px,3px)",s.hastranslate3d=/translate3d/.test(t[s.trstyle])),s.transitionstyle="transition",s.prefixstyle="",s.transitionend="transitionend",s.hastransition="transition"in t||function(){s.transitionend=!1
+for(var e=["webkitTransition","msTransition","MozTransition","OTransition","OTransition","KhtmlTransition"],o=["-webkit-","-ms-","-moz-","-o-","-o","-khtml-"],r=["webkitTransitionEnd","msTransitionEnd","transitionend","otransitionend","oTransitionEnd","KhtmlTransitionEnd"],i=0,n=e.length;n>i;i++)if(e[i]in t){s.transitionstyle=e[i],s.prefixstyle=o[i],s.transitionend=r[i]
+break}s.ischrome26&&(s.prefixstyle=o[1]),s.hastransition=s.transitionstyle}(),s.cursorgrabvalue=e(),s.hasmousecapture="setCapture"in o,s.hasMutationObserver=g!==!1,o=null,b=s,s},x=function(e,o){function t(){var e=T.doc.css(P.trstyle)
+return e&&"matrix"==e.substr(0,6)?e.replace(/^.*\((.*)\)$/g,"$1").replace(/px/g,"").split(/, +/):!1}function f(){var e=T.win
+if("zIndex"in e)return e.zIndex()
+for(;e.length>0;){if(9==e[0].nodeType)return!1
+var o=e.css("zIndex")
+if(!isNaN(o)&&0!==o)return parseInt(o)
+e=e.parent()}return!1}function b(e,o,t){var r=e.css(o),i=parseFloat(r)
+if(isNaN(i)){i=I[r]||0
+var s=3==i?t?T.win.outerHeight()-T.win.innerHeight():T.win.outerWidth()-T.win.innerWidth():1
+return T.isie8&&i&&(i+=1),s?i:0}return i}function x(e,o,t,r){T._bind(e,o,function(r){r=r||d.event
+var i={original:r,target:r.target||r.srcElement,type:"wheel",deltaMode:"MozMousePixelScroll"==r.type?0:1,deltaX:0,deltaZ:0,preventDefault:function(){return r.preventDefault?r.preventDefault():r.returnValue=!1,!1},stopImmediatePropagation:function(){r.stopImmediatePropagation?r.stopImmediatePropagation():r.cancelBubble=!0}}
+return"mousewheel"==o?(r.wheelDeltaX&&(i.deltaX=-1/40*r.wheelDeltaX),r.wheelDeltaY&&(i.deltaY=-1/40*r.wheelDeltaY),!i.deltaY&&!i.deltaX&&(i.deltaY=-1/40*r.wheelDelta)):i.deltaY=r.detail,t.call(e,i)},r)}function z(e,o,t,r){T.scrollrunning||(T.newscrolly=T.getScrollTop(),T.newscrollx=T.getScrollLeft(),A=v())
+var i=v()-A
+if(A=v(),i>350?q=1:q+=(2-q)/10,e=e*q|0,o=o*q|0,e){if(r)if(0>e){if(T.getScrollLeft()>=T.page.maxw)return!0}else if(T.getScrollLeft()<=0)return!0
+var s=e>0?1:-1
+D!==s&&(T.scrollmom&&T.scrollmom.stop(),T.newscrollx=T.getScrollLeft(),D=s),T.lastdeltax-=e}if(o){var n=function(){var e=T.getScrollTop()
+if(0>o){if(e>=T.page.maxh)return!0}else if(0>=e)return!0}()
+if(n){if(M.nativeparentscrolling&&t&&!T.ispage&&!T.zoomactive)return!0
+var l=T.view.h>>1
+T.newscrolly<-l?(T.newscrolly=-l,o=-1):T.newscrolly>T.page.maxh+l?(T.newscrolly=T.page.maxh+l,o=1):o=0}var a=o>0?1:-1
+X!==a&&(T.scrollmom&&T.scrollmom.stop(),T.newscrolly=T.getScrollTop(),X=a),T.lastdeltay-=o}(o||e)&&T.synched("relativexy",function(){var e=T.lastdeltay+T.newscrolly
+T.lastdeltay=0
+var o=T.lastdeltax+T.newscrollx
+T.lastdeltax=0,T.rail.drag||T.doScrollPos(o,e)})}function k(e,o,t){var r,i
+if(!t&&j)return!0
+if(0===e.deltaMode?(r=0|-(e.deltaX*(M.mousescrollstep/54)),i=0|-(e.deltaY*(M.mousescrollstep/54))):1===e.deltaMode&&(r=0|-(e.deltaX*M.mousescrollstep*50/80),i=0|-(e.deltaY*M.mousescrollstep*50/80)),o&&M.oneaxismousemode&&0===r&&i&&(r=i,i=0,t)){var s=0>r?T.getScrollLeft()>=T.page.maxw:T.getScrollLeft()<=0
+s&&(i=r,r=0)}T.isrtlmode&&(r=-r)
+var n=z(r,i,t,!0)
+return n?void(t&&(j=!0)):(j=!1,e.stopImmediatePropagation(),e.preventDefault())}var T=this
+this.version="3.7.6",this.name="nicescroll",this.me=o
+var E=a("body"),M=this.opt={doc:E,win:!1}
+if(a.extend(M,w),M.snapbackspeed=80,e)for(var L in M)void 0!==e[L]&&(M[L]=e[L])
+if(M.disablemutationobserver&&(g=!1),this.doc=M.doc,this.iddoc=this.doc&&this.doc[0]?this.doc[0].id||"":"",this.ispage=/^BODY|HTML/.test(M.win?M.win[0].nodeName:this.doc[0].nodeName),this.haswrapper=M.win!==!1,this.win=M.win||(this.ispage?u:this.doc),this.docscroll=this.ispage&&!this.haswrapper?u:this.win,this.body=E,this.viewport=!1,this.isfixed=!1,this.iframe=!1,this.isiframe="IFRAME"==this.doc[0].nodeName&&"IFRAME"==this.win[0].nodeName,this.istextarea="TEXTAREA"==this.win[0].nodeName,this.forcescreen=!1,this.canshowonmouseevent="scroll"!=M.autohidemode,this.onmousedown=!1,this.onmouseup=!1,this.onmousemove=!1,this.onmousewheel=!1,this.onkeypress=!1,this.ongesturezoom=!1,this.onclick=!1,this.onscrollstart=!1,this.onscrollend=!1,this.onscrollcancel=!1,this.onzoomin=!1,this.onzoomout=!1,this.view=!1,this.page=!1,this.scroll={x:0,y:0},this.scrollratio={x:0,y:0},this.cursorheight=20,this.scrollvaluemax=0,"auto"==M.rtlmode){var C=this.win[0]==d?this.body:this.win,N=C.css("writing-mode")||C.css("-webkit-writing-mode")||C.css("-ms-writing-mode")||C.css("-moz-writing-mode")
+"horizontal-tb"==N||"lr-tb"==N||""===N?(this.isrtlmode="rtl"==C.css("direction"),this.isvertical=!1):(this.isrtlmode="vertical-rl"==N||"tb"==N||"tb-rl"==N||"rl-tb"==N,this.isvertical="vertical-rl"==N||"tb"==N||"tb-rl"==N)}else this.isrtlmode=M.rtlmode===!0,this.isvertical=!1
+if(this.scrollrunning=!1,this.scrollmom=!1,this.observer=!1,this.observerremover=!1,this.observerbody=!1,M.scrollbarid!==!1)this.id=M.scrollbarid
+else do this.id="ascrail"+n++
+while(c.getElementById(this.id))
+this.rail=!1,this.cursor=!1,this.cursorfreezed=!1,this.selectiondrag=!1,this.zoom=!1,this.zoomactive=!1,this.hasfocus=!1,this.hasmousefocus=!1,this.railslocked=!1,this.locked=!1,this.hidden=!1,this.cursoractive=!0,this.wheelprevented=!1,this.overflowx=M.overflowx,this.overflowy=M.overflowy,this.nativescrollingarea=!1,this.checkarea=0,this.events=[],this.saved={},this.delaylist={},this.synclist={},this.lastdeltax=0,this.lastdeltay=0,this.detected=y()
+var P=a.extend({},this.detected)
+this.canhwscroll=P.hastransform&&M.hwacceleration,this.ishwscroll=this.canhwscroll&&T.haswrapper,this.isrtlmode?this.isvertical?this.hasreversehr=!(P.iswebkit||P.isie||P.isie11):this.hasreversehr=!(P.iswebkit||P.isie&&!P.isie10&&!P.isie11):this.hasreversehr=!1,this.istouchcapable=!1,P.cantouch||!P.hasw3ctouch&&!P.hasmstouch?!P.cantouch||P.isios||P.isandroid||!P.iswebkit&&!P.ismozilla||(this.istouchcapable=!0):this.istouchcapable=!0,M.enablemouselockapi||(P.hasmousecapture=!1,P.haspointerlock=!1),this.debounced=function(e,o,t){if(T){var r=T.delaylist[e]||!1
+r||(T.delaylist[e]={h:p(function(){T.delaylist[e].fn.call(T),T.delaylist[e]=!1},t)},o.call(T)),T.delaylist[e].fn=o}},this.synched=function(e,o){T.synclist[e]?T.synclist[e]=o:(T.synclist[e]=o,p(function(){T&&(T.synclist[e]&&T.synclist[e].call(T),T.synclist[e]=null)}))},this.unsynched=function(e){T.synclist[e]&&(T.synclist[e]=!1)},this.css=function(e,o){for(var t in o)T.saved.css.push([e,t,e.css(t)]),e.css(t,o[t])},this.scrollTop=function(e){return void 0===e?T.getScrollTop():T.setScrollTop(e)},this.scrollLeft=function(e){return void 0===e?T.getScrollLeft():T.setScrollLeft(e)}
+var R=function(e,o,t,r,i,s,n){this.st=e,this.ed=o,this.spd=t,this.p1=r||0,this.p2=i||1,this.p3=s||0,this.p4=n||1,this.ts=v(),this.df=o-e}
+if(R.prototype={B2:function(e){return 3*(1-e)*(1-e)*e},B3:function(e){return 3*(1-e)*e*e},B4:function(e){return e*e*e},getPos:function(){return(v()-this.ts)/this.spd},getNow:function(){var e=(v()-this.ts)/this.spd,o=this.B2(e)+this.B3(e)+this.B4(e)
+return e>=1?this.ed:this.st+this.df*o|0},update:function(e,o){return this.st=this.getNow(),this.ed=e,this.spd=o,this.ts=v(),this.df=this.ed-this.st,this}},this.ishwscroll){this.doc.translate={x:0,y:0,tx:"0px",ty:"0px"},P.hastranslate3d&&P.isios&&this.doc.css("-webkit-backface-visibility","hidden"),this.getScrollTop=function(e){if(!e){var o=t()
+if(o)return 16==o.length?-o[13]:-o[5]
+if(T.timerscroll&&T.timerscroll.bz)return T.timerscroll.bz.getNow()}return T.doc.translate.y},this.getScrollLeft=function(e){if(!e){var o=t()
+if(o)return 16==o.length?-o[12]:-o[4]
+if(T.timerscroll&&T.timerscroll.bh)return T.timerscroll.bh.getNow()}return T.doc.translate.x},this.notifyScrollEvent=function(e){var o=c.createEvent("UIEvents")
+o.initUIEvent("scroll",!1,!1,d,1),o.niceevent=!0,e.dispatchEvent(o)}
+var _=this.isrtlmode?1:-1
+P.hastranslate3d&&M.enabletranslate3d?(this.setScrollTop=function(e,o){T.doc.translate.y=e,T.doc.translate.ty=-1*e+"px",T.doc.css(P.trstyle,"translate3d("+T.doc.translate.tx+","+T.doc.translate.ty+",0)"),o||T.notifyScrollEvent(T.win[0])},this.setScrollLeft=function(e,o){T.doc.translate.x=e,T.doc.translate.tx=e*_+"px",T.doc.css(P.trstyle,"translate3d("+T.doc.translate.tx+","+T.doc.translate.ty+",0)"),o||T.notifyScrollEvent(T.win[0])}):(this.setScrollTop=function(e,o){T.doc.translate.y=e,T.doc.translate.ty=-1*e+"px",T.doc.css(P.trstyle,"translate("+T.doc.translate.tx+","+T.doc.translate.ty+")"),o||T.notifyScrollEvent(T.win[0])},this.setScrollLeft=function(e,o){T.doc.translate.x=e,T.doc.translate.tx=e*_+"px",T.doc.css(P.trstyle,"translate("+T.doc.translate.tx+","+T.doc.translate.ty+")"),o||T.notifyScrollEvent(T.win[0])})}else this.getScrollTop=function(){return T.docscroll.scrollTop()},this.setScrollTop=function(e){T.docscroll.scrollTop(e)},this.getScrollLeft=function(){var e
+return e=T.hasreversehr?T.detected.ismozilla?T.page.maxw-Math.abs(T.docscroll.scrollLeft()):T.page.maxw-T.docscroll.scrollLeft():T.docscroll.scrollLeft()},this.setScrollLeft=function(e){return setTimeout(function(){return T?(T.hasreversehr&&(e=T.detected.ismozilla?-(T.page.maxw-e):T.page.maxw-e),T.docscroll.scrollLeft(e)):void 0},1)}
+this.getTarget=function(e){return e?e.target?e.target:e.srcElement?e.srcElement:!1:!1},this.hasParent=function(e,o){if(!e)return!1
+for(var t=e.target||e.srcElement||e||!1;t&&t.id!=o;)t=t.parentNode||!1
+return t!==!1}
+var I={thin:1,medium:3,thick:5}
+this.getDocumentScrollOffset=function(){return{top:d.pageYOffset||c.documentElement.scrollTop,left:d.pageXOffset||c.documentElement.scrollLeft}},this.getOffset=function(){if(T.isfixed){var e=T.win.offset(),o=T.getDocumentScrollOffset()
+return e.top-=o.top,e.left-=o.left,e}var t=T.win.offset()
+if(!T.viewport)return t
+var r=T.viewport.offset()
+return{top:t.top-r.top,left:t.left-r.left}},this.updateScrollBar=function(e){var o,t
+if(T.ishwscroll)T.rail.css({height:T.win.innerHeight()-(M.railpadding.top+M.railpadding.bottom)}),T.railh&&T.railh.css({width:T.win.innerWidth()-(M.railpadding.left+M.railpadding.right)})
+else{var r=T.getOffset()
+if(o={top:r.top,left:r.left-(M.railpadding.left+M.railpadding.right)},o.top+=b(T.win,"border-top-width",!0),o.left+=T.rail.align?T.win.outerWidth()-b(T.win,"border-right-width")-T.rail.width:b(T.win,"border-left-width"),t=M.railoffset,t&&(t.top&&(o.top+=t.top),t.left&&(o.left+=t.left)),T.railslocked||T.rail.css({top:o.top,left:o.left,height:(e?e.h:T.win.innerHeight())-(M.railpadding.top+M.railpadding.bottom)}),T.zoom&&T.zoom.css({top:o.top+1,left:1==T.rail.align?o.left-20:o.left+T.rail.width+4}),T.railh&&!T.railslocked){o={top:r.top,left:r.left},t=M.railhoffset,t&&(t.top&&(o.top+=t.top),t.left&&(o.left+=t.left))
+var i=T.railh.align?o.top+b(T.win,"border-top-width",!0)+T.win.innerHeight()-T.railh.height:o.top+b(T.win,"border-top-width",!0),s=o.left+b(T.win,"border-left-width")
+T.railh.css({top:i-(M.railpadding.top+M.railpadding.bottom),left:s,width:T.railh.width})}}},this.doRailClick=function(e,o,t){var r,i,s,n
+T.railslocked||(T.cancelEvent(e),"pageY"in e||(e.pageX=e.clientX+c.documentElement.scrollLeft,e.pageY=e.clientY+c.documentElement.scrollTop),o?(r=t?T.doScrollLeft:T.doScrollTop,s=t?(e.pageX-T.railh.offset().left-T.cursorwidth/2)*T.scrollratio.x:(e.pageY-T.rail.offset().top-T.cursorheight/2)*T.scrollratio.y,T.unsynched("relativexy"),r(0|s)):(r=t?T.doScrollLeftBy:T.doScrollBy,s=t?T.scroll.x:T.scroll.y,n=t?e.pageX-T.railh.offset().left:e.pageY-T.rail.offset().top,i=t?T.view.w:T.view.h,r(s>=n?i:-i)))},T.newscrolly=T.newscrollx=0,T.hasanimationframe="requestAnimationFrame"in d,T.hascancelanimationframe="cancelAnimationFrame"in d,T.hasborderbox=!1,this.init=function(){if(T.saved.css=[],P.isoperamini)return!0
+if(P.isandroid&&!("hidden"in c))return!0
+M.emulatetouch=M.emulatetouch||M.touchbehavior,T.hasborderbox=d.getComputedStyle&&"border-box"===d.getComputedStyle(c.body)["box-sizing"]
+var e={"overflow-y":"hidden"}
+if((P.isie11||P.isie10)&&(e["-ms-overflow-style"]="none"),T.ishwscroll&&(this.doc.css(P.transitionstyle,P.prefixstyle+"transform 0ms ease-out"),P.transitionend&&T.bind(T.doc,P.transitionend,T.onScrollTransitionEnd,!1)),T.zindex="auto",T.ispage||"auto"!=M.zindex?T.zindex=M.zindex:T.zindex=f()||"auto",!T.ispage&&"auto"!=T.zindex&&T.zindex>l&&(l=T.zindex),T.isie&&0===T.zindex&&"auto"==M.zindex&&(T.zindex="auto"),!T.ispage||!P.isieold){var o=T.docscroll
+T.ispage&&(o=T.haswrapper?T.win:T.doc),T.css(o,e),T.ispage&&(P.isie11||P.isie)&&T.css(a("html"),e),!P.isios||T.ispage||T.haswrapper||T.css(E,{"-webkit-overflow-scrolling":"touch"})
+var t=a(c.createElement("div"))
+t.css({position:"relative",top:0,"float":"right",width:M.cursorwidth,height:0,"background-color":M.cursorcolor,border:M.cursorborder,"background-clip":"padding-box","-webkit-border-radius":M.cursorborderradius,"-moz-border-radius":M.cursorborderradius,"border-radius":M.cursorborderradius}),t.addClass("nicescroll-cursors"),T.cursor=t
+var n=a(c.createElement("div"))
+n.attr("id",T.id),n.addClass("nicescroll-rails nicescroll-rails-vr")
+var h,p,m=["left","right","top","bottom"]
+for(var v in m)p=m[v],h=M.railpadding[p]||0,h&&n.css("padding-"+p,h+"px")
+n.append(t),n.width=Math.max(parseFloat(M.cursorwidth),t.outerWidth()),n.css({width:n.width+"px",zIndex:T.zindex,background:M.background,cursor:"default"}),n.visibility=!0,n.scrollable=!0,n.align="left"==M.railalign?0:1,T.rail=n,T.rail.drag=!1
+var w=!1
+!M.boxzoom||T.ispage||P.isieold||(w=c.createElement("div"),T.bind(w,"click",T.doZoom),T.bind(w,"mouseenter",function(){T.zoom.css("opacity",M.cursoropacitymax)}),T.bind(w,"mouseleave",function(){T.zoom.css("opacity",M.cursoropacitymin)}),T.zoom=a(w),T.zoom.css({cursor:"pointer",zIndex:T.zindex,backgroundImage:"url("+M.scriptpath+"zoomico.png)",height:18,width:18,backgroundPosition:"0 0"}),M.dblclickzoom&&T.bind(T.win,"dblclick",T.doZoom),P.cantouch&&M.gesturezoom&&(T.ongesturezoom=function(e){return e.scale>1.5&&T.doZoomIn(e),e.scale<.8&&T.doZoomOut(e),T.cancelEvent(e)},T.bind(T.win,"gestureend",T.ongesturezoom))),T.railh=!1
+var b
+if(M.horizrailenabled&&(T.css(o,{overflowX:"hidden"}),t=a(c.createElement("div")),t.css({position:"absolute",top:0,height:M.cursorwidth,width:0,backgroundColor:M.cursorcolor,border:M.cursorborder,backgroundClip:"padding-box","-webkit-border-radius":M.cursorborderradius,"-moz-border-radius":M.cursorborderradius,"border-radius":M.cursorborderradius}),P.isieold&&t.css("overflow","hidden"),t.addClass("nicescroll-cursors"),T.cursorh=t,b=a(c.createElement("div")),b.attr("id",T.id+"-hr"),b.addClass("nicescroll-rails nicescroll-rails-hr"),b.height=Math.max(parseFloat(M.cursorwidth),t.outerHeight()),b.css({height:b.height+"px",zIndex:T.zindex,background:M.background}),b.append(t),b.visibility=!0,b.scrollable=!0,b.align="top"==M.railvalign?0:1,T.railh=b,T.railh.drag=!1),T.ispage)n.css({position:"fixed",top:0,height:"100%"}),n.css(n.align?{right:0}:{left:0}),T.body.append(n),T.railh&&(b.css({position:"fixed",left:0,width:"100%"}),b.css(b.align?{bottom:0}:{top:0}),T.body.append(b))
+else{if(T.ishwscroll){"static"==T.win.css("position")&&T.css(T.win,{position:"relative"})
+var y="HTML"==T.win[0].nodeName?T.body:T.win
+a(y).scrollTop(0).scrollLeft(0),T.zoom&&(T.zoom.css({position:"absolute",top:1,right:0,"margin-right":n.width+4}),y.append(T.zoom)),n.css({position:"absolute",top:0}),n.css(n.align?{right:0}:{left:0}),y.append(n),b&&(b.css({position:"absolute",left:0,bottom:0}),b.css(b.align?{bottom:0}:{top:0}),y.append(b))}else{T.isfixed="fixed"==T.win.css("position")
+var x=T.isfixed?"fixed":"absolute"
+T.isfixed||(T.viewport=T.getViewport(T.win[0])),T.viewport&&(T.body=T.viewport,/fixed|absolute/.test(T.viewport.css("position"))||T.css(T.viewport,{position:"relative"})),n.css({position:x}),T.zoom&&T.zoom.css({position:x}),T.updateScrollBar(),T.body.append(n),T.zoom&&T.body.append(T.zoom),T.railh&&(b.css({position:x}),T.body.append(b))}P.isios&&T.css(T.win,{"-webkit-tap-highlight-color":"rgba(0,0,0,0)","-webkit-touch-callout":"none"}),M.disableoutline&&(P.isie&&T.win.attr("hideFocus","true"),P.iswebkit&&T.win.css("outline","none"))}if(M.autohidemode===!1?(T.autohidedom=!1,T.rail.css({opacity:M.cursoropacitymax}),T.railh&&T.railh.css({opacity:M.cursoropacitymax})):M.autohidemode===!0||"leave"===M.autohidemode?(T.autohidedom=a().add(T.rail),P.isie8&&(T.autohidedom=T.autohidedom.add(T.cursor)),T.railh&&(T.autohidedom=T.autohidedom.add(T.railh)),T.railh&&P.isie8&&(T.autohidedom=T.autohidedom.add(T.cursorh))):"scroll"==M.autohidemode?(T.autohidedom=a().add(T.rail),T.railh&&(T.autohidedom=T.autohidedom.add(T.railh))):"cursor"==M.autohidemode?(T.autohidedom=a().add(T.cursor),T.railh&&(T.autohidedom=T.autohidedom.add(T.cursorh))):"hidden"==M.autohidemode&&(T.autohidedom=!1,T.hide(),T.railslocked=!1),P.cantouch||T.istouchcapable||M.emulatetouch||P.hasmstouch){T.scrollmom=new S(T)
+T.ontouchstart=function(e){if(T.locked)return!1
+if(e.pointerType&&("mouse"===e.pointerType||e.pointerType===e.MSPOINTER_TYPE_MOUSE))return!1
+if(T.hasmoving=!1,T.scrollmom.timer&&(T.triggerScrollEnd(),T.scrollmom.stop()),!T.railslocked){var o=T.getTarget(e)
+if(o){var t=/INPUT/i.test(o.nodeName)&&/range/i.test(o.type)
+if(t)return T.stopPropagation(e)}var r="mousedown"===e.type
+if(!("clientX"in e)&&"changedTouches"in e&&(e.clientX=e.changedTouches[0].clientX,e.clientY=e.changedTouches[0].clientY),T.forcescreen){var i=e
+e={original:e.original?e.original:e},e.clientX=i.screenX,e.clientY=i.screenY}if(T.rail.drag={x:e.clientX,y:e.clientY,sx:T.scroll.x,sy:T.scroll.y,st:T.getScrollTop(),sl:T.getScrollLeft(),pt:2,dl:!1,tg:o},T.ispage||!M.directionlockdeadzone)T.rail.drag.dl="f"
+else{var s={w:u.width(),h:u.height()},n=T.getContentSize(),l=n.h-s.h,c=n.w-s.w
+T.rail.scrollable&&!T.railh.scrollable?T.rail.drag.ck=l>0?"v":!1:!T.rail.scrollable&&T.railh.scrollable?T.rail.drag.ck=c>0?"h":!1:T.rail.drag.ck=!1}if(M.emulatetouch&&T.isiframe&&P.isie){var d=T.win.position()
+T.rail.drag.x+=d.left,T.rail.drag.y+=d.top}if(T.hasmoving=!1,T.lastmouseup=!1,T.scrollmom.reset(e.clientX,e.clientY),o&&r){var h=/INPUT|SELECT|BUTTON|TEXTAREA/i.test(o.nodeName)
+if(!h)return P.hasmousecapture&&o.setCapture(),M.emulatetouch?(o.onclick&&!o._onclick&&(o._onclick=o.onclick,o.onclick=function(e){return T.hasmoving?!1:void o._onclick.call(this,e)}),T.cancelEvent(e)):T.stopPropagation(e);/SUBMIT|CANCEL|BUTTON/i.test(a(o).attr("type"))&&(T.preventclick={tg:o,click:!1})}}},T.ontouchend=function(e){if(!T.rail.drag)return!0
+if(2==T.rail.drag.pt){if(e.pointerType&&("mouse"===e.pointerType||e.pointerType===e.MSPOINTER_TYPE_MOUSE))return!1
+T.rail.drag=!1
+var o="mouseup"===e.type
+if(T.hasmoving&&(T.scrollmom.doMomentum(),T.lastmouseup=!0,T.hideCursor(),P.hasmousecapture&&c.releaseCapture(),o))return T.cancelEvent(e)}else if(1==T.rail.drag.pt)return T.onmouseup(e)}
+var z=M.emulatetouch&&T.isiframe&&!P.hasmousecapture,k=.3*M.directionlockdeadzone|0
+T.ontouchmove=function(e,o){if(!T.rail.drag)return!0
+if(e.targetTouches&&M.preventmultitouchscrolling&&e.targetTouches.length>1)return!0
+if(e.pointerType&&("mouse"===e.pointerType||e.pointerType===e.MSPOINTER_TYPE_MOUSE))return!0
+if(2==T.rail.drag.pt){"changedTouches"in e&&(e.clientX=e.changedTouches[0].clientX,e.clientY=e.changedTouches[0].clientY)
+var t,r
+if(r=t=0,z&&!o){var i=T.win.position()
+r=-i.left,t=-i.top}var s=e.clientY+t,n=s-T.rail.drag.y,l=e.clientX+r,a=l-T.rail.drag.x,d=T.rail.drag.st-n
+if(T.ishwscroll&&M.bouncescroll)0>d?d=Math.round(d/2):d>T.page.maxh&&(d=T.page.maxh+Math.round((d-T.page.maxh)/2))
+else if(0>d?(d=0,s=0):d>T.page.maxh&&(d=T.page.maxh,s=0),0===s&&!T.hasmoving)return T.ispage||(T.rail.drag=!1),!0
+var u=T.getScrollLeft()
+if(T.railh&&T.railh.scrollable&&(u=T.isrtlmode?a-T.rail.drag.sl:T.rail.drag.sl-a,T.ishwscroll&&M.bouncescroll?0>u?u=Math.round(u/2):u>T.page.maxw&&(u=T.page.maxw+Math.round((u-T.page.maxw)/2)):(0>u&&(u=0,l=0),u>T.page.maxw&&(u=T.page.maxw,l=0))),!T.hasmoving){if(T.rail.drag.y===e.clientY&&T.rail.drag.x===e.clientX)return T.cancelEvent(e)
+var h=Math.abs(n),p=Math.abs(a),m=M.directionlockdeadzone
+if(T.rail.drag.ck?"v"==T.rail.drag.ck?p>m&&k>=h?T.rail.drag=!1:h>m&&(T.rail.drag.dl="v"):"h"==T.rail.drag.ck&&(h>m&&k>=p?T.rail.drag=!1:p>m&&(T.rail.drag.dl="h")):h>m&&p>m?T.rail.drag.dl="f":h>m?T.rail.drag.dl=p>k?"f":"v":p>m&&(T.rail.drag.dl=h>k?"f":"h"),!T.rail.drag.dl)return T.cancelEvent(e)
+T.triggerScrollStart(e.clientX,e.clientY,0,0,0),T.hasmoving=!0}return T.preventclick&&!T.preventclick.click&&(T.preventclick.click=T.preventclick.tg.onclick||!1,T.preventclick.tg.onclick=T.onpreventclick),T.rail.drag.dl&&("v"==T.rail.drag.dl?u=T.rail.drag.sl:"h"==T.rail.drag.dl&&(d=T.rail.drag.st)),T.synched("touchmove",function(){T.rail.drag&&2==T.rail.drag.pt&&(T.prepareTransition&&T.resetTransition(),T.rail.scrollable&&T.setScrollTop(d),T.scrollmom.update(l,s),T.railh&&T.railh.scrollable?(T.setScrollLeft(u),T.showCursor(d,u)):T.showCursor(d),P.isie10&&c.selection.clear())}),T.cancelEvent(e)}return 1==T.rail.drag.pt?T.onmousemove(e):void 0},T.ontouchstartCursor=function(e,o){if(!T.rail.drag||3==T.rail.drag.pt){if(T.locked)return T.cancelEvent(e)
+T.cancelScroll(),T.rail.drag={x:e.touches[0].clientX,y:e.touches[0].clientY,sx:T.scroll.x,sy:T.scroll.y,pt:3,hr:!!o}
+var t=T.getTarget(e)
+return!T.ispage&&P.hasmousecapture&&t.setCapture(),T.isiframe&&!P.hasmousecapture&&(T.saved.csspointerevents=T.doc.css("pointer-events"),T.css(T.doc,{"pointer-events":"none"})),T.cancelEvent(e)}},T.ontouchendCursor=function(e){if(T.rail.drag){if(P.hasmousecapture&&c.releaseCapture(),T.isiframe&&!P.hasmousecapture&&T.doc.css("pointer-events",T.saved.csspointerevents),3!=T.rail.drag.pt)return
+return T.rail.drag=!1,T.cancelEvent(e)}},T.ontouchmoveCursor=function(e){if(T.rail.drag){if(3!=T.rail.drag.pt)return
+if(T.cursorfreezed=!0,T.rail.drag.hr){T.scroll.x=T.rail.drag.sx+(e.touches[0].clientX-T.rail.drag.x),T.scroll.x<0&&(T.scroll.x=0)
+var o=T.scrollvaluemaxw
+T.scroll.x>o&&(T.scroll.x=o)}else{T.scroll.y=T.rail.drag.sy+(e.touches[0].clientY-T.rail.drag.y),T.scroll.y<0&&(T.scroll.y=0)
+var t=T.scrollvaluemax
+T.scroll.y>t&&(T.scroll.y=t)}return T.synched("touchmove",function(){T.rail.drag&&3==T.rail.drag.pt&&(T.showCursor(),T.rail.drag.hr?T.doScrollLeft(Math.round(T.scroll.x*T.scrollratio.x),M.cursordragspeed):T.doScrollTop(Math.round(T.scroll.y*T.scrollratio.y),M.cursordragspeed))}),T.cancelEvent(e)}}}if(T.onmousedown=function(e,o){if(!T.rail.drag||1==T.rail.drag.pt){if(T.railslocked)return T.cancelEvent(e)
+T.cancelScroll(),T.rail.drag={x:e.clientX,y:e.clientY,sx:T.scroll.x,sy:T.scroll.y,pt:1,hr:o||!1}
+var t=T.getTarget(e)
+return P.hasmousecapture&&t.setCapture(),T.isiframe&&!P.hasmousecapture&&(T.saved.csspointerevents=T.doc.css("pointer-events"),T.css(T.doc,{"pointer-events":"none"})),T.hasmoving=!1,T.cancelEvent(e)}},T.onmouseup=function(e){return T.rail.drag?1!=T.rail.drag.pt?!0:(P.hasmousecapture&&c.releaseCapture(),T.isiframe&&!P.hasmousecapture&&T.doc.css("pointer-events",T.saved.csspointerevents),T.rail.drag=!1,T.cursorfreezed=!1,T.hasmoving&&T.triggerScrollEnd(),T.cancelEvent(e)):void 0},T.onmousemove=function(e){if(T.rail.drag){if(1!==T.rail.drag.pt)return
+if(P.ischrome&&0===e.which)return T.onmouseup(e)
+if(T.cursorfreezed=!0,T.hasmoving||T.triggerScrollStart(e.clientX,e.clientY,0,0,0),T.hasmoving=!0,T.rail.drag.hr){T.scroll.x=T.rail.drag.sx+(e.clientX-T.rail.drag.x),T.scroll.x<0&&(T.scroll.x=0)
+var o=T.scrollvaluemaxw
+T.scroll.x>o&&(T.scroll.x=o)}else{T.scroll.y=T.rail.drag.sy+(e.clientY-T.rail.drag.y),T.scroll.y<0&&(T.scroll.y=0)
+var t=T.scrollvaluemax
+T.scroll.y>t&&(T.scroll.y=t)}return T.synched("mousemove",function(){T.cursorfreezed&&(T.showCursor(),T.rail.drag.hr?T.scrollLeft(Math.round(T.scroll.x*T.scrollratio.x)):T.scrollTop(Math.round(T.scroll.y*T.scrollratio.y)))}),T.cancelEvent(e)}T.checkarea=0},P.cantouch||M.emulatetouch)T.onpreventclick=function(e){return T.preventclick?(T.preventclick.tg.onclick=T.preventclick.click,T.preventclick=!1,T.cancelEvent(e)):void 0},T.onclick=P.isios?!1:function(e){return T.lastmouseup?(T.lastmouseup=!1,T.cancelEvent(e)):!0},M.grabcursorenabled&&P.cursorgrabvalue&&(T.css(T.ispage?T.doc:T.win,{cursor:P.cursorgrabvalue}),T.css(T.rail,{cursor:P.cursorgrabvalue}))
+else{var L=function(e){if(T.selectiondrag){if(e){var o=T.win.outerHeight(),t=e.pageY-T.selectiondrag.top
+t>0&&o>t&&(t=0),t>=o&&(t-=o),T.selectiondrag.df=t}if(0!==T.selectiondrag.df){var r=0|-(2*T.selectiondrag.df/6)
+T.doScrollBy(r),T.debounced("doselectionscroll",function(){L()},50)}}}
+"getSelection"in c?T.hasTextSelected=function(){return c.getSelection().rangeCount>0}:"selection"in c?T.hasTextSelected=function(){return"None"!=c.selection.type}:T.hasTextSelected=function(){return!1},T.onselectionstart=function(e){T.ispage||(T.selectiondrag=T.win.offset())},T.onselectionend=function(e){T.selectiondrag=!1},T.onselectiondrag=function(e){T.selectiondrag&&T.hasTextSelected()&&T.debounced("selectionscroll",function(){L(e)},250)}}if(P.hasw3ctouch?(T.css(T.ispage?a("html"):T.win,{"touch-action":"none"}),T.css(T.rail,{"touch-action":"none"}),T.css(T.cursor,{"touch-action":"none"}),T.bind(T.win,"pointerdown",T.ontouchstart),T.bind(c,"pointerup",T.ontouchend),T.delegate(c,"pointermove",T.ontouchmove)):P.hasmstouch?(T.css(T.ispage?a("html"):T.win,{"-ms-touch-action":"none"}),T.css(T.rail,{"-ms-touch-action":"none"}),T.css(T.cursor,{"-ms-touch-action":"none"}),T.bind(T.win,"MSPointerDown",T.ontouchstart),T.bind(c,"MSPointerUp",T.ontouchend),T.delegate(c,"MSPointerMove",T.ontouchmove),T.bind(T.cursor,"MSGestureHold",function(e){e.preventDefault()}),T.bind(T.cursor,"contextmenu",function(e){e.preventDefault()})):P.cantouch&&(T.bind(T.win,"touchstart",T.ontouchstart,!1,!0),T.bind(c,"touchend",T.ontouchend,!1,!0),T.bind(c,"touchcancel",T.ontouchend,!1,!0),T.delegate(c,"touchmove",T.ontouchmove,!1,!0)),M.emulatetouch&&(T.bind(T.win,"mousedown",T.ontouchstart,!1,!0),T.bind(c,"mouseup",T.ontouchend,!1,!0),T.bind(c,"mousemove",T.ontouchmove,!1,!0)),(M.cursordragontouch||!P.cantouch&&!M.emulatetouch)&&(T.rail.css({cursor:"default"}),T.railh&&T.railh.css({cursor:"default"}),T.jqbind(T.rail,"mouseenter",function(){return T.ispage||T.win.is(":visible")?(T.canshowonmouseevent&&T.showCursor(),void(T.rail.active=!0)):!1}),T.jqbind(T.rail,"mouseleave",function(){T.rail.active=!1,T.rail.drag||T.hideCursor()}),M.sensitiverail&&(T.bind(T.rail,"click",function(e){T.doRailClick(e,!1,!1)}),T.bind(T.rail,"dblclick",function(e){T.doRailClick(e,!0,!1)}),T.bind(T.cursor,"click",function(e){T.cancelEvent(e)}),T.bind(T.cursor,"dblclick",function(e){T.cancelEvent(e)})),T.railh&&(T.jqbind(T.railh,"mouseenter",function(){return T.ispage||T.win.is(":visible")?(T.canshowonmouseevent&&T.showCursor(),void(T.rail.active=!0)):!1}),T.jqbind(T.railh,"mouseleave",function(){T.rail.active=!1,T.rail.drag||T.hideCursor()}),M.sensitiverail&&(T.bind(T.railh,"click",function(e){T.doRailClick(e,!1,!0)}),T.bind(T.railh,"dblclick",function(e){T.doRailClick(e,!0,!0)}),T.bind(T.cursorh,"click",function(e){T.cancelEvent(e)}),T.bind(T.cursorh,"dblclick",function(e){T.cancelEvent(e)})))),M.cursordragontouch&&(this.istouchcapable||P.cantouch)&&(T.bind(T.cursor,"touchstart",T.ontouchstartCursor),T.bind(T.cursor,"touchmove",T.ontouchmoveCursor),T.bind(T.cursor,"touchend",T.ontouchendCursor),T.cursorh&&T.bind(T.cursorh,"touchstart",function(e){T.ontouchstartCursor(e,!0)}),T.cursorh&&T.bind(T.cursorh,"touchmove",T.ontouchmoveCursor),T.cursorh&&T.bind(T.cursorh,"touchend",T.ontouchendCursor)),M.emulatetouch||P.isandroid||P.isios?(T.bind(P.hasmousecapture?T.win:c,"mouseup",T.ontouchend),T.onclick&&T.bind(c,"click",T.onclick),M.cursordragontouch?(T.bind(T.cursor,"mousedown",T.onmousedown),T.bind(T.cursor,"mouseup",T.onmouseup),T.cursorh&&T.bind(T.cursorh,"mousedown",function(e){T.onmousedown(e,!0)}),T.cursorh&&T.bind(T.cursorh,"mouseup",T.onmouseup)):(T.bind(T.rail,"mousedown",function(e){e.preventDefault()}),T.railh&&T.bind(T.railh,"mousedown",function(e){e.preventDefault()}))):(T.bind(P.hasmousecapture?T.win:c,"mouseup",T.onmouseup),T.bind(c,"mousemove",T.onmousemove),T.onclick&&T.bind(c,"click",T.onclick),T.bind(T.cursor,"mousedown",T.onmousedown),T.bind(T.cursor,"mouseup",T.onmouseup),T.railh&&(T.bind(T.cursorh,"mousedown",function(e){T.onmousedown(e,!0)}),T.bind(T.cursorh,"mouseup",T.onmouseup)),!T.ispage&&M.enablescrollonselection&&(T.bind(T.win[0],"mousedown",T.onselectionstart),T.bind(c,"mouseup",T.onselectionend),T.bind(T.cursor,"mouseup",T.onselectionend),T.cursorh&&T.bind(T.cursorh,"mouseup",T.onselectionend),T.bind(c,"mousemove",T.onselectiondrag)),T.zoom&&(T.jqbind(T.zoom,"mouseenter",function(){T.canshowonmouseevent&&T.showCursor(),T.rail.active=!0}),T.jqbind(T.zoom,"mouseleave",function(){T.rail.active=!1,T.rail.drag||T.hideCursor()}))),M.enablemousewheel&&(T.isiframe||T.mousewheel(P.isie&&T.ispage?c:T.win,T.onmousewheel),T.mousewheel(T.rail,T.onmousewheel),T.railh&&T.mousewheel(T.railh,T.onmousewheelhr)),T.ispage||P.cantouch||/HTML|^BODY/.test(T.win[0].nodeName)||(T.win.attr("tabindex")||T.win.attr({tabindex:++s}),T.bind(T.win,"focus",function(e){r=T.getTarget(e).id||T.getTarget(e)||!1,T.hasfocus=!0,T.canshowonmouseevent&&T.noticeCursor()}),T.bind(T.win,"blur",function(e){r=!1,T.hasfocus=!1}),T.bind(T.win,"mouseenter",function(e){i=T.getTarget(e).id||T.getTarget(e)||!1,T.hasmousefocus=!0,T.canshowonmouseevent&&T.noticeCursor()}),T.bind(T.win,"mouseleave",function(e){i=!1,T.hasmousefocus=!1,T.rail.drag||T.hideCursor()})),T.onkeypress=function(e){if(T.railslocked&&0===T.page.maxh)return!0
+e=e||d.event
+var o=T.getTarget(e)
+if(o&&/INPUT|TEXTAREA|SELECT|OPTION/.test(o.nodeName)){var t=o.getAttribute("type")||o.type||!1
+if(!t||!/submit|button|cancel/i.tp)return!0}if(a(o).attr("contenteditable"))return!0
+if(T.hasfocus||T.hasmousefocus&&!r||T.ispage&&!r&&!i){var s=e.keyCode
+if(T.railslocked&&27!=s)return T.cancelEvent(e)
+var n=e.ctrlKey||!1,l=e.shiftKey||!1,c=!1
+switch(s){case 38:case 63233:T.doScrollBy(72),c=!0
+break
+case 40:case 63235:T.doScrollBy(-72),c=!0
+break
+case 37:case 63232:T.railh&&(n?T.doScrollLeft(0):T.doScrollLeftBy(72),c=!0)
+break
+case 39:case 63234:T.railh&&(n?T.doScrollLeft(T.page.maxw):T.doScrollLeftBy(-72),c=!0)
+break
+case 33:case 63276:T.doScrollBy(T.view.h),c=!0
+break
+case 34:case 63277:T.doScrollBy(-T.view.h),c=!0
+break
+case 36:case 63273:T.railh&&n?T.doScrollPos(0,0):T.doScrollTo(0),c=!0
+break
+case 35:case 63275:T.railh&&n?T.doScrollPos(T.page.maxw,T.page.maxh):T.doScrollTo(T.page.maxh),c=!0
+break
+case 32:M.spacebarenabled&&(l?T.doScrollBy(T.view.h):T.doScrollBy(-T.view.h),c=!0)
+break
+case 27:T.zoomactive&&(T.doZoom(),c=!0)}if(c)return T.cancelEvent(e)}},M.enablekeyboard&&T.bind(c,P.isopera&&!P.isopera12?"keypress":"keydown",T.onkeypress),T.bind(c,"keydown",function(e){var o=e.ctrlKey||!1
+o&&(T.wheelprevented=!0)}),T.bind(c,"keyup",function(e){var o=e.ctrlKey||!1
+o||(T.wheelprevented=!1)}),T.bind(d,"blur",function(e){T.wheelprevented=!1}),T.bind(d,"resize",T.onscreenresize),T.bind(d,"orientationchange",T.onscreenresize),T.bind(d,"load",T.lazyResize),P.ischrome&&!T.ispage&&!T.haswrapper){var C=T.win.attr("style"),N=parseFloat(T.win.css("width"))+1
+T.win.css("width",N),T.synched("chromefix",function(){T.win.attr("style",C)})}if(T.onAttributeChange=function(e){T.lazyResize(T.isieold?250:30)},M.enableobserver&&(T.isie11||g===!1||(T.observerbody=new g(function(e){return e.forEach(function(e){return"attributes"==e.type?E.hasClass("modal-open")&&E.hasClass("modal-dialog")&&!a.contains(a(".modal-dialog")[0],T.doc[0])?T.hide():T.show():void 0}),T.me.clientWidth!=T.page.width||T.me.clientHeight!=T.page.height||document.body.scrollHeight!=T.page.maxh?T.lazyResize(30):void 0}),T.observerbody.observe(c.body,{childList:!0,subtree:!0,characterData:!1,attributes:!0,attributeFilter:["class"]})),!T.ispage&&!T.haswrapper)){var R=T.win[0]
+g!==!1?(T.observer=new g(function(e){e.forEach(T.onAttributeChange)}),T.observer.observe(R,{childList:!0,characterData:!1,attributes:!0,subtree:!1}),T.observerremover=new g(function(e){e.forEach(function(e){if(e.removedNodes.length>0)for(var o in e.removedNodes)if(T&&e.removedNodes[o]===R)return T.remove()})}),T.observerremover.observe(R.parentNode,{childList:!0,characterData:!1,attributes:!1,subtree:!1})):(T.bind(R,P.isie&&!P.isie9?"propertychange":"DOMAttrModified",T.onAttributeChange),P.isie9&&R.attachEvent("onpropertychange",T.onAttributeChange),T.bind(R,"DOMNodeRemoved",function(e){e.target===R&&T.remove()}))}!T.ispage&&M.boxzoom&&T.bind(d,"resize",T.resizeZoom),T.istextarea&&(T.bind(T.win,"keydown",T.lazyResize),T.bind(T.win,"mouseup",T.lazyResize)),T.lazyResize(30)}if("IFRAME"==this.doc[0].nodeName){var _=function(){T.iframexd=!1
+var o
+try{o="contentDocument"in this?this.contentDocument:this.contentWindow._doc
+o.domain}catch(t){T.iframexd=!0,o=!1}if(T.iframexd)return"console"in d&&console.log("NiceScroll error: policy restriced iframe"),!0
+if(T.forcescreen=!0,T.isiframe&&(T.iframe={doc:a(o),html:T.doc.contents().find("html")[0],body:T.doc.contents().find("body")[0]},T.getContentSize=function(){return{w:Math.max(T.iframe.html.scrollWidth,T.iframe.body.scrollWidth),h:Math.max(T.iframe.html.scrollHeight,T.iframe.body.scrollHeight)}},T.docscroll=a(T.iframe.body)),!P.isios&&M.iframeautoresize&&!T.isiframe){T.win.scrollTop(0),T.doc.height("")
+var r=Math.max(o.getElementsByTagName("html")[0].scrollHeight,o.body.scrollHeight)
+T.doc.height(r)}T.lazyResize(30),T.css(a(T.iframe.body),e),P.isios&&T.haswrapper&&T.css(a(o.body),{"-webkit-transform":"translate3d(0,0,0)"}),"contentWindow"in this?T.bind(this.contentWindow,"scroll",T.onscroll):T.bind(o,"scroll",T.onscroll),M.enablemousewheel&&T.mousewheel(o,T.onmousewheel),M.enablekeyboard&&T.bind(o,P.isopera?"keypress":"keydown",T.onkeypress),P.cantouch?(T.bind(o,"touchstart",T.ontouchstart),T.bind(o,"touchmove",T.ontouchmove)):M.emulatetouch&&(T.bind(o,"mousedown",T.ontouchstart),T.bind(o,"mousemove",function(e){return T.ontouchmove(e,!0)}),M.grabcursorenabled&&P.cursorgrabvalue&&T.css(a(o.body),{cursor:P.cursorgrabvalue})),T.bind(o,"mouseup",T.ontouchend),T.zoom&&(M.dblclickzoom&&T.bind(o,"dblclick",T.doZoom),T.ongesturezoom&&T.bind(o,"gestureend",T.ongesturezoom))}
+this.doc[0].readyState&&"complete"===this.doc[0].readyState&&setTimeout(function(){_.call(T.doc[0],!1)},500),T.bind(this.doc,"load",_)}},this.showCursor=function(e,o){if(T.cursortimeout&&(clearTimeout(T.cursortimeout),T.cursortimeout=0),T.rail){if(T.autohidedom&&(T.autohidedom.stop().css({opacity:M.cursoropacitymax}),T.cursoractive=!0),T.rail.drag&&1==T.rail.drag.pt||(void 0!==e&&e!==!1&&(T.scroll.y=e/T.scrollratio.y|0),void 0!==o&&(T.scroll.x=o/T.scrollratio.x|0)),T.cursor.css({height:T.cursorheight,top:T.scroll.y}),T.cursorh){var t=T.hasreversehr?T.scrollvaluemaxw-T.scroll.x:T.scroll.x
+T.cursorh.css({width:T.cursorwidth,left:!T.rail.align&&T.rail.visibility?t+T.rail.width:t}),T.cursoractive=!0}T.zoom&&T.zoom.stop().css({opacity:M.cursoropacitymax})}},this.hideCursor=function(e){T.cursortimeout||T.rail&&T.autohidedom&&(T.hasmousefocus&&"leave"===M.autohidemode||(T.cursortimeout=setTimeout(function(){T.rail.active&&T.showonmouseevent||(T.autohidedom.stop().animate({opacity:M.cursoropacitymin}),T.zoom&&T.zoom.stop().animate({opacity:M.cursoropacitymin}),T.cursoractive=!1),T.cursortimeout=0},e||M.hidecursordelay)))},this.noticeCursor=function(e,o,t){T.showCursor(o,t),T.rail.active||T.hideCursor(e)},this.getContentSize=T.ispage?function(){return{w:Math.max(c.body.scrollWidth,c.documentElement.scrollWidth),h:Math.max(c.body.scrollHeight,c.documentElement.scrollHeight)}}:T.haswrapper?function(){return{w:T.doc[0].offsetWidth,h:T.doc[0].offsetHeight}}:function(){return{w:T.docscroll[0].scrollWidth,h:T.docscroll[0].scrollHeight}},this.onResize=function(e,o){if(!T||!T.win)return!1
+var t=T.page.maxh,r=T.page.maxw,i=T.view.h,s=T.view.w
+if(T.view={w:T.ispage?T.win.width():T.win[0].clientWidth,h:T.ispage?T.win.height():T.win[0].clientHeight},T.page=o?o:T.getContentSize(),T.page.maxh=Math.max(0,T.page.h-T.view.h),T.page.maxw=Math.max(0,T.page.w-T.view.w),T.page.maxh==t&&T.page.maxw==r&&T.view.w==s&&T.view.h==i){if(T.ispage)return T
+var n=T.win.offset()
+if(T.lastposition){var l=T.lastposition
+if(l.top==n.top&&l.left==n.left)return T}T.lastposition=n}if(0===T.page.maxh?(T.hideRail(),T.scrollvaluemax=0,T.scroll.y=0,T.scrollratio.y=0,T.cursorheight=0,T.setScrollTop(0),T.rail&&(T.rail.scrollable=!1)):(T.page.maxh-=M.railpadding.top+M.railpadding.bottom,T.rail.scrollable=!0),0===T.page.maxw?(T.hideRailHr(),T.scrollvaluemaxw=0,T.scroll.x=0,T.scrollratio.x=0,T.cursorwidth=0,T.setScrollLeft(0),T.railh&&(T.railh.scrollable=!1)):(T.page.maxw-=M.railpadding.left+M.railpadding.right,T.railh&&(T.railh.scrollable=M.horizrailenabled)),T.railslocked=T.locked||0===T.page.maxh&&0===T.page.maxw,T.railslocked)return T.ispage||T.updateScrollBar(T.view),!1
+T.hidden||(T.rail.visibility||T.showRail(),T.railh&&!T.railh.visibility&&T.showRailHr()),T.istextarea&&T.win.css("resize")&&"none"!=T.win.css("resize")&&(T.view.h-=20),T.cursorheight=Math.min(T.view.h,Math.round(T.view.h*(T.view.h/T.page.h))),T.cursorheight=M.cursorfixedheight?M.cursorfixedheight:Math.max(M.cursorminheight,T.cursorheight),T.cursorwidth=Math.min(T.view.w,Math.round(T.view.w*(T.view.w/T.page.w))),T.cursorwidth=M.cursorfixedheight?M.cursorfixedheight:Math.max(M.cursorminheight,T.cursorwidth),T.scrollvaluemax=T.view.h-T.cursorheight-(M.railpadding.top+M.railpadding.bottom),T.hasborderbox||(T.scrollvaluemax-=T.cursor[0].offsetHeight-T.cursor[0].clientHeight),T.railh&&(T.railh.width=T.page.maxh>0?T.view.w-T.rail.width:T.view.w,T.scrollvaluemaxw=T.railh.width-T.cursorwidth-(M.railpadding.left+M.railpadding.right)),T.ispage||T.updateScrollBar(T.view),T.scrollratio={x:T.page.maxw/T.scrollvaluemaxw,y:T.page.maxh/T.scrollvaluemax}
+var a=T.getScrollTop()
+return a>T.page.maxh?T.doScrollTop(T.page.maxh):(T.scroll.y=T.getScrollTop()/T.scrollratio.y|0,T.scroll.x=T.getScrollLeft()/T.scrollratio.x|0,T.cursoractive&&T.noticeCursor()),T.scroll.y&&0===T.getScrollTop()&&T.doScrollTo(T.scroll.y*T.scrollratio.y|0),T},this.resize=T.onResize
+var O=0
+this.onscreenresize=function(e){clearTimeout(O)
+var o=!T.ispage&&!T.haswrapper
+o&&T.hideRails(),O=setTimeout(function(){T&&(o&&T.showRails(),T.resize()),O=0},120)},this.lazyResize=function(e){return clearTimeout(O),e=isNaN(e)?240:e,O=setTimeout(function(){T&&T.resize(),O=0},e),T},this.jqbind=function(e,o,t){T.events.push({e:e,n:o,f:t,q:!0}),a(e).on(o,t)},this.mousewheel=function(e,o,t){var r="jquery"in e?e[0]:e
+if("onwheel"in c.createElement("div"))T._bind(r,"wheel",o,t||!1)
+else{var i=void 0!==c.onmousewheel?"mousewheel":"DOMMouseScroll"
+x(r,i,o,t||!1),"DOMMouseScroll"==i&&x(r,"MozMousePixelScroll",o,t||!1)}}
+var Y=!1
+if(P.haseventlistener){try{var H=Object.defineProperty({},"passive",{get:function(){Y=!0}})
+d.addEventListener("test",null,H)}catch(B){}this.stopPropagation=function(e){return e?(e=e.original?e.original:e,e.stopPropagation(),!1):!1},this.cancelEvent=function(e){return e.cancelable&&e.preventDefault(),e.stopImmediatePropagation(),e.preventManipulation&&e.preventManipulation(),!1}}else Event.prototype.preventDefault=function(){this.returnValue=!1},Event.prototype.stopPropagation=function(){this.cancelBubble=!0},d.constructor.prototype.addEventListener=c.constructor.prototype.addEventListener=Element.prototype.addEventListener=function(e,o,t){this.attachEvent("on"+e,o)},d.constructor.prototype.removeEventListener=c.constructor.prototype.removeEventListener=Element.prototype.removeEventListener=function(e,o,t){this.detachEvent("on"+e,o)},this.cancelEvent=function(e){return e=e||d.event,e&&(e.cancelBubble=!0,e.cancel=!0,e.returnValue=!1),!1},this.stopPropagation=function(e){return e=e||d.event,e&&(e.cancelBubble=!0),!1}
+this.delegate=function(e,o,t,r,i){var s=h[o]||!1
+s||(s={a:[],l:[],f:function(e){for(var o=s.l,t=o.length-1,r=!1,i=t;i>=0;i--)if(r=o[i].call(e.target,e),r===!1)return!1
+return r}},T.bind(e,o,s.f,r,i),h[o]=s),T.ispage?(s.a=[T.id].concat(s.a),s.l=[t].concat(s.l)):(s.a.push(T.id),s.l.push(t))},this.undelegate=function(e,o,t,r,i){var s=h[o]||!1
+if(s&&s.l)for(var n=0,l=s.l.length;l>n;n++)s.a[n]===T.id&&(s.a.splice(n),s.l.splice(n),0===s.a.length&&(T._unbind(e,o,s.l.f),h[o]=null))},this.bind=function(e,o,t,r,i){var s="jquery"in e?e[0]:e
+T._bind(s,o,t,r||!1,i||!1)},this._bind=function(e,o,t,r,i){T.events.push({e:e,n:o,f:t,b:r,q:!1}),Y&&i?e.addEventListener(o,t,{passive:!1,capture:r}):e.addEventListener(o,t,r||!1)},this._unbind=function(e,o,t,r){h[o]?T.undelegate(e,o,t,r):e.removeEventListener(o,t,r)},this.unbindAll=function(){for(var e=0;e<T.events.length;e++){var o=T.events[e]
+o.q?o.e.unbind(o.n,o.f):T._unbind(o.e,o.n,o.f,o.b)}},this.showRails=function(){return T.showRail().showRailHr()},this.showRail=function(){return 0===T.page.maxh||!T.ispage&&"none"==T.win.css("display")||(T.rail.visibility=!0,T.rail.css("display","block")),T},this.showRailHr=function(){return T.railh&&(0===T.page.maxw||!T.ispage&&"none"==T.win.css("display")||(T.railh.visibility=!0,T.railh.css("display","block"))),T},this.hideRails=function(){return T.hideRail().hideRailHr()},this.hideRail=function(){return T.rail.visibility=!1,T.rail.css("display","none"),T},this.hideRailHr=function(){return T.railh&&(T.railh.visibility=!1,T.railh.css("display","none")),T},this.show=function(){return T.hidden=!1,T.railslocked=!1,T.showRails()},this.hide=function(){return T.hidden=!0,T.railslocked=!0,T.hideRails()},this.toggle=function(){return T.hidden?T.show():T.hide()},this.remove=function(){T.stop(),T.cursortimeout&&clearTimeout(T.cursortimeout)
+for(var e in T.delaylist)T.delaylist[e]&&m(T.delaylist[e].h)
+T.doZoomOut(),T.unbindAll(),P.isie9&&T.win[0].detachEvent("onpropertychange",T.onAttributeChange),T.observer!==!1&&T.observer.disconnect(),T.observerremover!==!1&&T.observerremover.disconnect(),T.observerbody!==!1&&T.observerbody.disconnect(),T.events=null,T.cursor&&T.cursor.remove(),T.cursorh&&T.cursorh.remove(),T.rail&&T.rail.remove(),T.railh&&T.railh.remove(),T.zoom&&T.zoom.remove()
+for(var o=0;o<T.saved.css.length;o++){var t=T.saved.css[o]
+t[0].css(t[1],void 0===t[2]?"":t[2])}T.saved=!1,T.me.data("__nicescroll","")
+var r=a.nicescroll
+r.each(function(e){if(this&&this.id===T.id){delete r[e]
+for(var o=++e;o<r.length;o++,e++)r[e]=r[o]
+r.length--,r.length&&delete r[r.length]}})
+for(var i in T)T[i]=null,delete T[i]
+T=null},this.scrollstart=function(e){return this.onscrollstart=e,T},this.scrollend=function(e){return this.onscrollend=e,T},this.scrollcancel=function(e){return this.onscrollcancel=e,T},this.zoomin=function(e){return this.onzoomin=e,T},this.zoomout=function(e){return this.onzoomout=e,T},this.isScrollable=function(e){var o=e.target?e.target:e
+if("OPTION"==o.nodeName)return!0
+for(;o&&1==o.nodeType&&o!==this.me[0]&&!/^BODY|HTML/.test(o.nodeName);){var t=a(o),r=t.css("overflowY")||t.css("overflowX")||t.css("overflow")||""
+if(/scroll|auto/.test(r))return o.clientHeight!=o.scrollHeight
+o=o.parentNode?o.parentNode:!1}return!1},this.getViewport=function(e){for(var o=e&&e.parentNode?e.parentNode:!1;o&&1==o.nodeType&&!/^BODY|HTML/.test(o.nodeName);){var t=a(o)
+if(/fixed|absolute/.test(t.css("position")))return t
+var r=t.css("overflowY")||t.css("overflowX")||t.css("overflow")||""
+if(/scroll|auto/.test(r)&&o.clientHeight!=o.scrollHeight)return t
+if(t.getNiceScroll().length>0)return t
+o=o.parentNode?o.parentNode:!1}return!1},this.triggerScrollStart=function(e,o,t,r,i){if(T.onscrollstart){var s={type:"scrollstart",current:{x:e,y:o},request:{x:t,y:r},end:{x:T.newscrollx,y:T.newscrolly},speed:i}
+T.onscrollstart.call(T,s)}},this.triggerScrollEnd=function(){if(T.onscrollend){var e=T.getScrollLeft(),o=T.getScrollTop(),t={type:"scrollend",current:{x:e,y:o},end:{x:e,y:o}}
+T.onscrollend.call(T,t)}}
+var X=0,D=0,A=0,q=1,j=!1
+if(this.onmousewheel=function(e){if(T.wheelprevented||T.locked)return!1
+if(T.railslocked)return T.debounced("checkunlock",T.resize,250),!1
+if(T.rail.drag)return T.cancelEvent(e)
+if("auto"===M.oneaxismousemode&&0!==e.deltaX&&(M.oneaxismousemode=!1),M.oneaxismousemode&&0===e.deltaX&&!T.rail.scrollable)return T.railh&&T.railh.scrollable?T.onmousewheelhr(e):!0
+var o=v(),t=!1
+if(M.preservenativescrolling&&T.checkarea+600<o&&(T.nativescrollingarea=T.isScrollable(e),t=!0),T.checkarea=o,T.nativescrollingarea)return!0
+var r=k(e,!1,t)
+return r&&(T.checkarea=0),r},this.onmousewheelhr=function(e){if(!T.wheelprevented){if(T.railslocked||!T.railh.scrollable)return!0
+if(T.rail.drag)return T.cancelEvent(e)
+var o=v(),t=!1
+return M.preservenativescrolling&&T.checkarea+600<o&&(T.nativescrollingarea=T.isScrollable(e),t=!0),T.checkarea=o,T.nativescrollingarea?!0:T.railslocked?T.cancelEvent(e):k(e,!0,t)}},this.stop=function(){return T.cancelScroll(),T.scrollmon&&T.scrollmon.stop(),T.cursorfreezed=!1,T.scroll.y=Math.round(T.getScrollTop()*(1/T.scrollratio.y)),T.noticeCursor(),T},this.getTransitionSpeed=function(e){return 80+e/72*M.scrollspeed|0},M.smoothscroll)if(T.ishwscroll&&P.hastransition&&M.usetransition&&M.smoothscroll){var F=""
+this.resetTransition=function(){F="",T.doc.css(P.prefixstyle+"transition-duration","0ms")},this.prepareTransition=function(e,o){var t=o?e:T.getTransitionSpeed(e),r=t+"ms"
+return F!==r&&(F=r,T.doc.css(P.prefixstyle+"transition-duration",r)),t},this.doScrollLeft=function(e,o){var t=T.scrollrunning?T.newscrolly:T.getScrollTop()
+T.doScrollPos(e,t,o)},this.doScrollTop=function(e,o){var t=T.scrollrunning?T.newscrollx:T.getScrollLeft()
+T.doScrollPos(t,e,o)},this.cursorupdate={running:!1,start:function(){var e=this
+if(!e.running){e.running=!0
+var o=function(){e.running&&p(o),T.showCursor(T.getScrollTop(),T.getScrollLeft()),T.notifyScrollEvent(T.win[0])}
+p(o)}},stop:function(){this.running=!1}},this.doScrollPos=function(e,o,t){var r=T.getScrollTop(),i=T.getScrollLeft()
+if(((T.newscrolly-r)*(o-r)<0||(T.newscrollx-i)*(e-i)<0)&&T.cancelScroll(),M.bouncescroll?(0>o?o=o/2|0:o>T.page.maxh&&(o=T.page.maxh+(o-T.page.maxh)/2|0),0>e?e=e/2|0:e>T.page.maxw&&(e=T.page.maxw+(e-T.page.maxw)/2|0)):(0>o?o=0:o>T.page.maxh&&(o=T.page.maxh),0>e?e=0:e>T.page.maxw&&(e=T.page.maxw)),T.scrollrunning&&e==T.newscrollx&&o==T.newscrolly)return!1
+T.newscrolly=o,T.newscrollx=e
+var s=T.getScrollTop(),n=T.getScrollLeft(),l={}
+l.x=e-n,l.y=o-s
+var a=0|Math.sqrt(l.x*l.x+l.y*l.y),c=T.prepareTransition(a)
+T.scrollrunning||(T.scrollrunning=!0,T.triggerScrollStart(n,s,e,o,c),T.cursorupdate.start()),T.scrollendtrapped=!0,P.transitionend||(T.scrollendtrapped&&clearTimeout(T.scrollendtrapped),T.scrollendtrapped=setTimeout(T.onScrollTransitionEnd,c)),T.setScrollTop(T.newscrolly),T.setScrollLeft(T.newscrollx)},this.cancelScroll=function(){if(!T.scrollendtrapped)return!0
+var e=T.getScrollTop(),o=T.getScrollLeft()
+return T.scrollrunning=!1,P.transitionend||clearTimeout(P.transitionend),T.scrollendtrapped=!1,T.resetTransition(),T.setScrollTop(e),T.railh&&T.setScrollLeft(o),T.timerscroll&&T.timerscroll.tm&&clearInterval(T.timerscroll.tm),T.timerscroll=!1,T.cursorfreezed=!1,T.cursorupdate.stop(),T.showCursor(e,o),T},this.onScrollTransitionEnd=function(){if(T.scrollendtrapped){var e=T.getScrollTop(),o=T.getScrollLeft()
+if(0>e?e=0:e>T.page.maxh&&(e=T.page.maxh),0>o?o=0:o>T.page.maxw&&(o=T.page.maxw),e!=T.newscrolly||o!=T.newscrollx)return T.doScrollPos(o,e,M.snapbackspeed)
+T.scrollrunning&&T.triggerScrollEnd(),T.scrollrunning=!1,T.scrollendtrapped=!1,T.resetTransition(),T.timerscroll=!1,T.setScrollTop(e),T.railh&&T.setScrollLeft(o),T.cursorupdate.stop(),T.noticeCursor(!1,e,o),T.cursorfreezed=!1}}}else this.doScrollLeft=function(e,o){var t=T.scrollrunning?T.newscrolly:T.getScrollTop()
+T.doScrollPos(e,t,o)},this.doScrollTop=function(e,o){var t=T.scrollrunning?T.newscrollx:T.getScrollLeft()
+T.doScrollPos(t,e,o)},this.doScrollPos=function(e,o,t){var r=T.getScrollTop(),i=T.getScrollLeft();((T.newscrolly-r)*(o-r)<0||(T.newscrollx-i)*(e-i)<0)&&T.cancelScroll()
+var s=!1
+if(T.bouncescroll&&T.rail.visibility||(0>o?(o=0,s=!0):o>T.page.maxh&&(o=T.page.maxh,s=!0)),T.bouncescroll&&T.railh.visibility||(0>e?(e=0,s=!0):e>T.page.maxw&&(e=T.page.maxw,s=!0)),T.scrollrunning&&T.newscrolly===o&&T.newscrollx===e)return!0
+T.newscrolly=o,T.newscrollx=e,T.dst={},T.dst.x=e-i,T.dst.y=o-r,T.dst.px=i,T.dst.py=r
+var n=0|Math.sqrt(T.dst.x*T.dst.x+T.dst.y*T.dst.y),l=T.getTransitionSpeed(n)
+T.bzscroll={}
+var a=s?1:.58
+T.bzscroll.x=new R(i,T.newscrollx,l,0,0,a,1),T.bzscroll.y=new R(r,T.newscrolly,l,0,0,a,1)
+var c=(v(),function(){if(T.scrollrunning){var e=T.bzscroll.y.getPos()
+T.setScrollLeft(T.bzscroll.x.getNow()),T.setScrollTop(T.bzscroll.y.getNow()),1>=e?T.timer=p(c):(T.scrollrunning=!1,T.timer=0,T.triggerScrollEnd())}})
+T.scrollrunning||(T.triggerScrollStart(i,r,e,o,l),T.scrollrunning=!0,T.timer=p(c))},this.cancelScroll=function(){return T.timer&&m(T.timer),T.timer=0,T.bzscroll=!1,T.scrollrunning=!1,T}
+else this.doScrollLeft=function(e,o){var t=T.getScrollTop()
+T.doScrollPos(e,t,o)},this.doScrollTop=function(e,o){var t=T.getScrollLeft()
+T.doScrollPos(t,e,o)},this.doScrollPos=function(e,o,t){var r=e>T.page.maxw?T.page.maxw:e
+0>r&&(r=0)
+var i=o>T.page.maxh?T.page.maxh:o
+0>i&&(i=0),T.synched("scroll",function(){T.setScrollTop(i),T.setScrollLeft(r)})},this.cancelScroll=function(){}
+this.doScrollBy=function(e,o){z(0,e)},this.doScrollLeftBy=function(e,o){z(e,0)},this.doScrollTo=function(e,o){var t=o?Math.round(e*T.scrollratio.y):e
+0>t?t=0:t>T.page.maxh&&(t=T.page.maxh),T.cursorfreezed=!1,T.doScrollTop(e)},this.checkContentSize=function(){var e=T.getContentSize();(e.h!=T.page.h||e.w!=T.page.w)&&T.resize(!1,e)},T.onscroll=function(e){T.rail.drag||T.cursorfreezed||T.synched("scroll",function(){T.scroll.y=Math.round(T.getScrollTop()/T.scrollratio.y),T.railh&&(T.scroll.x=Math.round(T.getScrollLeft()/T.scrollratio.x)),T.noticeCursor()})},T.bind(T.docscroll,"scroll",T.onscroll),this.doZoomIn=function(e){if(!T.zoomactive){T.zoomactive=!0,T.zoomrestore={style:{}}
+var o=["position","top","left","zIndex","backgroundColor","marginTop","marginBottom","marginLeft","marginRight"],t=T.win[0].style
+for(var r in o){var i=o[r]
+T.zoomrestore.style[i]=void 0!==t[i]?t[i]:""}T.zoomrestore.style.width=T.win.css("width"),T.zoomrestore.style.height=T.win.css("height"),T.zoomrestore.padding={w:T.win.outerWidth()-T.win.width(),h:T.win.outerHeight()-T.win.height()},P.isios4&&(T.zoomrestore.scrollTop=u.scrollTop(),u.scrollTop(0)),T.win.css({position:P.isios4?"absolute":"fixed",top:0,left:0,zIndex:l+100,margin:0})
+var s=T.win.css("backgroundColor")
+return(""===s||/transparent|rgba\(0, 0, 0, 0\)|rgba\(0,0,0,0\)/.test(s))&&T.win.css("backgroundColor","#fff"),T.rail.css({zIndex:l+101}),T.zoom.css({zIndex:l+102}),T.zoom.css("backgroundPosition","0 -18px"),T.resizeZoom(),T.onzoomin&&T.onzoomin.call(T),T.cancelEvent(e)}},this.doZoomOut=function(e){return T.zoomactive?(T.zoomactive=!1,T.win.css("margin",""),T.win.css(T.zoomrestore.style),P.isios4&&u.scrollTop(T.zoomrestore.scrollTop),T.rail.css({"z-index":T.zindex}),T.zoom.css({"z-index":T.zindex}),T.zoomrestore=!1,T.zoom.css("backgroundPosition","0 0"),T.onResize(),T.onzoomout&&T.onzoomout.call(T),T.cancelEvent(e)):void 0},this.doZoom=function(e){return T.zoomactive?T.doZoomOut(e):T.doZoomIn(e)},this.resizeZoom=function(){if(T.zoomactive){var e=T.getScrollTop()
+T.win.css({width:u.width()-T.zoomrestore.padding.w+"px",height:u.height()-T.zoomrestore.padding.h+"px"}),T.onResize(),T.setScrollTop(Math.min(T.page.maxh,e))}},this.init(),a.nicescroll.push(this)},S=function(e){var o=this
+this.nc=e,this.lastx=0,this.lasty=0,this.speedx=0,this.speedy=0,this.lasttime=0,this.steptime=0,this.snapx=!1,this.snapy=!1,this.demulx=0,this.demuly=0,this.lastscrollx=-1,this.lastscrolly=-1,this.chkx=0,this.chky=0,this.timer=0,this.reset=function(e,t){o.stop(),o.steptime=0,o.lasttime=v(),o.speedx=0,o.speedy=0,o.lastx=e,o.lasty=t,o.lastscrollx=-1,o.lastscrolly=-1},this.update=function(e,t){var r=v()
+o.steptime=r-o.lasttime,o.lasttime=r
+var i=t-o.lasty,s=e-o.lastx,n=o.nc.getScrollTop(),l=o.nc.getScrollLeft(),a=n+i,c=l+s
+o.snapx=0>c||c>o.nc.page.maxw,o.snapy=0>a||a>o.nc.page.maxh,o.speedx=s,o.speedy=i,o.lastx=e,o.lasty=t},this.stop=function(){o.nc.unsynched("domomentum2d"),o.timer&&clearTimeout(o.timer),o.timer=0,o.lastscrollx=-1,o.lastscrolly=-1},this.doSnapy=function(e,t){var r=!1
+0>t?(t=0,r=!0):t>o.nc.page.maxh&&(t=o.nc.page.maxh,r=!0),0>e?(e=0,r=!0):e>o.nc.page.maxw&&(e=o.nc.page.maxw,r=!0),r?o.nc.doScrollPos(e,t,o.nc.opt.snapbackspeed):o.nc.triggerScrollEnd()},this.doMomentum=function(e){var t=v(),r=e?t+e:o.lasttime,i=o.nc.getScrollLeft(),s=o.nc.getScrollTop(),n=o.nc.page.maxh,l=o.nc.page.maxw
+o.speedx=l>0?Math.min(60,o.speedx):0,o.speedy=n>0?Math.min(60,o.speedy):0
+var a=r&&60>=t-r;(0>s||s>n||0>i||i>l)&&(a=!1)
+var c=o.speedy&&a?o.speedy:!1,d=o.speedx&&a?o.speedx:!1
+if(c||d){var u=Math.max(16,o.steptime)
+if(u>50){var h=u/50
+o.speedx*=h,o.speedy*=h,u=50}o.demulxy=0,o.lastscrollx=o.nc.getScrollLeft(),o.chkx=o.lastscrollx,o.lastscrolly=o.nc.getScrollTop(),o.chky=o.lastscrolly
+var p=o.lastscrollx,m=o.lastscrolly,f=function(){var e=v()-t>600?.04:.02
+o.speedx&&(p=Math.floor(o.lastscrollx-o.speedx*(1-o.demulxy)),o.lastscrollx=p,(0>p||p>l)&&(e=.1)),o.speedy&&(m=Math.floor(o.lastscrolly-o.speedy*(1-o.demulxy)),o.lastscrolly=m,(0>m||m>n)&&(e=.1)),o.demulxy=Math.min(1,o.demulxy+e),o.nc.synched("domomentum2d",function(){if(o.speedx){o.nc.getScrollLeft()
+o.chkx=p,o.nc.setScrollLeft(p)}if(o.speedy){o.nc.getScrollTop()
+o.chky=m,o.nc.setScrollTop(m)}o.timer||(o.nc.hideCursor(),o.doSnapy(p,m))}),o.demulxy<1?o.timer=setTimeout(f,u):(o.stop(),o.nc.hideCursor(),o.doSnapy(p,m))}
+f()}else o.doSnapy(o.nc.getScrollLeft(),o.nc.getScrollTop())}},z=e.fn.scrollTop
+e.cssHooks.pageYOffset={get:function(e,o,t){var r=a.data(e,"__nicescroll")||!1
+return r&&r.ishwscroll?r.getScrollTop():z.call(e)},set:function(e,o){var t=a.data(e,"__nicescroll")||!1
+return t&&t.ishwscroll?t.setScrollTop(parseInt(o)):z.call(e,o),this}},e.fn.scrollTop=function(e){if(void 0===e){var o=this[0]?a.data(this[0],"__nicescroll")||!1:!1
+return o&&o.ishwscroll?o.getScrollTop():z.call(this)}return this.each(function(){var o=a.data(this,"__nicescroll")||!1
+o&&o.ishwscroll?o.setScrollTop(parseInt(e)):z.call(a(this),e)})}
+var k=e.fn.scrollLeft
+a.cssHooks.pageXOffset={get:function(e,o,t){var r=a.data(e,"__nicescroll")||!1
+return r&&r.ishwscroll?r.getScrollLeft():k.call(e)},set:function(e,o){var t=a.data(e,"__nicescroll")||!1
+return t&&t.ishwscroll?t.setScrollLeft(parseInt(o)):k.call(e,o),this}},e.fn.scrollLeft=function(e){if(void 0===e){var o=this[0]?a.data(this[0],"__nicescroll")||!1:!1
+return o&&o.ishwscroll?o.getScrollLeft():k.call(this)}return this.each(function(){var o=a.data(this,"__nicescroll")||!1
+o&&o.ishwscroll?o.setScrollLeft(parseInt(e)):k.call(a(this),e)})}
+var T=function(e){var o=this
+if(this.length=0,this.name="nicescrollarray",this.each=function(e){return a.each(o,e),o},this.push=function(e){o[o.length]=e,o.length++},this.eq=function(e){return o[e]},e)for(var t=0;t<e.length;t++){var r=a.data(e[t],"__nicescroll")||!1
+r&&(this[this.length]=r,this.length++)}return this}
+t(T.prototype,["show","hide","toggle","onResize","resize","remove","stop","doScrollPos"],function(e,o){e[o]=function(){var e=arguments
+return this.each(function(){this[o].apply(this,e)})}}),e.fn.getNiceScroll=function(e){return void 0===e?new T(this):this[e]&&a.data(this[e],"__nicescroll")||!1}
+var E=e.expr.pseudos||e.expr[":"]
+E.nicescroll=function(e){return void 0!==a.data(e,"__nicescroll")},a.fn.niceScroll=function(e,o){void 0!==o||"object"!=typeof e||"jquery"in e||(o=e,e=!1)
+var t=new T
+return this.each(function(){var r=a(this),i=a.extend({},o)
+if(e){var s=a(e)
+i.doc=s.length>1?a(e,r):s,i.win=r}var n=!("doc"in i)
+n||"win"in i||(i.win=r)
+var l=r.data("__nicescroll")||!1
+l||(i.doc=i.doc||r,l=new x(i,r),r.data("__nicescroll",l)),t.push(l)}),1===t.length?t[0]:t},d.NiceScroll={getjQuery:function(){return e}},a.nicescroll||(a.nicescroll=new T,a.nicescroll.options=w)})
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/qrcode.js b/pluss-wap-page/src/main/resources/static/resources/js/qrcode.js
new file mode 100644
index 0000000..5cbe0f6
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/qrcode.js
@@ -0,0 +1,1237 @@
+//---------------------------------------------------------------------
+// QRCode for JavaScript
+//
+// Copyright (c) 2009 Kazuhiko Arase
+//
+// URL: http://www.d-project.com/
+//
+// Licensed under the MIT license:
+//   http://www.opensource.org/licenses/mit-license.php
+//
+// The word "QR Code" is registered trademark of 
+// DENSO WAVE INCORPORATED
+//   http://www.denso-wave.com/qrcode/faqpatent-e.html
+//
+//---------------------------------------------------------------------
+
+//---------------------------------------------------------------------
+// QR8bitByte
+//---------------------------------------------------------------------
+
+function QR8bitByte(data) {
+	this.mode = QRMode.MODE_8BIT_BYTE;
+	this.data = data;
+}
+
+QR8bitByte.prototype = {
+
+	getLength : function(buffer) {
+		return this.data.length;
+	},
+	
+	write : function(buffer) {
+		for (var i = 0; i < this.data.length; i++) {
+			// not JIS ...
+			buffer.put(this.data.charCodeAt(i), 8);
+		}
+	}
+};
+
+//---------------------------------------------------------------------
+// QRCode
+//---------------------------------------------------------------------
+
+function QRCode(typeNumber, errorCorrectLevel) {
+	this.typeNumber = typeNumber;
+	this.errorCorrectLevel = errorCorrectLevel;
+	this.modules = null;
+	this.moduleCount = 0;
+	this.dataCache = null;
+	this.dataList = new Array();
+}
+
+QRCode.prototype = {
+	
+	addData : function(data) {
+		var newData = new QR8bitByte(data);
+		this.dataList.push(newData);
+		this.dataCache = null;
+	},
+	
+	isDark : function(row, col) {
+		if (row < 0 || this.moduleCount <= row || col < 0 || this.moduleCount <= col) {
+			throw new Error(row + "," + col);
+		}
+		return this.modules[row][col];
+	},
+
+	getModuleCount : function() {
+		return this.moduleCount;
+	},
+	
+	make : function() {
+		// Calculate automatically typeNumber if provided is < 1
+		if (this.typeNumber < 1 ){
+			var typeNumber = 1;
+			for (typeNumber = 1; typeNumber < 40; typeNumber++) {
+				var rsBlocks = QRRSBlock.getRSBlocks(typeNumber, this.errorCorrectLevel);
+
+				var buffer = new QRBitBuffer();
+				var totalDataCount = 0;
+				for (var i = 0; i < rsBlocks.length; i++) {
+					totalDataCount += rsBlocks[i].dataCount;
+				}
+
+				for (var i = 0; i < this.dataList.length; i++) {
+					var data = this.dataList[i];
+					buffer.put(data.mode, 4);
+					buffer.put(data.getLength(), QRUtil.getLengthInBits(data.mode, typeNumber) );
+					data.write(buffer);
+				}
+				if (buffer.getLengthInBits() <= totalDataCount * 8)
+					break;
+			}
+			this.typeNumber = typeNumber;
+		}
+		this.makeImpl(false, this.getBestMaskPattern() );
+	},
+	
+	makeImpl : function(test, maskPattern) {
+		
+		this.moduleCount = this.typeNumber * 4 + 17;
+		this.modules = new Array(this.moduleCount);
+		
+		for (var row = 0; row < this.moduleCount; row++) {
+			
+			this.modules[row] = new Array(this.moduleCount);
+			
+			for (var col = 0; col < this.moduleCount; col++) {
+				this.modules[row][col] = null;//(col + row) % 3;
+			}
+		}
+	
+		this.setupPositionProbePattern(0, 0);
+		this.setupPositionProbePattern(this.moduleCount - 7, 0);
+		this.setupPositionProbePattern(0, this.moduleCount - 7);
+		this.setupPositionAdjustPattern();
+		this.setupTimingPattern();
+		this.setupTypeInfo(test, maskPattern);
+		
+		if (this.typeNumber >= 7) {
+			this.setupTypeNumber(test);
+		}
+	
+		if (this.dataCache == null) {
+			this.dataCache = QRCode.createData(this.typeNumber, this.errorCorrectLevel, this.dataList);
+		}
+	
+		this.mapData(this.dataCache, maskPattern);
+	},
+
+	setupPositionProbePattern : function(row, col)  {
+		
+		for (var r = -1; r <= 7; r++) {
+			
+			if (row + r <= -1 || this.moduleCount <= row + r) continue;
+			
+			for (var c = -1; c <= 7; c++) {
+				
+				if (col + c <= -1 || this.moduleCount <= col + c) continue;
+				
+				if ( (0 <= r && r <= 6 && (c == 0 || c == 6) )
+						|| (0 <= c && c <= 6 && (r == 0 || r == 6) )
+						|| (2 <= r && r <= 4 && 2 <= c && c <= 4) ) {
+					this.modules[row + r][col + c] = true;
+				} else {
+					this.modules[row + r][col + c] = false;
+				}
+			}		
+		}		
+	},
+	
+	getBestMaskPattern : function() {
+	
+		var minLostPoint = 0;
+		var pattern = 0;
+	
+		for (var i = 0; i < 8; i++) {
+			
+			this.makeImpl(true, i);
+	
+			var lostPoint = QRUtil.getLostPoint(this);
+	
+			if (i == 0 || minLostPoint >  lostPoint) {
+				minLostPoint = lostPoint;
+				pattern = i;
+			}
+		}
+	
+		return pattern;
+	},
+	
+	createMovieClip : function(target_mc, instance_name, depth) {
+	
+		var qr_mc = target_mc.createEmptyMovieClip(instance_name, depth);
+		var cs = 1;
+	
+		this.make();
+
+		for (var row = 0; row < this.modules.length; row++) {
+			
+			var y = row * cs;
+			
+			for (var col = 0; col < this.modules[row].length; col++) {
+	
+				var x = col * cs;
+				var dark = this.modules[row][col];
+			
+				if (dark) {
+					qr_mc.beginFill(0, 100);
+					qr_mc.moveTo(x, y);
+					qr_mc.lineTo(x + cs, y);
+					qr_mc.lineTo(x + cs, y + cs);
+					qr_mc.lineTo(x, y + cs);
+					qr_mc.endFill();
+				}
+			}
+		}
+		
+		return qr_mc;
+	},
+
+	setupTimingPattern : function() {
+		
+		for (var r = 8; r < this.moduleCount - 8; r++) {
+			if (this.modules[r][6] != null) {
+				continue;
+			}
+			this.modules[r][6] = (r % 2 == 0);
+		}
+	
+		for (var c = 8; c < this.moduleCount - 8; c++) {
+			if (this.modules[6][c] != null) {
+				continue;
+			}
+			this.modules[6][c] = (c % 2 == 0);
+		}
+	},
+	
+	setupPositionAdjustPattern : function() {
+	
+		var pos = QRUtil.getPatternPosition(this.typeNumber);
+		
+		for (var i = 0; i < pos.length; i++) {
+		
+			for (var j = 0; j < pos.length; j++) {
+			
+				var row = pos[i];
+				var col = pos[j];
+				
+				if (this.modules[row][col] != null) {
+					continue;
+				}
+				
+				for (var r = -2; r <= 2; r++) {
+				
+					for (var c = -2; c <= 2; c++) {
+					
+						if (r == -2 || r == 2 || c == -2 || c == 2 
+								|| (r == 0 && c == 0) ) {
+							this.modules[row + r][col + c] = true;
+						} else {
+							this.modules[row + r][col + c] = false;
+						}
+					}
+				}
+			}
+		}
+	},
+	
+	setupTypeNumber : function(test) {
+	
+		var bits = QRUtil.getBCHTypeNumber(this.typeNumber);
+	
+		for (var i = 0; i < 18; i++) {
+			var mod = (!test && ( (bits >> i) & 1) == 1);
+			this.modules[Math.floor(i / 3)][i % 3 + this.moduleCount - 8 - 3] = mod;
+		}
+	
+		for (var i = 0; i < 18; i++) {
+			var mod = (!test && ( (bits >> i) & 1) == 1);
+			this.modules[i % 3 + this.moduleCount - 8 - 3][Math.floor(i / 3)] = mod;
+		}
+	},
+	
+	setupTypeInfo : function(test, maskPattern) {
+	
+		var data = (this.errorCorrectLevel << 3) | maskPattern;
+		var bits = QRUtil.getBCHTypeInfo(data);
+	
+		// vertical		
+		for (var i = 0; i < 15; i++) {
+	
+			var mod = (!test && ( (bits >> i) & 1) == 1);
+	
+			if (i < 6) {
+				this.modules[i][8] = mod;
+			} else if (i < 8) {
+				this.modules[i + 1][8] = mod;
+			} else {
+				this.modules[this.moduleCount - 15 + i][8] = mod;
+			}
+		}
+	
+		// horizontal
+		for (var i = 0; i < 15; i++) {
+	
+			var mod = (!test && ( (bits >> i) & 1) == 1);
+			
+			if (i < 8) {
+				this.modules[8][this.moduleCount - i - 1] = mod;
+			} else if (i < 9) {
+				this.modules[8][15 - i - 1 + 1] = mod;
+			} else {
+				this.modules[8][15 - i - 1] = mod;
+			}
+		}
+	
+		// fixed module
+		this.modules[this.moduleCount - 8][8] = (!test);
+	
+	},
+	
+	mapData : function(data, maskPattern) {
+		
+		var inc = -1;
+		var row = this.moduleCount - 1;
+		var bitIndex = 7;
+		var byteIndex = 0;
+		
+		for (var col = this.moduleCount - 1; col > 0; col -= 2) {
+	
+			if (col == 6) col--;
+	
+			while (true) {
+	
+				for (var c = 0; c < 2; c++) {
+					
+					if (this.modules[row][col - c] == null) {
+						
+						var dark = false;
+	
+						if (byteIndex < data.length) {
+							dark = ( ( (data[byteIndex] >>> bitIndex) & 1) == 1);
+						}
+	
+						var mask = QRUtil.getMask(maskPattern, row, col - c);
+	
+						if (mask) {
+							dark = !dark;
+						}
+						
+						this.modules[row][col - c] = dark;
+						bitIndex--;
+	
+						if (bitIndex == -1) {
+							byteIndex++;
+							bitIndex = 7;
+						}
+					}
+				}
+								
+				row += inc;
+	
+				if (row < 0 || this.moduleCount <= row) {
+					row -= inc;
+					inc = -inc;
+					break;
+				}
+			}
+		}
+		
+	}
+
+};
+
+QRCode.PAD0 = 0xEC;
+QRCode.PAD1 = 0x11;
+
+QRCode.createData = function(typeNumber, errorCorrectLevel, dataList) {
+	
+	var rsBlocks = QRRSBlock.getRSBlocks(typeNumber, errorCorrectLevel);
+	
+	var buffer = new QRBitBuffer();
+	
+	for (var i = 0; i < dataList.length; i++) {
+		var data = dataList[i];
+		buffer.put(data.mode, 4);
+		buffer.put(data.getLength(), QRUtil.getLengthInBits(data.mode, typeNumber) );
+		data.write(buffer);
+	}
+
+	// calc num max data.
+	var totalDataCount = 0;
+	for (var i = 0; i < rsBlocks.length; i++) {
+		totalDataCount += rsBlocks[i].dataCount;
+	}
+
+	if (buffer.getLengthInBits() > totalDataCount * 8) {
+		throw new Error("code length overflow. ("
+			+ buffer.getLengthInBits()
+			+ ">"
+			+  totalDataCount * 8
+			+ ")");
+	}
+
+	// end code
+	if (buffer.getLengthInBits() + 4 <= totalDataCount * 8) {
+		buffer.put(0, 4);
+	}
+
+	// padding
+	while (buffer.getLengthInBits() % 8 != 0) {
+		buffer.putBit(false);
+	}
+
+	// padding
+	while (true) {
+		
+		if (buffer.getLengthInBits() >= totalDataCount * 8) {
+			break;
+		}
+		buffer.put(QRCode.PAD0, 8);
+		
+		if (buffer.getLengthInBits() >= totalDataCount * 8) {
+			break;
+		}
+		buffer.put(QRCode.PAD1, 8);
+	}
+
+	return QRCode.createBytes(buffer, rsBlocks);
+}
+
+QRCode.createBytes = function(buffer, rsBlocks) {
+
+	var offset = 0;
+	
+	var maxDcCount = 0;
+	var maxEcCount = 0;
+	
+	var dcdata = new Array(rsBlocks.length);
+	var ecdata = new Array(rsBlocks.length);
+	
+	for (var r = 0; r < rsBlocks.length; r++) {
+
+		var dcCount = rsBlocks[r].dataCount;
+		var ecCount = rsBlocks[r].totalCount - dcCount;
+
+		maxDcCount = Math.max(maxDcCount, dcCount);
+		maxEcCount = Math.max(maxEcCount, ecCount);
+		
+		dcdata[r] = new Array(dcCount);
+		
+		for (var i = 0; i < dcdata[r].length; i++) {
+			dcdata[r][i] = 0xff & buffer.buffer[i + offset];
+		}
+		offset += dcCount;
+		
+		var rsPoly = QRUtil.getErrorCorrectPolynomial(ecCount);
+		var rawPoly = new QRPolynomial(dcdata[r], rsPoly.getLength() - 1);
+
+		var modPoly = rawPoly.mod(rsPoly);
+		ecdata[r] = new Array(rsPoly.getLength() - 1);
+		for (var i = 0; i < ecdata[r].length; i++) {
+            var modIndex = i + modPoly.getLength() - ecdata[r].length;
+			ecdata[r][i] = (modIndex >= 0)? modPoly.get(modIndex) : 0;
+		}
+
+	}
+	
+	var totalCodeCount = 0;
+	for (var i = 0; i < rsBlocks.length; i++) {
+		totalCodeCount += rsBlocks[i].totalCount;
+	}
+
+	var data = new Array(totalCodeCount);
+	var index = 0;
+
+	for (var i = 0; i < maxDcCount; i++) {
+		for (var r = 0; r < rsBlocks.length; r++) {
+			if (i < dcdata[r].length) {
+				data[index++] = dcdata[r][i];
+			}
+		}
+	}
+
+	for (var i = 0; i < maxEcCount; i++) {
+		for (var r = 0; r < rsBlocks.length; r++) {
+			if (i < ecdata[r].length) {
+				data[index++] = ecdata[r][i];
+			}
+		}
+	}
+
+	return data;
+
+}
+
+//---------------------------------------------------------------------
+// QRMode
+//---------------------------------------------------------------------
+
+var QRMode = {
+	MODE_NUMBER :		1 << 0,
+	MODE_ALPHA_NUM : 	1 << 1,
+	MODE_8BIT_BYTE : 	1 << 2,
+	MODE_KANJI :		1 << 3
+};
+
+//---------------------------------------------------------------------
+// QRErrorCorrectLevel
+//---------------------------------------------------------------------
+ 
+var QRErrorCorrectLevel = {
+	L : 1,
+	M : 0,
+	Q : 3,
+	H : 2
+};
+
+//---------------------------------------------------------------------
+// QRMaskPattern
+//---------------------------------------------------------------------
+
+var QRMaskPattern = {
+	PATTERN000 : 0,
+	PATTERN001 : 1,
+	PATTERN010 : 2,
+	PATTERN011 : 3,
+	PATTERN100 : 4,
+	PATTERN101 : 5,
+	PATTERN110 : 6,
+	PATTERN111 : 7
+};
+
+//---------------------------------------------------------------------
+// QRUtil
+//---------------------------------------------------------------------
+ 
+var QRUtil = {
+
+    PATTERN_POSITION_TABLE : [
+	    [],
+	    [6, 18],
+	    [6, 22],
+	    [6, 26],
+	    [6, 30],
+	    [6, 34],
+	    [6, 22, 38],
+	    [6, 24, 42],
+	    [6, 26, 46],
+	    [6, 28, 50],
+	    [6, 30, 54],		
+	    [6, 32, 58],
+	    [6, 34, 62],
+	    [6, 26, 46, 66],
+	    [6, 26, 48, 70],
+	    [6, 26, 50, 74],
+	    [6, 30, 54, 78],
+	    [6, 30, 56, 82],
+	    [6, 30, 58, 86],
+	    [6, 34, 62, 90],
+	    [6, 28, 50, 72, 94],
+	    [6, 26, 50, 74, 98],
+	    [6, 30, 54, 78, 102],
+	    [6, 28, 54, 80, 106],
+	    [6, 32, 58, 84, 110],
+	    [6, 30, 58, 86, 114],
+	    [6, 34, 62, 90, 118],
+	    [6, 26, 50, 74, 98, 122],
+	    [6, 30, 54, 78, 102, 126],
+	    [6, 26, 52, 78, 104, 130],
+	    [6, 30, 56, 82, 108, 134],
+	    [6, 34, 60, 86, 112, 138],
+	    [6, 30, 58, 86, 114, 142],
+	    [6, 34, 62, 90, 118, 146],
+	    [6, 30, 54, 78, 102, 126, 150],
+	    [6, 24, 50, 76, 102, 128, 154],
+	    [6, 28, 54, 80, 106, 132, 158],
+	    [6, 32, 58, 84, 110, 136, 162],
+	    [6, 26, 54, 82, 110, 138, 166],
+	    [6, 30, 58, 86, 114, 142, 170]
+    ],
+
+    G15 : (1 << 10) | (1 << 8) | (1 << 5) | (1 << 4) | (1 << 2) | (1 << 1) | (1 << 0),
+    G18 : (1 << 12) | (1 << 11) | (1 << 10) | (1 << 9) | (1 << 8) | (1 << 5) | (1 << 2) | (1 << 0),
+    G15_MASK : (1 << 14) | (1 << 12) | (1 << 10)	| (1 << 4) | (1 << 1),
+
+    getBCHTypeInfo : function(data) {
+	    var d = data << 10;
+	    while (QRUtil.getBCHDigit(d) - QRUtil.getBCHDigit(QRUtil.G15) >= 0) {
+		    d ^= (QRUtil.G15 << (QRUtil.getBCHDigit(d) - QRUtil.getBCHDigit(QRUtil.G15) ) ); 	
+	    }
+	    return ( (data << 10) | d) ^ QRUtil.G15_MASK;
+    },
+
+    getBCHTypeNumber : function(data) {
+	    var d = data << 12;
+	    while (QRUtil.getBCHDigit(d) - QRUtil.getBCHDigit(QRUtil.G18) >= 0) {
+		    d ^= (QRUtil.G18 << (QRUtil.getBCHDigit(d) - QRUtil.getBCHDigit(QRUtil.G18) ) ); 	
+	    }
+	    return (data << 12) | d;
+    },
+
+    getBCHDigit : function(data) {
+
+	    var digit = 0;
+
+	    while (data != 0) {
+		    digit++;
+		    data >>>= 1;
+	    }
+
+	    return digit;
+    },
+
+    getPatternPosition : function(typeNumber) {
+	    return QRUtil.PATTERN_POSITION_TABLE[typeNumber - 1];
+    },
+
+    getMask : function(maskPattern, i, j) {
+	    
+	    switch (maskPattern) {
+		    
+	    case QRMaskPattern.PATTERN000 : return (i + j) % 2 == 0;
+	    case QRMaskPattern.PATTERN001 : return i % 2 == 0;
+	    case QRMaskPattern.PATTERN010 : return j % 3 == 0;
+	    case QRMaskPattern.PATTERN011 : return (i + j) % 3 == 0;
+	    case QRMaskPattern.PATTERN100 : return (Math.floor(i / 2) + Math.floor(j / 3) ) % 2 == 0;
+	    case QRMaskPattern.PATTERN101 : return (i * j) % 2 + (i * j) % 3 == 0;
+	    case QRMaskPattern.PATTERN110 : return ( (i * j) % 2 + (i * j) % 3) % 2 == 0;
+	    case QRMaskPattern.PATTERN111 : return ( (i * j) % 3 + (i + j) % 2) % 2 == 0;
+
+	    default :
+		    throw new Error("bad maskPattern:" + maskPattern);
+	    }
+    },
+
+    getErrorCorrectPolynomial : function(errorCorrectLength) {
+
+	    var a = new QRPolynomial([1], 0);
+
+	    for (var i = 0; i < errorCorrectLength; i++) {
+		    a = a.multiply(new QRPolynomial([1, QRMath.gexp(i)], 0) );
+	    }
+
+	    return a;
+    },
+
+    getLengthInBits : function(mode, type) {
+
+	    if (1 <= type && type < 10) {
+
+		    // 1 - 9
+
+		    switch(mode) {
+		    case QRMode.MODE_NUMBER 	: return 10;
+		    case QRMode.MODE_ALPHA_NUM 	: return 9;
+		    case QRMode.MODE_8BIT_BYTE	: return 8;
+		    case QRMode.MODE_KANJI  	: return 8;
+		    default :
+			    throw new Error("mode:" + mode);
+		    }
+
+	    } else if (type < 27) {
+
+		    // 10 - 26
+
+		    switch(mode) {
+		    case QRMode.MODE_NUMBER 	: return 12;
+		    case QRMode.MODE_ALPHA_NUM 	: return 11;
+		    case QRMode.MODE_8BIT_BYTE	: return 16;
+		    case QRMode.MODE_KANJI  	: return 10;
+		    default :
+			    throw new Error("mode:" + mode);
+		    }
+
+	    } else if (type < 41) {
+
+		    // 27 - 40
+
+		    switch(mode) {
+		    case QRMode.MODE_NUMBER 	: return 14;
+		    case QRMode.MODE_ALPHA_NUM	: return 13;
+		    case QRMode.MODE_8BIT_BYTE	: return 16;
+		    case QRMode.MODE_KANJI  	: return 12;
+		    default :
+			    throw new Error("mode:" + mode);
+		    }
+
+	    } else {
+		    throw new Error("type:" + type);
+	    }
+    },
+
+    getLostPoint : function(qrCode) {
+	    
+	    var moduleCount = qrCode.getModuleCount();
+	    
+	    var lostPoint = 0;
+	    
+	    // LEVEL1
+	    
+	    for (var row = 0; row < moduleCount; row++) {
+
+		    for (var col = 0; col < moduleCount; col++) {
+
+			    var sameCount = 0;
+			    var dark = qrCode.isDark(row, col);
+
+				for (var r = -1; r <= 1; r++) {
+
+				    if (row + r < 0 || moduleCount <= row + r) {
+					    continue;
+				    }
+
+				    for (var c = -1; c <= 1; c++) {
+
+					    if (col + c < 0 || moduleCount <= col + c) {
+						    continue;
+					    }
+
+					    if (r == 0 && c == 0) {
+						    continue;
+					    }
+
+					    if (dark == qrCode.isDark(row + r, col + c) ) {
+						    sameCount++;
+					    }
+				    }
+			    }
+
+			    if (sameCount > 5) {
+				    lostPoint += (3 + sameCount - 5);
+			    }
+		    }
+	    }
+
+	    // LEVEL2
+
+	    for (var row = 0; row < moduleCount - 1; row++) {
+		    for (var col = 0; col < moduleCount - 1; col++) {
+			    var count = 0;
+			    if (qrCode.isDark(row,     col    ) ) count++;
+			    if (qrCode.isDark(row + 1, col    ) ) count++;
+			    if (qrCode.isDark(row,     col + 1) ) count++;
+			    if (qrCode.isDark(row + 1, col + 1) ) count++;
+			    if (count == 0 || count == 4) {
+				    lostPoint += 3;
+			    }
+		    }
+	    }
+
+	    // LEVEL3
+
+	    for (var row = 0; row < moduleCount; row++) {
+		    for (var col = 0; col < moduleCount - 6; col++) {
+			    if (qrCode.isDark(row, col)
+					    && !qrCode.isDark(row, col + 1)
+					    &&  qrCode.isDark(row, col + 2)
+					    &&  qrCode.isDark(row, col + 3)
+					    &&  qrCode.isDark(row, col + 4)
+					    && !qrCode.isDark(row, col + 5)
+					    &&  qrCode.isDark(row, col + 6) ) {
+				    lostPoint += 40;
+			    }
+		    }
+	    }
+
+	    for (var col = 0; col < moduleCount; col++) {
+		    for (var row = 0; row < moduleCount - 6; row++) {
+			    if (qrCode.isDark(row, col)
+					    && !qrCode.isDark(row + 1, col)
+					    &&  qrCode.isDark(row + 2, col)
+					    &&  qrCode.isDark(row + 3, col)
+					    &&  qrCode.isDark(row + 4, col)
+					    && !qrCode.isDark(row + 5, col)
+					    &&  qrCode.isDark(row + 6, col) ) {
+				    lostPoint += 40;
+			    }
+		    }
+	    }
+
+	    // LEVEL4
+	    
+	    var darkCount = 0;
+
+	    for (var col = 0; col < moduleCount; col++) {
+		    for (var row = 0; row < moduleCount; row++) {
+			    if (qrCode.isDark(row, col) ) {
+				    darkCount++;
+			    }
+		    }
+	    }
+	    
+	    var ratio = Math.abs(100 * darkCount / moduleCount / moduleCount - 50) / 5;
+	    lostPoint += ratio * 10;
+
+	    return lostPoint;		
+    }
+
+};
+
+
+//---------------------------------------------------------------------
+// QRMath
+//---------------------------------------------------------------------
+
+var QRMath = {
+
+	glog : function(n) {
+	
+		if (n < 1) {
+			throw new Error("glog(" + n + ")");
+		}
+		
+		return QRMath.LOG_TABLE[n];
+	},
+	
+	gexp : function(n) {
+	
+		while (n < 0) {
+			n += 255;
+		}
+	
+		while (n >= 256) {
+			n -= 255;
+		}
+	
+		return QRMath.EXP_TABLE[n];
+	},
+	
+	EXP_TABLE : new Array(256),
+	
+	LOG_TABLE : new Array(256)
+
+};
+	
+for (var i = 0; i < 8; i++) {
+	QRMath.EXP_TABLE[i] = 1 << i;
+}
+for (var i = 8; i < 256; i++) {
+	QRMath.EXP_TABLE[i] = QRMath.EXP_TABLE[i - 4]
+		^ QRMath.EXP_TABLE[i - 5]
+		^ QRMath.EXP_TABLE[i - 6]
+		^ QRMath.EXP_TABLE[i - 8];
+}
+for (var i = 0; i < 255; i++) {
+	QRMath.LOG_TABLE[QRMath.EXP_TABLE[i] ] = i;
+}
+
+//---------------------------------------------------------------------
+// QRPolynomial
+//---------------------------------------------------------------------
+
+function QRPolynomial(num, shift) {
+
+	if (num.length == undefined) {
+		throw new Error(num.length + "/" + shift);
+	}
+
+	var offset = 0;
+
+	while (offset < num.length && num[offset] == 0) {
+		offset++;
+	}
+
+	this.num = new Array(num.length - offset + shift);
+	for (var i = 0; i < num.length - offset; i++) {
+		this.num[i] = num[i + offset];
+	}
+}
+
+QRPolynomial.prototype = {
+
+	get : function(index) {
+		return this.num[index];
+	},
+	
+	getLength : function() {
+		return this.num.length;
+	},
+	
+	multiply : function(e) {
+	
+		var num = new Array(this.getLength() + e.getLength() - 1);
+	
+		for (var i = 0; i < this.getLength(); i++) {
+			for (var j = 0; j < e.getLength(); j++) {
+				num[i + j] ^= QRMath.gexp(QRMath.glog(this.get(i) ) + QRMath.glog(e.get(j) ) );
+			}
+		}
+	
+		return new QRPolynomial(num, 0);
+	},
+	
+	mod : function(e) {
+	
+		if (this.getLength() - e.getLength() < 0) {
+			return this;
+		}
+	
+		var ratio = QRMath.glog(this.get(0) ) - QRMath.glog(e.get(0) );
+	
+		var num = new Array(this.getLength() );
+		
+		for (var i = 0; i < this.getLength(); i++) {
+			num[i] = this.get(i);
+		}
+		
+		for (var i = 0; i < e.getLength(); i++) {
+			num[i] ^= QRMath.gexp(QRMath.glog(e.get(i) ) + ratio);
+		}
+	
+		// recursive call
+		return new QRPolynomial(num, 0).mod(e);
+	}
+};
+
+//---------------------------------------------------------------------
+// QRRSBlock
+//---------------------------------------------------------------------
+
+function QRRSBlock(totalCount, dataCount) {
+	this.totalCount = totalCount;
+	this.dataCount  = dataCount;
+}
+
+QRRSBlock.RS_BLOCK_TABLE = [
+
+	// L
+	// M
+	// Q
+	// H
+
+	// 1
+	[1, 26, 19],
+	[1, 26, 16],
+	[1, 26, 13],
+	[1, 26, 9],
+	
+	// 2
+	[1, 44, 34],
+	[1, 44, 28],
+	[1, 44, 22],
+	[1, 44, 16],
+
+	// 3
+	[1, 70, 55],
+	[1, 70, 44],
+	[2, 35, 17],
+	[2, 35, 13],
+
+	// 4		
+	[1, 100, 80],
+	[2, 50, 32],
+	[2, 50, 24],
+	[4, 25, 9],
+	
+	// 5
+	[1, 134, 108],
+	[2, 67, 43],
+	[2, 33, 15, 2, 34, 16],
+	[2, 33, 11, 2, 34, 12],
+	
+	// 6
+	[2, 86, 68],
+	[4, 43, 27],
+	[4, 43, 19],
+	[4, 43, 15],
+	
+	// 7		
+	[2, 98, 78],
+	[4, 49, 31],
+	[2, 32, 14, 4, 33, 15],
+	[4, 39, 13, 1, 40, 14],
+	
+	// 8
+	[2, 121, 97],
+	[2, 60, 38, 2, 61, 39],
+	[4, 40, 18, 2, 41, 19],
+	[4, 40, 14, 2, 41, 15],
+	
+	// 9
+	[2, 146, 116],
+	[3, 58, 36, 2, 59, 37],
+	[4, 36, 16, 4, 37, 17],
+	[4, 36, 12, 4, 37, 13],
+	
+	// 10		
+	[2, 86, 68, 2, 87, 69],
+	[4, 69, 43, 1, 70, 44],
+	[6, 43, 19, 2, 44, 20],
+	[6, 43, 15, 2, 44, 16],
+
+	// 11
+	[4, 101, 81],
+	[1, 80, 50, 4, 81, 51],
+	[4, 50, 22, 4, 51, 23],
+	[3, 36, 12, 8, 37, 13],
+
+	// 12
+	[2, 116, 92, 2, 117, 93],
+	[6, 58, 36, 2, 59, 37],
+	[4, 46, 20, 6, 47, 21],
+	[7, 42, 14, 4, 43, 15],
+
+	// 13
+	[4, 133, 107],
+	[8, 59, 37, 1, 60, 38],
+	[8, 44, 20, 4, 45, 21],
+	[12, 33, 11, 4, 34, 12],
+
+	// 14
+	[3, 145, 115, 1, 146, 116],
+	[4, 64, 40, 5, 65, 41],
+	[11, 36, 16, 5, 37, 17],
+	[11, 36, 12, 5, 37, 13],
+
+	// 15
+	[5, 109, 87, 1, 110, 88],
+	[5, 65, 41, 5, 66, 42],
+	[5, 54, 24, 7, 55, 25],
+	[11, 36, 12],
+
+	// 16
+	[5, 122, 98, 1, 123, 99],
+	[7, 73, 45, 3, 74, 46],
+	[15, 43, 19, 2, 44, 20],
+	[3, 45, 15, 13, 46, 16],
+
+	// 17
+	[1, 135, 107, 5, 136, 108],
+	[10, 74, 46, 1, 75, 47],
+	[1, 50, 22, 15, 51, 23],
+	[2, 42, 14, 17, 43, 15],
+
+	// 18
+	[5, 150, 120, 1, 151, 121],
+	[9, 69, 43, 4, 70, 44],
+	[17, 50, 22, 1, 51, 23],
+	[2, 42, 14, 19, 43, 15],
+
+	// 19
+	[3, 141, 113, 4, 142, 114],
+	[3, 70, 44, 11, 71, 45],
+	[17, 47, 21, 4, 48, 22],
+	[9, 39, 13, 16, 40, 14],
+
+	// 20
+	[3, 135, 107, 5, 136, 108],
+	[3, 67, 41, 13, 68, 42],
+	[15, 54, 24, 5, 55, 25],
+	[15, 43, 15, 10, 44, 16],
+
+	// 21
+	[4, 144, 116, 4, 145, 117],
+	[17, 68, 42],
+	[17, 50, 22, 6, 51, 23],
+	[19, 46, 16, 6, 47, 17],
+
+	// 22
+	[2, 139, 111, 7, 140, 112],
+	[17, 74, 46],
+	[7, 54, 24, 16, 55, 25],
+	[34, 37, 13],
+
+	// 23
+	[4, 151, 121, 5, 152, 122],
+	[4, 75, 47, 14, 76, 48],
+	[11, 54, 24, 14, 55, 25],
+	[16, 45, 15, 14, 46, 16],
+
+	// 24
+	[6, 147, 117, 4, 148, 118],
+	[6, 73, 45, 14, 74, 46],
+	[11, 54, 24, 16, 55, 25],
+	[30, 46, 16, 2, 47, 17],
+
+	// 25
+	[8, 132, 106, 4, 133, 107],
+	[8, 75, 47, 13, 76, 48],
+	[7, 54, 24, 22, 55, 25],
+	[22, 45, 15, 13, 46, 16],
+
+	// 26
+	[10, 142, 114, 2, 143, 115],
+	[19, 74, 46, 4, 75, 47],
+	[28, 50, 22, 6, 51, 23],
+	[33, 46, 16, 4, 47, 17],
+
+	// 27
+	[8, 152, 122, 4, 153, 123],
+	[22, 73, 45, 3, 74, 46],
+	[8, 53, 23, 26, 54, 24],
+	[12, 45, 15, 28, 46, 16],
+
+	// 28
+	[3, 147, 117, 10, 148, 118],
+	[3, 73, 45, 23, 74, 46],
+	[4, 54, 24, 31, 55, 25],
+	[11, 45, 15, 31, 46, 16],
+
+	// 29
+	[7, 146, 116, 7, 147, 117],
+	[21, 73, 45, 7, 74, 46],
+	[1, 53, 23, 37, 54, 24],
+	[19, 45, 15, 26, 46, 16],
+
+	// 30
+	[5, 145, 115, 10, 146, 116],
+	[19, 75, 47, 10, 76, 48],
+	[15, 54, 24, 25, 55, 25],
+	[23, 45, 15, 25, 46, 16],
+
+	// 31
+	[13, 145, 115, 3, 146, 116],
+	[2, 74, 46, 29, 75, 47],
+	[42, 54, 24, 1, 55, 25],
+	[23, 45, 15, 28, 46, 16],
+
+	// 32
+	[17, 145, 115],
+	[10, 74, 46, 23, 75, 47],
+	[10, 54, 24, 35, 55, 25],
+	[19, 45, 15, 35, 46, 16],
+
+	// 33
+	[17, 145, 115, 1, 146, 116],
+	[14, 74, 46, 21, 75, 47],
+	[29, 54, 24, 19, 55, 25],
+	[11, 45, 15, 46, 46, 16],
+
+	// 34
+	[13, 145, 115, 6, 146, 116],
+	[14, 74, 46, 23, 75, 47],
+	[44, 54, 24, 7, 55, 25],
+	[59, 46, 16, 1, 47, 17],
+
+	// 35
+	[12, 151, 121, 7, 152, 122],
+	[12, 75, 47, 26, 76, 48],
+	[39, 54, 24, 14, 55, 25],
+	[22, 45, 15, 41, 46, 16],
+
+	// 36
+	[6, 151, 121, 14, 152, 122],
+	[6, 75, 47, 34, 76, 48],
+	[46, 54, 24, 10, 55, 25],
+	[2, 45, 15, 64, 46, 16],
+
+	// 37
+	[17, 152, 122, 4, 153, 123],
+	[29, 74, 46, 14, 75, 47],
+	[49, 54, 24, 10, 55, 25],
+	[24, 45, 15, 46, 46, 16],
+
+	// 38
+	[4, 152, 122, 18, 153, 123],
+	[13, 74, 46, 32, 75, 47],
+	[48, 54, 24, 14, 55, 25],
+	[42, 45, 15, 32, 46, 16],
+
+	// 39
+	[20, 147, 117, 4, 148, 118],
+	[40, 75, 47, 7, 76, 48],
+	[43, 54, 24, 22, 55, 25],
+	[10, 45, 15, 67, 46, 16],
+
+	// 40
+	[19, 148, 118, 6, 149, 119],
+	[18, 75, 47, 31, 76, 48],
+	[34, 54, 24, 34, 55, 25],
+	[20, 45, 15, 61, 46, 16]
+];
+
+QRRSBlock.getRSBlocks = function(typeNumber, errorCorrectLevel) {
+	
+	var rsBlock = QRRSBlock.getRsBlockTable(typeNumber, errorCorrectLevel);
+	
+	if (rsBlock == undefined) {
+		throw new Error("bad rs block @ typeNumber:" + typeNumber + "/errorCorrectLevel:" + errorCorrectLevel);
+	}
+
+	var length = rsBlock.length / 3;
+	
+	var list = new Array();
+	
+	for (var i = 0; i < length; i++) {
+
+		var count = rsBlock[i * 3 + 0];
+		var totalCount = rsBlock[i * 3 + 1];
+		var dataCount  = rsBlock[i * 3 + 2];
+
+		for (var j = 0; j < count; j++) {
+			list.push(new QRRSBlock(totalCount, dataCount) );	
+		}
+	}
+	
+	return list;
+}
+
+QRRSBlock.getRsBlockTable = function(typeNumber, errorCorrectLevel) {
+
+	switch(errorCorrectLevel) {
+	case QRErrorCorrectLevel.L :
+		return QRRSBlock.RS_BLOCK_TABLE[(typeNumber - 1) * 4 + 0];
+	case QRErrorCorrectLevel.M :
+		return QRRSBlock.RS_BLOCK_TABLE[(typeNumber - 1) * 4 + 1];
+	case QRErrorCorrectLevel.Q :
+		return QRRSBlock.RS_BLOCK_TABLE[(typeNumber - 1) * 4 + 2];
+	case QRErrorCorrectLevel.H :
+		return QRRSBlock.RS_BLOCK_TABLE[(typeNumber - 1) * 4 + 3];
+	default :
+		return undefined;
+	}
+}
+
+//---------------------------------------------------------------------
+// QRBitBuffer
+//---------------------------------------------------------------------
+
+function QRBitBuffer() {
+	this.buffer = new Array();
+	this.length = 0;
+}
+
+QRBitBuffer.prototype = {
+
+	get : function(index) {
+		var bufIndex = Math.floor(index / 8);
+		return ( (this.buffer[bufIndex] >>> (7 - index % 8) ) & 1) == 1;
+	},
+	
+	put : function(num, length) {
+		for (var i = 0; i < length; i++) {
+			this.putBit( ( (num >>> (length - i - 1) ) & 1) == 1);
+		}
+	},
+	
+	getLengthInBits : function() {
+		return this.length;
+	},
+	
+	putBit : function(bit) {
+	
+		var bufIndex = Math.floor(this.length / 8);
+		if (this.buffer.length <= bufIndex) {
+			this.buffer.push(0);
+		}
+	
+		if (bit) {
+			this.buffer[bufIndex] |= (0x80 >>> (this.length % 8) );
+		}
+	
+		this.length++;
+	}
+};
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/qrcode/jquery.qrcode.min.js b/pluss-wap-page/src/main/resources/static/resources/js/qrcode/jquery.qrcode.min.js
new file mode 100644
index 0000000..fe9680e
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/qrcode/jquery.qrcode.min.js
@@ -0,0 +1,28 @@
+(function(r){r.fn.qrcode=function(h){var s;function u(a){this.mode=s;this.data=a}function o(a,c){this.typeNumber=a;this.errorCorrectLevel=c;this.modules=null;this.moduleCount=0;this.dataCache=null;this.dataList=[]}function q(a,c){if(void 0==a.length)throw Error(a.length+"/"+c);for(var d=0;d<a.length&&0==a[d];)d++;this.num=Array(a.length-d+c);for(var b=0;b<a.length-d;b++)this.num[b]=a[b+d]}function p(a,c){this.totalCount=a;this.dataCount=c}function t(){this.buffer=[];this.length=0}u.prototype={getLength:function(){return this.data.length},
+write:function(a){for(var c=0;c<this.data.length;c++)a.put(this.data.charCodeAt(c),8)}};o.prototype={addData:function(a){this.dataList.push(new u(a));this.dataCache=null},isDark:function(a,c){if(0>a||this.moduleCount<=a||0>c||this.moduleCount<=c)throw Error(a+","+c);return this.modules[a][c]},getModuleCount:function(){return this.moduleCount},make:function(){if(1>this.typeNumber){for(var a=1,a=1;40>a;a++){for(var c=p.getRSBlocks(a,this.errorCorrectLevel),d=new t,b=0,e=0;e<c.length;e++)b+=c[e].dataCount;
+for(e=0;e<this.dataList.length;e++)c=this.dataList[e],d.put(c.mode,4),d.put(c.getLength(),j.getLengthInBits(c.mode,a)),c.write(d);if(d.getLengthInBits()<=8*b)break}this.typeNumber=a}this.makeImpl(!1,this.getBestMaskPattern())},makeImpl:function(a,c){this.moduleCount=4*this.typeNumber+17;this.modules=Array(this.moduleCount);for(var d=0;d<this.moduleCount;d++){this.modules[d]=Array(this.moduleCount);for(var b=0;b<this.moduleCount;b++)this.modules[d][b]=null}this.setupPositionProbePattern(0,0);this.setupPositionProbePattern(this.moduleCount-
+7,0);this.setupPositionProbePattern(0,this.moduleCount-7);this.setupPositionAdjustPattern();this.setupTimingPattern();this.setupTypeInfo(a,c);7<=this.typeNumber&&this.setupTypeNumber(a);null==this.dataCache&&(this.dataCache=o.createData(this.typeNumber,this.errorCorrectLevel,this.dataList));this.mapData(this.dataCache,c)},setupPositionProbePattern:function(a,c){for(var d=-1;7>=d;d++)if(!(-1>=a+d||this.moduleCount<=a+d))for(var b=-1;7>=b;b++)-1>=c+b||this.moduleCount<=c+b||(this.modules[a+d][c+b]=
+0<=d&&6>=d&&(0==b||6==b)||0<=b&&6>=b&&(0==d||6==d)||2<=d&&4>=d&&2<=b&&4>=b?!0:!1)},getBestMaskPattern:function(){for(var a=0,c=0,d=0;8>d;d++){this.makeImpl(!0,d);var b=j.getLostPoint(this);if(0==d||a>b)a=b,c=d}return c},createMovieClip:function(a,c,d){a=a.createEmptyMovieClip(c,d);this.make();for(c=0;c<this.modules.length;c++)for(var d=1*c,b=0;b<this.modules[c].length;b++){var e=1*b;this.modules[c][b]&&(a.beginFill(0,100),a.moveTo(e,d),a.lineTo(e+1,d),a.lineTo(e+1,d+1),a.lineTo(e,d+1),a.endFill())}return a},
+setupTimingPattern:function(){for(var a=8;a<this.moduleCount-8;a++)null==this.modules[a][6]&&(this.modules[a][6]=0==a%2);for(a=8;a<this.moduleCount-8;a++)null==this.modules[6][a]&&(this.modules[6][a]=0==a%2)},setupPositionAdjustPattern:function(){for(var a=j.getPatternPosition(this.typeNumber),c=0;c<a.length;c++)for(var d=0;d<a.length;d++){var b=a[c],e=a[d];if(null==this.modules[b][e])for(var f=-2;2>=f;f++)for(var i=-2;2>=i;i++)this.modules[b+f][e+i]=-2==f||2==f||-2==i||2==i||0==f&&0==i?!0:!1}},setupTypeNumber:function(a){for(var c=
+j.getBCHTypeNumber(this.typeNumber),d=0;18>d;d++){var b=!a&&1==(c>>d&1);this.modules[Math.floor(d/3)][d%3+this.moduleCount-8-3]=b}for(d=0;18>d;d++)b=!a&&1==(c>>d&1),this.modules[d%3+this.moduleCount-8-3][Math.floor(d/3)]=b},setupTypeInfo:function(a,c){for(var d=j.getBCHTypeInfo(this.errorCorrectLevel<<3|c),b=0;15>b;b++){var e=!a&&1==(d>>b&1);6>b?this.modules[b][8]=e:8>b?this.modules[b+1][8]=e:this.modules[this.moduleCount-15+b][8]=e}for(b=0;15>b;b++)e=!a&&1==(d>>b&1),8>b?this.modules[8][this.moduleCount-
+b-1]=e:9>b?this.modules[8][15-b-1+1]=e:this.modules[8][15-b-1]=e;this.modules[this.moduleCount-8][8]=!a},mapData:function(a,c){for(var d=-1,b=this.moduleCount-1,e=7,f=0,i=this.moduleCount-1;0<i;i-=2)for(6==i&&i--;;){for(var g=0;2>g;g++)if(null==this.modules[b][i-g]){var n=!1;f<a.length&&(n=1==(a[f]>>>e&1));j.getMask(c,b,i-g)&&(n=!n);this.modules[b][i-g]=n;e--; -1==e&&(f++,e=7)}b+=d;if(0>b||this.moduleCount<=b){b-=d;d=-d;break}}}};o.PAD0=236;o.PAD1=17;o.createData=function(a,c,d){for(var c=p.getRSBlocks(a,
+c),b=new t,e=0;e<d.length;e++){var f=d[e];b.put(f.mode,4);b.put(f.getLength(),j.getLengthInBits(f.mode,a));f.write(b)}for(e=a=0;e<c.length;e++)a+=c[e].dataCount;if(b.getLengthInBits()>8*a)throw Error("code length overflow. ("+b.getLengthInBits()+">"+8*a+")");for(b.getLengthInBits()+4<=8*a&&b.put(0,4);0!=b.getLengthInBits()%8;)b.putBit(!1);for(;!(b.getLengthInBits()>=8*a);){b.put(o.PAD0,8);if(b.getLengthInBits()>=8*a)break;b.put(o.PAD1,8)}return o.createBytes(b,c)};o.createBytes=function(a,c){for(var d=
+0,b=0,e=0,f=Array(c.length),i=Array(c.length),g=0;g<c.length;g++){var n=c[g].dataCount,h=c[g].totalCount-n,b=Math.max(b,n),e=Math.max(e,h);f[g]=Array(n);for(var k=0;k<f[g].length;k++)f[g][k]=255&a.buffer[k+d];d+=n;k=j.getErrorCorrectPolynomial(h);n=(new q(f[g],k.getLength()-1)).mod(k);i[g]=Array(k.getLength()-1);for(k=0;k<i[g].length;k++)h=k+n.getLength()-i[g].length,i[g][k]=0<=h?n.get(h):0}for(k=g=0;k<c.length;k++)g+=c[k].totalCount;d=Array(g);for(k=n=0;k<b;k++)for(g=0;g<c.length;g++)k<f[g].length&&
+(d[n++]=f[g][k]);for(k=0;k<e;k++)for(g=0;g<c.length;g++)k<i[g].length&&(d[n++]=i[g][k]);return d};s=4;for(var j={PATTERN_POSITION_TABLE:[[],[6,18],[6,22],[6,26],[6,30],[6,34],[6,22,38],[6,24,42],[6,26,46],[6,28,50],[6,30,54],[6,32,58],[6,34,62],[6,26,46,66],[6,26,48,70],[6,26,50,74],[6,30,54,78],[6,30,56,82],[6,30,58,86],[6,34,62,90],[6,28,50,72,94],[6,26,50,74,98],[6,30,54,78,102],[6,28,54,80,106],[6,32,58,84,110],[6,30,58,86,114],[6,34,62,90,118],[6,26,50,74,98,122],[6,30,54,78,102,126],[6,26,52,
+78,104,130],[6,30,56,82,108,134],[6,34,60,86,112,138],[6,30,58,86,114,142],[6,34,62,90,118,146],[6,30,54,78,102,126,150],[6,24,50,76,102,128,154],[6,28,54,80,106,132,158],[6,32,58,84,110,136,162],[6,26,54,82,110,138,166],[6,30,58,86,114,142,170]],G15:1335,G18:7973,G15_MASK:21522,getBCHTypeInfo:function(a){for(var c=a<<10;0<=j.getBCHDigit(c)-j.getBCHDigit(j.G15);)c^=j.G15<<j.getBCHDigit(c)-j.getBCHDigit(j.G15);return(a<<10|c)^j.G15_MASK},getBCHTypeNumber:function(a){for(var c=a<<12;0<=j.getBCHDigit(c)-
+j.getBCHDigit(j.G18);)c^=j.G18<<j.getBCHDigit(c)-j.getBCHDigit(j.G18);return a<<12|c},getBCHDigit:function(a){for(var c=0;0!=a;)c++,a>>>=1;return c},getPatternPosition:function(a){return j.PATTERN_POSITION_TABLE[a-1]},getMask:function(a,c,d){switch(a){case 0:return 0==(c+d)%2;case 1:return 0==c%2;case 2:return 0==d%3;case 3:return 0==(c+d)%3;case 4:return 0==(Math.floor(c/2)+Math.floor(d/3))%2;case 5:return 0==c*d%2+c*d%3;case 6:return 0==(c*d%2+c*d%3)%2;case 7:return 0==(c*d%3+(c+d)%2)%2;default:throw Error("bad maskPattern:"+
+a);}},getErrorCorrectPolynomial:function(a){for(var c=new q([1],0),d=0;d<a;d++)c=c.multiply(new q([1,l.gexp(d)],0));return c},getLengthInBits:function(a,c){if(1<=c&&10>c)switch(a){case 1:return 10;case 2:return 9;case s:return 8;case 8:return 8;default:throw Error("mode:"+a);}else if(27>c)switch(a){case 1:return 12;case 2:return 11;case s:return 16;case 8:return 10;default:throw Error("mode:"+a);}else if(41>c)switch(a){case 1:return 14;case 2:return 13;case s:return 16;case 8:return 12;default:throw Error("mode:"+
+a);}else throw Error("type:"+c);},getLostPoint:function(a){for(var c=a.getModuleCount(),d=0,b=0;b<c;b++)for(var e=0;e<c;e++){for(var f=0,i=a.isDark(b,e),g=-1;1>=g;g++)if(!(0>b+g||c<=b+g))for(var h=-1;1>=h;h++)0>e+h||c<=e+h||0==g&&0==h||i==a.isDark(b+g,e+h)&&f++;5<f&&(d+=3+f-5)}for(b=0;b<c-1;b++)for(e=0;e<c-1;e++)if(f=0,a.isDark(b,e)&&f++,a.isDark(b+1,e)&&f++,a.isDark(b,e+1)&&f++,a.isDark(b+1,e+1)&&f++,0==f||4==f)d+=3;for(b=0;b<c;b++)for(e=0;e<c-6;e++)a.isDark(b,e)&&!a.isDark(b,e+1)&&a.isDark(b,e+
+2)&&a.isDark(b,e+3)&&a.isDark(b,e+4)&&!a.isDark(b,e+5)&&a.isDark(b,e+6)&&(d+=40);for(e=0;e<c;e++)for(b=0;b<c-6;b++)a.isDark(b,e)&&!a.isDark(b+1,e)&&a.isDark(b+2,e)&&a.isDark(b+3,e)&&a.isDark(b+4,e)&&!a.isDark(b+5,e)&&a.isDark(b+6,e)&&(d+=40);for(e=f=0;e<c;e++)for(b=0;b<c;b++)a.isDark(b,e)&&f++;a=Math.abs(100*f/c/c-50)/5;return d+10*a}},l={glog:function(a){if(1>a)throw Error("glog("+a+")");return l.LOG_TABLE[a]},gexp:function(a){for(;0>a;)a+=255;for(;256<=a;)a-=255;return l.EXP_TABLE[a]},EXP_TABLE:Array(256),
+LOG_TABLE:Array(256)},m=0;8>m;m++)l.EXP_TABLE[m]=1<<m;for(m=8;256>m;m++)l.EXP_TABLE[m]=l.EXP_TABLE[m-4]^l.EXP_TABLE[m-5]^l.EXP_TABLE[m-6]^l.EXP_TABLE[m-8];for(m=0;255>m;m++)l.LOG_TABLE[l.EXP_TABLE[m]]=m;q.prototype={get:function(a){return this.num[a]},getLength:function(){return this.num.length},multiply:function(a){for(var c=Array(this.getLength()+a.getLength()-1),d=0;d<this.getLength();d++)for(var b=0;b<a.getLength();b++)c[d+b]^=l.gexp(l.glog(this.get(d))+l.glog(a.get(b)));return new q(c,0)},mod:function(a){if(0>
+this.getLength()-a.getLength())return this;for(var c=l.glog(this.get(0))-l.glog(a.get(0)),d=Array(this.getLength()),b=0;b<this.getLength();b++)d[b]=this.get(b);for(b=0;b<a.getLength();b++)d[b]^=l.gexp(l.glog(a.get(b))+c);return(new q(d,0)).mod(a)}};p.RS_BLOCK_TABLE=[[1,26,19],[1,26,16],[1,26,13],[1,26,9],[1,44,34],[1,44,28],[1,44,22],[1,44,16],[1,70,55],[1,70,44],[2,35,17],[2,35,13],[1,100,80],[2,50,32],[2,50,24],[4,25,9],[1,134,108],[2,67,43],[2,33,15,2,34,16],[2,33,11,2,34,12],[2,86,68],[4,43,27],
+[4,43,19],[4,43,15],[2,98,78],[4,49,31],[2,32,14,4,33,15],[4,39,13,1,40,14],[2,121,97],[2,60,38,2,61,39],[4,40,18,2,41,19],[4,40,14,2,41,15],[2,146,116],[3,58,36,2,59,37],[4,36,16,4,37,17],[4,36,12,4,37,13],[2,86,68,2,87,69],[4,69,43,1,70,44],[6,43,19,2,44,20],[6,43,15,2,44,16],[4,101,81],[1,80,50,4,81,51],[4,50,22,4,51,23],[3,36,12,8,37,13],[2,116,92,2,117,93],[6,58,36,2,59,37],[4,46,20,6,47,21],[7,42,14,4,43,15],[4,133,107],[8,59,37,1,60,38],[8,44,20,4,45,21],[12,33,11,4,34,12],[3,145,115,1,146,
+116],[4,64,40,5,65,41],[11,36,16,5,37,17],[11,36,12,5,37,13],[5,109,87,1,110,88],[5,65,41,5,66,42],[5,54,24,7,55,25],[11,36,12],[5,122,98,1,123,99],[7,73,45,3,74,46],[15,43,19,2,44,20],[3,45,15,13,46,16],[1,135,107,5,136,108],[10,74,46,1,75,47],[1,50,22,15,51,23],[2,42,14,17,43,15],[5,150,120,1,151,121],[9,69,43,4,70,44],[17,50,22,1,51,23],[2,42,14,19,43,15],[3,141,113,4,142,114],[3,70,44,11,71,45],[17,47,21,4,48,22],[9,39,13,16,40,14],[3,135,107,5,136,108],[3,67,41,13,68,42],[15,54,24,5,55,25],[15,
+43,15,10,44,16],[4,144,116,4,145,117],[17,68,42],[17,50,22,6,51,23],[19,46,16,6,47,17],[2,139,111,7,140,112],[17,74,46],[7,54,24,16,55,25],[34,37,13],[4,151,121,5,152,122],[4,75,47,14,76,48],[11,54,24,14,55,25],[16,45,15,14,46,16],[6,147,117,4,148,118],[6,73,45,14,74,46],[11,54,24,16,55,25],[30,46,16,2,47,17],[8,132,106,4,133,107],[8,75,47,13,76,48],[7,54,24,22,55,25],[22,45,15,13,46,16],[10,142,114,2,143,115],[19,74,46,4,75,47],[28,50,22,6,51,23],[33,46,16,4,47,17],[8,152,122,4,153,123],[22,73,45,
+3,74,46],[8,53,23,26,54,24],[12,45,15,28,46,16],[3,147,117,10,148,118],[3,73,45,23,74,46],[4,54,24,31,55,25],[11,45,15,31,46,16],[7,146,116,7,147,117],[21,73,45,7,74,46],[1,53,23,37,54,24],[19,45,15,26,46,16],[5,145,115,10,146,116],[19,75,47,10,76,48],[15,54,24,25,55,25],[23,45,15,25,46,16],[13,145,115,3,146,116],[2,74,46,29,75,47],[42,54,24,1,55,25],[23,45,15,28,46,16],[17,145,115],[10,74,46,23,75,47],[10,54,24,35,55,25],[19,45,15,35,46,16],[17,145,115,1,146,116],[14,74,46,21,75,47],[29,54,24,19,
+55,25],[11,45,15,46,46,16],[13,145,115,6,146,116],[14,74,46,23,75,47],[44,54,24,7,55,25],[59,46,16,1,47,17],[12,151,121,7,152,122],[12,75,47,26,76,48],[39,54,24,14,55,25],[22,45,15,41,46,16],[6,151,121,14,152,122],[6,75,47,34,76,48],[46,54,24,10,55,25],[2,45,15,64,46,16],[17,152,122,4,153,123],[29,74,46,14,75,47],[49,54,24,10,55,25],[24,45,15,46,46,16],[4,152,122,18,153,123],[13,74,46,32,75,47],[48,54,24,14,55,25],[42,45,15,32,46,16],[20,147,117,4,148,118],[40,75,47,7,76,48],[43,54,24,22,55,25],[10,
+45,15,67,46,16],[19,148,118,6,149,119],[18,75,47,31,76,48],[34,54,24,34,55,25],[20,45,15,61,46,16]];p.getRSBlocks=function(a,c){var d=p.getRsBlockTable(a,c);if(void 0==d)throw Error("bad rs block @ typeNumber:"+a+"/errorCorrectLevel:"+c);for(var b=d.length/3,e=[],f=0;f<b;f++)for(var h=d[3*f+0],g=d[3*f+1],j=d[3*f+2],l=0;l<h;l++)e.push(new p(g,j));return e};p.getRsBlockTable=function(a,c){switch(c){case 1:return p.RS_BLOCK_TABLE[4*(a-1)+0];case 0:return p.RS_BLOCK_TABLE[4*(a-1)+1];case 3:return p.RS_BLOCK_TABLE[4*
+(a-1)+2];case 2:return p.RS_BLOCK_TABLE[4*(a-1)+3]}};t.prototype={get:function(a){return 1==(this.buffer[Math.floor(a/8)]>>>7-a%8&1)},put:function(a,c){for(var d=0;d<c;d++)this.putBit(1==(a>>>c-d-1&1))},getLengthInBits:function(){return this.length},putBit:function(a){var c=Math.floor(this.length/8);this.buffer.length<=c&&this.buffer.push(0);a&&(this.buffer[c]|=128>>>this.length%8);this.length++}};"string"===typeof h&&(h={text:h});h=r.extend({},{render:"canvas",width:256,height:256,typeNumber:-1,
+correctLevel:2,background:"#ffffff",foreground:"#000000"},h);return this.each(function(){var a;if("canvas"==h.render){a=new o(h.typeNumber,h.correctLevel);a.addData(h.text);a.make();var c=document.createElement("canvas");c.width=h.width;c.height=h.height;for(var d=c.getContext("2d"),b=h.width/a.getModuleCount(),e=h.height/a.getModuleCount(),f=0;f<a.getModuleCount();f++)for(var i=0;i<a.getModuleCount();i++){d.fillStyle=a.isDark(f,i)?h.foreground:h.background;var g=Math.ceil((i+1)*b)-Math.floor(i*b),
+j=Math.ceil((f+1)*b)-Math.floor(f*b);d.fillRect(Math.round(i*b),Math.round(f*e),g,j)}}else{a=new o(h.typeNumber,h.correctLevel);a.addData(h.text);a.make();c=r("<table></table>").css("width",h.width+"px").css("height",h.height+"px").css("border","0px").css("border-collapse","collapse").css("background-color",h.background);d=h.width/a.getModuleCount();b=h.height/a.getModuleCount();for(e=0;e<a.getModuleCount();e++){f=r("<tr></tr>").css("height",b+"px").appendTo(c);for(i=0;i<a.getModuleCount();i++)r("<td></td>").css("width",
+d+"px").css("background-color",a.isDark(e,i)?h.foreground:h.background).appendTo(f)}}a=c;jQuery(a).appendTo(this)})}})(jQuery);
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/recharge/recharge.js b/pluss-wap-page/src/main/resources/static/resources/js/recharge/recharge.js
new file mode 100644
index 0000000..193aced
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/recharge/recharge.js
@@ -0,0 +1,48 @@
+window.onresize=function () {
+    document.documentElement.style.fontSize=document.documentElement.clientWidth/27+'px';
+    console.log(document.documentElement.clientWidth);
+    console.log(document.documentElement.clientHeight);
+    console.log(document.documentElement.style.fontSize);
+};
+window.onresize();
+$(function(){
+	//卡片选中
+	$(".choseCard").click(function(){
+		$(this).addClass("cardActive").append("<div class='sel-icon iconfont icon-gou'></div>");
+		$(this).siblings().removeClass("cardActive");
+		$(this).siblings().find(".sel-icon").remove();
+		var value = $(this).find("div.cardNum").attr("data-v");
+		$("#rnInput").val(value);
+	});
+	$("#rnInput").focus(function(){
+		$(".cardActive").removeClass("cardActive");
+		$(".icon-gou").remove();
+	})
+	/*$('.recharge-button').click(function(){
+		alertConfirm();
+	});
+	//确认弹窗
+	function alertConfirm(){
+		$.confirm({
+			title: '充值',
+			text: '',
+			onOK: function () {
+
+			},
+			onCancel: function () {
+			}
+		});
+	}
+	//开启loading
+	function openLoading(){
+		$('.recharge-loading').addClass('icon-loading');
+		$('.recharge-text').text('');
+		$('.recharge-button').css('background-color','#ec7b8e')
+	}
+	// 关闭loading
+	function closeLoading(){
+		$('.recharge-loading').removeClass('icon-loading');
+		$('.recharge-text').text('立即充值');
+		$('.recharge-button').css('background-color','#f33c5b')
+	}*/
+});
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/rechargeLog/rechargeLog.js b/pluss-wap-page/src/main/resources/static/resources/js/rechargeLog/rechargeLog.js
new file mode 100644
index 0000000..629010d
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/rechargeLog/rechargeLog.js
@@ -0,0 +1,97 @@
+/**
+ * create by robot 
+ * date Thu Sep 12 16:16:36 CST 2019 
+ */ 
+
+var pageIndex=1;
+$(document).ready(function(){
+	//调用查询
+	pageIndex=StringUtil.getQueryString('pageIndex');
+	if(pageIndex==undefined||pageIndex==null){
+		pageIndex=1;
+	}
+	queryMerchantMenberRecharge(pageIndex);
+});
+
+//查询
+function queryMerchantMenberRecharge(index){
+	if(typeof(index)=='undefined'){
+		index=1;
+	}
+	var url=ctx+'/vip/goRechargeLog';
+	$.ajax({  
+        url:url,  
+        type:"post", 
+        dataType:"json",
+        data:{  
+        	"currPage":index,
+        	 "memberCode":$("#memberCode").val(),
+             "storeId":$("#storeId").val(),
+        },  
+        success:function(result){
+        	//渲染数据
+        	$('#data_content').empty();
+        	var header='';
+        	var data='';
+        	data+='<div class="weui-flex lgraybg">';
+    		data+='<div class="weui-flex__item pt15 pb15 dgray tcenter f14">金额(元)</div>';
+    		data+='<div class="weui-flex__item pt15 pb15 dgray tcenter f14">时间</div>';
+    		data+='<div class="weui-flex__item pt15 pb15 dgray tcenter f14">状态</div>';
+    		data+='</div>';
+        	$.each(result.merchantMenberRechargeList,function(i){
+        		var merchantMenberRecharge=result.merchantMenberRechargeList[i];
+        		var createDt='';
+        		if(StringUtil.isNotBlank(merchantMenberRecharge.createDt)){
+        			createDt=new Date(merchantMenberRecharge.createDt).toYYYYMMDDHHMMSS();
+        		}
+        		data+='<div class="weui-flex bdbe">';
+        		data+='<div class="weui-flex__item pt15 pb15 tcenter f14">¥'+merchantMenberRecharge.rechargeMoney+'</div>';
+        		data+='<div class="weui-flex__item pt15 pb15 tcenter f14">'+createDt+'</div>';
+        		data+='<div class="weui-flex__item pt15 pb15 tcenter f14 f-green">充值成功</div>';
+        		data+='</div>';
+        	});
+        	$('#data_content').append(data);
+        } 
+    });  
+}
+
+
+//查询
+function queryMerchantMenberRecharge2(index){
+	if(typeof(index)=='undefined'){
+		index=1;
+	}
+	var url=ctx+'/vip/goRechargeLog';
+	$.ajax({  
+        url:url,  
+        type:"post", 
+        dataType:"json",
+        data:{  
+        	"currPage":index,
+        	 "memberCode":$("#memberCode").val(),
+             "storeId":$("#storeId").val(),
+        },  
+        success:function(result){ 
+        	var data='';
+        	//渲染数据
+        	$.each(result.merchantMenberRechargeList,function(i){
+        		var merchantMenberRecharge=result.merchantMenberRechargeList[i];
+        		var createDt='';
+        		if(StringUtil.isNotBlank(merchantMenberRecharge.createDt)){
+        			createDt=new Date(merchantMenberRecharge.createDt).toYYYYMMDDHHMMSS();
+        		}
+        		data+='<div class="weui-flex bdbe">';
+        		data+='<div class="weui-flex__item pt15 pb15 tcenter f14">¥'+merchantMenberRecharge.rechargeMoney+'</div>';
+        		data+='<div class="weui-flex__item pt15 pb15 tcenter f14">'+createDt+'</div>';
+        		data+='<div class="weui-flex__item pt15 pb15 tcenter f14 f-green">充值成功</div>';
+        		data+='</div>';
+        	});
+        	$('#data_content').append(data);
+        } 
+    });  
+}
+
+
+
+
+
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/swiper.min.js b/pluss-wap-page/src/main/resources/static/resources/js/swiper.min.js
new file mode 100644
index 0000000..e1e1a63
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/swiper.min.js
@@ -0,0 +1,13 @@
+/**
+ * Swiper 4.4.6
+ * Most modern mobile touch slider and framework with hardware accelerated transitions
+ * http://www.idangero.us/swiper/
+ *
+ * Copyright 2014-2018 Vladimir Kharlampidi
+ *
+ * Released under the MIT License
+ *
+ * Released on: December 19, 2018
+ */
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):e.Swiper=t()}(this,function(){"use strict";var f="undefined"==typeof document?{body:{},addEventListener:function(){},removeEventListener:function(){},activeElement:{blur:function(){},nodeName:""},querySelector:function(){return null},querySelectorAll:function(){return[]},getElementById:function(){return null},createEvent:function(){return{initEvent:function(){}}},createElement:function(){return{children:[],childNodes:[],style:{},setAttribute:function(){},getElementsByTagName:function(){return[]}}},location:{hash:""}}:document,J="undefined"==typeof window?{document:f,navigator:{userAgent:""},location:{},history:{},CustomEvent:function(){return this},addEventListener:function(){},removeEventListener:function(){},getComputedStyle:function(){return{getPropertyValue:function(){return""}}},Image:function(){},Date:function(){},screen:{},setTimeout:function(){},clearTimeout:function(){}}:window,l=function(e){for(var t=0;t<e.length;t+=1)this[t]=e[t];return this.length=e.length,this};function L(e,t){var a=[],i=0;if(e&&!t&&e instanceof l)return e;if(e)if("string"==typeof e){var s,r,n=e.trim();if(0<=n.indexOf("<")&&0<=n.indexOf(">")){var o="div";for(0===n.indexOf("<li")&&(o="ul"),0===n.indexOf("<tr")&&(o="tbody"),0!==n.indexOf("<td")&&0!==n.indexOf("<th")||(o="tr"),0===n.indexOf("<tbody")&&(o="table"),0===n.indexOf("<option")&&(o="select"),(r=f.createElement(o)).innerHTML=n,i=0;i<r.childNodes.length;i+=1)a.push(r.childNodes[i])}else for(s=t||"#"!==e[0]||e.match(/[ .<>:~]/)?(t||f).querySelectorAll(e.trim()):[f.getElementById(e.trim().split("#")[1])],i=0;i<s.length;i+=1)s[i]&&a.push(s[i])}else if(e.nodeType||e===J||e===f)a.push(e);else if(0<e.length&&e[0].nodeType)for(i=0;i<e.length;i+=1)a.push(e[i]);return new l(a)}function r(e){for(var t=[],a=0;a<e.length;a+=1)-1===t.indexOf(e[a])&&t.push(e[a]);return t}L.fn=l.prototype,L.Class=l,L.Dom7=l;var t={addClass:function(e){if(void 0===e)return this;for(var t=e.split(" "),a=0;a<t.length;a+=1)for(var i=0;i<this.length;i+=1)void 0!==this[i]&&void 0!==this[i].classList&&this[i].classList.add(t[a]);return this},removeClass:function(e){for(var t=e.split(" "),a=0;a<t.length;a+=1)for(var i=0;i<this.length;i+=1)void 0!==this[i]&&void 0!==this[i].classList&&this[i].classList.remove(t[a]);return this},hasClass:function(e){return!!this[0]&&this[0].classList.contains(e)},toggleClass:function(e){for(var t=e.split(" "),a=0;a<t.length;a+=1)for(var i=0;i<this.length;i+=1)void 0!==this[i]&&void 0!==this[i].classList&&this[i].classList.toggle(t[a]);return this},attr:function(e,t){var a=arguments;if(1===arguments.length&&"string"==typeof e)return this[0]?this[0].getAttribute(e):void 0;for(var i=0;i<this.length;i+=1)if(2===a.length)this[i].setAttribute(e,t);else for(var s in e)this[i][s]=e[s],this[i].setAttribute(s,e[s]);return this},removeAttr:function(e){for(var t=0;t<this.length;t+=1)this[t].removeAttribute(e);return this},data:function(e,t){var a;if(void 0!==t){for(var i=0;i<this.length;i+=1)(a=this[i]).dom7ElementDataStorage||(a.dom7ElementDataStorage={}),a.dom7ElementDataStorage[e]=t;return this}if(a=this[0]){if(a.dom7ElementDataStorage&&e in a.dom7ElementDataStorage)return a.dom7ElementDataStorage[e];var s=a.getAttribute("data-"+e);return s||void 0}},transform:function(e){for(var t=0;t<this.length;t+=1){var a=this[t].style;a.webkitTransform=e,a.transform=e}return this},transition:function(e){"string"!=typeof e&&(e+="ms");for(var t=0;t<this.length;t+=1){var a=this[t].style;a.webkitTransitionDuration=e,a.transitionDuration=e}return this},on:function(){for(var e,t=[],a=arguments.length;a--;)t[a]=arguments[a];var i=t[0],r=t[1],n=t[2],s=t[3];function o(e){var t=e.target;if(t){var a=e.target.dom7EventData||[];if(a.indexOf(e)<0&&a.unshift(e),L(t).is(r))n.apply(t,a);else for(var i=L(t).parents(),s=0;s<i.length;s+=1)L(i[s]).is(r)&&n.apply(i[s],a)}}function l(e){var t=e&&e.target&&e.target.dom7EventData||[];t.indexOf(e)<0&&t.unshift(e),n.apply(this,t)}"function"==typeof t[1]&&(i=(e=t)[0],n=e[1],s=e[2],r=void 0),s||(s=!1);for(var d,p=i.split(" "),c=0;c<this.length;c+=1){var u=this[c];if(r)for(d=0;d<p.length;d+=1){var h=p[d];u.dom7LiveListeners||(u.dom7LiveListeners={}),u.dom7LiveListeners[h]||(u.dom7LiveListeners[h]=[]),u.dom7LiveListeners[h].push({listener:n,proxyListener:o}),u.addEventListener(h,o,s)}else for(d=0;d<p.length;d+=1){var v=p[d];u.dom7Listeners||(u.dom7Listeners={}),u.dom7Listeners[v]||(u.dom7Listeners[v]=[]),u.dom7Listeners[v].push({listener:n,proxyListener:l}),u.addEventListener(v,l,s)}}return this},off:function(){for(var e,t=[],a=arguments.length;a--;)t[a]=arguments[a];var i=t[0],s=t[1],r=t[2],n=t[3];"function"==typeof t[1]&&(i=(e=t)[0],r=e[1],n=e[2],s=void 0),n||(n=!1);for(var o=i.split(" "),l=0;l<o.length;l+=1)for(var d=o[l],p=0;p<this.length;p+=1){var c=this[p],u=void 0;if(!s&&c.dom7Listeners?u=c.dom7Listeners[d]:s&&c.dom7LiveListeners&&(u=c.dom7LiveListeners[d]),u&&u.length)for(var h=u.length-1;0<=h;h-=1){var v=u[h];r&&v.listener===r?(c.removeEventListener(d,v.proxyListener,n),u.splice(h,1)):r||(c.removeEventListener(d,v.proxyListener,n),u.splice(h,1))}}return this},trigger:function(){for(var e=[],t=arguments.length;t--;)e[t]=arguments[t];for(var a=e[0].split(" "),i=e[1],s=0;s<a.length;s+=1)for(var r=a[s],n=0;n<this.length;n+=1){var o=this[n],l=void 0;try{l=new J.CustomEvent(r,{detail:i,bubbles:!0,cancelable:!0})}catch(e){(l=f.createEvent("Event")).initEvent(r,!0,!0),l.detail=i}o.dom7EventData=e.filter(function(e,t){return 0<t}),o.dispatchEvent(l),o.dom7EventData=[],delete o.dom7EventData}return this},transitionEnd:function(t){var a,i=["webkitTransitionEnd","transitionend"],s=this;function r(e){if(e.target===this)for(t.call(this,e),a=0;a<i.length;a+=1)s.off(i[a],r)}if(t)for(a=0;a<i.length;a+=1)s.on(i[a],r);return this},outerWidth:function(e){if(0<this.length){if(e){var t=this.styles();return this[0].offsetWidth+parseFloat(t.getPropertyValue("margin-right"))+parseFloat(t.getPropertyValue("margin-left"))}return this[0].offsetWidth}return null},outerHeight:function(e){if(0<this.length){if(e){var t=this.styles();return this[0].offsetHeight+parseFloat(t.getPropertyValue("margin-top"))+parseFloat(t.getPropertyValue("margin-bottom"))}return this[0].offsetHeight}return null},offset:function(){if(0<this.length){var e=this[0],t=e.getBoundingClientRect(),a=f.body,i=e.clientTop||a.clientTop||0,s=e.clientLeft||a.clientLeft||0,r=e===J?J.scrollY:e.scrollTop,n=e===J?J.scrollX:e.scrollLeft;return{top:t.top+r-i,left:t.left+n-s}}return null},css:function(e,t){var a;if(1===arguments.length){if("string"!=typeof e){for(a=0;a<this.length;a+=1)for(var i in e)this[a].style[i]=e[i];return this}if(this[0])return J.getComputedStyle(this[0],null).getPropertyValue(e)}if(2===arguments.length&&"string"==typeof e){for(a=0;a<this.length;a+=1)this[a].style[e]=t;return this}return this},each:function(e){if(!e)return this;for(var t=0;t<this.length;t+=1)if(!1===e.call(this[t],t,this[t]))return this;return this},html:function(e){if(void 0===e)return this[0]?this[0].innerHTML:void 0;for(var t=0;t<this.length;t+=1)this[t].innerHTML=e;return this},text:function(e){if(void 0===e)return this[0]?this[0].textContent.trim():null;for(var t=0;t<this.length;t+=1)this[t].textContent=e;return this},is:function(e){var t,a,i=this[0];if(!i||void 0===e)return!1;if("string"==typeof e){if(i.matches)return i.matches(e);if(i.webkitMatchesSelector)return i.webkitMatchesSelector(e);if(i.msMatchesSelector)return i.msMatchesSelector(e);for(t=L(e),a=0;a<t.length;a+=1)if(t[a]===i)return!0;return!1}if(e===f)return i===f;if(e===J)return i===J;if(e.nodeType||e instanceof l){for(t=e.nodeType?[e]:e,a=0;a<t.length;a+=1)if(t[a]===i)return!0;return!1}return!1},index:function(){var e,t=this[0];if(t){for(e=0;null!==(t=t.previousSibling);)1===t.nodeType&&(e+=1);return e}},eq:function(e){if(void 0===e)return this;var t,a=this.length;return new l(a-1<e?[]:e<0?(t=a+e)<0?[]:[this[t]]:[this[e]])},append:function(){for(var e,t=[],a=arguments.length;a--;)t[a]=arguments[a];for(var i=0;i<t.length;i+=1){e=t[i];for(var s=0;s<this.length;s+=1)if("string"==typeof e){var r=f.createElement("div");for(r.innerHTML=e;r.firstChild;)this[s].appendChild(r.firstChild)}else if(e instanceof l)for(var n=0;n<e.length;n+=1)this[s].appendChild(e[n]);else this[s].appendChild(e)}return this},prepend:function(e){var t,a;for(t=0;t<this.length;t+=1)if("string"==typeof e){var i=f.createElement("div");for(i.innerHTML=e,a=i.childNodes.length-1;0<=a;a-=1)this[t].insertBefore(i.childNodes[a],this[t].childNodes[0])}else if(e instanceof l)for(a=0;a<e.length;a+=1)this[t].insertBefore(e[a],this[t].childNodes[0]);else this[t].insertBefore(e,this[t].childNodes[0]);return this},next:function(e){return 0<this.length?e?this[0].nextElementSibling&&L(this[0].nextElementSibling).is(e)?new l([this[0].nextElementSibling]):new l([]):this[0].nextElementSibling?new l([this[0].nextElementSibling]):new l([]):new l([])},nextAll:function(e){var t=[],a=this[0];if(!a)return new l([]);for(;a.nextElementSibling;){var i=a.nextElementSibling;e?L(i).is(e)&&t.push(i):t.push(i),a=i}return new l(t)},prev:function(e){if(0<this.length){var t=this[0];return e?t.previousElementSibling&&L(t.previousElementSibling).is(e)?new l([t.previousElementSibling]):new l([]):t.previousElementSibling?new l([t.previousElementSibling]):new l([])}return new l([])},prevAll:function(e){var t=[],a=this[0];if(!a)return new l([]);for(;a.previousElementSibling;){var i=a.previousElementSibling;e?L(i).is(e)&&t.push(i):t.push(i),a=i}return new l(t)},parent:function(e){for(var t=[],a=0;a<this.length;a+=1)null!==this[a].parentNode&&(e?L(this[a].parentNode).is(e)&&t.push(this[a].parentNode):t.push(this[a].parentNode));return L(r(t))},parents:function(e){for(var t=[],a=0;a<this.length;a+=1)for(var i=this[a].parentNode;i;)e?L(i).is(e)&&t.push(i):t.push(i),i=i.parentNode;return L(r(t))},closest:function(e){var t=this;return void 0===e?new l([]):(t.is(e)||(t=t.parents(e).eq(0)),t)},find:function(e){for(var t=[],a=0;a<this.length;a+=1)for(var i=this[a].querySelectorAll(e),s=0;s<i.length;s+=1)t.push(i[s]);return new l(t)},children:function(e){for(var t=[],a=0;a<this.length;a+=1)for(var i=this[a].childNodes,s=0;s<i.length;s+=1)e?1===i[s].nodeType&&L(i[s]).is(e)&&t.push(i[s]):1===i[s].nodeType&&t.push(i[s]);return new l(r(t))},remove:function(){for(var e=0;e<this.length;e+=1)this[e].parentNode&&this[e].parentNode.removeChild(this[e]);return this},add:function(){for(var e=[],t=arguments.length;t--;)e[t]=arguments[t];var a,i;for(a=0;a<e.length;a+=1){var s=L(e[a]);for(i=0;i<s.length;i+=1)this[this.length]=s[i],this.length+=1}return this},styles:function(){return this[0]?J.getComputedStyle(this[0],null):{}}};Object.keys(t).forEach(function(e){L.fn[e]=t[e]});var e,a,i,ee={deleteProps:function(e){var t=e;Object.keys(t).forEach(function(e){try{t[e]=null}catch(e){}try{delete t[e]}catch(e){}})},nextTick:function(e,t){return void 0===t&&(t=0),setTimeout(e,t)},now:function(){return Date.now()},getTranslate:function(e,t){var a,i,s;void 0===t&&(t="x");var r=J.getComputedStyle(e,null);return J.WebKitCSSMatrix?(6<(i=r.transform||r.webkitTransform).split(",").length&&(i=i.split(", ").map(function(e){return e.replace(",",".")}).join(", ")),s=new J.WebKitCSSMatrix("none"===i?"":i)):a=(s=r.MozTransform||r.OTransform||r.MsTransform||r.msTransform||r.transform||r.getPropertyValue("transform").replace("translate(","matrix(1, 0, 0, 1,")).toString().split(","),"x"===t&&(i=J.WebKitCSSMatrix?s.m41:16===a.length?parseFloat(a[12]):parseFloat(a[4])),"y"===t&&(i=J.WebKitCSSMatrix?s.m42:16===a.length?parseFloat(a[13]):parseFloat(a[5])),i||0},parseUrlQuery:function(e){var t,a,i,s,r={},n=e||J.location.href;if("string"==typeof n&&n.length)for(s=(a=(n=-1<n.indexOf("?")?n.replace(/\S*\?/,""):"").split("&").filter(function(e){return""!==e})).length,t=0;t<s;t+=1)i=a[t].replace(/#\S+/g,"").split("="),r[decodeURIComponent(i[0])]=void 0===i[1]?void 0:decodeURIComponent(i[1])||"";return r},isObject:function(e){return"object"==typeof e&&null!==e&&e.constructor&&e.constructor===Object},extend:function(){for(var e=[],t=arguments.length;t--;)e[t]=arguments[t];for(var a=Object(e[0]),i=1;i<e.length;i+=1){var s=e[i];if(null!=s)for(var r=Object.keys(Object(s)),n=0,o=r.length;n<o;n+=1){var l=r[n],d=Object.getOwnPropertyDescriptor(s,l);void 0!==d&&d.enumerable&&(ee.isObject(a[l])&&ee.isObject(s[l])?ee.extend(a[l],s[l]):!ee.isObject(a[l])&&ee.isObject(s[l])?(a[l]={},ee.extend(a[l],s[l])):a[l]=s[l])}}return a}},te=(i=f.createElement("div"),{touch:J.Modernizr&&!0===J.Modernizr.touch||!!(0<J.navigator.maxTouchPoints||"ontouchstart"in J||J.DocumentTouch&&f instanceof J.DocumentTouch),pointerEvents:!!(J.navigator.pointerEnabled||J.PointerEvent||"maxTouchPoints"in J.navigator),prefixedPointerEvents:!!J.navigator.msPointerEnabled,transition:(a=i.style,"transition"in a||"webkitTransition"in a||"MozTransition"in a),transforms3d:J.Modernizr&&!0===J.Modernizr.csstransforms3d||(e=i.style,"webkitPerspective"in e||"MozPerspective"in e||"OPerspective"in e||"MsPerspective"in e||"perspective"in e),flexbox:function(){for(var e=i.style,t="alignItems webkitAlignItems webkitBoxAlign msFlexAlign mozBoxAlign webkitFlexDirection msFlexDirection mozBoxDirection mozBoxOrient webkitBoxDirection webkitBoxOrient".split(" "),a=0;a<t.length;a+=1)if(t[a]in e)return!0;return!1}(),observer:"MutationObserver"in J||"WebkitMutationObserver"in J,passiveListener:function(){var e=!1;try{var t=Object.defineProperty({},"passive",{get:function(){e=!0}});J.addEventListener("testPassiveListener",null,t)}catch(e){}return e}(),gestures:"ongesturestart"in J}),s=function(e){void 0===e&&(e={});var t=this;t.params=e,t.eventsListeners={},t.params&&t.params.on&&Object.keys(t.params.on).forEach(function(e){t.on(e,t.params.on[e])})},n={components:{configurable:!0}};s.prototype.on=function(e,t,a){var i=this;if("function"!=typeof t)return i;var s=a?"unshift":"push";return e.split(" ").forEach(function(e){i.eventsListeners[e]||(i.eventsListeners[e]=[]),i.eventsListeners[e][s](t)}),i},s.prototype.once=function(i,s,e){var r=this;if("function"!=typeof s)return r;return r.on(i,function e(){for(var t=[],a=arguments.length;a--;)t[a]=arguments[a];s.apply(r,t),r.off(i,e)},e)},s.prototype.off=function(e,i){var s=this;return s.eventsListeners&&e.split(" ").forEach(function(a){void 0===i?s.eventsListeners[a]=[]:s.eventsListeners[a]&&s.eventsListeners[a].length&&s.eventsListeners[a].forEach(function(e,t){e===i&&s.eventsListeners[a].splice(t,1)})}),s},s.prototype.emit=function(){for(var e=[],t=arguments.length;t--;)e[t]=arguments[t];var a,i,s,r=this;return r.eventsListeners&&("string"==typeof e[0]||Array.isArray(e[0])?(a=e[0],i=e.slice(1,e.length),s=r):(a=e[0].events,i=e[0].data,s=e[0].context||r),(Array.isArray(a)?a:a.split(" ")).forEach(function(e){if(r.eventsListeners&&r.eventsListeners[e]){var t=[];r.eventsListeners[e].forEach(function(e){t.push(e)}),t.forEach(function(e){e.apply(s,i)})}})),r},s.prototype.useModulesParams=function(a){var i=this;i.modules&&Object.keys(i.modules).forEach(function(e){var t=i.modules[e];t.params&&ee.extend(a,t.params)})},s.prototype.useModules=function(i){void 0===i&&(i={});var s=this;s.modules&&Object.keys(s.modules).forEach(function(e){var a=s.modules[e],t=i[e]||{};a.instance&&Object.keys(a.instance).forEach(function(e){var t=a.instance[e];s[e]="function"==typeof t?t.bind(s):t}),a.on&&s.on&&Object.keys(a.on).forEach(function(e){s.on(e,a.on[e])}),a.create&&a.create.bind(s)(t)})},n.components.set=function(e){this.use&&this.use(e)},s.installModule=function(t){for(var e=[],a=arguments.length-1;0<a--;)e[a]=arguments[a+1];var i=this;i.prototype.modules||(i.prototype.modules={});var s=t.name||Object.keys(i.prototype.modules).length+"_"+ee.now();return(i.prototype.modules[s]=t).proto&&Object.keys(t.proto).forEach(function(e){i.prototype[e]=t.proto[e]}),t.static&&Object.keys(t.static).forEach(function(e){i[e]=t.static[e]}),t.install&&t.install.apply(i,e),i},s.use=function(e){for(var t=[],a=arguments.length-1;0<a--;)t[a]=arguments[a+1];var i=this;return Array.isArray(e)?(e.forEach(function(e){return i.installModule(e)}),i):i.installModule.apply(i,[e].concat(t))},Object.defineProperties(s,n);var o={updateSize:function(){var e,t,a=this,i=a.$el;e=void 0!==a.params.width?a.params.width:i[0].clientWidth,t=void 0!==a.params.height?a.params.height:i[0].clientHeight,0===e&&a.isHorizontal()||0===t&&a.isVertical()||(e=e-parseInt(i.css("padding-left"),10)-parseInt(i.css("padding-right"),10),t=t-parseInt(i.css("padding-top"),10)-parseInt(i.css("padding-bottom"),10),ee.extend(a,{width:e,height:t,size:a.isHorizontal()?e:t}))},updateSlides:function(){var e=this,t=e.params,a=e.$wrapperEl,i=e.size,s=e.rtlTranslate,r=e.wrongRTL,n=e.virtual&&t.virtual.enabled,o=n?e.virtual.slides.length:e.slides.length,l=a.children("."+e.params.slideClass),d=n?e.virtual.slides.length:l.length,p=[],c=[],u=[],h=t.slidesOffsetBefore;"function"==typeof h&&(h=t.slidesOffsetBefore.call(e));var v=t.slidesOffsetAfter;"function"==typeof v&&(v=t.slidesOffsetAfter.call(e));var f=e.snapGrid.length,m=e.snapGrid.length,g=t.spaceBetween,b=-h,w=0,y=0;if(void 0!==i){var x,T;"string"==typeof g&&0<=g.indexOf("%")&&(g=parseFloat(g.replace("%",""))/100*i),e.virtualSize=-g,s?l.css({marginLeft:"",marginTop:""}):l.css({marginRight:"",marginBottom:""}),1<t.slidesPerColumn&&(x=Math.floor(d/t.slidesPerColumn)===d/e.params.slidesPerColumn?d:Math.ceil(d/t.slidesPerColumn)*t.slidesPerColumn,"auto"!==t.slidesPerView&&"row"===t.slidesPerColumnFill&&(x=Math.max(x,t.slidesPerView*t.slidesPerColumn)));for(var E,S=t.slidesPerColumn,C=x/S,M=Math.floor(d/t.slidesPerColumn),k=0;k<d;k+=1){T=0;var P=l.eq(k);if(1<t.slidesPerColumn){var z=void 0,$=void 0,L=void 0;"column"===t.slidesPerColumnFill?(L=k-($=Math.floor(k/S))*S,(M<$||$===M&&L===S-1)&&S<=(L+=1)&&(L=0,$+=1),z=$+L*x/S,P.css({"-webkit-box-ordinal-group":z,"-moz-box-ordinal-group":z,"-ms-flex-order":z,"-webkit-order":z,order:z})):$=k-(L=Math.floor(k/C))*C,P.css("margin-"+(e.isHorizontal()?"top":"left"),0!==L&&t.spaceBetween&&t.spaceBetween+"px").attr("data-swiper-column",$).attr("data-swiper-row",L)}if("none"!==P.css("display")){if("auto"===t.slidesPerView){var I=J.getComputedStyle(P[0],null),D=P[0].style.transform,O=P[0].style.webkitTransform;if(D&&(P[0].style.transform="none"),O&&(P[0].style.webkitTransform="none"),t.roundLengths)T=e.isHorizontal()?P.outerWidth(!0):P.outerHeight(!0);else if(e.isHorizontal()){var A=parseFloat(I.getPropertyValue("width")),N=parseFloat(I.getPropertyValue("padding-left")),H=parseFloat(I.getPropertyValue("padding-right")),G=parseFloat(I.getPropertyValue("margin-left")),B=parseFloat(I.getPropertyValue("margin-right")),X=I.getPropertyValue("box-sizing");T=X&&"border-box"===X?A+G+B:A+N+H+G+B}else{var Y=parseFloat(I.getPropertyValue("height")),V=parseFloat(I.getPropertyValue("padding-top")),F=parseFloat(I.getPropertyValue("padding-bottom")),R=parseFloat(I.getPropertyValue("margin-top")),q=parseFloat(I.getPropertyValue("margin-bottom")),W=I.getPropertyValue("box-sizing");T=W&&"border-box"===W?Y+R+q:Y+V+F+R+q}D&&(P[0].style.transform=D),O&&(P[0].style.webkitTransform=O),t.roundLengths&&(T=Math.floor(T))}else T=(i-(t.slidesPerView-1)*g)/t.slidesPerView,t.roundLengths&&(T=Math.floor(T)),l[k]&&(e.isHorizontal()?l[k].style.width=T+"px":l[k].style.height=T+"px");l[k]&&(l[k].swiperSlideSize=T),u.push(T),t.centeredSlides?(b=b+T/2+w/2+g,0===w&&0!==k&&(b=b-i/2-g),0===k&&(b=b-i/2-g),Math.abs(b)<.001&&(b=0),t.roundLengths&&(b=Math.floor(b)),y%t.slidesPerGroup==0&&p.push(b),c.push(b)):(t.roundLengths&&(b=Math.floor(b)),y%t.slidesPerGroup==0&&p.push(b),c.push(b),b=b+T+g),e.virtualSize+=T+g,w=T,y+=1}}if(e.virtualSize=Math.max(e.virtualSize,i)+v,s&&r&&("slide"===t.effect||"coverflow"===t.effect)&&a.css({width:e.virtualSize+t.spaceBetween+"px"}),te.flexbox&&!t.setWrapperSize||(e.isHorizontal()?a.css({width:e.virtualSize+t.spaceBetween+"px"}):a.css({height:e.virtualSize+t.spaceBetween+"px"})),1<t.slidesPerColumn&&(e.virtualSize=(T+t.spaceBetween)*x,e.virtualSize=Math.ceil(e.virtualSize/t.slidesPerColumn)-t.spaceBetween,e.isHorizontal()?a.css({width:e.virtualSize+t.spaceBetween+"px"}):a.css({height:e.virtualSize+t.spaceBetween+"px"}),t.centeredSlides)){E=[];for(var j=0;j<p.length;j+=1){var U=p[j];t.roundLengths&&(U=Math.floor(U)),p[j]<e.virtualSize+p[0]&&E.push(U)}p=E}if(!t.centeredSlides){E=[];for(var K=0;K<p.length;K+=1){var _=p[K];t.roundLengths&&(_=Math.floor(_)),p[K]<=e.virtualSize-i&&E.push(_)}p=E,1<Math.floor(e.virtualSize-i)-Math.floor(p[p.length-1])&&p.push(e.virtualSize-i)}if(0===p.length&&(p=[0]),0!==t.spaceBetween&&(e.isHorizontal()?s?l.css({marginLeft:g+"px"}):l.css({marginRight:g+"px"}):l.css({marginBottom:g+"px"})),t.centerInsufficientSlides){var Z=0;if(u.forEach(function(e){Z+=e+(t.spaceBetween?t.spaceBetween:0)}),(Z-=t.spaceBetween)<i){var Q=(i-Z)/2;p.forEach(function(e,t){p[t]=e-Q}),c.forEach(function(e,t){c[t]=e+Q})}}ee.extend(e,{slides:l,snapGrid:p,slidesGrid:c,slidesSizesGrid:u}),d!==o&&e.emit("slidesLengthChange"),p.length!==f&&(e.params.watchOverflow&&e.checkOverflow(),e.emit("snapGridLengthChange")),c.length!==m&&e.emit("slidesGridLengthChange"),(t.watchSlidesProgress||t.watchSlidesVisibility)&&e.updateSlidesOffset()}},updateAutoHeight:function(e){var t,a=this,i=[],s=0;if("number"==typeof e?a.setTransition(e):!0===e&&a.setTransition(a.params.speed),"auto"!==a.params.slidesPerView&&1<a.params.slidesPerView)for(t=0;t<Math.ceil(a.params.slidesPerView);t+=1){var r=a.activeIndex+t;if(r>a.slides.length)break;i.push(a.slides.eq(r)[0])}else i.push(a.slides.eq(a.activeIndex)[0]);for(t=0;t<i.length;t+=1)if(void 0!==i[t]){var n=i[t].offsetHeight;s=s<n?n:s}s&&a.$wrapperEl.css("height",s+"px")},updateSlidesOffset:function(){for(var e=this.slides,t=0;t<e.length;t+=1)e[t].swiperSlideOffset=this.isHorizontal()?e[t].offsetLeft:e[t].offsetTop},updateSlidesProgress:function(e){void 0===e&&(e=this&&this.translate||0);var t=this,a=t.params,i=t.slides,s=t.rtlTranslate;if(0!==i.length){void 0===i[0].swiperSlideOffset&&t.updateSlidesOffset();var r=-e;s&&(r=e),i.removeClass(a.slideVisibleClass),t.visibleSlidesIndexes=[],t.visibleSlides=[];for(var n=0;n<i.length;n+=1){var o=i[n],l=(r+(a.centeredSlides?t.minTranslate():0)-o.swiperSlideOffset)/(o.swiperSlideSize+a.spaceBetween);if(a.watchSlidesVisibility){var d=-(r-o.swiperSlideOffset),p=d+t.slidesSizesGrid[n];(0<=d&&d<t.size||0<p&&p<=t.size||d<=0&&p>=t.size)&&(t.visibleSlides.push(o),t.visibleSlidesIndexes.push(n),i.eq(n).addClass(a.slideVisibleClass))}o.progress=s?-l:l}t.visibleSlides=L(t.visibleSlides)}},updateProgress:function(e){void 0===e&&(e=this&&this.translate||0);var t=this,a=t.params,i=t.maxTranslate()-t.minTranslate(),s=t.progress,r=t.isBeginning,n=t.isEnd,o=r,l=n;0===i?n=r=!(s=0):(r=(s=(e-t.minTranslate())/i)<=0,n=1<=s),ee.extend(t,{progress:s,isBeginning:r,isEnd:n}),(a.watchSlidesProgress||a.watchSlidesVisibility)&&t.updateSlidesProgress(e),r&&!o&&t.emit("reachBeginning toEdge"),n&&!l&&t.emit("reachEnd toEdge"),(o&&!r||l&&!n)&&t.emit("fromEdge"),t.emit("progress",s)},updateSlidesClasses:function(){var e,t=this,a=t.slides,i=t.params,s=t.$wrapperEl,r=t.activeIndex,n=t.realIndex,o=t.virtual&&i.virtual.enabled;a.removeClass(i.slideActiveClass+" "+i.slideNextClass+" "+i.slidePrevClass+" "+i.slideDuplicateActiveClass+" "+i.slideDuplicateNextClass+" "+i.slideDuplicatePrevClass),(e=o?t.$wrapperEl.find("."+i.slideClass+'[data-swiper-slide-index="'+r+'"]'):a.eq(r)).addClass(i.slideActiveClass),i.loop&&(e.hasClass(i.slideDuplicateClass)?s.children("."+i.slideClass+":not(."+i.slideDuplicateClass+')[data-swiper-slide-index="'+n+'"]').addClass(i.slideDuplicateActiveClass):s.children("."+i.slideClass+"."+i.slideDuplicateClass+'[data-swiper-slide-index="'+n+'"]').addClass(i.slideDuplicateActiveClass));var l=e.nextAll("."+i.slideClass).eq(0).addClass(i.slideNextClass);i.loop&&0===l.length&&(l=a.eq(0)).addClass(i.slideNextClass);var d=e.prevAll("."+i.slideClass).eq(0).addClass(i.slidePrevClass);i.loop&&0===d.length&&(d=a.eq(-1)).addClass(i.slidePrevClass),i.loop&&(l.hasClass(i.slideDuplicateClass)?s.children("."+i.slideClass+":not(."+i.slideDuplicateClass+')[data-swiper-slide-index="'+l.attr("data-swiper-slide-index")+'"]').addClass(i.slideDuplicateNextClass):s.children("."+i.slideClass+"."+i.slideDuplicateClass+'[data-swiper-slide-index="'+l.attr("data-swiper-slide-index")+'"]').addClass(i.slideDuplicateNextClass),d.hasClass(i.slideDuplicateClass)?s.children("."+i.slideClass+":not(."+i.slideDuplicateClass+')[data-swiper-slide-index="'+d.attr("data-swiper-slide-index")+'"]').addClass(i.slideDuplicatePrevClass):s.children("."+i.slideClass+"."+i.slideDuplicateClass+'[data-swiper-slide-index="'+d.attr("data-swiper-slide-index")+'"]').addClass(i.slideDuplicatePrevClass))},updateActiveIndex:function(e){var t,a=this,i=a.rtlTranslate?a.translate:-a.translate,s=a.slidesGrid,r=a.snapGrid,n=a.params,o=a.activeIndex,l=a.realIndex,d=a.snapIndex,p=e;if(void 0===p){for(var c=0;c<s.length;c+=1)void 0!==s[c+1]?i>=s[c]&&i<s[c+1]-(s[c+1]-s[c])/2?p=c:i>=s[c]&&i<s[c+1]&&(p=c+1):i>=s[c]&&(p=c);n.normalizeSlideIndex&&(p<0||void 0===p)&&(p=0)}if((t=0<=r.indexOf(i)?r.indexOf(i):Math.floor(p/n.slidesPerGroup))>=r.length&&(t=r.length-1),p!==o){var u=parseInt(a.slides.eq(p).attr("data-swiper-slide-index")||p,10);ee.extend(a,{snapIndex:t,realIndex:u,previousIndex:o,activeIndex:p}),a.emit("activeIndexChange"),a.emit("snapIndexChange"),l!==u&&a.emit("realIndexChange"),a.emit("slideChange")}else t!==d&&(a.snapIndex=t,a.emit("snapIndexChange"))},updateClickedSlide:function(e){var t=this,a=t.params,i=L(e.target).closest("."+a.slideClass)[0],s=!1;if(i)for(var r=0;r<t.slides.length;r+=1)t.slides[r]===i&&(s=!0);if(!i||!s)return t.clickedSlide=void 0,void(t.clickedIndex=void 0);t.clickedSlide=i,t.virtual&&t.params.virtual.enabled?t.clickedIndex=parseInt(L(i).attr("data-swiper-slide-index"),10):t.clickedIndex=L(i).index(),a.slideToClickedSlide&&void 0!==t.clickedIndex&&t.clickedIndex!==t.activeIndex&&t.slideToClickedSlide()}};var d={getTranslate:function(e){void 0===e&&(e=this.isHorizontal()?"x":"y");var t=this.params,a=this.rtlTranslate,i=this.translate,s=this.$wrapperEl;if(t.virtualTranslate)return a?-i:i;var r=ee.getTranslate(s[0],e);return a&&(r=-r),r||0},setTranslate:function(e,t){var a=this,i=a.rtlTranslate,s=a.params,r=a.$wrapperEl,n=a.progress,o=0,l=0;a.isHorizontal()?o=i?-e:e:l=e,s.roundLengths&&(o=Math.floor(o),l=Math.floor(l)),s.virtualTranslate||(te.transforms3d?r.transform("translate3d("+o+"px, "+l+"px, 0px)"):r.transform("translate("+o+"px, "+l+"px)")),a.previousTranslate=a.translate,a.translate=a.isHorizontal()?o:l;var d=a.maxTranslate()-a.minTranslate();(0===d?0:(e-a.minTranslate())/d)!==n&&a.updateProgress(e),a.emit("setTranslate",a.translate,t)},minTranslate:function(){return-this.snapGrid[0]},maxTranslate:function(){return-this.snapGrid[this.snapGrid.length-1]}};var p={setTransition:function(e,t){this.$wrapperEl.transition(e),this.emit("setTransition",e,t)},transitionStart:function(e,t){void 0===e&&(e=!0);var a=this,i=a.activeIndex,s=a.params,r=a.previousIndex;s.autoHeight&&a.updateAutoHeight();var n=t;if(n||(n=r<i?"next":i<r?"prev":"reset"),a.emit("transitionStart"),e&&i!==r){if("reset"===n)return void a.emit("slideResetTransitionStart");a.emit("slideChangeTransitionStart"),"next"===n?a.emit("slideNextTransitionStart"):a.emit("slidePrevTransitionStart")}},transitionEnd:function(e,t){void 0===e&&(e=!0);var a=this,i=a.activeIndex,s=a.previousIndex;a.animating=!1,a.setTransition(0);var r=t;if(r||(r=s<i?"next":i<s?"prev":"reset"),a.emit("transitionEnd"),e&&i!==s){if("reset"===r)return void a.emit("slideResetTransitionEnd");a.emit("slideChangeTransitionEnd"),"next"===r?a.emit("slideNextTransitionEnd"):a.emit("slidePrevTransitionEnd")}}};var c={slideTo:function(e,t,a,i){void 0===e&&(e=0),void 0===t&&(t=this.params.speed),void 0===a&&(a=!0);var s=this,r=e;r<0&&(r=0);var n=s.params,o=s.snapGrid,l=s.slidesGrid,d=s.previousIndex,p=s.activeIndex,c=s.rtlTranslate;if(s.animating&&n.preventInteractionOnTransition)return!1;var u=Math.floor(r/n.slidesPerGroup);u>=o.length&&(u=o.length-1),(p||n.initialSlide||0)===(d||0)&&a&&s.emit("beforeSlideChangeStart");var h,v=-o[u];if(s.updateProgress(v),n.normalizeSlideIndex)for(var f=0;f<l.length;f+=1)-Math.floor(100*v)>=Math.floor(100*l[f])&&(r=f);if(s.initialized&&r!==p){if(!s.allowSlideNext&&v<s.translate&&v<s.minTranslate())return!1;if(!s.allowSlidePrev&&v>s.translate&&v>s.maxTranslate()&&(p||0)!==r)return!1}return h=p<r?"next":r<p?"prev":"reset",c&&-v===s.translate||!c&&v===s.translate?(s.updateActiveIndex(r),n.autoHeight&&s.updateAutoHeight(),s.updateSlidesClasses(),"slide"!==n.effect&&s.setTranslate(v),"reset"!==h&&(s.transitionStart(a,h),s.transitionEnd(a,h)),!1):(0!==t&&te.transition?(s.setTransition(t),s.setTranslate(v),s.updateActiveIndex(r),s.updateSlidesClasses(),s.emit("beforeTransitionStart",t,i),s.transitionStart(a,h),s.animating||(s.animating=!0,s.onSlideToWrapperTransitionEnd||(s.onSlideToWrapperTransitionEnd=function(e){s&&!s.destroyed&&e.target===this&&(s.$wrapperEl[0].removeEventListener("transitionend",s.onSlideToWrapperTransitionEnd),s.$wrapperEl[0].removeEventListener("webkitTransitionEnd",s.onSlideToWrapperTransitionEnd),s.onSlideToWrapperTransitionEnd=null,delete s.onSlideToWrapperTransitionEnd,s.transitionEnd(a,h))}),s.$wrapperEl[0].addEventListener("transitionend",s.onSlideToWrapperTransitionEnd),s.$wrapperEl[0].addEventListener("webkitTransitionEnd",s.onSlideToWrapperTransitionEnd))):(s.setTransition(0),s.setTranslate(v),s.updateActiveIndex(r),s.updateSlidesClasses(),s.emit("beforeTransitionStart",t,i),s.transitionStart(a,h),s.transitionEnd(a,h)),!0)},slideToLoop:function(e,t,a,i){void 0===e&&(e=0),void 0===t&&(t=this.params.speed),void 0===a&&(a=!0);var s=e;return this.params.loop&&(s+=this.loopedSlides),this.slideTo(s,t,a,i)},slideNext:function(e,t,a){void 0===e&&(e=this.params.speed),void 0===t&&(t=!0);var i=this,s=i.params,r=i.animating;return s.loop?!r&&(i.loopFix(),i._clientLeft=i.$wrapperEl[0].clientLeft,i.slideTo(i.activeIndex+s.slidesPerGroup,e,t,a)):i.slideTo(i.activeIndex+s.slidesPerGroup,e,t,a)},slidePrev:function(e,t,a){void 0===e&&(e=this.params.speed),void 0===t&&(t=!0);var i=this,s=i.params,r=i.animating,n=i.snapGrid,o=i.slidesGrid,l=i.rtlTranslate;if(s.loop){if(r)return!1;i.loopFix(),i._clientLeft=i.$wrapperEl[0].clientLeft}function d(e){return e<0?-Math.floor(Math.abs(e)):Math.floor(e)}var p,c=d(l?i.translate:-i.translate),u=n.map(function(e){return d(e)}),h=(o.map(function(e){return d(e)}),n[u.indexOf(c)],n[u.indexOf(c)-1]);return void 0!==h&&(p=o.indexOf(h))<0&&(p=i.activeIndex-1),i.slideTo(p,e,t,a)},slideReset:function(e,t,a){return void 0===e&&(e=this.params.speed),void 0===t&&(t=!0),this.slideTo(this.activeIndex,e,t,a)},slideToClosest:function(e,t,a){void 0===e&&(e=this.params.speed),void 0===t&&(t=!0);var i=this,s=i.activeIndex,r=Math.floor(s/i.params.slidesPerGroup);if(r<i.snapGrid.length-1){var n=i.rtlTranslate?i.translate:-i.translate,o=i.snapGrid[r];(i.snapGrid[r+1]-o)/2<n-o&&(s=i.params.slidesPerGroup)}return i.slideTo(s,e,t,a)},slideToClickedSlide:function(){var e,t=this,a=t.params,i=t.$wrapperEl,s="auto"===a.slidesPerView?t.slidesPerViewDynamic():a.slidesPerView,r=t.clickedIndex;if(a.loop){if(t.animating)return;e=parseInt(L(t.clickedSlide).attr("data-swiper-slide-index"),10),a.centeredSlides?r<t.loopedSlides-s/2||r>t.slides.length-t.loopedSlides+s/2?(t.loopFix(),r=i.children("."+a.slideClass+'[data-swiper-slide-index="'+e+'"]:not(.'+a.slideDuplicateClass+")").eq(0).index(),ee.nextTick(function(){t.slideTo(r)})):t.slideTo(r):r>t.slides.length-s?(t.loopFix(),r=i.children("."+a.slideClass+'[data-swiper-slide-index="'+e+'"]:not(.'+a.slideDuplicateClass+")").eq(0).index(),ee.nextTick(function(){t.slideTo(r)})):t.slideTo(r)}else t.slideTo(r)}};var u={loopCreate:function(){var i=this,e=i.params,t=i.$wrapperEl;t.children("."+e.slideClass+"."+e.slideDuplicateClass).remove();var s=t.children("."+e.slideClass);if(e.loopFillGroupWithBlank){var a=e.slidesPerGroup-s.length%e.slidesPerGroup;if(a!==e.slidesPerGroup){for(var r=0;r<a;r+=1){var n=L(f.createElement("div")).addClass(e.slideClass+" "+e.slideBlankClass);t.append(n)}s=t.children("."+e.slideClass)}}"auto"!==e.slidesPerView||e.loopedSlides||(e.loopedSlides=s.length),i.loopedSlides=parseInt(e.loopedSlides||e.slidesPerView,10),i.loopedSlides+=e.loopAdditionalSlides,i.loopedSlides>s.length&&(i.loopedSlides=s.length);var o=[],l=[];s.each(function(e,t){var a=L(t);e<i.loopedSlides&&l.push(t),e<s.length&&e>=s.length-i.loopedSlides&&o.push(t),a.attr("data-swiper-slide-index",e)});for(var d=0;d<l.length;d+=1)t.append(L(l[d].cloneNode(!0)).addClass(e.slideDuplicateClass));for(var p=o.length-1;0<=p;p-=1)t.prepend(L(o[p].cloneNode(!0)).addClass(e.slideDuplicateClass))},loopFix:function(){var e,t=this,a=t.params,i=t.activeIndex,s=t.slides,r=t.loopedSlides,n=t.allowSlidePrev,o=t.allowSlideNext,l=t.snapGrid,d=t.rtlTranslate;t.allowSlidePrev=!0,t.allowSlideNext=!0;var p=-l[i]-t.getTranslate();i<r?(e=s.length-3*r+i,e+=r,t.slideTo(e,0,!1,!0)&&0!==p&&t.setTranslate((d?-t.translate:t.translate)-p)):("auto"===a.slidesPerView&&2*r<=i||i>=s.length-r)&&(e=-s.length+i+r,e+=r,t.slideTo(e,0,!1,!0)&&0!==p&&t.setTranslate((d?-t.translate:t.translate)-p));t.allowSlidePrev=n,t.allowSlideNext=o},loopDestroy:function(){var e=this.$wrapperEl,t=this.params,a=this.slides;e.children("."+t.slideClass+"."+t.slideDuplicateClass+",."+t.slideClass+"."+t.slideBlankClass).remove(),a.removeAttr("data-swiper-slide-index")}};var h={setGrabCursor:function(e){if(!(te.touch||!this.params.simulateTouch||this.params.watchOverflow&&this.isLocked)){var t=this.el;t.style.cursor="move",t.style.cursor=e?"-webkit-grabbing":"-webkit-grab",t.style.cursor=e?"-moz-grabbin":"-moz-grab",t.style.cursor=e?"grabbing":"grab"}},unsetGrabCursor:function(){te.touch||this.params.watchOverflow&&this.isLocked||(this.el.style.cursor="")}};var v={appendSlide:function(e){var t=this,a=t.$wrapperEl,i=t.params;if(i.loop&&t.loopDestroy(),"object"==typeof e&&"length"in e)for(var s=0;s<e.length;s+=1)e[s]&&a.append(e[s]);else a.append(e);i.loop&&t.loopCreate(),i.observer&&te.observer||t.update()},prependSlide:function(e){var t=this,a=t.params,i=t.$wrapperEl,s=t.activeIndex;a.loop&&t.loopDestroy();var r=s+1;if("object"==typeof e&&"length"in e){for(var n=0;n<e.length;n+=1)e[n]&&i.prepend(e[n]);r=s+e.length}else i.prepend(e);a.loop&&t.loopCreate(),a.observer&&te.observer||t.update(),t.slideTo(r,0,!1)},addSlide:function(e,t){var a=this,i=a.$wrapperEl,s=a.params,r=a.activeIndex;s.loop&&(r-=a.loopedSlides,a.loopDestroy(),a.slides=i.children("."+s.slideClass));var n=a.slides.length;if(e<=0)a.prependSlide(t);else if(n<=e)a.appendSlide(t);else{for(var o=e<r?r+1:r,l=[],d=n-1;e<=d;d-=1){var p=a.slides.eq(d);p.remove(),l.unshift(p)}if("object"==typeof t&&"length"in t){for(var c=0;c<t.length;c+=1)t[c]&&i.append(t[c]);o=e<r?r+t.length:r}else i.append(t);for(var u=0;u<l.length;u+=1)i.append(l[u]);s.loop&&a.loopCreate(),s.observer&&te.observer||a.update(),s.loop?a.slideTo(o+a.loopedSlides,0,!1):a.slideTo(o,0,!1)}},removeSlide:function(e){var t=this,a=t.params,i=t.$wrapperEl,s=t.activeIndex;a.loop&&(s-=t.loopedSlides,t.loopDestroy(),t.slides=i.children("."+a.slideClass));var r,n=s;if("object"==typeof e&&"length"in e){for(var o=0;o<e.length;o+=1)r=e[o],t.slides[r]&&t.slides.eq(r).remove(),r<n&&(n-=1);n=Math.max(n,0)}else r=e,t.slides[r]&&t.slides.eq(r).remove(),r<n&&(n-=1),n=Math.max(n,0);a.loop&&t.loopCreate(),a.observer&&te.observer||t.update(),a.loop?t.slideTo(n+t.loopedSlides,0,!1):t.slideTo(n,0,!1)},removeAllSlides:function(){for(var e=[],t=0;t<this.slides.length;t+=1)e.push(t);this.removeSlide(e)}},m=function(){var e=J.navigator.userAgent,t={ios:!1,android:!1,androidChrome:!1,desktop:!1,windows:!1,iphone:!1,ipod:!1,ipad:!1,cordova:J.cordova||J.phonegap,phonegap:J.cordova||J.phonegap},a=e.match(/(Windows Phone);?[\s\/]+([\d.]+)?/),i=e.match(/(Android);?[\s\/]+([\d.]+)?/),s=e.match(/(iPad).*OS\s([\d_]+)/),r=e.match(/(iPod)(.*OS\s([\d_]+))?/),n=!s&&e.match(/(iPhone\sOS|iOS)\s([\d_]+)/);if(a&&(t.os="windows",t.osVersion=a[2],t.windows=!0),i&&!a&&(t.os="android",t.osVersion=i[2],t.android=!0,t.androidChrome=0<=e.toLowerCase().indexOf("chrome")),(s||n||r)&&(t.os="ios",t.ios=!0),n&&!r&&(t.osVersion=n[2].replace(/_/g,"."),t.iphone=!0),s&&(t.osVersion=s[2].replace(/_/g,"."),t.ipad=!0),r&&(t.osVersion=r[3]?r[3].replace(/_/g,"."):null,t.iphone=!0),t.ios&&t.osVersion&&0<=e.indexOf("Version/")&&"10"===t.osVersion.split(".")[0]&&(t.osVersion=e.toLowerCase().split("version/")[1].split(" ")[0]),t.desktop=!(t.os||t.android||t.webView),t.webView=(n||s||r)&&e.match(/.*AppleWebKit(?!.*Safari)/i),t.os&&"ios"===t.os){var o=t.osVersion.split("."),l=f.querySelector('meta[name="viewport"]');t.minimalUi=!t.webView&&(r||n)&&(1*o[0]==7?1<=1*o[1]:7<1*o[0])&&l&&0<=l.getAttribute("content").indexOf("minimal-ui")}return t.pixelRatio=J.devicePixelRatio||1,t}();function g(){var e=this,t=e.params,a=e.el;if(!a||0!==a.offsetWidth){t.breakpoints&&e.setBreakpoint();var i=e.allowSlideNext,s=e.allowSlidePrev,r=e.snapGrid;if(e.allowSlideNext=!0,e.allowSlidePrev=!0,e.updateSize(),e.updateSlides(),t.freeMode){var n=Math.min(Math.max(e.translate,e.maxTranslate()),e.minTranslate());e.setTranslate(n),e.updateActiveIndex(),e.updateSlidesClasses(),t.autoHeight&&e.updateAutoHeight()}else e.updateSlidesClasses(),("auto"===t.slidesPerView||1<t.slidesPerView)&&e.isEnd&&!e.params.centeredSlides?e.slideTo(e.slides.length-1,0,!1,!0):e.slideTo(e.activeIndex,0,!1,!0);e.allowSlidePrev=s,e.allowSlideNext=i,e.params.watchOverflow&&r!==e.snapGrid&&e.checkOverflow()}}var b={attachEvents:function(){var e=this,t=e.params,a=e.touchEvents,i=e.el,s=e.wrapperEl;e.onTouchStart=function(e){var t=this,a=t.touchEventsData,i=t.params,s=t.touches;if(!t.animating||!i.preventInteractionOnTransition){var r=e;if(r.originalEvent&&(r=r.originalEvent),a.isTouchEvent="touchstart"===r.type,(a.isTouchEvent||!("which"in r)||3!==r.which)&&!(!a.isTouchEvent&&"button"in r&&0<r.button||a.isTouched&&a.isMoved))if(i.noSwiping&&L(r.target).closest(i.noSwipingSelector?i.noSwipingSelector:"."+i.noSwipingClass)[0])t.allowClick=!0;else if(!i.swipeHandler||L(r).closest(i.swipeHandler)[0]){s.currentX="touchstart"===r.type?r.targetTouches[0].pageX:r.pageX,s.currentY="touchstart"===r.type?r.targetTouches[0].pageY:r.pageY;var n=s.currentX,o=s.currentY,l=i.edgeSwipeDetection||i.iOSEdgeSwipeDetection,d=i.edgeSwipeThreshold||i.iOSEdgeSwipeThreshold;if(!l||!(n<=d||n>=J.screen.width-d)){if(ee.extend(a,{isTouched:!0,isMoved:!1,allowTouchCallbacks:!0,isScrolling:void 0,startMoving:void 0}),s.startX=n,s.startY=o,a.touchStartTime=ee.now(),t.allowClick=!0,t.updateSize(),t.swipeDirection=void 0,0<i.threshold&&(a.allowThresholdMove=!1),"touchstart"!==r.type){var p=!0;L(r.target).is(a.formElements)&&(p=!1),f.activeElement&&L(f.activeElement).is(a.formElements)&&f.activeElement!==r.target&&f.activeElement.blur();var c=p&&t.allowTouchMove&&i.touchStartPreventDefault;(i.touchStartForcePreventDefault||c)&&r.preventDefault()}t.emit("touchStart",r)}}}}.bind(e),e.onTouchMove=function(e){var t=this,a=t.touchEventsData,i=t.params,s=t.touches,r=t.rtlTranslate,n=e;if(n.originalEvent&&(n=n.originalEvent),a.isTouched){if(!a.isTouchEvent||"mousemove"!==n.type){var o="touchmove"===n.type?n.targetTouches[0].pageX:n.pageX,l="touchmove"===n.type?n.targetTouches[0].pageY:n.pageY;if(n.preventedByNestedSwiper)return s.startX=o,void(s.startY=l);if(!t.allowTouchMove)return t.allowClick=!1,void(a.isTouched&&(ee.extend(s,{startX:o,startY:l,currentX:o,currentY:l}),a.touchStartTime=ee.now()));if(a.isTouchEvent&&i.touchReleaseOnEdges&&!i.loop)if(t.isVertical()){if(l<s.startY&&t.translate<=t.maxTranslate()||l>s.startY&&t.translate>=t.minTranslate())return a.isTouched=!1,void(a.isMoved=!1)}else if(o<s.startX&&t.translate<=t.maxTranslate()||o>s.startX&&t.translate>=t.minTranslate())return;if(a.isTouchEvent&&f.activeElement&&n.target===f.activeElement&&L(n.target).is(a.formElements))return a.isMoved=!0,void(t.allowClick=!1);if(a.allowTouchCallbacks&&t.emit("touchMove",n),!(n.targetTouches&&1<n.targetTouches.length)){s.currentX=o,s.currentY=l;var d,p=s.currentX-s.startX,c=s.currentY-s.startY;if(!(t.params.threshold&&Math.sqrt(Math.pow(p,2)+Math.pow(c,2))<t.params.threshold))if(void 0===a.isScrolling&&(t.isHorizontal()&&s.currentY===s.startY||t.isVertical()&&s.currentX===s.startX?a.isScrolling=!1:25<=p*p+c*c&&(d=180*Math.atan2(Math.abs(c),Math.abs(p))/Math.PI,a.isScrolling=t.isHorizontal()?d>i.touchAngle:90-d>i.touchAngle)),a.isScrolling&&t.emit("touchMoveOpposite",n),void 0===a.startMoving&&(s.currentX===s.startX&&s.currentY===s.startY||(a.startMoving=!0)),a.isScrolling)a.isTouched=!1;else if(a.startMoving){t.allowClick=!1,n.preventDefault(),i.touchMoveStopPropagation&&!i.nested&&n.stopPropagation(),a.isMoved||(i.loop&&t.loopFix(),a.startTranslate=t.getTranslate(),t.setTransition(0),t.animating&&t.$wrapperEl.trigger("webkitTransitionEnd transitionend"),a.allowMomentumBounce=!1,!i.grabCursor||!0!==t.allowSlideNext&&!0!==t.allowSlidePrev||t.setGrabCursor(!0),t.emit("sliderFirstMove",n)),t.emit("sliderMove",n),a.isMoved=!0;var u=t.isHorizontal()?p:c;s.diff=u,u*=i.touchRatio,r&&(u=-u),t.swipeDirection=0<u?"prev":"next",a.currentTranslate=u+a.startTranslate;var h=!0,v=i.resistanceRatio;if(i.touchReleaseOnEdges&&(v=0),0<u&&a.currentTranslate>t.minTranslate()?(h=!1,i.resistance&&(a.currentTranslate=t.minTranslate()-1+Math.pow(-t.minTranslate()+a.startTranslate+u,v))):u<0&&a.currentTranslate<t.maxTranslate()&&(h=!1,i.resistance&&(a.currentTranslate=t.maxTranslate()+1-Math.pow(t.maxTranslate()-a.startTranslate-u,v))),h&&(n.preventedByNestedSwiper=!0),!t.allowSlideNext&&"next"===t.swipeDirection&&a.currentTranslate<a.startTranslate&&(a.currentTranslate=a.startTranslate),!t.allowSlidePrev&&"prev"===t.swipeDirection&&a.currentTranslate>a.startTranslate&&(a.currentTranslate=a.startTranslate),0<i.threshold){if(!(Math.abs(u)>i.threshold||a.allowThresholdMove))return void(a.currentTranslate=a.startTranslate);if(!a.allowThresholdMove)return a.allowThresholdMove=!0,s.startX=s.currentX,s.startY=s.currentY,a.currentTranslate=a.startTranslate,void(s.diff=t.isHorizontal()?s.currentX-s.startX:s.currentY-s.startY)}i.followFinger&&((i.freeMode||i.watchSlidesProgress||i.watchSlidesVisibility)&&(t.updateActiveIndex(),t.updateSlidesClasses()),i.freeMode&&(0===a.velocities.length&&a.velocities.push({position:s[t.isHorizontal()?"startX":"startY"],time:a.touchStartTime}),a.velocities.push({position:s[t.isHorizontal()?"currentX":"currentY"],time:ee.now()})),t.updateProgress(a.currentTranslate),t.setTranslate(a.currentTranslate))}}}}else a.startMoving&&a.isScrolling&&t.emit("touchMoveOpposite",n)}.bind(e),e.onTouchEnd=function(e){var t=this,a=t.touchEventsData,i=t.params,s=t.touches,r=t.rtlTranslate,n=t.$wrapperEl,o=t.slidesGrid,l=t.snapGrid,d=e;if(d.originalEvent&&(d=d.originalEvent),a.allowTouchCallbacks&&t.emit("touchEnd",d),a.allowTouchCallbacks=!1,!a.isTouched)return a.isMoved&&i.grabCursor&&t.setGrabCursor(!1),a.isMoved=!1,void(a.startMoving=!1);i.grabCursor&&a.isMoved&&a.isTouched&&(!0===t.allowSlideNext||!0===t.allowSlidePrev)&&t.setGrabCursor(!1);var p,c=ee.now(),u=c-a.touchStartTime;if(t.allowClick&&(t.updateClickedSlide(d),t.emit("tap",d),u<300&&300<c-a.lastClickTime&&(a.clickTimeout&&clearTimeout(a.clickTimeout),a.clickTimeout=ee.nextTick(function(){t&&!t.destroyed&&t.emit("click",d)},300)),u<300&&c-a.lastClickTime<300&&(a.clickTimeout&&clearTimeout(a.clickTimeout),t.emit("doubleTap",d))),a.lastClickTime=ee.now(),ee.nextTick(function(){t.destroyed||(t.allowClick=!0)}),!a.isTouched||!a.isMoved||!t.swipeDirection||0===s.diff||a.currentTranslate===a.startTranslate)return a.isTouched=!1,a.isMoved=!1,void(a.startMoving=!1);if(a.isTouched=!1,a.isMoved=!1,a.startMoving=!1,p=i.followFinger?r?t.translate:-t.translate:-a.currentTranslate,i.freeMode){if(p<-t.minTranslate())return void t.slideTo(t.activeIndex);if(p>-t.maxTranslate())return void(t.slides.length<l.length?t.slideTo(l.length-1):t.slideTo(t.slides.length-1));if(i.freeModeMomentum){if(1<a.velocities.length){var h=a.velocities.pop(),v=a.velocities.pop(),f=h.position-v.position,m=h.time-v.time;t.velocity=f/m,t.velocity/=2,Math.abs(t.velocity)<i.freeModeMinimumVelocity&&(t.velocity=0),(150<m||300<ee.now()-h.time)&&(t.velocity=0)}else t.velocity=0;t.velocity*=i.freeModeMomentumVelocityRatio,a.velocities.length=0;var g=1e3*i.freeModeMomentumRatio,b=t.velocity*g,w=t.translate+b;r&&(w=-w);var y,x,T=!1,E=20*Math.abs(t.velocity)*i.freeModeMomentumBounceRatio;if(w<t.maxTranslate())i.freeModeMomentumBounce?(w+t.maxTranslate()<-E&&(w=t.maxTranslate()-E),y=t.maxTranslate(),T=!0,a.allowMomentumBounce=!0):w=t.maxTranslate(),i.loop&&i.centeredSlides&&(x=!0);else if(w>t.minTranslate())i.freeModeMomentumBounce?(w-t.minTranslate()>E&&(w=t.minTranslate()+E),y=t.minTranslate(),T=!0,a.allowMomentumBounce=!0):w=t.minTranslate(),i.loop&&i.centeredSlides&&(x=!0);else if(i.freeModeSticky){for(var S,C=0;C<l.length;C+=1)if(l[C]>-w){S=C;break}w=-(w=Math.abs(l[S]-w)<Math.abs(l[S-1]-w)||"next"===t.swipeDirection?l[S]:l[S-1])}if(x&&t.once("transitionEnd",function(){t.loopFix()}),0!==t.velocity)g=r?Math.abs((-w-t.translate)/t.velocity):Math.abs((w-t.translate)/t.velocity);else if(i.freeModeSticky)return void t.slideToClosest();i.freeModeMomentumBounce&&T?(t.updateProgress(y),t.setTransition(g),t.setTranslate(w),t.transitionStart(!0,t.swipeDirection),t.animating=!0,n.transitionEnd(function(){t&&!t.destroyed&&a.allowMomentumBounce&&(t.emit("momentumBounce"),t.setTransition(i.speed),t.setTranslate(y),n.transitionEnd(function(){t&&!t.destroyed&&t.transitionEnd()}))})):t.velocity?(t.updateProgress(w),t.setTransition(g),t.setTranslate(w),t.transitionStart(!0,t.swipeDirection),t.animating||(t.animating=!0,n.transitionEnd(function(){t&&!t.destroyed&&t.transitionEnd()}))):t.updateProgress(w),t.updateActiveIndex(),t.updateSlidesClasses()}else if(i.freeModeSticky)return void t.slideToClosest();(!i.freeModeMomentum||u>=i.longSwipesMs)&&(t.updateProgress(),t.updateActiveIndex(),t.updateSlidesClasses())}else{for(var M=0,k=t.slidesSizesGrid[0],P=0;P<o.length;P+=i.slidesPerGroup)void 0!==o[P+i.slidesPerGroup]?p>=o[P]&&p<o[P+i.slidesPerGroup]&&(k=o[(M=P)+i.slidesPerGroup]-o[P]):p>=o[P]&&(M=P,k=o[o.length-1]-o[o.length-2]);var z=(p-o[M])/k;if(u>i.longSwipesMs){if(!i.longSwipes)return void t.slideTo(t.activeIndex);"next"===t.swipeDirection&&(z>=i.longSwipesRatio?t.slideTo(M+i.slidesPerGroup):t.slideTo(M)),"prev"===t.swipeDirection&&(z>1-i.longSwipesRatio?t.slideTo(M+i.slidesPerGroup):t.slideTo(M))}else{if(!i.shortSwipes)return void t.slideTo(t.activeIndex);"next"===t.swipeDirection&&t.slideTo(M+i.slidesPerGroup),"prev"===t.swipeDirection&&t.slideTo(M)}}}.bind(e),e.onClick=function(e){this.allowClick||(this.params.preventClicks&&e.preventDefault(),this.params.preventClicksPropagation&&this.animating&&(e.stopPropagation(),e.stopImmediatePropagation()))}.bind(e);var r="container"===t.touchEventsTarget?i:s,n=!!t.nested;if(te.touch||!te.pointerEvents&&!te.prefixedPointerEvents){if(te.touch){var o=!("touchstart"!==a.start||!te.passiveListener||!t.passiveListeners)&&{passive:!0,capture:!1};r.addEventListener(a.start,e.onTouchStart,o),r.addEventListener(a.move,e.onTouchMove,te.passiveListener?{passive:!1,capture:n}:n),r.addEventListener(a.end,e.onTouchEnd,o)}(t.simulateTouch&&!m.ios&&!m.android||t.simulateTouch&&!te.touch&&m.ios)&&(r.addEventListener("mousedown",e.onTouchStart,!1),f.addEventListener("mousemove",e.onTouchMove,n),f.addEventListener("mouseup",e.onTouchEnd,!1))}else r.addEventListener(a.start,e.onTouchStart,!1),f.addEventListener(a.move,e.onTouchMove,n),f.addEventListener(a.end,e.onTouchEnd,!1);(t.preventClicks||t.preventClicksPropagation)&&r.addEventListener("click",e.onClick,!0),e.on(m.ios||m.android?"resize orientationchange observerUpdate":"resize observerUpdate",g,!0)},detachEvents:function(){var e=this,t=e.params,a=e.touchEvents,i=e.el,s=e.wrapperEl,r="container"===t.touchEventsTarget?i:s,n=!!t.nested;if(te.touch||!te.pointerEvents&&!te.prefixedPointerEvents){if(te.touch){var o=!("onTouchStart"!==a.start||!te.passiveListener||!t.passiveListeners)&&{passive:!0,capture:!1};r.removeEventListener(a.start,e.onTouchStart,o),r.removeEventListener(a.move,e.onTouchMove,n),r.removeEventListener(a.end,e.onTouchEnd,o)}(t.simulateTouch&&!m.ios&&!m.android||t.simulateTouch&&!te.touch&&m.ios)&&(r.removeEventListener("mousedown",e.onTouchStart,!1),f.removeEventListener("mousemove",e.onTouchMove,n),f.removeEventListener("mouseup",e.onTouchEnd,!1))}else r.removeEventListener(a.start,e.onTouchStart,!1),f.removeEventListener(a.move,e.onTouchMove,n),f.removeEventListener(a.end,e.onTouchEnd,!1);(t.preventClicks||t.preventClicksPropagation)&&r.removeEventListener("click",e.onClick,!0),e.off(m.ios||m.android?"resize orientationchange observerUpdate":"resize observerUpdate",g)}};var w,y={setBreakpoint:function(){var e=this,t=e.activeIndex,a=e.initialized,i=e.loopedSlides;void 0===i&&(i=0);var s=e.params,r=s.breakpoints;if(r&&(!r||0!==Object.keys(r).length)){var n=e.getBreakpoint(r);if(n&&e.currentBreakpoint!==n){var o=n in r?r[n]:void 0;o&&["slidesPerView","spaceBetween","slidesPerGroup"].forEach(function(e){var t=o[e];void 0!==t&&(o[e]="slidesPerView"!==e||"AUTO"!==t&&"auto"!==t?"slidesPerView"===e?parseFloat(t):parseInt(t,10):"auto")});var l=o||e.originalParams,d=s.loop&&l.slidesPerView!==s.slidesPerView;ee.extend(e.params,l),ee.extend(e,{allowTouchMove:e.params.allowTouchMove,allowSlideNext:e.params.allowSlideNext,allowSlidePrev:e.params.allowSlidePrev}),e.currentBreakpoint=n,d&&a&&(e.loopDestroy(),e.loopCreate(),e.updateSlides(),e.slideTo(t-i+e.loopedSlides,0,!1)),e.emit("breakpoint",l)}}},getBreakpoint:function(e){if(e){var t=!1,a=[];Object.keys(e).forEach(function(e){a.push(e)}),a.sort(function(e,t){return parseInt(e,10)-parseInt(t,10)});for(var i=0;i<a.length;i+=1){var s=a[i];this.params.breakpointsInverse?s<=J.innerWidth&&(t=s):s>=J.innerWidth&&!t&&(t=s)}return t||"max"}}},I={isIE:!!J.navigator.userAgent.match(/Trident/g)||!!J.navigator.userAgent.match(/MSIE/g),isEdge:!!J.navigator.userAgent.match(/Edge/g),isSafari:(w=J.navigator.userAgent.toLowerCase(),0<=w.indexOf("safari")&&w.indexOf("chrome")<0&&w.indexOf("android")<0),isUiWebView:/(iPhone|iPod|iPad).*AppleWebKit(?!.*Safari)/i.test(J.navigator.userAgent)};var x={init:!0,direction:"horizontal",touchEventsTarget:"container",initialSlide:0,speed:300,preventInteractionOnTransition:!1,edgeSwipeDetection:!1,edgeSwipeThreshold:20,freeMode:!1,freeModeMomentum:!0,freeModeMomentumRatio:1,freeModeMomentumBounce:!0,freeModeMomentumBounceRatio:1,freeModeMomentumVelocityRatio:1,freeModeSticky:!1,freeModeMinimumVelocity:.02,autoHeight:!1,setWrapperSize:!1,virtualTranslate:!1,effect:"slide",breakpoints:void 0,breakpointsInverse:!1,spaceBetween:0,slidesPerView:1,slidesPerColumn:1,slidesPerColumnFill:"column",slidesPerGroup:1,centeredSlides:!1,slidesOffsetBefore:0,slidesOffsetAfter:0,normalizeSlideIndex:!0,centerInsufficientSlides:!1,watchOverflow:!1,roundLengths:!1,touchRatio:1,touchAngle:45,simulateTouch:!0,shortSwipes:!0,longSwipes:!0,longSwipesRatio:.5,longSwipesMs:300,followFinger:!0,allowTouchMove:!0,threshold:0,touchMoveStopPropagation:!0,touchStartPreventDefault:!0,touchStartForcePreventDefault:!1,touchReleaseOnEdges:!1,uniqueNavElements:!0,resistance:!0,resistanceRatio:.85,watchSlidesProgress:!1,watchSlidesVisibility:!1,grabCursor:!1,preventClicks:!0,preventClicksPropagation:!0,slideToClickedSlide:!1,preloadImages:!0,updateOnImagesReady:!0,loop:!1,loopAdditionalSlides:0,loopedSlides:null,loopFillGroupWithBlank:!1,allowSlidePrev:!0,allowSlideNext:!0,swipeHandler:null,noSwiping:!0,noSwipingClass:"swiper-no-swiping",noSwipingSelector:null,passiveListeners:!0,containerModifierClass:"swiper-container-",slideClass:"swiper-slide",slideBlankClass:"swiper-slide-invisible-blank",slideActiveClass:"swiper-slide-active",slideDuplicateActiveClass:"swiper-slide-duplicate-active",slideVisibleClass:"swiper-slide-visible",slideDuplicateClass:"swiper-slide-duplicate",slideNextClass:"swiper-slide-next",slideDuplicateNextClass:"swiper-slide-duplicate-next",slidePrevClass:"swiper-slide-prev",slideDuplicatePrevClass:"swiper-slide-duplicate-prev",wrapperClass:"swiper-wrapper",runCallbacksOnInit:!0},T={update:o,translate:d,transition:p,slide:c,loop:u,grabCursor:h,manipulation:v,events:b,breakpoints:y,checkOverflow:{checkOverflow:function(){var e=this,t=e.isLocked;e.isLocked=1===e.snapGrid.length,e.allowSlideNext=!e.isLocked,e.allowSlidePrev=!e.isLocked,t!==e.isLocked&&e.emit(e.isLocked?"lock":"unlock"),t&&t!==e.isLocked&&(e.isEnd=!1,e.navigation.update())}},classes:{addClasses:function(){var t=this.classNames,a=this.params,e=this.rtl,i=this.$el,s=[];s.push(a.direction),a.freeMode&&s.push("free-mode"),te.flexbox||s.push("no-flexbox"),a.autoHeight&&s.push("autoheight"),e&&s.push("rtl"),1<a.slidesPerColumn&&s.push("multirow"),m.android&&s.push("android"),m.ios&&s.push("ios"),(I.isIE||I.isEdge)&&(te.pointerEvents||te.prefixedPointerEvents)&&s.push("wp8-"+a.direction),s.forEach(function(e){t.push(a.containerModifierClass+e)}),i.addClass(t.join(" "))},removeClasses:function(){var e=this.$el,t=this.classNames;e.removeClass(t.join(" "))}},images:{loadImage:function(e,t,a,i,s,r){var n;function o(){r&&r()}e.complete&&s?o():t?((n=new J.Image).onload=o,n.onerror=o,i&&(n.sizes=i),a&&(n.srcset=a),t&&(n.src=t)):o()},preloadImages:function(){var e=this;function t(){null!=e&&e&&!e.destroyed&&(void 0!==e.imagesLoaded&&(e.imagesLoaded+=1),e.imagesLoaded===e.imagesToLoad.length&&(e.params.updateOnImagesReady&&e.update(),e.emit("imagesReady")))}e.imagesToLoad=e.$el.find("img");for(var a=0;a<e.imagesToLoad.length;a+=1){var i=e.imagesToLoad[a];e.loadImage(i,i.currentSrc||i.getAttribute("src"),i.srcset||i.getAttribute("srcset"),i.sizes||i.getAttribute("sizes"),!0,t)}}}},E={},S=function(u){function h(){for(var e,t,s,a=[],i=arguments.length;i--;)a[i]=arguments[i];1===a.length&&a[0].constructor&&a[0].constructor===Object?s=a[0]:(t=(e=a)[0],s=e[1]),s||(s={}),s=ee.extend({},s),t&&!s.el&&(s.el=t),u.call(this,s),Object.keys(T).forEach(function(t){Object.keys(T[t]).forEach(function(e){h.prototype[e]||(h.prototype[e]=T[t][e])})});var r=this;void 0===r.modules&&(r.modules={}),Object.keys(r.modules).forEach(function(e){var t=r.modules[e];if(t.params){var a=Object.keys(t.params)[0],i=t.params[a];if("object"!=typeof i||null===i)return;if(!(a in s&&"enabled"in i))return;!0===s[a]&&(s[a]={enabled:!0}),"object"!=typeof s[a]||"enabled"in s[a]||(s[a].enabled=!0),s[a]||(s[a]={enabled:!1})}});var n=ee.extend({},x);r.useModulesParams(n),r.params=ee.extend({},n,E,s),r.originalParams=ee.extend({},r.params),r.passedParams=ee.extend({},s);var o=(r.$=L)(r.params.el);if(t=o[0]){if(1<o.length){var l=[];return o.each(function(e,t){var a=ee.extend({},s,{el:t});l.push(new h(a))}),l}t.swiper=r,o.data("swiper",r);var d,p,c=o.children("."+r.params.wrapperClass);return ee.extend(r,{$el:o,el:t,$wrapperEl:c,wrapperEl:c[0],classNames:[],slides:L(),slidesGrid:[],snapGrid:[],slidesSizesGrid:[],isHorizontal:function(){return"horizontal"===r.params.direction},isVertical:function(){return"vertical"===r.params.direction},rtl:"rtl"===t.dir.toLowerCase()||"rtl"===o.css("direction"),rtlTranslate:"horizontal"===r.params.direction&&("rtl"===t.dir.toLowerCase()||"rtl"===o.css("direction")),wrongRTL:"-webkit-box"===c.css("display"),activeIndex:0,realIndex:0,isBeginning:!0,isEnd:!1,translate:0,previousTranslate:0,progress:0,velocity:0,animating:!1,allowSlideNext:r.params.allowSlideNext,allowSlidePrev:r.params.allowSlidePrev,touchEvents:(d=["touchstart","touchmove","touchend"],p=["mousedown","mousemove","mouseup"],te.pointerEvents?p=["pointerdown","pointermove","pointerup"]:te.prefixedPointerEvents&&(p=["MSPointerDown","MSPointerMove","MSPointerUp"]),r.touchEventsTouch={start:d[0],move:d[1],end:d[2]},r.touchEventsDesktop={start:p[0],move:p[1],end:p[2]},te.touch||!r.params.simulateTouch?r.touchEventsTouch:r.touchEventsDesktop),touchEventsData:{isTouched:void 0,isMoved:void 0,allowTouchCallbacks:void 0,touchStartTime:void 0,isScrolling:void 0,currentTranslate:void 0,startTranslate:void 0,allowThresholdMove:void 0,formElements:"input, select, option, textarea, button, video",lastClickTime:ee.now(),clickTimeout:void 0,velocities:[],allowMomentumBounce:void 0,isTouchEvent:void 0,startMoving:void 0},allowClick:!0,allowTouchMove:r.params.allowTouchMove,touches:{startX:0,startY:0,currentX:0,currentY:0,diff:0},imagesToLoad:[],imagesLoaded:0}),r.useModules(),r.params.init&&r.init(),r}}u&&(h.__proto__=u);var e={extendedDefaults:{configurable:!0},defaults:{configurable:!0},Class:{configurable:!0},$:{configurable:!0}};return((h.prototype=Object.create(u&&u.prototype)).constructor=h).prototype.slidesPerViewDynamic=function(){var e=this,t=e.params,a=e.slides,i=e.slidesGrid,s=e.size,r=e.activeIndex,n=1;if(t.centeredSlides){for(var o,l=a[r].swiperSlideSize,d=r+1;d<a.length;d+=1)a[d]&&!o&&(n+=1,s<(l+=a[d].swiperSlideSize)&&(o=!0));for(var p=r-1;0<=p;p-=1)a[p]&&!o&&(n+=1,s<(l+=a[p].swiperSlideSize)&&(o=!0))}else for(var c=r+1;c<a.length;c+=1)i[c]-i[r]<s&&(n+=1);return n},h.prototype.update=function(){var a=this;if(a&&!a.destroyed){var e=a.snapGrid,t=a.params;t.breakpoints&&a.setBreakpoint(),a.updateSize(),a.updateSlides(),a.updateProgress(),a.updateSlidesClasses(),a.params.freeMode?(i(),a.params.autoHeight&&a.updateAutoHeight()):(("auto"===a.params.slidesPerView||1<a.params.slidesPerView)&&a.isEnd&&!a.params.centeredSlides?a.slideTo(a.slides.length-1,0,!1,!0):a.slideTo(a.activeIndex,0,!1,!0))||i(),t.watchOverflow&&e!==a.snapGrid&&a.checkOverflow(),a.emit("update")}function i(){var e=a.rtlTranslate?-1*a.translate:a.translate,t=Math.min(Math.max(e,a.maxTranslate()),a.minTranslate());a.setTranslate(t),a.updateActiveIndex(),a.updateSlidesClasses()}},h.prototype.init=function(){var e=this;e.initialized||(e.emit("beforeInit"),e.params.breakpoints&&e.setBreakpoint(),e.addClasses(),e.params.loop&&e.loopCreate(),e.updateSize(),e.updateSlides(),e.params.watchOverflow&&e.checkOverflow(),e.params.grabCursor&&e.setGrabCursor(),e.params.preloadImages&&e.preloadImages(),e.params.loop?e.slideTo(e.params.initialSlide+e.loopedSlides,0,e.params.runCallbacksOnInit):e.slideTo(e.params.initialSlide,0,e.params.runCallbacksOnInit),e.attachEvents(),e.initialized=!0,e.emit("init"))},h.prototype.destroy=function(e,t){void 0===e&&(e=!0),void 0===t&&(t=!0);var a=this,i=a.params,s=a.$el,r=a.$wrapperEl,n=a.slides;return void 0===a.params||a.destroyed||(a.emit("beforeDestroy"),a.initialized=!1,a.detachEvents(),i.loop&&a.loopDestroy(),t&&(a.removeClasses(),s.removeAttr("style"),r.removeAttr("style"),n&&n.length&&n.removeClass([i.slideVisibleClass,i.slideActiveClass,i.slideNextClass,i.slidePrevClass].join(" ")).removeAttr("style").removeAttr("data-swiper-slide-index").removeAttr("data-swiper-column").removeAttr("data-swiper-row")),a.emit("destroy"),Object.keys(a.eventsListeners).forEach(function(e){a.off(e)}),!1!==e&&(a.$el[0].swiper=null,a.$el.data("swiper",null),ee.deleteProps(a)),a.destroyed=!0),null},h.extendDefaults=function(e){ee.extend(E,e)},e.extendedDefaults.get=function(){return E},e.defaults.get=function(){return x},e.Class.get=function(){return u},e.$.get=function(){return L},Object.defineProperties(h,e),h}(s),C={name:"device",proto:{device:m},static:{device:m}},M={name:"support",proto:{support:te},static:{support:te}},k={name:"browser",proto:{browser:I},static:{browser:I}},P={name:"resize",create:function(){var e=this;ee.extend(e,{resize:{resizeHandler:function(){e&&!e.destroyed&&e.initialized&&(e.emit("beforeResize"),e.emit("resize"))},orientationChangeHandler:function(){e&&!e.destroyed&&e.initialized&&e.emit("orientationchange")}}})},on:{init:function(){J.addEventListener("resize",this.resize.resizeHandler),J.addEventListener("orientationchange",this.resize.orientationChangeHandler)},destroy:function(){J.removeEventListener("resize",this.resize.resizeHandler),J.removeEventListener("orientationchange",this.resize.orientationChangeHandler)}}},z={func:J.MutationObserver||J.WebkitMutationObserver,attach:function(e,t){void 0===t&&(t={});var a=this,i=new z.func(function(e){if(1!==e.length){var t=function(){a.emit("observerUpdate",e[0])};J.requestAnimationFrame?J.requestAnimationFrame(t):J.setTimeout(t,0)}else a.emit("observerUpdate",e[0])});i.observe(e,{attributes:void 0===t.attributes||t.attributes,childList:void 0===t.childList||t.childList,characterData:void 0===t.characterData||t.characterData}),a.observer.observers.push(i)},init:function(){var e=this;if(te.observer&&e.params.observer){if(e.params.observeParents)for(var t=e.$el.parents(),a=0;a<t.length;a+=1)e.observer.attach(t[a]);e.observer.attach(e.$el[0],{childList:e.params.observeSlideChildren}),e.observer.attach(e.$wrapperEl[0],{attributes:!1})}},destroy:function(){this.observer.observers.forEach(function(e){e.disconnect()}),this.observer.observers=[]}},$={name:"observer",params:{observer:!1,observeParents:!1,observeSlideChildren:!1},create:function(){ee.extend(this,{observer:{init:z.init.bind(this),attach:z.attach.bind(this),destroy:z.destroy.bind(this),observers:[]}})},on:{init:function(){this.observer.init()},destroy:function(){this.observer.destroy()}}},D={update:function(e){var t=this,a=t.params,i=a.slidesPerView,s=a.slidesPerGroup,r=a.centeredSlides,n=t.params.virtual,o=n.addSlidesBefore,l=n.addSlidesAfter,d=t.virtual,p=d.from,c=d.to,u=d.slides,h=d.slidesGrid,v=d.renderSlide,f=d.offset;t.updateActiveIndex();var m,g,b,w=t.activeIndex||0;m=t.rtlTranslate?"right":t.isHorizontal()?"left":"top",r?(g=Math.floor(i/2)+s+o,b=Math.floor(i/2)+s+l):(g=i+(s-1)+o,b=s+l);var y=Math.max((w||0)-b,0),x=Math.min((w||0)+g,u.length-1),T=(t.slidesGrid[y]||0)-(t.slidesGrid[0]||0);function E(){t.updateSlides(),t.updateProgress(),t.updateSlidesClasses(),t.lazy&&t.params.lazy.enabled&&t.lazy.load()}if(ee.extend(t.virtual,{from:y,to:x,offset:T,slidesGrid:t.slidesGrid}),p===y&&c===x&&!e)return t.slidesGrid!==h&&T!==f&&t.slides.css(m,T+"px"),void t.updateProgress();if(t.params.virtual.renderExternal)return t.params.virtual.renderExternal.call(t,{offset:T,from:y,to:x,slides:function(){for(var e=[],t=y;t<=x;t+=1)e.push(u[t]);return e}()}),void E();var S=[],C=[];if(e)t.$wrapperEl.find("."+t.params.slideClass).remove();else for(var M=p;M<=c;M+=1)(M<y||x<M)&&t.$wrapperEl.find("."+t.params.slideClass+'[data-swiper-slide-index="'+M+'"]').remove();for(var k=0;k<u.length;k+=1)y<=k&&k<=x&&(void 0===c||e?C.push(k):(c<k&&C.push(k),k<p&&S.push(k)));C.forEach(function(e){t.$wrapperEl.append(v(u[e],e))}),S.sort(function(e,t){return t-e}).forEach(function(e){t.$wrapperEl.prepend(v(u[e],e))}),t.$wrapperEl.children(".swiper-slide").css(m,T+"px"),E()},renderSlide:function(e,t){var a=this,i=a.params.virtual;if(i.cache&&a.virtual.cache[t])return a.virtual.cache[t];var s=i.renderSlide?L(i.renderSlide.call(a,e,t)):L('<div class="'+a.params.slideClass+'" data-swiper-slide-index="'+t+'">'+e+"</div>");return s.attr("data-swiper-slide-index")||s.attr("data-swiper-slide-index",t),i.cache&&(a.virtual.cache[t]=s),s},appendSlide:function(e){this.virtual.slides.push(e),this.virtual.update(!0)},prependSlide:function(e){var t=this;if(t.virtual.slides.unshift(e),t.params.virtual.cache){var a=t.virtual.cache,i={};Object.keys(a).forEach(function(e){i[e+1]=a[e]}),t.virtual.cache=i}t.virtual.update(!0),t.slideNext(0)}},O={name:"virtual",params:{virtual:{enabled:!1,slides:[],cache:!0,renderSlide:null,renderExternal:null,addSlidesBefore:0,addSlidesAfter:0}},create:function(){var e=this;ee.extend(e,{virtual:{update:D.update.bind(e),appendSlide:D.appendSlide.bind(e),prependSlide:D.prependSlide.bind(e),renderSlide:D.renderSlide.bind(e),slides:e.params.virtual.slides,cache:{}}})},on:{beforeInit:function(){var e=this;if(e.params.virtual.enabled){e.classNames.push(e.params.containerModifierClass+"virtual");var t={watchSlidesProgress:!0};ee.extend(e.params,t),ee.extend(e.originalParams,t),e.params.initialSlide||e.virtual.update()}},setTranslate:function(){this.params.virtual.enabled&&this.virtual.update()}}},A={handle:function(e){var t=this,a=t.rtlTranslate,i=e;i.originalEvent&&(i=i.originalEvent);var s=i.keyCode||i.charCode;if(!t.allowSlideNext&&(t.isHorizontal()&&39===s||t.isVertical()&&40===s))return!1;if(!t.allowSlidePrev&&(t.isHorizontal()&&37===s||t.isVertical()&&38===s))return!1;if(!(i.shiftKey||i.altKey||i.ctrlKey||i.metaKey||f.activeElement&&f.activeElement.nodeName&&("input"===f.activeElement.nodeName.toLowerCase()||"textarea"===f.activeElement.nodeName.toLowerCase()))){if(t.params.keyboard.onlyInViewport&&(37===s||39===s||38===s||40===s)){var r=!1;if(0<t.$el.parents("."+t.params.slideClass).length&&0===t.$el.parents("."+t.params.slideActiveClass).length)return;var n=J.innerWidth,o=J.innerHeight,l=t.$el.offset();a&&(l.left-=t.$el[0].scrollLeft);for(var d=[[l.left,l.top],[l.left+t.width,l.top],[l.left,l.top+t.height],[l.left+t.width,l.top+t.height]],p=0;p<d.length;p+=1){var c=d[p];0<=c[0]&&c[0]<=n&&0<=c[1]&&c[1]<=o&&(r=!0)}if(!r)return}t.isHorizontal()?(37!==s&&39!==s||(i.preventDefault?i.preventDefault():i.returnValue=!1),(39===s&&!a||37===s&&a)&&t.slideNext(),(37===s&&!a||39===s&&a)&&t.slidePrev()):(38!==s&&40!==s||(i.preventDefault?i.preventDefault():i.returnValue=!1),40===s&&t.slideNext(),38===s&&t.slidePrev()),t.emit("keyPress",s)}},enable:function(){this.keyboard.enabled||(L(f).on("keydown",this.keyboard.handle),this.keyboard.enabled=!0)},disable:function(){this.keyboard.enabled&&(L(f).off("keydown",this.keyboard.handle),this.keyboard.enabled=!1)}},N={name:"keyboard",params:{keyboard:{enabled:!1,onlyInViewport:!0}},create:function(){ee.extend(this,{keyboard:{enabled:!1,enable:A.enable.bind(this),disable:A.disable.bind(this),handle:A.handle.bind(this)}})},on:{init:function(){this.params.keyboard.enabled&&this.keyboard.enable()},destroy:function(){this.keyboard.enabled&&this.keyboard.disable()}}};var H={lastScrollTime:ee.now(),event:-1<J.navigator.userAgent.indexOf("firefox")?"DOMMouseScroll":function(){var e="onwheel",t=e in f;if(!t){var a=f.createElement("div");a.setAttribute(e,"return;"),t="function"==typeof a[e]}return!t&&f.implementation&&f.implementation.hasFeature&&!0!==f.implementation.hasFeature("","")&&(t=f.implementation.hasFeature("Events.wheel","3.0")),t}()?"wheel":"mousewheel",normalize:function(e){var t=0,a=0,i=0,s=0;return"detail"in e&&(a=e.detail),"wheelDelta"in e&&(a=-e.wheelDelta/120),"wheelDeltaY"in e&&(a=-e.wheelDeltaY/120),"wheelDeltaX"in e&&(t=-e.wheelDeltaX/120),"axis"in e&&e.axis===e.HORIZONTAL_AXIS&&(t=a,a=0),i=10*t,s=10*a,"deltaY"in e&&(s=e.deltaY),"deltaX"in e&&(i=e.deltaX),(i||s)&&e.deltaMode&&(1===e.deltaMode?(i*=40,s*=40):(i*=800,s*=800)),i&&!t&&(t=i<1?-1:1),s&&!a&&(a=s<1?-1:1),{spinX:t,spinY:a,pixelX:i,pixelY:s}},handleMouseEnter:function(){this.mouseEntered=!0},handleMouseLeave:function(){this.mouseEntered=!1},handle:function(e){var t=e,a=this,i=a.params.mousewheel;if(!a.mouseEntered&&!i.releaseOnEdges)return!0;t.originalEvent&&(t=t.originalEvent);var s=0,r=a.rtlTranslate?-1:1,n=H.normalize(t);if(i.forceToAxis)if(a.isHorizontal()){if(!(Math.abs(n.pixelX)>Math.abs(n.pixelY)))return!0;s=n.pixelX*r}else{if(!(Math.abs(n.pixelY)>Math.abs(n.pixelX)))return!0;s=n.pixelY}else s=Math.abs(n.pixelX)>Math.abs(n.pixelY)?-n.pixelX*r:-n.pixelY;if(0===s)return!0;if(i.invert&&(s=-s),a.params.freeMode){a.params.loop&&a.loopFix();var o=a.getTranslate()+s*i.sensitivity,l=a.isBeginning,d=a.isEnd;if(o>=a.minTranslate()&&(o=a.minTranslate()),o<=a.maxTranslate()&&(o=a.maxTranslate()),a.setTransition(0),a.setTranslate(o),a.updateProgress(),a.updateActiveIndex(),a.updateSlidesClasses(),(!l&&a.isBeginning||!d&&a.isEnd)&&a.updateSlidesClasses(),a.params.freeModeSticky&&(clearTimeout(a.mousewheel.timeout),a.mousewheel.timeout=ee.nextTick(function(){a.slideToClosest()},300)),a.emit("scroll",t),a.params.autoplay&&a.params.autoplayDisableOnInteraction&&a.autoplay.stop(),o===a.minTranslate()||o===a.maxTranslate())return!0}else{if(60<ee.now()-a.mousewheel.lastScrollTime)if(s<0)if(a.isEnd&&!a.params.loop||a.animating){if(i.releaseOnEdges)return!0}else a.slideNext(),a.emit("scroll",t);else if(a.isBeginning&&!a.params.loop||a.animating){if(i.releaseOnEdges)return!0}else a.slidePrev(),a.emit("scroll",t);a.mousewheel.lastScrollTime=(new J.Date).getTime()}return t.preventDefault?t.preventDefault():t.returnValue=!1,!1},enable:function(){var e=this;if(!H.event)return!1;if(e.mousewheel.enabled)return!1;var t=e.$el;return"container"!==e.params.mousewheel.eventsTarged&&(t=L(e.params.mousewheel.eventsTarged)),t.on("mouseenter",e.mousewheel.handleMouseEnter),t.on("mouseleave",e.mousewheel.handleMouseLeave),t.on(H.event,e.mousewheel.handle),e.mousewheel.enabled=!0},disable:function(){var e=this;if(!H.event)return!1;if(!e.mousewheel.enabled)return!1;var t=e.$el;return"container"!==e.params.mousewheel.eventsTarged&&(t=L(e.params.mousewheel.eventsTarged)),t.off(H.event,e.mousewheel.handle),!(e.mousewheel.enabled=!1)}},G={update:function(){var e=this,t=e.params.navigation;if(!e.params.loop){var a=e.navigation,i=a.$nextEl,s=a.$prevEl;s&&0<s.length&&(e.isBeginning?s.addClass(t.disabledClass):s.removeClass(t.disabledClass),s[e.params.watchOverflow&&e.isLocked?"addClass":"removeClass"](t.lockClass)),i&&0<i.length&&(e.isEnd?i.addClass(t.disabledClass):i.removeClass(t.disabledClass),i[e.params.watchOverflow&&e.isLocked?"addClass":"removeClass"](t.lockClass))}},onPrevClick:function(e){e.preventDefault(),this.isBeginning&&!this.params.loop||this.slidePrev()},onNextClick:function(e){e.preventDefault(),this.isEnd&&!this.params.loop||this.slideNext()},init:function(){var e,t,a=this,i=a.params.navigation;(i.nextEl||i.prevEl)&&(i.nextEl&&(e=L(i.nextEl),a.params.uniqueNavElements&&"string"==typeof i.nextEl&&1<e.length&&1===a.$el.find(i.nextEl).length&&(e=a.$el.find(i.nextEl))),i.prevEl&&(t=L(i.prevEl),a.params.uniqueNavElements&&"string"==typeof i.prevEl&&1<t.length&&1===a.$el.find(i.prevEl).length&&(t=a.$el.find(i.prevEl))),e&&0<e.length&&e.on("click",a.navigation.onNextClick),t&&0<t.length&&t.on("click",a.navigation.onPrevClick),ee.extend(a.navigation,{$nextEl:e,nextEl:e&&e[0],$prevEl:t,prevEl:t&&t[0]}))},destroy:function(){var e=this,t=e.navigation,a=t.$nextEl,i=t.$prevEl;a&&a.length&&(a.off("click",e.navigation.onNextClick),a.removeClass(e.params.navigation.disabledClass)),i&&i.length&&(i.off("click",e.navigation.onPrevClick),i.removeClass(e.params.navigation.disabledClass))}},B={update:function(){var e=this,t=e.rtl,s=e.params.pagination;if(s.el&&e.pagination.el&&e.pagination.$el&&0!==e.pagination.$el.length){var r,a=e.virtual&&e.params.virtual.enabled?e.virtual.slides.length:e.slides.length,i=e.pagination.$el,n=e.params.loop?Math.ceil((a-2*e.loopedSlides)/e.params.slidesPerGroup):e.snapGrid.length;if(e.params.loop?((r=Math.ceil((e.activeIndex-e.loopedSlides)/e.params.slidesPerGroup))>a-1-2*e.loopedSlides&&(r-=a-2*e.loopedSlides),n-1<r&&(r-=n),r<0&&"bullets"!==e.params.paginationType&&(r=n+r)):r=void 0!==e.snapIndex?e.snapIndex:e.activeIndex||0,"bullets"===s.type&&e.pagination.bullets&&0<e.pagination.bullets.length){var o,l,d,p=e.pagination.bullets;if(s.dynamicBullets&&(e.pagination.bulletSize=p.eq(0)[e.isHorizontal()?"outerWidth":"outerHeight"](!0),i.css(e.isHorizontal()?"width":"height",e.pagination.bulletSize*(s.dynamicMainBullets+4)+"px"),1<s.dynamicMainBullets&&void 0!==e.previousIndex&&(e.pagination.dynamicBulletIndex+=r-e.previousIndex,e.pagination.dynamicBulletIndex>s.dynamicMainBullets-1?e.pagination.dynamicBulletIndex=s.dynamicMainBullets-1:e.pagination.dynamicBulletIndex<0&&(e.pagination.dynamicBulletIndex=0)),o=r-e.pagination.dynamicBulletIndex,d=((l=o+(Math.min(p.length,s.dynamicMainBullets)-1))+o)/2),p.removeClass(s.bulletActiveClass+" "+s.bulletActiveClass+"-next "+s.bulletActiveClass+"-next-next "+s.bulletActiveClass+"-prev "+s.bulletActiveClass+"-prev-prev "+s.bulletActiveClass+"-main"),1<i.length)p.each(function(e,t){var a=L(t),i=a.index();i===r&&a.addClass(s.bulletActiveClass),s.dynamicBullets&&(o<=i&&i<=l&&a.addClass(s.bulletActiveClass+"-main"),i===o&&a.prev().addClass(s.bulletActiveClass+"-prev").prev().addClass(s.bulletActiveClass+"-prev-prev"),i===l&&a.next().addClass(s.bulletActiveClass+"-next").next().addClass(s.bulletActiveClass+"-next-next"))});else if(p.eq(r).addClass(s.bulletActiveClass),s.dynamicBullets){for(var c=p.eq(o),u=p.eq(l),h=o;h<=l;h+=1)p.eq(h).addClass(s.bulletActiveClass+"-main");c.prev().addClass(s.bulletActiveClass+"-prev").prev().addClass(s.bulletActiveClass+"-prev-prev"),u.next().addClass(s.bulletActiveClass+"-next").next().addClass(s.bulletActiveClass+"-next-next")}if(s.dynamicBullets){var v=Math.min(p.length,s.dynamicMainBullets+4),f=(e.pagination.bulletSize*v-e.pagination.bulletSize)/2-d*e.pagination.bulletSize,m=t?"right":"left";p.css(e.isHorizontal()?m:"top",f+"px")}}if("fraction"===s.type&&(i.find("."+s.currentClass).text(s.formatFractionCurrent(r+1)),i.find("."+s.totalClass).text(s.formatFractionTotal(n))),"progressbar"===s.type){var g;g=s.progressbarOpposite?e.isHorizontal()?"vertical":"horizontal":e.isHorizontal()?"horizontal":"vertical";var b=(r+1)/n,w=1,y=1;"horizontal"===g?w=b:y=b,i.find("."+s.progressbarFillClass).transform("translate3d(0,0,0) scaleX("+w+") scaleY("+y+")").transition(e.params.speed)}"custom"===s.type&&s.renderCustom?(i.html(s.renderCustom(e,r+1,n)),e.emit("paginationRender",e,i[0])):e.emit("paginationUpdate",e,i[0]),i[e.params.watchOverflow&&e.isLocked?"addClass":"removeClass"](s.lockClass)}},render:function(){var e=this,t=e.params.pagination;if(t.el&&e.pagination.el&&e.pagination.$el&&0!==e.pagination.$el.length){var a=e.virtual&&e.params.virtual.enabled?e.virtual.slides.length:e.slides.length,i=e.pagination.$el,s="";if("bullets"===t.type){for(var r=e.params.loop?Math.ceil((a-2*e.loopedSlides)/e.params.slidesPerGroup):e.snapGrid.length,n=0;n<r;n+=1)t.renderBullet?s+=t.renderBullet.call(e,n,t.bulletClass):s+="<"+t.bulletElement+' class="'+t.bulletClass+'"></'+t.bulletElement+">";i.html(s),e.pagination.bullets=i.find("."+t.bulletClass)}"fraction"===t.type&&(s=t.renderFraction?t.renderFraction.call(e,t.currentClass,t.totalClass):'<span class="'+t.currentClass+'"></span> / <span class="'+t.totalClass+'"></span>',i.html(s)),"progressbar"===t.type&&(s=t.renderProgressbar?t.renderProgressbar.call(e,t.progressbarFillClass):'<span class="'+t.progressbarFillClass+'"></span>',i.html(s)),"custom"!==t.type&&e.emit("paginationRender",e.pagination.$el[0])}},init:function(){var a=this,e=a.params.pagination;if(e.el){var t=L(e.el);0!==t.length&&(a.params.uniqueNavElements&&"string"==typeof e.el&&1<t.length&&1===a.$el.find(e.el).length&&(t=a.$el.find(e.el)),"bullets"===e.type&&e.clickable&&t.addClass(e.clickableClass),t.addClass(e.modifierClass+e.type),"bullets"===e.type&&e.dynamicBullets&&(t.addClass(""+e.modifierClass+e.type+"-dynamic"),a.pagination.dynamicBulletIndex=0,e.dynamicMainBullets<1&&(e.dynamicMainBullets=1)),"progressbar"===e.type&&e.progressbarOpposite&&t.addClass(e.progressbarOppositeClass),e.clickable&&t.on("click","."+e.bulletClass,function(e){e.preventDefault();var t=L(this).index()*a.params.slidesPerGroup;a.params.loop&&(t+=a.loopedSlides),a.slideTo(t)}),ee.extend(a.pagination,{$el:t,el:t[0]}))}},destroy:function(){var e=this,t=e.params.pagination;if(t.el&&e.pagination.el&&e.pagination.$el&&0!==e.pagination.$el.length){var a=e.pagination.$el;a.removeClass(t.hiddenClass),a.removeClass(t.modifierClass+t.type),e.pagination.bullets&&e.pagination.bullets.removeClass(t.bulletActiveClass),t.clickable&&a.off("click","."+t.bulletClass)}}},X={setTranslate:function(){var e=this;if(e.params.scrollbar.el&&e.scrollbar.el){var t=e.scrollbar,a=e.rtlTranslate,i=e.progress,s=t.dragSize,r=t.trackSize,n=t.$dragEl,o=t.$el,l=e.params.scrollbar,d=s,p=(r-s)*i;a?0<(p=-p)?(d=s-p,p=0):r<-p+s&&(d=r+p):p<0?(d=s+p,p=0):r<p+s&&(d=r-p),e.isHorizontal()?(te.transforms3d?n.transform("translate3d("+p+"px, 0, 0)"):n.transform("translateX("+p+"px)"),n[0].style.width=d+"px"):(te.transforms3d?n.transform("translate3d(0px, "+p+"px, 0)"):n.transform("translateY("+p+"px)"),n[0].style.height=d+"px"),l.hide&&(clearTimeout(e.scrollbar.timeout),o[0].style.opacity=1,e.scrollbar.timeout=setTimeout(function(){o[0].style.opacity=0,o.transition(400)},1e3))}},setTransition:function(e){this.params.scrollbar.el&&this.scrollbar.el&&this.scrollbar.$dragEl.transition(e)},updateSize:function(){var e=this;if(e.params.scrollbar.el&&e.scrollbar.el){var t=e.scrollbar,a=t.$dragEl,i=t.$el;a[0].style.width="",a[0].style.height="";var s,r=e.isHorizontal()?i[0].offsetWidth:i[0].offsetHeight,n=e.size/e.virtualSize,o=n*(r/e.size);s="auto"===e.params.scrollbar.dragSize?r*n:parseInt(e.params.scrollbar.dragSize,10),e.isHorizontal()?a[0].style.width=s+"px":a[0].style.height=s+"px",i[0].style.display=1<=n?"none":"",e.params.scrollbarHide&&(i[0].style.opacity=0),ee.extend(t,{trackSize:r,divider:n,moveDivider:o,dragSize:s}),t.$el[e.params.watchOverflow&&e.isLocked?"addClass":"removeClass"](e.params.scrollbar.lockClass)}},setDragPosition:function(e){var t,a=this,i=a.scrollbar,s=a.rtlTranslate,r=i.$el,n=i.dragSize,o=i.trackSize;t=((a.isHorizontal()?"touchstart"===e.type||"touchmove"===e.type?e.targetTouches[0].pageX:e.pageX||e.clientX:"touchstart"===e.type||"touchmove"===e.type?e.targetTouches[0].pageY:e.pageY||e.clientY)-r.offset()[a.isHorizontal()?"left":"top"]-n/2)/(o-n),t=Math.max(Math.min(t,1),0),s&&(t=1-t);var l=a.minTranslate()+(a.maxTranslate()-a.minTranslate())*t;a.updateProgress(l),a.setTranslate(l),a.updateActiveIndex(),a.updateSlidesClasses()},onDragStart:function(e){var t=this,a=t.params.scrollbar,i=t.scrollbar,s=t.$wrapperEl,r=i.$el,n=i.$dragEl;t.scrollbar.isTouched=!0,e.preventDefault(),e.stopPropagation(),s.transition(100),n.transition(100),i.setDragPosition(e),clearTimeout(t.scrollbar.dragTimeout),r.transition(0),a.hide&&r.css("opacity",1),t.emit("scrollbarDragStart",e)},onDragMove:function(e){var t=this.scrollbar,a=this.$wrapperEl,i=t.$el,s=t.$dragEl;this.scrollbar.isTouched&&(e.preventDefault?e.preventDefault():e.returnValue=!1,t.setDragPosition(e),a.transition(0),i.transition(0),s.transition(0),this.emit("scrollbarDragMove",e))},onDragEnd:function(e){var t=this,a=t.params.scrollbar,i=t.scrollbar.$el;t.scrollbar.isTouched&&(t.scrollbar.isTouched=!1,a.hide&&(clearTimeout(t.scrollbar.dragTimeout),t.scrollbar.dragTimeout=ee.nextTick(function(){i.css("opacity",0),i.transition(400)},1e3)),t.emit("scrollbarDragEnd",e),a.snapOnRelease&&t.slideToClosest())},enableDraggable:function(){var e=this;if(e.params.scrollbar.el){var t=e.scrollbar,a=e.touchEventsTouch,i=e.touchEventsDesktop,s=e.params,r=t.$el[0],n=!(!te.passiveListener||!s.passiveListeners)&&{passive:!1,capture:!1},o=!(!te.passiveListener||!s.passiveListeners)&&{passive:!0,capture:!1};te.touch?(r.addEventListener(a.start,e.scrollbar.onDragStart,n),r.addEventListener(a.move,e.scrollbar.onDragMove,n),r.addEventListener(a.end,e.scrollbar.onDragEnd,o)):(r.addEventListener(i.start,e.scrollbar.onDragStart,n),f.addEventListener(i.move,e.scrollbar.onDragMove,n),f.addEventListener(i.end,e.scrollbar.onDragEnd,o))}},disableDraggable:function(){var e=this;if(e.params.scrollbar.el){var t=e.scrollbar,a=e.touchEventsTouch,i=e.touchEventsDesktop,s=e.params,r=t.$el[0],n=!(!te.passiveListener||!s.passiveListeners)&&{passive:!1,capture:!1},o=!(!te.passiveListener||!s.passiveListeners)&&{passive:!0,capture:!1};te.touch?(r.removeEventListener(a.start,e.scrollbar.onDragStart,n),r.removeEventListener(a.move,e.scrollbar.onDragMove,n),r.removeEventListener(a.end,e.scrollbar.onDragEnd,o)):(r.removeEventListener(i.start,e.scrollbar.onDragStart,n),f.removeEventListener(i.move,e.scrollbar.onDragMove,n),f.removeEventListener(i.end,e.scrollbar.onDragEnd,o))}},init:function(){var e=this;if(e.params.scrollbar.el){var t=e.scrollbar,a=e.$el,i=e.params.scrollbar,s=L(i.el);e.params.uniqueNavElements&&"string"==typeof i.el&&1<s.length&&1===a.find(i.el).length&&(s=a.find(i.el));var r=s.find("."+e.params.scrollbar.dragClass);0===r.length&&(r=L('<div class="'+e.params.scrollbar.dragClass+'"></div>'),s.append(r)),ee.extend(t,{$el:s,el:s[0],$dragEl:r,dragEl:r[0]}),i.draggable&&t.enableDraggable()}},destroy:function(){this.scrollbar.disableDraggable()}},Y={setTransform:function(e,t){var a=this.rtl,i=L(e),s=a?-1:1,r=i.attr("data-swiper-parallax")||"0",n=i.attr("data-swiper-parallax-x"),o=i.attr("data-swiper-parallax-y"),l=i.attr("data-swiper-parallax-scale"),d=i.attr("data-swiper-parallax-opacity");if(n||o?(n=n||"0",o=o||"0"):this.isHorizontal()?(n=r,o="0"):(o=r,n="0"),n=0<=n.indexOf("%")?parseInt(n,10)*t*s+"%":n*t*s+"px",o=0<=o.indexOf("%")?parseInt(o,10)*t+"%":o*t+"px",null!=d){var p=d-(d-1)*(1-Math.abs(t));i[0].style.opacity=p}if(null==l)i.transform("translate3d("+n+", "+o+", 0px)");else{var c=l-(l-1)*(1-Math.abs(t));i.transform("translate3d("+n+", "+o+", 0px) scale("+c+")")}},setTranslate:function(){var i=this,e=i.$el,t=i.slides,s=i.progress,r=i.snapGrid;e.children("[data-swiper-parallax], [data-swiper-parallax-x], [data-swiper-parallax-y]").each(function(e,t){i.parallax.setTransform(t,s)}),t.each(function(e,t){var a=t.progress;1<i.params.slidesPerGroup&&"auto"!==i.params.slidesPerView&&(a+=Math.ceil(e/2)-s*(r.length-1)),a=Math.min(Math.max(a,-1),1),L(t).find("[data-swiper-parallax], [data-swiper-parallax-x], [data-swiper-parallax-y]").each(function(e,t){i.parallax.setTransform(t,a)})})},setTransition:function(s){void 0===s&&(s=this.params.speed);this.$el.find("[data-swiper-parallax], [data-swiper-parallax-x], [data-swiper-parallax-y]").each(function(e,t){var a=L(t),i=parseInt(a.attr("data-swiper-parallax-duration"),10)||s;0===s&&(i=0),a.transition(i)})}},V={getDistanceBetweenTouches:function(e){if(e.targetTouches.length<2)return 1;var t=e.targetTouches[0].pageX,a=e.targetTouches[0].pageY,i=e.targetTouches[1].pageX,s=e.targetTouches[1].pageY;return Math.sqrt(Math.pow(i-t,2)+Math.pow(s-a,2))},onGestureStart:function(e){var t=this,a=t.params.zoom,i=t.zoom,s=i.gesture;if(i.fakeGestureTouched=!1,i.fakeGestureMoved=!1,!te.gestures){if("touchstart"!==e.type||"touchstart"===e.type&&e.targetTouches.length<2)return;i.fakeGestureTouched=!0,s.scaleStart=V.getDistanceBetweenTouches(e)}s.$slideEl&&s.$slideEl.length||(s.$slideEl=L(e.target).closest(".swiper-slide"),0===s.$slideEl.length&&(s.$slideEl=t.slides.eq(t.activeIndex)),s.$imageEl=s.$slideEl.find("img, svg, canvas"),s.$imageWrapEl=s.$imageEl.parent("."+a.containerClass),s.maxRatio=s.$imageWrapEl.attr("data-swiper-zoom")||a.maxRatio,0!==s.$imageWrapEl.length)?(s.$imageEl.transition(0),t.zoom.isScaling=!0):s.$imageEl=void 0},onGestureChange:function(e){var t=this.params.zoom,a=this.zoom,i=a.gesture;if(!te.gestures){if("touchmove"!==e.type||"touchmove"===e.type&&e.targetTouches.length<2)return;a.fakeGestureMoved=!0,i.scaleMove=V.getDistanceBetweenTouches(e)}i.$imageEl&&0!==i.$imageEl.length&&(a.scale=te.gestures?e.scale*a.currentScale:i.scaleMove/i.scaleStart*a.currentScale,a.scale>i.maxRatio&&(a.scale=i.maxRatio-1+Math.pow(a.scale-i.maxRatio+1,.5)),a.scale<t.minRatio&&(a.scale=t.minRatio+1-Math.pow(t.minRatio-a.scale+1,.5)),i.$imageEl.transform("translate3d(0,0,0) scale("+a.scale+")"))},onGestureEnd:function(e){var t=this.params.zoom,a=this.zoom,i=a.gesture;if(!te.gestures){if(!a.fakeGestureTouched||!a.fakeGestureMoved)return;if("touchend"!==e.type||"touchend"===e.type&&e.changedTouches.length<2&&!m.android)return;a.fakeGestureTouched=!1,a.fakeGestureMoved=!1}i.$imageEl&&0!==i.$imageEl.length&&(a.scale=Math.max(Math.min(a.scale,i.maxRatio),t.minRatio),i.$imageEl.transition(this.params.speed).transform("translate3d(0,0,0) scale("+a.scale+")"),a.currentScale=a.scale,a.isScaling=!1,1===a.scale&&(i.$slideEl=void 0))},onTouchStart:function(e){var t=this.zoom,a=t.gesture,i=t.image;a.$imageEl&&0!==a.$imageEl.length&&(i.isTouched||(m.android&&e.preventDefault(),i.isTouched=!0,i.touchesStart.x="touchstart"===e.type?e.targetTouches[0].pageX:e.pageX,i.touchesStart.y="touchstart"===e.type?e.targetTouches[0].pageY:e.pageY))},onTouchMove:function(e){var t=this,a=t.zoom,i=a.gesture,s=a.image,r=a.velocity;if(i.$imageEl&&0!==i.$imageEl.length&&(t.allowClick=!1,s.isTouched&&i.$slideEl)){s.isMoved||(s.width=i.$imageEl[0].offsetWidth,s.height=i.$imageEl[0].offsetHeight,s.startX=ee.getTranslate(i.$imageWrapEl[0],"x")||0,s.startY=ee.getTranslate(i.$imageWrapEl[0],"y")||0,i.slideWidth=i.$slideEl[0].offsetWidth,i.slideHeight=i.$slideEl[0].offsetHeight,i.$imageWrapEl.transition(0),t.rtl&&(s.startX=-s.startX,s.startY=-s.startY));var n=s.width*a.scale,o=s.height*a.scale;if(!(n<i.slideWidth&&o<i.slideHeight)){if(s.minX=Math.min(i.slideWidth/2-n/2,0),s.maxX=-s.minX,s.minY=Math.min(i.slideHeight/2-o/2,0),s.maxY=-s.minY,s.touchesCurrent.x="touchmove"===e.type?e.targetTouches[0].pageX:e.pageX,s.touchesCurrent.y="touchmove"===e.type?e.targetTouches[0].pageY:e.pageY,!s.isMoved&&!a.isScaling){if(t.isHorizontal()&&(Math.floor(s.minX)===Math.floor(s.startX)&&s.touchesCurrent.x<s.touchesStart.x||Math.floor(s.maxX)===Math.floor(s.startX)&&s.touchesCurrent.x>s.touchesStart.x))return void(s.isTouched=!1);if(!t.isHorizontal()&&(Math.floor(s.minY)===Math.floor(s.startY)&&s.touchesCurrent.y<s.touchesStart.y||Math.floor(s.maxY)===Math.floor(s.startY)&&s.touchesCurrent.y>s.touchesStart.y))return void(s.isTouched=!1)}e.preventDefault(),e.stopPropagation(),s.isMoved=!0,s.currentX=s.touchesCurrent.x-s.touchesStart.x+s.startX,s.currentY=s.touchesCurrent.y-s.touchesStart.y+s.startY,s.currentX<s.minX&&(s.currentX=s.minX+1-Math.pow(s.minX-s.currentX+1,.8)),s.currentX>s.maxX&&(s.currentX=s.maxX-1+Math.pow(s.currentX-s.maxX+1,.8)),s.currentY<s.minY&&(s.currentY=s.minY+1-Math.pow(s.minY-s.currentY+1,.8)),s.currentY>s.maxY&&(s.currentY=s.maxY-1+Math.pow(s.currentY-s.maxY+1,.8)),r.prevPositionX||(r.prevPositionX=s.touchesCurrent.x),r.prevPositionY||(r.prevPositionY=s.touchesCurrent.y),r.prevTime||(r.prevTime=Date.now()),r.x=(s.touchesCurrent.x-r.prevPositionX)/(Date.now()-r.prevTime)/2,r.y=(s.touchesCurrent.y-r.prevPositionY)/(Date.now()-r.prevTime)/2,Math.abs(s.touchesCurrent.x-r.prevPositionX)<2&&(r.x=0),Math.abs(s.touchesCurrent.y-r.prevPositionY)<2&&(r.y=0),r.prevPositionX=s.touchesCurrent.x,r.prevPositionY=s.touchesCurrent.y,r.prevTime=Date.now(),i.$imageWrapEl.transform("translate3d("+s.currentX+"px, "+s.currentY+"px,0)")}}},onTouchEnd:function(){var e=this.zoom,t=e.gesture,a=e.image,i=e.velocity;if(t.$imageEl&&0!==t.$imageEl.length){if(!a.isTouched||!a.isMoved)return a.isTouched=!1,void(a.isMoved=!1);a.isTouched=!1,a.isMoved=!1;var s=300,r=300,n=i.x*s,o=a.currentX+n,l=i.y*r,d=a.currentY+l;0!==i.x&&(s=Math.abs((o-a.currentX)/i.x)),0!==i.y&&(r=Math.abs((d-a.currentY)/i.y));var p=Math.max(s,r);a.currentX=o,a.currentY=d;var c=a.width*e.scale,u=a.height*e.scale;a.minX=Math.min(t.slideWidth/2-c/2,0),a.maxX=-a.minX,a.minY=Math.min(t.slideHeight/2-u/2,0),a.maxY=-a.minY,a.currentX=Math.max(Math.min(a.currentX,a.maxX),a.minX),a.currentY=Math.max(Math.min(a.currentY,a.maxY),a.minY),t.$imageWrapEl.transition(p).transform("translate3d("+a.currentX+"px, "+a.currentY+"px,0)")}},onTransitionEnd:function(){var e=this.zoom,t=e.gesture;t.$slideEl&&this.previousIndex!==this.activeIndex&&(t.$imageEl.transform("translate3d(0,0,0) scale(1)"),t.$imageWrapEl.transform("translate3d(0,0,0)"),e.scale=1,e.currentScale=1,t.$slideEl=void 0,t.$imageEl=void 0,t.$imageWrapEl=void 0)},toggle:function(e){var t=this.zoom;t.scale&&1!==t.scale?t.out():t.in(e)},in:function(e){var t,a,i,s,r,n,o,l,d,p,c,u,h,v,f,m,g=this,b=g.zoom,w=g.params.zoom,y=b.gesture,x=b.image;(y.$slideEl||(y.$slideEl=g.clickedSlide?L(g.clickedSlide):g.slides.eq(g.activeIndex),y.$imageEl=y.$slideEl.find("img, svg, canvas"),y.$imageWrapEl=y.$imageEl.parent("."+w.containerClass)),y.$imageEl&&0!==y.$imageEl.length)&&(y.$slideEl.addClass(""+w.zoomedSlideClass),void 0===x.touchesStart.x&&e?(t="touchend"===e.type?e.changedTouches[0].pageX:e.pageX,a="touchend"===e.type?e.changedTouches[0].pageY:e.pageY):(t=x.touchesStart.x,a=x.touchesStart.y),b.scale=y.$imageWrapEl.attr("data-swiper-zoom")||w.maxRatio,b.currentScale=y.$imageWrapEl.attr("data-swiper-zoom")||w.maxRatio,e?(f=y.$slideEl[0].offsetWidth,m=y.$slideEl[0].offsetHeight,i=y.$slideEl.offset().left+f/2-t,s=y.$slideEl.offset().top+m/2-a,o=y.$imageEl[0].offsetWidth,l=y.$imageEl[0].offsetHeight,d=o*b.scale,p=l*b.scale,h=-(c=Math.min(f/2-d/2,0)),v=-(u=Math.min(m/2-p/2,0)),(r=i*b.scale)<c&&(r=c),h<r&&(r=h),(n=s*b.scale)<u&&(n=u),v<n&&(n=v)):n=r=0,y.$imageWrapEl.transition(300).transform("translate3d("+r+"px, "+n+"px,0)"),y.$imageEl.transition(300).transform("translate3d(0,0,0) scale("+b.scale+")"))},out:function(){var e=this,t=e.zoom,a=e.params.zoom,i=t.gesture;i.$slideEl||(i.$slideEl=e.clickedSlide?L(e.clickedSlide):e.slides.eq(e.activeIndex),i.$imageEl=i.$slideEl.find("img, svg, canvas"),i.$imageWrapEl=i.$imageEl.parent("."+a.containerClass)),i.$imageEl&&0!==i.$imageEl.length&&(t.scale=1,t.currentScale=1,i.$imageWrapEl.transition(300).transform("translate3d(0,0,0)"),i.$imageEl.transition(300).transform("translate3d(0,0,0) scale(1)"),i.$slideEl.removeClass(""+a.zoomedSlideClass),i.$slideEl=void 0)},enable:function(){var e=this,t=e.zoom;if(!t.enabled){t.enabled=!0;var a=!("touchstart"!==e.touchEvents.start||!te.passiveListener||!e.params.passiveListeners)&&{passive:!0,capture:!1};te.gestures?(e.$wrapperEl.on("gesturestart",".swiper-slide",t.onGestureStart,a),e.$wrapperEl.on("gesturechange",".swiper-slide",t.onGestureChange,a),e.$wrapperEl.on("gestureend",".swiper-slide",t.onGestureEnd,a)):"touchstart"===e.touchEvents.start&&(e.$wrapperEl.on(e.touchEvents.start,".swiper-slide",t.onGestureStart,a),e.$wrapperEl.on(e.touchEvents.move,".swiper-slide",t.onGestureChange,a),e.$wrapperEl.on(e.touchEvents.end,".swiper-slide",t.onGestureEnd,a)),e.$wrapperEl.on(e.touchEvents.move,"."+e.params.zoom.containerClass,t.onTouchMove)}},disable:function(){var e=this,t=e.zoom;if(t.enabled){e.zoom.enabled=!1;var a=!("touchstart"!==e.touchEvents.start||!te.passiveListener||!e.params.passiveListeners)&&{passive:!0,capture:!1};te.gestures?(e.$wrapperEl.off("gesturestart",".swiper-slide",t.onGestureStart,a),e.$wrapperEl.off("gesturechange",".swiper-slide",t.onGestureChange,a),e.$wrapperEl.off("gestureend",".swiper-slide",t.onGestureEnd,a)):"touchstart"===e.touchEvents.start&&(e.$wrapperEl.off(e.touchEvents.start,".swiper-slide",t.onGestureStart,a),e.$wrapperEl.off(e.touchEvents.move,".swiper-slide",t.onGestureChange,a),e.$wrapperEl.off(e.touchEvents.end,".swiper-slide",t.onGestureEnd,a)),e.$wrapperEl.off(e.touchEvents.move,"."+e.params.zoom.containerClass,t.onTouchMove)}}},F={loadInSlide:function(e,l){void 0===l&&(l=!0);var d=this,p=d.params.lazy;if(void 0!==e&&0!==d.slides.length){var c=d.virtual&&d.params.virtual.enabled?d.$wrapperEl.children("."+d.params.slideClass+'[data-swiper-slide-index="'+e+'"]'):d.slides.eq(e),t=c.find("."+p.elementClass+":not(."+p.loadedClass+"):not(."+p.loadingClass+")");!c.hasClass(p.elementClass)||c.hasClass(p.loadedClass)||c.hasClass(p.loadingClass)||(t=t.add(c[0])),0!==t.length&&t.each(function(e,t){var i=L(t);i.addClass(p.loadingClass);var s=i.attr("data-background"),r=i.attr("data-src"),n=i.attr("data-srcset"),o=i.attr("data-sizes");d.loadImage(i[0],r||s,n,o,!1,function(){if(null!=d&&d&&(!d||d.params)&&!d.destroyed){if(s?(i.css("background-image",'url("'+s+'")'),i.removeAttr("data-background")):(n&&(i.attr("srcset",n),i.removeAttr("data-srcset")),o&&(i.attr("sizes",o),i.removeAttr("data-sizes")),r&&(i.attr("src",r),i.removeAttr("data-src"))),i.addClass(p.loadedClass).removeClass(p.loadingClass),c.find("."+p.preloaderClass).remove(),d.params.loop&&l){var e=c.attr("data-swiper-slide-index");if(c.hasClass(d.params.slideDuplicateClass)){var t=d.$wrapperEl.children('[data-swiper-slide-index="'+e+'"]:not(.'+d.params.slideDuplicateClass+")");d.lazy.loadInSlide(t.index(),!1)}else{var a=d.$wrapperEl.children("."+d.params.slideDuplicateClass+'[data-swiper-slide-index="'+e+'"]');d.lazy.loadInSlide(a.index(),!1)}}d.emit("lazyImageReady",c[0],i[0])}}),d.emit("lazyImageLoad",c[0],i[0])})}},load:function(){var i=this,t=i.$wrapperEl,a=i.params,s=i.slides,e=i.activeIndex,r=i.virtual&&a.virtual.enabled,n=a.lazy,o=a.slidesPerView;function l(e){if(r){if(t.children("."+a.slideClass+'[data-swiper-slide-index="'+e+'"]').length)return!0}else if(s[e])return!0;return!1}function d(e){return r?L(e).attr("data-swiper-slide-index"):L(e).index()}if("auto"===o&&(o=0),i.lazy.initialImageLoaded||(i.lazy.initialImageLoaded=!0),i.params.watchSlidesVisibility)t.children("."+a.slideVisibleClass).each(function(e,t){var a=r?L(t).attr("data-swiper-slide-index"):L(t).index();i.lazy.loadInSlide(a)});else if(1<o)for(var p=e;p<e+o;p+=1)l(p)&&i.lazy.loadInSlide(p);else i.lazy.loadInSlide(e);if(n.loadPrevNext)if(1<o||n.loadPrevNextAmount&&1<n.loadPrevNextAmount){for(var c=n.loadPrevNextAmount,u=o,h=Math.min(e+u+Math.max(c,u),s.length),v=Math.max(e-Math.max(u,c),0),f=e+o;f<h;f+=1)l(f)&&i.lazy.loadInSlide(f);for(var m=v;m<e;m+=1)l(m)&&i.lazy.loadInSlide(m)}else{var g=t.children("."+a.slideNextClass);0<g.length&&i.lazy.loadInSlide(d(g));var b=t.children("."+a.slidePrevClass);0<b.length&&i.lazy.loadInSlide(d(b))}}},R={LinearSpline:function(e,t){var a,i,s,r,n,o=function(e,t){for(i=-1,a=e.length;1<a-i;)e[s=a+i>>1]<=t?i=s:a=s;return a};return this.x=e,this.y=t,this.lastIndex=e.length-1,this.interpolate=function(e){return e?(n=o(this.x,e),r=n-1,(e-this.x[r])*(this.y[n]-this.y[r])/(this.x[n]-this.x[r])+this.y[r]):0},this},getInterpolateFunction:function(e){var t=this;t.controller.spline||(t.controller.spline=t.params.loop?new R.LinearSpline(t.slidesGrid,e.slidesGrid):new R.LinearSpline(t.snapGrid,e.snapGrid))},setTranslate:function(e,t){var a,i,s=this,r=s.controller.control;function n(e){var t=s.rtlTranslate?-s.translate:s.translate;"slide"===s.params.controller.by&&(s.controller.getInterpolateFunction(e),i=-s.controller.spline.interpolate(-t)),i&&"container"!==s.params.controller.by||(a=(e.maxTranslate()-e.minTranslate())/(s.maxTranslate()-s.minTranslate()),i=(t-s.minTranslate())*a+e.minTranslate()),s.params.controller.inverse&&(i=e.maxTranslate()-i),e.updateProgress(i),e.setTranslate(i,s),e.updateActiveIndex(),e.updateSlidesClasses()}if(Array.isArray(r))for(var o=0;o<r.length;o+=1)r[o]!==t&&r[o]instanceof S&&n(r[o]);else r instanceof S&&t!==r&&n(r)},setTransition:function(t,e){var a,i=this,s=i.controller.control;function r(e){e.setTransition(t,i),0!==t&&(e.transitionStart(),e.params.autoHeight&&ee.nextTick(function(){e.updateAutoHeight()}),e.$wrapperEl.transitionEnd(function(){s&&(e.params.loop&&"slide"===i.params.controller.by&&e.loopFix(),e.transitionEnd())}))}if(Array.isArray(s))for(a=0;a<s.length;a+=1)s[a]!==e&&s[a]instanceof S&&r(s[a]);else s instanceof S&&e!==s&&r(s)}},q={makeElFocusable:function(e){return e.attr("tabIndex","0"),e},addElRole:function(e,t){return e.attr("role",t),e},addElLabel:function(e,t){return e.attr("aria-label",t),e},disableEl:function(e){return e.attr("aria-disabled",!0),e},enableEl:function(e){return e.attr("aria-disabled",!1),e},onEnterKey:function(e){var t=this,a=t.params.a11y;if(13===e.keyCode){var i=L(e.target);t.navigation&&t.navigation.$nextEl&&i.is(t.navigation.$nextEl)&&(t.isEnd&&!t.params.loop||t.slideNext(),t.isEnd?t.a11y.notify(a.lastSlideMessage):t.a11y.notify(a.nextSlideMessage)),t.navigation&&t.navigation.$prevEl&&i.is(t.navigation.$prevEl)&&(t.isBeginning&&!t.params.loop||t.slidePrev(),t.isBeginning?t.a11y.notify(a.firstSlideMessage):t.a11y.notify(a.prevSlideMessage)),t.pagination&&i.is("."+t.params.pagination.bulletClass)&&i[0].click()}},notify:function(e){var t=this.a11y.liveRegion;0!==t.length&&(t.html(""),t.html(e))},updateNavigation:function(){var e=this;if(!e.params.loop){var t=e.navigation,a=t.$nextEl,i=t.$prevEl;i&&0<i.length&&(e.isBeginning?e.a11y.disableEl(i):e.a11y.enableEl(i)),a&&0<a.length&&(e.isEnd?e.a11y.disableEl(a):e.a11y.enableEl(a))}},updatePagination:function(){var i=this,s=i.params.a11y;i.pagination&&i.params.pagination.clickable&&i.pagination.bullets&&i.pagination.bullets.length&&i.pagination.bullets.each(function(e,t){var a=L(t);i.a11y.makeElFocusable(a),i.a11y.addElRole(a,"button"),i.a11y.addElLabel(a,s.paginationBulletMessage.replace(/{{index}}/,a.index()+1))})},init:function(){var e=this;e.$el.append(e.a11y.liveRegion);var t,a,i=e.params.a11y;e.navigation&&e.navigation.$nextEl&&(t=e.navigation.$nextEl),e.navigation&&e.navigation.$prevEl&&(a=e.navigation.$prevEl),t&&(e.a11y.makeElFocusable(t),e.a11y.addElRole(t,"button"),e.a11y.addElLabel(t,i.nextSlideMessage),t.on("keydown",e.a11y.onEnterKey)),a&&(e.a11y.makeElFocusable(a),e.a11y.addElRole(a,"button"),e.a11y.addElLabel(a,i.prevSlideMessage),a.on("keydown",e.a11y.onEnterKey)),e.pagination&&e.params.pagination.clickable&&e.pagination.bullets&&e.pagination.bullets.length&&e.pagination.$el.on("keydown","."+e.params.pagination.bulletClass,e.a11y.onEnterKey)},destroy:function(){var e,t,a=this;a.a11y.liveRegion&&0<a.a11y.liveRegion.length&&a.a11y.liveRegion.remove(),a.navigation&&a.navigation.$nextEl&&(e=a.navigation.$nextEl),a.navigation&&a.navigation.$prevEl&&(t=a.navigation.$prevEl),e&&e.off("keydown",a.a11y.onEnterKey),t&&t.off("keydown",a.a11y.onEnterKey),a.pagination&&a.params.pagination.clickable&&a.pagination.bullets&&a.pagination.bullets.length&&a.pagination.$el.off("keydown","."+a.params.pagination.bulletClass,a.a11y.onEnterKey)}},W={init:function(){var e=this;if(e.params.history){if(!J.history||!J.history.pushState)return e.params.history.enabled=!1,void(e.params.hashNavigation.enabled=!0);var t=e.history;t.initialized=!0,t.paths=W.getPathValues(),(t.paths.key||t.paths.value)&&(t.scrollToSlide(0,t.paths.value,e.params.runCallbacksOnInit),e.params.history.replaceState||J.addEventListener("popstate",e.history.setHistoryPopState))}},destroy:function(){this.params.history.replaceState||J.removeEventListener("popstate",this.history.setHistoryPopState)},setHistoryPopState:function(){this.history.paths=W.getPathValues(),this.history.scrollToSlide(this.params.speed,this.history.paths.value,!1)},getPathValues:function(){var e=J.location.pathname.slice(1).split("/").filter(function(e){return""!==e}),t=e.length;return{key:e[t-2],value:e[t-1]}},setHistory:function(e,t){if(this.history.initialized&&this.params.history.enabled){var a=this.slides.eq(t),i=W.slugify(a.attr("data-history"));J.location.pathname.includes(e)||(i=e+"/"+i);var s=J.history.state;s&&s.value===i||(this.params.history.replaceState?J.history.replaceState({value:i},null,i):J.history.pushState({value:i},null,i))}},slugify:function(e){return e.toString().toLowerCase().replace(/\s+/g,"-").replace(/[^\w-]+/g,"").replace(/--+/g,"-").replace(/^-+/,"").replace(/-+$/,"")},scrollToSlide:function(e,t,a){var i=this;if(t)for(var s=0,r=i.slides.length;s<r;s+=1){var n=i.slides.eq(s);if(W.slugify(n.attr("data-history"))===t&&!n.hasClass(i.params.slideDuplicateClass)){var o=n.index();i.slideTo(o,e,a)}}else i.slideTo(0,e,a)}},j={onHashCange:function(){var e=this,t=f.location.hash.replace("#","");if(t!==e.slides.eq(e.activeIndex).attr("data-hash")){var a=e.$wrapperEl.children("."+e.params.slideClass+'[data-hash="'+t+'"]').index();if(void 0===a)return;e.slideTo(a)}},setHash:function(){var e=this;if(e.hashNavigation.initialized&&e.params.hashNavigation.enabled)if(e.params.hashNavigation.replaceState&&J.history&&J.history.replaceState)J.history.replaceState(null,null,"#"+e.slides.eq(e.activeIndex).attr("data-hash")||"");else{var t=e.slides.eq(e.activeIndex),a=t.attr("data-hash")||t.attr("data-history");f.location.hash=a||""}},init:function(){var e=this;if(!(!e.params.hashNavigation.enabled||e.params.history&&e.params.history.enabled)){e.hashNavigation.initialized=!0;var t=f.location.hash.replace("#","");if(t)for(var a=0,i=e.slides.length;a<i;a+=1){var s=e.slides.eq(a);if((s.attr("data-hash")||s.attr("data-history"))===t&&!s.hasClass(e.params.slideDuplicateClass)){var r=s.index();e.slideTo(r,0,e.params.runCallbacksOnInit,!0)}}e.params.hashNavigation.watchState&&L(J).on("hashchange",e.hashNavigation.onHashCange)}},destroy:function(){this.params.hashNavigation.watchState&&L(J).off("hashchange",this.hashNavigation.onHashCange)}},U={run:function(){var e=this,t=e.slides.eq(e.activeIndex),a=e.params.autoplay.delay;t.attr("data-swiper-autoplay")&&(a=t.attr("data-swiper-autoplay")||e.params.autoplay.delay),e.autoplay.timeout=ee.nextTick(function(){e.params.autoplay.reverseDirection?e.params.loop?(e.loopFix(),e.slidePrev(e.params.speed,!0,!0),e.emit("autoplay")):e.isBeginning?e.params.autoplay.stopOnLastSlide?e.autoplay.stop():(e.slideTo(e.slides.length-1,e.params.speed,!0,!0),e.emit("autoplay")):(e.slidePrev(e.params.speed,!0,!0),e.emit("autoplay")):e.params.loop?(e.loopFix(),e.slideNext(e.params.speed,!0,!0),e.emit("autoplay")):e.isEnd?e.params.autoplay.stopOnLastSlide?e.autoplay.stop():(e.slideTo(0,e.params.speed,!0,!0),e.emit("autoplay")):(e.slideNext(e.params.speed,!0,!0),e.emit("autoplay"))},a)},start:function(){var e=this;return void 0===e.autoplay.timeout&&(!e.autoplay.running&&(e.autoplay.running=!0,e.emit("autoplayStart"),e.autoplay.run(),!0))},stop:function(){var e=this;return!!e.autoplay.running&&(void 0!==e.autoplay.timeout&&(e.autoplay.timeout&&(clearTimeout(e.autoplay.timeout),e.autoplay.timeout=void 0),e.autoplay.running=!1,e.emit("autoplayStop"),!0))},pause:function(e){var t=this;t.autoplay.running&&(t.autoplay.paused||(t.autoplay.timeout&&clearTimeout(t.autoplay.timeout),t.autoplay.paused=!0,0!==e&&t.params.autoplay.waitForTransition?(t.$wrapperEl[0].addEventListener("transitionend",t.autoplay.onTransitionEnd),t.$wrapperEl[0].addEventListener("webkitTransitionEnd",t.autoplay.onTransitionEnd)):(t.autoplay.paused=!1,t.autoplay.run())))}},K={setTranslate:function(){for(var e=this,t=e.slides,a=0;a<t.length;a+=1){var i=e.slides.eq(a),s=-i[0].swiperSlideOffset;e.params.virtualTranslate||(s-=e.translate);var r=0;e.isHorizontal()||(r=s,s=0);var n=e.params.fadeEffect.crossFade?Math.max(1-Math.abs(i[0].progress),0):1+Math.min(Math.max(i[0].progress,-1),0);i.css({opacity:n}).transform("translate3d("+s+"px, "+r+"px, 0px)")}},setTransition:function(e){var a=this,t=a.slides,i=a.$wrapperEl;if(t.transition(e),a.params.virtualTranslate&&0!==e){var s=!1;t.transitionEnd(function(){if(!s&&a&&!a.destroyed){s=!0,a.animating=!1;for(var e=["webkitTransitionEnd","transitionend"],t=0;t<e.length;t+=1)i.trigger(e[t])}})}}},_={setTranslate:function(){var e,t=this,a=t.$el,i=t.$wrapperEl,s=t.slides,r=t.width,n=t.height,o=t.rtlTranslate,l=t.size,d=t.params.cubeEffect,p=t.isHorizontal(),c=t.virtual&&t.params.virtual.enabled,u=0;d.shadow&&(p?(0===(e=i.find(".swiper-cube-shadow")).length&&(e=L('<div class="swiper-cube-shadow"></div>'),i.append(e)),e.css({height:r+"px"})):0===(e=a.find(".swiper-cube-shadow")).length&&(e=L('<div class="swiper-cube-shadow"></div>'),a.append(e)));for(var h=0;h<s.length;h+=1){var v=s.eq(h),f=h;c&&(f=parseInt(v.attr("data-swiper-slide-index"),10));var m=90*f,g=Math.floor(m/360);o&&(m=-m,g=Math.floor(-m/360));var b=Math.max(Math.min(v[0].progress,1),-1),w=0,y=0,x=0;f%4==0?(w=4*-g*l,x=0):(f-1)%4==0?(w=0,x=4*-g*l):(f-2)%4==0?(w=l+4*g*l,x=l):(f-3)%4==0&&(w=-l,x=3*l+4*l*g),o&&(w=-w),p||(y=w,w=0);var T="rotateX("+(p?0:-m)+"deg) rotateY("+(p?m:0)+"deg) translate3d("+w+"px, "+y+"px, "+x+"px)";if(b<=1&&-1<b&&(u=90*f+90*b,o&&(u=90*-f-90*b)),v.transform(T),d.slideShadows){var E=p?v.find(".swiper-slide-shadow-left"):v.find(".swiper-slide-shadow-top"),S=p?v.find(".swiper-slide-shadow-right"):v.find(".swiper-slide-shadow-bottom");0===E.length&&(E=L('<div class="swiper-slide-shadow-'+(p?"left":"top")+'"></div>'),v.append(E)),0===S.length&&(S=L('<div class="swiper-slide-shadow-'+(p?"right":"bottom")+'"></div>'),v.append(S)),E.length&&(E[0].style.opacity=Math.max(-b,0)),S.length&&(S[0].style.opacity=Math.max(b,0))}}if(i.css({"-webkit-transform-origin":"50% 50% -"+l/2+"px","-moz-transform-origin":"50% 50% -"+l/2+"px","-ms-transform-origin":"50% 50% -"+l/2+"px","transform-origin":"50% 50% -"+l/2+"px"}),d.shadow)if(p)e.transform("translate3d(0px, "+(r/2+d.shadowOffset)+"px, "+-r/2+"px) rotateX(90deg) rotateZ(0deg) scale("+d.shadowScale+")");else{var C=Math.abs(u)-90*Math.floor(Math.abs(u)/90),M=1.5-(Math.sin(2*C*Math.PI/360)/2+Math.cos(2*C*Math.PI/360)/2),k=d.shadowScale,P=d.shadowScale/M,z=d.shadowOffset;e.transform("scale3d("+k+", 1, "+P+") translate3d(0px, "+(n/2+z)+"px, "+-n/2/P+"px) rotateX(-90deg)")}var $=I.isSafari||I.isUiWebView?-l/2:0;i.transform("translate3d(0px,0,"+$+"px) rotateX("+(t.isHorizontal()?0:u)+"deg) rotateY("+(t.isHorizontal()?-u:0)+"deg)")},setTransition:function(e){var t=this.$el;this.slides.transition(e).find(".swiper-slide-shadow-top, .swiper-slide-shadow-right, .swiper-slide-shadow-bottom, .swiper-slide-shadow-left").transition(e),this.params.cubeEffect.shadow&&!this.isHorizontal()&&t.find(".swiper-cube-shadow").transition(e)}},Z={setTranslate:function(){for(var e=this,t=e.slides,a=e.rtlTranslate,i=0;i<t.length;i+=1){var s=t.eq(i),r=s[0].progress;e.params.flipEffect.limitRotation&&(r=Math.max(Math.min(s[0].progress,1),-1));var n=-180*r,o=0,l=-s[0].swiperSlideOffset,d=0;if(e.isHorizontal()?a&&(n=-n):(d=l,o=-n,n=l=0),s[0].style.zIndex=-Math.abs(Math.round(r))+t.length,e.params.flipEffect.slideShadows){var p=e.isHorizontal()?s.find(".swiper-slide-shadow-left"):s.find(".swiper-slide-shadow-top"),c=e.isHorizontal()?s.find(".swiper-slide-shadow-right"):s.find(".swiper-slide-shadow-bottom");0===p.length&&(p=L('<div class="swiper-slide-shadow-'+(e.isHorizontal()?"left":"top")+'"></div>'),s.append(p)),0===c.length&&(c=L('<div class="swiper-slide-shadow-'+(e.isHorizontal()?"right":"bottom")+'"></div>'),s.append(c)),p.length&&(p[0].style.opacity=Math.max(-r,0)),c.length&&(c[0].style.opacity=Math.max(r,0))}s.transform("translate3d("+l+"px, "+d+"px, 0px) rotateX("+o+"deg) rotateY("+n+"deg)")}},setTransition:function(e){var a=this,t=a.slides,i=a.activeIndex,s=a.$wrapperEl;if(t.transition(e).find(".swiper-slide-shadow-top, .swiper-slide-shadow-right, .swiper-slide-shadow-bottom, .swiper-slide-shadow-left").transition(e),a.params.virtualTranslate&&0!==e){var r=!1;t.eq(i).transitionEnd(function(){if(!r&&a&&!a.destroyed){r=!0,a.animating=!1;for(var e=["webkitTransitionEnd","transitionend"],t=0;t<e.length;t+=1)s.trigger(e[t])}})}}},Q={setTranslate:function(){for(var e=this,t=e.width,a=e.height,i=e.slides,s=e.$wrapperEl,r=e.slidesSizesGrid,n=e.params.coverflowEffect,o=e.isHorizontal(),l=e.translate,d=o?t/2-l:a/2-l,p=o?n.rotate:-n.rotate,c=n.depth,u=0,h=i.length;u<h;u+=1){var v=i.eq(u),f=r[u],m=(d-v[0].swiperSlideOffset-f/2)/f*n.modifier,g=o?p*m:0,b=o?0:p*m,w=-c*Math.abs(m),y=o?0:n.stretch*m,x=o?n.stretch*m:0;Math.abs(x)<.001&&(x=0),Math.abs(y)<.001&&(y=0),Math.abs(w)<.001&&(w=0),Math.abs(g)<.001&&(g=0),Math.abs(b)<.001&&(b=0);var T="translate3d("+x+"px,"+y+"px,"+w+"px)  rotateX("+b+"deg) rotateY("+g+"deg)";if(v.transform(T),v[0].style.zIndex=1-Math.abs(Math.round(m)),n.slideShadows){var E=o?v.find(".swiper-slide-shadow-left"):v.find(".swiper-slide-shadow-top"),S=o?v.find(".swiper-slide-shadow-right"):v.find(".swiper-slide-shadow-bottom");0===E.length&&(E=L('<div class="swiper-slide-shadow-'+(o?"left":"top")+'"></div>'),v.append(E)),0===S.length&&(S=L('<div class="swiper-slide-shadow-'+(o?"right":"bottom")+'"></div>'),v.append(S)),E.length&&(E[0].style.opacity=0<m?m:0),S.length&&(S[0].style.opacity=0<-m?-m:0)}}(te.pointerEvents||te.prefixedPointerEvents)&&(s[0].style.perspectiveOrigin=d+"px 50%")},setTransition:function(e){this.slides.transition(e).find(".swiper-slide-shadow-top, .swiper-slide-shadow-right, .swiper-slide-shadow-bottom, .swiper-slide-shadow-left").transition(e)}},ae={init:function(){var e=this,t=e.params.thumbs,a=e.constructor;t.swiper instanceof a?(e.thumbs.swiper=t.swiper,ee.extend(e.thumbs.swiper.originalParams,{watchSlidesProgress:!0,slideToClickedSlide:!1}),ee.extend(e.thumbs.swiper.params,{watchSlidesProgress:!0,slideToClickedSlide:!1})):ee.isObject(t.swiper)&&(e.thumbs.swiper=new a(ee.extend({},t.swiper,{watchSlidesVisibility:!0,watchSlidesProgress:!0,slideToClickedSlide:!1})),e.thumbs.swiperCreated=!0),e.thumbs.swiper.$el.addClass(e.params.thumbs.thumbsContainerClass),e.thumbs.swiper.on("tap",e.thumbs.onThumbClick)},onThumbClick:function(){var e=this,t=e.thumbs.swiper;if(t){var a=t.clickedIndex,i=t.clickedSlide;if(!(i&&L(i).hasClass(e.params.thumbs.slideThumbActiveClass)||null==a)){var s;if(s=t.params.loop?parseInt(L(t.clickedSlide).attr("data-swiper-slide-index"),10):a,e.params.loop){var r=e.activeIndex;e.slides.eq(r).hasClass(e.params.slideDuplicateClass)&&(e.loopFix(),e._clientLeft=e.$wrapperEl[0].clientLeft,r=e.activeIndex);var n=e.slides.eq(r).prevAll('[data-swiper-slide-index="'+s+'"]').eq(0).index(),o=e.slides.eq(r).nextAll('[data-swiper-slide-index="'+s+'"]').eq(0).index();s=void 0===n?o:void 0===o?n:o-r<r-n?o:n}e.slideTo(s)}}},update:function(e){var t=this,a=t.thumbs.swiper;if(a){var i="auto"===a.params.slidesPerView?a.slidesPerViewDynamic():a.params.slidesPerView;if(t.realIndex!==a.realIndex){var s,r=a.activeIndex;if(a.params.loop){a.slides.eq(r).hasClass(a.params.slideDuplicateClass)&&(a.loopFix(),a._clientLeft=a.$wrapperEl[0].clientLeft,r=a.activeIndex);var n=a.slides.eq(r).prevAll('[data-swiper-slide-index="'+t.realIndex+'"]').eq(0).index(),o=a.slides.eq(r).nextAll('[data-swiper-slide-index="'+t.realIndex+'"]').eq(0).index();s=void 0===n?o:void 0===o?n:o-r==r-n?r:o-r<r-n?o:n}else s=t.realIndex;a.visibleSlidesIndexes.indexOf(s)<0&&(a.params.centeredSlides?s=r<s?s-Math.floor(i/2)+1:s+Math.floor(i/2)-1:r<s&&(s=s-i+1),a.slideTo(s,e?0:void 0))}var l=1,d=t.params.thumbs.slideThumbActiveClass;if(1<t.params.slidesPerView&&!t.params.centeredSlides&&(l=t.params.slidesPerView),a.slides.removeClass(d),a.params.loop)for(var p=0;p<l;p+=1)a.$wrapperEl.children('[data-swiper-slide-index="'+(t.realIndex+p)+'"]').addClass(d);else for(var c=0;c<l;c+=1)a.slides.eq(t.realIndex+c).addClass(d)}}},ie=[C,M,k,P,$,O,N,{name:"mousewheel",params:{mousewheel:{enabled:!1,releaseOnEdges:!1,invert:!1,forceToAxis:!1,sensitivity:1,eventsTarged:"container"}},create:function(){var e=this;ee.extend(e,{mousewheel:{enabled:!1,enable:H.enable.bind(e),disable:H.disable.bind(e),handle:H.handle.bind(e),handleMouseEnter:H.handleMouseEnter.bind(e),handleMouseLeave:H.handleMouseLeave.bind(e),lastScrollTime:ee.now()}})},on:{init:function(){this.params.mousewheel.enabled&&this.mousewheel.enable()},destroy:function(){this.mousewheel.enabled&&this.mousewheel.disable()}}},{name:"navigation",params:{navigation:{nextEl:null,prevEl:null,hideOnClick:!1,disabledClass:"swiper-button-disabled",hiddenClass:"swiper-button-hidden",lockClass:"swiper-button-lock"}},create:function(){var e=this;ee.extend(e,{navigation:{init:G.init.bind(e),update:G.update.bind(e),destroy:G.destroy.bind(e),onNextClick:G.onNextClick.bind(e),onPrevClick:G.onPrevClick.bind(e)}})},on:{init:function(){this.navigation.init(),this.navigation.update()},toEdge:function(){this.navigation.update()},fromEdge:function(){this.navigation.update()},destroy:function(){this.navigation.destroy()},click:function(e){var t=this.navigation,a=t.$nextEl,i=t.$prevEl;!this.params.navigation.hideOnClick||L(e.target).is(i)||L(e.target).is(a)||(a&&a.toggleClass(this.params.navigation.hiddenClass),i&&i.toggleClass(this.params.navigation.hiddenClass))}}},{name:"pagination",params:{pagination:{el:null,bulletElement:"span",clickable:!1,hideOnClick:!1,renderBullet:null,renderProgressbar:null,renderFraction:null,renderCustom:null,progressbarOpposite:!1,type:"bullets",dynamicBullets:!1,dynamicMainBullets:1,formatFractionCurrent:function(e){return e},formatFractionTotal:function(e){return e},bulletClass:"swiper-pagination-bullet",bulletActiveClass:"swiper-pagination-bullet-active",modifierClass:"swiper-pagination-",currentClass:"swiper-pagination-current",totalClass:"swiper-pagination-total",hiddenClass:"swiper-pagination-hidden",progressbarFillClass:"swiper-pagination-progressbar-fill",progressbarOppositeClass:"swiper-pagination-progressbar-opposite",clickableClass:"swiper-pagination-clickable",lockClass:"swiper-pagination-lock"}},create:function(){var e=this;ee.extend(e,{pagination:{init:B.init.bind(e),render:B.render.bind(e),update:B.update.bind(e),destroy:B.destroy.bind(e),dynamicBulletIndex:0}})},on:{init:function(){this.pagination.init(),this.pagination.render(),this.pagination.update()},activeIndexChange:function(){this.params.loop?this.pagination.update():void 0===this.snapIndex&&this.pagination.update()},snapIndexChange:function(){this.params.loop||this.pagination.update()},slidesLengthChange:function(){this.params.loop&&(this.pagination.render(),this.pagination.update())},snapGridLengthChange:function(){this.params.loop||(this.pagination.render(),this.pagination.update())},destroy:function(){this.pagination.destroy()},click:function(e){var t=this;t.params.pagination.el&&t.params.pagination.hideOnClick&&0<t.pagination.$el.length&&!L(e.target).hasClass(t.params.pagination.bulletClass)&&t.pagination.$el.toggleClass(t.params.pagination.hiddenClass)}}},{name:"scrollbar",params:{scrollbar:{el:null,dragSize:"auto",hide:!1,draggable:!1,snapOnRelease:!0,lockClass:"swiper-scrollbar-lock",dragClass:"swiper-scrollbar-drag"}},create:function(){var e=this;ee.extend(e,{scrollbar:{init:X.init.bind(e),destroy:X.destroy.bind(e),updateSize:X.updateSize.bind(e),setTranslate:X.setTranslate.bind(e),setTransition:X.setTransition.bind(e),enableDraggable:X.enableDraggable.bind(e),disableDraggable:X.disableDraggable.bind(e),setDragPosition:X.setDragPosition.bind(e),onDragStart:X.onDragStart.bind(e),onDragMove:X.onDragMove.bind(e),onDragEnd:X.onDragEnd.bind(e),isTouched:!1,timeout:null,dragTimeout:null}})},on:{init:function(){this.scrollbar.init(),this.scrollbar.updateSize(),this.scrollbar.setTranslate()},update:function(){this.scrollbar.updateSize()},resize:function(){this.scrollbar.updateSize()},observerUpdate:function(){this.scrollbar.updateSize()},setTranslate:function(){this.scrollbar.setTranslate()},setTransition:function(e){this.scrollbar.setTransition(e)},destroy:function(){this.scrollbar.destroy()}}},{name:"parallax",params:{parallax:{enabled:!1}},create:function(){ee.extend(this,{parallax:{setTransform:Y.setTransform.bind(this),setTranslate:Y.setTranslate.bind(this),setTransition:Y.setTransition.bind(this)}})},on:{beforeInit:function(){this.params.parallax.enabled&&(this.params.watchSlidesProgress=!0,this.originalParams.watchSlidesProgress=!0)},init:function(){this.params.parallax&&this.parallax.setTranslate()},setTranslate:function(){this.params.parallax&&this.parallax.setTranslate()},setTransition:function(e){this.params.parallax&&this.parallax.setTransition(e)}}},{name:"zoom",params:{zoom:{enabled:!1,maxRatio:3,minRatio:1,toggle:!0,containerClass:"swiper-zoom-container",zoomedSlideClass:"swiper-slide-zoomed"}},create:function(){var i=this,t={enabled:!1,scale:1,currentScale:1,isScaling:!1,gesture:{$slideEl:void 0,slideWidth:void 0,slideHeight:void 0,$imageEl:void 0,$imageWrapEl:void 0,maxRatio:3},image:{isTouched:void 0,isMoved:void 0,currentX:void 0,currentY:void 0,minX:void 0,minY:void 0,maxX:void 0,maxY:void 0,width:void 0,height:void 0,startX:void 0,startY:void 0,touchesStart:{},touchesCurrent:{}},velocity:{x:void 0,y:void 0,prevPositionX:void 0,prevPositionY:void 0,prevTime:void 0}};"onGestureStart onGestureChange onGestureEnd onTouchStart onTouchMove onTouchEnd onTransitionEnd toggle enable disable in out".split(" ").forEach(function(e){t[e]=V[e].bind(i)}),ee.extend(i,{zoom:t});var s=1;Object.defineProperty(i.zoom,"scale",{get:function(){return s},set:function(e){if(s!==e){var t=i.zoom.gesture.$imageEl?i.zoom.gesture.$imageEl[0]:void 0,a=i.zoom.gesture.$slideEl?i.zoom.gesture.$slideEl[0]:void 0;i.emit("zoomChange",e,t,a)}s=e}})},on:{init:function(){this.params.zoom.enabled&&this.zoom.enable()},destroy:function(){this.zoom.disable()},touchStart:function(e){this.zoom.enabled&&this.zoom.onTouchStart(e)},touchEnd:function(e){this.zoom.enabled&&this.zoom.onTouchEnd(e)},doubleTap:function(e){this.params.zoom.enabled&&this.zoom.enabled&&this.params.zoom.toggle&&this.zoom.toggle(e)},transitionEnd:function(){this.zoom.enabled&&this.params.zoom.enabled&&this.zoom.onTransitionEnd()}}},{name:"lazy",params:{lazy:{enabled:!1,loadPrevNext:!1,loadPrevNextAmount:1,loadOnTransitionStart:!1,elementClass:"swiper-lazy",loadingClass:"swiper-lazy-loading",loadedClass:"swiper-lazy-loaded",preloaderClass:"swiper-lazy-preloader"}},create:function(){ee.extend(this,{lazy:{initialImageLoaded:!1,load:F.load.bind(this),loadInSlide:F.loadInSlide.bind(this)}})},on:{beforeInit:function(){this.params.lazy.enabled&&this.params.preloadImages&&(this.params.preloadImages=!1)},init:function(){this.params.lazy.enabled&&!this.params.loop&&0===this.params.initialSlide&&this.lazy.load()},scroll:function(){this.params.freeMode&&!this.params.freeModeSticky&&this.lazy.load()},resize:function(){this.params.lazy.enabled&&this.lazy.load()},scrollbarDragMove:function(){this.params.lazy.enabled&&this.lazy.load()},transitionStart:function(){var e=this;e.params.lazy.enabled&&(e.params.lazy.loadOnTransitionStart||!e.params.lazy.loadOnTransitionStart&&!e.lazy.initialImageLoaded)&&e.lazy.load()},transitionEnd:function(){this.params.lazy.enabled&&!this.params.lazy.loadOnTransitionStart&&this.lazy.load()}}},{name:"controller",params:{controller:{control:void 0,inverse:!1,by:"slide"}},create:function(){var e=this;ee.extend(e,{controller:{control:e.params.controller.control,getInterpolateFunction:R.getInterpolateFunction.bind(e),setTranslate:R.setTranslate.bind(e),setTransition:R.setTransition.bind(e)}})},on:{update:function(){this.controller.control&&this.controller.spline&&(this.controller.spline=void 0,delete this.controller.spline)},resize:function(){this.controller.control&&this.controller.spline&&(this.controller.spline=void 0,delete this.controller.spline)},observerUpdate:function(){this.controller.control&&this.controller.spline&&(this.controller.spline=void 0,delete this.controller.spline)},setTranslate:function(e,t){this.controller.control&&this.controller.setTranslate(e,t)},setTransition:function(e,t){this.controller.control&&this.controller.setTransition(e,t)}}},{name:"a11y",params:{a11y:{enabled:!0,notificationClass:"swiper-notification",prevSlideMessage:"Previous slide",nextSlideMessage:"Next slide",firstSlideMessage:"This is the first slide",lastSlideMessage:"This is the last slide",paginationBulletMessage:"Go to slide {{index}}"}},create:function(){var t=this;ee.extend(t,{a11y:{liveRegion:L('<span class="'+t.params.a11y.notificationClass+'" aria-live="assertive" aria-atomic="true"></span>')}}),Object.keys(q).forEach(function(e){t.a11y[e]=q[e].bind(t)})},on:{init:function(){this.params.a11y.enabled&&(this.a11y.init(),this.a11y.updateNavigation())},toEdge:function(){this.params.a11y.enabled&&this.a11y.updateNavigation()},fromEdge:function(){this.params.a11y.enabled&&this.a11y.updateNavigation()},paginationUpdate:function(){this.params.a11y.enabled&&this.a11y.updatePagination()},destroy:function(){this.params.a11y.enabled&&this.a11y.destroy()}}},{name:"history",params:{history:{enabled:!1,replaceState:!1,key:"slides"}},create:function(){var e=this;ee.extend(e,{history:{init:W.init.bind(e),setHistory:W.setHistory.bind(e),setHistoryPopState:W.setHistoryPopState.bind(e),scrollToSlide:W.scrollToSlide.bind(e),destroy:W.destroy.bind(e)}})},on:{init:function(){this.params.history.enabled&&this.history.init()},destroy:function(){this.params.history.enabled&&this.history.destroy()},transitionEnd:function(){this.history.initialized&&this.history.setHistory(this.params.history.key,this.activeIndex)}}},{name:"hash-navigation",params:{hashNavigation:{enabled:!1,replaceState:!1,watchState:!1}},create:function(){var e=this;ee.extend(e,{hashNavigation:{initialized:!1,init:j.init.bind(e),destroy:j.destroy.bind(e),setHash:j.setHash.bind(e),onHashCange:j.onHashCange.bind(e)}})},on:{init:function(){this.params.hashNavigation.enabled&&this.hashNavigation.init()},destroy:function(){this.params.hashNavigation.enabled&&this.hashNavigation.destroy()},transitionEnd:function(){this.hashNavigation.initialized&&this.hashNavigation.setHash()}}},{name:"autoplay",params:{autoplay:{enabled:!1,delay:3e3,waitForTransition:!0,disableOnInteraction:!0,stopOnLastSlide:!1,reverseDirection:!1}},create:function(){var t=this;ee.extend(t,{autoplay:{running:!1,paused:!1,run:U.run.bind(t),start:U.start.bind(t),stop:U.stop.bind(t),pause:U.pause.bind(t),onTransitionEnd:function(e){t&&!t.destroyed&&t.$wrapperEl&&e.target===this&&(t.$wrapperEl[0].removeEventListener("transitionend",t.autoplay.onTransitionEnd),t.$wrapperEl[0].removeEventListener("webkitTransitionEnd",t.autoplay.onTransitionEnd),t.autoplay.paused=!1,t.autoplay.running?t.autoplay.run():t.autoplay.stop())}}})},on:{init:function(){this.params.autoplay.enabled&&this.autoplay.start()},beforeTransitionStart:function(e,t){this.autoplay.running&&(t||!this.params.autoplay.disableOnInteraction?this.autoplay.pause(e):this.autoplay.stop())},sliderFirstMove:function(){this.autoplay.running&&(this.params.autoplay.disableOnInteraction?this.autoplay.stop():this.autoplay.pause())},destroy:function(){this.autoplay.running&&this.autoplay.stop()}}},{name:"effect-fade",params:{fadeEffect:{crossFade:!1}},create:function(){ee.extend(this,{fadeEffect:{setTranslate:K.setTranslate.bind(this),setTransition:K.setTransition.bind(this)}})},on:{beforeInit:function(){var e=this;if("fade"===e.params.effect){e.classNames.push(e.params.containerModifierClass+"fade");var t={slidesPerView:1,slidesPerColumn:1,slidesPerGroup:1,watchSlidesProgress:!0,spaceBetween:0,virtualTranslate:!0};ee.extend(e.params,t),ee.extend(e.originalParams,t)}},setTranslate:function(){"fade"===this.params.effect&&this.fadeEffect.setTranslate()},setTransition:function(e){"fade"===this.params.effect&&this.fadeEffect.setTransition(e)}}},{name:"effect-cube",params:{cubeEffect:{slideShadows:!0,shadow:!0,shadowOffset:20,shadowScale:.94}},create:function(){ee.extend(this,{cubeEffect:{setTranslate:_.setTranslate.bind(this),setTransition:_.setTransition.bind(this)}})},on:{beforeInit:function(){var e=this;if("cube"===e.params.effect){e.classNames.push(e.params.containerModifierClass+"cube"),e.classNames.push(e.params.containerModifierClass+"3d");var t={slidesPerView:1,slidesPerColumn:1,slidesPerGroup:1,watchSlidesProgress:!0,resistanceRatio:0,spaceBetween:0,centeredSlides:!1,virtualTranslate:!0};ee.extend(e.params,t),ee.extend(e.originalParams,t)}},setTranslate:function(){"cube"===this.params.effect&&this.cubeEffect.setTranslate()},setTransition:function(e){"cube"===this.params.effect&&this.cubeEffect.setTransition(e)}}},{name:"effect-flip",params:{flipEffect:{slideShadows:!0,limitRotation:!0}},create:function(){ee.extend(this,{flipEffect:{setTranslate:Z.setTranslate.bind(this),setTransition:Z.setTransition.bind(this)}})},on:{beforeInit:function(){var e=this;if("flip"===e.params.effect){e.classNames.push(e.params.containerModifierClass+"flip"),e.classNames.push(e.params.containerModifierClass+"3d");var t={slidesPerView:1,slidesPerColumn:1,slidesPerGroup:1,watchSlidesProgress:!0,spaceBetween:0,virtualTranslate:!0};ee.extend(e.params,t),ee.extend(e.originalParams,t)}},setTranslate:function(){"flip"===this.params.effect&&this.flipEffect.setTranslate()},setTransition:function(e){"flip"===this.params.effect&&this.flipEffect.setTransition(e)}}},{name:"effect-coverflow",params:{coverflowEffect:{rotate:50,stretch:0,depth:100,modifier:1,slideShadows:!0}},create:function(){ee.extend(this,{coverflowEffect:{setTranslate:Q.setTranslate.bind(this),setTransition:Q.setTransition.bind(this)}})},on:{beforeInit:function(){var e=this;"coverflow"===e.params.effect&&(e.classNames.push(e.params.containerModifierClass+"coverflow"),e.classNames.push(e.params.containerModifierClass+"3d"),e.params.watchSlidesProgress=!0,e.originalParams.watchSlidesProgress=!0)},setTranslate:function(){"coverflow"===this.params.effect&&this.coverflowEffect.setTranslate()},setTransition:function(e){"coverflow"===this.params.effect&&this.coverflowEffect.setTransition(e)}}},{name:"thumbs",params:{thumbs:{swiper:null,slideThumbActiveClass:"swiper-slide-thumb-active",thumbsContainerClass:"swiper-container-thumbs"}},create:function(){ee.extend(this,{thumbs:{swiper:null,init:ae.init.bind(this),update:ae.update.bind(this),onThumbClick:ae.onThumbClick.bind(this)}})},on:{beforeInit:function(){var e=this.params.thumbs;e&&e.swiper&&(this.thumbs.init(),this.thumbs.update(!0))},slideChange:function(){this.thumbs.swiper&&this.thumbs.update()},update:function(){this.thumbs.swiper&&this.thumbs.update()},resize:function(){this.thumbs.swiper&&this.thumbs.update()},observerUpdate:function(){this.thumbs.swiper&&this.thumbs.update()},setTransition:function(e){var t=this.thumbs.swiper;t&&t.setTransition(e)},beforeDestroy:function(){var e=this.thumbs.swiper;e&&this.thumbs.swiperCreated&&e&&e.destroy()}}}];return void 0===S.use&&(S.use=S.Class.use,S.installModule=S.Class.installModule),S.use(ie),S});
+//# sourceMappingURL=swiper.min.js.map
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/jquery/jquery-1.10.1.min.js b/pluss-wap-page/src/main/resources/static/resources/js/third-party/jquery/jquery-1.10.1.min.js
new file mode 100644
index 0000000..e407e76
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/third-party/jquery/jquery-1.10.1.min.js
@@ -0,0 +1,6 @@
+/*! jQuery v1.10.1 | (c) 2005, 2013 jQuery Foundation, Inc. | jquery.org/license
+//@ sourceMappingURL=jquery-1.10.1.min.map
+*/
+(function(e,t){var n,r,i=typeof t,o=e.location,a=e.document,s=a.documentElement,l=e.jQuery,u=e.$,c={},p=[],f="1.10.1",d=p.concat,h=p.push,g=p.slice,m=p.indexOf,y=c.toString,v=c.hasOwnProperty,b=f.trim,x=function(e,t){return new x.fn.init(e,t,r)},w=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,T=/\S+/g,C=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,N=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,k=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,E=/^[\],:{}\s]*$/,S=/(?:^|:|,)(?:\s*\[)+/g,A=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,j=/"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g,D=/^-ms-/,L=/-([\da-z])/gi,H=function(e,t){return t.toUpperCase()},q=function(e){(a.addEventListener||"load"===e.type||"complete"===a.readyState)&&(_(),x.ready())},_=function(){a.addEventListener?(a.removeEventListener("DOMContentLoaded",q,!1),e.removeEventListener("load",q,!1)):(a.detachEvent("onreadystatechange",q),e.detachEvent("onload",q))};x.fn=x.prototype={jquery:f,constructor:x,init:function(e,n,r){var i,o;if(!e)return this;if("string"==typeof e){if(i="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:N.exec(e),!i||!i[1]&&n)return!n||n.jquery?(n||r).find(e):this.constructor(n).find(e);if(i[1]){if(n=n instanceof x?n[0]:n,x.merge(this,x.parseHTML(i[1],n&&n.nodeType?n.ownerDocument||n:a,!0)),k.test(i[1])&&x.isPlainObject(n))for(i in n)x.isFunction(this[i])?this[i](n[i]):this.attr(i,n[i]);return this}if(o=a.getElementById(i[2]),o&&o.parentNode){if(o.id!==i[2])return r.find(e);this.length=1,this[0]=o}return this.context=a,this.selector=e,this}return e.nodeType?(this.context=this[0]=e,this.length=1,this):x.isFunction(e)?r.ready(e):(e.selector!==t&&(this.selector=e.selector,this.context=e.context),x.makeArray(e,this))},selector:"",length:0,toArray:function(){return g.call(this)},get:function(e){return null==e?this.toArray():0>e?this[this.length+e]:this[e]},pushStack:function(e){var t=x.merge(this.constructor(),e);return t.prevObject=this,t.context=this.context,t},each:function(e,t){return x.each(this,e,t)},ready:function(e){return x.ready.promise().done(e),this},slice:function(){return this.pushStack(g.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(0>e?t:0);return this.pushStack(n>=0&&t>n?[this[n]]:[])},map:function(e){return this.pushStack(x.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject||this.constructor(null)},push:h,sort:[].sort,splice:[].splice},x.fn.init.prototype=x.fn,x.extend=x.fn.extend=function(){var e,n,r,i,o,a,s=arguments[0]||{},l=1,u=arguments.length,c=!1;for("boolean"==typeof s&&(c=s,s=arguments[1]||{},l=2),"object"==typeof s||x.isFunction(s)||(s={}),u===l&&(s=this,--l);u>l;l++)if(null!=(o=arguments[l]))for(i in o)e=s[i],r=o[i],s!==r&&(c&&r&&(x.isPlainObject(r)||(n=x.isArray(r)))?(n?(n=!1,a=e&&x.isArray(e)?e:[]):a=e&&x.isPlainObject(e)?e:{},s[i]=x.extend(c,a,r)):r!==t&&(s[i]=r));return s},x.extend({expando:"jQuery"+(f+Math.random()).replace(/\D/g,""),noConflict:function(t){return e.$===x&&(e.$=u),t&&e.jQuery===x&&(e.jQuery=l),x},isReady:!1,readyWait:1,holdReady:function(e){e?x.readyWait++:x.ready(!0)},ready:function(e){if(e===!0?!--x.readyWait:!x.isReady){if(!a.body)return setTimeout(x.ready);x.isReady=!0,e!==!0&&--x.readyWait>0||(n.resolveWith(a,[x]),x.fn.trigger&&x(a).trigger("ready").off("ready"))}},isFunction:function(e){return"function"===x.type(e)},isArray:Array.isArray||function(e){return"array"===x.type(e)},isWindow:function(e){return null!=e&&e==e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?c[y.call(e)]||"object":typeof e},isPlainObject:function(e){var n;if(!e||"object"!==x.type(e)||e.nodeType||x.isWindow(e))return!1;try{if(e.constructor&&!v.call(e,"constructor")&&!v.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(r){return!1}if(x.support.ownLast)for(n in e)return v.call(e,n);for(n in e);return n===t||v.call(e,n)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},error:function(e){throw Error(e)},parseHTML:function(e,t,n){if(!e||"string"!=typeof e)return null;"boolean"==typeof t&&(n=t,t=!1),t=t||a;var r=k.exec(e),i=!n&&[];return r?[t.createElement(r[1])]:(r=x.buildFragment([e],t,i),i&&x(i).remove(),x.merge([],r.childNodes))},parseJSON:function(n){return e.JSON&&e.JSON.parse?e.JSON.parse(n):null===n?n:"string"==typeof n&&(n=x.trim(n),n&&E.test(n.replace(A,"@").replace(j,"]").replace(S,"")))?Function("return "+n)():(x.error("Invalid JSON: "+n),t)},parseXML:function(n){var r,i;if(!n||"string"!=typeof n)return null;try{e.DOMParser?(i=new DOMParser,r=i.parseFromString(n,"text/xml")):(r=new ActiveXObject("Microsoft.XMLDOM"),r.async="false",r.loadXML(n))}catch(o){r=t}return r&&r.documentElement&&!r.getElementsByTagName("parsererror").length||x.error("Invalid XML: "+n),r},noop:function(){},globalEval:function(t){t&&x.trim(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(D,"ms-").replace(L,H)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t,n){var r,i=0,o=e.length,a=M(e);if(n){if(a){for(;o>i;i++)if(r=t.apply(e[i],n),r===!1)break}else for(i in e)if(r=t.apply(e[i],n),r===!1)break}else if(a){for(;o>i;i++)if(r=t.call(e[i],i,e[i]),r===!1)break}else for(i in e)if(r=t.call(e[i],i,e[i]),r===!1)break;return e},trim:b&&!b.call("\ufeff\u00a0")?function(e){return null==e?"":b.call(e)}:function(e){return null==e?"":(e+"").replace(C,"")},makeArray:function(e,t){var n=t||[];return null!=e&&(M(Object(e))?x.merge(n,"string"==typeof e?[e]:e):h.call(n,e)),n},inArray:function(e,t,n){var r;if(t){if(m)return m.call(t,e,n);for(r=t.length,n=n?0>n?Math.max(0,r+n):n:0;r>n;n++)if(n in t&&t[n]===e)return n}return-1},merge:function(e,n){var r=n.length,i=e.length,o=0;if("number"==typeof r)for(;r>o;o++)e[i++]=n[o];else while(n[o]!==t)e[i++]=n[o++];return e.length=i,e},grep:function(e,t,n){var r,i=[],o=0,a=e.length;for(n=!!n;a>o;o++)r=!!t(e[o],o),n!==r&&i.push(e[o]);return i},map:function(e,t,n){var r,i=0,o=e.length,a=M(e),s=[];if(a)for(;o>i;i++)r=t(e[i],i,n),null!=r&&(s[s.length]=r);else for(i in e)r=t(e[i],i,n),null!=r&&(s[s.length]=r);return d.apply([],s)},guid:1,proxy:function(e,n){var r,i,o;return"string"==typeof n&&(o=e[n],n=e,e=o),x.isFunction(e)?(r=g.call(arguments,2),i=function(){return e.apply(n||this,r.concat(g.call(arguments)))},i.guid=e.guid=e.guid||x.guid++,i):t},access:function(e,n,r,i,o,a,s){var l=0,u=e.length,c=null==r;if("object"===x.type(r)){o=!0;for(l in r)x.access(e,n,l,r[l],!0,a,s)}else if(i!==t&&(o=!0,x.isFunction(i)||(s=!0),c&&(s?(n.call(e,i),n=null):(c=n,n=function(e,t,n){return c.call(x(e),n)})),n))for(;u>l;l++)n(e[l],r,s?i:i.call(e[l],l,n(e[l],r)));return o?e:c?n.call(e):u?n(e[0],r):a},now:function(){return(new Date).getTime()},swap:function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];i=n.apply(e,r||[]);for(o in t)e.style[o]=a[o];return i}}),x.ready.promise=function(t){if(!n)if(n=x.Deferred(),"complete"===a.readyState)setTimeout(x.ready);else if(a.addEventListener)a.addEventListener("DOMContentLoaded",q,!1),e.addEventListener("load",q,!1);else{a.attachEvent("onreadystatechange",q),e.attachEvent("onload",q);var r=!1;try{r=null==e.frameElement&&a.documentElement}catch(i){}r&&r.doScroll&&function o(){if(!x.isReady){try{r.doScroll("left")}catch(e){return setTimeout(o,50)}_(),x.ready()}}()}return n.promise(t)},x.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(e,t){c["[object "+t+"]"]=t.toLowerCase()});function M(e){var t=e.length,n=x.type(e);return x.isWindow(e)?!1:1===e.nodeType&&t?!0:"array"===n||"function"!==n&&(0===t||"number"==typeof t&&t>0&&t-1 in e)}r=x(a),function(e,t){var n,r,i,o,a,s,l,u,c,p,f,d,h,g,m,y,v,b="sizzle"+-new Date,w=e.document,T=0,C=0,N=lt(),k=lt(),E=lt(),S=!1,A=function(){return 0},j=typeof t,D=1<<31,L={}.hasOwnProperty,H=[],q=H.pop,_=H.push,M=H.push,O=H.slice,F=H.indexOf||function(e){var t=0,n=this.length;for(;n>t;t++)if(this[t]===e)return t;return-1},B="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",P="[\\x20\\t\\r\\n\\f]",R="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",W=R.replace("w","w#"),$="\\["+P+"*("+R+")"+P+"*(?:([*^$|!~]?=)"+P+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+W+")|)|)"+P+"*\\]",I=":("+R+")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+$.replace(3,8)+")*)|.*)\\)|)",z=RegExp("^"+P+"+|((?:^|[^\\\\])(?:\\\\.)*)"+P+"+$","g"),X=RegExp("^"+P+"*,"+P+"*"),U=RegExp("^"+P+"*([>+~]|"+P+")"+P+"*"),V=RegExp(P+"*[+~]"),Y=RegExp("="+P+"*([^\\]'\"]*)"+P+"*\\]","g"),J=RegExp(I),G=RegExp("^"+W+"$"),Q={ID:RegExp("^#("+R+")"),CLASS:RegExp("^\\.("+R+")"),TAG:RegExp("^("+R.replace("w","w*")+")"),ATTR:RegExp("^"+$),PSEUDO:RegExp("^"+I),CHILD:RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+P+"*(even|odd|(([+-]|)(\\d*)n|)"+P+"*(?:([+-]|)"+P+"*(\\d+)|))"+P+"*\\)|)","i"),bool:RegExp("^(?:"+B+")$","i"),needsContext:RegExp("^"+P+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+P+"*((?:-\\d)?\\d*)"+P+"*\\)|)(?=[^-]|$)","i")},K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,et=/^(?:input|select|textarea|button)$/i,tt=/^h\d$/i,nt=/'|\\/g,rt=RegExp("\\\\([\\da-f]{1,6}"+P+"?|("+P+")|.)","ig"),it=function(e,t,n){var r="0x"+t-65536;return r!==r||n?t:0>r?String.fromCharCode(r+65536):String.fromCharCode(55296|r>>10,56320|1023&r)};try{M.apply(H=O.call(w.childNodes),w.childNodes),H[w.childNodes.length].nodeType}catch(ot){M={apply:H.length?function(e,t){_.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function at(e,t,n,i){var o,a,s,l,u,c,d,m,y,x;if((t?t.ownerDocument||t:w)!==f&&p(t),t=t||f,n=n||[],!e||"string"!=typeof e)return n;if(1!==(l=t.nodeType)&&9!==l)return[];if(h&&!i){if(o=Z.exec(e))if(s=o[1]){if(9===l){if(a=t.getElementById(s),!a||!a.parentNode)return n;if(a.id===s)return n.push(a),n}else if(t.ownerDocument&&(a=t.ownerDocument.getElementById(s))&&v(t,a)&&a.id===s)return n.push(a),n}else{if(o[2])return M.apply(n,t.getElementsByTagName(e)),n;if((s=o[3])&&r.getElementsByClassName&&t.getElementsByClassName)return M.apply(n,t.getElementsByClassName(s)),n}if(r.qsa&&(!g||!g.test(e))){if(m=d=b,y=t,x=9===l&&e,1===l&&"object"!==t.nodeName.toLowerCase()){c=bt(e),(d=t.getAttribute("id"))?m=d.replace(nt,"\\$&"):t.setAttribute("id",m),m="[id='"+m+"'] ",u=c.length;while(u--)c[u]=m+xt(c[u]);y=V.test(e)&&t.parentNode||t,x=c.join(",")}if(x)try{return M.apply(n,y.querySelectorAll(x)),n}catch(T){}finally{d||t.removeAttribute("id")}}}return At(e.replace(z,"$1"),t,n,i)}function st(e){return K.test(e+"")}function lt(){var e=[];function t(n,r){return e.push(n+=" ")>o.cacheLength&&delete t[e.shift()],t[n]=r}return t}function ut(e){return e[b]=!0,e}function ct(e){var t=f.createElement("div");try{return!!e(t)}catch(n){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function pt(e,t,n){e=e.split("|");var r,i=e.length,a=n?null:t;while(i--)(r=o.attrHandle[e[i]])&&r!==t||(o.attrHandle[e[i]]=a)}function ft(e,t){var n=e.getAttributeNode(t);return n&&n.specified?n.value:e[t]===!0?t.toLowerCase():null}function dt(e,t){return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}function ht(e){return"input"===e.nodeName.toLowerCase()?e.defaultValue:t}function gt(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&(~t.sourceIndex||D)-(~e.sourceIndex||D);if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function mt(e){return function(t){var n=t.nodeName.toLowerCase();return"input"===n&&t.type===e}}function yt(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function vt(e){return ut(function(t){return t=+t,ut(function(n,r){var i,o=e([],n.length,t),a=o.length;while(a--)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}s=at.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?"HTML"!==t.nodeName:!1},r=at.support={},p=at.setDocument=function(e){var n=e?e.ownerDocument||e:w,i=n.parentWindow;return n!==f&&9===n.nodeType&&n.documentElement?(f=n,d=n.documentElement,h=!s(n),i&&i.frameElement&&i.attachEvent("onbeforeunload",function(){p()}),r.attributes=ct(function(e){return e.innerHTML="<a href='#'></a>",pt("type|href|height|width",dt,"#"===e.firstChild.getAttribute("href")),pt(B,ft,null==e.getAttribute("disabled")),e.className="i",!e.getAttribute("className")}),r.input=ct(function(e){return e.innerHTML="<input>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")}),pt("value",ht,r.attributes&&r.input),r.getElementsByTagName=ct(function(e){return e.appendChild(n.createComment("")),!e.getElementsByTagName("*").length}),r.getElementsByClassName=ct(function(e){return e.innerHTML="<div class='a'></div><div class='a i'></div>",e.firstChild.className="i",2===e.getElementsByClassName("i").length}),r.getById=ct(function(e){return d.appendChild(e).id=b,!n.getElementsByName||!n.getElementsByName(b).length}),r.getById?(o.find.ID=function(e,t){if(typeof t.getElementById!==j&&h){var n=t.getElementById(e);return n&&n.parentNode?[n]:[]}},o.filter.ID=function(e){var t=e.replace(rt,it);return function(e){return e.getAttribute("id")===t}}):(delete o.find.ID,o.filter.ID=function(e){var t=e.replace(rt,it);return function(e){var n=typeof e.getAttributeNode!==j&&e.getAttributeNode("id");return n&&n.value===t}}),o.find.TAG=r.getElementsByTagName?function(e,n){return typeof n.getElementsByTagName!==j?n.getElementsByTagName(e):t}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},o.find.CLASS=r.getElementsByClassName&&function(e,n){return typeof n.getElementsByClassName!==j&&h?n.getElementsByClassName(e):t},m=[],g=[],(r.qsa=st(n.querySelectorAll))&&(ct(function(e){e.innerHTML="<select><option selected=''></option></select>",e.querySelectorAll("[selected]").length||g.push("\\["+P+"*(?:value|"+B+")"),e.querySelectorAll(":checked").length||g.push(":checked")}),ct(function(e){var t=n.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("t",""),e.querySelectorAll("[t^='']").length&&g.push("[*^$]="+P+"*(?:''|\"\")"),e.querySelectorAll(":enabled").length||g.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),g.push(",.*:")})),(r.matchesSelector=st(y=d.webkitMatchesSelector||d.mozMatchesSelector||d.oMatchesSelector||d.msMatchesSelector))&&ct(function(e){r.disconnectedMatch=y.call(e,"div"),y.call(e,"[s!='']:x"),m.push("!=",I)}),g=g.length&&RegExp(g.join("|")),m=m.length&&RegExp(m.join("|")),v=st(d.contains)||d.compareDocumentPosition?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},r.sortDetached=ct(function(e){return 1&e.compareDocumentPosition(n.createElement("div"))}),A=d.compareDocumentPosition?function(e,t){if(e===t)return S=!0,0;var i=t.compareDocumentPosition&&e.compareDocumentPosition&&e.compareDocumentPosition(t);return i?1&i||!r.sortDetached&&t.compareDocumentPosition(e)===i?e===n||v(w,e)?-1:t===n||v(w,t)?1:c?F.call(c,e)-F.call(c,t):0:4&i?-1:1:e.compareDocumentPosition?-1:1}:function(e,t){var r,i=0,o=e.parentNode,a=t.parentNode,s=[e],l=[t];if(e===t)return S=!0,0;if(!o||!a)return e===n?-1:t===n?1:o?-1:a?1:c?F.call(c,e)-F.call(c,t):0;if(o===a)return gt(e,t);r=e;while(r=r.parentNode)s.unshift(r);r=t;while(r=r.parentNode)l.unshift(r);while(s[i]===l[i])i++;return i?gt(s[i],l[i]):s[i]===w?-1:l[i]===w?1:0},n):f},at.matches=function(e,t){return at(e,null,null,t)},at.matchesSelector=function(e,t){if((e.ownerDocument||e)!==f&&p(e),t=t.replace(Y,"='$1']"),!(!r.matchesSelector||!h||m&&m.test(t)||g&&g.test(t)))try{var n=y.call(e,t);if(n||r.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(i){}return at(t,f,null,[e]).length>0},at.contains=function(e,t){return(e.ownerDocument||e)!==f&&p(e),v(e,t)},at.attr=function(e,n){(e.ownerDocument||e)!==f&&p(e);var i=o.attrHandle[n.toLowerCase()],a=i&&L.call(o.attrHandle,n.toLowerCase())?i(e,n,!h):t;return a===t?r.attributes||!h?e.getAttribute(n):(a=e.getAttributeNode(n))&&a.specified?a.value:null:a},at.error=function(e){throw Error("Syntax error, unrecognized expression: "+e)},at.uniqueSort=function(e){var t,n=[],i=0,o=0;if(S=!r.detectDuplicates,c=!r.sortStable&&e.slice(0),e.sort(A),S){while(t=e[o++])t===e[o]&&(i=n.push(o));while(i--)e.splice(n[i],1)}return e},a=at.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=a(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r];r++)n+=a(t);return n},o=at.selectors={cacheLength:50,createPseudo:ut,match:Q,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(rt,it),e[3]=(e[4]||e[5]||"").replace(rt,it),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||at.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&at.error(e[0]),e},PSEUDO:function(e){var n,r=!e[5]&&e[2];return Q.CHILD.test(e[0])?null:(e[3]&&e[4]!==t?e[2]=e[4]:r&&J.test(r)&&(n=bt(r,!0))&&(n=r.indexOf(")",r.length-n)-r.length)&&(e[0]=e[0].slice(0,n),e[2]=r.slice(0,n)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(rt,it).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=N[e+" "];return t||(t=RegExp("(^|"+P+")"+e+"("+P+"|$)"))&&N(e,function(e){return t.test("string"==typeof e.className&&e.className||typeof e.getAttribute!==j&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=at.attr(r,e);return null==i?"!="===t:t?(i+="","="===t?i===n:"!="===t?i!==n:"^="===t?n&&0===i.indexOf(n):"*="===t?n&&i.indexOf(n)>-1:"$="===t?n&&i.slice(-n.length)===n:"~="===t?(" "+i+" ").indexOf(n)>-1:"|="===t?i===n||i.slice(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,l){var u,c,p,f,d,h,g=o!==a?"nextSibling":"previousSibling",m=t.parentNode,y=s&&t.nodeName.toLowerCase(),v=!l&&!s;if(m){if(o){while(g){p=t;while(p=p[g])if(s?p.nodeName.toLowerCase()===y:1===p.nodeType)return!1;h=g="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?m.firstChild:m.lastChild],a&&v){c=m[b]||(m[b]={}),u=c[e]||[],d=u[0]===T&&u[1],f=u[0]===T&&u[2],p=d&&m.childNodes[d];while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if(1===p.nodeType&&++f&&p===t){c[e]=[T,d,f];break}}else if(v&&(u=(t[b]||(t[b]={}))[e])&&u[0]===T)f=u[1];else while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if((s?p.nodeName.toLowerCase()===y:1===p.nodeType)&&++f&&(v&&((p[b]||(p[b]={}))[e]=[T,f]),p===t))break;return f-=i,f===r||0===f%r&&f/r>=0}}},PSEUDO:function(e,t){var n,r=o.pseudos[e]||o.setFilters[e.toLowerCase()]||at.error("unsupported pseudo: "+e);return r[b]?r(t):r.length>1?(n=[e,e,"",t],o.setFilters.hasOwnProperty(e.toLowerCase())?ut(function(e,n){var i,o=r(e,t),a=o.length;while(a--)i=F.call(e,o[a]),e[i]=!(n[i]=o[a])}):function(e){return r(e,0,n)}):r}},pseudos:{not:ut(function(e){var t=[],n=[],r=l(e.replace(z,"$1"));return r[b]?ut(function(e,t,n,i){var o,a=r(e,null,i,[]),s=e.length;while(s--)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,i,o){return t[0]=e,r(t,null,o,n),!n.pop()}}),has:ut(function(e){return function(t){return at(e,t).length>0}}),contains:ut(function(e){return function(t){return(t.textContent||t.innerText||a(t)).indexOf(e)>-1}}),lang:ut(function(e){return G.test(e||"")||at.error("unsupported lang: "+e),e=e.replace(rt,it).toLowerCase(),function(t){var n;do if(n=h?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang"))return n=n.toLowerCase(),n===e||0===n.indexOf(e+"-");while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===d},focus:function(e){return e===f.activeElement&&(!f.hasFocus||f.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeName>"@"||3===e.nodeType||4===e.nodeType)return!1;return!0},parent:function(e){return!o.pseudos.empty(e)},header:function(e){return tt.test(e.nodeName)},input:function(e){return et.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||t.toLowerCase()===e.type)},first:vt(function(){return[0]}),last:vt(function(e,t){return[t-1]}),eq:vt(function(e,t,n){return[0>n?n+t:n]}),even:vt(function(e,t){var n=0;for(;t>n;n+=2)e.push(n);return e}),odd:vt(function(e,t){var n=1;for(;t>n;n+=2)e.push(n);return e}),lt:vt(function(e,t,n){var r=0>n?n+t:n;for(;--r>=0;)e.push(r);return e}),gt:vt(function(e,t,n){var r=0>n?n+t:n;for(;t>++r;)e.push(r);return e})}};for(n in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})o.pseudos[n]=mt(n);for(n in{submit:!0,reset:!0})o.pseudos[n]=yt(n);function bt(e,t){var n,r,i,a,s,l,u,c=k[e+" "];if(c)return t?0:c.slice(0);s=e,l=[],u=o.preFilter;while(s){(!n||(r=X.exec(s)))&&(r&&(s=s.slice(r[0].length)||s),l.push(i=[])),n=!1,(r=U.exec(s))&&(n=r.shift(),i.push({value:n,type:r[0].replace(z," ")}),s=s.slice(n.length));for(a in o.filter)!(r=Q[a].exec(s))||u[a]&&!(r=u[a](r))||(n=r.shift(),i.push({value:n,type:a,matches:r}),s=s.slice(n.length));if(!n)break}return t?s.length:s?at.error(e):k(e,l).slice(0)}function xt(e){var t=0,n=e.length,r="";for(;n>t;t++)r+=e[t].value;return r}function wt(e,t,n){var r=t.dir,o=n&&"parentNode"===r,a=C++;return t.first?function(t,n,i){while(t=t[r])if(1===t.nodeType||o)return e(t,n,i)}:function(t,n,s){var l,u,c,p=T+" "+a;if(s){while(t=t[r])if((1===t.nodeType||o)&&e(t,n,s))return!0}else while(t=t[r])if(1===t.nodeType||o)if(c=t[b]||(t[b]={}),(u=c[r])&&u[0]===p){if((l=u[1])===!0||l===i)return l===!0}else if(u=c[r]=[p],u[1]=e(t,n,s)||i,u[1]===!0)return!0}}function Tt(e){return e.length>1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function Ct(e,t,n,r,i){var o,a=[],s=0,l=e.length,u=null!=t;for(;l>s;s++)(o=e[s])&&(!n||n(o,r,i))&&(a.push(o),u&&t.push(s));return a}function Nt(e,t,n,r,i,o){return r&&!r[b]&&(r=Nt(r)),i&&!i[b]&&(i=Nt(i,o)),ut(function(o,a,s,l){var u,c,p,f=[],d=[],h=a.length,g=o||St(t||"*",s.nodeType?[s]:s,[]),m=!e||!o&&t?g:Ct(g,f,e,s,l),y=n?i||(o?e:h||r)?[]:a:m;if(n&&n(m,y,s,l),r){u=Ct(y,d),r(u,[],s,l),c=u.length;while(c--)(p=u[c])&&(y[d[c]]=!(m[d[c]]=p))}if(o){if(i||e){if(i){u=[],c=y.length;while(c--)(p=y[c])&&u.push(m[c]=p);i(null,y=[],u,l)}c=y.length;while(c--)(p=y[c])&&(u=i?F.call(o,p):f[c])>-1&&(o[u]=!(a[u]=p))}}else y=Ct(y===a?y.splice(h,y.length):y),i?i(null,a,y,l):M.apply(a,y)})}function kt(e){var t,n,r,i=e.length,a=o.relative[e[0].type],s=a||o.relative[" "],l=a?1:0,c=wt(function(e){return e===t},s,!0),p=wt(function(e){return F.call(t,e)>-1},s,!0),f=[function(e,n,r){return!a&&(r||n!==u)||((t=n).nodeType?c(e,n,r):p(e,n,r))}];for(;i>l;l++)if(n=o.relative[e[l].type])f=[wt(Tt(f),n)];else{if(n=o.filter[e[l].type].apply(null,e[l].matches),n[b]){for(r=++l;i>r;r++)if(o.relative[e[r].type])break;return Nt(l>1&&Tt(f),l>1&&xt(e.slice(0,l-1).concat({value:" "===e[l-2].type?"*":""})).replace(z,"$1"),n,r>l&&kt(e.slice(l,r)),i>r&&kt(e=e.slice(r)),i>r&&xt(e))}f.push(n)}return Tt(f)}function Et(e,t){var n=0,r=t.length>0,a=e.length>0,s=function(s,l,c,p,d){var h,g,m,y=[],v=0,b="0",x=s&&[],w=null!=d,C=u,N=s||a&&o.find.TAG("*",d&&l.parentNode||l),k=T+=null==C?1:Math.random()||.1;for(w&&(u=l!==f&&l,i=n);null!=(h=N[b]);b++){if(a&&h){g=0;while(m=e[g++])if(m(h,l,c)){p.push(h);break}w&&(T=k,i=++n)}r&&((h=!m&&h)&&v--,s&&x.push(h))}if(v+=b,r&&b!==v){g=0;while(m=t[g++])m(x,y,l,c);if(s){if(v>0)while(b--)x[b]||y[b]||(y[b]=q.call(p));y=Ct(y)}M.apply(p,y),w&&!s&&y.length>0&&v+t.length>1&&at.uniqueSort(p)}return w&&(T=k,u=C),x};return r?ut(s):s}l=at.compile=function(e,t){var n,r=[],i=[],o=E[e+" "];if(!o){t||(t=bt(e)),n=t.length;while(n--)o=kt(t[n]),o[b]?r.push(o):i.push(o);o=E(e,Et(i,r))}return o};function St(e,t,n){var r=0,i=t.length;for(;i>r;r++)at(e,t[r],n);return n}function At(e,t,n,i){var a,s,u,c,p,f=bt(e);if(!i&&1===f.length){if(s=f[0]=f[0].slice(0),s.length>2&&"ID"===(u=s[0]).type&&r.getById&&9===t.nodeType&&h&&o.relative[s[1].type]){if(t=(o.find.ID(u.matches[0].replace(rt,it),t)||[])[0],!t)return n;e=e.slice(s.shift().value.length)}a=Q.needsContext.test(e)?0:s.length;while(a--){if(u=s[a],o.relative[c=u.type])break;if((p=o.find[c])&&(i=p(u.matches[0].replace(rt,it),V.test(s[0].type)&&t.parentNode||t))){if(s.splice(a,1),e=i.length&&xt(s),!e)return M.apply(n,i),n;break}}}return l(e,f)(i,t,!h,n,V.test(e)),n}o.pseudos.nth=o.pseudos.eq;function jt(){}jt.prototype=o.filters=o.pseudos,o.setFilters=new jt,r.sortStable=b.split("").sort(A).join("")===b,p(),[0,0].sort(A),r.detectDuplicates=S,x.find=at,x.expr=at.selectors,x.expr[":"]=x.expr.pseudos,x.unique=at.uniqueSort,x.text=at.getText,x.isXMLDoc=at.isXML,x.contains=at.contains}(e);var O={};function F(e){var t=O[e]={};return x.each(e.match(T)||[],function(e,n){t[n]=!0}),t}x.Callbacks=function(e){e="string"==typeof e?O[e]||F(e):x.extend({},e);var n,r,i,o,a,s,l=[],u=!e.once&&[],c=function(t){for(r=e.memory&&t,i=!0,a=s||0,s=0,o=l.length,n=!0;l&&o>a;a++)if(l[a].apply(t[0],t[1])===!1&&e.stopOnFalse){r=!1;break}n=!1,l&&(u?u.length&&c(u.shift()):r?l=[]:p.disable())},p={add:function(){if(l){var t=l.length;(function i(t){x.each(t,function(t,n){var r=x.type(n);"function"===r?e.unique&&p.has(n)||l.push(n):n&&n.length&&"string"!==r&&i(n)})})(arguments),n?o=l.length:r&&(s=t,c(r))}return this},remove:function(){return l&&x.each(arguments,function(e,t){var r;while((r=x.inArray(t,l,r))>-1)l.splice(r,1),n&&(o>=r&&o--,a>=r&&a--)}),this},has:function(e){return e?x.inArray(e,l)>-1:!(!l||!l.length)},empty:function(){return l=[],o=0,this},disable:function(){return l=u=r=t,this},disabled:function(){return!l},lock:function(){return u=t,r||p.disable(),this},locked:function(){return!u},fireWith:function(e,t){return t=t||[],t=[e,t.slice?t.slice():t],!l||i&&!u||(n?u.push(t):c(t)),this},fire:function(){return p.fireWith(this,arguments),this},fired:function(){return!!i}};return p},x.extend({Deferred:function(e){var t=[["resolve","done",x.Callbacks("once memory"),"resolved"],["reject","fail",x.Callbacks("once memory"),"rejected"],["notify","progress",x.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return x.Deferred(function(n){x.each(t,function(t,o){var a=o[0],s=x.isFunction(e[t])&&e[t];i[o[1]](function(){var e=s&&s.apply(this,arguments);e&&x.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[a+"With"](this===r?n.promise():this,s?[e]:arguments)})}),e=null}).promise()},promise:function(e){return null!=e?x.extend(e,r):r}},i={};return r.pipe=r.then,x.each(t,function(e,o){var a=o[2],s=o[3];r[o[1]]=a.add,s&&a.add(function(){n=s},t[1^e][2].disable,t[2][2].lock),i[o[0]]=function(){return i[o[0]+"With"](this===i?r:this,arguments),this},i[o[0]+"With"]=a.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t=0,n=g.call(arguments),r=n.length,i=1!==r||e&&x.isFunction(e.promise)?r:0,o=1===i?e:x.Deferred(),a=function(e,t,n){return function(r){t[e]=this,n[e]=arguments.length>1?g.call(arguments):r,n===s?o.notifyWith(t,n):--i||o.resolveWith(t,n)}},s,l,u;if(r>1)for(s=Array(r),l=Array(r),u=Array(r);r>t;t++)n[t]&&x.isFunction(n[t].promise)?n[t].promise().done(a(t,u,n)).fail(o.reject).progress(a(t,l,s)):--i;return i||o.resolveWith(u,n),o.promise()}}),x.support=function(t){var n,r,o,s,l,u,c,p,f,d=a.createElement("div");if(d.setAttribute("className","t"),d.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",n=d.getElementsByTagName("*")||[],r=d.getElementsByTagName("a")[0],!r||!r.style||!n.length)return t;s=a.createElement("select"),u=s.appendChild(a.createElement("option")),o=d.getElementsByTagName("input")[0],r.style.cssText="top:1px;float:left;opacity:.5",t.getSetAttribute="t"!==d.className,t.leadingWhitespace=3===d.firstChild.nodeType,t.tbody=!d.getElementsByTagName("tbody").length,t.htmlSerialize=!!d.getElementsByTagName("link").length,t.style=/top/.test(r.getAttribute("style")),t.hrefNormalized="/a"===r.getAttribute("href"),t.opacity=/^0.5/.test(r.style.opacity),t.cssFloat=!!r.style.cssFloat,t.checkOn=!!o.value,t.optSelected=u.selected,t.enctype=!!a.createElement("form").enctype,t.html5Clone="<:nav></:nav>"!==a.createElement("nav").cloneNode(!0).outerHTML,t.inlineBlockNeedsLayout=!1,t.shrinkWrapBlocks=!1,t.pixelPosition=!1,t.deleteExpando=!0,t.noCloneEvent=!0,t.reliableMarginRight=!0,t.boxSizingReliable=!0,o.checked=!0,t.noCloneChecked=o.cloneNode(!0).checked,s.disabled=!0,t.optDisabled=!u.disabled;try{delete d.test}catch(h){t.deleteExpando=!1}o=a.createElement("input"),o.setAttribute("value",""),t.input=""===o.getAttribute("value"),o.value="t",o.setAttribute("type","radio"),t.radioValue="t"===o.value,o.setAttribute("checked","t"),o.setAttribute("name","t"),l=a.createDocumentFragment(),l.appendChild(o),t.appendChecked=o.checked,t.checkClone=l.cloneNode(!0).cloneNode(!0).lastChild.checked,d.attachEvent&&(d.attachEvent("onclick",function(){t.noCloneEvent=!1}),d.cloneNode(!0).click());for(f in{submit:!0,change:!0,focusin:!0})d.setAttribute(c="on"+f,"t"),t[f+"Bubbles"]=c in e||d.attributes[c].expando===!1;d.style.backgroundClip="content-box",d.cloneNode(!0).style.backgroundClip="",t.clearCloneStyle="content-box"===d.style.backgroundClip;for(f in x(t))break;return t.ownLast="0"!==f,x(function(){var n,r,o,s="padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;",l=a.getElementsByTagName("body")[0];l&&(n=a.createElement("div"),n.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px",l.appendChild(n).appendChild(d),d.innerHTML="<table><tr><td></td><td>t</td></tr></table>",o=d.getElementsByTagName("td"),o[0].style.cssText="padding:0;margin:0;border:0;display:none",p=0===o[0].offsetHeight,o[0].style.display="",o[1].style.display="none",t.reliableHiddenOffsets=p&&0===o[0].offsetHeight,d.innerHTML="",d.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",x.swap(l,null!=l.style.zoom?{zoom:1}:{},function(){t.boxSizing=4===d.offsetWidth}),e.getComputedStyle&&(t.pixelPosition="1%"!==(e.getComputedStyle(d,null)||{}).top,t.boxSizingReliable="4px"===(e.getComputedStyle(d,null)||{width:"4px"}).width,r=d.appendChild(a.createElement("div")),r.style.cssText=d.style.cssText=s,r.style.marginRight=r.style.width="0",d.style.width="1px",t.reliableMarginRight=!parseFloat((e.getComputedStyle(r,null)||{}).marginRight)),typeof d.style.zoom!==i&&(d.innerHTML="",d.style.cssText=s+"width:1px;padding:1px;display:inline;zoom:1",t.inlineBlockNeedsLayout=3===d.offsetWidth,d.style.display="block",d.innerHTML="<div></div>",d.firstChild.style.width="5px",t.shrinkWrapBlocks=3!==d.offsetWidth,t.inlineBlockNeedsLayout&&(l.style.zoom=1)),l.removeChild(n),n=d=o=r=null)
+}),n=s=l=u=r=o=null,t}({});var B=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,P=/([A-Z])/g;function R(e,n,r,i){if(x.acceptData(e)){var o,a,s=x.expando,l=e.nodeType,u=l?x.cache:e,c=l?e[s]:e[s]&&s;if(c&&u[c]&&(i||u[c].data)||r!==t||"string"!=typeof n)return c||(c=l?e[s]=p.pop()||x.guid++:s),u[c]||(u[c]=l?{}:{toJSON:x.noop}),("object"==typeof n||"function"==typeof n)&&(i?u[c]=x.extend(u[c],n):u[c].data=x.extend(u[c].data,n)),a=u[c],i||(a.data||(a.data={}),a=a.data),r!==t&&(a[x.camelCase(n)]=r),"string"==typeof n?(o=a[n],null==o&&(o=a[x.camelCase(n)])):o=a,o}}function W(e,t,n){if(x.acceptData(e)){var r,i,o=e.nodeType,a=o?x.cache:e,s=o?e[x.expando]:x.expando;if(a[s]){if(t&&(r=n?a[s]:a[s].data)){x.isArray(t)?t=t.concat(x.map(t,x.camelCase)):t in r?t=[t]:(t=x.camelCase(t),t=t in r?[t]:t.split(" ")),i=t.length;while(i--)delete r[t[i]];if(n?!I(r):!x.isEmptyObject(r))return}(n||(delete a[s].data,I(a[s])))&&(o?x.cleanData([e],!0):x.support.deleteExpando||a!=a.window?delete a[s]:a[s]=null)}}}x.extend({cache:{},noData:{applet:!0,embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(e){return e=e.nodeType?x.cache[e[x.expando]]:e[x.expando],!!e&&!I(e)},data:function(e,t,n){return R(e,t,n)},removeData:function(e,t){return W(e,t)},_data:function(e,t,n){return R(e,t,n,!0)},_removeData:function(e,t){return W(e,t,!0)},acceptData:function(e){if(e.nodeType&&1!==e.nodeType&&9!==e.nodeType)return!1;var t=e.nodeName&&x.noData[e.nodeName.toLowerCase()];return!t||t!==!0&&e.getAttribute("classid")===t}}),x.fn.extend({data:function(e,n){var r,i,o=null,a=0,s=this[0];if(e===t){if(this.length&&(o=x.data(s),1===s.nodeType&&!x._data(s,"parsedAttrs"))){for(r=s.attributes;r.length>a;a++)i=r[a].name,0===i.indexOf("data-")&&(i=x.camelCase(i.slice(5)),$(s,i,o[i]));x._data(s,"parsedAttrs",!0)}return o}return"object"==typeof e?this.each(function(){x.data(this,e)}):arguments.length>1?this.each(function(){x.data(this,e,n)}):s?$(s,e,x.data(s,e)):null},removeData:function(e){return this.each(function(){x.removeData(this,e)})}});function $(e,n,r){if(r===t&&1===e.nodeType){var i="data-"+n.replace(P,"-$1").toLowerCase();if(r=e.getAttribute(i),"string"==typeof r){try{r="true"===r?!0:"false"===r?!1:"null"===r?null:+r+""===r?+r:B.test(r)?x.parseJSON(r):r}catch(o){}x.data(e,n,r)}else r=t}return r}function I(e){var t;for(t in e)if(("data"!==t||!x.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}x.extend({queue:function(e,n,r){var i;return e?(n=(n||"fx")+"queue",i=x._data(e,n),r&&(!i||x.isArray(r)?i=x._data(e,n,x.makeArray(r)):i.push(r)),i||[]):t},dequeue:function(e,t){t=t||"fx";var n=x.queue(e,t),r=n.length,i=n.shift(),o=x._queueHooks(e,t),a=function(){x.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,a,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return x._data(e,n)||x._data(e,n,{empty:x.Callbacks("once memory").add(function(){x._removeData(e,t+"queue"),x._removeData(e,n)})})}}),x.fn.extend({queue:function(e,n){var r=2;return"string"!=typeof e&&(n=e,e="fx",r--),r>arguments.length?x.queue(this[0],e):n===t?this:this.each(function(){var t=x.queue(this,e,n);x._queueHooks(this,e),"fx"===e&&"inprogress"!==t[0]&&x.dequeue(this,e)})},dequeue:function(e){return this.each(function(){x.dequeue(this,e)})},delay:function(e,t){return e=x.fx?x.fx.speeds[e]||e:e,t=t||"fx",this.queue(t,function(t,n){var r=setTimeout(t,e);n.stop=function(){clearTimeout(r)}})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,n){var r,i=1,o=x.Deferred(),a=this,s=this.length,l=function(){--i||o.resolveWith(a,[a])};"string"!=typeof e&&(n=e,e=t),e=e||"fx";while(s--)r=x._data(a[s],e+"queueHooks"),r&&r.empty&&(i++,r.empty.add(l));return l(),o.promise(n)}});var z,X,U=/[\t\r\n\f]/g,V=/\r/g,Y=/^(?:input|select|textarea|button|object)$/i,J=/^(?:a|area)$/i,G=/^(?:checked|selected)$/i,Q=x.support.getSetAttribute,K=x.support.input;x.fn.extend({attr:function(e,t){return x.access(this,x.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){x.removeAttr(this,e)})},prop:function(e,t){return x.access(this,x.prop,e,t,arguments.length>1)},removeProp:function(e){return e=x.propFix[e]||e,this.each(function(){try{this[e]=t,delete this[e]}catch(n){}})},addClass:function(e){var t,n,r,i,o,a=0,s=this.length,l="string"==typeof e&&e;if(x.isFunction(e))return this.each(function(t){x(this).addClass(e.call(this,t,this.className))});if(l)for(t=(e||"").match(T)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(U," "):" ")){o=0;while(i=t[o++])0>r.indexOf(" "+i+" ")&&(r+=i+" ");n.className=x.trim(r)}return this},removeClass:function(e){var t,n,r,i,o,a=0,s=this.length,l=0===arguments.length||"string"==typeof e&&e;if(x.isFunction(e))return this.each(function(t){x(this).removeClass(e.call(this,t,this.className))});if(l)for(t=(e||"").match(T)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(U," "):"")){o=0;while(i=t[o++])while(r.indexOf(" "+i+" ")>=0)r=r.replace(" "+i+" "," ");n.className=e?x.trim(r):""}return this},toggleClass:function(e,t){var n=typeof e,r="boolean"==typeof t;return x.isFunction(e)?this.each(function(n){x(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if("string"===n){var o,a=0,s=x(this),l=t,u=e.match(T)||[];while(o=u[a++])l=r?l:!s.hasClass(o),s[l?"addClass":"removeClass"](o)}else(n===i||"boolean"===n)&&(this.className&&x._data(this,"__className__",this.className),this.className=this.className||e===!1?"":x._data(this,"__className__")||"")})},hasClass:function(e){var t=" "+e+" ",n=0,r=this.length;for(;r>n;n++)if(1===this[n].nodeType&&(" "+this[n].className+" ").replace(U," ").indexOf(t)>=0)return!0;return!1},val:function(e){var n,r,i,o=this[0];{if(arguments.length)return i=x.isFunction(e),this.each(function(n){var o;1===this.nodeType&&(o=i?e.call(this,n,x(this).val()):e,null==o?o="":"number"==typeof o?o+="":x.isArray(o)&&(o=x.map(o,function(e){return null==e?"":e+""})),r=x.valHooks[this.type]||x.valHooks[this.nodeName.toLowerCase()],r&&"set"in r&&r.set(this,o,"value")!==t||(this.value=o))});if(o)return r=x.valHooks[o.type]||x.valHooks[o.nodeName.toLowerCase()],r&&"get"in r&&(n=r.get(o,"value"))!==t?n:(n=o.value,"string"==typeof n?n.replace(V,""):null==n?"":n)}}}),x.extend({valHooks:{option:{get:function(e){var t=x.find.attr(e,"value");return null!=t?t:e.text}},select:{get:function(e){var t,n,r=e.options,i=e.selectedIndex,o="select-one"===e.type||0>i,a=o?null:[],s=o?i+1:r.length,l=0>i?s:o?i:0;for(;s>l;l++)if(n=r[l],!(!n.selected&&l!==i||(x.support.optDisabled?n.disabled:null!==n.getAttribute("disabled"))||n.parentNode.disabled&&x.nodeName(n.parentNode,"optgroup"))){if(t=x(n).val(),o)return t;a.push(t)}return a},set:function(e,t){var n,r,i=e.options,o=x.makeArray(t),a=i.length;while(a--)r=i[a],(r.selected=x.inArray(x(r).val(),o)>=0)&&(n=!0);return n||(e.selectedIndex=-1),o}}},attr:function(e,n,r){var o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return typeof e.getAttribute===i?x.prop(e,n,r):(1===s&&x.isXMLDoc(e)||(n=n.toLowerCase(),o=x.attrHooks[n]||(x.expr.match.bool.test(n)?X:z)),r===t?o&&"get"in o&&null!==(a=o.get(e,n))?a:(a=x.find.attr(e,n),null==a?t:a):null!==r?o&&"set"in o&&(a=o.set(e,r,n))!==t?a:(e.setAttribute(n,r+""),r):(x.removeAttr(e,n),t))},removeAttr:function(e,t){var n,r,i=0,o=t&&t.match(T);if(o&&1===e.nodeType)while(n=o[i++])r=x.propFix[n]||n,x.expr.match.bool.test(n)?K&&Q||!G.test(n)?e[r]=!1:e[x.camelCase("default-"+n)]=e[r]=!1:x.attr(e,n,""),e.removeAttribute(Q?n:r)},attrHooks:{type:{set:function(e,t){if(!x.support.radioValue&&"radio"===t&&x.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},propFix:{"for":"htmlFor","class":"className"},prop:function(e,n,r){var i,o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return a=1!==s||!x.isXMLDoc(e),a&&(n=x.propFix[n]||n,o=x.propHooks[n]),r!==t?o&&"set"in o&&(i=o.set(e,r,n))!==t?i:e[n]=r:o&&"get"in o&&null!==(i=o.get(e,n))?i:e[n]},propHooks:{tabIndex:{get:function(e){var t=x.find.attr(e,"tabindex");return t?parseInt(t,10):Y.test(e.nodeName)||J.test(e.nodeName)&&e.href?0:-1}}}}),X={set:function(e,t,n){return t===!1?x.removeAttr(e,n):K&&Q||!G.test(n)?e.setAttribute(!Q&&x.propFix[n]||n,n):e[x.camelCase("default-"+n)]=e[n]=!0,n}},x.each(x.expr.match.bool.source.match(/\w+/g),function(e,n){var r=x.expr.attrHandle[n]||x.find.attr;x.expr.attrHandle[n]=K&&Q||!G.test(n)?function(e,n,i){var o=x.expr.attrHandle[n],a=i?t:(x.expr.attrHandle[n]=t)!=r(e,n,i)?n.toLowerCase():null;return x.expr.attrHandle[n]=o,a}:function(e,n,r){return r?t:e[x.camelCase("default-"+n)]?n.toLowerCase():null}}),K&&Q||(x.attrHooks.value={set:function(e,n,r){return x.nodeName(e,"input")?(e.defaultValue=n,t):z&&z.set(e,n,r)}}),Q||(z={set:function(e,n,r){var i=e.getAttributeNode(r);return i||e.setAttributeNode(i=e.ownerDocument.createAttribute(r)),i.value=n+="","value"===r||n===e.getAttribute(r)?n:t}},x.expr.attrHandle.id=x.expr.attrHandle.name=x.expr.attrHandle.coords=function(e,n,r){var i;return r?t:(i=e.getAttributeNode(n))&&""!==i.value?i.value:null},x.valHooks.button={get:function(e,n){var r=e.getAttributeNode(n);return r&&r.specified?r.value:t},set:z.set},x.attrHooks.contenteditable={set:function(e,t,n){z.set(e,""===t?!1:t,n)}},x.each(["width","height"],function(e,n){x.attrHooks[n]={set:function(e,r){return""===r?(e.setAttribute(n,"auto"),r):t}}})),x.support.hrefNormalized||x.each(["href","src"],function(e,t){x.propHooks[t]={get:function(e){return e.getAttribute(t,4)}}}),x.support.style||(x.attrHooks.style={get:function(e){return e.style.cssText||t},set:function(e,t){return e.style.cssText=t+""}}),x.support.optSelected||(x.propHooks.selected={get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null}}),x.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){x.propFix[this.toLowerCase()]=this}),x.support.enctype||(x.propFix.enctype="encoding"),x.each(["radio","checkbox"],function(){x.valHooks[this]={set:function(e,n){return x.isArray(n)?e.checked=x.inArray(x(e).val(),n)>=0:t}},x.support.checkOn||(x.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})});var Z=/^(?:input|select|textarea)$/i,et=/^key/,tt=/^(?:mouse|contextmenu)|click/,nt=/^(?:focusinfocus|focusoutblur)$/,rt=/^([^.]*)(?:\.(.+)|)$/;function it(){return!0}function ot(){return!1}function at(){try{return a.activeElement}catch(e){}}x.event={global:{},add:function(e,n,r,o,a){var s,l,u,c,p,f,d,h,g,m,y,v=x._data(e);if(v){r.handler&&(c=r,r=c.handler,a=c.selector),r.guid||(r.guid=x.guid++),(l=v.events)||(l=v.events={}),(f=v.handle)||(f=v.handle=function(e){return typeof x===i||e&&x.event.triggered===e.type?t:x.event.dispatch.apply(f.elem,arguments)},f.elem=e),n=(n||"").match(T)||[""],u=n.length;while(u--)s=rt.exec(n[u])||[],g=y=s[1],m=(s[2]||"").split(".").sort(),g&&(p=x.event.special[g]||{},g=(a?p.delegateType:p.bindType)||g,p=x.event.special[g]||{},d=x.extend({type:g,origType:y,data:o,handler:r,guid:r.guid,selector:a,needsContext:a&&x.expr.match.needsContext.test(a),namespace:m.join(".")},c),(h=l[g])||(h=l[g]=[],h.delegateCount=0,p.setup&&p.setup.call(e,o,m,f)!==!1||(e.addEventListener?e.addEventListener(g,f,!1):e.attachEvent&&e.attachEvent("on"+g,f))),p.add&&(p.add.call(e,d),d.handler.guid||(d.handler.guid=r.guid)),a?h.splice(h.delegateCount++,0,d):h.push(d),x.event.global[g]=!0);e=null}},remove:function(e,t,n,r,i){var o,a,s,l,u,c,p,f,d,h,g,m=x.hasData(e)&&x._data(e);if(m&&(c=m.events)){t=(t||"").match(T)||[""],u=t.length;while(u--)if(s=rt.exec(t[u])||[],d=g=s[1],h=(s[2]||"").split(".").sort(),d){p=x.event.special[d]||{},d=(r?p.delegateType:p.bindType)||d,f=c[d]||[],s=s[2]&&RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),l=o=f.length;while(o--)a=f[o],!i&&g!==a.origType||n&&n.guid!==a.guid||s&&!s.test(a.namespace)||r&&r!==a.selector&&("**"!==r||!a.selector)||(f.splice(o,1),a.selector&&f.delegateCount--,p.remove&&p.remove.call(e,a));l&&!f.length&&(p.teardown&&p.teardown.call(e,h,m.handle)!==!1||x.removeEvent(e,d,m.handle),delete c[d])}else for(d in c)x.event.remove(e,d+t[u],n,r,!0);x.isEmptyObject(c)&&(delete m.handle,x._removeData(e,"events"))}},trigger:function(n,r,i,o){var s,l,u,c,p,f,d,h=[i||a],g=v.call(n,"type")?n.type:n,m=v.call(n,"namespace")?n.namespace.split("."):[];if(u=f=i=i||a,3!==i.nodeType&&8!==i.nodeType&&!nt.test(g+x.event.triggered)&&(g.indexOf(".")>=0&&(m=g.split("."),g=m.shift(),m.sort()),l=0>g.indexOf(":")&&"on"+g,n=n[x.expando]?n:new x.Event(g,"object"==typeof n&&n),n.isTrigger=o?2:3,n.namespace=m.join("."),n.namespace_re=n.namespace?RegExp("(^|\\.)"+m.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,n.result=t,n.target||(n.target=i),r=null==r?[n]:x.makeArray(r,[n]),p=x.event.special[g]||{},o||!p.trigger||p.trigger.apply(i,r)!==!1)){if(!o&&!p.noBubble&&!x.isWindow(i)){for(c=p.delegateType||g,nt.test(c+g)||(u=u.parentNode);u;u=u.parentNode)h.push(u),f=u;f===(i.ownerDocument||a)&&h.push(f.defaultView||f.parentWindow||e)}d=0;while((u=h[d++])&&!n.isPropagationStopped())n.type=d>1?c:p.bindType||g,s=(x._data(u,"events")||{})[n.type]&&x._data(u,"handle"),s&&s.apply(u,r),s=l&&u[l],s&&x.acceptData(u)&&s.apply&&s.apply(u,r)===!1&&n.preventDefault();if(n.type=g,!o&&!n.isDefaultPrevented()&&(!p._default||p._default.apply(h.pop(),r)===!1)&&x.acceptData(i)&&l&&i[g]&&!x.isWindow(i)){f=i[l],f&&(i[l]=null),x.event.triggered=g;try{i[g]()}catch(y){}x.event.triggered=t,f&&(i[l]=f)}return n.result}},dispatch:function(e){e=x.event.fix(e);var n,r,i,o,a,s=[],l=g.call(arguments),u=(x._data(this,"events")||{})[e.type]||[],c=x.event.special[e.type]||{};if(l[0]=e,e.delegateTarget=this,!c.preDispatch||c.preDispatch.call(this,e)!==!1){s=x.event.handlers.call(this,e,u),n=0;while((o=s[n++])&&!e.isPropagationStopped()){e.currentTarget=o.elem,a=0;while((i=o.handlers[a++])&&!e.isImmediatePropagationStopped())(!e.namespace_re||e.namespace_re.test(i.namespace))&&(e.handleObj=i,e.data=i.data,r=((x.event.special[i.origType]||{}).handle||i.handler).apply(o.elem,l),r!==t&&(e.result=r)===!1&&(e.preventDefault(),e.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,e),e.result}},handlers:function(e,n){var r,i,o,a,s=[],l=n.delegateCount,u=e.target;if(l&&u.nodeType&&(!e.button||"click"!==e.type))for(;u!=this;u=u.parentNode||this)if(1===u.nodeType&&(u.disabled!==!0||"click"!==e.type)){for(o=[],a=0;l>a;a++)i=n[a],r=i.selector+" ",o[r]===t&&(o[r]=i.needsContext?x(r,this).index(u)>=0:x.find(r,this,null,[u]).length),o[r]&&o.push(i);o.length&&s.push({elem:u,handlers:o})}return n.length>l&&s.push({elem:this,handlers:n.slice(l)}),s},fix:function(e){if(e[x.expando])return e;var t,n,r,i=e.type,o=e,s=this.fixHooks[i];s||(this.fixHooks[i]=s=tt.test(i)?this.mouseHooks:et.test(i)?this.keyHooks:{}),r=s.props?this.props.concat(s.props):this.props,e=new x.Event(o),t=r.length;while(t--)n=r[t],e[n]=o[n];return e.target||(e.target=o.srcElement||a),3===e.target.nodeType&&(e.target=e.target.parentNode),e.metaKey=!!e.metaKey,s.filter?s.filter(e,o):e},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return null==e.which&&(e.which=null!=t.charCode?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,n){var r,i,o,s=n.button,l=n.fromElement;return null==e.pageX&&null!=n.clientX&&(i=e.target.ownerDocument||a,o=i.documentElement,r=i.body,e.pageX=n.clientX+(o&&o.scrollLeft||r&&r.scrollLeft||0)-(o&&o.clientLeft||r&&r.clientLeft||0),e.pageY=n.clientY+(o&&o.scrollTop||r&&r.scrollTop||0)-(o&&o.clientTop||r&&r.clientTop||0)),!e.relatedTarget&&l&&(e.relatedTarget=l===e.target?n.toElement:l),e.which||s===t||(e.which=1&s?1:2&s?3:4&s?2:0),e}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==at()&&this.focus)try{return this.focus(),!1}catch(e){}},delegateType:"focusin"},blur:{trigger:function(){return this===at()&&this.blur?(this.blur(),!1):t},delegateType:"focusout"},click:{trigger:function(){return x.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):t},_default:function(e){return x.nodeName(e.target,"a")}},beforeunload:{postDispatch:function(e){e.result!==t&&(e.originalEvent.returnValue=e.result)}}},simulate:function(e,t,n,r){var i=x.extend(new x.Event,n,{type:e,isSimulated:!0,originalEvent:{}});r?x.event.trigger(i,null,t):x.event.dispatch.call(t,i),i.isDefaultPrevented()&&n.preventDefault()}},x.removeEvent=a.removeEventListener?function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n,!1)}:function(e,t,n){var r="on"+t;e.detachEvent&&(typeof e[r]===i&&(e[r]=null),e.detachEvent(r,n))},x.Event=function(e,n){return this instanceof x.Event?(e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||e.returnValue===!1||e.getPreventDefault&&e.getPreventDefault()?it:ot):this.type=e,n&&x.extend(this,n),this.timeStamp=e&&e.timeStamp||x.now(),this[x.expando]=!0,t):new x.Event(e,n)},x.Event.prototype={isDefaultPrevented:ot,isPropagationStopped:ot,isImmediatePropagationStopped:ot,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=it,e&&(e.preventDefault?e.preventDefault():e.returnValue=!1)},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=it,e&&(e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=it,this.stopPropagation()}},x.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(e,t){x.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,o=e.handleObj;return(!i||i!==r&&!x.contains(r,i))&&(e.type=o.origType,n=o.handler.apply(this,arguments),e.type=t),n}}}),x.support.submitBubbles||(x.event.special.submit={setup:function(){return x.nodeName(this,"form")?!1:(x.event.add(this,"click._submit keypress._submit",function(e){var n=e.target,r=x.nodeName(n,"input")||x.nodeName(n,"button")?n.form:t;r&&!x._data(r,"submitBubbles")&&(x.event.add(r,"submit._submit",function(e){e._submit_bubble=!0}),x._data(r,"submitBubbles",!0))}),t)},postDispatch:function(e){e._submit_bubble&&(delete e._submit_bubble,this.parentNode&&!e.isTrigger&&x.event.simulate("submit",this.parentNode,e,!0))},teardown:function(){return x.nodeName(this,"form")?!1:(x.event.remove(this,"._submit"),t)}}),x.support.changeBubbles||(x.event.special.change={setup:function(){return Z.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(x.event.add(this,"propertychange._change",function(e){"checked"===e.originalEvent.propertyName&&(this._just_changed=!0)}),x.event.add(this,"click._change",function(e){this._just_changed&&!e.isTrigger&&(this._just_changed=!1),x.event.simulate("change",this,e,!0)})),!1):(x.event.add(this,"beforeactivate._change",function(e){var t=e.target;Z.test(t.nodeName)&&!x._data(t,"changeBubbles")&&(x.event.add(t,"change._change",function(e){!this.parentNode||e.isSimulated||e.isTrigger||x.event.simulate("change",this.parentNode,e,!0)}),x._data(t,"changeBubbles",!0))}),t)},handle:function(e){var n=e.target;return this!==n||e.isSimulated||e.isTrigger||"radio"!==n.type&&"checkbox"!==n.type?e.handleObj.handler.apply(this,arguments):t},teardown:function(){return x.event.remove(this,"._change"),!Z.test(this.nodeName)}}),x.support.focusinBubbles||x.each({focus:"focusin",blur:"focusout"},function(e,t){var n=0,r=function(e){x.event.simulate(t,e.target,x.event.fix(e),!0)};x.event.special[t]={setup:function(){0===n++&&a.addEventListener(e,r,!0)},teardown:function(){0===--n&&a.removeEventListener(e,r,!0)}}}),x.fn.extend({on:function(e,n,r,i,o){var a,s;if("object"==typeof e){"string"!=typeof n&&(r=r||n,n=t);for(a in e)this.on(a,n,r,e[a],o);return this}if(null==r&&null==i?(i=n,r=n=t):null==i&&("string"==typeof n?(i=r,r=t):(i=r,r=n,n=t)),i===!1)i=ot;else if(!i)return this;return 1===o&&(s=i,i=function(e){return x().off(e),s.apply(this,arguments)},i.guid=s.guid||(s.guid=x.guid++)),this.each(function(){x.event.add(this,e,i,r,n)})},one:function(e,t,n,r){return this.on(e,t,n,r,1)},off:function(e,n,r){var i,o;if(e&&e.preventDefault&&e.handleObj)return i=e.handleObj,x(e.delegateTarget).off(i.namespace?i.origType+"."+i.namespace:i.origType,i.selector,i.handler),this;if("object"==typeof e){for(o in e)this.off(o,n,e[o]);return this}return(n===!1||"function"==typeof n)&&(r=n,n=t),r===!1&&(r=ot),this.each(function(){x.event.remove(this,e,r,n)})},trigger:function(e,t){return this.each(function(){x.event.trigger(e,t,this)})},triggerHandler:function(e,n){var r=this[0];return r?x.event.trigger(e,n,r,!0):t}});var st=/^.[^:#\[\.,]*$/,lt=/^(?:parents|prev(?:Until|All))/,ut=x.expr.match.needsContext,ct={children:!0,contents:!0,next:!0,prev:!0};x.fn.extend({find:function(e){var t,n=[],r=this,i=r.length;if("string"!=typeof e)return this.pushStack(x(e).filter(function(){for(t=0;i>t;t++)if(x.contains(r[t],this))return!0}));for(t=0;i>t;t++)x.find(e,r[t],n);return n=this.pushStack(i>1?x.unique(n):n),n.selector=this.selector?this.selector+" "+e:e,n},has:function(e){var t,n=x(e,this),r=n.length;return this.filter(function(){for(t=0;r>t;t++)if(x.contains(this,n[t]))return!0})},not:function(e){return this.pushStack(ft(this,e||[],!0))},filter:function(e){return this.pushStack(ft(this,e||[],!1))},is:function(e){return!!ft(this,"string"==typeof e&&ut.test(e)?x(e):e||[],!1).length},closest:function(e,t){var n,r=0,i=this.length,o=[],a=ut.test(e)||"string"!=typeof e?x(e,t||this.context):0;for(;i>r;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(11>n.nodeType&&(a?a.index(n)>-1:1===n.nodeType&&x.find.matchesSelector(n,e))){n=o.push(n);break}return this.pushStack(o.length>1?x.unique(o):o)},index:function(e){return e?"string"==typeof e?x.inArray(this[0],x(e)):x.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){var n="string"==typeof e?x(e,t):x.makeArray(e&&e.nodeType?[e]:e),r=x.merge(this.get(),n);return this.pushStack(x.unique(r))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}});function pt(e,t){do e=e[t];while(e&&1!==e.nodeType);return e}x.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return x.dir(e,"parentNode")},parentsUntil:function(e,t,n){return x.dir(e,"parentNode",n)},next:function(e){return pt(e,"nextSibling")},prev:function(e){return pt(e,"previousSibling")},nextAll:function(e){return x.dir(e,"nextSibling")},prevAll:function(e){return x.dir(e,"previousSibling")},nextUntil:function(e,t,n){return x.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return x.dir(e,"previousSibling",n)},siblings:function(e){return x.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return x.sibling(e.firstChild)},contents:function(e){return x.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:x.merge([],e.childNodes)}},function(e,t){x.fn[e]=function(n,r){var i=x.map(this,t,n);return"Until"!==e.slice(-5)&&(r=n),r&&"string"==typeof r&&(i=x.filter(r,i)),this.length>1&&(ct[e]||(i=x.unique(i)),lt.test(e)&&(i=i.reverse())),this.pushStack(i)}}),x.extend({filter:function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?x.find.matchesSelector(r,e)?[r]:[]:x.find.matches(e,x.grep(t,function(e){return 1===e.nodeType}))},dir:function(e,n,r){var i=[],o=e[n];while(o&&9!==o.nodeType&&(r===t||1!==o.nodeType||!x(o).is(r)))1===o.nodeType&&i.push(o),o=o[n];return i},sibling:function(e,t){var n=[];for(;e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n}});function ft(e,t,n){if(x.isFunction(t))return x.grep(e,function(e,r){return!!t.call(e,r,e)!==n});if(t.nodeType)return x.grep(e,function(e){return e===t!==n});if("string"==typeof t){if(st.test(t))return x.filter(t,e,n);t=x.filter(t,e)}return x.grep(e,function(e){return x.inArray(e,t)>=0!==n})}function dt(e){var t=ht.split("|"),n=e.createDocumentFragment();if(n.createElement)while(t.length)n.createElement(t.pop());return n}var ht="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",gt=/ jQuery\d+="(?:null|\d+)"/g,mt=RegExp("<(?:"+ht+")[\\s/>]","i"),yt=/^\s+/,vt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bt=/<([\w:]+)/,xt=/<tbody/i,wt=/<|&#?\w+;/,Tt=/<(?:script|style|link)/i,Ct=/^(?:checkbox|radio)$/i,Nt=/checked\s*(?:[^=]|=\s*.checked.)/i,kt=/^$|\/(?:java|ecma)script/i,Et=/^true\/(.*)/,St=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,At={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:x.support.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]},jt=dt(a),Dt=jt.appendChild(a.createElement("div"));At.optgroup=At.option,At.tbody=At.tfoot=At.colgroup=At.caption=At.thead,At.th=At.td,x.fn.extend({text:function(e){return x.access(this,function(e){return e===t?x.text(this):this.empty().append((this[0]&&this[0].ownerDocument||a).createTextNode(e))},null,e,arguments.length)},append:function(){return this.domManip(arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Lt(this,e);t.appendChild(e)}})},prepend:function(){return this.domManip(arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Lt(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},remove:function(e,t){var n,r=e?x.filter(e,this):this,i=0;for(;null!=(n=r[i]);i++)t||1!==n.nodeType||x.cleanData(Ft(n)),n.parentNode&&(t&&x.contains(n.ownerDocument,n)&&_t(Ft(n,"script")),n.parentNode.removeChild(n));return this},empty:function(){var e,t=0;for(;null!=(e=this[t]);t++){1===e.nodeType&&x.cleanData(Ft(e,!1));while(e.firstChild)e.removeChild(e.firstChild);e.options&&x.nodeName(e,"select")&&(e.options.length=0)}return this},clone:function(e,t){return e=null==e?!1:e,t=null==t?e:t,this.map(function(){return x.clone(this,e,t)})},html:function(e){return x.access(this,function(e){var n=this[0]||{},r=0,i=this.length;if(e===t)return 1===n.nodeType?n.innerHTML.replace(gt,""):t;if(!("string"!=typeof e||Tt.test(e)||!x.support.htmlSerialize&&mt.test(e)||!x.support.leadingWhitespace&&yt.test(e)||At[(bt.exec(e)||["",""])[1].toLowerCase()])){e=e.replace(vt,"<$1></$2>");try{for(;i>r;r++)n=this[r]||{},1===n.nodeType&&(x.cleanData(Ft(n,!1)),n.innerHTML=e);n=0}catch(o){}}n&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var e=x.map(this,function(e){return[e.nextSibling,e.parentNode]}),t=0;return this.domManip(arguments,function(n){var r=e[t++],i=e[t++];i&&(r&&r.parentNode!==i&&(r=this.nextSibling),x(this).remove(),i.insertBefore(n,r))},!0),t?this:this.remove()},detach:function(e){return this.remove(e,!0)},domManip:function(e,t,n){e=d.apply([],e);var r,i,o,a,s,l,u=0,c=this.length,p=this,f=c-1,h=e[0],g=x.isFunction(h);if(g||!(1>=c||"string"!=typeof h||x.support.checkClone)&&Nt.test(h))return this.each(function(r){var i=p.eq(r);g&&(e[0]=h.call(this,r,i.html())),i.domManip(e,t,n)});if(c&&(l=x.buildFragment(e,this[0].ownerDocument,!1,!n&&this),r=l.firstChild,1===l.childNodes.length&&(l=r),r)){for(a=x.map(Ft(l,"script"),Ht),o=a.length;c>u;u++)i=l,u!==f&&(i=x.clone(i,!0,!0),o&&x.merge(a,Ft(i,"script"))),t.call(this[u],i,u);if(o)for(s=a[a.length-1].ownerDocument,x.map(a,qt),u=0;o>u;u++)i=a[u],kt.test(i.type||"")&&!x._data(i,"globalEval")&&x.contains(s,i)&&(i.src?x._evalUrl(i.src):x.globalEval((i.text||i.textContent||i.innerHTML||"").replace(St,"")));l=r=null}return this}});function Lt(e,t){return x.nodeName(e,"table")&&x.nodeName(1===t.nodeType?t:t.firstChild,"tr")?e.getElementsByTagName("tbody")[0]||e.appendChild(e.ownerDocument.createElement("tbody")):e}function Ht(e){return e.type=(null!==x.find.attr(e,"type"))+"/"+e.type,e}function qt(e){var t=Et.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function _t(e,t){var n,r=0;for(;null!=(n=e[r]);r++)x._data(n,"globalEval",!t||x._data(t[r],"globalEval"))}function Mt(e,t){if(1===t.nodeType&&x.hasData(e)){var n,r,i,o=x._data(e),a=x._data(t,o),s=o.events;if(s){delete a.handle,a.events={};for(n in s)for(r=0,i=s[n].length;i>r;r++)x.event.add(t,n,s[n][r])}a.data&&(a.data=x.extend({},a.data))}}function Ot(e,t){var n,r,i;if(1===t.nodeType){if(n=t.nodeName.toLowerCase(),!x.support.noCloneEvent&&t[x.expando]){i=x._data(t);for(r in i.events)x.removeEvent(t,r,i.handle);t.removeAttribute(x.expando)}"script"===n&&t.text!==e.text?(Ht(t).text=e.text,qt(t)):"object"===n?(t.parentNode&&(t.outerHTML=e.outerHTML),x.support.html5Clone&&e.innerHTML&&!x.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):"input"===n&&Ct.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):"option"===n?t.defaultSelected=t.selected=e.defaultSelected:("input"===n||"textarea"===n)&&(t.defaultValue=e.defaultValue)}}x.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){x.fn[e]=function(e){var n,r=0,i=[],o=x(e),a=o.length-1;for(;a>=r;r++)n=r===a?this:this.clone(!0),x(o[r])[t](n),h.apply(i,n.get());return this.pushStack(i)}});function Ft(e,n){var r,o,a=0,s=typeof e.getElementsByTagName!==i?e.getElementsByTagName(n||"*"):typeof e.querySelectorAll!==i?e.querySelectorAll(n||"*"):t;if(!s)for(s=[],r=e.childNodes||e;null!=(o=r[a]);a++)!n||x.nodeName(o,n)?s.push(o):x.merge(s,Ft(o,n));return n===t||n&&x.nodeName(e,n)?x.merge([e],s):s}function Bt(e){Ct.test(e.type)&&(e.defaultChecked=e.checked)}x.extend({clone:function(e,t,n){var r,i,o,a,s,l=x.contains(e.ownerDocument,e);if(x.support.html5Clone||x.isXMLDoc(e)||!mt.test("<"+e.nodeName+">")?o=e.cloneNode(!0):(Dt.innerHTML=e.outerHTML,Dt.removeChild(o=Dt.firstChild)),!(x.support.noCloneEvent&&x.support.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||x.isXMLDoc(e)))for(r=Ft(o),s=Ft(e),a=0;null!=(i=s[a]);++a)r[a]&&Ot(i,r[a]);if(t)if(n)for(s=s||Ft(e),r=r||Ft(o),a=0;null!=(i=s[a]);a++)Mt(i,r[a]);else Mt(e,o);return r=Ft(o,"script"),r.length>0&&_t(r,!l&&Ft(e,"script")),r=s=i=null,o},buildFragment:function(e,t,n,r){var i,o,a,s,l,u,c,p=e.length,f=dt(t),d=[],h=0;for(;p>h;h++)if(o=e[h],o||0===o)if("object"===x.type(o))x.merge(d,o.nodeType?[o]:o);else if(wt.test(o)){s=s||f.appendChild(t.createElement("div")),l=(bt.exec(o)||["",""])[1].toLowerCase(),c=At[l]||At._default,s.innerHTML=c[1]+o.replace(vt,"<$1></$2>")+c[2],i=c[0];while(i--)s=s.lastChild;if(!x.support.leadingWhitespace&&yt.test(o)&&d.push(t.createTextNode(yt.exec(o)[0])),!x.support.tbody){o="table"!==l||xt.test(o)?"<table>"!==c[1]||xt.test(o)?0:s:s.firstChild,i=o&&o.childNodes.length;while(i--)x.nodeName(u=o.childNodes[i],"tbody")&&!u.childNodes.length&&o.removeChild(u)}x.merge(d,s.childNodes),s.textContent="";while(s.firstChild)s.removeChild(s.firstChild);s=f.lastChild}else d.push(t.createTextNode(o));s&&f.removeChild(s),x.support.appendChecked||x.grep(Ft(d,"input"),Bt),h=0;while(o=d[h++])if((!r||-1===x.inArray(o,r))&&(a=x.contains(o.ownerDocument,o),s=Ft(f.appendChild(o),"script"),a&&_t(s),n)){i=0;while(o=s[i++])kt.test(o.type||"")&&n.push(o)}return s=null,f},cleanData:function(e,t){var n,r,o,a,s=0,l=x.expando,u=x.cache,c=x.support.deleteExpando,f=x.event.special;for(;null!=(n=e[s]);s++)if((t||x.acceptData(n))&&(o=n[l],a=o&&u[o])){if(a.events)for(r in a.events)f[r]?x.event.remove(n,r):x.removeEvent(n,r,a.handle);
+u[o]&&(delete u[o],c?delete n[l]:typeof n.removeAttribute!==i?n.removeAttribute(l):n[l]=null,p.push(o))}},_evalUrl:function(e){return x.ajax({url:e,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})}}),x.fn.extend({wrapAll:function(e){if(x.isFunction(e))return this.each(function(t){x(this).wrapAll(e.call(this,t))});if(this[0]){var t=x(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstChild&&1===e.firstChild.nodeType)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return x.isFunction(e)?this.each(function(t){x(this).wrapInner(e.call(this,t))}):this.each(function(){var t=x(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=x.isFunction(e);return this.each(function(n){x(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){x.nodeName(this,"body")||x(this).replaceWith(this.childNodes)}).end()}});var Pt,Rt,Wt,$t=/alpha\([^)]*\)/i,It=/opacity\s*=\s*([^)]*)/,zt=/^(top|right|bottom|left)$/,Xt=/^(none|table(?!-c[ea]).+)/,Ut=/^margin/,Vt=RegExp("^("+w+")(.*)$","i"),Yt=RegExp("^("+w+")(?!px)[a-z%]+$","i"),Jt=RegExp("^([+-])=("+w+")","i"),Gt={BODY:"block"},Qt={position:"absolute",visibility:"hidden",display:"block"},Kt={letterSpacing:0,fontWeight:400},Zt=["Top","Right","Bottom","Left"],en=["Webkit","O","Moz","ms"];function tn(e,t){if(t in e)return t;var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=en.length;while(i--)if(t=en[i]+n,t in e)return t;return r}function nn(e,t){return e=t||e,"none"===x.css(e,"display")||!x.contains(e.ownerDocument,e)}function rn(e,t){var n,r,i,o=[],a=0,s=e.length;for(;s>a;a++)r=e[a],r.style&&(o[a]=x._data(r,"olddisplay"),n=r.style.display,t?(o[a]||"none"!==n||(r.style.display=""),""===r.style.display&&nn(r)&&(o[a]=x._data(r,"olddisplay",ln(r.nodeName)))):o[a]||(i=nn(r),(n&&"none"!==n||!i)&&x._data(r,"olddisplay",i?n:x.css(r,"display"))));for(a=0;s>a;a++)r=e[a],r.style&&(t&&"none"!==r.style.display&&""!==r.style.display||(r.style.display=t?o[a]||"":"none"));return e}x.fn.extend({css:function(e,n){return x.access(this,function(e,n,r){var i,o,a={},s=0;if(x.isArray(n)){for(o=Rt(e),i=n.length;i>s;s++)a[n[s]]=x.css(e,n[s],!1,o);return a}return r!==t?x.style(e,n,r):x.css(e,n)},e,n,arguments.length>1)},show:function(){return rn(this,!0)},hide:function(){return rn(this)},toggle:function(e){var t="boolean"==typeof e;return this.each(function(){(t?e:nn(this))?x(this).show():x(this).hide()})}}),x.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Wt(e,"opacity");return""===n?"1":n}}}},cssNumber:{columnCount:!0,fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":x.support.cssFloat?"cssFloat":"styleFloat"},style:function(e,n,r,i){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var o,a,s,l=x.camelCase(n),u=e.style;if(n=x.cssProps[l]||(x.cssProps[l]=tn(u,l)),s=x.cssHooks[n]||x.cssHooks[l],r===t)return s&&"get"in s&&(o=s.get(e,!1,i))!==t?o:u[n];if(a=typeof r,"string"===a&&(o=Jt.exec(r))&&(r=(o[1]+1)*o[2]+parseFloat(x.css(e,n)),a="number"),!(null==r||"number"===a&&isNaN(r)||("number"!==a||x.cssNumber[l]||(r+="px"),x.support.clearCloneStyle||""!==r||0!==n.indexOf("background")||(u[n]="inherit"),s&&"set"in s&&(r=s.set(e,r,i))===t)))try{u[n]=r}catch(c){}}},css:function(e,n,r,i){var o,a,s,l=x.camelCase(n);return n=x.cssProps[l]||(x.cssProps[l]=tn(e.style,l)),s=x.cssHooks[n]||x.cssHooks[l],s&&"get"in s&&(a=s.get(e,!0,r)),a===t&&(a=Wt(e,n,i)),"normal"===a&&n in Kt&&(a=Kt[n]),""===r||r?(o=parseFloat(a),r===!0||x.isNumeric(o)?o||0:a):a}}),e.getComputedStyle?(Rt=function(t){return e.getComputedStyle(t,null)},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),l=s?s.getPropertyValue(n)||s[n]:t,u=e.style;return s&&(""!==l||x.contains(e.ownerDocument,e)||(l=x.style(e,n)),Yt.test(l)&&Ut.test(n)&&(i=u.width,o=u.minWidth,a=u.maxWidth,u.minWidth=u.maxWidth=u.width=l,l=s.width,u.width=i,u.minWidth=o,u.maxWidth=a)),l}):a.documentElement.currentStyle&&(Rt=function(e){return e.currentStyle},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),l=s?s[n]:t,u=e.style;return null==l&&u&&u[n]&&(l=u[n]),Yt.test(l)&&!zt.test(n)&&(i=u.left,o=e.runtimeStyle,a=o&&o.left,a&&(o.left=e.currentStyle.left),u.left="fontSize"===n?"1em":l,l=u.pixelLeft+"px",u.left=i,a&&(o.left=a)),""===l?"auto":l});function on(e,t,n){var r=Vt.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function an(e,t,n,r,i){var o=n===(r?"border":"content")?4:"width"===t?1:0,a=0;for(;4>o;o+=2)"margin"===n&&(a+=x.css(e,n+Zt[o],!0,i)),r?("content"===n&&(a-=x.css(e,"padding"+Zt[o],!0,i)),"margin"!==n&&(a-=x.css(e,"border"+Zt[o]+"Width",!0,i))):(a+=x.css(e,"padding"+Zt[o],!0,i),"padding"!==n&&(a+=x.css(e,"border"+Zt[o]+"Width",!0,i)));return a}function sn(e,t,n){var r=!0,i="width"===t?e.offsetWidth:e.offsetHeight,o=Rt(e),a=x.support.boxSizing&&"border-box"===x.css(e,"boxSizing",!1,o);if(0>=i||null==i){if(i=Wt(e,t,o),(0>i||null==i)&&(i=e.style[t]),Yt.test(i))return i;r=a&&(x.support.boxSizingReliable||i===e.style[t]),i=parseFloat(i)||0}return i+an(e,t,n||(a?"border":"content"),r,o)+"px"}function ln(e){var t=a,n=Gt[e];return n||(n=un(e,t),"none"!==n&&n||(Pt=(Pt||x("<iframe frameborder='0' width='0' height='0'/>").css("cssText","display:block !important")).appendTo(t.documentElement),t=(Pt[0].contentWindow||Pt[0].contentDocument).document,t.write("<!doctype html><html><body>"),t.close(),n=un(e,t),Pt.detach()),Gt[e]=n),n}function un(e,t){var n=x(t.createElement(e)).appendTo(t.body),r=x.css(n[0],"display");return n.remove(),r}x.each(["height","width"],function(e,n){x.cssHooks[n]={get:function(e,r,i){return r?0===e.offsetWidth&&Xt.test(x.css(e,"display"))?x.swap(e,Qt,function(){return sn(e,n,i)}):sn(e,n,i):t},set:function(e,t,r){var i=r&&Rt(e);return on(e,t,r?an(e,n,r,x.support.boxSizing&&"border-box"===x.css(e,"boxSizing",!1,i),i):0)}}}),x.support.opacity||(x.cssHooks.opacity={get:function(e,t){return It.test((t&&e.currentStyle?e.currentStyle.filter:e.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":t?"1":""},set:function(e,t){var n=e.style,r=e.currentStyle,i=x.isNumeric(t)?"alpha(opacity="+100*t+")":"",o=r&&r.filter||n.filter||"";n.zoom=1,(t>=1||""===t)&&""===x.trim(o.replace($t,""))&&n.removeAttribute&&(n.removeAttribute("filter"),""===t||r&&!r.filter)||(n.filter=$t.test(o)?o.replace($t,i):o+" "+i)}}),x(function(){x.support.reliableMarginRight||(x.cssHooks.marginRight={get:function(e,n){return n?x.swap(e,{display:"inline-block"},Wt,[e,"marginRight"]):t}}),!x.support.pixelPosition&&x.fn.position&&x.each(["top","left"],function(e,n){x.cssHooks[n]={get:function(e,r){return r?(r=Wt(e,n),Yt.test(r)?x(e).position()[n]+"px":r):t}}})}),x.expr&&x.expr.filters&&(x.expr.filters.hidden=function(e){return 0>=e.offsetWidth&&0>=e.offsetHeight||!x.support.reliableHiddenOffsets&&"none"===(e.style&&e.style.display||x.css(e,"display"))},x.expr.filters.visible=function(e){return!x.expr.filters.hidden(e)}),x.each({margin:"",padding:"",border:"Width"},function(e,t){x.cssHooks[e+t]={expand:function(n){var r=0,i={},o="string"==typeof n?n.split(" "):[n];for(;4>r;r++)i[e+Zt[r]+t]=o[r]||o[r-2]||o[0];return i}},Ut.test(e)||(x.cssHooks[e+t].set=on)});var cn=/%20/g,pn=/\[\]$/,fn=/\r?\n/g,dn=/^(?:submit|button|image|reset|file)$/i,hn=/^(?:input|select|textarea|keygen)/i;x.fn.extend({serialize:function(){return x.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=x.prop(this,"elements");return e?x.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!x(this).is(":disabled")&&hn.test(this.nodeName)&&!dn.test(e)&&(this.checked||!Ct.test(e))}).map(function(e,t){var n=x(this).val();return null==n?null:x.isArray(n)?x.map(n,function(e){return{name:t.name,value:e.replace(fn,"\r\n")}}):{name:t.name,value:n.replace(fn,"\r\n")}}).get()}}),x.param=function(e,n){var r,i=[],o=function(e,t){t=x.isFunction(t)?t():null==t?"":t,i[i.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};if(n===t&&(n=x.ajaxSettings&&x.ajaxSettings.traditional),x.isArray(e)||e.jquery&&!x.isPlainObject(e))x.each(e,function(){o(this.name,this.value)});else for(r in e)gn(r,e[r],n,o);return i.join("&").replace(cn,"+")};function gn(e,t,n,r){var i;if(x.isArray(t))x.each(t,function(t,i){n||pn.test(e)?r(e,i):gn(e+"["+("object"==typeof i?t:"")+"]",i,n,r)});else if(n||"object"!==x.type(t))r(e,t);else for(i in t)gn(e+"["+i+"]",t[i],n,r)}x.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(e,t){x.fn[t]=function(e,n){return arguments.length>0?this.on(t,null,e,n):this.trigger(t)}}),x.fn.extend({hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)},bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)}});var mn,yn,vn=x.now(),bn=/\?/,xn=/#.*$/,wn=/([?&])_=[^&]*/,Tn=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Cn=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Nn=/^(?:GET|HEAD)$/,kn=/^\/\//,En=/^([\w.+-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,Sn=x.fn.load,An={},jn={},Dn="*/".concat("*");try{yn=o.href}catch(Ln){yn=a.createElement("a"),yn.href="",yn=yn.href}mn=En.exec(yn.toLowerCase())||[];function Hn(e){return function(t,n){"string"!=typeof t&&(n=t,t="*");var r,i=0,o=t.toLowerCase().match(T)||[];if(x.isFunction(n))while(r=o[i++])"+"===r[0]?(r=r.slice(1)||"*",(e[r]=e[r]||[]).unshift(n)):(e[r]=e[r]||[]).push(n)}}function qn(e,n,r,i){var o={},a=e===jn;function s(l){var u;return o[l]=!0,x.each(e[l]||[],function(e,l){var c=l(n,r,i);return"string"!=typeof c||a||o[c]?a?!(u=c):t:(n.dataTypes.unshift(c),s(c),!1)}),u}return s(n.dataTypes[0])||!o["*"]&&s("*")}function _n(e,n){var r,i,o=x.ajaxSettings.flatOptions||{};for(i in n)n[i]!==t&&((o[i]?e:r||(r={}))[i]=n[i]);return r&&x.extend(!0,e,r),e}x.fn.load=function(e,n,r){if("string"!=typeof e&&Sn)return Sn.apply(this,arguments);var i,o,a,s=this,l=e.indexOf(" ");return l>=0&&(i=e.slice(l,e.length),e=e.slice(0,l)),x.isFunction(n)?(r=n,n=t):n&&"object"==typeof n&&(a="POST"),s.length>0&&x.ajax({url:e,type:a,dataType:"html",data:n}).done(function(e){o=arguments,s.html(i?x("<div>").append(x.parseHTML(e)).find(i):e)}).complete(r&&function(e,t){s.each(r,o||[e.responseText,t,e])}),this},x.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){x.fn[t]=function(e){return this.on(t,e)}}),x.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:yn,type:"GET",isLocal:Cn.test(mn[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Dn,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":x.parseJSON,"text xml":x.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?_n(_n(e,x.ajaxSettings),t):_n(x.ajaxSettings,e)},ajaxPrefilter:Hn(An),ajaxTransport:Hn(jn),ajax:function(e,n){"object"==typeof e&&(n=e,e=t),n=n||{};var r,i,o,a,s,l,u,c,p=x.ajaxSetup({},n),f=p.context||p,d=p.context&&(f.nodeType||f.jquery)?x(f):x.event,h=x.Deferred(),g=x.Callbacks("once memory"),m=p.statusCode||{},y={},v={},b=0,w="canceled",C={readyState:0,getResponseHeader:function(e){var t;if(2===b){if(!c){c={};while(t=Tn.exec(a))c[t[1].toLowerCase()]=t[2]}t=c[e.toLowerCase()]}return null==t?null:t},getAllResponseHeaders:function(){return 2===b?a:null},setRequestHeader:function(e,t){var n=e.toLowerCase();return b||(e=v[n]=v[n]||e,y[e]=t),this},overrideMimeType:function(e){return b||(p.mimeType=e),this},statusCode:function(e){var t;if(e)if(2>b)for(t in e)m[t]=[m[t],e[t]];else C.always(e[C.status]);return this},abort:function(e){var t=e||w;return u&&u.abort(t),k(0,t),this}};if(h.promise(C).complete=g.add,C.success=C.done,C.error=C.fail,p.url=((e||p.url||yn)+"").replace(xn,"").replace(kn,mn[1]+"//"),p.type=n.method||n.type||p.method||p.type,p.dataTypes=x.trim(p.dataType||"*").toLowerCase().match(T)||[""],null==p.crossDomain&&(r=En.exec(p.url.toLowerCase()),p.crossDomain=!(!r||r[1]===mn[1]&&r[2]===mn[2]&&(r[3]||("http:"===r[1]?"80":"443"))===(mn[3]||("http:"===mn[1]?"80":"443")))),p.data&&p.processData&&"string"!=typeof p.data&&(p.data=x.param(p.data,p.traditional)),qn(An,p,n,C),2===b)return C;l=p.global,l&&0===x.active++&&x.event.trigger("ajaxStart"),p.type=p.type.toUpperCase(),p.hasContent=!Nn.test(p.type),o=p.url,p.hasContent||(p.data&&(o=p.url+=(bn.test(o)?"&":"?")+p.data,delete p.data),p.cache===!1&&(p.url=wn.test(o)?o.replace(wn,"$1_="+vn++):o+(bn.test(o)?"&":"?")+"_="+vn++)),p.ifModified&&(x.lastModified[o]&&C.setRequestHeader("If-Modified-Since",x.lastModified[o]),x.etag[o]&&C.setRequestHeader("If-None-Match",x.etag[o])),(p.data&&p.hasContent&&p.contentType!==!1||n.contentType)&&C.setRequestHeader("Content-Type",p.contentType),C.setRequestHeader("Accept",p.dataTypes[0]&&p.accepts[p.dataTypes[0]]?p.accepts[p.dataTypes[0]]+("*"!==p.dataTypes[0]?", "+Dn+"; q=0.01":""):p.accepts["*"]);for(i in p.headers)C.setRequestHeader(i,p.headers[i]);if(p.beforeSend&&(p.beforeSend.call(f,C,p)===!1||2===b))return C.abort();w="abort";for(i in{success:1,error:1,complete:1})C[i](p[i]);if(u=qn(jn,p,n,C)){C.readyState=1,l&&d.trigger("ajaxSend",[C,p]),p.async&&p.timeout>0&&(s=setTimeout(function(){C.abort("timeout")},p.timeout));try{b=1,u.send(y,k)}catch(N){if(!(2>b))throw N;k(-1,N)}}else k(-1,"No Transport");function k(e,n,r,i){var c,y,v,w,T,N=n;2!==b&&(b=2,s&&clearTimeout(s),u=t,a=i||"",C.readyState=e>0?4:0,c=e>=200&&300>e||304===e,r&&(w=Mn(p,C,r)),w=On(p,w,C,c),c?(p.ifModified&&(T=C.getResponseHeader("Last-Modified"),T&&(x.lastModified[o]=T),T=C.getResponseHeader("etag"),T&&(x.etag[o]=T)),204===e||"HEAD"===p.type?N="nocontent":304===e?N="notmodified":(N=w.state,y=w.data,v=w.error,c=!v)):(v=N,(e||!N)&&(N="error",0>e&&(e=0))),C.status=e,C.statusText=(n||N)+"",c?h.resolveWith(f,[y,N,C]):h.rejectWith(f,[C,N,v]),C.statusCode(m),m=t,l&&d.trigger(c?"ajaxSuccess":"ajaxError",[C,p,c?y:v]),g.fireWith(f,[C,N]),l&&(d.trigger("ajaxComplete",[C,p]),--x.active||x.event.trigger("ajaxStop")))}return C},getJSON:function(e,t,n){return x.get(e,t,n,"json")},getScript:function(e,n){return x.get(e,t,n,"script")}}),x.each(["get","post"],function(e,n){x[n]=function(e,r,i,o){return x.isFunction(r)&&(o=o||i,i=r,r=t),x.ajax({url:e,type:n,dataType:o,data:r,success:i})}});function Mn(e,n,r){var i,o,a,s,l=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),o===t&&(o=e.mimeType||n.getResponseHeader("Content-Type"));if(o)for(s in l)if(l[s]&&l[s].test(o)){u.unshift(s);break}if(u[0]in r)a=u[0];else{for(s in r){if(!u[0]||e.converters[s+" "+u[0]]){a=s;break}i||(i=s)}a=a||i}return a?(a!==u[0]&&u.unshift(a),r[a]):t}function On(e,t,n,r){var i,o,a,s,l,u={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)u[a.toLowerCase()]=e.converters[a];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!l&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),l=o,o=c.shift())if("*"===o)o=l;else if("*"!==l&&l!==o){if(a=u[l+" "+o]||u["* "+o],!a)for(i in u)if(s=i.split(" "),s[1]===o&&(a=u[l+" "+s[0]]||u["* "+s[0]])){a===!0?a=u[i]:u[i]!==!0&&(o=s[0],c.unshift(s[1]));break}if(a!==!0)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(p){return{state:"parsererror",error:a?p:"No conversion from "+l+" to "+o}}}return{state:"success",data:t}}x.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(e){return x.globalEval(e),e}}}),x.ajaxPrefilter("script",function(e){e.cache===t&&(e.cache=!1),e.crossDomain&&(e.type="GET",e.global=!1)}),x.ajaxTransport("script",function(e){if(e.crossDomain){var n,r=a.head||x("head")[0]||a.documentElement;return{send:function(t,i){n=a.createElement("script"),n.async=!0,e.scriptCharset&&(n.charset=e.scriptCharset),n.src=e.url,n.onload=n.onreadystatechange=function(e,t){(t||!n.readyState||/loaded|complete/.test(n.readyState))&&(n.onload=n.onreadystatechange=null,n.parentNode&&n.parentNode.removeChild(n),n=null,t||i(200,"success"))},r.insertBefore(n,r.firstChild)},abort:function(){n&&n.onload(t,!0)}}}});var Fn=[],Bn=/(=)\?(?=&|$)|\?\?/;x.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Fn.pop()||x.expando+"_"+vn++;return this[e]=!0,e}}),x.ajaxPrefilter("json jsonp",function(n,r,i){var o,a,s,l=n.jsonp!==!1&&(Bn.test(n.url)?"url":"string"==typeof n.data&&!(n.contentType||"").indexOf("application/x-www-form-urlencoded")&&Bn.test(n.data)&&"data");return l||"jsonp"===n.dataTypes[0]?(o=n.jsonpCallback=x.isFunction(n.jsonpCallback)?n.jsonpCallback():n.jsonpCallback,l?n[l]=n[l].replace(Bn,"$1"+o):n.jsonp!==!1&&(n.url+=(bn.test(n.url)?"&":"?")+n.jsonp+"="+o),n.converters["script json"]=function(){return s||x.error(o+" was not called"),s[0]},n.dataTypes[0]="json",a=e[o],e[o]=function(){s=arguments},i.always(function(){e[o]=a,n[o]&&(n.jsonpCallback=r.jsonpCallback,Fn.push(o)),s&&x.isFunction(a)&&a(s[0]),s=a=t}),"script"):t});var Pn,Rn,Wn=0,$n=e.ActiveXObject&&function(){var e;for(e in Pn)Pn[e](t,!0)};function In(){try{return new e.XMLHttpRequest}catch(t){}}function zn(){try{return new e.ActiveXObject("Microsoft.XMLHTTP")}catch(t){}}x.ajaxSettings.xhr=e.ActiveXObject?function(){return!this.isLocal&&In()||zn()}:In,Rn=x.ajaxSettings.xhr(),x.support.cors=!!Rn&&"withCredentials"in Rn,Rn=x.support.ajax=!!Rn,Rn&&x.ajaxTransport(function(n){if(!n.crossDomain||x.support.cors){var r;return{send:function(i,o){var a,s,l=n.xhr();if(n.username?l.open(n.type,n.url,n.async,n.username,n.password):l.open(n.type,n.url,n.async),n.xhrFields)for(s in n.xhrFields)l[s]=n.xhrFields[s];n.mimeType&&l.overrideMimeType&&l.overrideMimeType(n.mimeType),n.crossDomain||i["X-Requested-With"]||(i["X-Requested-With"]="XMLHttpRequest");try{for(s in i)l.setRequestHeader(s,i[s])}catch(u){}l.send(n.hasContent&&n.data||null),r=function(e,i){var s,u,c,p;try{if(r&&(i||4===l.readyState))if(r=t,a&&(l.onreadystatechange=x.noop,$n&&delete Pn[a]),i)4!==l.readyState&&l.abort();else{p={},s=l.status,u=l.getAllResponseHeaders(),"string"==typeof l.responseText&&(p.text=l.responseText);try{c=l.statusText}catch(f){c=""}s||!n.isLocal||n.crossDomain?1223===s&&(s=204):s=p.text?200:404}}catch(d){i||o(-1,d)}p&&o(s,c,p,u)},n.async?4===l.readyState?setTimeout(r):(a=++Wn,$n&&(Pn||(Pn={},x(e).unload($n)),Pn[a]=r),l.onreadystatechange=r):r()},abort:function(){r&&r(t,!0)}}}});var Xn,Un,Vn=/^(?:toggle|show|hide)$/,Yn=RegExp("^(?:([+-])=|)("+w+")([a-z%]*)$","i"),Jn=/queueHooks$/,Gn=[nr],Qn={"*":[function(e,t){var n=this.createTween(e,t),r=n.cur(),i=Yn.exec(t),o=i&&i[3]||(x.cssNumber[e]?"":"px"),a=(x.cssNumber[e]||"px"!==o&&+r)&&Yn.exec(x.css(n.elem,e)),s=1,l=20;if(a&&a[3]!==o){o=o||a[3],i=i||[],a=+r||1;do s=s||".5",a/=s,x.style(n.elem,e,a+o);while(s!==(s=n.cur()/r)&&1!==s&&--l)}return i&&(a=n.start=+a||+r||0,n.unit=o,n.end=i[1]?a+(i[1]+1)*i[2]:+i[2]),n}]};function Kn(){return setTimeout(function(){Xn=t}),Xn=x.now()}function Zn(e,t,n){var r,i=(Qn[t]||[]).concat(Qn["*"]),o=0,a=i.length;for(;a>o;o++)if(r=i[o].call(n,t,e))return r}function er(e,t,n){var r,i,o=0,a=Gn.length,s=x.Deferred().always(function(){delete l.elem}),l=function(){if(i)return!1;var t=Xn||Kn(),n=Math.max(0,u.startTime+u.duration-t),r=n/u.duration||0,o=1-r,a=0,l=u.tweens.length;for(;l>a;a++)u.tweens[a].run(o);return s.notifyWith(e,[u,o,n]),1>o&&l?n:(s.resolveWith(e,[u]),!1)},u=s.promise({elem:e,props:x.extend({},t),opts:x.extend(!0,{specialEasing:{}},n),originalProperties:t,originalOptions:n,startTime:Xn||Kn(),duration:n.duration,tweens:[],createTween:function(t,n){var r=x.Tween(e,u.opts,t,n,u.opts.specialEasing[t]||u.opts.easing);return u.tweens.push(r),r},stop:function(t){var n=0,r=t?u.tweens.length:0;if(i)return this;for(i=!0;r>n;n++)u.tweens[n].run(1);return t?s.resolveWith(e,[u,t]):s.rejectWith(e,[u,t]),this}}),c=u.props;for(tr(c,u.opts.specialEasing);a>o;o++)if(r=Gn[o].call(u,e,c,u.opts))return r;return x.map(c,Zn,u),x.isFunction(u.opts.start)&&u.opts.start.call(e,u),x.fx.timer(x.extend(l,{elem:e,anim:u,queue:u.opts.queue})),u.progress(u.opts.progress).done(u.opts.done,u.opts.complete).fail(u.opts.fail).always(u.opts.always)}function tr(e,t){var n,r,i,o,a;for(n in e)if(r=x.camelCase(n),i=t[r],o=e[n],x.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),a=x.cssHooks[r],a&&"expand"in a){o=a.expand(o),delete e[r];for(n in o)n in e||(e[n]=o[n],t[n]=i)}else t[r]=i}x.Animation=x.extend(er,{tweener:function(e,t){x.isFunction(e)?(t=e,e=["*"]):e=e.split(" ");var n,r=0,i=e.length;for(;i>r;r++)n=e[r],Qn[n]=Qn[n]||[],Qn[n].unshift(t)},prefilter:function(e,t){t?Gn.unshift(e):Gn.push(e)}});function nr(e,t,n){var r,i,o,a,s,l,u=this,c={},p=e.style,f=e.nodeType&&nn(e),d=x._data(e,"fxshow");n.queue||(s=x._queueHooks(e,"fx"),null==s.unqueued&&(s.unqueued=0,l=s.empty.fire,s.empty.fire=function(){s.unqueued||l()}),s.unqueued++,u.always(function(){u.always(function(){s.unqueued--,x.queue(e,"fx").length||s.empty.fire()})})),1===e.nodeType&&("height"in t||"width"in t)&&(n.overflow=[p.overflow,p.overflowX,p.overflowY],"inline"===x.css(e,"display")&&"none"===x.css(e,"float")&&(x.support.inlineBlockNeedsLayout&&"inline"!==ln(e.nodeName)?p.zoom=1:p.display="inline-block")),n.overflow&&(p.overflow="hidden",x.support.shrinkWrapBlocks||u.always(function(){p.overflow=n.overflow[0],p.overflowX=n.overflow[1],p.overflowY=n.overflow[2]}));for(r in t)if(i=t[r],Vn.exec(i)){if(delete t[r],o=o||"toggle"===i,i===(f?"hide":"show"))continue;c[r]=d&&d[r]||x.style(e,r)}if(!x.isEmptyObject(c)){d?"hidden"in d&&(f=d.hidden):d=x._data(e,"fxshow",{}),o&&(d.hidden=!f),f?x(e).show():u.done(function(){x(e).hide()}),u.done(function(){var t;x._removeData(e,"fxshow");for(t in c)x.style(e,t,c[t])});for(r in c)a=Zn(f?d[r]:0,r,u),r in d||(d[r]=a.start,f&&(a.end=a.start,a.start="width"===r||"height"===r?1:0))}}function rr(e,t,n,r,i){return new rr.prototype.init(e,t,n,r,i)}x.Tween=rr,rr.prototype={constructor:rr,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||"swing",this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(x.cssNumber[n]?"":"px")},cur:function(){var e=rr.propHooks[this.prop];return e&&e.get?e.get(this):rr.propHooks._default.get(this)},run:function(e){var t,n=rr.propHooks[this.prop];return this.pos=t=this.options.duration?x.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):rr.propHooks._default.set(this),this}},rr.prototype.init.prototype=rr.prototype,rr.propHooks={_default:{get:function(e){var t;return null==e.elem[e.prop]||e.elem.style&&null!=e.elem.style[e.prop]?(t=x.css(e.elem,e.prop,""),t&&"auto"!==t?t:0):e.elem[e.prop]},set:function(e){x.fx.step[e.prop]?x.fx.step[e.prop](e):e.elem.style&&(null!=e.elem.style[x.cssProps[e.prop]]||x.cssHooks[e.prop])?x.style(e.elem,e.prop,e.now+e.unit):e.elem[e.prop]=e.now}}},rr.propHooks.scrollTop=rr.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},x.each(["toggle","show","hide"],function(e,t){var n=x.fn[t];x.fn[t]=function(e,r,i){return null==e||"boolean"==typeof e?n.apply(this,arguments):this.animate(ir(t,!0),e,r,i)}}),x.fn.extend({fadeTo:function(e,t,n,r){return this.filter(nn).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(e,t,n,r){var i=x.isEmptyObject(e),o=x.speed(t,n,r),a=function(){var t=er(this,x.extend({},e),o);(i||x._data(this,"finish"))&&t.stop(!0)};return a.finish=a,i||o.queue===!1?this.each(a):this.queue(o.queue,a)},stop:function(e,n,r){var i=function(e){var t=e.stop;delete e.stop,t(r)};return"string"!=typeof e&&(r=n,n=e,e=t),n&&e!==!1&&this.queue(e||"fx",[]),this.each(function(){var t=!0,n=null!=e&&e+"queueHooks",o=x.timers,a=x._data(this);if(n)a[n]&&a[n].stop&&i(a[n]);else for(n in a)a[n]&&a[n].stop&&Jn.test(n)&&i(a[n]);for(n=o.length;n--;)o[n].elem!==this||null!=e&&o[n].queue!==e||(o[n].anim.stop(r),t=!1,o.splice(n,1));(t||!r)&&x.dequeue(this,e)})},finish:function(e){return e!==!1&&(e=e||"fx"),this.each(function(){var t,n=x._data(this),r=n[e+"queue"],i=n[e+"queueHooks"],o=x.timers,a=r?r.length:0;for(n.finish=!0,x.queue(this,e,[]),i&&i.stop&&i.stop.call(this,!0),t=o.length;t--;)o[t].elem===this&&o[t].queue===e&&(o[t].anim.stop(!0),o.splice(t,1));for(t=0;a>t;t++)r[t]&&r[t].finish&&r[t].finish.call(this);delete n.finish})}});function ir(e,t){var n,r={height:e},i=0;for(t=t?1:0;4>i;i+=2-t)n=Zt[i],r["margin"+n]=r["padding"+n]=e;return t&&(r.opacity=r.width=e),r}x.each({slideDown:ir("show"),slideUp:ir("hide"),slideToggle:ir("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,t){x.fn[e]=function(e,n,r){return this.animate(t,e,n,r)}}),x.speed=function(e,t,n){var r=e&&"object"==typeof e?x.extend({},e):{complete:n||!n&&t||x.isFunction(e)&&e,duration:e,easing:n&&t||t&&!x.isFunction(t)&&t};return r.duration=x.fx.off?0:"number"==typeof r.duration?r.duration:r.duration in x.fx.speeds?x.fx.speeds[r.duration]:x.fx.speeds._default,(null==r.queue||r.queue===!0)&&(r.queue="fx"),r.old=r.complete,r.complete=function(){x.isFunction(r.old)&&r.old.call(this),r.queue&&x.dequeue(this,r.queue)},r},x.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2}},x.timers=[],x.fx=rr.prototype.init,x.fx.tick=function(){var e,n=x.timers,r=0;for(Xn=x.now();n.length>r;r++)e=n[r],e()||n[r]!==e||n.splice(r--,1);n.length||x.fx.stop(),Xn=t},x.fx.timer=function(e){e()&&x.timers.push(e)&&x.fx.start()},x.fx.interval=13,x.fx.start=function(){Un||(Un=setInterval(x.fx.tick,x.fx.interval))},x.fx.stop=function(){clearInterval(Un),Un=null},x.fx.speeds={slow:600,fast:200,_default:400},x.fx.step={},x.expr&&x.expr.filters&&(x.expr.filters.animated=function(e){return x.grep(x.timers,function(t){return e===t.elem}).length}),x.fn.offset=function(e){if(arguments.length)return e===t?this:this.each(function(t){x.offset.setOffset(this,e,t)});var n,r,o={top:0,left:0},a=this[0],s=a&&a.ownerDocument;if(s)return n=s.documentElement,x.contains(n,a)?(typeof a.getBoundingClientRect!==i&&(o=a.getBoundingClientRect()),r=or(s),{top:o.top+(r.pageYOffset||n.scrollTop)-(n.clientTop||0),left:o.left+(r.pageXOffset||n.scrollLeft)-(n.clientLeft||0)}):o},x.offset={setOffset:function(e,t,n){var r=x.css(e,"position");"static"===r&&(e.style.position="relative");var i=x(e),o=i.offset(),a=x.css(e,"top"),s=x.css(e,"left"),l=("absolute"===r||"fixed"===r)&&x.inArray("auto",[a,s])>-1,u={},c={},p,f;l?(c=i.position(),p=c.top,f=c.left):(p=parseFloat(a)||0,f=parseFloat(s)||0),x.isFunction(t)&&(t=t.call(e,n,o)),null!=t.top&&(u.top=t.top-o.top+p),null!=t.left&&(u.left=t.left-o.left+f),"using"in t?t.using.call(e,u):i.css(u)}},x.fn.extend({position:function(){if(this[0]){var e,t,n={top:0,left:0},r=this[0];return"fixed"===x.css(r,"position")?t=r.getBoundingClientRect():(e=this.offsetParent(),t=this.offset(),x.nodeName(e[0],"html")||(n=e.offset()),n.top+=x.css(e[0],"borderTopWidth",!0),n.left+=x.css(e[0],"borderLeftWidth",!0)),{top:t.top-n.top-x.css(r,"marginTop",!0),left:t.left-n.left-x.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent||s;while(e&&!x.nodeName(e,"html")&&"static"===x.css(e,"position"))e=e.offsetParent;return e||s})}}),x.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,n){var r=/Y/.test(n);x.fn[e]=function(i){return x.access(this,function(e,i,o){var a=or(e);return o===t?a?n in a?a[n]:a.document.documentElement[i]:e[i]:(a?a.scrollTo(r?x(a).scrollLeft():o,r?o:x(a).scrollTop()):e[i]=o,t)},e,i,arguments.length,null)}});function or(e){return x.isWindow(e)?e:9===e.nodeType?e.defaultView||e.parentWindow:!1}x.each({Height:"height",Width:"width"},function(e,n){x.each({padding:"inner"+e,content:n,"":"outer"+e},function(r,i){x.fn[i]=function(i,o){var a=arguments.length&&(r||"boolean"!=typeof i),s=r||(i===!0||o===!0?"margin":"border");return x.access(this,function(n,r,i){var o;return x.isWindow(n)?n.document.documentElement["client"+e]:9===n.nodeType?(o=n.documentElement,Math.max(n.body["scroll"+e],o["scroll"+e],n.body["offset"+e],o["offset"+e],o["client"+e])):i===t?x.css(n,r,s):x.style(n,r,i,s)},n,a?i:t,a,null)}})}),x.fn.size=function(){return this.length},x.fn.andSelf=x.fn.addBack,"object"==typeof module&&module&&"object"==typeof module.exports?module.exports=x:(e.jQuery=e.$=x,"function"==typeof define&&define.amd&&define("jquery",[],function(){return x}))})(window);
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/jquery/jquery-1.11.0.min.js b/pluss-wap-page/src/main/resources/static/resources/js/third-party/jquery/jquery-1.11.0.min.js
new file mode 100644
index 0000000..fc516fb
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/third-party/jquery/jquery-1.11.0.min.js
@@ -0,0 +1,5 @@
+// JavaScript Document
+/*! jQuery v1.11.0 | (c) 2005, 2014 jQuery Foundation, Inc. | jquery.org/license */
+!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k="".trim,l={},m="1.11.0",n=function(a,b){return new n.fn.init(a,b)},o=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,p=/^-ms-/,q=/-([\da-z])/gi,r=function(a,b){return b.toUpperCase()};n.fn=n.prototype={jquery:m,constructor:n,selector:"",length:0,toArray:function(){return d.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var b=n.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return n.each(this,a,b)},map:function(a){return this.pushStack(n.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:c.sort,splice:c.splice},n.extend=n.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||n.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(e=arguments[h]))for(d in e)a=g[d],c=e[d],g!==c&&(j&&c&&(n.isPlainObject(c)||(b=n.isArray(c)))?(b?(b=!1,f=a&&n.isArray(a)?a:[]):f=a&&n.isPlainObject(a)?a:{},g[d]=n.extend(j,f,c)):void 0!==c&&(g[d]=c));return g},n.extend({expando:"jQuery"+(m+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===n.type(a)},isArray:Array.isArray||function(a){return"array"===n.type(a)},isWindow:function(a){return null!=a&&a==a.window},isNumeric:function(a){return a-parseFloat(a)>=0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},isPlainObject:function(a){var b;if(!a||"object"!==n.type(a)||a.nodeType||n.isWindow(a))return!1;try{if(a.constructor&&!j.call(a,"constructor")&&!j.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}if(l.ownLast)for(b in a)return j.call(a,b);for(b in a);return void 0===b||j.call(a,b)},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?h[i.call(a)]||"object":typeof a},globalEval:function(b){b&&n.trim(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(p,"ms-").replace(q,r)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var d,e=0,f=a.length,g=s(a);if(c){if(g){for(;f>e;e++)if(d=b.apply(a[e],c),d===!1)break}else for(e in a)if(d=b.apply(a[e],c),d===!1)break}else if(g){for(;f>e;e++)if(d=b.call(a[e],e,a[e]),d===!1)break}else for(e in a)if(d=b.call(a[e],e,a[e]),d===!1)break;return a},trim:k&&!k.call("\ufeff\xa0")?function(a){return null==a?"":k.call(a)}:function(a){return null==a?"":(a+"").replace(o,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(s(Object(a))?n.merge(c,"string"==typeof a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){var d;if(b){if(g)return g.call(b,a,c);for(d=b.length,c=c?0>c?Math.max(0,d+c):c:0;d>c;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,b){var c=+b.length,d=0,e=a.length;while(c>d)a[e++]=b[d++];if(c!==c)while(void 0!==b[d])a[e++]=b[d++];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,f=0,g=a.length,h=s(a),i=[];if(h)for(;g>f;f++)d=b(a[f],f,c),null!=d&&i.push(d);else for(f in a)d=b(a[f],f,c),null!=d&&i.push(d);return e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;return"string"==typeof b&&(f=a[b],b=a,a=f),n.isFunction(a)?(c=d.call(arguments,2),e=function(){return a.apply(b||this,c.concat(d.call(arguments)))},e.guid=a.guid=a.guid||n.guid++,e):void 0},now:function(){return+new Date},support:l}),n.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){h["[object "+b+"]"]=b.toLowerCase()});function s(a){var b=a.length,c=n.type(a);return"function"===c||n.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var t=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s="sizzle"+-new Date,t=a.document,u=0,v=0,w=eb(),x=eb(),y=eb(),z=function(a,b){return a===b&&(j=!0),0},A="undefined",B=1<<31,C={}.hasOwnProperty,D=[],E=D.pop,F=D.push,G=D.push,H=D.slice,I=D.indexOf||function(a){for(var b=0,c=this.length;c>b;b++)if(this[b]===a)return b;return-1},J="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",K="[\\x20\\t\\r\\n\\f]",L="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",M=L.replace("w","w#"),N="\\["+K+"*("+L+")"+K+"*(?:([*^$|!~]?=)"+K+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+M+")|)|)"+K+"*\\]",O=":("+L+")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+N.replace(3,8)+")*)|.*)\\)|)",P=new RegExp("^"+K+"+|((?:^|[^\\\\])(?:\\\\.)*)"+K+"+$","g"),Q=new RegExp("^"+K+"*,"+K+"*"),R=new RegExp("^"+K+"*([>+~]|"+K+")"+K+"*"),S=new RegExp("="+K+"*([^\\]'\"]*?)"+K+"*\\]","g"),T=new RegExp(O),U=new RegExp("^"+M+"$"),V={ID:new RegExp("^#("+L+")"),CLASS:new RegExp("^\\.("+L+")"),TAG:new RegExp("^("+L.replace("w","w*")+")"),ATTR:new RegExp("^"+N),PSEUDO:new RegExp("^"+O),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+K+"*(even|odd|(([+-]|)(\\d*)n|)"+K+"*(?:([+-]|)"+K+"*(\\d+)|))"+K+"*\\)|)","i"),bool:new RegExp("^(?:"+J+")$","i"),needsContext:new RegExp("^"+K+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+K+"*((?:-\\d)?\\d*)"+K+"*\\)|)(?=[^-]|$)","i")},W=/^(?:input|select|textarea|button)$/i,X=/^h\d$/i,Y=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,$=/[+~]/,_=/'|\\/g,ab=new RegExp("\\\\([\\da-f]{1,6}"+K+"?|("+K+")|.)","ig"),bb=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)};try{G.apply(D=H.call(t.childNodes),t.childNodes),D[t.childNodes.length].nodeType}catch(cb){G={apply:D.length?function(a,b){F.apply(a,H.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function db(a,b,d,e){var f,g,h,i,j,m,p,q,u,v;if((b?b.ownerDocument||b:t)!==l&&k(b),b=b||l,d=d||[],!a||"string"!=typeof a)return d;if(1!==(i=b.nodeType)&&9!==i)return[];if(n&&!e){if(f=Z.exec(a))if(h=f[1]){if(9===i){if(g=b.getElementById(h),!g||!g.parentNode)return d;if(g.id===h)return d.push(g),d}else if(b.ownerDocument&&(g=b.ownerDocument.getElementById(h))&&r(b,g)&&g.id===h)return d.push(g),d}else{if(f[2])return G.apply(d,b.getElementsByTagName(a)),d;if((h=f[3])&&c.getElementsByClassName&&b.getElementsByClassName)return G.apply(d,b.getElementsByClassName(h)),d}if(c.qsa&&(!o||!o.test(a))){if(q=p=s,u=b,v=9===i&&a,1===i&&"object"!==b.nodeName.toLowerCase()){m=ob(a),(p=b.getAttribute("id"))?q=p.replace(_,"\\$&"):b.setAttribute("id",q),q="[id='"+q+"'] ",j=m.length;while(j--)m[j]=q+pb(m[j]);u=$.test(a)&&mb(b.parentNode)||b,v=m.join(",")}if(v)try{return G.apply(d,u.querySelectorAll(v)),d}catch(w){}finally{p||b.removeAttribute("id")}}}return xb(a.replace(P,"$1"),b,d,e)}function eb(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function fb(a){return a[s]=!0,a}function gb(a){var b=l.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function hb(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function ib(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||B)-(~a.sourceIndex||B);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function jb(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function kb(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function lb(a){return fb(function(b){return b=+b,fb(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function mb(a){return a&&typeof a.getElementsByTagName!==A&&a}c=db.support={},f=db.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},k=db.setDocument=function(a){var b,e=a?a.ownerDocument||a:t,g=e.defaultView;return e!==l&&9===e.nodeType&&e.documentElement?(l=e,m=e.documentElement,n=!f(e),g&&g!==g.top&&(g.addEventListener?g.addEventListener("unload",function(){k()},!1):g.attachEvent&&g.attachEvent("onunload",function(){k()})),c.attributes=gb(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=gb(function(a){return a.appendChild(e.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=Y.test(e.getElementsByClassName)&&gb(function(a){return a.innerHTML="<div class='a'></div><div class='a i'></div>",a.firstChild.className="i",2===a.getElementsByClassName("i").length}),c.getById=gb(function(a){return m.appendChild(a).id=s,!e.getElementsByName||!e.getElementsByName(s).length}),c.getById?(d.find.ID=function(a,b){if(typeof b.getElementById!==A&&n){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(ab,bb);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(ab,bb);return function(a){var c=typeof a.getAttributeNode!==A&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return typeof b.getElementsByTagName!==A?b.getElementsByTagName(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return typeof b.getElementsByClassName!==A&&n?b.getElementsByClassName(a):void 0},p=[],o=[],(c.qsa=Y.test(e.querySelectorAll))&&(gb(function(a){a.innerHTML="<select t=''><option selected=''></option></select>",a.querySelectorAll("[t^='']").length&&o.push("[*^$]="+K+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||o.push("\\["+K+"*(?:value|"+J+")"),a.querySelectorAll(":checked").length||o.push(":checked")}),gb(function(a){var b=e.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&o.push("name"+K+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||o.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),o.push(",.*:")})),(c.matchesSelector=Y.test(q=m.webkitMatchesSelector||m.mozMatchesSelector||m.oMatchesSelector||m.msMatchesSelector))&&gb(function(a){c.disconnectedMatch=q.call(a,"div"),q.call(a,"[s!='']:x"),p.push("!=",O)}),o=o.length&&new RegExp(o.join("|")),p=p.length&&new RegExp(p.join("|")),b=Y.test(m.compareDocumentPosition),r=b||Y.test(m.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},z=b?function(a,b){if(a===b)return j=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===e||a.ownerDocument===t&&r(t,a)?-1:b===e||b.ownerDocument===t&&r(t,b)?1:i?I.call(i,a)-I.call(i,b):0:4&d?-1:1)}:function(a,b){if(a===b)return j=!0,0;var c,d=0,f=a.parentNode,g=b.parentNode,h=[a],k=[b];if(!f||!g)return a===e?-1:b===e?1:f?-1:g?1:i?I.call(i,a)-I.call(i,b):0;if(f===g)return ib(a,b);c=a;while(c=c.parentNode)h.unshift(c);c=b;while(c=c.parentNode)k.unshift(c);while(h[d]===k[d])d++;return d?ib(h[d],k[d]):h[d]===t?-1:k[d]===t?1:0},e):l},db.matches=function(a,b){return db(a,null,null,b)},db.matchesSelector=function(a,b){if((a.ownerDocument||a)!==l&&k(a),b=b.replace(S,"='$1']"),!(!c.matchesSelector||!n||p&&p.test(b)||o&&o.test(b)))try{var d=q.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return db(b,l,null,[a]).length>0},db.contains=function(a,b){return(a.ownerDocument||a)!==l&&k(a),r(a,b)},db.attr=function(a,b){(a.ownerDocument||a)!==l&&k(a);var e=d.attrHandle[b.toLowerCase()],f=e&&C.call(d.attrHandle,b.toLowerCase())?e(a,b,!n):void 0;return void 0!==f?f:c.attributes||!n?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},db.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},db.uniqueSort=function(a){var b,d=[],e=0,f=0;if(j=!c.detectDuplicates,i=!c.sortStable&&a.slice(0),a.sort(z),j){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return i=null,a},e=db.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=db.selectors={cacheLength:50,createPseudo:fb,match:V,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(ab,bb),a[3]=(a[4]||a[5]||"").replace(ab,bb),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||db.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&db.error(a[0]),a},PSEUDO:function(a){var b,c=!a[5]&&a[2];return V.CHILD.test(a[0])?null:(a[3]&&void 0!==a[4]?a[2]=a[4]:c&&T.test(c)&&(b=ob(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(ab,bb).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=w[a+" "];return b||(b=new RegExp("(^|"+K+")"+a+"("+K+"|$)"))&&w(a,function(a){return b.test("string"==typeof a.className&&a.className||typeof a.getAttribute!==A&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=db.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),t=!i&&!h;if(q){if(f){while(p){l=b;while(l=l[p])if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&t){k=q[s]||(q[s]={}),j=k[a]||[],n=j[0]===u&&j[1],m=j[0]===u&&j[2],l=n&&q.childNodes[n];while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if(1===l.nodeType&&++m&&l===b){k[a]=[u,n,m];break}}else if(t&&(j=(b[s]||(b[s]={}))[a])&&j[0]===u)m=j[1];else while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if((h?l.nodeName.toLowerCase()===r:1===l.nodeType)&&++m&&(t&&((l[s]||(l[s]={}))[a]=[u,m]),l===b))break;return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||db.error("unsupported pseudo: "+a);return e[s]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?fb(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=I.call(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:fb(function(a){var b=[],c=[],d=g(a.replace(P,"$1"));return d[s]?fb(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),!c.pop()}}),has:fb(function(a){return function(b){return db(a,b).length>0}}),contains:fb(function(a){return function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:fb(function(a){return U.test(a||"")||db.error("unsupported lang: "+a),a=a.replace(ab,bb).toLowerCase(),function(b){var c;do if(c=n?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===m},focus:function(a){return a===l.activeElement&&(!l.hasFocus||l.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return X.test(a.nodeName)},input:function(a){return W.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:lb(function(){return[0]}),last:lb(function(a,b){return[b-1]}),eq:lb(function(a,b,c){return[0>c?c+b:c]}),even:lb(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:lb(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:lb(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:lb(function(a,b,c){for(var d=0>c?c+b:c;++d<b;)a.push(d);return a})}},d.pseudos.nth=d.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})d.pseudos[b]=jb(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=kb(b);function nb(){}nb.prototype=d.filters=d.pseudos,d.setFilters=new nb;function ob(a,b){var c,e,f,g,h,i,j,k=x[a+" "];if(k)return b?0:k.slice(0);h=a,i=[],j=d.preFilter;while(h){(!c||(e=Q.exec(h)))&&(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=R.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(P," ")}),h=h.slice(c.length));for(g in d.filter)!(e=V[g].exec(h))||j[g]&&!(e=j[g](e))||(c=e.shift(),f.push({value:c,type:g,matches:e}),h=h.slice(c.length));if(!c)break}return b?h.length:h?db.error(a):x(a,i).slice(0)}function pb(a){for(var b=0,c=a.length,d="";c>b;b++)d+=a[b].value;return d}function qb(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=v++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j=[u,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(i=b[s]||(b[s]={}),(h=i[d])&&h[0]===u&&h[1]===f)return j[2]=h[2];if(i[d]=j,j[2]=a(b,c,g))return!0}}}function rb(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function sb(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function tb(a,b,c,d,e,f){return d&&!d[s]&&(d=tb(d)),e&&!e[s]&&(e=tb(e,f)),fb(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||wb(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:sb(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=sb(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?I.call(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=sb(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):G.apply(g,r)})}function ub(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],i=g||d.relative[" "],j=g?1:0,k=qb(function(a){return a===b},i,!0),l=qb(function(a){return I.call(b,a)>-1},i,!0),m=[function(a,c,d){return!g&&(d||c!==h)||((b=c).nodeType?k(a,c,d):l(a,c,d))}];f>j;j++)if(c=d.relative[a[j].type])m=[qb(rb(m),c)];else{if(c=d.filter[a[j].type].apply(null,a[j].matches),c[s]){for(e=++j;f>e;e++)if(d.relative[a[e].type])break;return tb(j>1&&rb(m),j>1&&pb(a.slice(0,j-1).concat({value:" "===a[j-2].type?"*":""})).replace(P,"$1"),c,e>j&&ub(a.slice(j,e)),f>e&&ub(a=a.slice(e)),f>e&&pb(a))}m.push(c)}return rb(m)}function vb(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,i,j,k){var m,n,o,p=0,q="0",r=f&&[],s=[],t=h,v=f||e&&d.find.TAG("*",k),w=u+=null==t?1:Math.random()||.1,x=v.length;for(k&&(h=g!==l&&g);q!==x&&null!=(m=v[q]);q++){if(e&&m){n=0;while(o=a[n++])if(o(m,g,i)){j.push(m);break}k&&(u=w)}c&&((m=!o&&m)&&p--,f&&r.push(m))}if(p+=q,c&&q!==p){n=0;while(o=b[n++])o(r,s,g,i);if(f){if(p>0)while(q--)r[q]||s[q]||(s[q]=E.call(j));s=sb(s)}G.apply(j,s),k&&!f&&s.length>0&&p+b.length>1&&db.uniqueSort(j)}return k&&(u=w,h=t),r};return c?fb(f):f}g=db.compile=function(a,b){var c,d=[],e=[],f=y[a+" "];if(!f){b||(b=ob(a)),c=b.length;while(c--)f=ub(b[c]),f[s]?d.push(f):e.push(f);f=y(a,vb(e,d))}return f};function wb(a,b,c){for(var d=0,e=b.length;e>d;d++)db(a,b[d],c);return c}function xb(a,b,e,f){var h,i,j,k,l,m=ob(a);if(!f&&1===m.length){if(i=m[0]=m[0].slice(0),i.length>2&&"ID"===(j=i[0]).type&&c.getById&&9===b.nodeType&&n&&d.relative[i[1].type]){if(b=(d.find.ID(j.matches[0].replace(ab,bb),b)||[])[0],!b)return e;a=a.slice(i.shift().value.length)}h=V.needsContext.test(a)?0:i.length;while(h--){if(j=i[h],d.relative[k=j.type])break;if((l=d.find[k])&&(f=l(j.matches[0].replace(ab,bb),$.test(i[0].type)&&mb(b.parentNode)||b))){if(i.splice(h,1),a=f.length&&pb(i),!a)return G.apply(e,f),e;break}}}return g(a,m)(f,b,!n,e,$.test(a)&&mb(b.parentNode)||b),e}return c.sortStable=s.split("").sort(z).join("")===s,c.detectDuplicates=!!j,k(),c.sortDetached=gb(function(a){return 1&a.compareDocumentPosition(l.createElement("div"))}),gb(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||hb("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&gb(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||hb("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),gb(function(a){return null==a.getAttribute("disabled")})||hb(J,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),db}(a);n.find=t,n.expr=t.selectors,n.expr[":"]=n.expr.pseudos,n.unique=t.uniqueSort,n.text=t.getText,n.isXMLDoc=t.isXML,n.contains=t.contains;var u=n.expr.match.needsContext,v=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,w=/^.[^:#\[\.,]*$/;function x(a,b,c){if(n.isFunction(b))return n.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return n.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(w.test(b))return n.filter(b,a,c);b=n.filter(b,a)}return n.grep(a,function(a){return n.inArray(a,b)>=0!==c})}n.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?n.find.matchesSelector(d,a)?[d]:[]:n.find.matches(a,n.grep(b,function(a){return 1===a.nodeType}))},n.fn.extend({find:function(a){var b,c=[],d=this,e=d.length;if("string"!=typeof a)return this.pushStack(n(a).filter(function(){for(b=0;e>b;b++)if(n.contains(d[b],this))return!0}));for(b=0;e>b;b++)n.find(a,d[b],c);return c=this.pushStack(e>1?n.unique(c):c),c.selector=this.selector?this.selector+" "+a:a,c},filter:function(a){return this.pushStack(x(this,a||[],!1))},not:function(a){return this.pushStack(x(this,a||[],!0))},is:function(a){return!!x(this,"string"==typeof a&&u.test(a)?n(a):a||[],!1).length}});var y,z=a.document,A=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,B=n.fn.init=function(a,b){var c,d;if(!a)return this;if("string"==typeof a){if(c="<"===a.charAt(0)&&">"===a.charAt(a.length-1)&&a.length>=3?[null,a,null]:A.exec(a),!c||!c[1]&&b)return!b||b.jquery?(b||y).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof n?b[0]:b,n.merge(this,n.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:z,!0)),v.test(c[1])&&n.isPlainObject(b))for(c in b)n.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}if(d=z.getElementById(c[2]),d&&d.parentNode){if(d.id!==c[2])return y.find(a);this.length=1,this[0]=d}return this.context=z,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):n.isFunction(a)?"undefined"!=typeof y.ready?y.ready(a):a(n):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),n.makeArray(a,this))};B.prototype=n.fn,y=n(z);var C=/^(?:parents|prev(?:Until|All))/,D={children:!0,contents:!0,next:!0,prev:!0};n.extend({dir:function(a,b,c){var d=[],e=a[b];while(e&&9!==e.nodeType&&(void 0===c||1!==e.nodeType||!n(e).is(c)))1===e.nodeType&&d.push(e),e=e[b];return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),n.fn.extend({has:function(a){var b,c=n(a,this),d=c.length;return this.filter(function(){for(b=0;d>b;b++)if(n.contains(this,c[b]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=u.test(a)||"string"!=typeof a?n(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&n.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?n.unique(f):f)},index:function(a){return a?"string"==typeof a?n.inArray(this[0],n(a)):n.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(n.unique(n.merge(this.get(),n(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function E(a,b){do a=a[b];while(a&&1!==a.nodeType);return a}n.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return n.dir(a,"parentNode")},parentsUntil:function(a,b,c){return n.dir(a,"parentNode",c)},next:function(a){return E(a,"nextSibling")},prev:function(a){return E(a,"previousSibling")},nextAll:function(a){return n.dir(a,"nextSibling")},prevAll:function(a){return n.dir(a,"previousSibling")},nextUntil:function(a,b,c){return n.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return n.dir(a,"previousSibling",c)},siblings:function(a){return n.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return n.sibling(a.firstChild)},contents:function(a){return n.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:n.merge([],a.childNodes)}},function(a,b){n.fn[a]=function(c,d){var e=n.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=n.filter(d,e)),this.length>1&&(D[a]||(e=n.unique(e)),C.test(a)&&(e=e.reverse())),this.pushStack(e)}});var F=/\S+/g,G={};function H(a){var b=G[a]={};return n.each(a.match(F)||[],function(a,c){b[c]=!0}),b}n.Callbacks=function(a){a="string"==typeof a?G[a]||H(a):n.extend({},a);var b,c,d,e,f,g,h=[],i=!a.once&&[],j=function(l){for(c=a.memory&&l,d=!0,f=g||0,g=0,e=h.length,b=!0;h&&e>f;f++)if(h[f].apply(l[0],l[1])===!1&&a.stopOnFalse){c=!1;break}b=!1,h&&(i?i.length&&j(i.shift()):c?h=[]:k.disable())},k={add:function(){if(h){var d=h.length;!function f(b){n.each(b,function(b,c){var d=n.type(c);"function"===d?a.unique&&k.has(c)||h.push(c):c&&c.length&&"string"!==d&&f(c)})}(arguments),b?e=h.length:c&&(g=d,j(c))}return this},remove:function(){return h&&n.each(arguments,function(a,c){var d;while((d=n.inArray(c,h,d))>-1)h.splice(d,1),b&&(e>=d&&e--,f>=d&&f--)}),this},has:function(a){return a?n.inArray(a,h)>-1:!(!h||!h.length)},empty:function(){return h=[],e=0,this},disable:function(){return h=i=c=void 0,this},disabled:function(){return!h},lock:function(){return i=void 0,c||k.disable(),this},locked:function(){return!i},fireWith:function(a,c){return!h||d&&!i||(c=c||[],c=[a,c.slice?c.slice():c],b?i.push(c):j(c)),this},fire:function(){return k.fireWith(this,arguments),this},fired:function(){return!!d}};return k},n.extend({Deferred:function(a){var b=[["resolve","done",n.Callbacks("once memory"),"resolved"],["reject","fail",n.Callbacks("once memory"),"rejected"],["notify","progress",n.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return n.Deferred(function(c){n.each(b,function(b,f){var g=n.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&n.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?n.extend(a,d):d}},e={};return d.pipe=d.then,n.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=d.call(arguments),e=c.length,f=1!==e||a&&n.isFunction(a.promise)?e:0,g=1===f?a:n.Deferred(),h=function(a,b,c){return function(e){b[a]=this,c[a]=arguments.length>1?d.call(arguments):e,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(e>1)for(i=new Array(e),j=new Array(e),k=new Array(e);e>b;b++)c[b]&&n.isFunction(c[b].promise)?c[b].promise().done(h(b,k,c)).fail(g.reject).progress(h(b,j,i)):--f;return f||g.resolveWith(k,c),g.promise()}});var I;n.fn.ready=function(a){return n.ready.promise().done(a),this},n.extend({isReady:!1,readyWait:1,holdReady:function(a){a?n.readyWait++:n.ready(!0)},ready:function(a){if(a===!0?!--n.readyWait:!n.isReady){if(!z.body)return setTimeout(n.ready);n.isReady=!0,a!==!0&&--n.readyWait>0||(I.resolveWith(z,[n]),n.fn.trigger&&n(z).trigger("ready").off("ready"))}}});function J(){z.addEventListener?(z.removeEventListener("DOMContentLoaded",K,!1),a.removeEventListener("load",K,!1)):(z.detachEvent("onreadystatechange",K),a.detachEvent("onload",K))}function K(){(z.addEventListener||"load"===event.type||"complete"===z.readyState)&&(J(),n.ready())}n.ready.promise=function(b){if(!I)if(I=n.Deferred(),"complete"===z.readyState)setTimeout(n.ready);else if(z.addEventListener)z.addEventListener("DOMContentLoaded",K,!1),a.addEventListener("load",K,!1);else{z.attachEvent("onreadystatechange",K),a.attachEvent("onload",K);var c=!1;try{c=null==a.frameElement&&z.documentElement}catch(d){}c&&c.doScroll&&!function e(){if(!n.isReady){try{c.doScroll("left")}catch(a){return setTimeout(e,50)}J(),n.ready()}}()}return I.promise(b)};var L="undefined",M;for(M in n(l))break;l.ownLast="0"!==M,l.inlineBlockNeedsLayout=!1,n(function(){var a,b,c=z.getElementsByTagName("body")[0];c&&(a=z.createElement("div"),a.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px",b=z.createElement("div"),c.appendChild(a).appendChild(b),typeof b.style.zoom!==L&&(b.style.cssText="border:0;margin:0;width:1px;padding:1px;display:inline;zoom:1",(l.inlineBlockNeedsLayout=3===b.offsetWidth)&&(c.style.zoom=1)),c.removeChild(a),a=b=null)}),function(){var a=z.createElement("div");if(null==l.deleteExpando){l.deleteExpando=!0;try{delete a.test}catch(b){l.deleteExpando=!1}}a=null}(),n.acceptData=function(a){var b=n.noData[(a.nodeName+" ").toLowerCase()],c=+a.nodeType||1;return 1!==c&&9!==c?!1:!b||b!==!0&&a.getAttribute("classid")===b};var N=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,O=/([A-Z])/g;function P(a,b,c){if(void 0===c&&1===a.nodeType){var d="data-"+b.replace(O,"-$1").toLowerCase();if(c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:N.test(c)?n.parseJSON(c):c}catch(e){}n.data(a,b,c)}else c=void 0}return c}function Q(a){var b;for(b in a)if(("data"!==b||!n.isEmptyObject(a[b]))&&"toJSON"!==b)return!1;return!0}function R(a,b,d,e){if(n.acceptData(a)){var f,g,h=n.expando,i=a.nodeType,j=i?n.cache:a,k=i?a[h]:a[h]&&h;if(k&&j[k]&&(e||j[k].data)||void 0!==d||"string"!=typeof b)return k||(k=i?a[h]=c.pop()||n.guid++:h),j[k]||(j[k]=i?{}:{toJSON:n.noop}),("object"==typeof b||"function"==typeof b)&&(e?j[k]=n.extend(j[k],b):j[k].data=n.extend(j[k].data,b)),g=j[k],e||(g.data||(g.data={}),g=g.data),void 0!==d&&(g[n.camelCase(b)]=d),"string"==typeof b?(f=g[b],null==f&&(f=g[n.camelCase(b)])):f=g,f
+}}function S(a,b,c){if(n.acceptData(a)){var d,e,f=a.nodeType,g=f?n.cache:a,h=f?a[n.expando]:n.expando;if(g[h]){if(b&&(d=c?g[h]:g[h].data)){n.isArray(b)?b=b.concat(n.map(b,n.camelCase)):b in d?b=[b]:(b=n.camelCase(b),b=b in d?[b]:b.split(" ")),e=b.length;while(e--)delete d[b[e]];if(c?!Q(d):!n.isEmptyObject(d))return}(c||(delete g[h].data,Q(g[h])))&&(f?n.cleanData([a],!0):l.deleteExpando||g!=g.window?delete g[h]:g[h]=null)}}}n.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(a){return a=a.nodeType?n.cache[a[n.expando]]:a[n.expando],!!a&&!Q(a)},data:function(a,b,c){return R(a,b,c)},removeData:function(a,b){return S(a,b)},_data:function(a,b,c){return R(a,b,c,!0)},_removeData:function(a,b){return S(a,b,!0)}}),n.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=n.data(f),1===f.nodeType&&!n._data(f,"parsedAttrs"))){c=g.length;while(c--)d=g[c].name,0===d.indexOf("data-")&&(d=n.camelCase(d.slice(5)),P(f,d,e[d]));n._data(f,"parsedAttrs",!0)}return e}return"object"==typeof a?this.each(function(){n.data(this,a)}):arguments.length>1?this.each(function(){n.data(this,a,b)}):f?P(f,a,n.data(f,a)):void 0},removeData:function(a){return this.each(function(){n.removeData(this,a)})}}),n.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=n._data(a,b),c&&(!d||n.isArray(c)?d=n._data(a,b,n.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=n.queue(a,b),d=c.length,e=c.shift(),f=n._queueHooks(a,b),g=function(){n.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return n._data(a,c)||n._data(a,c,{empty:n.Callbacks("once memory").add(function(){n._removeData(a,b+"queue"),n._removeData(a,c)})})}}),n.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length<c?n.queue(this[0],a):void 0===b?this:this.each(function(){var c=n.queue(this,a,b);n._queueHooks(this,a),"fx"===a&&"inprogress"!==c[0]&&n.dequeue(this,a)})},dequeue:function(a){return this.each(function(){n.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,b){var c,d=1,e=n.Deferred(),f=this,g=this.length,h=function(){--d||e.resolveWith(f,[f])};"string"!=typeof a&&(b=a,a=void 0),a=a||"fx";while(g--)c=n._data(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}});var T=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,U=["Top","Right","Bottom","Left"],V=function(a,b){return a=b||a,"none"===n.css(a,"display")||!n.contains(a.ownerDocument,a)},W=n.access=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===n.type(c)){e=!0;for(h in c)n.access(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,n.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(n(a),c)})),b))for(;i>h;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},X=/^(?:checkbox|radio)$/i;!function(){var a=z.createDocumentFragment(),b=z.createElement("div"),c=z.createElement("input");if(b.setAttribute("className","t"),b.innerHTML="  <link/><table></table><a href='/a'>a</a>",l.leadingWhitespace=3===b.firstChild.nodeType,l.tbody=!b.getElementsByTagName("tbody").length,l.htmlSerialize=!!b.getElementsByTagName("link").length,l.html5Clone="<:nav></:nav>"!==z.createElement("nav").cloneNode(!0).outerHTML,c.type="checkbox",c.checked=!0,a.appendChild(c),l.appendChecked=c.checked,b.innerHTML="<textarea>x</textarea>",l.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue,a.appendChild(b),b.innerHTML="<input type='radio' checked='checked' name='t'/>",l.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,l.noCloneEvent=!0,b.attachEvent&&(b.attachEvent("onclick",function(){l.noCloneEvent=!1}),b.cloneNode(!0).click()),null==l.deleteExpando){l.deleteExpando=!0;try{delete b.test}catch(d){l.deleteExpando=!1}}a=b=c=null}(),function(){var b,c,d=z.createElement("div");for(b in{submit:!0,change:!0,focusin:!0})c="on"+b,(l[b+"Bubbles"]=c in a)||(d.setAttribute(c,"t"),l[b+"Bubbles"]=d.attributes[c].expando===!1);d=null}();var Y=/^(?:input|select|textarea)$/i,Z=/^key/,$=/^(?:mouse|contextmenu)|click/,_=/^(?:focusinfocus|focusoutblur)$/,ab=/^([^.]*)(?:\.(.+)|)$/;function bb(){return!0}function cb(){return!1}function db(){try{return z.activeElement}catch(a){}}n.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=n._data(a);if(r){c.handler&&(i=c,c=i.handler,e=i.selector),c.guid||(c.guid=n.guid++),(g=r.events)||(g=r.events={}),(k=r.handle)||(k=r.handle=function(a){return typeof n===L||a&&n.event.triggered===a.type?void 0:n.event.dispatch.apply(k.elem,arguments)},k.elem=a),b=(b||"").match(F)||[""],h=b.length;while(h--)f=ab.exec(b[h])||[],o=q=f[1],p=(f[2]||"").split(".").sort(),o&&(j=n.event.special[o]||{},o=(e?j.delegateType:j.bindType)||o,j=n.event.special[o]||{},l=n.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&n.expr.match.needsContext.test(e),namespace:p.join(".")},i),(m=g[o])||(m=g[o]=[],m.delegateCount=0,j.setup&&j.setup.call(a,d,p,k)!==!1||(a.addEventListener?a.addEventListener(o,k,!1):a.attachEvent&&a.attachEvent("on"+o,k))),j.add&&(j.add.call(a,l),l.handler.guid||(l.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,l):m.push(l),n.event.global[o]=!0);a=null}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=n.hasData(a)&&n._data(a);if(r&&(k=r.events)){b=(b||"").match(F)||[""],j=b.length;while(j--)if(h=ab.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=n.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,m=k[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),i=f=m.length;while(f--)g=m[f],!e&&q!==g.origType||c&&c.guid!==g.guid||h&&!h.test(g.namespace)||d&&d!==g.selector&&("**"!==d||!g.selector)||(m.splice(f,1),g.selector&&m.delegateCount--,l.remove&&l.remove.call(a,g));i&&!m.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||n.removeEvent(a,o,r.handle),delete k[o])}else for(o in k)n.event.remove(a,o+b[j],c,d,!0);n.isEmptyObject(k)&&(delete r.handle,n._removeData(a,"events"))}},trigger:function(b,c,d,e){var f,g,h,i,k,l,m,o=[d||z],p=j.call(b,"type")?b.type:b,q=j.call(b,"namespace")?b.namespace.split("."):[];if(h=l=d=d||z,3!==d.nodeType&&8!==d.nodeType&&!_.test(p+n.event.triggered)&&(p.indexOf(".")>=0&&(q=p.split("."),p=q.shift(),q.sort()),g=p.indexOf(":")<0&&"on"+p,b=b[n.expando]?b:new n.Event(p,"object"==typeof b&&b),b.isTrigger=e?2:3,b.namespace=q.join("."),b.namespace_re=b.namespace?new RegExp("(^|\\.)"+q.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=d),c=null==c?[b]:n.makeArray(c,[b]),k=n.event.special[p]||{},e||!k.trigger||k.trigger.apply(d,c)!==!1)){if(!e&&!k.noBubble&&!n.isWindow(d)){for(i=k.delegateType||p,_.test(i+p)||(h=h.parentNode);h;h=h.parentNode)o.push(h),l=h;l===(d.ownerDocument||z)&&o.push(l.defaultView||l.parentWindow||a)}m=0;while((h=o[m++])&&!b.isPropagationStopped())b.type=m>1?i:k.bindType||p,f=(n._data(h,"events")||{})[b.type]&&n._data(h,"handle"),f&&f.apply(h,c),f=g&&h[g],f&&f.apply&&n.acceptData(h)&&(b.result=f.apply(h,c),b.result===!1&&b.preventDefault());if(b.type=p,!e&&!b.isDefaultPrevented()&&(!k._default||k._default.apply(o.pop(),c)===!1)&&n.acceptData(d)&&g&&d[p]&&!n.isWindow(d)){l=d[g],l&&(d[g]=null),n.event.triggered=p;try{d[p]()}catch(r){}n.event.triggered=void 0,l&&(d[g]=l)}return b.result}},dispatch:function(a){a=n.event.fix(a);var b,c,e,f,g,h=[],i=d.call(arguments),j=(n._data(this,"events")||{})[a.type]||[],k=n.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=n.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,g=0;while((e=f.handlers[g++])&&!a.isImmediatePropagationStopped())(!a.namespace_re||a.namespace_re.test(e.namespace))&&(a.handleObj=e,a.data=e.data,c=((n.event.special[e.origType]||{}).handle||e.handler).apply(f.elem,i),void 0!==c&&(a.result=c)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&(!a.button||"click"!==a.type))for(;i!=this;i=i.parentNode||this)if(1===i.nodeType&&(i.disabled!==!0||"click"!==a.type)){for(e=[],f=0;h>f;f++)d=b[f],c=d.selector+" ",void 0===e[c]&&(e[c]=d.needsContext?n(c,this).index(i)>=0:n.find(c,this,null,[i]).length),e[c]&&e.push(d);e.length&&g.push({elem:i,handlers:e})}return h<b.length&&g.push({elem:this,handlers:b.slice(h)}),g},fix:function(a){if(a[n.expando])return a;var b,c,d,e=a.type,f=a,g=this.fixHooks[e];g||(this.fixHooks[e]=g=$.test(e)?this.mouseHooks:Z.test(e)?this.keyHooks:{}),d=g.props?this.props.concat(g.props):this.props,a=new n.Event(f),b=d.length;while(b--)c=d[b],a[c]=f[c];return a.target||(a.target=f.srcElement||z),3===a.target.nodeType&&(a.target=a.target.parentNode),a.metaKey=!!a.metaKey,g.filter?g.filter(a,f):a},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){return null==a.which&&(a.which=null!=b.charCode?b.charCode:b.keyCode),a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,b){var c,d,e,f=b.button,g=b.fromElement;return null==a.pageX&&null!=b.clientX&&(d=a.target.ownerDocument||z,e=d.documentElement,c=d.body,a.pageX=b.clientX+(e&&e.scrollLeft||c&&c.scrollLeft||0)-(e&&e.clientLeft||c&&c.clientLeft||0),a.pageY=b.clientY+(e&&e.scrollTop||c&&c.scrollTop||0)-(e&&e.clientTop||c&&c.clientTop||0)),!a.relatedTarget&&g&&(a.relatedTarget=g===a.target?b.toElement:g),a.which||void 0===f||(a.which=1&f?1:2&f?3:4&f?2:0),a}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==db()&&this.focus)try{return this.focus(),!1}catch(a){}},delegateType:"focusin"},blur:{trigger:function(){return this===db()&&this.blur?(this.blur(),!1):void 0},delegateType:"focusout"},click:{trigger:function(){return n.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):void 0},_default:function(a){return n.nodeName(a.target,"a")}},beforeunload:{postDispatch:function(a){void 0!==a.result&&(a.originalEvent.returnValue=a.result)}}},simulate:function(a,b,c,d){var e=n.extend(new n.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?n.event.trigger(e,null,b):n.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},n.removeEvent=z.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){var d="on"+b;a.detachEvent&&(typeof a[d]===L&&(a[d]=null),a.detachEvent(d,c))},n.Event=function(a,b){return this instanceof n.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||void 0===a.defaultPrevented&&(a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault())?bb:cb):this.type=a,b&&n.extend(this,b),this.timeStamp=a&&a.timeStamp||n.now(),void(this[n.expando]=!0)):new n.Event(a,b)},n.Event.prototype={isDefaultPrevented:cb,isPropagationStopped:cb,isImmediatePropagationStopped:cb,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=bb,a&&(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=bb,a&&(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=bb,this.stopPropagation()}},n.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){n.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj;return(!e||e!==d&&!n.contains(d,e))&&(a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b),c}}}),l.submitBubbles||(n.event.special.submit={setup:function(){return n.nodeName(this,"form")?!1:void n.event.add(this,"click._submit keypress._submit",function(a){var b=a.target,c=n.nodeName(b,"input")||n.nodeName(b,"button")?b.form:void 0;c&&!n._data(c,"submitBubbles")&&(n.event.add(c,"submit._submit",function(a){a._submit_bubble=!0}),n._data(c,"submitBubbles",!0))})},postDispatch:function(a){a._submit_bubble&&(delete a._submit_bubble,this.parentNode&&!a.isTrigger&&n.event.simulate("submit",this.parentNode,a,!0))},teardown:function(){return n.nodeName(this,"form")?!1:void n.event.remove(this,"._submit")}}),l.changeBubbles||(n.event.special.change={setup:function(){return Y.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(n.event.add(this,"propertychange._change",function(a){"checked"===a.originalEvent.propertyName&&(this._just_changed=!0)}),n.event.add(this,"click._change",function(a){this._just_changed&&!a.isTrigger&&(this._just_changed=!1),n.event.simulate("change",this,a,!0)})),!1):void n.event.add(this,"beforeactivate._change",function(a){var b=a.target;Y.test(b.nodeName)&&!n._data(b,"changeBubbles")&&(n.event.add(b,"change._change",function(a){!this.parentNode||a.isSimulated||a.isTrigger||n.event.simulate("change",this.parentNode,a,!0)}),n._data(b,"changeBubbles",!0))})},handle:function(a){var b=a.target;return this!==b||a.isSimulated||a.isTrigger||"radio"!==b.type&&"checkbox"!==b.type?a.handleObj.handler.apply(this,arguments):void 0},teardown:function(){return n.event.remove(this,"._change"),!Y.test(this.nodeName)}}),l.focusinBubbles||n.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){n.event.simulate(b,a.target,n.event.fix(a),!0)};n.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=n._data(d,b);e||d.addEventListener(a,c,!0),n._data(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=n._data(d,b)-1;e?n._data(d,b,e):(d.removeEventListener(a,c,!0),n._removeData(d,b))}}}),n.fn.extend({on:function(a,b,c,d,e){var f,g;if("object"==typeof a){"string"!=typeof b&&(c=c||b,b=void 0);for(f in a)this.on(f,b,c,a[f],e);return this}if(null==c&&null==d?(d=b,c=b=void 0):null==d&&("string"==typeof b?(d=c,c=void 0):(d=c,c=b,b=void 0)),d===!1)d=cb;else if(!d)return this;return 1===e&&(g=d,d=function(a){return n().off(a),g.apply(this,arguments)},d.guid=g.guid||(g.guid=n.guid++)),this.each(function(){n.event.add(this,a,d,c,b)})},one:function(a,b,c,d){return this.on(a,b,c,d,1)},off:function(a,b,c){var d,e;if(a&&a.preventDefault&&a.handleObj)return d=a.handleObj,n(a.delegateTarget).off(d.namespace?d.origType+"."+d.namespace:d.origType,d.selector,d.handler),this;if("object"==typeof a){for(e in a)this.off(e,b,a[e]);return this}return(b===!1||"function"==typeof b)&&(c=b,b=void 0),c===!1&&(c=cb),this.each(function(){n.event.remove(this,a,c,b)})},trigger:function(a,b){return this.each(function(){n.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];return c?n.event.trigger(a,b,c,!0):void 0}});function eb(a){var b=fb.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}var fb="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",gb=/ jQuery\d+="(?:null|\d+)"/g,hb=new RegExp("<(?:"+fb+")[\\s/>]","i"),ib=/^\s+/,jb=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,kb=/<([\w:]+)/,lb=/<tbody/i,mb=/<|&#?\w+;/,nb=/<(?:script|style|link)/i,ob=/checked\s*(?:[^=]|=\s*.checked.)/i,pb=/^$|\/(?:java|ecma)script/i,qb=/^true\/(.*)/,rb=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,sb={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:l.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]},tb=eb(z),ub=tb.appendChild(z.createElement("div"));sb.optgroup=sb.option,sb.tbody=sb.tfoot=sb.colgroup=sb.caption=sb.thead,sb.th=sb.td;function vb(a,b){var c,d,e=0,f=typeof a.getElementsByTagName!==L?a.getElementsByTagName(b||"*"):typeof a.querySelectorAll!==L?a.querySelectorAll(b||"*"):void 0;if(!f)for(f=[],c=a.childNodes||a;null!=(d=c[e]);e++)!b||n.nodeName(d,b)?f.push(d):n.merge(f,vb(d,b));return void 0===b||b&&n.nodeName(a,b)?n.merge([a],f):f}function wb(a){X.test(a.type)&&(a.defaultChecked=a.checked)}function xb(a,b){return n.nodeName(a,"table")&&n.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function yb(a){return a.type=(null!==n.find.attr(a,"type"))+"/"+a.type,a}function zb(a){var b=qb.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function Ab(a,b){for(var c,d=0;null!=(c=a[d]);d++)n._data(c,"globalEval",!b||n._data(b[d],"globalEval"))}function Bb(a,b){if(1===b.nodeType&&n.hasData(a)){var c,d,e,f=n._data(a),g=n._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;e>d;d++)n.event.add(b,c,h[c][d])}g.data&&(g.data=n.extend({},g.data))}}function Cb(a,b){var c,d,e;if(1===b.nodeType){if(c=b.nodeName.toLowerCase(),!l.noCloneEvent&&b[n.expando]){e=n._data(b);for(d in e.events)n.removeEvent(b,d,e.handle);b.removeAttribute(n.expando)}"script"===c&&b.text!==a.text?(yb(b).text=a.text,zb(b)):"object"===c?(b.parentNode&&(b.outerHTML=a.outerHTML),l.html5Clone&&a.innerHTML&&!n.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):"input"===c&&X.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):"option"===c?b.defaultSelected=b.selected=a.defaultSelected:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}}n.extend({clone:function(a,b,c){var d,e,f,g,h,i=n.contains(a.ownerDocument,a);if(l.html5Clone||n.isXMLDoc(a)||!hb.test("<"+a.nodeName+">")?f=a.cloneNode(!0):(ub.innerHTML=a.outerHTML,ub.removeChild(f=ub.firstChild)),!(l.noCloneEvent&&l.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||n.isXMLDoc(a)))for(d=vb(f),h=vb(a),g=0;null!=(e=h[g]);++g)d[g]&&Cb(e,d[g]);if(b)if(c)for(h=h||vb(a),d=d||vb(f),g=0;null!=(e=h[g]);g++)Bb(e,d[g]);else Bb(a,f);return d=vb(f,"script"),d.length>0&&Ab(d,!i&&vb(a,"script")),d=h=e=null,f},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,k,m=a.length,o=eb(b),p=[],q=0;m>q;q++)if(f=a[q],f||0===f)if("object"===n.type(f))n.merge(p,f.nodeType?[f]:f);else if(mb.test(f)){h=h||o.appendChild(b.createElement("div")),i=(kb.exec(f)||["",""])[1].toLowerCase(),k=sb[i]||sb._default,h.innerHTML=k[1]+f.replace(jb,"<$1></$2>")+k[2],e=k[0];while(e--)h=h.lastChild;if(!l.leadingWhitespace&&ib.test(f)&&p.push(b.createTextNode(ib.exec(f)[0])),!l.tbody){f="table"!==i||lb.test(f)?"<table>"!==k[1]||lb.test(f)?0:h:h.firstChild,e=f&&f.childNodes.length;while(e--)n.nodeName(j=f.childNodes[e],"tbody")&&!j.childNodes.length&&f.removeChild(j)}n.merge(p,h.childNodes),h.textContent="";while(h.firstChild)h.removeChild(h.firstChild);h=o.lastChild}else p.push(b.createTextNode(f));h&&o.removeChild(h),l.appendChecked||n.grep(vb(p,"input"),wb),q=0;while(f=p[q++])if((!d||-1===n.inArray(f,d))&&(g=n.contains(f.ownerDocument,f),h=vb(o.appendChild(f),"script"),g&&Ab(h),c)){e=0;while(f=h[e++])pb.test(f.type||"")&&c.push(f)}return h=null,o},cleanData:function(a,b){for(var d,e,f,g,h=0,i=n.expando,j=n.cache,k=l.deleteExpando,m=n.event.special;null!=(d=a[h]);h++)if((b||n.acceptData(d))&&(f=d[i],g=f&&j[f])){if(g.events)for(e in g.events)m[e]?n.event.remove(d,e):n.removeEvent(d,e,g.handle);j[f]&&(delete j[f],k?delete d[i]:typeof d.removeAttribute!==L?d.removeAttribute(i):d[i]=null,c.push(f))}}}),n.fn.extend({text:function(a){return W(this,function(a){return void 0===a?n.text(this):this.empty().append((this[0]&&this[0].ownerDocument||z).createTextNode(a))},null,a,arguments.length)},append:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=xb(this,a);b.appendChild(a)}})},prepend:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=xb(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},remove:function(a,b){for(var c,d=a?n.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||n.cleanData(vb(c)),c.parentNode&&(b&&n.contains(c.ownerDocument,c)&&Ab(vb(c,"script")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++){1===a.nodeType&&n.cleanData(vb(a,!1));while(a.firstChild)a.removeChild(a.firstChild);a.options&&n.nodeName(a,"select")&&(a.options.length=0)}return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return n.clone(this,a,b)})},html:function(a){return W(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a)return 1===b.nodeType?b.innerHTML.replace(gb,""):void 0;if(!("string"!=typeof a||nb.test(a)||!l.htmlSerialize&&hb.test(a)||!l.leadingWhitespace&&ib.test(a)||sb[(kb.exec(a)||["",""])[1].toLowerCase()])){a=a.replace(jb,"<$1></$2>");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(n.cleanData(vb(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=arguments[0];return this.domManip(arguments,function(b){a=this.parentNode,n.cleanData(vb(this)),a&&a.replaceChild(b,this)}),a&&(a.length||a.nodeType)?this:this.remove()},detach:function(a){return this.remove(a,!0)},domManip:function(a,b){a=e.apply([],a);var c,d,f,g,h,i,j=0,k=this.length,m=this,o=k-1,p=a[0],q=n.isFunction(p);if(q||k>1&&"string"==typeof p&&!l.checkClone&&ob.test(p))return this.each(function(c){var d=m.eq(c);q&&(a[0]=p.call(this,c,d.html())),d.domManip(a,b)});if(k&&(i=n.buildFragment(a,this[0].ownerDocument,!1,this),c=i.firstChild,1===i.childNodes.length&&(i=c),c)){for(g=n.map(vb(i,"script"),yb),f=g.length;k>j;j++)d=i,j!==o&&(d=n.clone(d,!0,!0),f&&n.merge(g,vb(d,"script"))),b.call(this[j],d,j);if(f)for(h=g[g.length-1].ownerDocument,n.map(g,zb),j=0;f>j;j++)d=g[j],pb.test(d.type||"")&&!n._data(d,"globalEval")&&n.contains(h,d)&&(d.src?n._evalUrl&&n._evalUrl(d.src):n.globalEval((d.text||d.textContent||d.innerHTML||"").replace(rb,"")));i=c=null}return this}}),n.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){n.fn[a]=function(a){for(var c,d=0,e=[],g=n(a),h=g.length-1;h>=d;d++)c=d===h?this:this.clone(!0),n(g[d])[b](c),f.apply(e,c.get());return this.pushStack(e)}});var Db,Eb={};function Fb(b,c){var d=n(c.createElement(b)).appendTo(c.body),e=a.getDefaultComputedStyle?a.getDefaultComputedStyle(d[0]).display:n.css(d[0],"display");return d.detach(),e}function Gb(a){var b=z,c=Eb[a];return c||(c=Fb(a,b),"none"!==c&&c||(Db=(Db||n("<iframe frameborder='0' width='0' height='0'/>")).appendTo(b.documentElement),b=(Db[0].contentWindow||Db[0].contentDocument).document,b.write(),b.close(),c=Fb(a,b),Db.detach()),Eb[a]=c),c}!function(){var a,b,c=z.createElement("div"),d="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;padding:0;margin:0;border:0";c.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",a=c.getElementsByTagName("a")[0],a.style.cssText="float:left;opacity:.5",l.opacity=/^0.5/.test(a.style.opacity),l.cssFloat=!!a.style.cssFloat,c.style.backgroundClip="content-box",c.cloneNode(!0).style.backgroundClip="",l.clearCloneStyle="content-box"===c.style.backgroundClip,a=c=null,l.shrinkWrapBlocks=function(){var a,c,e,f;if(null==b){if(a=z.getElementsByTagName("body")[0],!a)return;f="border:0;width:0;height:0;position:absolute;top:0;left:-9999px",c=z.createElement("div"),e=z.createElement("div"),a.appendChild(c).appendChild(e),b=!1,typeof e.style.zoom!==L&&(e.style.cssText=d+";width:1px;padding:1px;zoom:1",e.innerHTML="<div></div>",e.firstChild.style.width="5px",b=3!==e.offsetWidth),a.removeChild(c),a=c=e=null}return b}}();var Hb=/^margin/,Ib=new RegExp("^("+T+")(?!px)[a-z%]+$","i"),Jb,Kb,Lb=/^(top|right|bottom|left)$/;a.getComputedStyle?(Jb=function(a){return a.ownerDocument.defaultView.getComputedStyle(a,null)},Kb=function(a,b,c){var d,e,f,g,h=a.style;return c=c||Jb(a),g=c?c.getPropertyValue(b)||c[b]:void 0,c&&(""!==g||n.contains(a.ownerDocument,a)||(g=n.style(a,b)),Ib.test(g)&&Hb.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=g,g=c.width,h.width=d,h.minWidth=e,h.maxWidth=f)),void 0===g?g:g+""}):z.documentElement.currentStyle&&(Jb=function(a){return a.currentStyle},Kb=function(a,b,c){var d,e,f,g,h=a.style;return c=c||Jb(a),g=c?c[b]:void 0,null==g&&h&&h[b]&&(g=h[b]),Ib.test(g)&&!Lb.test(b)&&(d=h.left,e=a.runtimeStyle,f=e&&e.left,f&&(e.left=a.currentStyle.left),h.left="fontSize"===b?"1em":g,g=h.pixelLeft+"px",h.left=d,f&&(e.left=f)),void 0===g?g:g+""||"auto"});function Mb(a,b){return{get:function(){var c=a();if(null!=c)return c?void delete this.get:(this.get=b).apply(this,arguments)}}}!function(){var b,c,d,e,f,g,h=z.createElement("div"),i="border:0;width:0;height:0;position:absolute;top:0;left:-9999px",j="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;padding:0;margin:0;border:0";h.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",b=h.getElementsByTagName("a")[0],b.style.cssText="float:left;opacity:.5",l.opacity=/^0.5/.test(b.style.opacity),l.cssFloat=!!b.style.cssFloat,h.style.backgroundClip="content-box",h.cloneNode(!0).style.backgroundClip="",l.clearCloneStyle="content-box"===h.style.backgroundClip,b=h=null,n.extend(l,{reliableHiddenOffsets:function(){if(null!=c)return c;var a,b,d,e=z.createElement("div"),f=z.getElementsByTagName("body")[0];if(f)return e.setAttribute("className","t"),e.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",a=z.createElement("div"),a.style.cssText=i,f.appendChild(a).appendChild(e),e.innerHTML="<table><tr><td></td><td>t</td></tr></table>",b=e.getElementsByTagName("td"),b[0].style.cssText="padding:0;margin:0;border:0;display:none",d=0===b[0].offsetHeight,b[0].style.display="",b[1].style.display="none",c=d&&0===b[0].offsetHeight,f.removeChild(a),e=f=null,c},boxSizing:function(){return null==d&&k(),d},boxSizingReliable:function(){return null==e&&k(),e},pixelPosition:function(){return null==f&&k(),f},reliableMarginRight:function(){var b,c,d,e;if(null==g&&a.getComputedStyle){if(b=z.getElementsByTagName("body")[0],!b)return;c=z.createElement("div"),d=z.createElement("div"),c.style.cssText=i,b.appendChild(c).appendChild(d),e=d.appendChild(z.createElement("div")),e.style.cssText=d.style.cssText=j,e.style.marginRight=e.style.width="0",d.style.width="1px",g=!parseFloat((a.getComputedStyle(e,null)||{}).marginRight),b.removeChild(c)}return g}});function k(){var b,c,h=z.getElementsByTagName("body")[0];h&&(b=z.createElement("div"),c=z.createElement("div"),b.style.cssText=i,h.appendChild(b).appendChild(c),c.style.cssText="-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;position:absolute;display:block;padding:1px;border:1px;width:4px;margin-top:1%;top:1%",n.swap(h,null!=h.style.zoom?{zoom:1}:{},function(){d=4===c.offsetWidth}),e=!0,f=!1,g=!0,a.getComputedStyle&&(f="1%"!==(a.getComputedStyle(c,null)||{}).top,e="4px"===(a.getComputedStyle(c,null)||{width:"4px"}).width),h.removeChild(b),c=h=null)}}(),n.swap=function(a,b,c,d){var e,f,g={};for(f in b)g[f]=a.style[f],a.style[f]=b[f];e=c.apply(a,d||[]);for(f in b)a.style[f]=g[f];return e};var Nb=/alpha\([^)]*\)/i,Ob=/opacity\s*=\s*([^)]*)/,Pb=/^(none|table(?!-c[ea]).+)/,Qb=new RegExp("^("+T+")(.*)$","i"),Rb=new RegExp("^([+-])=("+T+")","i"),Sb={position:"absolute",visibility:"hidden",display:"block"},Tb={letterSpacing:0,fontWeight:400},Ub=["Webkit","O","Moz","ms"];function Vb(a,b){if(b in a)return b;var c=b.charAt(0).toUpperCase()+b.slice(1),d=b,e=Ub.length;while(e--)if(b=Ub[e]+c,b in a)return b;return d}function Wb(a,b){for(var c,d,e,f=[],g=0,h=a.length;h>g;g++)d=a[g],d.style&&(f[g]=n._data(d,"olddisplay"),c=d.style.display,b?(f[g]||"none"!==c||(d.style.display=""),""===d.style.display&&V(d)&&(f[g]=n._data(d,"olddisplay",Gb(d.nodeName)))):f[g]||(e=V(d),(c&&"none"!==c||!e)&&n._data(d,"olddisplay",e?c:n.css(d,"display"))));for(g=0;h>g;g++)d=a[g],d.style&&(b&&"none"!==d.style.display&&""!==d.style.display||(d.style.display=b?f[g]||"":"none"));return a}function Xb(a,b,c){var d=Qb.exec(b);return d?Math.max(0,d[1]-(c||0))+(d[2]||"px"):b}function Yb(a,b,c,d,e){for(var f=c===(d?"border":"content")?4:"width"===b?1:0,g=0;4>f;f+=2)"margin"===c&&(g+=n.css(a,c+U[f],!0,e)),d?("content"===c&&(g-=n.css(a,"padding"+U[f],!0,e)),"margin"!==c&&(g-=n.css(a,"border"+U[f]+"Width",!0,e))):(g+=n.css(a,"padding"+U[f],!0,e),"padding"!==c&&(g+=n.css(a,"border"+U[f]+"Width",!0,e)));return g}function Zb(a,b,c){var d=!0,e="width"===b?a.offsetWidth:a.offsetHeight,f=Jb(a),g=l.boxSizing()&&"border-box"===n.css(a,"boxSizing",!1,f);if(0>=e||null==e){if(e=Kb(a,b,f),(0>e||null==e)&&(e=a.style[b]),Ib.test(e))return e;d=g&&(l.boxSizingReliable()||e===a.style[b]),e=parseFloat(e)||0}return e+Yb(a,b,c||(g?"border":"content"),d,f)+"px"}n.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=Kb(a,"opacity");return""===c?"1":c}}}},cssNumber:{columnCount:!0,fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":l.cssFloat?"cssFloat":"styleFloat"},style:function(a,b,c,d){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var e,f,g,h=n.camelCase(b),i=a.style;if(b=n.cssProps[h]||(n.cssProps[h]=Vb(i,h)),g=n.cssHooks[b]||n.cssHooks[h],void 0===c)return g&&"get"in g&&void 0!==(e=g.get(a,!1,d))?e:i[b];if(f=typeof c,"string"===f&&(e=Rb.exec(c))&&(c=(e[1]+1)*e[2]+parseFloat(n.css(a,b)),f="number"),null!=c&&c===c&&("number"!==f||n.cssNumber[h]||(c+="px"),l.clearCloneStyle||""!==c||0!==b.indexOf("background")||(i[b]="inherit"),!(g&&"set"in g&&void 0===(c=g.set(a,c,d)))))try{i[b]="",i[b]=c}catch(j){}}},css:function(a,b,c,d){var e,f,g,h=n.camelCase(b);return b=n.cssProps[h]||(n.cssProps[h]=Vb(a.style,h)),g=n.cssHooks[b]||n.cssHooks[h],g&&"get"in g&&(f=g.get(a,!0,c)),void 0===f&&(f=Kb(a,b,d)),"normal"===f&&b in Tb&&(f=Tb[b]),""===c||c?(e=parseFloat(f),c===!0||n.isNumeric(e)?e||0:f):f}}),n.each(["height","width"],function(a,b){n.cssHooks[b]={get:function(a,c,d){return c?0===a.offsetWidth&&Pb.test(n.css(a,"display"))?n.swap(a,Sb,function(){return Zb(a,b,d)}):Zb(a,b,d):void 0},set:function(a,c,d){var e=d&&Jb(a);return Xb(a,c,d?Yb(a,b,d,l.boxSizing()&&"border-box"===n.css(a,"boxSizing",!1,e),e):0)}}}),l.opacity||(n.cssHooks.opacity={get:function(a,b){return Ob.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=n.isNumeric(b)?"alpha(opacity="+100*b+")":"",f=d&&d.filter||c.filter||"";c.zoom=1,(b>=1||""===b)&&""===n.trim(f.replace(Nb,""))&&c.removeAttribute&&(c.removeAttribute("filter"),""===b||d&&!d.filter)||(c.filter=Nb.test(f)?f.replace(Nb,e):f+" "+e)}}),n.cssHooks.marginRight=Mb(l.reliableMarginRight,function(a,b){return b?n.swap(a,{display:"inline-block"},Kb,[a,"marginRight"]):void 0}),n.each({margin:"",padding:"",border:"Width"},function(a,b){n.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];4>d;d++)e[a+U[d]+b]=f[d]||f[d-2]||f[0];return e}},Hb.test(a)||(n.cssHooks[a+b].set=Xb)}),n.fn.extend({css:function(a,b){return W(this,function(a,b,c){var d,e,f={},g=0;if(n.isArray(b)){for(d=Jb(a),e=b.length;e>g;g++)f[b[g]]=n.css(a,b[g],!1,d);return f}return void 0!==c?n.style(a,b,c):n.css(a,b)
+},a,b,arguments.length>1)},show:function(){return Wb(this,!0)},hide:function(){return Wb(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){V(this)?n(this).show():n(this).hide()})}});function $b(a,b,c,d,e){return new $b.prototype.init(a,b,c,d,e)}n.Tween=$b,$b.prototype={constructor:$b,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||"swing",this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(n.cssNumber[c]?"":"px")},cur:function(){var a=$b.propHooks[this.prop];return a&&a.get?a.get(this):$b.propHooks._default.get(this)},run:function(a){var b,c=$b.propHooks[this.prop];return this.pos=b=this.options.duration?n.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):$b.propHooks._default.set(this),this}},$b.prototype.init.prototype=$b.prototype,$b.propHooks={_default:{get:function(a){var b;return null==a.elem[a.prop]||a.elem.style&&null!=a.elem.style[a.prop]?(b=n.css(a.elem,a.prop,""),b&&"auto"!==b?b:0):a.elem[a.prop]},set:function(a){n.fx.step[a.prop]?n.fx.step[a.prop](a):a.elem.style&&(null!=a.elem.style[n.cssProps[a.prop]]||n.cssHooks[a.prop])?n.style(a.elem,a.prop,a.now+a.unit):a.elem[a.prop]=a.now}}},$b.propHooks.scrollTop=$b.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},n.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2}},n.fx=$b.prototype.init,n.fx.step={};var _b,ac,bc=/^(?:toggle|show|hide)$/,cc=new RegExp("^(?:([+-])=|)("+T+")([a-z%]*)$","i"),dc=/queueHooks$/,ec=[jc],fc={"*":[function(a,b){var c=this.createTween(a,b),d=c.cur(),e=cc.exec(b),f=e&&e[3]||(n.cssNumber[a]?"":"px"),g=(n.cssNumber[a]||"px"!==f&&+d)&&cc.exec(n.css(c.elem,a)),h=1,i=20;if(g&&g[3]!==f){f=f||g[3],e=e||[],g=+d||1;do h=h||".5",g/=h,n.style(c.elem,a,g+f);while(h!==(h=c.cur()/d)&&1!==h&&--i)}return e&&(g=c.start=+g||+d||0,c.unit=f,c.end=e[1]?g+(e[1]+1)*e[2]:+e[2]),c}]};function gc(){return setTimeout(function(){_b=void 0}),_b=n.now()}function hc(a,b){var c,d={height:a},e=0;for(b=b?1:0;4>e;e+=2-b)c=U[e],d["margin"+c]=d["padding"+c]=a;return b&&(d.opacity=d.width=a),d}function ic(a,b,c){for(var d,e=(fc[b]||[]).concat(fc["*"]),f=0,g=e.length;g>f;f++)if(d=e[f].call(c,b,a))return d}function jc(a,b,c){var d,e,f,g,h,i,j,k,m=this,o={},p=a.style,q=a.nodeType&&V(a),r=n._data(a,"fxshow");c.queue||(h=n._queueHooks(a,"fx"),null==h.unqueued&&(h.unqueued=0,i=h.empty.fire,h.empty.fire=function(){h.unqueued||i()}),h.unqueued++,m.always(function(){m.always(function(){h.unqueued--,n.queue(a,"fx").length||h.empty.fire()})})),1===a.nodeType&&("height"in b||"width"in b)&&(c.overflow=[p.overflow,p.overflowX,p.overflowY],j=n.css(a,"display"),k=Gb(a.nodeName),"none"===j&&(j=k),"inline"===j&&"none"===n.css(a,"float")&&(l.inlineBlockNeedsLayout&&"inline"!==k?p.zoom=1:p.display="inline-block")),c.overflow&&(p.overflow="hidden",l.shrinkWrapBlocks()||m.always(function(){p.overflow=c.overflow[0],p.overflowX=c.overflow[1],p.overflowY=c.overflow[2]}));for(d in b)if(e=b[d],bc.exec(e)){if(delete b[d],f=f||"toggle"===e,e===(q?"hide":"show")){if("show"!==e||!r||void 0===r[d])continue;q=!0}o[d]=r&&r[d]||n.style(a,d)}if(!n.isEmptyObject(o)){r?"hidden"in r&&(q=r.hidden):r=n._data(a,"fxshow",{}),f&&(r.hidden=!q),q?n(a).show():m.done(function(){n(a).hide()}),m.done(function(){var b;n._removeData(a,"fxshow");for(b in o)n.style(a,b,o[b])});for(d in o)g=ic(q?r[d]:0,d,m),d in r||(r[d]=g.start,q&&(g.end=g.start,g.start="width"===d||"height"===d?1:0))}}function kc(a,b){var c,d,e,f,g;for(c in a)if(d=n.camelCase(c),e=b[d],f=a[c],n.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=n.cssHooks[d],g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}function lc(a,b,c){var d,e,f=0,g=ec.length,h=n.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=_b||gc(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;i>g;g++)j.tweens[g].run(f);return h.notifyWith(a,[j,f,c]),1>f&&i?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:n.extend({},b),opts:n.extend(!0,{specialEasing:{}},c),originalProperties:b,originalOptions:c,startTime:_b||gc(),duration:c.duration,tweens:[],createTween:function(b,c){var d=n.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(d),d},stop:function(b){var c=0,d=b?j.tweens.length:0;if(e)return this;for(e=!0;d>c;c++)j.tweens[c].run(1);return b?h.resolveWith(a,[j,b]):h.rejectWith(a,[j,b]),this}}),k=j.props;for(kc(k,j.opts.specialEasing);g>f;f++)if(d=ec[f].call(j,a,k,j.opts))return d;return n.map(k,ic,j),n.isFunction(j.opts.start)&&j.opts.start.call(a,j),n.fx.timer(n.extend(i,{elem:a,anim:j,queue:j.opts.queue})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}n.Animation=n.extend(lc,{tweener:function(a,b){n.isFunction(a)?(b=a,a=["*"]):a=a.split(" ");for(var c,d=0,e=a.length;e>d;d++)c=a[d],fc[c]=fc[c]||[],fc[c].unshift(b)},prefilter:function(a,b){b?ec.unshift(a):ec.push(a)}}),n.speed=function(a,b,c){var d=a&&"object"==typeof a?n.extend({},a):{complete:c||!c&&b||n.isFunction(a)&&a,duration:a,easing:c&&b||b&&!n.isFunction(b)&&b};return d.duration=n.fx.off?0:"number"==typeof d.duration?d.duration:d.duration in n.fx.speeds?n.fx.speeds[d.duration]:n.fx.speeds._default,(null==d.queue||d.queue===!0)&&(d.queue="fx"),d.old=d.complete,d.complete=function(){n.isFunction(d.old)&&d.old.call(this),d.queue&&n.dequeue(this,d.queue)},d},n.fn.extend({fadeTo:function(a,b,c,d){return this.filter(V).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=n.isEmptyObject(a),f=n.speed(b,c,d),g=function(){var b=lc(this,n.extend({},a),f);(e||n._data(this,"finish"))&&b.stop(!0)};return g.finish=g,e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,b,c){var d=function(a){var b=a.stop;delete a.stop,b(c)};return"string"!=typeof a&&(c=b,b=a,a=void 0),b&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,e=null!=a&&a+"queueHooks",f=n.timers,g=n._data(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&dc.test(e)&&d(g[e]);for(e=f.length;e--;)f[e].elem!==this||null!=a&&f[e].queue!==a||(f[e].anim.stop(c),b=!1,f.splice(e,1));(b||!c)&&n.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=n._data(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=n.timers,g=d?d.length:0;for(c.finish=!0,n.queue(this,a,[]),e&&e.stop&&e.stop.call(this,!0),b=f.length;b--;)f[b].elem===this&&f[b].queue===a&&(f[b].anim.stop(!0),f.splice(b,1));for(b=0;g>b;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),n.each(["toggle","show","hide"],function(a,b){var c=n.fn[b];n.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(hc(b,!0),a,d,e)}}),n.each({slideDown:hc("show"),slideUp:hc("hide"),slideToggle:hc("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){n.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),n.timers=[],n.fx.tick=function(){var a,b=n.timers,c=0;for(_b=n.now();c<b.length;c++)a=b[c],a()||b[c]!==a||b.splice(c--,1);b.length||n.fx.stop(),_b=void 0},n.fx.timer=function(a){n.timers.push(a),a()?n.fx.start():n.timers.pop()},n.fx.interval=13,n.fx.start=function(){ac||(ac=setInterval(n.fx.tick,n.fx.interval))},n.fx.stop=function(){clearInterval(ac),ac=null},n.fx.speeds={slow:600,fast:200,_default:400},n.fn.delay=function(a,b){return a=n.fx?n.fx.speeds[a]||a:a,b=b||"fx",this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},function(){var a,b,c,d,e=z.createElement("div");e.setAttribute("className","t"),e.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",a=e.getElementsByTagName("a")[0],c=z.createElement("select"),d=c.appendChild(z.createElement("option")),b=e.getElementsByTagName("input")[0],a.style.cssText="top:1px",l.getSetAttribute="t"!==e.className,l.style=/top/.test(a.getAttribute("style")),l.hrefNormalized="/a"===a.getAttribute("href"),l.checkOn=!!b.value,l.optSelected=d.selected,l.enctype=!!z.createElement("form").enctype,c.disabled=!0,l.optDisabled=!d.disabled,b=z.createElement("input"),b.setAttribute("value",""),l.input=""===b.getAttribute("value"),b.value="t",b.setAttribute("type","radio"),l.radioValue="t"===b.value,a=b=c=d=e=null}();var mc=/\r/g;n.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=n.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,n(this).val()):a,null==e?e="":"number"==typeof e?e+="":n.isArray(e)&&(e=n.map(e,function(a){return null==a?"":a+""})),b=n.valHooks[this.type]||n.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=n.valHooks[e.type]||n.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(mc,""):null==c?"":c)}}}),n.extend({valHooks:{option:{get:function(a){var b=n.find.attr(a,"value");return null!=b?b:n.text(a)}},select:{get:function(a){for(var b,c,d=a.options,e=a.selectedIndex,f="select-one"===a.type||0>e,g=f?null:[],h=f?e+1:d.length,i=0>e?h:f?e:0;h>i;i++)if(c=d[i],!(!c.selected&&i!==e||(l.optDisabled?c.disabled:null!==c.getAttribute("disabled"))||c.parentNode.disabled&&n.nodeName(c.parentNode,"optgroup"))){if(b=n(c).val(),f)return b;g.push(b)}return g},set:function(a,b){var c,d,e=a.options,f=n.makeArray(b),g=e.length;while(g--)if(d=e[g],n.inArray(n.valHooks.option.get(d),f)>=0)try{d.selected=c=!0}catch(h){d.scrollHeight}else d.selected=!1;return c||(a.selectedIndex=-1),e}}}}),n.each(["radio","checkbox"],function(){n.valHooks[this]={set:function(a,b){return n.isArray(b)?a.checked=n.inArray(n(a).val(),b)>=0:void 0}},l.checkOn||(n.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})});var nc,oc,pc=n.expr.attrHandle,qc=/^(?:checked|selected)$/i,rc=l.getSetAttribute,sc=l.input;n.fn.extend({attr:function(a,b){return W(this,n.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){n.removeAttr(this,a)})}}),n.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(a&&3!==f&&8!==f&&2!==f)return typeof a.getAttribute===L?n.prop(a,b,c):(1===f&&n.isXMLDoc(a)||(b=b.toLowerCase(),d=n.attrHooks[b]||(n.expr.match.bool.test(b)?oc:nc)),void 0===c?d&&"get"in d&&null!==(e=d.get(a,b))?e:(e=n.find.attr(a,b),null==e?void 0:e):null!==c?d&&"set"in d&&void 0!==(e=d.set(a,c,b))?e:(a.setAttribute(b,c+""),c):void n.removeAttr(a,b))},removeAttr:function(a,b){var c,d,e=0,f=b&&b.match(F);if(f&&1===a.nodeType)while(c=f[e++])d=n.propFix[c]||c,n.expr.match.bool.test(c)?sc&&rc||!qc.test(c)?a[d]=!1:a[n.camelCase("default-"+c)]=a[d]=!1:n.attr(a,c,""),a.removeAttribute(rc?c:d)},attrHooks:{type:{set:function(a,b){if(!l.radioValue&&"radio"===b&&n.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}}}),oc={set:function(a,b,c){return b===!1?n.removeAttr(a,c):sc&&rc||!qc.test(c)?a.setAttribute(!rc&&n.propFix[c]||c,c):a[n.camelCase("default-"+c)]=a[c]=!0,c}},n.each(n.expr.match.bool.source.match(/\w+/g),function(a,b){var c=pc[b]||n.find.attr;pc[b]=sc&&rc||!qc.test(b)?function(a,b,d){var e,f;return d||(f=pc[b],pc[b]=e,e=null!=c(a,b,d)?b.toLowerCase():null,pc[b]=f),e}:function(a,b,c){return c?void 0:a[n.camelCase("default-"+b)]?b.toLowerCase():null}}),sc&&rc||(n.attrHooks.value={set:function(a,b,c){return n.nodeName(a,"input")?void(a.defaultValue=b):nc&&nc.set(a,b,c)}}),rc||(nc={set:function(a,b,c){var d=a.getAttributeNode(c);return d||a.setAttributeNode(d=a.ownerDocument.createAttribute(c)),d.value=b+="","value"===c||b===a.getAttribute(c)?b:void 0}},pc.id=pc.name=pc.coords=function(a,b,c){var d;return c?void 0:(d=a.getAttributeNode(b))&&""!==d.value?d.value:null},n.valHooks.button={get:function(a,b){var c=a.getAttributeNode(b);return c&&c.specified?c.value:void 0},set:nc.set},n.attrHooks.contenteditable={set:function(a,b,c){nc.set(a,""===b?!1:b,c)}},n.each(["width","height"],function(a,b){n.attrHooks[b]={set:function(a,c){return""===c?(a.setAttribute(b,"auto"),c):void 0}}})),l.style||(n.attrHooks.style={get:function(a){return a.style.cssText||void 0},set:function(a,b){return a.style.cssText=b+""}});var tc=/^(?:input|select|textarea|button|object)$/i,uc=/^(?:a|area)$/i;n.fn.extend({prop:function(a,b){return W(this,n.prop,a,b,arguments.length>1)},removeProp:function(a){return a=n.propFix[a]||a,this.each(function(){try{this[a]=void 0,delete this[a]}catch(b){}})}}),n.extend({propFix:{"for":"htmlFor","class":"className"},prop:function(a,b,c){var d,e,f,g=a.nodeType;if(a&&3!==g&&8!==g&&2!==g)return f=1!==g||!n.isXMLDoc(a),f&&(b=n.propFix[b]||b,e=n.propHooks[b]),void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){var b=n.find.attr(a,"tabindex");return b?parseInt(b,10):tc.test(a.nodeName)||uc.test(a.nodeName)&&a.href?0:-1}}}}),l.hrefNormalized||n.each(["href","src"],function(a,b){n.propHooks[b]={get:function(a){return a.getAttribute(b,4)}}}),l.optSelected||(n.propHooks.selected={get:function(a){var b=a.parentNode;return b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex),null}}),n.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){n.propFix[this.toLowerCase()]=this}),l.enctype||(n.propFix.enctype="encoding");var vc=/[\t\r\n\f]/g;n.fn.extend({addClass:function(a){var b,c,d,e,f,g,h=0,i=this.length,j="string"==typeof a&&a;if(n.isFunction(a))return this.each(function(b){n(this).addClass(a.call(this,b,this.className))});if(j)for(b=(a||"").match(F)||[];i>h;h++)if(c=this[h],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(vc," "):" ")){f=0;while(e=b[f++])d.indexOf(" "+e+" ")<0&&(d+=e+" ");g=n.trim(d),c.className!==g&&(c.className=g)}return this},removeClass:function(a){var b,c,d,e,f,g,h=0,i=this.length,j=0===arguments.length||"string"==typeof a&&a;if(n.isFunction(a))return this.each(function(b){n(this).removeClass(a.call(this,b,this.className))});if(j)for(b=(a||"").match(F)||[];i>h;h++)if(c=this[h],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(vc," "):"")){f=0;while(e=b[f++])while(d.indexOf(" "+e+" ")>=0)d=d.replace(" "+e+" "," ");g=a?n.trim(d):"",c.className!==g&&(c.className=g)}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):this.each(n.isFunction(a)?function(c){n(this).toggleClass(a.call(this,c,this.className,b),b)}:function(){if("string"===c){var b,d=0,e=n(this),f=a.match(F)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else(c===L||"boolean"===c)&&(this.className&&n._data(this,"__className__",this.className),this.className=this.className||a===!1?"":n._data(this,"__className__")||"")})},hasClass:function(a){for(var b=" "+a+" ",c=0,d=this.length;d>c;c++)if(1===this[c].nodeType&&(" "+this[c].className+" ").replace(vc," ").indexOf(b)>=0)return!0;return!1}}),n.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){n.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),n.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)}});var wc=n.now(),xc=/\?/,yc=/(,)|(\[|{)|(}|])|"(?:[^"\\\r\n]|\\["\\\/bfnrt]|\\u[\da-fA-F]{4})*"\s*:?|true|false|null|-?(?!0\d)\d+(?:\.\d+|)(?:[eE][+-]?\d+|)/g;n.parseJSON=function(b){if(a.JSON&&a.JSON.parse)return a.JSON.parse(b+"");var c,d=null,e=n.trim(b+"");return e&&!n.trim(e.replace(yc,function(a,b,e,f){return c&&b&&(d=0),0===d?a:(c=e||b,d+=!f-!e,"")}))?Function("return "+e)():n.error("Invalid JSON: "+b)},n.parseXML=function(b){var c,d;if(!b||"string"!=typeof b)return null;try{a.DOMParser?(d=new DOMParser,c=d.parseFromString(b,"text/xml")):(c=new ActiveXObject("Microsoft.XMLDOM"),c.async="false",c.loadXML(b))}catch(e){c=void 0}return c&&c.documentElement&&!c.getElementsByTagName("parsererror").length||n.error("Invalid XML: "+b),c};var zc,Ac,Bc=/#.*$/,Cc=/([?&])_=[^&]*/,Dc=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Ec=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Fc=/^(?:GET|HEAD)$/,Gc=/^\/\//,Hc=/^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,Ic={},Jc={},Kc="*/".concat("*");try{Ac=location.href}catch(Lc){Ac=z.createElement("a"),Ac.href="",Ac=Ac.href}zc=Hc.exec(Ac.toLowerCase())||[];function Mc(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(F)||[];if(n.isFunction(c))while(d=f[e++])"+"===d.charAt(0)?(d=d.slice(1)||"*",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function Nc(a,b,c,d){var e={},f=a===Jc;function g(h){var i;return e[h]=!0,n.each(a[h]||[],function(a,h){var j=h(b,c,d);return"string"!=typeof j||f||e[j]?f?!(i=j):void 0:(b.dataTypes.unshift(j),g(j),!1)}),i}return g(b.dataTypes[0])||!e["*"]&&g("*")}function Oc(a,b){var c,d,e=n.ajaxSettings.flatOptions||{};for(d in b)void 0!==b[d]&&((e[d]?a:c||(c={}))[d]=b[d]);return c&&n.extend(!0,a,c),a}function Pc(a,b,c){var d,e,f,g,h=a.contents,i=a.dataTypes;while("*"===i[0])i.shift(),void 0===e&&(e=a.mimeType||b.getResponseHeader("Content-Type"));if(e)for(g in h)if(h[g]&&h[g].test(e)){i.unshift(g);break}if(i[0]in c)f=i[0];else{for(g in c){if(!i[0]||a.converters[g+" "+i[0]]){f=g;break}d||(d=g)}f=f||d}return f?(f!==i[0]&&i.unshift(f),c[f]):void 0}function Qc(a,b,c,d){var e,f,g,h,i,j={},k=a.dataTypes.slice();if(k[1])for(g in a.converters)j[g.toLowerCase()]=a.converters[g];f=k.shift();while(f)if(a.responseFields[f]&&(c[a.responseFields[f]]=b),!i&&d&&a.dataFilter&&(b=a.dataFilter(b,a.dataType)),i=f,f=k.shift())if("*"===f)f=i;else if("*"!==i&&i!==f){if(g=j[i+" "+f]||j["* "+f],!g)for(e in j)if(h=e.split(" "),h[1]===f&&(g=j[i+" "+h[0]]||j["* "+h[0]])){g===!0?g=j[e]:j[e]!==!0&&(f=h[0],k.unshift(h[1]));break}if(g!==!0)if(g&&a["throws"])b=g(b);else try{b=g(b)}catch(l){return{state:"parsererror",error:g?l:"No conversion from "+i+" to "+f}}}return{state:"success",data:b}}n.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Ac,type:"GET",isLocal:Ec.test(zc[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Kc,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":n.parseJSON,"text xml":n.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?Oc(Oc(a,n.ajaxSettings),b):Oc(n.ajaxSettings,a)},ajaxPrefilter:Mc(Ic),ajaxTransport:Mc(Jc),ajax:function(a,b){"object"==typeof a&&(b=a,a=void 0),b=b||{};var c,d,e,f,g,h,i,j,k=n.ajaxSetup({},b),l=k.context||k,m=k.context&&(l.nodeType||l.jquery)?n(l):n.event,o=n.Deferred(),p=n.Callbacks("once memory"),q=k.statusCode||{},r={},s={},t=0,u="canceled",v={readyState:0,getResponseHeader:function(a){var b;if(2===t){if(!j){j={};while(b=Dc.exec(f))j[b[1].toLowerCase()]=b[2]}b=j[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return 2===t?f:null},setRequestHeader:function(a,b){var c=a.toLowerCase();return t||(a=s[c]=s[c]||a,r[a]=b),this},overrideMimeType:function(a){return t||(k.mimeType=a),this},statusCode:function(a){var b;if(a)if(2>t)for(b in a)q[b]=[q[b],a[b]];else v.always(a[v.status]);return this},abort:function(a){var b=a||u;return i&&i.abort(b),x(0,b),this}};if(o.promise(v).complete=p.add,v.success=v.done,v.error=v.fail,k.url=((a||k.url||Ac)+"").replace(Bc,"").replace(Gc,zc[1]+"//"),k.type=b.method||b.type||k.method||k.type,k.dataTypes=n.trim(k.dataType||"*").toLowerCase().match(F)||[""],null==k.crossDomain&&(c=Hc.exec(k.url.toLowerCase()),k.crossDomain=!(!c||c[1]===zc[1]&&c[2]===zc[2]&&(c[3]||("http:"===c[1]?"80":"443"))===(zc[3]||("http:"===zc[1]?"80":"443")))),k.data&&k.processData&&"string"!=typeof k.data&&(k.data=n.param(k.data,k.traditional)),Nc(Ic,k,b,v),2===t)return v;h=k.global,h&&0===n.active++&&n.event.trigger("ajaxStart"),k.type=k.type.toUpperCase(),k.hasContent=!Fc.test(k.type),e=k.url,k.hasContent||(k.data&&(e=k.url+=(xc.test(e)?"&":"?")+k.data,delete k.data),k.cache===!1&&(k.url=Cc.test(e)?e.replace(Cc,"$1_="+wc++):e+(xc.test(e)?"&":"?")+"_="+wc++)),k.ifModified&&(n.lastModified[e]&&v.setRequestHeader("If-Modified-Since",n.lastModified[e]),n.etag[e]&&v.setRequestHeader("If-None-Match",n.etag[e])),(k.data&&k.hasContent&&k.contentType!==!1||b.contentType)&&v.setRequestHeader("Content-Type",k.contentType),v.setRequestHeader("Accept",k.dataTypes[0]&&k.accepts[k.dataTypes[0]]?k.accepts[k.dataTypes[0]]+("*"!==k.dataTypes[0]?", "+Kc+"; q=0.01":""):k.accepts["*"]);for(d in k.headers)v.setRequestHeader(d,k.headers[d]);if(k.beforeSend&&(k.beforeSend.call(l,v,k)===!1||2===t))return v.abort();u="abort";for(d in{success:1,error:1,complete:1})v[d](k[d]);if(i=Nc(Jc,k,b,v)){v.readyState=1,h&&m.trigger("ajaxSend",[v,k]),k.async&&k.timeout>0&&(g=setTimeout(function(){v.abort("timeout")},k.timeout));try{t=1,i.send(r,x)}catch(w){if(!(2>t))throw w;x(-1,w)}}else x(-1,"No Transport");function x(a,b,c,d){var j,r,s,u,w,x=b;2!==t&&(t=2,g&&clearTimeout(g),i=void 0,f=d||"",v.readyState=a>0?4:0,j=a>=200&&300>a||304===a,c&&(u=Pc(k,v,c)),u=Qc(k,u,v,j),j?(k.ifModified&&(w=v.getResponseHeader("Last-Modified"),w&&(n.lastModified[e]=w),w=v.getResponseHeader("etag"),w&&(n.etag[e]=w)),204===a||"HEAD"===k.type?x="nocontent":304===a?x="notmodified":(x=u.state,r=u.data,s=u.error,j=!s)):(s=x,(a||!x)&&(x="error",0>a&&(a=0))),v.status=a,v.statusText=(b||x)+"",j?o.resolveWith(l,[r,x,v]):o.rejectWith(l,[v,x,s]),v.statusCode(q),q=void 0,h&&m.trigger(j?"ajaxSuccess":"ajaxError",[v,k,j?r:s]),p.fireWith(l,[v,x]),h&&(m.trigger("ajaxComplete",[v,k]),--n.active||n.event.trigger("ajaxStop")))}return v},getJSON:function(a,b,c){return n.get(a,b,c,"json")},getScript:function(a,b){return n.get(a,void 0,b,"script")}}),n.each(["get","post"],function(a,b){n[b]=function(a,c,d,e){return n.isFunction(c)&&(e=e||d,d=c,c=void 0),n.ajax({url:a,type:b,dataType:e,data:c,success:d})}}),n.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){n.fn[b]=function(a){return this.on(b,a)}}),n._evalUrl=function(a){return n.ajax({url:a,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})},n.fn.extend({wrapAll:function(a){if(n.isFunction(a))return this.each(function(b){n(this).wrapAll(a.call(this,b))});if(this[0]){var b=n(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&1===a.firstChild.nodeType)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){return this.each(n.isFunction(a)?function(b){n(this).wrapInner(a.call(this,b))}:function(){var b=n(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=n.isFunction(a);return this.each(function(c){n(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){n.nodeName(this,"body")||n(this).replaceWith(this.childNodes)}).end()}}),n.expr.filters.hidden=function(a){return a.offsetWidth<=0&&a.offsetHeight<=0||!l.reliableHiddenOffsets()&&"none"===(a.style&&a.style.display||n.css(a,"display"))},n.expr.filters.visible=function(a){return!n.expr.filters.hidden(a)};var Rc=/%20/g,Sc=/\[\]$/,Tc=/\r?\n/g,Uc=/^(?:submit|button|image|reset|file)$/i,Vc=/^(?:input|select|textarea|keygen)/i;function Wc(a,b,c,d){var e;if(n.isArray(b))n.each(b,function(b,e){c||Sc.test(a)?d(a,e):Wc(a+"["+("object"==typeof e?b:"")+"]",e,c,d)});else if(c||"object"!==n.type(b))d(a,b);else for(e in b)Wc(a+"["+e+"]",b[e],c,d)}n.param=function(a,b){var c,d=[],e=function(a,b){b=n.isFunction(b)?b():null==b?"":b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};if(void 0===b&&(b=n.ajaxSettings&&n.ajaxSettings.traditional),n.isArray(a)||a.jquery&&!n.isPlainObject(a))n.each(a,function(){e(this.name,this.value)});else for(c in a)Wc(c,a[c],b,e);return d.join("&").replace(Rc,"+")},n.fn.extend({serialize:function(){return n.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=n.prop(this,"elements");return a?n.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!n(this).is(":disabled")&&Vc.test(this.nodeName)&&!Uc.test(a)&&(this.checked||!X.test(a))}).map(function(a,b){var c=n(this).val();return null==c?null:n.isArray(c)?n.map(c,function(a){return{name:b.name,value:a.replace(Tc,"\r\n")}}):{name:b.name,value:c.replace(Tc,"\r\n")}}).get()}}),n.ajaxSettings.xhr=void 0!==a.ActiveXObject?function(){return!this.isLocal&&/^(get|post|head|put|delete|options)$/i.test(this.type)&&$c()||_c()}:$c;var Xc=0,Yc={},Zc=n.ajaxSettings.xhr();a.ActiveXObject&&n(a).on("unload",function(){for(var a in Yc)Yc[a](void 0,!0)}),l.cors=!!Zc&&"withCredentials"in Zc,Zc=l.ajax=!!Zc,Zc&&n.ajaxTransport(function(a){if(!a.crossDomain||l.cors){var b;return{send:function(c,d){var e,f=a.xhr(),g=++Xc;if(f.open(a.type,a.url,a.async,a.username,a.password),a.xhrFields)for(e in a.xhrFields)f[e]=a.xhrFields[e];a.mimeType&&f.overrideMimeType&&f.overrideMimeType(a.mimeType),a.crossDomain||c["X-Requested-With"]||(c["X-Requested-With"]="XMLHttpRequest");for(e in c)void 0!==c[e]&&f.setRequestHeader(e,c[e]+"");f.send(a.hasContent&&a.data||null),b=function(c,e){var h,i,j;if(b&&(e||4===f.readyState))if(delete Yc[g],b=void 0,f.onreadystatechange=n.noop,e)4!==f.readyState&&f.abort();else{j={},h=f.status,"string"==typeof f.responseText&&(j.text=f.responseText);try{i=f.statusText}catch(k){i=""}h||!a.isLocal||a.crossDomain?1223===h&&(h=204):h=j.text?200:404}j&&d(h,i,j,f.getAllResponseHeaders())},a.async?4===f.readyState?setTimeout(b):f.onreadystatechange=Yc[g]=b:b()},abort:function(){b&&b(void 0,!0)}}}});function $c(){try{return new a.XMLHttpRequest}catch(b){}}function _c(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}n.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(a){return n.globalEval(a),a}}}),n.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),n.ajaxTransport("script",function(a){if(a.crossDomain){var b,c=z.head||n("head")[0]||z.documentElement;return{send:function(d,e){b=z.createElement("script"),b.async=!0,a.scriptCharset&&(b.charset=a.scriptCharset),b.src=a.url,b.onload=b.onreadystatechange=function(a,c){(c||!b.readyState||/loaded|complete/.test(b.readyState))&&(b.onload=b.onreadystatechange=null,b.parentNode&&b.parentNode.removeChild(b),b=null,c||e(200,"success"))},c.insertBefore(b,c.firstChild)},abort:function(){b&&b.onload(void 0,!0)}}}});var ad=[],bd=/(=)\?(?=&|$)|\?\?/;n.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=ad.pop()||n.expando+"_"+wc++;return this[a]=!0,a}}),n.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(bd.test(b.url)?"url":"string"==typeof b.data&&!(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&bd.test(b.data)&&"data");return h||"jsonp"===b.dataTypes[0]?(e=b.jsonpCallback=n.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,h?b[h]=b[h].replace(bd,"$1"+e):b.jsonp!==!1&&(b.url+=(xc.test(b.url)?"&":"?")+b.jsonp+"="+e),b.converters["script json"]=function(){return g||n.error(e+" was not called"),g[0]},b.dataTypes[0]="json",f=a[e],a[e]=function(){g=arguments},d.always(function(){a[e]=f,b[e]&&(b.jsonpCallback=c.jsonpCallback,ad.push(e)),g&&n.isFunction(f)&&f(g[0]),g=f=void 0}),"script"):void 0}),n.parseHTML=function(a,b,c){if(!a||"string"!=typeof a)return null;"boolean"==typeof b&&(c=b,b=!1),b=b||z;var d=v.exec(a),e=!c&&[];return d?[b.createElement(d[1])]:(d=n.buildFragment([a],b,e),e&&e.length&&n(e).remove(),n.merge([],d.childNodes))};var cd=n.fn.load;n.fn.load=function(a,b,c){if("string"!=typeof a&&cd)return cd.apply(this,arguments);var d,e,f,g=this,h=a.indexOf(" ");return h>=0&&(d=a.slice(h,a.length),a=a.slice(0,h)),n.isFunction(b)?(c=b,b=void 0):b&&"object"==typeof b&&(f="POST"),g.length>0&&n.ajax({url:a,type:f,dataType:"html",data:b}).done(function(a){e=arguments,g.html(d?n("<div>").append(n.parseHTML(a)).find(d):a)}).complete(c&&function(a,b){g.each(c,e||[a.responseText,b,a])}),this},n.expr.filters.animated=function(a){return n.grep(n.timers,function(b){return a===b.elem}).length};var dd=a.document.documentElement;function ed(a){return n.isWindow(a)?a:9===a.nodeType?a.defaultView||a.parentWindow:!1}n.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=n.css(a,"position"),l=n(a),m={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=n.css(a,"top"),i=n.css(a,"left"),j=("absolute"===k||"fixed"===k)&&n.inArray("auto",[f,i])>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),n.isFunction(b)&&(b=b.call(a,c,h)),null!=b.top&&(m.top=b.top-h.top+g),null!=b.left&&(m.left=b.left-h.left+e),"using"in b?b.using.call(a,m):l.css(m)}},n.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){n.offset.setOffset(this,a,b)});var b,c,d={top:0,left:0},e=this[0],f=e&&e.ownerDocument;if(f)return b=f.documentElement,n.contains(b,e)?(typeof e.getBoundingClientRect!==L&&(d=e.getBoundingClientRect()),c=ed(f),{top:d.top+(c.pageYOffset||b.scrollTop)-(b.clientTop||0),left:d.left+(c.pageXOffset||b.scrollLeft)-(b.clientLeft||0)}):d},position:function(){if(this[0]){var a,b,c={top:0,left:0},d=this[0];return"fixed"===n.css(d,"position")?b=d.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),n.nodeName(a[0],"html")||(c=a.offset()),c.top+=n.css(a[0],"borderTopWidth",!0),c.left+=n.css(a[0],"borderLeftWidth",!0)),{top:b.top-c.top-n.css(d,"marginTop",!0),left:b.left-c.left-n.css(d,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||dd;while(a&&!n.nodeName(a,"html")&&"static"===n.css(a,"position"))a=a.offsetParent;return a||dd})}}),n.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,b){var c=/Y/.test(b);n.fn[a]=function(d){return W(this,function(a,d,e){var f=ed(a);return void 0===e?f?b in f?f[b]:f.document.documentElement[d]:a[d]:void(f?f.scrollTo(c?n(f).scrollLeft():e,c?e:n(f).scrollTop()):a[d]=e)},a,d,arguments.length,null)}}),n.each(["top","left"],function(a,b){n.cssHooks[b]=Mb(l.pixelPosition,function(a,c){return c?(c=Kb(a,b),Ib.test(c)?n(a).position()[b]+"px":c):void 0})}),n.each({Height:"height",Width:"width"},function(a,b){n.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){n.fn[d]=function(d,e){var f=arguments.length&&(c||"boolean"!=typeof d),g=c||(d===!0||e===!0?"margin":"border");return W(this,function(b,c,d){var e;return n.isWindow(b)?b.document.documentElement["client"+a]:9===b.nodeType?(e=b.documentElement,Math.max(b.body["scroll"+a],e["scroll"+a],b.body["offset"+a],e["offset"+a],e["client"+a])):void 0===d?n.css(b,c,g):n.style(b,c,d,g)},b,f?d:void 0,f,null)}})}),n.fn.size=function(){return this.length},n.fn.andSelf=n.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return n});var fd=a.jQuery,gd=a.$;return n.noConflict=function(b){return a.$===n&&(a.$=gd),b&&a.jQuery===n&&(a.jQuery=fd),n},typeof b===L&&(a.jQuery=a.$=n),n});
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/jquery/jquery-ui.min.js b/pluss-wap-page/src/main/resources/static/resources/js/third-party/jquery/jquery-ui.min.js
new file mode 100644
index 0000000..6afd615
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/third-party/jquery/jquery-ui.min.js
@@ -0,0 +1,12 @@
+/*! jQuery UI - v1.10.4 - 2014-01-17
+* http://jqueryui.com
+* Includes: jquery.ui.core.js, jquery.ui.widget.js, jquery.ui.mouse.js, jquery.ui.draggable.js, jquery.ui.droppable.js, jquery.ui.resizable.js, jquery.ui.selectable.js, jquery.ui.sortable.js, jquery.ui.effect.js, jquery.ui.accordion.js, jquery.ui.autocomplete.js, jquery.ui.button.js, jquery.ui.datepicker.js, jquery.ui.dialog.js, jquery.ui.effect-blind.js, jquery.ui.effect-bounce.js, jquery.ui.effect-clip.js, jquery.ui.effect-drop.js, jquery.ui.effect-explode.js, jquery.ui.effect-fade.js, jquery.ui.effect-fold.js, jquery.ui.effect-highlight.js, jquery.ui.effect-pulsate.js, jquery.ui.effect-scale.js, jquery.ui.effect-shake.js, jquery.ui.effect-slide.js, jquery.ui.effect-transfer.js, jquery.ui.menu.js, jquery.ui.position.js, jquery.ui.progressbar.js, jquery.ui.slider.js, jquery.ui.spinner.js, jquery.ui.tabs.js, jquery.ui.tooltip.js
+* Copyright 2014 jQuery Foundation and other contributors; Licensed MIT */
+(function(t,e){function i(e,i){var n,o,a,r=e.nodeName.toLowerCase();return"area"===r?(n=e.parentNode,o=n.name,e.href&&o&&"map"===n.nodeName.toLowerCase()?(a=t("img[usemap=#"+o+"]")[0],!!a&&s(a)):!1):(/input|select|textarea|button|object/.test(r)?!e.disabled:"a"===r?e.href||i:i)&&s(e)}function s(e){return t.expr.filters.visible(e)&&!t(e).parents().addBack().filter(function(){return"hidden"===t.css(this,"visibility")}).length}var n=0,o=/^ui-id-\d+$/;t.ui=t.ui||{},t.extend(t.ui,{version:"1.10.4",keyCode:{BACKSPACE:8,COMMA:188,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,LEFT:37,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SPACE:32,TAB:9,UP:38}}),t.fn.extend({focus:function(e){return function(i,s){return"number"==typeof i?this.each(function(){var e=this;setTimeout(function(){t(e).focus(),s&&s.call(e)},i)}):e.apply(this,arguments)}}(t.fn.focus),scrollParent:function(){var e;return e=t.ui.ie&&/(static|relative)/.test(this.css("position"))||/absolute/.test(this.css("position"))?this.parents().filter(function(){return/(relative|absolute|fixed)/.test(t.css(this,"position"))&&/(auto|scroll)/.test(t.css(this,"overflow")+t.css(this,"overflow-y")+t.css(this,"overflow-x"))}).eq(0):this.parents().filter(function(){return/(auto|scroll)/.test(t.css(this,"overflow")+t.css(this,"overflow-y")+t.css(this,"overflow-x"))}).eq(0),/fixed/.test(this.css("position"))||!e.length?t(document):e},zIndex:function(i){if(i!==e)return this.css("zIndex",i);if(this.length)for(var s,n,o=t(this[0]);o.length&&o[0]!==document;){if(s=o.css("position"),("absolute"===s||"relative"===s||"fixed"===s)&&(n=parseInt(o.css("zIndex"),10),!isNaN(n)&&0!==n))return n;o=o.parent()}return 0},uniqueId:function(){return this.each(function(){this.id||(this.id="ui-id-"+ ++n)})},removeUniqueId:function(){return this.each(function(){o.test(this.id)&&t(this).removeAttr("id")})}}),t.extend(t.expr[":"],{data:t.expr.createPseudo?t.expr.createPseudo(function(e){return function(i){return!!t.data(i,e)}}):function(e,i,s){return!!t.data(e,s[3])},focusable:function(e){return i(e,!isNaN(t.attr(e,"tabindex")))},tabbable:function(e){var s=t.attr(e,"tabindex"),n=isNaN(s);return(n||s>=0)&&i(e,!n)}}),t("<a>").outerWidth(1).jquery||t.each(["Width","Height"],function(i,s){function n(e,i,s,n){return t.each(o,function(){i-=parseFloat(t.css(e,"padding"+this))||0,s&&(i-=parseFloat(t.css(e,"border"+this+"Width"))||0),n&&(i-=parseFloat(t.css(e,"margin"+this))||0)}),i}var o="Width"===s?["Left","Right"]:["Top","Bottom"],a=s.toLowerCase(),r={innerWidth:t.fn.innerWidth,innerHeight:t.fn.innerHeight,outerWidth:t.fn.outerWidth,outerHeight:t.fn.outerHeight};t.fn["inner"+s]=function(i){return i===e?r["inner"+s].call(this):this.each(function(){t(this).css(a,n(this,i)+"px")})},t.fn["outer"+s]=function(e,i){return"number"!=typeof e?r["outer"+s].call(this,e):this.each(function(){t(this).css(a,n(this,e,!0,i)+"px")})}}),t.fn.addBack||(t.fn.addBack=function(t){return this.add(null==t?this.prevObject:this.prevObject.filter(t))}),t("<a>").data("a-b","a").removeData("a-b").data("a-b")&&(t.fn.removeData=function(e){return function(i){return arguments.length?e.call(this,t.camelCase(i)):e.call(this)}}(t.fn.removeData)),t.ui.ie=!!/msie [\w.]+/.exec(navigator.userAgent.toLowerCase()),t.support.selectstart="onselectstart"in document.createElement("div"),t.fn.extend({disableSelection:function(){return this.bind((t.support.selectstart?"selectstart":"mousedown")+".ui-disableSelection",function(t){t.preventDefault()})},enableSelection:function(){return this.unbind(".ui-disableSelection")}}),t.extend(t.ui,{plugin:{add:function(e,i,s){var n,o=t.ui[e].prototype;for(n in s)o.plugins[n]=o.plugins[n]||[],o.plugins[n].push([i,s[n]])},call:function(t,e,i){var s,n=t.plugins[e];if(n&&t.element[0].parentNode&&11!==t.element[0].parentNode.nodeType)for(s=0;n.length>s;s++)t.options[n[s][0]]&&n[s][1].apply(t.element,i)}},hasScroll:function(e,i){if("hidden"===t(e).css("overflow"))return!1;var s=i&&"left"===i?"scrollLeft":"scrollTop",n=!1;return e[s]>0?!0:(e[s]=1,n=e[s]>0,e[s]=0,n)}})})(jQuery),function(t,e){var i=0,s=Array.prototype.slice,n=t.cleanData;t.cleanData=function(e){for(var i,s=0;null!=(i=e[s]);s++)try{t(i).triggerHandler("remove")}catch(o){}n(e)},t.widget=function(i,s,n){var o,a,r,h,l={},c=i.split(".")[0];i=i.split(".")[1],o=c+"-"+i,n||(n=s,s=t.Widget),t.expr[":"][o.toLowerCase()]=function(e){return!!t.data(e,o)},t[c]=t[c]||{},a=t[c][i],r=t[c][i]=function(t,i){return this._createWidget?(arguments.length&&this._createWidget(t,i),e):new r(t,i)},t.extend(r,a,{version:n.version,_proto:t.extend({},n),_childConstructors:[]}),h=new s,h.options=t.widget.extend({},h.options),t.each(n,function(i,n){return t.isFunction(n)?(l[i]=function(){var t=function(){return s.prototype[i].apply(this,arguments)},e=function(t){return s.prototype[i].apply(this,t)};return function(){var i,s=this._super,o=this._superApply;return this._super=t,this._superApply=e,i=n.apply(this,arguments),this._super=s,this._superApply=o,i}}(),e):(l[i]=n,e)}),r.prototype=t.widget.extend(h,{widgetEventPrefix:a?h.widgetEventPrefix||i:i},l,{constructor:r,namespace:c,widgetName:i,widgetFullName:o}),a?(t.each(a._childConstructors,function(e,i){var s=i.prototype;t.widget(s.namespace+"."+s.widgetName,r,i._proto)}),delete a._childConstructors):s._childConstructors.push(r),t.widget.bridge(i,r)},t.widget.extend=function(i){for(var n,o,a=s.call(arguments,1),r=0,h=a.length;h>r;r++)for(n in a[r])o=a[r][n],a[r].hasOwnProperty(n)&&o!==e&&(i[n]=t.isPlainObject(o)?t.isPlainObject(i[n])?t.widget.extend({},i[n],o):t.widget.extend({},o):o);return i},t.widget.bridge=function(i,n){var o=n.prototype.widgetFullName||i;t.fn[i]=function(a){var r="string"==typeof a,h=s.call(arguments,1),l=this;return a=!r&&h.length?t.widget.extend.apply(null,[a].concat(h)):a,r?this.each(function(){var s,n=t.data(this,o);return n?t.isFunction(n[a])&&"_"!==a.charAt(0)?(s=n[a].apply(n,h),s!==n&&s!==e?(l=s&&s.jquery?l.pushStack(s.get()):s,!1):e):t.error("no such method '"+a+"' for "+i+" widget instance"):t.error("cannot call methods on "+i+" prior to initialization; "+"attempted to call method '"+a+"'")}):this.each(function(){var e=t.data(this,o);e?e.option(a||{})._init():t.data(this,o,new n(a,this))}),l}},t.Widget=function(){},t.Widget._childConstructors=[],t.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",defaultElement:"<div>",options:{disabled:!1,create:null},_createWidget:function(e,s){s=t(s||this.defaultElement||this)[0],this.element=t(s),this.uuid=i++,this.eventNamespace="."+this.widgetName+this.uuid,this.options=t.widget.extend({},this.options,this._getCreateOptions(),e),this.bindings=t(),this.hoverable=t(),this.focusable=t(),s!==this&&(t.data(s,this.widgetFullName,this),this._on(!0,this.element,{remove:function(t){t.target===s&&this.destroy()}}),this.document=t(s.style?s.ownerDocument:s.document||s),this.window=t(this.document[0].defaultView||this.document[0].parentWindow)),this._create(),this._trigger("create",null,this._getCreateEventData()),this._init()},_getCreateOptions:t.noop,_getCreateEventData:t.noop,_create:t.noop,_init:t.noop,destroy:function(){this._destroy(),this.element.unbind(this.eventNamespace).removeData(this.widgetName).removeData(this.widgetFullName).removeData(t.camelCase(this.widgetFullName)),this.widget().unbind(this.eventNamespace).removeAttr("aria-disabled").removeClass(this.widgetFullName+"-disabled "+"ui-state-disabled"),this.bindings.unbind(this.eventNamespace),this.hoverable.removeClass("ui-state-hover"),this.focusable.removeClass("ui-state-focus")},_destroy:t.noop,widget:function(){return this.element},option:function(i,s){var n,o,a,r=i;if(0===arguments.length)return t.widget.extend({},this.options);if("string"==typeof i)if(r={},n=i.split("."),i=n.shift(),n.length){for(o=r[i]=t.widget.extend({},this.options[i]),a=0;n.length-1>a;a++)o[n[a]]=o[n[a]]||{},o=o[n[a]];if(i=n.pop(),1===arguments.length)return o[i]===e?null:o[i];o[i]=s}else{if(1===arguments.length)return this.options[i]===e?null:this.options[i];r[i]=s}return this._setOptions(r),this},_setOptions:function(t){var e;for(e in t)this._setOption(e,t[e]);return this},_setOption:function(t,e){return this.options[t]=e,"disabled"===t&&(this.widget().toggleClass(this.widgetFullName+"-disabled ui-state-disabled",!!e).attr("aria-disabled",e),this.hoverable.removeClass("ui-state-hover"),this.focusable.removeClass("ui-state-focus")),this},enable:function(){return this._setOption("disabled",!1)},disable:function(){return this._setOption("disabled",!0)},_on:function(i,s,n){var o,a=this;"boolean"!=typeof i&&(n=s,s=i,i=!1),n?(s=o=t(s),this.bindings=this.bindings.add(s)):(n=s,s=this.element,o=this.widget()),t.each(n,function(n,r){function h(){return i||a.options.disabled!==!0&&!t(this).hasClass("ui-state-disabled")?("string"==typeof r?a[r]:r).apply(a,arguments):e}"string"!=typeof r&&(h.guid=r.guid=r.guid||h.guid||t.guid++);var l=n.match(/^(\w+)\s*(.*)$/),c=l[1]+a.eventNamespace,u=l[2];u?o.delegate(u,c,h):s.bind(c,h)})},_off:function(t,e){e=(e||"").split(" ").join(this.eventNamespace+" ")+this.eventNamespace,t.unbind(e).undelegate(e)},_delay:function(t,e){function i(){return("string"==typeof t?s[t]:t).apply(s,arguments)}var s=this;return setTimeout(i,e||0)},_hoverable:function(e){this.hoverable=this.hoverable.add(e),this._on(e,{mouseenter:function(e){t(e.currentTarget).addClass("ui-state-hover")},mouseleave:function(e){t(e.currentTarget).removeClass("ui-state-hover")}})},_focusable:function(e){this.focusable=this.focusable.add(e),this._on(e,{focusin:function(e){t(e.currentTarget).addClass("ui-state-focus")},focusout:function(e){t(e.currentTarget).removeClass("ui-state-focus")}})},_trigger:function(e,i,s){var n,o,a=this.options[e];if(s=s||{},i=t.Event(i),i.type=(e===this.widgetEventPrefix?e:this.widgetEventPrefix+e).toLowerCase(),i.target=this.element[0],o=i.originalEvent)for(n in o)n in i||(i[n]=o[n]);return this.element.trigger(i,s),!(t.isFunction(a)&&a.apply(this.element[0],[i].concat(s))===!1||i.isDefaultPrevented())}},t.each({show:"fadeIn",hide:"fadeOut"},function(e,i){t.Widget.prototype["_"+e]=function(s,n,o){"string"==typeof n&&(n={effect:n});var a,r=n?n===!0||"number"==typeof n?i:n.effect||i:e;n=n||{},"number"==typeof n&&(n={duration:n}),a=!t.isEmptyObject(n),n.complete=o,n.delay&&s.delay(n.delay),a&&t.effects&&t.effects.effect[r]?s[e](n):r!==e&&s[r]?s[r](n.duration,n.easing,o):s.queue(function(i){t(this)[e](),o&&o.call(s[0]),i()})}})}(jQuery),function(t){var e=!1;t(document).mouseup(function(){e=!1}),t.widget("ui.mouse",{version:"1.10.4",options:{cancel:"input,textarea,button,select,option",distance:1,delay:0},_mouseInit:function(){var e=this;this.element.bind("mousedown."+this.widgetName,function(t){return e._mouseDown(t)}).bind("click."+this.widgetName,function(i){return!0===t.data(i.target,e.widgetName+".preventClickEvent")?(t.removeData(i.target,e.widgetName+".preventClickEvent"),i.stopImmediatePropagation(),!1):undefined}),this.started=!1},_mouseDestroy:function(){this.element.unbind("."+this.widgetName),this._mouseMoveDelegate&&t(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate)},_mouseDown:function(i){if(!e){this._mouseStarted&&this._mouseUp(i),this._mouseDownEvent=i;var s=this,n=1===i.which,o="string"==typeof this.options.cancel&&i.target.nodeName?t(i.target).closest(this.options.cancel).length:!1;return n&&!o&&this._mouseCapture(i)?(this.mouseDelayMet=!this.options.delay,this.mouseDelayMet||(this._mouseDelayTimer=setTimeout(function(){s.mouseDelayMet=!0},this.options.delay)),this._mouseDistanceMet(i)&&this._mouseDelayMet(i)&&(this._mouseStarted=this._mouseStart(i)!==!1,!this._mouseStarted)?(i.preventDefault(),!0):(!0===t.data(i.target,this.widgetName+".preventClickEvent")&&t.removeData(i.target,this.widgetName+".preventClickEvent"),this._mouseMoveDelegate=function(t){return s._mouseMove(t)},this._mouseUpDelegate=function(t){return s._mouseUp(t)},t(document).bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate),i.preventDefault(),e=!0,!0)):!0}},_mouseMove:function(e){return t.ui.ie&&(!document.documentMode||9>document.documentMode)&&!e.button?this._mouseUp(e):this._mouseStarted?(this._mouseDrag(e),e.preventDefault()):(this._mouseDistanceMet(e)&&this._mouseDelayMet(e)&&(this._mouseStarted=this._mouseStart(this._mouseDownEvent,e)!==!1,this._mouseStarted?this._mouseDrag(e):this._mouseUp(e)),!this._mouseStarted)},_mouseUp:function(e){return t(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate),this._mouseStarted&&(this._mouseStarted=!1,e.target===this._mouseDownEvent.target&&t.data(e.target,this.widgetName+".preventClickEvent",!0),this._mouseStop(e)),!1},_mouseDistanceMet:function(t){return Math.max(Math.abs(this._mouseDownEvent.pageX-t.pageX),Math.abs(this._mouseDownEvent.pageY-t.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return!0}})}(jQuery),function(t){t.widget("ui.draggable",t.ui.mouse,{version:"1.10.4",widgetEventPrefix:"drag",options:{addClasses:!0,appendTo:"parent",axis:!1,connectToSortable:!1,containment:!1,cursor:"auto",cursorAt:!1,grid:!1,handle:!1,helper:"original",iframeFix:!1,opacity:!1,refreshPositions:!1,revert:!1,revertDuration:500,scope:"default",scroll:!0,scrollSensitivity:20,scrollSpeed:20,snap:!1,snapMode:"both",snapTolerance:20,stack:!1,zIndex:!1,drag:null,start:null,stop:null},_create:function(){"original"!==this.options.helper||/^(?:r|a|f)/.test(this.element.css("position"))||(this.element[0].style.position="relative"),this.options.addClasses&&this.element.addClass("ui-draggable"),this.options.disabled&&this.element.addClass("ui-draggable-disabled"),this._mouseInit()},_destroy:function(){this.element.removeClass("ui-draggable ui-draggable-dragging ui-draggable-disabled"),this._mouseDestroy()},_mouseCapture:function(e){var i=this.options;return this.helper||i.disabled||t(e.target).closest(".ui-resizable-handle").length>0?!1:(this.handle=this._getHandle(e),this.handle?(t(i.iframeFix===!0?"iframe":i.iframeFix).each(function(){t("<div class='ui-draggable-iframeFix' style='background: #fff;'></div>").css({width:this.offsetWidth+"px",height:this.offsetHeight+"px",position:"absolute",opacity:"0.001",zIndex:1e3}).css(t(this).offset()).appendTo("body")}),!0):!1)},_mouseStart:function(e){var i=this.options;return this.helper=this._createHelper(e),this.helper.addClass("ui-draggable-dragging"),this._cacheHelperProportions(),t.ui.ddmanager&&(t.ui.ddmanager.current=this),this._cacheMargins(),this.cssPosition=this.helper.css("position"),this.scrollParent=this.helper.scrollParent(),this.offsetParent=this.helper.offsetParent(),this.offsetParentCssPosition=this.offsetParent.css("position"),this.offset=this.positionAbs=this.element.offset(),this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left},this.offset.scroll=!1,t.extend(this.offset,{click:{left:e.pageX-this.offset.left,top:e.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()}),this.originalPosition=this.position=this._generatePosition(e),this.originalPageX=e.pageX,this.originalPageY=e.pageY,i.cursorAt&&this._adjustOffsetFromHelper(i.cursorAt),this._setContainment(),this._trigger("start",e)===!1?(this._clear(),!1):(this._cacheHelperProportions(),t.ui.ddmanager&&!i.dropBehaviour&&t.ui.ddmanager.prepareOffsets(this,e),this._mouseDrag(e,!0),t.ui.ddmanager&&t.ui.ddmanager.dragStart(this,e),!0)},_mouseDrag:function(e,i){if("fixed"===this.offsetParentCssPosition&&(this.offset.parent=this._getParentOffset()),this.position=this._generatePosition(e),this.positionAbs=this._convertPositionTo("absolute"),!i){var s=this._uiHash();if(this._trigger("drag",e,s)===!1)return this._mouseUp({}),!1;this.position=s.position}return this.options.axis&&"y"===this.options.axis||(this.helper[0].style.left=this.position.left+"px"),this.options.axis&&"x"===this.options.axis||(this.helper[0].style.top=this.position.top+"px"),t.ui.ddmanager&&t.ui.ddmanager.drag(this,e),!1},_mouseStop:function(e){var i=this,s=!1;return t.ui.ddmanager&&!this.options.dropBehaviour&&(s=t.ui.ddmanager.drop(this,e)),this.dropped&&(s=this.dropped,this.dropped=!1),"original"!==this.options.helper||t.contains(this.element[0].ownerDocument,this.element[0])?("invalid"===this.options.revert&&!s||"valid"===this.options.revert&&s||this.options.revert===!0||t.isFunction(this.options.revert)&&this.options.revert.call(this.element,s)?t(this.helper).animate(this.originalPosition,parseInt(this.options.revertDuration,10),function(){i._trigger("stop",e)!==!1&&i._clear()}):this._trigger("stop",e)!==!1&&this._clear(),!1):!1},_mouseUp:function(e){return t("div.ui-draggable-iframeFix").each(function(){this.parentNode.removeChild(this)}),t.ui.ddmanager&&t.ui.ddmanager.dragStop(this,e),t.ui.mouse.prototype._mouseUp.call(this,e)},cancel:function(){return this.helper.is(".ui-draggable-dragging")?this._mouseUp({}):this._clear(),this},_getHandle:function(e){return this.options.handle?!!t(e.target).closest(this.element.find(this.options.handle)).length:!0},_createHelper:function(e){var i=this.options,s=t.isFunction(i.helper)?t(i.helper.apply(this.element[0],[e])):"clone"===i.helper?this.element.clone().removeAttr("id"):this.element;return s.parents("body").length||s.appendTo("parent"===i.appendTo?this.element[0].parentNode:i.appendTo),s[0]===this.element[0]||/(fixed|absolute)/.test(s.css("position"))||s.css("position","absolute"),s},_adjustOffsetFromHelper:function(e){"string"==typeof e&&(e=e.split(" ")),t.isArray(e)&&(e={left:+e[0],top:+e[1]||0}),"left"in e&&(this.offset.click.left=e.left+this.margins.left),"right"in e&&(this.offset.click.left=this.helperProportions.width-e.right+this.margins.left),"top"in e&&(this.offset.click.top=e.top+this.margins.top),"bottom"in e&&(this.offset.click.top=this.helperProportions.height-e.bottom+this.margins.top)},_getParentOffset:function(){var e=this.offsetParent.offset();return"absolute"===this.cssPosition&&this.scrollParent[0]!==document&&t.contains(this.scrollParent[0],this.offsetParent[0])&&(e.left+=this.scrollParent.scrollLeft(),e.top+=this.scrollParent.scrollTop()),(this.offsetParent[0]===document.body||this.offsetParent[0].tagName&&"html"===this.offsetParent[0].tagName.toLowerCase()&&t.ui.ie)&&(e={top:0,left:0}),{top:e.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:e.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if("relative"===this.cssPosition){var t=this.element.position();return{top:t.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:t.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.element.css("marginLeft"),10)||0,top:parseInt(this.element.css("marginTop"),10)||0,right:parseInt(this.element.css("marginRight"),10)||0,bottom:parseInt(this.element.css("marginBottom"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var e,i,s,n=this.options;return n.containment?"window"===n.containment?(this.containment=[t(window).scrollLeft()-this.offset.relative.left-this.offset.parent.left,t(window).scrollTop()-this.offset.relative.top-this.offset.parent.top,t(window).scrollLeft()+t(window).width()-this.helperProportions.width-this.margins.left,t(window).scrollTop()+(t(window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top],undefined):"document"===n.containment?(this.containment=[0,0,t(document).width()-this.helperProportions.width-this.margins.left,(t(document).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top],undefined):n.containment.constructor===Array?(this.containment=n.containment,undefined):("parent"===n.containment&&(n.containment=this.helper[0].parentNode),i=t(n.containment),s=i[0],s&&(e="hidden"!==i.css("overflow"),this.containment=[(parseInt(i.css("borderLeftWidth"),10)||0)+(parseInt(i.css("paddingLeft"),10)||0),(parseInt(i.css("borderTopWidth"),10)||0)+(parseInt(i.css("paddingTop"),10)||0),(e?Math.max(s.scrollWidth,s.offsetWidth):s.offsetWidth)-(parseInt(i.css("borderRightWidth"),10)||0)-(parseInt(i.css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left-this.margins.right,(e?Math.max(s.scrollHeight,s.offsetHeight):s.offsetHeight)-(parseInt(i.css("borderBottomWidth"),10)||0)-(parseInt(i.css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top-this.margins.bottom],this.relative_container=i),undefined):(this.containment=null,undefined)},_convertPositionTo:function(e,i){i||(i=this.position);var s="absolute"===e?1:-1,n="absolute"!==this.cssPosition||this.scrollParent[0]!==document&&t.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent;return this.offset.scroll||(this.offset.scroll={top:n.scrollTop(),left:n.scrollLeft()}),{top:i.top+this.offset.relative.top*s+this.offset.parent.top*s-("fixed"===this.cssPosition?-this.scrollParent.scrollTop():this.offset.scroll.top)*s,left:i.left+this.offset.relative.left*s+this.offset.parent.left*s-("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():this.offset.scroll.left)*s}},_generatePosition:function(e){var i,s,n,o,a=this.options,r="absolute"!==this.cssPosition||this.scrollParent[0]!==document&&t.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,h=e.pageX,l=e.pageY;return this.offset.scroll||(this.offset.scroll={top:r.scrollTop(),left:r.scrollLeft()}),this.originalPosition&&(this.containment&&(this.relative_container?(s=this.relative_container.offset(),i=[this.containment[0]+s.left,this.containment[1]+s.top,this.containment[2]+s.left,this.containment[3]+s.top]):i=this.containment,e.pageX-this.offset.click.left<i[0]&&(h=i[0]+this.offset.click.left),e.pageY-this.offset.click.top<i[1]&&(l=i[1]+this.offset.click.top),e.pageX-this.offset.click.left>i[2]&&(h=i[2]+this.offset.click.left),e.pageY-this.offset.click.top>i[3]&&(l=i[3]+this.offset.click.top)),a.grid&&(n=a.grid[1]?this.originalPageY+Math.round((l-this.originalPageY)/a.grid[1])*a.grid[1]:this.originalPageY,l=i?n-this.offset.click.top>=i[1]||n-this.offset.click.top>i[3]?n:n-this.offset.click.top>=i[1]?n-a.grid[1]:n+a.grid[1]:n,o=a.grid[0]?this.originalPageX+Math.round((h-this.originalPageX)/a.grid[0])*a.grid[0]:this.originalPageX,h=i?o-this.offset.click.left>=i[0]||o-this.offset.click.left>i[2]?o:o-this.offset.click.left>=i[0]?o-a.grid[0]:o+a.grid[0]:o)),{top:l-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+("fixed"===this.cssPosition?-this.scrollParent.scrollTop():this.offset.scroll.top),left:h-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():this.offset.scroll.left)}},_clear:function(){this.helper.removeClass("ui-draggable-dragging"),this.helper[0]===this.element[0]||this.cancelHelperRemoval||this.helper.remove(),this.helper=null,this.cancelHelperRemoval=!1},_trigger:function(e,i,s){return s=s||this._uiHash(),t.ui.plugin.call(this,e,[i,s]),"drag"===e&&(this.positionAbs=this._convertPositionTo("absolute")),t.Widget.prototype._trigger.call(this,e,i,s)},plugins:{},_uiHash:function(){return{helper:this.helper,position:this.position,originalPosition:this.originalPosition,offset:this.positionAbs}}}),t.ui.plugin.add("draggable","connectToSortable",{start:function(e,i){var s=t(this).data("ui-draggable"),n=s.options,o=t.extend({},i,{item:s.element});s.sortables=[],t(n.connectToSortable).each(function(){var i=t.data(this,"ui-sortable");i&&!i.options.disabled&&(s.sortables.push({instance:i,shouldRevert:i.options.revert}),i.refreshPositions(),i._trigger("activate",e,o))})},stop:function(e,i){var s=t(this).data("ui-draggable"),n=t.extend({},i,{item:s.element});t.each(s.sortables,function(){this.instance.isOver?(this.instance.isOver=0,s.cancelHelperRemoval=!0,this.instance.cancelHelperRemoval=!1,this.shouldRevert&&(this.instance.options.revert=this.shouldRevert),this.instance._mouseStop(e),this.instance.options.helper=this.instance.options._helper,"original"===s.options.helper&&this.instance.currentItem.css({top:"auto",left:"auto"})):(this.instance.cancelHelperRemoval=!1,this.instance._trigger("deactivate",e,n))})},drag:function(e,i){var s=t(this).data("ui-draggable"),n=this;t.each(s.sortables,function(){var o=!1,a=this;this.instance.positionAbs=s.positionAbs,this.instance.helperProportions=s.helperProportions,this.instance.offset.click=s.offset.click,this.instance._intersectsWith(this.instance.containerCache)&&(o=!0,t.each(s.sortables,function(){return this.instance.positionAbs=s.positionAbs,this.instance.helperProportions=s.helperProportions,this.instance.offset.click=s.offset.click,this!==a&&this.instance._intersectsWith(this.instance.containerCache)&&t.contains(a.instance.element[0],this.instance.element[0])&&(o=!1),o})),o?(this.instance.isOver||(this.instance.isOver=1,this.instance.currentItem=t(n).clone().removeAttr("id").appendTo(this.instance.element).data("ui-sortable-item",!0),this.instance.options._helper=this.instance.options.helper,this.instance.options.helper=function(){return i.helper[0]},e.target=this.instance.currentItem[0],this.instance._mouseCapture(e,!0),this.instance._mouseStart(e,!0,!0),this.instance.offset.click.top=s.offset.click.top,this.instance.offset.click.left=s.offset.click.left,this.instance.offset.parent.left-=s.offset.parent.left-this.instance.offset.parent.left,this.instance.offset.parent.top-=s.offset.parent.top-this.instance.offset.parent.top,s._trigger("toSortable",e),s.dropped=this.instance.element,s.currentItem=s.element,this.instance.fromOutside=s),this.instance.currentItem&&this.instance._mouseDrag(e)):this.instance.isOver&&(this.instance.isOver=0,this.instance.cancelHelperRemoval=!0,this.instance.options.revert=!1,this.instance._trigger("out",e,this.instance._uiHash(this.instance)),this.instance._mouseStop(e,!0),this.instance.options.helper=this.instance.options._helper,this.instance.currentItem.remove(),this.instance.placeholder&&this.instance.placeholder.remove(),s._trigger("fromSortable",e),s.dropped=!1)})}}),t.ui.plugin.add("draggable","cursor",{start:function(){var e=t("body"),i=t(this).data("ui-draggable").options;e.css("cursor")&&(i._cursor=e.css("cursor")),e.css("cursor",i.cursor)},stop:function(){var e=t(this).data("ui-draggable").options;e._cursor&&t("body").css("cursor",e._cursor)}}),t.ui.plugin.add("draggable","opacity",{start:function(e,i){var s=t(i.helper),n=t(this).data("ui-draggable").options;s.css("opacity")&&(n._opacity=s.css("opacity")),s.css("opacity",n.opacity)},stop:function(e,i){var s=t(this).data("ui-draggable").options;s._opacity&&t(i.helper).css("opacity",s._opacity)}}),t.ui.plugin.add("draggable","scroll",{start:function(){var e=t(this).data("ui-draggable");e.scrollParent[0]!==document&&"HTML"!==e.scrollParent[0].tagName&&(e.overflowOffset=e.scrollParent.offset())},drag:function(e){var i=t(this).data("ui-draggable"),s=i.options,n=!1;i.scrollParent[0]!==document&&"HTML"!==i.scrollParent[0].tagName?(s.axis&&"x"===s.axis||(i.overflowOffset.top+i.scrollParent[0].offsetHeight-e.pageY<s.scrollSensitivity?i.scrollParent[0].scrollTop=n=i.scrollParent[0].scrollTop+s.scrollSpeed:e.pageY-i.overflowOffset.top<s.scrollSensitivity&&(i.scrollParent[0].scrollTop=n=i.scrollParent[0].scrollTop-s.scrollSpeed)),s.axis&&"y"===s.axis||(i.overflowOffset.left+i.scrollParent[0].offsetWidth-e.pageX<s.scrollSensitivity?i.scrollParent[0].scrollLeft=n=i.scrollParent[0].scrollLeft+s.scrollSpeed:e.pageX-i.overflowOffset.left<s.scrollSensitivity&&(i.scrollParent[0].scrollLeft=n=i.scrollParent[0].scrollLeft-s.scrollSpeed))):(s.axis&&"x"===s.axis||(e.pageY-t(document).scrollTop()<s.scrollSensitivity?n=t(document).scrollTop(t(document).scrollTop()-s.scrollSpeed):t(window).height()-(e.pageY-t(document).scrollTop())<s.scrollSensitivity&&(n=t(document).scrollTop(t(document).scrollTop()+s.scrollSpeed))),s.axis&&"y"===s.axis||(e.pageX-t(document).scrollLeft()<s.scrollSensitivity?n=t(document).scrollLeft(t(document).scrollLeft()-s.scrollSpeed):t(window).width()-(e.pageX-t(document).scrollLeft())<s.scrollSensitivity&&(n=t(document).scrollLeft(t(document).scrollLeft()+s.scrollSpeed)))),n!==!1&&t.ui.ddmanager&&!s.dropBehaviour&&t.ui.ddmanager.prepareOffsets(i,e)}}),t.ui.plugin.add("draggable","snap",{start:function(){var e=t(this).data("ui-draggable"),i=e.options;e.snapElements=[],t(i.snap.constructor!==String?i.snap.items||":data(ui-draggable)":i.snap).each(function(){var i=t(this),s=i.offset();this!==e.element[0]&&e.snapElements.push({item:this,width:i.outerWidth(),height:i.outerHeight(),top:s.top,left:s.left})})},drag:function(e,i){var s,n,o,a,r,h,l,c,u,d,p=t(this).data("ui-draggable"),f=p.options,g=f.snapTolerance,m=i.offset.left,v=m+p.helperProportions.width,_=i.offset.top,b=_+p.helperProportions.height;for(u=p.snapElements.length-1;u>=0;u--)r=p.snapElements[u].left,h=r+p.snapElements[u].width,l=p.snapElements[u].top,c=l+p.snapElements[u].height,r-g>v||m>h+g||l-g>b||_>c+g||!t.contains(p.snapElements[u].item.ownerDocument,p.snapElements[u].item)?(p.snapElements[u].snapping&&p.options.snap.release&&p.options.snap.release.call(p.element,e,t.extend(p._uiHash(),{snapItem:p.snapElements[u].item})),p.snapElements[u].snapping=!1):("inner"!==f.snapMode&&(s=g>=Math.abs(l-b),n=g>=Math.abs(c-_),o=g>=Math.abs(r-v),a=g>=Math.abs(h-m),s&&(i.position.top=p._convertPositionTo("relative",{top:l-p.helperProportions.height,left:0}).top-p.margins.top),n&&(i.position.top=p._convertPositionTo("relative",{top:c,left:0}).top-p.margins.top),o&&(i.position.left=p._convertPositionTo("relative",{top:0,left:r-p.helperProportions.width}).left-p.margins.left),a&&(i.position.left=p._convertPositionTo("relative",{top:0,left:h}).left-p.margins.left)),d=s||n||o||a,"outer"!==f.snapMode&&(s=g>=Math.abs(l-_),n=g>=Math.abs(c-b),o=g>=Math.abs(r-m),a=g>=Math.abs(h-v),s&&(i.position.top=p._convertPositionTo("relative",{top:l,left:0}).top-p.margins.top),n&&(i.position.top=p._convertPositionTo("relative",{top:c-p.helperProportions.height,left:0}).top-p.margins.top),o&&(i.position.left=p._convertPositionTo("relative",{top:0,left:r}).left-p.margins.left),a&&(i.position.left=p._convertPositionTo("relative",{top:0,left:h-p.helperProportions.width}).left-p.margins.left)),!p.snapElements[u].snapping&&(s||n||o||a||d)&&p.options.snap.snap&&p.options.snap.snap.call(p.element,e,t.extend(p._uiHash(),{snapItem:p.snapElements[u].item})),p.snapElements[u].snapping=s||n||o||a||d)}}),t.ui.plugin.add("draggable","stack",{start:function(){var e,i=this.data("ui-draggable").options,s=t.makeArray(t(i.stack)).sort(function(e,i){return(parseInt(t(e).css("zIndex"),10)||0)-(parseInt(t(i).css("zIndex"),10)||0)});s.length&&(e=parseInt(t(s[0]).css("zIndex"),10)||0,t(s).each(function(i){t(this).css("zIndex",e+i)}),this.css("zIndex",e+s.length))}}),t.ui.plugin.add("draggable","zIndex",{start:function(e,i){var s=t(i.helper),n=t(this).data("ui-draggable").options;s.css("zIndex")&&(n._zIndex=s.css("zIndex")),s.css("zIndex",n.zIndex)},stop:function(e,i){var s=t(this).data("ui-draggable").options;s._zIndex&&t(i.helper).css("zIndex",s._zIndex)}})}(jQuery),function(t){function e(t,e,i){return t>e&&e+i>t}t.widget("ui.droppable",{version:"1.10.4",widgetEventPrefix:"drop",options:{accept:"*",activeClass:!1,addClasses:!0,greedy:!1,hoverClass:!1,scope:"default",tolerance:"intersect",activate:null,deactivate:null,drop:null,out:null,over:null},_create:function(){var e,i=this.options,s=i.accept;
+this.isover=!1,this.isout=!0,this.accept=t.isFunction(s)?s:function(t){return t.is(s)},this.proportions=function(){return arguments.length?(e=arguments[0],undefined):e?e:e={width:this.element[0].offsetWidth,height:this.element[0].offsetHeight}},t.ui.ddmanager.droppables[i.scope]=t.ui.ddmanager.droppables[i.scope]||[],t.ui.ddmanager.droppables[i.scope].push(this),i.addClasses&&this.element.addClass("ui-droppable")},_destroy:function(){for(var e=0,i=t.ui.ddmanager.droppables[this.options.scope];i.length>e;e++)i[e]===this&&i.splice(e,1);this.element.removeClass("ui-droppable ui-droppable-disabled")},_setOption:function(e,i){"accept"===e&&(this.accept=t.isFunction(i)?i:function(t){return t.is(i)}),t.Widget.prototype._setOption.apply(this,arguments)},_activate:function(e){var i=t.ui.ddmanager.current;this.options.activeClass&&this.element.addClass(this.options.activeClass),i&&this._trigger("activate",e,this.ui(i))},_deactivate:function(e){var i=t.ui.ddmanager.current;this.options.activeClass&&this.element.removeClass(this.options.activeClass),i&&this._trigger("deactivate",e,this.ui(i))},_over:function(e){var i=t.ui.ddmanager.current;i&&(i.currentItem||i.element)[0]!==this.element[0]&&this.accept.call(this.element[0],i.currentItem||i.element)&&(this.options.hoverClass&&this.element.addClass(this.options.hoverClass),this._trigger("over",e,this.ui(i)))},_out:function(e){var i=t.ui.ddmanager.current;i&&(i.currentItem||i.element)[0]!==this.element[0]&&this.accept.call(this.element[0],i.currentItem||i.element)&&(this.options.hoverClass&&this.element.removeClass(this.options.hoverClass),this._trigger("out",e,this.ui(i)))},_drop:function(e,i){var s=i||t.ui.ddmanager.current,n=!1;return s&&(s.currentItem||s.element)[0]!==this.element[0]?(this.element.find(":data(ui-droppable)").not(".ui-draggable-dragging").each(function(){var e=t.data(this,"ui-droppable");return e.options.greedy&&!e.options.disabled&&e.options.scope===s.options.scope&&e.accept.call(e.element[0],s.currentItem||s.element)&&t.ui.intersect(s,t.extend(e,{offset:e.element.offset()}),e.options.tolerance)?(n=!0,!1):undefined}),n?!1:this.accept.call(this.element[0],s.currentItem||s.element)?(this.options.activeClass&&this.element.removeClass(this.options.activeClass),this.options.hoverClass&&this.element.removeClass(this.options.hoverClass),this._trigger("drop",e,this.ui(s)),this.element):!1):!1},ui:function(t){return{draggable:t.currentItem||t.element,helper:t.helper,position:t.position,offset:t.positionAbs}}}),t.ui.intersect=function(t,i,s){if(!i.offset)return!1;var n,o,a=(t.positionAbs||t.position.absolute).left,r=(t.positionAbs||t.position.absolute).top,h=a+t.helperProportions.width,l=r+t.helperProportions.height,c=i.offset.left,u=i.offset.top,d=c+i.proportions().width,p=u+i.proportions().height;switch(s){case"fit":return a>=c&&d>=h&&r>=u&&p>=l;case"intersect":return a+t.helperProportions.width/2>c&&d>h-t.helperProportions.width/2&&r+t.helperProportions.height/2>u&&p>l-t.helperProportions.height/2;case"pointer":return n=(t.positionAbs||t.position.absolute).left+(t.clickOffset||t.offset.click).left,o=(t.positionAbs||t.position.absolute).top+(t.clickOffset||t.offset.click).top,e(o,u,i.proportions().height)&&e(n,c,i.proportions().width);case"touch":return(r>=u&&p>=r||l>=u&&p>=l||u>r&&l>p)&&(a>=c&&d>=a||h>=c&&d>=h||c>a&&h>d);default:return!1}},t.ui.ddmanager={current:null,droppables:{"default":[]},prepareOffsets:function(e,i){var s,n,o=t.ui.ddmanager.droppables[e.options.scope]||[],a=i?i.type:null,r=(e.currentItem||e.element).find(":data(ui-droppable)").addBack();t:for(s=0;o.length>s;s++)if(!(o[s].options.disabled||e&&!o[s].accept.call(o[s].element[0],e.currentItem||e.element))){for(n=0;r.length>n;n++)if(r[n]===o[s].element[0]){o[s].proportions().height=0;continue t}o[s].visible="none"!==o[s].element.css("display"),o[s].visible&&("mousedown"===a&&o[s]._activate.call(o[s],i),o[s].offset=o[s].element.offset(),o[s].proportions({width:o[s].element[0].offsetWidth,height:o[s].element[0].offsetHeight}))}},drop:function(e,i){var s=!1;return t.each((t.ui.ddmanager.droppables[e.options.scope]||[]).slice(),function(){this.options&&(!this.options.disabled&&this.visible&&t.ui.intersect(e,this,this.options.tolerance)&&(s=this._drop.call(this,i)||s),!this.options.disabled&&this.visible&&this.accept.call(this.element[0],e.currentItem||e.element)&&(this.isout=!0,this.isover=!1,this._deactivate.call(this,i)))}),s},dragStart:function(e,i){e.element.parentsUntil("body").bind("scroll.droppable",function(){e.options.refreshPositions||t.ui.ddmanager.prepareOffsets(e,i)})},drag:function(e,i){e.options.refreshPositions&&t.ui.ddmanager.prepareOffsets(e,i),t.each(t.ui.ddmanager.droppables[e.options.scope]||[],function(){if(!this.options.disabled&&!this.greedyChild&&this.visible){var s,n,o,a=t.ui.intersect(e,this,this.options.tolerance),r=!a&&this.isover?"isout":a&&!this.isover?"isover":null;r&&(this.options.greedy&&(n=this.options.scope,o=this.element.parents(":data(ui-droppable)").filter(function(){return t.data(this,"ui-droppable").options.scope===n}),o.length&&(s=t.data(o[0],"ui-droppable"),s.greedyChild="isover"===r)),s&&"isover"===r&&(s.isover=!1,s.isout=!0,s._out.call(s,i)),this[r]=!0,this["isout"===r?"isover":"isout"]=!1,this["isover"===r?"_over":"_out"].call(this,i),s&&"isout"===r&&(s.isout=!1,s.isover=!0,s._over.call(s,i)))}})},dragStop:function(e,i){e.element.parentsUntil("body").unbind("scroll.droppable"),e.options.refreshPositions||t.ui.ddmanager.prepareOffsets(e,i)}}}(jQuery),function(t){function e(t){return parseInt(t,10)||0}function i(t){return!isNaN(parseInt(t,10))}t.widget("ui.resizable",t.ui.mouse,{version:"1.10.4",widgetEventPrefix:"resize",options:{alsoResize:!1,animate:!1,animateDuration:"slow",animateEasing:"swing",aspectRatio:!1,autoHide:!1,containment:!1,ghost:!1,grid:!1,handles:"e,s,se",helper:!1,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:90,resize:null,start:null,stop:null},_create:function(){var e,i,s,n,o,a=this,r=this.options;if(this.element.addClass("ui-resizable"),t.extend(this,{_aspectRatio:!!r.aspectRatio,aspectRatio:r.aspectRatio,originalElement:this.element,_proportionallyResizeElements:[],_helper:r.helper||r.ghost||r.animate?r.helper||"ui-resizable-helper":null}),this.element[0].nodeName.match(/canvas|textarea|input|select|button|img/i)&&(this.element.wrap(t("<div class='ui-wrapper' style='overflow: hidden;'></div>").css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),top:this.element.css("top"),left:this.element.css("left")})),this.element=this.element.parent().data("ui-resizable",this.element.data("ui-resizable")),this.elementIsWrapper=!0,this.element.css({marginLeft:this.originalElement.css("marginLeft"),marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom")}),this.originalElement.css({marginLeft:0,marginTop:0,marginRight:0,marginBottom:0}),this.originalResizeStyle=this.originalElement.css("resize"),this.originalElement.css("resize","none"),this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"})),this.originalElement.css({margin:this.originalElement.css("margin")}),this._proportionallyResize()),this.handles=r.handles||(t(".ui-resizable-handle",this.element).length?{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",nw:".ui-resizable-nw"}:"e,s,se"),this.handles.constructor===String)for("all"===this.handles&&(this.handles="n,e,s,w,se,sw,ne,nw"),e=this.handles.split(","),this.handles={},i=0;e.length>i;i++)s=t.trim(e[i]),o="ui-resizable-"+s,n=t("<div class='ui-resizable-handle "+o+"'></div>"),n.css({zIndex:r.zIndex}),"se"===s&&n.addClass("ui-icon ui-icon-gripsmall-diagonal-se"),this.handles[s]=".ui-resizable-"+s,this.element.append(n);this._renderAxis=function(e){var i,s,n,o;e=e||this.element;for(i in this.handles)this.handles[i].constructor===String&&(this.handles[i]=t(this.handles[i],this.element).show()),this.elementIsWrapper&&this.originalElement[0].nodeName.match(/textarea|input|select|button/i)&&(s=t(this.handles[i],this.element),o=/sw|ne|nw|se|n|s/.test(i)?s.outerHeight():s.outerWidth(),n=["padding",/ne|nw|n/.test(i)?"Top":/se|sw|s/.test(i)?"Bottom":/^e$/.test(i)?"Right":"Left"].join(""),e.css(n,o),this._proportionallyResize()),t(this.handles[i]).length},this._renderAxis(this.element),this._handles=t(".ui-resizable-handle",this.element).disableSelection(),this._handles.mouseover(function(){a.resizing||(this.className&&(n=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i)),a.axis=n&&n[1]?n[1]:"se")}),r.autoHide&&(this._handles.hide(),t(this.element).addClass("ui-resizable-autohide").mouseenter(function(){r.disabled||(t(this).removeClass("ui-resizable-autohide"),a._handles.show())}).mouseleave(function(){r.disabled||a.resizing||(t(this).addClass("ui-resizable-autohide"),a._handles.hide())})),this._mouseInit()},_destroy:function(){this._mouseDestroy();var e,i=function(e){t(e).removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing").removeData("resizable").removeData("ui-resizable").unbind(".resizable").find(".ui-resizable-handle").remove()};return this.elementIsWrapper&&(i(this.element),e=this.element,this.originalElement.css({position:e.css("position"),width:e.outerWidth(),height:e.outerHeight(),top:e.css("top"),left:e.css("left")}).insertAfter(e),e.remove()),this.originalElement.css("resize",this.originalResizeStyle),i(this.originalElement),this},_mouseCapture:function(e){var i,s,n=!1;for(i in this.handles)s=t(this.handles[i])[0],(s===e.target||t.contains(s,e.target))&&(n=!0);return!this.options.disabled&&n},_mouseStart:function(i){var s,n,o,a=this.options,r=this.element.position(),h=this.element;return this.resizing=!0,/absolute/.test(h.css("position"))?h.css({position:"absolute",top:h.css("top"),left:h.css("left")}):h.is(".ui-draggable")&&h.css({position:"absolute",top:r.top,left:r.left}),this._renderProxy(),s=e(this.helper.css("left")),n=e(this.helper.css("top")),a.containment&&(s+=t(a.containment).scrollLeft()||0,n+=t(a.containment).scrollTop()||0),this.offset=this.helper.offset(),this.position={left:s,top:n},this.size=this._helper?{width:this.helper.width(),height:this.helper.height()}:{width:h.width(),height:h.height()},this.originalSize=this._helper?{width:h.outerWidth(),height:h.outerHeight()}:{width:h.width(),height:h.height()},this.originalPosition={left:s,top:n},this.sizeDiff={width:h.outerWidth()-h.width(),height:h.outerHeight()-h.height()},this.originalMousePosition={left:i.pageX,top:i.pageY},this.aspectRatio="number"==typeof a.aspectRatio?a.aspectRatio:this.originalSize.width/this.originalSize.height||1,o=t(".ui-resizable-"+this.axis).css("cursor"),t("body").css("cursor","auto"===o?this.axis+"-resize":o),h.addClass("ui-resizable-resizing"),this._propagate("start",i),!0},_mouseDrag:function(e){var i,s=this.helper,n={},o=this.originalMousePosition,a=this.axis,r=this.position.top,h=this.position.left,l=this.size.width,c=this.size.height,u=e.pageX-o.left||0,d=e.pageY-o.top||0,p=this._change[a];return p?(i=p.apply(this,[e,u,d]),this._updateVirtualBoundaries(e.shiftKey),(this._aspectRatio||e.shiftKey)&&(i=this._updateRatio(i,e)),i=this._respectSize(i,e),this._updateCache(i),this._propagate("resize",e),this.position.top!==r&&(n.top=this.position.top+"px"),this.position.left!==h&&(n.left=this.position.left+"px"),this.size.width!==l&&(n.width=this.size.width+"px"),this.size.height!==c&&(n.height=this.size.height+"px"),s.css(n),!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize(),t.isEmptyObject(n)||this._trigger("resize",e,this.ui()),!1):!1},_mouseStop:function(e){this.resizing=!1;var i,s,n,o,a,r,h,l=this.options,c=this;return this._helper&&(i=this._proportionallyResizeElements,s=i.length&&/textarea/i.test(i[0].nodeName),n=s&&t.ui.hasScroll(i[0],"left")?0:c.sizeDiff.height,o=s?0:c.sizeDiff.width,a={width:c.helper.width()-o,height:c.helper.height()-n},r=parseInt(c.element.css("left"),10)+(c.position.left-c.originalPosition.left)||null,h=parseInt(c.element.css("top"),10)+(c.position.top-c.originalPosition.top)||null,l.animate||this.element.css(t.extend(a,{top:h,left:r})),c.helper.height(c.size.height),c.helper.width(c.size.width),this._helper&&!l.animate&&this._proportionallyResize()),t("body").css("cursor","auto"),this.element.removeClass("ui-resizable-resizing"),this._propagate("stop",e),this._helper&&this.helper.remove(),!1},_updateVirtualBoundaries:function(t){var e,s,n,o,a,r=this.options;a={minWidth:i(r.minWidth)?r.minWidth:0,maxWidth:i(r.maxWidth)?r.maxWidth:1/0,minHeight:i(r.minHeight)?r.minHeight:0,maxHeight:i(r.maxHeight)?r.maxHeight:1/0},(this._aspectRatio||t)&&(e=a.minHeight*this.aspectRatio,n=a.minWidth/this.aspectRatio,s=a.maxHeight*this.aspectRatio,o=a.maxWidth/this.aspectRatio,e>a.minWidth&&(a.minWidth=e),n>a.minHeight&&(a.minHeight=n),a.maxWidth>s&&(a.maxWidth=s),a.maxHeight>o&&(a.maxHeight=o)),this._vBoundaries=a},_updateCache:function(t){this.offset=this.helper.offset(),i(t.left)&&(this.position.left=t.left),i(t.top)&&(this.position.top=t.top),i(t.height)&&(this.size.height=t.height),i(t.width)&&(this.size.width=t.width)},_updateRatio:function(t){var e=this.position,s=this.size,n=this.axis;return i(t.height)?t.width=t.height*this.aspectRatio:i(t.width)&&(t.height=t.width/this.aspectRatio),"sw"===n&&(t.left=e.left+(s.width-t.width),t.top=null),"nw"===n&&(t.top=e.top+(s.height-t.height),t.left=e.left+(s.width-t.width)),t},_respectSize:function(t){var e=this._vBoundaries,s=this.axis,n=i(t.width)&&e.maxWidth&&e.maxWidth<t.width,o=i(t.height)&&e.maxHeight&&e.maxHeight<t.height,a=i(t.width)&&e.minWidth&&e.minWidth>t.width,r=i(t.height)&&e.minHeight&&e.minHeight>t.height,h=this.originalPosition.left+this.originalSize.width,l=this.position.top+this.size.height,c=/sw|nw|w/.test(s),u=/nw|ne|n/.test(s);return a&&(t.width=e.minWidth),r&&(t.height=e.minHeight),n&&(t.width=e.maxWidth),o&&(t.height=e.maxHeight),a&&c&&(t.left=h-e.minWidth),n&&c&&(t.left=h-e.maxWidth),r&&u&&(t.top=l-e.minHeight),o&&u&&(t.top=l-e.maxHeight),t.width||t.height||t.left||!t.top?t.width||t.height||t.top||!t.left||(t.left=null):t.top=null,t},_proportionallyResize:function(){if(this._proportionallyResizeElements.length){var t,e,i,s,n,o=this.helper||this.element;for(t=0;this._proportionallyResizeElements.length>t;t++){if(n=this._proportionallyResizeElements[t],!this.borderDif)for(this.borderDif=[],i=[n.css("borderTopWidth"),n.css("borderRightWidth"),n.css("borderBottomWidth"),n.css("borderLeftWidth")],s=[n.css("paddingTop"),n.css("paddingRight"),n.css("paddingBottom"),n.css("paddingLeft")],e=0;i.length>e;e++)this.borderDif[e]=(parseInt(i[e],10)||0)+(parseInt(s[e],10)||0);n.css({height:o.height()-this.borderDif[0]-this.borderDif[2]||0,width:o.width()-this.borderDif[1]-this.borderDif[3]||0})}}},_renderProxy:function(){var e=this.element,i=this.options;this.elementOffset=e.offset(),this._helper?(this.helper=this.helper||t("<div style='overflow:hidden;'></div>"),this.helper.addClass(this._helper).css({width:this.element.outerWidth()-1,height:this.element.outerHeight()-1,position:"absolute",left:this.elementOffset.left+"px",top:this.elementOffset.top+"px",zIndex:++i.zIndex}),this.helper.appendTo("body").disableSelection()):this.helper=this.element},_change:{e:function(t,e){return{width:this.originalSize.width+e}},w:function(t,e){var i=this.originalSize,s=this.originalPosition;return{left:s.left+e,width:i.width-e}},n:function(t,e,i){var s=this.originalSize,n=this.originalPosition;return{top:n.top+i,height:s.height-i}},s:function(t,e,i){return{height:this.originalSize.height+i}},se:function(e,i,s){return t.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[e,i,s]))},sw:function(e,i,s){return t.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[e,i,s]))},ne:function(e,i,s){return t.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[e,i,s]))},nw:function(e,i,s){return t.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[e,i,s]))}},_propagate:function(e,i){t.ui.plugin.call(this,e,[i,this.ui()]),"resize"!==e&&this._trigger(e,i,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}}),t.ui.plugin.add("resizable","animate",{stop:function(e){var i=t(this).data("ui-resizable"),s=i.options,n=i._proportionallyResizeElements,o=n.length&&/textarea/i.test(n[0].nodeName),a=o&&t.ui.hasScroll(n[0],"left")?0:i.sizeDiff.height,r=o?0:i.sizeDiff.width,h={width:i.size.width-r,height:i.size.height-a},l=parseInt(i.element.css("left"),10)+(i.position.left-i.originalPosition.left)||null,c=parseInt(i.element.css("top"),10)+(i.position.top-i.originalPosition.top)||null;i.element.animate(t.extend(h,c&&l?{top:c,left:l}:{}),{duration:s.animateDuration,easing:s.animateEasing,step:function(){var s={width:parseInt(i.element.css("width"),10),height:parseInt(i.element.css("height"),10),top:parseInt(i.element.css("top"),10),left:parseInt(i.element.css("left"),10)};n&&n.length&&t(n[0]).css({width:s.width,height:s.height}),i._updateCache(s),i._propagate("resize",e)}})}}),t.ui.plugin.add("resizable","containment",{start:function(){var i,s,n,o,a,r,h,l=t(this).data("ui-resizable"),c=l.options,u=l.element,d=c.containment,p=d instanceof t?d.get(0):/parent/.test(d)?u.parent().get(0):d;p&&(l.containerElement=t(p),/document/.test(d)||d===document?(l.containerOffset={left:0,top:0},l.containerPosition={left:0,top:0},l.parentData={element:t(document),left:0,top:0,width:t(document).width(),height:t(document).height()||document.body.parentNode.scrollHeight}):(i=t(p),s=[],t(["Top","Right","Left","Bottom"]).each(function(t,n){s[t]=e(i.css("padding"+n))}),l.containerOffset=i.offset(),l.containerPosition=i.position(),l.containerSize={height:i.innerHeight()-s[3],width:i.innerWidth()-s[1]},n=l.containerOffset,o=l.containerSize.height,a=l.containerSize.width,r=t.ui.hasScroll(p,"left")?p.scrollWidth:a,h=t.ui.hasScroll(p)?p.scrollHeight:o,l.parentData={element:p,left:n.left,top:n.top,width:r,height:h}))},resize:function(e){var i,s,n,o,a=t(this).data("ui-resizable"),r=a.options,h=a.containerOffset,l=a.position,c=a._aspectRatio||e.shiftKey,u={top:0,left:0},d=a.containerElement;d[0]!==document&&/static/.test(d.css("position"))&&(u=h),l.left<(a._helper?h.left:0)&&(a.size.width=a.size.width+(a._helper?a.position.left-h.left:a.position.left-u.left),c&&(a.size.height=a.size.width/a.aspectRatio),a.position.left=r.helper?h.left:0),l.top<(a._helper?h.top:0)&&(a.size.height=a.size.height+(a._helper?a.position.top-h.top:a.position.top),c&&(a.size.width=a.size.height*a.aspectRatio),a.position.top=a._helper?h.top:0),a.offset.left=a.parentData.left+a.position.left,a.offset.top=a.parentData.top+a.position.top,i=Math.abs((a._helper?a.offset.left-u.left:a.offset.left-u.left)+a.sizeDiff.width),s=Math.abs((a._helper?a.offset.top-u.top:a.offset.top-h.top)+a.sizeDiff.height),n=a.containerElement.get(0)===a.element.parent().get(0),o=/relative|absolute/.test(a.containerElement.css("position")),n&&o&&(i-=Math.abs(a.parentData.left)),i+a.size.width>=a.parentData.width&&(a.size.width=a.parentData.width-i,c&&(a.size.height=a.size.width/a.aspectRatio)),s+a.size.height>=a.parentData.height&&(a.size.height=a.parentData.height-s,c&&(a.size.width=a.size.height*a.aspectRatio))},stop:function(){var e=t(this).data("ui-resizable"),i=e.options,s=e.containerOffset,n=e.containerPosition,o=e.containerElement,a=t(e.helper),r=a.offset(),h=a.outerWidth()-e.sizeDiff.width,l=a.outerHeight()-e.sizeDiff.height;e._helper&&!i.animate&&/relative/.test(o.css("position"))&&t(this).css({left:r.left-n.left-s.left,width:h,height:l}),e._helper&&!i.animate&&/static/.test(o.css("position"))&&t(this).css({left:r.left-n.left-s.left,width:h,height:l})}}),t.ui.plugin.add("resizable","alsoResize",{start:function(){var e=t(this).data("ui-resizable"),i=e.options,s=function(e){t(e).each(function(){var e=t(this);e.data("ui-resizable-alsoresize",{width:parseInt(e.width(),10),height:parseInt(e.height(),10),left:parseInt(e.css("left"),10),top:parseInt(e.css("top"),10)})})};"object"!=typeof i.alsoResize||i.alsoResize.parentNode?s(i.alsoResize):i.alsoResize.length?(i.alsoResize=i.alsoResize[0],s(i.alsoResize)):t.each(i.alsoResize,function(t){s(t)})},resize:function(e,i){var s=t(this).data("ui-resizable"),n=s.options,o=s.originalSize,a=s.originalPosition,r={height:s.size.height-o.height||0,width:s.size.width-o.width||0,top:s.position.top-a.top||0,left:s.position.left-a.left||0},h=function(e,s){t(e).each(function(){var e=t(this),n=t(this).data("ui-resizable-alsoresize"),o={},a=s&&s.length?s:e.parents(i.originalElement[0]).length?["width","height"]:["width","height","top","left"];t.each(a,function(t,e){var i=(n[e]||0)+(r[e]||0);i&&i>=0&&(o[e]=i||null)}),e.css(o)})};"object"!=typeof n.alsoResize||n.alsoResize.nodeType?h(n.alsoResize):t.each(n.alsoResize,function(t,e){h(t,e)})},stop:function(){t(this).removeData("resizable-alsoresize")}}),t.ui.plugin.add("resizable","ghost",{start:function(){var e=t(this).data("ui-resizable"),i=e.options,s=e.size;e.ghost=e.originalElement.clone(),e.ghost.css({opacity:.25,display:"block",position:"relative",height:s.height,width:s.width,margin:0,left:0,top:0}).addClass("ui-resizable-ghost").addClass("string"==typeof i.ghost?i.ghost:""),e.ghost.appendTo(e.helper)},resize:function(){var e=t(this).data("ui-resizable");e.ghost&&e.ghost.css({position:"relative",height:e.size.height,width:e.size.width})},stop:function(){var e=t(this).data("ui-resizable");e.ghost&&e.helper&&e.helper.get(0).removeChild(e.ghost.get(0))}}),t.ui.plugin.add("resizable","grid",{resize:function(){var e=t(this).data("ui-resizable"),i=e.options,s=e.size,n=e.originalSize,o=e.originalPosition,a=e.axis,r="number"==typeof i.grid?[i.grid,i.grid]:i.grid,h=r[0]||1,l=r[1]||1,c=Math.round((s.width-n.width)/h)*h,u=Math.round((s.height-n.height)/l)*l,d=n.width+c,p=n.height+u,f=i.maxWidth&&d>i.maxWidth,g=i.maxHeight&&p>i.maxHeight,m=i.minWidth&&i.minWidth>d,v=i.minHeight&&i.minHeight>p;i.grid=r,m&&(d+=h),v&&(p+=l),f&&(d-=h),g&&(p-=l),/^(se|s|e)$/.test(a)?(e.size.width=d,e.size.height=p):/^(ne)$/.test(a)?(e.size.width=d,e.size.height=p,e.position.top=o.top-u):/^(sw)$/.test(a)?(e.size.width=d,e.size.height=p,e.position.left=o.left-c):(p-l>0?(e.size.height=p,e.position.top=o.top-u):(e.size.height=l,e.position.top=o.top+n.height-l),d-h>0?(e.size.width=d,e.position.left=o.left-c):(e.size.width=h,e.position.left=o.left+n.width-h))}})}(jQuery),function(t){t.widget("ui.selectable",t.ui.mouse,{version:"1.10.4",options:{appendTo:"body",autoRefresh:!0,distance:0,filter:"*",tolerance:"touch",selected:null,selecting:null,start:null,stop:null,unselected:null,unselecting:null},_create:function(){var e,i=this;this.element.addClass("ui-selectable"),this.dragged=!1,this.refresh=function(){e=t(i.options.filter,i.element[0]),e.addClass("ui-selectee"),e.each(function(){var e=t(this),i=e.offset();t.data(this,"selectable-item",{element:this,$element:e,left:i.left,top:i.top,right:i.left+e.outerWidth(),bottom:i.top+e.outerHeight(),startselected:!1,selected:e.hasClass("ui-selected"),selecting:e.hasClass("ui-selecting"),unselecting:e.hasClass("ui-unselecting")})})},this.refresh(),this.selectees=e.addClass("ui-selectee"),this._mouseInit(),this.helper=t("<div class='ui-selectable-helper'></div>")},_destroy:function(){this.selectees.removeClass("ui-selectee").removeData("selectable-item"),this.element.removeClass("ui-selectable ui-selectable-disabled"),this._mouseDestroy()},_mouseStart:function(e){var i=this,s=this.options;this.opos=[e.pageX,e.pageY],this.options.disabled||(this.selectees=t(s.filter,this.element[0]),this._trigger("start",e),t(s.appendTo).append(this.helper),this.helper.css({left:e.pageX,top:e.pageY,width:0,height:0}),s.autoRefresh&&this.refresh(),this.selectees.filter(".ui-selected").each(function(){var s=t.data(this,"selectable-item");s.startselected=!0,e.metaKey||e.ctrlKey||(s.$element.removeClass("ui-selected"),s.selected=!1,s.$element.addClass("ui-unselecting"),s.unselecting=!0,i._trigger("unselecting",e,{unselecting:s.element}))}),t(e.target).parents().addBack().each(function(){var s,n=t.data(this,"selectable-item");return n?(s=!e.metaKey&&!e.ctrlKey||!n.$element.hasClass("ui-selected"),n.$element.removeClass(s?"ui-unselecting":"ui-selected").addClass(s?"ui-selecting":"ui-unselecting"),n.unselecting=!s,n.selecting=s,n.selected=s,s?i._trigger("selecting",e,{selecting:n.element}):i._trigger("unselecting",e,{unselecting:n.element}),!1):undefined}))},_mouseDrag:function(e){if(this.dragged=!0,!this.options.disabled){var i,s=this,n=this.options,o=this.opos[0],a=this.opos[1],r=e.pageX,h=e.pageY;return o>r&&(i=r,r=o,o=i),a>h&&(i=h,h=a,a=i),this.helper.css({left:o,top:a,width:r-o,height:h-a}),this.selectees.each(function(){var i=t.data(this,"selectable-item"),l=!1;i&&i.element!==s.element[0]&&("touch"===n.tolerance?l=!(i.left>r||o>i.right||i.top>h||a>i.bottom):"fit"===n.tolerance&&(l=i.left>o&&r>i.right&&i.top>a&&h>i.bottom),l?(i.selected&&(i.$element.removeClass("ui-selected"),i.selected=!1),i.unselecting&&(i.$element.removeClass("ui-unselecting"),i.unselecting=!1),i.selecting||(i.$element.addClass("ui-selecting"),i.selecting=!0,s._trigger("selecting",e,{selecting:i.element}))):(i.selecting&&((e.metaKey||e.ctrlKey)&&i.startselected?(i.$element.removeClass("ui-selecting"),i.selecting=!1,i.$element.addClass("ui-selected"),i.selected=!0):(i.$element.removeClass("ui-selecting"),i.selecting=!1,i.startselected&&(i.$element.addClass("ui-unselecting"),i.unselecting=!0),s._trigger("unselecting",e,{unselecting:i.element}))),i.selected&&(e.metaKey||e.ctrlKey||i.startselected||(i.$element.removeClass("ui-selected"),i.selected=!1,i.$element.addClass("ui-unselecting"),i.unselecting=!0,s._trigger("unselecting",e,{unselecting:i.element})))))}),!1}},_mouseStop:function(e){var i=this;return this.dragged=!1,t(".ui-unselecting",this.element[0]).each(function(){var s=t.data(this,"selectable-item");s.$element.removeClass("ui-unselecting"),s.unselecting=!1,s.startselected=!1,i._trigger("unselected",e,{unselected:s.element})}),t(".ui-selecting",this.element[0]).each(function(){var s=t.data(this,"selectable-item");s.$element.removeClass("ui-selecting").addClass("ui-selected"),s.selecting=!1,s.selected=!0,s.startselected=!0,i._trigger("selected",e,{selected:s.element})}),this._trigger("stop",e),this.helper.remove(),!1}})}(jQuery),function(t){function e(t,e,i){return t>e&&e+i>t}function i(t){return/left|right/.test(t.css("float"))||/inline|table-cell/.test(t.css("display"))}t.widget("ui.sortable",t.ui.mouse,{version:"1.10.4",widgetEventPrefix:"sort",ready:!1,options:{appendTo:"parent",axis:!1,connectWith:!1,containment:!1,cursor:"auto",cursorAt:!1,dropOnEmpty:!0,forcePlaceholderSize:!1,forceHelperSize:!1,grid:!1,handle:!1,helper:"original",items:"> *",opacity:!1,placeholder:!1,revert:!1,scroll:!0,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1e3,activate:null,beforeStop:null,change:null,deactivate:null,out:null,over:null,receive:null,remove:null,sort:null,start:null,stop:null,update:null},_create:function(){var t=this.options;this.containerCache={},this.element.addClass("ui-sortable"),this.refresh(),this.floating=this.items.length?"x"===t.axis||i(this.items[0].item):!1,this.offset=this.element.offset(),this._mouseInit(),this.ready=!0},_destroy:function(){this.element.removeClass("ui-sortable ui-sortable-disabled"),this._mouseDestroy();for(var t=this.items.length-1;t>=0;t--)this.items[t].item.removeData(this.widgetName+"-item");return this},_setOption:function(e,i){"disabled"===e?(this.options[e]=i,this.widget().toggleClass("ui-sortable-disabled",!!i)):t.Widget.prototype._setOption.apply(this,arguments)},_mouseCapture:function(e,i){var s=null,n=!1,o=this;return this.reverting?!1:this.options.disabled||"static"===this.options.type?!1:(this._refreshItems(e),t(e.target).parents().each(function(){return t.data(this,o.widgetName+"-item")===o?(s=t(this),!1):undefined}),t.data(e.target,o.widgetName+"-item")===o&&(s=t(e.target)),s?!this.options.handle||i||(t(this.options.handle,s).find("*").addBack().each(function(){this===e.target&&(n=!0)}),n)?(this.currentItem=s,this._removeCurrentsFromItems(),!0):!1:!1)},_mouseStart:function(e,i,s){var n,o,a=this.options;if(this.currentContainer=this,this.refreshPositions(),this.helper=this._createHelper(e),this._cacheHelperProportions(),this._cacheMargins(),this.scrollParent=this.helper.scrollParent(),this.offset=this.currentItem.offset(),this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left},t.extend(this.offset,{click:{left:e.pageX-this.offset.left,top:e.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()}),this.helper.css("position","absolute"),this.cssPosition=this.helper.css("position"),this.originalPosition=this._generatePosition(e),this.originalPageX=e.pageX,this.originalPageY=e.pageY,a.cursorAt&&this._adjustOffsetFromHelper(a.cursorAt),this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]},this.helper[0]!==this.currentItem[0]&&this.currentItem.hide(),this._createPlaceholder(),a.containment&&this._setContainment(),a.cursor&&"auto"!==a.cursor&&(o=this.document.find("body"),this.storedCursor=o.css("cursor"),o.css("cursor",a.cursor),this.storedStylesheet=t("<style>*{ cursor: "+a.cursor+" !important; }</style>").appendTo(o)),a.opacity&&(this.helper.css("opacity")&&(this._storedOpacity=this.helper.css("opacity")),this.helper.css("opacity",a.opacity)),a.zIndex&&(this.helper.css("zIndex")&&(this._storedZIndex=this.helper.css("zIndex")),this.helper.css("zIndex",a.zIndex)),this.scrollParent[0]!==document&&"HTML"!==this.scrollParent[0].tagName&&(this.overflowOffset=this.scrollParent.offset()),this._trigger("start",e,this._uiHash()),this._preserveHelperProportions||this._cacheHelperProportions(),!s)for(n=this.containers.length-1;n>=0;n--)this.containers[n]._trigger("activate",e,this._uiHash(this));return t.ui.ddmanager&&(t.ui.ddmanager.current=this),t.ui.ddmanager&&!a.dropBehaviour&&t.ui.ddmanager.prepareOffsets(this,e),this.dragging=!0,this.helper.addClass("ui-sortable-helper"),this._mouseDrag(e),!0},_mouseDrag:function(e){var i,s,n,o,a=this.options,r=!1;for(this.position=this._generatePosition(e),this.positionAbs=this._convertPositionTo("absolute"),this.lastPositionAbs||(this.lastPositionAbs=this.positionAbs),this.options.scroll&&(this.scrollParent[0]!==document&&"HTML"!==this.scrollParent[0].tagName?(this.overflowOffset.top+this.scrollParent[0].offsetHeight-e.pageY<a.scrollSensitivity?this.scrollParent[0].scrollTop=r=this.scrollParent[0].scrollTop+a.scrollSpeed:e.pageY-this.overflowOffset.top<a.scrollSensitivity&&(this.scrollParent[0].scrollTop=r=this.scrollParent[0].scrollTop-a.scrollSpeed),this.overflowOffset.left+this.scrollParent[0].offsetWidth-e.pageX<a.scrollSensitivity?this.scrollParent[0].scrollLeft=r=this.scrollParent[0].scrollLeft+a.scrollSpeed:e.pageX-this.overflowOffset.left<a.scrollSensitivity&&(this.scrollParent[0].scrollLeft=r=this.scrollParent[0].scrollLeft-a.scrollSpeed)):(e.pageY-t(document).scrollTop()<a.scrollSensitivity?r=t(document).scrollTop(t(document).scrollTop()-a.scrollSpeed):t(window).height()-(e.pageY-t(document).scrollTop())<a.scrollSensitivity&&(r=t(document).scrollTop(t(document).scrollTop()+a.scrollSpeed)),e.pageX-t(document).scrollLeft()<a.scrollSensitivity?r=t(document).scrollLeft(t(document).scrollLeft()-a.scrollSpeed):t(window).width()-(e.pageX-t(document).scrollLeft())<a.scrollSensitivity&&(r=t(document).scrollLeft(t(document).scrollLeft()+a.scrollSpeed))),r!==!1&&t.ui.ddmanager&&!a.dropBehaviour&&t.ui.ddmanager.prepareOffsets(this,e)),this.positionAbs=this._convertPositionTo("absolute"),this.options.axis&&"y"===this.options.axis||(this.helper[0].style.left=this.position.left+"px"),this.options.axis&&"x"===this.options.axis||(this.helper[0].style.top=this.position.top+"px"),i=this.items.length-1;i>=0;i--)if(s=this.items[i],n=s.item[0],o=this._intersectsWithPointer(s),o&&s.instance===this.currentContainer&&n!==this.currentItem[0]&&this.placeholder[1===o?"next":"prev"]()[0]!==n&&!t.contains(this.placeholder[0],n)&&("semi-dynamic"===this.options.type?!t.contains(this.element[0],n):!0)){if(this.direction=1===o?"down":"up","pointer"!==this.options.tolerance&&!this._intersectsWithSides(s))break;
+this._rearrange(e,s),this._trigger("change",e,this._uiHash());break}return this._contactContainers(e),t.ui.ddmanager&&t.ui.ddmanager.drag(this,e),this._trigger("sort",e,this._uiHash()),this.lastPositionAbs=this.positionAbs,!1},_mouseStop:function(e,i){if(e){if(t.ui.ddmanager&&!this.options.dropBehaviour&&t.ui.ddmanager.drop(this,e),this.options.revert){var s=this,n=this.placeholder.offset(),o=this.options.axis,a={};o&&"x"!==o||(a.left=n.left-this.offset.parent.left-this.margins.left+(this.offsetParent[0]===document.body?0:this.offsetParent[0].scrollLeft)),o&&"y"!==o||(a.top=n.top-this.offset.parent.top-this.margins.top+(this.offsetParent[0]===document.body?0:this.offsetParent[0].scrollTop)),this.reverting=!0,t(this.helper).animate(a,parseInt(this.options.revert,10)||500,function(){s._clear(e)})}else this._clear(e,i);return!1}},cancel:function(){if(this.dragging){this._mouseUp({target:null}),"original"===this.options.helper?this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper"):this.currentItem.show();for(var e=this.containers.length-1;e>=0;e--)this.containers[e]._trigger("deactivate",null,this._uiHash(this)),this.containers[e].containerCache.over&&(this.containers[e]._trigger("out",null,this._uiHash(this)),this.containers[e].containerCache.over=0)}return this.placeholder&&(this.placeholder[0].parentNode&&this.placeholder[0].parentNode.removeChild(this.placeholder[0]),"original"!==this.options.helper&&this.helper&&this.helper[0].parentNode&&this.helper.remove(),t.extend(this,{helper:null,dragging:!1,reverting:!1,_noFinalSort:null}),this.domPosition.prev?t(this.domPosition.prev).after(this.currentItem):t(this.domPosition.parent).prepend(this.currentItem)),this},serialize:function(e){var i=this._getItemsAsjQuery(e&&e.connected),s=[];return e=e||{},t(i).each(function(){var i=(t(e.item||this).attr(e.attribute||"id")||"").match(e.expression||/(.+)[\-=_](.+)/);i&&s.push((e.key||i[1]+"[]")+"="+(e.key&&e.expression?i[1]:i[2]))}),!s.length&&e.key&&s.push(e.key+"="),s.join("&")},toArray:function(e){var i=this._getItemsAsjQuery(e&&e.connected),s=[];return e=e||{},i.each(function(){s.push(t(e.item||this).attr(e.attribute||"id")||"")}),s},_intersectsWith:function(t){var e=this.positionAbs.left,i=e+this.helperProportions.width,s=this.positionAbs.top,n=s+this.helperProportions.height,o=t.left,a=o+t.width,r=t.top,h=r+t.height,l=this.offset.click.top,c=this.offset.click.left,u="x"===this.options.axis||s+l>r&&h>s+l,d="y"===this.options.axis||e+c>o&&a>e+c,p=u&&d;return"pointer"===this.options.tolerance||this.options.forcePointerForContainers||"pointer"!==this.options.tolerance&&this.helperProportions[this.floating?"width":"height"]>t[this.floating?"width":"height"]?p:e+this.helperProportions.width/2>o&&a>i-this.helperProportions.width/2&&s+this.helperProportions.height/2>r&&h>n-this.helperProportions.height/2},_intersectsWithPointer:function(t){var i="x"===this.options.axis||e(this.positionAbs.top+this.offset.click.top,t.top,t.height),s="y"===this.options.axis||e(this.positionAbs.left+this.offset.click.left,t.left,t.width),n=i&&s,o=this._getDragVerticalDirection(),a=this._getDragHorizontalDirection();return n?this.floating?a&&"right"===a||"down"===o?2:1:o&&("down"===o?2:1):!1},_intersectsWithSides:function(t){var i=e(this.positionAbs.top+this.offset.click.top,t.top+t.height/2,t.height),s=e(this.positionAbs.left+this.offset.click.left,t.left+t.width/2,t.width),n=this._getDragVerticalDirection(),o=this._getDragHorizontalDirection();return this.floating&&o?"right"===o&&s||"left"===o&&!s:n&&("down"===n&&i||"up"===n&&!i)},_getDragVerticalDirection:function(){var t=this.positionAbs.top-this.lastPositionAbs.top;return 0!==t&&(t>0?"down":"up")},_getDragHorizontalDirection:function(){var t=this.positionAbs.left-this.lastPositionAbs.left;return 0!==t&&(t>0?"right":"left")},refresh:function(t){return this._refreshItems(t),this.refreshPositions(),this},_connectWith:function(){var t=this.options;return t.connectWith.constructor===String?[t.connectWith]:t.connectWith},_getItemsAsjQuery:function(e){function i(){r.push(this)}var s,n,o,a,r=[],h=[],l=this._connectWith();if(l&&e)for(s=l.length-1;s>=0;s--)for(o=t(l[s]),n=o.length-1;n>=0;n--)a=t.data(o[n],this.widgetFullName),a&&a!==this&&!a.options.disabled&&h.push([t.isFunction(a.options.items)?a.options.items.call(a.element):t(a.options.items,a.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),a]);for(h.push([t.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):t(this.options.items,this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),this]),s=h.length-1;s>=0;s--)h[s][0].each(i);return t(r)},_removeCurrentsFromItems:function(){var e=this.currentItem.find(":data("+this.widgetName+"-item)");this.items=t.grep(this.items,function(t){for(var i=0;e.length>i;i++)if(e[i]===t.item[0])return!1;return!0})},_refreshItems:function(e){this.items=[],this.containers=[this];var i,s,n,o,a,r,h,l,c=this.items,u=[[t.isFunction(this.options.items)?this.options.items.call(this.element[0],e,{item:this.currentItem}):t(this.options.items,this.element),this]],d=this._connectWith();if(d&&this.ready)for(i=d.length-1;i>=0;i--)for(n=t(d[i]),s=n.length-1;s>=0;s--)o=t.data(n[s],this.widgetFullName),o&&o!==this&&!o.options.disabled&&(u.push([t.isFunction(o.options.items)?o.options.items.call(o.element[0],e,{item:this.currentItem}):t(o.options.items,o.element),o]),this.containers.push(o));for(i=u.length-1;i>=0;i--)for(a=u[i][1],r=u[i][0],s=0,l=r.length;l>s;s++)h=t(r[s]),h.data(this.widgetName+"-item",a),c.push({item:h,instance:a,width:0,height:0,left:0,top:0})},refreshPositions:function(e){this.offsetParent&&this.helper&&(this.offset.parent=this._getParentOffset());var i,s,n,o;for(i=this.items.length-1;i>=0;i--)s=this.items[i],s.instance!==this.currentContainer&&this.currentContainer&&s.item[0]!==this.currentItem[0]||(n=this.options.toleranceElement?t(this.options.toleranceElement,s.item):s.item,e||(s.width=n.outerWidth(),s.height=n.outerHeight()),o=n.offset(),s.left=o.left,s.top=o.top);if(this.options.custom&&this.options.custom.refreshContainers)this.options.custom.refreshContainers.call(this);else for(i=this.containers.length-1;i>=0;i--)o=this.containers[i].element.offset(),this.containers[i].containerCache.left=o.left,this.containers[i].containerCache.top=o.top,this.containers[i].containerCache.width=this.containers[i].element.outerWidth(),this.containers[i].containerCache.height=this.containers[i].element.outerHeight();return this},_createPlaceholder:function(e){e=e||this;var i,s=e.options;s.placeholder&&s.placeholder.constructor!==String||(i=s.placeholder,s.placeholder={element:function(){var s=e.currentItem[0].nodeName.toLowerCase(),n=t("<"+s+">",e.document[0]).addClass(i||e.currentItem[0].className+" ui-sortable-placeholder").removeClass("ui-sortable-helper");return"tr"===s?e.currentItem.children().each(function(){t("<td>&#160;</td>",e.document[0]).attr("colspan",t(this).attr("colspan")||1).appendTo(n)}):"img"===s&&n.attr("src",e.currentItem.attr("src")),i||n.css("visibility","hidden"),n},update:function(t,n){(!i||s.forcePlaceholderSize)&&(n.height()||n.height(e.currentItem.innerHeight()-parseInt(e.currentItem.css("paddingTop")||0,10)-parseInt(e.currentItem.css("paddingBottom")||0,10)),n.width()||n.width(e.currentItem.innerWidth()-parseInt(e.currentItem.css("paddingLeft")||0,10)-parseInt(e.currentItem.css("paddingRight")||0,10)))}}),e.placeholder=t(s.placeholder.element.call(e.element,e.currentItem)),e.currentItem.after(e.placeholder),s.placeholder.update(e,e.placeholder)},_contactContainers:function(s){var n,o,a,r,h,l,c,u,d,p,f=null,g=null;for(n=this.containers.length-1;n>=0;n--)if(!t.contains(this.currentItem[0],this.containers[n].element[0]))if(this._intersectsWith(this.containers[n].containerCache)){if(f&&t.contains(this.containers[n].element[0],f.element[0]))continue;f=this.containers[n],g=n}else this.containers[n].containerCache.over&&(this.containers[n]._trigger("out",s,this._uiHash(this)),this.containers[n].containerCache.over=0);if(f)if(1===this.containers.length)this.containers[g].containerCache.over||(this.containers[g]._trigger("over",s,this._uiHash(this)),this.containers[g].containerCache.over=1);else{for(a=1e4,r=null,p=f.floating||i(this.currentItem),h=p?"left":"top",l=p?"width":"height",c=this.positionAbs[h]+this.offset.click[h],o=this.items.length-1;o>=0;o--)t.contains(this.containers[g].element[0],this.items[o].item[0])&&this.items[o].item[0]!==this.currentItem[0]&&(!p||e(this.positionAbs.top+this.offset.click.top,this.items[o].top,this.items[o].height))&&(u=this.items[o].item.offset()[h],d=!1,Math.abs(u-c)>Math.abs(u+this.items[o][l]-c)&&(d=!0,u+=this.items[o][l]),a>Math.abs(u-c)&&(a=Math.abs(u-c),r=this.items[o],this.direction=d?"up":"down"));if(!r&&!this.options.dropOnEmpty)return;if(this.currentContainer===this.containers[g])return;r?this._rearrange(s,r,null,!0):this._rearrange(s,null,this.containers[g].element,!0),this._trigger("change",s,this._uiHash()),this.containers[g]._trigger("change",s,this._uiHash(this)),this.currentContainer=this.containers[g],this.options.placeholder.update(this.currentContainer,this.placeholder),this.containers[g]._trigger("over",s,this._uiHash(this)),this.containers[g].containerCache.over=1}},_createHelper:function(e){var i=this.options,s=t.isFunction(i.helper)?t(i.helper.apply(this.element[0],[e,this.currentItem])):"clone"===i.helper?this.currentItem.clone():this.currentItem;return s.parents("body").length||t("parent"!==i.appendTo?i.appendTo:this.currentItem[0].parentNode)[0].appendChild(s[0]),s[0]===this.currentItem[0]&&(this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")}),(!s[0].style.width||i.forceHelperSize)&&s.width(this.currentItem.width()),(!s[0].style.height||i.forceHelperSize)&&s.height(this.currentItem.height()),s},_adjustOffsetFromHelper:function(e){"string"==typeof e&&(e=e.split(" ")),t.isArray(e)&&(e={left:+e[0],top:+e[1]||0}),"left"in e&&(this.offset.click.left=e.left+this.margins.left),"right"in e&&(this.offset.click.left=this.helperProportions.width-e.right+this.margins.left),"top"in e&&(this.offset.click.top=e.top+this.margins.top),"bottom"in e&&(this.offset.click.top=this.helperProportions.height-e.bottom+this.margins.top)},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var e=this.offsetParent.offset();return"absolute"===this.cssPosition&&this.scrollParent[0]!==document&&t.contains(this.scrollParent[0],this.offsetParent[0])&&(e.left+=this.scrollParent.scrollLeft(),e.top+=this.scrollParent.scrollTop()),(this.offsetParent[0]===document.body||this.offsetParent[0].tagName&&"html"===this.offsetParent[0].tagName.toLowerCase()&&t.ui.ie)&&(e={top:0,left:0}),{top:e.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:e.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if("relative"===this.cssPosition){var t=this.currentItem.position();return{top:t.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:t.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.currentItem.css("marginLeft"),10)||0,top:parseInt(this.currentItem.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var e,i,s,n=this.options;"parent"===n.containment&&(n.containment=this.helper[0].parentNode),("document"===n.containment||"window"===n.containment)&&(this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,t("document"===n.containment?document:window).width()-this.helperProportions.width-this.margins.left,(t("document"===n.containment?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top]),/^(document|window|parent)$/.test(n.containment)||(e=t(n.containment)[0],i=t(n.containment).offset(),s="hidden"!==t(e).css("overflow"),this.containment=[i.left+(parseInt(t(e).css("borderLeftWidth"),10)||0)+(parseInt(t(e).css("paddingLeft"),10)||0)-this.margins.left,i.top+(parseInt(t(e).css("borderTopWidth"),10)||0)+(parseInt(t(e).css("paddingTop"),10)||0)-this.margins.top,i.left+(s?Math.max(e.scrollWidth,e.offsetWidth):e.offsetWidth)-(parseInt(t(e).css("borderLeftWidth"),10)||0)-(parseInt(t(e).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,i.top+(s?Math.max(e.scrollHeight,e.offsetHeight):e.offsetHeight)-(parseInt(t(e).css("borderTopWidth"),10)||0)-(parseInt(t(e).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top])},_convertPositionTo:function(e,i){i||(i=this.position);var s="absolute"===e?1:-1,n="absolute"!==this.cssPosition||this.scrollParent[0]!==document&&t.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,o=/(html|body)/i.test(n[0].tagName);return{top:i.top+this.offset.relative.top*s+this.offset.parent.top*s-("fixed"===this.cssPosition?-this.scrollParent.scrollTop():o?0:n.scrollTop())*s,left:i.left+this.offset.relative.left*s+this.offset.parent.left*s-("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():o?0:n.scrollLeft())*s}},_generatePosition:function(e){var i,s,n=this.options,o=e.pageX,a=e.pageY,r="absolute"!==this.cssPosition||this.scrollParent[0]!==document&&t.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,h=/(html|body)/i.test(r[0].tagName);return"relative"!==this.cssPosition||this.scrollParent[0]!==document&&this.scrollParent[0]!==this.offsetParent[0]||(this.offset.relative=this._getRelativeOffset()),this.originalPosition&&(this.containment&&(e.pageX-this.offset.click.left<this.containment[0]&&(o=this.containment[0]+this.offset.click.left),e.pageY-this.offset.click.top<this.containment[1]&&(a=this.containment[1]+this.offset.click.top),e.pageX-this.offset.click.left>this.containment[2]&&(o=this.containment[2]+this.offset.click.left),e.pageY-this.offset.click.top>this.containment[3]&&(a=this.containment[3]+this.offset.click.top)),n.grid&&(i=this.originalPageY+Math.round((a-this.originalPageY)/n.grid[1])*n.grid[1],a=this.containment?i-this.offset.click.top>=this.containment[1]&&i-this.offset.click.top<=this.containment[3]?i:i-this.offset.click.top>=this.containment[1]?i-n.grid[1]:i+n.grid[1]:i,s=this.originalPageX+Math.round((o-this.originalPageX)/n.grid[0])*n.grid[0],o=this.containment?s-this.offset.click.left>=this.containment[0]&&s-this.offset.click.left<=this.containment[2]?s:s-this.offset.click.left>=this.containment[0]?s-n.grid[0]:s+n.grid[0]:s)),{top:a-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+("fixed"===this.cssPosition?-this.scrollParent.scrollTop():h?0:r.scrollTop()),left:o-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():h?0:r.scrollLeft())}},_rearrange:function(t,e,i,s){i?i[0].appendChild(this.placeholder[0]):e.item[0].parentNode.insertBefore(this.placeholder[0],"down"===this.direction?e.item[0]:e.item[0].nextSibling),this.counter=this.counter?++this.counter:1;var n=this.counter;this._delay(function(){n===this.counter&&this.refreshPositions(!s)})},_clear:function(t,e){function i(t,e,i){return function(s){i._trigger(t,s,e._uiHash(e))}}this.reverting=!1;var s,n=[];if(!this._noFinalSort&&this.currentItem.parent().length&&this.placeholder.before(this.currentItem),this._noFinalSort=null,this.helper[0]===this.currentItem[0]){for(s in this._storedCSS)("auto"===this._storedCSS[s]||"static"===this._storedCSS[s])&&(this._storedCSS[s]="");this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper")}else this.currentItem.show();for(this.fromOutside&&!e&&n.push(function(t){this._trigger("receive",t,this._uiHash(this.fromOutside))}),!this.fromOutside&&this.domPosition.prev===this.currentItem.prev().not(".ui-sortable-helper")[0]&&this.domPosition.parent===this.currentItem.parent()[0]||e||n.push(function(t){this._trigger("update",t,this._uiHash())}),this!==this.currentContainer&&(e||(n.push(function(t){this._trigger("remove",t,this._uiHash())}),n.push(function(t){return function(e){t._trigger("receive",e,this._uiHash(this))}}.call(this,this.currentContainer)),n.push(function(t){return function(e){t._trigger("update",e,this._uiHash(this))}}.call(this,this.currentContainer)))),s=this.containers.length-1;s>=0;s--)e||n.push(i("deactivate",this,this.containers[s])),this.containers[s].containerCache.over&&(n.push(i("out",this,this.containers[s])),this.containers[s].containerCache.over=0);if(this.storedCursor&&(this.document.find("body").css("cursor",this.storedCursor),this.storedStylesheet.remove()),this._storedOpacity&&this.helper.css("opacity",this._storedOpacity),this._storedZIndex&&this.helper.css("zIndex","auto"===this._storedZIndex?"":this._storedZIndex),this.dragging=!1,this.cancelHelperRemoval){if(!e){for(this._trigger("beforeStop",t,this._uiHash()),s=0;n.length>s;s++)n[s].call(this,t);this._trigger("stop",t,this._uiHash())}return this.fromOutside=!1,!1}if(e||this._trigger("beforeStop",t,this._uiHash()),this.placeholder[0].parentNode.removeChild(this.placeholder[0]),this.helper[0]!==this.currentItem[0]&&this.helper.remove(),this.helper=null,!e){for(s=0;n.length>s;s++)n[s].call(this,t);this._trigger("stop",t,this._uiHash())}return this.fromOutside=!1,!0},_trigger:function(){t.Widget.prototype._trigger.apply(this,arguments)===!1&&this.cancel()},_uiHash:function(e){var i=e||this;return{helper:i.helper,placeholder:i.placeholder||t([]),position:i.position,originalPosition:i.originalPosition,offset:i.positionAbs,item:i.currentItem,sender:e?e.element:null}}})}(jQuery),function(t,e){var i="ui-effects-";t.effects={effect:{}},function(t,e){function i(t,e,i){var s=u[e.type]||{};return null==t?i||!e.def?null:e.def:(t=s.floor?~~t:parseFloat(t),isNaN(t)?e.def:s.mod?(t+s.mod)%s.mod:0>t?0:t>s.max?s.max:t)}function s(i){var s=l(),n=s._rgba=[];return i=i.toLowerCase(),f(h,function(t,o){var a,r=o.re.exec(i),h=r&&o.parse(r),l=o.space||"rgba";return h?(a=s[l](h),s[c[l].cache]=a[c[l].cache],n=s._rgba=a._rgba,!1):e}),n.length?("0,0,0,0"===n.join()&&t.extend(n,o.transparent),s):o[i]}function n(t,e,i){return i=(i+1)%1,1>6*i?t+6*(e-t)*i:1>2*i?e:2>3*i?t+6*(e-t)*(2/3-i):t}var o,a="backgroundColor borderBottomColor borderLeftColor borderRightColor borderTopColor color columnRuleColor outlineColor textDecorationColor textEmphasisColor",r=/^([\-+])=\s*(\d+\.?\d*)/,h=[{re:/rgba?\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,parse:function(t){return[t[1],t[2],t[3],t[4]]}},{re:/rgba?\(\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,parse:function(t){return[2.55*t[1],2.55*t[2],2.55*t[3],t[4]]}},{re:/#([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})/,parse:function(t){return[parseInt(t[1],16),parseInt(t[2],16),parseInt(t[3],16)]}},{re:/#([a-f0-9])([a-f0-9])([a-f0-9])/,parse:function(t){return[parseInt(t[1]+t[1],16),parseInt(t[2]+t[2],16),parseInt(t[3]+t[3],16)]}},{re:/hsla?\(\s*(\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,space:"hsla",parse:function(t){return[t[1],t[2]/100,t[3]/100,t[4]]}}],l=t.Color=function(e,i,s,n){return new t.Color.fn.parse(e,i,s,n)},c={rgba:{props:{red:{idx:0,type:"byte"},green:{idx:1,type:"byte"},blue:{idx:2,type:"byte"}}},hsla:{props:{hue:{idx:0,type:"degrees"},saturation:{idx:1,type:"percent"},lightness:{idx:2,type:"percent"}}}},u={"byte":{floor:!0,max:255},percent:{max:1},degrees:{mod:360,floor:!0}},d=l.support={},p=t("<p>")[0],f=t.each;p.style.cssText="background-color:rgba(1,1,1,.5)",d.rgba=p.style.backgroundColor.indexOf("rgba")>-1,f(c,function(t,e){e.cache="_"+t,e.props.alpha={idx:3,type:"percent",def:1}}),l.fn=t.extend(l.prototype,{parse:function(n,a,r,h){if(n===e)return this._rgba=[null,null,null,null],this;(n.jquery||n.nodeType)&&(n=t(n).css(a),a=e);var u=this,d=t.type(n),p=this._rgba=[];return a!==e&&(n=[n,a,r,h],d="array"),"string"===d?this.parse(s(n)||o._default):"array"===d?(f(c.rgba.props,function(t,e){p[e.idx]=i(n[e.idx],e)}),this):"object"===d?(n instanceof l?f(c,function(t,e){n[e.cache]&&(u[e.cache]=n[e.cache].slice())}):f(c,function(e,s){var o=s.cache;f(s.props,function(t,e){if(!u[o]&&s.to){if("alpha"===t||null==n[t])return;u[o]=s.to(u._rgba)}u[o][e.idx]=i(n[t],e,!0)}),u[o]&&0>t.inArray(null,u[o].slice(0,3))&&(u[o][3]=1,s.from&&(u._rgba=s.from(u[o])))}),this):e},is:function(t){var i=l(t),s=!0,n=this;return f(c,function(t,o){var a,r=i[o.cache];return r&&(a=n[o.cache]||o.to&&o.to(n._rgba)||[],f(o.props,function(t,i){return null!=r[i.idx]?s=r[i.idx]===a[i.idx]:e})),s}),s},_space:function(){var t=[],e=this;return f(c,function(i,s){e[s.cache]&&t.push(i)}),t.pop()},transition:function(t,e){var s=l(t),n=s._space(),o=c[n],a=0===this.alpha()?l("transparent"):this,r=a[o.cache]||o.to(a._rgba),h=r.slice();return s=s[o.cache],f(o.props,function(t,n){var o=n.idx,a=r[o],l=s[o],c=u[n.type]||{};null!==l&&(null===a?h[o]=l:(c.mod&&(l-a>c.mod/2?a+=c.mod:a-l>c.mod/2&&(a-=c.mod)),h[o]=i((l-a)*e+a,n)))}),this[n](h)},blend:function(e){if(1===this._rgba[3])return this;var i=this._rgba.slice(),s=i.pop(),n=l(e)._rgba;return l(t.map(i,function(t,e){return(1-s)*n[e]+s*t}))},toRgbaString:function(){var e="rgba(",i=t.map(this._rgba,function(t,e){return null==t?e>2?1:0:t});return 1===i[3]&&(i.pop(),e="rgb("),e+i.join()+")"},toHslaString:function(){var e="hsla(",i=t.map(this.hsla(),function(t,e){return null==t&&(t=e>2?1:0),e&&3>e&&(t=Math.round(100*t)+"%"),t});return 1===i[3]&&(i.pop(),e="hsl("),e+i.join()+")"},toHexString:function(e){var i=this._rgba.slice(),s=i.pop();return e&&i.push(~~(255*s)),"#"+t.map(i,function(t){return t=(t||0).toString(16),1===t.length?"0"+t:t}).join("")},toString:function(){return 0===this._rgba[3]?"transparent":this.toRgbaString()}}),l.fn.parse.prototype=l.fn,c.hsla.to=function(t){if(null==t[0]||null==t[1]||null==t[2])return[null,null,null,t[3]];var e,i,s=t[0]/255,n=t[1]/255,o=t[2]/255,a=t[3],r=Math.max(s,n,o),h=Math.min(s,n,o),l=r-h,c=r+h,u=.5*c;return e=h===r?0:s===r?60*(n-o)/l+360:n===r?60*(o-s)/l+120:60*(s-n)/l+240,i=0===l?0:.5>=u?l/c:l/(2-c),[Math.round(e)%360,i,u,null==a?1:a]},c.hsla.from=function(t){if(null==t[0]||null==t[1]||null==t[2])return[null,null,null,t[3]];var e=t[0]/360,i=t[1],s=t[2],o=t[3],a=.5>=s?s*(1+i):s+i-s*i,r=2*s-a;return[Math.round(255*n(r,a,e+1/3)),Math.round(255*n(r,a,e)),Math.round(255*n(r,a,e-1/3)),o]},f(c,function(s,n){var o=n.props,a=n.cache,h=n.to,c=n.from;l.fn[s]=function(s){if(h&&!this[a]&&(this[a]=h(this._rgba)),s===e)return this[a].slice();var n,r=t.type(s),u="array"===r||"object"===r?s:arguments,d=this[a].slice();return f(o,function(t,e){var s=u["object"===r?t:e.idx];null==s&&(s=d[e.idx]),d[e.idx]=i(s,e)}),c?(n=l(c(d)),n[a]=d,n):l(d)},f(o,function(e,i){l.fn[e]||(l.fn[e]=function(n){var o,a=t.type(n),h="alpha"===e?this._hsla?"hsla":"rgba":s,l=this[h](),c=l[i.idx];return"undefined"===a?c:("function"===a&&(n=n.call(this,c),a=t.type(n)),null==n&&i.empty?this:("string"===a&&(o=r.exec(n),o&&(n=c+parseFloat(o[2])*("+"===o[1]?1:-1))),l[i.idx]=n,this[h](l)))})})}),l.hook=function(e){var i=e.split(" ");f(i,function(e,i){t.cssHooks[i]={set:function(e,n){var o,a,r="";if("transparent"!==n&&("string"!==t.type(n)||(o=s(n)))){if(n=l(o||n),!d.rgba&&1!==n._rgba[3]){for(a="backgroundColor"===i?e.parentNode:e;(""===r||"transparent"===r)&&a&&a.style;)try{r=t.css(a,"backgroundColor"),a=a.parentNode}catch(h){}n=n.blend(r&&"transparent"!==r?r:"_default")}n=n.toRgbaString()}try{e.style[i]=n}catch(h){}}},t.fx.step[i]=function(e){e.colorInit||(e.start=l(e.elem,i),e.end=l(e.end),e.colorInit=!0),t.cssHooks[i].set(e.elem,e.start.transition(e.end,e.pos))}})},l.hook(a),t.cssHooks.borderColor={expand:function(t){var e={};return f(["Top","Right","Bottom","Left"],function(i,s){e["border"+s+"Color"]=t}),e}},o=t.Color.names={aqua:"#00ffff",black:"#000000",blue:"#0000ff",fuchsia:"#ff00ff",gray:"#808080",green:"#008000",lime:"#00ff00",maroon:"#800000",navy:"#000080",olive:"#808000",purple:"#800080",red:"#ff0000",silver:"#c0c0c0",teal:"#008080",white:"#ffffff",yellow:"#ffff00",transparent:[null,null,null,0],_default:"#ffffff"}}(jQuery),function(){function i(e){var i,s,n=e.ownerDocument.defaultView?e.ownerDocument.defaultView.getComputedStyle(e,null):e.currentStyle,o={};if(n&&n.length&&n[0]&&n[n[0]])for(s=n.length;s--;)i=n[s],"string"==typeof n[i]&&(o[t.camelCase(i)]=n[i]);else for(i in n)"string"==typeof n[i]&&(o[i]=n[i]);return o}function s(e,i){var s,n,a={};for(s in i)n=i[s],e[s]!==n&&(o[s]||(t.fx.step[s]||!isNaN(parseFloat(n)))&&(a[s]=n));return a}var n=["add","remove","toggle"],o={border:1,borderBottom:1,borderColor:1,borderLeft:1,borderRight:1,borderTop:1,borderWidth:1,margin:1,padding:1};t.each(["borderLeftStyle","borderRightStyle","borderBottomStyle","borderTopStyle"],function(e,i){t.fx.step[i]=function(t){("none"!==t.end&&!t.setAttr||1===t.pos&&!t.setAttr)&&(jQuery.style(t.elem,i,t.end),t.setAttr=!0)}}),t.fn.addBack||(t.fn.addBack=function(t){return this.add(null==t?this.prevObject:this.prevObject.filter(t))}),t.effects.animateClass=function(e,o,a,r){var h=t.speed(o,a,r);return this.queue(function(){var o,a=t(this),r=a.attr("class")||"",l=h.children?a.find("*").addBack():a;l=l.map(function(){var e=t(this);return{el:e,start:i(this)}}),o=function(){t.each(n,function(t,i){e[i]&&a[i+"Class"](e[i])})},o(),l=l.map(function(){return this.end=i(this.el[0]),this.diff=s(this.start,this.end),this}),a.attr("class",r),l=l.map(function(){var e=this,i=t.Deferred(),s=t.extend({},h,{queue:!1,complete:function(){i.resolve(e)}});return this.el.animate(this.diff,s),i.promise()}),t.when.apply(t,l.get()).done(function(){o(),t.each(arguments,function(){var e=this.el;t.each(this.diff,function(t){e.css(t,"")})}),h.complete.call(a[0])})})},t.fn.extend({addClass:function(e){return function(i,s,n,o){return s?t.effects.animateClass.call(this,{add:i},s,n,o):e.apply(this,arguments)}}(t.fn.addClass),removeClass:function(e){return function(i,s,n,o){return arguments.length>1?t.effects.animateClass.call(this,{remove:i},s,n,o):e.apply(this,arguments)}}(t.fn.removeClass),toggleClass:function(i){return function(s,n,o,a,r){return"boolean"==typeof n||n===e?o?t.effects.animateClass.call(this,n?{add:s}:{remove:s},o,a,r):i.apply(this,arguments):t.effects.animateClass.call(this,{toggle:s},n,o,a)}}(t.fn.toggleClass),switchClass:function(e,i,s,n,o){return t.effects.animateClass.call(this,{add:i,remove:e},s,n,o)}})}(),function(){function s(e,i,s,n){return t.isPlainObject(e)&&(i=e,e=e.effect),e={effect:e},null==i&&(i={}),t.isFunction(i)&&(n=i,s=null,i={}),("number"==typeof i||t.fx.speeds[i])&&(n=s,s=i,i={}),t.isFunction(s)&&(n=s,s=null),i&&t.extend(e,i),s=s||i.duration,e.duration=t.fx.off?0:"number"==typeof s?s:s in t.fx.speeds?t.fx.speeds[s]:t.fx.speeds._default,e.complete=n||i.complete,e}function n(e){return!e||"number"==typeof e||t.fx.speeds[e]?!0:"string"!=typeof e||t.effects.effect[e]?t.isFunction(e)?!0:"object"!=typeof e||e.effect?!1:!0:!0}t.extend(t.effects,{version:"1.10.4",save:function(t,e){for(var s=0;e.length>s;s++)null!==e[s]&&t.data(i+e[s],t[0].style[e[s]])},restore:function(t,s){var n,o;for(o=0;s.length>o;o++)null!==s[o]&&(n=t.data(i+s[o]),n===e&&(n=""),t.css(s[o],n))},setMode:function(t,e){return"toggle"===e&&(e=t.is(":hidden")?"show":"hide"),e},getBaseline:function(t,e){var i,s;switch(t[0]){case"top":i=0;break;case"middle":i=.5;break;case"bottom":i=1;break;default:i=t[0]/e.height}switch(t[1]){case"left":s=0;break;case"center":s=.5;break;case"right":s=1;break;default:s=t[1]/e.width}return{x:s,y:i}},createWrapper:function(e){if(e.parent().is(".ui-effects-wrapper"))return e.parent();var i={width:e.outerWidth(!0),height:e.outerHeight(!0),"float":e.css("float")},s=t("<div></div>").addClass("ui-effects-wrapper").css({fontSize:"100%",background:"transparent",border:"none",margin:0,padding:0}),n={width:e.width(),height:e.height()},o=document.activeElement;try{o.id}catch(a){o=document.body}return e.wrap(s),(e[0]===o||t.contains(e[0],o))&&t(o).focus(),s=e.parent(),"static"===e.css("position")?(s.css({position:"relative"}),e.css({position:"relative"})):(t.extend(i,{position:e.css("position"),zIndex:e.css("z-index")}),t.each(["top","left","bottom","right"],function(t,s){i[s]=e.css(s),isNaN(parseInt(i[s],10))&&(i[s]="auto")}),e.css({position:"relative",top:0,left:0,right:"auto",bottom:"auto"})),e.css(n),s.css(i).show()},removeWrapper:function(e){var i=document.activeElement;return e.parent().is(".ui-effects-wrapper")&&(e.parent().replaceWith(e),(e[0]===i||t.contains(e[0],i))&&t(i).focus()),e},setTransition:function(e,i,s,n){return n=n||{},t.each(i,function(t,i){var o=e.cssUnit(i);o[0]>0&&(n[i]=o[0]*s+o[1])}),n}}),t.fn.extend({effect:function(){function e(e){function s(){t.isFunction(o)&&o.call(n[0]),t.isFunction(e)&&e()}var n=t(this),o=i.complete,r=i.mode;(n.is(":hidden")?"hide"===r:"show"===r)?(n[r](),s()):a.call(n[0],i,s)}var i=s.apply(this,arguments),n=i.mode,o=i.queue,a=t.effects.effect[i.effect];return t.fx.off||!a?n?this[n](i.duration,i.complete):this.each(function(){i.complete&&i.complete.call(this)}):o===!1?this.each(e):this.queue(o||"fx",e)},show:function(t){return function(e){if(n(e))return t.apply(this,arguments);var i=s.apply(this,arguments);return i.mode="show",this.effect.call(this,i)}}(t.fn.show),hide:function(t){return function(e){if(n(e))return t.apply(this,arguments);var i=s.apply(this,arguments);return i.mode="hide",this.effect.call(this,i)}}(t.fn.hide),toggle:function(t){return function(e){if(n(e)||"boolean"==typeof e)return t.apply(this,arguments);var i=s.apply(this,arguments);return i.mode="toggle",this.effect.call(this,i)}}(t.fn.toggle),cssUnit:function(e){var i=this.css(e),s=[];return t.each(["em","px","%","pt"],function(t,e){i.indexOf(e)>0&&(s=[parseFloat(i),e])}),s}})}(),function(){var e={};t.each(["Quad","Cubic","Quart","Quint","Expo"],function(t,i){e[i]=function(e){return Math.pow(e,t+2)}}),t.extend(e,{Sine:function(t){return 1-Math.cos(t*Math.PI/2)},Circ:function(t){return 1-Math.sqrt(1-t*t)},Elastic:function(t){return 0===t||1===t?t:-Math.pow(2,8*(t-1))*Math.sin((80*(t-1)-7.5)*Math.PI/15)},Back:function(t){return t*t*(3*t-2)},Bounce:function(t){for(var e,i=4;((e=Math.pow(2,--i))-1)/11>t;);return 1/Math.pow(4,3-i)-7.5625*Math.pow((3*e-2)/22-t,2)}}),t.each(e,function(e,i){t.easing["easeIn"+e]=i,t.easing["easeOut"+e]=function(t){return 1-i(1-t)},t.easing["easeInOut"+e]=function(t){return.5>t?i(2*t)/2:1-i(-2*t+2)/2}})}()}(jQuery),function(t){var e=0,i={},s={};i.height=i.paddingTop=i.paddingBottom=i.borderTopWidth=i.borderBottomWidth="hide",s.height=s.paddingTop=s.paddingBottom=s.borderTopWidth=s.borderBottomWidth="show",t.widget("ui.accordion",{version:"1.10.4",options:{active:0,animate:{},collapsible:!1,event:"click",header:"> li > :first-child,> :not(li):even",heightStyle:"auto",icons:{activeHeader:"ui-icon-triangle-1-s",header:"ui-icon-triangle-1-e"},activate:null,beforeActivate:null},_create:function(){var e=this.options;this.prevShow=this.prevHide=t(),this.element.addClass("ui-accordion ui-widget ui-helper-reset").attr("role","tablist"),e.collapsible||e.active!==!1&&null!=e.active||(e.active=0),this._processPanels(),0>e.active&&(e.active+=this.headers.length),this._refresh()},_getCreateEventData:function(){return{header:this.active,panel:this.active.length?this.active.next():t(),content:this.active.length?this.active.next():t()}},_createIcons:function(){var e=this.options.icons;e&&(t("<span>").addClass("ui-accordion-header-icon ui-icon "+e.header).prependTo(this.headers),this.active.children(".ui-accordion-header-icon").removeClass(e.header).addClass(e.activeHeader),this.headers.addClass("ui-accordion-icons"))
+},_destroyIcons:function(){this.headers.removeClass("ui-accordion-icons").children(".ui-accordion-header-icon").remove()},_destroy:function(){var t;this.element.removeClass("ui-accordion ui-widget ui-helper-reset").removeAttr("role"),this.headers.removeClass("ui-accordion-header ui-accordion-header-active ui-helper-reset ui-state-default ui-corner-all ui-state-active ui-state-disabled ui-corner-top").removeAttr("role").removeAttr("aria-expanded").removeAttr("aria-selected").removeAttr("aria-controls").removeAttr("tabIndex").each(function(){/^ui-accordion/.test(this.id)&&this.removeAttribute("id")}),this._destroyIcons(),t=this.headers.next().css("display","").removeAttr("role").removeAttr("aria-hidden").removeAttr("aria-labelledby").removeClass("ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content ui-accordion-content-active ui-state-disabled").each(function(){/^ui-accordion/.test(this.id)&&this.removeAttribute("id")}),"content"!==this.options.heightStyle&&t.css("height","")},_setOption:function(t,e){return"active"===t?(this._activate(e),undefined):("event"===t&&(this.options.event&&this._off(this.headers,this.options.event),this._setupEvents(e)),this._super(t,e),"collapsible"!==t||e||this.options.active!==!1||this._activate(0),"icons"===t&&(this._destroyIcons(),e&&this._createIcons()),"disabled"===t&&this.headers.add(this.headers.next()).toggleClass("ui-state-disabled",!!e),undefined)},_keydown:function(e){if(!e.altKey&&!e.ctrlKey){var i=t.ui.keyCode,s=this.headers.length,n=this.headers.index(e.target),o=!1;switch(e.keyCode){case i.RIGHT:case i.DOWN:o=this.headers[(n+1)%s];break;case i.LEFT:case i.UP:o=this.headers[(n-1+s)%s];break;case i.SPACE:case i.ENTER:this._eventHandler(e);break;case i.HOME:o=this.headers[0];break;case i.END:o=this.headers[s-1]}o&&(t(e.target).attr("tabIndex",-1),t(o).attr("tabIndex",0),o.focus(),e.preventDefault())}},_panelKeyDown:function(e){e.keyCode===t.ui.keyCode.UP&&e.ctrlKey&&t(e.currentTarget).prev().focus()},refresh:function(){var e=this.options;this._processPanels(),e.active===!1&&e.collapsible===!0||!this.headers.length?(e.active=!1,this.active=t()):e.active===!1?this._activate(0):this.active.length&&!t.contains(this.element[0],this.active[0])?this.headers.length===this.headers.find(".ui-state-disabled").length?(e.active=!1,this.active=t()):this._activate(Math.max(0,e.active-1)):e.active=this.headers.index(this.active),this._destroyIcons(),this._refresh()},_processPanels:function(){this.headers=this.element.find(this.options.header).addClass("ui-accordion-header ui-helper-reset ui-state-default ui-corner-all"),this.headers.next().addClass("ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom").filter(":not(.ui-accordion-content-active)").hide()},_refresh:function(){var i,s=this.options,n=s.heightStyle,o=this.element.parent(),a=this.accordionId="ui-accordion-"+(this.element.attr("id")||++e);this.active=this._findActive(s.active).addClass("ui-accordion-header-active ui-state-active ui-corner-top").removeClass("ui-corner-all"),this.active.next().addClass("ui-accordion-content-active").show(),this.headers.attr("role","tab").each(function(e){var i=t(this),s=i.attr("id"),n=i.next(),o=n.attr("id");s||(s=a+"-header-"+e,i.attr("id",s)),o||(o=a+"-panel-"+e,n.attr("id",o)),i.attr("aria-controls",o),n.attr("aria-labelledby",s)}).next().attr("role","tabpanel"),this.headers.not(this.active).attr({"aria-selected":"false","aria-expanded":"false",tabIndex:-1}).next().attr({"aria-hidden":"true"}).hide(),this.active.length?this.active.attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0}).next().attr({"aria-hidden":"false"}):this.headers.eq(0).attr("tabIndex",0),this._createIcons(),this._setupEvents(s.event),"fill"===n?(i=o.height(),this.element.siblings(":visible").each(function(){var e=t(this),s=e.css("position");"absolute"!==s&&"fixed"!==s&&(i-=e.outerHeight(!0))}),this.headers.each(function(){i-=t(this).outerHeight(!0)}),this.headers.next().each(function(){t(this).height(Math.max(0,i-t(this).innerHeight()+t(this).height()))}).css("overflow","auto")):"auto"===n&&(i=0,this.headers.next().each(function(){i=Math.max(i,t(this).css("height","").height())}).height(i))},_activate:function(e){var i=this._findActive(e)[0];i!==this.active[0]&&(i=i||this.active[0],this._eventHandler({target:i,currentTarget:i,preventDefault:t.noop}))},_findActive:function(e){return"number"==typeof e?this.headers.eq(e):t()},_setupEvents:function(e){var i={keydown:"_keydown"};e&&t.each(e.split(" "),function(t,e){i[e]="_eventHandler"}),this._off(this.headers.add(this.headers.next())),this._on(this.headers,i),this._on(this.headers.next(),{keydown:"_panelKeyDown"}),this._hoverable(this.headers),this._focusable(this.headers)},_eventHandler:function(e){var i=this.options,s=this.active,n=t(e.currentTarget),o=n[0]===s[0],a=o&&i.collapsible,r=a?t():n.next(),h=s.next(),l={oldHeader:s,oldPanel:h,newHeader:a?t():n,newPanel:r};e.preventDefault(),o&&!i.collapsible||this._trigger("beforeActivate",e,l)===!1||(i.active=a?!1:this.headers.index(n),this.active=o?t():n,this._toggle(l),s.removeClass("ui-accordion-header-active ui-state-active"),i.icons&&s.children(".ui-accordion-header-icon").removeClass(i.icons.activeHeader).addClass(i.icons.header),o||(n.removeClass("ui-corner-all").addClass("ui-accordion-header-active ui-state-active ui-corner-top"),i.icons&&n.children(".ui-accordion-header-icon").removeClass(i.icons.header).addClass(i.icons.activeHeader),n.next().addClass("ui-accordion-content-active")))},_toggle:function(e){var i=e.newPanel,s=this.prevShow.length?this.prevShow:e.oldPanel;this.prevShow.add(this.prevHide).stop(!0,!0),this.prevShow=i,this.prevHide=s,this.options.animate?this._animate(i,s,e):(s.hide(),i.show(),this._toggleComplete(e)),s.attr({"aria-hidden":"true"}),s.prev().attr("aria-selected","false"),i.length&&s.length?s.prev().attr({tabIndex:-1,"aria-expanded":"false"}):i.length&&this.headers.filter(function(){return 0===t(this).attr("tabIndex")}).attr("tabIndex",-1),i.attr("aria-hidden","false").prev().attr({"aria-selected":"true",tabIndex:0,"aria-expanded":"true"})},_animate:function(t,e,n){var o,a,r,h=this,l=0,c=t.length&&(!e.length||t.index()<e.index()),u=this.options.animate||{},d=c&&u.down||u,p=function(){h._toggleComplete(n)};return"number"==typeof d&&(r=d),"string"==typeof d&&(a=d),a=a||d.easing||u.easing,r=r||d.duration||u.duration,e.length?t.length?(o=t.show().outerHeight(),e.animate(i,{duration:r,easing:a,step:function(t,e){e.now=Math.round(t)}}),t.hide().animate(s,{duration:r,easing:a,complete:p,step:function(t,i){i.now=Math.round(t),"height"!==i.prop?l+=i.now:"content"!==h.options.heightStyle&&(i.now=Math.round(o-e.outerHeight()-l),l=0)}}),undefined):e.animate(i,r,a,p):t.animate(s,r,a,p)},_toggleComplete:function(t){var e=t.oldPanel;e.removeClass("ui-accordion-content-active").prev().removeClass("ui-corner-top").addClass("ui-corner-all"),e.length&&(e.parent()[0].className=e.parent()[0].className),this._trigger("activate",null,t)}})}(jQuery),function(t){t.widget("ui.autocomplete",{version:"1.10.4",defaultElement:"<input>",options:{appendTo:null,autoFocus:!1,delay:300,minLength:1,position:{my:"left top",at:"left bottom",collision:"none"},source:null,change:null,close:null,focus:null,open:null,response:null,search:null,select:null},requestIndex:0,pending:0,_create:function(){var e,i,s,n=this.element[0].nodeName.toLowerCase(),o="textarea"===n,a="input"===n;this.isMultiLine=o?!0:a?!1:this.element.prop("isContentEditable"),this.valueMethod=this.element[o||a?"val":"text"],this.isNewMenu=!0,this.element.addClass("ui-autocomplete-input").attr("autocomplete","off"),this._on(this.element,{keydown:function(n){if(this.element.prop("readOnly"))return e=!0,s=!0,i=!0,undefined;e=!1,s=!1,i=!1;var o=t.ui.keyCode;switch(n.keyCode){case o.PAGE_UP:e=!0,this._move("previousPage",n);break;case o.PAGE_DOWN:e=!0,this._move("nextPage",n);break;case o.UP:e=!0,this._keyEvent("previous",n);break;case o.DOWN:e=!0,this._keyEvent("next",n);break;case o.ENTER:case o.NUMPAD_ENTER:this.menu.active&&(e=!0,n.preventDefault(),this.menu.select(n));break;case o.TAB:this.menu.active&&this.menu.select(n);break;case o.ESCAPE:this.menu.element.is(":visible")&&(this._value(this.term),this.close(n),n.preventDefault());break;default:i=!0,this._searchTimeout(n)}},keypress:function(s){if(e)return e=!1,(!this.isMultiLine||this.menu.element.is(":visible"))&&s.preventDefault(),undefined;if(!i){var n=t.ui.keyCode;switch(s.keyCode){case n.PAGE_UP:this._move("previousPage",s);break;case n.PAGE_DOWN:this._move("nextPage",s);break;case n.UP:this._keyEvent("previous",s);break;case n.DOWN:this._keyEvent("next",s)}}},input:function(t){return s?(s=!1,t.preventDefault(),undefined):(this._searchTimeout(t),undefined)},focus:function(){this.selectedItem=null,this.previous=this._value()},blur:function(t){return this.cancelBlur?(delete this.cancelBlur,undefined):(clearTimeout(this.searching),this.close(t),this._change(t),undefined)}}),this._initSource(),this.menu=t("<ul>").addClass("ui-autocomplete ui-front").appendTo(this._appendTo()).menu({role:null}).hide().data("ui-menu"),this._on(this.menu.element,{mousedown:function(e){e.preventDefault(),this.cancelBlur=!0,this._delay(function(){delete this.cancelBlur});var i=this.menu.element[0];t(e.target).closest(".ui-menu-item").length||this._delay(function(){var e=this;this.document.one("mousedown",function(s){s.target===e.element[0]||s.target===i||t.contains(i,s.target)||e.close()})})},menufocus:function(e,i){if(this.isNewMenu&&(this.isNewMenu=!1,e.originalEvent&&/^mouse/.test(e.originalEvent.type)))return this.menu.blur(),this.document.one("mousemove",function(){t(e.target).trigger(e.originalEvent)}),undefined;var s=i.item.data("ui-autocomplete-item");!1!==this._trigger("focus",e,{item:s})?e.originalEvent&&/^key/.test(e.originalEvent.type)&&this._value(s.value):this.liveRegion.text(s.value)},menuselect:function(t,e){var i=e.item.data("ui-autocomplete-item"),s=this.previous;this.element[0]!==this.document[0].activeElement&&(this.element.focus(),this.previous=s,this._delay(function(){this.previous=s,this.selectedItem=i})),!1!==this._trigger("select",t,{item:i})&&this._value(i.value),this.term=this._value(),this.close(t),this.selectedItem=i}}),this.liveRegion=t("<span>",{role:"status","aria-live":"polite"}).addClass("ui-helper-hidden-accessible").insertBefore(this.element),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_destroy:function(){clearTimeout(this.searching),this.element.removeClass("ui-autocomplete-input").removeAttr("autocomplete"),this.menu.element.remove(),this.liveRegion.remove()},_setOption:function(t,e){this._super(t,e),"source"===t&&this._initSource(),"appendTo"===t&&this.menu.element.appendTo(this._appendTo()),"disabled"===t&&e&&this.xhr&&this.xhr.abort()},_appendTo:function(){var e=this.options.appendTo;return e&&(e=e.jquery||e.nodeType?t(e):this.document.find(e).eq(0)),e||(e=this.element.closest(".ui-front")),e.length||(e=this.document[0].body),e},_initSource:function(){var e,i,s=this;t.isArray(this.options.source)?(e=this.options.source,this.source=function(i,s){s(t.ui.autocomplete.filter(e,i.term))}):"string"==typeof this.options.source?(i=this.options.source,this.source=function(e,n){s.xhr&&s.xhr.abort(),s.xhr=t.ajax({url:i,data:e,dataType:"json",success:function(t){n(t)},error:function(){n([])}})}):this.source=this.options.source},_searchTimeout:function(t){clearTimeout(this.searching),this.searching=this._delay(function(){this.term!==this._value()&&(this.selectedItem=null,this.search(null,t))},this.options.delay)},search:function(t,e){return t=null!=t?t:this._value(),this.term=this._value(),t.length<this.options.minLength?this.close(e):this._trigger("search",e)!==!1?this._search(t):undefined},_search:function(t){this.pending++,this.element.addClass("ui-autocomplete-loading"),this.cancelSearch=!1,this.source({term:t},this._response())},_response:function(){var e=++this.requestIndex;return t.proxy(function(t){e===this.requestIndex&&this.__response(t),this.pending--,this.pending||this.element.removeClass("ui-autocomplete-loading")},this)},__response:function(t){t&&(t=this._normalize(t)),this._trigger("response",null,{content:t}),!this.options.disabled&&t&&t.length&&!this.cancelSearch?(this._suggest(t),this._trigger("open")):this._close()},close:function(t){this.cancelSearch=!0,this._close(t)},_close:function(t){this.menu.element.is(":visible")&&(this.menu.element.hide(),this.menu.blur(),this.isNewMenu=!0,this._trigger("close",t))},_change:function(t){this.previous!==this._value()&&this._trigger("change",t,{item:this.selectedItem})},_normalize:function(e){return e.length&&e[0].label&&e[0].value?e:t.map(e,function(e){return"string"==typeof e?{label:e,value:e}:t.extend({label:e.label||e.value,value:e.value||e.label},e)})},_suggest:function(e){var i=this.menu.element.empty();this._renderMenu(i,e),this.isNewMenu=!0,this.menu.refresh(),i.show(),this._resizeMenu(),i.position(t.extend({of:this.element},this.options.position)),this.options.autoFocus&&this.menu.next()},_resizeMenu:function(){var t=this.menu.element;t.outerWidth(Math.max(t.width("").outerWidth()+1,this.element.outerWidth()))},_renderMenu:function(e,i){var s=this;t.each(i,function(t,i){s._renderItemData(e,i)})},_renderItemData:function(t,e){return this._renderItem(t,e).data("ui-autocomplete-item",e)},_renderItem:function(e,i){return t("<li>").append(t("<a>").text(i.label)).appendTo(e)},_move:function(t,e){return this.menu.element.is(":visible")?this.menu.isFirstItem()&&/^previous/.test(t)||this.menu.isLastItem()&&/^next/.test(t)?(this._value(this.term),this.menu.blur(),undefined):(this.menu[t](e),undefined):(this.search(null,e),undefined)},widget:function(){return this.menu.element},_value:function(){return this.valueMethod.apply(this.element,arguments)},_keyEvent:function(t,e){(!this.isMultiLine||this.menu.element.is(":visible"))&&(this._move(t,e),e.preventDefault())}}),t.extend(t.ui.autocomplete,{escapeRegex:function(t){return t.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")},filter:function(e,i){var s=RegExp(t.ui.autocomplete.escapeRegex(i),"i");return t.grep(e,function(t){return s.test(t.label||t.value||t)})}}),t.widget("ui.autocomplete",t.ui.autocomplete,{options:{messages:{noResults:"No search results.",results:function(t){return t+(t>1?" results are":" result is")+" available, use up and down arrow keys to navigate."}}},__response:function(t){var e;this._superApply(arguments),this.options.disabled||this.cancelSearch||(e=t&&t.length?this.options.messages.results(t.length):this.options.messages.noResults,this.liveRegion.text(e))}})}(jQuery),function(t){var e,i="ui-button ui-widget ui-state-default ui-corner-all",s="ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only",n=function(){var e=t(this);setTimeout(function(){e.find(":ui-button").button("refresh")},1)},o=function(e){var i=e.name,s=e.form,n=t([]);return i&&(i=i.replace(/'/g,"\\'"),n=s?t(s).find("[name='"+i+"']"):t("[name='"+i+"']",e.ownerDocument).filter(function(){return!this.form})),n};t.widget("ui.button",{version:"1.10.4",defaultElement:"<button>",options:{disabled:null,text:!0,label:null,icons:{primary:null,secondary:null}},_create:function(){this.element.closest("form").unbind("reset"+this.eventNamespace).bind("reset"+this.eventNamespace,n),"boolean"!=typeof this.options.disabled?this.options.disabled=!!this.element.prop("disabled"):this.element.prop("disabled",this.options.disabled),this._determineButtonType(),this.hasTitle=!!this.buttonElement.attr("title");var s=this,a=this.options,r="checkbox"===this.type||"radio"===this.type,h=r?"":"ui-state-active";null===a.label&&(a.label="input"===this.type?this.buttonElement.val():this.buttonElement.html()),this._hoverable(this.buttonElement),this.buttonElement.addClass(i).attr("role","button").bind("mouseenter"+this.eventNamespace,function(){a.disabled||this===e&&t(this).addClass("ui-state-active")}).bind("mouseleave"+this.eventNamespace,function(){a.disabled||t(this).removeClass(h)}).bind("click"+this.eventNamespace,function(t){a.disabled&&(t.preventDefault(),t.stopImmediatePropagation())}),this._on({focus:function(){this.buttonElement.addClass("ui-state-focus")},blur:function(){this.buttonElement.removeClass("ui-state-focus")}}),r&&this.element.bind("change"+this.eventNamespace,function(){s.refresh()}),"checkbox"===this.type?this.buttonElement.bind("click"+this.eventNamespace,function(){return a.disabled?!1:undefined}):"radio"===this.type?this.buttonElement.bind("click"+this.eventNamespace,function(){if(a.disabled)return!1;t(this).addClass("ui-state-active"),s.buttonElement.attr("aria-pressed","true");var e=s.element[0];o(e).not(e).map(function(){return t(this).button("widget")[0]}).removeClass("ui-state-active").attr("aria-pressed","false")}):(this.buttonElement.bind("mousedown"+this.eventNamespace,function(){return a.disabled?!1:(t(this).addClass("ui-state-active"),e=this,s.document.one("mouseup",function(){e=null}),undefined)}).bind("mouseup"+this.eventNamespace,function(){return a.disabled?!1:(t(this).removeClass("ui-state-active"),undefined)}).bind("keydown"+this.eventNamespace,function(e){return a.disabled?!1:((e.keyCode===t.ui.keyCode.SPACE||e.keyCode===t.ui.keyCode.ENTER)&&t(this).addClass("ui-state-active"),undefined)}).bind("keyup"+this.eventNamespace+" blur"+this.eventNamespace,function(){t(this).removeClass("ui-state-active")}),this.buttonElement.is("a")&&this.buttonElement.keyup(function(e){e.keyCode===t.ui.keyCode.SPACE&&t(this).click()})),this._setOption("disabled",a.disabled),this._resetButton()},_determineButtonType:function(){var t,e,i;this.type=this.element.is("[type=checkbox]")?"checkbox":this.element.is("[type=radio]")?"radio":this.element.is("input")?"input":"button","checkbox"===this.type||"radio"===this.type?(t=this.element.parents().last(),e="label[for='"+this.element.attr("id")+"']",this.buttonElement=t.find(e),this.buttonElement.length||(t=t.length?t.siblings():this.element.siblings(),this.buttonElement=t.filter(e),this.buttonElement.length||(this.buttonElement=t.find(e))),this.element.addClass("ui-helper-hidden-accessible"),i=this.element.is(":checked"),i&&this.buttonElement.addClass("ui-state-active"),this.buttonElement.prop("aria-pressed",i)):this.buttonElement=this.element},widget:function(){return this.buttonElement},_destroy:function(){this.element.removeClass("ui-helper-hidden-accessible"),this.buttonElement.removeClass(i+" ui-state-active "+s).removeAttr("role").removeAttr("aria-pressed").html(this.buttonElement.find(".ui-button-text").html()),this.hasTitle||this.buttonElement.removeAttr("title")},_setOption:function(t,e){return this._super(t,e),"disabled"===t?(this.element.prop("disabled",!!e),e&&this.buttonElement.removeClass("ui-state-focus"),undefined):(this._resetButton(),undefined)},refresh:function(){var e=this.element.is("input, button")?this.element.is(":disabled"):this.element.hasClass("ui-button-disabled");e!==this.options.disabled&&this._setOption("disabled",e),"radio"===this.type?o(this.element[0]).each(function(){t(this).is(":checked")?t(this).button("widget").addClass("ui-state-active").attr("aria-pressed","true"):t(this).button("widget").removeClass("ui-state-active").attr("aria-pressed","false")}):"checkbox"===this.type&&(this.element.is(":checked")?this.buttonElement.addClass("ui-state-active").attr("aria-pressed","true"):this.buttonElement.removeClass("ui-state-active").attr("aria-pressed","false"))},_resetButton:function(){if("input"===this.type)return this.options.label&&this.element.val(this.options.label),undefined;var e=this.buttonElement.removeClass(s),i=t("<span></span>",this.document[0]).addClass("ui-button-text").html(this.options.label).appendTo(e.empty()).text(),n=this.options.icons,o=n.primary&&n.secondary,a=[];n.primary||n.secondary?(this.options.text&&a.push("ui-button-text-icon"+(o?"s":n.primary?"-primary":"-secondary")),n.primary&&e.prepend("<span class='ui-button-icon-primary ui-icon "+n.primary+"'></span>"),n.secondary&&e.append("<span class='ui-button-icon-secondary ui-icon "+n.secondary+"'></span>"),this.options.text||(a.push(o?"ui-button-icons-only":"ui-button-icon-only"),this.hasTitle||e.attr("title",t.trim(i)))):a.push("ui-button-text-only"),e.addClass(a.join(" "))}}),t.widget("ui.buttonset",{version:"1.10.4",options:{items:"button, input[type=button], input[type=submit], input[type=reset], input[type=checkbox], input[type=radio], a, :data(ui-button)"},_create:function(){this.element.addClass("ui-buttonset")},_init:function(){this.refresh()},_setOption:function(t,e){"disabled"===t&&this.buttons.button("option",t,e),this._super(t,e)},refresh:function(){var e="rtl"===this.element.css("direction");this.buttons=this.element.find(this.options.items).filter(":ui-button").button("refresh").end().not(":ui-button").button().end().map(function(){return t(this).button("widget")[0]}).removeClass("ui-corner-all ui-corner-left ui-corner-right").filter(":first").addClass(e?"ui-corner-right":"ui-corner-left").end().filter(":last").addClass(e?"ui-corner-left":"ui-corner-right").end().end()},_destroy:function(){this.element.removeClass("ui-buttonset"),this.buttons.map(function(){return t(this).button("widget")[0]}).removeClass("ui-corner-left ui-corner-right").end().button("destroy")}})}(jQuery),function(t,e){function i(){this._curInst=null,this._keyEvent=!1,this._disabledInputs=[],this._datepickerShowing=!1,this._inDialog=!1,this._mainDivId="ui-datepicker-div",this._inlineClass="ui-datepicker-inline",this._appendClass="ui-datepicker-append",this._triggerClass="ui-datepicker-trigger",this._dialogClass="ui-datepicker-dialog",this._disableClass="ui-datepicker-disabled",this._unselectableClass="ui-datepicker-unselectable",this._currentClass="ui-datepicker-current-day",this._dayOverClass="ui-datepicker-days-cell-over",this.regional=[],this.regional[""]={closeText:"Done",prevText:"Prev",nextText:"Next",currentText:"Today",monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayNamesMin:["Su","Mo","Tu","We","Th","Fr","Sa"],weekHeader:"Wk",dateFormat:"mm/dd/yy",firstDay:0,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""},this._defaults={showOn:"focus",showAnim:"fadeIn",showOptions:{},defaultDate:null,appendText:"",buttonText:"...",buttonImage:"",buttonImageOnly:!1,hideIfNoPrevNext:!1,navigationAsDateFormat:!1,gotoCurrent:!1,changeMonth:!1,changeYear:!1,yearRange:"c-10:c+10",showOtherMonths:!1,selectOtherMonths:!1,showWeek:!1,calculateWeek:this.iso8601Week,shortYearCutoff:"+10",minDate:null,maxDate:null,duration:"fast",beforeShowDay:null,beforeShow:null,onSelect:null,onChangeMonthYear:null,onClose:null,numberOfMonths:1,showCurrentAtPos:0,stepMonths:1,stepBigMonths:12,altField:"",altFormat:"",constrainInput:!0,showButtonPanel:!1,autoSize:!1,disabled:!1},t.extend(this._defaults,this.regional[""]),this.dpDiv=s(t("<div id='"+this._mainDivId+"' class='ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>"))}function s(e){var i="button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a";return e.delegate(i,"mouseout",function(){t(this).removeClass("ui-state-hover"),-1!==this.className.indexOf("ui-datepicker-prev")&&t(this).removeClass("ui-datepicker-prev-hover"),-1!==this.className.indexOf("ui-datepicker-next")&&t(this).removeClass("ui-datepicker-next-hover")}).delegate(i,"mouseover",function(){t.datepicker._isDisabledDatepicker(o.inline?e.parent()[0]:o.input[0])||(t(this).parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover"),t(this).addClass("ui-state-hover"),-1!==this.className.indexOf("ui-datepicker-prev")&&t(this).addClass("ui-datepicker-prev-hover"),-1!==this.className.indexOf("ui-datepicker-next")&&t(this).addClass("ui-datepicker-next-hover"))})}function n(e,i){t.extend(e,i);for(var s in i)null==i[s]&&(e[s]=i[s]);return e}t.extend(t.ui,{datepicker:{version:"1.10.4"}});var o,a="datepicker";t.extend(i.prototype,{markerClassName:"hasDatepicker",maxRows:4,_widgetDatepicker:function(){return this.dpDiv},setDefaults:function(t){return n(this._defaults,t||{}),this},_attachDatepicker:function(e,i){var s,n,o;s=e.nodeName.toLowerCase(),n="div"===s||"span"===s,e.id||(this.uuid+=1,e.id="dp"+this.uuid),o=this._newInst(t(e),n),o.settings=t.extend({},i||{}),"input"===s?this._connectDatepicker(e,o):n&&this._inlineDatepicker(e,o)},_newInst:function(e,i){var n=e[0].id.replace(/([^A-Za-z0-9_\-])/g,"\\\\$1");return{id:n,input:e,selectedDay:0,selectedMonth:0,selectedYear:0,drawMonth:0,drawYear:0,inline:i,dpDiv:i?s(t("<div class='"+this._inlineClass+" ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>")):this.dpDiv}},_connectDatepicker:function(e,i){var s=t(e);i.append=t([]),i.trigger=t([]),s.hasClass(this.markerClassName)||(this._attachments(s,i),s.addClass(this.markerClassName).keydown(this._doKeyDown).keypress(this._doKeyPress).keyup(this._doKeyUp),this._autoSize(i),t.data(e,a,i),i.settings.disabled&&this._disableDatepicker(e))},_attachments:function(e,i){var s,n,o,a=this._get(i,"appendText"),r=this._get(i,"isRTL");i.append&&i.append.remove(),a&&(i.append=t("<span class='"+this._appendClass+"'>"+a+"</span>"),e[r?"before":"after"](i.append)),e.unbind("focus",this._showDatepicker),i.trigger&&i.trigger.remove(),s=this._get(i,"showOn"),("focus"===s||"both"===s)&&e.focus(this._showDatepicker),("button"===s||"both"===s)&&(n=this._get(i,"buttonText"),o=this._get(i,"buttonImage"),i.trigger=t(this._get(i,"buttonImageOnly")?t("<img/>").addClass(this._triggerClass).attr({src:o,alt:n,title:n}):t("<button type='button'></button>").addClass(this._triggerClass).html(o?t("<img/>").attr({src:o,alt:n,title:n}):n)),e[r?"before":"after"](i.trigger),i.trigger.click(function(){return t.datepicker._datepickerShowing&&t.datepicker._lastInput===e[0]?t.datepicker._hideDatepicker():t.datepicker._datepickerShowing&&t.datepicker._lastInput!==e[0]?(t.datepicker._hideDatepicker(),t.datepicker._showDatepicker(e[0])):t.datepicker._showDatepicker(e[0]),!1}))},_autoSize:function(t){if(this._get(t,"autoSize")&&!t.inline){var e,i,s,n,o=new Date(2009,11,20),a=this._get(t,"dateFormat");a.match(/[DM]/)&&(e=function(t){for(i=0,s=0,n=0;t.length>n;n++)t[n].length>i&&(i=t[n].length,s=n);return s},o.setMonth(e(this._get(t,a.match(/MM/)?"monthNames":"monthNamesShort"))),o.setDate(e(this._get(t,a.match(/DD/)?"dayNames":"dayNamesShort"))+20-o.getDay())),t.input.attr("size",this._formatDate(t,o).length)}},_inlineDatepicker:function(e,i){var s=t(e);s.hasClass(this.markerClassName)||(s.addClass(this.markerClassName).append(i.dpDiv),t.data(e,a,i),this._setDate(i,this._getDefaultDate(i),!0),this._updateDatepicker(i),this._updateAlternate(i),i.settings.disabled&&this._disableDatepicker(e),i.dpDiv.css("display","block"))},_dialogDatepicker:function(e,i,s,o,r){var h,l,c,u,d,p=this._dialogInst;return p||(this.uuid+=1,h="dp"+this.uuid,this._dialogInput=t("<input type='text' id='"+h+"' style='position: absolute; top: -100px; width: 0px;'/>"),this._dialogInput.keydown(this._doKeyDown),t("body").append(this._dialogInput),p=this._dialogInst=this._newInst(this._dialogInput,!1),p.settings={},t.data(this._dialogInput[0],a,p)),n(p.settings,o||{}),i=i&&i.constructor===Date?this._formatDate(p,i):i,this._dialogInput.val(i),this._pos=r?r.length?r:[r.pageX,r.pageY]:null,this._pos||(l=document.documentElement.clientWidth,c=document.documentElement.clientHeight,u=document.documentElement.scrollLeft||document.body.scrollLeft,d=document.documentElement.scrollTop||document.body.scrollTop,this._pos=[l/2-100+u,c/2-150+d]),this._dialogInput.css("left",this._pos[0]+20+"px").css("top",this._pos[1]+"px"),p.settings.onSelect=s,this._inDialog=!0,this.dpDiv.addClass(this._dialogClass),this._showDatepicker(this._dialogInput[0]),t.blockUI&&t.blockUI(this.dpDiv),t.data(this._dialogInput[0],a,p),this},_destroyDatepicker:function(e){var i,s=t(e),n=t.data(e,a);s.hasClass(this.markerClassName)&&(i=e.nodeName.toLowerCase(),t.removeData(e,a),"input"===i?(n.append.remove(),n.trigger.remove(),s.removeClass(this.markerClassName).unbind("focus",this._showDatepicker).unbind("keydown",this._doKeyDown).unbind("keypress",this._doKeyPress).unbind("keyup",this._doKeyUp)):("div"===i||"span"===i)&&s.removeClass(this.markerClassName).empty())},_enableDatepicker:function(e){var i,s,n=t(e),o=t.data(e,a);n.hasClass(this.markerClassName)&&(i=e.nodeName.toLowerCase(),"input"===i?(e.disabled=!1,o.trigger.filter("button").each(function(){this.disabled=!1}).end().filter("img").css({opacity:"1.0",cursor:""})):("div"===i||"span"===i)&&(s=n.children("."+this._inlineClass),s.children().removeClass("ui-state-disabled"),s.find("select.ui-datepicker-month, select.ui-datepicker-year").prop("disabled",!1)),this._disabledInputs=t.map(this._disabledInputs,function(t){return t===e?null:t}))},_disableDatepicker:function(e){var i,s,n=t(e),o=t.data(e,a);n.hasClass(this.markerClassName)&&(i=e.nodeName.toLowerCase(),"input"===i?(e.disabled=!0,o.trigger.filter("button").each(function(){this.disabled=!0}).end().filter("img").css({opacity:"0.5",cursor:"default"})):("div"===i||"span"===i)&&(s=n.children("."+this._inlineClass),s.children().addClass("ui-state-disabled"),s.find("select.ui-datepicker-month, select.ui-datepicker-year").prop("disabled",!0)),this._disabledInputs=t.map(this._disabledInputs,function(t){return t===e?null:t}),this._disabledInputs[this._disabledInputs.length]=e)},_isDisabledDatepicker:function(t){if(!t)return!1;for(var e=0;this._disabledInputs.length>e;e++)if(this._disabledInputs[e]===t)return!0;return!1},_getInst:function(e){try{return t.data(e,a)}catch(i){throw"Missing instance data for this datepicker"}},_optionDatepicker:function(i,s,o){var a,r,h,l,c=this._getInst(i);return 2===arguments.length&&"string"==typeof s?"defaults"===s?t.extend({},t.datepicker._defaults):c?"all"===s?t.extend({},c.settings):this._get(c,s):null:(a=s||{},"string"==typeof s&&(a={},a[s]=o),c&&(this._curInst===c&&this._hideDatepicker(),r=this._getDateDatepicker(i,!0),h=this._getMinMaxDate(c,"min"),l=this._getMinMaxDate(c,"max"),n(c.settings,a),null!==h&&a.dateFormat!==e&&a.minDate===e&&(c.settings.minDate=this._formatDate(c,h)),null!==l&&a.dateFormat!==e&&a.maxDate===e&&(c.settings.maxDate=this._formatDate(c,l)),"disabled"in a&&(a.disabled?this._disableDatepicker(i):this._enableDatepicker(i)),this._attachments(t(i),c),this._autoSize(c),this._setDate(c,r),this._updateAlternate(c),this._updateDatepicker(c)),e)},_changeDatepicker:function(t,e,i){this._optionDatepicker(t,e,i)},_refreshDatepicker:function(t){var e=this._getInst(t);e&&this._updateDatepicker(e)},_setDateDatepicker:function(t,e){var i=this._getInst(t);i&&(this._setDate(i,e),this._updateDatepicker(i),this._updateAlternate(i))},_getDateDatepicker:function(t,e){var i=this._getInst(t);return i&&!i.inline&&this._setDateFromField(i,e),i?this._getDate(i):null},_doKeyDown:function(e){var i,s,n,o=t.datepicker._getInst(e.target),a=!0,r=o.dpDiv.is(".ui-datepicker-rtl");if(o._keyEvent=!0,t.datepicker._datepickerShowing)switch(e.keyCode){case 9:t.datepicker._hideDatepicker(),a=!1;break;case 13:return n=t("td."+t.datepicker._dayOverClass+":not(."+t.datepicker._currentClass+")",o.dpDiv),n[0]&&t.datepicker._selectDay(e.target,o.selectedMonth,o.selectedYear,n[0]),i=t.datepicker._get(o,"onSelect"),i?(s=t.datepicker._formatDate(o),i.apply(o.input?o.input[0]:null,[s,o])):t.datepicker._hideDatepicker(),!1;case 27:t.datepicker._hideDatepicker();break;case 33:t.datepicker._adjustDate(e.target,e.ctrlKey?-t.datepicker._get(o,"stepBigMonths"):-t.datepicker._get(o,"stepMonths"),"M");break;case 34:t.datepicker._adjustDate(e.target,e.ctrlKey?+t.datepicker._get(o,"stepBigMonths"):+t.datepicker._get(o,"stepMonths"),"M");
+break;case 35:(e.ctrlKey||e.metaKey)&&t.datepicker._clearDate(e.target),a=e.ctrlKey||e.metaKey;break;case 36:(e.ctrlKey||e.metaKey)&&t.datepicker._gotoToday(e.target),a=e.ctrlKey||e.metaKey;break;case 37:(e.ctrlKey||e.metaKey)&&t.datepicker._adjustDate(e.target,r?1:-1,"D"),a=e.ctrlKey||e.metaKey,e.originalEvent.altKey&&t.datepicker._adjustDate(e.target,e.ctrlKey?-t.datepicker._get(o,"stepBigMonths"):-t.datepicker._get(o,"stepMonths"),"M");break;case 38:(e.ctrlKey||e.metaKey)&&t.datepicker._adjustDate(e.target,-7,"D"),a=e.ctrlKey||e.metaKey;break;case 39:(e.ctrlKey||e.metaKey)&&t.datepicker._adjustDate(e.target,r?-1:1,"D"),a=e.ctrlKey||e.metaKey,e.originalEvent.altKey&&t.datepicker._adjustDate(e.target,e.ctrlKey?+t.datepicker._get(o,"stepBigMonths"):+t.datepicker._get(o,"stepMonths"),"M");break;case 40:(e.ctrlKey||e.metaKey)&&t.datepicker._adjustDate(e.target,7,"D"),a=e.ctrlKey||e.metaKey;break;default:a=!1}else 36===e.keyCode&&e.ctrlKey?t.datepicker._showDatepicker(this):a=!1;a&&(e.preventDefault(),e.stopPropagation())},_doKeyPress:function(i){var s,n,o=t.datepicker._getInst(i.target);return t.datepicker._get(o,"constrainInput")?(s=t.datepicker._possibleChars(t.datepicker._get(o,"dateFormat")),n=String.fromCharCode(null==i.charCode?i.keyCode:i.charCode),i.ctrlKey||i.metaKey||" ">n||!s||s.indexOf(n)>-1):e},_doKeyUp:function(e){var i,s=t.datepicker._getInst(e.target);if(s.input.val()!==s.lastVal)try{i=t.datepicker.parseDate(t.datepicker._get(s,"dateFormat"),s.input?s.input.val():null,t.datepicker._getFormatConfig(s)),i&&(t.datepicker._setDateFromField(s),t.datepicker._updateAlternate(s),t.datepicker._updateDatepicker(s))}catch(n){}return!0},_showDatepicker:function(e){if(e=e.target||e,"input"!==e.nodeName.toLowerCase()&&(e=t("input",e.parentNode)[0]),!t.datepicker._isDisabledDatepicker(e)&&t.datepicker._lastInput!==e){var i,s,o,a,r,h,l;i=t.datepicker._getInst(e),t.datepicker._curInst&&t.datepicker._curInst!==i&&(t.datepicker._curInst.dpDiv.stop(!0,!0),i&&t.datepicker._datepickerShowing&&t.datepicker._hideDatepicker(t.datepicker._curInst.input[0])),s=t.datepicker._get(i,"beforeShow"),o=s?s.apply(e,[e,i]):{},o!==!1&&(n(i.settings,o),i.lastVal=null,t.datepicker._lastInput=e,t.datepicker._setDateFromField(i),t.datepicker._inDialog&&(e.value=""),t.datepicker._pos||(t.datepicker._pos=t.datepicker._findPos(e),t.datepicker._pos[1]+=e.offsetHeight),a=!1,t(e).parents().each(function(){return a|="fixed"===t(this).css("position"),!a}),r={left:t.datepicker._pos[0],top:t.datepicker._pos[1]},t.datepicker._pos=null,i.dpDiv.empty(),i.dpDiv.css({position:"absolute",display:"block",top:"-1000px"}),t.datepicker._updateDatepicker(i),r=t.datepicker._checkOffset(i,r,a),i.dpDiv.css({position:t.datepicker._inDialog&&t.blockUI?"static":a?"fixed":"absolute",display:"none",left:r.left+"px",top:r.top+"px"}),i.inline||(h=t.datepicker._get(i,"showAnim"),l=t.datepicker._get(i,"duration"),i.dpDiv.zIndex(t(e).zIndex()+1),t.datepicker._datepickerShowing=!0,t.effects&&t.effects.effect[h]?i.dpDiv.show(h,t.datepicker._get(i,"showOptions"),l):i.dpDiv[h||"show"](h?l:null),t.datepicker._shouldFocusInput(i)&&i.input.focus(),t.datepicker._curInst=i))}},_updateDatepicker:function(e){this.maxRows=4,o=e,e.dpDiv.empty().append(this._generateHTML(e)),this._attachHandlers(e),e.dpDiv.find("."+this._dayOverClass+" a").mouseover();var i,s=this._getNumberOfMonths(e),n=s[1],a=17;e.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width(""),n>1&&e.dpDiv.addClass("ui-datepicker-multi-"+n).css("width",a*n+"em"),e.dpDiv[(1!==s[0]||1!==s[1]?"add":"remove")+"Class"]("ui-datepicker-multi"),e.dpDiv[(this._get(e,"isRTL")?"add":"remove")+"Class"]("ui-datepicker-rtl"),e===t.datepicker._curInst&&t.datepicker._datepickerShowing&&t.datepicker._shouldFocusInput(e)&&e.input.focus(),e.yearshtml&&(i=e.yearshtml,setTimeout(function(){i===e.yearshtml&&e.yearshtml&&e.dpDiv.find("select.ui-datepicker-year:first").replaceWith(e.yearshtml),i=e.yearshtml=null},0))},_shouldFocusInput:function(t){return t.input&&t.input.is(":visible")&&!t.input.is(":disabled")&&!t.input.is(":focus")},_checkOffset:function(e,i,s){var n=e.dpDiv.outerWidth(),o=e.dpDiv.outerHeight(),a=e.input?e.input.outerWidth():0,r=e.input?e.input.outerHeight():0,h=document.documentElement.clientWidth+(s?0:t(document).scrollLeft()),l=document.documentElement.clientHeight+(s?0:t(document).scrollTop());return i.left-=this._get(e,"isRTL")?n-a:0,i.left-=s&&i.left===e.input.offset().left?t(document).scrollLeft():0,i.top-=s&&i.top===e.input.offset().top+r?t(document).scrollTop():0,i.left-=Math.min(i.left,i.left+n>h&&h>n?Math.abs(i.left+n-h):0),i.top-=Math.min(i.top,i.top+o>l&&l>o?Math.abs(o+r):0),i},_findPos:function(e){for(var i,s=this._getInst(e),n=this._get(s,"isRTL");e&&("hidden"===e.type||1!==e.nodeType||t.expr.filters.hidden(e));)e=e[n?"previousSibling":"nextSibling"];return i=t(e).offset(),[i.left,i.top]},_hideDatepicker:function(e){var i,s,n,o,r=this._curInst;!r||e&&r!==t.data(e,a)||this._datepickerShowing&&(i=this._get(r,"showAnim"),s=this._get(r,"duration"),n=function(){t.datepicker._tidyDialog(r)},t.effects&&(t.effects.effect[i]||t.effects[i])?r.dpDiv.hide(i,t.datepicker._get(r,"showOptions"),s,n):r.dpDiv["slideDown"===i?"slideUp":"fadeIn"===i?"fadeOut":"hide"](i?s:null,n),i||n(),this._datepickerShowing=!1,o=this._get(r,"onClose"),o&&o.apply(r.input?r.input[0]:null,[r.input?r.input.val():"",r]),this._lastInput=null,this._inDialog&&(this._dialogInput.css({position:"absolute",left:"0",top:"-100px"}),t.blockUI&&(t.unblockUI(),t("body").append(this.dpDiv))),this._inDialog=!1)},_tidyDialog:function(t){t.dpDiv.removeClass(this._dialogClass).unbind(".ui-datepicker-calendar")},_checkExternalClick:function(e){if(t.datepicker._curInst){var i=t(e.target),s=t.datepicker._getInst(i[0]);(i[0].id!==t.datepicker._mainDivId&&0===i.parents("#"+t.datepicker._mainDivId).length&&!i.hasClass(t.datepicker.markerClassName)&&!i.closest("."+t.datepicker._triggerClass).length&&t.datepicker._datepickerShowing&&(!t.datepicker._inDialog||!t.blockUI)||i.hasClass(t.datepicker.markerClassName)&&t.datepicker._curInst!==s)&&t.datepicker._hideDatepicker()}},_adjustDate:function(e,i,s){var n=t(e),o=this._getInst(n[0]);this._isDisabledDatepicker(n[0])||(this._adjustInstDate(o,i+("M"===s?this._get(o,"showCurrentAtPos"):0),s),this._updateDatepicker(o))},_gotoToday:function(e){var i,s=t(e),n=this._getInst(s[0]);this._get(n,"gotoCurrent")&&n.currentDay?(n.selectedDay=n.currentDay,n.drawMonth=n.selectedMonth=n.currentMonth,n.drawYear=n.selectedYear=n.currentYear):(i=new Date,n.selectedDay=i.getDate(),n.drawMonth=n.selectedMonth=i.getMonth(),n.drawYear=n.selectedYear=i.getFullYear()),this._notifyChange(n),this._adjustDate(s)},_selectMonthYear:function(e,i,s){var n=t(e),o=this._getInst(n[0]);o["selected"+("M"===s?"Month":"Year")]=o["draw"+("M"===s?"Month":"Year")]=parseInt(i.options[i.selectedIndex].value,10),this._notifyChange(o),this._adjustDate(n)},_selectDay:function(e,i,s,n){var o,a=t(e);t(n).hasClass(this._unselectableClass)||this._isDisabledDatepicker(a[0])||(o=this._getInst(a[0]),o.selectedDay=o.currentDay=t("a",n).html(),o.selectedMonth=o.currentMonth=i,o.selectedYear=o.currentYear=s,this._selectDate(e,this._formatDate(o,o.currentDay,o.currentMonth,o.currentYear)))},_clearDate:function(e){var i=t(e);this._selectDate(i,"")},_selectDate:function(e,i){var s,n=t(e),o=this._getInst(n[0]);i=null!=i?i:this._formatDate(o),o.input&&o.input.val(i),this._updateAlternate(o),s=this._get(o,"onSelect"),s?s.apply(o.input?o.input[0]:null,[i,o]):o.input&&o.input.trigger("change"),o.inline?this._updateDatepicker(o):(this._hideDatepicker(),this._lastInput=o.input[0],"object"!=typeof o.input[0]&&o.input.focus(),this._lastInput=null)},_updateAlternate:function(e){var i,s,n,o=this._get(e,"altField");o&&(i=this._get(e,"altFormat")||this._get(e,"dateFormat"),s=this._getDate(e),n=this.formatDate(i,s,this._getFormatConfig(e)),t(o).each(function(){t(this).val(n)}))},noWeekends:function(t){var e=t.getDay();return[e>0&&6>e,""]},iso8601Week:function(t){var e,i=new Date(t.getTime());return i.setDate(i.getDate()+4-(i.getDay()||7)),e=i.getTime(),i.setMonth(0),i.setDate(1),Math.floor(Math.round((e-i)/864e5)/7)+1},parseDate:function(i,s,n){if(null==i||null==s)throw"Invalid arguments";if(s="object"==typeof s?""+s:s+"",""===s)return null;var o,a,r,h,l=0,c=(n?n.shortYearCutoff:null)||this._defaults.shortYearCutoff,u="string"!=typeof c?c:(new Date).getFullYear()%100+parseInt(c,10),d=(n?n.dayNamesShort:null)||this._defaults.dayNamesShort,p=(n?n.dayNames:null)||this._defaults.dayNames,f=(n?n.monthNamesShort:null)||this._defaults.monthNamesShort,g=(n?n.monthNames:null)||this._defaults.monthNames,m=-1,v=-1,_=-1,b=-1,y=!1,w=function(t){var e=i.length>o+1&&i.charAt(o+1)===t;return e&&o++,e},x=function(t){var e=w(t),i="@"===t?14:"!"===t?20:"y"===t&&e?4:"o"===t?3:2,n=RegExp("^\\d{1,"+i+"}"),o=s.substring(l).match(n);if(!o)throw"Missing number at position "+l;return l+=o[0].length,parseInt(o[0],10)},k=function(i,n,o){var a=-1,r=t.map(w(i)?o:n,function(t,e){return[[e,t]]}).sort(function(t,e){return-(t[1].length-e[1].length)});if(t.each(r,function(t,i){var n=i[1];return s.substr(l,n.length).toLowerCase()===n.toLowerCase()?(a=i[0],l+=n.length,!1):e}),-1!==a)return a+1;throw"Unknown name at position "+l},D=function(){if(s.charAt(l)!==i.charAt(o))throw"Unexpected literal at position "+l;l++};for(o=0;i.length>o;o++)if(y)"'"!==i.charAt(o)||w("'")?D():y=!1;else switch(i.charAt(o)){case"d":_=x("d");break;case"D":k("D",d,p);break;case"o":b=x("o");break;case"m":v=x("m");break;case"M":v=k("M",f,g);break;case"y":m=x("y");break;case"@":h=new Date(x("@")),m=h.getFullYear(),v=h.getMonth()+1,_=h.getDate();break;case"!":h=new Date((x("!")-this._ticksTo1970)/1e4),m=h.getFullYear(),v=h.getMonth()+1,_=h.getDate();break;case"'":w("'")?D():y=!0;break;default:D()}if(s.length>l&&(r=s.substr(l),!/^\s+/.test(r)))throw"Extra/unparsed characters found in date: "+r;if(-1===m?m=(new Date).getFullYear():100>m&&(m+=(new Date).getFullYear()-(new Date).getFullYear()%100+(u>=m?0:-100)),b>-1)for(v=1,_=b;;){if(a=this._getDaysInMonth(m,v-1),a>=_)break;v++,_-=a}if(h=this._daylightSavingAdjust(new Date(m,v-1,_)),h.getFullYear()!==m||h.getMonth()+1!==v||h.getDate()!==_)throw"Invalid date";return h},ATOM:"yy-mm-dd",COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd",RFC_822:"D, d M y",RFC_850:"DD, dd-M-y",RFC_1036:"D, d M y",RFC_1123:"D, d M yy",RFC_2822:"D, d M yy",RSS:"D, d M y",TICKS:"!",TIMESTAMP:"@",W3C:"yy-mm-dd",_ticksTo1970:1e7*60*60*24*(718685+Math.floor(492.5)-Math.floor(19.7)+Math.floor(4.925)),formatDate:function(t,e,i){if(!e)return"";var s,n=(i?i.dayNamesShort:null)||this._defaults.dayNamesShort,o=(i?i.dayNames:null)||this._defaults.dayNames,a=(i?i.monthNamesShort:null)||this._defaults.monthNamesShort,r=(i?i.monthNames:null)||this._defaults.monthNames,h=function(e){var i=t.length>s+1&&t.charAt(s+1)===e;return i&&s++,i},l=function(t,e,i){var s=""+e;if(h(t))for(;i>s.length;)s="0"+s;return s},c=function(t,e,i,s){return h(t)?s[e]:i[e]},u="",d=!1;if(e)for(s=0;t.length>s;s++)if(d)"'"!==t.charAt(s)||h("'")?u+=t.charAt(s):d=!1;else switch(t.charAt(s)){case"d":u+=l("d",e.getDate(),2);break;case"D":u+=c("D",e.getDay(),n,o);break;case"o":u+=l("o",Math.round((new Date(e.getFullYear(),e.getMonth(),e.getDate()).getTime()-new Date(e.getFullYear(),0,0).getTime())/864e5),3);break;case"m":u+=l("m",e.getMonth()+1,2);break;case"M":u+=c("M",e.getMonth(),a,r);break;case"y":u+=h("y")?e.getFullYear():(10>e.getYear()%100?"0":"")+e.getYear()%100;break;case"@":u+=e.getTime();break;case"!":u+=1e4*e.getTime()+this._ticksTo1970;break;case"'":h("'")?u+="'":d=!0;break;default:u+=t.charAt(s)}return u},_possibleChars:function(t){var e,i="",s=!1,n=function(i){var s=t.length>e+1&&t.charAt(e+1)===i;return s&&e++,s};for(e=0;t.length>e;e++)if(s)"'"!==t.charAt(e)||n("'")?i+=t.charAt(e):s=!1;else switch(t.charAt(e)){case"d":case"m":case"y":case"@":i+="0123456789";break;case"D":case"M":return null;case"'":n("'")?i+="'":s=!0;break;default:i+=t.charAt(e)}return i},_get:function(t,i){return t.settings[i]!==e?t.settings[i]:this._defaults[i]},_setDateFromField:function(t,e){if(t.input.val()!==t.lastVal){var i=this._get(t,"dateFormat"),s=t.lastVal=t.input?t.input.val():null,n=this._getDefaultDate(t),o=n,a=this._getFormatConfig(t);try{o=this.parseDate(i,s,a)||n}catch(r){s=e?"":s}t.selectedDay=o.getDate(),t.drawMonth=t.selectedMonth=o.getMonth(),t.drawYear=t.selectedYear=o.getFullYear(),t.currentDay=s?o.getDate():0,t.currentMonth=s?o.getMonth():0,t.currentYear=s?o.getFullYear():0,this._adjustInstDate(t)}},_getDefaultDate:function(t){return this._restrictMinMax(t,this._determineDate(t,this._get(t,"defaultDate"),new Date))},_determineDate:function(e,i,s){var n=function(t){var e=new Date;return e.setDate(e.getDate()+t),e},o=function(i){try{return t.datepicker.parseDate(t.datepicker._get(e,"dateFormat"),i,t.datepicker._getFormatConfig(e))}catch(s){}for(var n=(i.toLowerCase().match(/^c/)?t.datepicker._getDate(e):null)||new Date,o=n.getFullYear(),a=n.getMonth(),r=n.getDate(),h=/([+\-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g,l=h.exec(i);l;){switch(l[2]||"d"){case"d":case"D":r+=parseInt(l[1],10);break;case"w":case"W":r+=7*parseInt(l[1],10);break;case"m":case"M":a+=parseInt(l[1],10),r=Math.min(r,t.datepicker._getDaysInMonth(o,a));break;case"y":case"Y":o+=parseInt(l[1],10),r=Math.min(r,t.datepicker._getDaysInMonth(o,a))}l=h.exec(i)}return new Date(o,a,r)},a=null==i||""===i?s:"string"==typeof i?o(i):"number"==typeof i?isNaN(i)?s:n(i):new Date(i.getTime());return a=a&&"Invalid Date"==""+a?s:a,a&&(a.setHours(0),a.setMinutes(0),a.setSeconds(0),a.setMilliseconds(0)),this._daylightSavingAdjust(a)},_daylightSavingAdjust:function(t){return t?(t.setHours(t.getHours()>12?t.getHours()+2:0),t):null},_setDate:function(t,e,i){var s=!e,n=t.selectedMonth,o=t.selectedYear,a=this._restrictMinMax(t,this._determineDate(t,e,new Date));t.selectedDay=t.currentDay=a.getDate(),t.drawMonth=t.selectedMonth=t.currentMonth=a.getMonth(),t.drawYear=t.selectedYear=t.currentYear=a.getFullYear(),n===t.selectedMonth&&o===t.selectedYear||i||this._notifyChange(t),this._adjustInstDate(t),t.input&&t.input.val(s?"":this._formatDate(t))},_getDate:function(t){var e=!t.currentYear||t.input&&""===t.input.val()?null:this._daylightSavingAdjust(new Date(t.currentYear,t.currentMonth,t.currentDay));return e},_attachHandlers:function(e){var i=this._get(e,"stepMonths"),s="#"+e.id.replace(/\\\\/g,"\\");e.dpDiv.find("[data-handler]").map(function(){var e={prev:function(){t.datepicker._adjustDate(s,-i,"M")},next:function(){t.datepicker._adjustDate(s,+i,"M")},hide:function(){t.datepicker._hideDatepicker()},today:function(){t.datepicker._gotoToday(s)},selectDay:function(){return t.datepicker._selectDay(s,+this.getAttribute("data-month"),+this.getAttribute("data-year"),this),!1},selectMonth:function(){return t.datepicker._selectMonthYear(s,this,"M"),!1},selectYear:function(){return t.datepicker._selectMonthYear(s,this,"Y"),!1}};t(this).bind(this.getAttribute("data-event"),e[this.getAttribute("data-handler")])})},_generateHTML:function(t){var e,i,s,n,o,a,r,h,l,c,u,d,p,f,g,m,v,_,b,y,w,x,k,D,C,I,P,T,M,S,z,A,E,H,N,W,O,F,R,L=new Date,j=this._daylightSavingAdjust(new Date(L.getFullYear(),L.getMonth(),L.getDate())),Y=this._get(t,"isRTL"),B=this._get(t,"showButtonPanel"),V=this._get(t,"hideIfNoPrevNext"),K=this._get(t,"navigationAsDateFormat"),q=this._getNumberOfMonths(t),U=this._get(t,"showCurrentAtPos"),Q=this._get(t,"stepMonths"),X=1!==q[0]||1!==q[1],$=this._daylightSavingAdjust(t.currentDay?new Date(t.currentYear,t.currentMonth,t.currentDay):new Date(9999,9,9)),G=this._getMinMaxDate(t,"min"),J=this._getMinMaxDate(t,"max"),Z=t.drawMonth-U,te=t.drawYear;if(0>Z&&(Z+=12,te--),J)for(e=this._daylightSavingAdjust(new Date(J.getFullYear(),J.getMonth()-q[0]*q[1]+1,J.getDate())),e=G&&G>e?G:e;this._daylightSavingAdjust(new Date(te,Z,1))>e;)Z--,0>Z&&(Z=11,te--);for(t.drawMonth=Z,t.drawYear=te,i=this._get(t,"prevText"),i=K?this.formatDate(i,this._daylightSavingAdjust(new Date(te,Z-Q,1)),this._getFormatConfig(t)):i,s=this._canAdjustMonth(t,-1,te,Z)?"<a class='ui-datepicker-prev ui-corner-all' data-handler='prev' data-event='click' title='"+i+"'><span class='ui-icon ui-icon-circle-triangle-"+(Y?"e":"w")+"'>"+i+"</span></a>":V?"":"<a class='ui-datepicker-prev ui-corner-all ui-state-disabled' title='"+i+"'><span class='ui-icon ui-icon-circle-triangle-"+(Y?"e":"w")+"'>"+i+"</span></a>",n=this._get(t,"nextText"),n=K?this.formatDate(n,this._daylightSavingAdjust(new Date(te,Z+Q,1)),this._getFormatConfig(t)):n,o=this._canAdjustMonth(t,1,te,Z)?"<a class='ui-datepicker-next ui-corner-all' data-handler='next' data-event='click' title='"+n+"'><span class='ui-icon ui-icon-circle-triangle-"+(Y?"w":"e")+"'>"+n+"</span></a>":V?"":"<a class='ui-datepicker-next ui-corner-all ui-state-disabled' title='"+n+"'><span class='ui-icon ui-icon-circle-triangle-"+(Y?"w":"e")+"'>"+n+"</span></a>",a=this._get(t,"currentText"),r=this._get(t,"gotoCurrent")&&t.currentDay?$:j,a=K?this.formatDate(a,r,this._getFormatConfig(t)):a,h=t.inline?"":"<button type='button' class='ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all' data-handler='hide' data-event='click'>"+this._get(t,"closeText")+"</button>",l=B?"<div class='ui-datepicker-buttonpane ui-widget-content'>"+(Y?h:"")+(this._isInRange(t,r)?"<button type='button' class='ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all' data-handler='today' data-event='click'>"+a+"</button>":"")+(Y?"":h)+"</div>":"",c=parseInt(this._get(t,"firstDay"),10),c=isNaN(c)?0:c,u=this._get(t,"showWeek"),d=this._get(t,"dayNames"),p=this._get(t,"dayNamesMin"),f=this._get(t,"monthNames"),g=this._get(t,"monthNamesShort"),m=this._get(t,"beforeShowDay"),v=this._get(t,"showOtherMonths"),_=this._get(t,"selectOtherMonths"),b=this._getDefaultDate(t),y="",x=0;q[0]>x;x++){for(k="",this.maxRows=4,D=0;q[1]>D;D++){if(C=this._daylightSavingAdjust(new Date(te,Z,t.selectedDay)),I=" ui-corner-all",P="",X){if(P+="<div class='ui-datepicker-group",q[1]>1)switch(D){case 0:P+=" ui-datepicker-group-first",I=" ui-corner-"+(Y?"right":"left");break;case q[1]-1:P+=" ui-datepicker-group-last",I=" ui-corner-"+(Y?"left":"right");break;default:P+=" ui-datepicker-group-middle",I=""}P+="'>"}for(P+="<div class='ui-datepicker-header ui-widget-header ui-helper-clearfix"+I+"'>"+(/all|left/.test(I)&&0===x?Y?o:s:"")+(/all|right/.test(I)&&0===x?Y?s:o:"")+this._generateMonthYearHeader(t,Z,te,G,J,x>0||D>0,f,g)+"</div><table class='ui-datepicker-calendar'><thead>"+"<tr>",T=u?"<th class='ui-datepicker-week-col'>"+this._get(t,"weekHeader")+"</th>":"",w=0;7>w;w++)M=(w+c)%7,T+="<th"+((w+c+6)%7>=5?" class='ui-datepicker-week-end'":"")+">"+"<span title='"+d[M]+"'>"+p[M]+"</span></th>";for(P+=T+"</tr></thead><tbody>",S=this._getDaysInMonth(te,Z),te===t.selectedYear&&Z===t.selectedMonth&&(t.selectedDay=Math.min(t.selectedDay,S)),z=(this._getFirstDayOfMonth(te,Z)-c+7)%7,A=Math.ceil((z+S)/7),E=X?this.maxRows>A?this.maxRows:A:A,this.maxRows=E,H=this._daylightSavingAdjust(new Date(te,Z,1-z)),N=0;E>N;N++){for(P+="<tr>",W=u?"<td class='ui-datepicker-week-col'>"+this._get(t,"calculateWeek")(H)+"</td>":"",w=0;7>w;w++)O=m?m.apply(t.input?t.input[0]:null,[H]):[!0,""],F=H.getMonth()!==Z,R=F&&!_||!O[0]||G&&G>H||J&&H>J,W+="<td class='"+((w+c+6)%7>=5?" ui-datepicker-week-end":"")+(F?" ui-datepicker-other-month":"")+(H.getTime()===C.getTime()&&Z===t.selectedMonth&&t._keyEvent||b.getTime()===H.getTime()&&b.getTime()===C.getTime()?" "+this._dayOverClass:"")+(R?" "+this._unselectableClass+" ui-state-disabled":"")+(F&&!v?"":" "+O[1]+(H.getTime()===$.getTime()?" "+this._currentClass:"")+(H.getTime()===j.getTime()?" ui-datepicker-today":""))+"'"+(F&&!v||!O[2]?"":" title='"+O[2].replace(/'/g,"&#39;")+"'")+(R?"":" data-handler='selectDay' data-event='click' data-month='"+H.getMonth()+"' data-year='"+H.getFullYear()+"'")+">"+(F&&!v?"&#xa0;":R?"<span class='ui-state-default'>"+H.getDate()+"</span>":"<a class='ui-state-default"+(H.getTime()===j.getTime()?" ui-state-highlight":"")+(H.getTime()===$.getTime()?" ui-state-active":"")+(F?" ui-priority-secondary":"")+"' href='#'>"+H.getDate()+"</a>")+"</td>",H.setDate(H.getDate()+1),H=this._daylightSavingAdjust(H);P+=W+"</tr>"}Z++,Z>11&&(Z=0,te++),P+="</tbody></table>"+(X?"</div>"+(q[0]>0&&D===q[1]-1?"<div class='ui-datepicker-row-break'></div>":""):""),k+=P}y+=k}return y+=l,t._keyEvent=!1,y},_generateMonthYearHeader:function(t,e,i,s,n,o,a,r){var h,l,c,u,d,p,f,g,m=this._get(t,"changeMonth"),v=this._get(t,"changeYear"),_=this._get(t,"showMonthAfterYear"),b="<div class='ui-datepicker-title'>",y="";if(o||!m)y+="<span class='ui-datepicker-month'>"+a[e]+"</span>";else{for(h=s&&s.getFullYear()===i,l=n&&n.getFullYear()===i,y+="<select class='ui-datepicker-month' data-handler='selectMonth' data-event='change'>",c=0;12>c;c++)(!h||c>=s.getMonth())&&(!l||n.getMonth()>=c)&&(y+="<option value='"+c+"'"+(c===e?" selected='selected'":"")+">"+r[c]+"</option>");y+="</select>"}if(_||(b+=y+(!o&&m&&v?"":"&#xa0;")),!t.yearshtml)if(t.yearshtml="",o||!v)b+="<span class='ui-datepicker-year'>"+i+"</span>";else{for(u=this._get(t,"yearRange").split(":"),d=(new Date).getFullYear(),p=function(t){var e=t.match(/c[+\-].*/)?i+parseInt(t.substring(1),10):t.match(/[+\-].*/)?d+parseInt(t,10):parseInt(t,10);return isNaN(e)?d:e},f=p(u[0]),g=Math.max(f,p(u[1]||"")),f=s?Math.max(f,s.getFullYear()):f,g=n?Math.min(g,n.getFullYear()):g,t.yearshtml+="<select class='ui-datepicker-year' data-handler='selectYear' data-event='change'>";g>=f;f++)t.yearshtml+="<option value='"+f+"'"+(f===i?" selected='selected'":"")+">"+f+"</option>";t.yearshtml+="</select>",b+=t.yearshtml,t.yearshtml=null}return b+=this._get(t,"yearSuffix"),_&&(b+=(!o&&m&&v?"":"&#xa0;")+y),b+="</div>"},_adjustInstDate:function(t,e,i){var s=t.drawYear+("Y"===i?e:0),n=t.drawMonth+("M"===i?e:0),o=Math.min(t.selectedDay,this._getDaysInMonth(s,n))+("D"===i?e:0),a=this._restrictMinMax(t,this._daylightSavingAdjust(new Date(s,n,o)));t.selectedDay=a.getDate(),t.drawMonth=t.selectedMonth=a.getMonth(),t.drawYear=t.selectedYear=a.getFullYear(),("M"===i||"Y"===i)&&this._notifyChange(t)},_restrictMinMax:function(t,e){var i=this._getMinMaxDate(t,"min"),s=this._getMinMaxDate(t,"max"),n=i&&i>e?i:e;return s&&n>s?s:n},_notifyChange:function(t){var e=this._get(t,"onChangeMonthYear");e&&e.apply(t.input?t.input[0]:null,[t.selectedYear,t.selectedMonth+1,t])},_getNumberOfMonths:function(t){var e=this._get(t,"numberOfMonths");return null==e?[1,1]:"number"==typeof e?[1,e]:e},_getMinMaxDate:function(t,e){return this._determineDate(t,this._get(t,e+"Date"),null)},_getDaysInMonth:function(t,e){return 32-this._daylightSavingAdjust(new Date(t,e,32)).getDate()},_getFirstDayOfMonth:function(t,e){return new Date(t,e,1).getDay()},_canAdjustMonth:function(t,e,i,s){var n=this._getNumberOfMonths(t),o=this._daylightSavingAdjust(new Date(i,s+(0>e?e:n[0]*n[1]),1));return 0>e&&o.setDate(this._getDaysInMonth(o.getFullYear(),o.getMonth())),this._isInRange(t,o)},_isInRange:function(t,e){var i,s,n=this._getMinMaxDate(t,"min"),o=this._getMinMaxDate(t,"max"),a=null,r=null,h=this._get(t,"yearRange");return h&&(i=h.split(":"),s=(new Date).getFullYear(),a=parseInt(i[0],10),r=parseInt(i[1],10),i[0].match(/[+\-].*/)&&(a+=s),i[1].match(/[+\-].*/)&&(r+=s)),(!n||e.getTime()>=n.getTime())&&(!o||e.getTime()<=o.getTime())&&(!a||e.getFullYear()>=a)&&(!r||r>=e.getFullYear())},_getFormatConfig:function(t){var e=this._get(t,"shortYearCutoff");return e="string"!=typeof e?e:(new Date).getFullYear()%100+parseInt(e,10),{shortYearCutoff:e,dayNamesShort:this._get(t,"dayNamesShort"),dayNames:this._get(t,"dayNames"),monthNamesShort:this._get(t,"monthNamesShort"),monthNames:this._get(t,"monthNames")}},_formatDate:function(t,e,i,s){e||(t.currentDay=t.selectedDay,t.currentMonth=t.selectedMonth,t.currentYear=t.selectedYear);var n=e?"object"==typeof e?e:this._daylightSavingAdjust(new Date(s,i,e)):this._daylightSavingAdjust(new Date(t.currentYear,t.currentMonth,t.currentDay));return this.formatDate(this._get(t,"dateFormat"),n,this._getFormatConfig(t))}}),t.fn.datepicker=function(e){if(!this.length)return this;t.datepicker.initialized||(t(document).mousedown(t.datepicker._checkExternalClick),t.datepicker.initialized=!0),0===t("#"+t.datepicker._mainDivId).length&&t("body").append(t.datepicker.dpDiv);var i=Array.prototype.slice.call(arguments,1);return"string"!=typeof e||"isDisabled"!==e&&"getDate"!==e&&"widget"!==e?"option"===e&&2===arguments.length&&"string"==typeof arguments[1]?t.datepicker["_"+e+"Datepicker"].apply(t.datepicker,[this[0]].concat(i)):this.each(function(){"string"==typeof e?t.datepicker["_"+e+"Datepicker"].apply(t.datepicker,[this].concat(i)):t.datepicker._attachDatepicker(this,e)}):t.datepicker["_"+e+"Datepicker"].apply(t.datepicker,[this[0]].concat(i))},t.datepicker=new i,t.datepicker.initialized=!1,t.datepicker.uuid=(new Date).getTime(),t.datepicker.version="1.10.4"}(jQuery),function(t){var e={buttons:!0,height:!0,maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0,width:!0},i={maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0};t.widget("ui.dialog",{version:"1.10.4",options:{appendTo:"body",autoOpen:!0,buttons:[],closeOnEscape:!0,closeText:"close",dialogClass:"",draggable:!0,hide:null,height:"auto",maxHeight:null,maxWidth:null,minHeight:150,minWidth:150,modal:!1,position:{my:"center",at:"center",of:window,collision:"fit",using:function(e){var i=t(this).css(e).offset().top;0>i&&t(this).css("top",e.top-i)}},resizable:!0,show:null,title:null,width:300,beforeClose:null,close:null,drag:null,dragStart:null,dragStop:null,focus:null,open:null,resize:null,resizeStart:null,resizeStop:null},_create:function(){this.originalCss={display:this.element[0].style.display,width:this.element[0].style.width,minHeight:this.element[0].style.minHeight,maxHeight:this.element[0].style.maxHeight,height:this.element[0].style.height},this.originalPosition={parent:this.element.parent(),index:this.element.parent().children().index(this.element)},this.originalTitle=this.element.attr("title"),this.options.title=this.options.title||this.originalTitle,this._createWrapper(),this.element.show().removeAttr("title").addClass("ui-dialog-content ui-widget-content").appendTo(this.uiDialog),this._createTitlebar(),this._createButtonPane(),this.options.draggable&&t.fn.draggable&&this._makeDraggable(),this.options.resizable&&t.fn.resizable&&this._makeResizable(),this._isOpen=!1},_init:function(){this.options.autoOpen&&this.open()},_appendTo:function(){var e=this.options.appendTo;return e&&(e.jquery||e.nodeType)?t(e):this.document.find(e||"body").eq(0)},_destroy:function(){var t,e=this.originalPosition;this._destroyOverlay(),this.element.removeUniqueId().removeClass("ui-dialog-content ui-widget-content").css(this.originalCss).detach(),this.uiDialog.stop(!0,!0).remove(),this.originalTitle&&this.element.attr("title",this.originalTitle),t=e.parent.children().eq(e.index),t.length&&t[0]!==this.element[0]?t.before(this.element):e.parent.append(this.element)},widget:function(){return this.uiDialog},disable:t.noop,enable:t.noop,close:function(e){var i,s=this;if(this._isOpen&&this._trigger("beforeClose",e)!==!1){if(this._isOpen=!1,this._destroyOverlay(),!this.opener.filter(":focusable").focus().length)try{i=this.document[0].activeElement,i&&"body"!==i.nodeName.toLowerCase()&&t(i).blur()}catch(n){}this._hide(this.uiDialog,this.options.hide,function(){s._trigger("close",e)})}},isOpen:function(){return this._isOpen},moveToTop:function(){this._moveToTop()},_moveToTop:function(t,e){var i=!!this.uiDialog.nextAll(":visible").insertBefore(this.uiDialog).length;return i&&!e&&this._trigger("focus",t),i},open:function(){var e=this;return this._isOpen?(this._moveToTop()&&this._focusTabbable(),undefined):(this._isOpen=!0,this.opener=t(this.document[0].activeElement),this._size(),this._position(),this._createOverlay(),this._moveToTop(null,!0),this._show(this.uiDialog,this.options.show,function(){e._focusTabbable(),e._trigger("focus")}),this._trigger("open"),undefined)},_focusTabbable:function(){var t=this.element.find("[autofocus]");t.length||(t=this.element.find(":tabbable")),t.length||(t=this.uiDialogButtonPane.find(":tabbable")),t.length||(t=this.uiDialogTitlebarClose.filter(":tabbable")),t.length||(t=this.uiDialog),t.eq(0).focus()},_keepFocus:function(e){function i(){var e=this.document[0].activeElement,i=this.uiDialog[0]===e||t.contains(this.uiDialog[0],e);i||this._focusTabbable()}e.preventDefault(),i.call(this),this._delay(i)},_createWrapper:function(){this.uiDialog=t("<div>").addClass("ui-dialog ui-widget ui-widget-content ui-corner-all ui-front "+this.options.dialogClass).hide().attr({tabIndex:-1,role:"dialog"}).appendTo(this._appendTo()),this._on(this.uiDialog,{keydown:function(e){if(this.options.closeOnEscape&&!e.isDefaultPrevented()&&e.keyCode&&e.keyCode===t.ui.keyCode.ESCAPE)return e.preventDefault(),this.close(e),undefined;if(e.keyCode===t.ui.keyCode.TAB){var i=this.uiDialog.find(":tabbable"),s=i.filter(":first"),n=i.filter(":last");e.target!==n[0]&&e.target!==this.uiDialog[0]||e.shiftKey?e.target!==s[0]&&e.target!==this.uiDialog[0]||!e.shiftKey||(n.focus(1),e.preventDefault()):(s.focus(1),e.preventDefault())}},mousedown:function(t){this._moveToTop(t)&&this._focusTabbable()}}),this.element.find("[aria-describedby]").length||this.uiDialog.attr({"aria-describedby":this.element.uniqueId().attr("id")})},_createTitlebar:function(){var e;this.uiDialogTitlebar=t("<div>").addClass("ui-dialog-titlebar ui-widget-header ui-corner-all ui-helper-clearfix").prependTo(this.uiDialog),this._on(this.uiDialogTitlebar,{mousedown:function(e){t(e.target).closest(".ui-dialog-titlebar-close")||this.uiDialog.focus()}}),this.uiDialogTitlebarClose=t("<button type='button'></button>").button({label:this.options.closeText,icons:{primary:"ui-icon-closethick"},text:!1}).addClass("ui-dialog-titlebar-close").appendTo(this.uiDialogTitlebar),this._on(this.uiDialogTitlebarClose,{click:function(t){t.preventDefault(),this.close(t)}}),e=t("<span>").uniqueId().addClass("ui-dialog-title").prependTo(this.uiDialogTitlebar),this._title(e),this.uiDialog.attr({"aria-labelledby":e.attr("id")})},_title:function(t){this.options.title||t.html("&#160;"),t.text(this.options.title)},_createButtonPane:function(){this.uiDialogButtonPane=t("<div>").addClass("ui-dialog-buttonpane ui-widget-content ui-helper-clearfix"),this.uiButtonSet=t("<div>").addClass("ui-dialog-buttonset").appendTo(this.uiDialogButtonPane),this._createButtons()},_createButtons:function(){var e=this,i=this.options.buttons;return this.uiDialogButtonPane.remove(),this.uiButtonSet.empty(),t.isEmptyObject(i)||t.isArray(i)&&!i.length?(this.uiDialog.removeClass("ui-dialog-buttons"),undefined):(t.each(i,function(i,s){var n,o;s=t.isFunction(s)?{click:s,text:i}:s,s=t.extend({type:"button"},s),n=s.click,s.click=function(){n.apply(e.element[0],arguments)},o={icons:s.icons,text:s.showText},delete s.icons,delete s.showText,t("<button></button>",s).button(o).appendTo(e.uiButtonSet)}),this.uiDialog.addClass("ui-dialog-buttons"),this.uiDialogButtonPane.appendTo(this.uiDialog),undefined)},_makeDraggable:function(){function e(t){return{position:t.position,offset:t.offset}}var i=this,s=this.options;this.uiDialog.draggable({cancel:".ui-dialog-content, .ui-dialog-titlebar-close",handle:".ui-dialog-titlebar",containment:"document",start:function(s,n){t(this).addClass("ui-dialog-dragging"),i._blockFrames(),i._trigger("dragStart",s,e(n))},drag:function(t,s){i._trigger("drag",t,e(s))},stop:function(n,o){s.position=[o.position.left-i.document.scrollLeft(),o.position.top-i.document.scrollTop()],t(this).removeClass("ui-dialog-dragging"),i._unblockFrames(),i._trigger("dragStop",n,e(o))}})},_makeResizable:function(){function e(t){return{originalPosition:t.originalPosition,originalSize:t.originalSize,position:t.position,size:t.size}}var i=this,s=this.options,n=s.resizable,o=this.uiDialog.css("position"),a="string"==typeof n?n:"n,e,s,w,se,sw,ne,nw";
+this.uiDialog.resizable({cancel:".ui-dialog-content",containment:"document",alsoResize:this.element,maxWidth:s.maxWidth,maxHeight:s.maxHeight,minWidth:s.minWidth,minHeight:this._minHeight(),handles:a,start:function(s,n){t(this).addClass("ui-dialog-resizing"),i._blockFrames(),i._trigger("resizeStart",s,e(n))},resize:function(t,s){i._trigger("resize",t,e(s))},stop:function(n,o){s.height=t(this).height(),s.width=t(this).width(),t(this).removeClass("ui-dialog-resizing"),i._unblockFrames(),i._trigger("resizeStop",n,e(o))}}).css("position",o)},_minHeight:function(){var t=this.options;return"auto"===t.height?t.minHeight:Math.min(t.minHeight,t.height)},_position:function(){var t=this.uiDialog.is(":visible");t||this.uiDialog.show(),this.uiDialog.position(this.options.position),t||this.uiDialog.hide()},_setOptions:function(s){var n=this,o=!1,a={};t.each(s,function(t,s){n._setOption(t,s),t in e&&(o=!0),t in i&&(a[t]=s)}),o&&(this._size(),this._position()),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option",a)},_setOption:function(t,e){var i,s,n=this.uiDialog;"dialogClass"===t&&n.removeClass(this.options.dialogClass).addClass(e),"disabled"!==t&&(this._super(t,e),"appendTo"===t&&this.uiDialog.appendTo(this._appendTo()),"buttons"===t&&this._createButtons(),"closeText"===t&&this.uiDialogTitlebarClose.button({label:""+e}),"draggable"===t&&(i=n.is(":data(ui-draggable)"),i&&!e&&n.draggable("destroy"),!i&&e&&this._makeDraggable()),"position"===t&&this._position(),"resizable"===t&&(s=n.is(":data(ui-resizable)"),s&&!e&&n.resizable("destroy"),s&&"string"==typeof e&&n.resizable("option","handles",e),s||e===!1||this._makeResizable()),"title"===t&&this._title(this.uiDialogTitlebar.find(".ui-dialog-title")))},_size:function(){var t,e,i,s=this.options;this.element.show().css({width:"auto",minHeight:0,maxHeight:"none",height:0}),s.minWidth>s.width&&(s.width=s.minWidth),t=this.uiDialog.css({height:"auto",width:s.width}).outerHeight(),e=Math.max(0,s.minHeight-t),i="number"==typeof s.maxHeight?Math.max(0,s.maxHeight-t):"none","auto"===s.height?this.element.css({minHeight:e,maxHeight:i,height:"auto"}):this.element.height(Math.max(0,s.height-t)),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option","minHeight",this._minHeight())},_blockFrames:function(){this.iframeBlocks=this.document.find("iframe").map(function(){var e=t(this);return t("<div>").css({position:"absolute",width:e.outerWidth(),height:e.outerHeight()}).appendTo(e.parent()).offset(e.offset())[0]})},_unblockFrames:function(){this.iframeBlocks&&(this.iframeBlocks.remove(),delete this.iframeBlocks)},_allowInteraction:function(e){return t(e.target).closest(".ui-dialog").length?!0:!!t(e.target).closest(".ui-datepicker").length},_createOverlay:function(){if(this.options.modal){var e=this,i=this.widgetFullName;t.ui.dialog.overlayInstances||this._delay(function(){t.ui.dialog.overlayInstances&&this.document.bind("focusin.dialog",function(s){e._allowInteraction(s)||(s.preventDefault(),t(".ui-dialog:visible:last .ui-dialog-content").data(i)._focusTabbable())})}),this.overlay=t("<div>").addClass("ui-widget-overlay ui-front").appendTo(this._appendTo()),this._on(this.overlay,{mousedown:"_keepFocus"}),t.ui.dialog.overlayInstances++}},_destroyOverlay:function(){this.options.modal&&this.overlay&&(t.ui.dialog.overlayInstances--,t.ui.dialog.overlayInstances||this.document.unbind("focusin.dialog"),this.overlay.remove(),this.overlay=null)}}),t.ui.dialog.overlayInstances=0,t.uiBackCompat!==!1&&t.widget("ui.dialog",t.ui.dialog,{_position:function(){var e,i=this.options.position,s=[],n=[0,0];i?(("string"==typeof i||"object"==typeof i&&"0"in i)&&(s=i.split?i.split(" "):[i[0],i[1]],1===s.length&&(s[1]=s[0]),t.each(["left","top"],function(t,e){+s[t]===s[t]&&(n[t]=s[t],s[t]=e)}),i={my:s[0]+(0>n[0]?n[0]:"+"+n[0])+" "+s[1]+(0>n[1]?n[1]:"+"+n[1]),at:s.join(" ")}),i=t.extend({},t.ui.dialog.prototype.options.position,i)):i=t.ui.dialog.prototype.options.position,e=this.uiDialog.is(":visible"),e||this.uiDialog.show(),this.uiDialog.position(i),e||this.uiDialog.hide()}})}(jQuery),function(t){var e=/up|down|vertical/,i=/up|left|vertical|horizontal/;t.effects.effect.blind=function(s,n){var o,a,r,h=t(this),l=["position","top","bottom","left","right","height","width"],c=t.effects.setMode(h,s.mode||"hide"),u=s.direction||"up",d=e.test(u),p=d?"height":"width",f=d?"top":"left",g=i.test(u),m={},v="show"===c;h.parent().is(".ui-effects-wrapper")?t.effects.save(h.parent(),l):t.effects.save(h,l),h.show(),o=t.effects.createWrapper(h).css({overflow:"hidden"}),a=o[p](),r=parseFloat(o.css(f))||0,m[p]=v?a:0,g||(h.css(d?"bottom":"right",0).css(d?"top":"left","auto").css({position:"absolute"}),m[f]=v?r:a+r),v&&(o.css(p,0),g||o.css(f,r+a)),o.animate(m,{duration:s.duration,easing:s.easing,queue:!1,complete:function(){"hide"===c&&h.hide(),t.effects.restore(h,l),t.effects.removeWrapper(h),n()}})}}(jQuery),function(t){t.effects.effect.bounce=function(e,i){var s,n,o,a=t(this),r=["position","top","bottom","left","right","height","width"],h=t.effects.setMode(a,e.mode||"effect"),l="hide"===h,c="show"===h,u=e.direction||"up",d=e.distance,p=e.times||5,f=2*p+(c||l?1:0),g=e.duration/f,m=e.easing,v="up"===u||"down"===u?"top":"left",_="up"===u||"left"===u,b=a.queue(),y=b.length;for((c||l)&&r.push("opacity"),t.effects.save(a,r),a.show(),t.effects.createWrapper(a),d||(d=a["top"===v?"outerHeight":"outerWidth"]()/3),c&&(o={opacity:1},o[v]=0,a.css("opacity",0).css(v,_?2*-d:2*d).animate(o,g,m)),l&&(d/=Math.pow(2,p-1)),o={},o[v]=0,s=0;p>s;s++)n={},n[v]=(_?"-=":"+=")+d,a.animate(n,g,m).animate(o,g,m),d=l?2*d:d/2;l&&(n={opacity:0},n[v]=(_?"-=":"+=")+d,a.animate(n,g,m)),a.queue(function(){l&&a.hide(),t.effects.restore(a,r),t.effects.removeWrapper(a),i()}),y>1&&b.splice.apply(b,[1,0].concat(b.splice(y,f+1))),a.dequeue()}}(jQuery),function(t){t.effects.effect.clip=function(e,i){var s,n,o,a=t(this),r=["position","top","bottom","left","right","height","width"],h=t.effects.setMode(a,e.mode||"hide"),l="show"===h,c=e.direction||"vertical",u="vertical"===c,d=u?"height":"width",p=u?"top":"left",f={};t.effects.save(a,r),a.show(),s=t.effects.createWrapper(a).css({overflow:"hidden"}),n="IMG"===a[0].tagName?s:a,o=n[d](),l&&(n.css(d,0),n.css(p,o/2)),f[d]=l?o:0,f[p]=l?0:o/2,n.animate(f,{queue:!1,duration:e.duration,easing:e.easing,complete:function(){l||a.hide(),t.effects.restore(a,r),t.effects.removeWrapper(a),i()}})}}(jQuery),function(t){t.effects.effect.drop=function(e,i){var s,n=t(this),o=["position","top","bottom","left","right","opacity","height","width"],a=t.effects.setMode(n,e.mode||"hide"),r="show"===a,h=e.direction||"left",l="up"===h||"down"===h?"top":"left",c="up"===h||"left"===h?"pos":"neg",u={opacity:r?1:0};t.effects.save(n,o),n.show(),t.effects.createWrapper(n),s=e.distance||n["top"===l?"outerHeight":"outerWidth"](!0)/2,r&&n.css("opacity",0).css(l,"pos"===c?-s:s),u[l]=(r?"pos"===c?"+=":"-=":"pos"===c?"-=":"+=")+s,n.animate(u,{queue:!1,duration:e.duration,easing:e.easing,complete:function(){"hide"===a&&n.hide(),t.effects.restore(n,o),t.effects.removeWrapper(n),i()}})}}(jQuery),function(t){t.effects.effect.explode=function(e,i){function s(){b.push(this),b.length===u*d&&n()}function n(){p.css({visibility:"visible"}),t(b).remove(),g||p.hide(),i()}var o,a,r,h,l,c,u=e.pieces?Math.round(Math.sqrt(e.pieces)):3,d=u,p=t(this),f=t.effects.setMode(p,e.mode||"hide"),g="show"===f,m=p.show().css("visibility","hidden").offset(),v=Math.ceil(p.outerWidth()/d),_=Math.ceil(p.outerHeight()/u),b=[];for(o=0;u>o;o++)for(h=m.top+o*_,c=o-(u-1)/2,a=0;d>a;a++)r=m.left+a*v,l=a-(d-1)/2,p.clone().appendTo("body").wrap("<div></div>").css({position:"absolute",visibility:"visible",left:-a*v,top:-o*_}).parent().addClass("ui-effects-explode").css({position:"absolute",overflow:"hidden",width:v,height:_,left:r+(g?l*v:0),top:h+(g?c*_:0),opacity:g?0:1}).animate({left:r+(g?0:l*v),top:h+(g?0:c*_),opacity:g?1:0},e.duration||500,e.easing,s)}}(jQuery),function(t){t.effects.effect.fade=function(e,i){var s=t(this),n=t.effects.setMode(s,e.mode||"toggle");s.animate({opacity:n},{queue:!1,duration:e.duration,easing:e.easing,complete:i})}}(jQuery),function(t){t.effects.effect.fold=function(e,i){var s,n,o=t(this),a=["position","top","bottom","left","right","height","width"],r=t.effects.setMode(o,e.mode||"hide"),h="show"===r,l="hide"===r,c=e.size||15,u=/([0-9]+)%/.exec(c),d=!!e.horizFirst,p=h!==d,f=p?["width","height"]:["height","width"],g=e.duration/2,m={},v={};t.effects.save(o,a),o.show(),s=t.effects.createWrapper(o).css({overflow:"hidden"}),n=p?[s.width(),s.height()]:[s.height(),s.width()],u&&(c=parseInt(u[1],10)/100*n[l?0:1]),h&&s.css(d?{height:0,width:c}:{height:c,width:0}),m[f[0]]=h?n[0]:c,v[f[1]]=h?n[1]:0,s.animate(m,g,e.easing).animate(v,g,e.easing,function(){l&&o.hide(),t.effects.restore(o,a),t.effects.removeWrapper(o),i()})}}(jQuery),function(t){t.effects.effect.highlight=function(e,i){var s=t(this),n=["backgroundImage","backgroundColor","opacity"],o=t.effects.setMode(s,e.mode||"show"),a={backgroundColor:s.css("backgroundColor")};"hide"===o&&(a.opacity=0),t.effects.save(s,n),s.show().css({backgroundImage:"none",backgroundColor:e.color||"#ffff99"}).animate(a,{queue:!1,duration:e.duration,easing:e.easing,complete:function(){"hide"===o&&s.hide(),t.effects.restore(s,n),i()}})}}(jQuery),function(t){t.effects.effect.pulsate=function(e,i){var s,n=t(this),o=t.effects.setMode(n,e.mode||"show"),a="show"===o,r="hide"===o,h=a||"hide"===o,l=2*(e.times||5)+(h?1:0),c=e.duration/l,u=0,d=n.queue(),p=d.length;for((a||!n.is(":visible"))&&(n.css("opacity",0).show(),u=1),s=1;l>s;s++)n.animate({opacity:u},c,e.easing),u=1-u;n.animate({opacity:u},c,e.easing),n.queue(function(){r&&n.hide(),i()}),p>1&&d.splice.apply(d,[1,0].concat(d.splice(p,l+1))),n.dequeue()}}(jQuery),function(t){t.effects.effect.puff=function(e,i){var s=t(this),n=t.effects.setMode(s,e.mode||"hide"),o="hide"===n,a=parseInt(e.percent,10)||150,r=a/100,h={height:s.height(),width:s.width(),outerHeight:s.outerHeight(),outerWidth:s.outerWidth()};t.extend(e,{effect:"scale",queue:!1,fade:!0,mode:n,complete:i,percent:o?a:100,from:o?h:{height:h.height*r,width:h.width*r,outerHeight:h.outerHeight*r,outerWidth:h.outerWidth*r}}),s.effect(e)},t.effects.effect.scale=function(e,i){var s=t(this),n=t.extend(!0,{},e),o=t.effects.setMode(s,e.mode||"effect"),a=parseInt(e.percent,10)||(0===parseInt(e.percent,10)?0:"hide"===o?0:100),r=e.direction||"both",h=e.origin,l={height:s.height(),width:s.width(),outerHeight:s.outerHeight(),outerWidth:s.outerWidth()},c={y:"horizontal"!==r?a/100:1,x:"vertical"!==r?a/100:1};n.effect="size",n.queue=!1,n.complete=i,"effect"!==o&&(n.origin=h||["middle","center"],n.restore=!0),n.from=e.from||("show"===o?{height:0,width:0,outerHeight:0,outerWidth:0}:l),n.to={height:l.height*c.y,width:l.width*c.x,outerHeight:l.outerHeight*c.y,outerWidth:l.outerWidth*c.x},n.fade&&("show"===o&&(n.from.opacity=0,n.to.opacity=1),"hide"===o&&(n.from.opacity=1,n.to.opacity=0)),s.effect(n)},t.effects.effect.size=function(e,i){var s,n,o,a=t(this),r=["position","top","bottom","left","right","width","height","overflow","opacity"],h=["position","top","bottom","left","right","overflow","opacity"],l=["width","height","overflow"],c=["fontSize"],u=["borderTopWidth","borderBottomWidth","paddingTop","paddingBottom"],d=["borderLeftWidth","borderRightWidth","paddingLeft","paddingRight"],p=t.effects.setMode(a,e.mode||"effect"),f=e.restore||"effect"!==p,g=e.scale||"both",m=e.origin||["middle","center"],v=a.css("position"),_=f?r:h,b={height:0,width:0,outerHeight:0,outerWidth:0};"show"===p&&a.show(),s={height:a.height(),width:a.width(),outerHeight:a.outerHeight(),outerWidth:a.outerWidth()},"toggle"===e.mode&&"show"===p?(a.from=e.to||b,a.to=e.from||s):(a.from=e.from||("show"===p?b:s),a.to=e.to||("hide"===p?b:s)),o={from:{y:a.from.height/s.height,x:a.from.width/s.width},to:{y:a.to.height/s.height,x:a.to.width/s.width}},("box"===g||"both"===g)&&(o.from.y!==o.to.y&&(_=_.concat(u),a.from=t.effects.setTransition(a,u,o.from.y,a.from),a.to=t.effects.setTransition(a,u,o.to.y,a.to)),o.from.x!==o.to.x&&(_=_.concat(d),a.from=t.effects.setTransition(a,d,o.from.x,a.from),a.to=t.effects.setTransition(a,d,o.to.x,a.to))),("content"===g||"both"===g)&&o.from.y!==o.to.y&&(_=_.concat(c).concat(l),a.from=t.effects.setTransition(a,c,o.from.y,a.from),a.to=t.effects.setTransition(a,c,o.to.y,a.to)),t.effects.save(a,_),a.show(),t.effects.createWrapper(a),a.css("overflow","hidden").css(a.from),m&&(n=t.effects.getBaseline(m,s),a.from.top=(s.outerHeight-a.outerHeight())*n.y,a.from.left=(s.outerWidth-a.outerWidth())*n.x,a.to.top=(s.outerHeight-a.to.outerHeight)*n.y,a.to.left=(s.outerWidth-a.to.outerWidth)*n.x),a.css(a.from),("content"===g||"both"===g)&&(u=u.concat(["marginTop","marginBottom"]).concat(c),d=d.concat(["marginLeft","marginRight"]),l=r.concat(u).concat(d),a.find("*[width]").each(function(){var i=t(this),s={height:i.height(),width:i.width(),outerHeight:i.outerHeight(),outerWidth:i.outerWidth()};f&&t.effects.save(i,l),i.from={height:s.height*o.from.y,width:s.width*o.from.x,outerHeight:s.outerHeight*o.from.y,outerWidth:s.outerWidth*o.from.x},i.to={height:s.height*o.to.y,width:s.width*o.to.x,outerHeight:s.height*o.to.y,outerWidth:s.width*o.to.x},o.from.y!==o.to.y&&(i.from=t.effects.setTransition(i,u,o.from.y,i.from),i.to=t.effects.setTransition(i,u,o.to.y,i.to)),o.from.x!==o.to.x&&(i.from=t.effects.setTransition(i,d,o.from.x,i.from),i.to=t.effects.setTransition(i,d,o.to.x,i.to)),i.css(i.from),i.animate(i.to,e.duration,e.easing,function(){f&&t.effects.restore(i,l)})})),a.animate(a.to,{queue:!1,duration:e.duration,easing:e.easing,complete:function(){0===a.to.opacity&&a.css("opacity",a.from.opacity),"hide"===p&&a.hide(),t.effects.restore(a,_),f||("static"===v?a.css({position:"relative",top:a.to.top,left:a.to.left}):t.each(["top","left"],function(t,e){a.css(e,function(e,i){var s=parseInt(i,10),n=t?a.to.left:a.to.top;return"auto"===i?n+"px":s+n+"px"})})),t.effects.removeWrapper(a),i()}})}}(jQuery),function(t){t.effects.effect.shake=function(e,i){var s,n=t(this),o=["position","top","bottom","left","right","height","width"],a=t.effects.setMode(n,e.mode||"effect"),r=e.direction||"left",h=e.distance||20,l=e.times||3,c=2*l+1,u=Math.round(e.duration/c),d="up"===r||"down"===r?"top":"left",p="up"===r||"left"===r,f={},g={},m={},v=n.queue(),_=v.length;for(t.effects.save(n,o),n.show(),t.effects.createWrapper(n),f[d]=(p?"-=":"+=")+h,g[d]=(p?"+=":"-=")+2*h,m[d]=(p?"-=":"+=")+2*h,n.animate(f,u,e.easing),s=1;l>s;s++)n.animate(g,u,e.easing).animate(m,u,e.easing);n.animate(g,u,e.easing).animate(f,u/2,e.easing).queue(function(){"hide"===a&&n.hide(),t.effects.restore(n,o),t.effects.removeWrapper(n),i()}),_>1&&v.splice.apply(v,[1,0].concat(v.splice(_,c+1))),n.dequeue()}}(jQuery),function(t){t.effects.effect.slide=function(e,i){var s,n=t(this),o=["position","top","bottom","left","right","width","height"],a=t.effects.setMode(n,e.mode||"show"),r="show"===a,h=e.direction||"left",l="up"===h||"down"===h?"top":"left",c="up"===h||"left"===h,u={};t.effects.save(n,o),n.show(),s=e.distance||n["top"===l?"outerHeight":"outerWidth"](!0),t.effects.createWrapper(n).css({overflow:"hidden"}),r&&n.css(l,c?isNaN(s)?"-"+s:-s:s),u[l]=(r?c?"+=":"-=":c?"-=":"+=")+s,n.animate(u,{queue:!1,duration:e.duration,easing:e.easing,complete:function(){"hide"===a&&n.hide(),t.effects.restore(n,o),t.effects.removeWrapper(n),i()}})}}(jQuery),function(t){t.effects.effect.transfer=function(e,i){var s=t(this),n=t(e.to),o="fixed"===n.css("position"),a=t("body"),r=o?a.scrollTop():0,h=o?a.scrollLeft():0,l=n.offset(),c={top:l.top-r,left:l.left-h,height:n.innerHeight(),width:n.innerWidth()},u=s.offset(),d=t("<div class='ui-effects-transfer'></div>").appendTo(document.body).addClass(e.className).css({top:u.top-r,left:u.left-h,height:s.innerHeight(),width:s.innerWidth(),position:o?"fixed":"absolute"}).animate(c,e.duration,e.easing,function(){d.remove(),i()})}}(jQuery),function(t){t.widget("ui.menu",{version:"1.10.4",defaultElement:"<ul>",delay:300,options:{icons:{submenu:"ui-icon-carat-1-e"},menus:"ul",position:{my:"left top",at:"right top"},role:"menu",blur:null,focus:null,select:null},_create:function(){this.activeMenu=this.element,this.mouseHandled=!1,this.element.uniqueId().addClass("ui-menu ui-widget ui-widget-content ui-corner-all").toggleClass("ui-menu-icons",!!this.element.find(".ui-icon").length).attr({role:this.options.role,tabIndex:0}).bind("click"+this.eventNamespace,t.proxy(function(t){this.options.disabled&&t.preventDefault()},this)),this.options.disabled&&this.element.addClass("ui-state-disabled").attr("aria-disabled","true"),this._on({"mousedown .ui-menu-item > a":function(t){t.preventDefault()},"click .ui-state-disabled > a":function(t){t.preventDefault()},"click .ui-menu-item:has(a)":function(e){var i=t(e.target).closest(".ui-menu-item");!this.mouseHandled&&i.not(".ui-state-disabled").length&&(this.select(e),e.isPropagationStopped()||(this.mouseHandled=!0),i.has(".ui-menu").length?this.expand(e):!this.element.is(":focus")&&t(this.document[0].activeElement).closest(".ui-menu").length&&(this.element.trigger("focus",[!0]),this.active&&1===this.active.parents(".ui-menu").length&&clearTimeout(this.timer)))},"mouseenter .ui-menu-item":function(e){var i=t(e.currentTarget);i.siblings().children(".ui-state-active").removeClass("ui-state-active"),this.focus(e,i)},mouseleave:"collapseAll","mouseleave .ui-menu":"collapseAll",focus:function(t,e){var i=this.active||this.element.children(".ui-menu-item").eq(0);e||this.focus(t,i)},blur:function(e){this._delay(function(){t.contains(this.element[0],this.document[0].activeElement)||this.collapseAll(e)})},keydown:"_keydown"}),this.refresh(),this._on(this.document,{click:function(e){t(e.target).closest(".ui-menu").length||this.collapseAll(e),this.mouseHandled=!1}})},_destroy:function(){this.element.removeAttr("aria-activedescendant").find(".ui-menu").addBack().removeClass("ui-menu ui-widget ui-widget-content ui-corner-all ui-menu-icons").removeAttr("role").removeAttr("tabIndex").removeAttr("aria-labelledby").removeAttr("aria-expanded").removeAttr("aria-hidden").removeAttr("aria-disabled").removeUniqueId().show(),this.element.find(".ui-menu-item").removeClass("ui-menu-item").removeAttr("role").removeAttr("aria-disabled").children("a").removeUniqueId().removeClass("ui-corner-all ui-state-hover").removeAttr("tabIndex").removeAttr("role").removeAttr("aria-haspopup").children().each(function(){var e=t(this);e.data("ui-menu-submenu-carat")&&e.remove()}),this.element.find(".ui-menu-divider").removeClass("ui-menu-divider ui-widget-content")},_keydown:function(e){function i(t){return t.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")}var s,n,o,a,r,h=!0;switch(e.keyCode){case t.ui.keyCode.PAGE_UP:this.previousPage(e);break;case t.ui.keyCode.PAGE_DOWN:this.nextPage(e);break;case t.ui.keyCode.HOME:this._move("first","first",e);break;case t.ui.keyCode.END:this._move("last","last",e);break;case t.ui.keyCode.UP:this.previous(e);break;case t.ui.keyCode.DOWN:this.next(e);break;case t.ui.keyCode.LEFT:this.collapse(e);break;case t.ui.keyCode.RIGHT:this.active&&!this.active.is(".ui-state-disabled")&&this.expand(e);break;case t.ui.keyCode.ENTER:case t.ui.keyCode.SPACE:this._activate(e);break;case t.ui.keyCode.ESCAPE:this.collapse(e);break;default:h=!1,n=this.previousFilter||"",o=String.fromCharCode(e.keyCode),a=!1,clearTimeout(this.filterTimer),o===n?a=!0:o=n+o,r=RegExp("^"+i(o),"i"),s=this.activeMenu.children(".ui-menu-item").filter(function(){return r.test(t(this).children("a").text())}),s=a&&-1!==s.index(this.active.next())?this.active.nextAll(".ui-menu-item"):s,s.length||(o=String.fromCharCode(e.keyCode),r=RegExp("^"+i(o),"i"),s=this.activeMenu.children(".ui-menu-item").filter(function(){return r.test(t(this).children("a").text())})),s.length?(this.focus(e,s),s.length>1?(this.previousFilter=o,this.filterTimer=this._delay(function(){delete this.previousFilter},1e3)):delete this.previousFilter):delete this.previousFilter}h&&e.preventDefault()},_activate:function(t){this.active.is(".ui-state-disabled")||(this.active.children("a[aria-haspopup='true']").length?this.expand(t):this.select(t))},refresh:function(){var e,i=this.options.icons.submenu,s=this.element.find(this.options.menus);this.element.toggleClass("ui-menu-icons",!!this.element.find(".ui-icon").length),s.filter(":not(.ui-menu)").addClass("ui-menu ui-widget ui-widget-content ui-corner-all").hide().attr({role:this.options.role,"aria-hidden":"true","aria-expanded":"false"}).each(function(){var e=t(this),s=e.prev("a"),n=t("<span>").addClass("ui-menu-icon ui-icon "+i).data("ui-menu-submenu-carat",!0);s.attr("aria-haspopup","true").prepend(n),e.attr("aria-labelledby",s.attr("id"))}),e=s.add(this.element),e.children(":not(.ui-menu-item):has(a)").addClass("ui-menu-item").attr("role","presentation").children("a").uniqueId().addClass("ui-corner-all").attr({tabIndex:-1,role:this._itemRole()}),e.children(":not(.ui-menu-item)").each(function(){var e=t(this);/[^\-\u2014\u2013\s]/.test(e.text())||e.addClass("ui-widget-content ui-menu-divider")}),e.children(".ui-state-disabled").attr("aria-disabled","true"),this.active&&!t.contains(this.element[0],this.active[0])&&this.blur()},_itemRole:function(){return{menu:"menuitem",listbox:"option"}[this.options.role]},_setOption:function(t,e){"icons"===t&&this.element.find(".ui-menu-icon").removeClass(this.options.icons.submenu).addClass(e.submenu),this._super(t,e)},focus:function(t,e){var i,s;this.blur(t,t&&"focus"===t.type),this._scrollIntoView(e),this.active=e.first(),s=this.active.children("a").addClass("ui-state-focus"),this.options.role&&this.element.attr("aria-activedescendant",s.attr("id")),this.active.parent().closest(".ui-menu-item").children("a:first").addClass("ui-state-active"),t&&"keydown"===t.type?this._close():this.timer=this._delay(function(){this._close()},this.delay),i=e.children(".ui-menu"),i.length&&t&&/^mouse/.test(t.type)&&this._startOpening(i),this.activeMenu=e.parent(),this._trigger("focus",t,{item:e})},_scrollIntoView:function(e){var i,s,n,o,a,r;this._hasScroll()&&(i=parseFloat(t.css(this.activeMenu[0],"borderTopWidth"))||0,s=parseFloat(t.css(this.activeMenu[0],"paddingTop"))||0,n=e.offset().top-this.activeMenu.offset().top-i-s,o=this.activeMenu.scrollTop(),a=this.activeMenu.height(),r=e.height(),0>n?this.activeMenu.scrollTop(o+n):n+r>a&&this.activeMenu.scrollTop(o+n-a+r))},blur:function(t,e){e||clearTimeout(this.timer),this.active&&(this.active.children("a").removeClass("ui-state-focus"),this.active=null,this._trigger("blur",t,{item:this.active}))},_startOpening:function(t){clearTimeout(this.timer),"true"===t.attr("aria-hidden")&&(this.timer=this._delay(function(){this._close(),this._open(t)},this.delay))},_open:function(e){var i=t.extend({of:this.active},this.options.position);clearTimeout(this.timer),this.element.find(".ui-menu").not(e.parents(".ui-menu")).hide().attr("aria-hidden","true"),e.show().removeAttr("aria-hidden").attr("aria-expanded","true").position(i)},collapseAll:function(e,i){clearTimeout(this.timer),this.timer=this._delay(function(){var s=i?this.element:t(e&&e.target).closest(this.element.find(".ui-menu"));s.length||(s=this.element),this._close(s),this.blur(e),this.activeMenu=s},this.delay)},_close:function(t){t||(t=this.active?this.active.parent():this.element),t.find(".ui-menu").hide().attr("aria-hidden","true").attr("aria-expanded","false").end().find("a.ui-state-active").removeClass("ui-state-active")},collapse:function(t){var e=this.active&&this.active.parent().closest(".ui-menu-item",this.element);e&&e.length&&(this._close(),this.focus(t,e))},expand:function(t){var e=this.active&&this.active.children(".ui-menu ").children(".ui-menu-item").first();e&&e.length&&(this._open(e.parent()),this._delay(function(){this.focus(t,e)}))},next:function(t){this._move("next","first",t)},previous:function(t){this._move("prev","last",t)},isFirstItem:function(){return this.active&&!this.active.prevAll(".ui-menu-item").length},isLastItem:function(){return this.active&&!this.active.nextAll(".ui-menu-item").length},_move:function(t,e,i){var s;this.active&&(s="first"===t||"last"===t?this.active["first"===t?"prevAll":"nextAll"](".ui-menu-item").eq(-1):this.active[t+"All"](".ui-menu-item").eq(0)),s&&s.length&&this.active||(s=this.activeMenu.children(".ui-menu-item")[e]()),this.focus(i,s)},nextPage:function(e){var i,s,n;return this.active?(this.isLastItem()||(this._hasScroll()?(s=this.active.offset().top,n=this.element.height(),this.active.nextAll(".ui-menu-item").each(function(){return i=t(this),0>i.offset().top-s-n}),this.focus(e,i)):this.focus(e,this.activeMenu.children(".ui-menu-item")[this.active?"last":"first"]())),undefined):(this.next(e),undefined)},previousPage:function(e){var i,s,n;return this.active?(this.isFirstItem()||(this._hasScroll()?(s=this.active.offset().top,n=this.element.height(),this.active.prevAll(".ui-menu-item").each(function(){return i=t(this),i.offset().top-s+n>0}),this.focus(e,i)):this.focus(e,this.activeMenu.children(".ui-menu-item").first())),undefined):(this.next(e),undefined)},_hasScroll:function(){return this.element.outerHeight()<this.element.prop("scrollHeight")},select:function(e){this.active=this.active||t(e.target).closest(".ui-menu-item");var i={item:this.active};this.active.has(".ui-menu").length||this.collapseAll(e,!0),this._trigger("select",e,i)}})}(jQuery),function(t,e){function i(t,e,i){return[parseFloat(t[0])*(p.test(t[0])?e/100:1),parseFloat(t[1])*(p.test(t[1])?i/100:1)]}function s(e,i){return parseInt(t.css(e,i),10)||0}function n(e){var i=e[0];return 9===i.nodeType?{width:e.width(),height:e.height(),offset:{top:0,left:0}}:t.isWindow(i)?{width:e.width(),height:e.height(),offset:{top:e.scrollTop(),left:e.scrollLeft()}}:i.preventDefault?{width:0,height:0,offset:{top:i.pageY,left:i.pageX}}:{width:e.outerWidth(),height:e.outerHeight(),offset:e.offset()}}t.ui=t.ui||{};var o,a=Math.max,r=Math.abs,h=Math.round,l=/left|center|right/,c=/top|center|bottom/,u=/[\+\-]\d+(\.[\d]+)?%?/,d=/^\w+/,p=/%$/,f=t.fn.position;t.position={scrollbarWidth:function(){if(o!==e)return o;var i,s,n=t("<div style='display:block;position:absolute;width:50px;height:50px;overflow:hidden;'><div style='height:100px;width:auto;'></div></div>"),a=n.children()[0];return t("body").append(n),i=a.offsetWidth,n.css("overflow","scroll"),s=a.offsetWidth,i===s&&(s=n[0].clientWidth),n.remove(),o=i-s},getScrollInfo:function(e){var i=e.isWindow||e.isDocument?"":e.element.css("overflow-x"),s=e.isWindow||e.isDocument?"":e.element.css("overflow-y"),n="scroll"===i||"auto"===i&&e.width<e.element[0].scrollWidth,o="scroll"===s||"auto"===s&&e.height<e.element[0].scrollHeight;return{width:o?t.position.scrollbarWidth():0,height:n?t.position.scrollbarWidth():0}},getWithinInfo:function(e){var i=t(e||window),s=t.isWindow(i[0]),n=!!i[0]&&9===i[0].nodeType;return{element:i,isWindow:s,isDocument:n,offset:i.offset()||{left:0,top:0},scrollLeft:i.scrollLeft(),scrollTop:i.scrollTop(),width:s?i.width():i.outerWidth(),height:s?i.height():i.outerHeight()}}},t.fn.position=function(e){if(!e||!e.of)return f.apply(this,arguments);e=t.extend({},e);var o,p,g,m,v,_,b=t(e.of),y=t.position.getWithinInfo(e.within),w=t.position.getScrollInfo(y),x=(e.collision||"flip").split(" "),k={};return _=n(b),b[0].preventDefault&&(e.at="left top"),p=_.width,g=_.height,m=_.offset,v=t.extend({},m),t.each(["my","at"],function(){var t,i,s=(e[this]||"").split(" ");1===s.length&&(s=l.test(s[0])?s.concat(["center"]):c.test(s[0])?["center"].concat(s):["center","center"]),s[0]=l.test(s[0])?s[0]:"center",s[1]=c.test(s[1])?s[1]:"center",t=u.exec(s[0]),i=u.exec(s[1]),k[this]=[t?t[0]:0,i?i[0]:0],e[this]=[d.exec(s[0])[0],d.exec(s[1])[0]]}),1===x.length&&(x[1]=x[0]),"right"===e.at[0]?v.left+=p:"center"===e.at[0]&&(v.left+=p/2),"bottom"===e.at[1]?v.top+=g:"center"===e.at[1]&&(v.top+=g/2),o=i(k.at,p,g),v.left+=o[0],v.top+=o[1],this.each(function(){var n,l,c=t(this),u=c.outerWidth(),d=c.outerHeight(),f=s(this,"marginLeft"),_=s(this,"marginTop"),D=u+f+s(this,"marginRight")+w.width,C=d+_+s(this,"marginBottom")+w.height,I=t.extend({},v),P=i(k.my,c.outerWidth(),c.outerHeight());"right"===e.my[0]?I.left-=u:"center"===e.my[0]&&(I.left-=u/2),"bottom"===e.my[1]?I.top-=d:"center"===e.my[1]&&(I.top-=d/2),I.left+=P[0],I.top+=P[1],t.support.offsetFractions||(I.left=h(I.left),I.top=h(I.top)),n={marginLeft:f,marginTop:_},t.each(["left","top"],function(i,s){t.ui.position[x[i]]&&t.ui.position[x[i]][s](I,{targetWidth:p,targetHeight:g,elemWidth:u,elemHeight:d,collisionPosition:n,collisionWidth:D,collisionHeight:C,offset:[o[0]+P[0],o[1]+P[1]],my:e.my,at:e.at,within:y,elem:c})}),e.using&&(l=function(t){var i=m.left-I.left,s=i+p-u,n=m.top-I.top,o=n+g-d,h={target:{element:b,left:m.left,top:m.top,width:p,height:g},element:{element:c,left:I.left,top:I.top,width:u,height:d},horizontal:0>s?"left":i>0?"right":"center",vertical:0>o?"top":n>0?"bottom":"middle"};u>p&&p>r(i+s)&&(h.horizontal="center"),d>g&&g>r(n+o)&&(h.vertical="middle"),h.important=a(r(i),r(s))>a(r(n),r(o))?"horizontal":"vertical",e.using.call(this,t,h)}),c.offset(t.extend(I,{using:l}))})},t.ui.position={fit:{left:function(t,e){var i,s=e.within,n=s.isWindow?s.scrollLeft:s.offset.left,o=s.width,r=t.left-e.collisionPosition.marginLeft,h=n-r,l=r+e.collisionWidth-o-n;e.collisionWidth>o?h>0&&0>=l?(i=t.left+h+e.collisionWidth-o-n,t.left+=h-i):t.left=l>0&&0>=h?n:h>l?n+o-e.collisionWidth:n:h>0?t.left+=h:l>0?t.left-=l:t.left=a(t.left-r,t.left)},top:function(t,e){var i,s=e.within,n=s.isWindow?s.scrollTop:s.offset.top,o=e.within.height,r=t.top-e.collisionPosition.marginTop,h=n-r,l=r+e.collisionHeight-o-n;e.collisionHeight>o?h>0&&0>=l?(i=t.top+h+e.collisionHeight-o-n,t.top+=h-i):t.top=l>0&&0>=h?n:h>l?n+o-e.collisionHeight:n:h>0?t.top+=h:l>0?t.top-=l:t.top=a(t.top-r,t.top)}},flip:{left:function(t,e){var i,s,n=e.within,o=n.offset.left+n.scrollLeft,a=n.width,h=n.isWindow?n.scrollLeft:n.offset.left,l=t.left-e.collisionPosition.marginLeft,c=l-h,u=l+e.collisionWidth-a-h,d="left"===e.my[0]?-e.elemWidth:"right"===e.my[0]?e.elemWidth:0,p="left"===e.at[0]?e.targetWidth:"right"===e.at[0]?-e.targetWidth:0,f=-2*e.offset[0];0>c?(i=t.left+d+p+f+e.collisionWidth-a-o,(0>i||r(c)>i)&&(t.left+=d+p+f)):u>0&&(s=t.left-e.collisionPosition.marginLeft+d+p+f-h,(s>0||u>r(s))&&(t.left+=d+p+f))},top:function(t,e){var i,s,n=e.within,o=n.offset.top+n.scrollTop,a=n.height,h=n.isWindow?n.scrollTop:n.offset.top,l=t.top-e.collisionPosition.marginTop,c=l-h,u=l+e.collisionHeight-a-h,d="top"===e.my[1],p=d?-e.elemHeight:"bottom"===e.my[1]?e.elemHeight:0,f="top"===e.at[1]?e.targetHeight:"bottom"===e.at[1]?-e.targetHeight:0,g=-2*e.offset[1];0>c?(s=t.top+p+f+g+e.collisionHeight-a-o,t.top+p+f+g>c&&(0>s||r(c)>s)&&(t.top+=p+f+g)):u>0&&(i=t.top-e.collisionPosition.marginTop+p+f+g-h,t.top+p+f+g>u&&(i>0||u>r(i))&&(t.top+=p+f+g))}},flipfit:{left:function(){t.ui.position.flip.left.apply(this,arguments),t.ui.position.fit.left.apply(this,arguments)},top:function(){t.ui.position.flip.top.apply(this,arguments),t.ui.position.fit.top.apply(this,arguments)}}},function(){var e,i,s,n,o,a=document.getElementsByTagName("body")[0],r=document.createElement("div");e=document.createElement(a?"div":"body"),s={visibility:"hidden",width:0,height:0,border:0,margin:0,background:"none"},a&&t.extend(s,{position:"absolute",left:"-1000px",top:"-1000px"});for(o in s)e.style[o]=s[o];e.appendChild(r),i=a||document.documentElement,i.insertBefore(e,i.firstChild),r.style.cssText="position: absolute; left: 10.7432222px;",n=t(r).offset().left,t.support.offsetFractions=n>10&&11>n,e.innerHTML="",i.removeChild(e)}()}(jQuery),function(t,e){t.widget("ui.progressbar",{version:"1.10.4",options:{max:100,value:0,change:null,complete:null},min:0,_create:function(){this.oldValue=this.options.value=this._constrainedValue(),this.element.addClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").attr({role:"progressbar","aria-valuemin":this.min}),this.valueDiv=t("<div class='ui-progressbar-value ui-widget-header ui-corner-left'></div>").appendTo(this.element),this._refreshValue()
+},_destroy:function(){this.element.removeClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").removeAttr("role").removeAttr("aria-valuemin").removeAttr("aria-valuemax").removeAttr("aria-valuenow"),this.valueDiv.remove()},value:function(t){return t===e?this.options.value:(this.options.value=this._constrainedValue(t),this._refreshValue(),e)},_constrainedValue:function(t){return t===e&&(t=this.options.value),this.indeterminate=t===!1,"number"!=typeof t&&(t=0),this.indeterminate?!1:Math.min(this.options.max,Math.max(this.min,t))},_setOptions:function(t){var e=t.value;delete t.value,this._super(t),this.options.value=this._constrainedValue(e),this._refreshValue()},_setOption:function(t,e){"max"===t&&(e=Math.max(this.min,e)),this._super(t,e)},_percentage:function(){return this.indeterminate?100:100*(this.options.value-this.min)/(this.options.max-this.min)},_refreshValue:function(){var e=this.options.value,i=this._percentage();this.valueDiv.toggle(this.indeterminate||e>this.min).toggleClass("ui-corner-right",e===this.options.max).width(i.toFixed(0)+"%"),this.element.toggleClass("ui-progressbar-indeterminate",this.indeterminate),this.indeterminate?(this.element.removeAttr("aria-valuenow"),this.overlayDiv||(this.overlayDiv=t("<div class='ui-progressbar-overlay'></div>").appendTo(this.valueDiv))):(this.element.attr({"aria-valuemax":this.options.max,"aria-valuenow":e}),this.overlayDiv&&(this.overlayDiv.remove(),this.overlayDiv=null)),this.oldValue!==e&&(this.oldValue=e,this._trigger("change")),e===this.options.max&&this._trigger("complete")}})}(jQuery),function(t){var e=5;t.widget("ui.slider",t.ui.mouse,{version:"1.10.4",widgetEventPrefix:"slide",options:{animate:!1,distance:0,max:100,min:0,orientation:"horizontal",range:!1,step:1,value:0,values:null,change:null,slide:null,start:null,stop:null},_create:function(){this._keySliding=!1,this._mouseSliding=!1,this._animateOff=!0,this._handleIndex=null,this._detectOrientation(),this._mouseInit(),this.element.addClass("ui-slider ui-slider-"+this.orientation+" ui-widget"+" ui-widget-content"+" ui-corner-all"),this._refresh(),this._setOption("disabled",this.options.disabled),this._animateOff=!1},_refresh:function(){this._createRange(),this._createHandles(),this._setupEvents(),this._refreshValue()},_createHandles:function(){var e,i,s=this.options,n=this.element.find(".ui-slider-handle").addClass("ui-state-default ui-corner-all"),o="<a class='ui-slider-handle ui-state-default ui-corner-all' href='#'></a>",a=[];for(i=s.values&&s.values.length||1,n.length>i&&(n.slice(i).remove(),n=n.slice(0,i)),e=n.length;i>e;e++)a.push(o);this.handles=n.add(t(a.join("")).appendTo(this.element)),this.handle=this.handles.eq(0),this.handles.each(function(e){t(this).data("ui-slider-handle-index",e)})},_createRange:function(){var e=this.options,i="";e.range?(e.range===!0&&(e.values?e.values.length&&2!==e.values.length?e.values=[e.values[0],e.values[0]]:t.isArray(e.values)&&(e.values=e.values.slice(0)):e.values=[this._valueMin(),this._valueMin()]),this.range&&this.range.length?this.range.removeClass("ui-slider-range-min ui-slider-range-max").css({left:"",bottom:""}):(this.range=t("<div></div>").appendTo(this.element),i="ui-slider-range ui-widget-header ui-corner-all"),this.range.addClass(i+("min"===e.range||"max"===e.range?" ui-slider-range-"+e.range:""))):(this.range&&this.range.remove(),this.range=null)},_setupEvents:function(){var t=this.handles.add(this.range).filter("a");this._off(t),this._on(t,this._handleEvents),this._hoverable(t),this._focusable(t)},_destroy:function(){this.handles.remove(),this.range&&this.range.remove(),this.element.removeClass("ui-slider ui-slider-horizontal ui-slider-vertical ui-widget ui-widget-content ui-corner-all"),this._mouseDestroy()},_mouseCapture:function(e){var i,s,n,o,a,r,h,l,c=this,u=this.options;return u.disabled?!1:(this.elementSize={width:this.element.outerWidth(),height:this.element.outerHeight()},this.elementOffset=this.element.offset(),i={x:e.pageX,y:e.pageY},s=this._normValueFromMouse(i),n=this._valueMax()-this._valueMin()+1,this.handles.each(function(e){var i=Math.abs(s-c.values(e));(n>i||n===i&&(e===c._lastChangedValue||c.values(e)===u.min))&&(n=i,o=t(this),a=e)}),r=this._start(e,a),r===!1?!1:(this._mouseSliding=!0,this._handleIndex=a,o.addClass("ui-state-active").focus(),h=o.offset(),l=!t(e.target).parents().addBack().is(".ui-slider-handle"),this._clickOffset=l?{left:0,top:0}:{left:e.pageX-h.left-o.width()/2,top:e.pageY-h.top-o.height()/2-(parseInt(o.css("borderTopWidth"),10)||0)-(parseInt(o.css("borderBottomWidth"),10)||0)+(parseInt(o.css("marginTop"),10)||0)},this.handles.hasClass("ui-state-hover")||this._slide(e,a,s),this._animateOff=!0,!0))},_mouseStart:function(){return!0},_mouseDrag:function(t){var e={x:t.pageX,y:t.pageY},i=this._normValueFromMouse(e);return this._slide(t,this._handleIndex,i),!1},_mouseStop:function(t){return this.handles.removeClass("ui-state-active"),this._mouseSliding=!1,this._stop(t,this._handleIndex),this._change(t,this._handleIndex),this._handleIndex=null,this._clickOffset=null,this._animateOff=!1,!1},_detectOrientation:function(){this.orientation="vertical"===this.options.orientation?"vertical":"horizontal"},_normValueFromMouse:function(t){var e,i,s,n,o;return"horizontal"===this.orientation?(e=this.elementSize.width,i=t.x-this.elementOffset.left-(this._clickOffset?this._clickOffset.left:0)):(e=this.elementSize.height,i=t.y-this.elementOffset.top-(this._clickOffset?this._clickOffset.top:0)),s=i/e,s>1&&(s=1),0>s&&(s=0),"vertical"===this.orientation&&(s=1-s),n=this._valueMax()-this._valueMin(),o=this._valueMin()+s*n,this._trimAlignValue(o)},_start:function(t,e){var i={handle:this.handles[e],value:this.value()};return this.options.values&&this.options.values.length&&(i.value=this.values(e),i.values=this.values()),this._trigger("start",t,i)},_slide:function(t,e,i){var s,n,o;this.options.values&&this.options.values.length?(s=this.values(e?0:1),2===this.options.values.length&&this.options.range===!0&&(0===e&&i>s||1===e&&s>i)&&(i=s),i!==this.values(e)&&(n=this.values(),n[e]=i,o=this._trigger("slide",t,{handle:this.handles[e],value:i,values:n}),s=this.values(e?0:1),o!==!1&&this.values(e,i))):i!==this.value()&&(o=this._trigger("slide",t,{handle:this.handles[e],value:i}),o!==!1&&this.value(i))},_stop:function(t,e){var i={handle:this.handles[e],value:this.value()};this.options.values&&this.options.values.length&&(i.value=this.values(e),i.values=this.values()),this._trigger("stop",t,i)},_change:function(t,e){if(!this._keySliding&&!this._mouseSliding){var i={handle:this.handles[e],value:this.value()};this.options.values&&this.options.values.length&&(i.value=this.values(e),i.values=this.values()),this._lastChangedValue=e,this._trigger("change",t,i)}},value:function(t){return arguments.length?(this.options.value=this._trimAlignValue(t),this._refreshValue(),this._change(null,0),undefined):this._value()},values:function(e,i){var s,n,o;if(arguments.length>1)return this.options.values[e]=this._trimAlignValue(i),this._refreshValue(),this._change(null,e),undefined;if(!arguments.length)return this._values();if(!t.isArray(arguments[0]))return this.options.values&&this.options.values.length?this._values(e):this.value();for(s=this.options.values,n=arguments[0],o=0;s.length>o;o+=1)s[o]=this._trimAlignValue(n[o]),this._change(null,o);this._refreshValue()},_setOption:function(e,i){var s,n=0;switch("range"===e&&this.options.range===!0&&("min"===i?(this.options.value=this._values(0),this.options.values=null):"max"===i&&(this.options.value=this._values(this.options.values.length-1),this.options.values=null)),t.isArray(this.options.values)&&(n=this.options.values.length),t.Widget.prototype._setOption.apply(this,arguments),e){case"orientation":this._detectOrientation(),this.element.removeClass("ui-slider-horizontal ui-slider-vertical").addClass("ui-slider-"+this.orientation),this._refreshValue();break;case"value":this._animateOff=!0,this._refreshValue(),this._change(null,0),this._animateOff=!1;break;case"values":for(this._animateOff=!0,this._refreshValue(),s=0;n>s;s+=1)this._change(null,s);this._animateOff=!1;break;case"min":case"max":this._animateOff=!0,this._refreshValue(),this._animateOff=!1;break;case"range":this._animateOff=!0,this._refresh(),this._animateOff=!1}},_value:function(){var t=this.options.value;return t=this._trimAlignValue(t)},_values:function(t){var e,i,s;if(arguments.length)return e=this.options.values[t],e=this._trimAlignValue(e);if(this.options.values&&this.options.values.length){for(i=this.options.values.slice(),s=0;i.length>s;s+=1)i[s]=this._trimAlignValue(i[s]);return i}return[]},_trimAlignValue:function(t){if(this._valueMin()>=t)return this._valueMin();if(t>=this._valueMax())return this._valueMax();var e=this.options.step>0?this.options.step:1,i=(t-this._valueMin())%e,s=t-i;return 2*Math.abs(i)>=e&&(s+=i>0?e:-e),parseFloat(s.toFixed(5))},_valueMin:function(){return this.options.min},_valueMax:function(){return this.options.max},_refreshValue:function(){var e,i,s,n,o,a=this.options.range,r=this.options,h=this,l=this._animateOff?!1:r.animate,c={};this.options.values&&this.options.values.length?this.handles.each(function(s){i=100*((h.values(s)-h._valueMin())/(h._valueMax()-h._valueMin())),c["horizontal"===h.orientation?"left":"bottom"]=i+"%",t(this).stop(1,1)[l?"animate":"css"](c,r.animate),h.options.range===!0&&("horizontal"===h.orientation?(0===s&&h.range.stop(1,1)[l?"animate":"css"]({left:i+"%"},r.animate),1===s&&h.range[l?"animate":"css"]({width:i-e+"%"},{queue:!1,duration:r.animate})):(0===s&&h.range.stop(1,1)[l?"animate":"css"]({bottom:i+"%"},r.animate),1===s&&h.range[l?"animate":"css"]({height:i-e+"%"},{queue:!1,duration:r.animate}))),e=i}):(s=this.value(),n=this._valueMin(),o=this._valueMax(),i=o!==n?100*((s-n)/(o-n)):0,c["horizontal"===this.orientation?"left":"bottom"]=i+"%",this.handle.stop(1,1)[l?"animate":"css"](c,r.animate),"min"===a&&"horizontal"===this.orientation&&this.range.stop(1,1)[l?"animate":"css"]({width:i+"%"},r.animate),"max"===a&&"horizontal"===this.orientation&&this.range[l?"animate":"css"]({width:100-i+"%"},{queue:!1,duration:r.animate}),"min"===a&&"vertical"===this.orientation&&this.range.stop(1,1)[l?"animate":"css"]({height:i+"%"},r.animate),"max"===a&&"vertical"===this.orientation&&this.range[l?"animate":"css"]({height:100-i+"%"},{queue:!1,duration:r.animate}))},_handleEvents:{keydown:function(i){var s,n,o,a,r=t(i.target).data("ui-slider-handle-index");switch(i.keyCode){case t.ui.keyCode.HOME:case t.ui.keyCode.END:case t.ui.keyCode.PAGE_UP:case t.ui.keyCode.PAGE_DOWN:case t.ui.keyCode.UP:case t.ui.keyCode.RIGHT:case t.ui.keyCode.DOWN:case t.ui.keyCode.LEFT:if(i.preventDefault(),!this._keySliding&&(this._keySliding=!0,t(i.target).addClass("ui-state-active"),s=this._start(i,r),s===!1))return}switch(a=this.options.step,n=o=this.options.values&&this.options.values.length?this.values(r):this.value(),i.keyCode){case t.ui.keyCode.HOME:o=this._valueMin();break;case t.ui.keyCode.END:o=this._valueMax();break;case t.ui.keyCode.PAGE_UP:o=this._trimAlignValue(n+(this._valueMax()-this._valueMin())/e);break;case t.ui.keyCode.PAGE_DOWN:o=this._trimAlignValue(n-(this._valueMax()-this._valueMin())/e);break;case t.ui.keyCode.UP:case t.ui.keyCode.RIGHT:if(n===this._valueMax())return;o=this._trimAlignValue(n+a);break;case t.ui.keyCode.DOWN:case t.ui.keyCode.LEFT:if(n===this._valueMin())return;o=this._trimAlignValue(n-a)}this._slide(i,r,o)},click:function(t){t.preventDefault()},keyup:function(e){var i=t(e.target).data("ui-slider-handle-index");this._keySliding&&(this._keySliding=!1,this._stop(e,i),this._change(e,i),t(e.target).removeClass("ui-state-active"))}}})}(jQuery),function(t){function e(t){return function(){var e=this.element.val();t.apply(this,arguments),this._refresh(),e!==this.element.val()&&this._trigger("change")}}t.widget("ui.spinner",{version:"1.10.4",defaultElement:"<input>",widgetEventPrefix:"spin",options:{culture:null,icons:{down:"ui-icon-triangle-1-s",up:"ui-icon-triangle-1-n"},incremental:!0,max:null,min:null,numberFormat:null,page:10,step:1,change:null,spin:null,start:null,stop:null},_create:function(){this._setOption("max",this.options.max),this._setOption("min",this.options.min),this._setOption("step",this.options.step),""!==this.value()&&this._value(this.element.val(),!0),this._draw(),this._on(this._events),this._refresh(),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_getCreateOptions:function(){var e={},i=this.element;return t.each(["min","max","step"],function(t,s){var n=i.attr(s);void 0!==n&&n.length&&(e[s]=n)}),e},_events:{keydown:function(t){this._start(t)&&this._keydown(t)&&t.preventDefault()},keyup:"_stop",focus:function(){this.previous=this.element.val()},blur:function(t){return this.cancelBlur?(delete this.cancelBlur,void 0):(this._stop(),this._refresh(),this.previous!==this.element.val()&&this._trigger("change",t),void 0)},mousewheel:function(t,e){if(e){if(!this.spinning&&!this._start(t))return!1;this._spin((e>0?1:-1)*this.options.step,t),clearTimeout(this.mousewheelTimer),this.mousewheelTimer=this._delay(function(){this.spinning&&this._stop(t)},100),t.preventDefault()}},"mousedown .ui-spinner-button":function(e){function i(){var t=this.element[0]===this.document[0].activeElement;t||(this.element.focus(),this.previous=s,this._delay(function(){this.previous=s}))}var s;s=this.element[0]===this.document[0].activeElement?this.previous:this.element.val(),e.preventDefault(),i.call(this),this.cancelBlur=!0,this._delay(function(){delete this.cancelBlur,i.call(this)}),this._start(e)!==!1&&this._repeat(null,t(e.currentTarget).hasClass("ui-spinner-up")?1:-1,e)},"mouseup .ui-spinner-button":"_stop","mouseenter .ui-spinner-button":function(e){return t(e.currentTarget).hasClass("ui-state-active")?this._start(e)===!1?!1:(this._repeat(null,t(e.currentTarget).hasClass("ui-spinner-up")?1:-1,e),void 0):void 0},"mouseleave .ui-spinner-button":"_stop"},_draw:function(){var t=this.uiSpinner=this.element.addClass("ui-spinner-input").attr("autocomplete","off").wrap(this._uiSpinnerHtml()).parent().append(this._buttonHtml());this.element.attr("role","spinbutton"),this.buttons=t.find(".ui-spinner-button").attr("tabIndex",-1).button().removeClass("ui-corner-all"),this.buttons.height()>Math.ceil(.5*t.height())&&t.height()>0&&t.height(t.height()),this.options.disabled&&this.disable()},_keydown:function(e){var i=this.options,s=t.ui.keyCode;switch(e.keyCode){case s.UP:return this._repeat(null,1,e),!0;case s.DOWN:return this._repeat(null,-1,e),!0;case s.PAGE_UP:return this._repeat(null,i.page,e),!0;case s.PAGE_DOWN:return this._repeat(null,-i.page,e),!0}return!1},_uiSpinnerHtml:function(){return"<span class='ui-spinner ui-widget ui-widget-content ui-corner-all'></span>"},_buttonHtml:function(){return"<a class='ui-spinner-button ui-spinner-up ui-corner-tr'><span class='ui-icon "+this.options.icons.up+"'>&#9650;</span>"+"</a>"+"<a class='ui-spinner-button ui-spinner-down ui-corner-br'>"+"<span class='ui-icon "+this.options.icons.down+"'>&#9660;</span>"+"</a>"},_start:function(t){return this.spinning||this._trigger("start",t)!==!1?(this.counter||(this.counter=1),this.spinning=!0,!0):!1},_repeat:function(t,e,i){t=t||500,clearTimeout(this.timer),this.timer=this._delay(function(){this._repeat(40,e,i)},t),this._spin(e*this.options.step,i)},_spin:function(t,e){var i=this.value()||0;this.counter||(this.counter=1),i=this._adjustValue(i+t*this._increment(this.counter)),this.spinning&&this._trigger("spin",e,{value:i})===!1||(this._value(i),this.counter++)},_increment:function(e){var i=this.options.incremental;return i?t.isFunction(i)?i(e):Math.floor(e*e*e/5e4-e*e/500+17*e/200+1):1},_precision:function(){var t=this._precisionOf(this.options.step);return null!==this.options.min&&(t=Math.max(t,this._precisionOf(this.options.min))),t},_precisionOf:function(t){var e=""+t,i=e.indexOf(".");return-1===i?0:e.length-i-1},_adjustValue:function(t){var e,i,s=this.options;return e=null!==s.min?s.min:0,i=t-e,i=Math.round(i/s.step)*s.step,t=e+i,t=parseFloat(t.toFixed(this._precision())),null!==s.max&&t>s.max?s.max:null!==s.min&&s.min>t?s.min:t},_stop:function(t){this.spinning&&(clearTimeout(this.timer),clearTimeout(this.mousewheelTimer),this.counter=0,this.spinning=!1,this._trigger("stop",t))},_setOption:function(t,e){if("culture"===t||"numberFormat"===t){var i=this._parse(this.element.val());return this.options[t]=e,this.element.val(this._format(i)),void 0}("max"===t||"min"===t||"step"===t)&&"string"==typeof e&&(e=this._parse(e)),"icons"===t&&(this.buttons.first().find(".ui-icon").removeClass(this.options.icons.up).addClass(e.up),this.buttons.last().find(".ui-icon").removeClass(this.options.icons.down).addClass(e.down)),this._super(t,e),"disabled"===t&&(e?(this.element.prop("disabled",!0),this.buttons.button("disable")):(this.element.prop("disabled",!1),this.buttons.button("enable")))},_setOptions:e(function(t){this._super(t),this._value(this.element.val())}),_parse:function(t){return"string"==typeof t&&""!==t&&(t=window.Globalize&&this.options.numberFormat?Globalize.parseFloat(t,10,this.options.culture):+t),""===t||isNaN(t)?null:t},_format:function(t){return""===t?"":window.Globalize&&this.options.numberFormat?Globalize.format(t,this.options.numberFormat,this.options.culture):t},_refresh:function(){this.element.attr({"aria-valuemin":this.options.min,"aria-valuemax":this.options.max,"aria-valuenow":this._parse(this.element.val())})},_value:function(t,e){var i;""!==t&&(i=this._parse(t),null!==i&&(e||(i=this._adjustValue(i)),t=this._format(i))),this.element.val(t),this._refresh()},_destroy:function(){this.element.removeClass("ui-spinner-input").prop("disabled",!1).removeAttr("autocomplete").removeAttr("role").removeAttr("aria-valuemin").removeAttr("aria-valuemax").removeAttr("aria-valuenow"),this.uiSpinner.replaceWith(this.element)},stepUp:e(function(t){this._stepUp(t)}),_stepUp:function(t){this._start()&&(this._spin((t||1)*this.options.step),this._stop())},stepDown:e(function(t){this._stepDown(t)}),_stepDown:function(t){this._start()&&(this._spin((t||1)*-this.options.step),this._stop())},pageUp:e(function(t){this._stepUp((t||1)*this.options.page)}),pageDown:e(function(t){this._stepDown((t||1)*this.options.page)}),value:function(t){return arguments.length?(e(this._value).call(this,t),void 0):this._parse(this.element.val())},widget:function(){return this.uiSpinner}})}(jQuery),function(t,e){function i(){return++n}function s(t){return t=t.cloneNode(!1),t.hash.length>1&&decodeURIComponent(t.href.replace(o,""))===decodeURIComponent(location.href.replace(o,""))}var n=0,o=/#.*$/;t.widget("ui.tabs",{version:"1.10.4",delay:300,options:{active:null,collapsible:!1,event:"click",heightStyle:"content",hide:null,show:null,activate:null,beforeActivate:null,beforeLoad:null,load:null},_create:function(){var e=this,i=this.options;this.running=!1,this.element.addClass("ui-tabs ui-widget ui-widget-content ui-corner-all").toggleClass("ui-tabs-collapsible",i.collapsible).delegate(".ui-tabs-nav > li","mousedown"+this.eventNamespace,function(e){t(this).is(".ui-state-disabled")&&e.preventDefault()}).delegate(".ui-tabs-anchor","focus"+this.eventNamespace,function(){t(this).closest("li").is(".ui-state-disabled")&&this.blur()}),this._processTabs(),i.active=this._initialActive(),t.isArray(i.disabled)&&(i.disabled=t.unique(i.disabled.concat(t.map(this.tabs.filter(".ui-state-disabled"),function(t){return e.tabs.index(t)}))).sort()),this.active=this.options.active!==!1&&this.anchors.length?this._findActive(i.active):t(),this._refresh(),this.active.length&&this.load(i.active)},_initialActive:function(){var i=this.options.active,s=this.options.collapsible,n=location.hash.substring(1);return null===i&&(n&&this.tabs.each(function(s,o){return t(o).attr("aria-controls")===n?(i=s,!1):e}),null===i&&(i=this.tabs.index(this.tabs.filter(".ui-tabs-active"))),(null===i||-1===i)&&(i=this.tabs.length?0:!1)),i!==!1&&(i=this.tabs.index(this.tabs.eq(i)),-1===i&&(i=s?!1:0)),!s&&i===!1&&this.anchors.length&&(i=0),i},_getCreateEventData:function(){return{tab:this.active,panel:this.active.length?this._getPanelForTab(this.active):t()}},_tabKeydown:function(i){var s=t(this.document[0].activeElement).closest("li"),n=this.tabs.index(s),o=!0;if(!this._handlePageNav(i)){switch(i.keyCode){case t.ui.keyCode.RIGHT:case t.ui.keyCode.DOWN:n++;break;case t.ui.keyCode.UP:case t.ui.keyCode.LEFT:o=!1,n--;break;case t.ui.keyCode.END:n=this.anchors.length-1;break;case t.ui.keyCode.HOME:n=0;break;case t.ui.keyCode.SPACE:return i.preventDefault(),clearTimeout(this.activating),this._activate(n),e;case t.ui.keyCode.ENTER:return i.preventDefault(),clearTimeout(this.activating),this._activate(n===this.options.active?!1:n),e;default:return}i.preventDefault(),clearTimeout(this.activating),n=this._focusNextTab(n,o),i.ctrlKey||(s.attr("aria-selected","false"),this.tabs.eq(n).attr("aria-selected","true"),this.activating=this._delay(function(){this.option("active",n)},this.delay))}},_panelKeydown:function(e){this._handlePageNav(e)||e.ctrlKey&&e.keyCode===t.ui.keyCode.UP&&(e.preventDefault(),this.active.focus())},_handlePageNav:function(i){return i.altKey&&i.keyCode===t.ui.keyCode.PAGE_UP?(this._activate(this._focusNextTab(this.options.active-1,!1)),!0):i.altKey&&i.keyCode===t.ui.keyCode.PAGE_DOWN?(this._activate(this._focusNextTab(this.options.active+1,!0)),!0):e},_findNextTab:function(e,i){function s(){return e>n&&(e=0),0>e&&(e=n),e}for(var n=this.tabs.length-1;-1!==t.inArray(s(),this.options.disabled);)e=i?e+1:e-1;return e},_focusNextTab:function(t,e){return t=this._findNextTab(t,e),this.tabs.eq(t).focus(),t},_setOption:function(t,i){return"active"===t?(this._activate(i),e):"disabled"===t?(this._setupDisabled(i),e):(this._super(t,i),"collapsible"===t&&(this.element.toggleClass("ui-tabs-collapsible",i),i||this.options.active!==!1||this._activate(0)),"event"===t&&this._setupEvents(i),"heightStyle"===t&&this._setupHeightStyle(i),e)},_tabId:function(t){return t.attr("aria-controls")||"ui-tabs-"+i()},_sanitizeSelector:function(t){return t?t.replace(/[!"$%&'()*+,.\/:;<=>?@\[\]\^`{|}~]/g,"\\$&"):""},refresh:function(){var e=this.options,i=this.tablist.children(":has(a[href])");e.disabled=t.map(i.filter(".ui-state-disabled"),function(t){return i.index(t)}),this._processTabs(),e.active!==!1&&this.anchors.length?this.active.length&&!t.contains(this.tablist[0],this.active[0])?this.tabs.length===e.disabled.length?(e.active=!1,this.active=t()):this._activate(this._findNextTab(Math.max(0,e.active-1),!1)):e.active=this.tabs.index(this.active):(e.active=!1,this.active=t()),this._refresh()},_refresh:function(){this._setupDisabled(this.options.disabled),this._setupEvents(this.options.event),this._setupHeightStyle(this.options.heightStyle),this.tabs.not(this.active).attr({"aria-selected":"false",tabIndex:-1}),this.panels.not(this._getPanelForTab(this.active)).hide().attr({"aria-expanded":"false","aria-hidden":"true"}),this.active.length?(this.active.addClass("ui-tabs-active ui-state-active").attr({"aria-selected":"true",tabIndex:0}),this._getPanelForTab(this.active).show().attr({"aria-expanded":"true","aria-hidden":"false"})):this.tabs.eq(0).attr("tabIndex",0)},_processTabs:function(){var e=this;this.tablist=this._getList().addClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all").attr("role","tablist"),this.tabs=this.tablist.find("> li:has(a[href])").addClass("ui-state-default ui-corner-top").attr({role:"tab",tabIndex:-1}),this.anchors=this.tabs.map(function(){return t("a",this)[0]}).addClass("ui-tabs-anchor").attr({role:"presentation",tabIndex:-1}),this.panels=t(),this.anchors.each(function(i,n){var o,a,r,h=t(n).uniqueId().attr("id"),l=t(n).closest("li"),c=l.attr("aria-controls");s(n)?(o=n.hash,a=e.element.find(e._sanitizeSelector(o))):(r=e._tabId(l),o="#"+r,a=e.element.find(o),a.length||(a=e._createPanel(r),a.insertAfter(e.panels[i-1]||e.tablist)),a.attr("aria-live","polite")),a.length&&(e.panels=e.panels.add(a)),c&&l.data("ui-tabs-aria-controls",c),l.attr({"aria-controls":o.substring(1),"aria-labelledby":h}),a.attr("aria-labelledby",h)}),this.panels.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").attr("role","tabpanel")},_getList:function(){return this.tablist||this.element.find("ol,ul").eq(0)},_createPanel:function(e){return t("<div>").attr("id",e).addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").data("ui-tabs-destroy",!0)},_setupDisabled:function(e){t.isArray(e)&&(e.length?e.length===this.anchors.length&&(e=!0):e=!1);for(var i,s=0;i=this.tabs[s];s++)e===!0||-1!==t.inArray(s,e)?t(i).addClass("ui-state-disabled").attr("aria-disabled","true"):t(i).removeClass("ui-state-disabled").removeAttr("aria-disabled");this.options.disabled=e},_setupEvents:function(e){var i={click:function(t){t.preventDefault()}};e&&t.each(e.split(" "),function(t,e){i[e]="_eventHandler"}),this._off(this.anchors.add(this.tabs).add(this.panels)),this._on(this.anchors,i),this._on(this.tabs,{keydown:"_tabKeydown"}),this._on(this.panels,{keydown:"_panelKeydown"}),this._focusable(this.tabs),this._hoverable(this.tabs)},_setupHeightStyle:function(e){var i,s=this.element.parent();"fill"===e?(i=s.height(),i-=this.element.outerHeight()-this.element.height(),this.element.siblings(":visible").each(function(){var e=t(this),s=e.css("position");"absolute"!==s&&"fixed"!==s&&(i-=e.outerHeight(!0))}),this.element.children().not(this.panels).each(function(){i-=t(this).outerHeight(!0)}),this.panels.each(function(){t(this).height(Math.max(0,i-t(this).innerHeight()+t(this).height()))}).css("overflow","auto")):"auto"===e&&(i=0,this.panels.each(function(){i=Math.max(i,t(this).height("").height())}).height(i))},_eventHandler:function(e){var i=this.options,s=this.active,n=t(e.currentTarget),o=n.closest("li"),a=o[0]===s[0],r=a&&i.collapsible,h=r?t():this._getPanelForTab(o),l=s.length?this._getPanelForTab(s):t(),c={oldTab:s,oldPanel:l,newTab:r?t():o,newPanel:h};e.preventDefault(),o.hasClass("ui-state-disabled")||o.hasClass("ui-tabs-loading")||this.running||a&&!i.collapsible||this._trigger("beforeActivate",e,c)===!1||(i.active=r?!1:this.tabs.index(o),this.active=a?t():o,this.xhr&&this.xhr.abort(),l.length||h.length||t.error("jQuery UI Tabs: Mismatching fragment identifier."),h.length&&this.load(this.tabs.index(o),e),this._toggle(e,c))},_toggle:function(e,i){function s(){o.running=!1,o._trigger("activate",e,i)}function n(){i.newTab.closest("li").addClass("ui-tabs-active ui-state-active"),a.length&&o.options.show?o._show(a,o.options.show,s):(a.show(),s())}var o=this,a=i.newPanel,r=i.oldPanel;this.running=!0,r.length&&this.options.hide?this._hide(r,this.options.hide,function(){i.oldTab.closest("li").removeClass("ui-tabs-active ui-state-active"),n()}):(i.oldTab.closest("li").removeClass("ui-tabs-active ui-state-active"),r.hide(),n()),r.attr({"aria-expanded":"false","aria-hidden":"true"}),i.oldTab.attr("aria-selected","false"),a.length&&r.length?i.oldTab.attr("tabIndex",-1):a.length&&this.tabs.filter(function(){return 0===t(this).attr("tabIndex")}).attr("tabIndex",-1),a.attr({"aria-expanded":"true","aria-hidden":"false"}),i.newTab.attr({"aria-selected":"true",tabIndex:0})},_activate:function(e){var i,s=this._findActive(e);s[0]!==this.active[0]&&(s.length||(s=this.active),i=s.find(".ui-tabs-anchor")[0],this._eventHandler({target:i,currentTarget:i,preventDefault:t.noop}))},_findActive:function(e){return e===!1?t():this.tabs.eq(e)},_getIndex:function(t){return"string"==typeof t&&(t=this.anchors.index(this.anchors.filter("[href$='"+t+"']"))),t},_destroy:function(){this.xhr&&this.xhr.abort(),this.element.removeClass("ui-tabs ui-widget ui-widget-content ui-corner-all ui-tabs-collapsible"),this.tablist.removeClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all").removeAttr("role"),this.anchors.removeClass("ui-tabs-anchor").removeAttr("role").removeAttr("tabIndex").removeUniqueId(),this.tabs.add(this.panels).each(function(){t.data(this,"ui-tabs-destroy")?t(this).remove():t(this).removeClass("ui-state-default ui-state-active ui-state-disabled ui-corner-top ui-corner-bottom ui-widget-content ui-tabs-active ui-tabs-panel").removeAttr("tabIndex").removeAttr("aria-live").removeAttr("aria-busy").removeAttr("aria-selected").removeAttr("aria-labelledby").removeAttr("aria-hidden").removeAttr("aria-expanded").removeAttr("role")}),this.tabs.each(function(){var e=t(this),i=e.data("ui-tabs-aria-controls");i?e.attr("aria-controls",i).removeData("ui-tabs-aria-controls"):e.removeAttr("aria-controls")}),this.panels.show(),"content"!==this.options.heightStyle&&this.panels.css("height","")},enable:function(i){var s=this.options.disabled;s!==!1&&(i===e?s=!1:(i=this._getIndex(i),s=t.isArray(s)?t.map(s,function(t){return t!==i?t:null}):t.map(this.tabs,function(t,e){return e!==i?e:null})),this._setupDisabled(s))},disable:function(i){var s=this.options.disabled;if(s!==!0){if(i===e)s=!0;else{if(i=this._getIndex(i),-1!==t.inArray(i,s))return;s=t.isArray(s)?t.merge([i],s).sort():[i]}this._setupDisabled(s)}},load:function(e,i){e=this._getIndex(e);var n=this,o=this.tabs.eq(e),a=o.find(".ui-tabs-anchor"),r=this._getPanelForTab(o),h={tab:o,panel:r};s(a[0])||(this.xhr=t.ajax(this._ajaxSettings(a,i,h)),this.xhr&&"canceled"!==this.xhr.statusText&&(o.addClass("ui-tabs-loading"),r.attr("aria-busy","true"),this.xhr.success(function(t){setTimeout(function(){r.html(t),n._trigger("load",i,h)},1)}).complete(function(t,e){setTimeout(function(){"abort"===e&&n.panels.stop(!1,!0),o.removeClass("ui-tabs-loading"),r.removeAttr("aria-busy"),t===n.xhr&&delete n.xhr},1)})))},_ajaxSettings:function(e,i,s){var n=this;return{url:e.attr("href"),beforeSend:function(e,o){return n._trigger("beforeLoad",i,t.extend({jqXHR:e,ajaxSettings:o},s))}}},_getPanelForTab:function(e){var i=t(e).attr("aria-controls");return this.element.find(this._sanitizeSelector("#"+i))}})}(jQuery),function(t){function e(e,i){var s=(e.attr("aria-describedby")||"").split(/\s+/);s.push(i),e.data("ui-tooltip-id",i).attr("aria-describedby",t.trim(s.join(" ")))}function i(e){var i=e.data("ui-tooltip-id"),s=(e.attr("aria-describedby")||"").split(/\s+/),n=t.inArray(i,s);-1!==n&&s.splice(n,1),e.removeData("ui-tooltip-id"),s=t.trim(s.join(" ")),s?e.attr("aria-describedby",s):e.removeAttr("aria-describedby")}var s=0;t.widget("ui.tooltip",{version:"1.10.4",options:{content:function(){var e=t(this).attr("title")||"";return t("<a>").text(e).html()},hide:!0,items:"[title]:not([disabled])",position:{my:"left top+15",at:"left bottom",collision:"flipfit flip"},show:!0,tooltipClass:null,track:!1,close:null,open:null},_create:function(){this._on({mouseover:"open",focusin:"open"}),this.tooltips={},this.parents={},this.options.disabled&&this._disable()},_setOption:function(e,i){var s=this;return"disabled"===e?(this[i?"_disable":"_enable"](),this.options[e]=i,void 0):(this._super(e,i),"content"===e&&t.each(this.tooltips,function(t,e){s._updateContent(e)}),void 0)},_disable:function(){var e=this;t.each(this.tooltips,function(i,s){var n=t.Event("blur");n.target=n.currentTarget=s[0],e.close(n,!0)}),this.element.find(this.options.items).addBack().each(function(){var e=t(this);e.is("[title]")&&e.data("ui-tooltip-title",e.attr("title")).attr("title","")})},_enable:function(){this.element.find(this.options.items).addBack().each(function(){var e=t(this);e.data("ui-tooltip-title")&&e.attr("title",e.data("ui-tooltip-title"))})},open:function(e){var i=this,s=t(e?e.target:this.element).closest(this.options.items);s.length&&!s.data("ui-tooltip-id")&&(s.attr("title")&&s.data("ui-tooltip-title",s.attr("title")),s.data("ui-tooltip-open",!0),e&&"mouseover"===e.type&&s.parents().each(function(){var e,s=t(this);s.data("ui-tooltip-open")&&(e=t.Event("blur"),e.target=e.currentTarget=this,i.close(e,!0)),s.attr("title")&&(s.uniqueId(),i.parents[this.id]={element:this,title:s.attr("title")},s.attr("title",""))}),this._updateContent(s,e))},_updateContent:function(t,e){var i,s=this.options.content,n=this,o=e?e.type:null;
+return"string"==typeof s?this._open(e,t,s):(i=s.call(t[0],function(i){t.data("ui-tooltip-open")&&n._delay(function(){e&&(e.type=o),this._open(e,t,i)})}),i&&this._open(e,t,i),void 0)},_open:function(i,s,n){function o(t){l.of=t,a.is(":hidden")||a.position(l)}var a,r,h,l=t.extend({},this.options.position);if(n){if(a=this._find(s),a.length)return a.find(".ui-tooltip-content").html(n),void 0;s.is("[title]")&&(i&&"mouseover"===i.type?s.attr("title",""):s.removeAttr("title")),a=this._tooltip(s),e(s,a.attr("id")),a.find(".ui-tooltip-content").html(n),this.options.track&&i&&/^mouse/.test(i.type)?(this._on(this.document,{mousemove:o}),o(i)):a.position(t.extend({of:s},this.options.position)),a.hide(),this._show(a,this.options.show),this.options.show&&this.options.show.delay&&(h=this.delayedShow=setInterval(function(){a.is(":visible")&&(o(l.of),clearInterval(h))},t.fx.interval)),this._trigger("open",i,{tooltip:a}),r={keyup:function(e){if(e.keyCode===t.ui.keyCode.ESCAPE){var i=t.Event(e);i.currentTarget=s[0],this.close(i,!0)}},remove:function(){this._removeTooltip(a)}},i&&"mouseover"!==i.type||(r.mouseleave="close"),i&&"focusin"!==i.type||(r.focusout="close"),this._on(!0,s,r)}},close:function(e){var s=this,n=t(e?e.currentTarget:this.element),o=this._find(n);this.closing||(clearInterval(this.delayedShow),n.data("ui-tooltip-title")&&n.attr("title",n.data("ui-tooltip-title")),i(n),o.stop(!0),this._hide(o,this.options.hide,function(){s._removeTooltip(t(this))}),n.removeData("ui-tooltip-open"),this._off(n,"mouseleave focusout keyup"),n[0]!==this.element[0]&&this._off(n,"remove"),this._off(this.document,"mousemove"),e&&"mouseleave"===e.type&&t.each(this.parents,function(e,i){t(i.element).attr("title",i.title),delete s.parents[e]}),this.closing=!0,this._trigger("close",e,{tooltip:o}),this.closing=!1)},_tooltip:function(e){var i="ui-tooltip-"+s++,n=t("<div>").attr({id:i,role:"tooltip"}).addClass("ui-tooltip ui-widget ui-corner-all ui-widget-content "+(this.options.tooltipClass||""));return t("<div>").addClass("ui-tooltip-content").appendTo(n),n.appendTo(this.document[0].body),this.tooltips[i]=e,n},_find:function(e){var i=e.data("ui-tooltip-id");return i?t("#"+i):t()},_removeTooltip:function(t){t.remove(),delete this.tooltips[t.attr("id")]},_destroy:function(){var e=this;t.each(this.tooltips,function(i,s){var n=t.Event("blur");n.target=n.currentTarget=s[0],e.close(n,!0),t("#"+i).remove(),s.data("ui-tooltip-title")&&(s.attr("title",s.data("ui-tooltip-title")),s.removeData("ui-tooltip-title"))})}})}(jQuery);
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/jquery/jquery.form.js b/pluss-wap-page/src/main/resources/static/resources/js/third-party/jquery/jquery.form.js
new file mode 100644
index 0000000..a8075ee
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/third-party/jquery/jquery.form.js
@@ -0,0 +1,911 @@
+/*!
+ * jQuery Form Plugin
+ * version: 2.83 (11-JUL-2011)
+ * @requires jQuery v1.3.2 or later
+ *
+ * Examples and documentation at: http://malsup.com/jquery/form/
+ * Dual licensed under the MIT and GPL licenses:
+ *   http://www.opensource.org/licenses/mit-license.php
+ *   http://www.gnu.org/licenses/gpl.html
+ */
+;(function($) {
+
+/*
+	Usage Note:
+	-----------
+	Do not use both ajaxSubmit and ajaxForm on the same form.  These
+	functions are intended to be exclusive.  Use ajaxSubmit if you want
+	to bind your own submit handler to the form.  For example,
+
+	$(document).ready(function() {
+		$('#myForm').bind('submit', function(e) {
+			e.preventDefault(); // <-- important
+			$(this).ajaxSubmit({
+				target: '#output'
+			});
+		});
+	});
+
+	Use ajaxForm when you want the plugin to manage all the event binding
+	for you.  For example,
+
+	$(document).ready(function() {
+		$('#myForm').ajaxForm({
+			target: '#output'
+		});
+	});
+
+	When using ajaxForm, the ajaxSubmit function will be invoked for you
+	at the appropriate time.
+*/
+
+/**
+ * ajaxSubmit() provides a mechanism for immediately submitting
+ * an HTML form using AJAX.
+ */
+$.fn.ajaxSubmit = function(options) {
+	// fast fail if nothing selected (http://dev.jquery.com/ticket/2752)
+	if (!this.length) {
+		log('ajaxSubmit: skipping submit process - no element selected');
+		return this;
+	}
+	
+	var method, action, url, $form = this;
+
+	if (typeof options == 'function') {
+		options = { success: options };
+	}
+
+	method = this.attr('method');
+	action = this.attr('action');
+	url = (typeof action === 'string') ? $.trim(action) : '';
+	url = url || window.location.href || '';
+	if (url) {
+		// clean url (don't include hash vaue)
+		url = (url.match(/^([^#]+)/)||[])[1];
+	}
+
+	options = $.extend(true, {
+		url:  url,
+		success: $.ajaxSettings.success,
+		type: method || 'GET',
+		iframeSrc: /^https/i.test(window.location.href || '') ? 'javascript:false' : 'about:blank'
+	}, options);
+
+	// hook for manipulating the form data before it is extracted;
+	// convenient for use with rich editors like tinyMCE or FCKEditor
+	var veto = {};
+	this.trigger('form-pre-serialize', [this, options, veto]);
+	if (veto.veto) {
+		log('ajaxSubmit: submit vetoed via form-pre-serialize trigger');
+		return this;
+	}
+
+	// provide opportunity to alter form data before it is serialized
+	if (options.beforeSerialize && options.beforeSerialize(this, options) === false) {
+		log('ajaxSubmit: submit aborted via beforeSerialize callback');
+		return this;
+	}
+
+	var n,v,a = this.formToArray(options.semantic);
+	if (options.data) {
+		options.extraData = options.data;
+		for (n in options.data) {
+			if(options.data[n] instanceof Array) {
+				for (var k in options.data[n]) {
+					a.push( { name: n, value: options.data[n][k] } );
+				}
+			}
+			else {
+				v = options.data[n];
+				v = $.isFunction(v) ? v() : v; // if value is fn, invoke it
+				a.push( { name: n, value: v } );
+			}
+		}
+	}
+
+	// give pre-submit callback an opportunity to abort the submit
+	if (options.beforeSubmit && options.beforeSubmit(a, this, options) === false) {
+		log('ajaxSubmit: submit aborted via beforeSubmit callback');
+		return this;
+	}
+
+	// fire vetoable 'validate' event
+	this.trigger('form-submit-validate', [a, this, options, veto]);
+	if (veto.veto) {
+		log('ajaxSubmit: submit vetoed via form-submit-validate trigger');
+		return this;
+	}
+
+	var q = $.param(a);
+
+	if (options.type.toUpperCase() == 'GET') {
+		options.url += (options.url.indexOf('?') >= 0 ? '&' : '?') + q;
+		options.data = null;  // data is null for 'get'
+	}
+	else {
+		options.data = q; // data is the query string for 'post'
+	}
+
+	var callbacks = [];
+	if (options.resetForm) {
+		callbacks.push(function() { $form.resetForm(); });
+	}
+	if (options.clearForm) {
+		callbacks.push(function() { $form.clearForm(); });
+	}
+
+	// perform a load on the target only if dataType is not provided
+	if (!options.dataType && options.target) {
+		var oldSuccess = options.success || function(){};
+		callbacks.push(function(data) {
+			var fn = options.replaceTarget ? 'replaceWith' : 'html';
+			$(options.target)[fn](data).each(oldSuccess, arguments);
+		});
+	}
+	else if (options.success) {
+		callbacks.push(options.success);
+	}
+
+	options.success = function(data, status, xhr) { // jQuery 1.4+ passes xhr as 3rd arg
+		var context = options.context || options;   // jQuery 1.4+ supports scope context 
+		for (var i=0, max=callbacks.length; i < max; i++) {
+			callbacks[i].apply(context, [data, status, xhr || $form, $form]);
+		}
+	};
+
+	// are there files to upload?
+	var fileInputs = $('input:file', this).length > 0;
+	var mp = 'multipart/form-data';
+	var multipart = ($form.attr('enctype') == mp || $form.attr('encoding') == mp);
+
+	// options.iframe allows user to force iframe mode
+	// 06-NOV-09: now defaulting to iframe mode if file input is detected
+   if (options.iframe !== false && (fileInputs || options.iframe || multipart)) {
+	   // hack to fix Safari hang (thanks to Tim Molendijk for this)
+	   // see:  http://groups.google.com/group/jquery-dev/browse_thread/thread/36395b7ab510dd5d
+	   if (options.closeKeepAlive) {
+		   $.get(options.closeKeepAlive, function() { fileUpload(a); });
+		}
+	   else {
+		   fileUpload(a);
+		}
+   }
+   else {
+		// IE7 massage (see issue 57)
+		if ($.browser.msie && method == 'get') { 
+			var ieMeth = $form[0].getAttribute('method');
+			if (typeof ieMeth === 'string')
+				options.type = ieMeth;
+		}
+		$.ajax(options);
+   }
+
+	// fire 'notify' event
+	this.trigger('form-submit-notify', [this, options]);
+	return this;
+
+
+	// private function for handling file uploads (hat tip to YAHOO!)
+	function fileUpload(a) {
+		var form = $form[0], el, i, s, g, id, $io, io, xhr, sub, n, timedOut, timeoutHandle;
+        var useProp = !!$.fn.prop;
+
+        if (a) {
+        	// ensure that every serialized input is still enabled
+          	for (i=0; i < a.length; i++) {
+                el = $(form[a[i].name]);
+                el[ useProp ? 'prop' : 'attr' ]('disabled', false);
+          	}
+        }
+
+		if ($(':input[name=submit],:input[id=submit]', form).length) {
+			// if there is an input with a name or id of 'submit' then we won't be
+			// able to invoke the submit fn on the form (at least not x-browser)
+			alert('Error: Form elements must not have name or id of "submit".');
+			return;
+		}
+		
+		s = $.extend(true, {}, $.ajaxSettings, options);
+		s.context = s.context || s;
+		id = 'jqFormIO' + (new Date().getTime());
+		if (s.iframeTarget) {
+			$io = $(s.iframeTarget);
+			n = $io.attr('name');
+			if (n == null)
+			 	$io.attr('name', id);
+			else
+				id = n;
+		}
+		else {
+			$io = $('<iframe name="' + id + '" src="'+ s.iframeSrc +'" />');
+			$io.css({ position: 'absolute', top: '-1000px', left: '-1000px' });
+		}
+		io = $io[0];
+
+
+		xhr = { // mock object
+			aborted: 0,
+			responseText: null,
+			responseXML: null,
+			status: 0,
+			statusText: 'n/a',
+			getAllResponseHeaders: function() {},
+			getResponseHeader: function() {},
+			setRequestHeader: function() {},
+			abort: function(status) {
+				var e = (status === 'timeout' ? 'timeout' : 'aborted');
+				log('aborting upload... ' + e);
+				this.aborted = 1;
+				$io.attr('src', s.iframeSrc); // abort op in progress
+				xhr.error = e;
+				s.error && s.error.call(s.context, xhr, e, status);
+				g && $.event.trigger("ajaxError", [xhr, s, e]);
+				s.complete && s.complete.call(s.context, xhr, e);
+			}
+		};
+
+		g = s.global;
+		// trigger ajax global events so that activity/block indicators work like normal
+		if (g && ! $.active++) {
+			$.event.trigger("ajaxStart");
+		}
+		if (g) {
+			$.event.trigger("ajaxSend", [xhr, s]);
+		}
+
+		if (s.beforeSend && s.beforeSend.call(s.context, xhr, s) === false) {
+			if (s.global) {
+				$.active--;
+			}
+			return;
+		}
+		if (xhr.aborted) {
+			return;
+		}
+
+		// add submitting element to data if we know it
+		sub = form.clk;
+		if (sub) {
+			n = sub.name;
+			if (n && !sub.disabled) {
+				s.extraData = s.extraData || {};
+				s.extraData[n] = sub.value;
+				if (sub.type == "image") {
+					s.extraData[n+'.x'] = form.clk_x;
+					s.extraData[n+'.y'] = form.clk_y;
+				}
+			}
+		}
+		
+		var CLIENT_TIMEOUT_ABORT = 1;
+		var SERVER_ABORT = 2;
+
+		function getDoc(frame) {
+			var doc = frame.contentWindow ? frame.contentWindow.document : frame.contentDocument ? frame.contentDocument : frame.document;
+			return doc;
+		}
+		
+		// take a breath so that pending repaints get some cpu time before the upload starts
+		function doSubmit() {
+			// make sure form attrs are set
+			var t = $form.attr('target'), a = $form.attr('action');
+
+			// update form attrs in IE friendly way
+			form.setAttribute('target',id);
+			if (!method) {
+				form.setAttribute('method', 'POST');
+			}
+			if (a != s.url) {
+				form.setAttribute('action', s.url);
+			}
+
+			// ie borks in some cases when setting encoding
+			if (! s.skipEncodingOverride && (!method || /post/i.test(method))) {
+				$form.attr({
+					encoding: 'multipart/form-data',
+					enctype:  'multipart/form-data'
+				});
+			}
+
+			// support timout
+			if (s.timeout) {
+				timeoutHandle = setTimeout(function() { timedOut = true; cb(CLIENT_TIMEOUT_ABORT); }, s.timeout);
+			}
+			
+			// look for server aborts
+			function checkState() {
+				try {
+					var state = getDoc(io).readyState;
+					log('state = ' + state);
+					if (state.toLowerCase() == 'uninitialized')
+						setTimeout(checkState,50);
+				}
+				catch(e) {
+					log('Server abort: ' , e, ' (', e.name, ')');
+					cb(SERVER_ABORT);
+					timeoutHandle && clearTimeout(timeoutHandle);
+					timeoutHandle = undefined;
+				}
+			}
+
+			// add "extra" data to form if provided in options
+			var extraInputs = [];
+			try {
+				if (s.extraData) {
+					for (var n in s.extraData) {
+						extraInputs.push(
+							$('<input type="hidden" name="'+n+'" />').attr('value',s.extraData[n])
+								.appendTo(form)[0]);
+					}
+				}
+
+				if (!s.iframeTarget) {
+					// add iframe to doc and submit the form
+					$io.appendTo('body');
+	                io.attachEvent ? io.attachEvent('onload', cb) : io.addEventListener('load', cb, false);
+				}
+				setTimeout(checkState,15);
+				form.submit();
+			}
+			finally {
+				// reset attrs and remove "extra" input elements
+				form.setAttribute('action',a);
+				if(t) {
+					form.setAttribute('target', t);
+				} else {
+					$form.removeAttr('target');
+				}
+				$(extraInputs).remove();
+			}
+		}
+
+		if (s.forceSync) {
+			doSubmit();
+		}
+		else {
+			setTimeout(doSubmit, 10); // this lets dom updates render
+		}
+
+		var data, doc, domCheckCount = 50, callbackProcessed;
+
+		function cb(e) {
+			if (xhr.aborted || callbackProcessed) {
+				return;
+			}
+			try {
+				doc = getDoc(io);
+			}
+			catch(ex) {
+				log('cannot access response document: ', ex);
+				e = SERVER_ABORT;
+			}
+			if (e === CLIENT_TIMEOUT_ABORT && xhr) {
+				xhr.abort('timeout');
+				return;
+			}
+			else if (e == SERVER_ABORT && xhr) {
+				xhr.abort('server abort');
+				return;
+			}
+
+			if (!doc || doc.location.href == s.iframeSrc) {
+				// response not received yet
+				if (!timedOut)
+					return;
+			}
+            io.detachEvent ? io.detachEvent('onload', cb) : io.removeEventListener('load', cb, false);
+
+			var status = 'success', errMsg;
+			try {
+				if (timedOut) {
+					throw 'timeout';
+				}
+
+				var isXml = s.dataType == 'xml' || doc.XMLDocument || $.isXMLDoc(doc);
+				log('isXml='+isXml);
+				if (!isXml && window.opera && (doc.body == null || doc.body.innerHTML == '')) {
+					if (--domCheckCount) {
+						// in some browsers (Opera) the iframe DOM is not always traversable when
+						// the onload callback fires, so we loop a bit to accommodate
+						log('requeing onLoad callback, DOM not available');
+						setTimeout(cb, 250);
+						return;
+					}
+					// let this fall through because server response could be an empty document
+					//log('Could not access iframe DOM after mutiple tries.');
+					//throw 'DOMException: not available';
+				}
+
+				//log('response detected');
+                var docRoot = doc.body ? doc.body : doc.documentElement;
+                xhr.responseText = docRoot ? docRoot.innerHTML : null;
+				xhr.responseXML = doc.XMLDocument ? doc.XMLDocument : doc;
+				if (isXml)
+					s.dataType = 'xml';
+				xhr.getResponseHeader = function(header){
+					var headers = {'content-type': s.dataType};
+					return headers[header];
+				};
+                // support for XHR 'status' & 'statusText' emulation :
+                if (docRoot) {
+                    xhr.status = Number( docRoot.getAttribute('status') ) || xhr.status;
+                    xhr.statusText = docRoot.getAttribute('statusText') || xhr.statusText;
+                }
+
+				var dt = s.dataType || '';
+				var scr = /(json|script|text)/.test(dt.toLowerCase());
+				if (scr || s.textarea) {
+					// see if user embedded response in textarea
+					var ta = doc.getElementsByTagName('textarea')[0];
+					if (ta) {
+						xhr.responseText = ta.value;
+                        // support for XHR 'status' & 'statusText' emulation :
+                        xhr.status = Number( ta.getAttribute('status') ) || xhr.status;
+                        xhr.statusText = ta.getAttribute('statusText') || xhr.statusText;
+					}
+					else if (scr) {
+						// account for browsers injecting pre around json response
+						var pre = doc.getElementsByTagName('pre')[0];
+						var b = doc.getElementsByTagName('body')[0];
+						if (pre) {
+							xhr.responseText = pre.textContent ? pre.textContent : pre.innerHTML;
+						}
+						else if (b) {
+							xhr.responseText = b.innerHTML;
+						}
+					}
+				}
+				else if (s.dataType == 'xml' && !xhr.responseXML && xhr.responseText != null) {
+					xhr.responseXML = toXml(xhr.responseText);
+				}
+
+                try {
+                    data = httpData(xhr, s.dataType, s);
+                }
+                catch (e) {
+                    status = 'parsererror';
+                    xhr.error = errMsg = (e || status);
+                }
+			}
+			catch (e) {
+				log('error caught: ',e);
+				status = 'error';
+                xhr.error = errMsg = (e || status);
+			}
+
+			if (xhr.aborted) {
+				log('upload aborted');
+				status = null;
+			}
+
+            if (xhr.status) { // we've set xhr.status
+                status = (xhr.status >= 200 && xhr.status < 300 || xhr.status === 304) ? 'success' : 'error';
+            }
+
+			// ordering of these callbacks/triggers is odd, but that's how $.ajax does it
+			if (status === 'success') {
+				s.success && s.success.call(s.context, data, 'success', xhr);
+				g && $.event.trigger("ajaxSuccess", [xhr, s]);
+			}
+            else if (status) {
+				if (errMsg == undefined)
+					errMsg = xhr.statusText;
+				s.error && s.error.call(s.context, xhr, status, errMsg);
+				g && $.event.trigger("ajaxError", [xhr, s, errMsg]);
+            }
+
+			g && $.event.trigger("ajaxComplete", [xhr, s]);
+
+			if (g && ! --$.active) {
+				$.event.trigger("ajaxStop");
+			}
+
+			s.complete && s.complete.call(s.context, xhr, status);
+
+			callbackProcessed = true;
+			if (s.timeout)
+				clearTimeout(timeoutHandle);
+
+			// clean up
+			setTimeout(function() {
+				if (!s.iframeTarget)
+					$io.remove();
+				xhr.responseXML = null;
+			}, 100);
+		}
+
+		var toXml = $.parseXML || function(s, doc) { // use parseXML if available (jQuery 1.5+)
+			if (window.ActiveXObject) {
+				doc = new ActiveXObject('Microsoft.XMLDOM');
+				doc.async = 'false';
+				doc.loadXML(s);
+			}
+			else {
+				doc = (new DOMParser()).parseFromString(s, 'text/xml');
+			}
+			return (doc && doc.documentElement && doc.documentElement.nodeName != 'parsererror') ? doc : null;
+		};
+		var parseJSON = $.parseJSON || function(s) {
+			return window['eval']('(' + s + ')');
+		};
+
+		var httpData = function( xhr, type, s ) { // mostly lifted from jq1.4.4
+
+			var ct = xhr.getResponseHeader('content-type') || '',
+				xml = type === 'xml' || !type && ct.indexOf('xml') >= 0,
+				data = xml ? xhr.responseXML : xhr.responseText;
+
+			if (xml && data.documentElement.nodeName === 'parsererror') {
+				$.error && $.error('parsererror');
+			}
+			if (s && s.dataFilter) {
+				data = s.dataFilter(data, type);
+			}
+			if (typeof data === 'string') {
+				if (type === 'json' || !type && ct.indexOf('json') >= 0) {
+					data = parseJSON(data);
+				} else if (type === "script" || !type && ct.indexOf("javascript") >= 0) {
+					$.globalEval(data);
+				}
+			}
+			return data;
+		};
+	}
+};
+
+/**
+ * ajaxForm() provides a mechanism for fully automating form submission.
+ *
+ * The advantages of using this method instead of ajaxSubmit() are:
+ *
+ * 1: This method will include coordinates for <input type="image" /> elements (if the element
+ *	is used to submit the form).
+ * 2. This method will include the submit element's name/value data (for the element that was
+ *	used to submit the form).
+ * 3. This method binds the submit() method to the form for you.
+ *
+ * The options argument for ajaxForm works exactly as it does for ajaxSubmit.  ajaxForm merely
+ * passes the options argument along after properly binding events for submit elements and
+ * the form itself.
+ */
+$.fn.ajaxForm = function(options) {
+	// in jQuery 1.3+ we can fix mistakes with the ready state
+	if (this.length === 0) {
+		var o = { s: this.selector, c: this.context };
+		if (!$.isReady && o.s) {
+			log('DOM not ready, queuing ajaxForm');
+			$(function() {
+				$(o.s,o.c).ajaxForm(options);
+			});
+			return this;
+		}
+		// is your DOM ready?  http://docs.jquery.com/Tutorials:Introducing_$(document).ready()
+		log('terminating; zero elements found by selector' + ($.isReady ? '' : ' (DOM not ready)'));
+		return this;
+	}
+
+	return this.ajaxFormUnbind().bind('submit.form-plugin', function(e) {
+		if (!e.isDefaultPrevented()) { // if event has been canceled, don't proceed
+			e.preventDefault();
+			$(this).ajaxSubmit(options);
+		}
+	}).bind('click.form-plugin', function(e) {
+		var target = e.target;
+		var $el = $(target);
+		if (!($el.is(":submit,input:image"))) {
+			// is this a child element of the submit el?  (ex: a span within a button)
+			var t = $el.closest(':submit');
+			if (t.length == 0) {
+				return;
+			}
+			target = t[0];
+		}
+		var form = this;
+		form.clk = target;
+		if (target.type == 'image') {
+			if (e.offsetX != undefined) {
+				form.clk_x = e.offsetX;
+				form.clk_y = e.offsetY;
+			} else if (typeof $.fn.offset == 'function') { // try to use dimensions plugin
+				var offset = $el.offset();
+				form.clk_x = e.pageX - offset.left;
+				form.clk_y = e.pageY - offset.top;
+			} else {
+				form.clk_x = e.pageX - target.offsetLeft;
+				form.clk_y = e.pageY - target.offsetTop;
+			}
+		}
+		// clear form vars
+		setTimeout(function() { form.clk = form.clk_x = form.clk_y = null; }, 100);
+	});
+};
+
+// ajaxFormUnbind unbinds the event handlers that were bound by ajaxForm
+$.fn.ajaxFormUnbind = function() {
+	return this.unbind('submit.form-plugin click.form-plugin');
+};
+
+/**
+ * formToArray() gathers form element data into an array of objects that can
+ * be passed to any of the following ajax functions: $.get, $.post, or load.
+ * Each object in the array has both a 'name' and 'value' property.  An example of
+ * an array for a simple login form might be:
+ *
+ * [ { name: 'username', value: 'jresig' }, { name: 'password', value: 'secret' } ]
+ *
+ * It is this array that is passed to pre-submit callback functions provided to the
+ * ajaxSubmit() and ajaxForm() methods.
+ */
+$.fn.formToArray = function(semantic) {
+	var a = [];
+	if (this.length === 0) {
+		return a;
+	}
+
+	var form = this[0];
+	var els = semantic ? form.getElementsByTagName('*') : form.elements;
+	if (!els) {
+		return a;
+	}
+
+	var i,j,n,v,el,max,jmax;
+	for(i=0, max=els.length; i < max; i++) {
+		el = els[i];
+		n = el.name;
+		if (!n) {
+			continue;
+		}
+
+		if (semantic && form.clk && el.type == "image") {
+			// handle image inputs on the fly when semantic == true
+			if(!el.disabled && form.clk == el) {
+				a.push({name: n, value: $(el).val()});
+				a.push({name: n+'.x', value: form.clk_x}, {name: n+'.y', value: form.clk_y});
+			}
+			continue;
+		}
+
+		v = $.fieldValue(el, true);
+		if (v && v.constructor == Array) {
+			for(j=0, jmax=v.length; j < jmax; j++) {
+				a.push({name: n, value: v[j]});
+			}
+		}
+		else if (v !== null && typeof v != 'undefined') {
+			a.push({name: n, value: v});
+		}
+	}
+
+	if (!semantic && form.clk) {
+		// input type=='image' are not found in elements array! handle it here
+		var $input = $(form.clk), input = $input[0];
+		n = input.name;
+		if (n && !input.disabled && input.type == 'image') {
+			a.push({name: n, value: $input.val()});
+			a.push({name: n+'.x', value: form.clk_x}, {name: n+'.y', value: form.clk_y});
+		}
+	}
+	return a;
+};
+
+/**
+ * Serializes form data into a 'submittable' string. This method will return a string
+ * in the format: name1=value1&amp;name2=value2
+ */
+$.fn.formSerialize = function(semantic) {
+	//hand off to jQuery.param for proper encoding
+	return $.param(this.formToArray(semantic));
+};
+
+/**
+ * Serializes all field elements in the jQuery object into a query string.
+ * This method will return a string in the format: name1=value1&amp;name2=value2
+ */
+$.fn.fieldSerialize = function(successful) {
+	var a = [];
+	this.each(function() {
+		var n = this.name;
+		if (!n) {
+			return;
+		}
+		var v = $.fieldValue(this, successful);
+		if (v && v.constructor == Array) {
+			for (var i=0,max=v.length; i < max; i++) {
+				a.push({name: n, value: v[i]});
+			}
+		}
+		else if (v !== null && typeof v != 'undefined') {
+			a.push({name: this.name, value: v});
+		}
+	});
+	//hand off to jQuery.param for proper encoding
+	return $.param(a);
+};
+
+/**
+ * Returns the value(s) of the element in the matched set.  For example, consider the following form:
+ *
+ *  <form><fieldset>
+ *	  <input name="A" type="text" />
+ *	  <input name="A" type="text" />
+ *	  <input name="B" type="checkbox" value="B1" />
+ *	  <input name="B" type="checkbox" value="B2"/>
+ *	  <input name="C" type="radio" value="C1" />
+ *	  <input name="C" type="radio" value="C2" />
+ *  </fieldset></form>
+ *
+ *  var v = $(':text').fieldValue();
+ *  // if no values are entered into the text inputs
+ *  v == ['','']
+ *  // if values entered into the text inputs are 'foo' and 'bar'
+ *  v == ['foo','bar']
+ *
+ *  var v = $(':checkbox').fieldValue();
+ *  // if neither checkbox is checked
+ *  v === undefined
+ *  // if both checkboxes are checked
+ *  v == ['B1', 'B2']
+ *
+ *  var v = $(':radio').fieldValue();
+ *  // if neither radio is checked
+ *  v === undefined
+ *  // if first radio is checked
+ *  v == ['C1']
+ *
+ * The successful argument controls whether or not the field element must be 'successful'
+ * (per http://www.w3.org/TR/html4/interact/forms.html#successful-controls).
+ * The default value of the successful argument is true.  If this value is false the value(s)
+ * for each element is returned.
+ *
+ * Note: This method *always* returns an array.  If no valid value can be determined the
+ *	   array will be empty, otherwise it will contain one or more values.
+ */
+$.fn.fieldValue = function(successful) {
+	for (var val=[], i=0, max=this.length; i < max; i++) {
+		var el = this[i];
+		var v = $.fieldValue(el, successful);
+		if (v === null || typeof v == 'undefined' || (v.constructor == Array && !v.length)) {
+			continue;
+		}
+		v.constructor == Array ? $.merge(val, v) : val.push(v);
+	}
+	return val;
+};
+
+/**
+ * Returns the value of the field element.
+ */
+$.fieldValue = function(el, successful) {
+	var n = el.name, t = el.type, tag = el.tagName.toLowerCase();
+	if (successful === undefined) {
+		successful = true;
+	}
+
+	if (successful && (!n || el.disabled || t == 'reset' || t == 'button' ||
+		(t == 'checkbox' || t == 'radio') && !el.checked ||
+		(t == 'submit' || t == 'image') && el.form && el.form.clk != el ||
+		tag == 'select' && el.selectedIndex == -1)) {
+			return null;
+	}
+
+	if (tag == 'select') {
+		var index = el.selectedIndex;
+		if (index < 0) {
+			return null;
+		}
+		var a = [], ops = el.options;
+		var one = (t == 'select-one');
+		var max = (one ? index+1 : ops.length);
+		for(var i=(one ? index : 0); i < max; i++) {
+			var op = ops[i];
+			if (op.selected) {
+				var v = op.value;
+				if (!v) { // extra pain for IE...
+					v = (op.attributes && op.attributes['value'] && !(op.attributes['value'].specified)) ? op.text : op.value;
+				}
+				if (one) {
+					return v;
+				}
+				a.push(v);
+			}
+		}
+		return a;
+	}
+	return $(el).val();
+};
+
+/**
+ * Clears the form data.  Takes the following actions on the form's input fields:
+ *  - input text fields will have their 'value' property set to the empty string
+ *  - select elements will have their 'selectedIndex' property set to -1
+ *  - checkbox and radio inputs will have their 'checked' property set to false
+ *  - inputs of type submit, button, reset, and hidden will *not* be effected
+ *  - button elements will *not* be effected
+ */
+$.fn.clearForm = function() {
+	return this.each(function() {
+		$('input,select,textarea', this).clearFields();
+	});
+};
+
+/**
+ * Clears the selected form elements.
+ */
+$.fn.clearFields = $.fn.clearInputs = function() {
+	var re = /^(?:color|date|datetime|email|month|number|password|range|search|tel|text|time|url|week)$/i; // 'hidden' is not in this list
+	return this.each(function() {
+		var t = this.type, tag = this.tagName.toLowerCase();
+		if (re.test(t) || tag == 'textarea') {
+			this.value = '';
+		}
+		else if (t == 'checkbox' || t == 'radio') {
+			this.checked = false;
+		}
+		else if (tag == 'select') {
+			this.selectedIndex = -1;
+		}
+	});
+};
+
+/**
+ * Resets the form data.  Causes all form elements to be reset to their original value.
+ */
+$.fn.resetForm = function() {
+	return this.each(function() {
+		// guard against an input with the name of 'reset'
+		// note that IE reports the reset function as an 'object'
+		if (typeof this.reset == 'function' || (typeof this.reset == 'object' && !this.reset.nodeType)) {
+			this.reset();
+		}
+	});
+};
+
+/**
+ * Enables or disables any matching elements.
+ */
+$.fn.enable = function(b) {
+	if (b === undefined) {
+		b = true;
+	}
+	return this.each(function() {
+		this.disabled = !b;
+	});
+};
+
+/**
+ * Checks/unchecks any matching checkboxes or radio buttons and
+ * selects/deselects and matching option elements.
+ */
+$.fn.selected = function(select) {
+	if (select === undefined) {
+		select = true;
+	}
+	return this.each(function() {
+		var t = this.type;
+		if (t == 'checkbox' || t == 'radio') {
+			this.checked = select;
+		}
+		else if (this.tagName.toLowerCase() == 'option') {
+			var $sel = $(this).parent('select');
+			if (select && $sel[0] && $sel[0].type == 'select-one') {
+				// deselect all other options
+				$sel.find('option').selected(false);
+			}
+			this.selected = select;
+		}
+	});
+};
+
+// helper fn for console logging
+function log() {
+	var msg = '[jquery.form] ' + Array.prototype.join.call(arguments,'');
+	if (window.console && window.console.log) {
+		window.console.log(msg);
+	}
+	else if (window.opera && window.opera.postError) {
+		window.opera.postError(msg);
+	}
+};
+
+})(jQuery);
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/jquery/jquery.min.js b/pluss-wap-page/src/main/resources/static/resources/js/third-party/jquery/jquery.min.js
new file mode 100644
index 0000000..29b3a2c
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/third-party/jquery/jquery.min.js
@@ -0,0 +1,6 @@
+/*! jQuery v1.10.2 | (c) 2005, 2013 jQuery Foundation, Inc. | jquery.org/license
+//@ sourceMappingURL=jquery.min.map
+*/
+(function(e,t){var n,r,i=typeof t,o=e.location,a=e.document,s=a.documentElement,l=e.jQuery,u=e.$,c={},p=[],f="1.10.2",d=p.concat,h=p.push,g=p.slice,m=p.indexOf,y=c.toString,v=c.hasOwnProperty,b=f.trim,x=function(e,t){return new x.fn.init(e,t,r)},w=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,T=/\S+/g,C=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,N=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,k=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,E=/^[\],:{}\s]*$/,S=/(?:^|:|,)(?:\s*\[)+/g,A=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,j=/"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g,D=/^-ms-/,L=/-([\da-z])/gi,H=function(e,t){return t.toUpperCase()},q=function(e){(a.addEventListener||"load"===e.type||"complete"===a.readyState)&&(_(),x.ready())},_=function(){a.addEventListener?(a.removeEventListener("DOMContentLoaded",q,!1),e.removeEventListener("load",q,!1)):(a.detachEvent("onreadystatechange",q),e.detachEvent("onload",q))};x.fn=x.prototype={jquery:f,constructor:x,init:function(e,n,r){var i,o;if(!e)return this;if("string"==typeof e){if(i="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:N.exec(e),!i||!i[1]&&n)return!n||n.jquery?(n||r).find(e):this.constructor(n).find(e);if(i[1]){if(n=n instanceof x?n[0]:n,x.merge(this,x.parseHTML(i[1],n&&n.nodeType?n.ownerDocument||n:a,!0)),k.test(i[1])&&x.isPlainObject(n))for(i in n)x.isFunction(this[i])?this[i](n[i]):this.attr(i,n[i]);return this}if(o=a.getElementById(i[2]),o&&o.parentNode){if(o.id!==i[2])return r.find(e);this.length=1,this[0]=o}return this.context=a,this.selector=e,this}return e.nodeType?(this.context=this[0]=e,this.length=1,this):x.isFunction(e)?r.ready(e):(e.selector!==t&&(this.selector=e.selector,this.context=e.context),x.makeArray(e,this))},selector:"",length:0,toArray:function(){return g.call(this)},get:function(e){return null==e?this.toArray():0>e?this[this.length+e]:this[e]},pushStack:function(e){var t=x.merge(this.constructor(),e);return t.prevObject=this,t.context=this.context,t},each:function(e,t){return x.each(this,e,t)},ready:function(e){return x.ready.promise().done(e),this},slice:function(){return this.pushStack(g.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(0>e?t:0);return this.pushStack(n>=0&&t>n?[this[n]]:[])},map:function(e){return this.pushStack(x.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject||this.constructor(null)},push:h,sort:[].sort,splice:[].splice},x.fn.init.prototype=x.fn,x.extend=x.fn.extend=function(){var e,n,r,i,o,a,s=arguments[0]||{},l=1,u=arguments.length,c=!1;for("boolean"==typeof s&&(c=s,s=arguments[1]||{},l=2),"object"==typeof s||x.isFunction(s)||(s={}),u===l&&(s=this,--l);u>l;l++)if(null!=(o=arguments[l]))for(i in o)e=s[i],r=o[i],s!==r&&(c&&r&&(x.isPlainObject(r)||(n=x.isArray(r)))?(n?(n=!1,a=e&&x.isArray(e)?e:[]):a=e&&x.isPlainObject(e)?e:{},s[i]=x.extend(c,a,r)):r!==t&&(s[i]=r));return s},x.extend({expando:"jQuery"+(f+Math.random()).replace(/\D/g,""),noConflict:function(t){return e.$===x&&(e.$=u),t&&e.jQuery===x&&(e.jQuery=l),x},isReady:!1,readyWait:1,holdReady:function(e){e?x.readyWait++:x.ready(!0)},ready:function(e){if(e===!0?!--x.readyWait:!x.isReady){if(!a.body)return setTimeout(x.ready);x.isReady=!0,e!==!0&&--x.readyWait>0||(n.resolveWith(a,[x]),x.fn.trigger&&x(a).trigger("ready").off("ready"))}},isFunction:function(e){return"function"===x.type(e)},isArray:Array.isArray||function(e){return"array"===x.type(e)},isWindow:function(e){return null!=e&&e==e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?c[y.call(e)]||"object":typeof e},isPlainObject:function(e){var n;if(!e||"object"!==x.type(e)||e.nodeType||x.isWindow(e))return!1;try{if(e.constructor&&!v.call(e,"constructor")&&!v.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(r){return!1}if(x.support.ownLast)for(n in e)return v.call(e,n);for(n in e);return n===t||v.call(e,n)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},error:function(e){throw Error(e)},parseHTML:function(e,t,n){if(!e||"string"!=typeof e)return null;"boolean"==typeof t&&(n=t,t=!1),t=t||a;var r=k.exec(e),i=!n&&[];return r?[t.createElement(r[1])]:(r=x.buildFragment([e],t,i),i&&x(i).remove(),x.merge([],r.childNodes))},parseJSON:function(n){return e.JSON&&e.JSON.parse?e.JSON.parse(n):null===n?n:"string"==typeof n&&(n=x.trim(n),n&&E.test(n.replace(A,"@").replace(j,"]").replace(S,"")))?Function("return "+n)():(x.error("Invalid JSON: "+n),t)},parseXML:function(n){var r,i;if(!n||"string"!=typeof n)return null;try{e.DOMParser?(i=new DOMParser,r=i.parseFromString(n,"text/xml")):(r=new ActiveXObject("Microsoft.XMLDOM"),r.async="false",r.loadXML(n))}catch(o){r=t}return r&&r.documentElement&&!r.getElementsByTagName("parsererror").length||x.error("Invalid XML: "+n),r},noop:function(){},globalEval:function(t){t&&x.trim(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(D,"ms-").replace(L,H)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t,n){var r,i=0,o=e.length,a=M(e);if(n){if(a){for(;o>i;i++)if(r=t.apply(e[i],n),r===!1)break}else for(i in e)if(r=t.apply(e[i],n),r===!1)break}else if(a){for(;o>i;i++)if(r=t.call(e[i],i,e[i]),r===!1)break}else for(i in e)if(r=t.call(e[i],i,e[i]),r===!1)break;return e},trim:b&&!b.call("\ufeff\u00a0")?function(e){return null==e?"":b.call(e)}:function(e){return null==e?"":(e+"").replace(C,"")},makeArray:function(e,t){var n=t||[];return null!=e&&(M(Object(e))?x.merge(n,"string"==typeof e?[e]:e):h.call(n,e)),n},inArray:function(e,t,n){var r;if(t){if(m)return m.call(t,e,n);for(r=t.length,n=n?0>n?Math.max(0,r+n):n:0;r>n;n++)if(n in t&&t[n]===e)return n}return-1},merge:function(e,n){var r=n.length,i=e.length,o=0;if("number"==typeof r)for(;r>o;o++)e[i++]=n[o];else while(n[o]!==t)e[i++]=n[o++];return e.length=i,e},grep:function(e,t,n){var r,i=[],o=0,a=e.length;for(n=!!n;a>o;o++)r=!!t(e[o],o),n!==r&&i.push(e[o]);return i},map:function(e,t,n){var r,i=0,o=e.length,a=M(e),s=[];if(a)for(;o>i;i++)r=t(e[i],i,n),null!=r&&(s[s.length]=r);else for(i in e)r=t(e[i],i,n),null!=r&&(s[s.length]=r);return d.apply([],s)},guid:1,proxy:function(e,n){var r,i,o;return"string"==typeof n&&(o=e[n],n=e,e=o),x.isFunction(e)?(r=g.call(arguments,2),i=function(){return e.apply(n||this,r.concat(g.call(arguments)))},i.guid=e.guid=e.guid||x.guid++,i):t},access:function(e,n,r,i,o,a,s){var l=0,u=e.length,c=null==r;if("object"===x.type(r)){o=!0;for(l in r)x.access(e,n,l,r[l],!0,a,s)}else if(i!==t&&(o=!0,x.isFunction(i)||(s=!0),c&&(s?(n.call(e,i),n=null):(c=n,n=function(e,t,n){return c.call(x(e),n)})),n))for(;u>l;l++)n(e[l],r,s?i:i.call(e[l],l,n(e[l],r)));return o?e:c?n.call(e):u?n(e[0],r):a},now:function(){return(new Date).getTime()},swap:function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];i=n.apply(e,r||[]);for(o in t)e.style[o]=a[o];return i}}),x.ready.promise=function(t){if(!n)if(n=x.Deferred(),"complete"===a.readyState)setTimeout(x.ready);else if(a.addEventListener)a.addEventListener("DOMContentLoaded",q,!1),e.addEventListener("load",q,!1);else{a.attachEvent("onreadystatechange",q),e.attachEvent("onload",q);var r=!1;try{r=null==e.frameElement&&a.documentElement}catch(i){}r&&r.doScroll&&function o(){if(!x.isReady){try{r.doScroll("left")}catch(e){return setTimeout(o,50)}_(),x.ready()}}()}return n.promise(t)},x.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(e,t){c["[object "+t+"]"]=t.toLowerCase()});function M(e){var t=e.length,n=x.type(e);return x.isWindow(e)?!1:1===e.nodeType&&t?!0:"array"===n||"function"!==n&&(0===t||"number"==typeof t&&t>0&&t-1 in e)}r=x(a),function(e,t){var n,r,i,o,a,s,l,u,c,p,f,d,h,g,m,y,v,b="sizzle"+-new Date,w=e.document,T=0,C=0,N=st(),k=st(),E=st(),S=!1,A=function(e,t){return e===t?(S=!0,0):0},j=typeof t,D=1<<31,L={}.hasOwnProperty,H=[],q=H.pop,_=H.push,M=H.push,O=H.slice,F=H.indexOf||function(e){var t=0,n=this.length;for(;n>t;t++)if(this[t]===e)return t;return-1},B="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",P="[\\x20\\t\\r\\n\\f]",R="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",W=R.replace("w","w#"),$="\\["+P+"*("+R+")"+P+"*(?:([*^$|!~]?=)"+P+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+W+")|)|)"+P+"*\\]",I=":("+R+")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+$.replace(3,8)+")*)|.*)\\)|)",z=RegExp("^"+P+"+|((?:^|[^\\\\])(?:\\\\.)*)"+P+"+$","g"),X=RegExp("^"+P+"*,"+P+"*"),U=RegExp("^"+P+"*([>+~]|"+P+")"+P+"*"),V=RegExp(P+"*[+~]"),Y=RegExp("="+P+"*([^\\]'\"]*)"+P+"*\\]","g"),J=RegExp(I),G=RegExp("^"+W+"$"),Q={ID:RegExp("^#("+R+")"),CLASS:RegExp("^\\.("+R+")"),TAG:RegExp("^("+R.replace("w","w*")+")"),ATTR:RegExp("^"+$),PSEUDO:RegExp("^"+I),CHILD:RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+P+"*(even|odd|(([+-]|)(\\d*)n|)"+P+"*(?:([+-]|)"+P+"*(\\d+)|))"+P+"*\\)|)","i"),bool:RegExp("^(?:"+B+")$","i"),needsContext:RegExp("^"+P+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+P+"*((?:-\\d)?\\d*)"+P+"*\\)|)(?=[^-]|$)","i")},K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,et=/^(?:input|select|textarea|button)$/i,tt=/^h\d$/i,nt=/'|\\/g,rt=RegExp("\\\\([\\da-f]{1,6}"+P+"?|("+P+")|.)","ig"),it=function(e,t,n){var r="0x"+t-65536;return r!==r||n?t:0>r?String.fromCharCode(r+65536):String.fromCharCode(55296|r>>10,56320|1023&r)};try{M.apply(H=O.call(w.childNodes),w.childNodes),H[w.childNodes.length].nodeType}catch(ot){M={apply:H.length?function(e,t){_.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function at(e,t,n,i){var o,a,s,l,u,c,d,m,y,x;if((t?t.ownerDocument||t:w)!==f&&p(t),t=t||f,n=n||[],!e||"string"!=typeof e)return n;if(1!==(l=t.nodeType)&&9!==l)return[];if(h&&!i){if(o=Z.exec(e))if(s=o[1]){if(9===l){if(a=t.getElementById(s),!a||!a.parentNode)return n;if(a.id===s)return n.push(a),n}else if(t.ownerDocument&&(a=t.ownerDocument.getElementById(s))&&v(t,a)&&a.id===s)return n.push(a),n}else{if(o[2])return M.apply(n,t.getElementsByTagName(e)),n;if((s=o[3])&&r.getElementsByClassName&&t.getElementsByClassName)return M.apply(n,t.getElementsByClassName(s)),n}if(r.qsa&&(!g||!g.test(e))){if(m=d=b,y=t,x=9===l&&e,1===l&&"object"!==t.nodeName.toLowerCase()){c=mt(e),(d=t.getAttribute("id"))?m=d.replace(nt,"\\$&"):t.setAttribute("id",m),m="[id='"+m+"'] ",u=c.length;while(u--)c[u]=m+yt(c[u]);y=V.test(e)&&t.parentNode||t,x=c.join(",")}if(x)try{return M.apply(n,y.querySelectorAll(x)),n}catch(T){}finally{d||t.removeAttribute("id")}}}return kt(e.replace(z,"$1"),t,n,i)}function st(){var e=[];function t(n,r){return e.push(n+=" ")>o.cacheLength&&delete t[e.shift()],t[n]=r}return t}function lt(e){return e[b]=!0,e}function ut(e){var t=f.createElement("div");try{return!!e(t)}catch(n){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function ct(e,t){var n=e.split("|"),r=e.length;while(r--)o.attrHandle[n[r]]=t}function pt(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&(~t.sourceIndex||D)-(~e.sourceIndex||D);if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function ft(e){return function(t){var n=t.nodeName.toLowerCase();return"input"===n&&t.type===e}}function dt(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function ht(e){return lt(function(t){return t=+t,lt(function(n,r){var i,o=e([],n.length,t),a=o.length;while(a--)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}s=at.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?"HTML"!==t.nodeName:!1},r=at.support={},p=at.setDocument=function(e){var n=e?e.ownerDocument||e:w,i=n.defaultView;return n!==f&&9===n.nodeType&&n.documentElement?(f=n,d=n.documentElement,h=!s(n),i&&i.attachEvent&&i!==i.top&&i.attachEvent("onbeforeunload",function(){p()}),r.attributes=ut(function(e){return e.className="i",!e.getAttribute("className")}),r.getElementsByTagName=ut(function(e){return e.appendChild(n.createComment("")),!e.getElementsByTagName("*").length}),r.getElementsByClassName=ut(function(e){return e.innerHTML="<div class='a'></div><div class='a i'></div>",e.firstChild.className="i",2===e.getElementsByClassName("i").length}),r.getById=ut(function(e){return d.appendChild(e).id=b,!n.getElementsByName||!n.getElementsByName(b).length}),r.getById?(o.find.ID=function(e,t){if(typeof t.getElementById!==j&&h){var n=t.getElementById(e);return n&&n.parentNode?[n]:[]}},o.filter.ID=function(e){var t=e.replace(rt,it);return function(e){return e.getAttribute("id")===t}}):(delete o.find.ID,o.filter.ID=function(e){var t=e.replace(rt,it);return function(e){var n=typeof e.getAttributeNode!==j&&e.getAttributeNode("id");return n&&n.value===t}}),o.find.TAG=r.getElementsByTagName?function(e,n){return typeof n.getElementsByTagName!==j?n.getElementsByTagName(e):t}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},o.find.CLASS=r.getElementsByClassName&&function(e,n){return typeof n.getElementsByClassName!==j&&h?n.getElementsByClassName(e):t},m=[],g=[],(r.qsa=K.test(n.querySelectorAll))&&(ut(function(e){e.innerHTML="<select><option selected=''></option></select>",e.querySelectorAll("[selected]").length||g.push("\\["+P+"*(?:value|"+B+")"),e.querySelectorAll(":checked").length||g.push(":checked")}),ut(function(e){var t=n.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("t",""),e.querySelectorAll("[t^='']").length&&g.push("[*^$]="+P+"*(?:''|\"\")"),e.querySelectorAll(":enabled").length||g.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),g.push(",.*:")})),(r.matchesSelector=K.test(y=d.webkitMatchesSelector||d.mozMatchesSelector||d.oMatchesSelector||d.msMatchesSelector))&&ut(function(e){r.disconnectedMatch=y.call(e,"div"),y.call(e,"[s!='']:x"),m.push("!=",I)}),g=g.length&&RegExp(g.join("|")),m=m.length&&RegExp(m.join("|")),v=K.test(d.contains)||d.compareDocumentPosition?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},A=d.compareDocumentPosition?function(e,t){if(e===t)return S=!0,0;var i=t.compareDocumentPosition&&e.compareDocumentPosition&&e.compareDocumentPosition(t);return i?1&i||!r.sortDetached&&t.compareDocumentPosition(e)===i?e===n||v(w,e)?-1:t===n||v(w,t)?1:c?F.call(c,e)-F.call(c,t):0:4&i?-1:1:e.compareDocumentPosition?-1:1}:function(e,t){var r,i=0,o=e.parentNode,a=t.parentNode,s=[e],l=[t];if(e===t)return S=!0,0;if(!o||!a)return e===n?-1:t===n?1:o?-1:a?1:c?F.call(c,e)-F.call(c,t):0;if(o===a)return pt(e,t);r=e;while(r=r.parentNode)s.unshift(r);r=t;while(r=r.parentNode)l.unshift(r);while(s[i]===l[i])i++;return i?pt(s[i],l[i]):s[i]===w?-1:l[i]===w?1:0},n):f},at.matches=function(e,t){return at(e,null,null,t)},at.matchesSelector=function(e,t){if((e.ownerDocument||e)!==f&&p(e),t=t.replace(Y,"='$1']"),!(!r.matchesSelector||!h||m&&m.test(t)||g&&g.test(t)))try{var n=y.call(e,t);if(n||r.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(i){}return at(t,f,null,[e]).length>0},at.contains=function(e,t){return(e.ownerDocument||e)!==f&&p(e),v(e,t)},at.attr=function(e,n){(e.ownerDocument||e)!==f&&p(e);var i=o.attrHandle[n.toLowerCase()],a=i&&L.call(o.attrHandle,n.toLowerCase())?i(e,n,!h):t;return a===t?r.attributes||!h?e.getAttribute(n):(a=e.getAttributeNode(n))&&a.specified?a.value:null:a},at.error=function(e){throw Error("Syntax error, unrecognized expression: "+e)},at.uniqueSort=function(e){var t,n=[],i=0,o=0;if(S=!r.detectDuplicates,c=!r.sortStable&&e.slice(0),e.sort(A),S){while(t=e[o++])t===e[o]&&(i=n.push(o));while(i--)e.splice(n[i],1)}return e},a=at.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=a(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r];r++)n+=a(t);return n},o=at.selectors={cacheLength:50,createPseudo:lt,match:Q,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(rt,it),e[3]=(e[4]||e[5]||"").replace(rt,it),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||at.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&at.error(e[0]),e},PSEUDO:function(e){var n,r=!e[5]&&e[2];return Q.CHILD.test(e[0])?null:(e[3]&&e[4]!==t?e[2]=e[4]:r&&J.test(r)&&(n=mt(r,!0))&&(n=r.indexOf(")",r.length-n)-r.length)&&(e[0]=e[0].slice(0,n),e[2]=r.slice(0,n)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(rt,it).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=N[e+" "];return t||(t=RegExp("(^|"+P+")"+e+"("+P+"|$)"))&&N(e,function(e){return t.test("string"==typeof e.className&&e.className||typeof e.getAttribute!==j&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=at.attr(r,e);return null==i?"!="===t:t?(i+="","="===t?i===n:"!="===t?i!==n:"^="===t?n&&0===i.indexOf(n):"*="===t?n&&i.indexOf(n)>-1:"$="===t?n&&i.slice(-n.length)===n:"~="===t?(" "+i+" ").indexOf(n)>-1:"|="===t?i===n||i.slice(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,l){var u,c,p,f,d,h,g=o!==a?"nextSibling":"previousSibling",m=t.parentNode,y=s&&t.nodeName.toLowerCase(),v=!l&&!s;if(m){if(o){while(g){p=t;while(p=p[g])if(s?p.nodeName.toLowerCase()===y:1===p.nodeType)return!1;h=g="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?m.firstChild:m.lastChild],a&&v){c=m[b]||(m[b]={}),u=c[e]||[],d=u[0]===T&&u[1],f=u[0]===T&&u[2],p=d&&m.childNodes[d];while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if(1===p.nodeType&&++f&&p===t){c[e]=[T,d,f];break}}else if(v&&(u=(t[b]||(t[b]={}))[e])&&u[0]===T)f=u[1];else while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if((s?p.nodeName.toLowerCase()===y:1===p.nodeType)&&++f&&(v&&((p[b]||(p[b]={}))[e]=[T,f]),p===t))break;return f-=i,f===r||0===f%r&&f/r>=0}}},PSEUDO:function(e,t){var n,r=o.pseudos[e]||o.setFilters[e.toLowerCase()]||at.error("unsupported pseudo: "+e);return r[b]?r(t):r.length>1?(n=[e,e,"",t],o.setFilters.hasOwnProperty(e.toLowerCase())?lt(function(e,n){var i,o=r(e,t),a=o.length;while(a--)i=F.call(e,o[a]),e[i]=!(n[i]=o[a])}):function(e){return r(e,0,n)}):r}},pseudos:{not:lt(function(e){var t=[],n=[],r=l(e.replace(z,"$1"));return r[b]?lt(function(e,t,n,i){var o,a=r(e,null,i,[]),s=e.length;while(s--)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,i,o){return t[0]=e,r(t,null,o,n),!n.pop()}}),has:lt(function(e){return function(t){return at(e,t).length>0}}),contains:lt(function(e){return function(t){return(t.textContent||t.innerText||a(t)).indexOf(e)>-1}}),lang:lt(function(e){return G.test(e||"")||at.error("unsupported lang: "+e),e=e.replace(rt,it).toLowerCase(),function(t){var n;do if(n=h?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang"))return n=n.toLowerCase(),n===e||0===n.indexOf(e+"-");while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===d},focus:function(e){return e===f.activeElement&&(!f.hasFocus||f.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeName>"@"||3===e.nodeType||4===e.nodeType)return!1;return!0},parent:function(e){return!o.pseudos.empty(e)},header:function(e){return tt.test(e.nodeName)},input:function(e){return et.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||t.toLowerCase()===e.type)},first:ht(function(){return[0]}),last:ht(function(e,t){return[t-1]}),eq:ht(function(e,t,n){return[0>n?n+t:n]}),even:ht(function(e,t){var n=0;for(;t>n;n+=2)e.push(n);return e}),odd:ht(function(e,t){var n=1;for(;t>n;n+=2)e.push(n);return e}),lt:ht(function(e,t,n){var r=0>n?n+t:n;for(;--r>=0;)e.push(r);return e}),gt:ht(function(e,t,n){var r=0>n?n+t:n;for(;t>++r;)e.push(r);return e})}},o.pseudos.nth=o.pseudos.eq;for(n in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})o.pseudos[n]=ft(n);for(n in{submit:!0,reset:!0})o.pseudos[n]=dt(n);function gt(){}gt.prototype=o.filters=o.pseudos,o.setFilters=new gt;function mt(e,t){var n,r,i,a,s,l,u,c=k[e+" "];if(c)return t?0:c.slice(0);s=e,l=[],u=o.preFilter;while(s){(!n||(r=X.exec(s)))&&(r&&(s=s.slice(r[0].length)||s),l.push(i=[])),n=!1,(r=U.exec(s))&&(n=r.shift(),i.push({value:n,type:r[0].replace(z," ")}),s=s.slice(n.length));for(a in o.filter)!(r=Q[a].exec(s))||u[a]&&!(r=u[a](r))||(n=r.shift(),i.push({value:n,type:a,matches:r}),s=s.slice(n.length));if(!n)break}return t?s.length:s?at.error(e):k(e,l).slice(0)}function yt(e){var t=0,n=e.length,r="";for(;n>t;t++)r+=e[t].value;return r}function vt(e,t,n){var r=t.dir,o=n&&"parentNode"===r,a=C++;return t.first?function(t,n,i){while(t=t[r])if(1===t.nodeType||o)return e(t,n,i)}:function(t,n,s){var l,u,c,p=T+" "+a;if(s){while(t=t[r])if((1===t.nodeType||o)&&e(t,n,s))return!0}else while(t=t[r])if(1===t.nodeType||o)if(c=t[b]||(t[b]={}),(u=c[r])&&u[0]===p){if((l=u[1])===!0||l===i)return l===!0}else if(u=c[r]=[p],u[1]=e(t,n,s)||i,u[1]===!0)return!0}}function bt(e){return e.length>1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function xt(e,t,n,r,i){var o,a=[],s=0,l=e.length,u=null!=t;for(;l>s;s++)(o=e[s])&&(!n||n(o,r,i))&&(a.push(o),u&&t.push(s));return a}function wt(e,t,n,r,i,o){return r&&!r[b]&&(r=wt(r)),i&&!i[b]&&(i=wt(i,o)),lt(function(o,a,s,l){var u,c,p,f=[],d=[],h=a.length,g=o||Nt(t||"*",s.nodeType?[s]:s,[]),m=!e||!o&&t?g:xt(g,f,e,s,l),y=n?i||(o?e:h||r)?[]:a:m;if(n&&n(m,y,s,l),r){u=xt(y,d),r(u,[],s,l),c=u.length;while(c--)(p=u[c])&&(y[d[c]]=!(m[d[c]]=p))}if(o){if(i||e){if(i){u=[],c=y.length;while(c--)(p=y[c])&&u.push(m[c]=p);i(null,y=[],u,l)}c=y.length;while(c--)(p=y[c])&&(u=i?F.call(o,p):f[c])>-1&&(o[u]=!(a[u]=p))}}else y=xt(y===a?y.splice(h,y.length):y),i?i(null,a,y,l):M.apply(a,y)})}function Tt(e){var t,n,r,i=e.length,a=o.relative[e[0].type],s=a||o.relative[" "],l=a?1:0,c=vt(function(e){return e===t},s,!0),p=vt(function(e){return F.call(t,e)>-1},s,!0),f=[function(e,n,r){return!a&&(r||n!==u)||((t=n).nodeType?c(e,n,r):p(e,n,r))}];for(;i>l;l++)if(n=o.relative[e[l].type])f=[vt(bt(f),n)];else{if(n=o.filter[e[l].type].apply(null,e[l].matches),n[b]){for(r=++l;i>r;r++)if(o.relative[e[r].type])break;return wt(l>1&&bt(f),l>1&&yt(e.slice(0,l-1).concat({value:" "===e[l-2].type?"*":""})).replace(z,"$1"),n,r>l&&Tt(e.slice(l,r)),i>r&&Tt(e=e.slice(r)),i>r&&yt(e))}f.push(n)}return bt(f)}function Ct(e,t){var n=0,r=t.length>0,a=e.length>0,s=function(s,l,c,p,d){var h,g,m,y=[],v=0,b="0",x=s&&[],w=null!=d,C=u,N=s||a&&o.find.TAG("*",d&&l.parentNode||l),k=T+=null==C?1:Math.random()||.1;for(w&&(u=l!==f&&l,i=n);null!=(h=N[b]);b++){if(a&&h){g=0;while(m=e[g++])if(m(h,l,c)){p.push(h);break}w&&(T=k,i=++n)}r&&((h=!m&&h)&&v--,s&&x.push(h))}if(v+=b,r&&b!==v){g=0;while(m=t[g++])m(x,y,l,c);if(s){if(v>0)while(b--)x[b]||y[b]||(y[b]=q.call(p));y=xt(y)}M.apply(p,y),w&&!s&&y.length>0&&v+t.length>1&&at.uniqueSort(p)}return w&&(T=k,u=C),x};return r?lt(s):s}l=at.compile=function(e,t){var n,r=[],i=[],o=E[e+" "];if(!o){t||(t=mt(e)),n=t.length;while(n--)o=Tt(t[n]),o[b]?r.push(o):i.push(o);o=E(e,Ct(i,r))}return o};function Nt(e,t,n){var r=0,i=t.length;for(;i>r;r++)at(e,t[r],n);return n}function kt(e,t,n,i){var a,s,u,c,p,f=mt(e);if(!i&&1===f.length){if(s=f[0]=f[0].slice(0),s.length>2&&"ID"===(u=s[0]).type&&r.getById&&9===t.nodeType&&h&&o.relative[s[1].type]){if(t=(o.find.ID(u.matches[0].replace(rt,it),t)||[])[0],!t)return n;e=e.slice(s.shift().value.length)}a=Q.needsContext.test(e)?0:s.length;while(a--){if(u=s[a],o.relative[c=u.type])break;if((p=o.find[c])&&(i=p(u.matches[0].replace(rt,it),V.test(s[0].type)&&t.parentNode||t))){if(s.splice(a,1),e=i.length&&yt(s),!e)return M.apply(n,i),n;break}}}return l(e,f)(i,t,!h,n,V.test(e)),n}r.sortStable=b.split("").sort(A).join("")===b,r.detectDuplicates=S,p(),r.sortDetached=ut(function(e){return 1&e.compareDocumentPosition(f.createElement("div"))}),ut(function(e){return e.innerHTML="<a href='#'></a>","#"===e.firstChild.getAttribute("href")})||ct("type|href|height|width",function(e,n,r){return r?t:e.getAttribute(n,"type"===n.toLowerCase()?1:2)}),r.attributes&&ut(function(e){return e.innerHTML="<input/>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||ct("value",function(e,n,r){return r||"input"!==e.nodeName.toLowerCase()?t:e.defaultValue}),ut(function(e){return null==e.getAttribute("disabled")})||ct(B,function(e,n,r){var i;return r?t:(i=e.getAttributeNode(n))&&i.specified?i.value:e[n]===!0?n.toLowerCase():null}),x.find=at,x.expr=at.selectors,x.expr[":"]=x.expr.pseudos,x.unique=at.uniqueSort,x.text=at.getText,x.isXMLDoc=at.isXML,x.contains=at.contains}(e);var O={};function F(e){var t=O[e]={};return x.each(e.match(T)||[],function(e,n){t[n]=!0}),t}x.Callbacks=function(e){e="string"==typeof e?O[e]||F(e):x.extend({},e);var n,r,i,o,a,s,l=[],u=!e.once&&[],c=function(t){for(r=e.memory&&t,i=!0,a=s||0,s=0,o=l.length,n=!0;l&&o>a;a++)if(l[a].apply(t[0],t[1])===!1&&e.stopOnFalse){r=!1;break}n=!1,l&&(u?u.length&&c(u.shift()):r?l=[]:p.disable())},p={add:function(){if(l){var t=l.length;(function i(t){x.each(t,function(t,n){var r=x.type(n);"function"===r?e.unique&&p.has(n)||l.push(n):n&&n.length&&"string"!==r&&i(n)})})(arguments),n?o=l.length:r&&(s=t,c(r))}return this},remove:function(){return l&&x.each(arguments,function(e,t){var r;while((r=x.inArray(t,l,r))>-1)l.splice(r,1),n&&(o>=r&&o--,a>=r&&a--)}),this},has:function(e){return e?x.inArray(e,l)>-1:!(!l||!l.length)},empty:function(){return l=[],o=0,this},disable:function(){return l=u=r=t,this},disabled:function(){return!l},lock:function(){return u=t,r||p.disable(),this},locked:function(){return!u},fireWith:function(e,t){return!l||i&&!u||(t=t||[],t=[e,t.slice?t.slice():t],n?u.push(t):c(t)),this},fire:function(){return p.fireWith(this,arguments),this},fired:function(){return!!i}};return p},x.extend({Deferred:function(e){var t=[["resolve","done",x.Callbacks("once memory"),"resolved"],["reject","fail",x.Callbacks("once memory"),"rejected"],["notify","progress",x.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return x.Deferred(function(n){x.each(t,function(t,o){var a=o[0],s=x.isFunction(e[t])&&e[t];i[o[1]](function(){var e=s&&s.apply(this,arguments);e&&x.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[a+"With"](this===r?n.promise():this,s?[e]:arguments)})}),e=null}).promise()},promise:function(e){return null!=e?x.extend(e,r):r}},i={};return r.pipe=r.then,x.each(t,function(e,o){var a=o[2],s=o[3];r[o[1]]=a.add,s&&a.add(function(){n=s},t[1^e][2].disable,t[2][2].lock),i[o[0]]=function(){return i[o[0]+"With"](this===i?r:this,arguments),this},i[o[0]+"With"]=a.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t=0,n=g.call(arguments),r=n.length,i=1!==r||e&&x.isFunction(e.promise)?r:0,o=1===i?e:x.Deferred(),a=function(e,t,n){return function(r){t[e]=this,n[e]=arguments.length>1?g.call(arguments):r,n===s?o.notifyWith(t,n):--i||o.resolveWith(t,n)}},s,l,u;if(r>1)for(s=Array(r),l=Array(r),u=Array(r);r>t;t++)n[t]&&x.isFunction(n[t].promise)?n[t].promise().done(a(t,u,n)).fail(o.reject).progress(a(t,l,s)):--i;return i||o.resolveWith(u,n),o.promise()}}),x.support=function(t){var n,r,o,s,l,u,c,p,f,d=a.createElement("div");if(d.setAttribute("className","t"),d.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",n=d.getElementsByTagName("*")||[],r=d.getElementsByTagName("a")[0],!r||!r.style||!n.length)return t;s=a.createElement("select"),u=s.appendChild(a.createElement("option")),o=d.getElementsByTagName("input")[0],r.style.cssText="top:1px;float:left;opacity:.5",t.getSetAttribute="t"!==d.className,t.leadingWhitespace=3===d.firstChild.nodeType,t.tbody=!d.getElementsByTagName("tbody").length,t.htmlSerialize=!!d.getElementsByTagName("link").length,t.style=/top/.test(r.getAttribute("style")),t.hrefNormalized="/a"===r.getAttribute("href"),t.opacity=/^0.5/.test(r.style.opacity),t.cssFloat=!!r.style.cssFloat,t.checkOn=!!o.value,t.optSelected=u.selected,t.enctype=!!a.createElement("form").enctype,t.html5Clone="<:nav></:nav>"!==a.createElement("nav").cloneNode(!0).outerHTML,t.inlineBlockNeedsLayout=!1,t.shrinkWrapBlocks=!1,t.pixelPosition=!1,t.deleteExpando=!0,t.noCloneEvent=!0,t.reliableMarginRight=!0,t.boxSizingReliable=!0,o.checked=!0,t.noCloneChecked=o.cloneNode(!0).checked,s.disabled=!0,t.optDisabled=!u.disabled;try{delete d.test}catch(h){t.deleteExpando=!1}o=a.createElement("input"),o.setAttribute("value",""),t.input=""===o.getAttribute("value"),o.value="t",o.setAttribute("type","radio"),t.radioValue="t"===o.value,o.setAttribute("checked","t"),o.setAttribute("name","t"),l=a.createDocumentFragment(),l.appendChild(o),t.appendChecked=o.checked,t.checkClone=l.cloneNode(!0).cloneNode(!0).lastChild.checked,d.attachEvent&&(d.attachEvent("onclick",function(){t.noCloneEvent=!1}),d.cloneNode(!0).click());for(f in{submit:!0,change:!0,focusin:!0})d.setAttribute(c="on"+f,"t"),t[f+"Bubbles"]=c in e||d.attributes[c].expando===!1;d.style.backgroundClip="content-box",d.cloneNode(!0).style.backgroundClip="",t.clearCloneStyle="content-box"===d.style.backgroundClip;for(f in x(t))break;return t.ownLast="0"!==f,x(function(){var n,r,o,s="padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;",l=a.getElementsByTagName("body")[0];l&&(n=a.createElement("div"),n.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px",l.appendChild(n).appendChild(d),d.innerHTML="<table><tr><td></td><td>t</td></tr></table>",o=d.getElementsByTagName("td"),o[0].style.cssText="padding:0;margin:0;border:0;display:none",p=0===o[0].offsetHeight,o[0].style.display="",o[1].style.display="none",t.reliableHiddenOffsets=p&&0===o[0].offsetHeight,d.innerHTML="",d.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",x.swap(l,null!=l.style.zoom?{zoom:1}:{},function(){t.boxSizing=4===d.offsetWidth}),e.getComputedStyle&&(t.pixelPosition="1%"!==(e.getComputedStyle(d,null)||{}).top,t.boxSizingReliable="4px"===(e.getComputedStyle(d,null)||{width:"4px"}).width,r=d.appendChild(a.createElement("div")),r.style.cssText=d.style.cssText=s,r.style.marginRight=r.style.width="0",d.style.width="1px",t.reliableMarginRight=!parseFloat((e.getComputedStyle(r,null)||{}).marginRight)),typeof d.style.zoom!==i&&(d.innerHTML="",d.style.cssText=s+"width:1px;padding:1px;display:inline;zoom:1",t.inlineBlockNeedsLayout=3===d.offsetWidth,d.style.display="block",d.innerHTML="<div></div>",d.firstChild.style.width="5px",t.shrinkWrapBlocks=3!==d.offsetWidth,t.inlineBlockNeedsLayout&&(l.style.zoom=1)),l.removeChild(n),n=d=o=r=null)}),n=s=l=u=r=o=null,t
+}({});var B=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,P=/([A-Z])/g;function R(e,n,r,i){if(x.acceptData(e)){var o,a,s=x.expando,l=e.nodeType,u=l?x.cache:e,c=l?e[s]:e[s]&&s;if(c&&u[c]&&(i||u[c].data)||r!==t||"string"!=typeof n)return c||(c=l?e[s]=p.pop()||x.guid++:s),u[c]||(u[c]=l?{}:{toJSON:x.noop}),("object"==typeof n||"function"==typeof n)&&(i?u[c]=x.extend(u[c],n):u[c].data=x.extend(u[c].data,n)),a=u[c],i||(a.data||(a.data={}),a=a.data),r!==t&&(a[x.camelCase(n)]=r),"string"==typeof n?(o=a[n],null==o&&(o=a[x.camelCase(n)])):o=a,o}}function W(e,t,n){if(x.acceptData(e)){var r,i,o=e.nodeType,a=o?x.cache:e,s=o?e[x.expando]:x.expando;if(a[s]){if(t&&(r=n?a[s]:a[s].data)){x.isArray(t)?t=t.concat(x.map(t,x.camelCase)):t in r?t=[t]:(t=x.camelCase(t),t=t in r?[t]:t.split(" ")),i=t.length;while(i--)delete r[t[i]];if(n?!I(r):!x.isEmptyObject(r))return}(n||(delete a[s].data,I(a[s])))&&(o?x.cleanData([e],!0):x.support.deleteExpando||a!=a.window?delete a[s]:a[s]=null)}}}x.extend({cache:{},noData:{applet:!0,embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(e){return e=e.nodeType?x.cache[e[x.expando]]:e[x.expando],!!e&&!I(e)},data:function(e,t,n){return R(e,t,n)},removeData:function(e,t){return W(e,t)},_data:function(e,t,n){return R(e,t,n,!0)},_removeData:function(e,t){return W(e,t,!0)},acceptData:function(e){if(e.nodeType&&1!==e.nodeType&&9!==e.nodeType)return!1;var t=e.nodeName&&x.noData[e.nodeName.toLowerCase()];return!t||t!==!0&&e.getAttribute("classid")===t}}),x.fn.extend({data:function(e,n){var r,i,o=null,a=0,s=this[0];if(e===t){if(this.length&&(o=x.data(s),1===s.nodeType&&!x._data(s,"parsedAttrs"))){for(r=s.attributes;r.length>a;a++)i=r[a].name,0===i.indexOf("data-")&&(i=x.camelCase(i.slice(5)),$(s,i,o[i]));x._data(s,"parsedAttrs",!0)}return o}return"object"==typeof e?this.each(function(){x.data(this,e)}):arguments.length>1?this.each(function(){x.data(this,e,n)}):s?$(s,e,x.data(s,e)):null},removeData:function(e){return this.each(function(){x.removeData(this,e)})}});function $(e,n,r){if(r===t&&1===e.nodeType){var i="data-"+n.replace(P,"-$1").toLowerCase();if(r=e.getAttribute(i),"string"==typeof r){try{r="true"===r?!0:"false"===r?!1:"null"===r?null:+r+""===r?+r:B.test(r)?x.parseJSON(r):r}catch(o){}x.data(e,n,r)}else r=t}return r}function I(e){var t;for(t in e)if(("data"!==t||!x.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}x.extend({queue:function(e,n,r){var i;return e?(n=(n||"fx")+"queue",i=x._data(e,n),r&&(!i||x.isArray(r)?i=x._data(e,n,x.makeArray(r)):i.push(r)),i||[]):t},dequeue:function(e,t){t=t||"fx";var n=x.queue(e,t),r=n.length,i=n.shift(),o=x._queueHooks(e,t),a=function(){x.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,a,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return x._data(e,n)||x._data(e,n,{empty:x.Callbacks("once memory").add(function(){x._removeData(e,t+"queue"),x._removeData(e,n)})})}}),x.fn.extend({queue:function(e,n){var r=2;return"string"!=typeof e&&(n=e,e="fx",r--),r>arguments.length?x.queue(this[0],e):n===t?this:this.each(function(){var t=x.queue(this,e,n);x._queueHooks(this,e),"fx"===e&&"inprogress"!==t[0]&&x.dequeue(this,e)})},dequeue:function(e){return this.each(function(){x.dequeue(this,e)})},delay:function(e,t){return e=x.fx?x.fx.speeds[e]||e:e,t=t||"fx",this.queue(t,function(t,n){var r=setTimeout(t,e);n.stop=function(){clearTimeout(r)}})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,n){var r,i=1,o=x.Deferred(),a=this,s=this.length,l=function(){--i||o.resolveWith(a,[a])};"string"!=typeof e&&(n=e,e=t),e=e||"fx";while(s--)r=x._data(a[s],e+"queueHooks"),r&&r.empty&&(i++,r.empty.add(l));return l(),o.promise(n)}});var z,X,U=/[\t\r\n\f]/g,V=/\r/g,Y=/^(?:input|select|textarea|button|object)$/i,J=/^(?:a|area)$/i,G=/^(?:checked|selected)$/i,Q=x.support.getSetAttribute,K=x.support.input;x.fn.extend({attr:function(e,t){return x.access(this,x.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){x.removeAttr(this,e)})},prop:function(e,t){return x.access(this,x.prop,e,t,arguments.length>1)},removeProp:function(e){return e=x.propFix[e]||e,this.each(function(){try{this[e]=t,delete this[e]}catch(n){}})},addClass:function(e){var t,n,r,i,o,a=0,s=this.length,l="string"==typeof e&&e;if(x.isFunction(e))return this.each(function(t){x(this).addClass(e.call(this,t,this.className))});if(l)for(t=(e||"").match(T)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(U," "):" ")){o=0;while(i=t[o++])0>r.indexOf(" "+i+" ")&&(r+=i+" ");n.className=x.trim(r)}return this},removeClass:function(e){var t,n,r,i,o,a=0,s=this.length,l=0===arguments.length||"string"==typeof e&&e;if(x.isFunction(e))return this.each(function(t){x(this).removeClass(e.call(this,t,this.className))});if(l)for(t=(e||"").match(T)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(U," "):"")){o=0;while(i=t[o++])while(r.indexOf(" "+i+" ")>=0)r=r.replace(" "+i+" "," ");n.className=e?x.trim(r):""}return this},toggleClass:function(e,t){var n=typeof e;return"boolean"==typeof t&&"string"===n?t?this.addClass(e):this.removeClass(e):x.isFunction(e)?this.each(function(n){x(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if("string"===n){var t,r=0,o=x(this),a=e.match(T)||[];while(t=a[r++])o.hasClass(t)?o.removeClass(t):o.addClass(t)}else(n===i||"boolean"===n)&&(this.className&&x._data(this,"__className__",this.className),this.className=this.className||e===!1?"":x._data(this,"__className__")||"")})},hasClass:function(e){var t=" "+e+" ",n=0,r=this.length;for(;r>n;n++)if(1===this[n].nodeType&&(" "+this[n].className+" ").replace(U," ").indexOf(t)>=0)return!0;return!1},val:function(e){var n,r,i,o=this[0];{if(arguments.length)return i=x.isFunction(e),this.each(function(n){var o;1===this.nodeType&&(o=i?e.call(this,n,x(this).val()):e,null==o?o="":"number"==typeof o?o+="":x.isArray(o)&&(o=x.map(o,function(e){return null==e?"":e+""})),r=x.valHooks[this.type]||x.valHooks[this.nodeName.toLowerCase()],r&&"set"in r&&r.set(this,o,"value")!==t||(this.value=o))});if(o)return r=x.valHooks[o.type]||x.valHooks[o.nodeName.toLowerCase()],r&&"get"in r&&(n=r.get(o,"value"))!==t?n:(n=o.value,"string"==typeof n?n.replace(V,""):null==n?"":n)}}}),x.extend({valHooks:{option:{get:function(e){var t=x.find.attr(e,"value");return null!=t?t:e.text}},select:{get:function(e){var t,n,r=e.options,i=e.selectedIndex,o="select-one"===e.type||0>i,a=o?null:[],s=o?i+1:r.length,l=0>i?s:o?i:0;for(;s>l;l++)if(n=r[l],!(!n.selected&&l!==i||(x.support.optDisabled?n.disabled:null!==n.getAttribute("disabled"))||n.parentNode.disabled&&x.nodeName(n.parentNode,"optgroup"))){if(t=x(n).val(),o)return t;a.push(t)}return a},set:function(e,t){var n,r,i=e.options,o=x.makeArray(t),a=i.length;while(a--)r=i[a],(r.selected=x.inArray(x(r).val(),o)>=0)&&(n=!0);return n||(e.selectedIndex=-1),o}}},attr:function(e,n,r){var o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return typeof e.getAttribute===i?x.prop(e,n,r):(1===s&&x.isXMLDoc(e)||(n=n.toLowerCase(),o=x.attrHooks[n]||(x.expr.match.bool.test(n)?X:z)),r===t?o&&"get"in o&&null!==(a=o.get(e,n))?a:(a=x.find.attr(e,n),null==a?t:a):null!==r?o&&"set"in o&&(a=o.set(e,r,n))!==t?a:(e.setAttribute(n,r+""),r):(x.removeAttr(e,n),t))},removeAttr:function(e,t){var n,r,i=0,o=t&&t.match(T);if(o&&1===e.nodeType)while(n=o[i++])r=x.propFix[n]||n,x.expr.match.bool.test(n)?K&&Q||!G.test(n)?e[r]=!1:e[x.camelCase("default-"+n)]=e[r]=!1:x.attr(e,n,""),e.removeAttribute(Q?n:r)},attrHooks:{type:{set:function(e,t){if(!x.support.radioValue&&"radio"===t&&x.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},propFix:{"for":"htmlFor","class":"className"},prop:function(e,n,r){var i,o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return a=1!==s||!x.isXMLDoc(e),a&&(n=x.propFix[n]||n,o=x.propHooks[n]),r!==t?o&&"set"in o&&(i=o.set(e,r,n))!==t?i:e[n]=r:o&&"get"in o&&null!==(i=o.get(e,n))?i:e[n]},propHooks:{tabIndex:{get:function(e){var t=x.find.attr(e,"tabindex");return t?parseInt(t,10):Y.test(e.nodeName)||J.test(e.nodeName)&&e.href?0:-1}}}}),X={set:function(e,t,n){return t===!1?x.removeAttr(e,n):K&&Q||!G.test(n)?e.setAttribute(!Q&&x.propFix[n]||n,n):e[x.camelCase("default-"+n)]=e[n]=!0,n}},x.each(x.expr.match.bool.source.match(/\w+/g),function(e,n){var r=x.expr.attrHandle[n]||x.find.attr;x.expr.attrHandle[n]=K&&Q||!G.test(n)?function(e,n,i){var o=x.expr.attrHandle[n],a=i?t:(x.expr.attrHandle[n]=t)!=r(e,n,i)?n.toLowerCase():null;return x.expr.attrHandle[n]=o,a}:function(e,n,r){return r?t:e[x.camelCase("default-"+n)]?n.toLowerCase():null}}),K&&Q||(x.attrHooks.value={set:function(e,n,r){return x.nodeName(e,"input")?(e.defaultValue=n,t):z&&z.set(e,n,r)}}),Q||(z={set:function(e,n,r){var i=e.getAttributeNode(r);return i||e.setAttributeNode(i=e.ownerDocument.createAttribute(r)),i.value=n+="","value"===r||n===e.getAttribute(r)?n:t}},x.expr.attrHandle.id=x.expr.attrHandle.name=x.expr.attrHandle.coords=function(e,n,r){var i;return r?t:(i=e.getAttributeNode(n))&&""!==i.value?i.value:null},x.valHooks.button={get:function(e,n){var r=e.getAttributeNode(n);return r&&r.specified?r.value:t},set:z.set},x.attrHooks.contenteditable={set:function(e,t,n){z.set(e,""===t?!1:t,n)}},x.each(["width","height"],function(e,n){x.attrHooks[n]={set:function(e,r){return""===r?(e.setAttribute(n,"auto"),r):t}}})),x.support.hrefNormalized||x.each(["href","src"],function(e,t){x.propHooks[t]={get:function(e){return e.getAttribute(t,4)}}}),x.support.style||(x.attrHooks.style={get:function(e){return e.style.cssText||t},set:function(e,t){return e.style.cssText=t+""}}),x.support.optSelected||(x.propHooks.selected={get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null}}),x.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){x.propFix[this.toLowerCase()]=this}),x.support.enctype||(x.propFix.enctype="encoding"),x.each(["radio","checkbox"],function(){x.valHooks[this]={set:function(e,n){return x.isArray(n)?e.checked=x.inArray(x(e).val(),n)>=0:t}},x.support.checkOn||(x.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})});var Z=/^(?:input|select|textarea)$/i,et=/^key/,tt=/^(?:mouse|contextmenu)|click/,nt=/^(?:focusinfocus|focusoutblur)$/,rt=/^([^.]*)(?:\.(.+)|)$/;function it(){return!0}function ot(){return!1}function at(){try{return a.activeElement}catch(e){}}x.event={global:{},add:function(e,n,r,o,a){var s,l,u,c,p,f,d,h,g,m,y,v=x._data(e);if(v){r.handler&&(c=r,r=c.handler,a=c.selector),r.guid||(r.guid=x.guid++),(l=v.events)||(l=v.events={}),(f=v.handle)||(f=v.handle=function(e){return typeof x===i||e&&x.event.triggered===e.type?t:x.event.dispatch.apply(f.elem,arguments)},f.elem=e),n=(n||"").match(T)||[""],u=n.length;while(u--)s=rt.exec(n[u])||[],g=y=s[1],m=(s[2]||"").split(".").sort(),g&&(p=x.event.special[g]||{},g=(a?p.delegateType:p.bindType)||g,p=x.event.special[g]||{},d=x.extend({type:g,origType:y,data:o,handler:r,guid:r.guid,selector:a,needsContext:a&&x.expr.match.needsContext.test(a),namespace:m.join(".")},c),(h=l[g])||(h=l[g]=[],h.delegateCount=0,p.setup&&p.setup.call(e,o,m,f)!==!1||(e.addEventListener?e.addEventListener(g,f,!1):e.attachEvent&&e.attachEvent("on"+g,f))),p.add&&(p.add.call(e,d),d.handler.guid||(d.handler.guid=r.guid)),a?h.splice(h.delegateCount++,0,d):h.push(d),x.event.global[g]=!0);e=null}},remove:function(e,t,n,r,i){var o,a,s,l,u,c,p,f,d,h,g,m=x.hasData(e)&&x._data(e);if(m&&(c=m.events)){t=(t||"").match(T)||[""],u=t.length;while(u--)if(s=rt.exec(t[u])||[],d=g=s[1],h=(s[2]||"").split(".").sort(),d){p=x.event.special[d]||{},d=(r?p.delegateType:p.bindType)||d,f=c[d]||[],s=s[2]&&RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),l=o=f.length;while(o--)a=f[o],!i&&g!==a.origType||n&&n.guid!==a.guid||s&&!s.test(a.namespace)||r&&r!==a.selector&&("**"!==r||!a.selector)||(f.splice(o,1),a.selector&&f.delegateCount--,p.remove&&p.remove.call(e,a));l&&!f.length&&(p.teardown&&p.teardown.call(e,h,m.handle)!==!1||x.removeEvent(e,d,m.handle),delete c[d])}else for(d in c)x.event.remove(e,d+t[u],n,r,!0);x.isEmptyObject(c)&&(delete m.handle,x._removeData(e,"events"))}},trigger:function(n,r,i,o){var s,l,u,c,p,f,d,h=[i||a],g=v.call(n,"type")?n.type:n,m=v.call(n,"namespace")?n.namespace.split("."):[];if(u=f=i=i||a,3!==i.nodeType&&8!==i.nodeType&&!nt.test(g+x.event.triggered)&&(g.indexOf(".")>=0&&(m=g.split("."),g=m.shift(),m.sort()),l=0>g.indexOf(":")&&"on"+g,n=n[x.expando]?n:new x.Event(g,"object"==typeof n&&n),n.isTrigger=o?2:3,n.namespace=m.join("."),n.namespace_re=n.namespace?RegExp("(^|\\.)"+m.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,n.result=t,n.target||(n.target=i),r=null==r?[n]:x.makeArray(r,[n]),p=x.event.special[g]||{},o||!p.trigger||p.trigger.apply(i,r)!==!1)){if(!o&&!p.noBubble&&!x.isWindow(i)){for(c=p.delegateType||g,nt.test(c+g)||(u=u.parentNode);u;u=u.parentNode)h.push(u),f=u;f===(i.ownerDocument||a)&&h.push(f.defaultView||f.parentWindow||e)}d=0;while((u=h[d++])&&!n.isPropagationStopped())n.type=d>1?c:p.bindType||g,s=(x._data(u,"events")||{})[n.type]&&x._data(u,"handle"),s&&s.apply(u,r),s=l&&u[l],s&&x.acceptData(u)&&s.apply&&s.apply(u,r)===!1&&n.preventDefault();if(n.type=g,!o&&!n.isDefaultPrevented()&&(!p._default||p._default.apply(h.pop(),r)===!1)&&x.acceptData(i)&&l&&i[g]&&!x.isWindow(i)){f=i[l],f&&(i[l]=null),x.event.triggered=g;try{i[g]()}catch(y){}x.event.triggered=t,f&&(i[l]=f)}return n.result}},dispatch:function(e){e=x.event.fix(e);var n,r,i,o,a,s=[],l=g.call(arguments),u=(x._data(this,"events")||{})[e.type]||[],c=x.event.special[e.type]||{};if(l[0]=e,e.delegateTarget=this,!c.preDispatch||c.preDispatch.call(this,e)!==!1){s=x.event.handlers.call(this,e,u),n=0;while((o=s[n++])&&!e.isPropagationStopped()){e.currentTarget=o.elem,a=0;while((i=o.handlers[a++])&&!e.isImmediatePropagationStopped())(!e.namespace_re||e.namespace_re.test(i.namespace))&&(e.handleObj=i,e.data=i.data,r=((x.event.special[i.origType]||{}).handle||i.handler).apply(o.elem,l),r!==t&&(e.result=r)===!1&&(e.preventDefault(),e.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,e),e.result}},handlers:function(e,n){var r,i,o,a,s=[],l=n.delegateCount,u=e.target;if(l&&u.nodeType&&(!e.button||"click"!==e.type))for(;u!=this;u=u.parentNode||this)if(1===u.nodeType&&(u.disabled!==!0||"click"!==e.type)){for(o=[],a=0;l>a;a++)i=n[a],r=i.selector+" ",o[r]===t&&(o[r]=i.needsContext?x(r,this).index(u)>=0:x.find(r,this,null,[u]).length),o[r]&&o.push(i);o.length&&s.push({elem:u,handlers:o})}return n.length>l&&s.push({elem:this,handlers:n.slice(l)}),s},fix:function(e){if(e[x.expando])return e;var t,n,r,i=e.type,o=e,s=this.fixHooks[i];s||(this.fixHooks[i]=s=tt.test(i)?this.mouseHooks:et.test(i)?this.keyHooks:{}),r=s.props?this.props.concat(s.props):this.props,e=new x.Event(o),t=r.length;while(t--)n=r[t],e[n]=o[n];return e.target||(e.target=o.srcElement||a),3===e.target.nodeType&&(e.target=e.target.parentNode),e.metaKey=!!e.metaKey,s.filter?s.filter(e,o):e},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return null==e.which&&(e.which=null!=t.charCode?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,n){var r,i,o,s=n.button,l=n.fromElement;return null==e.pageX&&null!=n.clientX&&(i=e.target.ownerDocument||a,o=i.documentElement,r=i.body,e.pageX=n.clientX+(o&&o.scrollLeft||r&&r.scrollLeft||0)-(o&&o.clientLeft||r&&r.clientLeft||0),e.pageY=n.clientY+(o&&o.scrollTop||r&&r.scrollTop||0)-(o&&o.clientTop||r&&r.clientTop||0)),!e.relatedTarget&&l&&(e.relatedTarget=l===e.target?n.toElement:l),e.which||s===t||(e.which=1&s?1:2&s?3:4&s?2:0),e}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==at()&&this.focus)try{return this.focus(),!1}catch(e){}},delegateType:"focusin"},blur:{trigger:function(){return this===at()&&this.blur?(this.blur(),!1):t},delegateType:"focusout"},click:{trigger:function(){return x.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):t},_default:function(e){return x.nodeName(e.target,"a")}},beforeunload:{postDispatch:function(e){e.result!==t&&(e.originalEvent.returnValue=e.result)}}},simulate:function(e,t,n,r){var i=x.extend(new x.Event,n,{type:e,isSimulated:!0,originalEvent:{}});r?x.event.trigger(i,null,t):x.event.dispatch.call(t,i),i.isDefaultPrevented()&&n.preventDefault()}},x.removeEvent=a.removeEventListener?function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n,!1)}:function(e,t,n){var r="on"+t;e.detachEvent&&(typeof e[r]===i&&(e[r]=null),e.detachEvent(r,n))},x.Event=function(e,n){return this instanceof x.Event?(e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||e.returnValue===!1||e.getPreventDefault&&e.getPreventDefault()?it:ot):this.type=e,n&&x.extend(this,n),this.timeStamp=e&&e.timeStamp||x.now(),this[x.expando]=!0,t):new x.Event(e,n)},x.Event.prototype={isDefaultPrevented:ot,isPropagationStopped:ot,isImmediatePropagationStopped:ot,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=it,e&&(e.preventDefault?e.preventDefault():e.returnValue=!1)},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=it,e&&(e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=it,this.stopPropagation()}},x.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(e,t){x.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,o=e.handleObj;return(!i||i!==r&&!x.contains(r,i))&&(e.type=o.origType,n=o.handler.apply(this,arguments),e.type=t),n}}}),x.support.submitBubbles||(x.event.special.submit={setup:function(){return x.nodeName(this,"form")?!1:(x.event.add(this,"click._submit keypress._submit",function(e){var n=e.target,r=x.nodeName(n,"input")||x.nodeName(n,"button")?n.form:t;r&&!x._data(r,"submitBubbles")&&(x.event.add(r,"submit._submit",function(e){e._submit_bubble=!0}),x._data(r,"submitBubbles",!0))}),t)},postDispatch:function(e){e._submit_bubble&&(delete e._submit_bubble,this.parentNode&&!e.isTrigger&&x.event.simulate("submit",this.parentNode,e,!0))},teardown:function(){return x.nodeName(this,"form")?!1:(x.event.remove(this,"._submit"),t)}}),x.support.changeBubbles||(x.event.special.change={setup:function(){return Z.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(x.event.add(this,"propertychange._change",function(e){"checked"===e.originalEvent.propertyName&&(this._just_changed=!0)}),x.event.add(this,"click._change",function(e){this._just_changed&&!e.isTrigger&&(this._just_changed=!1),x.event.simulate("change",this,e,!0)})),!1):(x.event.add(this,"beforeactivate._change",function(e){var t=e.target;Z.test(t.nodeName)&&!x._data(t,"changeBubbles")&&(x.event.add(t,"change._change",function(e){!this.parentNode||e.isSimulated||e.isTrigger||x.event.simulate("change",this.parentNode,e,!0)}),x._data(t,"changeBubbles",!0))}),t)},handle:function(e){var n=e.target;return this!==n||e.isSimulated||e.isTrigger||"radio"!==n.type&&"checkbox"!==n.type?e.handleObj.handler.apply(this,arguments):t},teardown:function(){return x.event.remove(this,"._change"),!Z.test(this.nodeName)}}),x.support.focusinBubbles||x.each({focus:"focusin",blur:"focusout"},function(e,t){var n=0,r=function(e){x.event.simulate(t,e.target,x.event.fix(e),!0)};x.event.special[t]={setup:function(){0===n++&&a.addEventListener(e,r,!0)},teardown:function(){0===--n&&a.removeEventListener(e,r,!0)}}}),x.fn.extend({on:function(e,n,r,i,o){var a,s;if("object"==typeof e){"string"!=typeof n&&(r=r||n,n=t);for(a in e)this.on(a,n,r,e[a],o);return this}if(null==r&&null==i?(i=n,r=n=t):null==i&&("string"==typeof n?(i=r,r=t):(i=r,r=n,n=t)),i===!1)i=ot;else if(!i)return this;return 1===o&&(s=i,i=function(e){return x().off(e),s.apply(this,arguments)},i.guid=s.guid||(s.guid=x.guid++)),this.each(function(){x.event.add(this,e,i,r,n)})},one:function(e,t,n,r){return this.on(e,t,n,r,1)},off:function(e,n,r){var i,o;if(e&&e.preventDefault&&e.handleObj)return i=e.handleObj,x(e.delegateTarget).off(i.namespace?i.origType+"."+i.namespace:i.origType,i.selector,i.handler),this;if("object"==typeof e){for(o in e)this.off(o,n,e[o]);return this}return(n===!1||"function"==typeof n)&&(r=n,n=t),r===!1&&(r=ot),this.each(function(){x.event.remove(this,e,r,n)})},trigger:function(e,t){return this.each(function(){x.event.trigger(e,t,this)})},triggerHandler:function(e,n){var r=this[0];return r?x.event.trigger(e,n,r,!0):t}});var st=/^.[^:#\[\.,]*$/,lt=/^(?:parents|prev(?:Until|All))/,ut=x.expr.match.needsContext,ct={children:!0,contents:!0,next:!0,prev:!0};x.fn.extend({find:function(e){var t,n=[],r=this,i=r.length;if("string"!=typeof e)return this.pushStack(x(e).filter(function(){for(t=0;i>t;t++)if(x.contains(r[t],this))return!0}));for(t=0;i>t;t++)x.find(e,r[t],n);return n=this.pushStack(i>1?x.unique(n):n),n.selector=this.selector?this.selector+" "+e:e,n},has:function(e){var t,n=x(e,this),r=n.length;return this.filter(function(){for(t=0;r>t;t++)if(x.contains(this,n[t]))return!0})},not:function(e){return this.pushStack(ft(this,e||[],!0))},filter:function(e){return this.pushStack(ft(this,e||[],!1))},is:function(e){return!!ft(this,"string"==typeof e&&ut.test(e)?x(e):e||[],!1).length},closest:function(e,t){var n,r=0,i=this.length,o=[],a=ut.test(e)||"string"!=typeof e?x(e,t||this.context):0;for(;i>r;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(11>n.nodeType&&(a?a.index(n)>-1:1===n.nodeType&&x.find.matchesSelector(n,e))){n=o.push(n);break}return this.pushStack(o.length>1?x.unique(o):o)},index:function(e){return e?"string"==typeof e?x.inArray(this[0],x(e)):x.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){var n="string"==typeof e?x(e,t):x.makeArray(e&&e.nodeType?[e]:e),r=x.merge(this.get(),n);return this.pushStack(x.unique(r))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}});function pt(e,t){do e=e[t];while(e&&1!==e.nodeType);return e}x.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return x.dir(e,"parentNode")},parentsUntil:function(e,t,n){return x.dir(e,"parentNode",n)},next:function(e){return pt(e,"nextSibling")},prev:function(e){return pt(e,"previousSibling")},nextAll:function(e){return x.dir(e,"nextSibling")},prevAll:function(e){return x.dir(e,"previousSibling")},nextUntil:function(e,t,n){return x.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return x.dir(e,"previousSibling",n)},siblings:function(e){return x.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return x.sibling(e.firstChild)},contents:function(e){return x.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:x.merge([],e.childNodes)}},function(e,t){x.fn[e]=function(n,r){var i=x.map(this,t,n);return"Until"!==e.slice(-5)&&(r=n),r&&"string"==typeof r&&(i=x.filter(r,i)),this.length>1&&(ct[e]||(i=x.unique(i)),lt.test(e)&&(i=i.reverse())),this.pushStack(i)}}),x.extend({filter:function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?x.find.matchesSelector(r,e)?[r]:[]:x.find.matches(e,x.grep(t,function(e){return 1===e.nodeType}))},dir:function(e,n,r){var i=[],o=e[n];while(o&&9!==o.nodeType&&(r===t||1!==o.nodeType||!x(o).is(r)))1===o.nodeType&&i.push(o),o=o[n];return i},sibling:function(e,t){var n=[];for(;e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n}});function ft(e,t,n){if(x.isFunction(t))return x.grep(e,function(e,r){return!!t.call(e,r,e)!==n});if(t.nodeType)return x.grep(e,function(e){return e===t!==n});if("string"==typeof t){if(st.test(t))return x.filter(t,e,n);t=x.filter(t,e)}return x.grep(e,function(e){return x.inArray(e,t)>=0!==n})}function dt(e){var t=ht.split("|"),n=e.createDocumentFragment();if(n.createElement)while(t.length)n.createElement(t.pop());return n}var ht="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",gt=/ jQuery\d+="(?:null|\d+)"/g,mt=RegExp("<(?:"+ht+")[\\s/>]","i"),yt=/^\s+/,vt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bt=/<([\w:]+)/,xt=/<tbody/i,wt=/<|&#?\w+;/,Tt=/<(?:script|style|link)/i,Ct=/^(?:checkbox|radio)$/i,Nt=/checked\s*(?:[^=]|=\s*.checked.)/i,kt=/^$|\/(?:java|ecma)script/i,Et=/^true\/(.*)/,St=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,At={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:x.support.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]},jt=dt(a),Dt=jt.appendChild(a.createElement("div"));At.optgroup=At.option,At.tbody=At.tfoot=At.colgroup=At.caption=At.thead,At.th=At.td,x.fn.extend({text:function(e){return x.access(this,function(e){return e===t?x.text(this):this.empty().append((this[0]&&this[0].ownerDocument||a).createTextNode(e))},null,e,arguments.length)},append:function(){return this.domManip(arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Lt(this,e);t.appendChild(e)}})},prepend:function(){return this.domManip(arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Lt(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},remove:function(e,t){var n,r=e?x.filter(e,this):this,i=0;for(;null!=(n=r[i]);i++)t||1!==n.nodeType||x.cleanData(Ft(n)),n.parentNode&&(t&&x.contains(n.ownerDocument,n)&&_t(Ft(n,"script")),n.parentNode.removeChild(n));return this},empty:function(){var e,t=0;for(;null!=(e=this[t]);t++){1===e.nodeType&&x.cleanData(Ft(e,!1));while(e.firstChild)e.removeChild(e.firstChild);e.options&&x.nodeName(e,"select")&&(e.options.length=0)}return this},clone:function(e,t){return e=null==e?!1:e,t=null==t?e:t,this.map(function(){return x.clone(this,e,t)})},html:function(e){return x.access(this,function(e){var n=this[0]||{},r=0,i=this.length;if(e===t)return 1===n.nodeType?n.innerHTML.replace(gt,""):t;if(!("string"!=typeof e||Tt.test(e)||!x.support.htmlSerialize&&mt.test(e)||!x.support.leadingWhitespace&&yt.test(e)||At[(bt.exec(e)||["",""])[1].toLowerCase()])){e=e.replace(vt,"<$1></$2>");try{for(;i>r;r++)n=this[r]||{},1===n.nodeType&&(x.cleanData(Ft(n,!1)),n.innerHTML=e);n=0}catch(o){}}n&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var e=x.map(this,function(e){return[e.nextSibling,e.parentNode]}),t=0;return this.domManip(arguments,function(n){var r=e[t++],i=e[t++];i&&(r&&r.parentNode!==i&&(r=this.nextSibling),x(this).remove(),i.insertBefore(n,r))},!0),t?this:this.remove()},detach:function(e){return this.remove(e,!0)},domManip:function(e,t,n){e=d.apply([],e);var r,i,o,a,s,l,u=0,c=this.length,p=this,f=c-1,h=e[0],g=x.isFunction(h);if(g||!(1>=c||"string"!=typeof h||x.support.checkClone)&&Nt.test(h))return this.each(function(r){var i=p.eq(r);g&&(e[0]=h.call(this,r,i.html())),i.domManip(e,t,n)});if(c&&(l=x.buildFragment(e,this[0].ownerDocument,!1,!n&&this),r=l.firstChild,1===l.childNodes.length&&(l=r),r)){for(a=x.map(Ft(l,"script"),Ht),o=a.length;c>u;u++)i=l,u!==f&&(i=x.clone(i,!0,!0),o&&x.merge(a,Ft(i,"script"))),t.call(this[u],i,u);if(o)for(s=a[a.length-1].ownerDocument,x.map(a,qt),u=0;o>u;u++)i=a[u],kt.test(i.type||"")&&!x._data(i,"globalEval")&&x.contains(s,i)&&(i.src?x._evalUrl(i.src):x.globalEval((i.text||i.textContent||i.innerHTML||"").replace(St,"")));l=r=null}return this}});function Lt(e,t){return x.nodeName(e,"table")&&x.nodeName(1===t.nodeType?t:t.firstChild,"tr")?e.getElementsByTagName("tbody")[0]||e.appendChild(e.ownerDocument.createElement("tbody")):e}function Ht(e){return e.type=(null!==x.find.attr(e,"type"))+"/"+e.type,e}function qt(e){var t=Et.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function _t(e,t){var n,r=0;for(;null!=(n=e[r]);r++)x._data(n,"globalEval",!t||x._data(t[r],"globalEval"))}function Mt(e,t){if(1===t.nodeType&&x.hasData(e)){var n,r,i,o=x._data(e),a=x._data(t,o),s=o.events;if(s){delete a.handle,a.events={};for(n in s)for(r=0,i=s[n].length;i>r;r++)x.event.add(t,n,s[n][r])}a.data&&(a.data=x.extend({},a.data))}}function Ot(e,t){var n,r,i;if(1===t.nodeType){if(n=t.nodeName.toLowerCase(),!x.support.noCloneEvent&&t[x.expando]){i=x._data(t);for(r in i.events)x.removeEvent(t,r,i.handle);t.removeAttribute(x.expando)}"script"===n&&t.text!==e.text?(Ht(t).text=e.text,qt(t)):"object"===n?(t.parentNode&&(t.outerHTML=e.outerHTML),x.support.html5Clone&&e.innerHTML&&!x.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):"input"===n&&Ct.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):"option"===n?t.defaultSelected=t.selected=e.defaultSelected:("input"===n||"textarea"===n)&&(t.defaultValue=e.defaultValue)}}x.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){x.fn[e]=function(e){var n,r=0,i=[],o=x(e),a=o.length-1;for(;a>=r;r++)n=r===a?this:this.clone(!0),x(o[r])[t](n),h.apply(i,n.get());return this.pushStack(i)}});function Ft(e,n){var r,o,a=0,s=typeof e.getElementsByTagName!==i?e.getElementsByTagName(n||"*"):typeof e.querySelectorAll!==i?e.querySelectorAll(n||"*"):t;if(!s)for(s=[],r=e.childNodes||e;null!=(o=r[a]);a++)!n||x.nodeName(o,n)?s.push(o):x.merge(s,Ft(o,n));return n===t||n&&x.nodeName(e,n)?x.merge([e],s):s}function Bt(e){Ct.test(e.type)&&(e.defaultChecked=e.checked)}x.extend({clone:function(e,t,n){var r,i,o,a,s,l=x.contains(e.ownerDocument,e);if(x.support.html5Clone||x.isXMLDoc(e)||!mt.test("<"+e.nodeName+">")?o=e.cloneNode(!0):(Dt.innerHTML=e.outerHTML,Dt.removeChild(o=Dt.firstChild)),!(x.support.noCloneEvent&&x.support.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||x.isXMLDoc(e)))for(r=Ft(o),s=Ft(e),a=0;null!=(i=s[a]);++a)r[a]&&Ot(i,r[a]);if(t)if(n)for(s=s||Ft(e),r=r||Ft(o),a=0;null!=(i=s[a]);a++)Mt(i,r[a]);else Mt(e,o);return r=Ft(o,"script"),r.length>0&&_t(r,!l&&Ft(e,"script")),r=s=i=null,o},buildFragment:function(e,t,n,r){var i,o,a,s,l,u,c,p=e.length,f=dt(t),d=[],h=0;for(;p>h;h++)if(o=e[h],o||0===o)if("object"===x.type(o))x.merge(d,o.nodeType?[o]:o);else if(wt.test(o)){s=s||f.appendChild(t.createElement("div")),l=(bt.exec(o)||["",""])[1].toLowerCase(),c=At[l]||At._default,s.innerHTML=c[1]+o.replace(vt,"<$1></$2>")+c[2],i=c[0];while(i--)s=s.lastChild;if(!x.support.leadingWhitespace&&yt.test(o)&&d.push(t.createTextNode(yt.exec(o)[0])),!x.support.tbody){o="table"!==l||xt.test(o)?"<table>"!==c[1]||xt.test(o)?0:s:s.firstChild,i=o&&o.childNodes.length;while(i--)x.nodeName(u=o.childNodes[i],"tbody")&&!u.childNodes.length&&o.removeChild(u)}x.merge(d,s.childNodes),s.textContent="";while(s.firstChild)s.removeChild(s.firstChild);s=f.lastChild}else d.push(t.createTextNode(o));s&&f.removeChild(s),x.support.appendChecked||x.grep(Ft(d,"input"),Bt),h=0;while(o=d[h++])if((!r||-1===x.inArray(o,r))&&(a=x.contains(o.ownerDocument,o),s=Ft(f.appendChild(o),"script"),a&&_t(s),n)){i=0;while(o=s[i++])kt.test(o.type||"")&&n.push(o)}return s=null,f},cleanData:function(e,t){var n,r,o,a,s=0,l=x.expando,u=x.cache,c=x.support.deleteExpando,f=x.event.special;for(;null!=(n=e[s]);s++)if((t||x.acceptData(n))&&(o=n[l],a=o&&u[o])){if(a.events)for(r in a.events)f[r]?x.event.remove(n,r):x.removeEvent(n,r,a.handle);
+u[o]&&(delete u[o],c?delete n[l]:typeof n.removeAttribute!==i?n.removeAttribute(l):n[l]=null,p.push(o))}},_evalUrl:function(e){return x.ajax({url:e,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})}}),x.fn.extend({wrapAll:function(e){if(x.isFunction(e))return this.each(function(t){x(this).wrapAll(e.call(this,t))});if(this[0]){var t=x(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstChild&&1===e.firstChild.nodeType)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return x.isFunction(e)?this.each(function(t){x(this).wrapInner(e.call(this,t))}):this.each(function(){var t=x(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=x.isFunction(e);return this.each(function(n){x(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){x.nodeName(this,"body")||x(this).replaceWith(this.childNodes)}).end()}});var Pt,Rt,Wt,$t=/alpha\([^)]*\)/i,It=/opacity\s*=\s*([^)]*)/,zt=/^(top|right|bottom|left)$/,Xt=/^(none|table(?!-c[ea]).+)/,Ut=/^margin/,Vt=RegExp("^("+w+")(.*)$","i"),Yt=RegExp("^("+w+")(?!px)[a-z%]+$","i"),Jt=RegExp("^([+-])=("+w+")","i"),Gt={BODY:"block"},Qt={position:"absolute",visibility:"hidden",display:"block"},Kt={letterSpacing:0,fontWeight:400},Zt=["Top","Right","Bottom","Left"],en=["Webkit","O","Moz","ms"];function tn(e,t){if(t in e)return t;var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=en.length;while(i--)if(t=en[i]+n,t in e)return t;return r}function nn(e,t){return e=t||e,"none"===x.css(e,"display")||!x.contains(e.ownerDocument,e)}function rn(e,t){var n,r,i,o=[],a=0,s=e.length;for(;s>a;a++)r=e[a],r.style&&(o[a]=x._data(r,"olddisplay"),n=r.style.display,t?(o[a]||"none"!==n||(r.style.display=""),""===r.style.display&&nn(r)&&(o[a]=x._data(r,"olddisplay",ln(r.nodeName)))):o[a]||(i=nn(r),(n&&"none"!==n||!i)&&x._data(r,"olddisplay",i?n:x.css(r,"display"))));for(a=0;s>a;a++)r=e[a],r.style&&(t&&"none"!==r.style.display&&""!==r.style.display||(r.style.display=t?o[a]||"":"none"));return e}x.fn.extend({css:function(e,n){return x.access(this,function(e,n,r){var i,o,a={},s=0;if(x.isArray(n)){for(o=Rt(e),i=n.length;i>s;s++)a[n[s]]=x.css(e,n[s],!1,o);return a}return r!==t?x.style(e,n,r):x.css(e,n)},e,n,arguments.length>1)},show:function(){return rn(this,!0)},hide:function(){return rn(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){nn(this)?x(this).show():x(this).hide()})}}),x.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Wt(e,"opacity");return""===n?"1":n}}}},cssNumber:{columnCount:!0,fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":x.support.cssFloat?"cssFloat":"styleFloat"},style:function(e,n,r,i){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var o,a,s,l=x.camelCase(n),u=e.style;if(n=x.cssProps[l]||(x.cssProps[l]=tn(u,l)),s=x.cssHooks[n]||x.cssHooks[l],r===t)return s&&"get"in s&&(o=s.get(e,!1,i))!==t?o:u[n];if(a=typeof r,"string"===a&&(o=Jt.exec(r))&&(r=(o[1]+1)*o[2]+parseFloat(x.css(e,n)),a="number"),!(null==r||"number"===a&&isNaN(r)||("number"!==a||x.cssNumber[l]||(r+="px"),x.support.clearCloneStyle||""!==r||0!==n.indexOf("background")||(u[n]="inherit"),s&&"set"in s&&(r=s.set(e,r,i))===t)))try{u[n]=r}catch(c){}}},css:function(e,n,r,i){var o,a,s,l=x.camelCase(n);return n=x.cssProps[l]||(x.cssProps[l]=tn(e.style,l)),s=x.cssHooks[n]||x.cssHooks[l],s&&"get"in s&&(a=s.get(e,!0,r)),a===t&&(a=Wt(e,n,i)),"normal"===a&&n in Kt&&(a=Kt[n]),""===r||r?(o=parseFloat(a),r===!0||x.isNumeric(o)?o||0:a):a}}),e.getComputedStyle?(Rt=function(t){return e.getComputedStyle(t,null)},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),l=s?s.getPropertyValue(n)||s[n]:t,u=e.style;return s&&(""!==l||x.contains(e.ownerDocument,e)||(l=x.style(e,n)),Yt.test(l)&&Ut.test(n)&&(i=u.width,o=u.minWidth,a=u.maxWidth,u.minWidth=u.maxWidth=u.width=l,l=s.width,u.width=i,u.minWidth=o,u.maxWidth=a)),l}):a.documentElement.currentStyle&&(Rt=function(e){return e.currentStyle},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),l=s?s[n]:t,u=e.style;return null==l&&u&&u[n]&&(l=u[n]),Yt.test(l)&&!zt.test(n)&&(i=u.left,o=e.runtimeStyle,a=o&&o.left,a&&(o.left=e.currentStyle.left),u.left="fontSize"===n?"1em":l,l=u.pixelLeft+"px",u.left=i,a&&(o.left=a)),""===l?"auto":l});function on(e,t,n){var r=Vt.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function an(e,t,n,r,i){var o=n===(r?"border":"content")?4:"width"===t?1:0,a=0;for(;4>o;o+=2)"margin"===n&&(a+=x.css(e,n+Zt[o],!0,i)),r?("content"===n&&(a-=x.css(e,"padding"+Zt[o],!0,i)),"margin"!==n&&(a-=x.css(e,"border"+Zt[o]+"Width",!0,i))):(a+=x.css(e,"padding"+Zt[o],!0,i),"padding"!==n&&(a+=x.css(e,"border"+Zt[o]+"Width",!0,i)));return a}function sn(e,t,n){var r=!0,i="width"===t?e.offsetWidth:e.offsetHeight,o=Rt(e),a=x.support.boxSizing&&"border-box"===x.css(e,"boxSizing",!1,o);if(0>=i||null==i){if(i=Wt(e,t,o),(0>i||null==i)&&(i=e.style[t]),Yt.test(i))return i;r=a&&(x.support.boxSizingReliable||i===e.style[t]),i=parseFloat(i)||0}return i+an(e,t,n||(a?"border":"content"),r,o)+"px"}function ln(e){var t=a,n=Gt[e];return n||(n=un(e,t),"none"!==n&&n||(Pt=(Pt||x("<iframe frameborder='0' width='0' height='0'/>").css("cssText","display:block !important")).appendTo(t.documentElement),t=(Pt[0].contentWindow||Pt[0].contentDocument).document,t.write("<!doctype html><html><body>"),t.close(),n=un(e,t),Pt.detach()),Gt[e]=n),n}function un(e,t){var n=x(t.createElement(e)).appendTo(t.body),r=x.css(n[0],"display");return n.remove(),r}x.each(["height","width"],function(e,n){x.cssHooks[n]={get:function(e,r,i){return r?0===e.offsetWidth&&Xt.test(x.css(e,"display"))?x.swap(e,Qt,function(){return sn(e,n,i)}):sn(e,n,i):t},set:function(e,t,r){var i=r&&Rt(e);return on(e,t,r?an(e,n,r,x.support.boxSizing&&"border-box"===x.css(e,"boxSizing",!1,i),i):0)}}}),x.support.opacity||(x.cssHooks.opacity={get:function(e,t){return It.test((t&&e.currentStyle?e.currentStyle.filter:e.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":t?"1":""},set:function(e,t){var n=e.style,r=e.currentStyle,i=x.isNumeric(t)?"alpha(opacity="+100*t+")":"",o=r&&r.filter||n.filter||"";n.zoom=1,(t>=1||""===t)&&""===x.trim(o.replace($t,""))&&n.removeAttribute&&(n.removeAttribute("filter"),""===t||r&&!r.filter)||(n.filter=$t.test(o)?o.replace($t,i):o+" "+i)}}),x(function(){x.support.reliableMarginRight||(x.cssHooks.marginRight={get:function(e,n){return n?x.swap(e,{display:"inline-block"},Wt,[e,"marginRight"]):t}}),!x.support.pixelPosition&&x.fn.position&&x.each(["top","left"],function(e,n){x.cssHooks[n]={get:function(e,r){return r?(r=Wt(e,n),Yt.test(r)?x(e).position()[n]+"px":r):t}}})}),x.expr&&x.expr.filters&&(x.expr.filters.hidden=function(e){return 0>=e.offsetWidth&&0>=e.offsetHeight||!x.support.reliableHiddenOffsets&&"none"===(e.style&&e.style.display||x.css(e,"display"))},x.expr.filters.visible=function(e){return!x.expr.filters.hidden(e)}),x.each({margin:"",padding:"",border:"Width"},function(e,t){x.cssHooks[e+t]={expand:function(n){var r=0,i={},o="string"==typeof n?n.split(" "):[n];for(;4>r;r++)i[e+Zt[r]+t]=o[r]||o[r-2]||o[0];return i}},Ut.test(e)||(x.cssHooks[e+t].set=on)});var cn=/%20/g,pn=/\[\]$/,fn=/\r?\n/g,dn=/^(?:submit|button|image|reset|file)$/i,hn=/^(?:input|select|textarea|keygen)/i;x.fn.extend({serialize:function(){return x.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=x.prop(this,"elements");return e?x.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!x(this).is(":disabled")&&hn.test(this.nodeName)&&!dn.test(e)&&(this.checked||!Ct.test(e))}).map(function(e,t){var n=x(this).val();return null==n?null:x.isArray(n)?x.map(n,function(e){return{name:t.name,value:e.replace(fn,"\r\n")}}):{name:t.name,value:n.replace(fn,"\r\n")}}).get()}}),x.param=function(e,n){var r,i=[],o=function(e,t){t=x.isFunction(t)?t():null==t?"":t,i[i.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};if(n===t&&(n=x.ajaxSettings&&x.ajaxSettings.traditional),x.isArray(e)||e.jquery&&!x.isPlainObject(e))x.each(e,function(){o(this.name,this.value)});else for(r in e)gn(r,e[r],n,o);return i.join("&").replace(cn,"+")};function gn(e,t,n,r){var i;if(x.isArray(t))x.each(t,function(t,i){n||pn.test(e)?r(e,i):gn(e+"["+("object"==typeof i?t:"")+"]",i,n,r)});else if(n||"object"!==x.type(t))r(e,t);else for(i in t)gn(e+"["+i+"]",t[i],n,r)}x.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(e,t){x.fn[t]=function(e,n){return arguments.length>0?this.on(t,null,e,n):this.trigger(t)}}),x.fn.extend({hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)},bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)}});var mn,yn,vn=x.now(),bn=/\?/,xn=/#.*$/,wn=/([?&])_=[^&]*/,Tn=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Cn=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Nn=/^(?:GET|HEAD)$/,kn=/^\/\//,En=/^([\w.+-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,Sn=x.fn.load,An={},jn={},Dn="*/".concat("*");try{yn=o.href}catch(Ln){yn=a.createElement("a"),yn.href="",yn=yn.href}mn=En.exec(yn.toLowerCase())||[];function Hn(e){return function(t,n){"string"!=typeof t&&(n=t,t="*");var r,i=0,o=t.toLowerCase().match(T)||[];if(x.isFunction(n))while(r=o[i++])"+"===r[0]?(r=r.slice(1)||"*",(e[r]=e[r]||[]).unshift(n)):(e[r]=e[r]||[]).push(n)}}function qn(e,n,r,i){var o={},a=e===jn;function s(l){var u;return o[l]=!0,x.each(e[l]||[],function(e,l){var c=l(n,r,i);return"string"!=typeof c||a||o[c]?a?!(u=c):t:(n.dataTypes.unshift(c),s(c),!1)}),u}return s(n.dataTypes[0])||!o["*"]&&s("*")}function _n(e,n){var r,i,o=x.ajaxSettings.flatOptions||{};for(i in n)n[i]!==t&&((o[i]?e:r||(r={}))[i]=n[i]);return r&&x.extend(!0,e,r),e}x.fn.load=function(e,n,r){if("string"!=typeof e&&Sn)return Sn.apply(this,arguments);var i,o,a,s=this,l=e.indexOf(" ");return l>=0&&(i=e.slice(l,e.length),e=e.slice(0,l)),x.isFunction(n)?(r=n,n=t):n&&"object"==typeof n&&(a="POST"),s.length>0&&x.ajax({url:e,type:a,dataType:"html",data:n}).done(function(e){o=arguments,s.html(i?x("<div>").append(x.parseHTML(e)).find(i):e)}).complete(r&&function(e,t){s.each(r,o||[e.responseText,t,e])}),this},x.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){x.fn[t]=function(e){return this.on(t,e)}}),x.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:yn,type:"GET",isLocal:Cn.test(mn[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Dn,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":x.parseJSON,"text xml":x.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?_n(_n(e,x.ajaxSettings),t):_n(x.ajaxSettings,e)},ajaxPrefilter:Hn(An),ajaxTransport:Hn(jn),ajax:function(e,n){"object"==typeof e&&(n=e,e=t),n=n||{};var r,i,o,a,s,l,u,c,p=x.ajaxSetup({},n),f=p.context||p,d=p.context&&(f.nodeType||f.jquery)?x(f):x.event,h=x.Deferred(),g=x.Callbacks("once memory"),m=p.statusCode||{},y={},v={},b=0,w="canceled",C={readyState:0,getResponseHeader:function(e){var t;if(2===b){if(!c){c={};while(t=Tn.exec(a))c[t[1].toLowerCase()]=t[2]}t=c[e.toLowerCase()]}return null==t?null:t},getAllResponseHeaders:function(){return 2===b?a:null},setRequestHeader:function(e,t){var n=e.toLowerCase();return b||(e=v[n]=v[n]||e,y[e]=t),this},overrideMimeType:function(e){return b||(p.mimeType=e),this},statusCode:function(e){var t;if(e)if(2>b)for(t in e)m[t]=[m[t],e[t]];else C.always(e[C.status]);return this},abort:function(e){var t=e||w;return u&&u.abort(t),k(0,t),this}};if(h.promise(C).complete=g.add,C.success=C.done,C.error=C.fail,p.url=((e||p.url||yn)+"").replace(xn,"").replace(kn,mn[1]+"//"),p.type=n.method||n.type||p.method||p.type,p.dataTypes=x.trim(p.dataType||"*").toLowerCase().match(T)||[""],null==p.crossDomain&&(r=En.exec(p.url.toLowerCase()),p.crossDomain=!(!r||r[1]===mn[1]&&r[2]===mn[2]&&(r[3]||("http:"===r[1]?"80":"443"))===(mn[3]||("http:"===mn[1]?"80":"443")))),p.data&&p.processData&&"string"!=typeof p.data&&(p.data=x.param(p.data,p.traditional)),qn(An,p,n,C),2===b)return C;l=p.global,l&&0===x.active++&&x.event.trigger("ajaxStart"),p.type=p.type.toUpperCase(),p.hasContent=!Nn.test(p.type),o=p.url,p.hasContent||(p.data&&(o=p.url+=(bn.test(o)?"&":"?")+p.data,delete p.data),p.cache===!1&&(p.url=wn.test(o)?o.replace(wn,"$1_="+vn++):o+(bn.test(o)?"&":"?")+"_="+vn++)),p.ifModified&&(x.lastModified[o]&&C.setRequestHeader("If-Modified-Since",x.lastModified[o]),x.etag[o]&&C.setRequestHeader("If-None-Match",x.etag[o])),(p.data&&p.hasContent&&p.contentType!==!1||n.contentType)&&C.setRequestHeader("Content-Type",p.contentType),C.setRequestHeader("Accept",p.dataTypes[0]&&p.accepts[p.dataTypes[0]]?p.accepts[p.dataTypes[0]]+("*"!==p.dataTypes[0]?", "+Dn+"; q=0.01":""):p.accepts["*"]);for(i in p.headers)C.setRequestHeader(i,p.headers[i]);if(p.beforeSend&&(p.beforeSend.call(f,C,p)===!1||2===b))return C.abort();w="abort";for(i in{success:1,error:1,complete:1})C[i](p[i]);if(u=qn(jn,p,n,C)){C.readyState=1,l&&d.trigger("ajaxSend",[C,p]),p.async&&p.timeout>0&&(s=setTimeout(function(){C.abort("timeout")},p.timeout));try{b=1,u.send(y,k)}catch(N){if(!(2>b))throw N;k(-1,N)}}else k(-1,"No Transport");function k(e,n,r,i){var c,y,v,w,T,N=n;2!==b&&(b=2,s&&clearTimeout(s),u=t,a=i||"",C.readyState=e>0?4:0,c=e>=200&&300>e||304===e,r&&(w=Mn(p,C,r)),w=On(p,w,C,c),c?(p.ifModified&&(T=C.getResponseHeader("Last-Modified"),T&&(x.lastModified[o]=T),T=C.getResponseHeader("etag"),T&&(x.etag[o]=T)),204===e||"HEAD"===p.type?N="nocontent":304===e?N="notmodified":(N=w.state,y=w.data,v=w.error,c=!v)):(v=N,(e||!N)&&(N="error",0>e&&(e=0))),C.status=e,C.statusText=(n||N)+"",c?h.resolveWith(f,[y,N,C]):h.rejectWith(f,[C,N,v]),C.statusCode(m),m=t,l&&d.trigger(c?"ajaxSuccess":"ajaxError",[C,p,c?y:v]),g.fireWith(f,[C,N]),l&&(d.trigger("ajaxComplete",[C,p]),--x.active||x.event.trigger("ajaxStop")))}return C},getJSON:function(e,t,n){return x.get(e,t,n,"json")},getScript:function(e,n){return x.get(e,t,n,"script")}}),x.each(["get","post"],function(e,n){x[n]=function(e,r,i,o){return x.isFunction(r)&&(o=o||i,i=r,r=t),x.ajax({url:e,type:n,dataType:o,data:r,success:i})}});function Mn(e,n,r){var i,o,a,s,l=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),o===t&&(o=e.mimeType||n.getResponseHeader("Content-Type"));if(o)for(s in l)if(l[s]&&l[s].test(o)){u.unshift(s);break}if(u[0]in r)a=u[0];else{for(s in r){if(!u[0]||e.converters[s+" "+u[0]]){a=s;break}i||(i=s)}a=a||i}return a?(a!==u[0]&&u.unshift(a),r[a]):t}function On(e,t,n,r){var i,o,a,s,l,u={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)u[a.toLowerCase()]=e.converters[a];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!l&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),l=o,o=c.shift())if("*"===o)o=l;else if("*"!==l&&l!==o){if(a=u[l+" "+o]||u["* "+o],!a)for(i in u)if(s=i.split(" "),s[1]===o&&(a=u[l+" "+s[0]]||u["* "+s[0]])){a===!0?a=u[i]:u[i]!==!0&&(o=s[0],c.unshift(s[1]));break}if(a!==!0)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(p){return{state:"parsererror",error:a?p:"No conversion from "+l+" to "+o}}}return{state:"success",data:t}}x.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(e){return x.globalEval(e),e}}}),x.ajaxPrefilter("script",function(e){e.cache===t&&(e.cache=!1),e.crossDomain&&(e.type="GET",e.global=!1)}),x.ajaxTransport("script",function(e){if(e.crossDomain){var n,r=a.head||x("head")[0]||a.documentElement;return{send:function(t,i){n=a.createElement("script"),n.async=!0,e.scriptCharset&&(n.charset=e.scriptCharset),n.src=e.url,n.onload=n.onreadystatechange=function(e,t){(t||!n.readyState||/loaded|complete/.test(n.readyState))&&(n.onload=n.onreadystatechange=null,n.parentNode&&n.parentNode.removeChild(n),n=null,t||i(200,"success"))},r.insertBefore(n,r.firstChild)},abort:function(){n&&n.onload(t,!0)}}}});var Fn=[],Bn=/(=)\?(?=&|$)|\?\?/;x.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Fn.pop()||x.expando+"_"+vn++;return this[e]=!0,e}}),x.ajaxPrefilter("json jsonp",function(n,r,i){var o,a,s,l=n.jsonp!==!1&&(Bn.test(n.url)?"url":"string"==typeof n.data&&!(n.contentType||"").indexOf("application/x-www-form-urlencoded")&&Bn.test(n.data)&&"data");return l||"jsonp"===n.dataTypes[0]?(o=n.jsonpCallback=x.isFunction(n.jsonpCallback)?n.jsonpCallback():n.jsonpCallback,l?n[l]=n[l].replace(Bn,"$1"+o):n.jsonp!==!1&&(n.url+=(bn.test(n.url)?"&":"?")+n.jsonp+"="+o),n.converters["script json"]=function(){return s||x.error(o+" was not called"),s[0]},n.dataTypes[0]="json",a=e[o],e[o]=function(){s=arguments},i.always(function(){e[o]=a,n[o]&&(n.jsonpCallback=r.jsonpCallback,Fn.push(o)),s&&x.isFunction(a)&&a(s[0]),s=a=t}),"script"):t});var Pn,Rn,Wn=0,$n=e.ActiveXObject&&function(){var e;for(e in Pn)Pn[e](t,!0)};function In(){try{return new e.XMLHttpRequest}catch(t){}}function zn(){try{return new e.ActiveXObject("Microsoft.XMLHTTP")}catch(t){}}x.ajaxSettings.xhr=e.ActiveXObject?function(){return!this.isLocal&&In()||zn()}:In,Rn=x.ajaxSettings.xhr(),x.support.cors=!!Rn&&"withCredentials"in Rn,Rn=x.support.ajax=!!Rn,Rn&&x.ajaxTransport(function(n){if(!n.crossDomain||x.support.cors){var r;return{send:function(i,o){var a,s,l=n.xhr();if(n.username?l.open(n.type,n.url,n.async,n.username,n.password):l.open(n.type,n.url,n.async),n.xhrFields)for(s in n.xhrFields)l[s]=n.xhrFields[s];n.mimeType&&l.overrideMimeType&&l.overrideMimeType(n.mimeType),n.crossDomain||i["X-Requested-With"]||(i["X-Requested-With"]="XMLHttpRequest");try{for(s in i)l.setRequestHeader(s,i[s])}catch(u){}l.send(n.hasContent&&n.data||null),r=function(e,i){var s,u,c,p;try{if(r&&(i||4===l.readyState))if(r=t,a&&(l.onreadystatechange=x.noop,$n&&delete Pn[a]),i)4!==l.readyState&&l.abort();else{p={},s=l.status,u=l.getAllResponseHeaders(),"string"==typeof l.responseText&&(p.text=l.responseText);try{c=l.statusText}catch(f){c=""}s||!n.isLocal||n.crossDomain?1223===s&&(s=204):s=p.text?200:404}}catch(d){i||o(-1,d)}p&&o(s,c,p,u)},n.async?4===l.readyState?setTimeout(r):(a=++Wn,$n&&(Pn||(Pn={},x(e).unload($n)),Pn[a]=r),l.onreadystatechange=r):r()},abort:function(){r&&r(t,!0)}}}});var Xn,Un,Vn=/^(?:toggle|show|hide)$/,Yn=RegExp("^(?:([+-])=|)("+w+")([a-z%]*)$","i"),Jn=/queueHooks$/,Gn=[nr],Qn={"*":[function(e,t){var n=this.createTween(e,t),r=n.cur(),i=Yn.exec(t),o=i&&i[3]||(x.cssNumber[e]?"":"px"),a=(x.cssNumber[e]||"px"!==o&&+r)&&Yn.exec(x.css(n.elem,e)),s=1,l=20;if(a&&a[3]!==o){o=o||a[3],i=i||[],a=+r||1;do s=s||".5",a/=s,x.style(n.elem,e,a+o);while(s!==(s=n.cur()/r)&&1!==s&&--l)}return i&&(a=n.start=+a||+r||0,n.unit=o,n.end=i[1]?a+(i[1]+1)*i[2]:+i[2]),n}]};function Kn(){return setTimeout(function(){Xn=t}),Xn=x.now()}function Zn(e,t,n){var r,i=(Qn[t]||[]).concat(Qn["*"]),o=0,a=i.length;for(;a>o;o++)if(r=i[o].call(n,t,e))return r}function er(e,t,n){var r,i,o=0,a=Gn.length,s=x.Deferred().always(function(){delete l.elem}),l=function(){if(i)return!1;var t=Xn||Kn(),n=Math.max(0,u.startTime+u.duration-t),r=n/u.duration||0,o=1-r,a=0,l=u.tweens.length;for(;l>a;a++)u.tweens[a].run(o);return s.notifyWith(e,[u,o,n]),1>o&&l?n:(s.resolveWith(e,[u]),!1)},u=s.promise({elem:e,props:x.extend({},t),opts:x.extend(!0,{specialEasing:{}},n),originalProperties:t,originalOptions:n,startTime:Xn||Kn(),duration:n.duration,tweens:[],createTween:function(t,n){var r=x.Tween(e,u.opts,t,n,u.opts.specialEasing[t]||u.opts.easing);return u.tweens.push(r),r},stop:function(t){var n=0,r=t?u.tweens.length:0;if(i)return this;for(i=!0;r>n;n++)u.tweens[n].run(1);return t?s.resolveWith(e,[u,t]):s.rejectWith(e,[u,t]),this}}),c=u.props;for(tr(c,u.opts.specialEasing);a>o;o++)if(r=Gn[o].call(u,e,c,u.opts))return r;return x.map(c,Zn,u),x.isFunction(u.opts.start)&&u.opts.start.call(e,u),x.fx.timer(x.extend(l,{elem:e,anim:u,queue:u.opts.queue})),u.progress(u.opts.progress).done(u.opts.done,u.opts.complete).fail(u.opts.fail).always(u.opts.always)}function tr(e,t){var n,r,i,o,a;for(n in e)if(r=x.camelCase(n),i=t[r],o=e[n],x.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),a=x.cssHooks[r],a&&"expand"in a){o=a.expand(o),delete e[r];for(n in o)n in e||(e[n]=o[n],t[n]=i)}else t[r]=i}x.Animation=x.extend(er,{tweener:function(e,t){x.isFunction(e)?(t=e,e=["*"]):e=e.split(" ");var n,r=0,i=e.length;for(;i>r;r++)n=e[r],Qn[n]=Qn[n]||[],Qn[n].unshift(t)},prefilter:function(e,t){t?Gn.unshift(e):Gn.push(e)}});function nr(e,t,n){var r,i,o,a,s,l,u=this,c={},p=e.style,f=e.nodeType&&nn(e),d=x._data(e,"fxshow");n.queue||(s=x._queueHooks(e,"fx"),null==s.unqueued&&(s.unqueued=0,l=s.empty.fire,s.empty.fire=function(){s.unqueued||l()}),s.unqueued++,u.always(function(){u.always(function(){s.unqueued--,x.queue(e,"fx").length||s.empty.fire()})})),1===e.nodeType&&("height"in t||"width"in t)&&(n.overflow=[p.overflow,p.overflowX,p.overflowY],"inline"===x.css(e,"display")&&"none"===x.css(e,"float")&&(x.support.inlineBlockNeedsLayout&&"inline"!==ln(e.nodeName)?p.zoom=1:p.display="inline-block")),n.overflow&&(p.overflow="hidden",x.support.shrinkWrapBlocks||u.always(function(){p.overflow=n.overflow[0],p.overflowX=n.overflow[1],p.overflowY=n.overflow[2]}));for(r in t)if(i=t[r],Vn.exec(i)){if(delete t[r],o=o||"toggle"===i,i===(f?"hide":"show"))continue;c[r]=d&&d[r]||x.style(e,r)}if(!x.isEmptyObject(c)){d?"hidden"in d&&(f=d.hidden):d=x._data(e,"fxshow",{}),o&&(d.hidden=!f),f?x(e).show():u.done(function(){x(e).hide()}),u.done(function(){var t;x._removeData(e,"fxshow");for(t in c)x.style(e,t,c[t])});for(r in c)a=Zn(f?d[r]:0,r,u),r in d||(d[r]=a.start,f&&(a.end=a.start,a.start="width"===r||"height"===r?1:0))}}function rr(e,t,n,r,i){return new rr.prototype.init(e,t,n,r,i)}x.Tween=rr,rr.prototype={constructor:rr,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||"swing",this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(x.cssNumber[n]?"":"px")},cur:function(){var e=rr.propHooks[this.prop];return e&&e.get?e.get(this):rr.propHooks._default.get(this)},run:function(e){var t,n=rr.propHooks[this.prop];return this.pos=t=this.options.duration?x.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):rr.propHooks._default.set(this),this}},rr.prototype.init.prototype=rr.prototype,rr.propHooks={_default:{get:function(e){var t;return null==e.elem[e.prop]||e.elem.style&&null!=e.elem.style[e.prop]?(t=x.css(e.elem,e.prop,""),t&&"auto"!==t?t:0):e.elem[e.prop]},set:function(e){x.fx.step[e.prop]?x.fx.step[e.prop](e):e.elem.style&&(null!=e.elem.style[x.cssProps[e.prop]]||x.cssHooks[e.prop])?x.style(e.elem,e.prop,e.now+e.unit):e.elem[e.prop]=e.now}}},rr.propHooks.scrollTop=rr.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},x.each(["toggle","show","hide"],function(e,t){var n=x.fn[t];x.fn[t]=function(e,r,i){return null==e||"boolean"==typeof e?n.apply(this,arguments):this.animate(ir(t,!0),e,r,i)}}),x.fn.extend({fadeTo:function(e,t,n,r){return this.filter(nn).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(e,t,n,r){var i=x.isEmptyObject(e),o=x.speed(t,n,r),a=function(){var t=er(this,x.extend({},e),o);(i||x._data(this,"finish"))&&t.stop(!0)};return a.finish=a,i||o.queue===!1?this.each(a):this.queue(o.queue,a)},stop:function(e,n,r){var i=function(e){var t=e.stop;delete e.stop,t(r)};return"string"!=typeof e&&(r=n,n=e,e=t),n&&e!==!1&&this.queue(e||"fx",[]),this.each(function(){var t=!0,n=null!=e&&e+"queueHooks",o=x.timers,a=x._data(this);if(n)a[n]&&a[n].stop&&i(a[n]);else for(n in a)a[n]&&a[n].stop&&Jn.test(n)&&i(a[n]);for(n=o.length;n--;)o[n].elem!==this||null!=e&&o[n].queue!==e||(o[n].anim.stop(r),t=!1,o.splice(n,1));(t||!r)&&x.dequeue(this,e)})},finish:function(e){return e!==!1&&(e=e||"fx"),this.each(function(){var t,n=x._data(this),r=n[e+"queue"],i=n[e+"queueHooks"],o=x.timers,a=r?r.length:0;for(n.finish=!0,x.queue(this,e,[]),i&&i.stop&&i.stop.call(this,!0),t=o.length;t--;)o[t].elem===this&&o[t].queue===e&&(o[t].anim.stop(!0),o.splice(t,1));for(t=0;a>t;t++)r[t]&&r[t].finish&&r[t].finish.call(this);delete n.finish})}});function ir(e,t){var n,r={height:e},i=0;for(t=t?1:0;4>i;i+=2-t)n=Zt[i],r["margin"+n]=r["padding"+n]=e;return t&&(r.opacity=r.width=e),r}x.each({slideDown:ir("show"),slideUp:ir("hide"),slideToggle:ir("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,t){x.fn[e]=function(e,n,r){return this.animate(t,e,n,r)}}),x.speed=function(e,t,n){var r=e&&"object"==typeof e?x.extend({},e):{complete:n||!n&&t||x.isFunction(e)&&e,duration:e,easing:n&&t||t&&!x.isFunction(t)&&t};return r.duration=x.fx.off?0:"number"==typeof r.duration?r.duration:r.duration in x.fx.speeds?x.fx.speeds[r.duration]:x.fx.speeds._default,(null==r.queue||r.queue===!0)&&(r.queue="fx"),r.old=r.complete,r.complete=function(){x.isFunction(r.old)&&r.old.call(this),r.queue&&x.dequeue(this,r.queue)},r},x.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2}},x.timers=[],x.fx=rr.prototype.init,x.fx.tick=function(){var e,n=x.timers,r=0;for(Xn=x.now();n.length>r;r++)e=n[r],e()||n[r]!==e||n.splice(r--,1);n.length||x.fx.stop(),Xn=t},x.fx.timer=function(e){e()&&x.timers.push(e)&&x.fx.start()},x.fx.interval=13,x.fx.start=function(){Un||(Un=setInterval(x.fx.tick,x.fx.interval))},x.fx.stop=function(){clearInterval(Un),Un=null},x.fx.speeds={slow:600,fast:200,_default:400},x.fx.step={},x.expr&&x.expr.filters&&(x.expr.filters.animated=function(e){return x.grep(x.timers,function(t){return e===t.elem}).length}),x.fn.offset=function(e){if(arguments.length)return e===t?this:this.each(function(t){x.offset.setOffset(this,e,t)});var n,r,o={top:0,left:0},a=this[0],s=a&&a.ownerDocument;if(s)return n=s.documentElement,x.contains(n,a)?(typeof a.getBoundingClientRect!==i&&(o=a.getBoundingClientRect()),r=or(s),{top:o.top+(r.pageYOffset||n.scrollTop)-(n.clientTop||0),left:o.left+(r.pageXOffset||n.scrollLeft)-(n.clientLeft||0)}):o},x.offset={setOffset:function(e,t,n){var r=x.css(e,"position");"static"===r&&(e.style.position="relative");var i=x(e),o=i.offset(),a=x.css(e,"top"),s=x.css(e,"left"),l=("absolute"===r||"fixed"===r)&&x.inArray("auto",[a,s])>-1,u={},c={},p,f;l?(c=i.position(),p=c.top,f=c.left):(p=parseFloat(a)||0,f=parseFloat(s)||0),x.isFunction(t)&&(t=t.call(e,n,o)),null!=t.top&&(u.top=t.top-o.top+p),null!=t.left&&(u.left=t.left-o.left+f),"using"in t?t.using.call(e,u):i.css(u)}},x.fn.extend({position:function(){if(this[0]){var e,t,n={top:0,left:0},r=this[0];return"fixed"===x.css(r,"position")?t=r.getBoundingClientRect():(e=this.offsetParent(),t=this.offset(),x.nodeName(e[0],"html")||(n=e.offset()),n.top+=x.css(e[0],"borderTopWidth",!0),n.left+=x.css(e[0],"borderLeftWidth",!0)),{top:t.top-n.top-x.css(r,"marginTop",!0),left:t.left-n.left-x.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent||s;while(e&&!x.nodeName(e,"html")&&"static"===x.css(e,"position"))e=e.offsetParent;return e||s})}}),x.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,n){var r=/Y/.test(n);x.fn[e]=function(i){return x.access(this,function(e,i,o){var a=or(e);return o===t?a?n in a?a[n]:a.document.documentElement[i]:e[i]:(a?a.scrollTo(r?x(a).scrollLeft():o,r?o:x(a).scrollTop()):e[i]=o,t)},e,i,arguments.length,null)}});function or(e){return x.isWindow(e)?e:9===e.nodeType?e.defaultView||e.parentWindow:!1}x.each({Height:"height",Width:"width"},function(e,n){x.each({padding:"inner"+e,content:n,"":"outer"+e},function(r,i){x.fn[i]=function(i,o){var a=arguments.length&&(r||"boolean"!=typeof i),s=r||(i===!0||o===!0?"margin":"border");return x.access(this,function(n,r,i){var o;return x.isWindow(n)?n.document.documentElement["client"+e]:9===n.nodeType?(o=n.documentElement,Math.max(n.body["scroll"+e],o["scroll"+e],n.body["offset"+e],o["offset"+e],o["client"+e])):i===t?x.css(n,r,s):x.style(n,r,i,s)},n,a?i:t,a,null)}})}),x.fn.size=function(){return this.length},x.fn.andSelf=x.fn.addBack,"object"==typeof module&&module&&"object"==typeof module.exports?module.exports=x:(e.jQuery=e.$=x,"function"==typeof define&&define.amd&&define("jquery",[],function(){return x}))})(window);
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/jquery/jquery.pagination.js b/pluss-wap-page/src/main/resources/static/resources/js/third-party/jquery/jquery.pagination.js
new file mode 100644
index 0000000..cf586c6
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/third-party/jquery/jquery.pagination.js
@@ -0,0 +1,249 @@
+/**
+ * This jQuery plugin displays pagination links inside the selected elements.
+ * 
+ * This plugin needs at least jQuery 1.4.2
+ *
+ * @author Gabriel Birke (birke *at* d-scribe *dot* de)
+ * @version 2.2
+ * @param {int} maxentries Number of entries to paginate
+ * @param {Object} opts Several options (see README for documentation)
+ * @return {Object} jQuery Object
+ */
+ (function($){
+	/**
+	 * @class Class for calculating pagination values
+	 */
+	$.PaginationCalculator = function(maxentries, opts) {
+		this.maxentries = maxentries;
+		this.opts = opts;
+	}
+	
+	$.extend($.PaginationCalculator.prototype, {
+		/**
+		 * Calculate the maximum number of pages
+		 * @method
+		 * @returns {Number}
+		 */
+		numPages:function() {
+			return Math.ceil(this.maxentries/this.opts.items_per_page);
+		},
+		/**
+		 * Calculate start and end point of pagination links depending on 
+		 * current_page and num_display_entries.
+		 * @returns {Array}
+		 */
+		getInterval:function(current_page)  {
+			var ne_half = Math.floor(this.opts.num_display_entries/2);
+			var np = this.numPages();
+			var upper_limit = np - this.opts.num_display_entries;
+			var start = current_page > ne_half ? Math.max( Math.min(current_page - ne_half, upper_limit), 0 ) : 0;
+			var end = current_page > ne_half?Math.min(current_page+ne_half + (this.opts.num_display_entries % 2), np):Math.min(this.opts.num_display_entries, np);
+			return {start:start, end:end};
+		}
+	});
+	
+	// Initialize jQuery object container for pagination renderers
+	$.PaginationRenderers = {}
+	
+	/**
+	 * @class Default renderer for rendering pagination links
+	 */
+	$.PaginationRenderers.defaultRenderer = function(maxentries, opts) {
+		this.maxentries = maxentries;
+		this.opts = opts;
+		this.pc = new $.PaginationCalculator(maxentries, opts);
+	}
+	$.extend($.PaginationRenderers.defaultRenderer.prototype, {
+		/**
+		 * Helper function for generating a single link (or a span tag if it's the current page)
+		 * @param {Number} page_id The page id for the new item
+		 * @param {Number} current_page 
+		 * @param {Object} appendopts Options for the new item: text and classes
+		 * @returns {jQuery} jQuery object containing the link
+		 */
+		createLink:function(page_id, current_page, appendopts){
+			var lnk, np = this.pc.numPages();
+			page_id = page_id<0?0:(page_id<np?page_id:np-1); // Normalize page id to sane value
+			appendopts = $.extend({text:page_id+1, classes:""}, appendopts||{});
+			if(page_id == current_page){
+				lnk = $("<a class='current'>" + appendopts.text + "</a>");
+			}
+			else
+			{
+				lnk = $("<a>" + appendopts.text + "</a>")
+					.attr('href', this.opts.link_to.replace(/__id__/,page_id));
+			}
+			if(appendopts.classes){ lnk.addClass(appendopts.classes); }
+			lnk.data('page_id', page_id);
+			return lnk;
+		},
+		// Generate a range of numeric links 
+		appendRange:function(container, current_page, start, end, opts) {
+			var i;
+			for(i=start; i<end; i++) {
+				this.createLink(i, current_page, opts).appendTo(container);
+			}
+		},
+		getLinks:function(current_page, eventHandler) {
+			var begin, end,
+				interval = this.pc.getInterval(current_page),
+				np = this.pc.numPages(),
+				fragment = $("<div class='pagination'></div>");
+			
+			// Generate "Previous"-Link
+			if(this.opts.prev_text && (current_page > 0 || this.opts.prev_show_always)){
+				fragment.append(this.createLink(current_page-1, current_page, {text:this.opts.prev_text, classes:"prev"}));
+			}
+			// Generate starting points
+			if (interval.start > 0 && this.opts.num_edge_entries > 0)
+			{
+				end = Math.min(this.opts.num_edge_entries, interval.start);
+				this.appendRange(fragment, current_page, 0, end, {classes:'sp'});
+				if(this.opts.num_edge_entries < interval.start && this.opts.ellipse_text)
+				{
+					$("<span class='pagination-break'>"+this.opts.ellipse_text+"</span>").appendTo(fragment);
+				}
+			}
+			// Generate interval links
+			this.appendRange(fragment, current_page, interval.start, interval.end);
+			// Generate ending points
+			if (interval.end < np && this.opts.num_edge_entries > 0)
+			{
+				if(np-this.opts.num_edge_entries > interval.end && this.opts.ellipse_text)
+				{
+					$("<span class='pagination-break'>"+this.opts.ellipse_text+"</span>").appendTo(fragment);
+				}
+				begin = Math.max(np-this.opts.num_edge_entries, interval.end);
+				this.appendRange(fragment, current_page, begin, np, {classes:'ep'});
+				
+			}
+			// Generate "Next"-Link
+			if(this.opts.next_text && (current_page < np-1 || this.opts.next_show_always)){
+				fragment.append(this.createLink(current_page+1, current_page, {text:this.opts.next_text, classes:"next"}));
+			}
+			$('a', fragment).click(eventHandler);
+			return fragment;
+		}
+	});
+	
+	// Extend jQuery
+	$.fn.pagination = function(maxentries, opts){
+		
+		// Initialize options with default values
+		opts = $.extend({
+			items_per_page:1,
+			num_display_entries:4,
+			current_page:0,
+			num_edge_entries:1,
+			link_to:"#",
+			prev_text:"<i></i>上一页",
+			next_text:"下一页 <i></i>",
+			ellipse_text:"...",
+			prev_show_always:true,
+			next_show_always:true,
+			renderer:"defaultRenderer",
+			show_if_single_page:false,
+			load_first_page:false,
+			callback:function(){return false;}
+		},opts||{});
+		
+		var containers = this,
+			renderer, links, current_page;
+
+		//goto
+    $(".page-btn").one("click",function(){
+    	var allPage = $(".allPage").text();
+    	//console.log(allPage);
+      var goPage = $(".page-go input").val() - 1; //跳转页数
+      if(goPage > -1 && goPage < allPage){
+				opts.current_page = goPage;
+      	$("#Pagination").pagination(allPage,opts);
+      }else {
+      	$("#Pagination").pagination(allPage);
+      }
+      //清空用户跳转页数
+      $(".page-go input").val("");
+    });
+		
+		/**
+		 * This is the event handling function for the pagination links. 
+		 * @param {int} page_id The new page number
+		 */
+		function paginationClickHandler(evt){
+			var links, 
+				new_current_page = $(evt.target).data('page_id'),
+				continuePropagation = selectPage(new_current_page);
+			if (!continuePropagation) {
+				evt.stopPropagation();
+			}
+			return continuePropagation;
+		}
+		
+		/**
+		 * This is a utility function for the internal event handlers. 
+		 * It sets the new current page on the pagination container objects, 
+		 * generates a new HTMl fragment for the pagination links and calls
+		 * the callback function.
+		 */
+		function selectPage(new_current_page) {
+			// update the link display of a all containers
+			containers.data('current_page', new_current_page);
+			links = renderer.getLinks(new_current_page, paginationClickHandler);
+			containers.empty();
+			links.appendTo(containers);
+			// call the callback and propagate the event if it does not return false
+			var continuePropagation = opts.callback(new_current_page, containers);
+			return continuePropagation;
+		}
+		
+		// -----------------------------------
+		// Initialize containers
+		// -----------------------------------
+                current_page = parseInt(opts.current_page);
+		containers.data('current_page', current_page);
+		// Create a sane value for maxentries and items_per_page
+		maxentries = (!maxentries || maxentries < 0)?1:maxentries;
+		opts.items_per_page = (!opts.items_per_page || opts.items_per_page < 0)?1:opts.items_per_page;
+		
+		if(!$.PaginationRenderers[opts.renderer])
+		{
+			throw new ReferenceError("Pagination renderer '" + opts.renderer + "' was not found in jQuery.PaginationRenderers object.");
+		}
+		renderer = new $.PaginationRenderers[opts.renderer](maxentries, opts);
+		
+		// Attach control events to the DOM elements
+		var pc = new $.PaginationCalculator(maxentries, opts);
+		var np = pc.numPages();
+		containers.bind('setPage', {numPages:np}, function(evt, page_id) { 
+				if(page_id >= 0 && page_id < evt.data.numPages) {
+					selectPage(page_id); return false;
+				}
+		});
+		containers.bind('prevPage', function(evt){
+				var current_page = $(this).data('current_page');
+				if (current_page > 0) {
+					selectPage(current_page - 1);
+				}
+				return false;
+		});
+		containers.bind('nextPage', {numPages:np}, function(evt){
+				var current_page = $(this).data('current_page');
+				if(current_page < evt.data.numPages - 1) {
+					selectPage(current_page + 1);
+				}
+				return false;
+		});
+		
+		// When all initialisation is done, draw the links
+		links = renderer.getLinks(current_page, paginationClickHandler);
+		containers.empty();
+		if(np > 1 || opts.show_if_single_page) {
+			links.appendTo(containers);
+		}
+		// call callback function
+		if(opts.load_first_page) {
+			opts.callback(current_page, containers);
+		}
+	} // End of $.fn.pagination block
+	
+})(jQuery);
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/kindeditor-all-min.js b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/kindeditor-all-min.js
new file mode 100644
index 0000000..3bb6d01
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/kindeditor-all-min.js
@@ -0,0 +1,355 @@
+/* KindEditor 4.1.10 (2013-11-23), Copyright (C) kindsoft.net, Licence: http://www.kindsoft.net/license.php */(function(b,d){function f(a){if(!a)return!1;return Object.prototype.toString.call(a)==="[object Array]"}function j(a){if(!a)return!1;return Object.prototype.toString.call(a)==="[object Function]"}function e(a,c){for(var g=0,b=c.length;g<b;g++)if(a===c[g])return g;return-1}function h(a,c){if(f(a))for(var g=0,b=a.length;g<b;g++){if(c.call(a[g],g,a[g])===!1)break}else for(g in a)if(a.hasOwnProperty(g)&&c.call(a[g],g,a[g])===!1)break}function m(a){return a.replace(/(?:^[ \t\n\r]+)|(?:[ \t\n\r]+$)/g,"")}
+function n(a,c,g){g=g===d?",":g;return(g+c+g).indexOf(g+a+g)>=0}function o(a,c){c=c||"px";return a&&/^\d+$/.test(a)?a+c:a}function l(a){var c;return a&&(c=/(\d+)/.exec(a))?parseInt(c[1],10):0}function s(a){return a.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;")}function v(a){return a.replace(/&lt;/g,"<").replace(/&gt;/g,">").replace(/&quot;/g,'"').replace(/&amp;/g,"&")}function p(a){var c=a.split("-"),a="";h(c,function(c,b){a+=c>0?b.charAt(0).toUpperCase()+
+b.substr(1):b});return a}function r(a){function c(a){a=parseInt(a,10).toString(16).toUpperCase();return a.length>1?a:"0"+a}return a.replace(/rgb\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)/ig,function(a,b,d,k){return"#"+c(b)+c(d)+c(k)})}function z(a,c){var c=c===d?",":c,g={},b=f(a)?a:a.split(c),t;h(b,function(a,c){if(t=/^(\d+)\.\.(\d+)$/.exec(c))for(var b=parseInt(t[1],10);b<=parseInt(t[2],10);b++)g[b.toString()]=!0;else g[c]=!0});return g}function D(a,c){return Array.prototype.slice.call(a,c||0)}function q(a,
+c){return a===d?c:a}function A(a,c,g){g||(g=c,c=null);var b;if(c){var d=function(){};d.prototype=c.prototype;b=new d;h(g,function(a,c){b[a]=c})}else b=g;b.constructor=a;a.prototype=b;a.parent=c?c.prototype:null}function B(a){var c;if(c=/\{[\s\S]*\}|\[[\s\S]*\]/.exec(a))a=c[0];c=/[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g;c.lastIndex=0;c.test(a)&&(a=a.replace(c,function(a){return"\\u"+("0000"+a.charCodeAt(0).toString(16)).slice(-4)}));
+if(/^[\],:{}\s]*$/.test(a.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,"@").replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,"]").replace(/(?:^|:|,)(?:\s*\[)+/g,"")))return eval("("+a+")");throw"JSON parse error";}function G(a,c,g){a.addEventListener?a.addEventListener(c,g,fb):a.attachEvent&&a.attachEvent("on"+c,g)}function C(a,c,g){a.removeEventListener?a.removeEventListener(c,g,fb):a.detachEvent&&a.detachEvent("on"+c,g)}function u(a,c){this.init(a,c)}function I(a){try{delete a[ma]}catch(c){a.removeAttribute&&
+a.removeAttribute(ma)}}function E(a,c,g){if(c.indexOf(",")>=0)h(c.split(","),function(){E(a,this,g)});else{var b=a[ma]||null;b||(a[ma]=++gb,b=gb);L[b]===d&&(L[b]={});var t=L[b][c];t&&t.length>0?C(a,c,t[0]):(L[b][c]=[],L[b].el=a);t=L[b][c];t.length===0&&(t[0]=function(c){var g=c?new u(a,c):d;h(t,function(c,b){c>0&&b&&b.call(a,g)})});e(g,t)<0&&t.push(g);G(a,c,t[0])}}function T(a,c,g){if(c&&c.indexOf(",")>=0)h(c.split(","),function(){T(a,this,g)});else{var b=a[ma]||null;if(b)if(c===d)b in L&&(h(L[b],
+function(c,g){c!="el"&&g.length>0&&C(a,c,g[0])}),delete L[b],I(a));else if(L[b]){var t=L[b][c];if(t&&t.length>0){g===d?(C(a,c,t[0]),delete L[b][c]):(h(t,function(a,c){a>0&&c===g&&t.splice(a,1)}),t.length==1&&(C(a,c,t[0]),delete L[b][c]));var k=0;h(L[b],function(){k++});k<2&&(delete L[b],I(a))}}}}function qa(a,c){if(c.indexOf(",")>=0)h(c.split(","),function(){qa(a,this)});else{var g=a[ma]||null;if(g){var b=L[g][c];if(L[g]&&b&&b.length>0)b[0]()}}}function $(a,c,g){c=/^\d{2,}$/.test(c)?c:c.toUpperCase().charCodeAt(0);
+E(a,"keydown",function(b){b.ctrlKey&&b.which==c&&!b.shiftKey&&!b.altKey&&(g.call(a),b.stop())})}function M(a){for(var c={},g=/\s*([\w\-]+)\s*:([^;]*)(;|$)/g,b;b=g.exec(a);){var d=m(b[1].toLowerCase());b=m(r(b[2]));c[d]=b}return c}function K(a){for(var c={},g=/\s+(?:([\w\-:]+)|(?:([\w\-:]+)=([^\s"'<>]+))|(?:([\w\-:"]+)="([^"]*)")|(?:([\w\-:"]+)='([^']*)'))(?=(?:\s|\/|>)+)/g,b;b=g.exec(a);){var d=(b[1]||b[2]||b[4]||b[6]).toLowerCase();c[d]=(b[2]?b[3]:b[4]?b[5]:b[7])||""}return c}function O(a,c){return a=
+/\s+class\s*=/.test(a)?a.replace(/(\s+class=["']?)([^"']*)(["']?[\s>])/,function(a,b,d,k){return(" "+d+" ").indexOf(" "+c+" ")<0?d===""?b+c+k:b+d+" "+c+k:a}):a.substr(0,a.length-1)+' class="'+c+'">'}function Q(a){var c="";h(M(a),function(a,b){c+=a+":"+b+";"});return c}function R(a,c,g,b){function t(a){for(var a=a.split("/"),c=[],g=0,b=a.length;g<b;g++){var d=a[g];d==".."?c.length>0&&c.pop():d!==""&&d!="."&&c.push(d)}return"/"+c.join("/")}function k(c,g){if(a.substr(0,c.length)===c){for(var d=[],t=
+0;t<g;t++)d.push("..");t=".";d.length>0&&(t+="/"+d.join("/"));b=="/"&&(t+="/");return t+a.substr(c.length)}else if(i=/^(.*)\//.exec(c))return k(i[1],++g)}c=q(c,"").toLowerCase();a.substr(0,5)!="data:"&&(a=a.replace(/([^:])\/\//g,"$1/"));if(e(c,["absolute","relative","domain"])<0)return a;g=g||location.protocol+"//"+location.host;if(b===d)var w=location.pathname.match(/^(\/.*)\//),b=w?w[1]:"";var i;if(i=/^(\w+:\/\/[^\/]*)/.exec(a)){if(i[1]!==g)return a}else if(/^\w+:/.test(a))return a;/^\//.test(a)?
+a=g+t(a.substr(1)):/^\w+:\/\//.test(a)||(a=g+t(b+"/"+a));c==="relative"?a=k(g+b,0).substr(2):c==="absolute"&&a.substr(0,g.length)===g&&(a=a.substr(g.length));return a}function H(a,c,g,b,d){a==null&&(a="");var g=g||"",b=q(b,!1),d=q(d,"\t"),k="xx-small,x-small,small,medium,large,x-large,xx-large".split(","),a=a.replace(/(<(?:pre|pre\s[^>]*)>)([\s\S]*?)(<\/pre>)/ig,function(a,c,g,b){return c+g.replace(/<(?:br|br\s[^>]*)>/ig,"\n")+b}),a=a.replace(/<(?:br|br\s[^>]*)\s*\/?>\s*<\/p>/ig,"</p>"),a=a.replace(/(<(?:p|p\s[^>]*)>)\s*(<\/p>)/ig,
+"$1<br />$2"),a=a.replace(/\u200B/g,""),a=a.replace(/\u00A9/g,"&copy;"),a=a.replace(/\u00AE/g,"&reg;"),a=a.replace(/<[^>]+/g,function(a){return a.replace(/\s+/g," ")}),w={};c&&(h(c,function(a,c){for(var g=a.split(","),b=0,d=g.length;b<d;b++)w[g[b]]=z(c)}),w.script||(a=a.replace(/(<(?:script|script\s[^>]*)>)([\s\S]*?)(<\/script>)/ig,"")),w.style||(a=a.replace(/(<(?:style|style\s[^>]*)>)([\s\S]*?)(<\/style>)/ig,"")));var i=[],a=a.replace(/(\s*)<(\/)?([\w\-:]+)((?:\s+|(?:\s+[\w\-:]+)|(?:\s+[\w\-:]+=[^\s"'<>]+)|(?:\s+[\w\-:"]+="[^"]*")|(?:\s+[\w\-:"]+='[^']*'))*)(\/)?>(\s*)/g,
+function(a,f,n,l,o,j,s){var f=f||"",n=n||"",m=l.toLowerCase(),r=o||"",l=j?" "+j:"",s=s||"";if(c&&!w[m])return"";l===""&&hb[m]&&(l=" /");ib[m]&&(f&&(f=" "),s&&(s=" "));Ma[m]&&(n?s="\n":f="\n");b&&m=="br"&&(s="\n");if(jb[m]&&!Ma[m])if(b){n&&i.length>0&&i[i.length-1]===m?i.pop():i.push(m);s=f="\n";o=0;for(j=n?i.length:i.length-1;o<j;o++)f+=d,n||(s+=d);l?i.pop():n||(s+=d)}else f=s="";if(r!==""){var p=K(a);if(m==="font"){var v={},q="";h(p,function(a,c){if(a==="color")v.color=c,delete p[a];a==="size"&&
+(v["font-size"]=k[parseInt(c,10)-1]||"",delete p[a]);a==="face"&&(v["font-family"]=c,delete p[a]);a==="style"&&(q=c)});q&&!/;$/.test(q)&&(q+=";");h(v,function(a,c){c!==""&&(/\s/.test(c)&&(c="'"+c+"'"),q+=a+":"+c+";")});p.style=q}h(p,function(a,b){Lb[a]&&(p[a]=a);e(a,["src","href"])>=0&&(p[a]=R(b,g));(c&&a!=="style"&&!w[m]["*"]&&!w[m][a]||m==="body"&&a==="contenteditable"||/^kindeditor_\d+$/.test(a))&&delete p[a];if(a==="style"&&b!==""){var d=M(b);h(d,function(a){c&&!w[m].style&&!w[m]["."+a]&&delete d[a]});
+var V="";h(d,function(a,c){V+=a+":"+c+";"});p.style=V}});r="";h(p,function(a,c){a==="style"&&c===""||(c=c.replace(/"/g,"&quot;"),r+=" "+a+'="'+c+'"')})}m==="font"&&(m="span");return f+"<"+n+m+r+l+">"+s}),a=a.replace(/(<(?:pre|pre\s[^>]*)>)([\s\S]*?)(<\/pre>)/ig,function(a,c,g,b){return c+g.replace(/\n/g,'<span id="__kindeditor_pre_newline__">\n')+b}),a=a.replace(/\n\s*\n/g,"\n"),a=a.replace(/<span id="__kindeditor_pre_newline__">\n/g,"\n");return m(a)}function U(a,c){a=a.replace(/<meta[\s\S]*?>/ig,
+"").replace(/<![\s\S]*?>/ig,"").replace(/<style[^>]*>[\s\S]*?<\/style>/ig,"").replace(/<script[^>]*>[\s\S]*?<\/script>/ig,"").replace(/<w:[^>]+>[\s\S]*?<\/w:[^>]+>/ig,"").replace(/<o:[^>]+>[\s\S]*?<\/o:[^>]+>/ig,"").replace(/<xml>[\s\S]*?<\/xml>/ig,"").replace(/<(?:table|td)[^>]*>/ig,function(a){return a.replace(/border-bottom:([#\w\s]+)/ig,"border:$1")});return H(a,c)}function W(a){if(/\.(rm|rmvb)(\?|$)/i.test(a))return"audio/x-pn-realaudio-plugin";if(/\.(swf|flv)(\?|$)/i.test(a))return"application/x-shockwave-flash";
+return"video/x-ms-asf-plugin"}function S(a){return K(unescape(a))}function Na(a){var c="<embed ";h(a,function(a,b){c+=a+'="'+b+'" '});c+="/>";return c}function kb(a,c){var g=c.width,b=c.height,d=c.type||W(c.src),k=Na(c),w="";/\D/.test(g)?w+="width:"+g+";":g>0&&(w+="width:"+g+"px;");/\D/.test(b)?w+="height:"+b+";":b>0&&(w+="height:"+b+"px;");g=/realaudio/i.test(d)?"ke-rm":/flash/i.test(d)?"ke-flash":"ke-media";g='<img class="'+g+'" src="'+a+'" ';w!==""&&(g+='style="'+w+'" ');g+='data-ke-tag="'+escape(k)+
+'" alt="" />';return g}function Da(a,c){if(a.nodeType==9&&c.nodeType!=9)return!0;for(;c=c.parentNode;)if(c==a)return!0;return!1}function Ea(a,c){var c=c.toLowerCase(),g=null;if(!Mb&&a.nodeName.toLowerCase()!="script"){var b=a.ownerDocument.createElement("div");b.appendChild(a.cloneNode(!1));b=K(v(b.innerHTML));c in b&&(g=b[c])}else try{g=a.getAttribute(c,2)}catch(d){g=a.getAttribute(c,1)}c==="style"&&g!==null&&(g=Q(g));return g}function Fa(a,c){function g(a){if(typeof a!="string")return a;return a.replace(/([^\w\-])/g,
+"\\$1")}function b(a,c){return a==="*"||a.toLowerCase()===g(c.toLowerCase())}function d(a,c,g){var t=[];(a=(g.ownerDocument||g).getElementById(a.replace(/\\/g,"")))&&b(c,a.nodeName)&&Da(g,a)&&t.push(a);return t}function k(a,c,g){var d=g.ownerDocument||g,t=[],k,w,i;if(g.getElementsByClassName){d=g.getElementsByClassName(a.replace(/\\/g,""));k=0;for(w=d.length;k<w;k++)i=d[k],b(c,i.nodeName)&&t.push(i)}else if(d.querySelectorAll){d=d.querySelectorAll((g.nodeName!=="#document"?g.nodeName+" ":"")+c+"."+
+a);k=0;for(w=d.length;k<w;k++)i=d[k],Da(g,i)&&t.push(i)}else{d=g.getElementsByTagName(c);a=" "+a+" ";k=0;for(w=d.length;k<w;k++)if(i=d[k],i.nodeType==1)(c=i.className)&&(" "+c+" ").indexOf(a)>-1&&t.push(i)}return t}function w(a,c,b,d){for(var t=[],b=d.getElementsByTagName(b),V=0,k=b.length;V<k;V++)d=b[V],d.nodeType==1&&(c===null?Ea(d,a)!==null&&t.push(d):c===g(Ea(d,a))&&t.push(d));return t}function i(a,c){var g=[],e,f=(e=/^((?:\\.|[^.#\s\[<>])+)/.exec(a))?e[1]:"*";if(e=/#((?:[\w\-]|\\.)+)$/.exec(a))g=
+d(e[1],f,c);else if(e=/\.((?:[\w\-]|\\.)+)$/.exec(a))g=k(e[1],f,c);else if(e=/\[((?:[\w\-]|\\.)+)\]/.exec(a))g=w(e[1].toLowerCase(),null,f,c);else if(e=/\[((?:[\w\-]|\\.)+)\s*=\s*['"]?((?:\\.|[^'"]+)+)['"]?\]/.exec(a)){g=e[1].toLowerCase();e=e[2];if(g==="id")f=d(e,f,c);else if(g==="class")f=k(e,f,c);else if(g==="name"){g=[];e=(c.ownerDocument||c).getElementsByName(e.replace(/\\/g,""));for(var Z,h=0,l=e.length;h<l;h++)Z=e[h],b(f,Z.nodeName)&&Da(c,Z)&&Z.getAttribute("name")!==null&&g.push(Z);f=g}else f=
+w(g,e,f,c);g=f}else{f=c.getElementsByTagName(f);Z=0;for(h=f.length;Z<h;Z++)e=f[Z],e.nodeType==1&&g.push(e)}return g}var f=a.split(",");if(f.length>1){var n=[];h(f,function(){h(Fa(this,c),function(){e(this,n)<0&&n.push(this)})});return n}for(var c=c||document,f=[],l,o=/((?:\\.|[^\s>])+|[\s>])/g;l=o.exec(a);)l[1]!==" "&&f.push(l[1]);l=[];if(f.length==1)return i(f[0],c);var o=!1,m,s,j,r,p,v,q,B,E,u;v=0;for(lenth=f.length;v<lenth;v++)if(m=f[v],m===">")o=!0;else{if(v>0){s=[];q=0;for(E=l.length;q<E;q++){r=
+l[q];j=i(m,r);B=0;for(u=j.length;B<u;B++)p=j[B],o?r===p.parentNode&&s.push(p):s.push(p)}l=s}else l=i(m,c);if(l.length===0)return[]}return l}function ia(a){if(!a)return document;return a.ownerDocument||a.document||a}function ja(a){if(!a)return b;a=ia(a);return a.parentWindow||a.defaultView}function Nb(a,c){if(a.nodeType==1){var g=ia(a);try{a.innerHTML='<img id="__kindeditor_temp_tag__" width="0" height="0" style="display:none;" />'+c;var b=g.getElementById("__kindeditor_temp_tag__");b.parentNode.removeChild(b)}catch(d){i(a).empty(),
+i("@"+c,g).each(function(){a.appendChild(this)})}}}function Oa(a,c,g){F&&N<8&&c.toLowerCase()=="class"&&(c="className");a.setAttribute(c,""+g)}function Pa(a){if(!a||!a.nodeName)return"";return a.nodeName.toLowerCase()}function Ob(a,c){var g=ja(a),b=p(c),d="";g.getComputedStyle?(g=g.getComputedStyle(a,null),d=g[b]||g.getPropertyValue(c)||a.style[b]):a.currentStyle&&(d=a.currentStyle[b]||a.style[b]);return d}function X(a){a=a||document;return da?a.body:a.documentElement}function na(a){var a=a||document,
+c;F||Pb||Qa?(c=X(a).scrollLeft,a=X(a).scrollTop):(c=ja(a).scrollX,a=ja(a).scrollY);return{x:c,y:a}}function P(a){this.init(a)}function lb(a){a.collapsed=a.startContainer===a.endContainer&&a.startOffset===a.endOffset;return a}function Ra(a,c,g){function b(d,t,V){var k=d.nodeValue.length,i;c&&(i=d.cloneNode(!0),i=t>0?i.splitText(t):i,V<k&&i.splitText(V-t));if(g){var w=d;t>0&&(w=d.splitText(t),a.setStart(d,t));V<k&&(d=w.splitText(V-t),a.setEnd(d,0));e.push(w)}return i}function d(){g&&a.up().collapse(!0);
+for(var c=0,b=e.length;c<b;c++){var t=e[c];t.parentNode&&t.parentNode.removeChild(t)}}function k(d,t){for(var m=d.firstChild,s;m;){s=(new aa(i)).selectNode(m);h=s.compareBoundaryPoints(ra,a);h>=0&&l<=0&&(l=s.compareBoundaryPoints(sa,a));l>=0&&n<=0&&(n=s.compareBoundaryPoints(oa,a));n>=0&&o<=0&&(o=s.compareBoundaryPoints(ta,a));if(o>=0)return!1;s=m.nextSibling;if(h>0)if(m.nodeType==1)if(l>=0&&n<=0)c&&t.appendChild(m.cloneNode(!0)),g&&e.push(m);else{var j;c&&(j=m.cloneNode(!1),t.appendChild(j));if(k(m,
+j)===!1)return!1}else if(m.nodeType==3&&(m=m==f.startContainer?b(m,f.startOffset,m.nodeValue.length):m==f.endContainer?b(m,0,f.endOffset):b(m,0,m.nodeValue.length),c))try{t.appendChild(m)}catch(r){}m=s}}var i=a.doc,e=[],f=a.cloneRange().down(),h=-1,l=-1,n=-1,o=-1,m=a.commonAncestor(),s=i.createDocumentFragment();if(m.nodeType==3)return m=b(m,a.startOffset,a.endOffset),c&&s.appendChild(m),d(),c?s:a;k(m,s);g&&a.up().collapse(!0);for(var m=0,j=e.length;m<j;m++){var r=e[m];r.parentNode&&r.parentNode.removeChild(r)}return c?
+s:a}function ua(a,c){for(var g=c;g;){var b=i(g);if(b.name=="marquee"||b.name=="select")return;g=g.parentNode}try{a.moveToElementText(c)}catch(d){}}function mb(a,c){var g=a.parentElement().ownerDocument,b=a.duplicate();b.collapse(c);var d=b.parentElement(),k=d.childNodes;if(k.length===0)return{node:d.parentNode,offset:i(d).index()};var w=g,e=0,f=-1,h=a.duplicate();ua(h,d);for(var l=0,n=k.length;l<n;l++){var o=k[l],f=h.compareEndPoints("StartToStart",b);if(f===0)return{node:o.parentNode,offset:l};if(o.nodeType==
+1){var m=a.duplicate(),s,j=i(o),r=o;j.isControl()&&(s=g.createElement("span"),j.after(s),r=s,e+=j.text().replace(/\r\n|\n|\r/g,"").length);ua(m,r);h.setEndPoint("StartToEnd",m);f>0?e+=m.text.replace(/\r\n|\n|\r/g,"").length:e=0;s&&i(s).remove()}else o.nodeType==3&&(h.moveStart("character",o.nodeValue.length),e+=o.nodeValue.length);f<0&&(w=o)}if(f<0&&w.nodeType==1)return{node:d,offset:i(d.lastChild).index()+1};if(f>0)for(;w.nextSibling&&w.nodeType==1;)w=w.nextSibling;h=a.duplicate();ua(h,d);h.setEndPoint("StartToEnd",
+b);e-=h.text.replace(/\r\n|\n|\r/g,"").length;if(f>0&&w.nodeType==3)for(g=w.previousSibling;g&&g.nodeType==3;)e-=g.nodeValue.length,g=g.previousSibling;return{node:w,offset:e}}function nb(a,c){var g=a.ownerDocument||a,b=g.body.createTextRange();if(g==a)return b.collapse(!0),b;if(a.nodeType==1&&a.childNodes.length>0){var d=a.childNodes,k;c===0?(k=d[0],d=!0):(k=d[c-1],d=!1);if(!k)return b;if(i(k).name==="head")return c===1&&(d=!0),c===2&&(d=!1),b.collapse(d),b;if(k.nodeType==1){var w=i(k),e;w.isControl()&&
+(e=g.createElement("span"),d?w.before(e):w.after(e),k=e);ua(b,k);b.collapse(d);e&&i(e).remove();return b}a=k;c=d?0:k.nodeValue.length}g=g.createElement("span");i(a).before(g);ua(b,g);b.moveStart("character",c);i(g).remove();return b}function ob(a){function c(a){if(i(a.node).name=="tr")a.node=a.node.cells[a.offset],a.offset=0}var g;if(Y){if(a.item)return g=ia(a.item(0)),g=new aa(g),g.selectNode(a.item(0)),g;g=a.parentElement().ownerDocument;var b=mb(a,!0),a=mb(a,!1);c(b);c(a);g=new aa(g);g.setStart(b.node,
+b.offset);g.setEnd(a.node,a.offset);return g}b=a.startContainer;g=b.ownerDocument||b;g=new aa(g);g.setStart(b,a.startOffset);g.setEnd(a.endContainer,a.endOffset);return g}function aa(a){this.init(a)}function Sa(a){if(!a.nodeName)return a.constructor===aa?a:ob(a);return new aa(a)}function ea(a,c,g){try{a.execCommand(c,!1,g)}catch(b){}}function pb(a,c){var g="";try{g=a.queryCommandValue(c)}catch(b){}typeof g!=="string"&&(g="");return g}function Ta(a){var c=ja(a);return Y?a.selection:c.getSelection()}
+function qb(a){var c={},g,b;h(a,function(a,d){g=a.split(",");for(var i=0,e=g.length;i<e;i++)b=g[i],c[b]=d});return c}function Ua(a,c){return rb(a,c,"*")||rb(a,c)}function rb(a,c,g){g=g||a.name;if(a.type!==1)return!1;c=qb(c);if(!c[g])return!1;for(var g=c[g].split(","),c=0,b=g.length;c<b;c++){var d=g[c];if(d==="*")return!0;var k=/^(\.?)([^=]+)(?:=([^=]*))?$/.exec(d),i=k[1]?"css":"attr",d=k[2],k=k[3]||"";if(k===""&&a[i](d)!=="")return!0;if(k!==""&&a[i](d)===k)return!0}return!1}function Va(a,c){a.type==
+1&&(sb(a,c,"*"),sb(a,c))}function sb(a,c,g){g=g||a.name;if(a.type===1&&(c=qb(c),c[g])){for(var g=c[g].split(","),c=!1,b=0,d=g.length;b<d;b++){var k=g[b];if(k==="*"){c=!0;break}var i=/^(\.?)([^=]+)(?:=([^=]*))?$/.exec(k),k=i[2];i[1]?(k=p(k),a[0].style[k]&&(a[0].style[k]="")):a.removeAttr(k)}c&&a.remove(!0)}}function Wa(a){for(;a.first();)a=a.first();return a}function pa(a){if(a.type!=1||a.isSingle())return!1;return a.html().replace(/<[^>]+>/g,"")===""}function Qb(a,c,g){h(c,function(c,g){c!=="style"&&
+a.attr(c,g)});h(g,function(c,g){a.css(c,g)})}function va(a){this.init(a)}function tb(a){a.nodeName&&(a=ia(a),a=Sa(a).selectNodeContents(a.body).collapse(!1));return new va(a)}function Xa(a){var c=a.moveEl,g=a.moveFn,b=a.clickEl||c,t=a.beforeDrag,k=[document];(a.iframeFix===d||a.iframeFix)&&i("iframe").each(function(){if(!/^https?:\/\//.test(R(this.src||"","absolute"))){var a;try{a=Ya(this)}catch(c){}if(a){var g=i(this).pos();i(a).data("pos-x",g.x);i(a).data("pos-y",g.y);k.push(a)}}});b.mousedown(function(a){function d(a){a.preventDefault();
+var c=i(ia(a.target)),t=fa((c.data("pos-x")||0)+a.pageX-j),a=fa((c.data("pos-y")||0)+a.pageY-r);g.call(b,n,o,m,s,t,a)}function e(a){a.preventDefault()}function f(a){a.preventDefault();i(k).unbind("mousemove",d).unbind("mouseup",f).unbind("selectstart",e);h.releaseCapture&&h.releaseCapture()}a.stopPropagation();var h=b.get(),n=l(c.css("left")),o=l(c.css("top")),m=c.width(),s=c.height(),j=a.pageX,r=a.pageY;t&&t();i(k).mousemove(d).mouseup(f).bind("selectstart",e);h.setCapture&&h.setCapture()})}function ga(a){this.init(a)}
+function Za(a){return new ga(a)}function Ya(a){a=i(a)[0];return a.contentDocument||a.contentWindow.document}function Rb(a,c,g,b){var d=[$a===""?"<html>":'<html dir="'+$a+'">','<head><meta charset="utf-8" /><title></title>',"<style>","html {margin:0;padding:0;}","body {margin:0;padding:5px;}",'body, td {font:12px/1.5 "sans serif",tahoma,verdana,helvetica;}',"body, p, div {word-wrap: break-word;}","p {margin:5px 0;}","table {border-collapse:collapse;}","img {border:0;}","noscript {display:none;}","table.ke-zeroborder td {border:1px dotted #AAA;}",
+"img.ke-flash {","\tborder:1px solid #AAA;","\tbackground-image:url("+a+"common/flash.gif);","\tbackground-position:center center;","\tbackground-repeat:no-repeat;","\twidth:100px;","\theight:100px;","}","img.ke-rm {","\tborder:1px solid #AAA;","\tbackground-image:url("+a+"common/rm.gif);","\tbackground-position:center center;","\tbackground-repeat:no-repeat;","\twidth:100px;","\theight:100px;","}","img.ke-media {","\tborder:1px solid #AAA;","\tbackground-image:url("+a+"common/media.gif);","\tbackground-position:center center;",
+"\tbackground-repeat:no-repeat;","\twidth:100px;","\theight:100px;","}","img.ke-anchor {","\tborder:1px dashed #666;","\twidth:16px;","\theight:16px;","}",".ke-script, .ke-noscript, .ke-display-none {","\tdisplay:none;","\tfont-size:0;","\twidth:0;","\theight:0;","}",".ke-pagebreak {","\tborder:1px dotted #AAA;","\tfont-size:0;","\theight:2px;","}","</style>"];f(g)||(g=[g]);h(g,function(a,c){c&&d.push('<link href="'+c+'" rel="stylesheet" />')});b&&d.push("<style>"+b+"</style>");d.push("</head><body "+
+(c?'class="'+c+'"':"")+"></body></html>");return d.join("\n")}function wa(a,c){if(a.hasVal()){if(c===d){var g=a.val();return g=g.replace(/(<(?:p|p\s[^>]*)>) *(<\/p>)/ig,"")}return a.val(c)}return a.html(c)}function xa(a){this.init(a)}function ub(a){return new xa(a)}function vb(a,c){var g=this.get(a);g&&!g.hasClass("ke-disabled")&&c(g)}function Ga(a){this.init(a)}function wb(a){return new Ga(a)}function ya(a){this.init(a)}function ab(a){return new ya(a)}function za(a){this.init(a)}function xb(a){return new za(a)}
+function bb(a){this.init(a)}function Aa(a){this.init(a)}function yb(a){return new Aa(a)}function cb(a,c){var g=document.getElementsByTagName("head")[0]||(da?document.body:document.documentElement),b=document.createElement("script");g.appendChild(b);b.src=a;b.charset="utf-8";b.onload=b.onreadystatechange=function(){if(!this.readyState||this.readyState==="loaded")c&&c(),b.onload=b.onreadystatechange=null,g.removeChild(b)}}function zb(a){var c=a.indexOf("?");return c>0?a.substr(0,c):a}function db(a){for(var c=
+document.getElementsByTagName("head")[0]||(da?document.body:document.documentElement),g=document.createElement("link"),b=zb(R(a,"absolute")),d=i('link[rel="stylesheet"]',c),k=0,w=d.length;k<w;k++)if(zb(R(d[k].href,"absolute"))===b)return;c.appendChild(g);g.href=a;g.rel="stylesheet"}function Ab(a,c){if(a===d)return ba;if(!c)return ba[a];ba[a]=c}function Bb(a){var c,g="core";if(c=/^(\w+)\.(\w+)$/.exec(a))g=c[1],a=c[2];return{ns:g,key:a}}function Cb(a,c){c=c===d?i.options.langType:c;if(typeof a==="string"){if(!ca[c])return"no language";
+var g=a.length-1;if(a.substr(g)===".")return ca[c][a.substr(0,g)];g=Bb(a);return ca[c][g.ns][g.key]}h(a,function(a,g){var b=Bb(a);ca[c]||(ca[c]={});ca[c][b.ns]||(ca[c][b.ns]={});ca[c][b.ns][b.key]=g})}function Ha(a,c){if(!a.collapsed){var a=a.cloneRange().up(),g=a.startContainer,b=a.startOffset;if(ka||a.isControl())if((g=i(g.childNodes[b]))&&g.name=="img"&&c(g))return g}}function Sb(){var a=this;i(a.edit.doc).contextmenu(function(c){a.menu&&a.hideMenu();if(a.useContextmenu){if(a._contextmenus.length!==
+0){var g=0,b=[];for(h(a._contextmenus,function(){if(this.title=="-")b.push(this);else if(this.cond&&this.cond()&&(b.push(this),this.width&&this.width>g))g=this.width});b.length>0&&b[0].title=="-";)b.shift();for(;b.length>0&&b[b.length-1].title=="-";)b.pop();var d=null;h(b,function(a){this.title=="-"&&d.title=="-"&&delete b[a];d=this});if(b.length>0){c.preventDefault();var k=i(a.edit.iframe).pos(),w=ab({x:k.x+c.clientX,y:k.y+c.clientY,width:g,css:{visibility:"hidden"},shadowMode:a.shadowMode});h(b,
+function(){this.title&&w.addItem(this)});var k=X(w.doc),e=w.div.height();c.clientY+e>=k.clientHeight-100&&w.pos(w.x,l(w.y)-e);w.div.css("visibility","visible");a.menu=w}}}else c.preventDefault()})}function Tb(){function a(a){for(a=i(a.commonAncestor());a;){if(a.type==1&&!a.isStyle())break;a=a.parent()}return a.name}var c=this,g=c.edit.doc,b=c.newlineTag;if(!(F&&b!=="br")&&(!la||!(N<3&&b!=="p"))&&!(Qa&&N<9)){var d=z("h1,h2,h3,h4,h5,h6,pre,li"),k=z("p,h1,h2,h3,h4,h5,h6,pre,li,blockquote");i(g).keydown(function(i){if(!(i.which!=
+13||i.shiftKey||i.ctrlKey||i.altKey)){c.cmd.selection();var e=a(c.cmd.range);e=="marquee"||e=="select"||(b==="br"&&!d[e]?(i.preventDefault(),c.insertHtml("<br />"+(F&&N<9?"":"\u200b"))):k[e]||ea(g,"formatblock","<p>"))}});i(g).keyup(function(d){if(!(d.which!=13||d.shiftKey||d.ctrlKey||d.altKey)&&b!="br")if(la){var d=c.cmd.commonAncestor("p"),t=c.cmd.commonAncestor("a");t&&t.text()==""&&(t.remove(!0),c.cmd.range.selectNodeContents(d[0]).collapse(!0),c.cmd.select())}else if(c.cmd.selection(),d=a(c.cmd.range),
+!(d=="marquee"||d=="select"))if(k[d]||ea(g,"formatblock","<p>"),d=c.cmd.commonAncestor("div")){for(var t=i("<p></p>"),e=d[0].firstChild;e;){var f=e.nextSibling;t.append(e);e=f}d.before(t);d.remove();c.cmd.range.selectNodeContents(t[0]);c.cmd.select()}})}}function Ub(){var a=this,c=a.edit.doc;i(c).keydown(function(g){if(g.which==9)if(g.preventDefault(),a.afterTab)a.afterTab.call(a,g);else{var g=a.cmd,b=g.range;b.shrink();b.collapsed&&b.startContainer.nodeType==1&&(b.insertNode(i("@&nbsp;",c)[0]),g.select());
+a.insertHtml("&nbsp;&nbsp;&nbsp;&nbsp;")}})}function Vb(){var a=this;i(a.edit.textarea[0],a.edit.win).focus(function(c){a.afterFocus&&a.afterFocus.call(a,c)}).blur(function(c){a.afterBlur&&a.afterBlur.call(a,c)})}function ha(a){return m(a.replace(/<span [^>]*id="?__kindeditor_bookmark_\w+_\d+__"?[^>]*><\/span>/ig,""))}function Ia(a){return a.replace(/<div[^>]+class="?__kindeditor_paste__"?[^>]*>[\s\S]*?<\/div>/ig,"")}function Db(a,c){if(a.length===0)a.push(c);else{var g=a[a.length-1];ha(c.html)!==
+ha(g.html)&&a.push(c)}}function Eb(a,c){var g=this.edit,b=g.doc.body,d,k;if(a.length===0)return this;g.designMode?(d=this.cmd.range,k=d.createBookmark(!0),k.html=b.innerHTML):k={html:b.innerHTML};Db(c,k);var e=a.pop();ha(k.html)===ha(e.html)&&a.length>0&&(e=a.pop());g.designMode?(g.html(e.html),e.start&&(d.moveToBookmark(e),this.select())):i(b).html(ha(e.html));return this}function Ba(a){function c(a,c){Ba.prototype[a]===d&&(g[a]=c);g.options[a]=c}var g=this;g.options={};h(a,function(g){c(g,a[g])});
+h(i.options,function(a,b){g[a]===d&&c(a,b)});var b=i(g.srcElement||"<textarea/>");if(!g.width)g.width=b[0].style.width||b.width();if(!g.height)g.height=b[0].style.height||b.height();c("width",q(g.width,g.minWidth));c("height",q(g.height,g.minHeight));c("width",o(g.width));c("height",o(g.height));if(Wb&&(!Xb||N<534))g.designMode=!1;g.srcElement=b;g.initContent="";g.plugin={};g.isCreated=!1;g._handlers={};g._contextmenus=[];g._undoStack=[];g._redoStack=[];g._firstAddBookmark=!0;g.menu=g.contextmenu=
+null;g.dialogs=[]}function Fb(a,c){function g(a){h(ba,function(c,g){j(g)&&g.call(a,KindEditor)});return a.create()}c=c||{};c.basePath=q(c.basePath,i.basePath);c.themesPath=q(c.themesPath,c.basePath+"themes/");c.langPath=q(c.langPath,c.basePath+"lang/");c.pluginsPath=q(c.pluginsPath,c.basePath+"plugins/");if(q(c.loadStyleMode,i.options.loadStyleMode)){var b=q(c.themeType,i.options.themeType);db(c.themesPath+"default/default.css");db(c.themesPath+b+"/"+b+".css")}if((b=i(a))&&b.length!==0){if(b.length>
+1)return b.each(function(){Fb(this,c)}),_instances[0];c.srcElement=b[0];var d=new Ba(c);_instances.push(d);if(ca[d.langType])return g(d);cb(d.langPath+d.langType+".js?ver="+encodeURIComponent(i.DEBUG?Ja:Ka),function(){g(d)});return d}}function Ca(a,c){i(a).each(function(a,b){i.each(_instances,function(a,g){if(g&&g.srcElement[0]==b)return c.call(g,a),!1})})}if(!b.KindEditor){if(!b.console)b.console={};if(!console.log)console.log=function(){};var Ka="4.1.10 (2013-11-23)",J=navigator.userAgent.toLowerCase(),
+F=J.indexOf("msie")>-1&&J.indexOf("opera")==-1,Pb=J.indexOf("msie")==-1&&J.indexOf("trident")>-1,la=J.indexOf("gecko")>-1&&J.indexOf("khtml")==-1,ka=J.indexOf("applewebkit")>-1,Qa=J.indexOf("opera")>-1,Wb=J.indexOf("mobile")>-1,Xb=/ipad|iphone|ipod/.test(J),da=document.compatMode!="CSS1Compat",Y=!b.getSelection,N=(J=/(?:msie|firefox|webkit|opera)[\/:\s](\d+)/.exec(J))?J[1]:"0",Ja=(new Date).getTime(),fa=Math.round,i={DEBUG:!1,VERSION:Ka,IE:F,GECKO:la,WEBKIT:ka,OPERA:Qa,V:N,TIME:Ja,each:h,isArray:f,
+isFunction:j,inArray:e,inString:n,trim:m,addUnit:o,removeUnit:l,escape:s,unescape:v,toCamel:p,toHex:r,toMap:z,toArray:D,undef:q,invalidUrl:function(a){return!a||/[<>"]/.test(a)},addParam:function(a,c){return a.indexOf("?")>=0?a+"&"+c:a+"?"+c},extend:A,json:B},ib=z("a,abbr,acronym,b,basefont,bdo,big,br,button,cite,code,del,dfn,em,font,i,img,input,ins,kbd,label,map,q,s,samp,select,small,span,strike,strong,sub,sup,textarea,tt,u,var"),jb=z("address,applet,blockquote,body,center,dd,dir,div,dl,dt,fieldset,form,frameset,h1,h2,h3,h4,h5,h6,head,hr,html,iframe,ins,isindex,li,map,menu,meta,noframes,noscript,object,ol,p,pre,script,style,table,tbody,td,tfoot,th,thead,title,tr,ul"),
+hb=z("area,base,basefont,br,col,frame,hr,img,input,isindex,link,meta,param,embed"),Gb=z("b,basefont,big,del,em,font,i,s,small,span,strike,strong,sub,sup,u"),Yb=z("img,table,input,textarea,button"),Ma=z("pre,style,script"),La=z("html,head,body,td,tr,table,ol,ul,li");z("colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr");var Lb=z("checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected"),Hb=z("input,button,textarea,select");i.basePath=function(){for(var a=
+document.getElementsByTagName("script"),c,g=0,b=a.length;g<b;g++)if(c=a[g].src||"",/kindeditor[\w\-\.]*\.js/.test(c))return c.substring(0,c.lastIndexOf("/")+1);return""}();i.options={designMode:!0,fullscreenMode:!1,filterMode:!0,wellFormatMode:!0,shadowMode:!0,loadStyleMode:!0,basePath:i.basePath,themesPath:i.basePath+"themes/",langPath:i.basePath+"lang/",pluginsPath:i.basePath+"plugins/",themeType:"default",langType:"zh_CN",urlType:"",newlineTag:"p",resizeType:2,syncType:"form",pasteType:2,dialogAlignType:"page",
+useContextmenu:!0,fullscreenShortcut:!1,bodyClass:"ke-content",indentChar:"\t",cssPath:"",cssData:"",minWidth:650,minHeight:100,minChangeSize:50,zIndex:811213,items:["source","|","undo","redo","|","preview","print","template","code","cut","copy","paste","plainpaste","wordpaste","|","justifyleft","justifycenter","justifyright","justifyfull","insertorderedlist","insertunorderedlist","indent","outdent","subscript","superscript","clearhtml","quickformat","selectall","|","fullscreen","/","formatblock",
+"fontname","fontsize","|","forecolor","hilitecolor","bold","italic","underline","strikethrough","lineheight","removeformat","|","image","table","hr","emoticons","baidumap","pagebreak","anchor","link","unlink","|","about"],noDisableItems:["source","fullscreen"],colorTable:[["#E53333","#E56600","#FF9900","#64451D","#DFC5A4","#FFE500"],["#009900","#006600","#99BB00","#B8D100","#60D978","#00D5FF"],["#337FE5","#003399","#4C33E5","#9933E5","#CC33E5","#EE33EE"],
+["#FFFFFF","#CCCCCC","#999999","#666666","#333333","#000000"]],fontSizeTable:["9px","10px","12px","14px","16px","18px","24px","32px"],htmlTags:{font:["id","class","color","size","face",".background-color"],span:["id","class",".color",".background-color",".font-size",".font-family",".background",".font-weight",".font-style",".text-decoration",".vertical-align",".line-height"],div:["id","class","align",".border",".margin",".padding",".text-align",".color",".background-color",".font-size",".font-family",
+".font-weight",".background",".font-style",".text-decoration",".vertical-align",".margin-left"],table:["id","class","border","cellspacing","cellpadding","width","height","align","bordercolor",".padding",".margin",".border","bgcolor",".text-align",".color",".background-color",".font-size",".font-family",".font-weight",".font-style",".text-decoration",".background",".width",".height",".border-collapse"],"td,th":["id","class","align","valign","width","height","colspan","rowspan","bgcolor",".text-align",
+".color",".background-color",".font-size",".font-family",".font-weight",".font-style",".text-decoration",".vertical-align",".background",".border"],a:["id","class","href","target","name"],embed:["id","class","src","width","height","type","loop","autostart","quality",".width",".height","align","allowscriptaccess"],img:["id","class","src","width","height","border","alt","title","align",".width",".height",".border"],"p,ol,ul,li,blockquote,h1,h2,h3,h4,h5,h6":["id","class","align",".text-align",".color",
+".background-color",".font-size",".font-family",".background",".font-weight",".font-style",".text-decoration",".vertical-align",".text-indent",".margin-left"],pre:["id","class"],hr:["id","class",".page-break-after"],"br,tbody,tr,strong,b,sub,sup,em,i,u,strike,s,del":["id","class"],iframe:["id","class","src","frameborder","width","height",".width",".height"]},layout:'<div class="container"><div class="toolbar"></div><div class="edit"></div><div class="statusbar"></div></div>'};var fb=!1,Ib=z("8,9,13,32,46,48..57,59,61,65..90,106,109..111,188,190..192,219..222"),
+J=z("33..40"),eb={};h(Ib,function(a,c){eb[a]=c});h(J,function(a,c){eb[a]=c});var Zb="altKey,attrChange,attrName,bubbles,button,cancelable,charCode,clientX,clientY,ctrlKey,currentTarget,data,detail,eventPhase,fromElement,handler,keyCode,metaKey,newValue,offsetX,offsetY,originalTarget,pageX,pageY,prevValue,relatedNode,relatedTarget,screenX,screenY,shiftKey,srcElement,target,toElement,view,wheelDelta,which".split(",");A(u,{init:function(a,c){var g=this,b=a.ownerDocument||a.document||a;g.event=c;h(Zb,
+function(a,b){g[b]=c[b]});if(!g.target)g.target=g.srcElement||b;if(g.target.nodeType===3)g.target=g.target.parentNode;if(!g.relatedTarget&&g.fromElement)g.relatedTarget=g.fromElement===g.target?g.toElement:g.fromElement;if(g.pageX==null&&g.clientX!=null){var t=b.documentElement,b=b.body;g.pageX=g.clientX+(t&&t.scrollLeft||b&&b.scrollLeft||0)-(t&&t.clientLeft||b&&b.clientLeft||0);g.pageY=g.clientY+(t&&t.scrollTop||b&&b.scrollTop||0)-(t&&t.clientTop||b&&b.clientTop||0)}if(!g.which&&(g.charCode||g.charCode===
+0?g.charCode:g.keyCode))g.which=g.charCode||g.keyCode;if(!g.metaKey&&g.ctrlKey)g.metaKey=g.ctrlKey;if(!g.which&&g.button!==d)g.which=g.button&1?1:g.button&2?3:g.button&4?2:0;switch(g.which){case 186:g.which=59;break;case 187:case 107:case 43:g.which=61;break;case 189:case 45:g.which=109;break;case 42:g.which=106;break;case 47:g.which=111;break;case 78:g.which=110}g.which>=96&&g.which<=105&&(g.which-=48)},preventDefault:function(){var a=this.event;a.preventDefault?a.preventDefault():a.returnValue=
+!1},stopPropagation:function(){var a=this.event;a.stopPropagation?a.stopPropagation():a.cancelBubble=!0},stop:function(){this.preventDefault();this.stopPropagation()}});var ma="kindeditor_"+Ja,gb=0,L={},Jb=!1;F&&b.attachEvent("onunload",function(){h(L,function(a,c){c.el&&T(c.el)})});i.ctrl=$;i.ready=function(a){function c(){t||(t=!0,a(KindEditor),Jb=!0)}function g(){if(!t){try{document.documentElement.doScroll("left")}catch(a){setTimeout(g,100);return}c()}}function d(){document.readyState==="complete"&&
+c()}if(Jb)a(KindEditor);else{var t=!1;if(document.addEventListener)E(document,"DOMContentLoaded",c);else if(document.attachEvent){E(document,"readystatechange",d);var k=!1;try{k=b.frameElement==null}catch(i){}document.documentElement.doScroll&&k&&g()}E(b,"load",c)}};i.formatUrl=R;i.formatHtml=H;i.getCssList=M;i.getAttrList=K;i.mediaType=W;i.mediaAttrs=S;i.mediaEmbed=Na;i.mediaImg=kb;i.clearMsWord=U;i.tmpl=function(a,c){var g=new Function("obj","var p=[],print=function(){p.push.apply(p,arguments);};with(obj){p.push('"+
+a.replace(/[\r\t\n]/g," ").split("<%").join("\t").replace(/((^|%>)[^\t]*)'/g,"$1\r").replace(/\t=(.*?)%>/g,"',$1,'").split("\t").join("');").split("%>").join("p.push('").split("\r").join("\\'")+"');}return p.join('');");return c?g(c):g};J=document.createElement("div");J.setAttribute("className","t");var Mb=J.className!=="t";i.query=function(a,c){var g=Fa(a,c);return g.length>0?g[0]:null};i.queryAll=Fa;A(P,{init:function(a){for(var a=f(a)?a:[a],c=0,g=0,b=a.length;g<b;g++)a[g]&&(this[g]=a[g].constructor===
+P?a[g][0]:a[g],c++);this.length=c;this.doc=ia(this[0]);this.name=Pa(this[0]);this.type=this.length>0?this[0].nodeType:null;this.win=ja(this[0])},each:function(a){for(var c=0;c<this.length;c++)if(a.call(this[c],c,this[c])===!1)break;return this},bind:function(a,c){this.each(function(){E(this,a,c)});return this},unbind:function(a,c){this.each(function(){T(this,a,c)});return this},fire:function(a){if(this.length<1)return this;qa(this[0],a);return this},hasAttr:function(a){if(this.length<1)return!1;return!!Ea(this[0],
+a)},attr:function(a,c){var g=this;if(a===d)return K(g.outer());if(typeof a==="object")return h(a,function(a,c){g.attr(a,c)}),g;if(c===d)return c=g.length<1?null:Ea(g[0],a),c===null?"":c;g.each(function(){Oa(this,a,c)});return g},removeAttr:function(a){this.each(function(){var c=a;F&&N<8&&c.toLowerCase()=="class"&&(c="className");Oa(this,c,"");this.removeAttribute(c)});return this},get:function(a){if(this.length<1)return null;return this[a||0]},eq:function(a){if(this.length<1)return null;return this[a]?
+new P(this[a]):null},hasClass:function(a){if(this.length<1)return!1;return n(a,this[0].className," ")},addClass:function(a){this.each(function(){if(!n(a,this.className," "))this.className=m(this.className+" "+a)});return this},removeClass:function(a){this.each(function(){if(n(a,this.className," "))this.className=m(this.className.replace(RegExp("(^|\\s)"+a+"(\\s|$)")," "))});return this},html:function(a){if(a===d){if(this.length<1||this.type!=1)return"";return H(this[0].innerHTML)}this.each(function(){Nb(this,
+a)});return this},text:function(){if(this.length<1)return"";return F?this[0].innerText:this[0].textContent},hasVal:function(){if(this.length<1)return!1;return!!Hb[Pa(this[0])]},val:function(a){if(a===d){if(this.length<1)return"";return this.hasVal()?this[0].value:this.attr("value")}else return this.each(function(){Hb[Pa(this)]?this.value=a:Oa(this,"value",a)}),this},css:function(a,c){var g=this;if(a===d)return M(g.attr("style"));if(typeof a==="object")return h(a,function(a,c){g.css(a,c)}),g;if(c===
+d){if(g.length<1)return"";return g[0].style[p(a)]||Ob(g[0],a)||""}g.each(function(){this.style[p(a)]=c});return g},width:function(a){if(a===d){if(this.length<1)return 0;return this[0].offsetWidth}return this.css("width",o(a))},height:function(a){if(a===d){if(this.length<1)return 0;return this[0].offsetHeight}return this.css("height",o(a))},opacity:function(a){this.each(function(){this.style.opacity===d?this.style.filter=a==1?"":"alpha(opacity="+a*100+")":this.style.opacity=a==1?"":a});return this},
+data:function(a,c){a="kindeditor_data_"+a;if(c===d){if(this.length<1)return null;return this[0][a]}this.each(function(){this[a]=c});return this},pos:function(){var a=this[0],c=0,g=0;if(a)if(a.getBoundingClientRect)a=a.getBoundingClientRect(),g=na(this.doc),c=a.left+g.x,g=a.top+g.y;else for(;a;)c+=a.offsetLeft,g+=a.offsetTop,a=a.offsetParent;return{x:fa(c),y:fa(g)}},clone:function(a){if(this.length<1)return new P([]);return new P(this[0].cloneNode(a))},append:function(a){this.each(function(){this.appendChild&&
+this.appendChild(i(a)[0])});return this},appendTo:function(a){this.each(function(){i(a)[0].appendChild(this)});return this},before:function(a){this.each(function(){this.parentNode.insertBefore(i(a)[0],this)});return this},after:function(a){this.each(function(){this.nextSibling?this.parentNode.insertBefore(i(a)[0],this.nextSibling):this.parentNode.appendChild(i(a)[0])});return this},replaceWith:function(a){var c=[];this.each(function(g,b){T(b);var d=i(a)[0];b.parentNode.replaceChild(d,b);c.push(d)});
+return i(c)},empty:function(){this.each(function(a,c){for(var b=c.firstChild;b;){if(!c.parentNode)break;var d=b.nextSibling;b.parentNode.removeChild(b);b=d}});return this},remove:function(a){var c=this;c.each(function(b,d){if(d.parentNode){T(d);if(a)for(var i=d.firstChild;i;){var k=i.nextSibling;d.parentNode.insertBefore(i,d);i=k}d.parentNode.removeChild(d);delete c[b]}});c.length=0;return c},show:function(a){a===d&&(a=this._originDisplay||"");if(this.css("display")!="none")return this;return this.css("display",
+a)},hide:function(){if(this.length<1)return this;this._originDisplay=this[0].style.display;return this.css("display","none")},outer:function(){if(this.length<1)return"";var a=this.doc.createElement("div");a.appendChild(this[0].cloneNode(!0));return H(a.innerHTML)},isSingle:function(){return!!hb[this.name]},isInline:function(){return!!ib[this.name]},isBlock:function(){return!!jb[this.name]},isStyle:function(){return!!Gb[this.name]},isControl:function(){return!!Yb[this.name]},contains:function(a){if(this.length<
+1)return!1;return Da(this[0],i(a)[0])},parent:function(){if(this.length<1)return null;var a=this[0].parentNode;return a?new P(a):null},children:function(){if(this.length<1)return new P([]);for(var a=[],c=this[0].firstChild;c;)(c.nodeType!=3||m(c.nodeValue)!=="")&&a.push(c),c=c.nextSibling;return new P(a)},first:function(){var a=this.children();return a.length>0?a.eq(0):null},last:function(){var a=this.children();return a.length>0?a.eq(a.length-1):null},index:function(){if(this.length<1)return-1;for(var a=
+-1,c=this[0];c;)a++,c=c.previousSibling;return a},prev:function(){if(this.length<1)return null;var a=this[0].previousSibling;return a?new P(a):null},next:function(){if(this.length<1)return null;var a=this[0].nextSibling;return a?new P(a):null},scan:function(a,c){function b(d){for(d=c?d.firstChild:d.lastChild;d;){var i=c?d.nextSibling:d.previousSibling;if(a(d)===!1)return!1;if(b(d)===!1)return!1;d=i}}if(!(this.length<1))return c=c===d?!0:c,b(this[0]),this}});h("blur,focus,focusin,focusout,load,resize,scroll,unload,click,dblclick,mousedown,mouseup,mousemove,mouseover,mouseout,mouseenter,mouseleave,change,select,submit,keydown,keypress,keyup,error,contextmenu".split(","),
+function(a,c){P.prototype[c]=function(a){return a?this.bind(c,a):this.fire(c)}});J=i;i=function(a,c){function b(a){a[0]||(a=[]);return new P(a)}if(!(a===d||a===null)){if(typeof a==="string"){c&&(c=i(c)[0]);var e=a.length;a.charAt(0)==="@"&&(a=a.substr(1));if(a.length!==e||/<.+>/.test(a)){var e=(c?c.ownerDocument||c:document).createElement("div"),t=[];e.innerHTML='<img id="__kindeditor_temp_tag__" width="0" height="0" style="display:none;" />'+a;for(var k=0,w=e.childNodes.length;k<w;k++){var h=e.childNodes[k];
+h.id!="__kindeditor_temp_tag__"&&t.push(h)}return b(t)}return b(Fa(a,c))}if(a&&a.constructor===P)return a;a.toArray&&(a=a.toArray());if(f(a))return b(a);return b(D(arguments))}};h(J,function(a,c){i[a]=c});i.NodeClass=P;b.KindEditor=i;var sa=0,ra=1,oa=2,ta=3,Kb=0;A(aa,{init:function(a){this.startContainer=a;this.startOffset=0;this.endContainer=a;this.endOffset=0;this.collapsed=!0;this.doc=a},commonAncestor:function(){function a(a){for(var c=[];a;)c.push(a),a=a.parentNode;return c}for(var c=a(this.startContainer),
+b=a(this.endContainer),d=0,i=c.length,k=b.length,e,f;++d;)if(e=c[i-d],f=b[k-d],!e||!f||e!==f)break;return c[i-d+1]},setStart:function(a,c){var b=this.doc;this.startContainer=a;this.startOffset=c;if(this.endContainer===b)this.endContainer=a,this.endOffset=c;return lb(this)},setEnd:function(a,c){var b=this.doc;this.endContainer=a;this.endOffset=c;if(this.startContainer===b)this.startContainer=a,this.startOffset=c;return lb(this)},setStartBefore:function(a){return this.setStart(a.parentNode||this.doc,
+i(a).index())},setStartAfter:function(a){return this.setStart(a.parentNode||this.doc,i(a).index()+1)},setEndBefore:function(a){return this.setEnd(a.parentNode||this.doc,i(a).index())},setEndAfter:function(a){return this.setEnd(a.parentNode||this.doc,i(a).index()+1)},selectNode:function(a){return this.setStartBefore(a).setEndAfter(a)},selectNodeContents:function(a){var c=i(a);if(c.type==3||c.isSingle())return this.selectNode(a);c=c.children();if(c.length>0)return this.setStartBefore(c[0]).setEndAfter(c[c.length-
+1]);return this.setStart(a,0).setEnd(a,0)},collapse:function(a){if(a)return this.setEnd(this.startContainer,this.startOffset);return this.setStart(this.endContainer,this.endOffset)},compareBoundaryPoints:function(a,c){var b=this.get(),d=c.get();if(Y){var t={};t[sa]="StartToStart";t[ra]="EndToStart";t[oa]="EndToEnd";t[ta]="StartToEnd";b=b.compareEndPoints(t[a],d);if(b!==0)return b;var k,e,f,h;if(a===sa||a===ta)k=this.startContainer,f=this.startOffset;if(a===ra||a===oa)k=this.endContainer,f=this.endOffset;
+if(a===sa||a===ra)e=c.startContainer,h=c.startOffset;if(a===oa||a===ta)e=c.endContainer,h=c.endOffset;if(k===e)return k=f-h,k>0?1:k<0?-1:0;for(b=e;b&&b.parentNode!==k;)b=b.parentNode;if(b)return i(b).index()>=f?-1:1;for(b=k;b&&b.parentNode!==e;)b=b.parentNode;if(b)return i(b).index()>=h?1:-1;if((b=i(e).next())&&b.contains(k))return 1;if((b=i(k).next())&&b.contains(e))return-1}else return b.compareBoundaryPoints(a,d)},cloneRange:function(){return(new aa(this.doc)).setStart(this.startContainer,this.startOffset).setEnd(this.endContainer,
+this.endOffset)},toString:function(){var a=this.get();return(Y?a.text:a.toString()).replace(/\r\n|\n|\r/g,"")},cloneContents:function(){return Ra(this,!0,!1)},deleteContents:function(){return Ra(this,!1,!0)},extractContents:function(){return Ra(this,!0,!0)},insertNode:function(a){var c=this.startContainer,b=this.startOffset,d=this.endContainer,i=this.endOffset,k,e,f,h=1;if(a.nodeName.toLowerCase()==="#document-fragment")k=a.firstChild,e=a.lastChild,h=a.childNodes.length;c.nodeType==1?(f=c.childNodes[b])?
+(c.insertBefore(a,f),c===d&&(i+=h)):c.appendChild(a):c.nodeType==3&&(b===0?(c.parentNode.insertBefore(a,c),c.parentNode===d&&(i+=h)):b>=c.nodeValue.length?c.nextSibling?c.parentNode.insertBefore(a,c.nextSibling):c.parentNode.appendChild(a):(f=b>0?c.splitText(b):c,c.parentNode.insertBefore(a,f),c===d&&(d=f,i-=b)));k?this.setStartBefore(k).setEndAfter(e):this.selectNode(a);if(this.compareBoundaryPoints(oa,this.cloneRange().setEnd(d,i))>=1)return this;return this.setEnd(d,i)},surroundContents:function(a){a.appendChild(this.extractContents());
+return this.insertNode(a).selectNode(a)},isControl:function(){var a=this.startContainer,c=this.startOffset,b=this.endContainer,d=this.endOffset;return a.nodeType==1&&a===b&&c+1===d&&i(a.childNodes[c]).isControl()},get:function(a){var c=this.doc;if(!Y){c=c.createRange();try{c.setStart(this.startContainer,this.startOffset),c.setEnd(this.endContainer,this.endOffset)}catch(b){}return c}if(a&&this.isControl())return c=c.body.createControlRange(),c.addElement(this.startContainer.childNodes[this.startOffset]),
+c;a=this.cloneRange().down();c=c.body.createTextRange();c.setEndPoint("StartToStart",nb(a.startContainer,a.startOffset));c.setEndPoint("EndToStart",nb(a.endContainer,a.endOffset));return c},html:function(){return i(this.cloneContents()).outer()},down:function(){function a(a,b,d){if(a.nodeType==1&&(a=i(a).children(),a.length!==0)){var k,e,f,h;b>0&&(k=a.eq(b-1));b<a.length&&(e=a.eq(b));if(k&&k.type==3)f=k[0],h=f.nodeValue.length;e&&e.type==3&&(f=e[0],h=0);f&&(d?c.setStart(f,h):c.setEnd(f,h))}}var c=
+this;a(c.startContainer,c.startOffset,!0);a(c.endContainer,c.endOffset,!1);return c},up:function(){function a(a,b,d){a.nodeType==3&&(b===0?d?c.setStartBefore(a):c.setEndBefore(a):b==a.nodeValue.length&&(d?c.setStartAfter(a):c.setEndAfter(a)))}var c=this;a(c.startContainer,c.startOffset,!0);a(c.endContainer,c.endOffset,!1);return c},enlarge:function(a){function c(c,d,k){c=i(c);if(!(c.type==3||La[c.name]||!a&&c.isBlock()))if(d===0){for(;!c.prev();){d=c.parent();if(!d||La[d.name]||!a&&d.isBlock())break;
+c=d}k?b.setStartBefore(c[0]):b.setEndBefore(c[0])}else if(d==c.children().length){for(;!c.next();){d=c.parent();if(!d||La[d.name]||!a&&d.isBlock())break;c=d}k?b.setStartAfter(c[0]):b.setEndAfter(c[0])}}var b=this;b.up();c(b.startContainer,b.startOffset,!0);c(b.endContainer,b.endOffset,!1);return b},shrink:function(){for(var a,c=this.collapsed;this.startContainer.nodeType==1&&(a=this.startContainer.childNodes[this.startOffset])&&a.nodeType==1&&!i(a).isSingle();)this.setStart(a,0);if(c)return this.collapse(c);
+for(;this.endContainer.nodeType==1&&this.endOffset>0&&(a=this.endContainer.childNodes[this.endOffset-1])&&a.nodeType==1&&!i(a).isSingle();)this.setEnd(a,a.childNodes.length);return this},createBookmark:function(a){var c,b=i('<span style="display:none;"></span>',this.doc)[0];b.id="__kindeditor_bookmark_start_"+Kb++ +"__";if(!this.collapsed)c=b.cloneNode(!0),c.id="__kindeditor_bookmark_end_"+Kb++ +"__";c&&this.cloneRange().collapse(!1).insertNode(c).setEndBefore(c);this.insertNode(b).setStartAfter(b);
+return{start:a?"#"+b.id:b,end:c?a?"#"+c.id:c:null}},moveToBookmark:function(a){var c=this.doc,b=i(a.start,c),a=a.end?i(a.end,c):null;if(!b||b.length<1)return this;this.setStartBefore(b[0]);b.remove();a&&a.length>0?(this.setEndBefore(a[0]),a.remove()):this.collapse(!0);return this},dump:function(){console.log("--------------------");console.log(this.startContainer.nodeType==3?this.startContainer.nodeValue:this.startContainer,this.startOffset);console.log(this.endContainer.nodeType==3?this.endContainer.nodeValue:
+this.endContainer,this.endOffset)}});i.RangeClass=aa;i.range=Sa;i.START_TO_START=sa;i.START_TO_END=ra;i.END_TO_END=oa;i.END_TO_START=ta;A(va,{init:function(a){var c=a.doc;this.doc=c;this.win=ja(c);this.sel=Ta(c);this.range=a},selection:function(a){var c=this.doc,b;b=Ta(c);var d;try{d=b.rangeCount>0?b.getRangeAt(0):b.createRange()}catch(e){}b=Y&&(!d||!d.item&&d.parentElement().ownerDocument!==c)?null:d;this.sel=Ta(c);if(b)return this.range=Sa(b),i(this.range.startContainer).name=="html"&&this.range.selectNodeContents(c.body).collapse(!1),
+this;a&&this.range.selectNodeContents(c.body).collapse(!1);return this},select:function(a){var a=q(a,!0),c=this.sel,b=this.range.cloneRange().shrink(),d=b.startContainer,e=b.startOffset,k=ia(d),f=this.win,h,l=!1;if(a&&d.nodeType==1&&b.collapsed){if(Y){c=i("<span>&nbsp;</span>",k);b.insertNode(c[0]);h=k.body.createTextRange();try{h.moveToElementText(c[0])}catch(n){}h.collapse(!1);h.select();c.remove();f.focus();return this}if(ka&&(a=d.childNodes,i(d).isInline()||e>0&&i(a[e-1]).isInline()||a[e]&&i(a[e]).isInline()))b.insertNode(k.createTextNode("\u200b")),
+l=!0}if(Y)try{h=b.get(!0),h.select()}catch(o){}else l&&b.collapse(!1),h=b.get(!0),c.removeAllRanges(),c.addRange(h),k!==document&&(b=i(h.endContainer).pos(),f.scrollTo(b.x,b.y));f.focus();return this},wrap:function(a){var c=this.range,b;b=i(a,this.doc);if(c.collapsed)return c.shrink(),c.insertNode(b[0]).selectNodeContents(b[0]),this;if(b.isBlock()){for(var d=a=b.clone(!0);d.first();)d=d.first();d.append(c.extractContents());c.insertNode(a[0]).selectNode(a[0]);return this}c.enlarge();var e=c.createBookmark(),
+a=c.commonAncestor(),k=!1;i(a).scan(function(a){if(!k&&a==e.start)k=!0;else if(k){if(a==e.end)return!1;var c=i(a),d;a:{for(d=c;d&&d.name!="body";){if(Ma[d.name]||d.name=="div"&&d.hasClass("ke-script")){d=!0;break a}d=d.parent()}d=!1}if(!d&&c.type==3&&m(a.nodeValue).length>0){for(var f;(f=c.parent())&&f.isStyle()&&f.children().length==1;)c=f;f=b;f=f.clone(!0);if(c.type==3)Wa(f).append(c.clone(!1)),c.replaceWith(f);else{for(var a=c,h;(h=c.first())&&h.children().length==1;)c=h;h=c.first();for(c=c.doc.createDocumentFragment();h;)c.appendChild(h[0]),
+h=h.next();h=a.clone(!0);d=Wa(h);for(var l=h,n=!1;f;){for(;l;)l.name===f.name&&(Qb(l,f.attr(),f.css()),n=!0),l=l.first();n||d.append(f.clone(!1));n=!1;f=f.first()}f=h;c.firstChild&&Wa(f).append(c);a.replaceWith(f)}}}});c.moveToBookmark(e);return this},split:function(a,c){for(var b=this.range,d=b.doc,e=b.cloneRange().collapse(a),k=e.startContainer,f=e.startOffset,h=k.nodeType==3?k.parentNode:k,l=!1,n;h&&h.parentNode;){n=i(h);if(c){if(!n.isStyle())break;if(!Ua(n,c))break}else if(La[n.name])break;l=
+!0;h=h.parentNode}if(l)d=d.createElement("span"),b.cloneRange().collapse(!a).insertNode(d),a?e.setStartBefore(h.firstChild).setEnd(k,f):e.setStart(k,f).setEndAfter(h.lastChild),k=e.extractContents(),f=k.firstChild,l=k.lastChild,a?(e.insertNode(k),b.setStartAfter(l).setEndBefore(d)):(h.appendChild(k),b.setStartBefore(d).setEndBefore(f)),e=d.parentNode,e==b.endContainer&&(h=i(d).prev(),k=i(d).next(),h&&k&&h.type==3&&k.type==3?b.setEnd(h[0],h[0].nodeValue.length):a||b.setEnd(b.endContainer,b.endOffset-
+1)),e.removeChild(d);return this},remove:function(a){var c=this.doc,b=this.range;b.enlarge();if(b.startOffset===0){for(var d=i(b.startContainer),e;(e=d.parent())&&e.isStyle()&&e.children().length==1;)d=e;b.setStart(d[0],0);d=i(b.startContainer);d.isBlock()&&Va(d,a);(d=d.parent())&&d.isBlock()&&Va(d,a)}if(b.collapsed){this.split(!0,a);c=b.startContainer;d=b.startOffset;if(d>0&&(e=i(c.childNodes[d-1]))&&pa(e))e.remove(),b.setStart(c,d-1);(d=i(c.childNodes[d]))&&pa(d)&&d.remove();pa(c)&&(b.startBefore(c),
+c.remove());b.collapse(!0);return this}this.split(!0,a);this.split(!1,a);var k=c.createElement("span"),f=c.createElement("span");b.cloneRange().collapse(!1).insertNode(f);b.cloneRange().collapse(!0).insertNode(k);var l=[],n=!1;i(b.commonAncestor()).scan(function(a){if(!n&&a==k)n=!0;else{if(a==f)return!1;n&&l.push(a)}});i(k).remove();i(f).remove();c=b.startContainer;d=b.startOffset;e=b.endContainer;var o=b.endOffset;if(d>0){var m=i(c.childNodes[d-1]);m&&pa(m)&&(m.remove(),b.setStart(c,d-1),c==e&&b.setEnd(e,
+o-1));if((d=i(c.childNodes[d]))&&pa(d))d.remove(),c==e&&b.setEnd(e,o-1)}(c=i(e.childNodes[b.endOffset]))&&pa(c)&&c.remove();c=b.createBookmark(!0);h(l,function(c,b){Va(i(b),a)});b.moveToBookmark(c);return this},commonNode:function(a){function c(c){for(var b=c;c;){if(Ua(i(c),a))return i(c);c=c.parentNode}for(;b&&(b=b.lastChild);)if(Ua(i(b),a))return i(b);return null}var b=this.range,d=b.endContainer,b=b.endOffset,e=d.nodeType==3||b===0?d:d.childNodes[b-1],k=c(e);if(k)return k;if(e.nodeType==1||d.nodeType==
+3&&b===0)if(d=i(e).prev())return c(d);return null},commonAncestor:function(a){function c(c){for(;c;){if(c.nodeType==1&&c.tagName.toLowerCase()===a)return c;c=c.parentNode}return null}var b=this.range,d=b.startContainer,e=b.startOffset,k=b.endContainer,b=b.endOffset,k=k.nodeType==3||b===0?k:k.childNodes[b-1],d=c(d.nodeType==3||e===0?d:d.childNodes[e-1]),e=c(k);if(d&&e&&d===e)return i(d);return null},state:function(a){var c=this.doc,b=!1;try{b=c.queryCommandState(a)}catch(d){}return b},val:function(a){var c=
+this.doc,a=a.toLowerCase(),b="";if(a==="fontfamily"||a==="fontname")return b=pb(c,"fontname"),b=b.replace(/['"]/g,""),b.toLowerCase();if(a==="formatblock"){b=pb(c,a);if(b===""&&(a=this.commonNode({"h1,h2,h3,h4,h5,h6,p,div,pre,address":"*"})))b=a.name;b==="Normal"&&(b="p");return b.toLowerCase()}if(a==="fontsize")return(a=this.commonNode({"*":".font-size"}))&&(b=a.css("font-size")),b.toLowerCase();if(a==="forecolor")return(a=this.commonNode({"*":".color"}))&&(b=a.css("color")),b=r(b),b===""&&(b="default"),
+b.toLowerCase();if(a==="hilitecolor")return(a=this.commonNode({"*":".background-color"}))&&(b=a.css("background-color")),b=r(b),b===""&&(b="default"),b.toLowerCase();return b},toggle:function(a,c){this.commonNode(c)?this.remove(c):this.wrap(a);return this.select()},bold:function(){return this.toggle("<strong></strong>",{span:".font-weight=bold",strong:"*",b:"*"})},italic:function(){return this.toggle("<em></em>",{span:".font-style=italic",em:"*",i:"*"})},underline:function(){return this.toggle("<u></u>",
+{span:".text-decoration=underline",u:"*"})},strikethrough:function(){return this.toggle("<s></s>",{span:".text-decoration=line-through",s:"*"})},forecolor:function(a){return this.wrap('<span style="color:'+a+';"></span>').select()},hilitecolor:function(a){return this.wrap('<span style="background-color:'+a+';"></span>').select()},fontsize:function(a){return this.wrap('<span style="font-size:'+a+';"></span>').select()},fontname:function(a){return this.fontfamily(a)},fontfamily:function(a){return this.wrap('<span style="font-family:'+
+a+';"></span>').select()},removeformat:function(){var a={"*":".font-weight,.font-style,.text-decoration,.color,.background-color,.font-size,.font-family,.text-indent"};h(Gb,function(c){a[c]="*"});this.remove(a);return this.select()},inserthtml:function(a,c){function b(a,c){var c='<img id="__kindeditor_temp_tag__" width="0" height="0" style="display:none;" />'+c,d=a.get();d.item?d.item(0).outerHTML=c:d.pasteHTML(c);var g=a.doc.getElementById("__kindeditor_temp_tag__");g.parentNode.removeChild(g);d=
+ob(d);a.setEnd(d.endContainer,d.endOffset);a.collapse(!1);e.select(!1)}function d(a,c){var b=a.doc,g=b.createDocumentFragment();i("@"+c,b).each(function(){g.appendChild(this)});a.deleteContents();a.insertNode(g);a.collapse(!1);e.select(!1)}var e=this,k=e.range;if(a==="")return e;if(Y&&c){try{b(k,a)}catch(f){d(k,a)}return e}d(k,a);return e},hr:function(){return this.inserthtml("<hr />")},print:function(){this.win.print();return this},insertimage:function(a,c,b,d,e,i){c=q(c,"");q(e,0);a='<img src="'+
+s(a)+'" data-ke-src="'+s(a)+'" ';b&&(a+='width="'+s(b)+'" ');d&&(a+='height="'+s(d)+'" ');c&&(a+='title="'+s(c)+'" ');i&&(a+='align="'+s(i)+'" ');a+='alt="'+s(c)+'" ';a+="/>";return this.inserthtml(a)},createlink:function(a,c){function b(a,c,d){i(a).attr("href",c).attr("data-ke-src",c);d?i(a).attr("target",d):i(a).removeAttr("target")}var d=this.doc,e=this.range;this.select();var k=this.commonNode({a:"*"});k&&!e.isControl()&&(e.selectNode(k.get()),this.select());k='<a href="'+s(a)+'" data-ke-src="'+
+s(a)+'" ';c&&(k+=' target="'+s(c)+'"');if(e.collapsed)return k+=">"+s(a)+"</a>",this.inserthtml(k);if(e.isControl()){var f=i(e.startContainer.childNodes[e.startOffset]);k+="></a>";f.after(i(k,d));f.next().append(f);e.selectNode(f[0]);return this.select()}var k=e.startContainer,f=e.startOffset,h=e.endContainer,e=e.endOffset;if(k.nodeType==1&&k===h&&f+1===e&&(e=k.childNodes[f],e.nodeName.toLowerCase()=="a"))return b(e,a,c),this;ea(d,"createlink","__kindeditor_temp_url__");i('a[href="__kindeditor_temp_url__"]',
+d).each(function(){b(this,a,c)});return this},unlink:function(){var a=this.doc,c=this.range;this.select();if(c.collapsed){var b=this.commonNode({a:"*"});b&&(c.selectNode(b.get()),this.select());ea(a,"unlink",null);ka&&i(c.startContainer).name==="img"&&(a=i(c.startContainer).parent(),a.name==="a"&&a.remove(!0))}else ea(a,"unlink",null);return this}});h("formatblock,selectall,justifyleft,justifycenter,justifyright,justifyfull,insertorderedlist,insertunorderedlist,indent,outdent,subscript,superscript".split(","),
+function(a,c){va.prototype[c]=function(a){this.select();ea(this.doc,c,a);Y&&e(c,"justifyleft,justifycenter,justifyright,justifyfull".split(","))>=0&&this.selection();(!Y||e(c,"formatblock,selectall,insertorderedlist,insertunorderedlist".split(","))>=0)&&this.selection();return this}});h("cut,copy,paste".split(","),function(a,c){va.prototype[c]=function(){if(!this.doc.queryCommandSupported(c))throw"not supported";this.select();ea(this.doc,c,null);return this}});i.CmdClass=va;i.cmd=tb;A(ga,{init:function(a){var c=
+this;c.name=a.name||"";c.doc=a.doc||document;c.win=ja(c.doc);c.x=o(a.x);c.y=o(a.y);c.z=a.z;c.width=o(a.width);c.height=o(a.height);c.div=i('<div style="display:block;"></div>');c.options=a;c._alignEl=a.alignEl;c.width&&c.div.css("width",c.width);c.height&&c.div.css("height",c.height);c.z&&c.div.css({position:"absolute",left:c.x,top:c.y,"z-index":c.z});c.z&&(c.x===d||c.y===d)&&c.autoPos(c.width,c.height);a.cls&&c.div.addClass(a.cls);a.shadowMode&&c.div.addClass("ke-shadow");a.css&&c.div.css(a.css);
+a.src?i(a.src).replaceWith(c.div):i(c.doc.body).append(c.div);a.html&&c.div.html(a.html);if(a.autoScroll)if(F&&N<7||da){var b=na();i(c.win).bind("scroll",function(){var a=na(),d=a.x-b.x,a=a.y-b.y;c.pos(l(c.x)+d,l(c.y)+a,!1)})}else c.div.css("position","fixed")},pos:function(a,c,b){b=q(b,!0);if(a!==null&&(a=a<0?0:o(a),this.div.css("left",a),b))this.x=a;if(c!==null&&(c=c<0?0:o(c),this.div.css("top",c),b))this.y=c;return this},autoPos:function(a,c){var b=l(a)||0,d=l(c)||0,e=na();if(this._alignEl){var k=
+i(this._alignEl),f=k.pos(),b=fa(k[0].clientWidth/2-b/2),d=fa(k[0].clientHeight/2-d/2);x=b<0?f.x:f.x+b;y=d<0?f.y:f.y+d}else f=X(this.doc),x=fa(e.x+(f.clientWidth-b)/2),y=fa(e.y+(f.clientHeight-d)/2);F&&N<7||da||(x-=e.x,y-=e.y);return this.pos(x,y)},remove:function(){var a=this;(F&&N<7||da)&&i(a.win).unbind("scroll");a.div.remove();h(a,function(c){a[c]=null});return this},show:function(){this.div.show();return this},hide:function(){this.div.hide();return this},draggable:function(a){var c=this,a=a||
+{};a.moveEl=c.div;a.moveFn=function(a,b,d,e,i,f){if((a+=i)<0)a=0;if((b+=f)<0)b=0;c.pos(a,b)};Xa(a);return c}});i.WidgetClass=ga;i.widget=Za;var $a="";if(J=document.getElementsByTagName("html"))$a=J[0].dir;A(xa,ga,{init:function(a){function c(){var c=Ya(b.iframe);c.open();if(h)c.domain=document.domain;c.write(Rb(d,e,k,f));c.close();b.win=b.iframe[0].contentWindow;b.doc=c;var l=tb(c);b.afterChange(function(){l.selection()});ka&&i(c).click(function(a){i(a.target).name==="img"&&(l.selection(!0),l.range.selectNode(a.target),
+l.select())});if(F)b._mousedownHandler=function(){var a=l.range.cloneRange();a.shrink();a.isControl()&&b.blur()},i(document).mousedown(b._mousedownHandler),i(c).keydown(function(a){if(a.which==8){l.selection();var c=l.range;c.isControl()&&(c.collapse(!0),i(c.startContainer.childNodes[c.startOffset]).remove(),a.preventDefault())}});b.cmd=l;b.html(wa(b.srcElement));F?(c.body.disabled=!0,c.body.contentEditable=!0,c.body.removeAttribute("disabled")):c.designMode="on";a.afterCreate&&a.afterCreate.call(b)}
+var b=this;xa.parent.init.call(b,a);b.srcElement=i(a.srcElement);b.div.addClass("ke-edit");b.designMode=q(a.designMode,!0);b.beforeGetHtml=a.beforeGetHtml;b.beforeSetHtml=a.beforeSetHtml;b.afterSetHtml=a.afterSetHtml;var d=q(a.themesPath,""),e=a.bodyClass,k=a.cssPath,f=a.cssData,h=location.protocol!="res:"&&location.host.replace(/:\d+/,"")!==document.domain,l="document.open();"+(h?'document.domain="'+document.domain+'";':"")+"document.close();",l=F?' src="javascript:void(function(){'+encodeURIComponent(l)+
+'}())"':"";b.iframe=i('<iframe class="ke-edit-iframe" hidefocus="true" frameborder="0"'+l+"></iframe>").css("width","100%");b.textarea=i('<textarea class="ke-edit-textarea" hidefocus="true"></textarea>').css("width","100%");b.tabIndex=isNaN(parseInt(a.tabIndex,10))?b.srcElement.attr("tabindex"):parseInt(a.tabIndex,10);b.iframe.attr("tabindex",b.tabIndex);b.textarea.attr("tabindex",b.tabIndex);b.width&&b.setWidth(b.width);b.height&&b.setHeight(b.height);b.designMode?b.textarea.hide():b.iframe.hide();
+h&&b.iframe.bind("load",function(){b.iframe.unbind("load");F?c():setTimeout(c,0)});b.div.append(b.iframe);b.div.append(b.textarea);b.srcElement.hide();!h&&c()},setWidth:function(a){this.width=a=o(a);this.div.css("width",a);return this},setHeight:function(a){this.height=a=o(a);this.div.css("height",a);this.iframe.css("height",a);if(F&&N<8||da)a=o(l(a)-2);this.textarea.css("height",a);return this},remove:function(){var a=this.doc;i(a.body).unbind();i(a).unbind();i(this.win).unbind();this._mousedownHandler&&
+i(document).unbind("mousedown",this._mousedownHandler);wa(this.srcElement,this.html());this.srcElement.show();a.write("");this.iframe.unbind();this.textarea.unbind();xa.parent.remove.call(this)},html:function(a,c){var b=this.doc;if(this.designMode){b=b.body;if(a===d)return a=c?"<!doctype html><html>"+b.parentNode.innerHTML+"</html>":b.innerHTML,this.beforeGetHtml&&(a=this.beforeGetHtml(a)),la&&a=="<br />"&&(a=""),a;this.beforeSetHtml&&(a=this.beforeSetHtml(a));F&&N>=9&&(a=a.replace(/(<.*?checked=")checked(".*>)/ig,
+"$1$2"));i(b).html(a);this.afterSetHtml&&this.afterSetHtml();return this}if(a===d)return this.textarea.val();this.textarea.val(a);return this},design:function(a){if(a===d?!this.designMode:a){if(!this.designMode)a=this.html(),this.designMode=!0,this.html(a),this.textarea.hide(),this.iframe.show()}else if(this.designMode)a=this.html(),this.designMode=!1,this.html(a),this.iframe.hide(),this.textarea.show();return this.focus()},focus:function(){this.designMode?this.win.focus():this.textarea[0].focus();
+return this},blur:function(){if(F){var a=i('<input type="text" style="float:left;width:0;height:0;padding:0;margin:0;border:0;" value="" />',this.div);this.div.append(a);a[0].focus();a.remove()}else this.designMode?this.win.blur():this.textarea[0].blur();return this},afterChange:function(a){function c(c){setTimeout(function(){a(c)},1)}var b=this.doc,d=b.body;i(b).keyup(function(c){!c.ctrlKey&&!c.altKey&&eb[c.which]&&a(c)});i(b).mouseup(a).contextmenu(a);i(this.win).blur(a);i(d).bind("paste",c);i(d).bind("cut",
+c);return this}});i.EditClass=xa;i.edit=ub;i.iframeDoc=Ya;A(Ga,ga,{init:function(a){function c(a){a=i(a);if(a.hasClass("ke-outline"))return a;if(a.hasClass("ke-toolbar-icon"))return a.parent()}function b(a,d){var g=c(a.target);if(g&&!g.hasClass("ke-disabled")&&!g.hasClass("ke-selected"))g[d]("ke-on")}var d=this;Ga.parent.init.call(d,a);d.disableMode=q(a.disableMode,!1);d.noDisableItemMap=z(q(a.noDisableItems,[]));d._itemMap={};d.div.addClass("ke-toolbar").bind("contextmenu,mousedown,mousemove",function(a){a.preventDefault()}).attr("unselectable",
+"on");d.div.mouseover(function(a){b(a,"addClass")}).mouseout(function(a){b(a,"removeClass")}).click(function(a){var b=c(a.target);b&&!b.hasClass("ke-disabled")&&d.options.click.call(this,a,b.attr("data-name"))})},get:function(a){if(this._itemMap[a])return this._itemMap[a];return this._itemMap[a]=i("span.ke-icon-"+a,this.div).parent()},select:function(a){vb.call(this,a,function(a){a.addClass("ke-selected")});return self},unselect:function(a){vb.call(this,a,function(a){a.removeClass("ke-selected").removeClass("ke-on")});
+return self},enable:function(a){if(a=a.get?a:this.get(a))a.removeClass("ke-disabled"),a.opacity(1);return this},disable:function(a){if(a=a.get?a:this.get(a))a.removeClass("ke-selected").addClass("ke-disabled"),a.opacity(0.5);return this},disableAll:function(a,c){var b=this,e=b.noDisableItemMap;c&&(e=z(c));(a===d?!b.disableMode:a)?(i("span.ke-outline",b.div).each(function(){var a=i(this),c=a[0].getAttribute("data-name",2);e[c]||b.disable(a)}),b.disableMode=!0):(i("span.ke-outline",b.div).each(function(){var a=
+i(this),c=a[0].getAttribute("data-name",2);e[c]||b.enable(a)}),b.disableMode=!1);return b}});i.ToolbarClass=Ga;i.toolbar=wb;A(ya,ga,{init:function(a){a.z=a.z||811213;ya.parent.init.call(this,a);this.centerLineMode=q(a.centerLineMode,!0);this.div.addClass("ke-menu").bind("click,mousedown",function(a){a.stopPropagation()}).attr("unselectable","on")},addItem:function(a){if(a.title==="-")this.div.append(i('<div class="ke-menu-separator"></div>'));else{var c=i('<div class="ke-menu-item" unselectable="on"></div>'),
+b=i('<div class="ke-inline-block ke-menu-item-left"></div>'),d=i('<div class="ke-inline-block ke-menu-item-right"></div>'),e=o(a.height),f=q(a.iconClass,"");this.div.append(c);e&&(c.css("height",e),d.css("line-height",e));var h;this.centerLineMode&&(h=i('<div class="ke-inline-block ke-menu-item-center"></div>'),e&&h.css("height",e));c.mouseover(function(){i(this).addClass("ke-menu-item-on");h&&h.addClass("ke-menu-item-center-on")}).mouseout(function(){i(this).removeClass("ke-menu-item-on");h&&h.removeClass("ke-menu-item-center-on")}).click(function(c){a.click.call(i(this));
+c.stopPropagation()}).append(b);h&&c.append(h);c.append(d);a.checked&&(f="ke-icon-checked");f!==""&&b.html('<span class="ke-inline-block ke-toolbar-icon ke-toolbar-icon-url '+f+'"></span>');d.html(a.title);return this}},remove:function(){this.options.beforeRemove&&this.options.beforeRemove.call(this);i(".ke-menu-item",this.div[0]).unbind();ya.parent.remove.call(this);return this}});i.MenuClass=ya;i.menu=ab;A(za,ga,{init:function(a){a.z=a.z||811213;za.parent.init.call(this,a);var c=a.colors||[["#E53333",
+"#E56600","#FF9900","#64451D","#DFC5A4","#FFE500"],["#009900","#006600","#99BB00","#B8D100","#60D978","#00D5FF"],["#337FE5","#003399","#4C33E5","#9933E5","#CC33E5","#EE33EE"],["#FFFFFF","#CCCCCC","#999999","#666666","#333333","#000000"]];this.selectedColor=(a.selectedColor||"").toLowerCase();this._cells=[];this.div.addClass("ke-colorpicker").bind("click,mousedown",function(a){a.stopPropagation()}).attr("unselectable","on");a=this.doc.createElement("table");this.div.append(a);a.className="ke-colorpicker-table";
+a.cellPadding=0;a.cellSpacing=0;a.border=0;var b=a.insertRow(0),d=b.insertCell(0);d.colSpan=c[0].length;this._addAttr(d,"","ke-colorpicker-cell-top");for(var e=0;e<c.length;e++)for(var b=a.insertRow(e+1),i=0;i<c[e].length;i++)d=b.insertCell(i),this._addAttr(d,c[e][i],"ke-colorpicker-cell")},_addAttr:function(a,c,b){var d=this,a=i(a).addClass(b);d.selectedColor===c.toLowerCase()&&a.addClass("ke-colorpicker-cell-selected");a.attr("title",c||d.options.noColor);a.mouseover(function(){i(this).addClass("ke-colorpicker-cell-on")});
+a.mouseout(function(){i(this).removeClass("ke-colorpicker-cell-on")});a.click(function(a){a.stop();d.options.click.call(i(this),c)});c?a.append(i('<div class="ke-colorpicker-cell-color" unselectable="on"></div>').css("background-color",c)):a.html(d.options.noColor);i(a).attr("unselectable","on");d._cells.push(a)},remove:function(){h(this._cells,function(){this.unbind()});za.parent.remove.call(this);return this}});i.ColorPickerClass=za;i.colorpicker=xb;A(bb,{init:function(a){var c=i(a.button),b=a.fieldName||
+"file",d=a.url||"",e=c.val(),f=a.extraParams||{},h=c[0].className||"",l=a.target||"kindeditor_upload_iframe_"+(new Date).getTime();a.afterError=a.afterError||function(a){alert(a)};var n=[],o;for(o in f)n.push('<input type="hidden" name="'+o+'" value="'+f[o]+'" />');b=['<div class="ke-inline-block '+h+'">',a.target?"":'<iframe name="'+l+'" style="display:none;"></iframe>',a.form?'<div class="ke-upload-area">':'<form class="ke-upload-area ke-form" method="post" enctype="multipart/form-data" target="'+
+l+'" action="'+d+'">','<span class="ke-button-common">',n.join(""),'<input type="button" class="ke-button-common ke-button" value="'+e+'" />',"</span>",'<input type="file" class="ke-upload-file" name="'+b+'" tabindex="-1" />',a.form?"</div>":"</form>","</div>"].join("");b=i(b,c.doc);c.hide();c.before(b);this.div=b;this.button=c;this.iframe=a.target?i('iframe[name="'+l+'"]'):i("iframe",b);this.form=a.form?i(a.form):i("form",b);this.fileBox=i(".ke-upload-file",b);c=a.width||i(".ke-button-common",b).width();
+i(".ke-upload-area",b).width(c);this.options=a},submit:function(){var a=this,c=a.iframe;c.bind("load",function(){c.unbind();var b=document.createElement("form");a.fileBox.before(b);i(b).append(a.fileBox);b.reset();i(b).remove(!0);var b=i.iframeDoc(c),d=b.getElementsByTagName("pre")[0],e="",f,e=d?d.innerHTML:b.body.innerHTML,e=v(e);c[0].src="javascript:false";try{f=i.json(e)}catch(h){a.options.afterError.call(a,"<!doctype html><html>"+b.body.parentNode.innerHTML+"</html>")}f&&a.options.afterUpload.call(a,
+f)});a.form[0].submit();return a},remove:function(){this.fileBox&&this.fileBox.unbind();this.iframe.remove();this.div.remove();this.button.show();return this}});i.UploadButtonClass=bb;i.uploadbutton=function(a){return new bb(a)};A(Aa,ga,{init:function(a){var c=q(a.shadowMode,!0);a.z=a.z||811213;a.shadowMode=!1;a.autoScroll=q(a.autoScroll,!0);Aa.parent.init.call(this,a);var b=a.title,d=i(a.body,this.doc),e=a.previewBtn,f=a.yesBtn,n=a.noBtn,o=a.closeBtn,m=q(a.showMask,!0);this.div.addClass("ke-dialog").bind("click,mousedown",
+function(a){a.stopPropagation()});var s=i('<div class="ke-dialog-content"></div>').appendTo(this.div);F&&N<7?this.iframeMask=i('<iframe src="about:blank" class="ke-dialog-shadow"></iframe>').appendTo(this.div):c&&i('<div class="ke-dialog-shadow"></div>').appendTo(this.div);c=i('<div class="ke-dialog-header"></div>');s.append(c);c.html(b);this.closeIcon=i('<span class="ke-dialog-icon-close" title="'+o.name+'"></span>').click(o.click);c.append(this.closeIcon);this.draggable({clickEl:c,beforeDrag:a.beforeDrag});
+a=i('<div class="ke-dialog-body"></div>');s.append(a);a.append(d);var j=i('<div class="ke-dialog-footer"></div>');(e||f||n)&&s.append(j);h([{btn:e,name:"preview"},{btn:f,name:"yes"},{btn:n,name:"no"}],function(){if(this.btn){var a=this.btn,a=a||{},c=a.name||"",b=i('<span class="ke-button-common ke-button-outer" title="'+c+'"></span>'),c=i('<input class="ke-button-common ke-button" type="button" value="'+c+'" />');a.click&&c.click(a.click);b.append(c);b.addClass("ke-dialog-"+this.name);j.append(b)}});
+this.height&&a.height(l(this.height)-c.height()-j.height());this.div.width(this.div.width());this.div.height(this.div.height());this.mask=null;if(m)d=X(this.doc),this.mask=Za({x:0,y:0,z:this.z-1,cls:"ke-dialog-mask",width:Math.max(d.scrollWidth,d.clientWidth),height:Math.max(d.scrollHeight,d.clientHeight)});this.autoPos(this.div.width(),this.div.height());this.footerDiv=j;this.bodyDiv=a;this.headerDiv=c;this.isLoading=!1},setMaskIndex:function(a){this.mask.div.css("z-index",a)},showLoading:function(a){var a=
+q(a,""),c=this.bodyDiv;this.loading=i('<div class="ke-dialog-loading"><div class="ke-inline-block ke-dialog-loading-content" style="margin-top:'+Math.round(c.height()/3)+'px;">'+a+"</div></div>").width(c.width()).height(c.height()).css("top",this.headerDiv.height()+"px");c.css("visibility","hidden").after(this.loading);this.isLoading=!0;return this},hideLoading:function(){this.loading&&this.loading.remove();this.bodyDiv.css("visibility","visible");this.isLoading=!1;return this},remove:function(){this.options.beforeRemove&&
+this.options.beforeRemove.call(this);this.mask&&this.mask.remove();this.iframeMask&&this.iframeMask.remove();this.closeIcon.unbind();i("input",this.div).unbind();i("button",this.div).unbind();this.footerDiv.unbind();this.bodyDiv.unbind();this.headerDiv.unbind();i("iframe",this.div).each(function(){i(this).remove()});Aa.parent.remove.call(this);return this}});i.DialogClass=Aa;i.dialog=yb;i.tabs=function(a){var c=Za(a),b=c.remove,d=a.afterSelect,a=c.div,e=[];a.addClass("ke-tabs").bind("contextmenu,mousedown,mousemove",
+function(a){a.preventDefault()});var f=i('<ul class="ke-tabs-ul ke-clearfix"></ul>');a.append(f);c.add=function(a){var c=i('<li class="ke-tabs-li">'+a.title+"</li>");c.data("tab",a);e.push(c);f.append(c)};c.selectedIndex=0;c.select=function(a){c.selectedIndex=a;h(e,function(b,d){d.unbind();b===a?(d.addClass("ke-tabs-li-selected"),i(d.data("tab").panel).show("")):(d.removeClass("ke-tabs-li-selected").removeClass("ke-tabs-li-on").mouseover(function(){i(this).addClass("ke-tabs-li-on")}).mouseout(function(){i(this).removeClass("ke-tabs-li-on")}).click(function(){c.select(b)}),
+i(d.data("tab").panel).hide())});d&&d.call(c,a)};c.remove=function(){h(e,function(){this.remove()});f.remove();b.call(c)};return c};i.loadScript=cb;i.loadStyle=db;i.ajax=function(a,c,d,e,i){var d=d||"GET",i=i||"json",f=b.XMLHttpRequest?new b.XMLHttpRequest:new ActiveXObject("Microsoft.XMLHTTP");f.open(d,a,!0);f.onreadystatechange=function(){if(f.readyState==4&&f.status==200&&c){var a=m(f.responseText);i=="json"&&(a=B(a));c(a)}};if(d=="POST"){var l=[];h(e,function(a,c){l.push(encodeURIComponent(a)+
+"="+encodeURIComponent(c))});try{f.setRequestHeader("Content-Type","application/x-www-form-urlencoded")}catch(n){}f.send(l.join("&"))}else f.send(null)};var ba={},ca={};Ba.prototype={lang:function(a){return Cb(a,this.langType)},loadPlugin:function(a,c){var b=this;if(ba[a]){if(!j(ba[a]))return setTimeout(function(){b.loadPlugin(a,c)},100),b;ba[a].call(b,KindEditor);c&&c.call(b);return b}ba[a]="loading";cb(b.pluginsPath+a+"/"+a+".js?ver="+encodeURIComponent(i.DEBUG?Ja:Ka),function(){setTimeout(function(){ba[a]&&
+b.loadPlugin(a,c)},0)});return b},handler:function(a,c){var b=this;b._handlers[a]||(b._handlers[a]=[]);if(j(c))return b._handlers[a].push(c),b;h(b._handlers[a],function(){c=this.call(b,c)});return c},clickToolbar:function(a,c){var b=this,e="clickToolbar"+a;if(c===d){if(b._handlers[e])return b.handler(e);b.loadPlugin(a,function(){b.handler(e)});return b}return b.handler(e,c)},updateState:function(){var a=this;h("justifyleft,justifycenter,justifyright,justifyfull,insertorderedlist,insertunorderedlist,subscript,superscript,bold,italic,underline,strikethrough".split(","),
+function(c,b){a.cmd.state(b)?a.toolbar.select(b):a.toolbar.unselect(b)});return a},addContextmenu:function(a){this._contextmenus.push(a);return this},afterCreate:function(a){return this.handler("afterCreate",a)},beforeRemove:function(a){return this.handler("beforeRemove",a)},beforeGetHtml:function(a){return this.handler("beforeGetHtml",a)},beforeSetHtml:function(a){return this.handler("beforeSetHtml",a)},afterSetHtml:function(a){return this.handler("afterSetHtml",a)},create:function(){function a(){m.height()===
+0?setTimeout(a,100):c.resize(e,f,!1)}var c=this,d=c.fullscreenMode;if(c.isCreated)return c;if(c.srcElement.data("kindeditor"))return c;c.srcElement.data("kindeditor","true");d?X().style.overflow="hidden":X().style.overflow="";var e=d?X().clientWidth+"px":c.width,f=d?X().clientHeight+"px":c.height;if(F&&N<8||da)f=o(l(f)+2);var k=c.container=i(c.layout);d?i(document.body).append(k):c.srcElement.before(k);var h=i(".toolbar",k),n=i(".edit",k),m=c.statusbar=i(".statusbar",k);k.removeClass("container").addClass("ke-container ke-container-"+
+c.themeType).css("width",e);if(d){k.css({position:"absolute",left:0,top:0,"z-index":811211});if(!la)c._scrollPos=na();b.scrollTo(0,0);i(document.body).css({height:"1px",overflow:"hidden"});i(document.body.parentNode).css("overflow","hidden");c._fullscreenExecuted=!0}else c._fullscreenExecuted&&(i(document.body).css({height:"",overflow:""}),i(document.body.parentNode).css("overflow","")),c._scrollPos&&b.scrollTo(c._scrollPos.x,c._scrollPos.y);var s=[];i.each(c.items,function(a,b){b=="|"?s.push('<span class="ke-inline-block ke-separator"></span>'):
+b=="/"?s.push('<div class="ke-hr"></div>'):(s.push('<span class="ke-outline" data-name="'+b+'" title="'+c.lang(b)+'" unselectable="on">'),s.push('<span class="ke-toolbar-icon ke-toolbar-icon-url ke-icon-'+b+'" unselectable="on"></span></span>'))});var h=c.toolbar=wb({src:h,html:s.join(""),noDisableItems:c.noDisableItems,click:function(a,b){a.stop();if(c.menu){var d=c.menu.name;c.hideMenu();if(d===b)return}c.clickToolbar(b)}}),j=l(f)-h.div.height(),r=c.edit=ub({height:j>0&&l(f)>c.minHeight?j:c.minHeight,
+src:n,srcElement:c.srcElement,designMode:c.designMode,themesPath:c.themesPath,bodyClass:c.bodyClass,cssPath:c.cssPath,cssData:c.cssData,beforeGetHtml:function(a){a=c.beforeGetHtml(a);a=ha(Ia(a));return H(a,c.filterMode?c.htmlTags:null,c.urlType,c.wellFormatMode,c.indentChar)},beforeSetHtml:function(a){a=H(a,c.filterMode?c.htmlTags:null,"",!1);return c.beforeSetHtml(a)},afterSetHtml:function(){c.edit=r=this;c.afterSetHtml()},afterCreate:function(){c.edit=r=this;c.cmd=r.cmd;c._docMousedownFn=function(){c.menu&&
+c.hideMenu()};i(r.doc,document).mousedown(c._docMousedownFn);Sb.call(c);Tb.call(c);Ub.call(c);Vb.call(c);r.afterChange(function(){r.designMode&&(c.updateState(),c.addBookmark(),c.options.afterChange&&c.options.afterChange.call(c))});r.textarea.keyup(function(a){!a.ctrlKey&&!a.altKey&&Ib[a.which]&&c.options.afterChange&&c.options.afterChange.call(c)});c.readonlyMode&&c.readonly();c.isCreated=!0;if(c.initContent==="")c.initContent=c.html();if(c._undoStack.length>0){var a=c._undoStack.pop();a.start&&
+(c.html(a.html),r.cmd.range.moveToBookmark(a),c.select())}c.afterCreate();c.options.afterCreate&&c.options.afterCreate.call(c)}});m.removeClass("statusbar").addClass("ke-statusbar").append('<span class="ke-inline-block ke-statusbar-center-icon"></span>').append('<span class="ke-inline-block ke-statusbar-right-icon"></span>');if(c._fullscreenResizeHandler)i(b).unbind("resize",c._fullscreenResizeHandler),c._fullscreenResizeHandler=null;a();d?(c._fullscreenResizeHandler=function(){c.isCreated&&c.resize(X().clientWidth,
+X().clientHeight,!1)},i(b).bind("resize",c._fullscreenResizeHandler),h.select("fullscreen"),m.first().css("visibility","hidden"),m.last().css("visibility","hidden")):(la&&i(b).bind("scroll",function(){c._scrollPos=na()}),c.resizeType>0?Xa({moveEl:k,clickEl:m,moveFn:function(a,b,d,g,e,f){g+=f;c.resize(null,g)}}):m.first().css("visibility","hidden"),c.resizeType===2?Xa({moveEl:k,clickEl:m.last(),moveFn:function(a,b,d,g,e,f){d+=e;g+=f;c.resize(d,g)}}):m.last().css("visibility","hidden"));return c},remove:function(){var a=
+this;if(!a.isCreated)return a;a.beforeRemove();a.srcElement.data("kindeditor","");a.menu&&a.hideMenu();h(a.dialogs,function(){a.hideDialog()});i(document).unbind("mousedown",a._docMousedownFn);a.toolbar.remove();a.edit.remove();a.statusbar.last().unbind();a.statusbar.unbind();a.container.remove();a.container=a.toolbar=a.edit=a.menu=null;a.dialogs=[];a.isCreated=!1;return a},resize:function(a,c,b){b=q(b,!0);if(a&&(/%/.test(a)||(a=l(a),a=a<this.minWidth?this.minWidth:a),this.container.css("width",o(a)),
+b))this.width=o(a);if(c&&(c=l(c),editHeight=l(c)-this.toolbar.div.height()-this.statusbar.height(),editHeight=editHeight<this.minHeight?this.minHeight:editHeight,this.edit.setHeight(editHeight),b))this.height=o(c);return this},select:function(){this.isCreated&&this.cmd.select();return this},html:function(a){if(a===d)return this.isCreated?this.edit.html():wa(this.srcElement);this.isCreated?this.edit.html(a):wa(this.srcElement,a);this.isCreated&&this.cmd.selection();return this},fullHtml:function(){return this.isCreated?
+this.edit.html(d,!0):""},text:function(a){return a===d?m(this.html().replace(/<(?!img|embed).*?>/ig,"").replace(/&nbsp;/ig," ")):this.html(s(a))},isEmpty:function(){return m(this.text().replace(/\r\n|\n|\r/,""))===""},isDirty:function(){return m(this.initContent.replace(/\r\n|\n|\r|t/g,""))!==m(this.html().replace(/\r\n|\n|\r|t/g,""))},selectedHtml:function(){var a=this.isCreated?this.cmd.range.html():"";return a=ha(Ia(a))},count:function(a){a=(a||"html").toLowerCase();if(a==="html")return this.html().length;
+if(a==="text")return this.text().replace(/<(?:img|embed).*?>/ig,"K").replace(/\r\n|\n|\r/g,"").length;return 0},exec:function(a){var a=a.toLowerCase(),c=this.cmd,b=e(a,"selectall,copy,paste,print".split(","))<0;b&&this.addBookmark(!1);c[a].apply(c,D(arguments,1));b&&(this.updateState(),this.addBookmark(!1),this.options.afterChange&&this.options.afterChange.call(this));return this},insertHtml:function(a,c){if(!this.isCreated)return this;a=this.beforeSetHtml(a);this.exec("inserthtml",a,c);return this},
+appendHtml:function(a){this.html(this.html()+a);if(this.isCreated)a=this.cmd,a.range.selectNodeContents(a.doc.body).collapse(!1),a.select();return this},sync:function(){wa(this.srcElement,this.html());return this},focus:function(){this.isCreated?this.edit.focus():this.srcElement[0].focus();return this},blur:function(){this.isCreated?this.edit.blur():this.srcElement[0].blur();return this},addBookmark:function(a){var a=q(a,!0),c=this.edit,b=c.doc.body,d=Ia(b.innerHTML);if(a&&this._undoStack.length>
+0&&Math.abs(d.length-ha(this._undoStack[this._undoStack.length-1].html).length)<this.minChangeSize)return this;c.designMode&&!this._firstAddBookmark?(c=this.cmd.range,a=c.createBookmark(!0),a.html=Ia(b.innerHTML),c.moveToBookmark(a)):a={html:d};this._firstAddBookmark=!1;Db(this._undoStack,a);return this},undo:function(){return Eb.call(this,this._undoStack,this._redoStack)},redo:function(){return Eb.call(this,this._redoStack,this._undoStack)},fullscreen:function(a){this.fullscreenMode=a===d?!this.fullscreenMode:
+a;this.addBookmark(!1);return this.remove().create()},readonly:function(a){var a=q(a,!0),c=this,b=c.edit,d=b.doc;c.designMode?c.toolbar.disableAll(a,[]):h(c.noDisableItems,function(){c.toolbar[a?"disable":"enable"](this)});F?d.body.contentEditable=!a:d.designMode=a?"off":"on";b.textarea[0].disabled=a},createMenu:function(a){var c=this.toolbar.get(a.name),b=c.pos();a.x=b.x;a.y=b.y+c.height();a.z=this.options.zIndex;a.shadowMode=q(a.shadowMode,this.shadowMode);a.selectedColor!==d?(a.cls="ke-colorpicker-"+
+this.themeType,a.noColor=this.lang("noColor"),this.menu=xb(a)):(a.cls="ke-menu-"+this.themeType,a.centerLineMode=!1,this.menu=ab(a));return this.menu},hideMenu:function(){this.menu.remove();this.menu=null;return this},hideContextmenu:function(){this.contextmenu.remove();this.contextmenu=null;return this},createDialog:function(a){var b=this;a.z=b.options.zIndex;a.shadowMode=q(a.shadowMode,b.shadowMode);a.closeBtn=q(a.closeBtn,{name:b.lang("close"),click:function(){b.hideDialog();F&&b.cmd&&b.cmd.select()}});
+a.noBtn=q(a.noBtn,{name:b.lang(a.yesBtn?"no":"close"),click:function(){b.hideDialog();F&&b.cmd&&b.cmd.select()}});if(b.dialogAlignType!="page")a.alignEl=b.container;a.cls="ke-dialog-"+b.themeType;if(b.dialogs.length>0){var d=b.dialogs[b.dialogs.length-1];b.dialogs[0].setMaskIndex(d.z+2);a.z=d.z+3;a.showMask=!1}a=yb(a);b.dialogs.push(a);return a},hideDialog:function(){this.dialogs.length>0&&this.dialogs.pop().remove();this.dialogs.length>0&&this.dialogs[0].setMaskIndex(this.dialogs[this.dialogs.length-
+1].z-1);return this},errorDialog:function(a){var b=this.createDialog({width:750,title:this.lang("uploadError"),body:'<div style="padding:10px 20px;"><iframe frameborder="0" style="width:708px;height:400px;"></iframe></div>'}),b=i("iframe",b.div),d=i.iframeDoc(b);d.open();d.write(a);d.close();i(d.body).css("background-color","#FFF");b[0].contentWindow.focus();return this}};_instances=[];i.remove=function(a){Ca(a,function(a){this.remove();_instances.splice(a,1)})};i.sync=function(a){Ca(a,function(){this.sync()})};
+i.html=function(a,b){Ca(a,function(){this.html(b)})};i.insertHtml=function(a,b){Ca(a,function(){this.insertHtml(b)})};i.appendHtml=function(a,b){Ca(a,function(){this.appendHtml(b)})};F&&N<7&&ea(document,"BackgroundImageCache",!0);i.EditorClass=Ba;i.editor=function(a){return new Ba(a)};i.create=Fb;i.instances=_instances;i.plugin=Ab;i.lang=Cb;Ab("core",function(a){var c=this,g={undo:"Z",redo:"Y",bold:"B",italic:"I",underline:"U",print:"P",selectall:"A"};c.afterSetHtml(function(){c.options.afterChange&&
+c.options.afterChange.call(c)});c.afterCreate(function(){if(c.syncType=="form"){for(var d=a(c.srcElement),g=!1;d=d.parent();)if(d.name=="form"){g=!0;break}if(g){d.bind("submit",function(){c.sync();a(b).bind("unload",function(){c.edit.textarea.remove()})});var e=a('[type="reset"]',d);e.click(function(){c.html(c.initContent);c.cmd.selection()});c.beforeRemove(function(){d.unbind();e.unbind()})}}});c.clickToolbar("source",function(){c.edit.designMode?(c.toolbar.disableAll(!0),c.edit.design(!1),c.toolbar.select("source")):
+(c.toolbar.disableAll(!1),c.edit.design(!0),c.toolbar.unselect("source"),la?setTimeout(function(){c.cmd.selection()},0):c.cmd.selection());c.designMode=c.edit.designMode});c.afterCreate(function(){c.designMode||c.toolbar.disableAll(!0).select("source")});c.clickToolbar("fullscreen",function(){c.fullscreen()});if(c.fullscreenShortcut){var f=!1;c.afterCreate(function(){a(c.edit.doc,c.edit.textarea).keyup(function(a){a.which==27&&setTimeout(function(){c.fullscreen()},0)});if(f){if(F&&!c.designMode)return;
+c.focus()}f||(f=!0)})}h("undo,redo".split(","),function(a,b){g[b]&&c.afterCreate(function(){$(this.edit.doc,g[b],function(){c.clickToolbar(b)})});c.clickToolbar(b,function(){c[b]()})});c.clickToolbar("formatblock",function(){var a=c.lang("formatblock.formatBlock"),b={h1:28,h2:24,h3:18,H4:14,p:12},d=c.cmd.val("formatblock"),g=c.createMenu({name:"formatblock",width:c.langType=="en"?200:150});h(a,function(a,e){var f="font-size:"+b[a]+"px;";a.charAt(0)==="h"&&(f+="font-weight:bold;");g.addItem({title:'<span style="'+
+f+'" unselectable="on">'+e+"</span>",height:b[a]+12,checked:d===a||d===e,click:function(){c.select().exec("formatblock","<"+a+">").hideMenu()}})})});c.clickToolbar("fontname",function(){var a=c.cmd.val("fontname"),b=c.createMenu({name:"fontname",width:150});h(c.lang("fontname.fontName"),function(d,g){b.addItem({title:'<span style="font-family: '+d+';" unselectable="on">'+g+"</span>",checked:a===d.toLowerCase()||a===g.toLowerCase(),click:function(){c.exec("fontname",d).hideMenu()}})})});c.clickToolbar("fontsize",
+function(){var a=c.cmd.val("fontsize"),b=c.createMenu({name:"fontsize",width:150});h(c.fontSizeTable,function(d,g){b.addItem({title:'<span style="font-size:'+g+';" unselectable="on">'+g+"</span>",height:l(g)+12,checked:a===g,click:function(){c.exec("fontsize",g).hideMenu()}})})});h("forecolor,hilitecolor".split(","),function(a,b){c.clickToolbar(b,function(){c.createMenu({name:b,selectedColor:c.cmd.val(b)||"default",colors:c.colorTable,click:function(a){c.exec(b,a).hideMenu()}})})});h("cut,copy,paste".split(","),
+function(a,b){c.clickToolbar(b,function(){c.focus();try{c.exec(b,null)}catch(a){alert(c.lang(b+"Error"))}})});c.clickToolbar("about",function(){var a='<div style="margin:20px;"><div>KindEditor '+Ka+'</div><div>Copyright &copy; <a href="http://www.kindsoft.net/" target="_blank">kindsoft.net</a> All rights reserved.</div></div>';c.createDialog({name:"about",width:350,title:c.lang("about"),body:a})});c.plugin.getSelectedLink=function(){return c.cmd.commonAncestor("a")};c.plugin.getSelectedImage=function(){return Ha(c.edit.cmd.range,
+function(a){return!/^ke-\w+$/i.test(a[0].className)})};c.plugin.getSelectedFlash=function(){return Ha(c.edit.cmd.range,function(a){return a[0].className=="ke-flash"})};c.plugin.getSelectedMedia=function(){return Ha(c.edit.cmd.range,function(a){return a[0].className=="ke-media"||a[0].className=="ke-rm"})};c.plugin.getSelectedAnchor=function(){return Ha(c.edit.cmd.range,function(a){return a[0].className=="ke-anchor"})};h("link,image,flash,media,anchor".split(","),function(a,b){var g=b.charAt(0).toUpperCase()+
+b.substr(1);h("edit,delete".split(","),function(a,e){c.addContextmenu({title:c.lang(e+g),click:function(){c.loadPlugin(b,function(){c.plugin[b][e]();c.hideMenu()})},cond:c.plugin["getSelected"+g],width:150,iconClass:e=="edit"?"ke-icon-"+b:d})});c.addContextmenu({title:"-"})});c.plugin.getSelectedTable=function(){return c.cmd.commonAncestor("table")};c.plugin.getSelectedRow=function(){return c.cmd.commonAncestor("tr")};c.plugin.getSelectedCell=function(){return c.cmd.commonAncestor("td")};h("prop,cellprop,colinsertleft,colinsertright,rowinsertabove,rowinsertbelow,rowmerge,colmerge,rowsplit,colsplit,coldelete,rowdelete,insert,delete".split(","),
+function(a,b){var d=e(b,["prop","delete"])<0?c.plugin.getSelectedCell:c.plugin.getSelectedTable;c.addContextmenu({title:c.lang("table"+b),click:function(){c.loadPlugin("table",function(){c.plugin.table[b]();c.hideMenu()})},cond:d,width:170,iconClass:"ke-icon-table"+b})});c.addContextmenu({title:"-"});h("selectall,justifyleft,justifycenter,justifyright,justifyfull,insertorderedlist,insertunorderedlist,indent,outdent,subscript,superscript,hr,print,bold,italic,underline,strikethrough,removeformat,unlink".split(","),
+function(a,b){g[b]&&c.afterCreate(function(){$(this.edit.doc,g[b],function(){c.cmd.selection();c.clickToolbar(b)})});c.clickToolbar(b,function(){c.focus().exec(b,null)})});c.afterCreate(function(){function b(){g.range.moveToBookmark(e);g.select();ka&&(a("div."+i,f).each(function(){a(this).after("<br />").remove(!0)}),a("span.Apple-style-span",f).remove(!0),a("span.Apple-tab-span",f).remove(!0),a("span[style]",f).each(function(){a(this).css("white-space")=="nowrap"&&a(this).remove(!0)}),a("meta",f).remove());
+var d=f[0].innerHTML;f.remove();d!==""&&(ka&&(d=d.replace(/(<br>)\1/ig,"$1")),c.pasteType===2&&(d=d.replace(/(<(?:p|p\s[^>]*)>) *(<\/p>)/ig,""),/schemas-microsoft-com|worddocument|mso-\w+/i.test(d)?d=U(d,c.filterMode?c.htmlTags:a.options.htmlTags):(d=H(d,c.filterMode?c.htmlTags:null),d=c.beforeSetHtml(d))),c.pasteType===1&&(d=d.replace(/&nbsp;/ig," "),d=d.replace(/\n\s*\n/g,"\n"),d=d.replace(/<br[^>]*>/ig,"\n"),d=d.replace(/<\/p><p[^>]*>/ig,"\n"),d=d.replace(/<[^>]+>/g,""),d=d.replace(/ {2}/g," &nbsp;"),
+c.newlineTag=="p"?/\n/.test(d)&&(d=d.replace(/^/,"<p>").replace(/$/,"<br /></p>").replace(/\n/g,"<br /></p><p>")):d=d.replace(/\n/g,"<br />$&")),c.insertHtml(d,!0))}var d=c.edit.doc,g,e,f,i="__kindeditor_paste__",h=!1;a(d.body).bind("paste",function(l){if(c.pasteType===0)l.stop();else if(!h){h=!0;a("div."+i,d).remove();g=c.cmd.selection();e=g.range.createBookmark();f=a('<div class="'+i+'"></div>',d).css({position:"absolute",width:"1px",height:"1px",overflow:"hidden",left:"-1981px",top:a(e.start).pos().y+
+"px","white-space":"nowrap"});a(d.body).append(f);if(F){var n=g.range.get(!0);n.moveToElementText(f[0]);n.select();n.execCommand("paste");l.preventDefault()}else g.range.selectNodeContents(f[0]),g.select();setTimeout(function(){b();h=!1},0)}})});c.beforeGetHtml(function(a){F&&N<=8&&(a=a.replace(/<div\s+[^>]*data-ke-input-tag="([^"]*)"[^>]*>([\s\S]*?)<\/div>/ig,function(a,b){return unescape(b)}),a=a.replace(/(<input)((?:\s+[^>]*)?>)/ig,function(a,b,c){if(!/\s+type="[^"]+"/i.test(a))return b+' type="text"'+
+c;return a}));return a.replace(/(<(?:noscript|noscript\s[^>]*)>)([\s\S]*?)(<\/noscript>)/ig,function(a,b,c,d){return b+v(c).replace(/\s+/g," ")+d}).replace(/<img[^>]*class="?ke-(flash|rm|media)"?[^>]*>/ig,function(a){var a=K(a),b=M(a.style||""),c=S(a["data-ke-tag"]),d=q(b.width,""),b=q(b.height,"");/px/i.test(d)&&(d=l(d));/px/i.test(b)&&(b=l(b));c.width=q(a.width,d);c.height=q(a.height,b);return Na(c)}).replace(/<img[^>]*class="?ke-anchor"?[^>]*>/ig,function(a){a=K(a);return'<a name="'+unescape(a["data-ke-name"])+
+'"></a>'}).replace(/<div\s+[^>]*data-ke-script-attr="([^"]*)"[^>]*>([\s\S]*?)<\/div>/ig,function(a,b,c){return"<script"+unescape(b)+">"+unescape(c)+"<\/script>"}).replace(/<div\s+[^>]*data-ke-noscript-attr="([^"]*)"[^>]*>([\s\S]*?)<\/div>/ig,function(a,b,c){return"<noscript"+unescape(b)+">"+unescape(c)+"</noscript>"}).replace(/(<[^>]*)data-ke-src="([^"]*)"([^>]*>)/ig,function(a,b,c){a=a.replace(/(\s+(?:href|src)=")[^"]*(")/i,function(a,b,d){return b+v(c)+d});return a=a.replace(/\s+data-ke-src="[^"]*"/i,
+"")}).replace(/(<[^>]+\s)data-ke-(on\w+="[^"]*"[^>]*>)/ig,function(a,b,c){return b+c})});c.beforeSetHtml(function(a){F&&N<=8&&(a=a.replace(/<input[^>]*>|<(select|button)[^>]*>[\s\S]*?<\/\1>/ig,function(a){var b=K(a);if(M(b.style||"").display=="none")return'<div class="ke-display-none" data-ke-input-tag="'+escape(a)+'"></div>';return a}));return a.replace(/<embed[^>]*type="([^"]+)"[^>]*>(?:<\/embed>)?/ig,function(a){a=K(a);a.src=q(a.src,"");a.width=q(a.width,0);a.height=q(a.height,0);return kb(c.themesPath+
+"common/blank.gif",a)}).replace(/<a[^>]*name="([^"]+)"[^>]*>(?:<\/a>)?/ig,function(a){var b=K(a);if(b.href!==d)return a;return'<img class="ke-anchor" src="'+c.themesPath+'common/anchor.gif" data-ke-name="'+escape(b.name)+'" />'}).replace(/<script([^>]*)>([\s\S]*?)<\/script>/ig,function(a,b,c){return'<div class="ke-script" data-ke-script-attr="'+escape(b)+'">'+escape(c)+"</div>"}).replace(/<noscript([^>]*)>([\s\S]*?)<\/noscript>/ig,function(a,b,c){return'<div class="ke-noscript" data-ke-noscript-attr="'+
+escape(b)+'">'+escape(c)+"</div>"}).replace(/(<[^>]*)(href|src)="([^"]*)"([^>]*>)/ig,function(a,b,c,d,g){if(a.match(/\sdata-ke-src="[^"]*"/i))return a;return a=b+c+'="'+d+'" data-ke-src="'+s(d)+'"'+g}).replace(/(<[^>]+\s)(on\w+="[^"]*"[^>]*>)/ig,function(a,b,c){return b+"data-ke-"+c}).replace(/<table[^>]*\s+border="0"[^>]*>/ig,function(a){if(a.indexOf("ke-zeroborder")>=0)return a;return O(a,"ke-zeroborder")})})})}})(window);
+KindEditor.lang({source:"HTML\u4ee3\u7801",preview:"\u9884\u89c8",undo:"\u540e\u9000(Ctrl+Z)",redo:"\u524d\u8fdb(Ctrl+Y)",cut:"\u526a\u5207(Ctrl+X)",copy:"\u590d\u5236(Ctrl+C)",paste:"\u7c98\u8d34(Ctrl+V)",plainpaste:"\u7c98\u8d34\u4e3a\u65e0\u683c\u5f0f\u6587\u672c",wordpaste:"\u4eceWord\u7c98\u8d34",selectall:"\u5168\u9009(Ctrl+A)",justifyleft:"\u5de6\u5bf9\u9f50",justifycenter:"\u5c45\u4e2d",justifyright:"\u53f3\u5bf9\u9f50",justifyfull:"\u4e24\u7aef\u5bf9\u9f50",insertorderedlist:"\u7f16\u53f7",
+insertunorderedlist:"\u9879\u76ee\u7b26\u53f7",indent:"\u589e\u52a0\u7f29\u8fdb",outdent:"\u51cf\u5c11\u7f29\u8fdb",subscript:"\u4e0b\u6807",superscript:"\u4e0a\u6807",formatblock:"\u6bb5\u843d",fontname:"\u5b57\u4f53",fontsize:"\u6587\u5b57\u5927\u5c0f",forecolor:"\u6587\u5b57\u989c\u8272",hilitecolor:"\u6587\u5b57\u80cc\u666f",bold:"\u7c97\u4f53(Ctrl+B)",italic:"\u659c\u4f53(Ctrl+I)",underline:"\u4e0b\u5212\u7ebf(Ctrl+U)",strikethrough:"\u5220\u9664\u7ebf",removeformat:"\u5220\u9664\u683c\u5f0f",
+image:"\u56fe\u7247",multiimage:"\u6279\u91cf\u56fe\u7247\u4e0a\u4f20",flash:"Flash",media:"\u89c6\u97f3\u9891",table:"\u8868\u683c",tablecell:"\u5355\u5143\u683c",hr:"\u63d2\u5165\u6a2a\u7ebf",emoticons:"\u63d2\u5165\u8868\u60c5",link:"\u8d85\u7ea7\u94fe\u63a5",unlink:"\u53d6\u6d88\u8d85\u7ea7\u94fe\u63a5",fullscreen:"\u5168\u5c4f\u663e\u793a",about:"\u5173\u4e8e",print:"\u6253\u5370(Ctrl+P)",filemanager:"\u6587\u4ef6\u7a7a\u95f4",code:"\u63d2\u5165\u7a0b\u5e8f\u4ee3\u7801",map:"Google\u5730\u56fe",
+baidumap:"\u767e\u5ea6\u5730\u56fe",lineheight:"\u884c\u8ddd",clearhtml:"\u6e05\u7406HTML\u4ee3\u7801",pagebreak:"\u63d2\u5165\u5206\u9875\u7b26",quickformat:"\u4e00\u952e\u6392\u7248",insertfile:"\u63d2\u5165\u6587\u4ef6",template:"\u63d2\u5165\u6a21\u677f",anchor:"\u951a\u70b9",yes:"\u786e\u5b9a",no:"\u53d6\u6d88",close:"\u5173\u95ed",editImage:"\u56fe\u7247\u5c5e\u6027",deleteImage:"\u5220\u9664\u56fe\u7247",editFlash:"Flash\u5c5e\u6027",deleteFlash:"\u5220\u9664Flash",editMedia:"\u89c6\u97f3\u9891\u5c5e\u6027",
+deleteMedia:"\u5220\u9664\u89c6\u97f3\u9891",editLink:"\u8d85\u7ea7\u94fe\u63a5\u5c5e\u6027",deleteLink:"\u53d6\u6d88\u8d85\u7ea7\u94fe\u63a5",editAnchor:"\u951a\u70b9\u5c5e\u6027",deleteAnchor:"\u5220\u9664\u951a\u70b9",tableprop:"\u8868\u683c\u5c5e\u6027",tablecellprop:"\u5355\u5143\u683c\u5c5e\u6027",tableinsert:"\u63d2\u5165\u8868\u683c",tabledelete:"\u5220\u9664\u8868\u683c",tablecolinsertleft:"\u5de6\u4fa7\u63d2\u5165\u5217",tablecolinsertright:"\u53f3\u4fa7\u63d2\u5165\u5217",tablerowinsertabove:"\u4e0a\u65b9\u63d2\u5165\u884c",
+tablerowinsertbelow:"\u4e0b\u65b9\u63d2\u5165\u884c",tablerowmerge:"\u5411\u4e0b\u5408\u5e76\u5355\u5143\u683c",tablecolmerge:"\u5411\u53f3\u5408\u5e76\u5355\u5143\u683c",tablerowsplit:"\u62c6\u5206\u884c",tablecolsplit:"\u62c6\u5206\u5217",tablecoldelete:"\u5220\u9664\u5217",tablerowdelete:"\u5220\u9664\u884c",noColor:"\u65e0\u989c\u8272",pleaseSelectFile:"\u8bf7\u9009\u62e9\u6587\u4ef6\u3002",invalidImg:"\u8bf7\u8f93\u5165\u6709\u6548\u7684URL\u5730\u5740\u3002\n\u53ea\u5141\u8bb8jpg,gif,bmp,png\u683c\u5f0f\u3002",
+invalidMedia:"\u8bf7\u8f93\u5165\u6709\u6548\u7684URL\u5730\u5740\u3002\n\u53ea\u5141\u8bb8swf,flv,mp3,wav,wma,wmv,mid,avi,mpg,asf,rm,rmvb\u683c\u5f0f\u3002",invalidWidth:"\u5bbd\u5ea6\u5fc5\u987b\u4e3a\u6570\u5b57\u3002",invalidHeight:"\u9ad8\u5ea6\u5fc5\u987b\u4e3a\u6570\u5b57\u3002",invalidBorder:"\u8fb9\u6846\u5fc5\u987b\u4e3a\u6570\u5b57\u3002",invalidUrl:"\u8bf7\u8f93\u5165\u6709\u6548\u7684URL\u5730\u5740\u3002",invalidRows:"\u884c\u6570\u4e3a\u5fc5\u9009\u9879\uff0c\u53ea\u5141\u8bb8\u8f93\u5165\u5927\u4e8e0\u7684\u6570\u5b57\u3002",
+invalidCols:"\u5217\u6570\u4e3a\u5fc5\u9009\u9879\uff0c\u53ea\u5141\u8bb8\u8f93\u5165\u5927\u4e8e0\u7684\u6570\u5b57\u3002",invalidPadding:"\u8fb9\u8ddd\u5fc5\u987b\u4e3a\u6570\u5b57\u3002",invalidSpacing:"\u95f4\u8ddd\u5fc5\u987b\u4e3a\u6570\u5b57\u3002",invalidJson:"\u670d\u52a1\u5668\u53d1\u751f\u6545\u969c\u3002",uploadSuccess:"\u4e0a\u4f20\u6210\u529f\u3002",cutError:"\u60a8\u7684\u6d4f\u89c8\u5668\u5b89\u5168\u8bbe\u7f6e\u4e0d\u5141\u8bb8\u4f7f\u7528\u526a\u5207\u64cd\u4f5c\uff0c\u8bf7\u4f7f\u7528\u5feb\u6377\u952e(Ctrl+X)\u6765\u5b8c\u6210\u3002",
+copyError:"\u60a8\u7684\u6d4f\u89c8\u5668\u5b89\u5168\u8bbe\u7f6e\u4e0d\u5141\u8bb8\u4f7f\u7528\u590d\u5236\u64cd\u4f5c\uff0c\u8bf7\u4f7f\u7528\u5feb\u6377\u952e(Ctrl+C)\u6765\u5b8c\u6210\u3002",pasteError:"\u60a8\u7684\u6d4f\u89c8\u5668\u5b89\u5168\u8bbe\u7f6e\u4e0d\u5141\u8bb8\u4f7f\u7528\u7c98\u8d34\u64cd\u4f5c\uff0c\u8bf7\u4f7f\u7528\u5feb\u6377\u952e(Ctrl+V)\u6765\u5b8c\u6210\u3002",ajaxLoading:"\u52a0\u8f7d\u4e2d\uff0c\u8bf7\u7a0d\u5019 ...",uploadLoading:"\u4e0a\u4f20\u4e2d\uff0c\u8bf7\u7a0d\u5019 ...",
+uploadError:"\u4e0a\u4f20\u9519\u8bef","plainpaste.comment":"\u8bf7\u4f7f\u7528\u5feb\u6377\u952e(Ctrl+V)\u628a\u5185\u5bb9\u7c98\u8d34\u5230\u4e0b\u9762\u7684\u65b9\u6846\u91cc\u3002","wordpaste.comment":"\u8bf7\u4f7f\u7528\u5feb\u6377\u952e(Ctrl+V)\u628a\u5185\u5bb9\u7c98\u8d34\u5230\u4e0b\u9762\u7684\u65b9\u6846\u91cc\u3002","code.pleaseInput":"\u8bf7\u8f93\u5165\u7a0b\u5e8f\u4ee3\u7801\u3002","link.url":"URL","link.linkType":"\u6253\u5f00\u7c7b\u578b","link.newWindow":"\u65b0\u7a97\u53e3","link.selfWindow":"\u5f53\u524d\u7a97\u53e3",
+"flash.url":"URL","flash.width":"\u5bbd\u5ea6","flash.height":"\u9ad8\u5ea6","flash.upload":"\u4e0a\u4f20","flash.viewServer":"\u6587\u4ef6\u7a7a\u95f4","media.url":"URL","media.width":"\u5bbd\u5ea6","media.height":"\u9ad8\u5ea6","media.autostart":"\u81ea\u52a8\u64ad\u653e","media.upload":"\u4e0a\u4f20","media.viewServer":"\u6587\u4ef6\u7a7a\u95f4","image.remoteImage":"\u7f51\u7edc\u56fe\u7247","image.localImage":"\u672c\u5730\u4e0a\u4f20","image.remoteUrl":"\u56fe\u7247\u5730\u5740","image.localUrl":"\u4e0a\u4f20\u6587\u4ef6",
+"image.size":"\u56fe\u7247\u5927\u5c0f","image.width":"\u5bbd","image.height":"\u9ad8","image.resetSize":"\u91cd\u7f6e\u5927\u5c0f","image.align":"\u5bf9\u9f50\u65b9\u5f0f","image.defaultAlign":"\u9ed8\u8ba4\u65b9\u5f0f","image.leftAlign":"\u5de6\u5bf9\u9f50","image.rightAlign":"\u53f3\u5bf9\u9f50","image.imgTitle":"\u56fe\u7247\u8bf4\u660e","image.upload":"\u6d4f\u89c8...","image.viewServer":"\u56fe\u7247\u7a7a\u95f4","multiimage.uploadDesc":"\u5141\u8bb8\u7528\u6237\u540c\u65f6\u4e0a\u4f20<%=uploadLimit%>\u5f20\u56fe\u7247\uff0c\u5355\u5f20\u56fe\u7247\u5bb9\u91cf\u4e0d\u8d85\u8fc7<%=sizeLimit%>",
+"multiimage.startUpload":"\u5f00\u59cb\u4e0a\u4f20","multiimage.clearAll":"\u5168\u90e8\u6e05\u7a7a","multiimage.insertAll":"\u5168\u90e8\u63d2\u5165","multiimage.queueLimitExceeded":"\u6587\u4ef6\u6570\u91cf\u8d85\u8fc7\u9650\u5236\u3002","multiimage.fileExceedsSizeLimit":"\u6587\u4ef6\u5927\u5c0f\u8d85\u8fc7\u9650\u5236\u3002","multiimage.zeroByteFile":"\u65e0\u6cd5\u4e0a\u4f20\u7a7a\u6587\u4ef6\u3002","multiimage.invalidFiletype":"\u6587\u4ef6\u7c7b\u578b\u4e0d\u6b63\u786e\u3002","multiimage.unknownError":"\u53d1\u751f\u5f02\u5e38\uff0c\u65e0\u6cd5\u4e0a\u4f20\u3002",
+"multiimage.pending":"\u7b49\u5f85\u4e0a\u4f20","multiimage.uploadError":"\u4e0a\u4f20\u5931\u8d25","filemanager.emptyFolder":"\u7a7a\u6587\u4ef6\u5939","filemanager.moveup":"\u79fb\u5230\u4e0a\u4e00\u7ea7\u6587\u4ef6\u5939","filemanager.viewType":"\u663e\u793a\u65b9\u5f0f\uff1a","filemanager.viewImage":"\u7f29\u7565\u56fe","filemanager.listImage":"\u8be6\u7ec6\u4fe1\u606f","filemanager.orderType":"\u6392\u5e8f\u65b9\u5f0f\uff1a","filemanager.fileName":"\u540d\u79f0","filemanager.fileSize":"\u5927\u5c0f",
+"filemanager.fileType":"\u7c7b\u578b","insertfile.url":"URL","insertfile.title":"\u6587\u4ef6\u8bf4\u660e","insertfile.upload":"\u4e0a\u4f20","insertfile.viewServer":"\u6587\u4ef6\u7a7a\u95f4","table.cells":"\u5355\u5143\u683c\u6570","table.rows":"\u884c\u6570","table.cols":"\u5217\u6570","table.size":"\u5927\u5c0f","table.width":"\u5bbd\u5ea6","table.height":"\u9ad8\u5ea6","table.percent":"%","table.px":"px","table.space":"\u8fb9\u8ddd\u95f4\u8ddd","table.padding":"\u8fb9\u8ddd","table.spacing":"\u95f4\u8ddd",
+"table.align":"\u5bf9\u9f50\u65b9\u5f0f","table.textAlign":"\u6c34\u5e73\u5bf9\u9f50","table.verticalAlign":"\u5782\u76f4\u5bf9\u9f50","table.alignDefault":"\u9ed8\u8ba4","table.alignLeft":"\u5de6\u5bf9\u9f50","table.alignCenter":"\u5c45\u4e2d","table.alignRight":"\u53f3\u5bf9\u9f50","table.alignTop":"\u9876\u90e8","table.alignMiddle":"\u4e2d\u90e8","table.alignBottom":"\u5e95\u90e8","table.alignBaseline":"\u57fa\u7ebf","table.border":"\u8fb9\u6846","table.borderWidth":"\u8fb9\u6846","table.borderColor":"\u989c\u8272",
+"table.backgroundColor":"\u80cc\u666f\u989c\u8272","map.address":"\u5730\u5740: ","map.search":"\u641c\u7d22","baidumap.address":"\u5730\u5740: ","baidumap.search":"\u641c\u7d22","baidumap.insertDynamicMap":"\u63d2\u5165\u52a8\u6001\u5730\u56fe","anchor.name":"\u951a\u70b9\u540d\u79f0","formatblock.formatBlock":{h1:"\u6807\u9898 1",h2:"\u6807\u9898 2",h3:"\u6807\u9898 3",h4:"\u6807\u9898 4",p:"\u6b63 \u6587"},"fontname.fontName":{SimSun:"\u5b8b\u4f53",NSimSun:"\u65b0\u5b8b\u4f53",FangSong_GB2312:"\u4eff\u5b8b_GB2312",
+KaiTi_GB2312:"\u6977\u4f53_GB2312",SimHei:"\u9ed1\u4f53","Microsoft YaHei":"\u5fae\u8f6f\u96c5\u9ed1",Arial:"Arial","Arial Black":"Arial Black","Times New Roman":"Times New Roman","Courier New":"Courier New",Tahoma:"Tahoma",Verdana:"Verdana"},"lineheight.lineHeight":[{1:"\u5355\u500d\u884c\u8ddd"},{"1.5":"1.5\u500d\u884c\u8ddd"},{2:"2\u500d\u884c\u8ddd"},{"2.5":"2.5\u500d\u884c\u8ddd"},{3:"3\u500d\u884c\u8ddd"}],"template.selectTemplate":"\u53ef\u9009\u6a21\u677f","template.replaceContent":"\u66ff\u6362\u5f53\u524d\u5185\u5bb9",
+"template.fileList":{"1.html":"\u56fe\u7247\u548c\u6587\u5b57","2.html":"\u8868\u683c","3.html":"\u9879\u76ee\u7f16\u53f7"}},"zh_CN");
+KindEditor.plugin("anchor",function(b){var d=this,f=d.lang("anchor.");d.plugin.anchor={edit:function(){var j=['<div style="padding:20px;"><div class="ke-dialog-row">','<label for="keName">'+f.name+"</label>",'<input class="ke-input-text" type="text" id="keName" name="name" value="" style="width:100px;" /></div></div>'].join(""),j=d.createDialog({name:"anchor",width:300,title:d.lang("anchor"),body:j,yesBtn:{name:d.lang("yes"),click:function(){d.insertHtml('<a name="'+e.val()+'">').hideDialog().focus()}}}).div,
+e=b('input[name="name"]',j);(j=d.plugin.getSelectedAnchor())&&e.val(unescape(j.attr("data-ke-name")));e[0].focus();e[0].select()},"delete":function(){d.plugin.getSelectedAnchor().remove()}};d.clickToolbar("anchor",d.plugin.anchor.edit)});
+KindEditor.plugin("autoheight",function(b){function d(){var d=j.edit,f=d.doc.body;d.iframe.height(e);j.resize(null,Math.max((b.IE?f.scrollHeight:f.offsetHeight)+76,e))}function f(){e=b.removeUnit(j.height);j.edit.afterChange(d);var f=j.edit,m=f.doc.body;f.iframe[0].scroll="no";m.style.overflowY="hidden";d()}var j=this;if(j.autoHeightMode){var e;j.isCreated?f():j.afterCreate(f)}});
+KindEditor.plugin("baidumap",function(b){var d=this,f=d.lang("baidumap."),j=b.undef(d.mapWidth,558),e=b.undef(d.mapHeight,360);d.clickToolbar("baidumap",function(){function h(){v=r[0].contentWindow;p=b.iframeDoc(r)}var m=['<div style="padding:10px 20px;"><div class="ke-header"><div class="ke-left">',f.address+' <input id="kindeditor_plugin_map_address" name="address" class="ke-input-text" value="" style="width:200px;" /> ','<span class="ke-button-common ke-button-outer">','<input type="button" name="searchBtn" class="ke-button-common ke-button" value="'+
+f.search+'" />','</span></div><div class="ke-right">','<input type="checkbox" id="keInsertDynamicMap" name="insertDynamicMap" value="1" /> <label for="keInsertDynamicMap">'+f.insertDynamicMap+"</label>",'</div><div class="ke-clearfix"></div></div>','<div class="ke-map" style="width:'+j+"px;height:"+e+'px;"></div>',"</div>"].join(""),m=d.createDialog({name:"baidumap",width:j+42,title:d.lang("baidumap"),body:m,yesBtn:{name:d.lang("yes"),click:function(){var b=v.map,f=b.getCenter(),f=f.lng+","+f.lat,
+b=b.getZoom(),b=[s[0].checked?d.pluginsPath+"baidumap/index.html":"http://api.map.baidu.com/staticimage","?center="+encodeURIComponent(f),"&zoom="+encodeURIComponent(b),"&width="+j,"&height="+e,"&markers="+encodeURIComponent(f),"&markerStyles="+encodeURIComponent("l,A")].join("");s[0].checked?d.insertHtml('<iframe src="'+b+'" frameborder="0" style="width:'+(j+2)+"px;height:"+(e+2)+'px;"></iframe>'):d.exec("insertimage",b);d.hideDialog().focus()}},beforeRemove:function(){l.remove();p&&p.write("");
+r.remove()}}),n=m.div,o=b('[name="address"]',n),l=b('[name="searchBtn"]',n),s=b('[name="insertDynamicMap"]',m.div),v,p,r=b('<iframe class="ke-textarea" frameborder="0" src="'+d.pluginsPath+'baidumap/map.html" style="width:'+j+"px;height:"+e+'px;"></iframe>');r.bind("load",function(){r.unbind("load");b.IE?h():setTimeout(h,0)});b(".ke-map",n).replaceWith(r);l.click(function(){v.search(o.val())})})});
+KindEditor.plugin("clearhtml",function(b){var d=this;d.clickToolbar("clearhtml",function(){d.focus();var f=d.html(),f=f.replace(/(<script[^>]*>)([\s\S]*?)(<\/script>)/ig,""),f=f.replace(/(<style[^>]*>)([\s\S]*?)(<\/style>)/ig,""),f=b.formatHtml(f,{a:["href","target"],embed:["src","width","height","type","loop","autostart","quality",".width",".height","align","allowscriptaccess"],img:["src","width","height","border","alt","title",".width",".height"],table:["border"],"td,th":["rowspan","colspan"],"div,hr,br,tbody,tr,p,ol,ul,li,blockquote,h1,h2,h3,h4,h5,h6":[]});
+d.html(f);d.cmd.selection(!0);d.addBookmark()})});
+KindEditor.plugin("code",function(b){var d=this;d.clickToolbar("code",function(){var f=d.lang("code."),j=d.createDialog({name:"code",width:450,title:d.lang("code"),body:'<div style="padding:10px 20px;"><div class="ke-dialog-row"><select class="ke-code-type"><option value="js">JavaScript</option><option value="html">HTML</option><option value="css">CSS</option><option value="php">PHP</option><option value="pl">Perl</option><option value="py">Python</option><option value="rb">Ruby</option><option value="java">Java</option><option value="vb">ASP/VB</option><option value="cpp">C/C++</option><option value="cs">C#</option><option value="xml">XML</option><option value="bsh">Shell</option><option value="">Other</option></select></div><textarea class="ke-textarea" style="width:408px;height:260px;"></textarea></div>',yesBtn:{name:d.lang("yes"),
+click:function(){var h=b(".ke-code-type",j.div).val(),m=e.val(),h='<pre class="prettyprint'+(h===""?"":" lang-"+h)+'">\n'+b.escape(m)+"</pre> ";b.trim(m)===""?(alert(f.pleaseInput),e[0].focus()):d.insertHtml(h).hideDialog().focus()}}}),e=b("textarea",j.div);e[0].focus()})});
+KindEditor.plugin("emoticons",function(b){var d=this,f=d.emoticonsPath||d.pluginsPath+"emoticons/images/",j=d.allowPreviewEmoticons===void 0?!0:d.allowPreviewEmoticons,e=1;d.clickToolbar("emoticons",function(){function h(e,h,l){B?e.mouseover(function(){h>D?(B.css("left",0),B.css("right","")):(B.css("left",""),B.css("right",0));G.attr("src",f+l+".gif");b(this).addClass("ke-on")}):e.mouseover(function(){b(this).addClass("ke-on")});e.mouseout(function(){b(this).removeClass("ke-on")});e.click(function(b){d.insertHtml('<img src="'+
+f+l+'.gif" border="0" alt="" />').hideMenu().focus();b.stop()})}function m(d,e){var l=document.createElement("table");e.append(l);B&&(b(l).mouseover(function(){B.show("block")}),b(l).mouseout(function(){B.hide()}),A.push(b(l)));l.className="ke-table";l.cellPadding=0;l.cellSpacing=0;l.border=0;for(var n=(d-1)*r+p,o=0;o<s;o++)for(var m=l.insertRow(o),j=0;j<v;j++){var q=b(m.insertCell(j));q.addClass("ke-cell");h(q,j,n);var u=b('<span class="ke-img"></span>').css("background-position","-"+24*n+"px 0px").css("background-image",
+"url("+f+"static.gif)");q.append(u);A.push(q);n++}return l}function n(){b.each(A,function(){this.unbind()})}function o(b,d){b.click(function(b){n();C.parentNode.removeChild(C);u.remove();C=m(d,q);l(d);e=d;b.stop()})}function l(d){u=b('<div class="ke-page"></div>');q.append(u);for(var e=1;e<=z;e++){if(d!==e){var f=b('<a href="javascript:;">['+e+"]</a>");o(f,e);u.append(f);A.push(f)}else u.append(b("@["+e+"]"));u.append(b("@&nbsp;"))}}var s=5,v=9,p=0,r=s*v,z=Math.ceil(135/r),D=Math.floor(v/2),q=b('<div class="ke-plugin-emoticons"></div>'),
+A=[];d.createMenu({name:"emoticons",beforeRemove:function(){n()}}).div.append(q);var B,G;j&&(B=b('<div class="ke-preview"></div>').css("right",0),G=b('<img class="ke-preview-img" src="'+f+p+'.gif" />'),q.append(B),B.append(G));var C=m(e,q),u;l(e)})});
+KindEditor.plugin("filemanager",function(b){function d(b,d){d.is_dir?b.attr("title",d.filename):b.attr("title",d.filename+" ("+Math.ceil(d.filesize/1024)+"KB, "+d.datetime+")")}var f=this,j=b.undef(f.fileManagerJson,f.basePath+"php/file_manager_json.php"),e=f.pluginsPath+"filemanager/images/",h=f.lang("filemanager.");f.plugin.filemanagerDialog=function(m){function n(d,e,h){d="path="+d+"&order="+e+"&dir="+z;A.showLoading(f.lang("ajaxLoading"));b.ajax(b.addParam(j,d+"&"+(new Date).getTime()),function(b){A.hideLoading();
+h(b)})}function o(d,e,f,h){var l=b.formatUrl(e.current_url+f.filename,"absolute"),o=encodeURIComponent(e.current_dir_path+f.filename+"/");f.is_dir?d.click(function(){n(o,u.val(),h)}):f.is_photo?d.click(function(){q.call(this,l,f.filename)}):d.click(function(){q.call(this,l,f.filename)});I.push(d)}function l(d,e){function f(){C.val()=="VIEW"?n(d.current_dir_path,u.val(),v):n(d.current_dir_path,u.val(),s)}b.each(I,function(){this.unbind()});G.unbind();C.unbind();u.unbind();d.current_dir_path&&G.click(function(){n(d.moveup_dir_path,
+u.val(),e)});C.change(f);u.change(f);B.html("")}function s(d){l(d,s);var f=document.createElement("table");f.className="ke-table";f.cellPadding=0;f.cellSpacing=0;f.border=0;B.append(f);for(var n=d.file_list,m=0,j=n.length;m<j;m++){var r=n[m],p=b(f.insertRow(m));p.mouseover(function(){b(this).addClass("ke-on")}).mouseout(function(){b(this).removeClass("ke-on")});var q=b('<img src="'+(e+(r.is_dir?"folder-16.gif":"file-16.gif"))+'" width="16" height="16" alt="'+r.filename+'" align="absmiddle" />'),q=
+b(p[0].insertCell(0)).addClass("ke-cell ke-name").append(q).append(document.createTextNode(" "+r.filename));!r.is_dir||r.has_file?(p.css("cursor","pointer"),q.attr("title",r.filename),o(q,d,r,s)):q.attr("title",h.emptyFolder);b(p[0].insertCell(1)).addClass("ke-cell ke-size").html(r.is_dir?"-":Math.ceil(r.filesize/1024)+"KB");b(p[0].insertCell(2)).addClass("ke-cell ke-datetime").html(r.datetime)}}function v(f){l(f,v);for(var n=f.file_list,m=0,s=n.length;m<s;m++){var j=n[m],r=b('<div class="ke-inline-block ke-item"></div>');
+B.append(r);var p=b('<div class="ke-inline-block ke-photo"></div>').mouseover(function(){b(this).addClass("ke-on")}).mouseout(function(){b(this).removeClass("ke-on")});r.append(p);var q=f.current_url+j.filename,q=b('<img src="'+(j.is_dir?e+"folder-64.gif":j.is_photo?q:e+"file-64.gif")+'" width="80" height="80" alt="'+j.filename+'" />');!j.is_dir||j.has_file?(p.css("cursor","pointer"),d(p,j),o(p,f,j,v)):p.attr("title",h.emptyFolder);p.append(q);r.append('<div class="ke-name" title="'+j.filename+'">'+
+j.filename+"</div>")}}var p=b.undef(m.width,650),r=b.undef(m.height,510),z=b.undef(m.dirName,""),D=b.undef(m.viewType,"VIEW").toUpperCase(),q=m.clickFn,m=['<div style="padding:10px 20px;"><div class="ke-plugin-filemanager-header"><div class="ke-left">','<img class="ke-inline-block" name="moveupImg" src="'+e+'go-up.gif" width="16" height="16" border="0" alt="" /> ','<a class="ke-inline-block" name="moveupLink" href="javascript:;">'+h.moveup+"</a>",'</div><div class="ke-right">',h.viewType+' <select class="ke-inline-block" name="viewType">',
+'<option value="VIEW">'+h.viewImage+"</option>",'<option value="LIST">'+h.listImage+"</option>","</select> ",h.orderType+' <select class="ke-inline-block" name="orderType">','<option value="NAME">'+h.fileName+"</option>",'<option value="SIZE">'+h.fileSize+"</option>",'<option value="TYPE">'+h.fileType+"</option>",'</select></div><div class="ke-clearfix"></div></div><div class="ke-plugin-filemanager-body"></div></div>'].join(""),A=f.createDialog({name:"filemanager",width:p,height:r,title:f.lang("filemanager"),
+body:m}),p=A.div,B=b(".ke-plugin-filemanager-body",p);b('[name="moveupImg"]',p);var G=b('[name="moveupLink"]',p);b('[name="viewServer"]',p);var C=b('[name="viewType"]',p),u=b('[name="orderType"]',p),I=[];C.val(D);n("",u.val(),D=="VIEW"?v:s);return A}});
+KindEditor.plugin("flash",function(b){var d=this,f=d.lang("flash."),j=b.undef(d.allowFlashUpload,!0),e=b.undef(d.allowFileManager,!1),h=b.undef(d.formatUploadUrl,!0),m=b.undef(d.extraFileUploadParams,{}),n=b.undef(d.filePostName,"imgFile"),o=b.undef(d.uploadJson,d.basePath+"php/upload_json.php");d.plugin.flash={edit:function(){var l=['<div style="padding:20px;"><div class="ke-dialog-row">','<label for="keUrl" style="width:60px;">'+f.url+"</label>",'<input class="ke-input-text" type="text" id="keUrl" name="url" value="" style="width:160px;" /> &nbsp;',
+'<input type="button" class="ke-upload-button" value="'+f.upload+'" /> &nbsp;','<span class="ke-button-common ke-button-outer">','<input type="button" class="ke-button-common ke-button" name="viewServer" value="'+f.viewServer+'" />','</span></div><div class="ke-dialog-row">','<label for="keWidth" style="width:60px;">'+f.width+"</label>",'<input type="text" id="keWidth" class="ke-input-text ke-input-number" name="width" value="550" maxlength="4" /> </div><div class="ke-dialog-row">','<label for="keHeight" style="width:60px;">'+
+f.height+"</label>",'<input type="text" id="keHeight" class="ke-input-text ke-input-number" name="height" value="400" maxlength="4" /> </div></div>'].join(""),s=d.createDialog({name:"flash",width:450,title:d.lang("flash"),body:l,yesBtn:{name:d.lang("yes"),click:function(){var e=b.trim(p.val()),f=r.val(),h=z.val();e=="http://"||b.invalidUrl(e)?(alert(d.lang("invalidUrl")),p[0].focus()):/^\d*$/.test(f)?/^\d*$/.test(h)?(e=b.mediaImg(d.themesPath+"common/blank.gif",{src:e,type:b.mediaType(".swf"),width:f,
+height:h,quality:"high"}),d.insertHtml(e).hideDialog().focus()):(alert(d.lang("invalidHeight")),z[0].focus()):(alert(d.lang("invalidWidth")),r[0].focus())}}}),v=s.div,p=b('[name="url"]',v),l=b('[name="viewServer"]',v),r=b('[name="width"]',v),z=b('[name="height"]',v);p.val("http://");if(j){var D=b.uploadbutton({button:b(".ke-upload-button",v)[0],fieldName:n,extraParams:m,url:b.addParam(o,"dir=flash"),afterUpload:function(e){s.hideLoading();if(e.error===0){var f=e.url;h&&(f=b.formatUrl(f,"absolute"));
+p.val(f);d.afterUpload&&d.afterUpload.call(d,f,e,"flash");alert(d.lang("uploadSuccess"))}else alert(e.message)},afterError:function(b){s.hideLoading();d.errorDialog(b)}});D.fileBox.change(function(){s.showLoading(d.lang("uploadLoading"));D.submit()})}else b(".ke-upload-button",v).hide();e?l.click(function(){d.loadPlugin("filemanager",function(){d.plugin.filemanagerDialog({viewType:"LIST",dirName:"flash",clickFn:function(e){d.dialogs.length>1&&(b('[name="url"]',v).val(e),d.afterSelectFile&&d.afterSelectFile.call(d,
+e),d.hideDialog())}})})}):l.hide();if(l=d.plugin.getSelectedFlash()){var q=b.mediaAttrs(l.attr("data-ke-tag"));p.val(q.src);r.val(b.removeUnit(l.css("width"))||q.width||0);z.val(b.removeUnit(l.css("height"))||q.height||0)}p[0].focus();p[0].select()},"delete":function(){d.plugin.getSelectedFlash().remove();d.addBookmark()}};d.clickToolbar("flash",d.plugin.flash.edit)});
+KindEditor.plugin("image",function(b){var d=this,f=b.undef(d.allowImageUpload,!0),j=b.undef(d.allowImageRemote,!0),e=b.undef(d.formatUploadUrl,!0),h=b.undef(d.allowFileManager,!1),m=b.undef(d.uploadJson,d.basePath+"php/upload_json.php"),n=b.undef(d.imageTabIndex,0),o=d.pluginsPath+"image/images/",l=b.undef(d.extraFileUploadParams,{}),s=b.undef(d.filePostName,"imgFile"),v=b.undef(d.fillDescAfterUploadImage,!1),p=d.lang("image.");d.plugin.imageDialog=function(f){function n(b,d){M.val(b);K.val(d);W=
+b;S=d}b.undef(f.imageWidth,"");b.undef(f.imageHeight,"");b.undef(f.imageTitle,"");b.undef(f.imageAlign,"");var j=b.undef(f.showRemote,!0),q=b.undef(f.showLocal,!0),A=b.undef(f.tabIndex,0),B=f.clickFn,G="kindeditor_upload_iframe_"+(new Date).getTime(),C=[],u;for(u in l)C.push('<input type="hidden" name="'+u+'" value="'+l[u]+'" />');var C=['<div style="padding:20px;"><div class="tabs"></div><div class="tab1" style="display:none;"><div class="ke-dialog-row">','<label for="remoteUrl" style="width:60px;">'+
+p.remoteUrl+"</label>",'<input type="text" id="remoteUrl" class="ke-input-text" name="url" value="" style="width:200px;" /> &nbsp;<span class="ke-button-common ke-button-outer">','<input type="button" class="ke-button-common ke-button" name="viewServer" value="'+p.viewServer+'" />','</span></div><div class="ke-dialog-row">','<label for="remoteWidth" style="width:60px;">'+p.size+"</label>",p.width+' <input type="text" id="remoteWidth" class="ke-input-text ke-input-number" name="width" value="" maxlength="4" /> ',
+p.height+' <input type="text" class="ke-input-text ke-input-number" name="height" value="" maxlength="4" /> ','<img class="ke-refresh-btn" src="'+o+'refresh.png" width="16" height="16" alt="" style="cursor:pointer;" title="'+p.resetSize+'" />','</div><div class="ke-dialog-row">','<label style="width:60px;">'+p.align+"</label>",'<input type="radio" name="align" class="ke-inline-block" value="" checked="checked" /> <img name="defaultImg" src="'+o+'align_top.gif" width="23" height="25" alt="" />',' <input type="radio" name="align" class="ke-inline-block" value="left" /> <img name="leftImg" src="'+
+o+'align_left.gif" width="23" height="25" alt="" />',' <input type="radio" name="align" class="ke-inline-block" value="right" /> <img name="rightImg" src="'+o+'align_right.gif" width="23" height="25" alt="" />','</div><div class="ke-dialog-row">','<label for="remoteTitle" style="width:60px;">'+p.imgTitle+"</label>",'<input type="text" id="remoteTitle" class="ke-input-text" name="title" value="" style="width:200px;" /></div></div><div class="tab2" style="display:none;">','<iframe name="'+G+'" style="display:none;"></iframe>',
+'<form class="ke-upload-area ke-form" method="post" enctype="multipart/form-data" target="'+G+'" action="'+b.addParam(m,"dir=image")+'">','<div class="ke-dialog-row">',C.join(""),'<label style="width:60px;">'+p.localUrl+"</label>",'<input type="text" name="localUrl" class="ke-input-text" tabindex="-1" style="width:200px;" readonly="true" /> &nbsp;','<input type="button" class="ke-upload-button" value="'+p.upload+'" />',"</div></form></div></div>"].join(""),I=d.createDialog({name:"image",width:q||
+h?450:400,height:q&&j?300:250,title:d.lang("image"),body:C,yesBtn:{name:d.lang("yes"),click:function(){if(!I.isLoading)if(q&&j&&H&&H.selectedIndex===1||!j)U.fileBox.val()==""?alert(d.lang("pleaseSelectFile")):(I.showLoading(d.lang("uploadLoading")),U.submit(),qa.val(""));else{var e=b.trim(T.val()),f=M.val(),h=K.val(),l=Q.val(),n="";R.each(function(){if(this.checked)return n=this.value,!1});e=="http://"||b.invalidUrl(e)?(alert(d.lang("invalidUrl")),T[0].focus()):/^\d*$/.test(f)?/^\d*$/.test(h)?B.call(d,
+e,l,f,h,0,n):(alert(d.lang("invalidHeight")),K[0].focus()):(alert(d.lang("invalidWidth")),M[0].focus())}}},beforeRemove:function(){$.unbind();M.unbind();K.unbind();O.unbind()}}),E=I.div,T=b('[name="url"]',E),qa=b('[name="localUrl"]',E),$=b('[name="viewServer"]',E),M=b('.tab1 [name="width"]',E),K=b('.tab1 [name="height"]',E),O=b(".ke-refresh-btn",E),Q=b('.tab1 [name="title"]',E),R=b('.tab1 [name="align"]',E),H;j&&q?(H=b.tabs({src:b(".tabs",E),afterSelect:function(){}}),H.add({title:p.remoteImage,panel:b(".tab1",
+E)}),H.add({title:p.localImage,panel:b(".tab2",E)}),H.select(A)):j?b(".tab1",E).show():q&&b(".tab2",E).show();var U=b.uploadbutton({button:b(".ke-upload-button",E)[0],fieldName:s,form:b(".ke-form",E),target:G,width:60,afterUpload:function(f){I.hideLoading();if(f.error===0){var h=f.url;e&&(h=b.formatUrl(h,"absolute"));d.afterUpload&&d.afterUpload.call(d,h,f,"image");v?(b(".ke-dialog-row #remoteUrl",E).val(h),b(".ke-tabs-li",E)[0].click(),b(".ke-refresh-btn",E).click()):B.call(d,h,f.title,f.width,f.height,
+f.border,f.align)}else alert(f.message)},afterError:function(b){I.hideLoading();d.errorDialog(b)}});U.fileBox.change(function(){qa.val(U.fileBox.val())});h?$.click(function(){d.loadPlugin("filemanager",function(){d.plugin.filemanagerDialog({viewType:"VIEW",dirName:"image",clickFn:function(e){d.dialogs.length>1&&(b('[name="url"]',E).val(e),d.afterSelectFile&&d.afterSelectFile.call(d,e),d.hideDialog())}})})}):$.hide();var W=0,S=0;O.click(function(){var d=b('<img src="'+T.val()+'" />',document).css({position:"absolute",
+visibility:"hidden",top:0,left:"-1000px"});d.bind("load",function(){n(d.width(),d.height());d.remove()});b(document.body).append(d)});M.change(function(){W>0&&K.val(Math.round(S/W*parseInt(this.value,10)))});K.change(function(){S>0&&M.val(Math.round(W/S*parseInt(this.value,10)))});T.val(f.imageUrl);n(f.imageWidth,f.imageHeight);Q.val(f.imageTitle);R.each(function(){if(this.value===f.imageAlign)return this.checked=!0,!1});j&&A===0&&(T[0].focus(),T[0].select());return I};d.plugin.image={edit:function(){var b=
+d.plugin.getSelectedImage();d.plugin.imageDialog({imageUrl:b?b.attr("data-ke-src"):"http://",imageWidth:b?b.width():"",imageHeight:b?b.height():"",imageTitle:b?b.attr("title"):"",imageAlign:b?b.attr("align"):"",showRemote:j,showLocal:f,tabIndex:b?0:n,clickFn:function(e,f,h,l,n,o){b?(b.attr("src",e),b.attr("data-ke-src",e),b.attr("width",h),b.attr("height",l),b.attr("title",f),b.attr("align",o),b.attr("alt",f)):d.exec("insertimage",e,f,h,l,n,o);setTimeout(function(){d.hideDialog().focus()},0)}})},
+"delete":function(){var b=d.plugin.getSelectedImage();b.parent().name=="a"&&(b=b.parent());b.remove();d.addBookmark()}};d.clickToolbar("image",d.plugin.image.edit)});
+KindEditor.plugin("insertfile",function(b){var d=this,f=b.undef(d.allowFileUpload,!0),j=b.undef(d.allowFileManager,!1),e=b.undef(d.formatUploadUrl,!0),h=b.undef(d.uploadJson,d.basePath+"php/upload_json.php"),m=b.undef(d.extraFileUploadParams,{}),n=b.undef(d.filePostName,"imgFile"),o=d.lang("insertfile.");d.plugin.fileDialog=function(l){var s=b.undef(l.fileUrl,"http://"),v=b.undef(l.fileTitle,""),p=l.clickFn,l=['<div style="padding:20px;"><div class="ke-dialog-row">','<label for="keUrl" style="width:60px;">'+
+o.url+"</label>",'<input type="text" id="keUrl" name="url" class="ke-input-text" style="width:160px;" /> &nbsp;','<input type="button" class="ke-upload-button" value="'+o.upload+'" /> &nbsp;','<span class="ke-button-common ke-button-outer">','<input type="button" class="ke-button-common ke-button" name="viewServer" value="'+o.viewServer+'" />','</span></div><div class="ke-dialog-row">','<label for="keTitle" style="width:60px;">'+o.title+"</label>",'<input type="text" id="keTitle" class="ke-input-text" name="title" value="" style="width:160px;" /></div></div></form></div>'].join(""),
+r=d.createDialog({name:"insertfile",width:450,title:d.lang("insertfile"),body:l,yesBtn:{name:d.lang("yes"),click:function(){var e=b.trim(D.val()),f=q.val();e=="http://"||b.invalidUrl(e)?(alert(d.lang("invalidUrl")),D[0].focus()):(b.trim(f)===""&&(f=e),p.call(d,e,f))}}}),z=r.div,D=b('[name="url"]',z),l=b('[name="viewServer"]',z),q=b('[name="title"]',z);if(f){var A=b.uploadbutton({button:b(".ke-upload-button",z)[0],fieldName:n,url:b.addParam(h,"dir=file"),extraParams:m,afterUpload:function(f){r.hideLoading();
+if(f.error===0){var h=f.url;e&&(h=b.formatUrl(h,"absolute"));D.val(h);d.afterUpload&&d.afterUpload.call(d,h,f,"insertfile");alert(d.lang("uploadSuccess"))}else alert(f.message)},afterError:function(b){r.hideLoading();d.errorDialog(b)}});A.fileBox.change(function(){r.showLoading(d.lang("uploadLoading"));A.submit()})}else b(".ke-upload-button",z).hide();j?l.click(function(){d.loadPlugin("filemanager",function(){d.plugin.filemanagerDialog({viewType:"LIST",dirName:"file",clickFn:function(e){d.dialogs.length>
+1&&(b('[name="url"]',z).val(e),d.afterSelectFile&&d.afterSelectFile.call(d,e),d.hideDialog())}})})}):l.hide();D.val(s);q.val(v);D[0].focus();D[0].select()};d.clickToolbar("insertfile",function(){d.plugin.fileDialog({clickFn:function(b,e){d.insertHtml('<a class="ke-insertfile" href="'+b+'" data-ke-src="'+b+'" target="_blank">'+e+"</a>").hideDialog().focus()}})})});
+KindEditor.plugin("lineheight",function(b){var d=this,f=d.lang("lineheight.");d.clickToolbar("lineheight",function(){var j="",e=d.cmd.commonNode({"*":".line-height"});e&&(j=e.css("line-height"));var h=d.createMenu({name:"lineheight",width:150});b.each(f.lineHeight,function(e,f){b.each(f,function(b,e){h.addItem({title:e,checked:j===b,click:function(){d.cmd.toggle('<span style="line-height:'+b+';"></span>',{span:".line-height="+b});d.updateState();d.addBookmark();d.hideMenu()}})})})})});
+KindEditor.plugin("link",function(b){var d=this;d.plugin.link={edit:function(){var f=d.lang("link."),j='<div style="padding:20px;"><div class="ke-dialog-row"><label for="keUrl" style="width:60px;">'+f.url+'</label><input class="ke-input-text" type="text" id="keUrl" name="url" value="" style="width:260px;" /></div><div class="ke-dialog-row""><label for="keType" style="width:60px;">'+f.linkType+'</label><select id="keType" name="type"></select></div></div>',j=d.createDialog({name:"link",width:450,title:d.lang("link"),
+body:j,yesBtn:{name:d.lang("yes"),click:function(){var f=b.trim(e.val());f=="http://"||b.invalidUrl(f)?(alert(d.lang("invalidUrl")),e[0].focus()):d.exec("createlink",f,h.val()).hideDialog().focus()}}}).div,e=b('input[name="url"]',j),h=b('select[name="type"]',j);e.val("http://");h[0].options[0]=new Option(f.newWindow,"_blank");h[0].options[1]=new Option(f.selfWindow,"");d.cmd.selection();if(f=d.plugin.getSelectedLink())d.cmd.range.selectNode(f[0]),d.cmd.select(),e.val(f.attr("data-ke-src")),h.val(f.attr("target"));
+e[0].focus();e[0].select()},"delete":function(){d.exec("unlink",null)}};d.clickToolbar("link",d.plugin.link.edit)});
+KindEditor.plugin("map",function(b){var d=this,f=d.lang("map.");d.clickToolbar("map",function(){function j(){n=l[0].contentWindow;o=b.iframeDoc(l)}var e=['<div style="padding:10px 20px;"><div class="ke-dialog-row">',f.address+' <input id="kindeditor_plugin_map_address" name="address" class="ke-input-text" value="" style="width:200px;" /> ','<span class="ke-button-common ke-button-outer">','<input type="button" name="searchBtn" class="ke-button-common ke-button" value="'+f.search+'" />','</span></div><div class="ke-map" style="width:558px;height:360px;"></div></div>'].join(""),
+e=d.createDialog({name:"map",width:600,title:d.lang("map"),body:e,yesBtn:{name:d.lang("yes"),click:function(){var b=n.map,e=b.getCenter().lat()+","+b.getCenter().lng(),f=b.getZoom(),b=b.getMapTypeId(),h="http://maps.googleapis.com/maps/api/staticmap";h+="?center="+encodeURIComponent(e);h+="&zoom="+encodeURIComponent(f);h+="&size=558x360";h+="&maptype="+encodeURIComponent(b);h+="&markers="+encodeURIComponent(e);h+="&language="+d.langType;h+="&sensor=false";d.exec("insertimage",h).hideDialog().focus()}},
+beforeRemove:function(){m.remove();o&&o.write("");l.remove()}}).div,h=b('[name="address"]',e),m=b('[name="searchBtn"]',e),n,o;['<!doctype html><html><head>\n<meta name="viewport" content="initial-scale=1.0, user-scalable=no" />\n<style>\n\thtml { height: 100% }\n\tbody { height: 100%; margin: 0; padding: 0; background-color: #FFF }\n\t#map_canvas { height: 100% }\n</style>','<script src="http://maps.googleapis.com/maps/api/js?sensor=false&language='+d.langType+'"><\/script>','<script>\nvar map, geocoder;\nfunction initialize() {\n\tvar latlng = new google.maps.LatLng(31.230393, 121.473704);\n\tvar options = {\n\t\tzoom: 11,\n\t\tcenter: latlng,\n\t\tdisableDefaultUI: true,\n\t\tpanControl: true,\n\t\tzoomControl: true,\n\t\tmapTypeControl: true,\n\t\tscaleControl: true,\n\t\tstreetViewControl: false,\n\t\toverviewMapControl: true,\n\t\tmapTypeId: google.maps.MapTypeId.ROADMAP\n\t};\n\tmap = new google.maps.Map(document.getElementById("map_canvas"), options);\n\tgeocoder = new google.maps.Geocoder();\n\tgeocoder.geocode({latLng: latlng}, function(results, status) {\n\t\tif (status == google.maps.GeocoderStatus.OK) {\n\t\t\tif (results[3]) {\n\t\t\t\tparent.document.getElementById("kindeditor_plugin_map_address").value = results[3].formatted_address;\n\t\t\t}\n\t\t}\n\t});\n}\nfunction search(address) {\n\tif (!map) return;\n\tgeocoder.geocode({address : address}, function(results, status) {\n\t\tif (status == google.maps.GeocoderStatus.OK) {\n\t\t\tmap.setZoom(11);\n\t\t\tmap.setCenter(results[0].geometry.location);\n\t\t\tvar marker = new google.maps.Marker({\n\t\t\t\tmap: map,\n\t\t\t\tposition: results[0].geometry.location\n\t\t\t});\n\t\t} else {\n\t\t\talert("Invalid address: " + address);\n\t\t}\n\t});\n}\n<\/script>\n</head>\n<body onload="initialize();">\n<div id="map_canvas" style="width:100%; height:100%"></div>\n</body></html>'].join("\n");
+var l=b('<iframe class="ke-textarea" frameborder="0" src="'+d.pluginsPath+'map/map.html" style="width:558px;height:360px;"></iframe>');l.bind("load",function(){l.unbind("load");b.IE?j():setTimeout(j,0)});b(".ke-map",e).replaceWith(l);m.click(function(){n.search(h.val())})})});
+KindEditor.plugin("media",function(b){var d=this,f=d.lang("media."),j=b.undef(d.allowMediaUpload,!0),e=b.undef(d.allowFileManager,!1),h=b.undef(d.formatUploadUrl,!0),m=b.undef(d.extraFileUploadParams,{}),n=b.undef(d.filePostName,"imgFile"),o=b.undef(d.uploadJson,d.basePath+"php/upload_json.php");d.plugin.media={edit:function(){var l=['<div style="padding:20px;"><div class="ke-dialog-row">','<label for="keUrl" style="width:60px;">'+f.url+"</label>",'<input class="ke-input-text" type="text" id="keUrl" name="url" value="" style="width:160px;" /> &nbsp;',
+'<input type="button" class="ke-upload-button" value="'+f.upload+'" /> &nbsp;','<span class="ke-button-common ke-button-outer">','<input type="button" class="ke-button-common ke-button" name="viewServer" value="'+f.viewServer+'" />','</span></div><div class="ke-dialog-row">','<label for="keWidth" style="width:60px;">'+f.width+"</label>",'<input type="text" id="keWidth" class="ke-input-text ke-input-number" name="width" value="550" maxlength="4" /></div><div class="ke-dialog-row">','<label for="keHeight" style="width:60px;">'+
+f.height+"</label>",'<input type="text" id="keHeight" class="ke-input-text ke-input-number" name="height" value="400" maxlength="4" /></div><div class="ke-dialog-row">','<label for="keAutostart">'+f.autostart+"</label>",'<input type="checkbox" id="keAutostart" name="autostart" value="" /> </div></div>'].join(""),s=d.createDialog({name:"media",width:450,height:230,title:d.lang("media"),body:l,yesBtn:{name:d.lang("yes"),click:function(){var e=b.trim(p.val()),f=r.val(),h=z.val();e=="http://"||b.invalidUrl(e)?
+(alert(d.lang("invalidUrl")),p[0].focus()):/^\d*$/.test(f)?/^\d*$/.test(h)?(e=b.mediaImg(d.themesPath+"common/blank.gif",{src:e,type:b.mediaType(e),width:f,height:h,autostart:D[0].checked?"true":"false",loop:"true"}),d.insertHtml(e).hideDialog().focus()):(alert(d.lang("invalidHeight")),z[0].focus()):(alert(d.lang("invalidWidth")),r[0].focus())}}}),v=s.div,p=b('[name="url"]',v),l=b('[name="viewServer"]',v),r=b('[name="width"]',v),z=b('[name="height"]',v),D=b('[name="autostart"]',v);p.val("http://");
+if(j){var q=b.uploadbutton({button:b(".ke-upload-button",v)[0],fieldName:n,extraParams:m,url:b.addParam(o,"dir=media"),afterUpload:function(e){s.hideLoading();if(e.error===0){var f=e.url;h&&(f=b.formatUrl(f,"absolute"));p.val(f);d.afterUpload&&d.afterUpload.call(d,f,e,"media");alert(d.lang("uploadSuccess"))}else alert(e.message)},afterError:function(b){s.hideLoading();d.errorDialog(b)}});q.fileBox.change(function(){s.showLoading(d.lang("uploadLoading"));q.submit()})}else b(".ke-upload-button",v).hide();
+e?l.click(function(){d.loadPlugin("filemanager",function(){d.plugin.filemanagerDialog({viewType:"LIST",dirName:"media",clickFn:function(e){d.dialogs.length>1&&(b('[name="url"]',v).val(e),d.afterSelectFile&&d.afterSelectFile.call(d,e),d.hideDialog())}})})}):l.hide();if(l=d.plugin.getSelectedMedia()){var A=b.mediaAttrs(l.attr("data-ke-tag"));p.val(A.src);r.val(b.removeUnit(l.css("width"))||A.width||0);z.val(b.removeUnit(l.css("height"))||A.height||0);D[0].checked=A.autostart==="true"}p[0].focus();p[0].select()},
+"delete":function(){d.plugin.getSelectedMedia().remove();d.addBookmark()}};d.clickToolbar("media",d.plugin.media.edit)});
+(function(b){function d(b){this.init(b)}b.extend(d,{init:function(d){function j(d,e){b(".ke-status > div",d).hide();b(".ke-message",d).addClass("ke-error").show().html(b.escape(e))}var e=this;d.afterError=d.afterError||function(b){alert(b)};e.options=d;e.progressbars={};e.div=b(d.container).html(['<div class="ke-swfupload"><div class="ke-swfupload-top"><div class="ke-inline-block ke-swfupload-button"><input type="button" value="Browse" /></div>','<div class="ke-inline-block ke-swfupload-desc">'+d.uploadDesc+
+"</div>",'<span class="ke-button-common ke-button-outer ke-swfupload-startupload">','<input type="button" class="ke-button-common ke-button" value="'+d.startButtonValue+'" />','</span></div><div class="ke-swfupload-body"></div></div>'].join(""));e.bodyDiv=b(".ke-swfupload-body",e.div);var h={debug:!1,upload_url:d.uploadUrl,flash_url:d.flashUrl,file_post_name:d.filePostName,button_placeholder:b(".ke-swfupload-button > input",e.div)[0],button_image_url:d.buttonImageUrl,button_width:d.buttonWidth,button_height:d.buttonHeight,
+button_cursor:SWFUpload.CURSOR.HAND,file_types:d.fileTypes,file_types_description:d.fileTypesDesc,file_upload_limit:d.fileUploadLimit,file_size_limit:d.fileSizeLimit,post_params:d.postParams,file_queued_handler:function(b){b.url=e.options.fileIconUrl;e.appendFile(b)},file_queue_error_handler:function(e,h){var o="";switch(h){case SWFUpload.QUEUE_ERROR.QUEUE_LIMIT_EXCEEDED:o=d.queueLimitExceeded;break;case SWFUpload.QUEUE_ERROR.FILE_EXCEEDS_SIZE_LIMIT:o=d.fileExceedsSizeLimit;break;case SWFUpload.QUEUE_ERROR.ZERO_BYTE_FILE:o=
+d.zeroByteFile;break;case SWFUpload.QUEUE_ERROR.INVALID_FILETYPE:o=d.invalidFiletype;break;default:o=d.unknownError}b.DEBUG&&alert(o)},upload_start_handler:function(d){d=b('div[data-id="'+d.id+'"]',this.bodyDiv);b(".ke-status > div",d).hide();b(".ke-progressbar",d).show()},upload_progress_handler:function(b,d,f){d=Math.round(d*100/f);b=e.progressbars[b.id];b.bar.css("width",Math.round(d*80/100)+"px");b.percent.html(d+"%")},upload_error_handler:function(d){d&&d.filestatus==SWFUpload.FILE_STATUS.ERROR&&
+(d=b('div[data-id="'+d.id+'"]',e.bodyDiv).eq(0),j(d,e.options.errorMessage))},upload_success_handler:function(d,f){var h=b('div[data-id="'+d.id+'"]',e.bodyDiv).eq(0),l={};try{l=b.json(f)}catch(s){e.options.afterError.call(this,"<!doctype html><html>"+f+"</html>")}l.error!==0?j(h,b.DEBUG?l.message:e.options.errorMessage):(d.url=l.url,b(".ke-img",h).attr("src",d.url).attr("data-status",d.filestatus).data("data",l),b(".ke-status > div",h).hide())}};e.swfu=new SWFUpload(h);b(".ke-swfupload-startupload input",
+e.div).click(function(){e.swfu.startUpload()})},getUrlList:function(){var d=[];b(".ke-img",self.bodyDiv).each(function(){var j=b(this);j.attr("data-status")==SWFUpload.FILE_STATUS.COMPLETE&&d.push(j.data("data"))});return d},removeFile:function(d){this.swfu.cancelUpload(d);d=b('div[data-id="'+d+'"]',this.bodyDiv);b(".ke-photo",d).unbind();b(".ke-delete",d).unbind();d.remove()},removeFiles:function(){var d=this;b(".ke-item",d.bodyDiv).each(function(){d.removeFile(b(this).attr("data-id"))})},appendFile:function(d){var j=
+this,e=b('<div class="ke-inline-block ke-item" data-id="'+d.id+'"></div>');j.bodyDiv.append(e);var h=b('<div class="ke-inline-block ke-photo"></div>').mouseover(function(){b(this).addClass("ke-on")}).mouseout(function(){b(this).removeClass("ke-on")});e.append(h);var m=b('<img src="'+d.url+'" class="ke-img" data-status="'+d.filestatus+'" width="80" height="80" alt="'+d.name+'" />');h.append(m);b('<span class="ke-delete"></span>').appendTo(h).click(function(){j.removeFile(d.id)});m=b('<div class="ke-status"></div>').appendTo(h);
+b('<div class="ke-progressbar"><div class="ke-progressbar-bar"><div class="ke-progressbar-bar-inner"></div></div><div class="ke-progressbar-percent">0%</div></div>').hide().appendTo(m);b('<div class="ke-message">'+j.options.pendingMessage+"</div>").appendTo(m);e.append('<div class="ke-name">'+d.name+"</div>");j.progressbars[d.id]={bar:b(".ke-progressbar-bar-inner",h),percent:b(".ke-progressbar-percent",h)}},remove:function(){this.removeFiles();this.swfu.destroy();this.div.html("")}});b.swfupload=
+function(b,j){return new d(b,j)}})(KindEditor);
+KindEditor.plugin("multiimage",function(b){var d=this;b.undef(d.formatUploadUrl,!0);var f=b.undef(d.uploadJson,d.basePath+"php/upload_json.php"),j=d.pluginsPath+"multiimage/images/",e=b.undef(d.imageSizeLimit,"1MB");b.undef(d.imageFileTypes,"*.jpg;*.gif;*.png");var h=b.undef(d.imageUploadLimit,20),m=b.undef(d.filePostName,"imgFile"),n=d.lang("multiimage.");d.plugin.multiImageDialog=function(o){var l=o.clickFn,o=b.tmpl(n.uploadDesc,{uploadLimit:h,sizeLimit:e}),s=d.createDialog({name:"multiimage",width:650,
+height:510,title:d.lang("multiimage"),body:'<div style="padding:20px;"><div class="swfupload"></div></div>',previewBtn:{name:n.insertAll,click:function(){l.call(d,v.getUrlList())}},yesBtn:{name:n.clearAll,click:function(){v.removeFiles()}},beforeRemove:function(){(!b.IE||b.V<=8)&&v.remove()}}),v=b.swfupload({container:b(".swfupload",s.div),buttonImageUrl:j+(d.langType=="zh_CN"?"select-files-zh_CN.png":"select-files-en.png"),buttonWidth:d.langType=="zh_CN"?72:88,buttonHeight:23,fileIconUrl:j+"image.png",
+uploadDesc:o,startButtonValue:n.startUpload,uploadUrl:b.addParam(f,"dir=image"),flashUrl:j+"swfupload.swf",filePostName:m,fileTypes:"*.jpg;*.jpeg;*.gif;*.png;*.bmp",fileTypesDesc:"Image Files",fileUploadLimit:h,fileSizeLimit:e,postParams:b.undef(d.extraFileUploadParams,{}),queueLimitExceeded:n.queueLimitExceeded,fileExceedsSizeLimit:n.fileExceedsSizeLimit,zeroByteFile:n.zeroByteFile,invalidFiletype:n.invalidFiletype,unknownError:n.unknownError,pendingMessage:n.pending,errorMessage:n.uploadError,afterError:function(b){d.errorDialog(b)}});
+return s};d.clickToolbar("multiimage",function(){d.plugin.multiImageDialog({clickFn:function(e){e.length!==0&&(b.each(e,function(b,e){d.afterUpload&&d.afterUpload.call(d,e.url,e,"multiimage");d.exec("insertimage",e.url,e.title,e.width,e.height,e.border,e.align)}),setTimeout(function(){d.hideDialog().focus()},0))}})})});
+(function(){window.SWFUpload=function(b){this.initSWFUpload(b)};SWFUpload.prototype.initSWFUpload=function(b){try{this.customSettings={},this.settings=b,this.eventQueue=[],this.movieName="KindEditor_SWFUpload_"+SWFUpload.movieCount++,this.movieElement=null,SWFUpload.instances[this.movieName]=this,this.initSettings(),this.loadFlash(),this.displayDebugInfo()}catch(d){throw delete SWFUpload.instances[this.movieName],d;}};SWFUpload.instances={};SWFUpload.movieCount=0;SWFUpload.version="2.2.0 2009-03-25";
+SWFUpload.QUEUE_ERROR={QUEUE_LIMIT_EXCEEDED:-100,FILE_EXCEEDS_SIZE_LIMIT:-110,ZERO_BYTE_FILE:-120,INVALID_FILETYPE:-130};SWFUpload.UPLOAD_ERROR={HTTP_ERROR:-200,MISSING_UPLOAD_URL:-210,IO_ERROR:-220,SECURITY_ERROR:-230,UPLOAD_LIMIT_EXCEEDED:-240,UPLOAD_FAILED:-250,SPECIFIED_FILE_ID_NOT_FOUND:-260,FILE_VALIDATION_FAILED:-270,FILE_CANCELLED:-280,UPLOAD_STOPPED:-290};SWFUpload.FILE_STATUS={QUEUED:-1,IN_PROGRESS:-2,ERROR:-3,COMPLETE:-4,CANCELLED:-5};SWFUpload.BUTTON_ACTION={SELECT_FILE:-100,SELECT_FILES:-110,
+START_UPLOAD:-120};SWFUpload.CURSOR={ARROW:-1,HAND:-2};SWFUpload.WINDOW_MODE={WINDOW:"window",TRANSPARENT:"transparent",OPAQUE:"opaque"};SWFUpload.completeURL=function(b){if(typeof b!=="string"||b.match(/^https?:\/\//i)||b.match(/^\//))return b;var d=window.location.pathname.lastIndexOf("/");path=d<=0?"/":window.location.pathname.substr(0,d)+"/";return path+b};SWFUpload.prototype.initSettings=function(){this.ensureDefault=function(b,d){this.settings[b]=this.settings[b]==void 0?d:this.settings[b]};
+this.ensureDefault("upload_url","");this.ensureDefault("preserve_relative_urls",!1);this.ensureDefault("file_post_name","Filedata");this.ensureDefault("post_params",{});this.ensureDefault("use_query_string",!1);this.ensureDefault("requeue_on_error",!1);this.ensureDefault("http_success",[]);this.ensureDefault("assume_success_timeout",0);this.ensureDefault("file_types","*.*");this.ensureDefault("file_types_description","All Files");this.ensureDefault("file_size_limit",0);this.ensureDefault("file_upload_limit",
+0);this.ensureDefault("file_queue_limit",0);this.ensureDefault("flash_url","swfupload.swf");this.ensureDefault("prevent_swf_caching",!0);this.ensureDefault("button_image_url","");this.ensureDefault("button_width",1);this.ensureDefault("button_height",1);this.ensureDefault("button_text","");this.ensureDefault("button_text_style","color: #000000; font-size: 16pt;");this.ensureDefault("button_text_top_padding",0);this.ensureDefault("button_text_left_padding",0);this.ensureDefault("button_action",SWFUpload.BUTTON_ACTION.SELECT_FILES);
+this.ensureDefault("button_disabled",!1);this.ensureDefault("button_placeholder_id","");this.ensureDefault("button_placeholder",null);this.ensureDefault("button_cursor",SWFUpload.CURSOR.ARROW);this.ensureDefault("button_window_mode",SWFUpload.WINDOW_MODE.WINDOW);this.ensureDefault("debug",!1);this.settings.debug_enabled=this.settings.debug;this.settings.return_upload_start_handler=this.returnUploadStart;this.ensureDefault("swfupload_loaded_handler",null);this.ensureDefault("file_dialog_start_handler",
+null);this.ensureDefault("file_queued_handler",null);this.ensureDefault("file_queue_error_handler",null);this.ensureDefault("file_dialog_complete_handler",null);this.ensureDefault("upload_start_handler",null);this.ensureDefault("upload_progress_handler",null);this.ensureDefault("upload_error_handler",null);this.ensureDefault("upload_success_handler",null);this.ensureDefault("upload_complete_handler",null);this.ensureDefault("debug_handler",this.debugMessage);this.ensureDefault("custom_settings",{});
+this.customSettings=this.settings.custom_settings;if(this.settings.prevent_swf_caching)this.settings.flash_url=this.settings.flash_url+(this.settings.flash_url.indexOf("?")<0?"?":"&")+"preventswfcaching="+(new Date).getTime();if(!this.settings.preserve_relative_urls)this.settings.upload_url=SWFUpload.completeURL(this.settings.upload_url),this.settings.button_image_url=SWFUpload.completeURL(this.settings.button_image_url);delete this.ensureDefault};SWFUpload.prototype.loadFlash=function(){var b,d;
+if(document.getElementById(this.movieName)!==null)throw"ID "+this.movieName+" is already in use. The Flash Object could not be added";b=document.getElementById(this.settings.button_placeholder_id)||this.settings.button_placeholder;if(b==void 0)throw"Could not find the placeholder element: "+this.settings.button_placeholder_id;d=document.createElement("div");d.innerHTML=this.getFlashHTML();b.parentNode.replaceChild(d.firstChild,b);window[this.movieName]==void 0&&(window[this.movieName]=this.getMovieElement())};
+SWFUpload.prototype.getFlashHTML=function(){var b="";KindEditor.IE&&KindEditor.V>8&&(b=' classid = "clsid:d27cdb6e-ae6d-11cf-96b8-444553540000"');return['<object id="',this.movieName,'"'+b+' type="application/x-shockwave-flash" data="',this.settings.flash_url,'" width="',this.settings.button_width,'" height="',this.settings.button_height,'" class="swfupload"><param name="wmode" value="',this.settings.button_window_mode,'" /><param name="movie" value="',this.settings.flash_url,'" /><param name="quality" value="high" /><param name="menu" value="false" /><param name="allowScriptAccess" value="always" />',
+'<param name="flashvars" value="'+this.getFlashVars()+'" />',"</object>"].join("")};SWFUpload.prototype.getFlashVars=function(){var b=this.buildParamString(),d=this.settings.http_success.join(",");return["movieName=",encodeURIComponent(this.movieName),"&amp;uploadURL=",encodeURIComponent(this.settings.upload_url),"&amp;useQueryString=",encodeURIComponent(this.settings.use_query_string),"&amp;requeueOnError=",encodeURIComponent(this.settings.requeue_on_error),"&amp;httpSuccess=",encodeURIComponent(d),
+"&amp;assumeSuccessTimeout=",encodeURIComponent(this.settings.assume_success_timeout),"&amp;params=",encodeURIComponent(b),"&amp;filePostName=",encodeURIComponent(this.settings.file_post_name),"&amp;fileTypes=",encodeURIComponent(this.settings.file_types),"&amp;fileTypesDescription=",encodeURIComponent(this.settings.file_types_description),"&amp;fileSizeLimit=",encodeURIComponent(this.settings.file_size_limit),"&amp;fileUploadLimit=",encodeURIComponent(this.settings.file_upload_limit),"&amp;fileQueueLimit=",
+encodeURIComponent(this.settings.file_queue_limit),"&amp;debugEnabled=",encodeURIComponent(this.settings.debug_enabled),"&amp;buttonImageURL=",encodeURIComponent(this.settings.button_image_url),"&amp;buttonWidth=",encodeURIComponent(this.settings.button_width),"&amp;buttonHeight=",encodeURIComponent(this.settings.button_height),"&amp;buttonText=",encodeURIComponent(this.settings.button_text),"&amp;buttonTextTopPadding=",encodeURIComponent(this.settings.button_text_top_padding),"&amp;buttonTextLeftPadding=",
+encodeURIComponent(this.settings.button_text_left_padding),"&amp;buttonTextStyle=",encodeURIComponent(this.settings.button_text_style),"&amp;buttonAction=",encodeURIComponent(this.settings.button_action),"&amp;buttonDisabled=",encodeURIComponent(this.settings.button_disabled),"&amp;buttonCursor=",encodeURIComponent(this.settings.button_cursor)].join("")};SWFUpload.prototype.getMovieElement=function(){if(this.movieElement==void 0)this.movieElement=document.getElementById(this.movieName);if(this.movieElement===
+null)throw"Could not find Flash element";return this.movieElement};SWFUpload.prototype.buildParamString=function(){var b=this.settings.post_params,d=[];if(typeof b==="object")for(var f in b)b.hasOwnProperty(f)&&d.push(encodeURIComponent(f.toString())+"="+encodeURIComponent(b[f].toString()));return d.join("&amp;")};SWFUpload.prototype.destroy=function(){try{this.cancelUpload(null,!1);var b=null;if((b=this.getMovieElement())&&typeof b.CallFunction==="unknown"){for(var d in b)try{typeof b[d]==="function"&&
+(b[d]=null)}catch(f){}try{b.parentNode.removeChild(b)}catch(j){}}window[this.movieName]=null;SWFUpload.instances[this.movieName]=null;delete SWFUpload.instances[this.movieName];this.movieName=this.eventQueue=this.customSettings=this.settings=this.movieElement=null;return!0}catch(e){return!1}};SWFUpload.prototype.displayDebugInfo=function(){this.debug(["---SWFUpload Instance Info---\nVersion: ",SWFUpload.version,"\nMovie Name: ",this.movieName,"\nSettings:\n\tupload_url:               ",this.settings.upload_url,
+"\n\tflash_url:                ",this.settings.flash_url,"\n\tuse_query_string:         ",this.settings.use_query_string.toString(),"\n\trequeue_on_error:         ",this.settings.requeue_on_error.toString(),"\n\thttp_success:             ",this.settings.http_success.join(", "),"\n\tassume_success_timeout:   ",this.settings.assume_success_timeout,"\n\tfile_post_name:           ",this.settings.file_post_name,"\n\tpost_params:              ",this.settings.post_params.toString(),"\n\tfile_types:               ",
+this.settings.file_types,"\n\tfile_types_description:   ",this.settings.file_types_description,"\n\tfile_size_limit:          ",this.settings.file_size_limit,"\n\tfile_upload_limit:        ",this.settings.file_upload_limit,"\n\tfile_queue_limit:         ",this.settings.file_queue_limit,"\n\tdebug:                    ",this.settings.debug.toString(),"\n\tprevent_swf_caching:      ",this.settings.prevent_swf_caching.toString(),"\n\tbutton_placeholder_id:    ",this.settings.button_placeholder_id.toString(),
+"\n\tbutton_placeholder:       ",this.settings.button_placeholder?"Set":"Not Set","\n\tbutton_image_url:         ",this.settings.button_image_url.toString(),"\n\tbutton_width:             ",this.settings.button_width.toString(),"\n\tbutton_height:            ",this.settings.button_height.toString(),"\n\tbutton_text:              ",this.settings.button_text.toString(),"\n\tbutton_text_style:        ",this.settings.button_text_style.toString(),"\n\tbutton_text_top_padding:  ",this.settings.button_text_top_padding.toString(),
+"\n\tbutton_text_left_padding: ",this.settings.button_text_left_padding.toString(),"\n\tbutton_action:            ",this.settings.button_action.toString(),"\n\tbutton_disabled:          ",this.settings.button_disabled.toString(),"\n\tcustom_settings:          ",this.settings.custom_settings.toString(),"\nEvent Handlers:\n\tswfupload_loaded_handler assigned:  ",(typeof this.settings.swfupload_loaded_handler==="function").toString(),"\n\tfile_dialog_start_handler assigned: ",(typeof this.settings.file_dialog_start_handler===
+"function").toString(),"\n\tfile_queued_handler assigned:       ",(typeof this.settings.file_queued_handler==="function").toString(),"\n\tfile_queue_error_handler assigned:  ",(typeof this.settings.file_queue_error_handler==="function").toString(),"\n\tupload_start_handler assigned:      ",(typeof this.settings.upload_start_handler==="function").toString(),"\n\tupload_progress_handler assigned:   ",(typeof this.settings.upload_progress_handler==="function").toString(),"\n\tupload_error_handler assigned:      ",
+(typeof this.settings.upload_error_handler==="function").toString(),"\n\tupload_success_handler assigned:    ",(typeof this.settings.upload_success_handler==="function").toString(),"\n\tupload_complete_handler assigned:   ",(typeof this.settings.upload_complete_handler==="function").toString(),"\n\tdebug_handler assigned:             ",(typeof this.settings.debug_handler==="function").toString(),"\n"].join(""))};SWFUpload.prototype.addSetting=function(b,d,f){return d==void 0?this.settings[b]=f:this.settings[b]=
+d};SWFUpload.prototype.getSetting=function(b){if(this.settings[b]!=void 0)return this.settings[b];return""};SWFUpload.prototype.callFlash=function(b,d){var d=d||[],f=this.getMovieElement(),j,e;try{e=f.CallFunction('<invoke name="'+b+'" returntype="javascript">'+__flash__argumentsToXML(d,0)+"</invoke>"),j=eval(e)}catch(h){throw"Call to "+b+" failed";}j!=void 0&&typeof j.post==="object"&&(j=this.unescapeFilePostParams(j));return j};SWFUpload.prototype.selectFile=function(){this.callFlash("SelectFile")};
+SWFUpload.prototype.selectFiles=function(){this.callFlash("SelectFiles")};SWFUpload.prototype.startUpload=function(b){this.callFlash("StartUpload",[b])};SWFUpload.prototype.cancelUpload=function(b,d){d!==!1&&(d=!0);this.callFlash("CancelUpload",[b,d])};SWFUpload.prototype.stopUpload=function(){this.callFlash("StopUpload")};SWFUpload.prototype.getStats=function(){return this.callFlash("GetStats")};SWFUpload.prototype.setStats=function(b){this.callFlash("SetStats",[b])};SWFUpload.prototype.getFile=
+function(b){return typeof b==="number"?this.callFlash("GetFileByIndex",[b]):this.callFlash("GetFile",[b])};SWFUpload.prototype.addFileParam=function(b,d,f){return this.callFlash("AddFileParam",[b,d,f])};SWFUpload.prototype.removeFileParam=function(b,d){this.callFlash("RemoveFileParam",[b,d])};SWFUpload.prototype.setUploadURL=function(b){this.settings.upload_url=b.toString();this.callFlash("SetUploadURL",[b])};SWFUpload.prototype.setPostParams=function(b){this.settings.post_params=b;this.callFlash("SetPostParams",
+[b])};SWFUpload.prototype.addPostParam=function(b,d){this.settings.post_params[b]=d;this.callFlash("SetPostParams",[this.settings.post_params])};SWFUpload.prototype.removePostParam=function(b){delete this.settings.post_params[b];this.callFlash("SetPostParams",[this.settings.post_params])};SWFUpload.prototype.setFileTypes=function(b,d){this.settings.file_types=b;this.settings.file_types_description=d;this.callFlash("SetFileTypes",[b,d])};SWFUpload.prototype.setFileSizeLimit=function(b){this.settings.file_size_limit=
+b;this.callFlash("SetFileSizeLimit",[b])};SWFUpload.prototype.setFileUploadLimit=function(b){this.settings.file_upload_limit=b;this.callFlash("SetFileUploadLimit",[b])};SWFUpload.prototype.setFileQueueLimit=function(b){this.settings.file_queue_limit=b;this.callFlash("SetFileQueueLimit",[b])};SWFUpload.prototype.setFilePostName=function(b){this.settings.file_post_name=b;this.callFlash("SetFilePostName",[b])};SWFUpload.prototype.setUseQueryString=function(b){this.settings.use_query_string=b;this.callFlash("SetUseQueryString",
+[b])};SWFUpload.prototype.setRequeueOnError=function(b){this.settings.requeue_on_error=b;this.callFlash("SetRequeueOnError",[b])};SWFUpload.prototype.setHTTPSuccess=function(b){typeof b==="string"&&(b=b.replace(" ","").split(","));this.settings.http_success=b;this.callFlash("SetHTTPSuccess",[b])};SWFUpload.prototype.setAssumeSuccessTimeout=function(b){this.settings.assume_success_timeout=b;this.callFlash("SetAssumeSuccessTimeout",[b])};SWFUpload.prototype.setDebugEnabled=function(b){this.settings.debug_enabled=
+b;this.callFlash("SetDebugEnabled",[b])};SWFUpload.prototype.setButtonImageURL=function(b){b==void 0&&(b="");this.settings.button_image_url=b;this.callFlash("SetButtonImageURL",[b])};SWFUpload.prototype.setButtonDimensions=function(b,d){this.settings.button_width=b;this.settings.button_height=d;var f=this.getMovieElement();if(f!=void 0)f.style.width=b+"px",f.style.height=d+"px";this.callFlash("SetButtonDimensions",[b,d])};SWFUpload.prototype.setButtonText=function(b){this.settings.button_text=b;this.callFlash("SetButtonText",
+[b])};SWFUpload.prototype.setButtonTextPadding=function(b,d){this.settings.button_text_top_padding=d;this.settings.button_text_left_padding=b;this.callFlash("SetButtonTextPadding",[b,d])};SWFUpload.prototype.setButtonTextStyle=function(b){this.settings.button_text_style=b;this.callFlash("SetButtonTextStyle",[b])};SWFUpload.prototype.setButtonDisabled=function(b){this.settings.button_disabled=b;this.callFlash("SetButtonDisabled",[b])};SWFUpload.prototype.setButtonAction=function(b){this.settings.button_action=
+b;this.callFlash("SetButtonAction",[b])};SWFUpload.prototype.setButtonCursor=function(b){this.settings.button_cursor=b;this.callFlash("SetButtonCursor",[b])};SWFUpload.prototype.queueEvent=function(b,d){d==void 0?d=[]:d instanceof Array||(d=[d]);var f=this;if(typeof this.settings[b]==="function")this.eventQueue.push(function(){this.settings[b].apply(this,d)}),setTimeout(function(){f.executeNextEvent()},0);else if(this.settings[b]!==null)throw"Event handler "+b+" is unknown or is not a function";};
+SWFUpload.prototype.executeNextEvent=function(){var b=this.eventQueue?this.eventQueue.shift():null;typeof b==="function"&&b.apply(this)};SWFUpload.prototype.unescapeFilePostParams=function(b){var d=/[$]([0-9a-f]{4})/i,f={},j;if(b!=void 0){for(var e in b.post)if(b.post.hasOwnProperty(e)){j=e;for(var h;(h=d.exec(j))!==null;)j=j.replace(h[0],String.fromCharCode(parseInt("0x"+h[1],16)));f[j]=b.post[e]}b.post=f}return b};SWFUpload.prototype.testExternalInterface=function(){try{return this.callFlash("TestExternalInterface")}catch(b){return!1}};
+SWFUpload.prototype.flashReady=function(){var b=this.getMovieElement();b?(this.cleanUp(b),this.queueEvent("swfupload_loaded_handler")):this.debug("Flash called back ready but the flash movie can't be found.")};SWFUpload.prototype.cleanUp=function(b){try{if(this.movieElement&&typeof b.CallFunction==="unknown"){this.debug("Removing Flash functions hooks (this should only run in IE and should prevent memory leaks)");for(var d in b)try{typeof b[d]==="function"&&(b[d]=null)}catch(f){}}}catch(j){}window.__flash__removeCallback=
+function(b,d){try{b&&(b[d]=null)}catch(f){}}};SWFUpload.prototype.fileDialogStart=function(){this.queueEvent("file_dialog_start_handler")};SWFUpload.prototype.fileQueued=function(b){b=this.unescapeFilePostParams(b);this.queueEvent("file_queued_handler",b)};SWFUpload.prototype.fileQueueError=function(b,d,f){b=this.unescapeFilePostParams(b);this.queueEvent("file_queue_error_handler",[b,d,f])};SWFUpload.prototype.fileDialogComplete=function(b,d,f){this.queueEvent("file_dialog_complete_handler",[b,d,
+f])};SWFUpload.prototype.uploadStart=function(b){b=this.unescapeFilePostParams(b);this.queueEvent("return_upload_start_handler",b)};SWFUpload.prototype.returnUploadStart=function(b){var d;if(typeof this.settings.upload_start_handler==="function")b=this.unescapeFilePostParams(b),d=this.settings.upload_start_handler.call(this,b);else if(this.settings.upload_start_handler!=void 0)throw"upload_start_handler must be a function";d===void 0&&(d=!0);this.callFlash("ReturnUploadStart",[!!d])};SWFUpload.prototype.uploadProgress=
+function(b,d,f){b=this.unescapeFilePostParams(b);this.queueEvent("upload_progress_handler",[b,d,f])};SWFUpload.prototype.uploadError=function(b,d,f){b=this.unescapeFilePostParams(b);this.queueEvent("upload_error_handler",[b,d,f])};SWFUpload.prototype.uploadSuccess=function(b,d,f){b=this.unescapeFilePostParams(b);this.queueEvent("upload_success_handler",[b,d,f])};SWFUpload.prototype.uploadComplete=function(b){b=this.unescapeFilePostParams(b);this.queueEvent("upload_complete_handler",b)};SWFUpload.prototype.debug=
+function(b){this.queueEvent("debug_handler",b)};SWFUpload.prototype.debugMessage=function(b){if(this.settings.debug){var d=[];if(typeof b==="object"&&typeof b.name==="string"&&typeof b.message==="string"){for(var f in b)b.hasOwnProperty(f)&&d.push(f+": "+b[f]);b=d.join("\n")||"";d=b.split("\n");b="EXCEPTION: "+d.join("\nEXCEPTION: ")}SWFUpload.Console.writeLine(b)}};SWFUpload.Console={};SWFUpload.Console.writeLine=function(b){var d,f;try{d=document.getElementById("SWFUpload_Console");if(!d)f=document.createElement("form"),
+document.getElementsByTagName("body")[0].appendChild(f),d=document.createElement("textarea"),d.id="SWFUpload_Console",d.style.fontFamily="monospace",d.setAttribute("wrap","off"),d.wrap="off",d.style.overflow="auto",d.style.width="700px",d.style.height="350px",d.style.margin="5px",f.appendChild(d);d.value+=b+"\n";d.scrollTop=d.scrollHeight-d.clientHeight}catch(j){alert("Exception: "+j.name+" Message: "+j.message)}}})();
+(function(){if(typeof SWFUpload==="function")SWFUpload.queue={},SWFUpload.prototype.initSettings=function(b){return function(){typeof b==="function"&&b.call(this);this.queueSettings={};this.queueSettings.queue_cancelled_flag=!1;this.queueSettings.queue_upload_count=0;this.queueSettings.user_upload_complete_handler=this.settings.upload_complete_handler;this.queueSettings.user_upload_start_handler=this.settings.upload_start_handler;this.settings.upload_complete_handler=SWFUpload.queue.uploadCompleteHandler;
+this.settings.upload_start_handler=SWFUpload.queue.uploadStartHandler;this.settings.queue_complete_handler=this.settings.queue_complete_handler||null}}(SWFUpload.prototype.initSettings),SWFUpload.prototype.startUpload=function(b){this.queueSettings.queue_cancelled_flag=!1;this.callFlash("StartUpload",[b])},SWFUpload.prototype.cancelQueue=function(){this.queueSettings.queue_cancelled_flag=!0;this.stopUpload();for(var b=this.getStats();b.files_queued>0;)this.cancelUpload(),b=this.getStats()},SWFUpload.queue.uploadStartHandler=
+function(b){var d;typeof this.queueSettings.user_upload_start_handler==="function"&&(d=this.queueSettings.user_upload_start_handler.call(this,b));d=d===!1?!1:!0;this.queueSettings.queue_cancelled_flag=!d;return d},SWFUpload.queue.uploadCompleteHandler=function(b){var d=this.queueSettings.user_upload_complete_handler;b.filestatus===SWFUpload.FILE_STATUS.COMPLETE&&this.queueSettings.queue_upload_count++;if(typeof d==="function"?d.call(this,b)!==!1:b.filestatus!==SWFUpload.FILE_STATUS.QUEUED)this.getStats().files_queued>
+0&&this.queueSettings.queue_cancelled_flag===!1?this.startUpload():(this.queueSettings.queue_cancelled_flag===!1?this.queueEvent("queue_complete_handler",[this.queueSettings.queue_upload_count]):this.queueSettings.queue_cancelled_flag=!1,this.queueSettings.queue_upload_count=0)}})();
+KindEditor.plugin("pagebreak",function(b){var d=this,f=b.undef(d.pagebreakHtml,'<hr style="page-break-after: always;" class="ke-pagebreak" />');d.clickToolbar("pagebreak",function(){var j=d.cmd,e=j.range;d.focus();var h=d.newlineTag=="br"||b.WEBKIT?"":'<span id="__kindeditor_tail_tag__"></span>';d.insertHtml(f+h);h!==""&&(h=b("#__kindeditor_tail_tag__",d.edit.doc),e.selectNodeContents(h[0]),h.removeAttr("id"),j.select())})});
+KindEditor.plugin("plainpaste",function(b){var d=this;d.clickToolbar("plainpaste",function(){var f='<div style="padding:10px 20px;"><div style="margin-bottom:10px;">'+d.lang("plainpaste.").comment+'</div><textarea class="ke-textarea" style="width:408px;height:260px;"></textarea></div>',f=d.createDialog({name:"plainpaste",width:450,title:d.lang("plainpaste"),body:f,yesBtn:{name:d.lang("yes"),click:function(){var e=j.val(),e=b.escape(e),e=e.replace(/ {2}/g," &nbsp;"),e=d.newlineTag=="p"?e.replace(/^/,
+"<p>").replace(/$/,"</p>").replace(/\n/g,"</p><p>"):e.replace(/\n/g,"<br />$&");d.insertHtml(e).hideDialog().focus()}}}),j=b("textarea",f.div);j[0].focus()})});
+KindEditor.plugin("preview",function(b){var d=this;d.clickToolbar("preview",function(){d.lang("preview.");var f=d.createDialog({name:"preview",width:750,title:d.lang("preview"),body:'<div style="padding:10px 20px;"><iframe class="ke-textarea" frameborder="0" style="width:708px;height:400px;"></iframe></div>'}),f=b("iframe",f.div),j=b.iframeDoc(f);j.open();j.write(d.fullHtml());j.close();b(j.body).css("background-color","#FFF");f[0].contentWindow.focus()})});
+KindEditor.plugin("quickformat",function(b){function d(b){for(b=b.first();b&&b.first();)b=b.first();return b}var f=this,j=b.toMap("blockquote,center,div,h1,h2,h3,h4,h5,h6,p");f.clickToolbar("quickformat",function(){f.focus();for(var e=f.edit.doc,h=f.cmd.range,m=b(e.body).first(),n,o=[],l=[],s=h.createBookmark(!0);m;){n=m.next();var v=d(m);if(!v||v.name!="img")if(j[m.name]?(m.html(m.html().replace(/^(\s|&nbsp;|\u3000)+/ig,"")),m.css("text-indent","2em")):l.push(m),!n||j[n.name]||j[m.name]&&!j[n.name])l.length>
+0&&o.push(l),l=[];m=n}b.each(o,function(d,f){var h=b('<p style="text-indent:2em;"></p>',e);f[0].before(h);b.each(f,function(b,d){h.append(d)})});h.moveToBookmark(s);f.addBookmark()})});
+KindEditor.plugin("table",function(b){function d(b,d){d=d.toUpperCase();b.css("background-color",d);b.css("color",d==="#000000"?"#FFFFFF":"#000000");b.html(d)}function f(f,h){function l(){b.each(m,function(){this.remove()});m=[];b(document).unbind("click,mousedown",l);f.unbind("click,mousedown",l)}h.bind("click,mousedown",function(b){b.stopPropagation()});h.click(function(){l();var h=b(this),o=h.pos(),o=b.colorpicker({x:o.x,y:o.y+h.height(),z:811214,selectedColor:b(this).html(),colors:e.colorTable,
+noColor:e.lang("noColor"),shadowMode:e.shadowMode,click:function(b){d(h,b);l()}});m.push(o);b(document).bind("click,mousedown",l);f.bind("click,mousedown",l)})}function j(b,d,e){for(var f=b=0,h=d.cells.length;f<h;f++){if(d.cells[f]==e)break;b+=d.cells[f].rowSpan-1}return e.cellIndex-b}var e=this,h=e.lang("table."),m=[];e.plugin.table={prop:function(n){var o=['<div style="padding:20px;"><div class="ke-dialog-row">','<label for="keRows" style="width:90px;">'+h.cells+"</label>",h.rows+' <input type="text" id="keRows" class="ke-input-text ke-input-number" name="rows" value="" maxlength="4" /> &nbsp; ',
+h.cols+' <input type="text" class="ke-input-text ke-input-number" name="cols" value="" maxlength="4" />','</div><div class="ke-dialog-row">','<label for="keWidth" style="width:90px;">'+h.size+"</label>",h.width+' <input type="text" id="keWidth" class="ke-input-text ke-input-number" name="width" value="" maxlength="4" /> &nbsp; ','<select name="widthType">','<option value="%">'+h.percent+"</option>",'<option value="px">'+h.px+"</option>","</select> &nbsp; ",h.height+' <input type="text" class="ke-input-text ke-input-number" name="height" value="" maxlength="4" /> &nbsp; ',
+'<select name="heightType">','<option value="%">'+h.percent+"</option>",'<option value="px">'+h.px+"</option>",'</select></div><div class="ke-dialog-row">','<label for="kePadding" style="width:90px;">'+h.space+"</label>",h.padding+' <input type="text" id="kePadding" class="ke-input-text ke-input-number" name="padding" value="" maxlength="4" /> &nbsp; ',h.spacing+' <input type="text" class="ke-input-text ke-input-number" name="spacing" value="" maxlength="4" />','</div><div class="ke-dialog-row">',
+'<label for="keAlign" style="width:90px;">'+h.align+"</label>",'<select id="keAlign" name="align">','<option value="">'+h.alignDefault+"</option>",'<option value="left">'+h.alignLeft+"</option>",'<option value="center">'+h.alignCenter+"</option>",'<option value="right">'+h.alignRight+"</option>",'</select></div><div class="ke-dialog-row">','<label for="keBorder" style="width:90px;">'+h.border+"</label>",h.borderWidth+' <input type="text" id="keBorder" class="ke-input-text ke-input-number" name="border" value="" maxlength="4" /> &nbsp; ',
+h.borderColor+' <span class="ke-inline-block ke-input-color"></span>','</div><div class="ke-dialog-row">','<label for="keBgColor" style="width:90px;">'+h.backgroundColor+"</label>",'<span class="ke-inline-block ke-input-color"></span></div></div>'].join(""),l=e.cmd.range.createBookmark(),o=e.createDialog({name:"table",width:500,title:e.lang("table"),body:o,beforeRemove:function(){C.unbind()},yesBtn:{name:e.lang("yes"),click:function(){var d=j.val(),f=m.val(),h=p.val(),n=r.val(),o=z.val(),I=D.val(),
+O=q.val(),Q=A.val(),R=B.val(),H=G.val(),U=b(C[0]).html()||"",W=b(C[1]).html()||"";if(d==0||!/^\d+$/.test(d))alert(e.lang("invalidRows")),j[0].focus();else if(f==0||!/^\d+$/.test(f))alert(e.lang("invalidRows")),m[0].focus();else if(/^\d*$/.test(h))if(/^\d*$/.test(n))if(/^\d*$/.test(O))if(/^\d*$/.test(Q))if(/^\d*$/.test(H)){if(u)h!==""?u.width(h+o):u.css("width",""),u[0].width!==void 0&&u.removeAttr("width"),n!==""?u.height(n+I):u.css("height",""),u[0].height!==void 0&&u.removeAttr("height"),u.css("background-color",
+W),u[0].bgColor!==void 0&&u.removeAttr("bgColor"),O!==""?u[0].cellPadding=O:u.removeAttr("cellPadding"),Q!==""?u[0].cellSpacing=Q:u.removeAttr("cellSpacing"),R!==""?u[0].align=R:u.removeAttr("align"),H!==""?u.attr("border",H):u.removeAttr("border"),H===""||H==="0"?u.addClass("ke-zeroborder"):u.removeClass("ke-zeroborder"),U!==""?u.attr("borderColor",U):u.removeAttr("borderColor"),e.hideDialog().focus(),e.cmd.range.moveToBookmark(l),e.cmd.select();else{var S="";h!==""&&(S+="width:"+h+o+";");n!==""&&
+(S+="height:"+n+I+";");W!==""&&(S+="background-color:"+W+";");h="<table";S!==""&&(h+=' style="'+S+'"');O!==""&&(h+=' cellpadding="'+O+'"');Q!==""&&(h+=' cellspacing="'+Q+'"');R!==""&&(h+=' align="'+R+'"');H!==""&&(h+=' border="'+H+'"');if(H===""||H==="0")h+=' class="ke-zeroborder"';U!==""&&(h+=' bordercolor="'+U+'"');h+=">";for(O=0;O<d;O++){h+="<tr>";for(Q=0;Q<f;Q++)h+="<td>"+(b.IE?"&nbsp;":"<br />")+"</td>";h+="</tr>"}h+="</table>";b.IE||(h+="<br />");e.insertHtml(h);e.select().hideDialog().focus()}e.addBookmark()}else alert(e.lang("invalidBorder")),
+G[0].focus();else alert(e.lang("invalidSpacing")),A[0].focus();else alert(e.lang("invalidPadding")),q[0].focus();else alert(e.lang("invalidHeight")),r[0].focus();else alert(e.lang("invalidWidth")),p[0].focus()}}}).div,j=b('[name="rows"]',o).val(3),m=b('[name="cols"]',o).val(2),p=b('[name="width"]',o).val(100),r=b('[name="height"]',o),z=b('[name="widthType"]',o),D=b('[name="heightType"]',o),q=b('[name="padding"]',o).val(2),A=b('[name="spacing"]',o).val(0),B=b('[name="align"]',o),G=b('[name="border"]',
+o).val(1),C=b(".ke-input-color",o);f(o,C.eq(0));f(o,C.eq(1));d(C.eq(0),"#000000");d(C.eq(1),"");j[0].focus();j[0].select();var u;if(!n&&(u=e.plugin.getSelectedTable())){j.val(u[0].rows.length);m.val(u[0].rows.length>0?u[0].rows[0].cells.length:0);j.attr("disabled",!0);m.attr("disabled",!0);var I,n=u[0].style.width||u[0].width,o=u[0].style.height||u[0].height;n!==void 0&&(I=/^(\d+)((?:px|%)*)$/.exec(n))?(p.val(I[1]),z.val(I[2])):p.val("");if(o!==void 0&&(I=/^(\d+)((?:px|%)*)$/.exec(o)))r.val(I[1]),
+D.val(I[2]);q.val(u[0].cellPadding||"");A.val(u[0].cellSpacing||"");B.val(u[0].align||"");G.val(u[0].border===void 0?"":u[0].border);d(C.eq(0),b.toHex(u.attr("borderColor")||""));d(C.eq(1),b.toHex(u[0].style.backgroundColor||u[0].bgColor||""));p[0].focus();p[0].select()}},cellprop:function(){var n=['<div style="padding:20px;"><div class="ke-dialog-row">','<label for="keWidth" style="width:90px;">'+h.size+"</label>",h.width+' <input type="text" id="keWidth" class="ke-input-text ke-input-number" name="width" value="" maxlength="4" /> &nbsp; ',
+'<select name="widthType">','<option value="%">'+h.percent+"</option>",'<option value="px">'+h.px+"</option>","</select> &nbsp; ",h.height+' <input type="text" class="ke-input-text ke-input-number" name="height" value="" maxlength="4" /> &nbsp; ','<select name="heightType">','<option value="%">'+h.percent+"</option>",'<option value="px">'+h.px+"</option>",'</select></div><div class="ke-dialog-row">','<label for="keAlign" style="width:90px;">'+h.align+"</label>",h.textAlign+' <select id="keAlign" name="textAlign">',
+'<option value="">'+h.alignDefault+"</option>",'<option value="left">'+h.alignLeft+"</option>",'<option value="center">'+h.alignCenter+"</option>",'<option value="right">'+h.alignRight+"</option>","</select> ",h.verticalAlign+' <select name="verticalAlign">','<option value="">'+h.alignDefault+"</option>",'<option value="top">'+h.alignTop+"</option>",'<option value="middle">'+h.alignMiddle+"</option>",'<option value="bottom">'+h.alignBottom+"</option>",'<option value="baseline">'+h.alignBaseline+"</option>",
+'</select></div><div class="ke-dialog-row">','<label for="keBorder" style="width:90px;">'+h.border+"</label>",h.borderWidth+' <input type="text" id="keBorder" class="ke-input-text ke-input-number" name="border" value="" maxlength="4" /> &nbsp; ',h.borderColor+' <span class="ke-inline-block ke-input-color"></span>','</div><div class="ke-dialog-row">','<label for="keBgColor" style="width:90px;">'+h.backgroundColor+"</label>",'<span class="ke-inline-block ke-input-color"></span></div></div>'].join(""),
+o=e.cmd.range.createBookmark(),n=e.createDialog({name:"table",width:500,title:e.lang("tablecell"),body:n,beforeRemove:function(){B.unbind()},yesBtn:{name:e.lang("yes"),click:function(){var d=l.val(),f=j.val(),h=m.val(),n=p.val();r.val();z.val();var C=D.val(),$=q.val(),M=A.val(),K=b(B[0]).html()||"",O=b(B[1]).html()||"";/^\d*$/.test(d)?/^\d*$/.test(f)?/^\d*$/.test(M)?(G.css({width:d!==""?d+h:"",height:f!==""?f+n:"","background-color":O,"text-align":C,"vertical-align":$,"border-width":M,"border-style":M!==
+""?"solid":"","border-color":K}),e.hideDialog().focus(),e.cmd.range.moveToBookmark(o),e.cmd.select(),e.addBookmark()):(alert(e.lang("invalidBorder")),A[0].focus()):(alert(e.lang("invalidHeight")),j[0].focus()):(alert(e.lang("invalidWidth")),l[0].focus())}}}).div,l=b('[name="width"]',n).val(100),j=b('[name="height"]',n),m=b('[name="widthType"]',n),p=b('[name="heightType"]',n),r=b('[name="padding"]',n).val(2),z=b('[name="spacing"]',n).val(0),D=b('[name="textAlign"]',n),q=b('[name="verticalAlign"]',
+n),A=b('[name="border"]',n).val(1),B=b(".ke-input-color",n);f(n,B.eq(0));f(n,B.eq(1));d(B.eq(0),"#000000");d(B.eq(1),"");l[0].focus();l[0].select();var G=e.plugin.getSelectedCell(),C=G[0].style.height||G[0].height||"";(n=/^(\d+)((?:px|%)*)$/.exec(G[0].style.width||G[0].width||""))?(l.val(n[1]),m.val(n[2])):l.val("");if(n=/^(\d+)((?:px|%)*)$/.exec(C))j.val(n[1]),p.val(n[2]);D.val(G[0].style.textAlign||"");q.val(G[0].style.verticalAlign||"");(n=G[0].style.borderWidth||"")&&(n=parseInt(n));A.val(n);
+d(B.eq(0),b.toHex(G[0].style.borderColor||""));d(B.eq(1),b.toHex(G[0].style.backgroundColor||""));l[0].focus();l[0].select()},insert:function(){this.prop(!0)},"delete":function(){var b=e.plugin.getSelectedTable();e.cmd.range.setStartBefore(b[0]).collapse(!0);e.cmd.select();b.remove();e.addBookmark()},colinsert:function(d){var f=e.plugin.getSelectedTable()[0],h=e.plugin.getSelectedRow()[0],m=e.plugin.getSelectedCell()[0],d=m.cellIndex+d;d+=f.rows[0].cells.length-h.cells.length;for(var h=0,v=f.rows.length;h<
+v;h++){var p=f.rows[h],d=p.insertCell(d);d.innerHTML=b.IE?"":"<br />";d=j(f,p,d)}e.cmd.range.selectNodeContents(m).collapse(!0);e.cmd.select();e.addBookmark()},colinsertleft:function(){this.colinsert(0)},colinsertright:function(){this.colinsert(1)},rowinsert:function(d){var f=e.plugin.getSelectedTable()[0],h=e.plugin.getSelectedRow()[0],j=e.plugin.getSelectedCell()[0],m=h.rowIndex;d===1&&(m=h.rowIndex+(j.rowSpan-1)+d);for(var p=f.insertRow(m),r=0,z=h.cells.length;r<z;r++){h.cells[r].rowSpan>1&&(z-=
+h.cells[r].rowSpan-1);var D=p.insertCell(r);if(d===1&&h.cells[r].colSpan>1)D.colSpan=h.cells[r].colSpan;D.innerHTML=b.IE?"":"<br />"}for(h=m;h>=0;h--)if(d=f.rows[h].cells,d.length>r){for(f=j.cellIndex;f>=0;f--)d[f].rowSpan>1&&(d[f].rowSpan+=1);break}e.cmd.range.selectNodeContents(j).collapse(!0);e.cmd.select();e.addBookmark()},rowinsertabove:function(){this.rowinsert(0)},rowinsertbelow:function(){this.rowinsert(1)},rowmerge:function(){var b=e.plugin.getSelectedTable()[0],d=e.plugin.getSelectedRow()[0],
+f=e.plugin.getSelectedCell()[0],h=d.rowIndex+f.rowSpan,d=b.rows[h];if(!(b.rows.length<=h))b=f.cellIndex,d.cells.length<=b||(h=d.cells[b],f.colSpan===h.colSpan&&(f.rowSpan+=h.rowSpan,d.deleteCell(b),e.cmd.range.selectNodeContents(f).collapse(!0),e.cmd.select(),e.addBookmark()))},colmerge:function(){e.plugin.getSelectedTable();var b=e.plugin.getSelectedRow()[0],d=e.plugin.getSelectedCell()[0],f=d.cellIndex+1;if(!(b.cells.length<=f)){var h=b.cells[f];d.rowSpan===h.rowSpan&&(d.colSpan+=h.colSpan,b.deleteCell(f),
+e.cmd.range.selectNodeContents(d).collapse(!0),e.cmd.select(),e.addBookmark())}},rowsplit:function(){var d=e.plugin.getSelectedTable()[0],f=e.plugin.getSelectedRow()[0],h=e.plugin.getSelectedCell()[0],m=f.rowIndex;if(h.rowSpan!==1){for(var v=j(d,f,h),f=1,p=h.rowSpan;f<p;f++){var r=d.rows[m+f],v=r.insertCell(v);if(h.colSpan>1)v.colSpan=h.colSpan;v.innerHTML=b.IE?"":"<br />";v=j(d,r,v)}b(h).removeAttr("rowSpan");e.cmd.range.selectNodeContents(h).collapse(!0);e.cmd.select();e.addBookmark()}},colsplit:function(){e.plugin.getSelectedTable();
+var d=e.plugin.getSelectedRow()[0],f=e.plugin.getSelectedCell()[0],h=f.cellIndex;if(f.colSpan!==1){for(var j=1,m=f.colSpan;j<m;j++){var p=d.insertCell(h+j);if(f.rowSpan>1)p.rowSpan=f.rowSpan;p.innerHTML=b.IE?"":"<br />"}b(f).removeAttr("colSpan");e.cmd.range.selectNodeContents(f).collapse(!0);e.cmd.select();e.addBookmark()}},coldelete:function(){for(var d=e.plugin.getSelectedTable()[0],f=e.plugin.getSelectedRow()[0],h=e.plugin.getSelectedCell()[0].cellIndex,j=0,m=d.rows.length;j<m;j++){var p=d.rows[j],
+r=p.cells[h];r.colSpan>1?(r.colSpan-=1,r.colSpan===1&&b(r).removeAttr("colSpan")):p.deleteCell(h);r.rowSpan>1&&(j+=r.rowSpan-1)}f.cells.length===0?(e.cmd.range.setStartBefore(d).collapse(!0),e.cmd.select(),b(d).remove()):e.cmd.selection(!0);e.addBookmark()},rowdelete:function(){for(var d=e.plugin.getSelectedTable()[0],f=e.plugin.getSelectedRow()[0],h=e.plugin.getSelectedCell()[0],f=f.rowIndex,h=h.rowSpan-1;h>=0;h--)d.deleteRow(f+h);d.rows.length===0?(e.cmd.range.setStartBefore(d).collapse(!0),e.cmd.select(),
+b(d).remove()):e.cmd.selection(!0);e.addBookmark()}};e.clickToolbar("table",e.plugin.table.prop)});
+KindEditor.plugin("template",function(b){function d(d){return j+d+"?ver="+encodeURIComponent(b.DEBUG?b.TIME:b.VERSION)}var f=this;f.lang("template.");var j=f.pluginsPath+"template/html/";f.clickToolbar("template",function(){var e=f.lang("template."),h=['<div style="padding:10px 20px;">','<div class="ke-header">','<div class="ke-left">',e.selectTemplate+" <select>"];b.each(e.fileList,function(b,d){h.push('<option value="'+b+'">'+d+"</option>")});html=[h.join(""),'</select></div><div class="ke-right">',
+'<input type="checkbox" id="keReplaceFlag" name="replaceFlag" value="1" /> <label for="keReplaceFlag">'+e.replaceContent+"</label>",'</div><div class="ke-clearfix"></div></div><iframe class="ke-textarea" frameborder="0" style="width:458px;height:260px;background-color:#FFF;"></iframe></div>'].join("");var e=f.createDialog({name:"template",width:500,title:f.lang("template"),body:html,yesBtn:{name:f.lang("yes"),click:function(){var d=b.iframeDoc(o);f[n[0].checked?"html":"insertHtml"](d.body.innerHTML).hideDialog().focus()}}}),
+j=b("select",e.div),n=b('[name="replaceFlag"]',e.div),o=b("iframe",e.div);n[0].checked=!0;o.attr("src",d(j.val()));j.change(function(){o.attr("src",d(this.value))})})});
+KindEditor.plugin("wordpaste",function(b){var d=this;d.clickToolbar("wordpaste",function(){var f='<div style="padding:10px 20px;"><div style="margin-bottom:10px;">'+d.lang("wordpaste.").comment+'</div><iframe class="ke-textarea" frameborder="0" style="width:408px;height:260px;"></iframe></div>',f=d.createDialog({name:"wordpaste",width:450,title:d.lang("wordpaste"),body:f,yesBtn:{name:d.lang("yes"),click:function(){var e=j.body.innerHTML,e=b.clearMsWord(e,d.filterMode?d.htmlTags:b.options.htmlTags);
+d.insertHtml(e).hideDialog().focus()}}}).div,f=b("iframe",f),j=b.iframeDoc(f);if(!b.IE)j.designMode="on";j.open();j.write("<!doctype html><html><head><title>WordPaste</title></head>");j.write('<body style="background-color:#FFF;font-size:12px;margin:2px;">');b.IE||j.write("<br />");j.write("</body></html>");j.close();if(b.IE)j.body.contentEditable="true";f[0].contentWindow.focus()})});
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/kindeditor-all.js b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/kindeditor-all.js
new file mode 100644
index 0000000..a5b8ea3
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/kindeditor-all.js
@@ -0,0 +1,10220 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2013 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @website http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+* @version 4.1.10 (2013-11-23)
+*******************************************************************************/
+(function (window, undefined) {
+	if (window.KindEditor) {
+		return;
+	}
+if (!window.console) {
+	window.console = {};
+}
+if (!console.log) {
+	console.log = function () {};
+}
+var _VERSION = '4.1.10 (2013-11-23)',
+	_ua = navigator.userAgent.toLowerCase(),
+	_IE = _ua.indexOf('msie') > -1 && _ua.indexOf('opera') == -1,
+	_NEWIE = _ua.indexOf('msie') == -1 && _ua.indexOf('trident') > -1,
+	_GECKO = _ua.indexOf('gecko') > -1 && _ua.indexOf('khtml') == -1,
+	_WEBKIT = _ua.indexOf('applewebkit') > -1,
+	_OPERA = _ua.indexOf('opera') > -1,
+	_MOBILE = _ua.indexOf('mobile') > -1,
+	_IOS = /ipad|iphone|ipod/.test(_ua),
+	_QUIRKS = document.compatMode != 'CSS1Compat',
+	_IERANGE = !window.getSelection,
+	_matches = /(?:msie|firefox|webkit|opera)[\/:\s](\d+)/.exec(_ua),
+	_V = _matches ? _matches[1] : '0',
+	_TIME = new Date().getTime();
+function _isArray(val) {
+	if (!val) {
+		return false;
+	}
+	return Object.prototype.toString.call(val) === '[object Array]';
+}
+function _isFunction(val) {
+	if (!val) {
+		return false;
+	}
+	return Object.prototype.toString.call(val) === '[object Function]';
+}
+function _inArray(val, arr) {
+	for (var i = 0, len = arr.length; i < len; i++) {
+		if (val === arr[i]) {
+			return i;
+		}
+	}
+	return -1;
+}
+function _each(obj, fn) {
+	if (_isArray(obj)) {
+		for (var i = 0, len = obj.length; i < len; i++) {
+			if (fn.call(obj[i], i, obj[i]) === false) {
+				break;
+			}
+		}
+	} else {
+		for (var key in obj) {
+			if (obj.hasOwnProperty(key)) {
+				if (fn.call(obj[key], key, obj[key]) === false) {
+					break;
+				}
+			}
+		}
+	}
+}
+function _trim(str) {
+	return str.replace(/(?:^[ \t\n\r]+)|(?:[ \t\n\r]+$)/g, '');
+}
+function _inString(val, str, delimiter) {
+	delimiter = delimiter === undefined ? ',' : delimiter;
+	return (delimiter + str + delimiter).indexOf(delimiter + val + delimiter) >= 0;
+}
+function _addUnit(val, unit) {
+	unit = unit || 'px';
+	return val && /^\d+$/.test(val) ? val + unit : val;
+}
+function _removeUnit(val) {
+	var match;
+	return val && (match = /(\d+)/.exec(val)) ? parseInt(match[1], 10) : 0;
+}
+function _escape(val) {
+	return val.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;');
+}
+function _unescape(val) {
+	return val.replace(/&lt;/g, '<').replace(/&gt;/g, '>').replace(/&quot;/g, '"').replace(/&amp;/g, '&');
+}
+function _toCamel(str) {
+	var arr = str.split('-');
+	str = '';
+	_each(arr, function(key, val) {
+		str += (key > 0) ? val.charAt(0).toUpperCase() + val.substr(1) : val;
+	});
+	return str;
+}
+function _toHex(val) {
+	function hex(d) {
+		var s = parseInt(d, 10).toString(16).toUpperCase();
+		return s.length > 1 ? s : '0' + s;
+	}
+	return val.replace(/rgb\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)/ig,
+		function($0, $1, $2, $3) {
+			return '#' + hex($1) + hex($2) + hex($3);
+		}
+	);
+}
+function _toMap(val, delimiter) {
+	delimiter = delimiter === undefined ? ',' : delimiter;
+	var map = {}, arr = _isArray(val) ? val : val.split(delimiter), match;
+	_each(arr, function(key, val) {
+		if ((match = /^(\d+)\.\.(\d+)$/.exec(val))) {
+			for (var i = parseInt(match[1], 10); i <= parseInt(match[2], 10); i++) {
+				map[i.toString()] = true;
+			}
+		} else {
+			map[val] = true;
+		}
+	});
+	return map;
+}
+function _toArray(obj, offset) {
+	return Array.prototype.slice.call(obj, offset || 0);
+}
+function _undef(val, defaultVal) {
+	return val === undefined ? defaultVal : val;
+}
+function _invalidUrl(url) {
+	return !url || /[<>"]/.test(url);
+}
+function _addParam(url, param) {
+	return url.indexOf('?') >= 0 ? url + '&' + param : url + '?' + param;
+}
+function _extend(child, parent, proto) {
+	if (!proto) {
+		proto = parent;
+		parent = null;
+	}
+	var childProto;
+	if (parent) {
+		var fn = function () {};
+		fn.prototype = parent.prototype;
+		childProto = new fn();
+		_each(proto, function(key, val) {
+			childProto[key] = val;
+		});
+	} else {
+		childProto = proto;
+	}
+	childProto.constructor = child;
+	child.prototype = childProto;
+	child.parent = parent ? parent.prototype : null;
+}
+function _json(text) {
+	var match;
+	if ((match = /\{[\s\S]*\}|\[[\s\S]*\]/.exec(text))) {
+		text = match[0];
+	}
+	var cx = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g;
+	cx.lastIndex = 0;
+	if (cx.test(text)) {
+		text = text.replace(cx, function (a) {
+			return '\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
+		});
+	}
+	if (/^[\],:{}\s]*$/.
+	test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@').
+	replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']').
+	replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
+		return eval('(' + text + ')');
+	}
+	throw 'JSON parse error';
+}
+var _round = Math.round;
+var K = {
+	DEBUG : false,
+	VERSION : _VERSION,
+	IE : _IE,
+	GECKO : _GECKO,
+	WEBKIT : _WEBKIT,
+	OPERA : _OPERA,
+	V : _V,
+	TIME : _TIME,
+	each : _each,
+	isArray : _isArray,
+	isFunction : _isFunction,
+	inArray : _inArray,
+	inString : _inString,
+	trim : _trim,
+	addUnit : _addUnit,
+	removeUnit : _removeUnit,
+	escape : _escape,
+	unescape : _unescape,
+	toCamel : _toCamel,
+	toHex : _toHex,
+	toMap : _toMap,
+	toArray : _toArray,
+	undef : _undef,
+	invalidUrl : _invalidUrl,
+	addParam : _addParam,
+	extend : _extend,
+	json : _json
+};
+var _INLINE_TAG_MAP = _toMap('a,abbr,acronym,b,basefont,bdo,big,br,button,cite,code,del,dfn,em,font,i,img,input,ins,kbd,label,map,q,s,samp,select,small,span,strike,strong,sub,sup,textarea,tt,u,var'),
+	_BLOCK_TAG_MAP = _toMap('address,applet,blockquote,body,center,dd,dir,div,dl,dt,fieldset,form,frameset,h1,h2,h3,h4,h5,h6,head,hr,html,iframe,ins,isindex,li,map,menu,meta,noframes,noscript,object,ol,p,pre,script,style,table,tbody,td,tfoot,th,thead,title,tr,ul'),
+	_SINGLE_TAG_MAP = _toMap('area,base,basefont,br,col,frame,hr,img,input,isindex,link,meta,param,embed'),
+	_STYLE_TAG_MAP = _toMap('b,basefont,big,del,em,font,i,s,small,span,strike,strong,sub,sup,u'),
+	_CONTROL_TAG_MAP = _toMap('img,table,input,textarea,button'),
+	_PRE_TAG_MAP = _toMap('pre,style,script'),
+	_NOSPLIT_TAG_MAP = _toMap('html,head,body,td,tr,table,ol,ul,li'),
+	_AUTOCLOSE_TAG_MAP = _toMap('colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr'),
+	_FILL_ATTR_MAP = _toMap('checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected'),
+	_VALUE_TAG_MAP = _toMap('input,button,textarea,select');
+function _getBasePath() {
+	var els = document.getElementsByTagName('script'), src;
+	for (var i = 0, len = els.length; i < len; i++) {
+		src = els[i].src || '';
+		if (/kindeditor[\w\-\.]*\.js/.test(src)) {
+			return src.substring(0, src.lastIndexOf('/') + 1);
+		}
+	}
+	return '';
+}
+K.basePath = _getBasePath();
+K.options = {
+	designMode : true,
+	fullscreenMode : false,
+	filterMode : true,
+	wellFormatMode : true,
+	shadowMode : true,
+	loadStyleMode : true,
+	basePath : K.basePath,
+	themesPath : K.basePath + 'themes/',
+	langPath : K.basePath + 'lang/',
+	pluginsPath : K.basePath + 'plugins/',
+	themeType : 'default',
+	langType : 'zh_CN',
+	urlType : '',
+	newlineTag : 'p',
+	resizeType : 2,
+	syncType : 'form',
+	pasteType : 2,
+	dialogAlignType : 'page',
+	useContextmenu : true,
+	fullscreenShortcut : false,
+	bodyClass : 'ke-content',
+	indentChar : '\t',
+	cssPath : '',
+	cssData : '',
+	minWidth : 650,
+	minHeight : 100,
+	minChangeSize : 50,
+	zIndex : 811213,
+	items : [
+		'source', '|', 'undo', 'redo', '|', 'preview', 'print', 'template', 'code', 'cut', 'copy', 'paste',
+		'plainpaste', 'wordpaste', '|', 'justifyleft', 'justifycenter', 'justifyright',
+		'justifyfull', 'insertorderedlist', 'insertunorderedlist', 'indent', 'outdent', 'subscript',
+		'superscript', 'clearhtml', 'quickformat', 'selectall', '|', 'fullscreen', '/',
+		'formatblock', 'fontname', 'fontsize', '|', 'forecolor', 'hilitecolor', 'bold',
+		'italic', 'underline', 'strikethrough', 'lineheight', 'removeformat', '|', 'image', 'multiimage',
+		'flash', 'media', 'insertfile', 'table', 'hr', 'emoticons', 'baidumap', 'pagebreak',
+		'anchor', 'link', 'unlink', '|', 'about'
+	],
+	noDisableItems : ['source', 'fullscreen'],
+	colorTable : [
+		['#E53333', '#E56600', '#FF9900', '#64451D', '#DFC5A4', '#FFE500'],
+		['#009900', '#006600', '#99BB00', '#B8D100', '#60D978', '#00D5FF'],
+		['#337FE5', '#003399', '#4C33E5', '#9933E5', '#CC33E5', '#EE33EE'],
+		['#FFFFFF', '#CCCCCC', '#999999', '#666666', '#333333', '#000000']
+	],
+	fontSizeTable : ['9px', '10px', '12px', '14px', '16px', '18px', '24px', '32px'],
+	htmlTags : {
+		font : ['id', 'class', 'color', 'size', 'face', '.background-color'],
+		span : [
+			'id', 'class', '.color', '.background-color', '.font-size', '.font-family', '.background',
+			'.font-weight', '.font-style', '.text-decoration', '.vertical-align', '.line-height'
+		],
+		div : [
+			'id', 'class', 'align', '.border', '.margin', '.padding', '.text-align', '.color',
+			'.background-color', '.font-size', '.font-family', '.font-weight', '.background',
+			'.font-style', '.text-decoration', '.vertical-align', '.margin-left'
+		],
+		table: [
+			'id', 'class', 'border', 'cellspacing', 'cellpadding', 'width', 'height', 'align', 'bordercolor',
+			'.padding', '.margin', '.border', 'bgcolor', '.text-align', '.color', '.background-color',
+			'.font-size', '.font-family', '.font-weight', '.font-style', '.text-decoration', '.background',
+			'.width', '.height', '.border-collapse'
+		],
+		'td,th': [
+			'id', 'class', 'align', 'valign', 'width', 'height', 'colspan', 'rowspan', 'bgcolor',
+			'.text-align', '.color', '.background-color', '.font-size', '.font-family', '.font-weight',
+			'.font-style', '.text-decoration', '.vertical-align', '.background', '.border'
+		],
+		a : ['id', 'class', 'href', 'target', 'name'],
+		embed : ['id', 'class', 'src', 'width', 'height', 'type', 'loop', 'autostart', 'quality', '.width', '.height', 'align', 'allowscriptaccess'],
+		img : ['id', 'class', 'src', 'width', 'height', 'border', 'alt', 'title', 'align', '.width', '.height', '.border'],
+		'p,ol,ul,li,blockquote,h1,h2,h3,h4,h5,h6' : [
+			'id', 'class', 'align', '.text-align', '.color', '.background-color', '.font-size', '.font-family', '.background',
+			'.font-weight', '.font-style', '.text-decoration', '.vertical-align', '.text-indent', '.margin-left'
+		],
+		pre : ['id', 'class'],
+		hr : ['id', 'class', '.page-break-after'],
+		'br,tbody,tr,strong,b,sub,sup,em,i,u,strike,s,del' : ['id', 'class'],
+		iframe : ['id', 'class', 'src', 'frameborder', 'width', 'height', '.width', '.height']
+	},
+	layout : '<div class="container"><div class="toolbar"></div><div class="edit"></div><div class="statusbar"></div></div>'
+};
+var _useCapture = false;
+var _INPUT_KEY_MAP = _toMap('8,9,13,32,46,48..57,59,61,65..90,106,109..111,188,190..192,219..222');
+var _CURSORMOVE_KEY_MAP = _toMap('33..40');
+var _CHANGE_KEY_MAP = {};
+_each(_INPUT_KEY_MAP, function(key, val) {
+	_CHANGE_KEY_MAP[key] = val;
+});
+_each(_CURSORMOVE_KEY_MAP, function(key, val) {
+	_CHANGE_KEY_MAP[key] = val;
+});
+function _bindEvent(el, type, fn) {
+	if (el.addEventListener){
+		el.addEventListener(type, fn, _useCapture);
+	} else if (el.attachEvent){
+		el.attachEvent('on' + type, fn);
+	}
+}
+function _unbindEvent(el, type, fn) {
+	if (el.removeEventListener){
+		el.removeEventListener(type, fn, _useCapture);
+	} else if (el.detachEvent){
+		el.detachEvent('on' + type, fn);
+	}
+}
+var _EVENT_PROPS = ('altKey,attrChange,attrName,bubbles,button,cancelable,charCode,clientX,clientY,ctrlKey,currentTarget,' +
+	'data,detail,eventPhase,fromElement,handler,keyCode,metaKey,newValue,offsetX,offsetY,originalTarget,pageX,' +
+	'pageY,prevValue,relatedNode,relatedTarget,screenX,screenY,shiftKey,srcElement,target,toElement,view,wheelDelta,which').split(',');
+function KEvent(el, event) {
+	this.init(el, event);
+}
+_extend(KEvent, {
+	init : function(el, event) {
+		var self = this, doc = el.ownerDocument || el.document || el;
+		self.event = event;
+		_each(_EVENT_PROPS, function(key, val) {
+			self[val] = event[val];
+		});
+		if (!self.target) {
+			self.target = self.srcElement || doc;
+		}
+		if (self.target.nodeType === 3) {
+			self.target = self.target.parentNode;
+		}
+		if (!self.relatedTarget && self.fromElement) {
+			self.relatedTarget = self.fromElement === self.target ? self.toElement : self.fromElement;
+		}
+		if (self.pageX == null && self.clientX != null) {
+			var d = doc.documentElement, body = doc.body;
+			self.pageX = self.clientX + (d && d.scrollLeft || body && body.scrollLeft || 0) - (d && d.clientLeft || body && body.clientLeft || 0);
+			self.pageY = self.clientY + (d && d.scrollTop  || body && body.scrollTop  || 0) - (d && d.clientTop  || body && body.clientTop  || 0);
+		}
+		if (!self.which && ((self.charCode || self.charCode === 0) ? self.charCode : self.keyCode)) {
+			self.which = self.charCode || self.keyCode;
+		}
+		if (!self.metaKey && self.ctrlKey) {
+			self.metaKey = self.ctrlKey;
+		}
+		if (!self.which && self.button !== undefined) {
+			self.which = (self.button & 1 ? 1 : (self.button & 2 ? 3 : (self.button & 4 ? 2 : 0)));
+		}
+		switch (self.which) {
+		case 186 :
+			self.which = 59;
+			break;
+		case 187 :
+		case 107 :
+		case 43 :
+			self.which = 61;
+			break;
+		case 189 :
+		case 45 :
+			self.which = 109;
+			break;
+		case 42 :
+			self.which = 106;
+			break;
+		case 47 :
+			self.which = 111;
+			break;
+		case 78 :
+			self.which = 110;
+			break;
+		}
+		if (self.which >= 96 && self.which <= 105) {
+			self.which -= 48;
+		}
+	},
+	preventDefault : function() {
+		var ev = this.event;
+		if (ev.preventDefault) {
+			ev.preventDefault();
+		} else {
+			ev.returnValue = false;
+		}
+	},
+	stopPropagation : function() {
+		var ev = this.event;
+		if (ev.stopPropagation) {
+			ev.stopPropagation();
+		} else {
+			ev.cancelBubble = true;
+		}
+	},
+	stop : function() {
+		this.preventDefault();
+		this.stopPropagation();
+	}
+});
+var _eventExpendo = 'kindeditor_' + _TIME, _eventId = 0, _eventData = {};
+function _getId(el) {
+	return el[_eventExpendo] || null;
+}
+function _setId(el) {
+	el[_eventExpendo] = ++_eventId;
+	return _eventId;
+}
+function _removeId(el) {
+	try {
+		delete el[_eventExpendo];
+	} catch(e) {
+		if (el.removeAttribute) {
+			el.removeAttribute(_eventExpendo);
+		}
+	}
+}
+function _bind(el, type, fn) {
+	if (type.indexOf(',') >= 0) {
+		_each(type.split(','), function() {
+			_bind(el, this, fn);
+		});
+		return;
+	}
+	var id = _getId(el);
+	if (!id) {
+		id = _setId(el);
+	}
+	if (_eventData[id] === undefined) {
+		_eventData[id] = {};
+	}
+	var events = _eventData[id][type];
+	if (events && events.length > 0) {
+		_unbindEvent(el, type, events[0]);
+	} else {
+		_eventData[id][type] = [];
+		_eventData[id].el = el;
+	}
+	events = _eventData[id][type];
+	if (events.length === 0) {
+		events[0] = function(e) {
+			var kevent = e ? new KEvent(el, e) : undefined;
+			_each(events, function(i, event) {
+				if (i > 0 && event) {
+					event.call(el, kevent);
+				}
+			});
+		};
+	}
+	if (_inArray(fn, events) < 0) {
+		events.push(fn);
+	}
+	_bindEvent(el, type, events[0]);
+}
+function _unbind(el, type, fn) {
+	if (type && type.indexOf(',') >= 0) {
+		_each(type.split(','), function() {
+			_unbind(el, this, fn);
+		});
+		return;
+	}
+	var id = _getId(el);
+	if (!id) {
+		return;
+	}
+	if (type === undefined) {
+		if (id in _eventData) {
+			_each(_eventData[id], function(key, events) {
+				if (key != 'el' && events.length > 0) {
+					_unbindEvent(el, key, events[0]);
+				}
+			});
+			delete _eventData[id];
+			_removeId(el);
+		}
+		return;
+	}
+	if (!_eventData[id]) {
+		return;
+	}
+	var events = _eventData[id][type];
+	if (events && events.length > 0) {
+		if (fn === undefined) {
+			_unbindEvent(el, type, events[0]);
+			delete _eventData[id][type];
+		} else {
+			_each(events, function(i, event) {
+				if (i > 0 && event === fn) {
+					events.splice(i, 1);
+				}
+			});
+			if (events.length == 1) {
+				_unbindEvent(el, type, events[0]);
+				delete _eventData[id][type];
+			}
+		}
+		var count = 0;
+		_each(_eventData[id], function() {
+			count++;
+		});
+		if (count < 2) {
+			delete _eventData[id];
+			_removeId(el);
+		}
+	}
+}
+function _fire(el, type) {
+	if (type.indexOf(',') >= 0) {
+		_each(type.split(','), function() {
+			_fire(el, this);
+		});
+		return;
+	}
+	var id = _getId(el);
+	if (!id) {
+		return;
+	}
+	var events = _eventData[id][type];
+	if (_eventData[id] && events && events.length > 0) {
+		events[0]();
+	}
+}
+function _ctrl(el, key, fn) {
+	var self = this;
+	key = /^\d{2,}$/.test(key) ? key : key.toUpperCase().charCodeAt(0);
+	_bind(el, 'keydown', function(e) {
+		if (e.ctrlKey && e.which == key && !e.shiftKey && !e.altKey) {
+			fn.call(el);
+			e.stop();
+		}
+	});
+}
+var _readyFinished = false;
+function _ready(fn) {
+	if (_readyFinished) {
+		fn(KindEditor);
+		return;
+	}
+	var loaded = false;
+	function readyFunc() {
+		if (!loaded) {
+			loaded = true;
+			fn(KindEditor);
+			_readyFinished = true;
+		}
+	}
+	function ieReadyFunc() {
+		if (!loaded) {
+			try {
+				document.documentElement.doScroll('left');
+			} catch(e) {
+				setTimeout(ieReadyFunc, 100);
+				return;
+			}
+			readyFunc();
+		}
+	}
+	function ieReadyStateFunc() {
+		if (document.readyState === 'complete') {
+			readyFunc();
+		}
+	}
+	if (document.addEventListener) {
+		_bind(document, 'DOMContentLoaded', readyFunc);
+	} else if (document.attachEvent) {
+		_bind(document, 'readystatechange', ieReadyStateFunc);
+		var toplevel = false;
+		try {
+			toplevel = window.frameElement == null;
+		} catch(e) {}
+		if (document.documentElement.doScroll && toplevel) {
+			ieReadyFunc();
+		}
+	}
+	_bind(window, 'load', readyFunc);
+}
+if (_IE) {
+	window.attachEvent('onunload', function() {
+		_each(_eventData, function(key, events) {
+			if (events.el) {
+				_unbind(events.el);
+			}
+		});
+	});
+}
+K.ctrl = _ctrl;
+K.ready = _ready;
+function _getCssList(css) {
+	var list = {},
+		reg = /\s*([\w\-]+)\s*:([^;]*)(;|$)/g,
+		match;
+	while ((match = reg.exec(css))) {
+		var key = _trim(match[1].toLowerCase()),
+			val = _trim(_toHex(match[2]));
+		list[key] = val;
+	}
+	return list;
+}
+function _getAttrList(tag) {
+	var list = {},
+		reg = /\s+(?:([\w\-:]+)|(?:([\w\-:]+)=([^\s"'<>]+))|(?:([\w\-:"]+)="([^"]*)")|(?:([\w\-:"]+)='([^']*)'))(?=(?:\s|\/|>)+)/g,
+		match;
+	while ((match = reg.exec(tag))) {
+		var key = (match[1] || match[2] || match[4] || match[6]).toLowerCase(),
+			val = (match[2] ? match[3] : (match[4] ? match[5] : match[7])) || '';
+		list[key] = val;
+	}
+	return list;
+}
+function _addClassToTag(tag, className) {
+	if (/\s+class\s*=/.test(tag)) {
+		tag = tag.replace(/(\s+class=["']?)([^"']*)(["']?[\s>])/, function($0, $1, $2, $3) {
+			if ((' ' + $2 + ' ').indexOf(' ' + className + ' ') < 0) {
+				return $2 === '' ? $1 + className + $3 : $1 + $2 + ' ' + className + $3;
+			} else {
+				return $0;
+			}
+		});
+	} else {
+		tag = tag.substr(0, tag.length - 1) + ' class="' + className + '">';
+	}
+	return tag;
+}
+function _formatCss(css) {
+	var str = '';
+	_each(_getCssList(css), function(key, val) {
+		str += key + ':' + val + ';';
+	});
+	return str;
+}
+function _formatUrl(url, mode, host, pathname) {
+	mode = _undef(mode, '').toLowerCase();
+	if (url.substr(0, 5) != 'data:') {
+		url = url.replace(/([^:])\/\//g, '$1/');
+	}
+	if (_inArray(mode, ['absolute', 'relative', 'domain']) < 0) {
+		return url;
+	}
+	host = host || location.protocol + '//' + location.host;
+	if (pathname === undefined) {
+		var m = location.pathname.match(/^(\/.*)\//);
+		pathname = m ? m[1] : '';
+	}
+	var match;
+	if ((match = /^(\w+:\/\/[^\/]*)/.exec(url))) {
+		if (match[1] !== host) {
+			return url;
+		}
+	} else if (/^\w+:/.test(url)) {
+		return url;
+	}
+	function getRealPath(path) {
+		var parts = path.split('/'), paths = [];
+		for (var i = 0, len = parts.length; i < len; i++) {
+			var part = parts[i];
+			if (part == '..') {
+				if (paths.length > 0) {
+					paths.pop();
+				}
+			} else if (part !== '' && part != '.') {
+				paths.push(part);
+			}
+		}
+		return '/' + paths.join('/');
+	}
+	if (/^\//.test(url)) {
+		url = host + getRealPath(url.substr(1));
+	} else if (!/^\w+:\/\//.test(url)) {
+		url = host + getRealPath(pathname + '/' + url);
+	}
+	function getRelativePath(path, depth) {
+		if (url.substr(0, path.length) === path) {
+			var arr = [];
+			for (var i = 0; i < depth; i++) {
+				arr.push('..');
+			}
+			var prefix = '.';
+			if (arr.length > 0) {
+				prefix += '/' + arr.join('/');
+			}
+			if (pathname == '/') {
+				prefix += '/';
+			}
+			return prefix + url.substr(path.length);
+		} else {
+			if ((match = /^(.*)\//.exec(path))) {
+				return getRelativePath(match[1], ++depth);
+			}
+		}
+	}
+	if (mode === 'relative') {
+		url = getRelativePath(host + pathname, 0).substr(2);
+	} else if (mode === 'absolute') {
+		if (url.substr(0, host.length) === host) {
+			url = url.substr(host.length);
+		}
+	}
+	return url;
+}
+function _formatHtml(html, htmlTags, urlType, wellFormatted, indentChar) {
+	if (html == null) {
+		html = '';
+	}
+	urlType = urlType || '';
+	wellFormatted = _undef(wellFormatted, false);
+	indentChar = _undef(indentChar, '\t');
+	var fontSizeList = 'xx-small,x-small,small,medium,large,x-large,xx-large'.split(',');
+	html = html.replace(/(<(?:pre|pre\s[^>]*)>)([\s\S]*?)(<\/pre>)/ig, function($0, $1, $2, $3) {
+		return $1 + $2.replace(/<(?:br|br\s[^>]*)>/ig, '\n') + $3;
+	});
+	html = html.replace(/<(?:br|br\s[^>]*)\s*\/?>\s*<\/p>/ig, '</p>');
+	html = html.replace(/(<(?:p|p\s[^>]*)>)\s*(<\/p>)/ig, '$1<br />$2');
+	html = html.replace(/\u200B/g, '');
+	html = html.replace(/\u00A9/g, '&copy;');
+	html = html.replace(/\u00AE/g, '&reg;');
+	html = html.replace(/<[^>]+/g, function($0) {
+		return $0.replace(/\s+/g, ' ');
+	});
+	var htmlTagMap = {};
+	if (htmlTags) {
+		_each(htmlTags, function(key, val) {
+			var arr = key.split(',');
+			for (var i = 0, len = arr.length; i < len; i++) {
+				htmlTagMap[arr[i]] = _toMap(val);
+			}
+		});
+		if (!htmlTagMap.script) {
+			html = html.replace(/(<(?:script|script\s[^>]*)>)([\s\S]*?)(<\/script>)/ig, '');
+		}
+		if (!htmlTagMap.style) {
+			html = html.replace(/(<(?:style|style\s[^>]*)>)([\s\S]*?)(<\/style>)/ig, '');
+		}
+	}
+	var re = /(\s*)<(\/)?([\w\-:]+)((?:\s+|(?:\s+[\w\-:]+)|(?:\s+[\w\-:]+=[^\s"'<>]+)|(?:\s+[\w\-:"]+="[^"]*")|(?:\s+[\w\-:"]+='[^']*'))*)(\/)?>(\s*)/g;
+	var tagStack = [];
+	html = html.replace(re, function($0, $1, $2, $3, $4, $5, $6) {
+		var full = $0,
+			startNewline = $1 || '',
+			startSlash = $2 || '',
+			tagName = $3.toLowerCase(),
+			attr = $4 || '',
+			endSlash = $5 ? ' ' + $5 : '',
+			endNewline = $6 || '';
+		if (htmlTags && !htmlTagMap[tagName]) {
+			return '';
+		}
+		if (endSlash === '' && _SINGLE_TAG_MAP[tagName]) {
+			endSlash = ' /';
+		}
+		if (_INLINE_TAG_MAP[tagName]) {
+			if (startNewline) {
+				startNewline = ' ';
+			}
+			if (endNewline) {
+				endNewline = ' ';
+			}
+		}
+		if (_PRE_TAG_MAP[tagName]) {
+			if (startSlash) {
+				endNewline = '\n';
+			} else {
+				startNewline = '\n';
+			}
+		}
+		if (wellFormatted && tagName == 'br') {
+			endNewline = '\n';
+		}
+		if (_BLOCK_TAG_MAP[tagName] && !_PRE_TAG_MAP[tagName]) {
+			if (wellFormatted) {
+				if (startSlash && tagStack.length > 0 && tagStack[tagStack.length - 1] === tagName) {
+					tagStack.pop();
+				} else {
+					tagStack.push(tagName);
+				}
+				startNewline = '\n';
+				endNewline = '\n';
+				for (var i = 0, len = startSlash ? tagStack.length : tagStack.length - 1; i < len; i++) {
+					startNewline += indentChar;
+					if (!startSlash) {
+						endNewline += indentChar;
+					}
+				}
+				if (endSlash) {
+					tagStack.pop();
+				} else if (!startSlash) {
+					endNewline += indentChar;
+				}
+			} else {
+				startNewline = endNewline = '';
+			}
+		}
+		if (attr !== '') {
+			var attrMap = _getAttrList(full);
+			if (tagName === 'font') {
+				var fontStyleMap = {}, fontStyle = '';
+				_each(attrMap, function(key, val) {
+					if (key === 'color') {
+						fontStyleMap.color = val;
+						delete attrMap[key];
+					}
+					if (key === 'size') {
+						fontStyleMap['font-size'] = fontSizeList[parseInt(val, 10) - 1] || '';
+						delete attrMap[key];
+					}
+					if (key === 'face') {
+						fontStyleMap['font-family'] = val;
+						delete attrMap[key];
+					}
+					if (key === 'style') {
+						fontStyle = val;
+					}
+				});
+				if (fontStyle && !/;$/.test(fontStyle)) {
+					fontStyle += ';';
+				}
+				_each(fontStyleMap, function(key, val) {
+					if (val === '') {
+						return;
+					}
+					if (/\s/.test(val)) {
+						val = "'" + val + "'";
+					}
+					fontStyle += key + ':' + val + ';';
+				});
+				attrMap.style = fontStyle;
+			}
+			_each(attrMap, function(key, val) {
+				if (_FILL_ATTR_MAP[key]) {
+					attrMap[key] = key;
+				}
+				if (_inArray(key, ['src', 'href']) >= 0) {
+					attrMap[key] = _formatUrl(val, urlType);
+				}
+				if (htmlTags && key !== 'style' && !htmlTagMap[tagName]['*'] && !htmlTagMap[tagName][key] ||
+					tagName === 'body' && key === 'contenteditable' ||
+					/^kindeditor_\d+$/.test(key)) {
+					delete attrMap[key];
+				}
+				if (key === 'style' && val !== '') {
+					var styleMap = _getCssList(val);
+					_each(styleMap, function(k, v) {
+						if (htmlTags && !htmlTagMap[tagName].style && !htmlTagMap[tagName]['.' + k]) {
+							delete styleMap[k];
+						}
+					});
+					var style = '';
+					_each(styleMap, function(k, v) {
+						style += k + ':' + v + ';';
+					});
+					attrMap.style = style;
+				}
+			});
+			attr = '';
+			_each(attrMap, function(key, val) {
+				if (key === 'style' && val === '') {
+					return;
+				}
+				val = val.replace(/"/g, '&quot;');
+				attr += ' ' + key + '="' + val + '"';
+			});
+		}
+		if (tagName === 'font') {
+			tagName = 'span';
+		}
+		return startNewline + '<' + startSlash + tagName + attr + endSlash + '>' + endNewline;
+	});
+	html = html.replace(/(<(?:pre|pre\s[^>]*)>)([\s\S]*?)(<\/pre>)/ig, function($0, $1, $2, $3) {
+		return $1 + $2.replace(/\n/g, '<span id="__kindeditor_pre_newline__">\n') + $3;
+	});
+	html = html.replace(/\n\s*\n/g, '\n');
+	html = html.replace(/<span id="__kindeditor_pre_newline__">\n/g, '\n');
+	return _trim(html);
+}
+function _clearMsWord(html, htmlTags) {
+	html = html.replace(/<meta[\s\S]*?>/ig, '')
+		.replace(/<![\s\S]*?>/ig, '')
+		.replace(/<style[^>]*>[\s\S]*?<\/style>/ig, '')
+		.replace(/<script[^>]*>[\s\S]*?<\/script>/ig, '')
+		.replace(/<w:[^>]+>[\s\S]*?<\/w:[^>]+>/ig, '')
+		.replace(/<o:[^>]+>[\s\S]*?<\/o:[^>]+>/ig, '')
+		.replace(/<xml>[\s\S]*?<\/xml>/ig, '')
+		.replace(/<(?:table|td)[^>]*>/ig, function(full) {
+			return full.replace(/border-bottom:([#\w\s]+)/ig, 'border:$1');
+		});
+	return _formatHtml(html, htmlTags);
+}
+function _mediaType(src) {
+	if (/\.(rm|rmvb)(\?|$)/i.test(src)) {
+		return 'audio/x-pn-realaudio-plugin';
+	}
+	if (/\.(swf|flv)(\?|$)/i.test(src)) {
+		return 'application/x-shockwave-flash';
+	}
+	return 'video/x-ms-asf-plugin';
+}
+function _mediaClass(type) {
+	if (/realaudio/i.test(type)) {
+		return 'ke-rm';
+	}
+	if (/flash/i.test(type)) {
+		return 'ke-flash';
+	}
+	return 'ke-media';
+}
+function _mediaAttrs(srcTag) {
+	return _getAttrList(unescape(srcTag));
+}
+function _mediaEmbed(attrs) {
+	var html = '<embed ';
+	_each(attrs, function(key, val) {
+		html += key + '="' + val + '" ';
+	});
+	html += '/>';
+	return html;
+}
+function _mediaImg(blankPath, attrs) {
+	var width = attrs.width,
+		height = attrs.height,
+		type = attrs.type || _mediaType(attrs.src),
+		srcTag = _mediaEmbed(attrs),
+		style = '';
+	if (/\D/.test(width)) {
+		style += 'width:' + width + ';';
+	} else if (width > 0) {
+		style += 'width:' + width + 'px;';
+	}
+	if (/\D/.test(height)) {
+		style += 'height:' + height + ';';
+	} else if (height > 0) {
+		style += 'height:' + height + 'px;';
+	}
+	var html = '<img class="' + _mediaClass(type) + '" src="' + blankPath + '" ';
+	if (style !== '') {
+		html += 'style="' + style + '" ';
+	}
+	html += 'data-ke-tag="' + escape(srcTag) + '" alt="" />';
+	return html;
+}
+function _tmpl(str, data) {
+	var fn = new Function("obj",
+		"var p=[],print=function(){p.push.apply(p,arguments);};" +
+		"with(obj){p.push('" +
+		str.replace(/[\r\t\n]/g, " ")
+			.split("<%").join("\t")
+			.replace(/((^|%>)[^\t]*)'/g, "$1\r")
+			.replace(/\t=(.*?)%>/g, "',$1,'")
+			.split("\t").join("');")
+			.split("%>").join("p.push('")
+			.split("\r").join("\\'") + "');}return p.join('');");
+	return data ? fn(data) : fn;
+}
+K.formatUrl = _formatUrl;
+K.formatHtml = _formatHtml;
+K.getCssList = _getCssList;
+K.getAttrList = _getAttrList;
+K.mediaType = _mediaType;
+K.mediaAttrs = _mediaAttrs;
+K.mediaEmbed = _mediaEmbed;
+K.mediaImg = _mediaImg;
+K.clearMsWord = _clearMsWord;
+K.tmpl = _tmpl;
+function _contains(nodeA, nodeB) {
+	if (nodeA.nodeType == 9 && nodeB.nodeType != 9) {
+		return true;
+	}
+	while ((nodeB = nodeB.parentNode)) {
+		if (nodeB == nodeA) {
+			return true;
+		}
+	}
+	return false;
+}
+var _getSetAttrDiv = document.createElement('div');
+_getSetAttrDiv.setAttribute('className', 't');
+var _GET_SET_ATTRIBUTE = _getSetAttrDiv.className !== 't';
+function _getAttr(el, key) {
+	key = key.toLowerCase();
+	var val = null;
+	if (!_GET_SET_ATTRIBUTE && el.nodeName.toLowerCase() != 'script') {
+		var div = el.ownerDocument.createElement('div');
+		div.appendChild(el.cloneNode(false));
+		var list = _getAttrList(_unescape(div.innerHTML));
+		if (key in list) {
+			val = list[key];
+		}
+	} else {
+		try {
+			val = el.getAttribute(key, 2);
+		} catch(e) {
+			val = el.getAttribute(key, 1);
+		}
+	}
+	if (key === 'style' && val !== null) {
+		val = _formatCss(val);
+	}
+	return val;
+}
+function _queryAll(expr, root) {
+	var exprList = expr.split(',');
+	if (exprList.length > 1) {
+		var mergedResults = [];
+		_each(exprList, function() {
+			_each(_queryAll(this, root), function() {
+				if (_inArray(this, mergedResults) < 0) {
+					mergedResults.push(this);
+				}
+			});
+		});
+		return mergedResults;
+	}
+	root = root || document;
+	function escape(str) {
+		if (typeof str != 'string') {
+			return str;
+		}
+		return str.replace(/([^\w\-])/g, '\\$1');
+	}
+	function stripslashes(str) {
+		return str.replace(/\\/g, '');
+	}
+	function cmpTag(tagA, tagB) {
+		return tagA === '*' || tagA.toLowerCase() === escape(tagB.toLowerCase());
+	}
+	function byId(id, tag, root) {
+		var arr = [],
+			doc = root.ownerDocument || root,
+			el = doc.getElementById(stripslashes(id));
+		if (el) {
+			if (cmpTag(tag, el.nodeName) && _contains(root, el)) {
+				arr.push(el);
+			}
+		}
+		return arr;
+	}
+	function byClass(className, tag, root) {
+		var doc = root.ownerDocument || root, arr = [], els, i, len, el;
+		if (root.getElementsByClassName) {
+			els = root.getElementsByClassName(stripslashes(className));
+			for (i = 0, len = els.length; i < len; i++) {
+				el = els[i];
+				if (cmpTag(tag, el.nodeName)) {
+					arr.push(el);
+				}
+			}
+		} else if (doc.querySelectorAll) {
+			els = doc.querySelectorAll((root.nodeName !== '#document' ? root.nodeName + ' ' : '') + tag + '.' + className);
+			for (i = 0, len = els.length; i < len; i++) {
+				el = els[i];
+				if (_contains(root, el)) {
+					arr.push(el);
+				}
+			}
+		} else {
+			els = root.getElementsByTagName(tag);
+			className = ' ' + className + ' ';
+			for (i = 0, len = els.length; i < len; i++) {
+				el = els[i];
+				if (el.nodeType == 1) {
+					var cls = el.className;
+					if (cls && (' ' + cls + ' ').indexOf(className) > -1) {
+						arr.push(el);
+					}
+				}
+			}
+		}
+		return arr;
+	}
+	function byName(name, tag, root) {
+		var arr = [], doc = root.ownerDocument || root,
+			els = doc.getElementsByName(stripslashes(name)), el;
+		for (var i = 0, len = els.length; i < len; i++) {
+			el = els[i];
+			if (cmpTag(tag, el.nodeName) && _contains(root, el)) {
+				if (el.getAttribute('name') !== null) {
+					arr.push(el);
+				}
+			}
+		}
+		return arr;
+	}
+	function byAttr(key, val, tag, root) {
+		var arr = [], els = root.getElementsByTagName(tag), el;
+		for (var i = 0, len = els.length; i < len; i++) {
+			el = els[i];
+			if (el.nodeType == 1) {
+				if (val === null) {
+					if (_getAttr(el, key) !== null) {
+						arr.push(el);
+					}
+				} else {
+					if (val === escape(_getAttr(el, key))) {
+						arr.push(el);
+					}
+				}
+			}
+		}
+		return arr;
+	}
+	function select(expr, root) {
+		var arr = [], matches;
+		matches = /^((?:\\.|[^.#\s\[<>])+)/.exec(expr);
+		var tag = matches ? matches[1] : '*';
+		if ((matches = /#((?:[\w\-]|\\.)+)$/.exec(expr))) {
+			arr = byId(matches[1], tag, root);
+		} else if ((matches = /\.((?:[\w\-]|\\.)+)$/.exec(expr))) {
+			arr = byClass(matches[1], tag, root);
+		} else if ((matches = /\[((?:[\w\-]|\\.)+)\]/.exec(expr))) {
+			arr = byAttr(matches[1].toLowerCase(), null, tag, root);
+		} else if ((matches = /\[((?:[\w\-]|\\.)+)\s*=\s*['"]?((?:\\.|[^'"]+)+)['"]?\]/.exec(expr))) {
+			var key = matches[1].toLowerCase(), val = matches[2];
+			if (key === 'id') {
+				arr = byId(val, tag, root);
+			} else if (key === 'class') {
+				arr = byClass(val, tag, root);
+			} else if (key === 'name') {
+				arr = byName(val, tag, root);
+			} else {
+				arr = byAttr(key, val, tag, root);
+			}
+		} else {
+			var els = root.getElementsByTagName(tag), el;
+			for (var i = 0, len = els.length; i < len; i++) {
+				el = els[i];
+				if (el.nodeType == 1) {
+					arr.push(el);
+				}
+			}
+		}
+		return arr;
+	}
+	var parts = [], arr, re = /((?:\\.|[^\s>])+|[\s>])/g;
+	while ((arr = re.exec(expr))) {
+		if (arr[1] !== ' ') {
+			parts.push(arr[1]);
+		}
+	}
+	var results = [];
+	if (parts.length == 1) {
+		return select(parts[0], root);
+	}
+	var isChild = false, part, els, subResults, val, v, i, j, k, length, len, l;
+	for (i = 0, lenth = parts.length; i < lenth; i++) {
+		part = parts[i];
+		if (part === '>') {
+			isChild = true;
+			continue;
+		}
+		if (i > 0) {
+			els = [];
+			for (j = 0, len = results.length; j < len; j++) {
+				val = results[j];
+				subResults = select(part, val);
+				for (k = 0, l = subResults.length; k < l; k++) {
+					v = subResults[k];
+					if (isChild) {
+						if (val === v.parentNode) {
+							els.push(v);
+						}
+					} else {
+						els.push(v);
+					}
+				}
+			}
+			results = els;
+		} else {
+			results = select(part, root);
+		}
+		if (results.length === 0) {
+			return [];
+		}
+	}
+	return results;
+}
+function _query(expr, root) {
+	var arr = _queryAll(expr, root);
+	return arr.length > 0 ? arr[0] : null;
+}
+K.query = _query;
+K.queryAll = _queryAll;
+function _get(val) {
+	return K(val)[0];
+}
+function _getDoc(node) {
+	if (!node) {
+		return document;
+	}
+	return node.ownerDocument || node.document || node;
+}
+function _getWin(node) {
+	if (!node) {
+		return window;
+	}
+	var doc = _getDoc(node);
+	return doc.parentWindow || doc.defaultView;
+}
+function _setHtml(el, html) {
+	if (el.nodeType != 1) {
+		return;
+	}
+	var doc = _getDoc(el);
+	try {
+		el.innerHTML = '<img id="__kindeditor_temp_tag__" width="0" height="0" style="display:none;" />' + html;
+		var temp = doc.getElementById('__kindeditor_temp_tag__');
+		temp.parentNode.removeChild(temp);
+	} catch(e) {
+		K(el).empty();
+		K('@' + html, doc).each(function() {
+			el.appendChild(this);
+		});
+	}
+}
+function _hasClass(el, cls) {
+	return _inString(cls, el.className, ' ');
+}
+function _setAttr(el, key, val) {
+	if (_IE && _V < 8 && key.toLowerCase() == 'class') {
+		key = 'className';
+	}
+	el.setAttribute(key, '' + val);
+}
+function _removeAttr(el, key) {
+	if (_IE && _V < 8 && key.toLowerCase() == 'class') {
+		key = 'className';
+	}
+	_setAttr(el, key, '');
+	el.removeAttribute(key);
+}
+function _getNodeName(node) {
+	if (!node || !node.nodeName) {
+		return '';
+	}
+	return node.nodeName.toLowerCase();
+}
+function _computedCss(el, key) {
+	var self = this, win = _getWin(el), camelKey = _toCamel(key), val = '';
+	if (win.getComputedStyle) {
+		var style = win.getComputedStyle(el, null);
+		val = style[camelKey] || style.getPropertyValue(key) || el.style[camelKey];
+	} else if (el.currentStyle) {
+		val = el.currentStyle[camelKey] || el.style[camelKey];
+	}
+	return val;
+}
+function _hasVal(node) {
+	return !!_VALUE_TAG_MAP[_getNodeName(node)];
+}
+function _docElement(doc) {
+	doc = doc || document;
+	return _QUIRKS ? doc.body : doc.documentElement;
+}
+function _docHeight(doc) {
+	var el = _docElement(doc);
+	return Math.max(el.scrollHeight, el.clientHeight);
+}
+function _docWidth(doc) {
+	var el = _docElement(doc);
+	return Math.max(el.scrollWidth, el.clientWidth);
+}
+function _getScrollPos(doc) {
+	doc = doc || document;
+	var x, y;
+	if (_IE || _NEWIE || _OPERA) {
+		x = _docElement(doc).scrollLeft;
+		y = _docElement(doc).scrollTop;
+	} else {
+		x = _getWin(doc).scrollX;
+		y = _getWin(doc).scrollY;
+	}
+	return {x : x, y : y};
+}
+function KNode(node) {
+	this.init(node);
+}
+_extend(KNode, {
+	init : function(node) {
+		var self = this;
+		node = _isArray(node) ? node : [node];
+		var length = 0;
+		for (var i = 0, len = node.length; i < len; i++) {
+			if (node[i]) {
+				self[i] = node[i].constructor === KNode ? node[i][0] : node[i];
+				length++;
+			}
+		}
+		self.length = length;
+		self.doc = _getDoc(self[0]);
+		self.name = _getNodeName(self[0]);
+		self.type = self.length > 0 ? self[0].nodeType : null;
+		self.win = _getWin(self[0]);
+	},
+	each : function(fn) {
+		var self = this;
+		for (var i = 0; i < self.length; i++) {
+			if (fn.call(self[i], i, self[i]) === false) {
+				return self;
+			}
+		}
+		return self;
+	},
+	bind : function(type, fn) {
+		this.each(function() {
+			_bind(this, type, fn);
+		});
+		return this;
+	},
+	unbind : function(type, fn) {
+		this.each(function() {
+			_unbind(this, type, fn);
+		});
+		return this;
+	},
+	fire : function(type) {
+		if (this.length < 1) {
+			return this;
+		}
+		_fire(this[0], type);
+		return this;
+	},
+	hasAttr : function(key) {
+		if (this.length < 1) {
+			return false;
+		}
+		return !!_getAttr(this[0], key);
+	},
+	attr : function(key, val) {
+		var self = this;
+		if (key === undefined) {
+			return _getAttrList(self.outer());
+		}
+		if (typeof key === 'object') {
+			_each(key, function(k, v) {
+				self.attr(k, v);
+			});
+			return self;
+		}
+		if (val === undefined) {
+			val = self.length < 1 ? null : _getAttr(self[0], key);
+			return val === null ? '' : val;
+		}
+		self.each(function() {
+			_setAttr(this, key, val);
+		});
+		return self;
+	},
+	removeAttr : function(key) {
+		this.each(function() {
+			_removeAttr(this, key);
+		});
+		return this;
+	},
+	get : function(i) {
+		if (this.length < 1) {
+			return null;
+		}
+		return this[i || 0];
+	},
+	eq : function(i) {
+		if (this.length < 1) {
+			return null;
+		}
+		return this[i] ? new KNode(this[i]) : null;
+	},
+	hasClass : function(cls) {
+		if (this.length < 1) {
+			return false;
+		}
+		return _hasClass(this[0], cls);
+	},
+	addClass : function(cls) {
+		this.each(function() {
+			if (!_hasClass(this, cls)) {
+				this.className = _trim(this.className + ' ' + cls);
+			}
+		});
+		return this;
+	},
+	removeClass : function(cls) {
+		this.each(function() {
+			if (_hasClass(this, cls)) {
+				this.className = _trim(this.className.replace(new RegExp('(^|\\s)' + cls + '(\\s|$)'), ' '));
+			}
+		});
+		return this;
+	},
+	html : function(val) {
+		var self = this;
+		if (val === undefined) {
+			if (self.length < 1 || self.type != 1) {
+				return '';
+			}
+			return _formatHtml(self[0].innerHTML);
+		}
+		self.each(function() {
+			_setHtml(this, val);
+		});
+		return self;
+	},
+	text : function() {
+		var self = this;
+		if (self.length < 1) {
+			return '';
+		}
+		return _IE ? self[0].innerText : self[0].textContent;
+	},
+	hasVal : function() {
+		if (this.length < 1) {
+			return false;
+		}
+		return _hasVal(this[0]);
+	},
+	val : function(val) {
+		var self = this;
+		if (val === undefined) {
+			if (self.length < 1) {
+				return '';
+			}
+			return self.hasVal() ? self[0].value : self.attr('value');
+		} else {
+			self.each(function() {
+				if (_hasVal(this)) {
+					this.value = val;
+				} else {
+					_setAttr(this, 'value' , val);
+				}
+			});
+			return self;
+		}
+	},
+	css : function(key, val) {
+		var self = this;
+		if (key === undefined) {
+			return _getCssList(self.attr('style'));
+		}
+		if (typeof key === 'object') {
+			_each(key, function(k, v) {
+				self.css(k, v);
+			});
+			return self;
+		}
+		if (val === undefined) {
+			if (self.length < 1) {
+				return '';
+			}
+			return self[0].style[_toCamel(key)] || _computedCss(self[0], key) || '';
+		}
+		self.each(function() {
+			this.style[_toCamel(key)] = val;
+		});
+		return self;
+	},
+	width : function(val) {
+		var self = this;
+		if (val === undefined) {
+			if (self.length < 1) {
+				return 0;
+			}
+			return self[0].offsetWidth;
+		}
+		return self.css('width', _addUnit(val));
+	},
+	height : function(val) {
+		var self = this;
+		if (val === undefined) {
+			if (self.length < 1) {
+				return 0;
+			}
+			return self[0].offsetHeight;
+		}
+		return self.css('height', _addUnit(val));
+	},
+	opacity : function(val) {
+		this.each(function() {
+			if (this.style.opacity === undefined) {
+				this.style.filter = val == 1 ? '' : 'alpha(opacity=' + (val * 100) + ')';
+			} else {
+				this.style.opacity = val == 1 ? '' : val;
+			}
+		});
+		return this;
+	},
+	data : function(key, val) {
+		var self = this;
+		key = 'kindeditor_data_' + key;
+		if (val === undefined) {
+			if (self.length < 1) {
+				return null;
+			}
+			return self[0][key];
+		}
+		this.each(function() {
+			this[key] = val;
+		});
+		return self;
+	},
+	pos : function() {
+		var self = this, node = self[0], x = 0, y = 0;
+		if (node) {
+			if (node.getBoundingClientRect) {
+				var box = node.getBoundingClientRect(),
+					pos = _getScrollPos(self.doc);
+				x = box.left + pos.x;
+				y = box.top + pos.y;
+			} else {
+				while (node) {
+					x += node.offsetLeft;
+					y += node.offsetTop;
+					node = node.offsetParent;
+				}
+			}
+		}
+		return {x : _round(x), y : _round(y)};
+	},
+	clone : function(bool) {
+		if (this.length < 1) {
+			return new KNode([]);
+		}
+		return new KNode(this[0].cloneNode(bool));
+	},
+	append : function(expr) {
+		this.each(function() {
+			if (this.appendChild) {
+				this.appendChild(_get(expr));
+			}
+		});
+		return this;
+	},
+	appendTo : function(expr) {
+		this.each(function() {
+			_get(expr).appendChild(this);
+		});
+		return this;
+	},
+	before : function(expr) {
+		this.each(function() {
+			this.parentNode.insertBefore(_get(expr), this);
+		});
+		return this;
+	},
+	after : function(expr) {
+		this.each(function() {
+			if (this.nextSibling) {
+				this.parentNode.insertBefore(_get(expr), this.nextSibling);
+			} else {
+				this.parentNode.appendChild(_get(expr));
+			}
+		});
+		return this;
+	},
+	replaceWith : function(expr) {
+		var nodes = [];
+		this.each(function(i, node) {
+			_unbind(node);
+			var newNode = _get(expr);
+			node.parentNode.replaceChild(newNode, node);
+			nodes.push(newNode);
+		});
+		return K(nodes);
+	},
+	empty : function() {
+		var self = this;
+		self.each(function(i, node) {
+			var child = node.firstChild;
+			while (child) {
+				if (!node.parentNode) {
+					return;
+				}
+				var next = child.nextSibling;
+				child.parentNode.removeChild(child);
+				child = next;
+			}
+		});
+		return self;
+	},
+	remove : function(keepChilds) {
+		var self = this;
+		self.each(function(i, node) {
+			if (!node.parentNode) {
+				return;
+			}
+			_unbind(node);
+			if (keepChilds) {
+				var child = node.firstChild;
+				while (child) {
+					var next = child.nextSibling;
+					node.parentNode.insertBefore(child, node);
+					child = next;
+				}
+			}
+			node.parentNode.removeChild(node);
+			delete self[i];
+		});
+		self.length = 0;
+		return self;
+	},
+	show : function(val) {
+		var self = this;
+		if (val === undefined) {
+			val = self._originDisplay || '';
+		}
+		if (self.css('display') != 'none') {
+			return self;
+		}
+		return self.css('display', val);
+	},
+	hide : function() {
+		var self = this;
+		if (self.length < 1) {
+			return self;
+		}
+		self._originDisplay = self[0].style.display;
+		return self.css('display', 'none');
+	},
+	outer : function() {
+		var self = this;
+		if (self.length < 1) {
+			return '';
+		}
+		var div = self.doc.createElement('div'), html;
+		div.appendChild(self[0].cloneNode(true));
+		html = _formatHtml(div.innerHTML);
+		div = null;
+		return html;
+	},
+	isSingle : function() {
+		return !!_SINGLE_TAG_MAP[this.name];
+	},
+	isInline : function() {
+		return !!_INLINE_TAG_MAP[this.name];
+	},
+	isBlock : function() {
+		return !!_BLOCK_TAG_MAP[this.name];
+	},
+	isStyle : function() {
+		return !!_STYLE_TAG_MAP[this.name];
+	},
+	isControl : function() {
+		return !!_CONTROL_TAG_MAP[this.name];
+	},
+	contains : function(otherNode) {
+		if (this.length < 1) {
+			return false;
+		}
+		return _contains(this[0], _get(otherNode));
+	},
+	parent : function() {
+		if (this.length < 1) {
+			return null;
+		}
+		var node = this[0].parentNode;
+		return node ? new KNode(node) : null;
+	},
+	children : function() {
+		if (this.length < 1) {
+			return new KNode([]);
+		}
+		var list = [], child = this[0].firstChild;
+		while (child) {
+			if (child.nodeType != 3 || _trim(child.nodeValue) !== '') {
+				list.push(child);
+			}
+			child = child.nextSibling;
+		}
+		return new KNode(list);
+	},
+	first : function() {
+		var list = this.children();
+		return list.length > 0 ? list.eq(0) : null;
+	},
+	last : function() {
+		var list = this.children();
+		return list.length > 0 ? list.eq(list.length - 1) : null;
+	},
+	index : function() {
+		if (this.length < 1) {
+			return -1;
+		}
+		var i = -1, sibling = this[0];
+		while (sibling) {
+			i++;
+			sibling = sibling.previousSibling;
+		}
+		return i;
+	},
+	prev : function() {
+		if (this.length < 1) {
+			return null;
+		}
+		var node = this[0].previousSibling;
+		return node ? new KNode(node) : null;
+	},
+	next : function() {
+		if (this.length < 1) {
+			return null;
+		}
+		var node = this[0].nextSibling;
+		return node ? new KNode(node) : null;
+	},
+	scan : function(fn, order) {
+		if (this.length < 1) {
+			return;
+		}
+		order = (order === undefined) ? true : order;
+		function walk(node) {
+			var n = order ? node.firstChild : node.lastChild;
+			while (n) {
+				var next = order ? n.nextSibling : n.previousSibling;
+				if (fn(n) === false) {
+					return false;
+				}
+				if (walk(n) === false) {
+					return false;
+				}
+				n = next;
+			}
+		}
+		walk(this[0]);
+		return this;
+	}
+});
+_each(('blur,focus,focusin,focusout,load,resize,scroll,unload,click,dblclick,' +
+	'mousedown,mouseup,mousemove,mouseover,mouseout,mouseenter,mouseleave,' +
+	'change,select,submit,keydown,keypress,keyup,error,contextmenu').split(','), function(i, type) {
+	KNode.prototype[type] = function(fn) {
+		return fn ? this.bind(type, fn) : this.fire(type);
+	};
+});
+var _K = K;
+K = function(expr, root) {
+	if (expr === undefined || expr === null) {
+		return;
+	}
+	function newNode(node) {
+		if (!node[0]) {
+			node = [];
+		}
+		return new KNode(node);
+	}
+	if (typeof expr === 'string') {
+		if (root) {
+			root = _get(root);
+		}
+		var length = expr.length;
+		if (expr.charAt(0) === '@') {
+			expr = expr.substr(1);
+		}
+		if (expr.length !== length || /<.+>/.test(expr)) {
+			var doc = root ? root.ownerDocument || root : document,
+				div = doc.createElement('div'), list = [];
+			div.innerHTML = '<img id="__kindeditor_temp_tag__" width="0" height="0" style="display:none;" />' + expr;
+			for (var i = 0, len = div.childNodes.length; i < len; i++) {
+				var child = div.childNodes[i];
+				if (child.id == '__kindeditor_temp_tag__') {
+					continue;
+				}
+				list.push(child);
+			}
+			return newNode(list);
+		}
+		return newNode(_queryAll(expr, root));
+	}
+	if (expr && expr.constructor === KNode) {
+		return expr;
+	}
+	if (expr.toArray) {
+		expr = expr.toArray();
+	}
+	if (_isArray(expr)) {
+		return newNode(expr);
+	}
+	return newNode(_toArray(arguments));
+};
+_each(_K, function(key, val) {
+	K[key] = val;
+});
+K.NodeClass = KNode;
+window.KindEditor = K;
+var _START_TO_START = 0,
+	_START_TO_END = 1,
+	_END_TO_END = 2,
+	_END_TO_START = 3,
+	_BOOKMARK_ID = 0;
+function _updateCollapsed(range) {
+	range.collapsed = (range.startContainer === range.endContainer && range.startOffset === range.endOffset);
+	return range;
+}
+function _copyAndDelete(range, isCopy, isDelete) {
+	var doc = range.doc, nodeList = [];
+	function splitTextNode(node, startOffset, endOffset) {
+		var length = node.nodeValue.length, centerNode;
+		if (isCopy) {
+			var cloneNode = node.cloneNode(true);
+			if (startOffset > 0) {
+				centerNode = cloneNode.splitText(startOffset);
+			} else {
+				centerNode = cloneNode;
+			}
+			if (endOffset < length) {
+				centerNode.splitText(endOffset - startOffset);
+			}
+		}
+		if (isDelete) {
+			var center = node;
+			if (startOffset > 0) {
+				center = node.splitText(startOffset);
+				range.setStart(node, startOffset);
+			}
+			if (endOffset < length) {
+				var right = center.splitText(endOffset - startOffset);
+				range.setEnd(right, 0);
+			}
+			nodeList.push(center);
+		}
+		return centerNode;
+	}
+	function removeNodes() {
+		if (isDelete) {
+			range.up().collapse(true);
+		}
+		for (var i = 0, len = nodeList.length; i < len; i++) {
+			var node = nodeList[i];
+			if (node.parentNode) {
+				node.parentNode.removeChild(node);
+			}
+		}
+	}
+	var copyRange = range.cloneRange().down();
+	var start = -1, incStart = -1, incEnd = -1, end = -1,
+		ancestor = range.commonAncestor(), frag = doc.createDocumentFragment();
+	if (ancestor.nodeType == 3) {
+		var textNode = splitTextNode(ancestor, range.startOffset, range.endOffset);
+		if (isCopy) {
+			frag.appendChild(textNode);
+		}
+		removeNodes();
+		return isCopy ? frag : range;
+	}
+	function extractNodes(parent, frag) {
+		var node = parent.firstChild, nextNode;
+		while (node) {
+			var testRange = new KRange(doc).selectNode(node);
+			start = testRange.compareBoundaryPoints(_START_TO_END, range);
+			if (start >= 0 && incStart <= 0) {
+				incStart = testRange.compareBoundaryPoints(_START_TO_START, range);
+			}
+			if (incStart >= 0 && incEnd <= 0) {
+				incEnd = testRange.compareBoundaryPoints(_END_TO_END, range);
+			}
+			if (incEnd >= 0 && end <= 0) {
+				end = testRange.compareBoundaryPoints(_END_TO_START, range);
+			}
+			if (end >= 0) {
+				return false;
+			}
+			nextNode = node.nextSibling;
+			if (start > 0) {
+				if (node.nodeType == 1) {
+					if (incStart >= 0 && incEnd <= 0) {
+						if (isCopy) {
+							frag.appendChild(node.cloneNode(true));
+						}
+						if (isDelete) {
+							nodeList.push(node);
+						}
+					} else {
+						var childFlag;
+						if (isCopy) {
+							childFlag = node.cloneNode(false);
+							frag.appendChild(childFlag);
+						}
+						if (extractNodes(node, childFlag) === false) {
+							return false;
+						}
+					}
+				} else if (node.nodeType == 3) {
+					var textNode;
+					if (node == copyRange.startContainer) {
+						textNode = splitTextNode(node, copyRange.startOffset, node.nodeValue.length);
+					} else if (node == copyRange.endContainer) {
+						textNode = splitTextNode(node, 0, copyRange.endOffset);
+					} else {
+						textNode = splitTextNode(node, 0, node.nodeValue.length);
+					}
+					if (isCopy) {
+						try {
+							frag.appendChild(textNode);
+						} catch(e) {}
+					}
+				}
+			}
+			node = nextNode;
+		}
+	}
+	extractNodes(ancestor, frag);
+	if (isDelete) {
+		range.up().collapse(true);
+	}
+	for (var i = 0, len = nodeList.length; i < len; i++) {
+		var node = nodeList[i];
+		if (node.parentNode) {
+			node.parentNode.removeChild(node);
+		}
+	}
+	return isCopy ? frag : range;
+}
+function _moveToElementText(range, el) {
+	var node = el;
+	while (node) {
+		var knode = K(node);
+		if (knode.name == 'marquee' || knode.name == 'select') {
+			return;
+		}
+		node = node.parentNode;
+	}
+	try {
+		range.moveToElementText(el);
+	} catch(e) {}
+}
+function _getStartEnd(rng, isStart) {
+	var doc = rng.parentElement().ownerDocument,
+		pointRange = rng.duplicate();
+	pointRange.collapse(isStart);
+	var parent = pointRange.parentElement(),
+		nodes = parent.childNodes;
+	if (nodes.length === 0) {
+		return {node: parent.parentNode, offset: K(parent).index()};
+	}
+	var startNode = doc, startPos = 0, cmp = -1;
+	var testRange = rng.duplicate();
+	_moveToElementText(testRange, parent);
+	for (var i = 0, len = nodes.length; i < len; i++) {
+		var node = nodes[i];
+		cmp = testRange.compareEndPoints('StartToStart', pointRange);
+		if (cmp === 0) {
+			return {node: node.parentNode, offset: i};
+		}
+		if (node.nodeType == 1) {
+			var nodeRange = rng.duplicate(), dummy, knode = K(node), newNode = node;
+			if (knode.isControl()) {
+				dummy = doc.createElement('span');
+				knode.after(dummy);
+				newNode = dummy;
+				startPos += knode.text().replace(/\r\n|\n|\r/g, '').length;
+			}
+			_moveToElementText(nodeRange, newNode);
+			testRange.setEndPoint('StartToEnd', nodeRange);
+			if (cmp > 0) {
+				startPos += nodeRange.text.replace(/\r\n|\n|\r/g, '').length;
+			} else {
+				startPos = 0;
+			}
+			if (dummy) {
+				K(dummy).remove();
+			}
+		} else if (node.nodeType == 3) {
+			testRange.moveStart('character', node.nodeValue.length);
+			startPos += node.nodeValue.length;
+		}
+		if (cmp < 0) {
+			startNode = node;
+		}
+	}
+	if (cmp < 0 && startNode.nodeType == 1) {
+		return {node: parent, offset: K(parent.lastChild).index() + 1};
+	}
+	if (cmp > 0) {
+		while (startNode.nextSibling && startNode.nodeType == 1) {
+			startNode = startNode.nextSibling;
+		}
+	}
+	testRange = rng.duplicate();
+	_moveToElementText(testRange, parent);
+	testRange.setEndPoint('StartToEnd', pointRange);
+	startPos -= testRange.text.replace(/\r\n|\n|\r/g, '').length;
+	if (cmp > 0 && startNode.nodeType == 3) {
+		var prevNode = startNode.previousSibling;
+		while (prevNode && prevNode.nodeType == 3) {
+			startPos -= prevNode.nodeValue.length;
+			prevNode = prevNode.previousSibling;
+		}
+	}
+	return {node: startNode, offset: startPos};
+}
+function _getEndRange(node, offset) {
+	var doc = node.ownerDocument || node,
+		range = doc.body.createTextRange();
+	if (doc == node) {
+		range.collapse(true);
+		return range;
+	}
+	if (node.nodeType == 1 && node.childNodes.length > 0) {
+		var children = node.childNodes, isStart, child;
+		if (offset === 0) {
+			child = children[0];
+			isStart = true;
+		} else {
+			child = children[offset - 1];
+			isStart = false;
+		}
+		if (!child) {
+			return range;
+		}
+		if (K(child).name === 'head') {
+			if (offset === 1) {
+				isStart = true;
+			}
+			if (offset === 2) {
+				isStart = false;
+			}
+			range.collapse(isStart);
+			return range;
+		}
+		if (child.nodeType == 1) {
+			var kchild = K(child), span;
+			if (kchild.isControl()) {
+				span = doc.createElement('span');
+				if (isStart) {
+					kchild.before(span);
+				} else {
+					kchild.after(span);
+				}
+				child = span;
+			}
+			_moveToElementText(range, child);
+			range.collapse(isStart);
+			if (span) {
+				K(span).remove();
+			}
+			return range;
+		}
+		node = child;
+		offset = isStart ? 0 : child.nodeValue.length;
+	}
+	var dummy = doc.createElement('span');
+	K(node).before(dummy);
+	_moveToElementText(range, dummy);
+	range.moveStart('character', offset);
+	K(dummy).remove();
+	return range;
+}
+function _toRange(rng) {
+	var doc, range;
+	function tr2td(start) {
+		if (K(start.node).name == 'tr') {
+			start.node = start.node.cells[start.offset];
+			start.offset = 0;
+		}
+	}
+	if (_IERANGE) {
+		if (rng.item) {
+			doc = _getDoc(rng.item(0));
+			range = new KRange(doc);
+			range.selectNode(rng.item(0));
+			return range;
+		}
+		doc = rng.parentElement().ownerDocument;
+		var start = _getStartEnd(rng, true),
+			end = _getStartEnd(rng, false);
+		tr2td(start);
+		tr2td(end);
+		range = new KRange(doc);
+		range.setStart(start.node, start.offset);
+		range.setEnd(end.node, end.offset);
+		return range;
+	}
+	var startContainer = rng.startContainer;
+	doc = startContainer.ownerDocument || startContainer;
+	range = new KRange(doc);
+	range.setStart(startContainer, rng.startOffset);
+	range.setEnd(rng.endContainer, rng.endOffset);
+	return range;
+}
+function KRange(doc) {
+	this.init(doc);
+}
+_extend(KRange, {
+	init : function(doc) {
+		var self = this;
+		self.startContainer = doc;
+		self.startOffset = 0;
+		self.endContainer = doc;
+		self.endOffset = 0;
+		self.collapsed = true;
+		self.doc = doc;
+	},
+	commonAncestor : function() {
+		function getParents(node) {
+			var parents = [];
+			while (node) {
+				parents.push(node);
+				node = node.parentNode;
+			}
+			return parents;
+		}
+		var parentsA = getParents(this.startContainer),
+			parentsB = getParents(this.endContainer),
+			i = 0, lenA = parentsA.length, lenB = parentsB.length, parentA, parentB;
+		while (++i) {
+			parentA = parentsA[lenA - i];
+			parentB = parentsB[lenB - i];
+			if (!parentA || !parentB || parentA !== parentB) {
+				break;
+			}
+		}
+		return parentsA[lenA - i + 1];
+	},
+	setStart : function(node, offset) {
+		var self = this, doc = self.doc;
+		self.startContainer = node;
+		self.startOffset = offset;
+		if (self.endContainer === doc) {
+			self.endContainer = node;
+			self.endOffset = offset;
+		}
+		return _updateCollapsed(this);
+	},
+	setEnd : function(node, offset) {
+		var self = this, doc = self.doc;
+		self.endContainer = node;
+		self.endOffset = offset;
+		if (self.startContainer === doc) {
+			self.startContainer = node;
+			self.startOffset = offset;
+		}
+		return _updateCollapsed(this);
+	},
+	setStartBefore : function(node) {
+		return this.setStart(node.parentNode || this.doc, K(node).index());
+	},
+	setStartAfter : function(node) {
+		return this.setStart(node.parentNode || this.doc, K(node).index() + 1);
+	},
+	setEndBefore : function(node) {
+		return this.setEnd(node.parentNode || this.doc, K(node).index());
+	},
+	setEndAfter : function(node) {
+		return this.setEnd(node.parentNode || this.doc, K(node).index() + 1);
+	},
+	selectNode : function(node) {
+		return this.setStartBefore(node).setEndAfter(node);
+	},
+	selectNodeContents : function(node) {
+		var knode = K(node);
+		if (knode.type == 3 || knode.isSingle()) {
+			return this.selectNode(node);
+		}
+		var children = knode.children();
+		if (children.length > 0) {
+			return this.setStartBefore(children[0]).setEndAfter(children[children.length - 1]);
+		}
+		return this.setStart(node, 0).setEnd(node, 0);
+	},
+	collapse : function(toStart) {
+		if (toStart) {
+			return this.setEnd(this.startContainer, this.startOffset);
+		}
+		return this.setStart(this.endContainer, this.endOffset);
+	},
+	compareBoundaryPoints : function(how, range) {
+		var rangeA = this.get(), rangeB = range.get();
+		if (_IERANGE) {
+			var arr = {};
+			arr[_START_TO_START] = 'StartToStart';
+			arr[_START_TO_END] = 'EndToStart';
+			arr[_END_TO_END] = 'EndToEnd';
+			arr[_END_TO_START] = 'StartToEnd';
+			var cmp = rangeA.compareEndPoints(arr[how], rangeB);
+			if (cmp !== 0) {
+				return cmp;
+			}
+			var nodeA, nodeB, nodeC, posA, posB;
+			if (how === _START_TO_START || how === _END_TO_START) {
+				nodeA = this.startContainer;
+				posA = this.startOffset;
+			}
+			if (how === _START_TO_END || how === _END_TO_END) {
+				nodeA = this.endContainer;
+				posA = this.endOffset;
+			}
+			if (how === _START_TO_START || how === _START_TO_END) {
+				nodeB = range.startContainer;
+				posB = range.startOffset;
+			}
+			if (how === _END_TO_END || how === _END_TO_START) {
+				nodeB = range.endContainer;
+				posB = range.endOffset;
+			}
+			if (nodeA === nodeB) {
+				var diff = posA - posB;
+				return diff > 0 ? 1 : (diff < 0 ? -1 : 0);
+			}
+			nodeC = nodeB;
+			while (nodeC && nodeC.parentNode !== nodeA) {
+				nodeC = nodeC.parentNode;
+			}
+			if (nodeC) {
+				return K(nodeC).index() >= posA ? -1 : 1;
+			}
+			nodeC = nodeA;
+			while (nodeC && nodeC.parentNode !== nodeB) {
+				nodeC = nodeC.parentNode;
+			}
+			if (nodeC) {
+				return K(nodeC).index() >= posB ? 1 : -1;
+			}
+			nodeC = K(nodeB).next();
+			if (nodeC && nodeC.contains(nodeA)) {
+				return 1;
+			}
+			nodeC = K(nodeA).next();
+			if (nodeC && nodeC.contains(nodeB)) {
+				return -1;
+			}
+		} else {
+			return rangeA.compareBoundaryPoints(how, rangeB);
+		}
+	},
+	cloneRange : function() {
+		return new KRange(this.doc).setStart(this.startContainer, this.startOffset).setEnd(this.endContainer, this.endOffset);
+	},
+	toString : function() {
+		var rng = this.get(), str = _IERANGE ? rng.text : rng.toString();
+		return str.replace(/\r\n|\n|\r/g, '');
+	},
+	cloneContents : function() {
+		return _copyAndDelete(this, true, false);
+	},
+	deleteContents : function() {
+		return _copyAndDelete(this, false, true);
+	},
+	extractContents : function() {
+		return _copyAndDelete(this, true, true);
+	},
+	insertNode : function(node) {
+		var self = this,
+			sc = self.startContainer, so = self.startOffset,
+			ec = self.endContainer, eo = self.endOffset,
+			firstChild, lastChild, c, nodeCount = 1;
+		if (node.nodeName.toLowerCase() === '#document-fragment') {
+			firstChild = node.firstChild;
+			lastChild = node.lastChild;
+			nodeCount = node.childNodes.length;
+		}
+		if (sc.nodeType == 1) {
+			c = sc.childNodes[so];
+			if (c) {
+				sc.insertBefore(node, c);
+				if (sc === ec) {
+					eo += nodeCount;
+				}
+			} else {
+				sc.appendChild(node);
+			}
+		} else if (sc.nodeType == 3) {
+			if (so === 0) {
+				sc.parentNode.insertBefore(node, sc);
+				if (sc.parentNode === ec) {
+					eo += nodeCount;
+				}
+			} else if (so >= sc.nodeValue.length) {
+				if (sc.nextSibling) {
+					sc.parentNode.insertBefore(node, sc.nextSibling);
+				} else {
+					sc.parentNode.appendChild(node);
+				}
+			} else {
+				if (so > 0) {
+					c = sc.splitText(so);
+				} else {
+					c = sc;
+				}
+				sc.parentNode.insertBefore(node, c);
+				if (sc === ec) {
+					ec = c;
+					eo -= so;
+				}
+			}
+		}
+		if (firstChild) {
+			self.setStartBefore(firstChild).setEndAfter(lastChild);
+		} else {
+			self.selectNode(node);
+		}
+		if (self.compareBoundaryPoints(_END_TO_END, self.cloneRange().setEnd(ec, eo)) >= 1) {
+			return self;
+		}
+		return self.setEnd(ec, eo);
+	},
+	surroundContents : function(node) {
+		node.appendChild(this.extractContents());
+		return this.insertNode(node).selectNode(node);
+	},
+	isControl : function() {
+		var self = this,
+			sc = self.startContainer, so = self.startOffset,
+			ec = self.endContainer, eo = self.endOffset, rng;
+		return sc.nodeType == 1 && sc === ec && so + 1 === eo && K(sc.childNodes[so]).isControl();
+	},
+	get : function(hasControlRange) {
+		var self = this, doc = self.doc, node, rng;
+		if (!_IERANGE) {
+			rng = doc.createRange();
+			try {
+				rng.setStart(self.startContainer, self.startOffset);
+				rng.setEnd(self.endContainer, self.endOffset);
+			} catch (e) {}
+			return rng;
+		}
+		if (hasControlRange && self.isControl()) {
+			rng = doc.body.createControlRange();
+			rng.addElement(self.startContainer.childNodes[self.startOffset]);
+			return rng;
+		}
+		var range = self.cloneRange().down();
+		rng = doc.body.createTextRange();
+		rng.setEndPoint('StartToStart', _getEndRange(range.startContainer, range.startOffset));
+		rng.setEndPoint('EndToStart', _getEndRange(range.endContainer, range.endOffset));
+		return rng;
+	},
+	html : function() {
+		return K(this.cloneContents()).outer();
+	},
+	down : function() {
+		var self = this;
+		function downPos(node, pos, isStart) {
+			if (node.nodeType != 1) {
+				return;
+			}
+			var children = K(node).children();
+			if (children.length === 0) {
+				return;
+			}
+			var left, right, child, offset;
+			if (pos > 0) {
+				left = children.eq(pos - 1);
+			}
+			if (pos < children.length) {
+				right = children.eq(pos);
+			}
+			if (left && left.type == 3) {
+				child = left[0];
+				offset = child.nodeValue.length;
+			}
+			if (right && right.type == 3) {
+				child = right[0];
+				offset = 0;
+			}
+			if (!child) {
+				return;
+			}
+			if (isStart) {
+				self.setStart(child, offset);
+			} else {
+				self.setEnd(child, offset);
+			}
+		}
+		downPos(self.startContainer, self.startOffset, true);
+		downPos(self.endContainer, self.endOffset, false);
+		return self;
+	},
+	up : function() {
+		var self = this;
+		function upPos(node, pos, isStart) {
+			if (node.nodeType != 3) {
+				return;
+			}
+			if (pos === 0) {
+				if (isStart) {
+					self.setStartBefore(node);
+				} else {
+					self.setEndBefore(node);
+				}
+			} else if (pos == node.nodeValue.length) {
+				if (isStart) {
+					self.setStartAfter(node);
+				} else {
+					self.setEndAfter(node);
+				}
+			}
+		}
+		upPos(self.startContainer, self.startOffset, true);
+		upPos(self.endContainer, self.endOffset, false);
+		return self;
+	},
+	enlarge : function(toBlock) {
+		var self = this;
+		self.up();
+		function enlargePos(node, pos, isStart) {
+			var knode = K(node), parent;
+			if (knode.type == 3 || _NOSPLIT_TAG_MAP[knode.name] || !toBlock && knode.isBlock()) {
+				return;
+			}
+			if (pos === 0) {
+				while (!knode.prev()) {
+					parent = knode.parent();
+					if (!parent || _NOSPLIT_TAG_MAP[parent.name] || !toBlock && parent.isBlock()) {
+						break;
+					}
+					knode = parent;
+				}
+				if (isStart) {
+					self.setStartBefore(knode[0]);
+				} else {
+					self.setEndBefore(knode[0]);
+				}
+			} else if (pos == knode.children().length) {
+				while (!knode.next()) {
+					parent = knode.parent();
+					if (!parent || _NOSPLIT_TAG_MAP[parent.name] || !toBlock && parent.isBlock()) {
+						break;
+					}
+					knode = parent;
+				}
+				if (isStart) {
+					self.setStartAfter(knode[0]);
+				} else {
+					self.setEndAfter(knode[0]);
+				}
+			}
+		}
+		enlargePos(self.startContainer, self.startOffset, true);
+		enlargePos(self.endContainer, self.endOffset, false);
+		return self;
+	},
+	shrink : function() {
+		var self = this, child, collapsed = self.collapsed;
+		while (self.startContainer.nodeType == 1 && (child = self.startContainer.childNodes[self.startOffset]) && child.nodeType == 1 && !K(child).isSingle()) {
+			self.setStart(child, 0);
+		}
+		if (collapsed) {
+			return self.collapse(collapsed);
+		}
+		while (self.endContainer.nodeType == 1 && self.endOffset > 0 && (child = self.endContainer.childNodes[self.endOffset - 1]) && child.nodeType == 1 && !K(child).isSingle()) {
+			self.setEnd(child, child.childNodes.length);
+		}
+		return self;
+	},
+	createBookmark : function(serialize) {
+		var self = this, doc = self.doc, endNode,
+			startNode = K('<span style="display:none;"></span>', doc)[0];
+		startNode.id = '__kindeditor_bookmark_start_' + (_BOOKMARK_ID++) + '__';
+		if (!self.collapsed) {
+			endNode = startNode.cloneNode(true);
+			endNode.id = '__kindeditor_bookmark_end_' + (_BOOKMARK_ID++) + '__';
+		}
+		if (endNode) {
+			self.cloneRange().collapse(false).insertNode(endNode).setEndBefore(endNode);
+		}
+		self.insertNode(startNode).setStartAfter(startNode);
+		return {
+			start : serialize ? '#' + startNode.id : startNode,
+			end : endNode ? (serialize ? '#' + endNode.id : endNode) : null
+		};
+	},
+	moveToBookmark : function(bookmark) {
+		var self = this, doc = self.doc,
+			start = K(bookmark.start, doc), end = bookmark.end ? K(bookmark.end, doc) : null;
+		if (!start || start.length < 1) {
+			return self;
+		}
+		self.setStartBefore(start[0]);
+		start.remove();
+		if (end && end.length > 0) {
+			self.setEndBefore(end[0]);
+			end.remove();
+		} else {
+			self.collapse(true);
+		}
+		return self;
+	},
+	dump : function() {
+		console.log('--------------------');
+		console.log(this.startContainer.nodeType == 3 ? this.startContainer.nodeValue : this.startContainer, this.startOffset);
+		console.log(this.endContainer.nodeType == 3 ? this.endContainer.nodeValue : this.endContainer, this.endOffset);
+	}
+});
+function _range(mixed) {
+	if (!mixed.nodeName) {
+		return mixed.constructor === KRange ? mixed : _toRange(mixed);
+	}
+	return new KRange(mixed);
+}
+K.RangeClass = KRange;
+K.range = _range;
+K.START_TO_START = _START_TO_START;
+K.START_TO_END = _START_TO_END;
+K.END_TO_END = _END_TO_END;
+K.END_TO_START = _END_TO_START;
+function _nativeCommand(doc, key, val) {
+	try {
+		doc.execCommand(key, false, val);
+	} catch(e) {}
+}
+function _nativeCommandValue(doc, key) {
+	var val = '';
+	try {
+		val = doc.queryCommandValue(key);
+	} catch (e) {}
+	if (typeof val !== 'string') {
+		val = '';
+	}
+	return val;
+}
+function _getSel(doc) {
+	var win = _getWin(doc);
+	return _IERANGE ? doc.selection : win.getSelection();
+}
+function _getRng(doc) {
+	var sel = _getSel(doc), rng;
+	try {
+		if (sel.rangeCount > 0) {
+			rng = sel.getRangeAt(0);
+		} else {
+			rng = sel.createRange();
+		}
+	} catch(e) {}
+	if (_IERANGE && (!rng || (!rng.item && rng.parentElement().ownerDocument !== doc))) {
+		return null;
+	}
+	return rng;
+}
+function _singleKeyMap(map) {
+	var newMap = {}, arr, v;
+	_each(map, function(key, val) {
+		arr = key.split(',');
+		for (var i = 0, len = arr.length; i < len; i++) {
+			v = arr[i];
+			newMap[v] = val;
+		}
+	});
+	return newMap;
+}
+function _hasAttrOrCss(knode, map) {
+	return _hasAttrOrCssByKey(knode, map, '*') || _hasAttrOrCssByKey(knode, map);
+}
+function _hasAttrOrCssByKey(knode, map, mapKey) {
+	mapKey = mapKey || knode.name;
+	if (knode.type !== 1) {
+		return false;
+	}
+	var newMap = _singleKeyMap(map);
+	if (!newMap[mapKey]) {
+		return false;
+	}
+	var arr = newMap[mapKey].split(',');
+	for (var i = 0, len = arr.length; i < len; i++) {
+		var key = arr[i];
+		if (key === '*') {
+			return true;
+		}
+		var match = /^(\.?)([^=]+)(?:=([^=]*))?$/.exec(key);
+		var method = match[1] ? 'css' : 'attr';
+		key = match[2];
+		var val = match[3] || '';
+		if (val === '' && knode[method](key) !== '') {
+			return true;
+		}
+		if (val !== '' && knode[method](key) === val) {
+			return true;
+		}
+	}
+	return false;
+}
+function _removeAttrOrCss(knode, map) {
+	if (knode.type != 1) {
+		return;
+	}
+	_removeAttrOrCssByKey(knode, map, '*');
+	_removeAttrOrCssByKey(knode, map);
+}
+function _removeAttrOrCssByKey(knode, map, mapKey) {
+	mapKey = mapKey || knode.name;
+	if (knode.type !== 1) {
+		return;
+	}
+	var newMap = _singleKeyMap(map);
+	if (!newMap[mapKey]) {
+		return;
+	}
+	var arr = newMap[mapKey].split(','), allFlag = false;
+	for (var i = 0, len = arr.length; i < len; i++) {
+		var key = arr[i];
+		if (key === '*') {
+			allFlag = true;
+			break;
+		}
+		var match = /^(\.?)([^=]+)(?:=([^=]*))?$/.exec(key);
+		key = match[2];
+		if (match[1]) {
+			key = _toCamel(key);
+			if (knode[0].style[key]) {
+				knode[0].style[key] = '';
+			}
+		} else {
+			knode.removeAttr(key);
+		}
+	}
+	if (allFlag) {
+		knode.remove(true);
+	}
+}
+function _getInnerNode(knode) {
+	var inner = knode;
+	while (inner.first()) {
+		inner = inner.first();
+	}
+	return inner;
+}
+function _isEmptyNode(knode) {
+	if (knode.type != 1 || knode.isSingle()) {
+		return false;
+	}
+	return knode.html().replace(/<[^>]+>/g, '') === '';
+}
+function _mergeWrapper(a, b) {
+	a = a.clone(true);
+	var lastA = _getInnerNode(a), childA = a, merged = false;
+	while (b) {
+		while (childA) {
+			if (childA.name === b.name) {
+				_mergeAttrs(childA, b.attr(), b.css());
+				merged = true;
+			}
+			childA = childA.first();
+		}
+		if (!merged) {
+			lastA.append(b.clone(false));
+		}
+		merged = false;
+		b = b.first();
+	}
+	return a;
+}
+function _wrapNode(knode, wrapper) {
+	wrapper = wrapper.clone(true);
+	if (knode.type == 3) {
+		_getInnerNode(wrapper).append(knode.clone(false));
+		knode.replaceWith(wrapper);
+		return wrapper;
+	}
+	var nodeWrapper = knode, child;
+	while ((child = knode.first()) && child.children().length == 1) {
+		knode = child;
+	}
+	child = knode.first();
+	var frag = knode.doc.createDocumentFragment();
+	while (child) {
+		frag.appendChild(child[0]);
+		child = child.next();
+	}
+	wrapper = _mergeWrapper(nodeWrapper, wrapper);
+	if (frag.firstChild) {
+		_getInnerNode(wrapper).append(frag);
+	}
+	nodeWrapper.replaceWith(wrapper);
+	return wrapper;
+}
+function _mergeAttrs(knode, attrs, styles) {
+	_each(attrs, function(key, val) {
+		if (key !== 'style') {
+			knode.attr(key, val);
+		}
+	});
+	_each(styles, function(key, val) {
+		knode.css(key, val);
+	});
+}
+function _inPreElement(knode) {
+	while (knode && knode.name != 'body') {
+		if (_PRE_TAG_MAP[knode.name] || knode.name == 'div' && knode.hasClass('ke-script')) {
+			return true;
+		}
+		knode = knode.parent();
+	}
+	return false;
+}
+function KCmd(range) {
+	this.init(range);
+}
+_extend(KCmd, {
+	init : function(range) {
+		var self = this, doc = range.doc;
+		self.doc = doc;
+		self.win = _getWin(doc);
+		self.sel = _getSel(doc);
+		self.range = range;
+	},
+	selection : function(forceReset) {
+		var self = this, doc = self.doc, rng = _getRng(doc);
+		self.sel = _getSel(doc);
+		if (rng) {
+			self.range = _range(rng);
+			if (K(self.range.startContainer).name == 'html') {
+				self.range.selectNodeContents(doc.body).collapse(false);
+			}
+			return self;
+		}
+		if (forceReset) {
+			self.range.selectNodeContents(doc.body).collapse(false);
+		}
+		return self;
+	},
+	select : function(hasDummy) {
+		hasDummy = _undef(hasDummy, true);
+		var self = this, sel = self.sel, range = self.range.cloneRange().shrink(),
+			sc = range.startContainer, so = range.startOffset,
+			ec = range.endContainer, eo = range.endOffset,
+			doc = _getDoc(sc), win = self.win, rng, hasU200b = false;
+		if (hasDummy && sc.nodeType == 1 && range.collapsed) {
+			if (_IERANGE) {
+				var dummy = K('<span>&nbsp;</span>', doc);
+				range.insertNode(dummy[0]);
+				rng = doc.body.createTextRange();
+				try {
+					rng.moveToElementText(dummy[0]);
+				} catch(ex) {}
+				rng.collapse(false);
+				rng.select();
+				dummy.remove();
+				win.focus();
+				return self;
+			}
+			if (_WEBKIT) {
+				var children = sc.childNodes;
+				if (K(sc).isInline() || so > 0 && K(children[so - 1]).isInline() || children[so] && K(children[so]).isInline()) {
+					range.insertNode(doc.createTextNode('\u200B'));
+					hasU200b = true;
+				}
+			}
+		}
+		if (_IERANGE) {
+			try {
+				rng = range.get(true);
+				rng.select();
+			} catch(e) {}
+		} else {
+			if (hasU200b) {
+				range.collapse(false);
+			}
+			rng = range.get(true);
+			sel.removeAllRanges();
+			sel.addRange(rng);
+			if (doc !== document) {
+				var pos = K(rng.endContainer).pos();
+				win.scrollTo(pos.x, pos.y);
+			}
+		}
+		win.focus();
+		return self;
+	},
+	wrap : function(val) {
+		var self = this, doc = self.doc, range = self.range, wrapper;
+		wrapper = K(val, doc);
+		if (range.collapsed) {
+			range.shrink();
+			range.insertNode(wrapper[0]).selectNodeContents(wrapper[0]);
+			return self;
+		}
+		if (wrapper.isBlock()) {
+			var copyWrapper = wrapper.clone(true), child = copyWrapper;
+			while (child.first()) {
+				child = child.first();
+			}
+			child.append(range.extractContents());
+			range.insertNode(copyWrapper[0]).selectNode(copyWrapper[0]);
+			return self;
+		}
+		range.enlarge();
+		var bookmark = range.createBookmark(), ancestor = range.commonAncestor(), isStart = false;
+		K(ancestor).scan(function(node) {
+			if (!isStart && node == bookmark.start) {
+				isStart = true;
+				return;
+			}
+			if (isStart) {
+				if (node == bookmark.end) {
+					return false;
+				}
+				var knode = K(node);
+				if (_inPreElement(knode)) {
+					return;
+				}
+				if (knode.type == 3 && _trim(node.nodeValue).length > 0) {
+					var parent;
+					while ((parent = knode.parent()) && parent.isStyle() && parent.children().length == 1) {
+						knode = parent;
+					}
+					_wrapNode(knode, wrapper);
+				}
+			}
+		});
+		range.moveToBookmark(bookmark);
+		return self;
+	},
+	split : function(isStart, map) {
+		var range = this.range, doc = range.doc;
+		var tempRange = range.cloneRange().collapse(isStart);
+		var node = tempRange.startContainer, pos = tempRange.startOffset,
+			parent = node.nodeType == 3 ? node.parentNode : node,
+			needSplit = false, knode;
+		while (parent && parent.parentNode) {
+			knode = K(parent);
+			if (map) {
+				if (!knode.isStyle()) {
+					break;
+				}
+				if (!_hasAttrOrCss(knode, map)) {
+					break;
+				}
+			} else {
+				if (_NOSPLIT_TAG_MAP[knode.name]) {
+					break;
+				}
+			}
+			needSplit = true;
+			parent = parent.parentNode;
+		}
+		if (needSplit) {
+			var dummy = doc.createElement('span');
+			range.cloneRange().collapse(!isStart).insertNode(dummy);
+			if (isStart) {
+				tempRange.setStartBefore(parent.firstChild).setEnd(node, pos);
+			} else {
+				tempRange.setStart(node, pos).setEndAfter(parent.lastChild);
+			}
+			var frag = tempRange.extractContents(),
+				first = frag.firstChild, last = frag.lastChild;
+			if (isStart) {
+				tempRange.insertNode(frag);
+				range.setStartAfter(last).setEndBefore(dummy);
+			} else {
+				parent.appendChild(frag);
+				range.setStartBefore(dummy).setEndBefore(first);
+			}
+			var dummyParent = dummy.parentNode;
+			if (dummyParent == range.endContainer) {
+				var prev = K(dummy).prev(), next = K(dummy).next();
+				if (prev && next && prev.type == 3 && next.type == 3) {
+					range.setEnd(prev[0], prev[0].nodeValue.length);
+				} else if (!isStart) {
+					range.setEnd(range.endContainer, range.endOffset - 1);
+				}
+			}
+			dummyParent.removeChild(dummy);
+		}
+		return this;
+	},
+	remove : function(map) {
+		var self = this, doc = self.doc, range = self.range;
+		range.enlarge();
+		if (range.startOffset === 0) {
+			var ksc = K(range.startContainer), parent;
+			while ((parent = ksc.parent()) && parent.isStyle() && parent.children().length == 1) {
+				ksc = parent;
+			}
+			range.setStart(ksc[0], 0);
+			ksc = K(range.startContainer);
+			if (ksc.isBlock()) {
+				_removeAttrOrCss(ksc, map);
+			}
+			var kscp = ksc.parent();
+			if (kscp && kscp.isBlock()) {
+				_removeAttrOrCss(kscp, map);
+			}
+		}
+		var sc, so;
+		if (range.collapsed) {
+			self.split(true, map);
+			sc = range.startContainer;
+			so = range.startOffset;
+			if (so > 0) {
+				var sb = K(sc.childNodes[so - 1]);
+				if (sb && _isEmptyNode(sb)) {
+					sb.remove();
+					range.setStart(sc, so - 1);
+				}
+			}
+			var sa = K(sc.childNodes[so]);
+			if (sa && _isEmptyNode(sa)) {
+				sa.remove();
+			}
+			if (_isEmptyNode(sc)) {
+				range.startBefore(sc);
+				sc.remove();
+			}
+			range.collapse(true);
+			return self;
+		}
+		self.split(true, map);
+		self.split(false, map);
+		var startDummy = doc.createElement('span'), endDummy = doc.createElement('span');
+		range.cloneRange().collapse(false).insertNode(endDummy);
+		range.cloneRange().collapse(true).insertNode(startDummy);
+		var nodeList = [], cmpStart = false;
+		K(range.commonAncestor()).scan(function(node) {
+			if (!cmpStart && node == startDummy) {
+				cmpStart = true;
+				return;
+			}
+			if (node == endDummy) {
+				return false;
+			}
+			if (cmpStart) {
+				nodeList.push(node);
+			}
+		});
+		K(startDummy).remove();
+		K(endDummy).remove();
+		sc = range.startContainer;
+		so = range.startOffset;
+		var ec = range.endContainer, eo = range.endOffset;
+		if (so > 0) {
+			var startBefore = K(sc.childNodes[so - 1]);
+			if (startBefore && _isEmptyNode(startBefore)) {
+				startBefore.remove();
+				range.setStart(sc, so - 1);
+				if (sc == ec) {
+					range.setEnd(ec, eo - 1);
+				}
+			}
+			var startAfter = K(sc.childNodes[so]);
+			if (startAfter && _isEmptyNode(startAfter)) {
+				startAfter.remove();
+				if (sc == ec) {
+					range.setEnd(ec, eo - 1);
+				}
+			}
+		}
+		var endAfter = K(ec.childNodes[range.endOffset]);
+		if (endAfter && _isEmptyNode(endAfter)) {
+			endAfter.remove();
+		}
+		var bookmark = range.createBookmark(true);
+		_each(nodeList, function(i, node) {
+			_removeAttrOrCss(K(node), map);
+		});
+		range.moveToBookmark(bookmark);
+		return self;
+	},
+	commonNode : function(map) {
+		var range = this.range;
+		var ec = range.endContainer, eo = range.endOffset,
+			node = (ec.nodeType == 3 || eo === 0) ? ec : ec.childNodes[eo - 1];
+		function find(node) {
+			var child = node, parent = node;
+			while (parent) {
+				if (_hasAttrOrCss(K(parent), map)) {
+					return K(parent);
+				}
+				parent = parent.parentNode;
+			}
+			while (child && (child = child.lastChild)) {
+				if (_hasAttrOrCss(K(child), map)) {
+					return K(child);
+				}
+			}
+			return null;
+		}
+		var cNode = find(node);
+		if (cNode) {
+			return cNode;
+		}
+		if (node.nodeType == 1 || (ec.nodeType == 3 && eo === 0)) {
+			var prev = K(node).prev();
+			if (prev) {
+				return find(prev);
+			}
+		}
+		return null;
+	},
+	commonAncestor : function(tagName) {
+		var range = this.range,
+			sc = range.startContainer, so = range.startOffset,
+			ec = range.endContainer, eo = range.endOffset,
+			startNode = (sc.nodeType == 3 || so === 0) ? sc : sc.childNodes[so - 1],
+			endNode = (ec.nodeType == 3 || eo === 0) ? ec : ec.childNodes[eo - 1];
+		function find(node) {
+			while (node) {
+				if (node.nodeType == 1) {
+					if (node.tagName.toLowerCase() === tagName) {
+						return node;
+					}
+				}
+				node = node.parentNode;
+			}
+			return null;
+		}
+		var start = find(startNode), end = find(endNode);
+		if (start && end && start === end) {
+			return K(start);
+		}
+		return null;
+	},
+	state : function(key) {
+		var self = this, doc = self.doc, bool = false;
+		try {
+			bool = doc.queryCommandState(key);
+		} catch (e) {}
+		return bool;
+	},
+	val : function(key) {
+		var self = this, doc = self.doc, range = self.range;
+		function lc(val) {
+			return val.toLowerCase();
+		}
+		key = lc(key);
+		var val = '', knode;
+		if (key === 'fontfamily' || key === 'fontname') {
+			val = _nativeCommandValue(doc, 'fontname');
+			val = val.replace(/['"]/g, '');
+			return lc(val);
+		}
+		if (key === 'formatblock') {
+			val = _nativeCommandValue(doc, key);
+			if (val === '') {
+				knode = self.commonNode({'h1,h2,h3,h4,h5,h6,p,div,pre,address' : '*'});
+				if (knode) {
+					val = knode.name;
+				}
+			}
+			if (val === 'Normal') {
+				val = 'p';
+			}
+			return lc(val);
+		}
+		if (key === 'fontsize') {
+			knode = self.commonNode({'*' : '.font-size'});
+			if (knode) {
+				val = knode.css('font-size');
+			}
+			return lc(val);
+		}
+		if (key === 'forecolor') {
+			knode = self.commonNode({'*' : '.color'});
+			if (knode) {
+				val = knode.css('color');
+			}
+			val = _toHex(val);
+			if (val === '') {
+				val = 'default';
+			}
+			return lc(val);
+		}
+		if (key === 'hilitecolor') {
+			knode = self.commonNode({'*' : '.background-color'});
+			if (knode) {
+				val = knode.css('background-color');
+			}
+			val = _toHex(val);
+			if (val === '') {
+				val = 'default';
+			}
+			return lc(val);
+		}
+		return val;
+	},
+	toggle : function(wrapper, map) {
+		var self = this;
+		if (self.commonNode(map)) {
+			self.remove(map);
+		} else {
+			self.wrap(wrapper);
+		}
+		return self.select();
+	},
+	bold : function() {
+		return this.toggle('<strong></strong>', {
+			span : '.font-weight=bold',
+			strong : '*',
+			b : '*'
+		});
+	},
+	italic : function() {
+		return this.toggle('<em></em>', {
+			span : '.font-style=italic',
+			em : '*',
+			i : '*'
+		});
+	},
+	underline : function() {
+		return this.toggle('<u></u>', {
+			span : '.text-decoration=underline',
+			u : '*'
+		});
+	},
+	strikethrough : function() {
+		return this.toggle('<s></s>', {
+			span : '.text-decoration=line-through',
+			s : '*'
+		});
+	},
+	forecolor : function(val) {
+		return this.wrap('<span style="color:' + val + ';"></span>').select();
+	},
+	hilitecolor : function(val) {
+		return this.wrap('<span style="background-color:' + val + ';"></span>').select();
+	},
+	fontsize : function(val) {
+		return this.wrap('<span style="font-size:' + val + ';"></span>').select();
+	},
+	fontname : function(val) {
+		return this.fontfamily(val);
+	},
+	fontfamily : function(val) {
+		return this.wrap('<span style="font-family:' + val + ';"></span>').select();
+	},
+	removeformat : function() {
+		var map = {
+			'*' : '.font-weight,.font-style,.text-decoration,.color,.background-color,.font-size,.font-family,.text-indent'
+		},
+		tags = _STYLE_TAG_MAP;
+		_each(tags, function(key, val) {
+			map[key] = '*';
+		});
+		this.remove(map);
+		return this.select();
+	},
+	inserthtml : function(val, quickMode) {
+		var self = this, range = self.range;
+		if (val === '') {
+			return self;
+		}
+		function pasteHtml(range, val) {
+			val = '<img id="__kindeditor_temp_tag__" width="0" height="0" style="display:none;" />' + val;
+			var rng = range.get();
+			if (rng.item) {
+				rng.item(0).outerHTML = val;
+			} else {
+				rng.pasteHTML(val);
+			}
+			var temp = range.doc.getElementById('__kindeditor_temp_tag__');
+			temp.parentNode.removeChild(temp);
+			var newRange = _toRange(rng);
+			range.setEnd(newRange.endContainer, newRange.endOffset);
+			range.collapse(false);
+			self.select(false);
+		}
+		function insertHtml(range, val) {
+			var doc = range.doc,
+				frag = doc.createDocumentFragment();
+			K('@' + val, doc).each(function() {
+				frag.appendChild(this);
+			});
+			range.deleteContents();
+			range.insertNode(frag);
+			range.collapse(false);
+			self.select(false);
+		}
+		if (_IERANGE && quickMode) {
+			try {
+				pasteHtml(range, val);
+			} catch(e) {
+				insertHtml(range, val);
+			}
+			return self;
+		}
+		insertHtml(range, val);
+		return self;
+	},
+	hr : function() {
+		return this.inserthtml('<hr />');
+	},
+	print : function() {
+		this.win.print();
+		return this;
+	},
+	insertimage : function(url, title, width, height, border, align) {
+		title = _undef(title, '');
+		border = _undef(border, 0);
+		var html = '<img src="' + _escape(url) + '" data-ke-src="' + _escape(url) + '" ';
+		if (width) {
+			html += 'width="' + _escape(width) + '" ';
+		}
+		if (height) {
+			html += 'height="' + _escape(height) + '" ';
+		}
+		if (title) {
+			html += 'title="' + _escape(title) + '" ';
+		}
+		if (align) {
+			html += 'align="' + _escape(align) + '" ';
+		}
+		html += 'alt="' + _escape(title) + '" ';
+		html += '/>';
+		return this.inserthtml(html);
+	},
+	createlink : function(url, type) {
+		var self = this, doc = self.doc, range = self.range;
+		self.select();
+		var a = self.commonNode({ a : '*' });
+		if (a && !range.isControl()) {
+			range.selectNode(a.get());
+			self.select();
+		}
+		var html = '<a href="' + _escape(url) + '" data-ke-src="' + _escape(url) + '" ';
+		if (type) {
+			html += ' target="' + _escape(type) + '"';
+		}
+		if (range.collapsed) {
+			html += '>' + _escape(url) + '</a>';
+			return self.inserthtml(html);
+		}
+		if (range.isControl()) {
+			var node = K(range.startContainer.childNodes[range.startOffset]);
+			html += '></a>';
+			node.after(K(html, doc));
+			node.next().append(node);
+			range.selectNode(node[0]);
+			return self.select();
+		}
+		function setAttr(node, url, type) {
+			K(node).attr('href', url).attr('data-ke-src', url);
+			if (type) {
+				K(node).attr('target', type);
+			} else {
+				K(node).removeAttr('target');
+			}
+		}
+		var sc = range.startContainer, so = range.startOffset,
+			ec = range.endContainer, eo = range.endOffset;
+		if (sc.nodeType == 1 && sc === ec && so + 1 === eo) {
+			var child = sc.childNodes[so];
+			if (child.nodeName.toLowerCase() == 'a') {
+				setAttr(child, url, type);
+				return self;
+			}
+		}
+		_nativeCommand(doc, 'createlink', '__kindeditor_temp_url__');
+		K('a[href="__kindeditor_temp_url__"]', doc).each(function() {
+			setAttr(this, url, type);
+		});
+		return self;
+	},
+	unlink : function() {
+		var self = this, doc = self.doc, range = self.range;
+		self.select();
+		if (range.collapsed) {
+			var a = self.commonNode({ a : '*' });
+			if (a) {
+				range.selectNode(a.get());
+				self.select();
+			}
+			_nativeCommand(doc, 'unlink', null);
+			if (_WEBKIT && K(range.startContainer).name === 'img') {
+				var parent = K(range.startContainer).parent();
+				if (parent.name === 'a') {
+					parent.remove(true);
+				}
+			}
+		} else {
+			_nativeCommand(doc, 'unlink', null);
+		}
+		return self;
+	}
+});
+_each(('formatblock,selectall,justifyleft,justifycenter,justifyright,justifyfull,insertorderedlist,' +
+	'insertunorderedlist,indent,outdent,subscript,superscript').split(','), function(i, name) {
+	KCmd.prototype[name] = function(val) {
+		var self = this;
+		self.select();
+		_nativeCommand(self.doc, name, val);
+		if (_IERANGE && _inArray(name, 'justifyleft,justifycenter,justifyright,justifyfull'.split(',')) >= 0) {
+			self.selection();
+		}
+		if (!_IERANGE || _inArray(name, 'formatblock,selectall,insertorderedlist,insertunorderedlist'.split(',')) >= 0) {
+			self.selection();
+		}
+		return self;
+	};
+});
+_each('cut,copy,paste'.split(','), function(i, name) {
+	KCmd.prototype[name] = function() {
+		var self = this;
+		if (!self.doc.queryCommandSupported(name)) {
+			throw 'not supported';
+		}
+		self.select();
+		_nativeCommand(self.doc, name, null);
+		return self;
+	};
+});
+function _cmd(mixed) {
+	if (mixed.nodeName) {
+		var doc = _getDoc(mixed);
+		mixed = _range(doc).selectNodeContents(doc.body).collapse(false);
+	}
+	return new KCmd(mixed);
+}
+K.CmdClass = KCmd;
+K.cmd = _cmd;
+function _drag(options) {
+	var moveEl = options.moveEl,
+		moveFn = options.moveFn,
+		clickEl = options.clickEl || moveEl,
+		beforeDrag = options.beforeDrag,
+		iframeFix = options.iframeFix === undefined ? true : options.iframeFix;
+	var docs = [document];
+	if (iframeFix) {
+		K('iframe').each(function() {
+			var src = _formatUrl(this.src || '', 'absolute');
+			if (/^https?:\/\//.test(src)) {
+				return;
+			}
+			var doc;
+			try {
+				doc = _iframeDoc(this);
+			} catch(e) {}
+			if (doc) {
+				var pos = K(this).pos();
+				K(doc).data('pos-x', pos.x);
+				K(doc).data('pos-y', pos.y);
+				docs.push(doc);
+			}
+		});
+	}
+	clickEl.mousedown(function(e) {
+		e.stopPropagation();
+		var self = clickEl.get(),
+			x = _removeUnit(moveEl.css('left')),
+			y = _removeUnit(moveEl.css('top')),
+			width = moveEl.width(),
+			height = moveEl.height(),
+			pageX = e.pageX,
+			pageY = e.pageY;
+		if (beforeDrag) {
+			beforeDrag();
+		}
+		function moveListener(e) {
+			e.preventDefault();
+			var kdoc = K(_getDoc(e.target));
+			var diffX = _round((kdoc.data('pos-x') || 0) + e.pageX - pageX);
+			var diffY = _round((kdoc.data('pos-y') || 0) + e.pageY - pageY);
+			moveFn.call(clickEl, x, y, width, height, diffX, diffY);
+		}
+		function selectListener(e) {
+			e.preventDefault();
+		}
+		function upListener(e) {
+			e.preventDefault();
+			K(docs).unbind('mousemove', moveListener)
+				.unbind('mouseup', upListener)
+				.unbind('selectstart', selectListener);
+			if (self.releaseCapture) {
+				self.releaseCapture();
+			}
+		}
+		K(docs).mousemove(moveListener)
+			.mouseup(upListener)
+			.bind('selectstart', selectListener);
+		if (self.setCapture) {
+			self.setCapture();
+		}
+	});
+}
+function KWidget(options) {
+	this.init(options);
+}
+_extend(KWidget, {
+	init : function(options) {
+		var self = this;
+		self.name = options.name || '';
+		self.doc = options.doc || document;
+		self.win = _getWin(self.doc);
+		self.x = _addUnit(options.x);
+		self.y = _addUnit(options.y);
+		self.z = options.z;
+		self.width = _addUnit(options.width);
+		self.height = _addUnit(options.height);
+		self.div = K('<div style="display:block;"></div>');
+		self.options = options;
+		self._alignEl = options.alignEl;
+		if (self.width) {
+			self.div.css('width', self.width);
+		}
+		if (self.height) {
+			self.div.css('height', self.height);
+		}
+		if (self.z) {
+			self.div.css({
+				position : 'absolute',
+				left : self.x,
+				top : self.y,
+				'z-index' : self.z
+			});
+		}
+		if (self.z && (self.x === undefined || self.y === undefined)) {
+			self.autoPos(self.width, self.height);
+		}
+		if (options.cls) {
+			self.div.addClass(options.cls);
+		}
+		if (options.shadowMode) {
+			self.div.addClass('ke-shadow');
+		}
+		if (options.css) {
+			self.div.css(options.css);
+		}
+		if (options.src) {
+			K(options.src).replaceWith(self.div);
+		} else {
+			K(self.doc.body).append(self.div);
+		}
+		if (options.html) {
+			self.div.html(options.html);
+		}
+		if (options.autoScroll) {
+			if (_IE && _V < 7 || _QUIRKS) {
+				var scrollPos = _getScrollPos();
+				K(self.win).bind('scroll', function(e) {
+					var pos = _getScrollPos(),
+						diffX = pos.x - scrollPos.x,
+						diffY = pos.y - scrollPos.y;
+					self.pos(_removeUnit(self.x) + diffX, _removeUnit(self.y) + diffY, false);
+				});
+			} else {
+				self.div.css('position', 'fixed');
+			}
+		}
+	},
+	pos : function(x, y, updateProp) {
+		var self = this;
+		updateProp = _undef(updateProp, true);
+		if (x !== null) {
+			x = x < 0 ? 0 : _addUnit(x);
+			self.div.css('left', x);
+			if (updateProp) {
+				self.x = x;
+			}
+		}
+		if (y !== null) {
+			y = y < 0 ? 0 : _addUnit(y);
+			self.div.css('top', y);
+			if (updateProp) {
+				self.y = y;
+			}
+		}
+		return self;
+	},
+	autoPos : function(width, height) {
+		var self = this,
+			w = _removeUnit(width) || 0,
+			h = _removeUnit(height) || 0,
+			scrollPos = _getScrollPos();
+		if (self._alignEl) {
+			var knode = K(self._alignEl),
+				pos = knode.pos(),
+				diffX = _round(knode[0].clientWidth / 2 - w / 2),
+				diffY = _round(knode[0].clientHeight / 2 - h / 2);
+			x = diffX < 0 ? pos.x : pos.x + diffX;
+			y = diffY < 0 ? pos.y : pos.y + diffY;
+		} else {
+			var docEl = _docElement(self.doc);
+			x = _round(scrollPos.x + (docEl.clientWidth - w) / 2);
+			y = _round(scrollPos.y + (docEl.clientHeight - h) / 2);
+		}
+		if (!(_IE && _V < 7 || _QUIRKS)) {
+			x -= scrollPos.x;
+			y -= scrollPos.y;
+		}
+		return self.pos(x, y);
+	},
+	remove : function() {
+		var self = this;
+		if (_IE && _V < 7 || _QUIRKS) {
+			K(self.win).unbind('scroll');
+		}
+		self.div.remove();
+		_each(self, function(i) {
+			self[i] = null;
+		});
+		return this;
+	},
+	show : function() {
+		this.div.show();
+		return this;
+	},
+	hide : function() {
+		this.div.hide();
+		return this;
+	},
+	draggable : function(options) {
+		var self = this;
+		options = options || {};
+		options.moveEl = self.div;
+		options.moveFn = function(x, y, width, height, diffX, diffY) {
+			if ((x = x + diffX) < 0) {
+				x = 0;
+			}
+			if ((y = y + diffY) < 0) {
+				y = 0;
+			}
+			self.pos(x, y);
+		};
+		_drag(options);
+		return self;
+	}
+});
+function _widget(options) {
+	return new KWidget(options);
+}
+K.WidgetClass = KWidget;
+K.widget = _widget;
+function _iframeDoc(iframe) {
+	iframe = _get(iframe);
+	return iframe.contentDocument || iframe.contentWindow.document;
+}
+var html, _direction = '';
+if ((html = document.getElementsByTagName('html'))) {
+	_direction = html[0].dir;
+}
+function _getInitHtml(themesPath, bodyClass, cssPath, cssData) {
+	var arr = [
+		(_direction === '' ? '<html>' : '<html dir="' + _direction + '">'),
+		'<head><meta charset="utf-8" /><title></title>',
+		'<style>',
+		'html {margin:0;padding:0;}',
+		'body {margin:0;padding:5px;}',
+		'body, td {font:12px/1.5 "sans serif",tahoma,verdana,helvetica;}',
+		'body, p, div {word-wrap: break-word;}',
+		'p {margin:5px 0;}',
+		'table {border-collapse:collapse;}',
+		'img {border:0;}',
+		'noscript {display:none;}',
+		'table.ke-zeroborder td {border:1px dotted #AAA;}',
+		'img.ke-flash {',
+		'	border:1px solid #AAA;',
+		'	background-image:url(' + themesPath + 'common/flash.gif);',
+		'	background-position:center center;',
+		'	background-repeat:no-repeat;',
+		'	width:100px;',
+		'	height:100px;',
+		'}',
+		'img.ke-rm {',
+		'	border:1px solid #AAA;',
+		'	background-image:url(' + themesPath + 'common/rm.gif);',
+		'	background-position:center center;',
+		'	background-repeat:no-repeat;',
+		'	width:100px;',
+		'	height:100px;',
+		'}',
+		'img.ke-media {',
+		'	border:1px solid #AAA;',
+		'	background-image:url(' + themesPath + 'common/media.gif);',
+		'	background-position:center center;',
+		'	background-repeat:no-repeat;',
+		'	width:100px;',
+		'	height:100px;',
+		'}',
+		'img.ke-anchor {',
+		'	border:1px dashed #666;',
+		'	width:16px;',
+		'	height:16px;',
+		'}',
+		'.ke-script, .ke-noscript, .ke-display-none {',
+		'	display:none;',
+		'	font-size:0;',
+		'	width:0;',
+		'	height:0;',
+		'}',
+		'.ke-pagebreak {',
+		'	border:1px dotted #AAA;',
+		'	font-size:0;',
+		'	height:2px;',
+		'}',
+		'</style>'
+	];
+	if (!_isArray(cssPath)) {
+		cssPath = [cssPath];
+	}
+	_each(cssPath, function(i, path) {
+		if (path) {
+			arr.push('<link href="' + path + '" rel="stylesheet" />');
+		}
+	});
+	if (cssData) {
+		arr.push('<style>' + cssData + '</style>');
+	}
+	arr.push('</head><body ' + (bodyClass ? 'class="' + bodyClass + '"' : '') + '></body></html>');
+	return arr.join('\n');
+}
+function _elementVal(knode, val) {
+	if (knode.hasVal()) {
+		if (val === undefined) {
+			var html = knode.val();
+			html = html.replace(/(<(?:p|p\s[^>]*)>) *(<\/p>)/ig, '');
+			return html;
+		}
+		return knode.val(val);
+	}
+	return knode.html(val);
+}
+function KEdit(options) {
+	this.init(options);
+}
+_extend(KEdit, KWidget, {
+	init : function(options) {
+		var self = this;
+		KEdit.parent.init.call(self, options);
+		self.srcElement = K(options.srcElement);
+		self.div.addClass('ke-edit');
+		self.designMode = _undef(options.designMode, true);
+		self.beforeGetHtml = options.beforeGetHtml;
+		self.beforeSetHtml = options.beforeSetHtml;
+		self.afterSetHtml = options.afterSetHtml;
+		var themesPath = _undef(options.themesPath, ''),
+			bodyClass = options.bodyClass,
+			cssPath = options.cssPath,
+			cssData = options.cssData,
+			isDocumentDomain = location.protocol != 'res:' && location.host.replace(/:\d+/, '') !== document.domain,
+			srcScript = ('document.open();' +
+				(isDocumentDomain ? 'document.domain="' + document.domain + '";' : '') +
+				'document.close();'),
+			iframeSrc = _IE ? ' src="javascript:void(function(){' + encodeURIComponent(srcScript) + '}())"' : '';
+		self.iframe = K('<iframe class="ke-edit-iframe" hidefocus="true" frameborder="0"' + iframeSrc + '></iframe>').css('width', '100%');
+		self.textarea = K('<textarea class="ke-edit-textarea" hidefocus="true"></textarea>').css('width', '100%');
+		self.tabIndex = isNaN(parseInt(options.tabIndex, 10)) ? self.srcElement.attr('tabindex') : parseInt(options.tabIndex, 10);
+		self.iframe.attr('tabindex', self.tabIndex);
+		self.textarea.attr('tabindex', self.tabIndex);
+		if (self.width) {
+			self.setWidth(self.width);
+		}
+		if (self.height) {
+			self.setHeight(self.height);
+		}
+		if (self.designMode) {
+			self.textarea.hide();
+		} else {
+			self.iframe.hide();
+		}
+		function ready() {
+			var doc = _iframeDoc(self.iframe);
+			doc.open();
+			if (isDocumentDomain) {
+				doc.domain = document.domain;
+			}
+			doc.write(_getInitHtml(themesPath, bodyClass, cssPath, cssData));
+			doc.close();
+			self.win = self.iframe[0].contentWindow;
+			self.doc = doc;
+			var cmd = _cmd(doc);
+			self.afterChange(function(e) {
+				cmd.selection();
+			});
+			if (_WEBKIT) {
+				K(doc).click(function(e) {
+					if (K(e.target).name === 'img') {
+						cmd.selection(true);
+						cmd.range.selectNode(e.target);
+						cmd.select();
+					}
+				});
+			}
+			if (_IE) {
+				self._mousedownHandler = function() {
+					var newRange = cmd.range.cloneRange();
+					newRange.shrink();
+					if (newRange.isControl()) {
+						self.blur();
+					}
+				};
+				K(document).mousedown(self._mousedownHandler);
+				K(doc).keydown(function(e) {
+					if (e.which == 8) {
+						cmd.selection();
+						var rng = cmd.range;
+						if (rng.isControl()) {
+							rng.collapse(true);
+							K(rng.startContainer.childNodes[rng.startOffset]).remove();
+							e.preventDefault();
+						}
+					}
+				});
+			}
+			self.cmd = cmd;
+			self.html(_elementVal(self.srcElement));
+			if (_IE) {
+				doc.body.disabled = true;
+				doc.body.contentEditable = true;
+				doc.body.removeAttribute('disabled');
+			} else {
+				doc.designMode = 'on';
+			}
+			if (options.afterCreate) {
+				options.afterCreate.call(self);
+			}
+		}
+		if (isDocumentDomain) {
+			self.iframe.bind('load', function(e) {
+				self.iframe.unbind('load');
+				if (_IE) {
+					ready();
+				} else {
+					setTimeout(ready, 0);
+				}
+			});
+		}
+		self.div.append(self.iframe);
+		self.div.append(self.textarea);
+		self.srcElement.hide();
+		!isDocumentDomain && ready();
+	},
+	setWidth : function(val) {
+		var self = this;
+		val = _addUnit(val);
+		self.width = val;
+		self.div.css('width', val);
+		return self;
+	},
+	setHeight : function(val) {
+		var self = this;
+		val = _addUnit(val);
+		self.height = val;
+		self.div.css('height', val);
+		self.iframe.css('height', val);
+		if ((_IE && _V < 8) || _QUIRKS) {
+			val = _addUnit(_removeUnit(val) - 2);
+		}
+		self.textarea.css('height', val);
+		return self;
+	},
+	remove : function() {
+		var self = this, doc = self.doc;
+		K(doc.body).unbind();
+		K(doc).unbind();
+		K(self.win).unbind();
+		if (self._mousedownHandler) {
+			K(document).unbind('mousedown', self._mousedownHandler);
+		}
+		_elementVal(self.srcElement, self.html());
+		self.srcElement.show();
+		doc.write('');
+		self.iframe.unbind();
+		self.textarea.unbind();
+		KEdit.parent.remove.call(self);
+	},
+	html : function(val, isFull) {
+		var self = this, doc = self.doc;
+		if (self.designMode) {
+			var body = doc.body;
+			if (val === undefined) {
+				if (isFull) {
+					val = '<!doctype html><html>' + body.parentNode.innerHTML + '</html>';
+				} else {
+					val = body.innerHTML;
+				}
+				if (self.beforeGetHtml) {
+					val = self.beforeGetHtml(val);
+				}
+				if (_GECKO && val == '<br />') {
+					val = '';
+				}
+				return val;
+			}
+			if (self.beforeSetHtml) {
+				val = self.beforeSetHtml(val);
+			}
+			if (_IE && _V >= 9) {
+				val = val.replace(/(<.*?checked=")checked(".*>)/ig, '$1$2');
+			}
+			K(body).html(val);
+			if (self.afterSetHtml) {
+				self.afterSetHtml();
+			}
+			return self;
+		}
+		if (val === undefined) {
+			return self.textarea.val();
+		}
+		self.textarea.val(val);
+		return self;
+	},
+	design : function(bool) {
+		var self = this, val;
+		if (bool === undefined ? !self.designMode : bool) {
+			if (!self.designMode) {
+				val = self.html();
+				self.designMode = true;
+				self.html(val);
+				self.textarea.hide();
+				self.iframe.show();
+			}
+		} else {
+			if (self.designMode) {
+				val = self.html();
+				self.designMode = false;
+				self.html(val);
+				self.iframe.hide();
+				self.textarea.show();
+			}
+		}
+		return self.focus();
+	},
+	focus : function() {
+		var self = this;
+		self.designMode ? self.win.focus() : self.textarea[0].focus();
+		return self;
+	},
+	blur : function() {
+		var self = this;
+		if (_IE) {
+			var input = K('<input type="text" style="float:left;width:0;height:0;padding:0;margin:0;border:0;" value="" />', self.div);
+			self.div.append(input);
+			input[0].focus();
+			input.remove();
+		} else {
+			self.designMode ? self.win.blur() : self.textarea[0].blur();
+		}
+		return self;
+	},
+	afterChange : function(fn) {
+		var self = this, doc = self.doc, body = doc.body;
+		K(doc).keyup(function(e) {
+			if (!e.ctrlKey && !e.altKey && _CHANGE_KEY_MAP[e.which]) {
+				fn(e);
+			}
+		});
+		K(doc).mouseup(fn).contextmenu(fn);
+		K(self.win).blur(fn);
+		function timeoutHandler(e) {
+			setTimeout(function() {
+				fn(e);
+			}, 1);
+		}
+		K(body).bind('paste', timeoutHandler);
+		K(body).bind('cut', timeoutHandler);
+		return self;
+	}
+});
+function _edit(options) {
+	return new KEdit(options);
+}
+K.EditClass = KEdit;
+K.edit = _edit;
+K.iframeDoc = _iframeDoc;
+function _selectToolbar(name, fn) {
+	var self = this,
+		knode = self.get(name);
+	if (knode) {
+		if (knode.hasClass('ke-disabled')) {
+			return;
+		}
+		fn(knode);
+	}
+}
+function KToolbar(options) {
+	this.init(options);
+}
+_extend(KToolbar, KWidget, {
+	init : function(options) {
+		var self = this;
+		KToolbar.parent.init.call(self, options);
+		self.disableMode = _undef(options.disableMode, false);
+		self.noDisableItemMap = _toMap(_undef(options.noDisableItems, []));
+		self._itemMap = {};
+		self.div.addClass('ke-toolbar').bind('contextmenu,mousedown,mousemove', function(e) {
+			e.preventDefault();
+		}).attr('unselectable', 'on');
+		function find(target) {
+			var knode = K(target);
+			if (knode.hasClass('ke-outline')) {
+				return knode;
+			}
+			if (knode.hasClass('ke-toolbar-icon')) {
+				return knode.parent();
+			}
+		}
+		function hover(e, method) {
+			var knode = find(e.target);
+			if (knode) {
+				if (knode.hasClass('ke-disabled')) {
+					return;
+				}
+				if (knode.hasClass('ke-selected')) {
+					return;
+				}
+				knode[method]('ke-on');
+			}
+		}
+		self.div.mouseover(function(e) {
+			hover(e, 'addClass');
+		})
+		.mouseout(function(e) {
+			hover(e, 'removeClass');
+		})
+		.click(function(e) {
+			var knode = find(e.target);
+			if (knode) {
+				if (knode.hasClass('ke-disabled')) {
+					return;
+				}
+				self.options.click.call(this, e, knode.attr('data-name'));
+			}
+		});
+	},
+	get : function(name) {
+		if (this._itemMap[name]) {
+			return this._itemMap[name];
+		}
+		return (this._itemMap[name] = K('span.ke-icon-' + name, this.div).parent());
+	},
+	select : function(name) {
+		_selectToolbar.call(this, name, function(knode) {
+			knode.addClass('ke-selected');
+		});
+		return self;
+	},
+	unselect : function(name) {
+		_selectToolbar.call(this, name, function(knode) {
+			knode.removeClass('ke-selected').removeClass('ke-on');
+		});
+		return self;
+	},
+	enable : function(name) {
+		var self = this,
+			knode = name.get ? name : self.get(name);
+		if (knode) {
+			knode.removeClass('ke-disabled');
+			knode.opacity(1);
+		}
+		return self;
+	},
+	disable : function(name) {
+		var self = this,
+			knode = name.get ? name : self.get(name);
+		if (knode) {
+			knode.removeClass('ke-selected').addClass('ke-disabled');
+			knode.opacity(0.5);
+		}
+		return self;
+	},
+	disableAll : function(bool, noDisableItems) {
+		var self = this, map = self.noDisableItemMap, item;
+		if (noDisableItems) {
+			map = _toMap(noDisableItems);
+		}
+		if (bool === undefined ? !self.disableMode : bool) {
+			K('span.ke-outline', self.div).each(function() {
+				var knode = K(this),
+					name = knode[0].getAttribute('data-name', 2);
+				if (!map[name]) {
+					self.disable(knode);
+				}
+			});
+			self.disableMode = true;
+		} else {
+			K('span.ke-outline', self.div).each(function() {
+				var knode = K(this),
+					name = knode[0].getAttribute('data-name', 2);
+				if (!map[name]) {
+					self.enable(knode);
+				}
+			});
+			self.disableMode = false;
+		}
+		return self;
+	}
+});
+function _toolbar(options) {
+	return new KToolbar(options);
+}
+K.ToolbarClass = KToolbar;
+K.toolbar = _toolbar;
+function KMenu(options) {
+	this.init(options);
+}
+_extend(KMenu, KWidget, {
+	init : function(options) {
+		var self = this;
+		options.z = options.z || 811213;
+		KMenu.parent.init.call(self, options);
+		self.centerLineMode = _undef(options.centerLineMode, true);
+		self.div.addClass('ke-menu').bind('click,mousedown', function(e){
+			e.stopPropagation();
+		}).attr('unselectable', 'on');
+	},
+	addItem : function(item) {
+		var self = this;
+		if (item.title === '-') {
+			self.div.append(K('<div class="ke-menu-separator"></div>'));
+			return;
+		}
+		var itemDiv = K('<div class="ke-menu-item" unselectable="on"></div>'),
+			leftDiv = K('<div class="ke-inline-block ke-menu-item-left"></div>'),
+			rightDiv = K('<div class="ke-inline-block ke-menu-item-right"></div>'),
+			height = _addUnit(item.height),
+			iconClass = _undef(item.iconClass, '');
+		self.div.append(itemDiv);
+		if (height) {
+			itemDiv.css('height', height);
+			rightDiv.css('line-height', height);
+		}
+		var centerDiv;
+		if (self.centerLineMode) {
+			centerDiv = K('<div class="ke-inline-block ke-menu-item-center"></div>');
+			if (height) {
+				centerDiv.css('height', height);
+			}
+		}
+		itemDiv.mouseover(function(e) {
+			K(this).addClass('ke-menu-item-on');
+			if (centerDiv) {
+				centerDiv.addClass('ke-menu-item-center-on');
+			}
+		})
+		.mouseout(function(e) {
+			K(this).removeClass('ke-menu-item-on');
+			if (centerDiv) {
+				centerDiv.removeClass('ke-menu-item-center-on');
+			}
+		})
+		.click(function(e) {
+			item.click.call(K(this));
+			e.stopPropagation();
+		})
+		.append(leftDiv);
+		if (centerDiv) {
+			itemDiv.append(centerDiv);
+		}
+		itemDiv.append(rightDiv);
+		if (item.checked) {
+			iconClass = 'ke-icon-checked';
+		}
+		if (iconClass !== '') {
+			leftDiv.html('<span class="ke-inline-block ke-toolbar-icon ke-toolbar-icon-url ' + iconClass + '"></span>');
+		}
+		rightDiv.html(item.title);
+		return self;
+	},
+	remove : function() {
+		var self = this;
+		if (self.options.beforeRemove) {
+			self.options.beforeRemove.call(self);
+		}
+		K('.ke-menu-item', self.div[0]).unbind();
+		KMenu.parent.remove.call(self);
+		return self;
+	}
+});
+function _menu(options) {
+	return new KMenu(options);
+}
+K.MenuClass = KMenu;
+K.menu = _menu;
+function KColorPicker(options) {
+	this.init(options);
+}
+_extend(KColorPicker, KWidget, {
+	init : function(options) {
+		var self = this;
+		options.z = options.z || 811213;
+		KColorPicker.parent.init.call(self, options);
+		var colors = options.colors || [
+			['#E53333', '#E56600', '#FF9900', '#64451D', '#DFC5A4', '#FFE500'],
+			['#009900', '#006600', '#99BB00', '#B8D100', '#60D978', '#00D5FF'],
+			['#337FE5', '#003399', '#4C33E5', '#9933E5', '#CC33E5', '#EE33EE'],
+			['#FFFFFF', '#CCCCCC', '#999999', '#666666', '#333333', '#000000']
+		];
+		self.selectedColor = (options.selectedColor || '').toLowerCase();
+		self._cells = [];
+		self.div.addClass('ke-colorpicker').bind('click,mousedown', function(e){
+			e.stopPropagation();
+		}).attr('unselectable', 'on');
+		var table = self.doc.createElement('table');
+		self.div.append(table);
+		table.className = 'ke-colorpicker-table';
+		table.cellPadding = 0;
+		table.cellSpacing = 0;
+		table.border = 0;
+		var row = table.insertRow(0), cell = row.insertCell(0);
+		cell.colSpan = colors[0].length;
+		self._addAttr(cell, '', 'ke-colorpicker-cell-top');
+		for (var i = 0; i < colors.length; i++) {
+			row = table.insertRow(i + 1);
+			for (var j = 0; j < colors[i].length; j++) {
+				cell = row.insertCell(j);
+				self._addAttr(cell, colors[i][j], 'ke-colorpicker-cell');
+			}
+		}
+	},
+	_addAttr : function(cell, color, cls) {
+		var self = this;
+		cell = K(cell).addClass(cls);
+		if (self.selectedColor === color.toLowerCase()) {
+			cell.addClass('ke-colorpicker-cell-selected');
+		}
+		cell.attr('title', color || self.options.noColor);
+		cell.mouseover(function(e) {
+			K(this).addClass('ke-colorpicker-cell-on');
+		});
+		cell.mouseout(function(e) {
+			K(this).removeClass('ke-colorpicker-cell-on');
+		});
+		cell.click(function(e) {
+			e.stop();
+			self.options.click.call(K(this), color);
+		});
+		if (color) {
+			cell.append(K('<div class="ke-colorpicker-cell-color" unselectable="on"></div>').css('background-color', color));
+		} else {
+			cell.html(self.options.noColor);
+		}
+		K(cell).attr('unselectable', 'on');
+		self._cells.push(cell);
+	},
+	remove : function() {
+		var self = this;
+		_each(self._cells, function() {
+			this.unbind();
+		});
+		KColorPicker.parent.remove.call(self);
+		return self;
+	}
+});
+function _colorpicker(options) {
+	return new KColorPicker(options);
+}
+K.ColorPickerClass = KColorPicker;
+K.colorpicker = _colorpicker;
+function KUploadButton(options) {
+	this.init(options);
+}
+_extend(KUploadButton, {
+	init : function(options) {
+		var self = this,
+			button = K(options.button),
+			fieldName = options.fieldName || 'file',
+			url = options.url || '',
+			title = button.val(),
+			extraParams = options.extraParams || {},
+			cls = button[0].className || '',
+			target = options.target || 'kindeditor_upload_iframe_' + new Date().getTime();
+		options.afterError = options.afterError || function(str) {
+			alert(str);
+		};
+		var hiddenElements = [];
+		for(var k in extraParams){
+			hiddenElements.push('<input type="hidden" name="' + k + '" value="' + extraParams[k] + '" />');
+		}
+		var html = [
+			'<div class="ke-inline-block ' + cls + '">',
+			(options.target ? '' : '<iframe name="' + target + '" style="display:none;"></iframe>'),
+			(options.form ? '<div class="ke-upload-area">' : '<form class="ke-upload-area ke-form" method="post" enctype="multipart/form-data" target="' + target + '" action="' + url + '">'),
+			'<span class="ke-button-common">',
+			hiddenElements.join(''),
+			'<input type="button" class="ke-button-common ke-button" value="' + title + '" />',
+			'</span>',
+			'<input type="file" class="ke-upload-file" name="' + fieldName + '" tabindex="-1" />',
+			(options.form ? '</div>' : '</form>'),
+			'</div>'].join('');
+		var div = K(html, button.doc);
+		button.hide();
+		button.before(div);
+		self.div = div;
+		self.button = button;
+		self.iframe = options.target ? K('iframe[name="' + target + '"]') : K('iframe', div);
+		self.form = options.form ? K(options.form) : K('form', div);
+		self.fileBox = K('.ke-upload-file', div);
+		var width = options.width || K('.ke-button-common', div).width();
+		K('.ke-upload-area', div).width(width);
+		self.options = options;
+	},
+	submit : function() {
+		var self = this,
+			iframe = self.iframe;
+		iframe.bind('load', function() {
+			iframe.unbind();
+			var tempForm = document.createElement('form');
+			self.fileBox.before(tempForm);
+			K(tempForm).append(self.fileBox);
+			tempForm.reset();
+			K(tempForm).remove(true);
+			var doc = K.iframeDoc(iframe),
+				pre = doc.getElementsByTagName('pre')[0],
+				str = '', data;
+			if (pre) {
+				str = pre.innerHTML;
+			} else {
+				str = doc.body.innerHTML;
+			}
+			str = _unescape(str);
+			iframe[0].src = 'javascript:false';
+			try {
+				data = K.json(str);
+			} catch (e) {
+				self.options.afterError.call(self, '<!doctype html><html>' + doc.body.parentNode.innerHTML + '</html>');
+			}
+			if (data) {
+				self.options.afterUpload.call(self, data);
+			}
+		});
+		self.form[0].submit();
+		return self;
+	},
+	remove : function() {
+		var self = this;
+		if (self.fileBox) {
+			self.fileBox.unbind();
+		}
+		self.iframe.remove();
+		self.div.remove();
+		self.button.show();
+		return self;
+	}
+});
+function _uploadbutton(options) {
+	return new KUploadButton(options);
+}
+K.UploadButtonClass = KUploadButton;
+K.uploadbutton = _uploadbutton;
+function _createButton(arg) {
+	arg = arg || {};
+	var name = arg.name || '',
+		span = K('<span class="ke-button-common ke-button-outer" title="' + name + '"></span>'),
+		btn = K('<input class="ke-button-common ke-button" type="button" value="' + name + '" />');
+	if (arg.click) {
+		btn.click(arg.click);
+	}
+	span.append(btn);
+	return span;
+}
+function KDialog(options) {
+	this.init(options);
+}
+_extend(KDialog, KWidget, {
+	init : function(options) {
+		var self = this;
+		var shadowMode = _undef(options.shadowMode, true);
+		options.z = options.z || 811213;
+		options.shadowMode = false;
+		options.autoScroll = _undef(options.autoScroll, true);
+		KDialog.parent.init.call(self, options);
+		var title = options.title,
+			body = K(options.body, self.doc),
+			previewBtn = options.previewBtn,
+			yesBtn = options.yesBtn,
+			noBtn = options.noBtn,
+			closeBtn = options.closeBtn,
+			showMask = _undef(options.showMask, true);
+		self.div.addClass('ke-dialog').bind('click,mousedown', function(e){
+			e.stopPropagation();
+		});
+		var contentDiv = K('<div class="ke-dialog-content"></div>').appendTo(self.div);
+		if (_IE && _V < 7) {
+			self.iframeMask = K('<iframe src="about:blank" class="ke-dialog-shadow"></iframe>').appendTo(self.div);
+		} else if (shadowMode) {
+			K('<div class="ke-dialog-shadow"></div>').appendTo(self.div);
+		}
+		var headerDiv = K('<div class="ke-dialog-header"></div>');
+		contentDiv.append(headerDiv);
+		headerDiv.html(title);
+		self.closeIcon = K('<span class="ke-dialog-icon-close" title="' + closeBtn.name + '"></span>').click(closeBtn.click);
+		headerDiv.append(self.closeIcon);
+		self.draggable({
+			clickEl : headerDiv,
+			beforeDrag : options.beforeDrag
+		});
+		var bodyDiv = K('<div class="ke-dialog-body"></div>');
+		contentDiv.append(bodyDiv);
+		bodyDiv.append(body);
+		var footerDiv = K('<div class="ke-dialog-footer"></div>');
+		if (previewBtn || yesBtn || noBtn) {
+			contentDiv.append(footerDiv);
+		}
+		_each([
+			{ btn : previewBtn, name : 'preview' },
+			{ btn : yesBtn, name : 'yes' },
+			{ btn : noBtn, name : 'no' }
+		], function() {
+			if (this.btn) {
+				var button = _createButton(this.btn);
+				button.addClass('ke-dialog-' + this.name);
+				footerDiv.append(button);
+			}
+		});
+		if (self.height) {
+			bodyDiv.height(_removeUnit(self.height) - headerDiv.height() - footerDiv.height());
+		}
+		self.div.width(self.div.width());
+		self.div.height(self.div.height());
+		self.mask = null;
+		if (showMask) {
+			var docEl = _docElement(self.doc),
+				docWidth = Math.max(docEl.scrollWidth, docEl.clientWidth),
+				docHeight = Math.max(docEl.scrollHeight, docEl.clientHeight);
+			self.mask = _widget({
+				x : 0,
+				y : 0,
+				z : self.z - 1,
+				cls : 'ke-dialog-mask',
+				width : docWidth,
+				height : docHeight
+			});
+		}
+		self.autoPos(self.div.width(), self.div.height());
+		self.footerDiv = footerDiv;
+		self.bodyDiv = bodyDiv;
+		self.headerDiv = headerDiv;
+		self.isLoading = false;
+	},
+	setMaskIndex : function(z) {
+		var self = this;
+		self.mask.div.css('z-index', z);
+	},
+	showLoading : function(msg) {
+		msg = _undef(msg, '');
+		var self = this, body = self.bodyDiv;
+		self.loading = K('<div class="ke-dialog-loading"><div class="ke-inline-block ke-dialog-loading-content" style="margin-top:' + Math.round(body.height() / 3) + 'px;">' + msg + '</div></div>')
+			.width(body.width()).height(body.height())
+			.css('top', self.headerDiv.height() + 'px');
+		body.css('visibility', 'hidden').after(self.loading);
+		self.isLoading = true;
+		return self;
+	},
+	hideLoading : function() {
+		this.loading && this.loading.remove();
+		this.bodyDiv.css('visibility', 'visible');
+		this.isLoading = false;
+		return this;
+	},
+	remove : function() {
+		var self = this;
+		if (self.options.beforeRemove) {
+			self.options.beforeRemove.call(self);
+		}
+		self.mask && self.mask.remove();
+		self.iframeMask && self.iframeMask.remove();
+		self.closeIcon.unbind();
+		K('input', self.div).unbind();
+		K('button', self.div).unbind();
+		self.footerDiv.unbind();
+		self.bodyDiv.unbind();
+		self.headerDiv.unbind();
+		K('iframe', self.div).each(function() {
+			K(this).remove();
+		});
+		KDialog.parent.remove.call(self);
+		return self;
+	}
+});
+function _dialog(options) {
+	return new KDialog(options);
+}
+K.DialogClass = KDialog;
+K.dialog = _dialog;
+function _tabs(options) {
+	var self = _widget(options),
+		remove = self.remove,
+		afterSelect = options.afterSelect,
+		div = self.div,
+		liList = [];
+	div.addClass('ke-tabs')
+		.bind('contextmenu,mousedown,mousemove', function(e) {
+			e.preventDefault();
+		});
+	var ul = K('<ul class="ke-tabs-ul ke-clearfix"></ul>');
+	div.append(ul);
+	self.add = function(tab) {
+		var li = K('<li class="ke-tabs-li">' + tab.title + '</li>');
+		li.data('tab', tab);
+		liList.push(li);
+		ul.append(li);
+	};
+	self.selectedIndex = 0;
+	self.select = function(index) {
+		self.selectedIndex = index;
+		_each(liList, function(i, li) {
+			li.unbind();
+			if (i === index) {
+				li.addClass('ke-tabs-li-selected');
+				K(li.data('tab').panel).show('');
+			} else {
+				li.removeClass('ke-tabs-li-selected').removeClass('ke-tabs-li-on')
+				.mouseover(function() {
+					K(this).addClass('ke-tabs-li-on');
+				})
+				.mouseout(function() {
+					K(this).removeClass('ke-tabs-li-on');
+				})
+				.click(function() {
+					self.select(i);
+				});
+				K(li.data('tab').panel).hide();
+			}
+		});
+		if (afterSelect) {
+			afterSelect.call(self, index);
+		}
+	};
+	self.remove = function() {
+		_each(liList, function() {
+			this.remove();
+		});
+		ul.remove();
+		remove.call(self);
+	};
+	return self;
+}
+K.tabs = _tabs;
+function _loadScript(url, fn) {
+	var head = document.getElementsByTagName('head')[0] || (_QUIRKS ? document.body : document.documentElement),
+		script = document.createElement('script');
+	head.appendChild(script);
+	script.src = url;
+	script.charset = 'utf-8';
+	script.onload = script.onreadystatechange = function() {
+		if (!this.readyState || this.readyState === 'loaded') {
+			if (fn) {
+				fn();
+			}
+			script.onload = script.onreadystatechange = null;
+			head.removeChild(script);
+		}
+	};
+}
+function _chopQuery(url) {
+	var index = url.indexOf('?');
+	return index > 0 ? url.substr(0, index) : url;
+}
+function _loadStyle(url) {
+	var head = document.getElementsByTagName('head')[0] || (_QUIRKS ? document.body : document.documentElement),
+		link = document.createElement('link'),
+		absoluteUrl = _chopQuery(_formatUrl(url, 'absolute'));
+	var links = K('link[rel="stylesheet"]', head);
+	for (var i = 0, len = links.length; i < len; i++) {
+		if (_chopQuery(_formatUrl(links[i].href, 'absolute')) === absoluteUrl) {
+			return;
+		}
+	}
+	head.appendChild(link);
+	link.href = url;
+	link.rel = 'stylesheet';
+}
+function _ajax(url, fn, method, param, dataType) {
+	method = method || 'GET';
+	dataType = dataType || 'json';
+	var xhr = window.XMLHttpRequest ? new window.XMLHttpRequest() : new ActiveXObject('Microsoft.XMLHTTP');
+	xhr.open(method, url, true);
+	xhr.onreadystatechange = function () {
+		if (xhr.readyState == 4 && xhr.status == 200) {
+			if (fn) {
+				var data = _trim(xhr.responseText);
+				if (dataType == 'json') {
+					data = _json(data);
+				}
+				fn(data);
+			}
+		}
+	};
+	if (method == 'POST') {
+		var params = [];
+		_each(param, function(key, val) {
+			params.push(encodeURIComponent(key) + '=' + encodeURIComponent(val));
+		});
+		try {
+			xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
+		} catch (e) {}
+		xhr.send(params.join('&'));
+	} else {
+		xhr.send(null);
+	}
+}
+K.loadScript = _loadScript;
+K.loadStyle = _loadStyle;
+K.ajax = _ajax;
+var _plugins = {};
+function _plugin(name, fn) {
+	if (name === undefined) {
+		return _plugins;
+	}
+	if (!fn) {
+		return _plugins[name];
+	}
+	_plugins[name] = fn;
+}
+var _language = {};
+function _parseLangKey(key) {
+	var match, ns = 'core';
+	if ((match = /^(\w+)\.(\w+)$/.exec(key))) {
+		ns = match[1];
+		key = match[2];
+	}
+	return { ns : ns, key : key };
+}
+function _lang(mixed, langType) {
+	langType = langType === undefined ? K.options.langType : langType;
+	if (typeof mixed === 'string') {
+		if (!_language[langType]) {
+			return 'no language';
+		}
+		var pos = mixed.length - 1;
+		if (mixed.substr(pos) === '.') {
+			return _language[langType][mixed.substr(0, pos)];
+		}
+		var obj = _parseLangKey(mixed);
+		return _language[langType][obj.ns][obj.key];
+	}
+	_each(mixed, function(key, val) {
+		var obj = _parseLangKey(key);
+		if (!_language[langType]) {
+			_language[langType] = {};
+		}
+		if (!_language[langType][obj.ns]) {
+			_language[langType][obj.ns] = {};
+		}
+		_language[langType][obj.ns][obj.key] = val;
+	});
+}
+function _getImageFromRange(range, fn) {
+	if (range.collapsed) {
+		return;
+	}
+	range = range.cloneRange().up();
+	var sc = range.startContainer, so = range.startOffset;
+	if (!_WEBKIT && !range.isControl()) {
+		return;
+	}
+	var img = K(sc.childNodes[so]);
+	if (!img || img.name != 'img') {
+		return;
+	}
+	if (fn(img)) {
+		return img;
+	}
+}
+function _bindContextmenuEvent() {
+	var self = this, doc = self.edit.doc;
+	K(doc).contextmenu(function(e) {
+		if (self.menu) {
+			self.hideMenu();
+		}
+		if (!self.useContextmenu) {
+			e.preventDefault();
+			return;
+		}
+		if (self._contextmenus.length === 0) {
+			return;
+		}
+		var maxWidth = 0, items = [];
+		_each(self._contextmenus, function() {
+			if (this.title == '-') {
+				items.push(this);
+				return;
+			}
+			if (this.cond && this.cond()) {
+				items.push(this);
+				if (this.width && this.width > maxWidth) {
+					maxWidth = this.width;
+				}
+			}
+		});
+		while (items.length > 0 && items[0].title == '-') {
+			items.shift();
+		}
+		while (items.length > 0 && items[items.length - 1].title == '-') {
+			items.pop();
+		}
+		var prevItem = null;
+		_each(items, function(i) {
+			if (this.title == '-' && prevItem.title == '-') {
+				delete items[i];
+			}
+			prevItem = this;
+		});
+		if (items.length > 0) {
+			e.preventDefault();
+			var pos = K(self.edit.iframe).pos(),
+				menu = _menu({
+					x : pos.x + e.clientX,
+					y : pos.y + e.clientY,
+					width : maxWidth,
+					css : { visibility: 'hidden' },
+					shadowMode : self.shadowMode
+				});
+			_each(items, function() {
+				if (this.title) {
+					menu.addItem(this);
+				}
+			});
+			var docEl = _docElement(menu.doc),
+				menuHeight = menu.div.height();
+			if (e.clientY + menuHeight >= docEl.clientHeight - 100) {
+				menu.pos(menu.x, _removeUnit(menu.y) - menuHeight);
+			}
+			menu.div.css('visibility', 'visible');
+			self.menu = menu;
+		}
+	});
+}
+function _bindNewlineEvent() {
+	var self = this, doc = self.edit.doc, newlineTag = self.newlineTag;
+	if (_IE && newlineTag !== 'br') {
+		return;
+	}
+	if (_GECKO && _V < 3 && newlineTag !== 'p') {
+		return;
+	}
+	if (_OPERA && _V < 9) {
+		return;
+	}
+	var brSkipTagMap = _toMap('h1,h2,h3,h4,h5,h6,pre,li'),
+		pSkipTagMap = _toMap('p,h1,h2,h3,h4,h5,h6,pre,li,blockquote');
+	function getAncestorTagName(range) {
+		var ancestor = K(range.commonAncestor());
+		while (ancestor) {
+			if (ancestor.type == 1 && !ancestor.isStyle()) {
+				break;
+			}
+			ancestor = ancestor.parent();
+		}
+		return ancestor.name;
+	}
+	K(doc).keydown(function(e) {
+		if (e.which != 13 || e.shiftKey || e.ctrlKey || e.altKey) {
+			return;
+		}
+		self.cmd.selection();
+		var tagName = getAncestorTagName(self.cmd.range);
+		if (tagName == 'marquee' || tagName == 'select') {
+			return;
+		}
+		if (newlineTag === 'br' && !brSkipTagMap[tagName]) {
+			e.preventDefault();
+			self.insertHtml('<br />' + (_IE && _V < 9 ? '' : '\u200B'));
+			return;
+		}
+		if (!pSkipTagMap[tagName]) {
+			_nativeCommand(doc, 'formatblock', '<p>');
+		}
+	});
+	K(doc).keyup(function(e) {
+		if (e.which != 13 || e.shiftKey || e.ctrlKey || e.altKey) {
+			return;
+		}
+		if (newlineTag == 'br') {
+			return;
+		}
+		if (_GECKO) {
+			var root = self.cmd.commonAncestor('p');
+			var a = self.cmd.commonAncestor('a');
+			if (a && a.text() == '') {
+				a.remove(true);
+				self.cmd.range.selectNodeContents(root[0]).collapse(true);
+				self.cmd.select();
+			}
+			return;
+		}
+		self.cmd.selection();
+		var tagName = getAncestorTagName(self.cmd.range);
+		if (tagName == 'marquee' || tagName == 'select') {
+			return;
+		}
+		if (!pSkipTagMap[tagName]) {
+			_nativeCommand(doc, 'formatblock', '<p>');
+		}
+		var div = self.cmd.commonAncestor('div');
+		if (div) {
+			var p = K('<p></p>'),
+				child = div[0].firstChild;
+			while (child) {
+				var next = child.nextSibling;
+				p.append(child);
+				child = next;
+			}
+			div.before(p);
+			div.remove();
+			self.cmd.range.selectNodeContents(p[0]);
+			self.cmd.select();
+		}
+	});
+}
+function _bindTabEvent() {
+	var self = this, doc = self.edit.doc;
+	K(doc).keydown(function(e) {
+		if (e.which == 9) {
+			e.preventDefault();
+			if (self.afterTab) {
+				self.afterTab.call(self, e);
+				return;
+			}
+			var cmd = self.cmd, range = cmd.range;
+			range.shrink();
+			if (range.collapsed && range.startContainer.nodeType == 1) {
+				range.insertNode(K('@&nbsp;', doc)[0]);
+				cmd.select();
+			}
+			self.insertHtml('&nbsp;&nbsp;&nbsp;&nbsp;');
+		}
+	});
+}
+function _bindFocusEvent() {
+	var self = this;
+	K(self.edit.textarea[0], self.edit.win).focus(function(e) {
+		if (self.afterFocus) {
+			self.afterFocus.call(self, e);
+		}
+	}).blur(function(e) {
+		if (self.afterBlur) {
+			self.afterBlur.call(self, e);
+		}
+	});
+}
+function _removeBookmarkTag(html) {
+	return _trim(html.replace(/<span [^>]*id="?__kindeditor_bookmark_\w+_\d+__"?[^>]*><\/span>/ig, ''));
+}
+function _removeTempTag(html) {
+	return html.replace(/<div[^>]+class="?__kindeditor_paste__"?[^>]*>[\s\S]*?<\/div>/ig, '');
+}
+function _addBookmarkToStack(stack, bookmark) {
+	if (stack.length === 0) {
+		stack.push(bookmark);
+		return;
+	}
+	var prev = stack[stack.length - 1];
+	if (_removeBookmarkTag(bookmark.html) !== _removeBookmarkTag(prev.html)) {
+		stack.push(bookmark);
+	}
+}
+function _undoToRedo(fromStack, toStack) {
+	var self = this, edit = self.edit,
+		body = edit.doc.body,
+		range, bookmark;
+	if (fromStack.length === 0) {
+		return self;
+	}
+	if (edit.designMode) {
+		range = self.cmd.range;
+		bookmark = range.createBookmark(true);
+		bookmark.html = body.innerHTML;
+	} else {
+		bookmark = {
+			html : body.innerHTML
+		};
+	}
+	_addBookmarkToStack(toStack, bookmark);
+	var prev = fromStack.pop();
+	if (_removeBookmarkTag(bookmark.html) === _removeBookmarkTag(prev.html) && fromStack.length > 0) {
+		prev = fromStack.pop();
+	}
+	if (edit.designMode) {
+		edit.html(prev.html);
+		if (prev.start) {
+			range.moveToBookmark(prev);
+			self.select();
+		}
+	} else {
+		K(body).html(_removeBookmarkTag(prev.html));
+	}
+	return self;
+}
+function KEditor(options) {
+	var self = this;
+	self.options = {};
+	function setOption(key, val) {
+		if (KEditor.prototype[key] === undefined) {
+			self[key] = val;
+		}
+		self.options[key] = val;
+	}
+	_each(options, function(key, val) {
+		setOption(key, options[key]);
+	});
+	_each(K.options, function(key, val) {
+		if (self[key] === undefined) {
+			setOption(key, val);
+		}
+	});
+	var se = K(self.srcElement || '<textarea/>');
+	if (!self.width) {
+		self.width = se[0].style.width || se.width();
+	}
+	if (!self.height) {
+		self.height = se[0].style.height || se.height();
+	}
+	setOption('width', _undef(self.width, self.minWidth));
+	setOption('height', _undef(self.height, self.minHeight));
+	setOption('width', _addUnit(self.width));
+	setOption('height', _addUnit(self.height));
+	if (_MOBILE && (!_IOS || _V < 534)) {
+		self.designMode = false;
+	}
+	self.srcElement = se;
+	self.initContent = '';
+	self.plugin = {};
+	self.isCreated = false;
+	self._handlers = {};
+	self._contextmenus = [];
+	self._undoStack = [];
+	self._redoStack = [];
+	self._firstAddBookmark = true;
+	self.menu = self.contextmenu = null;
+	self.dialogs = [];
+}
+KEditor.prototype = {
+	lang : function(mixed) {
+		return _lang(mixed, this.langType);
+	},
+	loadPlugin : function(name, fn) {
+		var self = this;
+		if (_plugins[name]) {
+			if (!_isFunction(_plugins[name])) {
+				setTimeout(function() {
+					self.loadPlugin(name, fn);
+				}, 100);
+				return self;
+			}
+			_plugins[name].call(self, KindEditor);
+			if (fn) {
+				fn.call(self);
+			}
+			return self;
+		}
+		_plugins[name] = 'loading';
+		_loadScript(self.pluginsPath + name + '/' + name + '.js?ver=' + encodeURIComponent(K.DEBUG ? _TIME : _VERSION), function() {
+			setTimeout(function() {
+				if (_plugins[name]) {
+					self.loadPlugin(name, fn);
+				}
+			}, 0);
+		});
+		return self;
+	},
+	handler : function(key, fn) {
+		var self = this;
+		if (!self._handlers[key]) {
+			self._handlers[key] = [];
+		}
+		if (_isFunction(fn)) {
+			self._handlers[key].push(fn);
+			return self;
+		}
+		_each(self._handlers[key], function() {
+			fn = this.call(self, fn);
+		});
+		return fn;
+	},
+	clickToolbar : function(name, fn) {
+		var self = this, key = 'clickToolbar' + name;
+		if (fn === undefined) {
+			if (self._handlers[key]) {
+				return self.handler(key);
+			}
+			self.loadPlugin(name, function() {
+				self.handler(key);
+			});
+			return self;
+		}
+		return self.handler(key, fn);
+	},
+	updateState : function() {
+		var self = this;
+		_each(('justifyleft,justifycenter,justifyright,justifyfull,insertorderedlist,insertunorderedlist,' +
+			'subscript,superscript,bold,italic,underline,strikethrough').split(','), function(i, name) {
+			self.cmd.state(name) ? self.toolbar.select(name) : self.toolbar.unselect(name);
+		});
+		return self;
+	},
+	addContextmenu : function(item) {
+		this._contextmenus.push(item);
+		return this;
+	},
+	afterCreate : function(fn) {
+		return this.handler('afterCreate', fn);
+	},
+	beforeRemove : function(fn) {
+		return this.handler('beforeRemove', fn);
+	},
+	beforeGetHtml : function(fn) {
+		return this.handler('beforeGetHtml', fn);
+	},
+	beforeSetHtml : function(fn) {
+		return this.handler('beforeSetHtml', fn);
+	},
+	afterSetHtml : function(fn) {
+		return this.handler('afterSetHtml', fn);
+	},
+	create : function() {
+		var self = this, fullscreenMode = self.fullscreenMode;
+		if (self.isCreated) {
+			return self;
+		}
+		if (self.srcElement.data('kindeditor')) {
+			return self;
+		}
+		self.srcElement.data('kindeditor', 'true');
+		if (fullscreenMode) {
+			_docElement().style.overflow = 'hidden';
+		} else {
+			_docElement().style.overflow = '';
+		}
+		var width = fullscreenMode ? _docElement().clientWidth + 'px' : self.width,
+			height = fullscreenMode ? _docElement().clientHeight + 'px' : self.height;
+		if ((_IE && _V < 8) || _QUIRKS) {
+			height = _addUnit(_removeUnit(height) + 2);
+		}
+		var container = self.container = K(self.layout);
+		if (fullscreenMode) {
+			K(document.body).append(container);
+		} else {
+			self.srcElement.before(container);
+		}
+		var toolbarDiv = K('.toolbar', container),
+			editDiv = K('.edit', container),
+			statusbar = self.statusbar = K('.statusbar', container);
+		container.removeClass('container')
+			.addClass('ke-container ke-container-' + self.themeType).css('width', width);
+		if (fullscreenMode) {
+			container.css({
+				position : 'absolute',
+				left : 0,
+				top : 0,
+				'z-index' : 811211
+			});
+			if (!_GECKO) {
+				self._scrollPos = _getScrollPos();
+			}
+			window.scrollTo(0, 0);
+			K(document.body).css({
+				'height' : '1px',
+				'overflow' : 'hidden'
+			});
+			K(document.body.parentNode).css('overflow', 'hidden');
+			self._fullscreenExecuted = true;
+		} else {
+			if (self._fullscreenExecuted) {
+				K(document.body).css({
+					'height' : '',
+					'overflow' : ''
+				});
+				K(document.body.parentNode).css('overflow', '');
+			}
+			if (self._scrollPos) {
+				window.scrollTo(self._scrollPos.x, self._scrollPos.y);
+			}
+		}
+		var htmlList = [];
+		K.each(self.items, function(i, name) {
+			if (name == '|') {
+				htmlList.push('<span class="ke-inline-block ke-separator"></span>');
+			} else if (name == '/') {
+				htmlList.push('<div class="ke-hr"></div>');
+			} else {
+				htmlList.push('<span class="ke-outline" data-name="' + name + '" title="' + self.lang(name) + '" unselectable="on">');
+				htmlList.push('<span class="ke-toolbar-icon ke-toolbar-icon-url ke-icon-' + name + '" unselectable="on"></span></span>');
+			}
+		});
+		var toolbar = self.toolbar = _toolbar({
+			src : toolbarDiv,
+			html : htmlList.join(''),
+			noDisableItems : self.noDisableItems,
+			click : function(e, name) {
+				e.stop();
+				if (self.menu) {
+					var menuName = self.menu.name;
+					self.hideMenu();
+					if (menuName === name) {
+						return;
+					}
+				}
+				self.clickToolbar(name);
+			}
+		});
+		var editHeight = _removeUnit(height) - toolbar.div.height();
+		var edit = self.edit = _edit({
+			height : editHeight > 0 && _removeUnit(height) > self.minHeight ? editHeight : self.minHeight,
+			src : editDiv,
+			srcElement : self.srcElement,
+			designMode : self.designMode,
+			themesPath : self.themesPath,
+			bodyClass : self.bodyClass,
+			cssPath : self.cssPath,
+			cssData : self.cssData,
+			beforeGetHtml : function(html) {
+				html = self.beforeGetHtml(html);
+				html = _removeBookmarkTag(_removeTempTag(html));
+				return _formatHtml(html, self.filterMode ? self.htmlTags : null, self.urlType, self.wellFormatMode, self.indentChar);
+			},
+			beforeSetHtml : function(html) {
+				html = _formatHtml(html, self.filterMode ? self.htmlTags : null, '', false);
+				return self.beforeSetHtml(html);
+			},
+			afterSetHtml : function() {
+				self.edit = edit = this;
+				self.afterSetHtml();
+			},
+			afterCreate : function() {
+				self.edit = edit = this;
+				self.cmd = edit.cmd;
+				self._docMousedownFn = function(e) {
+					if (self.menu) {
+						self.hideMenu();
+					}
+				};
+				K(edit.doc, document).mousedown(self._docMousedownFn);
+				_bindContextmenuEvent.call(self);
+				_bindNewlineEvent.call(self);
+				_bindTabEvent.call(self);
+				_bindFocusEvent.call(self);
+				edit.afterChange(function(e) {
+					if (!edit.designMode) {
+						return;
+					}
+					self.updateState();
+					self.addBookmark();
+					if (self.options.afterChange) {
+						self.options.afterChange.call(self);
+					}
+				});
+				edit.textarea.keyup(function(e) {
+					if (!e.ctrlKey && !e.altKey && _INPUT_KEY_MAP[e.which]) {
+						if (self.options.afterChange) {
+							self.options.afterChange.call(self);
+						}
+					}
+				});
+				if (self.readonlyMode) {
+					self.readonly();
+				}
+				self.isCreated = true;
+				if (self.initContent === '') {
+					self.initContent = self.html();
+				}
+				if (self._undoStack.length > 0) {
+					var prev = self._undoStack.pop();
+					if (prev.start) {
+						self.html(prev.html);
+						edit.cmd.range.moveToBookmark(prev);
+						self.select();
+					}
+				}
+				self.afterCreate();
+				if (self.options.afterCreate) {
+					self.options.afterCreate.call(self);
+				}
+			}
+		});
+		statusbar.removeClass('statusbar').addClass('ke-statusbar')
+			.append('<span class="ke-inline-block ke-statusbar-center-icon"></span>')
+			.append('<span class="ke-inline-block ke-statusbar-right-icon"></span>');
+		if (self._fullscreenResizeHandler) {
+			K(window).unbind('resize', self._fullscreenResizeHandler);
+			self._fullscreenResizeHandler = null;
+		}
+		function initResize() {
+			if (statusbar.height() === 0) {
+				setTimeout(initResize, 100);
+				return;
+			}
+			self.resize(width, height, false);
+		}
+		initResize();
+		if (fullscreenMode) {
+			self._fullscreenResizeHandler = function(e) {
+				if (self.isCreated) {
+					self.resize(_docElement().clientWidth, _docElement().clientHeight, false);
+				}
+			};
+			K(window).bind('resize', self._fullscreenResizeHandler);
+			toolbar.select('fullscreen');
+			statusbar.first().css('visibility', 'hidden');
+			statusbar.last().css('visibility', 'hidden');
+		} else {
+			if (_GECKO) {
+				K(window).bind('scroll', function(e) {
+					self._scrollPos = _getScrollPos();
+				});
+			}
+			if (self.resizeType > 0) {
+				_drag({
+					moveEl : container,
+					clickEl : statusbar,
+					moveFn : function(x, y, width, height, diffX, diffY) {
+						height += diffY;
+						self.resize(null, height);
+					}
+				});
+			} else {
+				statusbar.first().css('visibility', 'hidden');
+			}
+			if (self.resizeType === 2) {
+				_drag({
+					moveEl : container,
+					clickEl : statusbar.last(),
+					moveFn : function(x, y, width, height, diffX, diffY) {
+						width += diffX;
+						height += diffY;
+						self.resize(width, height);
+					}
+				});
+			} else {
+				statusbar.last().css('visibility', 'hidden');
+			}
+		}
+		return self;
+	},
+	remove : function() {
+		var self = this;
+		if (!self.isCreated) {
+			return self;
+		}
+		self.beforeRemove();
+		self.srcElement.data('kindeditor', '');
+		if (self.menu) {
+			self.hideMenu();
+		}
+		_each(self.dialogs, function() {
+			self.hideDialog();
+		});
+		K(document).unbind('mousedown', self._docMousedownFn);
+		self.toolbar.remove();
+		self.edit.remove();
+		self.statusbar.last().unbind();
+		self.statusbar.unbind();
+		self.container.remove();
+		self.container = self.toolbar = self.edit = self.menu = null;
+		self.dialogs = [];
+		self.isCreated = false;
+		return self;
+	},
+	resize : function(width, height, updateProp) {
+		var self = this;
+		updateProp = _undef(updateProp, true);
+		if (width) {
+			if (!/%/.test(width)) {
+				width = _removeUnit(width);
+				width = width < self.minWidth ? self.minWidth : width;
+			}
+			self.container.css('width', _addUnit(width));
+			if (updateProp) {
+				self.width = _addUnit(width);
+			}
+		}
+		if (height) {
+			height = _removeUnit(height);
+			editHeight = _removeUnit(height) - self.toolbar.div.height() - self.statusbar.height();
+			editHeight = editHeight < self.minHeight ? self.minHeight : editHeight;
+			self.edit.setHeight(editHeight);
+			if (updateProp) {
+				self.height = _addUnit(height);
+			}
+		}
+		return self;
+	},
+	select : function() {
+		this.isCreated && this.cmd.select();
+		return this;
+	},
+	html : function(val) {
+		var self = this;
+		if (val === undefined) {
+			return self.isCreated ? self.edit.html() : _elementVal(self.srcElement);
+		}
+		self.isCreated ? self.edit.html(val) : _elementVal(self.srcElement, val);
+		if (self.isCreated) {
+			self.cmd.selection();
+		}
+		return self;
+	},
+	fullHtml : function() {
+		return this.isCreated ? this.edit.html(undefined, true) : '';
+	},
+	text : function(val) {
+		var self = this;
+		if (val === undefined) {
+			return _trim(self.html().replace(/<(?!img|embed).*?>/ig, '').replace(/&nbsp;/ig, ' '));
+		} else {
+			return self.html(_escape(val));
+		}
+	},
+	isEmpty : function() {
+		return _trim(this.text().replace(/\r\n|\n|\r/, '')) === '';
+	},
+	isDirty : function() {
+		return _trim(this.initContent.replace(/\r\n|\n|\r|t/g, '')) !== _trim(this.html().replace(/\r\n|\n|\r|t/g, ''));
+	},
+	selectedHtml : function() {
+		var val = this.isCreated ? this.cmd.range.html() : '';
+		val = _removeBookmarkTag(_removeTempTag(val));
+		return val;
+	},
+	count : function(mode) {
+		var self = this;
+		mode = (mode || 'html').toLowerCase();
+		if (mode === 'html') {
+			return self.html().length;
+		}
+		if (mode === 'text') {
+			return self.text().replace(/<(?:img|embed).*?>/ig, 'K').replace(/\r\n|\n|\r/g, '').length;
+		}
+		return 0;
+	},
+	exec : function(key) {
+		key = key.toLowerCase();
+		var self = this, cmd = self.cmd,
+			changeFlag = _inArray(key, 'selectall,copy,paste,print'.split(',')) < 0;
+		if (changeFlag) {
+			self.addBookmark(false);
+		}
+		cmd[key].apply(cmd, _toArray(arguments, 1));
+		if (changeFlag) {
+			self.updateState();
+			self.addBookmark(false);
+			if (self.options.afterChange) {
+				self.options.afterChange.call(self);
+			}
+		}
+		return self;
+	},
+	insertHtml : function(val, quickMode) {
+		if (!this.isCreated) {
+			return this;
+		}
+		val = this.beforeSetHtml(val);
+		this.exec('inserthtml', val, quickMode);
+		return this;
+	},
+	appendHtml : function(val) {
+		this.html(this.html() + val);
+		if (this.isCreated) {
+			var cmd = this.cmd;
+			cmd.range.selectNodeContents(cmd.doc.body).collapse(false);
+			cmd.select();
+		}
+		return this;
+	},
+	sync : function() {
+		_elementVal(this.srcElement, this.html());
+		return this;
+	},
+	focus : function() {
+		this.isCreated ? this.edit.focus() : this.srcElement[0].focus();
+		return this;
+	},
+	blur : function() {
+		this.isCreated ? this.edit.blur() : this.srcElement[0].blur();
+		return this;
+	},
+	addBookmark : function(checkSize) {
+		checkSize = _undef(checkSize, true);
+		var self = this, edit = self.edit,
+			body = edit.doc.body,
+			html = _removeTempTag(body.innerHTML), bookmark;
+		if (checkSize && self._undoStack.length > 0) {
+			var prev = self._undoStack[self._undoStack.length - 1];
+			if (Math.abs(html.length - _removeBookmarkTag(prev.html).length) < self.minChangeSize) {
+				return self;
+			}
+		}
+		if (edit.designMode && !self._firstAddBookmark) {
+			var range = self.cmd.range;
+			bookmark = range.createBookmark(true);
+			bookmark.html = _removeTempTag(body.innerHTML);
+			range.moveToBookmark(bookmark);
+		} else {
+			bookmark = {
+				html : html
+			};
+		}
+		self._firstAddBookmark = false;
+		_addBookmarkToStack(self._undoStack, bookmark);
+		return self;
+	},
+	undo : function() {
+		return _undoToRedo.call(this, this._undoStack, this._redoStack);
+	},
+	redo : function() {
+		return _undoToRedo.call(this, this._redoStack, this._undoStack);
+	},
+	fullscreen : function(bool) {
+		this.fullscreenMode = (bool === undefined ? !this.fullscreenMode : bool);
+		this.addBookmark(false);
+		return this.remove().create();
+	},
+	readonly : function(isReadonly) {
+		isReadonly = _undef(isReadonly, true);
+		var self = this, edit = self.edit, doc = edit.doc;
+		if (self.designMode) {
+			self.toolbar.disableAll(isReadonly, []);
+		} else {
+			_each(self.noDisableItems, function() {
+				self.toolbar[isReadonly ? 'disable' : 'enable'](this);
+			});
+		}
+		if (_IE) {
+			doc.body.contentEditable = !isReadonly;
+		} else {
+			doc.designMode = isReadonly ? 'off' : 'on';
+		}
+		edit.textarea[0].disabled = isReadonly;
+	},
+	createMenu : function(options) {
+		var self = this,
+			name = options.name,
+			knode = self.toolbar.get(name),
+			pos = knode.pos();
+		options.x = pos.x;
+		options.y = pos.y + knode.height();
+		options.z = self.options.zIndex;
+		options.shadowMode = _undef(options.shadowMode, self.shadowMode);
+		if (options.selectedColor !== undefined) {
+			options.cls = 'ke-colorpicker-' + self.themeType;
+			options.noColor = self.lang('noColor');
+			self.menu = _colorpicker(options);
+		} else {
+			options.cls = 'ke-menu-' + self.themeType;
+			options.centerLineMode = false;
+			self.menu = _menu(options);
+		}
+		return self.menu;
+	},
+	hideMenu : function() {
+		this.menu.remove();
+		this.menu = null;
+		return this;
+	},
+	hideContextmenu : function() {
+		this.contextmenu.remove();
+		this.contextmenu = null;
+		return this;
+	},
+	createDialog : function(options) {
+		var self = this, name = options.name;
+		options.z = self.options.zIndex;
+		options.shadowMode = _undef(options.shadowMode, self.shadowMode);
+		options.closeBtn = _undef(options.closeBtn, {
+			name : self.lang('close'),
+			click : function(e) {
+				self.hideDialog();
+				if (_IE && self.cmd) {
+					self.cmd.select();
+				}
+			}
+		});
+		options.noBtn = _undef(options.noBtn, {
+			name : self.lang(options.yesBtn ? 'no' : 'close'),
+			click : function(e) {
+				self.hideDialog();
+				if (_IE && self.cmd) {
+					self.cmd.select();
+				}
+			}
+		});
+		if (self.dialogAlignType != 'page') {
+			options.alignEl = self.container;
+		}
+		options.cls = 'ke-dialog-' + self.themeType;
+		if (self.dialogs.length > 0) {
+			var firstDialog = self.dialogs[0],
+				parentDialog = self.dialogs[self.dialogs.length - 1];
+			firstDialog.setMaskIndex(parentDialog.z + 2);
+			options.z = parentDialog.z + 3;
+			options.showMask = false;
+		}
+		var dialog = _dialog(options);
+		self.dialogs.push(dialog);
+		return dialog;
+	},
+	hideDialog : function() {
+		var self = this;
+		if (self.dialogs.length > 0) {
+			self.dialogs.pop().remove();
+		}
+		if (self.dialogs.length > 0) {
+			var firstDialog = self.dialogs[0],
+				parentDialog = self.dialogs[self.dialogs.length - 1];
+			firstDialog.setMaskIndex(parentDialog.z - 1);
+		}
+		return self;
+	},
+	errorDialog : function(html) {
+		var self = this;
+		var dialog = self.createDialog({
+			width : 750,
+			title : self.lang('uploadError'),
+			body : '<div style="padding:10px 20px;"><iframe frameborder="0" style="width:708px;height:400px;"></iframe></div>'
+		});
+		var iframe = K('iframe', dialog.div), doc = K.iframeDoc(iframe);
+		doc.open();
+		doc.write(html);
+		doc.close();
+		K(doc.body).css('background-color', '#FFF');
+		iframe[0].contentWindow.focus();
+		return self;
+	}
+};
+function _editor(options) {
+	return new KEditor(options);
+}
+_instances = [];
+function _create(expr, options) {
+	options = options || {};
+	options.basePath = _undef(options.basePath, K.basePath);
+	options.themesPath = _undef(options.themesPath, options.basePath + 'themes/');
+	options.langPath = _undef(options.langPath, options.basePath + 'lang/');
+	options.pluginsPath = _undef(options.pluginsPath, options.basePath + 'plugins/');
+	if (_undef(options.loadStyleMode, K.options.loadStyleMode)) {
+		var themeType = _undef(options.themeType, K.options.themeType);
+		_loadStyle(options.themesPath + 'default/default.css');
+		_loadStyle(options.themesPath + themeType + '/' + themeType + '.css');
+	}
+	function create(editor) {
+		_each(_plugins, function(name, fn) {
+			if (_isFunction(fn)) {
+				fn.call(editor, KindEditor);
+			}
+		});
+		return editor.create();
+	}
+	var knode = K(expr);
+	if (!knode || knode.length === 0) {
+		return;
+	}
+	if (knode.length > 1) {
+		knode.each(function() {
+			_create(this, options);
+		});
+		return _instances[0];
+	}
+	options.srcElement = knode[0];
+	var editor = new KEditor(options);
+	_instances.push(editor);
+	if (_language[editor.langType]) {
+		return create(editor);
+	}
+	_loadScript(editor.langPath + editor.langType + '.js?ver=' + encodeURIComponent(K.DEBUG ? _TIME : _VERSION), function() {
+		create(editor);
+	});
+	return editor;
+}
+function _eachEditor(expr, fn) {
+	K(expr).each(function(i, el) {
+		K.each(_instances, function(j, editor) {
+			if (editor && editor.srcElement[0] == el) {
+				fn.call(editor, j);
+				return false;
+			}
+		});
+	});
+}
+K.remove = function(expr) {
+	_eachEditor(expr, function(i) {
+		this.remove();
+		_instances.splice(i, 1);
+	});
+};
+K.sync = function(expr) {
+	_eachEditor(expr, function() {
+		this.sync();
+	});
+};
+K.html = function(expr, val) {
+	_eachEditor(expr, function() {
+		this.html(val);
+	});
+};
+K.insertHtml = function(expr, val) {
+	_eachEditor(expr, function() {
+		this.insertHtml(val);
+	});
+};
+K.appendHtml = function(expr, val) {
+	_eachEditor(expr, function() {
+		this.appendHtml(val);
+	});
+};
+if (_IE && _V < 7) {
+	_nativeCommand(document, 'BackgroundImageCache', true);
+}
+K.EditorClass = KEditor;
+K.editor = _editor;
+K.create = _create;
+K.instances = _instances;
+K.plugin = _plugin;
+K.lang = _lang;
+_plugin('core', function(K) {
+	var self = this,
+		shortcutKeys = {
+			undo : 'Z', redo : 'Y', bold : 'B', italic : 'I', underline : 'U', print : 'P', selectall : 'A'
+		};
+	self.afterSetHtml(function() {
+		if (self.options.afterChange) {
+			self.options.afterChange.call(self);
+		}
+	});
+	self.afterCreate(function() {
+		if (self.syncType != 'form') {
+			return;
+		}
+		var el = K(self.srcElement), hasForm = false;
+		while ((el = el.parent())) {
+			if (el.name == 'form') {
+				hasForm = true;
+				break;
+			}
+		}
+		if (hasForm) {
+			el.bind('submit', function(e) {
+				self.sync();
+				K(window).bind('unload', function() {
+					self.edit.textarea.remove();
+				});
+			});
+			var resetBtn = K('[type="reset"]', el);
+			resetBtn.click(function() {
+				self.html(self.initContent);
+				self.cmd.selection();
+			});
+			self.beforeRemove(function() {
+				el.unbind();
+				resetBtn.unbind();
+			});
+		}
+	});
+	self.clickToolbar('source', function() {
+		if (self.edit.designMode) {
+			self.toolbar.disableAll(true);
+			self.edit.design(false);
+			self.toolbar.select('source');
+		} else {
+			self.toolbar.disableAll(false);
+			self.edit.design(true);
+			self.toolbar.unselect('source');
+			if (_GECKO) {
+				setTimeout(function() {
+					self.cmd.selection();
+				}, 0);
+			} else {
+				self.cmd.selection();
+			}
+		}
+		self.designMode = self.edit.designMode;
+	});
+	self.afterCreate(function() {
+		if (!self.designMode) {
+			self.toolbar.disableAll(true).select('source');
+		}
+	});
+	self.clickToolbar('fullscreen', function() {
+		self.fullscreen();
+	});
+	if (self.fullscreenShortcut) {
+		var loaded = false;
+		self.afterCreate(function() {
+			K(self.edit.doc, self.edit.textarea).keyup(function(e) {
+				if (e.which == 27) {
+					setTimeout(function() {
+						self.fullscreen();
+					}, 0);
+				}
+			});
+			if (loaded) {
+				if (_IE && !self.designMode) {
+					return;
+				}
+				self.focus();
+			}
+			if (!loaded) {
+				loaded = true;
+			}
+		});
+	}
+	_each('undo,redo'.split(','), function(i, name) {
+		if (shortcutKeys[name]) {
+			self.afterCreate(function() {
+				_ctrl(this.edit.doc, shortcutKeys[name], function() {
+					self.clickToolbar(name);
+				});
+			});
+		}
+		self.clickToolbar(name, function() {
+			self[name]();
+		});
+	});
+	self.clickToolbar('formatblock', function() {
+		var blocks = self.lang('formatblock.formatBlock'),
+			heights = {
+				h1 : 28,
+				h2 : 24,
+				h3 : 18,
+				H4 : 14,
+				p : 12
+			},
+			curVal = self.cmd.val('formatblock'),
+			menu = self.createMenu({
+				name : 'formatblock',
+				width : self.langType == 'en' ? 200 : 150
+			});
+		_each(blocks, function(key, val) {
+			var style = 'font-size:' + heights[key] + 'px;';
+			if (key.charAt(0) === 'h') {
+				style += 'font-weight:bold;';
+			}
+			menu.addItem({
+				title : '<span style="' + style + '" unselectable="on">' + val + '</span>',
+				height : heights[key] + 12,
+				checked : (curVal === key || curVal === val),
+				click : function() {
+					self.select().exec('formatblock', '<' + key + '>').hideMenu();
+				}
+			});
+		});
+	});
+	self.clickToolbar('fontname', function() {
+		var curVal = self.cmd.val('fontname'),
+			menu = self.createMenu({
+				name : 'fontname',
+				width : 150
+			});
+		_each(self.lang('fontname.fontName'), function(key, val) {
+			menu.addItem({
+				title : '<span style="font-family: ' + key + ';" unselectable="on">' + val + '</span>',
+				checked : (curVal === key.toLowerCase() || curVal === val.toLowerCase()),
+				click : function() {
+					self.exec('fontname', key).hideMenu();
+				}
+			});
+		});
+	});
+	self.clickToolbar('fontsize', function() {
+		var curVal = self.cmd.val('fontsize'),
+			menu = self.createMenu({
+				name : 'fontsize',
+				width : 150
+			});
+		_each(self.fontSizeTable, function(i, val) {
+			menu.addItem({
+				title : '<span style="font-size:' + val + ';" unselectable="on">' + val + '</span>',
+				height : _removeUnit(val) + 12,
+				checked : curVal === val,
+				click : function() {
+					self.exec('fontsize', val).hideMenu();
+				}
+			});
+		});
+	});
+	_each('forecolor,hilitecolor'.split(','), function(i, name) {
+		self.clickToolbar(name, function() {
+			self.createMenu({
+				name : name,
+				selectedColor : self.cmd.val(name) || 'default',
+				colors : self.colorTable,
+				click : function(color) {
+					self.exec(name, color).hideMenu();
+				}
+			});
+		});
+	});
+	_each(('cut,copy,paste').split(','), function(i, name) {
+		self.clickToolbar(name, function() {
+			self.focus();
+			try {
+				self.exec(name, null);
+			} catch(e) {
+				alert(self.lang(name + 'Error'));
+			}
+		});
+	});
+	self.clickToolbar('about', function() {
+		var html = '<div style="margin:20px;">' +
+			'<div>KindEditor ' + _VERSION + '</div>' +
+			'<div>Copyright &copy; <a href="http://www.kindsoft.net/" target="_blank">kindsoft.net</a> All rights reserved.</div>' +
+			'</div>';
+		self.createDialog({
+			name : 'about',
+			width : 350,
+			title : self.lang('about'),
+			body : html
+		});
+	});
+	self.plugin.getSelectedLink = function() {
+		return self.cmd.commonAncestor('a');
+	};
+	self.plugin.getSelectedImage = function() {
+		return _getImageFromRange(self.edit.cmd.range, function(img) {
+			return !/^ke-\w+$/i.test(img[0].className);
+		});
+	};
+	self.plugin.getSelectedFlash = function() {
+		return _getImageFromRange(self.edit.cmd.range, function(img) {
+			return img[0].className == 'ke-flash';
+		});
+	};
+	self.plugin.getSelectedMedia = function() {
+		return _getImageFromRange(self.edit.cmd.range, function(img) {
+			return img[0].className == 'ke-media' || img[0].className == 'ke-rm';
+		});
+	};
+	self.plugin.getSelectedAnchor = function() {
+		return _getImageFromRange(self.edit.cmd.range, function(img) {
+			return img[0].className == 'ke-anchor';
+		});
+	};
+	_each('link,image,flash,media,anchor'.split(','), function(i, name) {
+		var uName = name.charAt(0).toUpperCase() + name.substr(1);
+		_each('edit,delete'.split(','), function(j, val) {
+			self.addContextmenu({
+				title : self.lang(val + uName),
+				click : function() {
+					self.loadPlugin(name, function() {
+						self.plugin[name][val]();
+						self.hideMenu();
+					});
+				},
+				cond : self.plugin['getSelected' + uName],
+				width : 150,
+				iconClass : val == 'edit' ? 'ke-icon-' + name : undefined
+			});
+		});
+		self.addContextmenu({ title : '-' });
+	});
+	self.plugin.getSelectedTable = function() {
+		return self.cmd.commonAncestor('table');
+	};
+	self.plugin.getSelectedRow = function() {
+		return self.cmd.commonAncestor('tr');
+	};
+	self.plugin.getSelectedCell = function() {
+		return self.cmd.commonAncestor('td');
+	};
+	_each(('prop,cellprop,colinsertleft,colinsertright,rowinsertabove,rowinsertbelow,rowmerge,colmerge,' +
+	'rowsplit,colsplit,coldelete,rowdelete,insert,delete').split(','), function(i, val) {
+		var cond = _inArray(val, ['prop', 'delete']) < 0 ? self.plugin.getSelectedCell : self.plugin.getSelectedTable;
+		self.addContextmenu({
+			title : self.lang('table' + val),
+			click : function() {
+				self.loadPlugin('table', function() {
+					self.plugin.table[val]();
+					self.hideMenu();
+				});
+			},
+			cond : cond,
+			width : 170,
+			iconClass : 'ke-icon-table' + val
+		});
+	});
+	self.addContextmenu({ title : '-' });
+	_each(('selectall,justifyleft,justifycenter,justifyright,justifyfull,insertorderedlist,' +
+		'insertunorderedlist,indent,outdent,subscript,superscript,hr,print,' +
+		'bold,italic,underline,strikethrough,removeformat,unlink').split(','), function(i, name) {
+		if (shortcutKeys[name]) {
+			self.afterCreate(function() {
+				_ctrl(this.edit.doc, shortcutKeys[name], function() {
+					self.cmd.selection();
+					self.clickToolbar(name);
+				});
+			});
+		}
+		self.clickToolbar(name, function() {
+			self.focus().exec(name, null);
+		});
+	});
+	self.afterCreate(function() {
+		var doc = self.edit.doc, cmd, bookmark, div,
+			cls = '__kindeditor_paste__', pasting = false;
+		function movePastedData() {
+			cmd.range.moveToBookmark(bookmark);
+			cmd.select();
+			if (_WEBKIT) {
+				K('div.' + cls, div).each(function() {
+					K(this).after('<br />').remove(true);
+				});
+				K('span.Apple-style-span', div).remove(true);
+				K('span.Apple-tab-span', div).remove(true);
+				K('span[style]', div).each(function() {
+					if (K(this).css('white-space') == 'nowrap') {
+						K(this).remove(true);
+					}
+				});
+				K('meta', div).remove();
+			}
+			var html = div[0].innerHTML;
+			div.remove();
+			if (html === '') {
+				return;
+			}
+			if (_WEBKIT) {
+				html = html.replace(/(<br>)\1/ig, '$1');
+			}
+			if (self.pasteType === 2) {
+				html = html.replace(/(<(?:p|p\s[^>]*)>) *(<\/p>)/ig, '');
+				if (/schemas-microsoft-com|worddocument|mso-\w+/i.test(html)) {
+					html = _clearMsWord(html, self.filterMode ? self.htmlTags : K.options.htmlTags);
+				} else {
+					html = _formatHtml(html, self.filterMode ? self.htmlTags : null);
+					html = self.beforeSetHtml(html);
+				}
+			}
+			if (self.pasteType === 1) {
+				html = html.replace(/&nbsp;/ig, ' ');
+				html = html.replace(/\n\s*\n/g, '\n');
+				html = html.replace(/<br[^>]*>/ig, '\n');
+				html = html.replace(/<\/p><p[^>]*>/ig, '\n');
+				html = html.replace(/<[^>]+>/g, '');
+				html = html.replace(/ {2}/g, ' &nbsp;');
+				if (self.newlineTag == 'p') {
+					if (/\n/.test(html)) {
+						html = html.replace(/^/, '<p>').replace(/$/, '<br /></p>').replace(/\n/g, '<br /></p><p>');
+					}
+				} else {
+					html = html.replace(/\n/g, '<br />$&');
+				}
+			}
+			self.insertHtml(html, true);
+		}
+		K(doc.body).bind('paste', function(e){
+			if (self.pasteType === 0) {
+				e.stop();
+				return;
+			}
+			if (pasting) {
+				return;
+			}
+			pasting = true;
+			K('div.' + cls, doc).remove();
+			cmd = self.cmd.selection();
+			bookmark = cmd.range.createBookmark();
+			div = K('<div class="' + cls + '"></div>', doc).css({
+				position : 'absolute',
+				width : '1px',
+				height : '1px',
+				overflow : 'hidden',
+				left : '-1981px',
+				top : K(bookmark.start).pos().y + 'px',
+				'white-space' : 'nowrap'
+			});
+			K(doc.body).append(div);
+			if (_IE) {
+				var rng = cmd.range.get(true);
+				rng.moveToElementText(div[0]);
+				rng.select();
+				rng.execCommand('paste');
+				e.preventDefault();
+			} else {
+				cmd.range.selectNodeContents(div[0]);
+				cmd.select();
+			}
+			setTimeout(function() {
+				movePastedData();
+				pasting = false;
+			}, 0);
+		});
+	});
+	self.beforeGetHtml(function(html) {
+		if (_IE && _V <= 8) {
+			html = html.replace(/<div\s+[^>]*data-ke-input-tag="([^"]*)"[^>]*>([\s\S]*?)<\/div>/ig, function(full, tag) {
+				return unescape(tag);
+			});
+			html = html.replace(/(<input)((?:\s+[^>]*)?>)/ig, function($0, $1, $2) {
+				if (!/\s+type="[^"]+"/i.test($0)) {
+					return $1 + ' type="text"' + $2;
+				}
+				return $0;
+			});
+		}
+		return html.replace(/(<(?:noscript|noscript\s[^>]*)>)([\s\S]*?)(<\/noscript>)/ig, function($0, $1, $2, $3) {
+			return $1 + _unescape($2).replace(/\s+/g, ' ') + $3;
+		})
+		.replace(/<img[^>]*class="?ke-(flash|rm|media)"?[^>]*>/ig, function(full) {
+			var imgAttrs = _getAttrList(full);
+			var styles = _getCssList(imgAttrs.style || '');
+			var attrs = _mediaAttrs(imgAttrs['data-ke-tag']);
+			var width = _undef(styles.width, '');
+			var height = _undef(styles.height, '');
+			if (/px/i.test(width)) {
+				width = _removeUnit(width);
+			}
+			if (/px/i.test(height)) {
+				height = _removeUnit(height);
+			}
+			attrs.width = _undef(imgAttrs.width, width);
+			attrs.height = _undef(imgAttrs.height, height);
+			return _mediaEmbed(attrs);
+		})
+		.replace(/<img[^>]*class="?ke-anchor"?[^>]*>/ig, function(full) {
+			var imgAttrs = _getAttrList(full);
+			return '<a name="' + unescape(imgAttrs['data-ke-name']) + '"></a>';
+		})
+		.replace(/<div\s+[^>]*data-ke-script-attr="([^"]*)"[^>]*>([\s\S]*?)<\/div>/ig, function(full, attr, code) {
+			return '<script' + unescape(attr) + '>' + unescape(code) + '</script>';
+		})
+		.replace(/<div\s+[^>]*data-ke-noscript-attr="([^"]*)"[^>]*>([\s\S]*?)<\/div>/ig, function(full, attr, code) {
+			return '<noscript' + unescape(attr) + '>' + unescape(code) + '</noscript>';
+		})
+		.replace(/(<[^>]*)data-ke-src="([^"]*)"([^>]*>)/ig, function(full, start, src, end) {
+			full = full.replace(/(\s+(?:href|src)=")[^"]*(")/i, function($0, $1, $2) {
+				return $1 + _unescape(src) + $2;
+			});
+			full = full.replace(/\s+data-ke-src="[^"]*"/i, '');
+			return full;
+		})
+		.replace(/(<[^>]+\s)data-ke-(on\w+="[^"]*"[^>]*>)/ig, function(full, start, end) {
+			return start + end;
+		});
+	});
+	self.beforeSetHtml(function(html) {
+		if (_IE && _V <= 8) {
+			html = html.replace(/<input[^>]*>|<(select|button)[^>]*>[\s\S]*?<\/\1>/ig, function(full) {
+				var attrs = _getAttrList(full);
+				var styles = _getCssList(attrs.style || '');
+				if (styles.display == 'none') {
+					return '<div class="ke-display-none" data-ke-input-tag="' + escape(full) + '"></div>';
+				}
+				return full;
+			});
+		}
+		return html.replace(/<embed[^>]*type="([^"]+)"[^>]*>(?:<\/embed>)?/ig, function(full) {
+			var attrs = _getAttrList(full);
+			attrs.src = _undef(attrs.src, '');
+			attrs.width = _undef(attrs.width, 0);
+			attrs.height = _undef(attrs.height, 0);
+			return _mediaImg(self.themesPath + 'common/blank.gif', attrs);
+		})
+		.replace(/<a[^>]*name="([^"]+)"[^>]*>(?:<\/a>)?/ig, function(full) {
+			var attrs = _getAttrList(full);
+			if (attrs.href !== undefined) {
+				return full;
+			}
+			return '<img class="ke-anchor" src="' + self.themesPath + 'common/anchor.gif" data-ke-name="' + escape(attrs.name) + '" />';
+		})
+		.replace(/<script([^>]*)>([\s\S]*?)<\/script>/ig, function(full, attr, code) {
+			return '<div class="ke-script" data-ke-script-attr="' + escape(attr) + '">' + escape(code) + '</div>';
+		})
+		.replace(/<noscript([^>]*)>([\s\S]*?)<\/noscript>/ig, function(full, attr, code) {
+			return '<div class="ke-noscript" data-ke-noscript-attr="' + escape(attr) + '">' + escape(code) + '</div>';
+		})
+		.replace(/(<[^>]*)(href|src)="([^"]*)"([^>]*>)/ig, function(full, start, key, src, end) {
+			if (full.match(/\sdata-ke-src="[^"]*"/i)) {
+				return full;
+			}
+			full = start + key + '="' + src + '"' + ' data-ke-src="' + _escape(src) + '"' + end;
+			return full;
+		})
+		.replace(/(<[^>]+\s)(on\w+="[^"]*"[^>]*>)/ig, function(full, start, end) {
+			return start + 'data-ke-' + end;
+		})
+		.replace(/<table[^>]*\s+border="0"[^>]*>/ig, function(full) {
+			if (full.indexOf('ke-zeroborder') >= 0) {
+				return full;
+			}
+			return _addClassToTag(full, 'ke-zeroborder');
+		});
+	});
+});
+})(window);
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.lang({
+	source : 'HTML代码',
+	preview : '预览',
+	undo : '后退(Ctrl+Z)',
+	redo : '前进(Ctrl+Y)',
+	cut : '剪切(Ctrl+X)',
+	copy : '复制(Ctrl+C)',
+	paste : '粘贴(Ctrl+V)',
+	plainpaste : '粘贴为无格式文本',
+	wordpaste : '从Word粘贴',
+	selectall : '全选(Ctrl+A)',
+	justifyleft : '左对齐',
+	justifycenter : '居中',
+	justifyright : '右对齐',
+	justifyfull : '两端对齐',
+	insertorderedlist : '编号',
+	insertunorderedlist : '项目符号',
+	indent : '增加缩进',
+	outdent : '减少缩进',
+	subscript : '下标',
+	superscript : '上标',
+	formatblock : '段落',
+	fontname : '字体',
+	fontsize : '文字大小',
+	forecolor : '文字颜色',
+	hilitecolor : '文字背景',
+	bold : '粗体(Ctrl+B)',
+	italic : '斜体(Ctrl+I)',
+	underline : '下划线(Ctrl+U)',
+	strikethrough : '删除线',
+	removeformat : '删除格式',
+	image : '图片',
+	multiimage : '批量图片上传',
+	flash : 'Flash',
+	media : '视音频',
+	table : '表格',
+	tablecell : '单元格',
+	hr : '插入横线',
+	emoticons : '插入表情',
+	link : '超级链接',
+	unlink : '取消超级链接',
+	fullscreen : '全屏显示',
+	about : '关于',
+	print : '打印(Ctrl+P)',
+	filemanager : '文件空间',
+	code : '插入程序代码',
+	map : 'Google地图',
+	baidumap : '百度地图',
+	lineheight : '行距',
+	clearhtml : '清理HTML代码',
+	pagebreak : '插入分页符',
+	quickformat : '一键排版',
+	insertfile : '插入文件',
+	template : '插入模板',
+	anchor : '锚点',
+	yes : '确定',
+	no : '取消',
+	close : '关闭',
+	editImage : '图片属性',
+	deleteImage : '删除图片',
+	editFlash : 'Flash属性',
+	deleteFlash : '删除Flash',
+	editMedia : '视音频属性',
+	deleteMedia : '删除视音频',
+	editLink : '超级链接属性',
+	deleteLink : '取消超级链接',
+	editAnchor : '锚点属性',
+	deleteAnchor : '删除锚点',
+	tableprop : '表格属性',
+	tablecellprop : '单元格属性',
+	tableinsert : '插入表格',
+	tabledelete : '删除表格',
+	tablecolinsertleft : '左侧插入列',
+	tablecolinsertright : '右侧插入列',
+	tablerowinsertabove : '上方插入行',
+	tablerowinsertbelow : '下方插入行',
+	tablerowmerge : '向下合并单元格',
+	tablecolmerge : '向右合并单元格',
+	tablerowsplit : '拆分行',
+	tablecolsplit : '拆分列',
+	tablecoldelete : '删除列',
+	tablerowdelete : '删除行',
+	noColor : '无颜色',
+	pleaseSelectFile : '请选择文件。',
+	invalidImg : "请输入有效的URL地址。\n只允许jpg,gif,bmp,png格式。",
+	invalidMedia : "请输入有效的URL地址。\n只允许swf,flv,mp3,wav,wma,wmv,mid,avi,mpg,asf,rm,rmvb格式。",
+	invalidWidth : "宽度必须为数字。",
+	invalidHeight : "高度必须为数字。",
+	invalidBorder : "边框必须为数字。",
+	invalidUrl : "请输入有效的URL地址。",
+	invalidRows : '行数为必选项，只允许输入大于0的数字。',
+	invalidCols : '列数为必选项，只允许输入大于0的数字。',
+	invalidPadding : '边距必须为数字。',
+	invalidSpacing : '间距必须为数字。',
+	invalidJson : '服务器发生故障。',
+	uploadSuccess : '上传成功。',
+	cutError : '您的浏览器安全设置不允许使用剪切操作，请使用快捷键(Ctrl+X)来完成。',
+	copyError : '您的浏览器安全设置不允许使用复制操作，请使用快捷键(Ctrl+C)来完成。',
+	pasteError : '您的浏览器安全设置不允许使用粘贴操作，请使用快捷键(Ctrl+V)来完成。',
+	ajaxLoading : '加载中，请稍候 ...',
+	uploadLoading : '上传中，请稍候 ...',
+	uploadError : '上传错误',
+	'plainpaste.comment' : '请使用快捷键(Ctrl+V)把内容粘贴到下面的方框里。',
+	'wordpaste.comment' : '请使用快捷键(Ctrl+V)把内容粘贴到下面的方框里。',
+	'code.pleaseInput' : '请输入程序代码。',
+	'link.url' : 'URL',
+	'link.linkType' : '打开类型',
+	'link.newWindow' : '新窗口',
+	'link.selfWindow' : '当前窗口',
+	'flash.url' : 'URL',
+	'flash.width' : '宽度',
+	'flash.height' : '高度',
+	'flash.upload' : '上传',
+	'flash.viewServer' : '文件空间',
+	'media.url' : 'URL',
+	'media.width' : '宽度',
+	'media.height' : '高度',
+	'media.autostart' : '自动播放',
+	'media.upload' : '上传',
+	'media.viewServer' : '文件空间',
+	'image.remoteImage' : '网络图片',
+	'image.localImage' : '本地上传',
+	'image.remoteUrl' : '图片地址',
+	'image.localUrl' : '上传文件',
+	'image.size' : '图片大小',
+	'image.width' : '宽',
+	'image.height' : '高',
+	'image.resetSize' : '重置大小',
+	'image.align' : '对齐方式',
+	'image.defaultAlign' : '默认方式',
+	'image.leftAlign' : '左对齐',
+	'image.rightAlign' : '右对齐',
+	'image.imgTitle' : '图片说明',
+	'image.upload' : '浏览...',
+	'image.viewServer' : '图片空间',
+	'multiimage.uploadDesc' : '允许用户同时上传<%=uploadLimit%>张图片，单张图片容量不超过<%=sizeLimit%>',
+	'multiimage.startUpload' : '开始上传',
+	'multiimage.clearAll' : '全部清空',
+	'multiimage.insertAll' : '全部插入',
+	'multiimage.queueLimitExceeded' : '文件数量超过限制。',
+	'multiimage.fileExceedsSizeLimit' : '文件大小超过限制。',
+	'multiimage.zeroByteFile' : '无法上传空文件。',
+	'multiimage.invalidFiletype' : '文件类型不正确。',
+	'multiimage.unknownError' : '发生异常，无法上传。',
+	'multiimage.pending' : '等待上传',
+	'multiimage.uploadError' : '上传失败',
+	'filemanager.emptyFolder' : '空文件夹',
+	'filemanager.moveup' : '移到上一级文件夹',
+	'filemanager.viewType' : '显示方式：',
+	'filemanager.viewImage' : '缩略图',
+	'filemanager.listImage' : '详细信息',
+	'filemanager.orderType' : '排序方式：',
+	'filemanager.fileName' : '名称',
+	'filemanager.fileSize' : '大小',
+	'filemanager.fileType' : '类型',
+	'insertfile.url' : 'URL',
+	'insertfile.title' : '文件说明',
+	'insertfile.upload' : '上传',
+	'insertfile.viewServer' : '文件空间',
+	'table.cells' : '单元格数',
+	'table.rows' : '行数',
+	'table.cols' : '列数',
+	'table.size' : '大小',
+	'table.width' : '宽度',
+	'table.height' : '高度',
+	'table.percent' : '%',
+	'table.px' : 'px',
+	'table.space' : '边距间距',
+	'table.padding' : '边距',
+	'table.spacing' : '间距',
+	'table.align' : '对齐方式',
+	'table.textAlign' : '水平对齐',
+	'table.verticalAlign' : '垂直对齐',
+	'table.alignDefault' : '默认',
+	'table.alignLeft' : '左对齐',
+	'table.alignCenter' : '居中',
+	'table.alignRight' : '右对齐',
+	'table.alignTop' : '顶部',
+	'table.alignMiddle' : '中部',
+	'table.alignBottom' : '底部',
+	'table.alignBaseline' : '基线',
+	'table.border' : '边框',
+	'table.borderWidth' : '边框',
+	'table.borderColor' : '颜色',
+	'table.backgroundColor' : '背景颜色',
+	'map.address' : '地址: ',
+	'map.search' : '搜索',
+	'baidumap.address' : '地址: ',
+	'baidumap.search' : '搜索',
+	'baidumap.insertDynamicMap' : '插入动态地图',
+	'anchor.name' : '锚点名称',
+	'formatblock.formatBlock' : {
+		h1 : '标题 1',
+		h2 : '标题 2',
+		h3 : '标题 3',
+		h4 : '标题 4',
+		p : '正 文'
+	},
+	'fontname.fontName' : {
+		'SimSun' : '宋体',
+		'NSimSun' : '新宋体',
+		'FangSong_GB2312' : '仿宋_GB2312',
+		'KaiTi_GB2312' : '楷体_GB2312',
+		'SimHei' : '黑体',
+		'Microsoft YaHei' : '微软雅黑',
+		'Arial' : 'Arial',
+		'Arial Black' : 'Arial Black',
+		'Times New Roman' : 'Times New Roman',
+		'Courier New' : 'Courier New',
+		'Tahoma' : 'Tahoma',
+		'Verdana' : 'Verdana'
+	},
+	'lineheight.lineHeight' : [
+		{'1' : '单倍行距'},
+		{'1.5' : '1.5倍行距'},
+		{'2' : '2倍行距'},
+		{'2.5' : '2.5倍行距'},
+		{'3' : '3倍行距'}
+	],
+	'template.selectTemplate' : '可选模板',
+	'template.replaceContent' : '替换当前内容',
+	'template.fileList' : {
+		'1.html' : '图片和文字',
+		'2.html' : '表格',
+		'3.html' : '项目编号'
+	}
+}, 'zh_CN');
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('anchor', function(K) {
+	var self = this, name = 'anchor', lang = self.lang(name + '.');
+	self.plugin.anchor = {
+		edit : function() {
+			var html = ['<div style="padding:20px;">',
+					'<div class="ke-dialog-row">',
+					'<label for="keName">' + lang.name + '</label>',
+					'<input class="ke-input-text" type="text" id="keName" name="name" value="" style="width:100px;" />',
+					'</div>',
+					'</div>'].join('');
+			var dialog = self.createDialog({
+				name : name,
+				width : 300,
+				title : self.lang(name),
+				body : html,
+				yesBtn : {
+					name : self.lang('yes'),
+					click : function(e) {
+						self.insertHtml('<a name="' + nameBox.val() + '">').hideDialog().focus();
+					}
+				}
+			});
+			var div = dialog.div,
+				nameBox = K('input[name="name"]', div);
+			var img = self.plugin.getSelectedAnchor();
+			if (img) {
+				nameBox.val(unescape(img.attr('data-ke-name')));
+			}
+			nameBox[0].focus();
+			nameBox[0].select();
+		},
+		'delete' : function() {
+			self.plugin.getSelectedAnchor().remove();
+		}
+	};
+	self.clickToolbar(name, self.plugin.anchor.edit);
+});
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('autoheight', function(K) {
+	var self = this;
+
+	if (!self.autoHeightMode) {
+		return;
+	}
+
+	var minHeight;
+
+	function hideScroll() {
+		var edit = self.edit;
+		var body = edit.doc.body;
+		edit.iframe[0].scroll = 'no';
+		body.style.overflowY = 'hidden';
+	}
+
+	function resetHeight() {
+		var edit = self.edit;
+		var body = edit.doc.body;
+		edit.iframe.height(minHeight);
+		self.resize(null, Math.max((K.IE ? body.scrollHeight : body.offsetHeight) + 76, minHeight));
+	}
+
+	function init() {
+		minHeight = K.removeUnit(self.height);
+
+		self.edit.afterChange(resetHeight);
+		hideScroll();
+		resetHeight();
+	}
+
+	if (self.isCreated) {
+		init();
+	} else {
+		self.afterCreate(init);
+	}
+});
+
+/*
+* 如何实现真正的自动高度？
+* 修改编辑器高度之后，再次获取body内容高度时，最小值只会是当前iframe的设置高度，这样就导致高度只增不减。
+* 所以每次获取body内容高度之前，先将iframe的高度重置为最小高度，这样就能获取body的实际高度。
+* 由此就实现了真正的自动高度
+* 测试：chrome、firefox、IE9、IE8
+* */
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+// Baidu Maps: http://dev.baidu.com/wiki/map/index.php?title=%E9%A6%96%E9%A1%B5
+
+KindEditor.plugin('baidumap', function(K) {
+	var self = this, name = 'baidumap', lang = self.lang(name + '.');
+	var mapWidth = K.undef(self.mapWidth, 558);
+	var mapHeight = K.undef(self.mapHeight, 360);
+	self.clickToolbar(name, function() {
+		var html = ['<div style="padding:10px 20px;">',
+			'<div class="ke-header">',
+			// left start
+			'<div class="ke-left">',
+			lang.address + ' <input id="kindeditor_plugin_map_address" name="address" class="ke-input-text" value="" style="width:200px;" /> ',
+			'<span class="ke-button-common ke-button-outer">',
+			'<input type="button" name="searchBtn" class="ke-button-common ke-button" value="' + lang.search + '" />',
+			'</span>',
+			'</div>',
+			// right start
+			'<div class="ke-right">',
+			'<input type="checkbox" id="keInsertDynamicMap" name="insertDynamicMap" value="1" /> <label for="keInsertDynamicMap">' + lang.insertDynamicMap + '</label>',
+			'</div>',
+			'<div class="ke-clearfix"></div>',
+			'</div>',
+			'<div class="ke-map" style="width:' + mapWidth + 'px;height:' + mapHeight + 'px;"></div>',
+			'</div>'].join('');
+		var dialog = self.createDialog({
+			name : name,
+			width : mapWidth + 42,
+			title : self.lang(name),
+			body : html,
+			yesBtn : {
+				name : self.lang('yes'),
+				click : function(e) {
+					var map = win.map;
+					var centerObj = map.getCenter();
+					var center = centerObj.lng + ',' + centerObj.lat;
+					var zoom = map.getZoom();
+					var url = [checkbox[0].checked ? self.pluginsPath + 'baidumap/index.html' : 'http://api.map.baidu.com/staticimage',
+						'?center=' + encodeURIComponent(center),
+						'&zoom=' + encodeURIComponent(zoom),
+						'&width=' + mapWidth,
+						'&height=' + mapHeight,
+						'&markers=' + encodeURIComponent(center),
+						'&markerStyles=' + encodeURIComponent('l,A')].join('');
+					if (checkbox[0].checked) {
+						self.insertHtml('<iframe src="' + url + '" frameborder="0" style="width:' + (mapWidth + 2) + 'px;height:' + (mapHeight + 2) + 'px;"></iframe>');
+					} else {
+						self.exec('insertimage', url);
+					}
+					self.hideDialog().focus();
+				}
+			},
+			beforeRemove : function() {
+				searchBtn.remove();
+				if (doc) {
+					doc.write('');
+				}
+				iframe.remove();
+			}
+		});
+		var div = dialog.div,
+			addressBox = K('[name="address"]', div),
+			searchBtn = K('[name="searchBtn"]', div),
+			checkbox = K('[name="insertDynamicMap"]', dialog.div),
+			win, doc;
+		var iframe = K('<iframe class="ke-textarea" frameborder="0" src="' + self.pluginsPath + 'baidumap/map.html" style="width:' + mapWidth + 'px;height:' + mapHeight + 'px;"></iframe>');
+		function ready() {
+			win = iframe[0].contentWindow;
+			doc = K.iframeDoc(iframe);
+		}
+		iframe.bind('load', function() {
+			iframe.unbind('load');
+			if (K.IE) {
+				ready();
+			} else {
+				setTimeout(ready, 0);
+			}
+		});
+		K('.ke-map', div).replaceWith(iframe);
+		// search map
+		searchBtn.click(function() {
+			win.search(addressBox.val());
+		});
+	});
+});
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('clearhtml', function(K) {
+	var self = this, name = 'clearhtml';
+	self.clickToolbar(name, function() {
+		self.focus();
+		var html = self.html();
+		html = html.replace(/(<script[^>]*>)([\s\S]*?)(<\/script>)/ig, '');
+		html = html.replace(/(<style[^>]*>)([\s\S]*?)(<\/style>)/ig, '');
+		html = K.formatHtml(html, {
+			a : ['href', 'target'],
+			embed : ['src', 'width', 'height', 'type', 'loop', 'autostart', 'quality', '.width', '.height', 'align', 'allowscriptaccess'],
+			img : ['src', 'width', 'height', 'border', 'alt', 'title', '.width', '.height'],
+			table : ['border'],
+			'td,th' : ['rowspan', 'colspan'],
+			'div,hr,br,tbody,tr,p,ol,ul,li,blockquote,h1,h2,h3,h4,h5,h6' : []
+		});
+		self.html(html);
+		self.cmd.selection(true);
+		self.addBookmark();
+	});
+});
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+// google code prettify: http://google-code-prettify.googlecode.com/
+// http://google-code-prettify.googlecode.com/
+
+KindEditor.plugin('code', function(K) {
+	var self = this, name = 'code';
+	self.clickToolbar(name, function() {
+		var lang = self.lang(name + '.'),
+			html = ['<div style="padding:10px 20px;">',
+				'<div class="ke-dialog-row">',
+				'<select class="ke-code-type">',
+				'<option value="js">JavaScript</option>',
+				'<option value="html">HTML</option>',
+				'<option value="css">CSS</option>',
+				'<option value="php">PHP</option>',
+				'<option value="pl">Perl</option>',
+				'<option value="py">Python</option>',
+				'<option value="rb">Ruby</option>',
+				'<option value="java">Java</option>',
+				'<option value="vb">ASP/VB</option>',
+				'<option value="cpp">C/C++</option>',
+				'<option value="cs">C#</option>',
+				'<option value="xml">XML</option>',
+				'<option value="bsh">Shell</option>',
+				'<option value="">Other</option>',
+				'</select>',
+				'</div>',
+				'<textarea class="ke-textarea" style="width:408px;height:260px;"></textarea>',
+				'</div>'].join(''),
+			dialog = self.createDialog({
+				name : name,
+				width : 450,
+				title : self.lang(name),
+				body : html,
+				yesBtn : {
+					name : self.lang('yes'),
+					click : function(e) {
+						var type = K('.ke-code-type', dialog.div).val(),
+							code = textarea.val(),
+							cls = type === '' ? '' :  ' lang-' + type,
+							html = '<pre class="prettyprint' + cls + '">\n' + K.escape(code) + '</pre> ';
+						if (K.trim(code) === '') {
+							alert(lang.pleaseInput);
+							textarea[0].focus();
+							return;
+						}
+						self.insertHtml(html).hideDialog().focus();
+					}
+				}
+			}),
+			textarea = K('textarea', dialog.div);
+		textarea[0].focus();
+	});
+});
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('emoticons', function(K) {
+	var self = this, name = 'emoticons',
+		path = (self.emoticonsPath || self.pluginsPath + 'emoticons/images/'),
+		allowPreview = self.allowPreviewEmoticons === undefined ? true : self.allowPreviewEmoticons,
+		currentPageNum = 1;
+	self.clickToolbar(name, function() {
+		var rows = 5, cols = 9, total = 135, startNum = 0,
+			cells = rows * cols, pages = Math.ceil(total / cells),
+			colsHalf = Math.floor(cols / 2),
+			wrapperDiv = K('<div class="ke-plugin-emoticons"></div>'),
+			elements = [],
+			menu = self.createMenu({
+				name : name,
+				beforeRemove : function() {
+					removeEvent();
+				}
+			});
+		menu.div.append(wrapperDiv);
+		var previewDiv, previewImg;
+		if (allowPreview) {
+			previewDiv = K('<div class="ke-preview"></div>').css('right', 0);
+			previewImg = K('<img class="ke-preview-img" src="' + path + startNum + '.gif" />');
+			wrapperDiv.append(previewDiv);
+			previewDiv.append(previewImg);
+		}
+		function bindCellEvent(cell, j, num) {
+			if (previewDiv) {
+				cell.mouseover(function() {
+					if (j > colsHalf) {
+						previewDiv.css('left', 0);
+						previewDiv.css('right', '');
+					} else {
+						previewDiv.css('left', '');
+						previewDiv.css('right', 0);
+					}
+					previewImg.attr('src', path + num + '.gif');
+					K(this).addClass('ke-on');
+				});
+			} else {
+				cell.mouseover(function() {
+					K(this).addClass('ke-on');
+				});
+			}
+			cell.mouseout(function() {
+				K(this).removeClass('ke-on');
+			});
+			cell.click(function(e) {
+				self.insertHtml('<img src="' + path + num + '.gif" border="0" alt="" />').hideMenu().focus();
+				e.stop();
+			});
+		}
+		function createEmoticonsTable(pageNum, parentDiv) {
+			var table = document.createElement('table');
+			parentDiv.append(table);
+			if (previewDiv) {
+				K(table).mouseover(function() {
+					previewDiv.show('block');
+				});
+				K(table).mouseout(function() {
+					previewDiv.hide();
+				});
+				elements.push(K(table));
+			}
+			table.className = 'ke-table';
+			table.cellPadding = 0;
+			table.cellSpacing = 0;
+			table.border = 0;
+			var num = (pageNum - 1) * cells + startNum;
+			for (var i = 0; i < rows; i++) {
+				var row = table.insertRow(i);
+				for (var j = 0; j < cols; j++) {
+					var cell = K(row.insertCell(j));
+					cell.addClass('ke-cell');
+					bindCellEvent(cell, j, num);
+					var span = K('<span class="ke-img"></span>')
+						.css('background-position', '-' + (24 * num) + 'px 0px')
+						.css('background-image', 'url(' + path + 'static.gif)');
+					cell.append(span);
+					elements.push(cell);
+					num++;
+				}
+			}
+			return table;
+		}
+		var table = createEmoticonsTable(currentPageNum, wrapperDiv);
+		function removeEvent() {
+			K.each(elements, function() {
+				this.unbind();
+			});
+		}
+		var pageDiv;
+		function bindPageEvent(el, pageNum) {
+			el.click(function(e) {
+				removeEvent();
+				table.parentNode.removeChild(table);
+				pageDiv.remove();
+				table = createEmoticonsTable(pageNum, wrapperDiv);
+				createPageTable(pageNum);
+				currentPageNum = pageNum;
+				e.stop();
+			});
+		}
+		function createPageTable(currentPageNum) {
+			pageDiv = K('<div class="ke-page"></div>');
+			wrapperDiv.append(pageDiv);
+			for (var pageNum = 1; pageNum <= pages; pageNum++) {
+				if (currentPageNum !== pageNum) {
+					var a = K('<a href="javascript:;">[' + pageNum + ']</a>');
+					bindPageEvent(a, pageNum);
+					pageDiv.append(a);
+					elements.push(a);
+				} else {
+					pageDiv.append(K('@[' + pageNum + ']'));
+				}
+				pageDiv.append(K('@&nbsp;'));
+			}
+		}
+		createPageTable(currentPageNum);
+	});
+});
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('filemanager', function(K) {
+	var self = this, name = 'filemanager',
+		fileManagerJson = K.undef(self.fileManagerJson, self.basePath + 'php/file_manager_json.php'),
+		imgPath = self.pluginsPath + name + '/images/',
+		lang = self.lang(name + '.');
+	function makeFileTitle(filename, filesize, datetime) {
+		return filename + ' (' + Math.ceil(filesize / 1024) + 'KB, ' + datetime + ')';
+	}
+	function bindTitle(el, data) {
+		if (data.is_dir) {
+			el.attr('title', data.filename);
+		} else {
+			el.attr('title', makeFileTitle(data.filename, data.filesize, data.datetime));
+		}
+	}
+	self.plugin.filemanagerDialog = function(options) {
+		var width = K.undef(options.width, 650),
+			height = K.undef(options.height, 510),
+			dirName = K.undef(options.dirName, ''),
+			viewType = K.undef(options.viewType, 'VIEW').toUpperCase(), // "LIST" or "VIEW"
+			clickFn = options.clickFn;
+		var html = [
+			'<div style="padding:10px 20px;">',
+			// header start
+			'<div class="ke-plugin-filemanager-header">',
+			// left start
+			'<div class="ke-left">',
+			'<img class="ke-inline-block" name="moveupImg" src="' + imgPath + 'go-up.gif" width="16" height="16" border="0" alt="" /> ',
+			'<a class="ke-inline-block" name="moveupLink" href="javascript:;">' + lang.moveup + '</a>',
+			'</div>',
+			// right start
+			'<div class="ke-right">',
+			lang.viewType + ' <select class="ke-inline-block" name="viewType">',
+			'<option value="VIEW">' + lang.viewImage + '</option>',
+			'<option value="LIST">' + lang.listImage + '</option>',
+			'</select> ',
+			lang.orderType + ' <select class="ke-inline-block" name="orderType">',
+			'<option value="NAME">' + lang.fileName + '</option>',
+			'<option value="SIZE">' + lang.fileSize + '</option>',
+			'<option value="TYPE">' + lang.fileType + '</option>',
+			'</select>',
+			'</div>',
+			'<div class="ke-clearfix"></div>',
+			'</div>',
+			// body start
+			'<div class="ke-plugin-filemanager-body"></div>',
+			'</div>'
+		].join('');
+		var dialog = self.createDialog({
+			name : name,
+			width : width,
+			height : height,
+			title : self.lang(name),
+			body : html
+		}),
+		div = dialog.div,
+		bodyDiv = K('.ke-plugin-filemanager-body', div),
+		moveupImg = K('[name="moveupImg"]', div),
+		moveupLink = K('[name="moveupLink"]', div),
+		viewServerBtn = K('[name="viewServer"]', div),
+		viewTypeBox = K('[name="viewType"]', div),
+		orderTypeBox = K('[name="orderType"]', div);
+		function reloadPage(path, order, func) {
+			var param = 'path=' + path + '&order=' + order + '&dir=' + dirName;
+			dialog.showLoading(self.lang('ajaxLoading'));
+			K.ajax(K.addParam(fileManagerJson, param + '&' + new Date().getTime()), function(data) {
+				dialog.hideLoading();
+				func(data);
+			});
+		}
+		var elList = [];
+		function bindEvent(el, result, data, createFunc) {
+			var fileUrl = K.formatUrl(result.current_url + data.filename, 'absolute'),
+				dirPath = encodeURIComponent(result.current_dir_path + data.filename + '/');
+			if (data.is_dir) {
+				el.click(function(e) {
+					reloadPage(dirPath, orderTypeBox.val(), createFunc);
+				});
+			} else if (data.is_photo) {
+				el.click(function(e) {
+					clickFn.call(this, fileUrl, data.filename);
+				});
+			} else {
+				el.click(function(e) {
+					clickFn.call(this, fileUrl, data.filename);
+				});
+			}
+			elList.push(el);
+		}
+		function createCommon(result, createFunc) {
+			// remove events
+			K.each(elList, function() {
+				this.unbind();
+			});
+			moveupLink.unbind();
+			viewTypeBox.unbind();
+			orderTypeBox.unbind();
+			// add events
+			if (result.current_dir_path) {
+				moveupLink.click(function(e) {
+					reloadPage(result.moveup_dir_path, orderTypeBox.val(), createFunc);
+				});
+			}
+			function changeFunc() {
+				if (viewTypeBox.val() == 'VIEW') {
+					reloadPage(result.current_dir_path, orderTypeBox.val(), createView);
+				} else {
+					reloadPage(result.current_dir_path, orderTypeBox.val(), createList);
+				}
+			}
+			viewTypeBox.change(changeFunc);
+			orderTypeBox.change(changeFunc);
+			bodyDiv.html('');
+		}
+		function createList(result) {
+			createCommon(result, createList);
+			var table = document.createElement('table');
+			table.className = 'ke-table';
+			table.cellPadding = 0;
+			table.cellSpacing = 0;
+			table.border = 0;
+			bodyDiv.append(table);
+			var fileList = result.file_list;
+			for (var i = 0, len = fileList.length; i < len; i++) {
+				var data = fileList[i], row = K(table.insertRow(i));
+				row.mouseover(function(e) {
+					K(this).addClass('ke-on');
+				})
+				.mouseout(function(e) {
+					K(this).removeClass('ke-on');
+				});
+				var iconUrl = imgPath + (data.is_dir ? 'folder-16.gif' : 'file-16.gif'),
+					img = K('<img src="' + iconUrl + '" width="16" height="16" alt="' + data.filename + '" align="absmiddle" />'),
+					cell0 = K(row[0].insertCell(0)).addClass('ke-cell ke-name').append(img).append(document.createTextNode(' ' + data.filename));
+				if (!data.is_dir || data.has_file) {
+					row.css('cursor', 'pointer');
+					cell0.attr('title', data.filename);
+					bindEvent(cell0, result, data, createList);
+				} else {
+					cell0.attr('title', lang.emptyFolder);
+				}
+				K(row[0].insertCell(1)).addClass('ke-cell ke-size').html(data.is_dir ? '-' : Math.ceil(data.filesize / 1024) + 'KB');
+				K(row[0].insertCell(2)).addClass('ke-cell ke-datetime').html(data.datetime);
+			}
+		}
+		function createView(result) {
+			createCommon(result, createView);
+			var fileList = result.file_list;
+			for (var i = 0, len = fileList.length; i < len; i++) {
+				var data = fileList[i],
+					div = K('<div class="ke-inline-block ke-item"></div>');
+				bodyDiv.append(div);
+				var photoDiv = K('<div class="ke-inline-block ke-photo"></div>')
+					.mouseover(function(e) {
+						K(this).addClass('ke-on');
+					})
+					.mouseout(function(e) {
+						K(this).removeClass('ke-on');
+					});
+				div.append(photoDiv);
+				var fileUrl = result.current_url + data.filename,
+					iconUrl = data.is_dir ? imgPath + 'folder-64.gif' : (data.is_photo ? fileUrl : imgPath + 'file-64.gif');
+				var img = K('<img src="' + iconUrl + '" width="80" height="80" alt="' + data.filename + '" />');
+				if (!data.is_dir || data.has_file) {
+					photoDiv.css('cursor', 'pointer');
+					bindTitle(photoDiv, data);
+					bindEvent(photoDiv, result, data, createView);
+				} else {
+					photoDiv.attr('title', lang.emptyFolder);
+				}
+				photoDiv.append(img);
+				div.append('<div class="ke-name" title="' + data.filename + '">' + data.filename + '</div>');
+			}
+		}
+		viewTypeBox.val(viewType);
+		reloadPage('', orderTypeBox.val(), viewType == 'VIEW' ? createView : createList);
+		return dialog;
+	}
+
+});
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('flash', function(K) {
+	var self = this, name = 'flash', lang = self.lang(name + '.'),
+		allowFlashUpload = K.undef(self.allowFlashUpload, true),
+		allowFileManager = K.undef(self.allowFileManager, false),
+		formatUploadUrl = K.undef(self.formatUploadUrl, true),
+		extraParams = K.undef(self.extraFileUploadParams, {}),
+		filePostName = K.undef(self.filePostName, 'imgFile'),
+		uploadJson = K.undef(self.uploadJson, self.basePath + 'php/upload_json.php');
+	self.plugin.flash = {
+		edit : function() {
+			var html = [
+				'<div style="padding:20px;">',
+				//url
+				'<div class="ke-dialog-row">',
+				'<label for="keUrl" style="width:60px;">' + lang.url + '</label>',
+				'<input class="ke-input-text" type="text" id="keUrl" name="url" value="" style="width:160px;" /> &nbsp;',
+				'<input type="button" class="ke-upload-button" value="' + lang.upload + '" /> &nbsp;',
+				'<span class="ke-button-common ke-button-outer">',
+				'<input type="button" class="ke-button-common ke-button" name="viewServer" value="' + lang.viewServer + '" />',
+				'</span>',
+				'</div>',
+				//width
+				'<div class="ke-dialog-row">',
+				'<label for="keWidth" style="width:60px;">' + lang.width + '</label>',
+				'<input type="text" id="keWidth" class="ke-input-text ke-input-number" name="width" value="550" maxlength="4" /> ',
+				'</div>',
+				//height
+				'<div class="ke-dialog-row">',
+				'<label for="keHeight" style="width:60px;">' + lang.height + '</label>',
+				'<input type="text" id="keHeight" class="ke-input-text ke-input-number" name="height" value="400" maxlength="4" /> ',
+				'</div>',
+				'</div>'
+			].join('');
+			var dialog = self.createDialog({
+				name : name,
+				width : 450,
+				title : self.lang(name),
+				body : html,
+				yesBtn : {
+					name : self.lang('yes'),
+					click : function(e) {
+						var url = K.trim(urlBox.val()),
+							width = widthBox.val(),
+							height = heightBox.val();
+						if (url == 'http://' || K.invalidUrl(url)) {
+							alert(self.lang('invalidUrl'));
+							urlBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(width)) {
+							alert(self.lang('invalidWidth'));
+							widthBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(height)) {
+							alert(self.lang('invalidHeight'));
+							heightBox[0].focus();
+							return;
+						}
+						var html = K.mediaImg(self.themesPath + 'common/blank.gif', {
+								src : url,
+								type : K.mediaType('.swf'),
+								width : width,
+								height : height,
+								quality : 'high'
+							});
+						self.insertHtml(html).hideDialog().focus();
+					}
+				}
+			}),
+			div = dialog.div,
+			urlBox = K('[name="url"]', div),
+			viewServerBtn = K('[name="viewServer"]', div),
+			widthBox = K('[name="width"]', div),
+			heightBox = K('[name="height"]', div);
+			urlBox.val('http://');
+
+			if (allowFlashUpload) {
+				var uploadbutton = K.uploadbutton({
+					button : K('.ke-upload-button', div)[0],
+					fieldName : filePostName,
+					extraParams : extraParams,
+					url : K.addParam(uploadJson, 'dir=flash'),
+					afterUpload : function(data) {
+						dialog.hideLoading();
+						if (data.error === 0) {
+							var url = data.url;
+							if (formatUploadUrl) {
+								url = K.formatUrl(url, 'absolute');
+							}
+							urlBox.val(url);
+							if (self.afterUpload) {
+								self.afterUpload.call(self, url, data, name);
+							}
+							alert(self.lang('uploadSuccess'));
+						} else {
+							alert(data.message);
+						}
+					},
+					afterError : function(html) {
+						dialog.hideLoading();
+						self.errorDialog(html);
+					}
+				});
+				uploadbutton.fileBox.change(function(e) {
+					dialog.showLoading(self.lang('uploadLoading'));
+					uploadbutton.submit();
+				});
+			} else {
+				K('.ke-upload-button', div).hide();
+			}
+
+			if (allowFileManager) {
+				viewServerBtn.click(function(e) {
+					self.loadPlugin('filemanager', function() {
+						self.plugin.filemanagerDialog({
+							viewType : 'LIST',
+							dirName : 'flash',
+							clickFn : function(url, title) {
+								if (self.dialogs.length > 1) {
+									K('[name="url"]', div).val(url);
+									if (self.afterSelectFile) {
+										self.afterSelectFile.call(self, url);
+									}
+									self.hideDialog();
+								}
+							}
+						});
+					});
+				});
+			} else {
+				viewServerBtn.hide();
+			}
+
+			var img = self.plugin.getSelectedFlash();
+			if (img) {
+				var attrs = K.mediaAttrs(img.attr('data-ke-tag'));
+				urlBox.val(attrs.src);
+				widthBox.val(K.removeUnit(img.css('width')) || attrs.width || 0);
+				heightBox.val(K.removeUnit(img.css('height')) || attrs.height || 0);
+			}
+			urlBox[0].focus();
+			urlBox[0].select();
+		},
+		'delete' : function() {
+			self.plugin.getSelectedFlash().remove();
+			// [IE] 删除图片后立即点击图片按钮出错
+			self.addBookmark();
+		}
+	};
+	self.clickToolbar(name, self.plugin.flash.edit);
+});
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('image', function(K) {
+	var self = this, name = 'image',
+		allowImageUpload = K.undef(self.allowImageUpload, true),
+		allowImageRemote = K.undef(self.allowImageRemote, true),
+		formatUploadUrl = K.undef(self.formatUploadUrl, true),
+		allowFileManager = K.undef(self.allowFileManager, false),
+		uploadJson = K.undef(self.uploadJson, self.basePath + 'php/upload_json.php'),
+		imageTabIndex = K.undef(self.imageTabIndex, 0),
+		imgPath = self.pluginsPath + 'image/images/',
+		extraParams = K.undef(self.extraFileUploadParams, {}),
+		filePostName = K.undef(self.filePostName, 'imgFile'),
+		fillDescAfterUploadImage = K.undef(self.fillDescAfterUploadImage, false),
+		lang = self.lang(name + '.');
+
+	self.plugin.imageDialog = function(options) {
+		var imageUrl = options.imageUrl,
+			imageWidth = K.undef(options.imageWidth, ''),
+			imageHeight = K.undef(options.imageHeight, ''),
+			imageTitle = K.undef(options.imageTitle, ''),
+			imageAlign = K.undef(options.imageAlign, ''),
+			showRemote = K.undef(options.showRemote, true),
+			showLocal = K.undef(options.showLocal, true),
+			tabIndex = K.undef(options.tabIndex, 0),
+			clickFn = options.clickFn;
+		var target = 'kindeditor_upload_iframe_' + new Date().getTime();
+		var hiddenElements = [];
+		for(var k in extraParams){
+			hiddenElements.push('<input type="hidden" name="' + k + '" value="' + extraParams[k] + '" />');
+		}
+		var html = [
+			'<div style="padding:20px;">',
+			//tabs
+			'<div class="tabs"></div>',
+			//remote image - start
+			'<div class="tab1" style="display:none;">',
+			//url
+			'<div class="ke-dialog-row">',
+			'<label for="remoteUrl" style="width:60px;">' + lang.remoteUrl + '</label>',
+			'<input type="text" id="remoteUrl" class="ke-input-text" name="url" value="" style="width:200px;" /> &nbsp;',
+			'<span class="ke-button-common ke-button-outer">',
+			'<input type="button" class="ke-button-common ke-button" name="viewServer" value="' + lang.viewServer + '" />',
+			'</span>',
+			'</div>',
+			//size
+			'<div class="ke-dialog-row">',
+			'<label for="remoteWidth" style="width:60px;">' + lang.size + '</label>',
+			lang.width + ' <input type="text" id="remoteWidth" class="ke-input-text ke-input-number" name="width" value="" maxlength="4" /> ',
+			lang.height + ' <input type="text" class="ke-input-text ke-input-number" name="height" value="" maxlength="4" /> ',
+			'<img class="ke-refresh-btn" src="' + imgPath + 'refresh.png" width="16" height="16" alt="" style="cursor:pointer;" title="' + lang.resetSize + '" />',
+			'</div>',
+			//align
+			'<div class="ke-dialog-row">',
+			'<label style="width:60px;">' + lang.align + '</label>',
+			'<input type="radio" name="align" class="ke-inline-block" value="" checked="checked" /> <img name="defaultImg" src="' + imgPath + 'align_top.gif" width="23" height="25" alt="" />',
+			' <input type="radio" name="align" class="ke-inline-block" value="left" /> <img name="leftImg" src="' + imgPath + 'align_left.gif" width="23" height="25" alt="" />',
+			' <input type="radio" name="align" class="ke-inline-block" value="right" /> <img name="rightImg" src="' + imgPath + 'align_right.gif" width="23" height="25" alt="" />',
+			'</div>',
+			//title
+			'<div class="ke-dialog-row">',
+			'<label for="remoteTitle" style="width:60px;">' + lang.imgTitle + '</label>',
+			'<input type="text" id="remoteTitle" class="ke-input-text" name="title" value="" style="width:200px;" />',
+			'</div>',
+			'</div>',
+			//remote image - end
+			//local upload - start
+			'<div class="tab2" style="display:none;">',
+			'<iframe name="' + target + '" style="display:none;"></iframe>',
+			'<form class="ke-upload-area ke-form" method="post" enctype="multipart/form-data" target="' + target + '" action="' + K.addParam(uploadJson, 'dir=image') + '">',
+			//file
+			'<div class="ke-dialog-row">',
+			hiddenElements.join(''),
+			'<label style="width:60px;">' + lang.localUrl + '</label>',
+			'<input type="text" name="localUrl" class="ke-input-text" tabindex="-1" style="width:200px;" readonly="true" /> &nbsp;',
+			'<input type="button" class="ke-upload-button" value="' + lang.upload + '" />',
+			'</div>',
+			'</form>',
+			'</div>',
+			//local upload - end
+			'</div>'
+		].join('');
+		var dialogWidth = showLocal || allowFileManager ? 450 : 400,
+			dialogHeight = showLocal && showRemote ? 300 : 250;
+		var dialog = self.createDialog({
+			name : name,
+			width : dialogWidth,
+			height : dialogHeight,
+			title : self.lang(name),
+			body : html,
+			yesBtn : {
+				name : self.lang('yes'),
+				click : function(e) {
+					// Bugfix: http://code.google.com/p/kindeditor/issues/detail?id=319
+					if (dialog.isLoading) {
+						return;
+					}
+					// insert local image
+					if (showLocal && showRemote && tabs && tabs.selectedIndex === 1 || !showRemote) {
+						if (uploadbutton.fileBox.val() == '') {
+							alert(self.lang('pleaseSelectFile'));
+							return;
+						}
+						dialog.showLoading(self.lang('uploadLoading'));
+						uploadbutton.submit();
+						localUrlBox.val('');
+						return;
+					}
+					// insert remote image
+					var url = K.trim(urlBox.val()),
+						width = widthBox.val(),
+						height = heightBox.val(),
+						title = titleBox.val(),
+						align = '';
+					alignBox.each(function() {
+						if (this.checked) {
+							align = this.value;
+							return false;
+						}
+					});
+					if (url == 'http://' || K.invalidUrl(url)) {
+						alert(self.lang('invalidUrl'));
+						urlBox[0].focus();
+						return;
+					}
+					if (!/^\d*$/.test(width)) {
+						alert(self.lang('invalidWidth'));
+						widthBox[0].focus();
+						return;
+					}
+					if (!/^\d*$/.test(height)) {
+						alert(self.lang('invalidHeight'));
+						heightBox[0].focus();
+						return;
+					}
+					clickFn.call(self, url, title, width, height, 0, align);
+				}
+			},
+			beforeRemove : function() {
+				viewServerBtn.unbind();
+				widthBox.unbind();
+				heightBox.unbind();
+				refreshBtn.unbind();
+			}
+		}),
+		div = dialog.div;
+
+		var urlBox = K('[name="url"]', div),
+			localUrlBox = K('[name="localUrl"]', div),
+			viewServerBtn = K('[name="viewServer"]', div),
+			widthBox = K('.tab1 [name="width"]', div),
+			heightBox = K('.tab1 [name="height"]', div),
+			refreshBtn = K('.ke-refresh-btn', div),
+			titleBox = K('.tab1 [name="title"]', div),
+			alignBox = K('.tab1 [name="align"]', div);
+
+		var tabs;
+		if (showRemote && showLocal) {
+			tabs = K.tabs({
+				src : K('.tabs', div),
+				afterSelect : function(i) {}
+			});
+			tabs.add({
+				title : lang.remoteImage,
+				panel : K('.tab1', div)
+			});
+			tabs.add({
+				title : lang.localImage,
+				panel : K('.tab2', div)
+			});
+			tabs.select(tabIndex);
+		} else if (showRemote) {
+			K('.tab1', div).show();
+		} else if (showLocal) {
+			K('.tab2', div).show();
+		}
+
+		var uploadbutton = K.uploadbutton({
+			button : K('.ke-upload-button', div)[0],
+			fieldName : filePostName,
+			form : K('.ke-form', div),
+			target : target,
+			width: 60,
+			afterUpload : function(data) {
+				dialog.hideLoading();
+				if (data.error === 0) {
+					var url = data.url;
+					if (formatUploadUrl) {
+						url = K.formatUrl(url, 'absolute');
+					}
+					if (self.afterUpload) {
+						self.afterUpload.call(self, url, data, name);
+					}
+					if (!fillDescAfterUploadImage) {
+						clickFn.call(self, url, data.title, data.width, data.height, data.border, data.align);
+					} else {
+						K(".ke-dialog-row #remoteUrl", div).val(url);
+						K(".ke-tabs-li", div)[0].click();
+						K(".ke-refresh-btn", div).click();
+					}
+				} else {
+					alert(data.message);
+				}
+			},
+			afterError : function(html) {
+				dialog.hideLoading();
+				self.errorDialog(html);
+			}
+		});
+		uploadbutton.fileBox.change(function(e) {
+			localUrlBox.val(uploadbutton.fileBox.val());
+		});
+		if (allowFileManager) {
+			viewServerBtn.click(function(e) {
+				self.loadPlugin('filemanager', function() {
+					self.plugin.filemanagerDialog({
+						viewType : 'VIEW',
+						dirName : 'image',
+						clickFn : function(url, title) {
+							if (self.dialogs.length > 1) {
+								K('[name="url"]', div).val(url);
+								if (self.afterSelectFile) {
+									self.afterSelectFile.call(self, url);
+								}
+								self.hideDialog();
+							}
+						}
+					});
+				});
+			});
+		} else {
+			viewServerBtn.hide();
+		}
+		var originalWidth = 0, originalHeight = 0;
+		function setSize(width, height) {
+			widthBox.val(width);
+			heightBox.val(height);
+			originalWidth = width;
+			originalHeight = height;
+		}
+		refreshBtn.click(function(e) {
+			var tempImg = K('<img src="' + urlBox.val() + '" />', document).css({
+				position : 'absolute',
+				visibility : 'hidden',
+				top : 0,
+				left : '-1000px'
+			});
+			tempImg.bind('load', function() {
+				setSize(tempImg.width(), tempImg.height());
+				tempImg.remove();
+			});
+			K(document.body).append(tempImg);
+		});
+		widthBox.change(function(e) {
+			if (originalWidth > 0) {
+				heightBox.val(Math.round(originalHeight / originalWidth * parseInt(this.value, 10)));
+			}
+		});
+		heightBox.change(function(e) {
+			if (originalHeight > 0) {
+				widthBox.val(Math.round(originalWidth / originalHeight * parseInt(this.value, 10)));
+			}
+		});
+		urlBox.val(options.imageUrl);
+		setSize(options.imageWidth, options.imageHeight);
+		titleBox.val(options.imageTitle);
+		alignBox.each(function() {
+			if (this.value === options.imageAlign) {
+				this.checked = true;
+				return false;
+			}
+		});
+		if (showRemote && tabIndex === 0) {
+			urlBox[0].focus();
+			urlBox[0].select();
+		}
+		return dialog;
+	};
+	self.plugin.image = {
+		edit : function() {
+			var img = self.plugin.getSelectedImage();
+			self.plugin.imageDialog({
+				imageUrl : img ? img.attr('data-ke-src') : 'http://',
+				imageWidth : img ? img.width() : '',
+				imageHeight : img ? img.height() : '',
+				imageTitle : img ? img.attr('title') : '',
+				imageAlign : img ? img.attr('align') : '',
+				showRemote : allowImageRemote,
+				showLocal : allowImageUpload,
+				tabIndex: img ? 0 : imageTabIndex,
+				clickFn : function(url, title, width, height, border, align) {
+					if (img) {
+						img.attr('src', url);
+						img.attr('data-ke-src', url);
+						img.attr('width', width);
+						img.attr('height', height);
+						img.attr('title', title);
+						img.attr('align', align);
+						img.attr('alt', title);
+					} else {
+						self.exec('insertimage', url, title, width, height, border, align);
+					}
+					// Bugfix: [Firefox] 上传图片后，总是出现正在加载的样式，需要延迟执行hideDialog
+					setTimeout(function() {
+						self.hideDialog().focus();
+					}, 0);
+				}
+			});
+		},
+		'delete' : function() {
+			var target = self.plugin.getSelectedImage();
+			if (target.parent().name == 'a') {
+				target = target.parent();
+			}
+			target.remove();
+			// [IE] 删除图片后立即点击图片按钮出错
+			self.addBookmark();
+		}
+	};
+	self.clickToolbar(name, self.plugin.image.edit);
+});
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('insertfile', function(K) {
+	var self = this, name = 'insertfile',
+		allowFileUpload = K.undef(self.allowFileUpload, true),
+		allowFileManager = K.undef(self.allowFileManager, false),
+		formatUploadUrl = K.undef(self.formatUploadUrl, true),
+		uploadJson = K.undef(self.uploadJson, self.basePath + 'php/upload_json.php'),
+		extraParams = K.undef(self.extraFileUploadParams, {}),
+		filePostName = K.undef(self.filePostName, 'imgFile'),
+		lang = self.lang(name + '.');
+	self.plugin.fileDialog = function(options) {
+		var fileUrl = K.undef(options.fileUrl, 'http://'),
+			fileTitle = K.undef(options.fileTitle, ''),
+			clickFn = options.clickFn;
+		var html = [
+			'<div style="padding:20px;">',
+			'<div class="ke-dialog-row">',
+			'<label for="keUrl" style="width:60px;">' + lang.url + '</label>',
+			'<input type="text" id="keUrl" name="url" class="ke-input-text" style="width:160px;" /> &nbsp;',
+			'<input type="button" class="ke-upload-button" value="' + lang.upload + '" /> &nbsp;',
+			'<span class="ke-button-common ke-button-outer">',
+			'<input type="button" class="ke-button-common ke-button" name="viewServer" value="' + lang.viewServer + '" />',
+			'</span>',
+			'</div>',
+			//title
+			'<div class="ke-dialog-row">',
+			'<label for="keTitle" style="width:60px;">' + lang.title + '</label>',
+			'<input type="text" id="keTitle" class="ke-input-text" name="title" value="" style="width:160px;" /></div>',
+			'</div>',
+			//form end
+			'</form>',
+			'</div>'
+			].join('');
+		var dialog = self.createDialog({
+			name : name,
+			width : 450,
+			title : self.lang(name),
+			body : html,
+			yesBtn : {
+				name : self.lang('yes'),
+				click : function(e) {
+					var url = K.trim(urlBox.val()),
+						title = titleBox.val();
+					if (url == 'http://' || K.invalidUrl(url)) {
+						alert(self.lang('invalidUrl'));
+						urlBox[0].focus();
+						return;
+					}
+					if (K.trim(title) === '') {
+						title = url;
+					}
+					clickFn.call(self, url, title);
+				}
+			}
+		}),
+		div = dialog.div;
+
+		var urlBox = K('[name="url"]', div),
+			viewServerBtn = K('[name="viewServer"]', div),
+			titleBox = K('[name="title"]', div);
+
+		if (allowFileUpload) {
+			var uploadbutton = K.uploadbutton({
+				button : K('.ke-upload-button', div)[0],
+				fieldName : filePostName,
+				url : K.addParam(uploadJson, 'dir=file'),
+				extraParams : extraParams,
+				afterUpload : function(data) {
+					dialog.hideLoading();
+					if (data.error === 0) {
+						var url = data.url;
+						if (formatUploadUrl) {
+							url = K.formatUrl(url, 'absolute');
+						}
+						urlBox.val(url);
+						if (self.afterUpload) {
+							self.afterUpload.call(self, url, data, name);
+						}
+						alert(self.lang('uploadSuccess'));
+					} else {
+						alert(data.message);
+					}
+				},
+				afterError : function(html) {
+					dialog.hideLoading();
+					self.errorDialog(html);
+				}
+			});
+			uploadbutton.fileBox.change(function(e) {
+				dialog.showLoading(self.lang('uploadLoading'));
+				uploadbutton.submit();
+			});
+		} else {
+			K('.ke-upload-button', div).hide();
+		}
+		if (allowFileManager) {
+			viewServerBtn.click(function(e) {
+				self.loadPlugin('filemanager', function() {
+					self.plugin.filemanagerDialog({
+						viewType : 'LIST',
+						dirName : 'file',
+						clickFn : function(url, title) {
+							if (self.dialogs.length > 1) {
+								K('[name="url"]', div).val(url);
+								if (self.afterSelectFile) {
+									self.afterSelectFile.call(self, url);
+								}
+								self.hideDialog();
+							}
+						}
+					});
+				});
+			});
+		} else {
+			viewServerBtn.hide();
+		}
+		urlBox.val(fileUrl);
+		titleBox.val(fileTitle);
+		urlBox[0].focus();
+		urlBox[0].select();
+	};
+	self.clickToolbar(name, function() {
+		self.plugin.fileDialog({
+			clickFn : function(url, title) {
+				var html = '<a class="ke-insertfile" href="' + url + '" data-ke-src="' + url + '" target="_blank">' + title + '</a>';
+				self.insertHtml(html).hideDialog().focus();
+			}
+		});
+	});
+});
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('lineheight', function(K) {
+	var self = this, name = 'lineheight', lang = self.lang(name + '.');
+	self.clickToolbar(name, function() {
+		var curVal = '', commonNode = self.cmd.commonNode({'*' : '.line-height'});
+		if (commonNode) {
+			curVal = commonNode.css('line-height');
+		}
+		var menu = self.createMenu({
+			name : name,
+			width : 150
+		});
+		K.each(lang.lineHeight, function(i, row) {
+			K.each(row, function(key, val) {
+				menu.addItem({
+					title : val,
+					checked : curVal === key,
+					click : function() {
+						self.cmd.toggle('<span style="line-height:' + key + ';"></span>', {
+							span : '.line-height=' + key
+						});
+						self.updateState();
+						self.addBookmark();
+						self.hideMenu();
+					}
+				});
+			});
+		});
+	});
+});
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('link', function(K) {
+	var self = this, name = 'link';
+	self.plugin.link = {
+		edit : function() {
+			var lang = self.lang(name + '.'),
+				html = '<div style="padding:20px;">' +
+					//url
+					'<div class="ke-dialog-row">' +
+					'<label for="keUrl" style="width:60px;">' + lang.url + '</label>' +
+					'<input class="ke-input-text" type="text" id="keUrl" name="url" value="" style="width:260px;" /></div>' +
+					//type
+					'<div class="ke-dialog-row"">' +
+					'<label for="keType" style="width:60px;">' + lang.linkType + '</label>' +
+					'<select id="keType" name="type"></select>' +
+					'</div>' +
+					'</div>',
+				dialog = self.createDialog({
+					name : name,
+					width : 450,
+					title : self.lang(name),
+					body : html,
+					yesBtn : {
+						name : self.lang('yes'),
+						click : function(e) {
+							var url = K.trim(urlBox.val());
+							if (url == 'http://' || K.invalidUrl(url)) {
+								alert(self.lang('invalidUrl'));
+								urlBox[0].focus();
+								return;
+							}
+							self.exec('createlink', url, typeBox.val()).hideDialog().focus();
+						}
+					}
+				}),
+				div = dialog.div,
+				urlBox = K('input[name="url"]', div),
+				typeBox = K('select[name="type"]', div);
+			urlBox.val('http://');
+			typeBox[0].options[0] = new Option(lang.newWindow, '_blank');
+			typeBox[0].options[1] = new Option(lang.selfWindow, '');
+			self.cmd.selection();
+			var a = self.plugin.getSelectedLink();
+			if (a) {
+				self.cmd.range.selectNode(a[0]);
+				self.cmd.select();
+				urlBox.val(a.attr('data-ke-src'));
+				typeBox.val(a.attr('target'));
+			}
+			urlBox[0].focus();
+			urlBox[0].select();
+		},
+		'delete' : function() {
+			self.exec('unlink', null);
+		}
+	};
+	self.clickToolbar(name, self.plugin.link.edit);
+});
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+// Google Maps: http://code.google.com/apis/maps/index.html
+
+KindEditor.plugin('map', function(K) {
+	var self = this, name = 'map', lang = self.lang(name + '.');
+	self.clickToolbar(name, function() {
+		var html = ['<div style="padding:10px 20px;">',
+			'<div class="ke-dialog-row">',
+			lang.address + ' <input id="kindeditor_plugin_map_address" name="address" class="ke-input-text" value="" style="width:200px;" /> ',
+			'<span class="ke-button-common ke-button-outer">',
+			'<input type="button" name="searchBtn" class="ke-button-common ke-button" value="' + lang.search + '" />',
+			'</span>',
+			'</div>',
+			'<div class="ke-map" style="width:558px;height:360px;"></div>',
+			'</div>'].join('');
+		var dialog = self.createDialog({
+			name : name,
+			width : 600,
+			title : self.lang(name),
+			body : html,
+			yesBtn : {
+				name : self.lang('yes'),
+				click : function(e) {
+					var geocoder = win.geocoder,
+						map = win.map,
+						center = map.getCenter().lat() + ',' + map.getCenter().lng(),
+						zoom = map.getZoom(),
+						maptype = map.getMapTypeId(),
+						url = 'http://maps.googleapis.com/maps/api/staticmap';
+						url += '?center=' + encodeURIComponent(center);
+						url += '&zoom=' + encodeURIComponent(zoom);
+						url += '&size=558x360';
+						url += '&maptype=' + encodeURIComponent(maptype);
+						url += '&markers=' + encodeURIComponent(center);
+						url += '&language=' + self.langType;
+						url += '&sensor=false';
+					self.exec('insertimage', url).hideDialog().focus();
+				}
+			},
+			beforeRemove : function() {
+				searchBtn.remove();
+				if (doc) {
+					doc.write('');
+				}
+				iframe.remove();
+			}
+		});
+		var div = dialog.div,
+			addressBox = K('[name="address"]', div),
+			searchBtn = K('[name="searchBtn"]', div),
+			win, doc;
+		var iframeHtml = ['<!doctype html><html><head>',
+			'<meta name="viewport" content="initial-scale=1.0, user-scalable=no" />',
+			'<style>',
+			'	html { height: 100% }',
+			'	body { height: 100%; margin: 0; padding: 0; background-color: #FFF }',
+			'	#map_canvas { height: 100% }',
+			'</style>',
+			'<script src="http://maps.googleapis.com/maps/api/js?sensor=false&language=' + self.langType + '"></script>',
+			'<script>',
+			'var map, geocoder;',
+			'function initialize() {',
+			'	var latlng = new google.maps.LatLng(31.230393, 121.473704);',
+			'	var options = {',
+			'		zoom: 11,',
+			'		center: latlng,',
+			'		disableDefaultUI: true,',
+			'		panControl: true,',
+			'		zoomControl: true,',
+			'		mapTypeControl: true,',
+			'		scaleControl: true,',
+			'		streetViewControl: false,',
+			'		overviewMapControl: true,',
+			'		mapTypeId: google.maps.MapTypeId.ROADMAP',
+			'	};',
+			'	map = new google.maps.Map(document.getElementById("map_canvas"), options);',
+			'	geocoder = new google.maps.Geocoder();',
+			'	geocoder.geocode({latLng: latlng}, function(results, status) {',
+			'		if (status == google.maps.GeocoderStatus.OK) {',
+			'			if (results[3]) {',
+			'				parent.document.getElementById("kindeditor_plugin_map_address").value = results[3].formatted_address;',
+			'			}',
+			'		}',
+			'	});',
+			'}',
+			'function search(address) {',
+			'	if (!map) return;',
+			'	geocoder.geocode({address : address}, function(results, status) {',
+			'		if (status == google.maps.GeocoderStatus.OK) {',
+			'			map.setZoom(11);',
+			'			map.setCenter(results[0].geometry.location);',
+			'			var marker = new google.maps.Marker({',
+			'				map: map,',
+			'				position: results[0].geometry.location',
+			'			});',
+			'		} else {',
+			'			alert("Invalid address: " + address);',
+			'		}',
+			'	});',
+			'}',
+			'</script>',
+			'</head>',
+			'<body onload="initialize();">',
+			'<div id="map_canvas" style="width:100%; height:100%"></div>',
+			'</body></html>'].join('\n');
+		// TODO：用doc.write(iframeHtml)方式加载时，在IE6上第一次加载报错，暂时使用src方式
+		var iframe = K('<iframe class="ke-textarea" frameborder="0" src="' + self.pluginsPath + 'map/map.html" style="width:558px;height:360px;"></iframe>');
+		function ready() {
+			win = iframe[0].contentWindow;
+			doc = K.iframeDoc(iframe);
+			//doc.open();
+			//doc.write(iframeHtml);
+			//doc.close();
+		}
+		iframe.bind('load', function() {
+			iframe.unbind('load');
+			if (K.IE) {
+				ready();
+			} else {
+				setTimeout(ready, 0);
+			}
+		});
+		K('.ke-map', div).replaceWith(iframe);
+		// search map
+		searchBtn.click(function() {
+			win.search(addressBox.val());
+		});
+	});
+});
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('media', function(K) {
+	var self = this, name = 'media', lang = self.lang(name + '.'),
+		allowMediaUpload = K.undef(self.allowMediaUpload, true),
+		allowFileManager = K.undef(self.allowFileManager, false),
+		formatUploadUrl = K.undef(self.formatUploadUrl, true),
+		extraParams = K.undef(self.extraFileUploadParams, {}),
+		filePostName = K.undef(self.filePostName, 'imgFile'),
+		uploadJson = K.undef(self.uploadJson, self.basePath + 'php/upload_json.php');
+	self.plugin.media = {
+		edit : function() {
+			var html = [
+				'<div style="padding:20px;">',
+				//url
+				'<div class="ke-dialog-row">',
+				'<label for="keUrl" style="width:60px;">' + lang.url + '</label>',
+				'<input class="ke-input-text" type="text" id="keUrl" name="url" value="" style="width:160px;" /> &nbsp;',
+				'<input type="button" class="ke-upload-button" value="' + lang.upload + '" /> &nbsp;',
+				'<span class="ke-button-common ke-button-outer">',
+				'<input type="button" class="ke-button-common ke-button" name="viewServer" value="' + lang.viewServer + '" />',
+				'</span>',
+				'</div>',
+				//width
+				'<div class="ke-dialog-row">',
+				'<label for="keWidth" style="width:60px;">' + lang.width + '</label>',
+				'<input type="text" id="keWidth" class="ke-input-text ke-input-number" name="width" value="550" maxlength="4" />',
+				'</div>',
+				//height
+				'<div class="ke-dialog-row">',
+				'<label for="keHeight" style="width:60px;">' + lang.height + '</label>',
+				'<input type="text" id="keHeight" class="ke-input-text ke-input-number" name="height" value="400" maxlength="4" />',
+				'</div>',
+				//autostart
+				'<div class="ke-dialog-row">',
+				'<label for="keAutostart">' + lang.autostart + '</label>',
+				'<input type="checkbox" id="keAutostart" name="autostart" value="" /> ',
+				'</div>',
+				'</div>'
+			].join('');
+			var dialog = self.createDialog({
+				name : name,
+				width : 450,
+				height : 230,
+				title : self.lang(name),
+				body : html,
+				yesBtn : {
+					name : self.lang('yes'),
+					click : function(e) {
+						var url = K.trim(urlBox.val()),
+							width = widthBox.val(),
+							height = heightBox.val();
+						if (url == 'http://' || K.invalidUrl(url)) {
+							alert(self.lang('invalidUrl'));
+							urlBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(width)) {
+							alert(self.lang('invalidWidth'));
+							widthBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(height)) {
+							alert(self.lang('invalidHeight'));
+							heightBox[0].focus();
+							return;
+						}
+						var html = K.mediaImg(self.themesPath + 'common/blank.gif', {
+								src : url,
+								type : K.mediaType(url),
+								width : width,
+								height : height,
+								autostart : autostartBox[0].checked ? 'true' : 'false',
+								loop : 'true'
+							});
+						self.insertHtml(html).hideDialog().focus();
+					}
+				}
+			}),
+			div = dialog.div,
+			urlBox = K('[name="url"]', div),
+			viewServerBtn = K('[name="viewServer"]', div),
+			widthBox = K('[name="width"]', div),
+			heightBox = K('[name="height"]', div),
+			autostartBox = K('[name="autostart"]', div);
+			urlBox.val('http://');
+
+			if (allowMediaUpload) {
+				var uploadbutton = K.uploadbutton({
+					button : K('.ke-upload-button', div)[0],
+					fieldName : filePostName,
+					extraParams : extraParams,
+					url : K.addParam(uploadJson, 'dir=media'),
+					afterUpload : function(data) {
+						dialog.hideLoading();
+						if (data.error === 0) {
+							var url = data.url;
+							if (formatUploadUrl) {
+								url = K.formatUrl(url, 'absolute');
+							}
+							urlBox.val(url);
+							if (self.afterUpload) {
+								self.afterUpload.call(self, url, data, name);
+							}
+							alert(self.lang('uploadSuccess'));
+						} else {
+							alert(data.message);
+						}
+					},
+					afterError : function(html) {
+						dialog.hideLoading();
+						self.errorDialog(html);
+					}
+				});
+				uploadbutton.fileBox.change(function(e) {
+					dialog.showLoading(self.lang('uploadLoading'));
+					uploadbutton.submit();
+				});
+			} else {
+				K('.ke-upload-button', div).hide();
+			}
+
+			if (allowFileManager) {
+				viewServerBtn.click(function(e) {
+					self.loadPlugin('filemanager', function() {
+						self.plugin.filemanagerDialog({
+							viewType : 'LIST',
+							dirName : 'media',
+							clickFn : function(url, title) {
+								if (self.dialogs.length > 1) {
+									K('[name="url"]', div).val(url);
+									if (self.afterSelectFile) {
+										self.afterSelectFile.call(self, url);
+									}
+									self.hideDialog();
+								}
+							}
+						});
+					});
+				});
+			} else {
+				viewServerBtn.hide();
+			}
+
+			var img = self.plugin.getSelectedMedia();
+			if (img) {
+				var attrs = K.mediaAttrs(img.attr('data-ke-tag'));
+				urlBox.val(attrs.src);
+				widthBox.val(K.removeUnit(img.css('width')) || attrs.width || 0);
+				heightBox.val(K.removeUnit(img.css('height')) || attrs.height || 0);
+				autostartBox[0].checked = (attrs.autostart === 'true');
+			}
+			urlBox[0].focus();
+			urlBox[0].select();
+		},
+		'delete' : function() {
+			self.plugin.getSelectedMedia().remove();
+			// [IE] 删除图片后立即点击图片按钮出错
+			self.addBookmark();
+		}
+	};
+	self.clickToolbar(name, self.plugin.media.edit);
+});
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+
+(function(K) {
+
+function KSWFUpload(options) {
+	this.init(options);
+}
+K.extend(KSWFUpload, {
+	init : function(options) {
+		var self = this;
+		options.afterError = options.afterError || function(str) {
+			alert(str);
+		};
+		self.options = options;
+		self.progressbars = {};
+		// template
+		self.div = K(options.container).html([
+			'<div class="ke-swfupload">',
+			'<div class="ke-swfupload-top">',
+			'<div class="ke-inline-block ke-swfupload-button">',
+			'<input type="button" value="Browse" />',
+			'</div>',
+			'<div class="ke-inline-block ke-swfupload-desc">' + options.uploadDesc + '</div>',
+			'<span class="ke-button-common ke-button-outer ke-swfupload-startupload">',
+			'<input type="button" class="ke-button-common ke-button" value="' + options.startButtonValue + '" />',
+			'</span>',
+			'</div>',
+			'<div class="ke-swfupload-body"></div>',
+			'</div>'
+		].join(''));
+		self.bodyDiv = K('.ke-swfupload-body', self.div);
+
+		function showError(itemDiv, msg) {
+			K('.ke-status > div', itemDiv).hide();
+			K('.ke-message', itemDiv).addClass('ke-error').show().html(K.escape(msg));
+		}
+
+		var settings = {
+			debug : false,
+			upload_url : options.uploadUrl,
+			flash_url : options.flashUrl,
+			file_post_name : options.filePostName,
+			button_placeholder : K('.ke-swfupload-button > input', self.div)[0],
+			button_image_url: options.buttonImageUrl,
+			button_width: options.buttonWidth,
+			button_height: options.buttonHeight,
+			button_cursor : SWFUpload.CURSOR.HAND,
+			file_types : options.fileTypes,
+			file_types_description : options.fileTypesDesc,
+			file_upload_limit : options.fileUploadLimit,
+			file_size_limit : options.fileSizeLimit,
+			post_params : options.postParams,
+			file_queued_handler : function(file) {
+				file.url = self.options.fileIconUrl;
+				self.appendFile(file);
+			},
+			file_queue_error_handler : function(file, errorCode, message) {
+				var errorName = '';
+				switch (errorCode) {
+					case SWFUpload.QUEUE_ERROR.QUEUE_LIMIT_EXCEEDED:
+						errorName = options.queueLimitExceeded;
+						break;
+					case SWFUpload.QUEUE_ERROR.FILE_EXCEEDS_SIZE_LIMIT:
+						errorName = options.fileExceedsSizeLimit;
+						break;
+					case SWFUpload.QUEUE_ERROR.ZERO_BYTE_FILE:
+						errorName = options.zeroByteFile;
+						break;
+					case SWFUpload.QUEUE_ERROR.INVALID_FILETYPE:
+						errorName = options.invalidFiletype;
+						break;
+					default:
+						errorName = options.unknownError;
+						break;
+				}
+				K.DEBUG && alert(errorName);
+			},
+			upload_start_handler : function(file) {
+				var self = this;
+				var itemDiv = K('div[data-id="' + file.id + '"]', self.bodyDiv);
+				K('.ke-status > div', itemDiv).hide();
+				K('.ke-progressbar', itemDiv).show();
+			},
+			upload_progress_handler : function(file, bytesLoaded, bytesTotal) {
+				var percent = Math.round(bytesLoaded * 100 / bytesTotal);
+				var progressbar = self.progressbars[file.id];
+				progressbar.bar.css('width', Math.round(percent * 80 / 100) + 'px');
+				progressbar.percent.html(percent + '%');
+			},
+			upload_error_handler : function(file, errorCode, message) {
+				if (file && file.filestatus == SWFUpload.FILE_STATUS.ERROR) {
+					var itemDiv = K('div[data-id="' + file.id + '"]', self.bodyDiv).eq(0);
+					showError(itemDiv, self.options.errorMessage);
+				}
+			},
+			upload_success_handler : function(file, serverData) {
+				var itemDiv = K('div[data-id="' + file.id + '"]', self.bodyDiv).eq(0);
+				var data = {};
+				try {
+					data = K.json(serverData);
+				} catch (e) {
+					self.options.afterError.call(this, '<!doctype html><html>' + serverData + '</html>');
+				}
+				if (data.error !== 0) {
+					showError(itemDiv, K.DEBUG ? data.message : self.options.errorMessage);
+					return;
+				}
+				file.url = data.url;
+				K('.ke-img', itemDiv).attr('src', file.url).attr('data-status', file.filestatus).data('data', data);
+				K('.ke-status > div', itemDiv).hide();
+			}
+		};
+		self.swfu = new SWFUpload(settings);
+
+		K('.ke-swfupload-startupload input', self.div).click(function() {
+			self.swfu.startUpload();
+		});
+	},
+	getUrlList : function() {
+		var list = [];
+		K('.ke-img', self.bodyDiv).each(function() {
+			var img = K(this);
+			var status = img.attr('data-status');
+			if (status == SWFUpload.FILE_STATUS.COMPLETE) {
+				list.push(img.data('data'));
+			}
+		});
+		return list;
+	},
+	removeFile : function(fileId) {
+		var self = this;
+		self.swfu.cancelUpload(fileId);
+		var itemDiv = K('div[data-id="' + fileId + '"]', self.bodyDiv);
+		K('.ke-photo', itemDiv).unbind();
+		K('.ke-delete', itemDiv).unbind();
+		itemDiv.remove();
+	},
+	removeFiles : function() {
+		var self = this;
+		K('.ke-item', self.bodyDiv).each(function() {
+			self.removeFile(K(this).attr('data-id'));
+		});
+	},
+	appendFile : function(file) {
+		var self = this;
+		var itemDiv = K('<div class="ke-inline-block ke-item" data-id="' + file.id + '"></div>');
+		self.bodyDiv.append(itemDiv);
+		var photoDiv = K('<div class="ke-inline-block ke-photo"></div>')
+			.mouseover(function(e) {
+				K(this).addClass('ke-on');
+			})
+			.mouseout(function(e) {
+				K(this).removeClass('ke-on');
+			});
+		itemDiv.append(photoDiv);
+
+		var img = K('<img src="' + file.url + '" class="ke-img" data-status="' + file.filestatus + '" width="80" height="80" alt="' + file.name + '" />');
+		photoDiv.append(img);
+		K('<span class="ke-delete"></span>').appendTo(photoDiv).click(function() {
+			self.removeFile(file.id);
+		});
+		var statusDiv = K('<div class="ke-status"></div>').appendTo(photoDiv);
+		// progressbar
+		K(['<div class="ke-progressbar">',
+			'<div class="ke-progressbar-bar"><div class="ke-progressbar-bar-inner"></div></div>',
+			'<div class="ke-progressbar-percent">0%</div></div>'].join('')).hide().appendTo(statusDiv);
+		// message
+		K('<div class="ke-message">' + self.options.pendingMessage + '</div>').appendTo(statusDiv);
+
+		itemDiv.append('<div class="ke-name">' + file.name + '</div>');
+
+		self.progressbars[file.id] = {
+			bar : K('.ke-progressbar-bar-inner', photoDiv),
+			percent : K('.ke-progressbar-percent', photoDiv)
+		};
+	},
+	remove : function() {
+		this.removeFiles();
+		this.swfu.destroy();
+		this.div.html('');
+	}
+});
+
+K.swfupload = function(element, options) {
+	return new KSWFUpload(element, options);
+};
+
+})(KindEditor);
+
+KindEditor.plugin('multiimage', function(K) {
+	var self = this, name = 'multiimage',
+		formatUploadUrl = K.undef(self.formatUploadUrl, true),
+		uploadJson = K.undef(self.uploadJson, self.basePath + 'php/upload_json.php'),
+		imgPath = self.pluginsPath + 'multiimage/images/',
+		imageSizeLimit = K.undef(self.imageSizeLimit, '1MB'),
+		imageFileTypes = K.undef(self.imageFileTypes, '*.jpg;*.gif;*.png'),
+		imageUploadLimit = K.undef(self.imageUploadLimit, 20),
+		filePostName = K.undef(self.filePostName, 'imgFile'),
+		lang = self.lang(name + '.');
+
+	self.plugin.multiImageDialog = function(options) {
+		var clickFn = options.clickFn,
+			uploadDesc = K.tmpl(lang.uploadDesc, {uploadLimit : imageUploadLimit, sizeLimit : imageSizeLimit});
+		var html = [
+			'<div style="padding:20px;">',
+			'<div class="swfupload">',
+			'</div>',
+			'</div>'
+		].join('');
+		var dialog = self.createDialog({
+			name : name,
+			width : 650,
+			height : 510,
+			title : self.lang(name),
+			body : html,
+			previewBtn : {
+				name : lang.insertAll,
+				click : function(e) {
+					clickFn.call(self, swfupload.getUrlList());
+				}
+			},
+			yesBtn : {
+				name : lang.clearAll,
+				click : function(e) {
+					swfupload.removeFiles();
+				}
+			},
+			beforeRemove : function() {
+				// IE9 bugfix: https://github.com/kindsoft/kindeditor/issues/72
+				if (!K.IE || K.V <= 8) {
+					swfupload.remove();
+				}
+			}
+		}),
+		div = dialog.div;
+
+		var swfupload = K.swfupload({
+			container : K('.swfupload', div),
+			buttonImageUrl : imgPath + (self.langType == 'zh_CN' ? 'select-files-zh_CN.png' : 'select-files-en.png'),
+			buttonWidth : self.langType == 'zh_CN' ? 72 : 88,
+			buttonHeight : 23,
+			fileIconUrl : imgPath + 'image.png',
+			uploadDesc : uploadDesc,
+			startButtonValue : lang.startUpload,
+			uploadUrl : K.addParam(uploadJson, 'dir=image'),
+			flashUrl : imgPath + 'swfupload.swf',
+			filePostName : filePostName,
+			fileTypes : '*.jpg;*.jpeg;*.gif;*.png;*.bmp',
+			fileTypesDesc : 'Image Files',
+			fileUploadLimit : imageUploadLimit,
+			fileSizeLimit : imageSizeLimit,
+			postParams :  K.undef(self.extraFileUploadParams, {}),
+			queueLimitExceeded : lang.queueLimitExceeded,
+			fileExceedsSizeLimit : lang.fileExceedsSizeLimit,
+			zeroByteFile : lang.zeroByteFile,
+			invalidFiletype : lang.invalidFiletype,
+			unknownError : lang.unknownError,
+			pendingMessage : lang.pending,
+			errorMessage : lang.uploadError,
+			afterError : function(html) {
+				self.errorDialog(html);
+			}
+		});
+
+		return dialog;
+	};
+	self.clickToolbar(name, function() {
+		self.plugin.multiImageDialog({
+			clickFn : function (urlList) {
+				if (urlList.length === 0) {
+					return;
+				}
+				K.each(urlList, function(i, data) {
+					if (self.afterUpload) {
+						self.afterUpload.call(self, data.url, data, 'multiimage');
+					}
+					self.exec('insertimage', data.url, data.title, data.width, data.height, data.border, data.align);
+				});
+				// Bugfix: [Firefox] 上传图片后，总是出现正在加载的样式，需要延迟执行hideDialog
+				setTimeout(function() {
+					self.hideDialog().focus();
+				}, 0);
+			}
+		});
+	});
+});
+
+
+/**
+ * SWFUpload: http://www.swfupload.org, http://swfupload.googlecode.com
+ *
+ * mmSWFUpload 1.0: Flash upload dialog - http://profandesign.se/swfupload/,  http://www.vinterwebb.se/
+ *
+ * SWFUpload is (c) 2006-2007 Lars Huring, Olov Nilz閚 and Mammon Media and is released under the MIT License:
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ * SWFUpload 2 is (c) 2007-2008 Jake Roberts and is released under the MIT License:
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ */
+
+
+/* ******************* */
+/* Constructor & Init  */
+/* ******************* */
+
+(function() {
+
+window.SWFUpload = function (settings) {
+	this.initSWFUpload(settings);
+};
+
+SWFUpload.prototype.initSWFUpload = function (settings) {
+	try {
+		this.customSettings = {};	// A container where developers can place their own settings associated with this instance.
+		this.settings = settings;
+		this.eventQueue = [];
+		this.movieName = "KindEditor_SWFUpload_" + SWFUpload.movieCount++;
+		this.movieElement = null;
+
+
+		// Setup global control tracking
+		SWFUpload.instances[this.movieName] = this;
+
+		// Load the settings.  Load the Flash movie.
+		this.initSettings();
+		this.loadFlash();
+		this.displayDebugInfo();
+	} catch (ex) {
+		delete SWFUpload.instances[this.movieName];
+		throw ex;
+	}
+};
+
+/* *************** */
+/* Static Members  */
+/* *************** */
+SWFUpload.instances = {};
+SWFUpload.movieCount = 0;
+SWFUpload.version = "2.2.0 2009-03-25";
+SWFUpload.QUEUE_ERROR = {
+	QUEUE_LIMIT_EXCEEDED	  		: -100,
+	FILE_EXCEEDS_SIZE_LIMIT  		: -110,
+	ZERO_BYTE_FILE			  		: -120,
+	INVALID_FILETYPE		  		: -130
+};
+SWFUpload.UPLOAD_ERROR = {
+	HTTP_ERROR				  		: -200,
+	MISSING_UPLOAD_URL	      		: -210,
+	IO_ERROR				  		: -220,
+	SECURITY_ERROR			  		: -230,
+	UPLOAD_LIMIT_EXCEEDED	  		: -240,
+	UPLOAD_FAILED			  		: -250,
+	SPECIFIED_FILE_ID_NOT_FOUND		: -260,
+	FILE_VALIDATION_FAILED	  		: -270,
+	FILE_CANCELLED			  		: -280,
+	UPLOAD_STOPPED					: -290
+};
+SWFUpload.FILE_STATUS = {
+	QUEUED		 : -1,
+	IN_PROGRESS	 : -2,
+	ERROR		 : -3,
+	COMPLETE	 : -4,
+	CANCELLED	 : -5
+};
+SWFUpload.BUTTON_ACTION = {
+	SELECT_FILE  : -100,
+	SELECT_FILES : -110,
+	START_UPLOAD : -120
+};
+SWFUpload.CURSOR = {
+	ARROW : -1,
+	HAND : -2
+};
+SWFUpload.WINDOW_MODE = {
+	WINDOW : "window",
+	TRANSPARENT : "transparent",
+	OPAQUE : "opaque"
+};
+
+// Private: takes a URL, determines if it is relative and converts to an absolute URL
+// using the current site. Only processes the URL if it can, otherwise returns the URL untouched
+SWFUpload.completeURL = function(url) {
+	if (typeof(url) !== "string" || url.match(/^https?:\/\//i) || url.match(/^\//)) {
+		return url;
+	}
+
+	var currentURL = window.location.protocol + "//" + window.location.hostname + (window.location.port ? ":" + window.location.port : "");
+
+	var indexSlash = window.location.pathname.lastIndexOf("/");
+	if (indexSlash <= 0) {
+		path = "/";
+	} else {
+		path = window.location.pathname.substr(0, indexSlash) + "/";
+	}
+
+	return /*currentURL +*/ path + url;
+
+};
+
+
+/* ******************** */
+/* Instance Members  */
+/* ******************** */
+
+// Private: initSettings ensures that all the
+// settings are set, getting a default value if one was not assigned.
+SWFUpload.prototype.initSettings = function () {
+	this.ensureDefault = function (settingName, defaultValue) {
+		this.settings[settingName] = (this.settings[settingName] == undefined) ? defaultValue : this.settings[settingName];
+	};
+
+	// Upload backend settings
+	this.ensureDefault("upload_url", "");
+	this.ensureDefault("preserve_relative_urls", false);
+	this.ensureDefault("file_post_name", "Filedata");
+	this.ensureDefault("post_params", {});
+	this.ensureDefault("use_query_string", false);
+	this.ensureDefault("requeue_on_error", false);
+	this.ensureDefault("http_success", []);
+	this.ensureDefault("assume_success_timeout", 0);
+
+	// File Settings
+	this.ensureDefault("file_types", "*.*");
+	this.ensureDefault("file_types_description", "All Files");
+	this.ensureDefault("file_size_limit", 0);	// Default zero means "unlimited"
+	this.ensureDefault("file_upload_limit", 0);
+	this.ensureDefault("file_queue_limit", 0);
+
+	// Flash Settings
+	this.ensureDefault("flash_url", "swfupload.swf");
+	this.ensureDefault("prevent_swf_caching", true);
+
+	// Button Settings
+	this.ensureDefault("button_image_url", "");
+	this.ensureDefault("button_width", 1);
+	this.ensureDefault("button_height", 1);
+	this.ensureDefault("button_text", "");
+	this.ensureDefault("button_text_style", "color: #000000; font-size: 16pt;");
+	this.ensureDefault("button_text_top_padding", 0);
+	this.ensureDefault("button_text_left_padding", 0);
+	this.ensureDefault("button_action", SWFUpload.BUTTON_ACTION.SELECT_FILES);
+	this.ensureDefault("button_disabled", false);
+	this.ensureDefault("button_placeholder_id", "");
+	this.ensureDefault("button_placeholder", null);
+	this.ensureDefault("button_cursor", SWFUpload.CURSOR.ARROW);
+	this.ensureDefault("button_window_mode", SWFUpload.WINDOW_MODE.WINDOW);
+
+	// Debug Settings
+	this.ensureDefault("debug", false);
+	this.settings.debug_enabled = this.settings.debug;	// Here to maintain v2 API
+
+	// Event Handlers
+	this.settings.return_upload_start_handler = this.returnUploadStart;
+	this.ensureDefault("swfupload_loaded_handler", null);
+	this.ensureDefault("file_dialog_start_handler", null);
+	this.ensureDefault("file_queued_handler", null);
+	this.ensureDefault("file_queue_error_handler", null);
+	this.ensureDefault("file_dialog_complete_handler", null);
+
+	this.ensureDefault("upload_start_handler", null);
+	this.ensureDefault("upload_progress_handler", null);
+	this.ensureDefault("upload_error_handler", null);
+	this.ensureDefault("upload_success_handler", null);
+	this.ensureDefault("upload_complete_handler", null);
+
+	this.ensureDefault("debug_handler", this.debugMessage);
+
+	this.ensureDefault("custom_settings", {});
+
+	// Other settings
+	this.customSettings = this.settings.custom_settings;
+
+	// Update the flash url if needed
+	if (!!this.settings.prevent_swf_caching) {
+		this.settings.flash_url = this.settings.flash_url + (this.settings.flash_url.indexOf("?") < 0 ? "?" : "&") + "preventswfcaching=" + new Date().getTime();
+	}
+
+	if (!this.settings.preserve_relative_urls) {
+		//this.settings.flash_url = SWFUpload.completeURL(this.settings.flash_url);	// Don't need to do this one since flash doesn't look at it
+		this.settings.upload_url = SWFUpload.completeURL(this.settings.upload_url);
+		this.settings.button_image_url = SWFUpload.completeURL(this.settings.button_image_url);
+	}
+
+	delete this.ensureDefault;
+};
+
+// Private: loadFlash replaces the button_placeholder element with the flash movie.
+SWFUpload.prototype.loadFlash = function () {
+	var targetElement, tempParent;
+
+	// Make sure an element with the ID we are going to use doesn't already exist
+	if (document.getElementById(this.movieName) !== null) {
+		throw "ID " + this.movieName + " is already in use. The Flash Object could not be added";
+	}
+
+	// Get the element where we will be placing the flash movie
+	targetElement = document.getElementById(this.settings.button_placeholder_id) || this.settings.button_placeholder;
+
+	if (targetElement == undefined) {
+		throw "Could not find the placeholder element: " + this.settings.button_placeholder_id;
+	}
+
+	// Append the container and load the flash
+	tempParent = document.createElement("div");
+	tempParent.innerHTML = this.getFlashHTML();	// Using innerHTML is non-standard but the only sensible way to dynamically add Flash in IE (and maybe other browsers)
+	targetElement.parentNode.replaceChild(tempParent.firstChild, targetElement);
+
+	// Fix IE Flash/Form bug
+	if (window[this.movieName] == undefined) {
+		window[this.movieName] = this.getMovieElement();
+	}
+
+};
+
+// Private: getFlashHTML generates the object tag needed to embed the flash in to the document
+SWFUpload.prototype.getFlashHTML = function () {
+	// Flash Satay object syntax: http://www.alistapart.com/articles/flashsatay
+	// Fix bug for IE9
+	// http://www.kindsoft.net/view.php?bbsid=7&postid=5825&pagenum=1
+	var classid = '';
+	if (KindEditor.IE && KindEditor.V > 8) {
+		classid = ' classid = "clsid:d27cdb6e-ae6d-11cf-96b8-444553540000"';
+	}
+	return ['<object id="', this.movieName, '"' + classid + ' type="application/x-shockwave-flash" data="', this.settings.flash_url, '" width="', this.settings.button_width, '" height="', this.settings.button_height, '" class="swfupload">',
+				'<param name="wmode" value="', this.settings.button_window_mode, '" />',
+				'<param name="movie" value="', this.settings.flash_url, '" />',
+				'<param name="quality" value="high" />',
+				'<param name="menu" value="false" />',
+				'<param name="allowScriptAccess" value="always" />',
+				'<param name="flashvars" value="' + this.getFlashVars() + '" />',
+				'</object>'].join("");
+};
+
+// Private: getFlashVars builds the parameter string that will be passed
+// to flash in the flashvars param.
+SWFUpload.prototype.getFlashVars = function () {
+	// Build a string from the post param object
+	var paramString = this.buildParamString();
+	var httpSuccessString = this.settings.http_success.join(",");
+
+	// Build the parameter string
+	return ["movieName=", encodeURIComponent(this.movieName),
+			"&amp;uploadURL=", encodeURIComponent(this.settings.upload_url),
+			"&amp;useQueryString=", encodeURIComponent(this.settings.use_query_string),
+			"&amp;requeueOnError=", encodeURIComponent(this.settings.requeue_on_error),
+			"&amp;httpSuccess=", encodeURIComponent(httpSuccessString),
+			"&amp;assumeSuccessTimeout=", encodeURIComponent(this.settings.assume_success_timeout),
+			"&amp;params=", encodeURIComponent(paramString),
+			"&amp;filePostName=", encodeURIComponent(this.settings.file_post_name),
+			"&amp;fileTypes=", encodeURIComponent(this.settings.file_types),
+			"&amp;fileTypesDescription=", encodeURIComponent(this.settings.file_types_description),
+			"&amp;fileSizeLimit=", encodeURIComponent(this.settings.file_size_limit),
+			"&amp;fileUploadLimit=", encodeURIComponent(this.settings.file_upload_limit),
+			"&amp;fileQueueLimit=", encodeURIComponent(this.settings.file_queue_limit),
+			"&amp;debugEnabled=", encodeURIComponent(this.settings.debug_enabled),
+			"&amp;buttonImageURL=", encodeURIComponent(this.settings.button_image_url),
+			"&amp;buttonWidth=", encodeURIComponent(this.settings.button_width),
+			"&amp;buttonHeight=", encodeURIComponent(this.settings.button_height),
+			"&amp;buttonText=", encodeURIComponent(this.settings.button_text),
+			"&amp;buttonTextTopPadding=", encodeURIComponent(this.settings.button_text_top_padding),
+			"&amp;buttonTextLeftPadding=", encodeURIComponent(this.settings.button_text_left_padding),
+			"&amp;buttonTextStyle=", encodeURIComponent(this.settings.button_text_style),
+			"&amp;buttonAction=", encodeURIComponent(this.settings.button_action),
+			"&amp;buttonDisabled=", encodeURIComponent(this.settings.button_disabled),
+			"&amp;buttonCursor=", encodeURIComponent(this.settings.button_cursor)
+		].join("");
+};
+
+// Public: getMovieElement retrieves the DOM reference to the Flash element added by SWFUpload
+// The element is cached after the first lookup
+SWFUpload.prototype.getMovieElement = function () {
+	if (this.movieElement == undefined) {
+		this.movieElement = document.getElementById(this.movieName);
+	}
+
+	if (this.movieElement === null) {
+		throw "Could not find Flash element";
+	}
+
+	return this.movieElement;
+};
+
+// Private: buildParamString takes the name/value pairs in the post_params setting object
+// and joins them up in to a string formatted "name=value&amp;name=value"
+SWFUpload.prototype.buildParamString = function () {
+	var postParams = this.settings.post_params;
+	var paramStringPairs = [];
+
+	if (typeof(postParams) === "object") {
+		for (var name in postParams) {
+			if (postParams.hasOwnProperty(name)) {
+				paramStringPairs.push(encodeURIComponent(name.toString()) + "=" + encodeURIComponent(postParams[name].toString()));
+			}
+		}
+	}
+
+	return paramStringPairs.join("&amp;");
+};
+
+// Public: Used to remove a SWFUpload instance from the page. This method strives to remove
+// all references to the SWF, and other objects so memory is properly freed.
+// Returns true if everything was destroyed. Returns a false if a failure occurs leaving SWFUpload in an inconsistant state.
+// Credits: Major improvements provided by steffen
+SWFUpload.prototype.destroy = function () {
+	try {
+		// Make sure Flash is done before we try to remove it
+		this.cancelUpload(null, false);
+
+
+		// Remove the SWFUpload DOM nodes
+		var movieElement = null;
+		movieElement = this.getMovieElement();
+
+		if (movieElement && typeof(movieElement.CallFunction) === "unknown") { // We only want to do this in IE
+			// Loop through all the movie's properties and remove all function references (DOM/JS IE 6/7 memory leak workaround)
+			for (var i in movieElement) {
+				try {
+					if (typeof(movieElement[i]) === "function") {
+						movieElement[i] = null;
+					}
+				} catch (ex1) {}
+			}
+
+			// Remove the Movie Element from the page
+			try {
+				movieElement.parentNode.removeChild(movieElement);
+			} catch (ex) {}
+		}
+
+		// Remove IE form fix reference
+		window[this.movieName] = null;
+
+		// Destroy other references
+		SWFUpload.instances[this.movieName] = null;
+		delete SWFUpload.instances[this.movieName];
+
+		this.movieElement = null;
+		this.settings = null;
+		this.customSettings = null;
+		this.eventQueue = null;
+		this.movieName = null;
+
+
+		return true;
+	} catch (ex2) {
+		return false;
+	}
+};
+
+
+// Public: displayDebugInfo prints out settings and configuration
+// information about this SWFUpload instance.
+// This function (and any references to it) can be deleted when placing
+// SWFUpload in production.
+SWFUpload.prototype.displayDebugInfo = function () {
+	this.debug(
+		[
+			"---SWFUpload Instance Info---\n",
+			"Version: ", SWFUpload.version, "\n",
+			"Movie Name: ", this.movieName, "\n",
+			"Settings:\n",
+			"\t", "upload_url:               ", this.settings.upload_url, "\n",
+			"\t", "flash_url:                ", this.settings.flash_url, "\n",
+			"\t", "use_query_string:         ", this.settings.use_query_string.toString(), "\n",
+			"\t", "requeue_on_error:         ", this.settings.requeue_on_error.toString(), "\n",
+			"\t", "http_success:             ", this.settings.http_success.join(", "), "\n",
+			"\t", "assume_success_timeout:   ", this.settings.assume_success_timeout, "\n",
+			"\t", "file_post_name:           ", this.settings.file_post_name, "\n",
+			"\t", "post_params:              ", this.settings.post_params.toString(), "\n",
+			"\t", "file_types:               ", this.settings.file_types, "\n",
+			"\t", "file_types_description:   ", this.settings.file_types_description, "\n",
+			"\t", "file_size_limit:          ", this.settings.file_size_limit, "\n",
+			"\t", "file_upload_limit:        ", this.settings.file_upload_limit, "\n",
+			"\t", "file_queue_limit:         ", this.settings.file_queue_limit, "\n",
+			"\t", "debug:                    ", this.settings.debug.toString(), "\n",
+
+			"\t", "prevent_swf_caching:      ", this.settings.prevent_swf_caching.toString(), "\n",
+
+			"\t", "button_placeholder_id:    ", this.settings.button_placeholder_id.toString(), "\n",
+			"\t", "button_placeholder:       ", (this.settings.button_placeholder ? "Set" : "Not Set"), "\n",
+			"\t", "button_image_url:         ", this.settings.button_image_url.toString(), "\n",
+			"\t", "button_width:             ", this.settings.button_width.toString(), "\n",
+			"\t", "button_height:            ", this.settings.button_height.toString(), "\n",
+			"\t", "button_text:              ", this.settings.button_text.toString(), "\n",
+			"\t", "button_text_style:        ", this.settings.button_text_style.toString(), "\n",
+			"\t", "button_text_top_padding:  ", this.settings.button_text_top_padding.toString(), "\n",
+			"\t", "button_text_left_padding: ", this.settings.button_text_left_padding.toString(), "\n",
+			"\t", "button_action:            ", this.settings.button_action.toString(), "\n",
+			"\t", "button_disabled:          ", this.settings.button_disabled.toString(), "\n",
+
+			"\t", "custom_settings:          ", this.settings.custom_settings.toString(), "\n",
+			"Event Handlers:\n",
+			"\t", "swfupload_loaded_handler assigned:  ", (typeof this.settings.swfupload_loaded_handler === "function").toString(), "\n",
+			"\t", "file_dialog_start_handler assigned: ", (typeof this.settings.file_dialog_start_handler === "function").toString(), "\n",
+			"\t", "file_queued_handler assigned:       ", (typeof this.settings.file_queued_handler === "function").toString(), "\n",
+			"\t", "file_queue_error_handler assigned:  ", (typeof this.settings.file_queue_error_handler === "function").toString(), "\n",
+			"\t", "upload_start_handler assigned:      ", (typeof this.settings.upload_start_handler === "function").toString(), "\n",
+			"\t", "upload_progress_handler assigned:   ", (typeof this.settings.upload_progress_handler === "function").toString(), "\n",
+			"\t", "upload_error_handler assigned:      ", (typeof this.settings.upload_error_handler === "function").toString(), "\n",
+			"\t", "upload_success_handler assigned:    ", (typeof this.settings.upload_success_handler === "function").toString(), "\n",
+			"\t", "upload_complete_handler assigned:   ", (typeof this.settings.upload_complete_handler === "function").toString(), "\n",
+			"\t", "debug_handler assigned:             ", (typeof this.settings.debug_handler === "function").toString(), "\n"
+		].join("")
+	);
+};
+
+/* Note: addSetting and getSetting are no longer used by SWFUpload but are included
+	the maintain v2 API compatibility
+*/
+// Public: (Deprecated) addSetting adds a setting value. If the value given is undefined or null then the default_value is used.
+SWFUpload.prototype.addSetting = function (name, value, default_value) {
+    if (value == undefined) {
+        return (this.settings[name] = default_value);
+    } else {
+        return (this.settings[name] = value);
+	}
+};
+
+// Public: (Deprecated) getSetting gets a setting. Returns an empty string if the setting was not found.
+SWFUpload.prototype.getSetting = function (name) {
+    if (this.settings[name] != undefined) {
+        return this.settings[name];
+	}
+
+    return "";
+};
+
+
+
+// Private: callFlash handles function calls made to the Flash element.
+// Calls are made with a setTimeout for some functions to work around
+// bugs in the ExternalInterface library.
+SWFUpload.prototype.callFlash = function (functionName, argumentArray) {
+	argumentArray = argumentArray || [];
+
+	var movieElement = this.getMovieElement();
+	var returnValue, returnString;
+
+	// Flash's method if calling ExternalInterface methods (code adapted from MooTools).
+	try {
+		returnString = movieElement.CallFunction('<invoke name="' + functionName + '" returntype="javascript">' + __flash__argumentsToXML(argumentArray, 0) + '</invoke>');
+		returnValue = eval(returnString);
+	} catch (ex) {
+		throw "Call to " + functionName + " failed";
+	}
+
+	// Unescape file post param values
+	if (returnValue != undefined && typeof returnValue.post === "object") {
+		returnValue = this.unescapeFilePostParams(returnValue);
+	}
+
+	return returnValue;
+};
+
+/* *****************************
+	-- Flash control methods --
+	Your UI should use these
+	to operate SWFUpload
+   ***************************** */
+
+// WARNING: this function does not work in Flash Player 10
+// Public: selectFile causes a File Selection Dialog window to appear.  This
+// dialog only allows 1 file to be selected.
+SWFUpload.prototype.selectFile = function () {
+	this.callFlash("SelectFile");
+};
+
+// WARNING: this function does not work in Flash Player 10
+// Public: selectFiles causes a File Selection Dialog window to appear/ This
+// dialog allows the user to select any number of files
+// Flash Bug Warning: Flash limits the number of selectable files based on the combined length of the file names.
+// If the selection name length is too long the dialog will fail in an unpredictable manner.  There is no work-around
+// for this bug.
+SWFUpload.prototype.selectFiles = function () {
+	this.callFlash("SelectFiles");
+};
+
+
+// Public: startUpload starts uploading the first file in the queue unless
+// the optional parameter 'fileID' specifies the ID
+SWFUpload.prototype.startUpload = function (fileID) {
+	this.callFlash("StartUpload", [fileID]);
+};
+
+// Public: cancelUpload cancels any queued file.  The fileID parameter may be the file ID or index.
+// If you do not specify a fileID the current uploading file or first file in the queue is cancelled.
+// If you do not want the uploadError event to trigger you can specify false for the triggerErrorEvent parameter.
+SWFUpload.prototype.cancelUpload = function (fileID, triggerErrorEvent) {
+	if (triggerErrorEvent !== false) {
+		triggerErrorEvent = true;
+	}
+	this.callFlash("CancelUpload", [fileID, triggerErrorEvent]);
+};
+
+// Public: stopUpload stops the current upload and requeues the file at the beginning of the queue.
+// If nothing is currently uploading then nothing happens.
+SWFUpload.prototype.stopUpload = function () {
+	this.callFlash("StopUpload");
+};
+
+/* ************************
+ * Settings methods
+ *   These methods change the SWFUpload settings.
+ *   SWFUpload settings should not be changed directly on the settings object
+ *   since many of the settings need to be passed to Flash in order to take
+ *   effect.
+ * *********************** */
+
+// Public: getStats gets the file statistics object.
+SWFUpload.prototype.getStats = function () {
+	return this.callFlash("GetStats");
+};
+
+// Public: setStats changes the SWFUpload statistics.  You shouldn't need to
+// change the statistics but you can.  Changing the statistics does not
+// affect SWFUpload accept for the successful_uploads count which is used
+// by the upload_limit setting to determine how many files the user may upload.
+SWFUpload.prototype.setStats = function (statsObject) {
+	this.callFlash("SetStats", [statsObject]);
+};
+
+// Public: getFile retrieves a File object by ID or Index.  If the file is
+// not found then 'null' is returned.
+SWFUpload.prototype.getFile = function (fileID) {
+	if (typeof(fileID) === "number") {
+		return this.callFlash("GetFileByIndex", [fileID]);
+	} else {
+		return this.callFlash("GetFile", [fileID]);
+	}
+};
+
+// Public: addFileParam sets a name/value pair that will be posted with the
+// file specified by the Files ID.  If the name already exists then the
+// exiting value will be overwritten.
+SWFUpload.prototype.addFileParam = function (fileID, name, value) {
+	return this.callFlash("AddFileParam", [fileID, name, value]);
+};
+
+// Public: removeFileParam removes a previously set (by addFileParam) name/value
+// pair from the specified file.
+SWFUpload.prototype.removeFileParam = function (fileID, name) {
+	this.callFlash("RemoveFileParam", [fileID, name]);
+};
+
+// Public: setUploadUrl changes the upload_url setting.
+SWFUpload.prototype.setUploadURL = function (url) {
+	this.settings.upload_url = url.toString();
+	this.callFlash("SetUploadURL", [url]);
+};
+
+// Public: setPostParams changes the post_params setting
+SWFUpload.prototype.setPostParams = function (paramsObject) {
+	this.settings.post_params = paramsObject;
+	this.callFlash("SetPostParams", [paramsObject]);
+};
+
+// Public: addPostParam adds post name/value pair.  Each name can have only one value.
+SWFUpload.prototype.addPostParam = function (name, value) {
+	this.settings.post_params[name] = value;
+	this.callFlash("SetPostParams", [this.settings.post_params]);
+};
+
+// Public: removePostParam deletes post name/value pair.
+SWFUpload.prototype.removePostParam = function (name) {
+	delete this.settings.post_params[name];
+	this.callFlash("SetPostParams", [this.settings.post_params]);
+};
+
+// Public: setFileTypes changes the file_types setting and the file_types_description setting
+SWFUpload.prototype.setFileTypes = function (types, description) {
+	this.settings.file_types = types;
+	this.settings.file_types_description = description;
+	this.callFlash("SetFileTypes", [types, description]);
+};
+
+// Public: setFileSizeLimit changes the file_size_limit setting
+SWFUpload.prototype.setFileSizeLimit = function (fileSizeLimit) {
+	this.settings.file_size_limit = fileSizeLimit;
+	this.callFlash("SetFileSizeLimit", [fileSizeLimit]);
+};
+
+// Public: setFileUploadLimit changes the file_upload_limit setting
+SWFUpload.prototype.setFileUploadLimit = function (fileUploadLimit) {
+	this.settings.file_upload_limit = fileUploadLimit;
+	this.callFlash("SetFileUploadLimit", [fileUploadLimit]);
+};
+
+// Public: setFileQueueLimit changes the file_queue_limit setting
+SWFUpload.prototype.setFileQueueLimit = function (fileQueueLimit) {
+	this.settings.file_queue_limit = fileQueueLimit;
+	this.callFlash("SetFileQueueLimit", [fileQueueLimit]);
+};
+
+// Public: setFilePostName changes the file_post_name setting
+SWFUpload.prototype.setFilePostName = function (filePostName) {
+	this.settings.file_post_name = filePostName;
+	this.callFlash("SetFilePostName", [filePostName]);
+};
+
+// Public: setUseQueryString changes the use_query_string setting
+SWFUpload.prototype.setUseQueryString = function (useQueryString) {
+	this.settings.use_query_string = useQueryString;
+	this.callFlash("SetUseQueryString", [useQueryString]);
+};
+
+// Public: setRequeueOnError changes the requeue_on_error setting
+SWFUpload.prototype.setRequeueOnError = function (requeueOnError) {
+	this.settings.requeue_on_error = requeueOnError;
+	this.callFlash("SetRequeueOnError", [requeueOnError]);
+};
+
+// Public: setHTTPSuccess changes the http_success setting
+SWFUpload.prototype.setHTTPSuccess = function (http_status_codes) {
+	if (typeof http_status_codes === "string") {
+		http_status_codes = http_status_codes.replace(" ", "").split(",");
+	}
+
+	this.settings.http_success = http_status_codes;
+	this.callFlash("SetHTTPSuccess", [http_status_codes]);
+};
+
+// Public: setHTTPSuccess changes the http_success setting
+SWFUpload.prototype.setAssumeSuccessTimeout = function (timeout_seconds) {
+	this.settings.assume_success_timeout = timeout_seconds;
+	this.callFlash("SetAssumeSuccessTimeout", [timeout_seconds]);
+};
+
+// Public: setDebugEnabled changes the debug_enabled setting
+SWFUpload.prototype.setDebugEnabled = function (debugEnabled) {
+	this.settings.debug_enabled = debugEnabled;
+	this.callFlash("SetDebugEnabled", [debugEnabled]);
+};
+
+// Public: setButtonImageURL loads a button image sprite
+SWFUpload.prototype.setButtonImageURL = function (buttonImageURL) {
+	if (buttonImageURL == undefined) {
+		buttonImageURL = "";
+	}
+
+	this.settings.button_image_url = buttonImageURL;
+	this.callFlash("SetButtonImageURL", [buttonImageURL]);
+};
+
+// Public: setButtonDimensions resizes the Flash Movie and button
+SWFUpload.prototype.setButtonDimensions = function (width, height) {
+	this.settings.button_width = width;
+	this.settings.button_height = height;
+
+	var movie = this.getMovieElement();
+	if (movie != undefined) {
+		movie.style.width = width + "px";
+		movie.style.height = height + "px";
+	}
+
+	this.callFlash("SetButtonDimensions", [width, height]);
+};
+// Public: setButtonText Changes the text overlaid on the button
+SWFUpload.prototype.setButtonText = function (html) {
+	this.settings.button_text = html;
+	this.callFlash("SetButtonText", [html]);
+};
+// Public: setButtonTextPadding changes the top and left padding of the text overlay
+SWFUpload.prototype.setButtonTextPadding = function (left, top) {
+	this.settings.button_text_top_padding = top;
+	this.settings.button_text_left_padding = left;
+	this.callFlash("SetButtonTextPadding", [left, top]);
+};
+
+// Public: setButtonTextStyle changes the CSS used to style the HTML/Text overlaid on the button
+SWFUpload.prototype.setButtonTextStyle = function (css) {
+	this.settings.button_text_style = css;
+	this.callFlash("SetButtonTextStyle", [css]);
+};
+// Public: setButtonDisabled disables/enables the button
+SWFUpload.prototype.setButtonDisabled = function (isDisabled) {
+	this.settings.button_disabled = isDisabled;
+	this.callFlash("SetButtonDisabled", [isDisabled]);
+};
+// Public: setButtonAction sets the action that occurs when the button is clicked
+SWFUpload.prototype.setButtonAction = function (buttonAction) {
+	this.settings.button_action = buttonAction;
+	this.callFlash("SetButtonAction", [buttonAction]);
+};
+
+// Public: setButtonCursor changes the mouse cursor displayed when hovering over the button
+SWFUpload.prototype.setButtonCursor = function (cursor) {
+	this.settings.button_cursor = cursor;
+	this.callFlash("SetButtonCursor", [cursor]);
+};
+
+/* *******************************
+	Flash Event Interfaces
+	These functions are used by Flash to trigger the various
+	events.
+
+	All these functions a Private.
+
+	Because the ExternalInterface library is buggy the event calls
+	are added to a queue and the queue then executed by a setTimeout.
+	This ensures that events are executed in a determinate order and that
+	the ExternalInterface bugs are avoided.
+******************************* */
+
+SWFUpload.prototype.queueEvent = function (handlerName, argumentArray) {
+	// Warning: Don't call this.debug inside here or you'll create an infinite loop
+
+	if (argumentArray == undefined) {
+		argumentArray = [];
+	} else if (!(argumentArray instanceof Array)) {
+		argumentArray = [argumentArray];
+	}
+
+	var self = this;
+	if (typeof this.settings[handlerName] === "function") {
+		// Queue the event
+		this.eventQueue.push(function () {
+			this.settings[handlerName].apply(this, argumentArray);
+		});
+
+		// Execute the next queued event
+		setTimeout(function () {
+			self.executeNextEvent();
+		}, 0);
+
+	} else if (this.settings[handlerName] !== null) {
+		throw "Event handler " + handlerName + " is unknown or is not a function";
+	}
+};
+
+// Private: Causes the next event in the queue to be executed.  Since events are queued using a setTimeout
+// we must queue them in order to garentee that they are executed in order.
+SWFUpload.prototype.executeNextEvent = function () {
+	// Warning: Don't call this.debug inside here or you'll create an infinite loop
+
+	var  f = this.eventQueue ? this.eventQueue.shift() : null;
+	if (typeof(f) === "function") {
+		f.apply(this);
+	}
+};
+
+// Private: unescapeFileParams is part of a workaround for a flash bug where objects passed through ExternalInterface cannot have
+// properties that contain characters that are not valid for JavaScript identifiers. To work around this
+// the Flash Component escapes the parameter names and we must unescape again before passing them along.
+SWFUpload.prototype.unescapeFilePostParams = function (file) {
+	var reg = /[$]([0-9a-f]{4})/i;
+	var unescapedPost = {};
+	var uk;
+
+	if (file != undefined) {
+		for (var k in file.post) {
+			if (file.post.hasOwnProperty(k)) {
+				uk = k;
+				var match;
+				while ((match = reg.exec(uk)) !== null) {
+					uk = uk.replace(match[0], String.fromCharCode(parseInt("0x" + match[1], 16)));
+				}
+				unescapedPost[uk] = file.post[k];
+			}
+		}
+
+		file.post = unescapedPost;
+	}
+
+	return file;
+};
+
+// Private: Called by Flash to see if JS can call in to Flash (test if External Interface is working)
+SWFUpload.prototype.testExternalInterface = function () {
+	try {
+		return this.callFlash("TestExternalInterface");
+	} catch (ex) {
+		return false;
+	}
+};
+
+// Private: This event is called by Flash when it has finished loading. Don't modify this.
+// Use the swfupload_loaded_handler event setting to execute custom code when SWFUpload has loaded.
+SWFUpload.prototype.flashReady = function () {
+	// Check that the movie element is loaded correctly with its ExternalInterface methods defined
+	var movieElement = this.getMovieElement();
+
+	if (!movieElement) {
+		this.debug("Flash called back ready but the flash movie can't be found.");
+		return;
+	}
+
+	this.cleanUp(movieElement);
+
+	this.queueEvent("swfupload_loaded_handler");
+};
+
+// Private: removes Flash added fuctions to the DOM node to prevent memory leaks in IE.
+// This function is called by Flash each time the ExternalInterface functions are created.
+SWFUpload.prototype.cleanUp = function (movieElement) {
+	// Pro-actively unhook all the Flash functions
+	try {
+		if (this.movieElement && typeof(movieElement.CallFunction) === "unknown") { // We only want to do this in IE
+			this.debug("Removing Flash functions hooks (this should only run in IE and should prevent memory leaks)");
+			for (var key in movieElement) {
+				try {
+					if (typeof(movieElement[key]) === "function") {
+						movieElement[key] = null;
+					}
+				} catch (ex) {
+				}
+			}
+		}
+	} catch (ex1) {
+
+	}
+
+	// Fix Flashes own cleanup code so if the SWFMovie was removed from the page
+	// it doesn't display errors.
+	window["__flash__removeCallback"] = function (instance, name) {
+		try {
+			if (instance) {
+				instance[name] = null;
+			}
+		} catch (flashEx) {
+
+		}
+	};
+
+};
+
+
+/* This is a chance to do something before the browse window opens */
+SWFUpload.prototype.fileDialogStart = function () {
+	this.queueEvent("file_dialog_start_handler");
+};
+
+
+/* Called when a file is successfully added to the queue. */
+SWFUpload.prototype.fileQueued = function (file) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("file_queued_handler", file);
+};
+
+
+/* Handle errors that occur when an attempt to queue a file fails. */
+SWFUpload.prototype.fileQueueError = function (file, errorCode, message) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("file_queue_error_handler", [file, errorCode, message]);
+};
+
+/* Called after the file dialog has closed and the selected files have been queued.
+	You could call startUpload here if you want the queued files to begin uploading immediately. */
+SWFUpload.prototype.fileDialogComplete = function (numFilesSelected, numFilesQueued, numFilesInQueue) {
+	this.queueEvent("file_dialog_complete_handler", [numFilesSelected, numFilesQueued, numFilesInQueue]);
+};
+
+SWFUpload.prototype.uploadStart = function (file) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("return_upload_start_handler", file);
+};
+
+SWFUpload.prototype.returnUploadStart = function (file) {
+	var returnValue;
+	if (typeof this.settings.upload_start_handler === "function") {
+		file = this.unescapeFilePostParams(file);
+		returnValue = this.settings.upload_start_handler.call(this, file);
+	} else if (this.settings.upload_start_handler != undefined) {
+		throw "upload_start_handler must be a function";
+	}
+
+	// Convert undefined to true so if nothing is returned from the upload_start_handler it is
+	// interpretted as 'true'.
+	if (returnValue === undefined) {
+		returnValue = true;
+	}
+
+	returnValue = !!returnValue;
+
+	this.callFlash("ReturnUploadStart", [returnValue]);
+};
+
+
+
+SWFUpload.prototype.uploadProgress = function (file, bytesComplete, bytesTotal) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("upload_progress_handler", [file, bytesComplete, bytesTotal]);
+};
+
+SWFUpload.prototype.uploadError = function (file, errorCode, message) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("upload_error_handler", [file, errorCode, message]);
+};
+
+SWFUpload.prototype.uploadSuccess = function (file, serverData, responseReceived) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("upload_success_handler", [file, serverData, responseReceived]);
+};
+
+SWFUpload.prototype.uploadComplete = function (file) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("upload_complete_handler", file);
+};
+
+/* Called by SWFUpload JavaScript and Flash functions when debug is enabled. By default it writes messages to the
+   internal debug console.  You can override this event and have messages written where you want. */
+SWFUpload.prototype.debug = function (message) {
+	this.queueEvent("debug_handler", message);
+};
+
+
+/* **********************************
+	Debug Console
+	The debug console is a self contained, in page location
+	for debug message to be sent.  The Debug Console adds
+	itself to the body if necessary.
+
+	The console is automatically scrolled as messages appear.
+
+	If you are using your own debug handler or when you deploy to production and
+	have debug disabled you can remove these functions to reduce the file size
+	and complexity.
+********************************** */
+
+// Private: debugMessage is the default debug_handler.  If you want to print debug messages
+// call the debug() function.  When overriding the function your own function should
+// check to see if the debug setting is true before outputting debug information.
+SWFUpload.prototype.debugMessage = function (message) {
+	if (this.settings.debug) {
+		var exceptionMessage, exceptionValues = [];
+
+		// Check for an exception object and print it nicely
+		if (typeof message === "object" && typeof message.name === "string" && typeof message.message === "string") {
+			for (var key in message) {
+				if (message.hasOwnProperty(key)) {
+					exceptionValues.push(key + ": " + message[key]);
+				}
+			}
+			exceptionMessage = exceptionValues.join("\n") || "";
+			exceptionValues = exceptionMessage.split("\n");
+			exceptionMessage = "EXCEPTION: " + exceptionValues.join("\nEXCEPTION: ");
+			SWFUpload.Console.writeLine(exceptionMessage);
+		} else {
+			SWFUpload.Console.writeLine(message);
+		}
+	}
+};
+
+SWFUpload.Console = {};
+SWFUpload.Console.writeLine = function (message) {
+	var console, documentForm;
+
+	try {
+		console = document.getElementById("SWFUpload_Console");
+
+		if (!console) {
+			documentForm = document.createElement("form");
+			document.getElementsByTagName("body")[0].appendChild(documentForm);
+
+			console = document.createElement("textarea");
+			console.id = "SWFUpload_Console";
+			console.style.fontFamily = "monospace";
+			console.setAttribute("wrap", "off");
+			console.wrap = "off";
+			console.style.overflow = "auto";
+			console.style.width = "700px";
+			console.style.height = "350px";
+			console.style.margin = "5px";
+			documentForm.appendChild(console);
+		}
+
+		console.value += message + "\n";
+
+		console.scrollTop = console.scrollHeight - console.clientHeight;
+	} catch (ex) {
+		alert("Exception: " + ex.name + " Message: " + ex.message);
+	}
+};
+
+})();
+
+(function() {
+/*
+	Queue Plug-in
+
+	Features:
+		*Adds a cancelQueue() method for cancelling the entire queue.
+		*All queued files are uploaded when startUpload() is called.
+		*If false is returned from uploadComplete then the queue upload is stopped.
+		 If false is not returned (strict comparison) then the queue upload is continued.
+		*Adds a QueueComplete event that is fired when all the queued files have finished uploading.
+		 Set the event handler with the queue_complete_handler setting.
+
+	*/
+
+if (typeof(SWFUpload) === "function") {
+	SWFUpload.queue = {};
+
+	SWFUpload.prototype.initSettings = (function (oldInitSettings) {
+		return function () {
+			if (typeof(oldInitSettings) === "function") {
+				oldInitSettings.call(this);
+			}
+
+			this.queueSettings = {};
+
+			this.queueSettings.queue_cancelled_flag = false;
+			this.queueSettings.queue_upload_count = 0;
+
+			this.queueSettings.user_upload_complete_handler = this.settings.upload_complete_handler;
+			this.queueSettings.user_upload_start_handler = this.settings.upload_start_handler;
+			this.settings.upload_complete_handler = SWFUpload.queue.uploadCompleteHandler;
+			this.settings.upload_start_handler = SWFUpload.queue.uploadStartHandler;
+
+			this.settings.queue_complete_handler = this.settings.queue_complete_handler || null;
+		};
+	})(SWFUpload.prototype.initSettings);
+
+	SWFUpload.prototype.startUpload = function (fileID) {
+		this.queueSettings.queue_cancelled_flag = false;
+		this.callFlash("StartUpload", [fileID]);
+	};
+
+	SWFUpload.prototype.cancelQueue = function () {
+		this.queueSettings.queue_cancelled_flag = true;
+		this.stopUpload();
+
+		var stats = this.getStats();
+		while (stats.files_queued > 0) {
+			this.cancelUpload();
+			stats = this.getStats();
+		}
+	};
+
+	SWFUpload.queue.uploadStartHandler = function (file) {
+		var returnValue;
+		if (typeof(this.queueSettings.user_upload_start_handler) === "function") {
+			returnValue = this.queueSettings.user_upload_start_handler.call(this, file);
+		}
+
+		// To prevent upload a real "FALSE" value must be returned, otherwise default to a real "TRUE" value.
+		returnValue = (returnValue === false) ? false : true;
+
+		this.queueSettings.queue_cancelled_flag = !returnValue;
+
+		return returnValue;
+	};
+
+	SWFUpload.queue.uploadCompleteHandler = function (file) {
+		var user_upload_complete_handler = this.queueSettings.user_upload_complete_handler;
+		var continueUpload;
+
+		if (file.filestatus === SWFUpload.FILE_STATUS.COMPLETE) {
+			this.queueSettings.queue_upload_count++;
+		}
+
+		if (typeof(user_upload_complete_handler) === "function") {
+			continueUpload = (user_upload_complete_handler.call(this, file) === false) ? false : true;
+		} else if (file.filestatus === SWFUpload.FILE_STATUS.QUEUED) {
+			// If the file was stopped and re-queued don't restart the upload
+			continueUpload = false;
+		} else {
+			continueUpload = true;
+		}
+
+		if (continueUpload) {
+			var stats = this.getStats();
+			if (stats.files_queued > 0 && this.queueSettings.queue_cancelled_flag === false) {
+				this.startUpload();
+			} else if (this.queueSettings.queue_cancelled_flag === false) {
+				this.queueEvent("queue_complete_handler", [this.queueSettings.queue_upload_count]);
+				this.queueSettings.queue_upload_count = 0;
+			} else {
+				this.queueSettings.queue_cancelled_flag = false;
+				this.queueSettings.queue_upload_count = 0;
+			}
+		}
+	};
+}
+
+})();
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('pagebreak', function(K) {
+	var self = this;
+	var name = 'pagebreak';
+	var pagebreakHtml = K.undef(self.pagebreakHtml, '<hr style="page-break-after: always;" class="ke-pagebreak" />');
+
+	self.clickToolbar(name, function() {
+		var cmd = self.cmd, range = cmd.range;
+		self.focus();
+		var tail = self.newlineTag == 'br' || K.WEBKIT ? '' : '<span id="__kindeditor_tail_tag__"></span>';
+		self.insertHtml(pagebreakHtml + tail);
+		if (tail !== '') {
+			var p = K('#__kindeditor_tail_tag__', self.edit.doc);
+			range.selectNodeContents(p[0]);
+			p.removeAttr('id');
+			cmd.select();
+		}
+	});
+});
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('plainpaste', function(K) {
+	var self = this, name = 'plainpaste';
+	self.clickToolbar(name, function() {
+		var lang = self.lang(name + '.'),
+			html = '<div style="padding:10px 20px;">' +
+				'<div style="margin-bottom:10px;">' + lang.comment + '</div>' +
+				'<textarea class="ke-textarea" style="width:408px;height:260px;"></textarea>' +
+				'</div>',
+			dialog = self.createDialog({
+				name : name,
+				width : 450,
+				title : self.lang(name),
+				body : html,
+				yesBtn : {
+					name : self.lang('yes'),
+					click : function(e) {
+						var html = textarea.val();
+						html = K.escape(html);
+						html = html.replace(/ {2}/g, ' &nbsp;');
+						if (self.newlineTag == 'p') {
+							html = html.replace(/^/, '<p>').replace(/$/, '</p>').replace(/\n/g, '</p><p>');
+						} else {
+							html = html.replace(/\n/g, '<br />$&');
+						}
+						self.insertHtml(html).hideDialog().focus();
+					}
+				}
+			}),
+			textarea = K('textarea', dialog.div);
+		textarea[0].focus();
+	});
+});
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('preview', function(K) {
+	var self = this, name = 'preview', undefined;
+	self.clickToolbar(name, function() {
+		var lang = self.lang(name + '.'),
+			html = '<div style="padding:10px 20px;">' +
+				'<iframe class="ke-textarea" frameborder="0" style="width:708px;height:400px;"></iframe>' +
+				'</div>',
+			dialog = self.createDialog({
+				name : name,
+				width : 750,
+				title : self.lang(name),
+				body : html
+			}),
+			iframe = K('iframe', dialog.div),
+			doc = K.iframeDoc(iframe);
+		doc.open();
+		doc.write(self.fullHtml());
+		doc.close();
+		K(doc.body).css('background-color', '#FFF');
+		iframe[0].contentWindow.focus();
+	});
+});
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('quickformat', function(K) {
+	var self = this, name = 'quickformat',
+		blockMap = K.toMap('blockquote,center,div,h1,h2,h3,h4,h5,h6,p');
+	function getFirstChild(knode) {
+		var child = knode.first();
+		while (child && child.first()) {
+			child = child.first();
+		}
+		return child;
+	}
+	self.clickToolbar(name, function() {
+		self.focus();
+		var doc = self.edit.doc,
+			range = self.cmd.range,
+			child = K(doc.body).first(), next,
+			nodeList = [], subList = [],
+			bookmark = range.createBookmark(true);
+		while(child) {
+			next = child.next();
+			var firstChild = getFirstChild(child);
+			if (!firstChild || firstChild.name != 'img') {
+				if (blockMap[child.name]) {
+					child.html(child.html().replace(/^(\s|&nbsp;|　)+/ig, ''));
+					child.css('text-indent', '2em');
+				} else {
+					subList.push(child);
+				}
+				if (!next || (blockMap[next.name] || blockMap[child.name] && !blockMap[next.name])) {
+					if (subList.length > 0) {
+						nodeList.push(subList);
+					}
+					subList = [];
+				}
+			}
+			child = next;
+		}
+		K.each(nodeList, function(i, subList) {
+			var wrapper = K('<p style="text-indent:2em;"></p>', doc);
+			subList[0].before(wrapper);
+			K.each(subList, function(i, knode) {
+				wrapper.append(knode);
+			});
+		});
+		range.moveToBookmark(bookmark);
+		self.addBookmark();
+	});
+});
+
+/**
+--------------------------
+abcd<br />
+1234<br />
+
+to
+
+<p style="text-indent:2em;">
+	abcd<br />
+	1234<br />
+</p>
+
+--------------------------
+
+&nbsp; abcd<img>1233
+<p>1234</p>
+
+to
+
+<p style="text-indent:2em;">abcd<img>1233</p>
+<p style="text-indent:2em;">1234</p>
+
+--------------------------
+*//*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('table', function(K) {
+	var self = this, name = 'table', lang = self.lang(name + '.'), zeroborder = 'ke-zeroborder';
+	// 设置颜色
+	function _setColor(box, color) {
+		color = color.toUpperCase();
+		box.css('background-color', color);
+		box.css('color', color === '#000000' ? '#FFFFFF' : '#000000');
+		box.html(color);
+	}
+	// 初始化取色器
+	var pickerList = [];
+	function _initColorPicker(dialogDiv, colorBox) {
+		colorBox.bind('click,mousedown', function(e){
+			e.stopPropagation();
+		});
+		function removePicker() {
+			K.each(pickerList, function() {
+				this.remove();
+			});
+			pickerList = [];
+			K(document).unbind('click,mousedown', removePicker);
+			dialogDiv.unbind('click,mousedown', removePicker);
+		}
+		colorBox.click(function(e) {
+			removePicker();
+			var box = K(this),
+				pos = box.pos();
+			var picker = K.colorpicker({
+				x : pos.x,
+				y : pos.y + box.height(),
+				z : 811214,
+				selectedColor : K(this).html(),
+				colors : self.colorTable,
+				noColor : self.lang('noColor'),
+				shadowMode : self.shadowMode,
+				click : function(color) {
+					_setColor(box, color);
+					removePicker();
+				}
+			});
+			pickerList.push(picker);
+			K(document).bind('click,mousedown', removePicker);
+			dialogDiv.bind('click,mousedown', removePicker);
+		});
+	}
+	// 取得下一行cell的index
+	function _getCellIndex(table, row, cell) {
+		var rowSpanCount = 0;
+		for (var i = 0, len = row.cells.length; i < len; i++) {
+			if (row.cells[i] == cell) {
+				break;
+			}
+			rowSpanCount += row.cells[i].rowSpan - 1;
+		}
+		return cell.cellIndex - rowSpanCount;
+	}
+	self.plugin.table = {
+		//insert or modify table
+		prop : function(isInsert) {
+			var html = [
+				'<div style="padding:20px;">',
+				//rows, cols
+				'<div class="ke-dialog-row">',
+				'<label for="keRows" style="width:90px;">' + lang.cells + '</label>',
+				lang.rows + ' <input type="text" id="keRows" class="ke-input-text ke-input-number" name="rows" value="" maxlength="4" /> &nbsp; ',
+				lang.cols + ' <input type="text" class="ke-input-text ke-input-number" name="cols" value="" maxlength="4" />',
+				'</div>',
+				//width, height
+				'<div class="ke-dialog-row">',
+				'<label for="keWidth" style="width:90px;">' + lang.size + '</label>',
+				lang.width + ' <input type="text" id="keWidth" class="ke-input-text ke-input-number" name="width" value="" maxlength="4" /> &nbsp; ',
+				'<select name="widthType">',
+				'<option value="%">' + lang.percent + '</option>',
+				'<option value="px">' + lang.px + '</option>',
+				'</select> &nbsp; ',
+				lang.height + ' <input type="text" class="ke-input-text ke-input-number" name="height" value="" maxlength="4" /> &nbsp; ',
+				'<select name="heightType">',
+				'<option value="%">' + lang.percent + '</option>',
+				'<option value="px">' + lang.px + '</option>',
+				'</select>',
+				'</div>',
+				//space, padding
+				'<div class="ke-dialog-row">',
+				'<label for="kePadding" style="width:90px;">' + lang.space + '</label>',
+				lang.padding + ' <input type="text" id="kePadding" class="ke-input-text ke-input-number" name="padding" value="" maxlength="4" /> &nbsp; ',
+				lang.spacing + ' <input type="text" class="ke-input-text ke-input-number" name="spacing" value="" maxlength="4" />',
+				'</div>',
+				//align
+				'<div class="ke-dialog-row">',
+				'<label for="keAlign" style="width:90px;">' + lang.align + '</label>',
+				'<select id="keAlign" name="align">',
+				'<option value="">' + lang.alignDefault + '</option>',
+				'<option value="left">' + lang.alignLeft + '</option>',
+				'<option value="center">' + lang.alignCenter + '</option>',
+				'<option value="right">' + lang.alignRight + '</option>',
+				'</select>',
+				'</div>',
+				//border
+				'<div class="ke-dialog-row">',
+				'<label for="keBorder" style="width:90px;">' + lang.border + '</label>',
+				lang.borderWidth + ' <input type="text" id="keBorder" class="ke-input-text ke-input-number" name="border" value="" maxlength="4" /> &nbsp; ',
+				lang.borderColor + ' <span class="ke-inline-block ke-input-color"></span>',
+				'</div>',
+				//background color
+				'<div class="ke-dialog-row">',
+				'<label for="keBgColor" style="width:90px;">' + lang.backgroundColor + '</label>',
+				'<span class="ke-inline-block ke-input-color"></span>',
+				'</div>',
+				'</div>'
+			].join('');
+			var bookmark = self.cmd.range.createBookmark();
+			var dialog = self.createDialog({
+				name : name,
+				width : 500,
+				title : self.lang(name),
+				body : html,
+				beforeRemove : function() {
+					colorBox.unbind();
+				},
+				yesBtn : {
+					name : self.lang('yes'),
+					click : function(e) {
+						var rows = rowsBox.val(),
+							cols = colsBox.val(),
+							width = widthBox.val(),
+							height = heightBox.val(),
+							widthType = widthTypeBox.val(),
+							heightType = heightTypeBox.val(),
+							padding = paddingBox.val(),
+							spacing = spacingBox.val(),
+							align = alignBox.val(),
+							border = borderBox.val(),
+							borderColor = K(colorBox[0]).html() || '',
+							bgColor = K(colorBox[1]).html() || '';
+						if (rows == 0 || !/^\d+$/.test(rows)) {
+							alert(self.lang('invalidRows'));
+							rowsBox[0].focus();
+							return;
+						}
+						if (cols == 0 || !/^\d+$/.test(cols)) {
+							alert(self.lang('invalidRows'));
+							colsBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(width)) {
+							alert(self.lang('invalidWidth'));
+							widthBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(height)) {
+							alert(self.lang('invalidHeight'));
+							heightBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(padding)) {
+							alert(self.lang('invalidPadding'));
+							paddingBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(spacing)) {
+							alert(self.lang('invalidSpacing'));
+							spacingBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(border)) {
+							alert(self.lang('invalidBorder'));
+							borderBox[0].focus();
+							return;
+						}
+						//modify table
+						if (table) {
+							if (width !== '') {
+								table.width(width + widthType);
+							} else {
+								table.css('width', '');
+							}
+							if (table[0].width !== undefined) {
+								table.removeAttr('width');
+							}
+							if (height !== '') {
+								table.height(height + heightType);
+							} else {
+								table.css('height', '');
+							}
+							if (table[0].height !== undefined) {
+								table.removeAttr('height');
+							}
+							table.css('background-color', bgColor);
+							if (table[0].bgColor !== undefined) {
+								table.removeAttr('bgColor');
+							}
+							if (padding !== '') {
+								table[0].cellPadding = padding;
+							} else {
+								table.removeAttr('cellPadding');
+							}
+							if (spacing !== '') {
+								table[0].cellSpacing = spacing;
+							} else {
+								table.removeAttr('cellSpacing');
+							}
+							if (align !== '') {
+								table[0].align = align;
+							} else {
+								table.removeAttr('align');
+							}
+							if (border !== '') {
+								table.attr('border', border);
+							} else {
+								table.removeAttr('border');
+							}
+							if (border === '' || border === '0') {
+								table.addClass(zeroborder);
+							} else {
+								table.removeClass(zeroborder);
+							}
+							if (borderColor !== '') {
+								table.attr('borderColor', borderColor);
+							} else {
+								table.removeAttr('borderColor');
+							}
+							self.hideDialog().focus();
+							self.cmd.range.moveToBookmark(bookmark);
+							self.cmd.select();
+							self.addBookmark();
+							return;
+						}
+						//insert new table
+						var style = '';
+						if (width !== '') {
+							style += 'width:' + width + widthType + ';';
+						}
+						if (height !== '') {
+							style += 'height:' + height + heightType + ';';
+						}
+						if (bgColor !== '') {
+							style += 'background-color:' + bgColor + ';';
+						}
+						var html = '<table';
+						if (style !== '') {
+							html += ' style="' + style + '"';
+						}
+						if (padding !== '') {
+							html += ' cellpadding="' + padding + '"';
+						}
+						if (spacing !== '') {
+							html += ' cellspacing="' + spacing + '"';
+						}
+						if (align !== '') {
+							html += ' align="' + align + '"';
+						}
+						if (border !== '') {
+							html += ' border="' + border + '"';
+						}
+						if (border === '' || border === '0') {
+							html += ' class="' + zeroborder + '"';
+						}
+						if (borderColor !== '') {
+							html += ' bordercolor="' + borderColor + '"';
+						}
+						html += '>';
+						for (var i = 0; i < rows; i++) {
+							html += '<tr>';
+							for (var j = 0; j < cols; j++) {
+								html += '<td>' + (K.IE ? '&nbsp;' : '<br />') + '</td>';
+							}
+							html += '</tr>';
+						}
+						html += '</table>';
+						if (!K.IE) {
+							html += '<br />';
+						}
+						self.insertHtml(html);
+						self.select().hideDialog().focus();
+						self.addBookmark();
+					}
+				}
+			}),
+			div = dialog.div,
+			rowsBox = K('[name="rows"]', div).val(3),
+			colsBox = K('[name="cols"]', div).val(2),
+			widthBox = K('[name="width"]', div).val(100),
+			heightBox = K('[name="height"]', div),
+			widthTypeBox = K('[name="widthType"]', div),
+			heightTypeBox = K('[name="heightType"]', div),
+			paddingBox = K('[name="padding"]', div).val(2),
+			spacingBox = K('[name="spacing"]', div).val(0),
+			alignBox = K('[name="align"]', div),
+			borderBox = K('[name="border"]', div).val(1),
+			colorBox = K('.ke-input-color', div);
+			_initColorPicker(div, colorBox.eq(0));
+			_initColorPicker(div, colorBox.eq(1));
+			_setColor(colorBox.eq(0), '#000000');
+			_setColor(colorBox.eq(1), '');
+			// foucs and select
+			rowsBox[0].focus();
+			rowsBox[0].select();
+			var table;
+			if (isInsert) {
+				return;
+			}
+			//get selected table node
+			table = self.plugin.getSelectedTable();
+			if (table) {
+				rowsBox.val(table[0].rows.length);
+				colsBox.val(table[0].rows.length > 0 ? table[0].rows[0].cells.length : 0);
+				rowsBox.attr('disabled', true);
+				colsBox.attr('disabled', true);
+				var match,
+					tableWidth = table[0].style.width || table[0].width,
+					tableHeight = table[0].style.height || table[0].height;
+				if (tableWidth !== undefined && (match = /^(\d+)((?:px|%)*)$/.exec(tableWidth))) {
+					widthBox.val(match[1]);
+					widthTypeBox.val(match[2]);
+				} else {
+					widthBox.val('');
+				}
+				if (tableHeight !== undefined && (match = /^(\d+)((?:px|%)*)$/.exec(tableHeight))) {
+					heightBox.val(match[1]);
+					heightTypeBox.val(match[2]);
+				}
+				paddingBox.val(table[0].cellPadding || '');
+				spacingBox.val(table[0].cellSpacing || '');
+				alignBox.val(table[0].align || '');
+				borderBox.val(table[0].border === undefined ? '' : table[0].border);
+				_setColor(colorBox.eq(0), K.toHex(table.attr('borderColor') || ''));
+				_setColor(colorBox.eq(1), K.toHex(table[0].style.backgroundColor || table[0].bgColor || ''));
+				widthBox[0].focus();
+				widthBox[0].select();
+			}
+		},
+		//modify cell
+		cellprop : function() {
+			var html = [
+				'<div style="padding:20px;">',
+				//width, height
+				'<div class="ke-dialog-row">',
+				'<label for="keWidth" style="width:90px;">' + lang.size + '</label>',
+				lang.width + ' <input type="text" id="keWidth" class="ke-input-text ke-input-number" name="width" value="" maxlength="4" /> &nbsp; ',
+				'<select name="widthType">',
+				'<option value="%">' + lang.percent + '</option>',
+				'<option value="px">' + lang.px + '</option>',
+				'</select> &nbsp; ',
+				lang.height + ' <input type="text" class="ke-input-text ke-input-number" name="height" value="" maxlength="4" /> &nbsp; ',
+				'<select name="heightType">',
+				'<option value="%">' + lang.percent + '</option>',
+				'<option value="px">' + lang.px + '</option>',
+				'</select>',
+				'</div>',
+				//align
+				'<div class="ke-dialog-row">',
+				'<label for="keAlign" style="width:90px;">' + lang.align + '</label>',
+				lang.textAlign + ' <select id="keAlign" name="textAlign">',
+				'<option value="">' + lang.alignDefault + '</option>',
+				'<option value="left">' + lang.alignLeft + '</option>',
+				'<option value="center">' + lang.alignCenter + '</option>',
+				'<option value="right">' + lang.alignRight + '</option>',
+				'</select> ',
+				lang.verticalAlign + ' <select name="verticalAlign">',
+				'<option value="">' + lang.alignDefault + '</option>',
+				'<option value="top">' + lang.alignTop + '</option>',
+				'<option value="middle">' + lang.alignMiddle + '</option>',
+				'<option value="bottom">' + lang.alignBottom + '</option>',
+				'<option value="baseline">' + lang.alignBaseline + '</option>',
+				'</select>',
+				'</div>',
+				//border
+				'<div class="ke-dialog-row">',
+				'<label for="keBorder" style="width:90px;">' + lang.border + '</label>',
+				lang.borderWidth + ' <input type="text" id="keBorder" class="ke-input-text ke-input-number" name="border" value="" maxlength="4" /> &nbsp; ',
+				lang.borderColor + ' <span class="ke-inline-block ke-input-color"></span>',
+				'</div>',
+				//background color
+				'<div class="ke-dialog-row">',
+				'<label for="keBgColor" style="width:90px;">' + lang.backgroundColor + '</label>',
+				'<span class="ke-inline-block ke-input-color"></span>',
+				'</div>',
+				'</div>'
+			].join('');
+			var bookmark = self.cmd.range.createBookmark();
+			var dialog = self.createDialog({
+				name : name,
+				width : 500,
+				title : self.lang('tablecell'),
+				body : html,
+				beforeRemove : function() {
+					colorBox.unbind();
+				},
+				yesBtn : {
+					name : self.lang('yes'),
+					click : function(e) {
+						var width = widthBox.val(),
+							height = heightBox.val(),
+							widthType = widthTypeBox.val(),
+							heightType = heightTypeBox.val(),
+							padding = paddingBox.val(),
+							spacing = spacingBox.val(),
+							textAlign = textAlignBox.val(),
+							verticalAlign = verticalAlignBox.val(),
+							border = borderBox.val(),
+							borderColor = K(colorBox[0]).html() || '',
+							bgColor = K(colorBox[1]).html() || '';
+						if (!/^\d*$/.test(width)) {
+							alert(self.lang('invalidWidth'));
+							widthBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(height)) {
+							alert(self.lang('invalidHeight'));
+							heightBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(border)) {
+							alert(self.lang('invalidBorder'));
+							borderBox[0].focus();
+							return;
+						}
+						cell.css({
+							width : width !== '' ? (width + widthType) : '',
+							height : height !== '' ? (height + heightType) : '',
+							'background-color' : bgColor,
+							'text-align' : textAlign,
+							'vertical-align' : verticalAlign,
+							'border-width' : border,
+							'border-style' : border !== '' ? 'solid' : '',
+							'border-color' : borderColor
+						});
+						self.hideDialog().focus();
+						self.cmd.range.moveToBookmark(bookmark);
+						self.cmd.select();
+						self.addBookmark();
+					}
+				}
+			}),
+			div = dialog.div,
+			widthBox = K('[name="width"]', div).val(100),
+			heightBox = K('[name="height"]', div),
+			widthTypeBox = K('[name="widthType"]', div),
+			heightTypeBox = K('[name="heightType"]', div),
+			paddingBox = K('[name="padding"]', div).val(2),
+			spacingBox = K('[name="spacing"]', div).val(0),
+			textAlignBox = K('[name="textAlign"]', div),
+			verticalAlignBox = K('[name="verticalAlign"]', div),
+			borderBox = K('[name="border"]', div).val(1),
+			colorBox = K('.ke-input-color', div);
+			_initColorPicker(div, colorBox.eq(0));
+			_initColorPicker(div, colorBox.eq(1));
+			_setColor(colorBox.eq(0), '#000000');
+			_setColor(colorBox.eq(1), '');
+			// foucs and select
+			widthBox[0].focus();
+			widthBox[0].select();
+			// get selected cell
+			var cell = self.plugin.getSelectedCell();
+			var match,
+				cellWidth = cell[0].style.width || cell[0].width || '',
+				cellHeight = cell[0].style.height || cell[0].height || '';
+			if ((match = /^(\d+)((?:px|%)*)$/.exec(cellWidth))) {
+				widthBox.val(match[1]);
+				widthTypeBox.val(match[2]);
+			} else {
+				widthBox.val('');
+			}
+			if ((match = /^(\d+)((?:px|%)*)$/.exec(cellHeight))) {
+				heightBox.val(match[1]);
+				heightTypeBox.val(match[2]);
+			}
+			textAlignBox.val(cell[0].style.textAlign || '');
+			verticalAlignBox.val(cell[0].style.verticalAlign || '');
+			var border = cell[0].style.borderWidth || '';
+			if (border) {
+				border = parseInt(border);
+			}
+			borderBox.val(border);
+			_setColor(colorBox.eq(0), K.toHex(cell[0].style.borderColor || ''));
+			_setColor(colorBox.eq(1), K.toHex(cell[0].style.backgroundColor || ''));
+			widthBox[0].focus();
+			widthBox[0].select();
+		},
+		insert : function() {
+			this.prop(true);
+		},
+		'delete' : function() {
+			var table = self.plugin.getSelectedTable();
+			self.cmd.range.setStartBefore(table[0]).collapse(true);
+			self.cmd.select();
+			table.remove();
+			self.addBookmark();
+		},
+		colinsert : function(offset) {
+			var table = self.plugin.getSelectedTable()[0],
+				row = self.plugin.getSelectedRow()[0],
+				cell = self.plugin.getSelectedCell()[0],
+				index = cell.cellIndex + offset;
+			// 取得第一行的index
+			index += table.rows[0].cells.length - row.cells.length;
+
+			for (var i = 0, len = table.rows.length; i < len; i++) {
+				var newRow = table.rows[i],
+					newCell = newRow.insertCell(index);
+				newCell.innerHTML = K.IE ? '' : '<br />';
+				// 调整下一行的单元格index
+				index = _getCellIndex(table, newRow, newCell);
+			}
+			self.cmd.range.selectNodeContents(cell).collapse(true);
+			self.cmd.select();
+			self.addBookmark();
+		},
+		colinsertleft : function() {
+			this.colinsert(0);
+		},
+		colinsertright : function() {
+			this.colinsert(1);
+		},
+		rowinsert : function(offset) {
+			var table = self.plugin.getSelectedTable()[0],
+				row = self.plugin.getSelectedRow()[0],
+				cell = self.plugin.getSelectedCell()[0];
+			var rowIndex = row.rowIndex;
+			if (offset === 1) {
+				rowIndex = row.rowIndex + (cell.rowSpan - 1) + offset;
+			}
+			var newRow = table.insertRow(rowIndex);
+
+			for (var i = 0, len = row.cells.length; i < len; i++) {
+				// 调整cell个数
+				if (row.cells[i].rowSpan > 1) {
+					len -= row.cells[i].rowSpan - 1;
+				}
+				var newCell = newRow.insertCell(i);
+				// copy colspan
+				if (offset === 1 && row.cells[i].colSpan > 1) {
+					newCell.colSpan = row.cells[i].colSpan;
+				}
+				newCell.innerHTML = K.IE ? '' : '<br />';
+			}
+			// 调整rowspan
+			for (var j = rowIndex; j >= 0; j--) {
+				var cells = table.rows[j].cells;
+				if (cells.length > i) {
+					for (var k = cell.cellIndex; k >= 0; k--) {
+						if (cells[k].rowSpan > 1) {
+							cells[k].rowSpan += 1;
+						}
+					}
+					break;
+				}
+			}
+			self.cmd.range.selectNodeContents(cell).collapse(true);
+			self.cmd.select();
+			self.addBookmark();
+		},
+		rowinsertabove : function() {
+			this.rowinsert(0);
+		},
+		rowinsertbelow : function() {
+			this.rowinsert(1);
+		},
+		rowmerge : function() {
+			var table = self.plugin.getSelectedTable()[0],
+				row = self.plugin.getSelectedRow()[0],
+				cell = self.plugin.getSelectedCell()[0],
+				rowIndex = row.rowIndex, // 当前行的index
+				nextRowIndex = rowIndex + cell.rowSpan, // 下一行的index
+				nextRow = table.rows[nextRowIndex]; // 下一行
+			// 最后一行不能合并
+			if (table.rows.length <= nextRowIndex) {
+				return;
+			}
+			var cellIndex = cell.cellIndex; // 下一行单元格的index
+			if (nextRow.cells.length <= cellIndex) {
+				return;
+			}
+			var nextCell = nextRow.cells[cellIndex]; // 下一行单元格
+			// 上下行的colspan不一致时不能合并
+			if (cell.colSpan !== nextCell.colSpan) {
+				return;
+			}
+			cell.rowSpan += nextCell.rowSpan;
+			nextRow.deleteCell(cellIndex);
+			self.cmd.range.selectNodeContents(cell).collapse(true);
+			self.cmd.select();
+			self.addBookmark();
+		},
+		colmerge : function() {
+			var table = self.plugin.getSelectedTable()[0],
+				row = self.plugin.getSelectedRow()[0],
+				cell = self.plugin.getSelectedCell()[0],
+				rowIndex = row.rowIndex, // 当前行的index
+				cellIndex = cell.cellIndex,
+				nextCellIndex = cellIndex + 1;
+			// 最后一列不能合并
+			if (row.cells.length <= nextCellIndex) {
+				return;
+			}
+			var nextCell = row.cells[nextCellIndex];
+			// 左右列的rowspan不一致时不能合并
+			if (cell.rowSpan !== nextCell.rowSpan) {
+				return;
+			}
+			cell.colSpan += nextCell.colSpan;
+			row.deleteCell(nextCellIndex);
+			self.cmd.range.selectNodeContents(cell).collapse(true);
+			self.cmd.select();
+			self.addBookmark();
+		},
+		rowsplit : function() {
+			var table = self.plugin.getSelectedTable()[0],
+				row = self.plugin.getSelectedRow()[0],
+				cell = self.plugin.getSelectedCell()[0],
+				rowIndex = row.rowIndex;
+			// 不是可分割单元格
+			if (cell.rowSpan === 1) {
+				return;
+			}
+			var cellIndex = _getCellIndex(table, row, cell);
+			for (var i = 1, len = cell.rowSpan; i < len; i++) {
+				var newRow = table.rows[rowIndex + i],
+					newCell = newRow.insertCell(cellIndex);
+				if (cell.colSpan > 1) {
+					newCell.colSpan = cell.colSpan;
+				}
+				newCell.innerHTML = K.IE ? '' : '<br />';
+				// 调整下一行的单元格index
+				cellIndex = _getCellIndex(table, newRow, newCell);
+			}
+			K(cell).removeAttr('rowSpan');
+			self.cmd.range.selectNodeContents(cell).collapse(true);
+			self.cmd.select();
+			self.addBookmark();
+		},
+		colsplit : function() {
+			var table = self.plugin.getSelectedTable()[0],
+				row = self.plugin.getSelectedRow()[0],
+				cell = self.plugin.getSelectedCell()[0],
+				cellIndex = cell.cellIndex;
+			// 不是可分割单元格
+			if (cell.colSpan === 1) {
+				return;
+			}
+			for (var i = 1, len = cell.colSpan; i < len; i++) {
+				var newCell = row.insertCell(cellIndex + i);
+				if (cell.rowSpan > 1) {
+					newCell.rowSpan = cell.rowSpan;
+				}
+				newCell.innerHTML = K.IE ? '' : '<br />';
+			}
+			K(cell).removeAttr('colSpan');
+			self.cmd.range.selectNodeContents(cell).collapse(true);
+			self.cmd.select();
+			self.addBookmark();
+		},
+		coldelete : function() {
+			var table = self.plugin.getSelectedTable()[0],
+				row = self.plugin.getSelectedRow()[0],
+				cell = self.plugin.getSelectedCell()[0],
+				index = cell.cellIndex;
+			for (var i = 0, len = table.rows.length; i < len; i++) {
+				var newRow = table.rows[i],
+					newCell = newRow.cells[index];
+				if (newCell.colSpan > 1) {
+					newCell.colSpan -= 1;
+					if (newCell.colSpan === 1) {
+						K(newCell).removeAttr('colSpan');
+					}
+				} else {
+					newRow.deleteCell(index);
+				}
+				// 跳过不需要删除的行
+				if (newCell.rowSpan > 1) {
+					i += newCell.rowSpan - 1;
+				}
+			}
+			if (row.cells.length === 0) {
+				self.cmd.range.setStartBefore(table).collapse(true);
+				self.cmd.select();
+				K(table).remove();
+			} else {
+				self.cmd.selection(true);
+			}
+			self.addBookmark();
+		},
+		rowdelete : function() {
+			var table = self.plugin.getSelectedTable()[0],
+				row = self.plugin.getSelectedRow()[0],
+				cell = self.plugin.getSelectedCell()[0],
+				rowIndex = row.rowIndex;
+			// 从下到上删除
+			for (var i = cell.rowSpan - 1; i >= 0; i--) {
+				table.deleteRow(rowIndex + i);
+			}
+			if (table.rows.length === 0) {
+				self.cmd.range.setStartBefore(table).collapse(true);
+				self.cmd.select();
+				K(table).remove();
+			} else {
+				self.cmd.selection(true);
+			}
+			self.addBookmark();
+		}
+	};
+	self.clickToolbar(name, self.plugin.table.prop);
+});
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('template', function(K) {
+	var self = this, name = 'template', lang = self.lang(name + '.'),
+		htmlPath = self.pluginsPath + name + '/html/';
+	function getFilePath(fileName) {
+		return htmlPath + fileName + '?ver=' + encodeURIComponent(K.DEBUG ? K.TIME : K.VERSION);
+	}
+	self.clickToolbar(name, function() {
+		var lang = self.lang(name + '.'),
+			arr = ['<div style="padding:10px 20px;">',
+				'<div class="ke-header">',
+				// left start
+				'<div class="ke-left">',
+				lang. selectTemplate + ' <select>'];
+			K.each(lang.fileList, function(key, val) {
+				arr.push('<option value="' + key + '">' + val + '</option>');
+			});
+			html = [arr.join(''),
+				'</select></div>',
+				// right start
+				'<div class="ke-right">',
+				'<input type="checkbox" id="keReplaceFlag" name="replaceFlag" value="1" /> <label for="keReplaceFlag">' + lang.replaceContent + '</label>',
+				'</div>',
+				'<div class="ke-clearfix"></div>',
+				'</div>',
+				'<iframe class="ke-textarea" frameborder="0" style="width:458px;height:260px;background-color:#FFF;"></iframe>',
+				'</div>'].join('');
+		var dialog = self.createDialog({
+			name : name,
+			width : 500,
+			title : self.lang(name),
+			body : html,
+			yesBtn : {
+				name : self.lang('yes'),
+				click : function(e) {
+					var doc = K.iframeDoc(iframe);
+					self[checkbox[0].checked ? 'html' : 'insertHtml'](doc.body.innerHTML).hideDialog().focus();
+				}
+			}
+		});
+		var selectBox = K('select', dialog.div),
+			checkbox = K('[name="replaceFlag"]', dialog.div),
+			iframe = K('iframe', dialog.div);
+		checkbox[0].checked = true;
+		iframe.attr('src', getFilePath(selectBox.val()));
+		selectBox.change(function() {
+			iframe.attr('src', getFilePath(this.value));
+		});
+	});
+});
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('wordpaste', function(K) {
+	var self = this, name = 'wordpaste';
+	self.clickToolbar(name, function() {
+		var lang = self.lang(name + '.'),
+			html = '<div style="padding:10px 20px;">' +
+				'<div style="margin-bottom:10px;">' + lang.comment + '</div>' +
+				'<iframe class="ke-textarea" frameborder="0" style="width:408px;height:260px;"></iframe>' +
+				'</div>',
+			dialog = self.createDialog({
+				name : name,
+				width : 450,
+				title : self.lang(name),
+				body : html,
+				yesBtn : {
+					name : self.lang('yes'),
+					click : function(e) {
+						var str = doc.body.innerHTML;
+						str = K.clearMsWord(str, self.filterMode ? self.htmlTags : K.options.htmlTags);
+						self.insertHtml(str).hideDialog().focus();
+					}
+				}
+			}),
+			div = dialog.div,
+			iframe = K('iframe', div),
+			doc = K.iframeDoc(iframe);
+		if (!K.IE) {
+			doc.designMode = 'on';
+		}
+		doc.open();
+		doc.write('<!doctype html><html><head><title>WordPaste</title></head>');
+		doc.write('<body style="background-color:#FFF;font-size:12px;margin:2px;">');
+		if (!K.IE) {
+			doc.write('<br />');
+		}
+		doc.write('</body></html>');
+		doc.close();
+		if (K.IE) {
+			doc.body.contentEditable = 'true';
+		}
+		iframe[0].contentWindow.focus();
+	});
+});
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/kindeditor-min.js b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/kindeditor-min.js
new file mode 100644
index 0000000..7b35f52
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/kindeditor-min.js
@@ -0,0 +1,182 @@
+/* KindEditor 4.1.10 (2013-11-23), Copyright (C) kindsoft.net, Licence: http://www.kindsoft.net/license.php */(function(w,i){function Z(a){if(!a)return!1;return Object.prototype.toString.call(a)==="[object Array]"}function wa(a){if(!a)return!1;return Object.prototype.toString.call(a)==="[object Function]"}function J(a,b){for(var c=0,d=b.length;c<d;c++)if(a===b[c])return c;return-1}function m(a,b){if(Z(a))for(var c=0,d=a.length;c<d;c++){if(b.call(a[c],c,a[c])===!1)break}else for(c in a)if(a.hasOwnProperty(c)&&b.call(a[c],c,a[c])===!1)break}function B(a){return a.replace(/(?:^[ \t\n\r]+)|(?:[ \t\n\r]+$)/g,
+"")}function xa(a,b,c){c=c===i?",":c;return(c+b+c).indexOf(c+a+c)>=0}function s(a,b){b=b||"px";return a&&/^\d+$/.test(a)?a+b:a}function t(a){var b;return a&&(b=/(\d+)/.exec(a))?parseInt(b[1],10):0}function C(a){return a.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;")}function fa(a){return a.replace(/&lt;/g,"<").replace(/&gt;/g,">").replace(/&quot;/g,'"').replace(/&amp;/g,"&")}function ga(a){var b=a.split("-"),a="";m(b,function(b,d){a+=b>0?d.charAt(0).toUpperCase()+
+d.substr(1):d});return a}function ya(a){function b(a){a=parseInt(a,10).toString(16).toUpperCase();return a.length>1?a:"0"+a}return a.replace(/rgb\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)/ig,function(a,d,e,g){return"#"+b(d)+b(e)+b(g)})}function u(a,b){var b=b===i?",":b,c={},d=Z(a)?a:a.split(b),e;m(d,function(a,b){if(e=/^(\d+)\.\.(\d+)$/.exec(b))for(var d=parseInt(e[1],10);d<=parseInt(e[2],10);d++)c[d.toString()]=!0;else c[b]=!0});return c}function Ja(a,b){return Array.prototype.slice.call(a,b||0)}
+function l(a,b){return a===i?b:a}function E(a,b,c){c||(c=b,b=null);var d;if(b){var e=function(){};e.prototype=b.prototype;d=new e;m(c,function(a,b){d[a]=b})}else d=c;d.constructor=a;a.prototype=d;a.parent=b?b.prototype:null}function eb(a){var b;if(b=/\{[\s\S]*\}|\[[\s\S]*\]/.exec(a))a=b[0];b=/[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g;b.lastIndex=0;b.test(a)&&(a=a.replace(b,function(a){return"\\u"+("0000"+a.charCodeAt(0).toString(16)).slice(-4)}));
+if(/^[\],:{}\s]*$/.test(a.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,"@").replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,"]").replace(/(?:^|:|,)(?:\s*\[)+/g,"")))return eval("("+a+")");throw"JSON parse error";}function Rb(a,b,c){a.addEventListener?a.addEventListener(b,c,fb):a.attachEvent&&a.attachEvent("on"+b,c)}function za(a,b,c){a.removeEventListener?a.removeEventListener(b,c,fb):a.detachEvent&&a.detachEvent("on"+b,c)}function gb(a,b){this.init(a,b)}function hb(a){try{delete a[$]}catch(b){a.removeAttribute&&
+a.removeAttribute($)}}function aa(a,b,c){if(b.indexOf(",")>=0)m(b.split(","),function(){aa(a,this,c)});else{var d=a[$]||null;d||(a[$]=++ib,d=ib);v[d]===i&&(v[d]={});var e=v[d][b];e&&e.length>0?za(a,b,e[0]):(v[d][b]=[],v[d].el=a);e=v[d][b];e.length===0&&(e[0]=function(b){var c=b?new gb(a,b):i;m(e,function(b,d){b>0&&d&&d.call(a,c)})});J(c,e)<0&&e.push(c);Rb(a,b,e[0])}}function ha(a,b,c){if(b&&b.indexOf(",")>=0)m(b.split(","),function(){ha(a,this,c)});else{var d=a[$]||null;if(d)if(b===i)d in v&&(m(v[d],
+function(b,c){b!="el"&&c.length>0&&za(a,b,c[0])}),delete v[d],hb(a));else if(v[d]){var e=v[d][b];if(e&&e.length>0){c===i?(za(a,b,e[0]),delete v[d][b]):(m(e,function(a,b){a>0&&b===c&&e.splice(a,1)}),e.length==1&&(za(a,b,e[0]),delete v[d][b]));var g=0;m(v[d],function(){g++});g<2&&(delete v[d],hb(a))}}}}function jb(a,b){if(b.indexOf(",")>=0)m(b.split(","),function(){jb(a,this)});else{var c=a[$]||null;if(c){var d=v[c][b];if(v[c]&&d&&d.length>0)d[0]()}}}function Ka(a,b,c){b=/^\d{2,}$/.test(b)?b:b.toUpperCase().charCodeAt(0);
+aa(a,"keydown",function(d){d.ctrlKey&&d.which==b&&!d.shiftKey&&!d.altKey&&(c.call(a),d.stop())})}function ba(a){for(var b={},c=/\s*([\w\-]+)\s*:([^;]*)(;|$)/g,d;d=c.exec(a);){var e=B(d[1].toLowerCase());d=B(ya(d[2]));b[e]=d}return b}function I(a){for(var b={},c=/\s+(?:([\w\-:]+)|(?:([\w\-:]+)=([^\s"'<>]+))|(?:([\w\-:"]+)="([^"]*)")|(?:([\w\-:"]+)='([^']*)'))(?=(?:\s|\/|>)+)/g,d;d=c.exec(a);){var e=(d[1]||d[2]||d[4]||d[6]).toLowerCase();b[e]=(d[2]?d[3]:d[4]?d[5]:d[7])||""}return b}function Sb(a,b){return a=
+/\s+class\s*=/.test(a)?a.replace(/(\s+class=["']?)([^"']*)(["']?[\s>])/,function(a,d,e,g){return(" "+e+" ").indexOf(" "+b+" ")<0?e===""?d+b+g:d+e+" "+b+g:a}):a.substr(0,a.length-1)+' class="'+b+'">'}function Tb(a){var b="";m(ba(a),function(a,d){b+=a+":"+d+";"});return b}function ia(a,b,c,d){function e(a){for(var a=a.split("/"),b=[],c=0,d=a.length;c<d;c++){var e=a[c];e==".."?b.length>0&&b.pop():e!==""&&e!="."&&b.push(e)}return"/"+b.join("/")}function g(b,c){if(a.substr(0,b.length)===b){for(var e=[],
+h=0;h<c;h++)e.push("..");h=".";e.length>0&&(h+="/"+e.join("/"));d=="/"&&(h+="/");return h+a.substr(b.length)}else if(f=/^(.*)\//.exec(b))return g(f[1],++c)}b=l(b,"").toLowerCase();a.substr(0,5)!="data:"&&(a=a.replace(/([^:])\/\//g,"$1/"));if(J(b,["absolute","relative","domain"])<0)return a;c=c||location.protocol+"//"+location.host;if(d===i)var h=location.pathname.match(/^(\/.*)\//),d=h?h[1]:"";var f;if(f=/^(\w+:\/\/[^\/]*)/.exec(a)){if(f[1]!==c)return a}else if(/^\w+:/.test(a))return a;/^\//.test(a)?
+a=c+e(a.substr(1)):/^\w+:\/\//.test(a)||(a=c+e(d+"/"+a));b==="relative"?a=g(c+d,0).substr(2):b==="absolute"&&a.substr(0,c.length)===c&&(a=a.substr(c.length));return a}function U(a,b,c,d,e){a==null&&(a="");var c=c||"",d=l(d,!1),e=l(e,"\t"),g="xx-small,x-small,small,medium,large,x-large,xx-large".split(","),a=a.replace(/(<(?:pre|pre\s[^>]*)>)([\s\S]*?)(<\/pre>)/ig,function(a,b,c,d){return b+c.replace(/<(?:br|br\s[^>]*)>/ig,"\n")+d}),a=a.replace(/<(?:br|br\s[^>]*)\s*\/?>\s*<\/p>/ig,"</p>"),a=a.replace(/(<(?:p|p\s[^>]*)>)\s*(<\/p>)/ig,
+"$1<br />$2"),a=a.replace(/\u200B/g,""),a=a.replace(/\u00A9/g,"&copy;"),a=a.replace(/\u00AE/g,"&reg;"),a=a.replace(/<[^>]+/g,function(a){return a.replace(/\s+/g," ")}),h={};b&&(m(b,function(a,b){for(var c=a.split(","),d=0,e=c.length;d<e;d++)h[c[d]]=u(b)}),h.script||(a=a.replace(/(<(?:script|script\s[^>]*)>)([\s\S]*?)(<\/script>)/ig,"")),h.style||(a=a.replace(/(<(?:style|style\s[^>]*)>)([\s\S]*?)(<\/style>)/ig,"")));var f=[],a=a.replace(/(\s*)<(\/)?([\w\-:]+)((?:\s+|(?:\s+[\w\-:]+)|(?:\s+[\w\-:]+=[^\s"'<>]+)|(?:\s+[\w\-:"]+="[^"]*")|(?:\s+[\w\-:"]+='[^']*'))*)(\/)?>(\s*)/g,
+function(a,n,q,r,K,ja,i){var n=n||"",q=q||"",l=r.toLowerCase(),o=K||"",r=ja?" "+ja:"",i=i||"";if(b&&!h[l])return"";r===""&&kb[l]&&(r=" /");lb[l]&&(n&&(n=" "),i&&(i=" "));La[l]&&(q?i="\n":n="\n");d&&l=="br"&&(i="\n");if(mb[l]&&!La[l])if(d){q&&f.length>0&&f[f.length-1]===l?f.pop():f.push(l);i=n="\n";K=0;for(ja=q?f.length:f.length-1;K<ja;K++)n+=e,q||(i+=e);r?f.pop():q||(i+=e)}else n=i="";if(o!==""){var z=I(a);if(l==="font"){var L={},F="";m(z,function(a,b){if(a==="color")L.color=b,delete z[a];a==="size"&&
+(L["font-size"]=g[parseInt(b,10)-1]||"",delete z[a]);a==="face"&&(L["font-family"]=b,delete z[a]);a==="style"&&(F=b)});F&&!/;$/.test(F)&&(F+=";");m(L,function(a,b){b!==""&&(/\s/.test(b)&&(b="'"+b+"'"),F+=a+":"+b+";")});z.style=F}m(z,function(a,d){Ub[a]&&(z[a]=a);J(a,["src","href"])>=0&&(z[a]=ia(d,c));(b&&a!=="style"&&!h[l]["*"]&&!h[l][a]||l==="body"&&a==="contenteditable"||/^kindeditor_\d+$/.test(a))&&delete z[a];if(a==="style"&&d!==""){var e=ba(d);m(e,function(a){b&&!h[l].style&&!h[l]["."+a]&&delete e[a]});
+var g="";m(e,function(a,b){g+=a+":"+b+";"});z.style=g}});o="";m(z,function(a,b){a==="style"&&b===""||(b=b.replace(/"/g,"&quot;"),o+=" "+a+'="'+b+'"')})}l==="font"&&(l="span");return n+"<"+q+l+o+r+">"+i}),a=a.replace(/(<(?:pre|pre\s[^>]*)>)([\s\S]*?)(<\/pre>)/ig,function(a,b,c,d){return b+c.replace(/\n/g,'<span id="__kindeditor_pre_newline__">\n')+d}),a=a.replace(/\n\s*\n/g,"\n"),a=a.replace(/<span id="__kindeditor_pre_newline__">\n/g,"\n");return B(a)}function nb(a,b){a=a.replace(/<meta[\s\S]*?>/ig,
+"").replace(/<![\s\S]*?>/ig,"").replace(/<style[^>]*>[\s\S]*?<\/style>/ig,"").replace(/<script[^>]*>[\s\S]*?<\/script>/ig,"").replace(/<w:[^>]+>[\s\S]*?<\/w:[^>]+>/ig,"").replace(/<o:[^>]+>[\s\S]*?<\/o:[^>]+>/ig,"").replace(/<xml>[\s\S]*?<\/xml>/ig,"").replace(/<(?:table|td)[^>]*>/ig,function(a){return a.replace(/border-bottom:([#\w\s]+)/ig,"border:$1")});return U(a,b)}function ob(a){if(/\.(rm|rmvb)(\?|$)/i.test(a))return"audio/x-pn-realaudio-plugin";if(/\.(swf|flv)(\?|$)/i.test(a))return"application/x-shockwave-flash";
+return"video/x-ms-asf-plugin"}function pb(a){return I(unescape(a))}function Ma(a){var b="<embed ";m(a,function(a,d){b+=a+'="'+d+'" '});b+="/>";return b}function qb(a,b){var c=b.width,d=b.height,e=b.type||ob(b.src),g=Ma(b),h="";/\D/.test(c)?h+="width:"+c+";":c>0&&(h+="width:"+c+"px;");/\D/.test(d)?h+="height:"+d+";":d>0&&(h+="height:"+d+"px;");c=/realaudio/i.test(e)?"ke-rm":/flash/i.test(e)?"ke-flash":"ke-media";c='<img class="'+c+'" src="'+a+'" ';h!==""&&(c+='style="'+h+'" ');c+='data-ke-tag="'+escape(g)+
+'" alt="" />';return c}function Aa(a,b){if(a.nodeType==9&&b.nodeType!=9)return!0;for(;b=b.parentNode;)if(b==a)return!0;return!1}function Ba(a,b){var b=b.toLowerCase(),c=null;if(!Vb&&a.nodeName.toLowerCase()!="script"){var d=a.ownerDocument.createElement("div");d.appendChild(a.cloneNode(!1));d=I(fa(d.innerHTML));b in d&&(c=d[b])}else try{c=a.getAttribute(b,2)}catch(e){c=a.getAttribute(b,1)}b==="style"&&c!==null&&(c=Tb(c));return c}function Ca(a,b){function c(a){if(typeof a!="string")return a;return a.replace(/([^\w\-])/g,
+"\\$1")}function d(a,b){return a==="*"||a.toLowerCase()===c(b.toLowerCase())}function e(a,b,c){var e=[];(a=(c.ownerDocument||c).getElementById(a.replace(/\\/g,"")))&&d(b,a.nodeName)&&Aa(c,a)&&e.push(a);return e}function g(a,b,c){var e=c.ownerDocument||c,g=[],h,f,j;if(c.getElementsByClassName){e=c.getElementsByClassName(a.replace(/\\/g,""));h=0;for(f=e.length;h<f;h++)j=e[h],d(b,j.nodeName)&&g.push(j)}else if(e.querySelectorAll){e=e.querySelectorAll((c.nodeName!=="#document"?c.nodeName+" ":"")+b+"."+
+a);h=0;for(f=e.length;h<f;h++)j=e[h],Aa(c,j)&&g.push(j)}else{e=c.getElementsByTagName(b);a=" "+a+" ";h=0;for(f=e.length;h<f;h++)if(j=e[h],j.nodeType==1)(b=j.className)&&(" "+b+" ").indexOf(a)>-1&&g.push(j)}return g}function h(a,b,d,e){for(var g=[],d=e.getElementsByTagName(d),h=0,f=d.length;h<f;h++)e=d[h],e.nodeType==1&&(b===null?Ba(e,a)!==null&&g.push(e):b===c(Ba(e,a))&&g.push(e));return g}function f(a,b){var c=[],j,k=(j=/^((?:\\.|[^.#\s\[<>])+)/.exec(a))?j[1]:"*";if(j=/#((?:[\w\-]|\\.)+)$/.exec(a))c=
+e(j[1],k,b);else if(j=/\.((?:[\w\-]|\\.)+)$/.exec(a))c=g(j[1],k,b);else if(j=/\[((?:[\w\-]|\\.)+)\]/.exec(a))c=h(j[1].toLowerCase(),null,k,b);else if(j=/\[((?:[\w\-]|\\.)+)\s*=\s*['"]?((?:\\.|[^'"]+)+)['"]?\]/.exec(a)){c=j[1].toLowerCase();j=j[2];if(c==="id")k=e(j,k,b);else if(c==="class")k=g(j,k,b);else if(c==="name"){c=[];j=(b.ownerDocument||b).getElementsByName(j.replace(/\\/g,""));for(var n,r=0,q=j.length;r<q;r++)n=j[r],d(k,n.nodeName)&&Aa(b,n)&&n.getAttribute("name")!==null&&c.push(n);k=c}else k=
+h(c,j,k,b);c=k}else{k=b.getElementsByTagName(k);n=0;for(r=k.length;n<r;n++)j=k[n],j.nodeType==1&&c.push(j)}return c}var k=a.split(",");if(k.length>1){var n=[];m(k,function(){m(Ca(this,b),function(){J(this,n)<0&&n.push(this)})});return n}for(var b=b||document,k=[],q,r=/((?:\\.|[^\s>])+|[\s>])/g;q=r.exec(a);)q[1]!==" "&&k.push(q[1]);q=[];if(k.length==1)return f(k[0],b);var r=!1,K,l,i,o,p,z,L,F,s,t;z=0;for(lenth=k.length;z<lenth;z++)if(K=k[z],K===">")r=!0;else{if(z>0){l=[];L=0;for(s=q.length;L<s;L++){o=
+q[L];i=f(K,o);F=0;for(t=i.length;F<t;F++)p=i[F],r?o===p.parentNode&&l.push(p):l.push(p)}q=l}else q=f(K,b);if(q.length===0)return[]}return q}function V(a){if(!a)return document;return a.ownerDocument||a.document||a}function W(a){if(!a)return w;a=V(a);return a.parentWindow||a.defaultView}function Wb(a,b){if(a.nodeType==1){var c=V(a);try{a.innerHTML='<img id="__kindeditor_temp_tag__" width="0" height="0" style="display:none;" />'+b;var d=c.getElementById("__kindeditor_temp_tag__");d.parentNode.removeChild(d)}catch(e){f(a).empty(),
+f("@"+b,c).each(function(){a.appendChild(this)})}}}function Na(a,b,c){o&&A<8&&b.toLowerCase()=="class"&&(b="className");a.setAttribute(b,""+c)}function Oa(a){if(!a||!a.nodeName)return"";return a.nodeName.toLowerCase()}function Xb(a,b){var c=W(a),d=ga(b),e="";c.getComputedStyle?(c=c.getComputedStyle(a,null),e=c[d]||c.getPropertyValue(b)||a.style[d]):a.currentStyle&&(e=a.currentStyle[d]||a.style[d]);return e}function G(a){a=a||document;return P?a.body:a.documentElement}function ca(a){var a=a||document,
+b;o||Yb||Pa?(b=G(a).scrollLeft,a=G(a).scrollTop):(b=W(a).scrollX,a=W(a).scrollY);return{x:b,y:a}}function D(a){this.init(a)}function rb(a){a.collapsed=a.startContainer===a.endContainer&&a.startOffset===a.endOffset;return a}function Qa(a,b,c){function d(d,e,g){var h=d.nodeValue.length,k;b&&(k=d.cloneNode(!0),k=e>0?k.splitText(e):k,g<h&&k.splitText(g-e));if(c){var n=d;e>0&&(n=d.splitText(e),a.setStart(d,e));g<h&&(d=n.splitText(g-e),a.setEnd(d,0));f.push(n)}return k}function e(){c&&a.up().collapse(!0);
+for(var b=0,d=f.length;b<d;b++){var e=f[b];e.parentNode&&e.parentNode.removeChild(e)}}function g(e,l){for(var i=e.firstChild,o;i;){o=(new M(h)).selectNode(i);n=o.compareBoundaryPoints(ka,a);n>=0&&q<=0&&(q=o.compareBoundaryPoints(la,a));q>=0&&r<=0&&(r=o.compareBoundaryPoints(da,a));r>=0&&m<=0&&(m=o.compareBoundaryPoints(ma,a));if(m>=0)return!1;o=i.nextSibling;if(n>0)if(i.nodeType==1)if(q>=0&&r<=0)b&&l.appendChild(i.cloneNode(!0)),c&&f.push(i);else{var p;b&&(p=i.cloneNode(!1),l.appendChild(p));if(g(i,
+p)===!1)return!1}else if(i.nodeType==3&&(i=i==k.startContainer?d(i,k.startOffset,i.nodeValue.length):i==k.endContainer?d(i,0,k.endOffset):d(i,0,i.nodeValue.length),b))try{l.appendChild(i)}catch(ja){}i=o}}var h=a.doc,f=[],k=a.cloneRange().down(),n=-1,q=-1,r=-1,m=-1,l=a.commonAncestor(),i=h.createDocumentFragment();if(l.nodeType==3)return l=d(l,a.startOffset,a.endOffset),b&&i.appendChild(l),e(),b?i:a;g(l,i);c&&a.up().collapse(!0);for(var l=0,o=f.length;l<o;l++){var p=f[l];p.parentNode&&p.parentNode.removeChild(p)}return b?
+i:a}function na(a,b){for(var c=b;c;){var d=f(c);if(d.name=="marquee"||d.name=="select")return;c=c.parentNode}try{a.moveToElementText(b)}catch(e){}}function sb(a,b){var c=a.parentElement().ownerDocument,d=a.duplicate();d.collapse(b);var e=d.parentElement(),g=e.childNodes;if(g.length===0)return{node:e.parentNode,offset:f(e).index()};var h=c,j=0,k=-1,n=a.duplicate();na(n,e);for(var q=0,r=g.length;q<r;q++){var i=g[q],k=n.compareEndPoints("StartToStart",d);if(k===0)return{node:i.parentNode,offset:q};if(i.nodeType==
+1){var l=a.duplicate(),m,o=f(i),p=i;o.isControl()&&(m=c.createElement("span"),o.after(m),p=m,j+=o.text().replace(/\r\n|\n|\r/g,"").length);na(l,p);n.setEndPoint("StartToEnd",l);k>0?j+=l.text.replace(/\r\n|\n|\r/g,"").length:j=0;m&&f(m).remove()}else i.nodeType==3&&(n.moveStart("character",i.nodeValue.length),j+=i.nodeValue.length);k<0&&(h=i)}if(k<0&&h.nodeType==1)return{node:e,offset:f(e.lastChild).index()+1};if(k>0)for(;h.nextSibling&&h.nodeType==1;)h=h.nextSibling;n=a.duplicate();na(n,e);n.setEndPoint("StartToEnd",
+d);j-=n.text.replace(/\r\n|\n|\r/g,"").length;if(k>0&&h.nodeType==3)for(c=h.previousSibling;c&&c.nodeType==3;)j-=c.nodeValue.length,c=c.previousSibling;return{node:h,offset:j}}function tb(a,b){var c=a.ownerDocument||a,d=c.body.createTextRange();if(c==a)return d.collapse(!0),d;if(a.nodeType==1&&a.childNodes.length>0){var e=a.childNodes,g;b===0?(g=e[0],e=!0):(g=e[b-1],e=!1);if(!g)return d;if(f(g).name==="head")return b===1&&(e=!0),b===2&&(e=!1),d.collapse(e),d;if(g.nodeType==1){var h=f(g),j;h.isControl()&&
+(j=c.createElement("span"),e?h.before(j):h.after(j),g=j);na(d,g);d.collapse(e);j&&f(j).remove();return d}a=g;b=e?0:g.nodeValue.length}c=c.createElement("span");f(a).before(c);na(d,c);d.moveStart("character",b);f(c).remove();return d}function ub(a){function b(a){if(f(a.node).name=="tr")a.node=a.node.cells[a.offset],a.offset=0}var c;if(H){if(a.item)return c=V(a.item(0)),c=new M(c),c.selectNode(a.item(0)),c;c=a.parentElement().ownerDocument;var d=sb(a,!0),a=sb(a,!1);b(d);b(a);c=new M(c);c.setStart(d.node,
+d.offset);c.setEnd(a.node,a.offset);return c}d=a.startContainer;c=d.ownerDocument||d;c=new M(c);c.setStart(d,a.startOffset);c.setEnd(a.endContainer,a.endOffset);return c}function M(a){this.init(a)}function Ra(a){if(!a.nodeName)return a.constructor===M?a:ub(a);return new M(a)}function Q(a,b,c){try{a.execCommand(b,!1,c)}catch(d){}}function vb(a,b){var c="";try{c=a.queryCommandValue(b)}catch(d){}typeof c!=="string"&&(c="");return c}function Sa(a){var b=W(a);return H?a.selection:b.getSelection()}function wb(a){var b=
+{},c,d;m(a,function(a,g){c=a.split(",");for(var h=0,f=c.length;h<f;h++)d=c[h],b[d]=g});return b}function Ta(a,b){return xb(a,b,"*")||xb(a,b)}function xb(a,b,c){c=c||a.name;if(a.type!==1)return!1;b=wb(b);if(!b[c])return!1;for(var c=b[c].split(","),b=0,d=c.length;b<d;b++){var e=c[b];if(e==="*")return!0;var g=/^(\.?)([^=]+)(?:=([^=]*))?$/.exec(e),h=g[1]?"css":"attr",e=g[2],g=g[3]||"";if(g===""&&a[h](e)!=="")return!0;if(g!==""&&a[h](e)===g)return!0}return!1}function Ua(a,b){a.type==1&&(yb(a,b,"*"),yb(a,
+b))}function yb(a,b,c){c=c||a.name;if(a.type===1&&(b=wb(b),b[c])){for(var c=b[c].split(","),b=!1,d=0,e=c.length;d<e;d++){var g=c[d];if(g==="*"){b=!0;break}var h=/^(\.?)([^=]+)(?:=([^=]*))?$/.exec(g),g=h[2];h[1]?(g=ga(g),a[0].style[g]&&(a[0].style[g]="")):a.removeAttr(g)}b&&a.remove(!0)}}function Va(a){for(;a.first();)a=a.first();return a}function ea(a){if(a.type!=1||a.isSingle())return!1;return a.html().replace(/<[^>]+>/g,"")===""}function Zb(a,b,c){m(b,function(b,c){b!=="style"&&a.attr(b,c)});m(c,
+function(b,c){a.css(b,c)})}function oa(a){this.init(a)}function zb(a){a.nodeName&&(a=V(a),a=Ra(a).selectNodeContents(a.body).collapse(!1));return new oa(a)}function Wa(a){var b=a.moveEl,c=a.moveFn,d=a.clickEl||b,e=a.beforeDrag,g=[document];(a.iframeFix===i||a.iframeFix)&&f("iframe").each(function(){if(!/^https?:\/\//.test(ia(this.src||"","absolute"))){var a;try{a=Xa(this)}catch(b){}if(a){var c=f(this).pos();f(a).data("pos-x",c.x);f(a).data("pos-y",c.y);g.push(a)}}});d.mousedown(function(a){function j(a){a.preventDefault();
+var b=f(V(a.target)),e=R((b.data("pos-x")||0)+a.pageX-p),a=R((b.data("pos-y")||0)+a.pageY-s);c.call(d,r,l,m,o,e,a)}function k(a){a.preventDefault()}function n(a){a.preventDefault();f(g).unbind("mousemove",j).unbind("mouseup",n).unbind("selectstart",k);i.releaseCapture&&i.releaseCapture()}a.stopPropagation();var i=d.get(),r=t(b.css("left")),l=t(b.css("top")),m=b.width(),o=b.height(),p=a.pageX,s=a.pageY;e&&e();f(g).mousemove(j).mouseup(n).bind("selectstart",k);i.setCapture&&i.setCapture()})}function S(a){this.init(a)}
+function Ya(a){return new S(a)}function Xa(a){a=f(a)[0];return a.contentDocument||a.contentWindow.document}function $b(a,b,c,d){var e=[Za===""?"<html>":'<html dir="'+Za+'">','<head><meta charset="utf-8" /><title></title>',"<style>","html {margin:0;padding:0;}","body {margin:0;padding:5px;}",'body, td {font:12px/1.5 "sans serif",tahoma,verdana,helvetica;}',"body, p, div {word-wrap: break-word;}","p {margin:5px 0;}","table {border-collapse:collapse;}","img {border:0;}","noscript {display:none;}","table.ke-zeroborder td {border:1px dotted #AAA;}",
+"img.ke-flash {","\tborder:1px solid #AAA;","\tbackground-image:url("+a+"common/flash.gif);","\tbackground-position:center center;","\tbackground-repeat:no-repeat;","\twidth:100px;","\theight:100px;","}","img.ke-rm {","\tborder:1px solid #AAA;","\tbackground-image:url("+a+"common/rm.gif);","\tbackground-position:center center;","\tbackground-repeat:no-repeat;","\twidth:100px;","\theight:100px;","}","img.ke-media {","\tborder:1px solid #AAA;","\tbackground-image:url("+a+"common/media.gif);","\tbackground-position:center center;",
+"\tbackground-repeat:no-repeat;","\twidth:100px;","\theight:100px;","}","img.ke-anchor {","\tborder:1px dashed #666;","\twidth:16px;","\theight:16px;","}",".ke-script, .ke-noscript, .ke-display-none {","\tdisplay:none;","\tfont-size:0;","\twidth:0;","\theight:0;","}",".ke-pagebreak {","\tborder:1px dotted #AAA;","\tfont-size:0;","\theight:2px;","}","</style>"];Z(c)||(c=[c]);m(c,function(a,b){b&&e.push('<link href="'+b+'" rel="stylesheet" />')});d&&e.push("<style>"+d+"</style>");e.push("</head><body "+
+(b?'class="'+b+'"':"")+"></body></html>");return e.join("\n")}function pa(a,b){if(a.hasVal()){if(b===i){var c=a.val();return c=c.replace(/(<(?:p|p\s[^>]*)>) *(<\/p>)/ig,"")}return a.val(b)}return a.html(b)}function qa(a){this.init(a)}function Ab(a){return new qa(a)}function Bb(a,b){var c=this.get(a);c&&!c.hasClass("ke-disabled")&&b(c)}function Da(a){this.init(a)}function Cb(a){return new Da(a)}function ra(a){this.init(a)}function $a(a){return new ra(a)}function sa(a){this.init(a)}function Db(a){return new sa(a)}
+function ab(a){this.init(a)}function ta(a){this.init(a)}function Eb(a){return new ta(a)}function bb(a,b){var c=document.getElementsByTagName("head")[0]||(P?document.body:document.documentElement),d=document.createElement("script");c.appendChild(d);d.src=a;d.charset="utf-8";d.onload=d.onreadystatechange=function(){if(!this.readyState||this.readyState==="loaded")b&&b(),d.onload=d.onreadystatechange=null,c.removeChild(d)}}function Fb(a){var b=a.indexOf("?");return b>0?a.substr(0,b):a}function cb(a){for(var b=
+document.getElementsByTagName("head")[0]||(P?document.body:document.documentElement),c=document.createElement("link"),d=Fb(ia(a,"absolute")),e=f('link[rel="stylesheet"]',b),g=0,h=e.length;g<h;g++)if(Fb(ia(e[g].href,"absolute"))===d)return;b.appendChild(c);c.href=a;c.rel="stylesheet"}function Gb(a,b){if(a===i)return N;if(!b)return N[a];N[a]=b}function Hb(a){var b,c="core";if(b=/^(\w+)\.(\w+)$/.exec(a))c=b[1],a=b[2];return{ns:c,key:a}}function Ib(a,b){b=b===i?f.options.langType:b;if(typeof a==="string"){if(!O[b])return"no language";
+var c=a.length-1;if(a.substr(c)===".")return O[b][a.substr(0,c)];c=Hb(a);return O[b][c.ns][c.key]}m(a,function(a,c){var g=Hb(a);O[b]||(O[b]={});O[b][g.ns]||(O[b][g.ns]={});O[b][g.ns][g.key]=c})}function Ea(a,b){if(!a.collapsed){var a=a.cloneRange().up(),c=a.startContainer,d=a.startOffset;if(X||a.isControl())if((c=f(c.childNodes[d]))&&c.name=="img"&&b(c))return c}}function ac(){var a=this;f(a.edit.doc).contextmenu(function(b){a.menu&&a.hideMenu();if(a.useContextmenu){if(a._contextmenus.length!==0){var c=
+0,d=[];for(m(a._contextmenus,function(){if(this.title=="-")d.push(this);else if(this.cond&&this.cond()&&(d.push(this),this.width&&this.width>c))c=this.width});d.length>0&&d[0].title=="-";)d.shift();for(;d.length>0&&d[d.length-1].title=="-";)d.pop();var e=null;m(d,function(a){this.title=="-"&&e.title=="-"&&delete d[a];e=this});if(d.length>0){b.preventDefault();var g=f(a.edit.iframe).pos(),h=$a({x:g.x+b.clientX,y:g.y+b.clientY,width:c,css:{visibility:"hidden"},shadowMode:a.shadowMode});m(d,function(){this.title&&
+h.addItem(this)});var g=G(h.doc),j=h.div.height();b.clientY+j>=g.clientHeight-100&&h.pos(h.x,t(h.y)-j);h.div.css("visibility","visible");a.menu=h}}}else b.preventDefault()})}function bc(){function a(a){for(a=f(a.commonAncestor());a;){if(a.type==1&&!a.isStyle())break;a=a.parent()}return a.name}var b=this,c=b.edit.doc,d=b.newlineTag;if(!(o&&d!=="br")&&(!Y||!(A<3&&d!=="p"))&&!(Pa&&A<9)){var e=u("h1,h2,h3,h4,h5,h6,pre,li"),g=u("p,h1,h2,h3,h4,h5,h6,pre,li,blockquote");f(c).keydown(function(f){if(!(f.which!=
+13||f.shiftKey||f.ctrlKey||f.altKey)){b.cmd.selection();var j=a(b.cmd.range);j=="marquee"||j=="select"||(d==="br"&&!e[j]?(f.preventDefault(),b.insertHtml("<br />"+(o&&A<9?"":"\u200b"))):g[j]||Q(c,"formatblock","<p>"))}});f(c).keyup(function(e){if(!(e.which!=13||e.shiftKey||e.ctrlKey||e.altKey)&&d!="br")if(Y){var e=b.cmd.commonAncestor("p"),j=b.cmd.commonAncestor("a");j&&j.text()==""&&(j.remove(!0),b.cmd.range.selectNodeContents(e[0]).collapse(!0),b.cmd.select())}else if(b.cmd.selection(),e=a(b.cmd.range),
+!(e=="marquee"||e=="select"))if(g[e]||Q(c,"formatblock","<p>"),e=b.cmd.commonAncestor("div")){for(var j=f("<p></p>"),k=e[0].firstChild;k;){var n=k.nextSibling;j.append(k);k=n}e.before(j);e.remove();b.cmd.range.selectNodeContents(j[0]);b.cmd.select()}})}}function cc(){var a=this,b=a.edit.doc;f(b).keydown(function(c){if(c.which==9)if(c.preventDefault(),a.afterTab)a.afterTab.call(a,c);else{var c=a.cmd,d=c.range;d.shrink();d.collapsed&&d.startContainer.nodeType==1&&(d.insertNode(f("@&nbsp;",b)[0]),c.select());
+a.insertHtml("&nbsp;&nbsp;&nbsp;&nbsp;")}})}function dc(){var a=this;f(a.edit.textarea[0],a.edit.win).focus(function(b){a.afterFocus&&a.afterFocus.call(a,b)}).blur(function(b){a.afterBlur&&a.afterBlur.call(a,b)})}function T(a){return B(a.replace(/<span [^>]*id="?__kindeditor_bookmark_\w+_\d+__"?[^>]*><\/span>/ig,""))}function Fa(a){return a.replace(/<div[^>]+class="?__kindeditor_paste__"?[^>]*>[\s\S]*?<\/div>/ig,"")}function Jb(a,b){if(a.length===0)a.push(b);else{var c=a[a.length-1];T(b.html)!==T(c.html)&&
+a.push(b)}}function Kb(a,b){var c=this.edit,d=c.doc.body,e,g;if(a.length===0)return this;c.designMode?(e=this.cmd.range,g=e.createBookmark(!0),g.html=d.innerHTML):g={html:d.innerHTML};Jb(b,g);var h=a.pop();T(g.html)===T(h.html)&&a.length>0&&(h=a.pop());c.designMode?(c.html(h.html),h.start&&(e.moveToBookmark(h),this.select())):f(d).html(T(h.html));return this}function ua(a){function b(a,b){ua.prototype[a]===i&&(c[a]=b);c.options[a]=b}var c=this;c.options={};m(a,function(c){b(c,a[c])});m(f.options,
+function(a,d){c[a]===i&&b(a,d)});var d=f(c.srcElement||"<textarea/>");if(!c.width)c.width=d[0].style.width||d.width();if(!c.height)c.height=d[0].style.height||d.height();b("width",l(c.width,c.minWidth));b("height",l(c.height,c.minHeight));b("width",s(c.width));b("height",s(c.height));if(ec&&(!fc||A<534))c.designMode=!1;c.srcElement=d;c.initContent="";c.plugin={};c.isCreated=!1;c._handlers={};c._contextmenus=[];c._undoStack=[];c._redoStack=[];c._firstAddBookmark=!0;c.menu=c.contextmenu=null;c.dialogs=
+[]}function Lb(a,b){function c(a){m(N,function(b,c){wa(c)&&c.call(a,KindEditor)});return a.create()}b=b||{};b.basePath=l(b.basePath,f.basePath);b.themesPath=l(b.themesPath,b.basePath+"themes/");b.langPath=l(b.langPath,b.basePath+"lang/");b.pluginsPath=l(b.pluginsPath,b.basePath+"plugins/");if(l(b.loadStyleMode,f.options.loadStyleMode)){var d=l(b.themeType,f.options.themeType);cb(b.themesPath+"default/default.css");cb(b.themesPath+d+"/"+d+".css")}if((d=f(a))&&d.length!==0){if(d.length>1)return d.each(function(){Lb(this,
+b)}),_instances[0];b.srcElement=d[0];var e=new ua(b);_instances.push(e);if(O[e.langType])return c(e);bb(e.langPath+e.langType+".js?ver="+encodeURIComponent(f.DEBUG?Ga:Ha),function(){c(e)});return e}}function va(a,b){f(a).each(function(a,d){f.each(_instances,function(a,c){if(c&&c.srcElement[0]==d)return b.call(c,a),!1})})}if(!w.KindEditor){if(!w.console)w.console={};if(!console.log)console.log=function(){};var Ha="4.1.10 (2013-11-23)",p=navigator.userAgent.toLowerCase(),o=p.indexOf("msie")>-1&&p.indexOf("opera")==
+-1,Yb=p.indexOf("msie")==-1&&p.indexOf("trident")>-1,Y=p.indexOf("gecko")>-1&&p.indexOf("khtml")==-1,X=p.indexOf("applewebkit")>-1,Pa=p.indexOf("opera")>-1,ec=p.indexOf("mobile")>-1,fc=/ipad|iphone|ipod/.test(p),P=document.compatMode!="CSS1Compat",H=!w.getSelection,A=(p=/(?:msie|firefox|webkit|opera)[\/:\s](\d+)/.exec(p))?p[1]:"0",Ga=(new Date).getTime(),R=Math.round,f={DEBUG:!1,VERSION:Ha,IE:o,GECKO:Y,WEBKIT:X,OPERA:Pa,V:A,TIME:Ga,each:m,isArray:Z,isFunction:wa,inArray:J,inString:xa,trim:B,addUnit:s,
+removeUnit:t,escape:C,unescape:fa,toCamel:ga,toHex:ya,toMap:u,toArray:Ja,undef:l,invalidUrl:function(a){return!a||/[<>"]/.test(a)},addParam:function(a,b){return a.indexOf("?")>=0?a+"&"+b:a+"?"+b},extend:E,json:eb},lb=u("a,abbr,acronym,b,basefont,bdo,big,br,button,cite,code,del,dfn,em,font,i,img,input,ins,kbd,label,map,q,s,samp,select,small,span,strike,strong,sub,sup,textarea,tt,u,var"),mb=u("address,applet,blockquote,body,center,dd,dir,div,dl,dt,fieldset,form,frameset,h1,h2,h3,h4,h5,h6,head,hr,html,iframe,ins,isindex,li,map,menu,meta,noframes,noscript,object,ol,p,pre,script,style,table,tbody,td,tfoot,th,thead,title,tr,ul"),
+kb=u("area,base,basefont,br,col,frame,hr,img,input,isindex,link,meta,param,embed"),Mb=u("b,basefont,big,del,em,font,i,s,small,span,strike,strong,sub,sup,u"),gc=u("img,table,input,textarea,button"),La=u("pre,style,script"),Ia=u("html,head,body,td,tr,table,ol,ul,li");u("colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr");var Ub=u("checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected"),Nb=u("input,button,textarea,select");f.basePath=function(){for(var a=
+document.getElementsByTagName("script"),b,c=0,d=a.length;c<d;c++)if(b=a[c].src||"",/kindeditor[\w\-\.]*\.js/.test(b))return b.substring(0,b.lastIndexOf("/")+1);return""}();f.options={designMode:!0,fullscreenMode:!1,filterMode:!0,wellFormatMode:!0,shadowMode:!0,loadStyleMode:!0,basePath:f.basePath,themesPath:f.basePath+"themes/",langPath:f.basePath+"lang/",pluginsPath:f.basePath+"plugins/",themeType:"default",langType:"zh_CN",urlType:"",newlineTag:"p",resizeType:2,syncType:"form",pasteType:2,dialogAlignType:"page",
+useContextmenu:!0,fullscreenShortcut:!1,bodyClass:"ke-content",indentChar:"\t",cssPath:"",cssData:"",minWidth:650,minHeight:100,minChangeSize:50,zIndex:811213,items:["source","|","undo","redo","|","preview","print","template","code","cut","copy","paste","plainpaste","wordpaste","|","justifyleft","justifycenter","justifyright","justifyfull","insertorderedlist","insertunorderedlist","indent","outdent","subscript","superscript","clearhtml","quickformat","selectall","|","fullscreen","/","formatblock",
+"fontname","fontsize","|","forecolor","hilitecolor","bold","italic","underline","strikethrough","lineheight","removeformat","|","image","multiimage","flash","media","insertfile","table","hr","emoticons","baidumap","pagebreak","anchor","link","unlink","|","about"],noDisableItems:["source","fullscreen"],colorTable:[["#E53333","#E56600","#FF9900","#64451D","#DFC5A4","#FFE500"],["#009900","#006600","#99BB00","#B8D100","#60D978","#00D5FF"],["#337FE5","#003399","#4C33E5","#9933E5","#CC33E5","#EE33EE"],
+["#FFFFFF","#CCCCCC","#999999","#666666","#333333","#000000"]],fontSizeTable:["9px","10px","12px","14px","16px","18px","24px","32px"],htmlTags:{font:["id","class","color","size","face",".background-color"],span:["id","class",".color",".background-color",".font-size",".font-family",".background",".font-weight",".font-style",".text-decoration",".vertical-align",".line-height"],div:["id","class","align",".border",".margin",".padding",".text-align",".color",".background-color",".font-size",".font-family",
+".font-weight",".background",".font-style",".text-decoration",".vertical-align",".margin-left"],table:["id","class","border","cellspacing","cellpadding","width","height","align","bordercolor",".padding",".margin",".border","bgcolor",".text-align",".color",".background-color",".font-size",".font-family",".font-weight",".font-style",".text-decoration",".background",".width",".height",".border-collapse"],"td,th":["id","class","align","valign","width","height","colspan","rowspan","bgcolor",".text-align",
+".color",".background-color",".font-size",".font-family",".font-weight",".font-style",".text-decoration",".vertical-align",".background",".border"],a:["id","class","href","target","name"],embed:["id","class","src","width","height","type","loop","autostart","quality",".width",".height","align","allowscriptaccess"],img:["id","class","src","width","height","border","alt","title","align",".width",".height",".border"],"p,ol,ul,li,blockquote,h1,h2,h3,h4,h5,h6":["id","class","align",".text-align",".color",
+".background-color",".font-size",".font-family",".background",".font-weight",".font-style",".text-decoration",".vertical-align",".text-indent",".margin-left"],pre:["id","class"],hr:["id","class",".page-break-after"],"br,tbody,tr,strong,b,sub,sup,em,i,u,strike,s,del":["id","class"],iframe:["id","class","src","frameborder","width","height",".width",".height"]},layout:'<div class="container"><div class="toolbar"></div><div class="edit"></div><div class="statusbar"></div></div>'};var fb=!1,Ob=u("8,9,13,32,46,48..57,59,61,65..90,106,109..111,188,190..192,219..222"),
+p=u("33..40"),db={};m(Ob,function(a,b){db[a]=b});m(p,function(a,b){db[a]=b});var hc="altKey,attrChange,attrName,bubbles,button,cancelable,charCode,clientX,clientY,ctrlKey,currentTarget,data,detail,eventPhase,fromElement,handler,keyCode,metaKey,newValue,offsetX,offsetY,originalTarget,pageX,pageY,prevValue,relatedNode,relatedTarget,screenX,screenY,shiftKey,srcElement,target,toElement,view,wheelDelta,which".split(",");E(gb,{init:function(a,b){var c=this,d=a.ownerDocument||a.document||a;c.event=b;m(hc,
+function(a,d){c[d]=b[d]});if(!c.target)c.target=c.srcElement||d;if(c.target.nodeType===3)c.target=c.target.parentNode;if(!c.relatedTarget&&c.fromElement)c.relatedTarget=c.fromElement===c.target?c.toElement:c.fromElement;if(c.pageX==null&&c.clientX!=null){var e=d.documentElement,d=d.body;c.pageX=c.clientX+(e&&e.scrollLeft||d&&d.scrollLeft||0)-(e&&e.clientLeft||d&&d.clientLeft||0);c.pageY=c.clientY+(e&&e.scrollTop||d&&d.scrollTop||0)-(e&&e.clientTop||d&&d.clientTop||0)}if(!c.which&&(c.charCode||c.charCode===
+0?c.charCode:c.keyCode))c.which=c.charCode||c.keyCode;if(!c.metaKey&&c.ctrlKey)c.metaKey=c.ctrlKey;if(!c.which&&c.button!==i)c.which=c.button&1?1:c.button&2?3:c.button&4?2:0;switch(c.which){case 186:c.which=59;break;case 187:case 107:case 43:c.which=61;break;case 189:case 45:c.which=109;break;case 42:c.which=106;break;case 47:c.which=111;break;case 78:c.which=110}c.which>=96&&c.which<=105&&(c.which-=48)},preventDefault:function(){var a=this.event;a.preventDefault?a.preventDefault():a.returnValue=
+!1},stopPropagation:function(){var a=this.event;a.stopPropagation?a.stopPropagation():a.cancelBubble=!0},stop:function(){this.preventDefault();this.stopPropagation()}});var $="kindeditor_"+Ga,ib=0,v={},Pb=!1;o&&w.attachEvent("onunload",function(){m(v,function(a,b){b.el&&ha(b.el)})});f.ctrl=Ka;f.ready=function(a){function b(){e||(e=!0,a(KindEditor),Pb=!0)}function c(){if(!e){try{document.documentElement.doScroll("left")}catch(a){setTimeout(c,100);return}b()}}function d(){document.readyState==="complete"&&
+b()}if(Pb)a(KindEditor);else{var e=!1;if(document.addEventListener)aa(document,"DOMContentLoaded",b);else if(document.attachEvent){aa(document,"readystatechange",d);var g=!1;try{g=w.frameElement==null}catch(f){}document.documentElement.doScroll&&g&&c()}aa(w,"load",b)}};f.formatUrl=ia;f.formatHtml=U;f.getCssList=ba;f.getAttrList=I;f.mediaType=ob;f.mediaAttrs=pb;f.mediaEmbed=Ma;f.mediaImg=qb;f.clearMsWord=nb;f.tmpl=function(a,b){var c=new Function("obj","var p=[],print=function(){p.push.apply(p,arguments);};with(obj){p.push('"+
+a.replace(/[\r\t\n]/g," ").split("<%").join("\t").replace(/((^|%>)[^\t]*)'/g,"$1\r").replace(/\t=(.*?)%>/g,"',$1,'").split("\t").join("');").split("%>").join("p.push('").split("\r").join("\\'")+"');}return p.join('');");return b?c(b):c};p=document.createElement("div");p.setAttribute("className","t");var Vb=p.className!=="t";f.query=function(a,b){var c=Ca(a,b);return c.length>0?c[0]:null};f.queryAll=Ca;E(D,{init:function(a){for(var a=Z(a)?a:[a],b=0,c=0,d=a.length;c<d;c++)a[c]&&(this[c]=a[c].constructor===
+D?a[c][0]:a[c],b++);this.length=b;this.doc=V(this[0]);this.name=Oa(this[0]);this.type=this.length>0?this[0].nodeType:null;this.win=W(this[0])},each:function(a){for(var b=0;b<this.length;b++)if(a.call(this[b],b,this[b])===!1)break;return this},bind:function(a,b){this.each(function(){aa(this,a,b)});return this},unbind:function(a,b){this.each(function(){ha(this,a,b)});return this},fire:function(a){if(this.length<1)return this;jb(this[0],a);return this},hasAttr:function(a){if(this.length<1)return!1;return!!Ba(this[0],
+a)},attr:function(a,b){var c=this;if(a===i)return I(c.outer());if(typeof a==="object")return m(a,function(a,b){c.attr(a,b)}),c;if(b===i)return b=c.length<1?null:Ba(c[0],a),b===null?"":b;c.each(function(){Na(this,a,b)});return c},removeAttr:function(a){this.each(function(){var b=a;o&&A<8&&b.toLowerCase()=="class"&&(b="className");Na(this,b,"");this.removeAttribute(b)});return this},get:function(a){if(this.length<1)return null;return this[a||0]},eq:function(a){if(this.length<1)return null;return this[a]?
+new D(this[a]):null},hasClass:function(a){if(this.length<1)return!1;return xa(a,this[0].className," ")},addClass:function(a){this.each(function(){if(!xa(a,this.className," "))this.className=B(this.className+" "+a)});return this},removeClass:function(a){this.each(function(){if(xa(a,this.className," "))this.className=B(this.className.replace(RegExp("(^|\\s)"+a+"(\\s|$)")," "))});return this},html:function(a){if(a===i){if(this.length<1||this.type!=1)return"";return U(this[0].innerHTML)}this.each(function(){Wb(this,
+a)});return this},text:function(){if(this.length<1)return"";return o?this[0].innerText:this[0].textContent},hasVal:function(){if(this.length<1)return!1;return!!Nb[Oa(this[0])]},val:function(a){if(a===i){if(this.length<1)return"";return this.hasVal()?this[0].value:this.attr("value")}else return this.each(function(){Nb[Oa(this)]?this.value=a:Na(this,"value",a)}),this},css:function(a,b){var c=this;if(a===i)return ba(c.attr("style"));if(typeof a==="object")return m(a,function(a,b){c.css(a,b)}),c;if(b===
+i){if(c.length<1)return"";return c[0].style[ga(a)]||Xb(c[0],a)||""}c.each(function(){this.style[ga(a)]=b});return c},width:function(a){if(a===i){if(this.length<1)return 0;return this[0].offsetWidth}return this.css("width",s(a))},height:function(a){if(a===i){if(this.length<1)return 0;return this[0].offsetHeight}return this.css("height",s(a))},opacity:function(a){this.each(function(){this.style.opacity===i?this.style.filter=a==1?"":"alpha(opacity="+a*100+")":this.style.opacity=a==1?"":a});return this},
+data:function(a,b){a="kindeditor_data_"+a;if(b===i){if(this.length<1)return null;return this[0][a]}this.each(function(){this[a]=b});return this},pos:function(){var a=this[0],b=0,c=0;if(a)if(a.getBoundingClientRect)a=a.getBoundingClientRect(),c=ca(this.doc),b=a.left+c.x,c=a.top+c.y;else for(;a;)b+=a.offsetLeft,c+=a.offsetTop,a=a.offsetParent;return{x:R(b),y:R(c)}},clone:function(a){if(this.length<1)return new D([]);return new D(this[0].cloneNode(a))},append:function(a){this.each(function(){this.appendChild&&
+this.appendChild(f(a)[0])});return this},appendTo:function(a){this.each(function(){f(a)[0].appendChild(this)});return this},before:function(a){this.each(function(){this.parentNode.insertBefore(f(a)[0],this)});return this},after:function(a){this.each(function(){this.nextSibling?this.parentNode.insertBefore(f(a)[0],this.nextSibling):this.parentNode.appendChild(f(a)[0])});return this},replaceWith:function(a){var b=[];this.each(function(c,d){ha(d);var e=f(a)[0];d.parentNode.replaceChild(e,d);b.push(e)});
+return f(b)},empty:function(){this.each(function(a,b){for(var c=b.firstChild;c;){if(!b.parentNode)break;var d=c.nextSibling;c.parentNode.removeChild(c);c=d}});return this},remove:function(a){var b=this;b.each(function(c,d){if(d.parentNode){ha(d);if(a)for(var e=d.firstChild;e;){var g=e.nextSibling;d.parentNode.insertBefore(e,d);e=g}d.parentNode.removeChild(d);delete b[c]}});b.length=0;return b},show:function(a){a===i&&(a=this._originDisplay||"");if(this.css("display")!="none")return this;return this.css("display",
+a)},hide:function(){if(this.length<1)return this;this._originDisplay=this[0].style.display;return this.css("display","none")},outer:function(){if(this.length<1)return"";var a=this.doc.createElement("div");a.appendChild(this[0].cloneNode(!0));return U(a.innerHTML)},isSingle:function(){return!!kb[this.name]},isInline:function(){return!!lb[this.name]},isBlock:function(){return!!mb[this.name]},isStyle:function(){return!!Mb[this.name]},isControl:function(){return!!gc[this.name]},contains:function(a){if(this.length<
+1)return!1;return Aa(this[0],f(a)[0])},parent:function(){if(this.length<1)return null;var a=this[0].parentNode;return a?new D(a):null},children:function(){if(this.length<1)return new D([]);for(var a=[],b=this[0].firstChild;b;)(b.nodeType!=3||B(b.nodeValue)!=="")&&a.push(b),b=b.nextSibling;return new D(a)},first:function(){var a=this.children();return a.length>0?a.eq(0):null},last:function(){var a=this.children();return a.length>0?a.eq(a.length-1):null},index:function(){if(this.length<1)return-1;for(var a=
+-1,b=this[0];b;)a++,b=b.previousSibling;return a},prev:function(){if(this.length<1)return null;var a=this[0].previousSibling;return a?new D(a):null},next:function(){if(this.length<1)return null;var a=this[0].nextSibling;return a?new D(a):null},scan:function(a,b){function c(d){for(d=b?d.firstChild:d.lastChild;d;){var e=b?d.nextSibling:d.previousSibling;if(a(d)===!1)return!1;if(c(d)===!1)return!1;d=e}}if(!(this.length<1))return b=b===i?!0:b,c(this[0]),this}});m("blur,focus,focusin,focusout,load,resize,scroll,unload,click,dblclick,mousedown,mouseup,mousemove,mouseover,mouseout,mouseenter,mouseleave,change,select,submit,keydown,keypress,keyup,error,contextmenu".split(","),
+function(a,b){D.prototype[b]=function(a){return a?this.bind(b,a):this.fire(b)}});p=f;f=function(a,b){function c(a){a[0]||(a=[]);return new D(a)}if(!(a===i||a===null)){if(typeof a==="string"){b&&(b=f(b)[0]);var d=a.length;a.charAt(0)==="@"&&(a=a.substr(1));if(a.length!==d||/<.+>/.test(a)){var d=(b?b.ownerDocument||b:document).createElement("div"),e=[];d.innerHTML='<img id="__kindeditor_temp_tag__" width="0" height="0" style="display:none;" />'+a;for(var g=0,h=d.childNodes.length;g<h;g++){var j=d.childNodes[g];
+j.id!="__kindeditor_temp_tag__"&&e.push(j)}return c(e)}return c(Ca(a,b))}if(a&&a.constructor===D)return a;a.toArray&&(a=a.toArray());if(Z(a))return c(a);return c(Ja(arguments))}};m(p,function(a,b){f[a]=b});f.NodeClass=D;w.KindEditor=f;var la=0,ka=1,da=2,ma=3,Qb=0;E(M,{init:function(a){this.startContainer=a;this.startOffset=0;this.endContainer=a;this.endOffset=0;this.collapsed=!0;this.doc=a},commonAncestor:function(){function a(a){for(var b=[];a;)b.push(a),a=a.parentNode;return b}for(var b=a(this.startContainer),
+c=a(this.endContainer),d=0,e=b.length,g=c.length,f,j;++d;)if(f=b[e-d],j=c[g-d],!f||!j||f!==j)break;return b[e-d+1]},setStart:function(a,b){var c=this.doc;this.startContainer=a;this.startOffset=b;if(this.endContainer===c)this.endContainer=a,this.endOffset=b;return rb(this)},setEnd:function(a,b){var c=this.doc;this.endContainer=a;this.endOffset=b;if(this.startContainer===c)this.startContainer=a,this.startOffset=b;return rb(this)},setStartBefore:function(a){return this.setStart(a.parentNode||this.doc,
+f(a).index())},setStartAfter:function(a){return this.setStart(a.parentNode||this.doc,f(a).index()+1)},setEndBefore:function(a){return this.setEnd(a.parentNode||this.doc,f(a).index())},setEndAfter:function(a){return this.setEnd(a.parentNode||this.doc,f(a).index()+1)},selectNode:function(a){return this.setStartBefore(a).setEndAfter(a)},selectNodeContents:function(a){var b=f(a);if(b.type==3||b.isSingle())return this.selectNode(a);b=b.children();if(b.length>0)return this.setStartBefore(b[0]).setEndAfter(b[b.length-
+1]);return this.setStart(a,0).setEnd(a,0)},collapse:function(a){if(a)return this.setEnd(this.startContainer,this.startOffset);return this.setStart(this.endContainer,this.endOffset)},compareBoundaryPoints:function(a,b){var c=this.get(),d=b.get();if(H){var e={};e[la]="StartToStart";e[ka]="EndToStart";e[da]="EndToEnd";e[ma]="StartToEnd";c=c.compareEndPoints(e[a],d);if(c!==0)return c;var g,h,j,k;if(a===la||a===ma)g=this.startContainer,j=this.startOffset;if(a===ka||a===da)g=this.endContainer,j=this.endOffset;
+if(a===la||a===ka)h=b.startContainer,k=b.startOffset;if(a===da||a===ma)h=b.endContainer,k=b.endOffset;if(g===h)return g=j-k,g>0?1:g<0?-1:0;for(c=h;c&&c.parentNode!==g;)c=c.parentNode;if(c)return f(c).index()>=j?-1:1;for(c=g;c&&c.parentNode!==h;)c=c.parentNode;if(c)return f(c).index()>=k?1:-1;if((c=f(h).next())&&c.contains(g))return 1;if((c=f(g).next())&&c.contains(h))return-1}else return c.compareBoundaryPoints(a,d)},cloneRange:function(){return(new M(this.doc)).setStart(this.startContainer,this.startOffset).setEnd(this.endContainer,
+this.endOffset)},toString:function(){var a=this.get();return(H?a.text:a.toString()).replace(/\r\n|\n|\r/g,"")},cloneContents:function(){return Qa(this,!0,!1)},deleteContents:function(){return Qa(this,!1,!0)},extractContents:function(){return Qa(this,!0,!0)},insertNode:function(a){var b=this.startContainer,c=this.startOffset,d=this.endContainer,e=this.endOffset,g,f,j,k=1;if(a.nodeName.toLowerCase()==="#document-fragment")g=a.firstChild,f=a.lastChild,k=a.childNodes.length;b.nodeType==1?(j=b.childNodes[c])?
+(b.insertBefore(a,j),b===d&&(e+=k)):b.appendChild(a):b.nodeType==3&&(c===0?(b.parentNode.insertBefore(a,b),b.parentNode===d&&(e+=k)):c>=b.nodeValue.length?b.nextSibling?b.parentNode.insertBefore(a,b.nextSibling):b.parentNode.appendChild(a):(j=c>0?b.splitText(c):b,b.parentNode.insertBefore(a,j),b===d&&(d=j,e-=c)));g?this.setStartBefore(g).setEndAfter(f):this.selectNode(a);if(this.compareBoundaryPoints(da,this.cloneRange().setEnd(d,e))>=1)return this;return this.setEnd(d,e)},surroundContents:function(a){a.appendChild(this.extractContents());
+return this.insertNode(a).selectNode(a)},isControl:function(){var a=this.startContainer,b=this.startOffset,c=this.endContainer,d=this.endOffset;return a.nodeType==1&&a===c&&b+1===d&&f(a.childNodes[b]).isControl()},get:function(a){var b=this.doc;if(!H){b=b.createRange();try{b.setStart(this.startContainer,this.startOffset),b.setEnd(this.endContainer,this.endOffset)}catch(c){}return b}if(a&&this.isControl())return b=b.body.createControlRange(),b.addElement(this.startContainer.childNodes[this.startOffset]),
+b;a=this.cloneRange().down();b=b.body.createTextRange();b.setEndPoint("StartToStart",tb(a.startContainer,a.startOffset));b.setEndPoint("EndToStart",tb(a.endContainer,a.endOffset));return b},html:function(){return f(this.cloneContents()).outer()},down:function(){function a(a,d,e){if(a.nodeType==1&&(a=f(a).children(),a.length!==0)){var g,h,j,k;d>0&&(g=a.eq(d-1));d<a.length&&(h=a.eq(d));if(g&&g.type==3)j=g[0],k=j.nodeValue.length;h&&h.type==3&&(j=h[0],k=0);j&&(e?b.setStart(j,k):b.setEnd(j,k))}}var b=
+this;a(b.startContainer,b.startOffset,!0);a(b.endContainer,b.endOffset,!1);return b},up:function(){function a(a,d,e){a.nodeType==3&&(d===0?e?b.setStartBefore(a):b.setEndBefore(a):d==a.nodeValue.length&&(e?b.setStartAfter(a):b.setEndAfter(a)))}var b=this;a(b.startContainer,b.startOffset,!0);a(b.endContainer,b.endOffset,!1);return b},enlarge:function(a){function b(b,e,g){b=f(b);if(!(b.type==3||Ia[b.name]||!a&&b.isBlock()))if(e===0){for(;!b.prev();){e=b.parent();if(!e||Ia[e.name]||!a&&e.isBlock())break;
+b=e}g?c.setStartBefore(b[0]):c.setEndBefore(b[0])}else if(e==b.children().length){for(;!b.next();){e=b.parent();if(!e||Ia[e.name]||!a&&e.isBlock())break;b=e}g?c.setStartAfter(b[0]):c.setEndAfter(b[0])}}var c=this;c.up();b(c.startContainer,c.startOffset,!0);b(c.endContainer,c.endOffset,!1);return c},shrink:function(){for(var a,b=this.collapsed;this.startContainer.nodeType==1&&(a=this.startContainer.childNodes[this.startOffset])&&a.nodeType==1&&!f(a).isSingle();)this.setStart(a,0);if(b)return this.collapse(b);
+for(;this.endContainer.nodeType==1&&this.endOffset>0&&(a=this.endContainer.childNodes[this.endOffset-1])&&a.nodeType==1&&!f(a).isSingle();)this.setEnd(a,a.childNodes.length);return this},createBookmark:function(a){var b,c=f('<span style="display:none;"></span>',this.doc)[0];c.id="__kindeditor_bookmark_start_"+Qb++ +"__";if(!this.collapsed)b=c.cloneNode(!0),b.id="__kindeditor_bookmark_end_"+Qb++ +"__";b&&this.cloneRange().collapse(!1).insertNode(b).setEndBefore(b);this.insertNode(c).setStartAfter(c);
+return{start:a?"#"+c.id:c,end:b?a?"#"+b.id:b:null}},moveToBookmark:function(a){var b=this.doc,c=f(a.start,b),a=a.end?f(a.end,b):null;if(!c||c.length<1)return this;this.setStartBefore(c[0]);c.remove();a&&a.length>0?(this.setEndBefore(a[0]),a.remove()):this.collapse(!0);return this},dump:function(){console.log("--------------------");console.log(this.startContainer.nodeType==3?this.startContainer.nodeValue:this.startContainer,this.startOffset);console.log(this.endContainer.nodeType==3?this.endContainer.nodeValue:
+this.endContainer,this.endOffset)}});f.RangeClass=M;f.range=Ra;f.START_TO_START=la;f.START_TO_END=ka;f.END_TO_END=da;f.END_TO_START=ma;E(oa,{init:function(a){var b=a.doc;this.doc=b;this.win=W(b);this.sel=Sa(b);this.range=a},selection:function(a){var b=this.doc,c;c=Sa(b);var d;try{d=c.rangeCount>0?c.getRangeAt(0):c.createRange()}catch(e){}c=H&&(!d||!d.item&&d.parentElement().ownerDocument!==b)?null:d;this.sel=Sa(b);if(c)return this.range=Ra(c),f(this.range.startContainer).name=="html"&&this.range.selectNodeContents(b.body).collapse(!1),
+this;a&&this.range.selectNodeContents(b.body).collapse(!1);return this},select:function(a){var a=l(a,!0),b=this.sel,c=this.range.cloneRange().shrink(),d=c.startContainer,e=c.startOffset,g=V(d),h=this.win,j,k=!1;if(a&&d.nodeType==1&&c.collapsed){if(H){b=f("<span>&nbsp;</span>",g);c.insertNode(b[0]);j=g.body.createTextRange();try{j.moveToElementText(b[0])}catch(n){}j.collapse(!1);j.select();b.remove();h.focus();return this}if(X&&(a=d.childNodes,f(d).isInline()||e>0&&f(a[e-1]).isInline()||a[e]&&f(a[e]).isInline()))c.insertNode(g.createTextNode("\u200b")),
+k=!0}if(H)try{j=c.get(!0),j.select()}catch(i){}else k&&c.collapse(!1),j=c.get(!0),b.removeAllRanges(),b.addRange(j),g!==document&&(c=f(j.endContainer).pos(),h.scrollTo(c.x,c.y));h.focus();return this},wrap:function(a){var b=this.range,c;c=f(a,this.doc);if(b.collapsed)return b.shrink(),b.insertNode(c[0]).selectNodeContents(c[0]),this;if(c.isBlock()){for(var d=a=c.clone(!0);d.first();)d=d.first();d.append(b.extractContents());b.insertNode(a[0]).selectNode(a[0]);return this}b.enlarge();var e=b.createBookmark(),
+a=b.commonAncestor(),g=!1;f(a).scan(function(a){if(!g&&a==e.start)g=!0;else if(g){if(a==e.end)return!1;var b=f(a),d;a:{for(d=b;d&&d.name!="body";){if(La[d.name]||d.name=="div"&&d.hasClass("ke-script")){d=!0;break a}d=d.parent()}d=!1}if(!d&&b.type==3&&B(a.nodeValue).length>0){for(var n;(n=b.parent())&&n.isStyle()&&n.children().length==1;)b=n;n=c;n=n.clone(!0);if(b.type==3)Va(n).append(b.clone(!1)),b.replaceWith(n);else{for(var a=b,i;(i=b.first())&&i.children().length==1;)b=i;i=b.first();for(b=b.doc.createDocumentFragment();i;)b.appendChild(i[0]),
+i=i.next();i=a.clone(!0);d=Va(i);for(var r=i,l=!1;n;){for(;r;)r.name===n.name&&(Zb(r,n.attr(),n.css()),l=!0),r=r.first();l||d.append(n.clone(!1));l=!1;n=n.first()}n=i;b.firstChild&&Va(n).append(b);a.replaceWith(n)}}}});b.moveToBookmark(e);return this},split:function(a,b){for(var c=this.range,d=c.doc,e=c.cloneRange().collapse(a),g=e.startContainer,h=e.startOffset,j=g.nodeType==3?g.parentNode:g,k=!1,n;j&&j.parentNode;){n=f(j);if(b){if(!n.isStyle())break;if(!Ta(n,b))break}else if(Ia[n.name])break;k=
+!0;j=j.parentNode}if(k)d=d.createElement("span"),c.cloneRange().collapse(!a).insertNode(d),a?e.setStartBefore(j.firstChild).setEnd(g,h):e.setStart(g,h).setEndAfter(j.lastChild),g=e.extractContents(),h=g.firstChild,k=g.lastChild,a?(e.insertNode(g),c.setStartAfter(k).setEndBefore(d)):(j.appendChild(g),c.setStartBefore(d).setEndBefore(h)),e=d.parentNode,e==c.endContainer&&(j=f(d).prev(),g=f(d).next(),j&&g&&j.type==3&&g.type==3?c.setEnd(j[0],j[0].nodeValue.length):a||c.setEnd(c.endContainer,c.endOffset-
+1)),e.removeChild(d);return this},remove:function(a){var b=this.doc,c=this.range;c.enlarge();if(c.startOffset===0){for(var d=f(c.startContainer),e;(e=d.parent())&&e.isStyle()&&e.children().length==1;)d=e;c.setStart(d[0],0);d=f(c.startContainer);d.isBlock()&&Ua(d,a);(d=d.parent())&&d.isBlock()&&Ua(d,a)}if(c.collapsed){this.split(!0,a);b=c.startContainer;d=c.startOffset;if(d>0&&(e=f(b.childNodes[d-1]))&&ea(e))e.remove(),c.setStart(b,d-1);(d=f(b.childNodes[d]))&&ea(d)&&d.remove();ea(b)&&(c.startBefore(b),
+b.remove());c.collapse(!0);return this}this.split(!0,a);this.split(!1,a);var g=b.createElement("span"),h=b.createElement("span");c.cloneRange().collapse(!1).insertNode(h);c.cloneRange().collapse(!0).insertNode(g);var j=[],k=!1;f(c.commonAncestor()).scan(function(a){if(!k&&a==g)k=!0;else{if(a==h)return!1;k&&j.push(a)}});f(g).remove();f(h).remove();b=c.startContainer;d=c.startOffset;e=c.endContainer;var n=c.endOffset;if(d>0){var i=f(b.childNodes[d-1]);i&&ea(i)&&(i.remove(),c.setStart(b,d-1),b==e&&c.setEnd(e,
+n-1));if((d=f(b.childNodes[d]))&&ea(d))d.remove(),b==e&&c.setEnd(e,n-1)}(b=f(e.childNodes[c.endOffset]))&&ea(b)&&b.remove();b=c.createBookmark(!0);m(j,function(b,c){Ua(f(c),a)});c.moveToBookmark(b);return this},commonNode:function(a){function b(b){for(var c=b;b;){if(Ta(f(b),a))return f(b);b=b.parentNode}for(;c&&(c=c.lastChild);)if(Ta(f(c),a))return f(c);return null}var c=this.range,d=c.endContainer,c=c.endOffset,e=d.nodeType==3||c===0?d:d.childNodes[c-1],g=b(e);if(g)return g;if(e.nodeType==1||d.nodeType==
+3&&c===0)if(d=f(e).prev())return b(d);return null},commonAncestor:function(a){function b(b){for(;b;){if(b.nodeType==1&&b.tagName.toLowerCase()===a)return b;b=b.parentNode}return null}var c=this.range,d=c.startContainer,e=c.startOffset,g=c.endContainer,c=c.endOffset,g=g.nodeType==3||c===0?g:g.childNodes[c-1],d=b(d.nodeType==3||e===0?d:d.childNodes[e-1]),e=b(g);if(d&&e&&d===e)return f(d);return null},state:function(a){var b=this.doc,c=!1;try{c=b.queryCommandState(a)}catch(d){}return c},val:function(a){var b=
+this.doc,a=a.toLowerCase(),c="";if(a==="fontfamily"||a==="fontname")return c=vb(b,"fontname"),c=c.replace(/['"]/g,""),c.toLowerCase();if(a==="formatblock"){c=vb(b,a);if(c===""&&(a=this.commonNode({"h1,h2,h3,h4,h5,h6,p,div,pre,address":"*"})))c=a.name;c==="Normal"&&(c="p");return c.toLowerCase()}if(a==="fontsize")return(a=this.commonNode({"*":".font-size"}))&&(c=a.css("font-size")),c.toLowerCase();if(a==="forecolor")return(a=this.commonNode({"*":".color"}))&&(c=a.css("color")),c=ya(c),c===""&&(c="default"),
+c.toLowerCase();if(a==="hilitecolor")return(a=this.commonNode({"*":".background-color"}))&&(c=a.css("background-color")),c=ya(c),c===""&&(c="default"),c.toLowerCase();return c},toggle:function(a,b){this.commonNode(b)?this.remove(b):this.wrap(a);return this.select()},bold:function(){return this.toggle("<strong></strong>",{span:".font-weight=bold",strong:"*",b:"*"})},italic:function(){return this.toggle("<em></em>",{span:".font-style=italic",em:"*",i:"*"})},underline:function(){return this.toggle("<u></u>",
+{span:".text-decoration=underline",u:"*"})},strikethrough:function(){return this.toggle("<s></s>",{span:".text-decoration=line-through",s:"*"})},forecolor:function(a){return this.wrap('<span style="color:'+a+';"></span>').select()},hilitecolor:function(a){return this.wrap('<span style="background-color:'+a+';"></span>').select()},fontsize:function(a){return this.wrap('<span style="font-size:'+a+';"></span>').select()},fontname:function(a){return this.fontfamily(a)},fontfamily:function(a){return this.wrap('<span style="font-family:'+
+a+';"></span>').select()},removeformat:function(){var a={"*":".font-weight,.font-style,.text-decoration,.color,.background-color,.font-size,.font-family,.text-indent"};m(Mb,function(b){a[b]="*"});this.remove(a);return this.select()},inserthtml:function(a,b){function c(a,b){var b='<img id="__kindeditor_temp_tag__" width="0" height="0" style="display:none;" />'+b,c=a.get();c.item?c.item(0).outerHTML=b:c.pasteHTML(b);var d=a.doc.getElementById("__kindeditor_temp_tag__");d.parentNode.removeChild(d);c=
+ub(c);a.setEnd(c.endContainer,c.endOffset);a.collapse(!1);e.select(!1)}function d(a,b){var c=a.doc,d=c.createDocumentFragment();f("@"+b,c).each(function(){d.appendChild(this)});a.deleteContents();a.insertNode(d);a.collapse(!1);e.select(!1)}var e=this,g=e.range;if(a==="")return e;if(H&&b){try{c(g,a)}catch(h){d(g,a)}return e}d(g,a);return e},hr:function(){return this.inserthtml("<hr />")},print:function(){this.win.print();return this},insertimage:function(a,b,c,d,e,g){b=l(b,"");l(e,0);a='<img src="'+
+C(a)+'" data-ke-src="'+C(a)+'" ';c&&(a+='width="'+C(c)+'" ');d&&(a+='height="'+C(d)+'" ');b&&(a+='title="'+C(b)+'" ');g&&(a+='align="'+C(g)+'" ');a+='alt="'+C(b)+'" ';a+="/>";return this.inserthtml(a)},createlink:function(a,b){function c(a,b,c){f(a).attr("href",b).attr("data-ke-src",b);c?f(a).attr("target",c):f(a).removeAttr("target")}var d=this.doc,e=this.range;this.select();var g=this.commonNode({a:"*"});g&&!e.isControl()&&(e.selectNode(g.get()),this.select());g='<a href="'+C(a)+'" data-ke-src="'+
+C(a)+'" ';b&&(g+=' target="'+C(b)+'"');if(e.collapsed)return g+=">"+C(a)+"</a>",this.inserthtml(g);if(e.isControl()){var h=f(e.startContainer.childNodes[e.startOffset]);g+="></a>";h.after(f(g,d));h.next().append(h);e.selectNode(h[0]);return this.select()}var g=e.startContainer,h=e.startOffset,j=e.endContainer,e=e.endOffset;if(g.nodeType==1&&g===j&&h+1===e&&(e=g.childNodes[h],e.nodeName.toLowerCase()=="a"))return c(e,a,b),this;Q(d,"createlink","__kindeditor_temp_url__");f('a[href="__kindeditor_temp_url__"]',
+d).each(function(){c(this,a,b)});return this},unlink:function(){var a=this.doc,b=this.range;this.select();if(b.collapsed){var c=this.commonNode({a:"*"});c&&(b.selectNode(c.get()),this.select());Q(a,"unlink",null);X&&f(b.startContainer).name==="img"&&(a=f(b.startContainer).parent(),a.name==="a"&&a.remove(!0))}else Q(a,"unlink",null);return this}});m("formatblock,selectall,justifyleft,justifycenter,justifyright,justifyfull,insertorderedlist,insertunorderedlist,indent,outdent,subscript,superscript".split(","),
+function(a,b){oa.prototype[b]=function(a){this.select();Q(this.doc,b,a);H&&J(b,"justifyleft,justifycenter,justifyright,justifyfull".split(","))>=0&&this.selection();(!H||J(b,"formatblock,selectall,insertorderedlist,insertunorderedlist".split(","))>=0)&&this.selection();return this}});m("cut,copy,paste".split(","),function(a,b){oa.prototype[b]=function(){if(!this.doc.queryCommandSupported(b))throw"not supported";this.select();Q(this.doc,b,null);return this}});f.CmdClass=oa;f.cmd=zb;E(S,{init:function(a){var b=
+this;b.name=a.name||"";b.doc=a.doc||document;b.win=W(b.doc);b.x=s(a.x);b.y=s(a.y);b.z=a.z;b.width=s(a.width);b.height=s(a.height);b.div=f('<div style="display:block;"></div>');b.options=a;b._alignEl=a.alignEl;b.width&&b.div.css("width",b.width);b.height&&b.div.css("height",b.height);b.z&&b.div.css({position:"absolute",left:b.x,top:b.y,"z-index":b.z});b.z&&(b.x===i||b.y===i)&&b.autoPos(b.width,b.height);a.cls&&b.div.addClass(a.cls);a.shadowMode&&b.div.addClass("ke-shadow");a.css&&b.div.css(a.css);
+a.src?f(a.src).replaceWith(b.div):f(b.doc.body).append(b.div);a.html&&b.div.html(a.html);if(a.autoScroll)if(o&&A<7||P){var c=ca();f(b.win).bind("scroll",function(){var a=ca(),e=a.x-c.x,a=a.y-c.y;b.pos(t(b.x)+e,t(b.y)+a,!1)})}else b.div.css("position","fixed")},pos:function(a,b,c){c=l(c,!0);if(a!==null&&(a=a<0?0:s(a),this.div.css("left",a),c))this.x=a;if(b!==null&&(b=b<0?0:s(b),this.div.css("top",b),c))this.y=b;return this},autoPos:function(a,b){var c=t(a)||0,d=t(b)||0,e=ca();if(this._alignEl){var g=
+f(this._alignEl),h=g.pos(),c=R(g[0].clientWidth/2-c/2),d=R(g[0].clientHeight/2-d/2);x=c<0?h.x:h.x+c;y=d<0?h.y:h.y+d}else h=G(this.doc),x=R(e.x+(h.clientWidth-c)/2),y=R(e.y+(h.clientHeight-d)/2);o&&A<7||P||(x-=e.x,y-=e.y);return this.pos(x,y)},remove:function(){var a=this;(o&&A<7||P)&&f(a.win).unbind("scroll");a.div.remove();m(a,function(b){a[b]=null});return this},show:function(){this.div.show();return this},hide:function(){this.div.hide();return this},draggable:function(a){var b=this,a=a||{};a.moveEl=
+b.div;a.moveFn=function(a,d,e,g,f,j){if((a+=f)<0)a=0;if((d+=j)<0)d=0;b.pos(a,d)};Wa(a);return b}});f.WidgetClass=S;f.widget=Ya;var Za="";if(p=document.getElementsByTagName("html"))Za=p[0].dir;E(qa,S,{init:function(a){function b(){var b=Xa(c.iframe);b.open();if(j)b.domain=document.domain;b.write($b(d,e,g,h));b.close();c.win=c.iframe[0].contentWindow;c.doc=b;var k=zb(b);c.afterChange(function(){k.selection()});X&&f(b).click(function(a){f(a.target).name==="img"&&(k.selection(!0),k.range.selectNode(a.target),
+k.select())});if(o)c._mousedownHandler=function(){var a=k.range.cloneRange();a.shrink();a.isControl()&&c.blur()},f(document).mousedown(c._mousedownHandler),f(b).keydown(function(a){if(a.which==8){k.selection();var b=k.range;b.isControl()&&(b.collapse(!0),f(b.startContainer.childNodes[b.startOffset]).remove(),a.preventDefault())}});c.cmd=k;c.html(pa(c.srcElement));o?(b.body.disabled=!0,b.body.contentEditable=!0,b.body.removeAttribute("disabled")):b.designMode="on";a.afterCreate&&a.afterCreate.call(c)}
+var c=this;qa.parent.init.call(c,a);c.srcElement=f(a.srcElement);c.div.addClass("ke-edit");c.designMode=l(a.designMode,!0);c.beforeGetHtml=a.beforeGetHtml;c.beforeSetHtml=a.beforeSetHtml;c.afterSetHtml=a.afterSetHtml;var d=l(a.themesPath,""),e=a.bodyClass,g=a.cssPath,h=a.cssData,j=location.protocol!="res:"&&location.host.replace(/:\d+/,"")!==document.domain,k="document.open();"+(j?'document.domain="'+document.domain+'";':"")+"document.close();",k=o?' src="javascript:void(function(){'+encodeURIComponent(k)+
+'}())"':"";c.iframe=f('<iframe class="ke-edit-iframe" hidefocus="true" frameborder="0"'+k+"></iframe>").css("width","100%");c.textarea=f('<textarea class="ke-edit-textarea" hidefocus="true"></textarea>').css("width","100%");c.tabIndex=isNaN(parseInt(a.tabIndex,10))?c.srcElement.attr("tabindex"):parseInt(a.tabIndex,10);c.iframe.attr("tabindex",c.tabIndex);c.textarea.attr("tabindex",c.tabIndex);c.width&&c.setWidth(c.width);c.height&&c.setHeight(c.height);c.designMode?c.textarea.hide():c.iframe.hide();
+j&&c.iframe.bind("load",function(){c.iframe.unbind("load");o?b():setTimeout(b,0)});c.div.append(c.iframe);c.div.append(c.textarea);c.srcElement.hide();!j&&b()},setWidth:function(a){this.width=a=s(a);this.div.css("width",a);return this},setHeight:function(a){this.height=a=s(a);this.div.css("height",a);this.iframe.css("height",a);if(o&&A<8||P)a=s(t(a)-2);this.textarea.css("height",a);return this},remove:function(){var a=this.doc;f(a.body).unbind();f(a).unbind();f(this.win).unbind();this._mousedownHandler&&
+f(document).unbind("mousedown",this._mousedownHandler);pa(this.srcElement,this.html());this.srcElement.show();a.write("");this.iframe.unbind();this.textarea.unbind();qa.parent.remove.call(this)},html:function(a,b){var c=this.doc;if(this.designMode){c=c.body;if(a===i)return a=b?"<!doctype html><html>"+c.parentNode.innerHTML+"</html>":c.innerHTML,this.beforeGetHtml&&(a=this.beforeGetHtml(a)),Y&&a=="<br />"&&(a=""),a;this.beforeSetHtml&&(a=this.beforeSetHtml(a));o&&A>=9&&(a=a.replace(/(<.*?checked=")checked(".*>)/ig,
+"$1$2"));f(c).html(a);this.afterSetHtml&&this.afterSetHtml();return this}if(a===i)return this.textarea.val();this.textarea.val(a);return this},design:function(a){if(a===i?!this.designMode:a){if(!this.designMode)a=this.html(),this.designMode=!0,this.html(a),this.textarea.hide(),this.iframe.show()}else if(this.designMode)a=this.html(),this.designMode=!1,this.html(a),this.iframe.hide(),this.textarea.show();return this.focus()},focus:function(){this.designMode?this.win.focus():this.textarea[0].focus();
+return this},blur:function(){if(o){var a=f('<input type="text" style="float:left;width:0;height:0;padding:0;margin:0;border:0;" value="" />',this.div);this.div.append(a);a[0].focus();a.remove()}else this.designMode?this.win.blur():this.textarea[0].blur();return this},afterChange:function(a){function b(b){setTimeout(function(){a(b)},1)}var c=this.doc,d=c.body;f(c).keyup(function(b){!b.ctrlKey&&!b.altKey&&db[b.which]&&a(b)});f(c).mouseup(a).contextmenu(a);f(this.win).blur(a);f(d).bind("paste",b);f(d).bind("cut",
+b);return this}});f.EditClass=qa;f.edit=Ab;f.iframeDoc=Xa;E(Da,S,{init:function(a){function b(a){a=f(a);if(a.hasClass("ke-outline"))return a;if(a.hasClass("ke-toolbar-icon"))return a.parent()}function c(a,c){var d=b(a.target);if(d&&!d.hasClass("ke-disabled")&&!d.hasClass("ke-selected"))d[c]("ke-on")}var d=this;Da.parent.init.call(d,a);d.disableMode=l(a.disableMode,!1);d.noDisableItemMap=u(l(a.noDisableItems,[]));d._itemMap={};d.div.addClass("ke-toolbar").bind("contextmenu,mousedown,mousemove",function(a){a.preventDefault()}).attr("unselectable",
+"on");d.div.mouseover(function(a){c(a,"addClass")}).mouseout(function(a){c(a,"removeClass")}).click(function(a){var c=b(a.target);c&&!c.hasClass("ke-disabled")&&d.options.click.call(this,a,c.attr("data-name"))})},get:function(a){if(this._itemMap[a])return this._itemMap[a];return this._itemMap[a]=f("span.ke-icon-"+a,this.div).parent()},select:function(a){Bb.call(this,a,function(a){a.addClass("ke-selected")});return self},unselect:function(a){Bb.call(this,a,function(a){a.removeClass("ke-selected").removeClass("ke-on")});
+return self},enable:function(a){if(a=a.get?a:this.get(a))a.removeClass("ke-disabled"),a.opacity(1);return this},disable:function(a){if(a=a.get?a:this.get(a))a.removeClass("ke-selected").addClass("ke-disabled"),a.opacity(0.5);return this},disableAll:function(a,b){var c=this,d=c.noDisableItemMap;b&&(d=u(b));(a===i?!c.disableMode:a)?(f("span.ke-outline",c.div).each(function(){var a=f(this),b=a[0].getAttribute("data-name",2);d[b]||c.disable(a)}),c.disableMode=!0):(f("span.ke-outline",c.div).each(function(){var a=
+f(this),b=a[0].getAttribute("data-name",2);d[b]||c.enable(a)}),c.disableMode=!1);return c}});f.ToolbarClass=Da;f.toolbar=Cb;E(ra,S,{init:function(a){a.z=a.z||811213;ra.parent.init.call(this,a);this.centerLineMode=l(a.centerLineMode,!0);this.div.addClass("ke-menu").bind("click,mousedown",function(a){a.stopPropagation()}).attr("unselectable","on")},addItem:function(a){if(a.title==="-")this.div.append(f('<div class="ke-menu-separator"></div>'));else{var b=f('<div class="ke-menu-item" unselectable="on"></div>'),
+c=f('<div class="ke-inline-block ke-menu-item-left"></div>'),d=f('<div class="ke-inline-block ke-menu-item-right"></div>'),e=s(a.height),g=l(a.iconClass,"");this.div.append(b);e&&(b.css("height",e),d.css("line-height",e));var h;this.centerLineMode&&(h=f('<div class="ke-inline-block ke-menu-item-center"></div>'),e&&h.css("height",e));b.mouseover(function(){f(this).addClass("ke-menu-item-on");h&&h.addClass("ke-menu-item-center-on")}).mouseout(function(){f(this).removeClass("ke-menu-item-on");h&&h.removeClass("ke-menu-item-center-on")}).click(function(b){a.click.call(f(this));
+b.stopPropagation()}).append(c);h&&b.append(h);b.append(d);a.checked&&(g="ke-icon-checked");g!==""&&c.html('<span class="ke-inline-block ke-toolbar-icon ke-toolbar-icon-url '+g+'"></span>');d.html(a.title);return this}},remove:function(){this.options.beforeRemove&&this.options.beforeRemove.call(this);f(".ke-menu-item",this.div[0]).unbind();ra.parent.remove.call(this);return this}});f.MenuClass=ra;f.menu=$a;E(sa,S,{init:function(a){a.z=a.z||811213;sa.parent.init.call(this,a);var b=a.colors||[["#E53333",
+"#E56600","#FF9900","#64451D","#DFC5A4","#FFE500"],["#009900","#006600","#99BB00","#B8D100","#60D978","#00D5FF"],["#337FE5","#003399","#4C33E5","#9933E5","#CC33E5","#EE33EE"],["#FFFFFF","#CCCCCC","#999999","#666666","#333333","#000000"]];this.selectedColor=(a.selectedColor||"").toLowerCase();this._cells=[];this.div.addClass("ke-colorpicker").bind("click,mousedown",function(a){a.stopPropagation()}).attr("unselectable","on");a=this.doc.createElement("table");this.div.append(a);a.className="ke-colorpicker-table";
+a.cellPadding=0;a.cellSpacing=0;a.border=0;var c=a.insertRow(0),d=c.insertCell(0);d.colSpan=b[0].length;this._addAttr(d,"","ke-colorpicker-cell-top");for(var e=0;e<b.length;e++)for(var c=a.insertRow(e+1),g=0;g<b[e].length;g++)d=c.insertCell(g),this._addAttr(d,b[e][g],"ke-colorpicker-cell")},_addAttr:function(a,b,c){var d=this,a=f(a).addClass(c);d.selectedColor===b.toLowerCase()&&a.addClass("ke-colorpicker-cell-selected");a.attr("title",b||d.options.noColor);a.mouseover(function(){f(this).addClass("ke-colorpicker-cell-on")});
+a.mouseout(function(){f(this).removeClass("ke-colorpicker-cell-on")});a.click(function(a){a.stop();d.options.click.call(f(this),b)});b?a.append(f('<div class="ke-colorpicker-cell-color" unselectable="on"></div>').css("background-color",b)):a.html(d.options.noColor);f(a).attr("unselectable","on");d._cells.push(a)},remove:function(){m(this._cells,function(){this.unbind()});sa.parent.remove.call(this);return this}});f.ColorPickerClass=sa;f.colorpicker=Db;E(ab,{init:function(a){var b=f(a.button),c=a.fieldName||
+"file",d=a.url||"",e=b.val(),g=a.extraParams||{},h=b[0].className||"",j=a.target||"kindeditor_upload_iframe_"+(new Date).getTime();a.afterError=a.afterError||function(a){alert(a)};var k=[],i;for(i in g)k.push('<input type="hidden" name="'+i+'" value="'+g[i]+'" />');c=['<div class="ke-inline-block '+h+'">',a.target?"":'<iframe name="'+j+'" style="display:none;"></iframe>',a.form?'<div class="ke-upload-area">':'<form class="ke-upload-area ke-form" method="post" enctype="multipart/form-data" target="'+
+j+'" action="'+d+'">','<span class="ke-button-common">',k.join(""),'<input type="button" class="ke-button-common ke-button" value="'+e+'" />',"</span>",'<input type="file" class="ke-upload-file" name="'+c+'" tabindex="-1" />',a.form?"</div>":"</form>","</div>"].join("");c=f(c,b.doc);b.hide();b.before(c);this.div=c;this.button=b;this.iframe=a.target?f('iframe[name="'+j+'"]'):f("iframe",c);this.form=a.form?f(a.form):f("form",c);this.fileBox=f(".ke-upload-file",c);b=a.width||f(".ke-button-common",c).width();
+f(".ke-upload-area",c).width(b);this.options=a},submit:function(){var a=this,b=a.iframe;b.bind("load",function(){b.unbind();var c=document.createElement("form");a.fileBox.before(c);f(c).append(a.fileBox);c.reset();f(c).remove(!0);var c=f.iframeDoc(b),d=c.getElementsByTagName("pre")[0],e="",g,e=d?d.innerHTML:c.body.innerHTML,e=fa(e);b[0].src="javascript:false";try{g=f.json(e)}catch(h){a.options.afterError.call(a,"<!doctype html><html>"+c.body.parentNode.innerHTML+"</html>")}g&&a.options.afterUpload.call(a,
+g)});a.form[0].submit();return a},remove:function(){this.fileBox&&this.fileBox.unbind();this.iframe.remove();this.div.remove();this.button.show();return this}});f.UploadButtonClass=ab;f.uploadbutton=function(a){return new ab(a)};E(ta,S,{init:function(a){var b=l(a.shadowMode,!0);a.z=a.z||811213;a.shadowMode=!1;a.autoScroll=l(a.autoScroll,!0);ta.parent.init.call(this,a);var c=a.title,d=f(a.body,this.doc),e=a.previewBtn,g=a.yesBtn,h=a.noBtn,j=a.closeBtn,k=l(a.showMask,!0);this.div.addClass("ke-dialog").bind("click,mousedown",
+function(a){a.stopPropagation()});var i=f('<div class="ke-dialog-content"></div>').appendTo(this.div);o&&A<7?this.iframeMask=f('<iframe src="about:blank" class="ke-dialog-shadow"></iframe>').appendTo(this.div):b&&f('<div class="ke-dialog-shadow"></div>').appendTo(this.div);b=f('<div class="ke-dialog-header"></div>');i.append(b);b.html(c);this.closeIcon=f('<span class="ke-dialog-icon-close" title="'+j.name+'"></span>').click(j.click);b.append(this.closeIcon);this.draggable({clickEl:b,beforeDrag:a.beforeDrag});
+a=f('<div class="ke-dialog-body"></div>');i.append(a);a.append(d);var q=f('<div class="ke-dialog-footer"></div>');(e||g||h)&&i.append(q);m([{btn:e,name:"preview"},{btn:g,name:"yes"},{btn:h,name:"no"}],function(){if(this.btn){var a=this.btn,a=a||{},b=a.name||"",c=f('<span class="ke-button-common ke-button-outer" title="'+b+'"></span>'),b=f('<input class="ke-button-common ke-button" type="button" value="'+b+'" />');a.click&&b.click(a.click);c.append(b);c.addClass("ke-dialog-"+this.name);q.append(c)}});
+this.height&&a.height(t(this.height)-b.height()-q.height());this.div.width(this.div.width());this.div.height(this.div.height());this.mask=null;if(k)d=G(this.doc),this.mask=Ya({x:0,y:0,z:this.z-1,cls:"ke-dialog-mask",width:Math.max(d.scrollWidth,d.clientWidth),height:Math.max(d.scrollHeight,d.clientHeight)});this.autoPos(this.div.width(),this.div.height());this.footerDiv=q;this.bodyDiv=a;this.headerDiv=b;this.isLoading=!1},setMaskIndex:function(a){this.mask.div.css("z-index",a)},showLoading:function(a){var a=
+l(a,""),b=this.bodyDiv;this.loading=f('<div class="ke-dialog-loading"><div class="ke-inline-block ke-dialog-loading-content" style="margin-top:'+Math.round(b.height()/3)+'px;">'+a+"</div></div>").width(b.width()).height(b.height()).css("top",this.headerDiv.height()+"px");b.css("visibility","hidden").after(this.loading);this.isLoading=!0;return this},hideLoading:function(){this.loading&&this.loading.remove();this.bodyDiv.css("visibility","visible");this.isLoading=!1;return this},remove:function(){this.options.beforeRemove&&
+this.options.beforeRemove.call(this);this.mask&&this.mask.remove();this.iframeMask&&this.iframeMask.remove();this.closeIcon.unbind();f("input",this.div).unbind();f("button",this.div).unbind();this.footerDiv.unbind();this.bodyDiv.unbind();this.headerDiv.unbind();f("iframe",this.div).each(function(){f(this).remove()});ta.parent.remove.call(this);return this}});f.DialogClass=ta;f.dialog=Eb;f.tabs=function(a){var b=Ya(a),c=b.remove,d=a.afterSelect,a=b.div,e=[];a.addClass("ke-tabs").bind("contextmenu,mousedown,mousemove",
+function(a){a.preventDefault()});var g=f('<ul class="ke-tabs-ul ke-clearfix"></ul>');a.append(g);b.add=function(a){var b=f('<li class="ke-tabs-li">'+a.title+"</li>");b.data("tab",a);e.push(b);g.append(b)};b.selectedIndex=0;b.select=function(a){b.selectedIndex=a;m(e,function(c,d){d.unbind();c===a?(d.addClass("ke-tabs-li-selected"),f(d.data("tab").panel).show("")):(d.removeClass("ke-tabs-li-selected").removeClass("ke-tabs-li-on").mouseover(function(){f(this).addClass("ke-tabs-li-on")}).mouseout(function(){f(this).removeClass("ke-tabs-li-on")}).click(function(){b.select(c)}),
+f(d.data("tab").panel).hide())});d&&d.call(b,a)};b.remove=function(){m(e,function(){this.remove()});g.remove();c.call(b)};return b};f.loadScript=bb;f.loadStyle=cb;f.ajax=function(a,b,c,d,e){var c=c||"GET",e=e||"json",g=w.XMLHttpRequest?new w.XMLHttpRequest:new ActiveXObject("Microsoft.XMLHTTP");g.open(c,a,!0);g.onreadystatechange=function(){if(g.readyState==4&&g.status==200&&b){var a=B(g.responseText);e=="json"&&(a=eb(a));b(a)}};if(c=="POST"){var f=[];m(d,function(a,b){f.push(encodeURIComponent(a)+
+"="+encodeURIComponent(b))});try{g.setRequestHeader("Content-Type","application/x-www-form-urlencoded")}catch(j){}g.send(f.join("&"))}else g.send(null)};var N={},O={};ua.prototype={lang:function(a){return Ib(a,this.langType)},loadPlugin:function(a,b){var c=this;if(N[a]){if(!wa(N[a]))return setTimeout(function(){c.loadPlugin(a,b)},100),c;N[a].call(c,KindEditor);b&&b.call(c);return c}N[a]="loading";bb(c.pluginsPath+a+"/"+a+".js?ver="+encodeURIComponent(f.DEBUG?Ga:Ha),function(){setTimeout(function(){N[a]&&
+c.loadPlugin(a,b)},0)});return c},handler:function(a,b){var c=this;c._handlers[a]||(c._handlers[a]=[]);if(wa(b))return c._handlers[a].push(b),c;m(c._handlers[a],function(){b=this.call(c,b)});return b},clickToolbar:function(a,b){var c=this,d="clickToolbar"+a;if(b===i){if(c._handlers[d])return c.handler(d);c.loadPlugin(a,function(){c.handler(d)});return c}return c.handler(d,b)},updateState:function(){var a=this;m("justifyleft,justifycenter,justifyright,justifyfull,insertorderedlist,insertunorderedlist,subscript,superscript,bold,italic,underline,strikethrough".split(","),
+function(b,c){a.cmd.state(c)?a.toolbar.select(c):a.toolbar.unselect(c)});return a},addContextmenu:function(a){this._contextmenus.push(a);return this},afterCreate:function(a){return this.handler("afterCreate",a)},beforeRemove:function(a){return this.handler("beforeRemove",a)},beforeGetHtml:function(a){return this.handler("beforeGetHtml",a)},beforeSetHtml:function(a){return this.handler("beforeSetHtml",a)},afterSetHtml:function(a){return this.handler("afterSetHtml",a)},create:function(){function a(){k.height()===
+0?setTimeout(a,100):b.resize(d,e,!1)}var b=this,c=b.fullscreenMode;if(b.isCreated)return b;if(b.srcElement.data("kindeditor"))return b;b.srcElement.data("kindeditor","true");c?G().style.overflow="hidden":G().style.overflow="";var d=c?G().clientWidth+"px":b.width,e=c?G().clientHeight+"px":b.height;if(o&&A<8||P)e=s(t(e)+2);var g=b.container=f(b.layout);c?f(document.body).append(g):b.srcElement.before(g);var h=f(".toolbar",g),j=f(".edit",g),k=b.statusbar=f(".statusbar",g);g.removeClass("container").addClass("ke-container ke-container-"+
+b.themeType).css("width",d);if(c){g.css({position:"absolute",left:0,top:0,"z-index":811211});if(!Y)b._scrollPos=ca();w.scrollTo(0,0);f(document.body).css({height:"1px",overflow:"hidden"});f(document.body.parentNode).css("overflow","hidden");b._fullscreenExecuted=!0}else b._fullscreenExecuted&&(f(document.body).css({height:"",overflow:""}),f(document.body.parentNode).css("overflow","")),b._scrollPos&&w.scrollTo(b._scrollPos.x,b._scrollPos.y);var i=[];f.each(b.items,function(a,c){c=="|"?i.push('<span class="ke-inline-block ke-separator"></span>'):
+c=="/"?i.push('<div class="ke-hr"></div>'):(i.push('<span class="ke-outline" data-name="'+c+'" title="'+b.lang(c)+'" unselectable="on">'),i.push('<span class="ke-toolbar-icon ke-toolbar-icon-url ke-icon-'+c+'" unselectable="on"></span></span>'))});var h=b.toolbar=Cb({src:h,html:i.join(""),noDisableItems:b.noDisableItems,click:function(a,c){a.stop();if(b.menu){var d=b.menu.name;b.hideMenu();if(d===c)return}b.clickToolbar(c)}}),l=t(e)-h.div.height(),m=b.edit=Ab({height:l>0&&t(e)>b.minHeight?l:b.minHeight,
+src:j,srcElement:b.srcElement,designMode:b.designMode,themesPath:b.themesPath,bodyClass:b.bodyClass,cssPath:b.cssPath,cssData:b.cssData,beforeGetHtml:function(a){a=b.beforeGetHtml(a);a=T(Fa(a));return U(a,b.filterMode?b.htmlTags:null,b.urlType,b.wellFormatMode,b.indentChar)},beforeSetHtml:function(a){a=U(a,b.filterMode?b.htmlTags:null,"",!1);return b.beforeSetHtml(a)},afterSetHtml:function(){b.edit=m=this;b.afterSetHtml()},afterCreate:function(){b.edit=m=this;b.cmd=m.cmd;b._docMousedownFn=function(){b.menu&&
+b.hideMenu()};f(m.doc,document).mousedown(b._docMousedownFn);ac.call(b);bc.call(b);cc.call(b);dc.call(b);m.afterChange(function(){m.designMode&&(b.updateState(),b.addBookmark(),b.options.afterChange&&b.options.afterChange.call(b))});m.textarea.keyup(function(a){!a.ctrlKey&&!a.altKey&&Ob[a.which]&&b.options.afterChange&&b.options.afterChange.call(b)});b.readonlyMode&&b.readonly();b.isCreated=!0;if(b.initContent==="")b.initContent=b.html();if(b._undoStack.length>0){var a=b._undoStack.pop();a.start&&
+(b.html(a.html),m.cmd.range.moveToBookmark(a),b.select())}b.afterCreate();b.options.afterCreate&&b.options.afterCreate.call(b)}});k.removeClass("statusbar").addClass("ke-statusbar").append('<span class="ke-inline-block ke-statusbar-center-icon"></span>').append('<span class="ke-inline-block ke-statusbar-right-icon"></span>');if(b._fullscreenResizeHandler)f(w).unbind("resize",b._fullscreenResizeHandler),b._fullscreenResizeHandler=null;a();c?(b._fullscreenResizeHandler=function(){b.isCreated&&b.resize(G().clientWidth,
+G().clientHeight,!1)},f(w).bind("resize",b._fullscreenResizeHandler),h.select("fullscreen"),k.first().css("visibility","hidden"),k.last().css("visibility","hidden")):(Y&&f(w).bind("scroll",function(){b._scrollPos=ca()}),b.resizeType>0?Wa({moveEl:g,clickEl:k,moveFn:function(a,c,d,e,g,f){e+=f;b.resize(null,e)}}):k.first().css("visibility","hidden"),b.resizeType===2?Wa({moveEl:g,clickEl:k.last(),moveFn:function(a,c,d,e,g,f){d+=g;e+=f;b.resize(d,e)}}):k.last().css("visibility","hidden"));return b},remove:function(){var a=
+this;if(!a.isCreated)return a;a.beforeRemove();a.srcElement.data("kindeditor","");a.menu&&a.hideMenu();m(a.dialogs,function(){a.hideDialog()});f(document).unbind("mousedown",a._docMousedownFn);a.toolbar.remove();a.edit.remove();a.statusbar.last().unbind();a.statusbar.unbind();a.container.remove();a.container=a.toolbar=a.edit=a.menu=null;a.dialogs=[];a.isCreated=!1;return a},resize:function(a,b,c){c=l(c,!0);if(a&&(/%/.test(a)||(a=t(a),a=a<this.minWidth?this.minWidth:a),this.container.css("width",s(a)),
+c))this.width=s(a);if(b&&(b=t(b),editHeight=t(b)-this.toolbar.div.height()-this.statusbar.height(),editHeight=editHeight<this.minHeight?this.minHeight:editHeight,this.edit.setHeight(editHeight),c))this.height=s(b);return this},select:function(){this.isCreated&&this.cmd.select();return this},html:function(a){if(a===i)return this.isCreated?this.edit.html():pa(this.srcElement);this.isCreated?this.edit.html(a):pa(this.srcElement,a);this.isCreated&&this.cmd.selection();return this},fullHtml:function(){return this.isCreated?
+this.edit.html(i,!0):""},text:function(a){return a===i?B(this.html().replace(/<(?!img|embed).*?>/ig,"").replace(/&nbsp;/ig," ")):this.html(C(a))},isEmpty:function(){return B(this.text().replace(/\r\n|\n|\r/,""))===""},isDirty:function(){return B(this.initContent.replace(/\r\n|\n|\r|t/g,""))!==B(this.html().replace(/\r\n|\n|\r|t/g,""))},selectedHtml:function(){var a=this.isCreated?this.cmd.range.html():"";return a=T(Fa(a))},count:function(a){a=(a||"html").toLowerCase();if(a==="html")return this.html().length;
+if(a==="text")return this.text().replace(/<(?:img|embed).*?>/ig,"K").replace(/\r\n|\n|\r/g,"").length;return 0},exec:function(a){var a=a.toLowerCase(),b=this.cmd,c=J(a,"selectall,copy,paste,print".split(","))<0;c&&this.addBookmark(!1);b[a].apply(b,Ja(arguments,1));c&&(this.updateState(),this.addBookmark(!1),this.options.afterChange&&this.options.afterChange.call(this));return this},insertHtml:function(a,b){if(!this.isCreated)return this;a=this.beforeSetHtml(a);this.exec("inserthtml",a,b);return this},
+appendHtml:function(a){this.html(this.html()+a);if(this.isCreated)a=this.cmd,a.range.selectNodeContents(a.doc.body).collapse(!1),a.select();return this},sync:function(){pa(this.srcElement,this.html());return this},focus:function(){this.isCreated?this.edit.focus():this.srcElement[0].focus();return this},blur:function(){this.isCreated?this.edit.blur():this.srcElement[0].blur();return this},addBookmark:function(a){var a=l(a,!0),b=this.edit,c=b.doc.body,d=Fa(c.innerHTML);if(a&&this._undoStack.length>
+0&&Math.abs(d.length-T(this._undoStack[this._undoStack.length-1].html).length)<this.minChangeSize)return this;b.designMode&&!this._firstAddBookmark?(b=this.cmd.range,a=b.createBookmark(!0),a.html=Fa(c.innerHTML),b.moveToBookmark(a)):a={html:d};this._firstAddBookmark=!1;Jb(this._undoStack,a);return this},undo:function(){return Kb.call(this,this._undoStack,this._redoStack)},redo:function(){return Kb.call(this,this._redoStack,this._undoStack)},fullscreen:function(a){this.fullscreenMode=a===i?!this.fullscreenMode:
+a;this.addBookmark(!1);return this.remove().create()},readonly:function(a){var a=l(a,!0),b=this,c=b.edit,d=c.doc;b.designMode?b.toolbar.disableAll(a,[]):m(b.noDisableItems,function(){b.toolbar[a?"disable":"enable"](this)});o?d.body.contentEditable=!a:d.designMode=a?"off":"on";c.textarea[0].disabled=a},createMenu:function(a){var b=this.toolbar.get(a.name),c=b.pos();a.x=c.x;a.y=c.y+b.height();a.z=this.options.zIndex;a.shadowMode=l(a.shadowMode,this.shadowMode);a.selectedColor!==i?(a.cls="ke-colorpicker-"+
+this.themeType,a.noColor=this.lang("noColor"),this.menu=Db(a)):(a.cls="ke-menu-"+this.themeType,a.centerLineMode=!1,this.menu=$a(a));return this.menu},hideMenu:function(){this.menu.remove();this.menu=null;return this},hideContextmenu:function(){this.contextmenu.remove();this.contextmenu=null;return this},createDialog:function(a){var b=this;a.z=b.options.zIndex;a.shadowMode=l(a.shadowMode,b.shadowMode);a.closeBtn=l(a.closeBtn,{name:b.lang("close"),click:function(){b.hideDialog();o&&b.cmd&&b.cmd.select()}});
+a.noBtn=l(a.noBtn,{name:b.lang(a.yesBtn?"no":"close"),click:function(){b.hideDialog();o&&b.cmd&&b.cmd.select()}});if(b.dialogAlignType!="page")a.alignEl=b.container;a.cls="ke-dialog-"+b.themeType;if(b.dialogs.length>0){var c=b.dialogs[b.dialogs.length-1];b.dialogs[0].setMaskIndex(c.z+2);a.z=c.z+3;a.showMask=!1}a=Eb(a);b.dialogs.push(a);return a},hideDialog:function(){this.dialogs.length>0&&this.dialogs.pop().remove();this.dialogs.length>0&&this.dialogs[0].setMaskIndex(this.dialogs[this.dialogs.length-
+1].z-1);return this},errorDialog:function(a){var b=this.createDialog({width:750,title:this.lang("uploadError"),body:'<div style="padding:10px 20px;"><iframe frameborder="0" style="width:708px;height:400px;"></iframe></div>'}),b=f("iframe",b.div),c=f.iframeDoc(b);c.open();c.write(a);c.close();f(c.body).css("background-color","#FFF");b[0].contentWindow.focus();return this}};_instances=[];f.remove=function(a){va(a,function(a){this.remove();_instances.splice(a,1)})};f.sync=function(a){va(a,function(){this.sync()})};
+f.html=function(a,b){va(a,function(){this.html(b)})};f.insertHtml=function(a,b){va(a,function(){this.insertHtml(b)})};f.appendHtml=function(a,b){va(a,function(){this.appendHtml(b)})};o&&A<7&&Q(document,"BackgroundImageCache",!0);f.EditorClass=ua;f.editor=function(a){return new ua(a)};f.create=Lb;f.instances=_instances;f.plugin=Gb;f.lang=Ib;Gb("core",function(a){var b=this,c={undo:"Z",redo:"Y",bold:"B",italic:"I",underline:"U",print:"P",selectall:"A"};b.afterSetHtml(function(){b.options.afterChange&&
+b.options.afterChange.call(b)});b.afterCreate(function(){if(b.syncType=="form"){for(var c=a(b.srcElement),d=!1;c=c.parent();)if(c.name=="form"){d=!0;break}if(d){c.bind("submit",function(){b.sync();a(w).bind("unload",function(){b.edit.textarea.remove()})});var f=a('[type="reset"]',c);f.click(function(){b.html(b.initContent);b.cmd.selection()});b.beforeRemove(function(){c.unbind();f.unbind()})}}});b.clickToolbar("source",function(){b.edit.designMode?(b.toolbar.disableAll(!0),b.edit.design(!1),b.toolbar.select("source")):
+(b.toolbar.disableAll(!1),b.edit.design(!0),b.toolbar.unselect("source"),Y?setTimeout(function(){b.cmd.selection()},0):b.cmd.selection());b.designMode=b.edit.designMode});b.afterCreate(function(){b.designMode||b.toolbar.disableAll(!0).select("source")});b.clickToolbar("fullscreen",function(){b.fullscreen()});if(b.fullscreenShortcut){var d=!1;b.afterCreate(function(){a(b.edit.doc,b.edit.textarea).keyup(function(a){a.which==27&&setTimeout(function(){b.fullscreen()},0)});if(d){if(o&&!b.designMode)return;
+b.focus()}d||(d=!0)})}m("undo,redo".split(","),function(a,d){c[d]&&b.afterCreate(function(){Ka(this.edit.doc,c[d],function(){b.clickToolbar(d)})});b.clickToolbar(d,function(){b[d]()})});b.clickToolbar("formatblock",function(){var a=b.lang("formatblock.formatBlock"),c={h1:28,h2:24,h3:18,H4:14,p:12},d=b.cmd.val("formatblock"),f=b.createMenu({name:"formatblock",width:b.langType=="en"?200:150});m(a,function(a,e){var i="font-size:"+c[a]+"px;";a.charAt(0)==="h"&&(i+="font-weight:bold;");f.addItem({title:'<span style="'+
+i+'" unselectable="on">'+e+"</span>",height:c[a]+12,checked:d===a||d===e,click:function(){b.select().exec("formatblock","<"+a+">").hideMenu()}})})});b.clickToolbar("fontname",function(){var a=b.cmd.val("fontname"),c=b.createMenu({name:"fontname",width:150});m(b.lang("fontname.fontName"),function(d,f){c.addItem({title:'<span style="font-family: '+d+';" unselectable="on">'+f+"</span>",checked:a===d.toLowerCase()||a===f.toLowerCase(),click:function(){b.exec("fontname",d).hideMenu()}})})});b.clickToolbar("fontsize",
+function(){var a=b.cmd.val("fontsize"),c=b.createMenu({name:"fontsize",width:150});m(b.fontSizeTable,function(d,f){c.addItem({title:'<span style="font-size:'+f+';" unselectable="on">'+f+"</span>",height:t(f)+12,checked:a===f,click:function(){b.exec("fontsize",f).hideMenu()}})})});m("forecolor,hilitecolor".split(","),function(a,c){b.clickToolbar(c,function(){b.createMenu({name:c,selectedColor:b.cmd.val(c)||"default",colors:b.colorTable,click:function(a){b.exec(c,a).hideMenu()}})})});m("cut,copy,paste".split(","),
+function(a,c){b.clickToolbar(c,function(){b.focus();try{b.exec(c,null)}catch(a){alert(b.lang(c+"Error"))}})});b.clickToolbar("about",function(){var a='<div style="margin:20px;"><div>KindEditor '+Ha+'</div><div>Copyright &copy; <a href="http://www.kindsoft.net/" target="_blank">kindsoft.net</a> All rights reserved.</div></div>';b.createDialog({name:"about",width:350,title:b.lang("about"),body:a})});b.plugin.getSelectedLink=function(){return b.cmd.commonAncestor("a")};b.plugin.getSelectedImage=function(){return Ea(b.edit.cmd.range,
+function(a){return!/^ke-\w+$/i.test(a[0].className)})};b.plugin.getSelectedFlash=function(){return Ea(b.edit.cmd.range,function(a){return a[0].className=="ke-flash"})};b.plugin.getSelectedMedia=function(){return Ea(b.edit.cmd.range,function(a){return a[0].className=="ke-media"||a[0].className=="ke-rm"})};b.plugin.getSelectedAnchor=function(){return Ea(b.edit.cmd.range,function(a){return a[0].className=="ke-anchor"})};m("link,image,flash,media,anchor".split(","),function(a,c){var d=c.charAt(0).toUpperCase()+
+c.substr(1);m("edit,delete".split(","),function(a,e){b.addContextmenu({title:b.lang(e+d),click:function(){b.loadPlugin(c,function(){b.plugin[c][e]();b.hideMenu()})},cond:b.plugin["getSelected"+d],width:150,iconClass:e=="edit"?"ke-icon-"+c:i})});b.addContextmenu({title:"-"})});b.plugin.getSelectedTable=function(){return b.cmd.commonAncestor("table")};b.plugin.getSelectedRow=function(){return b.cmd.commonAncestor("tr")};b.plugin.getSelectedCell=function(){return b.cmd.commonAncestor("td")};m("prop,cellprop,colinsertleft,colinsertright,rowinsertabove,rowinsertbelow,rowmerge,colmerge,rowsplit,colsplit,coldelete,rowdelete,insert,delete".split(","),
+function(a,c){var d=J(c,["prop","delete"])<0?b.plugin.getSelectedCell:b.plugin.getSelectedTable;b.addContextmenu({title:b.lang("table"+c),click:function(){b.loadPlugin("table",function(){b.plugin.table[c]();b.hideMenu()})},cond:d,width:170,iconClass:"ke-icon-table"+c})});b.addContextmenu({title:"-"});m("selectall,justifyleft,justifycenter,justifyright,justifyfull,insertorderedlist,insertunorderedlist,indent,outdent,subscript,superscript,hr,print,bold,italic,underline,strikethrough,removeformat,unlink".split(","),
+function(a,d){c[d]&&b.afterCreate(function(){Ka(this.edit.doc,c[d],function(){b.cmd.selection();b.clickToolbar(d)})});b.clickToolbar(d,function(){b.focus().exec(d,null)})});b.afterCreate(function(){function c(){f.range.moveToBookmark(j);f.select();X&&(a("div."+l,i).each(function(){a(this).after("<br />").remove(!0)}),a("span.Apple-style-span",i).remove(!0),a("span.Apple-tab-span",i).remove(!0),a("span[style]",i).each(function(){a(this).css("white-space")=="nowrap"&&a(this).remove(!0)}),a("meta",i).remove());
+var d=i[0].innerHTML;i.remove();d!==""&&(X&&(d=d.replace(/(<br>)\1/ig,"$1")),b.pasteType===2&&(d=d.replace(/(<(?:p|p\s[^>]*)>) *(<\/p>)/ig,""),/schemas-microsoft-com|worddocument|mso-\w+/i.test(d)?d=nb(d,b.filterMode?b.htmlTags:a.options.htmlTags):(d=U(d,b.filterMode?b.htmlTags:null),d=b.beforeSetHtml(d))),b.pasteType===1&&(d=d.replace(/&nbsp;/ig," "),d=d.replace(/\n\s*\n/g,"\n"),d=d.replace(/<br[^>]*>/ig,"\n"),d=d.replace(/<\/p><p[^>]*>/ig,"\n"),d=d.replace(/<[^>]+>/g,""),d=d.replace(/ {2}/g," &nbsp;"),
+b.newlineTag=="p"?/\n/.test(d)&&(d=d.replace(/^/,"<p>").replace(/$/,"<br /></p>").replace(/\n/g,"<br /></p><p>")):d=d.replace(/\n/g,"<br />$&")),b.insertHtml(d,!0))}var d=b.edit.doc,f,j,i,l="__kindeditor_paste__",m=!1;a(d.body).bind("paste",function(p){if(b.pasteType===0)p.stop();else if(!m){m=!0;a("div."+l,d).remove();f=b.cmd.selection();j=f.range.createBookmark();i=a('<div class="'+l+'"></div>',d).css({position:"absolute",width:"1px",height:"1px",overflow:"hidden",left:"-1981px",top:a(j.start).pos().y+
+"px","white-space":"nowrap"});a(d.body).append(i);if(o){var s=f.range.get(!0);s.moveToElementText(i[0]);s.select();s.execCommand("paste");p.preventDefault()}else f.range.selectNodeContents(i[0]),f.select();setTimeout(function(){c();m=!1},0)}})});b.beforeGetHtml(function(a){o&&A<=8&&(a=a.replace(/<div\s+[^>]*data-ke-input-tag="([^"]*)"[^>]*>([\s\S]*?)<\/div>/ig,function(a,b){return unescape(b)}),a=a.replace(/(<input)((?:\s+[^>]*)?>)/ig,function(a,b,c){if(!/\s+type="[^"]+"/i.test(a))return b+' type="text"'+
+c;return a}));return a.replace(/(<(?:noscript|noscript\s[^>]*)>)([\s\S]*?)(<\/noscript>)/ig,function(a,b,c,d){return b+fa(c).replace(/\s+/g," ")+d}).replace(/<img[^>]*class="?ke-(flash|rm|media)"?[^>]*>/ig,function(a){var a=I(a),b=ba(a.style||""),c=pb(a["data-ke-tag"]),d=l(b.width,""),b=l(b.height,"");/px/i.test(d)&&(d=t(d));/px/i.test(b)&&(b=t(b));c.width=l(a.width,d);c.height=l(a.height,b);return Ma(c)}).replace(/<img[^>]*class="?ke-anchor"?[^>]*>/ig,function(a){a=I(a);return'<a name="'+unescape(a["data-ke-name"])+
+'"></a>'}).replace(/<div\s+[^>]*data-ke-script-attr="([^"]*)"[^>]*>([\s\S]*?)<\/div>/ig,function(a,b,c){return"<script"+unescape(b)+">"+unescape(c)+"<\/script>"}).replace(/<div\s+[^>]*data-ke-noscript-attr="([^"]*)"[^>]*>([\s\S]*?)<\/div>/ig,function(a,b,c){return"<noscript"+unescape(b)+">"+unescape(c)+"</noscript>"}).replace(/(<[^>]*)data-ke-src="([^"]*)"([^>]*>)/ig,function(a,b,c){a=a.replace(/(\s+(?:href|src)=")[^"]*(")/i,function(a,b,d){return b+fa(c)+d});return a=a.replace(/\s+data-ke-src="[^"]*"/i,
+"")}).replace(/(<[^>]+\s)data-ke-(on\w+="[^"]*"[^>]*>)/ig,function(a,b,c){return b+c})});b.beforeSetHtml(function(a){o&&A<=8&&(a=a.replace(/<input[^>]*>|<(select|button)[^>]*>[\s\S]*?<\/\1>/ig,function(a){var b=I(a);if(ba(b.style||"").display=="none")return'<div class="ke-display-none" data-ke-input-tag="'+escape(a)+'"></div>';return a}));return a.replace(/<embed[^>]*type="([^"]+)"[^>]*>(?:<\/embed>)?/ig,function(a){a=I(a);a.src=l(a.src,"");a.width=l(a.width,0);a.height=l(a.height,0);return qb(b.themesPath+
+"common/blank.gif",a)}).replace(/<a[^>]*name="([^"]+)"[^>]*>(?:<\/a>)?/ig,function(a){var c=I(a);if(c.href!==i)return a;return'<img class="ke-anchor" src="'+b.themesPath+'common/anchor.gif" data-ke-name="'+escape(c.name)+'" />'}).replace(/<script([^>]*)>([\s\S]*?)<\/script>/ig,function(a,b,c){return'<div class="ke-script" data-ke-script-attr="'+escape(b)+'">'+escape(c)+"</div>"}).replace(/<noscript([^>]*)>([\s\S]*?)<\/noscript>/ig,function(a,b,c){return'<div class="ke-noscript" data-ke-noscript-attr="'+
+escape(b)+'">'+escape(c)+"</div>"}).replace(/(<[^>]*)(href|src)="([^"]*)"([^>]*>)/ig,function(a,b,c,d,e){if(a.match(/\sdata-ke-src="[^"]*"/i))return a;return a=b+c+'="'+d+'" data-ke-src="'+C(d)+'"'+e}).replace(/(<[^>]+\s)(on\w+="[^"]*"[^>]*>)/ig,function(a,b,c){return b+"data-ke-"+c}).replace(/<table[^>]*\s+border="0"[^>]*>/ig,function(a){if(a.indexOf("ke-zeroborder")>=0)return a;return Sb(a,"ke-zeroborder")})})})}})(window);
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/kindeditor.js b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/kindeditor.js
new file mode 100644
index 0000000..7851a1b
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/kindeditor.js
@@ -0,0 +1,5960 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2013 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @website http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+* @version 4.1.10 (2013-11-23)
+*******************************************************************************/
+(function (window, undefined) {
+	if (window.KindEditor) {
+		return;
+	}
+if (!window.console) {
+	window.console = {};
+}
+if (!console.log) {
+	console.log = function () {};
+}
+var _VERSION = '4.1.10 (2013-11-23)',
+	_ua = navigator.userAgent.toLowerCase(),
+	_IE = _ua.indexOf('msie') > -1 && _ua.indexOf('opera') == -1,
+	_NEWIE = _ua.indexOf('msie') == -1 && _ua.indexOf('trident') > -1,
+	_GECKO = _ua.indexOf('gecko') > -1 && _ua.indexOf('khtml') == -1,
+	_WEBKIT = _ua.indexOf('applewebkit') > -1,
+	_OPERA = _ua.indexOf('opera') > -1,
+	_MOBILE = _ua.indexOf('mobile') > -1,
+	_IOS = /ipad|iphone|ipod/.test(_ua),
+	_QUIRKS = document.compatMode != 'CSS1Compat',
+	_IERANGE = !window.getSelection,
+	_matches = /(?:msie|firefox|webkit|opera)[\/:\s](\d+)/.exec(_ua),
+	_V = _matches ? _matches[1] : '0',
+	_TIME = new Date().getTime();
+function _isArray(val) {
+	if (!val) {
+		return false;
+	}
+	return Object.prototype.toString.call(val) === '[object Array]';
+}
+function _isFunction(val) {
+	if (!val) {
+		return false;
+	}
+	return Object.prototype.toString.call(val) === '[object Function]';
+}
+function _inArray(val, arr) {
+	for (var i = 0, len = arr.length; i < len; i++) {
+		if (val === arr[i]) {
+			return i;
+		}
+	}
+	return -1;
+}
+function _each(obj, fn) {
+	if (_isArray(obj)) {
+		for (var i = 0, len = obj.length; i < len; i++) {
+			if (fn.call(obj[i], i, obj[i]) === false) {
+				break;
+			}
+		}
+	} else {
+		for (var key in obj) {
+			if (obj.hasOwnProperty(key)) {
+				if (fn.call(obj[key], key, obj[key]) === false) {
+					break;
+				}
+			}
+		}
+	}
+}
+function _trim(str) {
+	return str.replace(/(?:^[ \t\n\r]+)|(?:[ \t\n\r]+$)/g, '');
+}
+function _inString(val, str, delimiter) {
+	delimiter = delimiter === undefined ? ',' : delimiter;
+	return (delimiter + str + delimiter).indexOf(delimiter + val + delimiter) >= 0;
+}
+function _addUnit(val, unit) {
+	unit = unit || 'px';
+	return val && /^\d+$/.test(val) ? val + unit : val;
+}
+function _removeUnit(val) {
+	var match;
+	return val && (match = /(\d+)/.exec(val)) ? parseInt(match[1], 10) : 0;
+}
+function _escape(val) {
+	return val.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;');
+}
+function _unescape(val) {
+	return val.replace(/&lt;/g, '<').replace(/&gt;/g, '>').replace(/&quot;/g, '"').replace(/&amp;/g, '&');
+}
+function _toCamel(str) {
+	var arr = str.split('-');
+	str = '';
+	_each(arr, function(key, val) {
+		str += (key > 0) ? val.charAt(0).toUpperCase() + val.substr(1) : val;
+	});
+	return str;
+}
+function _toHex(val) {
+	function hex(d) {
+		var s = parseInt(d, 10).toString(16).toUpperCase();
+		return s.length > 1 ? s : '0' + s;
+	}
+	return val.replace(/rgb\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)/ig,
+		function($0, $1, $2, $3) {
+			return '#' + hex($1) + hex($2) + hex($3);
+		}
+	);
+}
+function _toMap(val, delimiter) {
+	delimiter = delimiter === undefined ? ',' : delimiter;
+	var map = {}, arr = _isArray(val) ? val : val.split(delimiter), match;
+	_each(arr, function(key, val) {
+		if ((match = /^(\d+)\.\.(\d+)$/.exec(val))) {
+			for (var i = parseInt(match[1], 10); i <= parseInt(match[2], 10); i++) {
+				map[i.toString()] = true;
+			}
+		} else {
+			map[val] = true;
+		}
+	});
+	return map;
+}
+function _toArray(obj, offset) {
+	return Array.prototype.slice.call(obj, offset || 0);
+}
+function _undef(val, defaultVal) {
+	return val === undefined ? defaultVal : val;
+}
+function _invalidUrl(url) {
+	return !url || /[<>"]/.test(url);
+}
+function _addParam(url, param) {
+	return url.indexOf('?') >= 0 ? url + '&' + param : url + '?' + param;
+}
+function _extend(child, parent, proto) {
+	if (!proto) {
+		proto = parent;
+		parent = null;
+	}
+	var childProto;
+	if (parent) {
+		var fn = function () {};
+		fn.prototype = parent.prototype;
+		childProto = new fn();
+		_each(proto, function(key, val) {
+			childProto[key] = val;
+		});
+	} else {
+		childProto = proto;
+	}
+	childProto.constructor = child;
+	child.prototype = childProto;
+	child.parent = parent ? parent.prototype : null;
+}
+function _json(text) {
+	var match;
+	if ((match = /\{[\s\S]*\}|\[[\s\S]*\]/.exec(text))) {
+		text = match[0];
+	}
+	var cx = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g;
+	cx.lastIndex = 0;
+	if (cx.test(text)) {
+		text = text.replace(cx, function (a) {
+			return '\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
+		});
+	}
+	if (/^[\],:{}\s]*$/.
+	test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@').
+	replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']').
+	replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
+		return eval('(' + text + ')');
+	}
+	throw 'JSON parse error';
+}
+var _round = Math.round;
+var K = {
+	DEBUG : false,
+	VERSION : _VERSION,
+	IE : _IE,
+	GECKO : _GECKO,
+	WEBKIT : _WEBKIT,
+	OPERA : _OPERA,
+	V : _V,
+	TIME : _TIME,
+	each : _each,
+	isArray : _isArray,
+	isFunction : _isFunction,
+	inArray : _inArray,
+	inString : _inString,
+	trim : _trim,
+	addUnit : _addUnit,
+	removeUnit : _removeUnit,
+	escape : _escape,
+	unescape : _unescape,
+	toCamel : _toCamel,
+	toHex : _toHex,
+	toMap : _toMap,
+	toArray : _toArray,
+	undef : _undef,
+	invalidUrl : _invalidUrl,
+	addParam : _addParam,
+	extend : _extend,
+	json : _json
+};
+var _INLINE_TAG_MAP = _toMap('a,abbr,acronym,b,basefont,bdo,big,br,button,cite,code,del,dfn,em,font,i,img,input,ins,kbd,label,map,q,s,samp,select,small,span,strike,strong,sub,sup,textarea,tt,u,var'),
+	_BLOCK_TAG_MAP = _toMap('address,applet,blockquote,body,center,dd,dir,div,dl,dt,fieldset,form,frameset,h1,h2,h3,h4,h5,h6,head,hr,html,iframe,ins,isindex,li,map,menu,meta,noframes,noscript,object,ol,p,pre,script,style,table,tbody,td,tfoot,th,thead,title,tr,ul'),
+	_SINGLE_TAG_MAP = _toMap('area,base,basefont,br,col,frame,hr,img,input,isindex,link,meta,param,embed'),
+	_STYLE_TAG_MAP = _toMap('b,basefont,big,del,em,font,i,s,small,span,strike,strong,sub,sup,u'),
+	_CONTROL_TAG_MAP = _toMap('img,table,input,textarea,button'),
+	_PRE_TAG_MAP = _toMap('pre,style,script'),
+	_NOSPLIT_TAG_MAP = _toMap('html,head,body,td,tr,table,ol,ul,li'),
+	_AUTOCLOSE_TAG_MAP = _toMap('colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr'),
+	_FILL_ATTR_MAP = _toMap('checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected'),
+	_VALUE_TAG_MAP = _toMap('input,button,textarea,select');
+function _getBasePath() {
+	var els = document.getElementsByTagName('script'), src;
+	for (var i = 0, len = els.length; i < len; i++) {
+		src = els[i].src || '';
+		if (/kindeditor[\w\-\.]*\.js/.test(src)) {
+			return src.substring(0, src.lastIndexOf('/') + 1);
+		}
+	}
+	return '';
+}
+K.basePath = _getBasePath();
+K.options = {
+	designMode : true,
+	fullscreenMode : false,
+	filterMode : true,
+	wellFormatMode : true,
+	shadowMode : true,
+	loadStyleMode : true,
+	basePath : K.basePath,
+	themesPath : K.basePath + 'themes/',
+	langPath : K.basePath + 'lang/',
+	pluginsPath : K.basePath + 'plugins/',
+	themeType : 'default',
+	langType : 'zh_CN',
+	urlType : '',
+	newlineTag : 'p',
+	resizeType : 2,
+	syncType : 'form',
+	pasteType : 2,
+	dialogAlignType : 'page',
+	useContextmenu : true,
+	fullscreenShortcut : false,
+	bodyClass : 'ke-content',
+	indentChar : '\t',
+	cssPath : '',
+	cssData : '',
+	minWidth : 650,
+	minHeight : 100,
+	minChangeSize : 50,
+	zIndex : 811213,
+	items : [
+		'source', '|', 'undo', 'redo', '|', 'preview', 'print', 'template', 'code', 'cut', 'copy', 'paste',
+		'plainpaste', 'wordpaste', '|', 'justifyleft', 'justifycenter', 'justifyright',
+		'justifyfull', 'insertorderedlist', 'insertunorderedlist', 'indent', 'outdent', 'subscript',
+		'superscript', 'clearhtml', 'quickformat', 'selectall', '|', 'fullscreen', '/',
+		'formatblock', 'fontname', 'fontsize', '|', 'forecolor', 'hilitecolor', 'bold',
+		'italic', 'underline', 'strikethrough', 'lineheight', 'removeformat', '|', 'image', 'multiimage',
+		'flash', 'media', 'insertfile', 'table', 'hr', 'emoticons', 'baidumap', 'pagebreak',
+		'anchor', 'link', 'unlink', '|', 'about'
+	],
+	noDisableItems : ['source', 'fullscreen'],
+	colorTable : [
+		['#E53333', '#E56600', '#FF9900', '#64451D', '#DFC5A4', '#FFE500'],
+		['#009900', '#006600', '#99BB00', '#B8D100', '#60D978', '#00D5FF'],
+		['#337FE5', '#003399', '#4C33E5', '#9933E5', '#CC33E5', '#EE33EE'],
+		['#FFFFFF', '#CCCCCC', '#999999', '#666666', '#333333', '#000000']
+	],
+	fontSizeTable : ['9px', '10px', '12px', '14px', '16px', '18px', '24px', '32px'],
+	htmlTags : {
+		font : ['id', 'class', 'color', 'size', 'face', '.background-color'],
+		span : [
+			'id', 'class', '.color', '.background-color', '.font-size', '.font-family', '.background',
+			'.font-weight', '.font-style', '.text-decoration', '.vertical-align', '.line-height'
+		],
+		div : [
+			'id', 'class', 'align', '.border', '.margin', '.padding', '.text-align', '.color',
+			'.background-color', '.font-size', '.font-family', '.font-weight', '.background',
+			'.font-style', '.text-decoration', '.vertical-align', '.margin-left'
+		],
+		table: [
+			'id', 'class', 'border', 'cellspacing', 'cellpadding', 'width', 'height', 'align', 'bordercolor',
+			'.padding', '.margin', '.border', 'bgcolor', '.text-align', '.color', '.background-color',
+			'.font-size', '.font-family', '.font-weight', '.font-style', '.text-decoration', '.background',
+			'.width', '.height', '.border-collapse'
+		],
+		'td,th': [
+			'id', 'class', 'align', 'valign', 'width', 'height', 'colspan', 'rowspan', 'bgcolor',
+			'.text-align', '.color', '.background-color', '.font-size', '.font-family', '.font-weight',
+			'.font-style', '.text-decoration', '.vertical-align', '.background', '.border'
+		],
+		a : ['id', 'class', 'href', 'target', 'name'],
+		embed : ['id', 'class', 'src', 'width', 'height', 'type', 'loop', 'autostart', 'quality', '.width', '.height', 'align', 'allowscriptaccess'],
+		img : ['id', 'class', 'src', 'width', 'height', 'border', 'alt', 'title', 'align', '.width', '.height', '.border'],
+		'p,ol,ul,li,blockquote,h1,h2,h3,h4,h5,h6' : [
+			'id', 'class', 'align', '.text-align', '.color', '.background-color', '.font-size', '.font-family', '.background',
+			'.font-weight', '.font-style', '.text-decoration', '.vertical-align', '.text-indent', '.margin-left'
+		],
+		pre : ['id', 'class'],
+		hr : ['id', 'class', '.page-break-after'],
+		'br,tbody,tr,strong,b,sub,sup,em,i,u,strike,s,del' : ['id', 'class'],
+		iframe : ['id', 'class', 'src', 'frameborder', 'width', 'height', '.width', '.height']
+	},
+	layout : '<div class="container"><div class="toolbar"></div><div class="edit"></div><div class="statusbar"></div></div>'
+};
+var _useCapture = false;
+var _INPUT_KEY_MAP = _toMap('8,9,13,32,46,48..57,59,61,65..90,106,109..111,188,190..192,219..222');
+var _CURSORMOVE_KEY_MAP = _toMap('33..40');
+var _CHANGE_KEY_MAP = {};
+_each(_INPUT_KEY_MAP, function(key, val) {
+	_CHANGE_KEY_MAP[key] = val;
+});
+_each(_CURSORMOVE_KEY_MAP, function(key, val) {
+	_CHANGE_KEY_MAP[key] = val;
+});
+function _bindEvent(el, type, fn) {
+	if (el.addEventListener){
+		el.addEventListener(type, fn, _useCapture);
+	} else if (el.attachEvent){
+		el.attachEvent('on' + type, fn);
+	}
+}
+function _unbindEvent(el, type, fn) {
+	if (el.removeEventListener){
+		el.removeEventListener(type, fn, _useCapture);
+	} else if (el.detachEvent){
+		el.detachEvent('on' + type, fn);
+	}
+}
+var _EVENT_PROPS = ('altKey,attrChange,attrName,bubbles,button,cancelable,charCode,clientX,clientY,ctrlKey,currentTarget,' +
+	'data,detail,eventPhase,fromElement,handler,keyCode,metaKey,newValue,offsetX,offsetY,originalTarget,pageX,' +
+	'pageY,prevValue,relatedNode,relatedTarget,screenX,screenY,shiftKey,srcElement,target,toElement,view,wheelDelta,which').split(',');
+function KEvent(el, event) {
+	this.init(el, event);
+}
+_extend(KEvent, {
+	init : function(el, event) {
+		var self = this, doc = el.ownerDocument || el.document || el;
+		self.event = event;
+		_each(_EVENT_PROPS, function(key, val) {
+			self[val] = event[val];
+		});
+		if (!self.target) {
+			self.target = self.srcElement || doc;
+		}
+		if (self.target.nodeType === 3) {
+			self.target = self.target.parentNode;
+		}
+		if (!self.relatedTarget && self.fromElement) {
+			self.relatedTarget = self.fromElement === self.target ? self.toElement : self.fromElement;
+		}
+		if (self.pageX == null && self.clientX != null) {
+			var d = doc.documentElement, body = doc.body;
+			self.pageX = self.clientX + (d && d.scrollLeft || body && body.scrollLeft || 0) - (d && d.clientLeft || body && body.clientLeft || 0);
+			self.pageY = self.clientY + (d && d.scrollTop  || body && body.scrollTop  || 0) - (d && d.clientTop  || body && body.clientTop  || 0);
+		}
+		if (!self.which && ((self.charCode || self.charCode === 0) ? self.charCode : self.keyCode)) {
+			self.which = self.charCode || self.keyCode;
+		}
+		if (!self.metaKey && self.ctrlKey) {
+			self.metaKey = self.ctrlKey;
+		}
+		if (!self.which && self.button !== undefined) {
+			self.which = (self.button & 1 ? 1 : (self.button & 2 ? 3 : (self.button & 4 ? 2 : 0)));
+		}
+		switch (self.which) {
+		case 186 :
+			self.which = 59;
+			break;
+		case 187 :
+		case 107 :
+		case 43 :
+			self.which = 61;
+			break;
+		case 189 :
+		case 45 :
+			self.which = 109;
+			break;
+		case 42 :
+			self.which = 106;
+			break;
+		case 47 :
+			self.which = 111;
+			break;
+		case 78 :
+			self.which = 110;
+			break;
+		}
+		if (self.which >= 96 && self.which <= 105) {
+			self.which -= 48;
+		}
+	},
+	preventDefault : function() {
+		var ev = this.event;
+		if (ev.preventDefault) {
+			ev.preventDefault();
+		} else {
+			ev.returnValue = false;
+		}
+	},
+	stopPropagation : function() {
+		var ev = this.event;
+		if (ev.stopPropagation) {
+			ev.stopPropagation();
+		} else {
+			ev.cancelBubble = true;
+		}
+	},
+	stop : function() {
+		this.preventDefault();
+		this.stopPropagation();
+	}
+});
+var _eventExpendo = 'kindeditor_' + _TIME, _eventId = 0, _eventData = {};
+function _getId(el) {
+	return el[_eventExpendo] || null;
+}
+function _setId(el) {
+	el[_eventExpendo] = ++_eventId;
+	return _eventId;
+}
+function _removeId(el) {
+	try {
+		delete el[_eventExpendo];
+	} catch(e) {
+		if (el.removeAttribute) {
+			el.removeAttribute(_eventExpendo);
+		}
+	}
+}
+function _bind(el, type, fn) {
+	if (type.indexOf(',') >= 0) {
+		_each(type.split(','), function() {
+			_bind(el, this, fn);
+		});
+		return;
+	}
+	var id = _getId(el);
+	if (!id) {
+		id = _setId(el);
+	}
+	if (_eventData[id] === undefined) {
+		_eventData[id] = {};
+	}
+	var events = _eventData[id][type];
+	if (events && events.length > 0) {
+		_unbindEvent(el, type, events[0]);
+	} else {
+		_eventData[id][type] = [];
+		_eventData[id].el = el;
+	}
+	events = _eventData[id][type];
+	if (events.length === 0) {
+		events[0] = function(e) {
+			var kevent = e ? new KEvent(el, e) : undefined;
+			_each(events, function(i, event) {
+				if (i > 0 && event) {
+					event.call(el, kevent);
+				}
+			});
+		};
+	}
+	if (_inArray(fn, events) < 0) {
+		events.push(fn);
+	}
+	_bindEvent(el, type, events[0]);
+}
+function _unbind(el, type, fn) {
+	if (type && type.indexOf(',') >= 0) {
+		_each(type.split(','), function() {
+			_unbind(el, this, fn);
+		});
+		return;
+	}
+	var id = _getId(el);
+	if (!id) {
+		return;
+	}
+	if (type === undefined) {
+		if (id in _eventData) {
+			_each(_eventData[id], function(key, events) {
+				if (key != 'el' && events.length > 0) {
+					_unbindEvent(el, key, events[0]);
+				}
+			});
+			delete _eventData[id];
+			_removeId(el);
+		}
+		return;
+	}
+	if (!_eventData[id]) {
+		return;
+	}
+	var events = _eventData[id][type];
+	if (events && events.length > 0) {
+		if (fn === undefined) {
+			_unbindEvent(el, type, events[0]);
+			delete _eventData[id][type];
+		} else {
+			_each(events, function(i, event) {
+				if (i > 0 && event === fn) {
+					events.splice(i, 1);
+				}
+			});
+			if (events.length == 1) {
+				_unbindEvent(el, type, events[0]);
+				delete _eventData[id][type];
+			}
+		}
+		var count = 0;
+		_each(_eventData[id], function() {
+			count++;
+		});
+		if (count < 2) {
+			delete _eventData[id];
+			_removeId(el);
+		}
+	}
+}
+function _fire(el, type) {
+	if (type.indexOf(',') >= 0) {
+		_each(type.split(','), function() {
+			_fire(el, this);
+		});
+		return;
+	}
+	var id = _getId(el);
+	if (!id) {
+		return;
+	}
+	var events = _eventData[id][type];
+	if (_eventData[id] && events && events.length > 0) {
+		events[0]();
+	}
+}
+function _ctrl(el, key, fn) {
+	var self = this;
+	key = /^\d{2,}$/.test(key) ? key : key.toUpperCase().charCodeAt(0);
+	_bind(el, 'keydown', function(e) {
+		if (e.ctrlKey && e.which == key && !e.shiftKey && !e.altKey) {
+			fn.call(el);
+			e.stop();
+		}
+	});
+}
+var _readyFinished = false;
+function _ready(fn) {
+	if (_readyFinished) {
+		fn(KindEditor);
+		return;
+	}
+	var loaded = false;
+	function readyFunc() {
+		if (!loaded) {
+			loaded = true;
+			fn(KindEditor);
+			_readyFinished = true;
+		}
+	}
+	function ieReadyFunc() {
+		if (!loaded) {
+			try {
+				document.documentElement.doScroll('left');
+			} catch(e) {
+				setTimeout(ieReadyFunc, 100);
+				return;
+			}
+			readyFunc();
+		}
+	}
+	function ieReadyStateFunc() {
+		if (document.readyState === 'complete') {
+			readyFunc();
+		}
+	}
+	if (document.addEventListener) {
+		_bind(document, 'DOMContentLoaded', readyFunc);
+	} else if (document.attachEvent) {
+		_bind(document, 'readystatechange', ieReadyStateFunc);
+		var toplevel = false;
+		try {
+			toplevel = window.frameElement == null;
+		} catch(e) {}
+		if (document.documentElement.doScroll && toplevel) {
+			ieReadyFunc();
+		}
+	}
+	_bind(window, 'load', readyFunc);
+}
+if (_IE) {
+	window.attachEvent('onunload', function() {
+		_each(_eventData, function(key, events) {
+			if (events.el) {
+				_unbind(events.el);
+			}
+		});
+	});
+}
+K.ctrl = _ctrl;
+K.ready = _ready;
+function _getCssList(css) {
+	var list = {},
+		reg = /\s*([\w\-]+)\s*:([^;]*)(;|$)/g,
+		match;
+	while ((match = reg.exec(css))) {
+		var key = _trim(match[1].toLowerCase()),
+			val = _trim(_toHex(match[2]));
+		list[key] = val;
+	}
+	return list;
+}
+function _getAttrList(tag) {
+	var list = {},
+		reg = /\s+(?:([\w\-:]+)|(?:([\w\-:]+)=([^\s"'<>]+))|(?:([\w\-:"]+)="([^"]*)")|(?:([\w\-:"]+)='([^']*)'))(?=(?:\s|\/|>)+)/g,
+		match;
+	while ((match = reg.exec(tag))) {
+		var key = (match[1] || match[2] || match[4] || match[6]).toLowerCase(),
+			val = (match[2] ? match[3] : (match[4] ? match[5] : match[7])) || '';
+		list[key] = val;
+	}
+	return list;
+}
+function _addClassToTag(tag, className) {
+	if (/\s+class\s*=/.test(tag)) {
+		tag = tag.replace(/(\s+class=["']?)([^"']*)(["']?[\s>])/, function($0, $1, $2, $3) {
+			if ((' ' + $2 + ' ').indexOf(' ' + className + ' ') < 0) {
+				return $2 === '' ? $1 + className + $3 : $1 + $2 + ' ' + className + $3;
+			} else {
+				return $0;
+			}
+		});
+	} else {
+		tag = tag.substr(0, tag.length - 1) + ' class="' + className + '">';
+	}
+	return tag;
+}
+function _formatCss(css) {
+	var str = '';
+	_each(_getCssList(css), function(key, val) {
+		str += key + ':' + val + ';';
+	});
+	return str;
+}
+function _formatUrl(url, mode, host, pathname) {
+	mode = _undef(mode, '').toLowerCase();
+	if (url.substr(0, 5) != 'data:') {
+		url = url.replace(/([^:])\/\//g, '$1/');
+	}
+	if (_inArray(mode, ['absolute', 'relative', 'domain']) < 0) {
+		return url;
+	}
+	host = host || location.protocol + '//' + location.host;
+	if (pathname === undefined) {
+		var m = location.pathname.match(/^(\/.*)\//);
+		pathname = m ? m[1] : '';
+	}
+	var match;
+	if ((match = /^(\w+:\/\/[^\/]*)/.exec(url))) {
+		if (match[1] !== host) {
+			return url;
+		}
+	} else if (/^\w+:/.test(url)) {
+		return url;
+	}
+	function getRealPath(path) {
+		var parts = path.split('/'), paths = [];
+		for (var i = 0, len = parts.length; i < len; i++) {
+			var part = parts[i];
+			if (part == '..') {
+				if (paths.length > 0) {
+					paths.pop();
+				}
+			} else if (part !== '' && part != '.') {
+				paths.push(part);
+			}
+		}
+		return '/' + paths.join('/');
+	}
+	if (/^\//.test(url)) {
+		url = host + getRealPath(url.substr(1));
+	} else if (!/^\w+:\/\//.test(url)) {
+		url = host + getRealPath(pathname + '/' + url);
+	}
+	function getRelativePath(path, depth) {
+		if (url.substr(0, path.length) === path) {
+			var arr = [];
+			for (var i = 0; i < depth; i++) {
+				arr.push('..');
+			}
+			var prefix = '.';
+			if (arr.length > 0) {
+				prefix += '/' + arr.join('/');
+			}
+			if (pathname == '/') {
+				prefix += '/';
+			}
+			return prefix + url.substr(path.length);
+		} else {
+			if ((match = /^(.*)\//.exec(path))) {
+				return getRelativePath(match[1], ++depth);
+			}
+		}
+	}
+	if (mode === 'relative') {
+		url = getRelativePath(host + pathname, 0).substr(2);
+	} else if (mode === 'absolute') {
+		if (url.substr(0, host.length) === host) {
+			url = url.substr(host.length);
+		}
+	}
+	return url;
+}
+function _formatHtml(html, htmlTags, urlType, wellFormatted, indentChar) {
+	if (html == null) {
+		html = '';
+	}
+	urlType = urlType || '';
+	wellFormatted = _undef(wellFormatted, false);
+	indentChar = _undef(indentChar, '\t');
+	var fontSizeList = 'xx-small,x-small,small,medium,large,x-large,xx-large'.split(',');
+	html = html.replace(/(<(?:pre|pre\s[^>]*)>)([\s\S]*?)(<\/pre>)/ig, function($0, $1, $2, $3) {
+		return $1 + $2.replace(/<(?:br|br\s[^>]*)>/ig, '\n') + $3;
+	});
+	html = html.replace(/<(?:br|br\s[^>]*)\s*\/?>\s*<\/p>/ig, '</p>');
+	html = html.replace(/(<(?:p|p\s[^>]*)>)\s*(<\/p>)/ig, '$1<br />$2');
+	html = html.replace(/\u200B/g, '');
+	html = html.replace(/\u00A9/g, '&copy;');
+	html = html.replace(/\u00AE/g, '&reg;');
+	html = html.replace(/<[^>]+/g, function($0) {
+		return $0.replace(/\s+/g, ' ');
+	});
+	var htmlTagMap = {};
+	if (htmlTags) {
+		_each(htmlTags, function(key, val) {
+			var arr = key.split(',');
+			for (var i = 0, len = arr.length; i < len; i++) {
+				htmlTagMap[arr[i]] = _toMap(val);
+			}
+		});
+		if (!htmlTagMap.script) {
+			html = html.replace(/(<(?:script|script\s[^>]*)>)([\s\S]*?)(<\/script>)/ig, '');
+		}
+		if (!htmlTagMap.style) {
+			html = html.replace(/(<(?:style|style\s[^>]*)>)([\s\S]*?)(<\/style>)/ig, '');
+		}
+	}
+	var re = /(\s*)<(\/)?([\w\-:]+)((?:\s+|(?:\s+[\w\-:]+)|(?:\s+[\w\-:]+=[^\s"'<>]+)|(?:\s+[\w\-:"]+="[^"]*")|(?:\s+[\w\-:"]+='[^']*'))*)(\/)?>(\s*)/g;
+	var tagStack = [];
+	html = html.replace(re, function($0, $1, $2, $3, $4, $5, $6) {
+		var full = $0,
+			startNewline = $1 || '',
+			startSlash = $2 || '',
+			tagName = $3.toLowerCase(),
+			attr = $4 || '',
+			endSlash = $5 ? ' ' + $5 : '',
+			endNewline = $6 || '';
+		if (htmlTags && !htmlTagMap[tagName]) {
+			return '';
+		}
+		if (endSlash === '' && _SINGLE_TAG_MAP[tagName]) {
+			endSlash = ' /';
+		}
+		if (_INLINE_TAG_MAP[tagName]) {
+			if (startNewline) {
+				startNewline = ' ';
+			}
+			if (endNewline) {
+				endNewline = ' ';
+			}
+		}
+		if (_PRE_TAG_MAP[tagName]) {
+			if (startSlash) {
+				endNewline = '\n';
+			} else {
+				startNewline = '\n';
+			}
+		}
+		if (wellFormatted && tagName == 'br') {
+			endNewline = '\n';
+		}
+		if (_BLOCK_TAG_MAP[tagName] && !_PRE_TAG_MAP[tagName]) {
+			if (wellFormatted) {
+				if (startSlash && tagStack.length > 0 && tagStack[tagStack.length - 1] === tagName) {
+					tagStack.pop();
+				} else {
+					tagStack.push(tagName);
+				}
+				startNewline = '\n';
+				endNewline = '\n';
+				for (var i = 0, len = startSlash ? tagStack.length : tagStack.length - 1; i < len; i++) {
+					startNewline += indentChar;
+					if (!startSlash) {
+						endNewline += indentChar;
+					}
+				}
+				if (endSlash) {
+					tagStack.pop();
+				} else if (!startSlash) {
+					endNewline += indentChar;
+				}
+			} else {
+				startNewline = endNewline = '';
+			}
+		}
+		if (attr !== '') {
+			var attrMap = _getAttrList(full);
+			if (tagName === 'font') {
+				var fontStyleMap = {}, fontStyle = '';
+				_each(attrMap, function(key, val) {
+					if (key === 'color') {
+						fontStyleMap.color = val;
+						delete attrMap[key];
+					}
+					if (key === 'size') {
+						fontStyleMap['font-size'] = fontSizeList[parseInt(val, 10) - 1] || '';
+						delete attrMap[key];
+					}
+					if (key === 'face') {
+						fontStyleMap['font-family'] = val;
+						delete attrMap[key];
+					}
+					if (key === 'style') {
+						fontStyle = val;
+					}
+				});
+				if (fontStyle && !/;$/.test(fontStyle)) {
+					fontStyle += ';';
+				}
+				_each(fontStyleMap, function(key, val) {
+					if (val === '') {
+						return;
+					}
+					if (/\s/.test(val)) {
+						val = "'" + val + "'";
+					}
+					fontStyle += key + ':' + val + ';';
+				});
+				attrMap.style = fontStyle;
+			}
+			_each(attrMap, function(key, val) {
+				if (_FILL_ATTR_MAP[key]) {
+					attrMap[key] = key;
+				}
+				if (_inArray(key, ['src', 'href']) >= 0) {
+					attrMap[key] = _formatUrl(val, urlType);
+				}
+				if (htmlTags && key !== 'style' && !htmlTagMap[tagName]['*'] && !htmlTagMap[tagName][key] ||
+					tagName === 'body' && key === 'contenteditable' ||
+					/^kindeditor_\d+$/.test(key)) {
+					delete attrMap[key];
+				}
+				if (key === 'style' && val !== '') {
+					var styleMap = _getCssList(val);
+					_each(styleMap, function(k, v) {
+						if (htmlTags && !htmlTagMap[tagName].style && !htmlTagMap[tagName]['.' + k]) {
+							delete styleMap[k];
+						}
+					});
+					var style = '';
+					_each(styleMap, function(k, v) {
+						style += k + ':' + v + ';';
+					});
+					attrMap.style = style;
+				}
+			});
+			attr = '';
+			_each(attrMap, function(key, val) {
+				if (key === 'style' && val === '') {
+					return;
+				}
+				val = val.replace(/"/g, '&quot;');
+				attr += ' ' + key + '="' + val + '"';
+			});
+		}
+		if (tagName === 'font') {
+			tagName = 'span';
+		}
+		return startNewline + '<' + startSlash + tagName + attr + endSlash + '>' + endNewline;
+	});
+	html = html.replace(/(<(?:pre|pre\s[^>]*)>)([\s\S]*?)(<\/pre>)/ig, function($0, $1, $2, $3) {
+		return $1 + $2.replace(/\n/g, '<span id="__kindeditor_pre_newline__">\n') + $3;
+	});
+	html = html.replace(/\n\s*\n/g, '\n');
+	html = html.replace(/<span id="__kindeditor_pre_newline__">\n/g, '\n');
+	return _trim(html);
+}
+function _clearMsWord(html, htmlTags) {
+	html = html.replace(/<meta[\s\S]*?>/ig, '')
+		.replace(/<![\s\S]*?>/ig, '')
+		.replace(/<style[^>]*>[\s\S]*?<\/style>/ig, '')
+		.replace(/<script[^>]*>[\s\S]*?<\/script>/ig, '')
+		.replace(/<w:[^>]+>[\s\S]*?<\/w:[^>]+>/ig, '')
+		.replace(/<o:[^>]+>[\s\S]*?<\/o:[^>]+>/ig, '')
+		.replace(/<xml>[\s\S]*?<\/xml>/ig, '')
+		.replace(/<(?:table|td)[^>]*>/ig, function(full) {
+			return full.replace(/border-bottom:([#\w\s]+)/ig, 'border:$1');
+		});
+	return _formatHtml(html, htmlTags);
+}
+function _mediaType(src) {
+	if (/\.(rm|rmvb)(\?|$)/i.test(src)) {
+		return 'audio/x-pn-realaudio-plugin';
+	}
+	if (/\.(swf|flv)(\?|$)/i.test(src)) {
+		return 'application/x-shockwave-flash';
+	}
+	return 'video/x-ms-asf-plugin';
+}
+function _mediaClass(type) {
+	if (/realaudio/i.test(type)) {
+		return 'ke-rm';
+	}
+	if (/flash/i.test(type)) {
+		return 'ke-flash';
+	}
+	return 'ke-media';
+}
+function _mediaAttrs(srcTag) {
+	return _getAttrList(unescape(srcTag));
+}
+function _mediaEmbed(attrs) {
+	var html = '<embed ';
+	_each(attrs, function(key, val) {
+		html += key + '="' + val + '" ';
+	});
+	html += '/>';
+	return html;
+}
+function _mediaImg(blankPath, attrs) {
+	var width = attrs.width,
+		height = attrs.height,
+		type = attrs.type || _mediaType(attrs.src),
+		srcTag = _mediaEmbed(attrs),
+		style = '';
+	if (/\D/.test(width)) {
+		style += 'width:' + width + ';';
+	} else if (width > 0) {
+		style += 'width:' + width + 'px;';
+	}
+	if (/\D/.test(height)) {
+		style += 'height:' + height + ';';
+	} else if (height > 0) {
+		style += 'height:' + height + 'px;';
+	}
+	var html = '<img class="' + _mediaClass(type) + '" src="' + blankPath + '" ';
+	if (style !== '') {
+		html += 'style="' + style + '" ';
+	}
+	html += 'data-ke-tag="' + escape(srcTag) + '" alt="" />';
+	return html;
+}
+function _tmpl(str, data) {
+	var fn = new Function("obj",
+		"var p=[],print=function(){p.push.apply(p,arguments);};" +
+		"with(obj){p.push('" +
+		str.replace(/[\r\t\n]/g, " ")
+			.split("<%").join("\t")
+			.replace(/((^|%>)[^\t]*)'/g, "$1\r")
+			.replace(/\t=(.*?)%>/g, "',$1,'")
+			.split("\t").join("');")
+			.split("%>").join("p.push('")
+			.split("\r").join("\\'") + "');}return p.join('');");
+	return data ? fn(data) : fn;
+}
+K.formatUrl = _formatUrl;
+K.formatHtml = _formatHtml;
+K.getCssList = _getCssList;
+K.getAttrList = _getAttrList;
+K.mediaType = _mediaType;
+K.mediaAttrs = _mediaAttrs;
+K.mediaEmbed = _mediaEmbed;
+K.mediaImg = _mediaImg;
+K.clearMsWord = _clearMsWord;
+K.tmpl = _tmpl;
+function _contains(nodeA, nodeB) {
+	if (nodeA.nodeType == 9 && nodeB.nodeType != 9) {
+		return true;
+	}
+	while ((nodeB = nodeB.parentNode)) {
+		if (nodeB == nodeA) {
+			return true;
+		}
+	}
+	return false;
+}
+var _getSetAttrDiv = document.createElement('div');
+_getSetAttrDiv.setAttribute('className', 't');
+var _GET_SET_ATTRIBUTE = _getSetAttrDiv.className !== 't';
+function _getAttr(el, key) {
+	key = key.toLowerCase();
+	var val = null;
+	if (!_GET_SET_ATTRIBUTE && el.nodeName.toLowerCase() != 'script') {
+		var div = el.ownerDocument.createElement('div');
+		div.appendChild(el.cloneNode(false));
+		var list = _getAttrList(_unescape(div.innerHTML));
+		if (key in list) {
+			val = list[key];
+		}
+	} else {
+		try {
+			val = el.getAttribute(key, 2);
+		} catch(e) {
+			val = el.getAttribute(key, 1);
+		}
+	}
+	if (key === 'style' && val !== null) {
+		val = _formatCss(val);
+	}
+	return val;
+}
+function _queryAll(expr, root) {
+	var exprList = expr.split(',');
+	if (exprList.length > 1) {
+		var mergedResults = [];
+		_each(exprList, function() {
+			_each(_queryAll(this, root), function() {
+				if (_inArray(this, mergedResults) < 0) {
+					mergedResults.push(this);
+				}
+			});
+		});
+		return mergedResults;
+	}
+	root = root || document;
+	function escape(str) {
+		if (typeof str != 'string') {
+			return str;
+		}
+		return str.replace(/([^\w\-])/g, '\\$1');
+	}
+	function stripslashes(str) {
+		return str.replace(/\\/g, '');
+	}
+	function cmpTag(tagA, tagB) {
+		return tagA === '*' || tagA.toLowerCase() === escape(tagB.toLowerCase());
+	}
+	function byId(id, tag, root) {
+		var arr = [],
+			doc = root.ownerDocument || root,
+			el = doc.getElementById(stripslashes(id));
+		if (el) {
+			if (cmpTag(tag, el.nodeName) && _contains(root, el)) {
+				arr.push(el);
+			}
+		}
+		return arr;
+	}
+	function byClass(className, tag, root) {
+		var doc = root.ownerDocument || root, arr = [], els, i, len, el;
+		if (root.getElementsByClassName) {
+			els = root.getElementsByClassName(stripslashes(className));
+			for (i = 0, len = els.length; i < len; i++) {
+				el = els[i];
+				if (cmpTag(tag, el.nodeName)) {
+					arr.push(el);
+				}
+			}
+		} else if (doc.querySelectorAll) {
+			els = doc.querySelectorAll((root.nodeName !== '#document' ? root.nodeName + ' ' : '') + tag + '.' + className);
+			for (i = 0, len = els.length; i < len; i++) {
+				el = els[i];
+				if (_contains(root, el)) {
+					arr.push(el);
+				}
+			}
+		} else {
+			els = root.getElementsByTagName(tag);
+			className = ' ' + className + ' ';
+			for (i = 0, len = els.length; i < len; i++) {
+				el = els[i];
+				if (el.nodeType == 1) {
+					var cls = el.className;
+					if (cls && (' ' + cls + ' ').indexOf(className) > -1) {
+						arr.push(el);
+					}
+				}
+			}
+		}
+		return arr;
+	}
+	function byName(name, tag, root) {
+		var arr = [], doc = root.ownerDocument || root,
+			els = doc.getElementsByName(stripslashes(name)), el;
+		for (var i = 0, len = els.length; i < len; i++) {
+			el = els[i];
+			if (cmpTag(tag, el.nodeName) && _contains(root, el)) {
+				if (el.getAttribute('name') !== null) {
+					arr.push(el);
+				}
+			}
+		}
+		return arr;
+	}
+	function byAttr(key, val, tag, root) {
+		var arr = [], els = root.getElementsByTagName(tag), el;
+		for (var i = 0, len = els.length; i < len; i++) {
+			el = els[i];
+			if (el.nodeType == 1) {
+				if (val === null) {
+					if (_getAttr(el, key) !== null) {
+						arr.push(el);
+					}
+				} else {
+					if (val === escape(_getAttr(el, key))) {
+						arr.push(el);
+					}
+				}
+			}
+		}
+		return arr;
+	}
+	function select(expr, root) {
+		var arr = [], matches;
+		matches = /^((?:\\.|[^.#\s\[<>])+)/.exec(expr);
+		var tag = matches ? matches[1] : '*';
+		if ((matches = /#((?:[\w\-]|\\.)+)$/.exec(expr))) {
+			arr = byId(matches[1], tag, root);
+		} else if ((matches = /\.((?:[\w\-]|\\.)+)$/.exec(expr))) {
+			arr = byClass(matches[1], tag, root);
+		} else if ((matches = /\[((?:[\w\-]|\\.)+)\]/.exec(expr))) {
+			arr = byAttr(matches[1].toLowerCase(), null, tag, root);
+		} else if ((matches = /\[((?:[\w\-]|\\.)+)\s*=\s*['"]?((?:\\.|[^'"]+)+)['"]?\]/.exec(expr))) {
+			var key = matches[1].toLowerCase(), val = matches[2];
+			if (key === 'id') {
+				arr = byId(val, tag, root);
+			} else if (key === 'class') {
+				arr = byClass(val, tag, root);
+			} else if (key === 'name') {
+				arr = byName(val, tag, root);
+			} else {
+				arr = byAttr(key, val, tag, root);
+			}
+		} else {
+			var els = root.getElementsByTagName(tag), el;
+			for (var i = 0, len = els.length; i < len; i++) {
+				el = els[i];
+				if (el.nodeType == 1) {
+					arr.push(el);
+				}
+			}
+		}
+		return arr;
+	}
+	var parts = [], arr, re = /((?:\\.|[^\s>])+|[\s>])/g;
+	while ((arr = re.exec(expr))) {
+		if (arr[1] !== ' ') {
+			parts.push(arr[1]);
+		}
+	}
+	var results = [];
+	if (parts.length == 1) {
+		return select(parts[0], root);
+	}
+	var isChild = false, part, els, subResults, val, v, i, j, k, length, len, l;
+	for (i = 0, lenth = parts.length; i < lenth; i++) {
+		part = parts[i];
+		if (part === '>') {
+			isChild = true;
+			continue;
+		}
+		if (i > 0) {
+			els = [];
+			for (j = 0, len = results.length; j < len; j++) {
+				val = results[j];
+				subResults = select(part, val);
+				for (k = 0, l = subResults.length; k < l; k++) {
+					v = subResults[k];
+					if (isChild) {
+						if (val === v.parentNode) {
+							els.push(v);
+						}
+					} else {
+						els.push(v);
+					}
+				}
+			}
+			results = els;
+		} else {
+			results = select(part, root);
+		}
+		if (results.length === 0) {
+			return [];
+		}
+	}
+	return results;
+}
+function _query(expr, root) {
+	var arr = _queryAll(expr, root);
+	return arr.length > 0 ? arr[0] : null;
+}
+K.query = _query;
+K.queryAll = _queryAll;
+function _get(val) {
+	return K(val)[0];
+}
+function _getDoc(node) {
+	if (!node) {
+		return document;
+	}
+	return node.ownerDocument || node.document || node;
+}
+function _getWin(node) {
+	if (!node) {
+		return window;
+	}
+	var doc = _getDoc(node);
+	return doc.parentWindow || doc.defaultView;
+}
+function _setHtml(el, html) {
+	if (el.nodeType != 1) {
+		return;
+	}
+	var doc = _getDoc(el);
+	try {
+		el.innerHTML = '<img id="__kindeditor_temp_tag__" width="0" height="0" style="display:none;" />' + html;
+		var temp = doc.getElementById('__kindeditor_temp_tag__');
+		temp.parentNode.removeChild(temp);
+	} catch(e) {
+		K(el).empty();
+		K('@' + html, doc).each(function() {
+			el.appendChild(this);
+		});
+	}
+}
+function _hasClass(el, cls) {
+	return _inString(cls, el.className, ' ');
+}
+function _setAttr(el, key, val) {
+	if (_IE && _V < 8 && key.toLowerCase() == 'class') {
+		key = 'className';
+	}
+	el.setAttribute(key, '' + val);
+}
+function _removeAttr(el, key) {
+	if (_IE && _V < 8 && key.toLowerCase() == 'class') {
+		key = 'className';
+	}
+	_setAttr(el, key, '');
+	el.removeAttribute(key);
+}
+function _getNodeName(node) {
+	if (!node || !node.nodeName) {
+		return '';
+	}
+	return node.nodeName.toLowerCase();
+}
+function _computedCss(el, key) {
+	var self = this, win = _getWin(el), camelKey = _toCamel(key), val = '';
+	if (win.getComputedStyle) {
+		var style = win.getComputedStyle(el, null);
+		val = style[camelKey] || style.getPropertyValue(key) || el.style[camelKey];
+	} else if (el.currentStyle) {
+		val = el.currentStyle[camelKey] || el.style[camelKey];
+	}
+	return val;
+}
+function _hasVal(node) {
+	return !!_VALUE_TAG_MAP[_getNodeName(node)];
+}
+function _docElement(doc) {
+	doc = doc || document;
+	return _QUIRKS ? doc.body : doc.documentElement;
+}
+function _docHeight(doc) {
+	var el = _docElement(doc);
+	return Math.max(el.scrollHeight, el.clientHeight);
+}
+function _docWidth(doc) {
+	var el = _docElement(doc);
+	return Math.max(el.scrollWidth, el.clientWidth);
+}
+function _getScrollPos(doc) {
+	doc = doc || document;
+	var x, y;
+	if (_IE || _NEWIE || _OPERA) {
+		x = _docElement(doc).scrollLeft;
+		y = _docElement(doc).scrollTop;
+	} else {
+		x = _getWin(doc).scrollX;
+		y = _getWin(doc).scrollY;
+	}
+	return {x : x, y : y};
+}
+function KNode(node) {
+	this.init(node);
+}
+_extend(KNode, {
+	init : function(node) {
+		var self = this;
+		node = _isArray(node) ? node : [node];
+		var length = 0;
+		for (var i = 0, len = node.length; i < len; i++) {
+			if (node[i]) {
+				self[i] = node[i].constructor === KNode ? node[i][0] : node[i];
+				length++;
+			}
+		}
+		self.length = length;
+		self.doc = _getDoc(self[0]);
+		self.name = _getNodeName(self[0]);
+		self.type = self.length > 0 ? self[0].nodeType : null;
+		self.win = _getWin(self[0]);
+	},
+	each : function(fn) {
+		var self = this;
+		for (var i = 0; i < self.length; i++) {
+			if (fn.call(self[i], i, self[i]) === false) {
+				return self;
+			}
+		}
+		return self;
+	},
+	bind : function(type, fn) {
+		this.each(function() {
+			_bind(this, type, fn);
+		});
+		return this;
+	},
+	unbind : function(type, fn) {
+		this.each(function() {
+			_unbind(this, type, fn);
+		});
+		return this;
+	},
+	fire : function(type) {
+		if (this.length < 1) {
+			return this;
+		}
+		_fire(this[0], type);
+		return this;
+	},
+	hasAttr : function(key) {
+		if (this.length < 1) {
+			return false;
+		}
+		return !!_getAttr(this[0], key);
+	},
+	attr : function(key, val) {
+		var self = this;
+		if (key === undefined) {
+			return _getAttrList(self.outer());
+		}
+		if (typeof key === 'object') {
+			_each(key, function(k, v) {
+				self.attr(k, v);
+			});
+			return self;
+		}
+		if (val === undefined) {
+			val = self.length < 1 ? null : _getAttr(self[0], key);
+			return val === null ? '' : val;
+		}
+		self.each(function() {
+			_setAttr(this, key, val);
+		});
+		return self;
+	},
+	removeAttr : function(key) {
+		this.each(function() {
+			_removeAttr(this, key);
+		});
+		return this;
+	},
+	get : function(i) {
+		if (this.length < 1) {
+			return null;
+		}
+		return this[i || 0];
+	},
+	eq : function(i) {
+		if (this.length < 1) {
+			return null;
+		}
+		return this[i] ? new KNode(this[i]) : null;
+	},
+	hasClass : function(cls) {
+		if (this.length < 1) {
+			return false;
+		}
+		return _hasClass(this[0], cls);
+	},
+	addClass : function(cls) {
+		this.each(function() {
+			if (!_hasClass(this, cls)) {
+				this.className = _trim(this.className + ' ' + cls);
+			}
+		});
+		return this;
+	},
+	removeClass : function(cls) {
+		this.each(function() {
+			if (_hasClass(this, cls)) {
+				this.className = _trim(this.className.replace(new RegExp('(^|\\s)' + cls + '(\\s|$)'), ' '));
+			}
+		});
+		return this;
+	},
+	html : function(val) {
+		var self = this;
+		if (val === undefined) {
+			if (self.length < 1 || self.type != 1) {
+				return '';
+			}
+			return _formatHtml(self[0].innerHTML);
+		}
+		self.each(function() {
+			_setHtml(this, val);
+		});
+		return self;
+	},
+	text : function() {
+		var self = this;
+		if (self.length < 1) {
+			return '';
+		}
+		return _IE ? self[0].innerText : self[0].textContent;
+	},
+	hasVal : function() {
+		if (this.length < 1) {
+			return false;
+		}
+		return _hasVal(this[0]);
+	},
+	val : function(val) {
+		var self = this;
+		if (val === undefined) {
+			if (self.length < 1) {
+				return '';
+			}
+			return self.hasVal() ? self[0].value : self.attr('value');
+		} else {
+			self.each(function() {
+				if (_hasVal(this)) {
+					this.value = val;
+				} else {
+					_setAttr(this, 'value' , val);
+				}
+			});
+			return self;
+		}
+	},
+	css : function(key, val) {
+		var self = this;
+		if (key === undefined) {
+			return _getCssList(self.attr('style'));
+		}
+		if (typeof key === 'object') {
+			_each(key, function(k, v) {
+				self.css(k, v);
+			});
+			return self;
+		}
+		if (val === undefined) {
+			if (self.length < 1) {
+				return '';
+			}
+			return self[0].style[_toCamel(key)] || _computedCss(self[0], key) || '';
+		}
+		self.each(function() {
+			this.style[_toCamel(key)] = val;
+		});
+		return self;
+	},
+	width : function(val) {
+		var self = this;
+		if (val === undefined) {
+			if (self.length < 1) {
+				return 0;
+			}
+			return self[0].offsetWidth;
+		}
+		return self.css('width', _addUnit(val));
+	},
+	height : function(val) {
+		var self = this;
+		if (val === undefined) {
+			if (self.length < 1) {
+				return 0;
+			}
+			return self[0].offsetHeight;
+		}
+		return self.css('height', _addUnit(val));
+	},
+	opacity : function(val) {
+		this.each(function() {
+			if (this.style.opacity === undefined) {
+				this.style.filter = val == 1 ? '' : 'alpha(opacity=' + (val * 100) + ')';
+			} else {
+				this.style.opacity = val == 1 ? '' : val;
+			}
+		});
+		return this;
+	},
+	data : function(key, val) {
+		var self = this;
+		key = 'kindeditor_data_' + key;
+		if (val === undefined) {
+			if (self.length < 1) {
+				return null;
+			}
+			return self[0][key];
+		}
+		this.each(function() {
+			this[key] = val;
+		});
+		return self;
+	},
+	pos : function() {
+		var self = this, node = self[0], x = 0, y = 0;
+		if (node) {
+			if (node.getBoundingClientRect) {
+				var box = node.getBoundingClientRect(),
+					pos = _getScrollPos(self.doc);
+				x = box.left + pos.x;
+				y = box.top + pos.y;
+			} else {
+				while (node) {
+					x += node.offsetLeft;
+					y += node.offsetTop;
+					node = node.offsetParent;
+				}
+			}
+		}
+		return {x : _round(x), y : _round(y)};
+	},
+	clone : function(bool) {
+		if (this.length < 1) {
+			return new KNode([]);
+		}
+		return new KNode(this[0].cloneNode(bool));
+	},
+	append : function(expr) {
+		this.each(function() {
+			if (this.appendChild) {
+				this.appendChild(_get(expr));
+			}
+		});
+		return this;
+	},
+	appendTo : function(expr) {
+		this.each(function() {
+			_get(expr).appendChild(this);
+		});
+		return this;
+	},
+	before : function(expr) {
+		this.each(function() {
+			this.parentNode.insertBefore(_get(expr), this);
+		});
+		return this;
+	},
+	after : function(expr) {
+		this.each(function() {
+			if (this.nextSibling) {
+				this.parentNode.insertBefore(_get(expr), this.nextSibling);
+			} else {
+				this.parentNode.appendChild(_get(expr));
+			}
+		});
+		return this;
+	},
+	replaceWith : function(expr) {
+		var nodes = [];
+		this.each(function(i, node) {
+			_unbind(node);
+			var newNode = _get(expr);
+			node.parentNode.replaceChild(newNode, node);
+			nodes.push(newNode);
+		});
+		return K(nodes);
+	},
+	empty : function() {
+		var self = this;
+		self.each(function(i, node) {
+			var child = node.firstChild;
+			while (child) {
+				if (!node.parentNode) {
+					return;
+				}
+				var next = child.nextSibling;
+				child.parentNode.removeChild(child);
+				child = next;
+			}
+		});
+		return self;
+	},
+	remove : function(keepChilds) {
+		var self = this;
+		self.each(function(i, node) {
+			if (!node.parentNode) {
+				return;
+			}
+			_unbind(node);
+			if (keepChilds) {
+				var child = node.firstChild;
+				while (child) {
+					var next = child.nextSibling;
+					node.parentNode.insertBefore(child, node);
+					child = next;
+				}
+			}
+			node.parentNode.removeChild(node);
+			delete self[i];
+		});
+		self.length = 0;
+		return self;
+	},
+	show : function(val) {
+		var self = this;
+		if (val === undefined) {
+			val = self._originDisplay || '';
+		}
+		if (self.css('display') != 'none') {
+			return self;
+		}
+		return self.css('display', val);
+	},
+	hide : function() {
+		var self = this;
+		if (self.length < 1) {
+			return self;
+		}
+		self._originDisplay = self[0].style.display;
+		return self.css('display', 'none');
+	},
+	outer : function() {
+		var self = this;
+		if (self.length < 1) {
+			return '';
+		}
+		var div = self.doc.createElement('div'), html;
+		div.appendChild(self[0].cloneNode(true));
+		html = _formatHtml(div.innerHTML);
+		div = null;
+		return html;
+	},
+	isSingle : function() {
+		return !!_SINGLE_TAG_MAP[this.name];
+	},
+	isInline : function() {
+		return !!_INLINE_TAG_MAP[this.name];
+	},
+	isBlock : function() {
+		return !!_BLOCK_TAG_MAP[this.name];
+	},
+	isStyle : function() {
+		return !!_STYLE_TAG_MAP[this.name];
+	},
+	isControl : function() {
+		return !!_CONTROL_TAG_MAP[this.name];
+	},
+	contains : function(otherNode) {
+		if (this.length < 1) {
+			return false;
+		}
+		return _contains(this[0], _get(otherNode));
+	},
+	parent : function() {
+		if (this.length < 1) {
+			return null;
+		}
+		var node = this[0].parentNode;
+		return node ? new KNode(node) : null;
+	},
+	children : function() {
+		if (this.length < 1) {
+			return new KNode([]);
+		}
+		var list = [], child = this[0].firstChild;
+		while (child) {
+			if (child.nodeType != 3 || _trim(child.nodeValue) !== '') {
+				list.push(child);
+			}
+			child = child.nextSibling;
+		}
+		return new KNode(list);
+	},
+	first : function() {
+		var list = this.children();
+		return list.length > 0 ? list.eq(0) : null;
+	},
+	last : function() {
+		var list = this.children();
+		return list.length > 0 ? list.eq(list.length - 1) : null;
+	},
+	index : function() {
+		if (this.length < 1) {
+			return -1;
+		}
+		var i = -1, sibling = this[0];
+		while (sibling) {
+			i++;
+			sibling = sibling.previousSibling;
+		}
+		return i;
+	},
+	prev : function() {
+		if (this.length < 1) {
+			return null;
+		}
+		var node = this[0].previousSibling;
+		return node ? new KNode(node) : null;
+	},
+	next : function() {
+		if (this.length < 1) {
+			return null;
+		}
+		var node = this[0].nextSibling;
+		return node ? new KNode(node) : null;
+	},
+	scan : function(fn, order) {
+		if (this.length < 1) {
+			return;
+		}
+		order = (order === undefined) ? true : order;
+		function walk(node) {
+			var n = order ? node.firstChild : node.lastChild;
+			while (n) {
+				var next = order ? n.nextSibling : n.previousSibling;
+				if (fn(n) === false) {
+					return false;
+				}
+				if (walk(n) === false) {
+					return false;
+				}
+				n = next;
+			}
+		}
+		walk(this[0]);
+		return this;
+	}
+});
+_each(('blur,focus,focusin,focusout,load,resize,scroll,unload,click,dblclick,' +
+	'mousedown,mouseup,mousemove,mouseover,mouseout,mouseenter,mouseleave,' +
+	'change,select,submit,keydown,keypress,keyup,error,contextmenu').split(','), function(i, type) {
+	KNode.prototype[type] = function(fn) {
+		return fn ? this.bind(type, fn) : this.fire(type);
+	};
+});
+var _K = K;
+K = function(expr, root) {
+	if (expr === undefined || expr === null) {
+		return;
+	}
+	function newNode(node) {
+		if (!node[0]) {
+			node = [];
+		}
+		return new KNode(node);
+	}
+	if (typeof expr === 'string') {
+		if (root) {
+			root = _get(root);
+		}
+		var length = expr.length;
+		if (expr.charAt(0) === '@') {
+			expr = expr.substr(1);
+		}
+		if (expr.length !== length || /<.+>/.test(expr)) {
+			var doc = root ? root.ownerDocument || root : document,
+				div = doc.createElement('div'), list = [];
+			div.innerHTML = '<img id="__kindeditor_temp_tag__" width="0" height="0" style="display:none;" />' + expr;
+			for (var i = 0, len = div.childNodes.length; i < len; i++) {
+				var child = div.childNodes[i];
+				if (child.id == '__kindeditor_temp_tag__') {
+					continue;
+				}
+				list.push(child);
+			}
+			return newNode(list);
+		}
+		return newNode(_queryAll(expr, root));
+	}
+	if (expr && expr.constructor === KNode) {
+		return expr;
+	}
+	if (expr.toArray) {
+		expr = expr.toArray();
+	}
+	if (_isArray(expr)) {
+		return newNode(expr);
+	}
+	return newNode(_toArray(arguments));
+};
+_each(_K, function(key, val) {
+	K[key] = val;
+});
+K.NodeClass = KNode;
+window.KindEditor = K;
+var _START_TO_START = 0,
+	_START_TO_END = 1,
+	_END_TO_END = 2,
+	_END_TO_START = 3,
+	_BOOKMARK_ID = 0;
+function _updateCollapsed(range) {
+	range.collapsed = (range.startContainer === range.endContainer && range.startOffset === range.endOffset);
+	return range;
+}
+function _copyAndDelete(range, isCopy, isDelete) {
+	var doc = range.doc, nodeList = [];
+	function splitTextNode(node, startOffset, endOffset) {
+		var length = node.nodeValue.length, centerNode;
+		if (isCopy) {
+			var cloneNode = node.cloneNode(true);
+			if (startOffset > 0) {
+				centerNode = cloneNode.splitText(startOffset);
+			} else {
+				centerNode = cloneNode;
+			}
+			if (endOffset < length) {
+				centerNode.splitText(endOffset - startOffset);
+			}
+		}
+		if (isDelete) {
+			var center = node;
+			if (startOffset > 0) {
+				center = node.splitText(startOffset);
+				range.setStart(node, startOffset);
+			}
+			if (endOffset < length) {
+				var right = center.splitText(endOffset - startOffset);
+				range.setEnd(right, 0);
+			}
+			nodeList.push(center);
+		}
+		return centerNode;
+	}
+	function removeNodes() {
+		if (isDelete) {
+			range.up().collapse(true);
+		}
+		for (var i = 0, len = nodeList.length; i < len; i++) {
+			var node = nodeList[i];
+			if (node.parentNode) {
+				node.parentNode.removeChild(node);
+			}
+		}
+	}
+	var copyRange = range.cloneRange().down();
+	var start = -1, incStart = -1, incEnd = -1, end = -1,
+		ancestor = range.commonAncestor(), frag = doc.createDocumentFragment();
+	if (ancestor.nodeType == 3) {
+		var textNode = splitTextNode(ancestor, range.startOffset, range.endOffset);
+		if (isCopy) {
+			frag.appendChild(textNode);
+		}
+		removeNodes();
+		return isCopy ? frag : range;
+	}
+	function extractNodes(parent, frag) {
+		var node = parent.firstChild, nextNode;
+		while (node) {
+			var testRange = new KRange(doc).selectNode(node);
+			start = testRange.compareBoundaryPoints(_START_TO_END, range);
+			if (start >= 0 && incStart <= 0) {
+				incStart = testRange.compareBoundaryPoints(_START_TO_START, range);
+			}
+			if (incStart >= 0 && incEnd <= 0) {
+				incEnd = testRange.compareBoundaryPoints(_END_TO_END, range);
+			}
+			if (incEnd >= 0 && end <= 0) {
+				end = testRange.compareBoundaryPoints(_END_TO_START, range);
+			}
+			if (end >= 0) {
+				return false;
+			}
+			nextNode = node.nextSibling;
+			if (start > 0) {
+				if (node.nodeType == 1) {
+					if (incStart >= 0 && incEnd <= 0) {
+						if (isCopy) {
+							frag.appendChild(node.cloneNode(true));
+						}
+						if (isDelete) {
+							nodeList.push(node);
+						}
+					} else {
+						var childFlag;
+						if (isCopy) {
+							childFlag = node.cloneNode(false);
+							frag.appendChild(childFlag);
+						}
+						if (extractNodes(node, childFlag) === false) {
+							return false;
+						}
+					}
+				} else if (node.nodeType == 3) {
+					var textNode;
+					if (node == copyRange.startContainer) {
+						textNode = splitTextNode(node, copyRange.startOffset, node.nodeValue.length);
+					} else if (node == copyRange.endContainer) {
+						textNode = splitTextNode(node, 0, copyRange.endOffset);
+					} else {
+						textNode = splitTextNode(node, 0, node.nodeValue.length);
+					}
+					if (isCopy) {
+						try {
+							frag.appendChild(textNode);
+						} catch(e) {}
+					}
+				}
+			}
+			node = nextNode;
+		}
+	}
+	extractNodes(ancestor, frag);
+	if (isDelete) {
+		range.up().collapse(true);
+	}
+	for (var i = 0, len = nodeList.length; i < len; i++) {
+		var node = nodeList[i];
+		if (node.parentNode) {
+			node.parentNode.removeChild(node);
+		}
+	}
+	return isCopy ? frag : range;
+}
+function _moveToElementText(range, el) {
+	var node = el;
+	while (node) {
+		var knode = K(node);
+		if (knode.name == 'marquee' || knode.name == 'select') {
+			return;
+		}
+		node = node.parentNode;
+	}
+	try {
+		range.moveToElementText(el);
+	} catch(e) {}
+}
+function _getStartEnd(rng, isStart) {
+	var doc = rng.parentElement().ownerDocument,
+		pointRange = rng.duplicate();
+	pointRange.collapse(isStart);
+	var parent = pointRange.parentElement(),
+		nodes = parent.childNodes;
+	if (nodes.length === 0) {
+		return {node: parent.parentNode, offset: K(parent).index()};
+	}
+	var startNode = doc, startPos = 0, cmp = -1;
+	var testRange = rng.duplicate();
+	_moveToElementText(testRange, parent);
+	for (var i = 0, len = nodes.length; i < len; i++) {
+		var node = nodes[i];
+		cmp = testRange.compareEndPoints('StartToStart', pointRange);
+		if (cmp === 0) {
+			return {node: node.parentNode, offset: i};
+		}
+		if (node.nodeType == 1) {
+			var nodeRange = rng.duplicate(), dummy, knode = K(node), newNode = node;
+			if (knode.isControl()) {
+				dummy = doc.createElement('span');
+				knode.after(dummy);
+				newNode = dummy;
+				startPos += knode.text().replace(/\r\n|\n|\r/g, '').length;
+			}
+			_moveToElementText(nodeRange, newNode);
+			testRange.setEndPoint('StartToEnd', nodeRange);
+			if (cmp > 0) {
+				startPos += nodeRange.text.replace(/\r\n|\n|\r/g, '').length;
+			} else {
+				startPos = 0;
+			}
+			if (dummy) {
+				K(dummy).remove();
+			}
+		} else if (node.nodeType == 3) {
+			testRange.moveStart('character', node.nodeValue.length);
+			startPos += node.nodeValue.length;
+		}
+		if (cmp < 0) {
+			startNode = node;
+		}
+	}
+	if (cmp < 0 && startNode.nodeType == 1) {
+		return {node: parent, offset: K(parent.lastChild).index() + 1};
+	}
+	if (cmp > 0) {
+		while (startNode.nextSibling && startNode.nodeType == 1) {
+			startNode = startNode.nextSibling;
+		}
+	}
+	testRange = rng.duplicate();
+	_moveToElementText(testRange, parent);
+	testRange.setEndPoint('StartToEnd', pointRange);
+	startPos -= testRange.text.replace(/\r\n|\n|\r/g, '').length;
+	if (cmp > 0 && startNode.nodeType == 3) {
+		var prevNode = startNode.previousSibling;
+		while (prevNode && prevNode.nodeType == 3) {
+			startPos -= prevNode.nodeValue.length;
+			prevNode = prevNode.previousSibling;
+		}
+	}
+	return {node: startNode, offset: startPos};
+}
+function _getEndRange(node, offset) {
+	var doc = node.ownerDocument || node,
+		range = doc.body.createTextRange();
+	if (doc == node) {
+		range.collapse(true);
+		return range;
+	}
+	if (node.nodeType == 1 && node.childNodes.length > 0) {
+		var children = node.childNodes, isStart, child;
+		if (offset === 0) {
+			child = children[0];
+			isStart = true;
+		} else {
+			child = children[offset - 1];
+			isStart = false;
+		}
+		if (!child) {
+			return range;
+		}
+		if (K(child).name === 'head') {
+			if (offset === 1) {
+				isStart = true;
+			}
+			if (offset === 2) {
+				isStart = false;
+			}
+			range.collapse(isStart);
+			return range;
+		}
+		if (child.nodeType == 1) {
+			var kchild = K(child), span;
+			if (kchild.isControl()) {
+				span = doc.createElement('span');
+				if (isStart) {
+					kchild.before(span);
+				} else {
+					kchild.after(span);
+				}
+				child = span;
+			}
+			_moveToElementText(range, child);
+			range.collapse(isStart);
+			if (span) {
+				K(span).remove();
+			}
+			return range;
+		}
+		node = child;
+		offset = isStart ? 0 : child.nodeValue.length;
+	}
+	var dummy = doc.createElement('span');
+	K(node).before(dummy);
+	_moveToElementText(range, dummy);
+	range.moveStart('character', offset);
+	K(dummy).remove();
+	return range;
+}
+function _toRange(rng) {
+	var doc, range;
+	function tr2td(start) {
+		if (K(start.node).name == 'tr') {
+			start.node = start.node.cells[start.offset];
+			start.offset = 0;
+		}
+	}
+	if (_IERANGE) {
+		if (rng.item) {
+			doc = _getDoc(rng.item(0));
+			range = new KRange(doc);
+			range.selectNode(rng.item(0));
+			return range;
+		}
+		doc = rng.parentElement().ownerDocument;
+		var start = _getStartEnd(rng, true),
+			end = _getStartEnd(rng, false);
+		tr2td(start);
+		tr2td(end);
+		range = new KRange(doc);
+		range.setStart(start.node, start.offset);
+		range.setEnd(end.node, end.offset);
+		return range;
+	}
+	var startContainer = rng.startContainer;
+	doc = startContainer.ownerDocument || startContainer;
+	range = new KRange(doc);
+	range.setStart(startContainer, rng.startOffset);
+	range.setEnd(rng.endContainer, rng.endOffset);
+	return range;
+}
+function KRange(doc) {
+	this.init(doc);
+}
+_extend(KRange, {
+	init : function(doc) {
+		var self = this;
+		self.startContainer = doc;
+		self.startOffset = 0;
+		self.endContainer = doc;
+		self.endOffset = 0;
+		self.collapsed = true;
+		self.doc = doc;
+	},
+	commonAncestor : function() {
+		function getParents(node) {
+			var parents = [];
+			while (node) {
+				parents.push(node);
+				node = node.parentNode;
+			}
+			return parents;
+		}
+		var parentsA = getParents(this.startContainer),
+			parentsB = getParents(this.endContainer),
+			i = 0, lenA = parentsA.length, lenB = parentsB.length, parentA, parentB;
+		while (++i) {
+			parentA = parentsA[lenA - i];
+			parentB = parentsB[lenB - i];
+			if (!parentA || !parentB || parentA !== parentB) {
+				break;
+			}
+		}
+		return parentsA[lenA - i + 1];
+	},
+	setStart : function(node, offset) {
+		var self = this, doc = self.doc;
+		self.startContainer = node;
+		self.startOffset = offset;
+		if (self.endContainer === doc) {
+			self.endContainer = node;
+			self.endOffset = offset;
+		}
+		return _updateCollapsed(this);
+	},
+	setEnd : function(node, offset) {
+		var self = this, doc = self.doc;
+		self.endContainer = node;
+		self.endOffset = offset;
+		if (self.startContainer === doc) {
+			self.startContainer = node;
+			self.startOffset = offset;
+		}
+		return _updateCollapsed(this);
+	},
+	setStartBefore : function(node) {
+		return this.setStart(node.parentNode || this.doc, K(node).index());
+	},
+	setStartAfter : function(node) {
+		return this.setStart(node.parentNode || this.doc, K(node).index() + 1);
+	},
+	setEndBefore : function(node) {
+		return this.setEnd(node.parentNode || this.doc, K(node).index());
+	},
+	setEndAfter : function(node) {
+		return this.setEnd(node.parentNode || this.doc, K(node).index() + 1);
+	},
+	selectNode : function(node) {
+		return this.setStartBefore(node).setEndAfter(node);
+	},
+	selectNodeContents : function(node) {
+		var knode = K(node);
+		if (knode.type == 3 || knode.isSingle()) {
+			return this.selectNode(node);
+		}
+		var children = knode.children();
+		if (children.length > 0) {
+			return this.setStartBefore(children[0]).setEndAfter(children[children.length - 1]);
+		}
+		return this.setStart(node, 0).setEnd(node, 0);
+	},
+	collapse : function(toStart) {
+		if (toStart) {
+			return this.setEnd(this.startContainer, this.startOffset);
+		}
+		return this.setStart(this.endContainer, this.endOffset);
+	},
+	compareBoundaryPoints : function(how, range) {
+		var rangeA = this.get(), rangeB = range.get();
+		if (_IERANGE) {
+			var arr = {};
+			arr[_START_TO_START] = 'StartToStart';
+			arr[_START_TO_END] = 'EndToStart';
+			arr[_END_TO_END] = 'EndToEnd';
+			arr[_END_TO_START] = 'StartToEnd';
+			var cmp = rangeA.compareEndPoints(arr[how], rangeB);
+			if (cmp !== 0) {
+				return cmp;
+			}
+			var nodeA, nodeB, nodeC, posA, posB;
+			if (how === _START_TO_START || how === _END_TO_START) {
+				nodeA = this.startContainer;
+				posA = this.startOffset;
+			}
+			if (how === _START_TO_END || how === _END_TO_END) {
+				nodeA = this.endContainer;
+				posA = this.endOffset;
+			}
+			if (how === _START_TO_START || how === _START_TO_END) {
+				nodeB = range.startContainer;
+				posB = range.startOffset;
+			}
+			if (how === _END_TO_END || how === _END_TO_START) {
+				nodeB = range.endContainer;
+				posB = range.endOffset;
+			}
+			if (nodeA === nodeB) {
+				var diff = posA - posB;
+				return diff > 0 ? 1 : (diff < 0 ? -1 : 0);
+			}
+			nodeC = nodeB;
+			while (nodeC && nodeC.parentNode !== nodeA) {
+				nodeC = nodeC.parentNode;
+			}
+			if (nodeC) {
+				return K(nodeC).index() >= posA ? -1 : 1;
+			}
+			nodeC = nodeA;
+			while (nodeC && nodeC.parentNode !== nodeB) {
+				nodeC = nodeC.parentNode;
+			}
+			if (nodeC) {
+				return K(nodeC).index() >= posB ? 1 : -1;
+			}
+			nodeC = K(nodeB).next();
+			if (nodeC && nodeC.contains(nodeA)) {
+				return 1;
+			}
+			nodeC = K(nodeA).next();
+			if (nodeC && nodeC.contains(nodeB)) {
+				return -1;
+			}
+		} else {
+			return rangeA.compareBoundaryPoints(how, rangeB);
+		}
+	},
+	cloneRange : function() {
+		return new KRange(this.doc).setStart(this.startContainer, this.startOffset).setEnd(this.endContainer, this.endOffset);
+	},
+	toString : function() {
+		var rng = this.get(), str = _IERANGE ? rng.text : rng.toString();
+		return str.replace(/\r\n|\n|\r/g, '');
+	},
+	cloneContents : function() {
+		return _copyAndDelete(this, true, false);
+	},
+	deleteContents : function() {
+		return _copyAndDelete(this, false, true);
+	},
+	extractContents : function() {
+		return _copyAndDelete(this, true, true);
+	},
+	insertNode : function(node) {
+		var self = this,
+			sc = self.startContainer, so = self.startOffset,
+			ec = self.endContainer, eo = self.endOffset,
+			firstChild, lastChild, c, nodeCount = 1;
+		if (node.nodeName.toLowerCase() === '#document-fragment') {
+			firstChild = node.firstChild;
+			lastChild = node.lastChild;
+			nodeCount = node.childNodes.length;
+		}
+		if (sc.nodeType == 1) {
+			c = sc.childNodes[so];
+			if (c) {
+				sc.insertBefore(node, c);
+				if (sc === ec) {
+					eo += nodeCount;
+				}
+			} else {
+				sc.appendChild(node);
+			}
+		} else if (sc.nodeType == 3) {
+			if (so === 0) {
+				sc.parentNode.insertBefore(node, sc);
+				if (sc.parentNode === ec) {
+					eo += nodeCount;
+				}
+			} else if (so >= sc.nodeValue.length) {
+				if (sc.nextSibling) {
+					sc.parentNode.insertBefore(node, sc.nextSibling);
+				} else {
+					sc.parentNode.appendChild(node);
+				}
+			} else {
+				if (so > 0) {
+					c = sc.splitText(so);
+				} else {
+					c = sc;
+				}
+				sc.parentNode.insertBefore(node, c);
+				if (sc === ec) {
+					ec = c;
+					eo -= so;
+				}
+			}
+		}
+		if (firstChild) {
+			self.setStartBefore(firstChild).setEndAfter(lastChild);
+		} else {
+			self.selectNode(node);
+		}
+		if (self.compareBoundaryPoints(_END_TO_END, self.cloneRange().setEnd(ec, eo)) >= 1) {
+			return self;
+		}
+		return self.setEnd(ec, eo);
+	},
+	surroundContents : function(node) {
+		node.appendChild(this.extractContents());
+		return this.insertNode(node).selectNode(node);
+	},
+	isControl : function() {
+		var self = this,
+			sc = self.startContainer, so = self.startOffset,
+			ec = self.endContainer, eo = self.endOffset, rng;
+		return sc.nodeType == 1 && sc === ec && so + 1 === eo && K(sc.childNodes[so]).isControl();
+	},
+	get : function(hasControlRange) {
+		var self = this, doc = self.doc, node, rng;
+		if (!_IERANGE) {
+			rng = doc.createRange();
+			try {
+				rng.setStart(self.startContainer, self.startOffset);
+				rng.setEnd(self.endContainer, self.endOffset);
+			} catch (e) {}
+			return rng;
+		}
+		if (hasControlRange && self.isControl()) {
+			rng = doc.body.createControlRange();
+			rng.addElement(self.startContainer.childNodes[self.startOffset]);
+			return rng;
+		}
+		var range = self.cloneRange().down();
+		rng = doc.body.createTextRange();
+		rng.setEndPoint('StartToStart', _getEndRange(range.startContainer, range.startOffset));
+		rng.setEndPoint('EndToStart', _getEndRange(range.endContainer, range.endOffset));
+		return rng;
+	},
+	html : function() {
+		return K(this.cloneContents()).outer();
+	},
+	down : function() {
+		var self = this;
+		function downPos(node, pos, isStart) {
+			if (node.nodeType != 1) {
+				return;
+			}
+			var children = K(node).children();
+			if (children.length === 0) {
+				return;
+			}
+			var left, right, child, offset;
+			if (pos > 0) {
+				left = children.eq(pos - 1);
+			}
+			if (pos < children.length) {
+				right = children.eq(pos);
+			}
+			if (left && left.type == 3) {
+				child = left[0];
+				offset = child.nodeValue.length;
+			}
+			if (right && right.type == 3) {
+				child = right[0];
+				offset = 0;
+			}
+			if (!child) {
+				return;
+			}
+			if (isStart) {
+				self.setStart(child, offset);
+			} else {
+				self.setEnd(child, offset);
+			}
+		}
+		downPos(self.startContainer, self.startOffset, true);
+		downPos(self.endContainer, self.endOffset, false);
+		return self;
+	},
+	up : function() {
+		var self = this;
+		function upPos(node, pos, isStart) {
+			if (node.nodeType != 3) {
+				return;
+			}
+			if (pos === 0) {
+				if (isStart) {
+					self.setStartBefore(node);
+				} else {
+					self.setEndBefore(node);
+				}
+			} else if (pos == node.nodeValue.length) {
+				if (isStart) {
+					self.setStartAfter(node);
+				} else {
+					self.setEndAfter(node);
+				}
+			}
+		}
+		upPos(self.startContainer, self.startOffset, true);
+		upPos(self.endContainer, self.endOffset, false);
+		return self;
+	},
+	enlarge : function(toBlock) {
+		var self = this;
+		self.up();
+		function enlargePos(node, pos, isStart) {
+			var knode = K(node), parent;
+			if (knode.type == 3 || _NOSPLIT_TAG_MAP[knode.name] || !toBlock && knode.isBlock()) {
+				return;
+			}
+			if (pos === 0) {
+				while (!knode.prev()) {
+					parent = knode.parent();
+					if (!parent || _NOSPLIT_TAG_MAP[parent.name] || !toBlock && parent.isBlock()) {
+						break;
+					}
+					knode = parent;
+				}
+				if (isStart) {
+					self.setStartBefore(knode[0]);
+				} else {
+					self.setEndBefore(knode[0]);
+				}
+			} else if (pos == knode.children().length) {
+				while (!knode.next()) {
+					parent = knode.parent();
+					if (!parent || _NOSPLIT_TAG_MAP[parent.name] || !toBlock && parent.isBlock()) {
+						break;
+					}
+					knode = parent;
+				}
+				if (isStart) {
+					self.setStartAfter(knode[0]);
+				} else {
+					self.setEndAfter(knode[0]);
+				}
+			}
+		}
+		enlargePos(self.startContainer, self.startOffset, true);
+		enlargePos(self.endContainer, self.endOffset, false);
+		return self;
+	},
+	shrink : function() {
+		var self = this, child, collapsed = self.collapsed;
+		while (self.startContainer.nodeType == 1 && (child = self.startContainer.childNodes[self.startOffset]) && child.nodeType == 1 && !K(child).isSingle()) {
+			self.setStart(child, 0);
+		}
+		if (collapsed) {
+			return self.collapse(collapsed);
+		}
+		while (self.endContainer.nodeType == 1 && self.endOffset > 0 && (child = self.endContainer.childNodes[self.endOffset - 1]) && child.nodeType == 1 && !K(child).isSingle()) {
+			self.setEnd(child, child.childNodes.length);
+		}
+		return self;
+	},
+	createBookmark : function(serialize) {
+		var self = this, doc = self.doc, endNode,
+			startNode = K('<span style="display:none;"></span>', doc)[0];
+		startNode.id = '__kindeditor_bookmark_start_' + (_BOOKMARK_ID++) + '__';
+		if (!self.collapsed) {
+			endNode = startNode.cloneNode(true);
+			endNode.id = '__kindeditor_bookmark_end_' + (_BOOKMARK_ID++) + '__';
+		}
+		if (endNode) {
+			self.cloneRange().collapse(false).insertNode(endNode).setEndBefore(endNode);
+		}
+		self.insertNode(startNode).setStartAfter(startNode);
+		return {
+			start : serialize ? '#' + startNode.id : startNode,
+			end : endNode ? (serialize ? '#' + endNode.id : endNode) : null
+		};
+	},
+	moveToBookmark : function(bookmark) {
+		var self = this, doc = self.doc,
+			start = K(bookmark.start, doc), end = bookmark.end ? K(bookmark.end, doc) : null;
+		if (!start || start.length < 1) {
+			return self;
+		}
+		self.setStartBefore(start[0]);
+		start.remove();
+		if (end && end.length > 0) {
+			self.setEndBefore(end[0]);
+			end.remove();
+		} else {
+			self.collapse(true);
+		}
+		return self;
+	},
+	dump : function() {
+		console.log('--------------------');
+		console.log(this.startContainer.nodeType == 3 ? this.startContainer.nodeValue : this.startContainer, this.startOffset);
+		console.log(this.endContainer.nodeType == 3 ? this.endContainer.nodeValue : this.endContainer, this.endOffset);
+	}
+});
+function _range(mixed) {
+	if (!mixed.nodeName) {
+		return mixed.constructor === KRange ? mixed : _toRange(mixed);
+	}
+	return new KRange(mixed);
+}
+K.RangeClass = KRange;
+K.range = _range;
+K.START_TO_START = _START_TO_START;
+K.START_TO_END = _START_TO_END;
+K.END_TO_END = _END_TO_END;
+K.END_TO_START = _END_TO_START;
+function _nativeCommand(doc, key, val) {
+	try {
+		doc.execCommand(key, false, val);
+	} catch(e) {}
+}
+function _nativeCommandValue(doc, key) {
+	var val = '';
+	try {
+		val = doc.queryCommandValue(key);
+	} catch (e) {}
+	if (typeof val !== 'string') {
+		val = '';
+	}
+	return val;
+}
+function _getSel(doc) {
+	var win = _getWin(doc);
+	return _IERANGE ? doc.selection : win.getSelection();
+}
+function _getRng(doc) {
+	var sel = _getSel(doc), rng;
+	try {
+		if (sel.rangeCount > 0) {
+			rng = sel.getRangeAt(0);
+		} else {
+			rng = sel.createRange();
+		}
+	} catch(e) {}
+	if (_IERANGE && (!rng || (!rng.item && rng.parentElement().ownerDocument !== doc))) {
+		return null;
+	}
+	return rng;
+}
+function _singleKeyMap(map) {
+	var newMap = {}, arr, v;
+	_each(map, function(key, val) {
+		arr = key.split(',');
+		for (var i = 0, len = arr.length; i < len; i++) {
+			v = arr[i];
+			newMap[v] = val;
+		}
+	});
+	return newMap;
+}
+function _hasAttrOrCss(knode, map) {
+	return _hasAttrOrCssByKey(knode, map, '*') || _hasAttrOrCssByKey(knode, map);
+}
+function _hasAttrOrCssByKey(knode, map, mapKey) {
+	mapKey = mapKey || knode.name;
+	if (knode.type !== 1) {
+		return false;
+	}
+	var newMap = _singleKeyMap(map);
+	if (!newMap[mapKey]) {
+		return false;
+	}
+	var arr = newMap[mapKey].split(',');
+	for (var i = 0, len = arr.length; i < len; i++) {
+		var key = arr[i];
+		if (key === '*') {
+			return true;
+		}
+		var match = /^(\.?)([^=]+)(?:=([^=]*))?$/.exec(key);
+		var method = match[1] ? 'css' : 'attr';
+		key = match[2];
+		var val = match[3] || '';
+		if (val === '' && knode[method](key) !== '') {
+			return true;
+		}
+		if (val !== '' && knode[method](key) === val) {
+			return true;
+		}
+	}
+	return false;
+}
+function _removeAttrOrCss(knode, map) {
+	if (knode.type != 1) {
+		return;
+	}
+	_removeAttrOrCssByKey(knode, map, '*');
+	_removeAttrOrCssByKey(knode, map);
+}
+function _removeAttrOrCssByKey(knode, map, mapKey) {
+	mapKey = mapKey || knode.name;
+	if (knode.type !== 1) {
+		return;
+	}
+	var newMap = _singleKeyMap(map);
+	if (!newMap[mapKey]) {
+		return;
+	}
+	var arr = newMap[mapKey].split(','), allFlag = false;
+	for (var i = 0, len = arr.length; i < len; i++) {
+		var key = arr[i];
+		if (key === '*') {
+			allFlag = true;
+			break;
+		}
+		var match = /^(\.?)([^=]+)(?:=([^=]*))?$/.exec(key);
+		key = match[2];
+		if (match[1]) {
+			key = _toCamel(key);
+			if (knode[0].style[key]) {
+				knode[0].style[key] = '';
+			}
+		} else {
+			knode.removeAttr(key);
+		}
+	}
+	if (allFlag) {
+		knode.remove(true);
+	}
+}
+function _getInnerNode(knode) {
+	var inner = knode;
+	while (inner.first()) {
+		inner = inner.first();
+	}
+	return inner;
+}
+function _isEmptyNode(knode) {
+	if (knode.type != 1 || knode.isSingle()) {
+		return false;
+	}
+	return knode.html().replace(/<[^>]+>/g, '') === '';
+}
+function _mergeWrapper(a, b) {
+	a = a.clone(true);
+	var lastA = _getInnerNode(a), childA = a, merged = false;
+	while (b) {
+		while (childA) {
+			if (childA.name === b.name) {
+				_mergeAttrs(childA, b.attr(), b.css());
+				merged = true;
+			}
+			childA = childA.first();
+		}
+		if (!merged) {
+			lastA.append(b.clone(false));
+		}
+		merged = false;
+		b = b.first();
+	}
+	return a;
+}
+function _wrapNode(knode, wrapper) {
+	wrapper = wrapper.clone(true);
+	if (knode.type == 3) {
+		_getInnerNode(wrapper).append(knode.clone(false));
+		knode.replaceWith(wrapper);
+		return wrapper;
+	}
+	var nodeWrapper = knode, child;
+	while ((child = knode.first()) && child.children().length == 1) {
+		knode = child;
+	}
+	child = knode.first();
+	var frag = knode.doc.createDocumentFragment();
+	while (child) {
+		frag.appendChild(child[0]);
+		child = child.next();
+	}
+	wrapper = _mergeWrapper(nodeWrapper, wrapper);
+	if (frag.firstChild) {
+		_getInnerNode(wrapper).append(frag);
+	}
+	nodeWrapper.replaceWith(wrapper);
+	return wrapper;
+}
+function _mergeAttrs(knode, attrs, styles) {
+	_each(attrs, function(key, val) {
+		if (key !== 'style') {
+			knode.attr(key, val);
+		}
+	});
+	_each(styles, function(key, val) {
+		knode.css(key, val);
+	});
+}
+function _inPreElement(knode) {
+	while (knode && knode.name != 'body') {
+		if (_PRE_TAG_MAP[knode.name] || knode.name == 'div' && knode.hasClass('ke-script')) {
+			return true;
+		}
+		knode = knode.parent();
+	}
+	return false;
+}
+function KCmd(range) {
+	this.init(range);
+}
+_extend(KCmd, {
+	init : function(range) {
+		var self = this, doc = range.doc;
+		self.doc = doc;
+		self.win = _getWin(doc);
+		self.sel = _getSel(doc);
+		self.range = range;
+	},
+	selection : function(forceReset) {
+		var self = this, doc = self.doc, rng = _getRng(doc);
+		self.sel = _getSel(doc);
+		if (rng) {
+			self.range = _range(rng);
+			if (K(self.range.startContainer).name == 'html') {
+				self.range.selectNodeContents(doc.body).collapse(false);
+			}
+			return self;
+		}
+		if (forceReset) {
+			self.range.selectNodeContents(doc.body).collapse(false);
+		}
+		return self;
+	},
+	select : function(hasDummy) {
+		hasDummy = _undef(hasDummy, true);
+		var self = this, sel = self.sel, range = self.range.cloneRange().shrink(),
+			sc = range.startContainer, so = range.startOffset,
+			ec = range.endContainer, eo = range.endOffset,
+			doc = _getDoc(sc), win = self.win, rng, hasU200b = false;
+		if (hasDummy && sc.nodeType == 1 && range.collapsed) {
+			if (_IERANGE) {
+				var dummy = K('<span>&nbsp;</span>', doc);
+				range.insertNode(dummy[0]);
+				rng = doc.body.createTextRange();
+				try {
+					rng.moveToElementText(dummy[0]);
+				} catch(ex) {}
+				rng.collapse(false);
+				rng.select();
+				dummy.remove();
+				win.focus();
+				return self;
+			}
+			if (_WEBKIT) {
+				var children = sc.childNodes;
+				if (K(sc).isInline() || so > 0 && K(children[so - 1]).isInline() || children[so] && K(children[so]).isInline()) {
+					range.insertNode(doc.createTextNode('\u200B'));
+					hasU200b = true;
+				}
+			}
+		}
+		if (_IERANGE) {
+			try {
+				rng = range.get(true);
+				rng.select();
+			} catch(e) {}
+		} else {
+			if (hasU200b) {
+				range.collapse(false);
+			}
+			rng = range.get(true);
+			sel.removeAllRanges();
+			sel.addRange(rng);
+			if (doc !== document) {
+				var pos = K(rng.endContainer).pos();
+				win.scrollTo(pos.x, pos.y);
+			}
+		}
+		win.focus();
+		return self;
+	},
+	wrap : function(val) {
+		var self = this, doc = self.doc, range = self.range, wrapper;
+		wrapper = K(val, doc);
+		if (range.collapsed) {
+			range.shrink();
+			range.insertNode(wrapper[0]).selectNodeContents(wrapper[0]);
+			return self;
+		}
+		if (wrapper.isBlock()) {
+			var copyWrapper = wrapper.clone(true), child = copyWrapper;
+			while (child.first()) {
+				child = child.first();
+			}
+			child.append(range.extractContents());
+			range.insertNode(copyWrapper[0]).selectNode(copyWrapper[0]);
+			return self;
+		}
+		range.enlarge();
+		var bookmark = range.createBookmark(), ancestor = range.commonAncestor(), isStart = false;
+		K(ancestor).scan(function(node) {
+			if (!isStart && node == bookmark.start) {
+				isStart = true;
+				return;
+			}
+			if (isStart) {
+				if (node == bookmark.end) {
+					return false;
+				}
+				var knode = K(node);
+				if (_inPreElement(knode)) {
+					return;
+				}
+				if (knode.type == 3 && _trim(node.nodeValue).length > 0) {
+					var parent;
+					while ((parent = knode.parent()) && parent.isStyle() && parent.children().length == 1) {
+						knode = parent;
+					}
+					_wrapNode(knode, wrapper);
+				}
+			}
+		});
+		range.moveToBookmark(bookmark);
+		return self;
+	},
+	split : function(isStart, map) {
+		var range = this.range, doc = range.doc;
+		var tempRange = range.cloneRange().collapse(isStart);
+		var node = tempRange.startContainer, pos = tempRange.startOffset,
+			parent = node.nodeType == 3 ? node.parentNode : node,
+			needSplit = false, knode;
+		while (parent && parent.parentNode) {
+			knode = K(parent);
+			if (map) {
+				if (!knode.isStyle()) {
+					break;
+				}
+				if (!_hasAttrOrCss(knode, map)) {
+					break;
+				}
+			} else {
+				if (_NOSPLIT_TAG_MAP[knode.name]) {
+					break;
+				}
+			}
+			needSplit = true;
+			parent = parent.parentNode;
+		}
+		if (needSplit) {
+			var dummy = doc.createElement('span');
+			range.cloneRange().collapse(!isStart).insertNode(dummy);
+			if (isStart) {
+				tempRange.setStartBefore(parent.firstChild).setEnd(node, pos);
+			} else {
+				tempRange.setStart(node, pos).setEndAfter(parent.lastChild);
+			}
+			var frag = tempRange.extractContents(),
+				first = frag.firstChild, last = frag.lastChild;
+			if (isStart) {
+				tempRange.insertNode(frag);
+				range.setStartAfter(last).setEndBefore(dummy);
+			} else {
+				parent.appendChild(frag);
+				range.setStartBefore(dummy).setEndBefore(first);
+			}
+			var dummyParent = dummy.parentNode;
+			if (dummyParent == range.endContainer) {
+				var prev = K(dummy).prev(), next = K(dummy).next();
+				if (prev && next && prev.type == 3 && next.type == 3) {
+					range.setEnd(prev[0], prev[0].nodeValue.length);
+				} else if (!isStart) {
+					range.setEnd(range.endContainer, range.endOffset - 1);
+				}
+			}
+			dummyParent.removeChild(dummy);
+		}
+		return this;
+	},
+	remove : function(map) {
+		var self = this, doc = self.doc, range = self.range;
+		range.enlarge();
+		if (range.startOffset === 0) {
+			var ksc = K(range.startContainer), parent;
+			while ((parent = ksc.parent()) && parent.isStyle() && parent.children().length == 1) {
+				ksc = parent;
+			}
+			range.setStart(ksc[0], 0);
+			ksc = K(range.startContainer);
+			if (ksc.isBlock()) {
+				_removeAttrOrCss(ksc, map);
+			}
+			var kscp = ksc.parent();
+			if (kscp && kscp.isBlock()) {
+				_removeAttrOrCss(kscp, map);
+			}
+		}
+		var sc, so;
+		if (range.collapsed) {
+			self.split(true, map);
+			sc = range.startContainer;
+			so = range.startOffset;
+			if (so > 0) {
+				var sb = K(sc.childNodes[so - 1]);
+				if (sb && _isEmptyNode(sb)) {
+					sb.remove();
+					range.setStart(sc, so - 1);
+				}
+			}
+			var sa = K(sc.childNodes[so]);
+			if (sa && _isEmptyNode(sa)) {
+				sa.remove();
+			}
+			if (_isEmptyNode(sc)) {
+				range.startBefore(sc);
+				sc.remove();
+			}
+			range.collapse(true);
+			return self;
+		}
+		self.split(true, map);
+		self.split(false, map);
+		var startDummy = doc.createElement('span'), endDummy = doc.createElement('span');
+		range.cloneRange().collapse(false).insertNode(endDummy);
+		range.cloneRange().collapse(true).insertNode(startDummy);
+		var nodeList = [], cmpStart = false;
+		K(range.commonAncestor()).scan(function(node) {
+			if (!cmpStart && node == startDummy) {
+				cmpStart = true;
+				return;
+			}
+			if (node == endDummy) {
+				return false;
+			}
+			if (cmpStart) {
+				nodeList.push(node);
+			}
+		});
+		K(startDummy).remove();
+		K(endDummy).remove();
+		sc = range.startContainer;
+		so = range.startOffset;
+		var ec = range.endContainer, eo = range.endOffset;
+		if (so > 0) {
+			var startBefore = K(sc.childNodes[so - 1]);
+			if (startBefore && _isEmptyNode(startBefore)) {
+				startBefore.remove();
+				range.setStart(sc, so - 1);
+				if (sc == ec) {
+					range.setEnd(ec, eo - 1);
+				}
+			}
+			var startAfter = K(sc.childNodes[so]);
+			if (startAfter && _isEmptyNode(startAfter)) {
+				startAfter.remove();
+				if (sc == ec) {
+					range.setEnd(ec, eo - 1);
+				}
+			}
+		}
+		var endAfter = K(ec.childNodes[range.endOffset]);
+		if (endAfter && _isEmptyNode(endAfter)) {
+			endAfter.remove();
+		}
+		var bookmark = range.createBookmark(true);
+		_each(nodeList, function(i, node) {
+			_removeAttrOrCss(K(node), map);
+		});
+		range.moveToBookmark(bookmark);
+		return self;
+	},
+	commonNode : function(map) {
+		var range = this.range;
+		var ec = range.endContainer, eo = range.endOffset,
+			node = (ec.nodeType == 3 || eo === 0) ? ec : ec.childNodes[eo - 1];
+		function find(node) {
+			var child = node, parent = node;
+			while (parent) {
+				if (_hasAttrOrCss(K(parent), map)) {
+					return K(parent);
+				}
+				parent = parent.parentNode;
+			}
+			while (child && (child = child.lastChild)) {
+				if (_hasAttrOrCss(K(child), map)) {
+					return K(child);
+				}
+			}
+			return null;
+		}
+		var cNode = find(node);
+		if (cNode) {
+			return cNode;
+		}
+		if (node.nodeType == 1 || (ec.nodeType == 3 && eo === 0)) {
+			var prev = K(node).prev();
+			if (prev) {
+				return find(prev);
+			}
+		}
+		return null;
+	},
+	commonAncestor : function(tagName) {
+		var range = this.range,
+			sc = range.startContainer, so = range.startOffset,
+			ec = range.endContainer, eo = range.endOffset,
+			startNode = (sc.nodeType == 3 || so === 0) ? sc : sc.childNodes[so - 1],
+			endNode = (ec.nodeType == 3 || eo === 0) ? ec : ec.childNodes[eo - 1];
+		function find(node) {
+			while (node) {
+				if (node.nodeType == 1) {
+					if (node.tagName.toLowerCase() === tagName) {
+						return node;
+					}
+				}
+				node = node.parentNode;
+			}
+			return null;
+		}
+		var start = find(startNode), end = find(endNode);
+		if (start && end && start === end) {
+			return K(start);
+		}
+		return null;
+	},
+	state : function(key) {
+		var self = this, doc = self.doc, bool = false;
+		try {
+			bool = doc.queryCommandState(key);
+		} catch (e) {}
+		return bool;
+	},
+	val : function(key) {
+		var self = this, doc = self.doc, range = self.range;
+		function lc(val) {
+			return val.toLowerCase();
+		}
+		key = lc(key);
+		var val = '', knode;
+		if (key === 'fontfamily' || key === 'fontname') {
+			val = _nativeCommandValue(doc, 'fontname');
+			val = val.replace(/['"]/g, '');
+			return lc(val);
+		}
+		if (key === 'formatblock') {
+			val = _nativeCommandValue(doc, key);
+			if (val === '') {
+				knode = self.commonNode({'h1,h2,h3,h4,h5,h6,p,div,pre,address' : '*'});
+				if (knode) {
+					val = knode.name;
+				}
+			}
+			if (val === 'Normal') {
+				val = 'p';
+			}
+			return lc(val);
+		}
+		if (key === 'fontsize') {
+			knode = self.commonNode({'*' : '.font-size'});
+			if (knode) {
+				val = knode.css('font-size');
+			}
+			return lc(val);
+		}
+		if (key === 'forecolor') {
+			knode = self.commonNode({'*' : '.color'});
+			if (knode) {
+				val = knode.css('color');
+			}
+			val = _toHex(val);
+			if (val === '') {
+				val = 'default';
+			}
+			return lc(val);
+		}
+		if (key === 'hilitecolor') {
+			knode = self.commonNode({'*' : '.background-color'});
+			if (knode) {
+				val = knode.css('background-color');
+			}
+			val = _toHex(val);
+			if (val === '') {
+				val = 'default';
+			}
+			return lc(val);
+		}
+		return val;
+	},
+	toggle : function(wrapper, map) {
+		var self = this;
+		if (self.commonNode(map)) {
+			self.remove(map);
+		} else {
+			self.wrap(wrapper);
+		}
+		return self.select();
+	},
+	bold : function() {
+		return this.toggle('<strong></strong>', {
+			span : '.font-weight=bold',
+			strong : '*',
+			b : '*'
+		});
+	},
+	italic : function() {
+		return this.toggle('<em></em>', {
+			span : '.font-style=italic',
+			em : '*',
+			i : '*'
+		});
+	},
+	underline : function() {
+		return this.toggle('<u></u>', {
+			span : '.text-decoration=underline',
+			u : '*'
+		});
+	},
+	strikethrough : function() {
+		return this.toggle('<s></s>', {
+			span : '.text-decoration=line-through',
+			s : '*'
+		});
+	},
+	forecolor : function(val) {
+		return this.wrap('<span style="color:' + val + ';"></span>').select();
+	},
+	hilitecolor : function(val) {
+		return this.wrap('<span style="background-color:' + val + ';"></span>').select();
+	},
+	fontsize : function(val) {
+		return this.wrap('<span style="font-size:' + val + ';"></span>').select();
+	},
+	fontname : function(val) {
+		return this.fontfamily(val);
+	},
+	fontfamily : function(val) {
+		return this.wrap('<span style="font-family:' + val + ';"></span>').select();
+	},
+	removeformat : function() {
+		var map = {
+			'*' : '.font-weight,.font-style,.text-decoration,.color,.background-color,.font-size,.font-family,.text-indent'
+		},
+		tags = _STYLE_TAG_MAP;
+		_each(tags, function(key, val) {
+			map[key] = '*';
+		});
+		this.remove(map);
+		return this.select();
+	},
+	inserthtml : function(val, quickMode) {
+		var self = this, range = self.range;
+		if (val === '') {
+			return self;
+		}
+		function pasteHtml(range, val) {
+			val = '<img id="__kindeditor_temp_tag__" width="0" height="0" style="display:none;" />' + val;
+			var rng = range.get();
+			if (rng.item) {
+				rng.item(0).outerHTML = val;
+			} else {
+				rng.pasteHTML(val);
+			}
+			var temp = range.doc.getElementById('__kindeditor_temp_tag__');
+			temp.parentNode.removeChild(temp);
+			var newRange = _toRange(rng);
+			range.setEnd(newRange.endContainer, newRange.endOffset);
+			range.collapse(false);
+			self.select(false);
+		}
+		function insertHtml(range, val) {
+			var doc = range.doc,
+				frag = doc.createDocumentFragment();
+			K('@' + val, doc).each(function() {
+				frag.appendChild(this);
+			});
+			range.deleteContents();
+			range.insertNode(frag);
+			range.collapse(false);
+			self.select(false);
+		}
+		if (_IERANGE && quickMode) {
+			try {
+				pasteHtml(range, val);
+			} catch(e) {
+				insertHtml(range, val);
+			}
+			return self;
+		}
+		insertHtml(range, val);
+		return self;
+	},
+	hr : function() {
+		return this.inserthtml('<hr />');
+	},
+	print : function() {
+		this.win.print();
+		return this;
+	},
+	insertimage : function(url, title, width, height, border, align) {
+		title = _undef(title, '');
+		border = _undef(border, 0);
+		var html = '<img src="' + _escape(url) + '" data-ke-src="' + _escape(url) + '" ';
+		if (width) {
+			html += 'width="' + _escape(width) + '" ';
+		}
+		if (height) {
+			html += 'height="' + _escape(height) + '" ';
+		}
+		if (title) {
+			html += 'title="' + _escape(title) + '" ';
+		}
+		if (align) {
+			html += 'align="' + _escape(align) + '" ';
+		}
+		html += 'alt="' + _escape(title) + '" ';
+		html += '/>';
+		return this.inserthtml(html);
+	},
+	createlink : function(url, type) {
+		var self = this, doc = self.doc, range = self.range;
+		self.select();
+		var a = self.commonNode({ a : '*' });
+		if (a && !range.isControl()) {
+			range.selectNode(a.get());
+			self.select();
+		}
+		var html = '<a href="' + _escape(url) + '" data-ke-src="' + _escape(url) + '" ';
+		if (type) {
+			html += ' target="' + _escape(type) + '"';
+		}
+		if (range.collapsed) {
+			html += '>' + _escape(url) + '</a>';
+			return self.inserthtml(html);
+		}
+		if (range.isControl()) {
+			var node = K(range.startContainer.childNodes[range.startOffset]);
+			html += '></a>';
+			node.after(K(html, doc));
+			node.next().append(node);
+			range.selectNode(node[0]);
+			return self.select();
+		}
+		function setAttr(node, url, type) {
+			K(node).attr('href', url).attr('data-ke-src', url);
+			if (type) {
+				K(node).attr('target', type);
+			} else {
+				K(node).removeAttr('target');
+			}
+		}
+		var sc = range.startContainer, so = range.startOffset,
+			ec = range.endContainer, eo = range.endOffset;
+		if (sc.nodeType == 1 && sc === ec && so + 1 === eo) {
+			var child = sc.childNodes[so];
+			if (child.nodeName.toLowerCase() == 'a') {
+				setAttr(child, url, type);
+				return self;
+			}
+		}
+		_nativeCommand(doc, 'createlink', '__kindeditor_temp_url__');
+		K('a[href="__kindeditor_temp_url__"]', doc).each(function() {
+			setAttr(this, url, type);
+		});
+		return self;
+	},
+	unlink : function() {
+		var self = this, doc = self.doc, range = self.range;
+		self.select();
+		if (range.collapsed) {
+			var a = self.commonNode({ a : '*' });
+			if (a) {
+				range.selectNode(a.get());
+				self.select();
+			}
+			_nativeCommand(doc, 'unlink', null);
+			if (_WEBKIT && K(range.startContainer).name === 'img') {
+				var parent = K(range.startContainer).parent();
+				if (parent.name === 'a') {
+					parent.remove(true);
+				}
+			}
+		} else {
+			_nativeCommand(doc, 'unlink', null);
+		}
+		return self;
+	}
+});
+_each(('formatblock,selectall,justifyleft,justifycenter,justifyright,justifyfull,insertorderedlist,' +
+	'insertunorderedlist,indent,outdent,subscript,superscript').split(','), function(i, name) {
+	KCmd.prototype[name] = function(val) {
+		var self = this;
+		self.select();
+		_nativeCommand(self.doc, name, val);
+		if (_IERANGE && _inArray(name, 'justifyleft,justifycenter,justifyright,justifyfull'.split(',')) >= 0) {
+			self.selection();
+		}
+		if (!_IERANGE || _inArray(name, 'formatblock,selectall,insertorderedlist,insertunorderedlist'.split(',')) >= 0) {
+			self.selection();
+		}
+		return self;
+	};
+});
+_each('cut,copy,paste'.split(','), function(i, name) {
+	KCmd.prototype[name] = function() {
+		var self = this;
+		if (!self.doc.queryCommandSupported(name)) {
+			throw 'not supported';
+		}
+		self.select();
+		_nativeCommand(self.doc, name, null);
+		return self;
+	};
+});
+function _cmd(mixed) {
+	if (mixed.nodeName) {
+		var doc = _getDoc(mixed);
+		mixed = _range(doc).selectNodeContents(doc.body).collapse(false);
+	}
+	return new KCmd(mixed);
+}
+K.CmdClass = KCmd;
+K.cmd = _cmd;
+function _drag(options) {
+	var moveEl = options.moveEl,
+		moveFn = options.moveFn,
+		clickEl = options.clickEl || moveEl,
+		beforeDrag = options.beforeDrag,
+		iframeFix = options.iframeFix === undefined ? true : options.iframeFix;
+	var docs = [document];
+	if (iframeFix) {
+		K('iframe').each(function() {
+			var src = _formatUrl(this.src || '', 'absolute');
+			if (/^https?:\/\//.test(src)) {
+				return;
+			}
+			var doc;
+			try {
+				doc = _iframeDoc(this);
+			} catch(e) {}
+			if (doc) {
+				var pos = K(this).pos();
+				K(doc).data('pos-x', pos.x);
+				K(doc).data('pos-y', pos.y);
+				docs.push(doc);
+			}
+		});
+	}
+	clickEl.mousedown(function(e) {
+		e.stopPropagation();
+		var self = clickEl.get(),
+			x = _removeUnit(moveEl.css('left')),
+			y = _removeUnit(moveEl.css('top')),
+			width = moveEl.width(),
+			height = moveEl.height(),
+			pageX = e.pageX,
+			pageY = e.pageY;
+		if (beforeDrag) {
+			beforeDrag();
+		}
+		function moveListener(e) {
+			e.preventDefault();
+			var kdoc = K(_getDoc(e.target));
+			var diffX = _round((kdoc.data('pos-x') || 0) + e.pageX - pageX);
+			var diffY = _round((kdoc.data('pos-y') || 0) + e.pageY - pageY);
+			moveFn.call(clickEl, x, y, width, height, diffX, diffY);
+		}
+		function selectListener(e) {
+			e.preventDefault();
+		}
+		function upListener(e) {
+			e.preventDefault();
+			K(docs).unbind('mousemove', moveListener)
+				.unbind('mouseup', upListener)
+				.unbind('selectstart', selectListener);
+			if (self.releaseCapture) {
+				self.releaseCapture();
+			}
+		}
+		K(docs).mousemove(moveListener)
+			.mouseup(upListener)
+			.bind('selectstart', selectListener);
+		if (self.setCapture) {
+			self.setCapture();
+		}
+	});
+}
+function KWidget(options) {
+	this.init(options);
+}
+_extend(KWidget, {
+	init : function(options) {
+		var self = this;
+		self.name = options.name || '';
+		self.doc = options.doc || document;
+		self.win = _getWin(self.doc);
+		self.x = _addUnit(options.x);
+		self.y = _addUnit(options.y);
+		self.z = options.z;
+		self.width = _addUnit(options.width);
+		self.height = _addUnit(options.height);
+		self.div = K('<div style="display:block;"></div>');
+		self.options = options;
+		self._alignEl = options.alignEl;
+		if (self.width) {
+			self.div.css('width', self.width);
+		}
+		if (self.height) {
+			self.div.css('height', self.height);
+		}
+		if (self.z) {
+			self.div.css({
+				position : 'absolute',
+				left : self.x,
+				top : self.y,
+				'z-index' : self.z
+			});
+		}
+		if (self.z && (self.x === undefined || self.y === undefined)) {
+			self.autoPos(self.width, self.height);
+		}
+		if (options.cls) {
+			self.div.addClass(options.cls);
+		}
+		if (options.shadowMode) {
+			self.div.addClass('ke-shadow');
+		}
+		if (options.css) {
+			self.div.css(options.css);
+		}
+		if (options.src) {
+			K(options.src).replaceWith(self.div);
+		} else {
+			K(self.doc.body).append(self.div);
+		}
+		if (options.html) {
+			self.div.html(options.html);
+		}
+		if (options.autoScroll) {
+			if (_IE && _V < 7 || _QUIRKS) {
+				var scrollPos = _getScrollPos();
+				K(self.win).bind('scroll', function(e) {
+					var pos = _getScrollPos(),
+						diffX = pos.x - scrollPos.x,
+						diffY = pos.y - scrollPos.y;
+					self.pos(_removeUnit(self.x) + diffX, _removeUnit(self.y) + diffY, false);
+				});
+			} else {
+				self.div.css('position', 'fixed');
+			}
+		}
+	},
+	pos : function(x, y, updateProp) {
+		var self = this;
+		updateProp = _undef(updateProp, true);
+		if (x !== null) {
+			x = x < 0 ? 0 : _addUnit(x);
+			self.div.css('left', x);
+			if (updateProp) {
+				self.x = x;
+			}
+		}
+		if (y !== null) {
+			y = y < 0 ? 0 : _addUnit(y);
+			self.div.css('top', y);
+			if (updateProp) {
+				self.y = y;
+			}
+		}
+		return self;
+	},
+	autoPos : function(width, height) {
+		var self = this,
+			w = _removeUnit(width) || 0,
+			h = _removeUnit(height) || 0,
+			scrollPos = _getScrollPos();
+		if (self._alignEl) {
+			var knode = K(self._alignEl),
+				pos = knode.pos(),
+				diffX = _round(knode[0].clientWidth / 2 - w / 2),
+				diffY = _round(knode[0].clientHeight / 2 - h / 2);
+			x = diffX < 0 ? pos.x : pos.x + diffX;
+			y = diffY < 0 ? pos.y : pos.y + diffY;
+		} else {
+			var docEl = _docElement(self.doc);
+			x = _round(scrollPos.x + (docEl.clientWidth - w) / 2);
+			y = _round(scrollPos.y + (docEl.clientHeight - h) / 2);
+		}
+		if (!(_IE && _V < 7 || _QUIRKS)) {
+			x -= scrollPos.x;
+			y -= scrollPos.y;
+		}
+		return self.pos(x, y);
+	},
+	remove : function() {
+		var self = this;
+		if (_IE && _V < 7 || _QUIRKS) {
+			K(self.win).unbind('scroll');
+		}
+		self.div.remove();
+		_each(self, function(i) {
+			self[i] = null;
+		});
+		return this;
+	},
+	show : function() {
+		this.div.show();
+		return this;
+	},
+	hide : function() {
+		this.div.hide();
+		return this;
+	},
+	draggable : function(options) {
+		var self = this;
+		options = options || {};
+		options.moveEl = self.div;
+		options.moveFn = function(x, y, width, height, diffX, diffY) {
+			if ((x = x + diffX) < 0) {
+				x = 0;
+			}
+			if ((y = y + diffY) < 0) {
+				y = 0;
+			}
+			self.pos(x, y);
+		};
+		_drag(options);
+		return self;
+	}
+});
+function _widget(options) {
+	return new KWidget(options);
+}
+K.WidgetClass = KWidget;
+K.widget = _widget;
+function _iframeDoc(iframe) {
+	iframe = _get(iframe);
+	return iframe.contentDocument || iframe.contentWindow.document;
+}
+var html, _direction = '';
+if ((html = document.getElementsByTagName('html'))) {
+	_direction = html[0].dir;
+}
+function _getInitHtml(themesPath, bodyClass, cssPath, cssData) {
+	var arr = [
+		(_direction === '' ? '<html>' : '<html dir="' + _direction + '">'),
+		'<head><meta charset="utf-8" /><title></title>',
+		'<style>',
+		'html {margin:0;padding:0;}',
+		'body {margin:0;padding:5px;}',
+		'body, td {font:12px/1.5 "sans serif",tahoma,verdana,helvetica;}',
+		'body, p, div {word-wrap: break-word;}',
+		'p {margin:5px 0;}',
+		'table {border-collapse:collapse;}',
+		'img {border:0;}',
+		'noscript {display:none;}',
+		'table.ke-zeroborder td {border:1px dotted #AAA;}',
+		'img.ke-flash {',
+		'	border:1px solid #AAA;',
+		'	background-image:url(' + themesPath + 'common/flash.gif);',
+		'	background-position:center center;',
+		'	background-repeat:no-repeat;',
+		'	width:100px;',
+		'	height:100px;',
+		'}',
+		'img.ke-rm {',
+		'	border:1px solid #AAA;',
+		'	background-image:url(' + themesPath + 'common/rm.gif);',
+		'	background-position:center center;',
+		'	background-repeat:no-repeat;',
+		'	width:100px;',
+		'	height:100px;',
+		'}',
+		'img.ke-media {',
+		'	border:1px solid #AAA;',
+		'	background-image:url(' + themesPath + 'common/media.gif);',
+		'	background-position:center center;',
+		'	background-repeat:no-repeat;',
+		'	width:100px;',
+		'	height:100px;',
+		'}',
+		'img.ke-anchor {',
+		'	border:1px dashed #666;',
+		'	width:16px;',
+		'	height:16px;',
+		'}',
+		'.ke-script, .ke-noscript, .ke-display-none {',
+		'	display:none;',
+		'	font-size:0;',
+		'	width:0;',
+		'	height:0;',
+		'}',
+		'.ke-pagebreak {',
+		'	border:1px dotted #AAA;',
+		'	font-size:0;',
+		'	height:2px;',
+		'}',
+		'</style>'
+	];
+	if (!_isArray(cssPath)) {
+		cssPath = [cssPath];
+	}
+	_each(cssPath, function(i, path) {
+		if (path) {
+			arr.push('<link href="' + path + '" rel="stylesheet" />');
+		}
+	});
+	if (cssData) {
+		arr.push('<style>' + cssData + '</style>');
+	}
+	arr.push('</head><body ' + (bodyClass ? 'class="' + bodyClass + '"' : '') + '></body></html>');
+	return arr.join('\n');
+}
+function _elementVal(knode, val) {
+	if (knode.hasVal()) {
+		if (val === undefined) {
+			var html = knode.val();
+			html = html.replace(/(<(?:p|p\s[^>]*)>) *(<\/p>)/ig, '');
+			return html;
+		}
+		return knode.val(val);
+	}
+	return knode.html(val);
+}
+function KEdit(options) {
+	this.init(options);
+}
+_extend(KEdit, KWidget, {
+	init : function(options) {
+		var self = this;
+		KEdit.parent.init.call(self, options);
+		self.srcElement = K(options.srcElement);
+		self.div.addClass('ke-edit');
+		self.designMode = _undef(options.designMode, true);
+		self.beforeGetHtml = options.beforeGetHtml;
+		self.beforeSetHtml = options.beforeSetHtml;
+		self.afterSetHtml = options.afterSetHtml;
+		var themesPath = _undef(options.themesPath, ''),
+			bodyClass = options.bodyClass,
+			cssPath = options.cssPath,
+			cssData = options.cssData,
+			isDocumentDomain = location.protocol != 'res:' && location.host.replace(/:\d+/, '') !== document.domain,
+			srcScript = ('document.open();' +
+				(isDocumentDomain ? 'document.domain="' + document.domain + '";' : '') +
+				'document.close();'),
+			iframeSrc = _IE ? ' src="javascript:void(function(){' + encodeURIComponent(srcScript) + '}())"' : '';
+		self.iframe = K('<iframe class="ke-edit-iframe" hidefocus="true" frameborder="0"' + iframeSrc + '></iframe>').css('width', '100%');
+		self.textarea = K('<textarea class="ke-edit-textarea" hidefocus="true"></textarea>').css('width', '100%');
+		self.tabIndex = isNaN(parseInt(options.tabIndex, 10)) ? self.srcElement.attr('tabindex') : parseInt(options.tabIndex, 10);
+		self.iframe.attr('tabindex', self.tabIndex);
+		self.textarea.attr('tabindex', self.tabIndex);
+		if (self.width) {
+			self.setWidth(self.width);
+		}
+		if (self.height) {
+			self.setHeight(self.height);
+		}
+		if (self.designMode) {
+			self.textarea.hide();
+		} else {
+			self.iframe.hide();
+		}
+		function ready() {
+			var doc = _iframeDoc(self.iframe);
+			doc.open();
+			if (isDocumentDomain) {
+				doc.domain = document.domain;
+			}
+			doc.write(_getInitHtml(themesPath, bodyClass, cssPath, cssData));
+			doc.close();
+			self.win = self.iframe[0].contentWindow;
+			self.doc = doc;
+			var cmd = _cmd(doc);
+			self.afterChange(function(e) {
+				cmd.selection();
+			});
+			if (_WEBKIT) {
+				K(doc).click(function(e) {
+					if (K(e.target).name === 'img') {
+						cmd.selection(true);
+						cmd.range.selectNode(e.target);
+						cmd.select();
+					}
+				});
+			}
+			if (_IE) {
+				self._mousedownHandler = function() {
+					var newRange = cmd.range.cloneRange();
+					newRange.shrink();
+					if (newRange.isControl()) {
+						self.blur();
+					}
+				};
+				K(document).mousedown(self._mousedownHandler);
+				K(doc).keydown(function(e) {
+					if (e.which == 8) {
+						cmd.selection();
+						var rng = cmd.range;
+						if (rng.isControl()) {
+							rng.collapse(true);
+							K(rng.startContainer.childNodes[rng.startOffset]).remove();
+							e.preventDefault();
+						}
+					}
+				});
+			}
+			self.cmd = cmd;
+			self.html(_elementVal(self.srcElement));
+			if (_IE) {
+				doc.body.disabled = true;
+				doc.body.contentEditable = true;
+				doc.body.removeAttribute('disabled');
+			} else {
+				doc.designMode = 'on';
+			}
+			if (options.afterCreate) {
+				options.afterCreate.call(self);
+			}
+		}
+		if (isDocumentDomain) {
+			self.iframe.bind('load', function(e) {
+				self.iframe.unbind('load');
+				if (_IE) {
+					ready();
+				} else {
+					setTimeout(ready, 0);
+				}
+			});
+		}
+		self.div.append(self.iframe);
+		self.div.append(self.textarea);
+		self.srcElement.hide();
+		!isDocumentDomain && ready();
+	},
+	setWidth : function(val) {
+		var self = this;
+		val = _addUnit(val);
+		self.width = val;
+		self.div.css('width', val);
+		return self;
+	},
+	setHeight : function(val) {
+		var self = this;
+		val = _addUnit(val);
+		self.height = val;
+		self.div.css('height', val);
+		self.iframe.css('height', val);
+		if ((_IE && _V < 8) || _QUIRKS) {
+			val = _addUnit(_removeUnit(val) - 2);
+		}
+		self.textarea.css('height', val);
+		return self;
+	},
+	remove : function() {
+		var self = this, doc = self.doc;
+		K(doc.body).unbind();
+		K(doc).unbind();
+		K(self.win).unbind();
+		if (self._mousedownHandler) {
+			K(document).unbind('mousedown', self._mousedownHandler);
+		}
+		_elementVal(self.srcElement, self.html());
+		self.srcElement.show();
+		doc.write('');
+		self.iframe.unbind();
+		self.textarea.unbind();
+		KEdit.parent.remove.call(self);
+	},
+	html : function(val, isFull) {
+		var self = this, doc = self.doc;
+		if (self.designMode) {
+			var body = doc.body;
+			if (val === undefined) {
+				if (isFull) {
+					val = '<!doctype html><html>' + body.parentNode.innerHTML + '</html>';
+				} else {
+					val = body.innerHTML;
+				}
+				if (self.beforeGetHtml) {
+					val = self.beforeGetHtml(val);
+				}
+				if (_GECKO && val == '<br />') {
+					val = '';
+				}
+				return val;
+			}
+			if (self.beforeSetHtml) {
+				val = self.beforeSetHtml(val);
+			}
+			if (_IE && _V >= 9) {
+				val = val.replace(/(<.*?checked=")checked(".*>)/ig, '$1$2');
+			}
+			K(body).html(val);
+			if (self.afterSetHtml) {
+				self.afterSetHtml();
+			}
+			return self;
+		}
+		if (val === undefined) {
+			return self.textarea.val();
+		}
+		self.textarea.val(val);
+		return self;
+	},
+	design : function(bool) {
+		var self = this, val;
+		if (bool === undefined ? !self.designMode : bool) {
+			if (!self.designMode) {
+				val = self.html();
+				self.designMode = true;
+				self.html(val);
+				self.textarea.hide();
+				self.iframe.show();
+			}
+		} else {
+			if (self.designMode) {
+				val = self.html();
+				self.designMode = false;
+				self.html(val);
+				self.iframe.hide();
+				self.textarea.show();
+			}
+		}
+		return self.focus();
+	},
+	focus : function() {
+		var self = this;
+		self.designMode ? self.win.focus() : self.textarea[0].focus();
+		return self;
+	},
+	blur : function() {
+		var self = this;
+		if (_IE) {
+			var input = K('<input type="text" style="float:left;width:0;height:0;padding:0;margin:0;border:0;" value="" />', self.div);
+			self.div.append(input);
+			input[0].focus();
+			input.remove();
+		} else {
+			self.designMode ? self.win.blur() : self.textarea[0].blur();
+		}
+		return self;
+	},
+	afterChange : function(fn) {
+		var self = this, doc = self.doc, body = doc.body;
+		K(doc).keyup(function(e) {
+			if (!e.ctrlKey && !e.altKey && _CHANGE_KEY_MAP[e.which]) {
+				fn(e);
+			}
+		});
+		K(doc).mouseup(fn).contextmenu(fn);
+		K(self.win).blur(fn);
+		function timeoutHandler(e) {
+			setTimeout(function() {
+				fn(e);
+			}, 1);
+		}
+		K(body).bind('paste', timeoutHandler);
+		K(body).bind('cut', timeoutHandler);
+		return self;
+	}
+});
+function _edit(options) {
+	return new KEdit(options);
+}
+K.EditClass = KEdit;
+K.edit = _edit;
+K.iframeDoc = _iframeDoc;
+function _selectToolbar(name, fn) {
+	var self = this,
+		knode = self.get(name);
+	if (knode) {
+		if (knode.hasClass('ke-disabled')) {
+			return;
+		}
+		fn(knode);
+	}
+}
+function KToolbar(options) {
+	this.init(options);
+}
+_extend(KToolbar, KWidget, {
+	init : function(options) {
+		var self = this;
+		KToolbar.parent.init.call(self, options);
+		self.disableMode = _undef(options.disableMode, false);
+		self.noDisableItemMap = _toMap(_undef(options.noDisableItems, []));
+		self._itemMap = {};
+		self.div.addClass('ke-toolbar').bind('contextmenu,mousedown,mousemove', function(e) {
+			e.preventDefault();
+		}).attr('unselectable', 'on');
+		function find(target) {
+			var knode = K(target);
+			if (knode.hasClass('ke-outline')) {
+				return knode;
+			}
+			if (knode.hasClass('ke-toolbar-icon')) {
+				return knode.parent();
+			}
+		}
+		function hover(e, method) {
+			var knode = find(e.target);
+			if (knode) {
+				if (knode.hasClass('ke-disabled')) {
+					return;
+				}
+				if (knode.hasClass('ke-selected')) {
+					return;
+				}
+				knode[method]('ke-on');
+			}
+		}
+		self.div.mouseover(function(e) {
+			hover(e, 'addClass');
+		})
+		.mouseout(function(e) {
+			hover(e, 'removeClass');
+		})
+		.click(function(e) {
+			var knode = find(e.target);
+			if (knode) {
+				if (knode.hasClass('ke-disabled')) {
+					return;
+				}
+				self.options.click.call(this, e, knode.attr('data-name'));
+			}
+		});
+	},
+	get : function(name) {
+		if (this._itemMap[name]) {
+			return this._itemMap[name];
+		}
+		return (this._itemMap[name] = K('span.ke-icon-' + name, this.div).parent());
+	},
+	select : function(name) {
+		_selectToolbar.call(this, name, function(knode) {
+			knode.addClass('ke-selected');
+		});
+		return self;
+	},
+	unselect : function(name) {
+		_selectToolbar.call(this, name, function(knode) {
+			knode.removeClass('ke-selected').removeClass('ke-on');
+		});
+		return self;
+	},
+	enable : function(name) {
+		var self = this,
+			knode = name.get ? name : self.get(name);
+		if (knode) {
+			knode.removeClass('ke-disabled');
+			knode.opacity(1);
+		}
+		return self;
+	},
+	disable : function(name) {
+		var self = this,
+			knode = name.get ? name : self.get(name);
+		if (knode) {
+			knode.removeClass('ke-selected').addClass('ke-disabled');
+			knode.opacity(0.5);
+		}
+		return self;
+	},
+	disableAll : function(bool, noDisableItems) {
+		var self = this, map = self.noDisableItemMap, item;
+		if (noDisableItems) {
+			map = _toMap(noDisableItems);
+		}
+		if (bool === undefined ? !self.disableMode : bool) {
+			K('span.ke-outline', self.div).each(function() {
+				var knode = K(this),
+					name = knode[0].getAttribute('data-name', 2);
+				if (!map[name]) {
+					self.disable(knode);
+				}
+			});
+			self.disableMode = true;
+		} else {
+			K('span.ke-outline', self.div).each(function() {
+				var knode = K(this),
+					name = knode[0].getAttribute('data-name', 2);
+				if (!map[name]) {
+					self.enable(knode);
+				}
+			});
+			self.disableMode = false;
+		}
+		return self;
+	}
+});
+function _toolbar(options) {
+	return new KToolbar(options);
+}
+K.ToolbarClass = KToolbar;
+K.toolbar = _toolbar;
+function KMenu(options) {
+	this.init(options);
+}
+_extend(KMenu, KWidget, {
+	init : function(options) {
+		var self = this;
+		options.z = options.z || 811213;
+		KMenu.parent.init.call(self, options);
+		self.centerLineMode = _undef(options.centerLineMode, true);
+		self.div.addClass('ke-menu').bind('click,mousedown', function(e){
+			e.stopPropagation();
+		}).attr('unselectable', 'on');
+	},
+	addItem : function(item) {
+		var self = this;
+		if (item.title === '-') {
+			self.div.append(K('<div class="ke-menu-separator"></div>'));
+			return;
+		}
+		var itemDiv = K('<div class="ke-menu-item" unselectable="on"></div>'),
+			leftDiv = K('<div class="ke-inline-block ke-menu-item-left"></div>'),
+			rightDiv = K('<div class="ke-inline-block ke-menu-item-right"></div>'),
+			height = _addUnit(item.height),
+			iconClass = _undef(item.iconClass, '');
+		self.div.append(itemDiv);
+		if (height) {
+			itemDiv.css('height', height);
+			rightDiv.css('line-height', height);
+		}
+		var centerDiv;
+		if (self.centerLineMode) {
+			centerDiv = K('<div class="ke-inline-block ke-menu-item-center"></div>');
+			if (height) {
+				centerDiv.css('height', height);
+			}
+		}
+		itemDiv.mouseover(function(e) {
+			K(this).addClass('ke-menu-item-on');
+			if (centerDiv) {
+				centerDiv.addClass('ke-menu-item-center-on');
+			}
+		})
+		.mouseout(function(e) {
+			K(this).removeClass('ke-menu-item-on');
+			if (centerDiv) {
+				centerDiv.removeClass('ke-menu-item-center-on');
+			}
+		})
+		.click(function(e) {
+			item.click.call(K(this));
+			e.stopPropagation();
+		})
+		.append(leftDiv);
+		if (centerDiv) {
+			itemDiv.append(centerDiv);
+		}
+		itemDiv.append(rightDiv);
+		if (item.checked) {
+			iconClass = 'ke-icon-checked';
+		}
+		if (iconClass !== '') {
+			leftDiv.html('<span class="ke-inline-block ke-toolbar-icon ke-toolbar-icon-url ' + iconClass + '"></span>');
+		}
+		rightDiv.html(item.title);
+		return self;
+	},
+	remove : function() {
+		var self = this;
+		if (self.options.beforeRemove) {
+			self.options.beforeRemove.call(self);
+		}
+		K('.ke-menu-item', self.div[0]).unbind();
+		KMenu.parent.remove.call(self);
+		return self;
+	}
+});
+function _menu(options) {
+	return new KMenu(options);
+}
+K.MenuClass = KMenu;
+K.menu = _menu;
+function KColorPicker(options) {
+	this.init(options);
+}
+_extend(KColorPicker, KWidget, {
+	init : function(options) {
+		var self = this;
+		options.z = options.z || 811213;
+		KColorPicker.parent.init.call(self, options);
+		var colors = options.colors || [
+			['#E53333', '#E56600', '#FF9900', '#64451D', '#DFC5A4', '#FFE500'],
+			['#009900', '#006600', '#99BB00', '#B8D100', '#60D978', '#00D5FF'],
+			['#337FE5', '#003399', '#4C33E5', '#9933E5', '#CC33E5', '#EE33EE'],
+			['#FFFFFF', '#CCCCCC', '#999999', '#666666', '#333333', '#000000']
+		];
+		self.selectedColor = (options.selectedColor || '').toLowerCase();
+		self._cells = [];
+		self.div.addClass('ke-colorpicker').bind('click,mousedown', function(e){
+			e.stopPropagation();
+		}).attr('unselectable', 'on');
+		var table = self.doc.createElement('table');
+		self.div.append(table);
+		table.className = 'ke-colorpicker-table';
+		table.cellPadding = 0;
+		table.cellSpacing = 0;
+		table.border = 0;
+		var row = table.insertRow(0), cell = row.insertCell(0);
+		cell.colSpan = colors[0].length;
+		self._addAttr(cell, '', 'ke-colorpicker-cell-top');
+		for (var i = 0; i < colors.length; i++) {
+			row = table.insertRow(i + 1);
+			for (var j = 0; j < colors[i].length; j++) {
+				cell = row.insertCell(j);
+				self._addAttr(cell, colors[i][j], 'ke-colorpicker-cell');
+			}
+		}
+	},
+	_addAttr : function(cell, color, cls) {
+		var self = this;
+		cell = K(cell).addClass(cls);
+		if (self.selectedColor === color.toLowerCase()) {
+			cell.addClass('ke-colorpicker-cell-selected');
+		}
+		cell.attr('title', color || self.options.noColor);
+		cell.mouseover(function(e) {
+			K(this).addClass('ke-colorpicker-cell-on');
+		});
+		cell.mouseout(function(e) {
+			K(this).removeClass('ke-colorpicker-cell-on');
+		});
+		cell.click(function(e) {
+			e.stop();
+			self.options.click.call(K(this), color);
+		});
+		if (color) {
+			cell.append(K('<div class="ke-colorpicker-cell-color" unselectable="on"></div>').css('background-color', color));
+		} else {
+			cell.html(self.options.noColor);
+		}
+		K(cell).attr('unselectable', 'on');
+		self._cells.push(cell);
+	},
+	remove : function() {
+		var self = this;
+		_each(self._cells, function() {
+			this.unbind();
+		});
+		KColorPicker.parent.remove.call(self);
+		return self;
+	}
+});
+function _colorpicker(options) {
+	return new KColorPicker(options);
+}
+K.ColorPickerClass = KColorPicker;
+K.colorpicker = _colorpicker;
+function KUploadButton(options) {
+	this.init(options);
+}
+_extend(KUploadButton, {
+	init : function(options) {
+		var self = this,
+			button = K(options.button),
+			fieldName = options.fieldName || 'file',
+			url = options.url || '',
+			title = button.val(),
+			extraParams = options.extraParams || {},
+			cls = button[0].className || '',
+			target = options.target || 'kindeditor_upload_iframe_' + new Date().getTime();
+		options.afterError = options.afterError || function(str) {
+			alert(str);
+		};
+		var hiddenElements = [];
+		for(var k in extraParams){
+			hiddenElements.push('<input type="hidden" name="' + k + '" value="' + extraParams[k] + '" />');
+		}
+		var html = [
+			'<div class="ke-inline-block ' + cls + '">',
+			(options.target ? '' : '<iframe name="' + target + '" style="display:none;"></iframe>'),
+			(options.form ? '<div class="ke-upload-area">' : '<form class="ke-upload-area ke-form" method="post" enctype="multipart/form-data" target="' + target + '" action="' + url + '">'),
+			'<span class="ke-button-common">',
+			hiddenElements.join(''),
+			'<input type="button" class="ke-button-common ke-button" value="' + title + '" />',
+			'</span>',
+			'<input type="file" class="ke-upload-file" name="' + fieldName + '" tabindex="-1" />',
+			(options.form ? '</div>' : '</form>'),
+			'</div>'].join('');
+		var div = K(html, button.doc);
+		button.hide();
+		button.before(div);
+		self.div = div;
+		self.button = button;
+		self.iframe = options.target ? K('iframe[name="' + target + '"]') : K('iframe', div);
+		self.form = options.form ? K(options.form) : K('form', div);
+		self.fileBox = K('.ke-upload-file', div);
+		var width = options.width || K('.ke-button-common', div).width();
+		K('.ke-upload-area', div).width(width);
+		self.options = options;
+	},
+	submit : function() {
+		var self = this,
+			iframe = self.iframe;
+		iframe.bind('load', function() {
+			iframe.unbind();
+			var tempForm = document.createElement('form');
+			self.fileBox.before(tempForm);
+			K(tempForm).append(self.fileBox);
+			tempForm.reset();
+			K(tempForm).remove(true);
+			var doc = K.iframeDoc(iframe),
+				pre = doc.getElementsByTagName('pre')[0],
+				str = '', data;
+			if (pre) {
+				str = pre.innerHTML;
+			} else {
+				str = doc.body.innerHTML;
+			}
+			str = _unescape(str);
+			iframe[0].src = 'javascript:false';
+			try {
+				data = K.json(str);
+			} catch (e) {
+				self.options.afterError.call(self, '<!doctype html><html>' + doc.body.parentNode.innerHTML + '</html>');
+			}
+			if (data) {
+				self.options.afterUpload.call(self, data);
+			}
+		});
+		self.form[0].submit();
+		return self;
+	},
+	remove : function() {
+		var self = this;
+		if (self.fileBox) {
+			self.fileBox.unbind();
+		}
+		self.iframe.remove();
+		self.div.remove();
+		self.button.show();
+		return self;
+	}
+});
+function _uploadbutton(options) {
+	return new KUploadButton(options);
+}
+K.UploadButtonClass = KUploadButton;
+K.uploadbutton = _uploadbutton;
+function _createButton(arg) {
+	arg = arg || {};
+	var name = arg.name || '',
+		span = K('<span class="ke-button-common ke-button-outer" title="' + name + '"></span>'),
+		btn = K('<input class="ke-button-common ke-button" type="button" value="' + name + '" />');
+	if (arg.click) {
+		btn.click(arg.click);
+	}
+	span.append(btn);
+	return span;
+}
+function KDialog(options) {
+	this.init(options);
+}
+_extend(KDialog, KWidget, {
+	init : function(options) {
+		var self = this;
+		var shadowMode = _undef(options.shadowMode, true);
+		options.z = options.z || 811213;
+		options.shadowMode = false;
+		options.autoScroll = _undef(options.autoScroll, true);
+		KDialog.parent.init.call(self, options);
+		var title = options.title,
+			body = K(options.body, self.doc),
+			previewBtn = options.previewBtn,
+			yesBtn = options.yesBtn,
+			noBtn = options.noBtn,
+			closeBtn = options.closeBtn,
+			showMask = _undef(options.showMask, true);
+		self.div.addClass('ke-dialog').bind('click,mousedown', function(e){
+			e.stopPropagation();
+		});
+		var contentDiv = K('<div class="ke-dialog-content"></div>').appendTo(self.div);
+		if (_IE && _V < 7) {
+			self.iframeMask = K('<iframe src="about:blank" class="ke-dialog-shadow"></iframe>').appendTo(self.div);
+		} else if (shadowMode) {
+			K('<div class="ke-dialog-shadow"></div>').appendTo(self.div);
+		}
+		var headerDiv = K('<div class="ke-dialog-header"></div>');
+		contentDiv.append(headerDiv);
+		headerDiv.html(title);
+		self.closeIcon = K('<span class="ke-dialog-icon-close" title="' + closeBtn.name + '"></span>').click(closeBtn.click);
+		headerDiv.append(self.closeIcon);
+		self.draggable({
+			clickEl : headerDiv,
+			beforeDrag : options.beforeDrag
+		});
+		var bodyDiv = K('<div class="ke-dialog-body"></div>');
+		contentDiv.append(bodyDiv);
+		bodyDiv.append(body);
+		var footerDiv = K('<div class="ke-dialog-footer"></div>');
+		if (previewBtn || yesBtn || noBtn) {
+			contentDiv.append(footerDiv);
+		}
+		_each([
+			{ btn : previewBtn, name : 'preview' },
+			{ btn : yesBtn, name : 'yes' },
+			{ btn : noBtn, name : 'no' }
+		], function() {
+			if (this.btn) {
+				var button = _createButton(this.btn);
+				button.addClass('ke-dialog-' + this.name);
+				footerDiv.append(button);
+			}
+		});
+		if (self.height) {
+			bodyDiv.height(_removeUnit(self.height) - headerDiv.height() - footerDiv.height());
+		}
+		self.div.width(self.div.width());
+		self.div.height(self.div.height());
+		self.mask = null;
+		if (showMask) {
+			var docEl = _docElement(self.doc),
+				docWidth = Math.max(docEl.scrollWidth, docEl.clientWidth),
+				docHeight = Math.max(docEl.scrollHeight, docEl.clientHeight);
+			self.mask = _widget({
+				x : 0,
+				y : 0,
+				z : self.z - 1,
+				cls : 'ke-dialog-mask',
+				width : docWidth,
+				height : docHeight
+			});
+		}
+		self.autoPos(self.div.width(), self.div.height());
+		self.footerDiv = footerDiv;
+		self.bodyDiv = bodyDiv;
+		self.headerDiv = headerDiv;
+		self.isLoading = false;
+	},
+	setMaskIndex : function(z) {
+		var self = this;
+		self.mask.div.css('z-index', z);
+	},
+	showLoading : function(msg) {
+		msg = _undef(msg, '');
+		var self = this, body = self.bodyDiv;
+		self.loading = K('<div class="ke-dialog-loading"><div class="ke-inline-block ke-dialog-loading-content" style="margin-top:' + Math.round(body.height() / 3) + 'px;">' + msg + '</div></div>')
+			.width(body.width()).height(body.height())
+			.css('top', self.headerDiv.height() + 'px');
+		body.css('visibility', 'hidden').after(self.loading);
+		self.isLoading = true;
+		return self;
+	},
+	hideLoading : function() {
+		this.loading && this.loading.remove();
+		this.bodyDiv.css('visibility', 'visible');
+		this.isLoading = false;
+		return this;
+	},
+	remove : function() {
+		var self = this;
+		if (self.options.beforeRemove) {
+			self.options.beforeRemove.call(self);
+		}
+		self.mask && self.mask.remove();
+		self.iframeMask && self.iframeMask.remove();
+		self.closeIcon.unbind();
+		K('input', self.div).unbind();
+		K('button', self.div).unbind();
+		self.footerDiv.unbind();
+		self.bodyDiv.unbind();
+		self.headerDiv.unbind();
+		K('iframe', self.div).each(function() {
+			K(this).remove();
+		});
+		KDialog.parent.remove.call(self);
+		return self;
+	}
+});
+function _dialog(options) {
+	return new KDialog(options);
+}
+K.DialogClass = KDialog;
+K.dialog = _dialog;
+function _tabs(options) {
+	var self = _widget(options),
+		remove = self.remove,
+		afterSelect = options.afterSelect,
+		div = self.div,
+		liList = [];
+	div.addClass('ke-tabs')
+		.bind('contextmenu,mousedown,mousemove', function(e) {
+			e.preventDefault();
+		});
+	var ul = K('<ul class="ke-tabs-ul ke-clearfix"></ul>');
+	div.append(ul);
+	self.add = function(tab) {
+		var li = K('<li class="ke-tabs-li">' + tab.title + '</li>');
+		li.data('tab', tab);
+		liList.push(li);
+		ul.append(li);
+	};
+	self.selectedIndex = 0;
+	self.select = function(index) {
+		self.selectedIndex = index;
+		_each(liList, function(i, li) {
+			li.unbind();
+			if (i === index) {
+				li.addClass('ke-tabs-li-selected');
+				K(li.data('tab').panel).show('');
+			} else {
+				li.removeClass('ke-tabs-li-selected').removeClass('ke-tabs-li-on')
+				.mouseover(function() {
+					K(this).addClass('ke-tabs-li-on');
+				})
+				.mouseout(function() {
+					K(this).removeClass('ke-tabs-li-on');
+				})
+				.click(function() {
+					self.select(i);
+				});
+				K(li.data('tab').panel).hide();
+			}
+		});
+		if (afterSelect) {
+			afterSelect.call(self, index);
+		}
+	};
+	self.remove = function() {
+		_each(liList, function() {
+			this.remove();
+		});
+		ul.remove();
+		remove.call(self);
+	};
+	return self;
+}
+K.tabs = _tabs;
+function _loadScript(url, fn) {
+	var head = document.getElementsByTagName('head')[0] || (_QUIRKS ? document.body : document.documentElement),
+		script = document.createElement('script');
+	head.appendChild(script);
+	script.src = url;
+	script.charset = 'utf-8';
+	script.onload = script.onreadystatechange = function() {
+		if (!this.readyState || this.readyState === 'loaded') {
+			if (fn) {
+				fn();
+			}
+			script.onload = script.onreadystatechange = null;
+			head.removeChild(script);
+		}
+	};
+}
+function _chopQuery(url) {
+	var index = url.indexOf('?');
+	return index > 0 ? url.substr(0, index) : url;
+}
+function _loadStyle(url) {
+	var head = document.getElementsByTagName('head')[0] || (_QUIRKS ? document.body : document.documentElement),
+		link = document.createElement('link'),
+		absoluteUrl = _chopQuery(_formatUrl(url, 'absolute'));
+	var links = K('link[rel="stylesheet"]', head);
+	for (var i = 0, len = links.length; i < len; i++) {
+		if (_chopQuery(_formatUrl(links[i].href, 'absolute')) === absoluteUrl) {
+			return;
+		}
+	}
+	head.appendChild(link);
+	link.href = url;
+	link.rel = 'stylesheet';
+}
+function _ajax(url, fn, method, param, dataType) {
+	method = method || 'GET';
+	dataType = dataType || 'json';
+	var xhr = window.XMLHttpRequest ? new window.XMLHttpRequest() : new ActiveXObject('Microsoft.XMLHTTP');
+	xhr.open(method, url, true);
+	xhr.onreadystatechange = function () {
+		if (xhr.readyState == 4 && xhr.status == 200) {
+			if (fn) {
+				var data = _trim(xhr.responseText);
+				if (dataType == 'json') {
+					data = _json(data);
+				}
+				fn(data);
+			}
+		}
+	};
+	if (method == 'POST') {
+		var params = [];
+		_each(param, function(key, val) {
+			params.push(encodeURIComponent(key) + '=' + encodeURIComponent(val));
+		});
+		try {
+			xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
+		} catch (e) {}
+		xhr.send(params.join('&'));
+	} else {
+		xhr.send(null);
+	}
+}
+K.loadScript = _loadScript;
+K.loadStyle = _loadStyle;
+K.ajax = _ajax;
+var _plugins = {};
+function _plugin(name, fn) {
+	if (name === undefined) {
+		return _plugins;
+	}
+	if (!fn) {
+		return _plugins[name];
+	}
+	_plugins[name] = fn;
+}
+var _language = {};
+function _parseLangKey(key) {
+	var match, ns = 'core';
+	if ((match = /^(\w+)\.(\w+)$/.exec(key))) {
+		ns = match[1];
+		key = match[2];
+	}
+	return { ns : ns, key : key };
+}
+function _lang(mixed, langType) {
+	langType = langType === undefined ? K.options.langType : langType;
+	if (typeof mixed === 'string') {
+		if (!_language[langType]) {
+			return 'no language';
+		}
+		var pos = mixed.length - 1;
+		if (mixed.substr(pos) === '.') {
+			return _language[langType][mixed.substr(0, pos)];
+		}
+		var obj = _parseLangKey(mixed);
+		return _language[langType][obj.ns][obj.key];
+	}
+	_each(mixed, function(key, val) {
+		var obj = _parseLangKey(key);
+		if (!_language[langType]) {
+			_language[langType] = {};
+		}
+		if (!_language[langType][obj.ns]) {
+			_language[langType][obj.ns] = {};
+		}
+		_language[langType][obj.ns][obj.key] = val;
+	});
+}
+function _getImageFromRange(range, fn) {
+	if (range.collapsed) {
+		return;
+	}
+	range = range.cloneRange().up();
+	var sc = range.startContainer, so = range.startOffset;
+	if (!_WEBKIT && !range.isControl()) {
+		return;
+	}
+	var img = K(sc.childNodes[so]);
+	if (!img || img.name != 'img') {
+		return;
+	}
+	if (fn(img)) {
+		return img;
+	}
+}
+function _bindContextmenuEvent() {
+	var self = this, doc = self.edit.doc;
+	K(doc).contextmenu(function(e) {
+		if (self.menu) {
+			self.hideMenu();
+		}
+		if (!self.useContextmenu) {
+			e.preventDefault();
+			return;
+		}
+		if (self._contextmenus.length === 0) {
+			return;
+		}
+		var maxWidth = 0, items = [];
+		_each(self._contextmenus, function() {
+			if (this.title == '-') {
+				items.push(this);
+				return;
+			}
+			if (this.cond && this.cond()) {
+				items.push(this);
+				if (this.width && this.width > maxWidth) {
+					maxWidth = this.width;
+				}
+			}
+		});
+		while (items.length > 0 && items[0].title == '-') {
+			items.shift();
+		}
+		while (items.length > 0 && items[items.length - 1].title == '-') {
+			items.pop();
+		}
+		var prevItem = null;
+		_each(items, function(i) {
+			if (this.title == '-' && prevItem.title == '-') {
+				delete items[i];
+			}
+			prevItem = this;
+		});
+		if (items.length > 0) {
+			e.preventDefault();
+			var pos = K(self.edit.iframe).pos(),
+				menu = _menu({
+					x : pos.x + e.clientX,
+					y : pos.y + e.clientY,
+					width : maxWidth,
+					css : { visibility: 'hidden' },
+					shadowMode : self.shadowMode
+				});
+			_each(items, function() {
+				if (this.title) {
+					menu.addItem(this);
+				}
+			});
+			var docEl = _docElement(menu.doc),
+				menuHeight = menu.div.height();
+			if (e.clientY + menuHeight >= docEl.clientHeight - 100) {
+				menu.pos(menu.x, _removeUnit(menu.y) - menuHeight);
+			}
+			menu.div.css('visibility', 'visible');
+			self.menu = menu;
+		}
+	});
+}
+function _bindNewlineEvent() {
+	var self = this, doc = self.edit.doc, newlineTag = self.newlineTag;
+	if (_IE && newlineTag !== 'br') {
+		return;
+	}
+	if (_GECKO && _V < 3 && newlineTag !== 'p') {
+		return;
+	}
+	if (_OPERA && _V < 9) {
+		return;
+	}
+	var brSkipTagMap = _toMap('h1,h2,h3,h4,h5,h6,pre,li'),
+		pSkipTagMap = _toMap('p,h1,h2,h3,h4,h5,h6,pre,li,blockquote');
+	function getAncestorTagName(range) {
+		var ancestor = K(range.commonAncestor());
+		while (ancestor) {
+			if (ancestor.type == 1 && !ancestor.isStyle()) {
+				break;
+			}
+			ancestor = ancestor.parent();
+		}
+		return ancestor.name;
+	}
+	K(doc).keydown(function(e) {
+		if (e.which != 13 || e.shiftKey || e.ctrlKey || e.altKey) {
+			return;
+		}
+		self.cmd.selection();
+		var tagName = getAncestorTagName(self.cmd.range);
+		if (tagName == 'marquee' || tagName == 'select') {
+			return;
+		}
+		if (newlineTag === 'br' && !brSkipTagMap[tagName]) {
+			e.preventDefault();
+			self.insertHtml('<br />' + (_IE && _V < 9 ? '' : '\u200B'));
+			return;
+		}
+		if (!pSkipTagMap[tagName]) {
+			_nativeCommand(doc, 'formatblock', '<p>');
+		}
+	});
+	K(doc).keyup(function(e) {
+		if (e.which != 13 || e.shiftKey || e.ctrlKey || e.altKey) {
+			return;
+		}
+		if (newlineTag == 'br') {
+			return;
+		}
+		if (_GECKO) {
+			var root = self.cmd.commonAncestor('p');
+			var a = self.cmd.commonAncestor('a');
+			if (a && a.text() == '') {
+				a.remove(true);
+				self.cmd.range.selectNodeContents(root[0]).collapse(true);
+				self.cmd.select();
+			}
+			return;
+		}
+		self.cmd.selection();
+		var tagName = getAncestorTagName(self.cmd.range);
+		if (tagName == 'marquee' || tagName == 'select') {
+			return;
+		}
+		if (!pSkipTagMap[tagName]) {
+			_nativeCommand(doc, 'formatblock', '<p>');
+		}
+		var div = self.cmd.commonAncestor('div');
+		if (div) {
+			var p = K('<p></p>'),
+				child = div[0].firstChild;
+			while (child) {
+				var next = child.nextSibling;
+				p.append(child);
+				child = next;
+			}
+			div.before(p);
+			div.remove();
+			self.cmd.range.selectNodeContents(p[0]);
+			self.cmd.select();
+		}
+	});
+}
+function _bindTabEvent() {
+	var self = this, doc = self.edit.doc;
+	K(doc).keydown(function(e) {
+		if (e.which == 9) {
+			e.preventDefault();
+			if (self.afterTab) {
+				self.afterTab.call(self, e);
+				return;
+			}
+			var cmd = self.cmd, range = cmd.range;
+			range.shrink();
+			if (range.collapsed && range.startContainer.nodeType == 1) {
+				range.insertNode(K('@&nbsp;', doc)[0]);
+				cmd.select();
+			}
+			self.insertHtml('&nbsp;&nbsp;&nbsp;&nbsp;');
+		}
+	});
+}
+function _bindFocusEvent() {
+	var self = this;
+	K(self.edit.textarea[0], self.edit.win).focus(function(e) {
+		if (self.afterFocus) {
+			self.afterFocus.call(self, e);
+		}
+	}).blur(function(e) {
+		if (self.afterBlur) {
+			self.afterBlur.call(self, e);
+		}
+	});
+}
+function _removeBookmarkTag(html) {
+	return _trim(html.replace(/<span [^>]*id="?__kindeditor_bookmark_\w+_\d+__"?[^>]*><\/span>/ig, ''));
+}
+function _removeTempTag(html) {
+	return html.replace(/<div[^>]+class="?__kindeditor_paste__"?[^>]*>[\s\S]*?<\/div>/ig, '');
+}
+function _addBookmarkToStack(stack, bookmark) {
+	if (stack.length === 0) {
+		stack.push(bookmark);
+		return;
+	}
+	var prev = stack[stack.length - 1];
+	if (_removeBookmarkTag(bookmark.html) !== _removeBookmarkTag(prev.html)) {
+		stack.push(bookmark);
+	}
+}
+function _undoToRedo(fromStack, toStack) {
+	var self = this, edit = self.edit,
+		body = edit.doc.body,
+		range, bookmark;
+	if (fromStack.length === 0) {
+		return self;
+	}
+	if (edit.designMode) {
+		range = self.cmd.range;
+		bookmark = range.createBookmark(true);
+		bookmark.html = body.innerHTML;
+	} else {
+		bookmark = {
+			html : body.innerHTML
+		};
+	}
+	_addBookmarkToStack(toStack, bookmark);
+	var prev = fromStack.pop();
+	if (_removeBookmarkTag(bookmark.html) === _removeBookmarkTag(prev.html) && fromStack.length > 0) {
+		prev = fromStack.pop();
+	}
+	if (edit.designMode) {
+		edit.html(prev.html);
+		if (prev.start) {
+			range.moveToBookmark(prev);
+			self.select();
+		}
+	} else {
+		K(body).html(_removeBookmarkTag(prev.html));
+	}
+	return self;
+}
+function KEditor(options) {
+	var self = this;
+	self.options = {};
+	function setOption(key, val) {
+		if (KEditor.prototype[key] === undefined) {
+			self[key] = val;
+		}
+		self.options[key] = val;
+	}
+	_each(options, function(key, val) {
+		setOption(key, options[key]);
+	});
+	_each(K.options, function(key, val) {
+		if (self[key] === undefined) {
+			setOption(key, val);
+		}
+	});
+	var se = K(self.srcElement || '<textarea/>');
+	if (!self.width) {
+		self.width = se[0].style.width || se.width();
+	}
+	if (!self.height) {
+		self.height = se[0].style.height || se.height();
+	}
+	setOption('width', _undef(self.width, self.minWidth));
+	setOption('height', _undef(self.height, self.minHeight));
+	setOption('width', _addUnit(self.width));
+	setOption('height', _addUnit(self.height));
+	if (_MOBILE && (!_IOS || _V < 534)) {
+		self.designMode = false;
+	}
+	self.srcElement = se;
+	self.initContent = '';
+	self.plugin = {};
+	self.isCreated = false;
+	self._handlers = {};
+	self._contextmenus = [];
+	self._undoStack = [];
+	self._redoStack = [];
+	self._firstAddBookmark = true;
+	self.menu = self.contextmenu = null;
+	self.dialogs = [];
+}
+KEditor.prototype = {
+	lang : function(mixed) {
+		return _lang(mixed, this.langType);
+	},
+	loadPlugin : function(name, fn) {
+		var self = this;
+		if (_plugins[name]) {
+			if (!_isFunction(_plugins[name])) {
+				setTimeout(function() {
+					self.loadPlugin(name, fn);
+				}, 100);
+				return self;
+			}
+			_plugins[name].call(self, KindEditor);
+			if (fn) {
+				fn.call(self);
+			}
+			return self;
+		}
+		_plugins[name] = 'loading';
+		_loadScript(self.pluginsPath + name + '/' + name + '.js?ver=' + encodeURIComponent(K.DEBUG ? _TIME : _VERSION), function() {
+			setTimeout(function() {
+				if (_plugins[name]) {
+					self.loadPlugin(name, fn);
+				}
+			}, 0);
+		});
+		return self;
+	},
+	handler : function(key, fn) {
+		var self = this;
+		if (!self._handlers[key]) {
+			self._handlers[key] = [];
+		}
+		if (_isFunction(fn)) {
+			self._handlers[key].push(fn);
+			return self;
+		}
+		_each(self._handlers[key], function() {
+			fn = this.call(self, fn);
+		});
+		return fn;
+	},
+	clickToolbar : function(name, fn) {
+		var self = this, key = 'clickToolbar' + name;
+		if (fn === undefined) {
+			if (self._handlers[key]) {
+				return self.handler(key);
+			}
+			self.loadPlugin(name, function() {
+				self.handler(key);
+			});
+			return self;
+		}
+		return self.handler(key, fn);
+	},
+	updateState : function() {
+		var self = this;
+		_each(('justifyleft,justifycenter,justifyright,justifyfull,insertorderedlist,insertunorderedlist,' +
+			'subscript,superscript,bold,italic,underline,strikethrough').split(','), function(i, name) {
+			self.cmd.state(name) ? self.toolbar.select(name) : self.toolbar.unselect(name);
+		});
+		return self;
+	},
+	addContextmenu : function(item) {
+		this._contextmenus.push(item);
+		return this;
+	},
+	afterCreate : function(fn) {
+		return this.handler('afterCreate', fn);
+	},
+	beforeRemove : function(fn) {
+		return this.handler('beforeRemove', fn);
+	},
+	beforeGetHtml : function(fn) {
+		return this.handler('beforeGetHtml', fn);
+	},
+	beforeSetHtml : function(fn) {
+		return this.handler('beforeSetHtml', fn);
+	},
+	afterSetHtml : function(fn) {
+		return this.handler('afterSetHtml', fn);
+	},
+	create : function() {
+		var self = this, fullscreenMode = self.fullscreenMode;
+		if (self.isCreated) {
+			return self;
+		}
+		if (self.srcElement.data('kindeditor')) {
+			return self;
+		}
+		self.srcElement.data('kindeditor', 'true');
+		if (fullscreenMode) {
+			_docElement().style.overflow = 'hidden';
+		} else {
+			_docElement().style.overflow = '';
+		}
+		var width = fullscreenMode ? _docElement().clientWidth + 'px' : self.width,
+			height = fullscreenMode ? _docElement().clientHeight + 'px' : self.height;
+		if ((_IE && _V < 8) || _QUIRKS) {
+			height = _addUnit(_removeUnit(height) + 2);
+		}
+		var container = self.container = K(self.layout);
+		if (fullscreenMode) {
+			K(document.body).append(container);
+		} else {
+			self.srcElement.before(container);
+		}
+		var toolbarDiv = K('.toolbar', container),
+			editDiv = K('.edit', container),
+			statusbar = self.statusbar = K('.statusbar', container);
+		container.removeClass('container')
+			.addClass('ke-container ke-container-' + self.themeType).css('width', width);
+		if (fullscreenMode) {
+			container.css({
+				position : 'absolute',
+				left : 0,
+				top : 0,
+				'z-index' : 811211
+			});
+			if (!_GECKO) {
+				self._scrollPos = _getScrollPos();
+			}
+			window.scrollTo(0, 0);
+			K(document.body).css({
+				'height' : '1px',
+				'overflow' : 'hidden'
+			});
+			K(document.body.parentNode).css('overflow', 'hidden');
+			self._fullscreenExecuted = true;
+		} else {
+			if (self._fullscreenExecuted) {
+				K(document.body).css({
+					'height' : '',
+					'overflow' : ''
+				});
+				K(document.body.parentNode).css('overflow', '');
+			}
+			if (self._scrollPos) {
+				window.scrollTo(self._scrollPos.x, self._scrollPos.y);
+			}
+		}
+		var htmlList = [];
+		K.each(self.items, function(i, name) {
+			if (name == '|') {
+				htmlList.push('<span class="ke-inline-block ke-separator"></span>');
+			} else if (name == '/') {
+				htmlList.push('<div class="ke-hr"></div>');
+			} else {
+				htmlList.push('<span class="ke-outline" data-name="' + name + '" title="' + self.lang(name) + '" unselectable="on">');
+				htmlList.push('<span class="ke-toolbar-icon ke-toolbar-icon-url ke-icon-' + name + '" unselectable="on"></span></span>');
+			}
+		});
+		var toolbar = self.toolbar = _toolbar({
+			src : toolbarDiv,
+			html : htmlList.join(''),
+			noDisableItems : self.noDisableItems,
+			click : function(e, name) {
+				e.stop();
+				if (self.menu) {
+					var menuName = self.menu.name;
+					self.hideMenu();
+					if (menuName === name) {
+						return;
+					}
+				}
+				self.clickToolbar(name);
+			}
+		});
+		var editHeight = _removeUnit(height) - toolbar.div.height();
+		var edit = self.edit = _edit({
+			height : editHeight > 0 && _removeUnit(height) > self.minHeight ? editHeight : self.minHeight,
+			src : editDiv,
+			srcElement : self.srcElement,
+			designMode : self.designMode,
+			themesPath : self.themesPath,
+			bodyClass : self.bodyClass,
+			cssPath : self.cssPath,
+			cssData : self.cssData,
+			beforeGetHtml : function(html) {
+				html = self.beforeGetHtml(html);
+				html = _removeBookmarkTag(_removeTempTag(html));
+				return _formatHtml(html, self.filterMode ? self.htmlTags : null, self.urlType, self.wellFormatMode, self.indentChar);
+			},
+			beforeSetHtml : function(html) {
+				html = _formatHtml(html, self.filterMode ? self.htmlTags : null, '', false);
+				return self.beforeSetHtml(html);
+			},
+			afterSetHtml : function() {
+				self.edit = edit = this;
+				self.afterSetHtml();
+			},
+			afterCreate : function() {
+				self.edit = edit = this;
+				self.cmd = edit.cmd;
+				self._docMousedownFn = function(e) {
+					if (self.menu) {
+						self.hideMenu();
+					}
+				};
+				K(edit.doc, document).mousedown(self._docMousedownFn);
+				_bindContextmenuEvent.call(self);
+				_bindNewlineEvent.call(self);
+				_bindTabEvent.call(self);
+				_bindFocusEvent.call(self);
+				edit.afterChange(function(e) {
+					if (!edit.designMode) {
+						return;
+					}
+					self.updateState();
+					self.addBookmark();
+					if (self.options.afterChange) {
+						self.options.afterChange.call(self);
+					}
+				});
+				edit.textarea.keyup(function(e) {
+					if (!e.ctrlKey && !e.altKey && _INPUT_KEY_MAP[e.which]) {
+						if (self.options.afterChange) {
+							self.options.afterChange.call(self);
+						}
+					}
+				});
+				if (self.readonlyMode) {
+					self.readonly();
+				}
+				self.isCreated = true;
+				if (self.initContent === '') {
+					self.initContent = self.html();
+				}
+				if (self._undoStack.length > 0) {
+					var prev = self._undoStack.pop();
+					if (prev.start) {
+						self.html(prev.html);
+						edit.cmd.range.moveToBookmark(prev);
+						self.select();
+					}
+				}
+				self.afterCreate();
+				if (self.options.afterCreate) {
+					self.options.afterCreate.call(self);
+				}
+			}
+		});
+		statusbar.removeClass('statusbar').addClass('ke-statusbar')
+			.append('<span class="ke-inline-block ke-statusbar-center-icon"></span>')
+			.append('<span class="ke-inline-block ke-statusbar-right-icon"></span>');
+		if (self._fullscreenResizeHandler) {
+			K(window).unbind('resize', self._fullscreenResizeHandler);
+			self._fullscreenResizeHandler = null;
+		}
+		function initResize() {
+			if (statusbar.height() === 0) {
+				setTimeout(initResize, 100);
+				return;
+			}
+			self.resize(width, height, false);
+		}
+		initResize();
+		if (fullscreenMode) {
+			self._fullscreenResizeHandler = function(e) {
+				if (self.isCreated) {
+					self.resize(_docElement().clientWidth, _docElement().clientHeight, false);
+				}
+			};
+			K(window).bind('resize', self._fullscreenResizeHandler);
+			toolbar.select('fullscreen');
+			statusbar.first().css('visibility', 'hidden');
+			statusbar.last().css('visibility', 'hidden');
+		} else {
+			if (_GECKO) {
+				K(window).bind('scroll', function(e) {
+					self._scrollPos = _getScrollPos();
+				});
+			}
+			if (self.resizeType > 0) {
+				_drag({
+					moveEl : container,
+					clickEl : statusbar,
+					moveFn : function(x, y, width, height, diffX, diffY) {
+						height += diffY;
+						self.resize(null, height);
+					}
+				});
+			} else {
+				statusbar.first().css('visibility', 'hidden');
+			}
+			if (self.resizeType === 2) {
+				_drag({
+					moveEl : container,
+					clickEl : statusbar.last(),
+					moveFn : function(x, y, width, height, diffX, diffY) {
+						width += diffX;
+						height += diffY;
+						self.resize(width, height);
+					}
+				});
+			} else {
+				statusbar.last().css('visibility', 'hidden');
+			}
+		}
+		return self;
+	},
+	remove : function() {
+		var self = this;
+		if (!self.isCreated) {
+			return self;
+		}
+		self.beforeRemove();
+		self.srcElement.data('kindeditor', '');
+		if (self.menu) {
+			self.hideMenu();
+		}
+		_each(self.dialogs, function() {
+			self.hideDialog();
+		});
+		K(document).unbind('mousedown', self._docMousedownFn);
+		self.toolbar.remove();
+		self.edit.remove();
+		self.statusbar.last().unbind();
+		self.statusbar.unbind();
+		self.container.remove();
+		self.container = self.toolbar = self.edit = self.menu = null;
+		self.dialogs = [];
+		self.isCreated = false;
+		return self;
+	},
+	resize : function(width, height, updateProp) {
+		var self = this;
+		updateProp = _undef(updateProp, true);
+		if (width) {
+			if (!/%/.test(width)) {
+				width = _removeUnit(width);
+				width = width < self.minWidth ? self.minWidth : width;
+			}
+			self.container.css('width', _addUnit(width));
+			if (updateProp) {
+				self.width = _addUnit(width);
+			}
+		}
+		if (height) {
+			height = _removeUnit(height);
+			editHeight = _removeUnit(height) - self.toolbar.div.height() - self.statusbar.height();
+			editHeight = editHeight < self.minHeight ? self.minHeight : editHeight;
+			self.edit.setHeight(editHeight);
+			if (updateProp) {
+				self.height = _addUnit(height);
+			}
+		}
+		return self;
+	},
+	select : function() {
+		this.isCreated && this.cmd.select();
+		return this;
+	},
+	html : function(val) {
+		var self = this;
+		if (val === undefined) {
+			return self.isCreated ? self.edit.html() : _elementVal(self.srcElement);
+		}
+		self.isCreated ? self.edit.html(val) : _elementVal(self.srcElement, val);
+		if (self.isCreated) {
+			self.cmd.selection();
+		}
+		return self;
+	},
+	fullHtml : function() {
+		return this.isCreated ? this.edit.html(undefined, true) : '';
+	},
+	text : function(val) {
+		var self = this;
+		if (val === undefined) {
+			return _trim(self.html().replace(/<(?!img|embed).*?>/ig, '').replace(/&nbsp;/ig, ' '));
+		} else {
+			return self.html(_escape(val));
+		}
+	},
+	isEmpty : function() {
+		return _trim(this.text().replace(/\r\n|\n|\r/, '')) === '';
+	},
+	isDirty : function() {
+		return _trim(this.initContent.replace(/\r\n|\n|\r|t/g, '')) !== _trim(this.html().replace(/\r\n|\n|\r|t/g, ''));
+	},
+	selectedHtml : function() {
+		var val = this.isCreated ? this.cmd.range.html() : '';
+		val = _removeBookmarkTag(_removeTempTag(val));
+		return val;
+	},
+	count : function(mode) {
+		var self = this;
+		mode = (mode || 'html').toLowerCase();
+		if (mode === 'html') {
+			return self.html().length;
+		}
+		if (mode === 'text') {
+			return self.text().replace(/<(?:img|embed).*?>/ig, 'K').replace(/\r\n|\n|\r/g, '').length;
+		}
+		return 0;
+	},
+	exec : function(key) {
+		key = key.toLowerCase();
+		var self = this, cmd = self.cmd,
+			changeFlag = _inArray(key, 'selectall,copy,paste,print'.split(',')) < 0;
+		if (changeFlag) {
+			self.addBookmark(false);
+		}
+		cmd[key].apply(cmd, _toArray(arguments, 1));
+		if (changeFlag) {
+			self.updateState();
+			self.addBookmark(false);
+			if (self.options.afterChange) {
+				self.options.afterChange.call(self);
+			}
+		}
+		return self;
+	},
+	insertHtml : function(val, quickMode) {
+		if (!this.isCreated) {
+			return this;
+		}
+		val = this.beforeSetHtml(val);
+		this.exec('inserthtml', val, quickMode);
+		return this;
+	},
+	appendHtml : function(val) {
+		this.html(this.html() + val);
+		if (this.isCreated) {
+			var cmd = this.cmd;
+			cmd.range.selectNodeContents(cmd.doc.body).collapse(false);
+			cmd.select();
+		}
+		return this;
+	},
+	sync : function() {
+		_elementVal(this.srcElement, this.html());
+		return this;
+	},
+	focus : function() {
+		this.isCreated ? this.edit.focus() : this.srcElement[0].focus();
+		return this;
+	},
+	blur : function() {
+		this.isCreated ? this.edit.blur() : this.srcElement[0].blur();
+		return this;
+	},
+	addBookmark : function(checkSize) {
+		checkSize = _undef(checkSize, true);
+		var self = this, edit = self.edit,
+			body = edit.doc.body,
+			html = _removeTempTag(body.innerHTML), bookmark;
+		if (checkSize && self._undoStack.length > 0) {
+			var prev = self._undoStack[self._undoStack.length - 1];
+			if (Math.abs(html.length - _removeBookmarkTag(prev.html).length) < self.minChangeSize) {
+				return self;
+			}
+		}
+		if (edit.designMode && !self._firstAddBookmark) {
+			var range = self.cmd.range;
+			bookmark = range.createBookmark(true);
+			bookmark.html = _removeTempTag(body.innerHTML);
+			range.moveToBookmark(bookmark);
+		} else {
+			bookmark = {
+				html : html
+			};
+		}
+		self._firstAddBookmark = false;
+		_addBookmarkToStack(self._undoStack, bookmark);
+		return self;
+	},
+	undo : function() {
+		return _undoToRedo.call(this, this._undoStack, this._redoStack);
+	},
+	redo : function() {
+		return _undoToRedo.call(this, this._redoStack, this._undoStack);
+	},
+	fullscreen : function(bool) {
+		this.fullscreenMode = (bool === undefined ? !this.fullscreenMode : bool);
+		this.addBookmark(false);
+		return this.remove().create();
+	},
+	readonly : function(isReadonly) {
+		isReadonly = _undef(isReadonly, true);
+		var self = this, edit = self.edit, doc = edit.doc;
+		if (self.designMode) {
+			self.toolbar.disableAll(isReadonly, []);
+		} else {
+			_each(self.noDisableItems, function() {
+				self.toolbar[isReadonly ? 'disable' : 'enable'](this);
+			});
+		}
+		if (_IE) {
+			doc.body.contentEditable = !isReadonly;
+		} else {
+			doc.designMode = isReadonly ? 'off' : 'on';
+		}
+		edit.textarea[0].disabled = isReadonly;
+	},
+	createMenu : function(options) {
+		var self = this,
+			name = options.name,
+			knode = self.toolbar.get(name),
+			pos = knode.pos();
+		options.x = pos.x;
+		options.y = pos.y + knode.height();
+		options.z = self.options.zIndex;
+		options.shadowMode = _undef(options.shadowMode, self.shadowMode);
+		if (options.selectedColor !== undefined) {
+			options.cls = 'ke-colorpicker-' + self.themeType;
+			options.noColor = self.lang('noColor');
+			self.menu = _colorpicker(options);
+		} else {
+			options.cls = 'ke-menu-' + self.themeType;
+			options.centerLineMode = false;
+			self.menu = _menu(options);
+		}
+		return self.menu;
+	},
+	hideMenu : function() {
+		this.menu.remove();
+		this.menu = null;
+		return this;
+	},
+	hideContextmenu : function() {
+		this.contextmenu.remove();
+		this.contextmenu = null;
+		return this;
+	},
+	createDialog : function(options) {
+		var self = this, name = options.name;
+		options.z = self.options.zIndex;
+		options.shadowMode = _undef(options.shadowMode, self.shadowMode);
+		options.closeBtn = _undef(options.closeBtn, {
+			name : self.lang('close'),
+			click : function(e) {
+				self.hideDialog();
+				if (_IE && self.cmd) {
+					self.cmd.select();
+				}
+			}
+		});
+		options.noBtn = _undef(options.noBtn, {
+			name : self.lang(options.yesBtn ? 'no' : 'close'),
+			click : function(e) {
+				self.hideDialog();
+				if (_IE && self.cmd) {
+					self.cmd.select();
+				}
+			}
+		});
+		if (self.dialogAlignType != 'page') {
+			options.alignEl = self.container;
+		}
+		options.cls = 'ke-dialog-' + self.themeType;
+		if (self.dialogs.length > 0) {
+			var firstDialog = self.dialogs[0],
+				parentDialog = self.dialogs[self.dialogs.length - 1];
+			firstDialog.setMaskIndex(parentDialog.z + 2);
+			options.z = parentDialog.z + 3;
+			options.showMask = false;
+		}
+		var dialog = _dialog(options);
+		self.dialogs.push(dialog);
+		return dialog;
+	},
+	hideDialog : function() {
+		var self = this;
+		if (self.dialogs.length > 0) {
+			self.dialogs.pop().remove();
+		}
+		if (self.dialogs.length > 0) {
+			var firstDialog = self.dialogs[0],
+				parentDialog = self.dialogs[self.dialogs.length - 1];
+			firstDialog.setMaskIndex(parentDialog.z - 1);
+		}
+		return self;
+	},
+	errorDialog : function(html) {
+		var self = this;
+		var dialog = self.createDialog({
+			width : 750,
+			title : self.lang('uploadError'),
+			body : '<div style="padding:10px 20px;"><iframe frameborder="0" style="width:708px;height:400px;"></iframe></div>'
+		});
+		var iframe = K('iframe', dialog.div), doc = K.iframeDoc(iframe);
+		doc.open();
+		doc.write(html);
+		doc.close();
+		K(doc.body).css('background-color', '#FFF');
+		iframe[0].contentWindow.focus();
+		return self;
+	}
+};
+function _editor(options) {
+	return new KEditor(options);
+}
+_instances = [];
+function _create(expr, options) {
+	options = options || {};
+	options.basePath = _undef(options.basePath, K.basePath);
+	options.themesPath = _undef(options.themesPath, options.basePath + 'themes/');
+	options.langPath = _undef(options.langPath, options.basePath + 'lang/');
+	options.pluginsPath = _undef(options.pluginsPath, options.basePath + 'plugins/');
+	if (_undef(options.loadStyleMode, K.options.loadStyleMode)) {
+		var themeType = _undef(options.themeType, K.options.themeType);
+		_loadStyle(options.themesPath + 'default/default.css');
+		_loadStyle(options.themesPath + themeType + '/' + themeType + '.css');
+	}
+	function create(editor) {
+		_each(_plugins, function(name, fn) {
+			if (_isFunction(fn)) {
+				fn.call(editor, KindEditor);
+			}
+		});
+		return editor.create();
+	}
+	var knode = K(expr);
+	if (!knode || knode.length === 0) {
+		return;
+	}
+	if (knode.length > 1) {
+		knode.each(function() {
+			_create(this, options);
+		});
+		return _instances[0];
+	}
+	options.srcElement = knode[0];
+	var editor = new KEditor(options);
+	_instances.push(editor);
+	if (_language[editor.langType]) {
+		return create(editor);
+	}
+	_loadScript(editor.langPath + editor.langType + '.js?ver=' + encodeURIComponent(K.DEBUG ? _TIME : _VERSION), function() {
+		create(editor);
+	});
+	return editor;
+}
+function _eachEditor(expr, fn) {
+	K(expr).each(function(i, el) {
+		K.each(_instances, function(j, editor) {
+			if (editor && editor.srcElement[0] == el) {
+				fn.call(editor, j);
+				return false;
+			}
+		});
+	});
+}
+K.remove = function(expr) {
+	_eachEditor(expr, function(i) {
+		this.remove();
+		_instances.splice(i, 1);
+	});
+};
+K.sync = function(expr) {
+	_eachEditor(expr, function() {
+		this.sync();
+	});
+};
+K.html = function(expr, val) {
+	_eachEditor(expr, function() {
+		this.html(val);
+	});
+};
+K.insertHtml = function(expr, val) {
+	_eachEditor(expr, function() {
+		this.insertHtml(val);
+	});
+};
+K.appendHtml = function(expr, val) {
+	_eachEditor(expr, function() {
+		this.appendHtml(val);
+	});
+};
+if (_IE && _V < 7) {
+	_nativeCommand(document, 'BackgroundImageCache', true);
+}
+K.EditorClass = KEditor;
+K.editor = _editor;
+K.create = _create;
+K.instances = _instances;
+K.plugin = _plugin;
+K.lang = _lang;
+_plugin('core', function(K) {
+	var self = this,
+		shortcutKeys = {
+			undo : 'Z', redo : 'Y', bold : 'B', italic : 'I', underline : 'U', print : 'P', selectall : 'A'
+		};
+	self.afterSetHtml(function() {
+		if (self.options.afterChange) {
+			self.options.afterChange.call(self);
+		}
+	});
+	self.afterCreate(function() {
+		if (self.syncType != 'form') {
+			return;
+		}
+		var el = K(self.srcElement), hasForm = false;
+		while ((el = el.parent())) {
+			if (el.name == 'form') {
+				hasForm = true;
+				break;
+			}
+		}
+		if (hasForm) {
+			el.bind('submit', function(e) {
+				self.sync();
+				K(window).bind('unload', function() {
+					self.edit.textarea.remove();
+				});
+			});
+			var resetBtn = K('[type="reset"]', el);
+			resetBtn.click(function() {
+				self.html(self.initContent);
+				self.cmd.selection();
+			});
+			self.beforeRemove(function() {
+				el.unbind();
+				resetBtn.unbind();
+			});
+		}
+	});
+	self.clickToolbar('source', function() {
+		if (self.edit.designMode) {
+			self.toolbar.disableAll(true);
+			self.edit.design(false);
+			self.toolbar.select('source');
+		} else {
+			self.toolbar.disableAll(false);
+			self.edit.design(true);
+			self.toolbar.unselect('source');
+			if (_GECKO) {
+				setTimeout(function() {
+					self.cmd.selection();
+				}, 0);
+			} else {
+				self.cmd.selection();
+			}
+		}
+		self.designMode = self.edit.designMode;
+	});
+	self.afterCreate(function() {
+		if (!self.designMode) {
+			self.toolbar.disableAll(true).select('source');
+		}
+	});
+	self.clickToolbar('fullscreen', function() {
+		self.fullscreen();
+	});
+	if (self.fullscreenShortcut) {
+		var loaded = false;
+		self.afterCreate(function() {
+			K(self.edit.doc, self.edit.textarea).keyup(function(e) {
+				if (e.which == 27) {
+					setTimeout(function() {
+						self.fullscreen();
+					}, 0);
+				}
+			});
+			if (loaded) {
+				if (_IE && !self.designMode) {
+					return;
+				}
+				self.focus();
+			}
+			if (!loaded) {
+				loaded = true;
+			}
+		});
+	}
+	_each('undo,redo'.split(','), function(i, name) {
+		if (shortcutKeys[name]) {
+			self.afterCreate(function() {
+				_ctrl(this.edit.doc, shortcutKeys[name], function() {
+					self.clickToolbar(name);
+				});
+			});
+		}
+		self.clickToolbar(name, function() {
+			self[name]();
+		});
+	});
+	self.clickToolbar('formatblock', function() {
+		var blocks = self.lang('formatblock.formatBlock'),
+			heights = {
+				h1 : 28,
+				h2 : 24,
+				h3 : 18,
+				H4 : 14,
+				p : 12
+			},
+			curVal = self.cmd.val('formatblock'),
+			menu = self.createMenu({
+				name : 'formatblock',
+				width : self.langType == 'en' ? 200 : 150
+			});
+		_each(blocks, function(key, val) {
+			var style = 'font-size:' + heights[key] + 'px;';
+			if (key.charAt(0) === 'h') {
+				style += 'font-weight:bold;';
+			}
+			menu.addItem({
+				title : '<span style="' + style + '" unselectable="on">' + val + '</span>',
+				height : heights[key] + 12,
+				checked : (curVal === key || curVal === val),
+				click : function() {
+					self.select().exec('formatblock', '<' + key + '>').hideMenu();
+				}
+			});
+		});
+	});
+	self.clickToolbar('fontname', function() {
+		var curVal = self.cmd.val('fontname'),
+			menu = self.createMenu({
+				name : 'fontname',
+				width : 150
+			});
+		_each(self.lang('fontname.fontName'), function(key, val) {
+			menu.addItem({
+				title : '<span style="font-family: ' + key + ';" unselectable="on">' + val + '</span>',
+				checked : (curVal === key.toLowerCase() || curVal === val.toLowerCase()),
+				click : function() {
+					self.exec('fontname', key).hideMenu();
+				}
+			});
+		});
+	});
+	self.clickToolbar('fontsize', function() {
+		var curVal = self.cmd.val('fontsize'),
+			menu = self.createMenu({
+				name : 'fontsize',
+				width : 150
+			});
+		_each(self.fontSizeTable, function(i, val) {
+			menu.addItem({
+				title : '<span style="font-size:' + val + ';" unselectable="on">' + val + '</span>',
+				height : _removeUnit(val) + 12,
+				checked : curVal === val,
+				click : function() {
+					self.exec('fontsize', val).hideMenu();
+				}
+			});
+		});
+	});
+	_each('forecolor,hilitecolor'.split(','), function(i, name) {
+		self.clickToolbar(name, function() {
+			self.createMenu({
+				name : name,
+				selectedColor : self.cmd.val(name) || 'default',
+				colors : self.colorTable,
+				click : function(color) {
+					self.exec(name, color).hideMenu();
+				}
+			});
+		});
+	});
+	_each(('cut,copy,paste').split(','), function(i, name) {
+		self.clickToolbar(name, function() {
+			self.focus();
+			try {
+				self.exec(name, null);
+			} catch(e) {
+				alert(self.lang(name + 'Error'));
+			}
+		});
+	});
+	self.clickToolbar('about', function() {
+		var html = '<div style="margin:20px;">' +
+			'<div>KindEditor ' + _VERSION + '</div>' +
+			'<div>Copyright &copy; <a href="http://www.kindsoft.net/" target="_blank">kindsoft.net</a> All rights reserved.</div>' +
+			'</div>';
+		self.createDialog({
+			name : 'about',
+			width : 350,
+			title : self.lang('about'),
+			body : html
+		});
+	});
+	self.plugin.getSelectedLink = function() {
+		return self.cmd.commonAncestor('a');
+	};
+	self.plugin.getSelectedImage = function() {
+		return _getImageFromRange(self.edit.cmd.range, function(img) {
+			return !/^ke-\w+$/i.test(img[0].className);
+		});
+	};
+	self.plugin.getSelectedFlash = function() {
+		return _getImageFromRange(self.edit.cmd.range, function(img) {
+			return img[0].className == 'ke-flash';
+		});
+	};
+	self.plugin.getSelectedMedia = function() {
+		return _getImageFromRange(self.edit.cmd.range, function(img) {
+			return img[0].className == 'ke-media' || img[0].className == 'ke-rm';
+		});
+	};
+	self.plugin.getSelectedAnchor = function() {
+		return _getImageFromRange(self.edit.cmd.range, function(img) {
+			return img[0].className == 'ke-anchor';
+		});
+	};
+	_each('link,image,flash,media,anchor'.split(','), function(i, name) {
+		var uName = name.charAt(0).toUpperCase() + name.substr(1);
+		_each('edit,delete'.split(','), function(j, val) {
+			self.addContextmenu({
+				title : self.lang(val + uName),
+				click : function() {
+					self.loadPlugin(name, function() {
+						self.plugin[name][val]();
+						self.hideMenu();
+					});
+				},
+				cond : self.plugin['getSelected' + uName],
+				width : 150,
+				iconClass : val == 'edit' ? 'ke-icon-' + name : undefined
+			});
+		});
+		self.addContextmenu({ title : '-' });
+	});
+	self.plugin.getSelectedTable = function() {
+		return self.cmd.commonAncestor('table');
+	};
+	self.plugin.getSelectedRow = function() {
+		return self.cmd.commonAncestor('tr');
+	};
+	self.plugin.getSelectedCell = function() {
+		return self.cmd.commonAncestor('td');
+	};
+	_each(('prop,cellprop,colinsertleft,colinsertright,rowinsertabove,rowinsertbelow,rowmerge,colmerge,' +
+	'rowsplit,colsplit,coldelete,rowdelete,insert,delete').split(','), function(i, val) {
+		var cond = _inArray(val, ['prop', 'delete']) < 0 ? self.plugin.getSelectedCell : self.plugin.getSelectedTable;
+		self.addContextmenu({
+			title : self.lang('table' + val),
+			click : function() {
+				self.loadPlugin('table', function() {
+					self.plugin.table[val]();
+					self.hideMenu();
+				});
+			},
+			cond : cond,
+			width : 170,
+			iconClass : 'ke-icon-table' + val
+		});
+	});
+	self.addContextmenu({ title : '-' });
+	_each(('selectall,justifyleft,justifycenter,justifyright,justifyfull,insertorderedlist,' +
+		'insertunorderedlist,indent,outdent,subscript,superscript,hr,print,' +
+		'bold,italic,underline,strikethrough,removeformat,unlink').split(','), function(i, name) {
+		if (shortcutKeys[name]) {
+			self.afterCreate(function() {
+				_ctrl(this.edit.doc, shortcutKeys[name], function() {
+					self.cmd.selection();
+					self.clickToolbar(name);
+				});
+			});
+		}
+		self.clickToolbar(name, function() {
+			self.focus().exec(name, null);
+		});
+	});
+	self.afterCreate(function() {
+		var doc = self.edit.doc, cmd, bookmark, div,
+			cls = '__kindeditor_paste__', pasting = false;
+		function movePastedData() {
+			cmd.range.moveToBookmark(bookmark);
+			cmd.select();
+			if (_WEBKIT) {
+				K('div.' + cls, div).each(function() {
+					K(this).after('<br />').remove(true);
+				});
+				K('span.Apple-style-span', div).remove(true);
+				K('span.Apple-tab-span', div).remove(true);
+				K('span[style]', div).each(function() {
+					if (K(this).css('white-space') == 'nowrap') {
+						K(this).remove(true);
+					}
+				});
+				K('meta', div).remove();
+			}
+			var html = div[0].innerHTML;
+			div.remove();
+			if (html === '') {
+				return;
+			}
+			if (_WEBKIT) {
+				html = html.replace(/(<br>)\1/ig, '$1');
+			}
+			if (self.pasteType === 2) {
+				html = html.replace(/(<(?:p|p\s[^>]*)>) *(<\/p>)/ig, '');
+				if (/schemas-microsoft-com|worddocument|mso-\w+/i.test(html)) {
+					html = _clearMsWord(html, self.filterMode ? self.htmlTags : K.options.htmlTags);
+				} else {
+					html = _formatHtml(html, self.filterMode ? self.htmlTags : null);
+					html = self.beforeSetHtml(html);
+				}
+			}
+			if (self.pasteType === 1) {
+				html = html.replace(/&nbsp;/ig, ' ');
+				html = html.replace(/\n\s*\n/g, '\n');
+				html = html.replace(/<br[^>]*>/ig, '\n');
+				html = html.replace(/<\/p><p[^>]*>/ig, '\n');
+				html = html.replace(/<[^>]+>/g, '');
+				html = html.replace(/ {2}/g, ' &nbsp;');
+				if (self.newlineTag == 'p') {
+					if (/\n/.test(html)) {
+						html = html.replace(/^/, '<p>').replace(/$/, '<br /></p>').replace(/\n/g, '<br /></p><p>');
+					}
+				} else {
+					html = html.replace(/\n/g, '<br />$&');
+				}
+			}
+			self.insertHtml(html, true);
+		}
+		K(doc.body).bind('paste', function(e){
+			if (self.pasteType === 0) {
+				e.stop();
+				return;
+			}
+			if (pasting) {
+				return;
+			}
+			pasting = true;
+			K('div.' + cls, doc).remove();
+			cmd = self.cmd.selection();
+			bookmark = cmd.range.createBookmark();
+			div = K('<div class="' + cls + '"></div>', doc).css({
+				position : 'absolute',
+				width : '1px',
+				height : '1px',
+				overflow : 'hidden',
+				left : '-1981px',
+				top : K(bookmark.start).pos().y + 'px',
+				'white-space' : 'nowrap'
+			});
+			K(doc.body).append(div);
+			if (_IE) {
+				var rng = cmd.range.get(true);
+				rng.moveToElementText(div[0]);
+				rng.select();
+				rng.execCommand('paste');
+				e.preventDefault();
+			} else {
+				cmd.range.selectNodeContents(div[0]);
+				cmd.select();
+			}
+			setTimeout(function() {
+				movePastedData();
+				pasting = false;
+			}, 0);
+		});
+	});
+	self.beforeGetHtml(function(html) {
+		if (_IE && _V <= 8) {
+			html = html.replace(/<div\s+[^>]*data-ke-input-tag="([^"]*)"[^>]*>([\s\S]*?)<\/div>/ig, function(full, tag) {
+				return unescape(tag);
+			});
+			html = html.replace(/(<input)((?:\s+[^>]*)?>)/ig, function($0, $1, $2) {
+				if (!/\s+type="[^"]+"/i.test($0)) {
+					return $1 + ' type="text"' + $2;
+				}
+				return $0;
+			});
+		}
+		return html.replace(/(<(?:noscript|noscript\s[^>]*)>)([\s\S]*?)(<\/noscript>)/ig, function($0, $1, $2, $3) {
+			return $1 + _unescape($2).replace(/\s+/g, ' ') + $3;
+		})
+		.replace(/<img[^>]*class="?ke-(flash|rm|media)"?[^>]*>/ig, function(full) {
+			var imgAttrs = _getAttrList(full);
+			var styles = _getCssList(imgAttrs.style || '');
+			var attrs = _mediaAttrs(imgAttrs['data-ke-tag']);
+			var width = _undef(styles.width, '');
+			var height = _undef(styles.height, '');
+			if (/px/i.test(width)) {
+				width = _removeUnit(width);
+			}
+			if (/px/i.test(height)) {
+				height = _removeUnit(height);
+			}
+			attrs.width = _undef(imgAttrs.width, width);
+			attrs.height = _undef(imgAttrs.height, height);
+			return _mediaEmbed(attrs);
+		})
+		.replace(/<img[^>]*class="?ke-anchor"?[^>]*>/ig, function(full) {
+			var imgAttrs = _getAttrList(full);
+			return '<a name="' + unescape(imgAttrs['data-ke-name']) + '"></a>';
+		})
+		.replace(/<div\s+[^>]*data-ke-script-attr="([^"]*)"[^>]*>([\s\S]*?)<\/div>/ig, function(full, attr, code) {
+			return '<script' + unescape(attr) + '>' + unescape(code) + '</script>';
+		})
+		.replace(/<div\s+[^>]*data-ke-noscript-attr="([^"]*)"[^>]*>([\s\S]*?)<\/div>/ig, function(full, attr, code) {
+			return '<noscript' + unescape(attr) + '>' + unescape(code) + '</noscript>';
+		})
+		.replace(/(<[^>]*)data-ke-src="([^"]*)"([^>]*>)/ig, function(full, start, src, end) {
+			full = full.replace(/(\s+(?:href|src)=")[^"]*(")/i, function($0, $1, $2) {
+				return $1 + _unescape(src) + $2;
+			});
+			full = full.replace(/\s+data-ke-src="[^"]*"/i, '');
+			return full;
+		})
+		.replace(/(<[^>]+\s)data-ke-(on\w+="[^"]*"[^>]*>)/ig, function(full, start, end) {
+			return start + end;
+		});
+	});
+	self.beforeSetHtml(function(html) {
+		if (_IE && _V <= 8) {
+			html = html.replace(/<input[^>]*>|<(select|button)[^>]*>[\s\S]*?<\/\1>/ig, function(full) {
+				var attrs = _getAttrList(full);
+				var styles = _getCssList(attrs.style || '');
+				if (styles.display == 'none') {
+					return '<div class="ke-display-none" data-ke-input-tag="' + escape(full) + '"></div>';
+				}
+				return full;
+			});
+		}
+		return html.replace(/<embed[^>]*type="([^"]+)"[^>]*>(?:<\/embed>)?/ig, function(full) {
+			var attrs = _getAttrList(full);
+			attrs.src = _undef(attrs.src, '');
+			attrs.width = _undef(attrs.width, 0);
+			attrs.height = _undef(attrs.height, 0);
+			return _mediaImg(self.themesPath + 'common/blank.gif', attrs);
+		})
+		.replace(/<a[^>]*name="([^"]+)"[^>]*>(?:<\/a>)?/ig, function(full) {
+			var attrs = _getAttrList(full);
+			if (attrs.href !== undefined) {
+				return full;
+			}
+			return '<img class="ke-anchor" src="' + self.themesPath + 'common/anchor.gif" data-ke-name="' + escape(attrs.name) + '" />';
+		})
+		.replace(/<script([^>]*)>([\s\S]*?)<\/script>/ig, function(full, attr, code) {
+			return '<div class="ke-script" data-ke-script-attr="' + escape(attr) + '">' + escape(code) + '</div>';
+		})
+		.replace(/<noscript([^>]*)>([\s\S]*?)<\/noscript>/ig, function(full, attr, code) {
+			return '<div class="ke-noscript" data-ke-noscript-attr="' + escape(attr) + '">' + escape(code) + '</div>';
+		})
+		.replace(/(<[^>]*)(href|src)="([^"]*)"([^>]*>)/ig, function(full, start, key, src, end) {
+			if (full.match(/\sdata-ke-src="[^"]*"/i)) {
+				return full;
+			}
+			full = start + key + '="' + src + '"' + ' data-ke-src="' + _escape(src) + '"' + end;
+			return full;
+		})
+		.replace(/(<[^>]+\s)(on\w+="[^"]*"[^>]*>)/ig, function(full, start, end) {
+			return start + 'data-ke-' + end;
+		})
+		.replace(/<table[^>]*\s+border="0"[^>]*>/ig, function(full) {
+			if (full.indexOf('ke-zeroborder') >= 0) {
+				return full;
+			}
+			return _addClassToTag(full, 'ke-zeroborder');
+		});
+	});
+});
+})(window);
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/lang/ar.js b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/lang/ar.js
new file mode 100644
index 0000000..0516199
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/lang/ar.js
@@ -0,0 +1,233 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+* Arabic Translation By daif alotaibi (http://daif.net/)
+*******************************************************************************/
+
+KindEditor.lang({
+	source : 'عرض المصدر',
+	preview : 'معاينة الصفحة',
+	undo : 'تراجع(Ctrl+Z)',
+	redo : 'إعادة التراجع(Ctrl+Y)',
+	cut : 'قص(Ctrl+X)',
+	copy : 'نسخ(Ctrl+C)',
+	paste : 'لصق(Ctrl+V)',
+	plainpaste : 'لصق كنص عادي',
+	wordpaste : 'لصق من مايكروسفت ورد',
+	selectall : 'تحديد الكل',
+	justifyleft : 'محاذاه لليسار',
+	justifycenter : 'محاذاه للوسط',
+	justifyright : 'محاذاه لليمين',
+	justifyfull : 'محاذاه تلقائية',
+	insertorderedlist : 'قائمة مرقمه',
+	insertunorderedlist : 'قائمة نقطية',
+	indent : 'إزاحه النص',
+	outdent : 'إلغاء الازاحة',
+	subscript : 'أسفل النص',
+	superscript : 'أعلى النص',
+	formatblock : 'Paragraph format',
+	fontname : 'نوع الخط',
+	fontsize : 'حجم الخط',
+	forecolor : 'لون النص',
+	hilitecolor : 'لون خلفية النص',
+	bold : 'عريض(Ctrl+B)',
+	italic : 'مائل(Ctrl+I)',
+	underline : 'خط تحت النص(Ctrl+U)',
+	strikethrough : 'خط على النص',
+	removeformat : 'إزالة التنسيق',
+	image : 'إدراج صورة',
+	multiimage : 'Multi image',
+	flash : 'إدراج فلاش',
+	media : 'إدراج وسائط متعددة',
+	table : 'إدراج جدول',
+	tablecell : 'خلية',
+	hr : 'إدراج خط أفقي',
+	emoticons : 'إدراج وجه ضاحك',
+	link : 'رابط',
+	unlink : 'إزالة الرابط',
+	fullscreen : 'محرر ملئ الشاشة',
+	about : 'حول',
+	print : 'طباعة',
+	filemanager : 'مدير الملفات',
+	code : 'إدراج نص برمجي',
+	map : 'خرائط قووقل',
+	baidumap : 'خرائط قووقل',
+	lineheight : 'إرتفاع السطر',
+	clearhtml : 'مسح كود HTML',
+	pagebreak : 'إدراج فاصل صفحات',
+	quickformat : 'تنسيق سريع',
+	insertfile : 'إدراج ملف',
+	template : 'إدراج قالب',
+	anchor : 'رابط',
+	yes : 'موافق',
+	no : 'إلغاء',
+	close : 'إغلاق',
+	editImage : 'خصائص الصورة',
+	deleteImage : 'حذفالصورة',
+	editFlash : 'خصائص الفلاش',
+	deleteFlash : 'حذف الفلاش',
+	editMedia : 'خصائص الوسائط',
+	deleteMedia : 'حذف الوسائط',
+	editLink : 'خصائص الرابط',
+	deleteLink : 'إزالة الرابط',
+	tableprop : 'خصائص الجدول',
+	tablecellprop : 'خصائص الخلية',
+	tableinsert : 'إدراج جدول',
+	tabledelete : 'حذف جدول',
+	tablecolinsertleft : 'إدراج عمود لليسار',
+	tablecolinsertright : 'إدراج عمود لليسار',
+	tablerowinsertabove : 'إدراج صف للأعلى',
+	tablerowinsertbelow : 'إدراج صف للأسفل',
+	tablerowmerge : 'دمج للأسفل',
+	tablecolmerge : 'دمج لليمين',
+	tablerowsplit : 'تقسم الصف',
+	tablecolsplit : 'تقسيم العمود',
+	tablecoldelete : 'حذف العمود',
+	tablerowdelete : 'حذف الصف',
+	noColor : 'إفتراضي',
+	pleaseSelectFile : 'Please select file.',
+	invalidImg : "الرجاء إدخال رابط صحيح.\nالملفات المسموح بها: jpg,gif,bmp,png",
+	invalidMedia : "الرجاء إدخال رابط صحيح.\nالملفات المسموح بها: swf,flv,mp3,wav,wma,wmv,mid,avi,mpg,asf,rm,rmvb",
+	invalidWidth : "العرض يجب أن يكون رقم.",
+	invalidHeight : "الإرتفاع يجب أن يكون رقم.",
+	invalidBorder : "عرض الحد يجب أن يكون رقم.",
+	invalidUrl : "الرجاء إدخال رابط حيح.",
+	invalidRows : 'صفوف غير صحيح.',
+	invalidCols : 'أعمدة غير صحيحة.',
+	invalidPadding : 'The padding must be number.',
+	invalidSpacing : 'The spacing must be number.',
+	invalidJson : 'Invalid JSON string.',
+	uploadSuccess : 'تم رفع الملف بنجاح.',
+	cutError : 'حاليا غير مدعومة من المتصفح, إستخدم إختصار لوحة المفاتيح (Ctrl+X).',
+	copyError : 'حاليا غير مدعومة من المتصفح, إستخدم إختصار لوحة المفاتيح (Ctrl+C).',
+	pasteError : 'حاليا غير مدعومة من المتصفح, إستخدم إختصار لوحة المفاتيح (Ctrl+V).',
+	ajaxLoading : 'Loading ...',
+	uploadLoading : 'Uploading ...',
+	uploadError : 'Upload Error',
+	'plainpaste.comment' : 'إستخدم إختصار لوحة المفاتيح (Ctrl+V) للصق داخل النافذة.',
+	'wordpaste.comment' : 'إستخدم إختصار لوحة المفاتيح (Ctrl+V) للصق داخل النافذة.',
+	'code.pleaseInput' : 'Please input code.',
+	'link.url' : 'الرابط',
+	'link.linkType' : 'الهدف',
+	'link.newWindow' : 'نافذة جديدة',
+	'link.selfWindow' : 'نفس النافذة',
+	'flash.url' : 'الرابط',
+	'flash.width' : 'العرض',
+	'flash.height' : 'الإرتفاع',
+	'flash.upload' : 'رفع',
+	'flash.viewServer' : 'أستعراض',
+	'media.url' : 'الرابط',
+	'media.width' : 'العرض',
+	'media.height' : 'الإرتفاع',
+	'media.autostart' : 'تشغيل تلقائي',
+	'media.upload' : 'رفع',
+	'media.viewServer' : 'أستعراض',
+	'image.remoteImage' : 'إدراج الرابط',
+	'image.localImage' : 'رفع',
+	'image.remoteUrl' : 'الرابط',
+	'image.localUrl' : 'الملف',
+	'image.size' : 'الحجم',
+	'image.width' : 'العرض',
+	'image.height' : 'الإرتفاع',
+	'image.resetSize' : 'إستعادة الأبعاد',
+	'image.align' : 'محاذاة',
+	'image.defaultAlign' : 'الإفتراضي',
+	'image.leftAlign' : 'اليسار',
+	'image.rightAlign' : 'اليمين',
+	'image.imgTitle' : 'العنوان',
+	'image.upload' : 'أستعراض',
+	'image.viewServer' : 'أستعراض',
+	'multiimage.uploadDesc' : 'Allows users to upload <%=uploadLimit%> images, single image size not exceeding <%=sizeLimit%>',
+	'multiimage.startUpload' : 'Start upload',
+	'multiimage.clearAll' : 'Clear all',
+	'multiimage.insertAll' : 'Insert all',
+	'multiimage.queueLimitExceeded' : 'Queue limit exceeded.',
+	'multiimage.fileExceedsSizeLimit' : 'File exceeds size limit.',
+	'multiimage.zeroByteFile' : 'Zero byte file.',
+	'multiimage.invalidFiletype' : 'Invalid file type.',
+	'multiimage.unknownError' : 'Unknown upload error.',
+	'multiimage.pending' : 'Pending ...',
+	'multiimage.uploadError' : 'Upload error',
+	'filemanager.emptyFolder' : 'فارغ',
+	'filemanager.moveup' : 'المجلد الأب',
+	'filemanager.viewType' : 'العرض: ',
+	'filemanager.viewImage' : 'مصغرات',
+	'filemanager.listImage' : 'قائمة',
+	'filemanager.orderType' : 'الترتيب: ',
+	'filemanager.fileName' : 'بالإسم',
+	'filemanager.fileSize' : 'بالحجم',
+	'filemanager.fileType' : 'بالنوع',
+	'insertfile.url' : 'الرابط',
+	'insertfile.title' : 'العنوان',
+	'insertfile.upload' : 'رفع',
+	'insertfile.viewServer' : 'أستعراض',
+	'table.cells' : 'خلايا',
+	'table.rows' : 'صفوف',
+	'table.cols' : 'أعمدة',
+	'table.size' : 'الأبعاد',
+	'table.width' : 'العرض',
+	'table.height' : 'الإرتفاع',
+	'table.percent' : '%',
+	'table.px' : 'px',
+	'table.space' : 'الخارج',
+	'table.padding' : 'الداخل',
+	'table.spacing' : 'الفراغات',
+	'table.align' : 'محاذاه',
+	'table.textAlign' : 'افقى',
+	'table.verticalAlign' : 'رأسي',
+	'table.alignDefault' : 'إفتراضي',
+	'table.alignLeft' : 'يسار',
+	'table.alignCenter' : 'وسط',
+	'table.alignRight' : 'يمين',
+	'table.alignTop' : 'أعلى',
+	'table.alignMiddle' : 'منتصف',
+	'table.alignBottom' : 'أسفل',
+	'table.alignBaseline' : 'Baseline',
+	'table.border' : 'الحدود',
+	'table.borderWidth' : 'العرض',
+	'table.borderColor' : 'اللون',
+	'table.backgroundColor' : 'الخلفية',
+	'map.address' : 'العنوان: ',
+	'map.search' : 'بحث',
+	'baidumap.address' : 'العنوان: ',
+	'baidumap.search' : 'بحث',
+	'baidumap.insertDynamicMap' : 'Dynamic Map',
+	'anchor.name' : 'إسم الرابط',
+	'formatblock.formatBlock' : {
+		h1 : 'عنوان 1',
+		h2 : 'عنوان 2',
+		h3 : 'عنوان 3',
+		h4 : 'عنوان 4',
+		p : 'عادي'
+	},
+	'fontname.fontName' : {
+		'Arial' : 'Arial',
+		'Arial Black' : 'Arial Black',
+		'Comic Sans MS' : 'Comic Sans MS',
+		'Courier New' : 'Courier New',
+		'Garamond' : 'Garamond',
+		'Georgia' : 'Georgia',
+		'Tahoma' : 'Tahoma',
+		'Times New Roman' : 'Times New Roman',
+		'Trebuchet MS' : 'Trebuchet MS',
+		'Verdana' : 'Verdana'
+	},
+	'lineheight.lineHeight' : [
+		{'1' : 'إرتفاع السطر 1'},
+		{'1.5' : 'إرتفاع السطر 1.5'},
+		{'2' : 'إرتفاع السطر 2'},
+		{'2.5' : 'إرتفاع السطر 2.5'},
+		{'3' : 'إرتفاع السطر 3'}
+	],
+	'template.selectTemplate' : 'قالب',
+	'template.replaceContent' : 'إستبدال المحتوى الحالي',
+	'template.fileList' : {
+		'1.html' : 'صورة ونص',
+		'2.html' : 'جدول',
+		'3.html' : 'قائمة'
+	}
+}, 'ar');
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/lang/en.js b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/lang/en.js
new file mode 100644
index 0000000..39ce909
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/lang/en.js
@@ -0,0 +1,232 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.lang({
+	source : 'Source',
+	preview : 'Preview',
+	undo : 'Undo(Ctrl+Z)',
+	redo : 'Redo(Ctrl+Y)',
+	cut : 'Cut(Ctrl+X)',
+	copy : 'Copy(Ctrl+C)',
+	paste : 'Paste(Ctrl+V)',
+	plainpaste : 'Paste as plain text',
+	wordpaste : 'Paste from Word',
+	selectall : 'Select all',
+	justifyleft : 'Align left',
+	justifycenter : 'Align center',
+	justifyright : 'Align right',
+	justifyfull : 'Align full',
+	insertorderedlist : 'Ordered list',
+	insertunorderedlist : 'Unordered list',
+	indent : 'Increase indent',
+	outdent : 'Decrease indent',
+	subscript : 'Subscript',
+	superscript : 'Superscript',
+	formatblock : 'Paragraph format',
+	fontname : 'Font family',
+	fontsize : 'Font size',
+	forecolor : 'Text color',
+	hilitecolor : 'Highlight color',
+	bold : 'Bold(Ctrl+B)',
+	italic : 'Italic(Ctrl+I)',
+	underline : 'Underline(Ctrl+U)',
+	strikethrough : 'Strikethrough',
+	removeformat : 'Remove format',
+	image : 'Image',
+	multiimage : 'Multi image',
+	flash : 'Flash',
+	media : 'Embeded media',
+	table : 'Table',
+	tablecell : 'Cell',
+	hr : 'Insert horizontal line',
+	emoticons : 'Insert emoticon',
+	link : 'Link',
+	unlink : 'Unlink',
+	fullscreen : 'Toggle fullscreen mode',
+	about : 'About',
+	print : 'Print',
+	filemanager : 'File Manager',
+	code : 'Insert code',
+	map : 'Google Maps',
+	baidumap : 'Baidu Maps',
+	lineheight : 'Line height',
+	clearhtml : 'Clear HTML code',
+	pagebreak : 'Insert Page Break',
+	quickformat : 'Quick Format',
+	insertfile : 'Insert file',
+	template : 'Insert Template',
+	anchor : 'Anchor',
+	yes : 'OK',
+	no : 'Cancel',
+	close : 'Close',
+	editImage : 'Image properties',
+	deleteImage : 'Delete image',
+	editFlash : 'Flash properties',
+	deleteFlash : 'Delete flash',
+	editMedia : 'Media properties',
+	deleteMedia : 'Delete media',
+	editLink : 'Link properties',
+	deleteLink : 'Unlink',
+	tableprop : 'Table properties',
+	tablecellprop : 'Cell properties',
+	tableinsert : 'Insert table',
+	tabledelete : 'Delete table',
+	tablecolinsertleft : 'Insert column left',
+	tablecolinsertright : 'Insert column right',
+	tablerowinsertabove : 'Insert row above',
+	tablerowinsertbelow : 'Insert row below',
+	tablerowmerge : 'Merge down',
+	tablecolmerge : 'Merge right',
+	tablerowsplit : 'Split row',
+	tablecolsplit : 'Split column',
+	tablecoldelete : 'Delete column',
+	tablerowdelete : 'Delete row',
+	noColor : 'Default',
+	pleaseSelectFile : 'Please select file.',
+	invalidImg : "Please type valid URL.\nAllowed file extension: jpg,gif,bmp,png",
+	invalidMedia : "Please type valid URL.\nAllowed file extension: swf,flv,mp3,wav,wma,wmv,mid,avi,mpg,asf,rm,rmvb",
+	invalidWidth : "The width must be number.",
+	invalidHeight : "The height must be number.",
+	invalidBorder : "The border must be number.",
+	invalidUrl : "Please type valid URL.",
+	invalidRows : 'Invalid rows.',
+	invalidCols : 'Invalid columns.',
+	invalidPadding : 'The padding must be number.',
+	invalidSpacing : 'The spacing must be number.',
+	invalidJson : 'Invalid JSON string.',
+	uploadSuccess : 'Upload success.',
+	cutError : 'Currently not supported by your browser, use keyboard shortcut(Ctrl+X) instead.',
+	copyError : 'Currently not supported by your browser, use keyboard shortcut(Ctrl+C) instead.',
+	pasteError : 'Currently not supported by your browser, use keyboard shortcut(Ctrl+V) instead.',
+	ajaxLoading : 'Loading ...',
+	uploadLoading : 'Uploading ...',
+	uploadError : 'Upload Error',
+	'plainpaste.comment' : 'Use keyboard shortcut(Ctrl+V) to paste the text into the window.',
+	'wordpaste.comment' : 'Use keyboard shortcut(Ctrl+V) to paste the text into the window.',
+	'code.pleaseInput' : 'Please input code.',
+	'link.url' : 'URL',
+	'link.linkType' : 'Target',
+	'link.newWindow' : 'New window',
+	'link.selfWindow' : 'Same window',
+	'flash.url' : 'URL',
+	'flash.width' : 'Width',
+	'flash.height' : 'Height',
+	'flash.upload' : 'Upload',
+	'flash.viewServer' : 'Browse',
+	'media.url' : 'URL',
+	'media.width' : 'Width',
+	'media.height' : 'Height',
+	'media.autostart' : 'Auto start',
+	'media.upload' : 'Upload',
+	'media.viewServer' : 'Browse',
+	'image.remoteImage' : 'Insert URL',
+	'image.localImage' : 'Upload',
+	'image.remoteUrl' : 'URL',
+	'image.localUrl' : 'File',
+	'image.size' : 'Size',
+	'image.width' : 'Width',
+	'image.height' : 'Height',
+	'image.resetSize' : 'Reset dimensions',
+	'image.align' : 'Align',
+	'image.defaultAlign' : 'Default',
+	'image.leftAlign' : 'Left',
+	'image.rightAlign' : 'Right',
+	'image.imgTitle' : 'Title',
+	'image.upload' : 'Browse',
+	'image.viewServer' : 'Browse',
+	'multiimage.uploadDesc' : 'Allows users to upload <%=uploadLimit%> images, single image size not exceeding <%=sizeLimit%>',
+	'multiimage.startUpload' : 'Start upload',
+	'multiimage.clearAll' : 'Clear all',
+	'multiimage.insertAll' : 'Insert all',
+	'multiimage.queueLimitExceeded' : 'Queue limit exceeded.',
+	'multiimage.fileExceedsSizeLimit' : 'File exceeds size limit.',
+	'multiimage.zeroByteFile' : 'Zero byte file.',
+	'multiimage.invalidFiletype' : 'Invalid file type.',
+	'multiimage.unknownError' : 'Unknown upload error.',
+	'multiimage.pending' : 'Pending ...',
+	'multiimage.uploadError' : 'Upload error',
+	'filemanager.emptyFolder' : 'Blank',
+	'filemanager.moveup' : 'Parent folder',
+	'filemanager.viewType' : 'Display: ',
+	'filemanager.viewImage' : 'Thumbnails',
+	'filemanager.listImage' : 'List',
+	'filemanager.orderType' : 'Sorting: ',
+	'filemanager.fileName' : 'By name',
+	'filemanager.fileSize' : 'By size',
+	'filemanager.fileType' : 'By type',
+	'insertfile.url' : 'URL',
+	'insertfile.title' : 'Title',
+	'insertfile.upload' : 'Upload',
+	'insertfile.viewServer' : 'Browse',
+	'table.cells' : 'Cells',
+	'table.rows' : 'Rows',
+	'table.cols' : 'Columns',
+	'table.size' : 'Dimensions',
+	'table.width' : 'Width',
+	'table.height' : 'Height',
+	'table.percent' : '%',
+	'table.px' : 'px',
+	'table.space' : 'Space',
+	'table.padding' : 'Padding',
+	'table.spacing' : 'Spacing',
+	'table.align' : 'Align',
+	'table.textAlign' : 'Horizontal',
+	'table.verticalAlign' : 'Vertical',
+	'table.alignDefault' : 'Default',
+	'table.alignLeft' : 'Left',
+	'table.alignCenter' : 'Center',
+	'table.alignRight' : 'Right',
+	'table.alignTop' : 'Top',
+	'table.alignMiddle' : 'Middle',
+	'table.alignBottom' : 'Bottom',
+	'table.alignBaseline' : 'Baseline',
+	'table.border' : 'Border',
+	'table.borderWidth' : 'Width',
+	'table.borderColor' : 'Color',
+	'table.backgroundColor' : 'Background',
+	'map.address' : 'Address: ',
+	'map.search' : 'Search',
+	'baidumap.address' : 'Address: ',
+	'baidumap.search' : 'Search',
+	'baidumap.insertDynamicMap' : 'Dynamic Map',
+	'anchor.name' : 'Anchor name',
+	'formatblock.formatBlock' : {
+		h1 : 'Heading 1',
+		h2 : 'Heading 2',
+		h3 : 'Heading 3',
+		h4 : 'Heading 4',
+		p : 'Normal'
+	},
+	'fontname.fontName' : {
+		'Arial' : 'Arial',
+		'Arial Black' : 'Arial Black',
+		'Comic Sans MS' : 'Comic Sans MS',
+		'Courier New' : 'Courier New',
+		'Garamond' : 'Garamond',
+		'Georgia' : 'Georgia',
+		'Tahoma' : 'Tahoma',
+		'Times New Roman' : 'Times New Roman',
+		'Trebuchet MS' : 'Trebuchet MS',
+		'Verdana' : 'Verdana'
+	},
+	'lineheight.lineHeight' : [
+		{'1' : 'Line height 1'},
+		{'1.5' : 'Line height 1.5'},
+		{'2' : 'Line height 2'},
+		{'2.5' : 'Line height 2.5'},
+		{'3' : 'Line height 3'}
+	],
+	'template.selectTemplate' : 'Template',
+	'template.replaceContent' : 'Replace current content',
+	'template.fileList' : {
+		'1.html' : 'Image and Text',
+		'2.html' : 'Table',
+		'3.html' : 'List'
+	}
+}, 'en');
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/lang/ko.js b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/lang/ko.js
new file mode 100644
index 0000000..2341042
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/lang/ko.js
@@ -0,0 +1,237 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Composite <ukjinplant@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.lang({
+	source : '소스',
+	preview : '미리보기',
+	undo : '작업취소(Ctrl+Z)',
+	redo : '작업재개(Ctrl+Y)',
+	cut : '잘라내기(Ctrl+X)',
+	copy : '복사(Ctrl+C)',
+	paste : '붙여넣기(Ctrl+V)',
+	plainpaste : '일반 텍스트로 붙여넣기',
+	wordpaste : '워드 문서로 붙여넣기',
+	selectall : '전체 선택',
+	justifyleft : '왼쪽 정렬',
+	justifycenter : '가운데 정렬',
+	justifyright : '오른쪽 정렬',
+	justifyfull : '양쪽 정렬',
+	insertorderedlist : '순서 목록',
+	insertunorderedlist : '비순서 목록',
+	indent : '들여쓰기',
+	outdent : '내어쓰기',
+	subscript : '아랫첨자',
+	superscript : '윗첨자',
+	formatblock : '문단 형식',
+	fontname : '글꼴',
+	fontsize : '글자 크기',
+	forecolor : '글자색',
+	hilitecolor : '강조색',
+	bold : '굵게(Ctrl+B)',
+	italic : '이텔릭(Ctrl+I)',
+	underline : '빝줄(Ctrl+U)',
+	strikethrough : '취소선',
+	removeformat : '형식 제거',
+	image : '이미지 추가',
+	multiimage : '여러 이미지 추가',
+	flash : '플래시 추가',
+	media : '미디어 추가',
+	table : '표',
+	tablecell : '열',
+	hr : '구분선 추가',
+	emoticons : '이모티콘 추가',
+	link : '링크',
+	unlink : '링크 제거',
+	fullscreen : '전체 화면 모드',
+	about : '이 에디터는...',
+	print : '인쇄',
+	filemanager : '파일 관리자',
+	code : '코드 추가',
+	map : '구글 맵 추가',
+	baidumap : '바이두 맵 추가',
+	lineheight : '행 간격',
+	clearhtml : 'HTML 코드 정리',
+	pagebreak : '페이지 구분 추가',
+	quickformat : '빠른 형식',
+	insertfile : '파일 추가',
+	template : '템플릿 추가',
+	anchor : '책갈피',
+	yes : '확인',
+	no : '취소',
+	close : '닫기',
+	editImage : '이미지 속성',
+	deleteImage : '이미지 삭제',
+	editFlash : '플래시 속성',
+	deleteFlash : '플래시 삭제',
+	editMedia : '미디어 속성',
+	deleteMedia : '미디어 삭제',
+	editLink : '링크 속성',
+	deleteLink : '링크 삭제',
+	tableprop : '표 속성',
+	tablecellprop : '열 속성',
+	tableinsert : '표 추가',
+	tabledelete : '표 삭제',
+	tablecolinsertleft : '왼쪽으로 열 추가',
+	tablecolinsertright : '오른쪽으로 열 추가',
+	tablerowinsertabove : '위쪽으로 열 추가',
+	tablerowinsertbelow : '아래쪽으로 열 추가',
+	tablerowmerge : '아래로 병합',
+	tablecolmerge : '오른쪽으로 병합',
+	tablerowsplit : '행 나누기',
+	tablecolsplit : '열 나누기',
+	tablecoldelete : '열 삭제',
+	tablerowdelete : '행 삭제',
+	noColor : '기본색',
+	pleaseSelectFile : '파일 선택',
+	invalidImg : "올바른 주소를 입력하세요.\njpg,gif,bmp,png 형식이 가능합니다.",
+	invalidMedia : "올바른 주소를 입력하세요.\nswf,flv,mp3,wav,wma,wmv,mid,avi,mpg,asf,rm,rmvb 형식이 가능합니다.",
+	invalidWidth : "넓이 값은 숫자여야 합니다.",
+	invalidHeight : "높이 값은 숫자여야 합니다.",
+	invalidBorder : "굵기 값은 숫자여야 합니다.",
+	invalidUrl : "올바른 주소를 입력하세요.",
+	invalidRows : '올바른 행이 아닙니다.',
+	invalidCols : '올바른 열이 아닙니다.',
+	invalidPadding : '안쪽 여백 값은 숫자여야 합니다.',
+	invalidSpacing : '간격 길이 값은 숫자여야 합니다.',
+	invalidJson : '올바른 JSON 형식이 아닙니다.',
+	uploadSuccess : '업로드가 완료되었습니다.',
+	cutError : '브라우저가 잘라내기 기능을 지원하지 않습니다, 단축키로 대신 사용하세요. (Ctrl+X)',
+	copyError : '브라우저가 복사 기능을 지원하지 않습니다, 단축키로 대신 사용하세요. (Ctrl+X)',
+	pasteError : '브라우저가 붙여넣기 기능을 지원하지 않습니다, 단축키로 대신 사용하세요. (Ctrl+X)',
+	ajaxLoading : '불러오는 중 ...',
+	uploadLoading : '업로드 중 ...',
+	uploadError : '업로드 오류',
+	'plainpaste.comment' : '단축키(Ctrl+V)를 통하여 여기에 텍스트를 붙여넣으세요.',
+	'wordpaste.comment' : '단축키(Ctrl+V)를 통하여 여기에 워드 텍스트를 붙여넣으세요.',
+	'code.pleaseInput' : 'Please input code.',
+	'link.url' : '주소',
+	'link.linkType' : '창',
+	'link.newWindow' : '새 창',
+	'link.selfWindow' : '현재 창',
+	'flash.url' : '주소',
+	'flash.width' : '넓이',
+	'flash.height' : '높이',
+	'flash.upload' : '업로드',
+	'flash.viewServer' : '찾아보기',
+	'media.url' : '주소',
+	'media.width' : '넓이',
+	'media.height' : '높이',
+	'media.autostart' : '자동 시작',
+	'media.upload' : '업로드',
+	'media.viewServer' : '찾아보기',
+	'image.remoteImage' : '외부 이미지',
+	'image.localImage' : '내부 이미지',
+	'image.remoteUrl' : '주소',
+	'image.localUrl' : '파일',
+	'image.size' : '크기',
+	'image.width' : '넓이',
+	'image.height' : '높이',
+	'image.resetSize' : '기본 크기로',
+	'image.align' : '정렬',
+	'image.defaultAlign' : '기본',
+	'image.leftAlign' : '왼쪽',
+	'image.rightAlign' : '오른쪽',
+	'image.imgTitle' : '제목',
+	'image.upload' : '찾아보기',
+	'image.viewServer' : '찾아보기',
+	'multiimage.uploadDesc' : '최대 이미지 개수: <%=uploadLimit%>개, 개당 이미지 크기: <%=sizeLimit%>',
+	'multiimage.startUpload' : '업로드 시작',
+	'multiimage.clearAll' : '모두 삭제',
+	'multiimage.insertAll' : '모두 삽입',
+	'multiimage.queueLimitExceeded' : '업로드 개수가 초과되었습니다.',
+	'multiimage.fileExceedsSizeLimit' : '업로드 크기가 초과되었습니다.',
+	'multiimage.zeroByteFile' : '파일 크기가 없습니다.',
+	'multiimage.invalidFiletype' : '올바른 이미지가 아닙니다.',
+	'multiimage.unknownError' : '알 수 없는 업로드 오류가 발생하였습니다.',
+	'multiimage.pending' : '처리 중 ...',
+	'multiimage.uploadError' : '업로드 오류',
+	'filemanager.emptyFolder' : '빈 폴더',
+	'filemanager.moveup' : '위로',
+	'filemanager.viewType' : '보기 방식: ',
+	'filemanager.viewImage' : '미리 보기',
+	'filemanager.listImage' : '목록',
+	'filemanager.orderType' : '정렬 방식: ',
+	'filemanager.fileName' : '이름별',
+	'filemanager.fileSize' : '크기별',
+	'filemanager.fileType' : '종류별',
+	'insertfile.url' : '주소',
+	'insertfile.title' : '제목',
+	'insertfile.upload' : '업로드',
+	'insertfile.viewServer' : '찾아보기',
+	'table.cells' : '열',
+	'table.rows' : '행',
+	'table.cols' : '열',
+	'table.size' : '표 크기',
+	'table.width' : '넓이',
+	'table.height' : '높이',
+	'table.percent' : '%',
+	'table.px' : 'px',
+	'table.space' : '간격',
+	'table.padding' : '안쪽여백',
+	'table.spacing' : '간격',
+	'table.align' : '정렬',
+	'table.textAlign' : '수직',
+	'table.verticalAlign' : '수평',
+	'table.alignDefault' : '기본',
+	'table.alignLeft' : '왼쪽',
+	'table.alignCenter' : '가운데',
+	'table.alignRight' : '오른쪽',
+	'table.alignTop' : '위쪽',
+	'table.alignMiddle' : '중간',
+	'table.alignBottom' : '아래쪽',
+	'table.alignBaseline' : '글자기준',
+	'table.border' : '테두리',
+	'table.borderWidth' : '크기',
+	'table.borderColor' : '색상',
+	'table.backgroundColor' : '배경',
+	'map.address' : '주소: ',
+	'map.search' : '검색',
+	'baidumap.address' : '주소: ',
+	'baidumap.search' : '검색',
+	'baidumap.insertDynamicMap' : '동적 지도',
+	'anchor.name' : '책갈피명',
+	'formatblock.formatBlock' : {
+		h1 : '제목 1',
+		h2 : '제목 2',
+		h3 : '제목 3',
+		h4 : '제목 4',
+		p : '본문'
+	},
+	'fontname.fontName' : {
+		'Gulim' : '굴림',
+		'Dotum' : '돋움',
+		'Batang' : '바탕',
+		'Gungsuh' : '궁서',
+		'Malgun Gothic' : '맑은 고딕',
+		'Arial' : 'Arial',
+		'Arial Black' : 'Arial Black',
+		'Comic Sans MS' : 'Comic Sans MS',
+		'Courier New' : 'Courier New',
+		'Garamond' : 'Garamond',
+		'Georgia' : 'Georgia',
+		'Tahoma' : 'Tahoma',
+		'Times New Roman' : 'Times New Roman',
+		'Trebuchet MS' : 'Trebuchet MS',
+		'Verdana' : 'Verdana'
+	},
+	'lineheight.lineHeight' : [
+		{'1' : '행간 1'},
+		{'1.5' : '행간 1.5'},
+		{'2' : '행간 2'},
+		{'2.5' : '행간 2.5'},
+		{'3' : '행간 3'}
+	],
+	'template.selectTemplate' : '템플릿',
+	'template.replaceContent' : '내용 바꾸기',
+	'template.fileList' : {
+		'1.html' : '이미지와 텍스트',
+		'2.html' : '표',
+		'3.html' : '목록'
+	}
+}, 'ko');
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/lang/zh_CN.js b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/lang/zh_CN.js
new file mode 100644
index 0000000..c8506f3
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/lang/zh_CN.js
@@ -0,0 +1,236 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.lang({
+	source : 'HTML代码',
+	preview : '预览',
+	undo : '后退(Ctrl+Z)',
+	redo : '前进(Ctrl+Y)',
+	cut : '剪切(Ctrl+X)',
+	copy : '复制(Ctrl+C)',
+	paste : '粘贴(Ctrl+V)',
+	plainpaste : '粘贴为无格式文本',
+	wordpaste : '从Word粘贴',
+	selectall : '全选(Ctrl+A)',
+	justifyleft : '左对齐',
+	justifycenter : '居中',
+	justifyright : '右对齐',
+	justifyfull : '两端对齐',
+	insertorderedlist : '编号',
+	insertunorderedlist : '项目符号',
+	indent : '增加缩进',
+	outdent : '减少缩进',
+	subscript : '下标',
+	superscript : '上标',
+	formatblock : '段落',
+	fontname : '字体',
+	fontsize : '文字大小',
+	forecolor : '文字颜色',
+	hilitecolor : '文字背景',
+	bold : '粗体(Ctrl+B)',
+	italic : '斜体(Ctrl+I)',
+	underline : '下划线(Ctrl+U)',
+	strikethrough : '删除线',
+	removeformat : '删除格式',
+	image : '图片',
+	multiimage : '批量图片上传',
+	flash : 'Flash',
+	media : '视音频',
+	table : '表格',
+	tablecell : '单元格',
+	hr : '插入横线',
+	emoticons : '插入表情',
+	link : '超级链接',
+	unlink : '取消超级链接',
+	fullscreen : '全屏显示',
+	about : '关于',
+	print : '打印(Ctrl+P)',
+	filemanager : '文件空间',
+	code : '插入程序代码',
+	map : 'Google地图',
+	baidumap : '百度地图',
+	lineheight : '行距',
+	clearhtml : '清理HTML代码',
+	pagebreak : '插入分页符',
+	quickformat : '一键排版',
+	insertfile : '插入文件',
+	template : '插入模板',
+	anchor : '锚点',
+	yes : '确定',
+	no : '取消',
+	close : '关闭',
+	editImage : '图片属性',
+	deleteImage : '删除图片',
+	editFlash : 'Flash属性',
+	deleteFlash : '删除Flash',
+	editMedia : '视音频属性',
+	deleteMedia : '删除视音频',
+	editLink : '超级链接属性',
+	deleteLink : '取消超级链接',
+	editAnchor : '锚点属性',
+	deleteAnchor : '删除锚点',
+	tableprop : '表格属性',
+	tablecellprop : '单元格属性',
+	tableinsert : '插入表格',
+	tabledelete : '删除表格',
+	tablecolinsertleft : '左侧插入列',
+	tablecolinsertright : '右侧插入列',
+	tablerowinsertabove : '上方插入行',
+	tablerowinsertbelow : '下方插入行',
+	tablerowmerge : '向下合并单元格',
+	tablecolmerge : '向右合并单元格',
+	tablerowsplit : '拆分行',
+	tablecolsplit : '拆分列',
+	tablecoldelete : '删除列',
+	tablerowdelete : '删除行',
+	noColor : '无颜色',
+	pleaseSelectFile : '请选择文件。',
+	invalidImg : "请输入有效的URL地址。\n只允许jpg,gif,bmp,png格式。",
+	invalidMedia : "请输入有效的URL地址。\n只允许swf,flv,mp3,wav,wma,wmv,mid,avi,mpg,asf,rm,rmvb格式。",
+	invalidWidth : "宽度必须为数字。",
+	invalidHeight : "高度必须为数字。",
+	invalidBorder : "边框必须为数字。",
+	invalidUrl : "请输入有效的URL地址。",
+	invalidRows : '行数为必选项，只允许输入大于0的数字。',
+	invalidCols : '列数为必选项，只允许输入大于0的数字。',
+	invalidPadding : '边距必须为数字。',
+	invalidSpacing : '间距必须为数字。',
+	invalidJson : '服务器发生故障。',
+	uploadSuccess : '上传成功。',
+	cutError : '您的浏览器安全设置不允许使用剪切操作，请使用快捷键(Ctrl+X)来完成。',
+	copyError : '您的浏览器安全设置不允许使用复制操作，请使用快捷键(Ctrl+C)来完成。',
+	pasteError : '您的浏览器安全设置不允许使用粘贴操作，请使用快捷键(Ctrl+V)来完成。',
+	ajaxLoading : '加载中，请稍候 ...',
+	uploadLoading : '上传中，请稍候 ...',
+	uploadError : '上传错误',
+	'plainpaste.comment' : '请使用快捷键(Ctrl+V)把内容粘贴到下面的方框里。',
+	'wordpaste.comment' : '请使用快捷键(Ctrl+V)把内容粘贴到下面的方框里。',
+	'code.pleaseInput' : '请输入程序代码。',
+	'link.url' : 'URL',
+	'link.linkType' : '打开类型',
+	'link.newWindow' : '新窗口',
+	'link.selfWindow' : '当前窗口',
+	'flash.url' : 'URL',
+	'flash.width' : '宽度',
+	'flash.height' : '高度',
+	'flash.upload' : '上传',
+	'flash.viewServer' : '文件空间',
+	'media.url' : 'URL',
+	'media.width' : '宽度',
+	'media.height' : '高度',
+	'media.autostart' : '自动播放',
+	'media.upload' : '上传',
+	'media.viewServer' : '文件空间',
+	'image.remoteImage' : '网络图片',
+	'image.localImage' : '本地上传',
+	'image.remoteUrl' : '图片地址',
+	'image.localUrl' : '上传文件',
+	'image.size' : '图片大小',
+	'image.width' : '宽',
+	'image.height' : '高',
+	'image.resetSize' : '重置大小',
+	'image.align' : '对齐方式',
+	'image.defaultAlign' : '默认方式',
+	'image.leftAlign' : '左对齐',
+	'image.rightAlign' : '右对齐',
+	'image.imgTitle' : '图片说明',
+	'image.upload' : '浏览...',
+	'image.viewServer' : '图片空间',
+	'multiimage.uploadDesc' : '允许用户同时上传<%=uploadLimit%>张图片，单张图片容量不超过<%=sizeLimit%>',
+	'multiimage.startUpload' : '开始上传',
+	'multiimage.clearAll' : '全部清空',
+	'multiimage.insertAll' : '全部插入',
+	'multiimage.queueLimitExceeded' : '文件数量超过限制。',
+	'multiimage.fileExceedsSizeLimit' : '文件大小超过限制。',
+	'multiimage.zeroByteFile' : '无法上传空文件。',
+	'multiimage.invalidFiletype' : '文件类型不正确。',
+	'multiimage.unknownError' : '发生异常，无法上传。',
+	'multiimage.pending' : '等待上传',
+	'multiimage.uploadError' : '上传失败',
+	'filemanager.emptyFolder' : '空文件夹',
+	'filemanager.moveup' : '移到上一级文件夹',
+	'filemanager.viewType' : '显示方式：',
+	'filemanager.viewImage' : '缩略图',
+	'filemanager.listImage' : '详细信息',
+	'filemanager.orderType' : '排序方式：',
+	'filemanager.fileName' : '名称',
+	'filemanager.fileSize' : '大小',
+	'filemanager.fileType' : '类型',
+	'insertfile.url' : 'URL',
+	'insertfile.title' : '文件说明',
+	'insertfile.upload' : '上传',
+	'insertfile.viewServer' : '文件空间',
+	'table.cells' : '单元格数',
+	'table.rows' : '行数',
+	'table.cols' : '列数',
+	'table.size' : '大小',
+	'table.width' : '宽度',
+	'table.height' : '高度',
+	'table.percent' : '%',
+	'table.px' : 'px',
+	'table.space' : '边距间距',
+	'table.padding' : '边距',
+	'table.spacing' : '间距',
+	'table.align' : '对齐方式',
+	'table.textAlign' : '水平对齐',
+	'table.verticalAlign' : '垂直对齐',
+	'table.alignDefault' : '默认',
+	'table.alignLeft' : '左对齐',
+	'table.alignCenter' : '居中',
+	'table.alignRight' : '右对齐',
+	'table.alignTop' : '顶部',
+	'table.alignMiddle' : '中部',
+	'table.alignBottom' : '底部',
+	'table.alignBaseline' : '基线',
+	'table.border' : '边框',
+	'table.borderWidth' : '边框',
+	'table.borderColor' : '颜色',
+	'table.backgroundColor' : '背景颜色',
+	'map.address' : '地址: ',
+	'map.search' : '搜索',
+	'baidumap.address' : '地址: ',
+	'baidumap.search' : '搜索',
+	'baidumap.insertDynamicMap' : '插入动态地图',
+	'anchor.name' : '锚点名称',
+	'formatblock.formatBlock' : {
+		h1 : '标题 1',
+		h2 : '标题 2',
+		h3 : '标题 3',
+		h4 : '标题 4',
+		p : '正 文'
+	},
+	'fontname.fontName' : {
+		'SimSun' : '宋体',
+		'NSimSun' : '新宋体',
+		'FangSong_GB2312' : '仿宋_GB2312',
+		'KaiTi_GB2312' : '楷体_GB2312',
+		'SimHei' : '黑体',
+		'Microsoft YaHei' : '微软雅黑',
+		'Arial' : 'Arial',
+		'Arial Black' : 'Arial Black',
+		'Times New Roman' : 'Times New Roman',
+		'Courier New' : 'Courier New',
+		'Tahoma' : 'Tahoma',
+		'Verdana' : 'Verdana'
+	},
+	'lineheight.lineHeight' : [
+		{'1' : '单倍行距'},
+		{'1.5' : '1.5倍行距'},
+		{'2' : '2倍行距'},
+		{'2.5' : '2.5倍行距'},
+		{'3' : '3倍行距'}
+	],
+	'template.selectTemplate' : '可选模板',
+	'template.replaceContent' : '替换当前内容',
+	'template.fileList' : {
+		'1.html' : '图片和文字',
+		'2.html' : '表格',
+		'3.html' : '项目编号'
+	}
+}, 'zh_CN');
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/lang/zh_TW.js b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/lang/zh_TW.js
new file mode 100644
index 0000000..ceac2af
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/lang/zh_TW.js
@@ -0,0 +1,235 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.lang({
+	source : '原始碼',
+	preview : '預覽',
+	undo : '復原(Ctrl+Z)',
+	redo : '重複(Ctrl+Y)',
+	cut : '剪下(Ctrl+X)',
+	copy : '複製(Ctrl+C)',
+	paste : '貼上(Ctrl+V)',
+	plainpaste : '貼為純文字格式',
+	wordpaste : '自Word貼上',
+	selectall : '全選(Ctrl+A)',
+	justifyleft : '靠左對齊',
+	justifycenter : '置中',
+	justifyright : '靠右對齊',
+	justifyfull : '左右對齊',
+	insertorderedlist : '編號清單',
+	insertunorderedlist : '項目清單',
+	indent : '增加縮排',
+	outdent : '減少縮排',
+	subscript : '下標',
+	superscript : '上標',
+	formatblock : '標題',
+	fontname : '字體',
+	fontsize : '文字大小',
+	forecolor : '文字顏色',
+	hilitecolor : '背景顏色',
+	bold : '粗體(Ctrl+B)',
+	italic : '斜體(Ctrl+I)',
+	underline : '底線(Ctrl+U)',
+	strikethrough : '刪除線',
+	removeformat : '清除格式',
+	image : '影像',
+	multiimage : '批量影像上傳',
+	flash : 'Flash',
+	media : '多媒體',
+	table : '表格',
+	hr : '插入水平線',
+	emoticons : '插入表情',
+	link : '超連結',
+	unlink : '移除超連結',
+	fullscreen : '最大化',
+	about : '關於',
+	print : '列印(Ctrl+P)',
+	fileManager : '瀏覽伺服器',
+	code : '插入程式代碼',
+	map : 'Google地圖',
+	baidumap : 'Baidu地圖',
+	lineheight : '行距',
+	clearhtml : '清理HTML代碼',
+	pagebreak : '插入分頁符號',
+	quickformat : '快速排版',
+	insertfile : '插入文件',
+	template : '插入樣板',
+	anchor : '錨點',
+	yes : '確定',
+	no : '取消',
+	close : '關閉',
+	editImage : '影像屬性',
+	deleteImage : '刪除影像',
+	editFlash : 'Flash屬性',
+	deleteFlash : '删除Flash',
+	editMedia : '多媒體屬性',
+	deleteMedia : '删除多媒體',
+	editLink : '超連結屬性',
+	deleteLink : '移除超連結',
+	tableprop : '表格屬性',
+	tablecellprop : '儲存格屬性',
+	tableinsert : '插入表格',
+	tabledelete : '刪除表格',
+	tablecolinsertleft : '向左插入列',
+	tablecolinsertright : '向右插入列',
+	tablerowinsertabove : '向上插入欄',
+	tablerowinsertbelow : '下方插入欄',
+	tablerowmerge : '向下合併單元格',
+	tablecolmerge : '向右合併單元格',
+	tablerowsplit : '分割欄',
+	tablecolsplit : '分割列',
+	tablecoldelete : '删除列',
+	tablerowdelete : '删除欄',
+	noColor : '自動',
+	pleaseSelectFile : '請選擇文件。',
+	invalidImg : "請輸入有效的URL。\n只允許jpg,gif,bmp,png格式。",
+	invalidMedia : "請輸入有效的URL。\n只允許swf,flv,mp3,wav,wma,wmv,mid,avi,mpg,asf,rm,rmvb格式。",
+	invalidWidth : "寬度必須是數字。",
+	invalidHeight : "高度必須是數字。",
+	invalidBorder : "邊框必須是數字。",
+	invalidUrl : "請輸入有效的URL。",
+	invalidRows : '欄數是必須輸入項目，只允許輸入大於0的數字。',
+	invalidCols : '列數是必須輸入項目，只允許輸入大於0的數字。',
+	invalidPadding : '內距必須是數字。',
+	invalidSpacing : '間距必須是數字。',
+	invalidBorder : '边框必须为数字。',
+	pleaseInput : "請輸入內容。",
+	invalidJson : '伺服器發生故障。',
+	uploadSuccess : '上傳成功。',
+	cutError : '您的瀏覽器安全設置不允許使用剪下操作，請使用快捷鍵(Ctrl+X)完成。',
+	copyError : '您的瀏覽器安全設置不允許使用剪下操作，請使用快捷鍵(Ctrl+C)完成。',
+	pasteError : '您的瀏覽器安全設置不允許使用剪下操作，請使用快捷鍵(Ctrl+V)完成。',
+	ajaxLoading : '加載中，請稍候 ...',
+	uploadLoading : '上傳中，請稍候 ...',
+	uploadError : '上傳錯誤',
+	'plainpaste.comment' : '請使用快捷鍵(Ctrl+V)把內容貼到下方區域裡。',
+	'wordpaste.comment' : '請使用快捷鍵(Ctrl+V)把內容貼到下方區域裡。',
+	'code.pleaseInput' : 'Please input code.',
+	'link.url' : 'URL',
+	'link.linkType' : '打開類型',
+	'link.newWindow' : '新窗口',
+	'link.selfWindow' : '本頁窗口',
+	'flash.url' : 'URL',
+	'flash.width' : '寬度',
+	'flash.height' : '高度',
+	'flash.upload' : '上傳',
+	'flash.viewServer' : '瀏覽',
+	'media.url' : 'URL',
+	'media.width' : '寬度',
+	'media.height' : '高度',
+	'media.autostart' : '自動播放',
+	'media.upload' : '上傳',
+	'media.viewServer' : '瀏覽',
+	'image.remoteImage' : '網絡影像',
+	'image.localImage' : '上傳影像',
+	'image.remoteUrl' : '影像URL',
+	'image.localUrl' : '影像URL',
+	'image.size' : '影像大小',
+	'image.width' : '寬度',
+	'image.height' : '高度',
+	'image.resetSize' : '原始大小',
+	'image.align' : '對齊方式',
+	'image.defaultAlign' : '未設定',
+	'image.leftAlign' : '向左對齊',
+	'image.rightAlign' : '向右對齊',
+	'image.imgTitle' : '影像說明',
+	'image.upload' : '瀏覽...',
+	'image.viewServer' : '瀏覽...',
+	'multiimage.uploadDesc' : 'Allows users to upload <%=uploadLimit%> images, single image size not exceeding <%=sizeLimit%>',
+	'multiimage.startUpload' : 'Start upload',
+	'multiimage.clearAll' : 'Clear all',
+	'multiimage.insertAll' : 'Insert all',
+	'multiimage.queueLimitExceeded' : 'Queue limit exceeded.',
+	'multiimage.fileExceedsSizeLimit' : 'File exceeds size limit.',
+	'multiimage.zeroByteFile' : 'Zero byte file.',
+	'multiimage.invalidFiletype' : 'Invalid file type.',
+	'multiimage.unknownError' : 'Unknown upload error.',
+	'multiimage.pending' : 'Pending ...',
+	'multiimage.uploadError' : 'Upload error',
+	'filemanager.emptyFolder' : '空文件夾',
+	'filemanager.moveup' : '至上一級文件夾',
+	'filemanager.viewType' : '顯示方式：',
+	'filemanager.viewImage' : '縮略圖',
+	'filemanager.listImage' : '詳細信息',
+	'filemanager.orderType' : '排序方式：',
+	'filemanager.fileName' : '名稱',
+	'filemanager.fileSize' : '大小',
+	'filemanager.fileType' : '類型',
+	'insertfile.url' : 'URL',
+	'insertfile.title' : '文件說明',
+	'insertfile.upload' : '上傳',
+	'insertfile.viewServer' : '瀏覽',
+	'table.cells' : '儲存格數',
+	'table.rows' : '欄數',
+	'table.cols' : '列數',
+	'table.size' : '表格大小',
+	'table.width' : '寬度',
+	'table.height' : '高度',
+	'table.percent' : '%',
+	'table.px' : 'px',
+	'table.space' : '內距間距',
+	'table.padding' : '內距',
+	'table.spacing' : '間距',
+	'table.align' : '對齊方式',
+	'table.textAlign' : '水平對齊',
+	'table.verticalAlign' : '垂直對齊',
+	'table.alignDefault' : '未設定',
+	'table.alignLeft' : '向左對齊',
+	'table.alignCenter' : '置中',
+	'table.alignRight' : '向右對齊',
+	'table.alignTop' : '靠上',
+	'table.alignMiddle' : '置中',
+	'table.alignBottom' : '靠下',
+	'table.alignBaseline' : '基線',
+	'table.border' : '表格邊框',
+	'table.borderWidth' : '邊框',
+	'table.borderColor' : '顏色',
+	'table.backgroundColor' : '背景顏色',
+	'map.address' : '住所: ',
+	'map.search' : '尋找',
+	'baidumap.address' : '住所: ',
+	'baidumap.search' : '尋找',
+	'baidumap.insertDynamicMap' : '插入動態地圖',
+	'anchor.name' : '錨點名稱',
+	'formatblock.formatBlock' : {
+		h1 : '標題 1',
+		h2 : '標題 2',
+		h3 : '標題 3',
+		h4 : '標題 4',
+		p : '一般'
+	},
+	'fontname.fontName' : {
+		'MingLiU' : '細明體',
+		'PMingLiU' : '新細明體',
+		'DFKai-SB' : '標楷體',
+		'SimSun' : '宋體',
+		'NSimSun' : '新宋體',
+		'FangSong' : '仿宋體',
+		'Arial' : 'Arial',
+		'Arial Black' : 'Arial Black',
+		'Times New Roman' : 'Times New Roman',
+		'Courier New' : 'Courier New',
+		'Tahoma' : 'Tahoma',
+		'Verdana' : 'Verdana'
+	},
+	'lineheight.lineHeight' : [
+		{'1' : '单倍行距'},
+		{'1.5' : '1.5倍行距'},
+		{'2' : '2倍行距'},
+		{'2.5' : '2.5倍行距'},
+		{'3' : '3倍行距'}
+	],
+	'template.selectTemplate' : '可選樣板',
+	'template.replaceContent' : '取代當前內容',
+	'template.fileList' : {
+		'1.html' : '影像和文字',
+		'2.html' : '表格',
+		'3.html' : '项目清單'
+	}
+}, 'zh_TW');
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/license.txt b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/license.txt
new file mode 100644
index 0000000..4362b49
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/license.txt
@@ -0,0 +1,502 @@
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/anchor/anchor.js b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/anchor/anchor.js
new file mode 100644
index 0000000..55ab894
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/anchor/anchor.js
@@ -0,0 +1,46 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('anchor', function(K) {
+	var self = this, name = 'anchor', lang = self.lang(name + '.');
+	self.plugin.anchor = {
+		edit : function() {
+			var html = ['<div style="padding:20px;">',
+					'<div class="ke-dialog-row">',
+					'<label for="keName">' + lang.name + '</label>',
+					'<input class="ke-input-text" type="text" id="keName" name="name" value="" style="width:100px;" />',
+					'</div>',
+					'</div>'].join('');
+			var dialog = self.createDialog({
+				name : name,
+				width : 300,
+				title : self.lang(name),
+				body : html,
+				yesBtn : {
+					name : self.lang('yes'),
+					click : function(e) {
+						self.insertHtml('<a name="' + nameBox.val() + '">').hideDialog().focus();
+					}
+				}
+			});
+			var div = dialog.div,
+				nameBox = K('input[name="name"]', div);
+			var img = self.plugin.getSelectedAnchor();
+			if (img) {
+				nameBox.val(unescape(img.attr('data-ke-name')));
+			}
+			nameBox[0].focus();
+			nameBox[0].select();
+		},
+		'delete' : function() {
+			self.plugin.getSelectedAnchor().remove();
+		}
+	};
+	self.clickToolbar(name, self.plugin.anchor.edit);
+});
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/autoheight/autoheight.js b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/autoheight/autoheight.js
new file mode 100644
index 0000000..546578b
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/autoheight/autoheight.js
@@ -0,0 +1,54 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('autoheight', function(K) {
+	var self = this;
+
+	if (!self.autoHeightMode) {
+		return;
+	}
+
+	var minHeight;
+
+	function hideScroll() {
+		var edit = self.edit;
+		var body = edit.doc.body;
+		edit.iframe[0].scroll = 'no';
+		body.style.overflowY = 'hidden';
+	}
+
+	function resetHeight() {
+		var edit = self.edit;
+		var body = edit.doc.body;
+		edit.iframe.height(minHeight);
+		self.resize(null, Math.max((K.IE ? body.scrollHeight : body.offsetHeight) + 76, minHeight));
+	}
+
+	function init() {
+		minHeight = K.removeUnit(self.height);
+
+		self.edit.afterChange(resetHeight);
+		hideScroll();
+		resetHeight();
+	}
+
+	if (self.isCreated) {
+		init();
+	} else {
+		self.afterCreate(init);
+	}
+});
+
+/*
+* 如何实现真正的自动高度？
+* 修改编辑器高度之后，再次获取body内容高度时，最小值只会是当前iframe的设置高度，这样就导致高度只增不减。
+* 所以每次获取body内容高度之前，先将iframe的高度重置为最小高度，这样就能获取body的实际高度。
+* 由此就实现了真正的自动高度
+* 测试：chrome、firefox、IE9、IE8
+* */
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/baidumap/baidumap.js b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/baidumap/baidumap.js
new file mode 100644
index 0000000..12751c4
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/baidumap/baidumap.js
@@ -0,0 +1,93 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+// Baidu Maps: http://dev.baidu.com/wiki/map/index.php?title=%E9%A6%96%E9%A1%B5
+
+KindEditor.plugin('baidumap', function(K) {
+	var self = this, name = 'baidumap', lang = self.lang(name + '.');
+	var mapWidth = K.undef(self.mapWidth, 558);
+	var mapHeight = K.undef(self.mapHeight, 360);
+	self.clickToolbar(name, function() {
+		var html = ['<div style="padding:10px 20px;">',
+			'<div class="ke-header">',
+			// left start
+			'<div class="ke-left">',
+			lang.address + ' <input id="kindeditor_plugin_map_address" name="address" class="ke-input-text" value="" style="width:200px;" /> ',
+			'<span class="ke-button-common ke-button-outer">',
+			'<input type="button" name="searchBtn" class="ke-button-common ke-button" value="' + lang.search + '" />',
+			'</span>',
+			'</div>',
+			// right start
+			'<div class="ke-right">',
+			'<input type="checkbox" id="keInsertDynamicMap" name="insertDynamicMap" value="1" /> <label for="keInsertDynamicMap">' + lang.insertDynamicMap + '</label>',
+			'</div>',
+			'<div class="ke-clearfix"></div>',
+			'</div>',
+			'<div class="ke-map" style="width:' + mapWidth + 'px;height:' + mapHeight + 'px;"></div>',
+			'</div>'].join('');
+		var dialog = self.createDialog({
+			name : name,
+			width : mapWidth + 42,
+			title : self.lang(name),
+			body : html,
+			yesBtn : {
+				name : self.lang('yes'),
+				click : function(e) {
+					var map = win.map;
+					var centerObj = map.getCenter();
+					var center = centerObj.lng + ',' + centerObj.lat;
+					var zoom = map.getZoom();
+					var url = [checkbox[0].checked ? self.pluginsPath + 'baidumap/index.html' : 'http://api.map.baidu.com/staticimage',
+						'?center=' + encodeURIComponent(center),
+						'&zoom=' + encodeURIComponent(zoom),
+						'&width=' + mapWidth,
+						'&height=' + mapHeight,
+						'&markers=' + encodeURIComponent(center),
+						'&markerStyles=' + encodeURIComponent('l,A')].join('');
+					if (checkbox[0].checked) {
+						self.insertHtml('<iframe src="' + url + '" frameborder="0" style="width:' + (mapWidth + 2) + 'px;height:' + (mapHeight + 2) + 'px;"></iframe>');
+					} else {
+						self.exec('insertimage', url);
+					}
+					self.hideDialog().focus();
+				}
+			},
+			beforeRemove : function() {
+				searchBtn.remove();
+				if (doc) {
+					doc.write('');
+				}
+				iframe.remove();
+			}
+		});
+		var div = dialog.div,
+			addressBox = K('[name="address"]', div),
+			searchBtn = K('[name="searchBtn"]', div),
+			checkbox = K('[name="insertDynamicMap"]', dialog.div),
+			win, doc;
+		var iframe = K('<iframe class="ke-textarea" frameborder="0" src="' + self.pluginsPath + 'baidumap/map.html" style="width:' + mapWidth + 'px;height:' + mapHeight + 'px;"></iframe>');
+		function ready() {
+			win = iframe[0].contentWindow;
+			doc = K.iframeDoc(iframe);
+		}
+		iframe.bind('load', function() {
+			iframe.unbind('load');
+			if (K.IE) {
+				ready();
+			} else {
+				setTimeout(ready, 0);
+			}
+		});
+		K('.ke-map', div).replaceWith(iframe);
+		// search map
+		searchBtn.click(function() {
+			win.search(addressBox.val());
+		});
+	});
+});
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/baidumap/index.html b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/baidumap/index.html
new file mode 100644
index 0000000..e106d1a
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/baidumap/index.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta charset="utf-8" />
+<meta name="keywords" content="百度地图,百度地图API，百度地图自定义工具，百度地图所见即所得工具" />
+<meta name="description" content="百度地图API自定义地图，帮助用户在可视化操作下生成百度地图" />
+<title>百度地图API自定义地图</title>
+<!--引用百度地图API-->
+<style type="text/css">
+	html,body{margin:0;padding:0;}
+	.iw_poi_title {color:#CC5522;font-size:14px;font-weight:bold;overflow:hidden;padding-right:13px;white-space:nowrap}
+	.iw_poi_content {font:12px arial,sans-serif;overflow:visible;padding-top:4px;white-space:-moz-pre-wrap;word-wrap:break-word}
+</style>
+<script type="text/javascript" src="http://api.map.baidu.com/api?key=&v=1.1&services=true"></script>
+</head>
+
+<body onload="initMap();">
+  <!--百度地图容器-->
+  <div style="width:697px;height:550px;border:#ccc solid 1px;" id="dituContent"></div>
+</body>
+<script type="text/javascript">
+	function getParam(name) {
+		return location.href.match(new RegExp('[?&]' + name + '=([^?&]+)', 'i')) ? decodeURIComponent(RegExp.$1) : '';
+	}
+	var centerParam = getParam('center');
+	var zoomParam = getParam('zoom');
+	var widthParam = getParam('width');
+	var heightParam = getParam('height');
+	var markersParam = getParam('markers');
+	var markerStylesParam = getParam('markerStyles');
+
+	//创建和初始化地图函数：
+	function initMap(){
+		// [FF]切换模式后报错
+		if (!window.BMap) {
+			return;
+		}
+		var dituContent = document.getElementById('dituContent');
+		dituContent.style.width = widthParam + 'px';
+		dituContent.style.height = heightParam + 'px';
+
+		createMap();//创建地图
+		setMapEvent();//设置地图事件
+		addMapControl();//向地图添加控件
+
+		// 创建标注
+		var markersArr = markersParam.split(',');
+		var point = new BMap.Point(markersArr[0], markersArr[1]);
+		var marker = new BMap.Marker(point);
+		map.addOverlay(marker); // 将标注添加到地图中
+	}
+
+	//创建地图函数：
+	function createMap(){
+		var map = new BMap.Map("dituContent");//在百度地图容器中创建一个地图
+		var centerArr = centerParam.split(',');
+		var point = new BMap.Point(centerArr[0], centerArr[1]);//定义一个中心点坐标
+		map.centerAndZoom(point, zoomParam);//设定地图的中心点和坐标并将地图显示在地图容器中
+		window.map = map;//将map变量存储在全局
+	}
+
+	//地图事件设置函数：
+	function setMapEvent(){
+		map.enableDragging();//启用地图拖拽事件，默认启用(可不写)
+		map.enableScrollWheelZoom();//启用地图滚轮放大缩小
+		map.enableDoubleClickZoom();//启用鼠标双击放大，默认启用(可不写)
+		map.enableKeyboard();//启用键盘上下左右键移动地图
+	}
+
+	//地图控件添加函数：
+	function addMapControl(){
+		//向地图中添加缩放控件
+	var ctrl_nav = new BMap.NavigationControl({anchor:BMAP_ANCHOR_TOP_LEFT,type:BMAP_NAVIGATION_CONTROL_LARGE});
+	map.addControl(ctrl_nav);
+		//向地图中添加缩略图控件
+	var ctrl_ove = new BMap.OverviewMapControl({anchor:BMAP_ANCHOR_BOTTOM_RIGHT,isOpen:1});
+	map.addControl(ctrl_ove);
+		//向地图中添加比例尺控件
+	var ctrl_sca = new BMap.ScaleControl({anchor:BMAP_ANCHOR_BOTTOM_LEFT});
+	map.addControl(ctrl_sca);
+	}
+</script>
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/baidumap/map.html b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/baidumap/map.html
new file mode 100644
index 0000000..b65ea1d
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/baidumap/map.html
@@ -0,0 +1,43 @@
+<!doctype html>
+<html>
+	<head>
+		<meta charset="utf-8" />
+		<title>Baidu Maps</title>
+		<style>
+			html { height: 100% }
+			body { height: 100%; margin: 0; padding: 0; background-color: #FFF }
+		</style>
+		<script charset="utf-8" src="http://api.map.baidu.com/api?v=1.3"></script>
+		<script>
+			var map, geocoder;
+			function initialize() {
+				map = new BMap.Map('map_canvas');
+				var point = new BMap.Point(121.473704, 31.230393);
+				map.centerAndZoom(point, 11);
+				map.addControl(new BMap.NavigationControl());
+				map.enableScrollWheelZoom();
+
+				var gc = new BMap.Geocoder();
+				gc.getLocation(point, function(rs){
+					var addComp = rs.addressComponents;
+					var address = [addComp.city].join('');
+					parent.document.getElementById("kindeditor_plugin_map_address").value = address;
+				});
+			}
+			function search(address) {
+				if (!map) return;
+				var local = new BMap.LocalSearch(map, {
+					renderOptions: {
+						map: map,
+						autoViewport: true,
+						selectFirstResult: false
+					}
+				});
+				local.search(address);
+			}
+		</script>
+	</head>
+	<body onload="initialize();">
+		<div id="map_canvas" style="width:100%; height:100%"></div>
+	</body>
+</html>
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/clearhtml/clearhtml.js b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/clearhtml/clearhtml.js
new file mode 100644
index 0000000..1bf0e5d
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/clearhtml/clearhtml.js
@@ -0,0 +1,29 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('clearhtml', function(K) {
+	var self = this, name = 'clearhtml';
+	self.clickToolbar(name, function() {
+		self.focus();
+		var html = self.html();
+		html = html.replace(/(<script[^>]*>)([\s\S]*?)(<\/script>)/ig, '');
+		html = html.replace(/(<style[^>]*>)([\s\S]*?)(<\/style>)/ig, '');
+		html = K.formatHtml(html, {
+			a : ['href', 'target'],
+			embed : ['src', 'width', 'height', 'type', 'loop', 'autostart', 'quality', '.width', '.height', 'align', 'allowscriptaccess'],
+			img : ['src', 'width', 'height', 'border', 'alt', 'title', '.width', '.height'],
+			table : ['border'],
+			'td,th' : ['rowspan', 'colspan'],
+			'div,hr,br,tbody,tr,p,ol,ul,li,blockquote,h1,h2,h3,h4,h5,h6' : []
+		});
+		self.html(html);
+		self.cmd.selection(true);
+		self.addBookmark();
+	});
+});
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/code/code.js b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/code/code.js
new file mode 100644
index 0000000..85e4225
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/code/code.js
@@ -0,0 +1,62 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+// google code prettify: http://google-code-prettify.googlecode.com/
+// http://google-code-prettify.googlecode.com/
+
+KindEditor.plugin('code', function(K) {
+	var self = this, name = 'code';
+	self.clickToolbar(name, function() {
+		var lang = self.lang(name + '.'),
+			html = ['<div style="padding:10px 20px;">',
+				'<div class="ke-dialog-row">',
+				'<select class="ke-code-type">',
+				'<option value="js">JavaScript</option>',
+				'<option value="html">HTML</option>',
+				'<option value="css">CSS</option>',
+				'<option value="php">PHP</option>',
+				'<option value="pl">Perl</option>',
+				'<option value="py">Python</option>',
+				'<option value="rb">Ruby</option>',
+				'<option value="java">Java</option>',
+				'<option value="vb">ASP/VB</option>',
+				'<option value="cpp">C/C++</option>',
+				'<option value="cs">C#</option>',
+				'<option value="xml">XML</option>',
+				'<option value="bsh">Shell</option>',
+				'<option value="">Other</option>',
+				'</select>',
+				'</div>',
+				'<textarea class="ke-textarea" style="width:408px;height:260px;"></textarea>',
+				'</div>'].join(''),
+			dialog = self.createDialog({
+				name : name,
+				width : 450,
+				title : self.lang(name),
+				body : html,
+				yesBtn : {
+					name : self.lang('yes'),
+					click : function(e) {
+						var type = K('.ke-code-type', dialog.div).val(),
+							code = textarea.val(),
+							cls = type === '' ? '' :  ' lang-' + type,
+							html = '<pre class="prettyprint' + cls + '">\n' + K.escape(code) + '</pre> ';
+						if (K.trim(code) === '') {
+							alert(lang.pleaseInput);
+							textarea[0].focus();
+							return;
+						}
+						self.insertHtml(html).hideDialog().focus();
+					}
+				}
+			}),
+			textarea = K('textarea', dialog.div);
+		textarea[0].focus();
+	});
+});
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/code/prettify.css b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/code/prettify.css
new file mode 100644
index 0000000..b8287e5
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/code/prettify.css
@@ -0,0 +1,13 @@
+.pln{color:#000}@media screen{.str{color:#080}.kwd{color:#008}.com{color:#800}.typ{color:#606}.lit{color:#066}.pun,.opn,.clo{color:#660}.tag{color:#008}.atn{color:#606}.atv{color:#080}.dec,.var{color:#606}.fun{color:red}}@media print,projection{.str{color:#060}.kwd{color:#006;font-weight:bold}.com{color:#600;font-style:italic}.typ{color:#404;font-weight:bold}.lit{color:#044}.pun,.opn,.clo{color:#440}.tag{color:#006;font-weight:bold}.atn{color:#404}.atv{color:#060}}pre.prettyprint{padding:2px;border:1px solid #888}ol.linenums{margin-top:0;margin-bottom:0}li.L0,li.L1,li.L2,li.L3,li.L5,li.L6,li.L7,li.L8{list-style-type:none}li.L1,li.L3,li.L5,li.L7,li.L9{background:#eee}
+
+pre.prettyprint {
+	border: 0;
+	border-left: 3px solid rgb(204, 204, 204);
+	margin-left: 2em;
+	padding: 0.5em;
+	font-size: 110%;
+	display: block;
+	font-family: "Consolas", "Monaco", "Bitstream Vera Sans Mono", "Courier New", Courier, monospace;
+	margin: 1em 0px;
+	white-space: pre;
+}
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/code/prettify.js b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/code/prettify.js
new file mode 100644
index 0000000..eef5ad7
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/code/prettify.js
@@ -0,0 +1,28 @@
+var q=null;window.PR_SHOULD_USE_CONTINUATION=!0;
+(function(){function L(a){function m(a){var f=a.charCodeAt(0);if(f!==92)return f;var b=a.charAt(1);return(f=r[b])?f:"0"<=b&&b<="7"?parseInt(a.substring(1),8):b==="u"||b==="x"?parseInt(a.substring(2),16):a.charCodeAt(1)}function e(a){if(a<32)return(a<16?"\\x0":"\\x")+a.toString(16);a=String.fromCharCode(a);if(a==="\\"||a==="-"||a==="["||a==="]")a="\\"+a;return a}function h(a){for(var f=a.substring(1,a.length-1).match(/\\u[\dA-Fa-f]{4}|\\x[\dA-Fa-f]{2}|\\[0-3][0-7]{0,2}|\\[0-7]{1,2}|\\[\S\s]|[^\\]/g),a=
+[],b=[],o=f[0]==="^",c=o?1:0,i=f.length;c<i;++c){var j=f[c];if(/\\[bdsw]/i.test(j))a.push(j);else{var j=m(j),d;c+2<i&&"-"===f[c+1]?(d=m(f[c+2]),c+=2):d=j;b.push([j,d]);d<65||j>122||(d<65||j>90||b.push([Math.max(65,j)|32,Math.min(d,90)|32]),d<97||j>122||b.push([Math.max(97,j)&-33,Math.min(d,122)&-33]))}}b.sort(function(a,f){return a[0]-f[0]||f[1]-a[1]});f=[];j=[NaN,NaN];for(c=0;c<b.length;++c)i=b[c],i[0]<=j[1]+1?j[1]=Math.max(j[1],i[1]):f.push(j=i);b=["["];o&&b.push("^");b.push.apply(b,a);for(c=0;c<
+f.length;++c)i=f[c],b.push(e(i[0])),i[1]>i[0]&&(i[1]+1>i[0]&&b.push("-"),b.push(e(i[1])));b.push("]");return b.join("")}function y(a){for(var f=a.source.match(/\[(?:[^\\\]]|\\[\S\s])*]|\\u[\dA-Fa-f]{4}|\\x[\dA-Fa-f]{2}|\\\d+|\\[^\dux]|\(\?[!:=]|[()^]|[^()[\\^]+/g),b=f.length,d=[],c=0,i=0;c<b;++c){var j=f[c];j==="("?++i:"\\"===j.charAt(0)&&(j=+j.substring(1))&&j<=i&&(d[j]=-1)}for(c=1;c<d.length;++c)-1===d[c]&&(d[c]=++t);for(i=c=0;c<b;++c)j=f[c],j==="("?(++i,d[i]===void 0&&(f[c]="(?:")):"\\"===j.charAt(0)&&
+(j=+j.substring(1))&&j<=i&&(f[c]="\\"+d[i]);for(i=c=0;c<b;++c)"^"===f[c]&&"^"!==f[c+1]&&(f[c]="");if(a.ignoreCase&&s)for(c=0;c<b;++c)j=f[c],a=j.charAt(0),j.length>=2&&a==="["?f[c]=h(j):a!=="\\"&&(f[c]=j.replace(/[A-Za-z]/g,function(a){a=a.charCodeAt(0);return"["+String.fromCharCode(a&-33,a|32)+"]"}));return f.join("")}for(var t=0,s=!1,l=!1,p=0,d=a.length;p<d;++p){var g=a[p];if(g.ignoreCase)l=!0;else if(/[a-z]/i.test(g.source.replace(/\\u[\da-f]{4}|\\x[\da-f]{2}|\\[^UXux]/gi,""))){s=!0;l=!1;break}}for(var r=
+{b:8,t:9,n:10,v:11,f:12,r:13},n=[],p=0,d=a.length;p<d;++p){g=a[p];if(g.global||g.multiline)throw Error(""+g);n.push("(?:"+y(g)+")")}return RegExp(n.join("|"),l?"gi":"g")}function M(a){function m(a){switch(a.nodeType){case 1:if(e.test(a.className))break;for(var g=a.firstChild;g;g=g.nextSibling)m(g);g=a.nodeName;if("BR"===g||"LI"===g)h[s]="\n",t[s<<1]=y++,t[s++<<1|1]=a;break;case 3:case 4:g=a.nodeValue,g.length&&(g=p?g.replace(/\r\n?/g,"\n"):g.replace(/[\t\n\r ]+/g," "),h[s]=g,t[s<<1]=y,y+=g.length,
+t[s++<<1|1]=a)}}var e=/(?:^|\s)nocode(?:\s|$)/,h=[],y=0,t=[],s=0,l;a.currentStyle?l=a.currentStyle.whiteSpace:window.getComputedStyle&&(l=document.defaultView.getComputedStyle(a,q).getPropertyValue("white-space"));var p=l&&"pre"===l.substring(0,3);m(a);return{a:h.join("").replace(/\n$/,""),c:t}}function B(a,m,e,h){m&&(a={a:m,d:a},e(a),h.push.apply(h,a.e))}function x(a,m){function e(a){for(var l=a.d,p=[l,"pln"],d=0,g=a.a.match(y)||[],r={},n=0,z=g.length;n<z;++n){var f=g[n],b=r[f],o=void 0,c;if(typeof b===
+"string")c=!1;else{var i=h[f.charAt(0)];if(i)o=f.match(i[1]),b=i[0];else{for(c=0;c<t;++c)if(i=m[c],o=f.match(i[1])){b=i[0];break}o||(b="pln")}if((c=b.length>=5&&"lang-"===b.substring(0,5))&&!(o&&typeof o[1]==="string"))c=!1,b="src";c||(r[f]=b)}i=d;d+=f.length;if(c){c=o[1];var j=f.indexOf(c),k=j+c.length;o[2]&&(k=f.length-o[2].length,j=k-c.length);b=b.substring(5);B(l+i,f.substring(0,j),e,p);B(l+i+j,c,C(b,c),p);B(l+i+k,f.substring(k),e,p)}else p.push(l+i,b)}a.e=p}var h={},y;(function(){for(var e=a.concat(m),
+l=[],p={},d=0,g=e.length;d<g;++d){var r=e[d],n=r[3];if(n)for(var k=n.length;--k>=0;)h[n.charAt(k)]=r;r=r[1];n=""+r;p.hasOwnProperty(n)||(l.push(r),p[n]=q)}l.push(/[\S\s]/);y=L(l)})();var t=m.length;return e}function u(a){var m=[],e=[];a.tripleQuotedStrings?m.push(["str",/^(?:'''(?:[^'\\]|\\[\S\s]|''?(?=[^']))*(?:'''|$)|"""(?:[^"\\]|\\[\S\s]|""?(?=[^"]))*(?:"""|$)|'(?:[^'\\]|\\[\S\s])*(?:'|$)|"(?:[^"\\]|\\[\S\s])*(?:"|$))/,q,"'\""]):a.multiLineStrings?m.push(["str",/^(?:'(?:[^'\\]|\\[\S\s])*(?:'|$)|"(?:[^"\\]|\\[\S\s])*(?:"|$)|`(?:[^\\`]|\\[\S\s])*(?:`|$))/,
+q,"'\"`"]):m.push(["str",/^(?:'(?:[^\n\r'\\]|\\.)*(?:'|$)|"(?:[^\n\r"\\]|\\.)*(?:"|$))/,q,"\"'"]);a.verbatimStrings&&e.push(["str",/^@"(?:[^"]|"")*(?:"|$)/,q]);var h=a.hashComments;h&&(a.cStyleComments?(h>1?m.push(["com",/^#(?:##(?:[^#]|#(?!##))*(?:###|$)|.*)/,q,"#"]):m.push(["com",/^#(?:(?:define|elif|else|endif|error|ifdef|include|ifndef|line|pragma|undef|warning)\b|[^\n\r]*)/,q,"#"]),e.push(["str",/^<(?:(?:(?:\.\.\/)*|\/?)(?:[\w-]+(?:\/[\w-]+)+)?[\w-]+\.h|[a-z]\w*)>/,q])):m.push(["com",/^#[^\n\r]*/,
+q,"#"]));a.cStyleComments&&(e.push(["com",/^\/\/[^\n\r]*/,q]),e.push(["com",/^\/\*[\S\s]*?(?:\*\/|$)/,q]));a.regexLiterals&&e.push(["lang-regex",/^(?:^^\.?|[!+-]|!=|!==|#|%|%=|&|&&|&&=|&=|\(|\*|\*=|\+=|,|-=|->|\/|\/=|:|::|;|<|<<|<<=|<=|=|==|===|>|>=|>>|>>=|>>>|>>>=|[?@[^]|\^=|\^\^|\^\^=|{|\||\|=|\|\||\|\|=|~|break|case|continue|delete|do|else|finally|instanceof|return|throw|try|typeof)\s*(\/(?=[^*/])(?:[^/[\\]|\\[\S\s]|\[(?:[^\\\]]|\\[\S\s])*(?:]|$))+\/)/]);(h=a.types)&&e.push(["typ",h]);a=(""+a.keywords).replace(/^ | $/g,
+"");a.length&&e.push(["kwd",RegExp("^(?:"+a.replace(/[\s,]+/g,"|")+")\\b"),q]);m.push(["pln",/^\s+/,q," \r\n\t\xa0"]);e.push(["lit",/^@[$_a-z][\w$@]*/i,q],["typ",/^(?:[@_]?[A-Z]+[a-z][\w$@]*|\w+_t\b)/,q],["pln",/^[$_a-z][\w$@]*/i,q],["lit",/^(?:0x[\da-f]+|(?:\d(?:_\d+)*\d*(?:\.\d*)?|\.\d\+)(?:e[+-]?\d+)?)[a-z]*/i,q,"0123456789"],["pln",/^\\[\S\s]?/,q],["pun",/^.[^\s\w"-$'./@\\`]*/,q]);return x(m,e)}function D(a,m){function e(a){switch(a.nodeType){case 1:if(k.test(a.className))break;if("BR"===a.nodeName)h(a),
+a.parentNode&&a.parentNode.removeChild(a);else for(a=a.firstChild;a;a=a.nextSibling)e(a);break;case 3:case 4:if(p){var b=a.nodeValue,d=b.match(t);if(d){var c=b.substring(0,d.index);a.nodeValue=c;(b=b.substring(d.index+d[0].length))&&a.parentNode.insertBefore(s.createTextNode(b),a.nextSibling);h(a);c||a.parentNode.removeChild(a)}}}}function h(a){function b(a,d){var e=d?a.cloneNode(!1):a,f=a.parentNode;if(f){var f=b(f,1),g=a.nextSibling;f.appendChild(e);for(var h=g;h;h=g)g=h.nextSibling,f.appendChild(h)}return e}
+for(;!a.nextSibling;)if(a=a.parentNode,!a)return;for(var a=b(a.nextSibling,0),e;(e=a.parentNode)&&e.nodeType===1;)a=e;d.push(a)}var k=/(?:^|\s)nocode(?:\s|$)/,t=/\r\n?|\n/,s=a.ownerDocument,l;a.currentStyle?l=a.currentStyle.whiteSpace:window.getComputedStyle&&(l=s.defaultView.getComputedStyle(a,q).getPropertyValue("white-space"));var p=l&&"pre"===l.substring(0,3);for(l=s.createElement("LI");a.firstChild;)l.appendChild(a.firstChild);for(var d=[l],g=0;g<d.length;++g)e(d[g]);m===(m|0)&&d[0].setAttribute("value",
+m);var r=s.createElement("OL");r.className="linenums";for(var n=Math.max(0,m-1|0)||0,g=0,z=d.length;g<z;++g)l=d[g],l.className="L"+(g+n)%10,l.firstChild||l.appendChild(s.createTextNode("\xa0")),r.appendChild(l);a.appendChild(r)}function k(a,m){for(var e=m.length;--e>=0;){var h=m[e];A.hasOwnProperty(h)?window.console&&console.warn("cannot override language handler %s",h):A[h]=a}}function C(a,m){if(!a||!A.hasOwnProperty(a))a=/^\s*</.test(m)?"default-markup":"default-code";return A[a]}function E(a){var m=
+a.g;try{var e=M(a.h),h=e.a;a.a=h;a.c=e.c;a.d=0;C(m,h)(a);var k=/\bMSIE\b/.test(navigator.userAgent),m=/\n/g,t=a.a,s=t.length,e=0,l=a.c,p=l.length,h=0,d=a.e,g=d.length,a=0;d[g]=s;var r,n;for(n=r=0;n<g;)d[n]!==d[n+2]?(d[r++]=d[n++],d[r++]=d[n++]):n+=2;g=r;for(n=r=0;n<g;){for(var z=d[n],f=d[n+1],b=n+2;b+2<=g&&d[b+1]===f;)b+=2;d[r++]=z;d[r++]=f;n=b}for(d.length=r;h<p;){var o=l[h+2]||s,c=d[a+2]||s,b=Math.min(o,c),i=l[h+1],j;if(i.nodeType!==1&&(j=t.substring(e,b))){k&&(j=j.replace(m,"\r"));i.nodeValue=
+j;var u=i.ownerDocument,v=u.createElement("SPAN");v.className=d[a+1];var x=i.parentNode;x.replaceChild(v,i);v.appendChild(i);e<o&&(l[h+1]=i=u.createTextNode(t.substring(b,o)),x.insertBefore(i,v.nextSibling))}e=b;e>=o&&(h+=2);e>=c&&(a+=2)}}catch(w){"console"in window&&console.log(w&&w.stack?w.stack:w)}}var v=["break,continue,do,else,for,if,return,while"],w=[[v,"auto,case,char,const,default,double,enum,extern,float,goto,int,long,register,short,signed,sizeof,static,struct,switch,typedef,union,unsigned,void,volatile"],
+"catch,class,delete,false,import,new,operator,private,protected,public,this,throw,true,try,typeof"],F=[w,"alignof,align_union,asm,axiom,bool,concept,concept_map,const_cast,constexpr,decltype,dynamic_cast,explicit,export,friend,inline,late_check,mutable,namespace,nullptr,reinterpret_cast,static_assert,static_cast,template,typeid,typename,using,virtual,where"],G=[w,"abstract,boolean,byte,extends,final,finally,implements,import,instanceof,null,native,package,strictfp,super,synchronized,throws,transient"],
+H=[G,"as,base,by,checked,decimal,delegate,descending,dynamic,event,fixed,foreach,from,group,implicit,in,interface,internal,into,is,lock,object,out,override,orderby,params,partial,readonly,ref,sbyte,sealed,stackalloc,string,select,uint,ulong,unchecked,unsafe,ushort,var"],w=[w,"debugger,eval,export,function,get,null,set,undefined,var,with,Infinity,NaN"],I=[v,"and,as,assert,class,def,del,elif,except,exec,finally,from,global,import,in,is,lambda,nonlocal,not,or,pass,print,raise,try,with,yield,False,True,None"],
+J=[v,"alias,and,begin,case,class,def,defined,elsif,end,ensure,false,in,module,next,nil,not,or,redo,rescue,retry,self,super,then,true,undef,unless,until,when,yield,BEGIN,END"],v=[v,"case,done,elif,esac,eval,fi,function,in,local,set,then,until"],K=/^(DIR|FILE|vector|(de|priority_)?queue|list|stack|(const_)?iterator|(multi)?(set|map)|bitset|u?(int|float)\d*)/,N=/\S/,O=u({keywords:[F,H,w,"caller,delete,die,do,dump,elsif,eval,exit,foreach,for,goto,if,import,last,local,my,next,no,our,print,package,redo,require,sub,undef,unless,until,use,wantarray,while,BEGIN,END"+
+I,J,v],hashComments:!0,cStyleComments:!0,multiLineStrings:!0,regexLiterals:!0}),A={};k(O,["default-code"]);k(x([],[["pln",/^[^<?]+/],["dec",/^<!\w[^>]*(?:>|$)/],["com",/^<\!--[\S\s]*?(?:--\>|$)/],["lang-",/^<\?([\S\s]+?)(?:\?>|$)/],["lang-",/^<%([\S\s]+?)(?:%>|$)/],["pun",/^(?:<[%?]|[%?]>)/],["lang-",/^<xmp\b[^>]*>([\S\s]+?)<\/xmp\b[^>]*>/i],["lang-js",/^<script\b[^>]*>([\S\s]*?)(<\/script\b[^>]*>)/i],["lang-css",/^<style\b[^>]*>([\S\s]*?)(<\/style\b[^>]*>)/i],["lang-in.tag",/^(<\/?[a-z][^<>]*>)/i]]),
+["default-markup","htm","html","mxml","xhtml","xml","xsl"]);k(x([["pln",/^\s+/,q," \t\r\n"],["atv",/^(?:"[^"]*"?|'[^']*'?)/,q,"\"'"]],[["tag",/^^<\/?[a-z](?:[\w-.:]*\w)?|\/?>$/i],["atn",/^(?!style[\s=]|on)[a-z](?:[\w:-]*\w)?/i],["lang-uq.val",/^=\s*([^\s"'>]*(?:[^\s"'/>]|\/(?=\s)))/],["pun",/^[/<->]+/],["lang-js",/^on\w+\s*=\s*"([^"]+)"/i],["lang-js",/^on\w+\s*=\s*'([^']+)'/i],["lang-js",/^on\w+\s*=\s*([^\s"'>]+)/i],["lang-css",/^style\s*=\s*"([^"]+)"/i],["lang-css",/^style\s*=\s*'([^']+)'/i],["lang-css",
+/^style\s*=\s*([^\s"'>]+)/i]]),["in.tag"]);k(x([],[["atv",/^[\S\s]+/]]),["uq.val"]);k(u({keywords:F,hashComments:!0,cStyleComments:!0,types:K}),["c","cc","cpp","cxx","cyc","m"]);k(u({keywords:"null,true,false"}),["json"]);k(u({keywords:H,hashComments:!0,cStyleComments:!0,verbatimStrings:!0,types:K}),["cs"]);k(u({keywords:G,cStyleComments:!0}),["java"]);k(u({keywords:v,hashComments:!0,multiLineStrings:!0}),["bsh","csh","sh"]);k(u({keywords:I,hashComments:!0,multiLineStrings:!0,tripleQuotedStrings:!0}),
+["cv","py"]);k(u({keywords:"caller,delete,die,do,dump,elsif,eval,exit,foreach,for,goto,if,import,last,local,my,next,no,our,print,package,redo,require,sub,undef,unless,until,use,wantarray,while,BEGIN,END",hashComments:!0,multiLineStrings:!0,regexLiterals:!0}),["perl","pl","pm"]);k(u({keywords:J,hashComments:!0,multiLineStrings:!0,regexLiterals:!0}),["rb"]);k(u({keywords:w,cStyleComments:!0,regexLiterals:!0}),["js"]);k(u({keywords:"all,and,by,catch,class,else,extends,false,finally,for,if,in,is,isnt,loop,new,no,not,null,of,off,on,or,return,super,then,true,try,unless,until,when,while,yes",
+hashComments:3,cStyleComments:!0,multilineStrings:!0,tripleQuotedStrings:!0,regexLiterals:!0}),["coffee"]);k(x([],[["str",/^[\S\s]+/]]),["regex"]);window.prettyPrintOne=function(a,m,e){var h=document.createElement("PRE");h.innerHTML=a;e&&D(h,e);E({g:m,i:e,h:h});return h.innerHTML};window.prettyPrint=function(a){function m(){for(var e=window.PR_SHOULD_USE_CONTINUATION?l.now()+250:Infinity;p<h.length&&l.now()<e;p++){var n=h[p],k=n.className;if(k.indexOf("prettyprint")>=0){var k=k.match(g),f,b;if(b=
+!k){b=n;for(var o=void 0,c=b.firstChild;c;c=c.nextSibling)var i=c.nodeType,o=i===1?o?b:c:i===3?N.test(c.nodeValue)?b:o:o;b=(f=o===b?void 0:o)&&"CODE"===f.tagName}b&&(k=f.className.match(g));k&&(k=k[1]);b=!1;for(o=n.parentNode;o;o=o.parentNode)if((o.tagName==="pre"||o.tagName==="code"||o.tagName==="xmp")&&o.className&&o.className.indexOf("prettyprint")>=0){b=!0;break}b||((b=(b=n.className.match(/\blinenums\b(?::(\d+))?/))?b[1]&&b[1].length?+b[1]:!0:!1)&&D(n,b),d={g:k,h:n,i:b},E(d))}}p<h.length?setTimeout(m,
+250):a&&a()}for(var e=[document.getElementsByTagName("pre"),document.getElementsByTagName("code"),document.getElementsByTagName("xmp")],h=[],k=0;k<e.length;++k)for(var t=0,s=e[k].length;t<s;++t)h.push(e[k][t]);var e=q,l=Date;l.now||(l={now:function(){return+new Date}});var p=0,d,g=/\blang(?:uage)?-([\w.]+)(?!\S)/;m()};window.PR={createSimpleLexer:x,registerLangHandler:k,sourceDecorator:u,PR_ATTRIB_NAME:"atn",PR_ATTRIB_VALUE:"atv",PR_COMMENT:"com",PR_DECLARATION:"dec",PR_KEYWORD:"kwd",PR_LITERAL:"lit",
+PR_NOCODE:"nocode",PR_PLAIN:"pln",PR_PUNCTUATION:"pun",PR_SOURCE:"src",PR_STRING:"str",PR_TAG:"tag",PR_TYPE:"typ"}})();
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/emoticons.js b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/emoticons.js
new file mode 100644
index 0000000..a990066
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/emoticons.js
@@ -0,0 +1,129 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('emoticons', function(K) {
+	var self = this, name = 'emoticons',
+		path = (self.emoticonsPath || self.pluginsPath + 'emoticons/images/'),
+		allowPreview = self.allowPreviewEmoticons === undefined ? true : self.allowPreviewEmoticons,
+		currentPageNum = 1;
+	self.clickToolbar(name, function() {
+		var rows = 5, cols = 9, total = 135, startNum = 0,
+			cells = rows * cols, pages = Math.ceil(total / cells),
+			colsHalf = Math.floor(cols / 2),
+			wrapperDiv = K('<div class="ke-plugin-emoticons"></div>'),
+			elements = [],
+			menu = self.createMenu({
+				name : name,
+				beforeRemove : function() {
+					removeEvent();
+				}
+			});
+		menu.div.append(wrapperDiv);
+		var previewDiv, previewImg;
+		if (allowPreview) {
+			previewDiv = K('<div class="ke-preview"></div>').css('right', 0);
+			previewImg = K('<img class="ke-preview-img" src="' + path + startNum + '.gif" />');
+			wrapperDiv.append(previewDiv);
+			previewDiv.append(previewImg);
+		}
+		function bindCellEvent(cell, j, num) {
+			if (previewDiv) {
+				cell.mouseover(function() {
+					if (j > colsHalf) {
+						previewDiv.css('left', 0);
+						previewDiv.css('right', '');
+					} else {
+						previewDiv.css('left', '');
+						previewDiv.css('right', 0);
+					}
+					previewImg.attr('src', path + num + '.gif');
+					K(this).addClass('ke-on');
+				});
+			} else {
+				cell.mouseover(function() {
+					K(this).addClass('ke-on');
+				});
+			}
+			cell.mouseout(function() {
+				K(this).removeClass('ke-on');
+			});
+			cell.click(function(e) {
+				self.insertHtml('<img src="' + path + num + '.gif" border="0" alt="" />').hideMenu().focus();
+				e.stop();
+			});
+		}
+		function createEmoticonsTable(pageNum, parentDiv) {
+			var table = document.createElement('table');
+			parentDiv.append(table);
+			if (previewDiv) {
+				K(table).mouseover(function() {
+					previewDiv.show('block');
+				});
+				K(table).mouseout(function() {
+					previewDiv.hide();
+				});
+				elements.push(K(table));
+			}
+			table.className = 'ke-table';
+			table.cellPadding = 0;
+			table.cellSpacing = 0;
+			table.border = 0;
+			var num = (pageNum - 1) * cells + startNum;
+			for (var i = 0; i < rows; i++) {
+				var row = table.insertRow(i);
+				for (var j = 0; j < cols; j++) {
+					var cell = K(row.insertCell(j));
+					cell.addClass('ke-cell');
+					bindCellEvent(cell, j, num);
+					var span = K('<span class="ke-img"></span>')
+						.css('background-position', '-' + (24 * num) + 'px 0px')
+						.css('background-image', 'url(' + path + 'static.gif)');
+					cell.append(span);
+					elements.push(cell);
+					num++;
+				}
+			}
+			return table;
+		}
+		var table = createEmoticonsTable(currentPageNum, wrapperDiv);
+		function removeEvent() {
+			K.each(elements, function() {
+				this.unbind();
+			});
+		}
+		var pageDiv;
+		function bindPageEvent(el, pageNum) {
+			el.click(function(e) {
+				removeEvent();
+				table.parentNode.removeChild(table);
+				pageDiv.remove();
+				table = createEmoticonsTable(pageNum, wrapperDiv);
+				createPageTable(pageNum);
+				currentPageNum = pageNum;
+				e.stop();
+			});
+		}
+		function createPageTable(currentPageNum) {
+			pageDiv = K('<div class="ke-page"></div>');
+			wrapperDiv.append(pageDiv);
+			for (var pageNum = 1; pageNum <= pages; pageNum++) {
+				if (currentPageNum !== pageNum) {
+					var a = K('<a href="javascript:;">[' + pageNum + ']</a>');
+					bindPageEvent(a, pageNum);
+					pageDiv.append(a);
+					elements.push(a);
+				} else {
+					pageDiv.append(K('@[' + pageNum + ']'));
+				}
+				pageDiv.append(K('@&nbsp;'));
+			}
+		}
+		createPageTable(currentPageNum);
+	});
+});
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/0.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/0.gif
new file mode 100644
index 0000000..5be27cb
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/0.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/1.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/1.gif
new file mode 100644
index 0000000..a2644a9
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/1.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/10.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/10.gif
new file mode 100644
index 0000000..905c15b
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/10.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/100.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/100.gif
new file mode 100644
index 0000000..92ad35d
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/100.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/101.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/101.gif
new file mode 100644
index 0000000..1f27663
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/101.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/102.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/102.gif
new file mode 100644
index 0000000..748ded1
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/102.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/103.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/103.gif
new file mode 100644
index 0000000..be9eaa0
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/103.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/104.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/104.gif
new file mode 100644
index 0000000..d7c2066
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/104.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/105.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/105.gif
new file mode 100644
index 0000000..2f353ca
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/105.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/106.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/106.gif
new file mode 100644
index 0000000..5193534
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/106.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/107.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/107.gif
new file mode 100644
index 0000000..70d38d3
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/107.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/108.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/108.gif
new file mode 100644
index 0000000..749d500
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/108.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/109.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/109.gif
new file mode 100644
index 0000000..6f57d56
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/109.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/11.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/11.gif
new file mode 100644
index 0000000..b512dd5
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/11.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/110.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/110.gif
new file mode 100644
index 0000000..e253abc
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/110.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/111.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/111.gif
new file mode 100644
index 0000000..0c56723
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/111.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/112.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/112.gif
new file mode 100644
index 0000000..c8ddce8
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/112.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/113.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/113.gif
new file mode 100644
index 0000000..2727104
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/113.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/114.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/114.gif
new file mode 100644
index 0000000..53918e2
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/114.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/115.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/115.gif
new file mode 100644
index 0000000..4db3369
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/115.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/116.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/116.gif
new file mode 100644
index 0000000..57326bd
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/116.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/117.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/117.gif
new file mode 100644
index 0000000..14611b6
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/117.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/118.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/118.gif
new file mode 100644
index 0000000..8c25500
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/118.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/119.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/119.gif
new file mode 100644
index 0000000..65bb468
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/119.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/12.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/12.gif
new file mode 100644
index 0000000..547529c
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/12.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/120.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/120.gif
new file mode 100644
index 0000000..5ce77c0
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/120.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/121.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/121.gif
new file mode 100644
index 0000000..a021aba
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/121.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/122.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/122.gif
new file mode 100644
index 0000000..9a79e11
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/122.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/123.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/123.gif
new file mode 100644
index 0000000..b9480be
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/123.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/124.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/124.gif
new file mode 100644
index 0000000..7fed477
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/124.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/125.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/125.gif
new file mode 100644
index 0000000..e2c3c11
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/125.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/126.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/126.gif
new file mode 100644
index 0000000..24105c9
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/126.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/127.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/127.gif
new file mode 100644
index 0000000..0cead36
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/127.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/128.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/128.gif
new file mode 100644
index 0000000..3185861
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/128.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/129.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/129.gif
new file mode 100644
index 0000000..ffd7c6b
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/129.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/13.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/13.gif
new file mode 100644
index 0000000..3475300
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/13.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/130.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/130.gif
new file mode 100644
index 0000000..d828e3d
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/130.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/131.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/131.gif
new file mode 100644
index 0000000..dcb096f
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/131.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/132.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/132.gif
new file mode 100644
index 0000000..1b272a6
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/132.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/133.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/133.gif
new file mode 100644
index 0000000..0d0e864
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/133.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/134.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/134.gif
new file mode 100644
index 0000000..cf48356
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/134.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/14.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/14.gif
new file mode 100644
index 0000000..6a788f8
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/14.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/15.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/15.gif
new file mode 100644
index 0000000..debab8e
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/15.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/16.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/16.gif
new file mode 100644
index 0000000..ed5d29f
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/16.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/17.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/17.gif
new file mode 100644
index 0000000..85886fe
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/17.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/18.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/18.gif
new file mode 100644
index 0000000..b6af218
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/18.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/19.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/19.gif
new file mode 100644
index 0000000..e045ff2
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/19.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/2.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/2.gif
new file mode 100644
index 0000000..40cfda4
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/2.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/20.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/20.gif
new file mode 100644
index 0000000..efd650f
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/20.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/21.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/21.gif
new file mode 100644
index 0000000..cb8cf6d
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/21.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/22.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/22.gif
new file mode 100644
index 0000000..96b04df
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/22.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/23.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/23.gif
new file mode 100644
index 0000000..96516b8
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/23.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/24.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/24.gif
new file mode 100644
index 0000000..5f925c7
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/24.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/25.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/25.gif
new file mode 100644
index 0000000..97f8b1a
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/25.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/26.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/26.gif
new file mode 100644
index 0000000..a7cded7
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/26.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/27.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/27.gif
new file mode 100644
index 0000000..bb46890
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/27.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/28.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/28.gif
new file mode 100644
index 0000000..f59dd58
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/28.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/29.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/29.gif
new file mode 100644
index 0000000..3c5227e
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/29.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/3.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/3.gif
new file mode 100644
index 0000000..6d6f762
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/3.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/30.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/30.gif
new file mode 100644
index 0000000..e24a180
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/30.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/31.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/31.gif
new file mode 100644
index 0000000..073e743
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/31.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/32.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/32.gif
new file mode 100644
index 0000000..772eff2
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/32.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/33.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/33.gif
new file mode 100644
index 0000000..217c1c5
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/33.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/34.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/34.gif
new file mode 100644
index 0000000..e9d4213
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/34.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/35.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/35.gif
new file mode 100644
index 0000000..d6da2c3
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/35.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/36.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/36.gif
new file mode 100644
index 0000000..c1e6ac9
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/36.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/37.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/37.gif
new file mode 100644
index 0000000..92efec6
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/37.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/38.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/38.gif
new file mode 100644
index 0000000..489f0f9
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/38.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/39.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/39.gif
new file mode 100644
index 0000000..734f6d8
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/39.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/4.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/4.gif
new file mode 100644
index 0000000..6ccdaa2
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/4.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/40.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/40.gif
new file mode 100644
index 0000000..24a8eb6
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/40.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/41.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/41.gif
new file mode 100644
index 0000000..99139e1
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/41.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/42.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/42.gif
new file mode 100644
index 0000000..f60897e
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/42.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/43.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/43.gif
new file mode 100644
index 0000000..4350491
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/43.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/44.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/44.gif
new file mode 100644
index 0000000..650d3dd
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/44.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/45.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/45.gif
new file mode 100644
index 0000000..5c8e071
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/45.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/46.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/46.gif
new file mode 100644
index 0000000..f3cb074
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/46.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/47.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/47.gif
new file mode 100644
index 0000000..5b3057a
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/47.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/48.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/48.gif
new file mode 100644
index 0000000..27a30c1
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/48.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/49.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/49.gif
new file mode 100644
index 0000000..dcfa48a
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/49.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/5.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/5.gif
new file mode 100644
index 0000000..ab0b81b
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/5.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/50.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/50.gif
new file mode 100644
index 0000000..029cf0f
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/50.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/51.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/51.gif
new file mode 100644
index 0000000..69f183f
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/51.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/52.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/52.gif
new file mode 100644
index 0000000..d41e8aa
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/52.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/53.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/53.gif
new file mode 100644
index 0000000..56352dd
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/53.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/54.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/54.gif
new file mode 100644
index 0000000..b28d848
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/54.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/55.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/55.gif
new file mode 100644
index 0000000..e18da84
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/55.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/56.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/56.gif
new file mode 100644
index 0000000..edf96f0
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/56.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/57.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/57.gif
new file mode 100644
index 0000000..3f0e2b9
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/57.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/58.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/58.gif
new file mode 100644
index 0000000..47b1aaa
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/58.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/59.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/59.gif
new file mode 100644
index 0000000..918288b
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/59.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/6.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/6.gif
new file mode 100644
index 0000000..ceab122
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/6.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/60.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/60.gif
new file mode 100644
index 0000000..66d2113
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/60.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/61.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/61.gif
new file mode 100644
index 0000000..034933e
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/61.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/62.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/62.gif
new file mode 100644
index 0000000..8d5c4fd
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/62.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/63.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/63.gif
new file mode 100644
index 0000000..d58fcf6
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/63.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/64.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/64.gif
new file mode 100644
index 0000000..c4e00bd
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/64.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/65.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/65.gif
new file mode 100644
index 0000000..da23bfa
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/65.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/66.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/66.gif
new file mode 100644
index 0000000..310ec65
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/66.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/67.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/67.gif
new file mode 100644
index 0000000..51761ba
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/67.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/68.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/68.gif
new file mode 100644
index 0000000..345cb43
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/68.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/69.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/69.gif
new file mode 100644
index 0000000..e0f28a0
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/69.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/7.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/7.gif
new file mode 100644
index 0000000..2f45399
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/7.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/70.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/70.gif
new file mode 100644
index 0000000..24284cf
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/70.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/71.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/71.gif
new file mode 100644
index 0000000..a0ccf2e
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/71.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/72.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/72.gif
new file mode 100644
index 0000000..7e113ee
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/72.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/73.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/73.gif
new file mode 100644
index 0000000..c0293c3
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/73.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/74.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/74.gif
new file mode 100644
index 0000000..1c52bde
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/74.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/75.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/75.gif
new file mode 100644
index 0000000..9cb9aa7
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/75.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/76.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/76.gif
new file mode 100644
index 0000000..27019f8
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/76.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/77.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/77.gif
new file mode 100644
index 0000000..8f882f5
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/77.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/78.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/78.gif
new file mode 100644
index 0000000..d0d0856
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/78.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/79.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/79.gif
new file mode 100644
index 0000000..61652a7
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/79.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/8.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/8.gif
new file mode 100644
index 0000000..f6c8834
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/8.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/80.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/80.gif
new file mode 100644
index 0000000..9a77936
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/80.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/81.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/81.gif
new file mode 100644
index 0000000..2329101
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/81.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/82.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/82.gif
new file mode 100644
index 0000000..644748a
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/82.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/83.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/83.gif
new file mode 100644
index 0000000..fbf275b
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/83.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/84.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/84.gif
new file mode 100644
index 0000000..076f0c6
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/84.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/85.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/85.gif
new file mode 100644
index 0000000..d254af4
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/85.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/86.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/86.gif
new file mode 100644
index 0000000..8f09d33
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/86.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/87.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/87.gif
new file mode 100644
index 0000000..df70756
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/87.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/88.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/88.gif
new file mode 100644
index 0000000..4d8b15e
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/88.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/89.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/89.gif
new file mode 100644
index 0000000..05726dc
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/89.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/9.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/9.gif
new file mode 100644
index 0000000..c2d8450
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/9.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/90.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/90.gif
new file mode 100644
index 0000000..adaf20e
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/90.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/91.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/91.gif
new file mode 100644
index 0000000..608d0ad
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/91.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/92.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/92.gif
new file mode 100644
index 0000000..b909e16
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/92.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/93.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/93.gif
new file mode 100644
index 0000000..7f71a8c
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/93.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/94.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/94.gif
new file mode 100644
index 0000000..4f26d7d
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/94.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/95.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/95.gif
new file mode 100644
index 0000000..5ef6d38
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/95.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/96.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/96.gif
new file mode 100644
index 0000000..2b709e1
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/96.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/97.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/97.gif
new file mode 100644
index 0000000..cf29be8
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/97.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/98.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/98.gif
new file mode 100644
index 0000000..c70e7d3
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/98.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/99.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/99.gif
new file mode 100644
index 0000000..05c1863
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/99.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/static.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/static.gif
new file mode 100644
index 0000000..b8c444b
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/emoticons/images/static.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/filemanager/filemanager.js b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/filemanager/filemanager.js
new file mode 100644
index 0000000..fd899af
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/filemanager/filemanager.js
@@ -0,0 +1,189 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('filemanager', function(K) {
+	var self = this, name = 'filemanager',
+		fileManagerJson = K.undef(self.fileManagerJson, self.basePath + 'php/file_manager_json.php'),
+		imgPath = self.pluginsPath + name + '/images/',
+		lang = self.lang(name + '.');
+	function makeFileTitle(filename, filesize, datetime) {
+		return filename + ' (' + Math.ceil(filesize / 1024) + 'KB, ' + datetime + ')';
+	}
+	function bindTitle(el, data) {
+		if (data.is_dir) {
+			el.attr('title', data.filename);
+		} else {
+			el.attr('title', makeFileTitle(data.filename, data.filesize, data.datetime));
+		}
+	}
+	self.plugin.filemanagerDialog = function(options) {
+		var width = K.undef(options.width, 650),
+			height = K.undef(options.height, 510),
+			dirName = K.undef(options.dirName, ''),
+			viewType = K.undef(options.viewType, 'VIEW').toUpperCase(), // "LIST" or "VIEW"
+			clickFn = options.clickFn;
+		var html = [
+			'<div style="padding:10px 20px;">',
+			// header start
+			'<div class="ke-plugin-filemanager-header">',
+			// left start
+			'<div class="ke-left">',
+			'<img class="ke-inline-block" name="moveupImg" src="' + imgPath + 'go-up.gif" width="16" height="16" border="0" alt="" /> ',
+			'<a class="ke-inline-block" name="moveupLink" href="javascript:;">' + lang.moveup + '</a>',
+			'</div>',
+			// right start
+			'<div class="ke-right">',
+			lang.viewType + ' <select class="ke-inline-block" name="viewType">',
+			'<option value="VIEW">' + lang.viewImage + '</option>',
+			'<option value="LIST">' + lang.listImage + '</option>',
+			'</select> ',
+			lang.orderType + ' <select class="ke-inline-block" name="orderType">',
+			'<option value="NAME">' + lang.fileName + '</option>',
+			'<option value="SIZE">' + lang.fileSize + '</option>',
+			'<option value="TYPE">' + lang.fileType + '</option>',
+			'</select>',
+			'</div>',
+			'<div class="ke-clearfix"></div>',
+			'</div>',
+			// body start
+			'<div class="ke-plugin-filemanager-body"></div>',
+			'</div>'
+		].join('');
+		var dialog = self.createDialog({
+			name : name,
+			width : width,
+			height : height,
+			title : self.lang(name),
+			body : html
+		}),
+		div = dialog.div,
+		bodyDiv = K('.ke-plugin-filemanager-body', div),
+		moveupImg = K('[name="moveupImg"]', div),
+		moveupLink = K('[name="moveupLink"]', div),
+		viewServerBtn = K('[name="viewServer"]', div),
+		viewTypeBox = K('[name="viewType"]', div),
+		orderTypeBox = K('[name="orderType"]', div);
+		function reloadPage(path, order, func) {
+			var param = 'path=' + path + '&order=' + order + '&dir=' + dirName;
+			dialog.showLoading(self.lang('ajaxLoading'));
+			K.ajax(K.addParam(fileManagerJson, param + '&' + new Date().getTime()), function(data) {
+				dialog.hideLoading();
+				func(data);
+			});
+		}
+		var elList = [];
+		function bindEvent(el, result, data, createFunc) {
+			var fileUrl = K.formatUrl(result.current_url + data.filename, 'absolute'),
+				dirPath = encodeURIComponent(result.current_dir_path + data.filename + '/');
+			if (data.is_dir) {
+				el.click(function(e) {
+					reloadPage(dirPath, orderTypeBox.val(), createFunc);
+				});
+			} else if (data.is_photo) {
+				el.click(function(e) {
+					clickFn.call(this, fileUrl, data.filename);
+				});
+			} else {
+				el.click(function(e) {
+					clickFn.call(this, fileUrl, data.filename);
+				});
+			}
+			elList.push(el);
+		}
+		function createCommon(result, createFunc) {
+			// remove events
+			K.each(elList, function() {
+				this.unbind();
+			});
+			moveupLink.unbind();
+			viewTypeBox.unbind();
+			orderTypeBox.unbind();
+			// add events
+			if (result.current_dir_path) {
+				moveupLink.click(function(e) {
+					reloadPage(result.moveup_dir_path, orderTypeBox.val(), createFunc);
+				});
+			}
+			function changeFunc() {
+				if (viewTypeBox.val() == 'VIEW') {
+					reloadPage(result.current_dir_path, orderTypeBox.val(), createView);
+				} else {
+					reloadPage(result.current_dir_path, orderTypeBox.val(), createList);
+				}
+			}
+			viewTypeBox.change(changeFunc);
+			orderTypeBox.change(changeFunc);
+			bodyDiv.html('');
+		}
+		function createList(result) {
+			createCommon(result, createList);
+			var table = document.createElement('table');
+			table.className = 'ke-table';
+			table.cellPadding = 0;
+			table.cellSpacing = 0;
+			table.border = 0;
+			bodyDiv.append(table);
+			var fileList = result.file_list;
+			for (var i = 0, len = fileList.length; i < len; i++) {
+				var data = fileList[i], row = K(table.insertRow(i));
+				row.mouseover(function(e) {
+					K(this).addClass('ke-on');
+				})
+				.mouseout(function(e) {
+					K(this).removeClass('ke-on');
+				});
+				var iconUrl = imgPath + (data.is_dir ? 'folder-16.gif' : 'file-16.gif'),
+					img = K('<img src="' + iconUrl + '" width="16" height="16" alt="' + data.filename + '" align="absmiddle" />'),
+					cell0 = K(row[0].insertCell(0)).addClass('ke-cell ke-name').append(img).append(document.createTextNode(' ' + data.filename));
+				if (!data.is_dir || data.has_file) {
+					row.css('cursor', 'pointer');
+					cell0.attr('title', data.filename);
+					bindEvent(cell0, result, data, createList);
+				} else {
+					cell0.attr('title', lang.emptyFolder);
+				}
+				K(row[0].insertCell(1)).addClass('ke-cell ke-size').html(data.is_dir ? '-' : Math.ceil(data.filesize / 1024) + 'KB');
+				K(row[0].insertCell(2)).addClass('ke-cell ke-datetime').html(data.datetime);
+			}
+		}
+		function createView(result) {
+			createCommon(result, createView);
+			var fileList = result.file_list;
+			for (var i = 0, len = fileList.length; i < len; i++) {
+				var data = fileList[i],
+					div = K('<div class="ke-inline-block ke-item"></div>');
+				bodyDiv.append(div);
+				var photoDiv = K('<div class="ke-inline-block ke-photo"></div>')
+					.mouseover(function(e) {
+						K(this).addClass('ke-on');
+					})
+					.mouseout(function(e) {
+						K(this).removeClass('ke-on');
+					});
+				div.append(photoDiv);
+				var fileUrl = result.current_url + data.filename,
+					iconUrl = data.is_dir ? imgPath + 'folder-64.gif' : (data.is_photo ? fileUrl : imgPath + 'file-64.gif');
+				var img = K('<img src="' + iconUrl + '" width="80" height="80" alt="' + data.filename + '" />');
+				if (!data.is_dir || data.has_file) {
+					photoDiv.css('cursor', 'pointer');
+					bindTitle(photoDiv, data);
+					bindEvent(photoDiv, result, data, createView);
+				} else {
+					photoDiv.attr('title', lang.emptyFolder);
+				}
+				photoDiv.append(img);
+				div.append('<div class="ke-name" title="' + data.filename + '">' + data.filename + '</div>');
+			}
+		}
+		viewTypeBox.val(viewType);
+		reloadPage('', orderTypeBox.val(), viewType == 'VIEW' ? createView : createList);
+		return dialog;
+	}
+
+});
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/filemanager/images/file-16.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/filemanager/images/file-16.gif
new file mode 100644
index 0000000..2cf6e47
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/filemanager/images/file-16.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/filemanager/images/file-64.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/filemanager/images/file-64.gif
new file mode 100644
index 0000000..2e211da
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/filemanager/images/file-64.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/filemanager/images/folder-16.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/filemanager/images/folder-16.gif
new file mode 100644
index 0000000..850b5a3
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/filemanager/images/folder-16.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/filemanager/images/folder-64.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/filemanager/images/folder-64.gif
new file mode 100644
index 0000000..e8a1b09
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/filemanager/images/folder-64.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/filemanager/images/go-up.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/filemanager/images/go-up.gif
new file mode 100644
index 0000000..92ae23d
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/filemanager/images/go-up.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/flash/flash.js b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/flash/flash.js
new file mode 100644
index 0000000..d5d465e
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/flash/flash.js
@@ -0,0 +1,161 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('flash', function(K) {
+	var self = this, name = 'flash', lang = self.lang(name + '.'),
+		allowFlashUpload = K.undef(self.allowFlashUpload, true),
+		allowFileManager = K.undef(self.allowFileManager, false),
+		formatUploadUrl = K.undef(self.formatUploadUrl, true),
+		extraParams = K.undef(self.extraFileUploadParams, {}),
+		filePostName = K.undef(self.filePostName, 'imgFile'),
+		uploadJson = K.undef(self.uploadJson, self.basePath + 'php/upload_json.php');
+	self.plugin.flash = {
+		edit : function() {
+			var html = [
+				'<div style="padding:20px;">',
+				//url
+				'<div class="ke-dialog-row">',
+				'<label for="keUrl" style="width:60px;">' + lang.url + '</label>',
+				'<input class="ke-input-text" type="text" id="keUrl" name="url" value="" style="width:160px;" /> &nbsp;',
+				'<input type="button" class="ke-upload-button" value="' + lang.upload + '" /> &nbsp;',
+				'<span class="ke-button-common ke-button-outer">',
+				'<input type="button" class="ke-button-common ke-button" name="viewServer" value="' + lang.viewServer + '" />',
+				'</span>',
+				'</div>',
+				//width
+				'<div class="ke-dialog-row">',
+				'<label for="keWidth" style="width:60px;">' + lang.width + '</label>',
+				'<input type="text" id="keWidth" class="ke-input-text ke-input-number" name="width" value="550" maxlength="4" /> ',
+				'</div>',
+				//height
+				'<div class="ke-dialog-row">',
+				'<label for="keHeight" style="width:60px;">' + lang.height + '</label>',
+				'<input type="text" id="keHeight" class="ke-input-text ke-input-number" name="height" value="400" maxlength="4" /> ',
+				'</div>',
+				'</div>'
+			].join('');
+			var dialog = self.createDialog({
+				name : name,
+				width : 450,
+				title : self.lang(name),
+				body : html,
+				yesBtn : {
+					name : self.lang('yes'),
+					click : function(e) {
+						var url = K.trim(urlBox.val()),
+							width = widthBox.val(),
+							height = heightBox.val();
+						if (url == 'http://' || K.invalidUrl(url)) {
+							alert(self.lang('invalidUrl'));
+							urlBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(width)) {
+							alert(self.lang('invalidWidth'));
+							widthBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(height)) {
+							alert(self.lang('invalidHeight'));
+							heightBox[0].focus();
+							return;
+						}
+						var html = K.mediaImg(self.themesPath + 'common/blank.gif', {
+								src : url,
+								type : K.mediaType('.swf'),
+								width : width,
+								height : height,
+								quality : 'high'
+							});
+						self.insertHtml(html).hideDialog().focus();
+					}
+				}
+			}),
+			div = dialog.div,
+			urlBox = K('[name="url"]', div),
+			viewServerBtn = K('[name="viewServer"]', div),
+			widthBox = K('[name="width"]', div),
+			heightBox = K('[name="height"]', div);
+			urlBox.val('http://');
+
+			if (allowFlashUpload) {
+				var uploadbutton = K.uploadbutton({
+					button : K('.ke-upload-button', div)[0],
+					fieldName : filePostName,
+					extraParams : extraParams,
+					url : K.addParam(uploadJson, 'dir=flash'),
+					afterUpload : function(data) {
+						dialog.hideLoading();
+						if (data.error === 0) {
+							var url = data.url;
+							if (formatUploadUrl) {
+								url = K.formatUrl(url, 'absolute');
+							}
+							urlBox.val(url);
+							if (self.afterUpload) {
+								self.afterUpload.call(self, url, data, name);
+							}
+							alert(self.lang('uploadSuccess'));
+						} else {
+							alert(data.message);
+						}
+					},
+					afterError : function(html) {
+						dialog.hideLoading();
+						self.errorDialog(html);
+					}
+				});
+				uploadbutton.fileBox.change(function(e) {
+					dialog.showLoading(self.lang('uploadLoading'));
+					uploadbutton.submit();
+				});
+			} else {
+				K('.ke-upload-button', div).hide();
+			}
+
+			if (allowFileManager) {
+				viewServerBtn.click(function(e) {
+					self.loadPlugin('filemanager', function() {
+						self.plugin.filemanagerDialog({
+							viewType : 'LIST',
+							dirName : 'flash',
+							clickFn : function(url, title) {
+								if (self.dialogs.length > 1) {
+									K('[name="url"]', div).val(url);
+									if (self.afterSelectFile) {
+										self.afterSelectFile.call(self, url);
+									}
+									self.hideDialog();
+								}
+							}
+						});
+					});
+				});
+			} else {
+				viewServerBtn.hide();
+			}
+
+			var img = self.plugin.getSelectedFlash();
+			if (img) {
+				var attrs = K.mediaAttrs(img.attr('data-ke-tag'));
+				urlBox.val(attrs.src);
+				widthBox.val(K.removeUnit(img.css('width')) || attrs.width || 0);
+				heightBox.val(K.removeUnit(img.css('height')) || attrs.height || 0);
+			}
+			urlBox[0].focus();
+			urlBox[0].select();
+		},
+		'delete' : function() {
+			self.plugin.getSelectedFlash().remove();
+			// [IE] 删除图片后立即点击图片按钮出错
+			self.addBookmark();
+		}
+	};
+	self.clickToolbar(name, self.plugin.flash.edit);
+});
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/image/image.js b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/image/image.js
new file mode 100644
index 0000000..69029ed
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/image/image.js
@@ -0,0 +1,328 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('image', function(K) {
+	var self = this, name = 'image',
+		allowImageUpload = K.undef(self.allowImageUpload, true),
+		allowImageRemote = K.undef(self.allowImageRemote, true),
+		formatUploadUrl = K.undef(self.formatUploadUrl, true),
+		allowFileManager = K.undef(self.allowFileManager, false),
+		uploadJson = K.undef(self.uploadJson, self.basePath + 'php/upload_json.php'),
+		imageTabIndex = K.undef(self.imageTabIndex, 0),
+		imgPath = self.pluginsPath + 'image/images/',
+		extraParams = K.undef(self.extraFileUploadParams, {}),
+		filePostName = K.undef(self.filePostName, 'imgFile'),
+		fillDescAfterUploadImage = K.undef(self.fillDescAfterUploadImage, false),
+		lang = self.lang(name + '.');
+
+	self.plugin.imageDialog = function(options) {
+		var imageUrl = options.imageUrl,
+			imageWidth = K.undef(options.imageWidth, ''),
+			imageHeight = K.undef(options.imageHeight, ''),
+			imageTitle = K.undef(options.imageTitle, ''),
+			imageAlign = K.undef(options.imageAlign, ''),
+			showRemote = K.undef(options.showRemote, true),
+			showLocal = K.undef(options.showLocal, true),
+			tabIndex = K.undef(options.tabIndex, 0),
+			clickFn = options.clickFn;
+		var target = 'kindeditor_upload_iframe_' + new Date().getTime();
+		var hiddenElements = [];
+		for(var k in extraParams){
+			hiddenElements.push('<input type="hidden" name="' + k + '" value="' + extraParams[k] + '" />');
+		}
+		var html = [
+			'<div style="padding:20px;">',
+			//tabs
+			'<div class="tabs"></div>',
+			//remote image - start
+			'<div class="tab1" style="display:none;">',
+			//url
+			'<div class="ke-dialog-row">',
+			'<label for="remoteUrl" style="width:60px;">' + lang.remoteUrl + '</label>',
+			'<input type="text" id="remoteUrl" class="ke-input-text" name="url" value="" style="width:200px;" /> &nbsp;',
+			'<span class="ke-button-common ke-button-outer">',
+			'<input type="button" class="ke-button-common ke-button" name="viewServer" value="' + lang.viewServer + '" />',
+			'</span>',
+			'</div>',
+			//size
+			'<div class="ke-dialog-row">',
+			'<label for="remoteWidth" style="width:60px;">' + lang.size + '</label>',
+			lang.width + ' <input type="text" id="remoteWidth" class="ke-input-text ke-input-number" name="width" value="" maxlength="4" /> ',
+			lang.height + ' <input type="text" class="ke-input-text ke-input-number" name="height" value="" maxlength="4" /> ',
+			'<img class="ke-refresh-btn" src="' + imgPath + 'refresh.png" width="16" height="16" alt="" style="cursor:pointer;" title="' + lang.resetSize + '" />',
+			'</div>',
+			//align
+			'<div class="ke-dialog-row">',
+			'<label style="width:60px;">' + lang.align + '</label>',
+			'<input type="radio" name="align" class="ke-inline-block" value="" checked="checked" /> <img name="defaultImg" src="' + imgPath + 'align_top.gif" width="23" height="25" alt="" />',
+			' <input type="radio" name="align" class="ke-inline-block" value="left" /> <img name="leftImg" src="' + imgPath + 'align_left.gif" width="23" height="25" alt="" />',
+			' <input type="radio" name="align" class="ke-inline-block" value="right" /> <img name="rightImg" src="' + imgPath + 'align_right.gif" width="23" height="25" alt="" />',
+			'</div>',
+			//title
+			'<div class="ke-dialog-row">',
+			'<label for="remoteTitle" style="width:60px;">' + lang.imgTitle + '</label>',
+			'<input type="text" id="remoteTitle" class="ke-input-text" name="title" value="" style="width:200px;" />',
+			'</div>',
+			'</div>',
+			//remote image - end
+			//local upload - start
+			'<div class="tab2" style="display:none;">',
+			'<iframe name="' + target + '" style="display:none;"></iframe>',
+			'<form class="ke-upload-area ke-form" method="post" enctype="multipart/form-data" target="' + target + '" action="' + K.addParam(uploadJson, 'dir=image') + '">',
+			//file
+			'<div class="ke-dialog-row">',
+			hiddenElements.join(''),
+			'<label style="width:60px;">' + lang.localUrl + '</label>',
+			'<input type="text" name="localUrl" class="ke-input-text" tabindex="-1" style="width:200px;" readonly="true" /> &nbsp;',
+			'<input type="button" class="ke-upload-button" value="' + lang.upload + '" />',
+			'</div>',
+			'</form>',
+			'</div>',
+			//local upload - end
+			'</div>'
+		].join('');
+		var dialogWidth = showLocal || allowFileManager ? 450 : 400,
+			dialogHeight = showLocal && showRemote ? 300 : 250;
+		var dialog = self.createDialog({
+			name : name,
+			width : dialogWidth,
+			height : dialogHeight,
+			title : self.lang(name),
+			body : html,
+			yesBtn : {
+				name : self.lang('yes'),
+				click : function(e) {
+					// Bugfix: http://code.google.com/p/kindeditor/issues/detail?id=319
+					if (dialog.isLoading) {
+						return;
+					}
+					// insert local image
+					if (showLocal && showRemote && tabs && tabs.selectedIndex === 1 || !showRemote) {
+						if (uploadbutton.fileBox.val() == '') {
+							alert(self.lang('pleaseSelectFile'));
+							return;
+						}
+						dialog.showLoading(self.lang('uploadLoading'));
+						uploadbutton.submit();
+						localUrlBox.val('');
+						return;
+					}
+					// insert remote image
+					var url = K.trim(urlBox.val()),
+						width = widthBox.val(),
+						height = heightBox.val(),
+						title = titleBox.val(),
+						align = '';
+					alignBox.each(function() {
+						if (this.checked) {
+							align = this.value;
+							return false;
+						}
+					});
+					if (url == 'http://' || K.invalidUrl(url)) {
+						alert(self.lang('invalidUrl'));
+						urlBox[0].focus();
+						return;
+					}
+					if (!/^\d*$/.test(width)) {
+						alert(self.lang('invalidWidth'));
+						widthBox[0].focus();
+						return;
+					}
+					if (!/^\d*$/.test(height)) {
+						alert(self.lang('invalidHeight'));
+						heightBox[0].focus();
+						return;
+					}
+					clickFn.call(self, url, title, width, height, 0, align);
+				}
+			},
+			beforeRemove : function() {
+				viewServerBtn.unbind();
+				widthBox.unbind();
+				heightBox.unbind();
+				refreshBtn.unbind();
+			}
+		}),
+		div = dialog.div;
+
+		var urlBox = K('[name="url"]', div),
+			localUrlBox = K('[name="localUrl"]', div),
+			viewServerBtn = K('[name="viewServer"]', div),
+			widthBox = K('.tab1 [name="width"]', div),
+			heightBox = K('.tab1 [name="height"]', div),
+			refreshBtn = K('.ke-refresh-btn', div),
+			titleBox = K('.tab1 [name="title"]', div),
+			alignBox = K('.tab1 [name="align"]', div);
+
+		var tabs;
+		if (showRemote && showLocal) {
+			tabs = K.tabs({
+				src : K('.tabs', div),
+				afterSelect : function(i) {}
+			});
+			tabs.add({
+				title : lang.remoteImage,
+				panel : K('.tab1', div)
+			});
+			tabs.add({
+				title : lang.localImage,
+				panel : K('.tab2', div)
+			});
+			tabs.select(tabIndex);
+		} else if (showRemote) {
+			K('.tab1', div).show();
+		} else if (showLocal) {
+			K('.tab2', div).show();
+		}
+
+		var uploadbutton = K.uploadbutton({
+			button : K('.ke-upload-button', div)[0],
+			fieldName : filePostName,
+			form : K('.ke-form', div),
+			target : target,
+			width: 60,
+			afterUpload : function(data) {
+				dialog.hideLoading();
+				if (data.error === 0) {
+					var url = data.url;
+					if (formatUploadUrl) {
+						url = K.formatUrl(url, 'absolute');
+					}
+					if (self.afterUpload) {
+						self.afterUpload.call(self, url, data, name);
+					}
+					if (!fillDescAfterUploadImage) {
+						clickFn.call(self, url, data.title, data.width, data.height, data.border, data.align);
+					} else {
+						K(".ke-dialog-row #remoteUrl", div).val(url);
+						K(".ke-tabs-li", div)[0].click();
+						K(".ke-refresh-btn", div).click();
+					}
+				} else {
+					alert(data.message);
+				}
+			},
+			afterError : function(html) {
+				dialog.hideLoading();
+				self.errorDialog(html);
+			}
+		});
+		uploadbutton.fileBox.change(function(e) {
+			localUrlBox.val(uploadbutton.fileBox.val());
+		});
+		if (allowFileManager) {
+			viewServerBtn.click(function(e) {
+				self.loadPlugin('filemanager', function() {
+					self.plugin.filemanagerDialog({
+						viewType : 'VIEW',
+						dirName : 'image',
+						clickFn : function(url, title) {
+							if (self.dialogs.length > 1) {
+								K('[name="url"]', div).val(url);
+								if (self.afterSelectFile) {
+									self.afterSelectFile.call(self, url);
+								}
+								self.hideDialog();
+							}
+						}
+					});
+				});
+			});
+		} else {
+			viewServerBtn.hide();
+		}
+		var originalWidth = 0, originalHeight = 0;
+		function setSize(width, height) {
+			widthBox.val(width);
+			heightBox.val(height);
+			originalWidth = width;
+			originalHeight = height;
+		}
+		refreshBtn.click(function(e) {
+			var tempImg = K('<img src="' + urlBox.val() + '" />', document).css({
+				position : 'absolute',
+				visibility : 'hidden',
+				top : 0,
+				left : '-1000px'
+			});
+			tempImg.bind('load', function() {
+				setSize(tempImg.width(), tempImg.height());
+				tempImg.remove();
+			});
+			K(document.body).append(tempImg);
+		});
+		widthBox.change(function(e) {
+			if (originalWidth > 0) {
+				heightBox.val(Math.round(originalHeight / originalWidth * parseInt(this.value, 10)));
+			}
+		});
+		heightBox.change(function(e) {
+			if (originalHeight > 0) {
+				widthBox.val(Math.round(originalWidth / originalHeight * parseInt(this.value, 10)));
+			}
+		});
+		urlBox.val(options.imageUrl);
+		setSize(options.imageWidth, options.imageHeight);
+		titleBox.val(options.imageTitle);
+		alignBox.each(function() {
+			if (this.value === options.imageAlign) {
+				this.checked = true;
+				return false;
+			}
+		});
+		if (showRemote && tabIndex === 0) {
+			urlBox[0].focus();
+			urlBox[0].select();
+		}
+		return dialog;
+	};
+	self.plugin.image = {
+		edit : function() {
+			var img = self.plugin.getSelectedImage();
+			self.plugin.imageDialog({
+				imageUrl : img ? img.attr('data-ke-src') : 'http://',
+				imageWidth : img ? img.width() : '',
+				imageHeight : img ? img.height() : '',
+				imageTitle : img ? img.attr('title') : '',
+				imageAlign : img ? img.attr('align') : '',
+				showRemote : allowImageRemote,
+				showLocal : allowImageUpload,
+				tabIndex: img ? 0 : imageTabIndex,
+				clickFn : function(url, title, width, height, border, align) {
+					if (img) {
+						img.attr('src', url);
+						img.attr('data-ke-src', url);
+						img.attr('width', width);
+						img.attr('height', height);
+						img.attr('title', title);
+						img.attr('align', align);
+						img.attr('alt', title);
+					} else {
+						self.exec('insertimage', url, title, width, height, border, align);
+					}
+					// Bugfix: [Firefox] 上传图片后，总是出现正在加载的样式，需要延迟执行hideDialog
+					setTimeout(function() {
+						self.hideDialog().focus();
+					}, 0);
+				}
+			});
+		},
+		'delete' : function() {
+			var target = self.plugin.getSelectedImage();
+			if (target.parent().name == 'a') {
+				target = target.parent();
+			}
+			target.remove();
+			// [IE] 删除图片后立即点击图片按钮出错
+			self.addBookmark();
+		}
+	};
+	self.clickToolbar(name, self.plugin.image.edit);
+});
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/image/images/align_left.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/image/images/align_left.gif
new file mode 100644
index 0000000..ab17f56
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/image/images/align_left.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/image/images/align_right.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/image/images/align_right.gif
new file mode 100644
index 0000000..e8ebe6a
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/image/images/align_right.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/image/images/align_top.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/image/images/align_top.gif
new file mode 100644
index 0000000..d8826a5
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/image/images/align_top.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/image/images/refresh.png b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/image/images/refresh.png
new file mode 100644
index 0000000..77e12d1
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/image/images/refresh.png differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/insertfile/insertfile.js b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/insertfile/insertfile.js
new file mode 100644
index 0000000..b8c523e
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/insertfile/insertfile.js
@@ -0,0 +1,138 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('insertfile', function(K) {
+	var self = this, name = 'insertfile',
+		allowFileUpload = K.undef(self.allowFileUpload, true),
+		allowFileManager = K.undef(self.allowFileManager, false),
+		formatUploadUrl = K.undef(self.formatUploadUrl, true),
+		uploadJson = K.undef(self.uploadJson, self.basePath + 'php/upload_json.php'),
+		extraParams = K.undef(self.extraFileUploadParams, {}),
+		filePostName = K.undef(self.filePostName, 'imgFile'),
+		lang = self.lang(name + '.');
+	self.plugin.fileDialog = function(options) {
+		var fileUrl = K.undef(options.fileUrl, 'http://'),
+			fileTitle = K.undef(options.fileTitle, ''),
+			clickFn = options.clickFn;
+		var html = [
+			'<div style="padding:20px;">',
+			'<div class="ke-dialog-row">',
+			'<label for="keUrl" style="width:60px;">' + lang.url + '</label>',
+			'<input type="text" id="keUrl" name="url" class="ke-input-text" style="width:160px;" /> &nbsp;',
+			'<input type="button" class="ke-upload-button" value="' + lang.upload + '" /> &nbsp;',
+			'<span class="ke-button-common ke-button-outer">',
+			'<input type="button" class="ke-button-common ke-button" name="viewServer" value="' + lang.viewServer + '" />',
+			'</span>',
+			'</div>',
+			//title
+			'<div class="ke-dialog-row">',
+			'<label for="keTitle" style="width:60px;">' + lang.title + '</label>',
+			'<input type="text" id="keTitle" class="ke-input-text" name="title" value="" style="width:160px;" /></div>',
+			'</div>',
+			//form end
+			'</form>',
+			'</div>'
+			].join('');
+		var dialog = self.createDialog({
+			name : name,
+			width : 450,
+			title : self.lang(name),
+			body : html,
+			yesBtn : {
+				name : self.lang('yes'),
+				click : function(e) {
+					var url = K.trim(urlBox.val()),
+						title = titleBox.val();
+					if (url == 'http://' || K.invalidUrl(url)) {
+						alert(self.lang('invalidUrl'));
+						urlBox[0].focus();
+						return;
+					}
+					if (K.trim(title) === '') {
+						title = url;
+					}
+					clickFn.call(self, url, title);
+				}
+			}
+		}),
+		div = dialog.div;
+
+		var urlBox = K('[name="url"]', div),
+			viewServerBtn = K('[name="viewServer"]', div),
+			titleBox = K('[name="title"]', div);
+
+		if (allowFileUpload) {
+			var uploadbutton = K.uploadbutton({
+				button : K('.ke-upload-button', div)[0],
+				fieldName : filePostName,
+				url : K.addParam(uploadJson, 'dir=file'),
+				extraParams : extraParams,
+				afterUpload : function(data) {
+					dialog.hideLoading();
+					if (data.error === 0) {
+						var url = data.url;
+						if (formatUploadUrl) {
+							url = K.formatUrl(url, 'absolute');
+						}
+						urlBox.val(url);
+						if (self.afterUpload) {
+							self.afterUpload.call(self, url, data, name);
+						}
+						alert(self.lang('uploadSuccess'));
+					} else {
+						alert(data.message);
+					}
+				},
+				afterError : function(html) {
+					dialog.hideLoading();
+					self.errorDialog(html);
+				}
+			});
+			uploadbutton.fileBox.change(function(e) {
+				dialog.showLoading(self.lang('uploadLoading'));
+				uploadbutton.submit();
+			});
+		} else {
+			K('.ke-upload-button', div).hide();
+		}
+		if (allowFileManager) {
+			viewServerBtn.click(function(e) {
+				self.loadPlugin('filemanager', function() {
+					self.plugin.filemanagerDialog({
+						viewType : 'LIST',
+						dirName : 'file',
+						clickFn : function(url, title) {
+							if (self.dialogs.length > 1) {
+								K('[name="url"]', div).val(url);
+								if (self.afterSelectFile) {
+									self.afterSelectFile.call(self, url);
+								}
+								self.hideDialog();
+							}
+						}
+					});
+				});
+			});
+		} else {
+			viewServerBtn.hide();
+		}
+		urlBox.val(fileUrl);
+		titleBox.val(fileTitle);
+		urlBox[0].focus();
+		urlBox[0].select();
+	};
+	self.clickToolbar(name, function() {
+		self.plugin.fileDialog({
+			clickFn : function(url, title) {
+				var html = '<a class="ke-insertfile" href="' + url + '" data-ke-src="' + url + '" target="_blank">' + title + '</a>';
+				self.insertHtml(html).hideDialog().focus();
+			}
+		});
+	});
+});
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/lineheight/lineheight.js b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/lineheight/lineheight.js
new file mode 100644
index 0000000..ae679d7
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/lineheight/lineheight.js
@@ -0,0 +1,38 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('lineheight', function(K) {
+	var self = this, name = 'lineheight', lang = self.lang(name + '.');
+	self.clickToolbar(name, function() {
+		var curVal = '', commonNode = self.cmd.commonNode({'*' : '.line-height'});
+		if (commonNode) {
+			curVal = commonNode.css('line-height');
+		}
+		var menu = self.createMenu({
+			name : name,
+			width : 150
+		});
+		K.each(lang.lineHeight, function(i, row) {
+			K.each(row, function(key, val) {
+				menu.addItem({
+					title : val,
+					checked : curVal === key,
+					click : function() {
+						self.cmd.toggle('<span style="line-height:' + key + ';"></span>', {
+							span : '.line-height=' + key
+						});
+						self.updateState();
+						self.addBookmark();
+						self.hideMenu();
+					}
+				});
+			});
+		});
+	});
+});
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/link/link.js b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/link/link.js
new file mode 100644
index 0000000..352fa3c
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/link/link.js
@@ -0,0 +1,66 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('link', function(K) {
+	var self = this, name = 'link';
+	self.plugin.link = {
+		edit : function() {
+			var lang = self.lang(name + '.'),
+				html = '<div style="padding:20px;">' +
+					//url
+					'<div class="ke-dialog-row">' +
+					'<label for="keUrl" style="width:60px;">' + lang.url + '</label>' +
+					'<input class="ke-input-text" type="text" id="keUrl" name="url" value="" style="width:260px;" /></div>' +
+					//type
+					'<div class="ke-dialog-row"">' +
+					'<label for="keType" style="width:60px;">' + lang.linkType + '</label>' +
+					'<select id="keType" name="type"></select>' +
+					'</div>' +
+					'</div>',
+				dialog = self.createDialog({
+					name : name,
+					width : 450,
+					title : self.lang(name),
+					body : html,
+					yesBtn : {
+						name : self.lang('yes'),
+						click : function(e) {
+							var url = K.trim(urlBox.val());
+							if (url == 'http://' || K.invalidUrl(url)) {
+								alert(self.lang('invalidUrl'));
+								urlBox[0].focus();
+								return;
+							}
+							self.exec('createlink', url, typeBox.val()).hideDialog().focus();
+						}
+					}
+				}),
+				div = dialog.div,
+				urlBox = K('input[name="url"]', div),
+				typeBox = K('select[name="type"]', div);
+			urlBox.val('http://');
+			typeBox[0].options[0] = new Option(lang.newWindow, '_blank');
+			typeBox[0].options[1] = new Option(lang.selfWindow, '');
+			self.cmd.selection();
+			var a = self.plugin.getSelectedLink();
+			if (a) {
+				self.cmd.range.selectNode(a[0]);
+				self.cmd.select();
+				urlBox.val(a.attr('data-ke-src'));
+				typeBox.val(a.attr('target'));
+			}
+			urlBox[0].focus();
+			urlBox[0].select();
+		},
+		'delete' : function() {
+			self.exec('unlink', null);
+		}
+	};
+	self.clickToolbar(name, self.plugin.link.edit);
+});
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/map/map.html b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/map/map.html
new file mode 100644
index 0000000..1a9ad7d
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/map/map.html
@@ -0,0 +1,57 @@
+<!doctype html>
+<html>
+	<head>
+	<meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
+	<style>
+		html { height: 100% }
+		body { height: 100%; margin: 0; padding: 0; background-color: #FFF }
+		#map_canvas { height: 100% }
+	</style>
+	<script src="http://maps.googleapis.com/maps/api/js?sensor=false&language=zh_CN"></script>
+	<script>
+		var map, geocoder;
+		function initialize() {
+			var latlng = new google.maps.LatLng(31.230393, 121.473704);
+			var options = {
+				zoom: 11,
+				center: latlng,
+				disableDefaultUI: true,
+				panControl: true,
+				zoomControl: true,
+				mapTypeControl: true,
+				scaleControl: true,
+				streetViewControl: false,
+				overviewMapControl: true,
+				mapTypeId: google.maps.MapTypeId.ROADMAP
+			};
+			map = new google.maps.Map(document.getElementById("map_canvas"), options);
+			geocoder = new google.maps.Geocoder();
+			geocoder.geocode({latLng: latlng}, function(results, status) {
+				if (status == google.maps.GeocoderStatus.OK) {
+					if (results[3]) {
+						parent.document.getElementById("kindeditor_plugin_map_address").value = results[3].formatted_address;
+					}
+				}
+			});
+		}
+		function search(address) {
+			if (!map) return;
+			geocoder.geocode({address : address}, function(results, status) {
+				if (status == google.maps.GeocoderStatus.OK) {
+					map.setZoom(11);
+					map.setCenter(results[0].geometry.location);
+					var marker = new google.maps.Marker({
+						map: map,
+						position: results[0].geometry.location
+					});
+				} else {
+					alert("Invalid address: " + address);
+				}
+			});
+		}
+	</script>
+	</head>
+	<body onload="initialize();">
+		<div id="map_canvas" style="width:100%; height:100%"></div>
+	</body>
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/map/map.js b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/map/map.js
new file mode 100644
index 0000000..5290875
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/map/map.js
@@ -0,0 +1,137 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+// Google Maps: http://code.google.com/apis/maps/index.html
+
+KindEditor.plugin('map', function(K) {
+	var self = this, name = 'map', lang = self.lang(name + '.');
+	self.clickToolbar(name, function() {
+		var html = ['<div style="padding:10px 20px;">',
+			'<div class="ke-dialog-row">',
+			lang.address + ' <input id="kindeditor_plugin_map_address" name="address" class="ke-input-text" value="" style="width:200px;" /> ',
+			'<span class="ke-button-common ke-button-outer">',
+			'<input type="button" name="searchBtn" class="ke-button-common ke-button" value="' + lang.search + '" />',
+			'</span>',
+			'</div>',
+			'<div class="ke-map" style="width:558px;height:360px;"></div>',
+			'</div>'].join('');
+		var dialog = self.createDialog({
+			name : name,
+			width : 600,
+			title : self.lang(name),
+			body : html,
+			yesBtn : {
+				name : self.lang('yes'),
+				click : function(e) {
+					var geocoder = win.geocoder,
+						map = win.map,
+						center = map.getCenter().lat() + ',' + map.getCenter().lng(),
+						zoom = map.getZoom(),
+						maptype = map.getMapTypeId(),
+						url = 'http://maps.googleapis.com/maps/api/staticmap';
+						url += '?center=' + encodeURIComponent(center);
+						url += '&zoom=' + encodeURIComponent(zoom);
+						url += '&size=558x360';
+						url += '&maptype=' + encodeURIComponent(maptype);
+						url += '&markers=' + encodeURIComponent(center);
+						url += '&language=' + self.langType;
+						url += '&sensor=false';
+					self.exec('insertimage', url).hideDialog().focus();
+				}
+			},
+			beforeRemove : function() {
+				searchBtn.remove();
+				if (doc) {
+					doc.write('');
+				}
+				iframe.remove();
+			}
+		});
+		var div = dialog.div,
+			addressBox = K('[name="address"]', div),
+			searchBtn = K('[name="searchBtn"]', div),
+			win, doc;
+		var iframeHtml = ['<!doctype html><html><head>',
+			'<meta name="viewport" content="initial-scale=1.0, user-scalable=no" />',
+			'<style>',
+			'	html { height: 100% }',
+			'	body { height: 100%; margin: 0; padding: 0; background-color: #FFF }',
+			'	#map_canvas { height: 100% }',
+			'</style>',
+			'<script src="http://maps.googleapis.com/maps/api/js?sensor=false&language=' + self.langType + '"></script>',
+			'<script>',
+			'var map, geocoder;',
+			'function initialize() {',
+			'	var latlng = new google.maps.LatLng(31.230393, 121.473704);',
+			'	var options = {',
+			'		zoom: 11,',
+			'		center: latlng,',
+			'		disableDefaultUI: true,',
+			'		panControl: true,',
+			'		zoomControl: true,',
+			'		mapTypeControl: true,',
+			'		scaleControl: true,',
+			'		streetViewControl: false,',
+			'		overviewMapControl: true,',
+			'		mapTypeId: google.maps.MapTypeId.ROADMAP',
+			'	};',
+			'	map = new google.maps.Map(document.getElementById("map_canvas"), options);',
+			'	geocoder = new google.maps.Geocoder();',
+			'	geocoder.geocode({latLng: latlng}, function(results, status) {',
+			'		if (status == google.maps.GeocoderStatus.OK) {',
+			'			if (results[3]) {',
+			'				parent.document.getElementById("kindeditor_plugin_map_address").value = results[3].formatted_address;',
+			'			}',
+			'		}',
+			'	});',
+			'}',
+			'function search(address) {',
+			'	if (!map) return;',
+			'	geocoder.geocode({address : address}, function(results, status) {',
+			'		if (status == google.maps.GeocoderStatus.OK) {',
+			'			map.setZoom(11);',
+			'			map.setCenter(results[0].geometry.location);',
+			'			var marker = new google.maps.Marker({',
+			'				map: map,',
+			'				position: results[0].geometry.location',
+			'			});',
+			'		} else {',
+			'			alert("Invalid address: " + address);',
+			'		}',
+			'	});',
+			'}',
+			'</script>',
+			'</head>',
+			'<body onload="initialize();">',
+			'<div id="map_canvas" style="width:100%; height:100%"></div>',
+			'</body></html>'].join('\n');
+		// TODO：用doc.write(iframeHtml)方式加载时，在IE6上第一次加载报错，暂时使用src方式
+		var iframe = K('<iframe class="ke-textarea" frameborder="0" src="' + self.pluginsPath + 'map/map.html" style="width:558px;height:360px;"></iframe>');
+		function ready() {
+			win = iframe[0].contentWindow;
+			doc = K.iframeDoc(iframe);
+			//doc.open();
+			//doc.write(iframeHtml);
+			//doc.close();
+		}
+		iframe.bind('load', function() {
+			iframe.unbind('load');
+			if (K.IE) {
+				ready();
+			} else {
+				setTimeout(ready, 0);
+			}
+		});
+		K('.ke-map', div).replaceWith(iframe);
+		// search map
+		searchBtn.click(function() {
+			win.search(addressBox.val());
+		});
+	});
+});
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/media/media.js b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/media/media.js
new file mode 100644
index 0000000..5803466
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/media/media.js
@@ -0,0 +1,170 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('media', function(K) {
+	var self = this, name = 'media', lang = self.lang(name + '.'),
+		allowMediaUpload = K.undef(self.allowMediaUpload, true),
+		allowFileManager = K.undef(self.allowFileManager, false),
+		formatUploadUrl = K.undef(self.formatUploadUrl, true),
+		extraParams = K.undef(self.extraFileUploadParams, {}),
+		filePostName = K.undef(self.filePostName, 'imgFile'),
+		uploadJson = K.undef(self.uploadJson, self.basePath + 'php/upload_json.php');
+	self.plugin.media = {
+		edit : function() {
+			var html = [
+				'<div style="padding:20px;">',
+				//url
+				'<div class="ke-dialog-row">',
+				'<label for="keUrl" style="width:60px;">' + lang.url + '</label>',
+				'<input class="ke-input-text" type="text" id="keUrl" name="url" value="" style="width:160px;" /> &nbsp;',
+				'<input type="button" class="ke-upload-button" value="' + lang.upload + '" /> &nbsp;',
+				'<span class="ke-button-common ke-button-outer">',
+				'<input type="button" class="ke-button-common ke-button" name="viewServer" value="' + lang.viewServer + '" />',
+				'</span>',
+				'</div>',
+				//width
+				'<div class="ke-dialog-row">',
+				'<label for="keWidth" style="width:60px;">' + lang.width + '</label>',
+				'<input type="text" id="keWidth" class="ke-input-text ke-input-number" name="width" value="550" maxlength="4" />',
+				'</div>',
+				//height
+				'<div class="ke-dialog-row">',
+				'<label for="keHeight" style="width:60px;">' + lang.height + '</label>',
+				'<input type="text" id="keHeight" class="ke-input-text ke-input-number" name="height" value="400" maxlength="4" />',
+				'</div>',
+				//autostart
+				'<div class="ke-dialog-row">',
+				'<label for="keAutostart">' + lang.autostart + '</label>',
+				'<input type="checkbox" id="keAutostart" name="autostart" value="" /> ',
+				'</div>',
+				'</div>'
+			].join('');
+			var dialog = self.createDialog({
+				name : name,
+				width : 450,
+				height : 230,
+				title : self.lang(name),
+				body : html,
+				yesBtn : {
+					name : self.lang('yes'),
+					click : function(e) {
+						var url = K.trim(urlBox.val()),
+							width = widthBox.val(),
+							height = heightBox.val();
+						if (url == 'http://' || K.invalidUrl(url)) {
+							alert(self.lang('invalidUrl'));
+							urlBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(width)) {
+							alert(self.lang('invalidWidth'));
+							widthBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(height)) {
+							alert(self.lang('invalidHeight'));
+							heightBox[0].focus();
+							return;
+						}
+						var html = K.mediaImg(self.themesPath + 'common/blank.gif', {
+								src : url,
+								type : K.mediaType(url),
+								width : width,
+								height : height,
+								autostart : autostartBox[0].checked ? 'true' : 'false',
+								loop : 'true'
+							});
+						self.insertHtml(html).hideDialog().focus();
+					}
+				}
+			}),
+			div = dialog.div,
+			urlBox = K('[name="url"]', div),
+			viewServerBtn = K('[name="viewServer"]', div),
+			widthBox = K('[name="width"]', div),
+			heightBox = K('[name="height"]', div),
+			autostartBox = K('[name="autostart"]', div);
+			urlBox.val('http://');
+
+			if (allowMediaUpload) {
+				var uploadbutton = K.uploadbutton({
+					button : K('.ke-upload-button', div)[0],
+					fieldName : filePostName,
+					extraParams : extraParams,
+					url : K.addParam(uploadJson, 'dir=media'),
+					afterUpload : function(data) {
+						dialog.hideLoading();
+						if (data.error === 0) {
+							var url = data.url;
+							if (formatUploadUrl) {
+								url = K.formatUrl(url, 'absolute');
+							}
+							urlBox.val(url);
+							if (self.afterUpload) {
+								self.afterUpload.call(self, url, data, name);
+							}
+							alert(self.lang('uploadSuccess'));
+						} else {
+							alert(data.message);
+						}
+					},
+					afterError : function(html) {
+						dialog.hideLoading();
+						self.errorDialog(html);
+					}
+				});
+				uploadbutton.fileBox.change(function(e) {
+					dialog.showLoading(self.lang('uploadLoading'));
+					uploadbutton.submit();
+				});
+			} else {
+				K('.ke-upload-button', div).hide();
+			}
+
+			if (allowFileManager) {
+				viewServerBtn.click(function(e) {
+					self.loadPlugin('filemanager', function() {
+						self.plugin.filemanagerDialog({
+							viewType : 'LIST',
+							dirName : 'media',
+							clickFn : function(url, title) {
+								if (self.dialogs.length > 1) {
+									K('[name="url"]', div).val(url);
+									if (self.afterSelectFile) {
+										self.afterSelectFile.call(self, url);
+									}
+									self.hideDialog();
+								}
+							}
+						});
+					});
+				});
+			} else {
+				viewServerBtn.hide();
+			}
+
+			var img = self.plugin.getSelectedMedia();
+			if (img) {
+				var attrs = K.mediaAttrs(img.attr('data-ke-tag'));
+				urlBox.val(attrs.src);
+				widthBox.val(K.removeUnit(img.css('width')) || attrs.width || 0);
+				heightBox.val(K.removeUnit(img.css('height')) || attrs.height || 0);
+				autostartBox[0].checked = (attrs.autostart === 'true');
+			}
+			urlBox[0].focus();
+			urlBox[0].select();
+		},
+		'delete' : function() {
+			self.plugin.getSelectedMedia().remove();
+			// [IE] 删除图片后立即点击图片按钮出错
+			self.addBookmark();
+		}
+	};
+	self.clickToolbar(name, self.plugin.media.edit);
+});
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/multiimage/images/image.png b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/multiimage/images/image.png
new file mode 100644
index 0000000..fe79cf0
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/multiimage/images/image.png differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/multiimage/images/select-files-en.png b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/multiimage/images/select-files-en.png
new file mode 100644
index 0000000..a926a6e
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/multiimage/images/select-files-en.png differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/multiimage/images/select-files-zh_CN.png b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/multiimage/images/select-files-zh_CN.png
new file mode 100644
index 0000000..5a31d36
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/multiimage/images/select-files-zh_CN.png differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/multiimage/images/swfupload.swf b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/multiimage/images/swfupload.swf
new file mode 100644
index 0000000..e3f7670
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/multiimage/images/swfupload.swf differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/multiimage/multiimage.js b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/multiimage/multiimage.js
new file mode 100644
index 0000000..5e6ecf8
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/multiimage/multiimage.js
@@ -0,0 +1,1384 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+
+(function(K) {
+
+function KSWFUpload(options) {
+	this.init(options);
+}
+K.extend(KSWFUpload, {
+	init : function(options) {
+		var self = this;
+		options.afterError = options.afterError || function(str) {
+			alert(str);
+		};
+		self.options = options;
+		self.progressbars = {};
+		// template
+		self.div = K(options.container).html([
+			'<div class="ke-swfupload">',
+			'<div class="ke-swfupload-top">',
+			'<div class="ke-inline-block ke-swfupload-button">',
+			'<input type="button" value="Browse" />',
+			'</div>',
+			'<div class="ke-inline-block ke-swfupload-desc">' + options.uploadDesc + '</div>',
+			'<span class="ke-button-common ke-button-outer ke-swfupload-startupload">',
+			'<input type="button" class="ke-button-common ke-button" value="' + options.startButtonValue + '" />',
+			'</span>',
+			'</div>',
+			'<div class="ke-swfupload-body"></div>',
+			'</div>'
+		].join(''));
+		self.bodyDiv = K('.ke-swfupload-body', self.div);
+
+		function showError(itemDiv, msg) {
+			K('.ke-status > div', itemDiv).hide();
+			K('.ke-message', itemDiv).addClass('ke-error').show().html(K.escape(msg));
+		}
+
+		var settings = {
+			debug : false,
+			upload_url : options.uploadUrl,
+			flash_url : options.flashUrl,
+			file_post_name : options.filePostName,
+			button_placeholder : K('.ke-swfupload-button > input', self.div)[0],
+			button_image_url: options.buttonImageUrl,
+			button_width: options.buttonWidth,
+			button_height: options.buttonHeight,
+			button_cursor : SWFUpload.CURSOR.HAND,
+			file_types : options.fileTypes,
+			file_types_description : options.fileTypesDesc,
+			file_upload_limit : options.fileUploadLimit,
+			file_size_limit : options.fileSizeLimit,
+			post_params : options.postParams,
+			file_queued_handler : function(file) {
+				file.url = self.options.fileIconUrl;
+				self.appendFile(file);
+			},
+			file_queue_error_handler : function(file, errorCode, message) {
+				var errorName = '';
+				switch (errorCode) {
+					case SWFUpload.QUEUE_ERROR.QUEUE_LIMIT_EXCEEDED:
+						errorName = options.queueLimitExceeded;
+						break;
+					case SWFUpload.QUEUE_ERROR.FILE_EXCEEDS_SIZE_LIMIT:
+						errorName = options.fileExceedsSizeLimit;
+						break;
+					case SWFUpload.QUEUE_ERROR.ZERO_BYTE_FILE:
+						errorName = options.zeroByteFile;
+						break;
+					case SWFUpload.QUEUE_ERROR.INVALID_FILETYPE:
+						errorName = options.invalidFiletype;
+						break;
+					default:
+						errorName = options.unknownError;
+						break;
+				}
+				K.DEBUG && alert(errorName);
+			},
+			upload_start_handler : function(file) {
+				var self = this;
+				var itemDiv = K('div[data-id="' + file.id + '"]', self.bodyDiv);
+				K('.ke-status > div', itemDiv).hide();
+				K('.ke-progressbar', itemDiv).show();
+			},
+			upload_progress_handler : function(file, bytesLoaded, bytesTotal) {
+				var percent = Math.round(bytesLoaded * 100 / bytesTotal);
+				var progressbar = self.progressbars[file.id];
+				progressbar.bar.css('width', Math.round(percent * 80 / 100) + 'px');
+				progressbar.percent.html(percent + '%');
+			},
+			upload_error_handler : function(file, errorCode, message) {
+				if (file && file.filestatus == SWFUpload.FILE_STATUS.ERROR) {
+					var itemDiv = K('div[data-id="' + file.id + '"]', self.bodyDiv).eq(0);
+					showError(itemDiv, self.options.errorMessage);
+				}
+			},
+			upload_success_handler : function(file, serverData) {
+				var itemDiv = K('div[data-id="' + file.id + '"]', self.bodyDiv).eq(0);
+				var data = {};
+				try {
+					data = K.json(serverData);
+				} catch (e) {
+					self.options.afterError.call(this, '<!doctype html><html>' + serverData + '</html>');
+				}
+				if (data.error !== 0) {
+					showError(itemDiv, K.DEBUG ? data.message : self.options.errorMessage);
+					return;
+				}
+				file.url = data.url;
+				K('.ke-img', itemDiv).attr('src', file.url).attr('data-status', file.filestatus).data('data', data);
+				K('.ke-status > div', itemDiv).hide();
+			}
+		};
+		self.swfu = new SWFUpload(settings);
+
+		K('.ke-swfupload-startupload input', self.div).click(function() {
+			self.swfu.startUpload();
+		});
+	},
+	getUrlList : function() {
+		var list = [];
+		K('.ke-img', self.bodyDiv).each(function() {
+			var img = K(this);
+			var status = img.attr('data-status');
+			if (status == SWFUpload.FILE_STATUS.COMPLETE) {
+				list.push(img.data('data'));
+			}
+		});
+		return list;
+	},
+	removeFile : function(fileId) {
+		var self = this;
+		self.swfu.cancelUpload(fileId);
+		var itemDiv = K('div[data-id="' + fileId + '"]', self.bodyDiv);
+		K('.ke-photo', itemDiv).unbind();
+		K('.ke-delete', itemDiv).unbind();
+		itemDiv.remove();
+	},
+	removeFiles : function() {
+		var self = this;
+		K('.ke-item', self.bodyDiv).each(function() {
+			self.removeFile(K(this).attr('data-id'));
+		});
+	},
+	appendFile : function(file) {
+		var self = this;
+		var itemDiv = K('<div class="ke-inline-block ke-item" data-id="' + file.id + '"></div>');
+		self.bodyDiv.append(itemDiv);
+		var photoDiv = K('<div class="ke-inline-block ke-photo"></div>')
+			.mouseover(function(e) {
+				K(this).addClass('ke-on');
+			})
+			.mouseout(function(e) {
+				K(this).removeClass('ke-on');
+			});
+		itemDiv.append(photoDiv);
+
+		var img = K('<img src="' + file.url + '" class="ke-img" data-status="' + file.filestatus + '" width="80" height="80" alt="' + file.name + '" />');
+		photoDiv.append(img);
+		K('<span class="ke-delete"></span>').appendTo(photoDiv).click(function() {
+			self.removeFile(file.id);
+		});
+		var statusDiv = K('<div class="ke-status"></div>').appendTo(photoDiv);
+		// progressbar
+		K(['<div class="ke-progressbar">',
+			'<div class="ke-progressbar-bar"><div class="ke-progressbar-bar-inner"></div></div>',
+			'<div class="ke-progressbar-percent">0%</div></div>'].join('')).hide().appendTo(statusDiv);
+		// message
+		K('<div class="ke-message">' + self.options.pendingMessage + '</div>').appendTo(statusDiv);
+
+		itemDiv.append('<div class="ke-name">' + file.name + '</div>');
+
+		self.progressbars[file.id] = {
+			bar : K('.ke-progressbar-bar-inner', photoDiv),
+			percent : K('.ke-progressbar-percent', photoDiv)
+		};
+	},
+	remove : function() {
+		this.removeFiles();
+		this.swfu.destroy();
+		this.div.html('');
+	}
+});
+
+K.swfupload = function(element, options) {
+	return new KSWFUpload(element, options);
+};
+
+})(KindEditor);
+
+KindEditor.plugin('multiimage', function(K) {
+	var self = this, name = 'multiimage',
+		formatUploadUrl = K.undef(self.formatUploadUrl, true),
+		uploadJson = K.undef(self.uploadJson, self.basePath + 'php/upload_json.php'),
+		imgPath = self.pluginsPath + 'multiimage/images/',
+		imageSizeLimit = K.undef(self.imageSizeLimit, '1MB'),
+		imageFileTypes = K.undef(self.imageFileTypes, '*.jpg;*.gif;*.png'),
+		imageUploadLimit = K.undef(self.imageUploadLimit, 20),
+		filePostName = K.undef(self.filePostName, 'imgFile'),
+		lang = self.lang(name + '.');
+
+	self.plugin.multiImageDialog = function(options) {
+		var clickFn = options.clickFn,
+			uploadDesc = K.tmpl(lang.uploadDesc, {uploadLimit : imageUploadLimit, sizeLimit : imageSizeLimit});
+		var html = [
+			'<div style="padding:20px;">',
+			'<div class="swfupload">',
+			'</div>',
+			'</div>'
+		].join('');
+		var dialog = self.createDialog({
+			name : name,
+			width : 650,
+			height : 510,
+			title : self.lang(name),
+			body : html,
+			previewBtn : {
+				name : lang.insertAll,
+				click : function(e) {
+					clickFn.call(self, swfupload.getUrlList());
+				}
+			},
+			yesBtn : {
+				name : lang.clearAll,
+				click : function(e) {
+					swfupload.removeFiles();
+				}
+			},
+			beforeRemove : function() {
+				// IE9 bugfix: https://github.com/kindsoft/kindeditor/issues/72
+				if (!K.IE || K.V <= 8) {
+					swfupload.remove();
+				}
+			}
+		}),
+		div = dialog.div;
+
+		var swfupload = K.swfupload({
+			container : K('.swfupload', div),
+			buttonImageUrl : imgPath + (self.langType == 'zh_CN' ? 'select-files-zh_CN.png' : 'select-files-en.png'),
+			buttonWidth : self.langType == 'zh_CN' ? 72 : 88,
+			buttonHeight : 23,
+			fileIconUrl : imgPath + 'image.png',
+			uploadDesc : uploadDesc,
+			startButtonValue : lang.startUpload,
+			uploadUrl : K.addParam(uploadJson, 'dir=image'),
+			flashUrl : imgPath + 'swfupload.swf',
+			filePostName : filePostName,
+			fileTypes : '*.jpg;*.jpeg;*.gif;*.png;*.bmp',
+			fileTypesDesc : 'Image Files',
+			fileUploadLimit : imageUploadLimit,
+			fileSizeLimit : imageSizeLimit,
+			postParams :  K.undef(self.extraFileUploadParams, {}),
+			queueLimitExceeded : lang.queueLimitExceeded,
+			fileExceedsSizeLimit : lang.fileExceedsSizeLimit,
+			zeroByteFile : lang.zeroByteFile,
+			invalidFiletype : lang.invalidFiletype,
+			unknownError : lang.unknownError,
+			pendingMessage : lang.pending,
+			errorMessage : lang.uploadError,
+			afterError : function(html) {
+				self.errorDialog(html);
+			}
+		});
+
+		return dialog;
+	};
+	self.clickToolbar(name, function() {
+		self.plugin.multiImageDialog({
+			clickFn : function (urlList) {
+				if (urlList.length === 0) {
+					return;
+				}
+				K.each(urlList, function(i, data) {
+					if (self.afterUpload) {
+						self.afterUpload.call(self, data.url, data, 'multiimage');
+					}
+					self.exec('insertimage', data.url, data.title, data.width, data.height, data.border, data.align);
+				});
+				// Bugfix: [Firefox] 上传图片后，总是出现正在加载的样式，需要延迟执行hideDialog
+				setTimeout(function() {
+					self.hideDialog().focus();
+				}, 0);
+			}
+		});
+	});
+});
+
+
+/**
+ * SWFUpload: http://www.swfupload.org, http://swfupload.googlecode.com
+ *
+ * mmSWFUpload 1.0: Flash upload dialog - http://profandesign.se/swfupload/,  http://www.vinterwebb.se/
+ *
+ * SWFUpload is (c) 2006-2007 Lars Huring, Olov Nilz閚 and Mammon Media and is released under the MIT License:
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ * SWFUpload 2 is (c) 2007-2008 Jake Roberts and is released under the MIT License:
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ */
+
+
+/* ******************* */
+/* Constructor & Init  */
+/* ******************* */
+
+(function() {
+
+window.SWFUpload = function (settings) {
+	this.initSWFUpload(settings);
+};
+
+SWFUpload.prototype.initSWFUpload = function (settings) {
+	try {
+		this.customSettings = {};	// A container where developers can place their own settings associated with this instance.
+		this.settings = settings;
+		this.eventQueue = [];
+		this.movieName = "KindEditor_SWFUpload_" + SWFUpload.movieCount++;
+		this.movieElement = null;
+
+
+		// Setup global control tracking
+		SWFUpload.instances[this.movieName] = this;
+
+		// Load the settings.  Load the Flash movie.
+		this.initSettings();
+		this.loadFlash();
+		this.displayDebugInfo();
+	} catch (ex) {
+		delete SWFUpload.instances[this.movieName];
+		throw ex;
+	}
+};
+
+/* *************** */
+/* Static Members  */
+/* *************** */
+SWFUpload.instances = {};
+SWFUpload.movieCount = 0;
+SWFUpload.version = "2.2.0 2009-03-25";
+SWFUpload.QUEUE_ERROR = {
+	QUEUE_LIMIT_EXCEEDED	  		: -100,
+	FILE_EXCEEDS_SIZE_LIMIT  		: -110,
+	ZERO_BYTE_FILE			  		: -120,
+	INVALID_FILETYPE		  		: -130
+};
+SWFUpload.UPLOAD_ERROR = {
+	HTTP_ERROR				  		: -200,
+	MISSING_UPLOAD_URL	      		: -210,
+	IO_ERROR				  		: -220,
+	SECURITY_ERROR			  		: -230,
+	UPLOAD_LIMIT_EXCEEDED	  		: -240,
+	UPLOAD_FAILED			  		: -250,
+	SPECIFIED_FILE_ID_NOT_FOUND		: -260,
+	FILE_VALIDATION_FAILED	  		: -270,
+	FILE_CANCELLED			  		: -280,
+	UPLOAD_STOPPED					: -290
+};
+SWFUpload.FILE_STATUS = {
+	QUEUED		 : -1,
+	IN_PROGRESS	 : -2,
+	ERROR		 : -3,
+	COMPLETE	 : -4,
+	CANCELLED	 : -5
+};
+SWFUpload.BUTTON_ACTION = {
+	SELECT_FILE  : -100,
+	SELECT_FILES : -110,
+	START_UPLOAD : -120
+};
+SWFUpload.CURSOR = {
+	ARROW : -1,
+	HAND : -2
+};
+SWFUpload.WINDOW_MODE = {
+	WINDOW : "window",
+	TRANSPARENT : "transparent",
+	OPAQUE : "opaque"
+};
+
+// Private: takes a URL, determines if it is relative and converts to an absolute URL
+// using the current site. Only processes the URL if it can, otherwise returns the URL untouched
+SWFUpload.completeURL = function(url) {
+	if (typeof(url) !== "string" || url.match(/^https?:\/\//i) || url.match(/^\//)) {
+		return url;
+	}
+
+	var currentURL = window.location.protocol + "//" + window.location.hostname + (window.location.port ? ":" + window.location.port : "");
+
+	var indexSlash = window.location.pathname.lastIndexOf("/");
+	if (indexSlash <= 0) {
+		path = "/";
+	} else {
+		path = window.location.pathname.substr(0, indexSlash) + "/";
+	}
+
+	return /*currentURL +*/ path + url;
+
+};
+
+
+/* ******************** */
+/* Instance Members  */
+/* ******************** */
+
+// Private: initSettings ensures that all the
+// settings are set, getting a default value if one was not assigned.
+SWFUpload.prototype.initSettings = function () {
+	this.ensureDefault = function (settingName, defaultValue) {
+		this.settings[settingName] = (this.settings[settingName] == undefined) ? defaultValue : this.settings[settingName];
+	};
+
+	// Upload backend settings
+	this.ensureDefault("upload_url", "");
+	this.ensureDefault("preserve_relative_urls", false);
+	this.ensureDefault("file_post_name", "Filedata");
+	this.ensureDefault("post_params", {});
+	this.ensureDefault("use_query_string", false);
+	this.ensureDefault("requeue_on_error", false);
+	this.ensureDefault("http_success", []);
+	this.ensureDefault("assume_success_timeout", 0);
+
+	// File Settings
+	this.ensureDefault("file_types", "*.*");
+	this.ensureDefault("file_types_description", "All Files");
+	this.ensureDefault("file_size_limit", 0);	// Default zero means "unlimited"
+	this.ensureDefault("file_upload_limit", 0);
+	this.ensureDefault("file_queue_limit", 0);
+
+	// Flash Settings
+	this.ensureDefault("flash_url", "swfupload.swf");
+	this.ensureDefault("prevent_swf_caching", true);
+
+	// Button Settings
+	this.ensureDefault("button_image_url", "");
+	this.ensureDefault("button_width", 1);
+	this.ensureDefault("button_height", 1);
+	this.ensureDefault("button_text", "");
+	this.ensureDefault("button_text_style", "color: #000000; font-size: 16pt;");
+	this.ensureDefault("button_text_top_padding", 0);
+	this.ensureDefault("button_text_left_padding", 0);
+	this.ensureDefault("button_action", SWFUpload.BUTTON_ACTION.SELECT_FILES);
+	this.ensureDefault("button_disabled", false);
+	this.ensureDefault("button_placeholder_id", "");
+	this.ensureDefault("button_placeholder", null);
+	this.ensureDefault("button_cursor", SWFUpload.CURSOR.ARROW);
+	this.ensureDefault("button_window_mode", SWFUpload.WINDOW_MODE.WINDOW);
+
+	// Debug Settings
+	this.ensureDefault("debug", false);
+	this.settings.debug_enabled = this.settings.debug;	// Here to maintain v2 API
+
+	// Event Handlers
+	this.settings.return_upload_start_handler = this.returnUploadStart;
+	this.ensureDefault("swfupload_loaded_handler", null);
+	this.ensureDefault("file_dialog_start_handler", null);
+	this.ensureDefault("file_queued_handler", null);
+	this.ensureDefault("file_queue_error_handler", null);
+	this.ensureDefault("file_dialog_complete_handler", null);
+
+	this.ensureDefault("upload_start_handler", null);
+	this.ensureDefault("upload_progress_handler", null);
+	this.ensureDefault("upload_error_handler", null);
+	this.ensureDefault("upload_success_handler", null);
+	this.ensureDefault("upload_complete_handler", null);
+
+	this.ensureDefault("debug_handler", this.debugMessage);
+
+	this.ensureDefault("custom_settings", {});
+
+	// Other settings
+	this.customSettings = this.settings.custom_settings;
+
+	// Update the flash url if needed
+	if (!!this.settings.prevent_swf_caching) {
+		this.settings.flash_url = this.settings.flash_url + (this.settings.flash_url.indexOf("?") < 0 ? "?" : "&") + "preventswfcaching=" + new Date().getTime();
+	}
+
+	if (!this.settings.preserve_relative_urls) {
+		//this.settings.flash_url = SWFUpload.completeURL(this.settings.flash_url);	// Don't need to do this one since flash doesn't look at it
+		this.settings.upload_url = SWFUpload.completeURL(this.settings.upload_url);
+		this.settings.button_image_url = SWFUpload.completeURL(this.settings.button_image_url);
+	}
+
+	delete this.ensureDefault;
+};
+
+// Private: loadFlash replaces the button_placeholder element with the flash movie.
+SWFUpload.prototype.loadFlash = function () {
+	var targetElement, tempParent;
+
+	// Make sure an element with the ID we are going to use doesn't already exist
+	if (document.getElementById(this.movieName) !== null) {
+		throw "ID " + this.movieName + " is already in use. The Flash Object could not be added";
+	}
+
+	// Get the element where we will be placing the flash movie
+	targetElement = document.getElementById(this.settings.button_placeholder_id) || this.settings.button_placeholder;
+
+	if (targetElement == undefined) {
+		throw "Could not find the placeholder element: " + this.settings.button_placeholder_id;
+	}
+
+	// Append the container and load the flash
+	tempParent = document.createElement("div");
+	tempParent.innerHTML = this.getFlashHTML();	// Using innerHTML is non-standard but the only sensible way to dynamically add Flash in IE (and maybe other browsers)
+	targetElement.parentNode.replaceChild(tempParent.firstChild, targetElement);
+
+	// Fix IE Flash/Form bug
+	if (window[this.movieName] == undefined) {
+		window[this.movieName] = this.getMovieElement();
+	}
+
+};
+
+// Private: getFlashHTML generates the object tag needed to embed the flash in to the document
+SWFUpload.prototype.getFlashHTML = function () {
+	// Flash Satay object syntax: http://www.alistapart.com/articles/flashsatay
+	// Fix bug for IE9
+	// http://www.kindsoft.net/view.php?bbsid=7&postid=5825&pagenum=1
+	var classid = '';
+	if (KindEditor.IE && KindEditor.V > 8) {
+		classid = ' classid = "clsid:d27cdb6e-ae6d-11cf-96b8-444553540000"';
+	}
+	return ['<object id="', this.movieName, '"' + classid + ' type="application/x-shockwave-flash" data="', this.settings.flash_url, '" width="', this.settings.button_width, '" height="', this.settings.button_height, '" class="swfupload">',
+				'<param name="wmode" value="', this.settings.button_window_mode, '" />',
+				'<param name="movie" value="', this.settings.flash_url, '" />',
+				'<param name="quality" value="high" />',
+				'<param name="menu" value="false" />',
+				'<param name="allowScriptAccess" value="always" />',
+				'<param name="flashvars" value="' + this.getFlashVars() + '" />',
+				'</object>'].join("");
+};
+
+// Private: getFlashVars builds the parameter string that will be passed
+// to flash in the flashvars param.
+SWFUpload.prototype.getFlashVars = function () {
+	// Build a string from the post param object
+	var paramString = this.buildParamString();
+	var httpSuccessString = this.settings.http_success.join(",");
+
+	// Build the parameter string
+	return ["movieName=", encodeURIComponent(this.movieName),
+			"&amp;uploadURL=", encodeURIComponent(this.settings.upload_url),
+			"&amp;useQueryString=", encodeURIComponent(this.settings.use_query_string),
+			"&amp;requeueOnError=", encodeURIComponent(this.settings.requeue_on_error),
+			"&amp;httpSuccess=", encodeURIComponent(httpSuccessString),
+			"&amp;assumeSuccessTimeout=", encodeURIComponent(this.settings.assume_success_timeout),
+			"&amp;params=", encodeURIComponent(paramString),
+			"&amp;filePostName=", encodeURIComponent(this.settings.file_post_name),
+			"&amp;fileTypes=", encodeURIComponent(this.settings.file_types),
+			"&amp;fileTypesDescription=", encodeURIComponent(this.settings.file_types_description),
+			"&amp;fileSizeLimit=", encodeURIComponent(this.settings.file_size_limit),
+			"&amp;fileUploadLimit=", encodeURIComponent(this.settings.file_upload_limit),
+			"&amp;fileQueueLimit=", encodeURIComponent(this.settings.file_queue_limit),
+			"&amp;debugEnabled=", encodeURIComponent(this.settings.debug_enabled),
+			"&amp;buttonImageURL=", encodeURIComponent(this.settings.button_image_url),
+			"&amp;buttonWidth=", encodeURIComponent(this.settings.button_width),
+			"&amp;buttonHeight=", encodeURIComponent(this.settings.button_height),
+			"&amp;buttonText=", encodeURIComponent(this.settings.button_text),
+			"&amp;buttonTextTopPadding=", encodeURIComponent(this.settings.button_text_top_padding),
+			"&amp;buttonTextLeftPadding=", encodeURIComponent(this.settings.button_text_left_padding),
+			"&amp;buttonTextStyle=", encodeURIComponent(this.settings.button_text_style),
+			"&amp;buttonAction=", encodeURIComponent(this.settings.button_action),
+			"&amp;buttonDisabled=", encodeURIComponent(this.settings.button_disabled),
+			"&amp;buttonCursor=", encodeURIComponent(this.settings.button_cursor)
+		].join("");
+};
+
+// Public: getMovieElement retrieves the DOM reference to the Flash element added by SWFUpload
+// The element is cached after the first lookup
+SWFUpload.prototype.getMovieElement = function () {
+	if (this.movieElement == undefined) {
+		this.movieElement = document.getElementById(this.movieName);
+	}
+
+	if (this.movieElement === null) {
+		throw "Could not find Flash element";
+	}
+
+	return this.movieElement;
+};
+
+// Private: buildParamString takes the name/value pairs in the post_params setting object
+// and joins them up in to a string formatted "name=value&amp;name=value"
+SWFUpload.prototype.buildParamString = function () {
+	var postParams = this.settings.post_params;
+	var paramStringPairs = [];
+
+	if (typeof(postParams) === "object") {
+		for (var name in postParams) {
+			if (postParams.hasOwnProperty(name)) {
+				paramStringPairs.push(encodeURIComponent(name.toString()) + "=" + encodeURIComponent(postParams[name].toString()));
+			}
+		}
+	}
+
+	return paramStringPairs.join("&amp;");
+};
+
+// Public: Used to remove a SWFUpload instance from the page. This method strives to remove
+// all references to the SWF, and other objects so memory is properly freed.
+// Returns true if everything was destroyed. Returns a false if a failure occurs leaving SWFUpload in an inconsistant state.
+// Credits: Major improvements provided by steffen
+SWFUpload.prototype.destroy = function () {
+	try {
+		// Make sure Flash is done before we try to remove it
+		this.cancelUpload(null, false);
+
+
+		// Remove the SWFUpload DOM nodes
+		var movieElement = null;
+		movieElement = this.getMovieElement();
+
+		if (movieElement && typeof(movieElement.CallFunction) === "unknown") { // We only want to do this in IE
+			// Loop through all the movie's properties and remove all function references (DOM/JS IE 6/7 memory leak workaround)
+			for (var i in movieElement) {
+				try {
+					if (typeof(movieElement[i]) === "function") {
+						movieElement[i] = null;
+					}
+				} catch (ex1) {}
+			}
+
+			// Remove the Movie Element from the page
+			try {
+				movieElement.parentNode.removeChild(movieElement);
+			} catch (ex) {}
+		}
+
+		// Remove IE form fix reference
+		window[this.movieName] = null;
+
+		// Destroy other references
+		SWFUpload.instances[this.movieName] = null;
+		delete SWFUpload.instances[this.movieName];
+
+		this.movieElement = null;
+		this.settings = null;
+		this.customSettings = null;
+		this.eventQueue = null;
+		this.movieName = null;
+
+
+		return true;
+	} catch (ex2) {
+		return false;
+	}
+};
+
+
+// Public: displayDebugInfo prints out settings and configuration
+// information about this SWFUpload instance.
+// This function (and any references to it) can be deleted when placing
+// SWFUpload in production.
+SWFUpload.prototype.displayDebugInfo = function () {
+	this.debug(
+		[
+			"---SWFUpload Instance Info---\n",
+			"Version: ", SWFUpload.version, "\n",
+			"Movie Name: ", this.movieName, "\n",
+			"Settings:\n",
+			"\t", "upload_url:               ", this.settings.upload_url, "\n",
+			"\t", "flash_url:                ", this.settings.flash_url, "\n",
+			"\t", "use_query_string:         ", this.settings.use_query_string.toString(), "\n",
+			"\t", "requeue_on_error:         ", this.settings.requeue_on_error.toString(), "\n",
+			"\t", "http_success:             ", this.settings.http_success.join(", "), "\n",
+			"\t", "assume_success_timeout:   ", this.settings.assume_success_timeout, "\n",
+			"\t", "file_post_name:           ", this.settings.file_post_name, "\n",
+			"\t", "post_params:              ", this.settings.post_params.toString(), "\n",
+			"\t", "file_types:               ", this.settings.file_types, "\n",
+			"\t", "file_types_description:   ", this.settings.file_types_description, "\n",
+			"\t", "file_size_limit:          ", this.settings.file_size_limit, "\n",
+			"\t", "file_upload_limit:        ", this.settings.file_upload_limit, "\n",
+			"\t", "file_queue_limit:         ", this.settings.file_queue_limit, "\n",
+			"\t", "debug:                    ", this.settings.debug.toString(), "\n",
+
+			"\t", "prevent_swf_caching:      ", this.settings.prevent_swf_caching.toString(), "\n",
+
+			"\t", "button_placeholder_id:    ", this.settings.button_placeholder_id.toString(), "\n",
+			"\t", "button_placeholder:       ", (this.settings.button_placeholder ? "Set" : "Not Set"), "\n",
+			"\t", "button_image_url:         ", this.settings.button_image_url.toString(), "\n",
+			"\t", "button_width:             ", this.settings.button_width.toString(), "\n",
+			"\t", "button_height:            ", this.settings.button_height.toString(), "\n",
+			"\t", "button_text:              ", this.settings.button_text.toString(), "\n",
+			"\t", "button_text_style:        ", this.settings.button_text_style.toString(), "\n",
+			"\t", "button_text_top_padding:  ", this.settings.button_text_top_padding.toString(), "\n",
+			"\t", "button_text_left_padding: ", this.settings.button_text_left_padding.toString(), "\n",
+			"\t", "button_action:            ", this.settings.button_action.toString(), "\n",
+			"\t", "button_disabled:          ", this.settings.button_disabled.toString(), "\n",
+
+			"\t", "custom_settings:          ", this.settings.custom_settings.toString(), "\n",
+			"Event Handlers:\n",
+			"\t", "swfupload_loaded_handler assigned:  ", (typeof this.settings.swfupload_loaded_handler === "function").toString(), "\n",
+			"\t", "file_dialog_start_handler assigned: ", (typeof this.settings.file_dialog_start_handler === "function").toString(), "\n",
+			"\t", "file_queued_handler assigned:       ", (typeof this.settings.file_queued_handler === "function").toString(), "\n",
+			"\t", "file_queue_error_handler assigned:  ", (typeof this.settings.file_queue_error_handler === "function").toString(), "\n",
+			"\t", "upload_start_handler assigned:      ", (typeof this.settings.upload_start_handler === "function").toString(), "\n",
+			"\t", "upload_progress_handler assigned:   ", (typeof this.settings.upload_progress_handler === "function").toString(), "\n",
+			"\t", "upload_error_handler assigned:      ", (typeof this.settings.upload_error_handler === "function").toString(), "\n",
+			"\t", "upload_success_handler assigned:    ", (typeof this.settings.upload_success_handler === "function").toString(), "\n",
+			"\t", "upload_complete_handler assigned:   ", (typeof this.settings.upload_complete_handler === "function").toString(), "\n",
+			"\t", "debug_handler assigned:             ", (typeof this.settings.debug_handler === "function").toString(), "\n"
+		].join("")
+	);
+};
+
+/* Note: addSetting and getSetting are no longer used by SWFUpload but are included
+	the maintain v2 API compatibility
+*/
+// Public: (Deprecated) addSetting adds a setting value. If the value given is undefined or null then the default_value is used.
+SWFUpload.prototype.addSetting = function (name, value, default_value) {
+    if (value == undefined) {
+        return (this.settings[name] = default_value);
+    } else {
+        return (this.settings[name] = value);
+	}
+};
+
+// Public: (Deprecated) getSetting gets a setting. Returns an empty string if the setting was not found.
+SWFUpload.prototype.getSetting = function (name) {
+    if (this.settings[name] != undefined) {
+        return this.settings[name];
+	}
+
+    return "";
+};
+
+
+
+// Private: callFlash handles function calls made to the Flash element.
+// Calls are made with a setTimeout for some functions to work around
+// bugs in the ExternalInterface library.
+SWFUpload.prototype.callFlash = function (functionName, argumentArray) {
+	argumentArray = argumentArray || [];
+
+	var movieElement = this.getMovieElement();
+	var returnValue, returnString;
+
+	// Flash's method if calling ExternalInterface methods (code adapted from MooTools).
+	try {
+		returnString = movieElement.CallFunction('<invoke name="' + functionName + '" returntype="javascript">' + __flash__argumentsToXML(argumentArray, 0) + '</invoke>');
+		returnValue = eval(returnString);
+	} catch (ex) {
+		throw "Call to " + functionName + " failed";
+	}
+
+	// Unescape file post param values
+	if (returnValue != undefined && typeof returnValue.post === "object") {
+		returnValue = this.unescapeFilePostParams(returnValue);
+	}
+
+	return returnValue;
+};
+
+/* *****************************
+	-- Flash control methods --
+	Your UI should use these
+	to operate SWFUpload
+   ***************************** */
+
+// WARNING: this function does not work in Flash Player 10
+// Public: selectFile causes a File Selection Dialog window to appear.  This
+// dialog only allows 1 file to be selected.
+SWFUpload.prototype.selectFile = function () {
+	this.callFlash("SelectFile");
+};
+
+// WARNING: this function does not work in Flash Player 10
+// Public: selectFiles causes a File Selection Dialog window to appear/ This
+// dialog allows the user to select any number of files
+// Flash Bug Warning: Flash limits the number of selectable files based on the combined length of the file names.
+// If the selection name length is too long the dialog will fail in an unpredictable manner.  There is no work-around
+// for this bug.
+SWFUpload.prototype.selectFiles = function () {
+	this.callFlash("SelectFiles");
+};
+
+
+// Public: startUpload starts uploading the first file in the queue unless
+// the optional parameter 'fileID' specifies the ID
+SWFUpload.prototype.startUpload = function (fileID) {
+	this.callFlash("StartUpload", [fileID]);
+};
+
+// Public: cancelUpload cancels any queued file.  The fileID parameter may be the file ID or index.
+// If you do not specify a fileID the current uploading file or first file in the queue is cancelled.
+// If you do not want the uploadError event to trigger you can specify false for the triggerErrorEvent parameter.
+SWFUpload.prototype.cancelUpload = function (fileID, triggerErrorEvent) {
+	if (triggerErrorEvent !== false) {
+		triggerErrorEvent = true;
+	}
+	this.callFlash("CancelUpload", [fileID, triggerErrorEvent]);
+};
+
+// Public: stopUpload stops the current upload and requeues the file at the beginning of the queue.
+// If nothing is currently uploading then nothing happens.
+SWFUpload.prototype.stopUpload = function () {
+	this.callFlash("StopUpload");
+};
+
+/* ************************
+ * Settings methods
+ *   These methods change the SWFUpload settings.
+ *   SWFUpload settings should not be changed directly on the settings object
+ *   since many of the settings need to be passed to Flash in order to take
+ *   effect.
+ * *********************** */
+
+// Public: getStats gets the file statistics object.
+SWFUpload.prototype.getStats = function () {
+	return this.callFlash("GetStats");
+};
+
+// Public: setStats changes the SWFUpload statistics.  You shouldn't need to
+// change the statistics but you can.  Changing the statistics does not
+// affect SWFUpload accept for the successful_uploads count which is used
+// by the upload_limit setting to determine how many files the user may upload.
+SWFUpload.prototype.setStats = function (statsObject) {
+	this.callFlash("SetStats", [statsObject]);
+};
+
+// Public: getFile retrieves a File object by ID or Index.  If the file is
+// not found then 'null' is returned.
+SWFUpload.prototype.getFile = function (fileID) {
+	if (typeof(fileID) === "number") {
+		return this.callFlash("GetFileByIndex", [fileID]);
+	} else {
+		return this.callFlash("GetFile", [fileID]);
+	}
+};
+
+// Public: addFileParam sets a name/value pair that will be posted with the
+// file specified by the Files ID.  If the name already exists then the
+// exiting value will be overwritten.
+SWFUpload.prototype.addFileParam = function (fileID, name, value) {
+	return this.callFlash("AddFileParam", [fileID, name, value]);
+};
+
+// Public: removeFileParam removes a previously set (by addFileParam) name/value
+// pair from the specified file.
+SWFUpload.prototype.removeFileParam = function (fileID, name) {
+	this.callFlash("RemoveFileParam", [fileID, name]);
+};
+
+// Public: setUploadUrl changes the upload_url setting.
+SWFUpload.prototype.setUploadURL = function (url) {
+	this.settings.upload_url = url.toString();
+	this.callFlash("SetUploadURL", [url]);
+};
+
+// Public: setPostParams changes the post_params setting
+SWFUpload.prototype.setPostParams = function (paramsObject) {
+	this.settings.post_params = paramsObject;
+	this.callFlash("SetPostParams", [paramsObject]);
+};
+
+// Public: addPostParam adds post name/value pair.  Each name can have only one value.
+SWFUpload.prototype.addPostParam = function (name, value) {
+	this.settings.post_params[name] = value;
+	this.callFlash("SetPostParams", [this.settings.post_params]);
+};
+
+// Public: removePostParam deletes post name/value pair.
+SWFUpload.prototype.removePostParam = function (name) {
+	delete this.settings.post_params[name];
+	this.callFlash("SetPostParams", [this.settings.post_params]);
+};
+
+// Public: setFileTypes changes the file_types setting and the file_types_description setting
+SWFUpload.prototype.setFileTypes = function (types, description) {
+	this.settings.file_types = types;
+	this.settings.file_types_description = description;
+	this.callFlash("SetFileTypes", [types, description]);
+};
+
+// Public: setFileSizeLimit changes the file_size_limit setting
+SWFUpload.prototype.setFileSizeLimit = function (fileSizeLimit) {
+	this.settings.file_size_limit = fileSizeLimit;
+	this.callFlash("SetFileSizeLimit", [fileSizeLimit]);
+};
+
+// Public: setFileUploadLimit changes the file_upload_limit setting
+SWFUpload.prototype.setFileUploadLimit = function (fileUploadLimit) {
+	this.settings.file_upload_limit = fileUploadLimit;
+	this.callFlash("SetFileUploadLimit", [fileUploadLimit]);
+};
+
+// Public: setFileQueueLimit changes the file_queue_limit setting
+SWFUpload.prototype.setFileQueueLimit = function (fileQueueLimit) {
+	this.settings.file_queue_limit = fileQueueLimit;
+	this.callFlash("SetFileQueueLimit", [fileQueueLimit]);
+};
+
+// Public: setFilePostName changes the file_post_name setting
+SWFUpload.prototype.setFilePostName = function (filePostName) {
+	this.settings.file_post_name = filePostName;
+	this.callFlash("SetFilePostName", [filePostName]);
+};
+
+// Public: setUseQueryString changes the use_query_string setting
+SWFUpload.prototype.setUseQueryString = function (useQueryString) {
+	this.settings.use_query_string = useQueryString;
+	this.callFlash("SetUseQueryString", [useQueryString]);
+};
+
+// Public: setRequeueOnError changes the requeue_on_error setting
+SWFUpload.prototype.setRequeueOnError = function (requeueOnError) {
+	this.settings.requeue_on_error = requeueOnError;
+	this.callFlash("SetRequeueOnError", [requeueOnError]);
+};
+
+// Public: setHTTPSuccess changes the http_success setting
+SWFUpload.prototype.setHTTPSuccess = function (http_status_codes) {
+	if (typeof http_status_codes === "string") {
+		http_status_codes = http_status_codes.replace(" ", "").split(",");
+	}
+
+	this.settings.http_success = http_status_codes;
+	this.callFlash("SetHTTPSuccess", [http_status_codes]);
+};
+
+// Public: setHTTPSuccess changes the http_success setting
+SWFUpload.prototype.setAssumeSuccessTimeout = function (timeout_seconds) {
+	this.settings.assume_success_timeout = timeout_seconds;
+	this.callFlash("SetAssumeSuccessTimeout", [timeout_seconds]);
+};
+
+// Public: setDebugEnabled changes the debug_enabled setting
+SWFUpload.prototype.setDebugEnabled = function (debugEnabled) {
+	this.settings.debug_enabled = debugEnabled;
+	this.callFlash("SetDebugEnabled", [debugEnabled]);
+};
+
+// Public: setButtonImageURL loads a button image sprite
+SWFUpload.prototype.setButtonImageURL = function (buttonImageURL) {
+	if (buttonImageURL == undefined) {
+		buttonImageURL = "";
+	}
+
+	this.settings.button_image_url = buttonImageURL;
+	this.callFlash("SetButtonImageURL", [buttonImageURL]);
+};
+
+// Public: setButtonDimensions resizes the Flash Movie and button
+SWFUpload.prototype.setButtonDimensions = function (width, height) {
+	this.settings.button_width = width;
+	this.settings.button_height = height;
+
+	var movie = this.getMovieElement();
+	if (movie != undefined) {
+		movie.style.width = width + "px";
+		movie.style.height = height + "px";
+	}
+
+	this.callFlash("SetButtonDimensions", [width, height]);
+};
+// Public: setButtonText Changes the text overlaid on the button
+SWFUpload.prototype.setButtonText = function (html) {
+	this.settings.button_text = html;
+	this.callFlash("SetButtonText", [html]);
+};
+// Public: setButtonTextPadding changes the top and left padding of the text overlay
+SWFUpload.prototype.setButtonTextPadding = function (left, top) {
+	this.settings.button_text_top_padding = top;
+	this.settings.button_text_left_padding = left;
+	this.callFlash("SetButtonTextPadding", [left, top]);
+};
+
+// Public: setButtonTextStyle changes the CSS used to style the HTML/Text overlaid on the button
+SWFUpload.prototype.setButtonTextStyle = function (css) {
+	this.settings.button_text_style = css;
+	this.callFlash("SetButtonTextStyle", [css]);
+};
+// Public: setButtonDisabled disables/enables the button
+SWFUpload.prototype.setButtonDisabled = function (isDisabled) {
+	this.settings.button_disabled = isDisabled;
+	this.callFlash("SetButtonDisabled", [isDisabled]);
+};
+// Public: setButtonAction sets the action that occurs when the button is clicked
+SWFUpload.prototype.setButtonAction = function (buttonAction) {
+	this.settings.button_action = buttonAction;
+	this.callFlash("SetButtonAction", [buttonAction]);
+};
+
+// Public: setButtonCursor changes the mouse cursor displayed when hovering over the button
+SWFUpload.prototype.setButtonCursor = function (cursor) {
+	this.settings.button_cursor = cursor;
+	this.callFlash("SetButtonCursor", [cursor]);
+};
+
+/* *******************************
+	Flash Event Interfaces
+	These functions are used by Flash to trigger the various
+	events.
+
+	All these functions a Private.
+
+	Because the ExternalInterface library is buggy the event calls
+	are added to a queue and the queue then executed by a setTimeout.
+	This ensures that events are executed in a determinate order and that
+	the ExternalInterface bugs are avoided.
+******************************* */
+
+SWFUpload.prototype.queueEvent = function (handlerName, argumentArray) {
+	// Warning: Don't call this.debug inside here or you'll create an infinite loop
+
+	if (argumentArray == undefined) {
+		argumentArray = [];
+	} else if (!(argumentArray instanceof Array)) {
+		argumentArray = [argumentArray];
+	}
+
+	var self = this;
+	if (typeof this.settings[handlerName] === "function") {
+		// Queue the event
+		this.eventQueue.push(function () {
+			this.settings[handlerName].apply(this, argumentArray);
+		});
+
+		// Execute the next queued event
+		setTimeout(function () {
+			self.executeNextEvent();
+		}, 0);
+
+	} else if (this.settings[handlerName] !== null) {
+		throw "Event handler " + handlerName + " is unknown or is not a function";
+	}
+};
+
+// Private: Causes the next event in the queue to be executed.  Since events are queued using a setTimeout
+// we must queue them in order to garentee that they are executed in order.
+SWFUpload.prototype.executeNextEvent = function () {
+	// Warning: Don't call this.debug inside here or you'll create an infinite loop
+
+	var  f = this.eventQueue ? this.eventQueue.shift() : null;
+	if (typeof(f) === "function") {
+		f.apply(this);
+	}
+};
+
+// Private: unescapeFileParams is part of a workaround for a flash bug where objects passed through ExternalInterface cannot have
+// properties that contain characters that are not valid for JavaScript identifiers. To work around this
+// the Flash Component escapes the parameter names and we must unescape again before passing them along.
+SWFUpload.prototype.unescapeFilePostParams = function (file) {
+	var reg = /[$]([0-9a-f]{4})/i;
+	var unescapedPost = {};
+	var uk;
+
+	if (file != undefined) {
+		for (var k in file.post) {
+			if (file.post.hasOwnProperty(k)) {
+				uk = k;
+				var match;
+				while ((match = reg.exec(uk)) !== null) {
+					uk = uk.replace(match[0], String.fromCharCode(parseInt("0x" + match[1], 16)));
+				}
+				unescapedPost[uk] = file.post[k];
+			}
+		}
+
+		file.post = unescapedPost;
+	}
+
+	return file;
+};
+
+// Private: Called by Flash to see if JS can call in to Flash (test if External Interface is working)
+SWFUpload.prototype.testExternalInterface = function () {
+	try {
+		return this.callFlash("TestExternalInterface");
+	} catch (ex) {
+		return false;
+	}
+};
+
+// Private: This event is called by Flash when it has finished loading. Don't modify this.
+// Use the swfupload_loaded_handler event setting to execute custom code when SWFUpload has loaded.
+SWFUpload.prototype.flashReady = function () {
+	// Check that the movie element is loaded correctly with its ExternalInterface methods defined
+	var movieElement = this.getMovieElement();
+
+	if (!movieElement) {
+		this.debug("Flash called back ready but the flash movie can't be found.");
+		return;
+	}
+
+	this.cleanUp(movieElement);
+
+	this.queueEvent("swfupload_loaded_handler");
+};
+
+// Private: removes Flash added fuctions to the DOM node to prevent memory leaks in IE.
+// This function is called by Flash each time the ExternalInterface functions are created.
+SWFUpload.prototype.cleanUp = function (movieElement) {
+	// Pro-actively unhook all the Flash functions
+	try {
+		if (this.movieElement && typeof(movieElement.CallFunction) === "unknown") { // We only want to do this in IE
+			this.debug("Removing Flash functions hooks (this should only run in IE and should prevent memory leaks)");
+			for (var key in movieElement) {
+				try {
+					if (typeof(movieElement[key]) === "function") {
+						movieElement[key] = null;
+					}
+				} catch (ex) {
+				}
+			}
+		}
+	} catch (ex1) {
+
+	}
+
+	// Fix Flashes own cleanup code so if the SWFMovie was removed from the page
+	// it doesn't display errors.
+	window["__flash__removeCallback"] = function (instance, name) {
+		try {
+			if (instance) {
+				instance[name] = null;
+			}
+		} catch (flashEx) {
+
+		}
+	};
+
+};
+
+
+/* This is a chance to do something before the browse window opens */
+SWFUpload.prototype.fileDialogStart = function () {
+	this.queueEvent("file_dialog_start_handler");
+};
+
+
+/* Called when a file is successfully added to the queue. */
+SWFUpload.prototype.fileQueued = function (file) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("file_queued_handler", file);
+};
+
+
+/* Handle errors that occur when an attempt to queue a file fails. */
+SWFUpload.prototype.fileQueueError = function (file, errorCode, message) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("file_queue_error_handler", [file, errorCode, message]);
+};
+
+/* Called after the file dialog has closed and the selected files have been queued.
+	You could call startUpload here if you want the queued files to begin uploading immediately. */
+SWFUpload.prototype.fileDialogComplete = function (numFilesSelected, numFilesQueued, numFilesInQueue) {
+	this.queueEvent("file_dialog_complete_handler", [numFilesSelected, numFilesQueued, numFilesInQueue]);
+};
+
+SWFUpload.prototype.uploadStart = function (file) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("return_upload_start_handler", file);
+};
+
+SWFUpload.prototype.returnUploadStart = function (file) {
+	var returnValue;
+	if (typeof this.settings.upload_start_handler === "function") {
+		file = this.unescapeFilePostParams(file);
+		returnValue = this.settings.upload_start_handler.call(this, file);
+	} else if (this.settings.upload_start_handler != undefined) {
+		throw "upload_start_handler must be a function";
+	}
+
+	// Convert undefined to true so if nothing is returned from the upload_start_handler it is
+	// interpretted as 'true'.
+	if (returnValue === undefined) {
+		returnValue = true;
+	}
+
+	returnValue = !!returnValue;
+
+	this.callFlash("ReturnUploadStart", [returnValue]);
+};
+
+
+
+SWFUpload.prototype.uploadProgress = function (file, bytesComplete, bytesTotal) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("upload_progress_handler", [file, bytesComplete, bytesTotal]);
+};
+
+SWFUpload.prototype.uploadError = function (file, errorCode, message) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("upload_error_handler", [file, errorCode, message]);
+};
+
+SWFUpload.prototype.uploadSuccess = function (file, serverData, responseReceived) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("upload_success_handler", [file, serverData, responseReceived]);
+};
+
+SWFUpload.prototype.uploadComplete = function (file) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("upload_complete_handler", file);
+};
+
+/* Called by SWFUpload JavaScript and Flash functions when debug is enabled. By default it writes messages to the
+   internal debug console.  You can override this event and have messages written where you want. */
+SWFUpload.prototype.debug = function (message) {
+	this.queueEvent("debug_handler", message);
+};
+
+
+/* **********************************
+	Debug Console
+	The debug console is a self contained, in page location
+	for debug message to be sent.  The Debug Console adds
+	itself to the body if necessary.
+
+	The console is automatically scrolled as messages appear.
+
+	If you are using your own debug handler or when you deploy to production and
+	have debug disabled you can remove these functions to reduce the file size
+	and complexity.
+********************************** */
+
+// Private: debugMessage is the default debug_handler.  If you want to print debug messages
+// call the debug() function.  When overriding the function your own function should
+// check to see if the debug setting is true before outputting debug information.
+SWFUpload.prototype.debugMessage = function (message) {
+	if (this.settings.debug) {
+		var exceptionMessage, exceptionValues = [];
+
+		// Check for an exception object and print it nicely
+		if (typeof message === "object" && typeof message.name === "string" && typeof message.message === "string") {
+			for (var key in message) {
+				if (message.hasOwnProperty(key)) {
+					exceptionValues.push(key + ": " + message[key]);
+				}
+			}
+			exceptionMessage = exceptionValues.join("\n") || "";
+			exceptionValues = exceptionMessage.split("\n");
+			exceptionMessage = "EXCEPTION: " + exceptionValues.join("\nEXCEPTION: ");
+			SWFUpload.Console.writeLine(exceptionMessage);
+		} else {
+			SWFUpload.Console.writeLine(message);
+		}
+	}
+};
+
+SWFUpload.Console = {};
+SWFUpload.Console.writeLine = function (message) {
+	var console, documentForm;
+
+	try {
+		console = document.getElementById("SWFUpload_Console");
+
+		if (!console) {
+			documentForm = document.createElement("form");
+			document.getElementsByTagName("body")[0].appendChild(documentForm);
+
+			console = document.createElement("textarea");
+			console.id = "SWFUpload_Console";
+			console.style.fontFamily = "monospace";
+			console.setAttribute("wrap", "off");
+			console.wrap = "off";
+			console.style.overflow = "auto";
+			console.style.width = "700px";
+			console.style.height = "350px";
+			console.style.margin = "5px";
+			documentForm.appendChild(console);
+		}
+
+		console.value += message + "\n";
+
+		console.scrollTop = console.scrollHeight - console.clientHeight;
+	} catch (ex) {
+		alert("Exception: " + ex.name + " Message: " + ex.message);
+	}
+};
+
+})();
+
+(function() {
+/*
+	Queue Plug-in
+
+	Features:
+		*Adds a cancelQueue() method for cancelling the entire queue.
+		*All queued files are uploaded when startUpload() is called.
+		*If false is returned from uploadComplete then the queue upload is stopped.
+		 If false is not returned (strict comparison) then the queue upload is continued.
+		*Adds a QueueComplete event that is fired when all the queued files have finished uploading.
+		 Set the event handler with the queue_complete_handler setting.
+
+	*/
+
+if (typeof(SWFUpload) === "function") {
+	SWFUpload.queue = {};
+
+	SWFUpload.prototype.initSettings = (function (oldInitSettings) {
+		return function () {
+			if (typeof(oldInitSettings) === "function") {
+				oldInitSettings.call(this);
+			}
+
+			this.queueSettings = {};
+
+			this.queueSettings.queue_cancelled_flag = false;
+			this.queueSettings.queue_upload_count = 0;
+
+			this.queueSettings.user_upload_complete_handler = this.settings.upload_complete_handler;
+			this.queueSettings.user_upload_start_handler = this.settings.upload_start_handler;
+			this.settings.upload_complete_handler = SWFUpload.queue.uploadCompleteHandler;
+			this.settings.upload_start_handler = SWFUpload.queue.uploadStartHandler;
+
+			this.settings.queue_complete_handler = this.settings.queue_complete_handler || null;
+		};
+	})(SWFUpload.prototype.initSettings);
+
+	SWFUpload.prototype.startUpload = function (fileID) {
+		this.queueSettings.queue_cancelled_flag = false;
+		this.callFlash("StartUpload", [fileID]);
+	};
+
+	SWFUpload.prototype.cancelQueue = function () {
+		this.queueSettings.queue_cancelled_flag = true;
+		this.stopUpload();
+
+		var stats = this.getStats();
+		while (stats.files_queued > 0) {
+			this.cancelUpload();
+			stats = this.getStats();
+		}
+	};
+
+	SWFUpload.queue.uploadStartHandler = function (file) {
+		var returnValue;
+		if (typeof(this.queueSettings.user_upload_start_handler) === "function") {
+			returnValue = this.queueSettings.user_upload_start_handler.call(this, file);
+		}
+
+		// To prevent upload a real "FALSE" value must be returned, otherwise default to a real "TRUE" value.
+		returnValue = (returnValue === false) ? false : true;
+
+		this.queueSettings.queue_cancelled_flag = !returnValue;
+
+		return returnValue;
+	};
+
+	SWFUpload.queue.uploadCompleteHandler = function (file) {
+		var user_upload_complete_handler = this.queueSettings.user_upload_complete_handler;
+		var continueUpload;
+
+		if (file.filestatus === SWFUpload.FILE_STATUS.COMPLETE) {
+			this.queueSettings.queue_upload_count++;
+		}
+
+		if (typeof(user_upload_complete_handler) === "function") {
+			continueUpload = (user_upload_complete_handler.call(this, file) === false) ? false : true;
+		} else if (file.filestatus === SWFUpload.FILE_STATUS.QUEUED) {
+			// If the file was stopped and re-queued don't restart the upload
+			continueUpload = false;
+		} else {
+			continueUpload = true;
+		}
+
+		if (continueUpload) {
+			var stats = this.getStats();
+			if (stats.files_queued > 0 && this.queueSettings.queue_cancelled_flag === false) {
+				this.startUpload();
+			} else if (this.queueSettings.queue_cancelled_flag === false) {
+				this.queueEvent("queue_complete_handler", [this.queueSettings.queue_upload_count]);
+				this.queueSettings.queue_upload_count = 0;
+			} else {
+				this.queueSettings.queue_cancelled_flag = false;
+				this.queueSettings.queue_upload_count = 0;
+			}
+		}
+	};
+}
+
+})();
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/pagebreak/pagebreak.js b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/pagebreak/pagebreak.js
new file mode 100644
index 0000000..dfa883a
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/pagebreak/pagebreak.js
@@ -0,0 +1,27 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('pagebreak', function(K) {
+	var self = this;
+	var name = 'pagebreak';
+	var pagebreakHtml = K.undef(self.pagebreakHtml, '<hr style="page-break-after: always;" class="ke-pagebreak" />');
+
+	self.clickToolbar(name, function() {
+		var cmd = self.cmd, range = cmd.range;
+		self.focus();
+		var tail = self.newlineTag == 'br' || K.WEBKIT ? '' : '<span id="__kindeditor_tail_tag__"></span>';
+		self.insertHtml(pagebreakHtml + tail);
+		if (tail !== '') {
+			var p = K('#__kindeditor_tail_tag__', self.edit.doc);
+			range.selectNodeContents(p[0]);
+			p.removeAttr('id');
+			cmd.select();
+		}
+	});
+});
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/plainpaste/plainpaste.js b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/plainpaste/plainpaste.js
new file mode 100644
index 0000000..8f7bed8
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/plainpaste/plainpaste.js
@@ -0,0 +1,41 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('plainpaste', function(K) {
+	var self = this, name = 'plainpaste';
+	self.clickToolbar(name, function() {
+		var lang = self.lang(name + '.'),
+			html = '<div style="padding:10px 20px;">' +
+				'<div style="margin-bottom:10px;">' + lang.comment + '</div>' +
+				'<textarea class="ke-textarea" style="width:408px;height:260px;"></textarea>' +
+				'</div>',
+			dialog = self.createDialog({
+				name : name,
+				width : 450,
+				title : self.lang(name),
+				body : html,
+				yesBtn : {
+					name : self.lang('yes'),
+					click : function(e) {
+						var html = textarea.val();
+						html = K.escape(html);
+						html = html.replace(/ {2}/g, ' &nbsp;');
+						if (self.newlineTag == 'p') {
+							html = html.replace(/^/, '<p>').replace(/$/, '</p>').replace(/\n/g, '</p><p>');
+						} else {
+							html = html.replace(/\n/g, '<br />$&');
+						}
+						self.insertHtml(html).hideDialog().focus();
+					}
+				}
+			}),
+			textarea = K('textarea', dialog.div);
+		textarea[0].focus();
+	});
+});
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/preview/preview.js b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/preview/preview.js
new file mode 100644
index 0000000..ef6e2cf
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/preview/preview.js
@@ -0,0 +1,31 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('preview', function(K) {
+	var self = this, name = 'preview', undefined;
+	self.clickToolbar(name, function() {
+		var lang = self.lang(name + '.'),
+			html = '<div style="padding:10px 20px;">' +
+				'<iframe class="ke-textarea" frameborder="0" style="width:708px;height:400px;"></iframe>' +
+				'</div>',
+			dialog = self.createDialog({
+				name : name,
+				width : 750,
+				title : self.lang(name),
+				body : html
+			}),
+			iframe = K('iframe', dialog.div),
+			doc = K.iframeDoc(iframe);
+		doc.open();
+		doc.write(self.fullHtml());
+		doc.close();
+		K(doc.body).css('background-color', '#FFF');
+		iframe[0].contentWindow.focus();
+	});
+});
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/quickformat/quickformat.js b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/quickformat/quickformat.js
new file mode 100644
index 0000000..5b98c72
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/quickformat/quickformat.js
@@ -0,0 +1,81 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('quickformat', function(K) {
+	var self = this, name = 'quickformat',
+		blockMap = K.toMap('blockquote,center,div,h1,h2,h3,h4,h5,h6,p');
+	function getFirstChild(knode) {
+		var child = knode.first();
+		while (child && child.first()) {
+			child = child.first();
+		}
+		return child;
+	}
+	self.clickToolbar(name, function() {
+		self.focus();
+		var doc = self.edit.doc,
+			range = self.cmd.range,
+			child = K(doc.body).first(), next,
+			nodeList = [], subList = [],
+			bookmark = range.createBookmark(true);
+		while(child) {
+			next = child.next();
+			var firstChild = getFirstChild(child);
+			if (!firstChild || firstChild.name != 'img') {
+				if (blockMap[child.name]) {
+					child.html(child.html().replace(/^(\s|&nbsp;|　)+/ig, ''));
+					child.css('text-indent', '2em');
+				} else {
+					subList.push(child);
+				}
+				if (!next || (blockMap[next.name] || blockMap[child.name] && !blockMap[next.name])) {
+					if (subList.length > 0) {
+						nodeList.push(subList);
+					}
+					subList = [];
+				}
+			}
+			child = next;
+		}
+		K.each(nodeList, function(i, subList) {
+			var wrapper = K('<p style="text-indent:2em;"></p>', doc);
+			subList[0].before(wrapper);
+			K.each(subList, function(i, knode) {
+				wrapper.append(knode);
+			});
+		});
+		range.moveToBookmark(bookmark);
+		self.addBookmark();
+	});
+});
+
+/**
+--------------------------
+abcd<br />
+1234<br />
+
+to
+
+<p style="text-indent:2em;">
+	abcd<br />
+	1234<br />
+</p>
+
+--------------------------
+
+&nbsp; abcd<img>1233
+<p>1234</p>
+
+to
+
+<p style="text-indent:2em;">abcd<img>1233</p>
+<p style="text-indent:2em;">1234</p>
+
+--------------------------
+*/
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/table/table.js b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/table/table.js
new file mode 100644
index 0000000..4033b6a
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/table/table.js
@@ -0,0 +1,712 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('table', function(K) {
+	var self = this, name = 'table', lang = self.lang(name + '.'), zeroborder = 'ke-zeroborder';
+	// 设置颜色
+	function _setColor(box, color) {
+		color = color.toUpperCase();
+		box.css('background-color', color);
+		box.css('color', color === '#000000' ? '#FFFFFF' : '#000000');
+		box.html(color);
+	}
+	// 初始化取色器
+	var pickerList = [];
+	function _initColorPicker(dialogDiv, colorBox) {
+		colorBox.bind('click,mousedown', function(e){
+			e.stopPropagation();
+		});
+		function removePicker() {
+			K.each(pickerList, function() {
+				this.remove();
+			});
+			pickerList = [];
+			K(document).unbind('click,mousedown', removePicker);
+			dialogDiv.unbind('click,mousedown', removePicker);
+		}
+		colorBox.click(function(e) {
+			removePicker();
+			var box = K(this),
+				pos = box.pos();
+			var picker = K.colorpicker({
+				x : pos.x,
+				y : pos.y + box.height(),
+				z : 811214,
+				selectedColor : K(this).html(),
+				colors : self.colorTable,
+				noColor : self.lang('noColor'),
+				shadowMode : self.shadowMode,
+				click : function(color) {
+					_setColor(box, color);
+					removePicker();
+				}
+			});
+			pickerList.push(picker);
+			K(document).bind('click,mousedown', removePicker);
+			dialogDiv.bind('click,mousedown', removePicker);
+		});
+	}
+	// 取得下一行cell的index
+	function _getCellIndex(table, row, cell) {
+		var rowSpanCount = 0;
+		for (var i = 0, len = row.cells.length; i < len; i++) {
+			if (row.cells[i] == cell) {
+				break;
+			}
+			rowSpanCount += row.cells[i].rowSpan - 1;
+		}
+		return cell.cellIndex - rowSpanCount;
+	}
+	self.plugin.table = {
+		//insert or modify table
+		prop : function(isInsert) {
+			var html = [
+				'<div style="padding:20px;">',
+				//rows, cols
+				'<div class="ke-dialog-row">',
+				'<label for="keRows" style="width:90px;">' + lang.cells + '</label>',
+				lang.rows + ' <input type="text" id="keRows" class="ke-input-text ke-input-number" name="rows" value="" maxlength="4" /> &nbsp; ',
+				lang.cols + ' <input type="text" class="ke-input-text ke-input-number" name="cols" value="" maxlength="4" />',
+				'</div>',
+				//width, height
+				'<div class="ke-dialog-row">',
+				'<label for="keWidth" style="width:90px;">' + lang.size + '</label>',
+				lang.width + ' <input type="text" id="keWidth" class="ke-input-text ke-input-number" name="width" value="" maxlength="4" /> &nbsp; ',
+				'<select name="widthType">',
+				'<option value="%">' + lang.percent + '</option>',
+				'<option value="px">' + lang.px + '</option>',
+				'</select> &nbsp; ',
+				lang.height + ' <input type="text" class="ke-input-text ke-input-number" name="height" value="" maxlength="4" /> &nbsp; ',
+				'<select name="heightType">',
+				'<option value="%">' + lang.percent + '</option>',
+				'<option value="px">' + lang.px + '</option>',
+				'</select>',
+				'</div>',
+				//space, padding
+				'<div class="ke-dialog-row">',
+				'<label for="kePadding" style="width:90px;">' + lang.space + '</label>',
+				lang.padding + ' <input type="text" id="kePadding" class="ke-input-text ke-input-number" name="padding" value="" maxlength="4" /> &nbsp; ',
+				lang.spacing + ' <input type="text" class="ke-input-text ke-input-number" name="spacing" value="" maxlength="4" />',
+				'</div>',
+				//align
+				'<div class="ke-dialog-row">',
+				'<label for="keAlign" style="width:90px;">' + lang.align + '</label>',
+				'<select id="keAlign" name="align">',
+				'<option value="">' + lang.alignDefault + '</option>',
+				'<option value="left">' + lang.alignLeft + '</option>',
+				'<option value="center">' + lang.alignCenter + '</option>',
+				'<option value="right">' + lang.alignRight + '</option>',
+				'</select>',
+				'</div>',
+				//border
+				'<div class="ke-dialog-row">',
+				'<label for="keBorder" style="width:90px;">' + lang.border + '</label>',
+				lang.borderWidth + ' <input type="text" id="keBorder" class="ke-input-text ke-input-number" name="border" value="" maxlength="4" /> &nbsp; ',
+				lang.borderColor + ' <span class="ke-inline-block ke-input-color"></span>',
+				'</div>',
+				//background color
+				'<div class="ke-dialog-row">',
+				'<label for="keBgColor" style="width:90px;">' + lang.backgroundColor + '</label>',
+				'<span class="ke-inline-block ke-input-color"></span>',
+				'</div>',
+				'</div>'
+			].join('');
+			var bookmark = self.cmd.range.createBookmark();
+			var dialog = self.createDialog({
+				name : name,
+				width : 500,
+				title : self.lang(name),
+				body : html,
+				beforeRemove : function() {
+					colorBox.unbind();
+				},
+				yesBtn : {
+					name : self.lang('yes'),
+					click : function(e) {
+						var rows = rowsBox.val(),
+							cols = colsBox.val(),
+							width = widthBox.val(),
+							height = heightBox.val(),
+							widthType = widthTypeBox.val(),
+							heightType = heightTypeBox.val(),
+							padding = paddingBox.val(),
+							spacing = spacingBox.val(),
+							align = alignBox.val(),
+							border = borderBox.val(),
+							borderColor = K(colorBox[0]).html() || '',
+							bgColor = K(colorBox[1]).html() || '';
+						if (rows == 0 || !/^\d+$/.test(rows)) {
+							alert(self.lang('invalidRows'));
+							rowsBox[0].focus();
+							return;
+						}
+						if (cols == 0 || !/^\d+$/.test(cols)) {
+							alert(self.lang('invalidRows'));
+							colsBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(width)) {
+							alert(self.lang('invalidWidth'));
+							widthBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(height)) {
+							alert(self.lang('invalidHeight'));
+							heightBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(padding)) {
+							alert(self.lang('invalidPadding'));
+							paddingBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(spacing)) {
+							alert(self.lang('invalidSpacing'));
+							spacingBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(border)) {
+							alert(self.lang('invalidBorder'));
+							borderBox[0].focus();
+							return;
+						}
+						//modify table
+						if (table) {
+							if (width !== '') {
+								table.width(width + widthType);
+							} else {
+								table.css('width', '');
+							}
+							if (table[0].width !== undefined) {
+								table.removeAttr('width');
+							}
+							if (height !== '') {
+								table.height(height + heightType);
+							} else {
+								table.css('height', '');
+							}
+							if (table[0].height !== undefined) {
+								table.removeAttr('height');
+							}
+							table.css('background-color', bgColor);
+							if (table[0].bgColor !== undefined) {
+								table.removeAttr('bgColor');
+							}
+							if (padding !== '') {
+								table[0].cellPadding = padding;
+							} else {
+								table.removeAttr('cellPadding');
+							}
+							if (spacing !== '') {
+								table[0].cellSpacing = spacing;
+							} else {
+								table.removeAttr('cellSpacing');
+							}
+							if (align !== '') {
+								table[0].align = align;
+							} else {
+								table.removeAttr('align');
+							}
+							if (border !== '') {
+								table.attr('border', border);
+							} else {
+								table.removeAttr('border');
+							}
+							if (border === '' || border === '0') {
+								table.addClass(zeroborder);
+							} else {
+								table.removeClass(zeroborder);
+							}
+							if (borderColor !== '') {
+								table.attr('borderColor', borderColor);
+							} else {
+								table.removeAttr('borderColor');
+							}
+							self.hideDialog().focus();
+							self.cmd.range.moveToBookmark(bookmark);
+							self.cmd.select();
+							self.addBookmark();
+							return;
+						}
+						//insert new table
+						var style = '';
+						if (width !== '') {
+							style += 'width:' + width + widthType + ';';
+						}
+						if (height !== '') {
+							style += 'height:' + height + heightType + ';';
+						}
+						if (bgColor !== '') {
+							style += 'background-color:' + bgColor + ';';
+						}
+						var html = '<table';
+						if (style !== '') {
+							html += ' style="' + style + '"';
+						}
+						if (padding !== '') {
+							html += ' cellpadding="' + padding + '"';
+						}
+						if (spacing !== '') {
+							html += ' cellspacing="' + spacing + '"';
+						}
+						if (align !== '') {
+							html += ' align="' + align + '"';
+						}
+						if (border !== '') {
+							html += ' border="' + border + '"';
+						}
+						if (border === '' || border === '0') {
+							html += ' class="' + zeroborder + '"';
+						}
+						if (borderColor !== '') {
+							html += ' bordercolor="' + borderColor + '"';
+						}
+						html += '>';
+						for (var i = 0; i < rows; i++) {
+							html += '<tr>';
+							for (var j = 0; j < cols; j++) {
+								html += '<td>' + (K.IE ? '&nbsp;' : '<br />') + '</td>';
+							}
+							html += '</tr>';
+						}
+						html += '</table>';
+						if (!K.IE) {
+							html += '<br />';
+						}
+						self.insertHtml(html);
+						self.select().hideDialog().focus();
+						self.addBookmark();
+					}
+				}
+			}),
+			div = dialog.div,
+			rowsBox = K('[name="rows"]', div).val(3),
+			colsBox = K('[name="cols"]', div).val(2),
+			widthBox = K('[name="width"]', div).val(100),
+			heightBox = K('[name="height"]', div),
+			widthTypeBox = K('[name="widthType"]', div),
+			heightTypeBox = K('[name="heightType"]', div),
+			paddingBox = K('[name="padding"]', div).val(2),
+			spacingBox = K('[name="spacing"]', div).val(0),
+			alignBox = K('[name="align"]', div),
+			borderBox = K('[name="border"]', div).val(1),
+			colorBox = K('.ke-input-color', div);
+			_initColorPicker(div, colorBox.eq(0));
+			_initColorPicker(div, colorBox.eq(1));
+			_setColor(colorBox.eq(0), '#000000');
+			_setColor(colorBox.eq(1), '');
+			// foucs and select
+			rowsBox[0].focus();
+			rowsBox[0].select();
+			var table;
+			if (isInsert) {
+				return;
+			}
+			//get selected table node
+			table = self.plugin.getSelectedTable();
+			if (table) {
+				rowsBox.val(table[0].rows.length);
+				colsBox.val(table[0].rows.length > 0 ? table[0].rows[0].cells.length : 0);
+				rowsBox.attr('disabled', true);
+				colsBox.attr('disabled', true);
+				var match,
+					tableWidth = table[0].style.width || table[0].width,
+					tableHeight = table[0].style.height || table[0].height;
+				if (tableWidth !== undefined && (match = /^(\d+)((?:px|%)*)$/.exec(tableWidth))) {
+					widthBox.val(match[1]);
+					widthTypeBox.val(match[2]);
+				} else {
+					widthBox.val('');
+				}
+				if (tableHeight !== undefined && (match = /^(\d+)((?:px|%)*)$/.exec(tableHeight))) {
+					heightBox.val(match[1]);
+					heightTypeBox.val(match[2]);
+				}
+				paddingBox.val(table[0].cellPadding || '');
+				spacingBox.val(table[0].cellSpacing || '');
+				alignBox.val(table[0].align || '');
+				borderBox.val(table[0].border === undefined ? '' : table[0].border);
+				_setColor(colorBox.eq(0), K.toHex(table.attr('borderColor') || ''));
+				_setColor(colorBox.eq(1), K.toHex(table[0].style.backgroundColor || table[0].bgColor || ''));
+				widthBox[0].focus();
+				widthBox[0].select();
+			}
+		},
+		//modify cell
+		cellprop : function() {
+			var html = [
+				'<div style="padding:20px;">',
+				//width, height
+				'<div class="ke-dialog-row">',
+				'<label for="keWidth" style="width:90px;">' + lang.size + '</label>',
+				lang.width + ' <input type="text" id="keWidth" class="ke-input-text ke-input-number" name="width" value="" maxlength="4" /> &nbsp; ',
+				'<select name="widthType">',
+				'<option value="%">' + lang.percent + '</option>',
+				'<option value="px">' + lang.px + '</option>',
+				'</select> &nbsp; ',
+				lang.height + ' <input type="text" class="ke-input-text ke-input-number" name="height" value="" maxlength="4" /> &nbsp; ',
+				'<select name="heightType">',
+				'<option value="%">' + lang.percent + '</option>',
+				'<option value="px">' + lang.px + '</option>',
+				'</select>',
+				'</div>',
+				//align
+				'<div class="ke-dialog-row">',
+				'<label for="keAlign" style="width:90px;">' + lang.align + '</label>',
+				lang.textAlign + ' <select id="keAlign" name="textAlign">',
+				'<option value="">' + lang.alignDefault + '</option>',
+				'<option value="left">' + lang.alignLeft + '</option>',
+				'<option value="center">' + lang.alignCenter + '</option>',
+				'<option value="right">' + lang.alignRight + '</option>',
+				'</select> ',
+				lang.verticalAlign + ' <select name="verticalAlign">',
+				'<option value="">' + lang.alignDefault + '</option>',
+				'<option value="top">' + lang.alignTop + '</option>',
+				'<option value="middle">' + lang.alignMiddle + '</option>',
+				'<option value="bottom">' + lang.alignBottom + '</option>',
+				'<option value="baseline">' + lang.alignBaseline + '</option>',
+				'</select>',
+				'</div>',
+				//border
+				'<div class="ke-dialog-row">',
+				'<label for="keBorder" style="width:90px;">' + lang.border + '</label>',
+				lang.borderWidth + ' <input type="text" id="keBorder" class="ke-input-text ke-input-number" name="border" value="" maxlength="4" /> &nbsp; ',
+				lang.borderColor + ' <span class="ke-inline-block ke-input-color"></span>',
+				'</div>',
+				//background color
+				'<div class="ke-dialog-row">',
+				'<label for="keBgColor" style="width:90px;">' + lang.backgroundColor + '</label>',
+				'<span class="ke-inline-block ke-input-color"></span>',
+				'</div>',
+				'</div>'
+			].join('');
+			var bookmark = self.cmd.range.createBookmark();
+			var dialog = self.createDialog({
+				name : name,
+				width : 500,
+				title : self.lang('tablecell'),
+				body : html,
+				beforeRemove : function() {
+					colorBox.unbind();
+				},
+				yesBtn : {
+					name : self.lang('yes'),
+					click : function(e) {
+						var width = widthBox.val(),
+							height = heightBox.val(),
+							widthType = widthTypeBox.val(),
+							heightType = heightTypeBox.val(),
+							padding = paddingBox.val(),
+							spacing = spacingBox.val(),
+							textAlign = textAlignBox.val(),
+							verticalAlign = verticalAlignBox.val(),
+							border = borderBox.val(),
+							borderColor = K(colorBox[0]).html() || '',
+							bgColor = K(colorBox[1]).html() || '';
+						if (!/^\d*$/.test(width)) {
+							alert(self.lang('invalidWidth'));
+							widthBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(height)) {
+							alert(self.lang('invalidHeight'));
+							heightBox[0].focus();
+							return;
+						}
+						if (!/^\d*$/.test(border)) {
+							alert(self.lang('invalidBorder'));
+							borderBox[0].focus();
+							return;
+						}
+						cell.css({
+							width : width !== '' ? (width + widthType) : '',
+							height : height !== '' ? (height + heightType) : '',
+							'background-color' : bgColor,
+							'text-align' : textAlign,
+							'vertical-align' : verticalAlign,
+							'border-width' : border,
+							'border-style' : border !== '' ? 'solid' : '',
+							'border-color' : borderColor
+						});
+						self.hideDialog().focus();
+						self.cmd.range.moveToBookmark(bookmark);
+						self.cmd.select();
+						self.addBookmark();
+					}
+				}
+			}),
+			div = dialog.div,
+			widthBox = K('[name="width"]', div).val(100),
+			heightBox = K('[name="height"]', div),
+			widthTypeBox = K('[name="widthType"]', div),
+			heightTypeBox = K('[name="heightType"]', div),
+			paddingBox = K('[name="padding"]', div).val(2),
+			spacingBox = K('[name="spacing"]', div).val(0),
+			textAlignBox = K('[name="textAlign"]', div),
+			verticalAlignBox = K('[name="verticalAlign"]', div),
+			borderBox = K('[name="border"]', div).val(1),
+			colorBox = K('.ke-input-color', div);
+			_initColorPicker(div, colorBox.eq(0));
+			_initColorPicker(div, colorBox.eq(1));
+			_setColor(colorBox.eq(0), '#000000');
+			_setColor(colorBox.eq(1), '');
+			// foucs and select
+			widthBox[0].focus();
+			widthBox[0].select();
+			// get selected cell
+			var cell = self.plugin.getSelectedCell();
+			var match,
+				cellWidth = cell[0].style.width || cell[0].width || '',
+				cellHeight = cell[0].style.height || cell[0].height || '';
+			if ((match = /^(\d+)((?:px|%)*)$/.exec(cellWidth))) {
+				widthBox.val(match[1]);
+				widthTypeBox.val(match[2]);
+			} else {
+				widthBox.val('');
+			}
+			if ((match = /^(\d+)((?:px|%)*)$/.exec(cellHeight))) {
+				heightBox.val(match[1]);
+				heightTypeBox.val(match[2]);
+			}
+			textAlignBox.val(cell[0].style.textAlign || '');
+			verticalAlignBox.val(cell[0].style.verticalAlign || '');
+			var border = cell[0].style.borderWidth || '';
+			if (border) {
+				border = parseInt(border);
+			}
+			borderBox.val(border);
+			_setColor(colorBox.eq(0), K.toHex(cell[0].style.borderColor || ''));
+			_setColor(colorBox.eq(1), K.toHex(cell[0].style.backgroundColor || ''));
+			widthBox[0].focus();
+			widthBox[0].select();
+		},
+		insert : function() {
+			this.prop(true);
+		},
+		'delete' : function() {
+			var table = self.plugin.getSelectedTable();
+			self.cmd.range.setStartBefore(table[0]).collapse(true);
+			self.cmd.select();
+			table.remove();
+			self.addBookmark();
+		},
+		colinsert : function(offset) {
+			var table = self.plugin.getSelectedTable()[0],
+				row = self.plugin.getSelectedRow()[0],
+				cell = self.plugin.getSelectedCell()[0],
+				index = cell.cellIndex + offset;
+			// 取得第一行的index
+			index += table.rows[0].cells.length - row.cells.length;
+
+			for (var i = 0, len = table.rows.length; i < len; i++) {
+				var newRow = table.rows[i],
+					newCell = newRow.insertCell(index);
+				newCell.innerHTML = K.IE ? '' : '<br />';
+				// 调整下一行的单元格index
+				index = _getCellIndex(table, newRow, newCell);
+			}
+			self.cmd.range.selectNodeContents(cell).collapse(true);
+			self.cmd.select();
+			self.addBookmark();
+		},
+		colinsertleft : function() {
+			this.colinsert(0);
+		},
+		colinsertright : function() {
+			this.colinsert(1);
+		},
+		rowinsert : function(offset) {
+			var table = self.plugin.getSelectedTable()[0],
+				row = self.plugin.getSelectedRow()[0],
+				cell = self.plugin.getSelectedCell()[0];
+			var rowIndex = row.rowIndex;
+			if (offset === 1) {
+				rowIndex = row.rowIndex + (cell.rowSpan - 1) + offset;
+			}
+			var newRow = table.insertRow(rowIndex);
+
+			for (var i = 0, len = row.cells.length; i < len; i++) {
+				// 调整cell个数
+				if (row.cells[i].rowSpan > 1) {
+					len -= row.cells[i].rowSpan - 1;
+				}
+				var newCell = newRow.insertCell(i);
+				// copy colspan
+				if (offset === 1 && row.cells[i].colSpan > 1) {
+					newCell.colSpan = row.cells[i].colSpan;
+				}
+				newCell.innerHTML = K.IE ? '' : '<br />';
+			}
+			// 调整rowspan
+			for (var j = rowIndex; j >= 0; j--) {
+				var cells = table.rows[j].cells;
+				if (cells.length > i) {
+					for (var k = cell.cellIndex; k >= 0; k--) {
+						if (cells[k].rowSpan > 1) {
+							cells[k].rowSpan += 1;
+						}
+					}
+					break;
+				}
+			}
+			self.cmd.range.selectNodeContents(cell).collapse(true);
+			self.cmd.select();
+			self.addBookmark();
+		},
+		rowinsertabove : function() {
+			this.rowinsert(0);
+		},
+		rowinsertbelow : function() {
+			this.rowinsert(1);
+		},
+		rowmerge : function() {
+			var table = self.plugin.getSelectedTable()[0],
+				row = self.plugin.getSelectedRow()[0],
+				cell = self.plugin.getSelectedCell()[0],
+				rowIndex = row.rowIndex, // 当前行的index
+				nextRowIndex = rowIndex + cell.rowSpan, // 下一行的index
+				nextRow = table.rows[nextRowIndex]; // 下一行
+			// 最后一行不能合并
+			if (table.rows.length <= nextRowIndex) {
+				return;
+			}
+			var cellIndex = cell.cellIndex; // 下一行单元格的index
+			if (nextRow.cells.length <= cellIndex) {
+				return;
+			}
+			var nextCell = nextRow.cells[cellIndex]; // 下一行单元格
+			// 上下行的colspan不一致时不能合并
+			if (cell.colSpan !== nextCell.colSpan) {
+				return;
+			}
+			cell.rowSpan += nextCell.rowSpan;
+			nextRow.deleteCell(cellIndex);
+			self.cmd.range.selectNodeContents(cell).collapse(true);
+			self.cmd.select();
+			self.addBookmark();
+		},
+		colmerge : function() {
+			var table = self.plugin.getSelectedTable()[0],
+				row = self.plugin.getSelectedRow()[0],
+				cell = self.plugin.getSelectedCell()[0],
+				rowIndex = row.rowIndex, // 当前行的index
+				cellIndex = cell.cellIndex,
+				nextCellIndex = cellIndex + 1;
+			// 最后一列不能合并
+			if (row.cells.length <= nextCellIndex) {
+				return;
+			}
+			var nextCell = row.cells[nextCellIndex];
+			// 左右列的rowspan不一致时不能合并
+			if (cell.rowSpan !== nextCell.rowSpan) {
+				return;
+			}
+			cell.colSpan += nextCell.colSpan;
+			row.deleteCell(nextCellIndex);
+			self.cmd.range.selectNodeContents(cell).collapse(true);
+			self.cmd.select();
+			self.addBookmark();
+		},
+		rowsplit : function() {
+			var table = self.plugin.getSelectedTable()[0],
+				row = self.plugin.getSelectedRow()[0],
+				cell = self.plugin.getSelectedCell()[0],
+				rowIndex = row.rowIndex;
+			// 不是可分割单元格
+			if (cell.rowSpan === 1) {
+				return;
+			}
+			var cellIndex = _getCellIndex(table, row, cell);
+			for (var i = 1, len = cell.rowSpan; i < len; i++) {
+				var newRow = table.rows[rowIndex + i],
+					newCell = newRow.insertCell(cellIndex);
+				if (cell.colSpan > 1) {
+					newCell.colSpan = cell.colSpan;
+				}
+				newCell.innerHTML = K.IE ? '' : '<br />';
+				// 调整下一行的单元格index
+				cellIndex = _getCellIndex(table, newRow, newCell);
+			}
+			K(cell).removeAttr('rowSpan');
+			self.cmd.range.selectNodeContents(cell).collapse(true);
+			self.cmd.select();
+			self.addBookmark();
+		},
+		colsplit : function() {
+			var table = self.plugin.getSelectedTable()[0],
+				row = self.plugin.getSelectedRow()[0],
+				cell = self.plugin.getSelectedCell()[0],
+				cellIndex = cell.cellIndex;
+			// 不是可分割单元格
+			if (cell.colSpan === 1) {
+				return;
+			}
+			for (var i = 1, len = cell.colSpan; i < len; i++) {
+				var newCell = row.insertCell(cellIndex + i);
+				if (cell.rowSpan > 1) {
+					newCell.rowSpan = cell.rowSpan;
+				}
+				newCell.innerHTML = K.IE ? '' : '<br />';
+			}
+			K(cell).removeAttr('colSpan');
+			self.cmd.range.selectNodeContents(cell).collapse(true);
+			self.cmd.select();
+			self.addBookmark();
+		},
+		coldelete : function() {
+			var table = self.plugin.getSelectedTable()[0],
+				row = self.plugin.getSelectedRow()[0],
+				cell = self.plugin.getSelectedCell()[0],
+				index = cell.cellIndex;
+			for (var i = 0, len = table.rows.length; i < len; i++) {
+				var newRow = table.rows[i],
+					newCell = newRow.cells[index];
+				if (newCell.colSpan > 1) {
+					newCell.colSpan -= 1;
+					if (newCell.colSpan === 1) {
+						K(newCell).removeAttr('colSpan');
+					}
+				} else {
+					newRow.deleteCell(index);
+				}
+				// 跳过不需要删除的行
+				if (newCell.rowSpan > 1) {
+					i += newCell.rowSpan - 1;
+				}
+			}
+			if (row.cells.length === 0) {
+				self.cmd.range.setStartBefore(table).collapse(true);
+				self.cmd.select();
+				K(table).remove();
+			} else {
+				self.cmd.selection(true);
+			}
+			self.addBookmark();
+		},
+		rowdelete : function() {
+			var table = self.plugin.getSelectedTable()[0],
+				row = self.plugin.getSelectedRow()[0],
+				cell = self.plugin.getSelectedCell()[0],
+				rowIndex = row.rowIndex;
+			// 从下到上删除
+			for (var i = cell.rowSpan - 1; i >= 0; i--) {
+				table.deleteRow(rowIndex + i);
+			}
+			if (table.rows.length === 0) {
+				self.cmd.range.setStartBefore(table).collapse(true);
+				self.cmd.select();
+				K(table).remove();
+			} else {
+				self.cmd.selection(true);
+			}
+			self.addBookmark();
+		}
+	};
+	self.clickToolbar(name, self.plugin.table.prop);
+});
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/template/html/1.html b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/template/html/1.html
new file mode 100644
index 0000000..034126b
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/template/html/1.html
@@ -0,0 +1,14 @@
+<!doctype html>
+<html>
+<head>
+	<meta charset="utf-8" />
+</head>
+<body>
+	<h3>
+		<img align="left" height="100" style="margin-right: 10px" width="100" />在此处输入标题
+	</h3>
+	<p>
+		在此处输入内容
+	</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/template/html/2.html b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/template/html/2.html
new file mode 100644
index 0000000..dc2584a
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/template/html/2.html
@@ -0,0 +1,42 @@
+<!doctype html>
+<html>
+<head>
+	<meta charset="utf-8" />
+</head>
+<body>
+	<h3>
+		标题
+	</h3>
+	<table style="width:100%;" cellpadding="2" cellspacing="0" border="1">
+		<tbody>
+			<tr>
+				<td>
+					<h3>标题1</h3>
+				</td>
+				<td>
+					<h3>标题1</h3>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					内容1
+				</td>
+				<td>
+					内容2
+				</td>
+			</tr>
+			<tr>
+				<td>
+					内容3
+				</td>
+				<td>
+					内容4
+				</td>
+			</tr>
+		</tbody>
+	</table>
+	<p>
+		表格说明
+	</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/template/html/3.html b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/template/html/3.html
new file mode 100644
index 0000000..873f0c6
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/template/html/3.html
@@ -0,0 +1,36 @@
+<!doctype html>
+<html>
+<head>
+	<meta charset="utf-8" />
+</head>
+<body>
+	<p>
+		在此处输入内容
+	</p>
+	<ol>
+		<li>
+			描述1
+		</li>
+		<li>
+			描述2
+		</li>
+		<li>
+			描述3
+		</li>
+	</ol>
+	<p>
+		在此处输入内容
+	</p>
+	<ul>
+		<li>
+			描述1
+		</li>
+		<li>
+			描述2
+		</li>
+		<li>
+			描述3
+		</li>
+	</ul>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/template/template.js b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/template/template.js
new file mode 100644
index 0000000..4029e87
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/template/template.js
@@ -0,0 +1,58 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('template', function(K) {
+	var self = this, name = 'template', lang = self.lang(name + '.'),
+		htmlPath = self.pluginsPath + name + '/html/';
+	function getFilePath(fileName) {
+		return htmlPath + fileName + '?ver=' + encodeURIComponent(K.DEBUG ? K.TIME : K.VERSION);
+	}
+	self.clickToolbar(name, function() {
+		var lang = self.lang(name + '.'),
+			arr = ['<div style="padding:10px 20px;">',
+				'<div class="ke-header">',
+				// left start
+				'<div class="ke-left">',
+				lang. selectTemplate + ' <select>'];
+			K.each(lang.fileList, function(key, val) {
+				arr.push('<option value="' + key + '">' + val + '</option>');
+			});
+			html = [arr.join(''),
+				'</select></div>',
+				// right start
+				'<div class="ke-right">',
+				'<input type="checkbox" id="keReplaceFlag" name="replaceFlag" value="1" /> <label for="keReplaceFlag">' + lang.replaceContent + '</label>',
+				'</div>',
+				'<div class="ke-clearfix"></div>',
+				'</div>',
+				'<iframe class="ke-textarea" frameborder="0" style="width:458px;height:260px;background-color:#FFF;"></iframe>',
+				'</div>'].join('');
+		var dialog = self.createDialog({
+			name : name,
+			width : 500,
+			title : self.lang(name),
+			body : html,
+			yesBtn : {
+				name : self.lang('yes'),
+				click : function(e) {
+					var doc = K.iframeDoc(iframe);
+					self[checkbox[0].checked ? 'html' : 'insertHtml'](doc.body.innerHTML).hideDialog().focus();
+				}
+			}
+		});
+		var selectBox = K('select', dialog.div),
+			checkbox = K('[name="replaceFlag"]', dialog.div),
+			iframe = K('iframe', dialog.div);
+		checkbox[0].checked = true;
+		iframe.attr('src', getFilePath(selectBox.val()));
+		selectBox.change(function() {
+			iframe.attr('src', getFilePath(this.value));
+		});
+	});
+});
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/wordpaste/wordpaste.js b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/wordpaste/wordpaste.js
new file mode 100644
index 0000000..22061e1
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/plugins/wordpaste/wordpaste.js
@@ -0,0 +1,51 @@
+/*******************************************************************************
+* KindEditor - WYSIWYG HTML Editor for Internet
+* Copyright (C) 2006-2011 kindsoft.net
+*
+* @author Roddy <luolonghao@gmail.com>
+* @site http://www.kindsoft.net/
+* @licence http://www.kindsoft.net/license.php
+*******************************************************************************/
+
+KindEditor.plugin('wordpaste', function(K) {
+	var self = this, name = 'wordpaste';
+	self.clickToolbar(name, function() {
+		var lang = self.lang(name + '.'),
+			html = '<div style="padding:10px 20px;">' +
+				'<div style="margin-bottom:10px;">' + lang.comment + '</div>' +
+				'<iframe class="ke-textarea" frameborder="0" style="width:408px;height:260px;"></iframe>' +
+				'</div>',
+			dialog = self.createDialog({
+				name : name,
+				width : 450,
+				title : self.lang(name),
+				body : html,
+				yesBtn : {
+					name : self.lang('yes'),
+					click : function(e) {
+						var str = doc.body.innerHTML;
+						str = K.clearMsWord(str, self.filterMode ? self.htmlTags : K.options.htmlTags);
+						self.insertHtml(str).hideDialog().focus();
+					}
+				}
+			}),
+			div = dialog.div,
+			iframe = K('iframe', div),
+			doc = K.iframeDoc(iframe);
+		if (!K.IE) {
+			doc.designMode = 'on';
+		}
+		doc.open();
+		doc.write('<!doctype html><html><head><title>WordPaste</title></head>');
+		doc.write('<body style="background-color:#FFF;font-size:12px;margin:2px;">');
+		if (!K.IE) {
+			doc.write('<br />');
+		}
+		doc.write('</body></html>');
+		doc.close();
+		if (K.IE) {
+			doc.body.contentEditable = 'true';
+		}
+		iframe[0].contentWindow.focus();
+	});
+});
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/common/anchor.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/common/anchor.gif
new file mode 100644
index 0000000..61145ea
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/common/anchor.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/common/blank.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/common/blank.gif
new file mode 100644
index 0000000..5bfd67a
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/common/blank.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/common/flash.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/common/flash.gif
new file mode 100644
index 0000000..2cb12b2
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/common/flash.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/common/loading.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/common/loading.gif
new file mode 100644
index 0000000..c69e937
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/common/loading.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/common/media.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/common/media.gif
new file mode 100644
index 0000000..e1c0e30
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/common/media.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/common/rm.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/common/rm.gif
new file mode 100644
index 0000000..d013d55
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/common/rm.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/default/background.png b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/default/background.png
new file mode 100644
index 0000000..bbfb056
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/default/background.png differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/default/default.css b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/default/default.css
new file mode 100644
index 0000000..428b6c8
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/default/default.css
@@ -0,0 +1,1149 @@
+/* common */
+.ke-inline-block {
+	display: -moz-inline-stack;
+	display: inline-block;
+	vertical-align: middle;
+	zoom: 1;
+	*display: inline;
+}
+.ke-clearfix {
+	zoom: 1;
+}
+.ke-clearfix:after {
+	content: ".";
+	display: block;
+	clear: both;
+	font-size: 0;
+	height: 0;
+	line-height: 0;
+	visibility: hidden;
+}
+.ke-shadow {
+	box-shadow: 1px 1px 3px #A0A0A0;
+	-moz-box-shadow: 1px 1px 3px #A0A0A0;
+	-webkit-box-shadow: 1px 1px 3px #A0A0A0;
+	filter: progid:DXImageTransform.Microsoft.Shadow(color='#A0A0A0', Direction=135, Strength=3);
+	background-color: #F0F0EE;
+}
+.ke-menu a,
+.ke-menu a:hover,
+.ke-dialog a,
+.ke-dialog a:hover {
+	color: #337FE5;
+	text-decoration: none;
+}
+/* icons */
+.ke-icon-source {
+	background-position: 0px 0px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-preview {
+	background-position: 0px -16px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-print {
+	background-position: 0px -32px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-undo {
+	background-position: 0px -48px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-redo {
+	background-position: 0px -64px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-cut {
+	background-position: 0px -80px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-copy {
+	background-position: 0px -96px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-paste {
+	background-position: 0px -112px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-selectall {
+	background-position: 0px -128px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-justifyleft {
+	background-position: 0px -144px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-justifycenter {
+	background-position: 0px -160px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-justifyright {
+	background-position: 0px -176px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-justifyfull {
+	background-position: 0px -192px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-insertorderedlist {
+	background-position: 0px -208px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-insertunorderedlist {
+	background-position: 0px -224px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-indent {
+	background-position: 0px -240px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-outdent {
+	background-position: 0px -256px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-subscript {
+	background-position: 0px -272px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-superscript {
+	background-position: 0px -288px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-date {
+	background-position: 0px -304px;
+	width: 25px;
+	height: 16px;
+}
+.ke-icon-time {
+	background-position: 0px -320px;
+	width: 25px;
+	height: 16px;
+}
+.ke-icon-formatblock {
+	background-position: 0px -336px;
+	width: 25px;
+	height: 16px;
+}
+.ke-icon-fontname {
+	background-position: 0px -352px;
+	width: 21px;
+	height: 16px;
+}
+.ke-icon-fontsize {
+	background-position: 0px -368px;
+	width: 23px;
+	height: 16px;
+}
+.ke-icon-forecolor {
+	background-position: 0px -384px;
+	width: 20px;
+	height: 16px;
+}
+.ke-icon-hilitecolor {
+	background-position: 0px -400px;
+	width: 23px;
+	height: 16px;
+}
+.ke-icon-bold {
+	background-position: 0px -416px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-italic {
+	background-position: 0px -432px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-underline {
+	background-position: 0px -448px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-strikethrough {
+	background-position: 0px -464px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-removeformat {
+	background-position: 0px -480px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-image {
+	background-position: 0px -496px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-flash {
+	background-position: 0px -512px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-media {
+	background-position: 0px -528px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-div {
+	background-position: 0px -544px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-formula {
+	background-position: 0px -576px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-hr {
+	background-position: 0px -592px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-emoticons {
+	background-position: 0px -608px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-link {
+	background-position: 0px -624px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-unlink {
+	background-position: 0px -640px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-fullscreen {
+	background-position: 0px -656px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-about {
+	background-position: 0px -672px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-plainpaste {
+	background-position: 0px -704px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-wordpaste {
+	background-position: 0px -720px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-table {
+	background-position: 0px -784px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tablemenu {
+	background-position: 0px -768px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tableinsert {
+	background-position: 0px -784px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tabledelete {
+	background-position: 0px -800px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tablecolinsertleft {
+	background-position: 0px -816px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tablecolinsertright {
+	background-position: 0px -832px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tablerowinsertabove {
+	background-position: 0px -848px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tablerowinsertbelow {
+	background-position: 0px -864px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tablecoldelete {
+	background-position: 0px -880px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tablerowdelete {
+	background-position: 0px -896px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tablecellprop {
+	background-position: 0px -912px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tableprop {
+	background-position: 0px -928px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-checked {
+	background-position: 0px -944px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-code {
+	background-position: 0px -960px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-map {
+	background-position: 0px -976px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-baidumap {
+	background-position: 0px -976px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-lineheight {
+	background-position: 0px -992px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-clearhtml {
+	background-position: 0px -1008px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-pagebreak {
+	background-position: 0px -1024px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-insertfile {
+	background-position: 0px -1040px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-quickformat {
+	background-position: 0px -1056px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-template {
+	background-position: 0px -1072px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tablecellsplit {
+	background-position: 0px -1088px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tablerowmerge {
+	background-position: 0px -1104px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tablerowsplit {
+	background-position: 0px -1120px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tablecolmerge {
+	background-position: 0px -1136px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-tablecolsplit {
+	background-position: 0px -1152px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-anchor {
+	background-position: 0px -1168px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-search {
+	background-position: 0px -1184px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-new {
+	background-position: 0px -1200px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-specialchar {
+	background-position: 0px -1216px;
+	width: 16px;
+	height: 16px;
+}
+.ke-icon-multiimage {
+	background-position: 0px -1232px;
+	width: 16px;
+	height: 16px;
+}
+/* container */
+.ke-container {
+	display: block;
+	border: 1px solid #CCCCCC;
+	background-color: #FFF;
+	overflow: hidden;
+	margin: 0;
+	padding: 0;
+}
+/* toolbar */
+.ke-toolbar {
+	border-bottom: 1px solid #CCC;
+	background-color: #F0F0EE;
+	padding: 2px 5px;
+	text-align: left;
+	overflow: hidden;
+	zoom: 1;
+}
+.ke-toolbar-icon {
+	background-repeat: no-repeat;
+	font-size: 0;
+	line-height: 0;
+	overflow: hidden;
+	display: block;
+}
+.ke-toolbar-icon-url {
+	background-image: url(default.png);
+}
+.ke-toolbar .ke-outline {
+	border: 1px solid #F0F0EE;
+	margin: 1px;
+	padding: 1px 2px;
+	font-size: 0;
+	line-height: 0;
+	overflow: hidden;
+	cursor: pointer;
+	display: block;
+	float: left;
+}
+.ke-toolbar .ke-on {
+	border: 1px solid #5690D2;
+}
+.ke-toolbar .ke-selected {
+	border: 1px solid #5690D2;
+	background-color: #E9EFF6;
+}
+.ke-toolbar .ke-disabled {
+	cursor: default;
+}
+.ke-toolbar .ke-separator {
+	height: 16px;
+	margin: 2px 3px;
+	border-left: 1px solid #A0A0A0;
+	border-right: 1px solid #FFFFFF;
+	border-top:0;
+	border-bottom:0;
+	width: 0;
+	font-size: 0;
+	line-height: 0;
+	overflow: hidden;
+	display: block;
+	float: left;
+}
+.ke-toolbar .ke-hr {
+	overflow: hidden;
+	height: 1px;
+	clear: both;
+}
+/* edit */
+.ke-edit {
+	padding: 0;
+}
+.ke-edit-iframe,
+.ke-edit-textarea {
+	border: 0;
+	margin: 0;
+	padding: 0;
+	overflow: auto;
+}
+.ke-edit-textarea {
+	font: 12px/1.5 "Consolas", "Monaco", "Bitstream Vera Sans Mono", "Courier New", Courier, monospace;
+	color: #000;
+	overflow: auto;
+	resize: none;
+}
+.ke-edit-textarea:focus {
+	outline: none;
+}
+/* statusbar */
+.ke-statusbar {
+	position: relative;
+	background-color: #F0F0EE;
+	border-top: 1px solid #CCCCCC;
+	font-size: 0;
+	line-height: 0;
+	*height: 12px;
+	overflow: hidden;
+	text-align: center;
+	cursor: s-resize;
+}
+.ke-statusbar-center-icon {
+	background-position: -0px -754px;
+	width: 15px;
+	height: 11px;
+	background-image: url(default.png);
+}
+.ke-statusbar-right-icon {
+	position: absolute;
+	right: 0;
+	bottom: 0;
+	cursor: se-resize;
+	background-position: -5px -741px;
+	width: 11px;
+	height: 11px;
+	background-image: url(default.png);
+}
+/* menu */
+.ke-menu {
+	border: 1px solid #A0A0A0;
+	background-color: #F1F1F1;
+	color: #222222;
+	padding: 2px;
+	font-family: "sans serif",tahoma,verdana,helvetica;
+	font-size: 12px;
+	text-align: left;
+	overflow: hidden;
+}
+.ke-menu-item {
+	border: 1px solid #F1F1F1;
+	background-color: #F1F1F1;
+	color: #222222;
+	height: 24px;
+	overflow: hidden;
+	cursor: pointer;
+}
+.ke-menu-item-on {
+	border: 1px solid #5690D2;
+	background-color: #E9EFF6;
+}
+.ke-menu-item-left {
+	width: 27px;
+	text-align: center;
+	overflow: hidden;
+}
+.ke-menu-item-center {
+	width: 0;
+	height: 24px;
+	border-left: 1px solid #E3E3E3;
+	border-right: 1px solid #FFFFFF;
+	border-top: 0;
+	border-bottom: 0;
+}
+.ke-menu-item-center-on {
+	border-left: 1px solid #E9EFF6;
+	border-right: 1px solid #E9EFF6;
+}
+.ke-menu-item-right {
+	border: 0;
+	padding: 0 0 0 5px;
+	line-height: 24px;
+	text-align: left;
+	overflow: hidden;
+}
+.ke-menu-separator {
+	margin: 2px 0;
+	height: 0;
+	overflow: hidden;
+	border-top: 1px solid #CCCCCC;
+	border-bottom: 1px solid #FFFFFF;
+	border-left: 0;
+	border-right: 0;
+}
+/* colorpicker */
+.ke-colorpicker {
+	border: 1px solid #A0A0A0;
+	background-color: #F1F1F1;
+	color: #222222;
+	padding: 2px;
+}
+.ke-colorpicker-table {
+	border:0;
+	margin:0;
+	padding:0;
+	border-collapse: separate;
+}
+.ke-colorpicker-cell {
+	font-size: 0;
+	line-height: 0;
+	border: 1px solid #F0F0EE;
+	cursor: pointer;
+	margin:3px;
+	padding:0;
+}
+.ke-colorpicker-cell-top {
+	font-family: "sans serif",tahoma,verdana,helvetica;
+	font-size: 12px;
+	line-height: 24px;
+	border: 1px solid #F0F0EE;
+	cursor: pointer;
+	margin:0;
+	padding:0;
+	text-align: center;
+}
+.ke-colorpicker-cell-on {
+	border: 1px solid #5690D2;
+}
+.ke-colorpicker-cell-selected {
+	border: 1px solid #2446AB;
+}
+.ke-colorpicker-cell-color {
+	width: 14px;
+	height: 14px;
+	margin: 3px;
+	padding: 0;
+	border: 0;
+}
+/* dialog */
+.ke-dialog {
+	position: absolute;
+	margin: 0;
+	padding: 0;
+}
+.ke-dialog .ke-header {
+	width: 100%;
+	margin-bottom: 10px;
+}
+.ke-dialog .ke-header .ke-left {
+	float: left;
+}
+.ke-dialog .ke-header .ke-right {
+	float: right;
+}
+.ke-dialog .ke-header label {
+	margin-right: 0;
+	cursor: pointer;
+	font-weight: normal;
+	display: inline;
+	vertical-align: top;
+}
+.ke-dialog-content {
+	background-color: #FFF;
+	width: 100%;
+	height: 100%;
+	color: #333;
+	border: 1px solid #A0A0A0;
+}
+.ke-dialog-shadow {
+	position: absolute;
+	z-index: -1;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	box-shadow: 3px 3px 7px #999;
+	-moz-box-shadow: 3px 3px 7px #999;
+	-webkit-box-shadow: 3px 3px 7px #999;
+	filter: progid:DXImageTransform.Microsoft.Blur(PixelRadius='3', MakeShadow='true', ShadowOpacity='0.4');
+	background-color: #F0F0EE;
+}
+.ke-dialog-header {
+	border:0;
+	margin:0;
+	padding: 0 10px;
+	background: url(background.png) repeat scroll 0 0 #F0F0EE;
+	border-bottom: 1px solid #CFCFCF;
+	height: 24px;
+	font: 12px/24px "sans serif",tahoma,verdana,helvetica;
+	text-align: left;
+	color: #222;
+	cursor: move;
+}
+.ke-dialog-icon-close {
+	display: block;
+	background: url(default.png) no-repeat scroll 0px -688px;
+	width: 16px;
+	height: 16px;
+	position: absolute;
+	right: 6px;
+	top: 6px;
+	cursor: pointer;
+}
+.ke-dialog-body {
+	font: 12px/1.5 "sans serif",tahoma,verdana,helvetica;
+	text-align: left;
+	overflow: hidden;
+	width: 100%;
+}
+.ke-dialog-body textarea {
+	display: block;
+	overflow: auto;
+	padding: 0;
+	resize: none;
+}
+.ke-dialog-body textarea:focus,
+.ke-dialog-body input:focus,
+.ke-dialog-body select:focus {
+	outline: none;
+}
+.ke-dialog-body label {
+	margin-right: 10px;
+	cursor: pointer;
+	display: -moz-inline-stack;
+	display: inline-block;
+	vertical-align: middle;
+	zoom: 1;
+	*display: inline;
+}
+.ke-dialog-body img {
+	display: -moz-inline-stack;
+	display: inline-block;
+	vertical-align: middle;
+	zoom: 1;
+	*display: inline;
+}
+.ke-dialog-body select {
+	display: -moz-inline-stack;
+	display: inline-block;
+	vertical-align: middle;
+	zoom: 1;
+	*display: inline;
+	width: auto;
+}
+.ke-dialog-body .ke-textarea {
+	display: block;
+	width: 408px;
+	height: 260px;
+	font-family: "sans serif",tahoma,verdana,helvetica;
+	font-size: 12px;
+	border-color: #848484 #E0E0E0 #E0E0E0 #848484;
+	border-style: solid;
+	border-width: 1px;
+}
+.ke-dialog-body .ke-form {
+	margin: 0;
+	padding: 0;
+}
+.ke-dialog-loading {
+	position: absolute;
+	top: 0;
+	left: 1px;
+	z-index: 1;
+	text-align: center;
+}
+.ke-dialog-loading-content {
+	background: url("../common/loading.gif") no-repeat;
+    color: #666;
+    font-size: 14px;
+    font-weight: bold;
+    height: 31px;
+    line-height: 31px;
+    padding-left: 36px;
+}
+.ke-dialog-row {
+	margin-bottom: 10px;
+}
+.ke-dialog-footer {
+	font: 12px/1 "sans serif",tahoma,verdana,helvetica;
+	text-align: right;
+	padding:0 0 5px 0;
+	background-color: #FFF;
+	width: 100%;
+}
+.ke-dialog-preview,
+.ke-dialog-yes {
+	margin: 5px;
+}
+.ke-dialog-no {
+	margin: 5px 10px 5px 5px;
+}
+.ke-dialog-mask {
+	background-color:#FFF;
+	filter:alpha(opacity=50);
+	opacity:0.5;
+}
+.ke-button-common {
+	background: url(background.png) no-repeat scroll 0 -25px transparent;
+	cursor: pointer;
+	height: 23px;
+	line-height: 23px;
+	overflow: visible;
+	display: inline-block;
+	vertical-align: top;
+	cursor: pointer;
+}
+.ke-button-outer {
+	background-position: 0 -25px;
+	padding: 0;
+	position: relative;
+	display: -moz-inline-stack;
+	display: inline-block;
+	vertical-align: middle;
+	zoom: 1;
+	*display: inline;
+}
+.ke-button {
+	background-position: right -25px;
+	padding: 0 12px;
+	margin: 0;
+	font-family: "sans serif",tahoma,verdana,helvetica;
+	border: 0 none;
+	color: #333;
+	font-size: 12px;
+	left: 2px;
+	text-decoration: none;
+}
+/* inputbox */
+.ke-input-text {
+	background-color:#FFFFFF;
+	font-family: "sans serif",tahoma,verdana,helvetica;
+	font-size: 12px;
+	line-height: 17px;
+	height: 17px;
+	padding: 2px 4px;
+	border-color: #848484 #E0E0E0 #E0E0E0 #848484;
+	border-style: solid;
+	border-width: 1px;
+	display: -moz-inline-stack;
+	display: inline-block;
+	vertical-align: middle;
+	zoom: 1;
+	*display: inline;
+}
+.ke-input-number {
+	width: 50px;
+}
+.ke-input-color {
+	border: 1px solid #A0A0A0;
+	background-color: #FFFFFF;
+	font-size: 12px;
+	width: 60px;
+	height: 20px;
+	line-height: 20px;
+	padding-left: 5px;
+	overflow: hidden;
+	cursor: pointer;
+	display: -moz-inline-stack;
+	display: inline-block;
+	vertical-align: middle;
+	zoom: 1;
+	*display: inline;
+}
+.ke-upload-button {
+	position: relative;
+}
+.ke-upload-area {
+	position: relative;
+	overflow: hidden;
+	margin: 0;
+	padding: 0;
+	*height: 25px;
+}
+.ke-upload-area .ke-upload-file {
+	position: absolute;
+	font-size: 60px;
+	top: 0;
+	right: 0;
+	padding: 0;
+	margin: 0;
+	z-index: 811212;
+	border: 0 none;
+	opacity: 0;
+	filter: alpha(opacity=0);
+}
+/* tabs */
+.ke-tabs {
+	font: 12px/1 "sans serif",tahoma,verdana,helvetica;
+	border-bottom:1px solid #A0A0A0;
+	padding-left:5px;
+	margin-bottom:20px;
+}
+.ke-tabs-ul  {
+	list-style-image:none;
+	list-style-position:outside;
+	list-style-type:none;
+	margin:0;
+	padding:0;
+}
+.ke-tabs-li {
+	position: relative;
+	border: 1px solid #A0A0A0;
+	background-color: #F0F0EE;
+	margin: 0 2px -1px 0;
+	padding: 0 20px;
+	float: left;
+	line-height: 25px;
+	text-align: center;
+	color: #555555;
+	cursor: pointer;
+}
+.ke-tabs-li-selected {
+	background-color: #FFF;
+	border-bottom: 1px solid #FFF;
+	color: #000;
+	cursor: default;
+}
+.ke-tabs-li-on {
+	background-color: #FFF;
+	color: #000;
+}
+/* progressbar */
+.ke-progressbar {
+	position: relative;
+	margin: 0;
+	padding: 0;
+}
+.ke-progressbar-bar {
+	border: 1px solid #6FA5DB;
+	width: 80px;
+	height: 5px;
+	margin: 10px 10px 0 10px;
+	padding: 0;
+}
+.ke-progressbar-bar-inner {
+	width: 0;
+	height: 5px;
+	background-color: #6FA5DB;
+	overflow: hidden;
+	margin: 0;
+	padding: 0;
+}
+.ke-progressbar-percent {
+	position: absolute;
+	top: 0;
+	left: 40%;
+	display: none;
+}
+/* swfupload */
+.ke-swfupload-top {
+	position: relative;
+	margin-bottom: 10px;
+	_width: 608px;
+}
+.ke-swfupload-button {
+	height: 23px;
+	line-height: 23px;
+}
+.ke-swfupload-desc {
+	padding: 0 10px;
+	height: 23px;
+	line-height: 23px;
+}
+.ke-swfupload-startupload {
+	position: absolute;
+	top: 0;
+	right: 0;
+}
+.ke-swfupload-body {
+	overflow: scroll;
+	background-color:#FFFFFF;
+	border-color: #848484 #E0E0E0 #E0E0E0 #848484;
+	border-style: solid;
+	border-width: 1px;
+	width: auto;
+	height: 370px;
+	padding: 5px;
+}
+.ke-swfupload-body .ke-item {
+	width: 100px;
+	margin: 5px;
+}
+.ke-swfupload-body .ke-photo {
+	position: relative;
+	border: 1px solid #DDDDDD;
+	background-color:#FFFFFF;
+	padding: 10px;
+}
+.ke-swfupload-body .ke-delete {
+	display: block;
+	background: url(default.png) no-repeat scroll 0px -688px;
+	width: 16px;
+	height: 16px;
+	position: absolute;
+	right: 0;
+	top: 0;
+	cursor: pointer;
+}
+.ke-swfupload-body .ke-status  {
+	position: absolute;
+	left: 0;
+	bottom: 5px;
+	width: 100px;
+	height: 17px;
+}
+.ke-swfupload-body .ke-message  {
+	width: 100px;
+	text-align: center;
+	overflow: hidden;
+	height:17px;
+}
+.ke-swfupload-body .ke-error  {
+	color: red;
+}
+.ke-swfupload-body .ke-name {
+	width: 100px;
+	text-align: center;
+	overflow: hidden;
+	height:16px;
+}
+.ke-swfupload-body .ke-on {
+	border: 1px solid #5690D2;
+	background-color: #E9EFF6;
+}
+
+/* emoticons */
+.ke-plugin-emoticons {
+	position: relative;
+}
+.ke-plugin-emoticons .ke-preview {
+	position: absolute;
+	text-align: center;
+	margin: 2px;
+	padding: 10px;
+	top: 0;
+	border: 1px solid #A0A0A0;
+	background-color: #FFFFFF;
+	display: none;
+}
+.ke-plugin-emoticons .ke-preview-img {
+	border:0;
+	margin:0;
+	padding:0;
+}
+.ke-plugin-emoticons .ke-table {
+	border:0;
+	margin:0;
+	padding:0;
+	border-collapse:separate;
+}
+.ke-plugin-emoticons .ke-cell {
+	margin:0;
+	padding:1px;
+	border:1px solid #F0F0EE;
+	cursor:pointer;
+}
+.ke-plugin-emoticons .ke-on {
+	border: 1px solid #5690D2;
+	background-color: #E9EFF6;
+}
+.ke-plugin-emoticons .ke-img {
+	display:block;
+	background-repeat:no-repeat;
+	overflow:hidden;
+	margin:2px;
+	width:24px;
+	height:24px;
+	margin: 0;
+	padding: 0;
+	border: 0;
+}
+.ke-plugin-emoticons .ke-page {
+	text-align: right;
+	margin: 5px;
+	padding: 0;
+	border: 0;
+	font: 12px/1 "sans serif",tahoma,verdana,helvetica;
+	color: #333;
+	text-decoration: none;
+}
+.ke-plugin-plainpaste-textarea,
+.ke-plugin-wordpaste-iframe {
+	display: block;
+	width: 408px;
+	height: 260px;
+	font-family: "sans serif",tahoma,verdana,helvetica;
+	font-size: 12px;
+	border-color: #848484 #E0E0E0 #E0E0E0 #848484;
+	border-style: solid;
+	border-width: 1px;
+}
+/* filemanager */
+.ke-plugin-filemanager-header {
+	width: 100%;
+	margin-bottom: 10px;
+}
+.ke-plugin-filemanager-header .ke-left {
+	float: left;
+}
+.ke-plugin-filemanager-header .ke-right {
+	float: right;
+}
+.ke-plugin-filemanager-body {
+	overflow: scroll;
+	background-color:#FFFFFF;
+	border-color: #848484 #E0E0E0 #E0E0E0 #848484;
+	border-style: solid;
+	border-width: 1px;
+	width: auto;
+	height: 370px;
+	padding: 5px;
+}
+.ke-plugin-filemanager-body .ke-item {
+	width: 100px;
+	margin: 5px;
+}
+.ke-plugin-filemanager-body .ke-photo {
+	border: 1px solid #DDDDDD;
+	background-color:#FFFFFF;
+	padding: 10px;
+}
+.ke-plugin-filemanager-body .ke-name {
+	width: 100px;
+	text-align: center;
+	overflow: hidden;
+	height:16px;
+}
+.ke-plugin-filemanager-body .ke-on {
+	border: 1px solid #5690D2;
+	background-color: #E9EFF6;
+}
+.ke-plugin-filemanager-body .ke-table {
+	width: 95%;
+	border: 0;
+	margin: 0;
+	padding: 0;
+	border-collapse: separate;
+}
+.ke-plugin-filemanager-body .ke-table .ke-cell {
+	margin: 0;
+	padding: 0;
+	border: 0;
+}
+.ke-plugin-filemanager-body .ke-table .ke-name {
+	width: 55%;
+	text-align: left;
+}
+.ke-plugin-filemanager-body .ke-table .ke-size {
+	width: 15%;
+	text-align: left;
+}
+.ke-plugin-filemanager-body .ke-table .ke-datetime {
+	width: 30%;
+	text-align: center;
+}
+
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/default/default.png b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/default/default.png
new file mode 100644
index 0000000..cc9e72d
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/default/default.png differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/qq/editor.gif b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/qq/editor.gif
new file mode 100644
index 0000000..b256841
Binary files /dev/null and b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/qq/editor.gif differ
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/qq/qq.css b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/qq/qq.css
new file mode 100644
index 0000000..a45e08c
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/qq/qq.css
@@ -0,0 +1,143 @@
+/* container */
+.ke-container-qq {
+	display: block;
+	border: 1px solid #c3c3c3;
+	background-color: #FFF;
+	overflow: hidden;
+	margin: 0;
+	padding: 0;
+}
+/* toolbar */
+.ke-container-qq .ke-toolbar {
+	border-bottom: 1px solid #c3c3c3;
+	background-color: #FFFFFF;
+	padding: 2px 5px;
+	text-align: left;
+	overflow: hidden;
+	zoom: 1;
+}
+.ke-toolbar-icon-url {
+	background-image: url(editor.gif);
+	width:18px;
+	*xwidth:20px;
+	height:18px;
+	*xheight:20px;
+}
+.ke-icon-checked{
+	background-image: url(../default/default.png);
+	width:16px;
+	height:16px;
+}
+.ke-container-qq .ke-icon-bold{
+	background-position: 4px 1px;
+}
+.ke-container-qq .ke-icon-italic{
+	background-position: -27px 1px;
+}
+.ke-container-qq .ke-icon-italic{
+	background-position: -28px 1px;
+}
+.ke-container-qq .ke-icon-underline{
+	background-position: -60px 1px;
+}
+.ke-container-qq .ke-icon-fontname{
+	background-position: -95px 1px;
+}
+.ke-container-qq .ke-icon-fontsize{
+	background-position: -128px 1px;
+}
+.ke-container-qq .ke-icon-forecolor{
+	background-position: -159px 1px;
+}
+.ke-container-qq .ke-icon-hilitecolor{
+	background-position: -190px 1px;
+}
+.ke-container-qq .ke-icon-plug-align{
+	background-position: -223px 1px;
+}
+.plug-align-justifyleft{
+	background-position: -350px 1px;
+}
+.plug-align-justifycenter{
+	background-position: -382px 1px;
+}
+.plug-align-justifyright{
+	background-position: -414px 1px;
+}
+.plug-order-insertorderedlist{
+	background-position: -446px 1px;
+}
+.plug-order-insertunorderedlist{
+	background-position: -477px 1px;
+}
+.plug-indent-indent{
+	background-position: -513px 1px;
+}
+.plug-indent-outdent{
+	background-position: -545px 1px;
+}
+.ke-container-qq .ke-icon-plug-order{
+	background-position: -255px 1px;
+}
+.ke-container-qq .ke-icon-plug-indent{
+	background-position: -287px 1px;
+}
+.ke-container-qq .ke-icon-link{
+	background-position: -319px 1px;
+}
+
+.ke-container-qq .ke-toolbar .ke-outline {
+	cursor: default;
+	padding:0px;
+	border:1px solid #fff;
+}
+.ke-container-qq .ke-toolbar .ke-on {
+	border-left:1px solid white;
+	border-top:1px solid white;
+	border-right:1px solid gray;
+	border-bottom:1px solid gray;
+	background-color: #FFFFFF;
+}
+.ke-container-qq .ke-toolbar .ke-selected {
+	border-left:1px solid gray;
+	border-top:1px solid gray;
+	border-right:1px solid white;
+	border-bottom:1px solid white;
+	background-color: #FFFFFF;
+}
+.ke-container-qq .ke-toolbar  .ke-disabled {
+	cursor: default;
+}
+
+.ke-colorpicker-qq{
+	background:#fff;
+}
+/* statusbar */
+.ke-container-qq .ke-statusbar {
+	display:none;
+}
+/* menu */
+.ke-menu-qq {
+	border:1px solid #a6a6a6;
+	position:absolute;
+	background:#fff;
+	-moz-box-shadow:2px 2px 4px #DDDDDD;
+	z-index:999;
+	left:-400px;
+	top:-386px;
+	right:218px;
+	width:130px;
+}
+.ke-menu-qq .ke-menu-item {
+	padding:0px;
+	background:#fff;
+}
+.ke-menu-qq .ke-menu-item-on {
+	border:1px solid #000080;background:#FFEEC2;color:#036;
+}
+.ke-menu-qq .ke-toolbar .ke-selected {
+	border:1px solid #9a9afb;
+}
+.ke-menu-qq .ke-menu-item-left{
+	width:auto;
+}
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/simple/simple.css b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/simple/simple.css
new file mode 100644
index 0000000..4c76cf9
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/third-party/kindeditor-4.1.10/themes/simple/simple.css
@@ -0,0 +1,100 @@
+/* container */
+.ke-container-simple {
+	display: block;
+	border: 1px solid #CCC;
+	background-color: #FFF;
+	overflow: hidden;
+}
+/* toolbar */
+.ke-container-simple .ke-toolbar {
+	border-bottom: 1px solid #CCC;
+	background-color: #FFF;
+	padding: 2px 5px;
+	overflow: hidden;
+}
+.ke-container-simple .ke-toolbar .ke-outline {
+	border: 1px solid #FFF;
+	background-color: transparent;
+	margin: 1px;
+	padding: 1px 2px;
+	font-size: 0;
+	line-height: 0;
+	overflow: hidden;
+	cursor: pointer;
+}
+.ke-container-simple .ke-toolbar .ke-on {
+	border: 1px solid #5690D2;
+}
+.ke-container-simple .ke-toolbar .ke-selected {
+	border: 1px solid #5690D2;
+	background-color: #E9EFF6;
+}
+.ke-container-simple .ke-toolbar  .ke-disabled {
+	cursor: default;
+}
+/* statusbar */
+.ke-container-simple .ke-statusbar {
+	position: relative;
+	background-color: #FFF;
+	border-top: 1px solid #CCCCCC;
+	font-size: 0;
+	line-height: 0;
+	*height: 12px;
+	overflow: hidden;
+	text-align: center;
+	cursor: s-resize;
+}
+/* menu */
+.ke-menu-simple {
+	border: 1px solid #A0A0A0;
+	background-color: #FFF;
+	color: #222222;
+	padding: 2px;
+	font-family: "sans serif",tahoma,verdana,helvetica;
+	font-size: 12px;
+	text-align: left;
+	overflow: hidden;
+}
+.ke-menu-simple .ke-menu-item {
+	border: 1px solid #FFF;
+	background-color: #FFF;
+	color: #222222;
+	height: 24px;
+	overflow: hidden;
+	cursor: pointer;
+}
+.ke-menu-simple .ke-menu-item-on {
+	border: 1px solid #5690D2;
+	background-color: #FFF;
+}
+/* colorpicker */
+.ke-colorpicker-simple {
+	border: 1px solid #A0A0A0;
+	background-color: #FEFEFE;
+	color: #222222;
+	padding: 2px;
+}
+.ke-colorpicker-simple .ke-colorpicker-cell {
+	font-size: 0;
+	line-height: 0;
+	border: 1px solid #FEFEFE;
+	cursor: pointer;
+	margin:3px;
+	padding:0;
+}
+.ke-colorpicker-simple .ke-colorpicker-cell-top {
+	font-family: "sans serif",tahoma,verdana,helvetica;
+	font-size: 12px;
+	line-height: 24px;
+	border: 1px solid #FEFEFE;
+	cursor: pointer;
+	margin:0;
+	padding:0;
+	text-align: center;
+}
+.ke-colorpicker-simple .ke-colorpicker-cell-on {
+	border: 1px solid #5690D2;
+}
+.ke-colorpicker-simple .ke-colorpicker-cell-selected {
+	border: 1px solid #2446AB;
+}
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/third-party/swiper-3.4.2.jquery.min.js b/pluss-wap-page/src/main/resources/static/resources/js/third-party/swiper-3.4.2.jquery.min.js
new file mode 100644
index 0000000..3d379c7
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/third-party/swiper-3.4.2.jquery.min.js
@@ -0,0 +1,18 @@
+/**
+ * Swiper 3.4.2
+ * Most modern mobile touch slider and framework with hardware accelerated transitions
+ * 
+ * http://www.idangero.us/swiper/
+ * 
+ * Copyright 2017, Vladimir Kharlampidi
+ * The iDangero.us
+ * http://www.idangero.us/
+ * 
+ * Licensed under MIT
+ * 
+ * Released on: March 10, 2017
+ */
+!function(){"use strict";var e,a=function(t,s){function r(e){return Math.floor(e)}function i(){var e=x.params.autoplay,a=x.slides.eq(x.activeIndex);a.attr("data-swiper-autoplay")&&(e=a.attr("data-swiper-autoplay")||x.params.autoplay),x.autoplayTimeoutId=setTimeout(function(){x.params.loop?(x.fixLoop(),x._slideNext(),x.emit("onAutoplay",x)):x.isEnd?s.autoplayStopOnLast?x.stopAutoplay():(x._slideTo(0),x.emit("onAutoplay",x)):(x._slideNext(),x.emit("onAutoplay",x))},e)}function n(a,t){var s=e(a.target);if(!s.is(t))if("string"==typeof t)s=s.parents(t);else if(t.nodeType){var r;return s.parents().each(function(e,a){a===t&&(r=t)}),r?t:void 0}if(0!==s.length)return s[0]}function o(e,a){a=a||{};var t=window.MutationObserver||window.WebkitMutationObserver,s=new t(function(e){e.forEach(function(e){x.onResize(!0),x.emit("onObserverUpdate",x,e)})});s.observe(e,{attributes:void 0===a.attributes||a.attributes,childList:void 0===a.childList||a.childList,characterData:void 0===a.characterData||a.characterData}),x.observers.push(s)}function l(e){e.originalEvent&&(e=e.originalEvent);var a=e.keyCode||e.charCode;if(!x.params.allowSwipeToNext&&(x.isHorizontal()&&39===a||!x.isHorizontal()&&40===a))return!1;if(!x.params.allowSwipeToPrev&&(x.isHorizontal()&&37===a||!x.isHorizontal()&&38===a))return!1;if(!(e.shiftKey||e.altKey||e.ctrlKey||e.metaKey||document.activeElement&&document.activeElement.nodeName&&("input"===document.activeElement.nodeName.toLowerCase()||"textarea"===document.activeElement.nodeName.toLowerCase()))){if(37===a||39===a||38===a||40===a){var t=!1;if(x.container.parents("."+x.params.slideClass).length>0&&0===x.container.parents("."+x.params.slideActiveClass).length)return;var s={left:window.pageXOffset,top:window.pageYOffset},r=window.innerWidth,i=window.innerHeight,n=x.container.offset();x.rtl&&(n.left=n.left-x.container[0].scrollLeft);for(var o=[[n.left,n.top],[n.left+x.width,n.top],[n.left,n.top+x.height],[n.left+x.width,n.top+x.height]],l=0;l<o.length;l++){var p=o[l];p[0]>=s.left&&p[0]<=s.left+r&&p[1]>=s.top&&p[1]<=s.top+i&&(t=!0)}if(!t)return}x.isHorizontal()?(37!==a&&39!==a||(e.preventDefault?e.preventDefault():e.returnValue=!1),(39===a&&!x.rtl||37===a&&x.rtl)&&x.slideNext(),(37===a&&!x.rtl||39===a&&x.rtl)&&x.slidePrev()):(38!==a&&40!==a||(e.preventDefault?e.preventDefault():e.returnValue=!1),40===a&&x.slideNext(),38===a&&x.slidePrev()),x.emit("onKeyPress",x,a)}}function p(e){var a=0,t=0,s=0,r=0;return"detail"in e&&(t=e.detail),"wheelDelta"in e&&(t=-e.wheelDelta/120),"wheelDeltaY"in e&&(t=-e.wheelDeltaY/120),"wheelDeltaX"in e&&(a=-e.wheelDeltaX/120),"axis"in e&&e.axis===e.HORIZONTAL_AXIS&&(a=t,t=0),s=10*a,r=10*t,"deltaY"in e&&(r=e.deltaY),"deltaX"in e&&(s=e.deltaX),(s||r)&&e.deltaMode&&(1===e.deltaMode?(s*=40,r*=40):(s*=800,r*=800)),s&&!a&&(a=s<1?-1:1),r&&!t&&(t=r<1?-1:1),{spinX:a,spinY:t,pixelX:s,pixelY:r}}function d(e){e.originalEvent&&(e=e.originalEvent);var a=0,t=x.rtl?-1:1,s=p(e);if(x.params.mousewheelForceToAxis)if(x.isHorizontal()){if(!(Math.abs(s.pixelX)>Math.abs(s.pixelY)))return;a=s.pixelX*t}else{if(!(Math.abs(s.pixelY)>Math.abs(s.pixelX)))return;a=s.pixelY}else a=Math.abs(s.pixelX)>Math.abs(s.pixelY)?-s.pixelX*t:-s.pixelY;if(0!==a){if(x.params.mousewheelInvert&&(a=-a),x.params.freeMode){var r=x.getWrapperTranslate()+a*x.params.mousewheelSensitivity,i=x.isBeginning,n=x.isEnd;if(r>=x.minTranslate()&&(r=x.minTranslate()),r<=x.maxTranslate()&&(r=x.maxTranslate()),x.setWrapperTransition(0),x.setWrapperTranslate(r),x.updateProgress(),x.updateActiveIndex(),(!i&&x.isBeginning||!n&&x.isEnd)&&x.updateClasses(),x.params.freeModeSticky?(clearTimeout(x.mousewheel.timeout),x.mousewheel.timeout=setTimeout(function(){x.slideReset()},300)):x.params.lazyLoading&&x.lazy&&x.lazy.load(),x.emit("onScroll",x,e),x.params.autoplay&&x.params.autoplayDisableOnInteraction&&x.stopAutoplay(),0===r||r===x.maxTranslate())return}else{if((new window.Date).getTime()-x.mousewheel.lastScrollTime>60)if(a<0)if(x.isEnd&&!x.params.loop||x.animating){if(x.params.mousewheelReleaseOnEdges)return!0}else x.slideNext(),x.emit("onScroll",x,e);else if(x.isBeginning&&!x.params.loop||x.animating){if(x.params.mousewheelReleaseOnEdges)return!0}else x.slidePrev(),x.emit("onScroll",x,e);x.mousewheel.lastScrollTime=(new window.Date).getTime()}return e.preventDefault?e.preventDefault():e.returnValue=!1,!1}}function m(a,t){a=e(a);var s,r,i,n=x.rtl?-1:1;s=a.attr("data-swiper-parallax")||"0",r=a.attr("data-swiper-parallax-x"),i=a.attr("data-swiper-parallax-y"),r||i?(r=r||"0",i=i||"0"):x.isHorizontal()?(r=s,i="0"):(i=s,r="0"),r=r.indexOf("%")>=0?parseInt(r,10)*t*n+"%":r*t*n+"px",i=i.indexOf("%")>=0?parseInt(i,10)*t+"%":i*t+"px",a.transform("translate3d("+r+", "+i+",0px)")}function u(e){return 0!==e.indexOf("on")&&(e=e[0]!==e[0].toUpperCase()?"on"+e[0].toUpperCase()+e.substring(1):"on"+e),e}if(!(this instanceof a))return new a(t,s);var c={direction:"horizontal",touchEventsTarget:"container",initialSlide:0,speed:300,autoplay:!1,autoplayDisableOnInteraction:!0,autoplayStopOnLast:!1,iOSEdgeSwipeDetection:!1,iOSEdgeSwipeThreshold:20,freeMode:!1,freeModeMomentum:!0,freeModeMomentumRatio:1,freeModeMomentumBounce:!0,freeModeMomentumBounceRatio:1,freeModeMomentumVelocityRatio:1,freeModeSticky:!1,freeModeMinimumVelocity:.02,autoHeight:!1,setWrapperSize:!1,virtualTranslate:!1,effect:"slide",coverflow:{rotate:50,stretch:0,depth:100,modifier:1,slideShadows:!0},flip:{slideShadows:!0,limitRotation:!0},cube:{slideShadows:!0,shadow:!0,shadowOffset:20,shadowScale:.94},fade:{crossFade:!1},parallax:!1,zoom:!1,zoomMax:3,zoomMin:1,zoomToggle:!0,scrollbar:null,scrollbarHide:!0,scrollbarDraggable:!1,scrollbarSnapOnRelease:!1,keyboardControl:!1,mousewheelControl:!1,mousewheelReleaseOnEdges:!1,mousewheelInvert:!1,mousewheelForceToAxis:!1,mousewheelSensitivity:1,mousewheelEventsTarged:"container",hashnav:!1,hashnavWatchState:!1,history:!1,replaceState:!1,breakpoints:void 0,spaceBetween:0,slidesPerView:1,slidesPerColumn:1,slidesPerColumnFill:"column",slidesPerGroup:1,centeredSlides:!1,slidesOffsetBefore:0,slidesOffsetAfter:0,roundLengths:!1,touchRatio:1,touchAngle:45,simulateTouch:!0,shortSwipes:!0,longSwipes:!0,longSwipesRatio:.5,longSwipesMs:300,followFinger:!0,onlyExternal:!1,threshold:0,touchMoveStopPropagation:!0,touchReleaseOnEdges:!1,uniqueNavElements:!0,pagination:null,paginationElement:"span",paginationClickable:!1,paginationHide:!1,paginationBulletRender:null,paginationProgressRender:null,paginationFractionRender:null,paginationCustomRender:null,paginationType:"bullets",resistance:!0,resistanceRatio:.85,nextButton:null,prevButton:null,watchSlidesProgress:!1,watchSlidesVisibility:!1,grabCursor:!1,preventClicks:!0,preventClicksPropagation:!0,slideToClickedSlide:!1,lazyLoading:!1,lazyLoadingInPrevNext:!1,lazyLoadingInPrevNextAmount:1,lazyLoadingOnTransitionStart:!1,preloadImages:!0,updateOnImagesReady:!0,loop:!1,loopAdditionalSlides:0,loopedSlides:null,control:void 0,controlInverse:!1,controlBy:"slide",normalizeSlideIndex:!0,allowSwipeToPrev:!0,allowSwipeToNext:!0,swipeHandler:null,noSwiping:!0,noSwipingClass:"swiper-no-swiping",passiveListeners:!0,containerModifierClass:"swiper-container-",slideClass:"swiper-slide",slideActiveClass:"swiper-slide-active",slideDuplicateActiveClass:"swiper-slide-duplicate-active",slideVisibleClass:"swiper-slide-visible",slideDuplicateClass:"swiper-slide-duplicate",slideNextClass:"swiper-slide-next",slideDuplicateNextClass:"swiper-slide-duplicate-next",slidePrevClass:"swiper-slide-prev",slideDuplicatePrevClass:"swiper-slide-duplicate-prev",wrapperClass:"swiper-wrapper",bulletClass:"swiper-pagination-bullet",bulletActiveClass:"swiper-pagination-bullet-active",buttonDisabledClass:"swiper-button-disabled",paginationCurrentClass:"swiper-pagination-current",paginationTotalClass:"swiper-pagination-total",paginationHiddenClass:"swiper-pagination-hidden",paginationProgressbarClass:"swiper-pagination-progressbar",paginationClickableClass:"swiper-pagination-clickable",paginationModifierClass:"swiper-pagination-",lazyLoadingClass:"swiper-lazy",lazyStatusLoadingClass:"swiper-lazy-loading",lazyStatusLoadedClass:"swiper-lazy-loaded",lazyPreloaderClass:"swiper-lazy-preloader",notificationClass:"swiper-notification",preloaderClass:"preloader",zoomContainerClass:"swiper-zoom-container",observer:!1,observeParents:!1,a11y:!1,prevSlideMessage:"Previous slide",nextSlideMessage:"Next slide",firstSlideMessage:"This is the first slide",lastSlideMessage:"This is the last slide",paginationBulletMessage:"Go to slide {{index}}",runCallbacksOnInit:!0},g=s&&s.virtualTranslate;s=s||{};var h={};for(var v in s)if("object"!=typeof s[v]||null===s[v]||(s[v].nodeType||s[v]===window||s[v]===document||"undefined"!=typeof Dom7&&s[v]instanceof Dom7||"undefined"!=typeof jQuery&&s[v]instanceof jQuery))h[v]=s[v];else{h[v]={};for(var f in s[v])h[v][f]=s[v][f]}for(var w in c)if(void 0===s[w])s[w]=c[w];else if("object"==typeof s[w])for(var y in c[w])void 0===s[w][y]&&(s[w][y]=c[w][y]);var x=this;if(x.params=s,x.originalParams=h,x.classNames=[],void 0!==e&&"undefined"!=typeof Dom7&&(e=Dom7),(void 0!==e||(e="undefined"==typeof Dom7?window.Dom7||window.Zepto||window.jQuery:Dom7))&&(x.$=e,x.currentBreakpoint=void 0,x.getActiveBreakpoint=function(){if(!x.params.breakpoints)return!1;var e,a=!1,t=[];for(e in x.params.breakpoints)x.params.breakpoints.hasOwnProperty(e)&&t.push(e);t.sort(function(e,a){return parseInt(e,10)>parseInt(a,10)});for(var s=0;s<t.length;s++)(e=t[s])>=window.innerWidth&&!a&&(a=e);return a||"max"},x.setBreakpoint=function(){var e=x.getActiveBreakpoint();if(e&&x.currentBreakpoint!==e){var a=e in x.params.breakpoints?x.params.breakpoints[e]:x.originalParams,t=x.params.loop&&a.slidesPerView!==x.params.slidesPerView;for(var s in a)x.params[s]=a[s];x.currentBreakpoint=e,t&&x.destroyLoop&&x.reLoop(!0)}},x.params.breakpoints&&x.setBreakpoint(),x.container=e(t),0!==x.container.length)){if(x.container.length>1){var T=[];return x.container.each(function(){T.push(new a(this,s))}),T}x.container[0].swiper=x,x.container.data("swiper",x),x.classNames.push(x.params.containerModifierClass+x.params.direction),x.params.freeMode&&x.classNames.push(x.params.containerModifierClass+"free-mode"),x.support.flexbox||(x.classNames.push(x.params.containerModifierClass+"no-flexbox"),x.params.slidesPerColumn=1),x.params.autoHeight&&x.classNames.push(x.params.containerModifierClass+"autoheight"),(x.params.parallax||x.params.watchSlidesVisibility)&&(x.params.watchSlidesProgress=!0),x.params.touchReleaseOnEdges&&(x.params.resistanceRatio=0),["cube","coverflow","flip"].indexOf(x.params.effect)>=0&&(x.support.transforms3d?(x.params.watchSlidesProgress=!0,x.classNames.push(x.params.containerModifierClass+"3d")):x.params.effect="slide"),"slide"!==x.params.effect&&x.classNames.push(x.params.containerModifierClass+x.params.effect),"cube"===x.params.effect&&(x.params.resistanceRatio=0,x.params.slidesPerView=1,x.params.slidesPerColumn=1,x.params.slidesPerGroup=1,x.params.centeredSlides=!1,x.params.spaceBetween=0,x.params.virtualTranslate=!0),"fade"!==x.params.effect&&"flip"!==x.params.effect||(x.params.slidesPerView=1,x.params.slidesPerColumn=1,x.params.slidesPerGroup=1,x.params.watchSlidesProgress=!0,x.params.spaceBetween=0,void 0===g&&(x.params.virtualTranslate=!0)),x.params.grabCursor&&x.support.touch&&(x.params.grabCursor=!1),x.wrapper=x.container.children("."+x.params.wrapperClass),x.params.pagination&&(x.paginationContainer=e(x.params.pagination),x.params.uniqueNavElements&&"string"==typeof x.params.pagination&&x.paginationContainer.length>1&&1===x.container.find(x.params.pagination).length&&(x.paginationContainer=x.container.find(x.params.pagination)),"bullets"===x.params.paginationType&&x.params.paginationClickable?x.paginationContainer.addClass(x.params.paginationModifierClass+"clickable"):x.params.paginationClickable=!1,x.paginationContainer.addClass(x.params.paginationModifierClass+x.params.paginationType)),(x.params.nextButton||x.params.prevButton)&&(x.params.nextButton&&(x.nextButton=e(x.params.nextButton),x.params.uniqueNavElements&&"string"==typeof x.params.nextButton&&x.nextButton.length>1&&1===x.container.find(x.params.nextButton).length&&(x.nextButton=x.container.find(x.params.nextButton))),x.params.prevButton&&(x.prevButton=e(x.params.prevButton),x.params.uniqueNavElements&&"string"==typeof x.params.prevButton&&x.prevButton.length>1&&1===x.container.find(x.params.prevButton).length&&(x.prevButton=x.container.find(x.params.prevButton)))),x.isHorizontal=function(){return"horizontal"===x.params.direction},x.rtl=x.isHorizontal()&&("rtl"===x.container[0].dir.toLowerCase()||"rtl"===x.container.css("direction")),x.rtl&&x.classNames.push(x.params.containerModifierClass+"rtl"),x.rtl&&(x.wrongRTL="-webkit-box"===x.wrapper.css("display")),x.params.slidesPerColumn>1&&x.classNames.push(x.params.containerModifierClass+"multirow"),x.device.android&&x.classNames.push(x.params.containerModifierClass+"android"),x.container.addClass(x.classNames.join(" ")),x.translate=0,x.progress=0,x.velocity=0,x.lockSwipeToNext=function(){x.params.allowSwipeToNext=!1,x.params.allowSwipeToPrev===!1&&x.params.grabCursor&&x.unsetGrabCursor()},x.lockSwipeToPrev=function(){x.params.allowSwipeToPrev=!1,x.params.allowSwipeToNext===!1&&x.params.grabCursor&&x.unsetGrabCursor()},x.lockSwipes=function(){x.params.allowSwipeToNext=x.params.allowSwipeToPrev=!1,x.params.grabCursor&&x.unsetGrabCursor()},x.unlockSwipeToNext=function(){x.params.allowSwipeToNext=!0,x.params.allowSwipeToPrev===!0&&x.params.grabCursor&&x.setGrabCursor()},x.unlockSwipeToPrev=function(){x.params.allowSwipeToPrev=!0,x.params.allowSwipeToNext===!0&&x.params.grabCursor&&x.setGrabCursor()},x.unlockSwipes=function(){x.params.allowSwipeToNext=x.params.allowSwipeToPrev=!0,x.params.grabCursor&&x.setGrabCursor()},x.setGrabCursor=function(e){x.container[0].style.cursor="move",x.container[0].style.cursor=e?"-webkit-grabbing":"-webkit-grab",x.container[0].style.cursor=e?"-moz-grabbin":"-moz-grab",x.container[0].style.cursor=e?"grabbing":"grab"},x.unsetGrabCursor=function(){x.container[0].style.cursor=""},x.params.grabCursor&&x.setGrabCursor(),x.imagesToLoad=[],x.imagesLoaded=0,x.loadImage=function(e,a,t,s,r,i){function n(){i&&i()}var o;e.complete&&r?n():a?(o=new window.Image,o.onload=n,o.onerror=n,s&&(o.sizes=s),t&&(o.srcset=t),a&&(o.src=a)):n()},x.preloadImages=function(){function e(){void 0!==x&&null!==x&&x&&(void 0!==x.imagesLoaded&&x.imagesLoaded++,x.imagesLoaded===x.imagesToLoad.length&&(x.params.updateOnImagesReady&&x.update(),x.emit("onImagesReady",x)))}x.imagesToLoad=x.container.find("img");for(var a=0;a<x.imagesToLoad.length;a++)x.loadImage(x.imagesToLoad[a],x.imagesToLoad[a].currentSrc||x.imagesToLoad[a].getAttribute("src"),x.imagesToLoad[a].srcset||x.imagesToLoad[a].getAttribute("srcset"),x.imagesToLoad[a].sizes||x.imagesToLoad[a].getAttribute("sizes"),!0,e)},x.autoplayTimeoutId=void 0,x.autoplaying=!1,x.autoplayPaused=!1,x.startAutoplay=function(){return void 0===x.autoplayTimeoutId&&(!!x.params.autoplay&&(!x.autoplaying&&(x.autoplaying=!0,x.emit("onAutoplayStart",x),void i())))},x.stopAutoplay=function(e){x.autoplayTimeoutId&&(x.autoplayTimeoutId&&clearTimeout(x.autoplayTimeoutId),x.autoplaying=!1,x.autoplayTimeoutId=void 0,x.emit("onAutoplayStop",x))},x.pauseAutoplay=function(e){x.autoplayPaused||(x.autoplayTimeoutId&&clearTimeout(x.autoplayTimeoutId),x.autoplayPaused=!0,0===e?(x.autoplayPaused=!1,i()):x.wrapper.transitionEnd(function(){x&&(x.autoplayPaused=!1,x.autoplaying?i():x.stopAutoplay())}))},x.minTranslate=function(){return-x.snapGrid[0]},x.maxTranslate=function(){return-x.snapGrid[x.snapGrid.length-1]},x.updateAutoHeight=function(){var e,a=[],t=0;if("auto"!==x.params.slidesPerView&&x.params.slidesPerView>1)for(e=0;e<Math.ceil(x.params.slidesPerView);e++){var s=x.activeIndex+e;if(s>x.slides.length)break;a.push(x.slides.eq(s)[0])}else a.push(x.slides.eq(x.activeIndex)[0]);for(e=0;e<a.length;e++)if(void 0!==a[e]){var r=a[e].offsetHeight;t=r>t?r:t}t&&x.wrapper.css("height",t+"px")},x.updateContainerSize=function(){var e,a;e=void 0!==x.params.width?x.params.width:x.container[0].clientWidth,a=void 0!==x.params.height?x.params.height:x.container[0].clientHeight,0===e&&x.isHorizontal()||0===a&&!x.isHorizontal()||(e=e-parseInt(x.container.css("padding-left"),10)-parseInt(x.container.css("padding-right"),10),a=a-parseInt(x.container.css("padding-top"),10)-parseInt(x.container.css("padding-bottom"),10),x.width=e,x.height=a,x.size=x.isHorizontal()?x.width:x.height)},x.updateSlidesSize=function(){x.slides=x.wrapper.children("."+x.params.slideClass),x.snapGrid=[],x.slidesGrid=[],x.slidesSizesGrid=[];var e,a=x.params.spaceBetween,t=-x.params.slidesOffsetBefore,s=0,i=0;if(void 0!==x.size){"string"==typeof a&&a.indexOf("%")>=0&&(a=parseFloat(a.replace("%",""))/100*x.size),x.virtualSize=-a,x.rtl?x.slides.css({marginLeft:"",marginTop:""}):x.slides.css({marginRight:"",marginBottom:""});var n;x.params.slidesPerColumn>1&&(n=Math.floor(x.slides.length/x.params.slidesPerColumn)===x.slides.length/x.params.slidesPerColumn?x.slides.length:Math.ceil(x.slides.length/x.params.slidesPerColumn)*x.params.slidesPerColumn,"auto"!==x.params.slidesPerView&&"row"===x.params.slidesPerColumnFill&&(n=Math.max(n,x.params.slidesPerView*x.params.slidesPerColumn)));var o,l=x.params.slidesPerColumn,p=n/l,d=p-(x.params.slidesPerColumn*p-x.slides.length);for(e=0;e<x.slides.length;e++){o=0;var m=x.slides.eq(e);if(x.params.slidesPerColumn>1){var u,c,g;"column"===x.params.slidesPerColumnFill?(c=Math.floor(e/l),g=e-c*l,(c>d||c===d&&g===l-1)&&++g>=l&&(g=0,c++),u=c+g*n/l,m.css({"-webkit-box-ordinal-group":u,"-moz-box-ordinal-group":u,"-ms-flex-order":u,"-webkit-order":u,order:u})):(g=Math.floor(e/p),c=e-g*p),m.css("margin-"+(x.isHorizontal()?"top":"left"),0!==g&&x.params.spaceBetween&&x.params.spaceBetween+"px").attr("data-swiper-column",c).attr("data-swiper-row",g)}"none"!==m.css("display")&&("auto"===x.params.slidesPerView?(o=x.isHorizontal()?m.outerWidth(!0):m.outerHeight(!0),x.params.roundLengths&&(o=r(o))):(o=(x.size-(x.params.slidesPerView-1)*a)/x.params.slidesPerView,x.params.roundLengths&&(o=r(o)),x.isHorizontal()?x.slides[e].style.width=o+"px":x.slides[e].style.height=o+"px"),x.slides[e].swiperSlideSize=o,x.slidesSizesGrid.push(o),x.params.centeredSlides?(t=t+o/2+s/2+a,0===s&&0!==e&&(t=t-x.size/2-a),0===e&&(t=t-x.size/2-a),Math.abs(t)<.001&&(t=0),i%x.params.slidesPerGroup==0&&x.snapGrid.push(t),x.slidesGrid.push(t)):(i%x.params.slidesPerGroup==0&&x.snapGrid.push(t),x.slidesGrid.push(t),t=t+o+a),x.virtualSize+=o+a,s=o,i++)}x.virtualSize=Math.max(x.virtualSize,x.size)+x.params.slidesOffsetAfter;var h;if(x.rtl&&x.wrongRTL&&("slide"===x.params.effect||"coverflow"===x.params.effect)&&x.wrapper.css({width:x.virtualSize+x.params.spaceBetween+"px"}),x.support.flexbox&&!x.params.setWrapperSize||(x.isHorizontal()?x.wrapper.css({width:x.virtualSize+x.params.spaceBetween+"px"}):x.wrapper.css({height:x.virtualSize+x.params.spaceBetween+"px"})),x.params.slidesPerColumn>1&&(x.virtualSize=(o+x.params.spaceBetween)*n,x.virtualSize=Math.ceil(x.virtualSize/x.params.slidesPerColumn)-x.params.spaceBetween,x.isHorizontal()?x.wrapper.css({width:x.virtualSize+x.params.spaceBetween+"px"}):x.wrapper.css({height:x.virtualSize+x.params.spaceBetween+"px"}),x.params.centeredSlides)){for(h=[],e=0;e<x.snapGrid.length;e++)x.snapGrid[e]<x.virtualSize+x.snapGrid[0]&&h.push(x.snapGrid[e]);x.snapGrid=h}if(!x.params.centeredSlides){for(h=[],e=0;e<x.snapGrid.length;e++)x.snapGrid[e]<=x.virtualSize-x.size&&h.push(x.snapGrid[e]);x.snapGrid=h,Math.floor(x.virtualSize-x.size)-Math.floor(x.snapGrid[x.snapGrid.length-1])>1&&x.snapGrid.push(x.virtualSize-x.size)}0===x.snapGrid.length&&(x.snapGrid=[0]),0!==x.params.spaceBetween&&(x.isHorizontal()?x.rtl?x.slides.css({marginLeft:a+"px"}):x.slides.css({marginRight:a+"px"}):x.slides.css({marginBottom:a+"px"})),x.params.watchSlidesProgress&&x.updateSlidesOffset()}},x.updateSlidesOffset=function(){for(var e=0;e<x.slides.length;e++)x.slides[e].swiperSlideOffset=x.isHorizontal()?x.slides[e].offsetLeft:x.slides[e].offsetTop},x.currentSlidesPerView=function(){var e,a,t=1;if(x.params.centeredSlides){var s,r=x.slides[x.activeIndex].swiperSlideSize;for(e=x.activeIndex+1;e<x.slides.length;e++)x.slides[e]&&!s&&(r+=x.slides[e].swiperSlideSize,t++,r>x.size&&(s=!0));for(a=x.activeIndex-1;a>=0;a--)x.slides[a]&&!s&&(r+=x.slides[a].swiperSlideSize,t++,r>x.size&&(s=!0))}else for(e=x.activeIndex+1;e<x.slides.length;e++)x.slidesGrid[e]-x.slidesGrid[x.activeIndex]<x.size&&t++;return t},x.updateSlidesProgress=function(e){if(void 0===e&&(e=x.translate||0),0!==x.slides.length){void 0===x.slides[0].swiperSlideOffset&&x.updateSlidesOffset();var a=-e;x.rtl&&(a=e),x.slides.removeClass(x.params.slideVisibleClass);for(var t=0;t<x.slides.length;t++){var s=x.slides[t],r=(a+(x.params.centeredSlides?x.minTranslate():0)-s.swiperSlideOffset)/(s.swiperSlideSize+x.params.spaceBetween);if(x.params.watchSlidesVisibility){var i=-(a-s.swiperSlideOffset),n=i+x.slidesSizesGrid[t];(i>=0&&i<x.size||n>0&&n<=x.size||i<=0&&n>=x.size)&&x.slides.eq(t).addClass(x.params.slideVisibleClass)}s.progress=x.rtl?-r:r}}},x.updateProgress=function(e){void 0===e&&(e=x.translate||0);var a=x.maxTranslate()-x.minTranslate(),t=x.isBeginning,s=x.isEnd;0===a?(x.progress=0,x.isBeginning=x.isEnd=!0):(x.progress=(e-x.minTranslate())/a,x.isBeginning=x.progress<=0,x.isEnd=x.progress>=1),x.isBeginning&&!t&&x.emit("onReachBeginning",x),x.isEnd&&!s&&x.emit("onReachEnd",x),x.params.watchSlidesProgress&&x.updateSlidesProgress(e),x.emit("onProgress",x,x.progress)},x.updateActiveIndex=function(){var e,a,t,s=x.rtl?x.translate:-x.translate;for(a=0;a<x.slidesGrid.length;a++)void 0!==x.slidesGrid[a+1]?s>=x.slidesGrid[a]&&s<x.slidesGrid[a+1]-(x.slidesGrid[a+1]-x.slidesGrid[a])/2?e=a:s>=x.slidesGrid[a]&&s<x.slidesGrid[a+1]&&(e=a+1):s>=x.slidesGrid[a]&&(e=a);x.params.normalizeSlideIndex&&(e<0||void 0===e)&&(e=0),t=Math.floor(e/x.params.slidesPerGroup),t>=x.snapGrid.length&&(t=x.snapGrid.length-1),e!==x.activeIndex&&(x.snapIndex=t,x.previousIndex=x.activeIndex,x.activeIndex=e,x.updateClasses(),x.updateRealIndex())},x.updateRealIndex=function(){x.realIndex=parseInt(x.slides.eq(x.activeIndex).attr("data-swiper-slide-index")||x.activeIndex,10)},x.updateClasses=function(){x.slides.removeClass(x.params.slideActiveClass+" "+x.params.slideNextClass+" "+x.params.slidePrevClass+" "+x.params.slideDuplicateActiveClass+" "+x.params.slideDuplicateNextClass+" "+x.params.slideDuplicatePrevClass);var a=x.slides.eq(x.activeIndex);a.addClass(x.params.slideActiveClass),s.loop&&(a.hasClass(x.params.slideDuplicateClass)?x.wrapper.children("."+x.params.slideClass+":not(."+x.params.slideDuplicateClass+')[data-swiper-slide-index="'+x.realIndex+'"]').addClass(x.params.slideDuplicateActiveClass):x.wrapper.children("."+x.params.slideClass+"."+x.params.slideDuplicateClass+'[data-swiper-slide-index="'+x.realIndex+'"]').addClass(x.params.slideDuplicateActiveClass));var t=a.next("."+x.params.slideClass).addClass(x.params.slideNextClass);x.params.loop&&0===t.length&&(t=x.slides.eq(0),t.addClass(x.params.slideNextClass));var r=a.prev("."+x.params.slideClass).addClass(x.params.slidePrevClass);if(x.params.loop&&0===r.length&&(r=x.slides.eq(-1),r.addClass(x.params.slidePrevClass)),s.loop&&(t.hasClass(x.params.slideDuplicateClass)?x.wrapper.children("."+x.params.slideClass+":not(."+x.params.slideDuplicateClass+')[data-swiper-slide-index="'+t.attr("data-swiper-slide-index")+'"]').addClass(x.params.slideDuplicateNextClass):x.wrapper.children("."+x.params.slideClass+"."+x.params.slideDuplicateClass+'[data-swiper-slide-index="'+t.attr("data-swiper-slide-index")+'"]').addClass(x.params.slideDuplicateNextClass),r.hasClass(x.params.slideDuplicateClass)?x.wrapper.children("."+x.params.slideClass+":not(."+x.params.slideDuplicateClass+')[data-swiper-slide-index="'+r.attr("data-swiper-slide-index")+'"]').addClass(x.params.slideDuplicatePrevClass):x.wrapper.children("."+x.params.slideClass+"."+x.params.slideDuplicateClass+'[data-swiper-slide-index="'+r.attr("data-swiper-slide-index")+'"]').addClass(x.params.slideDuplicatePrevClass)),x.paginationContainer&&x.paginationContainer.length>0){var i,n=x.params.loop?Math.ceil((x.slides.length-2*x.loopedSlides)/x.params.slidesPerGroup):x.snapGrid.length;if(x.params.loop?(i=Math.ceil((x.activeIndex-x.loopedSlides)/x.params.slidesPerGroup),i>x.slides.length-1-2*x.loopedSlides&&(i-=x.slides.length-2*x.loopedSlides),i>n-1&&(i-=n),i<0&&"bullets"!==x.params.paginationType&&(i=n+i)):i=void 0!==x.snapIndex?x.snapIndex:x.activeIndex||0,"bullets"===x.params.paginationType&&x.bullets&&x.bullets.length>0&&(x.bullets.removeClass(x.params.bulletActiveClass),x.paginationContainer.length>1?x.bullets.each(function(){e(this).index()===i&&e(this).addClass(x.params.bulletActiveClass)}):x.bullets.eq(i).addClass(x.params.bulletActiveClass)),"fraction"===x.params.paginationType&&(x.paginationContainer.find("."+x.params.paginationCurrentClass).text(i+1),x.paginationContainer.find("."+x.params.paginationTotalClass).text(n)),"progress"===x.params.paginationType){var o=(i+1)/n,l=o,p=1;x.isHorizontal()||(p=o,l=1),x.paginationContainer.find("."+x.params.paginationProgressbarClass).transform("translate3d(0,0,0) scaleX("+l+") scaleY("+p+")").transition(x.params.speed)}"custom"===x.params.paginationType&&x.params.paginationCustomRender&&(x.paginationContainer.html(x.params.paginationCustomRender(x,i+1,n)),x.emit("onPaginationRendered",x,x.paginationContainer[0]))}x.params.loop||(x.params.prevButton&&x.prevButton&&x.prevButton.length>0&&(x.isBeginning?(x.prevButton.addClass(x.params.buttonDisabledClass),x.params.a11y&&x.a11y&&x.a11y.disable(x.prevButton)):(x.prevButton.removeClass(x.params.buttonDisabledClass),x.params.a11y&&x.a11y&&x.a11y.enable(x.prevButton))),x.params.nextButton&&x.nextButton&&x.nextButton.length>0&&(x.isEnd?(x.nextButton.addClass(x.params.buttonDisabledClass),x.params.a11y&&x.a11y&&x.a11y.disable(x.nextButton)):(x.nextButton.removeClass(x.params.buttonDisabledClass),x.params.a11y&&x.a11y&&x.a11y.enable(x.nextButton))))},x.updatePagination=function(){if(x.params.pagination&&x.paginationContainer&&x.paginationContainer.length>0){var e="";if("bullets"===x.params.paginationType){for(var a=x.params.loop?Math.ceil((x.slides.length-2*x.loopedSlides)/x.params.slidesPerGroup):x.snapGrid.length,t=0;t<a;t++)e+=x.params.paginationBulletRender?x.params.paginationBulletRender(x,t,x.params.bulletClass):"<"+x.params.paginationElement+' class="'+x.params.bulletClass+'"></'+x.params.paginationElement+">";x.paginationContainer.html(e),x.bullets=x.paginationContainer.find("."+x.params.bulletClass),x.params.paginationClickable&&x.params.a11y&&x.a11y&&x.a11y.initPagination()}"fraction"===x.params.paginationType&&(e=x.params.paginationFractionRender?x.params.paginationFractionRender(x,x.params.paginationCurrentClass,x.params.paginationTotalClass):'<span class="'+x.params.paginationCurrentClass+'"></span> / <span class="'+x.params.paginationTotalClass+'"></span>',x.paginationContainer.html(e)),"progress"===x.params.paginationType&&(e=x.params.paginationProgressRender?x.params.paginationProgressRender(x,x.params.paginationProgressbarClass):'<span class="'+x.params.paginationProgressbarClass+'"></span>',x.paginationContainer.html(e)),"custom"!==x.params.paginationType&&x.emit("onPaginationRendered",x,x.paginationContainer[0])}},x.update=function(e){function a(){x.rtl,x.translate;t=Math.min(Math.max(x.translate,x.maxTranslate()),x.minTranslate()),x.setWrapperTranslate(t),x.updateActiveIndex(),x.updateClasses()}if(x){x.updateContainerSize(),x.updateSlidesSize(),x.updateProgress(),x.updatePagination(),x.updateClasses(),x.params.scrollbar&&x.scrollbar&&x.scrollbar.set();var t;if(e){x.controller&&x.controller.spline&&(x.controller.spline=void 0),x.params.freeMode?(a(),x.params.autoHeight&&x.updateAutoHeight()):(("auto"===x.params.slidesPerView||x.params.slidesPerView>1)&&x.isEnd&&!x.params.centeredSlides?x.slideTo(x.slides.length-1,0,!1,!0):x.slideTo(x.activeIndex,0,!1,!0))||a()}else x.params.autoHeight&&x.updateAutoHeight()}},x.onResize=function(e){x.params.onBeforeResize&&x.params.onBeforeResize(x),x.params.breakpoints&&x.setBreakpoint();var a=x.params.allowSwipeToPrev,t=x.params.allowSwipeToNext;x.params.allowSwipeToPrev=x.params.allowSwipeToNext=!0,x.updateContainerSize(),x.updateSlidesSize(),("auto"===x.params.slidesPerView||x.params.freeMode||e)&&x.updatePagination(),x.params.scrollbar&&x.scrollbar&&x.scrollbar.set(),x.controller&&x.controller.spline&&(x.controller.spline=void 0);var s=!1;if(x.params.freeMode){var r=Math.min(Math.max(x.translate,x.maxTranslate()),x.minTranslate());x.setWrapperTranslate(r),x.updateActiveIndex(),x.updateClasses(),x.params.autoHeight&&x.updateAutoHeight()}else x.updateClasses(),s=("auto"===x.params.slidesPerView||x.params.slidesPerView>1)&&x.isEnd&&!x.params.centeredSlides?x.slideTo(x.slides.length-1,0,!1,!0):x.slideTo(x.activeIndex,0,!1,!0);x.params.lazyLoading&&!s&&x.lazy&&x.lazy.load(),x.params.allowSwipeToPrev=a,x.params.allowSwipeToNext=t,x.params.onAfterResize&&x.params.onAfterResize(x)},x.touchEventsDesktop={start:"mousedown",move:"mousemove",end:"mouseup"},window.navigator.pointerEnabled?x.touchEventsDesktop={start:"pointerdown",move:"pointermove",end:"pointerup"}:window.navigator.msPointerEnabled&&(x.touchEventsDesktop={start:"MSPointerDown",move:"MSPointerMove",end:"MSPointerUp"}),x.touchEvents={start:x.support.touch||!x.params.simulateTouch?"touchstart":x.touchEventsDesktop.start,move:x.support.touch||!x.params.simulateTouch?"touchmove":x.touchEventsDesktop.move,end:x.support.touch||!x.params.simulateTouch?"touchend":x.touchEventsDesktop.end},(window.navigator.pointerEnabled||window.navigator.msPointerEnabled)&&("container"===x.params.touchEventsTarget?x.container:x.wrapper).addClass("swiper-wp8-"+x.params.direction),x.initEvents=function(e){var a=e?"off":"on",t=e?"removeEventListener":"addEventListener",r="container"===x.params.touchEventsTarget?x.container[0]:x.wrapper[0],i=x.support.touch?r:document,n=!!x.params.nested;if(x.browser.ie)r[t](x.touchEvents.start,x.onTouchStart,!1),i[t](x.touchEvents.move,x.onTouchMove,n),i[t](x.touchEvents.end,x.onTouchEnd,!1);else{if(x.support.touch){var o=!("touchstart"!==x.touchEvents.start||!x.support.passiveListener||!x.params.passiveListeners)&&{passive:!0,capture:!1};r[t](x.touchEvents.start,x.onTouchStart,o),r[t](x.touchEvents.move,x.onTouchMove,n),r[t](x.touchEvents.end,x.onTouchEnd,o)}(s.simulateTouch&&!x.device.ios&&!x.device.android||s.simulateTouch&&!x.support.touch&&x.device.ios)&&(r[t]("mousedown",x.onTouchStart,!1),document[t]("mousemove",x.onTouchMove,n),document[t]("mouseup",x.onTouchEnd,!1))}window[t]("resize",x.onResize),x.params.nextButton&&x.nextButton&&x.nextButton.length>0&&(x.nextButton[a]("click",x.onClickNext),x.params.a11y&&x.a11y&&x.nextButton[a]("keydown",x.a11y.onEnterKey)),x.params.prevButton&&x.prevButton&&x.prevButton.length>0&&(x.prevButton[a]("click",x.onClickPrev),x.params.a11y&&x.a11y&&x.prevButton[a]("keydown",x.a11y.onEnterKey)),x.params.pagination&&x.params.paginationClickable&&(x.paginationContainer[a]("click","."+x.params.bulletClass,x.onClickIndex),x.params.a11y&&x.a11y&&x.paginationContainer[a]("keydown","."+x.params.bulletClass,x.a11y.onEnterKey)),(x.params.preventClicks||x.params.preventClicksPropagation)&&r[t]("click",x.preventClicks,!0)},x.attachEvents=function(){x.initEvents()},x.detachEvents=function(){x.initEvents(!0)},x.allowClick=!0,x.preventClicks=function(e){x.allowClick||(x.params.preventClicks&&e.preventDefault(),x.params.preventClicksPropagation&&x.animating&&(e.stopPropagation(),e.stopImmediatePropagation()))},x.onClickNext=function(e){e.preventDefault(),x.isEnd&&!x.params.loop||x.slideNext()},x.onClickPrev=function(e){e.preventDefault(),x.isBeginning&&!x.params.loop||x.slidePrev()},x.onClickIndex=function(a){a.preventDefault();var t=e(this).index()*x.params.slidesPerGroup
+;x.params.loop&&(t+=x.loopedSlides),x.slideTo(t)},x.updateClickedSlide=function(a){var t=n(a,"."+x.params.slideClass),s=!1;if(t)for(var r=0;r<x.slides.length;r++)x.slides[r]===t&&(s=!0);if(!t||!s)return x.clickedSlide=void 0,void(x.clickedIndex=void 0);if(x.clickedSlide=t,x.clickedIndex=e(t).index(),x.params.slideToClickedSlide&&void 0!==x.clickedIndex&&x.clickedIndex!==x.activeIndex){var i,o=x.clickedIndex,l="auto"===x.params.slidesPerView?x.currentSlidesPerView():x.params.slidesPerView;if(x.params.loop){if(x.animating)return;i=parseInt(e(x.clickedSlide).attr("data-swiper-slide-index"),10),x.params.centeredSlides?o<x.loopedSlides-l/2||o>x.slides.length-x.loopedSlides+l/2?(x.fixLoop(),o=x.wrapper.children("."+x.params.slideClass+'[data-swiper-slide-index="'+i+'"]:not(.'+x.params.slideDuplicateClass+")").eq(0).index(),setTimeout(function(){x.slideTo(o)},0)):x.slideTo(o):o>x.slides.length-l?(x.fixLoop(),o=x.wrapper.children("."+x.params.slideClass+'[data-swiper-slide-index="'+i+'"]:not(.'+x.params.slideDuplicateClass+")").eq(0).index(),setTimeout(function(){x.slideTo(o)},0)):x.slideTo(o)}else x.slideTo(o)}};var b,C,S,z,M,P,E,I,k,D,L="input, select, textarea, button, video",B=Date.now(),H=[];x.animating=!1,x.touches={startX:0,startY:0,currentX:0,currentY:0,diff:0};var G,X;x.onTouchStart=function(a){if(a.originalEvent&&(a=a.originalEvent),(G="touchstart"===a.type)||!("which"in a)||3!==a.which){if(x.params.noSwiping&&n(a,"."+x.params.noSwipingClass))return void(x.allowClick=!0);if(!x.params.swipeHandler||n(a,x.params.swipeHandler)){var t=x.touches.currentX="touchstart"===a.type?a.targetTouches[0].pageX:a.pageX,s=x.touches.currentY="touchstart"===a.type?a.targetTouches[0].pageY:a.pageY;if(!(x.device.ios&&x.params.iOSEdgeSwipeDetection&&t<=x.params.iOSEdgeSwipeThreshold)){if(b=!0,C=!1,S=!0,M=void 0,X=void 0,x.touches.startX=t,x.touches.startY=s,z=Date.now(),x.allowClick=!0,x.updateContainerSize(),x.swipeDirection=void 0,x.params.threshold>0&&(I=!1),"touchstart"!==a.type){var r=!0;e(a.target).is(L)&&(r=!1),document.activeElement&&e(document.activeElement).is(L)&&document.activeElement.blur(),r&&a.preventDefault()}x.emit("onTouchStart",x,a)}}}},x.onTouchMove=function(a){if(a.originalEvent&&(a=a.originalEvent),!G||"mousemove"!==a.type){if(a.preventedByNestedSwiper)return x.touches.startX="touchmove"===a.type?a.targetTouches[0].pageX:a.pageX,void(x.touches.startY="touchmove"===a.type?a.targetTouches[0].pageY:a.pageY);if(x.params.onlyExternal)return x.allowClick=!1,void(b&&(x.touches.startX=x.touches.currentX="touchmove"===a.type?a.targetTouches[0].pageX:a.pageX,x.touches.startY=x.touches.currentY="touchmove"===a.type?a.targetTouches[0].pageY:a.pageY,z=Date.now()));if(G&&x.params.touchReleaseOnEdges&&!x.params.loop)if(x.isHorizontal()){if(x.touches.currentX<x.touches.startX&&x.translate<=x.maxTranslate()||x.touches.currentX>x.touches.startX&&x.translate>=x.minTranslate())return}else if(x.touches.currentY<x.touches.startY&&x.translate<=x.maxTranslate()||x.touches.currentY>x.touches.startY&&x.translate>=x.minTranslate())return;if(G&&document.activeElement&&a.target===document.activeElement&&e(a.target).is(L))return C=!0,void(x.allowClick=!1);if(S&&x.emit("onTouchMove",x,a),!(a.targetTouches&&a.targetTouches.length>1)){if(x.touches.currentX="touchmove"===a.type?a.targetTouches[0].pageX:a.pageX,x.touches.currentY="touchmove"===a.type?a.targetTouches[0].pageY:a.pageY,void 0===M){var t;x.isHorizontal()&&x.touches.currentY===x.touches.startY||!x.isHorizontal()&&x.touches.currentX===x.touches.startX?M=!1:(t=180*Math.atan2(Math.abs(x.touches.currentY-x.touches.startY),Math.abs(x.touches.currentX-x.touches.startX))/Math.PI,M=x.isHorizontal()?t>x.params.touchAngle:90-t>x.params.touchAngle)}if(M&&x.emit("onTouchMoveOpposite",x,a),void 0===X&&(x.touches.currentX===x.touches.startX&&x.touches.currentY===x.touches.startY||(X=!0)),b){if(M)return void(b=!1);if(X){x.allowClick=!1,x.emit("onSliderMove",x,a),a.preventDefault(),x.params.touchMoveStopPropagation&&!x.params.nested&&a.stopPropagation(),C||(s.loop&&x.fixLoop(),E=x.getWrapperTranslate(),x.setWrapperTransition(0),x.animating&&x.wrapper.trigger("webkitTransitionEnd transitionend oTransitionEnd MSTransitionEnd msTransitionEnd"),x.params.autoplay&&x.autoplaying&&(x.params.autoplayDisableOnInteraction?x.stopAutoplay():x.pauseAutoplay()),D=!1,!x.params.grabCursor||x.params.allowSwipeToNext!==!0&&x.params.allowSwipeToPrev!==!0||x.setGrabCursor(!0)),C=!0;var r=x.touches.diff=x.isHorizontal()?x.touches.currentX-x.touches.startX:x.touches.currentY-x.touches.startY;r*=x.params.touchRatio,x.rtl&&(r=-r),x.swipeDirection=r>0?"prev":"next",P=r+E;var i=!0;if(r>0&&P>x.minTranslate()?(i=!1,x.params.resistance&&(P=x.minTranslate()-1+Math.pow(-x.minTranslate()+E+r,x.params.resistanceRatio))):r<0&&P<x.maxTranslate()&&(i=!1,x.params.resistance&&(P=x.maxTranslate()+1-Math.pow(x.maxTranslate()-E-r,x.params.resistanceRatio))),i&&(a.preventedByNestedSwiper=!0),!x.params.allowSwipeToNext&&"next"===x.swipeDirection&&P<E&&(P=E),!x.params.allowSwipeToPrev&&"prev"===x.swipeDirection&&P>E&&(P=E),x.params.threshold>0){if(!(Math.abs(r)>x.params.threshold||I))return void(P=E);if(!I)return I=!0,x.touches.startX=x.touches.currentX,x.touches.startY=x.touches.currentY,P=E,void(x.touches.diff=x.isHorizontal()?x.touches.currentX-x.touches.startX:x.touches.currentY-x.touches.startY)}x.params.followFinger&&((x.params.freeMode||x.params.watchSlidesProgress)&&x.updateActiveIndex(),x.params.freeMode&&(0===H.length&&H.push({position:x.touches[x.isHorizontal()?"startX":"startY"],time:z}),H.push({position:x.touches[x.isHorizontal()?"currentX":"currentY"],time:(new window.Date).getTime()})),x.updateProgress(P),x.setWrapperTranslate(P))}}}}},x.onTouchEnd=function(a){if(a.originalEvent&&(a=a.originalEvent),S&&x.emit("onTouchEnd",x,a),S=!1,b){x.params.grabCursor&&C&&b&&(x.params.allowSwipeToNext===!0||x.params.allowSwipeToPrev===!0)&&x.setGrabCursor(!1);var t=Date.now(),s=t-z;if(x.allowClick&&(x.updateClickedSlide(a),x.emit("onTap",x,a),s<300&&t-B>300&&(k&&clearTimeout(k),k=setTimeout(function(){x&&(x.params.paginationHide&&x.paginationContainer.length>0&&!e(a.target).hasClass(x.params.bulletClass)&&x.paginationContainer.toggleClass(x.params.paginationHiddenClass),x.emit("onClick",x,a))},300)),s<300&&t-B<300&&(k&&clearTimeout(k),x.emit("onDoubleTap",x,a))),B=Date.now(),setTimeout(function(){x&&(x.allowClick=!0)},0),!b||!C||!x.swipeDirection||0===x.touches.diff||P===E)return void(b=C=!1);b=C=!1;var r;if(r=x.params.followFinger?x.rtl?x.translate:-x.translate:-P,x.params.freeMode){if(r<-x.minTranslate())return void x.slideTo(x.activeIndex);if(r>-x.maxTranslate())return void(x.slides.length<x.snapGrid.length?x.slideTo(x.snapGrid.length-1):x.slideTo(x.slides.length-1));if(x.params.freeModeMomentum){if(H.length>1){var i=H.pop(),n=H.pop(),o=i.position-n.position,l=i.time-n.time;x.velocity=o/l,x.velocity=x.velocity/2,Math.abs(x.velocity)<x.params.freeModeMinimumVelocity&&(x.velocity=0),(l>150||(new window.Date).getTime()-i.time>300)&&(x.velocity=0)}else x.velocity=0;x.velocity=x.velocity*x.params.freeModeMomentumVelocityRatio,H.length=0;var p=1e3*x.params.freeModeMomentumRatio,d=x.velocity*p,m=x.translate+d;x.rtl&&(m=-m);var u,c=!1,g=20*Math.abs(x.velocity)*x.params.freeModeMomentumBounceRatio;if(m<x.maxTranslate())x.params.freeModeMomentumBounce?(m+x.maxTranslate()<-g&&(m=x.maxTranslate()-g),u=x.maxTranslate(),c=!0,D=!0):m=x.maxTranslate();else if(m>x.minTranslate())x.params.freeModeMomentumBounce?(m-x.minTranslate()>g&&(m=x.minTranslate()+g),u=x.minTranslate(),c=!0,D=!0):m=x.minTranslate();else if(x.params.freeModeSticky){var h,v=0;for(v=0;v<x.snapGrid.length;v+=1)if(x.snapGrid[v]>-m){h=v;break}m=Math.abs(x.snapGrid[h]-m)<Math.abs(x.snapGrid[h-1]-m)||"next"===x.swipeDirection?x.snapGrid[h]:x.snapGrid[h-1],x.rtl||(m=-m)}if(0!==x.velocity)p=x.rtl?Math.abs((-m-x.translate)/x.velocity):Math.abs((m-x.translate)/x.velocity);else if(x.params.freeModeSticky)return void x.slideReset();x.params.freeModeMomentumBounce&&c?(x.updateProgress(u),x.setWrapperTransition(p),x.setWrapperTranslate(m),x.onTransitionStart(),x.animating=!0,x.wrapper.transitionEnd(function(){x&&D&&(x.emit("onMomentumBounce",x),x.setWrapperTransition(x.params.speed),x.setWrapperTranslate(u),x.wrapper.transitionEnd(function(){x&&x.onTransitionEnd()}))})):x.velocity?(x.updateProgress(m),x.setWrapperTransition(p),x.setWrapperTranslate(m),x.onTransitionStart(),x.animating||(x.animating=!0,x.wrapper.transitionEnd(function(){x&&x.onTransitionEnd()}))):x.updateProgress(m),x.updateActiveIndex()}return void((!x.params.freeModeMomentum||s>=x.params.longSwipesMs)&&(x.updateProgress(),x.updateActiveIndex()))}var f,w=0,y=x.slidesSizesGrid[0];for(f=0;f<x.slidesGrid.length;f+=x.params.slidesPerGroup)void 0!==x.slidesGrid[f+x.params.slidesPerGroup]?r>=x.slidesGrid[f]&&r<x.slidesGrid[f+x.params.slidesPerGroup]&&(w=f,y=x.slidesGrid[f+x.params.slidesPerGroup]-x.slidesGrid[f]):r>=x.slidesGrid[f]&&(w=f,y=x.slidesGrid[x.slidesGrid.length-1]-x.slidesGrid[x.slidesGrid.length-2]);var T=(r-x.slidesGrid[w])/y;if(s>x.params.longSwipesMs){if(!x.params.longSwipes)return void x.slideTo(x.activeIndex);"next"===x.swipeDirection&&(T>=x.params.longSwipesRatio?x.slideTo(w+x.params.slidesPerGroup):x.slideTo(w)),"prev"===x.swipeDirection&&(T>1-x.params.longSwipesRatio?x.slideTo(w+x.params.slidesPerGroup):x.slideTo(w))}else{if(!x.params.shortSwipes)return void x.slideTo(x.activeIndex);"next"===x.swipeDirection&&x.slideTo(w+x.params.slidesPerGroup),"prev"===x.swipeDirection&&x.slideTo(w)}}},x._slideTo=function(e,a){return x.slideTo(e,a,!0,!0)},x.slideTo=function(e,a,t,s){void 0===t&&(t=!0),void 0===e&&(e=0),e<0&&(e=0),x.snapIndex=Math.floor(e/x.params.slidesPerGroup),x.snapIndex>=x.snapGrid.length&&(x.snapIndex=x.snapGrid.length-1);var r=-x.snapGrid[x.snapIndex];if(x.params.autoplay&&x.autoplaying&&(s||!x.params.autoplayDisableOnInteraction?x.pauseAutoplay(a):x.stopAutoplay()),x.updateProgress(r),x.params.normalizeSlideIndex)for(var i=0;i<x.slidesGrid.length;i++)-Math.floor(100*r)>=Math.floor(100*x.slidesGrid[i])&&(e=i);return!(!x.params.allowSwipeToNext&&r<x.translate&&r<x.minTranslate())&&(!(!x.params.allowSwipeToPrev&&r>x.translate&&r>x.maxTranslate()&&(x.activeIndex||0)!==e)&&(void 0===a&&(a=x.params.speed),x.previousIndex=x.activeIndex||0,x.activeIndex=e,x.updateRealIndex(),x.rtl&&-r===x.translate||!x.rtl&&r===x.translate?(x.params.autoHeight&&x.updateAutoHeight(),x.updateClasses(),"slide"!==x.params.effect&&x.setWrapperTranslate(r),!1):(x.updateClasses(),x.onTransitionStart(t),0===a||x.browser.lteIE9?(x.setWrapperTranslate(r),x.setWrapperTransition(0),x.onTransitionEnd(t)):(x.setWrapperTranslate(r),x.setWrapperTransition(a),x.animating||(x.animating=!0,x.wrapper.transitionEnd(function(){x&&x.onTransitionEnd(t)}))),!0)))},x.onTransitionStart=function(e){void 0===e&&(e=!0),x.params.autoHeight&&x.updateAutoHeight(),x.lazy&&x.lazy.onTransitionStart(),e&&(x.emit("onTransitionStart",x),x.activeIndex!==x.previousIndex&&(x.emit("onSlideChangeStart",x),x.activeIndex>x.previousIndex?x.emit("onSlideNextStart",x):x.emit("onSlidePrevStart",x)))},x.onTransitionEnd=function(e){x.animating=!1,x.setWrapperTransition(0),void 0===e&&(e=!0),x.lazy&&x.lazy.onTransitionEnd(),e&&(x.emit("onTransitionEnd",x),x.activeIndex!==x.previousIndex&&(x.emit("onSlideChangeEnd",x),x.activeIndex>x.previousIndex?x.emit("onSlideNextEnd",x):x.emit("onSlidePrevEnd",x))),x.params.history&&x.history&&x.history.setHistory(x.params.history,x.activeIndex),x.params.hashnav&&x.hashnav&&x.hashnav.setHash()},x.slideNext=function(e,a,t){if(x.params.loop){if(x.animating)return!1;x.fixLoop();x.container[0].clientLeft;return x.slideTo(x.activeIndex+x.params.slidesPerGroup,a,e,t)}return x.slideTo(x.activeIndex+x.params.slidesPerGroup,a,e,t)},x._slideNext=function(e){return x.slideNext(!0,e,!0)},x.slidePrev=function(e,a,t){if(x.params.loop){if(x.animating)return!1;x.fixLoop();x.container[0].clientLeft;return x.slideTo(x.activeIndex-1,a,e,t)}return x.slideTo(x.activeIndex-1,a,e,t)},x._slidePrev=function(e){return x.slidePrev(!0,e,!0)},x.slideReset=function(e,a,t){return x.slideTo(x.activeIndex,a,e)},x.disableTouchControl=function(){return x.params.onlyExternal=!0,!0},x.enableTouchControl=function(){return x.params.onlyExternal=!1,!0},x.setWrapperTransition=function(e,a){x.wrapper.transition(e),"slide"!==x.params.effect&&x.effects[x.params.effect]&&x.effects[x.params.effect].setTransition(e),x.params.parallax&&x.parallax&&x.parallax.setTransition(e),x.params.scrollbar&&x.scrollbar&&x.scrollbar.setTransition(e),x.params.control&&x.controller&&x.controller.setTransition(e,a),x.emit("onSetTransition",x,e)},x.setWrapperTranslate=function(e,a,t){var s=0,i=0;x.isHorizontal()?s=x.rtl?-e:e:i=e,x.params.roundLengths&&(s=r(s),i=r(i)),x.params.virtualTranslate||(x.support.transforms3d?x.wrapper.transform("translate3d("+s+"px, "+i+"px, 0px)"):x.wrapper.transform("translate("+s+"px, "+i+"px)")),x.translate=x.isHorizontal()?s:i;var n,o=x.maxTranslate()-x.minTranslate();n=0===o?0:(e-x.minTranslate())/o,n!==x.progress&&x.updateProgress(e),a&&x.updateActiveIndex(),"slide"!==x.params.effect&&x.effects[x.params.effect]&&x.effects[x.params.effect].setTranslate(x.translate),x.params.parallax&&x.parallax&&x.parallax.setTranslate(x.translate),x.params.scrollbar&&x.scrollbar&&x.scrollbar.setTranslate(x.translate),x.params.control&&x.controller&&x.controller.setTranslate(x.translate,t),x.emit("onSetTranslate",x,x.translate)},x.getTranslate=function(e,a){var t,s,r,i;return void 0===a&&(a="x"),x.params.virtualTranslate?x.rtl?-x.translate:x.translate:(r=window.getComputedStyle(e,null),window.WebKitCSSMatrix?(s=r.transform||r.webkitTransform,s.split(",").length>6&&(s=s.split(", ").map(function(e){return e.replace(",",".")}).join(", ")),i=new window.WebKitCSSMatrix("none"===s?"":s)):(i=r.MozTransform||r.OTransform||r.MsTransform||r.msTransform||r.transform||r.getPropertyValue("transform").replace("translate(","matrix(1, 0, 0, 1,"),t=i.toString().split(",")),"x"===a&&(s=window.WebKitCSSMatrix?i.m41:16===t.length?parseFloat(t[12]):parseFloat(t[4])),"y"===a&&(s=window.WebKitCSSMatrix?i.m42:16===t.length?parseFloat(t[13]):parseFloat(t[5])),x.rtl&&s&&(s=-s),s||0)},x.getWrapperTranslate=function(e){return void 0===e&&(e=x.isHorizontal()?"x":"y"),x.getTranslate(x.wrapper[0],e)},x.observers=[],x.initObservers=function(){if(x.params.observeParents)for(var e=x.container.parents(),a=0;a<e.length;a++)o(e[a]);o(x.container[0],{childList:!1}),o(x.wrapper[0],{attributes:!1})},x.disconnectObservers=function(){for(var e=0;e<x.observers.length;e++)x.observers[e].disconnect();x.observers=[]},x.createLoop=function(){x.wrapper.children("."+x.params.slideClass+"."+x.params.slideDuplicateClass).remove();var a=x.wrapper.children("."+x.params.slideClass);"auto"!==x.params.slidesPerView||x.params.loopedSlides||(x.params.loopedSlides=a.length),x.loopedSlides=parseInt(x.params.loopedSlides||x.params.slidesPerView,10),x.loopedSlides=x.loopedSlides+x.params.loopAdditionalSlides,x.loopedSlides>a.length&&(x.loopedSlides=a.length);var t,s=[],r=[];for(a.each(function(t,i){var n=e(this);t<x.loopedSlides&&r.push(i),t<a.length&&t>=a.length-x.loopedSlides&&s.push(i),n.attr("data-swiper-slide-index",t)}),t=0;t<r.length;t++)x.wrapper.append(e(r[t].cloneNode(!0)).addClass(x.params.slideDuplicateClass));for(t=s.length-1;t>=0;t--)x.wrapper.prepend(e(s[t].cloneNode(!0)).addClass(x.params.slideDuplicateClass))},x.destroyLoop=function(){x.wrapper.children("."+x.params.slideClass+"."+x.params.slideDuplicateClass).remove(),x.slides.removeAttr("data-swiper-slide-index")},x.reLoop=function(e){var a=x.activeIndex-x.loopedSlides;x.destroyLoop(),x.createLoop(),x.updateSlidesSize(),e&&x.slideTo(a+x.loopedSlides,0,!1)},x.fixLoop=function(){var e;x.activeIndex<x.loopedSlides?(e=x.slides.length-3*x.loopedSlides+x.activeIndex,e+=x.loopedSlides,x.slideTo(e,0,!1,!0)):("auto"===x.params.slidesPerView&&x.activeIndex>=2*x.loopedSlides||x.activeIndex>x.slides.length-2*x.params.slidesPerView)&&(e=-x.slides.length+x.activeIndex+x.loopedSlides,e+=x.loopedSlides,x.slideTo(e,0,!1,!0))},x.appendSlide=function(e){if(x.params.loop&&x.destroyLoop(),"object"==typeof e&&e.length)for(var a=0;a<e.length;a++)e[a]&&x.wrapper.append(e[a]);else x.wrapper.append(e);x.params.loop&&x.createLoop(),x.params.observer&&x.support.observer||x.update(!0)},x.prependSlide=function(e){x.params.loop&&x.destroyLoop();var a=x.activeIndex+1;if("object"==typeof e&&e.length){for(var t=0;t<e.length;t++)e[t]&&x.wrapper.prepend(e[t]);a=x.activeIndex+e.length}else x.wrapper.prepend(e);x.params.loop&&x.createLoop(),x.params.observer&&x.support.observer||x.update(!0),x.slideTo(a,0,!1)},x.removeSlide=function(e){x.params.loop&&(x.destroyLoop(),x.slides=x.wrapper.children("."+x.params.slideClass));var a,t=x.activeIndex;if("object"==typeof e&&e.length){for(var s=0;s<e.length;s++)a=e[s],x.slides[a]&&x.slides.eq(a).remove(),a<t&&t--;t=Math.max(t,0)}else a=e,x.slides[a]&&x.slides.eq(a).remove(),a<t&&t--,t=Math.max(t,0);x.params.loop&&x.createLoop(),x.params.observer&&x.support.observer||x.update(!0),x.params.loop?x.slideTo(t+x.loopedSlides,0,!1):x.slideTo(t,0,!1)},x.removeAllSlides=function(){for(var e=[],a=0;a<x.slides.length;a++)e.push(a);x.removeSlide(e)},x.effects={fade:{setTranslate:function(){for(var e=0;e<x.slides.length;e++){var a=x.slides.eq(e),t=a[0].swiperSlideOffset,s=-t;x.params.virtualTranslate||(s-=x.translate);var r=0;x.isHorizontal()||(r=s,s=0);var i=x.params.fade.crossFade?Math.max(1-Math.abs(a[0].progress),0):1+Math.min(Math.max(a[0].progress,-1),0);a.css({opacity:i}).transform("translate3d("+s+"px, "+r+"px, 0px)")}},setTransition:function(e){if(x.slides.transition(e),x.params.virtualTranslate&&0!==e){var a=!1;x.slides.transitionEnd(function(){if(!a&&x){a=!0,x.animating=!1;for(var e=["webkitTransitionEnd","transitionend","oTransitionEnd","MSTransitionEnd","msTransitionEnd"],t=0;t<e.length;t++)x.wrapper.trigger(e[t])}})}}},flip:{setTranslate:function(){for(var a=0;a<x.slides.length;a++){var t=x.slides.eq(a),s=t[0].progress;x.params.flip.limitRotation&&(s=Math.max(Math.min(t[0].progress,1),-1));var r=t[0].swiperSlideOffset,i=-180*s,n=i,o=0,l=-r,p=0;if(x.isHorizontal()?x.rtl&&(n=-n):(p=l,l=0,o=-n,n=0),t[0].style.zIndex=-Math.abs(Math.round(s))+x.slides.length,x.params.flip.slideShadows){var d=x.isHorizontal()?t.find(".swiper-slide-shadow-left"):t.find(".swiper-slide-shadow-top"),m=x.isHorizontal()?t.find(".swiper-slide-shadow-right"):t.find(".swiper-slide-shadow-bottom");0===d.length&&(d=e('<div class="swiper-slide-shadow-'+(x.isHorizontal()?"left":"top")+'"></div>'),t.append(d)),0===m.length&&(m=e('<div class="swiper-slide-shadow-'+(x.isHorizontal()?"right":"bottom")+'"></div>'),t.append(m)),d.length&&(d[0].style.opacity=Math.max(-s,0)),m.length&&(m[0].style.opacity=Math.max(s,0))}t.transform("translate3d("+l+"px, "+p+"px, 0px) rotateX("+o+"deg) rotateY("+n+"deg)")}},setTransition:function(a){if(x.slides.transition(a).find(".swiper-slide-shadow-top, .swiper-slide-shadow-right, .swiper-slide-shadow-bottom, .swiper-slide-shadow-left").transition(a),x.params.virtualTranslate&&0!==a){var t=!1;x.slides.eq(x.activeIndex).transitionEnd(function(){if(!t&&x&&e(this).hasClass(x.params.slideActiveClass)){t=!0,x.animating=!1;for(var a=["webkitTransitionEnd","transitionend","oTransitionEnd","MSTransitionEnd","msTransitionEnd"],s=0;s<a.length;s++)x.wrapper.trigger(a[s])}})}}},cube:{setTranslate:function(){var a,t=0;x.params.cube.shadow&&(x.isHorizontal()?(a=x.wrapper.find(".swiper-cube-shadow"),0===a.length&&(a=e('<div class="swiper-cube-shadow"></div>'),x.wrapper.append(a)),a.css({height:x.width+"px"})):(a=x.container.find(".swiper-cube-shadow"),0===a.length&&(a=e('<div class="swiper-cube-shadow"></div>'),x.container.append(a))));for(var s=0;s<x.slides.length;s++){var r=x.slides.eq(s),i=90*s,n=Math.floor(i/360);x.rtl&&(i=-i,n=Math.floor(-i/360));var o=Math.max(Math.min(r[0].progress,1),-1),l=0,p=0,d=0;s%4==0?(l=4*-n*x.size,d=0):(s-1)%4==0?(l=0,d=4*-n*x.size):(s-2)%4==0?(l=x.size+4*n*x.size,d=x.size):(s-3)%4==0&&(l=-x.size,d=3*x.size+4*x.size*n),x.rtl&&(l=-l),x.isHorizontal()||(p=l,l=0);var m="rotateX("+(x.isHorizontal()?0:-i)+"deg) rotateY("+(x.isHorizontal()?i:0)+"deg) translate3d("+l+"px, "+p+"px, "+d+"px)";if(o<=1&&o>-1&&(t=90*s+90*o,x.rtl&&(t=90*-s-90*o)),r.transform(m),x.params.cube.slideShadows){var u=x.isHorizontal()?r.find(".swiper-slide-shadow-left"):r.find(".swiper-slide-shadow-top"),c=x.isHorizontal()?r.find(".swiper-slide-shadow-right"):r.find(".swiper-slide-shadow-bottom");0===u.length&&(u=e('<div class="swiper-slide-shadow-'+(x.isHorizontal()?"left":"top")+'"></div>'),r.append(u)),0===c.length&&(c=e('<div class="swiper-slide-shadow-'+(x.isHorizontal()?"right":"bottom")+'"></div>'),r.append(c)),u.length&&(u[0].style.opacity=Math.max(-o,0)),c.length&&(c[0].style.opacity=Math.max(o,0))}}if(x.wrapper.css({"-webkit-transform-origin":"50% 50% -"+x.size/2+"px","-moz-transform-origin":"50% 50% -"+x.size/2+"px","-ms-transform-origin":"50% 50% -"+x.size/2+"px","transform-origin":"50% 50% -"+x.size/2+"px"}),x.params.cube.shadow)if(x.isHorizontal())a.transform("translate3d(0px, "+(x.width/2+x.params.cube.shadowOffset)+"px, "+-x.width/2+"px) rotateX(90deg) rotateZ(0deg) scale("+x.params.cube.shadowScale+")");else{var g=Math.abs(t)-90*Math.floor(Math.abs(t)/90),h=1.5-(Math.sin(2*g*Math.PI/360)/2+Math.cos(2*g*Math.PI/360)/2),v=x.params.cube.shadowScale,f=x.params.cube.shadowScale/h,w=x.params.cube.shadowOffset;a.transform("scale3d("+v+", 1, "+f+") translate3d(0px, "+(x.height/2+w)+"px, "+-x.height/2/f+"px) rotateX(-90deg)")}var y=x.isSafari||x.isUiWebView?-x.size/2:0;x.wrapper.transform("translate3d(0px,0,"+y+"px) rotateX("+(x.isHorizontal()?0:t)+"deg) rotateY("+(x.isHorizontal()?-t:0)+"deg)")},setTransition:function(e){x.slides.transition(e).find(".swiper-slide-shadow-top, .swiper-slide-shadow-right, .swiper-slide-shadow-bottom, .swiper-slide-shadow-left").transition(e),x.params.cube.shadow&&!x.isHorizontal()&&x.container.find(".swiper-cube-shadow").transition(e)}},coverflow:{setTranslate:function(){for(var a=x.translate,t=x.isHorizontal()?-a+x.width/2:-a+x.height/2,s=x.isHorizontal()?x.params.coverflow.rotate:-x.params.coverflow.rotate,r=x.params.coverflow.depth,i=0,n=x.slides.length;i<n;i++){var o=x.slides.eq(i),l=x.slidesSizesGrid[i],p=o[0].swiperSlideOffset,d=(t-p-l/2)/l*x.params.coverflow.modifier,m=x.isHorizontal()?s*d:0,u=x.isHorizontal()?0:s*d,c=-r*Math.abs(d),g=x.isHorizontal()?0:x.params.coverflow.stretch*d,h=x.isHorizontal()?x.params.coverflow.stretch*d:0;Math.abs(h)<.001&&(h=0),Math.abs(g)<.001&&(g=0),Math.abs(c)<.001&&(c=0),Math.abs(m)<.001&&(m=0),Math.abs(u)<.001&&(u=0);var v="translate3d("+h+"px,"+g+"px,"+c+"px)  rotateX("+u+"deg) rotateY("+m+"deg)";if(o.transform(v),o[0].style.zIndex=1-Math.abs(Math.round(d)),x.params.coverflow.slideShadows){var f=x.isHorizontal()?o.find(".swiper-slide-shadow-left"):o.find(".swiper-slide-shadow-top"),w=x.isHorizontal()?o.find(".swiper-slide-shadow-right"):o.find(".swiper-slide-shadow-bottom");0===f.length&&(f=e('<div class="swiper-slide-shadow-'+(x.isHorizontal()?"left":"top")+'"></div>'),o.append(f)),0===w.length&&(w=e('<div class="swiper-slide-shadow-'+(x.isHorizontal()?"right":"bottom")+'"></div>'),o.append(w)),f.length&&(f[0].style.opacity=d>0?d:0),w.length&&(w[0].style.opacity=-d>0?-d:0)}}if(x.browser.ie){x.wrapper[0].style.perspectiveOrigin=t+"px 50%"}},setTransition:function(e){x.slides.transition(e).find(".swiper-slide-shadow-top, .swiper-slide-shadow-right, .swiper-slide-shadow-bottom, .swiper-slide-shadow-left").transition(e)}}},x.lazy={initialImageLoaded:!1,loadImageInSlide:function(a,t){if(void 0!==a&&(void 0===t&&(t=!0),0!==x.slides.length)){var s=x.slides.eq(a),r=s.find("."+x.params.lazyLoadingClass+":not(."+x.params.lazyStatusLoadedClass+"):not(."+x.params.lazyStatusLoadingClass+")");!s.hasClass(x.params.lazyLoadingClass)||s.hasClass(x.params.lazyStatusLoadedClass)||s.hasClass(x.params.lazyStatusLoadingClass)||(r=r.add(s[0])),0!==r.length&&r.each(function(){var a=e(this);a.addClass(x.params.lazyStatusLoadingClass);var r=a.attr("data-background"),i=a.attr("data-src"),n=a.attr("data-srcset"),o=a.attr("data-sizes");x.loadImage(a[0],i||r,n,o,!1,function(){if(void 0!==x&&null!==x&&x){if(r?(a.css("background-image",'url("'+r+'")'),a.removeAttr("data-background")):(n&&(a.attr("srcset",n),a.removeAttr("data-srcset")),o&&(a.attr("sizes",o),a.removeAttr("data-sizes")),i&&(a.attr("src",i),a.removeAttr("data-src"))),a.addClass(x.params.lazyStatusLoadedClass).removeClass(x.params.lazyStatusLoadingClass),s.find("."+x.params.lazyPreloaderClass+", ."+x.params.preloaderClass).remove(),x.params.loop&&t){var e=s.attr("data-swiper-slide-index");if(s.hasClass(x.params.slideDuplicateClass)){var l=x.wrapper.children('[data-swiper-slide-index="'+e+'"]:not(.'+x.params.slideDuplicateClass+")");x.lazy.loadImageInSlide(l.index(),!1)}else{var p=x.wrapper.children("."+x.params.slideDuplicateClass+'[data-swiper-slide-index="'+e+'"]');x.lazy.loadImageInSlide(p.index(),!1)}}x.emit("onLazyImageReady",x,s[0],a[0])}}),x.emit("onLazyImageLoad",x,s[0],a[0])})}},load:function(){var a,t=x.params.slidesPerView;if("auto"===t&&(t=0),x.lazy.initialImageLoaded||(x.lazy.initialImageLoaded=!0),x.params.watchSlidesVisibility)x.wrapper.children("."+x.params.slideVisibleClass).each(function(){x.lazy.loadImageInSlide(e(this).index())});else if(t>1)for(a=x.activeIndex;a<x.activeIndex+t;a++)x.slides[a]&&x.lazy.loadImageInSlide(a);else x.lazy.loadImageInSlide(x.activeIndex);if(x.params.lazyLoadingInPrevNext)if(t>1||x.params.lazyLoadingInPrevNextAmount&&x.params.lazyLoadingInPrevNextAmount>1){var s=x.params.lazyLoadingInPrevNextAmount,r=t,i=Math.min(x.activeIndex+r+Math.max(s,r),x.slides.length),n=Math.max(x.activeIndex-Math.max(r,s),0);for(a=x.activeIndex+t;a<i;a++)x.slides[a]&&x.lazy.loadImageInSlide(a);for(a=n;a<x.activeIndex;a++)x.slides[a]&&x.lazy.loadImageInSlide(a)}else{var o=x.wrapper.children("."+x.params.slideNextClass);o.length>0&&x.lazy.loadImageInSlide(o.index());var l=x.wrapper.children("."+x.params.slidePrevClass);l.length>0&&x.lazy.loadImageInSlide(l.index())}},onTransitionStart:function(){x.params.lazyLoading&&(x.params.lazyLoadingOnTransitionStart||!x.params.lazyLoadingOnTransitionStart&&!x.lazy.initialImageLoaded)&&x.lazy.load()},onTransitionEnd:function(){x.params.lazyLoading&&!x.params.lazyLoadingOnTransitionStart&&x.lazy.load()}},x.scrollbar={isTouched:!1,setDragPosition:function(e){var a=x.scrollbar,t=x.isHorizontal()?"touchstart"===e.type||"touchmove"===e.type?e.targetTouches[0].pageX:e.pageX||e.clientX:"touchstart"===e.type||"touchmove"===e.type?e.targetTouches[0].pageY:e.pageY||e.clientY,s=t-a.track.offset()[x.isHorizontal()?"left":"top"]-a.dragSize/2,r=-x.minTranslate()*a.moveDivider,i=-x.maxTranslate()*a.moveDivider;s<r?s=r:s>i&&(s=i),s=-s/a.moveDivider,x.updateProgress(s),x.setWrapperTranslate(s,!0)},dragStart:function(e){var a=x.scrollbar;a.isTouched=!0,e.preventDefault(),e.stopPropagation(),a.setDragPosition(e),clearTimeout(a.dragTimeout),a.track.transition(0),x.params.scrollbarHide&&a.track.css("opacity",1),x.wrapper.transition(100),a.drag.transition(100),x.emit("onScrollbarDragStart",x)},dragMove:function(e){var a=x.scrollbar;a.isTouched&&(e.preventDefault?e.preventDefault():e.returnValue=!1,a.setDragPosition(e),x.wrapper.transition(0),a.track.transition(0),a.drag.transition(0),x.emit("onScrollbarDragMove",x))},dragEnd:function(e){var a=x.scrollbar;a.isTouched&&(a.isTouched=!1,x.params.scrollbarHide&&(clearTimeout(a.dragTimeout),a.dragTimeout=setTimeout(function(){a.track.css("opacity",0),a.track.transition(400)},1e3)),x.emit("onScrollbarDragEnd",x),x.params.scrollbarSnapOnRelease&&x.slideReset())},draggableEvents:function(){return x.params.simulateTouch!==!1||x.support.touch?x.touchEvents:x.touchEventsDesktop}(),enableDraggable:function(){var a=x.scrollbar,t=x.support.touch?a.track:document;e(a.track).on(a.draggableEvents.start,a.dragStart),e(t).on(a.draggableEvents.move,a.dragMove),e(t).on(a.draggableEvents.end,a.dragEnd)},disableDraggable:function(){var a=x.scrollbar,t=x.support.touch?a.track:document;e(a.track).off(a.draggableEvents.start,a.dragStart),e(t).off(a.draggableEvents.move,a.dragMove),e(t).off(a.draggableEvents.end,a.dragEnd)},set:function(){if(x.params.scrollbar){var a=x.scrollbar;a.track=e(x.params.scrollbar),x.params.uniqueNavElements&&"string"==typeof x.params.scrollbar&&a.track.length>1&&1===x.container.find(x.params.scrollbar).length&&(a.track=x.container.find(x.params.scrollbar)),a.drag=a.track.find(".swiper-scrollbar-drag"),0===a.drag.length&&(a.drag=e('<div class="swiper-scrollbar-drag"></div>'),a.track.append(a.drag)),a.drag[0].style.width="",a.drag[0].style.height="",a.trackSize=x.isHorizontal()?a.track[0].offsetWidth:a.track[0].offsetHeight,a.divider=x.size/x.virtualSize,a.moveDivider=a.divider*(a.trackSize/x.size),a.dragSize=a.trackSize*a.divider,x.isHorizontal()?a.drag[0].style.width=a.dragSize+"px":a.drag[0].style.height=a.dragSize+"px",a.divider>=1?a.track[0].style.display="none":a.track[0].style.display="",x.params.scrollbarHide&&(a.track[0].style.opacity=0)}},setTranslate:function(){if(x.params.scrollbar){var e,a=x.scrollbar,t=(x.translate,a.dragSize);e=(a.trackSize-a.dragSize)*x.progress,x.rtl&&x.isHorizontal()?(e=-e,e>0?(t=a.dragSize-e,e=0):-e+a.dragSize>a.trackSize&&(t=a.trackSize+e)):e<0?(t=a.dragSize+e,e=0):e+a.dragSize>a.trackSize&&(t=a.trackSize-e),x.isHorizontal()?(x.support.transforms3d?a.drag.transform("translate3d("+e+"px, 0, 0)"):a.drag.transform("translateX("+e+"px)"),a.drag[0].style.width=t+"px"):(x.support.transforms3d?a.drag.transform("translate3d(0px, "+e+"px, 0)"):a.drag.transform("translateY("+e+"px)"),a.drag[0].style.height=t+"px"),x.params.scrollbarHide&&(clearTimeout(a.timeout),a.track[0].style.opacity=1,a.timeout=setTimeout(function(){a.track[0].style.opacity=0,a.track.transition(400)},1e3))}},setTransition:function(e){x.params.scrollbar&&x.scrollbar.drag.transition(e)}},x.controller={LinearSpline:function(e,a){var t=function(){var e,a,t;return function(s,r){for(a=-1,e=s.length;e-a>1;)s[t=e+a>>1]<=r?a=t:e=t;return e}}();this.x=e,this.y=a,this.lastIndex=e.length-1;var s,r;this.x.length;this.interpolate=function(e){return e?(r=t(this.x,e),s=r-1,(e-this.x[s])*(this.y[r]-this.y[s])/(this.x[r]-this.x[s])+this.y[s]):0}},getInterpolateFunction:function(e){x.controller.spline||(x.controller.spline=x.params.loop?new x.controller.LinearSpline(x.slidesGrid,e.slidesGrid):new x.controller.LinearSpline(x.snapGrid,e.snapGrid))},setTranslate:function(e,t){function s(a){e=a.rtl&&"horizontal"===a.params.direction?-x.translate:x.translate,"slide"===x.params.controlBy&&(x.controller.getInterpolateFunction(a),i=-x.controller.spline.interpolate(-e)),i&&"container"!==x.params.controlBy||(r=(a.maxTranslate()-a.minTranslate())/(x.maxTranslate()-x.minTranslate()),i=(e-x.minTranslate())*r+a.minTranslate()),x.params.controlInverse&&(i=a.maxTranslate()-i),a.updateProgress(i),a.setWrapperTranslate(i,!1,x),a.updateActiveIndex()}var r,i,n=x.params.control;if(Array.isArray(n))for(var o=0;o<n.length;o++)n[o]!==t&&n[o]instanceof a&&s(n[o]);else n instanceof a&&t!==n&&s(n)},setTransition:function(e,t){function s(a){a.setWrapperTransition(e,x),0!==e&&(a.onTransitionStart(),a.wrapper.transitionEnd(function(){i&&(a.params.loop&&"slide"===x.params.controlBy&&a.fixLoop(),a.onTransitionEnd())}))}var r,i=x.params.control;if(Array.isArray(i))for(r=0;r<i.length;r++)i[r]!==t&&i[r]instanceof a&&s(i[r]);else i instanceof a&&t!==i&&s(i)}},x.hashnav={onHashCange:function(e,a){var t=document.location.hash.replace("#","");t!==x.slides.eq(x.activeIndex).attr("data-hash")&&x.slideTo(x.wrapper.children("."+x.params.slideClass+'[data-hash="'+t+'"]').index())},attachEvents:function(a){var t=a?"off":"on";e(window)[t]("hashchange",x.hashnav.onHashCange)},setHash:function(){
+if(x.hashnav.initialized&&x.params.hashnav)if(x.params.replaceState&&window.history&&window.history.replaceState)window.history.replaceState(null,null,"#"+x.slides.eq(x.activeIndex).attr("data-hash")||"");else{var e=x.slides.eq(x.activeIndex),a=e.attr("data-hash")||e.attr("data-history");document.location.hash=a||""}},init:function(){if(x.params.hashnav&&!x.params.history){x.hashnav.initialized=!0;var e=document.location.hash.replace("#","");if(e)for(var a=0,t=x.slides.length;a<t;a++){var s=x.slides.eq(a),r=s.attr("data-hash")||s.attr("data-history");if(r===e&&!s.hasClass(x.params.slideDuplicateClass)){var i=s.index();x.slideTo(i,0,x.params.runCallbacksOnInit,!0)}}x.params.hashnavWatchState&&x.hashnav.attachEvents()}},destroy:function(){x.params.hashnavWatchState&&x.hashnav.attachEvents(!0)}},x.history={init:function(){if(x.params.history){if(!window.history||!window.history.pushState)return x.params.history=!1,void(x.params.hashnav=!0);x.history.initialized=!0,this.paths=this.getPathValues(),(this.paths.key||this.paths.value)&&(this.scrollToSlide(0,this.paths.value,x.params.runCallbacksOnInit),x.params.replaceState||window.addEventListener("popstate",this.setHistoryPopState))}},setHistoryPopState:function(){x.history.paths=x.history.getPathValues(),x.history.scrollToSlide(x.params.speed,x.history.paths.value,!1)},getPathValues:function(){var e=window.location.pathname.slice(1).split("/"),a=e.length;return{key:e[a-2],value:e[a-1]}},setHistory:function(e,a){if(x.history.initialized&&x.params.history){var t=x.slides.eq(a),s=this.slugify(t.attr("data-history"));window.location.pathname.includes(e)||(s=e+"/"+s),x.params.replaceState?window.history.replaceState(null,null,s):window.history.pushState(null,null,s)}},slugify:function(e){return e.toString().toLowerCase().replace(/\s+/g,"-").replace(/[^\w\-]+/g,"").replace(/\-\-+/g,"-").replace(/^-+/,"").replace(/-+$/,"")},scrollToSlide:function(e,a,t){if(a)for(var s=0,r=x.slides.length;s<r;s++){var i=x.slides.eq(s),n=this.slugify(i.attr("data-history"));if(n===a&&!i.hasClass(x.params.slideDuplicateClass)){var o=i.index();x.slideTo(o,e,t)}}else x.slideTo(0,e,t)}},x.disableKeyboardControl=function(){x.params.keyboardControl=!1,e(document).off("keydown",l)},x.enableKeyboardControl=function(){x.params.keyboardControl=!0,e(document).on("keydown",l)},x.mousewheel={event:!1,lastScrollTime:(new window.Date).getTime()},x.params.mousewheelControl&&(x.mousewheel.event=navigator.userAgent.indexOf("firefox")>-1?"DOMMouseScroll":function(){var e="onwheel"in document;if(!e){var a=document.createElement("div");a.setAttribute("onwheel","return;"),e="function"==typeof a.onwheel}return!e&&document.implementation&&document.implementation.hasFeature&&document.implementation.hasFeature("","")!==!0&&(e=document.implementation.hasFeature("Events.wheel","3.0")),e}()?"wheel":"mousewheel"),x.disableMousewheelControl=function(){if(!x.mousewheel.event)return!1;var a=x.container;return"container"!==x.params.mousewheelEventsTarged&&(a=e(x.params.mousewheelEventsTarged)),a.off(x.mousewheel.event,d),x.params.mousewheelControl=!1,!0},x.enableMousewheelControl=function(){if(!x.mousewheel.event)return!1;var a=x.container;return"container"!==x.params.mousewheelEventsTarged&&(a=e(x.params.mousewheelEventsTarged)),a.on(x.mousewheel.event,d),x.params.mousewheelControl=!0,!0},x.parallax={setTranslate:function(){x.container.children("[data-swiper-parallax], [data-swiper-parallax-x], [data-swiper-parallax-y]").each(function(){m(this,x.progress)}),x.slides.each(function(){var a=e(this);a.find("[data-swiper-parallax], [data-swiper-parallax-x], [data-swiper-parallax-y]").each(function(){m(this,Math.min(Math.max(a[0].progress,-1),1))})})},setTransition:function(a){void 0===a&&(a=x.params.speed),x.container.find("[data-swiper-parallax], [data-swiper-parallax-x], [data-swiper-parallax-y]").each(function(){var t=e(this),s=parseInt(t.attr("data-swiper-parallax-duration"),10)||a;0===a&&(s=0),t.transition(s)})}},x.zoom={scale:1,currentScale:1,isScaling:!1,gesture:{slide:void 0,slideWidth:void 0,slideHeight:void 0,image:void 0,imageWrap:void 0,zoomMax:x.params.zoomMax},image:{isTouched:void 0,isMoved:void 0,currentX:void 0,currentY:void 0,minX:void 0,minY:void 0,maxX:void 0,maxY:void 0,width:void 0,height:void 0,startX:void 0,startY:void 0,touchesStart:{},touchesCurrent:{}},velocity:{x:void 0,y:void 0,prevPositionX:void 0,prevPositionY:void 0,prevTime:void 0},getDistanceBetweenTouches:function(e){if(e.targetTouches.length<2)return 1;var a=e.targetTouches[0].pageX,t=e.targetTouches[0].pageY,s=e.targetTouches[1].pageX,r=e.targetTouches[1].pageY;return Math.sqrt(Math.pow(s-a,2)+Math.pow(r-t,2))},onGestureStart:function(a){var t=x.zoom;if(!x.support.gestures){if("touchstart"!==a.type||"touchstart"===a.type&&a.targetTouches.length<2)return;t.gesture.scaleStart=t.getDistanceBetweenTouches(a)}if(!(t.gesture.slide&&t.gesture.slide.length||(t.gesture.slide=e(this),0===t.gesture.slide.length&&(t.gesture.slide=x.slides.eq(x.activeIndex)),t.gesture.image=t.gesture.slide.find("img, svg, canvas"),t.gesture.imageWrap=t.gesture.image.parent("."+x.params.zoomContainerClass),t.gesture.zoomMax=t.gesture.imageWrap.attr("data-swiper-zoom")||x.params.zoomMax,0!==t.gesture.imageWrap.length)))return void(t.gesture.image=void 0);t.gesture.image.transition(0),t.isScaling=!0},onGestureChange:function(e){var a=x.zoom;if(!x.support.gestures){if("touchmove"!==e.type||"touchmove"===e.type&&e.targetTouches.length<2)return;a.gesture.scaleMove=a.getDistanceBetweenTouches(e)}a.gesture.image&&0!==a.gesture.image.length&&(x.support.gestures?a.scale=e.scale*a.currentScale:a.scale=a.gesture.scaleMove/a.gesture.scaleStart*a.currentScale,a.scale>a.gesture.zoomMax&&(a.scale=a.gesture.zoomMax-1+Math.pow(a.scale-a.gesture.zoomMax+1,.5)),a.scale<x.params.zoomMin&&(a.scale=x.params.zoomMin+1-Math.pow(x.params.zoomMin-a.scale+1,.5)),a.gesture.image.transform("translate3d(0,0,0) scale("+a.scale+")"))},onGestureEnd:function(e){var a=x.zoom;!x.support.gestures&&("touchend"!==e.type||"touchend"===e.type&&e.changedTouches.length<2)||a.gesture.image&&0!==a.gesture.image.length&&(a.scale=Math.max(Math.min(a.scale,a.gesture.zoomMax),x.params.zoomMin),a.gesture.image.transition(x.params.speed).transform("translate3d(0,0,0) scale("+a.scale+")"),a.currentScale=a.scale,a.isScaling=!1,1===a.scale&&(a.gesture.slide=void 0))},onTouchStart:function(e,a){var t=e.zoom;t.gesture.image&&0!==t.gesture.image.length&&(t.image.isTouched||("android"===e.device.os&&a.preventDefault(),t.image.isTouched=!0,t.image.touchesStart.x="touchstart"===a.type?a.targetTouches[0].pageX:a.pageX,t.image.touchesStart.y="touchstart"===a.type?a.targetTouches[0].pageY:a.pageY))},onTouchMove:function(e){var a=x.zoom;if(a.gesture.image&&0!==a.gesture.image.length&&(x.allowClick=!1,a.image.isTouched&&a.gesture.slide)){a.image.isMoved||(a.image.width=a.gesture.image[0].offsetWidth,a.image.height=a.gesture.image[0].offsetHeight,a.image.startX=x.getTranslate(a.gesture.imageWrap[0],"x")||0,a.image.startY=x.getTranslate(a.gesture.imageWrap[0],"y")||0,a.gesture.slideWidth=a.gesture.slide[0].offsetWidth,a.gesture.slideHeight=a.gesture.slide[0].offsetHeight,a.gesture.imageWrap.transition(0),x.rtl&&(a.image.startX=-a.image.startX),x.rtl&&(a.image.startY=-a.image.startY));var t=a.image.width*a.scale,s=a.image.height*a.scale;if(!(t<a.gesture.slideWidth&&s<a.gesture.slideHeight)){if(a.image.minX=Math.min(a.gesture.slideWidth/2-t/2,0),a.image.maxX=-a.image.minX,a.image.minY=Math.min(a.gesture.slideHeight/2-s/2,0),a.image.maxY=-a.image.minY,a.image.touchesCurrent.x="touchmove"===e.type?e.targetTouches[0].pageX:e.pageX,a.image.touchesCurrent.y="touchmove"===e.type?e.targetTouches[0].pageY:e.pageY,!a.image.isMoved&&!a.isScaling){if(x.isHorizontal()&&Math.floor(a.image.minX)===Math.floor(a.image.startX)&&a.image.touchesCurrent.x<a.image.touchesStart.x||Math.floor(a.image.maxX)===Math.floor(a.image.startX)&&a.image.touchesCurrent.x>a.image.touchesStart.x)return void(a.image.isTouched=!1);if(!x.isHorizontal()&&Math.floor(a.image.minY)===Math.floor(a.image.startY)&&a.image.touchesCurrent.y<a.image.touchesStart.y||Math.floor(a.image.maxY)===Math.floor(a.image.startY)&&a.image.touchesCurrent.y>a.image.touchesStart.y)return void(a.image.isTouched=!1)}e.preventDefault(),e.stopPropagation(),a.image.isMoved=!0,a.image.currentX=a.image.touchesCurrent.x-a.image.touchesStart.x+a.image.startX,a.image.currentY=a.image.touchesCurrent.y-a.image.touchesStart.y+a.image.startY,a.image.currentX<a.image.minX&&(a.image.currentX=a.image.minX+1-Math.pow(a.image.minX-a.image.currentX+1,.8)),a.image.currentX>a.image.maxX&&(a.image.currentX=a.image.maxX-1+Math.pow(a.image.currentX-a.image.maxX+1,.8)),a.image.currentY<a.image.minY&&(a.image.currentY=a.image.minY+1-Math.pow(a.image.minY-a.image.currentY+1,.8)),a.image.currentY>a.image.maxY&&(a.image.currentY=a.image.maxY-1+Math.pow(a.image.currentY-a.image.maxY+1,.8)),a.velocity.prevPositionX||(a.velocity.prevPositionX=a.image.touchesCurrent.x),a.velocity.prevPositionY||(a.velocity.prevPositionY=a.image.touchesCurrent.y),a.velocity.prevTime||(a.velocity.prevTime=Date.now()),a.velocity.x=(a.image.touchesCurrent.x-a.velocity.prevPositionX)/(Date.now()-a.velocity.prevTime)/2,a.velocity.y=(a.image.touchesCurrent.y-a.velocity.prevPositionY)/(Date.now()-a.velocity.prevTime)/2,Math.abs(a.image.touchesCurrent.x-a.velocity.prevPositionX)<2&&(a.velocity.x=0),Math.abs(a.image.touchesCurrent.y-a.velocity.prevPositionY)<2&&(a.velocity.y=0),a.velocity.prevPositionX=a.image.touchesCurrent.x,a.velocity.prevPositionY=a.image.touchesCurrent.y,a.velocity.prevTime=Date.now(),a.gesture.imageWrap.transform("translate3d("+a.image.currentX+"px, "+a.image.currentY+"px,0)")}}},onTouchEnd:function(e,a){var t=e.zoom;if(t.gesture.image&&0!==t.gesture.image.length){if(!t.image.isTouched||!t.image.isMoved)return t.image.isTouched=!1,void(t.image.isMoved=!1);t.image.isTouched=!1,t.image.isMoved=!1;var s=300,r=300,i=t.velocity.x*s,n=t.image.currentX+i,o=t.velocity.y*r,l=t.image.currentY+o;0!==t.velocity.x&&(s=Math.abs((n-t.image.currentX)/t.velocity.x)),0!==t.velocity.y&&(r=Math.abs((l-t.image.currentY)/t.velocity.y));var p=Math.max(s,r);t.image.currentX=n,t.image.currentY=l;var d=t.image.width*t.scale,m=t.image.height*t.scale;t.image.minX=Math.min(t.gesture.slideWidth/2-d/2,0),t.image.maxX=-t.image.minX,t.image.minY=Math.min(t.gesture.slideHeight/2-m/2,0),t.image.maxY=-t.image.minY,t.image.currentX=Math.max(Math.min(t.image.currentX,t.image.maxX),t.image.minX),t.image.currentY=Math.max(Math.min(t.image.currentY,t.image.maxY),t.image.minY),t.gesture.imageWrap.transition(p).transform("translate3d("+t.image.currentX+"px, "+t.image.currentY+"px,0)")}},onTransitionEnd:function(e){var a=e.zoom;a.gesture.slide&&e.previousIndex!==e.activeIndex&&(a.gesture.image.transform("translate3d(0,0,0) scale(1)"),a.gesture.imageWrap.transform("translate3d(0,0,0)"),a.gesture.slide=a.gesture.image=a.gesture.imageWrap=void 0,a.scale=a.currentScale=1)},toggleZoom:function(a,t){var s=a.zoom;if(s.gesture.slide||(s.gesture.slide=a.clickedSlide?e(a.clickedSlide):a.slides.eq(a.activeIndex),s.gesture.image=s.gesture.slide.find("img, svg, canvas"),s.gesture.imageWrap=s.gesture.image.parent("."+a.params.zoomContainerClass)),s.gesture.image&&0!==s.gesture.image.length){var r,i,n,o,l,p,d,m,u,c,g,h,v,f,w,y,x,T;void 0===s.image.touchesStart.x&&t?(r="touchend"===t.type?t.changedTouches[0].pageX:t.pageX,i="touchend"===t.type?t.changedTouches[0].pageY:t.pageY):(r=s.image.touchesStart.x,i=s.image.touchesStart.y),s.scale&&1!==s.scale?(s.scale=s.currentScale=1,s.gesture.imageWrap.transition(300).transform("translate3d(0,0,0)"),s.gesture.image.transition(300).transform("translate3d(0,0,0) scale(1)"),s.gesture.slide=void 0):(s.scale=s.currentScale=s.gesture.imageWrap.attr("data-swiper-zoom")||a.params.zoomMax,t?(x=s.gesture.slide[0].offsetWidth,T=s.gesture.slide[0].offsetHeight,n=s.gesture.slide.offset().left,o=s.gesture.slide.offset().top,l=n+x/2-r,p=o+T/2-i,u=s.gesture.image[0].offsetWidth,c=s.gesture.image[0].offsetHeight,g=u*s.scale,h=c*s.scale,v=Math.min(x/2-g/2,0),f=Math.min(T/2-h/2,0),w=-v,y=-f,d=l*s.scale,m=p*s.scale,d<v&&(d=v),d>w&&(d=w),m<f&&(m=f),m>y&&(m=y)):(d=0,m=0),s.gesture.imageWrap.transition(300).transform("translate3d("+d+"px, "+m+"px,0)"),s.gesture.image.transition(300).transform("translate3d(0,0,0) scale("+s.scale+")"))}},attachEvents:function(a){var t=a?"off":"on";if(x.params.zoom){var s=(x.slides,!("touchstart"!==x.touchEvents.start||!x.support.passiveListener||!x.params.passiveListeners)&&{passive:!0,capture:!1});x.support.gestures?(x.slides[t]("gesturestart",x.zoom.onGestureStart,s),x.slides[t]("gesturechange",x.zoom.onGestureChange,s),x.slides[t]("gestureend",x.zoom.onGestureEnd,s)):"touchstart"===x.touchEvents.start&&(x.slides[t](x.touchEvents.start,x.zoom.onGestureStart,s),x.slides[t](x.touchEvents.move,x.zoom.onGestureChange,s),x.slides[t](x.touchEvents.end,x.zoom.onGestureEnd,s)),x[t]("touchStart",x.zoom.onTouchStart),x.slides.each(function(a,s){e(s).find("."+x.params.zoomContainerClass).length>0&&e(s)[t](x.touchEvents.move,x.zoom.onTouchMove)}),x[t]("touchEnd",x.zoom.onTouchEnd),x[t]("transitionEnd",x.zoom.onTransitionEnd),x.params.zoomToggle&&x.on("doubleTap",x.zoom.toggleZoom)}},init:function(){x.zoom.attachEvents()},destroy:function(){x.zoom.attachEvents(!0)}},x._plugins=[];for(var Y in x.plugins){var A=x.plugins[Y](x,x.params[Y]);A&&x._plugins.push(A)}return x.callPlugins=function(e){for(var a=0;a<x._plugins.length;a++)e in x._plugins[a]&&x._plugins[a][e](arguments[1],arguments[2],arguments[3],arguments[4],arguments[5])},x.emitterEventListeners={},x.emit=function(e){x.params[e]&&x.params[e](arguments[1],arguments[2],arguments[3],arguments[4],arguments[5]);var a;if(x.emitterEventListeners[e])for(a=0;a<x.emitterEventListeners[e].length;a++)x.emitterEventListeners[e][a](arguments[1],arguments[2],arguments[3],arguments[4],arguments[5]);x.callPlugins&&x.callPlugins(e,arguments[1],arguments[2],arguments[3],arguments[4],arguments[5])},x.on=function(e,a){return e=u(e),x.emitterEventListeners[e]||(x.emitterEventListeners[e]=[]),x.emitterEventListeners[e].push(a),x},x.off=function(e,a){var t;if(e=u(e),void 0===a)return x.emitterEventListeners[e]=[],x;if(x.emitterEventListeners[e]&&0!==x.emitterEventListeners[e].length){for(t=0;t<x.emitterEventListeners[e].length;t++)x.emitterEventListeners[e][t]===a&&x.emitterEventListeners[e].splice(t,1);return x}},x.once=function(e,a){e=u(e);var t=function(){a(arguments[0],arguments[1],arguments[2],arguments[3],arguments[4]),x.off(e,t)};return x.on(e,t),x},x.a11y={makeFocusable:function(e){return e.attr("tabIndex","0"),e},addRole:function(e,a){return e.attr("role",a),e},addLabel:function(e,a){return e.attr("aria-label",a),e},disable:function(e){return e.attr("aria-disabled",!0),e},enable:function(e){return e.attr("aria-disabled",!1),e},onEnterKey:function(a){13===a.keyCode&&(e(a.target).is(x.params.nextButton)?(x.onClickNext(a),x.isEnd?x.a11y.notify(x.params.lastSlideMessage):x.a11y.notify(x.params.nextSlideMessage)):e(a.target).is(x.params.prevButton)&&(x.onClickPrev(a),x.isBeginning?x.a11y.notify(x.params.firstSlideMessage):x.a11y.notify(x.params.prevSlideMessage)),e(a.target).is("."+x.params.bulletClass)&&e(a.target)[0].click())},liveRegion:e('<span class="'+x.params.notificationClass+'" aria-live="assertive" aria-atomic="true"></span>'),notify:function(e){var a=x.a11y.liveRegion;0!==a.length&&(a.html(""),a.html(e))},init:function(){x.params.nextButton&&x.nextButton&&x.nextButton.length>0&&(x.a11y.makeFocusable(x.nextButton),x.a11y.addRole(x.nextButton,"button"),x.a11y.addLabel(x.nextButton,x.params.nextSlideMessage)),x.params.prevButton&&x.prevButton&&x.prevButton.length>0&&(x.a11y.makeFocusable(x.prevButton),x.a11y.addRole(x.prevButton,"button"),x.a11y.addLabel(x.prevButton,x.params.prevSlideMessage)),e(x.container).append(x.a11y.liveRegion)},initPagination:function(){x.params.pagination&&x.params.paginationClickable&&x.bullets&&x.bullets.length&&x.bullets.each(function(){var a=e(this);x.a11y.makeFocusable(a),x.a11y.addRole(a,"button"),x.a11y.addLabel(a,x.params.paginationBulletMessage.replace(/{{index}}/,a.index()+1))})},destroy:function(){x.a11y.liveRegion&&x.a11y.liveRegion.length>0&&x.a11y.liveRegion.remove()}},x.init=function(){x.params.loop&&x.createLoop(),x.updateContainerSize(),x.updateSlidesSize(),x.updatePagination(),x.params.scrollbar&&x.scrollbar&&(x.scrollbar.set(),x.params.scrollbarDraggable&&x.scrollbar.enableDraggable()),"slide"!==x.params.effect&&x.effects[x.params.effect]&&(x.params.loop||x.updateProgress(),x.effects[x.params.effect].setTranslate()),x.params.loop?x.slideTo(x.params.initialSlide+x.loopedSlides,0,x.params.runCallbacksOnInit):(x.slideTo(x.params.initialSlide,0,x.params.runCallbacksOnInit),0===x.params.initialSlide&&(x.parallax&&x.params.parallax&&x.parallax.setTranslate(),x.lazy&&x.params.lazyLoading&&(x.lazy.load(),x.lazy.initialImageLoaded=!0))),x.attachEvents(),x.params.observer&&x.support.observer&&x.initObservers(),x.params.preloadImages&&!x.params.lazyLoading&&x.preloadImages(),x.params.zoom&&x.zoom&&x.zoom.init(),x.params.autoplay&&x.startAutoplay(),x.params.keyboardControl&&x.enableKeyboardControl&&x.enableKeyboardControl(),x.params.mousewheelControl&&x.enableMousewheelControl&&x.enableMousewheelControl(),x.params.hashnavReplaceState&&(x.params.replaceState=x.params.hashnavReplaceState),x.params.history&&x.history&&x.history.init(),x.params.hashnav&&x.hashnav&&x.hashnav.init(),x.params.a11y&&x.a11y&&x.a11y.init(),x.emit("onInit",x)},x.cleanupStyles=function(){x.container.removeClass(x.classNames.join(" ")).removeAttr("style"),x.wrapper.removeAttr("style"),x.slides&&x.slides.length&&x.slides.removeClass([x.params.slideVisibleClass,x.params.slideActiveClass,x.params.slideNextClass,x.params.slidePrevClass].join(" ")).removeAttr("style").removeAttr("data-swiper-column").removeAttr("data-swiper-row"),x.paginationContainer&&x.paginationContainer.length&&x.paginationContainer.removeClass(x.params.paginationHiddenClass),x.bullets&&x.bullets.length&&x.bullets.removeClass(x.params.bulletActiveClass),x.params.prevButton&&e(x.params.prevButton).removeClass(x.params.buttonDisabledClass),x.params.nextButton&&e(x.params.nextButton).removeClass(x.params.buttonDisabledClass),x.params.scrollbar&&x.scrollbar&&(x.scrollbar.track&&x.scrollbar.track.length&&x.scrollbar.track.removeAttr("style"),x.scrollbar.drag&&x.scrollbar.drag.length&&x.scrollbar.drag.removeAttr("style"))},x.destroy=function(e,a){x.detachEvents(),x.stopAutoplay(),x.params.scrollbar&&x.scrollbar&&x.params.scrollbarDraggable&&x.scrollbar.disableDraggable(),x.params.loop&&x.destroyLoop(),a&&x.cleanupStyles(),x.disconnectObservers(),x.params.zoom&&x.zoom&&x.zoom.destroy(),x.params.keyboardControl&&x.disableKeyboardControl&&x.disableKeyboardControl(),x.params.mousewheelControl&&x.disableMousewheelControl&&x.disableMousewheelControl(),x.params.a11y&&x.a11y&&x.a11y.destroy(),x.params.history&&!x.params.replaceState&&window.removeEventListener("popstate",x.history.setHistoryPopState),x.params.hashnav&&x.hashnav&&x.hashnav.destroy(),x.emit("onDestroy"),e!==!1&&(x=null)},x.init(),x}};a.prototype={isSafari:function(){var e=window.navigator.userAgent.toLowerCase();return e.indexOf("safari")>=0&&e.indexOf("chrome")<0&&e.indexOf("android")<0}(),isUiWebView:/(iPhone|iPod|iPad).*AppleWebKit(?!.*Safari)/i.test(window.navigator.userAgent),isArray:function(e){return"[object Array]"===Object.prototype.toString.apply(e)},browser:{ie:window.navigator.pointerEnabled||window.navigator.msPointerEnabled,ieTouch:window.navigator.msPointerEnabled&&window.navigator.msMaxTouchPoints>1||window.navigator.pointerEnabled&&window.navigator.maxTouchPoints>1,lteIE9:function(){var e=document.createElement("div");return e.innerHTML="<!--[if lte IE 9]><i></i><![endif]-->",1===e.getElementsByTagName("i").length}()},device:function(){var e=window.navigator.userAgent,a=e.match(/(Android);?[\s\/]+([\d.]+)?/),t=e.match(/(iPad).*OS\s([\d_]+)/),s=e.match(/(iPod)(.*OS\s([\d_]+))?/),r=!t&&e.match(/(iPhone\sOS|iOS)\s([\d_]+)/);return{ios:t||r||s,android:a}}(),support:{touch:window.Modernizr&&Modernizr.touch===!0||function(){return!!("ontouchstart"in window||window.DocumentTouch&&document instanceof DocumentTouch)}(),transforms3d:window.Modernizr&&Modernizr.csstransforms3d===!0||function(){var e=document.createElement("div").style;return"webkitPerspective"in e||"MozPerspective"in e||"OPerspective"in e||"MsPerspective"in e||"perspective"in e}(),flexbox:function(){for(var e=document.createElement("div").style,a="alignItems webkitAlignItems webkitBoxAlign msFlexAlign mozBoxAlign webkitFlexDirection msFlexDirection mozBoxDirection mozBoxOrient webkitBoxDirection webkitBoxOrient".split(" "),t=0;t<a.length;t++)if(a[t]in e)return!0}(),observer:function(){return"MutationObserver"in window||"WebkitMutationObserver"in window}(),passiveListener:function(){var e=!1;try{var a=Object.defineProperty({},"passive",{get:function(){e=!0}});window.addEventListener("testPassiveListener",null,a)}catch(e){}return e}(),gestures:function(){return"ongesturestart"in window}()},plugins:{}};for(var t=["jQuery","Zepto","Dom7"],s=0;s<t.length;s++)window[t[s]]&&function(e){e.fn.swiper=function(t){var s;return e(this).each(function(){var e=new a(this,t);s||(s=e)}),s}}(window[t[s]]);var r;r="undefined"==typeof Dom7?window.Dom7||window.Zepto||window.jQuery:Dom7,r&&("transitionEnd"in r.fn||(r.fn.transitionEnd=function(e){function a(i){if(i.target===this)for(e.call(this,i),t=0;t<s.length;t++)r.off(s[t],a)}var t,s=["webkitTransitionEnd","transitionend","oTransitionEnd","MSTransitionEnd","msTransitionEnd"],r=this;if(e)for(t=0;t<s.length;t++)r.on(s[t],a);return this}),"transform"in r.fn||(r.fn.transform=function(e){for(var a=0;a<this.length;a++){var t=this[a].style;t.webkitTransform=t.MsTransform=t.msTransform=t.MozTransform=t.OTransform=t.transform=e}return this}),"transition"in r.fn||(r.fn.transition=function(e){"string"!=typeof e&&(e+="ms");for(var a=0;a<this.length;a++){var t=this[a].style;t.webkitTransitionDuration=t.MsTransitionDuration=t.msTransitionDuration=t.MozTransitionDuration=t.OTransitionDuration=t.transitionDuration=e}return this}),"outerWidth"in r.fn||(r.fn.outerWidth=function(e){return this.length>0?e?this[0].offsetWidth+parseFloat(this.css("margin-right"))+parseFloat(this.css("margin-left")):this[0].offsetWidth:null})),window.Swiper=a}(),"undefined"!=typeof module?module.exports=window.Swiper:"function"==typeof define&&define.amd&&define([],function(){"use strict";return window.Swiper});
+//# sourceMappingURL=maps/swiper.jquery.min.js.map
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/utils/DateUtil.js b/pluss-wap-page/src/main/resources/static/resources/js/utils/DateUtil.js
new file mode 100644
index 0000000..52bcc3e
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/utils/DateUtil.js
@@ -0,0 +1,13 @@
+Date.prototype.toYYYYMMDDHHMMSS = function() {
+	var mouth=this.getMonth() + 1<10?'0'+(this.getMonth() + 1):(this.getMonth() + 1);
+	var day=this.getDate()<10?'0'+this.getDate():this.getDate();
+	
+    return this.getFullYear() + "/" + mouth + "/" + day + " " + this.getHours() + ":" + this.getMinutes() + ":" + this.getSeconds() ;
+};
+
+Date.prototype.toYYYYMMDD = function() {
+	var mouth=this.getMonth() + 1<10?'0'+(this.getMonth() + 1):(this.getMonth() + 1);
+	var day=this.getDate()<10?'0'+this.getDate():this.getDate();
+	
+    return this.getFullYear() + "-" + mouth + "-" + day;
+};
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/utils/DialogUtil.js b/pluss-wap-page/src/main/resources/static/resources/js/utils/DialogUtil.js
new file mode 100644
index 0000000..1a1ce6e
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/utils/DialogUtil.js
@@ -0,0 +1,318 @@
+/**
+ * 
+ * 为了layer的顶层dialog显示
+ * 相关API请看<a herf="http://layer.layui.com/api.html">http://layer.layui.com/api.html</a>
+ 
+ * 
+ * <pre>
+ * 邮箱:50875875@qq.com
+ * 日期:2019-02-17-21:29:34
+ * 版权：安徽航天信息有限公司
+ * </pre>
+ */
+DialogUtil = {
+	/**
+	 * 获取顶部窗口
+	 */
+	getParent : function(w) {
+		var win = w ? w : window;
+		if (win.parent != win) // 找到最顶层窗口
+			return this.getParent(win.parent);
+		return win;
+	},
+	/**
+	 * 格式化 var str=String.format("姓名:{0},性别:{1}","hugh","男"); alert(str);
+	 * 
+	 * @returns
+	 */
+	format : function() {
+		var template = arguments[0], args = arguments, str = template.replace(
+				/\{(\d+)\}/g, function(m, i) {
+					return args[parseInt(i) + 1];
+				});
+		return str;
+	},
+	layer : function() {
+		return this.getParent().laydialog;
+	},
+	open : function(options) {
+		return this.layer().open(options);
+	},
+	/**
+	 * 关闭指定的弹窗
+	 * @param index 对话框的index
+	 * @returns
+	 */
+	close : function(index) {
+		return this.layer().close(index);
+	},
+	/**
+	 * 关闭当前的弹窗
+	 * @returns
+	 */
+	closeDialog : function() {
+		if(frameElement &&frameElement.dialog){
+			return this.close(frameElement.dialog.index);
+		}else{
+		   if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") !=-1) {  
+		        window.location.href="about:blank";  
+		        window.close();  
+		    } else {  
+		        window.opener = null;  
+		        window.open("", "_self");  
+		        window.close();  
+		    }  
+		}
+	},
+	/**
+	 * 关闭所有的弹窗
+	 * @returns
+	 */
+	closeAll : function() {
+		return this.layer().closeAll();
+	},
+	/**
+	 * 获得弹出窗口的Window对象<br>
+	 * DialogUtil.getChildFrameWindow().xxx();
+	 * xxx ：是具体的方法。
+	 * @param index 这个是对话框的id
+	 * @returns
+	 */
+	getChildFrameWindow:function(index){
+		return this.layer().getChildFrameWindow(index);
+	},
+	/**
+	 * 可以通过选择器查找对象
+	 * @param selector 
+	 * @param index
+	 * @returns
+	 */
+	getChildFrame:function(selector, index){
+		return this.layer().getChildFrame(selector,index);
+	},
+	/**
+	 * 弹窗框
+	 * @param options 
+	 * params  传递的参数 
+	 * callback 回调
+	 * 
+	 * @returns
+	 */
+	dialog:function(options){
+		var opts = jQuery.extend({}, {
+		    type: 2,
+		    area: ['90%', '90%'],
+		    fix: true, //固定
+		    maxmin: true,
+		    btnAlign:'c'
+		}, options);
+		return this.layer().open(opts);
+	},
+	/**
+	 * 窗口回调
+	 * @param options
+	 */
+	callback:function(options){
+		if(frameElement.dialog){
+			if(frameElement.dialog.callback){
+				frameElement.dialog.callback(options);
+			}
+		}
+	},
+	/**
+	 * 全屏窗口
+	 * @returns
+	 */
+	openFullWindow:function(){
+		var options={},
+    		defaultOptions = {
+			    type: 2,
+			    area: ['100%', '100%'],
+			    fix: true, //固定
+			    maxmin: true
+			};
+	    if (typeof arguments[0] === 'object' ) {
+	        options = jQuery.extend(true, defaultOptions, arguments[0]);
+	    } else {
+	        options = jQuery.extend(true, defaultOptions, {
+	        	content: arguments[0],
+	        	title:typeof arguments[1] !== 'undefined' ? arguments[1] : null
+	        });
+	    }
+	    options = jQuery.extend(true, defaultOptions, options);
+		return this.layer().open(options);
+	},
+	/**
+	 * alert
+	 * 
+	 * @param content  【必填】 提示消息 //注意这个是字符串，
+	 * @param title  【选填】 如果是function类型 ,则是回调（callback），如果是String类型 则是提示标题,不传入为默认值‘提示'
+	 * @param callback 【选填】  如果是function类型 ,则是回调（callback）
+	 * @returns
+	 */
+	alert : function(content,title,callback){
+			var  o = {
+				content: content
+			 };
+			if (typeof (title) == "function") o.callback = title;
+			if(callback) o.callback = callback;
+			if (typeof (title) == "string" && title != "") o.title = title;
+		return this.layer().alert(o);
+	},
+	/**
+	 * 警告
+	 * 
+	 * @param content  【必填】 提示消息
+	 * @param title  【选填】 如果是function类型 ,则是回调（callback），如果是String类型 则是提示标题,不传入为默认值‘提示'
+	 * @param callback 【选填】  如果是function类型 ,则是回调（callback）
+	 * @returns
+	 */
+	warn:function(content,title,callback){
+		var  o = {
+				content: content,
+				icon:0
+			 };
+			if (typeof (title) == "function") o.callback = title;
+			if(callback) o.callback = callback;
+			if (typeof (title) == "string" && title != "") o.title = title;
+		return this.layer().alert(o);
+	},
+	/**
+	 * 错误提示信息
+	 * @param content 【必填】 错误信息简述
+	 * @param detail 【必填】 详细错误信息
+	 * @param title  【选填】  如果是function类型 ,则是回调（callback），如果是String类型 则是提示标题,不传入为默认值‘提示'
+	 * @param callback 【选填】  如果是function类型 ,则是回调（callback）
+	 * @returns
+	 */
+	error : function(content,detail,title,callback){ 
+		if(detail){
+			var divTemplate="<div class='div_error' >" +
+			"<div class='div_error_msg'><i class='fa fa-times-circle'></i>&nbsp;{0}</div>" +
+				"<div style='text-align:left; padding-bottom:10px; padding-left:10px;'></div>" +
+			"<div class='div_error_detail'>{1}</div>" +
+			"</div>";
+			var msg=this.format(divTemplate,content,detail);
+			if (typeof (title) == "function") {
+				callback = title;
+				title ="提示";
+			}
+			if (typeof (title) == "string" && title != "") title = title;
+		    return this.layer().alert({
+		    	content: msg,
+		    	title:title,
+		    	callback:callback
+		    });
+		}else{
+		    return this.layer().alert({
+		    	content: content,
+				icon:2
+		    });
+		}
+	
+	},
+	/**
+	 *  确认对话框
+	 *  
+	 * @param content 【必填】 提示消息
+	 * @param title 【选填】     如果是function类型 ,则是回调（callback），如果是String类型 则是提示标题,不传入为默认值‘提示’；
+	 * @param callback 【选填】  如果是function类型 ,则是回调（callback），如果是boolean类型 并且为true 则是按钮为是否  否则是默认
+	 * @param buttonsLabel 【选填】 如果是boolean类型 则是按钮为是否
+	 * @returns 
+	 */
+	confirm : function(content,title,callback,buttonsLabel) {
+		var  o = {content:content };
+		if (typeof (title) == "function") o.callback = title;
+		if (typeof (callback) == "boolean") buttonsLabel = callback;
+		if (typeof (callback) == "function") o.callback  = callback;
+		if (typeof (title) == "string" && title != "") o.title = title;
+		if(buttonsLabel){
+			o.btn = [{
+				label: '&#x662F;'//是
+	           }, {
+	        	   label: '&#x5426;'//否
+	           }];
+		}
+		return this.layer().confirm(o);
+	},
+	/**
+	 * 加载的对话框
+	 * @param icon 【选填】加载的图标 0-2可选 如果是0，无需传
+	 * @param options  【选填】 可以设置时间等参数
+	 * @returns
+	 */
+	load : function(icon, options) {
+		if(!options)
+			options = {};
+		if(typeof (icon) == "string"){
+			options = {title:icon};
+			icon = 0;
+		}
+		
+		return this.layer().load(icon, options);
+	},
+	/**
+	 * 顶部通知框
+	 * @param content  【必填】提示消息
+	 * @param options  【选填】选项
+	 * @param callback 【选填】回调
+	 * @returns
+	 */
+	toastr : function(content,options, callback) {
+		var opts ={
+				offset : 0,
+				shift :6};
+		if(typeof (options)  == "boolean") {
+			opts.shift = options?0:6;
+		}else if(typeof (options)  == "function"){
+			callback = options;
+		}
+		return this.msg(content,opts, callback);
+	},
+	/**
+	 * 提示消息 【中间】
+	 * @param content 【必填】提示消息
+	 * @param options 【必填】选项
+	 * @param callback 【选填】回调
+	 * @returns
+	 */
+	msg : function(content, options, callback) {
+		return this.layer().msg(content, options, callback);
+	},
+	/**
+	 * 气泡提示
+	 * @param content 【必填】提示消息
+	 * @param follow  位置
+	 * @param options 【必填】选项
+	 * @returns
+	 */
+	tips : function(content, follow, options) {
+		return this.layer().tips(content, follow, options);
+	},
+	// 导出专用
+	tipDialog : function(title, message, detail, type, callback) {
+		var divTemplate = "<div class='div_error' >"
+				+ "<div class='div_error_msg'>{0}</div>"
+				+ "<div style='text-align:left; padding-bottom:10px; padding-left:10px;'></div>"
+				+ "<div class='div_error_detail'>{1}</div>" + "</div>";
+		var content = this.format(divTemplate, message, detail);
+		return this.layer().alert( {
+			title:title,
+			content:content,
+			icon :  type
+		});
+	},
+	/**
+	 * tab 层
+	 * @param options
+	 */
+	tab:function(options){
+		return this.layer().tab(options);
+	},
+	/**
+	 * prompt层
+	 */
+	prompt:function(options,yes){
+		return this.layer().prompt(options,yes);
+	}
+};
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/utils/StringUtil.js b/pluss-wap-page/src/main/resources/static/resources/js/utils/StringUtil.js
new file mode 100644
index 0000000..55c0eea
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/utils/StringUtil.js
@@ -0,0 +1,204 @@
+/*******************************************************************************
+ * 
+ * 系统主页
+ * 
+ * <pre>
+ *  
+ * 作者：liys
+ * 邮箱:5087587@qq.com
+ * 日期:2019-2-15-11:43:52
+ * 版权：安徽航天信息有限公司
+ * </pre>
+ * 
+ ******************************************************************************/
+StringUtil={
+	//获取url参数
+	getQueryString:function(name){
+	    var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i"); 
+	    var r = window.location.search.substr(1).match(reg); 
+	    if (r != null) return unescape(r[2]); 
+	    return null; 
+		
+	},
+	//校验字符串不为空
+	isNotBlank:function(text){
+		return !(this.isBlank(text))
+	},
+	//校验字符串是否为空
+	isBlank:function(text){
+		if(text==null){
+			return true;
+		}
+		if(text==""){
+			return true;
+		}
+		if(text.length==0){
+			return true;
+		}
+		if(text==undefined){
+			return true;
+		}
+		return false;
+	},
+	//判断一个对象是否为空
+	objectIsBlank:function(obj){
+		if(JSON.stringify(obj)=="{}"){
+			return true
+		}
+		if(Object.keys(obj).length==0){
+			return true
+		}
+		return false
+	},
+	//判断一个对象是否不为空
+	objectIsNotBlank:function(obj){
+		return !(this.objectIsBlank(obj))
+	},
+	/**
+	 * 判断一个字符串是邮箱
+	 * @param str
+	 * @returns
+	 */
+	isEmail:function(str){
+		var pattern = /\w[-\w.+]*@([A-Za-z0-9][-A-Za-z0-9]+\.)+[A-Za-z]{2,14}/g;
+		return (pattern.test(str))
+	},
+	/**
+	 * 判断一个字符串不是邮箱
+	 * @param str
+	 * @returns
+	 */
+	isNotEmail:function(str){
+		var pattern = /\w[-\w.+]*@([A-Za-z0-9][-A-Za-z0-9]+\.)+[A-Za-z]{2,14}/g;
+		return !(pattern.test(str))
+	},
+	/**
+	 * 判断一个字符串是身份证
+	 * @param str
+	 * @returns
+	 */
+	isIdCard:function(str){
+		var pattern = /\d{17}[0-9Xx]|\d{15}/g;
+		return (pattern.test(str))
+	},
+	
+	/**
+	 * 判断一个字符串不是身份证
+	 * @param str
+	 * @returns
+	 */
+	isNotIdCard:function(str){
+		var pattern = /\d{17}[0-9Xx]|\d{15}/g;
+		return !(pattern.test(str))
+	},
+	
+	/**
+	 * 判断一个字符串是正整数
+	 * @param str
+	 * @returns
+	 */
+	isJustInteger:function(str){
+		var pattern = /^[1-9]\d*$/;
+		return (pattern.test(str))
+	},
+	/**
+	 * 判断一个字符串不是正整数
+	 * @param str
+	 * @returns
+	 */
+	isNotJustInteger:function(str){
+		return !(this.isJustInteger(str))
+	},
+	
+	/**
+	 * 判断一个字符串是手机号
+	 * @param str
+	 * @returns
+	 */
+	isPhone:function(str){
+		var pattern = /(13\d|14[579]|15[^4\D]|17[^49\D]|18\d)\d{8}/g;
+		return (pattern.test(str))
+	},
+	/**
+	 * 判断一个字符串不是手机号
+	 * @param str
+	 * @returns
+	 */
+	isNotPhone:function(str){
+		var pattern = /(13\d|14[579]|15[^4\D]|17[^49\D]|18\d)\d{8}/g;
+		return !(pattern.test(str))
+	},
+	/**
+	 * 判断一个字符串是正整数和小数
+	 */
+	isJustIntgerAndDecimals:function(str){
+		var pattern =  /^\d+(\.\d{1,6})?$/;
+		return (pattern.test(str))
+	},
+	/**
+	 * 判断一个字符串是正整数和小数
+	 */
+	isNotJustIntgerAndDecimals:function(str){
+		return !(this.isJustIntgerAndDecimals(str))
+	},
+	/**
+	 * 0-1之间的最多两位小数(包含0和1)
+	 */
+	isZeroAndOneBT(str){
+		var pattern = /^(0(\.\d{1,2})?|1(\.0{1,2})?)$/;
+		return (pattern.test(str))
+	},
+	/**
+	 * 不是0-1之间的最多两位小数(包含0和1)
+	 */
+	isNotZeroAndOneBT(str){
+		var pattern = /^(0(\.\d{1,2})?|1(\.0{1,2})?)$/;
+		return !(pattern.test(str))
+	},
+	
+	/**
+	 * 0-1之间的最多两位小数(不包含0)
+	 */
+	isOneBT(str){
+		var pattern =  /\b0(\.\d{1,2})\b/g;
+		return (pattern.test(str))
+	},
+	/**
+	 * 不是0-1之间的最多两位小数(不包含0)
+	 */
+	isNotOneBT(str){
+		var pattern =  /\b0(\.\d{1,2})\b/g;
+		return !(pattern.test(str))
+	},
+	
+	/**
+	 * 0-1之间的最多两位小数(包含0)
+	 */
+	isZeroOneBT(str){
+		var pattern =  /\b0(\.\d{1,2})?\b/g;
+		return (pattern.test(str))
+	},
+	/**
+	 * 不是0-1之间的最多两位小数(包含0)
+	 */
+	isNotZeroOneBT(str){
+		var pattern =  /\b0(\.\d{1,2})?\b/g;
+		return !(pattern.test(str))
+	},
+	
+	
+	/**
+	 * 正数+两位小数的数
+	 */
+	isNotTwo(str){
+		var pattern =  /^(?!0+(?:\.0+)?$)(?:[1-9]\d*|0)(?:\.\d{1,2})?$/;
+		return !(pattern.test(str))
+	},
+	
+	
+	
+
+	
+}
+
+
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/utils/nzh.min.js b/pluss-wap-page/src/main/resources/static/resources/js/utils/nzh.min.js
new file mode 100644
index 0000000..73708da
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/utils/nzh.min.js
@@ -0,0 +1,6 @@
+/*!
+ * nzh v1.0.4
+ * Homepage http://cnwhy.github.io/nzh
+ * License BSD-2-Clause
+ */
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):t.Nzh=e()}(this,function(){"use strict";function t(t,e){return e={exports:{}},t(e,e.exports),e.exports}function e(t,e){var r=i.getNumbResult(t);if(!r)return t;e=e?e:{};var n=this.ch,c=this.ch_u,h=this.ch_f||"",u=this.ch_d||".",a=n.charAt(0),o=r.int,s=r.decimal,l=r.minus,f="",g="",p=l?h:"",d=function t(r,h,u){r=i.getNumbResult(r).int;var o="",s=arguments.length>1?arguments[1]:e.tenMin,l=r.length;if(1==l)return n.charAt(+r);if(l<=4)for(var f=0,g=l;g--;){var p=+r.charAt(f);o+=s&&2==l&&0==f&&1==p?"":n.charAt(p),o+=p&&g?c.charAt(g):"",f++}else{for(var d=r.length/4>>0,_=r.length%4;0==_||!c.charAt(3+d);)_+=4,d--;var A=r.substr(0,_),v=r.substr(_);o=t(A,s)+c.charAt(3+d)+("0"==v.charAt(0)?a:"")+t(v,s)}return o=i.clearZero(o,a)};if(s){s=i.clearZero(s,"0","$");for(var _=0;_<s.length;_++)g+=n.charAt(+s.charAt(_));g=g?u+g:""}if(f=d(o),e.ww&&c.length>5){var A=c.charAt(4),v=c.charAt(5),m=f.lastIndexOf(v);~m&&(f=f.substring(0,m).replace(new RegExp(v,"g"),A+A)+f.substring(m))}return p+f+g}function r(t){t=t.toString();var e=t.split(this.ch_d),r=e[0].replace(this.ch_f,""),n=e[1],c=!!~e[0].indexOf(this.ch_f),h=this.ch_u.charAt(1),u=this.ch_u.charAt(4),a=this.ch_u.charAt(5);r=r.replace(new RegExp(u+"{2}","g"),a);for(var o=r.split(""),s=0,l=0,f=[],g=[],p=[],d=0;d<o.length;d++){var _=o[d],A=0,v=0;if(~(A=this.ch.indexOf(_)))A>0&&p.unshift(A);else if(~(v=this.ch_u.indexOf(_))){var m=i.getDigit(v);s>v?(i.unshiftZero(p,m),i.centerArray(g,p)):v>=l?(0==d&&(p=[1]),i.centerArray(f,g,p),f.length>0&&i.unshiftZero(f,m),l=v):(0==p.length&&h==_&&(p=[1]),i.centerArray(g,p),i.unshiftZero(g,i.getDigit(v)),s=v)}}i.centerArray(f,g,p).reverse(),0==f.length&&f.push(0);var y=0;if(n){f.push("."),y="0.";for(var d=0;d<n.length;d++)y+=this.ch.indexOf(n.charAt(d)),f.push(this.ch.indexOf(n.charAt(d)));y=+y}return c&&f.unshift("-"),parseFloat(f.join(""))}function n(t,r){var n={ww:!0,complete:!1,outSymbol:!0},c=i.getNumbResult(t),h=this.ch.charAt(0);if(r="object"==typeof r?r:{},!c)return t;r=i.extend(n,r);var u=c.num,a=c.decimal||"",o=r.outSymbol?this.m_t:"",s=a?"":this.m_z,l="";if(r.complete){for(var f=1;f<this.m_u.length;f++)l+=e.call(this,a.charAt(f-1)||"0")+this.m_u.charAt(f);s=e.call(this,u,r)+this.m_u.charAt(0)}else{if(a=i.clearZero(a,"0","$"))for(var g,f=0;f<this.m_u.length-1;f++)a.charAt(f)&&"0"!=a.charAt(f)&&(l+=e.call(this,a.charAt(f))+this.m_u.charAt(f+1),g=!1),"0"!==a.charAt(f)||g||(0==f&&"0"==u||(l+=h),g=!0);"0"==u&&!s&&l||(s=e.call(this,u,r)+this.m_u.charAt(0)+s)}return o+s+l}function c(t,e){return{encodeS:function(e,r){return r=i.extend({ww:!0,tenMin:!0},r),h.CL.call(t,e,r)},encodeB:function(t,r){return r=i.extend({ww:!0},r),h.CL.call(e,t,r)},decodeS:function(){return h.unCL.apply(t,arguments)},decodeB:function(){return h.unCL.apply(e,arguments)},toMoney:function(t,r){return r=i.extend({ww:!0},r),h.toMoney.call(e,t,r)}}}var i=t(function(t,e){var r=/^([+-])?0*(\d+)(\.(\d+))?$/,n=/^([+-])?0*(\d+)(\.(\d+))?e(([+-])?(\d+))$/i,c=e.e2ten=function(t){var e=n.exec(t.toString());if(!e)return t;var r=e[2],c=e[4]||"",i=e[5]?+e[5]:0;if(i>0){var h=c.substr(0,i);h=h.length<i?h+new Array(i-h.length+1).join("0"):h,c=c.substr(i),r+=h}else{i=-i;var u=r.length-i;u=u<0?0:u;var a=r.substr(u,i);a=a.length<i?new Array(i-a.length+1).join("0")+a:a,r=r.substring(0,u),c=a+c}return r=""==r?"0":r,("-"==e[1]?"-":"")+r+(c?"."+c:"")};e.getNumbResult=function(t){var e=r.exec(t.toString());if(!e&&n.test(t.toString())&&(e=r.exec(c(t.toString()))),e)return{int:e[2],decimal:e[4],minus:"-"==e[1],num:e.slice(1,3).join("")}},e.centerArray=function t(e,r){if(e.splice.apply(e,[0,r.length].concat(r.splice(0,r.length))),arguments.length>2){var n=[].slice.call(arguments,2);n.unshift(e),t.apply(null,n)}return e};var i=e.hasAttr=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)};e.extend=function(t){for(var e,r=arguments[0]||{},n=Array.prototype.slice.call(arguments,1),c=0;c<n.length;c++){var h=n[c];for(e in h)i(h,e)&&(r[e]=h[e])}return r},e.getDigit=function(t){return t>=5?4*(t-4)+4:t},e.unshiftZero=function(t,e){if(null==e&&(e=1),!(e<=0))for(;e--;)t.unshift(0)},e.clearZero=function(t,e,r){if(null==t)return"";var n=~"*.?+$^[](){}|\\/".indexOf(e)?"\\"+e:e,c=new RegExp("^"+n+"+"),i=new RegExp(n+"+$"),h=new RegExp(n+"{2}","g");return t=t.toString(),"^"==r&&(t=t.replace(c,"")),r&&"$"!=r||(t=t.replace(i,"")),r&&"nto1"!=r||(t=t.replace(h,e)),t}}),h=(i.e2ten,i.getNumbResult,i.centerArray,i.hasAttr,i.extend,i.getDigit,i.unshiftZero,i.clearZero,{CL:e,unCL:r,toMoney:n}),u=c,a={ch:"零一二三四五六七八九",ch_u:"个十百千万亿",ch_f:"负",ch_d:"点"},o={ch:"零壹贰叁肆伍陆柒捌玖",ch_u:"个拾佰仟万亿",ch_f:"负",ch_d:"点",m_t:"人民币",m_z:"整",m_u:"元角分"},s={ch:"零一二三四五六七八九",ch_u:"個十百千萬億",ch_f:"負",ch_d:"點"},l={ch:"零壹貳參肆伍陸柒捌玖",ch_u:"個拾佰仟萬億",ch_f:"負",ch_d:"點",m_t:"$",m_z:"整",m_u:"圓角分"},f={s:a,b:o,hk_s:s,hk_b:l},g=function(t){this.lang=t,this.encode=function(){return h.CL.apply(t,arguments)},this.decode=function(){return h.unCL.apply(t,arguments)},this.toMoney=function(){return h.toMoney.apply(t,arguments)}};g.langs=f,g.cn=u(f.s,f.b),g.hk=u(f.hk_s,f.hk_b);var p=g;return p});
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/verify.js b/pluss-wap-page/src/main/resources/static/resources/js/verify.js
new file mode 100644
index 0000000..48c9e52
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/verify.js
@@ -0,0 +1,840 @@
+/*! Verify-v0.1.0 MIT License by 大熊*/
+
+
+;(function($, window, document,undefined) {
+	
+	//定义Code的构造函数
+    var Code = function(ele, opt) {
+        this.$element = ele,
+        this.defaults = {
+        	type : 1,
+        	figure : 100,	//位数，仅在type=2时生效
+        	arith : 0,	//算法，支持加减乘，0为随机，仅在type=2时生效
+        	width : '200px',
+		    height : '60px',
+		    fontSize : '30px',
+        	codeLength : 6,
+        	btnId : 'check-btn',
+        	ready : function(){},
+        	success : function(){},
+            error : function(){}
+        },
+        this.options = $.extend({}, this.defaults, opt)
+    };
+    
+    var _code_chars = [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','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'];
+    var _code_color1 = ['#fffff0', '#f0ffff', '#f0fff0', '#fff0f0'];
+    var _code_color2 = ['#FF0033', '#006699', '#993366', '#FF9900', '#66CC66', '#FF33CC'];
+    
+    //定义Code的方法
+    Code.prototype = {
+    	init : function() {
+			
+			var _this = this;
+			
+			this.loadDom();
+			this.setCode();
+			
+			this.options.ready();
+			
+			this.$element[0].onselectstart = document.body.ondrag = function(){ 
+				return false; 
+			};
+			
+			//点击验证码
+			this.$element.find('.verify-code, .verify-change-code').on('click', function() {
+				_this.setCode();
+			});
+			
+			//确定的点击事件
+			this.htmlDoms.code_btn.on('click', function() {
+				_this.checkCode();
+			})
+			
+    	},
+    	
+    	//加载页面
+    	loadDom : function() {
+    		var panelHtml = '<div class="cerify-code-panel"><div class="verify-code"></div><div class="verify-code-area"><div class="verify-input-area"><input type="text" class="varify-input-code" /></div><div class="verify-change-area"><a class="verify-change-code">换一张</a></div></div></div>';
+        	this.$element.append(panelHtml);
+        	
+        	this.isEnd = false;
+        	
+        	this.htmlDoms = {
+        		code_btn : $('#'+this.options.btnId),
+        		code : this.$element.find('.verify-code'),
+        		code_area : this.$element.find('.verify-code-area'),
+        		code_input : this.$element.find('.varify-input-code'),
+        	};
+        	
+        	this.htmlDoms.code.css({'width':this.options.width, 'height':this.options.height,'line-height':this.options.height, 'font-size':this.options.fontSize});
+        	this.htmlDoms.code_area.css({'width':this.options.width});
+    	},
+    	
+    	
+    	//设置验证码
+    	setCode : function() {
+    		if(this.isEnd == false) {
+    			
+	    		var color1Num = Math.floor(Math.random() * 3);
+	    		var color2Num = Math.floor(Math.random() * 5);
+	    		
+	    		this.htmlDoms.code.css({'background-color': _code_color1[color1Num], 'color': _code_color2[color2Num]});
+	    		this.htmlDoms.code_input.val('');
+	    		
+	    		var code = '';
+	    		this.code_chose = '';
+	    		
+	    		if(this.options.type == 1) {		//普通验证码
+					for(var i = 0; i < this.options.codeLength; i++) {
+						var charNum = Math.floor(Math.random() * 52);
+						var tmpStyle = (charNum%2 ==0)? "font-style:italic;margin-right: 10px;":"font-weight:bolder;";
+						tmpStyle += (Math.floor(Math.random() * 2) == 1)? "font-weight:bolder;":"";
+						
+						this.code_chose += _code_chars[charNum];
+						code += '<font style="'+tmpStyle+'">'+_code_chars[charNum]+'</font>';
+					}
+	    		}else {		//算法验证码
+	    			
+	    			var num1 = Math.floor(Math.random() * this.options.figure);
+	    			var num2 = Math.floor(Math.random() * this.options.figure);
+	    			
+	    			if(this.options.arith == 0) {
+	    				var tmparith = Math.floor(Math.random() * 3);
+	    			}
+	    			
+	    			switch(tmparith) {
+	    				case 1 :
+	    					this.code_chose = parseInt(num1) + parseInt(num2);
+	    					code = num1 + ' + ' + num2 + ' = ?';
+	    					break;
+	    				case 2 :
+	    					if(parseInt(num1) < parseInt(num2)) {
+	    						var tmpnum = num1;
+	    						num1 = num2;
+	    						num2 = tmpnum;
+	    					}
+	    					this.code_chose = parseInt(num1) - parseInt(num2);
+	    					code = num1 + ' - ' + num2 + ' = ?';
+	    					break;
+	    				default :
+	    					this.code_chose = parseInt(num1) * parseInt(num2);
+	    					code = num1 + ' × ' + num2 + ' = ?';
+	    					break;
+	    			}
+	    		}
+	    		
+	    		this.htmlDoms.code.html(code);
+    		}
+    	},
+    	
+    	//比对验证码
+    	checkCode : function() {
+    		if(this.options.type == 1) {		//普通验证码
+    			var own_input = this.htmlDoms.code_input.val().toUpperCase();
+    			this.code_chose = this.code_chose.toUpperCase();
+    		}else {
+    			var own_input = this.htmlDoms.code_input.val();
+    		}
+    		
+    		if(own_input == this.code_chose) {
+    			this.isEnd = true;
+    			this.options.success(this);
+    		}else {
+    			this.options.error(this);
+    			this.setCode();
+    		}
+    	},
+    	
+    	//刷新
+    	refresh : function() {
+    		this.isEnd = false;
+    		this.$element.find('.verify-code').click();
+    	}
+    	
+    	
+    };
+    
+    
+    //定义Slide的构造函数
+    var Slide = function(ele, opt) {
+        this.$element = ele,
+        this.defaults = {
+        	
+        	type : 1,
+        	mode : 'fixed',	//弹出式pop，固定fixed
+        	vOffset: 5,
+            vSpace : 5,
+            explain : '向右滑动完成验证',
+            imgUrl : 'images/',
+            imgName : ['1.jpg', '2.jpg'],
+            imgSize : {
+	        	width: '450px',
+	        	height: '200px',
+	        },
+	        blockSize : {
+	        	width: '50px',
+	        	height: '50px',
+	        },
+	        barSize : {
+	        	width : '450px',
+	        	height : '40px',
+	        },
+            ready : function(){},
+        	success : function(){},
+            error : function(){}
+            
+        },
+        this.options = $.extend({}, this.defaults, opt)
+    };
+    
+    
+    //定义Slide的方法
+    Slide.prototype = {
+        
+        init: function() {
+        	var _this = this;
+        	
+        	//加载页面
+        	this.loadDom();
+        	this.options.ready();
+        	
+        	this.$element[0].onselectstart = document.body.ondrag = function(){ 
+				return false; 
+			};
+        	
+        	if(this.options.mode == 'pop')	{
+        		this.$element.on('mouseover', function(e){
+        			_this.showImg();
+	        	});
+	        	
+	        	this.$element.on('mouseout', function(e){
+	        		_this.hideImg();
+	        	});
+	        	
+	        	
+	        	this.htmlDoms.out_panel.on('mouseover', function(e){
+	        		_this.showImg();
+	        	});
+	        	
+	        	this.htmlDoms.out_panel.on('mouseout', function(e){
+	        		_this.hideImg();
+	        	});
+        	}
+        	
+        	//按下
+        	this.htmlDoms.move_block.on('touchstart', function(e) {
+        		_this.start(e);
+        	});
+        	
+        	this.htmlDoms.move_block.on('mousedown', function(e) {
+        		_this.start(e);
+        	});
+        	
+        	//拖动
+            window.addEventListener("touchmove", function(e) {
+            	_this.move(e);
+            });
+            window.addEventListener("mousemove", function(e) {
+				
+            	_this.move(e);
+            });
+            
+            //鼠标松开
+            window.addEventListener("touchend", function() {
+            	_this.end();
+            });
+            window.addEventListener("mouseup", function() {
+            	_this.end();
+            });
+            
+            //刷新
+            _this.$element.find('.verify-refresh').on('click', function() {
+            	_this.refresh();
+            });
+        },
+        
+        //初始化加载
+        loadDom : function() {
+        	this.img_rand = Math.floor(Math.random() * this.options.imgName.length);			//随机的背景图片
+        	
+        	var panelHtml = '';
+        	var tmpHtml = '';
+        	
+        	if(this.options.type != 1) {		//图片滑动
+        		panelHtml += '<div class="verify-img-out"><div class="verify-img-panel"><div  class="verify-refresh"><i class="iconfont icon-refresh"></i></div><div class="verify-gap"></div></div></div>';
+        		tmpHtml = '<div  class="verify-sub-block"></div>';
+        	}
+        	
+        	panelHtml += '<div class="verify-bar-area"><span  class="verify-msg">'+this.options.explain+'</span><div class="verify-left-bar"><span  class="verify-msg"></span><div  class="verify-move-block"><i  class="icon icon-10 f22"></i>'+tmpHtml+'</div></div></div>';
+        	this.$element.append(panelHtml);
+        	
+        	this.htmlDoms = {
+        		gap : this.$element.find('.verify-gap'),
+        		sub_block : this.$element.find('.verify-sub-block'),
+        		out_panel : this.$element.find('.verify-img-out'),
+        		img_panel : this.$element.find('.verify-img-panel'),
+        		bar_area : this.$element.find('.verify-bar-area'),
+        		move_block : this.$element.find('.verify-move-block'),
+        		left_bar : this.$element.find('.verify-left-bar'),
+        		msg : this.$element.find('.verify-msg'),
+        		icon : this.$element.find('.layui-icon'),
+        		refresh :this.$element.find('.verify-refresh')
+        	};
+        	
+        	this.status = false;	//鼠标状态
+        	this.isEnd = false;		//是够验证完成
+        	this.setSize = this.resetSize(this);	//重新设置宽度高度
+        	
+        	this.$element.css('position', 'relative');
+        	if(this.options.mode == 'pop') {
+        		this.htmlDoms.out_panel.css({'display': 'none', 'position': 'absolute', 'bottom': '42px'});
+        		this.htmlDoms.sub_block.css({'display': 'none'});
+        	}else {
+        		this.htmlDoms.out_panel.css({'position': 'relative'});
+        	}
+        	
+        	this.htmlDoms.gap.css({'width': this.options.blockSize.width, 'height': this.options.blockSize.height});
+        	this.htmlDoms.sub_block.css({'width': this.options.blockSize.width, 'height': this.options.blockSize.height});
+        	this.htmlDoms.out_panel.css('height', parseInt(this.setSize.img_height) + this.options.vSpace + 'px');
+        	this.htmlDoms.img_panel.css({'width': this.setSize.img_width, 'height': this.setSize.img_height, 'background': 'url(' + this.options.imgUrl + this.options.imgName[this.img_rand]+')', 'background-size' : this.setSize.img_width + ' '+ this.setSize.img_height});
+        	this.htmlDoms.bar_area.css({'width': this.setSize.bar_width, 'height': this.options.barSize.height, 'line-height':this.options.barSize.height});
+        	this.htmlDoms.move_block.css({'width': this.options.barSize.height, 'height': this.options.barSize.height});
+        	this.htmlDoms.left_bar.css({'width': this.options.barSize.height, 'height': this.options.barSize.height});
+        	
+        	this.randSet();
+        },
+        
+        //鼠标按下
+        start: function(e) {
+        	if(this.isEnd == false) {
+	        	this.htmlDoms.msg.text('');
+	        	this.htmlDoms.move_block.css('background-color', '#337ab7');
+	        	this.htmlDoms.left_bar.css('border-color', '#337AB7');
+	        	this.htmlDoms.icon.css('color', '#fff');
+	        	e.stopPropagation();
+	        	this.status = true;
+        	}
+        },
+        
+        //鼠标移动
+        move: function(e) {
+        	if(this.status && this.isEnd == false) {
+				if(this.options.mode == 'pop')	{
+        			this.showImg();
+				}
+        		
+	            if(!e.touches) {    //兼容移动端
+	                var x = e.clientX;
+	            }else {     //兼容PC端
+	                var x = e.touches[0].pageX;
+	            }
+	            var bar_area_left = Slide.prototype.getLeft(this.htmlDoms.bar_area[0]); 
+	            var move_block_left = x - bar_area_left; //小方块相对于父元素的left值
+	            
+	            
+	            if(this.options.type != 1) {		//图片滑动
+	            	if(move_block_left >= this.htmlDoms.bar_area[0].offsetWidth - parseInt(parseInt(this.options.blockSize.width)/2) - 2) {
+	                	move_block_left = this.htmlDoms.bar_area[0].offsetWidth - parseInt(parseInt(this.options.blockSize.width)/2) - 2;
+	            	}
+	            	
+	            }else {		//普通滑动
+	            	if(move_block_left >= this.htmlDoms.bar_area[0].offsetWidth - parseInt(parseInt(this.options.barSize.height)/2) + 3) {
+	            		this.$element.find('.verify-msg:eq(1)').text('松开验证');
+	                	move_block_left = this.htmlDoms.bar_area[0].offsetWidth - parseInt(parseInt(this.options.barSize.height)/2) + 3;
+	            	}else {
+	            		this.$element.find('.verify-msg:eq(1)').text('');
+	            	}
+	            }
+	            
+	            
+	            if(move_block_left <= 0) {
+            		move_block_left = parseInt(parseInt(this.options.blockSize.width)/2);
+            	}
+	            
+	            //拖动后小方块的left值
+	            this.htmlDoms.move_block.css('left', move_block_left-parseInt(parseInt(this.options.blockSize.width)/2) + "px");
+	            this.htmlDoms.left_bar.css('width', move_block_left-parseInt(parseInt(this.options.blockSize.width)/2) + "px");
+	        }
+        },
+        
+        //鼠标松开
+        end: function() {
+        	
+        	var _this = this;
+        	
+        	//判断是否重合
+        	if(this.status  && this.isEnd == false) {
+        		
+        		if(this.options.type != 1) {		//图片滑动
+        			
+        			var vOffset = parseInt(this.options.vOffset);
+		            if(parseInt(this.htmlDoms.gap.css('left')) >= (parseInt(this.htmlDoms.move_block.css('left')) - vOffset) && parseInt(this.htmlDoms.gap.css('left')) <= (parseInt(this.htmlDoms.move_block.css('left')) + vOffset)) {
+		            	this.htmlDoms.move_block.css('background-color', '#5cb85c');
+		            	this.htmlDoms.left_bar.css({'border-color': '#5cb85c', 'background-color': '#fff'});
+		            	this.htmlDoms.icon.css('color', '#fff');
+		            	this.htmlDoms.icon.removeClass('layui-icon-right');
+		            	this.htmlDoms.icon.addClass('icon icon-66 f2');
+		            	this.htmlDoms.refresh.hide();
+		            	this.isEnd = true;
+		            	this.options.success(this);
+		            }else{
+		            	this.htmlDoms.move_block.css('background-color', '#d9534f');
+		            	this.htmlDoms.left_bar.css('border-color', '#d9534f');
+		            	this.htmlDoms.icon.css('color', '#fff');
+		            	this.htmlDoms.icon.removeClass('layui-icon-right');
+		            	this.htmlDoms.icon.addClass('icon icon-40 f22');
+		            	
+		            	
+		            	setTimeout(function () { 
+					    	_this.refresh();
+					    }, 400);
+		            	
+		            	this.options.error(this);
+		            }
+        			
+        		}else {		//普通滑动
+        			
+        			if(parseInt(this.htmlDoms.move_block.css('left')) >= (parseInt(this.setSize.bar_width) - parseInt(this.options.barSize.height) - parseInt(this.options.vOffset))) {
+        				this.htmlDoms.move_block.css('background-color', '#5cb85c');
+        				this.htmlDoms.left_bar.css({'color': '#4cae4c', 'border-color': '#5cb85c', 'background-color': '#fff' });
+        				this.htmlDoms.icon.css('color', '#fff');
+		            	this.htmlDoms.icon.removeClass('layui-icon-right');
+		            	this.htmlDoms.icon.addClass('icon icon-66 f2');
+		            	this.htmlDoms.refresh.hide();
+        				this.$element.find('.verify-msg:eq(1)').text('验证成功');
+        				this.isEnd = true;
+        				this.options.success(this);
+        			}else {
+        				this.$element.find('.verify-msg:eq(1)').text('');
+        				this.htmlDoms.move_block.css('background-color', '#d9534f');
+		            	this.htmlDoms.left_bar.css('border-color', '#d9534f');
+		            	this.htmlDoms.icon.css('color', '#fff');
+		            	this.htmlDoms.icon.removeClass('layui-icon-right');
+		            	this.htmlDoms.icon.addClass('icon icon-40 f22');
+		            	this.isEnd = true;
+		            	
+		            	setTimeout(function () { 
+		            		_this.$element.find('.verify-msg:eq(1)').text('');
+					    	_this.refresh();
+					    	_this.isEnd = false;
+					    }, 400);
+		            	
+		            	this.options.error(this);
+        			}
+        		}
+        		
+	            this.status = false;
+        	}
+        },
+        
+        //弹出式
+        showImg : function() {
+        	this.htmlDoms.out_panel.css({'display': 'block'});
+        	this.htmlDoms.sub_block.css({'display': 'block'});
+        },
+        
+        //固定式
+        hideImg : function() {
+        	this.htmlDoms.out_panel.css({'display': 'none'});
+        	this.htmlDoms.sub_block.css({'display': 'none'});
+        },
+        
+        
+        resetSize : function(obj) {
+        	var img_width,img_height,bar_width,bar_height;	//图片的宽度、高度，移动条的宽度、高度
+        	var parentWidth = obj.$element.parent().width() || $(window).width();
+        	var parentHeight = obj.$element.parent().height() || $(window).height();
+        	
+       		if(obj.options.imgSize.width.indexOf('%')!= -1){
+        		img_width = parseInt(obj.options.imgSize.width)/100 * parentWidth + 'px';
+		　　}else {
+				img_width = obj.options.imgSize.width;
+			}
+		
+			if(obj.options.imgSize.height.indexOf('%')!= -1){
+        		img_height = parseInt(obj.options.imgSize.height)/100 * parentHeight + 'px';
+		　　}else {
+				img_height = obj.options.imgSize.height;
+			}
+		
+			if(obj.options.barSize.width.indexOf('%')!= -1){
+        		bar_width = parseInt(obj.options.barSize.width)/100 * parentWidth + 'px';
+		　　}else {
+				bar_width = obj.options.barSize.width;
+			}
+		
+			if(obj.options.barSize.height.indexOf('%')!= -1){
+        		bar_height = parseInt(obj.options.barSize.height)/100 * parentHeight + 'px';
+		　　}else {
+				bar_height = obj.options.barSize.height;
+			}
+		
+			return {img_width : img_width, img_height : img_height, bar_width : bar_width, bar_height : bar_height};
+       	},
+        
+        //随机出生点位
+        randSet: function() {
+        	var rand1 = Math.floor(Math.random()*9+1);
+        	var rand2 = Math.floor(Math.random()*9+1);
+        	var top = rand1 * parseInt(this.setSize.img_height)/15 + parseInt(this.setSize.img_height) * 0.1;
+        	var left = rand2 * parseInt(this.setSize.img_width)/15 + parseInt(this.setSize.img_width) * 0.1;
+        	
+        	this.$element.find('.verify-gap').css({'top': top, 'left': left});
+          	this.$element.find('.verify-sub-block').css({'top':'-'+(parseInt(this.setSize.img_height)- top + this.options.vSpace)+'px', 'background-image': 'url('+ this.options.imgUrl + this.options.imgName[this.img_rand]+')', 'background-size': this.setSize.img_width + ' '+ this.setSize.img_height,'background-position-y': '-'+top+ 'px', 'background-position-x': '-'+left+'px'});
+        },
+        
+        //刷新
+        refresh: function() {
+        	this.htmlDoms.refresh.show();
+        	this.$element.find('.verify-msg:eq(1)').text('');
+        	this.$element.find('.verify-msg:eq(1)').css('color', '#000');
+        	this.htmlDoms.move_block.animate({'left':'0px'}, 'fast');
+			this.htmlDoms.left_bar.animate({'width': '40px'}, 'fast');
+			this.htmlDoms.left_bar.css({'border-color': '#ddd'});
+			
+			this.htmlDoms.move_block.css('background-color', '#fff');
+			this.htmlDoms.icon.css('color', '#000');
+			this.htmlDoms.icon.removeClass('icon icon-40 f22');
+			this.htmlDoms.icon.addClass('layui-icon-right');
+			this.$element.find('.verify-msg:eq(0)').text(this.options.explain);
+        	
+        	this.randSet();
+        	this.img_rand = Math.floor(Math.random() * this.options.imgName.length);			//随机的背景图片
+            this.$element.find('.verify-img-panel').css({'background': 'url('+ this.options.imgUrl +this.options.imgName[this.img_rand]+')', 'background-size': this.setSize.img_width + ' '+ this.setSize.img_height});
+            this.$element.find('.verify-sub-block').css({'background-image': 'url('+ this.options.imgUrl +this.options.imgName[this.img_rand]+')', 'background-size': this.setSize.img_width + ' '+ this.setSize.img_height});
+        	
+        	this.isEnd = false;
+        },
+        
+        //获取left值
+        getLeft: function(node) {
+			var left = $(node).offset().left; 
+//          var nowPos = node.offsetParent; 	
+//          
+//          while(nowPos != null) {　　
+//              left += $(nowPos).offset().left;　
+//              nowPos = nowPos.offsetParent;　　
+//          }
+            return left;
+        }
+    };
+    
+    
+    //定义Points的构造函数
+    var Points = function(ele, opt) {
+        this.$element = ele,
+        this.defaults = {
+        	mode : 'fixed',	//弹出式pop，固定fixed
+        	defaultNum : 4,	//默认的文字数量
+		    checkNum : 3,	//校对的文字数量
+		    vSpace : 5,	//间隔
+		    imgUrl : 'images/',
+        	imgName : ['1.jpg', '2.jpg'],
+        	imgSize : {
+	        	width: '400px',
+	        	height: '200px',
+	        },
+	        barSize : {
+	        	width : '400px',
+	        	height : '40px',
+	        },
+	        ready : function(){},
+        	success : function(){},
+            error : function(){}
+        },
+        this.options = $.extend({}, this.defaults, opt)
+    };
+    
+    //定义Points的方法
+    Points.prototype = {
+    	init : function() {
+			
+			var _this = this;
+			
+			//加载页面
+        	_this.loadDom();
+        	 
+        	_this.refresh();
+        	_this.options.ready();
+        	
+        	this.$element[0].onselectstart = document.body.ondrag = function(){ 
+				return false; 
+			};
+			
+			
+			if(this.options.mode == 'pop')	{
+        		this.$element.on('mouseover', function(e){
+        			_this.showImg();
+	        	});
+	        	
+	        	this.$element.on('mouseout', function(e){
+	        		_this.hideImg();
+	        	});
+	        	
+	        	
+	        	this.htmlDoms.out_panel.on('mouseover', function(e){
+	        		_this.showImg();
+	        	});
+	        	
+	        	this.htmlDoms.out_panel.on('mouseout', function(e){
+	        		_this.hideImg();
+	        	});
+        	}
+			
+        	
+		 	//点击事件比对
+        	_this.$element.find('.verify-img-panel canvas').on('click', function(e) {
+        		
+				_this.checkPosArr.push(_this.getMousePos(this, e));
+				
+				if(_this.num == _this.options.checkNum) {
+					
+					_this.num = _this.createPoint(_this.getMousePos(this, e));
+					setTimeout(function () { 
+						var flag = _this.comparePos(_this.fontPos, _this.checkPosArr);
+						
+						if(flag == false) {	//验证失败
+							
+							_this.options.error(_this);
+							_this.$element.find('.verify-bar-area').css({'color': '#d9534f', 'border-color': '#d9534f'});
+						    _this.$element.find('.verify-msg').text('验证失败');
+							
+							setTimeout(function () { 
+								_this.$element.find('.verify-bar-area').css({'color': '#000','border-color': '#ddd'});
+						    	_this.refresh();
+						    }, 400);
+							
+						}else {	//验证成功
+							_this.$element.find('.verify-bar-area').css({'color': '#4cae4c', 'border-color': '#5cb85c'});
+							_this.$element.find('.verify-msg').text('验证成功');
+							_this.$element.find('.verify-refresh').hide();
+							_this.$element.find('.verify-img-panel').unbind('click');
+							_this.options.success(_this);
+						}
+					}, 400);
+					
+				}
+				
+				if(_this.num < _this.options.checkNum) {
+					_this.num = _this.createPoint(_this.getMousePos(this, e));
+				}
+
+        	});
+        	
+        	 //刷新
+            _this.$element.find('.verify-refresh').on('click', function() {
+            	_this.refresh();
+            });
+        	
+    	},
+    	
+    	
+    	
+    	//加载页面
+    	loadDom : function() {
+    		
+    		this.fontPos = [];	//选中的坐标信息
+    		this.checkPosArr = [];	//用户点击的坐标
+    		this.num = 1;	//点击的记数
+    		this.img_rand = Math.floor(Math.random() * this.options.imgName.length);			//随机的背景图片
+    		
+        	var panelHtml = '';
+        	var tmpHtml = '';
+        	
+        	this.setSize = Slide.prototype.resetSize(this);	//重新设置宽度高度
+        	
+        	panelHtml += '<div class="verify-img-out"><div class="verify-img-panel"><div class="verify-refresh" style="z-index:3"><i class="iconfont icon-refresh"></i></div><canvas width="'+this.setSize.img_width+'" height="'+this.setSize.img_height+'"></canvas></div></div><div class="verify-bar-area"><span  class="verify-msg"></span></div>';
+        	
+        	this.$element.append(panelHtml);
+        	
+        	
+        	this.htmlDoms = {
+        		out_panel : this.$element.find('.verify-img-out'),
+        		img_panel : this.$element.find('.verify-img-panel'),
+        		bar_area : this.$element.find('.verify-bar-area'),
+        		msg : this.$element.find('.verify-msg'),
+        	};
+        	
+        	this.$element.css('position', 'relative');
+        	if(this.options.mode == 'pop') {
+        		this.htmlDoms.out_panel.css({'display': 'none', 'position': 'absolute', 'bottom': '42px'});
+        	}else {
+        		this.htmlDoms.out_panel.css({'position': 'relative'});
+        	}
+        	
+        	this.htmlDoms.out_panel.css('height', parseInt(this.setSize.img_height) + this.options.vSpace + 'px');
+    		this.htmlDoms.img_panel.css({'width': this.setSize.img_width, 'height': this.setSize.img_height, 'background-size' : this.setSize.img_width + ' '+ this.setSize.img_height, 'margin-bottom': this.options.vSpace + 'px'});
+    		this.htmlDoms.bar_area.css({'width': this.options.barSize.width, 'height': this.options.barSize.height, 'line-height':this.options.barSize.height});
+    		
+    	},
+    	
+    	//绘制合成的图片
+    	drawImg : function(obj, img) {
+    		//准备canvas环境 
+	       	var canvas = this.$element.find('canvas')[0];
+	      	//var canvas=document.getElementById("myCanvas");
+	       	var ctx=canvas.getContext("2d");
+	       	
+	       	// 绘制图片
+	       	ctx.drawImage(img,0,0, parseInt(this.setSize.img_width), parseInt(this.setSize.img_height));
+	       	
+	       	// 绘制水印
+	       	var fontSizeArr = ['italic small-caps bold 20px microsoft yahei', 'small-caps normal 25px arial', '34px microsoft yahei'];
+	       	var fontStr = '天地玄黄宇宙洪荒日月盈昃辰宿列张寒来暑往秋收冬藏闰余成岁律吕调阳云腾致雨露结为霜金生丽水玉出昆冈剑号巨阙珠称夜光果珍李柰菜重芥姜海咸河淡鳞潜羽翔龙师火帝鸟官人皇始制文字乃服衣裳推位让国有虞陶唐吊民伐罪周发殷汤坐朝问道垂拱平章爱育黎首臣伏戎羌遐迩体率宾归王';	//不重复的汉字
+	       	
+	       	
+	       	var fontChars = [];
+	       	
+	       	var avg = Math.floor(parseInt(this.setSize.img_width)/(parseInt(this.options.defaultNum)+1));
+	       	var tmp_index = '';
+	       	var color2Num = Math.floor(Math.random() * 5);
+	       	
+	       	for(var i = 1; i <= this.options.defaultNum; i++) {
+	       		
+	       		fontChars[i-1] = this.getChars(fontStr, fontChars);
+	       		
+	       		tmp_index = Math.floor(Math.random()*3);
+	       		ctx.font = fontSizeArr[tmp_index];
+		       	ctx.fillStyle = _code_color2[color2Num];
+		       	
+		       	if(Math.floor(Math.random() * 2) == 1) {
+		       		var tmp_y = Math.floor(parseInt(this.setSize.img_height)/2) + tmp_index*20 + 20;
+		       	}else {
+		       		var tmp_y = Math.floor(parseInt(this.setSize.img_height)/2) - tmp_index*20;
+		       	}
+		       	
+		       	ctx.fillText(fontChars[i-1],avg * i, tmp_y);
+		       	this.fontPos[i-1] = {'char': fontChars[i-1], 'x': avg * i, 'y': tmp_y};
+		       	
+	       	}
+	       	
+	       	for(var i = 0; i < (this.options.defaultNum-this.options.checkNum); i++) {
+	       		this.shuffle(this.fontPos).pop();
+	       	}
+	       	
+	       	var msgStr = '';
+	       	for(var i = 0; i < this.fontPos.length; i++) {
+	       		msgStr += this.fontPos[i].char + ',';
+	       	}
+	       	
+	       	this.htmlDoms.msg.text('请顺序点击【' + msgStr.substring(0,msgStr.length-1) + '】');
+	       	
+	       	return this.fontPos;
+    	},
+    	
+    	//获取坐标
+    	getMousePos :function(obj, event) {
+            var e = event || window.event;
+            var scrollX = document.documentElement.scrollLeft || document.body.scrollLeft;
+            var scrollY = document.documentElement.scrollTop || document.body.scrollTop;
+            var x = e.clientX - ($(obj).offset().left - $(window).scrollLeft());
+    		var y = e.clientY - ($(obj).offset().top - $(window).scrollTop());
+    		
+            return {'x': x, 'y': y};
+     	},
+     	
+     	//递归去重
+     	getChars : function(fontStr, fontChars) {
+     		
+     		var tmp_rand = parseInt(Math.floor(Math.random() * fontStr.length));
+     		if(tmp_rand > 0) {
+     			tmp_rand = tmp_rand - 1;
+     		}
+     		
+     		tmp_char = fontStr.charAt(tmp_rand);
+       		if($.inArray(tmp_char, fontChars) == -1) {
+       			return tmp_char;
+       		}else {
+       			return Points.prototype.getChars(fontStr, fontChars);
+       		}
+     	},
+		
+     	//洗牌数组
+       	shuffle : function(arr) {
+			var m = arr.length, i;
+			var tmpF;
+			while (m) {
+				i = (Math.random() * m--) >>> 0;
+				tmpF = arr[m];
+				arr[m] = arr[i];
+				arr[i] = tmpF;
+				//[arr[m], arr[i]] = [arr[i], arr[m]];	//低版本浏览器不支持此写法
+			}
+			return arr;
+		},
+       	
+       	//创建坐标点
+       	createPoint : function (pos) {
+       		this.htmlDoms.img_panel.append('<div class="point-area" style="background-color:#1abd6c;color:#fff;z-index:9999;width:30px;height:30px;text-align:center;line-height:30px;border-radius: 50%;position:absolute;top:'+parseInt(pos.y-10)+'px;left:'+parseInt(pos.x-10)+'px;">'+this.num+'</div>');
+       		return ++this.num;
+       	},
+       	
+       	//比对坐标点
+       	comparePos : function (fontPos, checkPosArr) {
+       		
+       		var flag = true;
+       		for(var i = 0; i < fontPos.length; i++) {
+       			if(!(parseInt(checkPosArr[i].x) + 40 > fontPos[i].x && parseInt(checkPosArr[i].x) - 40 < fontPos[i].x && parseInt(checkPosArr[i].y) + 40 > fontPos[i].y && parseInt(checkPosArr[i].y) - 40 < fontPos[i].y)) {
+       				flag = false;
+       				break;
+       			}
+       		}
+       		
+       		return flag;
+       	},
+       	
+       	//弹出式
+        showImg : function() {
+        	this.htmlDoms.out_panel.css({'display': 'block'});
+        },
+        
+        //固定式
+        hideImg : function() {
+        	this.htmlDoms.out_panel.css({'display': 'none'});
+        },
+       	
+       	//刷新
+        refresh: function() {
+        	var _this = this;
+        	this.$element.find('.point-area').remove();
+        	this.fontPos = [];
+        	this.checkPosArr = [];
+        	this.num = 1;
+        	
+        	this.img_rand = Math.floor(Math.random() * this.options.imgName.length);			//随机的背景图片
+        	var img = new Image();
+		    img.src = this.options.imgUrl +this.options.imgName[this.img_rand];
+		 	
+		 	
+		 	// 加载完成开始绘制
+		 	$(img).on('load', function(e) {
+        		this.fontPos = _this.drawImg(_this, this);
+        	});
+        	
+        	_this.$element.find('.verify-bar-area').css({'color': '#000', 'border-color': '#ddd'});
+			_this.$element.find('.verify-msg').text('验证失败');
+			_this.$element.find('.verify-refresh').show();
+        },
+    	
+    };
+    
+    //在插件中使用codeVerify对象
+    $.fn.codeVerify = function(options, callbacks) {
+        var code = new Code(this, options);
+        code.init();
+    };
+    
+    //在插件中使用slideVerify对象
+    $.fn.slideVerify = function(options, callbacks) {
+        var slide = new Slide(this, options);
+        slide.init();
+    };
+    
+    //在插件中使用clickVerify对象
+    $.fn.pointsVerify = function(options, callbacks) {
+        var points = new Points(this, options);
+        points.init();
+    };
+   
+})(jQuery, window, document);
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/weui/jquery-weui.min.js b/pluss-wap-page/src/main/resources/static/resources/js/weui/jquery-weui.min.js
new file mode 100644
index 0000000..28951e8
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/weui/jquery-weui.min.js
@@ -0,0 +1,13 @@
+/** 
+* jQuery WeUI V1.2.1 
+* By 言川
+* http://lihongxun945.github.io/jquery-weui/
+ */
+!function(t){"use strict";t.fn.transitionEnd=function(t){function e(r){if(r.target===this)for(t.call(this,r),n=0;n<i.length;n++)a.off(i[n],e)}var n,i=["webkitTransitionEnd","transitionend","oTransitionEnd","MSTransitionEnd","msTransitionEnd"],a=this;if(t)for(n=0;n<i.length;n++)a.on(i[n],e);return this},t.support=function(){var t={touch:!!("ontouchstart"in window||window.DocumentTouch&&document instanceof window.DocumentTouch)};return t}(),t.touchEvents={start:t.support.touch?"touchstart":"mousedown",move:t.support.touch?"touchmove":"mousemove",end:t.support.touch?"touchend":"mouseup"},t.getTouchPosition=function(t){return t=t.originalEvent||t,"touchstart"===t.type||"touchmove"===t.type||"touchend"===t.type?{x:t.targetTouches[0].pageX,y:t.targetTouches[0].pageY}:{x:t.pageX,y:t.pageY}},t.fn.scrollHeight=function(){return this[0].scrollHeight},t.fn.transform=function(t){for(var e=0;e<this.length;e++){var n=this[e].style;n.webkitTransform=n.MsTransform=n.msTransform=n.MozTransform=n.OTransform=n.transform=t}return this},t.fn.transition=function(t){"string"!=typeof t&&(t+="ms");for(var e=0;e<this.length;e++){var n=this[e].style;n.webkitTransitionDuration=n.MsTransitionDuration=n.msTransitionDuration=n.MozTransitionDuration=n.OTransitionDuration=n.transitionDuration=t}return this},t.getTranslate=function(t,e){var n,i,a,r;return"undefined"==typeof e&&(e="x"),a=window.getComputedStyle(t,null),window.WebKitCSSMatrix?r=new WebKitCSSMatrix("none"===a.webkitTransform?"":a.webkitTransform):(r=a.MozTransform||a.OTransform||a.MsTransform||a.msTransform||a.transform||a.getPropertyValue("transform").replace("translate(","matrix(1, 0, 0, 1,"),n=r.toString().split(",")),"x"===e&&(i=window.WebKitCSSMatrix?r.m41:16===n.length?parseFloat(n[12]):parseFloat(n[4])),"y"===e&&(i=window.WebKitCSSMatrix?r.m42:16===n.length?parseFloat(n[13]):parseFloat(n[5])),i||0},t.requestAnimationFrame=function(t){return window.requestAnimationFrame?window.requestAnimationFrame(t):window.webkitRequestAnimationFrame?window.webkitRequestAnimationFrame(t):window.mozRequestAnimationFrame?window.mozRequestAnimationFrame(t):window.setTimeout(t,1e3/60)},t.cancelAnimationFrame=function(t){return window.cancelAnimationFrame?window.cancelAnimationFrame(t):window.webkitCancelAnimationFrame?window.webkitCancelAnimationFrame(t):window.mozCancelAnimationFrame?window.mozCancelAnimationFrame(t):window.clearTimeout(t)},t.fn.join=function(t){return this.toArray().join(t)}}($),+function(t){"use strict";t.Template7=t.t7=function(){function t(t){return"[object Array]"===Object.prototype.toString.apply(t)}function e(t){return"function"==typeof t}function n(t){var e,n,i,a=t.replace(/[{}#}]/g,"").split(" "),r=[];for(n=0;n<a.length;n++){var o=a[n];if(0===n)r.push(o);else if(0===o.indexOf('"'))if(2===o.match(/"/g).length)r.push(o);else{for(e=0,i=n+1;i<a.length;i++)if(o+=" "+a[i],a[i].indexOf('"')>=0){e=i,r.push(o);break}e&&(n=e)}else if(o.indexOf("=")>0){var s=o.split("="),c=s[0],l=s[1];if(2!==l.match(/"/g).length){for(e=0,i=n+1;i<a.length;i++)if(l+=" "+a[i],a[i].indexOf('"')>=0){e=i;break}e&&(n=e)}var u=[c,l.replace(/"/g,"")];r.push(u)}else r.push(o)}return r}function i(e){var i,a,r=[];if(!e)return[];var o=e.split(/({{[^{^}]*}})/);for(i=0;i<o.length;i++){var s=o[i];if(""!==s)if(s.indexOf("{{")<0)r.push({type:"plain",content:s});else{if(s.indexOf("{/")>=0)continue;if(s.indexOf("{#")<0&&s.indexOf(" ")<0&&s.indexOf("else")<0){r.push({type:"variable",contextName:s.replace(/[{}]/g,"")});continue}var c=n(s),l=c[0],u=[],p={};for(a=1;a<c.length;a++){var h=c[a];t(h)?p[h[0]]="false"!==h[1]&&h[1]:u.push(h)}if(s.indexOf("{#")>=0){var d,f="",m="",v=0,g=!1,w=!1,y=0;for(a=i+1;a<o.length;a++)if(o[a].indexOf("{{#")>=0&&y++,o[a].indexOf("{{/")>=0&&y--,o[a].indexOf("{{#"+l)>=0)f+=o[a],w&&(m+=o[a]),v++;else if(o[a].indexOf("{{/"+l)>=0){if(!(v>0)){d=a,g=!0;break}v--,f+=o[a],w&&(m+=o[a])}else o[a].indexOf("else")>=0&&0===y?w=!0:(w||(f+=o[a]),w&&(m+=o[a]));g&&(d&&(i=d),r.push({type:"helper",helperName:l,contextName:u,content:f,inverseContent:m,hash:p}))}else s.indexOf(" ")>0&&r.push({type:"helper",helperName:l,contextName:u,hash:p})}}return r}var a=function(t){function e(t,e){return t.content?o(t.content,e):function(){return""}}function n(t,e){return t.inverseContent?o(t.inverseContent,e):function(){return""}}function a(t,e){var n,i,a=0;if(0===t.indexOf("../")){a=t.split("../").length-1;var r=e.split("_")[1]-a;e="ctx_"+(r>=1?r:1),i=t.split("../")[a].split(".")}else 0===t.indexOf("@global")?(e="$.Template7.global",i=t.split("@global.")[1].split(".")):0===t.indexOf("@root")?(e="ctx_1",i=t.split("@root.")[1].split(".")):i=t.split(".");n=e;for(var o=0;o<i.length;o++){var s=i[o];0===s.indexOf("@")?o>0?n+="[(data && data."+s.replace("@","")+")]":n="(data && data."+t.replace("@","")+")":isFinite(s)?n+="["+s+"]":0===s.indexOf("this")?n=s.replace("this",e):n+="."+s}return n}function r(t,e){for(var n=[],i=0;i<t.length;i++)0===t[i].indexOf('"')?n.push(t[i]):n.push(a(t[i],e));return n.join(", ")}function o(t,o){if(o=o||1,t=t||s.template,"string"!=typeof t)throw new Error("Template7: Template must be a string");var c=i(t);if(0===c.length)return function(){return""};var l="ctx_"+o,u="(function ("+l+", data) {\n";1===o&&(u+="function isArray(arr){return Object.prototype.toString.apply(arr) === '[object Array]';}\n",u+="function isFunction(func){return (typeof func === 'function');}\n",u+='function c(val, ctx) {if (typeof val !== "undefined") {if (isFunction(val)) {return val.call(ctx);} else return val;} else return "";}\n'),u+="var r = '';\n";var p;for(p=0;p<c.length;p++){var h=c[p];if("plain"!==h.type){var d,f;if("variable"===h.type&&(d=a(h.contextName,l),u+="r += c("+d+", "+l+");"),"helper"===h.type)if(h.helperName in s.helpers)f=r(h.contextName,l),u+="r += ($.Template7.helpers."+h.helperName+").call("+l+", "+(f&&f+", ")+"{hash:"+JSON.stringify(h.hash)+", data: data || {}, fn: "+e(h,o+1)+", inverse: "+n(h,o+1)+", root: ctx_1});";else{if(h.contextName.length>0)throw new Error('Template7: Missing helper: "'+h.helperName+'"');d=a(h.helperName,l),u+="if ("+d+") {",u+="if (isArray("+d+")) {",u+="r += ($.Template7.helpers.each).call("+l+", "+d+", {hash:"+JSON.stringify(h.hash)+", data: data || {}, fn: "+e(h,o+1)+", inverse: "+n(h,o+1)+", root: ctx_1});",u+="}else {",u+="r += ($.Template7.helpers.with).call("+l+", "+d+", {hash:"+JSON.stringify(h.hash)+", data: data || {}, fn: "+e(h,o+1)+", inverse: "+n(h,o+1)+", root: ctx_1});",u+="}}"}}else u+="r +='"+h.content.replace(/\r/g,"\\r").replace(/\n/g,"\\n").replace(/'/g,"\\'")+"';"}return u+="\nreturn r;})",eval.call(window,u)}var s=this;s.template=t,s.compile=function(t){return s.compiled||(s.compiled=o(t)),s.compiled}};a.prototype={options:{},helpers:{"if":function(t,n){return e(t)&&(t=t.call(this)),t?n.fn(this,n.data):n.inverse(this,n.data)},unless:function(t,n){return e(t)&&(t=t.call(this)),t?n.inverse(this,n.data):n.fn(this,n.data)},each:function(n,i){var a="",r=0;if(e(n)&&(n=n.call(this)),t(n)){for(i.hash.reverse&&(n=n.reverse()),r=0;r<n.length;r++)a+=i.fn(n[r],{first:0===r,last:r===n.length-1,index:r});i.hash.reverse&&(n=n.reverse())}else for(var o in n)r++,a+=i.fn(n[o],{key:o});return r>0?a:i.inverse(this)},"with":function(t,n){return e(t)&&(t=t.call(this)),n.fn(t)},join:function(t,n){return e(t)&&(t=t.call(this)),t.join(n.hash.delimiter||n.hash.delimeter)},js:function(t,e){var n;return n=t.indexOf("return")>=0?"(function(){"+t+"})":"(function(){return ("+t+")})",eval.call(this,n).call(this)},js_compare:function(t,e){var n;n=t.indexOf("return")>=0?"(function(){"+t+"})":"(function(){return ("+t+")})";var i=eval.call(this,n).call(this);return i?e.fn(this,e.data):e.inverse(this,e.data)}}};var r=function(t,e){if(2===arguments.length){var n=new a(t),i=n.compile()(e);return n=null,i}return new a(t)};return r.registerHelper=function(t,e){a.prototype.helpers[t]=e},r.unregisterHelper=function(t){a.prototype.helpers[t]=void 0,delete a.prototype.helpers[t]},r.compile=function(t,e){var n=new a(t,e);return n.compile()},r.options=a.prototype.options,r.helpers=a.prototype.helpers,r}()}($),/*! Hammer.JS - v2.0.8 - 2016-04-23
+ * http://hammerjs.github.io/
+ *
+ * Copyright (c) 2016 Jorik Tangelder;
+ * Licensed under the MIT license */
+function(t,e,n,i){"use strict";function a(t,e,n){return setTimeout(l(t,n),e)}function r(t,e,n){return!!Array.isArray(t)&&(o(t,n[e],n),!0)}function o(t,e,n){var a;if(t)if(t.forEach)t.forEach(e,n);else if(t.length!==i)for(a=0;a<t.length;)e.call(n,t[a],a,t),a++;else for(a in t)t.hasOwnProperty(a)&&e.call(n,t[a],a,t)}function s(e,n,i){var a="DEPRECATED METHOD: "+n+"\n"+i+" AT \n";return function(){var n=new Error("get-stack-trace"),i=n&&n.stack?n.stack.replace(/^[^\(]+?[\n$]/gm,"").replace(/^\s+at\s+/gm,"").replace(/^Object.<anonymous>\s*\(/gm,"{anonymous}()@"):"Unknown Stack Trace",r=t.console&&(t.console.warn||t.console.log);return r&&r.call(t.console,a,i),e.apply(this,arguments)}}function c(t,e,n){var i,a=e.prototype;i=t.prototype=Object.create(a),i.constructor=t,i._super=a,n&&pt(i,n)}function l(t,e){return function(){return t.apply(e,arguments)}}function u(t,e){return typeof t==ft?t.apply(e?e[0]||i:i,e):t}function p(t,e){return t===i?e:t}function h(t,e,n){o(v(e),function(e){t.addEventListener(e,n,!1)})}function d(t,e,n){o(v(e),function(e){t.removeEventListener(e,n,!1)})}function f(t,e){for(;t;){if(t==e)return!0;t=t.parentNode}return!1}function m(t,e){return t.indexOf(e)>-1}function v(t){return t.trim().split(/\s+/g)}function g(t,e,n){if(t.indexOf&&!n)return t.indexOf(e);for(var i=0;i<t.length;){if(n&&t[i][n]==e||!n&&t[i]===e)return i;i++}return-1}function w(t){return Array.prototype.slice.call(t,0)}function y(t,e,n){for(var i=[],a=[],r=0;r<t.length;){var o=e?t[r][e]:t[r];g(a,o)<0&&i.push(t[r]),a[r]=o,r++}return n&&(i=e?i.sort(function(t,n){return t[e]>n[e]}):i.sort()),i}function T(t,e){for(var n,a,r=e[0].toUpperCase()+e.slice(1),o=0;o<ht.length;){if(n=ht[o],a=n?n+r:e,a in t)return a;o++}return i}function k(){return Tt++}function x(e){var n=e.ownerDocument||e;return n.defaultView||n.parentWindow||t}function C(t,e){var n=this;this.manager=t,this.callback=e,this.element=t.element,this.target=t.options.inputTarget,this.domHandler=function(e){u(t.options.enable,[t])&&n.handler(e)},this.init()}function b(t){var e,n=t.options.inputClass;return new(e=n?n:Ct?F:bt?z:xt?j:N)(t,M)}function M(t,e,n){var i=n.pointers.length,a=n.changedPointers.length,r=e&Ot&&i-a===0,o=e&(It|Ht)&&i-a===0;n.isFirst=!!r,n.isFinal=!!o,r&&(t.session={}),n.eventType=e,_(t,n),t.emit("hammer.input",n),t.recognize(n),t.session.prevInput=n}function _(t,e){var n=t.session,i=e.pointers,a=i.length;n.firstInput||(n.firstInput=P(e)),a>1&&!n.firstMultiple?n.firstMultiple=P(e):1===a&&(n.firstMultiple=!1);var r=n.firstInput,o=n.firstMultiple,s=o?o.center:r.center,c=e.center=O(i);e.timeStamp=gt(),e.deltaTime=e.timeStamp-r.timeStamp,e.angle=S(s,c),e.distance=H(s,c),E(n,e),e.offsetDirection=I(e.deltaX,e.deltaY);var l=A(e.deltaTime,e.deltaX,e.deltaY);e.overallVelocityX=l.x,e.overallVelocityY=l.y,e.overallVelocity=vt(l.x)>vt(l.y)?l.x:l.y,e.scale=o?V(o.pointers,i):1,e.rotation=o?Y(o.pointers,i):0,e.maxPointers=n.prevInput?e.pointers.length>n.prevInput.maxPointers?e.pointers.length:n.prevInput.maxPointers:e.pointers.length,D(n,e);var u=t.element;f(e.srcEvent.target,u)&&(u=e.srcEvent.target),e.target=u}function E(t,e){var n=e.center,i=t.offsetDelta||{},a=t.prevDelta||{},r=t.prevInput||{};e.eventType!==Ot&&r.eventType!==It||(a=t.prevDelta={x:r.deltaX||0,y:r.deltaY||0},i=t.offsetDelta={x:n.x,y:n.y}),e.deltaX=a.x+(n.x-i.x),e.deltaY=a.y+(n.y-i.y)}function D(t,e){var n,a,r,o,s=t.lastInterval||e,c=e.timeStamp-s.timeStamp;if(e.eventType!=Ht&&(c>Pt||s.velocity===i)){var l=e.deltaX-s.deltaX,u=e.deltaY-s.deltaY,p=A(c,l,u);a=p.x,r=p.y,n=vt(p.x)>vt(p.y)?p.x:p.y,o=I(l,u),t.lastInterval=e}else n=s.velocity,a=s.velocityX,r=s.velocityY,o=s.direction;e.velocity=n,e.velocityX=a,e.velocityY=r,e.direction=o}function P(t){for(var e=[],n=0;n<t.pointers.length;)e[n]={clientX:mt(t.pointers[n].clientX),clientY:mt(t.pointers[n].clientY)},n++;return{timeStamp:gt(),pointers:e,center:O(e),deltaX:t.deltaX,deltaY:t.deltaY}}function O(t){var e=t.length;if(1===e)return{x:mt(t[0].clientX),y:mt(t[0].clientY)};for(var n=0,i=0,a=0;a<e;)n+=t[a].clientX,i+=t[a].clientY,a++;return{x:mt(n/e),y:mt(i/e)}}function A(t,e,n){return{x:e/t||0,y:n/t||0}}function I(t,e){return t===e?St:vt(t)>=vt(e)?t<0?Yt:Vt:e<0?Nt:Ft}function H(t,e,n){n||(n=Lt);var i=e[n[0]]-t[n[0]],a=e[n[1]]-t[n[1]];return Math.sqrt(i*i+a*a)}function S(t,e,n){n||(n=Lt);var i=e[n[0]]-t[n[0]],a=e[n[1]]-t[n[1]];return 180*Math.atan2(a,i)/Math.PI}function Y(t,e){return S(e[1],e[0],jt)+S(t[1],t[0],jt)}function V(t,e){return H(e[0],e[1],jt)/H(t[0],t[1],jt)}function N(){this.evEl=$t,this.evWin=Wt,this.pressed=!1,C.apply(this,arguments)}function F(){this.evEl=Bt,this.evWin=Gt,C.apply(this,arguments),this.store=this.manager.session.pointerEvents=[]}function R(){this.evTarget=Zt,this.evWin=Qt,this.started=!1,C.apply(this,arguments)}function q(t,e){var n=w(t.touches),i=w(t.changedTouches);return e&(It|Ht)&&(n=y(n.concat(i),"identifier",!0)),[n,i]}function z(){this.evTarget=ee,this.targetIds={},C.apply(this,arguments)}function L(t,e){var n=w(t.touches),i=this.targetIds;if(e&(Ot|At)&&1===n.length)return i[n[0].identifier]=!0,[n,n];var a,r,o=w(t.changedTouches),s=[],c=this.target;if(r=n.filter(function(t){return f(t.target,c)}),e===Ot)for(a=0;a<r.length;)i[r[a].identifier]=!0,a++;for(a=0;a<o.length;)i[o[a].identifier]&&s.push(o[a]),e&(It|Ht)&&delete i[o[a].identifier],a++;return s.length?[y(r.concat(s),"identifier",!0),s]:void 0}function j(){C.apply(this,arguments);var t=l(this.handler,this);this.touch=new z(this.manager,t),this.mouse=new N(this.manager,t),this.primaryTouch=null,this.lastTouches=[]}function X(t,e){t&Ot?(this.primaryTouch=e.changedPointers[0].identifier,$.call(this,e)):t&(It|Ht)&&$.call(this,e)}function $(t){var e=t.changedPointers[0];if(e.identifier===this.primaryTouch){var n={x:e.clientX,y:e.clientY};this.lastTouches.push(n);var i=this.lastTouches,a=function(){var t=i.indexOf(n);t>-1&&i.splice(t,1)};setTimeout(a,ne)}}function W(t){for(var e=t.srcEvent.clientX,n=t.srcEvent.clientY,i=0;i<this.lastTouches.length;i++){var a=this.lastTouches[i],r=Math.abs(e-a.x),o=Math.abs(n-a.y);if(r<=ie&&o<=ie)return!0}return!1}function K(t,e){this.manager=t,this.set(e)}function U(t){if(m(t,le))return le;var e=m(t,ue),n=m(t,pe);return e&&n?le:e||n?e?ue:pe:m(t,ce)?ce:se}function B(){if(!re)return!1;var e={},n=t.CSS&&t.CSS.supports;return["auto","manipulation","pan-y","pan-x","pan-x pan-y","none"].forEach(function(i){e[i]=!n||t.CSS.supports("touch-action",i)}),e}function G(t){this.options=pt({},this.defaults,t||{}),this.id=k(),this.manager=null,this.options.enable=p(this.options.enable,!0),this.state=de,this.simultaneous={},this.requireFail=[]}function J(t){return t&we?"cancel":t&ve?"end":t&me?"move":t&fe?"start":""}function Z(t){return t==Ft?"down":t==Nt?"up":t==Yt?"left":t==Vt?"right":""}function Q(t,e){var n=e.manager;return n?n.get(t):t}function tt(){G.apply(this,arguments)}function et(){tt.apply(this,arguments),this.pX=null,this.pY=null}function nt(){tt.apply(this,arguments)}function it(){G.apply(this,arguments),this._timer=null,this._input=null}function at(){tt.apply(this,arguments)}function rt(){tt.apply(this,arguments)}function ot(){G.apply(this,arguments),this.pTime=!1,this.pCenter=!1,this._timer=null,this._input=null,this.count=0}function st(t,e){return e=e||{},e.recognizers=p(e.recognizers,st.defaults.preset),new ct(t,e)}function ct(t,e){this.options=pt({},st.defaults,e||{}),this.options.inputTarget=this.options.inputTarget||t,this.handlers={},this.session={},this.recognizers=[],this.oldCssProps={},this.element=t,this.input=b(this),this.touchAction=new K(this,this.options.touchAction),lt(this,!0),o(this.options.recognizers,function(t){var e=this.add(new t[0](t[1]));t[2]&&e.recognizeWith(t[2]),t[3]&&e.requireFailure(t[3])},this)}function lt(t,e){var n=t.element;if(n.style){var i;o(t.options.cssProps,function(a,r){i=T(n.style,r),e?(t.oldCssProps[i]=n.style[i],n.style[i]=a):n.style[i]=t.oldCssProps[i]||""}),e||(t.oldCssProps={})}}function ut(t,n){var i=e.createEvent("Event");i.initEvent(t,!0,!0),i.gesture=n,n.target.dispatchEvent(i)}var pt,ht=["","webkit","Moz","MS","ms","o"],dt=e.createElement("div"),ft="function",mt=Math.round,vt=Math.abs,gt=Date.now;pt="function"!=typeof Object.assign?function(t){if(t===i||null===t)throw new TypeError("Cannot convert undefined or null to object");for(var e=Object(t),n=1;n<arguments.length;n++){var a=arguments[n];if(a!==i&&null!==a)for(var r in a)a.hasOwnProperty(r)&&(e[r]=a[r])}return e}:Object.assign;var wt=s(function(t,e,n){for(var a=Object.keys(e),r=0;r<a.length;)(!n||n&&t[a[r]]===i)&&(t[a[r]]=e[a[r]]),r++;return t},"extend","Use `assign`."),yt=s(function(t,e){return wt(t,e,!0)},"merge","Use `assign`."),Tt=1,kt=/mobile|tablet|ip(ad|hone|od)|android/i,xt="ontouchstart"in t,Ct=T(t,"PointerEvent")!==i,bt=xt&&kt.test(navigator.userAgent),Mt="touch",_t="pen",Et="mouse",Dt="kinect",Pt=25,Ot=1,At=2,It=4,Ht=8,St=1,Yt=2,Vt=4,Nt=8,Ft=16,Rt=Yt|Vt,qt=Nt|Ft,zt=Rt|qt,Lt=["x","y"],jt=["clientX","clientY"];C.prototype={handler:function(){},init:function(){this.evEl&&h(this.element,this.evEl,this.domHandler),this.evTarget&&h(this.target,this.evTarget,this.domHandler),this.evWin&&h(x(this.element),this.evWin,this.domHandler)},destroy:function(){this.evEl&&d(this.element,this.evEl,this.domHandler),this.evTarget&&d(this.target,this.evTarget,this.domHandler),this.evWin&&d(x(this.element),this.evWin,this.domHandler)}};var Xt={mousedown:Ot,mousemove:At,mouseup:It},$t="mousedown",Wt="mousemove mouseup";c(N,C,{handler:function(t){var e=Xt[t.type];e&Ot&&0===t.button&&(this.pressed=!0),e&At&&1!==t.which&&(e=It),this.pressed&&(e&It&&(this.pressed=!1),this.callback(this.manager,e,{pointers:[t],changedPointers:[t],pointerType:Et,srcEvent:t}))}});var Kt={pointerdown:Ot,pointermove:At,pointerup:It,pointercancel:Ht,pointerout:Ht},Ut={2:Mt,3:_t,4:Et,5:Dt},Bt="pointerdown",Gt="pointermove pointerup pointercancel";t.MSPointerEvent&&!t.PointerEvent&&(Bt="MSPointerDown",Gt="MSPointerMove MSPointerUp MSPointerCancel"),c(F,C,{handler:function(t){var e=this.store,n=!1,i=t.type.toLowerCase().replace("ms",""),a=Kt[i],r=Ut[t.pointerType]||t.pointerType,o=r==Mt,s=g(e,t.pointerId,"pointerId");a&Ot&&(0===t.button||o)?s<0&&(e.push(t),s=e.length-1):a&(It|Ht)&&(n=!0),s<0||(e[s]=t,this.callback(this.manager,a,{pointers:e,changedPointers:[t],pointerType:r,srcEvent:t}),n&&e.splice(s,1))}});var Jt={touchstart:Ot,touchmove:At,touchend:It,touchcancel:Ht},Zt="touchstart",Qt="touchstart touchmove touchend touchcancel";c(R,C,{handler:function(t){var e=Jt[t.type];if(e===Ot&&(this.started=!0),this.started){var n=q.call(this,t,e);e&(It|Ht)&&n[0].length-n[1].length===0&&(this.started=!1),this.callback(this.manager,e,{pointers:n[0],changedPointers:n[1],pointerType:Mt,srcEvent:t})}}});var te={touchstart:Ot,touchmove:At,touchend:It,touchcancel:Ht},ee="touchstart touchmove touchend touchcancel";c(z,C,{handler:function(t){var e=te[t.type],n=L.call(this,t,e);n&&this.callback(this.manager,e,{pointers:n[0],changedPointers:n[1],pointerType:Mt,srcEvent:t})}});var ne=2500,ie=25;c(j,C,{handler:function(t,e,n){var i=n.pointerType==Mt,a=n.pointerType==Et;if(!(a&&n.sourceCapabilities&&n.sourceCapabilities.firesTouchEvents)){if(i)X.call(this,e,n);else if(a&&W.call(this,n))return;this.callback(t,e,n)}},destroy:function(){this.touch.destroy(),this.mouse.destroy()}});var ae=T(dt.style,"touchAction"),re=ae!==i,oe="compute",se="auto",ce="manipulation",le="none",ue="pan-x",pe="pan-y",he=B();K.prototype={set:function(t){t==oe&&(t=this.compute()),re&&this.manager.element.style&&he[t]&&(this.manager.element.style[ae]=t),this.actions=t.toLowerCase().trim()},update:function(){this.set(this.manager.options.touchAction)},compute:function(){var t=[];return o(this.manager.recognizers,function(e){u(e.options.enable,[e])&&(t=t.concat(e.getTouchAction()))}),U(t.join(" "))},preventDefaults:function(t){var e=t.srcEvent,n=t.offsetDirection;if(this.manager.session.prevented)return void e.preventDefault();var i=this.actions,a=m(i,le)&&!he[le],r=m(i,pe)&&!he[pe],o=m(i,ue)&&!he[ue];if(a){var s=1===t.pointers.length,c=t.distance<2,l=t.deltaTime<250;if(s&&c&&l)return}return o&&r?void 0:a||r&&n&Rt||o&&n&qt?this.preventSrc(e):void 0},preventSrc:function(t){this.manager.session.prevented=!0,t.preventDefault()}};var de=1,fe=2,me=4,ve=8,ge=ve,we=16,ye=32;G.prototype={defaults:{},set:function(t){return pt(this.options,t),this.manager&&this.manager.touchAction.update(),this},recognizeWith:function(t){if(r(t,"recognizeWith",this))return this;var e=this.simultaneous;return t=Q(t,this),e[t.id]||(e[t.id]=t,t.recognizeWith(this)),this},dropRecognizeWith:function(t){return r(t,"dropRecognizeWith",this)?this:(t=Q(t,this),delete this.simultaneous[t.id],this)},requireFailure:function(t){if(r(t,"requireFailure",this))return this;var e=this.requireFail;return t=Q(t,this),g(e,t)===-1&&(e.push(t),t.requireFailure(this)),this},dropRequireFailure:function(t){if(r(t,"dropRequireFailure",this))return this;t=Q(t,this);var e=g(this.requireFail,t);return e>-1&&this.requireFail.splice(e,1),this},hasRequireFailures:function(){return this.requireFail.length>0},canRecognizeWith:function(t){return!!this.simultaneous[t.id]},emit:function(t){function e(e){n.manager.emit(e,t)}var n=this,i=this.state;i<ve&&e(n.options.event+J(i)),e(n.options.event),t.additionalEvent&&e(t.additionalEvent),i>=ve&&e(n.options.event+J(i))},tryEmit:function(t){return this.canEmit()?this.emit(t):void(this.state=ye)},canEmit:function(){for(var t=0;t<this.requireFail.length;){if(!(this.requireFail[t].state&(ye|de)))return!1;t++}return!0},recognize:function(t){var e=pt({},t);return u(this.options.enable,[this,e])?(this.state&(ge|we|ye)&&(this.state=de),this.state=this.process(e),void(this.state&(fe|me|ve|we)&&this.tryEmit(e))):(this.reset(),void(this.state=ye))},process:function(t){},getTouchAction:function(){},reset:function(){}},c(tt,G,{defaults:{pointers:1},attrTest:function(t){var e=this.options.pointers;return 0===e||t.pointers.length===e},process:function(t){var e=this.state,n=t.eventType,i=e&(fe|me),a=this.attrTest(t);return i&&(n&Ht||!a)?e|we:i||a?n&It?e|ve:e&fe?e|me:fe:ye}}),c(et,tt,{defaults:{event:"pan",threshold:10,pointers:1,direction:zt},getTouchAction:function(){var t=this.options.direction,e=[];return t&Rt&&e.push(pe),t&qt&&e.push(ue),e},directionTest:function(t){var e=this.options,n=!0,i=t.distance,a=t.direction,r=t.deltaX,o=t.deltaY;return a&e.direction||(e.direction&Rt?(a=0===r?St:r<0?Yt:Vt,n=r!=this.pX,i=Math.abs(t.deltaX)):(a=0===o?St:o<0?Nt:Ft,n=o!=this.pY,i=Math.abs(t.deltaY))),t.direction=a,n&&i>e.threshold&&a&e.direction},attrTest:function(t){return tt.prototype.attrTest.call(this,t)&&(this.state&fe||!(this.state&fe)&&this.directionTest(t))},emit:function(t){this.pX=t.deltaX,this.pY=t.deltaY;var e=Z(t.direction);e&&(t.additionalEvent=this.options.event+e),this._super.emit.call(this,t)}}),c(nt,tt,{defaults:{event:"pinch",threshold:0,pointers:2},getTouchAction:function(){return[le]},attrTest:function(t){return this._super.attrTest.call(this,t)&&(Math.abs(t.scale-1)>this.options.threshold||this.state&fe)},emit:function(t){if(1!==t.scale){var e=t.scale<1?"in":"out";t.additionalEvent=this.options.event+e}this._super.emit.call(this,t)}}),c(it,G,{defaults:{event:"press",pointers:1,time:251,threshold:9},getTouchAction:function(){return[se]},process:function(t){var e=this.options,n=t.pointers.length===e.pointers,i=t.distance<e.threshold,r=t.deltaTime>e.time;if(this._input=t,!i||!n||t.eventType&(It|Ht)&&!r)this.reset();else if(t.eventType&Ot)this.reset(),this._timer=a(function(){this.state=ge,this.tryEmit()},e.time,this);else if(t.eventType&It)return ge;return ye},reset:function(){clearTimeout(this._timer)},emit:function(t){this.state===ge&&(t&&t.eventType&It?this.manager.emit(this.options.event+"up",t):(this._input.timeStamp=gt(),this.manager.emit(this.options.event,this._input)))}}),c(at,tt,{defaults:{event:"rotate",threshold:0,pointers:2},getTouchAction:function(){return[le]},attrTest:function(t){return this._super.attrTest.call(this,t)&&(Math.abs(t.rotation)>this.options.threshold||this.state&fe)}}),c(rt,tt,{defaults:{event:"swipe",threshold:10,velocity:.3,direction:Rt|qt,pointers:1},getTouchAction:function(){return et.prototype.getTouchAction.call(this)},attrTest:function(t){var e,n=this.options.direction;return n&(Rt|qt)?e=t.overallVelocity:n&Rt?e=t.overallVelocityX:n&qt&&(e=t.overallVelocityY),this._super.attrTest.call(this,t)&&n&t.offsetDirection&&t.distance>this.options.threshold&&t.maxPointers==this.options.pointers&&vt(e)>this.options.velocity&&t.eventType&It},emit:function(t){var e=Z(t.offsetDirection);e&&this.manager.emit(this.options.event+e,t),this.manager.emit(this.options.event,t)}}),c(ot,G,{defaults:{event:"tap",pointers:1,taps:1,interval:300,time:250,threshold:9,posThreshold:10},getTouchAction:function(){return[ce]},process:function(t){var e=this.options,n=t.pointers.length===e.pointers,i=t.distance<e.threshold,r=t.deltaTime<e.time;if(this.reset(),t.eventType&Ot&&0===this.count)return this.failTimeout();if(i&&r&&n){if(t.eventType!=It)return this.failTimeout();var o=!this.pTime||t.timeStamp-this.pTime<e.interval,s=!this.pCenter||H(this.pCenter,t.center)<e.posThreshold;this.pTime=t.timeStamp,this.pCenter=t.center,s&&o?this.count+=1:this.count=1,this._input=t;var c=this.count%e.taps;if(0===c)return this.hasRequireFailures()?(this._timer=a(function(){this.state=ge,this.tryEmit()},e.interval,this),fe):ge}return ye},failTimeout:function(){return this._timer=a(function(){this.state=ye},this.options.interval,this),ye},reset:function(){clearTimeout(this._timer)},emit:function(){this.state==ge&&(this._input.tapCount=this.count,this.manager.emit(this.options.event,this._input))}}),st.VERSION="2.0.8",st.defaults={domEvents:!1,touchAction:oe,enable:!0,inputTarget:null,inputClass:null,preset:[[at,{enable:!1}],[nt,{enable:!1},["rotate"]],[rt,{direction:Rt}],[et,{direction:Rt},["swipe"]],[ot],[ot,{event:"doubletap",taps:2},["tap"]],[it]],cssProps:{userSelect:"none",touchSelect:"none",touchCallout:"none",contentZooming:"none",userDrag:"none",tapHighlightColor:"rgba(0,0,0,0)"}};var Te=1,ke=2;ct.prototype={set:function(t){return pt(this.options,t),t.touchAction&&this.touchAction.update(),t.inputTarget&&(this.input.destroy(),this.input.target=t.inputTarget,this.input.init()),this},stop:function(t){this.session.stopped=t?ke:Te},recognize:function(t){var e=this.session;if(!e.stopped){this.touchAction.preventDefaults(t);var n,i=this.recognizers,a=e.curRecognizer;(!a||a&&a.state&ge)&&(a=e.curRecognizer=null);for(var r=0;r<i.length;)n=i[r],e.stopped===ke||a&&n!=a&&!n.canRecognizeWith(a)?n.reset():n.recognize(t),!a&&n.state&(fe|me|ve)&&(a=e.curRecognizer=n),r++}},get:function(t){if(t instanceof G)return t;for(var e=this.recognizers,n=0;n<e.length;n++)if(e[n].options.event==t)return e[n];return null},add:function(t){if(r(t,"add",this))return this;var e=this.get(t.options.event);return e&&this.remove(e),this.recognizers.push(t),t.manager=this,this.touchAction.update(),t},remove:function(t){if(r(t,"remove",this))return this;if(t=this.get(t)){var e=this.recognizers,n=g(e,t);n!==-1&&(e.splice(n,1),this.touchAction.update())}return this},on:function(t,e){if(t!==i&&e!==i){var n=this.handlers;return o(v(t),function(t){n[t]=n[t]||[],n[t].push(e)}),this}},off:function(t,e){if(t!==i){var n=this.handlers;return o(v(t),function(t){e?n[t]&&n[t].splice(g(n[t],e),1):delete n[t]}),this}},emit:function(t,e){this.options.domEvents&&ut(t,e);var n=this.handlers[t]&&this.handlers[t].slice();if(n&&n.length){e.type=t,e.preventDefault=function(){e.srcEvent.preventDefault()};for(var i=0;i<n.length;)n[i](e),i++}},destroy:function(){this.element&&lt(this,!1),this.handlers={},this.session={},this.input.destroy(),this.element=null}},pt(st,{INPUT_START:Ot,INPUT_MOVE:At,INPUT_END:It,INPUT_CANCEL:Ht,STATE_POSSIBLE:de,STATE_BEGAN:fe,STATE_CHANGED:me,STATE_ENDED:ve,STATE_RECOGNIZED:ge,STATE_CANCELLED:we,STATE_FAILED:ye,DIRECTION_NONE:St,DIRECTION_LEFT:Yt,DIRECTION_RIGHT:Vt,DIRECTION_UP:Nt,DIRECTION_DOWN:Ft,DIRECTION_HORIZONTAL:Rt,DIRECTION_VERTICAL:qt,DIRECTION_ALL:zt,Manager:ct,Input:C,TouchAction:K,TouchInput:z,MouseInput:N,PointerEventInput:F,TouchMouseInput:j,SingleTouchInput:R,Recognizer:G,AttrRecognizer:tt,Tap:ot,Pan:et,Swipe:rt,Pinch:nt,Rotate:at,Press:it,on:h,off:d,each:o,merge:yt,extend:wt,assign:pt,inherit:c,bindFn:l,prefixed:T});var xe="undefined"!=typeof t?t:"undefined"!=typeof self?self:{};xe.Hammer=st,"function"==typeof define&&define.amd?define(function(){return st}):"undefined"!=typeof module&&module.exports?module.exports=st:t[n]=st}(window,document,"Hammer"),+function(t){"use strict";var e;t.modal=function(n,i){n=t.extend({},e,n);var a=n.buttons,r=a.map(function(t,e){return'<a href="javascript:;" class="weui-dialog__btn '+(t.className||"")+'">'+t.text+"</a>"}).join(""),o='<div class="weui-dialog"><div class="weui-dialog__hd"><strong class="weui-dialog__title">'+n.title+"</strong></div>"+(n.text?'<div class="weui-dialog__bd">'+n.text+"</div>":"")+'<div class="weui-dialog__ft">'+r+"</div></div>",s=t.openModal(o,i);return s.find(".weui-dialog__btn").each(function(e,i){var r=t(i);r.click(function(){n.autoClose&&t.closeModal(),a[e].onClick&&a[e].onClick.call(s)})}),s},t.openModal=function(e,n){var i=t("<div class='weui-mask'></div>").appendTo(document.body);i.show();var a=t(e).appendTo(document.body);return n&&a.transitionEnd(function(){n.call(a)}),a.show(),i.addClass("weui-mask--visible"),a.addClass("weui-dialog--visible"),a},t.closeModal=function(){t(".weui-mask--visible").removeClass("weui-mask--visible").transitionEnd(function(){t(this).remove()}),t(".weui-dialog--visible").removeClass("weui-dialog--visible").transitionEnd(function(){t(this).remove()})},t.alert=function(n,i,a){var r;return"object"==typeof n?r=n:("function"==typeof i&&(a=arguments[1],i=void 0),r={text:n,title:i,onOK:a}),t.modal({text:r.text,title:r.title,buttons:[{text:e.buttonOK,className:"primary",onClick:r.onOK}]})},t.confirm=function(n,i,a,r){var o;return"object"==typeof n?o=n:("function"==typeof i&&(r=arguments[2],a=arguments[1],i=void 0),o={text:n,title:i,onOK:a,onCancel:r}),t.modal({text:o.text,title:o.title,buttons:[{text:e.buttonCancel,className:"default",onClick:o.onCancel},{text:e.buttonOK,className:"primary",onClick:o.onOK}]})},t.prompt=function(n,i,a,r,o){var s;"object"==typeof n?s=n:("function"==typeof i&&(o=arguments[3],r=arguments[2],a=arguments[1],i=void 0),s={text:n,title:i,input:o,onOK:a,onCancel:r,empty:!1});var c=t.modal({text:'<p class="weui-prompt-text">'+(s.text||"")+'</p><input type="text" class="weui-input weui-prompt-input" id="weui-prompt-input" value="'+(s.input||"")+'" />',title:s.title,autoClose:!1,buttons:[{text:e.buttonCancel,className:"default",onClick:function(){t.closeModal(),s.onCancel&&s.onCancel.call(c)}},{text:e.buttonOK,className:"primary",onClick:function(){var e=t("#weui-prompt-input").val();return s.empty||""!==e&&null!==e?(t.closeModal(),void(s.onOK&&s.onOK.call(c,e))):(c.find(".weui-prompt-input").focus()[0].select(),!1)}}]},function(){this.find(".weui-prompt-input").focus()[0].select()});return c},t.login=function(n,i,a,r,o,s){var c;"object"==typeof n?c=n:("function"==typeof i&&(s=arguments[4],o=arguments[3],r=arguments[2],a=arguments[1],i=void 0),c={text:n,title:i,username:o,password:s,onOK:a,onCancel:r});var l=t.modal({text:'<p class="weui-prompt-text">'+(c.text||"")+'</p><input type="text" class="weui-input weui-prompt-input" id="weui-prompt-username" value="'+(c.username||"")+'" placeholder="输入用户名" /><input type="password" class="weui-input weui-prompt-input" id="weui-prompt-password" value="'+(c.password||"")+'" placeholder="输入密码" />',title:c.title,autoClose:!1,buttons:[{text:e.buttonCancel,className:"default",onClick:function(){t.closeModal(),c.onCancel&&c.onCancel.call(l)}},{text:e.buttonOK,className:"primary",onClick:function(){var e=t("#weui-prompt-username").val(),n=t("#weui-prompt-password").val();return c.empty||""!==e&&null!==e?c.empty||""!==n&&null!==n?(t.closeModal(),void(c.onOK&&c.onOK.call(l,e,n))):(l.find("#weui-prompt-password").focus()[0].select(),!1):(l.find("#weui-prompt-username").focus()[0].select(),!1)}}]},function(){this.find("#weui-prompt-username").focus()[0].select()});return l},e=t.modal.prototype.defaults={title:"提示",text:void 0,buttonOK:"确定",buttonCancel:"取消",buttons:[{text:"确定",className:"primary"}],autoClose:!0}}($),+function(t){"use strict";var e=function(e,n){n=n||"";var i=(t("<div class='weui-mask_transparent'></div>").appendTo(document.body),'<div class="weui-toast '+n+'">'+e+"</div>"),a=t(i).appendTo(document.body);a.addClass("weui-toast--visible"),a.show()},n=function(e){t(".weui-mask_transparent").remove();var n=!1,i=t(".weui-toast--visible").removeClass("weui-toast--visible").transitionEnd(function(){var i=t(this);i.remove(),e&&e(),n=!0});setTimeout(function(){n||(i.remove(),e&&e())},1e3)};t.toast=function(t,a,r){"function"==typeof a&&(r=a);var o,s="weui-icon-success-no-circle",c=i.duration;"cancel"==a?(o="weui-toast_cancel",s="weui-icon-cancel"):"forbidden"==a?(o="weui-toast--forbidden",s="weui-icon-warn"):"text"==a?o="weui-toast--text":"number"==typeof a&&(c=a),e('<i class="'+s+' weui-icon_toast"></i><p class="weui-toast_content">'+(t||"已经完成")+"</p>",o),setTimeout(function(){n(r)},c)},t.showLoading=function(t){var n='<div class="weui_loading">';n+='<i class="weui-loading weui-icon_toast"></i>',n+="</div>",n+='<p class="weui-toast_content">'+(t||"数据加载中")+"</p>",e(n,"weui_loading_toast")},t.hideLoading=function(){n()};var i=t.toast.prototype.defaults={duration:2500}}($),+function(t){"use strict";var e,n=function(e){var n=t("<div class='weui-mask weui-actions_mask'></div>").appendTo(document.body),i=e.actions||[],a=i.map(function(t,e){return'<div class="weui-actionsheet__cell '+(t.className||"")+'">'+t.text+"</div>"}).join(""),r="";e.title&&(r='<div class="weui-actionsheet__title"><p class="weui-actionsheet__title-text">'+e.title+"</p></div>");var o='<div class="weui-actionsheet " id="weui-actionsheet">'+r+'<div class="weui-actionsheet__menu">'+a+'</div><div class="weui-actionsheet__action"><div class="weui-actionsheet__cell weui-actionsheet_cancel">取消</div></div></div>',s=t(o).appendTo(document.body);s.find(".weui-actionsheet__menu .weui-actionsheet__cell, .weui-actionsheet__action .weui-actionsheet__cell").each(function(n,a){t(a).click(function(){t.closeActions(),e.onClose&&e.onClose(),i[n]&&i[n].onClick&&i[n].onClick()})}),n.show(),s.show(),n.addClass("weui-mask--visible"),s.addClass("weui-actionsheet_toggle")},i=function(){t(".weui-mask").removeClass("weui-mask--visible").transitionEnd(function(){t(this).remove()}),t(".weui-actionsheet").removeClass("weui-actionsheet_toggle").transitionEnd(function(){t(this).remove()})};t.actions=function(i){i=t.extend({},e,i),n(i)},t.closeActions=function(){i()},t(document).on("click",".weui-actions_mask",function(){t.closeActions()});var e=t.actions.prototype.defaults={title:void 0,onClose:void 0}}($),+function(t){"use strict";var e=function(n,i){"function"==typeof i&&(i={onRefresh:i}),"string"==typeof i&&(i=void 0),this.opt=t.extend(e.defaults,i||{}),this.container=t(n),this.attachEvents()};e.defaults={distance:50,onRefresh:void 0,onPull:void 0},e.prototype.touchStart=function(e){if(!this.container.hasClass("refreshing")){var n=t.getTouchPosition(e);this.start=n,this.diffX=this.diffY=0}},e.prototype.touchMove=function(e){if(!this.container.hasClass("refreshing")){if(!this.start)return!1;if(!(this.container.scrollTop()>0)){var n=t.getTouchPosition(e);return this.diffX=n.x-this.start.x,this.diffY=n.y-this.start.y,Math.abs(this.diffX)>Math.abs(this.diffY)||void(this.diffY<0||(this.container.addClass("touching"),e.preventDefault(),e.stopPropagation(),this.diffY=Math.pow(this.diffY,.75),this.container.css("transform","translate3d(0, "+this.diffY+"px, 0)"),this.triggerPull(this.diffY)))}}},e.prototype.touchEnd=function(){this.start=!1,this.diffY<=0||this.container.hasClass("refreshing")||(this.container.removeClass("touching"),this.container.removeClass("pull-down pull-up"),this.container.css("transform",""),Math.abs(this.diffY)<=this.opt.distance||this.triggerPullToRefresh())},e.prototype.triggerPullToRefresh=function(){this.triggerPull(this.opt.distance),this.container.removeClass("pull-up").addClass("refreshing"),this.opt.onRefresh&&this.opt.onRefresh.call(this),this.container.trigger("pull-to-refresh")},e.prototype.triggerPull=function(t){t<this.opt.distance?this.container.removeClass("pull-up").addClass("pull-down"):this.container.removeClass("pull-down").addClass("pull-up"),this.opt.onPull&&this.opt.onPull.call(this,Math.floor(t/this.opt.distance*100)),this.container.trigger("pull")},e.prototype.pullToRefreshDone=function(){this.container.removeClass("refreshing")},e.prototype.attachEvents=function(){var e=this.container;e.addClass("weui-pull-to-refresh"),e.on(t.touchEvents.start,t.proxy(this.touchStart,this)),e.on(t.touchEvents.move,t.proxy(this.touchMove,this)),e.on(t.touchEvents.end,t.proxy(this.touchEnd,this))};var n=function(e){t(e).removeClass("refreshing")};t.fn.pullToRefresh=function(n){return this.each(function(){var i=t(this),a=i.data("ptr");a||i.data("ptr",a=new e(this,n)),"string"==typeof n&&a[n].call(a)})},t.fn.pullToRefreshDone=function(){return this.each(function(){n(this)})}}($),+function(t){"use strict";var e=function(e){var n,i=e[0].tagName.toUpperCase();n="BODY"===i||"HTML"===i?e.scrollTop()||t(window).scrollTop():e.scrollTop();var a=e.scrollHeight()-(t(window).height()+n);return console.log(a),a},n=function(e,n){this.container=t(e),this.container.data("infinite",this),this.distance=n||50,this.attachEvents()};n.prototype.scroll=function(){this.container;this._check()},n.prototype.attachEvents=function(e){var n=this.container,i="BODY"===n[0].tagName.toUpperCase()?t(document):n;i[e?"off":"on"]("scroll",t.proxy(this.scroll,this))},n.prototype.detachEvents=function(t){this.attachEvents(!0)},n.prototype._check=function(){var t=e(this.container);Math.abs(t)<=this.distance&&this.container.trigger("infinite")};t.fn.infinite=function(t){return this.each(function(){new n(this,t)})},t.fn.destroyInfinite=function(){return this.each(function(){var e=t(this).data("infinite");e&&e.detachEvents&&e.detachEvents()})}}($),+function(t){"use strict";var e="weui-bar__item--on",n=function(n){var i=t(n);if(!i.hasClass(e)){var a=i.attr("href");if(/^#/.test(a)){i.parent().find("."+e).removeClass(e),i.addClass(e);var r=i.parents(".weui-tab").find(".weui-tab__bd");r.find(".weui-tab__bd-item--active").removeClass("weui-tab__bd-item--active"),t(a).addClass("weui-tab__bd-item--active")}}};t.showTab=n,t(document).on("click",".weui-navbar__item, .weui-tabbar__item",function(i){var a=t(i.currentTarget),r=a.attr("href");a.hasClass(e)||/^#/.test(r)&&(i.preventDefault(),n(a))})}($),+function(t){"use strict";t(document).on("click touchstart",".weui-search-bar__label",function(e){t(e.target).parents(".weui-search-bar").addClass("weui-search-bar_focusing").find("input").focus()}).on("click",".weui-search-bar__cancel-btn",function(e){t(e.target).parents(".weui-search-bar").removeClass("weui-search-bar_focusing").find(".weui-search-bar__input").val("").blur()}).on("click",".weui-icon-clear",function(e){t(e.target).parents(".weui-search-bar").find(".weui-search-bar__input").val("").focus()})}($),function(t){"use strict";var e={},n=navigator.userAgent,i=n.match(/(Android);?[\s\/]+([\d.]+)?/),a=n.match(/(iPad).*OS\s([\d_]+)/),r=n.match(/(iPod)(.*OS\s([\d_]+))?/),o=!a&&n.match(/(iPhone\sOS)\s([\d_]+)/);if(e.ios=e.android=e.iphone=e.ipad=e.androidChrome=!1,i&&(e.os="android",e.osVersion=i[2],e.android=!0,e.androidChrome=n.toLowerCase().indexOf("chrome")>=0),(a||o||r)&&(e.os="ios",e.ios=!0),o&&!r&&(e.osVersion=o[2].replace(/_/g,"."),e.iphone=!0),a&&(e.osVersion=a[2].replace(/_/g,"."),e.ipad=!0),r&&(e.osVersion=r[3]?r[3].replace(/_/g,"."):null,e.iphone=!0),e.ios&&e.osVersion&&n.indexOf("Version/")>=0&&"10"===e.osVersion.split(".")[0]&&(e.osVersion=n.toLowerCase().split("version/")[1].split(" ")[0]),
+e.webView=(o||a||r)&&n.match(/.*AppleWebKit(?!.*Safari)/i),e.os&&"ios"===e.os){var s=e.osVersion.split(".");e.minimalUi=!e.webView&&(r||o)&&(1*s[0]===7?1*s[1]>=1:1*s[0]>7)&&t('meta[name="viewport"]').length>0&&t('meta[name="viewport"]').attr("content").indexOf("minimal-ui")>=0}var c=t(window).width(),l=t(window).height();e.statusBar=!1,e.webView&&c*l===screen.width*screen.height?e.statusBar=!0:e.statusBar=!1;var u=[];if(e.pixelRatio=window.devicePixelRatio||1,u.push("pixel-ratio-"+Math.floor(e.pixelRatio)),e.pixelRatio>=2&&u.push("retina"),e.os&&(u.push(e.os,e.os+"-"+e.osVersion.split(".")[0],e.os+"-"+e.osVersion.replace(/\./g,"-")),"ios"===e.os))for(var p=parseInt(e.osVersion.split(".")[0],10),h=p-1;h>=6;h--)u.push("ios-gt-"+h);e.statusBar?u.push("with-statusbar-overlay"):t("html").removeClass("with-statusbar-overlay"),u.length>0&&t("html").addClass(u.join(" ")),t.device=e}($),+function(t){"use strict";var e=function(e){function n(){var e=!1;return c.params.convertToPopover||c.params.onlyInPopover?(!c.inline&&c.params.input&&(c.params.onlyInPopover?e=!0:t.device.ios?e=!!t.device.ipad:t(window).width()>=768&&(e=!0)),e):e}function i(){return!!(c.opened&&c.container&&c.container.length>0&&c.container.parents(".popover").length>0)}function a(){if(c.opened)for(var t=0;t<c.cols.length;t++)c.cols[t].divider||(c.cols[t].calcSize(),c.cols[t].setValue(c.cols[t].value,0,!1))}function r(t){if(t.preventDefault(),!c.opened&&(c.open(),c.params.scrollToInput&&!n())){var e=c.input.parents(".content");if(0===e.length)return;var i,a=parseInt(e.css("padding-top"),10),r=parseInt(e.css("padding-bottom"),10),o=e[0].offsetHeight-a-c.container.height(),s=e[0].scrollHeight-a-c.container.height(),l=c.input.offset().top-a+c.input[0].offsetHeight;if(l>o){var u=e.scrollTop()+l-o;u+o>s&&(i=u+o-s+r,o===s&&(i=c.container.height()),e.css({"padding-bottom":i+"px"})),e.scrollTop(u,300)}}}function o(e){i()||(c.input&&c.input.length>0?e.target!==c.input[0]&&0===t(e.target).parents(".weui-picker-modal").length&&c.close():0===t(e.target).parents(".weui-picker-modal").length&&c.close())}function s(){c.opened=!1,c.input&&c.input.length>0&&c.input.parents(".page-content").css({"padding-bottom":""}),c.params.onClose&&c.params.onClose(c),c.container.find(".picker-items-col").each(function(){c.destroyPickerCol(this)})}var c=this,l={updateValuesOnMomentum:!1,updateValuesOnTouchmove:!0,rotateEffect:!1,momentumRatio:7,freeMode:!1,scrollToInput:!0,inputReadOnly:!0,toolbar:!0,toolbarCloseText:"完成",title:"请选择",toolbarTemplate:'<div class="toolbar">          <div class="toolbar-inner">          <a href="javascript:;" class="picker-button close-picker">{{closeText}}</a>          <h1 class="title">{{title}}</h1>          </div>          </div>'};e=e||{};for(var u in l)"undefined"==typeof e[u]&&(e[u]=l[u]);c.params=e,c.cols=[],c.initialized=!1,c.inline=!!c.params.container;var p=t.device.ios||navigator.userAgent.toLowerCase().indexOf("safari")>=0&&navigator.userAgent.toLowerCase().indexOf("chrome")<0&&!t.device.android;return c.setValue=function(t,e){for(var n=0,i=0;i<c.cols.length;i++)c.cols[i]&&!c.cols[i].divider&&(c.cols[i].setValue(t[n],e),n++)},c.updateValue=function(){for(var e=[],n=[],i=0;i<c.cols.length;i++)c.cols[i].divider||(e.push(c.cols[i].value),n.push(c.cols[i].displayValue));e.indexOf(void 0)>=0||(c.value=e,c.displayValue=n,c.params.onChange&&c.params.onChange(c,c.value,c.displayValue),c.input&&c.input.length>0&&(t(c.input).val(c.params.formatValue?c.params.formatValue(c,c.value,c.displayValue):c.value.join(" ")),t(c.input).trigger("change")))},c.initPickerCol=function(e,n){function i(){w=t.requestAnimationFrame(function(){h.updateItems(void 0,void 0,0),i()})}function a(e){if(!T&&!y){e.preventDefault(),y=!0;var n=t.getTouchPosition(e);k=x=n.y,C=(new Date).getTime(),A=!0,M=E=t.getTranslate(h.wrapper[0],"y")}}function r(e){if(y){e.preventDefault(),A=!1;var n=t.getTouchPosition(e);x=n.y,T||(t.cancelAnimationFrame(w),T=!0,M=E=t.getTranslate(h.wrapper[0],"y"),h.wrapper.transition(0)),e.preventDefault();var i=x-k;E=M+i,_=void 0,E<v&&(E=v-Math.pow(v-E,.8),_="min"),E>g&&(E=g+Math.pow(E-g,.8),_="max"),h.wrapper.transform("translate3d(0,"+E+"px,0)"),h.updateItems(void 0,E,0,c.params.updateValuesOnTouchmove),P=E-D||E,O=(new Date).getTime(),D=E}}function o(e){if(!y||!T)return void(y=T=!1);y=T=!1,h.wrapper.transition(""),_&&("min"===_?h.wrapper.transform("translate3d(0,"+v+"px,0)"):h.wrapper.transform("translate3d(0,"+g+"px,0)")),b=(new Date).getTime();var n,a;b-C>300?a=E:(n=Math.abs(P/(b-O)),a=E+P*c.params.momentumRatio),a=Math.max(Math.min(a,g),v);var r=-Math.floor((a-g)/f);c.params.freeMode||(a=-r*f+g),h.wrapper.transform("translate3d(0,"+parseInt(a,10)+"px,0)"),h.updateItems(r,a,"",!0),c.params.updateValuesOnMomentum&&(i(),h.wrapper.transitionEnd(function(){t.cancelAnimationFrame(w)})),setTimeout(function(){A=!0},100)}function s(e){if(A){t.cancelAnimationFrame(w);var n=t(this).attr("data-picker-value");h.setValue(n)}}var l=t(e),u=l.index(),h=c.cols[u];if(!h.divider){h.container=l,h.wrapper=h.container.find(".picker-items-col-wrapper"),h.items=h.wrapper.find(".picker-item");var d,f,m,v,g;h.replaceValues=function(t,e){h.destroyEvents(),h.values=t,h.displayValues=e;var n=c.columnHTML(h,!0);h.wrapper.html(n),h.items=h.wrapper.find(".picker-item"),h.calcSize(),h.setValue(h.values[0]||"",0,!0),h.initEvents()},h.calcSize=function(){if(h.values.length){c.params.rotateEffect&&(h.container.removeClass("picker-items-col-absolute"),h.width||h.container.css({width:""}));var e,n;e=0,n=h.container[0].offsetHeight,d=h.wrapper[0].offsetHeight,f=h.items[0].offsetHeight,m=f*h.items.length,v=n/2-m+f/2,g=n/2-f/2,h.width&&(e=h.width,parseInt(e,10)===e&&(e+="px"),h.container.css({width:e})),c.params.rotateEffect&&(h.width||(h.items.each(function(){var n=t(this);n.css({width:"auto"}),e=Math.max(e,n[0].offsetWidth),n.css({width:""})}),h.container.css({width:e+2+"px"})),h.container.addClass("picker-items-col-absolute"))}},h.calcSize(),h.wrapper.transform("translate3d(0,"+g+"px,0)").transition(0);var w;h.setValue=function(e,n,a){"undefined"==typeof n&&(n="");var r=h.wrapper.find('.picker-item[data-picker-value="'+e+'"]').index();if("undefined"==typeof r||r===-1)return void(h.value=h.displayValue=e);var o=-r*f+g;h.wrapper.transition(n),h.wrapper.transform("translate3d(0,"+o+"px,0)"),c.params.updateValuesOnMomentum&&h.activeIndex&&h.activeIndex!==r&&(t.cancelAnimationFrame(w),h.wrapper.transitionEnd(function(){t.cancelAnimationFrame(w)}),i()),h.updateItems(r,o,n,a)},h.updateItems=function(e,n,i,a){"undefined"==typeof n&&(n=t.getTranslate(h.wrapper[0],"y")),"undefined"==typeof e&&(e=-Math.round((n-g)/f)),e<0&&(e=0),e>=h.items.length&&(e=h.items.length-1);var r=h.activeIndex;h.activeIndex=e,h.wrapper.find(".picker-selected").removeClass("picker-selected"),c.params.rotateEffect&&h.items.transition(i);var o=h.items.eq(e).addClass("picker-selected").transform("");if((a||"undefined"==typeof a)&&(h.value=o.attr("data-picker-value"),h.displayValue=h.displayValues?h.displayValues[e]:h.value,r!==e&&(h.onChange&&h.onChange(c,h.value,h.displayValue),c.updateValue())),c.params.rotateEffect){(n-(Math.floor((n-g)/f)*f+g))/f;h.items.each(function(){var e=t(this),i=e.index()*f,a=g-n,r=i-a,o=r/f,s=Math.ceil(h.height/f/2)+1,c=-18*o;c>180&&(c=180),c<-180&&(c=-180),Math.abs(o)>s?e.addClass("picker-item-far"):e.removeClass("picker-item-far"),e.transform("translate3d(0, "+(-n+g)+"px, "+(p?-110:0)+"px) rotateX("+c+"deg)")})}},n&&h.updateItems(0,g,0);var y,T,k,x,C,b,M,_,E,D,P,O,A=!0;h.initEvents=function(e){var n=e?"off":"on";h.container[n](t.touchEvents.start,a),h.container[n](t.touchEvents.move,r),h.container[n](t.touchEvents.end,o),h.items[n]("click",s)},h.destroyEvents=function(){h.initEvents(!0)},h.container[0].f7DestroyPickerCol=function(){h.destroyEvents()},h.initEvents()}},c.destroyPickerCol=function(e){e=t(e),"f7DestroyPickerCol"in e[0]&&e[0].f7DestroyPickerCol()},t(window).on("resize",a),c.columnHTML=function(t,e){var n="",i="";if(t.divider)i+='<div class="picker-items-col picker-items-col-divider '+(t.textAlign?"picker-items-col-"+t.textAlign:"")+" "+(t.cssClass||"")+'">'+t.content+"</div>";else{for(var a=0;a<t.values.length;a++)n+='<div class="picker-item" data-picker-value="'+t.values[a]+'">'+(t.displayValues?t.displayValues[a]:t.values[a])+"</div>";i+='<div class="picker-items-col '+(t.textAlign?"picker-items-col-"+t.textAlign:"")+" "+(t.cssClass||"")+'"><div class="picker-items-col-wrapper">'+n+"</div></div>"}return e?n:i},c.layout=function(){var t,e="",n="";c.cols=[];var i="";for(t=0;t<c.params.cols.length;t++){var a=c.params.cols[t];i+=c.columnHTML(c.params.cols[t]),c.cols.push(a)}n="weui-picker-modal picker-columns "+(c.params.cssClass||"")+(c.params.rotateEffect?" picker-3d":"")+(1===c.params.cols.length?" picker-columns-single":""),e='<div class="'+n+'">'+(c.params.toolbar?c.params.toolbarTemplate.replace(/{{closeText}}/g,c.params.toolbarCloseText).replace(/{{title}}/g,c.params.title):"")+'<div class="picker-modal-inner picker-items">'+i+'<div class="picker-center-highlight"></div></div></div>',c.pickerHTML=e},c.params.input&&(c.input=t(c.params.input),c.input.length>0&&(c.params.inputReadOnly&&c.input.prop("readOnly",!0),c.inline||c.input.on("click",r),c.params.inputReadOnly&&c.input.on("focus mousedown",function(t){t.preventDefault()}))),c.inline||t("html").on("click",o),c.opened=!1,c.open=function(){var e=n();c.opened||(c.layout(),e?(c.pickerHTML='<div class="popover popover-picker-columns"><div class="popover-inner">'+c.pickerHTML+"</div></div>",c.popover=t.popover(c.pickerHTML,c.params.input,!0),c.container=t(c.popover).find(".weui-picker-modal"),t(c.popover).on("close",function(){s()})):c.inline?(c.container=t(c.pickerHTML),c.container.addClass("picker-modal-inline"),t(c.params.container).append(c.container)):(c.container=t(t.openPicker(c.pickerHTML)),t(c.container).on("close",function(){s()})),c.container[0].f7Picker=c,c.container.find(".picker-items-col").each(function(){var t=!0;(!c.initialized&&c.params.value||c.initialized&&c.value)&&(t=!1),c.initPickerCol(this,t)}),c.initialized?c.value&&c.setValue(c.value,0):c.params.value&&c.setValue(c.params.value,0)),c.opened=!0,c.initialized=!0,c.params.onOpen&&c.params.onOpen(c)},c.close=function(e){if(c.opened&&!c.inline)return i()?void t.closePicker(c.popover):void t.closePicker(c.container)},c.destroy=function(){c.close(),c.params.input&&c.input.length>0&&(c.input.off("click focus",r),t(c.input).data("picker",null)),t("html").off("click",o),t(window).off("resize",a)},c.inline&&c.open(),c};t(document).on("click",".close-picker",function(){var e=t(".weui-picker-modal.weui-picker-modal-visible");e.length>0&&t.closePicker(e)}),t(document).on(t.touchEvents.move,".picker-modal-inner",function(t){t.preventDefault()}),t.openPicker=function(e,n,i){"function"==typeof n&&(i=n,n=void 0),t.closePicker();var a=t("<div class='weui-picker-container "+(n||"")+"'></div>").appendTo(document.body);a.show(),a.addClass("weui-picker-container-visible");var r=t(e).appendTo(a);return r.width(),r.addClass("weui-picker-modal-visible"),i&&a.on("close",i),r},t.updatePicker=function(e){var n=t(".weui-picker-container-visible");if(!n[0])return!1;n.html("");var i=t(e).appendTo(n);return i.addClass("weui-picker-modal-visible"),i},t.closePicker=function(e,n){"function"==typeof e&&(n=e),t(".weui-picker-modal-visible").removeClass("weui-picker-modal-visible").transitionEnd(function(){t(this).parent().remove(),n&&n()}).trigger("close")},t.fn.picker=function(n){var i=arguments;return this.each(function(){if(this){var a=t(this),r=a.data("picker");if(!r){n=t.extend({input:this},n||{});var o=a.val();void 0===n.value&&""!==o&&(n.value=n.cols&&n.cols.length>1?o.split(" "):[o]);var s=t.extend({input:this},n);r=new e(s),a.data("picker",r)}"string"==typeof n&&r[n].apply(r,Array.prototype.slice.call(i,1))}})}}($),+function(t){"use strict";var e,n=[],i=function(e,i){this.config=i,this.data={values:"",titles:"",origins:[],length:0},this.$input=t(e),this.$input.prop("readOnly",!0),this.initConfig(),i=this.config,this.$input.click(t.proxy(this.open,this)),n.push(this)};i.prototype.initConfig=function(){this.config=t.extend({},e,this.config);var n=this.config;n.items&&n.items.length&&(n.items=n.items.map(function(t,e){return"string"==typeof t?{title:t,value:t}:t}),this.tpl=t.t7.compile("<div class='weui-picker-modal weui-select-modal'>"+n.toolbarTemplate+(n.multi?n.checkboxTemplate:n.radioTemplate)+"</div>"),void 0!==n.input&&this.$input.val(n.input),this.parseInitValue(),this._init=!0)},i.prototype.updateInputValue=function(t,e){var n,i;this.config.multi?(n=t.join(this.config.split),i=e.join(this.config.split)):(n=t[0],i=e[0]);var a=[];this.config.items.forEach(function(e){t.each(function(t,n){e.value==n&&a.push(e)})}),this.$input.val(i).data("values",n),this.$input.attr("value",i).attr("data-values",n);var r={values:n,titles:i,valuesArray:t,titlesArray:e,origins:a,length:a.length};this.data=r,this.$input.trigger("change",r),this.config.onChange&&this.config.onChange.call(this,r)},i.prototype.parseInitValue=function(){var t=this.$input.val(),e=this.config.items;if(this._init||void 0!==t&&null!=t&&""!==t)for(var n=this.config.multi?t.split(this.config.split):[t],i=0;i<e.length;i++){e[i].checked=!1;for(var a=0;a<n.length;a++)e[i].title===n[a]&&(e[i].checked=!0)}},i.prototype._bind=function(e){var n=this,i=this.config;e.on("change",function(a){var r=e.find("input:checked"),o=r.map(function(){return t(this).val()}),s=r.map(function(){return t(this).data("title")});n.updateInputValue(o,s),i.autoClose&&!i.multi&&n.close()}).trigger("change").on("click",".close-select",function(){n.close()})},i.prototype.update=function(e){this.config=t.extend({},this.config,e),this.initConfig(),this._open&&this._bind(t.updatePicker(this.getHTML()))},i.prototype.open=function(e,i){if(!this._open){for(var a=0;a<n.length;a++){var r=n[a];if(r!==this&&r._open&&!r.close())return!1}this.parseInitValue();var o=this.config,s=this.dialog=t.openPicker(this.getHTML());this._bind(s),this._open=!0,o.onOpen&&o.onOpen(this)}},i.prototype.close=function(e,n){if(!this._open)return!1;var i=this,a=this.config.beforeClose;if(!n){if(a&&"function"==typeof a&&a.call(this,this.data.values,this.data.titles)===!1)return!1;if(this.config.multi){if(void 0!==this.config.min&&this.data.length<this.config.min)return t.toast("请至少选择"+this.config.min+"个","text"),!1;if(void 0!==this.config.max&&this.data.length>this.config.max)return t.toast("最多只能选择"+this.config.max+"个","text"),!1}}return t.closePicker(function(){i.onClose(),e&&e()}),!0},i.prototype.onClose=function(){this._open=!1,this.config.onClose&&this.config.onClose(this)},i.prototype.getHTML=function(t){var e=this.config;return this.tpl({items:e.items,title:e.title,closeText:e.closeText})},t.fn.select=function(e,n){return this.each(function(){var a=t(this);a.data("weui-select")||a.data("weui-select",new i(this,e));var r=a.data("weui-select");return"string"==typeof e&&r[e].call(r,n),r})},e=t.fn.select.prototype.defaults={items:[],input:void 0,title:"请选择",multi:!1,closeText:"确定",autoClose:!0,onChange:void 0,beforeClose:void 0,onClose:void 0,onOpen:void 0,split:",",min:void 0,max:void 0,toolbarTemplate:'<div class="toolbar">      <div class="toolbar-inner">      <a href="javascript:;" class="picker-button close-select">{{closeText}}</a>      <h1 class="title">{{title}}</h1>      </div>      </div>',radioTemplate:'<div class="weui-cells weui-cells_radio">        {{#items}}        <label class="weui-cell weui-check_label" for="weui-select-id-{{this.title}}">          <div class="weui-cell__bd weui-cell_primary">            <p>{{this.title}}</p>          </div>          <div class="weui-cell__ft">            <input type="radio" class="weui-check" name="weui-select" id="weui-select-id-{{this.title}}" value="{{this.value}}" {{#if this.checked}}checked="checked"{{/if}} data-title="{{this.title}}">            <span class="weui-icon-checked"></span>          </div>        </label>        {{/items}}      </div>',checkboxTemplate:'<div class="weui-cells weui-cells_checkbox">        {{#items}}        <label class="weui-cell weui-check_label" for="weui-select-id-{{this.title}}">          <div class="weui-cell__bd weui-cell_primary">            <p>{{this.title}}</p>          </div>          <div class="weui-cell__ft">            <input type="checkbox" class="weui-check" name="weui-select" id="weui-select-id-{{this.title}}" value="{{this.value}}" {{#if this.checked}}checked="checked"{{/if}} data-title="{{this.title}}" >            <span class="weui-icon-checked"></span>          </div>        </label>        {{/items}}      </div>'}}($),+function(t){"use strict";var e,n=!1,i=function(t,e){var t=new Date(t),e=new Date(e);return t.getFullYear()===e.getFullYear()&&t.getMonth()===e.getMonth()&&t.getDate()===e.getDate()},a=function(a){function r(){var e=!1;return p.params.convertToPopover||p.params.onlyInPopover?(!p.inline&&p.params.input&&(p.params.onlyInPopover?e=!0:t.device.ios?e=!!t.device.ipad:t(window).width()>=768&&(e=!0)),e):e}function o(){return!!(p.opened&&p.container&&p.container.length>0&&p.container.parents(".popover").length>0)}function s(t){t=new Date(t);var e=t.getFullYear(),n=t.getMonth(),i=n+1,a=t.getDate(),r=t.getDay();return p.params.dateFormat.replace(/yyyy/g,e).replace(/yy/g,(e+"").substring(2)).replace(/mm/g,i<10?"0"+i:i).replace(/m/g,i).replace(/MM/g,p.params.monthNames[n]).replace(/M/g,p.params.monthNamesShort[n]).replace(/dd/g,a<10?"0"+a:a).replace(/d/g,a).replace(/DD/g,p.params.dayNames[r]).replace(/D/g,p.params.dayNamesShort[r])}function c(t){if(t.preventDefault(),!p.opened&&(p.open(),p.params.scrollToInput&&!r())){var e=p.input.parents(".page-content");if(0===e.length)return;var n,i=parseInt(e.css("padding-top"),10),a=parseInt(e.css("padding-bottom"),10),o=e[0].offsetHeight-i-p.container.height(),s=e[0].scrollHeight-i-p.container.height(),c=p.input.offset().top-i+p.input[0].offsetHeight;if(c>o){var l=e.scrollTop()+c-o;l+o>s&&(n=l+o-s+a,o===s&&(n=p.container.height()),e.css({"padding-bottom":n+"px"})),e.scrollTop(l,300)}}}function l(e){o()||(p.input&&p.input.length>0?e.target!==p.input[0]&&0===t(e.target).parents(".weui-picker-modal").length&&p.close():0===t(e.target).parents(".weui-picker-modal").length&&p.close())}function u(){p.opened=!1,p.input&&p.input.length>0&&p.input.parents(".page-content").css({"padding-bottom":""}),p.params.onClose&&p.params.onClose(p),p.destroyCalendarEvents()}var p=this;a=a||{};for(var h in e)"undefined"==typeof a[h]&&(a[h]=e[h]);p.params=a,p.initialized=!1,p.inline=!!p.params.container,p.isH="horizontal"===p.params.direction;var d=p.isH&&n?-1:1;return p.animating=!1,p.addValue=function(t){if(p.params.multiple){p.value||(p.value=[]);for(var e,n=0;n<p.value.length;n++)i(t,p.value[n])&&(e=n);"undefined"==typeof e?p.value.push(t):p.value.splice(e,1),p.updateValue()}else p.value=[t],p.updateValue()},p.setValue=function(t){var e=new Date(t[0]);p.setYearMonth(e.getFullYear(),e.getMonth()),p.addValue(+e)},p.updateValue=function(){p.wrapper.find(".picker-calendar-day-selected").removeClass("picker-calendar-day-selected");var e,n;for(e=0;e<p.value.length;e++){var i=new Date(p.value[e]);p.wrapper.find('.picker-calendar-day[data-date="'+i.getFullYear()+"-"+i.getMonth()+"-"+i.getDate()+'"]').addClass("picker-calendar-day-selected")}if(p.params.onChange&&p.params.onChange(p,p.value.map(s),p.value.map(function(t){return+new Date("string"==typeof t?t.split(/\D/).filter(function(t){return!!t}).join("-"):t)})),p.input&&p.input.length>0){if(p.params.formatValue)n=p.params.formatValue(p,p.value);else{for(n=[],e=0;e<p.value.length;e++)n.push(s(p.value[e]));n=n.join(", ")}t(p.input).val(n),t(p.input).trigger("change")}},p.initCalendarEvents=function(){function e(e){if(!s&&!o){o=!0;var n=t.getTouchPosition(e);c=h=n.x,l=h=n.y,f=(new Date).getTime(),T=0,C=!0,x=void 0,v=g=p.monthsTranslate}}function i(e){if(o){var n=t.getTouchPosition(e);if(u=n.x,h=n.y,"undefined"==typeof x&&(x=!!(x||Math.abs(h-l)>Math.abs(u-c))),p.isH&&x)return void(o=!1);if(e.preventDefault(),p.animating)return void(o=!1);C=!1,s||(s=!0,w=p.wrapper[0].offsetWidth,y=p.wrapper[0].offsetHeight,p.wrapper.transition(0)),e.preventDefault(),k=p.isH?u-c:h-l,T=k/(p.isH?w:y),g=100*(p.monthsTranslate*d+T),p.wrapper.transform("translate3d("+(p.isH?g:0)+"%, "+(p.isH?0:g)+"%, 0)")}}function a(t){return o&&s?(o=s=!1,m=(new Date).getTime(),m-f<300?Math.abs(k)<10?p.resetMonth():k>=10?n?p.nextMonth():p.prevMonth():n?p.prevMonth():p.nextMonth():T<=-.5?n?p.prevMonth():p.nextMonth():T>=.5?n?p.nextMonth():p.prevMonth():p.resetMonth(),void setTimeout(function(){C=!0},100)):void(o=s=!1)}function r(e){if(C){var n=t(e.target).parents(".picker-calendar-day");if(0===n.length&&t(e.target).hasClass("picker-calendar-day")&&(n=t(e.target)),0!==n.length&&!n.hasClass("picker-calendar-day-disabled")){n.hasClass("picker-calendar-day-next")&&p.nextMonth(),n.hasClass("picker-calendar-day-prev")&&p.prevMonth();var i=n.attr("data-year"),a=n.attr("data-month"),r=n.attr("data-day");p.params.onDayClick&&p.params.onDayClick(p,n[0],i,a,r),p.addValue(new Date(i,a,r).getTime()),p.params.closeOnSelect&&!p.params.multiple&&p.close()}}}var o,s,c,l,u,h,f,m,v,g,w,y,T,k,x,C=!0;p.container.find(".picker-calendar-prev-month").on("click",p.prevMonth),p.container.find(".picker-calendar-next-month").on("click",p.nextMonth),p.container.find(".picker-calendar-prev-year").on("click",p.prevYear),p.container.find(".picker-calendar-next-year").on("click",p.nextYear),p.wrapper.on("click",r),p.params.touchMove&&(p.wrapper.on(t.touchEvents.start,e),p.wrapper.on(t.touchEvents.move,i),p.wrapper.on(t.touchEvents.end,a)),p.container[0].f7DestroyCalendarEvents=function(){p.container.find(".picker-calendar-prev-month").off("click",p.prevMonth),p.container.find(".picker-calendar-next-month").off("click",p.nextMonth),p.container.find(".picker-calendar-prev-year").off("click",p.prevYear),p.container.find(".picker-calendar-next-year").off("click",p.nextYear),p.wrapper.off("click",r),p.params.touchMove&&(p.wrapper.off(t.touchEvents.start,e),p.wrapper.off(t.touchEvents.move,i),p.wrapper.off(t.touchEvents.end,a))}},p.destroyCalendarEvents=function(t){"f7DestroyCalendarEvents"in p.container[0]&&p.container[0].f7DestroyCalendarEvents()},p.daysInMonth=function(t){var e=new Date(t);return new Date(e.getFullYear(),e.getMonth()+1,0).getDate()},p.monthHTML=function(t,e){t=new Date(t);var n=t.getFullYear(),i=t.getMonth();t.getDate();"next"===e&&(t=11===i?new Date(n+1,0):new Date(n,i+1,1)),"prev"===e&&(t=0===i?new Date(n-1,11):new Date(n,i-1,1)),"next"!==e&&"prev"!==e||(i=t.getMonth(),n=t.getFullYear());var a=p.daysInMonth(new Date(t.getFullYear(),t.getMonth()).getTime()-864e6),r=p.daysInMonth(t),o=new Date(t.getFullYear(),t.getMonth()).getDay();0===o&&(o=7);var s,c,l,u=[],h=6,d=7,f="",m=0+(p.params.firstDay-1),v=(new Date).setHours(0,0,0,0),g=p.params.minDate?new Date(p.params.minDate).getTime():null,w=p.params.maxDate?new Date(p.params.maxDate).getTime():null;if(p.value&&p.value.length)for(c=0;c<p.value.length;c++)u.push(new Date(p.value[c]).setHours(0,0,0,0));for(c=1;c<=h;c++){var y="";for(l=1;l<=d;l++){var T=l;m++;var k=m-o,x="";k<0?(k=a+k+1,x+=" picker-calendar-day-prev",s=new Date(i-1<0?n-1:n,i-1<0?11:i-1,k).getTime()):(k+=1,k>r?(k-=r,x+=" picker-calendar-day-next",s=new Date(i+1>11?n+1:n,i+1>11?0:i+1,k).getTime()):s=new Date(n,i,k).getTime()),s===v&&(x+=" picker-calendar-day-today"),u.indexOf(s)>=0&&(x+=" picker-calendar-day-selected"),p.params.weekendDays.indexOf(T-1)>=0&&(x+=" picker-calendar-day-weekend"),(g&&s<g||w&&s>w)&&(x+=" picker-calendar-day-disabled"),s=new Date(s);var C=s.getFullYear(),b=s.getMonth();y+='<div data-year="'+C+'" data-month="'+b+'" data-day="'+k+'" class="picker-calendar-day'+x+'" data-date="'+(C+"-"+b+"-"+k)+'"><span>'+k+"</span></div>"}f+='<div class="picker-calendar-row">'+y+"</div>"}return f='<div class="picker-calendar-month" data-year="'+n+'" data-month="'+i+'">'+f+"</div>"},p.animating=!1,p.updateCurrentMonthYear=function(t){"undefined"==typeof t?(p.currentMonth=parseInt(p.months.eq(1).attr("data-month"),10),p.currentYear=parseInt(p.months.eq(1).attr("data-year"),10)):(p.currentMonth=parseInt(p.months.eq("next"===t?p.months.length-1:0).attr("data-month"),10),p.currentYear=parseInt(p.months.eq("next"===t?p.months.length-1:0).attr("data-year"),10)),p.container.find(".current-month-value").text(p.params.monthNames[p.currentMonth]),p.container.find(".current-year-value").text(p.currentYear)},p.onMonthChangeStart=function(t){p.updateCurrentMonthYear(t),p.months.removeClass("picker-calendar-month-current picker-calendar-month-prev picker-calendar-month-next");var e="next"===t?p.months.length-1:0;p.months.eq(e).addClass("picker-calendar-month-current"),p.months.eq("next"===t?e-1:e+1).addClass("next"===t?"picker-calendar-month-prev":"picker-calendar-month-next"),p.params.onMonthYearChangeStart&&p.params.onMonthYearChangeStart(p,p.currentYear,p.currentMonth)},p.onMonthChangeEnd=function(t,e){p.animating=!1;var n,i,a;p.wrapper.find(".picker-calendar-month:not(.picker-calendar-month-prev):not(.picker-calendar-month-current):not(.picker-calendar-month-next)").remove(),"undefined"==typeof t&&(t="next",e=!0),e?(p.wrapper.find(".picker-calendar-month-next, .picker-calendar-month-prev").remove(),i=p.monthHTML(new Date(p.currentYear,p.currentMonth),"prev"),n=p.monthHTML(new Date(p.currentYear,p.currentMonth),"next")):a=p.monthHTML(new Date(p.currentYear,p.currentMonth),t),("next"===t||e)&&p.wrapper.append(a||n),("prev"===t||e)&&p.wrapper.prepend(a||i),p.months=p.wrapper.find(".picker-calendar-month"),p.setMonthsTranslate(p.monthsTranslate),p.params.onMonthAdd&&p.params.onMonthAdd(p,"next"===t?p.months.eq(p.months.length-1)[0]:p.months.eq(0)[0]),p.params.onMonthYearChangeEnd&&p.params.onMonthYearChangeEnd(p,p.currentYear,p.currentMonth)},p.setMonthsTranslate=function(t){t=t||p.monthsTranslate||0,"undefined"==typeof p.monthsTranslate&&(p.monthsTranslate=t),p.months.removeClass("picker-calendar-month-current picker-calendar-month-prev picker-calendar-month-next");var e=100*-(t+1)*d,n=100*-t*d,i=100*-(t-1)*d;p.months.eq(0).transform("translate3d("+(p.isH?e:0)+"%, "+(p.isH?0:e)+"%, 0)").addClass("picker-calendar-month-prev"),p.months.eq(1).transform("translate3d("+(p.isH?n:0)+"%, "+(p.isH?0:n)+"%, 0)").addClass("picker-calendar-month-current"),p.months.eq(2).transform("translate3d("+(p.isH?i:0)+"%, "+(p.isH?0:i)+"%, 0)").addClass("picker-calendar-month-next")},p.nextMonth=function(e){"undefined"!=typeof e&&"object"!=typeof e||(e="",p.params.animate||(e=0));var n=parseInt(p.months.eq(p.months.length-1).attr("data-month"),10),i=parseInt(p.months.eq(p.months.length-1).attr("data-year"),10),a=new Date(i,n),r=a.getTime(),o=!p.animating;if(p.params.maxDate&&r>new Date(p.params.maxDate).getTime())return p.resetMonth();if(p.monthsTranslate--,n===p.currentMonth){var s=100*-p.monthsTranslate*d,c=t(p.monthHTML(r,"next")).transform("translate3d("+(p.isH?s:0)+"%, "+(p.isH?0:s)+"%, 0)").addClass("picker-calendar-month-next");p.wrapper.append(c[0]),p.months=p.wrapper.find(".picker-calendar-month"),p.params.onMonthAdd&&p.params.onMonthAdd(p,p.months.eq(p.months.length-1)[0])}p.animating=!0,p.onMonthChangeStart("next");var l=100*p.monthsTranslate*d;p.wrapper.transition(e).transform("translate3d("+(p.isH?l:0)+"%, "+(p.isH?0:l)+"%, 0)"),o&&p.wrapper.transitionEnd(function(){p.onMonthChangeEnd("next")}),p.params.animate||p.onMonthChangeEnd("next")},p.prevMonth=function(e){"undefined"!=typeof e&&"object"!=typeof e||(e="",p.params.animate||(e=0));var n=parseInt(p.months.eq(0).attr("data-month"),10),i=parseInt(p.months.eq(0).attr("data-year"),10),a=new Date(i,n+1,(-1)),r=a.getTime(),o=!p.animating;if(p.params.minDate&&r<new Date(p.params.minDate).getTime())return p.resetMonth();if(p.monthsTranslate++,n===p.currentMonth){var s=100*-p.monthsTranslate*d,c=t(p.monthHTML(r,"prev")).transform("translate3d("+(p.isH?s:0)+"%, "+(p.isH?0:s)+"%, 0)").addClass("picker-calendar-month-prev");p.wrapper.prepend(c[0]),p.months=p.wrapper.find(".picker-calendar-month"),p.params.onMonthAdd&&p.params.onMonthAdd(p,p.months.eq(0)[0])}p.animating=!0,p.onMonthChangeStart("prev");var l=100*p.monthsTranslate*d;p.wrapper.transition(e).transform("translate3d("+(p.isH?l:0)+"%, "+(p.isH?0:l)+"%, 0)"),o&&p.wrapper.transitionEnd(function(){p.onMonthChangeEnd("prev")}),p.params.animate||p.onMonthChangeEnd("prev")},p.resetMonth=function(t){"undefined"==typeof t&&(t="");var e=100*p.monthsTranslate*d;p.wrapper.transition(t).transform("translate3d("+(p.isH?e:0)+"%, "+(p.isH?0:e)+"%, 0)")},p.setYearMonth=function(t,e,n){"undefined"==typeof t&&(t=p.currentYear),"undefined"==typeof e&&(e=p.currentMonth),"undefined"!=typeof n&&"object"!=typeof n||(n="",p.params.animate||(n=0));var i;if(i=t<p.currentYear?new Date(t,e+1,(-1)).getTime():new Date(t,e).getTime(),p.params.maxDate&&i>new Date(p.params.maxDate).getTime())return!1;if(p.params.minDate&&i<new Date(p.params.minDate).getTime())return!1;var a=new Date(p.currentYear,p.currentMonth).getTime(),r=i>a?"next":"prev",o=p.monthHTML(new Date(t,e));p.monthsTranslate=p.monthsTranslate||0;var s,c,l=p.monthsTranslate,u=!p.animating;i>a?(p.monthsTranslate--,p.animating||p.months.eq(p.months.length-1).remove(),p.wrapper.append(o),p.months=p.wrapper.find(".picker-calendar-month"),s=100*-(l-1)*d,p.months.eq(p.months.length-1).transform("translate3d("+(p.isH?s:0)+"%, "+(p.isH?0:s)+"%, 0)").addClass("picker-calendar-month-next")):(p.monthsTranslate++,p.animating||p.months.eq(0).remove(),p.wrapper.prepend(o),p.months=p.wrapper.find(".picker-calendar-month"),s=100*-(l+1)*d,p.months.eq(0).transform("translate3d("+(p.isH?s:0)+"%, "+(p.isH?0:s)+"%, 0)").addClass("picker-calendar-month-prev")),p.params.onMonthAdd&&p.params.onMonthAdd(p,"next"===r?p.months.eq(p.months.length-1)[0]:p.months.eq(0)[0]),p.animating=!0,p.onMonthChangeStart(r),c=100*p.monthsTranslate*d,p.wrapper.transition(n).transform("translate3d("+(p.isH?c:0)+"%, "+(p.isH?0:c)+"%, 0)"),u&&p.wrapper.transitionEnd(function(){p.onMonthChangeEnd(r,!0)}),p.params.animate||p.onMonthChangeEnd(r)},p.nextYear=function(){p.setYearMonth(p.currentYear+1)},p.prevYear=function(){p.setYearMonth(p.currentYear-1)},p.layout=function(){var t,e="",n="",i=p.value&&p.value.length?p.value[0]:(new Date).setHours(0,0,0,0),a=p.monthHTML(i,"prev"),r=p.monthHTML(i),o=p.monthHTML(i,"next"),s='<div class="picker-calendar-months"><div class="picker-calendar-months-wrapper">'+(a+r+o)+"</div></div>",c="";if(p.params.weekHeader){for(t=0;t<7;t++){var l=t+p.params.firstDay>6?t-7+p.params.firstDay:t+p.params.firstDay,u=p.params.dayNamesShort[l];c+='<div class="picker-calendar-week-day '+(p.params.weekendDays.indexOf(l)>=0?"picker-calendar-week-day-weekend":"")+'"> '+u+"</div>"}c='<div class="picker-calendar-week-days">'+c+"</div>"}n="weui-picker-calendar "+(p.params.cssClass||""),p.inline||(n="weui-picker-modal "+n);var h=p.params.toolbar?p.params.toolbarTemplate.replace(/{{closeText}}/g,p.params.toolbarCloseText):"";p.params.toolbar&&(h=p.params.toolbarTemplate.replace(/{{closeText}}/g,p.params.toolbarCloseText).replace(/{{monthPicker}}/g,p.params.monthPicker?p.params.monthPickerTemplate:"").replace(/{{yearPicker}}/g,p.params.yearPicker?p.params.yearPickerTemplate:"")),e='<div class="'+n+'">'+h+'<div class="picker-modal-inner">'+c+s+"</div></div>",p.pickerHTML=e},p.params.input&&(p.input=t(p.params.input),p.input.length>0&&(p.params.inputReadOnly&&p.input.prop("readOnly",!0),p.inline||p.input.on("click",c),p.params.inputReadOnly&&p.input.on("focus mousedown",function(t){t.preventDefault()}))),p.inline||t(document).on("click touchend",l),p.opened=!1,p.open=function(){var e=r()&&!1,n=!1;p.opened||(p.value||p.params.value&&(p.value=p.params.value,n=!0),p.layout(),e?(p.pickerHTML='<div class="popover popover-picker-calendar"><div class="popover-inner">'+p.pickerHTML+"</div></div>",p.popover=t.popover(p.pickerHTML,p.params.input,!0),p.container=t(p.popover).find(".weui-picker-modal"),
+t(p.popover).on("close",function(){u()})):p.inline?(p.container=t(p.pickerHTML),p.container.addClass("picker-modal-inline"),t(p.params.container).append(p.container)):(p.container=t(t.openPicker(p.pickerHTML)),t(p.container).on("close",function(){u()})),p.container[0].f7Calendar=p,p.wrapper=p.container.find(".picker-calendar-months-wrapper"),p.months=p.wrapper.find(".picker-calendar-month"),p.updateCurrentMonthYear(),p.monthsTranslate=0,p.setMonthsTranslate(),p.initCalendarEvents(),n&&p.updateValue()),p.opened=!0,p.initialized=!0,p.params.onMonthAdd&&p.months.each(function(){p.params.onMonthAdd(p,this)}),p.params.onOpen&&p.params.onOpen(p)},p.close=function(){if(p.opened&&!p.inline)return p.animating=!1,o()?void t.closePicker(p.popover):void t.closePicker(p.container)},p.destroy=function(){p.close(),p.params.input&&p.input.length>0&&(p.input.off("click focus",c),p.input.data("calendar",null)),t("html").off("click",l)},p.inline&&p.open(),p},r=function(t){return t<10?"0"+t:t};t.fn.calendar=function(e,n){return e=e||{},this.each(function(){var i=t(this);if(i[0]){var o={};"INPUT"===i[0].tagName.toUpperCase()?o.input=i:o.container=i;var s=i.data("calendar");if(!s)if("string"==typeof e);else{if(!e.value&&i.val()&&(e.value=[i.val()]),!e.value){var c=new Date;e.value=[c.getFullYear()+"/"+r(c.getMonth()+1)+"/"+r(c.getDate())]}s=i.data("calendar",new a(t.extend(o,e)))}"string"==typeof e&&s[e].call(s,n)}})},e=t.fn.calendar.prototype.defaults={value:void 0,monthNames:["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],monthNamesShort:["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],dayNames:["周日","周一","周二","周三","周四","周五","周六"],dayNamesShort:["周日","周一","周二","周三","周四","周五","周六"],firstDay:1,weekendDays:[0,6],multiple:!1,dateFormat:"yyyy/mm/dd",direction:"horizontal",minDate:null,maxDate:null,touchMove:!0,animate:!0,closeOnSelect:!0,monthPicker:!0,monthPickerTemplate:'<div class="picker-calendar-month-picker"><a href="javascript:;" class="link icon-only picker-calendar-prev-month"><i class="icon icon-prev"></i></a><div class="current-month-value"></div><a href="javascript:;" class="link icon-only picker-calendar-next-month"><i class="icon icon-next"></i></a></div>',yearPicker:!0,yearPickerTemplate:'<div class="picker-calendar-year-picker"><a href="javascript:;" class="link icon-only picker-calendar-prev-year"><i class="icon icon-prev"></i></a><span class="current-year-value"></span><a href="javascript:;" class="link icon-only picker-calendar-next-year"><i class="icon icon-next"></i></a></div>',weekHeader:!0,scrollToInput:!0,inputReadOnly:!0,convertToPopover:!0,onlyInPopover:!1,toolbar:!0,toolbarCloseText:"Done",toolbarTemplate:'<div class="toolbar"><div class="toolbar-inner">{{yearPicker}}{{monthPicker}}</div></div>'}}($),+function(t){"use strict";var e,n=function(t){return t<10?"0"+t:t},i=function(e,n){this.input=t(e),this.params=n||{},this.initMonthes=n.monthes,this.initYears=n.years;var i=t.extend({},n,this.getConfig());t(this.input).picker(i)};i.prototype={getDays:function(t){for(var e=[],n=1;n<=(t||31);n++)e.push(n<10?"0"+n:n);return e},getDaysByMonthAndYear:function(t,e){var n=new Date(e,parseInt(t)+1-1,1),i=new Date(n-1);return this.getDays(i.getDate())},getConfig:function(){var t,e=new Date,i=this.params,a=this,r={rotateEffect:!1,cssClass:"datetime-picker",value:[e.getFullYear(),n(e.getMonth()+1),n(e.getDate()),n(e.getHours()),n(e.getMinutes())],onChange:function(e,n,r){var o=(e.cols,a.getDaysByMonthAndYear(n[1],n[0])),s=n[2];s>o.length&&(s=o.length),e.cols[4].setValue(s);var c=new Date(n[0]+"-"+n[1]+"-"+n[2]),l=!0;if(i.min){var u=new Date("function"==typeof i.min?i.min():i.min);c<+u&&(e.setValue(t),l=!1)}if(i.max){var p=new Date("function"==typeof i.max?i.max():i.max);c>+p&&(e.setValue(t),l=!1)}l&&(t=n),a.params.onChange&&a.params.onChange.apply(this,arguments)},formatValue:function(t,e,n){return a.params.format(t,e,n)},cols:[{values:this.initYears},{divider:!0,content:i.yearSplit},{values:this.initMonthes},{divider:!0,content:i.monthSplit},{values:function(){for(var t=[],e=1;e<=31;e++)t.push(n(e));return t}()}]};i.dateSplit&&r.cols.push({divider:!0,content:i.dateSplit}),r.cols.push({divider:!0,content:i.datetimeSplit});var o=a.params.times();o&&o.length&&(r.cols=r.cols.concat(o));var s=this.input.val();return s&&(r.value=i.parse(s)),this.params.value&&(this.input.val(this.params.value),r.value=i.parse(this.params.value)),r}},t.fn.datetimePicker=function(n){return n=t.extend({},e,n),this.each(function(){if(this){var e=t(this),a=e.data("datetime");return a||e.data("datetime",new i(this,n)),a}})},e=t.fn.datetimePicker.prototype.defaults={input:void 0,min:void 0,max:void 0,yearSplit:"-",monthSplit:"-",dateSplit:"",datetimeSplit:" ",monthes:"01 02 03 04 05 06 07 08 09 10 11 12".split(" "),years:function(){for(var t=[],e=1950;e<=2030;e++)t.push(e);return t}(),times:function(){return[{values:function(){for(var t=[],e=0;e<24;e++)t.push(n(e));return t}()},{divider:!0,content:":"},{values:function(){for(var t=[],e=0;e<60;e++)t.push(n(e));return t}()}]},format:function(t,e){return t.cols.map(function(t){return t.value||t.content}).join("")},parse:function(t){var e=t.split(this.datetimeSplit);return e[0].split(/\D/).concat(e[1].split(/:|时|分|秒/)).filter(function(t){return!!t})}}}($),+function(t){"use strict";t.openPopup=function(e,n){t.closePopup(),e=t(e),e.show(),e.width(),e.addClass("weui-popup__container--visible");var i=e.find(".weui-popup__modal");i.width(),i.transitionEnd(function(){i.trigger("open")})},t.closePopup=function(e,n){e=t(e||".weui-popup__container--visible"),e.find(".weui-popup__modal").transitionEnd(function(){var i=t(this);i.trigger("close"),e.hide(),n&&e.remove()}),e.removeClass("weui-popup__container--visible")},t(document).on("click",".close-popup, .weui-popup__overlay",function(){t.closePopup()}).on("click",".open-popup",function(){t(t(this).data("target")).popup()}).on("click",".weui-popup__container",function(e){t(e.target).hasClass("weui-popup__container")&&t.closePopup()}),t.fn.popup=function(){return this.each(function(){t.openPopup(this)})}}($),+function(t){"use strict";var e,n,i,a,r,o,s=function(n){var i=t.getTouchPosition(n);a=i,r=o=0,e.addClass("touching")},c=function(n){if(!a)return!1;n.preventDefault(),n.stopPropagation();var i=t.getTouchPosition(n);r=i.x-a.x,o=i.y-a.y,o>0&&(o=Math.sqrt(o)),e.css("transform","translate3d(0, "+o+"px, 0)")},l=function(){e.removeClass("touching"),e.attr("style",""),o<0&&Math.abs(o)>.38*e.height()&&t.closeNotification(),Math.abs(r)<=1&&Math.abs(o)<=1&&e.trigger("noti-click"),a=!1},u=function(e){e.on(t.touchEvents.start,s),e.on(t.touchEvents.move,c),e.on(t.touchEvents.end,l)};t.notification=t.noti=function(a){a=t.extend({},n,a),e=t(".weui-notification"),e[0]||(e=t('<div class="weui-notification"></div>').appendTo(document.body),u(e)),e.off("noti-click"),a.onClick&&e.on("noti-click",function(){a.onClick(a.data)}),e.html(t.t7.compile(a.tpl)(a)),e.show(),e.addClass("weui-notification--in"),e.data("params",a);var r=function(){i&&(clearTimeout(i),i=null),i=setTimeout(function(){e.hasClass("weui-notification--touching")?r():t.closeNotification()},a.time)};r()},t.closeNotification=function(){i&&clearTimeout(i),i=null;var e=t(".weui-notification").removeClass("weui-notification--in").transitionEnd(function(){t(this).remove()});if(e[0]){var n=t(".weui-notification").data("params");n&&n.onClose&&n.onClose(n.data)}},n=t.noti.prototype.defaults={title:void 0,text:void 0,media:void 0,time:4e3,onClick:void 0,onClose:void 0,data:void 0,tpl:'<div class="weui-notification__inner">{{#if media}}<div class="weui-notification__media">{{media}}</div>{{/if}}<div class="weui-notification__content">{{#if title}}<div class="weui-notification__title">{{title}}</div>{{/if}}{{#if text}}<div class="weui-notification__text">{{text}}</div>{{/if}}</div><div class="weui-notification__handle-bar"></div></div>'}}($),+function(t){"use strict";var e;t.toptip=function(n,i,a){if(n){"string"==typeof i&&(a=i,i=void 0),i=i||3e3;var r=a?"bg-"+a:"bg-danger",o=t(".weui-toptips").remove();o=t('<div class="weui-toptips"></div>').appendTo(document.body),o.html(n),o[0].className="weui-toptips "+r,clearTimeout(e),o.hasClass("weui-toptips_visible")||(o.show().width(),o.addClass("weui-toptips_visible")),e=setTimeout(function(){o.removeClass("weui-toptips_visible").transitionEnd(function(){o.remove()})},i)}}}($),+function(t){"use strict";var e=function(e,n){this.container=t(e),this.handler=this.container.find(".weui-slider__handler"),this.track=this.container.find(".weui-slider__track"),this.value=this.container.find(".weui-slider-box__value"),this.bind(),"function"==typeof n&&(this.callback=n)};e.prototype.bind=function(){this.container.on(t.touchEvents.start,t.proxy(this.touchStart,this)).on(t.touchEvents.end,t.proxy(this.touchEnd,this)),t(document.body).on(t.touchEvents.move,t.proxy(this.touchMove,this))},e.prototype.touchStart=function(e){e.preventDefault(),this.start=t.getTouchPosition(e),this.width=this.container.find(".weui-slider__inner").width(),this.left=parseInt(this.container.find(".weui-slider__handler").css("left")),this.touching=!0},e.prototype.touchMove=function(e){if(!this.touching)return!0;var n=t.getTouchPosition(e),i=n.x-this.start.x,a=i+this.left,r=parseInt(a/this.width*100);r<0&&(r=0),r>100&&(r=100),this.handler.css("left",r+"%"),this.track.css("width",r+"%"),this.value.text(r),this.callback&&this.callback.call(this,r),this.container.trigger("change",r)},e.prototype.touchEnd=function(t){this.touching=!1},t.fn.slider=function(n){this.each(function(){var i=t(this),a=i.data("slider");return a?a:void i.data("slider",new e(this,n))})}}($),+function(t){"use strict";var e=[],n="swipeout-touching",i=function(n){this.container=t(n),this.mover=this.container.find(">.weui-cell__bd"),this.attachEvents(),e.push(this)};i.prototype.touchStart=function(e){var i=t.getTouchPosition(e);this.container.addClass(n),this.start=i,this.startX=0,this.startTime=+new Date;var a=this.mover.css("transform").match(/-?[\d\.]+/g);a&&a.length&&(this.startX=parseInt(a[4])),this.diffX=this.diffY=0,this._closeOthers(),this.limit=this.container.find(">.weui-cell__ft").width()||68},i.prototype.touchMove=function(e){if(!this.start)return!0;var n=t.getTouchPosition(e);if(this.diffX=n.x-this.start.x,this.diffY=n.y-this.start.y,Math.abs(this.diffX)<Math.abs(this.diffY))return this.close(),this.start=!1,!0;e.preventDefault(),e.stopPropagation();var i=this.diffX+this.startX;i>0&&(i=0),Math.abs(i)>this.limit&&(i=-(Math.pow(-(i+this.limit),.7)+this.limit)),this.mover.css("transform","translate3d("+i+"px, 0, 0)")},i.prototype.touchEnd=function(){if(!this.start)return!0;this.start=!1;var t=this.diffX+this.startX,e=new Date-this.startTime;this.diffX<-5&&e<200?this.open():this.diffX>=0&&e<200?this.close():t>0||-t<=this.limit/2?this.close():this.open()},i.prototype.close=function(){this.container.removeClass(n),this.mover.css("transform","translate3d(0, 0, 0)"),this.container.trigger("swipeout-close")},i.prototype.open=function(){this.container.removeClass(n),this._closeOthers(),this.mover.css("transform","translate3d("+-this.limit+"px, 0, 0)"),this.container.trigger("swipeout-open")},i.prototype.attachEvents=function(){var e=this.mover;e.on(t.touchEvents.start,t.proxy(this.touchStart,this)),e.on(t.touchEvents.move,t.proxy(this.touchMove,this)),e.on(t.touchEvents.end,t.proxy(this.touchEnd,this))},i.prototype._closeOthers=function(){var t=this;e.forEach(function(e){e!==t&&e.close()})};var a=function(t){return new i(t)};t.fn.swipeout=function(e){return this.each(function(){var n=t(this),i=n.data("swipeout")||a(this);n.data("swipeout",i),"string"==typeof e&&i[e]()})},t(".weui-cell_swiped").swipeout()}($);
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/zepto.min.js b/pluss-wap-page/src/main/resources/static/resources/js/zepto.min.js
new file mode 100644
index 0000000..3f17e6f
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/zepto.min.js
@@ -0,0 +1,6 @@
+!function(t,e){"function"==typeof define&&define.amd?define(function(){return e(t)}):e(t)}(this,function(t){var e=function(){function e(t){return null==t?t+"":W[Y.call(t)]||"object"}function n(t){return"function"==e(t)}function r(t){return null!=t&&t==t.window}function i(t){return null!=t&&t.nodeType==t.DOCUMENT_NODE}function o(t){return"object"==e(t)}function a(t){return o(t)&&!r(t)&&Object.getPrototypeOf(t)==Object.prototype}function s(t){var e=!!t&&"length"in t&&t.length,n=C.type(t);return"function"!=n&&!r(t)&&("array"==n||0===e||"number"==typeof e&&e>0&&e-1 in t)}function u(t){return L.call(t,function(t){return null!=t})}function c(t){return t.length>0?C.fn.concat.apply([],t):t}function l(t){return t.replace(/::/g,"/").replace(/([A-Z]+)([A-Z][a-z])/g,"$1_$2").replace(/([a-z\d])([A-Z])/g,"$1_$2").replace(/_/g,"-").toLowerCase()}function f(t){return t in k?k[t]:k[t]=RegExp("(^|\\s)"+t+"(\\s|$)")}function h(t,e){return"number"!=typeof e||Z[l(t)]?e:e+"px"}function p(t){var e,n;return F[t]||(e=$.createElement(t),$.body.appendChild(e),n=getComputedStyle(e,"").getPropertyValue("display"),e.parentNode.removeChild(e),"none"==n&&(n="block"),F[t]=n),F[t]}function d(t){return"children"in t?D.call(t.children):C.map(t.childNodes,function(t){return 1==t.nodeType?t:void 0})}function m(t,e){var n,r=t?t.length:0;for(n=0;r>n;n++)this[n]=t[n];this.length=r,this.selector=e||""}function g(t,e,n){for(w in e)n&&(a(e[w])||te(e[w]))?(a(e[w])&&!a(t[w])&&(t[w]={}),te(e[w])&&!te(t[w])&&(t[w]=[]),g(t[w],e[w],n)):e[w]!==j&&(t[w]=e[w])}function v(t,e){return null==e?C(t):C(t).filter(e)}function y(t,e,r,i){return n(e)?e.call(t,r,i):e}function x(t,e,n){null==n?t.removeAttribute(e):t.setAttribute(e,n)}function b(t,e){var n=t.className||"",r=n&&n.baseVal!==j;return e===j?r?n.baseVal:n:void(r?n.baseVal=e:t.className=e)}function E(t){try{return t?"true"==t||("false"==t?!1:"null"==t?null:+t+""==t?+t:/^[\[\{]/.test(t)?C.parseJSON(t):t):t}catch(e){return t}}function T(t,e){e(t);for(var n=0,r=t.childNodes.length;r>n;n++)T(t.childNodes[n],e)}var j,w,C,S,N,O,P=[],A=P.concat,L=P.filter,D=P.slice,$=t.document,F={},k={},Z={"column-count":1,columns:1,"font-weight":1,"line-height":1,opacity:1,"z-index":1,zoom:1},M=/^\s*<(\w+|!)[^>]*>/,z=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,R=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,q=/^(?:body|html)$/i,_=/([A-Z])/g,I=["val","css","html","text","data","width","height","offset"],H=["after","prepend","before","append"],V=$.createElement("table"),B=$.createElement("tr"),X={tr:$.createElement("tbody"),tbody:V,thead:V,tfoot:V,td:B,th:B,"*":$.createElement("div")},U=/complete|loaded|interactive/,J=/^[\w-]*$/,W={},Y=W.toString,G={},K=$.createElement("div"),Q={tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},te=Array.isArray||function(t){return t instanceof Array};return G.matches=function(t,e){if(!e||!t||1!==t.nodeType)return!1;var n=t.matches||t.webkitMatchesSelector||t.mozMatchesSelector||t.oMatchesSelector||t.matchesSelector;if(n)return n.call(t,e);var r,i=t.parentNode,o=!i;return o&&(i=K).appendChild(t),r=~G.qsa(i,e).indexOf(t),o&&K.removeChild(t),r},N=function(t){return t.replace(/-+(.)?/g,function(t,e){return e?e.toUpperCase():""})},O=function(t){return L.call(t,function(e,n){return t.indexOf(e)==n})},G.fragment=function(t,e,n){var r,i,o;return z.test(t)&&(r=C($.createElement(RegExp.$1))),r||(t.replace&&(t=t.replace(R,"<$1></$2>")),e===j&&(e=M.test(t)&&RegExp.$1),e in X||(e="*"),o=X[e],o.innerHTML=""+t,r=C.each(D.call(o.childNodes),function(){o.removeChild(this)})),a(n)&&(i=C(r),C.each(n,function(t,e){I.indexOf(t)>-1?i[t](e):i.attr(t,e)})),r},G.Z=function(t,e){return new m(t,e)},G.isZ=function(t){return t instanceof G.Z},G.init=function(t,e){var r;if(!t)return G.Z();if("string"==typeof t)if(t=t.trim(),"<"==t[0]&&M.test(t))r=G.fragment(t,RegExp.$1,e),t=null;else{if(e!==j)return C(e).find(t);r=G.qsa($,t)}else{if(n(t))return C($).ready(t);if(G.isZ(t))return t;if(te(t))r=u(t);else if(o(t))r=[t],t=null;else if(M.test(t))r=G.fragment(t.trim(),RegExp.$1,e),t=null;else{if(e!==j)return C(e).find(t);r=G.qsa($,t)}}return G.Z(r,t)},C=function(t,e){return G.init(t,e)},C.extend=function(t){var e,n=D.call(arguments,1);return"boolean"==typeof t&&(e=t,t=n.shift()),n.forEach(function(n){g(t,n,e)}),t},G.qsa=function(t,e){var n,r="#"==e[0],i=!r&&"."==e[0],o=r||i?e.slice(1):e,a=J.test(o);return t.getElementById&&a&&r?(n=t.getElementById(o))?[n]:[]:1!==t.nodeType&&9!==t.nodeType&&11!==t.nodeType?[]:D.call(a&&!r&&t.getElementsByClassName?i?t.getElementsByClassName(o):t.getElementsByTagName(e):t.querySelectorAll(e))},C.contains=$.documentElement.contains?function(t,e){return t!==e&&t.contains(e)}:function(t,e){for(;e&&(e=e.parentNode);)if(e===t)return!0;return!1},C.type=e,C.isFunction=n,C.isWindow=r,C.isArray=te,C.isPlainObject=a,C.isEmptyObject=function(t){var e;for(e in t)return!1;return!0},C.isNumeric=function(t){var e=+t,n=typeof t;return null!=t&&"boolean"!=n&&("string"!=n||t.length)&&!isNaN(e)&&isFinite(e)||!1},C.inArray=function(t,e,n){return P.indexOf.call(e,t,n)},C.camelCase=N,C.trim=function(t){return null==t?"":String.prototype.trim.call(t)},C.uuid=0,C.support={},C.expr={},C.noop=function(){},C.map=function(t,e){var n,r,i,o=[];if(s(t))for(r=0;r<t.length;r++)n=e(t[r],r),null!=n&&o.push(n);else for(i in t)n=e(t[i],i),null!=n&&o.push(n);return c(o)},C.each=function(t,e){var n,r;if(s(t)){for(n=0;n<t.length;n++)if(e.call(t[n],n,t[n])===!1)return t}else for(r in t)if(e.call(t[r],r,t[r])===!1)return t;return t},C.grep=function(t,e){return L.call(t,e)},t.JSON&&(C.parseJSON=JSON.parse),C.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(t,e){W["[object "+e+"]"]=e.toLowerCase()}),C.fn={constructor:G.Z,length:0,forEach:P.forEach,reduce:P.reduce,push:P.push,sort:P.sort,splice:P.splice,indexOf:P.indexOf,concat:function(){var t,e,n=[];for(t=0;t<arguments.length;t++)e=arguments[t],n[t]=G.isZ(e)?e.toArray():e;return A.apply(G.isZ(this)?this.toArray():this,n)},map:function(t){return C(C.map(this,function(e,n){return t.call(e,n,e)}))},slice:function(){return C(D.apply(this,arguments))},ready:function(t){return U.test($.readyState)&&$.body?t(C):$.addEventListener("DOMContentLoaded",function(){t(C)},!1),this},get:function(t){return t===j?D.call(this):this[0>t?t+this.length:t]},toArray:function(){return this.get()},size:function(){return this.length},remove:function(){return this.each(function(){null!=this.parentNode&&this.parentNode.removeChild(this)})},each:function(t){return P.every.call(this,function(e,n){return t.call(e,n,e)!==!1}),this},filter:function(t){return n(t)?this.not(this.not(t)):C(L.call(this,function(e){return G.matches(e,t)}))},add:function(t,e){return C(O(this.concat(C(t,e))))},is:function(t){return this.length>0&&G.matches(this[0],t)},not:function(t){var e=[];if(n(t)&&t.call!==j)this.each(function(n){t.call(this,n)||e.push(this)});else{var r="string"==typeof t?this.filter(t):s(t)&&n(t.item)?D.call(t):C(t);this.forEach(function(t){r.indexOf(t)<0&&e.push(t)})}return C(e)},has:function(t){return this.filter(function(){return o(t)?C.contains(this,t):C(this).find(t).size()})},eq:function(t){return-1===t?this.slice(t):this.slice(t,+t+1)},first:function(){var t=this[0];return t&&!o(t)?t:C(t)},last:function(){var t=this[this.length-1];return t&&!o(t)?t:C(t)},find:function(t){var e,n=this;return e=t?"object"==typeof t?C(t).filter(function(){var t=this;return P.some.call(n,function(e){return C.contains(e,t)})}):1==this.length?C(G.qsa(this[0],t)):this.map(function(){return G.qsa(this,t)}):C()},closest:function(t,e){var n=[],r="object"==typeof t&&C(t);return this.each(function(o,a){for(;a&&!(r?r.indexOf(a)>=0:G.matches(a,t));)a=a!==e&&!i(a)&&a.parentNode;a&&n.indexOf(a)<0&&n.push(a)}),C(n)},parents:function(t){for(var e=[],n=this;n.length>0;)n=C.map(n,function(t){return(t=t.parentNode)&&!i(t)&&e.indexOf(t)<0?(e.push(t),t):void 0});return v(e,t)},parent:function(t){return v(O(this.pluck("parentNode")),t)},children:function(t){return v(this.map(function(){return d(this)}),t)},contents:function(){return this.map(function(){return this.contentDocument||D.call(this.childNodes)})},siblings:function(t){return v(this.map(function(t,e){return L.call(d(e.parentNode),function(t){return t!==e})}),t)},empty:function(){return this.each(function(){this.innerHTML=""})},pluck:function(t){return C.map(this,function(e){return e[t]})},show:function(){return this.each(function(){"none"==this.style.display&&(this.style.display=""),"none"==getComputedStyle(this,"").getPropertyValue("display")&&(this.style.display=p(this.nodeName))})},replaceWith:function(t){return this.before(t).remove()},wrap:function(t){var e=n(t);if(this[0]&&!e)var r=C(t).get(0),i=r.parentNode||this.length>1;return this.each(function(n){C(this).wrapAll(e?t.call(this,n):i?r.cloneNode(!0):r)})},wrapAll:function(t){if(this[0]){C(this[0]).before(t=C(t));for(var e;(e=t.children()).length;)t=e.first();C(t).append(this)}return this},wrapInner:function(t){var e=n(t);return this.each(function(n){var r=C(this),i=r.contents(),o=e?t.call(this,n):t;i.length?i.wrapAll(o):r.append(o)})},unwrap:function(){return this.parent().each(function(){C(this).replaceWith(C(this).children())}),this},clone:function(){return this.map(function(){return this.cloneNode(!0)})},hide:function(){return this.css("display","none")},toggle:function(t){return this.each(function(){var e=C(this);(t===j?"none"==e.css("display"):t)?e.show():e.hide()})},prev:function(t){return C(this.pluck("previousElementSibling")).filter(t||"*")},next:function(t){return C(this.pluck("nextElementSibling")).filter(t||"*")},html:function(t){return 0 in arguments?this.each(function(e){var n=this.innerHTML;C(this).empty().append(y(this,t,e,n))}):0 in this?this[0].innerHTML:null},text:function(t){return 0 in arguments?this.each(function(e){var n=y(this,t,e,this.textContent);this.textContent=null==n?"":""+n}):0 in this?this.pluck("textContent").join(""):null},attr:function(t,e){var n;return"string"!=typeof t||1 in arguments?this.each(function(n){if(1===this.nodeType)if(o(t))for(w in t)x(this,w,t[w]);else x(this,t,y(this,e,n,this.getAttribute(t)))}):0 in this&&1==this[0].nodeType&&null!=(n=this[0].getAttribute(t))?n:j},removeAttr:function(t){return this.each(function(){1===this.nodeType&&t.split(" ").forEach(function(t){x(this,t)},this)})},prop:function(t,e){return t=Q[t]||t,1 in arguments?this.each(function(n){this[t]=y(this,e,n,this[t])}):this[0]&&this[0][t]},removeProp:function(t){return t=Q[t]||t,this.each(function(){delete this[t]})},data:function(t,e){var n="data-"+t.replace(_,"-$1").toLowerCase(),r=1 in arguments?this.attr(n,e):this.attr(n);return null!==r?E(r):j},val:function(t){return 0 in arguments?(null==t&&(t=""),this.each(function(e){this.value=y(this,t,e,this.value)})):this[0]&&(this[0].multiple?C(this[0]).find("option").filter(function(){return this.selected}).pluck("value"):this[0].value)},offset:function(e){if(e)return this.each(function(t){var n=C(this),r=y(this,e,t,n.offset()),i=n.offsetParent().offset(),o={top:r.top-i.top,left:r.left-i.left};"static"==n.css("position")&&(o.position="relative"),n.css(o)});if(!this.length)return null;if($.documentElement!==this[0]&&!C.contains($.documentElement,this[0]))return{top:0,left:0};var n=this[0].getBoundingClientRect();return{left:n.left+t.pageXOffset,top:n.top+t.pageYOffset,width:Math.round(n.width),height:Math.round(n.height)}},css:function(t,n){if(arguments.length<2){var r=this[0];if("string"==typeof t){if(!r)return;return r.style[N(t)]||getComputedStyle(r,"").getPropertyValue(t)}if(te(t)){if(!r)return;var i={},o=getComputedStyle(r,"");return C.each(t,function(t,e){i[e]=r.style[N(e)]||o.getPropertyValue(e)}),i}}var a="";if("string"==e(t))n||0===n?a=l(t)+":"+h(t,n):this.each(function(){this.style.removeProperty(l(t))});else for(w in t)t[w]||0===t[w]?a+=l(w)+":"+h(w,t[w])+";":this.each(function(){this.style.removeProperty(l(w))});return this.each(function(){this.style.cssText+=";"+a})},index:function(t){return t?this.indexOf(C(t)[0]):this.parent().children().indexOf(this[0])},hasClass:function(t){return t?P.some.call(this,function(t){return this.test(b(t))},f(t)):!1},addClass:function(t){return t?this.each(function(e){if("className"in this){S=[];var n=b(this),r=y(this,t,e,n);r.split(/\s+/g).forEach(function(t){C(this).hasClass(t)||S.push(t)},this),S.length&&b(this,n+(n?" ":"")+S.join(" "))}}):this},removeClass:function(t){return this.each(function(e){if("className"in this){if(t===j)return b(this,"");S=b(this),y(this,t,e,S).split(/\s+/g).forEach(function(t){S=S.replace(f(t)," ")}),b(this,S.trim())}})},toggleClass:function(t,e){return t?this.each(function(n){var r=C(this),i=y(this,t,n,b(this));i.split(/\s+/g).forEach(function(t){(e===j?!r.hasClass(t):e)?r.addClass(t):r.removeClass(t)})}):this},scrollTop:function(t){if(this.length){var e="scrollTop"in this[0];return t===j?e?this[0].scrollTop:this[0].pageYOffset:this.each(e?function(){this.scrollTop=t}:function(){this.scrollTo(this.scrollX,t)})}},scrollLeft:function(t){if(this.length){var e="scrollLeft"in this[0];return t===j?e?this[0].scrollLeft:this[0].pageXOffset:this.each(e?function(){this.scrollLeft=t}:function(){this.scrollTo(t,this.scrollY)})}},position:function(){if(this.length){var t=this[0],e=this.offsetParent(),n=this.offset(),r=q.test(e[0].nodeName)?{top:0,left:0}:e.offset();return n.top-=parseFloat(C(t).css("margin-top"))||0,n.left-=parseFloat(C(t).css("margin-left"))||0,r.top+=parseFloat(C(e[0]).css("border-top-width"))||0,r.left+=parseFloat(C(e[0]).css("border-left-width"))||0,{top:n.top-r.top,left:n.left-r.left}}},offsetParent:function(){return this.map(function(){for(var t=this.offsetParent||$.body;t&&!q.test(t.nodeName)&&"static"==C(t).css("position");)t=t.offsetParent;return t})}},C.fn.detach=C.fn.remove,["width","height"].forEach(function(t){var e=t.replace(/./,function(t){return t[0].toUpperCase()});C.fn[t]=function(n){var o,a=this[0];return n===j?r(a)?a["inner"+e]:i(a)?a.documentElement["scroll"+e]:(o=this.offset())&&o[t]:this.each(function(e){a=C(this),a.css(t,y(this,n,e,a[t]()))})}}),H.forEach(function(n,r){var i=r%2;C.fn[n]=function(){var n,o,a=C.map(arguments,function(t){var r=[];return n=e(t),"array"==n?(t.forEach(function(t){return t.nodeType!==j?r.push(t):C.zepto.isZ(t)?r=r.concat(t.get()):void(r=r.concat(G.fragment(t)))}),r):"object"==n||null==t?t:G.fragment(t)}),s=this.length>1;return a.length<1?this:this.each(function(e,n){o=i?n:n.parentNode,n=0==r?n.nextSibling:1==r?n.firstChild:2==r?n:null;var u=C.contains($.documentElement,o);a.forEach(function(e){if(s)e=e.cloneNode(!0);else if(!o)return C(e).remove();o.insertBefore(e,n),u&&T(e,function(e){if(!(null==e.nodeName||"SCRIPT"!==e.nodeName.toUpperCase()||e.type&&"text/javascript"!==e.type||e.src)){var n=e.ownerDocument?e.ownerDocument.defaultView:t;n.eval.call(n,e.innerHTML)}})})})},C.fn[i?n+"To":"insert"+(r?"Before":"After")]=function(t){return C(t)[n](this),this}}),G.Z.prototype=m.prototype=C.fn,G.uniq=O,G.deserializeValue=E,C.zepto=G,C}();return t.Zepto=e,void 0===t.$&&(t.$=e),function(e){function n(t){return t._zid||(t._zid=p++)}function r(t,e,r,a){if(e=i(e),e.ns)var s=o(e.ns);return(v[n(t)]||[]).filter(function(t){return!(!t||e.e&&t.e!=e.e||e.ns&&!s.test(t.ns)||r&&n(t.fn)!==n(r)||a&&t.sel!=a)})}function i(t){var e=(""+t).split(".");return{e:e[0],ns:e.slice(1).sort().join(" ")}}function o(t){return RegExp("(?:^| )"+t.replace(" "," .* ?")+"(?: |$)")}function a(t,e){return t.del&&!x&&t.e in b||!!e}function s(t){return E[t]||x&&b[t]||t}function u(t,r,o,u,c,f,p){var d=n(t),m=v[d]||(v[d]=[]);r.split(/\s/).forEach(function(n){if("ready"==n)return e(document).ready(o);var r=i(n);r.fn=o,r.sel=c,r.e in E&&(o=function(t){var n=t.relatedTarget;return!n||n!==this&&!e.contains(this,n)?r.fn.apply(this,arguments):void 0}),r.del=f;var d=f||o;r.proxy=function(e){if(e=l(e),!e.isImmediatePropagationStopped()){e.data=u;var n=d.apply(t,e._args==h?[e]:[e].concat(e._args));return n===!1&&(e.preventDefault(),e.stopPropagation()),n}},r.i=m.length,m.push(r),"addEventListener"in t&&t.addEventListener(s(r.e),r.proxy,a(r,p))})}function c(t,e,i,o,u){var c=n(t);(e||"").split(/\s/).forEach(function(e){r(t,e,i,o).forEach(function(e){delete v[c][e.i],"removeEventListener"in t&&t.removeEventListener(s(e.e),e.proxy,a(e,u))})})}function l(t,n){return(n||!t.isDefaultPrevented)&&(n||(n=t),e.each(C,function(e,r){var i=n[e];t[e]=function(){return this[r]=T,i&&i.apply(n,arguments)},t[r]=j}),t.timeStamp||(t.timeStamp=Date.now()),(n.defaultPrevented!==h?n.defaultPrevented:"returnValue"in n?n.returnValue===!1:n.getPreventDefault&&n.getPreventDefault())&&(t.isDefaultPrevented=T)),t}function f(t){var e,n={originalEvent:t};for(e in t)w.test(e)||t[e]===h||(n[e]=t[e]);return l(n,t)}var h,p=1,d=Array.prototype.slice,m=e.isFunction,g=function(t){return"string"==typeof t},v={},y={},x="onfocusin"in t,b={focus:"focusin",blur:"focusout"},E={mouseenter:"mouseover",mouseleave:"mouseout"};y.click=y.mousedown=y.mouseup=y.mousemove="MouseEvents",e.event={add:u,remove:c},e.proxy=function(t,r){var i=2 in arguments&&d.call(arguments,2);if(m(t)){var o=function(){return t.apply(r,i?i.concat(d.call(arguments)):arguments)};return o._zid=n(t),o}if(g(r))return i?(i.unshift(t[r],t),e.proxy.apply(null,i)):e.proxy(t[r],t);throw new TypeError("expected function")},e.fn.bind=function(t,e,n){return this.on(t,e,n)},e.fn.unbind=function(t,e){return this.off(t,e)},e.fn.one=function(t,e,n,r){return this.on(t,e,n,r,1)};var T=function(){return!0},j=function(){return!1},w=/^([A-Z]|returnValue$|layer[XY]$|webkitMovement[XY]$)/,C={preventDefault:"isDefaultPrevented",stopImmediatePropagation:"isImmediatePropagationStopped",stopPropagation:"isPropagationStopped"};e.fn.delegate=function(t,e,n){return this.on(e,t,n)},e.fn.undelegate=function(t,e,n){return this.off(e,t,n)},e.fn.live=function(t,n){return e(document.body).delegate(this.selector,t,n),this},e.fn.die=function(t,n){return e(document.body).undelegate(this.selector,t,n),this},e.fn.on=function(t,n,r,i,o){var a,s,l=this;return t&&!g(t)?(e.each(t,function(t,e){l.on(t,n,r,e,o)}),l):(g(n)||m(i)||i===!1||(i=r,r=n,n=h),(i===h||r===!1)&&(i=r,r=h),i===!1&&(i=j),l.each(function(l,h){o&&(a=function(t){return c(h,t.type,i),i.apply(this,arguments)}),n&&(s=function(t){var r,o=e(t.target).closest(n,h).get(0);return o&&o!==h?(r=e.extend(f(t),{currentTarget:o,liveFired:h}),(a||i).apply(o,[r].concat(d.call(arguments,1)))):void 0}),u(h,t,i,r,n,s||a)}))},e.fn.off=function(t,n,r){var i=this;return t&&!g(t)?(e.each(t,function(t,e){i.off(t,n,e)}),i):(g(n)||m(r)||r===!1||(r=n,n=h),r===!1&&(r=j),i.each(function(){c(this,t,r,n)}))},e.fn.trigger=function(t,n){return t=g(t)||e.isPlainObject(t)?e.Event(t):l(t),t._args=n,this.each(function(){t.type in b&&"function"==typeof this[t.type]?this[t.type]():"dispatchEvent"in this?this.dispatchEvent(t):e(this).triggerHandler(t,n)})},e.fn.triggerHandler=function(t,n){var i,o;return this.each(function(a,s){i=f(g(t)?e.Event(t):t),i._args=n,i.target=s,e.each(r(s,t.type||t),function(t,e){return o=e.proxy(i),i.isImmediatePropagationStopped()?!1:void 0})}),o},"focusin focusout focus blur load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select keydown keypress keyup error".split(" ").forEach(function(t){e.fn[t]=function(e){return 0 in arguments?this.bind(t,e):this.trigger(t)}}),e.Event=function(t,e){g(t)||(e=t,t=e.type);var n=document.createEvent(y[t]||"Events"),r=!0;if(e)for(var i in e)"bubbles"==i?r=!!e[i]:n[i]=e[i];return n.initEvent(t,r,!0),l(n)}}(e),function(e){function n(t,n,r){var i=e.Event(n);return e(t).trigger(i,r),!i.isDefaultPrevented()}function r(t,e,r,i){return t.global?n(e||b,r,i):void 0}function i(t){t.global&&0===e.active++&&r(t,null,"ajaxStart")}function o(t){t.global&&!--e.active&&r(t,null,"ajaxStop")}function a(t,e){var n=e.context;return e.beforeSend.call(n,t,e)===!1||r(e,n,"ajaxBeforeSend",[t,e])===!1?!1:void r(e,n,"ajaxSend",[t,e])}function s(t,e,n,i){var o=n.context,a="success";n.success.call(o,t,a,e),i&&i.resolveWith(o,[t,a,e]),r(n,o,"ajaxSuccess",[e,n,t]),c(a,e,n)}function u(t,e,n,i,o){var a=i.context;i.error.call(a,n,e,t),o&&o.rejectWith(a,[n,e,t]),r(i,a,"ajaxError",[n,i,t||e]),c(e,n,i)}function c(t,e,n){var i=n.context;n.complete.call(i,e,t),r(n,i,"ajaxComplete",[e,n]),o(n)}function l(t,e,n){if(n.dataFilter==f)return t;var r=n.context;return n.dataFilter.call(r,t,e)}function f(){}function h(t){return t&&(t=t.split(";",2)[0]),t&&(t==C?"html":t==w?"json":T.test(t)?"script":j.test(t)&&"xml")||"text"}function p(t,e){return""==e?t:(t+"&"+e).replace(/[&?]{1,2}/,"?")}function d(t){t.processData&&t.data&&"string"!=e.type(t.data)&&(t.data=e.param(t.data,t.traditional)),!t.data||t.type&&"GET"!=t.type.toUpperCase()&&"jsonp"!=t.dataType||(t.url=p(t.url,t.data),t.data=void 0)}function m(t,n,r,i){return e.isFunction(n)&&(i=r,r=n,n=void 0),e.isFunction(r)||(i=r,r=void 0),{url:t,data:n,success:r,dataType:i}}function g(t,n,r,i){var o,a=e.isArray(n),s=e.isPlainObject(n);e.each(n,function(n,u){o=e.type(u),i&&(n=r?i:i+"["+(s||"object"==o||"array"==o?n:"")+"]"),!i&&a?t.add(u.name,u.value):"array"==o||!r&&"object"==o?g(t,u,r,n):t.add(n,u)})}var v,y,x=+new Date,b=t.document,E=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,T=/^(?:text|application)\/javascript/i,j=/^(?:text|application)\/xml/i,w="application/json",C="text/html",S=/^\s*$/,N=b.createElement("a");N.href=t.location.href,e.active=0,e.ajaxJSONP=function(n,r){if(!("type"in n))return e.ajax(n);var i,o,c=n.jsonpCallback,l=(e.isFunction(c)?c():c)||"Zepto"+x++,f=b.createElement("script"),h=t[l],p=function(t){e(f).triggerHandler("error",t||"abort")},d={abort:p};return r&&r.promise(d),e(f).on("load error",function(a,c){clearTimeout(o),e(f).off().remove(),"error"!=a.type&&i?s(i[0],d,n,r):u(null,c||"error",d,n,r),t[l]=h,i&&e.isFunction(h)&&h(i[0]),h=i=void 0}),a(d,n)===!1?(p("abort"),d):(t[l]=function(){i=arguments},f.src=n.url.replace(/\?(.+)=\?/,"?$1="+l),b.head.appendChild(f),n.timeout>0&&(o=setTimeout(function(){p("timeout")},n.timeout)),d)},e.ajaxSettings={type:"GET",beforeSend:f,success:f,error:f,complete:f,context:null,global:!0,xhr:function(){return new t.XMLHttpRequest},accepts:{script:"text/javascript, application/javascript, application/x-javascript",json:w,xml:"application/xml, text/xml",html:C,text:"text/plain"},crossDomain:!1,timeout:0,processData:!0,cache:!0,dataFilter:f},e.ajax=function(n){var r,o,c=e.extend({},n||{}),m=e.Deferred&&e.Deferred();for(v in e.ajaxSettings)void 0===c[v]&&(c[v]=e.ajaxSettings[v]);i(c),c.crossDomain||(r=b.createElement("a"),r.href=c.url,r.href=r.href,c.crossDomain=N.protocol+"//"+N.host!=r.protocol+"//"+r.host),c.url||(c.url=""+t.location),(o=c.url.indexOf("#"))>-1&&(c.url=c.url.slice(0,o)),d(c);var g=c.dataType,x=/\?.+=\?/.test(c.url);if(x&&(g="jsonp"),c.cache!==!1&&(n&&n.cache===!0||"script"!=g&&"jsonp"!=g)||(c.url=p(c.url,"_="+Date.now())),"jsonp"==g)return x||(c.url=p(c.url,c.jsonp?c.jsonp+"=?":c.jsonp===!1?"":"callback=?")),e.ajaxJSONP(c,m);var E,T=c.accepts[g],j={},w=function(t,e){j[t.toLowerCase()]=[t,e]},C=/^([\w-]+:)\/\//.test(c.url)?RegExp.$1:t.location.protocol,O=c.xhr(),P=O.setRequestHeader;if(m&&m.promise(O),c.crossDomain||w("X-Requested-With","XMLHttpRequest"),w("Accept",T||"*/*"),(T=c.mimeType||T)&&(T.indexOf(",")>-1&&(T=T.split(",",2)[0]),O.overrideMimeType&&O.overrideMimeType(T)),(c.contentType||c.contentType!==!1&&c.data&&"GET"!=c.type.toUpperCase())&&w("Content-Type",c.contentType||"application/x-www-form-urlencoded"),c.headers)for(y in c.headers)w(y,c.headers[y]);if(O.setRequestHeader=w,O.onreadystatechange=function(){if(4==O.readyState){O.onreadystatechange=f,clearTimeout(E);var t,n=!1;if(O.status>=200&&O.status<300||304==O.status||0==O.status&&"file:"==C){if(g=g||h(c.mimeType||O.getResponseHeader("content-type")),"arraybuffer"==O.responseType||"blob"==O.responseType)t=O.response;else{t=O.responseText;try{t=l(t,g,c),"script"==g?(1,eval)(t):"xml"==g?t=O.responseXML:"json"==g&&(t=S.test(t)?null:e.parseJSON(t))}catch(r){n=r}if(n)return u(n,"parsererror",O,c,m)}s(t,O,c,m)}else u(O.statusText||null,O.status?"error":"abort",O,c,m)}},a(O,c)===!1)return O.abort(),u(null,"abort",O,c,m),O;var A="async"in c?c.async:!0;if(O.open(c.type,c.url,A,c.username,c.password),c.xhrFields)for(y in c.xhrFields)O[y]=c.xhrFields[y];for(y in j)P.apply(O,j[y]);return c.timeout>0&&(E=setTimeout(function(){O.onreadystatechange=f,O.abort(),u(null,"timeout",O,c,m)},c.timeout)),O.send(c.data?c.data:null),O},e.get=function(){return e.ajax(m.apply(null,arguments))},e.post=function(){var t=m.apply(null,arguments);return t.type="POST",e.ajax(t)},e.getJSON=function(){var t=m.apply(null,arguments);return t.dataType="json",e.ajax(t)},e.fn.load=function(t,n,r){if(!this.length)return this;var i,o=this,a=t.split(/\s/),s=m(t,n,r),u=s.success;return a.length>1&&(s.url=a[0],i=a[1]),s.success=function(t){o.html(i?e("<div>").html(t.replace(E,"")).find(i):t),u&&u.apply(o,arguments)},e.ajax(s),this};var O=encodeURIComponent;e.param=function(t,n){var r=[];return r.add=function(t,n){e.isFunction(n)&&(n=n()),null==n&&(n=""),this.push(O(t)+"="+O(n))},g(r,t,n),r.join("&").replace(/%20/g,"+")}}(e),function(t){t.fn.serializeArray=function(){var e,n,r=[],i=function(t){return t.forEach?t.forEach(i):void r.push({name:e,value:t})};return this[0]&&t.each(this[0].elements,function(r,o){n=o.type,e=o.name,e&&"fieldset"!=o.nodeName.toLowerCase()&&!o.disabled&&"submit"!=n&&"reset"!=n&&"button"!=n&&"file"!=n&&("radio"!=n&&"checkbox"!=n||o.checked)&&i(t(o).val())}),r},t.fn.serialize=function(){var t=[];return this.serializeArray().forEach(function(e){t.push(encodeURIComponent(e.name)+"="+encodeURIComponent(e.value))}),t.join("&")},t.fn.submit=function(e){if(0 in arguments)this.bind("submit",e);else if(this.length){var n=t.Event("submit");this.eq(0).trigger(n),n.isDefaultPrevented()||this.get(0).submit()}return this}}(e),function(){try{getComputedStyle(void 0)}catch(e){var n=getComputedStyle;t.getComputedStyle=function(t,e){try{return n(t,e)}catch(r){return null}}}}(),e}),function(t,e){function n(t){return t.replace(/([A-Z])/g,"-$1").toLowerCase()}function r(t){return i?i+t:t.toLowerCase()}var i,o,a,s,u,c,l,f,h,p,d="",m={Webkit:"webkit",Moz:"",O:"o"},g=document.createElement("div"),v=/^((translate|rotate|scale)(X|Y|Z|3d)?|matrix(3d)?|perspective|skew(X|Y)?)$/i,y={};g.style.transform===e&&t.each(m,function(t,n){return g.style[t+"TransitionProperty"]!==e?(d="-"+t.toLowerCase()+"-",i=n,!1):e}),o=d+"transform",y[a=d+"transition-property"]=y[s=d+"transition-duration"]=y[c=d+"transition-delay"]=y[u=d+"transition-timing-function"]=y[l=d+"animation-name"]=y[f=d+"animation-duration"]=y[p=d+"animation-delay"]=y[h=d+"animation-timing-function"]="",t.fx={off:i===e&&g.style.transitionProperty===e,speeds:{_default:400,fast:200,slow:600},cssPrefix:d,transitionEnd:r("TransitionEnd"),animationEnd:r("AnimationEnd")},t.fn.animate=function(n,r,i,o,a){return t.isFunction(r)&&(o=r,i=e,r=e),t.isFunction(i)&&(o=i,i=e),t.isPlainObject(r)&&(i=r.easing,o=r.complete,a=r.delay,r=r.duration),r&&(r=("number"==typeof r?r:t.fx.speeds[r]||t.fx.speeds._default)/1e3),a&&(a=parseFloat(a)/1e3),this.anim(n,r,i,o,a)},t.fn.anim=function(r,i,d,m,g){var x,b,E,T={},j="",w=this,C=t.fx.transitionEnd,S=!1;if(i===e&&(i=t.fx.speeds._default/1e3),g===e&&(g=0),t.fx.off&&(i=0),"string"==typeof r)T[l]=r,T[f]=i+"s",T[p]=g+"s",T[h]=d||"linear",C=t.fx.animationEnd;else{b=[];for(x in r)v.test(x)?j+=x+"("+r[x]+") ":(T[x]=r[x],b.push(n(x)));j&&(T[o]=j,b.push(o)),i>0&&"object"==typeof r&&(T[a]=b.join(", "),T[s]=i+"s",T[c]=g+"s",T[u]=d||"linear")}return E=function(n){if(e!==n){if(n.target!==n.currentTarget)return;t(n.target).unbind(C,E)}else t(this).unbind(C,E);S=!0,t(this).css(y),m&&m.call(this)},i>0&&(this.bind(C,E),setTimeout(function(){S||E.call(w)},1e3*(i+g)+25)),this.size()&&this.get(0).clientLeft,this.css(T),i>0||setTimeout(function(){w.each(function(){E.call(this)})},0),this},g=null}(Zepto),function(t,e){function n(n,r,i,o,a){"function"!=typeof r||a||(a=r,r=e);var s={opacity:i};return o&&(s.scale=o,n.css(t.fx.cssPrefix+"transform-origin","0 0")),n.animate(s,r,null,a)}function r(e,r,i,o){return n(e,r,0,i,function(){a.call(t(this)),o&&o.call(this)})}var i=window.document,o=(i.documentElement,t.fn.show),a=t.fn.hide,s=t.fn.toggle;t.fn.show=function(t,r){return o.call(this),t===e?t=0:this.css("opacity",0),n(this,t,1,"",r)},t.fn.hide=function(t,n){return t===e?a.call(this):r(this,t,"0,0",n)},t.fn.toggle=function(n,r){return n===e||"boolean"==typeof n?s.call(this,n):this.each(function(){var e=t(this);e["none"==e.css("display")?"show":"hide"](n,r)})},t.fn.fadeTo=function(t,e,r){return n(this,t,e,null,r)},t.fn.fadeIn=function(t,e){var n=this.css("opacity");return n>0?this.css("opacity",0):n=1,o.call(this).fadeTo(t,n,e)},t.fn.fadeOut=function(t,e){return r(this,t,null,e)},t.fn.fadeToggle=function(e,n){return this.each(function(){var r=t(this);r[0==r.css("opacity")||"none"==r.css("display")?"fadeIn":"fadeOut"](e,n)})}}(Zepto);
+(function(d){var e={},g=d.fn.data,b=d.camelCase,c=d.expando="Zepto"+(+new Date()),i=[];function f(m,k){var n=m[c],j=n&&e[n];if(k===undefined){return j||h(m)}else{if(j){if(k in j){return j[k]}var l=b(k);if(l in j){return j[l]}}return g.call(d(m),k)}}function h(l,k,m){var n=l[c]||(l[c]=++d.uuid),j=e[n]||(e[n]=a(l));if(k!==undefined){j[b(k)]=m}return j}function a(k){var j={};d.each(k.attributes||i,function(m,l){if(l.name.indexOf("data-")==0){j[b(l.name.replace("data-",""))]=d.zepto.deserializeValue(l.value)}});return j}d.fn.data=function(j,k){return k===undefined?d.isPlainObject(j)?this.each(function(l,m){d.each(j,function(n,o){h(m,n,o)})}):(0 in this?f(this[0],j):undefined):this.each(function(){h(this,j,k)})};d.data=function(k,j,l){return d(k).data(j,l)};d.hasData=function(k){var l=k[c],j=l&&e[l];return j?!d.isEmptyObject(j):false};d.fn.removeData=function(j){if(typeof j=="string"){j=j.split(/\s+/)}return this.each(function(){var l=this[c],k=l&&e[l];if(k){d.each(j||k,function(m){delete k[j?b(this):m]})}})};["remove","empty"].forEach(function(j){var k=d.fn[j];d.fn[j]=function(){var l=this.find("*");if(j==="remove"){l=l.add(this)}l.removeData();return k.call(this)}})})(Zepto);
+/*selector*/
+!function(t){function n(n){return n=t(n),!(!n.width()&&!n.height())&&"none"!==n.css("display")}function e(t,n){t=t.replace(/=#\]/g,'="#"]');var e,r,i=s.exec(t);if(i&&i[2]in o&&(e=o[i[2]],r=i[3],t=i[1],r)){var u=Number(r);r=isNaN(u)?r.replace(/^["']|["']$/g,""):u}return n(t,e,r)}var r=t.zepto,i=r.qsa,u=r.matches,o=t.expr[":"]={visible:function(){return n(this)?this:void 0},hidden:function(){return n(this)?void 0:this},selected:function(){return this.selected?this:void 0},checked:function(){return this.checked?this:void 0},parent:function(){return this.parentNode},first:function(t){return 0===t?this:void 0},last:function(t,n){return t===n.length-1?this:void 0},eq:function(t,n,e){return t===e?this:void 0},contains:function(n,e,r){return t(this).text().indexOf(r)>-1?this:void 0},has:function(t,n,e){return r.qsa(this,e).length?this:void 0}},s=new RegExp("(.*):(\\w+)(?:\\(([^)]+)\\))?$\\s*"),c=/^\s*>/,a="Zepto"+ +new Date;r.qsa=function(n,u){return e(u,function(e,o,s){try{var h;!e&&o?e="*":c.test(e)&&(h=t(n).addClass(a),e="."+a+" "+e);var f=i(n,e)}catch(d){throw console.error("error performing selector: %o",u),d}finally{h&&h.removeClass(a)}return o?r.uniq(t.map(f,function(t,n){return o.call(t,n,f,s)})):f})},r.matches=function(t,n){return e(n,function(n,e,r){return!(n&&!u(t,n)||e&&e.call(t,null,r)!==t)})}}(Zepto);
+/*手势*/
+!function(t){function e(t){return"tagName"in t?t:t.parentNode}function n(t,e,n,i){var o=Math.abs(t-e),r=Math.abs(n-i);return o>=r?t-e>0?"Left":"Right":n-i>0?"Up":"Down"}function i(){d=null,u.last&&(u.el.trigger("longTap"),u={})}function o(){d&&clearTimeout(d),d=null}function r(){a&&clearTimeout(a),s&&clearTimeout(s),c&&clearTimeout(c),d&&clearTimeout(d),a=s=c=d=null,u={}}var a,s,c,d,u={},l=750;t(document).ready(function(){var f,h;t(document.body).bind("touchstart",function(n){f=Date.now(),h=f-(u.last||f),u.el=t(e(n.touches[0].target)),a&&clearTimeout(a),u.x1=n.touches[0].pageX,u.y1=n.touches[0].pageY,h>0&&250>=h&&(u.isDoubleTap=!0),u.last=f,d=setTimeout(i,l)}).bind("touchmove",function(t){o(),u.x2=t.touches[0].pageX,u.y2=t.touches[0].pageY,Math.abs(u.x1-u.x2)>10&&t.preventDefault()}).bind("touchend",function(){o(),u.x2&&Math.abs(u.x1-u.x2)>30||u.y2&&Math.abs(u.y1-u.y2)>30?c=setTimeout(function(){u.el.trigger("swipe"),u.el.trigger("swipe"+n(u.x1,u.x2,u.y1,u.y2)),u={}},0):"last"in u&&(s=setTimeout(function(){var e=t.Event("tap");e.cancelTouch=r,u.el.trigger(e),u.isDoubleTap?(u.el.trigger("doubleTap"),u={}):a=setTimeout(function(){a=null,u.el.trigger("singleTap"),u={}},250)},0))}).bind("touchcancel",r),t(window).bind("scroll",r)}),["swipe","swipeLeft","swipeRight","swipeUp","swipeDown","doubleTap","tap","singleTap","longTap"].forEach(function(e){t.fn[e]=function(t){return this.bind(e,t)}})}(Zepto);
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/js/zepto.weui.js b/pluss-wap-page/src/main/resources/static/resources/js/zepto.weui.js
new file mode 100644
index 0000000..5ba3fb3
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/js/zepto.weui.js
@@ -0,0 +1,3757 @@
+;(function($) {
+    "use strict";
+
+    $.fn.transitionEnd = function(callback) {
+        var events = ['webkitTransitionEnd', 'transitionend', 'oTransitionEnd', 'MSTransitionEnd', 'msTransitionEnd'],
+            i, dom = this;
+
+        function fireCallBack(e) {
+            /*jshint validthis:true */
+            if (e.target !== this) return;
+            callback.call(this, e);
+            for (i = 0; i < events.length; i++) {
+                dom.off(events[i], fireCallBack);
+            }
+        }
+        if (callback) {
+            for (i = 0; i < events.length; i++) {
+                dom.on(events[i], fireCallBack);
+            }
+        }
+        return this;
+    };
+
+    $.support = (function() {
+        var support = {
+            touch: !!(('ontouchstart' in window) || window.DocumentTouch && document instanceof window.DocumentTouch)
+        };
+        return support;
+    })();
+
+    $.touchEvents = {
+        start: $.support.touch ? 'touchstart' : 'mousedown',
+        move: $.support.touch ? 'touchmove' : 'mousemove',
+        end: $.support.touch ? 'touchend' : 'mouseup'
+    };
+
+    $.getTouchPosition = function(e) {
+        e = e.originalEvent || e; //jquery wrap the originevent
+        if(e.type === 'touchstart' || e.type === 'touchmove' || e.type === 'touchend') {
+            return {
+                x: e.targetTouches[0].pageX,
+                y: e.targetTouches[0].pageY
+            };
+        } else {
+            return {
+                x: e.pageX,
+                y: e.pageY
+            };
+        }
+    };
+
+    $.fn.scrollHeight = function() {
+        return this[0].scrollHeight;
+    };
+
+    $.fn.transform = function(transform) {
+        for (var i = 0; i < this.length; i++) {
+            var elStyle = this[i].style;
+            elStyle.webkitTransform = elStyle.MsTransform = elStyle.msTransform = elStyle.MozTransform = elStyle.OTransform = elStyle.transform = transform;
+        }
+        return this;
+    };
+    $.fn.transition = function(duration) {
+        if (typeof duration !== 'string') {
+            duration = duration + 'ms';
+        }
+        for (var i = 0; i < this.length; i++) {
+            var elStyle = this[i].style;
+            elStyle.webkitTransitionDuration = elStyle.MsTransitionDuration = elStyle.msTransitionDuration = elStyle.MozTransitionDuration = elStyle.OTransitionDuration = elStyle.transitionDuration = duration;
+        }
+        return this;
+    };
+
+    $.getTranslate = function (el, axis) {
+        var matrix, curTransform, curStyle, transformMatrix;
+
+        // automatic axis detection
+        if (typeof axis === 'undefined') {
+            axis = 'x';
+        }
+
+        curStyle = window.getComputedStyle(el, null);
+        if (window.WebKitCSSMatrix) {
+            // Some old versions of Webkit choke when 'none' is passed; pass
+            // empty string instead in this case
+            transformMatrix = new WebKitCSSMatrix(curStyle.webkitTransform === 'none' ? '' : curStyle.webkitTransform);
+        }
+        else {
+            transformMatrix = curStyle.MozTransform || curStyle.OTransform || curStyle.MsTransform || curStyle.msTransform  || curStyle.transform || curStyle.getPropertyValue('transform').replace('translate(', 'matrix(1, 0, 0, 1,');
+            matrix = transformMatrix.toString().split(',');
+        }
+
+        if (axis === 'x') {
+            //Latest Chrome and webkits Fix
+            if (window.WebKitCSSMatrix)
+                curTransform = transformMatrix.m41;
+            //Crazy IE10 Matrix
+            else if (matrix.length === 16)
+                curTransform = parseFloat(matrix[12]);
+            //Normal Browsers
+            else
+                curTransform = parseFloat(matrix[4]);
+        }
+        if (axis === 'y') {
+            //Latest Chrome and webkits Fix
+            if (window.WebKitCSSMatrix)
+                curTransform = transformMatrix.m42;
+            //Crazy IE10 Matrix
+            else if (matrix.length === 16)
+                curTransform = parseFloat(matrix[13]);
+            //Normal Browsers
+            else
+                curTransform = parseFloat(matrix[5]);
+        }
+
+        return curTransform || 0;
+    };
+    $.requestAnimationFrame = function (callback) {
+        if (window.requestAnimationFrame) return window.requestAnimationFrame(callback);
+        else if (window.webkitRequestAnimationFrame) return window.webkitRequestAnimationFrame(callback);
+        else if (window.mozRequestAnimationFrame) return window.mozRequestAnimationFrame(callback);
+        else {
+            return window.setTimeout(callback, 1000 / 60);
+        }
+    };
+
+    $.cancelAnimationFrame = function (id) {
+        if (window.cancelAnimationFrame) return window.cancelAnimationFrame(id);
+        else if (window.webkitCancelAnimationFrame) return window.webkitCancelAnimationFrame(id);
+        else if (window.mozCancelAnimationFrame) return window.mozCancelAnimationFrame(id);
+        else {
+            return window.clearTimeout(id);
+        }
+    };
+
+    $.fn.join = function(arg) {
+        return this.toArray().join(arg);
+    }
+})($);
+
+/*===========================
+  Template7 Template engine
+  ===========================*/
+/* global $:true */
+/* jshint unused:false */
+/* jshint forin:false */
++function ($) {
+    "use strict";
+    $.Template7 = $.t7 = (function () {
+        function isArray(arr) {
+            return Object.prototype.toString.apply(arr) === '[object Array]';
+        }
+        function isObject(obj) {
+            return obj instanceof Object;
+        }
+        function isFunction(func) {
+            return typeof func === 'function';
+        }
+        var cache = {};
+        function helperToSlices(string) {
+            var helperParts = string.replace(/[{}#}]/g, '').split(' ');
+            var slices = [];
+            var shiftIndex, i, j;
+            for (i = 0; i < helperParts.length; i++) {
+                var part = helperParts[i];
+                if (i === 0) slices.push(part);
+                else {
+                    if (part.indexOf('"') === 0) {
+                        // Plain String
+                        if (part.match(/"/g).length === 2) {
+                            // One word string
+                            slices.push(part);
+                        }
+                        else {
+                            // Find closed Index
+                            shiftIndex = 0;
+                            for (j = i + 1; j < helperParts.length; j++) {
+                                part += ' ' + helperParts[j];
+                                if (helperParts[j].indexOf('"') >= 0) {
+                                    shiftIndex = j;
+                                    slices.push(part);
+                                    break;
+                                }
+                            }
+                            if (shiftIndex) i = shiftIndex;
+                        }
+                    }
+                    else {
+                        if (part.indexOf('=') > 0) {
+                            // Hash
+                            var hashParts = part.split('=');
+                            var hashName = hashParts[0];
+                            var hashContent = hashParts[1];
+                            if (hashContent.match(/"/g).length !== 2) {
+                                shiftIndex = 0;
+                                for (j = i + 1; j < helperParts.length; j++) {
+                                    hashContent += ' ' + helperParts[j];
+                                    if (helperParts[j].indexOf('"') >= 0) {
+                                        shiftIndex = j;
+                                        break;
+                                    }
+                                }
+                                if (shiftIndex) i = shiftIndex;
+                            }
+                            var hash = [hashName, hashContent.replace(/"/g,'')];
+                            slices.push(hash);
+                        }
+                        else {
+                            // Plain variable
+                            slices.push(part);
+                        }
+                    }
+                }
+            }
+            return slices;
+        }
+        function stringToBlocks(string) {
+            var blocks = [], i, j, k;
+            if (!string) return [];
+            var _blocks = string.split(/({{[^{^}]*}})/);
+            for (i = 0; i < _blocks.length; i++) {
+                var block = _blocks[i];
+                if (block === '') continue;
+                if (block.indexOf('{{') < 0) {
+                    blocks.push({
+                        type: 'plain',
+                        content: block
+                    });
+                }
+                else {
+                    if (block.indexOf('{/') >= 0) {
+                        continue;
+                    }
+                    if (block.indexOf('{#') < 0 && block.indexOf(' ') < 0 && block.indexOf('else') < 0) {
+                        // Simple variable
+                        blocks.push({
+                            type: 'variable',
+                            contextName: block.replace(/[{}]/g, '')
+                        });
+                        continue;
+                    }
+                    // Helpers
+                    var helperSlices = helperToSlices(block);
+                    var helperName = helperSlices[0];
+                    var helperContext = [];
+                    var helperHash = {};
+                    for (j = 1; j < helperSlices.length; j++) {
+                        var slice = helperSlices[j];
+                        if (isArray(slice)) {
+                            // Hash
+                            helperHash[slice[0]] = slice[1] === 'false' ? false : slice[1];
+                        }
+                        else {
+                            helperContext.push(slice);
+                        }
+                    }
+
+                    if (block.indexOf('{#') >= 0) {
+                        // Condition/Helper
+                        var helperStartIndex = i;
+                        var helperContent = '';
+                        var elseContent = '';
+                        var toSkip = 0;
+                        var shiftIndex;
+                        var foundClosed = false, foundElse = false, foundClosedElse = false, depth = 0;
+                        for (j = i + 1; j < _blocks.length; j++) {
+                            if (_blocks[j].indexOf('{{#') >= 0) {
+                                depth ++;
+                            }
+                            if (_blocks[j].indexOf('{{/') >= 0) {
+                                depth --;
+                            }
+                            if (_blocks[j].indexOf('{{#' + helperName) >= 0) {
+                                helperContent += _blocks[j];
+                                if (foundElse) elseContent += _blocks[j];
+                                toSkip ++;
+                            }
+                            else if (_blocks[j].indexOf('{{/' + helperName) >= 0) {
+                                if (toSkip > 0) {
+                                    toSkip--;
+                                    helperContent += _blocks[j];
+                                    if (foundElse) elseContent += _blocks[j];
+                                }
+                                else {
+                                    shiftIndex = j;
+                                    foundClosed = true;
+                                    break;
+                                }
+                            }
+                            else if (_blocks[j].indexOf('else') >= 0 && depth === 0) {
+                                foundElse = true;
+                            }
+                            else {
+                                if (!foundElse) helperContent += _blocks[j];
+                                if (foundElse) elseContent += _blocks[j];
+                            }
+
+                        }
+                        if (foundClosed) {
+                            if (shiftIndex) i = shiftIndex;
+                            blocks.push({
+                                type: 'helper',
+                                helperName: helperName,
+                                contextName: helperContext,
+                                content: helperContent,
+                                inverseContent: elseContent,
+                                hash: helperHash
+                            });
+                        }
+                    }
+                    else if (block.indexOf(' ') > 0) {
+                        blocks.push({
+                            type: 'helper',
+                            helperName: helperName,
+                            contextName: helperContext,
+                            hash: helperHash
+                        });
+                    }
+                }
+            }
+            return blocks;
+        }
+        var Template7 = function (template) {
+            var t = this;
+            t.template = template;
+
+            function getCompileFn(block, depth) {
+                if (block.content) return compile(block.content, depth);
+                else return function () {return ''; };
+            }
+            function getCompileInverse(block, depth) {
+                if (block.inverseContent) return compile(block.inverseContent, depth);
+                else return function () {return ''; };
+            }
+            function getCompileVar(name, ctx) {
+                var variable, parts, levelsUp = 0, initialCtx = ctx;
+                if (name.indexOf('../') === 0) {
+                    levelsUp = name.split('../').length - 1;
+                    var newDepth = ctx.split('_')[1] - levelsUp;
+                    ctx = 'ctx_' + (newDepth >= 1 ? newDepth : 1);
+                    parts = name.split('../')[levelsUp].split('.');
+                }
+                else if (name.indexOf('@global') === 0) {
+                    ctx = '$.Template7.global';
+                    parts = name.split('@global.')[1].split('.');
+                }
+                else if (name.indexOf('@root') === 0) {
+                    ctx = 'ctx_1';
+                    parts = name.split('@root.')[1].split('.');
+                }
+                else {
+                    parts = name.split('.');
+                }
+                variable = ctx;
+                for (var i = 0; i < parts.length; i++) {
+                    var part = parts[i];
+                    if (part.indexOf('@') === 0) {
+                        if (i > 0) {
+                            variable += '[(data && data.' + part.replace('@', '') + ')]';
+                        }
+                        else {
+                            variable = '(data && data.' + name.replace('@', '') + ')';
+                        }
+                    }
+                    else {
+                        if (isFinite(part)) {
+                            variable += '[' + part + ']';
+                        }
+                        else {
+                            if (part.indexOf('this') === 0) {
+                                variable = part.replace('this', ctx);
+                            }
+                            else {
+                                variable += '.' + part;
+                            }
+                        }
+                    }
+                }
+
+                return variable;
+            }
+            function getCompiledArguments(contextArray, ctx) {
+                var arr = [];
+                for (var i = 0; i < contextArray.length; i++) {
+                    if (contextArray[i].indexOf('"') === 0) arr.push(contextArray[i]);
+                    else {
+                        arr.push(getCompileVar(contextArray[i], ctx));
+                    }
+                }
+                return arr.join(', ');
+            }
+            function compile(template, depth) {
+                depth = depth || 1;
+                template = template || t.template;
+                if (typeof template !== 'string') {
+                    throw new Error('Template7: Template must be a string');
+                }
+                var blocks = stringToBlocks(template);
+                if (blocks.length === 0) {
+                    return function () { return ''; };
+                }
+                var ctx = 'ctx_' + depth;
+                var resultString = '(function (' + ctx + ', data) {\n';
+                if (depth === 1) {
+                    resultString += 'function isArray(arr){return Object.prototype.toString.apply(arr) === \'[object Array]\';}\n';
+                    resultString += 'function isFunction(func){return (typeof func === \'function\');}\n';
+                    resultString += 'function c(val, ctx) {if (typeof val !== "undefined") {if (isFunction(val)) {return val.call(ctx);} else return val;} else return "";}\n';
+                }
+                resultString += 'var r = \'\';\n';
+                var i, j, context;
+                for (i = 0; i < blocks.length; i++) {
+                    var block = blocks[i];
+                    // Plain block
+                    if (block.type === 'plain') {
+                        resultString += 'r +=\'' + (block.content).replace(/\r/g, '\\r').replace(/\n/g, '\\n').replace(/'/g, '\\' + '\'') + '\';';
+                        continue;
+                    }
+                    var variable, compiledArguments;
+                    // Variable block
+                    if (block.type === 'variable') {
+                        variable = getCompileVar(block.contextName, ctx);
+                        resultString += 'r += c(' + variable + ', ' + ctx + ');';
+                    }
+                    // Helpers block
+                    if (block.type === 'helper') {
+                        if (block.helperName in t.helpers) {
+                            compiledArguments = getCompiledArguments(block.contextName, ctx);
+                            resultString += 'r += ($.Template7.helpers.' + block.helperName + ').call(' + ctx + ', ' + (compiledArguments && (compiledArguments + ', ')) +'{hash:' + JSON.stringify(block.hash) + ', data: data || {}, fn: ' + getCompileFn(block, depth+1) + ', inverse: ' + getCompileInverse(block, depth+1) + ', root: ctx_1});';
+                        }
+                        else {
+                            if (block.contextName.length > 0) {
+                                throw new Error('Template7: Missing helper: "' + block.helperName + '"');
+                            }
+                            else {
+                                variable = getCompileVar(block.helperName, ctx);
+                                resultString += 'if (' + variable + ') {';
+                                resultString += 'if (isArray(' + variable + ')) {';
+                                resultString += 'r += ($.Template7.helpers.each).call(' + ctx + ', ' + variable + ', {hash:' + JSON.stringify(block.hash) + ', data: data || {}, fn: ' + getCompileFn(block, depth+1) + ', inverse: ' + getCompileInverse(block, depth+1) + ', root: ctx_1});';
+                                resultString += '}else {';
+                                resultString += 'r += ($.Template7.helpers.with).call(' + ctx + ', ' + variable + ', {hash:' + JSON.stringify(block.hash) + ', data: data || {}, fn: ' + getCompileFn(block, depth+1) + ', inverse: ' + getCompileInverse(block, depth+1) + ', root: ctx_1});';
+                                resultString += '}}';
+                            }
+                        }
+                    }
+                }
+                resultString += '\nreturn r;})';
+                return eval.call(window, resultString);
+            }
+            t.compile = function (template) {
+                if (!t.compiled) {
+                    t.compiled = compile(template);
+                }
+                return t.compiled;
+            };
+        };
+        Template7.prototype = {
+            options: {},
+            helpers: {
+                'if': function (context, options) {
+                    if (isFunction(context)) { context = context.call(this); }
+                    if (context) {
+                        return options.fn(this, options.data);
+                    }
+                    else {
+                        return options.inverse(this, options.data);
+                    }
+                },
+                'unless': function (context, options) {
+                    if (isFunction(context)) { context = context.call(this); }
+                    if (!context) {
+                        return options.fn(this, options.data);
+                    }
+                    else {
+                        return options.inverse(this, options.data);
+                    }
+                },
+                'each': function (context, options) {
+                    var ret = '', i = 0;
+                    if (isFunction(context)) { context = context.call(this); }
+                    if (isArray(context)) {
+                        if (options.hash.reverse) {
+                            context = context.reverse();
+                        }
+                        for (i = 0; i < context.length; i++) {
+                            ret += options.fn(context[i], {first: i === 0, last: i === context.length - 1, index: i});
+                        }
+                        if (options.hash.reverse) {
+                            context = context.reverse();
+                        }
+                    }
+                    else {
+                        for (var key in context) {
+                            i++;
+                            ret += options.fn(context[key], {key: key});
+                        }
+                    }
+                    if (i > 0) return ret;
+                    else return options.inverse(this);
+                },
+                'with': function (context, options) {
+                    if (isFunction(context)) { context = context.call(this); }
+                    return options.fn(context);
+                },
+                'join': function (context, options) {
+                    if (isFunction(context)) { context = context.call(this); }
+                    return context.join(options.hash.delimiter || options.hash.delimeter);
+                },
+                'js': function (expression, options) {
+                    var func;
+                    if (expression.indexOf('return')>=0) {
+                        func = '(function(){'+expression+'})';
+                    }
+                    else {
+                        func = '(function(){return ('+expression+')})';
+                    }
+                    return eval.call(this, func).call(this);
+                },
+                'js_compare': function (expression, options) {
+                    var func;
+                    if (expression.indexOf('return')>=0) {
+                        func = '(function(){'+expression+'})';
+                    }
+                    else {
+                        func = '(function(){return ('+expression+')})';
+                    }
+                    var condition = eval.call(this, func).call(this);
+                    if (condition) {
+                        return options.fn(this, options.data);
+                    }
+                    else {
+                        return options.inverse(this, options.data);
+                    }
+                }
+            }
+        };
+        var t7 = function (template, data) {
+            if (arguments.length === 2) {
+                var instance = new Template7(template);
+                var rendered = instance.compile()(data);
+                instance = null;
+                return (rendered);
+            }
+            else return new Template7(template);
+        };
+        t7.registerHelper = function (name, fn) {
+            Template7.prototype.helpers[name] = fn;
+        };
+        t7.unregisterHelper = function (name) {
+            Template7.prototype.helpers[name] = undefined;
+            delete Template7.prototype.helpers[name];
+        };
+
+        t7.compile = function (template, options) {
+            var instance = new Template7(template, options);
+            return instance.compile();
+        };
+
+        t7.options = Template7.prototype.options;
+        t7.helpers = Template7.prototype.helpers;
+        return t7;
+    })();
+}($);
+
++ function($) {
+    "use strict";
+
+    var defaults;
+
+    $.modal = function(params, onOpen) {
+        params = $.extend({}, defaults, params);
+
+
+        var buttons = params.buttons;
+
+        var buttonsHtml = buttons.map(function(d, i) {
+            return '<a href="javascript:;" class="weui-dialog__btn ' + (d.className || "") + '">' + d.text + '</a>';
+        }).join("");
+
+        var tpl = '<div class="weui-dialog">' +
+            '<div class="weui-dialog__hd"><strong class="weui-dialog__title">' + params.title + '</strong></div>' +
+            ( params.text ? '<div class="weui-dialog__bd">'+params.text+'</div>' : '')+
+            '<div class="weui-dialog__ft">' + buttonsHtml + '</div>' +
+            '</div>';
+
+        var dialog = $.openModal(tpl, onOpen);
+
+        dialog.find(".weui-dialog__btn").each(function(i, e) {
+            var el = $(e);
+            el.click(function() {
+                //先关闭对话框，再调用回调函数
+                if(params.autoClose) $.closeModal();
+
+                if(buttons[i].onClick) {
+                    buttons[i].onClick.call(dialog);
+                }
+            });
+        });
+
+        return dialog;
+    };
+
+    $.openModal = function(tpl, onOpen) {
+        var mask = $("<div class='weui-mask'></div>").appendTo(document.body);
+        mask.show();
+
+        var dialog = $(tpl).appendTo(document.body);
+
+        if (onOpen) {
+            dialog.transitionEnd(function () {
+                onOpen.call(dialog);
+            });
+        }
+
+        dialog.show();
+        mask.addClass("weui-mask--visible");
+        dialog.addClass("weui-dialog--visible");
+
+
+        return dialog;
+    }
+
+    $.closeModal = function() {
+        $(".weui-mask--visible").removeClass("weui-mask--visible").transitionEnd(function() {
+            $(this).remove();
+        });
+        $(".weui-dialog--visible").removeClass("weui-dialog--visible").transitionEnd(function() {
+            $(this).remove();
+        });
+    };
+
+    $.alert = function(text, title, onOK) {
+        var config;
+        if (typeof text === 'object') {
+            config = text;
+        } else {
+            if (typeof title === 'function') {
+                onOK = arguments[1];
+                title = undefined;
+            }
+
+            config = {
+                text: text,
+                title: title,
+                onOK: onOK
+            }
+        }
+        return $.modal({
+            text: config.text,
+            title: config.title,
+            buttons: [{
+                text: defaults.buttonOK,
+                className: "primary",
+                onClick: config.onOK
+            }]
+        });
+    }
+
+    $.confirm = function(text, title, onOK, onCancel) {
+        var config;
+        if (typeof text === 'object') {
+            config = text
+        } else {
+            if (typeof title === 'function') {
+                onCancel = arguments[2];
+                onOK = arguments[1];
+                title = undefined;
+            }
+
+            config = {
+                text: text,
+                title: title,
+                onOK: onOK,
+                onCancel: onCancel
+            }
+        }
+        return $.modal({
+            text: config.text,
+            title: config.title,
+            buttons: [
+                {
+                    text: defaults.buttonCancel,
+                    className: "default",
+                    onClick: config.onCancel
+                },
+                {
+                    text: defaults.buttonOK,
+                    className: "primary",
+                    onClick: config.onOK
+                }]
+        });
+    };
+
+    //如果参数过多，建议通过 config 对象进行配置，而不是传入多个参数。
+    $.prompt = function(text, title, onOK, onCancel, input) {
+        var config;
+        if (typeof text === 'object') {
+            config = text;
+        } else {
+            if (typeof title === 'function') {
+                input = arguments[3];
+                onCancel = arguments[2];
+                onOK = arguments[1];
+                title = undefined;
+            }
+            config = {
+                text: text,
+                title: title,
+                input: input,
+                onOK: onOK,
+                onCancel: onCancel,
+                empty: false  //allow empty
+            }
+        }
+
+        var modal = $.modal({
+            text: '<p class="weui-prompt-text">'+(config.text || '')+'</p><input type="text" class="weui-input weui-prompt-input" id="weui-prompt-input" value="' + (config.input || '') + '" />',
+            title: config.title,
+            autoClose: false,
+            buttons: [
+                {
+                    text: defaults.buttonCancel,
+                    className: "default",
+                    onClick: function () {
+                        $.closeModal();
+                        config.onCancel && config.onCancel.call(modal);
+                    }
+                },
+                {
+                    text: defaults.buttonOK,
+                    className: "primary",
+                    onClick: function() {
+                        var input = $("#weui-prompt-input").val();
+                        if (!config.empty && (input === "" || input === null)) {
+                            modal.find('.weui-prompt-input').focus()[0].select();
+                            return false;
+                        }
+                        $.closeModal();
+                        config.onOK && config.onOK.call(modal, input);
+                    }
+                }]
+        }, function () {
+            this.find('.weui-prompt-input').focus()[0].select();
+        });
+
+        return modal;
+    };
+
+    //如果参数过多，建议通过 config 对象进行配置，而不是传入多个参数。
+    $.login = function(text, title, onOK, onCancel, username, password) {
+        var config;
+        if (typeof text === 'object') {
+            config = text;
+        } else {
+            if (typeof title === 'function') {
+                password = arguments[4];
+                username = arguments[3];
+                onCancel = arguments[2];
+                onOK = arguments[1];
+                title = undefined;
+            }
+            config = {
+                text: text,
+                title: title,
+                username: username,
+                password: password,
+                onOK: onOK,
+                onCancel: onCancel
+            }
+        }
+
+        var modal = $.modal({
+            text: '<p class="weui-prompt-text">'+(config.text || '')+'</p>' +
+            '<input type="text" class="weui-input weui-prompt-input" id="weui-prompt-username" value="' + (config.username || '') + '" placeholder="输入用户名" />' +
+            '<input type="password" class="weui-input weui-prompt-input" id="weui-prompt-password" value="' + (config.password || '') + '" placeholder="输入密码" />',
+            title: config.title,
+            autoClose: false,
+            buttons: [
+                {
+                    text: defaults.buttonCancel,
+                    className: "default",
+                    onClick: function () {
+                        $.closeModal();
+                        config.onCancel && config.onCancel.call(modal);
+                    }
+                }, {
+                    text: defaults.buttonOK,
+                    className: "primary",
+                    onClick: function() {
+                        var username = $("#weui-prompt-username").val();
+                        var password = $("#weui-prompt-password").val();
+                        if (!config.empty && (username === "" || username === null)) {
+                            modal.find('#weui-prompt-username').focus()[0].select();
+                            return false;
+                        }
+                        if (!config.empty && (password === "" || password === null)) {
+                            modal.find('#weui-prompt-password').focus()[0].select();
+                            return false;
+                        }
+                        $.closeModal();
+                        config.onOK && config.onOK.call(modal, username, password);
+                    }
+                }]
+        }, function () {
+            this.find('#weui-prompt-username').focus()[0].select();
+        });
+
+        return modal;
+    };
+
+    defaults = $.modal.prototype.defaults = {
+        title: "提示",
+        text: undefined,
+        buttonOK: "确定",
+        buttonCancel: "取消",
+        buttons: [{
+            text: "确定",
+            className: "primary"
+        }],
+        autoClose: true //点击按钮自动关闭对话框，如果你不希望点击按钮就关闭对话框，可以把这个设置为false
+    };
+
+}($);
+
++ function($) {
+    "use strict";
+
+    var defaults;
+
+    var show = function(html, className) {
+        className = className || "";
+        var mask = $("<div class='weui-mask_transparent'></div>").appendTo(document.body);
+
+        var tpl = '<div class="weui-toast ' + className + '">' + html + '</div>';
+        var dialog = $(tpl).appendTo(document.body);
+
+        dialog.addClass("weui-toast--visible");
+        dialog.show();
+    };
+
+    var hide = function(callback) {
+        $(".weui-mask_transparent").remove();
+        $(".weui-toast--visible").removeClass("weui-toast--visible").transitionEnd(function() {
+            var $this = $(this);
+            $this.remove();
+            callback && callback($this);
+        });
+    }
+
+    $.toast = function(text, style, callback) {
+        if(typeof style === "function") {
+            callback = style;
+        }
+        var className, iconClassName = 'weui-icon-success-no-circle';
+        var duration = toastDefaults.duration;
+        if(style == "cancel") {
+            className = "weui-toast_cancel";
+            iconClassName = 'weui-icon-cancel'
+        } else if(style == "forbidden") {
+            className = "weui-toast--forbidden";
+            iconClassName = 'weui-icon-warn'
+        } else if(style == "text") {
+            className = "weui-toast--text";
+        } else if(typeof style === typeof 1) {
+            duration = style
+        }
+        show('<i class="' + iconClassName + ' weui-icon_toast"></i><p class="weui-toast_content">' + (text || "已经完成") + '</p>', className);
+
+        setTimeout(function() {
+            hide(callback);
+        }, duration);
+    }
+
+    $.showLoading = function(text) {
+        var html = '<div class="weui_loading">';
+        html += '<i class="weui-loading weui-icon_toast"></i>';
+        html += '</div>';
+        html += '<p class="weui-toast_content">' + (text || "数据加载中") + '</p>';
+        show(html, 'weui_loading_toast');
+    }
+
+    $.hideLoading = function() {
+        hide();
+    }
+
+    var toastDefaults = $.toast.prototype.defaults = {
+        duration: 2500
+    }
+
+}($);
+
++ function($) {
+    "use strict";
+
+    var defaults;
+
+    var show = function(params) {
+
+        var mask = $("<div class='weui-mask weui-actions_mask'></div>").appendTo(document.body);
+
+        var actions = params.actions || [];
+
+        var actionsHtml = actions.map(function(d, i) {
+            return '<div class="weui-actionsheet__cell ' + (d.className || "") + '">' + d.text + '</div>';
+        }).join("");
+
+        var titleHtml = "";
+
+        if (params.title) {
+            titleHtml = '<div class="weui-actionsheet__title"><p class="weui-actionsheet__title-text">' + params.title + '</p></div>';
+        }
+
+        var tpl = '<div class="weui-actionsheet " id="weui-actionsheet">'+
+            titleHtml +
+            '<div class="weui-actionsheet__menu">'+
+            actionsHtml +
+            '</div>'+
+            '<div class="weui-actionsheet__action">'+
+            '<div class="weui-actionsheet__cell weui-actionsheet_cancel">取消</div>'+
+            '</div>'+
+            '</div>';
+        var dialog = $(tpl).appendTo(document.body);
+
+        dialog.find(".weui-actionsheet__menu .weui-actionsheet__cell, .weui-actionsheet__action .weui-actionsheet__cell").each(function(i, e) {
+            $(e).click(function() {
+                $.closeActions();
+                params.onClose && params.onClose();
+                if(actions[i] && actions[i].onClick) {
+                    actions[i].onClick();
+                }
+            })
+        });
+
+        mask.show();
+        dialog.show();
+        mask.addClass("weui-mask--visible");
+        dialog.addClass("weui-actionsheet_toggle");
+    };
+
+    var hide = function() {
+        $(".weui-mask").removeClass("weui-mask--visible").transitionEnd(function() {
+            $(this).remove();
+        });
+        $(".weui-actionsheet").removeClass("weui-actionsheet_toggle").transitionEnd(function() {
+            $(this).remove();
+        });
+    }
+
+    $.actions = function(params) {
+        params = $.extend({}, defaults, params);
+        show(params);
+    }
+
+    $.closeActions = function() {
+        hide();
+    }
+
+    $(document).on("click tap", ".weui-actions_mask", function() {
+        $.closeActions();
+    });
+
+    var defaults = $.actions.prototype.defaults = {
+        title: undefined,
+        onClose: undefined,
+        /*actions: [{
+      text: "菜单",
+      className: "color-danger",
+      onClick: function() {
+        console.log(1);
+      }
+    },{
+      text: "菜单2",
+      className: "color-success",
+      onClick: function() {
+        console.log(2);
+      }
+    }]*/
+    }
+
+}($);
+
+/* ===============================================================================
+************   Pull to refreh ************
+=============================================================================== */
+/* global $:true */
+
++function ($) {
+    "use strict";
+
+    var PTR = function(el, opt) {
+        if (typeof opt === typeof function () {}) {
+            opt = {
+                onRefresh: opt
+            }
+        }
+        if (typeof opt === typeof 'a') {
+            opt = undefined
+        }
+        this.opt = $.extend(PTR.defaults, opt || {});
+        this.container = $(el);
+        this.attachEvents();
+    }
+
+    PTR.defaults = {
+        distance: 50,
+        onRefresh: undefined,
+        onPull: undefined
+    }
+
+    PTR.prototype.touchStart = function(e) {
+        if(this.container.hasClass("refreshing")) return;
+        var p = $.getTouchPosition(e);
+        this.start = p;
+        this.diffX = this.diffY = 0;
+    };
+
+    PTR.prototype.touchMove= function(e) {
+        if(this.container.hasClass("refreshing")) return;
+        if(!this.start) return false;
+        if(this.container.scrollTop() > 0) return;
+        var p = $.getTouchPosition(e);
+        this.diffX = p.x - this.start.x;
+        this.diffY = p.y - this.start.y;
+        if (Math.abs(this.diffX) > Math.abs(this.diffY)) return true; // 说明是左右方向的拖动
+        if(this.diffY < 0) return;
+        this.container.addClass("touching");
+        e.preventDefault();
+        e.stopPropagation();
+        this.diffY = Math.pow(this.diffY, 0.75);
+        this.container.css("transform", "translate3d(0, "+this.diffY+"px, 0)");
+        this.triggerPull(this.diffY)
+    };
+    PTR.prototype.touchEnd = function() {
+        this.start = false;
+        if(this.diffY <= 0 || this.container.hasClass("refreshing")) return;
+        this.container.removeClass("touching");
+        this.container.removeClass("pull-down pull-up");
+        this.container.css("transform", "");
+        if(Math.abs(this.diffY) <= this.opt.distance) {
+        } else {
+            this.triggerPullToRefresh();
+        }
+    };
+
+    PTR.prototype.triggerPullToRefresh = function() {
+        this.triggerPull(this.opt.distance)
+        this.container.removeClass('pull-up').addClass("refreshing");
+        if (this.opt.onRefresh) {
+            this.opt.onRefresh.call(this)
+        }
+        this.container.trigger("pull-to-refresh");
+    }
+
+    PTR.prototype.triggerPull = function(diffY) {
+
+        if(diffY < this.opt.distance) {
+            this.container.removeClass("pull-up").addClass("pull-down");
+        } else {
+            this.container.removeClass("pull-down").addClass("pull-up");
+        }
+
+        if (this.opt.onPull) {
+            this.opt.onPull.call(this, Math.floor(diffY / this.opt.distance * 100))
+        }
+        this.container.trigger("pull");
+    }
+
+    PTR.prototype.pullToRefreshDone = function() {
+        this.container.removeClass("refreshing");
+    }
+
+    PTR.prototype.attachEvents = function() {
+        var el = this.container;
+        el.addClass("weui-pull-to-refresh");
+        el.on($.touchEvents.start, $.proxy(this.touchStart, this));
+        el.on($.touchEvents.move, $.proxy(this.touchMove, this));
+        el.on($.touchEvents.end, $.proxy(this.touchEnd, this));
+    };
+
+    var pullToRefreshDone = function(el) {
+        $(el).removeClass("refreshing");
+    }
+
+    $.fn.pullToRefresh = function(opt) {
+        return this.each(function() {
+            var $this = $(this)
+            var ptr = $this.data('ptr')
+            if (!ptr) $this.data('ptr', ptr = new PTR(this, opt))
+            if (typeof opt === typeof 'a') {
+                ptr[opt].call(ptr)
+            }
+        });
+    }
+
+    $.fn.pullToRefreshDone = function() {
+        return this.each(function() {
+            pullToRefreshDone(this);
+        });
+    }
+
+}($);
+
+/* ===============================================================================
+************   Infinite ************
+=============================================================================== */
+/* global $:true */
++function ($) {
+    "use strict";
+
+    // fix https://github.com/lihongxun945/jquery-weui/issues/442
+    // chrome will always return 0, when use document.body.scrollTop
+    // https://stackoverflow.com/questions/43717316/google-chrome-document-body-scrolltop-always-returns-0
+    var getOffset = function (container) {
+        var tagName = container[0].tagName.toUpperCase()
+        var scrollTop
+        if (tagName === 'BODY' || tagName === 'HTML') {
+            scrollTop = container.scrollTop() || $(window).scrollTop()
+        } else {
+            scrollTop = container.scrollTop()
+        }
+        var offset = container.scrollHeight() - ($(window).height() + scrollTop)
+        console.log(offset)
+        return offset
+    }
+
+    var Infinite = function(el, distance) {
+        this.container = $(el);
+        this.container.data("infinite", this);
+        this.distance = distance || 50;
+        this.attachEvents();
+    }
+
+    Infinite.prototype.scroll = function() {
+        var container = this.container;
+        this._check();
+    }
+
+    Infinite.prototype.attachEvents = function(off) {
+        var el = this.container;
+        var scrollContainer = (el[0].tagName.toUpperCase() === "BODY" ? $(document) : el);
+        scrollContainer[off ? "off" : "on"]("scroll", $.proxy(this.scroll, this));
+    };
+    Infinite.prototype.detachEvents = function(off) {
+        this.attachEvents(true);
+    }
+    Infinite.prototype._check = function() {
+        var offset = getOffset(this.container);
+        if(Math.abs(offset) <= this.distance) {
+            this.container.trigger("infinite");
+        }
+    }
+
+    var infinite = function(el) {
+        attachEvents(el);
+    }
+
+    $.fn.infinite = function(distance) {
+        return this.each(function() {
+            new Infinite(this, distance);
+        });
+    }
+    $.fn.destroyInfinite = function() {
+        return this.each(function() {
+            var infinite = $(this).data("infinite");
+            if(infinite && infinite.detachEvents) infinite.detachEvents();
+        });
+    }
+
+}($);
+
+/* global $:true */
++function ($) {
+    "use strict";
+
+    var ITEM_ON = "weui-bar__item--on";
+
+    var showTab = function(a) {
+        var $a = $(a);
+        if($a.hasClass(ITEM_ON)) return;
+        var href = $a.attr("href");
+
+        if(!/^#/.test(href)) return ;
+
+        $a.parent().find("."+ITEM_ON).removeClass(ITEM_ON);
+        $a.addClass(ITEM_ON);
+
+        var bd = $a.parents(".weui-tab").find(".weui-tab__bd");
+
+        bd.find(".weui-tab__bd-item--active").removeClass("weui-tab__bd-item--active");
+
+        $(href).addClass("weui-tab__bd-item--active");
+    }
+
+    $.showTab = showTab;
+
+    $(document).on("click tap", ".weui-navbar__item, .weui-tabbar__item", function(e) {
+        var $a = $(e.currentTarget);
+        var href = $a.attr("href");
+        if($a.hasClass(ITEM_ON)) return;
+        if(!/^#/.test(href)) return;
+
+        e.preventDefault();
+
+        showTab($a);
+    });
+
+}($);
+
+/* global $:true */
++ function($) {
+    "use strict";
+
+    $(document).on("click touchstart", ".weui-search-bar__label", function(e) {
+        $(e.target).parents(".weui-search-bar").addClass("weui-search-bar_focusing").find('input').focus();
+    })
+
+        .on("click", ".weui-search-bar__cancel-btn", function(e) {
+            var $input = $(e.target).parents(".weui-search-bar").removeClass("weui-search-bar_focusing").find(".weui-search-bar__input").val("").blur();
+        })
+        .on("click", ".weui-icon-clear", function(e) {
+            var $input = $(e.target).parents(".weui-search-bar").find(".weui-search-bar__input").val("").focus();
+        });
+
+}($);
+
+/*===========================
+Device/OS Detection
+===========================*/
+/* global $:true */
+;(function ($) {
+    "use strict";
+    var device = {};
+    var ua = navigator.userAgent;
+
+    var android = ua.match(/(Android);?[\s\/]+([\d.]+)?/);
+    var ipad = ua.match(/(iPad).*OS\s([\d_]+)/);
+    var ipod = ua.match(/(iPod)(.*OS\s([\d_]+))?/);
+    var iphone = !ipad && ua.match(/(iPhone\sOS)\s([\d_]+)/);
+
+    device.ios = device.android = device.iphone = device.ipad = device.androidChrome = false;
+
+    // Android
+    if (android) {
+        device.os = 'android';
+        device.osVersion = android[2];
+        device.android = true;
+        device.androidChrome = ua.toLowerCase().indexOf('chrome') >= 0;
+    }
+    if (ipad || iphone || ipod) {
+        device.os = 'ios';
+        device.ios = true;
+    }
+    // iOS
+    if (iphone && !ipod) {
+        device.osVersion = iphone[2].replace(/_/g, '.');
+        device.iphone = true;
+    }
+    if (ipad) {
+        device.osVersion = ipad[2].replace(/_/g, '.');
+        device.ipad = true;
+    }
+    if (ipod) {
+        device.osVersion = ipod[3] ? ipod[3].replace(/_/g, '.') : null;
+        device.iphone = true;
+    }
+    // iOS 8+ changed UA
+    if (device.ios && device.osVersion && ua.indexOf('Version/') >= 0) {
+        if (device.osVersion.split('.')[0] === '10') {
+            device.osVersion = ua.toLowerCase().split('version/')[1].split(' ')[0];
+        }
+    }
+
+    // Webview
+    device.webView = (iphone || ipad || ipod) && ua.match(/.*AppleWebKit(?!.*Safari)/i);
+
+    // Minimal UI
+    if (device.os && device.os === 'ios') {
+        var osVersionArr = device.osVersion.split('.');
+        device.minimalUi = !device.webView &&
+            (ipod || iphone) &&
+            (osVersionArr[0] * 1 === 7 ? osVersionArr[1] * 1 >= 1 : osVersionArr[0] * 1 > 7) &&
+            $('meta[name="viewport"]').length > 0 && $('meta[name="viewport"]').attr('content').indexOf('minimal-ui') >= 0;
+    }
+
+    // Check for status bar and fullscreen app mode
+    var windowWidth = $(window).width();
+    var windowHeight = $(window).height();
+    device.statusBar = false;
+    if (device.webView && (windowWidth * windowHeight === screen.width * screen.height)) {
+        device.statusBar = true;
+    }
+    else {
+        device.statusBar = false;
+    }
+
+    // Classes
+    var classNames = [];
+
+    // Pixel Ratio
+    device.pixelRatio = window.devicePixelRatio || 1;
+    classNames.push('pixel-ratio-' + Math.floor(device.pixelRatio));
+    if (device.pixelRatio >= 2) {
+        classNames.push('retina');
+    }
+
+    // OS classes
+    if (device.os) {
+        classNames.push(device.os, device.os + '-' + device.osVersion.split('.')[0], device.os + '-' + device.osVersion.replace(/\./g, '-'));
+        if (device.os === 'ios') {
+            var major = parseInt(device.osVersion.split('.')[0], 10);
+            for (var i = major - 1; i >= 6; i--) {
+                classNames.push('ios-gt-' + i);
+            }
+        }
+
+    }
+    // Status bar classes
+    if (device.statusBar) {
+        classNames.push('with-statusbar-overlay');
+    }
+    else {
+        $('html').removeClass('with-statusbar-overlay');
+    }
+
+    // Add html classes
+    if (classNames.length > 0) $('html').addClass(classNames.join(' '));
+
+    $.device = device;
+})($);
+
+/*======================================================
+************   Picker   ************
+======================================================*/
+/* global $:true */
+/* jshint unused:false */
+/* jshint multistr:true */
++ function($) {
+    "use strict";
+    var Picker = function (params) {
+        var p = this;
+        var defaults = {
+            updateValuesOnMomentum: false,
+            updateValuesOnTouchmove: true,
+            rotateEffect: false,
+            momentumRatio: 7,
+            freeMode: false,
+            // Common settings
+            scrollToInput: true,
+            inputReadOnly: true,
+            toolbar: true,
+            toolbarCloseText: '完成',
+            title: '请选择',
+            toolbarTemplate: '<div class="toolbar">\
+          <div class="toolbar-inner">\
+          <a href="javascript:;" class="picker-button close-picker">{{closeText}}</a>\
+          <h1 class="title">{{title}}</h1>\
+          </div>\
+          </div>',
+        };
+        params = params || {};
+        for (var def in defaults) {
+            if (typeof params[def] === 'undefined') {
+                params[def] = defaults[def];
+            }
+        }
+        p.params = params;
+        p.cols = [];
+        p.initialized = false;
+
+        // Inline flag
+        p.inline = p.params.container ? true : false;
+
+        // 3D Transforms origin bug, only on safari
+        var originBug = $.device.ios || (navigator.userAgent.toLowerCase().indexOf('safari') >= 0 && navigator.userAgent.toLowerCase().indexOf('chrome') < 0) && !$.device.android;
+
+        // Should be converted to popover
+        function isPopover() {
+            var toPopover = false;
+            if (!p.params.convertToPopover && !p.params.onlyInPopover) return toPopover;
+            if (!p.inline && p.params.input) {
+                if (p.params.onlyInPopover) toPopover = true;
+                else {
+                    if ($.device.ios) {
+                        toPopover = $.device.ipad ? true : false;
+                    }
+                    else {
+                        if ($(window).width() >= 768) toPopover = true;
+                    }
+                }
+            }
+            return toPopover;
+        }
+        function inPopover() {
+            if (p.opened && p.container && p.container.length > 0 && p.container.parents('.popover').length > 0) return true;
+            else return false;
+        }
+
+        // Value
+        p.setValue = function (arrValues, transition) {
+            var valueIndex = 0;
+            for (var i = 0; i < p.cols.length; i++) {
+                if (p.cols[i] && !p.cols[i].divider) {
+                    p.cols[i].setValue(arrValues[valueIndex], transition);
+                    valueIndex++;
+                }
+            }
+        };
+        p.updateValue = function () {
+            var newValue = [];
+            var newDisplayValue = [];
+            for (var i = 0; i < p.cols.length; i++) {
+                if (!p.cols[i].divider) {
+                    newValue.push(p.cols[i].value);
+                    newDisplayValue.push(p.cols[i].displayValue);
+                }
+            }
+            if (newValue.indexOf(undefined) >= 0) {
+                return;
+            }
+            p.value = newValue;
+            p.displayValue = newDisplayValue;
+            if (p.params.onChange) {
+                p.params.onChange(p, p.value, p.displayValue);
+            }
+            if (p.input && p.input.length > 0) {
+                $(p.input).val(p.params.formatValue ? p.params.formatValue(p, p.value, p.displayValue) : p.value.join(' '));
+                $(p.input).trigger('change');
+            }
+        };
+
+        // Columns Handlers
+        p.initPickerCol = function (colElement, updateItems) {
+            var colContainer = $(colElement);
+            var colIndex = colContainer.index();
+            var col = p.cols[colIndex];
+            if (col.divider) return;
+            col.container = colContainer;
+            col.wrapper = col.container.find('.picker-items-col-wrapper');
+            col.items = col.wrapper.find('.picker-item');
+
+            var i, j;
+            var wrapperHeight, itemHeight, itemsHeight, minTranslate, maxTranslate;
+            col.replaceValues = function (values, displayValues) {
+                col.destroyEvents();
+                col.values = values;
+                col.displayValues = displayValues;
+                var newItemsHTML = p.columnHTML(col, true);
+                col.wrapper.html(newItemsHTML);
+                col.items = col.wrapper.find('.picker-item');
+                col.calcSize();
+                col.setValue(col.values[0] || '', 0, true);
+                col.initEvents();
+            };
+            col.calcSize = function () {
+                if (!col.values.length) return;
+                if (p.params.rotateEffect) {
+                    col.container.removeClass('picker-items-col-absolute');
+                    if (!col.width) col.container.css({width:''});
+                }
+                var colWidth, colHeight;
+                colWidth = 0;
+                colHeight = col.container[0].offsetHeight;
+                wrapperHeight = col.wrapper[0].offsetHeight;
+                itemHeight = col.items[0].offsetHeight;
+                itemsHeight = itemHeight * col.items.length;
+                minTranslate = colHeight / 2 - itemsHeight + itemHeight / 2;
+                maxTranslate = colHeight / 2 - itemHeight / 2;
+                if (col.width) {
+                    colWidth = col.width;
+                    if (parseInt(colWidth, 10) === colWidth) colWidth = colWidth + 'px';
+                    col.container.css({width: colWidth});
+                }
+                if (p.params.rotateEffect) {
+                    if (!col.width) {
+                        col.items.each(function () {
+                            var item = $(this);
+                            item.css({width:'auto'});
+                            colWidth = Math.max(colWidth, item[0].offsetWidth);
+                            item.css({width:''});
+                        });
+                        col.container.css({width: (colWidth + 2) + 'px'});
+                    }
+                    col.container.addClass('picker-items-col-absolute');
+                }
+            };
+            col.calcSize();
+
+            col.wrapper.transform('translate3d(0,' + maxTranslate + 'px,0)').transition(0);
+
+
+            var activeIndex = 0;
+            var animationFrameId;
+
+            // Set Value Function
+            col.setValue = function (newValue, transition, valueCallbacks) {
+                if (typeof transition === 'undefined') transition = '';
+                var newActiveIndex = col.wrapper.find('.picker-item[data-picker-value="' + newValue + '"]').index();
+                if(typeof newActiveIndex === 'undefined' || newActiveIndex === -1) {
+                    col.value = col.displayValue = newValue;
+                    return;
+                }
+                var newTranslate = -newActiveIndex * itemHeight + maxTranslate;
+                // Update wrapper
+                col.wrapper.transition(transition);
+                col.wrapper.transform('translate3d(0,' + (newTranslate) + 'px,0)');
+
+                // Watch items
+                if (p.params.updateValuesOnMomentum && col.activeIndex && col.activeIndex !== newActiveIndex ) {
+                    $.cancelAnimationFrame(animationFrameId);
+                    col.wrapper.transitionEnd(function(){
+                        $.cancelAnimationFrame(animationFrameId);
+                    });
+                    updateDuringScroll();
+                }
+
+                // Update items
+                col.updateItems(newActiveIndex, newTranslate, transition, valueCallbacks);
+            };
+
+            col.updateItems = function (activeIndex, translate, transition, valueCallbacks) {
+                if (typeof translate === 'undefined') {
+                    translate = $.getTranslate(col.wrapper[0], 'y');
+                }
+                if(typeof activeIndex === 'undefined') activeIndex = -Math.round((translate - maxTranslate)/itemHeight);
+                if (activeIndex < 0) activeIndex = 0;
+                if (activeIndex >= col.items.length) activeIndex = col.items.length - 1;
+                var previousActiveIndex = col.activeIndex;
+                col.activeIndex = activeIndex;
+
+                //去掉 .picker-after-selected, .picker-before-selected 以提高性能
+                col.wrapper.find('.picker-selected').removeClass('picker-selected');
+                if (p.params.rotateEffect) {
+                    col.items.transition(transition);
+                }
+                var selectedItem = col.items.eq(activeIndex).addClass('picker-selected').transform('');
+
+                if (valueCallbacks || typeof valueCallbacks === 'undefined') {
+                    // Update values
+                    col.value = selectedItem.attr('data-picker-value');
+                    col.displayValue = col.displayValues ? col.displayValues[activeIndex] : col.value;
+                    // On change callback
+                    if (previousActiveIndex !== activeIndex) {
+                        if (col.onChange) {
+                            col.onChange(p, col.value, col.displayValue);
+                        }
+                        p.updateValue();
+                    }
+                }
+
+                // Set 3D rotate effect
+                if (!p.params.rotateEffect) {
+                    return;
+                }
+                var percentage = (translate - (Math.floor((translate - maxTranslate)/itemHeight) * itemHeight + maxTranslate)) / itemHeight;
+
+                col.items.each(function () {
+                    var item = $(this);
+                    var itemOffsetTop = item.index() * itemHeight;
+                    var translateOffset = maxTranslate - translate;
+                    var itemOffset = itemOffsetTop - translateOffset;
+                    var percentage = itemOffset / itemHeight;
+
+                    var itemsFit = Math.ceil(col.height / itemHeight / 2) + 1;
+
+                    var angle = (-18*percentage);
+                    if (angle > 180) angle = 180;
+                    if (angle < -180) angle = -180;
+                    // Far class
+                    if (Math.abs(percentage) > itemsFit) item.addClass('picker-item-far');
+                    else item.removeClass('picker-item-far');
+                    // Set transform
+                    item.transform('translate3d(0, ' + (-translate + maxTranslate) + 'px, ' + (originBug ? -110 : 0) + 'px) rotateX(' + angle + 'deg)');
+                });
+            };
+
+            function updateDuringScroll() {
+                animationFrameId = $.requestAnimationFrame(function () {
+                    col.updateItems(undefined, undefined, 0);
+                    updateDuringScroll();
+                });
+            }
+
+            // Update items on init
+            if (updateItems) col.updateItems(0, maxTranslate, 0);
+
+            var allowItemClick = true;
+            var isTouched, isMoved, touchStartY, touchCurrentY, touchStartTime, touchEndTime, startTranslate, returnTo, currentTranslate, prevTranslate, velocityTranslate, velocityTime;
+            function handleTouchStart (e) {
+                if (isMoved || isTouched) return;
+                e.preventDefault();
+                isTouched = true;
+                var position = $.getTouchPosition(e);
+                touchStartY = touchCurrentY = position.y;
+                touchStartTime = (new Date()).getTime();
+
+                allowItemClick = true;
+                startTranslate = currentTranslate = $.getTranslate(col.wrapper[0], 'y');
+            }
+            function handleTouchMove (e) {
+                if (!isTouched) return;
+                e.preventDefault();
+                allowItemClick = false;
+                var position = $.getTouchPosition(e);
+                touchCurrentY = position.y;
+                if (!isMoved) {
+                    // First move
+                    $.cancelAnimationFrame(animationFrameId);
+                    isMoved = true;
+                    startTranslate = currentTranslate = $.getTranslate(col.wrapper[0], 'y');
+                    col.wrapper.transition(0);
+                }
+                e.preventDefault();
+
+                var diff = touchCurrentY - touchStartY;
+                currentTranslate = startTranslate + diff;
+                returnTo = undefined;
+
+                // Normalize translate
+                if (currentTranslate < minTranslate) {
+                    currentTranslate = minTranslate - Math.pow(minTranslate - currentTranslate, 0.8);
+                    returnTo = 'min';
+                }
+                if (currentTranslate > maxTranslate) {
+                    currentTranslate = maxTranslate + Math.pow(currentTranslate - maxTranslate, 0.8);
+                    returnTo = 'max';
+                }
+                // Transform wrapper
+                col.wrapper.transform('translate3d(0,' + currentTranslate + 'px,0)');
+
+                // Update items
+                col.updateItems(undefined, currentTranslate, 0, p.params.updateValuesOnTouchmove);
+
+                // Calc velocity
+                velocityTranslate = currentTranslate - prevTranslate || currentTranslate;
+                velocityTime = (new Date()).getTime();
+                prevTranslate = currentTranslate;
+            }
+            function handleTouchEnd (e) {
+                if (!isTouched || !isMoved) {
+                    isTouched = isMoved = false;
+                    return;
+                }
+                isTouched = isMoved = false;
+                col.wrapper.transition('');
+                if (returnTo) {
+                    if (returnTo === 'min') {
+                        col.wrapper.transform('translate3d(0,' + minTranslate + 'px,0)');
+                    }
+                    else col.wrapper.transform('translate3d(0,' + maxTranslate + 'px,0)');
+                }
+                touchEndTime = new Date().getTime();
+                var velocity, newTranslate;
+                if (touchEndTime - touchStartTime > 300) {
+                    newTranslate = currentTranslate;
+                }
+                else {
+                    velocity = Math.abs(velocityTranslate / (touchEndTime - velocityTime));
+                    newTranslate = currentTranslate + velocityTranslate * p.params.momentumRatio;
+                }
+
+                newTranslate = Math.max(Math.min(newTranslate, maxTranslate), minTranslate);
+
+                // Active Index
+                var activeIndex = -Math.floor((newTranslate - maxTranslate)/itemHeight);
+
+                // Normalize translate
+                if (!p.params.freeMode) newTranslate = -activeIndex * itemHeight + maxTranslate;
+
+                // Transform wrapper
+                col.wrapper.transform('translate3d(0,' + (parseInt(newTranslate,10)) + 'px,0)');
+
+                // Update items
+                col.updateItems(activeIndex, newTranslate, '', true);
+
+                // Watch items
+                if (p.params.updateValuesOnMomentum) {
+                    updateDuringScroll();
+                    col.wrapper.transitionEnd(function(){
+                        $.cancelAnimationFrame(animationFrameId);
+                    });
+                }
+
+                // Allow click
+                setTimeout(function () {
+                    allowItemClick = true;
+                }, 100);
+            }
+
+            function handleClick(e) {
+                if (!allowItemClick) return;
+                $.cancelAnimationFrame(animationFrameId);
+                /*jshint validthis:true */
+                var value = $(this).attr('data-picker-value');
+                col.setValue(value);
+            }
+
+            col.initEvents = function (detach) {
+                var method = detach ? 'off' : 'on';
+                col.container[method]($.touchEvents.start, handleTouchStart);
+                col.container[method]($.touchEvents.move, handleTouchMove);
+                col.container[method]($.touchEvents.end, handleTouchEnd);
+                col.items[method]('click', handleClick);
+            };
+            col.destroyEvents = function () {
+                col.initEvents(true);
+            };
+
+            col.container[0].f7DestroyPickerCol = function () {
+                col.destroyEvents();
+            };
+
+            col.initEvents();
+
+        };
+        p.destroyPickerCol = function (colContainer) {
+            colContainer = $(colContainer);
+            if ('f7DestroyPickerCol' in colContainer[0]) colContainer[0].f7DestroyPickerCol();
+        };
+        // Resize cols
+        function resizeCols() {
+            if (!p.opened) return;
+            for (var i = 0; i < p.cols.length; i++) {
+                if (!p.cols[i].divider) {
+                    p.cols[i].calcSize();
+                    p.cols[i].setValue(p.cols[i].value, 0, false);
+                }
+            }
+        }
+        $(window).on('resize', resizeCols);
+
+        // HTML Layout
+        p.columnHTML = function (col, onlyItems) {
+            var columnItemsHTML = '';
+            var columnHTML = '';
+            if (col.divider) {
+                columnHTML += '<div class="picker-items-col picker-items-col-divider ' + (col.textAlign ? 'picker-items-col-' + col.textAlign : '') + ' ' + (col.cssClass || '') + '">' + col.content + '</div>';
+            }
+            else {
+                for (var j = 0; j < col.values.length; j++) {
+                    columnItemsHTML += '<div class="picker-item" data-picker-value="' + col.values[j] + '">' + (col.displayValues ? col.displayValues[j] : col.values[j]) + '</div>';
+                }
+                columnHTML += '<div class="picker-items-col ' + (col.textAlign ? 'picker-items-col-' + col.textAlign : '') + ' ' + (col.cssClass || '') + '"><div class="picker-items-col-wrapper">' + columnItemsHTML + '</div></div>';
+            }
+            return onlyItems ? columnItemsHTML : columnHTML;
+        };
+        p.layout = function () {
+            var pickerHTML = '';
+            var pickerClass = '';
+            var i;
+            p.cols = [];
+            var colsHTML = '';
+            for (i = 0; i < p.params.cols.length; i++) {
+                var col = p.params.cols[i];
+                colsHTML += p.columnHTML(p.params.cols[i]);
+                p.cols.push(col);
+            }
+            pickerClass = 'weui-picker-modal picker-columns ' + (p.params.cssClass || '') + (p.params.rotateEffect ? ' picker-3d' : '') + (p.params.cols.length === 1 ? ' picker-columns-single' : '');
+            pickerHTML =
+                '<div class="' + (pickerClass) + '">' +
+                (p.params.toolbar ? p.params.toolbarTemplate.replace(/{{closeText}}/g, p.params.toolbarCloseText).replace(/{{title}}/g, p.params.title) : '') +
+                '<div class="picker-modal-inner picker-items">' +
+                colsHTML +
+                '<div class="picker-center-highlight"></div>' +
+                '</div>' +
+                '</div>';
+
+            p.pickerHTML = pickerHTML;
+        };
+
+        // Input Events
+        function openOnInput(e) {
+            e.preventDefault();
+            if (p.opened) return;
+            p.open();
+            if (p.params.scrollToInput && !isPopover()) {
+                var pageContent = p.input.parents('.content');
+                if (pageContent.length === 0) return;
+
+                var paddingTop = parseInt(pageContent.css('padding-top'), 10),
+                    paddingBottom = parseInt(pageContent.css('padding-bottom'), 10),
+                    pageHeight = pageContent[0].offsetHeight - paddingTop - p.container.height(),
+                    pageScrollHeight = pageContent[0].scrollHeight - paddingTop - p.container.height(),
+                    newPaddingBottom;
+                var inputTop = p.input.offset().top - paddingTop + p.input[0].offsetHeight;
+                if (inputTop > pageHeight) {
+                    var scrollTop = pageContent.scrollTop() + inputTop - pageHeight;
+                    if (scrollTop + pageHeight > pageScrollHeight) {
+                        newPaddingBottom = scrollTop + pageHeight - pageScrollHeight + paddingBottom;
+                        if (pageHeight === pageScrollHeight) {
+                            newPaddingBottom = p.container.height();
+                        }
+                        pageContent.css({'padding-bottom': (newPaddingBottom) + 'px'});
+                    }
+                    pageContent.scrollTop(scrollTop, 300);
+                }
+            }
+        }
+        function closeOnHTMLClick(e) {
+            if (inPopover()) return;
+            if (p.input && p.input.length > 0) {
+                if (e.target !== p.input[0] && $(e.target).parents('.weui-picker-modal').length === 0) p.close();
+            }
+            else {
+                if ($(e.target).parents('.weui-picker-modal').length === 0) p.close();
+            }
+        }
+
+        if (p.params.input) {
+            p.input = $(p.params.input);
+            if (p.input.length > 0) {
+                if (p.params.inputReadOnly) p.input.prop('readOnly', true);
+                if (!p.inline) {
+                    p.input.on('click', openOnInput);
+                }
+                if (p.params.inputReadOnly) {
+                    p.input.on('focus mousedown', function (e) {
+                        e.preventDefault();
+                    });
+                }
+            }
+
+        }
+
+        if (!p.inline) $('html').on('click tap', closeOnHTMLClick);
+
+        // Open
+        function onPickerClose() {
+            p.opened = false;
+            if (p.input && p.input.length > 0) p.input.parents('.page-content').css({'padding-bottom': ''});
+            if (p.params.onClose) p.params.onClose(p);
+
+            // Destroy events
+            p.container.find('.picker-items-col').each(function () {
+                p.destroyPickerCol(this);
+            });
+        }
+
+        p.opened = false;
+        p.open = function () {
+            var toPopover = isPopover();
+
+            if (!p.opened) {
+
+                // Layout
+                p.layout();
+
+                // Append
+                if (toPopover) {
+                    p.pickerHTML = '<div class="popover popover-picker-columns"><div class="popover-inner">' + p.pickerHTML + '</div></div>';
+                    p.popover = $.popover(p.pickerHTML, p.params.input, true);
+                    p.container = $(p.popover).find('.weui-picker-modal');
+                    $(p.popover).on('close', function () {
+                        onPickerClose();
+                    });
+                }
+                else if (p.inline) {
+                    p.container = $(p.pickerHTML);
+                    p.container.addClass('picker-modal-inline');
+                    $(p.params.container).append(p.container);
+                }
+                else {
+                    p.container = $($.openPicker(p.pickerHTML));
+                    $(p.container)
+                        .on('close', function () {
+                            onPickerClose();
+                        });
+                }
+
+                // Store picker instance
+                p.container[0].f7Picker = p;
+
+                // Init Events
+                p.container.find('.picker-items-col').each(function () {
+                    var updateItems = true;
+                    if ((!p.initialized && p.params.value) || (p.initialized && p.value)) updateItems = false;
+                    p.initPickerCol(this, updateItems);
+                });
+
+                // Set value
+                if (!p.initialized) {
+                    if (p.params.value) {
+                        p.setValue(p.params.value, 0);
+                    }
+                }
+                else {
+                    if (p.value) p.setValue(p.value, 0);
+                }
+            }
+
+            // Set flag
+            p.opened = true;
+            p.initialized = true;
+
+            if (p.params.onOpen) p.params.onOpen(p);
+        };
+
+        // Close
+        p.close = function (force) {
+            if (!p.opened || p.inline) return;
+            if (inPopover()) {
+                $.closePicker(p.popover);
+                return;
+            }
+            else {
+                $.closePicker(p.container);
+                return;
+            }
+        };
+
+        // Destroy
+        p.destroy = function () {
+            p.close();
+            if (p.params.input && p.input.length > 0) {
+                p.input.off('click focus', openOnInput);
+                $(p.input).data('picker', null);
+            }
+            $('html').off('click', closeOnHTMLClick);
+            $(window).off('resize', resizeCols);
+        };
+
+        if (p.inline) {
+            p.open();
+        }
+
+        return p;
+    };
+
+    $(document).on("click tap", ".close-picker", function() {
+        var pickerToClose = $('.weui-picker-modal.weui-picker-modal-visible');
+        if (pickerToClose.length > 0) {
+            $.closePicker(pickerToClose);
+        }
+    });
+
+    //修复picker会滚动页面的bug
+    $(document).on($.touchEvents.move, ".picker-modal-inner", function(e) {
+        e.preventDefault();
+    });
+
+
+    $.openPicker = function(tpl, className, callback) {
+
+        if(typeof className === "function") {
+            callback = className;
+            className = undefined;
+        }
+
+        $.closePicker();
+
+        var container = $("<div class='weui-picker-container "+ (className || "") + "'></div>").appendTo(document.body);
+        container.show();
+
+        container.addClass("weui-picker-container-visible");
+
+        //关于布局的问题，如果直接放在body上，则做动画的时候会撑开body高度而导致滚动条变化。
+        var dialog = $(tpl).appendTo(container);
+
+        dialog.width(); //通过取一次CSS值，强制浏览器不能把上下两行代码合并执行，因为合并之后会导致无法出现动画。
+
+        dialog.addClass("weui-picker-modal-visible");
+
+        callback && container.on("close", callback);
+
+        return dialog;
+    }
+
+    $.updatePicker = function(tpl) {
+        var container = $(".weui-picker-container-visible");
+        if(!container[0]) return false;
+
+        container.html("");
+
+        var dialog = $(tpl).appendTo(container);
+
+        dialog.addClass("weui-picker-modal-visible");
+
+        return dialog;
+    }
+
+    $.closePicker = function(container, callback) {
+        if(typeof container === "function") callback = container;
+        $(".weui-picker-modal-visible").removeClass("weui-picker-modal-visible").transitionEnd(function() {
+            $(this).parent().remove();
+            callback && callback();
+        }).trigger("close");
+    };
+
+    $.fn.picker = function(params) {
+        var args = arguments;
+        return this.each(function() {
+            if(!this) return;
+            var $this = $(this);
+
+            var picker = $this.data("picker");
+            if(!picker) {
+                params = $.extend({ input: this }, params || {}) // https://github.com/lihongxun945/jquery-weui/issues/432
+                var inputValue = $this.val();
+                if(params.value === undefined && inputValue !== "") {
+                    params.value = (params.cols && params.cols.length > 1) ? inputValue.split(" ") : [inputValue];
+                }
+                var p = $.extend({input: this}, params);
+                picker = new Picker(p);
+                $this.data("picker", picker);
+            }
+            if(typeof params === typeof "a") {
+                picker[params].apply(picker, Array.prototype.slice.call(args, 1));
+            }
+        });
+    };
+}($);
+
+/* global $:true */
++ function($) {
+    "use strict";
+
+    var defaults;
+
+    var selects = [];
+
+    var Select = function(input, config) {
+
+        var self = this;
+        this.config = config;
+
+        //init empty data
+        this.data = {
+            values: '',
+            titles: '',
+            origins: [],
+            length: 0
+        };
+
+        this.$input = $(input);
+        this.$input.prop("readOnly", true);
+
+        this.initConfig();
+
+        config = this.config;
+
+        this.$input.click($.proxy(this.open, this));
+        selects.push(this)
+    }
+
+    Select.prototype.initConfig = function() {
+        this.config = $.extend({}, defaults, this.config);
+
+        var config = this.config;
+
+        if(!config.items || !config.items.length) return;
+
+        config.items = config.items.map(function(d, i) {
+            if(typeof d == typeof "a") {
+                return {
+                    title: d,
+                    value: d
+                };
+            }
+
+            return d;
+        });
+
+
+        this.tpl = $.t7.compile("<div class='weui-picker-modal weui-select-modal'>" + config.toolbarTemplate + (config.multi ? config.checkboxTemplate : config.radioTemplate) + "</div>");
+
+        if(config.input !== undefined) this.$input.val(config.input);
+
+        this.parseInitValue();
+
+        this._init = true;
+    }
+
+    Select.prototype.updateInputValue = function(values, titles) {
+        var v, t;
+        if(this.config.multi) {
+            v = values.join(this.config.split);
+            t = titles.join(this.config.split);
+        } else {
+            v = values[0];
+            t = titles[0];
+        }
+
+        //caculate origin data
+        var origins = [];
+
+        this.config.items.forEach(function(d) {
+            values.each(function(i, dd) {
+                if(d.value == dd) origins.push(d);
+            });
+        });
+
+        this.$input.val(t).data("values", v);
+        this.$input.attr("value", t).attr("data-values", v);
+
+        var data = {
+            values: v,
+            titles: t,
+            valuesArray: values,
+            titlesArray: titles,
+            origins: origins,
+            length: origins.length
+        };
+        this.data = data;
+        this.$input.trigger("change", data);
+        this.config.onChange && this.config.onChange.call(this, data);
+    }
+
+    Select.prototype.parseInitValue = function() {
+        var value = this.$input.val();
+        var items = this.config.items;
+
+        //如果input为空，只有在第一次初始化的时候才保留默认选择。因为后来就是用户自己取消了全部选择，不能再为他选中默认值。
+        if( !this._init && (value === undefined || value == null || value === "")) return;
+
+        var titles = this.config.multi ? value.split(this.config.split) : [value];
+        for(var i=0;i<items.length;i++) {
+            items[i].checked = false;
+            for(var j=0;j<titles.length;j++) {
+                if(items[i].title === titles[j]) {
+                    items[i].checked = true;
+                }
+            }
+        }
+    }
+
+    Select.prototype._bind = function(dialog) {
+        var self = this,
+            config = this.config;
+        dialog.on("change", function(e) {
+            var checked = dialog.find("input:checked");
+            var values = checked.map(function() {
+                return $(this).val();
+            });
+            var titles = checked.map(function() {
+                return $(this).data("title");
+            });
+            self.updateInputValue(values, titles);
+
+            if(config.autoClose && !config.multi) self.close();
+        })
+            .on("click tap", ".close-select", function() {
+                self.close();
+            });
+    }
+
+    //更新数据
+    Select.prototype.update = function(config) {
+        this.config = $.extend({}, this.config, config);
+        this.initConfig();
+        if(this._open) {
+            this._bind($.updatePicker(this.getHTML()));
+        }
+    }
+
+    Select.prototype.open = function(values, titles) {
+
+        if(this._open) return;
+
+        // open picker 会默认关掉其他的，但是 onClose 不会被调用，所以这里先关掉其他select
+        for (var i = 0; i < selects.length; i++ ) {
+            var s = selects[i];
+            if (s === this) continue;
+            if (s._open) {
+                if(!s.close()) return false; // 其他的select由于某些条件限制关闭失败。
+            }
+        }
+
+        this.parseInitValue();
+
+        var config = this.config;
+
+        var dialog = this.dialog = $.openPicker(this.getHTML());
+
+        this._bind(dialog);
+
+        this._open = true;
+        if(config.onOpen) config.onOpen(this);
+    }
+
+    Select.prototype.close = function(callback, force) {
+        if (!this._open) return false;
+        var self = this,
+            beforeClose = this.config.beforeClose;
+
+        if(typeof callback === typeof true) {
+            force === callback;
+        }
+        if(!force) {
+            if(beforeClose && typeof beforeClose === 'function' && beforeClose.call(this, this.data.values, this.data.titles) === false) {
+                return false
+            }
+            if(this.config.multi) {
+                if(this.config.min !== undefined && this.data.length < this.config.min) {
+                    $.toast("请至少选择"+this.config.min+"个", "text");
+                    return false
+                }
+                if(this.config.max !== undefined && this.data.length > this.config.max) {
+                    $.toast("最多只能选择"+this.config.max+"个", "text");
+                    return false
+                }
+            }
+        }
+        $.closePicker(function() {
+            self.onClose();
+            callback && callback();
+        });
+
+        return true
+    }
+
+    Select.prototype.onClose = function() {
+        this._open = false;
+        if(this.config.onClose) this.config.onClose(this);
+    }
+
+    Select.prototype.getHTML = function(callback) {
+        var config = this.config;
+        return this.tpl({
+            items: config.items,
+            title: config.title,
+            closeText: config.closeText
+        })
+    }
+
+
+    $.fn.select = function(params, args) {
+
+        return this.each(function() {
+            var $this = $(this);
+            if(!$this.data("weui-select")) $this.data("weui-select", new Select(this, params));
+
+            var select = $this.data("weui-select");
+
+            if(typeof params === typeof "a") select[params].call(select, args);
+
+            return select;
+        });
+    }
+
+    defaults = $.fn.select.prototype.defaults = {
+        items: [],
+        input: undefined, //输入框的初始值
+        title: "请选择",
+        multi: false,
+        closeText: "确定",
+        autoClose: true, //是否选择完成后自动关闭，只有单选模式下才有效
+        onChange: undefined, //function
+        beforeClose: undefined, // function 关闭之前，如果返回false则阻止关闭
+        onClose: undefined, //function
+        onOpen: undefined, //function
+        split: ",",  //多选模式下的分隔符
+        min: undefined, //多选模式下可用，最少选择数
+        max: undefined, //单选模式下可用，最多选择数
+        toolbarTemplate: '<div class="toolbar">\
+      <div class="toolbar-inner">\
+      <a href="javascript:;" class="picker-button close-select">{{closeText}}</a>\
+      <h1 class="title">{{title}}</h1>\
+      </div>\
+      </div>',
+        radioTemplate:
+            '<div class="weui-cells weui-cells_radio">\
+              {{#items}}\
+              <label class="weui-cell weui-check_label" for="weui-select-id-{{this.title}}">\
+                <div class="weui-cell__bd weui-cell_primary">\
+                  <p>{{this.title}}</p>\
+                </div>\
+                <div class="weui-cell__ft">\
+                  <input type="radio" class="weui-check" name="weui-select" id="weui-select-id-{{this.title}}" value="{{this.value}}" {{#if this.checked}}checked="checked"{{/if}} data-title="{{this.title}}">\
+                  <span class="weui-icon-checked"></span>\
+                </div>\
+              </label>\
+              {{/items}}\
+            </div>',
+        checkboxTemplate:
+            '<div class="weui-cells weui-cells_checkbox">\
+              {{#items}}\
+              <label class="weui-cell weui-check_label" for="weui-select-id-{{this.title}}">\
+                <div class="weui-cell__bd weui-cell_primary">\
+                  <p>{{this.title}}</p>\
+                </div>\
+                <div class="weui-cell__ft">\
+                  <input type="checkbox" class="weui-check" name="weui-select" id="weui-select-id-{{this.title}}" value="{{this.value}}" {{#if this.checked}}checked="checked"{{/if}} data-title="{{this.title}}" >\
+                  <span class="weui-icon-checked"></span>\
+                </div>\
+              </label>\
+              {{/items}}\
+            </div>',
+    }
+
+}($);
+
+/*======================================================
+************   Calendar   ************
+======================================================*/
+/* global $:true */
+/*jshint unused: false*/
++function ($) {
+    "use strict";
+    var rtl = false;
+    var defaults;
+    var isSameDate = function (a, b) {
+        var a = new Date(a),
+            b = new Date(b);
+        return a.getFullYear() === b.getFullYear() && a.getMonth() === b.getMonth() && a.getDate() === b.getDate()
+    }
+    var Calendar = function (params) {
+        var p = this;
+        params = params || {};
+        for (var def in defaults) {
+            if (typeof params[def] === 'undefined') {
+                params[def] = defaults[def];
+            }
+        }
+        p.params = params;
+        p.initialized = false;
+
+        // Inline flag
+        p.inline = p.params.container ? true : false;
+
+        // Is horizontal
+        p.isH = p.params.direction === 'horizontal';
+
+        // RTL inverter
+        var inverter = p.isH ? (rtl ? -1 : 1) : 1;
+
+        // Animating flag
+        p.animating = false;
+
+        // Should be converted to popover
+        function isPopover() {
+            var toPopover = false;
+            if (!p.params.convertToPopover && !p.params.onlyInPopover) return toPopover;
+            if (!p.inline && p.params.input) {
+                if (p.params.onlyInPopover) toPopover = true;
+                else {
+                    if ($.device.ios) {
+                        toPopover = $.device.ipad ? true : false;
+                    }
+                    else {
+                        if ($(window).width() >= 768) toPopover = true;
+                    }
+                }
+            }
+            return toPopover;
+        }
+        function inPopover() {
+            if (p.opened && p.container && p.container.length > 0 && p.container.parents('.popover').length > 0) return true;
+            else return false;
+        }
+
+        // Format date
+        function formatDate(date) {
+            date = new Date(date);
+            var year = date.getFullYear();
+            var month = date.getMonth();
+            var month1 = month + 1;
+            var day = date.getDate();
+            var weekDay = date.getDay();
+            return p.params.dateFormat
+                .replace(/yyyy/g, year)
+                .replace(/yy/g, (year + '').substring(2))
+                .replace(/mm/g, month1 < 10 ? '0' + month1 : month1)
+                .replace(/m/g, month1)
+                .replace(/MM/g, p.params.monthNames[month])
+                .replace(/M/g, p.params.monthNamesShort[month])
+                .replace(/dd/g, day < 10 ? '0' + day : day)
+                .replace(/d/g, day)
+                .replace(/DD/g, p.params.dayNames[weekDay])
+                .replace(/D/g, p.params.dayNamesShort[weekDay]);
+        }
+
+
+        // Value
+        p.addValue = function (value) {
+            if (p.params.multiple) {
+                if (!p.value) p.value = [];
+                var inValuesIndex;
+                for (var i = 0; i < p.value.length; i++) {
+                    if (isSameDate(value, p.value[i])) {
+                        inValuesIndex = i;
+                    }
+                }
+                if (typeof inValuesIndex === 'undefined') {
+                    p.value.push(value);
+                }
+                else {
+                    p.value.splice(inValuesIndex, 1);
+                }
+                p.updateValue();
+            }
+            else {
+                p.value = [value];
+                p.updateValue();
+            }
+        };
+        p.setValue = function (arrValues) {
+            var date = new Date(arrValues[0]);
+            p.setYearMonth(date.getFullYear(), date.getMonth());
+            p.addValue(+ date);
+        };
+        p.updateValue = function () {
+            p.wrapper.find('.picker-calendar-day-selected').removeClass('picker-calendar-day-selected');
+            var i, inputValue;
+            for (i = 0; i < p.value.length; i++) {
+                var valueDate = new Date(p.value[i]);
+                p.wrapper.find('.picker-calendar-day[data-date="' + valueDate.getFullYear() + '-' + valueDate.getMonth() + '-' + valueDate.getDate() + '"]').addClass('picker-calendar-day-selected');
+            }
+            if (p.params.onChange) {
+                p.params.onChange(p, p.value.map(formatDate), p.value.map(function (d) {
+                    return + new Date(typeof d === typeof 'a' ? d.split(/\D/).filter(function (a) { return !!a; }).join("-") : d);
+                }));
+            }
+            if (p.input && p.input.length > 0) {
+                if (p.params.formatValue) inputValue = p.params.formatValue(p, p.value);
+                else {
+                    inputValue = [];
+                    for (i = 0; i < p.value.length; i++) {
+                        inputValue.push(formatDate(p.value[i]));
+                    }
+                    inputValue = inputValue.join(', ');
+                }
+                $(p.input).val(inputValue);
+                $(p.input).trigger('change');
+            }
+        };
+
+        // Columns Handlers
+        p.initCalendarEvents = function () {
+            var col;
+            var allowItemClick = true;
+            var isTouched, isMoved, touchStartX, touchStartY, touchCurrentX, touchCurrentY, touchStartTime, touchEndTime, startTranslate, currentTranslate, wrapperWidth, wrapperHeight, percentage, touchesDiff, isScrolling;
+            function handleTouchStart (e) {
+                if (isMoved || isTouched) return;
+                // e.preventDefault();
+                isTouched = true;
+                var position = $.getTouchPosition(e);
+                touchStartX = touchCurrentY = position.x;
+                touchStartY = touchCurrentY = position.y;
+                touchStartTime = (new Date()).getTime();
+                percentage = 0;
+                allowItemClick = true;
+                isScrolling = undefined;
+                startTranslate = currentTranslate = p.monthsTranslate;
+            }
+            function handleTouchMove (e) {
+                if (!isTouched) return;
+                var position = $.getTouchPosition(e);
+                touchCurrentX = position.x;
+                touchCurrentY = position.y;
+                if (typeof isScrolling === 'undefined') {
+                    isScrolling = !!(isScrolling || Math.abs(touchCurrentY - touchStartY) > Math.abs(touchCurrentX - touchStartX));
+                }
+                if (p.isH && isScrolling) {
+                    isTouched = false;
+                    return;
+                }
+                e.preventDefault();
+                if (p.animating) {
+                    isTouched = false;
+                    return;
+                }
+                allowItemClick = false;
+                if (!isMoved) {
+                    // First move
+                    isMoved = true;
+                    wrapperWidth = p.wrapper[0].offsetWidth;
+                    wrapperHeight = p.wrapper[0].offsetHeight;
+                    p.wrapper.transition(0);
+                }
+                e.preventDefault();
+
+                touchesDiff = p.isH ? touchCurrentX - touchStartX : touchCurrentY - touchStartY;
+                percentage = touchesDiff/(p.isH ? wrapperWidth : wrapperHeight);
+                currentTranslate = (p.monthsTranslate * inverter + percentage) * 100;
+
+                // Transform wrapper
+                p.wrapper.transform('translate3d(' + (p.isH ? currentTranslate : 0) + '%, ' + (p.isH ? 0 : currentTranslate) + '%, 0)');
+
+            }
+            function handleTouchEnd (e) {
+                if (!isTouched || !isMoved) {
+                    isTouched = isMoved = false;
+                    return;
+                }
+                isTouched = isMoved = false;
+
+                touchEndTime = new Date().getTime();
+                if (touchEndTime - touchStartTime < 300) {
+                    if (Math.abs(touchesDiff) < 10) {
+                        p.resetMonth();
+                    }
+                    else if (touchesDiff >= 10) {
+                        if (rtl) p.nextMonth();
+                        else p.prevMonth();
+                    }
+                    else {
+                        if (rtl) p.prevMonth();
+                        else p.nextMonth();
+                    }
+                }
+                else {
+                    if (percentage <= -0.5) {
+                        if (rtl) p.prevMonth();
+                        else p.nextMonth();
+                    }
+                    else if (percentage >= 0.5) {
+                        if (rtl) p.nextMonth();
+                        else p.prevMonth();
+                    }
+                    else {
+                        p.resetMonth();
+                    }
+                }
+
+                // Allow click
+                setTimeout(function () {
+                    allowItemClick = true;
+                }, 100);
+            }
+
+            function handleDayClick(e) {
+                if (!allowItemClick) return;
+                var day = $(e.target).parents('.picker-calendar-day');
+                if (day.length === 0 && $(e.target).hasClass('picker-calendar-day')) {
+                    day = $(e.target);
+                }
+                if (day.length === 0) return;
+                // if (day.hasClass('picker-calendar-day-selected') && !p.params.multiple) return;
+                if (day.hasClass('picker-calendar-day-disabled')) return;
+                if (day.hasClass('picker-calendar-day-next')) p.nextMonth();
+                if (day.hasClass('picker-calendar-day-prev')) p.prevMonth();
+                var dateYear = day.attr('data-year');
+                var dateMonth = day.attr('data-month');
+                var dateDay = day.attr('data-day');
+                if (p.params.onDayClick) {
+                    p.params.onDayClick(p, day[0], dateYear, dateMonth, dateDay);
+                }
+                p.addValue(new Date(dateYear, dateMonth, dateDay).getTime());
+                if (p.params.closeOnSelect && !p.params.multiple) p.close();
+            }
+
+            p.container.find('.picker-calendar-prev-month').on('click', p.prevMonth);
+            p.container.find('.picker-calendar-next-month').on('click', p.nextMonth);
+            p.container.find('.picker-calendar-prev-year').on('click', p.prevYear);
+            p.container.find('.picker-calendar-next-year').on('click', p.nextYear);
+            p.wrapper.on('click', handleDayClick);
+            if (p.params.touchMove) {
+                p.wrapper.on($.touchEvents.start, handleTouchStart);
+                p.wrapper.on($.touchEvents.move, handleTouchMove);
+                p.wrapper.on($.touchEvents.end, handleTouchEnd);
+            }
+
+            p.container[0].f7DestroyCalendarEvents = function () {
+                p.container.find('.picker-calendar-prev-month').off('click', p.prevMonth);
+                p.container.find('.picker-calendar-next-month').off('click', p.nextMonth);
+                p.container.find('.picker-calendar-prev-year').off('click', p.prevYear);
+                p.container.find('.picker-calendar-next-year').off('click', p.nextYear);
+                p.wrapper.off('click', handleDayClick);
+                if (p.params.touchMove) {
+                    p.wrapper.off($.touchEvents.start, handleTouchStart);
+                    p.wrapper.off($.touchEvents.move, handleTouchMove);
+                    p.wrapper.off($.touchEvents.end, handleTouchEnd);
+                }
+            };
+
+
+        };
+        p.destroyCalendarEvents = function (colContainer) {
+            if ('f7DestroyCalendarEvents' in p.container[0]) p.container[0].f7DestroyCalendarEvents();
+        };
+
+        // Calendar Methods
+        p.daysInMonth = function (date) {
+            var d = new Date(date);
+            return new Date(d.getFullYear(), d.getMonth() + 1, 0).getDate();
+        };
+        p.monthHTML = function (date, offset) {
+            date = new Date(date);
+            var year = date.getFullYear(),
+                month = date.getMonth(),
+                day = date.getDate();
+            if (offset === 'next') {
+                if (month === 11) date = new Date(year + 1, 0);
+                else date = new Date(year, month + 1, 1);
+            }
+            if (offset === 'prev') {
+                if (month === 0) date = new Date(year - 1, 11);
+                else date = new Date(year, month - 1, 1);
+            }
+            if (offset === 'next' || offset === 'prev') {
+                month = date.getMonth();
+                year = date.getFullYear();
+            }
+            var daysInPrevMonth = p.daysInMonth(new Date(date.getFullYear(), date.getMonth()).getTime() - 10 * 24 * 60 * 60 * 1000),
+                daysInMonth = p.daysInMonth(date),
+                firstDayOfMonthIndex = new Date(date.getFullYear(), date.getMonth()).getDay();
+            if (firstDayOfMonthIndex === 0) firstDayOfMonthIndex = 7;
+
+            var dayDate, currentValues = [], i, j,
+                rows = 6, cols = 7,
+                monthHTML = '',
+                dayIndex = 0 + (p.params.firstDay - 1),
+                today = new Date().setHours(0,0,0,0),
+                minDate = p.params.minDate ? new Date(p.params.minDate).getTime() : null,
+                maxDate = p.params.maxDate ? new Date(p.params.maxDate).getTime() : null;
+
+            if (p.value && p.value.length) {
+                for (i = 0; i < p.value.length; i++) {
+                    currentValues.push(new Date(p.value[i]).setHours(0,0,0,0));
+                }
+            }
+
+            for (i = 1; i <= rows; i++) {
+                var rowHTML = '';
+                var row = i;
+                for (j = 1; j <= cols; j++) {
+                    var col = j;
+                    dayIndex ++;
+                    var dayNumber = dayIndex - firstDayOfMonthIndex;
+                    var addClass = '';
+                    if (dayNumber < 0) {
+                        dayNumber = daysInPrevMonth + dayNumber + 1;
+                        addClass += ' picker-calendar-day-prev';
+                        dayDate = new Date(month - 1 < 0 ? year - 1 : year, month - 1 < 0 ? 11 : month - 1, dayNumber).getTime();
+                    }
+                    else {
+                        dayNumber = dayNumber + 1;
+                        if (dayNumber > daysInMonth) {
+                            dayNumber = dayNumber - daysInMonth;
+                            addClass += ' picker-calendar-day-next';
+                            dayDate = new Date(month + 1 > 11 ? year + 1 : year, month + 1 > 11 ? 0 : month + 1, dayNumber).getTime();
+                        }
+                        else {
+                            dayDate = new Date(year, month, dayNumber).getTime();
+                        }
+                    }
+                    // Today
+                    if (dayDate === today) addClass += ' picker-calendar-day-today';
+                    // Selected
+                    if (currentValues.indexOf(dayDate) >= 0) addClass += ' picker-calendar-day-selected';
+                    // Weekend
+                    if (p.params.weekendDays.indexOf(col - 1) >= 0) {
+                        addClass += ' picker-calendar-day-weekend';
+                    }
+                    // Disabled
+                    if ((minDate && dayDate < minDate) || (maxDate && dayDate > maxDate)) {
+                        addClass += ' picker-calendar-day-disabled';
+                    }
+
+                    dayDate = new Date(dayDate);
+                    var dayYear = dayDate.getFullYear();
+                    var dayMonth = dayDate.getMonth();
+                    rowHTML += '<div data-year="' + dayYear + '" data-month="' + dayMonth + '" data-day="' + dayNumber + '" class="picker-calendar-day' + (addClass) + '" data-date="' + (dayYear + '-' + dayMonth + '-' + dayNumber) + '"><span>'+dayNumber+'</span></div>';
+                }
+                monthHTML += '<div class="picker-calendar-row">' + rowHTML + '</div>';
+            }
+            monthHTML = '<div class="picker-calendar-month" data-year="' + year + '" data-month="' + month + '">' + monthHTML + '</div>';
+            return monthHTML;
+        };
+        p.animating = false;
+        p.updateCurrentMonthYear = function (dir) {
+            if (typeof dir === 'undefined') {
+                p.currentMonth = parseInt(p.months.eq(1).attr('data-month'), 10);
+                p.currentYear = parseInt(p.months.eq(1).attr('data-year'), 10);
+            }
+            else {
+                p.currentMonth = parseInt(p.months.eq(dir === 'next' ? (p.months.length - 1) : 0).attr('data-month'), 10);
+                p.currentYear = parseInt(p.months.eq(dir === 'next' ? (p.months.length - 1) : 0).attr('data-year'), 10);
+            }
+            p.container.find('.current-month-value').text(p.params.monthNames[p.currentMonth]);
+            p.container.find('.current-year-value').text(p.currentYear);
+
+        };
+        p.onMonthChangeStart = function (dir) {
+            p.updateCurrentMonthYear(dir);
+            p.months.removeClass('picker-calendar-month-current picker-calendar-month-prev picker-calendar-month-next');
+            var currentIndex = dir === 'next' ? p.months.length - 1 : 0;
+
+            p.months.eq(currentIndex).addClass('picker-calendar-month-current');
+            p.months.eq(dir === 'next' ? currentIndex - 1 : currentIndex + 1).addClass(dir === 'next' ? 'picker-calendar-month-prev' : 'picker-calendar-month-next');
+
+            if (p.params.onMonthYearChangeStart) {
+                p.params.onMonthYearChangeStart(p, p.currentYear, p.currentMonth);
+            }
+        };
+        p.onMonthChangeEnd = function (dir, rebuildBoth) {
+            p.animating = false;
+            var nextMonthHTML, prevMonthHTML, newMonthHTML;
+            p.wrapper.find('.picker-calendar-month:not(.picker-calendar-month-prev):not(.picker-calendar-month-current):not(.picker-calendar-month-next)').remove();
+
+            if (typeof dir === 'undefined') {
+                dir = 'next';
+                rebuildBoth = true;
+            }
+            if (!rebuildBoth) {
+                newMonthHTML = p.monthHTML(new Date(p.currentYear, p.currentMonth), dir);
+            }
+            else {
+                p.wrapper.find('.picker-calendar-month-next, .picker-calendar-month-prev').remove();
+                prevMonthHTML = p.monthHTML(new Date(p.currentYear, p.currentMonth), 'prev');
+                nextMonthHTML = p.monthHTML(new Date(p.currentYear, p.currentMonth), 'next');
+            }
+            if (dir === 'next' || rebuildBoth) {
+                p.wrapper.append(newMonthHTML || nextMonthHTML);
+            }
+            if (dir === 'prev' || rebuildBoth) {
+                p.wrapper.prepend(newMonthHTML || prevMonthHTML);
+            }
+            p.months = p.wrapper.find('.picker-calendar-month');
+            p.setMonthsTranslate(p.monthsTranslate);
+            if (p.params.onMonthAdd) {
+                p.params.onMonthAdd(p, dir === 'next' ? p.months.eq(p.months.length - 1)[0] : p.months.eq(0)[0]);
+            }
+            if (p.params.onMonthYearChangeEnd) {
+                p.params.onMonthYearChangeEnd(p, p.currentYear, p.currentMonth);
+            }
+        };
+        p.setMonthsTranslate = function (translate) {
+            translate = translate || p.monthsTranslate || 0;
+            if (typeof p.monthsTranslate === 'undefined') p.monthsTranslate = translate;
+            p.months.removeClass('picker-calendar-month-current picker-calendar-month-prev picker-calendar-month-next');
+            var prevMonthTranslate = -(translate + 1) * 100 * inverter;
+            var currentMonthTranslate = -translate * 100 * inverter;
+            var nextMonthTranslate = -(translate - 1) * 100 * inverter;
+            p.months.eq(0).transform('translate3d(' + (p.isH ? prevMonthTranslate : 0) + '%, ' + (p.isH ? 0 : prevMonthTranslate) + '%, 0)').addClass('picker-calendar-month-prev');
+            p.months.eq(1).transform('translate3d(' + (p.isH ? currentMonthTranslate : 0) + '%, ' + (p.isH ? 0 : currentMonthTranslate) + '%, 0)').addClass('picker-calendar-month-current');
+            p.months.eq(2).transform('translate3d(' + (p.isH ? nextMonthTranslate : 0) + '%, ' + (p.isH ? 0 : nextMonthTranslate) + '%, 0)').addClass('picker-calendar-month-next');
+        };
+        p.nextMonth = function (transition) {
+            if (typeof transition === 'undefined' || typeof transition === 'object') {
+                transition = '';
+                if (!p.params.animate) transition = 0;
+            }
+            var nextMonth = parseInt(p.months.eq(p.months.length - 1).attr('data-month'), 10);
+            var nextYear = parseInt(p.months.eq(p.months.length - 1).attr('data-year'), 10);
+            var nextDate = new Date(nextYear, nextMonth);
+            var nextDateTime = nextDate.getTime();
+            var transitionEndCallback = p.animating ? false : true;
+            if (p.params.maxDate) {
+                if (nextDateTime > new Date(p.params.maxDate).getTime()) {
+                    return p.resetMonth();
+                }
+            }
+            p.monthsTranslate --;
+            if (nextMonth === p.currentMonth) {
+                var nextMonthTranslate = -(p.monthsTranslate) * 100 * inverter;
+                var nextMonthHTML = $(p.monthHTML(nextDateTime, 'next')).transform('translate3d(' + (p.isH ? nextMonthTranslate : 0) + '%, ' + (p.isH ? 0 : nextMonthTranslate) + '%, 0)').addClass('picker-calendar-month-next');
+                p.wrapper.append(nextMonthHTML[0]);
+                p.months = p.wrapper.find('.picker-calendar-month');
+                if (p.params.onMonthAdd) {
+                    p.params.onMonthAdd(p, p.months.eq(p.months.length - 1)[0]);
+                }
+            }
+            p.animating = true;
+            p.onMonthChangeStart('next');
+            var translate = (p.monthsTranslate * 100) * inverter;
+
+            p.wrapper.transition(transition).transform('translate3d(' + (p.isH ? translate : 0) + '%, ' + (p.isH ? 0 : translate) + '%, 0)');
+            if (transitionEndCallback) {
+                p.wrapper.transitionEnd(function () {
+                    p.onMonthChangeEnd('next');
+                });
+            }
+            if (!p.params.animate) {
+                p.onMonthChangeEnd('next');
+            }
+        };
+        p.prevMonth = function (transition) {
+            if (typeof transition === 'undefined' || typeof transition === 'object') {
+                transition = '';
+                if (!p.params.animate) transition = 0;
+            }
+            var prevMonth = parseInt(p.months.eq(0).attr('data-month'), 10);
+            var prevYear = parseInt(p.months.eq(0).attr('data-year'), 10);
+            var prevDate = new Date(prevYear, prevMonth + 1, -1);
+            var prevDateTime = prevDate.getTime();
+            var transitionEndCallback = p.animating ? false : true;
+            if (p.params.minDate) {
+                if (prevDateTime < new Date(p.params.minDate).getTime()) {
+                    return p.resetMonth();
+                }
+            }
+            p.monthsTranslate ++;
+            if (prevMonth === p.currentMonth) {
+                var prevMonthTranslate = -(p.monthsTranslate) * 100 * inverter;
+                var prevMonthHTML = $(p.monthHTML(prevDateTime, 'prev')).transform('translate3d(' + (p.isH ? prevMonthTranslate : 0) + '%, ' + (p.isH ? 0 : prevMonthTranslate) + '%, 0)').addClass('picker-calendar-month-prev');
+                p.wrapper.prepend(prevMonthHTML[0]);
+                p.months = p.wrapper.find('.picker-calendar-month');
+                if (p.params.onMonthAdd) {
+                    p.params.onMonthAdd(p, p.months.eq(0)[0]);
+                }
+            }
+            p.animating = true;
+            p.onMonthChangeStart('prev');
+            var translate = (p.monthsTranslate * 100) * inverter;
+            p.wrapper.transition(transition).transform('translate3d(' + (p.isH ? translate : 0) + '%, ' + (p.isH ? 0 : translate) + '%, 0)');
+            if (transitionEndCallback) {
+                p.wrapper.transitionEnd(function () {
+                    p.onMonthChangeEnd('prev');
+                });
+            }
+            if (!p.params.animate) {
+                p.onMonthChangeEnd('prev');
+            }
+        };
+        p.resetMonth = function (transition) {
+            if (typeof transition === 'undefined') transition = '';
+            var translate = (p.monthsTranslate * 100) * inverter;
+            p.wrapper.transition(transition).transform('translate3d(' + (p.isH ? translate : 0) + '%, ' + (p.isH ? 0 : translate) + '%, 0)');
+        };
+        p.setYearMonth = function (year, month, transition) {
+            if (typeof year === 'undefined') year = p.currentYear;
+            if (typeof month === 'undefined') month = p.currentMonth;
+            if (typeof transition === 'undefined' || typeof transition === 'object') {
+                transition = '';
+                if (!p.params.animate) transition = 0;
+            }
+            var targetDate;
+            if (year < p.currentYear) {
+                targetDate = new Date(year, month + 1, -1).getTime();
+            }
+            else {
+                targetDate = new Date(year, month).getTime();
+            }
+            if (p.params.maxDate && targetDate > new Date(p.params.maxDate).getTime()) {
+                return false;
+            }
+            if (p.params.minDate && targetDate < new Date(p.params.minDate).getTime()) {
+                return false;
+            }
+            var currentDate = new Date(p.currentYear, p.currentMonth).getTime();
+            var dir = targetDate > currentDate ? 'next' : 'prev';
+            var newMonthHTML = p.monthHTML(new Date(year, month));
+            p.monthsTranslate = p.monthsTranslate || 0;
+            var prevTranslate = p.monthsTranslate;
+            var monthTranslate, wrapperTranslate;
+            var transitionEndCallback = p.animating ? false : true;
+            if (targetDate > currentDate) {
+                // To next
+                p.monthsTranslate --;
+                if (!p.animating) p.months.eq(p.months.length - 1).remove();
+                p.wrapper.append(newMonthHTML);
+                p.months = p.wrapper.find('.picker-calendar-month');
+                monthTranslate = -(prevTranslate - 1) * 100 * inverter;
+                p.months.eq(p.months.length - 1).transform('translate3d(' + (p.isH ? monthTranslate : 0) + '%, ' + (p.isH ? 0 : monthTranslate) + '%, 0)').addClass('picker-calendar-month-next');
+            }
+            else {
+                // To prev
+                p.monthsTranslate ++;
+                if (!p.animating) p.months.eq(0).remove();
+                p.wrapper.prepend(newMonthHTML);
+                p.months = p.wrapper.find('.picker-calendar-month');
+                monthTranslate = -(prevTranslate + 1) * 100 * inverter;
+                p.months.eq(0).transform('translate3d(' + (p.isH ? monthTranslate : 0) + '%, ' + (p.isH ? 0 : monthTranslate) + '%, 0)').addClass('picker-calendar-month-prev');
+            }
+            if (p.params.onMonthAdd) {
+                p.params.onMonthAdd(p, dir === 'next' ? p.months.eq(p.months.length - 1)[0] : p.months.eq(0)[0]);
+            }
+            p.animating = true;
+            p.onMonthChangeStart(dir);
+            wrapperTranslate = (p.monthsTranslate * 100) * inverter;
+            p.wrapper.transition(transition).transform('translate3d(' + (p.isH ? wrapperTranslate : 0) + '%, ' + (p.isH ? 0 : wrapperTranslate) + '%, 0)');
+            if (transitionEndCallback) {
+                p.wrapper.transitionEnd(function () {
+                    p.onMonthChangeEnd(dir, true);
+                });
+            }
+            if (!p.params.animate) {
+                p.onMonthChangeEnd(dir);
+            }
+        };
+        p.nextYear = function () {
+            p.setYearMonth(p.currentYear + 1);
+        };
+        p.prevYear = function () {
+            p.setYearMonth(p.currentYear - 1);
+        };
+
+
+        // HTML Layout
+        p.layout = function () {
+            var pickerHTML = '';
+            var pickerClass = '';
+            var i;
+
+            var layoutDate = p.value && p.value.length ? p.value[0] : new Date().setHours(0,0,0,0);
+            var prevMonthHTML = p.monthHTML(layoutDate, 'prev');
+            var currentMonthHTML = p.monthHTML(layoutDate);
+            var nextMonthHTML = p.monthHTML(layoutDate, 'next');
+            var monthsHTML = '<div class="picker-calendar-months"><div class="picker-calendar-months-wrapper">' + (prevMonthHTML + currentMonthHTML + nextMonthHTML) + '</div></div>';
+            // Week days header
+            var weekHeaderHTML = '';
+            if (p.params.weekHeader) {
+                for (i = 0; i < 7; i++) {
+                    var weekDayIndex = (i + p.params.firstDay > 6) ? (i - 7 + p.params.firstDay) : (i + p.params.firstDay);
+                    var dayName = p.params.dayNamesShort[weekDayIndex];
+                    weekHeaderHTML += '<div class="picker-calendar-week-day ' + ((p.params.weekendDays.indexOf(weekDayIndex) >= 0) ? 'picker-calendar-week-day-weekend' : '') + '"> ' + dayName + '</div>';
+
+                }
+                weekHeaderHTML = '<div class="picker-calendar-week-days">' + weekHeaderHTML + '</div>';
+            }
+            pickerClass = 'weui-picker-calendar ' + (p.params.cssClass || '');
+            if(!p.inline) pickerClass = 'weui-picker-modal ' + pickerClass;
+            var toolbarHTML = p.params.toolbar ? p.params.toolbarTemplate.replace(/{{closeText}}/g, p.params.toolbarCloseText) : '';
+            if (p.params.toolbar) {
+                toolbarHTML = p.params.toolbarTemplate
+                    .replace(/{{closeText}}/g, p.params.toolbarCloseText)
+                    .replace(/{{monthPicker}}/g, (p.params.monthPicker ? p.params.monthPickerTemplate : ''))
+                    .replace(/{{yearPicker}}/g, (p.params.yearPicker ? p.params.yearPickerTemplate : ''));
+            }
+
+            pickerHTML =
+                '<div class="' + (pickerClass) + '">' +
+                toolbarHTML +
+                '<div class="picker-modal-inner">' +
+                weekHeaderHTML +
+                monthsHTML +
+                '</div>' +
+                '</div>';
+
+
+            p.pickerHTML = pickerHTML;
+        };
+
+        // Input Events
+        function openOnInput(e) {
+            e.preventDefault();
+            if (p.opened) return;
+            p.open();
+            if (p.params.scrollToInput && !isPopover()) {
+                var pageContent = p.input.parents('.page-content');
+                if (pageContent.length === 0) return;
+
+                var paddingTop = parseInt(pageContent.css('padding-top'), 10),
+                    paddingBottom = parseInt(pageContent.css('padding-bottom'), 10),
+                    pageHeight = pageContent[0].offsetHeight - paddingTop - p.container.height(),
+                    pageScrollHeight = pageContent[0].scrollHeight - paddingTop - p.container.height(),
+                    newPaddingBottom;
+
+                var inputTop = p.input.offset().top - paddingTop + p.input[0].offsetHeight;
+                if (inputTop > pageHeight) {
+                    var scrollTop = pageContent.scrollTop() + inputTop - pageHeight;
+                    if (scrollTop + pageHeight > pageScrollHeight) {
+                        newPaddingBottom = scrollTop + pageHeight - pageScrollHeight + paddingBottom;
+                        if (pageHeight === pageScrollHeight) {
+                            newPaddingBottom = p.container.height();
+                        }
+                        pageContent.css({'padding-bottom': (newPaddingBottom) + 'px'});
+                    }
+                    pageContent.scrollTop(scrollTop, 300);
+                }
+            }
+        }
+        function closeOnHTMLClick(e) {
+            if (inPopover()) return;
+            if (p.input && p.input.length > 0) {
+                if (e.target !== p.input[0] && $(e.target).parents('.weui-picker-modal').length === 0) p.close();
+            }
+            else {
+                if ($(e.target).parents('.weui-picker-modal').length === 0) p.close();
+            }
+        }
+
+        if (p.params.input) {
+            p.input = $(p.params.input);
+            if (p.input.length > 0) {
+                if (p.params.inputReadOnly) p.input.prop('readOnly', true);
+                if (!p.inline) {
+                    p.input.on('click tap', openOnInput);
+                }
+                if (p.params.inputReadOnly) {
+                    p.input.on('focus mousedown', function (e) {
+                        e.preventDefault();
+                    });
+                }
+            }
+
+        }
+
+        //iphone 上无法正确触发 click，会导致点击外面无法关闭
+        if (!p.inline) $(document).on('click touchend', closeOnHTMLClick);
+
+        // Open
+        function onPickerClose() {
+            p.opened = false;
+            if (p.input && p.input.length > 0) p.input.parents('.page-content').css({'padding-bottom': ''});
+            if (p.params.onClose) p.params.onClose(p);
+
+            // Destroy events
+            p.destroyCalendarEvents();
+        }
+
+        p.opened = false;
+        p.open = function () {
+            var toPopover = isPopover() && false;
+            var updateValue = false;
+            if (!p.opened) {
+                // Set date value
+                if (!p.value) {
+                    if (p.params.value) {
+                        p.value = p.params.value;
+                        updateValue = true;
+                    }
+                }
+
+                // Layout
+                p.layout();
+
+                // Append
+                if (toPopover) {
+                    p.pickerHTML = '<div class="popover popover-picker-calendar"><div class="popover-inner">' + p.pickerHTML + '</div></div>';
+                    p.popover = $.popover(p.pickerHTML, p.params.input, true);
+                    p.container = $(p.popover).find('.weui-picker-modal');
+                    $(p.popover).on('close', function () {
+                        onPickerClose();
+                    });
+                }
+                else if (p.inline) {
+                    p.container = $(p.pickerHTML);
+                    p.container.addClass('picker-modal-inline');
+                    $(p.params.container).append(p.container);
+                }
+                else {
+                    p.container = $($.openPicker(p.pickerHTML));
+                    $(p.container)
+                        .on('close', function () {
+                            onPickerClose();
+                        });
+                }
+
+                // Store calendar instance
+                p.container[0].f7Calendar = p;
+                p.wrapper = p.container.find('.picker-calendar-months-wrapper');
+
+                // Months
+                p.months = p.wrapper.find('.picker-calendar-month');
+
+                // Update current month and year
+                p.updateCurrentMonthYear();
+
+                // Set initial translate
+                p.monthsTranslate = 0;
+                p.setMonthsTranslate();
+
+                // Init events
+                p.initCalendarEvents();
+
+                // Update input value
+                if (updateValue) p.updateValue();
+
+            }
+
+            // Set flag
+            p.opened = true;
+            p.initialized = true;
+            if (p.params.onMonthAdd) {
+                p.months.each(function () {
+                    p.params.onMonthAdd(p, this);
+                });
+            }
+            if (p.params.onOpen) p.params.onOpen(p);
+        };
+
+        // Close
+        p.close = function () {
+            if (!p.opened || p.inline) return;
+            p.animating = false;  //有可能还有动画没做完，因此animating设置还没改。
+            if (inPopover()) {
+                $.closePicker(p.popover);
+                return;
+            }
+            else {
+                $.closePicker(p.container);
+                return;
+            }
+        };
+
+        // Destroy
+        p.destroy = function () {
+            p.close();
+            if (p.params.input && p.input.length > 0) {
+                p.input.off('click focus', openOnInput);
+                p.input.data("calendar", null);
+            }
+            $('html').off('click', closeOnHTMLClick);
+        };
+
+        if (p.inline) {
+            p.open();
+        }
+
+        return p;
+    };
+
+    var format = function(d) {
+        return d < 10 ? "0"+d : d;
+    }
+
+
+    $.fn.calendar = function (params, args) {
+        params = params || {};
+        return this.each(function() {
+            var $this = $(this);
+            if(!$this[0]) return;
+            var p = {};
+            if($this[0].tagName.toUpperCase() === "INPUT") {
+                p.input = $this;
+            } else {
+                p.container = $this;
+            }
+
+            var calendar = $this.data("calendar");
+
+            if(!calendar) {
+                if(typeof params === typeof "a") {
+                } else {
+                    if(!params.value && $this.val()) params.value = [$this.val()];
+                    //默认显示今天
+                    if(!params.value) {
+                        var today = new Date();
+                        params.value = [today.getFullYear() + "/" + format(today.getMonth() + 1) + "/" + format(today.getDate())];
+                    }
+                    calendar = $this.data("calendar", new Calendar($.extend(p, params)));
+                }
+            }
+
+            if(typeof params === typeof "a") {
+                calendar[params].call(calendar, args);
+            }
+        });
+    };
+
+    defaults = $.fn.calendar.prototype.defaults = {
+        value: undefined, // 通过JS赋值，注意是数组
+        monthNames: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月'],
+        monthNamesShort: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月'],
+        dayNames: ['周日', '周一', '周二', '周三', '周四', '周五', '周六'],
+        dayNamesShort: ['周日', '周一', '周二', '周三', '周四', '周五', '周六'],
+        firstDay: 1, // First day of the week, Monday
+        weekendDays: [0, 6], // Sunday and Saturday
+        multiple: false,
+        dateFormat: 'yyyy/mm/dd',
+        direction: 'horizontal', // or 'vertical'
+        minDate: null,
+        maxDate: null,
+        touchMove: true,
+        animate: true,
+        closeOnSelect: true,
+        monthPicker: true,
+        monthPickerTemplate:
+        '<div class="picker-calendar-month-picker">' +
+        '<a href="javascript:;" class="link icon-only picker-calendar-prev-month"><i class="icon icon-prev"></i></a>' +
+        '<div class="current-month-value"></div>' +
+        '<a href="javascript:;" class="link icon-only picker-calendar-next-month"><i class="icon icon-next"></i></a>' +
+        '</div>',
+        yearPicker: true,
+        yearPickerTemplate:
+        '<div class="picker-calendar-year-picker">' +
+        '<a href="javascript:;" class="link icon-only picker-calendar-prev-year"><i class="icon icon-prev"></i></a>' +
+        '<span class="current-year-value"></span>' +
+        '<a href="javascript:;" class="link icon-only picker-calendar-next-year"><i class="icon icon-next"></i></a>' +
+        '</div>',
+        weekHeader: true,
+        // Common settings
+        scrollToInput: true,
+        inputReadOnly: true,
+        convertToPopover: true,
+        onlyInPopover: false,
+        toolbar: true,
+        toolbarCloseText: 'Done',
+        toolbarTemplate:
+        '<div class="toolbar">' +
+        '<div class="toolbar-inner">' +
+        '{{yearPicker}}' +
+        '{{monthPicker}}' +
+        // '<a href="#" class="link close-picker">{{closeText}}</a>' +
+        '</div>' +
+        '</div>',
+        /* Callbacks
+    onMonthAdd
+    onChange
+    onOpen
+    onClose
+    onDayClick
+    onMonthYearChangeStart
+    onMonthYearChangeEnd
+    */
+    };
+
+}($);
+
+/* global $:true */
+/* jshint unused:false*/
+
++ function($) {
+    "use strict";
+
+
+    var defaults;
+
+    var formatNumber = function (n) {
+        return n < 10 ? "0" + n : n;
+    }
+
+    var Datetime = function(input, params) {
+        this.input = $(input);
+        this.params = params || {};
+
+        this.initMonthes = params.monthes
+
+        this.initYears = params.years
+
+        var p = $.extend({}, params, this.getConfig());
+        $(this.input).picker(p);
+    }
+
+    Datetime.prototype = {
+        getDays : function(max) {
+            var days = [];
+            for(var i=1; i<= (max||31);i++) {
+                days.push(i < 10 ? "0"+i : i);
+            }
+            return days;
+        },
+
+        getDaysByMonthAndYear : function(month, year) {
+            var int_d = new Date(year, parseInt(month)+1-1, 1);
+            var d = new Date(int_d - 1);
+            return this.getDays(d.getDate());
+        },
+        getConfig: function() {
+            var today = new Date(),
+                params = this.params,
+                self = this,
+                lastValidValues;
+
+            var config = {
+                rotateEffect: false,  //为了性能
+                cssClass: 'datetime-picker',
+
+                value: [today.getFullYear(), formatNumber(today.getMonth()+1), formatNumber(today.getDate()), formatNumber(today.getHours()), (formatNumber(today.getMinutes()))],
+
+                onChange: function (picker, values, displayValues) {
+                    var cols = picker.cols;
+                    var days = self.getDaysByMonthAndYear(values[1], values[0]);
+                    var currentValue = values[2];
+                    if(currentValue > days.length) currentValue = days.length;
+                    picker.cols[4].setValue(currentValue);
+
+                    //check min and max
+                    var current = new Date(values[0]+'-'+values[1]+'-'+values[2]);
+                    var valid = true;
+                    if(params.min) {
+                        var min = new Date(typeof params.min === "function" ? params.min() : params.min);
+
+                        if(current < +min) {
+                            picker.setValue(lastValidValues);
+                            valid = false;
+                        }
+                    }
+                    if(params.max) {
+                        var max = new Date(typeof params.max === "function" ? params.max() : params.max);
+                        if(current > +max) {
+                            picker.setValue(lastValidValues);
+                            valid = false;
+                        }
+                    }
+
+                    valid && (lastValidValues = values);
+
+                    if (self.params.onChange) {
+                        self.params.onChange.apply(this, arguments);
+                    }
+                },
+
+                formatValue: function (p, values, displayValues) {
+                    return self.params.format(p, values, displayValues);
+                },
+
+                cols: [
+                    {
+                        values: this.initYears
+                    },
+                    {
+                        divider: true,  // 这是一个分隔符
+                        content: params.yearSplit
+                    },
+                    {
+                        values: this.initMonthes
+                    },
+                    {
+                        divider: true,  // 这是一个分隔符
+                        content: params.monthSplit
+                    },
+                    {
+                        values: (function () {
+                            var dates = [];
+                            for (var i=1; i<=31; i++) dates.push(formatNumber(i));
+                            return dates;
+                        })()
+                    },
+
+                ]
+            }
+
+            if (params.dateSplit) {
+                config.cols.push({
+                    divider: true,
+                    content: params.dateSplit
+                })
+            }
+
+            config.cols.push({
+                divider: true,
+                content: params.datetimeSplit
+            })
+
+            var times = self.params.times();
+            if (times && times.length) {
+                config.cols = config.cols.concat(times);
+            }
+
+            var inputValue = this.input.val();
+            if(inputValue) config.value = params.parse(inputValue);
+            if(this.params.value) {
+                this.input.val(this.params.value);
+                config.value = params.parse(this.params.value);
+            }
+
+            return config;
+        }
+    }
+
+    $.fn.datetimePicker = function(params) {
+        params = $.extend({}, defaults, params);
+        return this.each(function() {
+            if(!this) return;
+            var $this = $(this);
+            var datetime = $this.data("datetime");
+            if(!datetime) $this.data("datetime", new Datetime(this, params));
+            return datetime;
+        });
+    };
+
+    defaults = $.fn.datetimePicker.prototype.defaults = {
+        input: undefined, // 默认值
+        min: undefined, // YYYY-MM-DD 最大最小值只比较年月日，不比较时分秒
+        max: undefined,  // YYYY-MM-DD
+        yearSplit: '-',
+        monthSplit: '-',
+        dateSplit: '',  // 默认为空
+        datetimeSplit: ' ',  // 日期和时间之间的分隔符，不可为空
+        monthes: ('01 02 03 04 05 06 07 08 09 10 11 12').split(' '),
+        years: (function () {
+            var arr = [];
+            for (var i = 1950; i <= 2030; i++) { arr.push(i); }
+            return arr;
+        })(),
+        times: function () {
+            return [  // 自定义的时间
+                {
+                    values: (function () {
+                        var hours = [];
+                        for (var i=0; i<24; i++) hours.push(formatNumber(i));
+                        return hours;
+                    })()
+                },
+                {
+                    divider: true,  // 这是一个分隔符
+                    content: ':'
+                },
+                {
+                    values: (function () {
+                        var minutes = [];
+                        for (var i=0; i<60; i++) minutes.push(formatNumber(i));
+                        return minutes;
+                    })()
+                }
+            ];
+        },
+        format: function (p, values) { // 数组转换成字符串
+            return p.cols.map(function (col) {
+                return col.value || col.content;
+            }).join('');
+        },
+        parse: function (str) {
+            // 把字符串转换成数组，用来解析初始值
+            // 如果你的定制的初始值格式无法被这个默认函数解析，请自定义这个函数。比如你的时间是 '子时' 那么默认情况这个'时'会被当做分隔符而导致错误，所以你需要自己定义parse函数
+            // 默认兼容的分隔符
+            var t = str.split(this.datetimeSplit);
+            return t[0].split(/\D/).concat(t[1].split(/:|时|分|秒/)).filter(function (d) {
+                return !!d;
+            })
+        }
+    }
+
+}($);
+
+/*======================================================
+************   Picker   ************
+======================================================*/
+/* global $:true */
+
++ function($) {
+    "use strict";
+
+
+    //Popup 和 picker 之类的不要共用一个弹出方法，因为这样会导致 在 popup 中再弹出 picker 的时候会有问题。
+
+    $.openPopup = function(popup, className) {
+
+        $.closePopup();
+
+        popup = $(popup);
+        popup.show();
+        popup.width();
+        popup.addClass("weui-popup__container--visible");
+        var modal = popup.find(".weui-popup__modal");
+        modal.width();
+        modal.transitionEnd(function() {
+            modal.trigger("open");
+        });
+    }
+
+
+    $.closePopup = function(container, remove) {
+        container = $(container || ".weui-popup__container--visible");
+        container.find('.weui-popup__modal').transitionEnd(function() {
+            var $this = $(this);
+            $this.trigger("close");
+            container.hide();
+            remove && container.remove();
+        })
+        container.removeClass("weui-popup__container--visible")
+    };
+
+
+    $(document).on("click tap", ".close-popup, .weui-popup__overlay", function() {
+        $.closePopup();
+    })
+        .on("click tap", ".open-popup", function() {
+            $($(this).data("target")).popup();
+        })
+        .on("click tap", ".weui-popup__container", function(e) {
+            if($(e.target).hasClass("weui-popup__container")) $.closePopup();
+        })
+
+    $.fn.popup = function() {
+        return this.each(function() {
+            $.openPopup(this);
+        });
+    };
+
+}($);
+
+/* ===============================================================================
+************   Notification ************
+=============================================================================== */
+/* global $:true */
++function ($) {
+    "use strict";
+
+    var noti, defaults, timeout, start, diffX, diffY;
+
+    var touchStart = function(e) {
+        var p = $.getTouchPosition(e);
+        start = p;
+        diffX = diffY = 0;
+        noti.addClass("touching");
+    };
+    var touchMove = function(e) {
+        if(!start) return false;
+        e.preventDefault();
+        e.stopPropagation();
+        var p = $.getTouchPosition(e);
+        diffX = p.x - start.x;
+        diffY = p.y - start.y;
+        if(diffY > 0) {
+            diffY = Math.sqrt(diffY);
+        }
+
+        noti.css("transform", "translate3d(0, "+diffY+"px, 0)");
+    };
+    var touchEnd = function() {
+        noti.removeClass("touching");
+        noti.attr("style", "");
+        if(diffY < 0 && (Math.abs(diffY) > noti.height()*0.38)) {
+            $.closeNotification();
+        }
+
+        if(Math.abs(diffX) <= 1 && Math.abs(diffY) <= 1) {
+            noti.trigger("noti-click");
+        }
+
+        start = false;
+    };
+
+    var attachEvents = function(el) {
+        el.on($.touchEvents.start, touchStart);
+        el.on($.touchEvents.move, touchMove);
+        el.on($.touchEvents.end, touchEnd);
+    };
+
+    $.notification = $.noti = function(params) {
+        params = $.extend({}, defaults, params);
+        noti = $(".weui-notification");
+        if(!noti[0]) { // create a new notification
+            noti = $('<div class="weui-notification"></div>').appendTo(document.body);
+            attachEvents(noti);
+        }
+
+        noti.off("noti-click"); //the click event is not correct sometime: it will trigger when user is draging.
+        if(params.onClick) noti.on("noti-click", function() {
+            params.onClick(params.data);
+        });
+
+        noti.html($.t7.compile(params.tpl)(params));
+
+        noti.show();
+
+        noti.addClass("weui-notification--in");
+        noti.data("params", params);
+
+        var startTimeout = function() {
+            if(timeout) {
+                clearTimeout(timeout);
+                timeout = null;
+            }
+
+            timeout = setTimeout(function() {
+                if(noti.hasClass("weui-notification--touching")) {
+                    startTimeout();
+                } else {
+                    $.closeNotification();
+                }
+            }, params.time);
+        };
+
+        startTimeout();
+
+    };
+
+    $.closeNotification = function() {
+        timeout && clearTimeout(timeout);
+        timeout = null;
+        var noti = $(".weui-notification").removeClass("weui-notification--in").transitionEnd(function() {
+            $(this).remove();
+        });
+
+        if(noti[0]) {
+            var params = $(".weui-notification").data("params");
+            if(params && params.onClose) {
+                params.onClose(params.data);
+            }
+        }
+    };
+
+    defaults = $.noti.prototype.defaults = {
+        title: undefined,
+        text: undefined,
+        media: undefined,
+        time: 4000,
+        onClick: undefined,
+        onClose: undefined,
+        data: undefined,
+        tpl:  '<div class="weui-notification__inner">' +
+        '{{#if media}}<div class="weui-notification__media">{{media}}</div>{{/if}}' +
+        '<div class="weui-notification__content">' +
+        '{{#if title}}<div class="weui-notification__title">{{title}}</div>{{/if}}' +
+        '{{#if text}}<div class="weui-notification__text">{{text}}</div>{{/if}}' +
+        '</div>' +
+        '<div class="weui-notification__handle-bar"></div>' +
+        '</div>'
+    };
+
+}($);
+
++ function($) {
+    "use strict";
+
+    var timeout;
+
+    $.toptip = function(text, duration, type) {
+        if(!text) return;
+        if(typeof duration === typeof "a") {
+            type = duration;
+            duration = undefined;
+        }
+        duration = duration || 3000;
+        var className = type ? 'bg-' + type : 'bg-danger';
+        var $t = $('.weui-toptips').remove();
+        $t = $('<div class="weui-toptips"></div>').appendTo(document.body);
+        $t.html(text);
+        $t[0].className = 'weui-toptips ' + className
+
+        clearTimeout(timeout);
+
+        if(!$t.hasClass('weui-toptips_visible')) {
+            $t.show().width();
+            $t.addClass('weui-toptips_visible');
+        }
+
+        timeout = setTimeout(function() {
+
+                $(".weui-toptips_visible").remove();
+
+        }, duration);
+    }
+}($);
+
+/* ===============================================================================
+************   Swipeout ************
+=============================================================================== */
+/* global $:true */
+
++function ($) {
+    "use strict";
+
+    var cache = [];
+    var TOUCHING = 'swipeout-touching'
+
+    var Swipeout = function(el) {
+        this.container = $(el);
+        this.mover = this.container.find('>.weui-cell__bd')
+        this.attachEvents();
+        cache.push(this)
+    }
+
+    Swipeout.prototype.touchStart = function(e) {
+        var p = $.getTouchPosition(e);
+        this.container.addClass(TOUCHING);
+        this.start = p;
+        this.startX = 0;
+        this.startTime = + new Date;
+        var transform =  this.mover.css('transform').match(/-?[\d\.]+/g)
+        if (transform && transform.length) this.startX = parseInt(transform[4])
+        this.diffX = this.diffY = 0;
+        this._closeOthers()
+        this.limit = this.container.find('>.weui-cell__ft').width() || 68; // 因为有的时候初始化的时候元素是隐藏的（比如在对话框内），所以在touchstart的时候计算宽度而不是初始化的时候
+    };
+
+    Swipeout.prototype.touchMove= function(e) {
+        if(!this.start) return true;
+        var p = $.getTouchPosition(e);
+        this.diffX = p.x - this.start.x;
+        this.diffY = p.y - this.start.y;
+        if (Math.abs(this.diffX) < Math.abs(this.diffY)) { // 说明是上下方向在拖动
+            this.close()
+            this.start = false
+            return true;
+        }
+        e.preventDefault();
+        e.stopPropagation();
+        var x = this.diffX + this.startX
+        if (x > 0) x = 0;
+        if (Math.abs(x) > this.limit) x = - (Math.pow(-(x+this.limit), .7) + this.limit)
+        this.mover.css("transform", "translate3d("+x+"px, 0, 0)");
+    };
+    Swipeout.prototype.touchEnd = function() {
+        if (!this.start) return true;
+        this.start = false;
+        var x = this.diffX + this.startX
+        var t = new Date - this.startTime;
+        if (this.diffX < -5 && t < 200) { // 向左快速滑动，则打开
+            this.open()
+        } else if (this.diffX >= 0 && t < 200) { // 向右快速滑动，或者单击,则关闭
+            this.close()
+        } else if (x > 0 || -x <= this.limit / 2) {
+            this.close()
+        } else {
+            this.open()
+        }
+    };
+
+
+    Swipeout.prototype.close = function() {
+        this.container.removeClass(TOUCHING);
+        this.mover.css("transform", "translate3d(0, 0, 0)");
+        this.container.trigger('swipeout-close');
+    }
+
+    Swipeout.prototype.open = function() {
+        this.container.removeClass(TOUCHING);
+        this._closeOthers()
+        this.mover.css("transform", "translate3d(" + (-this.limit) + "px, 0, 0)");
+        this.container.trigger('swipeout-open');
+    }
+
+    Swipeout.prototype.attachEvents = function() {
+        var el = this.mover;
+        el.on($.touchEvents.start, $.proxy(this.touchStart, this));
+        el.on($.touchEvents.move, $.proxy(this.touchMove, this));
+        el.on($.touchEvents.end, $.proxy(this.touchEnd, this));
+    }
+    Swipeout.prototype._closeOthers = function() {
+        //close others
+        var self = this
+        cache.forEach(function (s) {
+            if (s !== self) s.close()
+        })
+    }
+
+    var swipeout = function(el) {
+        return new Swipeout(el);
+    };
+
+    $.fn.swipeout = function (arg) {
+        return this.each(function() {
+            var $this = $(this)
+            var s = $this.data('swipeout') || swipeout(this);
+            $this.data('swipeout', s);
+
+            if (typeof arg === typeof 'a') {
+                s[arg]()
+            }
+        });
+    }
+
+    $('.weui-cell_swiped').swipeout() // auto init
+}($);
+//tab
+(function ($) {
+    var oldFnTab = $.fn.tab;
+    $.fn.tab = function (options) {
+        options = $.extend({defaultIndex: 0, activeClass: 'weui-bar__item_on', onToggle: $.noop}, options);
+        const $tabbarItems = this.find('.weui-tabbar__item, .weui-navbar__item');
+        const $tabBdItems = this.find('.weui-tab__content');
+        this.toggle = function (index) {
+            const $defaultTabbarItem = $tabbarItems.eq(index);
+            $defaultTabbarItem.addClass(options.activeClass).siblings().removeClass(options.activeClass);
+            const $defaultTabBdItem = $tabBdItems.eq(index);
+            $defaultTabBdItem.fadeIn().siblings().fadeOut();
+            options.onToggle(index);
+        };
+        const self = this;
+        this.on('click tap', '.weui-tabbar__item, .weui-navbar__item', function (e) {
+            const index = $(this).index();
+            self.toggle(index);
+        });
+        this.toggle(options.defaultIndex);
+        return this;
+    };
+    $.fn.tab.noConflict = function () {
+        return oldFnTab;
+    };
+})($);
+function share(){
+    var sharetpl='<div class="weui-share" onclick="$(this).remove();">\n' +
+        '<div class="weui-share-box">\n' +
+        '点击右上角发送给指定朋友或分享到朋友圈 <i></i>\n' +
+        '</div>\n' +
+        '</div>';
+    var sharetpl = $.t7.compile(sharetpl);
+    $("body").append(sharetpl());
+
+}
+$(function(){
+    var weixinimg=[];var weixinsrc=[];weixinimg=$('.weixin');for(var i=0;i<weixinimg.length;i++){weixinsrc[i]=weixinimg[i].src;};$('.weixin').click(function(){var index=$('.weixin').index(this);wx.previewImage({current:weixinsrc[index],urls:weixinsrc});});
+});
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/static/resources/json/city.json b/pluss-wap-page/src/main/resources/static/resources/json/city.json
new file mode 100644
index 0000000..3519721
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/static/resources/json/city.json
@@ -0,0 +1,14378 @@
+{
+	"locationList": [{
+			"code": "110000",
+			"name": "北京市",
+			"childs": [{
+				"code": "110100",
+				"name": "北京市",
+				"childs": [{
+						"code": "110101",
+						"name": "东城区"
+					},
+					{
+						"code": "110102",
+						"name": "西城区"
+					},
+					{
+						"code": "110105",
+						"name": "朝阳区"
+					},
+					{
+						"code": "110106",
+						"name": "丰台区"
+					},
+					{
+						"code": "110107",
+						"name": "石景山区"
+					},
+					{
+						"code": "110108",
+						"name": "海淀区"
+					},
+					{
+						"code": "110109",
+						"name": "门头沟区"
+					},
+					{
+						"code": "110111",
+						"name": "房山区"
+					},
+					{
+						"code": "110112",
+						"name": "通州区"
+					},
+					{
+						"code": "110113",
+						"name": "顺义区"
+					},
+					{
+						"code": "110114",
+						"name": "昌平区"
+					},
+					{
+						"code": "110115",
+						"name": "大兴区"
+					},
+					{
+						"code": "110116",
+						"name": "怀柔区"
+					},
+					{
+						"code": "110117",
+						"name": "平谷区"
+					},
+					{
+						"code": "110118",
+						"name": "密云区"
+					},
+					{
+						"code": "110119",
+						"name": "延庆区"
+					}
+				]
+			}]
+		},
+		{
+			"code": "120000",
+			"name": "天津市",
+			"childs": [{
+				"code": "120100",
+				"name": "天津市",
+				"childs": [{
+						"code": "120101",
+						"name": "和平区"
+					},
+					{
+						"code": "120102",
+						"name": "河东区"
+					},
+					{
+						"code": "120103",
+						"name": "河西区"
+					},
+					{
+						"code": "120104",
+						"name": "南开区"
+					},
+					{
+						"code": "120105",
+						"name": "河北区"
+					},
+					{
+						"code": "120106",
+						"name": "红桥区"
+					},
+					{
+						"code": "120110",
+						"name": "东丽区"
+					},
+					{
+						"code": "120111",
+						"name": "西青区"
+					},
+					{
+						"code": "120112",
+						"name": "津南区"
+					},
+					{
+						"code": "120113",
+						"name": "北辰区"
+					},
+					{
+						"code": "120114",
+						"name": "武清区"
+					},
+					{
+						"code": "120115",
+						"name": "宝坻区"
+					},
+					{
+						"code": "120116",
+						"name": "滨海新区"
+					},
+					{
+						"code": "120117",
+						"name": "宁河区"
+					},
+					{
+						"code": "120118",
+						"name": "静海区"
+					},
+					{
+						"code": "120119",
+						"name": "蓟州区"
+					}
+				]
+			}]
+		},
+		{
+			"code": "130000",
+			"name": "河北省",
+			"childs": [{
+					"code": "130100",
+					"name": "石家庄市",
+					"childs": [{
+							"code": "130102",
+							"name": "长安区"
+						},
+						{
+							"code": "130104",
+							"name": "桥西区"
+						},
+						{
+							"code": "130105",
+							"name": "新华区"
+						},
+						{
+							"code": "130107",
+							"name": "井陉矿区"
+						},
+						{
+							"code": "130108",
+							"name": "裕华区"
+						},
+						{
+							"code": "130109",
+							"name": "藁城区"
+						},
+						{
+							"code": "130110",
+							"name": "鹿泉区"
+						},
+						{
+							"code": "130111",
+							"name": "栾城区"
+						},
+						{
+							"code": "130121",
+							"name": "井陉县"
+						},
+						{
+							"code": "130123",
+							"name": "正定县"
+						},
+						{
+							"code": "130125",
+							"name": "行唐县"
+						},
+						{
+							"code": "130126",
+							"name": "灵寿县"
+						},
+						{
+							"code": "130127",
+							"name": "高邑县"
+						},
+						{
+							"code": "130128",
+							"name": "深泽县"
+						},
+						{
+							"code": "130129",
+							"name": "赞皇县"
+						},
+						{
+							"code": "130130",
+							"name": "无极县"
+						},
+						{
+							"code": "130131",
+							"name": "平山县"
+						},
+						{
+							"code": "130132",
+							"name": "元氏县"
+						},
+						{
+							"code": "130133",
+							"name": "赵县"
+						},
+						{
+							"code": "130181",
+							"name": "辛集市"
+						},
+						{
+							"code": "130183",
+							"name": "晋州市"
+						},
+						{
+							"code": "130184",
+							"name": "新乐市"
+						}
+					]
+				},
+				{
+					"code": "130200",
+					"name": "唐山市",
+					"childs": [{
+							"code": "130202",
+							"name": "路南区"
+						},
+						{
+							"code": "130203",
+							"name": "路北区"
+						},
+						{
+							"code": "130204",
+							"name": "古冶区"
+						},
+						{
+							"code": "130205",
+							"name": "开平区"
+						},
+						{
+							"code": "130207",
+							"name": "丰南区"
+						},
+						{
+							"code": "130208",
+							"name": "丰润区"
+						},
+						{
+							"code": "130209",
+							"name": "曹妃甸区"
+						},
+						{
+							"code": "130224",
+							"name": "滦南县"
+						},
+						{
+							"code": "130225",
+							"name": "乐亭县"
+						},
+						{
+							"code": "130227",
+							"name": "迁西县"
+						},
+						{
+							"code": "130229",
+							"name": "玉田县"
+						},
+						{
+							"code": "130281",
+							"name": "遵化市"
+						},
+						{
+							"code": "130283",
+							"name": "迁安市"
+						},
+						{
+							"code": "130284",
+							"name": "滦州市"
+						}
+					]
+				},
+				{
+					"code": "130300",
+					"name": "秦皇岛市",
+					"childs": [{
+							"code": "130302",
+							"name": "海港区"
+						},
+						{
+							"code": "130303",
+							"name": "山海关区"
+						},
+						{
+							"code": "130304",
+							"name": "北戴河区"
+						},
+						{
+							"code": "130306",
+							"name": "抚宁区"
+						},
+						{
+							"code": "130321",
+							"name": "青龙满族自治县"
+						},
+						{
+							"code": "130322",
+							"name": "昌黎县"
+						},
+						{
+							"code": "130324",
+							"name": "卢龙县"
+						}
+					]
+				},
+				{
+					"code": "130400",
+					"name": "邯郸市",
+					"childs": [{
+							"code": "130402",
+							"name": "邯山区"
+						},
+						{
+							"code": "130403",
+							"name": "丛台区"
+						},
+						{
+							"code": "130404",
+							"name": "复兴区"
+						},
+						{
+							"code": "130406",
+							"name": "峰峰矿区"
+						},
+						{
+							"code": "130407",
+							"name": "肥乡区"
+						},
+						{
+							"code": "130408",
+							"name": "永年区"
+						},
+						{
+							"code": "130423",
+							"name": "临漳县"
+						},
+						{
+							"code": "130424",
+							"name": "成安县"
+						},
+						{
+							"code": "130425",
+							"name": "大名县"
+						},
+						{
+							"code": "130426",
+							"name": "涉县"
+						},
+						{
+							"code": "130427",
+							"name": "磁县"
+						},
+						{
+							"code": "130430",
+							"name": "邱县"
+						},
+						{
+							"code": "130431",
+							"name": "鸡泽县"
+						},
+						{
+							"code": "130432",
+							"name": "广平县"
+						},
+						{
+							"code": "130433",
+							"name": "馆陶县"
+						},
+						{
+							"code": "130434",
+							"name": "魏县"
+						},
+						{
+							"code": "130435",
+							"name": "曲周县"
+						},
+						{
+							"code": "130481",
+							"name": "武安市"
+						}
+					]
+				},
+				{
+					"code": "130500",
+					"name": "邢台市",
+					"childs": [{
+							"code": "130502",
+							"name": "桥东区"
+						},
+						{
+							"code": "130503",
+							"name": "桥西区"
+						},
+						{
+							"code": "130521",
+							"name": "邢台县"
+						},
+						{
+							"code": "130522",
+							"name": "临城县"
+						},
+						{
+							"code": "130523",
+							"name": "内丘县"
+						},
+						{
+							"code": "130524",
+							"name": "柏乡县"
+						},
+						{
+							"code": "130525",
+							"name": "隆尧县"
+						},
+						{
+							"code": "130526",
+							"name": "任县"
+						},
+						{
+							"code": "130527",
+							"name": "南和县"
+						},
+						{
+							"code": "130528",
+							"name": "宁晋县"
+						},
+						{
+							"code": "130529",
+							"name": "巨鹿县"
+						},
+						{
+							"code": "130530",
+							"name": "新河县"
+						},
+						{
+							"code": "130531",
+							"name": "广宗县"
+						},
+						{
+							"code": "130532",
+							"name": "平乡县"
+						},
+						{
+							"code": "130533",
+							"name": "威县"
+						},
+						{
+							"code": "130534",
+							"name": "清河县"
+						},
+						{
+							"code": "130535",
+							"name": "临西县"
+						},
+						{
+							"code": "130581",
+							"name": "南宫市"
+						},
+						{
+							"code": "130582",
+							"name": "沙河市"
+						}
+					]
+				},
+				{
+					"code": "130600",
+					"name": "保定市",
+					"childs": [{
+							"code": "130602",
+							"name": "竞秀区"
+						},
+						{
+							"code": "130606",
+							"name": "莲池区"
+						},
+						{
+							"code": "130607",
+							"name": "满城区"
+						},
+						{
+							"code": "130608",
+							"name": "清苑区"
+						},
+						{
+							"code": "130609",
+							"name": "徐水区"
+						},
+						{
+							"code": "130623",
+							"name": "涞水县"
+						},
+						{
+							"code": "130624",
+							"name": "阜平县"
+						},
+						{
+							"code": "130626",
+							"name": "定兴县"
+						},
+						{
+							"code": "130627",
+							"name": "唐县"
+						},
+						{
+							"code": "130628",
+							"name": "高阳县"
+						},
+						{
+							"code": "130629",
+							"name": "容城县"
+						},
+						{
+							"code": "130630",
+							"name": "涞源县"
+						},
+						{
+							"code": "130631",
+							"name": "望都县"
+						},
+						{
+							"code": "130632",
+							"name": "安新县"
+						},
+						{
+							"code": "130633",
+							"name": "易县"
+						},
+						{
+							"code": "130634",
+							"name": "曲阳县"
+						},
+						{
+							"code": "130635",
+							"name": "蠡县"
+						},
+						{
+							"code": "130636",
+							"name": "顺平县"
+						},
+						{
+							"code": "130637",
+							"name": "博野县"
+						},
+						{
+							"code": "130638",
+							"name": "雄县"
+						},
+						{
+							"code": "130681",
+							"name": "涿州市"
+						},
+						{
+							"code": "130682",
+							"name": "定州市"
+						},
+						{
+							"code": "130683",
+							"name": "安国市"
+						},
+						{
+							"code": "130684",
+							"name": "高碑店市"
+						}
+					]
+				},
+				{
+					"code": "130700",
+					"name": "张家口市",
+					"childs": [{
+							"code": "130702",
+							"name": "桥东区"
+						},
+						{
+							"code": "130703",
+							"name": "桥西区"
+						},
+						{
+							"code": "130705",
+							"name": "宣化区"
+						},
+						{
+							"code": "130706",
+							"name": "下花园区"
+						},
+						{
+							"code": "130708",
+							"name": "万全区"
+						},
+						{
+							"code": "130709",
+							"name": "崇礼区"
+						},
+						{
+							"code": "130722",
+							"name": "张北县"
+						},
+						{
+							"code": "130723",
+							"name": "康保县"
+						},
+						{
+							"code": "130724",
+							"name": "沽源县"
+						},
+						{
+							"code": "130725",
+							"name": "尚义县"
+						},
+						{
+							"code": "130726",
+							"name": "蔚县"
+						},
+						{
+							"code": "130727",
+							"name": "阳原县"
+						},
+						{
+							"code": "130728",
+							"name": "怀安县"
+						},
+						{
+							"code": "130730",
+							"name": "怀来县"
+						},
+						{
+							"code": "130731",
+							"name": "涿鹿县"
+						},
+						{
+							"code": "130732",
+							"name": "赤城县"
+						}
+					]
+				},
+				{
+					"code": "130800",
+					"name": "承德市",
+					"childs": [{
+							"code": "130802",
+							"name": "双桥区"
+						},
+						{
+							"code": "130803",
+							"name": "双滦区"
+						},
+						{
+							"code": "130804",
+							"name": "鹰手营子矿区"
+						},
+						{
+							"code": "130821",
+							"name": "承德县"
+						},
+						{
+							"code": "130822",
+							"name": "兴隆县"
+						},
+						{
+							"code": "130824",
+							"name": "滦平县"
+						},
+						{
+							"code": "130825",
+							"name": "隆化县"
+						},
+						{
+							"code": "130826",
+							"name": "丰宁满族自治县"
+						},
+						{
+							"code": "130827",
+							"name": "宽城满族自治县"
+						},
+						{
+							"code": "130828",
+							"name": "围场满族蒙古族自治县"
+						},
+						{
+							"code": "130881",
+							"name": "平泉市"
+						}
+					]
+				},
+				{
+					"code": "130900",
+					"name": "沧州市",
+					"childs": [{
+							"code": "130902",
+							"name": "新华区"
+						},
+						{
+							"code": "130903",
+							"name": "运河区"
+						},
+						{
+							"code": "130921",
+							"name": "沧县"
+						},
+						{
+							"code": "130922",
+							"name": "青县"
+						},
+						{
+							"code": "130923",
+							"name": "东光县"
+						},
+						{
+							"code": "130924",
+							"name": "海兴县"
+						},
+						{
+							"code": "130925",
+							"name": "盐山县"
+						},
+						{
+							"code": "130926",
+							"name": "肃宁县"
+						},
+						{
+							"code": "130927",
+							"name": "南皮县"
+						},
+						{
+							"code": "130928",
+							"name": "吴桥县"
+						},
+						{
+							"code": "130929",
+							"name": "献县"
+						},
+						{
+							"code": "130930",
+							"name": "孟村回族自治县"
+						},
+						{
+							"code": "130981",
+							"name": "泊头市"
+						},
+						{
+							"code": "130982",
+							"name": "任丘市"
+						},
+						{
+							"code": "130983",
+							"name": "黄骅市"
+						},
+						{
+							"code": "130984",
+							"name": "河间市"
+						}
+					]
+				},
+				{
+					"code": "131000",
+					"name": "廊坊市",
+					"childs": [{
+							"code": "131002",
+							"name": "安次区"
+						},
+						{
+							"code": "131003",
+							"name": "广阳区"
+						},
+						{
+							"code": "131022",
+							"name": "固安县"
+						},
+						{
+							"code": "131023",
+							"name": "永清县"
+						},
+						{
+							"code": "131024",
+							"name": "香河县"
+						},
+						{
+							"code": "131025",
+							"name": "大城县"
+						},
+						{
+							"code": "131026",
+							"name": "文安县"
+						},
+						{
+							"code": "131028",
+							"name": "大厂回族自治县"
+						},
+						{
+							"code": "131081",
+							"name": "霸州市"
+						},
+						{
+							"code": "131082",
+							"name": "三河市"
+						}
+					]
+				},
+				{
+					"code": "131100",
+					"name": "衡水市",
+					"childs": [{
+							"code": "131102",
+							"name": "桃城区"
+						},
+						{
+							"code": "131103",
+							"name": "冀州区"
+						},
+						{
+							"code": "131121",
+							"name": "枣强县"
+						},
+						{
+							"code": "131122",
+							"name": "武邑县"
+						},
+						{
+							"code": "131123",
+							"name": "武强县"
+						},
+						{
+							"code": "131124",
+							"name": "饶阳县"
+						},
+						{
+							"code": "131125",
+							"name": "安平县"
+						},
+						{
+							"code": "131126",
+							"name": "故城县"
+						},
+						{
+							"code": "131127",
+							"name": "景县"
+						},
+						{
+							"code": "131128",
+							"name": "阜城县"
+						},
+						{
+							"code": "131182",
+							"name": "深州市"
+						}
+					]
+				}
+			]
+		},
+		{
+			"code": "140000",
+			"name": "山西省",
+			"childs": [{
+					"code": "140100",
+					"name": "太原市",
+					"childs": [{
+							"code": "140105",
+							"name": "小店区"
+						},
+						{
+							"code": "140106",
+							"name": "迎泽区"
+						},
+						{
+							"code": "140107",
+							"name": "杏花岭区"
+						},
+						{
+							"code": "140108",
+							"name": "尖草坪区"
+						},
+						{
+							"code": "140109",
+							"name": "万柏林区"
+						},
+						{
+							"code": "140110",
+							"name": "晋源区"
+						},
+						{
+							"code": "140121",
+							"name": "清徐县"
+						},
+						{
+							"code": "140122",
+							"name": "阳曲县"
+						},
+						{
+							"code": "140123",
+							"name": "娄烦县"
+						},
+						{
+							"code": "140181",
+							"name": "古交市"
+						}
+					]
+				},
+				{
+					"code": "140200",
+					"name": "大同市",
+					"childs": [{
+							"code": "140212",
+							"name": "新荣区"
+						},
+						{
+							"code": "140213",
+							"name": "平城区"
+						},
+						{
+							"code": "140214",
+							"name": "云冈区"
+						},
+						{
+							"code": "140215",
+							"name": "云州区"
+						},
+						{
+							"code": "140221",
+							"name": "阳高县"
+						},
+						{
+							"code": "140222",
+							"name": "天镇县"
+						},
+						{
+							"code": "140223",
+							"name": "广灵县"
+						},
+						{
+							"code": "140224",
+							"name": "灵丘县"
+						},
+						{
+							"code": "140225",
+							"name": "浑源县"
+						},
+						{
+							"code": "140226",
+							"name": "左云县"
+						}
+					]
+				},
+				{
+					"code": "140300",
+					"name": "阳泉市",
+					"childs": [{
+							"code": "140302",
+							"name": "城区"
+						},
+						{
+							"code": "140303",
+							"name": "矿区"
+						},
+						{
+							"code": "140311",
+							"name": "郊区"
+						},
+						{
+							"code": "140321",
+							"name": "平定县"
+						},
+						{
+							"code": "140322",
+							"name": "盂县"
+						}
+					]
+				},
+				{
+					"code": "140400",
+					"name": "长治市",
+					"childs": [{
+							"code": "140403",
+							"name": "潞州区"
+						},
+						{
+							"code": "140404",
+							"name": "上党区"
+						},
+						{
+							"code": "140405",
+							"name": "屯留区"
+						},
+						{
+							"code": "140406",
+							"name": "潞城区"
+						},
+						{
+							"code": "140423",
+							"name": "襄垣县"
+						},
+						{
+							"code": "140425",
+							"name": "平顺县"
+						},
+						{
+							"code": "140426",
+							"name": "黎城县"
+						},
+						{
+							"code": "140427",
+							"name": "壶关县"
+						},
+						{
+							"code": "140428",
+							"name": "长子县"
+						},
+						{
+							"code": "140429",
+							"name": "武乡县"
+						},
+						{
+							"code": "140430",
+							"name": "沁县"
+						},
+						{
+							"code": "140431",
+							"name": "沁源县"
+						}
+					]
+				},
+				{
+					"code": "140500",
+					"name": "晋城市",
+					"childs": [{
+							"code": "140502",
+							"name": "城区"
+						},
+						{
+							"code": "140521",
+							"name": "沁水县"
+						},
+						{
+							"code": "140522",
+							"name": "阳城县"
+						},
+						{
+							"code": "140524",
+							"name": "陵川县"
+						},
+						{
+							"code": "140525",
+							"name": "泽州县"
+						},
+						{
+							"code": "140581",
+							"name": "高平市"
+						}
+					]
+				},
+				{
+					"code": "140600",
+					"name": "朔州市",
+					"childs": [{
+							"code": "140602",
+							"name": "朔城区"
+						},
+						{
+							"code": "140603",
+							"name": "平鲁区"
+						},
+						{
+							"code": "140621",
+							"name": "山阴县"
+						},
+						{
+							"code": "140622",
+							"name": "应县"
+						},
+						{
+							"code": "140623",
+							"name": "右玉县"
+						},
+						{
+							"code": "140681",
+							"name": "怀仁市"
+						}
+					]
+				},
+				{
+					"code": "140700",
+					"name": "晋中市",
+					"childs": [{
+							"code": "140702",
+							"name": "榆次区"
+						},
+						{
+							"code": "140721",
+							"name": "榆社县"
+						},
+						{
+							"code": "140722",
+							"name": "左权县"
+						},
+						{
+							"code": "140723",
+							"name": "和顺县"
+						},
+						{
+							"code": "140724",
+							"name": "昔阳县"
+						},
+						{
+							"code": "140725",
+							"name": "寿阳县"
+						},
+						{
+							"code": "140726",
+							"name": "太谷县"
+						},
+						{
+							"code": "140727",
+							"name": "祁县"
+						},
+						{
+							"code": "140728",
+							"name": "平遥县"
+						},
+						{
+							"code": "140729",
+							"name": "灵石县"
+						},
+						{
+							"code": "140781",
+							"name": "介休市"
+						}
+					]
+				},
+				{
+					"code": "140800",
+					"name": "运城市",
+					"childs": [{
+							"code": "140802",
+							"name": "盐湖区"
+						},
+						{
+							"code": "140821",
+							"name": "临猗县"
+						},
+						{
+							"code": "140822",
+							"name": "万荣县"
+						},
+						{
+							"code": "140823",
+							"name": "闻喜县"
+						},
+						{
+							"code": "140824",
+							"name": "稷山县"
+						},
+						{
+							"code": "140825",
+							"name": "新绛县"
+						},
+						{
+							"code": "140826",
+							"name": "绛县"
+						},
+						{
+							"code": "140827",
+							"name": "垣曲县"
+						},
+						{
+							"code": "140828",
+							"name": "夏县"
+						},
+						{
+							"code": "140829",
+							"name": "平陆县"
+						},
+						{
+							"code": "140830",
+							"name": "芮城县"
+						},
+						{
+							"code": "140881",
+							"name": "永济市"
+						},
+						{
+							"code": "140882",
+							"name": "河津市"
+						}
+					]
+				},
+				{
+					"code": "140900",
+					"name": "忻州市",
+					"childs": [{
+							"code": "140902",
+							"name": "忻府区"
+						},
+						{
+							"code": "140921",
+							"name": "定襄县"
+						},
+						{
+							"code": "140922",
+							"name": "五台县"
+						},
+						{
+							"code": "140923",
+							"name": "代县"
+						},
+						{
+							"code": "140924",
+							"name": "繁峙县"
+						},
+						{
+							"code": "140925",
+							"name": "宁武县"
+						},
+						{
+							"code": "140926",
+							"name": "静乐县"
+						},
+						{
+							"code": "140927",
+							"name": "神池县"
+						},
+						{
+							"code": "140928",
+							"name": "五寨县"
+						},
+						{
+							"code": "140929",
+							"name": "岢岚县"
+						},
+						{
+							"code": "140930",
+							"name": "河曲县"
+						},
+						{
+							"code": "140931",
+							"name": "保德县"
+						},
+						{
+							"code": "140932",
+							"name": "偏关县"
+						},
+						{
+							"code": "140981",
+							"name": "原平市"
+						}
+					]
+				},
+				{
+					"code": "141000",
+					"name": "临汾市",
+					"childs": [{
+							"code": "141002",
+							"name": "尧都区"
+						},
+						{
+							"code": "141021",
+							"name": "曲沃县"
+						},
+						{
+							"code": "141022",
+							"name": "翼城县"
+						},
+						{
+							"code": "141023",
+							"name": "襄汾县"
+						},
+						{
+							"code": "141024",
+							"name": "洪洞县"
+						},
+						{
+							"code": "141025",
+							"name": "古县"
+						},
+						{
+							"code": "141026",
+							"name": "安泽县"
+						},
+						{
+							"code": "141027",
+							"name": "浮山县"
+						},
+						{
+							"code": "141028",
+							"name": "吉县"
+						},
+						{
+							"code": "141029",
+							"name": "乡宁县"
+						},
+						{
+							"code": "141030",
+							"name": "大宁县"
+						},
+						{
+							"code": "141031",
+							"name": "隰县"
+						},
+						{
+							"code": "141032",
+							"name": "永和县"
+						},
+						{
+							"code": "141033",
+							"name": "蒲县"
+						},
+						{
+							"code": "141034",
+							"name": "汾西县"
+						},
+						{
+							"code": "141081",
+							"name": "侯马市"
+						},
+						{
+							"code": "141082",
+							"name": "霍州市"
+						}
+					]
+				},
+				{
+					"code": "141100",
+					"name": "吕梁市",
+					"childs": [{
+							"code": "141102",
+							"name": "离石区"
+						},
+						{
+							"code": "141121",
+							"name": "文水县"
+						},
+						{
+							"code": "141122",
+							"name": "交城县"
+						},
+						{
+							"code": "141123",
+							"name": "兴县"
+						},
+						{
+							"code": "141124",
+							"name": "临县"
+						},
+						{
+							"code": "141125",
+							"name": "柳林县"
+						},
+						{
+							"code": "141126",
+							"name": "石楼县"
+						},
+						{
+							"code": "141127",
+							"name": "岚县"
+						},
+						{
+							"code": "141128",
+							"name": "方山县"
+						},
+						{
+							"code": "141129",
+							"name": "中阳县"
+						},
+						{
+							"code": "141130",
+							"name": "交口县"
+						},
+						{
+							"code": "141181",
+							"name": "孝义市"
+						},
+						{
+							"code": "141182",
+							"name": "汾阳市"
+						}
+					]
+				}
+			]
+		},
+		{
+			"code": "150000",
+			"name": "内蒙古自治区",
+			"childs": [{
+					"code": "150100",
+					"name": "呼和浩特市",
+					"childs": [{
+							"code": "150102",
+							"name": "新城区"
+						},
+						{
+							"code": "150103",
+							"name": "回民区"
+						},
+						{
+							"code": "150104",
+							"name": "玉泉区"
+						},
+						{
+							"code": "150105",
+							"name": "赛罕区"
+						},
+						{
+							"code": "150121",
+							"name": "土默特左旗"
+						},
+						{
+							"code": "150122",
+							"name": "托克托县"
+						},
+						{
+							"code": "150123",
+							"name": "和林格尔县"
+						},
+						{
+							"code": "150124",
+							"name": "清水河县"
+						},
+						{
+							"code": "150125",
+							"name": "武川县"
+						}
+					]
+				},
+				{
+					"code": "150200",
+					"name": "包头市",
+					"childs": [{
+							"code": "150202",
+							"name": "东河区"
+						},
+						{
+							"code": "150203",
+							"name": "昆都仑区"
+						},
+						{
+							"code": "150204",
+							"name": "青山区"
+						},
+						{
+							"code": "150205",
+							"name": "石拐区"
+						},
+						{
+							"code": "150206",
+							"name": "白云鄂博矿区"
+						},
+						{
+							"code": "150207",
+							"name": "九原区"
+						},
+						{
+							"code": "150221",
+							"name": "土默特右旗"
+						},
+						{
+							"code": "150222",
+							"name": "固阳县"
+						},
+						{
+							"code": "150223",
+							"name": "达尔罕茂明安联合旗"
+						}
+					]
+				},
+				{
+					"code": "150300",
+					"name": "乌海市",
+					"childs": [{
+							"code": "150302",
+							"name": "海勃湾区"
+						},
+						{
+							"code": "150303",
+							"name": "海南区"
+						},
+						{
+							"code": "150304",
+							"name": "乌达区"
+						}
+					]
+				},
+				{
+					"code": "150400",
+					"name": "赤峰市",
+					"childs": [{
+							"code": "150402",
+							"name": "红山区"
+						},
+						{
+							"code": "150403",
+							"name": "元宝山区"
+						},
+						{
+							"code": "150404",
+							"name": "松山区"
+						},
+						{
+							"code": "150421",
+							"name": "阿鲁科尔沁旗"
+						},
+						{
+							"code": "150422",
+							"name": "巴林左旗"
+						},
+						{
+							"code": "150423",
+							"name": "巴林右旗"
+						},
+						{
+							"code": "150424",
+							"name": "林西县"
+						},
+						{
+							"code": "150425",
+							"name": "克什克腾旗"
+						},
+						{
+							"code": "150426",
+							"name": "翁牛特旗"
+						},
+						{
+							"code": "150428",
+							"name": "喀喇沁旗"
+						},
+						{
+							"code": "150429",
+							"name": "宁城县"
+						},
+						{
+							"code": "150430",
+							"name": "敖汉旗"
+						}
+					]
+				},
+				{
+					"code": "150500",
+					"name": "通辽市",
+					"childs": [{
+							"code": "150502",
+							"name": "科尔沁区"
+						},
+						{
+							"code": "150521",
+							"name": "科尔沁左翼中旗"
+						},
+						{
+							"code": "150522",
+							"name": "科尔沁左翼后旗"
+						},
+						{
+							"code": "150523",
+							"name": "开鲁县"
+						},
+						{
+							"code": "150524",
+							"name": "库伦旗"
+						},
+						{
+							"code": "150525",
+							"name": "奈曼旗"
+						},
+						{
+							"code": "150526",
+							"name": "扎鲁特旗"
+						},
+						{
+							"code": "150581",
+							"name": "霍林郭勒市"
+						}
+					]
+				},
+				{
+					"code": "150600",
+					"name": "鄂尔多斯市",
+					"childs": [{
+							"code": "150602",
+							"name": "东胜区"
+						},
+						{
+							"code": "150603",
+							"name": "康巴什区"
+						},
+						{
+							"code": "150621",
+							"name": "达拉特旗"
+						},
+						{
+							"code": "150622",
+							"name": "准格尔旗"
+						},
+						{
+							"code": "150623",
+							"name": "鄂托克前旗"
+						},
+						{
+							"code": "150624",
+							"name": "鄂托克旗"
+						},
+						{
+							"code": "150625",
+							"name": "杭锦旗"
+						},
+						{
+							"code": "150626",
+							"name": "乌审旗"
+						},
+						{
+							"code": "150627",
+							"name": "伊金霍洛旗"
+						}
+					]
+				},
+				{
+					"code": "150700",
+					"name": "呼伦贝尔市",
+					"childs": [{
+							"code": "150702",
+							"name": "海拉尔区"
+						},
+						{
+							"code": "150703",
+							"name": "扎赉诺尔区"
+						},
+						{
+							"code": "150721",
+							"name": "阿荣旗"
+						},
+						{
+							"code": "150722",
+							"name": "莫力达瓦达斡尔族自治旗"
+						},
+						{
+							"code": "150723",
+							"name": "鄂伦春自治旗"
+						},
+						{
+							"code": "150724",
+							"name": "鄂温克族自治旗"
+						},
+						{
+							"code": "150725",
+							"name": "陈巴尔虎旗"
+						},
+						{
+							"code": "150726",
+							"name": "新巴尔虎左旗"
+						},
+						{
+							"code": "150727",
+							"name": "新巴尔虎右旗"
+						},
+						{
+							"code": "150781",
+							"name": "满洲里市"
+						},
+						{
+							"code": "150782",
+							"name": "牙克石市"
+						},
+						{
+							"code": "150783",
+							"name": "扎兰屯市"
+						},
+						{
+							"code": "150784",
+							"name": "额尔古纳市"
+						},
+						{
+							"code": "150785",
+							"name": "根河市"
+						}
+					]
+				},
+				{
+					"code": "150800",
+					"name": "巴彦淖尔市",
+					"childs": [{
+							"code": "150802",
+							"name": "临河区"
+						},
+						{
+							"code": "150821",
+							"name": "五原县"
+						},
+						{
+							"code": "150822",
+							"name": "磴口县"
+						},
+						{
+							"code": "150823",
+							"name": "乌拉特前旗"
+						},
+						{
+							"code": "150824",
+							"name": "乌拉特中旗"
+						},
+						{
+							"code": "150825",
+							"name": "乌拉特后旗"
+						},
+						{
+							"code": "150826",
+							"name": "杭锦后旗"
+						}
+					]
+				},
+				{
+					"code": "150900",
+					"name": "乌兰察布市",
+					"childs": [{
+							"code": "150902",
+							"name": "集宁区"
+						},
+						{
+							"code": "150921",
+							"name": "卓资县"
+						},
+						{
+							"code": "150922",
+							"name": "化德县"
+						},
+						{
+							"code": "150923",
+							"name": "商都县"
+						},
+						{
+							"code": "150924",
+							"name": "兴和县"
+						},
+						{
+							"code": "150925",
+							"name": "凉城县"
+						},
+						{
+							"code": "150926",
+							"name": "察哈尔右翼前旗"
+						},
+						{
+							"code": "150927",
+							"name": "察哈尔右翼中旗"
+						},
+						{
+							"code": "150928",
+							"name": "察哈尔右翼后旗"
+						},
+						{
+							"code": "150929",
+							"name": "四子王旗"
+						},
+						{
+							"code": "150981",
+							"name": "丰镇市"
+						}
+					]
+				},
+				{
+					"code": "152200",
+					"name": "兴安盟",
+					"childs": [{
+							"code": "152201",
+							"name": "乌兰浩特市"
+						},
+						{
+							"code": "152202",
+							"name": "阿尔山市"
+						},
+						{
+							"code": "152221",
+							"name": "科尔沁右翼前旗"
+						},
+						{
+							"code": "152222",
+							"name": "科尔沁右翼中旗"
+						},
+						{
+							"code": "152223",
+							"name": "扎赉特旗"
+						},
+						{
+							"code": "152224",
+							"name": "突泉县"
+						}
+					]
+				},
+				{
+					"code": "152500",
+					"name": "锡林郭勒盟",
+					"childs": [{
+							"code": "152501",
+							"name": "二连浩特市"
+						},
+						{
+							"code": "152502",
+							"name": "锡林浩特市"
+						},
+						{
+							"code": "152522",
+							"name": "阿巴嘎旗"
+						},
+						{
+							"code": "152523",
+							"name": "苏尼特左旗"
+						},
+						{
+							"code": "152524",
+							"name": "苏尼特右旗"
+						},
+						{
+							"code": "152525",
+							"name": "东乌珠穆沁旗"
+						},
+						{
+							"code": "152526",
+							"name": "西乌珠穆沁旗"
+						},
+						{
+							"code": "152527",
+							"name": "太仆寺旗"
+						},
+						{
+							"code": "152528",
+							"name": "镶黄旗"
+						},
+						{
+							"code": "152529",
+							"name": "正镶白旗"
+						},
+						{
+							"code": "152530",
+							"name": "正蓝旗"
+						},
+						{
+							"code": "152531",
+							"name": "多伦县"
+						}
+					]
+				},
+				{
+					"code": "152900",
+					"name": "阿拉善盟",
+					"childs": [{
+							"code": "152921",
+							"name": "阿拉善左旗"
+						},
+						{
+							"code": "152922",
+							"name": "阿拉善右旗"
+						},
+						{
+							"code": "152923",
+							"name": "额济纳旗"
+						}
+					]
+				}
+			]
+		},
+		{
+			"code": "210000",
+			"name": "辽宁省",
+			"childs": [{
+					"code": "210100",
+					"name": "沈阳市",
+					"childs": [{
+							"code": "210102",
+							"name": "和平区"
+						},
+						{
+							"code": "210103",
+							"name": "沈河区"
+						},
+						{
+							"code": "210104",
+							"name": "大东区"
+						},
+						{
+							"code": "210105",
+							"name": "皇姑区"
+						},
+						{
+							"code": "210106",
+							"name": "铁西区"
+						},
+						{
+							"code": "210111",
+							"name": "苏家屯区"
+						},
+						{
+							"code": "210112",
+							"name": "浑南区"
+						},
+						{
+							"code": "210113",
+							"name": "沈北新区"
+						},
+						{
+							"code": "210114",
+							"name": "于洪区"
+						},
+						{
+							"code": "210115",
+							"name": "辽中区"
+						},
+						{
+							"code": "210123",
+							"name": "康平县"
+						},
+						{
+							"code": "210124",
+							"name": "法库县"
+						},
+						{
+							"code": "210181",
+							"name": "新民市"
+						}
+					]
+				},
+				{
+					"code": "210200",
+					"name": "大连市",
+					"childs": [{
+							"code": "210202",
+							"name": "中山区"
+						},
+						{
+							"code": "210203",
+							"name": "西岗区"
+						},
+						{
+							"code": "210204",
+							"name": "沙河口区"
+						},
+						{
+							"code": "210211",
+							"name": "甘井子区"
+						},
+						{
+							"code": "210212",
+							"name": "旅顺口区"
+						},
+						{
+							"code": "210213",
+							"name": "金州区"
+						},
+						{
+							"code": "210214",
+							"name": "普兰店区"
+						},
+						{
+							"code": "210224",
+							"name": "长海县"
+						},
+						{
+							"code": "210281",
+							"name": "瓦房店市"
+						},
+						{
+							"code": "210283",
+							"name": "庄河市"
+						}
+					]
+				},
+				{
+					"code": "210300",
+					"name": "鞍山市",
+					"childs": [{
+							"code": "210302",
+							"name": "铁东区"
+						},
+						{
+							"code": "210303",
+							"name": "铁西区"
+						},
+						{
+							"code": "210304",
+							"name": "立山区"
+						},
+						{
+							"code": "210311",
+							"name": "千山区"
+						},
+						{
+							"code": "210321",
+							"name": "台安县"
+						},
+						{
+							"code": "210323",
+							"name": "岫岩满族自治县"
+						},
+						{
+							"code": "210381",
+							"name": "海城市"
+						}
+					]
+				},
+				{
+					"code": "210400",
+					"name": "抚顺市",
+					"childs": [{
+							"code": "210402",
+							"name": "新抚区"
+						},
+						{
+							"code": "210403",
+							"name": "东洲区"
+						},
+						{
+							"code": "210404",
+							"name": "望花区"
+						},
+						{
+							"code": "210411",
+							"name": "顺城区"
+						},
+						{
+							"code": "210421",
+							"name": "抚顺县"
+						},
+						{
+							"code": "210422",
+							"name": "新宾满族自治县"
+						},
+						{
+							"code": "210423",
+							"name": "清原满族自治县"
+						}
+					]
+				},
+				{
+					"code": "210500",
+					"name": "本溪市",
+					"childs": [{
+							"code": "210502",
+							"name": "平山区"
+						},
+						{
+							"code": "210503",
+							"name": "溪湖区"
+						},
+						{
+							"code": "210504",
+							"name": "明山区"
+						},
+						{
+							"code": "210505",
+							"name": "南芬区"
+						},
+						{
+							"code": "210521",
+							"name": "本溪满族自治县"
+						},
+						{
+							"code": "210522",
+							"name": "桓仁满族自治县"
+						}
+					]
+				},
+				{
+					"code": "210600",
+					"name": "丹东市",
+					"childs": [{
+							"code": "210602",
+							"name": "元宝区"
+						},
+						{
+							"code": "210603",
+							"name": "振兴区"
+						},
+						{
+							"code": "210604",
+							"name": "振安区"
+						},
+						{
+							"code": "210624",
+							"name": "宽甸满族自治县"
+						},
+						{
+							"code": "210681",
+							"name": "东港市"
+						},
+						{
+							"code": "210682",
+							"name": "凤城市"
+						}
+					]
+				},
+				{
+					"code": "210700",
+					"name": "锦州市",
+					"childs": [{
+							"code": "210702",
+							"name": "古塔区"
+						},
+						{
+							"code": "210703",
+							"name": "凌河区"
+						},
+						{
+							"code": "210711",
+							"name": "太和区"
+						},
+						{
+							"code": "210726",
+							"name": "黑山县"
+						},
+						{
+							"code": "210727",
+							"name": "义县"
+						},
+						{
+							"code": "210781",
+							"name": "凌海市"
+						},
+						{
+							"code": "210782",
+							"name": "北镇市"
+						}
+					]
+				},
+				{
+					"code": "210800",
+					"name": "营口市",
+					"childs": [{
+							"code": "210802",
+							"name": "站前区"
+						},
+						{
+							"code": "210803",
+							"name": "西市区"
+						},
+						{
+							"code": "210804",
+							"name": "鲅鱼圈区"
+						},
+						{
+							"code": "210811",
+							"name": "老边区"
+						},
+						{
+							"code": "210881",
+							"name": "盖州市"
+						},
+						{
+							"code": "210882",
+							"name": "大石桥市"
+						}
+					]
+				},
+				{
+					"code": "210900",
+					"name": "阜新市",
+					"childs": [{
+							"code": "210902",
+							"name": "海州区"
+						},
+						{
+							"code": "210903",
+							"name": "新邱区"
+						},
+						{
+							"code": "210904",
+							"name": "太平区"
+						},
+						{
+							"code": "210905",
+							"name": "清河门区"
+						},
+						{
+							"code": "210911",
+							"name": "细河区"
+						},
+						{
+							"code": "210921",
+							"name": "阜新蒙古族自治县"
+						},
+						{
+							"code": "210922",
+							"name": "彰武县"
+						}
+					]
+				},
+				{
+					"code": "211000",
+					"name": "辽阳市",
+					"childs": [{
+							"code": "211002",
+							"name": "白塔区"
+						},
+						{
+							"code": "211003",
+							"name": "文圣区"
+						},
+						{
+							"code": "211004",
+							"name": "宏伟区"
+						},
+						{
+							"code": "211005",
+							"name": "弓长岭区"
+						},
+						{
+							"code": "211011",
+							"name": "太子河区"
+						},
+						{
+							"code": "211021",
+							"name": "辽阳县"
+						},
+						{
+							"code": "211081",
+							"name": "灯塔市"
+						}
+					]
+				},
+				{
+					"code": "211100",
+					"name": "盘锦市",
+					"childs": [{
+							"code": "211102",
+							"name": "双台子区"
+						},
+						{
+							"code": "211103",
+							"name": "兴隆台区"
+						},
+						{
+							"code": "211104",
+							"name": "大洼区"
+						},
+						{
+							"code": "211122",
+							"name": "盘山县"
+						}
+					]
+				},
+				{
+					"code": "211200",
+					"name": "铁岭市",
+					"childs": [{
+							"code": "211202",
+							"name": "银州区"
+						},
+						{
+							"code": "211204",
+							"name": "清河区"
+						},
+						{
+							"code": "211221",
+							"name": "铁岭县"
+						},
+						{
+							"code": "211223",
+							"name": "西丰县"
+						},
+						{
+							"code": "211224",
+							"name": "昌图县"
+						},
+						{
+							"code": "211281",
+							"name": "调兵山市"
+						},
+						{
+							"code": "211282",
+							"name": "开原市"
+						}
+					]
+				},
+				{
+					"code": "211300",
+					"name": "朝阳市",
+					"childs": [{
+							"code": "211302",
+							"name": "双塔区"
+						},
+						{
+							"code": "211303",
+							"name": "龙城区"
+						},
+						{
+							"code": "211321",
+							"name": "朝阳县"
+						},
+						{
+							"code": "211322",
+							"name": "建平县"
+						},
+						{
+							"code": "211324",
+							"name": "喀喇沁左翼蒙古族自治县"
+						},
+						{
+							"code": "211381",
+							"name": "北票市"
+						},
+						{
+							"code": "211382",
+							"name": "凌源市"
+						}
+					]
+				},
+				{
+					"code": "211400",
+					"name": "葫芦岛市",
+					"childs": [{
+							"code": "211402",
+							"name": "连山区"
+						},
+						{
+							"code": "211403",
+							"name": "龙港区"
+						},
+						{
+							"code": "211404",
+							"name": "南票区"
+						},
+						{
+							"code": "211421",
+							"name": "绥中县"
+						},
+						{
+							"code": "211422",
+							"name": "建昌县"
+						},
+						{
+							"code": "211481",
+							"name": "兴城市"
+						}
+					]
+				}
+			]
+		},
+		{
+			"code": "220000",
+			"name": "吉林省",
+			"childs": [{
+					"code": "220100",
+					"name": "长春市",
+					"childs": [{
+							"code": "220102",
+							"name": "南关区"
+						},
+						{
+							"code": "220103",
+							"name": "宽城区"
+						},
+						{
+							"code": "220104",
+							"name": "朝阳区"
+						},
+						{
+							"code": "220105",
+							"name": "二道区"
+						},
+						{
+							"code": "220106",
+							"name": "绿园区"
+						},
+						{
+							"code": "220112",
+							"name": "双阳区"
+						},
+						{
+							"code": "220113",
+							"name": "九台区"
+						},
+						{
+							"code": "220122",
+							"name": "农安县"
+						},
+						{
+							"code": "220182",
+							"name": "榆树市"
+						},
+						{
+							"code": "220183",
+							"name": "德惠市"
+						}
+					]
+				},
+				{
+					"code": "220200",
+					"name": "吉林市",
+					"childs": [{
+							"code": "220202",
+							"name": "昌邑区"
+						},
+						{
+							"code": "220203",
+							"name": "龙潭区"
+						},
+						{
+							"code": "220204",
+							"name": "船营区"
+						},
+						{
+							"code": "220211",
+							"name": "丰满区"
+						},
+						{
+							"code": "220221",
+							"name": "永吉县"
+						},
+						{
+							"code": "220281",
+							"name": "蛟河市"
+						},
+						{
+							"code": "220282",
+							"name": "桦甸市"
+						},
+						{
+							"code": "220283",
+							"name": "舒兰市"
+						},
+						{
+							"code": "220284",
+							"name": "磐石市"
+						}
+					]
+				},
+				{
+					"code": "220300",
+					"name": "四平市",
+					"childs": [{
+							"code": "220302",
+							"name": "铁西区"
+						},
+						{
+							"code": "220303",
+							"name": "铁东区"
+						},
+						{
+							"code": "220322",
+							"name": "梨树县"
+						},
+						{
+							"code": "220323",
+							"name": "伊通满族自治县"
+						},
+						{
+							"code": "220381",
+							"name": "公主岭市"
+						},
+						{
+							"code": "220382",
+							"name": "双辽市"
+						}
+					]
+				},
+				{
+					"code": "220400",
+					"name": "辽源市",
+					"childs": [{
+							"code": "220402",
+							"name": "龙山区"
+						},
+						{
+							"code": "220403",
+							"name": "西安区"
+						},
+						{
+							"code": "220421",
+							"name": "东丰县"
+						},
+						{
+							"code": "220422",
+							"name": "东辽县"
+						}
+					]
+				},
+				{
+					"code": "220500",
+					"name": "通化市",
+					"childs": [{
+							"code": "220502",
+							"name": "东昌区"
+						},
+						{
+							"code": "220503",
+							"name": "二道江区"
+						},
+						{
+							"code": "220521",
+							"name": "通化县"
+						},
+						{
+							"code": "220523",
+							"name": "辉南县"
+						},
+						{
+							"code": "220524",
+							"name": "柳河县"
+						},
+						{
+							"code": "220581",
+							"name": "梅河口市"
+						},
+						{
+							"code": "220582",
+							"name": "集安市"
+						}
+					]
+				},
+				{
+					"code": "220600",
+					"name": "白山市",
+					"childs": [{
+							"code": "220602",
+							"name": "浑江区"
+						},
+						{
+							"code": "220605",
+							"name": "江源区"
+						},
+						{
+							"code": "220621",
+							"name": "抚松县"
+						},
+						{
+							"code": "220622",
+							"name": "靖宇县"
+						},
+						{
+							"code": "220623",
+							"name": "长白朝鲜族自治县"
+						},
+						{
+							"code": "220681",
+							"name": "临江市"
+						}
+					]
+				},
+				{
+					"code": "220700",
+					"name": "松原市",
+					"childs": [{
+							"code": "220702",
+							"name": "宁江区"
+						},
+						{
+							"code": "220721",
+							"name": "前郭尔罗斯蒙古族自治县"
+						},
+						{
+							"code": "220722",
+							"name": "长岭县"
+						},
+						{
+							"code": "220723",
+							"name": "乾安县"
+						},
+						{
+							"code": "220781",
+							"name": "扶余市"
+						}
+					]
+				},
+				{
+					"code": "220800",
+					"name": "白城市",
+					"childs": [{
+							"code": "220802",
+							"name": "洮北区"
+						},
+						{
+							"code": "220821",
+							"name": "镇赉县"
+						},
+						{
+							"code": "220822",
+							"name": "通榆县"
+						},
+						{
+							"code": "220881",
+							"name": "洮南市"
+						},
+						{
+							"code": "220882",
+							"name": "大安市"
+						}
+					]
+				},
+				{
+					"code": "222400",
+					"name": "延边朝鲜族自治州",
+					"childs": [{
+							"code": "222401",
+							"name": "延吉市"
+						},
+						{
+							"code": "222402",
+							"name": "图们市"
+						},
+						{
+							"code": "222403",
+							"name": "敦化市"
+						},
+						{
+							"code": "222404",
+							"name": "珲春市"
+						},
+						{
+							"code": "222405",
+							"name": "龙井市"
+						},
+						{
+							"code": "222406",
+							"name": "和龙市"
+						},
+						{
+							"code": "222424",
+							"name": "汪清县"
+						},
+						{
+							"code": "222426",
+							"name": "安图县"
+						}
+					]
+				}
+			]
+		},
+		{
+			"code": "230000",
+			"name": "黑龙江省",
+			"childs": [{
+					"code": "230100",
+					"name": "哈尔滨市",
+					"childs": [{
+							"code": "230102",
+							"name": "道里区"
+						},
+						{
+							"code": "230103",
+							"name": "南岗区"
+						},
+						{
+							"code": "230104",
+							"name": "道外区"
+						},
+						{
+							"code": "230108",
+							"name": "平房区"
+						},
+						{
+							"code": "230109",
+							"name": "松北区"
+						},
+						{
+							"code": "230110",
+							"name": "香坊区"
+						},
+						{
+							"code": "230111",
+							"name": "呼兰区"
+						},
+						{
+							"code": "230112",
+							"name": "阿城区"
+						},
+						{
+							"code": "230113",
+							"name": "双城区"
+						},
+						{
+							"code": "230123",
+							"name": "依兰县"
+						},
+						{
+							"code": "230124",
+							"name": "方正县"
+						},
+						{
+							"code": "230125",
+							"name": "宾县"
+						},
+						{
+							"code": "230126",
+							"name": "巴彦县"
+						},
+						{
+							"code": "230127",
+							"name": "木兰县"
+						},
+						{
+							"code": "230128",
+							"name": "通河县"
+						},
+						{
+							"code": "230129",
+							"name": "延寿县"
+						},
+						{
+							"code": "230183",
+							"name": "尚志市"
+						},
+						{
+							"code": "230184",
+							"name": "五常市"
+						}
+					]
+				},
+				{
+					"code": "230200",
+					"name": "齐齐哈尔市",
+					"childs": [{
+							"code": "230202",
+							"name": "龙沙区"
+						},
+						{
+							"code": "230203",
+							"name": "建华区"
+						},
+						{
+							"code": "230204",
+							"name": "铁锋区"
+						},
+						{
+							"code": "230205",
+							"name": "昂昂溪区"
+						},
+						{
+							"code": "230206",
+							"name": "富拉尔基区"
+						},
+						{
+							"code": "230207",
+							"name": "碾子山区"
+						},
+						{
+							"code": "230208",
+							"name": "梅里斯达斡尔族区"
+						},
+						{
+							"code": "230221",
+							"name": "龙江县"
+						},
+						{
+							"code": "230223",
+							"name": "依安县"
+						},
+						{
+							"code": "230224",
+							"name": "泰来县"
+						},
+						{
+							"code": "230225",
+							"name": "甘南县"
+						},
+						{
+							"code": "230227",
+							"name": "富裕县"
+						},
+						{
+							"code": "230229",
+							"name": "克山县"
+						},
+						{
+							"code": "230230",
+							"name": "克东县"
+						},
+						{
+							"code": "230231",
+							"name": "拜泉县"
+						},
+						{
+							"code": "230281",
+							"name": "讷河市"
+						}
+					]
+				},
+				{
+					"code": "230300",
+					"name": "鸡西市",
+					"childs": [{
+							"code": "230302",
+							"name": "鸡冠区"
+						},
+						{
+							"code": "230303",
+							"name": "恒山区"
+						},
+						{
+							"code": "230304",
+							"name": "滴道区"
+						},
+						{
+							"code": "230305",
+							"name": "梨树区"
+						},
+						{
+							"code": "230306",
+							"name": "城子河区"
+						},
+						{
+							"code": "230307",
+							"name": "麻山区"
+						},
+						{
+							"code": "230321",
+							"name": "鸡东县"
+						},
+						{
+							"code": "230381",
+							"name": "虎林市"
+						},
+						{
+							"code": "230382",
+							"name": "密山市"
+						}
+					]
+				},
+				{
+					"code": "230400",
+					"name": "鹤岗市",
+					"childs": [{
+							"code": "230402",
+							"name": "向阳区"
+						},
+						{
+							"code": "230403",
+							"name": "工农区"
+						},
+						{
+							"code": "230404",
+							"name": "南山区"
+						},
+						{
+							"code": "230405",
+							"name": "兴安区"
+						},
+						{
+							"code": "230406",
+							"name": "东山区"
+						},
+						{
+							"code": "230407",
+							"name": "兴山区"
+						},
+						{
+							"code": "230421",
+							"name": "萝北县"
+						},
+						{
+							"code": "230422",
+							"name": "绥滨县"
+						}
+					]
+				},
+				{
+					"code": "230500",
+					"name": "双鸭山市",
+					"childs": [{
+							"code": "230502",
+							"name": "尖山区"
+						},
+						{
+							"code": "230503",
+							"name": "岭东区"
+						},
+						{
+							"code": "230505",
+							"name": "四方台区"
+						},
+						{
+							"code": "230506",
+							"name": "宝山区"
+						},
+						{
+							"code": "230521",
+							"name": "集贤县"
+						},
+						{
+							"code": "230522",
+							"name": "友谊县"
+						},
+						{
+							"code": "230523",
+							"name": "宝清县"
+						},
+						{
+							"code": "230524",
+							"name": "饶河县"
+						}
+					]
+				},
+				{
+					"code": "230600",
+					"name": "大庆市",
+					"childs": [{
+							"code": "230602",
+							"name": "萨尔图区"
+						},
+						{
+							"code": "230603",
+							"name": "龙凤区"
+						},
+						{
+							"code": "230604",
+							"name": "让胡路区"
+						},
+						{
+							"code": "230605",
+							"name": "红岗区"
+						},
+						{
+							"code": "230606",
+							"name": "大同区"
+						},
+						{
+							"code": "230621",
+							"name": "肇州县"
+						},
+						{
+							"code": "230622",
+							"name": "肇源县"
+						},
+						{
+							"code": "230623",
+							"name": "林甸县"
+						},
+						{
+							"code": "230624",
+							"name": "杜尔伯特蒙古族自治县"
+						}
+					]
+				},
+				{
+					"code": "230700",
+					"name": "伊春市",
+					"childs": [{
+							"code": "230702",
+							"name": "伊春区"
+						},
+						{
+							"code": "230703",
+							"name": "南岔区"
+						},
+						{
+							"code": "230704",
+							"name": "友好区"
+						},
+						{
+							"code": "230705",
+							"name": "西林区"
+						},
+						{
+							"code": "230706",
+							"name": "翠峦区"
+						},
+						{
+							"code": "230707",
+							"name": "新青区"
+						},
+						{
+							"code": "230708",
+							"name": "美溪区"
+						},
+						{
+							"code": "230709",
+							"name": "金山屯区"
+						},
+						{
+							"code": "230710",
+							"name": "五营区"
+						},
+						{
+							"code": "230711",
+							"name": "乌马河区"
+						},
+						{
+							"code": "230712",
+							"name": "汤旺河区"
+						},
+						{
+							"code": "230713",
+							"name": "带岭区"
+						},
+						{
+							"code": "230714",
+							"name": "乌伊岭区"
+						},
+						{
+							"code": "230715",
+							"name": "红星区"
+						},
+						{
+							"code": "230716",
+							"name": "上甘岭区"
+						},
+						{
+							"code": "230722",
+							"name": "嘉荫县"
+						},
+						{
+							"code": "230781",
+							"name": "铁力市"
+						}
+					]
+				},
+				{
+					"code": "230800",
+					"name": "佳木斯市",
+					"childs": [{
+							"code": "230803",
+							"name": "向阳区"
+						},
+						{
+							"code": "230804",
+							"name": "前进区"
+						},
+						{
+							"code": "230805",
+							"name": "东风区"
+						},
+						{
+							"code": "230811",
+							"name": "郊区"
+						},
+						{
+							"code": "230822",
+							"name": "桦南县"
+						},
+						{
+							"code": "230826",
+							"name": "桦川县"
+						},
+						{
+							"code": "230828",
+							"name": "汤原县"
+						},
+						{
+							"code": "230881",
+							"name": "同江市"
+						},
+						{
+							"code": "230882",
+							"name": "富锦市"
+						},
+						{
+							"code": "230883",
+							"name": "抚远市"
+						}
+					]
+				},
+				{
+					"code": "230900",
+					"name": "七台河市",
+					"childs": [{
+							"code": "230902",
+							"name": "新兴区"
+						},
+						{
+							"code": "230903",
+							"name": "桃山区"
+						},
+						{
+							"code": "230904",
+							"name": "茄子河区"
+						},
+						{
+							"code": "230921",
+							"name": "勃利县"
+						}
+					]
+				},
+				{
+					"code": "231000",
+					"name": "牡丹江市",
+					"childs": [{
+							"code": "231002",
+							"name": "东安区"
+						},
+						{
+							"code": "231003",
+							"name": "阳明区"
+						},
+						{
+							"code": "231004",
+							"name": "爱民区"
+						},
+						{
+							"code": "231005",
+							"name": "西安区"
+						},
+						{
+							"code": "231025",
+							"name": "林口县"
+						},
+						{
+							"code": "231081",
+							"name": "绥芬河市"
+						},
+						{
+							"code": "231083",
+							"name": "海林市"
+						},
+						{
+							"code": "231084",
+							"name": "宁安市"
+						},
+						{
+							"code": "231085",
+							"name": "穆棱市"
+						},
+						{
+							"code": "231086",
+							"name": "东宁市"
+						}
+					]
+				},
+				{
+					"code": "231100",
+					"name": "黑河市",
+					"childs": [{
+							"code": "231102",
+							"name": "爱辉区"
+						},
+						{
+							"code": "231121",
+							"name": "嫩江县"
+						},
+						{
+							"code": "231123",
+							"name": "逊克县"
+						},
+						{
+							"code": "231124",
+							"name": "孙吴县"
+						},
+						{
+							"code": "231181",
+							"name": "北安市"
+						},
+						{
+							"code": "231182",
+							"name": "五大连池市"
+						}
+					]
+				},
+				{
+					"code": "231200",
+					"name": "绥化市",
+					"childs": [{
+							"code": "231202",
+							"name": "北林区"
+						},
+						{
+							"code": "231221",
+							"name": "望奎县"
+						},
+						{
+							"code": "231222",
+							"name": "兰西县"
+						},
+						{
+							"code": "231223",
+							"name": "青冈县"
+						},
+						{
+							"code": "231224",
+							"name": "庆安县"
+						},
+						{
+							"code": "231225",
+							"name": "明水县"
+						},
+						{
+							"code": "231226",
+							"name": "绥棱县"
+						},
+						{
+							"code": "231281",
+							"name": "安达市"
+						},
+						{
+							"code": "231282",
+							"name": "肇东市"
+						},
+						{
+							"code": "231283",
+							"name": "海伦市"
+						}
+					]
+				},
+				{
+					"code": "232700",
+					"name": "大兴安岭地区",
+					"childs": [{
+							"code": "232701",
+							"name": "漠河市"
+						},
+						{
+							"code": "232721",
+							"name": "呼玛县"
+						},
+						{
+							"code": "232722",
+							"name": "塔河县"
+						}
+					]
+				}
+			]
+		},
+		{
+			"code": "310000",
+			"name": "上海市",
+			"childs": [{
+				"code": "310100",
+				"name": "上海市",
+				"childs": [{
+						"code": "310101",
+						"name": "黄浦区"
+					},
+					{
+						"code": "310104",
+						"name": "徐汇区"
+					},
+					{
+						"code": "310105",
+						"name": "长宁区"
+					},
+					{
+						"code": "310106",
+						"name": "静安区"
+					},
+					{
+						"code": "310107",
+						"name": "普陀区"
+					},
+					{
+						"code": "310109",
+						"name": "虹口区"
+					},
+					{
+						"code": "310110",
+						"name": "杨浦区"
+					},
+					{
+						"code": "310112",
+						"name": "闵行区"
+					},
+					{
+						"code": "310113",
+						"name": "宝山区"
+					},
+					{
+						"code": "310114",
+						"name": "嘉定区"
+					},
+					{
+						"code": "310115",
+						"name": "浦东新区"
+					},
+					{
+						"code": "310116",
+						"name": "金山区"
+					},
+					{
+						"code": "310117",
+						"name": "松江区"
+					},
+					{
+						"code": "310118",
+						"name": "青浦区"
+					},
+					{
+						"code": "310120",
+						"name": "奉贤区"
+					},
+					{
+						"code": "310151",
+						"name": "崇明区"
+					}
+				]
+			}]
+		},
+		{
+			"code": "320000",
+			"name": "江苏省",
+			"childs": [{
+					"code": "320100",
+					"name": "南京市",
+					"childs": [{
+							"code": "320102",
+							"name": "玄武区"
+						},
+						{
+							"code": "320104",
+							"name": "秦淮区"
+						},
+						{
+							"code": "320105",
+							"name": "建邺区"
+						},
+						{
+							"code": "320106",
+							"name": "鼓楼区"
+						},
+						{
+							"code": "320111",
+							"name": "浦口区"
+						},
+						{
+							"code": "320113",
+							"name": "栖霞区"
+						},
+						{
+							"code": "320114",
+							"name": "雨花台区"
+						},
+						{
+							"code": "320115",
+							"name": "江宁区"
+						},
+						{
+							"code": "320116",
+							"name": "六合区"
+						},
+						{
+							"code": "320117",
+							"name": "溧水区"
+						},
+						{
+							"code": "320118",
+							"name": "高淳区"
+						}
+					]
+				},
+				{
+					"code": "320200",
+					"name": "无锡市",
+					"childs": [{
+							"code": "320205",
+							"name": "锡山区"
+						},
+						{
+							"code": "320206",
+							"name": "惠山区"
+						},
+						{
+							"code": "320211",
+							"name": "滨湖区"
+						},
+						{
+							"code": "320213",
+							"name": "梁溪区"
+						},
+						{
+							"code": "320214",
+							"name": "新吴区"
+						},
+						{
+							"code": "320281",
+							"name": "江阴市"
+						},
+						{
+							"code": "320282",
+							"name": "宜兴市"
+						}
+					]
+				},
+				{
+					"code": "320300",
+					"name": "徐州市",
+					"childs": [{
+							"code": "320302",
+							"name": "鼓楼区"
+						},
+						{
+							"code": "320303",
+							"name": "云龙区"
+						},
+						{
+							"code": "320305",
+							"name": "贾汪区"
+						},
+						{
+							"code": "320311",
+							"name": "泉山区"
+						},
+						{
+							"code": "320312",
+							"name": "铜山区"
+						},
+						{
+							"code": "320321",
+							"name": "丰县"
+						},
+						{
+							"code": "320322",
+							"name": "沛县"
+						},
+						{
+							"code": "320324",
+							"name": "睢宁县"
+						},
+						{
+							"code": "320381",
+							"name": "新沂市"
+						},
+						{
+							"code": "320382",
+							"name": "邳州市"
+						}
+					]
+				},
+				{
+					"code": "320400",
+					"name": "常州市",
+					"childs": [{
+							"code": "320402",
+							"name": "天宁区"
+						},
+						{
+							"code": "320404",
+							"name": "钟楼区"
+						},
+						{
+							"code": "320411",
+							"name": "新北区"
+						},
+						{
+							"code": "320412",
+							"name": "武进区"
+						},
+						{
+							"code": "320413",
+							"name": "金坛区"
+						},
+						{
+							"code": "320481",
+							"name": "溧阳市"
+						}
+					]
+				},
+				{
+					"code": "320500",
+					"name": "苏州市",
+					"childs": [{
+							"code": "320505",
+							"name": "虎丘区"
+						},
+						{
+							"code": "320506",
+							"name": "吴中区"
+						},
+						{
+							"code": "320507",
+							"name": "相城区"
+						},
+						{
+							"code": "320508",
+							"name": "姑苏区"
+						},
+						{
+							"code": "320509",
+							"name": "吴江区"
+						},
+						{
+							"code": "320581",
+							"name": "常熟市"
+						},
+						{
+							"code": "320582",
+							"name": "张家港市"
+						},
+						{
+							"code": "320583",
+							"name": "昆山市"
+						},
+						{
+							"code": "320585",
+							"name": "太仓市"
+						}
+					]
+				},
+				{
+					"code": "320600",
+					"name": "南通市",
+					"childs": [{
+							"code": "320602",
+							"name": "崇川区"
+						},
+						{
+							"code": "320611",
+							"name": "港闸区"
+						},
+						{
+							"code": "320612",
+							"name": "通州区"
+						},
+						{
+							"code": "320623",
+							"name": "如东县"
+						},
+						{
+							"code": "320681",
+							"name": "启东市"
+						},
+						{
+							"code": "320682",
+							"name": "如皋市"
+						},
+						{
+							"code": "320684",
+							"name": "海门市"
+						},
+						{
+							"code": "320685",
+							"name": "海安市"
+						}
+					]
+				},
+				{
+					"code": "320700",
+					"name": "连云港市",
+					"childs": [{
+							"code": "320703",
+							"name": "连云区"
+						},
+						{
+							"code": "320706",
+							"name": "海州区"
+						},
+						{
+							"code": "320707",
+							"name": "赣榆区"
+						},
+						{
+							"code": "320722",
+							"name": "东海县"
+						},
+						{
+							"code": "320723",
+							"name": "灌云县"
+						},
+						{
+							"code": "320724",
+							"name": "灌南县"
+						}
+					]
+				},
+				{
+					"code": "320800",
+					"name": "淮安市",
+					"childs": [{
+							"code": "320803",
+							"name": "淮安区"
+						},
+						{
+							"code": "320804",
+							"name": "淮阴区"
+						},
+						{
+							"code": "320812",
+							"name": "清江浦区"
+						},
+						{
+							"code": "320813",
+							"name": "洪泽区"
+						},
+						{
+							"code": "320826",
+							"name": "涟水县"
+						},
+						{
+							"code": "320830",
+							"name": "盱眙县"
+						},
+						{
+							"code": "320831",
+							"name": "金湖县"
+						}
+					]
+				},
+				{
+					"code": "320900",
+					"name": "盐城市",
+					"childs": [{
+							"code": "320902",
+							"name": "亭湖区"
+						},
+						{
+							"code": "320903",
+							"name": "盐都区"
+						},
+						{
+							"code": "320904",
+							"name": "大丰区"
+						},
+						{
+							"code": "320921",
+							"name": "响水县"
+						},
+						{
+							"code": "320922",
+							"name": "滨海县"
+						},
+						{
+							"code": "320923",
+							"name": "阜宁县"
+						},
+						{
+							"code": "320924",
+							"name": "射阳县"
+						},
+						{
+							"code": "320925",
+							"name": "建湖县"
+						},
+						{
+							"code": "320981",
+							"name": "东台市"
+						}
+					]
+				},
+				{
+					"code": "321000",
+					"name": "扬州市",
+					"childs": [{
+							"code": "321002",
+							"name": "广陵区"
+						},
+						{
+							"code": "321003",
+							"name": "邗江区"
+						},
+						{
+							"code": "321012",
+							"name": "江都区"
+						},
+						{
+							"code": "321023",
+							"name": "宝应县"
+						},
+						{
+							"code": "321081",
+							"name": "仪征市"
+						},
+						{
+							"code": "321084",
+							"name": "高邮市"
+						}
+					]
+				},
+				{
+					"code": "321100",
+					"name": "镇江市",
+					"childs": [{
+							"code": "321102",
+							"name": "京口区"
+						},
+						{
+							"code": "321111",
+							"name": "润州区"
+						},
+						{
+							"code": "321112",
+							"name": "丹徒区"
+						},
+						{
+							"code": "321181",
+							"name": "丹阳市"
+						},
+						{
+							"code": "321182",
+							"name": "扬中市"
+						},
+						{
+							"code": "321183",
+							"name": "句容市"
+						}
+					]
+				},
+				{
+					"code": "321200",
+					"name": "泰州市",
+					"childs": [{
+							"code": "321202",
+							"name": "海陵区"
+						},
+						{
+							"code": "321203",
+							"name": "高港区"
+						},
+						{
+							"code": "321204",
+							"name": "姜堰区"
+						},
+						{
+							"code": "321281",
+							"name": "兴化市"
+						},
+						{
+							"code": "321282",
+							"name": "靖江市"
+						},
+						{
+							"code": "321283",
+							"name": "泰兴市"
+						}
+					]
+				},
+				{
+					"code": "321300",
+					"name": "宿迁市",
+					"childs": [{
+							"code": "321302",
+							"name": "宿城区"
+						},
+						{
+							"code": "321311",
+							"name": "宿豫区"
+						},
+						{
+							"code": "321322",
+							"name": "沭阳县"
+						},
+						{
+							"code": "321323",
+							"name": "泗阳县"
+						},
+						{
+							"code": "321324",
+							"name": "泗洪县"
+						}
+					]
+				}
+			]
+		},
+		{
+			"code": "330000",
+			"name": "浙江省",
+			"childs": [{
+					"code": "330100",
+					"name": "杭州市",
+					"childs": [{
+							"code": "330102",
+							"name": "上城区"
+						},
+						{
+							"code": "330103",
+							"name": "下城区"
+						},
+						{
+							"code": "330104",
+							"name": "江干区"
+						},
+						{
+							"code": "330105",
+							"name": "拱墅区"
+						},
+						{
+							"code": "330106",
+							"name": "西湖区"
+						},
+						{
+							"code": "330108",
+							"name": "滨江区"
+						},
+						{
+							"code": "330109",
+							"name": "萧山区"
+						},
+						{
+							"code": "330110",
+							"name": "余杭区"
+						},
+						{
+							"code": "330111",
+							"name": "富阳区"
+						},
+						{
+							"code": "330112",
+							"name": "临安区"
+						},
+						{
+							"code": "330122",
+							"name": "桐庐县"
+						},
+						{
+							"code": "330127",
+							"name": "淳安县"
+						},
+						{
+							"code": "330182",
+							"name": "建德市"
+						}
+					]
+				},
+				{
+					"code": "330200",
+					"name": "宁波市",
+					"childs": [{
+							"code": "330203",
+							"name": "海曙区"
+						},
+						{
+							"code": "330205",
+							"name": "江北区"
+						},
+						{
+							"code": "330206",
+							"name": "北仑区"
+						},
+						{
+							"code": "330211",
+							"name": "镇海区"
+						},
+						{
+							"code": "330212",
+							"name": "鄞州区"
+						},
+						{
+							"code": "330213",
+							"name": "奉化区"
+						},
+						{
+							"code": "330225",
+							"name": "象山县"
+						},
+						{
+							"code": "330226",
+							"name": "宁海县"
+						},
+						{
+							"code": "330281",
+							"name": "余姚市"
+						},
+						{
+							"code": "330282",
+							"name": "慈溪市"
+						}
+					]
+				},
+				{
+					"code": "330300",
+					"name": "温州市",
+					"childs": [{
+							"code": "330302",
+							"name": "鹿城区"
+						},
+						{
+							"code": "330303",
+							"name": "龙湾区"
+						},
+						{
+							"code": "330304",
+							"name": "瓯海区"
+						},
+						{
+							"code": "330305",
+							"name": "洞头区"
+						},
+						{
+							"code": "330324",
+							"name": "永嘉县"
+						},
+						{
+							"code": "330326",
+							"name": "平阳县"
+						},
+						{
+							"code": "330327",
+							"name": "苍南县"
+						},
+						{
+							"code": "330328",
+							"name": "文成县"
+						},
+						{
+							"code": "330329",
+							"name": "泰顺县"
+						},
+						{
+							"code": "330381",
+							"name": "瑞安市"
+						},
+						{
+							"code": "330382",
+							"name": "乐清市"
+						}
+					]
+				},
+				{
+					"code": "330400",
+					"name": "嘉兴市",
+					"childs": [{
+							"code": "330402",
+							"name": "南湖区"
+						},
+						{
+							"code": "330411",
+							"name": "秀洲区"
+						},
+						{
+							"code": "330421",
+							"name": "嘉善县"
+						},
+						{
+							"code": "330424",
+							"name": "海盐县"
+						},
+						{
+							"code": "330481",
+							"name": "海宁市"
+						},
+						{
+							"code": "330482",
+							"name": "平湖市"
+						},
+						{
+							"code": "330483",
+							"name": "桐乡市"
+						}
+					]
+				},
+				{
+					"code": "330500",
+					"name": "湖州市",
+					"childs": [{
+							"code": "330502",
+							"name": "吴兴区"
+						},
+						{
+							"code": "330503",
+							"name": "南浔区"
+						},
+						{
+							"code": "330521",
+							"name": "德清县"
+						},
+						{
+							"code": "330522",
+							"name": "长兴县"
+						},
+						{
+							"code": "330523",
+							"name": "安吉县"
+						}
+					]
+				},
+				{
+					"code": "330600",
+					"name": "绍兴市",
+					"childs": [{
+							"code": "330602",
+							"name": "越城区"
+						},
+						{
+							"code": "330603",
+							"name": "柯桥区"
+						},
+						{
+							"code": "330604",
+							"name": "上虞区"
+						},
+						{
+							"code": "330624",
+							"name": "新昌县"
+						},
+						{
+							"code": "330681",
+							"name": "诸暨市"
+						},
+						{
+							"code": "330683",
+							"name": "嵊州市"
+						}
+					]
+				},
+				{
+					"code": "330700",
+					"name": "金华市",
+					"childs": [{
+							"code": "330702",
+							"name": "婺城区"
+						},
+						{
+							"code": "330703",
+							"name": "金东区"
+						},
+						{
+							"code": "330723",
+							"name": "武义县"
+						},
+						{
+							"code": "330726",
+							"name": "浦江县"
+						},
+						{
+							"code": "330727",
+							"name": "磐安县"
+						},
+						{
+							"code": "330781",
+							"name": "兰溪市"
+						},
+						{
+							"code": "330782",
+							"name": "义乌市"
+						},
+						{
+							"code": "330783",
+							"name": "东阳市"
+						},
+						{
+							"code": "330784",
+							"name": "永康市"
+						}
+					]
+				},
+				{
+					"code": "330800",
+					"name": "衢州市",
+					"childs": [{
+							"code": "330802",
+							"name": "柯城区"
+						},
+						{
+							"code": "330803",
+							"name": "衢江区"
+						},
+						{
+							"code": "330822",
+							"name": "常山县"
+						},
+						{
+							"code": "330824",
+							"name": "开化县"
+						},
+						{
+							"code": "330825",
+							"name": "龙游县"
+						},
+						{
+							"code": "330881",
+							"name": "江山市"
+						}
+					]
+				},
+				{
+					"code": "330900",
+					"name": "舟山市",
+					"childs": [{
+							"code": "330902",
+							"name": "定海区"
+						},
+						{
+							"code": "330903",
+							"name": "普陀区"
+						},
+						{
+							"code": "330921",
+							"name": "岱山县"
+						},
+						{
+							"code": "330922",
+							"name": "嵊泗县"
+						}
+					]
+				},
+				{
+					"code": "331000",
+					"name": "台州市",
+					"childs": [{
+							"code": "331002",
+							"name": "椒江区"
+						},
+						{
+							"code": "331003",
+							"name": "黄岩区"
+						},
+						{
+							"code": "331004",
+							"name": "路桥区"
+						},
+						{
+							"code": "331022",
+							"name": "三门县"
+						},
+						{
+							"code": "331023",
+							"name": "天台县"
+						},
+						{
+							"code": "331024",
+							"name": "仙居县"
+						},
+						{
+							"code": "331081",
+							"name": "温岭市"
+						},
+						{
+							"code": "331082",
+							"name": "临海市"
+						},
+						{
+							"code": "331083",
+							"name": "玉环市"
+						}
+					]
+				},
+				{
+					"code": "331100",
+					"name": "丽水市",
+					"childs": [{
+							"code": "331102",
+							"name": "莲都区"
+						},
+						{
+							"code": "331121",
+							"name": "青田县"
+						},
+						{
+							"code": "331122",
+							"name": "缙云县"
+						},
+						{
+							"code": "331123",
+							"name": "遂昌县"
+						},
+						{
+							"code": "331124",
+							"name": "松阳县"
+						},
+						{
+							"code": "331125",
+							"name": "云和县"
+						},
+						{
+							"code": "331126",
+							"name": "庆元县"
+						},
+						{
+							"code": "331127",
+							"name": "景宁畲族自治县"
+						},
+						{
+							"code": "331181",
+							"name": "龙泉市"
+						}
+					]
+				}
+			]
+		},
+		{
+			"code": "340000",
+			"name": "安徽省",
+			"childs": [{
+					"code": "340100",
+					"name": "合肥市",
+					"childs": [{
+							"code": "340102",
+							"name": "瑶海区"
+						},
+						{
+							"code": "340103",
+							"name": "庐阳区"
+						},
+						{
+							"code": "340104",
+							"name": "蜀山区"
+						},
+						{
+							"code": "340111",
+							"name": "包河区"
+						},
+						{
+							"code": "340121",
+							"name": "长丰县"
+						},
+						{
+							"code": "340122",
+							"name": "肥东县"
+						},
+						{
+							"code": "340123",
+							"name": "肥西县"
+						},
+						{
+							"code": "340124",
+							"name": "庐江县"
+						},
+						{
+							"code": "340181",
+							"name": "巢湖市"
+						}
+					]
+				},
+				{
+					"code": "340200",
+					"name": "芜湖市",
+					"childs": [{
+							"code": "340202",
+							"name": "镜湖区"
+						},
+						{
+							"code": "340203",
+							"name": "弋江区"
+						},
+						{
+							"code": "340207",
+							"name": "鸠江区"
+						},
+						{
+							"code": "340208",
+							"name": "三山区"
+						},
+						{
+							"code": "340221",
+							"name": "芜湖县"
+						},
+						{
+							"code": "340222",
+							"name": "繁昌县"
+						},
+						{
+							"code": "340223",
+							"name": "南陵县"
+						},
+						{
+							"code": "340225",
+							"name": "无为县"
+						}
+					]
+				},
+				{
+					"code": "340300",
+					"name": "蚌埠市",
+					"childs": [{
+							"code": "340302",
+							"name": "龙子湖区"
+						},
+						{
+							"code": "340303",
+							"name": "蚌山区"
+						},
+						{
+							"code": "340304",
+							"name": "禹会区"
+						},
+						{
+							"code": "340311",
+							"name": "淮上区"
+						},
+						{
+							"code": "340321",
+							"name": "怀远县"
+						},
+						{
+							"code": "340322",
+							"name": "五河县"
+						},
+						{
+							"code": "340323",
+							"name": "固镇县"
+						}
+					]
+				},
+				{
+					"code": "340400",
+					"name": "淮南市",
+					"childs": [{
+							"code": "340402",
+							"name": "大通区"
+						},
+						{
+							"code": "340403",
+							"name": "田家庵区"
+						},
+						{
+							"code": "340404",
+							"name": "谢家集区"
+						},
+						{
+							"code": "340405",
+							"name": "八公山区"
+						},
+						{
+							"code": "340406",
+							"name": "潘集区"
+						},
+						{
+							"code": "340421",
+							"name": "凤台县"
+						},
+						{
+							"code": "340422",
+							"name": "寿县"
+						}
+					]
+				},
+				{
+					"code": "340500",
+					"name": "马鞍山市",
+					"childs": [{
+							"code": "340503",
+							"name": "花山区"
+						},
+						{
+							"code": "340504",
+							"name": "雨山区"
+						},
+						{
+							"code": "340506",
+							"name": "博望区"
+						},
+						{
+							"code": "340521",
+							"name": "当涂县"
+						},
+						{
+							"code": "340522",
+							"name": "含山县"
+						},
+						{
+							"code": "340523",
+							"name": "和县"
+						}
+					]
+				},
+				{
+					"code": "340600",
+					"name": "淮北市",
+					"childs": [{
+							"code": "340602",
+							"name": "杜集区"
+						},
+						{
+							"code": "340603",
+							"name": "相山区"
+						},
+						{
+							"code": "340604",
+							"name": "烈山区"
+						},
+						{
+							"code": "340621",
+							"name": "濉溪县"
+						}
+					]
+				},
+				{
+					"code": "340700",
+					"name": "铜陵市",
+					"childs": [{
+							"code": "340705",
+							"name": "铜官区"
+						},
+						{
+							"code": "340706",
+							"name": "义安区"
+						},
+						{
+							"code": "340711",
+							"name": "郊区"
+						},
+						{
+							"code": "340722",
+							"name": "枞阳县"
+						}
+					]
+				},
+				{
+					"code": "340800",
+					"name": "安庆市",
+					"childs": [{
+							"code": "340802",
+							"name": "迎江区"
+						},
+						{
+							"code": "340803",
+							"name": "大观区"
+						},
+						{
+							"code": "340811",
+							"name": "宜秀区"
+						},
+						{
+							"code": "340822",
+							"name": "怀宁县"
+						},
+						{
+							"code": "340825",
+							"name": "太湖县"
+						},
+						{
+							"code": "340826",
+							"name": "宿松县"
+						},
+						{
+							"code": "340827",
+							"name": "望江县"
+						},
+						{
+							"code": "340828",
+							"name": "岳西县"
+						},
+						{
+							"code": "340881",
+							"name": "桐城市"
+						},
+						{
+							"code": "340882",
+							"name": "潜山市"
+						}
+					]
+				},
+				{
+					"code": "341000",
+					"name": "黄山市",
+					"childs": [{
+							"code": "341002",
+							"name": "屯溪区"
+						},
+						{
+							"code": "341003",
+							"name": "黄山区"
+						},
+						{
+							"code": "341004",
+							"name": "徽州区"
+						},
+						{
+							"code": "341021",
+							"name": "歙县"
+						},
+						{
+							"code": "341022",
+							"name": "休宁县"
+						},
+						{
+							"code": "341023",
+							"name": "黟县"
+						},
+						{
+							"code": "341024",
+							"name": "祁门县"
+						}
+					]
+				},
+				{
+					"code": "341100",
+					"name": "滁州市",
+					"childs": [{
+							"code": "341102",
+							"name": "琅琊区"
+						},
+						{
+							"code": "341103",
+							"name": "南谯区"
+						},
+						{
+							"code": "341122",
+							"name": "来安县"
+						},
+						{
+							"code": "341124",
+							"name": "全椒县"
+						},
+						{
+							"code": "341125",
+							"name": "定远县"
+						},
+						{
+							"code": "341126",
+							"name": "凤阳县"
+						},
+						{
+							"code": "341181",
+							"name": "天长市"
+						},
+						{
+							"code": "341182",
+							"name": "明光市"
+						}
+					]
+				},
+				{
+					"code": "341200",
+					"name": "阜阳市",
+					"childs": [{
+							"code": "341202",
+							"name": "颍州区"
+						},
+						{
+							"code": "341203",
+							"name": "颍东区"
+						},
+						{
+							"code": "341204",
+							"name": "颍泉区"
+						},
+						{
+							"code": "341221",
+							"name": "临泉县"
+						},
+						{
+							"code": "341222",
+							"name": "太和县"
+						},
+						{
+							"code": "341225",
+							"name": "阜南县"
+						},
+						{
+							"code": "341226",
+							"name": "颍上县"
+						},
+						{
+							"code": "341282",
+							"name": "界首市"
+						}
+					]
+				},
+				{
+					"code": "341300",
+					"name": "宿州市",
+					"childs": [{
+							"code": "341302",
+							"name": "埇桥区"
+						},
+						{
+							"code": "341321",
+							"name": "砀山县"
+						},
+						{
+							"code": "341322",
+							"name": "萧县"
+						},
+						{
+							"code": "341323",
+							"name": "灵璧县"
+						},
+						{
+							"code": "341324",
+							"name": "泗县"
+						}
+					]
+				},
+				{
+					"code": "341500",
+					"name": "六安市",
+					"childs": [{
+							"code": "341502",
+							"name": "金安区"
+						},
+						{
+							"code": "341503",
+							"name": "裕安区"
+						},
+						{
+							"code": "341504",
+							"name": "叶集区"
+						},
+						{
+							"code": "341522",
+							"name": "霍邱县"
+						},
+						{
+							"code": "341523",
+							"name": "舒城县"
+						},
+						{
+							"code": "341524",
+							"name": "金寨县"
+						},
+						{
+							"code": "341525",
+							"name": "霍山县"
+						}
+					]
+				},
+				{
+					"code": "341600",
+					"name": "亳州市",
+					"childs": [{
+							"code": "341602",
+							"name": "谯城区"
+						},
+						{
+							"code": "341621",
+							"name": "涡阳县"
+						},
+						{
+							"code": "341622",
+							"name": "蒙城县"
+						},
+						{
+							"code": "341623",
+							"name": "利辛县"
+						}
+					]
+				},
+				{
+					"code": "341700",
+					"name": "池州市",
+					"childs": [{
+							"code": "341702",
+							"name": "贵池区"
+						},
+						{
+							"code": "341721",
+							"name": "东至县"
+						},
+						{
+							"code": "341722",
+							"name": "石台县"
+						},
+						{
+							"code": "341723",
+							"name": "青阳县"
+						}
+					]
+				},
+				{
+					"code": "341800",
+					"name": "宣城市",
+					"childs": [{
+							"code": "341802",
+							"name": "宣州区"
+						},
+						{
+							"code": "341821",
+							"name": "郎溪县"
+						},
+						{
+							"code": "341822",
+							"name": "广德县"
+						},
+						{
+							"code": "341823",
+							"name": "泾县"
+						},
+						{
+							"code": "341824",
+							"name": "绩溪县"
+						},
+						{
+							"code": "341825",
+							"name": "旌德县"
+						},
+						{
+							"code": "341881",
+							"name": "宁国市"
+						}
+					]
+				}
+			]
+		},
+		{
+			"code": "350000",
+			"name": "福建省",
+			"childs": [{
+					"code": "350100",
+					"name": "福州市",
+					"childs": [{
+							"code": "350102",
+							"name": "鼓楼区"
+						},
+						{
+							"code": "350103",
+							"name": "台江区"
+						},
+						{
+							"code": "350104",
+							"name": "仓山区"
+						},
+						{
+							"code": "350105",
+							"name": "马尾区"
+						},
+						{
+							"code": "350111",
+							"name": "晋安区"
+						},
+						{
+							"code": "350112",
+							"name": "长乐区"
+						},
+						{
+							"code": "350121",
+							"name": "闽侯县"
+						},
+						{
+							"code": "350122",
+							"name": "连江县"
+						},
+						{
+							"code": "350123",
+							"name": "罗源县"
+						},
+						{
+							"code": "350124",
+							"name": "闽清县"
+						},
+						{
+							"code": "350125",
+							"name": "永泰县"
+						},
+						{
+							"code": "350128",
+							"name": "平潭县"
+						},
+						{
+							"code": "350181",
+							"name": "福清市"
+						}
+					]
+				},
+				{
+					"code": "350200",
+					"name": "厦门市",
+					"childs": [{
+							"code": "350203",
+							"name": "思明区"
+						},
+						{
+							"code": "350205",
+							"name": "海沧区"
+						},
+						{
+							"code": "350206",
+							"name": "湖里区"
+						},
+						{
+							"code": "350211",
+							"name": "集美区"
+						},
+						{
+							"code": "350212",
+							"name": "同安区"
+						},
+						{
+							"code": "350213",
+							"name": "翔安区"
+						}
+					]
+				},
+				{
+					"code": "350300",
+					"name": "莆田市",
+					"childs": [{
+							"code": "350302",
+							"name": "城厢区"
+						},
+						{
+							"code": "350303",
+							"name": "涵江区"
+						},
+						{
+							"code": "350304",
+							"name": "荔城区"
+						},
+						{
+							"code": "350305",
+							"name": "秀屿区"
+						},
+						{
+							"code": "350322",
+							"name": "仙游县"
+						}
+					]
+				},
+				{
+					"code": "350400",
+					"name": "三明市",
+					"childs": [{
+							"code": "350402",
+							"name": "梅列区"
+						},
+						{
+							"code": "350403",
+							"name": "三元区"
+						},
+						{
+							"code": "350421",
+							"name": "明溪县"
+						},
+						{
+							"code": "350423",
+							"name": "清流县"
+						},
+						{
+							"code": "350424",
+							"name": "宁化县"
+						},
+						{
+							"code": "350425",
+							"name": "大田县"
+						},
+						{
+							"code": "350426",
+							"name": "尤溪县"
+						},
+						{
+							"code": "350427",
+							"name": "沙县"
+						},
+						{
+							"code": "350428",
+							"name": "将乐县"
+						},
+						{
+							"code": "350429",
+							"name": "泰宁县"
+						},
+						{
+							"code": "350430",
+							"name": "建宁县"
+						},
+						{
+							"code": "350481",
+							"name": "永安市"
+						}
+					]
+				},
+				{
+					"code": "350500",
+					"name": "泉州市",
+					"childs": [{
+							"code": "350502",
+							"name": "鲤城区"
+						},
+						{
+							"code": "350503",
+							"name": "丰泽区"
+						},
+						{
+							"code": "350504",
+							"name": "洛江区"
+						},
+						{
+							"code": "350505",
+							"name": "泉港区"
+						},
+						{
+							"code": "350521",
+							"name": "惠安县"
+						},
+						{
+							"code": "350524",
+							"name": "安溪县"
+						},
+						{
+							"code": "350525",
+							"name": "永春县"
+						},
+						{
+							"code": "350526",
+							"name": "德化县"
+						},
+						{
+							"code": "350527",
+							"name": "金门县"
+						},
+						{
+							"code": "350581",
+							"name": "石狮市"
+						},
+						{
+							"code": "350582",
+							"name": "晋江市"
+						},
+						{
+							"code": "350583",
+							"name": "南安市"
+						}
+					]
+				},
+				{
+					"code": "350600",
+					"name": "漳州市",
+					"childs": [{
+							"code": "350602",
+							"name": "芗城区"
+						},
+						{
+							"code": "350603",
+							"name": "龙文区"
+						},
+						{
+							"code": "350622",
+							"name": "云霄县"
+						},
+						{
+							"code": "350623",
+							"name": "漳浦县"
+						},
+						{
+							"code": "350624",
+							"name": "诏安县"
+						},
+						{
+							"code": "350625",
+							"name": "长泰县"
+						},
+						{
+							"code": "350626",
+							"name": "东山县"
+						},
+						{
+							"code": "350627",
+							"name": "南靖县"
+						},
+						{
+							"code": "350628",
+							"name": "平和县"
+						},
+						{
+							"code": "350629",
+							"name": "华安县"
+						},
+						{
+							"code": "350681",
+							"name": "龙海市"
+						}
+					]
+				},
+				{
+					"code": "350700",
+					"name": "南平市",
+					"childs": [{
+							"code": "350702",
+							"name": "延平区"
+						},
+						{
+							"code": "350703",
+							"name": "建阳区"
+						},
+						{
+							"code": "350721",
+							"name": "顺昌县"
+						},
+						{
+							"code": "350722",
+							"name": "浦城县"
+						},
+						{
+							"code": "350723",
+							"name": "光泽县"
+						},
+						{
+							"code": "350724",
+							"name": "松溪县"
+						},
+						{
+							"code": "350725",
+							"name": "政和县"
+						},
+						{
+							"code": "350781",
+							"name": "邵武市"
+						},
+						{
+							"code": "350782",
+							"name": "武夷山市"
+						},
+						{
+							"code": "350783",
+							"name": "建瓯市"
+						}
+					]
+				},
+				{
+					"code": "350800",
+					"name": "龙岩市",
+					"childs": [{
+							"code": "350802",
+							"name": "新罗区"
+						},
+						{
+							"code": "350803",
+							"name": "永定区"
+						},
+						{
+							"code": "350821",
+							"name": "长汀县"
+						},
+						{
+							"code": "350823",
+							"name": "上杭县"
+						},
+						{
+							"code": "350824",
+							"name": "武平县"
+						},
+						{
+							"code": "350825",
+							"name": "连城县"
+						},
+						{
+							"code": "350881",
+							"name": "漳平市"
+						}
+					]
+				},
+				{
+					"code": "350900",
+					"name": "宁德市",
+					"childs": [{
+							"code": "350902",
+							"name": "蕉城区"
+						},
+						{
+							"code": "350921",
+							"name": "霞浦县"
+						},
+						{
+							"code": "350922",
+							"name": "古田县"
+						},
+						{
+							"code": "350923",
+							"name": "屏南县"
+						},
+						{
+							"code": "350924",
+							"name": "寿宁县"
+						},
+						{
+							"code": "350925",
+							"name": "周宁县"
+						},
+						{
+							"code": "350926",
+							"name": "柘荣县"
+						},
+						{
+							"code": "350981",
+							"name": "福安市"
+						},
+						{
+							"code": "350982",
+							"name": "福鼎市"
+						}
+					]
+				}
+			]
+		},
+		{
+			"code": "360000",
+			"name": "江西省",
+			"childs": [{
+					"code": "360100",
+					"name": "南昌市",
+					"childs": [{
+							"code": "360102",
+							"name": "东湖区"
+						},
+						{
+							"code": "360103",
+							"name": "西湖区"
+						},
+						{
+							"code": "360104",
+							"name": "青云谱区"
+						},
+						{
+							"code": "360105",
+							"name": "湾里区"
+						},
+						{
+							"code": "360111",
+							"name": "青山湖区"
+						},
+						{
+							"code": "360112",
+							"name": "新建区"
+						},
+						{
+							"code": "360121",
+							"name": "南昌县"
+						},
+						{
+							"code": "360123",
+							"name": "安义县"
+						},
+						{
+							"code": "360124",
+							"name": "进贤县"
+						}
+					]
+				},
+				{
+					"code": "360200",
+					"name": "景德镇市",
+					"childs": [{
+							"code": "360202",
+							"name": "昌江区"
+						},
+						{
+							"code": "360203",
+							"name": "珠山区"
+						},
+						{
+							"code": "360222",
+							"name": "浮梁县"
+						},
+						{
+							"code": "360281",
+							"name": "乐平市"
+						}
+					]
+				},
+				{
+					"code": "360300",
+					"name": "萍乡市",
+					"childs": [{
+							"code": "360302",
+							"name": "安源区"
+						},
+						{
+							"code": "360313",
+							"name": "湘东区"
+						},
+						{
+							"code": "360321",
+							"name": "莲花县"
+						},
+						{
+							"code": "360322",
+							"name": "上栗县"
+						},
+						{
+							"code": "360323",
+							"name": "芦溪县"
+						}
+					]
+				},
+				{
+					"code": "360400",
+					"name": "九江市",
+					"childs": [{
+							"code": "360402",
+							"name": "濂溪区"
+						},
+						{
+							"code": "360403",
+							"name": "浔阳区"
+						},
+						{
+							"code": "360404",
+							"name": "柴桑区"
+						},
+						{
+							"code": "360423",
+							"name": "武宁县"
+						},
+						{
+							"code": "360424",
+							"name": "修水县"
+						},
+						{
+							"code": "360425",
+							"name": "永修县"
+						},
+						{
+							"code": "360426",
+							"name": "德安县"
+						},
+						{
+							"code": "360428",
+							"name": "都昌县"
+						},
+						{
+							"code": "360429",
+							"name": "湖口县"
+						},
+						{
+							"code": "360430",
+							"name": "彭泽县"
+						},
+						{
+							"code": "360481",
+							"name": "瑞昌市"
+						},
+						{
+							"code": "360482",
+							"name": "共青城市"
+						},
+						{
+							"code": "360483",
+							"name": "庐山市"
+						}
+					]
+				},
+				{
+					"code": "360500",
+					"name": "新余市",
+					"childs": [{
+							"code": "360502",
+							"name": "渝水区"
+						},
+						{
+							"code": "360521",
+							"name": "分宜县"
+						}
+					]
+				},
+				{
+					"code": "360600",
+					"name": "鹰潭市",
+					"childs": [{
+							"code": "360602",
+							"name": "月湖区"
+						},
+						{
+							"code": "360603",
+							"name": "余江区"
+						},
+						{
+							"code": "360681",
+							"name": "贵溪市"
+						}
+					]
+				},
+				{
+					"code": "360700",
+					"name": "赣州市",
+					"childs": [{
+							"code": "360702",
+							"name": "章贡区"
+						},
+						{
+							"code": "360703",
+							"name": "南康区"
+						},
+						{
+							"code": "360704",
+							"name": "赣县区"
+						},
+						{
+							"code": "360722",
+							"name": "信丰县"
+						},
+						{
+							"code": "360723",
+							"name": "大余县"
+						},
+						{
+							"code": "360724",
+							"name": "上犹县"
+						},
+						{
+							"code": "360725",
+							"name": "崇义县"
+						},
+						{
+							"code": "360726",
+							"name": "安远县"
+						},
+						{
+							"code": "360727",
+							"name": "龙南县"
+						},
+						{
+							"code": "360728",
+							"name": "定南县"
+						},
+						{
+							"code": "360729",
+							"name": "全南县"
+						},
+						{
+							"code": "360730",
+							"name": "宁都县"
+						},
+						{
+							"code": "360731",
+							"name": "于都县"
+						},
+						{
+							"code": "360732",
+							"name": "兴国县"
+						},
+						{
+							"code": "360733",
+							"name": "会昌县"
+						},
+						{
+							"code": "360734",
+							"name": "寻乌县"
+						},
+						{
+							"code": "360735",
+							"name": "石城县"
+						},
+						{
+							"code": "360781",
+							"name": "瑞金市"
+						}
+					]
+				},
+				{
+					"code": "360800",
+					"name": "吉安市",
+					"childs": [{
+							"code": "360802",
+							"name": "吉州区"
+						},
+						{
+							"code": "360803",
+							"name": "青原区"
+						},
+						{
+							"code": "360821",
+							"name": "吉安县"
+						},
+						{
+							"code": "360822",
+							"name": "吉水县"
+						},
+						{
+							"code": "360823",
+							"name": "峡江县"
+						},
+						{
+							"code": "360824",
+							"name": "新干县"
+						},
+						{
+							"code": "360825",
+							"name": "永丰县"
+						},
+						{
+							"code": "360826",
+							"name": "泰和县"
+						},
+						{
+							"code": "360827",
+							"name": "遂川县"
+						},
+						{
+							"code": "360828",
+							"name": "万安县"
+						},
+						{
+							"code": "360829",
+							"name": "安福县"
+						},
+						{
+							"code": "360830",
+							"name": "永新县"
+						},
+						{
+							"code": "360881",
+							"name": "井冈山市"
+						}
+					]
+				},
+				{
+					"code": "360900",
+					"name": "宜春市",
+					"childs": [{
+							"code": "360902",
+							"name": "袁州区"
+						},
+						{
+							"code": "360921",
+							"name": "奉新县"
+						},
+						{
+							"code": "360922",
+							"name": "万载县"
+						},
+						{
+							"code": "360923",
+							"name": "上高县"
+						},
+						{
+							"code": "360924",
+							"name": "宜丰县"
+						},
+						{
+							"code": "360925",
+							"name": "靖安县"
+						},
+						{
+							"code": "360926",
+							"name": "铜鼓县"
+						},
+						{
+							"code": "360981",
+							"name": "丰城市"
+						},
+						{
+							"code": "360982",
+							"name": "樟树市"
+						},
+						{
+							"code": "360983",
+							"name": "高安市"
+						}
+					]
+				},
+				{
+					"code": "361000",
+					"name": "抚州市",
+					"childs": [{
+							"code": "361002",
+							"name": "临川区"
+						},
+						{
+							"code": "361003",
+							"name": "东乡区"
+						},
+						{
+							"code": "361021",
+							"name": "南城县"
+						},
+						{
+							"code": "361022",
+							"name": "黎川县"
+						},
+						{
+							"code": "361023",
+							"name": "南丰县"
+						},
+						{
+							"code": "361024",
+							"name": "崇仁县"
+						},
+						{
+							"code": "361025",
+							"name": "乐安县"
+						},
+						{
+							"code": "361026",
+							"name": "宜黄县"
+						},
+						{
+							"code": "361027",
+							"name": "金溪县"
+						},
+						{
+							"code": "361028",
+							"name": "资溪县"
+						},
+						{
+							"code": "361030",
+							"name": "广昌县"
+						}
+					]
+				},
+				{
+					"code": "361100",
+					"name": "上饶市",
+					"childs": [{
+							"code": "361102",
+							"name": "信州区"
+						},
+						{
+							"code": "361103",
+							"name": "广丰区"
+						},
+						{
+							"code": "361121",
+							"name": "上饶县"
+						},
+						{
+							"code": "361123",
+							"name": "玉山县"
+						},
+						{
+							"code": "361124",
+							"name": "铅山县"
+						},
+						{
+							"code": "361125",
+							"name": "横峰县"
+						},
+						{
+							"code": "361126",
+							"name": "弋阳县"
+						},
+						{
+							"code": "361127",
+							"name": "余干县"
+						},
+						{
+							"code": "361128",
+							"name": "鄱阳县"
+						},
+						{
+							"code": "361129",
+							"name": "万年县"
+						},
+						{
+							"code": "361130",
+							"name": "婺源县"
+						},
+						{
+							"code": "361181",
+							"name": "德兴市"
+						}
+					]
+				}
+			]
+		},
+		{
+			"code": "370000",
+			"name": "山东省",
+			"childs": [{
+					"code": "370100",
+					"name": "济南市",
+					"childs": [{
+							"code": "370102",
+							"name": "历下区"
+						},
+						{
+							"code": "370103",
+							"name": "市中区"
+						},
+						{
+							"code": "370104",
+							"name": "槐荫区"
+						},
+						{
+							"code": "370105",
+							"name": "天桥区"
+						},
+						{
+							"code": "370112",
+							"name": "历城区"
+						},
+						{
+							"code": "370113",
+							"name": "长清区"
+						},
+						{
+							"code": "370114",
+							"name": "章丘区"
+						},
+						{
+							"code": "370115",
+							"name": "济阳区"
+						},
+						{
+							"code": "370116",
+							"name": "莱芜区"
+						},
+						{
+							"code": "370117",
+							"name": "钢城区"
+						},
+						{
+							"code": "370124",
+							"name": "平阴县"
+						},
+						{
+							"code": "370126",
+							"name": "商河县"
+						}
+					]
+				},
+				{
+					"code": "370200",
+					"name": "青岛市",
+					"childs": [{
+							"code": "370202",
+							"name": "市南区"
+						},
+						{
+							"code": "370203",
+							"name": "市北区"
+						},
+						{
+							"code": "370211",
+							"name": "黄岛区"
+						},
+						{
+							"code": "370212",
+							"name": "崂山区"
+						},
+						{
+							"code": "370213",
+							"name": "李沧区"
+						},
+						{
+							"code": "370214",
+							"name": "城阳区"
+						},
+						{
+							"code": "370215",
+							"name": "即墨区"
+						},
+						{
+							"code": "370281",
+							"name": "胶州市"
+						},
+						{
+							"code": "370283",
+							"name": "平度市"
+						},
+						{
+							"code": "370285",
+							"name": "莱西市"
+						}
+					]
+				},
+				{
+					"code": "370300",
+					"name": "淄博市",
+					"childs": [{
+							"code": "370302",
+							"name": "淄川区"
+						},
+						{
+							"code": "370303",
+							"name": "张店区"
+						},
+						{
+							"code": "370304",
+							"name": "博山区"
+						},
+						{
+							"code": "370305",
+							"name": "临淄区"
+						},
+						{
+							"code": "370306",
+							"name": "周村区"
+						},
+						{
+							"code": "370321",
+							"name": "桓台县"
+						},
+						{
+							"code": "370322",
+							"name": "高青县"
+						},
+						{
+							"code": "370323",
+							"name": "沂源县"
+						}
+					]
+				},
+				{
+					"code": "370400",
+					"name": "枣庄市",
+					"childs": [{
+							"code": "370402",
+							"name": "市中区"
+						},
+						{
+							"code": "370403",
+							"name": "薛城区"
+						},
+						{
+							"code": "370404",
+							"name": "峄城区"
+						},
+						{
+							"code": "370405",
+							"name": "台儿庄区"
+						},
+						{
+							"code": "370406",
+							"name": "山亭区"
+						},
+						{
+							"code": "370481",
+							"name": "滕州市"
+						}
+					]
+				},
+				{
+					"code": "370500",
+					"name": "东营市",
+					"childs": [{
+							"code": "370502",
+							"name": "东营区"
+						},
+						{
+							"code": "370503",
+							"name": "河口区"
+						},
+						{
+							"code": "370505",
+							"name": "垦利区"
+						},
+						{
+							"code": "370522",
+							"name": "利津县"
+						},
+						{
+							"code": "370523",
+							"name": "广饶县"
+						}
+					]
+				},
+				{
+					"code": "370600",
+					"name": "烟台市",
+					"childs": [{
+							"code": "370602",
+							"name": "芝罘区"
+						},
+						{
+							"code": "370611",
+							"name": "福山区"
+						},
+						{
+							"code": "370612",
+							"name": "牟平区"
+						},
+						{
+							"code": "370613",
+							"name": "莱山区"
+						},
+						{
+							"code": "370634",
+							"name": "长岛县"
+						},
+						{
+							"code": "370681",
+							"name": "龙口市"
+						},
+						{
+							"code": "370682",
+							"name": "莱阳市"
+						},
+						{
+							"code": "370683",
+							"name": "莱州市"
+						},
+						{
+							"code": "370684",
+							"name": "蓬莱市"
+						},
+						{
+							"code": "370685",
+							"name": "招远市"
+						},
+						{
+							"code": "370686",
+							"name": "栖霞市"
+						},
+						{
+							"code": "370687",
+							"name": "海阳市"
+						}
+					]
+				},
+				{
+					"code": "370700",
+					"name": "潍坊市",
+					"childs": [{
+							"code": "370702",
+							"name": "潍城区"
+						},
+						{
+							"code": "370703",
+							"name": "寒亭区"
+						},
+						{
+							"code": "370704",
+							"name": "坊子区"
+						},
+						{
+							"code": "370705",
+							"name": "奎文区"
+						},
+						{
+							"code": "370724",
+							"name": "临朐县"
+						},
+						{
+							"code": "370725",
+							"name": "昌乐县"
+						},
+						{
+							"code": "370781",
+							"name": "青州市"
+						},
+						{
+							"code": "370782",
+							"name": "诸城市"
+						},
+						{
+							"code": "370783",
+							"name": "寿光市"
+						},
+						{
+							"code": "370784",
+							"name": "安丘市"
+						},
+						{
+							"code": "370785",
+							"name": "高密市"
+						},
+						{
+							"code": "370786",
+							"name": "昌邑市"
+						}
+					]
+				},
+				{
+					"code": "370800",
+					"name": "济宁市",
+					"childs": [{
+							"code": "370811",
+							"name": "任城区"
+						},
+						{
+							"code": "370812",
+							"name": "兖州区"
+						},
+						{
+							"code": "370826",
+							"name": "微山县"
+						},
+						{
+							"code": "370827",
+							"name": "鱼台县"
+						},
+						{
+							"code": "370828",
+							"name": "金乡县"
+						},
+						{
+							"code": "370829",
+							"name": "嘉祥县"
+						},
+						{
+							"code": "370830",
+							"name": "汶上县"
+						},
+						{
+							"code": "370831",
+							"name": "泗水县"
+						},
+						{
+							"code": "370832",
+							"name": "梁山县"
+						},
+						{
+							"code": "370881",
+							"name": "曲阜市"
+						},
+						{
+							"code": "370883",
+							"name": "邹城市"
+						}
+					]
+				},
+				{
+					"code": "370900",
+					"name": "泰安市",
+					"childs": [{
+							"code": "370902",
+							"name": "泰山区"
+						},
+						{
+							"code": "370911",
+							"name": "岱岳区"
+						},
+						{
+							"code": "370921",
+							"name": "宁阳县"
+						},
+						{
+							"code": "370923",
+							"name": "东平县"
+						},
+						{
+							"code": "370982",
+							"name": "新泰市"
+						},
+						{
+							"code": "370983",
+							"name": "肥城市"
+						}
+					]
+				},
+				{
+					"code": "371000",
+					"name": "威海市",
+					"childs": [{
+							"code": "371002",
+							"name": "环翠区"
+						},
+						{
+							"code": "371003",
+							"name": "文登区"
+						},
+						{
+							"code": "371082",
+							"name": "荣成市"
+						},
+						{
+							"code": "371083",
+							"name": "乳山市"
+						}
+					]
+				},
+				{
+					"code": "371100",
+					"name": "日照市",
+					"childs": [{
+							"code": "371102",
+							"name": "东港区"
+						},
+						{
+							"code": "371103",
+							"name": "岚山区"
+						},
+						{
+							"code": "371121",
+							"name": "五莲县"
+						},
+						{
+							"code": "371122",
+							"name": "莒县"
+						}
+					]
+				},
+				{
+					"code": "371300",
+					"name": "临沂市",
+					"childs": [{
+							"code": "371302",
+							"name": "兰山区"
+						},
+						{
+							"code": "371311",
+							"name": "罗庄区"
+						},
+						{
+							"code": "371312",
+							"name": "河东区"
+						},
+						{
+							"code": "371321",
+							"name": "沂南县"
+						},
+						{
+							"code": "371322",
+							"name": "郯城县"
+						},
+						{
+							"code": "371323",
+							"name": "沂水县"
+						},
+						{
+							"code": "371324",
+							"name": "兰陵县"
+						},
+						{
+							"code": "371325",
+							"name": "费县"
+						},
+						{
+							"code": "371326",
+							"name": "平邑县"
+						},
+						{
+							"code": "371327",
+							"name": "莒南县"
+						},
+						{
+							"code": "371328",
+							"name": "蒙阴县"
+						},
+						{
+							"code": "371329",
+							"name": "临沭县"
+						}
+					]
+				},
+				{
+					"code": "371400",
+					"name": "德州市",
+					"childs": [{
+							"code": "371402",
+							"name": "德城区"
+						},
+						{
+							"code": "371403",
+							"name": "陵城区"
+						},
+						{
+							"code": "371422",
+							"name": "宁津县"
+						},
+						{
+							"code": "371423",
+							"name": "庆云县"
+						},
+						{
+							"code": "371424",
+							"name": "临邑县"
+						},
+						{
+							"code": "371425",
+							"name": "齐河县"
+						},
+						{
+							"code": "371426",
+							"name": "平原县"
+						},
+						{
+							"code": "371427",
+							"name": "夏津县"
+						},
+						{
+							"code": "371428",
+							"name": "武城县"
+						},
+						{
+							"code": "371481",
+							"name": "乐陵市"
+						},
+						{
+							"code": "371482",
+							"name": "禹城市"
+						}
+					]
+				},
+				{
+					"code": "371500",
+					"name": "聊城市",
+					"childs": [{
+							"code": "371502",
+							"name": "东昌府区"
+						},
+						{
+							"code": "371521",
+							"name": "阳谷县"
+						},
+						{
+							"code": "371522",
+							"name": "莘县"
+						},
+						{
+							"code": "371523",
+							"name": "茌平县"
+						},
+						{
+							"code": "371524",
+							"name": "东阿县"
+						},
+						{
+							"code": "371525",
+							"name": "冠县"
+						},
+						{
+							"code": "371526",
+							"name": "高唐县"
+						},
+						{
+							"code": "371581",
+							"name": "临清市"
+						}
+					]
+				},
+				{
+					"code": "371600",
+					"name": "滨州市",
+					"childs": [{
+							"code": "371602",
+							"name": "滨城区"
+						},
+						{
+							"code": "371603",
+							"name": "沾化区"
+						},
+						{
+							"code": "371621",
+							"name": "惠民县"
+						},
+						{
+							"code": "371622",
+							"name": "阳信县"
+						},
+						{
+							"code": "371623",
+							"name": "无棣县"
+						},
+						{
+							"code": "371625",
+							"name": "博兴县"
+						},
+						{
+							"code": "371681",
+							"name": "邹平市"
+						}
+					]
+				},
+				{
+					"code": "371700",
+					"name": "菏泽市",
+					"childs": [{
+							"code": "371702",
+							"name": "牡丹区"
+						},
+						{
+							"code": "371703",
+							"name": "定陶区"
+						},
+						{
+							"code": "371721",
+							"name": "曹县"
+						},
+						{
+							"code": "371722",
+							"name": "单县"
+						},
+						{
+							"code": "371723",
+							"name": "成武县"
+						},
+						{
+							"code": "371724",
+							"name": "巨野县"
+						},
+						{
+							"code": "371725",
+							"name": "郓城县"
+						},
+						{
+							"code": "371726",
+							"name": "鄄城县"
+						},
+						{
+							"code": "371728",
+							"name": "东明县"
+						}
+					]
+				}
+			]
+		},
+		{
+			"code": "410000",
+			"name": "河南省",
+			"childs": [{
+					"code": "410100",
+					"name": "郑州市",
+					"childs": [{
+							"code": "410102",
+							"name": "中原区"
+						},
+						{
+							"code": "410103",
+							"name": "二七区"
+						},
+						{
+							"code": "410104",
+							"name": "管城回族区"
+						},
+						{
+							"code": "410105",
+							"name": "金水区"
+						},
+						{
+							"code": "410106",
+							"name": "上街区"
+						},
+						{
+							"code": "410108",
+							"name": "惠济区"
+						},
+						{
+							"code": "410122",
+							"name": "中牟县"
+						},
+						{
+							"code": "410181",
+							"name": "巩义市"
+						},
+						{
+							"code": "410182",
+							"name": "荥阳市"
+						},
+						{
+							"code": "410183",
+							"name": "新密市"
+						},
+						{
+							"code": "410184",
+							"name": "新郑市"
+						},
+						{
+							"code": "410185",
+							"name": "登封市"
+						}
+					]
+				},
+				{
+					"code": "410200",
+					"name": "开封市",
+					"childs": [{
+							"code": "410202",
+							"name": "龙亭区"
+						},
+						{
+							"code": "410203",
+							"name": "顺河回族区"
+						},
+						{
+							"code": "410204",
+							"name": "鼓楼区"
+						},
+						{
+							"code": "410205",
+							"name": "禹王台区"
+						},
+						{
+							"code": "410212",
+							"name": "祥符区"
+						},
+						{
+							"code": "410221",
+							"name": "杞县"
+						},
+						{
+							"code": "410222",
+							"name": "通许县"
+						},
+						{
+							"code": "410223",
+							"name": "尉氏县"
+						},
+						{
+							"code": "410225",
+							"name": "兰考县"
+						}
+					]
+				},
+				{
+					"code": "410300",
+					"name": "洛阳市",
+					"childs": [{
+							"code": "410302",
+							"name": "老城区"
+						},
+						{
+							"code": "410303",
+							"name": "西工区"
+						},
+						{
+							"code": "410304",
+							"name": "瀍河回族区"
+						},
+						{
+							"code": "410305",
+							"name": "涧西区"
+						},
+						{
+							"code": "410306",
+							"name": "吉利区"
+						},
+						{
+							"code": "410311",
+							"name": "洛龙区"
+						},
+						{
+							"code": "410322",
+							"name": "孟津县"
+						},
+						{
+							"code": "410323",
+							"name": "新安县"
+						},
+						{
+							"code": "410324",
+							"name": "栾川县"
+						},
+						{
+							"code": "410325",
+							"name": "嵩县"
+						},
+						{
+							"code": "410326",
+							"name": "汝阳县"
+						},
+						{
+							"code": "410327",
+							"name": "宜阳县"
+						},
+						{
+							"code": "410328",
+							"name": "洛宁县"
+						},
+						{
+							"code": "410329",
+							"name": "伊川县"
+						},
+						{
+							"code": "410381",
+							"name": "偃师市"
+						}
+					]
+				},
+				{
+					"code": "410400",
+					"name": "平顶山市",
+					"childs": [{
+							"code": "410402",
+							"name": "新华区"
+						},
+						{
+							"code": "410403",
+							"name": "卫东区"
+						},
+						{
+							"code": "410404",
+							"name": "石龙区"
+						},
+						{
+							"code": "410411",
+							"name": "湛河区"
+						},
+						{
+							"code": "410421",
+							"name": "宝丰县"
+						},
+						{
+							"code": "410422",
+							"name": "叶县"
+						},
+						{
+							"code": "410423",
+							"name": "鲁山县"
+						},
+						{
+							"code": "410425",
+							"name": "郏县"
+						},
+						{
+							"code": "410481",
+							"name": "舞钢市"
+						},
+						{
+							"code": "410482",
+							"name": "汝州市"
+						}
+					]
+				},
+				{
+					"code": "410500",
+					"name": "安阳市",
+					"childs": [{
+							"code": "410502",
+							"name": "文峰区"
+						},
+						{
+							"code": "410503",
+							"name": "北关区"
+						},
+						{
+							"code": "410505",
+							"name": "殷都区"
+						},
+						{
+							"code": "410506",
+							"name": "龙安区"
+						},
+						{
+							"code": "410522",
+							"name": "安阳县"
+						},
+						{
+							"code": "410523",
+							"name": "汤阴县"
+						},
+						{
+							"code": "410526",
+							"name": "滑县"
+						},
+						{
+							"code": "410527",
+							"name": "内黄县"
+						},
+						{
+							"code": "410581",
+							"name": "林州市"
+						}
+					]
+				},
+				{
+					"code": "410600",
+					"name": "鹤壁市",
+					"childs": [{
+							"code": "410602",
+							"name": "鹤山区"
+						},
+						{
+							"code": "410603",
+							"name": "山城区"
+						},
+						{
+							"code": "410611",
+							"name": "淇滨区"
+						},
+						{
+							"code": "410621",
+							"name": "浚县"
+						},
+						{
+							"code": "410622",
+							"name": "淇县"
+						}
+					]
+				},
+				{
+					"code": "410700",
+					"name": "新乡市",
+					"childs": [{
+							"code": "410702",
+							"name": "红旗区"
+						},
+						{
+							"code": "410703",
+							"name": "卫滨区"
+						},
+						{
+							"code": "410704",
+							"name": "凤泉区"
+						},
+						{
+							"code": "410711",
+							"name": "牧野区"
+						},
+						{
+							"code": "410721",
+							"name": "新乡县"
+						},
+						{
+							"code": "410724",
+							"name": "获嘉县"
+						},
+						{
+							"code": "410725",
+							"name": "原阳县"
+						},
+						{
+							"code": "410726",
+							"name": "延津县"
+						},
+						{
+							"code": "410727",
+							"name": "封丘县"
+						},
+						{
+							"code": "410728",
+							"name": "长垣县"
+						},
+						{
+							"code": "410781",
+							"name": "卫辉市"
+						},
+						{
+							"code": "410782",
+							"name": "辉县市"
+						}
+					]
+				},
+				{
+					"code": "410800",
+					"name": "焦作市",
+					"childs": [{
+							"code": "410802",
+							"name": "解放区"
+						},
+						{
+							"code": "410803",
+							"name": "中站区"
+						},
+						{
+							"code": "410804",
+							"name": "马村区"
+						},
+						{
+							"code": "410811",
+							"name": "山阳区"
+						},
+						{
+							"code": "410821",
+							"name": "修武县"
+						},
+						{
+							"code": "410822",
+							"name": "博爱县"
+						},
+						{
+							"code": "410823",
+							"name": "武陟县"
+						},
+						{
+							"code": "410825",
+							"name": "温县"
+						},
+						{
+							"code": "410882",
+							"name": "沁阳市"
+						},
+						{
+							"code": "410883",
+							"name": "孟州市"
+						}
+					]
+				},
+				{
+					"code": "410900",
+					"name": "濮阳市",
+					"childs": [{
+							"code": "410902",
+							"name": "华龙区"
+						},
+						{
+							"code": "410922",
+							"name": "清丰县"
+						},
+						{
+							"code": "410923",
+							"name": "南乐县"
+						},
+						{
+							"code": "410926",
+							"name": "范县"
+						},
+						{
+							"code": "410927",
+							"name": "台前县"
+						},
+						{
+							"code": "410928",
+							"name": "濮阳县"
+						}
+					]
+				},
+				{
+					"code": "411000",
+					"name": "许昌市",
+					"childs": [{
+							"code": "411002",
+							"name": "魏都区"
+						},
+						{
+							"code": "411003",
+							"name": "建安区"
+						},
+						{
+							"code": "411024",
+							"name": "鄢陵县"
+						},
+						{
+							"code": "411025",
+							"name": "襄城县"
+						},
+						{
+							"code": "411081",
+							"name": "禹州市"
+						},
+						{
+							"code": "411082",
+							"name": "长葛市"
+						}
+					]
+				},
+				{
+					"code": "411100",
+					"name": "漯河市",
+					"childs": [{
+							"code": "411102",
+							"name": "源汇区"
+						},
+						{
+							"code": "411103",
+							"name": "郾城区"
+						},
+						{
+							"code": "411104",
+							"name": "召陵区"
+						},
+						{
+							"code": "411121",
+							"name": "舞阳县"
+						},
+						{
+							"code": "411122",
+							"name": "临颍县"
+						}
+					]
+				},
+				{
+					"code": "411200",
+					"name": "三门峡市",
+					"childs": [{
+							"code": "411202",
+							"name": "湖滨区"
+						},
+						{
+							"code": "411203",
+							"name": "陕州区"
+						},
+						{
+							"code": "411221",
+							"name": "渑池县"
+						},
+						{
+							"code": "411224",
+							"name": "卢氏县"
+						},
+						{
+							"code": "411281",
+							"name": "义马市"
+						},
+						{
+							"code": "411282",
+							"name": "灵宝市"
+						}
+					]
+				},
+				{
+					"code": "411300",
+					"name": "南阳市",
+					"childs": [{
+							"code": "411302",
+							"name": "宛城区"
+						},
+						{
+							"code": "411303",
+							"name": "卧龙区"
+						},
+						{
+							"code": "411321",
+							"name": "南召县"
+						},
+						{
+							"code": "411322",
+							"name": "方城县"
+						},
+						{
+							"code": "411323",
+							"name": "西峡县"
+						},
+						{
+							"code": "411324",
+							"name": "镇平县"
+						},
+						{
+							"code": "411325",
+							"name": "内乡县"
+						},
+						{
+							"code": "411326",
+							"name": "淅川县"
+						},
+						{
+							"code": "411327",
+							"name": "社旗县"
+						},
+						{
+							"code": "411328",
+							"name": "唐河县"
+						},
+						{
+							"code": "411329",
+							"name": "新野县"
+						},
+						{
+							"code": "411330",
+							"name": "桐柏县"
+						},
+						{
+							"code": "411381",
+							"name": "邓州市"
+						}
+					]
+				},
+				{
+					"code": "411400",
+					"name": "商丘市",
+					"childs": [{
+							"code": "411402",
+							"name": "梁园区"
+						},
+						{
+							"code": "411403",
+							"name": "睢阳区"
+						},
+						{
+							"code": "411421",
+							"name": "民权县"
+						},
+						{
+							"code": "411422",
+							"name": "睢县"
+						},
+						{
+							"code": "411423",
+							"name": "宁陵县"
+						},
+						{
+							"code": "411424",
+							"name": "柘城县"
+						},
+						{
+							"code": "411425",
+							"name": "虞城县"
+						},
+						{
+							"code": "411426",
+							"name": "夏邑县"
+						},
+						{
+							"code": "411481",
+							"name": "永城市"
+						}
+					]
+				},
+				{
+					"code": "411500",
+					"name": "信阳市",
+					"childs": [{
+							"code": "411502",
+							"name": "浉河区"
+						},
+						{
+							"code": "411503",
+							"name": "平桥区"
+						},
+						{
+							"code": "411521",
+							"name": "罗山县"
+						},
+						{
+							"code": "411522",
+							"name": "光山县"
+						},
+						{
+							"code": "411523",
+							"name": "新县"
+						},
+						{
+							"code": "411524",
+							"name": "商城县"
+						},
+						{
+							"code": "411525",
+							"name": "固始县"
+						},
+						{
+							"code": "411526",
+							"name": "潢川县"
+						},
+						{
+							"code": "411527",
+							"name": "淮滨县"
+						},
+						{
+							"code": "411528",
+							"name": "息县"
+						}
+					]
+				},
+				{
+					"code": "411600",
+					"name": "周口市",
+					"childs": [{
+							"code": "411602",
+							"name": "川汇区"
+						},
+						{
+							"code": "411621",
+							"name": "扶沟县"
+						},
+						{
+							"code": "411622",
+							"name": "西华县"
+						},
+						{
+							"code": "411623",
+							"name": "商水县"
+						},
+						{
+							"code": "411624",
+							"name": "沈丘县"
+						},
+						{
+							"code": "411625",
+							"name": "郸城县"
+						},
+						{
+							"code": "411626",
+							"name": "淮阳县"
+						},
+						{
+							"code": "411627",
+							"name": "太康县"
+						},
+						{
+							"code": "411628",
+							"name": "鹿邑县"
+						},
+						{
+							"code": "411681",
+							"name": "项城市"
+						}
+					]
+				},
+				{
+					"code": "411700",
+					"name": "驻马店市",
+					"childs": [{
+							"code": "411702",
+							"name": "驿城区"
+						},
+						{
+							"code": "411721",
+							"name": "西平县"
+						},
+						{
+							"code": "411722",
+							"name": "上蔡县"
+						},
+						{
+							"code": "411723",
+							"name": "平舆县"
+						},
+						{
+							"code": "411724",
+							"name": "正阳县"
+						},
+						{
+							"code": "411725",
+							"name": "确山县"
+						},
+						{
+							"code": "411726",
+							"name": "泌阳县"
+						},
+						{
+							"code": "411727",
+							"name": "汝南县"
+						},
+						{
+							"code": "411728",
+							"name": "遂平县"
+						},
+						{
+							"code": "411729",
+							"name": "新蔡县"
+						}
+					]
+				}
+			]
+		},
+		{
+			"code": "420000",
+			"name": "湖北省",
+			"childs": [{
+					"code": "420100",
+					"name": "武汉市",
+					"childs": [{
+							"code": "420102",
+							"name": "江岸区"
+						},
+						{
+							"code": "420103",
+							"name": "江汉区"
+						},
+						{
+							"code": "420104",
+							"name": "硚口区"
+						},
+						{
+							"code": "420105",
+							"name": "汉阳区"
+						},
+						{
+							"code": "420106",
+							"name": "武昌区"
+						},
+						{
+							"code": "420107",
+							"name": "青山区"
+						},
+						{
+							"code": "420111",
+							"name": "洪山区"
+						},
+						{
+							"code": "420112",
+							"name": "东西湖区"
+						},
+						{
+							"code": "420113",
+							"name": "汉南区"
+						},
+						{
+							"code": "420114",
+							"name": "蔡甸区"
+						},
+						{
+							"code": "420115",
+							"name": "江夏区"
+						},
+						{
+							"code": "420116",
+							"name": "黄陂区"
+						},
+						{
+							"code": "420117",
+							"name": "新洲区"
+						}
+					]
+				},
+				{
+					"code": "420200",
+					"name": "黄石市",
+					"childs": [{
+							"code": "420202",
+							"name": "黄石港区"
+						},
+						{
+							"code": "420203",
+							"name": "西塞山区"
+						},
+						{
+							"code": "420204",
+							"name": "下陆区"
+						},
+						{
+							"code": "420205",
+							"name": "铁山区"
+						},
+						{
+							"code": "420222",
+							"name": "阳新县"
+						},
+						{
+							"code": "420281",
+							"name": "大冶市"
+						}
+					]
+				},
+				{
+					"code": "420300",
+					"name": "十堰市",
+					"childs": [{
+							"code": "420302",
+							"name": "茅箭区"
+						},
+						{
+							"code": "420303",
+							"name": "张湾区"
+						},
+						{
+							"code": "420304",
+							"name": "郧阳区"
+						},
+						{
+							"code": "420322",
+							"name": "郧西县"
+						},
+						{
+							"code": "420323",
+							"name": "竹山县"
+						},
+						{
+							"code": "420324",
+							"name": "竹溪县"
+						},
+						{
+							"code": "420325",
+							"name": "房县"
+						},
+						{
+							"code": "420381",
+							"name": "丹江口市"
+						}
+					]
+				},
+				{
+					"code": "420500",
+					"name": "宜昌市",
+					"childs": [{
+							"code": "420502",
+							"name": "西陵区"
+						},
+						{
+							"code": "420503",
+							"name": "伍家岗区"
+						},
+						{
+							"code": "420504",
+							"name": "点军区"
+						},
+						{
+							"code": "420505",
+							"name": "猇亭区"
+						},
+						{
+							"code": "420506",
+							"name": "夷陵区"
+						},
+						{
+							"code": "420525",
+							"name": "远安县"
+						},
+						{
+							"code": "420526",
+							"name": "兴山县"
+						},
+						{
+							"code": "420527",
+							"name": "秭归县"
+						},
+						{
+							"code": "420528",
+							"name": "长阳土家族自治县"
+						},
+						{
+							"code": "420529",
+							"name": "五峰土家族自治县"
+						},
+						{
+							"code": "420581",
+							"name": "宜都市"
+						},
+						{
+							"code": "420582",
+							"name": "当阳市"
+						},
+						{
+							"code": "420583",
+							"name": "枝江市"
+						}
+					]
+				},
+				{
+					"code": "420600",
+					"name": "襄阳市",
+					"childs": [{
+							"code": "420602",
+							"name": "襄城区"
+						},
+						{
+							"code": "420606",
+							"name": "樊城区"
+						},
+						{
+							"code": "420607",
+							"name": "襄州区"
+						},
+						{
+							"code": "420624",
+							"name": "南漳县"
+						},
+						{
+							"code": "420625",
+							"name": "谷城县"
+						},
+						{
+							"code": "420626",
+							"name": "保康县"
+						},
+						{
+							"code": "420682",
+							"name": "老河口市"
+						},
+						{
+							"code": "420683",
+							"name": "枣阳市"
+						},
+						{
+							"code": "420684",
+							"name": "宜城市"
+						}
+					]
+				},
+				{
+					"code": "420700",
+					"name": "鄂州市",
+					"childs": [{
+							"code": "420702",
+							"name": "梁子湖区"
+						},
+						{
+							"code": "420703",
+							"name": "华容区"
+						},
+						{
+							"code": "420704",
+							"name": "鄂城区"
+						}
+					]
+				},
+				{
+					"code": "420800",
+					"name": "荆门市",
+					"childs": [{
+							"code": "420802",
+							"name": "东宝区"
+						},
+						{
+							"code": "420804",
+							"name": "掇刀区"
+						},
+						{
+							"code": "420822",
+							"name": "沙洋县"
+						},
+						{
+							"code": "420881",
+							"name": "钟祥市"
+						},
+						{
+							"code": "420882",
+							"name": "京山市"
+						}
+					]
+				},
+				{
+					"code": "420900",
+					"name": "孝感市",
+					"childs": [{
+							"code": "420902",
+							"name": "孝南区"
+						},
+						{
+							"code": "420921",
+							"name": "孝昌县"
+						},
+						{
+							"code": "420922",
+							"name": "大悟县"
+						},
+						{
+							"code": "420923",
+							"name": "云梦县"
+						},
+						{
+							"code": "420981",
+							"name": "应城市"
+						},
+						{
+							"code": "420982",
+							"name": "安陆市"
+						},
+						{
+							"code": "420984",
+							"name": "汉川市"
+						}
+					]
+				},
+				{
+					"code": "421000",
+					"name": "荆州市",
+					"childs": [{
+							"code": "421002",
+							"name": "沙市区"
+						},
+						{
+							"code": "421003",
+							"name": "荆州区"
+						},
+						{
+							"code": "421022",
+							"name": "公安县"
+						},
+						{
+							"code": "421023",
+							"name": "监利县"
+						},
+						{
+							"code": "421024",
+							"name": "江陵县"
+						},
+						{
+							"code": "421081",
+							"name": "石首市"
+						},
+						{
+							"code": "421083",
+							"name": "洪湖市"
+						},
+						{
+							"code": "421087",
+							"name": "松滋市"
+						}
+					]
+				},
+				{
+					"code": "421100",
+					"name": "黄冈市",
+					"childs": [{
+							"code": "421102",
+							"name": "黄州区"
+						},
+						{
+							"code": "421121",
+							"name": "团风县"
+						},
+						{
+							"code": "421122",
+							"name": "红安县"
+						},
+						{
+							"code": "421123",
+							"name": "罗田县"
+						},
+						{
+							"code": "421124",
+							"name": "英山县"
+						},
+						{
+							"code": "421125",
+							"name": "浠水县"
+						},
+						{
+							"code": "421126",
+							"name": "蕲春县"
+						},
+						{
+							"code": "421127",
+							"name": "黄梅县"
+						},
+						{
+							"code": "421181",
+							"name": "麻城市"
+						},
+						{
+							"code": "421182",
+							"name": "武穴市"
+						}
+					]
+				},
+				{
+					"code": "421200",
+					"name": "咸宁市",
+					"childs": [{
+							"code": "421202",
+							"name": "咸安区"
+						},
+						{
+							"code": "421221",
+							"name": "嘉鱼县"
+						},
+						{
+							"code": "421222",
+							"name": "通城县"
+						},
+						{
+							"code": "421223",
+							"name": "崇阳县"
+						},
+						{
+							"code": "421224",
+							"name": "通山县"
+						},
+						{
+							"code": "421281",
+							"name": "赤壁市"
+						}
+					]
+				},
+				{
+					"code": "421300",
+					"name": "随州市",
+					"childs": [{
+							"code": "421303",
+							"name": "曾都区"
+						},
+						{
+							"code": "421321",
+							"name": "随县"
+						},
+						{
+							"code": "421381",
+							"name": "广水市"
+						}
+					]
+				},
+				{
+					"code": "422800",
+					"name": "恩施土家族苗族自治州",
+					"childs": [{
+							"code": "422801",
+							"name": "恩施市"
+						},
+						{
+							"code": "422802",
+							"name": "利川市"
+						},
+						{
+							"code": "422822",
+							"name": "建始县"
+						},
+						{
+							"code": "422823",
+							"name": "巴东县"
+						},
+						{
+							"code": "422825",
+							"name": "宣恩县"
+						},
+						{
+							"code": "422826",
+							"name": "咸丰县"
+						},
+						{
+							"code": "422827",
+							"name": "来凤县"
+						},
+						{
+							"code": "422828",
+							"name": "鹤峰县"
+						}
+					]
+				},
+				{
+					"code": "420100",
+					"name": "武汉市",
+					"childs": [{
+							"code": "420102",
+							"name": "江岸区"
+						},
+						{
+							"code": "420103",
+							"name": "江汉区"
+						},
+						{
+							"code": "420104",
+							"name": "硚口区"
+						},
+						{
+							"code": "420105",
+							"name": "汉阳区"
+						},
+						{
+							"code": "420106",
+							"name": "武昌区"
+						},
+						{
+							"code": "420107",
+							"name": "青山区"
+						},
+						{
+							"code": "420111",
+							"name": "洪山区"
+						},
+						{
+							"code": "420112",
+							"name": "东西湖区"
+						},
+						{
+							"code": "420113",
+							"name": "汉南区"
+						},
+						{
+							"code": "420114",
+							"name": "蔡甸区"
+						},
+						{
+							"code": "420115",
+							"name": "江夏区"
+						},
+						{
+							"code": "420116",
+							"name": "黄陂区"
+						},
+						{
+							"code": "420117",
+							"name": "新洲区"
+						}
+					]
+				},
+				{
+					"code": "429005",
+					"name": "潜江市",
+					"childs": [{
+							"code": "429005001",
+							"name": "园林街道"
+						},
+						{
+							"code": "429005002",
+							"name": "杨市街道"
+						},
+						{
+							"code": "429005003",
+							"name": "周矶街道"
+						},
+						{
+							"code": "429005004",
+							"name": "广华街道"
+						},
+						{
+							"code": "429005005",
+							"name": "泰丰街道"
+						},
+						{
+							"code": "429005006",
+							"name": "高场街道"
+						},
+						{
+							"code": "429005100",
+							"name": "竹根滩镇"
+						},
+						{
+							"code": "429005101",
+							"name": "渔洋镇"
+						},
+						{
+							"code": "429005102",
+							"name": "王场镇"
+						},
+						{
+							"code": "429005103",
+							"name": "高石碑镇"
+						},
+						{
+							"code": "429005104",
+							"name": "熊口镇"
+						},
+						{
+							"code": "429005105",
+							"name": "老新镇"
+						},
+						{
+							"code": "429005106",
+							"name": "浩口镇"
+						},
+						{
+							"code": "429005107",
+							"name": "积玉口镇"
+						},
+						{
+							"code": "429005108",
+							"name": "张金镇"
+						},
+						{
+							"code": "429005109",
+							"name": "龙湾镇"
+						},
+						{
+							"code": "429005400",
+							"name": "江汉石油管理局"
+						},
+						{
+							"code": "429005401",
+							"name": "潜江经济开发区"
+						},
+						{
+							"code": "429005450",
+							"name": "周矶管理局"
+						},
+						{
+							"code": "429005451",
+							"name": "后湖管理局"
+						},
+						{
+							"code": "429005451",
+							"name": "后湖管理局"
+						},
+						{
+							"code": "429005452",
+							"name": "熊口管理局"
+						},
+						{
+							"code": "429005453",
+							"name": "总口管理局"
+						},
+						{
+							"code": "429005454",
+							"name": "白鹭湖管理局"
+						},
+						{
+							"code": "429005455",
+							"name": "运粮湖管理局"
+						},
+						{
+							"code": "429005455",
+							"name": "浩口原种场"
+						}
+
+					]
+				},
+				{
+					"code": "429004",
+					"name": "仙桃市",
+					"childs": [{
+							"code": "429004001",
+							"name": "沙嘴街道"
+						},
+						{
+							"code": "429004002",
+							"name": "干河街道"
+						},
+						{
+							"code": "429004003",
+							"name": "龙华山街道"
+						},
+						{
+							"code": "429004100",
+							"name": "郑场镇"
+						},
+						{
+							"code": "429004101",
+							"name": "毛嘴镇"
+						},
+						{
+							"code": "429004102",
+							"name": "豆河镇"
+						},
+						{
+							"code": "429004103",
+							"name": "三伏潭镇"
+						},
+						{
+							"code": "429004104",
+							"name": "胡场镇"
+						},
+						{
+							"code": "429004105",
+							"name": "长倘口镇"
+						},
+						{
+							"code": "429004106",
+							"name": "西流河镇"
+						},
+						{
+							"code": "429004107",
+							"name": "沙湖镇"
+						},
+						{
+							"code": "429004108",
+							"name": "杨林尾镇"
+						},
+						{
+							"code": "429004109",
+							"name": "彭场镇"
+						},
+						{
+							"code": "429004110",
+							"name": "张沟镇"
+						},
+						{
+							"code": "429004111",
+							"name": "郭河镇"
+						},
+						{
+							"code": "429004112",
+							"name": "沔城回族镇"
+						},
+						{
+							"code": "429004113",
+							"name": "通海口"
+						},
+						{
+							"code": "429004114",
+							"name": "陈场镇"
+						},
+						{
+							"code": "429004400",
+							"name": "工业园区"
+						},
+						{
+							"code": "429004401",
+							"name": "九合垸原种场"
+						},
+						{
+							"code": "429004401",
+							"name": "沙湖原种场"
+						},
+						{
+							"code": "429004404",
+							"name": "五湖渔场"
+						},
+						{
+							"code": "429004405",
+							"name": "赵西垸林场"
+						},
+						{
+							"code": "429004407",
+							"name": "畜禽良种场"
+						},
+						{
+							"code": "429004408",
+							"name": "排湖风景区"
+						}
+
+					]
+				},
+				{
+					"code": "429006",
+					"name": "天门市",
+					"childs": [{
+							"code": "429006001",
+							"name": "竟陵街道"
+						},
+						{
+							"code": "429006002",
+							"name": "侨乡街道开发区"
+						},
+						{
+							"code": "429006003",
+							"name": "杨林街道"
+						},
+						{
+							"code": "429006100",
+							"name": "多宝镇"
+						},
+						{
+							"code": "429006101",
+							"name": "拖市镇"
+						},
+						{
+							"code": "429006102",
+							"name": "张港镇"
+						},
+						{
+							"code": "429006103",
+							"name": "蒋场镇"
+						},
+						{
+							"code": "429006104",
+							"name": "汪场镇"
+						},
+						{
+							"code": "429006105",
+							"name": "渔薪镇"
+						},
+						{
+							"code": "429006106",
+							"name": "黄潭镇"
+						},
+						{
+							"code": "429006107",
+							"name": "岳口镇"
+						},
+						{
+							"code": "429006108",
+							"name": "横林镇"
+						},
+						{
+							"code": "429006109",
+							"name": "彭市镇"
+						},
+						{
+							"code": "429006110",
+							"name": "麻洋镇"
+						},
+						{
+							"code": "429006111",
+							"name": "多祥镇"
+						},
+						{
+							"code": "429006112",
+							"name": "干驿镇"
+						},
+						{
+							"code": "429006113",
+							"name": "马湾镇"
+						},
+						{
+							"code": "429006114",
+							"name": "卢市镇"
+						},
+						{
+							"code": "429006115",
+							"name": "小板镇"
+						},
+						{
+							"code": "429006116",
+							"name": "九真镇"
+						},
+						{
+							"code": "429006118",
+							"name": "皂市镇"
+						},
+						{
+							"code": "429006119",
+							"name": "胡市镇"
+						},
+						{
+							"code": "429006120",
+							"name": "石河镇"
+						},
+						{
+							"code": "429006121",
+							"name": "佛子山镇"
+						},
+						{
+							"code": "429006201",
+							"name": "净潭乡"
+						},
+						{
+							"code": "429006450",
+							"name": "蒋湖农场"
+						},
+						{
+							"code": "429006451",
+							"name": "白茅湖农场"
+						},
+						{
+							"code": "429006452",
+							"name": "沉湖管委会"
+						}
+
+					]
+				}
+
+			]
+		},
+		{
+			"code": "430000",
+			"name": "湖南省",
+			"childs": [{
+					"code": "430100",
+					"name": "长沙市",
+					"childs": [{
+							"code": "430102",
+							"name": "芙蓉区"
+						},
+						{
+							"code": "430103",
+							"name": "天心区"
+						},
+						{
+							"code": "430104",
+							"name": "岳麓区"
+						},
+						{
+							"code": "430105",
+							"name": "开福区"
+						},
+						{
+							"code": "430111",
+							"name": "雨花区"
+						},
+						{
+							"code": "430112",
+							"name": "望城区"
+						},
+						{
+							"code": "430121",
+							"name": "长沙县"
+						},
+						{
+							"code": "430181",
+							"name": "浏阳市"
+						},
+						{
+							"code": "430182",
+							"name": "宁乡市"
+						}
+					]
+				},
+				{
+					"code": "430200",
+					"name": "株洲市",
+					"childs": [{
+							"code": "430202",
+							"name": "荷塘区"
+						},
+						{
+							"code": "430203",
+							"name": "芦淞区"
+						},
+						{
+							"code": "430204",
+							"name": "石峰区"
+						},
+						{
+							"code": "430211",
+							"name": "天元区"
+						},
+						{
+							"code": "430212",
+							"name": "渌口区"
+						},
+						{
+							"code": "430223",
+							"name": "攸县"
+						},
+						{
+							"code": "430224",
+							"name": "茶陵县"
+						},
+						{
+							"code": "430225",
+							"name": "炎陵县"
+						},
+						{
+							"code": "430281",
+							"name": "醴陵市"
+						}
+					]
+				},
+				{
+					"code": "430300",
+					"name": "湘潭市",
+					"childs": [{
+							"code": "430302",
+							"name": "雨湖区"
+						},
+						{
+							"code": "430304",
+							"name": "岳塘区"
+						},
+						{
+							"code": "430321",
+							"name": "湘潭县"
+						},
+						{
+							"code": "430381",
+							"name": "湘乡市"
+						},
+						{
+							"code": "430382",
+							"name": "韶山市"
+						}
+					]
+				},
+				{
+					"code": "430400",
+					"name": "衡阳市",
+					"childs": [{
+							"code": "430405",
+							"name": "珠晖区"
+						},
+						{
+							"code": "430406",
+							"name": "雁峰区"
+						},
+						{
+							"code": "430407",
+							"name": "石鼓区"
+						},
+						{
+							"code": "430408",
+							"name": "蒸湘区"
+						},
+						{
+							"code": "430412",
+							"name": "南岳区"
+						},
+						{
+							"code": "430421",
+							"name": "衡阳县"
+						},
+						{
+							"code": "430422",
+							"name": "衡南县"
+						},
+						{
+							"code": "430423",
+							"name": "衡山县"
+						},
+						{
+							"code": "430424",
+							"name": "衡东县"
+						},
+						{
+							"code": "430426",
+							"name": "祁东县"
+						},
+						{
+							"code": "430481",
+							"name": "耒阳市"
+						},
+						{
+							"code": "430482",
+							"name": "常宁市"
+						}
+					]
+				},
+				{
+					"code": "430500",
+					"name": "邵阳市",
+					"childs": [{
+							"code": "430502",
+							"name": "双清区"
+						},
+						{
+							"code": "430503",
+							"name": "大祥区"
+						},
+						{
+							"code": "430511",
+							"name": "北塔区"
+						},
+						{
+							"code": "430521",
+							"name": "邵东县"
+						},
+						{
+							"code": "430522",
+							"name": "新邵县"
+						},
+						{
+							"code": "430523",
+							"name": "邵阳县"
+						},
+						{
+							"code": "430524",
+							"name": "隆回县"
+						},
+						{
+							"code": "430525",
+							"name": "洞口县"
+						},
+						{
+							"code": "430527",
+							"name": "绥宁县"
+						},
+						{
+							"code": "430528",
+							"name": "新宁县"
+						},
+						{
+							"code": "430529",
+							"name": "城步苗族自治县"
+						},
+						{
+							"code": "430581",
+							"name": "武冈市"
+						}
+					]
+				},
+				{
+					"code": "430600",
+					"name": "岳阳市",
+					"childs": [{
+							"code": "430602",
+							"name": "岳阳楼区"
+						},
+						{
+							"code": "430603",
+							"name": "云溪区"
+						},
+						{
+							"code": "430611",
+							"name": "君山区"
+						},
+						{
+							"code": "430621",
+							"name": "岳阳县"
+						},
+						{
+							"code": "430623",
+							"name": "华容县"
+						},
+						{
+							"code": "430624",
+							"name": "湘阴县"
+						},
+						{
+							"code": "430626",
+							"name": "平江县"
+						},
+						{
+							"code": "430681",
+							"name": "汨罗市"
+						},
+						{
+							"code": "430682",
+							"name": "临湘市"
+						}
+					]
+				},
+				{
+					"code": "430700",
+					"name": "常德市",
+					"childs": [{
+							"code": "430702",
+							"name": "武陵区"
+						},
+						{
+							"code": "430703",
+							"name": "鼎城区"
+						},
+						{
+							"code": "430721",
+							"name": "安乡县"
+						},
+						{
+							"code": "430722",
+							"name": "汉寿县"
+						},
+						{
+							"code": "430723",
+							"name": "澧县"
+						},
+						{
+							"code": "430724",
+							"name": "临澧县"
+						},
+						{
+							"code": "430725",
+							"name": "桃源县"
+						},
+						{
+							"code": "430726",
+							"name": "石门县"
+						},
+						{
+							"code": "430781",
+							"name": "津市市"
+						}
+					]
+				},
+				{
+					"code": "430800",
+					"name": "张家界市",
+					"childs": [{
+							"code": "430802",
+							"name": "永定区"
+						},
+						{
+							"code": "430811",
+							"name": "武陵源区"
+						},
+						{
+							"code": "430821",
+							"name": "慈利县"
+						},
+						{
+							"code": "430822",
+							"name": "桑植县"
+						}
+					]
+				},
+				{
+					"code": "430900",
+					"name": "益阳市",
+					"childs": [{
+							"code": "430902",
+							"name": "资阳区"
+						},
+						{
+							"code": "430903",
+							"name": "赫山区"
+						},
+						{
+							"code": "430921",
+							"name": "南县"
+						},
+						{
+							"code": "430922",
+							"name": "桃江县"
+						},
+						{
+							"code": "430923",
+							"name": "安化县"
+						},
+						{
+							"code": "430981",
+							"name": "沅江市"
+						}
+					]
+				},
+				{
+					"code": "431000",
+					"name": "郴州市",
+					"childs": [{
+							"code": "431002",
+							"name": "北湖区"
+						},
+						{
+							"code": "431003",
+							"name": "苏仙区"
+						},
+						{
+							"code": "431021",
+							"name": "桂阳县"
+						},
+						{
+							"code": "431022",
+							"name": "宜章县"
+						},
+						{
+							"code": "431023",
+							"name": "永兴县"
+						},
+						{
+							"code": "431024",
+							"name": "嘉禾县"
+						},
+						{
+							"code": "431025",
+							"name": "临武县"
+						},
+						{
+							"code": "431026",
+							"name": "汝城县"
+						},
+						{
+							"code": "431027",
+							"name": "桂东县"
+						},
+						{
+							"code": "431028",
+							"name": "安仁县"
+						},
+						{
+							"code": "431081",
+							"name": "资兴市"
+						}
+					]
+				},
+				{
+					"code": "431100",
+					"name": "永州市",
+					"childs": [{
+							"code": "431102",
+							"name": "零陵区"
+						},
+						{
+							"code": "431103",
+							"name": "冷水滩区"
+						},
+						{
+							"code": "431121",
+							"name": "祁阳县"
+						},
+						{
+							"code": "431122",
+							"name": "东安县"
+						},
+						{
+							"code": "431123",
+							"name": "双牌县"
+						},
+						{
+							"code": "431124",
+							"name": "道县"
+						},
+						{
+							"code": "431125",
+							"name": "江永县"
+						},
+						{
+							"code": "431126",
+							"name": "宁远县"
+						},
+						{
+							"code": "431127",
+							"name": "蓝山县"
+						},
+						{
+							"code": "431128",
+							"name": "新田县"
+						},
+						{
+							"code": "431129",
+							"name": "江华瑶族自治县"
+						}
+					]
+				},
+				{
+					"code": "431200",
+					"name": "怀化市",
+					"childs": [{
+							"code": "431202",
+							"name": "鹤城区"
+						},
+						{
+							"code": "431221",
+							"name": "中方县"
+						},
+						{
+							"code": "431222",
+							"name": "沅陵县"
+						},
+						{
+							"code": "431223",
+							"name": "辰溪县"
+						},
+						{
+							"code": "431224",
+							"name": "溆浦县"
+						},
+						{
+							"code": "431225",
+							"name": "会同县"
+						},
+						{
+							"code": "431226",
+							"name": "麻阳苗族自治县"
+						},
+						{
+							"code": "431227",
+							"name": "新晃侗族自治县"
+						},
+						{
+							"code": "431228",
+							"name": "芷江侗族自治县"
+						},
+						{
+							"code": "431229",
+							"name": "靖州苗族侗族自治县"
+						},
+						{
+							"code": "431230",
+							"name": "通道侗族自治县"
+						},
+						{
+							"code": "431281",
+							"name": "洪江市"
+						}
+					]
+				},
+				{
+					"code": "431300",
+					"name": "娄底市",
+					"childs": [{
+							"code": "431302",
+							"name": "娄星区"
+						},
+						{
+							"code": "431321",
+							"name": "双峰县"
+						},
+						{
+							"code": "431322",
+							"name": "新化县"
+						},
+						{
+							"code": "431381",
+							"name": "冷水江市"
+						},
+						{
+							"code": "431382",
+							"name": "涟源市"
+						}
+					]
+				},
+				{
+					"code": "433100",
+					"name": "湘西土家族苗族自治州",
+					"childs": [{
+							"code": "433101",
+							"name": "吉首市"
+						},
+						{
+							"code": "433122",
+							"name": "泸溪县"
+						},
+						{
+							"code": "433123",
+							"name": "凤凰县"
+						},
+						{
+							"code": "433124",
+							"name": "花垣县"
+						},
+						{
+							"code": "433125",
+							"name": "保靖县"
+						},
+						{
+							"code": "433126",
+							"name": "古丈县"
+						},
+						{
+							"code": "433127",
+							"name": "永顺县"
+						},
+						{
+							"code": "433130",
+							"name": "龙山县"
+						}
+					]
+				}
+			]
+		},
+		{
+			"code": "440000",
+			"name": "广东省",
+			"childs": [{
+					"code": "440100",
+					"name": "广州市",
+					"childs": [{
+							"code": "440103",
+							"name": "荔湾区"
+						},
+						{
+							"code": "440104",
+							"name": "越秀区"
+						},
+						{
+							"code": "440105",
+							"name": "海珠区"
+						},
+						{
+							"code": "440106",
+							"name": "天河区"
+						},
+						{
+							"code": "440111",
+							"name": "白云区"
+						},
+						{
+							"code": "440112",
+							"name": "黄埔区"
+						},
+						{
+							"code": "440113",
+							"name": "番禺区"
+						},
+						{
+							"code": "440114",
+							"name": "花都区"
+						},
+						{
+							"code": "440115",
+							"name": "南沙区"
+						},
+						{
+							"code": "440117",
+							"name": "从化区"
+						},
+						{
+							"code": "440118",
+							"name": "增城区"
+						}
+					]
+				},
+				{
+					"code": "440200",
+					"name": "韶关市",
+					"childs": [{
+							"code": "440203",
+							"name": "武江区"
+						},
+						{
+							"code": "440204",
+							"name": "浈江区"
+						},
+						{
+							"code": "440205",
+							"name": "曲江区"
+						},
+						{
+							"code": "440222",
+							"name": "始兴县"
+						},
+						{
+							"code": "440224",
+							"name": "仁化县"
+						},
+						{
+							"code": "440229",
+							"name": "翁源县"
+						},
+						{
+							"code": "440232",
+							"name": "乳源瑶族自治县"
+						},
+						{
+							"code": "440233",
+							"name": "新丰县"
+						},
+						{
+							"code": "440281",
+							"name": "乐昌市"
+						},
+						{
+							"code": "440282",
+							"name": "南雄市"
+						}
+					]
+				},
+				{
+					"code": "440300",
+					"name": "深圳市",
+					"childs": [{
+							"code": "440303",
+							"name": "罗湖区"
+						},
+						{
+							"code": "440304",
+							"name": "福田区"
+						},
+						{
+							"code": "440305",
+							"name": "南山区"
+						},
+						{
+							"code": "440306",
+							"name": "宝安区"
+						},
+						{
+							"code": "440307",
+							"name": "龙岗区"
+						},
+						{
+							"code": "440308",
+							"name": "盐田区"
+						},
+						{
+							"code": "440309",
+							"name": "龙华区"
+						},
+						{
+							"code": "440310",
+							"name": "坪山区"
+						},
+						{
+							"code": "440311",
+							"name": "光明区"
+						}
+					]
+				},
+				{
+					"code": "440400",
+					"name": "珠海市",
+					"childs": [{
+							"code": "440402",
+							"name": "香洲区"
+						},
+						{
+							"code": "440403",
+							"name": "斗门区"
+						},
+						{
+							"code": "440404",
+							"name": "金湾区"
+						}
+					]
+				},
+				{
+					"code": "440500",
+					"name": "汕头市",
+					"childs": [{
+							"code": "440507",
+							"name": "龙湖区"
+						},
+						{
+							"code": "440511",
+							"name": "金平区"
+						},
+						{
+							"code": "440512",
+							"name": "濠江区"
+						},
+						{
+							"code": "440513",
+							"name": "潮阳区"
+						},
+						{
+							"code": "440514",
+							"name": "潮南区"
+						},
+						{
+							"code": "440515",
+							"name": "澄海区"
+						},
+						{
+							"code": "440523",
+							"name": "南澳县"
+						}
+					]
+				},
+				{
+					"code": "440600",
+					"name": "佛山市",
+					"childs": [{
+							"code": "440604",
+							"name": "禅城区"
+						},
+						{
+							"code": "440605",
+							"name": "南海区"
+						},
+						{
+							"code": "440606",
+							"name": "顺德区"
+						},
+						{
+							"code": "440607",
+							"name": "三水区"
+						},
+						{
+							"code": "440608",
+							"name": "高明区"
+						}
+					]
+				},
+				{
+					"code": "440700",
+					"name": "江门市",
+					"childs": [{
+							"code": "440703",
+							"name": "蓬江区"
+						},
+						{
+							"code": "440704",
+							"name": "江海区"
+						},
+						{
+							"code": "440705",
+							"name": "新会区"
+						},
+						{
+							"code": "440781",
+							"name": "台山市"
+						},
+						{
+							"code": "440783",
+							"name": "开平市"
+						},
+						{
+							"code": "440784",
+							"name": "鹤山市"
+						},
+						{
+							"code": "440785",
+							"name": "恩平市"
+						}
+					]
+				},
+				{
+					"code": "440800",
+					"name": "湛江市",
+					"childs": [{
+							"code": "440802",
+							"name": "赤坎区"
+						},
+						{
+							"code": "440803",
+							"name": "霞山区"
+						},
+						{
+							"code": "440804",
+							"name": "坡头区"
+						},
+						{
+							"code": "440811",
+							"name": "麻章区"
+						},
+						{
+							"code": "440823",
+							"name": "遂溪县"
+						},
+						{
+							"code": "440825",
+							"name": "徐闻县"
+						},
+						{
+							"code": "440881",
+							"name": "廉江市"
+						},
+						{
+							"code": "440882",
+							"name": "雷州市"
+						},
+						{
+							"code": "440883",
+							"name": "吴川市"
+						}
+					]
+				},
+				{
+					"code": "440900",
+					"name": "茂名市",
+					"childs": [{
+							"code": "440902",
+							"name": "茂南区"
+						},
+						{
+							"code": "440904",
+							"name": "电白区"
+						},
+						{
+							"code": "440981",
+							"name": "高州市"
+						},
+						{
+							"code": "440982",
+							"name": "化州市"
+						},
+						{
+							"code": "440983",
+							"name": "信宜市"
+						}
+					]
+				},
+				{
+					"code": "441200",
+					"name": "肇庆市",
+					"childs": [{
+							"code": "441202",
+							"name": "端州区"
+						},
+						{
+							"code": "441203",
+							"name": "鼎湖区"
+						},
+						{
+							"code": "441204",
+							"name": "高要区"
+						},
+						{
+							"code": "441223",
+							"name": "广宁县"
+						},
+						{
+							"code": "441224",
+							"name": "怀集县"
+						},
+						{
+							"code": "441225",
+							"name": "封开县"
+						},
+						{
+							"code": "441226",
+							"name": "德庆县"
+						},
+						{
+							"code": "441284",
+							"name": "四会市"
+						}
+					]
+				},
+				{
+					"code": "441300",
+					"name": "惠州市",
+					"childs": [{
+							"code": "441302",
+							"name": "惠城区"
+						},
+						{
+							"code": "441303",
+							"name": "惠阳区"
+						},
+						{
+							"code": "441322",
+							"name": "博罗县"
+						},
+						{
+							"code": "441323",
+							"name": "惠东县"
+						},
+						{
+							"code": "441324",
+							"name": "龙门县"
+						}
+					]
+				},
+				{
+					"code": "441400",
+					"name": "梅州市",
+					"childs": [{
+							"code": "441402",
+							"name": "梅江区"
+						},
+						{
+							"code": "441403",
+							"name": "梅县区"
+						},
+						{
+							"code": "441422",
+							"name": "大埔县"
+						},
+						{
+							"code": "441423",
+							"name": "丰顺县"
+						},
+						{
+							"code": "441424",
+							"name": "五华县"
+						},
+						{
+							"code": "441426",
+							"name": "平远县"
+						},
+						{
+							"code": "441427",
+							"name": "蕉岭县"
+						},
+						{
+							"code": "441481",
+							"name": "兴宁市"
+						}
+					]
+				},
+				{
+					"code": "441500",
+					"name": "汕尾市",
+					"childs": [{
+							"code": "441502",
+							"name": "城区"
+						},
+						{
+							"code": "441521",
+							"name": "海丰县"
+						},
+						{
+							"code": "441523",
+							"name": "陆河县"
+						},
+						{
+							"code": "441581",
+							"name": "陆丰市"
+						}
+					]
+				},
+				{
+					"code": "441600",
+					"name": "河源市",
+					"childs": [{
+							"code": "441602",
+							"name": "源城区"
+						},
+						{
+							"code": "441621",
+							"name": "紫金县"
+						},
+						{
+							"code": "441622",
+							"name": "龙川县"
+						},
+						{
+							"code": "441623",
+							"name": "连平县"
+						},
+						{
+							"code": "441624",
+							"name": "和平县"
+						},
+						{
+							"code": "441625",
+							"name": "东源县"
+						}
+					]
+				},
+				{
+					"code": "441700",
+					"name": "阳江市",
+					"childs": [{
+							"code": "441702",
+							"name": "江城区"
+						},
+						{
+							"code": "441704",
+							"name": "阳东区"
+						},
+						{
+							"code": "441721",
+							"name": "阳西县"
+						},
+						{
+							"code": "441781",
+							"name": "阳春市"
+						}
+					]
+				},
+				{
+					"code": "441800",
+					"name": "清远市",
+					"childs": [{
+							"code": "441802",
+							"name": "清城区"
+						},
+						{
+							"code": "441803",
+							"name": "清新区"
+						},
+						{
+							"code": "441821",
+							"name": "佛冈县"
+						},
+						{
+							"code": "441823",
+							"name": "阳山县"
+						},
+						{
+							"code": "441825",
+							"name": "连山壮族瑶族自治县"
+						},
+						{
+							"code": "441826",
+							"name": "连南瑶族自治县"
+						},
+						{
+							"code": "441881",
+							"name": "英德市"
+						},
+						{
+							"code": "441882",
+							"name": "连州市"
+						}
+					]
+				},
+				{
+					"code": "441900",
+					"name": "东莞市",
+					"childs": [{
+							"code": "441900003",
+							"name": "东城街道"
+						},
+						{
+							"code": "441900004",
+							"name": "南城街道"
+						},
+						{
+							"code": "441900005",
+							"name": "万江街道"
+						},
+						{
+							"code": "441900006",
+							"name": "莞城街道"
+						},
+						{
+							"code": "441900101",
+							"name": "石碣镇"
+						},
+						{
+							"code": "441900102",
+							"name": "石龙镇"
+						},
+						{
+							"code": "441900103",
+							"name": "茶山镇"
+						},
+						{
+							"code": "441900104",
+							"name": "石排镇"
+						},
+						{
+							"code": "441900105",
+							"name": "企石镇"
+						},
+						{
+							"code": "441900106",
+							"name": "横沥镇"
+						},
+						{
+							"code": "441900107",
+							"name": "桥头镇"
+						},
+						{
+							"code": "441900108",
+							"name": "谢岗镇"
+						},
+						{
+							"code": "441900109",
+							"name": "东坑镇"
+						},
+						{
+							"code": "441900110",
+							"name": "常平镇"
+						},
+						{
+							"code": "441900111",
+							"name": "寮步镇"
+						},
+						{
+							"code": "441900112",
+							"name": "樟木头镇"
+						},
+						{
+							"code": "441900113",
+							"name": "大朗镇"
+						},
+						{
+							"code": "441900114",
+							"name": "黄江镇"
+						},
+						{
+							"code": "441900115",
+							"name": "清溪镇"
+						},
+						{
+							"code": "441900116",
+							"name": "塘厦镇"
+						},
+						{
+							"code": "441900117",
+							"name": "凤岗镇"
+						},
+						{
+							"code": "441900118",
+							"name": "大岭山镇"
+						},
+						{
+							"code": "441900119",
+							"name": "长安镇"
+						},
+						{
+							"code": "441900121",
+							"name": "虎门镇"
+						},
+						{
+							"code": "441900122",
+							"name": "厚街镇"
+						},
+						{
+							"code": "441900123",
+							"name": "沙田镇"
+						},
+						{
+							"code": "441900124",
+							"name": "道滘镇"
+						},
+						{
+							"code": "441900125",
+							"name": "洪梅镇"
+						},
+						{
+							"code": "441900126",
+							"name": "麻涌镇"
+						},
+						{
+							"code": "441900127",
+							"name": "望牛墩镇"
+						},
+						{
+							"code": "441900128",
+							"name": "中堂镇"
+						},
+						{
+							"code": "441900129",
+							"name": "高埗镇"
+						},
+						{
+							"code": "441900401",
+							"name": "松山湖管委会"
+						},
+						{
+							"code": "441900402",
+							"name": "虎门港管委会"
+						},
+						{
+							"code": "441900403",
+							"name": "东莞生态园"
+						}
+					]
+				},
+				{
+					"code": "442000",
+					"name": "中山市",
+					"childs": [{
+						"code": "442000001",
+						"name": "石岐区街道"
+					}, {
+						"code": "442000002",
+						"name": "东区街道"
+					}, {
+						"code": "442000003",
+						"name": "火炬开发区街道"
+					}, {
+						"code": "442000004",
+						"name": "西区街道"
+					}, {
+						"code": "442000005",
+						"name": "南区街道"
+					}, {
+						"code": "442000006",
+						"name": "五桂山街道"
+					}, {
+						"code": "442000100",
+						"name": "小榄镇"
+					}, {
+						"code": "442000101",
+						"name": "黄圃镇"
+					}, {
+						"code": "442000102",
+						"name": "民众镇"
+					}, {
+						"code": "442000103",
+						"name": "东凤镇"
+					}, {
+						"code": "442000104",
+						"name": "东升镇"
+					}, {
+						"code": "442000105",
+						"name": "古镇镇"
+					}, {
+						"code": "442000106",
+						"name": "沙溪镇"
+					}, {
+						"code": "442000107",
+						"name": "坦洲镇"
+					}, {
+						"code": "442000108",
+						"name": "港口镇"
+					}, {
+						"code": "442000109",
+						"name": "三角镇"
+					}, {
+						"code": "442000110",
+						"name": "横栏镇"
+					}, {
+						"code": "442000111",
+						"name": "南头镇"
+					}, {
+						"code": "442000112",
+						"name": "阜沙镇"
+					}, {
+						"code": "442000113",
+						"name": "南朗镇"
+					}, {
+						"code": "442000114",
+						"name": "三乡镇"
+					}, {
+						"code": "442000115",
+						"name": "板芙镇"
+					}, {
+						"code": "442000116",
+						"name": "大涌镇"
+					}, {
+						"code": "442000117",
+						"name": "神湾镇"
+					}]
+				},
+				{
+					"code": "445100",
+					"name": "潮州市",
+					"childs": [{
+							"code": "445102",
+							"name": "湘桥区"
+						},
+						{
+							"code": "445103",
+							"name": "潮安区"
+						},
+						{
+							"code": "445122",
+							"name": "饶平县"
+						}
+					]
+				},
+				{
+					"code": "445200",
+					"name": "揭阳市",
+					"childs": [{
+							"code": "445202",
+							"name": "榕城区"
+						},
+						{
+							"code": "445203",
+							"name": "揭东区"
+						},
+						{
+							"code": "445222",
+							"name": "揭西县"
+						},
+						{
+							"code": "445224",
+							"name": "惠来县"
+						},
+						{
+							"code": "445281",
+							"name": "普宁市"
+						}
+					]
+				},
+				{
+					"code": "445300",
+					"name": "云浮市",
+					"childs": [{
+							"code": "445302",
+							"name": "云城区"
+						},
+						{
+							"code": "445303",
+							"name": "云安区"
+						},
+						{
+							"code": "445321",
+							"name": "新兴县"
+						},
+						{
+							"code": "445322",
+							"name": "郁南县"
+						},
+						{
+							"code": "445381",
+							"name": "罗定市"
+						}
+					]
+				}
+			]
+		},
+		{
+			"code": "450000",
+			"name": "广西壮族自治区",
+			"childs": [{
+					"code": "450100",
+					"name": "南宁市",
+					"childs": [{
+							"code": "450102",
+							"name": "兴宁区"
+						},
+						{
+							"code": "450103",
+							"name": "青秀区"
+						},
+						{
+							"code": "450105",
+							"name": "江南区"
+						},
+						{
+							"code": "450107",
+							"name": "西乡塘区"
+						},
+						{
+							"code": "450108",
+							"name": "良庆区"
+						},
+						{
+							"code": "450109",
+							"name": "邕宁区"
+						},
+						{
+							"code": "450110",
+							"name": "武鸣区"
+						},
+						{
+							"code": "450123",
+							"name": "隆安县"
+						},
+						{
+							"code": "450124",
+							"name": "马山县"
+						},
+						{
+							"code": "450125",
+							"name": "上林县"
+						},
+						{
+							"code": "450126",
+							"name": "宾阳县"
+						},
+						{
+							"code": "450127",
+							"name": "横县"
+						}
+					]
+				},
+				{
+					"code": "450200",
+					"name": "柳州市",
+					"childs": [{
+							"code": "450202",
+							"name": "城中区"
+						},
+						{
+							"code": "450203",
+							"name": "鱼峰区"
+						},
+						{
+							"code": "450204",
+							"name": "柳南区"
+						},
+						{
+							"code": "450205",
+							"name": "柳北区"
+						},
+						{
+							"code": "450206",
+							"name": "柳江区"
+						},
+						{
+							"code": "450222",
+							"name": "柳城县"
+						},
+						{
+							"code": "450223",
+							"name": "鹿寨县"
+						},
+						{
+							"code": "450224",
+							"name": "融安县"
+						},
+						{
+							"code": "450225",
+							"name": "融水苗族自治县"
+						},
+						{
+							"code": "450226",
+							"name": "三江侗族自治县"
+						}
+					]
+				},
+				{
+					"code": "450300",
+					"name": "桂林市",
+					"childs": [{
+							"code": "450302",
+							"name": "秀峰区"
+						},
+						{
+							"code": "450303",
+							"name": "叠彩区"
+						},
+						{
+							"code": "450304",
+							"name": "象山区"
+						},
+						{
+							"code": "450305",
+							"name": "七星区"
+						},
+						{
+							"code": "450311",
+							"name": "雁山区"
+						},
+						{
+							"code": "450312",
+							"name": "临桂区"
+						},
+						{
+							"code": "450321",
+							"name": "阳朔县"
+						},
+						{
+							"code": "450323",
+							"name": "灵川县"
+						},
+						{
+							"code": "450324",
+							"name": "全州县"
+						},
+						{
+							"code": "450325",
+							"name": "兴安县"
+						},
+						{
+							"code": "450326",
+							"name": "永福县"
+						},
+						{
+							"code": "450327",
+							"name": "灌阳县"
+						},
+						{
+							"code": "450328",
+							"name": "龙胜各族自治县"
+						},
+						{
+							"code": "450329",
+							"name": "资源县"
+						},
+						{
+							"code": "450330",
+							"name": "平乐县"
+						},
+						{
+							"code": "450381",
+							"name": "荔浦市"
+						},
+						{
+							"code": "450332",
+							"name": "恭城瑶族自治县"
+						}
+					]
+				},
+				{
+					"code": "450400",
+					"name": "梧州市",
+					"childs": [{
+							"code": "450403",
+							"name": "万秀区"
+						},
+						{
+							"code": "450405",
+							"name": "长洲区"
+						},
+						{
+							"code": "450406",
+							"name": "龙圩区"
+						},
+						{
+							"code": "450421",
+							"name": "苍梧县"
+						},
+						{
+							"code": "450422",
+							"name": "藤县"
+						},
+						{
+							"code": "450423",
+							"name": "蒙山县"
+						},
+						{
+							"code": "450481",
+							"name": "岑溪市"
+						}
+					]
+				},
+				{
+					"code": "450500",
+					"name": "北海市",
+					"childs": [{
+							"code": "450502",
+							"name": "海城区"
+						},
+						{
+							"code": "450503",
+							"name": "银海区"
+						},
+						{
+							"code": "450512",
+							"name": "铁山港区"
+						},
+						{
+							"code": "450521",
+							"name": "合浦县"
+						}
+					]
+				},
+				{
+					"code": "450600",
+					"name": "防城港市",
+					"childs": [{
+							"code": "450602",
+							"name": "港口区"
+						},
+						{
+							"code": "450603",
+							"name": "防城区"
+						},
+						{
+							"code": "450621",
+							"name": "上思县"
+						},
+						{
+							"code": "450681",
+							"name": "东兴市"
+						}
+					]
+				},
+				{
+					"code": "450700",
+					"name": "钦州市",
+					"childs": [{
+							"code": "450702",
+							"name": "钦南区"
+						},
+						{
+							"code": "450703",
+							"name": "钦北区"
+						},
+						{
+							"code": "450721",
+							"name": "灵山县"
+						},
+						{
+							"code": "450722",
+							"name": "浦北县"
+						}
+					]
+				},
+				{
+					"code": "450800",
+					"name": "贵港市",
+					"childs": [{
+							"code": "450802",
+							"name": "港北区"
+						},
+						{
+							"code": "450803",
+							"name": "港南区"
+						},
+						{
+							"code": "450804",
+							"name": "覃塘区"
+						},
+						{
+							"code": "450821",
+							"name": "平南县"
+						},
+						{
+							"code": "450881",
+							"name": "桂平市"
+						}
+					]
+				},
+				{
+					"code": "450900",
+					"name": "玉林市",
+					"childs": [{
+							"code": "450902",
+							"name": "玉州区"
+						},
+						{
+							"code": "450903",
+							"name": "福绵区"
+						},
+						{
+							"code": "450921",
+							"name": "容县"
+						},
+						{
+							"code": "450922",
+							"name": "陆川县"
+						},
+						{
+							"code": "450923",
+							"name": "博白县"
+						},
+						{
+							"code": "450924",
+							"name": "兴业县"
+						},
+						{
+							"code": "450981",
+							"name": "北流市"
+						}
+					]
+				},
+				{
+					"code": "451000",
+					"name": "百色市",
+					"childs": [{
+							"code": "451002",
+							"name": "右江区"
+						},
+						{
+							"code": "451021",
+							"name": "田阳县"
+						},
+						{
+							"code": "451022",
+							"name": "田东县"
+						},
+						{
+							"code": "451023",
+							"name": "平果县"
+						},
+						{
+							"code": "451024",
+							"name": "德保县"
+						},
+						{
+							"code": "451026",
+							"name": "那坡县"
+						},
+						{
+							"code": "451027",
+							"name": "凌云县"
+						},
+						{
+							"code": "451028",
+							"name": "乐业县"
+						},
+						{
+							"code": "451029",
+							"name": "田林县"
+						},
+						{
+							"code": "451030",
+							"name": "西林县"
+						},
+						{
+							"code": "451031",
+							"name": "隆林各族自治县"
+						},
+						{
+							"code": "451081",
+							"name": "靖西市"
+						}
+					]
+				},
+				{
+					"code": "451100",
+					"name": "贺州市",
+					"childs": [{
+							"code": "451102",
+							"name": "八步区"
+						},
+						{
+							"code": "451103",
+							"name": "平桂区"
+						},
+						{
+							"code": "451121",
+							"name": "昭平县"
+						},
+						{
+							"code": "451122",
+							"name": "钟山县"
+						},
+						{
+							"code": "451123",
+							"name": "富川瑶族自治县"
+						}
+					]
+				},
+				{
+					"code": "451200",
+					"name": "河池市",
+					"childs": [{
+							"code": "451202",
+							"name": "金城江区"
+						},
+						{
+							"code": "451203",
+							"name": "宜州区"
+						},
+						{
+							"code": "451221",
+							"name": "南丹县"
+						},
+						{
+							"code": "451222",
+							"name": "天峨县"
+						},
+						{
+							"code": "451223",
+							"name": "凤山县"
+						},
+						{
+							"code": "451224",
+							"name": "东兰县"
+						},
+						{
+							"code": "451225",
+							"name": "罗城仫佬族自治县"
+						},
+						{
+							"code": "451226",
+							"name": "环江毛南族自治县"
+						},
+						{
+							"code": "451227",
+							"name": "巴马瑶族自治县"
+						},
+						{
+							"code": "451228",
+							"name": "都安瑶族自治县"
+						},
+						{
+							"code": "451229",
+							"name": "大化瑶族自治县"
+						}
+					]
+				},
+				{
+					"code": "451300",
+					"name": "来宾市",
+					"childs": [{
+							"code": "451302",
+							"name": "兴宾区"
+						},
+						{
+							"code": "451321",
+							"name": "忻城县"
+						},
+						{
+							"code": "451322",
+							"name": "象州县"
+						},
+						{
+							"code": "451323",
+							"name": "武宣县"
+						},
+						{
+							"code": "451324",
+							"name": "金秀瑶族自治县"
+						},
+						{
+							"code": "451381",
+							"name": "合山市"
+						}
+					]
+				},
+				{
+					"code": "451400",
+					"name": "崇左市",
+					"childs": [{
+							"code": "451402",
+							"name": "江州区"
+						},
+						{
+							"code": "451421",
+							"name": "扶绥县"
+						},
+						{
+							"code": "451422",
+							"name": "宁明县"
+						},
+						{
+							"code": "451423",
+							"name": "龙州县"
+						},
+						{
+							"code": "451424",
+							"name": "大新县"
+						},
+						{
+							"code": "451425",
+							"name": "天等县"
+						},
+						{
+							"code": "451481",
+							"name": "凭祥市"
+						}
+					]
+				}
+			]
+		},
+		{
+			"code": "460000",
+			"name": "海南省",
+			"childs": [{
+					"code": "460100",
+					"name": "海口市",
+					"childs": [{
+							"code": "460105",
+							"name": "秀英区"
+						},
+						{
+							"code": "460106",
+							"name": "龙华区"
+						},
+						{
+							"code": "460107",
+							"name": "琼山区"
+						},
+						{
+							"code": "460108",
+							"name": "美兰区"
+						}
+					]
+				},
+				{
+					"code": "460200",
+					"name": "三亚市",
+					"childs": [{
+							"code": "460202",
+							"name": "海棠区"
+						},
+						{
+							"code": "460203",
+							"name": "吉阳区"
+						},
+						{
+							"code": "460204",
+							"name": "天涯区"
+						},
+						{
+							"code": "460205",
+							"name": "崖州区"
+						}
+					]
+				},
+				{
+					"code": "460300",
+					"name": "三沙市",
+					"childs": [{
+							"code": "460321",
+							"name": "西沙群岛"
+						},
+						{
+							"code": "460322",
+							"name": "南沙群岛"
+						},
+						{
+							"code": "460323",
+							"name": "中沙群岛的岛礁及其海域"
+						}
+					]
+				},
+				{
+					"code": "460400",
+					"name": "儋州市",
+					"childs": [
+						{"code":"460400100","name":"那大镇"},
+						{"code":"460400101","name":"和庆镇"},
+						{"code":"460400102","name":"南丰镇"},
+						{"code":"460400103","name":"大成镇"},
+						{"code":"460400104","name":"雅星镇"},
+						{"code":"460400105","name":"兰洋镇"},
+						{"code":"460400106","name":"光村镇"},
+						{"code":"460400107","name":"木棠镇"},
+						{"code":"460400108","name":"海头镇"},
+						{"code":"460400109","name":"峨蔓镇"},
+						{"code":"460400110","name":"三都镇"},
+						{"code":"460400111","name":"王五镇"},
+						{"code":"460400112","name":"白马井镇"},
+						{"code":"460400113","name":"中和镇"},
+						{"code":"460400114","name":"排浦镇"},
+						{"code":"460400115","name":"东成镇"},
+						{"code":"460400116","name":"新州镇"},
+						{"code":"460400400","name":"国营西培农场"},
+						{"code":"460400404","name":"国营西联农场"},
+						{"code":"460400405","name":"国营蓝洋农场"},
+						{"code":"460400407","name":"国营八一农场"},
+						{"code":"460400499","name":"洋浦经济开发区"},
+						{"code":"460400500","name":"华南热作学院"}
+					]
+				},
+				{
+					"code":"469000",
+					"name":"省直辖县级行政区划",
+					"childs": [
+						{"code": "469001","name": "五指山市"},
+						{"code": "469002","name": "琼海市"},
+						{"code": "469005", "name": "文昌市"},
+						{"code": "469006", "name": "万宁市"},
+						{"code": "469007", "name": "东方市"},
+						{"code": "469021", "name": "定安县"},
+						{"code": "469022", "name": "屯昌县"},
+						{"code": "469023", "name": "澄迈县"},
+						{"code": "469024", "name": "临高县"},
+						{"code": "469025", "name": "白沙黎族自治县"},
+						{"code": "469026", "name": "昌江黎族自治县"},
+						{"code": "469027", "name": "乐东黎族自治县"},
+						{"code": "469028", "name": "陵水黎族自治县"},
+						{"code": "469029", "name": "保亭黎族苗族自治县"},
+						{"code": "469030", "name": "琼中黎族苗族自治县"}
+					]
+				}
+			]
+		},
+		{
+			"code": "500000",
+			"name": "重庆市",
+			"childs": [{
+				"code": "500100",
+				"name": "重庆市",
+				"childs": [{
+						"code": "500101",
+						"name": "万州区"
+					},
+					{
+						"code": "500102",
+						"name": "涪陵区"
+					},
+					{
+						"code": "500103",
+						"name": "渝中区"
+					},
+					{
+						"code": "500104",
+						"name": "大渡口区"
+					},
+					{
+						"code": "500105",
+						"name": "江北区"
+					},
+					{
+						"code": "500106",
+						"name": "沙坪坝区"
+					},
+					{
+						"code": "500107",
+						"name": "九龙坡区"
+					},
+					{
+						"code": "500108",
+						"name": "南岸区"
+					},
+					{
+						"code": "500109",
+						"name": "北碚区"
+					},
+					{
+						"code": "500110",
+						"name": "綦江区"
+					},
+					{
+						"code": "500111",
+						"name": "大足区"
+					},
+					{
+						"code": "500112",
+						"name": "渝北区"
+					},
+					{
+						"code": "500113",
+						"name": "巴南区"
+					},
+					{
+						"code": "500114",
+						"name": "黔江区"
+					},
+					{
+						"code": "500115",
+						"name": "长寿区"
+					},
+					{
+						"code": "500116",
+						"name": "江津区"
+					},
+					{
+						"code": "500117",
+						"name": "合川区"
+					},
+					{
+						"code": "500118",
+						"name": "永川区"
+					},
+					{
+						"code": "500119",
+						"name": "南川区"
+					},
+					{
+						"code": "500120",
+						"name": "璧山区"
+					},
+					{
+						"code": "500151",
+						"name": "铜梁区"
+					},
+					{
+						"code": "500152",
+						"name": "潼南区"
+					},
+					{
+						"code": "500153",
+						"name": "荣昌区"
+					},
+					{
+						"code": "500154",
+						"name": "开州区"
+					},
+					{
+						"code": "500155",
+						"name": "梁平区"
+					},
+					{
+						"code": "500156",
+						"name": "武隆区"
+					},
+					{
+						"code": "500229",
+						"name": "城口县"
+					},
+					{
+						"code": "500230",
+						"name": "丰都县"
+					},
+					{
+						"code": "500231",
+						"name": "垫江县"
+					},
+					{
+						"code": "500233",
+						"name": "忠县"
+					},
+					{
+						"code": "500235",
+						"name": "云阳县"
+					},
+					{
+						"code": "500236",
+						"name": "奉节县"
+					},
+					{
+						"code": "500237",
+						"name": "巫山县"
+					},
+					{
+						"code": "500238",
+						"name": "巫溪县"
+					},
+					{
+						"code": "500240",
+						"name": "石柱土家族自治县"
+					},
+					{
+						"code": "500241",
+						"name": "秀山土家族苗族自治县"
+					},
+					{
+						"code": "500242",
+						"name": "酉阳土家族苗族自治县"
+					},
+					{
+						"code": "500243",
+						"name": "彭水苗族土家族自治县"
+					}
+				]
+			}]
+		},
+		{
+			"code": "510000",
+			"name": "四川省",
+			"childs": [{
+					"code": "510100",
+					"name": "成都市",
+					"childs": [{
+							"code": "510104",
+							"name": "锦江区"
+						},
+						{
+							"code": "510105",
+							"name": "青羊区"
+						},
+						{
+							"code": "510106",
+							"name": "金牛区"
+						},
+						{
+							"code": "510107",
+							"name": "武侯区"
+						},
+						{
+							"code": "510108",
+							"name": "成华区"
+						},
+						{
+							"code": "510112",
+							"name": "龙泉驿区"
+						},
+						{
+							"code": "510113",
+							"name": "青白江区"
+						},
+						{
+							"code": "510114",
+							"name": "新都区"
+						},
+						{
+							"code": "510115",
+							"name": "温江区"
+						},
+						{
+							"code": "510116",
+							"name": "双流区"
+						},
+						{
+							"code": "510117",
+							"name": "郫都区"
+						},
+						{
+							"code": "510121",
+							"name": "金堂县"
+						},
+						{
+							"code": "510129",
+							"name": "大邑县"
+						},
+						{
+							"code": "510131",
+							"name": "蒲江县"
+						},
+						{
+							"code": "510132",
+							"name": "新津县"
+						},
+						{
+							"code": "510181",
+							"name": "都江堰市"
+						},
+						{
+							"code": "510182",
+							"name": "彭州市"
+						},
+						{
+							"code": "510183",
+							"name": "邛崃市"
+						},
+						{
+							"code": "510184",
+							"name": "崇州市"
+						},
+						{
+							"code": "510185",
+							"name": "简阳市"
+						}
+					]
+				},
+				{
+					"code": "510300",
+					"name": "自贡市",
+					"childs": [{
+							"code": "510302",
+							"name": "自流井区"
+						},
+						{
+							"code": "510303",
+							"name": "贡井区"
+						},
+						{
+							"code": "510304",
+							"name": "大安区"
+						},
+						{
+							"code": "510311",
+							"name": "沿滩区"
+						},
+						{
+							"code": "510321",
+							"name": "荣县"
+						},
+						{
+							"code": "510322",
+							"name": "富顺县"
+						}
+					]
+				},
+				{
+					"code": "510400",
+					"name": "攀枝花市",
+					"childs": [{
+							"code": "510402",
+							"name": "东区"
+						},
+						{
+							"code": "510403",
+							"name": "西区"
+						},
+						{
+							"code": "510411",
+							"name": "仁和区"
+						},
+						{
+							"code": "510421",
+							"name": "米易县"
+						},
+						{
+							"code": "510422",
+							"name": "盐边县"
+						}
+					]
+				},
+				{
+					"code": "510500",
+					"name": "泸州市",
+					"childs": [{
+							"code": "510502",
+							"name": "江阳区"
+						},
+						{
+							"code": "510503",
+							"name": "纳溪区"
+						},
+						{
+							"code": "510504",
+							"name": "龙马潭区"
+						},
+						{
+							"code": "510521",
+							"name": "泸县"
+						},
+						{
+							"code": "510522",
+							"name": "合江县"
+						},
+						{
+							"code": "510524",
+							"name": "叙永县"
+						},
+						{
+							"code": "510525",
+							"name": "古蔺县"
+						}
+					]
+				},
+				{
+					"code": "510600",
+					"name": "德阳市",
+					"childs": [{
+							"code": "510603",
+							"name": "旌阳区"
+						},
+						{
+							"code": "510604",
+							"name": "罗江区"
+						},
+						{
+							"code": "510623",
+							"name": "中江县"
+						},
+						{
+							"code": "510681",
+							"name": "广汉市"
+						},
+						{
+							"code": "510682",
+							"name": "什邡市"
+						},
+						{
+							"code": "510683",
+							"name": "绵竹市"
+						}
+					]
+				},
+				{
+					"code": "510700",
+					"name": "绵阳市",
+					"childs": [{
+							"code": "510703",
+							"name": "涪城区"
+						},
+						{
+							"code": "510704",
+							"name": "游仙区"
+						},
+						{
+							"code": "510705",
+							"name": "安州区"
+						},
+						{
+							"code": "510722",
+							"name": "三台县"
+						},
+						{
+							"code": "510723",
+							"name": "盐亭县"
+						},
+						{
+							"code": "510725",
+							"name": "梓潼县"
+						},
+						{
+							"code": "510726",
+							"name": "北川羌族自治县"
+						},
+						{
+							"code": "510727",
+							"name": "平武县"
+						},
+						{
+							"code": "510781",
+							"name": "江油市"
+						}
+					]
+				},
+				{
+					"code": "510800",
+					"name": "广元市",
+					"childs": [{
+							"code": "510802",
+							"name": "利州区"
+						},
+						{
+							"code": "510811",
+							"name": "昭化区"
+						},
+						{
+							"code": "510812",
+							"name": "朝天区"
+						},
+						{
+							"code": "510821",
+							"name": "旺苍县"
+						},
+						{
+							"code": "510822",
+							"name": "青川县"
+						},
+						{
+							"code": "510823",
+							"name": "剑阁县"
+						},
+						{
+							"code": "510824",
+							"name": "苍溪县"
+						}
+					]
+				},
+				{
+					"code": "510900",
+					"name": "遂宁市",
+					"childs": [{
+							"code": "510903",
+							"name": "船山区"
+						},
+						{
+							"code": "510904",
+							"name": "安居区"
+						},
+						{
+							"code": "510921",
+							"name": "蓬溪县"
+						},
+						{
+							"code": "510922",
+							"name": "射洪县"
+						},
+						{
+							"code": "510923",
+							"name": "大英县"
+						}
+					]
+				},
+				{
+					"code": "511000",
+					"name": "内江市",
+					"childs": [{
+							"code": "511002",
+							"name": "市中区"
+						},
+						{
+							"code": "511011",
+							"name": "东兴区"
+						},
+						{
+							"code": "511024",
+							"name": "威远县"
+						},
+						{
+							"code": "511025",
+							"name": "资中县"
+						},
+						{
+							"code": "511083",
+							"name": "隆昌市"
+						}
+					]
+				},
+				{
+					"code": "511100",
+					"name": "乐山市",
+					"childs": [{
+							"code": "511102",
+							"name": "市中区"
+						},
+						{
+							"code": "511111",
+							"name": "沙湾区"
+						},
+						{
+							"code": "511112",
+							"name": "五通桥区"
+						},
+						{
+							"code": "511113",
+							"name": "金口河区"
+						},
+						{
+							"code": "511123",
+							"name": "犍为县"
+						},
+						{
+							"code": "511124",
+							"name": "井研县"
+						},
+						{
+							"code": "511126",
+							"name": "夹江县"
+						},
+						{
+							"code": "511129",
+							"name": "沐川县"
+						},
+						{
+							"code": "511132",
+							"name": "峨边彝族自治县"
+						},
+						{
+							"code": "511133",
+							"name": "马边彝族自治县"
+						},
+						{
+							"code": "511181",
+							"name": "峨眉山市"
+						}
+					]
+				},
+				{
+					"code": "511300",
+					"name": "南充市",
+					"childs": [{
+							"code": "511302",
+							"name": "顺庆区"
+						},
+						{
+							"code": "511303",
+							"name": "高坪区"
+						},
+						{
+							"code": "511304",
+							"name": "嘉陵区"
+						},
+						{
+							"code": "511321",
+							"name": "南部县"
+						},
+						{
+							"code": "511322",
+							"name": "营山县"
+						},
+						{
+							"code": "511323",
+							"name": "蓬安县"
+						},
+						{
+							"code": "511324",
+							"name": "仪陇县"
+						},
+						{
+							"code": "511325",
+							"name": "西充县"
+						},
+						{
+							"code": "511381",
+							"name": "阆中市"
+						}
+					]
+				},
+				{
+					"code": "511400",
+					"name": "眉山市",
+					"childs": [{
+							"code": "511402",
+							"name": "东坡区"
+						},
+						{
+							"code": "511403",
+							"name": "彭山区"
+						},
+						{
+							"code": "511421",
+							"name": "仁寿县"
+						},
+						{
+							"code": "511423",
+							"name": "洪雅县"
+						},
+						{
+							"code": "511424",
+							"name": "丹棱县"
+						},
+						{
+							"code": "511425",
+							"name": "青神县"
+						}
+					]
+				},
+				{
+					"code": "511500",
+					"name": "宜宾市",
+					"childs": [{
+							"code": "511502",
+							"name": "翠屏区"
+						},
+						{
+							"code": "511503",
+							"name": "南溪区"
+						},
+						{
+							"code": "511504",
+							"name": "叙州区"
+						},
+						{
+							"code": "511523",
+							"name": "江安县"
+						},
+						{
+							"code": "511524",
+							"name": "长宁县"
+						},
+						{
+							"code": "511525",
+							"name": "高县"
+						},
+						{
+							"code": "511526",
+							"name": "珙县"
+						},
+						{
+							"code": "511527",
+							"name": "筠连县"
+						},
+						{
+							"code": "511528",
+							"name": "兴文县"
+						},
+						{
+							"code": "511529",
+							"name": "屏山县"
+						}
+					]
+				},
+				{
+					"code": "511600",
+					"name": "广安市",
+					"childs": [{
+							"code": "511602",
+							"name": "广安区"
+						},
+						{
+							"code": "511603",
+							"name": "前锋区"
+						},
+						{
+							"code": "511621",
+							"name": "岳池县"
+						},
+						{
+							"code": "511622",
+							"name": "武胜县"
+						},
+						{
+							"code": "511623",
+							"name": "邻水县"
+						},
+						{
+							"code": "511681",
+							"name": "华蓥市"
+						}
+					]
+				},
+				{
+					"code": "511700",
+					"name": "达州市",
+					"childs": [{
+							"code": "511702",
+							"name": "通川区"
+						},
+						{
+							"code": "511703",
+							"name": "达川区"
+						},
+						{
+							"code": "511722",
+							"name": "宣汉县"
+						},
+						{
+							"code": "511723",
+							"name": "开江县"
+						},
+						{
+							"code": "511724",
+							"name": "大竹县"
+						},
+						{
+							"code": "511725",
+							"name": "渠县"
+						},
+						{
+							"code": "511781",
+							"name": "万源市"
+						}
+					]
+				},
+				{
+					"code": "511800",
+					"name": "雅安市",
+					"childs": [{
+							"code": "511802",
+							"name": "雨城区"
+						},
+						{
+							"code": "511803",
+							"name": "名山区"
+						},
+						{
+							"code": "511822",
+							"name": "荥经县"
+						},
+						{
+							"code": "511823",
+							"name": "汉源县"
+						},
+						{
+							"code": "511824",
+							"name": "石棉县"
+						},
+						{
+							"code": "511825",
+							"name": "天全县"
+						},
+						{
+							"code": "511826",
+							"name": "芦山县"
+						},
+						{
+							"code": "511827",
+							"name": "宝兴县"
+						}
+					]
+				},
+				{
+					"code": "511900",
+					"name": "巴中市",
+					"childs": [{
+							"code": "511902",
+							"name": "巴州区"
+						},
+						{
+							"code": "511903",
+							"name": "恩阳区"
+						},
+						{
+							"code": "511921",
+							"name": "通江县"
+						},
+						{
+							"code": "511922",
+							"name": "南江县"
+						},
+						{
+							"code": "511923",
+							"name": "平昌县"
+						}
+					]
+				},
+				{
+					"code": "512000",
+					"name": "资阳市",
+					"childs": [{
+							"code": "512002",
+							"name": "雁江区"
+						},
+						{
+							"code": "512021",
+							"name": "安岳县"
+						},
+						{
+							"code": "512022",
+							"name": "乐至县"
+						}
+					]
+				},
+				{
+					"code": "513200",
+					"name": "阿坝藏族羌族自治州",
+					"childs": [{
+							"code": "513201",
+							"name": "马尔康市"
+						},
+						{
+							"code": "513221",
+							"name": "汶川县"
+						},
+						{
+							"code": "513222",
+							"name": "理县"
+						},
+						{
+							"code": "513223",
+							"name": "茂县"
+						},
+						{
+							"code": "513224",
+							"name": "松潘县"
+						},
+						{
+							"code": "513225",
+							"name": "九寨沟县"
+						},
+						{
+							"code": "513226",
+							"name": "金川县"
+						},
+						{
+							"code": "513227",
+							"name": "小金县"
+						},
+						{
+							"code": "513228",
+							"name": "黑水县"
+						},
+						{
+							"code": "513230",
+							"name": "壤塘县"
+						},
+						{
+							"code": "513231",
+							"name": "阿坝县"
+						},
+						{
+							"code": "513232",
+							"name": "若尔盖县"
+						},
+						{
+							"code": "513233",
+							"name": "红原县"
+						}
+					]
+				},
+				{
+					"code": "513300",
+					"name": "甘孜藏族自治州",
+					"childs": [{
+							"code": "513301",
+							"name": "康定市"
+						},
+						{
+							"code": "513322",
+							"name": "泸定县"
+						},
+						{
+							"code": "513323",
+							"name": "丹巴县"
+						},
+						{
+							"code": "513324",
+							"name": "九龙县"
+						},
+						{
+							"code": "513325",
+							"name": "雅江县"
+						},
+						{
+							"code": "513326",
+							"name": "道孚县"
+						},
+						{
+							"code": "513327",
+							"name": "炉霍县"
+						},
+						{
+							"code": "513328",
+							"name": "甘孜县"
+						},
+						{
+							"code": "513329",
+							"name": "新龙县"
+						},
+						{
+							"code": "513330",
+							"name": "德格县"
+						},
+						{
+							"code": "513331",
+							"name": "白玉县"
+						},
+						{
+							"code": "513332",
+							"name": "石渠县"
+						},
+						{
+							"code": "513333",
+							"name": "色达县"
+						},
+						{
+							"code": "513334",
+							"name": "理塘县"
+						},
+						{
+							"code": "513335",
+							"name": "巴塘县"
+						},
+						{
+							"code": "513336",
+							"name": "乡城县"
+						},
+						{
+							"code": "513337",
+							"name": "稻城县"
+						},
+						{
+							"code": "513338",
+							"name": "得荣县"
+						}
+					]
+				},
+				{
+					"code": "513400",
+					"name": "凉山彝族自治州",
+					"childs": [{
+							"code": "513401",
+							"name": "西昌市"
+						},
+						{
+							"code": "513422",
+							"name": "木里藏族自治县"
+						},
+						{
+							"code": "513423",
+							"name": "盐源县"
+						},
+						{
+							"code": "513424",
+							"name": "德昌县"
+						},
+						{
+							"code": "513425",
+							"name": "会理县"
+						},
+						{
+							"code": "513426",
+							"name": "会东县"
+						},
+						{
+							"code": "513427",
+							"name": "宁南县"
+						},
+						{
+							"code": "513428",
+							"name": "普格县"
+						},
+						{
+							"code": "513429",
+							"name": "布拖县"
+						},
+						{
+							"code": "513430",
+							"name": "金阳县"
+						},
+						{
+							"code": "513431",
+							"name": "昭觉县"
+						},
+						{
+							"code": "513432",
+							"name": "喜德县"
+						},
+						{
+							"code": "513433",
+							"name": "冕宁县"
+						},
+						{
+							"code": "513434",
+							"name": "越西县"
+						},
+						{
+							"code": "513435",
+							"name": "甘洛县"
+						},
+						{
+							"code": "513436",
+							"name": "美姑县"
+						},
+						{
+							"code": "513437",
+							"name": "雷波县"
+						}
+					]
+				}
+			]
+		},
+		{
+			"code": "520000",
+			"name": "贵州省",
+			"childs": [{
+					"code": "520100",
+					"name": "贵阳市",
+					"childs": [{
+							"code": "520102",
+							"name": "南明区"
+						},
+						{
+							"code": "520103",
+							"name": "云岩区"
+						},
+						{
+							"code": "520111",
+							"name": "花溪区"
+						},
+						{
+							"code": "520112",
+							"name": "乌当区"
+						},
+						{
+							"code": "520113",
+							"name": "白云区"
+						},
+						{
+							"code": "520115",
+							"name": "观山湖区"
+						},
+						{
+							"code": "520121",
+							"name": "开阳县"
+						},
+						{
+							"code": "520122",
+							"name": "息烽县"
+						},
+						{
+							"code": "520123",
+							"name": "修文县"
+						},
+						{
+							"code": "520181",
+							"name": "清镇市"
+						}
+					]
+				},
+				{
+					"code": "520200",
+					"name": "六盘水市",
+					"childs": [{
+							"code": "520201",
+							"name": "钟山区"
+						},
+						{
+							"code": "520203",
+							"name": "六枝特区"
+						},
+						{
+							"code": "520221",
+							"name": "水城县"
+						},
+						{
+							"code": "520281",
+							"name": "盘州市"
+						}
+					]
+				},
+				{
+					"code": "520300",
+					"name": "遵义市",
+					"childs": [{
+							"code": "520302",
+							"name": "红花岗区"
+						},
+						{
+							"code": "520303",
+							"name": "汇川区"
+						},
+						{
+							"code": "520304",
+							"name": "播州区"
+						},
+						{
+							"code": "520322",
+							"name": "桐梓县"
+						},
+						{
+							"code": "520323",
+							"name": "绥阳县"
+						},
+						{
+							"code": "520324",
+							"name": "正安县"
+						},
+						{
+							"code": "520325",
+							"name": "道真仡佬族苗族自治县"
+						},
+						{
+							"code": "520326",
+							"name": "务川仡佬族苗族自治县"
+						},
+						{
+							"code": "520327",
+							"name": "凤冈县"
+						},
+						{
+							"code": "520328",
+							"name": "湄潭县"
+						},
+						{
+							"code": "520329",
+							"name": "余庆县"
+						},
+						{
+							"code": "520330",
+							"name": "习水县"
+						},
+						{
+							"code": "520381",
+							"name": "赤水市"
+						},
+						{
+							"code": "520382",
+							"name": "仁怀市"
+						}
+					]
+				},
+				{
+					"code": "520400",
+					"name": "安顺市",
+					"childs": [{
+							"code": "520402",
+							"name": "西秀区"
+						},
+						{
+							"code": "520403",
+							"name": "平坝区"
+						},
+						{
+							"code": "520422",
+							"name": "普定县"
+						},
+						{
+							"code": "520423",
+							"name": "镇宁布依族苗族自治县"
+						},
+						{
+							"code": "520424",
+							"name": "关岭布依族苗族自治县"
+						},
+						{
+							"code": "520425",
+							"name": "紫云苗族布依族自治县"
+						}
+					]
+				},
+				{
+					"code": "520500",
+					"name": "毕节市",
+					"childs": [{
+							"code": "520502",
+							"name": "七星关区"
+						},
+						{
+							"code": "520521",
+							"name": "大方县"
+						},
+						{
+							"code": "520522",
+							"name": "黔西县"
+						},
+						{
+							"code": "520523",
+							"name": "金沙县"
+						},
+						{
+							"code": "520524",
+							"name": "织金县"
+						},
+						{
+							"code": "520525",
+							"name": "纳雍县"
+						},
+						{
+							"code": "520526",
+							"name": "威宁彝族回族苗族自治县"
+						},
+						{
+							"code": "520527",
+							"name": "赫章县"
+						}
+					]
+				},
+				{
+					"code": "520600",
+					"name": "铜仁市",
+					"childs": [{
+							"code": "520602",
+							"name": "碧江区"
+						},
+						{
+							"code": "520603",
+							"name": "万山区"
+						},
+						{
+							"code": "520621",
+							"name": "江口县"
+						},
+						{
+							"code": "520622",
+							"name": "玉屏侗族自治县"
+						},
+						{
+							"code": "520623",
+							"name": "石阡县"
+						},
+						{
+							"code": "520624",
+							"name": "思南县"
+						},
+						{
+							"code": "520625",
+							"name": "印江土家族苗族自治县"
+						},
+						{
+							"code": "520626",
+							"name": "德江县"
+						},
+						{
+							"code": "520627",
+							"name": "沿河土家族自治县"
+						},
+						{
+							"code": "520628",
+							"name": "松桃苗族自治县"
+						}
+					]
+				},
+				{
+					"code": "522300",
+					"name": "黔西南布依族苗族自治州",
+					"childs": [{
+							"code": "522301",
+							"name": "兴义市"
+						},
+						{
+							"code": "522302",
+							"name": "兴仁市"
+						},
+						{
+							"code": "522323",
+							"name": "普安县"
+						},
+						{
+							"code": "522324",
+							"name": "晴隆县"
+						},
+						{
+							"code": "522325",
+							"name": "贞丰县"
+						},
+						{
+							"code": "522326",
+							"name": "望谟县"
+						},
+						{
+							"code": "522327",
+							"name": "册亨县"
+						},
+						{
+							"code": "522328",
+							"name": "安龙县"
+						}
+					]
+				},
+				{
+					"code": "522600",
+					"name": "黔东南苗族侗族自治州",
+					"childs": [{
+							"code": "522601",
+							"name": "凯里市"
+						},
+						{
+							"code": "522622",
+							"name": "黄平县"
+						},
+						{
+							"code": "522623",
+							"name": "施秉县"
+						},
+						{
+							"code": "522624",
+							"name": "三穗县"
+						},
+						{
+							"code": "522625",
+							"name": "镇远县"
+						},
+						{
+							"code": "522626",
+							"name": "岑巩县"
+						},
+						{
+							"code": "522627",
+							"name": "天柱县"
+						},
+						{
+							"code": "522628",
+							"name": "锦屏县"
+						},
+						{
+							"code": "522629",
+							"name": "剑河县"
+						},
+						{
+							"code": "522630",
+							"name": "台江县"
+						},
+						{
+							"code": "522631",
+							"name": "黎平县"
+						},
+						{
+							"code": "522632",
+							"name": "榕江县"
+						},
+						{
+							"code": "522633",
+							"name": "从江县"
+						},
+						{
+							"code": "522634",
+							"name": "雷山县"
+						},
+						{
+							"code": "522635",
+							"name": "麻江县"
+						},
+						{
+							"code": "522636",
+							"name": "丹寨县"
+						}
+					]
+				},
+				{
+					"code": "522700",
+					"name": "黔南布依族苗族自治州",
+					"childs": [{
+							"code": "522701",
+							"name": "都匀市"
+						},
+						{
+							"code": "522702",
+							"name": "福泉市"
+						},
+						{
+							"code": "522722",
+							"name": "荔波县"
+						},
+						{
+							"code": "522723",
+							"name": "贵定县"
+						},
+						{
+							"code": "522725",
+							"name": "瓮安县"
+						},
+						{
+							"code": "522726",
+							"name": "独山县"
+						},
+						{
+							"code": "522727",
+							"name": "平塘县"
+						},
+						{
+							"code": "522728",
+							"name": "罗甸县"
+						},
+						{
+							"code": "522729",
+							"name": "长顺县"
+						},
+						{
+							"code": "522730",
+							"name": "龙里县"
+						},
+						{
+							"code": "522731",
+							"name": "惠水县"
+						},
+						{
+							"code": "522732",
+							"name": "三都水族自治县"
+						}
+					]
+				}
+			]
+		},
+		{
+			"code": "530000",
+			"name": "云南省",
+			"childs": [{
+					"code": "530100",
+					"name": "昆明市",
+					"childs": [{
+							"code": "530102",
+							"name": "五华区"
+						},
+						{
+							"code": "530103",
+							"name": "盘龙区"
+						},
+						{
+							"code": "530111",
+							"name": "官渡区"
+						},
+						{
+							"code": "530112",
+							"name": "西山区"
+						},
+						{
+							"code": "530113",
+							"name": "东川区"
+						},
+						{
+							"code": "530114",
+							"name": "呈贡区"
+						},
+						{
+							"code": "530115",
+							"name": "晋宁区"
+						},
+						{
+							"code": "530124",
+							"name": "富民县"
+						},
+						{
+							"code": "530125",
+							"name": "宜良县"
+						},
+						{
+							"code": "530126",
+							"name": "石林彝族自治县"
+						},
+						{
+							"code": "530127",
+							"name": "嵩明县"
+						},
+						{
+							"code": "530128",
+							"name": "禄劝彝族苗族自治县"
+						},
+						{
+							"code": "530129",
+							"name": "寻甸回族彝族自治县"
+						},
+						{
+							"code": "530181",
+							"name": "安宁市"
+						}
+					]
+				},
+				{
+					"code": "530300",
+					"name": "曲靖市",
+					"childs": [{
+							"code": "530302",
+							"name": "麒麟区"
+						},
+						{
+							"code": "530303",
+							"name": "沾益区"
+						},
+						{
+							"code": "530304",
+							"name": "马龙区"
+						},
+						{
+							"code": "530322",
+							"name": "陆良县"
+						},
+						{
+							"code": "530323",
+							"name": "师宗县"
+						},
+						{
+							"code": "530324",
+							"name": "罗平县"
+						},
+						{
+							"code": "530325",
+							"name": "富源县"
+						},
+						{
+							"code": "530326",
+							"name": "会泽县"
+						},
+						{
+							"code": "530381",
+							"name": "宣威市"
+						}
+					]
+				},
+				{
+					"code": "530400",
+					"name": "玉溪市",
+					"childs": [{
+							"code": "530402",
+							"name": "红塔区"
+						},
+						{
+							"code": "530403",
+							"name": "江川区"
+						},
+						{
+							"code": "530422",
+							"name": "澄江县"
+						},
+						{
+							"code": "530423",
+							"name": "通海县"
+						},
+						{
+							"code": "530424",
+							"name": "华宁县"
+						},
+						{
+							"code": "530425",
+							"name": "易门县"
+						},
+						{
+							"code": "530426",
+							"name": "峨山彝族自治县"
+						},
+						{
+							"code": "530427",
+							"name": "新平彝族傣族自治县"
+						},
+						{
+							"code": "530428",
+							"name": "元江哈尼族彝族傣族自治县"
+						}
+					]
+				},
+				{
+					"code": "530500",
+					"name": "保山市",
+					"childs": [{
+							"code": "530502",
+							"name": "隆阳区"
+						},
+						{
+							"code": "530521",
+							"name": "施甸县"
+						},
+						{
+							"code": "530523",
+							"name": "龙陵县"
+						},
+						{
+							"code": "530524",
+							"name": "昌宁县"
+						},
+						{
+							"code": "530581",
+							"name": "腾冲市"
+						}
+					]
+				},
+				{
+					"code": "530600",
+					"name": "昭通市",
+					"childs": [{
+							"code": "530602",
+							"name": "昭阳区"
+						},
+						{
+							"code": "530621",
+							"name": "鲁甸县"
+						},
+						{
+							"code": "530622",
+							"name": "巧家县"
+						},
+						{
+							"code": "530623",
+							"name": "盐津县"
+						},
+						{
+							"code": "530624",
+							"name": "大关县"
+						},
+						{
+							"code": "530625",
+							"name": "永善县"
+						},
+						{
+							"code": "530626",
+							"name": "绥江县"
+						},
+						{
+							"code": "530627",
+							"name": "镇雄县"
+						},
+						{
+							"code": "530628",
+							"name": "彝良县"
+						},
+						{
+							"code": "530629",
+							"name": "威信县"
+						},
+						{
+							"code": "530681",
+							"name": "水富市"
+						}
+					]
+				},
+				{
+					"code": "530700",
+					"name": "丽江市",
+					"childs": [{
+							"code": "530702",
+							"name": "古城区"
+						},
+						{
+							"code": "530721",
+							"name": "玉龙纳西族自治县"
+						},
+						{
+							"code": "530722",
+							"name": "永胜县"
+						},
+						{
+							"code": "530723",
+							"name": "华坪县"
+						},
+						{
+							"code": "530724",
+							"name": "宁蒗彝族自治县"
+						}
+					]
+				},
+				{
+					"code": "530800",
+					"name": "普洱市",
+					"childs": [{
+							"code": "530802",
+							"name": "思茅区"
+						},
+						{
+							"code": "530821",
+							"name": "宁洱哈尼族彝族自治县"
+						},
+						{
+							"code": "530822",
+							"name": "墨江哈尼族自治县"
+						},
+						{
+							"code": "530823",
+							"name": "景东彝族自治县"
+						},
+						{
+							"code": "530824",
+							"name": "景谷傣族彝族自治县"
+						},
+						{
+							"code": "530825",
+							"name": "镇沅彝族哈尼族拉祜族自治县"
+						},
+						{
+							"code": "530826",
+							"name": "江城哈尼族彝族自治县"
+						},
+						{
+							"code": "530827",
+							"name": "孟连傣族拉祜族佤族自治县"
+						},
+						{
+							"code": "530828",
+							"name": "澜沧拉祜族自治县"
+						},
+						{
+							"code": "530829",
+							"name": "西盟佤族自治县"
+						}
+					]
+				},
+				{
+					"code": "530900",
+					"name": "临沧市",
+					"childs": [{
+							"code": "530902",
+							"name": "临翔区"
+						},
+						{
+							"code": "530921",
+							"name": "凤庆县"
+						},
+						{
+							"code": "530922",
+							"name": "云县"
+						},
+						{
+							"code": "530923",
+							"name": "永德县"
+						},
+						{
+							"code": "530924",
+							"name": "镇康县"
+						},
+						{
+							"code": "530925",
+							"name": "双江拉祜族佤族布朗族傣族自治县"
+						},
+						{
+							"code": "530926",
+							"name": "耿马傣族佤族自治县"
+						},
+						{
+							"code": "530927",
+							"name": "沧源佤族自治县"
+						}
+					]
+				},
+				{
+					"code": "532300",
+					"name": "楚雄彝族自治州",
+					"childs": [{
+							"code": "532301",
+							"name": "楚雄市"
+						},
+						{
+							"code": "532322",
+							"name": "双柏县"
+						},
+						{
+							"code": "532323",
+							"name": "牟定县"
+						},
+						{
+							"code": "532324",
+							"name": "南华县"
+						},
+						{
+							"code": "532325",
+							"name": "姚安县"
+						},
+						{
+							"code": "532326",
+							"name": "大姚县"
+						},
+						{
+							"code": "532327",
+							"name": "永仁县"
+						},
+						{
+							"code": "532328",
+							"name": "元谋县"
+						},
+						{
+							"code": "532329",
+							"name": "武定县"
+						},
+						{
+							"code": "532331",
+							"name": "禄丰县"
+						}
+					]
+				},
+				{
+					"code": "532500",
+					"name": "红河哈尼族彝族自治州",
+					"childs": [{
+							"code": "532501",
+							"name": "个旧市"
+						},
+						{
+							"code": "532502",
+							"name": "开远市"
+						},
+						{
+							"code": "532503",
+							"name": "蒙自市"
+						},
+						{
+							"code": "532504",
+							"name": "弥勒市"
+						},
+						{
+							"code": "532523",
+							"name": "屏边苗族自治县"
+						},
+						{
+							"code": "532524",
+							"name": "建水县"
+						},
+						{
+							"code": "532525",
+							"name": "石屏县"
+						},
+						{
+							"code": "532527",
+							"name": "泸西县"
+						},
+						{
+							"code": "532528",
+							"name": "元阳县"
+						},
+						{
+							"code": "532529",
+							"name": "红河县"
+						},
+						{
+							"code": "532530",
+							"name": "金平苗族瑶族傣族自治县"
+						},
+						{
+							"code": "532531",
+							"name": "绿春县"
+						},
+						{
+							"code": "532532",
+							"name": "河口瑶族自治县"
+						}
+					]
+				},
+				{
+					"code": "532600",
+					"name": "文山壮族苗族自治州",
+					"childs": [{
+							"code": "532601",
+							"name": "文山市"
+						},
+						{
+							"code": "532622",
+							"name": "砚山县"
+						},
+						{
+							"code": "532623",
+							"name": "西畴县"
+						},
+						{
+							"code": "532624",
+							"name": "麻栗坡县"
+						},
+						{
+							"code": "532625",
+							"name": "马关县"
+						},
+						{
+							"code": "532626",
+							"name": "丘北县"
+						},
+						{
+							"code": "532627",
+							"name": "广南县"
+						},
+						{
+							"code": "532628",
+							"name": "富宁县"
+						}
+					]
+				},
+				{
+					"code": "532800",
+					"name": "西双版纳傣族自治州",
+					"childs": [{
+							"code": "532801",
+							"name": "景洪市"
+						},
+						{
+							"code": "532822",
+							"name": "勐海县"
+						},
+						{
+							"code": "532823",
+							"name": "勐腊县"
+						}
+					]
+				},
+				{
+					"code": "532900",
+					"name": "大理白族自治州",
+					"childs": [{
+							"code": "532901",
+							"name": "大理市"
+						},
+						{
+							"code": "532922",
+							"name": "漾濞彝族自治县"
+						},
+						{
+							"code": "532923",
+							"name": "祥云县"
+						},
+						{
+							"code": "532924",
+							"name": "宾川县"
+						},
+						{
+							"code": "532925",
+							"name": "弥渡县"
+						},
+						{
+							"code": "532926",
+							"name": "南涧彝族自治县"
+						},
+						{
+							"code": "532927",
+							"name": "巍山彝族回族自治县"
+						},
+						{
+							"code": "532928",
+							"name": "永平县"
+						},
+						{
+							"code": "532929",
+							"name": "云龙县"
+						},
+						{
+							"code": "532930",
+							"name": "洱源县"
+						},
+						{
+							"code": "532931",
+							"name": "剑川县"
+						},
+						{
+							"code": "532932",
+							"name": "鹤庆县"
+						}
+					]
+				},
+				{
+					"code": "533100",
+					"name": "德宏傣族景颇族自治州",
+					"childs": [{
+							"code": "533102",
+							"name": "瑞丽市"
+						},
+						{
+							"code": "533103",
+							"name": "芒市"
+						},
+						{
+							"code": "533122",
+							"name": "梁河县"
+						},
+						{
+							"code": "533123",
+							"name": "盈江县"
+						},
+						{
+							"code": "533124",
+							"name": "陇川县"
+						}
+					]
+				},
+				{
+					"code": "533300",
+					"name": "怒江傈僳族自治州",
+					"childs": [{
+							"code": "533301",
+							"name": "泸水市"
+						},
+						{
+							"code": "533323",
+							"name": "福贡县"
+						},
+						{
+							"code": "533324",
+							"name": "贡山独龙族怒族自治县"
+						},
+						{
+							"code": "533325",
+							"name": "兰坪白族普米族自治县"
+						}
+					]
+				},
+				{
+					"code": "533400",
+					"name": "迪庆藏族自治州",
+					"childs": [{
+							"code": "533401",
+							"name": "香格里拉市"
+						},
+						{
+							"code": "533422",
+							"name": "德钦县"
+						},
+						{
+							"code": "533423",
+							"name": "维西傈僳族自治县"
+						}
+					]
+				}
+			]
+		},
+		{
+			"code": "540000",
+			"name": "西藏自治区",
+			"childs": [{
+					"code": "540100",
+					"name": "拉萨市",
+					"childs": [{
+							"code": "540102",
+							"name": "城关区"
+						},
+						{
+							"code": "540103",
+							"name": "堆龙德庆区"
+						},
+						{
+							"code": "540104",
+							"name": "达孜区"
+						},
+						{
+							"code": "540121",
+							"name": "林周县"
+						},
+						{
+							"code": "540122",
+							"name": "当雄县"
+						},
+						{
+							"code": "540123",
+							"name": "尼木县"
+						},
+						{
+							"code": "540124",
+							"name": "曲水县"
+						},
+						{
+							"code": "540127",
+							"name": "墨竹工卡县"
+						}
+					]
+				},
+				{
+					"code": "540200",
+					"name": "日喀则市",
+					"childs": [{
+							"code": "540202",
+							"name": "桑珠孜区"
+						},
+						{
+							"code": "540221",
+							"name": "南木林县"
+						},
+						{
+							"code": "540222",
+							"name": "江孜县"
+						},
+						{
+							"code": "540223",
+							"name": "定日县"
+						},
+						{
+							"code": "540224",
+							"name": "萨迦县"
+						},
+						{
+							"code": "540225",
+							"name": "拉孜县"
+						},
+						{
+							"code": "540226",
+							"name": "昂仁县"
+						},
+						{
+							"code": "540227",
+							"name": "谢通门县"
+						},
+						{
+							"code": "540228",
+							"name": "白朗县"
+						},
+						{
+							"code": "540229",
+							"name": "仁布县"
+						},
+						{
+							"code": "540230",
+							"name": "康马县"
+						},
+						{
+							"code": "540231",
+							"name": "定结县"
+						},
+						{
+							"code": "540232",
+							"name": "仲巴县"
+						},
+						{
+							"code": "540233",
+							"name": "亚东县"
+						},
+						{
+							"code": "540234",
+							"name": "吉隆县"
+						},
+						{
+							"code": "540235",
+							"name": "聂拉木县"
+						},
+						{
+							"code": "540236",
+							"name": "萨嘎县"
+						},
+						{
+							"code": "540237",
+							"name": "岗巴县"
+						}
+					]
+				},
+				{
+					"code": "540300",
+					"name": "昌都市",
+					"childs": [{
+							"code": "540302",
+							"name": "卡若区"
+						},
+						{
+							"code": "540321",
+							"name": "江达县"
+						},
+						{
+							"code": "540322",
+							"name": "贡觉县"
+						},
+						{
+							"code": "540323",
+							"name": "类乌齐县"
+						},
+						{
+							"code": "540324",
+							"name": "丁青县"
+						},
+						{
+							"code": "540325",
+							"name": "察雅县"
+						},
+						{
+							"code": "540326",
+							"name": "八宿县"
+						},
+						{
+							"code": "540327",
+							"name": "左贡县"
+						},
+						{
+							"code": "540328",
+							"name": "芒康县"
+						},
+						{
+							"code": "540329",
+							"name": "洛隆县"
+						},
+						{
+							"code": "540330",
+							"name": "边坝县"
+						}
+					]
+				},
+				{
+					"code": "540400",
+					"name": "林芝市",
+					"childs": [{
+							"code": "540402",
+							"name": "巴宜区"
+						},
+						{
+							"code": "540421",
+							"name": "工布江达县"
+						},
+						{
+							"code": "540422",
+							"name": "米林县"
+						},
+						{
+							"code": "540423",
+							"name": "墨脱县"
+						},
+						{
+							"code": "540424",
+							"name": "波密县"
+						},
+						{
+							"code": "540425",
+							"name": "察隅县"
+						},
+						{
+							"code": "540426",
+							"name": "朗县"
+						}
+					]
+				},
+				{
+					"code": "540500",
+					"name": "山南市",
+					"childs": [{
+							"code": "540502",
+							"name": "乃东区"
+						},
+						{
+							"code": "540521",
+							"name": "扎囊县"
+						},
+						{
+							"code": "540522",
+							"name": "贡嘎县"
+						},
+						{
+							"code": "540523",
+							"name": "桑日县"
+						},
+						{
+							"code": "540524",
+							"name": "琼结县"
+						},
+						{
+							"code": "540525",
+							"name": "曲松县"
+						},
+						{
+							"code": "540526",
+							"name": "措美县"
+						},
+						{
+							"code": "540527",
+							"name": "洛扎县"
+						},
+						{
+							"code": "540528",
+							"name": "加查县"
+						},
+						{
+							"code": "540529",
+							"name": "隆子县"
+						},
+						{
+							"code": "540530",
+							"name": "错那县"
+						},
+						{
+							"code": "540531",
+							"name": "浪卡子县"
+						}
+					]
+				},
+				{
+					"code": "540600",
+					"name": "那曲市",
+					"childs": [{
+							"code": "540602",
+							"name": "色尼区"
+						},
+						{
+							"code": "540621",
+							"name": "嘉黎县"
+						},
+						{
+							"code": "540622",
+							"name": "比如县"
+						},
+						{
+							"code": "540623",
+							"name": "聂荣县"
+						},
+						{
+							"code": "540624",
+							"name": "安多县"
+						},
+						{
+							"code": "540625",
+							"name": "申扎县"
+						},
+						{
+							"code": "540626",
+							"name": "索县"
+						},
+						{
+							"code": "540627",
+							"name": "班戈县"
+						},
+						{
+							"code": "540628",
+							"name": "巴青县"
+						},
+						{
+							"code": "540629",
+							"name": "尼玛县"
+						},
+						{
+							"code": "540630",
+							"name": "双湖县"
+						}
+					]
+				},
+				{
+					"code": "542500",
+					"name": "阿里地区",
+					"childs": [{
+							"code": "542521",
+							"name": "普兰县"
+						},
+						{
+							"code": "542522",
+							"name": "札达县"
+						},
+						{
+							"code": "542523",
+							"name": "噶尔县"
+						},
+						{
+							"code": "542524",
+							"name": "日土县"
+						},
+						{
+							"code": "542525",
+							"name": "革吉县"
+						},
+						{
+							"code": "542526",
+							"name": "改则县"
+						},
+						{
+							"code": "542527",
+							"name": "措勤县"
+						}
+					]
+				}
+			]
+		},
+		{
+			"code": "610000",
+			"name": "陕西省",
+			"childs": [{
+					"code": "610100",
+					"name": "西安市",
+					"childs": [{
+							"code": "610102",
+							"name": "新城区"
+						},
+						{
+							"code": "610103",
+							"name": "碑林区"
+						},
+						{
+							"code": "610104",
+							"name": "莲湖区"
+						},
+						{
+							"code": "610111",
+							"name": "灞桥区"
+						},
+						{
+							"code": "610112",
+							"name": "未央区"
+						},
+						{
+							"code": "610113",
+							"name": "雁塔区"
+						},
+						{
+							"code": "610114",
+							"name": "阎良区"
+						},
+						{
+							"code": "610115",
+							"name": "临潼区"
+						},
+						{
+							"code": "610116",
+							"name": "长安区"
+						},
+						{
+							"code": "610117",
+							"name": "高陵区"
+						},
+						{
+							"code": "610118",
+							"name": "鄠邑区"
+						},
+						{
+							"code": "610122",
+							"name": "蓝田县"
+						},
+						{
+							"code": "610124",
+							"name": "周至县"
+						}
+					]
+				},
+				{
+					"code": "610200",
+					"name": "铜川市",
+					"childs": [{
+							"code": "610202",
+							"name": "王益区"
+						},
+						{
+							"code": "610203",
+							"name": "印台区"
+						},
+						{
+							"code": "610204",
+							"name": "耀州区"
+						},
+						{
+							"code": "610222",
+							"name": "宜君县"
+						}
+					]
+				},
+				{
+					"code": "610300",
+					"name": "宝鸡市",
+					"childs": [{
+							"code": "610302",
+							"name": "渭滨区"
+						},
+						{
+							"code": "610303",
+							"name": "金台区"
+						},
+						{
+							"code": "610304",
+							"name": "陈仓区"
+						},
+						{
+							"code": "610322",
+							"name": "凤翔县"
+						},
+						{
+							"code": "610323",
+							"name": "岐山县"
+						},
+						{
+							"code": "610324",
+							"name": "扶风县"
+						},
+						{
+							"code": "610326",
+							"name": "眉县"
+						},
+						{
+							"code": "610327",
+							"name": "陇县"
+						},
+						{
+							"code": "610328",
+							"name": "千阳县"
+						},
+						{
+							"code": "610329",
+							"name": "麟游县"
+						},
+						{
+							"code": "610330",
+							"name": "凤县"
+						},
+						{
+							"code": "610331",
+							"name": "太白县"
+						}
+					]
+				},
+				{
+					"code": "610400",
+					"name": "咸阳市",
+					"childs": [{
+							"code": "610402",
+							"name": "秦都区"
+						},
+						{
+							"code": "610403",
+							"name": "杨陵区"
+						},
+						{
+							"code": "610404",
+							"name": "渭城区"
+						},
+						{
+							"code": "610422",
+							"name": "三原县"
+						},
+						{
+							"code": "610423",
+							"name": "泾阳县"
+						},
+						{
+							"code": "610424",
+							"name": "乾县"
+						},
+						{
+							"code": "610425",
+							"name": "礼泉县"
+						},
+						{
+							"code": "610426",
+							"name": "永寿县"
+						},
+						{
+							"code": "610428",
+							"name": "长武县"
+						},
+						{
+							"code": "610429",
+							"name": "旬邑县"
+						},
+						{
+							"code": "610430",
+							"name": "淳化县"
+						},
+						{
+							"code": "610431",
+							"name": "武功县"
+						},
+						{
+							"code": "610481",
+							"name": "兴平市"
+						},
+						{
+							"code": "610482",
+							"name": "彬州市"
+						}
+					]
+				},
+				{
+					"code": "610500",
+					"name": "渭南市",
+					"childs": [{
+							"code": "610502",
+							"name": "临渭区"
+						},
+						{
+							"code": "610503",
+							"name": "华州区"
+						},
+						{
+							"code": "610522",
+							"name": "潼关县"
+						},
+						{
+							"code": "610523",
+							"name": "大荔县"
+						},
+						{
+							"code": "610524",
+							"name": "合阳县"
+						},
+						{
+							"code": "610525",
+							"name": "澄城县"
+						},
+						{
+							"code": "610526",
+							"name": "蒲城县"
+						},
+						{
+							"code": "610527",
+							"name": "白水县"
+						},
+						{
+							"code": "610528",
+							"name": "富平县"
+						},
+						{
+							"code": "610581",
+							"name": "韩城市"
+						},
+						{
+							"code": "610582",
+							"name": "华阴市"
+						}
+					]
+				},
+				{
+					"code": "610600",
+					"name": "延安市",
+					"childs": [{
+							"code": "610602",
+							"name": "宝塔区"
+						},
+						{
+							"code": "610603",
+							"name": "安塞区"
+						},
+						{
+							"code": "610621",
+							"name": "延长县"
+						},
+						{
+							"code": "610622",
+							"name": "延川县"
+						},
+						{
+							"code": "610623",
+							"name": "子长县"
+						},
+						{
+							"code": "610625",
+							"name": "志丹县"
+						},
+						{
+							"code": "610626",
+							"name": "吴起县"
+						},
+						{
+							"code": "610627",
+							"name": "甘泉县"
+						},
+						{
+							"code": "610628",
+							"name": "富县"
+						},
+						{
+							"code": "610629",
+							"name": "洛川县"
+						},
+						{
+							"code": "610630",
+							"name": "宜川县"
+						},
+						{
+							"code": "610631",
+							"name": "黄龙县"
+						},
+						{
+							"code": "610632",
+							"name": "黄陵县"
+						}
+					]
+				},
+				{
+					"code": "610700",
+					"name": "汉中市",
+					"childs": [{
+							"code": "610702",
+							"name": "汉台区"
+						},
+						{
+							"code": "610703",
+							"name": "南郑区"
+						},
+						{
+							"code": "610722",
+							"name": "城固县"
+						},
+						{
+							"code": "610723",
+							"name": "洋县"
+						},
+						{
+							"code": "610724",
+							"name": "西乡县"
+						},
+						{
+							"code": "610725",
+							"name": "勉县"
+						},
+						{
+							"code": "610726",
+							"name": "宁强县"
+						},
+						{
+							"code": "610727",
+							"name": "略阳县"
+						},
+						{
+							"code": "610728",
+							"name": "镇巴县"
+						},
+						{
+							"code": "610729",
+							"name": "留坝县"
+						},
+						{
+							"code": "610730",
+							"name": "佛坪县"
+						}
+					]
+				},
+				{
+					"code": "610800",
+					"name": "榆林市",
+					"childs": [{
+							"code": "610802",
+							"name": "榆阳区"
+						},
+						{
+							"code": "610803",
+							"name": "横山区"
+						},
+						{
+							"code": "610822",
+							"name": "府谷县"
+						},
+						{
+							"code": "610824",
+							"name": "靖边县"
+						},
+						{
+							"code": "610825",
+							"name": "定边县"
+						},
+						{
+							"code": "610826",
+							"name": "绥德县"
+						},
+						{
+							"code": "610827",
+							"name": "米脂县"
+						},
+						{
+							"code": "610828",
+							"name": "佳县"
+						},
+						{
+							"code": "610829",
+							"name": "吴堡县"
+						},
+						{
+							"code": "610830",
+							"name": "清涧县"
+						},
+						{
+							"code": "610831",
+							"name": "子洲县"
+						},
+						{
+							"code": "610881",
+							"name": "神木市"
+						}
+					]
+				},
+				{
+					"code": "610900",
+					"name": "安康市",
+					"childs": [{
+							"code": "610902",
+							"name": "汉滨区"
+						},
+						{
+							"code": "610921",
+							"name": "汉阴县"
+						},
+						{
+							"code": "610922",
+							"name": "石泉县"
+						},
+						{
+							"code": "610923",
+							"name": "宁陕县"
+						},
+						{
+							"code": "610924",
+							"name": "紫阳县"
+						},
+						{
+							"code": "610925",
+							"name": "岚皋县"
+						},
+						{
+							"code": "610926",
+							"name": "平利县"
+						},
+						{
+							"code": "610927",
+							"name": "镇坪县"
+						},
+						{
+							"code": "610928",
+							"name": "旬阳县"
+						},
+						{
+							"code": "610929",
+							"name": "白河县"
+						}
+					]
+				},
+				{
+					"code": "611000",
+					"name": "商洛市",
+					"childs": [{
+							"code": "611002",
+							"name": "商州区"
+						},
+						{
+							"code": "611021",
+							"name": "洛南县"
+						},
+						{
+							"code": "611022",
+							"name": "丹凤县"
+						},
+						{
+							"code": "611023",
+							"name": "商南县"
+						},
+						{
+							"code": "611024",
+							"name": "山阳县"
+						},
+						{
+							"code": "611025",
+							"name": "镇安县"
+						},
+						{
+							"code": "611026",
+							"name": "柞水县"
+						}
+					]
+				}
+			]
+		},
+		{
+			"code": "620000",
+			"name": "甘肃省",
+			"childs": [{
+					"code": "620100",
+					"name": "兰州市",
+					"childs": [{
+							"code": "620102",
+							"name": "城关区"
+						},
+						{
+							"code": "620103",
+							"name": "七里河区"
+						},
+						{
+							"code": "620104",
+							"name": "西固区"
+						},
+						{
+							"code": "620105",
+							"name": "安宁区"
+						},
+						{
+							"code": "620111",
+							"name": "红古区"
+						},
+						{
+							"code": "620121",
+							"name": "永登县"
+						},
+						{
+							"code": "620122",
+							"name": "皋兰县"
+						},
+						{
+							"code": "620123",
+							"name": "榆中县"
+						}
+					]
+				},
+				{
+					"code": "620200",
+					"name": "嘉峪关市",
+					"childs":[{
+							"code": "620200100",
+							"name": "新城镇"
+						},
+						{
+							"code": "620200101",
+							"name": "峪泉镇"
+						},
+						{
+							"code": "620200102",
+							"name": "文殊镇"
+						},
+						{
+							"code": "620200401",
+							"name": "雄关区"
+						},
+						{
+							"code": "620200402",
+							"name": "镜铁区"
+						},
+						{
+							"code": "620200403",
+							"name": "长城区"
+						}
+					]
+				},
+				{
+					"code": "620300",
+					"name": "金昌市",
+					"childs": [{
+							"code": "620302",
+							"name": "金川区"
+						},
+						{
+							"code": "620321",
+							"name": "永昌县"
+						}
+					]
+				},
+				{
+					"code": "620400",
+					"name": "白银市",
+					"childs": [{
+							"code": "620402",
+							"name": "白银区"
+						},
+						{
+							"code": "620403",
+							"name": "平川区"
+						},
+						{
+							"code": "620421",
+							"name": "靖远县"
+						},
+						{
+							"code": "620422",
+							"name": "会宁县"
+						},
+						{
+							"code": "620423",
+							"name": "景泰县"
+						}
+					]
+				},
+				{
+					"code": "620500",
+					"name": "天水市",
+					"childs": [{
+							"code": "620502",
+							"name": "秦州区"
+						},
+						{
+							"code": "620503",
+							"name": "麦积区"
+						},
+						{
+							"code": "620521",
+							"name": "清水县"
+						},
+						{
+							"code": "620522",
+							"name": "秦安县"
+						},
+						{
+							"code": "620523",
+							"name": "甘谷县"
+						},
+						{
+							"code": "620524",
+							"name": "武山县"
+						},
+						{
+							"code": "620525",
+							"name": "张家川回族自治县"
+						}
+					]
+				},
+				{
+					"code": "620600",
+					"name": "武威市",
+					"childs": [{
+							"code": "620602",
+							"name": "凉州区"
+						},
+						{
+							"code": "620621",
+							"name": "民勤县"
+						},
+						{
+							"code": "620622",
+							"name": "古浪县"
+						},
+						{
+							"code": "620623",
+							"name": "天祝藏族自治县"
+						}
+					]
+				},
+				{
+					"code": "620700",
+					"name": "张掖市",
+					"childs": [{
+							"code": "620702",
+							"name": "甘州区"
+						},
+						{
+							"code": "620721",
+							"name": "肃南裕固族自治县"
+						},
+						{
+							"code": "620722",
+							"name": "民乐县"
+						},
+						{
+							"code": "620723",
+							"name": "临泽县"
+						},
+						{
+							"code": "620724",
+							"name": "高台县"
+						},
+						{
+							"code": "620725",
+							"name": "山丹县"
+						}
+					]
+				},
+				{
+					"code": "620800",
+					"name": "平凉市",
+					"childs": [{
+							"code": "620802",
+							"name": "崆峒区"
+						},
+						{
+							"code": "620821",
+							"name": "泾川县"
+						},
+						{
+							"code": "620822",
+							"name": "灵台县"
+						},
+						{
+							"code": "620823",
+							"name": "崇信县"
+						},
+						{
+							"code": "620825",
+							"name": "庄浪县"
+						},
+						{
+							"code": "620826",
+							"name": "静宁县"
+						},
+						{
+							"code": "620881",
+							"name": "华亭市"
+						}
+					]
+				},
+				{
+					"code": "620900",
+					"name": "酒泉市",
+					"childs": [{
+							"code": "620902",
+							"name": "肃州区"
+						},
+						{
+							"code": "620921",
+							"name": "金塔县"
+						},
+						{
+							"code": "620922",
+							"name": "瓜州县"
+						},
+						{
+							"code": "620923",
+							"name": "肃北蒙古族自治县"
+						},
+						{
+							"code": "620924",
+							"name": "阿克塞哈萨克族自治县"
+						},
+						{
+							"code": "620981",
+							"name": "玉门市"
+						},
+						{
+							"code": "620982",
+							"name": "敦煌市"
+						}
+					]
+				},
+				{
+					"code": "621000",
+					"name": "庆阳市",
+					"childs": [{
+							"code": "621002",
+							"name": "西峰区"
+						},
+						{
+							"code": "621021",
+							"name": "庆城县"
+						},
+						{
+							"code": "621022",
+							"name": "环县"
+						},
+						{
+							"code": "621023",
+							"name": "华池县"
+						},
+						{
+							"code": "621024",
+							"name": "合水县"
+						},
+						{
+							"code": "621025",
+							"name": "正宁县"
+						},
+						{
+							"code": "621026",
+							"name": "宁县"
+						},
+						{
+							"code": "621027",
+							"name": "镇原县"
+						}
+					]
+				},
+				{
+					"code": "621100",
+					"name": "定西市",
+					"childs": [{
+							"code": "621102",
+							"name": "安定区"
+						},
+						{
+							"code": "621121",
+							"name": "通渭县"
+						},
+						{
+							"code": "621122",
+							"name": "陇西县"
+						},
+						{
+							"code": "621123",
+							"name": "渭源县"
+						},
+						{
+							"code": "621124",
+							"name": "临洮县"
+						},
+						{
+							"code": "621125",
+							"name": "漳县"
+						},
+						{
+							"code": "621126",
+							"name": "岷县"
+						}
+					]
+				},
+				{
+					"code": "621200",
+					"name": "陇南市",
+					"childs": [{
+							"code": "621202",
+							"name": "武都区"
+						},
+						{
+							"code": "621221",
+							"name": "成县"
+						},
+						{
+							"code": "621222",
+							"name": "文县"
+						},
+						{
+							"code": "621223",
+							"name": "宕昌县"
+						},
+						{
+							"code": "621224",
+							"name": "康县"
+						},
+						{
+							"code": "621225",
+							"name": "西和县"
+						},
+						{
+							"code": "621226",
+							"name": "礼县"
+						},
+						{
+							"code": "621227",
+							"name": "徽县"
+						},
+						{
+							"code": "621228",
+							"name": "两当县"
+						}
+					]
+				},
+				{
+					"code": "622900",
+					"name": "临夏回族自治州",
+					"childs": [{
+							"code": "622901",
+							"name": "临夏市"
+						},
+						{
+							"code": "622921",
+							"name": "临夏县"
+						},
+						{
+							"code": "622922",
+							"name": "康乐县"
+						},
+						{
+							"code": "622923",
+							"name": "永靖县"
+						},
+						{
+							"code": "622924",
+							"name": "广河县"
+						},
+						{
+							"code": "622925",
+							"name": "和政县"
+						},
+						{
+							"code": "622926",
+							"name": "东乡族自治县"
+						},
+						{
+							"code": "622927",
+							"name": "积石山保安族东乡族撒拉族自治县"
+						}
+					]
+				},
+				{
+					"code": "623000",
+					"name": "甘南藏族自治州",
+					"childs": [{
+							"code": "623001",
+							"name": "合作市"
+						},
+						{
+							"code": "623021",
+							"name": "临潭县"
+						},
+						{
+							"code": "623022",
+							"name": "卓尼县"
+						},
+						{
+							"code": "623023",
+							"name": "舟曲县"
+						},
+						{
+							"code": "623024",
+							"name": "迭部县"
+						},
+						{
+							"code": "623025",
+							"name": "玛曲县"
+						},
+						{
+							"code": "623026",
+							"name": "碌曲县"
+						},
+						{
+							"code": "623027",
+							"name": "夏河县"
+						}
+					]
+				}
+			]
+		},
+		{
+			"code": "630000",
+			"name": "青海省",
+			"childs": [{
+					"code": "630100",
+					"name": "西宁市",
+					"childs": [{
+							"code": "630102",
+							"name": "城东区"
+						},
+						{
+							"code": "630103",
+							"name": "城中区"
+						},
+						{
+							"code": "630104",
+							"name": "城西区"
+						},
+						{
+							"code": "630105",
+							"name": "城北区"
+						},
+						{
+							"code": "630121",
+							"name": "大通回族土族自治县"
+						},
+						{
+							"code": "630122",
+							"name": "湟中县"
+						},
+						{
+							"code": "630123",
+							"name": "湟源县"
+						}
+					]
+				},
+				{
+					"code": "630200",
+					"name": "海东市",
+					"childs": [{
+							"code": "630202",
+							"name": "乐都区"
+						},
+						{
+							"code": "630203",
+							"name": "平安区"
+						},
+						{
+							"code": "630222",
+							"name": "民和回族土族自治县"
+						},
+						{
+							"code": "630223",
+							"name": "互助土族自治县"
+						},
+						{
+							"code": "630224",
+							"name": "化隆回族自治县"
+						},
+						{
+							"code": "630225",
+							"name": "循化撒拉族自治县"
+						}
+					]
+				},
+				{
+					"code": "632200",
+					"name": "海北藏族自治州",
+					"childs": [{
+							"code": "632221",
+							"name": "门源回族自治县"
+						},
+						{
+							"code": "632222",
+							"name": "祁连县"
+						},
+						{
+							"code": "632223",
+							"name": "海晏县"
+						},
+						{
+							"code": "632224",
+							"name": "刚察县"
+						}
+					]
+				},
+				{
+					"code": "632300",
+					"name": "黄南藏族自治州",
+					"childs": [{
+							"code": "632321",
+							"name": "同仁县"
+						},
+						{
+							"code": "632322",
+							"name": "尖扎县"
+						},
+						{
+							"code": "632323",
+							"name": "泽库县"
+						},
+						{
+							"code": "632324",
+							"name": "河南蒙古族自治县"
+						}
+					]
+				},
+				{
+					"code": "632500",
+					"name": "海南藏族自治州",
+					"childs": [{
+							"code": "632521",
+							"name": "共和县"
+						},
+						{
+							"code": "632522",
+							"name": "同德县"
+						},
+						{
+							"code": "632523",
+							"name": "贵德县"
+						},
+						{
+							"code": "632524",
+							"name": "兴海县"
+						},
+						{
+							"code": "632525",
+							"name": "贵南县"
+						}
+					]
+				},
+				{
+					"code": "632600",
+					"name": "果洛藏族自治州",
+					"childs": [{
+							"code": "632621",
+							"name": "玛沁县"
+						},
+						{
+							"code": "632622",
+							"name": "班玛县"
+						},
+						{
+							"code": "632623",
+							"name": "甘德县"
+						},
+						{
+							"code": "632624",
+							"name": "达日县"
+						},
+						{
+							"code": "632625",
+							"name": "久治县"
+						},
+						{
+							"code": "632626",
+							"name": "玛多县"
+						}
+					]
+				},
+				{
+					"code": "632700",
+					"name": "玉树藏族自治州",
+					"childs": [{
+							"code": "632701",
+							"name": "玉树市"
+						},
+						{
+							"code": "632722",
+							"name": "杂多县"
+						},
+						{
+							"code": "632723",
+							"name": "称多县"
+						},
+						{
+							"code": "632724",
+							"name": "治多县"
+						},
+						{
+							"code": "632725",
+							"name": "囊谦县"
+						},
+						{
+							"code": "632726",
+							"name": "曲麻莱县"
+						}
+					]
+				},
+				{
+					"code": "632800",
+					"name": "海西蒙古族藏族自治州",
+					"childs": [{
+							"code": "632801",
+							"name": "格尔木市"
+						},
+						{
+							"code": "632802",
+							"name": "德令哈市"
+						},
+						{
+							"code": "632803",
+							"name": "茫崖市"
+						},
+						{
+							"code": "632821",
+							"name": "乌兰县"
+						},
+						{
+							"code": "632822",
+							"name": "都兰县"
+						},
+						{
+							"code": "632823",
+							"name": "天峻县"
+						}
+					]
+				}
+			]
+		},
+		{
+			"code": "640000",
+			"name": "宁夏回族自治区",
+			"childs": [{
+					"code": "640100",
+					"name": "银川市",
+					"childs": [{
+							"code": "640104",
+							"name": "兴庆区"
+						},
+						{
+							"code": "640105",
+							"name": "西夏区"
+						},
+						{
+							"code": "640106",
+							"name": "金凤区"
+						},
+						{
+							"code": "640121",
+							"name": "永宁县"
+						},
+						{
+							"code": "640122",
+							"name": "贺兰县"
+						},
+						{
+							"code": "640181",
+							"name": "灵武市"
+						}
+					]
+				},
+				{
+					"code": "640200",
+					"name": "石嘴山市",
+					"childs": [{
+							"code": "640202",
+							"name": "大武口区"
+						},
+						{
+							"code": "640205",
+							"name": "惠农区"
+						},
+						{
+							"code": "640221",
+							"name": "平罗县"
+						}
+					]
+				},
+				{
+					"code": "640300",
+					"name": "吴忠市",
+					"childs": [{
+							"code": "640302",
+							"name": "利通区"
+						},
+						{
+							"code": "640303",
+							"name": "红寺堡区"
+						},
+						{
+							"code": "640323",
+							"name": "盐池县"
+						},
+						{
+							"code": "640324",
+							"name": "同心县"
+						},
+						{
+							"code": "640381",
+							"name": "青铜峡市"
+						}
+					]
+				},
+				{
+					"code": "640400",
+					"name": "固原市",
+					"childs": [{
+							"code": "640402",
+							"name": "原州区"
+						},
+						{
+							"code": "640422",
+							"name": "西吉县"
+						},
+						{
+							"code": "640423",
+							"name": "隆德县"
+						},
+						{
+							"code": "640424",
+							"name": "泾源县"
+						},
+						{
+							"code": "640425",
+							"name": "彭阳县"
+						}
+					]
+				},
+				{
+					"code": "640500",
+					"name": "中卫市",
+					"childs": [{
+							"code": "640502",
+							"name": "沙坡头区"
+						},
+						{
+							"code": "640521",
+							"name": "中宁县"
+						},
+						{
+							"code": "640522",
+							"name": "海原县"
+						}
+					]
+				}
+			]
+		},
+		{
+			"code": "650000",
+			"name": "新疆维吾尔自治区",
+			"childs": [{
+					"code": "650100",
+					"name": "乌鲁木齐市",
+					"childs": [{
+							"code": "650102",
+							"name": "天山区"
+						},
+						{
+							"code": "650103",
+							"name": "沙依巴克区"
+						},
+						{
+							"code": "650104",
+							"name": "新市区"
+						},
+						{
+							"code": "650105",
+							"name": "水磨沟区"
+						},
+						{
+							"code": "650106",
+							"name": "头屯河区"
+						},
+						{
+							"code": "650107",
+							"name": "达坂城区"
+						},
+						{
+							"code": "650109",
+							"name": "米东区"
+						},
+						{
+							"code": "650121",
+							"name": "乌鲁木齐县"
+						}
+					]
+				},
+				{
+					"code": "650200",
+					"name": "克拉玛依市",
+					"childs": [{
+							"code": "650202",
+							"name": "独山子区"
+						},
+						{
+							"code": "650203",
+							"name": "克拉玛依区"
+						},
+						{
+							"code": "650204",
+							"name": "白碱滩区"
+						},
+						{
+							"code": "650205",
+							"name": "乌尔禾区"
+						}
+					]
+				},
+				{
+					"code": "650400",
+					"name": "吐鲁番市",
+					"childs": [{
+							"code": "650402",
+							"name": "高昌区"
+						},
+						{
+							"code": "650421",
+							"name": "鄯善县"
+						},
+						{
+							"code": "650422",
+							"name": "托克逊县"
+						}
+					]
+				},
+				{
+					"code": "650500",
+					"name": "哈密市",
+					"childs": [{
+							"code": "650502",
+							"name": "伊州区"
+						},
+						{
+							"code": "650521",
+							"name": "巴里坤哈萨克自治县"
+						},
+						{
+							"code": "650522",
+							"name": "伊吾县"
+						}
+					]
+				},
+				{
+					"code": "652300",
+					"name": "昌吉回族自治州",
+					"childs": [{
+							"code": "652301",
+							"name": "昌吉市"
+						},
+						{
+							"code": "652302",
+							"name": "阜康市"
+						},
+						{
+							"code": "652323",
+							"name": "呼图壁县"
+						},
+						{
+							"code": "652324",
+							"name": "玛纳斯县"
+						},
+						{
+							"code": "652325",
+							"name": "奇台县"
+						},
+						{
+							"code": "652327",
+							"name": "吉木萨尔县"
+						},
+						{
+							"code": "652328",
+							"name": "木垒哈萨克自治县"
+						}
+					]
+				},
+				{
+					"code": "652700",
+					"name": "博尔塔拉蒙古自治州",
+					"childs": [{
+							"code": "652701",
+							"name": "博乐市"
+						},
+						{
+							"code": "652702",
+							"name": "阿拉山口市"
+						},
+						{
+							"code": "652722",
+							"name": "精河县"
+						},
+						{
+							"code": "652723",
+							"name": "温泉县"
+						}
+					]
+				},
+				{
+					"code": "652800",
+					"name": "巴音郭楞蒙古自治州",
+					"childs": [{
+							"code": "652801",
+							"name": "库尔勒市"
+						},
+						{
+							"code": "652822",
+							"name": "轮台县"
+						},
+						{
+							"code": "652823",
+							"name": "尉犁县"
+						},
+						{
+							"code": "652824",
+							"name": "若羌县"
+						},
+						{
+							"code": "652825",
+							"name": "且末县"
+						},
+						{
+							"code": "652826",
+							"name": "焉耆回族自治县"
+						},
+						{
+							"code": "652827",
+							"name": "和静县"
+						},
+						{
+							"code": "652828",
+							"name": "和硕县"
+						},
+						{
+							"code": "652829",
+							"name": "博湖县"
+						}
+					]
+				},
+				{
+					"code": "652900",
+					"name": "阿克苏地区",
+					"childs": [{
+							"code": "652901",
+							"name": "阿克苏市"
+						},
+						{
+							"code": "652922",
+							"name": "温宿县"
+						},
+						{
+							"code": "652923",
+							"name": "库车县"
+						},
+						{
+							"code": "652924",
+							"name": "沙雅县"
+						},
+						{
+							"code": "652925",
+							"name": "新和县"
+						},
+						{
+							"code": "652926",
+							"name": "拜城县"
+						},
+						{
+							"code": "652927",
+							"name": "乌什县"
+						},
+						{
+							"code": "652928",
+							"name": "阿瓦提县"
+						},
+						{
+							"code": "652929",
+							"name": "柯坪县"
+						}
+					]
+				},
+				{
+					"code": "653000",
+					"name": "克孜勒苏柯尔克孜自治州",
+					"childs": [{
+							"code": "653001",
+							"name": "阿图什市"
+						},
+						{
+							"code": "653022",
+							"name": "阿克陶县"
+						},
+						{
+							"code": "653023",
+							"name": "阿合奇县"
+						},
+						{
+							"code": "653024",
+							"name": "乌恰县"
+						}
+					]
+				},
+				{
+					"code": "653100",
+					"name": "喀什地区",
+					"childs": [{
+							"code": "653101",
+							"name": "喀什市"
+						},
+						{
+							"code": "653121",
+							"name": "疏附县"
+						},
+						{
+							"code": "653122",
+							"name": "疏勒县"
+						},
+						{
+							"code": "653123",
+							"name": "英吉沙县"
+						},
+						{
+							"code": "653124",
+							"name": "泽普县"
+						},
+						{
+							"code": "653125",
+							"name": "莎车县"
+						},
+						{
+							"code": "653126",
+							"name": "叶城县"
+						},
+						{
+							"code": "653127",
+							"name": "麦盖提县"
+						},
+						{
+							"code": "653128",
+							"name": "岳普湖县"
+						},
+						{
+							"code": "653129",
+							"name": "伽师县"
+						},
+						{
+							"code": "653130",
+							"name": "巴楚县"
+						},
+						{
+							"code": "653131",
+							"name": "塔什库尔干塔吉克自治县"
+						}
+					]
+				},
+				{
+					"code": "653200",
+					"name": "和田地区",
+					"childs": [{
+							"code": "653201",
+							"name": "和田市"
+						},
+						{
+							"code": "653221",
+							"name": "和田县"
+						},
+						{
+							"code": "653222",
+							"name": "墨玉县"
+						},
+						{
+							"code": "653223",
+							"name": "皮山县"
+						},
+						{
+							"code": "653224",
+							"name": "洛浦县"
+						},
+						{
+							"code": "653225",
+							"name": "策勒县"
+						},
+						{
+							"code": "653226",
+							"name": "于田县"
+						},
+						{
+							"code": "653227",
+							"name": "民丰县"
+						}
+					]
+				},
+				{
+					"code": "654000",
+					"name": "伊犁哈萨克自治州",
+					"childs": [{
+							"code": "654002",
+							"name": "伊宁市"
+						},
+						{
+							"code": "654003",
+							"name": "奎屯市"
+						},
+						{
+							"code": "654004",
+							"name": "霍尔果斯市"
+						},
+						{
+							"code": "654021",
+							"name": "伊宁县"
+						},
+						{
+							"code": "654022",
+							"name": "察布查尔锡伯自治县"
+						},
+						{
+							"code": "654023",
+							"name": "霍城县"
+						},
+						{
+							"code": "654024",
+							"name": "巩留县"
+						},
+						{
+							"code": "654025",
+							"name": "新源县"
+						},
+						{
+							"code": "654026",
+							"name": "昭苏县"
+						},
+						{
+							"code": "654027",
+							"name": "特克斯县"
+						},
+						{
+							"code": "654028",
+							"name": "尼勒克县"
+						}
+					]
+				},
+				{
+					"code": "654200",
+					"name": "塔城地区",
+					"childs": [{
+							"code": "654201",
+							"name": "塔城市"
+						},
+						{
+							"code": "654202",
+							"name": "乌苏市"
+						},
+						{
+							"code": "654221",
+							"name": "额敏县"
+						},
+						{
+							"code": "654223",
+							"name": "沙湾县"
+						},
+						{
+							"code": "654224",
+							"name": "托里县"
+						},
+						{
+							"code": "654225",
+							"name": "裕民县"
+						},
+						{
+							"code": "654226",
+							"name": "和布克赛尔蒙古自治县"
+						}
+					]
+				},
+				{
+					"code": "654300",
+					"name": "阿勒泰地区",
+					"childs": [{
+							"code": "654301",
+							"name": "阿勒泰市"
+						},
+						{
+							"code": "654321",
+							"name": "布尔津县"
+						},
+						{
+							"code": "654322",
+							"name": "富蕴县"
+						},
+						{
+							"code": "654323",
+							"name": "福海县"
+						},
+						{
+							"code": "654324",
+							"name": "哈巴河县"
+						},
+						{
+							"code": "654325",
+							"name": "青河县"
+						},
+						{
+							"code": "654326",
+							"name": "吉木乃县"
+						}
+					]
+				}
+			]
+		},
+		{
+			"code": "710000",
+			"name": "台湾省",
+			"childs": [
+				{
+					"code":"710100",
+					"name":"台北市",
+					"childs": [
+						{"code":"710101","name":"中正区"},
+						{"code":"710102","name":"大同区"},
+						{"code":"710103","name":"中山区"},
+						{"code":"710104","name":"松山区"},
+						{"code":"710105","name":"大安区"},
+						{"code":"710106","name":"万华区"},
+						{"code":"710107","name":"信义区"},
+						{"code":"710108","name":"士林区"},
+						{"code":"710109","name":"北投区"},
+						{"code":"710110","name":"内湖区"},
+						{"code":"710111","name":"南港区"},
+						{"code":"710112","name":"文山区"},
+						{"code":"710113","name":"其它区"}
+					]
+				},
+				{
+					"code":"710200",
+					"name":"高雄市",
+					"childs": [
+						{"code":"710201","name":"新兴区"},
+						{"code":"710202","name":"前金区"},
+						{"code":"710203","name":"芩雅区"},
+						{"code":"710204","name":"盐埕区"},
+						{"code":"710205","name":"鼓山区"},
+						{"code":"710206","name":"旗津区"},
+						{"code":"710207","name":"前镇区"},
+						{"code":"710208","name":"三民区"},
+						{"code":"710209","name":"左营区"},
+						{"code":"710210","name":"楠梓区"},
+						{"code":"710211","name":"小港区"},
+						{"code":"710212","name":"其它区"},
+						{"code":"710241","name":"苓雅区"},
+						{"code":"710242","name":"仁武区"},
+						{"code":"710243","name":"大社区"},
+						{"code":"710244","name":"冈山区"},
+						{"code":"710245","name":"路竹区"},
+						{"code":"710246","name":"阿莲区"},
+						{"code":"710247","name":"田寮区"},
+						{"code":"710248","name":"燕巢区"},
+						{"code":"710249","name":"桥头区"},
+						{"code":"710250","name":"梓官区"},
+						{"code":"710251","name":"弥陀区"},
+						{"code":"710252","name":"永安区"},
+						{"code":"710253","name":"湖内区"},
+						{"code":"710254","name":"凤山区"},
+						{"code":"710255","name":"大寮区"},
+						{"code":"710256","name":"林园区"},
+						{"code":"710257","name":"鸟松区"},
+						{"code":"710258","name":"大树区"},
+						{"code":"710259","name":"旗山区"},
+						{"code":"710260","name":"美浓区"},
+						{"code":"710261","name":"六龟区"},
+						{"code":"710262","name":"内门区"},
+						{"code":"710263","name":"杉林区"},
+						{"code":"710264","name":"甲仙区"},
+						{"code":"710265","name":"桃源区"},
+						{"code":"710266","name":"那玛夏区"},
+						{"code":"710267","name":"茂林区"},
+						{"code":"710268","name":"茄萣区"}
+					]
+				},
+				{
+					"code":"710300",
+					"name":"台南市",
+					"childs": [
+						{"code":"710301","name":"中西区"},
+						{"code":"710302","name":"东区"},
+						{"code":"710303","name":"南区"},
+						{"code":"710304","name":"北区"},
+						{"code":"710305","name":"安平区"},
+						{"code":"710306","name":"安南区"},
+						{"code":"710307","name":"其它区"},
+						{"code":"710339","name":"永康区"},
+						{"code":"710340","name":"归仁区"},
+						{"code":"710341","name":"新化区"},
+						{"code":"710342","name":"左镇区"},
+						{"code":"710343","name":"玉井区"},
+						{"code":"710344","name":"楠西区"},
+						{"code":"710345","name":"南化区"},
+						{"code":"710346","name":"仁德区"},
+						{"code":"710347","name":"关庙区"},
+						{"code":"710348","name":"龙崎区"},
+						{"code":"710349","name":"官田区"},
+						{"code":"710350","name":"麻豆区"},
+						{"code":"710351","name":"佳里区"},
+						{"code":"710352","name":"西港区"},
+						{"code":"710353","name":"七股区"},
+						{"code":"710354","name":"将军区"},
+						{"code":"710355","name":"学甲区"},
+						{"code":"710356","name":"北门区"},
+						{"code":"710357","name":"新营区"},
+						{"code":"710358","name":"后壁区"},
+						{"code":"710359","name":"白河区"},
+						{"code":"710360","name":"东山区"},
+						{"code":"710361","name":"六甲区"},
+						{"code":"710362","name":"下营区"},
+						{"code":"710363","name":"柳营区"},
+						{"code":"710364","name":"盐水区"},
+						{"code":"710365","name":"善化区"},
+						{"code":"710366","name":"大内区"},
+						{"code":"710367","name":"山上区"},
+						{"code":"710368","name":"新市区"},
+						{"code":"710369","name":"安定区"}
+					]
+				},
+				{
+					"code":"710400",
+					"name":"台中市",
+					"childs": [
+						{"code":"710401","name":"中区"},
+						{"code":"710402","name":"东区"},
+						{"code":"710403","name":"南区"},
+						{"code":"710404","name":"西区"},
+						{"code":"710405","name":"北区"},
+						{"code":"710406","name":"北屯区"},
+						{"code":"710407","name":"西屯区"},
+						{"code":"710408","name":"南屯区"},
+						{"code":"710409","name":"其它区"},
+						{"code":"710431","name":"太平区"},
+						{"code":"710432","name":"大里区"},
+						{"code":"710433","name":"雾峰区"},
+						{"code":"710434","name":"乌日区"},
+						{"code":"710435","name":"丰原区"},
+						{"code":"710436","name":"后里区"},
+						{"code":"710437","name":"石冈区"},
+						{"code":"710438","name":"东势区"},
+						{"code":"710439","name":"和平区"},
+						{"code":"710440","name":"新社区"},
+						{"code":"710441","name":"潭子区"},
+						{"code":"710442","name":"大雅区"},
+						{"code":"710443","name":"神冈区"},
+						{"code":"710444","name":"大肚区"},
+						{"code":"710445","name":"沙鹿区"},
+						{"code":"710446","name":"龙井区"},
+						{"code":"710447","name":"梧栖区"},
+						{"code":"710448","name":"清水区"},
+						{"code":"710449","name":"大甲区"},
+						{"code":"710450","name":"外埔区"},
+						{"code":"710451","name":"大安区"}
+					]
+				},
+				{
+					"code":"710500",
+					"name":"金门县",
+					"childs": [
+						{"code":"710507","name":"金沙镇"},
+						{"code":"710508","name":"金湖镇"},
+						{"code":"710509","name":"金宁乡"},
+						{"code":"710510","name":"金城镇"},
+						{"code":"710511","name":"烈屿乡"},
+						{"code":"710512","name":"乌坵乡"}
+					]
+				},
+				{
+					"code":"710600",
+					"name":"南投县",
+					"childs": [
+						{"code":"710614","name":"南投市"},
+						{"code":"710615","name":"中寮乡"},
+						{"code":"710616","name":"草屯镇"},
+						{"code":"710617","name":"国姓乡"},
+						{"code":"710618","name":"埔里镇"},
+						{"code":"710619","name":"仁爱乡"},
+						{"code":"710620","name":"名间乡"},
+						{"code":"710621","name":"集集镇"},
+						{"code":"710622","name":"水里乡"},
+						{"code":"710623","name":"鱼池乡"},
+						{"code":"710624","name":"信义乡"},
+						{"code":"710625","name":"竹山镇"},
+						{"code":"710626","name":"鹿谷乡"}
+					]
+				},
+				{
+					"code":"710700",
+					"name":"基隆市",
+					"childs": [
+						{"code":"710701","name":"仁爱区"},
+						{"code":"710702","name":"信义区"},
+						{"code":"710703","name":"中正区"},
+						{"code":"710704","name":"中山区"},
+						{"code":"710705","name":"安乐区"},
+						{"code":"710706","name":"暖暖区"},
+						{"code":"710707","name":"七堵区"},
+						{"code":"710708","name":"其它区"}
+					]
+				},
+				{
+					"code":"710800",
+					"name":"新竹市",
+					"childs": [
+						{"code":"710801","name":"东区"},
+						{"code":"710802","name":"北区"},
+						{"code":"710803","name":"香山区"},
+						{"code":"710804","name":"其它区"}
+					]
+				},
+				{
+					"code":"710900",
+					"name":"嘉义市",
+					"childs": [
+						{"code":"710901","name":"东区"},
+						{"code":"710902","name":"西区"},
+						{"code":"710903","name":"其它区"}
+					]
+				},
+				{
+					"code":"711100",
+					"name":"新北市",
+					"childs": [
+						{"code":"711130","name":"万里区"},
+						{"code":"711131","name":"金山区"},
+						{"code":"711132","name":"板桥区"},
+						{"code":"711133","name":"汐止区"},
+						{"code":"711134","name":"深坑区"},
+						{"code":"711135","name":"石碇区"},
+						{"code":"711136","name":"瑞芳区"},
+						{"code":"711137","name":"平溪区"},
+						{"code":"711138","name":"双溪区"},
+						{"code":"711139","name":"贡寮区"},
+						{"code":"711140","name":"新店区"},
+						{"code":"711141","name":"坪林区"},
+						{"code":"711142","name":"乌来区"},
+						{"code":"711143","name":"永和区"},
+						{"code":"711144","name":"中和区"},
+						{"code":"711145","name":"土城区"},
+						{"code":"711146","name":"三峡区"},
+						{"code":"711147","name":"树林区"},
+						{"code":"711148","name":"莺歌区"},
+						{"code":"711149","name":"三重区"},
+						{"code":"711150","name":"新庄区"},
+						{"code":"711151","name":"泰山区"},
+						{"code":"711152","name":"林口区"},
+						{"code":"711153","name":"芦洲区"},
+						{"code":"711154","name":"五股区"},
+						{"code":"711155","name":"八里区"},
+						{"code":"711156","name":"淡水区"},
+						{"code":"711157","name":"三芝区"},
+						{"code":"711158","name":"石门区"}
+					]
+				},
+				{
+					"code":"711200",
+					"name":"宜兰县",
+					"childs": [
+						{"code":"711214","name":"宜兰市"},
+						{"code":"711215","name":"头城镇"},
+						{"code":"711216","name":"礁溪乡"},
+						{"code":"711217","name":"壮围乡"},
+						{"code":"711218","name":"员山乡"},
+						{"code":"711219","name":"罗东镇"},
+						{"code":"711220","name":"三星乡"},
+						{"code":"711221","name":"大同乡"},
+						{"code":"711222","name":"五结乡"},
+						{"code":"711223","name":"冬山乡"},
+						{"code":"711224","name":"苏澳镇"},
+						{"code":"711225","name":"南澳乡"},
+						{"code":"711226","name":"钓鱼台"}
+					]
+				},
+				{
+					"code":"711300",
+					"name":"新竹县",
+					"childs": [
+						{"code":"711314","name":"竹北市"},
+						{"code":"711315","name":"湖口乡"},
+						{"code":"711316","name":"新丰乡"},
+						{"code":"711317","name":"新埔镇"},
+						{"code":"711318","name":"关西镇"},
+						{"code":"711319","name":"芎林乡"},
+						{"code":"711320","name":"宝山乡"},
+						{"code":"711321","name":"竹东镇"},
+						{"code":"711322","name":"五峰乡"},
+						{"code":"711323","name":"横山乡"},
+						{"code":"711324","name":"尖石乡"},
+						{"code":"711325","name":"北埔乡"},
+						{"code":"711326","name":"峨眉乡"}
+					]
+				},
+				{
+					"code":"711400",
+					"name":"桃园县",
+					"childs": [
+						{"code":"711414","name":"中坜市"},
+						{"code":"711415","name":"平镇市"},
+						{"code":"711416","name":"龙潭乡"},
+						{"code":"711417","name":"杨梅市"},
+						{"code":"711418","name":"新屋乡"},
+						{"code":"711419","name":"观音乡"},
+						{"code":"711420","name":"桃园市"},
+						{"code":"711421","name":"龟山乡"},
+						{"code":"711422","name":"八德市"},
+						{"code":"711423","name":"大溪镇"},
+						{"code":"711424","name":"复兴乡"},
+						{"code":"711425","name":"大园乡"},
+						{"code":"711426","name":"芦竹乡"}
+					]
+				},
+				{
+					"code":"711500",
+					"name":"苗栗县",
+					"childs": [
+						{"code":"711519","name":"竹南镇"},
+						{"code":"711520","name":"头份镇"},
+						{"code":"711521","name":"三湾乡"},
+						{"code":"711522","name":"南庄乡"},
+						{"code":"711523","name":"狮潭乡"},
+						{"code":"711524","name":"后龙镇"},
+						{"code":"711525","name":"通霄镇"},
+						{"code":"711526","name":"苑里镇"},
+						{"code":"711527","name":"苗栗市"},
+						{"code":"711528","name":"造桥乡"},
+						{"code":"711529","name":"头屋乡"},
+						{"code":"711530","name":"公馆乡"},
+						{"code":"711531","name":"大湖乡"},
+						{"code":"711532","name":"泰安乡"},
+						{"code":"711533","name":"铜锣乡"},
+						{"code":"711534","name":"三义乡"},
+						{"code":"711535","name":"西湖乡"},
+						{"code":"711536","name":"卓兰镇"}
+					]
+				},
+				{
+					"code":"711700",
+					"name":"彰化县",
+					"childs": [
+						{"code":"711727","name":"彰化市"},
+						{"code":"711728","name":"芬园乡"},
+						{"code":"711729","name":"花坛乡"},
+						{"code":"711730","name":"秀水乡"},
+						{"code":"711731","name":"鹿港镇"},
+						{"code":"711732","name":"福兴乡"},
+						{"code":"711733","name":"线西乡"},
+						{"code":"711734","name":"和美镇"},
+						{"code":"711735","name":"伸港乡"},
+						{"code":"711736","name":"员林镇"},
+						{"code":"711737","name":"社头乡"},
+						{"code":"711738","name":"永靖乡"},
+						{"code":"711739","name":"埔心乡"},
+						{"code":"711740","name":"溪湖镇"},
+						{"code":"711741","name":"大村乡"},
+						{"code":"711742","name":"埔盐乡"},
+						{"code":"711743","name":"田中镇"},
+						{"code":"711744","name":"北斗镇"},
+						{"code":"711745","name":"田尾乡"},
+						{"code":"711746","name":"埤头乡"},
+						{"code":"711747","name":"溪州乡"},
+						{"code":"711748","name":"竹塘乡"},
+						{"code":"711749","name":"二林镇"},
+						{"code":"711750","name":"大城乡"},
+						{"code":"711751","name":"芳苑乡"},
+						{"code":"711752","name":"二水乡"}
+					]
+				},
+				{
+					"code":"711900",
+					"name":"嘉义县",
+					"childs": [
+						{"code":"711919","name":"番路乡"},
+						{"code":"711920","name":"梅山乡"},
+						{"code":"711921","name":"竹崎乡"},
+						{"code":"711922","name":"阿里山乡"},
+						{"code":"711923","name":"中埔乡"},
+						{"code":"711924","name":"大埔乡"},
+						{"code":"711925","name":"水上乡"},
+						{"code":"711926","name":"鹿草乡"},
+						{"code":"711927","name":"太保市"},
+						{"code":"711928","name":"朴子市"},
+						{"code":"711929","name":"东石乡"},
+						{"code":"711930","name":"六脚乡"},
+						{"code":"711931","name":"新港乡"},
+						{"code":"711932","name":"民雄乡"},
+						{"code":"711933","name":"大林镇"},
+						{"code":"711934","name":"溪口乡"},
+						{"code":"711935","name":"义竹乡"},
+						{"code":"711936","name":"布袋镇"}
+					]
+				},
+				{
+					"code":"712100",
+					"name":"云林县",
+					"childs": [
+						{"code":"712121","name":"斗南镇"},
+						{"code":"712122","name":"大埤乡"},
+						{"code":"712123","name":"虎尾镇"},
+						{"code":"712124","name":"土库镇"},
+						{"code":"712125","name":"褒忠乡"},
+						{"code":"712126","name":"东势乡"},
+						{"code":"712127","name":"台西乡"},
+						{"code":"712128","name":"仑背乡"},
+						{"code":"712129","name":"麦寮乡"},
+						{"code":"712130","name":"斗六市"},
+						{"code":"712131","name":"林内乡"},
+						{"code":"712132","name":"古坑乡"},
+						{"code":"712133","name":"莿桐乡"},
+						{"code":"712134","name":"西螺镇"},
+						{"code":"712135","name":"二仑乡"},
+						{"code":"712136","name":"北港镇"},
+						{"code":"712137","name":"水林乡"},
+						{"code":"712138","name":"口湖乡"},
+						{"code":"712139","name":"四湖乡"},
+						{"code":"712140","name":"元长乡"}
+					]
+				},
+				{
+					"code":"712400",
+					"name":"屏东县",
+					"childs": [
+						{"code":"712434","name":"屏东市"},
+						{"code":"712435","name":"三地门乡"},
+						{"code":"712436","name":"雾台乡"},
+						{"code":"712437","name":"玛家乡"},
+						{"code":"712438","name":"九如乡"},
+						{"code":"712439","name":"里港乡"},
+						{"code":"712440","name":"高树乡"},
+						{"code":"712441","name":"盐埔乡"},
+						{"code":"712442","name":"长治乡"},
+						{"code":"712443","name":"麟洛乡"},
+						{"code":"712444","name":"竹田乡"},
+						{"code":"712445","name":"内埔乡"},
+						{"code":"712446","name":"万丹乡"},
+						{"code":"712447","name":"潮州镇"},
+						{"code":"712448","name":"泰武乡"},
+						{"code":"712449","name":"来义乡"},
+						{"code":"712450","name":"万峦乡"},
+						{"code":"712451","name":"崁顶乡"},
+						{"code":"712452","name":"新埤乡"},
+						{"code":"712453","name":"南州乡"},
+						{"code":"712454","name":"林边乡"},
+						{"code":"712455","name":"东港镇"},
+						{"code":"712456","name":"琉球乡"},
+						{"code":"712457","name":"佳冬乡"},
+						{"code":"712458","name":"新园乡"},
+						{"code":"712459","name":"枋寮乡"},
+						{"code":"712460","name":"枋山乡"},
+						{"code":"712461","name":"春日乡"},
+						{"code":"712462","name":"狮子乡"},
+						{"code":"712463","name":"车城乡"},
+						{"code":"712464","name":"牡丹乡"},
+						{"code":"712465","name":"恒春镇"},
+						{"code":"712466","name":"满州乡"}
+					]
+				},
+				{
+					"code":"712500",
+					"name":"台东县",
+					"childs": [
+						{"code":"712517","name":"台东市"},
+						{"code":"712518","name":"绿岛乡"},
+						{"code":"712519","name":"兰屿乡"},
+						{"code":"712520","name":"延平乡"},
+						{"code":"712521","name":"卑南乡"},
+						{"code":"712522","name":"鹿野乡"},
+						{"code":"712523","name":"关山镇"},
+						{"code":"712524","name":"海端乡"},
+						{"code":"712525","name":"池上乡"},
+						{"code":"712526","name":"东河乡"},
+						{"code":"712527","name":"成功镇"},
+						{"code":"712528","name":"长滨乡"},
+						{"code":"712529","name":"金峰乡"},
+						{"code":"712530","name":"大武乡"},
+						{"code":"712531","name":"达仁乡"},
+						{"code":"712532","name":"太麻里乡"}
+					]
+				},
+				{
+					"code":"712600",
+					"name":"花莲县",
+					"childs": [
+						{"code":"712615","name":"花莲市"},
+						{"code":"712616","name":"新城乡"},
+						{"code":"712617","name":"太鲁阁"},
+						{"code":"712618","name":"秀林乡"},
+						{"code":"712619","name":"吉安乡"},
+						{"code":"712620","name":"寿丰乡"},
+						{"code":"712621","name":"凤林镇"},
+						{"code":"712622","name":"光复乡"},
+						{"code":"712623","name":"丰滨乡"},
+						{"code":"712624","name":"瑞穗乡"},
+						{"code":"712625","name":"万荣乡"},
+						{"code":"712626","name":"玉里镇"},
+						{"code":"712627","name":"卓溪乡"},
+						{"code":"712628","name":"富里乡"}
+					]
+				},
+				{
+					"code":"712700",
+					"name":"澎湖县",
+					"childs": [
+						{"code":"712707","name":"马公市"},
+						{"code":"712708","name":"西屿乡"},
+						{"code":"712709","name":"望安乡"},
+						{"code":"712710","name":"七美乡"},
+						{"code":"712711","name":"白沙乡"},
+						{"code":"712712","name":"湖西乡"}
+					]
+				},
+				{
+					"code":"712800",
+					"name":"连江县",
+					"childs": [
+						{"code":"712805","name":"南竿乡"},
+						{"code":"712806","name":"北竿乡"},
+						{"code":"712807","name":"莒光乡"},
+						{"code":"712808","name":"东引乡"}
+					]
+				}
+			]
+		},
+		{
+			"code": "810000",
+			"name": "香港特别行政区",
+			"childs": [
+				{
+					"code": "810000",
+					"name": "香港特别行政区",
+					"childs": [
+						{"code":"810001","name":"中西區"},
+						{"code":"810002","name":"灣仔區"},
+						{"code":"810003","name":"東區"},
+						{"code":"810004","name":"南區"},
+						{"code":"810005","name":"油尖旺區"},
+						{"code":"810006","name":"深水埗區"},
+						{"code":"810007","name":"九龍城區"},
+						{"code":"810008","name":"黃大仙區"},
+						{"code":"810009","name":"觀塘區"},
+						{"code":"810010","name":"荃灣區"},
+						{"code":"810011","name":"屯門區"},
+						{"code":"810012","name":"元朗區"},
+						{"code":"810013","name":"北區"},
+						{"code":"810014","name":"大埔區"},
+						{"code":"810015","name":"西貢區"},
+						{"code":"810016","name":"沙田區"},
+						{"code":"810017","name":"葵青區"},
+						{"code":"810018","name":"離島區"}
+					]
+				}
+			]
+		},
+		{
+			"code": "820000",
+			"name": "澳门特别行政区",
+			"childs": [
+				{
+					"code": "820000",
+					"name": "澳门特别行政区",
+					"childs": [
+						{"code":"820001","name":"花地瑪堂區"},
+						{"code":"820002","name":"花王堂區"},
+						{"code":"820003","name":"望德堂區"},
+						{"code":"820004","name":"大堂區"},
+						{"code":"820005","name":"風順堂區"},
+						{"code":"820006","name":"嘉模堂區"},
+						{"code":"820007","name":"路氹填海區"},
+						{"code":"820008","name":"聖方濟各堂區"}
+					]
+				}
+			]
+		}
+	]
+}
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/templates/jft/th_jft_pay.html b/pluss-wap-page/src/main/resources/templates/jft/th_jft_pay.html
new file mode 100644
index 0000000..9a23e79
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/templates/jft/th_jft_pay.html
@@ -0,0 +1,460 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
+    <meta content="yes" name="apple-mobile-web-app-capable">
+    <meta content="black" name="apple-mobile-web-app-status-bar-style">
+    <meta content="telephone=no" name="format-detection">
+    <meta content="email=no" name="format-detection">
+    <link rel="stylesheet" type="text/css" th:href="@{'/resources/css/weui.css'}"/>
+    <link rel="stylesheet" type="text/css" th:href="@{'/resources/css/weuix.css'}"/>
+    <script src="https://www.shouyinbei.net/resources/js/alipayjsapi.min3.1.1.js"></script>
+    <script th:src="@{'/resources/js/jquery.min.js'}"></script>
+    <script th:src="@{'/resources/js/zepto.weui.js'}"></script>
+    <title>缴费通</title>
+    <style>
+        * {
+            padding: 0;
+            margin: 0;
+        }
+        html,body{
+            width:100%;
+            height:100%;
+            margin:0 auto;
+            padding:0px;
+            background-color:#F5F6F8;
+            color: #000000;
+        }
+        .shade{
+            display: none;
+            position: absolute;
+            top: 0;
+            left: 0;
+            width: 100%;
+            height: 100%;
+            background-color: rgba(0,0,0,.1);
+            z-index: 998;
+            overflow: auto;
+        }
+        .loading{
+            z-index: 10000;
+            position: absolute;
+            width: 100%;
+            display: none;
+            margin: 40px 0;
+        }
+        .loading-body{
+            width: 30%;
+            text-align: center;
+            margin: 0 auto;
+            padding: .4rem 0;
+            background-color: #fff;
+            border-radius: 4px;
+        }
+        .loading-icon{
+            background-image: url(data:image/gif;base64,R0lGODlhIAAgALMAAP///7Ozs/v7+9bW1uHh4fLy8rq6uoGBgTQ0NAEBARsbG8TExJeXl/39/VRUVAAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQFBQAAACwAAAAAIAAgAAAE5xDISSlLrOrNp0pKNRCdFhxVolJLEJQUoSgOpSYT4RowNSsvyW1icA16k8MMMRkCBjskBTFDAZyuAEkqCfxIQ2hgQRFvAQEEIjNxVDW6XNE4YagRjuBCwe60smQUDnd4Rz1ZAQZnFAGDd0hihh12CEE9kjAEVlycXIg7BAsMB6SlnJ87paqbSKiKoqusnbMdmDC2tXQlkUhziYtyWTxIfy6BE8WJt5YEvpJivxNaGmLHT0VnOgGYf0dZXS7APdpB309RnHOG5gDqXGLDaC457D1zZ/V/nmOM82XiHQjYKhKP1oZmADdEAAAh+QQFBQAAACwAAAAAGAAXAAAEchDISasKNeuJFKoHs4mUYlJIkmjIV54Soypsa0wmLSnqoTEtBw52mG0AjhYpBxioEqRNy8V0qFzNw+GGwlJki4lBqx1IBgjMkRIghwjrzcDti2/Gh7D9qN774wQGAYOEfwCChIV/gYmDho+QkZKTR3p7EQAh+QQFBQAAACwBAAAAHQAOAAAEchDISWdANesNHHJZwE2DUSEo5SjKKB2HOKGYFLD1CB/DnEoIlkti2PlyuKGEATMBaAACSyGbEDYD4zN1YIEmh0SCQQgYehNmTNNaKsQJXmBuuEYPi9ECAU/UFnNzeUp9VBQEBoFOLmFxWHNoQw6RWEocEQAh+QQFBQAAACwHAAAAGQARAAAEaRDICdZZNOvNDsvfBhBDdpwZgohBgE3nQaki0AYEjEqOGmqDlkEnAzBUjhrA0CoBYhLVSkm4SaAAWkahCFAWTU0A4RxzFWJnzXFWJJWb9pTihRu5dvghl+/7NQmBggo/fYKHCX8AiAmEEQAh+QQFBQAAACwOAAAAEgAYAAAEZXCwAaq9ODAMDOUAI17McYDhWA3mCYpb1RooXBktmsbt944BU6zCQCBQiwPB4jAihiCK86irTB20qvWp7Xq/FYV4TNWNz4oqWoEIgL0HX/eQSLi69boCikTkE2VVDAp5d1p0CW4RACH5BAUFAAAALA4AAAASAB4AAASAkBgCqr3YBIMXvkEIMsxXhcFFpiZqBaTXisBClibgAnd+ijYGq2I4HAamwXBgNHJ8BEbzgPNNjz7LwpnFDLvgLGJMdnw/5DRCrHaE3xbKm6FQwOt1xDnpwCvcJgcJMgEIeCYOCQlrF4YmBIoJVV2CCXZvCooHbwGRcAiKcmFUJhEAIfkEBQUAAAAsDwABABEAHwAABHsQyAkGoRivELInnOFlBjeM1BCiFBdcbMUtKQdTN0CUJru5NJQrYMh5VIFTTKJcOj2HqJQRhEqvqGuU+uw6AwgEwxkOO55lxIihoDjKY8pBoThPxmpAYi+hKzoeewkTdHkZghMIdCOIhIuHfBMOjxiNLR4KCW1ODAlxSxEAIfkEBQUAAAAsCAAOABgAEgAABGwQyEkrCDgbYvvMoOF5ILaNaIoGKroch9hacD3MFMHUBzMHiBtgwJMBFolDB4GoGGBCACKRcAAUWAmzOWJQExysQsJgWj0KqvKalTiYPhp1LBFTtp10Is6mT5gdVFx1bRN8FTsVCAqDOB9+KhEAIfkEBQUAAAAsAgASAB0ADgAABHgQyEmrBePS4bQdQZBdR5IcHmWEgUFQgWKaKbWwwSIhc4LonsXhBSCsQoOSScGQDJiWwOHQnAxWBIYJNXEoFCiEWDI9jCzESey7GwMM5doEwW4jJoypQQ743u1WcTV0CgFzbhJ5XClfHYd/EwZnHoYVDgiOfHKQNREAIfkEBQUAAAAsAAAPABkAEQAABGeQqUQruDjrW3vaYCZ5X2ie6EkcKaooTAsi7ytnTq046BBsNcTvItz4AotMwKZBIC6H6CVAJaCcT0CUBTgaTg5nTCu9GKiDEMPJg5YBBOpwlnVzLwtqyKnZagZWahoMB2M3GgsHSRsRACH5BAUFAAAALAEACAARABgAAARcMKR0gL34npkUyyCAcAmyhBijkGi2UW02VHFt33iu7yiDIDaD4/erEYGDlu/nuBAOJ9Dvc2EcDgFAYIuaXS3bbOh6MIC5IAP5Eh5fk2exC4tpgwZyiyFgvhEMBBEAIfkEBQUAAAAsAAACAA4AHQAABHMQyAnYoViSlFDGXBJ808Ep5KRwV8qEg+pRCOeoioKMwJK0Ekcu54h9AoghKgXIMZgAApQZcCCu2Ax2O6NUud2pmJcyHA4L0uDM/ljYDCnGfGakJQE5YH0wUBYBAUYfBIFkHwaBgxkDgX5lgXpHAXcpBIsRADs=);background-size:100% 100%;
+            height: 30px;
+            width: 30px;
+            margin: 10px auto;
+        }
+        .header{
+            font-size: 0.8rem;
+            font-weight: 400;
+            text-align: center;
+            height: 1.8rem;
+            vertical-align:middle;
+            line-height:1.8rem;  /*line-height must be equal to height*/
+            color: #fff;
+            background: -webkit-linear-gradient(left, #47A8FC , #4C8BF8); /* Safari 5.1 - 6.0 */
+            background: -o-linear-gradient(right, #47A8FC, #4C8BF8); /* Opera 11.1 - 12.0 */
+            background: -moz-linear-gradient(right, #47A8FC, #4C8BF8); /* Firefox 3.6 - 15 */
+            background: linear-gradient(to right, #47A8FC , #4C8BF8); /* 标准的语法 */
+        }
+        .tr-amt{
+            background: #fff;
+            text-align: center;
+            line-height: 1.6rem;
+            padding: 1.5rem 0 .5rem 0;
+        }
+        .text{
+            font-size: 0.7rem;
+            font-weight: bold;
+        }
+        .amt-info{
+            display: flex;
+            justify-content: center;
+            align-items: end;
+        }
+        .rmb-icon{
+            height: 20px;
+            padding: 10px 0 5px 0;
+        }
+        .amt{
+            font-size: 1.2rem;
+            font-weight: bold;
+        }
+        .tr-item{
+            background: #fff;
+            margin-top: 10px;
+            font-size: 0.7rem;
+        }
+        .item-info{
+            display: flex;
+            justify-content: space-between;
+            padding: 10px 20px;
+        }
+        .item-label{
+            color: #a5a2a2;
+        }
+        .red{
+            color: red;
+        }
+        .br{
+            border-top: 1px solid #ededed;
+            margin: 0 20px;
+        }
+        .jft-input{
+            border: 0;
+            text-align: right;
+            outline:medium;
+            font-size:16px
+        }
+        .item-warming{
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            font-size: .575rem;
+            margin-top: 20px;
+            color: red;
+        }
+        .footer{
+            width: 100%;
+            position: fixed;
+            bottom: 30px;
+            text-align: center;
+        }
+        .cancel-btn{
+            padding: 10px 30px;
+            border: 1px solid #d9d9d9;
+            border-radius: 20px;
+            background: #fff;
+            margin-right: 30px;
+            font-size: .6rem;
+        }
+        .l-success-btn{
+            padding: 10px 30px;
+            border: 1px solid #d9d9d9;
+            border-radius: 20px;
+            background-color: rgba(64, 142, 249, 1);
+            color: #fff;
+            font-size: .6rem;
+        }
+        .j-success-btn{
+            padding: 8px 30px;
+            border: 1px solid #d9d9d9;
+            border-radius: 20px;
+            background-color: rgba(64, 142, 249, 1);
+            color: #fff;
+            font-size: .6rem;
+        }
+        .dialog{
+            z-index: 999;
+            height: 13rem;
+            width: 100%;
+            position: absolute;
+            top: 25%;
+            display: none;
+            font-size: 0.70rem;
+        }
+        .dialog-content{
+            background: #fff;
+            height: 14rem;
+            border-radius: 5px;
+            margin: 0 auto;
+            width: 70%;
+        }
+        .dialog-body{
+            padding: 10px 20px 0px 20px;
+        }
+        .dialog-item{
+            margin: 10px 0 20px 0;
+        }
+        .dialog-input{
+            border: 0;
+            border-bottom: 1px solid #efefef;
+            outline: medium;
+            width: 100%;
+            font-size: 16px;
+        }
+        .dialog-item-input{
+            margin-top: 10px;
+        }
+        .dialog-br:hover{
+            width: 100%;
+        }
+        .dialog-br{
+            display: block;
+            border-top: 2px solid #03A6FF;
+            width: 0%;
+        }
+        input:focus + .dialog-br {
+            width: 100%;
+            transition: all 0.4s
+        }
+        .dialog-btns{
+            position: absolute;
+            bottom: -10px;
+            justify-content: center;
+            margin-left: 3%;
+        }
+        .dialog-warming{
+            font-size: .675rem;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            color: red;
+        }
+        .dialog-cancel-btn{
+            padding: 8px 30px;
+            border: 1px solid #d9d9d9;
+            border-radius: 20px;
+            background: #fff;
+            font-size: .6rem;
+        }
+        button{
+            outline:medium;
+        }
+        input::-webkit-input-placeholder, textarea::-webkit-input-placeholder {
+            font-size:16px;
+        }
+        input:-moz-placeholder, textarea:-moz-placeholder {
+            font-size:16px;
+        }
+        input::-moz-placeholder, textarea::-moz-placeholder {
+            font-size:16px;
+        }
+        input:-ms-input-placeholder, textarea:-ms-input-placeholder {
+            font-size:16px;
+        }
+    </style>
+</head>
+<body>
+<div class="body">
+    <div class="header">
+        缴费通支付
+    </div>
+    <div class="tr-amt">
+        <img th:src="@{'/resources/images/jft-wallet-icon.png'}">
+        <div class="text">付款单</div>
+        <div class="amt-info">
+            <img class="rmb-icon" th:src="@{'/resources/images/jft-rmb-icon.png'}">
+            <div class="amt" th:text="${amount}"></div>
+        </div>
+    </div>
+    <div class="tr-item">
+        <div class="item-info">
+            <div class="item-label">收款商家</div>
+            <div class="item-text" th:text="${merchantName}"></div>
+        </div>
+        <div class="item-info">
+            <div class="item-label">项目名称</div>
+            <div class="item-text" th:text="${pName}"></div>
+        </div>
+    </div>
+    <div class="tr-item">
+        <div class="item-each" th:each="payment,index:${paymentList}">
+            <div class="item-input item-info">
+                <div class="item-label"><span th:text="${payment.name}"></span> <span class="red">*</span></div>
+                <div class="item-input">
+                    <input th:type="${payment.code == 'phone' ? 'number' : 'text'}" class="jft-input" th:name="${payment.code}" th:msg="${payment.name}" th:id="${payment.code}" th:placeholder="${'请输入'+payment.name}">
+                </div>
+            </div>
+            <div class="br" th:if="${index.count != index.size}"></div>
+        </div>
+    </div>
+    <div class="item-warming">
+        <img class="tips-icon" th:src="@{'/resources/images/jft-tips-icon.png'}">
+        <div class="warming-text">请谨慎核对收款单信息，风险自行承担</div>
+    </div>
+    <div class="footer">
+        <div class="footer-btns">
+            <button class="l-success-btn" style="padding: 10px 100px" id="subPay" onclick="subPay()">立即支付</button>
+        </div>
+    </div>
+</div>
+
+<div class="dialog" id="dialog">
+    <div class="dialog-header"></div>
+    <div class="dialog-content">
+        <div class="header">收款方信息</div>
+        <div class="dialog-body">
+            <div class="dialog-item">
+                <div class="dialog-item-name">姓名</div>
+                <div class="dialog-item-input">
+                    <input type="text" class="dialog-input" name="name" id="cName" autofocus th:placeholder="${cpName}">
+                    <span class="dialog-br"></span>
+                </div>
+            </div>
+            <div class="dialog-item">
+                <div class="dialog-item-name">手机号</div>
+                <div class="dialog-item-input">
+                    <input type="number" class="dialog-input" name="phone" id="cPhone" autofocus th:placeholder="${cpPhone}">
+                    <span class="dialog-br"></span>
+                </div>
+            </div>
+        </div>
+        <div class="dialog-warming">
+            <img class="tips-icon" th:src="@{'/resources/images/jft-tips-icon.png'}">
+            <div class="warming-text">如遇诈骗，请立即报警</div>
+        </div>
+        <div class="dialog-btns">
+            <button class="dialog-cancel-btn" onclick="hideDialog()">取消支付</button>
+            <button class="j-success-btn" onclick="submitPay()">继续支付</button>
+        </div>
+    </div>
+</div>
+<div id='shade' class="shade"></div>
+<div class="loading" id="loading">
+    <div class="loading-body">
+        <div class="loading-icon">
+        </div>
+        <div class="loading-msg">
+            支付中...
+        </div>
+    </div>
+</div>
+<input type="hidden" id="tk" th:value="${tk}">
+<input type="hidden" id="userId" th:value="${userId}">
+</body>
+<script type="text/javascript">
+    (function (doc, win) {
+        var docEl = doc.documentElement,
+            resizeEvt = 'orientationchange' in window ? 'orientationchange' : 'resize',
+            recalc = function () {
+                var clientWidth = docEl.clientWidth;
+                if (!clientWidth) return;
+                docEl.style.fontSize = 20 * (clientWidth / 320) + 'px';//其中“20”根据你设置的html的font-size属性值做适当的变化
+            };
+
+        if (!doc.addEventListener) return;
+        win.addEventListener(resizeEvt, recalc, false);
+        doc.addEventListener('DOMContentLoaded', recalc, false);
+    })(document, window);
+</script>
+<script type="text/javascript">
+    var winHeight = $(window).height();  //获取当前页面高度
+    let city = "";
+    let province = "";
+    $(window).resize(function () {
+        var thisHeight = $(this).height();
+        if (winHeight - thisHeight > 140) {
+            //键盘弹出
+            $('.footer').css('position', 'static');
+        } else {
+            //键盘收起
+            $('.footer').css({'position': 'fixed', 'bottom': '30'});
+        }
+    })
+    function getLocation(){
+        AlipayJSBridge.call('getCurrentLocation', { bizType: '$s',requestType:1}, function(result) {
+            if (result.error) {
+                AlipayJSBridge.call('alert', {
+                    title: '提示',
+                    message: "请允许位置信息授权后支付",
+                    button: '确定'
+                }, function(e) {
+                });
+                return;
+            }else{
+                city = result.city;
+                province = result.province;
+                subTowPay();
+            }
+        });
+    }
+    function subPay(){
+        if(!city){
+            getLocation()
+        }else{
+            subTowPay();
+        }
+    }
+    function subTowPay(){
+        let flag = false;
+        let msg = "";
+        $(".item-each").find("input").each(function (k,v){
+            if(!$(v).val()){
+                flag = true;
+                msg = $(v).attr("msg");
+            }
+        })
+        if(flag){
+            return $.toast(msg+"不能为空","text");
+        }
+        showDialog();
+    }
+
+    function showDialog(){
+        $("#shade").show();
+        $("#dialog").show();
+    }
+    function hideDialog(){
+        $("#shade").hide();
+        $("#dialog").hide();
+    }
+    function submitPay(){
+        $vaData = {};
+        $(".item-each").find("input").each(function (k,v){
+            $vaData[$(v).attr("name")] = $(v).val();
+        })
+        let cName = $("#cName").val();
+        let cPhone = $("#cPhone").val();
+        if(!cName){
+            return $.toast("收款方姓名不能为空！","text");
+        }
+        $vaData["cName"] = cName;
+        if(!cPhone){
+            return $.toast("收款方手机号不能为空！","text");
+        }
+        $vaData["cPhone"] = cPhone;
+        $vaData["tk"] = $("#tk").val();
+        $vaData["payUserId"] = $("#userId").val();
+        $vaData["city"] = city;
+        $vaData["province"] = province;
+        hideDialog();
+        $.showLoading("支付中...");
+        let url = "/wap/jft/tradePay";
+        $.ajax({
+            url:url,
+            data:$vaData,
+            type:"post",
+            success:function (res){
+                $.hideLoading();
+                if(res.code == 400){
+                    return $.toast(res.message,"text");
+                }
+                let rdata = res.data;
+                var reg=/^([hH][tT]{2}[pP]:\/\/|[hH][tT]{2}[pP][sS]:\/\/)(([A-Za-z0-9-~]+).)+([A-Za-z0-9-~\/])+$/;
+                if(reg.test(rdata.source)){
+                    window.location = rdata.source;
+                }else{
+                    ap.tradePay({
+                        tradeNO : rdata.source
+                    }, function(res) {
+                        if (res.resultCode == '9000') {
+                            window.location = '/wap/jft/jump?orderNumber='+rdata.orderNumber; //订单支付成功
+                        } else if (res.resultCode == '8000') {
+                        } else if (res.resultCode == '4000') {
+                            ap.alert("订单支付失败");
+                        } else if (res.resultCode == '6001' || res.resultCode == '99') {
+                        } else if (res.resultCode == '6002') {
+                            ap.alert("网络连接出错");
+                        }
+                    });
+                }
+            }
+        })
+    }
+</script>
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/templates/jft/th_jft_success.html b/pluss-wap-page/src/main/resources/templates/jft/th_jft_success.html
new file mode 100644
index 0000000..649db88
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/templates/jft/th_jft_success.html
@@ -0,0 +1,169 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
+    <meta content="yes" name="apple-mobile-web-app-capable">
+    <meta content="black" name="apple-mobile-web-app-status-bar-style">
+    <meta content="telephone=no" name="format-detection">
+    <meta content="email=no" name="format-detection">
+    <link rel="stylesheet" type="text/css" th:href="@{'/resources/css/weui.css'}"/>
+    <link rel="stylesheet" type="text/css" th:href="@{'/resources/css/weuix.css'}"/>
+    <script src="https://www.shouyinbei.net/resources/js/alipayjsapi.min3.1.1.js"></script>
+    <script th:src="@{'/resources/js/jquery.min.js'}"></script>
+    <script th:src="@{'/resources/js/zepto.weui.js'}"></script>
+    <title>缴费通</title>
+    <style>
+        * {
+            padding: 0;
+            margin: 0;
+        }
+        html,body{
+            width:100%;
+            height:100%;
+            margin:0 auto;
+            padding:0px;
+            background-color:#F5F6F8;
+            color: #000000;
+        }
+        .header{
+            font-size: 0.8rem;
+            font-weight: 400;
+            text-align: center;
+            height: 1.8rem;
+            vertical-align:middle;
+            line-height:1.8rem;  /*line-height must be equal to height*/
+            color: #fff;
+            background: -webkit-linear-gradient(left, #47A8FC , #4C8BF8); /* Safari 5.1 - 6.0 */
+            background: -o-linear-gradient(right, #47A8FC, #4C8BF8); /* Opera 11.1 - 12.0 */
+            background: -moz-linear-gradient(right, #47A8FC, #4C8BF8); /* Firefox 3.6 - 15 */
+            background: linear-gradient(to right, #47A8FC , #4C8BF8); /* 标准的语法 */
+        }
+        .tr-amt{
+            background: #fff;
+            text-align: center;
+            line-height: 1.6rem;
+            padding: 1.5rem 0 .5rem 0;
+        }
+        .text{
+            font-size: 0.8rem;
+            font-weight: bold;
+        }
+        .amt-info{
+            display: flex;
+            justify-content: center;
+            align-items: end;
+        }
+        .rmb-icon{
+            height: 20px;
+            padding: 10px 0 0 0;
+        }
+        .amt{
+            font-size: 1.2rem;
+            font-weight: bold;
+        }
+        .pay-success{
+            width: 3.555rem;
+        }
+        .tr-item{
+            background: #fff;
+            margin-top: 10px;
+            font-size: 0.7rem;
+        }
+        .item-info{
+            display: flex;
+            justify-content: space-between;
+            padding: 10px 20px;
+        }
+        .item-label{
+            color: #a5a2a2;
+        }
+        .br{
+            border-top: 1px solid #ededed;
+            margin: 0 20px;
+        }
+        .item-copy{
+            margin-left: -50px;
+            padding: 2px 5px;
+            background: #47A8FC;
+            color: #fff;
+            border-radius: 3px;
+            font-size: 13px;
+        }
+    </style>
+</head>
+<body>
+<div class="body">
+    <div class="header">
+        缴费通支付
+    </div>
+    <div class="tr-amt">
+        <img class="pay-success" th:src="@{'/resources/images/jft-success-icon.png'}">
+        <div class="text">支付成功</div>
+        <div class="amt-info">
+            <img class="rmb-icon" th:src="@{'/resources/images/jft-rmb-icon.png'}">
+            <div class="amt" th:text="${amount}"></div>
+        </div>
+    </div>
+    <div class="tr-item">
+        <div class="item-info">
+            <div class="item-label">收款商家</div>
+            <div class="item-text" th:text="${merchantName}"></div>
+        </div>
+        <div class="item-info">
+            <div class="item-label">项目名称</div>
+            <div class="item-text" th:text="${pName}"></div>
+        </div>
+    </div>
+
+    <div class="tr-item">
+        <div class="item-input item-info">
+            <div class="item-label">交易类型</div>
+            <div class="item-text" th:text="${payTypeDesc}"></div>
+        </div>
+        <div class="br"></div>
+        <div class="item-input item-info">
+            <div class="item-label">订单号</div>
+            <div class="item-text" th:text="${orderNumber}"></div>
+<!--            <span class="item-copy" th:data-order="${orderNumber}" onclick="copyNumber(this)">复制</span>-->
+            <span class="item-copy" data-order="123123123" onclick="copyNumber(this)">复制</span>
+        </div>
+        <div class="br"></div>
+        <div class="item-input item-info">
+            <div class="item-label">时间</div>
+            <div class="item-text" th:text="${date}"></div>
+        </div>
+    </div>
+</div>
+<input type="hidden" id="tk" th:value="${tk}">
+</body>
+<script type="text/javascript">
+    (function (doc, win) {
+        var docEl = doc.documentElement,
+            resizeEvt = 'orientationchange' in window ? 'orientationchange' : 'resize',
+            recalc = function () {
+                var clientWidth = docEl.clientWidth;
+                if (!clientWidth) return;
+                docEl.style.fontSize = 20 * (clientWidth / 320) + 'px';//其中“20”根据你设置的html的font-size属性值做适当的变化
+            };
+
+        if (!doc.addEventListener) return;
+        win.addEventListener(resizeEvt, recalc, false);
+        doc.addEventListener('DOMContentLoaded', recalc, false);
+    })(document, window);
+</script>
+<script>
+    function copyNumber(obj){
+        let value = $(obj).attr("data-order");
+        let input = document.querySelector('.copy-input') || document.createElement('input');
+        input.setAttribute("readonly","readonly");
+        input.className = "copy-input";
+        input.value = value;
+        input.style = `position: fixed;top: -100%;`
+        document.body.append(input)
+        input.select();
+        document.execCommand("copy");
+        $.toast("内容已复制","text");
+    }
+</script>
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/templates/pay.html b/pluss-wap-page/src/main/resources/templates/pay.html
new file mode 100644
index 0000000..a728470
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/templates/pay.html
@@ -0,0 +1,455 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <meta charset="utf-8">
+    <meta content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=no" name="viewport">
+    <meta content="yes" name="apple-mobile-web-app-capable">
+    <meta content="black" name="apple-mobile-web-app-status-bar-style">
+    <meta content="telephone=no" name="format-detection">
+    <meta content="email=no" name="format-detection">
+    <script src="https://www.shouyinbei.net/resources/js/alipayjsapi.min3.1.1.js"></script>
+    <title>向商户付款</title>
+    <style>
+        html,body{
+            width:100%;
+            height:100%;
+            margin:0 auto;
+            padding:0px;
+            background-color:#EFEFF4;
+        }
+        .payinfo{
+            display: block;
+            position: absolute;
+            bottom: 0;
+            height: 13rem;
+            width: 100%;
+            overflow: hidden;
+            transition: .4s;
+        }
+        table{
+            width:100%;
+            height: 90%;
+            bottom: 0;
+            background-color:white;
+        }
+        table tr td{
+            text-align:center;
+            width:24.9999999%;
+            border-right:1px solid #D9D9D9;
+            border-bottom:1px solid #D9D9D9;
+        }
+        table tr td:active{
+            background-color:#ECECEC;
+        }
+        .keybord-return,.keybord-stop{
+            width:30px;
+            height:30px;
+            margin:0px auto;
+            color:white;
+        }
+        .keybord-return{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADICAMAAACahl6sAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAALpQTFRFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAqyRq8wAAAD10Uk5TAAM/gJ+efz5Q2ddPAouKAZZ8nP0vrfcLN03+GcxYu9gSGkCBndobPbe8+QonMuCH7xOIW0fNtCwra4NgHN+ehK8AAAABYktHRACIBR1IAAAACXBIWXMAAABIAAAASABGyWs+AAAB4UlEQVR42u3c51LCQBiF4Y2IgDQVRcWCvffe9v5vS2FGhSH5kTLzney8zxWcd3ZD+BXnAAAAAAAAAAAAgFSiucp8daEWWe/Iq97wY4tN6yW5tNr+T6drvSa77pKfsGw9J7PWymSH761aDyqmw/s160XZTN+rkf669aYsZs7jx4b1qII6/Kb1qvRm79VIzXpWarHn4Qdb1ruK6fDb1rvSir9X3u9YD0sp4Tz8bst6WTEdwz3rZekk3avGvvUyOuiwR4cWOrTQoYUOLXRooUMLHVro0EKHFjq00KGFDi10aKFDCx1a6NBChxY6tNChhQ4tdIhpx3cMy9ZRD6QjaoTR4Q7CeD6cOwzjPJyrhnEezh3FhByfWK/KoBLK1TqNfdhLeCbRMJCfX9cM5IXoXCeUkqQ/jeV7TijRQ4keSvRQoocSPZTooUQPJXoo0UOJHkr0UKKHEj2U6KFEDyV6KNFDiR5K9FCihxI9lOgJpySUD04ml5yV7jPlSberfN8tTjiTc+tdRZVcXFrvSi/+dl1Zz8og9kyurVcVVVK6b2KPzd6uG+tJGc2cya31ooJK7u6tB2U2dbt65Xsf/ms9DH47+o/WY/J5eh5nDF5erZfk9vb+Ufn8sl4BAAAAAAAAAAAAY9/5YLt8mhkMlgAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAyMC0wNy0wNFQxNTowMjo0OSswODowMMIgQKAAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMjAtMDctMDRUMTU6MDI6NDkrMDg6MDCzffgcAAAAR3RFWHRzdmc6YmFzZS11cmkAZmlsZTovLy9ob21lL2FkbWluL2ljb24tZm9udC90bXAvaWNvbl91ZmVhaXVpd2lrZy9iYWNrLnN2Z4Ft+LMAAAAASUVORK5CYII=); background-size:100% 90%; }
+        .keybord-stop{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAgAAAAIACAMAAADDpiTIAAAAA3NCSVQICAjb4U/gAAAACXBIWXMAAA3lAAAN5QHm6mmvAAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAAWtQTFRF////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAR9G26gAAAHh0Uk5TAAECAwQFBgcICQsMDQ4PEBMUFRcaHyEiJiwuLzAyMzQ1Nj0+P0JGR0pNUFZXW11eYmZnaG1ub3F3eH6Ag4SFhomMj5WWmJmgoqWmp6usrrGytLq9vsLDxsnKy87P0NLT1dfZ3N7i4+Tl5unr7O/w8vX29/n6+/3+X88dAwAACGRJREFUeNrt3Y1/jfUfx/HvSFbKXaxVilVCq4lFIRRRQm6SkbsYs9pqbcr682PkdtfsOlOPc6738/UHXI/f4/N+/kp2zrVS5tvyvoF9x4cuXx+b+ltt2tTY9ctDx/cN9C0vz7dV/YeHnbeTGj7cv+p5rf/67ovTLtp5TV/c/frC11+x7axTdm5nt61Y0Pyv7p90xM5ucv+rLc+/ZMeYA3Z+YzuWtLZ/vz/3NaTh/hbmf++cwzWnc+/VnL/3pKM1q5O9dfbfMuFiTWtiy/z333XbvZrX7V3znL/7iGM1syPd89l/zXmXamrn1zx7/w2j7tTcRjc8a/+P/ayv0U19/Iz9najpzSlgg///N/+fAXP8W2CNf/8HNFr5J8Fuf/6P6HzVfw367/+QjlT8/Z/LpDTr3wlu8fe/Md2e5ecCvX7+E9TE0z8b9PPfqE4+9fkPN8nqyU+InHOSrM498fk/F0nrsc8JLvH5z7iGH/2s8A73yGvHI9//8Pn/wMYefmNkv2sktv/B9/98/yuyyX+/N7jNLTLbdh+A7/+Gdvb+9/9dIrV77w/Y7RCp7Z4BcNEhUrs48/4f73+JbXqVHwNkd/cHAoedIbfDdwD4OVBww6Usd4Xklpc+R0iurww4QnIDZZ8jJLevHHeE5I6XIUdIbqhcdoTkLpfrjpDc9eLjgNGNFe8EiW6quEF2AAAgAASAABAAAkAACAABIAAEgAAQAAJAAAgAASAABIAAEAACQAAIgJmmLtWv8mHj9Z91rfJhI/UfNlL5sGv1HzZe+bAWTjbVtgAulfpVPuxQ/Wetq3zYYP2HDVY+bF39hx2qHqB+lwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA1JEBAIAAEAACQAAIAAEgAASAABAAAkAACAABIAAEgAAQAAJAAAgAASAAZho/VL/Kh/1c/1nHKh/2Y/2H/Vj5sGP1H/Zz5cNaONl42wLw1TDfDQQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADg/wRwbV39Kh92rP6zPqp82N76D9tb+bCP6j+s+pfZtHCya20LQJ0XAAAIAAEgAASAABAAAkAACAABIAAEgAAQAAJAAAgAASAABIAAEAACQAAIAAEgAASAABAAAkAACAABIAAEgAAQAAJAAAgAASAABIAAEAACQAAIgLu18Euj2rdDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AfzVrv/Lxi81qPF2vfJf5be2tan/od/KiCMkN1KuOkJyV8tPjpDcT+W0IyR3uhx0hOQOlk8dIblPyweOkNwHZa0jJLe2dE24Qm4TXaWccobcTpVSPnOG3D67A+BNZ8jtzTsAun51h9R+7br7s+pvHSK1b2c+rLDJIVLbNANg8S8ukdkvi+99Xukrp8jsq/sfWHvLKTJ769+PLJ5xi8TOPPjM6vpp18hrev3DTy0fdY68jj7ysfWeW+6R1q2eR7+4cMBB0jrw2DdXVv7uIln9vvLx7y597iRZff7El9e6b7hJUje6n/z64oCjJDXw9BdYv3GVnL6Z5RvMS4fcJaWhpbN9h/013xMNaeS12d9i8Pak2yQ0+XbVeyz6HSeh/uo3mXzhOs3vizleZdP1vfs0ve+75nqZ0cs+GtDwzrw89+usXvB18UZ38IVnvtFs8E9namp/Ds7nnXbvt+07zbSwxt+f31sNe664VRO70jPf91ouO+FazevEsvm/2bRrj8+INaxbe7pqvdy25zufFG5Q09/1lLq9468EGtOZd1p6xfVmfxhsRFc2t/qS80Wf3HS+Tu/mJ4sW8J77l3ZecMJO7sLOlxb6uw7e+NI/Bjr1//xfvvFcft3For5dp/9wzs7qj9O7+haV59eL7+78+odRd+2ERn/4eue7L/4nv/rmld71Gz/cun1Qbdn2rR9uXN/7SpEkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZKkuq1u0i9zWW3P+u1pzq9x2mPNaAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAen7/wNF3uGEUW54AwAAAABJRU5ErkJggg==); background-size:100% 100%;}
+        .pay{
+            color:#ffffff;
+            font-size:120%;
+            background-color:#df6051;
+        }
+        .pay:active{
+            /*background-color: #df6051;*/
+            background-color: rgba(223,96,81,0.7);
+        }
+        .shouyin{
+            text-align: center;
+            color: #9b9b9b;
+            font-size: 13px;
+        }
+        .logo{
+            background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAD70lEQVRoQ9VaTYgURxT+Xm8w7PQs6CFgXDCXEAKeFHKLRKMo6HoSc0qmqlfxICSn/KCXmIMuiZ4UBEG3q+aokItKiGSTDZ5CIHtK9LAXhRVJDoZs9ywR7CfVuzPMzM5sV/X0MNt92Z7q9773vu2qej/VhIKuSIgDBO8AgEkCTybApLlfg1/ygCUGLSH9m8xVtZ4rwjQNAhLXgikQjgE8BWCHI9ZTgO6Cccevh3cddVvizgT4zJnqSqMRMFMA8O68hjv1aIGIw/FKJaRr1yIXTGsCkZTbx5iChJNpEL3tYsRalnnRI2/2JXFYVeqZjZ4VgVjK95hRJ+BdG9BBZRh4RISar9TvWViZBFZq0/sTSn7OAhrGc4+9D8frs79shL0hgUiIgECzw3DOFpPB01Wtw37yfQlEQnxJoG9tDQ1TjsFfVbX+rpeNngRiIU4CdGOYTrlj8ylf65vdeusIxEIcTffnTXnxlK/1vXbXOgiYrZKYHwBD2iYH/qfwIhPtbd9iOwisiOBsAr44sJ0hAnigc+M6nGmaaBEwEbYRxQtDC1JFkWJerFT93c2I3SLQkPJTZlwpys4wcYjwWUWpq8ZGi0Asgj9cchsC5l8yfi3C0THCBwzss8eiBV+He1oEIiEOEehHewAgYXwzUVfnXXT6yS7X5HmP8LULFoMPV7W+n76BhhCXGPS5C8Bo34CZOny5ovUXKYFYyMcAdroScJHPknWbQinaE1+rt6jxyfT77CUPsgx0BY/5ilb7XXSyZGMh/wewJUuuw4/E20uxCC4CfNZJkXC8otT3LjpZsrGUF8A4lyXX+ZxmDAENcM1F0dcqMw13wUun8cen38TYi6duelSnhpA/MWCKcdvrpq/VKVthF7lYSJODHbXVIWCOIiEfulRaDD5YVEeh29HVJgHfsSWQVm6RkP8RMGGr9IKwbZtS/7bLLwfBG+b3RBj+M8j4cym3bmE8t/WFgWVnAuDkiF+v/9DhqAlESH4bdLwh5Qlm3HIl4DSFDDgRPqooddvctxstatyBwKM8i7iJ/+faza4ug0WNZ/JIF3GebdQgJ4Q0kHmMDbsGWV4MhkP1XIHMOGViwbKU+4ogMKHUfCwkZ5Fd/5xmcqUSm4UAmVQijYI5krlN8AZWk7l0J8mRTo+aQEc6naegGTWBjoJmdRq5lZSjJdBVUq4FJKei/jWPdr0ehn+57xzrNUwq4iX8ty1Wz6I+R1vlfkJo9WdsjfeSI8Z1At6xwujXVjHKpW5sGQKlby2uLuYSN3ebc7DU7fUmiVIfcLSRKO8RU5NEqQ/5WmuizMesrelU5oPu9ghZ2k8NeoX5Un7s0S9fGdXnNq8Aors/k02FsxcAAAAASUVORK5CYII=);background-size:100% 100%;
+            width: 35px;
+            height: 35px;
+        }
+        .icon{
+            background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAC7UlEQVRYR72WTWgTURDH/7ObJi1YENFT4kVtD/YgSMFaaOrbpfYgeElaURA8CIKKIAhCQYyCIAiC0KLgodBDwUqhiODB8N42RfFQEYoVBUGRCiKioPUjNbsjK4mk2ySbTTe+687O7/dm3hehiSOXy+20bXuEiAQzTwkhznpx1Cx+ET4FoKuMMSaEOF3ObIpAFfhfruM4l0zTzJQkmiIwNze3y7btKWbuXFNyoh/RaHRzb2/vT/db6AKWZd1h5tsAlgHcBZDwSHxLJBJbOjo68qELSCkniegwgC8A9gPYQETTzLypJNG0FkgpJ4joaNlsX2qadpCIttm2PQOglZlvGoZxMvRFqJQaB3DM229mzsVisaF8Pr8XwCHDMI6Evg2VUm6/j1fbzkR0Lx6PD5d6HqqAUuoWgBM+Z8n07OzscCaTcSrFNbwLlFKjAE75wGfa29uHu7u7f1etUCMnoWVZN5j5jM+/9wEMCSF+1YoLXAEp5XUiWnOmeyAPVlZWhgYHB7/7TTCQgFLqGoBzPkkftrW1pXt6er76wQMdREqpqwDO1ywnkdR1Pd3X1+ceRHWNuiogpbxCRCO1Mrp7nohSQohPdZGLQb4CUsrLRHTBJ+kjAGkhxIcg8JotyGazndFoNOLeap473ct44jhO2jTN90HhNQUsy3JX+pKmaYs1JOYLhUJqYGDgXSPwmgJKqSwAk5kPRCKRtxUknmmalurv73/TKLyqQPFFs1hK7DjOnpaWluWSBBEtMLO74F6vB15VQCl1EcC/Z5MbGIlEtjNza/GlkzIM49V64VUFpJRPiWi3F1AoFDbGYrF4Mpl8EQa8ooC3/EXQvOM4E5qmjQsh3KdWaGPNOVBefiKatG17zDTNx6ERPYkqCTwHMCqEcO/6po9VAm75w+xvPfarBJRS7hN6Rz0/BonRdf1jtYl5BThI4iCxuq53VZL4bwIAtgohlrzSlRbhviAzqydW1/XPyWRyoVKs73VcD2A9MX8AVWwjMF0q1kMAAAAASUVORK5CYII=);background-size:100% 100%;
+            width: 15px;
+            height: 15px;
+        }
+        .body{
+            padding: 2rem 1rem;
+        }
+        .store-info{
+            display: flex;
+            align-items: center;
+        }
+        .name{
+            margin-left: .5rem;
+        }
+        .main-amt{
+            height: 3rem;
+            padding: 1.2rem 0 0 0;
+        }
+        .amt-content {
+            display: flex;
+            background: #fff;
+            padding: 10px 20px;
+            border-radius: 4px;
+            height: 40px;
+            font-size: 18px;
+        }
+        .input-label {
+            flex: 1;
+            line-height: 40px;
+        }
+        .input-box {
+            line-height: 40px;
+            font-size: 25px;
+            color: #777;
+        }
+        .gb {
+            display: inline-block;
+            width: 2px;
+            height: 30px;
+            margin-top: -6px;
+            background: #df6051;
+            vertical-align: middle;
+            animation: gb 1.3s infinite;
+        }
+        .money-input {
+            font-weight: bold;
+            color: #df6051;
+        }
+        @keyframes gb {
+            from {
+                opacity: 1;
+            } to {
+                  opacity: 0;
+              }
+        }
+        .remark-info{
+            display: flex;
+            align-items: center;
+            font-size: 13px;
+            color: #9e9e9e;
+        }
+        .set-remark{
+            margin-left: 5px;
+        }
+        .main-title{
+            display: flex;
+            justify-content: space-between;
+        }
+
+        .shade{
+            display: none;
+            position: absolute;
+            top: 0;
+            left: 0;
+            width: 100%;
+            height: 100%;
+            background-color: rgba(0,0,0,.1);
+            z-index: 1002;
+            overflow: auto;
+        }
+        .dialog{
+            z-index: 8888;
+            height: 13rem;
+            width: 100%;
+            position: absolute;
+            display: none;
+        }
+        .dialog-content{
+            background: #fff;
+            height: 11rem;
+            border-radius: 10px;
+            padding: 10px 20px;
+            margin: 0 auto;
+            width: 60%;
+        }
+        .btns{
+            padding: 0 0 0 5%;
+        }
+        .btn-cancel{
+            width: 45%;
+            height: 1.8rem;
+            border-radius: 20px;
+            border: none;
+        }
+        .btn-submit{
+            width: 45%;
+            height: 1.8rem;
+            border-radius: 20px;
+            border: none;
+            background-color: #df6051;
+            color: #fff;
+        }
+        .remark-text{
+            border: 1px solid #e4e0e0;
+            height: 6rem;
+            width: 100%;
+        }
+        .remark-body{
+            margin-top: 15px;
+        }
+        .loading{
+            z-index: 10000;
+            position: absolute;
+            width: 100%;
+            display: none;
+            margin: 40px 0;
+        }
+        .loading-body{
+            width: 30%;
+            text-align: center;
+            margin: 0 auto;
+            padding: .4rem 0;
+            background-color: #fff;
+            border-radius: 4px;
+        }
+        .loading-icon{
+            background-image: url(data:image/gif;base64,R0lGODlhIAAgALMAAP///7Ozs/v7+9bW1uHh4fLy8rq6uoGBgTQ0NAEBARsbG8TExJeXl/39/VRUVAAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQFBQAAACwAAAAAIAAgAAAE5xDISSlLrOrNp0pKNRCdFhxVolJLEJQUoSgOpSYT4RowNSsvyW1icA16k8MMMRkCBjskBTFDAZyuAEkqCfxIQ2hgQRFvAQEEIjNxVDW6XNE4YagRjuBCwe60smQUDnd4Rz1ZAQZnFAGDd0hihh12CEE9kjAEVlycXIg7BAsMB6SlnJ87paqbSKiKoqusnbMdmDC2tXQlkUhziYtyWTxIfy6BE8WJt5YEvpJivxNaGmLHT0VnOgGYf0dZXS7APdpB309RnHOG5gDqXGLDaC457D1zZ/V/nmOM82XiHQjYKhKP1oZmADdEAAAh+QQFBQAAACwAAAAAGAAXAAAEchDISasKNeuJFKoHs4mUYlJIkmjIV54Soypsa0wmLSnqoTEtBw52mG0AjhYpBxioEqRNy8V0qFzNw+GGwlJki4lBqx1IBgjMkRIghwjrzcDti2/Gh7D9qN774wQGAYOEfwCChIV/gYmDho+QkZKTR3p7EQAh+QQFBQAAACwBAAAAHQAOAAAEchDISWdANesNHHJZwE2DUSEo5SjKKB2HOKGYFLD1CB/DnEoIlkti2PlyuKGEATMBaAACSyGbEDYD4zN1YIEmh0SCQQgYehNmTNNaKsQJXmBuuEYPi9ECAU/UFnNzeUp9VBQEBoFOLmFxWHNoQw6RWEocEQAh+QQFBQAAACwHAAAAGQARAAAEaRDICdZZNOvNDsvfBhBDdpwZgohBgE3nQaki0AYEjEqOGmqDlkEnAzBUjhrA0CoBYhLVSkm4SaAAWkahCFAWTU0A4RxzFWJnzXFWJJWb9pTihRu5dvghl+/7NQmBggo/fYKHCX8AiAmEEQAh+QQFBQAAACwOAAAAEgAYAAAEZXCwAaq9ODAMDOUAI17McYDhWA3mCYpb1RooXBktmsbt944BU6zCQCBQiwPB4jAihiCK86irTB20qvWp7Xq/FYV4TNWNz4oqWoEIgL0HX/eQSLi69boCikTkE2VVDAp5d1p0CW4RACH5BAUFAAAALA4AAAASAB4AAASAkBgCqr3YBIMXvkEIMsxXhcFFpiZqBaTXisBClibgAnd+ijYGq2I4HAamwXBgNHJ8BEbzgPNNjz7LwpnFDLvgLGJMdnw/5DRCrHaE3xbKm6FQwOt1xDnpwCvcJgcJMgEIeCYOCQlrF4YmBIoJVV2CCXZvCooHbwGRcAiKcmFUJhEAIfkEBQUAAAAsDwABABEAHwAABHsQyAkGoRivELInnOFlBjeM1BCiFBdcbMUtKQdTN0CUJru5NJQrYMh5VIFTTKJcOj2HqJQRhEqvqGuU+uw6AwgEwxkOO55lxIihoDjKY8pBoThPxmpAYi+hKzoeewkTdHkZghMIdCOIhIuHfBMOjxiNLR4KCW1ODAlxSxEAIfkEBQUAAAAsCAAOABgAEgAABGwQyEkrCDgbYvvMoOF5ILaNaIoGKroch9hacD3MFMHUBzMHiBtgwJMBFolDB4GoGGBCACKRcAAUWAmzOWJQExysQsJgWj0KqvKalTiYPhp1LBFTtp10Is6mT5gdVFx1bRN8FTsVCAqDOB9+KhEAIfkEBQUAAAAsAgASAB0ADgAABHgQyEmrBePS4bQdQZBdR5IcHmWEgUFQgWKaKbWwwSIhc4LonsXhBSCsQoOSScGQDJiWwOHQnAxWBIYJNXEoFCiEWDI9jCzESey7GwMM5doEwW4jJoypQQ743u1WcTV0CgFzbhJ5XClfHYd/EwZnHoYVDgiOfHKQNREAIfkEBQUAAAAsAAAPABkAEQAABGeQqUQruDjrW3vaYCZ5X2ie6EkcKaooTAsi7ytnTq046BBsNcTvItz4AotMwKZBIC6H6CVAJaCcT0CUBTgaTg5nTCu9GKiDEMPJg5YBBOpwlnVzLwtqyKnZagZWahoMB2M3GgsHSRsRACH5BAUFAAAALAEACAARABgAAARcMKR0gL34npkUyyCAcAmyhBijkGi2UW02VHFt33iu7yiDIDaD4/erEYGDlu/nuBAOJ9Dvc2EcDgFAYIuaXS3bbOh6MIC5IAP5Eh5fk2exC4tpgwZyiyFgvhEMBBEAIfkEBQUAAAAsAAACAA4AHQAABHMQyAnYoViSlFDGXBJ808Ep5KRwV8qEg+pRCOeoioKMwJK0Ekcu54h9AoghKgXIMZgAApQZcCCu2Ax2O6NUud2pmJcyHA4L0uDM/ljYDCnGfGakJQE5YH0wUBYBAUYfBIFkHwaBgxkDgX5lgXpHAXcpBIsRADs=);background-size:100% 100%;
+            height: 30px;
+            width: 30px;
+            margin: 10px auto;
+        }
+
+    </style>
+</head>
+<body>
+<div class="body">
+    <div class="main-title">
+        <div class="store-info">
+            <div class="logo"></div>
+            <div class="name" th:text="${storeName}"></div>
+        </div>
+        <div class="remark-info">
+            <div class="icon"></div>
+            <div class="set-remark" onclick="showRemarkDialog()">设置备注</div>
+        </div>
+    </div>
+    <div class="main-amt">
+        <div class="amt-content" onclick="showInput()">
+            <div class="input-label">消费金额</div>
+            <div class="input-box">￥ <span class="money-input" name="comsumeMoney" id="comsumeMoney"></span> <span class="gb"></span></div>
+        </div>
+    </div>
+
+</div>
+<div class="payinfo" id="payinfo">
+    <div class="shouyin" onclick="showInput()">
+        <p>收&nbsp;银&nbsp;就&nbsp;用&nbsp;收&nbsp;银&nbsp;呗</p>
+    </div>
+    <table cellspacing="0" cellpadding="0" id="table1">
+        <tr>
+            <td class="paynum" onclick="inputAmt(1)">1</td>
+            <td class="paynum" onclick="inputAmt(2)">2</td>
+            <td class="paynum" onclick="inputAmt(3)">3</td>
+            <td id="pay-return" onclick="inputAmt('del')"><div class="keybord-return"></div></td>
+        </tr>
+        <tr>
+            <td class="paynum" onclick="inputAmt(4)">4</td>
+            <td class="paynum" onclick="inputAmt(5)">5</td>
+            <td class="paynum" onclick="inputAmt(6)">6</td>
+            <td rowspan="3" class="pay" id="pay">支付</td>
+        </tr>
+        <tr>
+            <td class="paynum" onclick="inputAmt(7)">7</td>
+            <td class="paynum" onclick="inputAmt(8)">8</td>
+            <td class="paynum" onclick="inputAmt(9)">9</td>
+        </tr>
+        <tr>
+            <td id="pay-stop" onclick="hideInput()"><div class="keybord-stop"></div></td>
+            <td id="pay-zero" onclick="inputAmt(0)">0</td>
+            <td id="pay-float" onclick="inputAmt('.')">.</td>
+        </tr>
+    </table>
+</div>
+<div id='shade' class="shade"></div>
+
+<div class="dialog" id="dialog">
+    <div class="dialog-content">
+        <div class="label">设置备注</div>
+        <div class="remark-body">
+            <textarea id="remark" class="remark-text"></textarea>
+        </div>
+        <div class="btns">
+            <button class="btn-cancel" onclick="hideRemarkDialog('cancel')">取消</button>
+            <button class="btn-submit" onclick="hideRemarkDialog('submit')">确定</button>
+        </div>
+    </div>
+</div>
+
+<div class="loading" id="loading">
+    <div class="loading-body">
+        <div class="loading-icon">
+        </div>
+        <div class="loading-msg">
+            支付中...
+        </div>
+    </div>
+</div>
+
+
+<input type="hidden" id="merchantCode" th:value="${merchantCode}">
+<input type="hidden" id="openid" th:value="${openid}">
+<input type="hidden" id="userid" th:value="${userid}">
+<input type="hidden" id="userAppId" th:value="${userAppId}">
+<input type="hidden" id="storeId" th:value="${storeId}">
+<input type="hidden" id="unionId" th:value="${unionId}">
+<input type="hidden" id="payType" th:value="${payType}">
+</body>
+<script>
+    function inputAmt(o){
+        var dom = document.getElementById('comsumeMoney');
+        var txt = dom.innerText;
+        if(!txt){
+            if(o === 'del' || o === '.'){
+                return;
+            }
+        }
+        if(o === '.' && txt.indexOf(".") > 0){
+            return;
+        }
+        if(o === 'del'){
+            txt = txt.slice(0,-1);
+            dom.innerText = txt
+            return;
+        }
+        if(txt.indexOf(".") > 0 ){
+            var v = txt.split(".")[1];
+            if(v && v.length > 1){
+                return;
+            }
+        }else{
+            if(txt.indexOf("0") == 0 && o !== '.'){
+                return;
+            }
+        }
+        txt = txt === "" ? o : txt + "" + o;
+        let max = 999999;
+        if(parseFloat(txt) > max){
+            return;
+        }
+        dom.innerText = txt;
+    }
+    function hideInput(){
+        var dom = document.getElementById('payinfo');
+        dom.style.height = '20px'
+    }
+    function showInput(){
+        var dom = document.getElementById('payinfo');
+        dom.style.height = '13rem'
+    }
+    function showRemarkDialog(){
+        var shape = document.getElementById('shade');
+        var dialog = document.getElementById('dialog');
+        shape.style.display = 'block';
+        dialog.style.display = 'block';
+    }
+    function hideRemarkDialog(t){
+        var shape = document.getElementById('shade');
+        var dialog = document.getElementById('dialog');
+        shape.style.display = 'none';
+        dialog.style.display = 'none';
+        if(t === 'cancel'){
+            document.getElementById('remark').value = "";
+        }
+    }
+    document.getElementById("pay").onclick = ()=>{
+        var comsumeMoney = document.getElementById('comsumeMoney').innerText;
+        if(comsumeMoney == undefined || comsumeMoney == '' || comsumeMoney == null){
+            return;
+        }
+        var shape = document.getElementById('shade');
+        var loading = document.getElementById('loading');
+        shape.style.display = 'block';
+        loading.style.display = 'block';
+        var storeId = document.getElementById("storeId").value;
+        var openid = document.getElementById("openid").value;
+        var merchantCode = document.getElementById("merchantCode").value;
+        var remark = document.getElementById("remark").value;
+        var userId = document.getElementById("userid").value;
+        var unionId = document.getElementById("unionId").value;
+        var userAppId = document.getElementById("userAppId").value;
+        var payType = document.getElementById("payType").value;
+
+        var params = "storeId="+storeId + "&openid="+openid + "&merchantCode="+merchantCode +
+            "&remark="+remark + "&userId="+userId+"&unionId="+unionId +
+            "&userAppId="+userAppId +"&payWay="+payType+ "&comsumeMoney="+comsumeMoney;
+        var url = "/wap/merchant/tradePay";
+        var xhr = new XMLHttpRequest();//创建请求对象
+        xhr.open("POST", url, true);//链接服务器
+        xhr.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
+        xhr.onreadystatechange = function () {
+            if (xhr.readyState === 4) {//请求已完成，且响应已就绪
+                shape.style.display = "none";
+                loading.style.display = "none";
+                if (xhr.status === 200) {//请求成功
+                    var resultStr = xhr.responseText//获取结果
+                    var resultObj = JSON.parse(resultStr);//解析数据
+                    if (resultObj.code == 200) {
+                        var rdata = resultObj.data;
+                        if("WXZF" == payType){
+                            WeixinJSBridge.invoke('getBrandWCPayRequest', {
+                                // 商品名称
+                                "appId" : rdata.payAppId,
+                                "timeStamp" : rdata.payTimeStamp,
+                                "nonceStr" : rdata.paynonceStr,
+                                "package" : rdata.payPackage,
+                                "signType" : rdata.paySignType,
+                                "paySign" : rdata.paySign,
+                            }, function(res) {
+                                if (res.err_msg == "get_brand_wcpay_request:ok" || res.err_msg == "stopMonitoringBeacons:ok") {
+                                    //成功之后跳转地址
+                                    window.location = '/wap/merchant/paySuccess';
+                                } else {
+                                    cancelPay(rdata.orderNumber);
+                                    alert("支付失败");
+                                }
+                            })
+                        }else if("ZFBZF" == payType){
+                            var reg=/^([hH][tT]{2}[pP]:\/\/|[hH][tT]{2}[pP][sS]:\/\/)(([A-Za-z0-9-~]+).)+([A-Za-z0-9-~\/])+$/;
+                            if(reg.test(rdata.source)){
+                                window.location = rdata.source;
+                            }else{
+                                ap.tradePay({
+                                    tradeNO : rdata.source
+                                }, function(res) {
+                                    if (res.resultCode == '9000') {
+                                        window.location = '/wap/merchant/paySuccess'; //订单支付成功
+                                    } else if (res.resultCode == '8000') {
+                                    } else if (res.resultCode == '4000') {
+                                        cancelPay(rdata.orderNumber);
+                                        ap.alert("订单支付失败");
+                                    } else if (res.resultCode == '6001' || res.resultCode == '99') {
+                                        cancelPay(rdata.orderNumber);
+                                    } else if (res.resultCode == '6002') {
+                                        cancelPay(rdata.orderNumber);
+                                        ap.alert("网络连接出错");
+                                    }
+                                });
+                            }
+                        }else{
+                            window.location = rdata.redirectUrl;
+                        }
+                    } else {
+                        alert(resultObj.message);
+                    }
+                }
+                else {
+                    alert("错误码 : " + xhr.status);
+                }
+            }
+        }
+        xhr.send(params);//发送请求
+    }
+    function cancelPay(m) {
+        var url = "/wap/merchant/cancelPay/"+m;
+        var xhr = new XMLHttpRequest();//创建请求对象
+        xhr.open("GET", url, true);//链接服务器
+        xhr.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
+        xhr.onreadystatechange = function () {
+
+        }
+        xhr.send();
+    }
+</script>
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/templates/th_account_bind.html b/pluss-wap-page/src/main/resources/templates/th_account_bind.html
new file mode 100644
index 0000000..8a5d148
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/templates/th_account_bind.html
@@ -0,0 +1,379 @@
+<!DOCTYPE html>
+<html lang="en" style="font-size: 16px;" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <meta charset="UTF-8">
+    <meta data-n-head="true" name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
+    <meta data-n-head="true" data-hid="description" name="description" content="商户公众号">
+    <meta data-n-head="true" http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate">
+    <meta data-n-head="true" http-equiv="Pragma" content="no-cache">
+    <meta data-n-head="true" http-equiv="Expires" content="0">
+    <title data-n-head="true">账号绑定</title>
+    <script src="/wap/resources/js/jquery.min.js"></script>
+    <title>账号绑定</title>
+    <style>
+        *{-webkit-tap-highlight-color:transparent;outline:0;-webkit-box-sizing:border-box;box-sizing:border-box}*,blockquote,body,button,dd,dl,dt,fieldset,form,h1,h2,h3,h4,h5,h6,hr,input,legend,li,ol,p,pre,td,textarea,th,ul{margin:0;padding:0;vertical-align:baseline}html{font-family:Source Sans Pro,-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Arial,sans-serif;word-spacing:.03125rem;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%;-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;-webkit-box-sizing:border-box;box-sizing:border-box}img{border:0 none;vertical-align:top}em,i{font-style:normal}ol,ul{list-style:none}table{border-collapse:collapse;border-spacing:0}a{text-decoration:none}html{-webkit-tap-highlight-color:rgba(0,0,0,0)}#__layout,#__nuxt,body,html{min-height:100%;width:100%;background-color:#f6f6f6;color:#333}input{border:none;outline:none;color:#666;caret-color:#f04144}::-moz-input-placeholder{color:#ccc}:-ms-input-placeholder{color:#ccc}::-webkit-input-placeholder{color:#ccc}::-ms-input-placeholder{color:#ccc}::placeholder{color:#ccc}input:disabled{color:#666;background:none;opacity:1;filter:alpha(opacity=100);-webkit-text-fill-color:#666}input:disabled::-moz-input-placeholder{color:#ccc;-webkit-text-fill-color:#ccc}input:disabled:-ms-input-placeholder{color:#ccc;-webkit-text-fill-color:#ccc}input:disabled::-webkit-input-placeholder{color:#ccc;-webkit-text-fill-color:#ccc}input:disabled::-ms-input-placeholder{color:#ccc;-webkit-text-fill-color:#ccc}input:disabled::placeholder{color:#ccc;-webkit-text-fill-color:#ccc}.absolute-center{-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.absolute-center,.vertical-center{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.horizontal-center{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.active-color{color:#f04144}.ellipsis{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.no-jurisdiction{-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;padding-top:10.3125rem}.no-jurisdiction .no-jurisdiction-img{width:6.65625rem}.no-jurisdiction .no-jurisdiction-img img{width:100%;height:auto}.no-jurisdiction .no-jurisdiction-text{margin-top:1.5625rem;font-size:.875rem;text-align:center;color:#999}.forbid-root-scroll{position:fixed;overflow:hidden;height:100%}.thin-border,.thin-border-bottom,.thin-border-left,.thin-border-right,.thin-border-top{position:relative}.thin-border-top:before{top:0;left:0;border-bottom:.0625rem solid #e5e5e5}.thin-border-bottom:before,.thin-border-top:before{content:"";position:absolute;width:200%;height:.0625rem;-webkit-box-sizing:border-box;box-sizing:border-box;-webkit-transform-origin:0 0;transform-origin:0 0;-webkit-transform:scale(.5);transform:scale(.5)}.thin-border-bottom:before{bottom:0;border-bottom:.0625rem solid #e6e6e6}.thin-border-right:before{right:0;height:200%;border-right:.0625rem solid #ccc}.thin-border-left:before,.thin-border-right:before{content:"";position:absolute;top:0;width:.0625rem;-webkit-box-sizing:border-box;box-sizing:border-box;-webkit-transform-origin:0 0;transform-origin:0 0;-webkit-transform:scale(.5);transform:scale(.5)}.thin-border-left:before{left:0;height:1.5625rem;border-left:.0625rem solid #ccc}.thin-border:before{content:"";position:absolute;top:0;left:0;width:200%;height:200%;border:.0625rem solid #ccc;-webkit-box-sizing:border-box;box-sizing:border-box;border-radius:.125rem;-webkit-transform:scale(.5);transform:scale(.5);-webkit-transform-origin:0 0;transform-origin:0 0;pointer-events:none}.display-inline-block{display:inline-block}.display-inline{display:inline}.display-block{display:block}.vertical-align-m{vertical-align:middle}.vertical-align-t{vertical-align:top}.float-r{float:right}.float-l{float:left}.slide-in-down-enter-active,.slide-in-down-leave-active{-webkit-transition:all .2s;transition:all .2s;-webkit-transform:translateY(0);transform:translateY(0)}.slide-in-down-enter,.slide-in-down-leave-to{-webkit-transform:translateY(-100%);transform:translateY(-100%)}.slide-in-up-enter-active,.slide-in-up-leave-active{-webkit-transition:.2s;transition:.2s;-webkit-transform:translate(0);transform:translate(0)}.slide-in-up-enter,.slide-in-up-leave-to{-webkit-transform:translateY(100%);transform:translateY(100%)}.zoom-in-enter-active,.zoom-leave-active{-webkit-transition:.2s;transition:.2s;-webkit-transform:scale(1);transform:scale(1)}.zoom-in-enter,.zoom-leave-to{-webkit-transform:scale(0);transform:scale(0)}.fade-enter-active,.fade-leave-active{-webkit-transition:opacity .2s;transition:opacity .2s}.fade-enter,.fade-leave-to{opacity:0}.slide-left-enter,.slide-right-leave-active{opacity:0;-webkit-transform:translate(100%);transform:translate(100%);-webkit-transition:all .3s cubic-bezier(.55,0,.1,1);transition:all .3s cubic-bezier(.55,0,.1,1)}.slide-left-leave-active,.slide-right-enter{opacity:0;-webkit-transform:translate(-100%);transform:translate(-100%);-webkit-transition:all .5s cubic-bezier(.55,0,.1,1);transition:all .5s cubic-bezier(.55,0,.1,1)}
+    </style>
+    <style>
+        *{
+            margin: 0;
+            padding: 0;
+            vertical-align: baseline;
+        }
+        html{
+            font-family: Source Sans Pro,-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Arial,sans-serif;
+            word-spacing: .03125rem;
+            -webkit-text-size-adjust: 100%;
+            -webkit-font-smoothing: antialiased;
+            -webkit-box-sizing: border-box;
+            box-sizing: border-box;
+            -webkit-tap-highlight-color: rgba(0,0,0,0);
+            word-spacing: .03125rem;
+        }
+        body{
+            min-height: 100%;
+            width: 100%;
+            background-color: #f6f6f6;
+            color: #333;
+            display: block;
+        }
+        /*.nuxt-progress{*/
+        /*    width: 0%;*/
+        /*    height: 2px;*/
+        /*    background-color: #f04144;*/
+        /*    opacity: 0;*/
+
+        /*    position: fixed;*/
+        /*    top: 0;*/
+        /*    left: 0;*/
+        /*    right: 0;*/
+        /*    !*height: .0625rem;*!*/
+        /*    !*width: 0;*!*/
+        /*    !*-webkit-transition: width .2s,opacity .4s;*!*/
+        /*    transition: width .2s,opacity .4s;*/
+        /*    !*opacity: 1;*!*/
+        /*    !*background-color: #efc14e;*!*/
+        /*    z-index: 999999;*/
+        /*}*/
+        .account-binding{
+            width: 19.0625rem;
+            height: 20.25rem;
+            margin: 2.5rem auto 0;
+        }
+        .account-binding .account-binding-logo{
+            height: 8.71875rem;
+            -webkit-box-orient: vertical;
+            -webkit-box-direction: normal;
+            -ms-flex-direction: column;
+            flex-direction: column;
+        }
+         .absolute-center, .vertical-center {
+             display: -webkit-box;
+             display: -ms-flexbox;
+             display: flex;
+             -webkit-box-align: center;
+             -ms-flex-align: center;
+             align-items: center;
+         }
+        .account-binding .account-binding-form{
+            overflow: hidden;
+            width: 100%;
+            height: 5.625rem;
+            padding: 0 .625rem;
+            -webkit-box-sizing: border-box;
+            box-sizing: border-box;
+            background-color: #fff;
+            -webkit-box-shadow: 0 0.09375rem 0.3125rem 0 rgb(0 0 0 / 5%);
+            box-shadow: 0 0.09375rem 0.3125rem 0 rgb(0 0 0 / 5%);
+            border-radius: .25rem;
+        }
+        .f-input{
+            height: 2.8125rem;
+            padding: .03125rem .8125rem;
+            -webkit-box-sizing: border-box;
+            box-sizing: border-box;
+            background-color: #fff;
+        }
+         .absolute-center, .vertical-center {
+             display: -webkit-box;
+             display: -ms-flexbox;
+             display: flex;
+             -webkit-box-align: center;
+             -ms-flex-align: center;
+             align-items: center;
+         }
+        .absolute-center {
+            -webkit-box-pack: center;
+            -ms-flex-pack: center;
+            justify-content: center;
+        }
+        .absolute-center, .vertical-center {
+            display: -webkit-box;
+            display: -ms-flexbox;
+            display: flex;
+            -webkit-box-align: center;
+            -ms-flex-align: center;
+            align-items: center;
+        }
+        .f-input .f-input-title{
+            height: 100%;
+            margin-right: 1.125rem;
+        }
+        .f-input .f-input-value{
+            -webkit-box-flex: 1;
+            -ms-flex: 1;
+            flex: 1;
+            height: 100%;
+        }
+        .f-input .f-input-icon{
+            -webkit-box-pack: end;
+            -ms-flex-pack: end;
+            justify-content: flex-end;
+            width: 1.34375rem;
+            height: .8125rem;
+        }
+        img {
+            border: 0 none;
+            vertical-align: top;
+        }
+        .account-binding .account-binding-form #account-icon, .account-binding .account-binding-form #pwd-icon{
+            width: 1.125rem;
+            height: 1.125rem;
+        }
+        .f-input .f-input-title .f-input-title-icon{
+            width: 1.125rem;
+            height: 1.125rem;
+        }
+        .f-input .f-input-value input{
+            display: block;
+            width: 100%;
+            height: 100%;
+            font-size: 1rem;
+        }
+        .ellipsis {
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+        }
+        input {
+            border: none;
+            outline: none;
+            color: #666;
+            caret-color: #FD7663;
+        }
+        .account-binding .account-binding-btn{
+            position: relative;
+            height: 5.90625rem;
+        }
+        .f-button{
+            width: 100%;
+            height: 2.75rem;
+            border-radius: .25rem;
+            font-size: 1.0625rem;
+            background-color: #FD7663;
+            color: #fff;
+        }
+        .account-binding .account-binding-btn .acb-button{
+            position: absolute;
+            bottom: 0;
+        }
+        .account-binding .account-binding-logo{
+            height: 8.71875rem;
+            -webkit-box-orient: vertical;
+            -webkit-box-direction: normal;
+            -ms-flex-direction: column;
+            flex-direction: column;
+        }
+        .account-binding .account-binding-logo .abl-img{
+            height: 4.375rem;
+            margin-bottom: 1.46875rem;
+        }
+        .account-binding .account-binding-logo .abl-img img{
+            height: 100%;
+            width: auto;
+            border-radius: 5px;
+        }
+        .account-binding .account-binding-form #account-icon, .account-binding .account-binding-form #pwd-icon{
+            width: 1.125rem;
+            height: 1.125rem;
+        }
+        .account-binding .account-binding-form .h-line{
+            width: 100%;
+            height: .063125rem;
+            background-color: #e5e5e5;
+        }
+        .f-input .f-input-icon img{
+            width: auto;
+            height: 100%;
+        }
+        .f-toast{
+            z-index: 99;
+            position: fixed;
+            top: 48%;
+            left: 50%;
+            max-width: 80%;
+            min-width: 10.375rem;
+            padding: .78125rem .625rem .625rem;
+            border-radius: .3125rem;
+            -webkit-box-sizing: border-box;
+            box-sizing: border-box;
+            text-align: center;
+            background: rgba(51,51,51,.7);
+            color: #fff;
+            -webkit-transform: translate(-50%,-50%);
+            transform: translate(-50%,-50%);
+        }
+        .f-toast .f-toast-icon{
+            height: .96875rem;
+            margin-bottom: .71875rem;
+        }
+        .f-toast .f-toast-icon img{
+            width: auto;
+            height: 100%;
+        }
+        .f-popup{
+            z-index: 0;
+            position: fixed;
+            top: 0;
+            left: 0;
+            overflow: hidden;
+            width: 100%;
+            height: 100%;
+            background-color: rgba(0,0,0,.7);
+        }
+        .f-loading{
+            position: fixed;
+            z-index: 1;
+            top: 40%;
+            left: 37%;
+            padding: 1rem 1rem;
+            display: none;
+            border-radius: 5px;
+            background-color: #fff;
+        }
+        .loading-icon{
+            margin: 0 0 0 .8rem;
+        }
+        .loading-txt{
+            margin-top: .5rem;
+        }
+    </style>
+</head>
+<body>
+    <div class="container">
+<!--        <div class="nuxt-progress"></div>-->
+        <input type="hidden" name="openid" id="openid" th:value="${openid}">
+        <div class="content">
+            <div class="account-binding">
+                <div class="account-binding-logo vertical-center">
+                    <div class="abl-img">
+                        <img src="https://www.shouyinbei.net/resources/images/logo.png"/>
+                    </div>
+                    <div class="abl-text">
+                        绑定您的收银呗账户
+                    </div>
+                </div>
+                <div class="account-binding-form">
+                    <div class="f-input vertical-center">
+                        <div class="f-input-title absolute-center">
+                            <div class="f-input-title-icon absolute-center">
+                                <img src="/wap/resources/images/account_icon.2635004.png" id="account-icon" />
+                            </div>
+                        </div>
+                        <div class="f-input-value vertical-center">
+                            <input placeholder="请输入账号" id="loginName"  class="vertical-center ellipsis">
+                        </div>
+                        <div class="f-input-icon vertical-center" style="display: none" data-id="loginName">
+                            <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAADLklEQVRIia2WTWhdVRSFv7XPRaEFBy0tOir+oQit1RKNREEdGSpYaP2F6kSROlDxZyg6cNTiUMGKiAoiNQWtoogTxSpIrBnYSrGKbaJpNVXU1qB5757l4J2H6c19Mdau0WOfdfd39zn77XM1MTGBJHLOdLtdIgJJ2KZouaTrbQ8DFwLnlviM7SPA58CHtn+SdMqzKSUiAttUDNZK4AngLtur2gyS+j9ngTeAp21/0+aNAZCtwFfAQ0ArpKFlku6RdEDSY0sFbbf9CrB6CYCmzgJ2SHq9H+hXHf19LYEdwOOnAWjqdkljADlnbBOdToe5uTlyzneklFrLPk1truv6yU6nQ13XvYqAVTnnF+d1Wl+HgR+XkPRXYEETSHpK0nrbRGnB7ZKWNXz7JZ0PXAR8uwjkZ+Ay4GLg45b1520TdV2fY3tri6FT1zW2T0bEOuDLFs8ksBY4Wnam0zRExFW2Lw3bo0BqSXIF8E5d1+ScZyNimF7L9zUNDANHAWy/DNzYTGKbqqq2hKSRFggAKaWNKaWxbrfbh10J/AYYWN+HAC8Adw/KI+maAC6Z9w9f8DYRsTmltKvA/oqIoVLtTLE9B9w7CFLyXFABa1q6rQm71fZeSXdKOlSWVgKvAqOLQYpWBCw67+bDRiJiuW1yzgBnAwO3vSEF8P0SjMckrc45HyxbSM552vZ5wMElPH8iJH33L6ZJYIPtmW63i6T3Ukp7y2iZtT0E7B9YSu/8pwL4YhHILwUyXdc1EfGspJsiYiSltKvATtoesr3YC08EsGfA4mFJ64DjOWciYqekB+CfBkkpjZXz+jMiLpd0oJnENrbfjJzzEeDTFtCU7R9K0pck3ddMUFr/7RI6YfvrljzHIuKjqly1D9K7kufrOuC1MgNvaSvZNpJuBj6wPQ1sanokPSwJjY+P9wPPAI+0JTxdSXo3pbQRIKqqoqoqIuJR25+cQc5kRNxWzmjBVX4t8NkZgExFxAbgj36g7ZthGNj5PyBvAWslHZ8fbP0KknQ/sAXY9x8Ah4BttjfRm/CnaOCcs73b9m5JNwCjkq4G1gAriuV3euNrH/C+7T2DbgGAvwHNP28e196upwAAAABJRU5ErkJggg==" />
+                        </div>
+                    </div>
+                    <div class="h-line"></div>
+                    <div class="f-input vertical-center">
+                        <div class="f-input-title absolute-center">
+                            <div class="f-input-title-icon absolute-center">
+                                <img src="/wap/resources/images/pwd_icon.6459233.png" id="pwd-icon" />
+                            </div>
+                        </div>
+                        <div class="f-input-value vertical-center" >
+                            <input type="password" id="password" placeholder="请输入密码" class="vertical-center ellipsis">
+                        </div>
+                        <div class="f-input-icon vertical-center" data-id="password" style="display: none">
+                            <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAADLklEQVRIia2WTWhdVRSFv7XPRaEFBy0tOir+oQit1RKNREEdGSpYaP2F6kSROlDxZyg6cNTiUMGKiAoiNQWtoogTxSpIrBnYSrGKbaJpNVXU1qB5757l4J2H6c19Mdau0WOfdfd39zn77XM1MTGBJHLOdLtdIgJJ2KZouaTrbQ8DFwLnlviM7SPA58CHtn+SdMqzKSUiAttUDNZK4AngLtur2gyS+j9ngTeAp21/0+aNAZCtwFfAQ0ArpKFlku6RdEDSY0sFbbf9CrB6CYCmzgJ2SHq9H+hXHf19LYEdwOOnAWjqdkljADlnbBOdToe5uTlyzneklFrLPk1truv6yU6nQ13XvYqAVTnnF+d1Wl+HgR+XkPRXYEETSHpK0nrbRGnB7ZKWNXz7JZ0PXAR8uwjkZ+Ay4GLg45b1520TdV2fY3tri6FT1zW2T0bEOuDLFs8ksBY4Wnam0zRExFW2Lw3bo0BqSXIF8E5d1+ScZyNimF7L9zUNDANHAWy/DNzYTGKbqqq2hKSRFggAKaWNKaWxbrfbh10J/AYYWN+HAC8Adw/KI+maAC6Z9w9f8DYRsTmltKvA/oqIoVLtTLE9B9w7CFLyXFABa1q6rQm71fZeSXdKOlSWVgKvAqOLQYpWBCw67+bDRiJiuW1yzgBnAwO3vSEF8P0SjMckrc45HyxbSM552vZ5wMElPH8iJH33L6ZJYIPtmW63i6T3Ukp7y2iZtT0E7B9YSu/8pwL4YhHILwUyXdc1EfGspJsiYiSltKvATtoesr3YC08EsGfA4mFJ64DjOWciYqekB+CfBkkpjZXz+jMiLpd0oJnENrbfjJzzEeDTFtCU7R9K0pck3ddMUFr/7RI6YfvrljzHIuKjqly1D9K7kufrOuC1MgNvaSvZNpJuBj6wPQ1sanokPSwJjY+P9wPPAI+0JTxdSXo3pbQRIKqqoqoqIuJR25+cQc5kRNxWzmjBVX4t8NkZgExFxAbgj36g7ZthGNj5PyBvAWslHZ8fbP0KknQ/sAXY9x8Ah4BttjfRm/CnaOCcs73b9m5JNwCjkq4G1gAriuV3euNrH/C+7T2DbgGAvwHNP28e196upwAAAABJRU5ErkJggg==" />
+                        </div>
+                    </div>
+                </div>
+                <div class="account-binding-btn">
+                    <div class="f-button absolute-center acb-button" onclick="bind()">绑定</div>
+                </div>
+            </div>
+        </div>
+        <div class="f-toast ellipsis" style="display: none">
+            <div class="f-toast-text"></div>
+        </div>
+        <div class="f-popup jsPop" style="display: none"></div>
+        <div class="f-loading">
+            <img src="/wap/resources/images/loading-2.gif" class="loading-icon" />
+            <div class="loading-txt">加载中...</div>
+        </div>
+    </div>
+<script>
+    function bind(){
+        let $loginName = $("#loginName").val();
+        if(!$loginName){
+            $(".f-toast").show().html("账号不能为空！");
+            hideMsg();
+            return;
+        }
+        let $password = $("#password").val();
+        if(!$password){
+            $(".f-toast").show().html("密码不能为空！");
+            hideMsg();
+            return;
+        }
+        let $openid = $("#openid").val();
+        if(!$openid || $openid == "null"){
+            $(".f-toast").show().html("缺失参数！");
+            hideMsg();
+            return;
+        }
+        $(".jsPop").show();
+        $(".f-loading").show();
+        let $url = "/wap/merchant/account/toBind"
+        $.ajax({
+            url:$url,
+            type:"post",
+            data:{"loginName":$loginName,"password":$password,"openid":$openid},
+            dataType:"json",
+            success:function (res){
+                $(".jsPop").hide();
+                $(".f-loading").hide();
+                $(".f-toast").show().html(res.message);
+                hideMsg();
+                if(res.code == 200){
+                    setTimeout("toLocation("+res.data+")",500);
+                }
+            },error:function (error){
+                $(".jsPop").hide();
+                $(".f-loading").hide();
+                $(".f-toast").show().html("系统异常");
+            }
+        })
+    }
+    $(document).keydown(function (event){
+        $(event.target).parent("div").next().show();
+    })
+    $(".f-input-icon").click(function (event){
+        let $data = $(event.currentTarget).data();
+        $("#"+$data.id).val("");
+        $(event.currentTarget).hide();
+    })
+    function toLocation(id){
+        window.location.href = `/wap/merchant/account/list/` + id;
+    }
+    function hideMsg(){
+        setTimeout(function (){
+            $(".f-toast").hide();
+        },1000)
+    }
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/templates/th_account_list.html b/pluss-wap-page/src/main/resources/templates/th_account_list.html
new file mode 100644
index 0000000..9385751
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/templates/th_account_list.html
@@ -0,0 +1,231 @@
+<!DOCTYPE html>
+<html lang="en" style="font-size: 16px;" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <meta charset="UTF-8">
+    <meta data-n-head="true" name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
+    <meta data-n-head="true" data-hid="description" name="description" content="商户公众号">
+    <meta data-n-head="true" http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate">
+    <meta data-n-head="true" http-equiv="Pragma" content="no-cache">
+    <meta data-n-head="true" http-equiv="Expires" content="0">
+    <title data-n-head="true">账号绑定</title>
+    <title>账号绑定</title>
+    <link rel="stylesheet" href="/wap/resources/css/weui.css">
+    <script src="/wap/resources/js/jquery.min.js"></script>
+    <style >
+        html {
+            font-family: Source Sans Pro,-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Arial,sans-serif;
+            word-spacing: .03125rem;
+            -ms-text-size-adjust: 100%;
+            -webkit-text-size-adjust: 100%;
+            -moz-osx-font-smoothing: grayscale;
+            -webkit-font-smoothing: antialiased;
+            -webkit-box-sizing: border-box;
+            box-sizing: border-box;
+        }
+        body{
+            background-color: #f3f3f3;
+            padding: 2rem 0 0 0;
+        }
+        .account-con{
+            width: 100%;
+
+        }
+        .account-logo img{
+            width: 100px;
+            height: 100px;
+            border-radius: 10px;
+        }
+        .account-title{
+            width: 100%;
+            margin-top: 30px;
+            text-align: center;
+        }
+        .account-con-list{
+            width: calc(100% - 3rem);
+            margin: 2rem auto 0 auto;
+        }
+        .account-list{
+            width: calc(100% - 40px);
+            display: flex;
+            flex-wrap: wrap;
+            border-bottom: 1px solid #f1f1f1;
+            padding: 10px 20px;
+            background-color: #fff;
+
+        }
+        .account-operation{
+            flex: 1;
+            text-align: right;
+        }
+        .account-button{
+            width: calc(100% - 60px);
+            background-color: #FD7663;
+            padding: 10px;
+            text-align: center;
+            border-radius: 10px;
+            margin: 4.5rem auto 0 auto;
+            color: #fff;
+        }
+        .account-logo{
+            height: 4.375rem;
+            margin-bottom: 1.46875rem;
+            text-align: center;
+        }
+        .account-logo img{
+            height: 100%;
+            width: auto;
+            border-radius: 5px;
+        }
+        .weui-switch:checked, .weui-switch-cp__input:checked ~ .weui-switch-cp__box {
+            border-color: #FD7663;
+            background-color: #FD7663;
+        }
+        .weui-switch, .weui-switch-cp__box{
+            width: 41px;
+            height: 22px;
+        }
+        .weui-switch:before, .weui-switch-cp__box:before {
+            width: 40px;
+            height: 20px;
+        }
+        .weui-switch:after, .weui-switch-cp__box:after {
+            width: 20px;
+            height: 20px;
+        }
+        .f-toast{
+            z-index: 99;
+            position: fixed;
+            top: 48%;
+            left: 50%;
+            max-width: 80%;
+            min-width: 10.375rem;
+            padding: .78125rem .625rem .625rem;
+            border-radius: .3125rem;
+            -webkit-box-sizing: border-box;
+            box-sizing: border-box;
+            text-align: center;
+            background: rgba(51,51,51,.7);
+            color: #fff;
+            -webkit-transform: translate(-50%,-50%);
+            transform: translate(-50%,-50%);
+        }
+        .f-toast .f-toast-icon{
+            height: .96875rem;
+            margin-bottom: .71875rem;
+        }
+        .f-toast .f-toast-icon img{
+            width: auto;
+            height: 100%;
+        }
+        .f-popup{
+            z-index: 0;
+            position: fixed;
+            top: 0;
+            left: 0;
+            overflow: hidden;
+            width: 100%;
+            height: 100%;
+            background-color: rgba(0,0,0,.7);
+        }
+        .f-loading{
+            position: fixed;
+            z-index: 1;
+            top: 40%;
+            left: 37%;
+            padding: 1rem 1rem;
+            display: none;
+            border-radius: 5px;
+            background-color: #fff;
+        }
+        .loading-icon{
+            margin: 0 0 0 .8rem;
+        }
+        .loading-txt{
+            margin-top: .5rem;
+        }
+    </style>
+</head>
+<body>
+    <div class="container">
+<!--        <div class="nuxt-progress"></div>-->
+        <input type="hidden" name="userAppId" id="userAppId" th:value="${userAppId}">
+        <div class="content">
+            <div class="account-con">
+                <div class="account-logo">
+                    <img src="https://www.shouyinbei.net/resources/images/logo.png" alt="">
+                </div>
+                <div class="account-title">收款就用收银呗</div>
+                <div class="account-con-list">
+                    <div class="account-list" th:each="user:${list}">
+                        <div class="account-name" th:text="${user.alias}"></div>
+                        <div class="account-operation">
+                            <input class="weui-switch" onchange="setIsPushStatus(this)" th:value="${user.isPushWxMessage}" th:attr="data-mcode=${user.merchantCode},checked=${user.isPushWxMessage == '1' ? 'true' : 'false'}" type="checkbox"/>
+                        </div>
+                    </div>
+                </div>
+                <div class="account-button">
+                    解绑
+                </div>
+            </div>
+        </div>
+        <div class="f-toast ellipsis" style="display: none">
+            <div class="f-toast-text"></div>
+        </div>
+        <div class="f-popup jsPop" style="display: none"></div>
+        <div class="f-loading">
+            <img src="/wap/resources/images/loading-2.gif" class="loading-icon" />
+            <div class="loading-txt">加载中...</div>
+        </div>
+    </div>
+    <script>
+        $(".account-button").click(function (event){
+            let $userAppId = $("#userAppId").val();
+            $(".jsPop").show();
+            $(".f-loading").show();
+            let $url = `/wap/merchant/account/unBind/${$userAppId}`;
+            $.post($url,function (res){
+                $(".jsPop").hide();
+                $(".f-loading").hide();
+                $(".f-toast").show().html(res.message);
+                if(res.code == 200){
+                    let openid = res.data;
+                    setTimeout(function (){
+                        if(openid == "null" || !openid){
+                            window.location.href = `/wap/merchant/account/auth`;
+                        }else{
+                            window.location.href = `/wap/merchant/account/bind?openId=${openid}`;
+                        }
+                    },500);
+                }
+            })
+        })
+        // function toLocation(openid){
+        //     if(openid == "null" || !openid){
+        //         window.location.href = `/wap/merchant/account/auth`;
+        //     }else{
+        //         window.location.href = `/wap/merchant/account/bind?openId=${openid}`;
+        //     }
+        // }
+        function setIsPushStatus(obj){
+            $(".jsPop").show();
+            $(".f-loading").show();
+            let $val = obj.value == 1 ? 0 : 1;
+            let $userAppId = $("#userAppId").val();
+            let $merchantCode = $(obj).data("mcode");
+            $(obj).val($val);
+            let $url = `/wap/merchant/account/unBindSend`;
+            $.post($url,{"userAppId":$userAppId,"merchantCode":$merchantCode,"isPushWxMessage":$val},function (res){
+                $(".jsPop").hide();
+                $(".f-loading").hide();
+                $(".f-toast").show().html(res.message);
+                hideMsg();
+            })
+        }
+        function hideMsg(){
+            setTimeout(function (){
+                $(".f-toast").hide();
+            },1000);
+        }
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/templates/th_alipay.html b/pluss-wap-page/src/main/resources/templates/th_alipay.html
new file mode 100644
index 0000000..63e984f
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/templates/th_alipay.html
@@ -0,0 +1,55 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <title></title>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0,user-scalable=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="apple-mobile-web-app-title" content="">
+    <meta name="HandheldFriendly" content="true">
+    <meta name="format-detection" content="telephone=no">
+    <script src="/wap/resources/js/jquery.min.js"></script>
+    <script src="https://gw.alipayobjects.com/as/g/h5-lib/alipayjsapi/3.1.1/alipayjsapi.min.js"></script>
+</head>
+<body>
+<input type="hidden" id="orderNumber" name="orderNumber" th:value="${orderNumber}">
+<input type="hidden" id="appId" name="appId" th:value="${appId}">
+<script>
+    $(function() {
+        if (/AlipayClient/.test(window.navigator.userAgent)) {
+            // let $url = "/wap/aliPay/getAuthOpenId";
+            let orderNumber = $("#orderNumber").val();
+            let $payUrl = "/wap/aliPay/orderPay"
+            let $appid = $("#appId").val();
+            if(!$appid){
+                $appid = "2019092967932477";
+            }
+            ap.showLoading({
+                content: '加载中...'
+            });
+            ap.getAuthCode({
+                appId: $appid,
+                scopes: ['auth_base'],
+            }, function(res) {
+                let authCode = res.authCode;
+                $.post($payUrl,{"authCode":authCode,"orderNumber":orderNumber},function (res){
+                    ap.hideLoading();
+                    if(res.code != 200){
+                        ap.alert({title: '提示',content: res.message,buttonText: '确定'});
+                        return;
+                    }else{
+                        ap.tradePay({
+                            tradeNO : res.data.source
+                        }, function(res) {
+                            AlipayJSBridge.call('closeWebview');
+                        });
+                    }
+                })
+            });
+        }
+    })
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/templates/th_device_pay.html b/pluss-wap-page/src/main/resources/templates/th_device_pay.html
new file mode 100644
index 0000000..29d3a06
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/templates/th_device_pay.html
@@ -0,0 +1,295 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <meta charset="utf-8">
+    <meta content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=no" name="viewport">
+    <meta content="yes" name="apple-mobile-web-app-capable">
+    <meta content="black" name="apple-mobile-web-app-status-bar-style">
+    <meta content="telephone=no" name="format-detection">
+    <meta content="email=no" name="format-detection">
+    <script src="https://www.shouyinbei.net/resources/js/alipayjsapi.min3.1.1.js"></script>
+    <title>向商户付款</title>
+    <style>
+        * {
+            padding: 0;
+            margin: 0;
+        }
+        html,body{
+            width:100%;
+            height:100%;
+            margin:0 auto;
+            padding:0px;
+            background-color:#EFEFF4;
+        }
+        .main{
+            margin: 0 .6rem;
+            background-color: #fff;
+            padding: 0 .8rem;
+            min-height: 20rem;
+            border-radius: 0 0 .2rem .2rem;
+            padding: .8rem;
+        }
+        .div-item{
+            display: flex;
+            justify-content: space-between;
+            line-height: 3rem;
+        }
+        .item-label{
+            color: #989898;
+            font-size: .8rem;
+        }
+        .item-hr{
+            border-bottom: 1px solid #e8e6e6;
+        }
+        .div-item-body{
+            text-align: center;
+            line-height: 2rem;
+            padding: 1.5rem 0;
+        }
+        .item-amt{
+            font-size: 32px;
+        }
+        .item-icon-item{
+            font-size: 20px;
+        }
+        .item-content{
+            height: 17rem;
+        }
+        .btn{
+            text-align: center;
+        }
+        .pay-btn{
+            height: 2.3rem;
+            width: 80%;
+            border: none;
+            border-radius: 5px;
+            background-color: #ff2d4b;
+            color: #fff;
+        }
+        .div-item-time{
+            text-align: center;
+        }
+        .item-label-name{
+            color: #666;
+        }
+        .times-item{
+            background-color: #ff2d4b;
+            padding: 0 4px;
+            color: #fff;
+            border-radius:4px;
+        }
+        .pay-btn:active{
+            background: #ff2d4b;
+            opacity: 0.5;
+        }
+        .disabled{
+            background-color: #ff2d4b61;
+        }
+        .shade{
+            display: none;
+            position: absolute;
+            top: 0;
+            left: 0;
+            width: 100%;
+            height: 100%;
+            background-color: rgba(0,0,0,.1);
+            z-index: 1002;
+            overflow: auto;
+        }
+        .loading{
+            z-index: 10000;
+            position: absolute;
+            width: 100%;
+            display: none;
+            margin: 40px 0;
+            top: 30%;
+        }
+        .loading-body{
+            width: 30%;
+            text-align: center;
+            margin: 0 auto;
+            padding: .4rem 0;
+            background-color: #fff;
+            border-radius: 4px;
+        }
+        .loading-icon{
+            background-image: url(data:image/gif;base64,R0lGODlhIAAgALMAAP///7Ozs/v7+9bW1uHh4fLy8rq6uoGBgTQ0NAEBARsbG8TExJeXl/39/VRUVAAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQFBQAAACwAAAAAIAAgAAAE5xDISSlLrOrNp0pKNRCdFhxVolJLEJQUoSgOpSYT4RowNSsvyW1icA16k8MMMRkCBjskBTFDAZyuAEkqCfxIQ2hgQRFvAQEEIjNxVDW6XNE4YagRjuBCwe60smQUDnd4Rz1ZAQZnFAGDd0hihh12CEE9kjAEVlycXIg7BAsMB6SlnJ87paqbSKiKoqusnbMdmDC2tXQlkUhziYtyWTxIfy6BE8WJt5YEvpJivxNaGmLHT0VnOgGYf0dZXS7APdpB309RnHOG5gDqXGLDaC457D1zZ/V/nmOM82XiHQjYKhKP1oZmADdEAAAh+QQFBQAAACwAAAAAGAAXAAAEchDISasKNeuJFKoHs4mUYlJIkmjIV54Soypsa0wmLSnqoTEtBw52mG0AjhYpBxioEqRNy8V0qFzNw+GGwlJki4lBqx1IBgjMkRIghwjrzcDti2/Gh7D9qN774wQGAYOEfwCChIV/gYmDho+QkZKTR3p7EQAh+QQFBQAAACwBAAAAHQAOAAAEchDISWdANesNHHJZwE2DUSEo5SjKKB2HOKGYFLD1CB/DnEoIlkti2PlyuKGEATMBaAACSyGbEDYD4zN1YIEmh0SCQQgYehNmTNNaKsQJXmBuuEYPi9ECAU/UFnNzeUp9VBQEBoFOLmFxWHNoQw6RWEocEQAh+QQFBQAAACwHAAAAGQARAAAEaRDICdZZNOvNDsvfBhBDdpwZgohBgE3nQaki0AYEjEqOGmqDlkEnAzBUjhrA0CoBYhLVSkm4SaAAWkahCFAWTU0A4RxzFWJnzXFWJJWb9pTihRu5dvghl+/7NQmBggo/fYKHCX8AiAmEEQAh+QQFBQAAACwOAAAAEgAYAAAEZXCwAaq9ODAMDOUAI17McYDhWA3mCYpb1RooXBktmsbt944BU6zCQCBQiwPB4jAihiCK86irTB20qvWp7Xq/FYV4TNWNz4oqWoEIgL0HX/eQSLi69boCikTkE2VVDAp5d1p0CW4RACH5BAUFAAAALA4AAAASAB4AAASAkBgCqr3YBIMXvkEIMsxXhcFFpiZqBaTXisBClibgAnd+ijYGq2I4HAamwXBgNHJ8BEbzgPNNjz7LwpnFDLvgLGJMdnw/5DRCrHaE3xbKm6FQwOt1xDnpwCvcJgcJMgEIeCYOCQlrF4YmBIoJVV2CCXZvCooHbwGRcAiKcmFUJhEAIfkEBQUAAAAsDwABABEAHwAABHsQyAkGoRivELInnOFlBjeM1BCiFBdcbMUtKQdTN0CUJru5NJQrYMh5VIFTTKJcOj2HqJQRhEqvqGuU+uw6AwgEwxkOO55lxIihoDjKY8pBoThPxmpAYi+hKzoeewkTdHkZghMIdCOIhIuHfBMOjxiNLR4KCW1ODAlxSxEAIfkEBQUAAAAsCAAOABgAEgAABGwQyEkrCDgbYvvMoOF5ILaNaIoGKroch9hacD3MFMHUBzMHiBtgwJMBFolDB4GoGGBCACKRcAAUWAmzOWJQExysQsJgWj0KqvKalTiYPhp1LBFTtp10Is6mT5gdVFx1bRN8FTsVCAqDOB9+KhEAIfkEBQUAAAAsAgASAB0ADgAABHgQyEmrBePS4bQdQZBdR5IcHmWEgUFQgWKaKbWwwSIhc4LonsXhBSCsQoOSScGQDJiWwOHQnAxWBIYJNXEoFCiEWDI9jCzESey7GwMM5doEwW4jJoypQQ743u1WcTV0CgFzbhJ5XClfHYd/EwZnHoYVDgiOfHKQNREAIfkEBQUAAAAsAAAPABkAEQAABGeQqUQruDjrW3vaYCZ5X2ie6EkcKaooTAsi7ytnTq046BBsNcTvItz4AotMwKZBIC6H6CVAJaCcT0CUBTgaTg5nTCu9GKiDEMPJg5YBBOpwlnVzLwtqyKnZagZWahoMB2M3GgsHSRsRACH5BAUFAAAALAEACAARABgAAARcMKR0gL34npkUyyCAcAmyhBijkGi2UW02VHFt33iu7yiDIDaD4/erEYGDlu/nuBAOJ9Dvc2EcDgFAYIuaXS3bbOh6MIC5IAP5Eh5fk2exC4tpgwZyiyFgvhEMBBEAIfkEBQUAAAAsAAACAA4AHQAABHMQyAnYoViSlFDGXBJ808Ep5KRwV8qEg+pRCOeoioKMwJK0Ekcu54h9AoghKgXIMZgAApQZcCCu2Ax2O6NUud2pmJcyHA4L0uDM/ljYDCnGfGakJQE5YH0wUBYBAUYfBIFkHwaBgxkDgX5lgXpHAXcpBIsRADs=);background-size:100% 100%;
+            height: 30px;
+            width: 30px;
+            margin: 10px auto;
+        }
+    </style>
+</head>
+<body>
+<div class="body">
+    <div class="main">
+        <div class="item-content">
+            <div class="div-item">
+                <label class="item-label">商户</label>
+                <div class="item-name" th:text="${storeName}"></div>
+            </div>
+            <div class="item-hr"></div>
+            <div class="div-item">
+                <label class="item-label">订单总额</label>
+                <div class="item-name">￥<span th:text="${payAmt}"></span></div>
+            </div>
+            <div class="div-item-body">
+                <label class="item-label">您需要支付</label>
+                <div class="item-name item-amt"><span class="item-icon-item">￥</span><span th:text="${payAmt}"></span></div>
+            </div>
+            <div class="div-item-time">
+                <div class="times">
+                    <input type="hidden" id="overtime">
+                    <label class="item-label-name">支付剩余</label>
+                    <span class="times-item minute" id="minute" th:text="${min}"></span> :
+                    <span class="times-item second" id="second" th:text="${sec}"></span>
+                </div>
+            </div>
+        </div>
+        <div class="btn">
+            <button class="pay-btn" onclick="pay()">立即支付</button>
+        </div>
+    </div>
+    <div id='shade' class="shade"></div>
+
+    <div class="loading" id="loading">
+        <div class="loading-body">
+            <div class="loading-icon">
+            </div>
+            <div class="loading-msg">
+                支付中...
+            </div>
+        </div>
+    </div>
+
+    <input type="hidden" id="tk" th:value="${tk}">
+    <input type="hidden" id="userId" th:value="${userId}">
+    <input type="hidden" id="payWay" th:value="${payWay}">
+</div>
+</body>
+<script src="/wap/resources/js/jquery.min.js"></script>
+<script type="text/javascript">
+    (function (doc, win) {
+        var docEl = doc.documentElement,
+            resizeEvt = 'orientationchange' in window ? 'orientationchange' : 'resize',
+            recalc = function () {
+                var clientWidth = docEl.clientWidth;
+                if (!clientWidth) return;
+                docEl.style.fontSize = 16 * (clientWidth / 320) + 'px';//其中“20”根据你设置的html的font-size属性值做适当的变化
+            };
+
+        if (!doc.addEventListener) return;
+        win.addEventListener(resizeEvt, recalc, false);
+        doc.addEventListener('DOMContentLoaded', recalc, false);
+    })(document, window);
+</script>
+<script>
+    let index = setInterval("countDown()",1000);
+    // tradePay();
+    let countDown = function (){
+        let minute = $("#minute").html();
+        let second = $("#second").html();
+        if(minute == "00" && second == "00"){
+            clearInterval(index);
+            disablePay();
+        }else{
+            if(second == "00"){
+                second = 59;
+                minute = parseInt(minute) - 1;
+                if(minute < 10){
+                    minute = "0" + minute;
+                }
+            }else if(parseInt(second) <= 10){
+                second = "0"+(parseInt(second) - 1);
+            }else{
+                second = parseInt(second) - 1;
+            }
+            $("#minute").html(minute);
+            $("#second").html(second);
+        }
+    }
+    function disablePay(){
+        $(".pay-btn").addClass("disabled").removeAttr("onclick").attr("disabled",true);
+    }
+    let pay = function (){
+        tradePay();
+    }
+    function tradePay(){
+        let tk = $("#tk").val();
+        let userId = $("#userId").val();
+        let payWay = $("#payWay").val();
+
+        $("#shade").show();
+        $("#loading").show();
+        $.ajax({
+            url : '/wap/merchant/tradePay',
+            data : {
+                "tk" : tk,
+                "payWay" : payWay,
+                "userId" : userId
+            },
+            dataType : "json",
+            type : "post",
+            success : function(res) {
+                $("#shade").hide();
+                $("#loading").hide();
+                if (res.code == 200) {
+                    var rdata = res.data;
+                    if("WXZF" == payWay){
+                        WeixinJSBridge.invoke('getBrandWCPayRequest', {
+                            // 商品名称
+                            "appId" : rdata.payAppId,
+                            "timeStamp" : rdata.payTimeStamp,
+                            "nonceStr" : rdata.paynonceStr,
+                            "package" : rdata.payPackage,
+                            "signType" : rdata.paySignType,
+                            "paySign" : rdata.paySign,
+                        }, function(res) {
+                            if (res.err_msg == "get_brand_wcpay_request:ok" || res.err_msg == "stopMonitoringBeacons:ok") {
+                                //成功之后跳转地址
+                                window.location = '/wap/merchant/jumpUrl?orderNumber='+rdata.orderNumber;
+                            } else {
+                                cancelPay(rdata.orderNumber);
+                                alert("支付失败");
+                            }
+                        })
+                    }else if("ZFBZF" == payWay){
+                        var reg=/^([hH][tT]{2}[pP]:\/\/|[hH][tT]{2}[pP][sS]:\/\/)(([A-Za-z0-9-~]+).)+([A-Za-z0-9-~\/])+$/;
+                        if(reg.test(rdata.source)){
+                            window.location = rdata.source;
+                        }else{
+                            ap.tradePay({
+                                tradeNO : rdata.source
+                            }, function(res) {
+                                if (res.resultCode == '9000') {
+                                    window.location = '/wap/merchant/jumpUrl?orderNumber='+rdata.orderNumber;//订单支付成功
+                                } else if (res.resultCode == '8000') {
+                                } else if (res.resultCode == '4000') {
+                                    cancelPay(rdata.orderNumber);
+                                    ap.alert("订单支付失败");
+                                } else if (res.resultCode == '6001' || res.resultCode == '99') {
+                                    cancelPay(rdata.orderNumber);
+                                } else if (res.resultCode == '6002') {
+                                    cancelPay(rdata.orderNumber);
+                                    ap.alert("网络连接出错");
+                                }
+                            });
+                        }
+                    }else{
+                        window.location = rdata.redirectUrl;
+                    }
+                } else {
+                    alert(res.message);
+                }
+            }
+        })
+    }
+
+    function cancelPay(m) {
+        var url =  "/wap/merchant/cancelPay/"+m;
+        $.get(url, (res)=>{
+            console.log(res);
+        })
+    }
+</script>
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/templates/th_index.html b/pluss-wap-page/src/main/resources/templates/th_index.html
new file mode 100644
index 0000000..8bbe6c0
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/templates/th_index.html
@@ -0,0 +1,736 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <meta charset="utf-8">
+    <meta content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=no" name="viewport">
+    <meta content="yes" name="apple-mobile-web-app-capable">
+    <meta content="black" name="apple-mobile-web-app-status-bar-style">
+    <meta content="telephone=no" name="format-detection">
+    <meta content="email=no" name="format-detection">
+    <!--    <link rel="stylesheet" href="https://act.weixin.qq.com/static/cdn/css/wepayui/0.1.1/wepayui.min.css">-->
+    <script src="https://www.shouyinbei.net/resources/js/alipayjsapi.min3.1.1.js"></script>
+    <title>向商户付款</title>
+    <style>
+        * {
+            padding: 0;
+            margin: 0;
+        }
+        html,body{
+            width:100%;
+            height:100%;
+            margin:0 auto;
+            padding:0px;
+            background-color:#EFEFF4;
+        }
+        .payinfo{
+            display: block;
+            position: absolute;
+            bottom: 0;
+            height: 13rem;
+            width: 100%;
+            overflow: hidden;
+            transition: .4s;
+        }
+        table{
+            width:100%;
+            height: 91%;
+            bottom: 0;
+            background-color:white;
+        }
+        table tr{
+            height: 25%;
+        }
+        table tr td{
+            text-align:center;
+            width:24.9999999%;
+            border-right:1px solid #D9D9D9;
+            border-bottom:1px solid #D9D9D9;
+        }
+        table tr td:active{
+            background-color:#ECECEC;
+        }
+        .keybord-return,.keybord-stop{
+            width:30px;
+            height:30px;
+            margin:0px auto;
+            color:white;
+        }
+        .keybord-return{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADICAMAAACahl6sAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAALpQTFRFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAqyRq8wAAAD10Uk5TAAM/gJ+efz5Q2ddPAouKAZZ8nP0vrfcLN03+GcxYu9gSGkCBndobPbe8+QonMuCH7xOIW0fNtCwra4NgHN+ehK8AAAABYktHRACIBR1IAAAACXBIWXMAAABIAAAASABGyWs+AAAB4UlEQVR42u3c51LCQBiF4Y2IgDQVRcWCvffe9v5vS2FGhSH5kTLzney8zxWcd3ZD+BXnAAAAAAAAAAAAgFSiucp8daEWWe/Iq97wY4tN6yW5tNr+T6drvSa77pKfsGw9J7PWymSH761aDyqmw/s160XZTN+rkf669aYsZs7jx4b1qII6/Kb1qvRm79VIzXpWarHn4Qdb1ruK6fDb1rvSir9X3u9YD0sp4Tz8bst6WTEdwz3rZekk3avGvvUyOuiwR4cWOrTQoYUOLXRooUMLHVro0EKHFjq00KGFDi10aKFDCx1a6NBChxY6tNChhQ4tdIhpx3cMy9ZRD6QjaoTR4Q7CeD6cOwzjPJyrhnEezh3FhByfWK/KoBLK1TqNfdhLeCbRMJCfX9cM5IXoXCeUkqQ/jeV7TijRQ4keSvRQoocSPZTooUQPJXoo0UOJHkr0UKKHEj2U6KFEDyV6KNFDiR5K9FCihxI9lOgJpySUD04ml5yV7jPlSberfN8tTjiTc+tdRZVcXFrvSi/+dl1Zz8og9kyurVcVVVK6b2KPzd6uG+tJGc2cya31ooJK7u6tB2U2dbt65Xsf/ms9DH47+o/WY/J5eh5nDF5erZfk9vb+Ufn8sl4BAAAAAAAAAAAAY9/5YLt8mhkMlgAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAyMC0wNy0wNFQxNTowMjo0OSswODowMMIgQKAAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMjAtMDctMDRUMTU6MDI6NDkrMDg6MDCzffgcAAAAR3RFWHRzdmc6YmFzZS11cmkAZmlsZTovLy9ob21lL2FkbWluL2ljb24tZm9udC90bXAvaWNvbl91ZmVhaXVpd2lrZy9iYWNrLnN2Z4Ft+LMAAAAASUVORK5CYII=); background-size:100% 90%; }
+        .keybord-stop{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAgAAAAIACAMAAADDpiTIAAAAA3NCSVQICAjb4U/gAAAACXBIWXMAAA3lAAAN5QHm6mmvAAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAAWtQTFRF////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAR9G26gAAAHh0Uk5TAAECAwQFBgcICQsMDQ4PEBMUFRcaHyEiJiwuLzAyMzQ1Nj0+P0JGR0pNUFZXW11eYmZnaG1ub3F3eH6Ag4SFhomMj5WWmJmgoqWmp6usrrGytLq9vsLDxsnKy87P0NLT1dfZ3N7i4+Tl5unr7O/w8vX29/n6+/3+X88dAwAACGRJREFUeNrt3Y1/jfUfx/HvSFbKXaxVilVCq4lFIRRRQm6SkbsYs9pqbcr682PkdtfsOlOPc6738/UHXI/f4/N+/kp2zrVS5tvyvoF9x4cuXx+b+ltt2tTY9ctDx/cN9C0vz7dV/YeHnbeTGj7cv+p5rf/67ovTLtp5TV/c/frC11+x7axTdm5nt61Y0Pyv7p90xM5ucv+rLc+/ZMeYA3Z+YzuWtLZ/vz/3NaTh/hbmf++cwzWnc+/VnL/3pKM1q5O9dfbfMuFiTWtiy/z333XbvZrX7V3znL/7iGM1syPd89l/zXmXamrn1zx7/w2j7tTcRjc8a/+P/ayv0U19/Iz9najpzSlgg///N/+fAXP8W2CNf/8HNFr5J8Fuf/6P6HzVfw367/+QjlT8/Z/LpDTr3wlu8fe/Md2e5ecCvX7+E9TE0z8b9PPfqE4+9fkPN8nqyU+InHOSrM498fk/F0nrsc8JLvH5z7iGH/2s8A73yGvHI9//8Pn/wMYefmNkv2sktv/B9/98/yuyyX+/N7jNLTLbdh+A7/+Gdvb+9/9dIrV77w/Y7RCp7Z4BcNEhUrs48/4f73+JbXqVHwNkd/cHAoedIbfDdwD4OVBww6Usd4Xklpc+R0iurww4QnIDZZ8jJLevHHeE5I6XIUdIbqhcdoTkLpfrjpDc9eLjgNGNFe8EiW6quEF2AAAgAASAABAAAkAACAABIAAEgAAQAAJAAAgAASAABIAAEAACQAAIgJmmLtWv8mHj9Z91rfJhI/UfNlL5sGv1HzZe+bAWTjbVtgAulfpVPuxQ/Wetq3zYYP2HDVY+bF39hx2qHqB+lwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA1JEBAIAAEAACQAAIAAEgAASAABAAAkAACAABIAAEgAAQAAJAAAgAASAAZho/VL/Kh/1c/1nHKh/2Y/2H/Vj5sGP1H/Zz5cNaONl42wLw1TDfDQQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADg/wRwbV39Kh92rP6zPqp82N76D9tb+bCP6j+s+pfZtHCya20LQJ0XAAAIAAEgAASAABAAAkAACAABIAAEgAAQAAJAAAgAASAABIAAEAACQAAIAAEgAASAABAAAkAACAABIAAEgAAQAAJAAAgAASAABIAAEAACQAAIgLu18Euj2rdDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AfzVrv/Lxi81qPF2vfJf5be2tan/od/KiCMkN1KuOkJyV8tPjpDcT+W0IyR3uhx0hOQOlk8dIblPyweOkNwHZa0jJLe2dE24Qm4TXaWccobcTpVSPnOG3D67A+BNZ8jtzTsAun51h9R+7br7s+pvHSK1b2c+rLDJIVLbNANg8S8ukdkvi+99Xukrp8jsq/sfWHvLKTJ769+PLJ5xi8TOPPjM6vpp18hrev3DTy0fdY68jj7ysfWeW+6R1q2eR7+4cMBB0jrw2DdXVv7uIln9vvLx7y597iRZff7El9e6b7hJUje6n/z64oCjJDXw9BdYv3GVnL6Z5RvMS4fcJaWhpbN9h/013xMNaeS12d9i8Pak2yQ0+XbVeyz6HSeh/uo3mXzhOs3vizleZdP1vfs0ve+75nqZ0cs+GtDwzrw89+usXvB18UZ38IVnvtFs8E9namp/Ds7nnXbvt+07zbSwxt+f31sNe664VRO70jPf91ouO+FazevEsvm/2bRrj8+INaxbe7pqvdy25zufFG5Q09/1lLq9468EGtOZd1p6xfVmfxhsRFc2t/qS80Wf3HS+Tu/mJ4sW8J77l3ZecMJO7sLOlxb6uw7e+NI/Bjr1//xfvvFcft3For5dp/9wzs7qj9O7+haV59eL7+78+odRd+2ERn/4eue7L/4nv/rmld71Gz/cun1Qbdn2rR9uXN/7SpEkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZKkuq1u0i9zWW3P+u1pzq9x2mPNaAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAen7/wNF3uGEUW54AwAAAABJRU5ErkJggg==); background-size:100% 100%;}
+        .pay{
+            color:#ffffff;
+            font-size:120%;
+            background-color:#df6051;
+        }
+        .pay:active{
+            /*background-color: #df6051;*/
+            background-color: rgba(223,96,81,0.7);
+        }
+        .shouyin{
+            text-align: center;
+            color: #9b9b9b;
+            font-size: 13px;
+            margin-bottom: 10px;
+        }
+        .logo{
+            background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAD70lEQVRoQ9VaTYgURxT+Xm8w7PQs6CFgXDCXEAKeFHKLRKMo6HoSc0qmqlfxICSn/KCXmIMuiZ4UBEG3q+aokItKiGSTDZ5CIHtK9LAXhRVJDoZs9ywR7CfVuzPMzM5sV/X0MNt92Z7q9773vu2qej/VhIKuSIgDBO8AgEkCTybApLlfg1/ygCUGLSH9m8xVtZ4rwjQNAhLXgikQjgE8BWCHI9ZTgO6Cccevh3cddVvizgT4zJnqSqMRMFMA8O68hjv1aIGIw/FKJaRr1yIXTGsCkZTbx5iChJNpEL3tYsRalnnRI2/2JXFYVeqZjZ4VgVjK95hRJ+BdG9BBZRh4RISar9TvWViZBFZq0/sTSn7OAhrGc4+9D8frs79shL0hgUiIgECzw3DOFpPB01Wtw37yfQlEQnxJoG9tDQ1TjsFfVbX+rpeNngRiIU4CdGOYTrlj8ylf65vdeusIxEIcTffnTXnxlK/1vXbXOgiYrZKYHwBD2iYH/qfwIhPtbd9iOwisiOBsAr44sJ0hAnigc+M6nGmaaBEwEbYRxQtDC1JFkWJerFT93c2I3SLQkPJTZlwpys4wcYjwWUWpq8ZGi0Asgj9cchsC5l8yfi3C0THCBwzss8eiBV+He1oEIiEOEehHewAgYXwzUVfnXXT6yS7X5HmP8LULFoMPV7W+n76BhhCXGPS5C8Bo34CZOny5ovUXKYFYyMcAdroScJHPknWbQinaE1+rt6jxyfT77CUPsgx0BY/5ilb7XXSyZGMh/wewJUuuw4/E20uxCC4CfNZJkXC8otT3LjpZsrGUF8A4lyXX+ZxmDAENcM1F0dcqMw13wUun8cen38TYi6duelSnhpA/MWCKcdvrpq/VKVthF7lYSJODHbXVIWCOIiEfulRaDD5YVEeh29HVJgHfsSWQVm6RkP8RMGGr9IKwbZtS/7bLLwfBG+b3RBj+M8j4cym3bmE8t/WFgWVnAuDkiF+v/9DhqAlESH4bdLwh5Qlm3HIl4DSFDDgRPqooddvctxstatyBwKM8i7iJ/+faza4ug0WNZ/JIF3GebdQgJ4Q0kHmMDbsGWV4MhkP1XIHMOGViwbKU+4ogMKHUfCwkZ5Fd/5xmcqUSm4UAmVQijYI5krlN8AZWk7l0J8mRTo+aQEc6naegGTWBjoJmdRq5lZSjJdBVUq4FJKei/jWPdr0ehn+57xzrNUwq4iX8ty1Wz6I+R1vlfkJo9WdsjfeSI8Z1At6xwujXVjHKpW5sGQKlby2uLuYSN3ebc7DU7fUmiVIfcLSRKO8RU5NEqQ/5WmuizMesrelU5oPu9ghZ2k8NeoX5Un7s0S9fGdXnNq8Aors/k02FsxcAAAAASUVORK5CYII=);background-size:100% 100%;
+            width: 2.1875rem;
+            height: 2.1875rem;
+        }
+        .icon{
+            background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAC7UlEQVRYR72WTWgTURDH/7ObJi1YENFT4kVtD/YgSMFaaOrbpfYgeElaURA8CIKKIAhCQYyCIAiC0KLgodBDwUqhiODB8N42RfFQEYoVBUGRCiKioPUjNbsjK4mk2ySbTTe+687O7/dm3hehiSOXy+20bXuEiAQzTwkhznpx1Cx+ET4FoKuMMSaEOF3ObIpAFfhfruM4l0zTzJQkmiIwNze3y7btKWbuXFNyoh/RaHRzb2/vT/db6AKWZd1h5tsAlgHcBZDwSHxLJBJbOjo68qELSCkniegwgC8A9gPYQETTzLypJNG0FkgpJ4joaNlsX2qadpCIttm2PQOglZlvGoZxMvRFqJQaB3DM229mzsVisaF8Pr8XwCHDMI6Evg2VUm6/j1fbzkR0Lx6PD5d6HqqAUuoWgBM+Z8n07OzscCaTcSrFNbwLlFKjAE75wGfa29uHu7u7f1etUCMnoWVZN5j5jM+/9wEMCSF+1YoLXAEp5XUiWnOmeyAPVlZWhgYHB7/7TTCQgFLqGoBzPkkftrW1pXt6er76wQMdREqpqwDO1ywnkdR1Pd3X1+ceRHWNuiogpbxCRCO1Mrp7nohSQohPdZGLQb4CUsrLRHTBJ+kjAGkhxIcg8JotyGazndFoNOLeap473ct44jhO2jTN90HhNQUsy3JX+pKmaYs1JOYLhUJqYGDgXSPwmgJKqSwAk5kPRCKRtxUknmmalurv73/TKLyqQPFFs1hK7DjOnpaWluWSBBEtMLO74F6vB15VQCl1EcC/Z5MbGIlEtjNza/GlkzIM49V64VUFpJRPiWi3F1AoFDbGYrF4Mpl8EQa8ooC3/EXQvOM4E5qmjQsh3KdWaGPNOVBefiKatG17zDTNx6ERPYkqCTwHMCqEcO/6po9VAm75w+xvPfarBJRS7hN6Rz0/BonRdf1jtYl5BThI4iCxuq53VZL4bwIAtgohlrzSlRbhviAzqydW1/XPyWRyoVKs73VcD2A9MX8AVWwjMF0q1kMAAAAASUVORK5CYII=);background-size:100% 100%;
+            width: .9375rem;
+            height: .9375rem;
+        }
+        .body{
+            padding: 2rem 1rem;
+        }
+        .store-info{
+            display: flex;
+            align-items: center;
+        }
+        .name{
+            margin-left: .5rem;
+        }
+        .main-amt{
+            height: 3rem;
+            padding: 1.2rem 0 0 0;
+        }
+        .amt-content {
+            display: flex;
+            background: #fff;
+            padding: .5rem 1rem;
+            border-radius: 4px;
+            height: 2.5rem;
+            font-size: 1.125rem;
+        }
+        .input-label {
+            flex: 1;
+            line-height: 2.5rem;
+        }
+        .input-box {
+            line-height: 2.5rem;
+            font-size: 1.5625rem;
+            color: #777;
+        }
+        .gb {
+            display: inline-block;
+            width: 2px;
+            height: 1.875rem;
+            margin-top: -6px;
+            background: #df6051;
+            vertical-align: middle;
+            animation: gb 1.3s infinite;
+        }
+        .money-input {
+            font-weight: bold;
+            color: #df6051;
+        }
+        @keyframes gb {
+            from {
+                opacity: 1;
+            } to {
+                  opacity: 0;
+              }
+        }
+        .remark-info{
+            display: flex;
+            align-items: center;
+            font-size: 13px;
+            color: #9e9e9e;
+        }
+        .set-remark{
+            margin-left: 5px;
+        }
+        .main-title{
+            display: flex;
+            justify-content: space-between;
+        }
+
+        .shade{
+            display: none;
+            position: absolute;
+            top: 0;
+            left: 0;
+            width: 100%;
+            height: 100%;
+            background-color: rgba(0,0,0,.1);
+            z-index: 1002;
+            overflow: auto;
+        }
+        .dialog{
+            z-index: 8888;
+            height: 13rem;
+            width: 100%;
+            position: absolute;
+            display: none;
+            top: 30%;
+        }
+        .dialog-content{
+            background: #fff;
+            border-radius: 10px;
+            padding: 10px 20px;
+            margin: 0 auto;
+            width: 60%;
+            box-shadow: 0px 0px 10px #686868
+        }
+        .btns{
+            padding: 0 0 0 5%;
+        }
+        .btn-cancel{
+            width: 48%;
+            height: 1.4rem;
+            border-radius: 20px;
+            border: none;
+        }
+        .btn-submit{
+            width: 45%;
+            height: 1.4rem;
+            border-radius: 20px;
+            border: none;
+            background-color: #df6051;
+            color: #fff;
+        }
+        .remark-text{
+            border: 1px solid #e4e0e0;
+            height: 6rem;
+            width: 100%;
+        }
+        .remark-body{
+            margin-top: 15px;
+        }
+        .loading{
+            z-index: 10000;
+            position: absolute;
+            width: 100%;
+            display: none;
+            margin: 40px 0;
+        }
+        .loading-body{
+            width: 30%;
+            text-align: center;
+            margin: 0 auto;
+            padding: .4rem 0;
+            background-color: #fff;
+            border-radius: 4px;
+        }
+        .loading-icon{
+            background-image: url(data:image/gif;base64,R0lGODlhIAAgALMAAP///7Ozs/v7+9bW1uHh4fLy8rq6uoGBgTQ0NAEBARsbG8TExJeXl/39/VRUVAAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQFBQAAACwAAAAAIAAgAAAE5xDISSlLrOrNp0pKNRCdFhxVolJLEJQUoSgOpSYT4RowNSsvyW1icA16k8MMMRkCBjskBTFDAZyuAEkqCfxIQ2hgQRFvAQEEIjNxVDW6XNE4YagRjuBCwe60smQUDnd4Rz1ZAQZnFAGDd0hihh12CEE9kjAEVlycXIg7BAsMB6SlnJ87paqbSKiKoqusnbMdmDC2tXQlkUhziYtyWTxIfy6BE8WJt5YEvpJivxNaGmLHT0VnOgGYf0dZXS7APdpB309RnHOG5gDqXGLDaC457D1zZ/V/nmOM82XiHQjYKhKP1oZmADdEAAAh+QQFBQAAACwAAAAAGAAXAAAEchDISasKNeuJFKoHs4mUYlJIkmjIV54Soypsa0wmLSnqoTEtBw52mG0AjhYpBxioEqRNy8V0qFzNw+GGwlJki4lBqx1IBgjMkRIghwjrzcDti2/Gh7D9qN774wQGAYOEfwCChIV/gYmDho+QkZKTR3p7EQAh+QQFBQAAACwBAAAAHQAOAAAEchDISWdANesNHHJZwE2DUSEo5SjKKB2HOKGYFLD1CB/DnEoIlkti2PlyuKGEATMBaAACSyGbEDYD4zN1YIEmh0SCQQgYehNmTNNaKsQJXmBuuEYPi9ECAU/UFnNzeUp9VBQEBoFOLmFxWHNoQw6RWEocEQAh+QQFBQAAACwHAAAAGQARAAAEaRDICdZZNOvNDsvfBhBDdpwZgohBgE3nQaki0AYEjEqOGmqDlkEnAzBUjhrA0CoBYhLVSkm4SaAAWkahCFAWTU0A4RxzFWJnzXFWJJWb9pTihRu5dvghl+/7NQmBggo/fYKHCX8AiAmEEQAh+QQFBQAAACwOAAAAEgAYAAAEZXCwAaq9ODAMDOUAI17McYDhWA3mCYpb1RooXBktmsbt944BU6zCQCBQiwPB4jAihiCK86irTB20qvWp7Xq/FYV4TNWNz4oqWoEIgL0HX/eQSLi69boCikTkE2VVDAp5d1p0CW4RACH5BAUFAAAALA4AAAASAB4AAASAkBgCqr3YBIMXvkEIMsxXhcFFpiZqBaTXisBClibgAnd+ijYGq2I4HAamwXBgNHJ8BEbzgPNNjz7LwpnFDLvgLGJMdnw/5DRCrHaE3xbKm6FQwOt1xDnpwCvcJgcJMgEIeCYOCQlrF4YmBIoJVV2CCXZvCooHbwGRcAiKcmFUJhEAIfkEBQUAAAAsDwABABEAHwAABHsQyAkGoRivELInnOFlBjeM1BCiFBdcbMUtKQdTN0CUJru5NJQrYMh5VIFTTKJcOj2HqJQRhEqvqGuU+uw6AwgEwxkOO55lxIihoDjKY8pBoThPxmpAYi+hKzoeewkTdHkZghMIdCOIhIuHfBMOjxiNLR4KCW1ODAlxSxEAIfkEBQUAAAAsCAAOABgAEgAABGwQyEkrCDgbYvvMoOF5ILaNaIoGKroch9hacD3MFMHUBzMHiBtgwJMBFolDB4GoGGBCACKRcAAUWAmzOWJQExysQsJgWj0KqvKalTiYPhp1LBFTtp10Is6mT5gdVFx1bRN8FTsVCAqDOB9+KhEAIfkEBQUAAAAsAgASAB0ADgAABHgQyEmrBePS4bQdQZBdR5IcHmWEgUFQgWKaKbWwwSIhc4LonsXhBSCsQoOSScGQDJiWwOHQnAxWBIYJNXEoFCiEWDI9jCzESey7GwMM5doEwW4jJoypQQ743u1WcTV0CgFzbhJ5XClfHYd/EwZnHoYVDgiOfHKQNREAIfkEBQUAAAAsAAAPABkAEQAABGeQqUQruDjrW3vaYCZ5X2ie6EkcKaooTAsi7ytnTq046BBsNcTvItz4AotMwKZBIC6H6CVAJaCcT0CUBTgaTg5nTCu9GKiDEMPJg5YBBOpwlnVzLwtqyKnZagZWahoMB2M3GgsHSRsRACH5BAUFAAAALAEACAARABgAAARcMKR0gL34npkUyyCAcAmyhBijkGi2UW02VHFt33iu7yiDIDaD4/erEYGDlu/nuBAOJ9Dvc2EcDgFAYIuaXS3bbOh6MIC5IAP5Eh5fk2exC4tpgwZyiyFgvhEMBBEAIfkEBQUAAAAsAAACAA4AHQAABHMQyAnYoViSlFDGXBJ808Ep5KRwV8qEg+pRCOeoioKMwJK0Ekcu54h9AoghKgXIMZgAApQZcCCu2Ax2O6NUud2pmJcyHA4L0uDM/ljYDCnGfGakJQE5YH0wUBYBAUYfBIFkHwaBgxkDgX5lgXpHAXcpBIsRADs=);background-size:100% 100%;
+            height: 30px;
+            width: 30px;
+            margin: 10px auto;
+        }
+        .label{
+            text-align: center;
+        }
+        .inner-text{
+            color: #727272;
+            line-height: 1.2rem;
+            font-size: .78rem;
+        }
+        .label-txt{
+            text-align: center;
+        }
+        .desc-text{
+            margin-top: -0.5rem;
+        }
+        .footer-btn{
+            text-align: center;
+            margin-top: -0.50rem;
+        }
+        .crux-text{
+            color: #f73131;
+            font-weight: bold;
+        }
+        .crux-br{
+            display: inline-block;
+            width: 100%;
+            border-top: 1px solid #e4e4e4;
+            vertical-align: top;
+            margin-top: .3rem;
+        }
+        .footer-btn button{
+            background-color: #fff;
+            border: 1px solid #b2b2b2;
+            color: #5f5f5f;
+            /*vertical-align:bottom;*/
+            line-height: 1.50rem;
+        }
+        .footer-btn .success{
+            background-color: #df6051;
+            border: 0;
+            color: #fff;
+        }
+        .item{
+            display: flex;
+            justify-content: start;
+            align-items: center;
+            font-size: 15px;
+        }
+        .merc-label{
+            width: 35%;
+            color: #606060;
+        }
+        .item > input {
+            width: 65%;
+            height: 20px;
+            border: 0;
+            border-bottom: 1px solid #c5b6b6;
+            text-align: right;
+            outline: none;
+        }
+        .body-input{
+            line-height: 30px;
+        }
+        .dialog-desc{
+            line-height: 20px;
+        }
+        .dialog-desc-p{
+            font-size: 13px;
+            margin-top: 5px;
+            color: #df6051;
+        }
+    </style>
+</head>
+<body>
+<div class="body">
+    <div class="main-title">
+        <div class="store-info">
+            <div class="logo"></div>
+            <div class="name" th:text="${storeName}"></div>
+        </div>
+        <div class="remark-info">
+            <div class="icon"></div>
+            <div class="set-remark" onclick="showRemarkDialog()">设置备注</div>
+        </div>
+    </div>
+    <div class="main-amt">
+        <div class="amt-content" onclick="showInput()">
+            <div class="input-label">金额</div>
+            <div class="input-box">￥ <span class="money-input" name="comsumeMoney" id="comsumeMoney"></span> <span class="gb"></span></div>
+        </div>
+    </div>
+
+</div>
+<div class="payinfo" id="payinfo">
+    <div class="shouyin" onclick="showInput()">
+        <p>收&nbsp;银&nbsp;就&nbsp;用&nbsp;收&nbsp;银&nbsp;呗</p>
+    </div>
+    <table cellspacing="0" cellpadding="0" id="table1">
+        <tr>
+            <td class="paynum" onclick="inputAmt(1)">1</td>
+            <td class="paynum" onclick="inputAmt(2)">2</td>
+            <td class="paynum" onclick="inputAmt(3)">3</td>
+            <td id="pay-return" onclick="inputAmt('del')"><div class="keybord-return"></div></td>
+        </tr>
+        <tr>
+            <td class="paynum" onclick="inputAmt(4)">4</td>
+            <td class="paynum" onclick="inputAmt(5)">5</td>
+            <td class="paynum" onclick="inputAmt(6)">6</td>
+            <td rowspan="3" class="pay" id="pay">支付</td>
+        </tr>
+        <tr>
+            <td class="paynum" onclick="inputAmt(7)">7</td>
+            <td class="paynum" onclick="inputAmt(8)">8</td>
+            <td class="paynum" onclick="inputAmt(9)">9</td>
+        </tr>
+        <tr>
+            <td id="pay-stop" onclick="hideInput()"><div class="keybord-stop"></div></td>
+            <td id="pay-zero" onclick="inputAmt(0)">0</td>
+            <td id="pay-float" onclick="inputAmt('.')">.</td>
+        </tr>
+    </table>
+</div>
+<div id='shade' class="shade"></div>
+
+<div class="dialog" id="dialog">
+    <div class="dialog-content">
+        <div class="label">设置备注</div>
+        <div class="remark-body">
+            <textarea id="remark" class="remark-text"></textarea>
+        </div>
+        <div class="btns">
+            <button class="btn-cancel" onclick="hideRemarkDialog('cancel')">取消</button>
+            <button class="btn-submit" onclick="hideRemarkDialog('submit')">确定</button>
+        </div>
+    </div>
+</div>
+
+<div class="dialog dialog-txt" id="dialog-txt">
+    <div class="dialog-content">
+        <div class="label-txt">反诈中心提醒</div>
+        <span class="crux-br"></span>
+        <div class="desc-text">
+            <p class="inner-text">
+                <span class="crux-text">刷单返利</span>、
+                <span class="crux-text">信用卡借呗提额</span>、
+                <span class="crux-text">电商退款</span>、
+                <span class="crux-text">网络贷款</span>、
+                <span class="crux-text">赌博上分</span>、
+                <span class="crux-text">投资理财</span>都是骗子，一旦付款资金无法追回，如果是以上情况切勿付款！
+            </p>
+        </div>
+        <span class="crux-br"></span>
+        <div class="footer-btn">
+            <button id="btn-success" class="btn-cancel">我已确认<span id="countDown">(<span id="second"></span>S)</span></button>
+            <button id="btn-cancel" onclick="hideDialog()" class="btn-cancel">取消支付</button>
+
+        </div>
+    </div>
+</div>
+
+<div class="dialog dialog-txt" id="dialog-info">
+    <div class="dialog-content">
+        <div class="label-txt">请确认收款方信息</div>
+        <span class="crux-br"></span>
+        <div class="desc-text body-input">
+            <div class="item">
+                <div class="merc-label">姓名：</div>
+                <input type="text" name="accountName" id="accountName" maxlength="20"  autocomplete="off" value="" />
+            </div>
+            <div class="item">
+                <div class="merc-label">手机号：</div>
+                <input type="number" name="accountPhone" id="accountPhone" maxlength="11"  autocomplete="off" value="" />
+            </div>
+            <div class="decs dialog-desc">
+                <p class="dialog-desc-p">若遇到诈骗，可再次扫码对商家进行投诉!</p>
+            </div>
+        </div>
+        <span class="crux-br"></span>
+        <div class="footer-btn">
+            <button class="btn-cancel success" id="submitPay">继续支付</button>
+            <button class="btn-cancel" onclick="hideInfoDialog()">取消</button>
+        </div>
+    </div>
+</div>
+
+<div class="loading" id="loading">
+    <div class="loading-body">
+        <div class="loading-icon">
+        </div>
+        <div class="loading-msg">
+            支付中...
+        </div>
+    </div>
+</div>
+
+<input type="hidden" id="p" th:value="${p}">
+<input type="hidden" id="merchantCode" th:value="${merchantCode}">
+<input type="hidden" id="token" th:value="${token}">
+<input type="hidden" id="accountNameValue" th:value="${accountName}">
+<input type="hidden" id="accountPhoneValue" th:value="${accountPhone}">
+</body>
+<script type="text/javascript">
+    (function (doc, win) {
+        var docEl = doc.documentElement,
+            resizeEvt = 'orientationchange' in window ? 'orientationchange' : 'resize',
+            recalc = function () {
+                var clientWidth = docEl.clientWidth;
+                if (!clientWidth) return;
+                docEl.style.fontSize = 20 * (clientWidth / 320) + 'px';//其中“20”根据你设置的html的font-size属性值做适当的变化
+            };
+
+        if (!doc.addEventListener) return;
+        win.addEventListener(resizeEvt, recalc, false);
+        doc.addEventListener('DOMContentLoaded', recalc, false);
+    })(document, window);
+</script>
+<script>
+    document.getElementById("shade").style.display = "block";
+    document.getElementById("dialog-txt").style.display = "block";
+    let accName = document.getElementById("accountNameValue").value;
+    let accVal = document.getElementById("accountPhoneValue").value;
+    document.getElementById("accountName").setAttribute("placeholder",accName);
+    document.getElementById("accountPhone").setAttribute("placeholder",accVal);
+    var i = 5;
+    var flag = false;
+    var interval = null;
+    openCountDowm();
+    function openCountDowm(t){
+        i = t || i;
+        document.getElementById("second").innerText = i;
+        interval = setInterval("countDown()",1000);
+    }
+    function countDown(){
+        if(i <= 1){
+            clearInterval(interval);
+            document.getElementById("countDown").style.display = "none";
+            document.getElementById("btn-success").classList.add("success");
+        }
+        document.getElementById("second").innerText = --i;
+    }
+    function inputAmt(o){
+        var dom = document.getElementById('comsumeMoney');
+        var txt = dom.innerText;
+        if(!txt){
+            if(o === 'del' || o === '.'){
+                return;
+            }
+        }
+        if(o === '.' && txt.indexOf(".") > 0){
+            return;
+        }
+        if(o === 'del'){
+            txt = txt.slice(0,-1);
+            dom.innerText = txt
+            return;
+        }
+        if(txt.indexOf(".") > 0 ){
+            var v = txt.split(".")[1];
+            if(v && v.length > 1){
+                return;
+            }
+        }else{
+            if(txt.indexOf("0") == 0 && o !== '.'){
+                return;
+            }
+        }
+        txt = txt === "" ? o : txt + "" + o;
+        let max = 99999;
+        if(parseFloat(txt) > max){
+            return;
+        }
+        dom.innerText = txt;
+    }
+    function hideInput(){
+        var dom = document.getElementById('payinfo');
+        dom.style.height = '20px'
+    }
+    function showInput(){
+        var dom = document.getElementById('payinfo');
+        dom.style.height = '13rem'
+    }
+    function showRemarkDialog(){
+        var shape = document.getElementById('shade');
+        var dialog = document.getElementById('dialog');
+        shape.style.display = 'block';
+        dialog.style.display = 'block';
+    }
+    function hideRemarkDialog(t){
+        var shape = document.getElementById('shade');
+        var dialog = document.getElementById('dialog');
+        shape.style.display = 'none';
+        dialog.style.display = 'none';
+        if(t === 'cancel'){
+            document.getElementById('remark').value = "";
+        }
+    }
+    function hideInfoDialog(){
+        var dialog = document.getElementById('dialog-info');
+        dialog.style.display = 'none';
+        document.getElementById("accountName").value = "";
+        document.getElementById("accountPhone").value = "";
+    }
+    function hideDialog(){
+        clearInterval(interval);
+        var shape = document.getElementById('shade');
+        var dialog = document.getElementById('dialog-txt');
+        shape.style.display = 'none';
+        dialog.style.display = 'none';
+    }
+    function showDialog(){
+        var shape = document.getElementById('shade');
+        var dialog = document.getElementById('dialog-txt');
+        shape.style.display = 'block';
+        dialog.style.display = 'block';
+    }
+    document.getElementById("btn-success").onclick = () => {
+        if(i > 0){
+            return;
+        }
+        flag = true;
+        hideDialog();
+    }
+
+    document.getElementById("submitPay").onclick = ()=>{
+        let name = document.getElementById("accountName").value;
+        let phone = document.getElementById("accountPhone").value;
+        if(!name){
+            alert("请输入收款方姓名！");
+            return;
+        }
+        if(!phone){
+            alert("请输入收款方手机号！");
+            return;
+        }
+        var shape = document.getElementById('shade');
+        var loading = document.getElementById('loading');
+        shape.style.display = 'block';
+        loading.style.display = 'block';
+
+
+        var comsumeMoney = document.getElementById('comsumeMoney').innerText;
+        var p = document.getElementById("p").value;
+        var remark = document.getElementById("remark").value;
+        var merchantCode = document.getElementById("merchantCode").value;
+        var token = document.getElementById("token").value;
+        var params = "p="+p+"&comsumeMoney="+comsumeMoney+"&remark="+remark+ "&merchantCode="+merchantCode+"&token="+token+"&accountName="+name+"&accountPhone="+phone;
+        var url = "/wap/merchant/moveTradePay";
+        var xhr = new XMLHttpRequest();//创建请求对象
+        xhr.open("POST", url, true);//链接服务器
+        xhr.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
+        xhr.onreadystatechange = function () {
+            if (xhr.readyState === 4) {//请求已完成，且响应已就绪
+                shape.style.display = "none";
+                loading.style.display = "none";
+                if (xhr.status === 200) {//请求成功
+                    var resultStr = xhr.responseText//获取结果
+                    var resultObj = JSON.parse(resultStr);//解析数据
+                    if (resultObj.code == 200) {
+                        var rdata = resultObj.data;
+                        if("WXZF" == rdata.payType){
+                            WeixinJSBridge.invoke('getBrandWCPayRequest', {
+                                // 商品名称
+                                "appId" : rdata.payAppId,
+                                "timeStamp" : rdata.payTimeStamp,
+                                "nonceStr" : rdata.paynonceStr,
+                                "package" : rdata.payPackage,
+                                "signType" : rdata.paySignType,
+                                "paySign" : rdata.paySign,
+                            }, function(res) {
+                                if (res.err_msg == "get_brand_wcpay_request:ok" || res.err_msg == "stopMonitoringBeacons:ok") {
+                                    //成功之后跳转地址
+                                    window.location = '/wap/merchant/jumpUrl?orderNumber='+rdata.orderNumber;
+                                } else {
+                                    cancelPay(rdata.orderNumber);
+                                    alert("支付失败");
+                                }
+                            })
+                        }else if("ZFBZF" == rdata.payType){
+                            var reg=/^([hH][tT]{2}[pP]:\/\/|[hH][tT]{2}[pP][sS]:\/\/)(([A-Za-z0-9-~]+).)+([A-Za-z0-9-~\/])+$/;
+                            if(reg.test(rdata.source)){
+                                window.location = rdata.source;
+                            }else{
+                                ap.tradePay({
+                                    tradeNO : rdata.source
+                                }, function(res) {
+                                    if (res.resultCode == '9000') {
+                                        window.location = '/wap/merchant/jumpUrl?orderNumber='+rdata.orderNumber; //订单支付成功
+                                    } else if (res.resultCode == '8000') {
+                                    } else if (res.resultCode == '4000') {
+                                        cancelPay(rdata.orderNumber);
+                                        ap.alert("订单支付失败");
+                                    } else if (res.resultCode == '6001' || res.resultCode == '99') {
+                                        cancelPay(rdata.orderNumber);
+                                    } else if (res.resultCode == '6002') {
+                                        cancelPay(rdata.orderNumber);
+                                        ap.alert("网络连接出错");
+                                    }
+                                });
+                            }
+                        }else{
+                            window.location = rdata.redirectUrl;
+                        }
+                    } else {
+                        alert(resultObj.message);
+                    }
+                }
+                else {
+                    alert("错误码 : " + xhr.status);
+                }
+            }
+        }
+        xhr.send(params);//发送请求
+
+    }
+
+    document.getElementById("pay").onclick = ()=>{
+        var comsumeMoney = document.getElementById('comsumeMoney').innerText;
+        if(comsumeMoney == undefined || comsumeMoney == '' || comsumeMoney == null){
+            return;
+        }
+        if(!flag){
+            showDialog();
+            openCountDowm(5);
+            return;
+        }
+        document.getElementById('dialog-info').style.display = "block";
+
+        // var shape = document.getElementById('shade');
+        // var loading = document.getElementById('loading');
+        // shape.style.display = 'block';
+        // loading.style.display = 'block';
+        // var p = document.getElementById("p").value;
+        // var remark = document.getElementById("remark").value;
+        // var merchantCode = document.getElementById("merchantCode").value;
+        // var token = document.getElementById("token").value;
+        // var params = "p="+p+"&comsumeMoney="+comsumeMoney+"&remark="+remark+ "&merchantCode="+merchantCode+"&token="+token;
+        // var url = "/wap/merchant/moveTradePay";
+        // var xhr = new XMLHttpRequest();//创建请求对象
+        // xhr.open("POST", url, true);//链接服务器
+        // xhr.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
+        // xhr.onreadystatechange = function () {
+        //     if (xhr.readyState === 4) {//请求已完成，且响应已就绪
+        //         shape.style.display = "none";
+        //         loading.style.display = "none";
+        //         if (xhr.status === 200) {//请求成功
+        //             var resultStr = xhr.responseText//获取结果
+        //             var resultObj = JSON.parse(resultStr);//解析数据
+        //             if (resultObj.code == 200) {
+        //                 var rdata = resultObj.data;
+        //                 if("WXZF" == rdata.payType){
+        //                     WeixinJSBridge.invoke('getBrandWCPayRequest', {
+        //                         // 商品名称
+        //                         "appId" : rdata.payAppId,
+        //                         "timeStamp" : rdata.payTimeStamp,
+        //                         "nonceStr" : rdata.paynonceStr,
+        //                         "package" : rdata.payPackage,
+        //                         "signType" : rdata.paySignType,
+        //                         "paySign" : rdata.paySign,
+        //                     }, function(res) {
+        //                         if (res.err_msg == "get_brand_wcpay_request:ok" || res.err_msg == "stopMonitoringBeacons:ok") {
+        //                             //成功之后跳转地址
+        //                             window.location = '/wap/merchant/jumpUrl?orderNumber='+rdata.orderNumber;
+        //                         } else {
+        //                             cancelPay(rdata.orderNumber);
+        //                             alert("支付失败");
+        //                         }
+        //                     })
+        //                 }else if("ZFBZF" == rdata.payType){
+        //                     var reg=/^([hH][tT]{2}[pP]:\/\/|[hH][tT]{2}[pP][sS]:\/\/)(([A-Za-z0-9-~]+).)+([A-Za-z0-9-~\/])+$/;
+        //                     if(reg.test(rdata.source)){
+        //                         window.location = rdata.source;
+        //                     }else{
+        //                         ap.tradePay({
+        //                             tradeNO : rdata.source
+        //                         }, function(res) {
+        //                             if (res.resultCode == '9000') {
+        //                                 window.location = '/wap/merchant/jumpUrl?orderNumber='+rdata.orderNumber; //订单支付成功
+        //                             } else if (res.resultCode == '8000') {
+        //                             } else if (res.resultCode == '4000') {
+        //                                 cancelPay(rdata.orderNumber);
+        //                                 ap.alert("订单支付失败");
+        //                             } else if (res.resultCode == '6001' || res.resultCode == '99') {
+        //                                 cancelPay(rdata.orderNumber);
+        //                             } else if (res.resultCode == '6002') {
+        //                                 cancelPay(rdata.orderNumber);
+        //                                 ap.alert("网络连接出错");
+        //                             }
+        //                         });
+        //                     }
+        //                 }else{
+        //                     window.location = rdata.redirectUrl;
+        //                 }
+        //             } else {
+        //                 alert(resultObj.message);
+        //             }
+        //         }
+        //         else {
+        //             alert("错误码 : " + xhr.status);
+        //         }
+        //     }
+        // }
+        // xhr.send(params);//发送请求
+    }
+    function cancelPay(m) {
+        var url = "/wap/merchant/cancelPay/"+m;
+        var xhr = new XMLHttpRequest();//创建请求对象
+        xhr.open("GET", url, true);//链接服务器
+        xhr.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
+        xhr.onreadystatechange = function () {
+
+        }
+        xhr.send();
+    }
+</script>
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/templates/th_pay.html b/pluss-wap-page/src/main/resources/templates/th_pay.html
new file mode 100644
index 0000000..67461fa
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/templates/th_pay.html
@@ -0,0 +1,488 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <meta charset="utf-8">
+    <meta content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=no" name="viewport">
+    <meta content="yes" name="apple-mobile-web-app-capable">
+    <meta content="black" name="apple-mobile-web-app-status-bar-style">
+    <meta content="telephone=no" name="format-detection">
+    <meta content="email=no" name="format-detection">
+    <!--    <link rel="stylesheet" href="https://act.weixin.qq.com/static/cdn/css/wepayui/0.1.1/wepayui.min.css">-->
+    <script src="https://www.shouyinbei.net/resources/js/alipayjsapi.min3.1.1.js"></script>
+    <title>向商户付款</title>
+    <style>
+        * {
+            padding: 0;
+            margin: 0;
+        }
+        html,body{
+            width:100%;
+            height:100%;
+            margin:0 auto;
+            padding:0px;
+            background-color:#EFEFF4;
+        }
+        .payinfo{
+            display: block;
+            position: absolute;
+            bottom: 0;
+            height: 13rem;
+            width: 100%;
+            overflow: hidden;
+            transition: .4s;
+        }
+        table{
+            width:100%;
+            height: 91%;
+            bottom: 0;
+            background-color:white;
+        }
+        table tr{
+            height: 25%;
+        }
+        table tr td{
+            text-align:center;
+            width:24.9999999%;
+            border-right:1px solid #D9D9D9;
+            border-bottom:1px solid #D9D9D9;
+        }
+        table tr td:active{
+            background-color:#ECECEC;
+        }
+        .keybord-return,.keybord-stop{
+            width:30px;
+            height:30px;
+            margin:0px auto;
+            color:white;
+        }
+        .keybord-return{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADICAMAAACahl6sAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAALpQTFRFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAqyRq8wAAAD10Uk5TAAM/gJ+efz5Q2ddPAouKAZZ8nP0vrfcLN03+GcxYu9gSGkCBndobPbe8+QonMuCH7xOIW0fNtCwra4NgHN+ehK8AAAABYktHRACIBR1IAAAACXBIWXMAAABIAAAASABGyWs+AAAB4UlEQVR42u3c51LCQBiF4Y2IgDQVRcWCvffe9v5vS2FGhSH5kTLzney8zxWcd3ZD+BXnAAAAAAAAAAAAgFSiucp8daEWWe/Iq97wY4tN6yW5tNr+T6drvSa77pKfsGw9J7PWymSH761aDyqmw/s160XZTN+rkf669aYsZs7jx4b1qII6/Kb1qvRm79VIzXpWarHn4Qdb1ruK6fDb1rvSir9X3u9YD0sp4Tz8bst6WTEdwz3rZekk3avGvvUyOuiwR4cWOrTQoYUOLXRooUMLHVro0EKHFjq00KGFDi10aKFDCx1a6NBChxY6tNChhQ4tdIhpx3cMy9ZRD6QjaoTR4Q7CeD6cOwzjPJyrhnEezh3FhByfWK/KoBLK1TqNfdhLeCbRMJCfX9cM5IXoXCeUkqQ/jeV7TijRQ4keSvRQoocSPZTooUQPJXoo0UOJHkr0UKKHEj2U6KFEDyV6KNFDiR5K9FCihxI9lOgJpySUD04ml5yV7jPlSberfN8tTjiTc+tdRZVcXFrvSi/+dl1Zz8og9kyurVcVVVK6b2KPzd6uG+tJGc2cya31ooJK7u6tB2U2dbt65Xsf/ms9DH47+o/WY/J5eh5nDF5erZfk9vb+Ufn8sl4BAAAAAAAAAAAAY9/5YLt8mhkMlgAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAyMC0wNy0wNFQxNTowMjo0OSswODowMMIgQKAAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMjAtMDctMDRUMTU6MDI6NDkrMDg6MDCzffgcAAAAR3RFWHRzdmc6YmFzZS11cmkAZmlsZTovLy9ob21lL2FkbWluL2ljb24tZm9udC90bXAvaWNvbl91ZmVhaXVpd2lrZy9iYWNrLnN2Z4Ft+LMAAAAASUVORK5CYII=); background-size:100% 90%; }
+        .keybord-stop{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAgAAAAIACAMAAADDpiTIAAAAA3NCSVQICAjb4U/gAAAACXBIWXMAAA3lAAAN5QHm6mmvAAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAAWtQTFRF////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAR9G26gAAAHh0Uk5TAAECAwQFBgcICQsMDQ4PEBMUFRcaHyEiJiwuLzAyMzQ1Nj0+P0JGR0pNUFZXW11eYmZnaG1ub3F3eH6Ag4SFhomMj5WWmJmgoqWmp6usrrGytLq9vsLDxsnKy87P0NLT1dfZ3N7i4+Tl5unr7O/w8vX29/n6+/3+X88dAwAACGRJREFUeNrt3Y1/jfUfx/HvSFbKXaxVilVCq4lFIRRRQm6SkbsYs9pqbcr682PkdtfsOlOPc6738/UHXI/f4/N+/kp2zrVS5tvyvoF9x4cuXx+b+ltt2tTY9ctDx/cN9C0vz7dV/YeHnbeTGj7cv+p5rf/67ovTLtp5TV/c/frC11+x7axTdm5nt61Y0Pyv7p90xM5ucv+rLc+/ZMeYA3Z+YzuWtLZ/vz/3NaTh/hbmf++cwzWnc+/VnL/3pKM1q5O9dfbfMuFiTWtiy/z333XbvZrX7V3znL/7iGM1syPd89l/zXmXamrn1zx7/w2j7tTcRjc8a/+P/ayv0U19/Iz9najpzSlgg///N/+fAXP8W2CNf/8HNFr5J8Fuf/6P6HzVfw367/+QjlT8/Z/LpDTr3wlu8fe/Md2e5ecCvX7+E9TE0z8b9PPfqE4+9fkPN8nqyU+InHOSrM498fk/F0nrsc8JLvH5z7iGH/2s8A73yGvHI9//8Pn/wMYefmNkv2sktv/B9/98/yuyyX+/N7jNLTLbdh+A7/+Gdvb+9/9dIrV77w/Y7RCp7Z4BcNEhUrs48/4f73+JbXqVHwNkd/cHAoedIbfDdwD4OVBww6Usd4Xklpc+R0iurww4QnIDZZ8jJLevHHeE5I6XIUdIbqhcdoTkLpfrjpDc9eLjgNGNFe8EiW6quEF2AAAgAASAABAAAkAACAABIAAEgAAQAAJAAAgAASAABIAAEAACQAAIgJmmLtWv8mHj9Z91rfJhI/UfNlL5sGv1HzZe+bAWTjbVtgAulfpVPuxQ/Wetq3zYYP2HDVY+bF39hx2qHqB+lwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA1JEBAIAAEAACQAAIAAEgAASAABAAAkAACAABIAAEgAAQAAJAAAgAASAAZho/VL/Kh/1c/1nHKh/2Y/2H/Vj5sGP1H/Zz5cNaONl42wLw1TDfDQQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADg/wRwbV39Kh92rP6zPqp82N76D9tb+bCP6j+s+pfZtHCya20LQJ0XAAAIAAEgAASAABAAAkAACAABIAAEgAAQAAJAAAgAASAABIAAEAACQAAIAAEgAASAABAAAkAACAABIAAEgAAQAAJAAAgAASAABIAAEAACQAAIgLu18Euj2rdDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AfzVrv/Lxi81qPF2vfJf5be2tan/od/KiCMkN1KuOkJyV8tPjpDcT+W0IyR3uhx0hOQOlk8dIblPyweOkNwHZa0jJLe2dE24Qm4TXaWccobcTpVSPnOG3D67A+BNZ8jtzTsAun51h9R+7br7s+pvHSK1b2c+rLDJIVLbNANg8S8ukdkvi+99Xukrp8jsq/sfWHvLKTJ769+PLJ5xi8TOPPjM6vpp18hrev3DTy0fdY68jj7ysfWeW+6R1q2eR7+4cMBB0jrw2DdXVv7uIln9vvLx7y597iRZff7El9e6b7hJUje6n/z64oCjJDXw9BdYv3GVnL6Z5RvMS4fcJaWhpbN9h/013xMNaeS12d9i8Pak2yQ0+XbVeyz6HSeh/uo3mXzhOs3vizleZdP1vfs0ve+75nqZ0cs+GtDwzrw89+usXvB18UZ38IVnvtFs8E9namp/Ds7nnXbvt+07zbSwxt+f31sNe664VRO70jPf91ouO+FazevEsvm/2bRrj8+INaxbe7pqvdy25zufFG5Q09/1lLq9468EGtOZd1p6xfVmfxhsRFc2t/qS80Wf3HS+Tu/mJ4sW8J77l3ZecMJO7sLOlxb6uw7e+NI/Bjr1//xfvvFcft3For5dp/9wzs7qj9O7+haV59eL7+78+odRd+2ERn/4eue7L/4nv/rmld71Gz/cun1Qbdn2rR9uXN/7SpEkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZKkuq1u0i9zWW3P+u1pzq9x2mPNaAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAen7/wNF3uGEUW54AwAAAABJRU5ErkJggg==); background-size:100% 100%;}
+        .pay{
+            color:#ffffff;
+            font-size:120%;
+            background-color:#df6051;
+        }
+        .pay:active{
+            /*background-color: #df6051;*/
+            background-color: rgba(223,96,81,0.7);
+        }
+        .shouyin{
+            text-align: center;
+            color: #9b9b9b;
+            font-size: 13px;
+            margin-bottom: 10px;
+        }
+        .logo{
+            background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAD70lEQVRoQ9VaTYgURxT+Xm8w7PQs6CFgXDCXEAKeFHKLRKMo6HoSc0qmqlfxICSn/KCXmIMuiZ4UBEG3q+aokItKiGSTDZ5CIHtK9LAXhRVJDoZs9ywR7CfVuzPMzM5sV/X0MNt92Z7q9773vu2qej/VhIKuSIgDBO8AgEkCTybApLlfg1/ygCUGLSH9m8xVtZ4rwjQNAhLXgikQjgE8BWCHI9ZTgO6Cccevh3cddVvizgT4zJnqSqMRMFMA8O68hjv1aIGIw/FKJaRr1yIXTGsCkZTbx5iChJNpEL3tYsRalnnRI2/2JXFYVeqZjZ4VgVjK95hRJ+BdG9BBZRh4RISar9TvWViZBFZq0/sTSn7OAhrGc4+9D8frs79shL0hgUiIgECzw3DOFpPB01Wtw37yfQlEQnxJoG9tDQ1TjsFfVbX+rpeNngRiIU4CdGOYTrlj8ylf65vdeusIxEIcTffnTXnxlK/1vXbXOgiYrZKYHwBD2iYH/qfwIhPtbd9iOwisiOBsAr44sJ0hAnigc+M6nGmaaBEwEbYRxQtDC1JFkWJerFT93c2I3SLQkPJTZlwpys4wcYjwWUWpq8ZGi0Asgj9cchsC5l8yfi3C0THCBwzss8eiBV+He1oEIiEOEehHewAgYXwzUVfnXXT6yS7X5HmP8LULFoMPV7W+n76BhhCXGPS5C8Bo34CZOny5ovUXKYFYyMcAdroScJHPknWbQinaE1+rt6jxyfT77CUPsgx0BY/5ilb7XXSyZGMh/wewJUuuw4/E20uxCC4CfNZJkXC8otT3LjpZsrGUF8A4lyXX+ZxmDAENcM1F0dcqMw13wUun8cen38TYi6duelSnhpA/MWCKcdvrpq/VKVthF7lYSJODHbXVIWCOIiEfulRaDD5YVEeh29HVJgHfsSWQVm6RkP8RMGGr9IKwbZtS/7bLLwfBG+b3RBj+M8j4cym3bmE8t/WFgWVnAuDkiF+v/9DhqAlESH4bdLwh5Qlm3HIl4DSFDDgRPqooddvctxstatyBwKM8i7iJ/+faza4ug0WNZ/JIF3GebdQgJ4Q0kHmMDbsGWV4MhkP1XIHMOGViwbKU+4ogMKHUfCwkZ5Fd/5xmcqUSm4UAmVQijYI5krlN8AZWk7l0J8mRTo+aQEc6naegGTWBjoJmdRq5lZSjJdBVUq4FJKei/jWPdr0ehn+57xzrNUwq4iX8ty1Wz6I+R1vlfkJo9WdsjfeSI8Z1At6xwujXVjHKpW5sGQKlby2uLuYSN3ebc7DU7fUmiVIfcLSRKO8RU5NEqQ/5WmuizMesrelU5oPu9ghZ2k8NeoX5Un7s0S9fGdXnNq8Aors/k02FsxcAAAAASUVORK5CYII=);background-size:100% 100%;
+            width: 2.1875rem;
+            height: 2.1875rem;
+        }
+        .icon{
+            background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAC7UlEQVRYR72WTWgTURDH/7ObJi1YENFT4kVtD/YgSMFaaOrbpfYgeElaURA8CIKKIAhCQYyCIAiC0KLgodBDwUqhiODB8N42RfFQEYoVBUGRCiKioPUjNbsjK4mk2ySbTTe+687O7/dm3hehiSOXy+20bXuEiAQzTwkhznpx1Cx+ET4FoKuMMSaEOF3ObIpAFfhfruM4l0zTzJQkmiIwNze3y7btKWbuXFNyoh/RaHRzb2/vT/db6AKWZd1h5tsAlgHcBZDwSHxLJBJbOjo68qELSCkniegwgC8A9gPYQETTzLypJNG0FkgpJ4joaNlsX2qadpCIttm2PQOglZlvGoZxMvRFqJQaB3DM229mzsVisaF8Pr8XwCHDMI6Evg2VUm6/j1fbzkR0Lx6PD5d6HqqAUuoWgBM+Z8n07OzscCaTcSrFNbwLlFKjAE75wGfa29uHu7u7f1etUCMnoWVZN5j5jM+/9wEMCSF+1YoLXAEp5XUiWnOmeyAPVlZWhgYHB7/7TTCQgFLqGoBzPkkftrW1pXt6er76wQMdREqpqwDO1ywnkdR1Pd3X1+ceRHWNuiogpbxCRCO1Mrp7nohSQohPdZGLQb4CUsrLRHTBJ+kjAGkhxIcg8JotyGazndFoNOLeap473ct44jhO2jTN90HhNQUsy3JX+pKmaYs1JOYLhUJqYGDgXSPwmgJKqSwAk5kPRCKRtxUknmmalurv73/TKLyqQPFFs1hK7DjOnpaWluWSBBEtMLO74F6vB15VQCl1EcC/Z5MbGIlEtjNza/GlkzIM49V64VUFpJRPiWi3F1AoFDbGYrF4Mpl8EQa8ooC3/EXQvOM4E5qmjQsh3KdWaGPNOVBefiKatG17zDTNx6ERPYkqCTwHMCqEcO/6po9VAm75w+xvPfarBJRS7hN6Rz0/BonRdf1jtYl5BThI4iCxuq53VZL4bwIAtgohlrzSlRbhviAzqydW1/XPyWRyoVKs73VcD2A9MX8AVWwjMF0q1kMAAAAASUVORK5CYII=);background-size:100% 100%;
+            width: .9375rem;
+            height: .9375rem;
+        }
+        .body{
+            padding: 2rem 1rem;
+        }
+        .store-info{
+            display: flex;
+            align-items: center;
+        }
+        .name{
+            margin-left: .5rem;
+        }
+        .main-amt{
+            height: 3rem;
+            padding: 1.2rem 0 0 0;
+        }
+        .amt-content {
+            display: flex;
+            background: #fff;
+            padding: .5rem 1rem;
+            border-radius: 4px;
+            height: 2.5rem;
+            font-size: 1.125rem;
+        }
+        .input-label {
+            flex: 1;
+            line-height: 2.5rem;
+        }
+        .input-box {
+            line-height: 2.5rem;
+            font-size: 1.5625rem;
+            color: #777;
+        }
+        .gb {
+            display: inline-block;
+            width: 2px;
+            height: 1.875rem;
+            margin-top: -6px;
+            background: #df6051;
+            vertical-align: middle;
+            animation: gb 1.3s infinite;
+        }
+        .money-input {
+            font-weight: bold;
+            color: #df6051;
+        }
+        @keyframes gb {
+            from {
+                opacity: 1;
+            } to {
+                  opacity: 0;
+              }
+        }
+        .remark-info{
+            display: flex;
+            align-items: center;
+            font-size: 13px;
+            color: #9e9e9e;
+        }
+        .set-remark{
+            margin-left: 5px;
+        }
+        .main-title{
+            display: flex;
+            justify-content: space-between;
+        }
+
+        .shade{
+            display: none;
+            position: absolute;
+            top: 0;
+            left: 0;
+            width: 100%;
+            height: 100%;
+            background-color: rgba(0,0,0,.1);
+            z-index: 1002;
+            overflow: auto;
+        }
+        .dialog{
+            z-index: 8888;
+            height: 13rem;
+            width: 100%;
+            position: absolute;
+            display: none;
+        }
+        .dialog-content{
+            background: #fff;
+            height: 11rem;
+            border-radius: 10px;
+            padding: 10px 20px;
+            margin: 0 auto;
+            width: 60%;
+        }
+        .btns{
+            padding: 0 0 0 5%;
+        }
+        .btn-cancel{
+            width: 45%;
+            height: 1.8rem;
+            border-radius: 20px;
+            border: none;
+        }
+        .btn-submit{
+            width: 45%;
+            height: 1.8rem;
+            border-radius: 20px;
+            border: none;
+            background-color: #df6051;
+            color: #fff;
+        }
+        .remark-text{
+            border: 1px solid #e4e0e0;
+            height: 6rem;
+            width: 100%;
+        }
+        .remark-body{
+            margin-top: 15px;
+        }
+        .loading{
+            z-index: 10000;
+            position: absolute;
+            width: 100%;
+            display: none;
+            margin: 40px 0;
+        }
+        .loading-body{
+            width: 30%;
+            text-align: center;
+            margin: 0 auto;
+            padding: .4rem 0;
+            background-color: #fff;
+            border-radius: 4px;
+        }
+        .loading-icon{
+            background-image: url(data:image/gif;base64,R0lGODlhIAAgALMAAP///7Ozs/v7+9bW1uHh4fLy8rq6uoGBgTQ0NAEBARsbG8TExJeXl/39/VRUVAAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQFBQAAACwAAAAAIAAgAAAE5xDISSlLrOrNp0pKNRCdFhxVolJLEJQUoSgOpSYT4RowNSsvyW1icA16k8MMMRkCBjskBTFDAZyuAEkqCfxIQ2hgQRFvAQEEIjNxVDW6XNE4YagRjuBCwe60smQUDnd4Rz1ZAQZnFAGDd0hihh12CEE9kjAEVlycXIg7BAsMB6SlnJ87paqbSKiKoqusnbMdmDC2tXQlkUhziYtyWTxIfy6BE8WJt5YEvpJivxNaGmLHT0VnOgGYf0dZXS7APdpB309RnHOG5gDqXGLDaC457D1zZ/V/nmOM82XiHQjYKhKP1oZmADdEAAAh+QQFBQAAACwAAAAAGAAXAAAEchDISasKNeuJFKoHs4mUYlJIkmjIV54Soypsa0wmLSnqoTEtBw52mG0AjhYpBxioEqRNy8V0qFzNw+GGwlJki4lBqx1IBgjMkRIghwjrzcDti2/Gh7D9qN774wQGAYOEfwCChIV/gYmDho+QkZKTR3p7EQAh+QQFBQAAACwBAAAAHQAOAAAEchDISWdANesNHHJZwE2DUSEo5SjKKB2HOKGYFLD1CB/DnEoIlkti2PlyuKGEATMBaAACSyGbEDYD4zN1YIEmh0SCQQgYehNmTNNaKsQJXmBuuEYPi9ECAU/UFnNzeUp9VBQEBoFOLmFxWHNoQw6RWEocEQAh+QQFBQAAACwHAAAAGQARAAAEaRDICdZZNOvNDsvfBhBDdpwZgohBgE3nQaki0AYEjEqOGmqDlkEnAzBUjhrA0CoBYhLVSkm4SaAAWkahCFAWTU0A4RxzFWJnzXFWJJWb9pTihRu5dvghl+/7NQmBggo/fYKHCX8AiAmEEQAh+QQFBQAAACwOAAAAEgAYAAAEZXCwAaq9ODAMDOUAI17McYDhWA3mCYpb1RooXBktmsbt944BU6zCQCBQiwPB4jAihiCK86irTB20qvWp7Xq/FYV4TNWNz4oqWoEIgL0HX/eQSLi69boCikTkE2VVDAp5d1p0CW4RACH5BAUFAAAALA4AAAASAB4AAASAkBgCqr3YBIMXvkEIMsxXhcFFpiZqBaTXisBClibgAnd+ijYGq2I4HAamwXBgNHJ8BEbzgPNNjz7LwpnFDLvgLGJMdnw/5DRCrHaE3xbKm6FQwOt1xDnpwCvcJgcJMgEIeCYOCQlrF4YmBIoJVV2CCXZvCooHbwGRcAiKcmFUJhEAIfkEBQUAAAAsDwABABEAHwAABHsQyAkGoRivELInnOFlBjeM1BCiFBdcbMUtKQdTN0CUJru5NJQrYMh5VIFTTKJcOj2HqJQRhEqvqGuU+uw6AwgEwxkOO55lxIihoDjKY8pBoThPxmpAYi+hKzoeewkTdHkZghMIdCOIhIuHfBMOjxiNLR4KCW1ODAlxSxEAIfkEBQUAAAAsCAAOABgAEgAABGwQyEkrCDgbYvvMoOF5ILaNaIoGKroch9hacD3MFMHUBzMHiBtgwJMBFolDB4GoGGBCACKRcAAUWAmzOWJQExysQsJgWj0KqvKalTiYPhp1LBFTtp10Is6mT5gdVFx1bRN8FTsVCAqDOB9+KhEAIfkEBQUAAAAsAgASAB0ADgAABHgQyEmrBePS4bQdQZBdR5IcHmWEgUFQgWKaKbWwwSIhc4LonsXhBSCsQoOSScGQDJiWwOHQnAxWBIYJNXEoFCiEWDI9jCzESey7GwMM5doEwW4jJoypQQ743u1WcTV0CgFzbhJ5XClfHYd/EwZnHoYVDgiOfHKQNREAIfkEBQUAAAAsAAAPABkAEQAABGeQqUQruDjrW3vaYCZ5X2ie6EkcKaooTAsi7ytnTq046BBsNcTvItz4AotMwKZBIC6H6CVAJaCcT0CUBTgaTg5nTCu9GKiDEMPJg5YBBOpwlnVzLwtqyKnZagZWahoMB2M3GgsHSRsRACH5BAUFAAAALAEACAARABgAAARcMKR0gL34npkUyyCAcAmyhBijkGi2UW02VHFt33iu7yiDIDaD4/erEYGDlu/nuBAOJ9Dvc2EcDgFAYIuaXS3bbOh6MIC5IAP5Eh5fk2exC4tpgwZyiyFgvhEMBBEAIfkEBQUAAAAsAAACAA4AHQAABHMQyAnYoViSlFDGXBJ808Ep5KRwV8qEg+pRCOeoioKMwJK0Ekcu54h9AoghKgXIMZgAApQZcCCu2Ax2O6NUud2pmJcyHA4L0uDM/ljYDCnGfGakJQE5YH0wUBYBAUYfBIFkHwaBgxkDgX5lgXpHAXcpBIsRADs=);background-size:100% 100%;
+            height: 30px;
+            width: 30px;
+            margin: 10px auto;
+        }
+
+    </style>
+</head>
+<body>
+<div class="body">
+    <div class="main-title">
+        <div class="store-info">
+            <div class="logo"></div>
+            <div class="name" th:text="${storeName}"></div>
+        </div>
+        <div class="remark-info">
+            <div class="icon"></div>
+            <div class="set-remark" onclick="showRemarkDialog()">设置备注</div>
+        </div>
+    </div>
+    <div class="main-amt">
+        <div class="amt-content" onclick="showInput()">
+            <div class="input-label">金额</div>
+            <div class="input-box">￥ <span class="money-input" name="comsumeMoney" id="comsumeMoney"></span> <span class="gb"></span></div>
+        </div>
+    </div>
+
+</div>
+<div class="payinfo" id="payinfo">
+    <div class="shouyin" onclick="showInput()">
+        <p>收&nbsp;银&nbsp;就&nbsp;用&nbsp;收&nbsp;银&nbsp;呗</p>
+    </div>
+    <table cellspacing="0" cellpadding="0" id="table1">
+        <tr>
+            <td class="paynum" onclick="inputAmt(1)">1</td>
+            <td class="paynum" onclick="inputAmt(2)">2</td>
+            <td class="paynum" onclick="inputAmt(3)">3</td>
+            <td id="pay-return" onclick="inputAmt('del')"><div class="keybord-return"></div></td>
+        </tr>
+        <tr>
+            <td class="paynum" onclick="inputAmt(4)">4</td>
+            <td class="paynum" onclick="inputAmt(5)">5</td>
+            <td class="paynum" onclick="inputAmt(6)">6</td>
+            <td rowspan="3" class="pay" id="pay">支付</td>
+        </tr>
+        <tr>
+            <td class="paynum" onclick="inputAmt(7)">7</td>
+            <td class="paynum" onclick="inputAmt(8)">8</td>
+            <td class="paynum" onclick="inputAmt(9)">9</td>
+        </tr>
+        <tr>
+            <td id="pay-stop" onclick="hideInput()"><div class="keybord-stop"></div></td>
+            <td id="pay-zero" onclick="inputAmt(0)">0</td>
+            <td id="pay-float" onclick="inputAmt('.')">.</td>
+        </tr>
+    </table>
+</div>
+<div id='shade' class="shade"></div>
+
+<div class="dialog" id="dialog">
+    <div class="dialog-content">
+        <div class="label">设置备注</div>
+        <div class="remark-body">
+            <textarea id="remark" class="remark-text"></textarea>
+        </div>
+        <div class="btns">
+            <button class="btn-cancel" onclick="hideRemarkDialog('cancel')">取消</button>
+            <button class="btn-submit" onclick="hideRemarkDialog('submit')">确定</button>
+        </div>
+    </div>
+</div>
+
+<div class="loading" id="loading">
+    <div class="loading-body">
+        <div class="loading-icon">
+        </div>
+        <div class="loading-msg">
+            支付中...
+        </div>
+    </div>
+</div>
+
+
+<input type="hidden" id="merchantCode" th:value="${merchantCode}">
+<input type="hidden" id="openid" th:value="${openid}">
+<input type="hidden" id="userid" th:value="${userid}">
+<input type="hidden" id="userAppId" th:value="${userAppId}">
+<input type="hidden" id="storeId" th:value="${storeId}">
+<input type="hidden" id="unionId" th:value="${unionId}">
+<input type="hidden" id="payType" th:value="${payType}">
+<input type="hidden" id="qrNo" th:value="${qrNo}">
+<input type="hidden" id="channelVal" th:value="${channelVal}">
+</body>
+<script>
+    function inputAmt(o){
+        var dom = document.getElementById('comsumeMoney');
+        var txt = dom.innerText;
+        if(!txt){
+            if(o === 'del' || o === '.'){
+                return;
+            }
+        }
+        if(o === '.' && txt.indexOf(".") > 0){
+            return;
+        }
+        if(o === 'del'){
+            txt = txt.slice(0,-1);
+            dom.innerText = txt
+            return;
+        }
+        if(txt.indexOf(".") > 0 ){
+            var v = txt.split(".")[1];
+            if(v && v.length > 1){
+                return;
+            }
+        }else{
+            if(txt.indexOf("0") == 0 && o !== '.'){
+                return;
+            }
+        }
+        txt = txt === "" ? o : txt + "" + o;
+        let max = 99999;
+        if(parseFloat(txt) > max){
+            return;
+        }
+        dom.innerText = txt;
+    }
+    function hideInput(){
+        var dom = document.getElementById('payinfo');
+        dom.style.height = '20px'
+    }
+    function showInput(){
+        var dom = document.getElementById('payinfo');
+        dom.style.height = '13rem'
+    }
+    function showRemarkDialog(){
+        var shape = document.getElementById('shade');
+        var dialog = document.getElementById('dialog');
+        shape.style.display = 'block';
+        dialog.style.display = 'block';
+    }
+    function hideRemarkDialog(t){
+        var shape = document.getElementById('shade');
+        var dialog = document.getElementById('dialog');
+        shape.style.display = 'none';
+        dialog.style.display = 'none';
+        if(t === 'cancel'){
+            document.getElementById('remark').value = "";
+        }
+    }
+    document.getElementById("pay").onclick = ()=>{
+        var comsumeMoney = document.getElementById('comsumeMoney').innerText;
+        if(comsumeMoney == undefined || comsumeMoney == '' || comsumeMoney == null){
+            return;
+        }
+        var shape = document.getElementById('shade');
+        var loading = document.getElementById('loading');
+        shape.style.display = 'block';
+        loading.style.display = 'block';
+        var storeId = document.getElementById("storeId").value;
+        var openid = document.getElementById("openid").value;
+        var merchantCode = document.getElementById("merchantCode").value;
+        var remark = document.getElementById("remark").value;
+        var userId = document.getElementById("userid").value;
+        var unionId = document.getElementById("unionId").value;
+        var userAppId = document.getElementById("userAppId").value;
+        var payType = document.getElementById("payType").value;
+        var qrNo = document.getElementById("qrNo").value;
+        var channelVal = document.getElementById("channelVal").value;
+
+        var params = "storeId="+storeId + "&openid="+openid + "&merchantCode="+merchantCode +
+            "&remark="+remark + "&userId="+userId+"&unionId="+unionId +
+            "&userAppId="+userAppId +"&payWay="+payType+ "&comsumeMoney="+comsumeMoney;
+        if(qrNo){
+            params = params + "&snNo=" + qrNo;
+        }
+        if(channelVal){
+            params = params + "&channelVal=" + channelVal;
+        }
+        var url = "/wap/merchant/tradePay";
+        var xhr = new XMLHttpRequest();//创建请求对象
+        xhr.open("POST", url, true);//链接服务器
+        xhr.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
+        xhr.onreadystatechange = function () {
+            if (xhr.readyState === 4) {//请求已完成，且响应已就绪
+                shape.style.display = "none";
+                loading.style.display = "none";
+                if (xhr.status === 200) {//请求成功
+                    var resultStr = xhr.responseText//获取结果
+                    var resultObj = JSON.parse(resultStr);//解析数据
+                    if (resultObj.code == 200) {
+                        var rdata = resultObj.data;
+                        if("WXZF" == payType){
+                            WeixinJSBridge.invoke('getBrandWCPayRequest', {
+                                // 商品名称
+                                "appId" : rdata.payAppId,
+                                "timeStamp" : rdata.payTimeStamp,
+                                "nonceStr" : rdata.paynonceStr,
+                                "package" : rdata.payPackage,
+                                "signType" : rdata.paySignType,
+                                "paySign" : rdata.paySign,
+                            }, function(res) {
+                                if (res.err_msg == "get_brand_wcpay_request:ok" || res.err_msg == "stopMonitoringBeacons:ok") {
+                                    //成功之后跳转地址
+                                    window.location = '/wap/merchant/jumpUrl?orderNumber='+rdata.orderNumber;
+                                } else {
+                                    cancelPay(rdata.orderNumber);
+                                    alert("支付失败");
+                                }
+                            })
+                        }else if("ZFBZF" == payType){
+                            var reg=/^([hH][tT]{2}[pP]:\/\/|[hH][tT]{2}[pP][sS]:\/\/)(([A-Za-z0-9-~]+).)+([A-Za-z0-9-~\/])+$/;
+                            if(reg.test(rdata.source)){
+                                window.location = rdata.source;
+                            }else{
+                                ap.tradePay({
+                                    tradeNO : rdata.source
+                                }, function(res) {
+                                    if (res.resultCode == '9000') {
+                                        window.location = '/wap/merchant/jumpUrl?orderNumber='+rdata.orderNumber; //订单支付成功
+                                    } else if (res.resultCode == '8000') {
+                                    } else if (res.resultCode == '4000') {
+                                        cancelPay(rdata.orderNumber);
+                                        ap.alert("订单支付失败");
+                                    } else if (res.resultCode == '6001' || res.resultCode == '99') {
+                                        cancelPay(rdata.orderNumber);
+                                    } else if (res.resultCode == '6002') {
+                                        cancelPay(rdata.orderNumber);
+                                        ap.alert("网络连接出错");
+                                    }
+                                });
+                            }
+                        }else{
+                            window.location = rdata.redirectUrl;
+                        }
+                    } else {
+                        alert(resultObj.message);
+                    }
+                }
+                else {
+                    alert("错误码 : " + xhr.status);
+                }
+            }
+        }
+        xhr.send(params);//发送请求
+    }
+    function cancelPay(orderNumber) {
+        var url = "/wap/merchant/cancelPay/"+orderNumber;
+        var xhr = new XMLHttpRequest();//创建请求对象
+        xhr.open("GET", url, true);//链接服务器
+        xhr.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
+        xhr.onreadystatechange = function () {
+        }
+        xhr.send();//发送请求
+    }
+</script>
+<script type="text/javascript">
+    (function (doc, win) {
+        var docEl = doc.documentElement,
+            resizeEvt = 'orientationchange' in window ? 'orientationchange' : 'resize',
+            recalc = function () {
+                var clientWidth = docEl.clientWidth;
+                if (!clientWidth) return;
+                docEl.style.fontSize = 20 * (clientWidth / 320) + 'px';//其中“20”根据你设置的html的font-size属性值做适当的变化
+            };
+
+        if (!doc.addEventListener) return;
+        win.addEventListener(resizeEvt, recalc, false);
+        doc.addEventListener('DOMContentLoaded', recalc, false);
+    })(document, window);
+</script>
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/templates/th_pay_test.html b/pluss-wap-page/src/main/resources/templates/th_pay_test.html
new file mode 100644
index 0000000..40f2785
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/templates/th_pay_test.html
@@ -0,0 +1,484 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <meta charset="utf-8">
+    <meta content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=no" name="viewport">
+    <meta content="yes" name="apple-mobile-web-app-capable">
+    <meta content="black" name="apple-mobile-web-app-status-bar-style">
+    <meta content="telephone=no" name="format-detection">
+    <meta content="email=no" name="format-detection">
+    <!--    <link rel="stylesheet" href="https://act.weixin.qq.com/static/cdn/css/wepayui/0.1.1/wepayui.min.css">-->
+    <script src="https://www.shouyinbei.net/resources/js/alipayjsapi.min3.1.1.js"></script>
+    <title>向商户付款</title>
+    <style>
+        * {
+            padding: 0;
+            margin: 0;
+        }
+        html,body{
+            width:100%;
+            height:100%;
+            margin:0 auto;
+            padding:0px;
+            background-color:#EFEFF4;
+        }
+        .payinfo{
+            display: block;
+            position: absolute;
+            bottom: 0;
+            height: 13rem;
+            width: 100%;
+            overflow: hidden;
+            transition: .4s;
+        }
+        table{
+            width:100%;
+            height: 91%;
+            bottom: 0;
+            background-color:white;
+        }
+        table tr{
+            height: 25%;
+        }
+        table tr td{
+            text-align:center;
+            width:24.9999999%;
+            border-right:1px solid #D9D9D9;
+            border-bottom:1px solid #D9D9D9;
+        }
+        table tr td:active{
+            background-color:#ECECEC;
+        }
+        .keybord-return,.keybord-stop{
+            width:30px;
+            height:30px;
+            margin:0px auto;
+            color:white;
+        }
+        .keybord-return{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADICAMAAACahl6sAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAALpQTFRFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAqyRq8wAAAD10Uk5TAAM/gJ+efz5Q2ddPAouKAZZ8nP0vrfcLN03+GcxYu9gSGkCBndobPbe8+QonMuCH7xOIW0fNtCwra4NgHN+ehK8AAAABYktHRACIBR1IAAAACXBIWXMAAABIAAAASABGyWs+AAAB4UlEQVR42u3c51LCQBiF4Y2IgDQVRcWCvffe9v5vS2FGhSH5kTLzney8zxWcd3ZD+BXnAAAAAAAAAAAAgFSiucp8daEWWe/Iq97wY4tN6yW5tNr+T6drvSa77pKfsGw9J7PWymSH761aDyqmw/s160XZTN+rkf669aYsZs7jx4b1qII6/Kb1qvRm79VIzXpWarHn4Qdb1ruK6fDb1rvSir9X3u9YD0sp4Tz8bst6WTEdwz3rZekk3avGvvUyOuiwR4cWOrTQoYUOLXRooUMLHVro0EKHFjq00KGFDi10aKFDCx1a6NBChxY6tNChhQ4tdIhpx3cMy9ZRD6QjaoTR4Q7CeD6cOwzjPJyrhnEezh3FhByfWK/KoBLK1TqNfdhLeCbRMJCfX9cM5IXoXCeUkqQ/jeV7TijRQ4keSvRQoocSPZTooUQPJXoo0UOJHkr0UKKHEj2U6KFEDyV6KNFDiR5K9FCihxI9lOgJpySUD04ml5yV7jPlSberfN8tTjiTc+tdRZVcXFrvSi/+dl1Zz8og9kyurVcVVVK6b2KPzd6uG+tJGc2cya31ooJK7u6tB2U2dbt65Xsf/ms9DH47+o/WY/J5eh5nDF5erZfk9vb+Ufn8sl4BAAAAAAAAAAAAY9/5YLt8mhkMlgAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAyMC0wNy0wNFQxNTowMjo0OSswODowMMIgQKAAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMjAtMDctMDRUMTU6MDI6NDkrMDg6MDCzffgcAAAAR3RFWHRzdmc6YmFzZS11cmkAZmlsZTovLy9ob21lL2FkbWluL2ljb24tZm9udC90bXAvaWNvbl91ZmVhaXVpd2lrZy9iYWNrLnN2Z4Ft+LMAAAAASUVORK5CYII=); background-size:100% 90%; }
+        .keybord-stop{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAgAAAAIACAMAAADDpiTIAAAAA3NCSVQICAjb4U/gAAAACXBIWXMAAA3lAAAN5QHm6mmvAAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAAWtQTFRF////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAR9G26gAAAHh0Uk5TAAECAwQFBgcICQsMDQ4PEBMUFRcaHyEiJiwuLzAyMzQ1Nj0+P0JGR0pNUFZXW11eYmZnaG1ub3F3eH6Ag4SFhomMj5WWmJmgoqWmp6usrrGytLq9vsLDxsnKy87P0NLT1dfZ3N7i4+Tl5unr7O/w8vX29/n6+/3+X88dAwAACGRJREFUeNrt3Y1/jfUfx/HvSFbKXaxVilVCq4lFIRRRQm6SkbsYs9pqbcr682PkdtfsOlOPc6738/UHXI/f4/N+/kp2zrVS5tvyvoF9x4cuXx+b+ltt2tTY9ctDx/cN9C0vz7dV/YeHnbeTGj7cv+p5rf/67ovTLtp5TV/c/frC11+x7axTdm5nt61Y0Pyv7p90xM5ucv+rLc+/ZMeYA3Z+YzuWtLZ/vz/3NaTh/hbmf++cwzWnc+/VnL/3pKM1q5O9dfbfMuFiTWtiy/z333XbvZrX7V3znL/7iGM1syPd89l/zXmXamrn1zx7/w2j7tTcRjc8a/+P/ayv0U19/Iz9najpzSlgg///N/+fAXP8W2CNf/8HNFr5J8Fuf/6P6HzVfw367/+QjlT8/Z/LpDTr3wlu8fe/Md2e5ecCvX7+E9TE0z8b9PPfqE4+9fkPN8nqyU+InHOSrM498fk/F0nrsc8JLvH5z7iGH/2s8A73yGvHI9//8Pn/wMYefmNkv2sktv/B9/98/yuyyX+/N7jNLTLbdh+A7/+Gdvb+9/9dIrV77w/Y7RCp7Z4BcNEhUrs48/4f73+JbXqVHwNkd/cHAoedIbfDdwD4OVBww6Usd4Xklpc+R0iurww4QnIDZZ8jJLevHHeE5I6XIUdIbqhcdoTkLpfrjpDc9eLjgNGNFe8EiW6quEF2AAAgAASAABAAAkAACAABIAAEgAAQAAJAAAgAASAABIAAEAACQAAIgJmmLtWv8mHj9Z91rfJhI/UfNlL5sGv1HzZe+bAWTjbVtgAulfpVPuxQ/Wetq3zYYP2HDVY+bF39hx2qHqB+lwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA1JEBAIAAEAACQAAIAAEgAASAABAAAkAACAABIAAEgAAQAAJAAAgAASAAZho/VL/Kh/1c/1nHKh/2Y/2H/Vj5sGP1H/Zz5cNaONl42wLw1TDfDQQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADg/wRwbV39Kh92rP6zPqp82N76D9tb+bCP6j+s+pfZtHCya20LQJ0XAAAIAAEgAASAABAAAkAACAABIAAEgAAQAAJAAAgAASAABIAAEAACQAAIAAEgAASAABAAAkAACAABIAAEgAAQAAJAAAgAASAABIAAEAACQAAIgLu18Euj2rdDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AfzVrv/Lxi81qPF2vfJf5be2tan/od/KiCMkN1KuOkJyV8tPjpDcT+W0IyR3uhx0hOQOlk8dIblPyweOkNwHZa0jJLe2dE24Qm4TXaWccobcTpVSPnOG3D67A+BNZ8jtzTsAun51h9R+7br7s+pvHSK1b2c+rLDJIVLbNANg8S8ukdkvi+99Xukrp8jsq/sfWHvLKTJ769+PLJ5xi8TOPPjM6vpp18hrev3DTy0fdY68jj7ysfWeW+6R1q2eR7+4cMBB0jrw2DdXVv7uIln9vvLx7y597iRZff7El9e6b7hJUje6n/z64oCjJDXw9BdYv3GVnL6Z5RvMS4fcJaWhpbN9h/013xMNaeS12d9i8Pak2yQ0+XbVeyz6HSeh/uo3mXzhOs3vizleZdP1vfs0ve+75nqZ0cs+GtDwzrw89+usXvB18UZ38IVnvtFs8E9namp/Ds7nnXbvt+07zbSwxt+f31sNe664VRO70jPf91ouO+FazevEsvm/2bRrj8+INaxbe7pqvdy25zufFG5Q09/1lLq9468EGtOZd1p6xfVmfxhsRFc2t/qS80Wf3HS+Tu/mJ4sW8J77l3ZecMJO7sLOlxb6uw7e+NI/Bjr1//xfvvFcft3For5dp/9wzs7qj9O7+haV59eL7+78+odRd+2ERn/4eue7L/4nv/rmld71Gz/cun1Qbdn2rR9uXN/7SpEkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZKkuq1u0i9zWW3P+u1pzq9x2mPNaAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAen7/wNF3uGEUW54AwAAAABJRU5ErkJggg==); background-size:100% 100%;}
+        .pay{
+            color:#ffffff;
+            font-size:120%;
+            background-color:#df6051;
+        }
+        .pay:active{
+            /*background-color: #df6051;*/
+            background-color: rgba(223,96,81,0.7);
+        }
+        .shouyin{
+            text-align: center;
+            color: #9b9b9b;
+            font-size: 13px;
+            margin-bottom: 10px;
+        }
+        .logo{
+            background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAD70lEQVRoQ9VaTYgURxT+Xm8w7PQs6CFgXDCXEAKeFHKLRKMo6HoSc0qmqlfxICSn/KCXmIMuiZ4UBEG3q+aokItKiGSTDZ5CIHtK9LAXhRVJDoZs9ywR7CfVuzPMzM5sV/X0MNt92Z7q9773vu2qej/VhIKuSIgDBO8AgEkCTybApLlfg1/ygCUGLSH9m8xVtZ4rwjQNAhLXgikQjgE8BWCHI9ZTgO6Cccevh3cddVvizgT4zJnqSqMRMFMA8O68hjv1aIGIw/FKJaRr1yIXTGsCkZTbx5iChJNpEL3tYsRalnnRI2/2JXFYVeqZjZ4VgVjK95hRJ+BdG9BBZRh4RISar9TvWViZBFZq0/sTSn7OAhrGc4+9D8frs79shL0hgUiIgECzw3DOFpPB01Wtw37yfQlEQnxJoG9tDQ1TjsFfVbX+rpeNngRiIU4CdGOYTrlj8ylf65vdeusIxEIcTffnTXnxlK/1vXbXOgiYrZKYHwBD2iYH/qfwIhPtbd9iOwisiOBsAr44sJ0hAnigc+M6nGmaaBEwEbYRxQtDC1JFkWJerFT93c2I3SLQkPJTZlwpys4wcYjwWUWpq8ZGi0Asgj9cchsC5l8yfi3C0THCBwzss8eiBV+He1oEIiEOEehHewAgYXwzUVfnXXT6yS7X5HmP8LULFoMPV7W+n76BhhCXGPS5C8Bo34CZOny5ovUXKYFYyMcAdroScJHPknWbQinaE1+rt6jxyfT77CUPsgx0BY/5ilb7XXSyZGMh/wewJUuuw4/E20uxCC4CfNZJkXC8otT3LjpZsrGUF8A4lyXX+ZxmDAENcM1F0dcqMw13wUun8cen38TYi6duelSnhpA/MWCKcdvrpq/VKVthF7lYSJODHbXVIWCOIiEfulRaDD5YVEeh29HVJgHfsSWQVm6RkP8RMGGr9IKwbZtS/7bLLwfBG+b3RBj+M8j4cym3bmE8t/WFgWVnAuDkiF+v/9DhqAlESH4bdLwh5Qlm3HIl4DSFDDgRPqooddvctxstatyBwKM8i7iJ/+faza4ug0WNZ/JIF3GebdQgJ4Q0kHmMDbsGWV4MhkP1XIHMOGViwbKU+4ogMKHUfCwkZ5Fd/5xmcqUSm4UAmVQijYI5krlN8AZWk7l0J8mRTo+aQEc6naegGTWBjoJmdRq5lZSjJdBVUq4FJKei/jWPdr0ehn+57xzrNUwq4iX8ty1Wz6I+R1vlfkJo9WdsjfeSI8Z1At6xwujXVjHKpW5sGQKlby2uLuYSN3ebc7DU7fUmiVIfcLSRKO8RU5NEqQ/5WmuizMesrelU5oPu9ghZ2k8NeoX5Un7s0S9fGdXnNq8Aors/k02FsxcAAAAASUVORK5CYII=);background-size:100% 100%;
+            width: 2.1875rem;
+            height: 2.1875rem;
+        }
+        .icon{
+            background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAC7UlEQVRYR72WTWgTURDH/7ObJi1YENFT4kVtD/YgSMFaaOrbpfYgeElaURA8CIKKIAhCQYyCIAiC0KLgodBDwUqhiODB8N42RfFQEYoVBUGRCiKioPUjNbsjK4mk2ySbTTe+687O7/dm3hehiSOXy+20bXuEiAQzTwkhznpx1Cx+ET4FoKuMMSaEOF3ObIpAFfhfruM4l0zTzJQkmiIwNze3y7btKWbuXFNyoh/RaHRzb2/vT/db6AKWZd1h5tsAlgHcBZDwSHxLJBJbOjo68qELSCkniegwgC8A9gPYQETTzLypJNG0FkgpJ4joaNlsX2qadpCIttm2PQOglZlvGoZxMvRFqJQaB3DM229mzsVisaF8Pr8XwCHDMI6Evg2VUm6/j1fbzkR0Lx6PD5d6HqqAUuoWgBM+Z8n07OzscCaTcSrFNbwLlFKjAE75wGfa29uHu7u7f1etUCMnoWVZN5j5jM+/9wEMCSF+1YoLXAEp5XUiWnOmeyAPVlZWhgYHB7/7TTCQgFLqGoBzPkkftrW1pXt6er76wQMdREqpqwDO1ywnkdR1Pd3X1+ceRHWNuiogpbxCRCO1Mrp7nohSQohPdZGLQb4CUsrLRHTBJ+kjAGkhxIcg8JotyGazndFoNOLeap473ct44jhO2jTN90HhNQUsy3JX+pKmaYs1JOYLhUJqYGDgXSPwmgJKqSwAk5kPRCKRtxUknmmalurv73/TKLyqQPFFs1hK7DjOnpaWluWSBBEtMLO74F6vB15VQCl1EcC/Z5MbGIlEtjNza/GlkzIM49V64VUFpJRPiWi3F1AoFDbGYrF4Mpl8EQa8ooC3/EXQvOM4E5qmjQsh3KdWaGPNOVBefiKatG17zDTNx6ERPYkqCTwHMCqEcO/6po9VAm75w+xvPfarBJRS7hN6Rz0/BonRdf1jtYl5BThI4iCxuq53VZL4bwIAtgohlrzSlRbhviAzqydW1/XPyWRyoVKs73VcD2A9MX8AVWwjMF0q1kMAAAAASUVORK5CYII=);background-size:100% 100%;
+            width: .9375rem;
+            height: .9375rem;
+        }
+        .body{
+            padding: 2rem 1rem;
+        }
+        .store-info{
+            display: flex;
+            align-items: center;
+        }
+        .name{
+            margin-left: .5rem;
+        }
+        .main-amt{
+            height: 3rem;
+            padding: 1.2rem 0 0 0;
+        }
+        .amt-content {
+            display: flex;
+            background: #fff;
+            padding: .5rem 1rem;
+            border-radius: 4px;
+            height: 2.5rem;
+            font-size: 1.125rem;
+        }
+        .input-label {
+            flex: 1;
+            line-height: 2.5rem;
+        }
+        .input-box {
+            line-height: 2.5rem;
+            font-size: 1.5625rem;
+            color: #777;
+        }
+        .gb {
+            display: inline-block;
+            width: 2px;
+            height: 1.875rem;
+            margin-top: -6px;
+            background: #df6051;
+            vertical-align: middle;
+            animation: gb 1.3s infinite;
+        }
+        .money-input {
+            font-weight: bold;
+            color: #df6051;
+        }
+        @keyframes gb {
+            from {
+                opacity: 1;
+            } to {
+                  opacity: 0;
+              }
+        }
+        .remark-info{
+            display: flex;
+            align-items: center;
+            font-size: 13px;
+            color: #9e9e9e;
+        }
+        .set-remark{
+            margin-left: 5px;
+        }
+        .main-title{
+            display: flex;
+            justify-content: space-between;
+        }
+
+        .shade{
+            display: none;
+            position: absolute;
+            top: 0;
+            left: 0;
+            width: 100%;
+            height: 100%;
+            background-color: rgba(0,0,0,.1);
+            z-index: 1002;
+            overflow: auto;
+        }
+        .dialog{
+            z-index: 8888;
+            height: 13rem;
+            width: 100%;
+            position: absolute;
+            display: none;
+        }
+        .dialog-content{
+            background: #fff;
+            height: 11rem;
+            border-radius: 10px;
+            padding: 10px 20px;
+            margin: 0 auto;
+            width: 60%;
+        }
+        .btns{
+            padding: 0 0 0 5%;
+        }
+        .btn-cancel{
+            width: 45%;
+            height: 1.8rem;
+            border-radius: 20px;
+            border: none;
+        }
+        .btn-submit{
+            width: 45%;
+            height: 1.8rem;
+            border-radius: 20px;
+            border: none;
+            background-color: #df6051;
+            color: #fff;
+        }
+        .remark-text{
+            border: 1px solid #e4e0e0;
+            height: 6rem;
+            width: 100%;
+        }
+        .remark-body{
+            margin-top: 15px;
+        }
+        .loading{
+            z-index: 10000;
+            position: absolute;
+            width: 100%;
+            display: none;
+            margin: 40px 0;
+        }
+        .loading-body{
+            width: 30%;
+            text-align: center;
+            margin: 0 auto;
+            padding: .4rem 0;
+            background-color: #fff;
+            border-radius: 4px;
+        }
+        .loading-icon{
+            background-image: url(data:image/gif;base64,R0lGODlhIAAgALMAAP///7Ozs/v7+9bW1uHh4fLy8rq6uoGBgTQ0NAEBARsbG8TExJeXl/39/VRUVAAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQFBQAAACwAAAAAIAAgAAAE5xDISSlLrOrNp0pKNRCdFhxVolJLEJQUoSgOpSYT4RowNSsvyW1icA16k8MMMRkCBjskBTFDAZyuAEkqCfxIQ2hgQRFvAQEEIjNxVDW6XNE4YagRjuBCwe60smQUDnd4Rz1ZAQZnFAGDd0hihh12CEE9kjAEVlycXIg7BAsMB6SlnJ87paqbSKiKoqusnbMdmDC2tXQlkUhziYtyWTxIfy6BE8WJt5YEvpJivxNaGmLHT0VnOgGYf0dZXS7APdpB309RnHOG5gDqXGLDaC457D1zZ/V/nmOM82XiHQjYKhKP1oZmADdEAAAh+QQFBQAAACwAAAAAGAAXAAAEchDISasKNeuJFKoHs4mUYlJIkmjIV54Soypsa0wmLSnqoTEtBw52mG0AjhYpBxioEqRNy8V0qFzNw+GGwlJki4lBqx1IBgjMkRIghwjrzcDti2/Gh7D9qN774wQGAYOEfwCChIV/gYmDho+QkZKTR3p7EQAh+QQFBQAAACwBAAAAHQAOAAAEchDISWdANesNHHJZwE2DUSEo5SjKKB2HOKGYFLD1CB/DnEoIlkti2PlyuKGEATMBaAACSyGbEDYD4zN1YIEmh0SCQQgYehNmTNNaKsQJXmBuuEYPi9ECAU/UFnNzeUp9VBQEBoFOLmFxWHNoQw6RWEocEQAh+QQFBQAAACwHAAAAGQARAAAEaRDICdZZNOvNDsvfBhBDdpwZgohBgE3nQaki0AYEjEqOGmqDlkEnAzBUjhrA0CoBYhLVSkm4SaAAWkahCFAWTU0A4RxzFWJnzXFWJJWb9pTihRu5dvghl+/7NQmBggo/fYKHCX8AiAmEEQAh+QQFBQAAACwOAAAAEgAYAAAEZXCwAaq9ODAMDOUAI17McYDhWA3mCYpb1RooXBktmsbt944BU6zCQCBQiwPB4jAihiCK86irTB20qvWp7Xq/FYV4TNWNz4oqWoEIgL0HX/eQSLi69boCikTkE2VVDAp5d1p0CW4RACH5BAUFAAAALA4AAAASAB4AAASAkBgCqr3YBIMXvkEIMsxXhcFFpiZqBaTXisBClibgAnd+ijYGq2I4HAamwXBgNHJ8BEbzgPNNjz7LwpnFDLvgLGJMdnw/5DRCrHaE3xbKm6FQwOt1xDnpwCvcJgcJMgEIeCYOCQlrF4YmBIoJVV2CCXZvCooHbwGRcAiKcmFUJhEAIfkEBQUAAAAsDwABABEAHwAABHsQyAkGoRivELInnOFlBjeM1BCiFBdcbMUtKQdTN0CUJru5NJQrYMh5VIFTTKJcOj2HqJQRhEqvqGuU+uw6AwgEwxkOO55lxIihoDjKY8pBoThPxmpAYi+hKzoeewkTdHkZghMIdCOIhIuHfBMOjxiNLR4KCW1ODAlxSxEAIfkEBQUAAAAsCAAOABgAEgAABGwQyEkrCDgbYvvMoOF5ILaNaIoGKroch9hacD3MFMHUBzMHiBtgwJMBFolDB4GoGGBCACKRcAAUWAmzOWJQExysQsJgWj0KqvKalTiYPhp1LBFTtp10Is6mT5gdVFx1bRN8FTsVCAqDOB9+KhEAIfkEBQUAAAAsAgASAB0ADgAABHgQyEmrBePS4bQdQZBdR5IcHmWEgUFQgWKaKbWwwSIhc4LonsXhBSCsQoOSScGQDJiWwOHQnAxWBIYJNXEoFCiEWDI9jCzESey7GwMM5doEwW4jJoypQQ743u1WcTV0CgFzbhJ5XClfHYd/EwZnHoYVDgiOfHKQNREAIfkEBQUAAAAsAAAPABkAEQAABGeQqUQruDjrW3vaYCZ5X2ie6EkcKaooTAsi7ytnTq046BBsNcTvItz4AotMwKZBIC6H6CVAJaCcT0CUBTgaTg5nTCu9GKiDEMPJg5YBBOpwlnVzLwtqyKnZagZWahoMB2M3GgsHSRsRACH5BAUFAAAALAEACAARABgAAARcMKR0gL34npkUyyCAcAmyhBijkGi2UW02VHFt33iu7yiDIDaD4/erEYGDlu/nuBAOJ9Dvc2EcDgFAYIuaXS3bbOh6MIC5IAP5Eh5fk2exC4tpgwZyiyFgvhEMBBEAIfkEBQUAAAAsAAACAA4AHQAABHMQyAnYoViSlFDGXBJ808Ep5KRwV8qEg+pRCOeoioKMwJK0Ekcu54h9AoghKgXIMZgAApQZcCCu2Ax2O6NUud2pmJcyHA4L0uDM/ljYDCnGfGakJQE5YH0wUBYBAUYfBIFkHwaBgxkDgX5lgXpHAXcpBIsRADs=);background-size:100% 100%;
+            height: 30px;
+            width: 30px;
+            margin: 10px auto;
+        }
+        .dialog-confirm{
+            height:5rem;
+        }
+        .dialog-body{
+            text-align: center;
+            padding: 10px 0;
+            font-size: 17px;
+        }
+        .confirm-btn-div{
+            height: 1.5rem;
+            margin-top: 10px;
+        }
+        .confirm-btn{
+            height: 100%;
+            border-radius: 20px;
+            border: none;
+        }
+    </style>
+</head>
+<body>
+<div class="body">
+    <div class="main-title">
+        <div class="store-info">
+            <div class="logo"></div>
+            <div class="name" th:text="测试门店"></div>
+        </div>
+        <div class="remark-info">
+            <div class="icon"></div>
+            <div class="set-remark" onclick="showRemarkDialog()">设置备注</div>
+        </div>
+    </div>
+    <div class="main-amt">
+        <div class="amt-content" onclick="showInput()">
+            <div class="input-label">金额</div>
+            <div class="input-box">￥ <span class="money-input" name="comsumeMoney" id="comsumeMoney"></span> <span class="gb"></span></div>
+        </div>
+    </div>
+
+</div>
+<div class="payinfo" id="payinfo">
+    <div class="shouyin" onclick="showInput()">
+        <p>收&nbsp;银&nbsp;就&nbsp;用&nbsp;收&nbsp;银&nbsp;呗</p>
+    </div>
+    <table cellspacing="0" cellpadding="0" id="table1">
+        <tr>
+            <td class="paynum" onclick="inputAmt(1)">1</td>
+            <td class="paynum" onclick="inputAmt(2)">2</td>
+            <td class="paynum" onclick="inputAmt(3)">3</td>
+            <td id="pay-return" onclick="inputAmt('del')"><div class="keybord-return"></div></td>
+        </tr>
+        <tr>
+            <td class="paynum" onclick="inputAmt(4)">4</td>
+            <td class="paynum" onclick="inputAmt(5)">5</td>
+            <td class="paynum" onclick="inputAmt(6)">6</td>
+            <td rowspan="3" class="pay" id="pay">支付</td>
+        </tr>
+        <tr>
+            <td class="paynum" onclick="inputAmt(7)">7</td>
+            <td class="paynum" onclick="inputAmt(8)">8</td>
+            <td class="paynum" onclick="inputAmt(9)">9</td>
+        </tr>
+        <tr>
+            <td id="pay-stop" onclick="hideInput()"><div class="keybord-stop"></div></td>
+            <td id="pay-zero" onclick="inputAmt(0)">0</td>
+            <td id="pay-float" onclick="inputAmt('.')">.</td>
+        </tr>
+    </table>
+</div>
+<div id='shade' class="shade"></div>
+
+<div class="dialog" id="dialogConfirm">
+    <div class="dialog-content dialog-confirm">
+        <div class="remark-body">
+            <div class="dialog-body">确认支付吗？</div>
+        </div>
+        <div class="btns confirm-btn-div">
+            <button class="btn-cancel confirm-btn" onclick="confirmDialog('none','cancel')">取消</button>
+            <button class="btn-submit confirm-btn" onclick="confirmDialog('none','submit')">确定</button>
+        </div>
+    </div>
+</div>
+
+<div class="dialog" id="dialog">
+    <div class="dialog-content">
+        <div class="label">设置备注</div>
+        <div class="remark-body">
+            <textarea id="remark" class="remark-text"></textarea>
+        </div>
+        <div class="btns">
+            <button class="btn-cancel" onclick="hideRemarkDialog('cancel')">取消</button>
+            <button class="btn-submit" onclick="hideRemarkDialog('submit')">确定</button>
+        </div>
+    </div>
+</div>
+
+<div class="loading" id="loading">
+    <div class="loading-body">
+        <div class="loading-icon">
+        </div>
+        <div class="loading-msg">
+            支付中...
+        </div>
+    </div>
+</div>
+</body>
+<script>
+    function inputAmt(o){
+        var dom = document.getElementById('comsumeMoney');
+        var txt = dom.innerText;
+        if(!txt){
+            if(o === 'del' || o === '.'){
+                return;
+            }
+        }
+        if(o === '.' && txt.indexOf(".") > 0){
+            return;
+        }
+        if(o === 'del'){
+            txt = txt.slice(0,-1);
+            dom.innerText = txt
+            return;
+        }
+        if(txt.indexOf(".") > 0 ){
+            var v = txt.split(".")[1];
+            if(v && v.length > 1){
+                return;
+            }
+        }else{
+            if(txt.indexOf("0") == 0 && o !== '.'){
+                return;
+            }
+        }
+        txt = txt === "" ? o : txt + "" + o;
+        let max = 99999;
+        if(parseFloat(txt) > max){
+            return;
+        }
+        dom.innerText = txt;
+    }
+    function hideInput(){
+        var dom = document.getElementById('payinfo');
+        dom.style.height = '20px'
+    }
+    function showInput(){
+        var dom = document.getElementById('payinfo');
+        dom.style.height = '13rem'
+    }
+    function showRemarkDialog(){
+        var shape = document.getElementById('shade');
+        var dialog = document.getElementById('dialog');
+        shape.style.display = 'block';
+        dialog.style.display = 'block';
+    }
+
+    function hideRemarkDialog(t){
+        var shape = document.getElementById('shade');
+        var dialog = document.getElementById('dialog');
+        shape.style.display = 'none';
+        dialog.style.display = 'none';
+        if(t === 'cancel'){
+            document.getElementById('remark').value = "";
+        }
+    }
+
+    function confirmDialog(type,op){
+        var shape = document.getElementById('shade');
+        var dialogConfirm = document.getElementById('dialogConfirm');
+        shape.style.display = type;
+        dialogConfirm.style.display = type;
+        if(op && op == "submit"){
+            tradePayTest();
+        }
+        if(op && op == "cancel"){
+            tradePayCancelTest();
+        }
+
+    }
+    document.getElementById("pay").onclick = ()=>{
+        let comsumeMoney = document.getElementById('comsumeMoney').innerText;
+        if(comsumeMoney == undefined || comsumeMoney == '' || comsumeMoney == null){
+            return;
+        }
+        confirmDialog("block");
+    }
+
+    function showLoading(type){
+        var shape = document.getElementById('shade');
+        var loading = document.getElementById('loading');
+        shape.style.display = type;
+        loading.style.display = type;
+    }
+    function tradePayTest(){
+        confirmDialog("none");
+        showLoading('block');
+        let comsumeMoney = document.getElementById('comsumeMoney').innerText;
+        let params = "comsumeMoney="+comsumeMoney;
+        var url = "/wap/merchant/tradePayTest";
+        var xhr = new XMLHttpRequest();//创建请求对象
+        xhr.open("POST", url, true);//链接服务器
+        xhr.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
+        xhr.onreadystatechange = function () {
+            if (xhr.readyState === 4) {//请求已完成，且响应已就绪
+                showLoading('none');
+                if (xhr.status === 200) {//请求成功
+                    var resultStr = xhr.responseText//获取结果
+                    var resultObj = JSON.parse(resultStr);//解析数据
+                    if (resultObj.code == 200) {
+                        alert(resultObj.data);
+                        setTimeout(function (){
+                            window.location = '/wap/merchant/jumpUrlTest';
+                        },2000)
+                    } else {
+                        alert(resultObj.message);
+                    }
+                }
+                else {
+                    alert("错误码 : " + xhr.status);
+                }
+            }
+        }
+        xhr.send(params);//发送请求
+    }
+    function tradePayCancelTest() {
+        let comsumeMoney = document.getElementById('comsumeMoney').innerText;
+        var url = "/wap/merchant/cancelPayTest/"+comsumeMoney;
+        var xhr = new XMLHttpRequest();//创建请求对象
+        xhr.open("GET", url, true);//链接服务器
+        xhr.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
+        xhr.onreadystatechange = function () {
+            if (xhr.readyState === 4) {//请求已完成，且响应已就绪
+                if (xhr.status === 200) {//请求成功
+                    var resultStr = xhr.responseText//获取结果
+                    var resultObj = JSON.parse(resultStr);//解析数据
+                    if (resultObj.code == 200) {
+                        alert(resultObj.data);
+                    } else {
+                        alert(resultObj.message);
+                    }
+                }
+                else {
+                    alert("错误码 : " + xhr.status);
+                }
+            }
+        }
+        xhr.send();//发送请求
+    }
+</script>
+<script type="text/javascript">
+    (function (doc, win) {
+        var docEl = doc.documentElement,
+            resizeEvt = 'orientationchange' in window ? 'orientationchange' : 'resize',
+            recalc = function () {
+                var clientWidth = docEl.clientWidth;
+                if (!clientWidth) return;
+                docEl.style.fontSize = 20 * (clientWidth / 320) + 'px';//其中“20”根据你设置的html的font-size属性值做适当的变化
+            };
+
+        if (!doc.addEventListener) return;
+        win.addEventListener(resizeEvt, recalc, false);
+        doc.addEventListener('DOMContentLoaded', recalc, false);
+    })(document, window);
+</script>
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/templates/user/th_agent.html b/pluss-wap-page/src/main/resources/templates/user/th_agent.html
new file mode 100644
index 0000000..f31d82b
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/templates/user/th_agent.html
@@ -0,0 +1,254 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <title>新增代理</title>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0,user-scalable=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="apple-mobile-web-app-title" content="">
+    <meta name="HandheldFriendly" content="true">
+    <meta name="format-detection" content="telephone=no">
+    <link rel="stylesheet" href="/wap/resources/css/weui.css">
+    <link rel="stylesheet" href="/wap/resources/css/weuix.css">
+    <style>
+        body{
+            background-color: #f7f7f7;
+        }
+        .main{
+            color: #333;
+            padding: 0 10px 20px 10px;
+            background-color: #fff;
+            margin: 0 10px;
+            border-radius:5px;
+        }
+        .kaptcha{
+            width: 80px;
+            height: 32px;
+        }
+        /*.weui-cells_form{*/
+        /*    height: 1.5rem;*/
+        /*    line-height: normal;*/
+        /*}*/
+        .weui-toast weui_loading_toast weui-toast--visible{
+            padding: 10px 0;
+        }
+        .weui-icon_toast{
+            margin: 20px 0 0;
+        }
+        .weui-icon_toast.weui-loading{
+            margin: 15px 0 0 0;
+        }
+        .weui-cells_form_btn{
+            width: 80%;
+            margin: 0.8rem auto 0 auto;
+        }
+        .weui-btn_plain-primary{
+            box-sizing: border-box;
+            border: 1px solid #FF586A;
+            color: #FF586A;
+        }
+    </style>
+</head>
+<body>
+<input type="hidden" id="token" name="token" th:value="${token}">
+<input type="hidden" id="uid" name="uid" th:value="${uid}">
+<div class="main">
+    <div class="weui-cells weui-cells_form bdbe" style="margin-top:10px;">
+        <div class="weui-cell weui-cell_warn">
+            <div class="weui-cell__hd"><span class="icon icon-90 f24"></span></div>
+            <div class="weui-cell__bd">
+                <input class="weui-input tleft pl10" id="phone" type="number" pattern="[0-9]*" value="weui input error" th:autocomplete="off" placeholder="注册手机号">
+            </div>
+        </div>
+    </div>
+    <div class="weui-cells weui-cells_form bdbe">
+        <div class="weui-cell weui-cell_warn">
+            <div class="weui-cell__hd"><span class="icon icon-71 f24"></span></div>
+            <div class="weui-cell__bd">
+                <input class="weui-input tleft pl10" id="validateCode" type="text" maxlength="4" value="" placeholder="图形验证码">
+            </div>
+            <div class="weui-cell__bd tright">
+                <img src="/wap/kaptcha/get"  onclick="refreshKaptcha(this)" th:autocomplete="off"  class="kaptcha dlblock white f12" />
+            </div>
+        </div>
+    </div>
+
+    <div class="weui-cells weui-cells_form bdbe">
+        <div class="weui-cell weui-cell_warn">
+            <div class="weui-cell__hd"><span class="icon icon-71 f24"></span></div>
+            <div class="weui-cell__bd">
+                <input class="weui-input tleft pl10" id="phoneverify" type="number" th:autocomplete="off" pattern="[0-9]*" value="weui input error" placeholder="验证码">
+            </div>
+            <div class="weui-cell__bd tright">
+                <a  href="javascript:void(0);" onclick="verification()" id="obtain" th:autocomplete="off" class="weui-btn_primary radius5 pt10 pb10 pl10 pr10 dlblock white f12">获取验证码</a>
+            </div>
+        </div>
+    </div>
+    <div class="weui-cells weui-cells_form bdbe">
+        <div class="weui-cell weui-cell_warn">
+            <div class="weui-cell__hd"><span class="icon icon-31 f24"></span></div>
+            <div class="weui-cell__bd">
+                <input class="weui-input tleft pl10" type="password" id="password" th:autocomplete="off" maxlength="20" placeholder="6~20位登录密码">
+            </div>
+        </div>
+    </div>
+    <div class="weui-cells weui-cells_form bdbe">
+        <div class="weui-cell weui-cell_warn">
+            <div class="weui-cell__hd"><span class="icon icon-31 f24"></span></div>
+            <div class="weui-cell__bd pl10">
+                <input class="weui-input tleft" type="password" id="againPassword" th:autocomplete="off" maxlength="20" placeholder="确认登录密码"/>
+            </div>
+        </div>
+    </div>
+    <div class="weui-cells weui-cells_form">
+        <div class="weui-cell weui-cell_warn">
+            <div class="weui-cell__hd"><span class="icon icon-97 f24"></span></div>
+            <div class="weui-cell__bd pl10">
+                <input class="weui-input tleft" type="text" id="userNo" maxlength="50" th:autocomplete="off" onkeyup="value=value.replace(/[\u4e00-\u9fa5]/ig,'')" placeholder="用户编号(可选，例如:A1)"/>
+            </div>
+        </div>
+    </div>
+    <div class="weui-cells_form_btn">
+        <a href="javascript:;" class="weui-btn weui-btn_plain-primary" onclick="submitSave()">提交</a>
+    </div>
+</div>
+<script type="text/javascript" src="/wap/resources/js/jquery.min.js"></script>
+<script type="text/javascript" src="/wap/resources/js/zepto.min.js"></script>
+<script type="text/javascript" src="/wap/resources/js/zepto.weui.js"></script>
+<script type="text/javascript" src="/wap/resources/js/common/h5.js"></script>
+<script>
+    function verification() {
+        var phoneReg = /(^1[3|4|5|6|7|8|9]\d{9}$)|(^09\d{8}$)/;
+        var phone=$.trim($("#phone").val());
+        if (!phoneReg.test(phone)) {
+            $.alert("请输入正确的手机号","系统提示");
+            return;
+        }
+        var validateCode = $.trim($("#validateCode").val());
+        if(!validateCode){
+            $.alert("请输入图形验证码","系统提示");
+            return;
+        }
+        var href = 'javascript:void(0); onclick=verification()';
+        var _this = $("#obtain");
+        _this.removeAttr("href");
+        $.showLoading("获取中...");
+        $.ajax({
+            url:'/wap/vip/getPhoneCode',
+            data:{
+                "phone":phone,
+                "validateCode" : validateCode
+            },
+            dataType:"json",
+            type:"post",
+            success:function(data){
+                //成功
+                $.hideLoading();
+                if(data.code=='1'){
+                    $.toast("短信验证码已发送至您的手机，请查收","text");
+                    var sec = 60;
+                    var timer = window.setInterval(function() {
+                        sec--;
+                        if (sec > 0) {
+                            _this.text(sec + "秒重新发送!");
+                        } else {
+                            // 去掉定时器
+                            window.clearInterval(timer);
+                            _this.text("获取验证码");
+                            _this.attr("href","javascript:void(0); onclick=verification()");
+                        }
+                    }, 1000);
+                }else if(data.code=='0'){
+                    $.alert("获取验证码失败，请稍后再试","系统提示");
+                    _this.text("获取验证码");
+                    _this.attr("href",href);
+                }else if(data.code=='2'){
+                    //系统错误
+                    $.alert("系统繁忙！","系统提示");
+                    _this.text("获取验证码");
+                    _this.attr("href",href);
+                }else if(data.code=='3'){
+                    $.alert("手机号已被注册！","系统提示");
+                    _this.text("获取验证码");
+                    _this.attr("href",href);
+                }else{
+                    $.alert(data.msg,"系统提示");
+                    _this.text("获取验证码");
+                    _this.attr("href",href);
+                }
+            }
+        })
+    }
+    function refreshKaptcha(obj){
+        let url = $(obj).attr("src");
+        let time = new Date().getTime();
+        if(url.indexOf("?") > 0){
+            url = url.split("?")[0]
+        }
+        $(obj).attr("src",url+"?t="+ time);
+    }
+
+    function submitSave(){
+        let phone = $("#phone").val();
+        // let validateCode = $("#validateCode").val();
+        let phoneverify = $("#phoneverify").val();
+        let password = $("#password").val();
+        let againPassword = $("#againPassword").val();
+        let userNo = $("#userNo").val();
+        let uid = $("#uid").val();
+
+        if (!phone) {
+            $.alert("注册手机号不能为空！","系统提示");
+            return;
+        }
+
+        if (!phoneverify) {
+            $.alert("验证码不能为空！","系统提示");
+            return;
+        }
+
+        if (!password || !againPassword) {
+            $.alert("登录密码不能为空","系统提示");
+            return;
+        }
+
+        if (password.length < 6 || password.length > 20) {
+            $.alert("密码长度6到20位！","系统提示");
+            return;
+        }
+
+        if(password != againPassword){
+            $.alert("两次的密码必须相同！","系统提示");
+            return;
+        }
+        $.showLoading("提交中...")
+        $.ajax({
+            url:'/wap/user/agent/save',
+            data:{
+                "phone":phone,
+                "phoneverify":phoneverify,
+                "password":password,
+                "userNo":userNo,
+                "userId":uid,
+            },
+            dataType:"json",
+            type:"post",
+            success:function(res){
+                $.hideLoading();
+                if(res.code == '200'){
+                    window.location.href = "/wap/merchant/registerSuccess";
+                }else{
+                    $.alert(res.message,"系统提示");
+                }
+            },
+            error:function(res){
+                $.hideLoading();
+                $.alert("系统繁忙,请稍后再试","系统提示");
+            },
+        })
+    }
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/resources/templates/user/th_agent_list.html b/pluss-wap-page/src/main/resources/templates/user/th_agent_list.html
new file mode 100644
index 0000000..e288a95
--- /dev/null
+++ b/pluss-wap-page/src/main/resources/templates/user/th_agent_list.html
@@ -0,0 +1,137 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <title>直属代理列表</title>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0,user-scalable=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="apple-mobile-web-app-title" content="">
+    <meta name="HandheldFriendly" content="true">
+    <meta name="format-detection" content="telephone=no">
+    <link rel="stylesheet" href="/wap/resources/css/weui/weui.min.css">
+    <link rel="stylesheet" href="/wap/resources/css/weui/jquery-weui.min.css">
+<!--    <script type="text/javascript" src="/wap/resources/js/common/h5.js"></script>-->
+    <style>
+        body{
+            background-color: #f7f7f7;
+        }
+        .container{
+            background-color: #f7f7f7;
+            width: 100%;
+            height:100%;
+            position: absolute;
+            padding:0px;
+            overflow: hidden;
+            color: #000;
+        }
+        .records-list{
+            height:100%;overflow:auto;  z-index: 1;
+            background-color: #f7f7f7;
+        }
+        .weui-form-preview{
+            margin: 10px 0 0 0;
+        }
+        .br{
+            border-bottom: 1px solid #dcdbdbb8;
+            width: 100%;
+            height: 1px;
+            display: block;
+            margin: 0 auto;
+        }
+    </style>
+</head>
+<body>
+<input type="hidden" id="token" th:value="${token}">
+<div class="container">
+    <div class="list-main-mian infinite weui-pull-to-refresh records-list" id="listwrap">
+        <!--下拉刷新-->
+        <div class="weui-pull-to-refresh__layer" style="padding: 5px;">
+            <div class="weui-pull-to-refresh__arrow"></div>
+            <div class="weui-pull-to-refresh__preloader"></div>
+            <div class="down">下拉刷新</div>
+            <div class="up">释放刷新</div>
+            <div class="refresh">正在刷新</div>
+        </div>
+        <div class="weui-form-preview" id="Tolist">
+            <!--内容展示区域-->
+        </div>
+        <div class="weui-loadmore" style="padding-bottom:30px;height:20px">
+            <i class="weui-loading"></i>
+            <span class="weui-loadmore__tips">正在加载</span>
+        </div>
+    </div>
+<!--    <a href="javascript:;" class="weui_btn weui_btn_primary">按钮</a>-->
+</div>
+<script type="text/javascript" src="/wap/resources/js/jquery.min.js"></script>
+<script src="/wap/resources/js/weui/jquery-weui.min.js"></script>
+<script>
+    var pages = 1;
+    var sizes = 10;
+    var loading = false;  //状态标记
+    $(function () {
+        loadlist();
+    })
+    //=========================下拉刷新
+    $("#listwrap").pullToRefresh().on("pull-to-refresh", function () {
+        setTimeout(function () {
+            pages = 1;
+            $("#Tolist").html("");
+            loadlist();
+            if (loading) loading = false;
+            $("#listwrap").pullToRefreshDone(); // 重置下拉刷新
+        }, 1500);   //模拟延迟
+    });
+    //============================滚动加载
+    $("#listwrap").infinite().on("infinite", function () {
+        if (loading) return;
+        loading = true;
+        pages++; //页数
+        $('.weui-loadmore').show();
+        setTimeout(function () {
+            loadlist();
+            loading = false;
+        }, 2500);   //模拟延迟
+    });
+    // =======加载数据loadlist();
+    function loadlist() {
+        var html = "";
+        $.ajax({
+            type: "POST",
+            url: "/wap/user/agent/page",
+            data: { 'page': pages, 'size': sizes,'token':$("#token").val()},
+            dataType: "json",
+            error: function (request) {
+                $(".weui-loadmore").hide();
+                html += "<div class=\"weui-cells__title\" >已无更多数据</div>";
+                $("#Tolist").append(html);
+            },
+            success: function (data) {
+                if(data.code == 200){
+                    if (data.data.records.length > 0) {
+                        for (var i = 0; i < data.data.records.length; i++) {
+                            html += ' <div class="weui-form-preview__bd"> ';
+                            html += ' <div class="weui-form-preview__item"> ';
+                            html += ' <label class="weui-form-preview__label">' + data.data.records[i].userName + '</label> ';
+                            html += ' <div class="weui-form-preview__value">编号：' + (data.data.records[i].userNo == null ? "-" : data.data.records[i].userNo) + '</div> ';
+                            html += ' </div> ';
+                            html += ' </div> <span class="br"></span>';
+                        }
+                        $("#Tolist").append(html);
+                    }
+                    else {
+                        html += "<div class=\"weui-cells__title\" >已无更多数据</div>";
+                        $("#Tolist").append(html);
+                        loading = true;
+                    }
+                }else{
+                    $.toast(data.message,"text");
+                }
+                $(".weui-loadmore").hide();
+            }
+        });
+    }
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/common.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/common.jsp
new file mode 100644
index 0000000..fe36424
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/common.jsp
@@ -0,0 +1,44 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+<c:set var="ctx" value="${pageContext.request.contextPath}"  scope="request"/>
+<c:set var="resourcePath" value="${ctx}/resources"  scope="request"/>
+<script type="text/javascript">
+    var ctx = "${ctx}"; //上下文路径
+    var resourcePath = "${resourcePath}";  
+    document.writeln('<script type="text/javascript" src="'+resourcePath+'/js/global.js?d=' + new Date().getTime() + '" ><\/script>');
+</script>
+<link rel="stylesheet" href="${resourcePath}/css/weui.css">
+<link rel="stylesheet" href="${resourcePath}/css/weuix.css">
+<%--<link rel="stylesheet" href="${resourcePath}/css/h5.css">
+<link rel="stylesheet" href="${resourcePath}/css/h5-common.css">
+<link rel="stylesheet" href="${resourcePath}/css/mobileSelect.css">--%>
+<script type="text/javascript" src="${resourcePath}/js/jquery.min.js"></script>
+<script type="text/javascript" src="${resourcePath}/js/zepto.min.js"></script>
+<script type="text/javascript" src="${resourcePath}/js/zepto.weui.js"></script>
+<script type="text/javascript" src="${resourcePath}/js/swiper.min.js"></script>
+<script type="text/javascript" src="${resourcePath}/js/utils/StringUtil.js"></script>
+<script type="text/javascript" src="${resourcePath}/js/utils/DateUtil.js"></script>
+
+<%--<script type="text/javascript" src="${resourcePath}/js/auto-size.js"></script>
+<script type="text/javascript" src="${resourcePath}/js/mobileSelect.js"></script>--%>
+ <!-- <script type="text/javascript">
+	requireCss("wap/css/weui.css");
+	requireCss("wap/css/weuix.css"); 
+	require("wap/js/jquery.min.js");
+	require("wap/js/zepto.min.js");
+	require("wap/js/zepto.weui.js");
+	require("wap/js/swiper.min.js");
+	require("wap/js/utils/StringUtil.js");
+	require("wap/js/utils/DateUtil.js");
+</script>  -->
+<script>
+	function serialize(form) {
+		var serializeArray = form.serializeArray();
+		var result = {};
+		$.each(serializeArray, function(index, item) {
+			result[item.name] = item.value;
+		});
+		return result;
+	}
+</script>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/error.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/error.jsp
new file mode 100644
index 0000000..624a35a
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/error.jsp
@@ -0,0 +1,15 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+</head>
+<body>
+	
+	<%
+
+	response.sendRedirect("http://ah.189.cn/404.html");
+
+	%>
+	
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/index.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/index.jsp
new file mode 100644
index 0000000..8f94ca4
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/index.jsp
@@ -0,0 +1,21 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<%@ taglib prefix="shiro" uri="http://shiro.apache.org/tags" %>
+<html>
+<head>
+<jsp:include page="common.jsp"></jsp:include>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>红袖标</title>
+<jsp:include page="common.jsp" />
+<link href="http://lingxi.voicecloud.cn/favicon.ico" rel="shortcut icon"/>
+<!-- 引用外部库 -->
+</head>
+<body>
+
+	<%
+		request.getRequestDispatcher("/index.do").forward(request, response);
+	%>
+
+</body>
+
+</html>
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/jsp/activity/act-one-bonus.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/activity/act-one-bonus.jsp
new file mode 100644
index 0000000..8be0c2a
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/activity/act-one-bonus.jsp
@@ -0,0 +1,101 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<!DOCTYPE html>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html lang="en">
+<head>
+	<meta charset="UTF-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1">
+	<meta http-equiv="pragma" content="no-cache">
+	<meta http-equiv="Cache-Control" content="no-cache, must-revalidate">
+	<meta http-equiv="expires" content="0">
+	<c:set var="ctx" value="${pageContext.request.contextPath}"  scope="request"/>
+	<c:set var="resourcePath" value="${ctx}/resources"  scope="request"/>
+	<script type="text/javascript">
+		var ctx = "${ctx}"; //上下文路径
+		var resourcePath = "${resourcePath}";
+		document.writeln('<script type="text/javascript" src="'+resourcePath+'/js/global.js?d=' + new Date().getTime() + '" ><\/script>');
+	</script>
+    <title>邀请</title>
+	<style>
+		#Rootloading {
+			display: inline-block;
+			width: 12.8%;
+			max-width: 80px;
+			position: absolute;
+			left: 50%;
+			top: 50%;
+			transform: translate(-50%, -50%);
+		}
+	</style>
+	<link href="${resourcePath}/css/act-common.css" rel="stylesheet">
+	<style id="__WXWORK_INNER_SCROLLBAR_CSS">
+		::-webkit-scrollbar {
+			width: 12px !important;
+			height: 12px !important;
+		}
+
+		::-webkit-scrollbar-track:vertical {}
+
+		::-webkit-scrollbar-thumb:vertical {
+			background-color: rgba(136, 141, 152, 0.5) !important;
+			border-radius: 10px !important;
+			background-clip: content-box !important;
+			border: 2px solid transparent !important;
+		}
+
+		::-webkit-scrollbar-track:horizontal {}
+
+		::-webkit-scrollbar-thumb:horizontal {
+			background-color: rgba(136, 141, 152, 0.5) !important;
+			border-radius: 10px !important;
+			background-clip: content-box !important;
+			border: 2px solid transparent !important;
+		}
+
+		::-webkit-resizer {
+			display: none !important;
+		}
+	</style>
+</head>
+<body style="height: auto;">
+<div id="app" class="">
+	<div id="adminRewardIntro">
+		<p>1.新用户是指首次注册收银呗的用户；</p>
+		<p>2.每日获得的分润次日即可在账户中提现；</p>
+		<p>3.由于不可抗力（包括但不限于服务器意外关机、网络意外中断、收银呗平台受到恶意攻击及磁盘意外损坏）而导致交易数据丢失的情况不计算奖励金额；</p>
+		<p>5.活动暂停或取消前发生的交易金额仍按照规则比例计算并结算奖励金，活动暂停或取消后发生的交易金额不再计算奖励金。但如果活动由于监管等原因被强制暂停，奖励金将停止发放。</p>
+		<p><b>奖励详情</b></p>
+		<p>1.用户A通过本活动邀请好友B开通收银呗业务，B邀请好友C开通收银呗业务等。</p>
+		<p>2.净收款交易金额（收款金额-退款金额）</p>
+		<p>3.A可以通过邀请好友升级</p>
+		<p class="indent">1) V1等级（注册即为V1）</p>
+		<p class="indent">2) V2等级（B≥50人或B累计交易额50万）</p>
+		<p class="indent">3) V3等级（B≥500人或B累计交易额500万）</p>
+		<p>示例：</p>
+		<p class="indent">1) A=V1，B每月净收款交易金额100万元，A每月奖励分润为100万*0.06%=600元；</p>
+		<p class="indent">2) A=V2，B每月净收款交易金额100万元，A每月奖励分润为100万*0.08%=800元；</p>
+		<p class="indent">3) A=V3，B每月净收款交易金额100万元，A每月奖励分润为100万*0.1%=1000元；</p>
+		<p class="indent">4) A=V3，B=V2，C每月净收款交易金额100万元，B每月奖励分润为100万*0.08%=800元，A每月奖励分润为100万*0.02%=200元；</p>
+		<p class="indent">5) 以此类推</p>
+	</div>
+	<!---->
+	<!---->
+</div>
+<div class="toast-wrapper" style="display: none;">
+	<div class="toast"></div>
+</div>
+<div class="toast3-wrapper" style="display: none;">
+
+</div>
+<div class="toast-wrapper2" style="display: none;">
+	<div class="toast2" style="height: 200px;">
+		<p class="toast-title"></p>
+		<p class="toast-message"></p>
+		<div class="btn-wrapper">
+			<!----><button type="button" class="btn"></button></div>
+	</div>
+</div>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/jsp/activity/act-one-desc.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/activity/act-one-desc.jsp
new file mode 100644
index 0000000..173b968
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/activity/act-one-desc.jsp
@@ -0,0 +1,131 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<!DOCTYPE html>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html lang="en">
+<head>
+	<meta charset="UTF-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1">
+	<meta http-equiv="pragma" content="no-cache">
+	<meta http-equiv="Cache-Control" content="no-cache, must-revalidate">
+	<meta http-equiv="expires" content="0">
+	<c:set var="ctx" value="${pageContext.request.contextPath}"  scope="request"/>
+	<c:set var="resourcePath" value="${ctx}/resources"  scope="request"/>
+	<script type="text/javascript">
+		var ctx = "${ctx}"; //上下文路径
+		var resourcePath = "${resourcePath}";
+		document.writeln('<script type="text/javascript" src="'+resourcePath+'/js/global.js?d=' + new Date().getTime() + '" ><\/script>');
+	</script>
+    <title>活动细则</title>
+	<style>
+		#Rootloading {
+			display: inline-block;
+			width: 12.8%;
+			max-width: 80px;
+			position: absolute;
+			left: 50%;
+			top: 50%;
+			transform: translate(-50%, -50%);
+		}
+	</style>
+	<link href="${resourcePath}/css/act-common.css" rel="stylesheet">
+	<style id="__WXWORK_INNER_SCROLLBAR_CSS">
+		::-webkit-scrollbar {
+			width: 12px !important;
+			height: 12px !important;
+		}
+
+		::-webkit-scrollbar-track:vertical {}
+
+		::-webkit-scrollbar-thumb:vertical {
+			background-color: rgba(136, 141, 152, 0.5) !important;
+			border-radius: 10px !important;
+			background-clip: content-box !important;
+			border: 2px solid transparent !important;
+		}
+
+		::-webkit-scrollbar-track:horizontal {}
+
+		::-webkit-scrollbar-thumb:horizontal {
+			background-color: rgba(136, 141, 152, 0.5) !important;
+			border-radius: 10px !important;
+			background-clip: content-box !important;
+			border: 2px solid transparent !important;
+		}
+
+		::-webkit-resizer {
+			display: none !important;
+		}
+	</style>
+</head>
+<body style="height: auto;">
+<div id="app" class="">
+	<div id="adminRules">
+		<h2>收银呗用户邀请活动规则</h2>
+		<p>一、参与方式</p>
+		<p>收银呗用户在知悉并确认接受本邀请规则的情况下，自愿参与本活动。</p>
+		<h3>用户邀请的好友经审核通过开通收银呗业务（“开通”指经收银呗平台合作收单机构复审通过且实现收款功能），该用户即可获得相应的邀请奖励。</h3>
+		<p>二、邀请奖励规则</p>
+		<p>（一）奖励详情</p>
+		<p>1.用户A通过本活动邀请好友B开通收银呗业务，B邀请好友C开通收银呗业务等。 </p>
+		<p>2.净收款交易金额（收款金额-退款金额）。 </p>
+		<p>3.A可以通过邀请好友升级</p>
+		<p class="indent">1) V1等级（注册即为V1）</p>
+		<p class="indent">2) V2等级（B≥50人或B累计交易额50万）</p>
+		<p class="indent">3) V3等级（B≥500人或B累计交易额500万）</p>
+		<p>（二）奖励内容</p>
+		<p>1.自用省钱</p>
+		<p class="indent">1) B≥${oneLevel}人，A商户交易费率降至${oneRate}%；</p>
+		<p class="indent">2) B≥${twoLevel}人，A商户交易费率降至${twoRate}%；</p>
+		<p>2.推广赚钱</p>
+		<p class="indent">1)A=V1，A可获得B净收款交易金额0.06%分润；</p>
+		<p class="indent">2)A=V2，A可获得B净收款交易金额0.08%分润；</p>
+		<p class="indent">3)A=V3，A可获得B净收款交易金额0.10%分润；</p>
+		<p>3.团队奖励</p>
+		<p class="indent">1)A可获得B团队的净收款交易金额的费率差分润；</p>
+		<p>例如：</p>
+		<p class="indent">1) A邀请${oneLevel}个好友开通收银呗，A商户交易费率降至${oneRate}%，每交易1万省8元；</p>
+		<p class="indent">2) A邀请${twoLevel}个好友开通收银呗，A商户交易费率降至${twoRate}%，每交易1万省13元；</p>
+		<p class="indent">3) A=V1，B每月净收款交易金额100万元，A每月奖励分润为100万*0.06%=600元；</p>
+		<p class="indent">4) A=V2，B每月净收款交易金额100万元，A每月奖励分润为100万*0.08%=800元；</p>
+		<p class="indent">5) A=V3，B每月净收款交易金额100万元，A每月奖励分润为100万*0.1%=1000元；</p>
+		<p class="indent">6) A=V3，B=V2，C每月净收款交易金额100万元，B每月奖励分润为100万*0.08%=800元，A每月奖励分润为100万*0.02%=200元；</p>
+		<p class="indent">7) 以此类推</p>
+		<p>三、活动时间</p>
+		<p>${actStartDate}-${actEndDate}</p>
+		<p>四、活动须知</p>
+		<p>1. 该活动为持续性活动，如用户已在某一期活动中邀请一位及以上好友成功开通收银呗业务，则在后续各期活动中将累计。</p>
+		<p>2. 由于不可抗力（包括但不限于服务器意外关机、网络意外中断、收银呗平台受到恶意攻击及磁盘意外损坏）而导致交易数据丢失的情况不计算奖励金额。</p>
+		<p>3. 因业务发展需要，武汉融商创银科技有限公司有权对奖励金额的计算公式及奖励金额的分润比例进行调整或对影响奖励金额计算的事项进行变动，并将在收银呗平台以公告形式公布，用户应实时关注收银呗平台公告内容。</p>
+		<p>五、奖励金额支付</p>
+		<p>1. 自用省钱完成任务，次日自动修改费率。</p>
+		<p>2. 推广赚钱和团队奖励，用户可在账户中直接提现。</p>
+		<p>3. 用户知悉并同意上述结算规则，用户知悉武汉融商创银科技有限公司有权调整奖励金额的结算日期、支付方式等结算规则及标准并在收银呗系统上予以公布，若用户继续参与本活动，则视为用户接受新的奖励金额结算规则及标准。新的奖励金额结算规则及标准自公布之日起生效适用。</p>
+		<p>六、其他说明</p>
+		<p>1. 用户承诺具备参与本活动所需的能力。</p>
+		<p>2. 用户参与本活动不构成与收银呗平台主体公司形成任何目的的合伙、合资、雇佣或代理关系，用户亦不可冒用前述主体名义从事任何活动，否则用户应就其行为承担一切经济及法律责任。</p>
+		<p>3. 用户承诺其推广行为严格遵守法律法规且不侵犯他人合法权益，如实准确地根据收银呗业务描述进行推荐，否则武汉融商创银科技有限公司将取消用户参与活动及领取奖励的资格，并由用户应自行承担其行为造成的一切后果及责任。</p>
+		<p>4. 如用户存在违规作弊行为（包括但不限于恶意套取资金、机器作弊、虚假申请等违反诚实信用原则行为），武汉融商创银科技有限公司有权取消其参与活动和领取奖励的资格，必要时追究其法律责任。</p>
+		<p>5. 本活动自规则公告日正式开展，以3个月为周期，逐期开展。如遇不可抗力或特定情况（包括但不限于自然灾害、政府机关指令、网络攻击等），武汉融商创银科技有限公司有权暂停或取消本活动；活动暂停或取消前发生的交易金额仍按照规则比例计算并结算奖励，活动暂停或取消后发生的交易金额不再计算奖励。但如果活动由于监管等原因被强制暂停，奖励将停止发放。</p>
+		<p>6. 活动期间，活动规则可能发生调整，以收银呗页面显示的活动规则为准。</p>
+		<p>7. 如遇本活动相关的任何问题，可通过收银呗“联系客服”选项或拨打客服电话400-675-2070进行咨询或投诉。本活动与Apple Inc.无关。</p>
+	</div>
+</div>
+<div class="toast-wrapper" style="display: none;">
+	<div class="toast"></div>
+</div>
+<div class="toast3-wrapper" style="display: none;">
+
+</div>
+<div class="toast-wrapper2" style="display: none;">
+	<div class="toast2" style="height: 200px;">
+		<p class="toast-title"></p>
+		<p class="toast-message"></p>
+		<div class="btn-wrapper">
+			<!----><button type="button" class="btn"></button></div>
+	</div>
+</div>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/jsp/activity/act-one-detail.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/activity/act-one-detail.jsp
new file mode 100644
index 0000000..73e76de
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/activity/act-one-detail.jsp
@@ -0,0 +1,144 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<!DOCTYPE html>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html lang="en">
+<head>
+	<meta charset="UTF-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1">
+	<meta http-equiv="pragma" content="no-cache">
+	<meta http-equiv="Cache-Control" content="no-cache, must-revalidate">
+	<meta http-equiv="expires" content="0">
+	<c:set var="ctx" value="${pageContext.request.contextPath}"  scope="request"/>
+	<c:set var="resourcePath" value="${ctx}/resources"  scope="request"/>
+	<script type="text/javascript">
+		var ctx = "${ctx}"; //上下文路径
+		var resourcePath = "${resourcePath}";
+		document.writeln('<script type="text/javascript" src="'+resourcePath+'/js/global.js?d=' + new Date().getTime() + '" ><\/script>');
+	</script>
+    <title>邀请</title>
+	<style>
+		#Rootloading {
+			display: inline-block;
+			width: 12.8%;
+			max-width: 80px;
+			position: absolute;
+			left: 50%;
+			top: 50%;
+			transform: translate(-50%, -50%);
+		}
+	</style>
+	<link href="${resourcePath}/css/act-common.css" rel="stylesheet">
+	<style id="__WXWORK_INNER_SCROLLBAR_CSS">
+		::-webkit-scrollbar {
+			width: 12px !important;
+			height: 12px !important;
+		}
+
+		::-webkit-scrollbar-track:vertical {}
+
+		::-webkit-scrollbar-thumb:vertical {
+			background-color: rgba(136, 141, 152, 0.5) !important;
+			border-radius: 10px !important;
+			background-clip: content-box !important;
+			border: 2px solid transparent !important;
+		}
+
+		::-webkit-scrollbar-track:horizontal {}
+
+		::-webkit-scrollbar-thumb:horizontal {
+			background-color: rgba(136, 141, 152, 0.5) !important;
+			border-radius: 10px !important;
+			background-clip: content-box !important;
+			border: 2px solid transparent !important;
+		}
+
+		::-webkit-resizer {
+			display: none !important;
+		}
+		.act-desc a{
+			position: absolute;
+			top: 1.5rem;
+			right: -.1875rem;
+			border-top-left-radius: .9375rem;
+			border-bottom-left-radius: .9375rem;
+			border: 1px solid #fcfcfc;
+			padding: .375rem .75rem .375rem 1.125rem;
+			text-align: center;
+			font-size: .875rem;
+			color: #fff;
+		}
+	</style>
+</head>
+<body style="height: auto;">
+	<div id="app" class="">
+		<div id="RegisterInviteShow">
+			<img src="${resourcePath}/css/assets/invute-page.4fc98.png" class="introduce">
+			<div class="act-desc">
+				<a onclick="actDesc()">活动细则</a>
+			</div>
+			<div class="bottom">
+				<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAApoAAABsCAMAAAD9huLgAAAAolBMVEUAAAD/gID/39//zMz/3czvv7//xcX/0cX2ysH/ysH4v7j5vrj6u7H1uK31uLP6tq37sqb4q6D4r6T4qZz2pJj5pJj5opP3oJL3m473no71mo31nI34jH34kYL4kYX4lIX4lor4mYr6aVP6aVX6blr6c1/6dl/6eGT6eGf6fWz6gGz6gnH6hXH6h3j6inj6jH36lIX9XUT9X0n9ZE79aVP9bFM7T6jcAAAANnRSTlMAAggPDxAWFh0dJCsxMjI4P0ZGTVRUWlthYWJiZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmb0DQeIAAABdElEQVR42u3coVLDQBSG0f+mcRigAoVgBoPk/Z8JkCi6CApJG4YZTDYM5wim5GtN5mZDt0A9BrZocAowmmA0MZpgNPlfxnIOMJrwi9F8SZJ9nr6OXCd5Pj6utOh6l173Lk/+3A39c6Z1vUMfd0lLcjqhp0d0vUOvB1eovsk+DlP8+QW6vmofhzouoN9Pb0XXu/SPVfNjYp+S7POcZD/7Xte79LpNhlzN9pWWk63rHXrdTe+JThfaLN4z6fqKfXxNhrS07JK02Z3/kGQ4ftX11XvdzPeVzneYpqfq+sp9fJvmtE5Smy29ur56r31gi8a2+IDom8e6vnqvS5cnf2DVhO2M5qHS0vL5V0LLH1R1vUuvC5cnbujwmxu63xXUN9nHw/JJdbY/r+sdeu2m3fghh1Ta8ZPN6Yiud+jl33ewTTunAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOjoHY2OiMa2C96YAAAAAElFTkSuQmCC"
+					 class="introduceBac">
+				<ul class="introduceBar">
+					<li>
+						<div class="left">福利一</div>
+						<div class="right">
+							<h3>自用省钱</h3>
+							<p>成功邀请商户进件，下调费率</p>
+						</div>
+					</li>
+					<li>
+						<div class="left">福利二</div>
+						<div class="right">
+							<h3>分享赚钱</h3>
+							<p>邀请好友，赚分润，日结/无上限</p>
+						</div>
+					</li>
+					<li></li>
+				</ul>
+				<div class="introduceTable">
+					<p>成功邀请</p>
+					<p>商户费率</p>
+				</div>
+				<ul class="introduceList">
+					<c:forEach items="${inviteRateList}" var="invite">
+						<li>
+							<p>${invite.number}人</p>
+							<p>${invite.rate}%</p>
+						</li>
+					</c:forEach>
+				</ul>
+			</div>
+			<p class="noLimit">邀请无上限，赶快行动吧</p>
+			<div class="inviteBtn"><img src="${resourcePath}/css/assets/invite-btn.0ea39.png"></div>
+		</div>
+		<!---->
+		<!---->
+	</div>
+	<div class="toast-wrapper" style="display: none;">
+		<div class="toast"></div>
+	</div>
+	<div class="toast3-wrapper" style="display: none;">
+
+	</div>
+	<div class="toast-wrapper2" style="display: none;">
+		<div class="toast2" style="height: 200px;">
+			<p class="toast-title"></p>
+			<p class="toast-message"></p>
+			<div class="btn-wrapper">
+				<!----><button type="button" class="btn"></button></div>
+		</div>
+	</div>
+<script>
+	$(function () {
+		$(".inviteBtn").on("click",function () {
+			window.location.href = ctx + '/merchant/register?inviteNum=${inviteNum}';
+		})
+	})
+	function actDesc() {
+		window.location.href = ctx + '/activity/one/desc?token=${token}&t=${t}';
+	}
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/jsp/activity/act-one-income.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/activity/act-one-income.jsp
new file mode 100644
index 0000000..7f86b3e
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/activity/act-one-income.jsp
@@ -0,0 +1,271 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<!DOCTYPE html>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html lang="en">
+<head>
+	<meta charset="UTF-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1">
+	<meta http-equiv="pragma" content="no-cache">
+	<meta http-equiv="Cache-Control" content="no-cache, must-revalidate">
+	<meta http-equiv="expires" content="0">
+	<c:set var="ctx" value="${pageContext.request.contextPath}"  scope="request"/>
+	<c:set var="resourcePath" value="${ctx}/resources"  scope="request"/>
+	<script type="text/javascript">
+		var ctx = "${ctx}"; //上下文路径
+		var resourcePath = "${resourcePath}";
+		document.writeln('<script type="text/javascript" src="'+resourcePath+'/js/global.js?d=' + new Date().getTime() + '" ><\/script>');
+	</script>
+    <title>邀请</title>
+	<style>
+		#Rootloading {
+			display: inline-block;
+			width: 12.8%;
+			max-width: 80px;
+			position: absolute;
+			left: 50%;
+			top: 50%;
+			transform: translate(-50%, -50%);
+		}
+	</style>
+	<link rel="stylesheet" href="https://unpkg.com/mescroll.js@1.4.1/mescroll.min.css">
+	<link href="${resourcePath}/css/act-common.css" rel="stylesheet">
+	<style id="__WXWORK_INNER_SCROLLBAR_CSS">
+		::-webkit-scrollbar {
+			width: 12px !important;
+			height: 12px !important;
+		}
+
+		::-webkit-scrollbar-track:vertical {}
+
+		::-webkit-scrollbar-thumb:vertical {
+			background-color: rgba(136, 141, 152, 0.5) !important;
+			border-radius: 10px !important;
+			background-clip: content-box !important;
+			border: 2px solid transparent !important;
+		}
+
+		::-webkit-scrollbar-track:horizontal {}
+
+		::-webkit-scrollbar-thumb:horizontal {
+			background-color: rgba(136, 141, 152, 0.5) !important;
+			border-radius: 10px !important;
+			background-clip: content-box !important;
+			border: 2px solid transparent !important;
+		}
+
+		::-webkit-resizer {
+			display: none !important;
+		}
+		tbody{
+			position: relative;
+			bottom: 0;
+		}
+	</style>
+	<link rel="stylesheet" href="${resourcePath}/css/mobileSelect.css">
+	<script src="https://unpkg.com/mescroll.js@1.4.1/mescroll.min.js" charset="utf-8"></script>
+	<%--<script type="text/javascript" src="${resourcePath}/js/auto-size.js"></script>--%>
+	<script type="text/javascript" src="${resourcePath}/js/mobileSelect.js"></script>
+</head>
+<body style="height: auto;">
+<div id="app" class="">
+	<div id="adminRewards">
+		<div class="header">
+			<div class="accumulate-container">
+				<div class="desc">
+					累计商户分润
+					<div class="prompt-container"><i class="icon-question"></i>
+						<div class="prompt">推广商户交易产生的分润奖励</div>
+					</div>
+				</div>
+				<div class="data">
+					<div class="val">${mercShareAmtCount}</div>
+					<div class="unit">元</div>
+				</div>
+			</div>
+			<div class="accumulate-container">
+				<div class="desc">
+					累计升级分润
+					<div class="prompt-container"><i class="icon-question"></i>
+						<div class="prompt">推广用户升级代理产生的升级奖励</div>
+					</div>
+				</div>
+				<div class="data">
+					<div class="val">${toUpShareAmtCount}</div>
+					<div class="unit">元</div>
+				</div>
+			</div>
+		</div>
+		<div class="main">
+			<div class="table-title">分润明细</div>
+			<table class="table-header">
+				<thead>
+				<tr>
+					<th>商户名称</th>
+					<th>贡献分润</th>
+					<th>分润时间</th>
+				</tr>
+				</thead>
+			</table>
+			<div class="table-body" id="mescroll">
+				<table id="profit-table" class="table-body">
+
+				</table>
+			</div>
+		</div>
+		<div class="btn-invite"></div>
+		<div class="wx-prompt-dialog" style="display: none;">
+			<div>点击右上角，分享给好友</div>
+		</div>
+	</div>
+	<div class="footer" style="display: none;">
+		<ul>
+			<li class=""><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAG0AAABtCAMAAACcJh9kAAACQ1BMVEUAAAAAAAD///8AAAAAAH8Af39/f38AAFUAVVVVVVUAAEAAQEBAQEAzMzMzM2YqKioqKlUkJCQkJEkgIEAgQEBAQEAcHDkcOTk5OTkaGjMaGk0zMzMzM00XFy4XF0YXLi4XLkYuLkYVKkAqKkAUJzsnJzsSJDckJDciIjMiIkQiM0QgIDAgIEAgMEAeHjweLTwcHDkcKzkbKDYaJjMmJjMmJkAYJDEYJD0kJD0XIy4XIzoXLjojIzojLjoWITchITchLDcgIDUgIEAfHzMfKTMfKT0dJzscJjkbJDcaIzUaIz4jIzUZIjMZKjsiIjMiIjsZIToZKTohITohKToYIDggKDgfJzYeJTQeJTwdJDMdJDocIzIcIzkcIjcbIjYbIjwaITQhITQhITshJzsaIDMaJjMaJjkgJjkZHzgfHzgfJTgYJDceJDceJDUeJDsdIzQdIzocIjMcIjkcKDMcITcbITYbJjYhITYbIDUbIDoaHzQaJDkfHzkfJDkZJDMZJDgfJDgZIzceIzcZIjYdIjYdIjUdIjocITQcITkcIDgcJTgbIDcbJDcbHzYbJDYbJDoaIzUaIzkaIzQaIzgeIzQeIzgZIjMZIjceIjcZITYdITYdJjYZITUdITUcIDUcIDkcJDUcIDQcIDgcJDQcJDgbHzcbIzcbIzYfIzYbIjUaIjQaIjgaITQaITceITcZITcdITcdJDcZIDYdIDYdJDYZIDUcIDUcIzUcHzQcIzQcIzgcIjQcIjcbIjMbIjYbIjYaITVrmw0DAAAAwXRSTlMAAQECAgICAwMDBAQEBQUGBgcHCAgICQkJCgoKCgsLCwsLDAwNDQ4ODw8PEBAQERESEhMUFBQVFRUWFhYWFhcXFxgYGRkZGhscHR0dHh4eHh8fHx8gICEiIiMjJCQlJiYnJycnKCgoKCkpKSoqKyssLC0tLS4vLy8wMDExMTEyMjIzMzQ0NTU2Njc3ODg5OTk6Ojs7Ozs8PDw9PT0+Pj8/P0BAQEBBQUJCQ0RERUVFRkZGR0dHSEhISUlJSkpLS0xNx8p4qQAAB+xJREFUaN7tWv9fE2Uc5xhxkpuzDQ+nlSWeR1LTsQyilZpyI7AgKpjrRqSVhSNwbYSVbemswLmKtRpLSM1u7YK2NgXG1t3+tO6ZJruPwL4w/KHXPj/tdV/2fp7P5/28P+/neV1FRTkkgeE4jj0oMJlyb+NepeyBYOGksf+s42y/kcQ3Hmwz2edNCmkh6e0jN290xaoNtusLQjqdFhau2wzVG1q9KoK2s3z6TvCsnSaqNpAexMuXo+nliF5+mdgwsuA7GH+cz0Lj435mxwZxRaV754clIZ0dwtIP7+hUG7KimwajUqwMXnSwaQNWeq3xyzCfvj/48JfG2lLzg+q5yKVXDu5iD1VSrmyqNQf49GrBB8y1m0qoH7pPgvPCqmjCfPATXal0RaY6PBRKpteKZGjosKok2cRUencCTCaZTIKpJtx6VSmouedN7xxYZX8OWYb+BNfmvG/uWTeWouHt8ZT0fxPBET2lHwkmpHip8bcbFOsDq37GysIasZadsgrZTgsLa8lan6leT8lqjKMhULPZiQ5SFA8MJzsmZkHtQqPGmqKLhz9JO8NQOZyvqu90mSr1q06oLmEn/WSRKo2pu25CMs6ea6m890Bly7lZSM2bXeqiZqegTvsBEQTfwIFsxVcdGPCBJxL+01QRXFG3nJyW5kmIT1qeRnmSa6gGSiNHuX7aMhmX4vHTJ1vUBafRMAqlKvHjMSJzj+yw2qwdZOY3cezHBBSyUUNhycTqu92QH3OjbYQ4s6onTOen2BA7dd70hEgXnGgbnYNccXfX54+H4Q29VyLSf1icGT28RSS+QmvyxzNX4n6TViFe2XJ4dGZR+nDkSm9D3i22Sn3mN6i7N6zbEfFxaiR6z3NFRyhUxqrt1hvw8d/OqPN0Y0qDYwbUIuYxPYXWrYZ2sstp41knrUEa8JTJEwM1nnEYlPksaeKoPQLIyF3qqReXWc3u405JmxPmncd314gLr77nEgeoGbEfJXIvdOLod0uAY7yjFVWh8lEmAHkqBJhHK1GlWx08uLf03VEiV+fUMt9HgLZf+6BZ1AesxmANxu/ro/Gg1SDmGFM3f3AN9IrI94x2rQ6LKbUDPjD4xcAgEocqosUWWtFzhWwtyJ8rqMHAIpieb0CrXJ2a1S3nwwJk/ut16AVV22RkZWciRCbbkJxhda/DlSCEz7dUr0r8LlcY9Kywy7j7oYqKh0nzRGw108XHJszkwxUVD+02uoAkJMOurpWXAk62j0fhw2M0Ir5Sy/j5NUwQ72e0SrQU6DE43Oh4+0q7StnjzB9A8tO/f6jNPNlsi/Brei4+YmvOjFj74e8gmYk/mMfv44qqyRpICVLie5hGkR/Yrlc+Y0FfuRW5Ba6wn72yS8yCopHxSJeCkApYm6QbE5n6pSHAD37O95Yo85iMfM0TgQm+5LwEUxbxvEbKRDzyLR9QaSE89JI6e3pb2y/CLMbdz6IuvKnu/WvQO4bO7d+5/1wIesxr79dtQh3/WXccZvNi+9blmTWavuGgoRk5gs4oHmkdDgLNTPhPHVTKlAdP+eGN4HDrI+h848gItE7cN6bGu7OrIZkAuLsQtOnE3oyrj5y9xUOFMO9D1qRynxmqDn/r7BG1SCu5zhZcACMJMGRNBm3buwGgccKkeRu6p+n0gM2GwF+g73ku+gJ8b97TqUHj32aehO8F3t2WYeOLXpBnzt1NIRXWMV7AjxRra7u3r5cRbTY2BbjiZXRIpaluN6hN3PMiYiZlkV7nua9o0cZgW/ednoLV/tWuzTZUCq39V8iuqdP7topDVdNfcdIacAyFlu5YTLqWBvWbxcflhq/hNipx1VwvMQAYXm++moCbq68NYsmxzfpB6ZqMjSEBaP08Gy3hO9mkRD21y/VXCpqbNygoQjj1BrRLqb9cXaiPKptO+rJHEvu8VXxBb18uDn/bx2zH0WFWxxWg5/yss33L/e0D29LunAWytnilAx2B4dsZ3+3lWxG7HrnDPi5LEGhEAkz7Xhja5NBHesVKvQpT6D8KQcMcfk+LIRrRWTLE9SEHqtRP3E0lf8ORObiqOzR8Fbyf8vYfWM3VKA/0e1Pg+avDh+oyx2KOG3dnF5vQZ/5AZfHGkoKQil8fMSD21ra5AHv56C+9u1Zvwtiu3l+iIJucq60WrSLDyPV4ShCSMa/ljjRjtfTYzN8L7BedJCKT3OSZB6/Oul+oW8thyOpecIO9HD/vMckRtcnOL9iFv2fG6Nr/hks8d7zvRI9Bgxinob+NwF2S7ViOc12Z8pgN7r4i3yKzWYFrDD0n+o4/t6L/wprd0JNPf6zLvcGt1n08Df25uzmXO5d33wZpvNz7mDwP1yt/rPcySObt7hwvYjsGgE2+0L0nv/0Dtqf7AjDMAzuwHO51WKLcnOtg/sePqoMuTtIVhrU5yt1kl1iCUzpF/gdKMoXulMRA2JsKQEv81L9fXtAuU76//6dEkWjhIUWhJ2UyxVC4SLRpS+HHcjLLdJFogROFH31gJwJltDJaGa2MVkYro5XRymhltDJaGa2kaKyj9flCo9XBFokm/LM4X2gs/iMUibbuKKM9MDSdrYRoNt3aaBh1poRoZygsx6crDC+UCEvgmVwfuFQb4elY0ZG4acx5PrbXwpYIjbXszeNjGcs4t7TebApL3Lgln09pMLLz0/Gfp9YXP49/2knmpekyhZrQrDcIteLBfBhbjv9d/AvRMI1q3LveBgAAAABJRU5ErkJggg==">                    首页
+			</li>
+			<li class=""><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAG0AAABtCAMAAACcJh9kAAABzlBMVEUAAAAAAAD///8AAAAAAH9/f38AAFUAVVVVVVUAAEAAQEBAQEAzMzMqKioqKlUkJCQkJEkgIEAcHDkcOTkaGjMaMzMXFy4XLi4XLkYuLkYVKioVKkAqKkAnJzsSJDckJDciIjMgIDAgIEAgMEAeHjweLTwcHDkcKzkbKDYbKEMoKDYaJjMaJkAmJkAkJD0XIy4XIzojIzohITcgIDUfHzMfHz0fKTMfKT0dHTsdJzscJjkbJDckJDcaIzUZIjMZKTohIToYIDgYKDggIDgXHzYfHzYfJzYeJTQeJTwdJDMdJDocIzkcIjcbIjYaITQaJzshITsaIDMaJjkgIDMgIDkgJjkZJTgYJDcYJDUeJDUeJDsdIzQdIzocIjMcIjkcITcbITYbJjwbJTUgIDUaHzQZHzMZJDMZJDgfJDgeIzcZIjYdIjYdIjUdIjocITQcITkcIDgbJDcgJDcbJDYaIzUaIzQaIzgeIzQeIjcZITYdITYdITUcIDUcJDUcJDkcIDQcJDQcJDgbHzcbIzcbIzYbIjUbIjkaIjQaITQaITceITcZITcdITcdJDcZIDYdIDYcIDUcIzUcHzQcIzQcIzgcIjQcIjcbIjYbIjYaITWSlqNxAAAAmnRSTlMAAQECAgIDAwMEBAQFBgYHBwgJCQoKCwsLCwwMDA0ODg8QEBARERISExMTFBQUFRYWFhcYGRkZGRoaGxwcHR4fHyAgICEhISIiIyMkJSYnJycoKCgoKCkqKysrLCwtLS4vLzAwMTIyMjIzNDQ1NTY2Nzg4OTo7Ozs8PT0+Pz8/QEBAQUFCQ0NERUVFRkZGR0dISElJSUpKS0xNE5pYcQAAA05JREFUaN7t2vtX0mAYB/DNKSlscUmxIAOtxKKboRWQihfyNk27WCTJMiuNNAq0XJQakOYlUZS9/Lf9kjI9gHvfOeyH9/sjZ+/5nI0dnsPzPASBg4NzYiEpFVooEh4r01ls11Biq2EoSIu2tAyMcuMo4Xys06yGwSgr+0PIoCY912WCeJpUDRtPAWQNJBc6jdK1ivsfM7ICJh3SNSaQkKnFhqRr2ukdeVpma0y6pguDImr6iEwsszxSRA2EWoun7SYGahE1AB0hMWUrQdRiX+ASnva31dIEmgY4L1w8ritVUL/JYk1wKF3asKasRtFnrZdRUmcuWM1zaSqDvYV95EPJCOtprFZDaQb3px2AmjTfboLRDO7ZNTnVfN5rJKVrjZzMIhRsVknXBpZkanE/I13zb8qtr0GtdG1CbjUHYZ107Y3cap6J6LF2strKN6lJHIMWGpSaKSBf69VIjUuQr3VJLl0OrGENa1jDGtawhjWsYQ1rOUdBd8WaTmGt3J3VhJDSmrYjq21OaRXWqnqz/6hWXzMKa5eeZbX4qNJa07usFn1MHz3rADsytD4+q0W6Nfm+3eDW/izt1y1UjWIC66I+1518fS7GH9+7aP1zParG2MKiQ88v5OuIqpqDexfxXiOqZg3Es32nVA+dr2NIGr3zSZDJACHms9CImr41lto/klp0FbjU1M6nARA2Rmz/PoDWyNvj4hbLW3uBa9XVjR6WfeC0MIgaXccti44stlUf8UaZzfry/WcNqWntT36KTiRnLsJMdiA10v5SEDc0o4NQA3AorcLa8T4uxkCggVJEIzUGa9Ng5M/B4Z/nNKmIVmZx+5fSB9vCy1w95LBFrAXzTN66+x++ePVh9vAawGrwuk6GlsgzVeS/xzfSh7vdYDfk0ZAytAIjlBwT25V2HfTCCWqnN833W0qJ4mhg++vTcxqiSNp2tO0Mwt4O2qwjMekyn0IZN45twVLCWjTgLEe5M4IYisHe3O+gy6xCHKU6JqG0VHSi50YlKkYYOxeS0jxheyXGzwzf1JcQyCFNXXNpSS/9Js95r1bSKpKQEbXZyfoKb3hxAd8w2+e512CG3h/LVc1rCm+vNdSdN9BlxzV0P3Izr5QiSQIHB+c/y1/rtIcDpwBpdwAAAABJRU5ErkJggg==">                    账单
+			</li>
+			<li class=""><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAG0AAABtCAMAAACcJh9kAAACW1BMVEUAAAAAAAD///8AAAAAAH9/f38AAFUAVVVVVVUAAEAAQEBAQEAAMzMzMzMqKioqKlUqVVUkJCQkJEkgIEAcHDkcHFUcOTk5OTkaGjMaMzMzMzMzM00XFy4XLi4XLkYuLkYVKioVKkAqKkAUJzsnJzsnJ04kJDciIjMiIkQiMzMiM0QgIDAgIEAeHjweLTwcHDkcKzkrKzkbKDYoKEMaJjMaJkAmJjMYJDEYJD0kJDEkJD0jIy4jIzoWITchITchLDcVIDUgIDUgKjUfHzMfHz0fKTMfKT0dJzEdJzscJjkmJjkbJDckJDcaIzUaIz4jIzUjIz4ZIjMiIjsiKjsZITohITohKToYIDggIDggKDgXHzYfHzYfJzYfJz4eJTQeJTwdJDMdJDocIzkcIjciIjcbIjYbKDYiKDwaITQaJzQhITQhJzsaIDMgIDkgJjMgJjkZJTgfHzgfJTgeJDceJDUdIzQdIzocIjMcIjkcKDkcITIcITccJzcbITYbJjYbIDUbIDobJTUgJToaHzQaJDQZJDMZJDgfJDgZIzIZIzceIzcZIjYdIjYdIjsdIjUcITQcIDMcIDgcJTMcJTgbIDcbJDcgJDcbHzYbJDYaIzUaIzkfIzUaIzQeIzQeIzgZIjMZIjceIjcZITYdITYdITUcIDUcJDUcIDQcJDQcJDgbHzcbIzMbIzcbIzYbIjUbIjkaIjQaIjgeIjQeJTQaITQaITceITcZITMZITcdITcZIDYdIDYdJDYZIDUcIDUcIzUcIzkcHzQcIzQcIjQcIjcbIjMbIjYbIjYaITWRLhvGAAAAyXRSTlMAAQECAgIDAwMEBAQFBQYGBgcHCAkJCQkKCgoKCwsLCwwMDA0NDQ4PDw8PEBARERISEhMTFBQUFRUVFRYWFxcXGBgYGRkZGRoaGxscHB0dHR0eHh4fHx8gICAhISEhIiIjIyQlJSYmJicnJycoKCgoKSkpKissLC0tLS4uLi8vMDAwMDExMjIyMzMzNDQ0NTY3Nzc3ODg4OTk6Ojo7Ozs8PDw9PT4/P0BAQEFBQUJDQ0RERERFRUVGRkZHR0dISEhISUlKSktLTE23sPFYAAAIsklEQVRo3u1a/19aVR/3CPKQPGDcSwtd24oR7KlctGYj88sz1xBza7a0dBkl5mI9rS+ijraGrdLmfQgzJaGWmZquBkSFi8GUBLqXPysmr+2cg1flctjr9byeV58f5dzzPp+v5/35HEtK/pcFVOzRG2rq/11fY9DvqQB3E0kiV2lqO04POMf+O+YcON1Rq1HJJXcLUbavbcizGAwtR6Ir0chyKLjoGWrbJ7sbUCKFod0x4U9waShcwj/haDcoRMUGk6ifGVxk0xuFXRx8Ri0pMlp131w4meaTZHiur7qo4UHV2efY9GbCztnrqOIFi7yWCaW3khBTKy8WWGkLE2a3RGPDTEtpkTR7whni0lsLF3I+URTtgH7An95e/AP6YrhuV3cgmQdaMtC9qwiqmV24z7iY/3vftO97fww3L+syEysHZIMRrHwkw984Xms71vaa45twEvslMigjhaObPKhqyWvnWx/XqmmaVmsfbz1/DbUx62mkCNF05wLIhhHfmVrlbQWAsvaML4IGyjkdoSEP+ZHjc95X78V+vvdVL2LMpP8QmSmVL6zC7dbmX1GLsZ/F6lfm1+BhVl9QEqHp34Ze4wJv6TcueCsAj8O+rSdCOzIG90p5tBtvFonWk4LnGTtChNblg2g/vMtT6AH17g8QzddFhNb3I0RzNZfzrChvdkG0H/uI0Pp/hiE3qONjBCLdIFzycz8R2tBNuJWN5otvQNvgkptDRGgXYQikrbyFCciscEnqIhHaJ0jyvl7Gu6TsdST9Pymabn283ANQfUXTzRGHWw1oeaNEOwCXxB1EaPZluNWlGj7aKKm5BJcs24nQrAvQcVd6+JiHvOcKdNuClQjt+AREC4/sEm9YIN41EoZoE8eJ0OqcSFAu8NyWVOMCEpLOOiK0B63IzR11P3sPHpbgnmfdUeT2tj5IhFZuRngrt+o4qETjUqQ86EDuPzZsLie7vA94US7wC3NAgfyoOMD8gvII7wFSNmlB/JJOBcethtvtocxgHQ8i2Z9esJAySvk+JoGxydn+J7OxQj3ZP4sxygSzj5icg96rHN5guJpuNRilTS68FeGu9haBmhvsf+BwoXc04hKx5p0QDvaH3VCMFqfx6xhO+V1N8hJ5kwv/Y+zrxmI0OUD1/BV841krVUJZZ/E/XnleVZT2VNWes/GcjS6hbXM5R2hXFwOMMp7z5+qmLFHm6uY/Z6TIwUrNo9GcNthtyvjN5M5phqOjZtJmGFSdYII5fdr1s+sxefZ6Tl8XZE5UATKwY9MRXIdU6E6+hVL4T5HpYyRwQNozk8hp8AMfGbKlUmH4KJDT6idmeqQFwwFNlycn1Va9NqMiuyFQGG3e1Zyk83RpCoXbcXxuBXfZsrd7L7Jgb7d3GXfeytzxHYVpVtY5lcRr1u8OI4WSBTFldPyO16/kVGdZIdpVPefGAyT6na0mZ9oKKmps30XxUHE/VyUcrMI0GcFDwNd3Hw8Luq/PhwdSZNJUIdiORz/FN4l5T+4Q8ywU7zjpjeHH+vSoQFvK9efx8A662jaJNqBpY4J4kpzXC7oORDrrEl6WLrduPj+WtYzgxW3JqhMy/KU7Ahg/CA/XKza3DlDUD4cxzhDooAVMm1rd2FmDI/Vbf03Xj2DGZN2teU+h5DrXCuZ2pmW7MbWkhcGCasWly9d11RcC6JeRL5sV2x0UKJq/RBOGC1zIb7IN1Kd+Qp0WGW+tzOOzytZxFC7x0yl1PraUHLmMpY/XIs3rlFKLF0vQy0fyeCUQqy6GsOvMkuedBaos2IUXuqgSb/vRA23zSDxyfvv+fFNHtN/uR7Rj59se2PaThgnU/HFGm/+rkEzLxFGHTzRsc1CgtcXQVGPMAqa3QGZm0KSL2bRbfyzrmELWry29XCmovFa+vLSGfD/VsaVhynZ+voo5Tei8UY+5bvXznWVbdWsnkBlCOuHSC6X2cr0LyVVu4cQWHR2oZdAQ8VkEMyggtfjQQGFqN90ByC1xqBrH2goZgetsLLJH3CLfDE5iHEbsGPmqoZAnUVnDV4h9uGHjJhUFUDZ09jHftbsgrra7ax6dsdg2eQeUPuz9EylZo5S4IDQxNYoUsD+9D/OX2Yc6kQ6b850SF8Z6gfgUMvrmrnY+xLvMOBpBWGh/4S+v1f0I642MGnkbtReRtj3121FpwWjSo7+lkKHAi6V8U030RAEHwUsh0DsCqJV4pqjlZqTZ5DyNdEnhQjd6kLB080y/FOjraPxDKUmXCaQfxtEXVcUGW+s8sMBx33aTTSNA97dQuYRHlxsDtAkhx6zjKcJ+/SkHcksumXLd8th7CBtJnqwgRKs4iTwSht57LOfnwxOwUYnPGsWEaGLjLPRcbOJwzq/tQRZx617iMcteJOjYYLsY7zGRp5/0dAP5VIdqmEZ2tGE9rcQwjMTIZ/dLidGk93+GxMmwAb135C95YPhft5dmq6ucooULJc9W81L7dZgEnpdQykENQitzM51ZfenqBpNwaaims3p0zkA0/yDqGxVzAxryUt2tanCod+yLaZ9wmf5irPfQrUpUdwma8gajQtGmYCFJ9GozdWz/wGK6UFkc2J+pVdpeZM8pDM0Dk3G1OUNHHv0gwBWMxgU+eDRDUJohNU16UDT6wp0r4obHADKtpj+RLlwS/kwzCwyeO+4JXKCxmJxkb5OfN3ZnXl570mTSk3nR3f3GbTrETmIxKdr5n5tclgB+nGlqgP59QrT3M5exTPtxlp5yN89UirALyfDmZGAt8euMvTHT1ACNjRDNlhnlAFmjfebXxFpg8k3DP/AbTKbpGHKPO3v+9c/1/OtOcgRYXLJ7Pb/kj/Q4x91DHZoNNBiUK5RKhUy0fogy0zWiKLlmWu9tgEh2a9Py7a5mrXU+VTBYat6qFcbm95ydCYajMeESDQdnzu4R1kEAkerp0073hHBxO08/rRIJpTUipf5g/WHhUn9Qryz6f2/+LX/L/4f8BS9qqdvsj0alAAAAAElFTkSuQmCC">                    我的
+			</li>
+		</ul>
+	</div>
+	<!---->
+	<!---->
+</div>
+<div class="toast-wrapper" style="display: none;">
+	<div class="toast"></div>
+</div>
+<div class="toast3-wrapper" style="display: none;">
+
+</div>
+<div class="toast-wrapper2" style="display: none;">
+	<div class="toast2" style="height: 200px;">
+		<p class="toast-title"></p>
+		<p class="toast-message"></p>
+		<div class="btn-wrapper">
+			<!----><button type="button" class="btn"></button></div>
+	</div>
+</div>
+<script>
+	$(function () {
+		$(".prompt-container").on('click',function () {
+			var dom = $(this).find("div.prompt");
+			if(dom.attr("data-index") == undefined || dom.attr("data-index") == 1){
+				dom.show();
+				dom.attr("data-index",0);
+			}else{
+				dom.hide();
+				dom.attr("data-index",1);
+			}
+		})
+	})
+</script>
+<script type="text/javascript" charset="utf-8">
+	$(function(){
+		//创建MeScroll对象
+		var mescroll = new MeScroll("mescroll", {
+			down: {
+				auto: true, //是否在初始化完毕之后自动执行下拉回调callback; 默认true
+				callback: downCallback, //下拉刷新的回调
+			},
+			up: {
+				auto: false, //是否在初始化时以上拉加载的方式自动加载第一页数据; 默认false
+				callback: upCallback, //上拉回调,此处可简写; 相当于 callback: function (page) { upCallback(page); }
+				htmlNodata: "没有更多了",
+			}
+		});
+		/*下拉刷新的回调 */
+		function downCallback(){
+			//联网加载数据
+			var pageNum = 1;
+			getListDataFromNet(pageNum, 10, function(data,type){
+				//联网成功的回调,隐藏下拉刷新的状态
+				mescroll.endSuccess();
+				//设置列表数据
+				setListData(data, false,pageNum);
+			}, function(){
+				//联网失败的回调,隐藏下拉刷新的状态
+				mescroll.endErr();
+			});
+		}
+		var page = {num:1, size:10};
+		function upCallback(page){
+			//联网加载数据
+			page.num = 2;
+			getListDataFromNet(page.num, page.size, function(data,type){
+				//联网成功的回调,隐藏下拉刷新和上拉加载的状态;
+				mescroll.endSuccess(data.length);//传参:数据的总数; mescroll会自动判断列表如果无任何数据,则提示空;列表无下一页数据,则提示无更多数据;
+				//设置列表数据
+				setListData(data, true,type,page.num);
+			}, function(){
+				//联网失败的回调,隐藏下拉刷新和上拉加载的状态;
+				mescroll.endErr();
+			});
+		}
+
+		/*设置列表数据*/
+		function setListData(data, isAppend,pageNum) {
+			var dom = $("#profit-table");
+			var str = "";
+			if(data.length > 0){
+				for (var i = 0; i <data.length; i++) {
+					var newObj=data[i];
+					str += "<tr>";
+					str += "<td>"+newObj.merchantName+"</td>";
+					str += "<td>"+newObj.price+"</td>";
+					str += "<td>"+newObj.createDt+"</td>";
+				}
+			}else{
+				if(pageNum < 2){
+					str += "<div class='no-data'>暂无数据</div>";
+					dom.append(str);
+				}
+			}
+			if(!isAppend){
+				dom.empty();
+			}
+			dom.append(str);
+		}
+
+		function renderTime(date) {
+			var dateee = new Date(date).toJSON();
+			return new Date(+new Date(dateee) + 8 * 3600 * 1000).toISOString().replace(/T/g, ' ').replace(/\.[\d]{3}Z/, '').substr(0,16);
+		}
+
+		/*联网加载列表数据*/
+		var downIndex=0;
+		function getListDataFromNet(pageNum,pageSize,successCallback,errorCallback) {
+			//延时一秒,模拟联网
+			/*setTimeout(function () {
+
+			},1000)*/
+			try{
+				$.ajax({
+					url : ctx + '/activity/income/page',
+					dataType : 'json',
+					type : "post",
+					data : {
+						'token': '${token}',
+						't': '${t}',
+						'pageNum': pageNum,
+						'pageSize': pageSize,
+					},
+					success : function(res) {
+						if(res.code == 200){
+							var profitList = res.data.records;
+							successCallback&&successCallback(profitList);
+						}else {
+							errorCallback&&errorCallback();
+						}
+					},
+				})
+			}catch(e){
+				//联网失败的回调
+				errorCallback&&errorCallback();
+			}
+		}
+		//禁止PC浏览器拖拽图片,避免与下拉刷新冲突;如果仅在移动端使用,可删除此代码
+		document.ondragstart=function() {return false;}
+	});
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/jsp/activity/act-one-invite.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/activity/act-one-invite.jsp
new file mode 100644
index 0000000..4f5a1f1
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/activity/act-one-invite.jsp
@@ -0,0 +1,367 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<!DOCTYPE html>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html lang="en">
+<head>
+	<meta charset="UTF-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1">
+	<meta http-equiv="pragma" content="no-cache">
+	<meta http-equiv="Cache-Control" content="no-cache, must-revalidate">
+	<meta http-equiv="expires" content="0">
+	<c:set var="ctx" value="${pageContext.request.contextPath}"  scope="request"/>
+	<c:set var="resourcePath" value="${ctx}/resources"  scope="request"/>
+	<script type="text/javascript">
+		var ctx = "${ctx}"; //上下文路径
+		var resourcePath = "${resourcePath}";
+		document.writeln('<script type="text/javascript" src="'+resourcePath+'/js/global.js?d=' + new Date().getTime() + '" ><\/script>');
+	</script>
+    <title>邀请</title>
+	<style>
+		#Rootloading {
+			display: inline-block;
+			width: 12.8%;
+			max-width: 80px;
+			position: absolute;
+			left: 50%;
+			top: 50%;
+			transform: translate(-50%, -50%);
+		}
+	</style>
+	<link rel="stylesheet" href="https://unpkg.com/mescroll.js@1.4.1/mescroll.min.css">
+	<link href="${resourcePath}/css/act-common.css" rel="stylesheet">
+	<style id="__WXWORK_INNER_SCROLLBAR_CSS">
+		::-webkit-scrollbar {
+			width: 12px !important;
+			height: 12px !important;
+		}
+
+		::-webkit-scrollbar-track:vertical {}
+
+		::-webkit-scrollbar-thumb:vertical {
+			background-color: rgba(136, 141, 152, 0.5) !important;
+			border-radius: 10px !important;
+			background-clip: content-box !important;
+			border: 2px solid transparent !important;
+		}
+
+		::-webkit-scrollbar-track:horizontal {}
+
+		::-webkit-scrollbar-thumb:horizontal {
+			background-color: rgba(136, 141, 152, 0.5) !important;
+			border-radius: 10px !important;
+			background-clip: content-box !important;
+			border: 2px solid transparent !important;
+		}
+
+		::-webkit-resizer {
+			display: none !important;
+		}
+		/*.mescroll{
+			position: fixed;
+			top: 44px;
+			bottom: 0;
+			height: auto; !*如设置bottom:50px,则需height:auto才能生效*!
+		}*/
+	</style>
+	<link rel="stylesheet" href="${resourcePath}/css/mobileSelect.css">
+	<script src="https://unpkg.com/mescroll.js@1.4.1/mescroll.min.js" charset="utf-8"></script>
+	<%--<script type="text/javascript" src="${resourcePath}/js/auto-size.js"></script>--%>
+	<script type="text/javascript" src="${resourcePath}/js/mobileSelect.js"></script>
+</head>
+<body style="height: auto;">
+<div id="app" class="">
+	<div id="adminFriends">
+		<div class="header">
+			<div class="accumulate-container active" id="user">
+				<div class="desc">
+					已成功邀请人数
+					<div class="prompt-container"><i class="icon-question icon-question-white"></i>
+						<div class="prompt">
+							<p>未认证：未进行实名认证</p>
+							<p>已认证：已进行实名认证</p>
+							<p>审核中：实名认证中断</p>
+							<p>已进件：已成功开通商户</p>
+							<p>可在APP推广-拓展跟进</p></div>
+					</div>
+				</div>
+				<div class="data">
+					<div class="val">${empty userCount ? '0' : userCount}</div>
+					<div class="unit">人</div>
+				</div>
+			</div>
+			<div class="accumulate-container" id="merc">
+				<div class="desc">
+					已成功邀请商户
+					<div class="prompt-container"><i class="icon-question"></i>
+						<div class="prompt">复审通过的商户，秒审和已驳回的不计算</div>
+					</div>
+				</div>
+				<div class="data">
+					<div class="val mercCount"></div>
+					<div class="unit">人</div>
+				</div>
+			</div>
+		</div>
+		<div class="main" id="mescroll">
+			<div class="user">
+				<table class="table-header">
+					<thead>
+					<tr>
+						<th>用户账号</th><!-- 用户账号 -->
+						<th>认证状态</th><!-- 商户名称 -->
+						<th>邀请时间</th><!-- 进件时间 -->
+					</tr>
+					</thead>
+				</table>
+				<div class="table-body">
+					<table id="user-table" class="table-body">
+
+					</table>
+				</div>
+			</div>
+			<div class="merc" style="display: none;">
+				<table class="table-header">
+					<thead>
+					<tr>
+						<th>用户账号</th><!-- 用户账号 -->
+						<th>商户名称</th><!-- 商户名称 -->
+						<th>进件时间</th><!-- 进件时间 -->
+					</tr>
+					</thead>
+				</table>
+				<div class="table-body">
+					<table id="merc-table" class="table-body">
+
+					</table>
+				</div>
+			</div>
+		</div>
+		<div class="btn-invite"></div>
+		<div class="wx-prompt-dialog" style="display: none;">
+			<div>点击右上角，分享给好友</div>
+		</div>
+	</div>
+	<div class="footer" style="display: none;">
+		<ul>
+			<li class=""><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAG0AAABtCAMAAACcJh9kAAACQ1BMVEUAAAAAAAD///8AAAAAAH8Af39/f38AAFUAVVVVVVUAAEAAQEBAQEAzMzMzM2YqKioqKlUkJCQkJEkgIEAgQEBAQEAcHDkcOTk5OTkaGjMaGk0zMzMzM00XFy4XF0YXLi4XLkYuLkYVKkAqKkAUJzsnJzsSJDckJDciIjMiIkQiM0QgIDAgIEAgMEAeHjweLTwcHDkcKzkbKDYaJjMmJjMmJkAYJDEYJD0kJD0XIy4XIzoXLjojIzojLjoWITchITchLDcgIDUgIEAfHzMfKTMfKT0dJzscJjkbJDcaIzUaIz4jIzUZIjMZKjsiIjMiIjsZIToZKTohITohKToYIDggKDgfJzYeJTQeJTwdJDMdJDocIzIcIzkcIjcbIjYbIjwaITQhITQhITshJzsaIDMaJjMaJjkgJjkZHzgfHzgfJTgYJDceJDceJDUeJDsdIzQdIzocIjMcIjkcKDMcITcbITYbJjYhITYbIDUbIDoaHzQaJDkfHzkfJDkZJDMZJDgfJDgZIzceIzcZIjYdIjYdIjUdIjocITQcITkcIDgcJTgbIDcbJDcbHzYbJDYbJDoaIzUaIzkaIzQaIzgeIzQeIzgZIjMZIjceIjcZITYdITYdJjYZITUdITUcIDUcIDkcJDUcIDQcIDgcJDQcJDgbHzcbIzcbIzYfIzYbIjUaIjQaIjgaITQaITceITcZITcdITcdJDcZIDYdIDYdJDYZIDUcIDUcIzUcHzQcIzQcIzgcIjQcIjcbIjMbIjYbIjYaITVrmw0DAAAAwXRSTlMAAQECAgICAwMDBAQEBQUGBgcHCAgICQkJCgoKCgsLCwsLDAwNDQ4ODw8PEBAQERESEhMUFBQVFRUWFhYWFhcXFxgYGRkZGhscHR0dHh4eHh8fHx8gICEiIiMjJCQlJiYnJycnKCgoKCkpKSoqKyssLC0tLS4vLy8wMDExMTEyMjIzMzQ0NTU2Njc3ODg5OTk6Ojs7Ozs8PDw9PT0+Pj8/P0BAQEBBQUJCQ0RERUVFRkZGR0dHSEhISUlJSkpLS0xNx8p4qQAAB+xJREFUaN7tWv9fE2Uc5xhxkpuzDQ+nlSWeR1LTsQyilZpyI7AgKpjrRqSVhSNwbYSVbemswLmKtRpLSM1u7YK2NgXG1t3+tO6ZJruPwL4w/KHXPj/tdV/2fp7P5/28P+/neV1FRTkkgeE4jj0oMJlyb+NepeyBYOGksf+s42y/kcQ3Hmwz2edNCmkh6e0jN290xaoNtusLQjqdFhau2wzVG1q9KoK2s3z6TvCsnSaqNpAexMuXo+nliF5+mdgwsuA7GH+cz0Lj435mxwZxRaV754clIZ0dwtIP7+hUG7KimwajUqwMXnSwaQNWeq3xyzCfvj/48JfG2lLzg+q5yKVXDu5iD1VSrmyqNQf49GrBB8y1m0qoH7pPgvPCqmjCfPATXal0RaY6PBRKpteKZGjosKok2cRUencCTCaZTIKpJtx6VSmouedN7xxYZX8OWYb+BNfmvG/uWTeWouHt8ZT0fxPBET2lHwkmpHip8bcbFOsDq37GysIasZadsgrZTgsLa8lan6leT8lqjKMhULPZiQ5SFA8MJzsmZkHtQqPGmqKLhz9JO8NQOZyvqu90mSr1q06oLmEn/WSRKo2pu25CMs6ea6m890Bly7lZSM2bXeqiZqegTvsBEQTfwIFsxVcdGPCBJxL+01QRXFG3nJyW5kmIT1qeRnmSa6gGSiNHuX7aMhmX4vHTJ1vUBafRMAqlKvHjMSJzj+yw2qwdZOY3cezHBBSyUUNhycTqu92QH3OjbYQ4s6onTOen2BA7dd70hEgXnGgbnYNccXfX54+H4Q29VyLSf1icGT28RSS+QmvyxzNX4n6TViFe2XJ4dGZR+nDkSm9D3i22Sn3mN6i7N6zbEfFxaiR6z3NFRyhUxqrt1hvw8d/OqPN0Y0qDYwbUIuYxPYXWrYZ2sstp41knrUEa8JTJEwM1nnEYlPksaeKoPQLIyF3qqReXWc3u405JmxPmncd314gLr77nEgeoGbEfJXIvdOLod0uAY7yjFVWh8lEmAHkqBJhHK1GlWx08uLf03VEiV+fUMt9HgLZf+6BZ1AesxmANxu/ro/Gg1SDmGFM3f3AN9IrI94x2rQ6LKbUDPjD4xcAgEocqosUWWtFzhWwtyJ8rqMHAIpieb0CrXJ2a1S3nwwJk/ut16AVV22RkZWciRCbbkJxhda/DlSCEz7dUr0r8LlcY9Kywy7j7oYqKh0nzRGw108XHJszkwxUVD+02uoAkJMOurpWXAk62j0fhw2M0Ir5Sy/j5NUwQ72e0SrQU6DE43Oh4+0q7StnjzB9A8tO/f6jNPNlsi/Brei4+YmvOjFj74e8gmYk/mMfv44qqyRpICVLie5hGkR/Yrlc+Y0FfuRW5Ba6wn72yS8yCopHxSJeCkApYm6QbE5n6pSHAD37O95Yo85iMfM0TgQm+5LwEUxbxvEbKRDzyLR9QaSE89JI6e3pb2y/CLMbdz6IuvKnu/WvQO4bO7d+5/1wIesxr79dtQh3/WXccZvNi+9blmTWavuGgoRk5gs4oHmkdDgLNTPhPHVTKlAdP+eGN4HDrI+h848gItE7cN6bGu7OrIZkAuLsQtOnE3oyrj5y9xUOFMO9D1qRynxmqDn/r7BG1SCu5zhZcACMJMGRNBm3buwGgccKkeRu6p+n0gM2GwF+g73ku+gJ8b97TqUHj32aehO8F3t2WYeOLXpBnzt1NIRXWMV7AjxRra7u3r5cRbTY2BbjiZXRIpaluN6hN3PMiYiZlkV7nua9o0cZgW/ednoLV/tWuzTZUCq39V8iuqdP7topDVdNfcdIacAyFlu5YTLqWBvWbxcflhq/hNipx1VwvMQAYXm++moCbq68NYsmxzfpB6ZqMjSEBaP08Gy3hO9mkRD21y/VXCpqbNygoQjj1BrRLqb9cXaiPKptO+rJHEvu8VXxBb18uDn/bx2zH0WFWxxWg5/yss33L/e0D29LunAWytnilAx2B4dsZ3+3lWxG7HrnDPi5LEGhEAkz7Xhja5NBHesVKvQpT6D8KQcMcfk+LIRrRWTLE9SEHqtRP3E0lf8ORObiqOzR8Fbyf8vYfWM3VKA/0e1Pg+avDh+oyx2KOG3dnF5vQZ/5AZfHGkoKQil8fMSD21ra5AHv56C+9u1Zvwtiu3l+iIJucq60WrSLDyPV4ShCSMa/ljjRjtfTYzN8L7BedJCKT3OSZB6/Oul+oW8thyOpecIO9HD/vMckRtcnOL9iFv2fG6Nr/hks8d7zvRI9Bgxinob+NwF2S7ViOc12Z8pgN7r4i3yKzWYFrDD0n+o4/t6L/wprd0JNPf6zLvcGt1n08Df25uzmXO5d33wZpvNz7mDwP1yt/rPcySObt7hwvYjsGgE2+0L0nv/0Dtqf7AjDMAzuwHO51WKLcnOtg/sePqoMuTtIVhrU5yt1kl1iCUzpF/gdKMoXulMRA2JsKQEv81L9fXtAuU76//6dEkWjhIUWhJ2UyxVC4SLRpS+HHcjLLdJFogROFH31gJwJltDJaGa2MVkYro5XRymhltDJaGa2kaKyj9flCo9XBFokm/LM4X2gs/iMUibbuKKM9MDSdrYRoNt3aaBh1poRoZygsx6crDC+UCEvgmVwfuFQb4elY0ZG4acx5PrbXwpYIjbXszeNjGcs4t7TebApL3Lgln09pMLLz0/Gfp9YXP49/2knmpekyhZrQrDcIteLBfBhbjv9d/AvRMI1q3LveBgAAAABJRU5ErkJggg==">                    首页
+			</li>
+			<li class=""><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAG0AAABtCAMAAACcJh9kAAABzlBMVEUAAAAAAAD///8AAAAAAH9/f38AAFUAVVVVVVUAAEAAQEBAQEAzMzMqKioqKlUkJCQkJEkgIEAcHDkcOTkaGjMaMzMXFy4XLi4XLkYuLkYVKioVKkAqKkAnJzsSJDckJDciIjMgIDAgIEAgMEAeHjweLTwcHDkcKzkbKDYbKEMoKDYaJjMaJkAmJkAkJD0XIy4XIzojIzohITcgIDUfHzMfHz0fKTMfKT0dHTsdJzscJjkbJDckJDcaIzUZIjMZKTohIToYIDgYKDggIDgXHzYfHzYfJzYeJTQeJTwdJDMdJDocIzkcIjcbIjYaITQaJzshITsaIDMaJjkgIDMgIDkgJjkZJTgYJDcYJDUeJDUeJDsdIzQdIzocIjMcIjkcITcbITYbJjwbJTUgIDUaHzQZHzMZJDMZJDgfJDgeIzcZIjYdIjYdIjUdIjocITQcITkcIDgbJDcgJDcbJDYaIzUaIzQaIzgeIzQeIjcZITYdITYdITUcIDUcJDUcJDkcIDQcJDQcJDgbHzcbIzcbIzYbIjUbIjkaIjQaITQaITceITcZITcdITcdJDcZIDYdIDYcIDUcIzUcHzQcIzQcIzgcIjQcIjcbIjYbIjYaITWSlqNxAAAAmnRSTlMAAQECAgIDAwMEBAQFBgYHBwgJCQoKCwsLCwwMDA0ODg8QEBARERISExMTFBQUFRYWFhcYGRkZGRoaGxwcHR4fHyAgICEhISIiIyMkJSYnJycoKCgoKCkqKysrLCwtLS4vLzAwMTIyMjIzNDQ1NTY2Nzg4OTo7Ozs8PT0+Pz8/QEBAQUFCQ0NERUVFRkZGR0dISElJSUpKS0xNE5pYcQAAA05JREFUaN7t2vtX0mAYB/DNKSlscUmxIAOtxKKboRWQihfyNk27WCTJMiuNNAq0XJQakOYlUZS9/Lf9kjI9gHvfOeyH9/sjZ+/5nI0dnsPzPASBg4NzYiEpFVooEh4r01ls11Biq2EoSIu2tAyMcuMo4Xys06yGwSgr+0PIoCY912WCeJpUDRtPAWQNJBc6jdK1ivsfM7ICJh3SNSaQkKnFhqRr2ukdeVpma0y6pguDImr6iEwsszxSRA2EWoun7SYGahE1AB0hMWUrQdRiX+ASnva31dIEmgY4L1w8ritVUL/JYk1wKF3asKasRtFnrZdRUmcuWM1zaSqDvYV95EPJCOtprFZDaQb3px2AmjTfboLRDO7ZNTnVfN5rJKVrjZzMIhRsVknXBpZkanE/I13zb8qtr0GtdG1CbjUHYZ107Y3cap6J6LF2strKN6lJHIMWGpSaKSBf69VIjUuQr3VJLl0OrGENa1jDGtawhjWsYQ1rOUdBd8WaTmGt3J3VhJDSmrYjq21OaRXWqnqz/6hWXzMKa5eeZbX4qNJa07usFn1MHz3rADsytD4+q0W6Nfm+3eDW/izt1y1UjWIC66I+1518fS7GH9+7aP1zParG2MKiQ88v5OuIqpqDexfxXiOqZg3Es32nVA+dr2NIGr3zSZDJACHms9CImr41lto/klp0FbjU1M6nARA2Rmz/PoDWyNvj4hbLW3uBa9XVjR6WfeC0MIgaXccti44stlUf8UaZzfry/WcNqWntT36KTiRnLsJMdiA10v5SEDc0o4NQA3AorcLa8T4uxkCggVJEIzUGa9Ng5M/B4Z/nNKmIVmZx+5fSB9vCy1w95LBFrAXzTN66+x++ePVh9vAawGrwuk6GlsgzVeS/xzfSh7vdYDfk0ZAytAIjlBwT25V2HfTCCWqnN833W0qJ4mhg++vTcxqiSNp2tO0Mwt4O2qwjMekyn0IZN45twVLCWjTgLEe5M4IYisHe3O+gy6xCHKU6JqG0VHSi50YlKkYYOxeS0jxheyXGzwzf1JcQyCFNXXNpSS/9Js95r1bSKpKQEbXZyfoKb3hxAd8w2+e512CG3h/LVc1rCm+vNdSdN9BlxzV0P3Izr5QiSQIHB+c/y1/rtIcDpwBpdwAAAABJRU5ErkJggg==">                    账单
+			</li>
+			<li class=""><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAG0AAABtCAMAAACcJh9kAAACW1BMVEUAAAAAAAD///8AAAAAAH9/f38AAFUAVVVVVVUAAEAAQEBAQEAAMzMzMzMqKioqKlUqVVUkJCQkJEkgIEAcHDkcHFUcOTk5OTkaGjMaMzMzMzMzM00XFy4XLi4XLkYuLkYVKioVKkAqKkAUJzsnJzsnJ04kJDciIjMiIkQiMzMiM0QgIDAgIEAeHjweLTwcHDkcKzkrKzkbKDYoKEMaJjMaJkAmJjMYJDEYJD0kJDEkJD0jIy4jIzoWITchITchLDcVIDUgIDUgKjUfHzMfHz0fKTMfKT0dJzEdJzscJjkmJjkbJDckJDcaIzUaIz4jIzUjIz4ZIjMiIjsiKjsZITohITohKToYIDggIDggKDgXHzYfHzYfJzYfJz4eJTQeJTwdJDMdJDocIzkcIjciIjcbIjYbKDYiKDwaITQaJzQhITQhJzsaIDMgIDkgJjMgJjkZJTgfHzgfJTgeJDceJDUdIzQdIzocIjMcIjkcKDkcITIcITccJzcbITYbJjYbIDUbIDobJTUgJToaHzQaJDQZJDMZJDgfJDgZIzIZIzceIzcZIjYdIjYdIjsdIjUcITQcIDMcIDgcJTMcJTgbIDcbJDcgJDcbHzYbJDYaIzUaIzkfIzUaIzQeIzQeIzgZIjMZIjceIjcZITYdITYdITUcIDUcJDUcIDQcJDQcJDgbHzcbIzMbIzcbIzYbIjUbIjkaIjQaIjgeIjQeJTQaITQaITceITcZITMZITcdITcZIDYdIDYdJDYZIDUcIDUcIzUcIzkcHzQcIzQcIjQcIjcbIjMbIjYbIjYaITWRLhvGAAAAyXRSTlMAAQECAgIDAwMEBAQFBQYGBgcHCAkJCQkKCgoKCwsLCwwMDA0NDQ4PDw8PEBARERISEhMTFBQUFRUVFRYWFxcXGBgYGRkZGRoaGxscHB0dHR0eHh4fHx8gICAhISEhIiIjIyQlJSYmJicnJycoKCgoKSkpKissLC0tLS4uLi8vMDAwMDExMjIyMzMzNDQ0NTY3Nzc3ODg4OTk6Ojo7Ozs8PDw9PT4/P0BAQEFBQUJDQ0RERERFRUVGRkZHR0dISEhISUlKSktLTE23sPFYAAAIsklEQVRo3u1a/19aVR/3CPKQPGDcSwtd24oR7KlctGYj88sz1xBza7a0dBkl5mI9rS+ijraGrdLmfQgzJaGWmZquBkSFi8GUBLqXPysmr+2cg1flctjr9byeV58f5dzzPp+v5/35HEtK/pcFVOzRG2rq/11fY9DvqQB3E0kiV2lqO04POMf+O+YcON1Rq1HJJXcLUbavbcizGAwtR6Ir0chyKLjoGWrbJ7sbUCKFod0x4U9waShcwj/haDcoRMUGk6ifGVxk0xuFXRx8Ri0pMlp131w4meaTZHiur7qo4UHV2efY9GbCztnrqOIFi7yWCaW3khBTKy8WWGkLE2a3RGPDTEtpkTR7whni0lsLF3I+URTtgH7An95e/AP6YrhuV3cgmQdaMtC9qwiqmV24z7iY/3vftO97fww3L+syEysHZIMRrHwkw984Xms71vaa45twEvslMigjhaObPKhqyWvnWx/XqmmaVmsfbz1/DbUx62mkCNF05wLIhhHfmVrlbQWAsvaML4IGyjkdoSEP+ZHjc95X78V+vvdVL2LMpP8QmSmVL6zC7dbmX1GLsZ/F6lfm1+BhVl9QEqHp34Ze4wJv6TcueCsAj8O+rSdCOzIG90p5tBtvFonWk4LnGTtChNblg2g/vMtT6AH17g8QzddFhNb3I0RzNZfzrChvdkG0H/uI0Pp/hiE3qONjBCLdIFzycz8R2tBNuJWN5otvQNvgkptDRGgXYQikrbyFCciscEnqIhHaJ0jyvl7Gu6TsdST9Pymabn283ANQfUXTzRGHWw1oeaNEOwCXxB1EaPZluNWlGj7aKKm5BJcs24nQrAvQcVd6+JiHvOcKdNuClQjt+AREC4/sEm9YIN41EoZoE8eJ0OqcSFAu8NyWVOMCEpLOOiK0B63IzR11P3sPHpbgnmfdUeT2tj5IhFZuRngrt+o4qETjUqQ86EDuPzZsLie7vA94US7wC3NAgfyoOMD8gvII7wFSNmlB/JJOBcethtvtocxgHQ8i2Z9esJAySvk+JoGxydn+J7OxQj3ZP4sxygSzj5icg96rHN5guJpuNRilTS68FeGu9haBmhvsf+BwoXc04hKx5p0QDvaH3VCMFqfx6xhO+V1N8hJ5kwv/Y+zrxmI0OUD1/BV841krVUJZZ/E/XnleVZT2VNWes/GcjS6hbXM5R2hXFwOMMp7z5+qmLFHm6uY/Z6TIwUrNo9GcNthtyvjN5M5phqOjZtJmGFSdYII5fdr1s+sxefZ6Tl8XZE5UATKwY9MRXIdU6E6+hVL4T5HpYyRwQNozk8hp8AMfGbKlUmH4KJDT6idmeqQFwwFNlycn1Va9NqMiuyFQGG3e1Zyk83RpCoXbcXxuBXfZsrd7L7Jgb7d3GXfeytzxHYVpVtY5lcRr1u8OI4WSBTFldPyO16/kVGdZIdpVPefGAyT6na0mZ9oKKmps30XxUHE/VyUcrMI0GcFDwNd3Hw8Luq/PhwdSZNJUIdiORz/FN4l5T+4Q8ywU7zjpjeHH+vSoQFvK9efx8A662jaJNqBpY4J4kpzXC7oORDrrEl6WLrduPj+WtYzgxW3JqhMy/KU7Ahg/CA/XKza3DlDUD4cxzhDooAVMm1rd2FmDI/Vbf03Xj2DGZN2teU+h5DrXCuZ2pmW7MbWkhcGCasWly9d11RcC6JeRL5sV2x0UKJq/RBOGC1zIb7IN1Kd+Qp0WGW+tzOOzytZxFC7x0yl1PraUHLmMpY/XIs3rlFKLF0vQy0fyeCUQqy6GsOvMkuedBaos2IUXuqgSb/vRA23zSDxyfvv+fFNHtN/uR7Rj59se2PaThgnU/HFGm/+rkEzLxFGHTzRsc1CgtcXQVGPMAqa3QGZm0KSL2bRbfyzrmELWry29XCmovFa+vLSGfD/VsaVhynZ+voo5Tei8UY+5bvXznWVbdWsnkBlCOuHSC6X2cr0LyVVu4cQWHR2oZdAQ8VkEMyggtfjQQGFqN90ByC1xqBrH2goZgetsLLJH3CLfDE5iHEbsGPmqoZAnUVnDV4h9uGHjJhUFUDZ09jHftbsgrra7ax6dsdg2eQeUPuz9EylZo5S4IDQxNYoUsD+9D/OX2Yc6kQ6b850SF8Z6gfgUMvrmrnY+xLvMOBpBWGh/4S+v1f0I642MGnkbtReRtj3121FpwWjSo7+lkKHAi6V8U030RAEHwUsh0DsCqJV4pqjlZqTZ5DyNdEnhQjd6kLB080y/FOjraPxDKUmXCaQfxtEXVcUGW+s8sMBx33aTTSNA97dQuYRHlxsDtAkhx6zjKcJ+/SkHcksumXLd8th7CBtJnqwgRKs4iTwSht57LOfnwxOwUYnPGsWEaGLjLPRcbOJwzq/tQRZx617iMcteJOjYYLsY7zGRp5/0dAP5VIdqmEZ2tGE9rcQwjMTIZ/dLidGk93+GxMmwAb135C95YPhft5dmq6ucooULJc9W81L7dZgEnpdQykENQitzM51ZfenqBpNwaaims3p0zkA0/yDqGxVzAxryUt2tanCod+yLaZ9wmf5irPfQrUpUdwma8gajQtGmYCFJ9GozdWz/wGK6UFkc2J+pVdpeZM8pDM0Dk3G1OUNHHv0gwBWMxgU+eDRDUJohNU16UDT6wp0r4obHADKtpj+RLlwS/kwzCwyeO+4JXKCxmJxkb5OfN3ZnXl570mTSk3nR3f3GbTrETmIxKdr5n5tclgB+nGlqgP59QrT3M5exTPtxlp5yN89UirALyfDmZGAt8euMvTHT1ACNjRDNlhnlAFmjfebXxFpg8k3DP/AbTKbpGHKPO3v+9c/1/OtOcgRYXLJ7Pb/kj/Q4x91DHZoNNBiUK5RKhUy0fogy0zWiKLlmWu9tgEh2a9Py7a5mrXU+VTBYat6qFcbm95ydCYajMeESDQdnzu4R1kEAkerp0073hHBxO08/rRIJpTUipf5g/WHhUn9Qryz6f2/+LX/L/4f8BS9qqdvsj0alAAAAAElFTkSuQmCC">                    我的
+			</li>
+		</ul>
+	</div>
+	<!---->
+	<!---->
+</div>
+<div class="toast-wrapper" style="display: none;">
+	<div class="toast"></div>
+</div>
+<div class="toast3-wrapper" style="display: none;">
+
+</div>
+<div class="toast-wrapper2" style="display: none;">
+	<div class="toast2" style="height: 200px;">
+		<p class="toast-title"></p>
+		<p class="toast-message"></p>
+		<div class="btn-wrapper">
+			<!----><button type="button" class="btn"></button></div>
+	</div>
+</div>
+<script>
+	$(function () {
+		$(".accumulate-container").on('click',function () {
+			if(this.className.indexOf('active') > 0){
+				return;
+			}else{
+				$('.accumulate-container').each(function (k,v) {
+					v.classList.remove('active');
+					$('.'+$(v).attr("id")).hide();
+				})
+				this.classList.add('active');
+				$('.'+$(this).attr("id")).show();
+			}
+		})
+		$(".prompt-container").on('click',function () {
+			var dom = $(this).find("div.prompt");
+			if(dom.attr("data-index") == undefined || dom.attr("data-index") == 1){
+				dom.show();
+				dom.attr("data-index",0);
+			}else{
+				dom.hide();
+				dom.attr("data-index",1);
+			}
+		})
+	})
+
+</script>
+<script type="text/javascript" charset="utf-8">
+	$(function(){
+		//创建MeScroll对象
+		var mescroll = new MeScroll("mescroll", {
+			down: {
+				auto: true, //是否在初始化完毕之后自动执行下拉回调callback; 默认true
+				callback: downCallback, //下拉刷新的回调
+			},
+			up: {
+				auto: false, //是否在初始化时以上拉加载的方式自动加载第一页数据; 默认false
+				callback: upCallback, //上拉回调,此处可简写; 相当于 callback: function (page) { upCallback(page); }
+				htmlNodata: "没有更多了",
+			}
+		});
+
+		function getDom() {
+			var checkValue =  $(".accumulate-container.active").attr("id");
+			if(checkValue == "user"){
+				return $("#user-table");
+			}else{
+				return $("#merc-table");
+			}
+		}
+
+		/*下拉刷新的回调 */
+		function downCallback(){
+			//联网加载数据
+			var pageNum = 1;
+			getListDataFromNet(pageNum, 10, function(data,type){
+				//联网成功的回调,隐藏下拉刷新的状态
+				mescroll.endSuccess();
+				//设置列表数据
+				setListData(data, false,getDom(),type,pageNum);
+			}, function(){
+				//联网失败的回调,隐藏下拉刷新的状态
+				mescroll.endErr();
+			});
+		}
+		var page = {num:1, size:10};
+		function upCallback(page){
+			//联网加载数据
+			page.num = 2;
+			getListDataFromNet(page.num, page.size, function(data,type){
+				//联网成功的回调,隐藏下拉刷新和上拉加载的状态;
+				mescroll.endSuccess(data.length);//传参:数据的总数; mescroll会自动判断列表如果无任何数据,则提示空;列表无下一页数据,则提示无更多数据;
+				//设置列表数据
+				setListData(data, true,getDom(),type,page.num);
+			}, function(){
+				//联网失败的回调,隐藏下拉刷新和上拉加载的状态;
+				mescroll.endErr();
+			});
+		}
+
+		/*设置列表数据*/
+		function setListData(data, isAppend,dom,type,pageNum) {
+			var str = "";
+			if(type == 'user'){
+				if(data.length > 0){
+					for (var i = 0; i <data.length; i++) {
+						var newObj=data[i];
+						str += "<tr>";
+						str += "<td>"+newObj.loginName+"</td>";
+						str += "<td>"+formatDictUserTypeName(newObj.status,newObj.merchantAuditStatus)+"</td>";
+						str += "<td>"+newObj.createDt+"</td></tr>";
+					}
+				}else{
+					if(pageNum < 2){
+						str += "<div class='no-data'>暂无数据</div>";
+						$("#user-table").append(str);
+					}
+				}
+				if(!isAppend){
+					$("#user-table").empty();
+				}
+				$("#user-table").append(str);
+			}else{
+				if(data.length > 0){
+					for (var i = 0; i < data.length; i++) {
+						var newObj=data[i];
+						str += "<tr>";
+						str += "<td>"+newObj.loginName+"</td>";
+						str += "<td>"+newObj.alias+"</td>";
+						str += "<td>"+newObj.createDt+"</td></tr>";
+					}
+				}else{
+					if(pageNum < 2){
+						str += "<div class='no-data'>暂无数据</div>";
+						$("#merc-table").append(str);
+					}
+				}
+				if(!isAppend){
+					$("#merc-table").empty();
+				}
+				$("#merc-table").append(str);
+			}
+		}
+		function renderTime(date) {
+			var dateee = new Date(date).toJSON();
+			return new Date(+new Date(dateee) + 8 * 3600 * 1000).toISOString().replace(/T/g, ' ').replace(/\.[\d]{3}Z/, '').substr(0,16);
+		}
+
+		function formateDate(datetime) {
+			// let  = "2019-11-06T16:00:00.000Z"
+			function addDateZero(num) {
+				return (num < 10 ? "0" + num : num);
+			}
+			let d = new Date(datetime);
+			let formatdatetime = d.getFullYear() + '-' + addDateZero(d.getMonth() + 1) + '-' + addDateZero(d.getDate());
+			return formatdatetime;
+		}
+		function formatDictUserTypeName(value,merchantAuditStatus) {
+			if(value == '0'){
+				return '未认证';
+			}else if(value == '1'){
+				return '审核中';
+			}else if(value == '2'){
+				return '审核失败';
+			}else if(value == '3' && merchantAuditStatus != '3'){
+				return '已认证';
+			}else if(merchantAuditStatus == '3') {
+				return '已进件';
+			}else{
+				return '未知';
+			}
+		}
+
+		/*联网加载列表数据*/
+		var downIndex=0;
+		function getListDataFromNet(pageNum,pageSize,successCallback,errorCallback) {
+			//延时一秒,模拟联网
+			/*setTimeout(function () {
+
+			},1000)*/
+			try{
+				$.ajax({
+					url : ctx + '/activity/invite/page',
+					dataType : 'json',
+					type : "post",
+					data : {
+						'token': '${token}',
+						't': '${t}',
+						'pageNum': pageNum,
+						'pageSize': pageSize,
+					},
+					success : function(res) {
+						if(res.code == 200){
+							var userList = res.data.userList.records;
+							var mercList = res.data.mercList.records;
+							var mercCount = res.data.mercCount;
+							$(".mercCount").html(mercCount);
+							successCallback&&successCallback(userList,'user');
+							successCallback&&successCallback(mercList,'merc');
+						}else {
+							errorCallback&&errorCallback();
+						}
+					},
+				})
+			}catch(e){
+				//联网失败的回调
+				errorCallback&&errorCallback();
+			}
+		}
+		//禁止PC浏览器拖拽图片,避免与下拉刷新冲突;如果仅在移动端使用,可删除此代码
+		document.ondragstart=function() {return false;}
+	});
+</script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/jsp/activity/act-one-lay.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/activity/act-one-lay.jsp
new file mode 100644
index 0000000..3658b27
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/activity/act-one-lay.jsp
@@ -0,0 +1,110 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<!DOCTYPE html>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html lang="en">
+<head>
+	<meta charset="UTF-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1">
+	<meta http-equiv="pragma" content="no-cache">
+	<meta http-equiv="Cache-Control" content="no-cache, must-revalidate">
+	<meta http-equiv="expires" content="0">
+	<c:set var="ctx" value="${pageContext.request.contextPath}"  scope="request"/>
+	<c:set var="resourcePath" value="${ctx}/resources"  scope="request"/>
+	<script type="text/javascript">
+		var ctx = "${ctx}"; //上下文路径
+		var resourcePath = "${resourcePath}";
+		document.writeln('<script type="text/javascript" src="'+resourcePath+'/js/global.js?d=' + new Date().getTime() + '" ><\/script>');
+	</script>
+    <title>邀请</title>
+	<style>
+		#Rootloading {
+			display: inline-block;
+			width: 12.8%;
+			max-width: 80px;
+			position: absolute;
+			left: 50%;
+			top: 50%;
+			transform: translate(-50%, -50%);
+		}
+	</style>
+	<link href="${resourcePath}/css/act-common.css" rel="stylesheet">
+	<style id="__WXWORK_INNER_SCROLLBAR_CSS">
+		::-webkit-scrollbar {
+			width: 12px !important;
+			height: 12px !important;
+		}
+
+		::-webkit-scrollbar-track:vertical {}
+
+		::-webkit-scrollbar-thumb:vertical {
+			background-color: rgba(136, 141, 152, 0.5) !important;
+			border-radius: 10px !important;
+			background-clip: content-box !important;
+			border: 2px solid transparent !important;
+		}
+
+		::-webkit-scrollbar-track:horizontal {}
+
+		::-webkit-scrollbar-thumb:horizontal {
+			background-color: rgba(136, 141, 152, 0.5) !important;
+			border-radius: 10px !important;
+			background-clip: content-box !important;
+			border: 2px solid transparent !important;
+		}
+
+		::-webkit-resizer {
+			display: none !important;
+		}
+	</style>
+</head>
+<body style="height: auto;">
+<div id="app" class="">
+	<div id="registerActivityEntrance">
+		<div class="top">
+			<img src="${resourcePath}/css/assets/banner.9492e.png" class="activity-desc">
+			<img src="${resourcePath}/css/assets/button.2df98.png" class="activity-button" style="border-radius: 30px;box-shadow: 0 4px 8px 0 hsla(0, 0%, 78%, .5)">
+		</div>
+		<div class="bottom">
+			<img src="${resourcePath}/css/assets/inviteF.ca150.png" class="activity-invite">
+		</div>
+	</div>
+	<div class="footer" style="display: none;">
+		<ul>
+			<li class=""><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAG0AAABtCAMAAACcJh9kAAACQ1BMVEUAAAAAAAD///8AAAAAAH8Af39/f38AAFUAVVVVVVUAAEAAQEBAQEAzMzMzM2YqKioqKlUkJCQkJEkgIEAgQEBAQEAcHDkcOTk5OTkaGjMaGk0zMzMzM00XFy4XF0YXLi4XLkYuLkYVKkAqKkAUJzsnJzsSJDckJDciIjMiIkQiM0QgIDAgIEAgMEAeHjweLTwcHDkcKzkbKDYaJjMmJjMmJkAYJDEYJD0kJD0XIy4XIzoXLjojIzojLjoWITchITchLDcgIDUgIEAfHzMfKTMfKT0dJzscJjkbJDcaIzUaIz4jIzUZIjMZKjsiIjMiIjsZIToZKTohITohKToYIDggKDgfJzYeJTQeJTwdJDMdJDocIzIcIzkcIjcbIjYbIjwaITQhITQhITshJzsaIDMaJjMaJjkgJjkZHzgfHzgfJTgYJDceJDceJDUeJDsdIzQdIzocIjMcIjkcKDMcITcbITYbJjYhITYbIDUbIDoaHzQaJDkfHzkfJDkZJDMZJDgfJDgZIzceIzcZIjYdIjYdIjUdIjocITQcITkcIDgcJTgbIDcbJDcbHzYbJDYbJDoaIzUaIzkaIzQaIzgeIzQeIzgZIjMZIjceIjcZITYdITYdJjYZITUdITUcIDUcIDkcJDUcIDQcIDgcJDQcJDgbHzcbIzcbIzYfIzYbIjUaIjQaIjgaITQaITceITcZITcdITcdJDcZIDYdIDYdJDYZIDUcIDUcIzUcHzQcIzQcIzgcIjQcIjcbIjMbIjYbIjYaITVrmw0DAAAAwXRSTlMAAQECAgICAwMDBAQEBQUGBgcHCAgICQkJCgoKCgsLCwsLDAwNDQ4ODw8PEBAQERESEhMUFBQVFRUWFhYWFhcXFxgYGRkZGhscHR0dHh4eHh8fHx8gICEiIiMjJCQlJiYnJycnKCgoKCkpKSoqKyssLC0tLS4vLy8wMDExMTEyMjIzMzQ0NTU2Njc3ODg5OTk6Ojs7Ozs8PDw9PT0+Pj8/P0BAQEBBQUJCQ0RERUVFRkZGR0dHSEhISUlJSkpLS0xNx8p4qQAAB+xJREFUaN7tWv9fE2Uc5xhxkpuzDQ+nlSWeR1LTsQyilZpyI7AgKpjrRqSVhSNwbYSVbemswLmKtRpLSM1u7YK2NgXG1t3+tO6ZJruPwL4w/KHXPj/tdV/2fp7P5/28P+/neV1FRTkkgeE4jj0oMJlyb+NepeyBYOGksf+s42y/kcQ3Hmwz2edNCmkh6e0jN290xaoNtusLQjqdFhau2wzVG1q9KoK2s3z6TvCsnSaqNpAexMuXo+nliF5+mdgwsuA7GH+cz0Lj435mxwZxRaV754clIZ0dwtIP7+hUG7KimwajUqwMXnSwaQNWeq3xyzCfvj/48JfG2lLzg+q5yKVXDu5iD1VSrmyqNQf49GrBB8y1m0qoH7pPgvPCqmjCfPATXal0RaY6PBRKpteKZGjosKok2cRUencCTCaZTIKpJtx6VSmouedN7xxYZX8OWYb+BNfmvG/uWTeWouHt8ZT0fxPBET2lHwkmpHip8bcbFOsDq37GysIasZadsgrZTgsLa8lan6leT8lqjKMhULPZiQ5SFA8MJzsmZkHtQqPGmqKLhz9JO8NQOZyvqu90mSr1q06oLmEn/WSRKo2pu25CMs6ea6m890Bly7lZSM2bXeqiZqegTvsBEQTfwIFsxVcdGPCBJxL+01QRXFG3nJyW5kmIT1qeRnmSa6gGSiNHuX7aMhmX4vHTJ1vUBafRMAqlKvHjMSJzj+yw2qwdZOY3cezHBBSyUUNhycTqu92QH3OjbYQ4s6onTOen2BA7dd70hEgXnGgbnYNccXfX54+H4Q29VyLSf1icGT28RSS+QmvyxzNX4n6TViFe2XJ4dGZR+nDkSm9D3i22Sn3mN6i7N6zbEfFxaiR6z3NFRyhUxqrt1hvw8d/OqPN0Y0qDYwbUIuYxPYXWrYZ2sstp41knrUEa8JTJEwM1nnEYlPksaeKoPQLIyF3qqReXWc3u405JmxPmncd314gLr77nEgeoGbEfJXIvdOLod0uAY7yjFVWh8lEmAHkqBJhHK1GlWx08uLf03VEiV+fUMt9HgLZf+6BZ1AesxmANxu/ro/Gg1SDmGFM3f3AN9IrI94x2rQ6LKbUDPjD4xcAgEocqosUWWtFzhWwtyJ8rqMHAIpieb0CrXJ2a1S3nwwJk/ut16AVV22RkZWciRCbbkJxhda/DlSCEz7dUr0r8LlcY9Kywy7j7oYqKh0nzRGw108XHJszkwxUVD+02uoAkJMOurpWXAk62j0fhw2M0Ir5Sy/j5NUwQ72e0SrQU6DE43Oh4+0q7StnjzB9A8tO/f6jNPNlsi/Brei4+YmvOjFj74e8gmYk/mMfv44qqyRpICVLie5hGkR/Yrlc+Y0FfuRW5Ba6wn72yS8yCopHxSJeCkApYm6QbE5n6pSHAD37O95Yo85iMfM0TgQm+5LwEUxbxvEbKRDzyLR9QaSE89JI6e3pb2y/CLMbdz6IuvKnu/WvQO4bO7d+5/1wIesxr79dtQh3/WXccZvNi+9blmTWavuGgoRk5gs4oHmkdDgLNTPhPHVTKlAdP+eGN4HDrI+h848gItE7cN6bGu7OrIZkAuLsQtOnE3oyrj5y9xUOFMO9D1qRynxmqDn/r7BG1SCu5zhZcACMJMGRNBm3buwGgccKkeRu6p+n0gM2GwF+g73ku+gJ8b97TqUHj32aehO8F3t2WYeOLXpBnzt1NIRXWMV7AjxRra7u3r5cRbTY2BbjiZXRIpaluN6hN3PMiYiZlkV7nua9o0cZgW/ednoLV/tWuzTZUCq39V8iuqdP7topDVdNfcdIacAyFlu5YTLqWBvWbxcflhq/hNipx1VwvMQAYXm++moCbq68NYsmxzfpB6ZqMjSEBaP08Gy3hO9mkRD21y/VXCpqbNygoQjj1BrRLqb9cXaiPKptO+rJHEvu8VXxBb18uDn/bx2zH0WFWxxWg5/yss33L/e0D29LunAWytnilAx2B4dsZ3+3lWxG7HrnDPi5LEGhEAkz7Xhja5NBHesVKvQpT6D8KQcMcfk+LIRrRWTLE9SEHqtRP3E0lf8ORObiqOzR8Fbyf8vYfWM3VKA/0e1Pg+avDh+oyx2KOG3dnF5vQZ/5AZfHGkoKQil8fMSD21ra5AHv56C+9u1Zvwtiu3l+iIJucq60WrSLDyPV4ShCSMa/ljjRjtfTYzN8L7BedJCKT3OSZB6/Oul+oW8thyOpecIO9HD/vMckRtcnOL9iFv2fG6Nr/hks8d7zvRI9Bgxinob+NwF2S7ViOc12Z8pgN7r4i3yKzWYFrDD0n+o4/t6L/wprd0JNPf6zLvcGt1n08Df25uzmXO5d33wZpvNz7mDwP1yt/rPcySObt7hwvYjsGgE2+0L0nv/0Dtqf7AjDMAzuwHO51WKLcnOtg/sePqoMuTtIVhrU5yt1kl1iCUzpF/gdKMoXulMRA2JsKQEv81L9fXtAuU76//6dEkWjhIUWhJ2UyxVC4SLRpS+HHcjLLdJFogROFH31gJwJltDJaGa2MVkYro5XRymhltDJaGa2kaKyj9flCo9XBFokm/LM4X2gs/iMUibbuKKM9MDSdrYRoNt3aaBh1poRoZygsx6crDC+UCEvgmVwfuFQb4elY0ZG4acx5PrbXwpYIjbXszeNjGcs4t7TebApL3Lgln09pMLLz0/Gfp9YXP49/2knmpekyhZrQrDcIteLBfBhbjv9d/AvRMI1q3LveBgAAAABJRU5ErkJggg==">                    首页
+			</li>
+			<li class=""><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAG0AAABtCAMAAACcJh9kAAABzlBMVEUAAAAAAAD///8AAAAAAH9/f38AAFUAVVVVVVUAAEAAQEBAQEAzMzMqKioqKlUkJCQkJEkgIEAcHDkcOTkaGjMaMzMXFy4XLi4XLkYuLkYVKioVKkAqKkAnJzsSJDckJDciIjMgIDAgIEAgMEAeHjweLTwcHDkcKzkbKDYbKEMoKDYaJjMaJkAmJkAkJD0XIy4XIzojIzohITcgIDUfHzMfHz0fKTMfKT0dHTsdJzscJjkbJDckJDcaIzUZIjMZKTohIToYIDgYKDggIDgXHzYfHzYfJzYeJTQeJTwdJDMdJDocIzkcIjcbIjYaITQaJzshITsaIDMaJjkgIDMgIDkgJjkZJTgYJDcYJDUeJDUeJDsdIzQdIzocIjMcIjkcITcbITYbJjwbJTUgIDUaHzQZHzMZJDMZJDgfJDgeIzcZIjYdIjYdIjUdIjocITQcITkcIDgbJDcgJDcbJDYaIzUaIzQaIzgeIzQeIjcZITYdITYdITUcIDUcJDUcJDkcIDQcJDQcJDgbHzcbIzcbIzYbIjUbIjkaIjQaITQaITceITcZITcdITcdJDcZIDYdIDYcIDUcIzUcHzQcIzQcIzgcIjQcIjcbIjYbIjYaITWSlqNxAAAAmnRSTlMAAQECAgIDAwMEBAQFBgYHBwgJCQoKCwsLCwwMDA0ODg8QEBARERISExMTFBQUFRYWFhcYGRkZGRoaGxwcHR4fHyAgICEhISIiIyMkJSYnJycoKCgoKCkqKysrLCwtLS4vLzAwMTIyMjIzNDQ1NTY2Nzg4OTo7Ozs8PT0+Pz8/QEBAQUFCQ0NERUVFRkZGR0dISElJSUpKS0xNE5pYcQAAA05JREFUaN7t2vtX0mAYB/DNKSlscUmxIAOtxKKboRWQihfyNk27WCTJMiuNNAq0XJQakOYlUZS9/Lf9kjI9gHvfOeyH9/sjZ+/5nI0dnsPzPASBg4NzYiEpFVooEh4r01ls11Biq2EoSIu2tAyMcuMo4Xys06yGwSgr+0PIoCY912WCeJpUDRtPAWQNJBc6jdK1ivsfM7ICJh3SNSaQkKnFhqRr2ukdeVpma0y6pguDImr6iEwsszxSRA2EWoun7SYGahE1AB0hMWUrQdRiX+ASnva31dIEmgY4L1w8ritVUL/JYk1wKF3asKasRtFnrZdRUmcuWM1zaSqDvYV95EPJCOtprFZDaQb3px2AmjTfboLRDO7ZNTnVfN5rJKVrjZzMIhRsVknXBpZkanE/I13zb8qtr0GtdG1CbjUHYZ107Y3cap6J6LF2strKN6lJHIMWGpSaKSBf69VIjUuQr3VJLl0OrGENa1jDGtawhjWsYQ1rOUdBd8WaTmGt3J3VhJDSmrYjq21OaRXWqnqz/6hWXzMKa5eeZbX4qNJa07usFn1MHz3rADsytD4+q0W6Nfm+3eDW/izt1y1UjWIC66I+1518fS7GH9+7aP1zParG2MKiQ88v5OuIqpqDexfxXiOqZg3Es32nVA+dr2NIGr3zSZDJACHms9CImr41lto/klp0FbjU1M6nARA2Rmz/PoDWyNvj4hbLW3uBa9XVjR6WfeC0MIgaXccti44stlUf8UaZzfry/WcNqWntT36KTiRnLsJMdiA10v5SEDc0o4NQA3AorcLa8T4uxkCggVJEIzUGa9Ng5M/B4Z/nNKmIVmZx+5fSB9vCy1w95LBFrAXzTN66+x++ePVh9vAawGrwuk6GlsgzVeS/xzfSh7vdYDfk0ZAytAIjlBwT25V2HfTCCWqnN833W0qJ4mhg++vTcxqiSNp2tO0Mwt4O2qwjMekyn0IZN45twVLCWjTgLEe5M4IYisHe3O+gy6xCHKU6JqG0VHSi50YlKkYYOxeS0jxheyXGzwzf1JcQyCFNXXNpSS/9Js95r1bSKpKQEbXZyfoKb3hxAd8w2+e512CG3h/LVc1rCm+vNdSdN9BlxzV0P3Izr5QiSQIHB+c/y1/rtIcDpwBpdwAAAABJRU5ErkJggg==">                    账单
+			</li>
+			<li class=""><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAG0AAABtCAMAAACcJh9kAAACW1BMVEUAAAAAAAD///8AAAAAAH9/f38AAFUAVVVVVVUAAEAAQEBAQEAAMzMzMzMqKioqKlUqVVUkJCQkJEkgIEAcHDkcHFUcOTk5OTkaGjMaMzMzMzMzM00XFy4XLi4XLkYuLkYVKioVKkAqKkAUJzsnJzsnJ04kJDciIjMiIkQiMzMiM0QgIDAgIEAeHjweLTwcHDkcKzkrKzkbKDYoKEMaJjMaJkAmJjMYJDEYJD0kJDEkJD0jIy4jIzoWITchITchLDcVIDUgIDUgKjUfHzMfHz0fKTMfKT0dJzEdJzscJjkmJjkbJDckJDcaIzUaIz4jIzUjIz4ZIjMiIjsiKjsZITohITohKToYIDggIDggKDgXHzYfHzYfJzYfJz4eJTQeJTwdJDMdJDocIzkcIjciIjcbIjYbKDYiKDwaITQaJzQhITQhJzsaIDMgIDkgJjMgJjkZJTgfHzgfJTgeJDceJDUdIzQdIzocIjMcIjkcKDkcITIcITccJzcbITYbJjYbIDUbIDobJTUgJToaHzQaJDQZJDMZJDgfJDgZIzIZIzceIzcZIjYdIjYdIjsdIjUcITQcIDMcIDgcJTMcJTgbIDcbJDcgJDcbHzYbJDYaIzUaIzkfIzUaIzQeIzQeIzgZIjMZIjceIjcZITYdITYdITUcIDUcJDUcIDQcJDQcJDgbHzcbIzMbIzcbIzYbIjUbIjkaIjQaIjgeIjQeJTQaITQaITceITcZITMZITcdITcZIDYdIDYdJDYZIDUcIDUcIzUcIzkcHzQcIzQcIjQcIjcbIjMbIjYbIjYaITWRLhvGAAAAyXRSTlMAAQECAgIDAwMEBAQFBQYGBgcHCAkJCQkKCgoKCwsLCwwMDA0NDQ4PDw8PEBARERISEhMTFBQUFRUVFRYWFxcXGBgYGRkZGRoaGxscHB0dHR0eHh4fHx8gICAhISEhIiIjIyQlJSYmJicnJycoKCgoKSkpKissLC0tLS4uLi8vMDAwMDExMjIyMzMzNDQ0NTY3Nzc3ODg4OTk6Ojo7Ozs8PDw9PT4/P0BAQEFBQUJDQ0RERERFRUVGRkZHR0dISEhISUlKSktLTE23sPFYAAAIsklEQVRo3u1a/19aVR/3CPKQPGDcSwtd24oR7KlctGYj88sz1xBza7a0dBkl5mI9rS+ijraGrdLmfQgzJaGWmZquBkSFi8GUBLqXPysmr+2cg1flctjr9byeV58f5dzzPp+v5/35HEtK/pcFVOzRG2rq/11fY9DvqQB3E0kiV2lqO04POMf+O+YcON1Rq1HJJXcLUbavbcizGAwtR6Ir0chyKLjoGWrbJ7sbUCKFod0x4U9waShcwj/haDcoRMUGk6ifGVxk0xuFXRx8Ri0pMlp131w4meaTZHiur7qo4UHV2efY9GbCztnrqOIFi7yWCaW3khBTKy8WWGkLE2a3RGPDTEtpkTR7whni0lsLF3I+URTtgH7An95e/AP6YrhuV3cgmQdaMtC9qwiqmV24z7iY/3vftO97fww3L+syEysHZIMRrHwkw984Xms71vaa45twEvslMigjhaObPKhqyWvnWx/XqmmaVmsfbz1/DbUx62mkCNF05wLIhhHfmVrlbQWAsvaML4IGyjkdoSEP+ZHjc95X78V+vvdVL2LMpP8QmSmVL6zC7dbmX1GLsZ/F6lfm1+BhVl9QEqHp34Ze4wJv6TcueCsAj8O+rSdCOzIG90p5tBtvFonWk4LnGTtChNblg2g/vMtT6AH17g8QzddFhNb3I0RzNZfzrChvdkG0H/uI0Pp/hiE3qONjBCLdIFzycz8R2tBNuJWN5otvQNvgkptDRGgXYQikrbyFCciscEnqIhHaJ0jyvl7Gu6TsdST9Pymabn283ANQfUXTzRGHWw1oeaNEOwCXxB1EaPZluNWlGj7aKKm5BJcs24nQrAvQcVd6+JiHvOcKdNuClQjt+AREC4/sEm9YIN41EoZoE8eJ0OqcSFAu8NyWVOMCEpLOOiK0B63IzR11P3sPHpbgnmfdUeT2tj5IhFZuRngrt+o4qETjUqQ86EDuPzZsLie7vA94US7wC3NAgfyoOMD8gvII7wFSNmlB/JJOBcethtvtocxgHQ8i2Z9esJAySvk+JoGxydn+J7OxQj3ZP4sxygSzj5icg96rHN5guJpuNRilTS68FeGu9haBmhvsf+BwoXc04hKx5p0QDvaH3VCMFqfx6xhO+V1N8hJ5kwv/Y+zrxmI0OUD1/BV841krVUJZZ/E/XnleVZT2VNWes/GcjS6hbXM5R2hXFwOMMp7z5+qmLFHm6uY/Z6TIwUrNo9GcNthtyvjN5M5phqOjZtJmGFSdYII5fdr1s+sxefZ6Tl8XZE5UATKwY9MRXIdU6E6+hVL4T5HpYyRwQNozk8hp8AMfGbKlUmH4KJDT6idmeqQFwwFNlycn1Va9NqMiuyFQGG3e1Zyk83RpCoXbcXxuBXfZsrd7L7Jgb7d3GXfeytzxHYVpVtY5lcRr1u8OI4WSBTFldPyO16/kVGdZIdpVPefGAyT6na0mZ9oKKmps30XxUHE/VyUcrMI0GcFDwNd3Hw8Luq/PhwdSZNJUIdiORz/FN4l5T+4Q8ywU7zjpjeHH+vSoQFvK9efx8A662jaJNqBpY4J4kpzXC7oORDrrEl6WLrduPj+WtYzgxW3JqhMy/KU7Ahg/CA/XKza3DlDUD4cxzhDooAVMm1rd2FmDI/Vbf03Xj2DGZN2teU+h5DrXCuZ2pmW7MbWkhcGCasWly9d11RcC6JeRL5sV2x0UKJq/RBOGC1zIb7IN1Kd+Qp0WGW+tzOOzytZxFC7x0yl1PraUHLmMpY/XIs3rlFKLF0vQy0fyeCUQqy6GsOvMkuedBaos2IUXuqgSb/vRA23zSDxyfvv+fFNHtN/uR7Rj59se2PaThgnU/HFGm/+rkEzLxFGHTzRsc1CgtcXQVGPMAqa3QGZm0KSL2bRbfyzrmELWry29XCmovFa+vLSGfD/VsaVhynZ+voo5Tei8UY+5bvXznWVbdWsnkBlCOuHSC6X2cr0LyVVu4cQWHR2oZdAQ8VkEMyggtfjQQGFqN90ByC1xqBrH2goZgetsLLJH3CLfDE5iHEbsGPmqoZAnUVnDV4h9uGHjJhUFUDZ09jHftbsgrra7ax6dsdg2eQeUPuz9EylZo5S4IDQxNYoUsD+9D/OX2Yc6kQ6b850SF8Z6gfgUMvrmrnY+xLvMOBpBWGh/4S+v1f0I642MGnkbtReRtj3121FpwWjSo7+lkKHAi6V8U030RAEHwUsh0DsCqJV4pqjlZqTZ5DyNdEnhQjd6kLB080y/FOjraPxDKUmXCaQfxtEXVcUGW+s8sMBx33aTTSNA97dQuYRHlxsDtAkhx6zjKcJ+/SkHcksumXLd8th7CBtJnqwgRKs4iTwSht57LOfnwxOwUYnPGsWEaGLjLPRcbOJwzq/tQRZx617iMcteJOjYYLsY7zGRp5/0dAP5VIdqmEZ2tGE9rcQwjMTIZ/dLidGk93+GxMmwAb135C95YPhft5dmq6ucooULJc9W81L7dZgEnpdQykENQitzM51ZfenqBpNwaaims3p0zkA0/yDqGxVzAxryUt2tanCod+yLaZ9wmf5irPfQrUpUdwma8gajQtGmYCFJ9GozdWz/wGK6UFkc2J+pVdpeZM8pDM0Dk3G1OUNHHv0gwBWMxgU+eDRDUJohNU16UDT6wp0r4obHADKtpj+RLlwS/kwzCwyeO+4JXKCxmJxkb5OfN3ZnXl570mTSk3nR3f3GbTrETmIxKdr5n5tclgB+nGlqgP59QrT3M5exTPtxlp5yN89UirALyfDmZGAt8euMvTHT1ACNjRDNlhnlAFmjfebXxFpg8k3DP/AbTKbpGHKPO3v+9c/1/OtOcgRYXLJ7Pb/kj/Q4x91DHZoNNBiUK5RKhUy0fogy0zWiKLlmWu9tgEh2a9Py7a5mrXU+VTBYat6qFcbm95ydCYajMeESDQdnzu4R1kEAkerp0073hHBxO08/rRIJpTUipf5g/WHhUn9Qryz6f2/+LX/L/4f8BS9qqdvsj0alAAAAAElFTkSuQmCC">                    我的
+			</li>
+		</ul>
+	</div>
+	<!---->
+	<!---->
+</div>
+	<div class="toast-wrapper" style="display: none;">
+		<div class="toast"></div>
+	</div>
+	<div class="toast3-wrapper" style="display: none;">
+
+	</div>
+	<div class="toast-wrapper2" style="display: none;">
+		<div class="toast2" style="height: 200px;">
+			<p class="toast-title"></p>
+			<p class="toast-message"></p>
+			<div class="btn-wrapper">
+				<!----><button type="button" class="btn"></button></div>
+		</div>
+	</div>
+<script>
+	$(function () {
+		$(".activity-button").on("click",function () {
+			window.location.href = ctx + '/merchant/register?inviteNum=${inviteNum}';
+		})
+		$(".bottom").on("click",function () {
+			window.location.href = ctx + '/activity/one/detail?token=${token}&t=${t}';
+		})
+	})
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/jsp/activity/act-one-poster.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/activity/act-one-poster.jsp
new file mode 100644
index 0000000..b586cfd
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/activity/act-one-poster.jsp
@@ -0,0 +1,142 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<!DOCTYPE html>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html lang="en">
+<head>
+	<meta charset="UTF-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1">
+	<meta http-equiv="pragma" content="no-cache">
+	<meta http-equiv="Cache-Control" content="no-cache, must-revalidate">
+	<meta http-equiv="expires" content="0">
+	<c:set var="ctx" value="${pageContext.request.contextPath}"  scope="request"/>
+	<c:set var="resourcePath" value="${ctx}/resources"  scope="request"/>
+	<script type="text/javascript">
+		var ctx = "${ctx}"; //上下文路径
+		var resourcePath = "${resourcePath}";
+		document.writeln('<script type="text/javascript" src="'+resourcePath+'/js/global.js?d=' + new Date().getTime() + '" ><\/script>');
+	</script>
+<%--	<script src="http://res.wx.qq.com/open/js/jweixin-1.6.0.js"></script>--%>
+    <title>海报</title>
+	<style>
+		#Rootloading {
+			display: inline-block;
+			width: 12.8%;
+			max-width: 80px;
+			position: absolute;
+			left: 50%;
+			top: 50%;
+			transform: translate(-50%, -50%);
+		}
+	</style>
+	<link href="${resourcePath}/css/act-common.css" rel="stylesheet">
+	<style id="__WXWORK_INNER_SCROLLBAR_CSS">
+		::-webkit-scrollbar {
+			width: 12px !important;
+			height: 12px !important;
+		}
+
+		::-webkit-scrollbar-track:vertical {}
+
+		::-webkit-scrollbar-thumb:vertical {
+			background-color: rgba(136, 141, 152, 0.5) !important;
+			border-radius: 10px !important;
+			background-clip: content-box !important;
+			border: 2px solid transparent !important;
+		}
+
+		::-webkit-scrollbar-track:horizontal {}
+
+		::-webkit-scrollbar-thumb:horizontal {
+			background-color: rgba(136, 141, 152, 0.5) !important;
+			border-radius: 10px !important;
+			background-clip: content-box !important;
+			border: 2px solid transparent !important;
+		}
+
+		::-webkit-resizer {
+			display: none !important;
+		}
+		.activity-desc{
+			display: block;
+			width: 90% !important;
+			padding: 5%;
+			border-radius: 25px;
+		}
+		.save-btn{
+			width: 60%;
+			background-color: #FF381F;
+			color: #fff;
+			padding: 10px;
+			margin: 15px 20%;
+			border-radius: 20px;
+			box-shadow: 0px 0px 5px #9c9c9c;
+		}
+		.qr_code_image{
+			position: absolute;
+			width: 100%;
+			padding: 64.7% 37.5%;
+		}
+	</style>
+	<script src="${resourcePath}/js/qrcode/jquery.qrcode.min.js"></script>
+</head>
+<body style="height: auto;">
+<div id="app" class="">
+	<div id="registerActivityEntrance">
+		<div class="top">
+			<div class="qr_code_image" id="qrcode">
+			</div>
+			<img src="https://syb-resource.oss-cn-hangzhou.aliyuncs.com/images/poster.bg-2.png" id="qrCodePic" class="activity-desc">
+<%--			<button class="save-btn" onclick="savePic()">保存到相册</button>--%>
+		</div>
+
+	</div>
+	<!---->
+	<!---->
+</div>
+	<div class="toast-wrapper" style="display: none;">
+		<div class="toast"></div>
+	</div>
+	<div class="toast3-wrapper" style="display: none;">
+
+	</div>
+	<div class="toast-wrapper2" style="display: none;">
+		<div class="toast2" style="height: 200px;">
+			<p class="toast-title"></p>
+			<p class="toast-message"></p>
+			<div class="btn-wrapper">
+				<!----><button type="button" class="btn"></button></div>
+		</div>
+	</div>
+	<script>
+		$('#qrcode').qrcode({
+			render: "canvas",//设置渲染方式(有两种方式 table和canvas，默认是canvas）
+			text: '${url}',
+			width: 97, //二维码宽
+			height: 97, //二维码长
+			background: "#ffffff",//背景颜色
+			foreground: "#000000", //前景颜色
+			correctLevel :0,//纠错等级
+		});
+	</script>
+<%--<script>--%>
+<%--	function savePic(){--%>
+<%--		var picurl= $("#qrCodePic").attr("src");--%>
+<%--		//alert(picurl);--%>
+<%--		savePicture(picurl);--%>
+<%--	}--%>
+<%--	var triggerEvent = "touchstart";--%>
+<%--	function savePicture(Url){--%>
+<%--		var blob=new Blob([''], {type:'application/octet-stream'});--%>
+<%--		var url = URL.createObjectURL(blob);--%>
+<%--		var a = document.createElement('a');--%>
+<%--		a.href = Url;--%>
+<%--		a.download = Url.replace(/(.*\/)*([^.]+.*)/ig,"$2").split("?")[0];--%>
+<%--		var e = document.createEvent('MouseEvents');--%>
+<%--		e.initMouseEvent('click', true, false, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null);--%>
+<%--		a.dispatchEvent(e);--%>
+<%--		URL.revokeObjectURL(url);--%>
+<%--	}--%>
+<%--</script>--%>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/jsp/activity/act-one-thrift.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/activity/act-one-thrift.jsp
new file mode 100644
index 0000000..e6ef4f4
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/activity/act-one-thrift.jsp
@@ -0,0 +1,286 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<!DOCTYPE html>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html lang="en">
+<head>
+	<meta charset="UTF-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1">
+	<meta http-equiv="pragma" content="no-cache">
+	<meta http-equiv="Cache-Control" content="no-cache, must-revalidate">
+	<meta http-equiv="expires" content="0">
+	<c:set var="ctx" value="${pageContext.request.contextPath}"  scope="request"/>
+	<c:set var="resourcePath" value="${ctx}/resources"  scope="request"/>
+	<script type="text/javascript">
+		var ctx = "${ctx}"; //上下文路径
+		var resourcePath = "${resourcePath}";
+		document.writeln('<script type="text/javascript" src="'+resourcePath+'/js/global.js?d=' + new Date().getTime() + '" ><\/script>');
+	</script>
+    <title>邀请</title>
+	<style>
+		#Rootloading {
+			display: inline-block;
+			width: 12.8%;
+			max-width: 80px;
+			position: absolute;
+			left: 50%;
+			top: 50%;
+			transform: translate(-50%, -50%);
+		}
+	</style>
+	<link rel="stylesheet" href="https://unpkg.com/mescroll.js@1.4.1/mescroll.min.css">
+	<link href="${resourcePath}/css/act-common.css" rel="stylesheet">
+	<style id="__WXWORK_INNER_SCROLLBAR_CSS">
+		::-webkit-scrollbar {
+			width: 12px !important;
+			height: 12px !important;
+		}
+
+		::-webkit-scrollbar-track:vertical {}
+
+		::-webkit-scrollbar-thumb:vertical {
+			background-color: rgba(136, 141, 152, 0.5) !important;
+			border-radius: 10px !important;
+			background-clip: content-box !important;
+			border: 2px solid transparent !important;
+		}
+
+		::-webkit-scrollbar-track:horizontal {}
+
+		::-webkit-scrollbar-thumb:horizontal {
+			background-color: rgba(136, 141, 152, 0.5) !important;
+			border-radius: 10px !important;
+			background-clip: content-box !important;
+			border: 2px solid transparent !important;
+		}
+
+		::-webkit-resizer {
+			display: none !important;
+		}
+	</style>
+	<link rel="stylesheet" href="${resourcePath}/css/mobileSelect.css">
+	<script src="https://unpkg.com/mescroll.js@1.4.1/mescroll.min.js" charset="utf-8"></script>
+	<%--<script type="text/javascript" src="${resourcePath}/js/auto-size.js"></script>--%>
+	<script type="text/javascript" src="${resourcePath}/js/mobileSelect.js"></script>
+</head>
+<body style="height: auto;">
+<div id="app" class="">
+	<div id="adminRewards">
+		<div class="header">
+			<div class="accumulate-container">
+				<div class="desc">
+					今日交易流水
+					<div class="prompt-container"><i class="icon-question"></i>
+						<div class="prompt">商户今日交易流水</div>
+					</div>
+				</div>
+				<div class="data">
+					<div class="val">${map.dateAmt}</div>
+					<div class="unit">元</div>
+				</div>
+			</div>
+			<div class="accumulate-container">
+				<div class="desc">
+					今日省钱金额
+					<div class="prompt-container"><i class="icon-question"></i>
+						<div class="prompt">当前商户费率对比固定0.38%费率节省金额</div>
+					</div>
+				</div>
+				<div class="data">
+					<div class="val">${result.saveDateAmt}</div>
+					<div class="unit">元</div>
+				</div>
+			</div>
+			<div class="accumulate-container">
+				<div class="desc">
+					累计交易流水
+					<div class="prompt-container"><i class="icon-question"></i>
+						<div class="prompt">商户总交易流水</div>
+					</div>
+				</div>
+				<div class="data">
+					<div class="val">${map.tradeAmtCount}</div>
+					<div class="unit">元</div>
+				</div>
+			</div>
+			<div class="accumulate-container">
+				<div class="desc">
+					累计省钱金额
+					<div class="prompt-container"><i class="icon-question"></i>
+						<div class="prompt">当前商户费率对比固定0.38%费率总节省金额</div>
+					</div>
+				</div>
+				<div class="data">
+					<div class="val">${result.saveAmtCount}</div>
+					<div class="unit">元</div>
+				</div>
+			</div>
+		</div>
+		<div class="main">
+			<div class="table-title">交易明细</div>
+			<table class="table-header">
+				<thead>
+				<tr>
+					<th>交易金额</th>
+					<th>省钱金额</th>
+					<th>交易时间</th>
+				</tr>
+				</thead>
+			</table>
+			<div class="table-body" id="mescroll">
+				<table id="order-table" class="table-body">
+
+				</table>
+			</div>
+		</div>
+		<div class="btn-invite"></div>
+		<div class="wx-prompt-dialog" style="display: none;">
+			<div>点击右上角，分享给好友</div>
+		</div>
+	</div>
+	<div class="footer" style="display: none;">
+		<ul>
+			<li class=""><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAG0AAABtCAMAAACcJh9kAAACQ1BMVEUAAAAAAAD///8AAAAAAH8Af39/f38AAFUAVVVVVVUAAEAAQEBAQEAzMzMzM2YqKioqKlUkJCQkJEkgIEAgQEBAQEAcHDkcOTk5OTkaGjMaGk0zMzMzM00XFy4XF0YXLi4XLkYuLkYVKkAqKkAUJzsnJzsSJDckJDciIjMiIkQiM0QgIDAgIEAgMEAeHjweLTwcHDkcKzkbKDYaJjMmJjMmJkAYJDEYJD0kJD0XIy4XIzoXLjojIzojLjoWITchITchLDcgIDUgIEAfHzMfKTMfKT0dJzscJjkbJDcaIzUaIz4jIzUZIjMZKjsiIjMiIjsZIToZKTohITohKToYIDggKDgfJzYeJTQeJTwdJDMdJDocIzIcIzkcIjcbIjYbIjwaITQhITQhITshJzsaIDMaJjMaJjkgJjkZHzgfHzgfJTgYJDceJDceJDUeJDsdIzQdIzocIjMcIjkcKDMcITcbITYbJjYhITYbIDUbIDoaHzQaJDkfHzkfJDkZJDMZJDgfJDgZIzceIzcZIjYdIjYdIjUdIjocITQcITkcIDgcJTgbIDcbJDcbHzYbJDYbJDoaIzUaIzkaIzQaIzgeIzQeIzgZIjMZIjceIjcZITYdITYdJjYZITUdITUcIDUcIDkcJDUcIDQcIDgcJDQcJDgbHzcbIzcbIzYfIzYbIjUaIjQaIjgaITQaITceITcZITcdITcdJDcZIDYdIDYdJDYZIDUcIDUcIzUcHzQcIzQcIzgcIjQcIjcbIjMbIjYbIjYaITVrmw0DAAAAwXRSTlMAAQECAgICAwMDBAQEBQUGBgcHCAgICQkJCgoKCgsLCwsLDAwNDQ4ODw8PEBAQERESEhMUFBQVFRUWFhYWFhcXFxgYGRkZGhscHR0dHh4eHh8fHx8gICEiIiMjJCQlJiYnJycnKCgoKCkpKSoqKyssLC0tLS4vLy8wMDExMTEyMjIzMzQ0NTU2Njc3ODg5OTk6Ojs7Ozs8PDw9PT0+Pj8/P0BAQEBBQUJCQ0RERUVFRkZGR0dHSEhISUlJSkpLS0xNx8p4qQAAB+xJREFUaN7tWv9fE2Uc5xhxkpuzDQ+nlSWeR1LTsQyilZpyI7AgKpjrRqSVhSNwbYSVbemswLmKtRpLSM1u7YK2NgXG1t3+tO6ZJruPwL4w/KHXPj/tdV/2fp7P5/28P+/neV1FRTkkgeE4jj0oMJlyb+NepeyBYOGksf+s42y/kcQ3Hmwz2edNCmkh6e0jN290xaoNtusLQjqdFhau2wzVG1q9KoK2s3z6TvCsnSaqNpAexMuXo+nliF5+mdgwsuA7GH+cz0Lj435mxwZxRaV754clIZ0dwtIP7+hUG7KimwajUqwMXnSwaQNWeq3xyzCfvj/48JfG2lLzg+q5yKVXDu5iD1VSrmyqNQf49GrBB8y1m0qoH7pPgvPCqmjCfPATXal0RaY6PBRKpteKZGjosKok2cRUencCTCaZTIKpJtx6VSmouedN7xxYZX8OWYb+BNfmvG/uWTeWouHt8ZT0fxPBET2lHwkmpHip8bcbFOsDq37GysIasZadsgrZTgsLa8lan6leT8lqjKMhULPZiQ5SFA8MJzsmZkHtQqPGmqKLhz9JO8NQOZyvqu90mSr1q06oLmEn/WSRKo2pu25CMs6ea6m890Bly7lZSM2bXeqiZqegTvsBEQTfwIFsxVcdGPCBJxL+01QRXFG3nJyW5kmIT1qeRnmSa6gGSiNHuX7aMhmX4vHTJ1vUBafRMAqlKvHjMSJzj+yw2qwdZOY3cezHBBSyUUNhycTqu92QH3OjbYQ4s6onTOen2BA7dd70hEgXnGgbnYNccXfX54+H4Q29VyLSf1icGT28RSS+QmvyxzNX4n6TViFe2XJ4dGZR+nDkSm9D3i22Sn3mN6i7N6zbEfFxaiR6z3NFRyhUxqrt1hvw8d/OqPN0Y0qDYwbUIuYxPYXWrYZ2sstp41knrUEa8JTJEwM1nnEYlPksaeKoPQLIyF3qqReXWc3u405JmxPmncd314gLr77nEgeoGbEfJXIvdOLod0uAY7yjFVWh8lEmAHkqBJhHK1GlWx08uLf03VEiV+fUMt9HgLZf+6BZ1AesxmANxu/ro/Gg1SDmGFM3f3AN9IrI94x2rQ6LKbUDPjD4xcAgEocqosUWWtFzhWwtyJ8rqMHAIpieb0CrXJ2a1S3nwwJk/ut16AVV22RkZWciRCbbkJxhda/DlSCEz7dUr0r8LlcY9Kywy7j7oYqKh0nzRGw108XHJszkwxUVD+02uoAkJMOurpWXAk62j0fhw2M0Ir5Sy/j5NUwQ72e0SrQU6DE43Oh4+0q7StnjzB9A8tO/f6jNPNlsi/Brei4+YmvOjFj74e8gmYk/mMfv44qqyRpICVLie5hGkR/Yrlc+Y0FfuRW5Ba6wn72yS8yCopHxSJeCkApYm6QbE5n6pSHAD37O95Yo85iMfM0TgQm+5LwEUxbxvEbKRDzyLR9QaSE89JI6e3pb2y/CLMbdz6IuvKnu/WvQO4bO7d+5/1wIesxr79dtQh3/WXccZvNi+9blmTWavuGgoRk5gs4oHmkdDgLNTPhPHVTKlAdP+eGN4HDrI+h848gItE7cN6bGu7OrIZkAuLsQtOnE3oyrj5y9xUOFMO9D1qRynxmqDn/r7BG1SCu5zhZcACMJMGRNBm3buwGgccKkeRu6p+n0gM2GwF+g73ku+gJ8b97TqUHj32aehO8F3t2WYeOLXpBnzt1NIRXWMV7AjxRra7u3r5cRbTY2BbjiZXRIpaluN6hN3PMiYiZlkV7nua9o0cZgW/ednoLV/tWuzTZUCq39V8iuqdP7topDVdNfcdIacAyFlu5YTLqWBvWbxcflhq/hNipx1VwvMQAYXm++moCbq68NYsmxzfpB6ZqMjSEBaP08Gy3hO9mkRD21y/VXCpqbNygoQjj1BrRLqb9cXaiPKptO+rJHEvu8VXxBb18uDn/bx2zH0WFWxxWg5/yss33L/e0D29LunAWytnilAx2B4dsZ3+3lWxG7HrnDPi5LEGhEAkz7Xhja5NBHesVKvQpT6D8KQcMcfk+LIRrRWTLE9SEHqtRP3E0lf8ORObiqOzR8Fbyf8vYfWM3VKA/0e1Pg+avDh+oyx2KOG3dnF5vQZ/5AZfHGkoKQil8fMSD21ra5AHv56C+9u1Zvwtiu3l+iIJucq60WrSLDyPV4ShCSMa/ljjRjtfTYzN8L7BedJCKT3OSZB6/Oul+oW8thyOpecIO9HD/vMckRtcnOL9iFv2fG6Nr/hks8d7zvRI9Bgxinob+NwF2S7ViOc12Z8pgN7r4i3yKzWYFrDD0n+o4/t6L/wprd0JNPf6zLvcGt1n08Df25uzmXO5d33wZpvNz7mDwP1yt/rPcySObt7hwvYjsGgE2+0L0nv/0Dtqf7AjDMAzuwHO51WKLcnOtg/sePqoMuTtIVhrU5yt1kl1iCUzpF/gdKMoXulMRA2JsKQEv81L9fXtAuU76//6dEkWjhIUWhJ2UyxVC4SLRpS+HHcjLLdJFogROFH31gJwJltDJaGa2MVkYro5XRymhltDJaGa2kaKyj9flCo9XBFokm/LM4X2gs/iMUibbuKKM9MDSdrYRoNt3aaBh1poRoZygsx6crDC+UCEvgmVwfuFQb4elY0ZG4acx5PrbXwpYIjbXszeNjGcs4t7TebApL3Lgln09pMLLz0/Gfp9YXP49/2knmpekyhZrQrDcIteLBfBhbjv9d/AvRMI1q3LveBgAAAABJRU5ErkJggg==">                    首页
+			</li>
+			<li class=""><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAG0AAABtCAMAAACcJh9kAAABzlBMVEUAAAAAAAD///8AAAAAAH9/f38AAFUAVVVVVVUAAEAAQEBAQEAzMzMqKioqKlUkJCQkJEkgIEAcHDkcOTkaGjMaMzMXFy4XLi4XLkYuLkYVKioVKkAqKkAnJzsSJDckJDciIjMgIDAgIEAgMEAeHjweLTwcHDkcKzkbKDYbKEMoKDYaJjMaJkAmJkAkJD0XIy4XIzojIzohITcgIDUfHzMfHz0fKTMfKT0dHTsdJzscJjkbJDckJDcaIzUZIjMZKTohIToYIDgYKDggIDgXHzYfHzYfJzYeJTQeJTwdJDMdJDocIzkcIjcbIjYaITQaJzshITsaIDMaJjkgIDMgIDkgJjkZJTgYJDcYJDUeJDUeJDsdIzQdIzocIjMcIjkcITcbITYbJjwbJTUgIDUaHzQZHzMZJDMZJDgfJDgeIzcZIjYdIjYdIjUdIjocITQcITkcIDgbJDcgJDcbJDYaIzUaIzQaIzgeIzQeIjcZITYdITYdITUcIDUcJDUcJDkcIDQcJDQcJDgbHzcbIzcbIzYbIjUbIjkaIjQaITQaITceITcZITcdITcdJDcZIDYdIDYcIDUcIzUcHzQcIzQcIzgcIjQcIjcbIjYbIjYaITWSlqNxAAAAmnRSTlMAAQECAgIDAwMEBAQFBgYHBwgJCQoKCwsLCwwMDA0ODg8QEBARERISExMTFBQUFRYWFhcYGRkZGRoaGxwcHR4fHyAgICEhISIiIyMkJSYnJycoKCgoKCkqKysrLCwtLS4vLzAwMTIyMjIzNDQ1NTY2Nzg4OTo7Ozs8PT0+Pz8/QEBAQUFCQ0NERUVFRkZGR0dISElJSUpKS0xNE5pYcQAAA05JREFUaN7t2vtX0mAYB/DNKSlscUmxIAOtxKKboRWQihfyNk27WCTJMiuNNAq0XJQakOYlUZS9/Lf9kjI9gHvfOeyH9/sjZ+/5nI0dnsPzPASBg4NzYiEpFVooEh4r01ls11Biq2EoSIu2tAyMcuMo4Xys06yGwSgr+0PIoCY912WCeJpUDRtPAWQNJBc6jdK1ivsfM7ICJh3SNSaQkKnFhqRr2ukdeVpma0y6pguDImr6iEwsszxSRA2EWoun7SYGahE1AB0hMWUrQdRiX+ASnva31dIEmgY4L1w8ritVUL/JYk1wKF3asKasRtFnrZdRUmcuWM1zaSqDvYV95EPJCOtprFZDaQb3px2AmjTfboLRDO7ZNTnVfN5rJKVrjZzMIhRsVknXBpZkanE/I13zb8qtr0GtdG1CbjUHYZ107Y3cap6J6LF2strKN6lJHIMWGpSaKSBf69VIjUuQr3VJLl0OrGENa1jDGtawhjWsYQ1rOUdBd8WaTmGt3J3VhJDSmrYjq21OaRXWqnqz/6hWXzMKa5eeZbX4qNJa07usFn1MHz3rADsytD4+q0W6Nfm+3eDW/izt1y1UjWIC66I+1518fS7GH9+7aP1zParG2MKiQ88v5OuIqpqDexfxXiOqZg3Es32nVA+dr2NIGr3zSZDJACHms9CImr41lto/klp0FbjU1M6nARA2Rmz/PoDWyNvj4hbLW3uBa9XVjR6WfeC0MIgaXccti44stlUf8UaZzfry/WcNqWntT36KTiRnLsJMdiA10v5SEDc0o4NQA3AorcLa8T4uxkCggVJEIzUGa9Ng5M/B4Z/nNKmIVmZx+5fSB9vCy1w95LBFrAXzTN66+x++ePVh9vAawGrwuk6GlsgzVeS/xzfSh7vdYDfk0ZAytAIjlBwT25V2HfTCCWqnN833W0qJ4mhg++vTcxqiSNp2tO0Mwt4O2qwjMekyn0IZN45twVLCWjTgLEe5M4IYisHe3O+gy6xCHKU6JqG0VHSi50YlKkYYOxeS0jxheyXGzwzf1JcQyCFNXXNpSS/9Js95r1bSKpKQEbXZyfoKb3hxAd8w2+e512CG3h/LVc1rCm+vNdSdN9BlxzV0P3Izr5QiSQIHB+c/y1/rtIcDpwBpdwAAAABJRU5ErkJggg==">                    账单
+			</li>
+			<li class=""><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAG0AAABtCAMAAACcJh9kAAACW1BMVEUAAAAAAAD///8AAAAAAH9/f38AAFUAVVVVVVUAAEAAQEBAQEAAMzMzMzMqKioqKlUqVVUkJCQkJEkgIEAcHDkcHFUcOTk5OTkaGjMaMzMzMzMzM00XFy4XLi4XLkYuLkYVKioVKkAqKkAUJzsnJzsnJ04kJDciIjMiIkQiMzMiM0QgIDAgIEAeHjweLTwcHDkcKzkrKzkbKDYoKEMaJjMaJkAmJjMYJDEYJD0kJDEkJD0jIy4jIzoWITchITchLDcVIDUgIDUgKjUfHzMfHz0fKTMfKT0dJzEdJzscJjkmJjkbJDckJDcaIzUaIz4jIzUjIz4ZIjMiIjsiKjsZITohITohKToYIDggIDggKDgXHzYfHzYfJzYfJz4eJTQeJTwdJDMdJDocIzkcIjciIjcbIjYbKDYiKDwaITQaJzQhITQhJzsaIDMgIDkgJjMgJjkZJTgfHzgfJTgeJDceJDUdIzQdIzocIjMcIjkcKDkcITIcITccJzcbITYbJjYbIDUbIDobJTUgJToaHzQaJDQZJDMZJDgfJDgZIzIZIzceIzcZIjYdIjYdIjsdIjUcITQcIDMcIDgcJTMcJTgbIDcbJDcgJDcbHzYbJDYaIzUaIzkfIzUaIzQeIzQeIzgZIjMZIjceIjcZITYdITYdITUcIDUcJDUcIDQcJDQcJDgbHzcbIzMbIzcbIzYbIjUbIjkaIjQaIjgeIjQeJTQaITQaITceITcZITMZITcdITcZIDYdIDYdJDYZIDUcIDUcIzUcIzkcHzQcIzQcIjQcIjcbIjMbIjYbIjYaITWRLhvGAAAAyXRSTlMAAQECAgIDAwMEBAQFBQYGBgcHCAkJCQkKCgoKCwsLCwwMDA0NDQ4PDw8PEBARERISEhMTFBQUFRUVFRYWFxcXGBgYGRkZGRoaGxscHB0dHR0eHh4fHx8gICAhISEhIiIjIyQlJSYmJicnJycoKCgoKSkpKissLC0tLS4uLi8vMDAwMDExMjIyMzMzNDQ0NTY3Nzc3ODg4OTk6Ojo7Ozs8PDw9PT4/P0BAQEFBQUJDQ0RERERFRUVGRkZHR0dISEhISUlKSktLTE23sPFYAAAIsklEQVRo3u1a/19aVR/3CPKQPGDcSwtd24oR7KlctGYj88sz1xBza7a0dBkl5mI9rS+ijraGrdLmfQgzJaGWmZquBkSFi8GUBLqXPysmr+2cg1flctjr9byeV58f5dzzPp+v5/35HEtK/pcFVOzRG2rq/11fY9DvqQB3E0kiV2lqO04POMf+O+YcON1Rq1HJJXcLUbavbcizGAwtR6Ir0chyKLjoGWrbJ7sbUCKFod0x4U9waShcwj/haDcoRMUGk6ifGVxk0xuFXRx8Ri0pMlp131w4meaTZHiur7qo4UHV2efY9GbCztnrqOIFi7yWCaW3khBTKy8WWGkLE2a3RGPDTEtpkTR7whni0lsLF3I+URTtgH7An95e/AP6YrhuV3cgmQdaMtC9qwiqmV24z7iY/3vftO97fww3L+syEysHZIMRrHwkw984Xms71vaa45twEvslMigjhaObPKhqyWvnWx/XqmmaVmsfbz1/DbUx62mkCNF05wLIhhHfmVrlbQWAsvaML4IGyjkdoSEP+ZHjc95X78V+vvdVL2LMpP8QmSmVL6zC7dbmX1GLsZ/F6lfm1+BhVl9QEqHp34Ze4wJv6TcueCsAj8O+rSdCOzIG90p5tBtvFonWk4LnGTtChNblg2g/vMtT6AH17g8QzddFhNb3I0RzNZfzrChvdkG0H/uI0Pp/hiE3qONjBCLdIFzycz8R2tBNuJWN5otvQNvgkptDRGgXYQikrbyFCciscEnqIhHaJ0jyvl7Gu6TsdST9Pymabn283ANQfUXTzRGHWw1oeaNEOwCXxB1EaPZluNWlGj7aKKm5BJcs24nQrAvQcVd6+JiHvOcKdNuClQjt+AREC4/sEm9YIN41EoZoE8eJ0OqcSFAu8NyWVOMCEpLOOiK0B63IzR11P3sPHpbgnmfdUeT2tj5IhFZuRngrt+o4qETjUqQ86EDuPzZsLie7vA94US7wC3NAgfyoOMD8gvII7wFSNmlB/JJOBcethtvtocxgHQ8i2Z9esJAySvk+JoGxydn+J7OxQj3ZP4sxygSzj5icg96rHN5guJpuNRilTS68FeGu9haBmhvsf+BwoXc04hKx5p0QDvaH3VCMFqfx6xhO+V1N8hJ5kwv/Y+zrxmI0OUD1/BV841krVUJZZ/E/XnleVZT2VNWes/GcjS6hbXM5R2hXFwOMMp7z5+qmLFHm6uY/Z6TIwUrNo9GcNthtyvjN5M5phqOjZtJmGFSdYII5fdr1s+sxefZ6Tl8XZE5UATKwY9MRXIdU6E6+hVL4T5HpYyRwQNozk8hp8AMfGbKlUmH4KJDT6idmeqQFwwFNlycn1Va9NqMiuyFQGG3e1Zyk83RpCoXbcXxuBXfZsrd7L7Jgb7d3GXfeytzxHYVpVtY5lcRr1u8OI4WSBTFldPyO16/kVGdZIdpVPefGAyT6na0mZ9oKKmps30XxUHE/VyUcrMI0GcFDwNd3Hw8Luq/PhwdSZNJUIdiORz/FN4l5T+4Q8ywU7zjpjeHH+vSoQFvK9efx8A662jaJNqBpY4J4kpzXC7oORDrrEl6WLrduPj+WtYzgxW3JqhMy/KU7Ahg/CA/XKza3DlDUD4cxzhDooAVMm1rd2FmDI/Vbf03Xj2DGZN2teU+h5DrXCuZ2pmW7MbWkhcGCasWly9d11RcC6JeRL5sV2x0UKJq/RBOGC1zIb7IN1Kd+Qp0WGW+tzOOzytZxFC7x0yl1PraUHLmMpY/XIs3rlFKLF0vQy0fyeCUQqy6GsOvMkuedBaos2IUXuqgSb/vRA23zSDxyfvv+fFNHtN/uR7Rj59se2PaThgnU/HFGm/+rkEzLxFGHTzRsc1CgtcXQVGPMAqa3QGZm0KSL2bRbfyzrmELWry29XCmovFa+vLSGfD/VsaVhynZ+voo5Tei8UY+5bvXznWVbdWsnkBlCOuHSC6X2cr0LyVVu4cQWHR2oZdAQ8VkEMyggtfjQQGFqN90ByC1xqBrH2goZgetsLLJH3CLfDE5iHEbsGPmqoZAnUVnDV4h9uGHjJhUFUDZ09jHftbsgrra7ax6dsdg2eQeUPuz9EylZo5S4IDQxNYoUsD+9D/OX2Yc6kQ6b850SF8Z6gfgUMvrmrnY+xLvMOBpBWGh/4S+v1f0I642MGnkbtReRtj3121FpwWjSo7+lkKHAi6V8U030RAEHwUsh0DsCqJV4pqjlZqTZ5DyNdEnhQjd6kLB080y/FOjraPxDKUmXCaQfxtEXVcUGW+s8sMBx33aTTSNA97dQuYRHlxsDtAkhx6zjKcJ+/SkHcksumXLd8th7CBtJnqwgRKs4iTwSht57LOfnwxOwUYnPGsWEaGLjLPRcbOJwzq/tQRZx617iMcteJOjYYLsY7zGRp5/0dAP5VIdqmEZ2tGE9rcQwjMTIZ/dLidGk93+GxMmwAb135C95YPhft5dmq6ucooULJc9W81L7dZgEnpdQykENQitzM51ZfenqBpNwaaims3p0zkA0/yDqGxVzAxryUt2tanCod+yLaZ9wmf5irPfQrUpUdwma8gajQtGmYCFJ9GozdWz/wGK6UFkc2J+pVdpeZM8pDM0Dk3G1OUNHHv0gwBWMxgU+eDRDUJohNU16UDT6wp0r4obHADKtpj+RLlwS/kwzCwyeO+4JXKCxmJxkb5OfN3ZnXl570mTSk3nR3f3GbTrETmIxKdr5n5tclgB+nGlqgP59QrT3M5exTPtxlp5yN89UirALyfDmZGAt8euMvTHT1ACNjRDNlhnlAFmjfebXxFpg8k3DP/AbTKbpGHKPO3v+9c/1/OtOcgRYXLJ7Pb/kj/Q4x91DHZoNNBiUK5RKhUy0fogy0zWiKLlmWu9tgEh2a9Py7a5mrXU+VTBYat6qFcbm95ydCYajMeESDQdnzu4R1kEAkerp0073hHBxO08/rRIJpTUipf5g/WHhUn9Qryz6f2/+LX/L/4f8BS9qqdvsj0alAAAAAElFTkSuQmCC">                    我的
+			</li>
+		</ul>
+	</div>
+	<!---->
+	<!---->
+</div>
+<div class="toast-wrapper" style="display: none;">
+	<div class="toast"></div>
+</div>
+<div class="toast3-wrapper" style="display: none;">
+
+</div>
+<div class="toast-wrapper2" style="display: none;">
+	<div class="toast2" style="height: 200px;">
+		<p class="toast-title"></p>
+		<p class="toast-message"></p>
+		<div class="btn-wrapper">
+			<!----><button type="button" class="btn"></button></div>
+	</div>
+</div>
+<script>
+	$(function () {
+		$(".prompt-container").on('click',function () {
+			var dom = $(this).find("div.prompt");
+			if(dom.attr("data-index") == undefined || dom.attr("data-index") == 1){
+				dom.show();
+				dom.attr("data-index",0);
+			}else{
+				dom.hide();
+				dom.attr("data-index",1);
+			}
+		})
+	})
+</script>
+<script type="text/javascript" charset="utf-8">
+	$(function(){
+		//创建MeScroll对象
+		var mescroll = new MeScroll("mescroll", {
+			down: {
+				auto: true, //是否在初始化完毕之后自动执行下拉回调callback; 默认true
+				callback: downCallback, //下拉刷新的回调
+			},
+			up: {
+				auto: false, //是否在初始化时以上拉加载的方式自动加载第一页数据; 默认false
+				callback: upCallback, //上拉回调,此处可简写; 相当于 callback: function (page) { upCallback(page); }
+				htmlNodata: "没有更多了",
+			}
+		});
+		/*下拉刷新的回调 */
+		function downCallback(){
+			//联网加载数据
+			var pageNum = 1;
+			getListDataFromNet(pageNum, 10, function(data,type){
+				//联网成功的回调,隐藏下拉刷新的状态
+				mescroll.endSuccess();
+				//设置列表数据
+				setListData(data, false,pageNum);
+			}, function(){
+				//联网失败的回调,隐藏下拉刷新的状态
+				mescroll.endErr();
+			});
+		}
+		var page = {num:1, size:10};
+		function upCallback(page){
+			//联网加载数据
+			page.num = 2;
+			getListDataFromNet(page.num, page.size, function(data,type){
+				//联网成功的回调,隐藏下拉刷新和上拉加载的状态;
+				mescroll.endSuccess(data.length);//传参:数据的总数; mescroll会自动判断列表如果无任何数据,则提示空;列表无下一页数据,则提示无更多数据;
+				//设置列表数据
+				setListData(data, true,type,page.num);
+			}, function(){
+				//联网失败的回调,隐藏下拉刷新和上拉加载的状态;
+				mescroll.endErr();
+			});
+		}
+
+		/*设置列表数据*/
+		function setListData(data, isAppend,pageNum) {
+			var dom = $("#order-table");
+			var str = "";
+			if(data.length > 0){
+				for (var i = 0; i <data.length; i++) {
+					var newObj=data[i];
+					str += "<tr>";
+					str += "<td>"+newObj.consumeFee.toFixed(2)+"</td>";
+					str += "<td>"+newObj.saveAmt.toFixed(2)+"</td>";
+					str += "<td>"+newObj.transDt+"</td>";
+				}
+			}else{
+				if(pageNum < 2){
+					str += "<div class='no-data'>暂无数据</div>";
+					dom.append(str);
+				}
+			}
+			if(!isAppend){
+				dom.empty();
+			}
+			dom.append(str);
+		}
+
+		/*联网加载列表数据*/
+		var downIndex=0;
+		function getListDataFromNet(pageNum,pageSize,successCallback,errorCallback) {
+			//延时一秒,模拟联网
+			/*setTimeout(function () {
+
+			},1000)*/
+			try{
+				$.ajax({
+					url : ctx + '/activity/thrift/page',
+					dataType : 'json',
+					type : "post",
+					data : {
+						'token': '${token}',
+						't': '${t}',
+						'pageNum': pageNum,
+						'pageSize': pageSize,
+					},
+					success : function(res) {
+						if(res.code == 200){
+							var orderList = res.data.records;
+							successCallback&&successCallback(orderList);
+						}else {
+							errorCallback&&errorCallback();
+						}
+					},
+				})
+			}catch(e){
+				//联网失败的回调
+				errorCallback&&errorCallback();
+			}
+		}
+		//禁止PC浏览器拖拽图片,避免与下拉刷新冲突;如果仅在移动端使用,可删除此代码
+		document.ondragstart=function() {return false;}
+	});
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/jsp/activity/act-one.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/activity/act-one.jsp
new file mode 100644
index 0000000..847d9d2
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/activity/act-one.jsp
@@ -0,0 +1,188 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<!DOCTYPE html>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html lang="en">
+<head>
+	<meta charset="UTF-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1">
+	<meta http-equiv="pragma" content="no-cache">
+	<meta http-equiv="Cache-Control" content="no-cache, must-revalidate">
+	<meta http-equiv="expires" content="0">
+	<c:set var="ctx" value="${pageContext.request.contextPath}"  scope="request"/>
+	<c:set var="resourcePath" value="${ctx}/resources"  scope="request"/>
+	<script type="text/javascript">
+		var ctx = "${ctx}"; //上下文路径
+		var resourcePath = "${resourcePath}";
+		document.writeln('<script type="text/javascript" src="'+resourcePath+'/js/global.js?d=' + new Date().getTime() + '" ><\/script>');
+	</script>
+    <title>邀请好友嗨赚奖励金</title>
+	<%--<link rel="stylesheet" href="${resourcePath}/css/h5.css">
+	<link rel="stylesheet" href="${resourcePath}/css/h5-common.css">--%>
+	<style>
+		#Rootloading {
+			display: inline-block;
+			width: 12.8%;
+			max-width: 80px;
+			position: absolute;
+			left: 50%;
+			top: 50%;
+			transform: translate(-50%, -50%);
+		}
+	</style>
+	<link href="${resourcePath}/css/act-common.css" rel="stylesheet">
+	<style id="__WXWORK_INNER_SCROLLBAR_CSS">
+		::-webkit-scrollbar {
+			width: 12px !important;
+			height: 12px !important;
+		}
+
+		::-webkit-scrollbar-track:vertical {}
+
+		::-webkit-scrollbar-thumb:vertical {
+			background-color: rgba(136, 141, 152, 0.5) !important;
+			border-radius: 10px !important;
+			background-clip: content-box !important;
+			border: 2px solid transparent !important;
+		}
+
+		::-webkit-scrollbar-track:horizontal {}
+
+		::-webkit-scrollbar-thumb:horizontal {
+			background-color: rgba(136, 141, 152, 0.5) !important;
+			border-radius: 10px !important;
+			background-clip: content-box !important;
+			border: 2px solid transparent !important;
+		}
+
+		::-webkit-resizer {
+			display: none !important;
+		}
+		.loading{
+			background-color: #fff;
+			color: #000;
+			width: 5rem;
+			text-align: center;
+			padding: 0.5rem 0;
+			border-radius: 5px;
+			display: none;
+			z-index: 1000;
+			position: fixed;
+			margin: 0 auto;
+			left: 0;
+			right: 0;
+			top: 40%;
+		}
+	</style>
+</head>
+
+<body style="height: auto;">
+<div id="app" class="">
+	<div id="adminInvite">
+		<div class="header">
+			<div class="info"><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADgAAAA4CAYAAACohjseAAAAAXNSR0IArs4c6QAAAERlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAAOKADAAQAAAABAAAAOAAAAAANV2hTAAAHtUlEQVRoBd1bCWwUVRj+35RySCuHcpZCCcilEKVyBKmBCAQasJYQxIiKkpB4xIAQuTSIASQRFE1MUBJTREUDShERFGIMIsrRBcthuVsKAuWm3NB5fv/s7HZ2d2Z25+2W1v7Jv+/N//7/f++bd783KyjBJKVMgsue4CxwF5PTEaaajIDKTS5FWGTy7wh9QogKhDWLACoZnANeAb4IViW2ZR/sK7naUaIQDcDTwWfBiSb2yb4b3HWgyDQJPB58HFzVxHlwXtz0q56Q0TDwXvDdJs5zWJUhhHMBnnu3Udnkx2UQCQUKhyngfJvMqkvEZUlJCEg4ygAXVhcSl3y5TBnRQLpWtelgK5w0j+aomtLLkG8fzJ3FTvk7AgQ4bgJbwN2djL3I5aH9JLf9SfraH4jKTpHIGkAiO4fEgz1INIhrJtiNcvQDyCt25bEFCHAsXwXOsTPyIpP79pCe9xnJnTuI7tyJNG2bQVruaBLDnyJRp05kemyS1VDLBUgZru4EcC4UZ4Qre33Wf/2F9AXziK5fi2oq+mWRNv0dEim8olOieQA4M9wyAiBqj+ean8IVvT5zzVVMfoXoxo2YTcWgoaTNmE0oaMw2YYrZsF1nlWnWB4Dj1cICq0wlLisqSF/yiSdwnI/cuJ6kb7tKlgGbBSaGwDOFAIR0HLhbMFU1chADSuFOJWv5Y76SnWnEZR9ndRAECOQ8lM22JqrGpW8bka4rmfOLkeWXlWxNo9kmFuMxCBBPE8FpplJcgdy3V93+/DmikmJ1ez8GxmKQARCIee812ZTFFXD/k6dPxufj3+Nx2cN4sokp2AezIbwvXq+G/a1bRFdt59zY3V84H7uuvSZjYUxBgM/Z6ylIJfre7dsKhpUmMoZ5s1LbMTaWUzRUJU8NgxzVPCZIH1Ys3I/iIIkFgrxSHocHw3QwY+M+mAluFK+3gL3cVaA8ggZ80An0wXNng4+KEcbUkwH2V3RgayZatraVexI2akLUpKknEwflLAbY1SFRSSyeGELUsZOSrWGEBbc2ZiyJexPSqLoywM7qpYm0FHjzSe99SNRUbVAWI58mbfSzkY7VJJ0ZIB/KJpTE/c2IdweeSUsibfBQz2YuBukMUHl/4uKYtFHPoB95q0XxZC6JjgltUKlVBlC0a09J89FUYxx0xPPjSXvtDbd3ppJmAFQxjMlGdOpC2gvjo+t2eIC0cRNIJCnv6B3z4BqMe0Z19I4EkdbWLdlIE2ltbDe5EgsGXtvGQeVVDlBevxq1fAwknCTWsxWTXia5ZVN4kpdnA2CpFwsvuvLmDZIrv41usqeQ9A3rCEuroK7csJ7oWDHpK5ajFm0Oq4KarpFSbvT7wQpjuqtjkgeKSF/8sf80zUm1VWsS7TsQtW7j19DRHNEPebGtf/eNX7Z7F8ntW0n0fczJi5u8iAH+46bhJU2ePEFyl4/kH5tQqL+Ibt10NBdjX/KvWBqmROjItTgFPH4sKNe/yiOR2ZtEsucrwyK+UOkFTzhjUCN56qQBRm7+jeTeQuwFo/c56vEI1fnoUyNDyVury5eIzp4h4wXt+ZvkGpzLhL0c8WgfEgMHo7bTSDTDQXtjrFfvaWg7OFmQ9OYa9IGRg7cdhV6wjWT+Sn8T9LjB5emDyRhIpk0iOnqY6BpejKUPGgqWH7ljKzEbVLcelieppE2bRQzcgRiTT8M5Io/DGx2UbMX68i9If/N14lpT2r2XHPX7RQ1oI3L9teUCLqIQqF3RsxeJbg9FJFkEGxibZgqWWRJco9yM9KVL4trzyYLtpK9fYzQvbUg2aW/NIapf3zVfayIf82tT3yaBF+RCX3JaACCfZEdORjbW8gAG3ZvOg4eNSaQIo6X+wXzSf15rpGmPDyRt5rtE9dD0ohBf2GgTp0Zb9TAW43TeAIiqRE+nhVF8G8mqB7oRvjG46O/PwW1TvjH/af0HoD/1jVALEWDE1V7kJV1SiNjmYaGJKViDrLMIfMJGOVR0G6dmiSI+4l/2eeWIGe0ajW+fot9AMQbGYlCgiXJ/uA7JLFPuGPB8lEgSrTDs16tPEifhsrTE3TVPJ9HPXGeZWAxfQYCm5zyE+8y4bSAeziTRpx9RQ9cObmtrK8xo7xfzcX3Z6UqVthkkRowk0cvSbDHSytJjlTqRMS57nlXM82CQgLwCE/8UCIwOGkywRESjxtjnLcLp9SmSJUeIjhxGeNSYpOnMGf+kzeeaMe4CRHo7v3f4Iz7wxf5RGzWGxNDhJMxVjjHnfr3UuHmSRw5ZShMRncIYrNIQgJwAhXUAiVtL9wtQ0aIlMVNv1KZJku8C+TwTTUleuugHe/GCv+kdOkiSj+S5mfEonFyXKAXLtBat/NZ4IcYIOeFV4pdoJQ3dQmLek2u+x5IEfu2JL0BD7gZZzfamEQBZvgqcw0r/A1qNMsZ+hc2AAJJXwVvA3fm5BtNulM3bRwgBMACZgTgvAJsHZDUsLEN5XD8jCR9FQ8qPNl3MDsD8lmoacZlcwcVcYG6u4Nr5KVfgLQBg7f0YLwCSQwCtnZ9ThoGsvR/EhgGtnZ80W0FyHM028FH6SsT5w3JVYlv2kbCP0m1XMuEAvDyjcLxZywT3B3cF821KOjjVZAQhfyvADto42duMsCB8LcnK8dB/xaN8r3R9c6EAAAAASUVORK5CYII=">
+				<span>账号:${loginName}</span></div>
+			<div class="title">
+				邀好友一起<br> 嗨赚
+				<span>分润</span></div> <a onclick="actDesc()">活动细则</a>
+		</div>
+		<div class="main">
+			<div class="reward">
+				<div class="reward-item reward-item-rate">
+					<div class="reward-item-desc">
+						<div class="reward-item-title">自用省钱</div>
+						<div class="reward-item-subtitle">成功邀请商户进件，下调费率</div>
+					</div>
+				</div>
+				<div class="reward-item reward-item-bonus">
+					<div class="reward-item-desc">
+						<div class="reward-item-title">分享赚钱</div>
+						<div class="reward-item-subtitle">邀请好友，赚分润，日结/无上限</div>
+					</div>
+				</div>
+			</div>
+			<div class="total">
+				<div class="total-invite">
+					<div>${userCount}</div>
+					已成功邀请
+					<span class="triangle"></span>
+					<div class="view-tip"></div>
+				</div>
+				<div class="total-income">
+					<div>${shareAmountCount}</div>
+					累计获得分润
+					<span class="triangle"></span>
+				</div>
+				<div class="total-thrift">
+					<div>${saveAmtCount}</div>
+					累计省钱
+					<span class="triangle"></span>
+				</div>
+			</div>
+		</div>
+		<p>邀请无上限，赶快行动吧</p>
+		<%--<div class="btn-invite"></div>--%>
+		<div class="btn-poster-create"></div>
+		<div class="dialog-wrapper dialog-rate" style="display: none;">
+			<div class="dialog">
+				<div class="header"><span>费率下调</span> <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoBAMAAAB+0KVeAAAALVBMVEW4usFHcEy4u8K/wcS5u8G4usK4usK7v8a5u8K4u8K8vLy9vcS5u8K6vMO5u8Evar4lAAAAD3RSTlP/AGQIy+r3F6pUBC28O4QcLPRyAAABQ0lEQVQoz12SLU8DQRCG3zR3K0mGFRfOkaaQ4K4KUYFDNCQXXEWTSx2GBNQJxKmiCaECdzgk/4AfgSYY+B3Mfs3uduWTybzPzCy+Vg1lr/p9xEU5zWHfTdDiOmN6iwleoF5T+ABcYt5ik3Sttig+oE9QHkd43mFJoKMON6MUfqK4Y6hnUCLQgwsZ0rwTAW06Wkg7ETDR5OBbEKgGW2ihCNhoD4OAttEB1k7ARQfoBHy0QCuwcNERssDtEAoDZAHloyM0AiiaPUh/UGvagxwdTxAgR0M95ZCnLuMJHKx56ivewFkKzdSN2UAK3dRyAsgJ3QZGgX7qeucFkCycDr0A7O/xU2svgGThRO9OAMnCKQggRJOcYGS46MLCTVcrgGpICr0A+rjwIDDFj0SLwJq/9zL/8zMcYEg7WoF2hfvTnJH+fv4HoQhoTnpK9QgAAAAASUVORK5CYII="
+															 alt="关闭" class="close">
+					<!---->
+				</div>
+				<div class="content">
+					<ul class="rate">
+						<c:forEach items="${inviteRateList}" var="rate">
+							<li class="rate-item">
+								<div>邀请${rate.number}名商户成功进件</div>
+								<div>商户费率${rate.rate}%</div>
+							</li>
+						</c:forEach>
+					</ul>
+					<div class="tip">若当前费率已为最低费率，则不进行降费调整</div>
+				</div>
+			</div>
+		</div>
+		<div class="wx-prompt-dialog" style="display: none;">
+<%--			<div>点击右上角，分享给好友</div>--%>
+		</div>
+		<div class="loading" style="background-color: #fff;color: #000">
+			<div class="loading-icon">
+				<img src="${resourcePath}/images/loading-2.gif">
+			</div>
+			<div class="loading-text">加载中...</div>
+		</div>
+	</div>
+</div>
+</body>
+<script>
+	$(function() {
+		$(".total-invite").on('click', function() {
+			window.location.href = ctx + '/activity/one/invite?token=${token}&count=${userCount}&t=${t}';
+		});
+		$(".reward-item-bonus").on('click', function() {
+			window.location.href = ctx + '/activity/one/bonus?token=${token}&t=${t}';
+		})
+		$(".reward-item-rate").on('click', function() {
+			$(".dialog-rate").show();
+		})
+		$(".close").on('click', function() {
+			$(".dialog-rate").hide();
+		})
+		$(".total-income").on('click', function() {
+			window.location.href = ctx + '/activity/one/income?token=${token}&t=${t}';
+		});
+		$(".total-thrift").on('click', function() {
+			window.location.href = ctx + '/activity/one/thrift?token=${token}&t=${t}';
+		});
+		$(".btn-poster-create").on('click',function () {
+			$(".wx-prompt-dialog").show();
+			$(".loading").show();
+			window.location.href = ctx + '/activity/one/poster?token=${token}&t=${t}';
+		})
+	})
+
+	function actDesc() {
+		window.location.href = ctx + '/activity/one/desc?token=${token}&t=${t}';
+	}
+</script>
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/jsp/activity/actDetail.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/activity/actDetail.jsp
new file mode 100644
index 0000000..80946ce
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/activity/actDetail.jsp
@@ -0,0 +1,641 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<!DOCTYPE html>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html lang="en" data-dpr="1" style="font-size: 37.52px;">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta name="viewport"
+          content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no,viewport-fit=cover">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <meta name="format-detection" content="telephone=no">
+    <meta name="keywords" content="">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <c:set var="ctx" value="${pageContext.request.contextPath}" scope="request"/>
+    <c:set var="resourcePath" value="${ctx}/resources" scope="request"/>
+    <script type="text/javascript">
+        var ctx = "${ctx}"; //上下文路径
+        var resourcePath = "${resourcePath}";
+        document.writeln('<script type="text/javascript" src="' + resourcePath + '/js/global.js?d=' + new Date().getTime() + '" ><\/script>');
+    </script>
+    <title>活动详情</title>
+    <link rel="stylesheet" href="${resourcePath}/css/h5.css">
+    <link rel="stylesheet" href="${resourcePath}/css/h5-common.css">
+    <style>
+        * {
+            -webkit-box-sizing: border-box;
+            box-sizing: border-box;
+            margin: 0;
+            padding: 0;
+            outline: 0;
+            -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+        }
+
+        div {
+            display: block;
+        }
+
+        #app, body, html {
+            font-size: .34333333rem;
+            color: #333;
+            -webkit-user-select: none;
+            -moz-user-select: none;
+            -o-user-select: none;
+            user-select: none;
+            height: auto;
+        }
+
+        .img > img {
+            width: 100%;
+        }
+
+        .time-img, .rule-img {
+            text-align: center;
+        }
+
+        .time-img > img, .rule-img > img {
+            width: 35%;
+        }
+
+        .time-text {
+            margin-top: 10px;
+            text-align: center;
+        }
+
+        .rule-img {
+            margin-top: 30px;
+        }
+
+        .rule-text {
+            padding: 10px 30px;
+            line-height: 20px;
+        }
+
+        .status {
+            position: absolute;
+            top: 14.34666667rem;
+            left: .51333333rem;
+            width: 9.04rem;
+            height: 2.81333333rem;
+            background: url('${resourcePath}/images/act-tip.png') no-repeat;
+            background-size: 100%;
+        }
+
+        .status-c-1 {
+            width: 9.04rem;
+            min-height: 2.81333333rem;
+            box-shadow: 0 0 30px #F4A460 inset;
+            border-radius: 15px;
+            margin: auto;
+            padding: 20px;
+            padding-top: 50px;
+            margin-bottom: 30px;
+        }
+
+        .status-info {
+            position: absolute;
+            top: 50%;
+            transform: translateY(-50%);
+            left: 1.45333333rem;
+            right: 1.4rem;
+            text-align: center;
+            color: #ffd698;
+            font-size: .45333333rem;
+        }
+
+        .progress_bar .pro-bar {
+            background: hsl(0, 0%, 97%);
+            box-shadow: 0 1px 2px hsla(0, 0%, 0%, 0.1) inset;
+            height: 4px;
+            margin-bottom: 12px;
+            position: relative;
+        }
+
+        .progress_bar .progress_bar_title {
+            font-size: 15px;
+            font-weight: 300;
+            position: relative;
+            top: -28px;
+            z-index: 1;
+        }
+
+        .progress_bar .progress-bar-inner {
+            background-color: hsl(0, 0%, 88%);
+            display: block;
+            width: 0;
+            height: 100%;
+            position: absolute;
+            top: 0;
+            left: 0px;
+            transition: width 1s linear 0s;
+            animation: animate-positive 2s;
+            box-shadow: 0px 0px 10px 1px #FFF, 0 0 1px #FFF, 0 0 1px #FFF, 0 0 1px #FFF, 0 0 1px #FFF, 0 0 1px #FFF, 0 0 1px #FFF;
+        }
+
+        .progress_bar .progress-bar-inner:before {
+            content: "";
+            background-color: hsl(0, 0%, 100%);
+            border-radius: 50%;
+            width: 4px;
+            height: 4px;
+            position: absolute;
+            right: -10px;
+            top: 0;
+            z-index: 1;
+        }
+
+        .progress_bar .progress-bar-inner:after {
+            content: "";
+            width: 14px;
+            height: 14px;
+            background-color: inherit;
+            border-radius: 50%;
+            position: absolute;
+            right: -15px;
+            top: -5px;
+            box-shadow: 0px 0px 10px 1px #FFF, 0 0 1px #FFF, 0 0 1px #FFF, 0 0 1px #FFF, 0 0 1px #FFF, 0 0 1px #FFF, 0 0 1px #FFF;
+        }
+
+        @-webkit-keyframes animate-positive {
+            0% {
+                width: 0%;
+            }
+        }
+
+        @keyframes animate-positive {
+            0% {
+                width: 0%;
+            }
+        }
+
+        body {
+            background: #494A5F;
+            color: #D5D6E2;
+            font-weight: 500;
+            font-size: 1.05em;
+            font-family: "Microsoft YaHei", "宋体", "Segoe UI", "Lucida Grande", Helvetica, Arial, sans-serif, FreeSans, Arimo;
+        }
+
+        a {
+            color: #2fa0ec;
+            outline: none;
+            text-decoration: none;
+        }
+
+        a:hover, a:focus {
+            color: #74777b;
+            text-decoration: none;
+        }
+
+        .htmleaf-container {
+            margin: 0 auto;
+        }
+
+        .popup-body {
+            font-weight: 500;
+            color: #000000;
+            font-size: .45rem;
+        }
+
+        .bg-amt{
+            position: relative;
+            width: 9.04rem;
+            height: 2.74666667rem;
+            margin: 22.613px auto 12.8px;
+            background: url("${resourcePath}/images/bg_amt.png") no-repeat;
+            background-size: 100%;
+        }
+        .info-num{
+            position: absolute;
+            top: 1.12rem;
+            left: 1.12rem;
+            width: 3.73333333rem;
+            height: 1.4rem;
+            line-height: 1.4rem;
+            color: red;
+            font-family: HYYakuHei-IEW;
+            font-size: .8rem;
+            font-weight: 600;
+            text-align: center;
+        }
+        .status-c-2 {
+            width: 9.04rem;
+            box-shadow: 0 0 30px #f4a460 inset;
+            border-radius: 15px;
+            margin: auto;
+            padding: 20px;
+            margin-bottom: 30px;
+            margin-top: .8rem;
+        }
+        .device-inp{
+            height: 1rem;
+        }
+        .empty{
+            border: 1px solid red;
+        }
+        .error-msg{
+            display: none;
+            color: red;
+        }
+    </style>
+</head>
+<body style="font-size: 12px;">
+<div id="app" style="background-color: ${empty c || c == 0 ? '#FB544E' :  (c == 1 || c == 4) ? '#DD5E01' :  c == 2 ? '#2925D2' : '#060ACE'}; color: #FFF">
+    <div id="wrapper" class="wrapper">
+        <div class="img">
+            <c:choose>
+                <c:when test="${c == 3}">
+                    <img src="${resourcePath}/images/3-rate-${t eq 'merchant' ? 'm' : 'f'}.jpg">
+                </c:when>
+                <c:otherwise>
+                    <img src="${resourcePath}/images/${empty c ? 0 : c}-rate.jpg">
+                </c:otherwise>
+            </c:choose>
+        </div>
+        <div class="body-content" style="margin-top:${empty c || c == 0 ? '2rem' : '0rem'}">
+            <div class="time">
+                <c:if test="${empty c || c == 0}">
+                    <div class="status">
+                        <p class="status-info">
+                            <c:if test="${isMarket == 1}">
+                                您已成功参与此活动
+                            </c:if>
+                            <c:if test="${isMarket == 0 or empty isMarket}">
+                                您尚未参与此活动
+                            </c:if>
+                            <br>武汉商户可以联系我司开通
+                            <br>开通成功后即可享受该活动
+                        </p>
+                    </div>
+                </c:if>
+                <c:if test="${c == 1 || c == 2 || c == 4}">
+                    <div style="">
+                        <div class="status-c-1">
+                            <div class="progress_bar" style="width: 95%;margin-left: 8px;">
+                                <div class="pro-bar">
+                                    <small class="progress_bar_title"
+                                           style="display: flex;justify-content: space-between">
+                                        <div style="display: flex;justify-content: flex-start">
+                                            <div>达标进度:&nbsp;</div>
+                                            <div style="line-height: 21px;">${tradeAmt}/${marketQuota}</div>
+                                        </div>
+                                        <div>
+                                            <div class="progress_number">%</div>
+                                        </div>
+                                    </small>
+                                    <span class="progress-bar-inner"
+                                          style="background-color: #1abc9c; width: ${progressNum}%"
+                                          data-value="${progressNum}" data-percentage-value="${progressNum}"></span>
+                                </div>
+                            </div>
+                            <div style="display: flex;justify-content: space-between;padding: 0 10px 0 10px;">
+                                <c:if test="${userType ne 'agent'}">
+                                    <div style="font-weight:300;font-size: 15px" id="actText">${actTitle}</div>
+                                </c:if>
+                                <c:if test="${userType eq 'agent'}">
+                                    <div style="font-weight:300;font-size: 15px" id="actText">暂无活动资格</div>
+                                </c:if>
+                                <c:if test="${f == 0}">
+                                    <div style="font-weight:300;font-size: 15px" id="toEnroll">点此报名</div>
+                                </c:if>
+                                <c:if test="${f == 2}">
+                                    <div style="font-weight:300;font-size: 15px" id="toEnroll">重新报名</div>
+                                </c:if>
+                            </div>
+                            <c:if test="${f == 2}">
+                                <div style="font-weight:300;font-size: 15px;" id="checkTitle" >${checkTitle}</div>
+                            </c:if>
+                        </div>
+
+                    </div>
+                </c:if>
+
+                <c:if test="${c == 3}">
+                    <div style="">
+                        <div class="bg-amt">
+                            <p class="info-num">${marketAmtCount}</p>
+                        </div>
+                        <div class="status-c-2">
+                            <div style="display: flex;justify-content: space-between;padding: 0 10px 0 10px;">
+                                <c:if test="${userType ne 'agent'}">
+                                    <div style="font-weight:300;font-size: 15px" id="actText">${actTitle}</div>
+                                </c:if>
+                                <c:if test="${userType eq 'agent'}">
+                                    <div style="font-weight:300;font-size: 15px" id="actText">暂无活动资格</div>
+                                </c:if>
+                                <c:if test="${f == 0}">
+                                    <div style="font-weight:300;font-size: 15px" id="toEnroll">点此报名</div>
+                                </c:if>
+                                <c:if test="${f == 2}">
+                                    <div style="font-weight:300;font-size: 15px" id="toEnroll">重新报名</div>
+                                </c:if>
+                            </div>
+                            <c:if test="${f == 2}">
+                                <div style="font-weight:300;font-size: 15px;" id="checkTitle" >${checkTitle}</div>
+                            </c:if>
+                        </div>
+
+                    </div>
+                </c:if>
+
+                <div class="time-img">
+                    <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAUAAAAAuCAMAAABuxzAGAAAAllBMVEUAAADt0aTs0qXt0aTt0aT/2bHt0KXu0qft0aX//8Xu06Xu06Xw1Kvt0aXs06bx1afw1Kjs0aXt0aTu0aTt0qXt0KTt0aTt0aTu0aXu0aXy0qjt0abu0aXt0aXt0aX+2rDu0aXu0qX11ars0aTu06Xs0aXt0aXs0aXt0aXu0qbt0aTv0qft0aXv06bt0aXt0aXu06fs0KTeFDRKAAAAMXRSTlMAmTO84QbrMO8DLUkb+iERKczIio7mpmSCaCVwlG2qC6FbF/c7sq7Zv1G1PfNBedQ2nTzx7gAABd1JREFUaN7d29lyqkAQgOFWGQVEUHHDJYgaCYlbv//LHaYRG6KyHC2L+F2pUSvzB8LMxMCrGHvIpwWhNpQlQhr8tpp8C/gjjL4DGayg5mOnC7lcDKlQUhtDPUibzteIc/gbTB/xcwU3aN1gsvWRfL00YB+lAIg3u8WBiugOMTRsgySslTnV623vMBh9+R1MCOKq8ytaVkD9J8UtFNBUMbSbgnTEW5pQEd4OyQQADnifr50D4hWRFbCBKa1CASFAqa/9gYAw7SH5cMHEO5R5W8ArA8IcJecvBARhI+mvoI9X1r2a0wXyyoDCp3db/YWAAPsmSgeYYZrv6RqQVwbkx3EpT5Hub52qBYSpgog2gHGYOV7Q/jl1TQdDDbimX4HcgIsg1IgCTtPGGDrSTSCz0BgAtvEheO2JAYWp66aABGts22MLEozRcDgyINOqhxNI8ThgvpU0pSvn6kJwwC6EahRQ4D0dPsIVADDXuLYtKBeQx5vVhLuJVj3UEonnDmqhQeLZhko/ypyCrgcPBNzhDfvHAsJhbgCUDcjjzWjC3cw6MflL4xoZ8yMjJCPIUbmApGxAHm9GE+6m14nOX7JrxOZHhkiGcM9YvFVAHu/dJtztCQG1GvbMVwb8TOvTCSdvbX8HbPSvLJ4c8PFTWFvK778N0qGZQE06yUeGcNfHt0SvoFvKzYD505h0QBWvDJ58Cj9+EVnyQg4mmKkD2Sye39ZeE/Dxi8jj05iTgmSpFQtof9xA+aOFoM8Bf14dsPw05hmsBpKtKBLwerHHe106rQdvBgz00PZ/AjaXsQ8OWK2ViHbu1nBnSkKTFsJKUk7Ajbz5yQE395dyxqJowD4fWFUNCNDeoTTJuwrnBKQUS5CWmQE1R8X9OwWEH1nwWzwYkF5hc8DTnYBd+R6+eKeAcFK5X3bA1kaSwdXNhQ6SE+3oSKOsgBukJ75VQGgtRYmJdIuuOvDL4LIFCvQLv84BB4dQjwLGx+faLBSw14rtKx2w3ErkwKkSaCIdcMDWvWmMsaPLTdlpzJ8IqDsxGq7vXKyAfWGItu+ChgsxXn5Ee3n6nYDx317a7xSw7gmQFnhPnZ/sdqIxat4xce12UbJA+qRqNwPyfv1Re6OAS1QH3aIBA3m/FlanNVOU7HzvmDibp7cD8n69V4GAT9qRdtc0uPyAPEkJok58CI6jrFzNvB2QCyuiwEXEjG0oYEV3pJ3ouy4WUMg37Lhy9pM8BEfRQcW/JI2MgHWUnPLTmIruSNP02I4DfrTTjumAe74+N/gQ1NTotOX3W90JyJeZoVs6YBV3pAG6l1XWgouwLw54CbHg5e/OotUMJkZFUz43K2BLHsUTrXTA6u1IS3a0EVUsoFCj85PzHOg9kpNrOmZFVkDYon/6j5VI5XakJW1I2QoG9JDHZVKUoUxFM5MZkOhOIvFoHjqmAupzFwoEVLex72ruSPOkYpofkO8tALSNfcSId36PjpmYU+844Nlb7khL3zyG/IAbKjX1lk286J2f8wEAvBV6FfA9d6QBdJRmxQIafQrYwZT9CXn/5TxCJS/g26yFl5RklR+QezCVTuPvbepTrBZFeTjgtnHFqWBAo8NnX37AAyYc7R/NlPV9uhukrjNfiYAnK7QsEzCLqFZAOzoJEwE767TkSuQHz9bfi3itttwP+TOs0pF/JLl/lRuXD3iq1OcDXZU3AQos5YTM6Y8WJ3EZTlf044UZac3p7uR3wPkupENk396f9Klh1em1/aIBLVcDYxt9xxUxQ2lRNCDYk/bq5h/nGxqAoiq+ghH9V8Dr2Rob5QbkJU4HyRaqQVN4NZYb8Bq/RllRSpI8Ky0jpN18ETsUDThJvKQa3Imcz9VS41IaaWp2wECe1Wv6uocxxYBMLUxoWkUDbvDMr87/MbnjI9cpsBK5dmoijuP1KuksTcim7bifv4eiATUVyVcXqmQDmQEbOQFh6seHsHew54NZYEAuZ3Lm7AUUDggzuShb7OHNWAKexg0JeI1/OgCuMfhdyFwAAAAASUVORK5CYII=">
+                </div>
+                <div class="time-text">
+                    <fmt:formatDate value='${act.startTime}' pattern='yyyy年MM月dd日'/> - <fmt:formatDate
+                        value='${act.endTime}' pattern='yyyy年MM月dd日'/>
+                </div>
+            </div>
+        </div>
+        <div>
+            <div class="rule">
+                <div class="rule-img">
+                    <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAUAAAAAuCAMAAABuxzAGAAAAkFBMVEUAAADt0qXt0KP/3q7u1Kbs0aTt0aTt0aXs0aXt06bt0KXt0aXs0aTt0aXt0aXv0qbv06zv0qbt0aXt0aTu0aXx1aft0aXu0aXy0qju0aXt0aTt0aTu0aXt0aXu06bt0aXu06Xt0aT11aru0qXt0aXt0qbu1Kbt0aT32a7/4bft0aXt0aXu1Kft0aXt0qXs0KTFA6FhAAAAL3RSTlMAM5kFLufy7rEh69330uFAG036Y4QRkWgmiqa8oKpKbzvJF1rXUyu2DQi/dzbOf2mEc5cAAAbESURBVGje5NfbdqIwFIDhDQEx4qAVUbGAgEi1Hvb7v90kux3IFIQ6akud78ZcSNbKj5AIX2U8gnbsSYiglpcLY7iRdCQY0BXjZA4NvI2e4SSHVlsUelBrjoION/KEQh86gtuI/RRqsHxzCjMkrzcMGP6qweHdcVDD6W7AhYOCGYG026Z8YWiRu58tX7MJKjbwblbBLgz4C2ss4J2NNYbdDbjuIZmK8R7PyxgQhhW7Lwp4iOP40LmAsDgiCXfA8Qx7Fu3g2wOacv7uBQTmI0lSSLBimOjzHMg/BeS5dEIhpOH2LWBSsqoBHUXnAwKMBijtYYV/s9c5A+GKgBl+sH4LqMzbrwScgMLqfkBY2G9vwfFpNV9votEh53MUnqHKqIAfHJBxw+AMFJ7r+64HivHSNJdjaJQmsp9qXQZsl0qcAqYF1haQa5pmnA3IXUG7MKC63mqTajdmaILBlO/OdGHmKfNZKFgtBbdruCJgD2uM2gIGFORcwA0K08sDquutb6J04xrhUHB14kJhiWQJLe4UcBpICQoZDeM7BlTX29Ck7GZoxICCrxMfCiYSE85xd/cMWD3G3DGgut6GJkW3mwTU8cj/24DXP8K0CisCaT9QUJPJQGHCWeGLRFfQyGkK2KVH+PpNJEByAuGEjSbQzCtvvN4UsEubyPXHmIODJGCfCzgNa5xA4ihk3x7wkmPMLXgvSPrsUwETrPEKkkHDMmB8i4A/4Z/IFMnLbuUoBigMHYXdEjAulxUUAVcWGdIdsAh7tIAQDVGatu3CLQEjFIIPAfdYUQSU4ZxHCAhxT/4C2ZUB6Qq/DHhoCyg/jw8REA5W0a8loBELFNyKC0b5ntuDtPxMQCrz/BgBwQjYBQdpDYUQPvBRmIMUoqCB4Nqkh4Jpkz8BtzTLgwT83a3ZbakJAwF4KAgFVFhExFUBARVWMO//diUT8tdTtlz1YL8bdg8YzMdkJs4BmS3wyVVpYDm/SYEWSE5kINOrsIWV+T8TaB04mMbqg6AEyZeY8e3UAMeXmz9UcgfQz1m6QNTwmhRYvZVAo2rxmJMpDBA0ESufZlWjAUZLKHu1RSowIzSqC8Sc+TEpEMM8fxeBn8RJ0rkCb7j2xlTo7NXEWCur2QVBSijbVBOY0EM4KRA349WbdKSbNTqaKfDMk91D3T7umFbk9JvAjCCruyIQDx5MCsTBszfpSB8wQGZGoEkHjGju67CJv1e6IDslSYo7ymGdTgoMsUpNC/Txrm/Skb7iHpjP9JLpbHSBAZ85D0GplaTKeCUILmTEpgaNYIBFrNf3vXEPBlpdIEubUfsOHWmeogwuMAadL13gD7mJKWQIBvwmQmADHNNG5xgZlnxoeuNVEyhS6ht0pPkWuIZ5AltHWZ8o5SnG+KnVWT1mnfaB3yPlNed7gQkLo+V3pAdMvOdrpkDcn10BcTEat1RVLVTyf357QBdoarzalZWo/4PAjW3bHpieiPNnHMevxXakZY1MZwr84vuzIt4QRjWOEbnA2PKpKj53AKktpobX2ztFoM6NjHFuNUBZbEdalIIe5gks0FRanT0i6MdrLjDiaGso4DJQy5o+qRKDPvkQAo8BaDzGOC/sPhTjZFkWLK4jDXAnlHyewPCKAiOiEXR46GCEnvb1H8IPoCRsmZc9C1gh0ByE/1AzEWErOLCHgdJlv6HKslFUzhN4IjrOBu1ctLdYGx7SMmbJB1DM69UEcGvCMqYQWIpmAxKssQ60GR69btECw4itvnkCX0ShPhamS+3XwhFScZ3SuS/edgPIWKE8gRRoae2bQzQuisIhFDtYssAjW4SKwGitQxSBARlZP3J39PMZoJFaFlI1IWZjtHH2Z4KsSkXgTjYiILwQhMaq4TGDBqg8lySwcfjkZ3VjWqrT/8w7kYG7e3slaoPQSAjlBYiL4/stMNp8RRDf5aF0vqeBL6pO87RHwSEmaHa5d4eB8iMw0nB/81kxXwZMWT5XIBzjrASdM1+RsHW29ZYwLCasF6sb7fDavQlRPlF4UN0J6lMSn+sznS79myjEsAhMnO+6mSdwuhNBtiWqFFxVuQ9ghFzPZc9fZpDkMkOopdf10KfF9peSGyyCJvawC6UK9E86zvcCb2v6CAy5+0CfISAZVea5eryv2OR142v8xI9RcAmCIuL+4FN9QEuh3dVoZ0YVnqDzeB8rJIzoLJQZKxIVMuD7wZTym6ARBjcBi8kVtZ+Byo77g4Nc7y4siAK+FXj6i0Bwax7C1fOYJPkt1E7uQGI4cQkqTRcMFKXcAtW7FnSeFh8rRl6VAf8X+xam0c+Z8BcC+Hf8ArKOt1H5vn4GAAAAAElFTkSuQmCC">
+                </div>
+                <div class="rule-text">
+                    ${act.officRule}
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+<c:if test="${c == 1 or c == 2 or c == 4}">
+    <div class="popup-container dialog-body active"
+         style="display: none;box-shadow: 5px 5px 20px #888888;border-radius: 5px;">
+        <div class="popup"><!---->
+            <div class="popup-body">
+                <div style="display: flex;justify-content: space-around;line-height: 1rem;">
+                    <div>
+                        <label>设备SN号：</label>
+                    </div>
+                    <div>
+                        <input name="deviceNo" class="device-inp" id="deviceNo" placeholder="请输入设备SN号" />
+
+                    </div>
+                </div>
+                <p class="error-msg"></p>
+            </div>
+            <div class="popup-btns" style="display: flex;justify-content:space-around;">
+                <div style="width: 50%" onclick="hide(this)">
+                    <span style="color: rgba(0,0,0,.5)" class="btn btn-positive">取消</span>
+                </div>
+                <div style="width: 50%" onclick="toConfrim('${act.id}')">
+                    <span class="btn btn-positive">确认</span>
+                </div>
+            </div>
+        </div>
+    </div>
+</c:if>
+
+<c:if test="${c == 3}">
+    <div class="popup-container dialog-body active"
+         style="display: none;box-shadow: 5px 5px 20px #888888;border-radius: 5px;">
+        <div class="popup"><!---->
+            <div class="popup-body">
+                <div style="display: flex;justify-content: space-around;line-height: 1rem;">
+                    <div>
+                        <label>激活码：</label>
+                    </div>
+                    <div>
+                        <input name="deviceNo" class="device-inp" id="deviceNo" placeholder="请输入激活码" />
+
+                    </div>
+                </div>
+                <p class="error-msg"></p>
+            </div>
+            <div class="popup-btns" style="display: flex;justify-content:space-around;">
+                <div style="width: 50%" onclick="hide(this)">
+                    <span style="color: rgba(0,0,0,.5)" class="btn btn-positive">取消</span>
+                </div>
+                <div style="width: 50%" onclick="toConfrim('${act.id}')">
+                    <span class="btn btn-positive">确认</span>
+                </div>
+            </div>
+        </div>
+    </div>
+</c:if>
+
+<div class="mint-indicator" style="display: none; z-index: 9994">
+    <div class="mint-indicator-wrapper" style="padding: 20px;">
+        <span class="mint-indicator-spin">
+            <div class="mint-spinner-fading-circle circle-color-12" style="width: 32px; height: 32px;">
+                <div class="mint-spinner-fading-circle-circle is-circle2">
+
+                </div>
+                <div class="mint-spinner-fading-circle-circle is-circle3">
+
+                </div>
+                <div class="mint-spinner-fading-circle-circle is-circle4">
+
+                </div>
+                <div class="mint-spinner-fading-circle-circle is-circle5">
+
+                </div>
+                <div class="mint-spinner-fading-circle-circle is-circle6">
+
+                </div>
+                <div class="mint-spinner-fading-circle-circle is-circle7">
+
+                </div>
+                <div class="mint-spinner-fading-circle-circle is-circle8">
+
+                </div>
+                <div class="mint-spinner-fading-circle-circle is-circle9">
+
+                </div>
+                <div class="mint-spinner-fading-circle-circle is-circle10">
+
+                </div>
+                <div class="mint-spinner-fading-circle-circle is-circle11">
+
+                </div>
+                <div class="mint-spinner-fading-circle-circle is-circle12">
+
+                </div>
+                <div class="mint-spinner-fading-circle-circle is-circle13">
+
+                </div>
+            </div>
+        </span>
+        <span class="mint-indicator-text" style="">加载中...</span>
+    </div>
+</div>
+<div class="backdrop-container a-title active" style="display: none;"></div>
+<div class="popup-container active a-title" style="display: none;">
+    <div class="popup"><!---->
+        <div class="popup-body a-title-body"></div>
+        <div class="popup-btns" id="popup-btns" onclick="hide(this)"><span class="btn btn-positive">确定</span></div>
+    </div>
+</div>
+<script src="${resourcePath}/js/jquery.nicescroll.min.js"></script>
+<script type="text/javascript">
+    $(document).ready(function () {
+        $("#wrapper").niceScroll({cursorborder: "", cursorcolor: "#00F", boxzoom: false});
+    })
+</script>
+<script type="text/javascript">
+    /* === 判断支持版本 start === */
+    (function () {
+        var viewportTag = null;
+        var metaTags = document.getElementsByTagName('meta');
+        for (var i = 0; i < metaTags.length; i++) {
+            if (metaTags[i].getAttribute('name') === "viewport") {
+                viewportTag = metaTags[i];
+                break;
+            }
+        }
+        if (!viewportTag) {
+            viewportTag = document.createElement("meta");
+            viewportTag.setAttribute('name', 'viewport');
+        }
+
+        var viewportTagContent =
+            'width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no';
+
+        // Detect if iOS device
+        if (/(iPhone|iPod|iPad)/i.test(window.navigator.userAgent)) {
+            // Get iOS major version
+            var iosVersion = parseInt((window.navigator.userAgent).match(/OS (\d+)_(\d+)_?(\d+)? like Mac OS X/i)[1]);
+            // Detect if device is running >iOS 11
+            // iOS 11's UIWebView and WKWebView changes the viewport behaviour to render viewport without the status bar. Need to override with "viewport-fit: cover" to include the status bar.
+            if (iosVersion >= 11) {
+                viewportTagContent += ', viewport-fit=cover';
+            }
+        }
+
+        // Update viewport tag attribute
+        viewportTag.setAttribute('content', viewportTagContent);
+    })();
+    /* === 判断支持版本 end === */
+
+    // refs http://www.html-js.com/article/3041 移动端高清、多屏适配方案
+    !function (a, b) {
+        function c() {
+            var b = f.getBoundingClientRect().width;
+            b / i > 540 && (b = 540 * i);
+            var c = b / 10;
+            f.style.fontSize = c + "px", k.rem = a.rem = c
+        }
+
+        var d, e = a.document,
+            f = e.documentElement,
+            g = e.querySelector('meta[name="viewport"]'),
+            h = e.querySelector('meta[name="flexible"]'),
+            i = 0,
+            j = 0,
+            k = b.flexible || (b.flexible = {});
+        if (g) {
+            var l = g.getAttribute("content").match(/initial\-scale=([\d\.]+)/);
+            l && (j = parseFloat(l[1]), i = parseInt(1 / j))
+        } else if (h) {
+            var m = h.getAttribute("content");
+            if (m) {
+                var n = m.match(/initial\-dpr=([\d\.]+)/),
+                    o = m.match(/maximum\-dpr=([\d\.]+)/);
+                n && (i = parseFloat(n[1]), j = parseFloat((1 / i).toFixed(2))), o && (i = parseFloat(o[1]), j = parseFloat((
+                    1 / i).toFixed(2)))
+            }
+        }
+        if (!i && !j) {
+            var p = (a.navigator.appVersion.match(/android/gi), a.navigator.appVersion.match(/iphone/gi)),
+                q = a.devicePixelRatio;
+            i = p ? q >= 3 && (!i || i >= 3) ? 3 : q >= 2 && (!i || i >= 2) ? 2 : 1 : 1, j = 1 / i
+        }
+        if (f.setAttribute("data-dpr", i), !g)
+            if (g = e.createElement("meta"), g.setAttribute("name", "viewport"), g.setAttribute("content",
+                "initial-scale=" + j + ", maximum-scale=" + j + ", minimum-scale=" + j + ", user-scalable=no"), f
+                .firstElementChild) f.firstElementChild.appendChild(g);
+            else {
+                var r = e.createElement("div");
+                r.appendChild(g), e.write(r.innerHTML)
+            }
+        a.addEventListener("resize", function () {
+            clearTimeout(d), d = setTimeout(c, 300)
+        }, !1), a.addEventListener("pageshow", function (a) {
+            a.persisted && (clearTimeout(d), d = setTimeout(c, 300))
+        }, !1), "complete" === e.readyState ? e.body.style.fontSize = 12 * i + "px" : e.addEventListener(
+            "DOMContentLoaded",
+            function () {
+                e.body.style.fontSize = 12 * i + "px"
+            }, !1), c(), k.dpr = a.dpr = i, k.refreshRem = c, k.rem2px = function (a) {
+            var b = parseFloat(a) * this.rem;
+            return "string" == typeof a && a.match(/rem$/) && (b += "px"), b
+        }, k.px2rem = function (a) {
+            var b = parseFloat(a) / this.rem;
+            return "string" == typeof a && a.match(/px$/) && (b += "rem"), b
+        }
+    }(window, window.lib || (window.lib = {}));
+</script>
+<script type="text/javascript">
+    $(function () {
+        var progress = $(".progress-bar-inner");
+        progress.each(function (i) {
+            var data = $(this).attr('data-value');
+            $(this).prev().find(".progress_number").html(data + "%");
+        });
+
+        $("#toEnroll").on('click', function () {
+            $('.dialog-body').show();
+            return;
+        })
+
+        $("#deviceNo").keydown((event) => {
+            $(".device-inp").removeClass("empty");
+            $(".error-msg").hide();
+        })
+    });
+
+    function hide(obj) {
+        if (obj != undefined) {
+            $(".a-title").hide();
+        }
+        $('.active').hide();
+    }
+
+    function toConfrim(obj) {
+        if (obj == undefined) {
+            $('.a-title-body').html("活动有误！");
+            $(".a-title").show();
+            return;
+        }
+        let deviceNo = $("#deviceNo").val();
+        let type = '${c}';
+        if(!deviceNo){
+            let msg = type == 1 || type == 2  ? "请输入设备SN号" : "请输入激活码"
+            $(".device-inp").addClass("empty");
+            $(".error-msg").html(msg).show();
+            return;
+        }
+        $('.dialog-body').hide();
+        //loading
+        $(".mint-indicator").show();
+        $.ajax({
+            url: ctx + '/activity/toEnroll',
+            dataType: 'json',
+            type: "post",
+            data: {
+                'actId': obj,
+                'token': '${token}',
+                'deviceNo':deviceNo,
+                'c':type || "0"
+            },
+            success: function (res) {
+                $(".mint-indicator").hide();
+                if (res.code == 200) {
+                    $('.a-title-body').html(res.message);
+                    $(".a-title").show();
+                    $("#toEnroll").hide();
+                    $("#actText").html("申请成功,等待审核...");
+                    $("#checkTitle").html(" ");
+                } else {
+                    $('.a-title-body').html(res.message);
+                    $(".a-title").show();
+                }
+            },
+        });
+    }
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/jsp/activity/activity.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/activity/activity.jsp
new file mode 100644
index 0000000..74f2427
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/activity/activity.jsp
@@ -0,0 +1,2266 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<!DOCTYPE html>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+	<meta name="viewport"
+		  content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no,viewport-fit=cover">
+	<meta http-equiv="X-UA-Compatible" content="ie=edge">
+	<meta name="format-detection" content="telephone=no">
+	<meta name="keywords" content="">
+	<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+	<meta name="renderer" content="webkit">
+	<c:set var="ctx" value="${pageContext.request.contextPath}"  scope="request"/>
+	<c:set var="resourcePath" value="${ctx}/resources"  scope="request"/>
+	<script type="text/javascript">
+		var ctx = "${ctx}"; //上下文路径
+		var resourcePath = "${resourcePath}";
+		document.writeln('<script type="text/javascript" src="'+resourcePath+'/js/global.js?d=' + new Date().getTime() + '" ><\/script>');
+	</script>
+
+	<title>官方活动</title>
+	<style type="text/css">.mint-popup-bottom[data-v-8cd1bb9c]{-webkit-transform:translate3d(-50%,0,0)!important}.mint-indicator-wrapper[data-v-8cd1bb9c]{-webkit-transform:translate(-50%,-50%);z-index:999}#app[data-v-8cd1bb9c],body[data-v-8cd1bb9c],html[data-v-8cd1bb9c]{font-size:5.973px;font-size:.37333333rem;height:100%;color:#333;-webkit-user-select:none;-moz-user-select:none;-o-user-select:none;-ms-user-select:none;user-select:none}body[data-v-8cd1bb9c],html[data-v-8cd1bb9c],input[data-v-8cd1bb9c],textarea[data-v-8cd1bb9c]{font-family:PingFangSC-Regular,Helvetica,sans-serif}input[data-v-8cd1bb9c],textarea[data-v-8cd1bb9c]{background-color:#fff}input[data-v-8cd1bb9c],li[data-v-8cd1bb9c],ol[data-v-8cd1bb9c],textarea[data-v-8cd1bb9c],ul[data-v-8cd1bb9c]{padding:0;border:0;margin:0}.tc[data-v-8cd1bb9c]{text-align:center}.tr[data-v-8cd1bb9c]{text-align:right}.tl[data-v-8cd1bb9c]{text-align:left}.c4b[data-v-8cd1bb9c]{color:#4b4b4b}.c000[data-v-8cd1bb9c]{color:#000}.c333[data-v-8cd1bb9c]{color:#333}.c666[data-v-8cd1bb9c]{color:#666}.c999[data-v-8cd1bb9c]{color:#999}.cccc[data-v-8cd1bb9c]{color:#ccc}.cddd[data-v-8cd1bb9c]{color:#ddd}.c9b9b[data-v-8cd1bb9c]{color:#9b9b9b}.cblue[data-v-8cd1bb9c]{color:#3089f7}.cred[data-v-8cd1bb9c]{color:red}.cora[data-v-8cd1bb9c]{color:#faa800}.cbase[data-v-8cd1bb9c]{color:#ff721f}.cfff[data-v-8cd1bb9c]{color:#fff}.bfff[data-v-8cd1bb9c]{background-color:#fff}.bbase[data-v-8cd1bb9c]{background-color:#ff721f}.fl[data-v-8cd1bb9c]{float:left}.fr[data-v-8cd1bb9c]{float:right}.mt10[data-v-8cd1bb9c]{margin-top:4.266px;margin-top:.26666667rem}.ml15[data-v-8cd1bb9c]{margin-left:6.4px;margin-left:.4rem}.mr15[data-v-8cd1bb9c]{margin-right:6.4px;margin-right:.4rem}.mt15[data-v-8cd1bb9c]{margin-top:6.4px;margin-top:.4rem}.mb15[data-v-8cd1bb9c]{margin-bottom:6.4px;margin-bottom:.4rem}.pl15[data-v-8cd1bb9c]{padding-left:6.4px;padding-left:.4rem}.pr15[data-v-8cd1bb9c]{padding-right:6.4px;padding-right:.4rem}.pt15[data-v-8cd1bb9c]{padding-top:6.4px;padding-top:.4rem}.pb15[data-v-8cd1bb9c]{padding-bottom:6.4px;padding-bottom:.4rem}.mt30[data-v-8cd1bb9c]{margin-top:12.8px;margin-top:.8rem}.mb30[data-v-8cd1bb9c]{margin-bottom:12.8px;margin-bottom:.8rem}.fz12[data-v-8cd1bb9c]{font-size:5.12px;font-size:.32rem}.fz13[data-v-8cd1bb9c]{font-size:5.546px;font-size:.34666667rem}.fz14[data-v-8cd1bb9c]{font-size:5.973px;font-size:.37333333rem}.fz15[data-v-8cd1bb9c]{font-size:6.4px;font-size:.4rem}.fz16[data-v-8cd1bb9c]{font-size:6.826px;font-size:.42666667rem}.fz18[data-v-8cd1bb9c]{font-size:7.68px;font-size:.48rem}.fz20[data-v-8cd1bb9c]{font-size:8.533px;font-size:.53333333rem}.fz22[data-v-8cd1bb9c]{font-size:9.386px;font-size:.58666667rem}.fz24[data-v-8cd1bb9c]{font-size:10.24px;font-size:.64rem}.fz32[data-v-8cd1bb9c]{font-size:13.653px;font-size:.85333333rem}.fz36[data-v-8cd1bb9c]{font-size:15.36px;font-size:.96rem}.block[data-v-8cd1bb9c]{display:block}b[data-v-8cd1bb9c],dfn[data-v-8cd1bb9c],em[data-v-8cd1bb9c]{font-style:normal;font-weight:400}.font-DINAlternate[data-v-8cd1bb9c]{font-family:DINAlternate-Bold,PingFangSC-Regular,Helvetica,sans-serif}.arr_r[data-v-8cd1bb9c]{position:relative}.arr_r[data-v-8cd1bb9c]:after{content:"";position:absolute;z-index:80;right:6.4px;right:.4rem;top:50%;width:6px;height:6px;border:1px solid #c7c7cc;border-width:2px 2px 0 0;transform:translateY(-50%) rotate(45deg)}.shadow[data-v-8cd1bb9c]{box-shadow:0 8px 25px 0 #eaebec}.ellips[data-v-8cd1bb9c]{white-space:nowrap;overflow:hidden;text-overflow:ellipsis}.ellips_line2[data-v-8cd1bb9c],.ellips_line3[data-v-8cd1bb9c]{display:-webkit-box;overflow:hidden}.ellips_line2[data-v-8cd1bb9c]{-webkit-line-clamp:2}.ellips_line3[data-v-8cd1bb9c]{-webkit-line-clamp:3}.to-check[data-v-8cd1bb9c]{position:relative}.to-check.checked[data-v-8cd1bb9c]:before{content:"";position:absolute;top:50%;right:6.4px;right:.4rem;width:6.4px;width:.4rem;height:3.2px;height:.2rem;border:2px solid #ff721f;border-width:0 0 2px 2px;transform:translateY(-50%) rotate(-45deg)}.ui-page[data-v-8cd1bb9c]{position:relative;max-width:256px;max-width:16rem;min-height:100%;background-color:#f7f7f7;padding-top:1px;margin:-1px auto 0}.ui-page[data-v-8cd1bb9c]:after{content:"";position:fixed;top:0;bottom:0;left:0;right:0;z-index:-1;background-color:#f7f7f7}button[data-v-8cd1bb9c]{font-size:6.4px;font-size:.4rem;border-radius:1px;background-color:#ff721f}button.disabled[data-v-8cd1bb9c]{opacity:.4}.mebtn[data-v-8cd1bb9c]{width:100%;padding:0 6.4px;padding:0 .4rem}input[data-v-8cd1bb9c]::-webkit-input-placeholder{color:#ccc}[data-v-8cd1bb9c]:-moz-placeholder,[data-v-8cd1bb9c]::-moz-placeholder{color:#ccc}[data-v-8cd1bb9c]:-ms-input-placeholder{color:#ccc}[class*=mint-tab-container][data-v-8cd1bb9c]{visibility:visible;position:static;opacity:1}.loading-txt[data-v-8cd1bb9c]{width:76.8px;width:4.8rem}.loading-txt em[data-v-8cd1bb9c]{display:block;margin:4.266px auto;margin:.26666667rem auto}.loading-txt .txt[data-v-8cd1bb9c]{margin-bottom:2.56px;margin-bottom:.16rem}.v-input-clear[data-v-8cd1bb9c]{position:absolute;right:-4.266px;right:-.26666667rem;top:50%;display:none;z-index:9;padding:4.266px;padding:.26666667rem;background-color:#fff;transform:translateY(-50%)}.v-input-clear.active[data-v-8cd1bb9c]{display:block}.v-input-clear .icon-font[data-v-8cd1bb9c]{display:block;color:#ccc;font-size:7.68px;font-size:.48rem}.popup-container .popup-title[data-v-8cd1bb9c]{font-weight:700}.popup-container .popup-btns .btn[data-v-8cd1bb9c]{color:#ff721f}.flex[data-v-8cd1bb9c]{display:-ms-flexbox;display:flex}.flex .flex-li[data-v-8cd1bb9c],.flex li[data-v-8cd1bb9c]{-ms-flex:1;flex:1}.i-warn-red[data-v-8cd1bb9c]{display:inline-block;width:20px;height:20px;background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAAAXNSR0IArs4c6QAAAkNJREFUSA29Vj1PVEEUvWdYA72dFkJCQkGhkJjQECpqTbQyWuhPcMFYUFjYyUfCbyDSYEJvZWhIiDEWmlCxFkBla8Tdfdcz897O7L7F2XkE3yS7e+fOOffMx92ZC0lo+vLOnAAPRWVRILdF9ZajAWf0ndJ3QN8+Nn98GRUOMYA2px6L6FsGm4nh/BhwLII1bJzseV/JuFRQV2amJLt4T7GFEj6xi0Mx40+wfnxSJgwJ6urkkmT6gVt1swyu1If8FINHeNf61M8bEHRiXfnIld3oB13dRlvGZLlf1Au6bdTfR6NXxiCQHU6CXH1KfCM6IbtSTNzvba/xYHtmKdto5BU2Wi/4eU7ua8//l2FjunzIAU6wyMa0BDH61cfGWLC98zJDF3IN6W0HUz+1dbCib2aP5FcH0rloptLc30tkD7o6PS/d9ud0okXyHF2rnFzzRrLOg5xc4RvyjejvFRg5lLeVYaIsViICW0yYOWy27nGl25W41DLubqzEMrse3pBge2fE4D3MFRYXcQQ3MNTQP76vjWB7Z8SgVvgfRnDXNgQot5RPTH3t3CbNaW161LJJc1CbILVs0uzXJkgt48oC91L/Z1lqWK0iS7GWLNfOQmajzx4ZINdw5LwGYVmQ0gzCzdTNgh3l4rBX54THkzWIpDzAmaxrc/Iu49sH+FlUxw66B5ixi+ZffNuvo8QI50FBV3uwBnGzKmZ05R+7slI9Y2MNCFqHE2UNQivtTC1pqJFr65hSxWZhA1ta5tVWCA8JX2Op/xc+6NDNayMwOQAAAABJRU5ErkJggg==) no-repeat;background-size:20px 20px}.i-checked[data-v-8cd1bb9c],.i-unchecked[data-v-8cd1bb9c]{position:relative;display:inline-block;width:16px;height:16px;background:url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+Cjxzdmcgd2lkdGg9IjMycHgiIGhlaWdodD0iMzJweCIgdmlld0JveD0iMCAwIDMyIDMyIiB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPgogICAgPCEtLSBHZW5lcmF0b3I6IFNrZXRjaCA1MC4yICg1NTA0NykgLSBodHRwOi8vd3d3LmJvaGVtaWFuY29kaW5nLmNvbS9za2V0Y2ggLS0+CiAgICA8dGl0bGU+5Y2P6K6u5Yu+L+WLvjwvdGl0bGU+CiAgICA8ZGVzYz5DcmVhdGVkIHdpdGggU2tldGNoLjwvZGVzYz4KICAgIDxkZWZzPjwvZGVmcz4KICAgIDxnIGlkPSLljY/orq7li74v5Yu+IiBzdHJva2U9Im5vbmUiIHN0cm9rZS13aWR0aD0iMSIgZmlsbD0ibm9uZSIgZmlsbC1ydWxlPSJldmVub2RkIj4KICAgICAgICA8cGF0aCBkPSJNMjguNDQ0NDQ0NCwwIEwzLjU1NTU1NTU2LDAgQzEuNiwwIDAsMS42IDAsMy41NTU1NTU1NiBMMCwyOC40NDQ0NDQ0IEMwLDMwLjQgMS42LDMyIDMuNTU1NTU1NTYsMzIgTDI4LjQ0NDQ0NDQsMzIgQzMwLjQsMzIgMzIsMzAuNCAzMiwyOC40NDQ0NDQ0IEwzMiwzLjU1NTU1NTU2IEMzMiwxLjYgMzAuNCwwIDI4LjQ0NDQ0NDQsMCBMMjguNDQ0NDQ0NCwwIFogTTEyLjQ0NDQ0NDQsMjQuODg4ODg4OSBMMy41NTU1NTU1NiwxNi4zNDE4ODAzIEw2LjA0NDQ0NDQ0LDEzLjk0ODcxNzkgTDEyLjQ0NDQ0NDQsMjAuMTAyNTY0MSBMMjUuOTU1NTU1Niw3LjExMTExMTExIEwyOC40NDQ0NDQ0LDkuNTA0MjczNSBMMTIuNDQ0NDQ0NCwyNC44ODg4ODg5IEwxMi40NDQ0NDQ0LDI0Ljg4ODg4ODkgWiIgaWQ9IuWLvuS4iiIgZmlsbD0iI0ZGNzIxRiI+PC9wYXRoPgogICAgPC9nPgo8L3N2Zz4=) no-repeat;background-size:16px auto}.i-unchecked[data-v-8cd1bb9c]{background-image:url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+Cjxzdmcgd2lkdGg9IjMycHgiIGhlaWdodD0iMzJweCIgdmlld0JveD0iMCAwIDMyIDMyIiB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPgogICAgPCEtLSBHZW5lcmF0b3I6IFNrZXRjaCA1MC4yICg1NTA0NykgLSBodHRwOi8vd3d3LmJvaGVtaWFuY29kaW5nLmNvbS9za2V0Y2ggLS0+CiAgICA8dGl0bGU+5Y2P6K6u5Yu+L+acquWLvjwvdGl0bGU+CiAgICA8ZGVzYz5DcmVhdGVkIHdpdGggU2tldGNoLjwvZGVzYz4KICAgIDxkZWZzPjwvZGVmcz4KICAgIDxnIGlkPSLljY/orq7li74v5pyq5Yu+IiBzdHJva2U9Im5vbmUiIHN0cm9rZS13aWR0aD0iMSIgZmlsbD0ibm9uZSIgZmlsbC1ydWxlPSJldmVub2RkIiBmaWxsLW9wYWNpdHk9IjAuMyI+CiAgICAgICAgPHBhdGggZD0iTTI4LjQ0NDQ0NDQsMCBMMy41NTU1NTU1NiwwIEMxLjYsMCAwLDEuNiAwLDMuNTU1NTU1NTYgTDAsMjguNDQ0NDQ0NCBDMCwzMC40IDEuNiwzMiAzLjU1NTU1NTU2LDMyIEwyOC40NDQ0NDQ0LDMyIEMzMC40LDMyIDMyLDMwLjQgMzIsMjguNDQ0NDQ0NCBMMzIsMy41NTU1NTU1NiBDMzIsMS42IDMwLjQsMCAyOC40NDQ0NDQ0LDAgTDI4LjQ0NDQ0NDQsMCBaIE0xMi40NDQ0NDQ0LDI0Ljg4ODg4ODkgTDMuNTU1NTU1NTYsMTYuMzQxODgwMyBMNi4wNDQ0NDQ0NCwxMy45NDg3MTc5IEwxMi40NDQ0NDQ0LDIwLjEwMjU2NDEgTDI1Ljk1NTU1NTYsNy4xMTExMTExMSBMMjguNDQ0NDQ0NCw5LjUwNDI3MzUgTDEyLjQ0NDQ0NDQsMjQuODg4ODg4OSBMMTIuNDQ0NDQ0NCwyNC44ODg4ODg5IFoiIGlkPSLmsqHli77kuIoiIGZpbGw9IiNGRjcyMUYiPjwvcGF0aD4KICAgIDwvZz4KPC9zdmc+)}.model-container .key-body[data-v-8cd1bb9c]{padding-bottom:1.493px;padding-bottom:.09333333rem;background-color:#d2d5db}.model-container .key-body ul.number li[data-v-8cd1bb9c]{height:14.933px;height:.93333333rem;line-height:14.933px;line-height:.93333333rem;padding:3.626px 0;padding:.22666667rem 0;width:31%;margin:0 1.7% 1.7% 0;border-radius:5px;background-color:#fff;box-shadow:0 1px 0 0 #898a8d}.model-container .key-body ul.number li[data-v-8cd1bb9c]:nth-child(3n-2){margin-left:1.7%}.model-container .key-body ul.number li[data-v-8cd1bb9c]:before{content:none}.model-container .key-body ul.number li.key-back[data-v-8cd1bb9c],.model-container .key-body ul.number li.key-null[data-v-8cd1bb9c]{background-color:#d2d5db;box-shadow:none}.model-container .key-body ul.number li.key-back[data-v-8cd1bb9c]:active{opacity:.5}.freeMask[data-v-8cd1bb9c]{background-color:transparent}.vx-header+.scroll-wrapper[data-v-8cd1bb9c]{top:0}@keyframes lighter-data-v-8cd1bb9c{0%{background-color:#000}50%{background-color:#000}51%{background-color:transparent}to{background-color:transparent}}@keyframes rotater-data-v-8cd1bb9c{0%{-webkit-transform:rotate(0)}to{-webkit-transform:rotate(1turn)}}.get-money-activity[data-v-8cd1bb9c]{padding:6.4px;padding:.4rem;text-align:center;background-color:#fff}.get-money-activity .get-money-title[data-v-8cd1bb9c]{display:-ms-flexbox;display:flex;-ms-flex-pack:justify;justify-content:space-between;font-size:5.973px;font-size:.37333333rem;line-height:7.04px;line-height:.44rem;margin-top:5.546px;margin-top:.34666667rem;font-family:PingFangSC-Regular}.get-money-activity .get-money-title .one[data-v-8cd1bb9c]{color:#333}.get-money-activity .get-money-title .two[data-v-8cd1bb9c]{color:#ff7728}.get-money-activity .money[data-v-8cd1bb9c]{text-align:left;color:#333;font-size:13.653px;font-size:.85333333rem;line-height:18.773px;line-height:1.17333333rem;font-family:DINAlternate-Bold}.get-money-activity .money-desc[data-v-8cd1bb9c]{font-family:PingFangSC-Regular;color:#333;font-size:5.973px;font-size:.37333333rem;line-height:8.533px;line-height:.53333333rem;margin-top:5.333px;margin-top:.33333333rem;margin-bottom:5.333px;margin-bottom:.33333333rem;text-align:left}.get-money-activity .money-list[data-v-8cd1bb9c]{display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;-ms-flex-pack:start;justify-content:flex-start}.get-money-activity .money-list li[data-v-8cd1bb9c]{width:45.866px;width:2.86666667rem;height:23.253px;height:1.45333333rem;line-height:23.253px;line-height:1.45333333rem;font-size:11.093px;font-size:.69333333rem;color:#333;border:1px solid #bcbcbc;font-family:DINAlternate-Bold;border-radius:.10666667rem;margin-bottom:4.693px;margin-bottom:.29333333rem}.get-money-activity .money-list li[data-v-8cd1bb9c]:nth-child(3n-1){margin-left:4.693px;margin-left:.29333333rem;margin-right:4.693px;margin-right:.29333333rem}.get-money-activity .money-list li span[data-v-8cd1bb9c]{font-size:8.96px;font-size:.56rem}.get-money-activity .money-list .li-disabled[data-v-8cd1bb9c]{color:#dfdfdf}.get-money-activity .money-list .li-actived[data-v-8cd1bb9c]{color:#ff7728;border:1px solid #ff7728;background-color:rgba(255,119,40,.1)}.get-money-activity .get-money-desc[data-v-8cd1bb9c]{font-family:PingFangSC-Regular;color:#333;font-size:5.973px;font-size:.37333333rem;line-height:9.386px;line-height:.58666667rem;margin-top:2.133px;margin-top:.13333333rem;margin-bottom:12.8px;margin-bottom:.8rem;text-align:left}.get-money-activity .button-disabled[data-v-8cd1bb9c],.get-money-activity .money-button[data-v-8cd1bb9c]{width:100%;height:18.773px;height:1.17333333rem;line-height:18.773px;line-height:1.17333333rem;font-size:6.826px;font-size:.42666667rem;border-radius:.02666667rem;color:#fff;font-family:PingFangSC-Medium;font-weight:700}.get-money-activity .button-disabled[data-v-8cd1bb9c]{background-color:rgb(253,117,100)}.get-money-activity .money-button[data-v-8cd1bb9c]{background-color:#ff7728}.get-money-activity .money-exchange-link[data-v-8cd1bb9c]{width:100%;height:42.666px;height:2.66666667rem;margin-top:6.4px;margin-top:.4rem}.get-money-activity .money-exchange-link img[data-v-8cd1bb9c]{width:100%;height:100%}</style><style type="text/css" title="fading circle style">.circle-color-12 > div::before { background-color: #ccc; }
+</style>
+	<style type="text/css">
+		.ui-page {
+			position: relative;
+			max-width: 256px;
+			max-width: 16rem;
+			min-height: 100%;
+			padding-top: 1px;
+			margin: -1px auto 0
+		}
+
+		.ui-page, .ui-page:after {
+			background-color: #f7f7f7
+		}
+
+		.ui-page:after {
+			content: "";
+			position: fixed;
+			top: 0;
+			bottom: 0;
+			left: 0;
+			right: 0;
+			z-index: -1
+		}
+		.money-activity-detail {
+			background-color: #f6f6f6;
+			height: 100%
+		}
+
+		.money-activity-detail .scroll {
+			height: 100%
+		}
+
+		.money-activity-detail .fixed-head {
+			position: fixed;
+			top: 0;
+			z-index: 100;
+			width: 100%
+		}
+
+		.money-activity-detail .mint-datetime .picker-toolbar .mint-datetime-cancel {
+			text-align: left;
+			padding-left: 6.4px;
+			padding-left: .4rem
+		}
+
+		.money-activity-detail .mint-datetime .picker-toolbar .mint-datetime-confirm {
+			text-align: right;
+			padding-right: 6.4px;
+			padding-right: .4rem
+		}
+
+		.money-activity-detail .mint-datetime .mint-datetime-picker .picker-items .picker-slot:nth-child(3) {
+			display: none
+		}
+
+		.money-activity-detail .mint-datetime-action {
+			color: #FD7564
+		}
+
+		.money-activity-detail .no-more {
+			color: #666;
+			font-family: PingFangSC-Regular;
+			font-size: 4.693px;
+			font-size: .293333rem
+		}
+
+		.money-activity-detail .money-head {
+			padding: 6.4px;
+			padding: .4rem;
+			width: 100%;
+			padding-bottom: 0;
+			background-color: #fff
+		}
+
+		.money-activity-detail .money-head .head {
+			overflow: hidden;
+			height: 29.226px;
+			height: 1.82666667rem;
+			box-shadow: 0 4px 8px 0 hsla(0, 0%, 78%, .5);
+			background-color: #fff;
+			border-radius: .21333333rem;
+			margin-bottom: 6.4px;
+			margin-bottom: .4rem;
+			padding-top: 5.973px;
+			padding-top: .37333333rem
+		}
+
+		.money-activity-detail .money-head .head .top-date {
+			float: left;
+			padding-left: 6.4px;
+			padding-left: .4rem;
+			border-right: 1px dashed #ddd;
+			font-family: PingFangSC-Medium;
+			position: relative;
+			width: 41.6px;
+			width: 2.6rem
+		}
+
+		.money-activity-detail .money-head .head .top-date .year {
+			font-size: 5.12px;
+			font-size: .32rem;
+			color: #999
+		}
+
+		.money-activity-detail .money-head .head .top-date .mouth {
+			font-size: 8.96px;
+			font-size: .56rem;
+			color: #333
+		}
+
+		.money-activity-detail .money-head .head .top-date .arrow-down {
+			position: absolute;
+			border-top-width: 2.986px;
+			border-top-width: .18666667rem;
+			border-bottom-width: 2.986px;
+			border-bottom-width: .18666667rem;
+			border-right-width: 2.986px;
+			border-right-width: .18666667rem;
+			border-left-width: 2.986px;
+			border-left-width: .18666667rem;
+			border-top-color: #999;
+			border-style: solid;
+			border-left-color: transparent;
+			border-bottom-color: transparent;
+			border-right-color: transparent;
+			left: 29.866px;
+			left: 1.86666667rem;
+			top: 6.4px;
+			top: .4rem;
+			opacity: .5
+		}
+
+		.money-activity-detail .money-head .head .top-date img {
+			display: inline-block;
+			float: left;
+			width: 5.333px;
+			width: .33333333rem;
+			height: 3.2px;
+			height: .2rem;
+			margin-left: 2.133px;
+			margin-left: .13333333rem
+		}
+
+		.money-activity-detail .money-head .head .top-money {
+			float: left;
+			padding-left: 4.053px;
+			padding-left: .25333333rem;
+			font-size: 5.12px;
+			font-size: .32rem;
+			line-height: 5.973px;
+			line-height: .37333333rem;
+			color: #333
+		}
+
+		.money-activity-detail .money-head .head .top-money .get {
+			margin-bottom: 4.266px;
+			margin-bottom: .26666667rem;
+			margin-top: 2.133px;
+			margin-top: .13333333rem
+		}
+
+		.money-activity-detail .money-head .head .top-money .fince {
+			color: #ff7728;
+			font-size: 5.12px;
+			font-size: .32rem;
+			margin-left: 8.533px;
+			margin-left: .53333333rem;
+			margin-top: 1.706px;
+			margin-top: .10666667rem;
+			padding-bottom: 1.066px;
+			padding-bottom: .06666667rem;
+			padding-right: 5.973px;
+			padding-right: .37333333rem;
+			border-bottom: 1px solid #ff7728;
+			position: relative
+		}
+
+		.money-activity-detail .money-head .head .top-money .fince:after {
+			content: "";
+			position: absolute;
+			right: 1.28px;
+			right: .08rem;
+			top: 50%;
+			margin-top: -2.133px;
+			margin-top: -.13333333rem;
+			width: 2.133px;
+			width: .13333333rem;
+			height: 3.2px;
+			height: .2rem;
+			background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyB3aWR0aD0iMTBweCIgaGVpZ2h0PSIxNXB4IiB2aWV3Qm94PSIwIDAgMTAgMTUiIHZlcnNpb249IjEuMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayI+CiAgICA8IS0tIEdlbmVyYXRvcjogU2tldGNoIDUyLjYgKDY3NDkxKSAtIGh0dHA6Ly93d3cuYm9oZW1pYW5jb2RpbmcuY29tL3NrZXRjaCAtLT4KICAgIDx0aXRsZT7ljrvlkJHnrq3lpLQ8L3RpdGxlPgogICAgPGRlc2M+Q3JlYXRlZCB3aXRoIFNrZXRjaC48L2Rlc2M+CiAgICA8ZyBpZD0iMDcwMiIgc3Ryb2tlPSJub25lIiBzdHJva2Utd2lkdGg9IjEiIGZpbGw9Im5vbmUiIGZpbGwtcnVsZT0iZXZlbm9kZCI+CiAgICAgICAgPGcgaWQ9IueUqOadpeagh+azqCIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoLTY2OS4wMDAwMDAsIC0xNjIuMDAwMDAwKSIgZmlsbD0iI0ZGNzcyOCIgZmlsbC1ydWxlPSJub256ZXJvIj4KICAgICAgICAgICAgPHBhdGggZD0iTTY2OS45MzQ2OTMsMTY0LjcwMzA1MiBDNjY5LjM1MTQ4NCwxNjQuMTE0Njk5IDY2OS4zNTU2NTQsMTYzLjE2NDk2MSA2NjkuOTQ0MDA3LDE2Mi41ODE3NTIgQzY3MC41MzIzNiwxNjEuOTk4NTQzIDY3MS40ODIwOTgsMTYyLjAwMjcxMyA2NzIuMDY1MzA3LDE2Mi41OTEwNjYgTDY3OC43MTIwNjcsMTY5LjI5NjQ1MyBMNjcyLjA4MTU5OCwxNzUuOTg1NDA1IEM2NzEuNDk4MzksMTc2LjU3Mzc1NyA2NzAuNTQ4NjUxLDE3Ni41Nzc5MjggNjY5Ljk2MDI5OCwxNzUuOTk0NzE5IEM2NjkuMzcxOTQ2LDE3NS40MTE1MSA2NjkuMzY3Nzc1LDE3NC40NjE3NzIgNjY5Ljk1MDk4NCwxNzMuODczNDE5IEw2NzQuNDg3OTMzLDE2OS4yOTY0NTMgTDY2OS45MzQ2OTMsMTY0LjcwMzA1MiBaIiBpZD0i5Y675ZCR566t5aS0Ij48L3BhdGg+CiAgICAgICAgPC9nPgogICAgPC9nPgo8L3N2Zz4=) no-repeat 50%;
+			background-size: cover
+		}
+
+		.money-activity-detail .money-head .getAndOut {
+			display: -ms-flexbox;
+			display: flex;
+			text-align: center;
+			font-size: 5.973px;
+			font-size: .37333333rem;
+			color: #333;
+			height: 18.773px;
+			height: 1.17333333rem;
+			line-height: 18.773px;
+			line-height: 1.17333333rem
+		}
+
+		.money-activity-detail .money-head .getAndOut .left, .money-activity-detail .money-head .getAndOut .right {
+			-ms-flex: 1;
+			flex: 1
+		}
+
+		.money-activity-detail .money-head .getAndOut span {
+			display: inline-block;
+			height: 100%
+		}
+
+		.money-activity-detail .money-head .getAndOut .head-actived {
+			position: relative;
+			color: #FD7564;
+		}
+
+		.money-activity-detail .money-head .getAndOut .head-actived:after {
+			content: "";
+			position: absolute;
+			bottom: 0;
+			left: 0;
+			width: 100%;
+			height: 1.706px;
+			height: .10666667rem;
+			background-color: #ff7728;
+			border-radius: .05333333rem
+		}
+
+		.money-activity-detail .detail {
+			height: 100%;
+			padding-top: 60.586px;
+			padding-top: 3.78666667rem;
+			box-sizing: border-box;
+			overflow: scroll
+		}
+
+		.money-activity-detail .detail ul {
+			padding-left: 6.4px;
+			padding-left: .4rem;
+			background-color: #fff
+		}
+
+		.money-activity-detail .detail li {
+			background: -webkit-linear-gradient(top, #ddd 50%, transparent 0) 100% 100%;
+			background-size: 100% 1px;
+			background-repeat: no-repeat;
+			background-color: #fff;
+			padding-right: 6.4px;
+			padding-right: .4rem;
+			padding-bottom: 6.826px;
+			padding-bottom: .42666667rem
+		}
+
+		.money-activity-detail .detail li .detail-top {
+			color: #333;
+			display: -ms-flexbox;
+			display: flex;
+			-ms-flex-pack: justify;
+			justify-content: space-between;
+			height: 16.64px;
+			height: 1.04rem;
+			line-height: 16.64px;
+			line-height: 1.04rem
+		}
+
+		.money-activity-detail .detail li .detail-top span:first-child {
+			font-family: PingFangSC-Medium;
+			font-size: 5.973px;
+			font-size: .37333333rem;
+			width: 85.333px;
+			width: 5.33333333rem;
+			overflow: hidden;
+			white-space: nowrap;
+			text-overflow: ellipsis
+		}
+
+		.money-activity-detail .detail li .detail-top span:nth-child(2) {
+			font-size: 8.533px;
+			font-size: .53333333rem;
+			font-family: DINAlternate-Bold
+		}
+
+		.money-activity-detail .detail li .detail-time {
+			font-size: 5.973px;
+			font-size: .37333333rem;
+			color: #999
+		}
+
+		.money-activity-detail .detail .mint-loadmore-bottom-custom {
+			text-align: center;
+			height: 50px;
+			line-height: 50px;
+			background-color: #f7f7f7
+		}
+
+		.money-activity-detail .detail .mint-loadmore-spinner {
+			display: inline-block;
+			margin-right: 5px;
+			vertical-align: middle
+		}
+
+		.money-activity-detail .go-top {
+			width: 15.786px;
+			width: .98666667rem;
+			height: 15.786px;
+			height: .98666667rem;
+			background: #fff;
+			border: 1px solid #666;
+			border-radius: 50%;
+			position: fixed;
+			right: 6.4px;
+			right: .4rem;
+			top: 192px;
+			top: 12rem;
+			opacity: .6
+		}
+
+		.money-activity-detail .go-top img {
+			display: block;
+			width: 6.826px;
+			width: .42666667rem;
+			height: 8.533px;
+			height: .53333333rem;
+			position: absolute;
+			top: 50%;
+			left: 50%;
+			transform: translate(-50%, -50%)
+		}
+
+		.money-activity-detail .monthNoDetail, .money-activity-detail .noDetail {
+			text-align: center;
+			color: #999;
+			font-family: PingFangSC-Regular
+		}
+
+		.money-activity-detail .monthNoDetail .img, .money-activity-detail .noDetail .img {
+			width: 68.266px;
+			width: 4.26666667rem;
+			height: 68.266px;
+			height: 4.26666667rem;
+			margin: 0 auto;
+			margin-top: 19.84px;
+			margin-top: 1.24rem;
+			margin-bottom: 11.733px;
+			margin-bottom: .73333333rem
+		}
+
+		.money-activity-detail .monthNoDetail .img img, .money-activity-detail .noDetail .img img {
+			width: 100%;
+			height: 100%;
+			display: block
+		}
+
+		.money-activity-detail .monthNoDetail .desc, .money-activity-detail .noDetail .desc {
+			font-size: 7.68px;
+			font-size: .48rem;
+			line-height: 7.68px;
+			line-height: .48rem;
+			margin-bottom: 5.12px;
+			margin-bottom: .32rem
+		}
+
+		.money-activity-detail .monthNoDetail .desc-two, .money-activity-detail .noDetail .desc-two {
+			font-size: 5.973px;
+			font-size: .37333333rem;
+			line-height: 5.973px;
+			line-height: .37333333rem
+		}
+		.mint-popup {
+			position: fixed;
+			background: #fff;
+			top: 50%;
+			left: 50%;
+			transform: translate3d(-50%, -50%, 0);
+			-webkit-backface-visibility: hidden;
+			backface-visibility: hidden;
+			transition: .2s ease-out
+		}
+		.mint-popup-bottom {
+			top: auto;
+			right: auto;
+			bottom: 0;
+			left: 50%;
+			transform: translate3d(-50%, 0, 0)
+		}
+		.mint-datetime {
+			width: 100%
+		}
+
+		.mint-datetime .picker-toolbar {
+			border-bottom: 1px solid #eaeaea
+		}
+
+		.mint-datetime-action {
+			display: inline-block;
+			width: 50%;
+			text-align: center;
+			line-height: 40px;
+			font-size: 16px;
+			color: #26a2ff
+		}
+
+		.mint-datetime-cancel {
+			float: left
+		}
+
+		.mint-datetime-confirm {
+			float: right
+		}
+		.mint-popup-bottom {
+			-webkit-transform: translate3d(-50%, 0, 0) !important
+		}
+		.picker {
+			overflow: hidden
+		}
+
+		.picker-toolbar {
+			height: 40px
+		}
+
+		.picker-items {
+			display: -ms-flexbox;
+			display: flex;
+			-ms-flex-pack: center;
+			justify-content: center;
+			padding: 0;
+			text-align: right;
+			font-size: 24px;
+			position: relative
+		}
+
+		.picker-center-highlight {
+			box-sizing: border-box;
+			position: absolute;
+			left: 0;
+			width: 100%;
+			top: 50%;
+			margin-top: -18px;
+			pointer-events: none
+		}
+
+		.picker-center-highlight:after, .picker-center-highlight:before {
+			content: "";
+			position: absolute;
+			height: 1px;
+			width: 100%;
+			background-color: #eaeaea;
+			display: block;
+			z-index: 15;
+			transform: scaleY(.5)
+		}
+
+		.picker-center-highlight:before {
+			left: 0;
+			top: 0;
+			bottom: auto;
+			right: auto
+		}
+
+		.picker-center-highlight:after {
+			left: 0;
+			bottom: 0;
+			right: auto;
+			top: auto
+		}
+
+		.picker-slot {
+			font-size: 18px;
+			overflow: hidden;
+			position: relative;
+			max-height: 100%
+		}
+
+		.picker-slot.picker-slot-left {
+			text-align: left
+		}
+
+		.picker-slot.picker-slot-center {
+			text-align: center
+		}
+
+		.picker-slot.picker-slot-right {
+			text-align: right
+		}
+
+		.picker-slot.picker-slot-divider {
+			color: #000;
+			display: -ms-flexbox;
+			display: flex;
+			-ms-flex-align: center;
+			align-items: center
+		}
+
+		.picker-slot-wrapper {
+			transition-duration: .3s;
+			transition-timing-function: ease-out;
+			-webkit-backface-visibility: hidden;
+			backface-visibility: hidden
+		}
+
+		.picker-slot-wrapper.dragging, .picker-slot-wrapper.dragging .picker-item {
+			transition-duration: 0s
+		}
+
+		.picker-item {
+			height: 36px;
+			line-height: 36px;
+			padding: 0 10px;
+			white-space: nowrap;
+			position: relative;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			color: #707274;
+			left: 0;
+			top: 0;
+			width: 100%;
+			box-sizing: border-box;
+			transition-duration: .3s;
+			-webkit-backface-visibility: hidden;
+			backface-visibility: hidden
+		}
+
+		.picker-slot-absolute .picker-item {
+			position: absolute
+		}
+
+		.picker-item.picker-item-far {
+			pointer-events: none
+		}
+
+		.picker-item.picker-selected {
+			color: #000;
+			transform: translateZ(0) rotateX(0)
+		}
+
+		.picker-3d .picker-items {
+			overflow: hidden;
+			perspective: 700px
+		}
+
+		.picker-3d .picker-item, .picker-3d .picker-slot, .picker-3d .picker-slot-wrapper {
+			transform-style: preserve-3d
+		}
+
+		.picker-3d .picker-slot {
+			overflow: visible
+		}
+
+		.picker-3d .picker-item {
+			transform-origin: center center;
+			-webkit-backface-visibility: hidden;
+			backface-visibility: hidden;
+			transition-timing-function: ease-out
+		}
+		.money-activity-detail .mint-datetime .picker-toolbar .mint-datetime-cancel {
+			text-align: left;
+			padding-left: 6.4px;
+			padding-left: .4rem
+		}
+
+		.money-activity-detail .mint-datetime .picker-toolbar .mint-datetime-confirm {
+			text-align: right;
+			padding-right: 6.4px;
+			padding-right: .4rem
+		}
+
+		.money-activity-detail .mint-datetime .mint-datetime-picker .picker-items .picker-slot:nth-child(3) {
+			display: none
+		}
+		.v-modal {
+			position: fixed;
+			left: 0;
+			top: 0;
+			width: 100%;
+			height: 100%;
+			opacity: .5;
+			background: #000;
+		}
+		.picker-slot {
+			font-size: 18px;
+			overflow: hidden;
+			position: relative;
+			max-height: 100%
+		}
+
+		.picker-slot.picker-slot-left {
+			text-align: left
+		}
+
+		.picker-slot.picker-slot-center {
+			text-align: center
+		}
+
+		.picker-slot.picker-slot-right {
+			text-align: right
+		}
+
+		.picker-slot.picker-slot-divider {
+			color: #000;
+			display: -ms-flexbox;
+			display: flex;
+			-ms-flex-align: center;
+			align-items: center
+		}
+
+		.picker-slot-wrapper {
+			transition-duration: .3s;
+			transition-timing-function: ease-out;
+			-webkit-backface-visibility: hidden;
+			backface-visibility: hidden
+		}
+
+		.picker-slot-wrapper.dragging, .picker-slot-wrapper.dragging .picker-item {
+			transition-duration: 0s
+		}
+		.picker-item {
+			height: 36px;
+			line-height: 36px;
+			padding: 0 10px;
+			white-space: nowrap;
+			position: relative;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			color: #707274;
+			left: 0;
+			top: 0;
+			width: 100%;
+			box-sizing: border-box;
+			transition-duration: .3s;
+			-webkit-backface-visibility: hidden;
+			backface-visibility: hidden
+		}
+
+		.picker-slot-absolute .picker-item {
+			position: absolute
+		}
+
+		.picker-item.picker-item-far {
+			pointer-events: none
+		}
+
+		.picker-item.picker-selected {
+			color: #000;
+			transform: translateZ(0) rotateX(0)
+		}
+
+		.picker-3d .picker-items {
+			overflow: hidden;
+			perspective: 700px
+		}
+
+		.picker-3d .picker-item, .picker-3d .picker-slot, .picker-3d .picker-slot-wrapper {
+			transform-style: preserve-3d
+		}
+
+		.picker-3d .picker-slot {
+			overflow: visible
+		}
+
+		.picker-3d .picker-item {
+			transform-origin: center center;
+			-webkit-backface-visibility: hidden;
+			backface-visibility: hidden;
+			transition-timing-function: ease-out
+		}
+
+		.order-li{
+			overflow: hidden;
+			height: 29.226px;
+			height: 1.82666667rem;
+			box-shadow: 0 4px 8px 0 hsla(0, 0%, 78%, .5);
+			background-color: #fff;
+			border-radius: .21333333rem;
+			margin-bottom: 6.4px;
+			margin-bottom: .4rem;
+			padding-top: 5.973px;
+			padding-top: .37333333rem
+		}
+	</style>
+	<style type="text/css">
+		.mint-spinner-fading-circle {
+			position: relative
+		}
+		.mint-spinner-fading-circle-circle {
+			width: 100%;
+			height: 100%;
+			top: 0;
+			left: 0;
+			position: absolute
+		}
+
+		.mint-spinner-fading-circle-circle:before {
+			content: " ";
+			display: block;
+			margin: 0 auto;
+			width: 15%;
+			height: 15%;
+			border-radius: 100%;
+			animation: mint-fading-circle 1.2s infinite ease-in-out both
+		}
+
+		.mint-spinner-fading-circle-circle.is-circle2 {
+			transform: rotate(30deg)
+		}
+
+		.mint-spinner-fading-circle-circle.is-circle2:before {
+			animation-delay: -1.1s
+		}
+
+		.mint-spinner-fading-circle-circle.is-circle3 {
+			transform: rotate(60deg)
+		}
+
+		.mint-spinner-fading-circle-circle.is-circle3:before {
+			animation-delay: -1s
+		}
+
+		.mint-spinner-fading-circle-circle.is-circle4 {
+			transform: rotate(90deg)
+		}
+
+		.mint-spinner-fading-circle-circle.is-circle4:before {
+			animation-delay: -.9s
+		}
+
+		.mint-spinner-fading-circle-circle.is-circle5 {
+			transform: rotate(120deg)
+		}
+
+		.mint-spinner-fading-circle-circle.is-circle5:before {
+			animation-delay: -.8s
+		}
+
+		.mint-spinner-fading-circle-circle.is-circle6 {
+			transform: rotate(150deg)
+		}
+
+		.mint-spinner-fading-circle-circle.is-circle6:before {
+			animation-delay: -.7s
+		}
+
+		.mint-spinner-fading-circle-circle.is-circle7 {
+			transform: rotate(180deg)
+		}
+
+		.mint-spinner-fading-circle-circle.is-circle7:before {
+			animation-delay: -.6s
+		}
+
+		.mint-spinner-fading-circle-circle.is-circle8 {
+			transform: rotate(210deg)
+		}
+
+		.mint-spinner-fading-circle-circle.is-circle8:before {
+			animation-delay: -.5s
+		}
+
+		.mint-spinner-fading-circle-circle.is-circle9 {
+			transform: rotate(240deg)
+		}
+
+		.mint-spinner-fading-circle-circle.is-circle9:before {
+			animation-delay: -.4s
+		}
+
+		.mint-spinner-fading-circle-circle.is-circle10 {
+			transform: rotate(270deg)
+		}
+
+		.mint-spinner-fading-circle-circle.is-circle10:before {
+			animation-delay: -.3s
+		}
+
+		.mint-spinner-fading-circle-circle.is-circle11 {
+			transform: rotate(300deg)
+		}
+
+		.mint-spinner-fading-circle-circle.is-circle11:before {
+			animation-delay: -.2s
+		}
+
+		.mint-spinner-fading-circle-circle.is-circle12 {
+			transform: rotate(330deg)
+		}
+
+		.mint-spinner-fading-circle-circle.is-circle12:before {
+			animation-delay: -.1s
+		}
+
+		@keyframes mint-fading-circle {
+			0%, 39%, to {
+				opacity: 0
+			}
+			40% {
+				opacity: 1
+			}
+		}
+	</style>
+	<style type="text/css">.mint-tab-container-item {
+		-ms-flex-negative: 0;
+		flex-shrink: 0;
+		width: 100%
+	}</style>
+	<style type="text/css">.mint-tab-container {
+		overflow: hidden;
+		position: relative
+	}
+
+	.mint-tab-container .swipe-transition {
+		transition: transform .15s ease-in-out
+	}
+
+	.mint-tab-container-wrap {
+		display: -ms-flexbox;
+		display: flex
+	}</style>
+	<style type="text/css">.mint-tab-item {
+		display: block;
+		padding: 7px 0;
+		-ms-flex: 1;
+		flex: 1;
+		text-decoration: none
+	}
+
+	.mint-tab-item-icon {
+		width: 24px;
+		height: 24px;
+		margin: 0 auto 5px
+	}
+
+	.mint-tab-item-icon:empty {
+		display: none
+	}
+
+	.mint-tab-item-icon > * {
+		display: block;
+		width: 100%;
+		height: 100%
+	}
+
+	.mint-tab-item-label {
+		color: inherit;
+		font-size: 12px;
+		line-height: 1
+	}</style>
+	<style type="text/css">.mint-navbar {
+		background-color: #fff;
+		display: -ms-flexbox;
+		display: flex;
+		text-align: center
+	}
+
+	.mint-navbar .mint-tab-item {
+		padding: 17px 0;
+		font-size: 15px
+	}
+
+	.mint-navbar .mint-tab-item:last-child {
+		border-right: 0
+	}
+
+	.mint-navbar .mint-tab-item.is-selected {
+		border-bottom: 3px solid #26a2ff;
+		color: #26a2ff;
+		margin-bottom: -3px
+	}
+
+	.mint-navbar.is-fixed {
+		top: 0;
+		right: 0;
+		left: 0;
+		position: fixed;
+		z-index: 1
+	}</style>
+	<style type="text/css">.scroll-wrapper {
+		width: 100%;
+		height: 100%;
+		overflow-y: scroll;
+		color: #333;
+		font-size: 5.973px;
+		font-size: .37333333rem
+	}
+
+	.btn-default {
+		background: #d0d0d0
+	}
+
+	.btn-active, .btn-default {
+		display: -ms-flexbox;
+		display: flex;
+		-ms-flex-pack: center;
+		justify-content: center;
+		-ms-flex-align: center;
+		align-items: center;
+		color: #fff;
+		width: 147.2px;
+		width: 9.2rem;
+		font-size: 6.826px;
+		font-size: .42666667rem;
+		height: 18.773px;
+		height: 1.17333333rem;
+		border-radius: .08rem
+	}
+
+	.btn-active {
+		background: #d0d0d0;
+		background: #f05a22
+	}
+
+	.btn-box {
+		width: 100%;
+		display: -ms-flexbox;
+		display: flex;
+		-ms-flex-pack: center;
+		justify-content: center;
+		-ms-flex-align: center;
+		align-items: center;
+		padding: 12.8px 0;
+		padding: .8rem 0
+	}
+
+	#app, body, html {
+		font-size: 5.973px;
+		font-size: .37333333rem;
+		height: 100%;
+		color: #333;
+		-webkit-user-select: none;
+		-moz-user-select: none;
+		-o-user-select: none;
+		-ms-user-select: none;
+		user-select: none
+	}
+
+	body, html, input, textarea {
+		font-family: PingFangSC-Regular, Helvetica, sans-serif
+	}
+
+	input, textarea {
+		background-color: #fff
+	}
+
+	input, li, ol, textarea, ul {
+		padding: 0;
+		border: 0;
+		margin: 0
+	}
+
+	.tc {
+		text-align: center
+	}
+
+	.tr {
+		text-align: right
+	}
+
+	.tl {
+		text-align: left
+	}
+
+	.c4b {
+		color: #4b4b4b
+	}
+
+	.c000 {
+		color: #000
+	}
+
+	.c333 {
+		color: #333
+	}
+
+	.c666 {
+		color: #666
+	}
+
+	.c999 {
+		color: #999
+	}
+
+	.cccc {
+		color: #ccc
+	}
+
+	.cddd {
+		color: #ddd
+	}
+
+	.c9b9b {
+		color: #9b9b9b
+	}
+
+	.cblue {
+		color: #3089f7
+	}
+
+	.cred {
+		color: red
+	}
+
+	.cora {
+		color: #faa800
+	}
+
+	.cbase {
+		color: #ff721f
+	}
+
+	.cfff {
+		color: #fff
+	}
+
+	.bfff {
+		background-color: #fff
+	}
+
+	.bbase {
+		background-color: #ff721f
+	}
+
+	.fl {
+		float: left
+	}
+
+	.fr {
+		float: right
+	}
+
+	.mt10 {
+		margin-top: 4.266px;
+		margin-top: .26666667rem
+	}
+
+	.ml15 {
+		margin-left: 6.4px;
+		margin-left: .4rem
+	}
+
+	.mr15 {
+		margin-right: 6.4px;
+		margin-right: .4rem
+	}
+
+	.mt15 {
+		margin-top: 6.4px;
+		margin-top: .4rem
+	}
+
+	.mb15 {
+		margin-bottom: 6.4px;
+		margin-bottom: .4rem
+	}
+
+	.pl15 {
+		padding-left: 6.4px;
+		padding-left: .4rem
+	}
+
+	.pr15 {
+		padding-right: 6.4px;
+		padding-right: .4rem
+	}
+
+	.pt15 {
+		padding-top: 6.4px;
+		padding-top: .4rem
+	}
+
+	.pb15 {
+		padding-bottom: 6.4px;
+		padding-bottom: .4rem
+	}
+
+	.mt30 {
+		margin-top: 12.8px;
+		margin-top: .8rem
+	}
+
+	.mb30 {
+		margin-bottom: 12.8px;
+		margin-bottom: .8rem
+	}
+
+	.fz12 {
+		font-size: 5.12px;
+		font-size: .32rem
+	}
+
+	.fz13 {
+		font-size: 5.546px;
+		font-size: .34666667rem
+	}
+
+	.fz14 {
+		font-size: 5.973px;
+		font-size: .37333333rem
+	}
+
+	.fz15 {
+		font-size: 6.4px;
+		font-size: .4rem
+	}
+
+	.fz16 {
+		font-size: 6.826px;
+		font-size: .42666667rem
+	}
+
+	.fz18 {
+		font-size: 7.68px;
+		font-size: .48rem
+	}
+
+	.fz20 {
+		font-size: 8.533px;
+		font-size: .53333333rem
+	}
+
+	.fz22 {
+		font-size: 9.386px;
+		font-size: .58666667rem
+	}
+
+	.fz24 {
+		font-size: 10.24px;
+		font-size: .64rem
+	}
+
+	.fz32 {
+		font-size: 13.653px;
+		font-size: .85333333rem
+	}
+
+	.fz36 {
+		font-size: 15.36px;
+		font-size: .96rem
+	}
+
+	.block {
+		display: block
+	}
+
+	b, dfn, em {
+		font-style: normal;
+		font-weight: 400
+	}
+
+	.font-DINAlternate {
+		font-family: DINAlternate-Bold, PingFangSC-Regular, Helvetica, sans-serif
+	}
+
+	.arr_r {
+		position: relative
+	}
+
+	.arr_r:after {
+		content: "";
+		position: absolute;
+		z-index: 80;
+		right: 6.4px;
+		right: .4rem;
+		top: 50%;
+		width: 6px;
+		height: 6px;
+		border: 1px solid #c7c7cc;
+		border-width: 2px 2px 0 0;
+		transform: translateY(-50%) rotate(45deg)
+	}
+
+	.shadow {
+		box-shadow: 0 8px 25px 0 #eaebec
+	}
+
+	.ellips {
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis
+	}
+
+	.ellips_line2, .ellips_line3 {
+		display: -webkit-box;
+		overflow: hidden
+	}
+
+	.ellips_line2 {
+		-webkit-line-clamp: 2
+	}
+
+	.ellips_line3 {
+		-webkit-line-clamp: 3
+	}
+
+	.to-check {
+		position: relative
+	}
+
+	.to-check.checked:before {
+		content: "";
+		position: absolute;
+		top: 50%;
+		right: 6.4px;
+		right: .4rem;
+		width: 6.4px;
+		width: .4rem;
+		height: 3.2px;
+		height: .2rem;
+		border: 2px solid #ff721f;
+		border-width: 0 0 2px 2px;
+		transform: translateY(-50%) rotate(-45deg)
+	}
+
+	.ui-page {
+		position: relative;
+		max-width: 256px;
+		max-width: 16rem;
+		min-height: 100%;
+		padding-top: 1px;
+		margin: -1px auto 0
+	}
+
+	.ui-page, .ui-page:after {
+		background-color: #f7f7f7
+	}
+
+	.ui-page:after {
+		content: "";
+		position: fixed;
+		top: 0;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		z-index: -1
+	}
+
+	button {
+		font-size: 6.4px;
+		font-size: .4rem;
+		border-radius: 1px;
+		background-color: #ff721f
+	}
+
+	button.disabled {
+		opacity: .4
+	}
+
+	.mebtn {
+		width: 100%;
+		padding: 0 6.4px;
+		padding: 0 .4rem
+	}
+
+	input::-webkit-input-placeholder {
+		color: #ccc
+	}
+
+	:-moz-placeholder, ::-moz-placeholder {
+		color: #ccc
+	}
+
+	:-ms-input-placeholder {
+		color: #ccc
+	}
+
+	[class*=mint-tab-container] {
+		visibility: visible;
+		position: static;
+		opacity: 1
+	}
+
+	.loading-txt {
+		width: 76.8px;
+		width: 4.8rem
+	}
+
+	.loading-txt em {
+		display: block;
+		margin: 4.266px auto;
+		margin: .26666667rem auto
+	}
+
+	.loading-txt .txt {
+		margin-bottom: 2.56px;
+		margin-bottom: .16rem
+	}
+
+	.v-input-clear {
+		position: absolute;
+		right: -4.266px;
+		right: -.26666667rem;
+		top: 50%;
+		display: none;
+		z-index: 9;
+		padding: 4.266px;
+		padding: .26666667rem;
+		background-color: #fff;
+		transform: translateY(-50%)
+	}
+
+	.v-input-clear.active {
+		display: block
+	}
+
+	.v-input-clear .icon-font {
+		display: block;
+		color: #ccc;
+		font-size: 7.68px;
+		font-size: .48rem
+	}
+
+	.popup-container .popup-title {
+		font-weight: 700
+	}
+
+	.popup-container .popup-btns .btn {
+		color: #ff721f
+	}
+
+	.flex {
+		display: -ms-flexbox;
+		display: flex
+	}
+
+	.flex .flex-li, .flex li {
+		-ms-flex: 1;
+		flex: 1
+	}
+
+	.i-warn-red {
+		display: inline-block;
+		width: 20px;
+		height: 20px;
+		background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAAAXNSR0IArs4c6QAAAkNJREFUSA29Vj1PVEEUvWdYA72dFkJCQkGhkJjQECpqTbQyWuhPcMFYUFjYyUfCbyDSYEJvZWhIiDEWmlCxFkBla8Tdfdcz897O7L7F2XkE3yS7e+fOOffMx92ZC0lo+vLOnAAPRWVRILdF9ZajAWf0ndJ3QN8+Nn98GRUOMYA2px6L6FsGm4nh/BhwLII1bJzseV/JuFRQV2amJLt4T7GFEj6xi0Mx40+wfnxSJgwJ6urkkmT6gVt1swyu1If8FINHeNf61M8bEHRiXfnIld3oB13dRlvGZLlf1Au6bdTfR6NXxiCQHU6CXH1KfCM6IbtSTNzvba/xYHtmKdto5BU2Wi/4eU7ua8//l2FjunzIAU6wyMa0BDH61cfGWLC98zJDF3IN6W0HUz+1dbCib2aP5FcH0rloptLc30tkD7o6PS/d9ud0okXyHF2rnFzzRrLOg5xc4RvyjejvFRg5lLeVYaIsViICW0yYOWy27nGl25W41DLubqzEMrse3pBge2fE4D3MFRYXcQQ3MNTQP76vjWB7Z8SgVvgfRnDXNgQot5RPTH3t3CbNaW161LJJc1CbILVs0uzXJkgt48oC91L/Z1lqWK0iS7GWLNfOQmajzx4ZINdw5LwGYVmQ0gzCzdTNgh3l4rBX54THkzWIpDzAmaxrc/Iu49sH+FlUxw66B5ixi+ZffNuvo8QI50FBV3uwBnGzKmZ05R+7slI9Y2MNCFqHE2UNQivtTC1pqJFr65hSxWZhA1ta5tVWCA8JX2Op/xc+6NDNayMwOQAAAABJRU5ErkJggg==) no-repeat;
+		background-size: 20px 20px
+	}
+
+	.i-checked, .i-unchecked {
+		position: relative;
+		display: inline-block;
+		width: 16px;
+		height: 16px;
+		background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+Cjxzdmcgd2lkdGg9IjMycHgiIGhlaWdodD0iMzJweCIgdmlld0JveD0iMCAwIDMyIDMyIiB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPgogICAgPCEtLSBHZW5lcmF0b3I6IFNrZXRjaCA1MC4yICg1NTA0NykgLSBodHRwOi8vd3d3LmJvaGVtaWFuY29kaW5nLmNvbS9za2V0Y2ggLS0+CiAgICA8dGl0bGU+5Y2P6K6u5Yu+L+WLvjwvdGl0bGU+CiAgICA8ZGVzYz5DcmVhdGVkIHdpdGggU2tldGNoLjwvZGVzYz4KICAgIDxkZWZzPjwvZGVmcz4KICAgIDxnIGlkPSLljY/orq7li74v5Yu+IiBzdHJva2U9Im5vbmUiIHN0cm9rZS13aWR0aD0iMSIgZmlsbD0ibm9uZSIgZmlsbC1ydWxlPSJldmVub2RkIj4KICAgICAgICA8cGF0aCBkPSJNMjguNDQ0NDQ0NCwwIEwzLjU1NTU1NTU2LDAgQzEuNiwwIDAsMS42IDAsMy41NTU1NTU1NiBMMCwyOC40NDQ0NDQ0IEMwLDMwLjQgMS42LDMyIDMuNTU1NTU1NTYsMzIgTDI4LjQ0NDQ0NDQsMzIgQzMwLjQsMzIgMzIsMzAuNCAzMiwyOC40NDQ0NDQ0IEwzMiwzLjU1NTU1NTU2IEMzMiwxLjYgMzAuNCwwIDI4LjQ0NDQ0NDQsMCBMMjguNDQ0NDQ0NCwwIFogTTEyLjQ0NDQ0NDQsMjQuODg4ODg4OSBMMy41NTU1NTU1NiwxNi4zNDE4ODAzIEw2LjA0NDQ0NDQ0LDEzLjk0ODcxNzkgTDEyLjQ0NDQ0NDQsMjAuMTAyNTY0MSBMMjUuOTU1NTU1Niw3LjExMTExMTExIEwyOC40NDQ0NDQ0LDkuNTA0MjczNSBMMTIuNDQ0NDQ0NCwyNC44ODg4ODg5IEwxMi40NDQ0NDQ0LDI0Ljg4ODg4ODkgWiIgaWQ9IuWLvuS4iiIgZmlsbD0iI0ZGNzIxRiI+PC9wYXRoPgogICAgPC9nPgo8L3N2Zz4=) no-repeat;
+		background-size: 16px auto
+	}
+
+	.i-unchecked {
+		background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+Cjxzdmcgd2lkdGg9IjMycHgiIGhlaWdodD0iMzJweCIgdmlld0JveD0iMCAwIDMyIDMyIiB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPgogICAgPCEtLSBHZW5lcmF0b3I6IFNrZXRjaCA1MC4yICg1NTA0NykgLSBodHRwOi8vd3d3LmJvaGVtaWFuY29kaW5nLmNvbS9za2V0Y2ggLS0+CiAgICA8dGl0bGU+5Y2P6K6u5Yu+L+acquWLvjwvdGl0bGU+CiAgICA8ZGVzYz5DcmVhdGVkIHdpdGggU2tldGNoLjwvZGVzYz4KICAgIDxkZWZzPjwvZGVmcz4KICAgIDxnIGlkPSLljY/orq7li74v5pyq5Yu+IiBzdHJva2U9Im5vbmUiIHN0cm9rZS13aWR0aD0iMSIgZmlsbD0ibm9uZSIgZmlsbC1ydWxlPSJldmVub2RkIiBmaWxsLW9wYWNpdHk9IjAuMyI+CiAgICAgICAgPHBhdGggZD0iTTI4LjQ0NDQ0NDQsMCBMMy41NTU1NTU1NiwwIEMxLjYsMCAwLDEuNiAwLDMuNTU1NTU1NTYgTDAsMjguNDQ0NDQ0NCBDMCwzMC40IDEuNiwzMiAzLjU1NTU1NTU2LDMyIEwyOC40NDQ0NDQ0LDMyIEMzMC40LDMyIDMyLDMwLjQgMzIsMjguNDQ0NDQ0NCBMMzIsMy41NTU1NTU1NiBDMzIsMS42IDMwLjQsMCAyOC40NDQ0NDQ0LDAgTDI4LjQ0NDQ0NDQsMCBaIE0xMi40NDQ0NDQ0LDI0Ljg4ODg4ODkgTDMuNTU1NTU1NTYsMTYuMzQxODgwMyBMNi4wNDQ0NDQ0NCwxMy45NDg3MTc5IEwxMi40NDQ0NDQ0LDIwLjEwMjU2NDEgTDI1Ljk1NTU1NTYsNy4xMTExMTExMSBMMjguNDQ0NDQ0NCw5LjUwNDI3MzUgTDEyLjQ0NDQ0NDQsMjQuODg4ODg4OSBMMTIuNDQ0NDQ0NCwyNC44ODg4ODg5IFoiIGlkPSLmsqHli77kuIoiIGZpbGw9IiNGRjcyMUYiPjwvcGF0aD4KICAgIDwvZz4KPC9zdmc+)
+	}
+
+	.model-container .key-body {
+		padding-bottom: 1.493px;
+		padding-bottom: .09333333rem;
+		background-color: #d2d5db
+	}
+
+	.model-container .key-body ul.number li {
+		height: 14.933px;
+		height: .93333333rem;
+		line-height: 14.933px;
+		line-height: .93333333rem;
+		padding: 3.626px 0;
+		padding: .22666667rem 0;
+		width: 31%;
+		margin: 0 1.7% 1.7% 0;
+		border-radius: 5px;
+		background-color: #fff;
+		box-shadow: 0 1px 0 0 #898a8d
+	}
+
+	.model-container .key-body ul.number li:nth-child(3n-2) {
+		margin-left: 1.7%
+	}
+
+	.model-container .key-body ul.number li:before {
+		content: none
+	}
+
+	.model-container .key-body ul.number li.key-back, .model-container .key-body ul.number li.key-null {
+		background-color: #d2d5db;
+		box-shadow: none
+	}
+
+	.model-container .key-body ul.number li.key-back:active {
+		opacity: .5
+	}
+
+	.freeMask {
+		background-color: transparent
+	}
+
+	.vx-header + .scroll-wrapper {
+		top: 0
+	}
+
+	@keyframes lighter {
+		0% {
+			background-color: #000
+		}
+		50% {
+			background-color: #000
+		}
+		51% {
+			background-color: transparent
+		}
+		to {
+			background-color: transparent
+		}
+	}
+
+	@keyframes rotater {
+		0% {
+			-webkit-transform: rotate(0)
+		}
+		to {
+			-webkit-transform: rotate(1turn)
+		}
+	}
+
+	.fixedBody, .windowbox {
+		position: fixed;
+		width: 100%;
+		overflow: hidden
+	}
+
+	.windowbox {
+		height: 100%;
+		left: 0;
+		top: 0;
+		z-index: 9999
+	}
+
+	.windowbox .popup-body {
+		height: 85.333px;
+		height: 5.33333333rem;
+		overflow-y: auto
+	}
+
+	.windowbox .rewardHeight {
+		text-align: left !important;
+		overflow-y: auto
+	}
+
+	.index-point {
+		width: 100%;
+		height: 100%;
+		overflow: hidden;
+		position: fixed;
+		left: 0;
+		top: 0;
+		z-index: 9999;
+		background: rgba(0, 0, 0, .76)
+	}
+
+	.index-point img {
+		width: 157.866px;
+		width: 9.86666667rem;
+		height: 96.64px;
+		height: 6.04rem;
+		display: block;
+		margin: 0 auto;
+		margin-bottom: 61.226px;
+		margin-bottom: 3.82666667rem;
+	}
+	img{
+		border-radius: 10px 10px 0 0;
+	}
+
+	.index-point .index-btn {
+		width: 66.986px;
+		width: 4.18666667rem;
+		height: 18.773px;
+		height: 1.17333333rem;
+		line-height: 18.773px;
+		line-height: 1.17333333rem;
+		text-align: center;
+		color: #fff;
+		margin: 0 auto;
+		border: 2px solid #fff;
+		box-shadow: 0 8px 25px 0 rgba(0, 0, 0, .5);
+		border-radius: .58666667rem
+	}
+
+	.dialogHeight {
+		height: 85.333px;
+		height: 5.33333333rem;
+		overflow-y: auto
+	}
+
+	.money-card {
+		background-color: #fff;
+		padding: 6.4px;
+		padding: .4rem;
+		padding-top: 5.546px;
+		padding-top: .34666667rem;
+		padding-bottom: 0;
+		box-sizing: border-box
+	}
+
+	.money-card .card {
+		width: 100%;
+		height: 48.64px;
+		height: 3.04rem;
+		padding-top: 7.68px;
+		padding-top: .48rem;
+		background-image: linear-gradient(-180deg, #fca195, #ef5151);
+		border-radius: 8px 8px 0 0;
+		color: #fff;
+		box-sizing: border-box
+	}
+
+	.money-card .card .money-title {
+		font-size: .32rem;
+		line-height: .32rem;
+		padding-left: .6rem;
+		padding-right: .4rem;
+		margin-bottom: .16rem;
+		display: -ms-flexbox;
+		display: flex;
+		-ms-flex-pack: justify;
+		justify-content: space-between
+	}
+
+	.money-card .card .money-title .question {
+		width: 6.826px;
+		width: .42666667rem;
+		height: 6.826px;
+		height: .42666667rem
+	}
+
+	.money-card .card .money-title .question img {
+		width: 100%;
+		height: 100%;
+		display: inline-block
+	}
+
+	.money-card .card .money-detail {
+		height: 13.653px;
+		height: .85333333rem;
+		display: -ms-flexbox;
+		display: flex;
+		-ms-flex-pack: start;
+		justify-content: flex-start;
+		-ms-flex-align: center;
+		align-items: center
+	}
+
+	.money-card .card .money-detail .money {
+		font-size: .65333333rem;
+		height: 13.653px;
+		height: .85333333rem;
+		line-height: 13.653px;
+		line-height: .85333333rem;
+		padding-left: 12.8px;
+		padding-left: .6rem;
+		font-family: DINAlternate-Bold;
+		display: inline-block
+	}
+
+	.money-card .card .money-detail .money-desc {
+		font-family: PingFangSC-Medium;
+		display: inline-block;
+		height: 9.386px;
+		height: .58666667rem;
+		line-height: 9.386px;
+		line-height: .58666667rem;
+		padding: 4.48px;
+		padding: .28rem;
+		margin-left: 6.4px;
+		margin-left: .4rem;
+		border-radius: .32666667rem;
+		padding-top: 0;
+		padding-bottom: 0;
+		font-size: 4.693px;
+		font-size: .29333333rem;
+		background-color: #fd4444;
+		opacity: .99;
+		position: relative;
+		padding-top: 2px;
+	}
+
+	.money-card .card .money-detail .money-desc:after {
+		content: "";
+		position: absolute;
+		top: .853px;
+		top: .05333333rem;
+		left: -5.546px;
+		left: -.34666667rem;
+		border: 4.053px;
+		border: .25333333rem;
+		border-style: solid;
+		border-color: #fd4444;
+		border-left-color: transparent;
+		border-top-color: transparent;
+		border-bottom-color: transparent
+	}
+
+	.money-card .card .money-active {
+		display: -ms-flexbox;
+		display: flex;
+		line-height: 12.8px;
+		line-height: .8rem;
+		height: 12.8px;
+		height: .8rem;
+		margin-top: 4.266px;
+		margin-top: .26666667rem
+	}
+
+	.money-card .card .money-active .left, .money-card .card .money-active .right {
+		-ms-flex: 1;
+		flex: 1;
+		text-align: center;
+		font-family: PingFangSC-Medium;
+		line-height: 12.8px;
+		line-height: .8rem;
+		height: 12.8px;
+		height: .8rem;
+		position: relative
+	}
+
+	.money-card .card .money-active .left img, .money-card .card .money-active .right img {
+		height: 5.546px;
+		height: .34666667rem;
+		width: 5.546px;
+		width: .34666667rem;
+		top: .426px;
+		top: .02666667rem;
+		left: -1.28px;
+		left: -.08rem;
+		position: relative
+	}
+
+	.money-card .card .money-active .left:after {
+		content: "";
+		position: absolute;
+		width: 1px;
+		height: 6.826px;
+		height: .42666667rem;
+		background-color: #fff;
+		opacity: .2;
+		right: 0;
+		top: 50%;
+		transform: translateY(-50%)
+	}
+
+	.boxshadow {
+		height: 8.533px;
+		height: .53333333rem;
+		width: 100%;
+		box-shadow: 2px -13px 13px rgba(0, 0, 0, .1)
+	}
+
+	.activity-index-page, .boxshadow {
+		background-color: #fff
+	}
+
+	.activity-index-page .scroll-wrapper-activity {
+		height: auto
+	}
+
+	.activity-index-page .rewardMessage {
+		text-align: left
+	}
+
+	.activity-index-page .rewardMessage ul {
+		margin-left: 8.533px;
+		margin-left: .53333333rem
+	}
+
+	.activity-index-page .rewardMessage ul li {
+		list-style: disc
+	}
+
+	.activity-tab-view {
+		height: 25.6px !important;
+		height: 1.6rem !important
+	}
+
+	.activity-tab-view .mint-navbar {
+		width: 100%;
+		display: block;
+		text-align: left;
+		padding-left: 6.4px;
+		padding-left: .4rem
+	}
+
+	.activity-tab-view .mint-tab-item {
+		position: relative;
+		display: inline-block;
+		margin-right: 6.4px;
+		margin-right: .4rem
+	}
+
+	.activity-tab-view .mint-tab-item:after {
+		content: "";
+		position: absolute;
+		bottom: 0;
+		left: 50%;
+		width: 23.04px;
+		width: 1.44rem;
+		height: 1.706px;
+		height: .10666667rem;
+		border-radius: .05333333rem;
+		background-color: transparent;
+		transform: translateX(-50%)
+	}
+
+	.activity-tab-view .mint-tab-item-label {
+		font-size: 5.973px;
+		font-size: .37333333rem;
+		color: #666
+	}
+
+	.activity-tab-view .mint-navbar .mint-tab-item.is-selected {
+		border-bottom: 0 none
+	}
+
+	.activity-tab-view .mint-navbar .mint-tab-item.is-selected:after {
+		background-color: #FD7564
+	}
+
+	.activity-tab-view .mint-navbar .mint-tab-item.is-selected .mint-tab-item-label {
+		color: #000;
+		font-size: 7.68px;
+		font-size: .48rem
+	}
+
+	.activity-tab-view-old {
+		height: 21.333px;
+		height: 1.33333333rem
+	}
+
+	.activity-tab-view-old .mint-navbar {
+		position: fixed;
+		top: 0;
+		left: 0;
+		width: 100%;
+		z-index: 9999
+	}
+
+	.activity-tab-view-old .mint-tab-item {
+		position: relative
+	}
+
+	.activity-tab-view-old .mint-tab-item:after {
+		content: "";
+		position: absolute;
+		bottom: 3px;
+		left: 50%;
+		width: 11.946px;
+		width: .74666667rem;
+		height: 4px;
+		border-radius: 10px;
+		background-color: transparent;
+		transform: translateX(-50%)
+	}
+
+	.activity-tab-view-old .mint-tab-item-label {
+		font-size: 5.973px;
+		font-size: .37333333rem
+	}
+
+	.activity-tab-view-old .mint-navbar .mint-tab-item.is-selected {
+		color: #ff721f;
+		border-bottom: 0 none
+	}
+
+	.activity-tab-view-old .mint-navbar .mint-tab-item.is-selected:after {
+		background-color: #ff721f
+	}
+	.activity-cont-view{
+		margin-top: 5.2rem;
+	}
+	.activity-cont-view [class*=-container] {
+		visibility: visible;
+		opacity: 1;
+		position: static
+	}
+
+	.activity ~ .activity {
+		margin-top: 4.266px;
+		margin-top: .26666667rem
+	}
+	.activity{
+		margin: 0px 15px;
+	}
+	.add-scroll {
+		overflow-y: scroll
+	}
+
+	.activity-title {
+		color: #666;
+		font-size: 5.973px;
+		font-size: .37333333rem;
+		padding: 6.4px 0;
+		padding: .4rem 0
+	}
+
+	.activity-list .bottomShadow {
+		box-shadow: 0 0 10px rgba(0, 0, 0, .1)
+	}
+
+	.activity-list .start-activity-item {
+		position: relative;
+		background-color: #fff;
+		border-radius: 8px
+	}
+
+	.activity-list .start-activity-item .activity-name {
+		width: 92.586px;
+		width: 5.78666667rem;
+		font-size: 6.826px;
+		font-size: .42666667rem;
+		font-weight: 700
+	}
+
+	div.activity-name{
+		position: absolute;
+		top: 25%;
+		left: .5rem;
+		color: #fff;
+		font-family: PingFangSC-Medium, sans-serif;
+		font-size: .45rem;
+	}
+	div.activity-title{
+		position: absolute;
+		top: 35%;
+		left: .5rem;
+		color: #fff;
+		font-family: PingFangSC-Light, sans-serif;
+		font-size: .3rem;
+	}
+
+	.activity-list .start-activity-item .activity-name .integral {
+		font-weight: 400;
+		line-height: 7.68px;
+		line-height: .48rem
+	}
+
+	.activity-list .start-activity-item .activity-name .activity-amount {
+		position: absolute;
+		right: 0
+	}
+
+	.activity-list .start-activity-item .activity-other-name {
+		color: #fff;
+		font-size: 5.12px;
+		font-size: .32rem;
+		line-height: 7.04px;
+		line-height: .44rem;
+		margin-top: 3.413px;
+		margin-top: .21333333rem
+	}
+
+	.activity-list .start-activity-item .activity-time {
+		color: #999;
+		font-size: 5.12px;
+		font-size: .32rem;
+		line-height: 14.506px;
+		line-height: .90666667rem;
+		padding-left: 6.4px;
+		padding-left: .3rem;
+		font-family: PingFangSC-Regular
+	}
+
+	.activity-list .start-activity-item .c999 {
+		color: #999
+	}
+
+	.activity-list .start-activity-item .cfff {
+		color: #fff
+	}
+
+	.activity-list .start-activity-item .icon-won {
+		height: 29.866px;
+		height: 1.86666667rem;
+		width: 29.866px;
+		width: 1.86666667rem;
+		top: 6.4px;
+		top: .4rem;
+		right: -12.8px;
+		right: -.8rem;
+		position: absolute;
+		transform: translateY(-50%)
+	}
+
+	div.polaroid {
+		box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.2), 0 1px 2px 0 rgba(0, 0, 0, 0.19);
+	}
+
+	.activity-list .start-activity-item .icon-won img {
+		display: block;
+		width: 100%;
+		height: auto
+	}
+
+	.activity-list .start-activity-item .won-txt {
+		padding-top: 4.266px;
+		padding-top: .26666667rem
+	}
+
+	.activity-list .start-activity-item .item-box {
+		position: absolute;
+		left: 6.4px;
+		left: .4rem;
+		top: 10.666px;
+		top: .66666667rem;
+		z-index: 11
+	}
+
+	.activity-list .start-activity-item .bg-icon {
+		width: 100%;
+		height: auto;
+		display: block
+	}
+
+	.activity-list .add-card {
+		margin-top: 6.4px;
+		margin-top: .4rem;
+		margin-bottom: 6.4px;
+		margin-bottom: .4rem;
+		border: none;
+		border-radius: 10px;
+	}
+
+	.activity-list .add-border {
+		background: -webkit-linear-gradient(top, #ddd 50%, transparent 0) 100% 100%;
+		background-size: 100% 1px;
+		background-repeat: no-repeat
+	}
+
+	.activity-list .add-border:last-child {
+		background-image: none
+	}
+
+	.activity-list .page-infinite-loading {
+		text-align: center;
+		height: 10.666px;
+		height: .66666667rem;
+		line-height: 10.666px;
+		line-height: .66666667rem
+	}
+
+	.no-more {
+		text-align: center;
+		color: #666;
+		font-family: PingFangSC-Regular;
+		font-size: 4.693px;
+		font-size: .29333333rem;
+		line-height: 4.693px;
+		line-height: .29333333rem;
+		padding: 8.533px;
+		padding: .53333333rem
+	}
+	</style>
+	<style type="text/css">
+	.mint-popup-bottom {
+		-webkit-transform: translate3d(-50%, 0, 0) !important
+	}
+
+	.mint-indicator-wrapper {
+		-webkit-transform: translate(-50%, -50%);
+		z-index: 999
+	}
+
+	.no-result-wrap {
+		margin: 80px 0
+	}
+
+	.no-result-wrap p {
+		font-size: 6.4px;
+		font-size: .4rem;
+		color: #999;
+		margin-bottom: 6.4px;
+		margin-bottom: .4rem
+	}
+
+	.no-result-wrap .fz30 {
+		font-size: 8.533px;
+		font-size: .53333333rem
+	}
+
+	.no-result-wrap .no-result {
+		background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyB3aWR0aD0iMzIwcHgiIGhlaWdodD0iMzIwcHgiIHZpZXdCb3g9IjAgMCAzMjAgMzIwIiB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPgogICAgPCEtLSBHZW5lcmF0b3I6IFNrZXRjaCA0OC4yICg0NzMyNykgLSBodHRwOi8vd3d3LmJvaGVtaWFuY29kaW5nLmNvbS9za2V0Y2ggLS0+CiAgICA8dGl0bGU+54q25oCB5Zu+5qCHL+epuuiusOW9lTwvdGl0bGU+CiAgICA8ZGVzYz5DcmVhdGVkIHdpdGggU2tldGNoLjwvZGVzYz4KICAgIDxkZWZzPjwvZGVmcz4KICAgIDxnIGlkPSJTeW1ib2xzIiBzdHJva2U9Im5vbmUiIHN0cm9rZS13aWR0aD0iMSIgZmlsbD0ibm9uZSIgZmlsbC1ydWxlPSJldmVub2RkIj4KICAgICAgICA8ZyBpZD0i54q25oCB5Zu+5qCHL+epuuiusOW9lSI+CiAgICAgICAgICAgIDxyZWN0IGlkPSJSZWN0YW5nbGUiIHg9IjAiIHk9IjAiIHdpZHRoPSIzMjAiIGhlaWdodD0iMzIwIj48L3JlY3Q+CiAgICAgICAgICAgIDxwYXRoIGQ9Ik0xODcuOTkzLDQ4LjUyMjIgTDIyMy42MjYsNDguNTIyMiBMMjIzLjY0MiwxOTkuMDA2MiBMOTYsMTk5LjAwNjIgTDk2LDQ4LjUyMjIgTDEzMS42MzMsNDguNTIyMiBMMTMxLjYzMyw2MS44NTYyIEwxMDkuMzM1LDYxLjg1NjIgTDEwOS4zMzUsMTg1LjY3MjIgTDIxMC4yOTEsMTg1LjY3MjIgTDIxMC4yOTEsNjEuODU2MiBMMTg3Ljk5Myw2MS44NTYyIEwxODcuOTkzLDQ4LjUyMjIgWiBNMTMwLjkxNDQsMTAyLjg5MyBMMTMwLjkxNDQsODkuNTU5IEwxODcuNDI3NCw4OS41NTkgTDE4Ny40Mjc0LDEwMi44OTMgTDEzMC45MTQ0LDEwMi44OTMgWiBNMTMwLjkxNDQsMTI4LjU2IEwxMzAuOTE0NCwxMTUuMjI2IEwxODcuNDI3NCwxMTUuMjI2IEwxODcuNDI3NCwxMjguNTYgTDEzMC45MTQ0LDEyOC41NiBaIE0xMzAuOTE0NCwxNTQuMjI2IEwxMzAuOTE0NCwxNDAuODkyIEwxODcuNDI3NCwxNDAuODkyIEwxODcuNDI3NCwxNTQuMjI2IEwxMzAuOTE0NCwxNTQuMjI2IFogTTE0MS43MTY0LDYxLjk1NCBMMTQxLjcxNjQsNDEgTDE3Ny45MDg0LDQxIEwxNzcuOTA4NCw2MS45NTQgTDE0MS43MTY0LDYxLjk1NCBaIE0xMzUuNTg0NCwyNDUuNzAxIEwxMzUuNTg0NCwyMTMuMDAzIEwxNDMuOTk1NCwyMTMuMDAzIEwxNDMuOTk1NCwyNDUuNzAxIEwxMzUuNTg0NCwyNDUuNzAxIFogTTEzNS41ODQ0LDI3MS4xODggTDEzNS41ODQ0LDI1MC41MTEgTDE0My45OTU0LDI1MC41MTEgTDE0My45OTU0LDI3MS4xODggTDEzNS41ODQ0LDI3MS4xODggWiBNMTYxLjQxODQsMjM3Ljg2NSBMMTYxLjQxODQsMjEwLjExOCBMMTY5LjgyOTQsMjEwLjExOCBMMTY5LjgyOTQsMjM3Ljg2NSBMMTYxLjQxODQsMjM3Ljg2NSBaIE0yMDIuODYzNCwyNDAuMzQ3IEwyMDIuODYzNCwyMTcuMjE3IEwyMTEuMjc0NCwyMTcuMjE3IEwyMTEuMjc0NCwyNDAuMzQ3IEwyMDIuODYzNCwyNDAuMzQ3IFogTTE2MS40MTg0LDI1My45MDggTDE2MS40MTg0LDI0NS4xODkgTDE2OS44Mjk0LDI0NS4xODkgTDE2OS44Mjk0LDI1My45MDggTDE2MS40MTg0LDI1My45MDggWiBNMTgyLjY0MzQsMjc4LjI5NCBMMTgyLjY0MzQsMjQ4Ljc4MiBMMTkxLjA1NDQsMjQ4Ljc4MiBMMTkxLjA1NDQsMjc4LjI5NCBMMTgyLjY0MzQsMjc4LjI5NCBaIE0xODIuNjQzNCwyNDIuOTYgTDE4Mi42NDM0LDIyNi4wNjggTDE5MS4wNTQ0LDIyNi4wNjggTDE5MS4wNTQ0LDI0Mi45NiBMMTgyLjY0MzQsMjQyLjk2IFogTTExMy45NTc0LDI1Ni42MDkgTDExMy45NTc0LDIxNi4zNjkgTDEyMi4zNjg0LDIxNi4zNjkgTDEyMi4zNjg0LDI1Ni42MDkgTDExMy45NTc0LDI1Ni42MDkgWiIgaWQ9IkNvbWJpbmVkLVNoYXBlIiBmaWxsPSIjQ0NDQ0NDIj48L3BhdGg+CiAgICAgICAgPC9nPgogICAgPC9nPgo8L3N2Zz4=) no-repeat 50%;
+		background-size: 160px auto
+	}
+
+	.no-result-wrap .no-result, .noresultMessage .no-result {
+		margin-bottom: 8.533px;
+		margin-bottom: .53333333rem;
+		width: 78px;
+		height: 140px;
+		margin: 30px auto 20px
+	}
+	.head{
+		position: fixed;
+		top: 0;
+		z-index: 1;
+		width: 100%;
+	}
+	.noresultMessage .no-result {
+		background: url(https://p1.yqbimg.net/h5/v/manager/static/noResultMessCenter-17d3fc.png) no-repeat 50%;
+		background-size: 160px auto
+	}</style>
+	<style type="text/css" title="fading circle style">.circle-color-29 > div::before {
+		background-color: #ccc;
+	}</style>
+	<link rel="stylesheet" href="${resourcePath}/css/h5.css">
+	<link rel="stylesheet" href="${resourcePath}/css/h5-common.css">
+
+</head>
+
+<body>
+	<div id="app">
+		<div class="ui-page ui-page activity-index-page">
+			<div class="head">
+				<div class="money-card">
+					<div class="card">
+						<div class="money-title"><span>积分余额</span>
+							<div class="question"><img src="https://p1.yqbimg.net/h5/v/manager/static/help-7b90c7.svg" alt="">
+							</div>
+						</div>
+						<div class="money-detail">
+							<div class="money"><fmt:formatNumber type="number" value="${marketAmtCount}" pattern="0.00" maxFractionDigits="2"/></div>
+							<div class="money-desc">可使用<fmt:formatNumber type="number" value="${useAmt}" pattern="0.00" maxFractionDigits="2"/>积分</div>
+						</div>
+						<div class="money-active">
+							<div class="left" name="toHref" index="1">
+								<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAMAAADXqc3KAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAABdUExURf///////////////////////////0dwTP////////////////////////////////////////////////////////////////////////////////////////////Rqj9cAAAAfdFJOU5k8hD8afEYAXB5PlZIDeytiJVkUgAl2jGiJZiI2QT1yUnOnAAAA0ElEQVR42sWRyY6DMBAFa5zYJl6IzRog4f8/c2gw0kTJferypK7Dc7exQjtPXq/WrtpPc2uFXSwBYZ4RQj5FVARnBoDBuICKRSxw3+IBjy3usBTxhF4mh+/hWUQ+Jje4HT6fHRPqeoqrYjo64ppGQNUddLUCxrRGS9/xha4ngUqVIK+qhKQgMdJYoXQcNIwodI6nWKwQs0bx4isvrAl8EIzs4fDmZ8OBkzQeZ0U06PfymmoX1X8IXYTBm8uGAydpPGYXbfjYry1/Pnj+4Ac52S+KQg78k0vOoQAAAABJRU5ErkJggg=="
+									 alt="">兑换商品
+							</div>
+<%--							<div class="left" name="toHref" index="2">--%>
+<%--								<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAMAAADXqc3KAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAABLUExURf///////////////////////////0dwTP///////////////////////////////////////////////////////////////////zU9RnsAAAAZdFJOU5lElYNtDUEAkhAchl50Ni9VU4p8JwhmARUOXXxQAAAA5ElEQVR42nWSyRKEIAxEH4IYBNxn+f8vHSQuNQf7QJE0lU460CmCd1bEOh+OBJpOXEjhJkYB8mzMnAEZT8JDM7VaoZ0a8EqMEPvuQh9h3IkgxLYzcdizQzRdG5FQiERT3tt69g22nqkjwFSeGrCvlwVTggkCHnbdj4OUwH32DsDjyNrOArBocxmHZS63zWUlsttKOGORWnXlwloV5SD8ItJAI7J4JWopxQB1Fi11iG9v51ZYnXtvKq7t/mtouzqgEQ6I0QFPS24NteQy8SZOE2/bv/A9bf9fVAjXop5X+/wZHr/PD2WeDf2Pd3qnAAAAAElFTkSuQmCC"--%>
+<%--									 alt="">申请提现--%>
+<%--							</div>--%>
+							<div class="right" name="toHref" index="3">
+								<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAZCAMAAAACPC7cAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAA8UExURf///////////////////////////0dwTP///////////////////////////////////////////////3ypOu0AAAAUdFJOU5l9RmhRFAoANzUskY0bYyIER3KIC0WzTwAAAIRJREFUeNqlkkkOwyAQBDtmFgx4wfn/X4OQhTMkWJFSxzqUBjVQdgmG5FjBER9EhkOcZsMUi0zI2pGLBHyvPYCqQxZVycFqBpzqCmxGL8DxRetMXCLkbaTxm+ZQ2fpLTshoeZ7ad22p7P9csq+PxrG8P/6CroinRpab9mCdwZaD5Qf/5AWhhwr5hUPaBAAAAABJRU5ErkJggg=="
+									 alt="">查看明细
+							</div>
+						</div>
+					</div>
+				</div>
+				<div class="boxshadow"></div>
+				<div class="activity-tab-view">
+					<div class="mint-navbar" style="left: 0px; right: 0px; top: 0px; z-index: 30;"><a
+							class="mint-tab-item is-selected">
+						<div class="mint-tab-item-icon"></div>
+						<div class="mint-tab-item-label">热门活动</div>
+					</a> <a class="mint-tab-item">
+						<div class="mint-tab-item-icon"></div>
+						<div class="mint-tab-item-label">往期活动</div>
+					</a></div>
+				</div>
+			</div>
+			<div class="activity-cont-view">
+				<div class="mint-tab-container">
+					<div class="mint-tab-container-wrap">
+
+						<c:if test="${empty activityList}">
+							<div class="mint-tab-container-item new">
+								<div>
+									<div class="no-result-wrap tc ">
+										<p class="no-result"></p>
+										<div class="c666 fz16">暂无活动记录</div>
+									</div>
+								</div>
+							</div>
+						</c:if>
+						<c:if test="${not empty activityList}" >
+							<div class="activity new">
+								<div class="activity-list">
+									<c:forEach items="${activityList}" var="activity">
+										<div class="start-activity-item" onclick="toIndexDetail('${activity.id}','${activity.toImgUrl}')">
+											<div class="add-card polaroid">
+												<img style="width:100%" src="${activity.officImgUrl}">
+												<div class="activity-name">${activity.officTitle}</div>
+												<div class="activity-title">${activity.officContent}</div>
+												<div class="activity-time">
+													活动时间：<fmt:formatDate value='${activity.startTime}' pattern='yyyy年MM月dd日'/>&nbsp;至&nbsp;<fmt:formatDate value='${activity.endTime}' pattern='yyyy年MM月dd日'/>
+												</div>
+											</div>
+										</div>
+									</c:forEach>
+								</div>
+							</div>
+						</c:if>
+
+						<c:if test="${empty activitOldList}">
+							<div class="mint-tab-container-item old" style="display: none;">
+								<div>
+									<div class="no-result-wrap tc ">
+										<p class="no-result"></p>
+										<div class="c666 fz16">暂无活动记录</div>
+									</div>
+								</div>
+							</div>
+						</c:if>
+						<c:if test="${not empty activitOldList}" >
+							<div class="activity old" style="display: none;">
+								<div class="activity-list">
+									<c:forEach items="${activitOldList}" var="activity">
+										<div class="start-activity-item">
+											<div class="add-card polaroid">
+												<img style="width:100%" src="${activity.officImgUrl}">
+												<div class="activity-name">${activity.officTitle}</div>
+												<div class="activity-title">${activity.officContent}</div>
+												<div class="activity-time">
+													活动时间：<fmt:formatDate value='${activity.startTime}' pattern='yyyy年MM月dd日'/>&nbsp;至&nbsp;<fmt:formatDate value='${activity.endTime}' pattern='yyyy年MM月dd日'/>
+												</div>
+											</div>
+										</div>
+									</c:forEach>
+								</div>
+							</div>
+						</c:if>
+					</div>
+				</div>
+			</div>
+			<div class="index-point" style="display: none;"><img
+					src="https://p1.yqbimg.net/h5/v/manager/static/rookie-537b68.png" alt="">
+				<div class="index-btn">我知道了</div>
+			</div>
+		</div>
+	</div>
+	<script type="text/javascript">
+		/* === 判断支持版本 end === */
+		// refs http://www.html-js.com/article/3041 移动端高清、多屏适配方案
+		!function (a, b) {
+			function c() {
+				var b = f.getBoundingClientRect().width;
+				b / i > 540 && (b = 540 * i);
+				var c = b / 10;
+				f.style.fontSize = c + "px", k.rem = a.rem = c
+			}
+
+			var d, e = a.document,
+					f = e.documentElement,
+					g = e.querySelector('meta[name="viewport"]'),
+					h = e.querySelector('meta[name="flexible"]'),
+					i = 0,
+					j = 0,
+					k = b.flexible || (b.flexible = {});
+			if (g) {
+				var l = g.getAttribute("content").match(/initial\-scale=([\d\.]+)/);
+				l && (j = parseFloat(l[1]), i = parseInt(1 / j))
+			} else if (h) {
+				var m = h.getAttribute("content");
+				if (m) {
+					var n = m.match(/initial\-dpr=([\d\.]+)/),
+							o = m.match(/maximum\-dpr=([\d\.]+)/);
+					n && (i = parseFloat(n[1]), j = parseFloat((1 / i).toFixed(2))), o && (i = parseFloat(o[1]), j = parseFloat((
+							1 / i).toFixed(2)))
+				}
+			}
+			if (!i && !j) {
+				var p = (a.navigator.appVersion.match(/android/gi), a.navigator.appVersion.match(/iphone/gi)),
+						q = a.devicePixelRatio;
+				i = p ? q >= 3 && (!i || i >= 3) ? 3 : q >= 2 && (!i || i >= 2) ? 2 : 1 : 1, j = 1 / i
+			}
+			if (f.setAttribute("data-dpr", i), !g)
+				if (g = e.createElement("meta"), g.setAttribute("name", "viewport"), g.setAttribute("content",
+						"initial-scale=" + j + ", maximum-scale=" + j + ", minimum-scale=" + j + ", user-scalable=no"), f
+						.firstElementChild) f.firstElementChild.appendChild(g);
+				else {
+					var r = e.createElement("div");
+					r.appendChild(g), e.write(r.innerHTML)
+				}
+			a.addEventListener("resize", function () {
+				clearTimeout(d), d = setTimeout(c, 300)
+			}, !1), a.addEventListener("pageshow", function (a) {
+				a.persisted && (clearTimeout(d), d = setTimeout(c, 300))
+			}, !1), "complete" === e.readyState ? e.body.style.fontSize = 12 * i + "px" : e.addEventListener(
+					"DOMContentLoaded",
+					function () {
+						e.body.style.fontSize = 12 * i + "px"
+					}, !1), c(), k.dpr = a.dpr = i, k.refreshRem = c, k.rem2px = function (a) {
+				var b = parseFloat(a) * this.rem;
+				return "string" == typeof a && a.match(/rem$/) && (b += "px"), b
+			}, k.px2rem = function (a) {
+				var b = parseFloat(a) / this.rem;
+				return "string" == typeof a && a.match(/px$/) && (b += "rem"), b
+			}
+		}(window, window.lib || (window.lib = {}));
+	</script>
+	<script>
+		var aList = document.querySelectorAll('a');
+		var rg = /\d+/;
+		for(var i=0;i<aList.length;i++){
+			(function(i){
+				aList[i].onclick =
+						function(){
+							if(i == 0){
+								aList[i+1].classList.remove('is-selected');
+								$(".old").hide();
+								$(".new").show();
+							}else{
+								$(".new").hide();
+								$(".old").show();
+								aList[i-1].classList.remove('is-selected');
+							}
+							aList[i].classList.add('is-selected');
+						}
+			})(i)
+		}
+		$('.money-active').children('div').each(function () {
+			$(this).bind('click',function () {
+				var index = $(this).attr("index");
+				var url = "";
+				if(index === '1'){
+					url = ctx + "/activity/good?token="+'${token}';
+				}
+				if(index === '2'){
+					url = ctx + "/activity/cash?token="+'${token}';
+				}
+				if(index === '3'){
+					url = ctx + "/activity/detail?type=1&token="+'${token}';
+				}
+				window.location.href = url;
+			});
+		})
+		$(".question").on('click',function () {
+			var url =  ctx + "/activity/desc";
+			window.location.href = url;
+		})
+		function toIndexDetail(id,url) {
+			let domain = '${domain}';
+			if(url){
+				if(url.indexOf(domain) > -1){
+					window.location.href = url+'&token=${token}&a='+id+'&t=${t}';
+				}else{
+					window.location.href = url;
+				}
+			}else{
+				window.location.href = ctx+'/activity/act/detail?token=${token}&a='+id+'&t=${t}';
+			}
+		}
+	</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/jsp/activity/address.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/activity/address.jsp
new file mode 100644
index 0000000..51b1f30
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/activity/address.jsp
@@ -0,0 +1,231 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<!DOCTYPE html>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html lang="en" data-dpr="1" style="font-size: 37.52px;">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta name="viewport"
+          content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no,viewport-fit=cover">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <meta name="format-detection" content="telephone=no">
+    <meta name="keywords" content="">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+	<c:set var="ctx" value="${pageContext.request.contextPath}"  scope="request"/>
+	<c:set var="resourcePath" value="${ctx}/resources"  scope="request"/>
+	<script type="text/javascript">
+		var ctx = "${ctx}"; //上下文路径
+		var resourcePath = "${resourcePath}";
+		document.writeln('<script type="text/javascript" src="'+resourcePath+'/js/global.js?d=' + new Date().getTime() + '" ><\/script>');
+	</script>
+    <title>收货地址</title>
+	<link rel="stylesheet" href="${resourcePath}/css/h5.css">
+	<link rel="stylesheet" href="${resourcePath}/css/h5-common.css">
+	<style>
+		body{
+			background-color: #F6F6F4;
+		}
+		#app,html{
+			height: auto !important;
+		}
+		#app{
+			padding: 10px;
+		}
+		.no-data{
+			width: 200px;
+			text-align: center;
+			margin: 30% auto 0 auto;
+		}
+		.no-data-icon{
+			text-align: center;
+			width: 100%;
+		}
+		.no-data-desc{
+			color: #a1a0a0;
+			font-size: 16px;
+		}
+		.footer{
+			position: fixed;
+			bottom: 0;
+			left: 0;
+			width: 100%;
+		}
+		.add-btn{
+			background: #f14e4e;
+		}
+		.address-item{
+			background: #fff;
+			border-radius: 5px;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			height: 55px;
+			padding: 10px;
+			line-height: 20px;
+			margin-bottom: 10px;
+		}
+		.icon{
+			width: 30px;
+			height: 30px;
+		}
+		.address-info{
+			margin-left: 10px;
+			width: 75%;
+		}
+		.address-text{
+			font-size: 13px;
+		}
+		.link-text{
+			font-size: 11px;
+			color: #a0a0a0;
+		}
+		.ellipsis{
+			text-overflow: ellipsis;
+			overflow: hidden;
+			white-space: nowrap;
+		}
+		.is-default{
+			margin-left: 10px;
+			padding: 3px;
+			background-color: #f14e4e;
+			color: #fff;
+			border-radius: 3px;
+		}
+	</style>
+</head>
+<body>
+	<div id="app">
+		<c:choose>
+			<c:when test="${not empty addressList}">
+				<c:forEach items="${addressList}" var="ars">
+					<div class="address-item" >
+						<img class="icon" src="${resourcePath}/images/address-icon.png">
+						<div class="address-info" onclick="checkAddress('${ars.id}')">
+							<div class="address-text ellipsis">${ars.areaName} ${ars.address}</div>
+							<div class="link-text">${ars.name} ${ars.phone}
+								<c:if test="${ars.defFlag eq '1'}">
+									<span class="is-default">默认</span>
+								</c:if>
+							</div>
+						</div>
+						<img class="icon" onclick="updateAddress('${ars.id}')" src="${resourcePath}/images/update-icon.png">
+					</div>
+				</c:forEach>
+			</c:when>
+			<c:otherwise>
+				<div class="no-data">
+					<img class="no-data-icon" src="${resourcePath}/images/no-goods.png">
+					<p class="no-data-desc">暂无收货地址~</p>
+				</div>
+			</c:otherwise>
+		</c:choose>
+		<div class="footer">
+			<button class="add-btn">新增收货地址</button>
+		</div>
+	</div>
+	<script type="text/javascript">
+		/* === 判断支持版本 start === */
+		(function () {
+			var viewportTag = null;
+			var metaTags = document.getElementsByTagName('meta');
+			for (var i = 0; i < metaTags.length; i++) {
+				if (metaTags[i].getAttribute('name') === "viewport") {
+					viewportTag = metaTags[i];
+					break;
+				}
+			}
+			if (!viewportTag) {
+				viewportTag = document.createElement("meta");
+				viewportTag.setAttribute('name', 'viewport');
+			}
+
+			var viewportTagContent =
+					'width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no';
+
+			// Detect if iOS device
+			if (/(iPhone|iPod|iPad)/i.test(window.navigator.userAgent)) {
+				// Get iOS major version
+				var iosVersion = parseInt((window.navigator.userAgent).match(/OS (\d+)_(\d+)_?(\d+)? like Mac OS X/i)[1]);
+				// Detect if device is running >iOS 11
+				// iOS 11's UIWebView and WKWebView changes the viewport behaviour to render viewport without the status bar. Need to override with "viewport-fit: cover" to include the status bar.
+				if (iosVersion >= 11) {
+					viewportTagContent += ', viewport-fit=cover';
+				}
+			}
+
+			// Update viewport tag attribute
+			viewportTag.setAttribute('content', viewportTagContent);
+		})();
+		/* === 判断支持版本 end === */
+
+		// refs http://www.html-js.com/article/3041 移动端高清、多屏适配方案
+		!function (a, b) {
+			function c() {
+				var b = f.getBoundingClientRect().width;
+				b / i > 540 && (b = 540 * i);
+				var c = b / 10;
+				f.style.fontSize = c + "px", k.rem = a.rem = c
+			}
+			var d, e = a.document,
+					f = e.documentElement,
+					g = e.querySelector('meta[name="viewport"]'),
+					h = e.querySelector('meta[name="flexible"]'),
+					i = 0,
+					j = 0,
+					k = b.flexible || (b.flexible = {});
+			if (g) {
+				var l = g.getAttribute("content").match(/initial\-scale=([\d\.]+)/);
+				l && (j = parseFloat(l[1]), i = parseInt(1 / j))
+			} else if (h) {
+				var m = h.getAttribute("content");
+				if (m) {
+					var n = m.match(/initial\-dpr=([\d\.]+)/),
+							o = m.match(/maximum\-dpr=([\d\.]+)/);
+					n && (i = parseFloat(n[1]), j = parseFloat((1 / i).toFixed(2))), o && (i = parseFloat(o[1]), j = parseFloat((
+							1 / i).toFixed(2)))
+				}
+			}
+			if (!i && !j) {
+				var p = (a.navigator.appVersion.match(/android/gi), a.navigator.appVersion.match(/iphone/gi)),
+						q = a.devicePixelRatio;
+				i = p ? q >= 3 && (!i || i >= 3) ? 3 : q >= 2 && (!i || i >= 2) ? 2 : 1 : 1, j = 1 / i
+			}
+			if (f.setAttribute("data-dpr", i), !g)
+				if (g = e.createElement("meta"), g.setAttribute("name", "viewport"), g.setAttribute("content",
+						"initial-scale=" + j + ", maximum-scale=" + j + ", minimum-scale=" + j + ", user-scalable=no"), f
+						.firstElementChild) f.firstElementChild.appendChild(g);
+				else {
+					var r = e.createElement("div");
+					r.appendChild(g), e.write(r.innerHTML)
+				}
+			a.addEventListener("resize", function () {
+				clearTimeout(d), d = setTimeout(c, 300)
+			}, !1), a.addEventListener("pageshow", function (a) {
+				a.persisted && (clearTimeout(d), d = setTimeout(c, 300))
+			}, !1), "complete" === e.readyState ? e.body.style.fontSize = 12 * i + "px" : e.addEventListener(
+					"DOMContentLoaded",
+					function () {
+						e.body.style.fontSize = 12 * i + "px"
+					}, !1), c(), k.dpr = a.dpr = i, k.refreshRem = c, k.rem2px = function (a) {
+				var b = parseFloat(a) * this.rem;
+				return "string" == typeof a && a.match(/rem$/) && (b += "px"), b
+			}, k.px2rem = function (a) {
+				var b = parseFloat(a) / this.rem;
+				return "string" == typeof a && a.match(/px$/) && (b += "rem"), b
+			}
+		}(window, window.lib || (window.lib = {}));
+	</script>
+	<script>
+		$(".add-btn").click(function (res){
+			window.location.href= ctx + '/activity/address/add?token=${token}&g=${g}';
+		})
+		function updateAddress(id){
+			window.location.href= ctx + '/activity/address/add?token=${token}&g=${g}&aid='+id;
+		}
+		function checkAddress(id){
+			window.location.href= ctx + "/activity/exchange/order?token=${token}&g=${g}&aid="+id;
+		}
+	</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/jsp/activity/addressPost.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/activity/addressPost.jsp
new file mode 100644
index 0000000..7cbfffd
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/activity/addressPost.jsp
@@ -0,0 +1,331 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<!DOCTYPE html>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html lang="en" data-dpr="1" style="font-size: 37.52px;">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta name="viewport"
+          content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no,viewport-fit=cover">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <meta name="format-detection" content="telephone=no">
+    <meta name="keywords" content="">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+	<c:set var="ctx" value="${pageContext.request.contextPath}"  scope="request"/>
+	<c:set var="resourcePath" value="${ctx}/resources"  scope="request"/>
+	<script type="text/javascript">
+		var ctx = "${ctx}"; //上下文路径
+		var resourcePath = "${resourcePath}";
+		document.writeln('<script type="text/javascript" src="'+resourcePath+'/js/global.js?d=' + new Date().getTime() + '" ><\/script>');
+	</script>
+	<script src="${resourcePath}/js/mobileSelect.js"></script>
+	<script type="text/javascript" src="${resourcePath}/js/zepto.min.js"></script>
+	<script type="text/javascript" src="${resourcePath}/js/zepto.weui.js"></script>
+    <title>编辑收货地址</title>
+	<link rel="stylesheet" href="${resourcePath}/css/h5.css">
+	<link rel="stylesheet" href="${resourcePath}/css/h5-common.css">
+	<link rel="stylesheet" href="${resourcePath}/css/mobileSelect.css">
+	<link rel="stylesheet" href="${resourcePath}/css/weui.css">
+	<link rel="stylesheet" href="${resourcePath}/css/weuix.css">
+	<style>
+		body{
+			background-color: #F6F6F4;
+		}
+		#app{
+			padding: 10px;
+		}
+		.address-info{
+			background: #fff;
+			border-radius: 5px;
+			line-height: 45px;
+			padding: 0 10px 10px 10px;
+		}
+		.info{
+			border-bottom: 1px solid #e2e2e2;
+			display: flex;
+		}
+		.label-name{
+			display: block;
+			width: 2.5rem;
+		}
+		.no-border{
+			border: 0;
+		}
+
+		div{
+			position: relative;
+		}
+
+		input[type="radio"] {
+			width: 20px;
+			height: 20px;
+			opacity: 0;
+		}
+
+		.radio-item label {
+			position: absolute;
+			left: 5px;
+			top: 3px;
+			width: 20px;
+			height: 20px;
+			border-radius: 50%;
+			border: 1px solid #999;
+　　　　　　　cursor: pointer;
+		}
+
+		/*设置选中的input的样式*/
+		/* + 是兄弟选择器,获取选中后的label元素*/
+		input:checked+label {
+			background-color: #f14e4e;
+			border: 1px solid #f14e4e;
+		}
+		/*添加的加号与label进行拼接(一个矩形边框去掉上和左的边框),再旋转45度*/
+		input:checked+label::after {
+			position: absolute;
+			content: "";
+			width: 5px;
+			height: 10px;
+			top: 1px;
+			left: 6px;
+			border: 2px solid #fff;
+			border-top: none;
+			border-left: none;
+			transform: rotate(45deg);
+		}
+		.radio-label{
+			margin-top: 6px;
+		}
+		.radio-item{
+			margin-right: 15px;
+		}
+		.radio-label-text{
+			margin-left: 10px;
+		}
+		.item-input{
+			width: 70%;
+		}
+		.icon{
+			width: 25px;
+			height: 25px;
+			margin-top: 8px;
+		}
+		.submit-btn{
+			background: #f14e4e;
+		}
+		.popup-container {
+			z-index: 9993;
+			/* -webkit-transition: all .3s ease-out; */
+			transition: all .3s ease-out;
+		}
+		.loading-container, .popup-container {
+			left: 50%;
+			top: 50%;
+			-webkit-transform: translate(-50%,-50%);
+			transform: translate(-50%,-50%);
+		}
+		[class*=-container] {
+			visibility: hidden;
+			opacity: 0;
+			position: fixed;
+		}
+		.popup-container .popup {
+			border-radius: .05333333rem;
+			width: 7.33333333rem;
+			font-size: .4rem;
+			-webkit-box-shadow: 0 0 2px rgba(0,0,0,.2);
+			box-shadow: 0 0 2px rgba(0,0,0,.2);
+			text-align: center;
+			background-color: #fff;
+		}
+		.popup-container .popup .popup-body {
+			padding: .64rem .32rem;
+			font-size: .95em;
+			overflow-y: auto;
+			overflow-x: hidden;
+		}
+		.popup-container .popup .popup-btns {
+			display: -webkit-box;
+			display: -webkit-flex;
+			display: flex;
+			-webkit-box-direction: normal;
+			-webkit-box-orient: horizontal;
+			-webkit-flex-direction: row;
+			flex-direction: row;
+		}
+		.popup-container .popup .popup-btns .btn {
+			padding: .26666667rem 0;
+			-webkit-box-flex: 1;
+			-webkit-flex: 1;
+			flex: 1;
+			display: block;
+			background: inherit;
+		}
+		.popup-container .popup-btns .btn {
+			color: #ff721f;
+		}
+		.popup-container .popup-btns .btn {
+			color: #ff721f;
+		}
+		.red{
+			color: red;
+		}
+		.areaName{
+			margin-left: 10px;
+		}
+		.default-btn{
+			background-color: #919191;
+		}
+	</style>
+</head>
+<body>
+	<div id="app">
+		<form id="form" >
+			<input type="hidden" name="token" value="${token}">
+			<input type="hidden" name="g" value="${g}">
+			<input type="hidden" name="id" value="${userAddress.id}">
+			<div class="address-info">
+				<div class="info">
+					<label class="label-name">姓名：<span class="red">*</span></label>
+					<input type="text" class="item-input" name="name" autocomplete="off" value="${userAddress.name}" placeholder="请输入收货人姓名">
+				</div>
+				<div class="info">
+					<label class="label-name">联系方式：<span class="red">*</span></label>
+					<input type="text" class="item-input" name="phone" autocomplete="off" value="${userAddress.phone}" placeholder="请输入收货人联系方式">
+				</div>
+				<div class="info">
+					<label class="label-name">收货地址：<span class="red">*</span></label>
+					<input type="text" class="item-input areaName" name="areaName" id="trigger" value="${userAddress.areaName}" readonly autocomplete="off" placeholder="选择省/市/区">
+					<input type="hidden" class="item-input" name="areaCode" value="${userAddress.areaCode}" id="areaCode">
+					<img class="icon" src="${resourcePath}/images/arrow-right-icon.png">
+				</div>
+				<div class="info">
+					<label class="label-name">详细地址：<span class="red">*</span></label>
+					<input type="text" class="item-input" name="address" value="${userAddress.address}" autocomplete="off" placeholder="街道门牌，楼栋楼层等信息">
+				</div>
+				<div class="info no-border">
+					<label class="label-name">默认：</label>
+					<div class="radio-item">
+						<input id="item1" type="radio" name="defFlag" ${userAddress.defFlag eq '1' ? 'checked' : ''} value="1">
+						<label for="item1" class="radio-label"></label>
+						<span class="radio-label-text">是</span>
+					</div>
+					<div class="radio-item">
+						<input id="item2" type="radio" name="defFlag" value="0" ${userAddress.defFlag eq '0' || empty userAddress ? 'checked' : ''}>
+						<label for="item2" class="radio-label"></label>
+						<span class="radio-label-text">否</span>
+					</div>
+				</div>
+				<button type="button" class="submit-btn">保存并使用</button>
+				<c:if test="${not empty userAddress and  not empty userAddress.id }">
+					<button type="button" class="default-btn" onclick="deleteAddress('${userAddress.id}')" >删除</button>
+				</c:if>
+			</div>
+		</form>
+	</div>
+	<div class="backdrop-container active" style="display: none;"></div>
+	<div class="popup-container active" style="display: none;">
+		<div class="popup"><!---->
+			<div class="popup-body"></div>
+			<div class="popup-btns" id="popup-btns" onclick="hide(this)"><span class="btn btn-positive">确定</span></div>
+		</div>
+	</div>
+	<div class="mint-indicator" style="display: none;">
+		<div class="mint-indicator-wrapper" style="padding: 20px;">
+        	<img src="${resourcePath}/images/loading-2.gif">
+			<span class="mint-indicator-text" style="">加载中...</span>
+		</div>
+	</div>
+</body>
+<script src="${resourcePath}/js/common/h5.js"></script>
+<script src="${resourcePath}/js/mobileSelect.js"></script>
+<script type="text/javascript">
+	let mobileSelect1 = null;
+	$(function (){
+		let url =  resourcePath + "/json/city.json";
+		$.ajax({
+			url:url,
+			type:"GET",
+			dataType:"json",
+			success:res =>{
+				let data = res.locationList;
+				mobileSelect1 = new MobileSelect({
+					trigger: '#trigger',// 点击容器的ID
+					title: '省市区',//
+					keyMap:{"id":"code","value":"name","childs":"childs"},
+					cancelBtnText:" ",
+					wheels: [
+						{data:data}
+					],
+					connector:"-",
+					position:[0,0,0], //Initialize positioning
+					callback:function (indexArr,data){
+						$("#trigger").val(data[0].name +"-"+ data[1].name +"-"+ data[2].name);
+						$("#areaCode").val(data[0].code +"-"+ data[1].code +"-" + data[2].code);
+					},
+				});
+			}
+		})
+	})
+	$(".submit-btn").click(function (){
+		var serializeArray = $("#form").serializeArray();
+		var data = {};
+		$.each(serializeArray, function(index, item) {
+			data[item.name] = item.value;
+		});
+		if(!data.name)return showDialog("收货人姓名不能为空");
+		if(!data.phone)return showDialog("收货人联系方式不能为空");
+		if(!data.areaName)return showDialog("收货人地址不能为空");
+		if(!data.address)return showDialog("收货人详细地址不能为空");
+		let url = ctx + "/activity/address/save";
+		$(".mint-indicator").show();
+		$(".backdrop-container").show();
+		$.ajax({
+			url:url,
+			type: 'post',
+			data:data,
+			dataType:'json',
+			success:function (res){
+				$(".mint-indicator").hide();
+				$(".backdrop-container").hide();
+				if(res.code == 200){
+					showDialog(res.message,ctx + "/activity/exchange/order?token=${token}&g=${g}&aid="+res.data.id);
+				}else{
+					showDialog(res.message);
+				}
+			}
+		})
+
+	})
+	function deleteAddress(id){
+		$.confirm("确认删除吗?",function (res){
+			$(".mint-indicator").show();
+			$(".backdrop-container").show();
+			let $url = ctx + "/activity/address/del/"+id;
+			$.post($url,function (res){
+				$(".mint-indicator").hide();
+				$(".backdrop-container").hide();
+				if(res.code == 200){
+					showDialog(res.message,ctx + "/activity/address?token=${token}&g=${g}");
+				}else{
+					showDialog(res.message);
+				}
+			})
+		})
+	}
+	function showDialog(text,href){
+		$('.popup-body').html(text);
+		$('.active').show();
+		if(href){
+			$('.popup-body').attr("location",href)
+		}
+	}
+	function hide(obj) {
+		$('.active').hide();
+		let href = $(obj).prev().attr("location");
+		if(href){
+			window.location.href = href;
+		}
+	}
+</script>
+</html>
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/jsp/activity/cash.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/activity/cash.jsp
new file mode 100644
index 0000000..2c5e86f
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/activity/cash.jsp
@@ -0,0 +1,340 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<!DOCTYPE html>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html lang="en" data-dpr="1" style="font-size: 37.52px;">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<meta name="viewport"
+      content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no,viewport-fit=cover">
+<meta http-equiv="X-UA-Compatible" content="ie=edge">
+<meta name="format-detection" content="telephone=no">
+<meta name="keywords" content="">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+<meta name="renderer" content="webkit">
+<c:set var="ctx" value="${pageContext.request.contextPath}"  scope="request"/>
+<c:set var="resourcePath" value="${ctx}/resources"  scope="request"/>
+<script type="text/javascript">
+    var ctx = "${ctx}"; //上下文路径
+    var resourcePath = "${resourcePath}";
+    document.writeln('<script type="text/javascript" src="'+resourcePath+'/js/global.js?d=' + new Date().getTime() + '" ><\/script>');
+</script>
+
+<title>申请提现</title>
+<style type="text/css">.mint-popup-bottom[data-v-8cd1bb9c]{-webkit-transform:translate3d(-50%,0,0)!important}.mint-indicator-wrapper[data-v-8cd1bb9c]{-webkit-transform:translate(-50%,-50%);z-index:999}#app[data-v-8cd1bb9c],body[data-v-8cd1bb9c],html[data-v-8cd1bb9c]{font-size:5.973px;font-size:.37333333rem;height:100%;color:#333;-webkit-user-select:none;-moz-user-select:none;-o-user-select:none;-ms-user-select:none;user-select:none}body[data-v-8cd1bb9c],html[data-v-8cd1bb9c],input[data-v-8cd1bb9c],textarea[data-v-8cd1bb9c]{font-family:PingFangSC-Regular,Helvetica,sans-serif}input[data-v-8cd1bb9c],textarea[data-v-8cd1bb9c]{background-color:#fff}input[data-v-8cd1bb9c],li[data-v-8cd1bb9c],ol[data-v-8cd1bb9c],textarea[data-v-8cd1bb9c],ul[data-v-8cd1bb9c]{padding:0;border:0;margin:0}.tc[data-v-8cd1bb9c]{text-align:center}.tr[data-v-8cd1bb9c]{text-align:right}.tl[data-v-8cd1bb9c]{text-align:left}.c4b[data-v-8cd1bb9c]{color:#4b4b4b}.c000[data-v-8cd1bb9c]{color:#000}.c333[data-v-8cd1bb9c]{color:#333}.c666[data-v-8cd1bb9c]{color:#666}.c999[data-v-8cd1bb9c]{color:#999}.cccc[data-v-8cd1bb9c]{color:#ccc}.cddd[data-v-8cd1bb9c]{color:#ddd}.c9b9b[data-v-8cd1bb9c]{color:#9b9b9b}.cblue[data-v-8cd1bb9c]{color:#3089f7}.cred[data-v-8cd1bb9c]{color:red}.cora[data-v-8cd1bb9c]{color:#faa800}.cbase[data-v-8cd1bb9c]{color:#ff721f}.cfff[data-v-8cd1bb9c]{color:#fff}.bfff[data-v-8cd1bb9c]{background-color:#fff}.bbase[data-v-8cd1bb9c]{background-color:#ff721f}.fl[data-v-8cd1bb9c]{float:left}.fr[data-v-8cd1bb9c]{float:right}.mt10[data-v-8cd1bb9c]{margin-top:4.266px;margin-top:.26666667rem}.ml15[data-v-8cd1bb9c]{margin-left:6.4px;margin-left:.4rem}.mr15[data-v-8cd1bb9c]{margin-right:6.4px;margin-right:.4rem}.mt15[data-v-8cd1bb9c]{margin-top:6.4px;margin-top:.4rem}.mb15[data-v-8cd1bb9c]{margin-bottom:6.4px;margin-bottom:.4rem}.pl15[data-v-8cd1bb9c]{padding-left:6.4px;padding-left:.4rem}.pr15[data-v-8cd1bb9c]{padding-right:6.4px;padding-right:.4rem}.pt15[data-v-8cd1bb9c]{padding-top:6.4px;padding-top:.4rem}.pb15[data-v-8cd1bb9c]{padding-bottom:6.4px;padding-bottom:.4rem}.mt30[data-v-8cd1bb9c]{margin-top:12.8px;margin-top:.8rem}.mb30[data-v-8cd1bb9c]{margin-bottom:12.8px;margin-bottom:.8rem}.fz12[data-v-8cd1bb9c]{font-size:5.12px;font-size:.32rem}.fz13[data-v-8cd1bb9c]{font-size:5.546px;font-size:.34666667rem}.fz14[data-v-8cd1bb9c]{font-size:5.973px;font-size:.37333333rem}.fz15[data-v-8cd1bb9c]{font-size:6.4px;font-size:.4rem}.fz16[data-v-8cd1bb9c]{font-size:6.826px;font-size:.42666667rem}.fz18[data-v-8cd1bb9c]{font-size:7.68px;font-size:.48rem}.fz20[data-v-8cd1bb9c]{font-size:8.533px;font-size:.53333333rem}.fz22[data-v-8cd1bb9c]{font-size:9.386px;font-size:.58666667rem}.fz24[data-v-8cd1bb9c]{font-size:10.24px;font-size:.64rem}.fz32[data-v-8cd1bb9c]{font-size:13.653px;font-size:.85333333rem}.fz36[data-v-8cd1bb9c]{font-size:15.36px;font-size:.96rem}.block[data-v-8cd1bb9c]{display:block}b[data-v-8cd1bb9c],dfn[data-v-8cd1bb9c],em[data-v-8cd1bb9c]{font-style:normal;font-weight:400}.font-DINAlternate[data-v-8cd1bb9c]{font-family:DINAlternate-Bold,PingFangSC-Regular,Helvetica,sans-serif}.arr_r[data-v-8cd1bb9c]{position:relative}.arr_r[data-v-8cd1bb9c]:after{content:"";position:absolute;z-index:80;right:6.4px;right:.4rem;top:50%;width:6px;height:6px;border:1px solid #c7c7cc;border-width:2px 2px 0 0;transform:translateY(-50%) rotate(45deg)}.shadow[data-v-8cd1bb9c]{box-shadow:0 8px 25px 0 #eaebec}.ellips[data-v-8cd1bb9c]{white-space:nowrap;overflow:hidden;text-overflow:ellipsis}.ellips_line2[data-v-8cd1bb9c],.ellips_line3[data-v-8cd1bb9c]{display:-webkit-box;overflow:hidden}.ellips_line2[data-v-8cd1bb9c]{-webkit-line-clamp:2}.ellips_line3[data-v-8cd1bb9c]{-webkit-line-clamp:3}.to-check[data-v-8cd1bb9c]{position:relative}.to-check.checked[data-v-8cd1bb9c]:before{content:"";position:absolute;top:50%;right:6.4px;right:.4rem;width:6.4px;width:.4rem;height:3.2px;height:.2rem;border:2px solid #ff721f;border-width:0 0 2px 2px;transform:translateY(-50%) rotate(-45deg)}.ui-page[data-v-8cd1bb9c]{position:relative;max-width:256px;max-width:16rem;min-height:100%;background-color:#f7f7f7;padding-top:1px;margin:-1px auto 0}.ui-page[data-v-8cd1bb9c]:after{content:"";position:fixed;top:0;bottom:0;left:0;right:0;z-index:-1;background-color:#f7f7f7}button[data-v-8cd1bb9c]{font-size:6.4px;font-size:.4rem;border-radius:1px;background-color:#ff721f}button.disabled[data-v-8cd1bb9c]{opacity:.4}.mebtn[data-v-8cd1bb9c]{width:100%;padding:0 6.4px;padding:0 .4rem}input[data-v-8cd1bb9c]::-webkit-input-placeholder{color:#ccc}[data-v-8cd1bb9c]:-moz-placeholder,[data-v-8cd1bb9c]::-moz-placeholder{color:#ccc}[data-v-8cd1bb9c]:-ms-input-placeholder{color:#ccc}[class*=mint-tab-container][data-v-8cd1bb9c]{visibility:visible;position:static;opacity:1}.loading-txt[data-v-8cd1bb9c]{width:76.8px;width:4.8rem}.loading-txt em[data-v-8cd1bb9c]{display:block;margin:4.266px auto;margin:.26666667rem auto}.loading-txt .txt[data-v-8cd1bb9c]{margin-bottom:2.56px;margin-bottom:.16rem}.v-input-clear[data-v-8cd1bb9c]{position:absolute;right:-4.266px;right:-.26666667rem;top:50%;display:none;z-index:9;padding:4.266px;padding:.26666667rem;background-color:#fff;transform:translateY(-50%)}.v-input-clear.active[data-v-8cd1bb9c]{display:block}.v-input-clear .icon-font[data-v-8cd1bb9c]{display:block;color:#ccc;font-size:7.68px;font-size:.48rem}.popup-container .popup-title[data-v-8cd1bb9c]{font-weight:700}.popup-container .popup-btns .btn[data-v-8cd1bb9c]{color:#ff721f}.flex[data-v-8cd1bb9c]{display:-ms-flexbox;display:flex}.flex .flex-li[data-v-8cd1bb9c],.flex li[data-v-8cd1bb9c]{-ms-flex:1;flex:1}.i-warn-red[data-v-8cd1bb9c]{display:inline-block;width:20px;height:20px;background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAAAXNSR0IArs4c6QAAAkNJREFUSA29Vj1PVEEUvWdYA72dFkJCQkGhkJjQECpqTbQyWuhPcMFYUFjYyUfCbyDSYEJvZWhIiDEWmlCxFkBla8Tdfdcz897O7L7F2XkE3yS7e+fOOffMx92ZC0lo+vLOnAAPRWVRILdF9ZajAWf0ndJ3QN8+Nn98GRUOMYA2px6L6FsGm4nh/BhwLII1bJzseV/JuFRQV2amJLt4T7GFEj6xi0Mx40+wfnxSJgwJ6urkkmT6gVt1swyu1If8FINHeNf61M8bEHRiXfnIld3oB13dRlvGZLlf1Au6bdTfR6NXxiCQHU6CXH1KfCM6IbtSTNzvba/xYHtmKdto5BU2Wi/4eU7ua8//l2FjunzIAU6wyMa0BDH61cfGWLC98zJDF3IN6W0HUz+1dbCib2aP5FcH0rloptLc30tkD7o6PS/d9ud0okXyHF2rnFzzRrLOg5xc4RvyjejvFRg5lLeVYaIsViICW0yYOWy27nGl25W41DLubqzEMrse3pBge2fE4D3MFRYXcQQ3MNTQP76vjWB7Z8SgVvgfRnDXNgQot5RPTH3t3CbNaW161LJJc1CbILVs0uzXJkgt48oC91L/Z1lqWK0iS7GWLNfOQmajzx4ZINdw5LwGYVmQ0gzCzdTNgh3l4rBX54THkzWIpDzAmaxrc/Iu49sH+FlUxw66B5ixi+ZffNuvo8QI50FBV3uwBnGzKmZ05R+7slI9Y2MNCFqHE2UNQivtTC1pqJFr65hSxWZhA1ta5tVWCA8JX2Op/xc+6NDNayMwOQAAAABJRU5ErkJggg==) no-repeat;background-size:20px 20px}.i-checked[data-v-8cd1bb9c],.i-unchecked[data-v-8cd1bb9c]{position:relative;display:inline-block;width:16px;height:16px;background:url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+Cjxzdmcgd2lkdGg9IjMycHgiIGhlaWdodD0iMzJweCIgdmlld0JveD0iMCAwIDMyIDMyIiB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPgogICAgPCEtLSBHZW5lcmF0b3I6IFNrZXRjaCA1MC4yICg1NTA0NykgLSBodHRwOi8vd3d3LmJvaGVtaWFuY29kaW5nLmNvbS9za2V0Y2ggLS0+CiAgICA8dGl0bGU+5Y2P6K6u5Yu+L+WLvjwvdGl0bGU+CiAgICA8ZGVzYz5DcmVhdGVkIHdpdGggU2tldGNoLjwvZGVzYz4KICAgIDxkZWZzPjwvZGVmcz4KICAgIDxnIGlkPSLljY/orq7li74v5Yu+IiBzdHJva2U9Im5vbmUiIHN0cm9rZS13aWR0aD0iMSIgZmlsbD0ibm9uZSIgZmlsbC1ydWxlPSJldmVub2RkIj4KICAgICAgICA8cGF0aCBkPSJNMjguNDQ0NDQ0NCwwIEwzLjU1NTU1NTU2LDAgQzEuNiwwIDAsMS42IDAsMy41NTU1NTU1NiBMMCwyOC40NDQ0NDQ0IEMwLDMwLjQgMS42LDMyIDMuNTU1NTU1NTYsMzIgTDI4LjQ0NDQ0NDQsMzIgQzMwLjQsMzIgMzIsMzAuNCAzMiwyOC40NDQ0NDQ0IEwzMiwzLjU1NTU1NTU2IEMzMiwxLjYgMzAuNCwwIDI4LjQ0NDQ0NDQsMCBMMjguNDQ0NDQ0NCwwIFogTTEyLjQ0NDQ0NDQsMjQuODg4ODg4OSBMMy41NTU1NTU1NiwxNi4zNDE4ODAzIEw2LjA0NDQ0NDQ0LDEzLjk0ODcxNzkgTDEyLjQ0NDQ0NDQsMjAuMTAyNTY0MSBMMjUuOTU1NTU1Niw3LjExMTExMTExIEwyOC40NDQ0NDQ0LDkuNTA0MjczNSBMMTIuNDQ0NDQ0NCwyNC44ODg4ODg5IEwxMi40NDQ0NDQ0LDI0Ljg4ODg4ODkgWiIgaWQ9IuWLvuS4iiIgZmlsbD0iI0ZGNzIxRiI+PC9wYXRoPgogICAgPC9nPgo8L3N2Zz4=) no-repeat;background-size:16px auto}.i-unchecked[data-v-8cd1bb9c]{background-image:url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+Cjxzdmcgd2lkdGg9IjMycHgiIGhlaWdodD0iMzJweCIgdmlld0JveD0iMCAwIDMyIDMyIiB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPgogICAgPCEtLSBHZW5lcmF0b3I6IFNrZXRjaCA1MC4yICg1NTA0NykgLSBodHRwOi8vd3d3LmJvaGVtaWFuY29kaW5nLmNvbS9za2V0Y2ggLS0+CiAgICA8dGl0bGU+5Y2P6K6u5Yu+L+acquWLvjwvdGl0bGU+CiAgICA8ZGVzYz5DcmVhdGVkIHdpdGggU2tldGNoLjwvZGVzYz4KICAgIDxkZWZzPjwvZGVmcz4KICAgIDxnIGlkPSLljY/orq7li74v5pyq5Yu+IiBzdHJva2U9Im5vbmUiIHN0cm9rZS13aWR0aD0iMSIgZmlsbD0ibm9uZSIgZmlsbC1ydWxlPSJldmVub2RkIiBmaWxsLW9wYWNpdHk9IjAuMyI+CiAgICAgICAgPHBhdGggZD0iTTI4LjQ0NDQ0NDQsMCBMMy41NTU1NTU1NiwwIEMxLjYsMCAwLDEuNiAwLDMuNTU1NTU1NTYgTDAsMjguNDQ0NDQ0NCBDMCwzMC40IDEuNiwzMiAzLjU1NTU1NTU2LDMyIEwyOC40NDQ0NDQ0LDMyIEMzMC40LDMyIDMyLDMwLjQgMzIsMjguNDQ0NDQ0NCBMMzIsMy41NTU1NTU1NiBDMzIsMS42IDMwLjQsMCAyOC40NDQ0NDQ0LDAgTDI4LjQ0NDQ0NDQsMCBaIE0xMi40NDQ0NDQ0LDI0Ljg4ODg4ODkgTDMuNTU1NTU1NTYsMTYuMzQxODgwMyBMNi4wNDQ0NDQ0NCwxMy45NDg3MTc5IEwxMi40NDQ0NDQ0LDIwLjEwMjU2NDEgTDI1Ljk1NTU1NTYsNy4xMTExMTExMSBMMjguNDQ0NDQ0NCw5LjUwNDI3MzUgTDEyLjQ0NDQ0NDQsMjQuODg4ODg4OSBMMTIuNDQ0NDQ0NCwyNC44ODg4ODg5IFoiIGlkPSLmsqHli77kuIoiIGZpbGw9IiNGRjcyMUYiPjwvcGF0aD4KICAgIDwvZz4KPC9zdmc+)}.model-container .key-body[data-v-8cd1bb9c]{padding-bottom:1.493px;padding-bottom:.09333333rem;background-color:#d2d5db}.model-container .key-body ul.number li[data-v-8cd1bb9c]{height:14.933px;height:.93333333rem;line-height:14.933px;line-height:.93333333rem;padding:3.626px 0;padding:.22666667rem 0;width:31%;margin:0 1.7% 1.7% 0;border-radius:5px;background-color:#fff;box-shadow:0 1px 0 0 #898a8d}.model-container .key-body ul.number li[data-v-8cd1bb9c]:nth-child(3n-2){margin-left:1.7%}.model-container .key-body ul.number li[data-v-8cd1bb9c]:before{content:none}.model-container .key-body ul.number li.key-back[data-v-8cd1bb9c],.model-container .key-body ul.number li.key-null[data-v-8cd1bb9c]{background-color:#d2d5db;box-shadow:none}.model-container .key-body ul.number li.key-back[data-v-8cd1bb9c]:active{opacity:.5}.freeMask[data-v-8cd1bb9c]{background-color:transparent}.vx-header+.scroll-wrapper[data-v-8cd1bb9c]{top:0}@keyframes lighter-data-v-8cd1bb9c{0%{background-color:#000}50%{background-color:#000}51%{background-color:transparent}to{background-color:transparent}}@keyframes rotater-data-v-8cd1bb9c{0%{-webkit-transform:rotate(0)}to{-webkit-transform:rotate(1turn)}}.get-money-activity[data-v-8cd1bb9c]{padding:6.4px;padding:.4rem;text-align:center;background-color:#fff}.get-money-activity .get-money-title[data-v-8cd1bb9c]{display:-ms-flexbox;display:flex;-ms-flex-pack:justify;justify-content:space-between;font-size:5.973px;font-size:.37333333rem;line-height:7.04px;line-height:.44rem;margin-top:5.546px;margin-top:.34666667rem;font-family:PingFangSC-Regular}.get-money-activity .get-money-title .one[data-v-8cd1bb9c]{color:#333}.get-money-activity .get-money-title .two[data-v-8cd1bb9c]{color:#ff7728}.get-money-activity .money[data-v-8cd1bb9c]{text-align:left;color:#333;font-size:13.653px;font-size:.85333333rem;line-height:18.773px;line-height:1.17333333rem;font-family:DINAlternate-Bold}.get-money-activity .money-desc[data-v-8cd1bb9c]{font-family:PingFangSC-Regular;color:#333;font-size:5.973px;font-size:.37333333rem;line-height:8.533px;line-height:.53333333rem;margin-top:5.333px;margin-top:.33333333rem;margin-bottom:5.333px;margin-bottom:.33333333rem;text-align:left}.get-money-activity .money-list[data-v-8cd1bb9c]{display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;-ms-flex-pack:start;justify-content:flex-start}.get-money-activity .money-list li[data-v-8cd1bb9c]{width:45.866px;width:2.86666667rem;height:23.253px;height:1.45333333rem;line-height:23.253px;line-height:1.45333333rem;font-size:11.093px;font-size:.69333333rem;color:#333;border:1px solid #bcbcbc;font-family:DINAlternate-Bold;border-radius:.10666667rem;margin-bottom:4.693px;margin-bottom:.29333333rem}.get-money-activity .money-list li[data-v-8cd1bb9c]:nth-child(3n-1){margin-left:4.693px;margin-left:.29333333rem;margin-right:4.693px;margin-right:.29333333rem}.get-money-activity .money-list li span[data-v-8cd1bb9c]{font-size:8.96px;font-size:.56rem}.get-money-activity .money-list .li-disabled[data-v-8cd1bb9c]{color:#dfdfdf}.get-money-activity .money-list .li-actived[data-v-8cd1bb9c]{color:#ff7728;border:1px solid #ff7728;background-color:rgba(255,119,40,.1)}.get-money-activity .get-money-desc[data-v-8cd1bb9c]{font-family:PingFangSC-Regular;color:#333;font-size:5.973px;font-size:.37333333rem;line-height:9.386px;line-height:.58666667rem;margin-top:2.133px;margin-top:.13333333rem;margin-bottom:12.8px;margin-bottom:.8rem;text-align:left}.get-money-activity .button-disabled[data-v-8cd1bb9c],.get-money-activity .money-button[data-v-8cd1bb9c]{width:100%;height:18.773px;height:1.17333333rem;line-height:18.773px;line-height:1.17333333rem;font-size:6.826px;font-size:.42666667rem;border-radius:.02666667rem;color:#fff;font-family:PingFangSC-Medium;font-weight:700}.get-money-activity .button-disabled[data-v-8cd1bb9c]{background-color:rgb(253,117,100)}.get-money-activity .money-button[data-v-8cd1bb9c]{background-color:#ff7728}.get-money-activity .money-exchange-link[data-v-8cd1bb9c]{width:100%;height:42.666px;height:2.66666667rem;margin-top:6.4px;margin-top:.4rem}.get-money-activity .money-exchange-link img[data-v-8cd1bb9c]{width:100%;height:100%}</style><style type="text/css" title="fading circle style">.circle-color-12 > div::before { background-color: #ccc; }
+</style>
+<style type="text/css">
+::-webkit-input-placeholder { /* WebKit, Blink, Edge */
+    color: #333;
+    font-size: 40px;
+}
+:-moz-placeholder { /* Mozilla Firefox 4 to 18 */
+    color: #333;
+    font-size: 40px;
+}
+::-moz-placeholder { /* Mozilla Firefox 19+ */
+    color: #333;
+    font-size: 40px;
+}
+:-ms-input-placeholder { /* Internet Explorer 10-11 */
+    color: #333;
+    font-size: 40px;
+}
+
+[class*=-container].active {
+    visibility: visible;
+    opacity: 1;
+}
+.popup-container {
+    z-index: 9993;
+    /* -webkit-transition: all .3s ease-out; */
+    transition: all .3s ease-out;
+}
+.loading-container, .popup-container {
+    left: 50%;
+    top: 50%;
+    -webkit-transform: translate(-50%,-50%);
+    transform: translate(-50%,-50%);
+}
+[class*=-container] {
+    visibility: hidden;
+    opacity: 0;
+    position: fixed;
+}
+.popup-container .popup {
+    border-radius: .05333333rem;
+    width: 7.33333333rem;
+    font-size: .4rem;
+    -webkit-box-shadow: 0 0 2px rgba(0,0,0,.2);
+    box-shadow: 0 0 2px rgba(0,0,0,.2);
+    text-align: center;
+    background-color: #fff;
+}
+.popup-container .popup .popup-body {
+    padding: .64rem .32rem;
+    font-size: .95em;
+    overflow-y: auto;
+    overflow-x: hidden;
+}
+.popup-container .popup .popup-btns {
+    display: -webkit-box;
+    display: -webkit-flex;
+    display: flex;
+    -webkit-box-direction: normal;
+    -webkit-box-orient: horizontal;
+    -webkit-flex-direction: row;
+    flex-direction: row;
+}
+.popup-container .popup .popup-btns .btn {
+    padding: .26666667rem 0;
+    -webkit-box-flex: 1;
+    -webkit-flex: 1;
+    flex: 1;
+    display: block;
+    background: inherit;
+}
+.popup-container .popup-btns .btn {
+    color: #ff721f;
+}
+.popup-container .popup-btns .btn {
+    color: #ff721f;
+}
+.btn.btn-positive {
+    color: #3d98cc;
+    font-weight: 700;
+}
+.btn {
+    padding: 0 .4rem;
+    background-color: #f8f8f8;
+    color: #444;
+    position: relative;
+    display: inline-block;
+    border: none;
+    text-align: center;
+    text-overflow: ellipsis;
+}
+</style>
+<link rel="stylesheet" href="${resourcePath}/css/h5.css">
+<link rel="stylesheet" href="${resourcePath}/css/h5-common.css">
+
+</head>
+<body>
+<div id="app" class="app">
+    <div data-v-8cd1bb9c="" class="ui-page get-money-activity">
+        <div style="background-color: #fff;">
+            <div data-v-8cd1bb9c="" class="money-desc">
+                <div style="display: flex; justify-content: space-between;padding: 0 0 3px 0;">
+                    <div style="font-family:PingFangSC-Medium; font-size: .6rem;">
+                        提现金额
+                    </div>
+                    <div data-v-8cd1bb9c="" id="detail" class="get-money-title">
+                        <span data-v-8cd1bb9c="" class="two" style="margin-top: -0.4rem;">奖励金提现记录</span>
+                    </div>
+                </div>
+                <input style="width: 100%; height: 2rem;font-size: 30px; background-color:#fff;" type="number" name="cashAmt" id="cashAmt"  placeholder="￥0.00">
+            </div>
+            <div data-v-8cd1bb9c="" class="money-desc" >
+                <div data-v-8cd1bb9c="" class="get-money-title">
+                    <span data-v-8cd1bb9c="" class="one">可提现<span id="use"><fmt:formatNumber type="number" value="${useAmt}" pattern="0.00" maxFractionDigits="2"/></span>元,不可提现<span id="nouse"><fmt:formatNumber type="number" value="${noMarketAmt}" pattern="0.00" maxFractionDigits="2"/></span>元</span>
+                </div>
+            </div>
+            <ul data-v-8cd1bb9c="" class="money-list">
+                <li data-v-8cd1bb9c="" class="li-disabled" onclick="getCashValue(50)">50<span data-v-8cd1bb9c="" class="yuan">元</span></li>
+                <li data-v-8cd1bb9c="" class="li-disabled" onclick="getCashValue(100)">100<span data-v-8cd1bb9c="" class="yuan">元</span></li>
+                <li data-v-8cd1bb9c="" class="li-disabled" onclick="getCashValue(200)">200<span data-v-8cd1bb9c="" class="yuan">元</span></li>
+                <li data-v-8cd1bb9c="" class="li-disabled" onclick="getCashValue(300)">300<span data-v-8cd1bb9c="" class="yuan">元</span></li>
+                <li data-v-8cd1bb9c="" class="li-disabled" onclick="getCashValue(500)">500<span data-v-8cd1bb9c="" class="yuan">元</span></li>
+                <li data-v-8cd1bb9c="" class="li-disabled" onclick="getCashValue()">全部<span data-v-8cd1bb9c="" class="yuan"></span></li>
+            </ul>
+        </div>
+        <div data-v-8cd1bb9c="" class="get-money-desc"></div>
+        <div data-v-8cd1bb9c="" class="button-disabled">提现</div>
+        <div data-v-8cd1bb9c="" class="money-exchange-link">
+            <img data-v-8cd1bb9c="" src="https://p1.yqbimg.net/h5/v/manager/static/money-exchange-banner-b44f4c.png" alt="">
+        </div>
+    </div>
+</div>
+<div class="mint-indicator" style="display: none;">
+    <div class="mint-indicator-wrapper" style="padding: 20px;">
+        <span class="mint-indicator-spin">
+            <div class="mint-spinner-fading-circle circle-color-12" style="width: 32px; height: 32px;">
+                <div class="mint-spinner-fading-circle-circle is-circle2">
+
+                </div>
+                <div class="mint-spinner-fading-circle-circle is-circle3">
+
+                </div>
+                <div class="mint-spinner-fading-circle-circle is-circle4">
+
+                </div>
+                <div class="mint-spinner-fading-circle-circle is-circle5">
+
+                </div>
+                <div class="mint-spinner-fading-circle-circle is-circle6">
+
+                </div>
+                <div class="mint-spinner-fading-circle-circle is-circle7">
+
+                </div>
+                <div class="mint-spinner-fading-circle-circle is-circle8">
+
+                </div>
+                <div class="mint-spinner-fading-circle-circle is-circle9">
+
+                </div>
+                <div class="mint-spinner-fading-circle-circle is-circle10">
+
+                </div>
+                <div class="mint-spinner-fading-circle-circle is-circle11">
+
+                </div>
+                <div class="mint-spinner-fading-circle-circle is-circle12">
+
+                </div>
+                <div class="mint-spinner-fading-circle-circle is-circle13">
+
+                </div>
+            </div>
+        </span>
+        <span class="mint-indicator-text" style="">加载中...</span>
+    </div>
+</div>
+<div class="backdrop-container active" style="display: none;"></div>
+<div class="popup-container active" style="display: none;">
+    <div class="popup"><!---->
+        <div class="popup-body"></div>
+        <div class="popup-btns" id="popup-btns" onclick="hide(this)"><span class="btn btn-positive">确定</span></div>
+    </div>
+</div>
+<script type="text/javascript">
+    /* === 判断支持版本 end === */
+    // refs http://www.html-js.com/article/3041 移动端高清、多屏适配方案
+    !function (a, b) {
+        function c() {
+            var b = f.getBoundingClientRect().width;
+            b / i > 540 && (b = 540 * i);
+            var c = b / 10;
+            f.style.fontSize = c + "px", k.rem = a.rem = c
+        }
+
+        var d, e = a.document,
+            f = e.documentElement,
+            g = e.querySelector('meta[name="viewport"]'),
+            h = e.querySelector('meta[name="flexible"]'),
+            i = 0,
+            j = 0,
+            k = b.flexible || (b.flexible = {});
+        if (g) {
+            var l = g.getAttribute("content").match(/initial\-scale=([\d\.]+)/);
+            l && (j = parseFloat(l[1]), i = parseInt(1 / j))
+        } else if (h) {
+            var m = h.getAttribute("content");
+            if (m) {
+                var n = m.match(/initial\-dpr=([\d\.]+)/),
+                    o = m.match(/maximum\-dpr=([\d\.]+)/);
+                n && (i = parseFloat(n[1]), j = parseFloat((1 / i).toFixed(2))), o && (i = parseFloat(o[1]), j = parseFloat((
+                    1 / i).toFixed(2)))
+            }
+        }
+        if (!i && !j) {
+            var p = (a.navigator.appVersion.match(/android/gi), a.navigator.appVersion.match(/iphone/gi)),
+                q = a.devicePixelRatio;
+            i = p ? q >= 3 && (!i || i >= 3) ? 3 : q >= 2 && (!i || i >= 2) ? 2 : 1 : 1, j = 1 / i
+        }
+        if (f.setAttribute("data-dpr", i), !g)
+            if (g = e.createElement("meta"), g.setAttribute("name", "viewport"), g.setAttribute("content",
+                "initial-scale=" + j + ", maximum-scale=" + j + ", minimum-scale=" + j + ", user-scalable=no"), f
+                .firstElementChild) f.firstElementChild.appendChild(g);
+            else {
+                var r = e.createElement("div");
+                r.appendChild(g), e.write(r.innerHTML)
+            }
+        a.addEventListener("resize", function () {
+            clearTimeout(d), d = setTimeout(c, 300)
+        }, !1), a.addEventListener("pageshow", function (a) {
+            a.persisted && (clearTimeout(d), d = setTimeout(c, 300))
+        }, !1), "complete" === e.readyState ? e.body.style.fontSize = 12 * i + "px" : e.addEventListener(
+            "DOMContentLoaded",
+            function () {
+                e.body.style.fontSize = 12 * i + "px"
+            }, !1), c(), k.dpr = a.dpr = i, k.refreshRem = c, k.rem2px = function (a) {
+            var b = parseFloat(a) * this.rem;
+            return "string" == typeof a && a.match(/rem$/) && (b += "px"), b
+        }, k.px2rem = function (a) {
+            var b = parseFloat(a) / this.rem;
+            return "string" == typeof a && a.match(/px$/) && (b += "rem"), b
+        }
+    }(window, window.lib || (window.lib = {}));
+</script>
+<script>
+    $('.button-disabled').bind('click',function (e) {
+        //$('.d-title').show();
+        var cashAmt = $("#cashAmt").val();
+        if(!cashAmt){
+            $('.popup-body').html("提现金额不能为空！");
+            $('.active').show();
+            return;
+        }
+        var reg = /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/;
+        if (!reg.test(cashAmt)) {
+            $('.popup-body').html("提现金额格式有误！");
+            $('.active').show();
+            return;
+        }
+        if (parseFloat(cashAmt) < 50.00) {
+            $('.popup-body').html("单笔提现金额不能小于50");
+            $('.active').show();
+            return;
+        }
+        if (parseFloat(cashAmt) > 50000.00) {
+            $('.popup-body').html("单笔最多5万！");
+            $('.active').show();
+            return;
+        }
+        var useAmt = $("#use").html();
+        if(parseFloat(useAmt) < parseFloat(cashAmt)){
+            $('.popup-body').html("不可超过可提现金额！");
+            $('.active').show();
+            return;
+        }
+        $(".mint-indicator").show();
+        $.ajax({
+            url : ctx + '/activity/withdraw',
+            dataType : 'json',
+            type : "post",
+            data : {
+                'cashAmt' : cashAmt,
+                'token': '${token}'
+            },
+            success : function(res) {
+                $(".mint-indicator").hide();
+                if(res.code == 200){
+                    $('.popup-body').html("操作成功！");
+                    $('.active').show();
+                    var money = res.data;
+                    $("#use").html(parseFloat(money).toFixed(2));
+                    $("#cashAmt").val("");
+                }else {
+                    $('.popup-body').html(res.message);
+                    $('.active').show();
+                    return;
+                }
+            },
+        });
+    })
+    $("#detail").on('click',function () {
+        window.location.href=ctx + "/activity/detail?type=2&token="+'${token}';
+    })
+    function hide(obj) {
+        $('.active').hide();
+    }
+    function getCashValue(value) {
+        if(value != undefined){
+            $("#cashAmt").val(parseFloat(value).toFixed(2));
+        }else{
+            var useAmt = $("#use").html();
+            $("#cashAmt").val(parseFloat(useAmt).toFixed(2));
+        }
+    }
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/jsp/activity/desc.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/activity/desc.jsp
new file mode 100644
index 0000000..3ac2697
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/activity/desc.jsp
@@ -0,0 +1,244 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<!DOCTYPE html>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html lang="en" data-dpr="1" style="font-size: 37.52px;">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta name="viewport"
+          content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no,viewport-fit=cover">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <meta name="format-detection" content="telephone=no">
+    <meta name="keywords" content="">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+	<c:set var="ctx" value="${pageContext.request.contextPath}"  scope="request"/>
+	<c:set var="resourcePath" value="${ctx}/resources"  scope="request"/>
+	<script type="text/javascript">
+		var ctx = "${ctx}"; //上下文路径
+		var resourcePath = "${resourcePath}";
+	</script>
+    <title>奖励金说明</title>
+	<link rel="stylesheet" href="${resourcePath}/css/h5.css">
+	<link rel="stylesheet" href="${resourcePath}/css/h5-common.css">
+	<style>
+		* {
+			-webkit-box-sizing: border-box;
+			box-sizing: border-box;
+			margin: 0;
+			padding: 0;
+			outline: 0;
+			-webkit-tap-highlight-color: rgba(0,0,0,0);
+		}
+		div {
+			display: block;
+		}
+		.top{
+			position: absolute;
+			top: 1rem;
+			left: 30%;
+			color: #FFFFFF;
+			height: .93333333rem;
+			line-height: .93333333rem;
+			font-size: .6rem;
+			font-weight: 500;
+			background-color: rgba(255,255,255,.2);
+		}
+		.desc{
+			margin-top: 0.5rem;
+		}
+		.content-1 .title{
+			height: .6rem;
+			padding: 10px 0;
+			font-size: .433333rem;
+			font-family: DINAlternate-Bold;
+			text-align: center;
+			font-weight: 600;
+		}
+		.content-1 .desc{
+			font-size: .353333rem;
+			margin-top: .823333rem;
+			font-family: PingFangSC-Regular,Helvetica,sans-serif;
+			width: 90%;
+			margin-left: 6%;
+			color: rgba(0,0,0,.6);
+			line-height: 25px;
+		}
+
+		.content-2 .title{
+			height: .6rem;
+			font-size: .433333rem;
+			margin-top: 10px;
+			font-family: DINAlternate-Bold;
+			text-align: center;
+			font-weight: 600;
+		}
+
+		.content-2 .desc{
+			height: .6rem;
+			font-size: .353333rem;
+			font-family: PingFangSC-Regular,Helvetica,sans-serif;
+			width: 90%;
+			margin-left: 6%;
+			color: rgba(0,0,0,.6);
+			line-height: 25px;
+		}
+		.content-3  .title{
+			height: .6rem;
+			font-size: .433333rem;
+			margin-top: 2.5888rem;
+			font-family: DINAlternate-Bold;
+			text-align: center;
+			font-weight: 600;
+		}
+		.content-3 .desc{
+			height: .6rem;
+			font-size: .353333rem;
+			font-family: PingFangSC-Regular,Helvetica,sans-serif;
+			width: 90%;
+			margin-left: 6%;
+			color: rgba(0,0,0,.6);
+			margin-bottom: 3rem;
+			line-height: 25px;
+		}
+	</style>
+</head>
+<body style="font-size: 12px;">
+	<div id="app">
+		<div style="width: 100%;height: 2rem;">
+			<img width="100%" src="https://syb-resource.oss-cn-hangzhou.aliyuncs.com/upload/app/B06EC7846DB34E4FBB15F1493627C9DA.jpg?Expires=1916296893&OSSAccessKeyId=LTAI4G25PY4Tebxq4gCrhtF5&Signature=InjkIawrAHlXqj89Rs1sus3JVZM%3D">
+			<div class="top">
+				<div>>>积分说明<<</div>
+			</div>
+			<div class="content">
+				<div class="content-1 text">
+					<div class="title">
+						<div><span style="color: #FD7564"> >>> </span>1.积分是什么<span style="color: #FD7564"> <<< </span></div>
+					</div>
+					<div class="desc">
+						积分是商户参与收银呗活动所获得的奖励，可以兑换商品或参与其他活动。
+						订单交易所获得的积分，在交易订单满一个月后方可使用，防止违规获取积分（如恶意退款、套现、虚假订单、刷单等）
+						违规商户扣除所有奖励，永久关闭积分活动权限。
+					</div>
+				</div>
+				<div class="content-2 text">
+					<div class="title">
+						<div><span style="color: #FD7564"> >>> </span>2.积分如何使用<span style="color: #FD7564"> <<< </span></div>
+					</div>
+					<div class="desc">
+						<div>
+							<div style="font-weight: 600;color: #000;">
+								兑换商品
+							</div>
+							<div style="margin-top: .122rem;line-height: 0.6rem;">
+								积分可以在<span style="color: orangered">＂商户活动-积分&lt;兑换商品&gt;＂</span>页页面进行商品兑换，兑换商品后，将会扣除等额积分，详细兑换规则可以联系收银呗客服。
+							</div>
+						</div>
+					</div>
+				</div>
+				<div class="content-3">
+					<div class="title">
+						<div><span style="color: #FD7564"> >>> </span>3.积分如何获取<span style="color: #FD7564"> <<< </span></div>
+					</div>
+					<div class="desc">
+						部分地区商户参与营销活动、日常签到等即可获取对应积分，积分获取方式不得有违规（如恶意退款、套现、虚假订单、刷单等），否则我司有权冻结并清除积分。
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+	<script type="text/javascript">
+		/* === 判断支持版本 start === */
+		(function () {
+			var viewportTag = null;
+			var metaTags = document.getElementsByTagName('meta');
+			for (var i = 0; i < metaTags.length; i++) {
+				if (metaTags[i].getAttribute('name') === "viewport") {
+					viewportTag = metaTags[i];
+					break;
+				}
+			}
+			if (!viewportTag) {
+				viewportTag = document.createElement("meta");
+				viewportTag.setAttribute('name', 'viewport');
+			}
+
+			var viewportTagContent =
+					'width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no';
+
+			// Detect if iOS device
+			if (/(iPhone|iPod|iPad)/i.test(window.navigator.userAgent)) {
+				// Get iOS major version
+				var iosVersion = parseInt((window.navigator.userAgent).match(/OS (\d+)_(\d+)_?(\d+)? like Mac OS X/i)[1]);
+				// Detect if device is running >iOS 11
+				// iOS 11's UIWebView and WKWebView changes the viewport behaviour to render viewport without the status bar. Need to override with "viewport-fit: cover" to include the status bar.
+				if (iosVersion >= 11) {
+					viewportTagContent += ', viewport-fit=cover';
+				}
+			}
+
+			// Update viewport tag attribute
+			viewportTag.setAttribute('content', viewportTagContent);
+		})();
+		/* === 判断支持版本 end === */
+
+		// refs http://www.html-js.com/article/3041 移动端高清、多屏适配方案
+		!function (a, b) {
+			function c() {
+				var b = f.getBoundingClientRect().width;
+				b / i > 540 && (b = 540 * i);
+				var c = b / 10;
+				f.style.fontSize = c + "px", k.rem = a.rem = c
+			}
+
+			var d, e = a.document,
+					f = e.documentElement,
+					g = e.querySelector('meta[name="viewport"]'),
+					h = e.querySelector('meta[name="flexible"]'),
+					i = 0,
+					j = 0,
+					k = b.flexible || (b.flexible = {});
+			if (g) {
+				var l = g.getAttribute("content").match(/initial\-scale=([\d\.]+)/);
+				l && (j = parseFloat(l[1]), i = parseInt(1 / j))
+			} else if (h) {
+				var m = h.getAttribute("content");
+				if (m) {
+					var n = m.match(/initial\-dpr=([\d\.]+)/),
+							o = m.match(/maximum\-dpr=([\d\.]+)/);
+					n && (i = parseFloat(n[1]), j = parseFloat((1 / i).toFixed(2))), o && (i = parseFloat(o[1]), j = parseFloat((
+							1 / i).toFixed(2)))
+				}
+			}
+			if (!i && !j) {
+				var p = (a.navigator.appVersion.match(/android/gi), a.navigator.appVersion.match(/iphone/gi)),
+						q = a.devicePixelRatio;
+				i = p ? q >= 3 && (!i || i >= 3) ? 3 : q >= 2 && (!i || i >= 2) ? 2 : 1 : 1, j = 1 / i
+			}
+			if (f.setAttribute("data-dpr", i), !g)
+				if (g = e.createElement("meta"), g.setAttribute("name", "viewport"), g.setAttribute("content",
+						"initial-scale=" + j + ", maximum-scale=" + j + ", minimum-scale=" + j + ", user-scalable=no"), f
+						.firstElementChild) f.firstElementChild.appendChild(g);
+				else {
+					var r = e.createElement("div");
+					r.appendChild(g), e.write(r.innerHTML)
+				}
+			a.addEventListener("resize", function () {
+				clearTimeout(d), d = setTimeout(c, 300)
+			}, !1), a.addEventListener("pageshow", function (a) {
+				a.persisted && (clearTimeout(d), d = setTimeout(c, 300))
+			}, !1), "complete" === e.readyState ? e.body.style.fontSize = 12 * i + "px" : e.addEventListener(
+					"DOMContentLoaded",
+					function () {
+						e.body.style.fontSize = 12 * i + "px"
+					}, !1), c(), k.dpr = a.dpr = i, k.refreshRem = c, k.rem2px = function (a) {
+				var b = parseFloat(a) * this.rem;
+				return "string" == typeof a && a.match(/rem$/) && (b += "px"), b
+			}, k.px2rem = function (a) {
+				var b = parseFloat(a) / this.rem;
+				return "string" == typeof a && a.match(/px$/) && (b += "rem"), b
+			}
+		}(window, window.lib || (window.lib = {}));
+	</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/jsp/activity/detail.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/activity/detail.jsp
new file mode 100644
index 0000000..f64e634
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/activity/detail.jsp
@@ -0,0 +1,1852 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<!DOCTYPE html>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html lang="en" data-dpr="1">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta name="viewport"
+          content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no,viewport-fit=cover">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <meta name="format-detection" content="telephone=no">
+    <meta name="keywords" content="">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<c:set var="ctx" value="${pageContext.request.contextPath}"  scope="request"/>
+	<c:set var="resourcePath" value="${ctx}/resources"  scope="request"/>
+	<script type="text/javascript">
+		var ctx = "${ctx}"; //上下文路径
+		var resourcePath = "${resourcePath}";
+		document.writeln('<script type="text/javascript" src="'+resourcePath+'/js/global.js?d=' + new Date().getTime() + '" ><\/script>');
+	</script>
+    <title>明细</title>
+	<link rel="stylesheet" href="https://unpkg.com/mescroll.js@1.4.1/mescroll.min.css">
+	<style type="text/css">.mint-popup-bottom[data-v-8cd1bb9c] {
+		-webkit-transform: translate3d(-50%, 0, 0) !important
+	}
+
+	.mint-indicator-wrapper[data-v-8cd1bb9c] {
+		-webkit-transform: translate(-50%, -50%);
+		z-index: 999
+	}
+
+	#app[data-v-8cd1bb9c], body[data-v-8cd1bb9c], html[data-v-8cd1bb9c] {
+		font-size: 5.973px;
+		font-size: .37333333rem;
+		height: 100%;
+		color: #333;
+		-webkit-user-select: none;
+		-moz-user-select: none;
+		-o-user-select: none;
+		-ms-user-select: none;
+		user-select: none
+	}
+
+	body[data-v-8cd1bb9c], html[data-v-8cd1bb9c], input[data-v-8cd1bb9c], textarea[data-v-8cd1bb9c] {
+		font-family: PingFangSC-Regular, Helvetica, sans-serif
+	}
+
+	input[data-v-8cd1bb9c], textarea[data-v-8cd1bb9c] {
+		background-color: #fff
+	}
+
+	input[data-v-8cd1bb9c], li[data-v-8cd1bb9c], ol[data-v-8cd1bb9c], textarea[data-v-8cd1bb9c], ul[data-v-8cd1bb9c] {
+		padding: 0;
+		border: 0;
+		margin: 0
+	}
+
+	.tc[data-v-8cd1bb9c] {
+		text-align: center
+	}
+
+	.tr[data-v-8cd1bb9c] {
+		text-align: right
+	}
+
+	.tl[data-v-8cd1bb9c] {
+		text-align: left
+	}
+
+	.c4b[data-v-8cd1bb9c] {
+		color: #4b4b4b
+	}
+
+	.c000[data-v-8cd1bb9c] {
+		color: #000
+	}
+
+	.c333[data-v-8cd1bb9c] {
+		color: #333
+	}
+
+	.c666[data-v-8cd1bb9c] {
+		color: #666
+	}
+
+	.c999[data-v-8cd1bb9c] {
+		color: #999
+	}
+
+	.cccc[data-v-8cd1bb9c] {
+		color: #ccc
+	}
+
+	.cddd[data-v-8cd1bb9c] {
+		color: #ddd
+	}
+
+	.c9b9b[data-v-8cd1bb9c] {
+		color: #9b9b9b
+	}
+
+	.cblue[data-v-8cd1bb9c] {
+		color: #3089f7
+	}
+
+	.cred[data-v-8cd1bb9c] {
+		color: red
+	}
+
+	.cora[data-v-8cd1bb9c] {
+		color: #faa800
+	}
+
+	.cbase[data-v-8cd1bb9c] {
+		color: #ff721f
+	}
+
+	.cfff[data-v-8cd1bb9c] {
+		color: #fff
+	}
+
+	.bfff[data-v-8cd1bb9c] {
+		background-color: #fff
+	}
+
+	.bbase[data-v-8cd1bb9c] {
+		background-color: #ff721f
+	}
+
+	.fl[data-v-8cd1bb9c] {
+		float: left
+	}
+
+	.fr[data-v-8cd1bb9c] {
+		float: right
+	}
+
+	.mt10[data-v-8cd1bb9c] {
+		margin-top: 4.266px;
+		margin-top: .26666667rem
+	}
+
+	.ml15[data-v-8cd1bb9c] {
+		margin-left: 6.4px;
+		margin-left: .4rem
+	}
+
+	.mr15[data-v-8cd1bb9c] {
+		margin-right: 6.4px;
+		margin-right: .4rem
+	}
+
+	.mt15[data-v-8cd1bb9c] {
+		margin-top: 6.4px;
+		margin-top: .4rem
+	}
+
+	.mb15[data-v-8cd1bb9c] {
+		margin-bottom: 6.4px;
+		margin-bottom: .4rem
+	}
+
+	.pl15[data-v-8cd1bb9c] {
+		padding-left: 6.4px;
+		padding-left: .4rem
+	}
+
+	.pr15[data-v-8cd1bb9c] {
+		padding-right: 6.4px;
+		padding-right: .4rem
+	}
+
+	.pt15[data-v-8cd1bb9c] {
+		padding-top: 6.4px;
+		padding-top: .4rem
+	}
+
+	.pb15[data-v-8cd1bb9c] {
+		padding-bottom: 6.4px;
+		padding-bottom: .4rem
+	}
+
+	.mt30[data-v-8cd1bb9c] {
+		margin-top: 12.8px;
+		margin-top: .8rem
+	}
+
+	.mb30[data-v-8cd1bb9c] {
+		margin-bottom: 12.8px;
+		margin-bottom: .8rem
+	}
+
+	.fz12[data-v-8cd1bb9c] {
+		font-size: 5.12px;
+		font-size: .32rem
+	}
+
+	.fz13[data-v-8cd1bb9c] {
+		font-size: 5.546px;
+		font-size: .34666667rem
+	}
+
+	.fz14[data-v-8cd1bb9c] {
+		font-size: 5.973px;
+		font-size: .37333333rem
+	}
+
+	.fz15[data-v-8cd1bb9c] {
+		font-size: 6.4px;
+		font-size: .4rem
+	}
+
+	.fz16[data-v-8cd1bb9c] {
+		font-size: 6.826px;
+		font-size: .42666667rem
+	}
+
+	.fz18[data-v-8cd1bb9c] {
+		font-size: 7.68px;
+		font-size: .48rem
+	}
+
+	.fz20[data-v-8cd1bb9c] {
+		font-size: 8.533px;
+		font-size: .53333333rem
+	}
+
+	.fz22[data-v-8cd1bb9c] {
+		font-size: 9.386px;
+		font-size: .58666667rem
+	}
+
+	.fz24[data-v-8cd1bb9c] {
+		font-size: 10.24px;
+		font-size: .64rem
+	}
+
+	.fz32[data-v-8cd1bb9c] {
+		font-size: 13.653px;
+		font-size: .85333333rem
+	}
+
+	.fz36[data-v-8cd1bb9c] {
+		font-size: 15.36px;
+		font-size: .96rem
+	}
+
+	.block[data-v-8cd1bb9c] {
+		display: block
+	}
+
+	b[data-v-8cd1bb9c], dfn[data-v-8cd1bb9c], em[data-v-8cd1bb9c] {
+		font-style: normal;
+		font-weight: 400
+	}
+
+	.font-DINAlternate[data-v-8cd1bb9c] {
+		font-family: DINAlternate-Bold, PingFangSC-Regular, Helvetica, sans-serif
+	}
+
+	.arr_r[data-v-8cd1bb9c] {
+		position: relative
+	}
+
+	.arr_r[data-v-8cd1bb9c]:after {
+		content: "";
+		position: absolute;
+		z-index: 80;
+		right: 6.4px;
+		right: .4rem;
+		top: 50%;
+		width: 6px;
+		height: 6px;
+		border: 1px solid #c7c7cc;
+		border-width: 2px 2px 0 0;
+		transform: translateY(-50%) rotate(45deg)
+	}
+
+	.shadow[data-v-8cd1bb9c] {
+		box-shadow: 0 8px 25px 0 #eaebec
+	}
+
+	.ellips[data-v-8cd1bb9c] {
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis
+	}
+
+	.ellips_line2[data-v-8cd1bb9c], .ellips_line3[data-v-8cd1bb9c] {
+		display: -webkit-box;
+		overflow: hidden
+	}
+
+	.ellips_line2[data-v-8cd1bb9c] {
+		-webkit-line-clamp: 2
+	}
+
+	.ellips_line3[data-v-8cd1bb9c] {
+		-webkit-line-clamp: 3
+	}
+
+	.to-check[data-v-8cd1bb9c] {
+		position: relative
+	}
+
+	.to-check.checked[data-v-8cd1bb9c]:before {
+		content: "";
+		position: absolute;
+		top: 50%;
+		right: 6.4px;
+		right: .4rem;
+		width: 6.4px;
+		width: .4rem;
+		height: 3.2px;
+		height: .2rem;
+		border: 2px solid #ff721f;
+		border-width: 0 0 2px 2px;
+		transform: translateY(-50%) rotate(-45deg)
+	}
+
+	.ui-page[data-v-8cd1bb9c] {
+		position: relative;
+		max-width: 256px;
+		max-width: 16rem;
+		min-height: 100%;
+		background-color: #f7f7f7;
+		padding-top: 1px;
+		margin: -1px auto 0
+	}
+
+	.ui-page[data-v-8cd1bb9c]:after {
+		content: "";
+		position: fixed;
+		top: 0;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		z-index: -1;
+		background-color: #f7f7f7
+	}
+
+	button[data-v-8cd1bb9c] {
+		font-size: 6.4px;
+		font-size: .4rem;
+		border-radius: 1px;
+		background-color: #ff721f
+	}
+
+	button.disabled[data-v-8cd1bb9c] {
+		opacity: .4
+	}
+
+	.mebtn[data-v-8cd1bb9c] {
+		width: 100%;
+		padding: 0 6.4px;
+		padding: 0 .4rem
+	}
+
+	input[data-v-8cd1bb9c]::-webkit-input-placeholder {
+		color: #ccc
+	}
+
+	[data-v-8cd1bb9c]:-moz-placeholder, [data-v-8cd1bb9c]::-moz-placeholder {
+		color: #ccc
+	}
+
+	[data-v-8cd1bb9c]:-ms-input-placeholder {
+		color: #ccc
+	}
+
+	[class*=mint-tab-container][data-v-8cd1bb9c] {
+		visibility: visible;
+		position: static;
+		opacity: 1
+	}
+
+	.loading-txt[data-v-8cd1bb9c] {
+		width: 76.8px;
+		width: 4.8rem
+	}
+
+	.loading-txt em[data-v-8cd1bb9c] {
+		display: block;
+		margin: 4.266px auto;
+		margin: .26666667rem auto
+	}
+
+	.loading-txt .txt[data-v-8cd1bb9c] {
+		margin-bottom: 2.56px;
+		margin-bottom: .16rem
+	}
+
+	.v-input-clear[data-v-8cd1bb9c] {
+		position: absolute;
+		right: -4.266px;
+		right: -.26666667rem;
+		top: 50%;
+		display: none;
+		z-index: 9;
+		padding: 4.266px;
+		padding: .26666667rem;
+		background-color: #fff;
+		transform: translateY(-50%)
+	}
+
+	.v-input-clear.active[data-v-8cd1bb9c] {
+		display: block
+	}
+
+	.v-input-clear .icon-font[data-v-8cd1bb9c] {
+		display: block;
+		color: #ccc;
+		font-size: 7.68px;
+		font-size: .48rem
+	}
+
+	.popup-container .popup-title[data-v-8cd1bb9c] {
+		font-weight: 700
+	}
+
+	.popup-container .popup-btns .btn[data-v-8cd1bb9c] {
+		color: #ff721f
+	}
+
+	.flex[data-v-8cd1bb9c] {
+		display: -ms-flexbox;
+		display: flex
+	}
+
+	.flex .flex-li[data-v-8cd1bb9c], .flex li[data-v-8cd1bb9c] {
+		-ms-flex: 1;
+		flex: 1
+	}
+
+	.i-warn-red[data-v-8cd1bb9c] {
+		display: inline-block;
+		width: 20px;
+		height: 20px;
+		background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAAAXNSR0IArs4c6QAAAkNJREFUSA29Vj1PVEEUvWdYA72dFkJCQkGhkJjQECpqTbQyWuhPcMFYUFjYyUfCbyDSYEJvZWhIiDEWmlCxFkBla8Tdfdcz897O7L7F2XkE3yS7e+fOOffMx92ZC0lo+vLOnAAPRWVRILdF9ZajAWf0ndJ3QN8+Nn98GRUOMYA2px6L6FsGm4nh/BhwLII1bJzseV/JuFRQV2amJLt4T7GFEj6xi0Mx40+wfnxSJgwJ6urkkmT6gVt1swyu1If8FINHeNf61M8bEHRiXfnIld3oB13dRlvGZLlf1Au6bdTfR6NXxiCQHU6CXH1KfCM6IbtSTNzvba/xYHtmKdto5BU2Wi/4eU7ua8//l2FjunzIAU6wyMa0BDH61cfGWLC98zJDF3IN6W0HUz+1dbCib2aP5FcH0rloptLc30tkD7o6PS/d9ud0okXyHF2rnFzzRrLOg5xc4RvyjejvFRg5lLeVYaIsViICW0yYOWy27nGl25W41DLubqzEMrse3pBge2fE4D3MFRYXcQQ3MNTQP76vjWB7Z8SgVvgfRnDXNgQot5RPTH3t3CbNaW161LJJc1CbILVs0uzXJkgt48oC91L/Z1lqWK0iS7GWLNfOQmajzx4ZINdw5LwGYVmQ0gzCzdTNgh3l4rBX54THkzWIpDzAmaxrc/Iu49sH+FlUxw66B5ixi+ZffNuvo8QI50FBV3uwBnGzKmZ05R+7slI9Y2MNCFqHE2UNQivtTC1pqJFr65hSxWZhA1ta5tVWCA8JX2Op/xc+6NDNayMwOQAAAABJRU5ErkJggg==) no-repeat;
+		background-size: 20px 20px
+	}
+
+	.i-checked[data-v-8cd1bb9c], .i-unchecked[data-v-8cd1bb9c] {
+		position: relative;
+		display: inline-block;
+		width: 16px;
+		height: 16px;
+		background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+Cjxzdmcgd2lkdGg9IjMycHgiIGhlaWdodD0iMzJweCIgdmlld0JveD0iMCAwIDMyIDMyIiB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPgogICAgPCEtLSBHZW5lcmF0b3I6IFNrZXRjaCA1MC4yICg1NTA0NykgLSBodHRwOi8vd3d3LmJvaGVtaWFuY29kaW5nLmNvbS9za2V0Y2ggLS0+CiAgICA8dGl0bGU+5Y2P6K6u5Yu+L+WLvjwvdGl0bGU+CiAgICA8ZGVzYz5DcmVhdGVkIHdpdGggU2tldGNoLjwvZGVzYz4KICAgIDxkZWZzPjwvZGVmcz4KICAgIDxnIGlkPSLljY/orq7li74v5Yu+IiBzdHJva2U9Im5vbmUiIHN0cm9rZS13aWR0aD0iMSIgZmlsbD0ibm9uZSIgZmlsbC1ydWxlPSJldmVub2RkIj4KICAgICAgICA8cGF0aCBkPSJNMjguNDQ0NDQ0NCwwIEwzLjU1NTU1NTU2LDAgQzEuNiwwIDAsMS42IDAsMy41NTU1NTU1NiBMMCwyOC40NDQ0NDQ0IEMwLDMwLjQgMS42LDMyIDMuNTU1NTU1NTYsMzIgTDI4LjQ0NDQ0NDQsMzIgQzMwLjQsMzIgMzIsMzAuNCAzMiwyOC40NDQ0NDQ0IEwzMiwzLjU1NTU1NTU2IEMzMiwxLjYgMzAuNCwwIDI4LjQ0NDQ0NDQsMCBMMjguNDQ0NDQ0NCwwIFogTTEyLjQ0NDQ0NDQsMjQuODg4ODg4OSBMMy41NTU1NTU1NiwxNi4zNDE4ODAzIEw2LjA0NDQ0NDQ0LDEzLjk0ODcxNzkgTDEyLjQ0NDQ0NDQsMjAuMTAyNTY0MSBMMjUuOTU1NTU1Niw3LjExMTExMTExIEwyOC40NDQ0NDQ0LDkuNTA0MjczNSBMMTIuNDQ0NDQ0NCwyNC44ODg4ODg5IEwxMi40NDQ0NDQ0LDI0Ljg4ODg4ODkgWiIgaWQ9IuWLvuS4iiIgZmlsbD0iI0ZGNzIxRiI+PC9wYXRoPgogICAgPC9nPgo8L3N2Zz4=) no-repeat;
+		background-size: 16px auto
+	}
+
+	.i-unchecked[data-v-8cd1bb9c] {
+		background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+Cjxzdmcgd2lkdGg9IjMycHgiIGhlaWdodD0iMzJweCIgdmlld0JveD0iMCAwIDMyIDMyIiB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPgogICAgPCEtLSBHZW5lcmF0b3I6IFNrZXRjaCA1MC4yICg1NTA0NykgLSBodHRwOi8vd3d3LmJvaGVtaWFuY29kaW5nLmNvbS9za2V0Y2ggLS0+CiAgICA8dGl0bGU+5Y2P6K6u5Yu+L+acquWLvjwvdGl0bGU+CiAgICA8ZGVzYz5DcmVhdGVkIHdpdGggU2tldGNoLjwvZGVzYz4KICAgIDxkZWZzPjwvZGVmcz4KICAgIDxnIGlkPSLljY/orq7li74v5pyq5Yu+IiBzdHJva2U9Im5vbmUiIHN0cm9rZS13aWR0aD0iMSIgZmlsbD0ibm9uZSIgZmlsbC1ydWxlPSJldmVub2RkIiBmaWxsLW9wYWNpdHk9IjAuMyI+CiAgICAgICAgPHBhdGggZD0iTTI4LjQ0NDQ0NDQsMCBMMy41NTU1NTU1NiwwIEMxLjYsMCAwLDEuNiAwLDMuNTU1NTU1NTYgTDAsMjguNDQ0NDQ0NCBDMCwzMC40IDEuNiwzMiAzLjU1NTU1NTU2LDMyIEwyOC40NDQ0NDQ0LDMyIEMzMC40LDMyIDMyLDMwLjQgMzIsMjguNDQ0NDQ0NCBMMzIsMy41NTU1NTU1NiBDMzIsMS42IDMwLjQsMCAyOC40NDQ0NDQ0LDAgTDI4LjQ0NDQ0NDQsMCBaIE0xMi40NDQ0NDQ0LDI0Ljg4ODg4ODkgTDMuNTU1NTU1NTYsMTYuMzQxODgwMyBMNi4wNDQ0NDQ0NCwxMy45NDg3MTc5IEwxMi40NDQ0NDQ0LDIwLjEwMjU2NDEgTDI1Ljk1NTU1NTYsNy4xMTExMTExMSBMMjguNDQ0NDQ0NCw5LjUwNDI3MzUgTDEyLjQ0NDQ0NDQsMjQuODg4ODg4OSBMMTIuNDQ0NDQ0NCwyNC44ODg4ODg5IFoiIGlkPSLmsqHli77kuIoiIGZpbGw9IiNGRjcyMUYiPjwvcGF0aD4KICAgIDwvZz4KPC9zdmc+)
+	}
+
+	.model-container .key-body[data-v-8cd1bb9c] {
+		padding-bottom: 1.493px;
+		padding-bottom: .09333333rem;
+		background-color: #d2d5db
+	}
+
+	.model-container .key-body ul.number li[data-v-8cd1bb9c] {
+		height: 14.933px;
+		height: .93333333rem;
+		line-height: 14.933px;
+		line-height: .93333333rem;
+		padding: 3.626px 0;
+		padding: .22666667rem 0;
+		width: 31%;
+		margin: 0 1.7% 1.7% 0;
+		border-radius: 5px;
+		background-color: #fff;
+		box-shadow: 0 1px 0 0 #898a8d
+	}
+
+	.model-container .key-body ul.number li[data-v-8cd1bb9c]:nth-child(3n-2) {
+		margin-left: 1.7%
+	}
+
+	.model-container .key-body ul.number li[data-v-8cd1bb9c]:before {
+		content: none
+	}
+
+	.model-container .key-body ul.number li.key-back[data-v-8cd1bb9c], .model-container .key-body ul.number li.key-null[data-v-8cd1bb9c] {
+		background-color: #d2d5db;
+		box-shadow: none
+	}
+
+	.model-container .key-body ul.number li.key-back[data-v-8cd1bb9c]:active {
+		opacity: .5
+	}
+
+	.freeMask[data-v-8cd1bb9c] {
+		background-color: transparent
+	}
+
+	.vx-header + .scroll-wrapper[data-v-8cd1bb9c] {
+		top: 0
+	}
+
+	@keyframes lighter-data-v-8cd1bb9c {
+		0% {
+			background-color: #000
+		}
+		50% {
+			background-color: #000
+		}
+		51% {
+			background-color: transparent
+		}
+		to {
+			background-color: transparent
+		}
+	}
+
+	@keyframes rotater-data-v-8cd1bb9c {
+		0% {
+			-webkit-transform: rotate(0)
+		}
+		to {
+			-webkit-transform: rotate(1turn)
+		}
+	}
+
+	.get-money-activity[data-v-8cd1bb9c] {
+		padding: 6.4px;
+		padding: .4rem;
+		text-align: center;
+		background-color: #fff
+	}
+
+	.get-money-activity .get-money-title[data-v-8cd1bb9c] {
+		display: -ms-flexbox;
+		display: flex;
+		-ms-flex-pack: justify;
+		justify-content: space-between;
+		font-size: 5.973px;
+		font-size: .37333333rem;
+		line-height: 7.04px;
+		line-height: .44rem;
+		margin-top: 5.546px;
+		margin-top: .34666667rem;
+		font-family: PingFangSC-Regular
+	}
+
+	.get-money-activity .get-money-title .one[data-v-8cd1bb9c] {
+		color: #333
+	}
+
+	.get-money-activity .get-money-title .two[data-v-8cd1bb9c] {
+		color: #ff7728
+	}
+
+	.get-money-activity .money[data-v-8cd1bb9c] {
+		text-align: left;
+		color: #333;
+		font-size: 13.653px;
+		font-size: .85333333rem;
+		line-height: 18.773px;
+		line-height: 1.17333333rem;
+		font-family: DINAlternate-Bold
+	}
+
+	.get-money-activity .money-desc[data-v-8cd1bb9c] {
+		font-family: PingFangSC-Regular;
+		color: #333;
+		font-size: 5.973px;
+		font-size: .37333333rem;
+		line-height: 8.533px;
+		line-height: .53333333rem;
+		margin-top: 5.333px;
+		margin-top: .33333333rem;
+		margin-bottom: 5.333px;
+		margin-bottom: .33333333rem;
+		text-align: left
+	}
+
+	.get-money-activity .money-list[data-v-8cd1bb9c] {
+		display: -ms-flexbox;
+		display: flex;
+		-ms-flex-wrap: wrap;
+		flex-wrap: wrap;
+		-ms-flex-pack: start;
+		justify-content: flex-start
+	}
+
+	.get-money-activity .money-list li[data-v-8cd1bb9c] {
+		width: 45.866px;
+		width: 2.86666667rem;
+		height: 23.253px;
+		height: 1.45333333rem;
+		line-height: 23.253px;
+		line-height: 1.45333333rem;
+		font-size: 11.093px;
+		font-size: .69333333rem;
+		color: #333;
+		border: 1px solid #bcbcbc;
+		font-family: DINAlternate-Bold;
+		border-radius: .10666667rem;
+		margin-bottom: 4.693px;
+		margin-bottom: .29333333rem
+	}
+
+	.get-money-activity .money-list li[data-v-8cd1bb9c]:nth-child(3n-1) {
+		margin-left: 4.693px;
+		margin-left: .29333333rem;
+		margin-right: 4.693px;
+		margin-right: .29333333rem
+	}
+
+	.get-money-activity .money-list li span[data-v-8cd1bb9c] {
+		font-size: 8.96px;
+		font-size: .56rem
+	}
+
+	.get-money-activity .money-list .li-disabled[data-v-8cd1bb9c] {
+		color: #dfdfdf
+	}
+
+	.get-money-activity .money-list .li-actived[data-v-8cd1bb9c] {
+		color: #ff7728;
+		border: 1px solid #ff7728;
+		background-color: rgba(255, 119, 40, .1)
+	}
+
+	.get-money-activity .get-money-desc[data-v-8cd1bb9c] {
+		font-family: PingFangSC-Regular;
+		color: #333;
+		font-size: 5.973px;
+		font-size: .37333333rem;
+		line-height: 9.386px;
+		line-height: .58666667rem;
+		margin-top: 2.133px;
+		margin-top: .13333333rem;
+		margin-bottom: 12.8px;
+		margin-bottom: .8rem;
+		text-align: left
+	}
+
+	.get-money-activity .button-disabled[data-v-8cd1bb9c], .get-money-activity .money-button[data-v-8cd1bb9c] {
+		width: 100%;
+		height: 18.773px;
+		height: 1.17333333rem;
+		line-height: 18.773px;
+		line-height: 1.17333333rem;
+		font-size: 6.826px;
+		font-size: .42666667rem;
+		border-radius: .02666667rem;
+		color: #fff;
+		font-family: PingFangSC-Medium;
+		font-weight: 700
+	}
+
+	.get-money-activity .button-disabled[data-v-8cd1bb9c] {
+		background-color: rgb(253, 117, 100)
+	}
+
+	.get-money-activity .money-button[data-v-8cd1bb9c] {
+		background-color: #ff7728
+	}
+
+	.get-money-activity .money-exchange-link[data-v-8cd1bb9c] {
+		width: 100%;
+		height: 42.666px;
+		height: 2.66666667rem;
+		margin-top: 6.4px;
+		margin-top: .4rem
+	}
+	.get-money-activity .money-exchange-link img[data-v-8cd1bb9c] {
+		width: 100%;
+		height: 100%
+	}
+	</style>
+	<style type="text/css">
+		.ui-page {
+			position: relative;
+			max-width: 256px;
+			max-width: 16rem;
+			min-height: 100%;
+			padding-top: 1px;
+			margin: -1px auto 0
+		}
+
+		.ui-page, .ui-page:after {
+			background-color: #f7f7f7
+		}
+
+		.ui-page:after {
+			content: "";
+			position: fixed;
+			top: 0;
+			bottom: 0;
+			left: 0;
+			right: 0;
+			z-index: -1
+		}
+		.money-activity-detail {
+			background-color: #f6f6f6;
+			height: 100%
+		}
+
+		.money-activity-detail .scroll {
+			height: 100%
+		}
+
+		.money-activity-detail .fixed-head {
+			position: fixed;
+			top: 0;
+			z-index: 100;
+			width: 100%
+		}
+		.money-activity-detail .mint-datetime .picker-toolbar .mint-datetime-cancel {
+			text-align: left;
+			padding-left: 6.4px;
+			padding-left: .4rem
+		}
+
+		.money-activity-detail .mint-datetime .picker-toolbar .mint-datetime-confirm {
+			text-align: right;
+			padding-right: 6.4px;
+			padding-right: .4rem
+		}
+
+		.money-activity-detail .mint-datetime .mint-datetime-picker .picker-items .picker-slot:nth-child(3) {
+			display: none
+		}
+
+		.money-activity-detail .mint-datetime-action {
+			color: #FD7564
+		}
+
+		.money-activity-detail .no-more {
+			color: #666;
+			font-family: PingFangSC-Regular;
+			font-size: 4.693px;
+			font-size: .293333rem
+		}
+
+		.money-activity-detail .money-head {
+			padding: 6.4px;
+			padding: .4rem;
+			width: 100%;
+			padding-bottom: 0;
+			background-color: #fff
+		}
+
+		.money-activity-detail .money-head .head {
+			overflow: hidden;
+			height: 29.226px;
+			height: 1.82666667rem;
+			box-shadow: 0 4px 8px 0 hsla(0, 0%, 78%, .5);
+			background-color: #fff;
+			border-radius: .21333333rem;
+			margin-bottom: 6.4px;
+			margin-bottom: .4rem;
+			padding-top: 5.973px;
+			padding-top: .37333333rem
+		}
+
+		.money-activity-detail .money-head .head .top-date {
+			float: left;
+			padding-left: 6.4px;
+			padding-left: .4rem;
+			border-right: 1px dashed #ddd;
+			font-family: PingFangSC-Medium;
+			position: relative;
+			width: 41.6px;
+			width: 2.6rem
+		}
+
+		.money-activity-detail .money-head .head .top-date .year {
+			font-size: 5.12px;
+			font-size: .32rem;
+			color: #999
+		}
+
+		.money-activity-detail .money-head .head .top-date .mouth {
+			font-size: 8.96px;
+			font-size: .56rem;
+			color: #333
+		}
+
+		.money-activity-detail .money-head .head .top-date .arrow-down {
+			position: absolute;
+			border-top-width: 2.986px;
+			border-top-width: .18666667rem;
+			border-bottom-width: 2.986px;
+			border-bottom-width: .18666667rem;
+			border-right-width: 2.986px;
+			border-right-width: .18666667rem;
+			border-left-width: 2.986px;
+			border-left-width: .18666667rem;
+			border-top-color: #999;
+			border-style: solid;
+			border-left-color: transparent;
+			border-bottom-color: transparent;
+			border-right-color: transparent;
+			left: 29.866px;
+			left: 1.86666667rem;
+			top: 6.4px;
+			top: .4rem;
+			opacity: .5
+		}
+
+		.money-activity-detail .money-head .head .top-date img {
+			display: inline-block;
+			float: left;
+			width: 5.333px;
+			width: .33333333rem;
+			height: 3.2px;
+			height: .2rem;
+			margin-left: 2.133px;
+			margin-left: .13333333rem
+		}
+
+		.money-activity-detail .money-head .head .top-money {
+			float: left;
+			padding-left: 4.053px;
+			padding-left: .25333333rem;
+			font-size: 5.12px;
+			font-size: .32rem;
+			line-height: 5.973px;
+			line-height: .37333333rem;
+			color: #333
+		}
+
+		.money-activity-detail .money-head .head .top-money .get {
+			margin-bottom: 4.266px;
+			margin-bottom: .26666667rem;
+			margin-top: 2.133px;
+			margin-top: .13333333rem
+		}
+
+		.money-activity-detail .money-head .head .top-money .fince {
+			color: #ff7728;
+			font-size: 5.12px;
+			font-size: .32rem;
+			margin-left: 8.533px;
+			margin-left: .53333333rem;
+			margin-top: 1.706px;
+			margin-top: .10666667rem;
+			padding-bottom: 1.066px;
+			padding-bottom: .06666667rem;
+			padding-right: 5.973px;
+			padding-right: .37333333rem;
+			border-bottom: 1px solid #ff7728;
+			position: relative
+		}
+
+		.money-activity-detail .money-head .head .top-money .fince:after {
+			content: "";
+			position: absolute;
+			right: 1.28px;
+			right: .08rem;
+			top: 50%;
+			margin-top: -2.133px;
+			margin-top: -.13333333rem;
+			width: 2.133px;
+			width: .13333333rem;
+			height: 3.2px;
+			height: .2rem;
+			background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyB3aWR0aD0iMTBweCIgaGVpZ2h0PSIxNXB4IiB2aWV3Qm94PSIwIDAgMTAgMTUiIHZlcnNpb249IjEuMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayI+CiAgICA8IS0tIEdlbmVyYXRvcjogU2tldGNoIDUyLjYgKDY3NDkxKSAtIGh0dHA6Ly93d3cuYm9oZW1pYW5jb2RpbmcuY29tL3NrZXRjaCAtLT4KICAgIDx0aXRsZT7ljrvlkJHnrq3lpLQ8L3RpdGxlPgogICAgPGRlc2M+Q3JlYXRlZCB3aXRoIFNrZXRjaC48L2Rlc2M+CiAgICA8ZyBpZD0iMDcwMiIgc3Ryb2tlPSJub25lIiBzdHJva2Utd2lkdGg9IjEiIGZpbGw9Im5vbmUiIGZpbGwtcnVsZT0iZXZlbm9kZCI+CiAgICAgICAgPGcgaWQ9IueUqOadpeagh+azqCIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoLTY2OS4wMDAwMDAsIC0xNjIuMDAwMDAwKSIgZmlsbD0iI0ZGNzcyOCIgZmlsbC1ydWxlPSJub256ZXJvIj4KICAgICAgICAgICAgPHBhdGggZD0iTTY2OS45MzQ2OTMsMTY0LjcwMzA1MiBDNjY5LjM1MTQ4NCwxNjQuMTE0Njk5IDY2OS4zNTU2NTQsMTYzLjE2NDk2MSA2NjkuOTQ0MDA3LDE2Mi41ODE3NTIgQzY3MC41MzIzNiwxNjEuOTk4NTQzIDY3MS40ODIwOTgsMTYyLjAwMjcxMyA2NzIuMDY1MzA3LDE2Mi41OTEwNjYgTDY3OC43MTIwNjcsMTY5LjI5NjQ1MyBMNjcyLjA4MTU5OCwxNzUuOTg1NDA1IEM2NzEuNDk4MzksMTc2LjU3Mzc1NyA2NzAuNTQ4NjUxLDE3Ni41Nzc5MjggNjY5Ljk2MDI5OCwxNzUuOTk0NzE5IEM2NjkuMzcxOTQ2LDE3NS40MTE1MSA2NjkuMzY3Nzc1LDE3NC40NjE3NzIgNjY5Ljk1MDk4NCwxNzMuODczNDE5IEw2NzQuNDg3OTMzLDE2OS4yOTY0NTMgTDY2OS45MzQ2OTMsMTY0LjcwMzA1MiBaIiBpZD0i5Y675ZCR566t5aS0Ij48L3BhdGg+CiAgICAgICAgPC9nPgogICAgPC9nPgo8L3N2Zz4=) no-repeat 50%;
+			background-size: cover
+		}
+
+		.money-activity-detail .money-head .getAndOut {
+			display: -ms-flexbox;
+			display: flex;
+			text-align: center;
+			font-size: 5.973px;
+			font-size: .37333333rem;
+			color: #333;
+			height: 18.773px;
+			height: 1.17333333rem;
+			line-height: 18.773px;
+			line-height: 1.17333333rem
+		}
+
+		.money-activity-detail .money-head .getAndOut .left, .money-activity-detail .money-head .getAndOut .right {
+			-ms-flex: 1;
+			flex: 1
+		}
+
+		.money-activity-detail .money-head .getAndOut span {
+			display: inline-block;
+			height: 100%
+		}
+
+		.money-activity-detail .money-head .getAndOut .head-actived {
+			position: relative;
+			color: #FD7564;
+		}
+
+		.money-activity-detail .money-head .getAndOut .head-actived:after {
+			content: "";
+			position: absolute;
+			bottom: 0;
+			left: 0;
+			width: 100%;
+			height: 1.706px;
+			height: .10666667rem;
+			background-color: #ff7728;
+			border-radius: .05333333rem
+		}
+
+		.money-activity-detail .detail {
+			height: auto;
+			padding-top: 60.586px;
+			padding-top: 3.78666667rem;
+			box-sizing: border-box;
+			overflow: scroll
+		}
+
+		.money-activity-detail .detail ul {
+			padding-left: 6.4px;
+			padding-left: .4rem;
+			background-color: #fff
+		}
+
+		.money-activity-detail .detail li {
+			background: -webkit-linear-gradient(top, #ddd 50%, transparent 0) 100% 100%;
+			background-size: 100% 1px;
+			background-repeat: no-repeat;
+			background-color: #fff;
+			padding-right: 6.4px;
+			padding-right: .4rem;
+			padding-bottom: 6.826px;
+			padding-bottom: .42666667rem
+		}
+
+		.money-activity-detail .detail li .detail-top {
+			color: #333;
+			display: -ms-flexbox;
+			display: flex;
+			-ms-flex-pack: justify;
+			justify-content: space-between;
+			height: 16.64px;
+			height: 1.04rem;
+			line-height: 16.64px;
+			line-height: 1.04rem
+		}
+
+		.money-activity-detail .detail li .detail-top span:first-child {
+			font-family: PingFangSC-Medium;
+			font-size: 5.973px;
+			font-size: .37333333rem;
+			width: 85.333px;
+			width: 5.33333333rem;
+			overflow: hidden;
+			white-space: nowrap;
+			text-overflow: ellipsis
+		}
+
+		.money-activity-detail .detail li .detail-top span:nth-child(2) {
+			font-size: 8.533px;
+			font-size: .53333333rem;
+			font-family: DINAlternate-Bold
+		}
+
+		.money-activity-detail .detail li .detail-time {
+			font-size: 5.973px;
+			font-size: .37333333rem;
+			color: #999
+		}
+
+		.money-activity-detail .detail .mint-loadmore-bottom-custom {
+			text-align: center;
+			height: 50px;
+			line-height: 50px;
+			background-color: #f7f7f7
+		}
+
+		.money-activity-detail .detail .mint-loadmore-spinner {
+			display: inline-block;
+			margin-right: 5px;
+			vertical-align: middle
+		}
+
+		.money-activity-detail .go-top {
+			width: 15.786px;
+			width: .98666667rem;
+			height: 15.786px;
+			height: .98666667rem;
+			background: #fff;
+			border: 1px solid #666;
+			border-radius: 50%;
+			position: fixed;
+			right: 6.4px;
+			right: .4rem;
+			top: 192px;
+			top: 12rem;
+			opacity: .6
+		}
+
+		.money-activity-detail .go-top img {
+			display: block;
+			width: 6.826px;
+			width: .42666667rem;
+			height: 8.533px;
+			height: .53333333rem;
+			position: absolute;
+			top: 50%;
+			left: 50%;
+			transform: translate(-50%, -50%)
+		}
+
+		.money-activity-detail .monthNoDetail, .money-activity-detail .noDetail {
+			text-align: center;
+			color: #999;
+			font-family: PingFangSC-Regular
+		}
+
+		.money-activity-detail .monthNoDetail .img, .money-activity-detail .noDetail .img {
+			width: 68.266px;
+			width: 4.26666667rem;
+			height: 68.266px;
+			height: 4.26666667rem;
+			margin: 0 auto;
+			margin-top: 19.84px;
+			margin-top: 1.24rem;
+			margin-bottom: 11.733px;
+			margin-bottom: .73333333rem
+		}
+
+		.money-activity-detail .monthNoDetail .img img, .money-activity-detail .noDetail .img img {
+			width: 100%;
+			height: 100%;
+			display: block
+		}
+
+		.money-activity-detail .monthNoDetail .desc, .money-activity-detail .noDetail .desc {
+			font-size: 7.68px;
+			font-size: .48rem;
+			line-height: 7.68px;
+			line-height: .48rem;
+			margin-bottom: 5.12px;
+			margin-bottom: .32rem
+		}
+
+		.money-activity-detail .monthNoDetail .desc-two, .money-activity-detail .noDetail .desc-two {
+			font-size: 5.973px;
+			font-size: .37333333rem;
+			line-height: 5.973px;
+			line-height: .37333333rem
+		}
+		.mint-popup {
+			position: fixed;
+			background: #fff;
+			top: 50%;
+			left: 50%;
+			transform: translate3d(-50%, -50%, 0);
+			-webkit-backface-visibility: hidden;
+			backface-visibility: hidden;
+			transition: .2s ease-out
+		}
+		.mint-popup-bottom {
+			top: auto;
+			right: auto;
+			bottom: 0;
+			left: 50%;
+			transform: translate3d(-50%, 0, 0)
+		}
+		.mint-datetime {
+			width: 100%
+		}
+
+		.mint-datetime .picker-toolbar {
+			border-bottom: 1px solid #eaeaea
+		}
+
+		.mint-datetime-action {
+			display: inline-block;
+			width: 50%;
+			text-align: center;
+			line-height: 40px;
+			font-size: 16px;
+			color: #26a2ff
+		}
+
+		.mint-datetime-cancel {
+			float: left
+		}
+
+		.mint-datetime-confirm {
+			float: right
+		}
+		.mint-popup-bottom {
+			-webkit-transform: translate3d(-50%, 0, 0) !important
+		}
+		.picker {
+			overflow: hidden
+		}
+
+		.picker-toolbar {
+			height: 40px
+		}
+
+		.picker-items {
+			display: -ms-flexbox;
+			display: flex;
+			-ms-flex-pack: center;
+			justify-content: center;
+			padding: 0;
+			text-align: right;
+			font-size: 24px;
+			position: relative
+		}
+
+		.picker-center-highlight {
+			box-sizing: border-box;
+			position: absolute;
+			left: 0;
+			width: 100%;
+			top: 50%;
+			margin-top: -18px;
+			pointer-events: none
+		}
+
+		.picker-center-highlight:after, .picker-center-highlight:before {
+			content: "";
+			position: absolute;
+			height: 1px;
+			width: 100%;
+			background-color: #eaeaea;
+			display: block;
+			z-index: 15;
+			transform: scaleY(.5)
+		}
+
+		.picker-center-highlight:before {
+			left: 0;
+			top: 0;
+			bottom: auto;
+			right: auto
+		}
+
+		.picker-center-highlight:after {
+			left: 0;
+			bottom: 0;
+			right: auto;
+			top: auto
+		}
+
+		.picker-slot {
+			font-size: 18px;
+			overflow: hidden;
+			position: relative;
+			max-height: 100%
+		}
+
+		.picker-slot.picker-slot-left {
+			text-align: left
+		}
+
+		.picker-slot.picker-slot-center {
+			text-align: center
+		}
+
+		.picker-slot.picker-slot-right {
+			text-align: right
+		}
+
+		.picker-slot.picker-slot-divider {
+			color: #000;
+			display: -ms-flexbox;
+			display: flex;
+			-ms-flex-align: center;
+			align-items: center
+		}
+
+		.picker-slot-wrapper {
+			transition-duration: .3s;
+			transition-timing-function: ease-out;
+			-webkit-backface-visibility: hidden;
+			backface-visibility: hidden
+		}
+
+		.picker-slot-wrapper.dragging, .picker-slot-wrapper.dragging .picker-item {
+			transition-duration: 0s
+		}
+
+		.picker-item {
+			height: 36px;
+			line-height: 36px;
+			padding: 0 10px;
+			white-space: nowrap;
+			position: relative;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			color: #707274;
+			left: 0;
+			top: 0;
+			width: 100%;
+			box-sizing: border-box;
+			transition-duration: .3s;
+			-webkit-backface-visibility: hidden;
+			backface-visibility: hidden
+		}
+
+		.picker-slot-absolute .picker-item {
+			position: absolute
+		}
+
+		.picker-item.picker-item-far {
+			pointer-events: none
+		}
+
+		.picker-item.picker-selected {
+			color: #000;
+			transform: translateZ(0) rotateX(0)
+		}
+
+		.picker-3d .picker-items {
+			overflow: hidden;
+			perspective: 700px
+		}
+
+		.picker-3d .picker-item, .picker-3d .picker-slot, .picker-3d .picker-slot-wrapper {
+			transform-style: preserve-3d
+		}
+
+		.picker-3d .picker-slot {
+			overflow: visible
+		}
+
+		.picker-3d .picker-item {
+			transform-origin: center center;
+			-webkit-backface-visibility: hidden;
+			backface-visibility: hidden;
+			transition-timing-function: ease-out
+		}
+		.money-activity-detail .mint-datetime .picker-toolbar .mint-datetime-cancel {
+			text-align: left;
+			padding-left: 6.4px;
+			padding-left: .4rem
+		}
+
+		.money-activity-detail .mint-datetime .picker-toolbar .mint-datetime-confirm {
+			text-align: right;
+			padding-right: 6.4px;
+			padding-right: .4rem
+		}
+
+		.money-activity-detail .mint-datetime .mint-datetime-picker .picker-items .picker-slot:nth-child(3) {
+			display: none
+		}
+		.v-modal {
+			position: fixed;
+			left: 0;
+			top: 0;
+			width: 100%;
+			height: 100%;
+			opacity: .5;
+			background: #000;
+		}
+		.picker-slot {
+			font-size: 18px;
+			overflow: hidden;
+			position: relative;
+			max-height: 100%
+		}
+
+		.picker-slot.picker-slot-left {
+			text-align: left
+		}
+
+		.picker-slot.picker-slot-center {
+			text-align: center
+		}
+
+		.picker-slot.picker-slot-right {
+			text-align: right
+		}
+
+		.picker-slot.picker-slot-divider {
+			color: #000;
+			display: -ms-flexbox;
+			display: flex;
+			-ms-flex-align: center;
+			align-items: center
+		}
+
+		.picker-slot-wrapper {
+			transition-duration: .3s;
+			transition-timing-function: ease-out;
+			-webkit-backface-visibility: hidden;
+			backface-visibility: hidden
+		}
+
+		.picker-slot-wrapper.dragging, .picker-slot-wrapper.dragging .picker-item {
+			transition-duration: 0s
+		}
+		.picker-item {
+			height: 36px;
+			line-height: 36px;
+			padding: 0 10px;
+			white-space: nowrap;
+			position: relative;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			color: #707274;
+			left: 0;
+			top: 0;
+			width: 100%;
+			box-sizing: border-box;
+			transition-duration: .3s;
+			-webkit-backface-visibility: hidden;
+			backface-visibility: hidden
+		}
+
+		.picker-slot-absolute .picker-item {
+			position: absolute
+		}
+
+		.picker-item.picker-item-far {
+			pointer-events: none
+		}
+
+		.picker-item.picker-selected {
+			color: #000;
+			transform: translateZ(0) rotateX(0)
+		}
+
+		.picker-3d .picker-items {
+			overflow: hidden;
+			perspective: 700px
+		}
+
+		.picker-3d .picker-item, .picker-3d .picker-slot, .picker-3d .picker-slot-wrapper {
+			transform-style: preserve-3d
+		}
+
+		.picker-3d .picker-slot {
+			overflow: visible
+		}
+
+		.picker-3d .picker-item {
+			transform-origin: center center;
+			-webkit-backface-visibility: hidden;
+			backface-visibility: hidden;
+			transition-timing-function: ease-out
+		}
+		.mint-loadmore {
+			overflow: hidden;
+		}
+		.mint-loadmore-top {
+			margin-top: -50px;
+		}
+		.mint-loadmore-text {
+			vertical-align: middle;
+		}
+		.money-activity-detail .detail ul {
+			padding-left: 6.4px;
+			padding-left: .4rem;
+			background-color: #fff;
+		}
+		.mint-loadmore-bottom {
+			margin-bottom: -50px;
+		}
+		.mint-loadmore-bottom, .mint-loadmore-top {
+			text-align: center;
+			height: 50px;
+			line-height: 50px;
+		}
+		.wrapper-order-item{
+			background-color: #fff; padding: 0.233rem; line-height: .8rem;box-shadow: 0 4px 8px 0 hsla(0, 0%, 78%, .5);border-radius: 10px;margin-bottom: .4rem;
+		}
+		.wrapper-order-item-content{
+			display: flex;
+			justify-content: space-between;
+		}
+	</style>
+
+	<style type="text/css" title="fading circle style">.circle-color-12 > div::before {
+		background-color: #ccc;
+	}
+	</style>
+	<style type="text/css">
+		* {
+			margin: 0;
+			padding: 0;
+			-webkit-touch-callout:none;
+			-webkit-user-select:none;
+			-webkit-tap-highlight-color:transparent;
+		}
+		body{background-color: white}
+		ul{list-style-type: none}
+		a {text-decoration: none;color: #18B4FE;}
+		/*列表*/
+		.mescroll{
+			position: fixed;
+			top: 44px;
+			bottom: 0;
+			height: auto;
+			padding-top: 3.2rem;
+		}
+		.padding-list{
+			padding: .4rem;
+		}
+	</style>
+	<link rel="stylesheet" href="${resourcePath}/css/h5.css">
+	<link rel="stylesheet" href="${resourcePath}/css/h5-common.css">
+	<link rel="stylesheet" href="${resourcePath}/css/mobileSelect.css">
+	<script src="https://unpkg.com/mescroll.js@1.4.1/mescroll.min.js" charset="utf-8"></script>
+	<script type="text/javascript" src="${resourcePath}/js/auto-size.js"></script>
+	<script type="text/javascript" src="${resourcePath}/js/mobileSelect.js"></script>
+</head>
+
+<body>
+<div id="app" style="font-size: 12px;">
+	<div class="ui-page money-activity-detail">
+		<div class="scroll">
+			<div class="fixed-head">
+				<div class="money-head" style="left: 0px; right: 0px; top: 0px; z-index: 10;">
+					<div class="head shadow">
+						<div class="top-date">
+							<div class="year">${nowYear}年</div>
+							<div class="mouth">${nowMonth}月</div>
+							<p class="arrow-down" id="trigger"></p></div>
+						<div class="top-money">
+							<div class="get">收入（积分） <span style="color: green">${incomeAmt}</span></div>
+							<div class="out">支出（积分） <span style="color: red">${expendAmt}</span></div>
+							<%--							<div class="out"><span>支出（元） 0</span><!----></div>--%>
+						</div>
+					</div>
+					<div class="getAndOut">
+						<div class="left" id="get" ><span class="${type == '1' ? 'head-actived' : ''} ">收入</span></div>
+						<div class="right" id="out" ><span class="${type == '2' ? 'head-actived' : ''} ">支出</span></div>
+					</div>
+				</div>
+			</div>
+			<div class="detail">
+				<!--滑动区域-->
+				<div id="mescroll-get" class="mescroll" style="display: ${type == '1' || type == null || type == '' ? 'black' : 'none'}">
+					<div id="getlist" class="padding-list">
+<%--						<c:if test="${not empty orderList.records}">--%>
+<%--							<c:forEach items="${orderList.records}" var="order">--%>
+<%--								<div class="wrapper-order-item">--%>
+<%--									<div class="wrapper-order-item-content">--%>
+<%--										<div>订单号</div>--%>
+<%--										<div>${order.orderNumber}</div>--%>
+<%--									</div>--%>
+<%--									<div class="wrapper-order-item-content">--%>
+<%--										<div>订单金额(元)</div>--%>
+<%--										<div><fmt:formatNumber value="${order.consumeFee}" pattern="0.00" maxFractionDigits="2" /></div>--%>
+<%--									</div>--%>
+<%--									<div class="wrapper-order-item-content">--%>
+<%--										<div>积分</div>--%>
+<%--										<div style="color: green">+&nbsp;${order.marketAmt == null ? '0.00' : order.marketAmt}</div>--%>
+<%--									</div>--%>
+<%--									<div class="wrapper-order-item-content">--%>
+<%--										<div>交易时间</div>--%>
+<%--										<div>&nbsp;<fmt:formatDate value='${order.transDt}' pattern='yyyy-MM-dd HH:mm:ss'/></div>--%>
+<%--									</div>--%>
+<%--								</div>--%>
+<%--							</c:forEach>--%>
+<%--						</c:if>--%>
+					</div>
+				</div>
+				<div id="mescroll-out" class="mescroll" style="display: ${type == '2' ? 'black' : 'none'}">
+					<div id="outlist" class="padding-list">
+<%--						<c:if test="${not empty cashList.records}">--%>
+<%--							<c:forEach items="${cashList.records}" var="cash">--%>
+<%--								<div class="wrapper-order-item">--%>
+<%--									<div class="wrapper-order-item-content">--%>
+<%--										<div>订单号</div>--%>
+<%--										<div>${cash.cashNo}</div>--%>
+<%--									</div>--%>
+<%--									<div class="wrapper-order-item-content">--%>
+<%--										<div>积分</div>--%>
+<%--										<div style="color: red">-&nbsp;${cash.cashAmt}</div>--%>
+<%--									</div>--%>
+<%--									<div class="wrapper-order-item-content">--%>
+<%--										<div>状态</div>--%>
+<%--										<c:if test="${cash.status == '1'}">--%>
+<%--											<div style="color: orange">&nbsp;兑换中</div>--%>
+<%--										</c:if>--%>
+<%--										<c:if test="${cash.status == '2'}">--%>
+<%--											<div style="color: green">&nbsp;兑换成功</div>--%>
+<%--										</c:if>--%>
+<%--										<c:if test="${cash.status == '3'}">--%>
+<%--											<div style="color: red">&nbsp;兑换失败</div>--%>
+<%--										</c:if>--%>
+<%--									</div>--%>
+<%--									<div class="wrapper-order-item-content">--%>
+<%--										<div>兑换时间</div>--%>
+<%--										<div>&nbsp;<fmt:formatDate value='${cash.cashTime}' pattern='yyyy-MM-dd HH:mm:ss'/></div>--%>
+<%--									</div>--%>
+<%--								</div>--%>
+<%--							</c:forEach>--%>
+<%--						</c:if>--%>
+					</div>
+				</div>
+			</div>
+		</div>
+		<div class="mint-indicator" style="display: none;">
+			<div class="mint-indicator-wrapper" style="padding: 20px;">
+					<span class="mint-indicator-spin">
+						<div class="mint-spinner-fading-circle circle-color-12" style="width: 32px; height: 32px;">
+							<div class="mint-spinner-fading-circle-circle is-circle2">
+
+							</div>
+							<div class="mint-spinner-fading-circle-circle is-circle3">
+
+							</div>
+							<div class="mint-spinner-fading-circle-circle is-circle4">
+
+							</div>
+							<div class="mint-spinner-fading-circle-circle is-circle5">
+
+							</div>
+							<div class="mint-spinner-fading-circle-circle is-circle6">
+
+							</div>
+							<div class="mint-spinner-fading-circle-circle is-circle7">
+
+							</div>
+							<div class="mint-spinner-fading-circle-circle is-circle8">
+
+							</div>
+							<div class="mint-spinner-fading-circle-circle is-circle9">
+
+							</div>
+							<div class="mint-spinner-fading-circle-circle is-circle10">
+
+							</div>
+							<div class="mint-spinner-fading-circle-circle is-circle11">
+
+							</div>
+							<div class="mint-spinner-fading-circle-circle is-circle12">
+
+							</div>
+							<div class="mint-spinner-fading-circle-circle is-circle13">
+
+							</div>
+						</div>
+					</span>
+				<span class="mint-indicator-text" style="">加载中...</span>
+			</div>
+		</div>
+		<div class="backdrop-container active" style="display: none;"></div>
+
+		<div class="v-modal" style="z-index: 2002; display: none;" ></div>
+	</div>
+</div>
+</div>
+</body>
+<script type="text/javascript">
+	/* === 判断支持版本 end === */
+	// refs http://www.html-js.com/article/3041 移动端高清、多屏适配方案
+	!function (a, b) {
+		function c() {
+			var b = f.getBoundingClientRect().width;
+			b / i > 540 && (b = 540 * i);
+			var c = b / 10;
+			f.style.fontSize = c + "px", k.rem = a.rem = c
+		}
+
+		var d, e = a.document,
+				f = e.documentElement,
+				g = e.querySelector('meta[name="viewport"]'),
+				h = e.querySelector('meta[name="flexible"]'),
+				i = 0,
+				j = 0,
+				k = b.flexible || (b.flexible = {});
+		if (g) {
+			var l = g.getAttribute("content").match(/initial\-scale=([\d\.]+)/);
+			l && (j = parseFloat(l[1]), i = parseInt(1 / j))
+		} else if (h) {
+			var m = h.getAttribute("content");
+			if (m) {
+				var n = m.match(/initial\-dpr=([\d\.]+)/),
+						o = m.match(/maximum\-dpr=([\d\.]+)/);
+				n && (i = parseFloat(n[1]), j = parseFloat((1 / i).toFixed(2))), o && (i = parseFloat(o[1]), j = parseFloat((
+						1 / i).toFixed(2)))
+			}
+		}
+		if (!i && !j) {
+			var p = (a.navigator.appVersion.match(/android/gi), a.navigator.appVersion.match(/iphone/gi)),
+					q = a.devicePixelRatio;
+			i = p ? q >= 3 && (!i || i >= 3) ? 3 : q >= 2 && (!i || i >= 2) ? 2 : 1 : 1, j = 1 / i
+		}
+		if (f.setAttribute("data-dpr", i), !g)
+			if (g = e.createElement("meta"), g.setAttribute("name", "viewport"), g.setAttribute("content",
+					"initial-scale=" + j + ", maximum-scale=" + j + ", minimum-scale=" + j + ", user-scalable=no"), f
+					.firstElementChild) f.firstElementChild.appendChild(g);
+			else {
+				var r = e.createElement("div");
+				r.appendChild(g), e.write(r.innerHTML)
+			}
+		a.addEventListener("resize", function () {
+			clearTimeout(d), d = setTimeout(c, 300)
+		}, !1), a.addEventListener("pageshow", function (a) {
+			a.persisted && (clearTimeout(d), d = setTimeout(c, 300))
+		}, !1), "complete" === e.readyState ? e.body.style.fontSize = 12 * i + "px" : e.addEventListener(
+				"DOMContentLoaded",
+				function () {
+					e.body.style.fontSize = 12 * i + "px"
+				}, !1), c(), k.dpr = a.dpr = i, k.refreshRem = c, k.rem2px = function (a) {
+			var b = parseFloat(a) * this.rem;
+			return "string" == typeof a && a.match(/rem$/) && (b += "px"), b
+		}, k.px2rem = function (a) {
+			var b = parseFloat(a) / this.rem;
+			return "string" == typeof a && a.match(/px$/) && (b += "rem"), b
+		}
+	}(window, window.lib || (window.lib = {}));
+</script>
+<script>
+	var data = '${monthList}';
+	var mobileSelect = new MobileSelect({
+		trigger: '#trigger',
+		wheels: [
+			{data:JSON.parse(data)}
+		],
+		transitionEnd:function(indexArr, data){
+		},
+		callback:function(indexArr, data){
+			$("#trigger").html("");
+			var dateStr = data[0].value + "-" +data[1].value;
+			$(".year").html(data[0].value+"年");
+			$(".mouth").html(data[1].value+"月");
+			$(".mint-indicator").show();
+			var checkDomValue = $(".head-actived").parent("div").attr("id");
+			var type = "";
+			if(checkDomValue == "get"){
+				type = 1
+			}else{
+				type = 2
+			}
+			var url = ctx + '/activity/detail?token=${token}&type='+type+'&date='+dateStr;
+			window.location.href = url;
+		}
+	});
+
+</script>
+<script type="text/javascript" charset="utf-8">
+
+	$(function(){
+		//创建MeScroll对象
+		var getscroll = new MeScroll("mescroll-get", {
+			down: {
+				auto: false, //是否在初始化完毕之后自动执行下拉回调callback; 默认true
+				callback: downGetCallback, //下拉刷新的回调
+			},
+			up: {
+				auto: true, //是否在初始化时以上拉加载的方式自动加载第一页数据; 默认false
+				callback: upGetCallback, //上拉回调,此处可简写; 相当于 callback: function (page) { upCallback(page); }
+				htmlNodata: "没有更多了",
+			}
+		});
+
+
+		function getDom() {
+			var checkValue =  $(".head-actived").parent("div").attr("id");
+			if(checkValue == "get"){
+				return $("#getlist");
+			}else{
+				return $("#outlist");
+			}
+		}
+
+		/*下拉刷新的回调 */
+		function downGetCallback(){
+			//联网加载数据
+			getListDataFromNet(0, 10,'get',function(data,type){
+				//联网成功的回调,隐藏下拉刷新的状态
+				getscroll.endSuccess();
+				//设置列表数据
+				setListData(data, false,getDom(),type);
+			}, function(){
+				//联网失败的回调,隐藏下拉刷新的状态
+				getscroll.endErr();
+			});
+		}
+		function upGetCallback(page){
+			//联网加载数据
+			getListDataFromNet(page.num, page.size,'get',function(data,type){
+				//联网成功的回调,隐藏下拉刷新和上拉加载的状态;
+				getscroll.endSuccess(data.length);//传参:数据的总数; mescroll会自动判断列表如果无任何数据,则提示空;列表无下一页数据,则提示无更多数据;
+				setListData(data, true,getDom(),type);
+			}, function(){
+				//联网失败的回调,隐藏下拉刷新和上拉加载的状态;
+				getscroll.endErr();
+			});
+		}
+
+		/*设置列表数据*/
+		function setListData(data, isAppend,dom,type) {
+			var str = "";
+			if(type == 'get'){
+				for (var i = 0; i <data.length; i++) {
+					var newObj=data[i];
+					str += '<div class="wrapper-order-item">' +
+							'<div class="wrapper-order-item-content">' +
+							'<div>类型</div>' +
+							'<div>'+(newObj.type == '1' ? "订单交易" : newObj.type == '2' ? '机具活动' : newObj.type == '3' ? '完成任务' : '签到打卡')+'</div></div>' +
+							'<div class="wrapper-order-item-content">'+
+							'<div>积分</div>'+
+							'<div style="color: green">+&nbsp;'+(newObj.integral == null ? "0.00" : newObj.integral)+'</div></div>'+
+							'<div class="wrapper-order-item-content">'+
+							'<div>发放时间</div>'+
+							'<div>&nbsp;'+newObj.createTime+'</div></div></div>'
+					// var liDom=document.createElement("div");
+					// dom.innerHTML=str;
+					// if (isAppend) {
+					// 	dom.appendChild(liDom);//加在列表的后面,上拉加载
+					// } else{
+					// 	dom.insertBefore(liDom, dom.firstChild);//加在列表的前面,下拉刷新
+					// }
+				}
+				if(!isAppend){
+					$("#getlist").empty();
+				}
+				$("#getlist").append(str);
+			}else{
+				for (var i = 0; i < data.length; i++) {
+					var newObj=data[i];
+					str += '<div class="wrapper-order-item">' +
+							'<div class="wrapper-order-item-content">' +
+							'<div>订单号</div>' +
+							'<div>'+newObj.orderNumber+'</div></div>' +
+							'<div class="wrapper-order-item-content">' +
+							'<div>积分</div>' +
+							'<div style="color: red;">'+(newObj.integral)+'</div></div>'+
+							'<div class="wrapper-order-item-content">'+
+							'<div>状态</div>'+
+							'<div style="color: green">'+(newObj.status == 1 ? "<span style='color:orange'>待付款</span>" : newObj.status == 2 ? "<span style='color:green'>兑换成功</span>": "<span style='color:red'>兑换失败</span>" )+'</div></div>'+
+							'<div class="wrapper-order-item-content">'+
+							'<div>兑换时间</div>'+
+							'<div>&nbsp;'+newObj.handleTime+'</div></div></div>'
+					// var liDom=document.createElement("div");
+					// dom.innerHTML=str;
+					// if (isAppend) {
+					// 	dom.appendChild(liDom);//加在列表的后面,上拉加载
+					// } else{
+					// 	dom.insertBefore(liDom, dom.firstChild);//加在列表的前面,下拉刷新
+					// }
+				}
+				if(!isAppend){
+					$("#outlist").empty();
+				}
+				$("#outlist").append(str);
+			}
+		}
+		/*联网加载列表数据*/
+		function getListDataFromNet(pageNum,pageSize,type,successCallback,errorCallback) {
+			//延时一秒,模拟联网
+			setTimeout(function () {
+				try{
+					$.ajax({
+						url : ctx + '/activity/page',
+						dataType : 'json',
+						type : "post",
+						data : {
+							'date' : '${nowYear}-${nowMonth}',
+							'token': '${token}',
+							'pageNum': pageNum,
+							'pageSize': pageSize,
+						},
+						success : function(res) {
+							if(res.code == 200){
+								var orderList = res.data.orderList.records;
+								var cashList = res.data.cashList.records;
+								if(type == "get"){
+									successCallback&&successCallback(orderList,'get');
+								}else{
+									successCallback&&successCallback(cashList,'out');
+								}
+							}else {
+								errorCallback&&errorCallback();
+							}
+						},
+					})
+				}catch(e){
+					//联网失败的回调
+					errorCallback&&errorCallback();
+				}
+			},1000)
+		}
+
+		$("div.getAndOut > div").each(function(i,e){
+			(function(i){
+				e.onclick = function(){
+					$.each($("div.getAndOut > div"),function (v,m) {
+						m.children[0].classList.remove("head-actived");
+						$("#outlist").hide();
+						$("#getlist").hide();
+					})
+					if(e.getAttribute("id") == "get"){
+						$("#getlist").show();
+						$("#outlist").hide();
+						$("#mescroll-get").show();
+						$("#mescroll-out").hide();
+					}else{
+						$("#getlist").hide();
+						$("#outlist").show();
+						$("#mescroll-get").hide();
+						$("#mescroll-out").show();
+						initOut();
+					}
+					e.children[0].classList.add("head-actived")
+				}
+			})(i)
+		})
+		let outscroll = null;
+		function initOut(){
+			if(outscroll == null){
+				outscroll = new MeScroll("mescroll-out", {
+					down: {
+						auto: false, //是否在初始化完毕之后自动执行下拉回调callback; 默认true
+						callback: downOutCallback, //下拉刷新的回调
+					},
+					up: {
+						auto: true, //是否在初始化时以上拉加载的方式自动加载第一页数据; 默认false
+						callback: upOutCallback, //上拉回调,此处可简写; 相当于 callback: function (page) { upCallback(page); }
+						htmlNodata: "没有更多了",
+					}
+				});
+			}
+		}
+
+		/*下拉刷新的回调 */
+		function downOutCallback(){
+			//联网加载数据
+			getListDataFromNet(0, 10,'out',function(data,type){
+				//联网成功的回调,隐藏下拉刷新的状态
+				outscroll.endSuccess();
+				//设置列表数据
+				setListData(data, false,getDom(),type);
+			}, function(){
+				//联网失败的回调,隐藏下拉刷新的状态
+				outscroll.endErr();
+			});
+		}
+		function upOutCallback(page){
+			//联网加载数据
+			getListDataFromNet(page.num, page.size,'out',function(data,type){
+				//联网成功的回调,隐藏下拉刷新和上拉加载的状态;
+				outscroll.endSuccess(data.length);//传参:数据的总数; mescroll会自动判断列表如果无任何数据,则提示空;列表无下一页数据,则提示无更多数据;
+				setListData(data, true,getDom(),type);
+			}, function(){
+				//联网失败的回调,隐藏下拉刷新和上拉加载的状态;
+				outscroll.endErr();
+			});
+		}
+		//禁止PC浏览器拖拽图片,避免与下拉刷新冲突;如果仅在移动端使用,可删除此代码
+		document.ondragstart=function() {return false;}
+	});
+</script>
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/jsp/activity/goodDetail.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/activity/goodDetail.jsp
new file mode 100644
index 0000000..4c3383f
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/activity/goodDetail.jsp
@@ -0,0 +1,348 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<!DOCTYPE html>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html lang="en" data-dpr="1" style="font-size: 37.52px;">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta name="viewport"
+          content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no,viewport-fit=cover">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <meta name="format-detection" content="telephone=no">
+    <meta name="keywords" content="">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+	<c:set var="ctx" value="${pageContext.request.contextPath}"  scope="request"/>
+	<c:set var="resourcePath" value="${ctx}/resources"  scope="request"/>
+	<script type="text/javascript">
+		var ctx = "${ctx}"; //上下文路径
+		var resourcePath = "${resourcePath}";
+		document.writeln('<script type="text/javascript" src="'+resourcePath+'/js/global.js?d=' + new Date().getTime() + '" ><\/script>');
+	</script>
+	<script type="text/javascript" src="${resourcePath}/js/zepto.weui.js"></script>
+    <title>商品详情</title>
+	<link rel="stylesheet" href="${resourcePath}/css/h5.css">
+	<link rel="stylesheet" href="${resourcePath}/css/h5-common.css">
+	<link rel="stylesheet" href="${resourcePath}/css/weui.css">
+	<link rel="stylesheet" href="${resourcePath}/css/weuix.css">
+	<style type="text/css">.mint-popup-bottom[data-v-8cd1bb9c]{-webkit-transform:translate3d(-50%,0,0)!important}.mint-indicator-wrapper[data-v-8cd1bb9c]{-webkit-transform:translate(-50%,-50%);z-index:999}#app[data-v-8cd1bb9c],body[data-v-8cd1bb9c],html[data-v-8cd1bb9c]{font-size:5.973px;font-size:.37333333rem;height:100%;color:#333;-webkit-user-select:none;-moz-user-select:none;-o-user-select:none;-ms-user-select:none;user-select:none}body[data-v-8cd1bb9c],html[data-v-8cd1bb9c],input[data-v-8cd1bb9c],textarea[data-v-8cd1bb9c]{font-family:PingFangSC-Regular,Helvetica,sans-serif}input[data-v-8cd1bb9c],textarea[data-v-8cd1bb9c]{background-color:#fff}input[data-v-8cd1bb9c],li[data-v-8cd1bb9c],ol[data-v-8cd1bb9c],textarea[data-v-8cd1bb9c],ul[data-v-8cd1bb9c]{padding:0;border:0;margin:0}.tc[data-v-8cd1bb9c]{text-align:center}.tr[data-v-8cd1bb9c]{text-align:right}.tl[data-v-8cd1bb9c]{text-align:left}.c4b[data-v-8cd1bb9c]{color:#4b4b4b}.c000[data-v-8cd1bb9c]{color:#000}.c333[data-v-8cd1bb9c]{color:#333}.c666[data-v-8cd1bb9c]{color:#666}.c999[data-v-8cd1bb9c]{color:#999}.cccc[data-v-8cd1bb9c]{color:#ccc}.cddd[data-v-8cd1bb9c]{color:#ddd}.c9b9b[data-v-8cd1bb9c]{color:#9b9b9b}.cblue[data-v-8cd1bb9c]{color:#3089f7}.cred[data-v-8cd1bb9c]{color:red}.cora[data-v-8cd1bb9c]{color:#faa800}.cbase[data-v-8cd1bb9c]{color:#ff721f}.cfff[data-v-8cd1bb9c]{color:#fff}.bfff[data-v-8cd1bb9c]{background-color:#fff}.bbase[data-v-8cd1bb9c]{background-color:#ff721f}.fl[data-v-8cd1bb9c]{float:left}.fr[data-v-8cd1bb9c]{float:right}.mt10[data-v-8cd1bb9c]{margin-top:4.266px;margin-top:.26666667rem}.ml15[data-v-8cd1bb9c]{margin-left:6.4px;margin-left:.4rem}.mr15[data-v-8cd1bb9c]{margin-right:6.4px;margin-right:.4rem}.mt15[data-v-8cd1bb9c]{margin-top:6.4px;margin-top:.4rem}.mb15[data-v-8cd1bb9c]{margin-bottom:6.4px;margin-bottom:.4rem}.pl15[data-v-8cd1bb9c]{padding-left:6.4px;padding-left:.4rem}.pr15[data-v-8cd1bb9c]{padding-right:6.4px;padding-right:.4rem}.pt15[data-v-8cd1bb9c]{padding-top:6.4px;padding-top:.4rem}.pb15[data-v-8cd1bb9c]{padding-bottom:6.4px;padding-bottom:.4rem}.mt30[data-v-8cd1bb9c]{margin-top:12.8px;margin-top:.8rem}.mb30[data-v-8cd1bb9c]{margin-bottom:12.8px;margin-bottom:.8rem}.fz12[data-v-8cd1bb9c]{font-size:5.12px;font-size:.32rem}.fz13[data-v-8cd1bb9c]{font-size:5.546px;font-size:.34666667rem}.fz14[data-v-8cd1bb9c]{font-size:5.973px;font-size:.37333333rem}.fz15[data-v-8cd1bb9c]{font-size:6.4px;font-size:.4rem}.fz16[data-v-8cd1bb9c]{font-size:6.826px;font-size:.42666667rem}.fz18[data-v-8cd1bb9c]{font-size:7.68px;font-size:.48rem}.fz20[data-v-8cd1bb9c]{font-size:8.533px;font-size:.53333333rem}.fz22[data-v-8cd1bb9c]{font-size:9.386px;font-size:.58666667rem}.fz24[data-v-8cd1bb9c]{font-size:10.24px;font-size:.64rem}.fz32[data-v-8cd1bb9c]{font-size:13.653px;font-size:.85333333rem}.fz36[data-v-8cd1bb9c]{font-size:15.36px;font-size:.96rem}.block[data-v-8cd1bb9c]{display:block}b[data-v-8cd1bb9c],dfn[data-v-8cd1bb9c],em[data-v-8cd1bb9c]{font-style:normal;font-weight:400}.font-DINAlternate[data-v-8cd1bb9c]{font-family:DINAlternate-Bold,PingFangSC-Regular,Helvetica,sans-serif}.arr_r[data-v-8cd1bb9c]{position:relative}.arr_r[data-v-8cd1bb9c]:after{content:"";position:absolute;z-index:80;right:6.4px;right:.4rem;top:50%;width:6px;height:6px;border:1px solid #c7c7cc;border-width:2px 2px 0 0;transform:translateY(-50%) rotate(45deg)}.shadow[data-v-8cd1bb9c]{box-shadow:0 8px 25px 0 #eaebec}.ellips[data-v-8cd1bb9c]{white-space:nowrap;overflow:hidden;text-overflow:ellipsis}.ellips_line2[data-v-8cd1bb9c],.ellips_line3[data-v-8cd1bb9c]{display:-webkit-box;overflow:hidden}.ellips_line2[data-v-8cd1bb9c]{-webkit-line-clamp:2}.ellips_line3[data-v-8cd1bb9c]{-webkit-line-clamp:3}.to-check[data-v-8cd1bb9c]{position:relative}.to-check.checked[data-v-8cd1bb9c]:before{content:"";position:absolute;top:50%;right:6.4px;right:.4rem;width:6.4px;width:.4rem;height:3.2px;height:.2rem;border:2px solid #ff721f;border-width:0 0 2px 2px;transform:translateY(-50%) rotate(-45deg)}.ui-page[data-v-8cd1bb9c]{position:relative;max-width:256px;max-width:16rem;min-height:100%;background-color:#f7f7f7;padding-top:1px;margin:-1px auto 0}.ui-page[data-v-8cd1bb9c]:after{content:"";position:fixed;top:0;bottom:0;left:0;right:0;z-index:-1;background-color:#f7f7f7}button[data-v-8cd1bb9c]{font-size:6.4px;font-size:.4rem;border-radius:1px;background-color:#ff721f}button.disabled[data-v-8cd1bb9c]{opacity:.4}.mebtn[data-v-8cd1bb9c]{width:100%;padding:0 6.4px;padding:0 .4rem}input[data-v-8cd1bb9c]::-webkit-input-placeholder{color:#ccc}[data-v-8cd1bb9c]:-moz-placeholder,[data-v-8cd1bb9c]::-moz-placeholder{color:#ccc}[data-v-8cd1bb9c]:-ms-input-placeholder{color:#ccc}[class*=mint-tab-container][data-v-8cd1bb9c]{visibility:visible;position:static;opacity:1}.loading-txt[data-v-8cd1bb9c]{width:76.8px;width:4.8rem}.loading-txt em[data-v-8cd1bb9c]{display:block;margin:4.266px auto;margin:.26666667rem auto}.loading-txt .txt[data-v-8cd1bb9c]{margin-bottom:2.56px;margin-bottom:.16rem}.v-input-clear[data-v-8cd1bb9c]{position:absolute;right:-4.266px;right:-.26666667rem;top:50%;display:none;z-index:9;padding:4.266px;padding:.26666667rem;background-color:#fff;transform:translateY(-50%)}.v-input-clear.active[data-v-8cd1bb9c]{display:block}.v-input-clear .icon-font[data-v-8cd1bb9c]{display:block;color:#ccc;font-size:7.68px;font-size:.48rem}.popup-container .popup-title[data-v-8cd1bb9c]{font-weight:700}.popup-container .popup-btns .btn[data-v-8cd1bb9c]{color:#ff721f}.flex[data-v-8cd1bb9c]{display:-ms-flexbox;display:flex}.flex .flex-li[data-v-8cd1bb9c],.flex li[data-v-8cd1bb9c]{-ms-flex:1;flex:1}.i-warn-red[data-v-8cd1bb9c]{display:inline-block;width:20px;height:20px;background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAAAXNSR0IArs4c6QAAAkNJREFUSA29Vj1PVEEUvWdYA72dFkJCQkGhkJjQECpqTbQyWuhPcMFYUFjYyUfCbyDSYEJvZWhIiDEWmlCxFkBla8Tdfdcz897O7L7F2XkE3yS7e+fOOffMx92ZC0lo+vLOnAAPRWVRILdF9ZajAWf0ndJ3QN8+Nn98GRUOMYA2px6L6FsGm4nh/BhwLII1bJzseV/JuFRQV2amJLt4T7GFEj6xi0Mx40+wfnxSJgwJ6urkkmT6gVt1swyu1If8FINHeNf61M8bEHRiXfnIld3oB13dRlvGZLlf1Au6bdTfR6NXxiCQHU6CXH1KfCM6IbtSTNzvba/xYHtmKdto5BU2Wi/4eU7ua8//l2FjunzIAU6wyMa0BDH61cfGWLC98zJDF3IN6W0HUz+1dbCib2aP5FcH0rloptLc30tkD7o6PS/d9ud0okXyHF2rnFzzRrLOg5xc4RvyjejvFRg5lLeVYaIsViICW0yYOWy27nGl25W41DLubqzEMrse3pBge2fE4D3MFRYXcQQ3MNTQP76vjWB7Z8SgVvgfRnDXNgQot5RPTH3t3CbNaW161LJJc1CbILVs0uzXJkgt48oC91L/Z1lqWK0iS7GWLNfOQmajzx4ZINdw5LwGYVmQ0gzCzdTNgh3l4rBX54THkzWIpDzAmaxrc/Iu49sH+FlUxw66B5ixi+ZffNuvo8QI50FBV3uwBnGzKmZ05R+7slI9Y2MNCFqHE2UNQivtTC1pqJFr65hSxWZhA1ta5tVWCA8JX2Op/xc+6NDNayMwOQAAAABJRU5ErkJggg==) no-repeat;background-size:20px 20px}.i-checked[data-v-8cd1bb9c],.i-unchecked[data-v-8cd1bb9c]{position:relative;display:inline-block;width:16px;height:16px;background:url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+Cjxzdmcgd2lkdGg9IjMycHgiIGhlaWdodD0iMzJweCIgdmlld0JveD0iMCAwIDMyIDMyIiB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPgogICAgPCEtLSBHZW5lcmF0b3I6IFNrZXRjaCA1MC4yICg1NTA0NykgLSBodHRwOi8vd3d3LmJvaGVtaWFuY29kaW5nLmNvbS9za2V0Y2ggLS0+CiAgICA8dGl0bGU+5Y2P6K6u5Yu+L+WLvjwvdGl0bGU+CiAgICA8ZGVzYz5DcmVhdGVkIHdpdGggU2tldGNoLjwvZGVzYz4KICAgIDxkZWZzPjwvZGVmcz4KICAgIDxnIGlkPSLljY/orq7li74v5Yu+IiBzdHJva2U9Im5vbmUiIHN0cm9rZS13aWR0aD0iMSIgZmlsbD0ibm9uZSIgZmlsbC1ydWxlPSJldmVub2RkIj4KICAgICAgICA8cGF0aCBkPSJNMjguNDQ0NDQ0NCwwIEwzLjU1NTU1NTU2LDAgQzEuNiwwIDAsMS42IDAsMy41NTU1NTU1NiBMMCwyOC40NDQ0NDQ0IEMwLDMwLjQgMS42LDMyIDMuNTU1NTU1NTYsMzIgTDI4LjQ0NDQ0NDQsMzIgQzMwLjQsMzIgMzIsMzAuNCAzMiwyOC40NDQ0NDQ0IEwzMiwzLjU1NTU1NTU2IEMzMiwxLjYgMzAuNCwwIDI4LjQ0NDQ0NDQsMCBMMjguNDQ0NDQ0NCwwIFogTTEyLjQ0NDQ0NDQsMjQuODg4ODg4OSBMMy41NTU1NTU1NiwxNi4zNDE4ODAzIEw2LjA0NDQ0NDQ0LDEzLjk0ODcxNzkgTDEyLjQ0NDQ0NDQsMjAuMTAyNTY0MSBMMjUuOTU1NTU1Niw3LjExMTExMTExIEwyOC40NDQ0NDQ0LDkuNTA0MjczNSBMMTIuNDQ0NDQ0NCwyNC44ODg4ODg5IEwxMi40NDQ0NDQ0LDI0Ljg4ODg4ODkgWiIgaWQ9IuWLvuS4iiIgZmlsbD0iI0ZGNzIxRiI+PC9wYXRoPgogICAgPC9nPgo8L3N2Zz4=) no-repeat;background-size:16px auto}.i-unchecked[data-v-8cd1bb9c]{background-image:url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+Cjxzdmcgd2lkdGg9IjMycHgiIGhlaWdodD0iMzJweCIgdmlld0JveD0iMCAwIDMyIDMyIiB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPgogICAgPCEtLSBHZW5lcmF0b3I6IFNrZXRjaCA1MC4yICg1NTA0NykgLSBodHRwOi8vd3d3LmJvaGVtaWFuY29kaW5nLmNvbS9za2V0Y2ggLS0+CiAgICA8dGl0bGU+5Y2P6K6u5Yu+L+acquWLvjwvdGl0bGU+CiAgICA8ZGVzYz5DcmVhdGVkIHdpdGggU2tldGNoLjwvZGVzYz4KICAgIDxkZWZzPjwvZGVmcz4KICAgIDxnIGlkPSLljY/orq7li74v5pyq5Yu+IiBzdHJva2U9Im5vbmUiIHN0cm9rZS13aWR0aD0iMSIgZmlsbD0ibm9uZSIgZmlsbC1ydWxlPSJldmVub2RkIiBmaWxsLW9wYWNpdHk9IjAuMyI+CiAgICAgICAgPHBhdGggZD0iTTI4LjQ0NDQ0NDQsMCBMMy41NTU1NTU1NiwwIEMxLjYsMCAwLDEuNiAwLDMuNTU1NTU1NTYgTDAsMjguNDQ0NDQ0NCBDMCwzMC40IDEuNiwzMiAzLjU1NTU1NTU2LDMyIEwyOC40NDQ0NDQ0LDMyIEMzMC40LDMyIDMyLDMwLjQgMzIsMjguNDQ0NDQ0NCBMMzIsMy41NTU1NTU1NiBDMzIsMS42IDMwLjQsMCAyOC40NDQ0NDQ0LDAgTDI4LjQ0NDQ0NDQsMCBaIE0xMi40NDQ0NDQ0LDI0Ljg4ODg4ODkgTDMuNTU1NTU1NTYsMTYuMzQxODgwMyBMNi4wNDQ0NDQ0NCwxMy45NDg3MTc5IEwxMi40NDQ0NDQ0LDIwLjEwMjU2NDEgTDI1Ljk1NTU1NTYsNy4xMTExMTExMSBMMjguNDQ0NDQ0NCw5LjUwNDI3MzUgTDEyLjQ0NDQ0NDQsMjQuODg4ODg4OSBMMTIuNDQ0NDQ0NCwyNC44ODg4ODg5IFoiIGlkPSLmsqHli77kuIoiIGZpbGw9IiNGRjcyMUYiPjwvcGF0aD4KICAgIDwvZz4KPC9zdmc+)}.model-container .key-body[data-v-8cd1bb9c]{padding-bottom:1.493px;padding-bottom:.09333333rem;background-color:#d2d5db}.model-container .key-body ul.number li[data-v-8cd1bb9c]{height:14.933px;height:.93333333rem;line-height:14.933px;line-height:.93333333rem;padding:3.626px 0;padding:.22666667rem 0;width:31%;margin:0 1.7% 1.7% 0;border-radius:5px;background-color:#fff;box-shadow:0 1px 0 0 #898a8d}.model-container .key-body ul.number li[data-v-8cd1bb9c]:nth-child(3n-2){margin-left:1.7%}.model-container .key-body ul.number li[data-v-8cd1bb9c]:before{content:none}.model-container .key-body ul.number li.key-back[data-v-8cd1bb9c],.model-container .key-body ul.number li.key-null[data-v-8cd1bb9c]{background-color:#d2d5db;box-shadow:none}.model-container .key-body ul.number li.key-back[data-v-8cd1bb9c]:active{opacity:.5}.freeMask[data-v-8cd1bb9c]{background-color:transparent}.vx-header+.scroll-wrapper[data-v-8cd1bb9c]{top:0}@keyframes lighter-data-v-8cd1bb9c{0%{background-color:#000}50%{background-color:#000}51%{background-color:transparent}to{background-color:transparent}}@keyframes rotater-data-v-8cd1bb9c{0%{-webkit-transform:rotate(0)}to{-webkit-transform:rotate(1turn)}}.get-money-activity[data-v-8cd1bb9c]{padding:6.4px;padding:.4rem;text-align:center;background-color:#fff}.get-money-activity .get-money-title[data-v-8cd1bb9c]{display:-ms-flexbox;display:flex;-ms-flex-pack:justify;justify-content:space-between;font-size:5.973px;font-size:.37333333rem;line-height:7.04px;line-height:.44rem;margin-top:5.546px;margin-top:.34666667rem;font-family:PingFangSC-Regular}.get-money-activity .get-money-title .one[data-v-8cd1bb9c]{color:#333}.get-money-activity .get-money-title .two[data-v-8cd1bb9c]{color:#ff7728}.get-money-activity .money[data-v-8cd1bb9c]{text-align:left;color:#333;font-size:13.653px;font-size:.85333333rem;line-height:18.773px;line-height:1.17333333rem;font-family:DINAlternate-Bold}.get-money-activity .money-desc[data-v-8cd1bb9c]{font-family:PingFangSC-Regular;color:#333;font-size:5.973px;font-size:.37333333rem;line-height:8.533px;line-height:.53333333rem;margin-top:5.333px;margin-top:.33333333rem;margin-bottom:5.333px;margin-bottom:.33333333rem;text-align:left}.get-money-activity .money-list[data-v-8cd1bb9c]{display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;-ms-flex-pack:start;justify-content:flex-start}.get-money-activity .money-list li[data-v-8cd1bb9c]{width:45.866px;width:2.86666667rem;height:23.253px;height:1.45333333rem;line-height:23.253px;line-height:1.45333333rem;font-size:11.093px;font-size:.69333333rem;color:#333;border:1px solid #bcbcbc;font-family:DINAlternate-Bold;border-radius:.10666667rem;margin-bottom:4.693px;margin-bottom:.29333333rem}.get-money-activity .money-list li[data-v-8cd1bb9c]:nth-child(3n-1){margin-left:4.693px;margin-left:.29333333rem;margin-right:4.693px;margin-right:.29333333rem}.get-money-activity .money-list li span[data-v-8cd1bb9c]{font-size:8.96px;font-size:.56rem}.get-money-activity .money-list .li-disabled[data-v-8cd1bb9c]{color:#dfdfdf}.get-money-activity .money-list .li-actived[data-v-8cd1bb9c]{color:#ff7728;border:1px solid #ff7728;background-color:rgba(255,119,40,.1)}.get-money-activity .get-money-desc[data-v-8cd1bb9c]{font-family:PingFangSC-Regular;color:#333;font-size:5.973px;font-size:.37333333rem;line-height:9.386px;line-height:.58666667rem;margin-top:2.133px;margin-top:.13333333rem;margin-bottom:12.8px;margin-bottom:.8rem;text-align:left}.get-money-activity .button-disabled[data-v-8cd1bb9c],.get-money-activity .money-button[data-v-8cd1bb9c]{width:100%;height:18.773px;height:1.17333333rem;line-height:18.773px;line-height:1.17333333rem;font-size:6.826px;font-size:.42666667rem;border-radius:.02666667rem;color:#fff;font-family:PingFangSC-Medium;font-weight:700}.get-money-activity .button-disabled[data-v-8cd1bb9c]{background-color:rgb(253,117,100)}.get-money-activity .money-button[data-v-8cd1bb9c]{background-color:#ff7728}.get-money-activity .money-exchange-link[data-v-8cd1bb9c]{width:100%;height:42.666px;height:2.66666667rem;margin-top:6.4px;margin-top:.4rem}.get-money-activity .money-exchange-link img[data-v-8cd1bb9c]{width:100%;height:100%}</style><style type="text/css" title="fading circle style">.circle-color-12 > div::before { background-color: #ccc; }
+</style>
+	<style>
+		* {
+			-webkit-box-sizing: border-box;
+			box-sizing: border-box;
+			margin: 0;
+			padding: 0;
+			outline: 0;
+			-webkit-tap-highlight-color: rgba(0,0,0,0);
+		}
+		div {
+			display: block;
+		}
+		.top{
+			width: 100%;
+		}
+		.image{
+			width: 100%;
+		}
+		.image img{
+			width: 100%;
+		}
+		.desc{
+			height: auto;
+		}
+		.top-name{
+			margin-top: .3rem;
+			margin-left: .2rem;
+			font-size: .6rem;
+		}
+		.top-price{
+			margin-top: .1rem;
+			margin-left: .2rem;
+			font-size: .6rem;
+			color: #fd8a00;
+			margin-bottom: 5px;
+		}
+		.footer{
+			width: 100%;
+			position: fixed;
+			bottom: 0;
+			height: 50px;
+			z-index: 999;
+			background-color: #fff;
+			box-shadow: 1px 1px 5px #000;
+			padding: 5px;
+		}
+		.footer-bottom{
+			width: 90%;
+			background-color:#fd8a00;
+			font-size: .4rem;
+			color: #fff;
+			border-radius: 5px;
+			text-align: center;
+			margin-left: 5%;
+			line-height: 40px;
+			height: 40px;
+
+		}
+		.c-body{
+			width: 95%;
+			height: auto;
+			background: #fff;
+			margin-left: 2.5%;
+			margin-top: .3222rem;
+			box-shadow: 0px 0px 2px #888888;
+			border-radius: 5px;
+			padding:15px 0 15px 15px;
+		}
+		.c-title{
+			margin-left: 2.5%;
+		}
+		.content{
+			margin-top: 0.99rem;
+			/*margin-bottom: 2rem;*/
+		}
+		.c-body-desc{
+			width: 95%;
+		}
+		.c-body-desc img{
+			width: 100%;
+		}
+		.postage{
+			font-size: .4rem;
+		}
+		.top-rule{
+			margin-left: 0.3rem;
+			font-size: 10px;
+			border: 1px solid #409EFF;
+			padding: 2px;
+			border-radius: 3px;
+			color: #409EFF;
+		}
+	</style>
+</head>
+<body style="font-size: 12px;">
+	<div id="app">
+		<div>
+			<div class="top">
+				<div class="image">
+					<img src="${good.imgUrl}">
+				</div>
+				<div class="desc">
+					<div class="top-name">
+						<p>${good.goodName}</p>
+					</div>
+					<div class="top-price">
+						<p>
+							${good.goodPrice}
+							<span class="postage">
+							 	积分
+							</span>
+							<span class="postage" style="display: ${good.deductRule eq "1" ? 'black' : 'none'}">
+							 	+￥${good.deductValue}元
+							</span>
+							<span class="postage" style="display: ${good.isPostage eq 1 ? 'black' : 'none'}">
+								包邮
+							</span>
+						</p>
+					</div>
+					<span class="top-rule" style="display: ${good.deductRule eq "1" ? 'black' : 'none'}">
+						积分+现金
+					</span>
+				</div>
+			</div>
+			<div class="content">
+				<div class="c-title">
+					权益介绍
+				</div>
+				<div class="c-body">
+					<div class="c-body-desc">
+						${good.goodDesc}
+					</div>
+				</div>
+				<div class="c-bottom" style="height: 60px;">
+				</div>
+			</div>
+			<div class="footer">
+				<div class="footer-bottom" id="exchange">
+					<span>立即兑换</span>
+				</div>
+			</div>
+		</div>
+	</div>
+<%--	<div class="popup-container dialog-body active" style="display: none;box-shadow: 5px 5px 20px #888888;border-radius: 5px;">--%>
+<%--		<div class="popup"><!---->--%>
+<%--			<div class="popup-body">确认兑换该商品吗？</div>--%>
+<%--			<div class="popup-btns" style="display: flex;justify-content:space-around;">--%>
+<%--				<div style="width: 50%" onclick="hide(this)">--%>
+<%--					<span style="color: rgba(0,0,0,.5)" class="btn btn-positive">暂时不换</span>--%>
+<%--				</div>--%>
+<%--				<div style="width: 50%" onclick="exchangeGoods('${good.id}')">--%>
+<%--					<span class="btn btn-positive">确认兑换</span>--%>
+<%--				</div>--%>
+<%--			</div>--%>
+<%--		</div>--%>
+<%--	</div>--%>
+	<div class="mint-indicator" style="display: none; z-index: 9994">
+		<div class="mint-indicator-wrapper" style="padding: 20px;">
+        <span class="mint-indicator-spin">
+            <div class="mint-spinner-fading-circle circle-color-12" style="width: 32px; height: 32px;">
+                <div class="mint-spinner-fading-circle-circle is-circle2">
+
+                </div>
+                <div class="mint-spinner-fading-circle-circle is-circle3">
+
+                </div>
+                <div class="mint-spinner-fading-circle-circle is-circle4">
+
+                </div>
+                <div class="mint-spinner-fading-circle-circle is-circle5">
+
+                </div>
+                <div class="mint-spinner-fading-circle-circle is-circle6">
+
+                </div>
+                <div class="mint-spinner-fading-circle-circle is-circle7">
+
+                </div>
+                <div class="mint-spinner-fading-circle-circle is-circle8">
+
+                </div>
+                <div class="mint-spinner-fading-circle-circle is-circle9">
+
+                </div>
+                <div class="mint-spinner-fading-circle-circle is-circle10">
+
+                </div>
+                <div class="mint-spinner-fading-circle-circle is-circle11">
+
+                </div>
+                <div class="mint-spinner-fading-circle-circle is-circle12">
+
+                </div>
+                <div class="mint-spinner-fading-circle-circle is-circle13">
+
+                </div>
+            </div>
+        </span>
+			<span class="mint-indicator-text" style="">加载中...</span>
+		</div>
+	</div>
+	<div class="backdrop-container a-title active" style="display: none;"></div>
+	<div class="popup-container active a-title" style="display: none;">
+		<div class="popup"><!---->
+			<div class="popup-body a-title-body"></div>
+			<div class="popup-btns" id="popup-btns" onclick="hide(this)"><span class="btn btn-positive">确定</span></div>
+		</div>
+	</div>
+
+	<script type="text/javascript">
+		/* === 判断支持版本 start === */
+		(function () {
+			var viewportTag = null;
+			var metaTags = document.getElementsByTagName('meta');
+			for (var i = 0; i < metaTags.length; i++) {
+				if (metaTags[i].getAttribute('name') === "viewport") {
+					viewportTag = metaTags[i];
+					break;
+				}
+			}
+			if (!viewportTag) {
+				viewportTag = document.createElement("meta");
+				viewportTag.setAttribute('name', 'viewport');
+			}
+
+			var viewportTagContent =
+					'width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no';
+
+			// Detect if iOS device
+			if (/(iPhone|iPod|iPad)/i.test(window.navigator.userAgent)) {
+				// Get iOS major version
+				var iosVersion = parseInt((window.navigator.userAgent).match(/OS (\d+)_(\d+)_?(\d+)? like Mac OS X/i)[1]);
+				// Detect if device is running >iOS 11
+				// iOS 11's UIWebView and WKWebView changes the viewport behaviour to render viewport without the status bar. Need to override with "viewport-fit: cover" to include the status bar.
+				if (iosVersion >= 11) {
+					viewportTagContent += ', viewport-fit=cover';
+				}
+			}
+
+			// Update viewport tag attribute
+			viewportTag.setAttribute('content', viewportTagContent);
+		})();
+		/* === 判断支持版本 end === */
+
+		// refs http://www.html-js.com/article/3041 移动端高清、多屏适配方案
+		!function (a, b) {
+			function c() {
+				var b = f.getBoundingClientRect().width;
+				b / i > 540 && (b = 540 * i);
+				var c = b / 10;
+				f.style.fontSize = c + "px", k.rem = a.rem = c
+			}
+			var d, e = a.document,
+					f = e.documentElement,
+					g = e.querySelector('meta[name="viewport"]'),
+					h = e.querySelector('meta[name="flexible"]'),
+					i = 0,
+					j = 0,
+					k = b.flexible || (b.flexible = {});
+			if (g) {
+				var l = g.getAttribute("content").match(/initial\-scale=([\d\.]+)/);
+				l && (j = parseFloat(l[1]), i = parseInt(1 / j))
+			} else if (h) {
+				var m = h.getAttribute("content");
+				if (m) {
+					var n = m.match(/initial\-dpr=([\d\.]+)/),
+							o = m.match(/maximum\-dpr=([\d\.]+)/);
+					n && (i = parseFloat(n[1]), j = parseFloat((1 / i).toFixed(2))), o && (i = parseFloat(o[1]), j = parseFloat((
+							1 / i).toFixed(2)))
+				}
+			}
+			if (!i && !j) {
+				var p = (a.navigator.appVersion.match(/android/gi), a.navigator.appVersion.match(/iphone/gi)),
+						q = a.devicePixelRatio;
+				i = p ? q >= 3 && (!i || i >= 3) ? 3 : q >= 2 && (!i || i >= 2) ? 2 : 1 : 1, j = 1 / i
+			}
+			if (f.setAttribute("data-dpr", i), !g)
+				if (g = e.createElement("meta"), g.setAttribute("name", "viewport"), g.setAttribute("content",
+						"initial-scale=" + j + ", maximum-scale=" + j + ", minimum-scale=" + j + ", user-scalable=no"), f
+						.firstElementChild) f.firstElementChild.appendChild(g);
+				else {
+					var r = e.createElement("div");
+					r.appendChild(g), e.write(r.innerHTML)
+				}
+			a.addEventListener("resize", function () {
+				clearTimeout(d), d = setTimeout(c, 300)
+			}, !1), a.addEventListener("pageshow", function (a) {
+				a.persisted && (clearTimeout(d), d = setTimeout(c, 300))
+			}, !1), "complete" === e.readyState ? e.body.style.fontSize = 12 * i + "px" : e.addEventListener(
+					"DOMContentLoaded",
+					function () {
+						e.body.style.fontSize = 12 * i + "px"
+					}, !1), c(), k.dpr = a.dpr = i, k.refreshRem = c, k.rem2px = function (a) {
+				var b = parseFloat(a) * this.rem;
+				return "string" == typeof a && a.match(/rem$/) && (b += "px"), b
+			}, k.px2rem = function (a) {
+				var b = parseFloat(a) / this.rem;
+				return "string" == typeof a && a.match(/px$/) && (b += "rem"), b
+			}
+		}(window, window.lib || (window.lib = {}));
+	</script>
+	<script>
+		$("#exchange").on('click',function () {
+			let flag = '${flag}';
+			if(flag == 0){
+				$.toast("积分不足！","text");
+				return;
+			}
+			window.location.href= ctx + '/activity/exchange/order?token=${token}&g=${good.id}';
+		})
+		function hide(obj) {
+			if(obj != undefined){
+				$(".a-title").hide();
+			}
+			$('.active').hide();
+		}
+	</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/jsp/activity/goodExchange.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/activity/goodExchange.jsp
new file mode 100644
index 0000000..8bd26b4
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/activity/goodExchange.jsp
@@ -0,0 +1,638 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<!DOCTYPE html>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html lang="en" data-dpr="1" style="font-size: 37.52px;">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta name="viewport"
+          content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no,viewport-fit=cover">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <meta name="format-detection" content="telephone=no">
+    <meta name="keywords" content="">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+	<c:set var="ctx" value="${pageContext.request.contextPath}"  scope="request"/>
+	<c:set var="resourcePath" value="${ctx}/resources"  scope="request"/>
+	<script type="text/javascript">
+		var ctx = "${ctx}"; //上下文路径
+		var resourcePath = "${resourcePath}";
+		document.writeln('<script type="text/javascript" src="'+resourcePath+'/js/global.js?d=' + new Date().getTime() + '" ><\/script>');
+	</script>
+<%--	<script type="text/javascript" src="${resourcePath}/js/zepto.min.js"></script>--%>
+	<script type="text/javascript" src="${resourcePath}/js/zepto.weui.js"></script>
+    <title>商品兑换详情</title>
+	<link rel="stylesheet" href="${resourcePath}/css/h5.css">
+	<link rel="stylesheet" href="${resourcePath}/css/h5-common.css">
+	<link rel="stylesheet" href="https://unpkg.com/mescroll.js@1.4.1/mescroll.min.css">
+	<link rel="stylesheet" href="${resourcePath}/css/weui.css">
+	<link rel="stylesheet" href="${resourcePath}/css/weuix.css">
+	<style>
+		* {
+			-webkit-box-sizing: border-box;
+			box-sizing: border-box;
+			margin: 0;
+			padding: 0;
+			outline: 0;
+			-webkit-tap-highlight-color: rgba(0,0,0,0);
+		}
+		div {
+			display: block;
+		}
+		.ui-page, .ui-page:after {
+			background-color: #f7f7f7;
+		}
+		#app, body, html {
+			font-size: .34333333rem;
+			height: 100%;
+			color: #333;
+			-webkit-user-select: none;
+			-moz-user-select: none;
+			-o-user-select: none;
+			user-select: none;
+		}
+		.ui-page[data-v-07f6ffda] {
+			position: relative;
+			max-width: 256px;
+			max-width: 16rem;
+			min-height: 100%;
+			background-color: #f7f7f7;
+			padding-top: 1px;
+			margin: -1px auto 0;
+		}
+		.money-exchange[data-v-07f6ffda] {
+			height: 100%;
+		}
+		.money-exchange .money-header-amount[data-v-07f6ffda] {
+			width: 100%;
+			height: 34.133px;
+			height: 2.13333333rem;
+			box-sizing: border-box;
+			background-image: linear-gradient(153deg,#fca195, #ef5151 89%);
+			color: #fff;
+			display: -ms-flexbox;
+			display: flex;
+			-ms-flex-pack: justify;
+			justify-content: space-between;
+			-ms-flex-align: center;
+			align-items: center;
+			position: fixed;
+			top: 0;
+			left: 0;
+			z-index: 1;
+		}
+		.money-exchange .money-header-amount .money-amount[data-v-07f6ffda] {
+			height: 34.133px;
+			height: 2.13333333rem;
+			padding-left: 6.4px;
+			padding-left: .4rem;
+			display: -ms-flexbox;
+			display: flex;
+			-ms-flex-pack: justify;
+			justify-content: space-between;
+			-ms-flex-direction: column;
+			flex-direction: column;
+			padding: 5.333px;
+			padding: .33333333rem;
+		}
+		.money-exchange .money-header-amount .money-amount div.title[data-v-07f6ffda] {
+			height: .6rem;
+			font-size: 5.12px;
+			font-size: .32rem;
+			line-height: 9.6px;
+			line-height: .6rem;
+			font-family: DINAlternate-Bold;
+		}
+		.money-exchange .money-header-amount .money-amount div.money[data-v-07f6ffda] {
+			height: .86666667rem;
+			font-size: .66666667rem;
+			line-height: .86666667rem;
+			font-family: DINAlternate-Bold;
+		}
+		.money-exchange .money-header-amount .money-record[data-v-07f6ffda] {
+			margin-right: 5.12px;
+			margin-right: .32rem;
+			height: 10.666px;
+			height: .66666667rem;
+			line-height: 10.24px;
+			line-height: .64rem;
+			width: 42.666px;
+			width: 2.66666667rem;
+			border-radius: .39333333rem;
+			font-size: 5.546px;
+			font-size: .34666667rem;
+			border: 1px solid #fff;
+			text-align: center;
+		}
+		.money-exchange .money-content[data-v-07f6ffda] {
+			width: 100%;
+			height: 100%;
+			padding-top: 34.133px;
+			position: relative;
+			overflow: auto;
+		}
+		.money-exchange .money-content div.no-goods[data-v-07f6ffda] {
+			position: absolute;
+			width: 85.333px;
+			width: 5.33333333rem;
+			height: 106.666px;
+			height: 6.66666667rem;
+			left: 50%;
+			top: 50%;
+			transform: translateX(-50%) translateY(-50%);
+		}
+		.money-exchange .money-content div.no-goods span[data-v-07f6ffda] {
+			display: inline-block;
+			width: 85.333px;
+			width: 5.33333333rem;
+			height: 21.333px;
+			height: 1.33333333rem;
+			text-align: center;
+			line-height: 21.333px;
+			line-height: 1.33333333rem;
+			font-size: 6.4px;
+			font-size: .4rem;
+			color: #999;
+		}
+		.money-exchange .money-content div.no-goods img[data-v-07f6ffda] {
+			width: 85.333px;
+			width: 5.33333333rem;
+			height: 85.333px;
+			height: 5.33333333rem;
+		}
+		.money-exchange .money-content .goods-list[data-v-07f6ffda] {
+			padding-left: 4.266px;
+			padding-left: .26666667rem;
+			padding-right: 4.266px;
+			padding-right: .26666667rem
+		}
+		.money-exchange .money-content .goods-list .list-title[data-v-07f6ffda] {
+			height: 14.933px;
+			height: .93333333rem;
+			line-height: 14.933px;
+			line-height: .93333333rem;
+			font-size: 6.4px;
+			font-size: .4rem;
+			font-weight: 700
+		}
+		.money-exchange .money-content .goods-list .list-wrap[data-v-07f6ffda] {
+			display: -ms-flexbox;
+			display: flex;
+			width: 100%;
+			-ms-flex-pack: justify;
+			justify-content: space-between;
+			-ms-flex-wrap: wrap;
+			flex-wrap: wrap
+		}
+		.money-exchange .money-content .goods-list .list-wrap .list-item[data-v-07f6ffda] {
+			width: 49%;
+			font-size: 0;
+			margin-bottom: .6666rem;
+		}
+		.money-exchange .money-content .goods-list .list-wrap .list-item .item-image[data-v-07f6ffda] {
+			width: 100%;
+			height: 48px;
+			height: 3rem
+		}
+		.money-exchange .money-content .goods-list .list-wrap .list-item .item-name[data-v-07f6ffda] {
+			display: block;
+			font-weight: 700;
+			padding-top: 2.133px;
+			padding-top: .13333333rem;
+			font-size: 5.973px;
+			font-size: .37333333rem
+		}
+		.money-exchange .money-content .goods-list .list-wrap .list-item .item-image img[data-v-07f6ffda] {
+			width: 100%;
+			height: 100%;
+			border-radius: 10px 10px 0 0;
+		}
+		.money-exchange .money-content .goods-list .list-wrap .list-item .item-amount[data-v-07f6ffda] {
+			color: #ff721f;
+			font-size: 9.6px;
+			font-size: .45rem;
+			height: 12.8px;
+			height: .8rem;
+			display: inline-block;
+			margin-right: 1.066px;
+			margin-right: .06666667rem
+		}
+		.money-exchange .money-content .goods-list .list-wrap .list-item .item-detail[data-v-07f6ffda] {
+			color: #ff721f;
+			font-size: 5.546px;
+			font-size: .34666667rem;
+			height: 12.8px;
+			height: .8rem;
+			display: inline-block;
+			margin-right: 2.133px;
+			margin-right: .13333333rem
+		}
+
+		.money-exchange .money-content .goods-list .list-wrap .list-item .item-tip[data-v-07f6ffda] {
+			font-size: 5.546px;
+			font-size: .34666667rem;
+			height: 12.8px;
+			height: .8rem;
+			display: inline-block;
+			text-decoration: line-through;
+			color: #999
+		}
+		div.polaroid {
+			box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.2), 0 1px 2px 0 rgba(0, 0, 0, 0.19);
+			border-radius: 10px;
+		}
+		.goods-content{
+			display: flex;
+			justify-content: space-between;
+			line-height: .7rem;
+			padding: 0 .2rem;
+		}
+		.item-name{
+			margin-top: .1rem;
+		}
+		.item-amount{
+			margin-top: .2rem;
+		}
+		.wrapper-order-item{
+			width: 95%;
+			background-color: #fff; padding: 0.233rem; line-height: .8rem;box-shadow: 0 4px 8px 0 hsla(0, 0%, 78%, .5);border-radius: 10px;margin-bottom: .4rem;
+		}
+		.wrapper-order-item-content{
+			display: flex;
+			justify-content: space-between;
+		}
+		.mescroll{
+			position: fixed;
+			top: 60px;
+			bottom: 0;
+			height: auto;
+		}
+		.ellipsis{
+			text-overflow: ellipsis;
+			overflow: hidden;
+			white-space: nowrap;
+		}
+		.good-label{
+			width: 25%;
+		}
+		.expressNo{
+			color: #06A6F1;
+		}
+		.hread{
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			padding: 0.3rem 0.25rem;
+			background-color: #fff;
+			margin-bottom: 0.3rem;
+			font-size: 16px;
+			position: fixed;
+			top: 0;
+			border: 0;
+			z-index: 1;
+			width: 100%;
+			height: 1.2rem;
+			border-bottom: 1px solid #d5d3d3;
+		}
+		.integral{
+			display: flex;
+			align-items: center;
+		}
+		.integral-label{
+			color: #888888;
+		}
+		.integral-value{
+			color: #ff721f;
+			font-weight: bold;
+		}
+		.integral-record-btn{
+			height: 0.66666667rem;
+			line-height: .64rem;
+			width: 2.3rem;
+			border-radius: 0.1rem;
+			font-size: .34666667rem;
+			border: 1px solid #ff721f;
+			text-align: center;
+			color: #ff721f;
+		}
+	</style>
+	<link rel="stylesheet" href="${resourcePath}/css/mobileSelect.css">
+	<script src="https://unpkg.com/mescroll.js@1.4.1/mescroll.min.js" charset="utf-8"></script>
+	<script type="text/javascript" src="${resourcePath}/js/auto-size.js"></script>
+	<script type="text/javascript" src="${resourcePath}/js/mobileSelect.js"></script>
+</head>
+<body style="font-size: 12px;">
+	<div id="app">
+		<div class="hread">
+			<div class="integral">
+				<div class="integral-label">可用积分：</div>
+				<div class="integral-value">${useAmt}</div>
+			</div>
+<%--			<div class="integral-record-btn money-record">兑换记录</div>--%>
+		</div>
+		<div data-v-07f6ffda="" class="ui-page money-exchange">
+			<div data-v-07f6ffda="" class="money-content">
+				<c:if test="${empty goodExchange.records }">
+					<div data-v-07f6ffda="" class="no-goods">
+						<img data-v-07f6ffda="" src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyB3aWR0aD0iMzIwcHgiIGhlaWdodD0iMzIwcHgiIHZpZXdCb3g9IjAgMCAzMjAgMzIwIiB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPgogICAgPCEtLSBHZW5lcmF0b3I6IFNrZXRjaCA0OC4yICg0NzMyNykgLSBodHRwOi8vd3d3LmJvaGVtaWFuY29kaW5nLmNvbS9za2V0Y2ggLS0+CiAgICA8dGl0bGU+54q25oCB5Zu+5qCHL+epuuiusOW9lTwvdGl0bGU+CiAgICA8ZGVzYz5DcmVhdGVkIHdpdGggU2tldGNoLjwvZGVzYz4KICAgIDxkZWZzPjwvZGVmcz4KICAgIDxnIGlkPSJTeW1ib2xzIiBzdHJva2U9Im5vbmUiIHN0cm9rZS13aWR0aD0iMSIgZmlsbD0ibm9uZSIgZmlsbC1ydWxlPSJldmVub2RkIj4KICAgICAgICA8ZyBpZD0i54q25oCB5Zu+5qCHL+epuuiusOW9lSI+CiAgICAgICAgICAgIDxyZWN0IGlkPSJSZWN0YW5nbGUiIHg9IjAiIHk9IjAiIHdpZHRoPSIzMjAiIGhlaWdodD0iMzIwIj48L3JlY3Q+CiAgICAgICAgICAgIDxwYXRoIGQ9Ik0xODcuOTkzLDQ4LjUyMjIgTDIyMy42MjYsNDguNTIyMiBMMjIzLjY0MiwxOTkuMDA2MiBMOTYsMTk5LjAwNjIgTDk2LDQ4LjUyMjIgTDEzMS42MzMsNDguNTIyMiBMMTMxLjYzMyw2MS44NTYyIEwxMDkuMzM1LDYxLjg1NjIgTDEwOS4zMzUsMTg1LjY3MjIgTDIxMC4yOTEsMTg1LjY3MjIgTDIxMC4yOTEsNjEuODU2MiBMMTg3Ljk5Myw2MS44NTYyIEwxODcuOTkzLDQ4LjUyMjIgWiBNMTMwLjkxNDQsMTAyLjg5MyBMMTMwLjkxNDQsODkuNTU5IEwxODcuNDI3NCw4OS41NTkgTDE4Ny40Mjc0LDEwMi44OTMgTDEzMC45MTQ0LDEwMi44OTMgWiBNMTMwLjkxNDQsMTI4LjU2IEwxMzAuOTE0NCwxMTUuMjI2IEwxODcuNDI3NCwxMTUuMjI2IEwxODcuNDI3NCwxMjguNTYgTDEzMC45MTQ0LDEyOC41NiBaIE0xMzAuOTE0NCwxNTQuMjI2IEwxMzAuOTE0NCwxNDAuODkyIEwxODcuNDI3NCwxNDAuODkyIEwxODcuNDI3NCwxNTQuMjI2IEwxMzAuOTE0NCwxNTQuMjI2IFogTTE0MS43MTY0LDYxLjk1NCBMMTQxLjcxNjQsNDEgTDE3Ny45MDg0LDQxIEwxNzcuOTA4NCw2MS45NTQgTDE0MS43MTY0LDYxLjk1NCBaIE0xMzUuNTg0NCwyNDUuNzAxIEwxMzUuNTg0NCwyMTMuMDAzIEwxNDMuOTk1NCwyMTMuMDAzIEwxNDMuOTk1NCwyNDUuNzAxIEwxMzUuNTg0NCwyNDUuNzAxIFogTTEzNS41ODQ0LDI3MS4xODggTDEzNS41ODQ0LDI1MC41MTEgTDE0My45OTU0LDI1MC41MTEgTDE0My45OTU0LDI3MS4xODggTDEzNS41ODQ0LDI3MS4xODggWiBNMTYxLjQxODQsMjM3Ljg2NSBMMTYxLjQxODQsMjEwLjExOCBMMTY5LjgyOTQsMjEwLjExOCBMMTY5LjgyOTQsMjM3Ljg2NSBMMTYxLjQxODQsMjM3Ljg2NSBaIE0yMDIuODYzNCwyNDAuMzQ3IEwyMDIuODYzNCwyMTcuMjE3IEwyMTEuMjc0NCwyMTcuMjE3IEwyMTEuMjc0NCwyNDAuMzQ3IEwyMDIuODYzNCwyNDAuMzQ3IFogTTE2MS40MTg0LDI1My45MDggTDE2MS40MTg0LDI0NS4xODkgTDE2OS44Mjk0LDI0NS4xODkgTDE2OS44Mjk0LDI1My45MDggTDE2MS40MTg0LDI1My45MDggWiBNMTgyLjY0MzQsMjc4LjI5NCBMMTgyLjY0MzQsMjQ4Ljc4MiBMMTkxLjA1NDQsMjQ4Ljc4MiBMMTkxLjA1NDQsMjc4LjI5NCBMMTgyLjY0MzQsMjc4LjI5NCBaIE0xODIuNjQzNCwyNDIuOTYgTDE4Mi42NDM0LDIyNi4wNjggTDE5MS4wNTQ0LDIyNi4wNjggTDE5MS4wNTQ0LDI0Mi45NiBMMTgyLjY0MzQsMjQyLjk2IFogTTExMy45NTc0LDI1Ni42MDkgTDExMy45NTc0LDIxNi4zNjkgTDEyMi4zNjg0LDIxNi4zNjkgTDEyMi4zNjg0LDI1Ni42MDkgTDExMy45NTc0LDI1Ni42MDkgWiIgaWQ9IkNvbWJpbmVkLVNoYXBlIiBmaWxsPSIjQ0NDQ0NDIj48L3BhdGg+CiAgICAgICAgPC9nPgogICAgPC9nPgo8L3N2Zz4=" alt="">
+						<span data-v-07f6ffda="">暂无商品兑换记录！</span>
+					</div>
+				</c:if>
+					<div data-v-07f6ffda class="goods-list">
+						<c:if test="${not empty goodExchange.records}">
+							<div id="mescroll" class="mescroll">
+								<div data-v-07f6ffda class="list-wrap">
+									<c:forEach items="${goodExchange.records}" var="exchange">
+										<div class="wrapper-order-item">
+											<div class="wrapper-order-item-content">
+												<div class="good-label">商品名称</div>
+												<div class="ellipsis">${exchange.name}</div>
+											</div>
+											<div class="wrapper-order-item-content">
+												<div class="good-label">价格</div>
+												<div class="ellipsis">${exchange.price}</div>
+											</div>
+											<c:if test="${not empty exchange.expressNo}">
+												<div class="wrapper-order-item-content" >
+													<div class="good-label">快递单号</div>
+<%--													<textarea cols="30" rows="10"></textarea>--%>
+													<div class="ellipsis expressNo" onclick="copyText(this)">${exchange.expressNo}</div>
+												</div>
+											</c:if>
+											<div class="wrapper-order-item-content" >
+												<div class="good-label">支付状态</div>
+												<div class="ellipsis">
+													<c:choose>
+														<c:when test="${exchange.status eq 1}">
+															<span style="color: green">已支付</span>
+														</c:when>
+														<c:otherwise>
+															<span style="color: red">待支付</span>
+														</c:otherwise>
+													</c:choose>
+												</div>
+											</div>
+											<div class="wrapper-order-item-content" >
+												<div class="good-label">发货状态</div>
+												<div class="ellipsis">
+													<c:choose>
+														<c:when test="${exchange.deliveryStatus eq 1}">
+															<span style="color: green">已发货</span>
+														</c:when>
+														<c:otherwise>
+															<span style="color: #ec4406">待发货</span>
+														</c:otherwise>
+													</c:choose>
+												</div>
+											</div>
+											<div class="wrapper-order-item-content">
+												<div class="good-label">兑换时间</div>
+												<div class="ellipsis">&nbsp;<fmt:formatDate value='${exchange.createTime}' pattern='yyyy-MM-dd HH:mm:ss'/></div>
+											</div>
+										</div>
+									</c:forEach>
+								</div>
+							</div>
+						</c:if>
+					</div>
+			</div>
+		</div>
+	</div>
+
+	<script type="text/javascript">
+		/* === 判断支持版本 start === */
+		(function () {
+			var viewportTag = null;
+			var metaTags = document.getElementsByTagName('meta');
+			for (var i = 0; i < metaTags.length; i++) {
+				if (metaTags[i].getAttribute('name') === "viewport") {
+					viewportTag = metaTags[i];
+					break;
+				}
+			}
+			if (!viewportTag) {
+				viewportTag = document.createElement("meta");
+				viewportTag.setAttribute('name', 'viewport');
+			}
+
+			var viewportTagContent =
+					'width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no';
+
+			// Detect if iOS device
+			if (/(iPhone|iPod|iPad)/i.test(window.navigator.userAgent)) {
+				// Get iOS major version
+				var iosVersion = parseInt((window.navigator.userAgent).match(/OS (\d+)_(\d+)_?(\d+)? like Mac OS X/i)[1]);
+				// Detect if device is running >iOS 11
+				// iOS 11's UIWebView and WKWebView changes the viewport behaviour to render viewport without the status bar. Need to override with "viewport-fit: cover" to include the status bar.
+				if (iosVersion >= 11) {
+					viewportTagContent += ', viewport-fit=cover';
+				}
+			}
+
+			// Update viewport tag attribute
+			viewportTag.setAttribute('content', viewportTagContent);
+		})();
+		/* === 判断支持版本 end === */
+
+		// refs http://www.html-js.com/article/3041 移动端高清、多屏适配方案
+		!function (a, b) {
+			function c() {
+				var b = f.getBoundingClientRect().width;
+				b / i > 540 && (b = 540 * i);
+				var c = b / 10;
+				f.style.fontSize = c + "px", k.rem = a.rem = c
+			}
+			var d, e = a.document,
+					f = e.documentElement,
+					g = e.querySelector('meta[name="viewport"]'),
+					h = e.querySelector('meta[name="flexible"]'),
+					i = 0,
+					j = 0,
+					k = b.flexible || (b.flexible = {});
+			if (g) {
+				var l = g.getAttribute("content").match(/initial\-scale=([\d\.]+)/);
+				l && (j = parseFloat(l[1]), i = parseInt(1 / j))
+			} else if (h) {
+				var m = h.getAttribute("content");
+				if (m) {
+					var n = m.match(/initial\-dpr=([\d\.]+)/),
+							o = m.match(/maximum\-dpr=([\d\.]+)/);
+					n && (i = parseFloat(n[1]), j = parseFloat((1 / i).toFixed(2))), o && (i = parseFloat(o[1]), j = parseFloat((
+							1 / i).toFixed(2)))
+				}
+			}
+			if (!i && !j) {
+				var p = (a.navigator.appVersion.match(/android/gi), a.navigator.appVersion.match(/iphone/gi)),
+						q = a.devicePixelRatio;
+				i = p ? q >= 3 && (!i || i >= 3) ? 3 : q >= 2 && (!i || i >= 2) ? 2 : 1 : 1, j = 1 / i
+			}
+			if (f.setAttribute("data-dpr", i), !g)
+				if (g = e.createElement("meta"), g.setAttribute("name", "viewport"), g.setAttribute("content",
+						"initial-scale=" + j + ", maximum-scale=" + j + ", minimum-scale=" + j + ", user-scalable=no"), f
+						.firstElementChild) f.firstElementChild.appendChild(g);
+				else {
+					var r = e.createElement("div");
+					r.appendChild(g), e.write(r.innerHTML)
+				}
+			a.addEventListener("resize", function () {
+				clearTimeout(d), d = setTimeout(c, 300)
+			}, !1), a.addEventListener("pageshow", function (a) {
+				a.persisted && (clearTimeout(d), d = setTimeout(c, 300))
+			}, !1), "complete" === e.readyState ? e.body.style.fontSize = 12 * i + "px" : e.addEventListener(
+					"DOMContentLoaded",
+					function () {
+						e.body.style.fontSize = 12 * i + "px"
+					}, !1), c(), k.dpr = a.dpr = i, k.refreshRem = c, k.rem2px = function (a) {
+				var b = parseFloat(a) * this.rem;
+				return "string" == typeof a && a.match(/rem$/) && (b += "px"), b
+			}, k.px2rem = function (a) {
+				var b = parseFloat(a) / this.rem;
+				return "string" == typeof a && a.match(/px$/) && (b += "rem"), b
+			}
+		}(window, window.lib || (window.lib = {}));
+	</script>
+	<script>
+		$(".money-record").on('click',function () {
+			window.location.href= ctx + '/activity/exchange/view?token=${token}';
+		})
+	</script>
+
+	<script type="text/javascript" charset="utf-8">
+		$(function(){
+			//创建MeScroll对象
+			var mescroll = new MeScroll("mescroll", {
+				down: {
+					auto: false, //是否在初始化完毕之后自动执行下拉回调callback; 默认true
+					callback: downCallback, //下拉刷新的回调
+				},
+				up: {
+					auto: false, //是否在初始化时以上拉加载的方式自动加载第一页数据; 默认false
+					callback: upCallback, //上拉回调,此处可简写; 相当于 callback: function (page) { upCallback(page); }
+					htmlNodata: "没有更多了",
+				}
+			});
+			/*下拉刷新的回调 */
+			function downCallback(){
+				//联网加载数据
+				getListDataFromNet(0, 10, function(data){
+					//联网成功的回调,隐藏下拉刷新的状态
+					mescroll.endSuccess();
+					//设置列表数据
+					setListData(data,false);
+				}, function(){
+					//联网失败的回调,隐藏下拉刷新的状态
+					mescroll.endErr();
+				});
+			}
+			var page = {num:1, size:10};
+			function upCallback(page){
+				//联网加载数据
+				page.num = 2;
+				getListDataFromNet(page.num, page.size, function(data){
+					//联网成功的回调,隐藏下拉刷新和上拉加载的状态;
+					mescroll.endSuccess(data.length);//传参:数据的总数; mescroll会自动判断列表如果无任何数据,则提示空;列表无下一页数据,则提示无更多数据;
+					//设置列表数据
+					setListData(data, true);
+				}, function(){
+					//联网失败的回调,隐藏下拉刷新和上拉加载的状态;
+					mescroll.endErr();
+				});
+			}
+
+			/*设置列表数据*/
+			function setListData(data, isAppend) {
+				var str = "";
+				for (var i = 0; i <data.length; i++) {
+					var newObj=data[i];
+					str += '<div class="wrapper-order-item">' +
+							'<div class="wrapper-order-item-content">' +
+							'<div class="good-label">商品名称</div>' +
+							'<div class="ellipsis">'+newObj.name+'</div></div>' +
+							'<div class="wrapper-order-item-content">' +
+							'<div class="good-label">价格</div>' +
+							'<div class="ellipsis">'+(parseFloat(newObj.price).toFixed(2))+'</div></div>';
+							if(newObj.expressNo){
+								str += '<div class="wrapper-order-item-content">'+
+								'<div class="good-label">快递单号</div>'+
+								'<textarea style="display: none" cols="30" rows="10"></textarea>' +
+								'<div class="ellipsis expressNo" onclick="copyText(this)">'+newObj.expressNo+'</div></div>'
+							}
+					str += '<div class="wrapper-order-item-content">'+
+							'<div class="good-label">支付状态</div>'+
+							'<div class="ellipsis" style="color: green">';
+							if(newObj.status == 1){
+								str +='<span style="color: green">已支付</span>';
+							}else{
+								str +='<span style="color: red">待支付</span>';
+							}
+					str +=	'</div></div>';
+					str += '<div class="wrapper-order-item-content">'+
+							'<div class="good-label">发货状态</div>'+
+							'<div class="ellipsis" style="color: green">';
+							if(newObj.deliveryStatus == 1){
+								str +='<span style="color: green">已发货</span>';
+							}else{
+								str +='<span style="color: #ec4406">待发货</span>';
+							}
+					 str +=	'</div></div>'+
+							'<div class="wrapper-order-item-content">'+
+							'<div class="good-label">兑换时间</div>'+
+							'<div class="ellipsis">&nbsp;'+renderTime(newObj.createTime)+'</div></div></div>';
+
+				}
+				if(!isAppend){
+					$(".list-wrap").empty();
+				}
+				$(".list-wrap").append(str);
+			}
+			function renderTime(date) {
+				var dateee = new Date(date).toJSON();
+				return new Date(+new Date(dateee) + 8 * 3600 * 1000).toISOString().replace(/T/g, ' ').replace(/\.[\d]{3}Z/, '')
+			}
+			/*联网加载列表数据*/
+			var downIndex=0;
+			function getListDataFromNet(pageNum,pageSize,successCallback,errorCallback) {
+				//延时一秒,模拟联网
+				setTimeout(function () {
+					try{
+						$.ajax({
+							url : ctx + '/activity/goods/exchange/page',
+							dataType : 'json',
+							type : "post",
+							data : {
+								'token': '${token}',
+								'pageNum': pageNum,
+								'pageSize': pageSize,
+							},
+							success : function(res) {
+								if(res.code == 200){
+									var list = res.data.records;
+									successCallback&&successCallback(list);
+								}else {
+									errorCallback&&errorCallback();
+								}
+							},
+						})
+					}catch(e){
+						//联网失败的回调
+						errorCallback&&errorCallback();
+					}
+				},1000)
+			}
+
+			//禁止PC浏览器拖拽图片,避免与下拉刷新冲突;如果仅在移动端使用,可删除此代码
+			document.ondragstart=function() {return false;}
+		});
+
+		function copyText(o){
+			let text = $(o).html();
+			let textArea = $(o).prev("textarea");
+			textArea.val(text);
+			$(o).prev("textarea")[0].select();						//选择文本框中内容
+			document.execCommand('copy');
+			// $.toast("复制成功","text");
+			// document.execCommand("copy");
+		}
+	</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/jsp/activity/goods.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/activity/goods.jsp
new file mode 100644
index 0000000..65ac788
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/activity/goods.jsp
@@ -0,0 +1,449 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<!DOCTYPE html>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html lang="en" data-dpr="1" style="font-size: 37.52px;">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta name="viewport"
+          content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no,viewport-fit=cover">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <meta name="format-detection" content="telephone=no">
+    <meta name="keywords" content="">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+	<c:set var="ctx" value="${pageContext.request.contextPath}"  scope="request"/>
+	<c:set var="resourcePath" value="${ctx}/resources"  scope="request"/>
+	<script type="text/javascript">
+		var ctx = "${ctx}"; //上下文路径
+		var resourcePath = "${resourcePath}";
+		document.writeln('<script type="text/javascript" src="'+resourcePath+'/js/global.js?d=' + new Date().getTime() + '" ><\/script>');
+	</script>
+    <title>商品列表</title>
+	<link rel="stylesheet" href="${resourcePath}/css/h5.css">
+	<link rel="stylesheet" href="${resourcePath}/css/h5-common.css">
+	<style>
+		* {
+			-webkit-box-sizing: border-box;
+			box-sizing: border-box;
+			margin: 0;
+			padding: 0;
+			outline: 0;
+			-webkit-tap-highlight-color: rgba(0,0,0,0);
+		}
+		div {
+			display: block;
+		}
+		.ui-page, .ui-page:after {
+			background-color: #f7f7f7;
+		}
+		#app, body, html {
+			font-size: .34333333rem;
+			height: 100%;
+			color: #333;
+			-webkit-user-select: none;
+			-moz-user-select: none;
+			-o-user-select: none;
+			user-select: none;
+		}
+		.ui-page[data-v-07f6ffda] {
+			position: relative;
+			max-width: 256px;
+			max-width: 16rem;
+			min-height: 100%;
+			background-color: #f7f7f7;
+			padding-top: 1px;
+			margin: -1px auto 0;
+			margin-top: 1.5rem;
+		}
+		.money-exchange[data-v-07f6ffda] {
+			height: 100%;
+		}
+		.money-exchange .money-header-amount[data-v-07f6ffda] {
+			width: 100%;
+			height: 34.133px;
+			height: 2.13333333rem;
+			box-sizing: border-box;
+			background-image: linear-gradient(153deg,#fca195, #ef5151 89%);
+			color: #fff;
+			display: -ms-flexbox;
+			display: flex;
+			-ms-flex-pack: justify;
+			justify-content: space-between;
+			-ms-flex-align: center;
+			align-items: center;
+			position: fixed;
+			top: 0;
+			left: 0;
+			z-index: 1;
+		}
+		.money-exchange .money-header-amount .money-amount[data-v-07f6ffda] {
+			height: 34.133px;
+			height: 2.13333333rem;
+			padding-left: 6.4px;
+			padding-left: .4rem;
+			display: -ms-flexbox;
+			display: flex;
+			-ms-flex-pack: justify;
+			justify-content: space-between;
+			-ms-flex-direction: column;
+			flex-direction: column;
+			padding: 5.333px;
+			padding: .33333333rem;
+		}
+		.money-exchange .money-header-amount .money-amount div.title[data-v-07f6ffda] {
+			height: .6rem;
+			font-size: 5.12px;
+			font-size: .32rem;
+			line-height: 9.6px;
+			line-height: .6rem;
+			font-family: DINAlternate-Bold;
+		}
+		.money-exchange .money-header-amount .money-amount div.money[data-v-07f6ffda] {
+			height: .86666667rem;
+			font-size: .66666667rem;
+			line-height: .86666667rem;
+			font-family: DINAlternate-Bold;
+		}
+		.money-exchange .money-header-amount .money-record[data-v-07f6ffda] {
+			margin-right: 5.12px;
+			margin-right: .32rem;
+			height: 10.666px;
+			height: .66666667rem;
+			line-height: 10.24px;
+			line-height: .64rem;
+			width: 42.666px;
+			width: 2.66666667rem;
+			border-radius: .39333333rem;
+			font-size: 5.546px;
+			font-size: .34666667rem;
+			border: 1px solid #fff;
+			text-align: center;
+		}
+		/*.money-exchange .money-content[data-v-07f6ffda] {*/
+		/*	width: 100%;*/
+		/*	height: 100%;*/
+		/*	padding-top: 34.133px;*/
+		/*	padding-top: 2.13333333rem;*/
+		/*	position: relative;*/
+		/*	overflow: auto;*/
+		/*}*/
+		.money-exchange .money-content div.no-goods[data-v-07f6ffda] {
+			position: absolute;
+			width: 85.333px;
+			width: 5.33333333rem;
+			height: 106.666px;
+			height: 6.66666667rem;
+			left: 50%;
+			top: 50%;
+			transform: translateX(-50%) translateY(-50%);
+		}
+		.money-exchange .money-content div.no-goods span[data-v-07f6ffda] {
+			display: inline-block;
+			width: 85.333px;
+			width: 5.33333333rem;
+			height: 21.333px;
+			height: 1.33333333rem;
+			text-align: center;
+			line-height: 21.333px;
+			line-height: 1.33333333rem;
+			font-size: 6.4px;
+			font-size: .4rem;
+			color: #999;
+		}
+		.money-exchange .money-content div.no-goods img[data-v-07f6ffda] {
+			width: 85.333px;
+			width: 5.33333333rem;
+			height: 85.333px;
+			height: 5.33333333rem;
+		}
+		.money-exchange .money-content .goods-list[data-v-07f6ffda] {
+			padding-left: 4.266px;
+			padding-left: .26666667rem;
+			padding-right: 4.266px;
+			padding-right: .26666667rem
+		}
+		.money-exchange .money-content .goods-list .list-title[data-v-07f6ffda] {
+			height: 14.933px;
+			height: .93333333rem;
+			line-height: 14.933px;
+			line-height: .93333333rem;
+			font-size: 6.4px;
+			font-size: .4rem;
+			font-weight: 700
+		}
+		.money-exchange .money-content .goods-list .list-wrap[data-v-07f6ffda] {
+			display: -ms-flexbox;
+			display: flex;
+			width: 100%;
+			-ms-flex-pack: justify;
+			justify-content: space-between;
+			-ms-flex-wrap: wrap;
+			flex-wrap: wrap
+		}
+		.money-exchange .money-content .goods-list .list-wrap .list-item[data-v-07f6ffda] {
+			width: 49%;
+			font-size: 0;
+			margin-bottom: .3666rem;
+		}
+		.money-exchange .money-content .goods-list .list-wrap .list-item .item-image[data-v-07f6ffda] {
+			width: 100%;
+		}
+		.money-exchange .money-content .goods-list .list-wrap .list-item .item-name[data-v-07f6ffda] {
+			display: block;
+			font-weight: 700;
+			padding-top: 2.133px;
+			padding-top: .13333333rem;
+			font-size: 5.973px;
+			font-size: .37333333rem
+		}
+		.money-exchange .money-content .goods-list .list-wrap .list-item .item-image img[data-v-07f6ffda] {
+			width: 100%;
+			border-radius: 5px 5px 0 0;
+		}
+		.money-exchange .money-content .goods-list .list-wrap .list-item .item-amount[data-v-07f6ffda] {
+			color: #ff721f;
+			font-size: .55rem;
+			display: inline-block;
+			margin-right: 1.066px;
+			margin-right: .06666667rem;
+			margin-bottom: 10px;
+		}
+		.money-exchange .money-content .goods-list .list-wrap .list-item .item-detail[data-v-07f6ffda] {
+			color: #ff721f;
+			font-size: 5.546px;
+			font-size: .34666667rem;
+			height: 12.8px;
+			height: .8rem;
+			display: inline-block;
+			margin-right: 2.133px;
+			margin-right: .13333333rem
+		}
+
+		.money-exchange .money-content .goods-list .list-wrap .list-item .item-tip[data-v-07f6ffda] {
+			font-size: 5.546px;
+			font-size: .34666667rem;
+			height: 12.8px;
+			height: .8rem;
+			display: inline-block;
+			text-decoration: line-through;
+			color: #999
+		}
+		div.polaroid {
+			box-shadow: 0 1px 1px 0 rgba(0, 0, 0, .1), 0 1px 1px 0 rgba(0, 0, 0, .1);
+			border-radius: 5px;
+		}
+		.goods-content{
+			line-height: .45rem;
+			padding: 0 .2rem;
+		}
+		.item-name{
+			margin-top: .1rem;
+		}
+		.item-amount{
+			margin-top: .2rem;
+		}
+		.postage{
+			font-size: .4rem;
+		}
+		.hread{
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			padding: 0.3rem 0.25rem;
+			background-color: #fff;
+			margin-bottom: 0.3rem;
+			font-size: 16px;
+			position: fixed;
+			top: 0;
+			border: 0;
+			z-index: 1;
+			width: 100%;
+			height: 1.2rem;
+			border-bottom: 1px solid #d5d3d3;
+		}
+		.integral{
+			display: flex;
+			align-items: center;
+		}
+		.integral-label{
+			color: #888888;
+		}
+		.integral-value{
+			color: #ff721f;
+			font-weight: bold;
+		}
+		.integral-record-btn{
+			height: 0.66666667rem;
+			line-height: .64rem;
+			width: 2.3rem;
+			border-radius: 0.1rem;
+			font-size: .34666667rem;
+			border: 1px solid #ff721f;
+			text-align: center;
+			color: #ff721f;
+		}
+	</style>
+</head>
+<body style="font-size: 12px;">
+	<div id="app">
+		<div class="hread">
+			<div class="integral">
+				<div class="integral-label">可用积分：</div>
+				<div class="integral-value">${useAmt}</div>
+			</div>
+			<div class="integral-record-btn money-record">兑换记录</div>
+		</div>
+		<div data-v-07f6ffda="" class="ui-page money-exchange">
+<%--			<div data-v-07f6ffda="" class="money-header-amount">--%>
+<%--				<div data-v-07f6ffda="" class="money-amount">--%>
+<%--					<div data-v-07f6ffda="" class="title">可用积分</div>--%>
+<%--					<div data-v-07f6ffda="" class="money">${useAmt}</div>--%>
+<%--				</div>--%>
+<%--				<div data-v-07f6ffda="" class="money-record">商品兑换记录</div>--%>
+<%--			</div>--%>
+			<div data-v-07f6ffda="" class="money-content">
+				<c:if test="${empty goodList }">
+					<div data-v-07f6ffda="" class="no-goods">
+						<img data-v-07f6ffda="" src="${resourcePath}/images/no-goods.png" alt="">
+						<span data-v-07f6ffda="">更多好货，敬请期待</span>
+					</div>
+				</c:if>
+<%--				<div data-v-07f6ffda="" class="no-goods">--%>
+<%--					<img data-v-07f6ffda="" src="${resourcePath}/images/no-goods.png" alt="">--%>
+<%--					<span data-v-07f6ffda="">更多好货，敬请期待</span>--%>
+<%--				</div>--%>
+				<c:if test="${not empty goodList }">
+					<div data-v-07f6ffda class="goods-list">
+<%--						<div data-v-07f6ffda class="list-title" style="margin: .222rem 0 .4444rem 0">--%>
+<%--							商品列表--%>
+<%--						</div>--%>
+						<div data-v-07f6ffda class="list-wrap">
+							<c:forEach items="${goodList}" var="good">
+								<div data-v-07f6ffda data-index="${good.id}" class="list-item polaroid" onclick="detail(this)" >
+									<div data-v-07f6ffda class="item-image">
+										<img data-v-07f6ffda src="${good.imgUrl}">
+									</div>
+									<div class="goods-content">
+										<div data-v-07f6ffda class="item-name">
+											${good.goodName}
+										</div>
+										<div data-v-07f6ffda class="item-amount">
+											${good.goodPrice}
+											<span class="postage" style="display: ${good.isPostage eq 1 ? 'black' : 'none'}">
+												包邮
+											</span>
+										</div>
+									</div>
+								</div>
+							</c:forEach>
+						</div>
+					</div>
+				</c:if>
+			</div>
+		</div>
+	</div>
+
+	<script type="text/javascript">
+		/* === 判断支持版本 start === */
+		(function () {
+			var viewportTag = null;
+			var metaTags = document.getElementsByTagName('meta');
+			for (var i = 0; i < metaTags.length; i++) {
+				if (metaTags[i].getAttribute('name') === "viewport") {
+					viewportTag = metaTags[i];
+					break;
+				}
+			}
+			if (!viewportTag) {
+				viewportTag = document.createElement("meta");
+				viewportTag.setAttribute('name', 'viewport');
+			}
+
+			var viewportTagContent =
+					'width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no';
+
+			// Detect if iOS device
+			if (/(iPhone|iPod|iPad)/i.test(window.navigator.userAgent)) {
+				// Get iOS major version
+				var iosVersion = parseInt((window.navigator.userAgent).match(/OS (\d+)_(\d+)_?(\d+)? like Mac OS X/i)[1]);
+				// Detect if device is running >iOS 11
+				// iOS 11's UIWebView and WKWebView changes the viewport behaviour to render viewport without the status bar. Need to override with "viewport-fit: cover" to include the status bar.
+				if (iosVersion >= 11) {
+					viewportTagContent += ', viewport-fit=cover';
+				}
+			}
+
+			// Update viewport tag attribute
+			viewportTag.setAttribute('content', viewportTagContent);
+		})();
+		/* === 判断支持版本 end === */
+
+		// refs http://www.html-js.com/article/3041 移动端高清、多屏适配方案
+		!function (a, b) {
+			function c() {
+				var b = f.getBoundingClientRect().width;
+				b / i > 540 && (b = 540 * i);
+				var c = b / 10;
+				f.style.fontSize = c + "px", k.rem = a.rem = c
+			}
+			var d, e = a.document,
+					f = e.documentElement,
+					g = e.querySelector('meta[name="viewport"]'),
+					h = e.querySelector('meta[name="flexible"]'),
+					i = 0,
+					j = 0,
+					k = b.flexible || (b.flexible = {});
+			if (g) {
+				var l = g.getAttribute("content").match(/initial\-scale=([\d\.]+)/);
+				l && (j = parseFloat(l[1]), i = parseInt(1 / j))
+			} else if (h) {
+				var m = h.getAttribute("content");
+				if (m) {
+					var n = m.match(/initial\-dpr=([\d\.]+)/),
+							o = m.match(/maximum\-dpr=([\d\.]+)/);
+					n && (i = parseFloat(n[1]), j = parseFloat((1 / i).toFixed(2))), o && (i = parseFloat(o[1]), j = parseFloat((
+							1 / i).toFixed(2)))
+				}
+			}
+			if (!i && !j) {
+				var p = (a.navigator.appVersion.match(/android/gi), a.navigator.appVersion.match(/iphone/gi)),
+						q = a.devicePixelRatio;
+				i = p ? q >= 3 && (!i || i >= 3) ? 3 : q >= 2 && (!i || i >= 2) ? 2 : 1 : 1, j = 1 / i
+			}
+			if (f.setAttribute("data-dpr", i), !g)
+				if (g = e.createElement("meta"), g.setAttribute("name", "viewport"), g.setAttribute("content",
+						"initial-scale=" + j + ", maximum-scale=" + j + ", minimum-scale=" + j + ", user-scalable=no"), f
+						.firstElementChild) f.firstElementChild.appendChild(g);
+				else {
+					var r = e.createElement("div");
+					r.appendChild(g), e.write(r.innerHTML)
+				}
+			a.addEventListener("resize", function () {
+				clearTimeout(d), d = setTimeout(c, 300)
+			}, !1), a.addEventListener("pageshow", function (a) {
+				a.persisted && (clearTimeout(d), d = setTimeout(c, 300))
+			}, !1), "complete" === e.readyState ? e.body.style.fontSize = 12 * i + "px" : e.addEventListener(
+					"DOMContentLoaded",
+					function () {
+						e.body.style.fontSize = 12 * i + "px"
+					}, !1), c(), k.dpr = a.dpr = i, k.refreshRem = c, k.rem2px = function (a) {
+				var b = parseFloat(a) * this.rem;
+				return "string" == typeof a && a.match(/rem$/) && (b += "px"), b
+			}, k.px2rem = function (a) {
+				var b = parseFloat(a) / this.rem;
+				return "string" == typeof a && a.match(/px$/) && (b += "rem"), b
+			}
+		}(window, window.lib || (window.lib = {}));
+	</script>
+	<script>
+		function detail(obj) {
+			var g = $(obj).attr("data-index");
+			window.location.href= ctx + '/activity/good/detail?token=${token}&g='+g;
+		}
+		$(".money-record").on('click',function () {
+			window.location.href= ctx + '/activity/exchange/view?token=${token}';
+		})
+	</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/jsp/activity/order.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/activity/order.jsp
new file mode 100644
index 0000000..619cefc
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/activity/order.jsp
@@ -0,0 +1,340 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<!DOCTYPE html>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html lang="en" data-dpr="1" style="font-size: 37.52px;">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta name="viewport"
+          content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no,viewport-fit=cover">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <meta name="format-detection" content="telephone=no">
+    <meta name="keywords" content="">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+	<c:set var="ctx" value="${pageContext.request.contextPath}"  scope="request"/>
+	<c:set var="resourcePath" value="${ctx}/resources"  scope="request"/>
+	<script type="text/javascript">
+		var ctx = "${ctx}"; //上下文路径
+		var resourcePath = "${resourcePath}";
+		document.writeln('<script type="text/javascript" src="'+resourcePath+'/js/global.js?d=' + new Date().getTime() + '" ><\/script>');
+	</script>
+	<script type="text/javascript" src="${resourcePath}/js/zepto.min.js"></script>
+	<script type="text/javascript" src="${resourcePath}/js/zepto.weui.js"></script>
+    <title>确认订单</title>
+	<link rel="stylesheet" href="${resourcePath}/css/h5.css">
+	<link rel="stylesheet" href="${resourcePath}/css/h5-common.css">
+	<link rel="stylesheet" href="${resourcePath}/css/weui.css">
+	<link rel="stylesheet" href="${resourcePath}/css/weuix.css">
+	<style>
+		body{
+			background-color: #F6F6F4;
+		}
+		#app{
+			padding: .4rem;
+		}
+		.address{
+			background-color: #fff;
+			border-radius: 5px;
+			display: flex;
+			justify-content: space-between;
+			padding: 8px;
+			align-items: center;
+		}
+		.icon{
+			width: 25px;
+			height: 25px;
+		}
+		.add-text{
+			color: #f14e4e;
+			font-size: .4rem;
+			width: 80%;
+		}
+		.good-image{
+			width: 60px;
+		}
+		.good-order{
+			background-color: #fff;
+			border-radius: 5px;
+			margin-top: .355rem;
+		}
+		.goods-info{
+			padding: 10px;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+		}
+		.goods-name{
+			width: 70%;
+		}
+		.order-info{
+			display: flex;
+			justify-content: space-between;
+			padding: 0 10px 8px 10px;
+		}
+		.order-price{
+			color: #f14e4e;
+			font-size: 18px;
+		}
+		.order-price-text{
+			font-size: 14px;
+		}
+		.good-price-text{
+			margin-top: 5px;
+			font-size: 16px;
+			color: #f14e4e;
+		}
+		.good-name-text{
+			font-size: 14px;
+		}
+		.footer{
+			position: fixed;
+			bottom: 0;
+			left: 0;
+			background-color: #fff;
+			display: flex;
+			width: 100%;
+			padding: 10px;
+			justify-content: space-between;
+			border-radius: 5px 5px 0 0;
+			box-shadow: 1px 1px 12px #acacac;
+			align-items: center;
+			font-size: 12px;
+		}
+		.btn-submit{
+			width: 2.5rem;
+			height: 1rem;
+			line-height: 1rem;
+			margin:0;
+			background:#f14e4e;
+		}
+		.price-desc,.postage-fee{
+			color: #f14e4e;
+		}
+		.price-jf-text{
+			font-size: 12px;
+		}
+		.pay-icon{
+			width: 30px;
+		}
+		.order-pay-type{
+			margin-top: .355rem;
+			background-color: #fff;
+			border-radius: 5px;
+			padding: 10px;
+		}
+		.pay-info{
+			display: flex;
+			justify-content: flex-start;
+			align-items: center;
+		}
+		.hr{
+			border-top: 1px solid #ebe5e5;
+			margin: 10px 0;
+		}
+		.pay-name{
+			margin-left: 10px;
+		}
+		.type-pay{
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+		}
+		.pay-type{
+			width: .5rem;
+			height: .5rem;
+			appearance: auto;
+			webkit-appearance:auto;
+			border: black;
+		}
+
+
+		.order-pay-type div{
+			position: relative;
+		}
+
+		input[type="radio"] {
+			width: 20px;
+			height: 20px;
+			opacity: 0;
+		}
+
+		.type-pay label {
+			position: absolute;
+			right: 5px;
+			top: 3px;
+			width: 20px;
+			height: 20px;
+			border-radius: 50%;
+			border: 1px solid #999;
+　　　　　　　cursor: pointer;
+		}
+
+		/*设置选中的input的样式*/
+		/* + 是兄弟选择器,获取选中后的label元素*/
+		input:checked+label {
+			background-color: #f14e4e;
+			border: 1px solid #f14e4e;
+		}
+		/*添加的加号与label进行拼接(一个矩形边框去掉上和左的边框),再旋转45度*/
+		input:checked+label::after {
+			position: absolute;
+			content: "";
+			width: 5px;
+			height: 10px;
+			top: 1px;
+			left: 6px;
+			border: 2px solid #fff;
+			border-top: none;
+			border-left: none;
+			transform: rotate(45deg);
+		}
+		.address-info{
+			width: 75%;
+		}
+		.address-text{
+			font-size: 13px;
+		}
+		.link-text{
+			font-size: 11px;
+			color: #a0a0a0;
+		}
+		.ellipsis{
+			text-overflow: ellipsis;
+			overflow: hidden;
+			white-space: nowrap;
+		}
+		.order-hr{
+			border-top: 1px solid #ebe5e5;
+			margin: 0 auto 10px auto;
+			width: 93%;
+		}
+		.weui-icon_toast.weui-loading{
+			margin: 20px 0 0 0;
+		}
+		.foot-text{
+			font-size: 14px;
+		}
+		.postage-fee{
+			font-size: 14px;
+			color: #e89292;
+		}
+	</style>
+	<style type="text/css">.mint-popup-bottom[data-v-8cd1bb9c]{-webkit-transform:translate3d(-50%,0,0)!important}.mint-indicator-wrapper[data-v-8cd1bb9c]{-webkit-transform:translate(-50%,-50%);z-index:999}#app[data-v-8cd1bb9c],body[data-v-8cd1bb9c],html[data-v-8cd1bb9c]{font-size:5.973px;font-size:.37333333rem;height:100%;color:#333;-webkit-user-select:none;-moz-user-select:none;-o-user-select:none;-ms-user-select:none;user-select:none}body[data-v-8cd1bb9c],html[data-v-8cd1bb9c],input[data-v-8cd1bb9c],textarea[data-v-8cd1bb9c]{font-family:PingFangSC-Regular,Helvetica,sans-serif}input[data-v-8cd1bb9c],textarea[data-v-8cd1bb9c]{background-color:#fff}input[data-v-8cd1bb9c],li[data-v-8cd1bb9c],ol[data-v-8cd1bb9c],textarea[data-v-8cd1bb9c],ul[data-v-8cd1bb9c]{padding:0;border:0;margin:0}.tc[data-v-8cd1bb9c]{text-align:center}.tr[data-v-8cd1bb9c]{text-align:right}.tl[data-v-8cd1bb9c]{text-align:left}.c4b[data-v-8cd1bb9c]{color:#4b4b4b}.c000[data-v-8cd1bb9c]{color:#000}.c333[data-v-8cd1bb9c]{color:#333}.c666[data-v-8cd1bb9c]{color:#666}.c999[data-v-8cd1bb9c]{color:#999}.cccc[data-v-8cd1bb9c]{color:#ccc}.cddd[data-v-8cd1bb9c]{color:#ddd}.c9b9b[data-v-8cd1bb9c]{color:#9b9b9b}.cblue[data-v-8cd1bb9c]{color:#3089f7}.cred[data-v-8cd1bb9c]{color:red}.cora[data-v-8cd1bb9c]{color:#faa800}.cbase[data-v-8cd1bb9c]{color:#ff721f}.cfff[data-v-8cd1bb9c]{color:#fff}.bfff[data-v-8cd1bb9c]{background-color:#fff}.bbase[data-v-8cd1bb9c]{background-color:#ff721f}.fl[data-v-8cd1bb9c]{float:left}.fr[data-v-8cd1bb9c]{float:right}.mt10[data-v-8cd1bb9c]{margin-top:4.266px;margin-top:.26666667rem}.ml15[data-v-8cd1bb9c]{margin-left:6.4px;margin-left:.4rem}.mr15[data-v-8cd1bb9c]{margin-right:6.4px;margin-right:.4rem}.mt15[data-v-8cd1bb9c]{margin-top:6.4px;margin-top:.4rem}.mb15[data-v-8cd1bb9c]{margin-bottom:6.4px;margin-bottom:.4rem}.pl15[data-v-8cd1bb9c]{padding-left:6.4px;padding-left:.4rem}.pr15[data-v-8cd1bb9c]{padding-right:6.4px;padding-right:.4rem}.pt15[data-v-8cd1bb9c]{padding-top:6.4px;padding-top:.4rem}.pb15[data-v-8cd1bb9c]{padding-bottom:6.4px;padding-bottom:.4rem}.mt30[data-v-8cd1bb9c]{margin-top:12.8px;margin-top:.8rem}.mb30[data-v-8cd1bb9c]{margin-bottom:12.8px;margin-bottom:.8rem}.fz12[data-v-8cd1bb9c]{font-size:5.12px;font-size:.32rem}.fz13[data-v-8cd1bb9c]{font-size:5.546px;font-size:.34666667rem}.fz14[data-v-8cd1bb9c]{font-size:5.973px;font-size:.37333333rem}.fz15[data-v-8cd1bb9c]{font-size:6.4px;font-size:.4rem}.fz16[data-v-8cd1bb9c]{font-size:6.826px;font-size:.42666667rem}.fz18[data-v-8cd1bb9c]{font-size:7.68px;font-size:.48rem}.fz20[data-v-8cd1bb9c]{font-size:8.533px;font-size:.53333333rem}.fz22[data-v-8cd1bb9c]{font-size:9.386px;font-size:.58666667rem}.fz24[data-v-8cd1bb9c]{font-size:10.24px;font-size:.64rem}.fz32[data-v-8cd1bb9c]{font-size:13.653px;font-size:.85333333rem}.fz36[data-v-8cd1bb9c]{font-size:15.36px;font-size:.96rem}.block[data-v-8cd1bb9c]{display:block}b[data-v-8cd1bb9c],dfn[data-v-8cd1bb9c],em[data-v-8cd1bb9c]{font-style:normal;font-weight:400}.font-DINAlternate[data-v-8cd1bb9c]{font-family:DINAlternate-Bold,PingFangSC-Regular,Helvetica,sans-serif}.arr_r[data-v-8cd1bb9c]{position:relative}.arr_r[data-v-8cd1bb9c]:after{content:"";position:absolute;z-index:80;right:6.4px;right:.4rem;top:50%;width:6px;height:6px;border:1px solid #c7c7cc;border-width:2px 2px 0 0;transform:translateY(-50%) rotate(45deg)}.shadow[data-v-8cd1bb9c]{box-shadow:0 8px 25px 0 #eaebec}.ellips[data-v-8cd1bb9c]{white-space:nowrap;overflow:hidden;text-overflow:ellipsis}.ellips_line2[data-v-8cd1bb9c],.ellips_line3[data-v-8cd1bb9c]{display:-webkit-box;overflow:hidden}.ellips_line2[data-v-8cd1bb9c]{-webkit-line-clamp:2}.ellips_line3[data-v-8cd1bb9c]{-webkit-line-clamp:3}.to-check[data-v-8cd1bb9c]{position:relative}.to-check.checked[data-v-8cd1bb9c]:before{content:"";position:absolute;top:50%;right:6.4px;right:.4rem;width:6.4px;width:.4rem;height:3.2px;height:.2rem;border:2px solid #ff721f;border-width:0 0 2px 2px;transform:translateY(-50%) rotate(-45deg)}.ui-page[data-v-8cd1bb9c]{position:relative;max-width:256px;max-width:16rem;min-height:100%;background-color:#f7f7f7;padding-top:1px;margin:-1px auto 0}.ui-page[data-v-8cd1bb9c]:after{content:"";position:fixed;top:0;bottom:0;left:0;right:0;z-index:-1;background-color:#f7f7f7}button[data-v-8cd1bb9c]{font-size:6.4px;font-size:.4rem;border-radius:1px;background-color:#ff721f}button.disabled[data-v-8cd1bb9c]{opacity:.4}.mebtn[data-v-8cd1bb9c]{width:100%;padding:0 6.4px;padding:0 .4rem}input[data-v-8cd1bb9c]::-webkit-input-placeholder{color:#ccc}[data-v-8cd1bb9c]:-moz-placeholder,[data-v-8cd1bb9c]::-moz-placeholder{color:#ccc}[data-v-8cd1bb9c]:-ms-input-placeholder{color:#ccc}[class*=mint-tab-container][data-v-8cd1bb9c]{visibility:visible;position:static;opacity:1}.loading-txt[data-v-8cd1bb9c]{width:76.8px;width:4.8rem}.loading-txt em[data-v-8cd1bb9c]{display:block;margin:4.266px auto;margin:.26666667rem auto}.loading-txt .txt[data-v-8cd1bb9c]{margin-bottom:2.56px;margin-bottom:.16rem}.v-input-clear[data-v-8cd1bb9c]{position:absolute;right:-4.266px;right:-.26666667rem;top:50%;display:none;z-index:9;padding:4.266px;padding:.26666667rem;background-color:#fff;transform:translateY(-50%)}.v-input-clear.active[data-v-8cd1bb9c]{display:block}.v-input-clear .icon-font[data-v-8cd1bb9c]{display:block;color:#ccc;font-size:7.68px;font-size:.48rem}.popup-container .popup-title[data-v-8cd1bb9c]{font-weight:700}.popup-container .popup-btns .btn[data-v-8cd1bb9c]{color:#ff721f}.flex[data-v-8cd1bb9c]{display:-ms-flexbox;display:flex}.flex .flex-li[data-v-8cd1bb9c],.flex li[data-v-8cd1bb9c]{-ms-flex:1;flex:1}.i-warn-red[data-v-8cd1bb9c]{display:inline-block;width:20px;height:20px;background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAAAXNSR0IArs4c6QAAAkNJREFUSA29Vj1PVEEUvWdYA72dFkJCQkGhkJjQECpqTbQyWuhPcMFYUFjYyUfCbyDSYEJvZWhIiDEWmlCxFkBla8Tdfdcz897O7L7F2XkE3yS7e+fOOffMx92ZC0lo+vLOnAAPRWVRILdF9ZajAWf0ndJ3QN8+Nn98GRUOMYA2px6L6FsGm4nh/BhwLII1bJzseV/JuFRQV2amJLt4T7GFEj6xi0Mx40+wfnxSJgwJ6urkkmT6gVt1swyu1If8FINHeNf61M8bEHRiXfnIld3oB13dRlvGZLlf1Au6bdTfR6NXxiCQHU6CXH1KfCM6IbtSTNzvba/xYHtmKdto5BU2Wi/4eU7ua8//l2FjunzIAU6wyMa0BDH61cfGWLC98zJDF3IN6W0HUz+1dbCib2aP5FcH0rloptLc30tkD7o6PS/d9ud0okXyHF2rnFzzRrLOg5xc4RvyjejvFRg5lLeVYaIsViICW0yYOWy27nGl25W41DLubqzEMrse3pBge2fE4D3MFRYXcQQ3MNTQP76vjWB7Z8SgVvgfRnDXNgQot5RPTH3t3CbNaW161LJJc1CbILVs0uzXJkgt48oC91L/Z1lqWK0iS7GWLNfOQmajzx4ZINdw5LwGYVmQ0gzCzdTNgh3l4rBX54THkzWIpDzAmaxrc/Iu49sH+FlUxw66B5ixi+ZffNuvo8QI50FBV3uwBnGzKmZ05R+7slI9Y2MNCFqHE2UNQivtTC1pqJFr65hSxWZhA1ta5tVWCA8JX2Op/xc+6NDNayMwOQAAAABJRU5ErkJggg==) no-repeat;background-size:20px 20px}.i-checked[data-v-8cd1bb9c],.i-unchecked[data-v-8cd1bb9c]{position:relative;display:inline-block;width:16px;height:16px;background:url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+Cjxzdmcgd2lkdGg9IjMycHgiIGhlaWdodD0iMzJweCIgdmlld0JveD0iMCAwIDMyIDMyIiB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPgogICAgPCEtLSBHZW5lcmF0b3I6IFNrZXRjaCA1MC4yICg1NTA0NykgLSBodHRwOi8vd3d3LmJvaGVtaWFuY29kaW5nLmNvbS9za2V0Y2ggLS0+CiAgICA8dGl0bGU+5Y2P6K6u5Yu+L+WLvjwvdGl0bGU+CiAgICA8ZGVzYz5DcmVhdGVkIHdpdGggU2tldGNoLjwvZGVzYz4KICAgIDxkZWZzPjwvZGVmcz4KICAgIDxnIGlkPSLljY/orq7li74v5Yu+IiBzdHJva2U9Im5vbmUiIHN0cm9rZS13aWR0aD0iMSIgZmlsbD0ibm9uZSIgZmlsbC1ydWxlPSJldmVub2RkIj4KICAgICAgICA8cGF0aCBkPSJNMjguNDQ0NDQ0NCwwIEwzLjU1NTU1NTU2LDAgQzEuNiwwIDAsMS42IDAsMy41NTU1NTU1NiBMMCwyOC40NDQ0NDQ0IEMwLDMwLjQgMS42LDMyIDMuNTU1NTU1NTYsMzIgTDI4LjQ0NDQ0NDQsMzIgQzMwLjQsMzIgMzIsMzAuNCAzMiwyOC40NDQ0NDQ0IEwzMiwzLjU1NTU1NTU2IEMzMiwxLjYgMzAuNCwwIDI4LjQ0NDQ0NDQsMCBMMjguNDQ0NDQ0NCwwIFogTTEyLjQ0NDQ0NDQsMjQuODg4ODg4OSBMMy41NTU1NTU1NiwxNi4zNDE4ODAzIEw2LjA0NDQ0NDQ0LDEzLjk0ODcxNzkgTDEyLjQ0NDQ0NDQsMjAuMTAyNTY0MSBMMjUuOTU1NTU1Niw3LjExMTExMTExIEwyOC40NDQ0NDQ0LDkuNTA0MjczNSBMMTIuNDQ0NDQ0NCwyNC44ODg4ODg5IEwxMi40NDQ0NDQ0LDI0Ljg4ODg4ODkgWiIgaWQ9IuWLvuS4iiIgZmlsbD0iI0ZGNzIxRiI+PC9wYXRoPgogICAgPC9nPgo8L3N2Zz4=) no-repeat;background-size:16px auto}.i-unchecked[data-v-8cd1bb9c]{background-image:url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+Cjxzdmcgd2lkdGg9IjMycHgiIGhlaWdodD0iMzJweCIgdmlld0JveD0iMCAwIDMyIDMyIiB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPgogICAgPCEtLSBHZW5lcmF0b3I6IFNrZXRjaCA1MC4yICg1NTA0NykgLSBodHRwOi8vd3d3LmJvaGVtaWFuY29kaW5nLmNvbS9za2V0Y2ggLS0+CiAgICA8dGl0bGU+5Y2P6K6u5Yu+L+acquWLvjwvdGl0bGU+CiAgICA8ZGVzYz5DcmVhdGVkIHdpdGggU2tldGNoLjwvZGVzYz4KICAgIDxkZWZzPjwvZGVmcz4KICAgIDxnIGlkPSLljY/orq7li74v5pyq5Yu+IiBzdHJva2U9Im5vbmUiIHN0cm9rZS13aWR0aD0iMSIgZmlsbD0ibm9uZSIgZmlsbC1ydWxlPSJldmVub2RkIiBmaWxsLW9wYWNpdHk9IjAuMyI+CiAgICAgICAgPHBhdGggZD0iTTI4LjQ0NDQ0NDQsMCBMMy41NTU1NTU1NiwwIEMxLjYsMCAwLDEuNiAwLDMuNTU1NTU1NTYgTDAsMjguNDQ0NDQ0NCBDMCwzMC40IDEuNiwzMiAzLjU1NTU1NTU2LDMyIEwyOC40NDQ0NDQ0LDMyIEMzMC40LDMyIDMyLDMwLjQgMzIsMjguNDQ0NDQ0NCBMMzIsMy41NTU1NTU1NiBDMzIsMS42IDMwLjQsMCAyOC40NDQ0NDQ0LDAgTDI4LjQ0NDQ0NDQsMCBaIE0xMi40NDQ0NDQ0LDI0Ljg4ODg4ODkgTDMuNTU1NTU1NTYsMTYuMzQxODgwMyBMNi4wNDQ0NDQ0NCwxMy45NDg3MTc5IEwxMi40NDQ0NDQ0LDIwLjEwMjU2NDEgTDI1Ljk1NTU1NTYsNy4xMTExMTExMSBMMjguNDQ0NDQ0NCw5LjUwNDI3MzUgTDEyLjQ0NDQ0NDQsMjQuODg4ODg4OSBMMTIuNDQ0NDQ0NCwyNC44ODg4ODg5IFoiIGlkPSLmsqHli77kuIoiIGZpbGw9IiNGRjcyMUYiPjwvcGF0aD4KICAgIDwvZz4KPC9zdmc+)}.model-container .key-body[data-v-8cd1bb9c]{padding-bottom:1.493px;padding-bottom:.09333333rem;background-color:#d2d5db}.model-container .key-body ul.number li[data-v-8cd1bb9c]{height:14.933px;height:.93333333rem;line-height:14.933px;line-height:.93333333rem;padding:3.626px 0;padding:.22666667rem 0;width:31%;margin:0 1.7% 1.7% 0;border-radius:5px;background-color:#fff;box-shadow:0 1px 0 0 #898a8d}.model-container .key-body ul.number li[data-v-8cd1bb9c]:nth-child(3n-2){margin-left:1.7%}.model-container .key-body ul.number li[data-v-8cd1bb9c]:before{content:none}.model-container .key-body ul.number li.key-back[data-v-8cd1bb9c],.model-container .key-body ul.number li.key-null[data-v-8cd1bb9c]{background-color:#d2d5db;box-shadow:none}.model-container .key-body ul.number li.key-back[data-v-8cd1bb9c]:active{opacity:.5}.freeMask[data-v-8cd1bb9c]{background-color:transparent}.vx-header+.scroll-wrapper[data-v-8cd1bb9c]{top:0}@keyframes lighter-data-v-8cd1bb9c{0%{background-color:#000}50%{background-color:#000}51%{background-color:transparent}to{background-color:transparent}}@keyframes rotater-data-v-8cd1bb9c{0%{-webkit-transform:rotate(0)}to{-webkit-transform:rotate(1turn)}}.get-money-activity[data-v-8cd1bb9c]{padding:6.4px;padding:.4rem;text-align:center;background-color:#fff}.get-money-activity .get-money-title[data-v-8cd1bb9c]{display:-ms-flexbox;display:flex;-ms-flex-pack:justify;justify-content:space-between;font-size:5.973px;font-size:.37333333rem;line-height:7.04px;line-height:.44rem;margin-top:5.546px;margin-top:.34666667rem;font-family:PingFangSC-Regular}.get-money-activity .get-money-title .one[data-v-8cd1bb9c]{color:#333}.get-money-activity .get-money-title .two[data-v-8cd1bb9c]{color:#ff7728}.get-money-activity .money[data-v-8cd1bb9c]{text-align:left;color:#333;font-size:13.653px;font-size:.85333333rem;line-height:18.773px;line-height:1.17333333rem;font-family:DINAlternate-Bold}.get-money-activity .money-desc[data-v-8cd1bb9c]{font-family:PingFangSC-Regular;color:#333;font-size:5.973px;font-size:.37333333rem;line-height:8.533px;line-height:.53333333rem;margin-top:5.333px;margin-top:.33333333rem;margin-bottom:5.333px;margin-bottom:.33333333rem;text-align:left}.get-money-activity .money-list[data-v-8cd1bb9c]{display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;-ms-flex-pack:start;justify-content:flex-start}.get-money-activity .money-list li[data-v-8cd1bb9c]{width:45.866px;width:2.86666667rem;height:23.253px;height:1.45333333rem;line-height:23.253px;line-height:1.45333333rem;font-size:11.093px;font-size:.69333333rem;color:#333;border:1px solid #bcbcbc;font-family:DINAlternate-Bold;border-radius:.10666667rem;margin-bottom:4.693px;margin-bottom:.29333333rem}.get-money-activity .money-list li[data-v-8cd1bb9c]:nth-child(3n-1){margin-left:4.693px;margin-left:.29333333rem;margin-right:4.693px;margin-right:.29333333rem}.get-money-activity .money-list li span[data-v-8cd1bb9c]{font-size:8.96px;font-size:.56rem}.get-money-activity .money-list .li-disabled[data-v-8cd1bb9c]{color:#dfdfdf}.get-money-activity .money-list .li-actived[data-v-8cd1bb9c]{color:#ff7728;border:1px solid #ff7728;background-color:rgba(255,119,40,.1)}.get-money-activity .get-money-desc[data-v-8cd1bb9c]{font-family:PingFangSC-Regular;color:#333;font-size:5.973px;font-size:.37333333rem;line-height:9.386px;line-height:.58666667rem;margin-top:2.133px;margin-top:.13333333rem;margin-bottom:12.8px;margin-bottom:.8rem;text-align:left}.get-money-activity .button-disabled[data-v-8cd1bb9c],.get-money-activity .money-button[data-v-8cd1bb9c]{width:100%;height:18.773px;height:1.17333333rem;line-height:18.773px;line-height:1.17333333rem;font-size:6.826px;font-size:.42666667rem;border-radius:.02666667rem;color:#fff;font-family:PingFangSC-Medium;font-weight:700}.get-money-activity .button-disabled[data-v-8cd1bb9c]{background-color:rgb(253,117,100)}.get-money-activity .money-button[data-v-8cd1bb9c]{background-color:#ff7728}.get-money-activity .money-exchange-link[data-v-8cd1bb9c]{width:100%;height:42.666px;height:2.66666667rem;margin-top:6.4px;margin-top:.4rem}.get-money-activity .money-exchange-link img[data-v-8cd1bb9c]{width:100%;height:100%}</style><style type="text/css" title="fading circle style">.circle-color-12 > div::before { background-color: #ccc; }
+	</style>
+</head>
+<body>
+	<div id="app">
+		<input id="aid" type="hidden" value="${aid}">
+		<div class="address">
+			<img class="icon" src="${resourcePath}/images/address-icon.png">
+			<c:choose>
+				<c:when test="${empty userAddres}">
+					<div class="add-text">请先选择收货地址</div>
+				</c:when>
+				<c:otherwise>
+					<div class="address-info">
+						<div class="address-text ellipsis">${userAddres.areaName} ${userAddres.address}</div>
+						<div class="link-text">${userAddres.name} ${userAddres.phone}</div>
+					</div>
+				</c:otherwise>
+			</c:choose>
+
+			<img class="icon" src="${resourcePath}/images/arrow-right-icon.png">
+		</div>
+		<div class="good-order">
+			<div class="goods-info">
+				<img class="good-image" src="${good.imgUrl}" alt="">
+				<div class="goods-name">
+					<div class="good-name-text">${good.goodName}</div>
+					<div class="good-price-text">${good.goodPrice}</div>
+				</div>
+				<div class="goods-num">X1</div>
+			</div>
+			<div class="hr order-hr"></div>
+			<div class="order-info">
+				<div class="order-name">实付：</div>
+				<div class="order-price">${good.goodPrice}&nbsp;<span class="order-price-text">积分</span><span class="order-price-text" style="display: ${good.isPostage == 1 ? 'black' : 'none'}">&nbsp;包邮</span></div>
+			</div>
+			<div class="order-info" style="display: ${good.deductRule == 1 ? 'black' : 'none'}">
+				<div class="order-name">金额：</div>
+				<div class="order-price postage-fee">￥${good.deductValue}</div>
+			</div>
+			<div class="order-info" style="display: ${good.isPostage == 0 ? 'black' : 'none'}">
+				<div class="order-name">邮费：</div>
+				<div class="order-price postage-fee">￥${good.postageFee}</div>
+			</div>
+		</div>
+		<div class="order-pay-type" style="display: ${good.isPostage == 0 ? 'black' : 'none'}">
+			<div class="type-pay" for="alipay">
+				<div class="pay-info">
+					<img class="pay-icon" src="${resourcePath}/images/alipay-icon.png" alt="支付宝">
+					<div class="pay-name">支付宝</div>
+				</div>
+				<input type="radio" class="pay-type" checked id="alipay" value="alipay" name="pay-type">
+				<label for="alipay" class="radio-label"></label>
+			</div>
+<%--			<div class="hr"></div>--%>
+<%--			<div class="type-pay" for="wxpay">--%>
+<%--				<div class="pay-info">--%>
+<%--					<img class="pay-icon" src="${resourcePath}/images/wxpay-icon.png" alt="微信">--%>
+<%--					<div class="pay-name">微信</div>--%>
+<%--				</div>--%>
+<%--				<input type="radio"  class="pay-type" value="wxpay" id="wxpay" name="pay-type">--%>
+<%--				<label for="wxpay" class="radio-label"></label>--%>
+<%--			</div>--%>
+		</div>
+		<div class="footer">
+			<div class="foot-text">
+				实付 :
+				<span class="price-desc">${good.goodPrice}
+					<span class="price-jf-text">积分</span>
+				</span>
+				<span class="postage-fee" style="display: ${good.isPostage == 0 || good.deductRule == 1 ? 'black' : 'none'}">&nbsp;+￥${good.postageFee + good.deductValue}</span>
+			</div>
+			<button class="btn-submit">立即兑换</button>
+		</div>
+	</div>
+	<script src="${resourcePath}/js/common/h5.js"></script>
+	<script>
+		$(".address").click(function (res){
+			window.location.href= ctx + '/activity/address?token=${token}&g=${good.id}';
+		})
+		$(".btn-submit").click(function (res){
+			let isPostage = '${good.isPostage}';
+			let deductRule = '${good.deductRule}';
+			let aid = $("#aid").val();
+			if(!aid)return $.toast("请先选择收货地址！","text");
+			// if(isPostage == 0)return $.alert("不包邮商品暂时无法兑换！","提示");
+			let url = ctx + "/activity/goods/exchange";
+			var data = {};
+			data.aid = aid;
+			data.token = '${token}';
+			data.goodsId = '${good.id}';
+			let lodingText = isPostage == 0 ? "支付中..." : "加载中...";
+			$.showLoading(lodingText);
+			$.ajax({
+				url:url,
+				data:data,
+				type:"post",
+				dataType:"json",
+				success:function (res){
+					if(res.code == 200){
+						if(isPostage == 0 || deductRule == 1){
+							let form = res.data.result;
+							$("#app").append(form);
+						}else{
+							$.alert(res.message,"提示",function (res){
+								window.location.href = ctx + '/activity/good?token=${token}';
+							});
+						}
+					}else{
+						$.hideLoading();
+						$.alert(res.message,"提示");
+					}
+				}
+			})
+		})
+	</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/jsp/aliPay/aliPay.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/aliPay/aliPay.jsp
new file mode 100644
index 0000000..69e2dc6
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/aliPay/aliPay.jsp
@@ -0,0 +1,45 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html>
+<jsp:include page="../../common.jsp" />
+<script type="text/javascript" src="https://www.shouyinbei.net/resources/wap/js/jquery.qrcode.js"></script>
+<script type="text/javascript" src="https://www.shouyinbei.net/resources/wap/js/qrcode.js"></script>
+</script>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="viewport"
+    content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+<title>支付宝授权码</title>
+</head>
+<body class="bluebg">
+        <div class="positionf wp100 left0 top0 zindex100 h40 tcenter">
+            <div>
+                <span class="white">支付宝授权码</span>
+            </div>
+        </div>
+        <!-- 容器 -->
+        <div class="weui-tab">
+            <div class="mt50">
+                <div class="ml20 mr20 pt20 fc cardbg">
+                    <div class="lgraybg radius5" id="qrcodeTable" style="width: 210px;margin:15px auto"></div>
+                    <div class="pt10 pb50 tcenter f14"><span class="f-red">*注:</span><span class="">请使用支付宝进件支付宝扫码</span></div>
+                </div>
+            </div>
+        </div>
+        <input type="hidden" id="website" value="${returnUrl}">
+         <script type="text/javascript">
+             $(function(){
+               var website=$("#website").val();
+                $(".lgraybg").height($(".lgraybg").width());
+                jQuery('#qrcodeTable').qrcode({
+                    //这种方式兼容IE8
+                    text: website,
+                     width:210,        // 宽度
+                     height:210,
+        });
+            });
+        </script>
+    </body>
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/jsp/aliPay/fail.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/aliPay/fail.jsp
new file mode 100644
index 0000000..77a7cd3
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/aliPay/fail.jsp
@@ -0,0 +1,33 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html>
+<jsp:include page="../../common.jsp" />
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="viewport"
+    content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+<title>授权失败</title>
+</head>
+  <body style="background:#f7f8fa;">
+        <div class="page-title tcenter bluebg white h40 white positionr">
+            <div>
+                <span>授权失败</span>
+            </div>
+        </div>
+        <div class="login_form ml20 mr20 mt50">
+            <form method="post">
+                <div class="weui-cells weui-cells_form mt50 tcenter">   
+                    <div class="bg-red icon icon-95 f55 white dlblock radiusp50 padding15">
+                        
+                    </div>
+                    <div class="mt30">
+                       授权失败！
+                    </div>
+                </div>
+            </form>
+        </div>
+    </body>
+
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/jsp/aliPay/returnUrl.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/aliPay/returnUrl.jsp
new file mode 100644
index 0000000..96abf37
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/aliPay/returnUrl.jsp
@@ -0,0 +1,14 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ page import="java.util.*"%>
+<%@ page import="java.util.Map"%>
+<%@ page import="com.alipay.api.*"%>
+<%@ page import="com.alipay.api.request.*"%>
+<%@ page import="com.alipay.api.response.*"%>
+
+<html>
+  <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <title>支付宝页面跳转同步通知页面</title>
+  </head>
+
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/jsp/aliPay/success.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/aliPay/success.jsp
new file mode 100644
index 0000000..795a217
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/aliPay/success.jsp
@@ -0,0 +1,33 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html>
+<jsp:include page="../../common.jsp" />
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="viewport"
+    content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+<title>授权成功</title>
+</head>
+  <body style="background:#f7f8fa;">
+        <div class="page-title tcenter bluebg white h40 white positionr">
+            <div>
+                <span>授权成功</span>
+            </div>
+        </div>
+        <div class="login_form ml20 mr20 mt50">
+            <form method="post">
+                <div class="weui-cells weui-cells_form mt50 tcenter">   
+                    <div class="bg-green icon icon-66 f55 white dlblock radiusp50 padding15">
+                        
+                    </div>
+                    <div class="mt30">
+                        授权成功！
+                    </div>
+                </div>
+            </form>
+        </div>
+    </body>
+
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/jsp/customer/customerSet.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/customer/customerSet.jsp
new file mode 100644
index 0000000..6f0c70e
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/customer/customerSet.jsp
@@ -0,0 +1,1410 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<!DOCTYPE html>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html lang="en" data-dpr="1">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta name="viewport"
+          content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no,viewport-fit=cover">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <meta name="format-detection" content="telephone=no">
+    <meta name="keywords" content="">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <c:set var="ctx" value="${pageContext.request.contextPath}" scope="request"/>
+    <c:set var="resourcePath" value="${ctx}/resources" scope="request"/>
+    <script type="text/javascript">
+        var ctx = "${ctx}"; //上下文路径
+        var resourcePath = "${resourcePath}";
+        document.writeln('<script type="text/javascript" src="' + resourcePath + '/js/global.js?d=' + new Date().getTime() + '" ><\/script>');
+    </script>
+    <title>支付即好友</title>
+    <link rel="stylesheet" href="${resourcePath}/css/h5.css">
+    <link rel="stylesheet" href="${resourcePath}/css/h5-common.css">
+    <style type="text/css">.mint-popup-bottom[data-v-8cd1bb9c] {
+        -webkit-transform: translate3d(-50%, 0, 0) !important
+    }
+
+    .mint-indicator-wrapper[data-v-8cd1bb9c] {
+        -webkit-transform: translate(-50%, -50%);
+        z-index: 999
+    }
+
+    #app[data-v-8cd1bb9c], body[data-v-8cd1bb9c], html[data-v-8cd1bb9c] {
+        font-size: 5.973px;
+        font-size: .37333333rem;
+        height: 100%;
+        color: #333;
+        -webkit-user-select: none;
+        -moz-user-select: none;
+        -o-user-select: none;
+        -ms-user-select: none;
+        user-select: none
+    }
+
+    body[data-v-8cd1bb9c], html[data-v-8cd1bb9c], input[data-v-8cd1bb9c], textarea[data-v-8cd1bb9c] {
+        font-family: PingFangSC-Regular, Helvetica, sans-serif
+    }
+
+    input[data-v-8cd1bb9c], textarea[data-v-8cd1bb9c] {
+        background-color: #fff
+    }
+
+    input[data-v-8cd1bb9c], li[data-v-8cd1bb9c], ol[data-v-8cd1bb9c], textarea[data-v-8cd1bb9c], ul[data-v-8cd1bb9c] {
+        padding: 0;
+        border: 0;
+        margin: 0
+    }
+
+    .tc[data-v-8cd1bb9c] {
+        text-align: center
+    }
+
+    .tr[data-v-8cd1bb9c] {
+        text-align: right
+    }
+
+    .tl[data-v-8cd1bb9c] {
+        text-align: left
+    }
+
+    .c4b[data-v-8cd1bb9c] {
+        color: #4b4b4b
+    }
+
+    .c000[data-v-8cd1bb9c] {
+        color: #000
+    }
+
+    .c333[data-v-8cd1bb9c] {
+        color: #333
+    }
+
+    .c666[data-v-8cd1bb9c] {
+        color: #666
+    }
+
+    .c999[data-v-8cd1bb9c] {
+        color: #999
+    }
+
+    .cccc[data-v-8cd1bb9c] {
+        color: #ccc
+    }
+
+    .cddd[data-v-8cd1bb9c] {
+        color: #ddd
+    }
+
+    .c9b9b[data-v-8cd1bb9c] {
+        color: #9b9b9b
+    }
+
+    .cblue[data-v-8cd1bb9c] {
+        color: #3089f7
+    }
+
+    .cred[data-v-8cd1bb9c] {
+        color: red
+    }
+
+    .cora[data-v-8cd1bb9c] {
+        color: #faa800
+    }
+
+    .cbase[data-v-8cd1bb9c] {
+        color: #ff721f
+    }
+
+    .cfff[data-v-8cd1bb9c] {
+        color: #fff
+    }
+
+    .bfff[data-v-8cd1bb9c] {
+        background-color: #fff
+    }
+
+    .bbase[data-v-8cd1bb9c] {
+        background-color: #ff721f
+    }
+
+    .fl[data-v-8cd1bb9c] {
+        float: left
+    }
+
+    .fr[data-v-8cd1bb9c] {
+        float: right
+    }
+
+    .mt10[data-v-8cd1bb9c] {
+        margin-top: 4.266px;
+        margin-top: .26666667rem
+    }
+
+    .ml15[data-v-8cd1bb9c] {
+        margin-left: 6.4px;
+        margin-left: .4rem
+    }
+
+    .mr15[data-v-8cd1bb9c] {
+        margin-right: 6.4px;
+        margin-right: .4rem
+    }
+
+    .mt15[data-v-8cd1bb9c] {
+        margin-top: 6.4px;
+        margin-top: .4rem
+    }
+
+    .mb15[data-v-8cd1bb9c] {
+        margin-bottom: 6.4px;
+        margin-bottom: .4rem
+    }
+
+    .pl15[data-v-8cd1bb9c] {
+        padding-left: 6.4px;
+        padding-left: .4rem
+    }
+
+    .pr15[data-v-8cd1bb9c] {
+        padding-right: 6.4px;
+        padding-right: .4rem
+    }
+
+    .pt15[data-v-8cd1bb9c] {
+        padding-top: 6.4px;
+        padding-top: .4rem
+    }
+
+    .pb15[data-v-8cd1bb9c] {
+        padding-bottom: 6.4px;
+        padding-bottom: .4rem
+    }
+
+    .mt30[data-v-8cd1bb9c] {
+        margin-top: 12.8px;
+        margin-top: .8rem
+    }
+
+    .mb30[data-v-8cd1bb9c] {
+        margin-bottom: 12.8px;
+        margin-bottom: .8rem
+    }
+
+    .fz12[data-v-8cd1bb9c] {
+        font-size: 5.12px;
+        font-size: .32rem
+    }
+
+    .fz13[data-v-8cd1bb9c] {
+        font-size: 5.546px;
+        font-size: .34666667rem
+    }
+
+    .fz14[data-v-8cd1bb9c] {
+        font-size: 5.973px;
+        font-size: .37333333rem
+    }
+
+    .fz15[data-v-8cd1bb9c] {
+        font-size: 6.4px;
+        font-size: .4rem
+    }
+
+    .fz16[data-v-8cd1bb9c] {
+        font-size: 6.826px;
+        font-size: .42666667rem
+    }
+
+    .fz18[data-v-8cd1bb9c] {
+        font-size: 7.68px;
+        font-size: .48rem
+    }
+
+    .fz20[data-v-8cd1bb9c] {
+        font-size: 8.533px;
+        font-size: .53333333rem
+    }
+
+    .fz22[data-v-8cd1bb9c] {
+        font-size: 9.386px;
+        font-size: .58666667rem
+    }
+
+    .fz24[data-v-8cd1bb9c] {
+        font-size: 10.24px;
+        font-size: .64rem
+    }
+
+    .fz32[data-v-8cd1bb9c] {
+        font-size: 13.653px;
+        font-size: .85333333rem
+    }
+
+    .fz36[data-v-8cd1bb9c] {
+        font-size: 15.36px;
+        font-size: .96rem
+    }
+
+    .block[data-v-8cd1bb9c] {
+        display: block
+    }
+
+    b[data-v-8cd1bb9c], dfn[data-v-8cd1bb9c], em[data-v-8cd1bb9c] {
+        font-style: normal;
+        font-weight: 400
+    }
+
+    .font-DINAlternate[data-v-8cd1bb9c] {
+        font-family: DINAlternate-Bold, PingFangSC-Regular, Helvetica, sans-serif
+    }
+
+    .arr_r[data-v-8cd1bb9c] {
+        position: relative
+    }
+
+    .arr_r[data-v-8cd1bb9c]:after {
+        content: "";
+        position: absolute;
+        z-index: 80;
+        right: 6.4px;
+        right: .4rem;
+        top: 50%;
+        width: 6px;
+        height: 6px;
+        border: 1px solid #c7c7cc;
+        border-width: 2px 2px 0 0;
+        transform: translateY(-50%) rotate(45deg)
+    }
+
+    .shadow[data-v-8cd1bb9c] {
+        box-shadow: 0 8px 25px 0 #eaebec
+    }
+
+    .ellips[data-v-8cd1bb9c] {
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis
+    }
+
+    .ellips_line2[data-v-8cd1bb9c], .ellips_line3[data-v-8cd1bb9c] {
+        display: -webkit-box;
+        overflow: hidden
+    }
+
+    .ellips_line2[data-v-8cd1bb9c] {
+        -webkit-line-clamp: 2
+    }
+
+    .ellips_line3[data-v-8cd1bb9c] {
+        -webkit-line-clamp: 3
+    }
+
+    .to-check[data-v-8cd1bb9c] {
+        position: relative
+    }
+
+    .to-check.checked[data-v-8cd1bb9c]:before {
+        content: "";
+        position: absolute;
+        top: 50%;
+        right: 6.4px;
+        right: .4rem;
+        width: 6.4px;
+        width: .4rem;
+        height: 3.2px;
+        height: .2rem;
+        border: 2px solid #ff721f;
+        border-width: 0 0 2px 2px;
+        transform: translateY(-50%) rotate(-45deg)
+    }
+
+    .ui-page[data-v-8cd1bb9c] {
+        position: relative;
+        max-width: 256px;
+        max-width: 16rem;
+        min-height: 100%;
+        background-color: #f7f7f7;
+        padding-top: 1px;
+        margin: -1px auto 0
+    }
+
+    .ui-page[data-v-8cd1bb9c]:after {
+        content: "";
+        position: fixed;
+        top: 0;
+        bottom: 0;
+        left: 0;
+        right: 0;
+        z-index: -1;
+        background-color: #f7f7f7
+    }
+
+    button[data-v-8cd1bb9c] {
+        font-size: 6.4px;
+        font-size: .4rem;
+        border-radius: 1px;
+        background-color: #ff721f
+    }
+
+    button.disabled[data-v-8cd1bb9c] {
+        opacity: .4
+    }
+
+    .mebtn[data-v-8cd1bb9c] {
+        width: 100%;
+        padding: 0 6.4px;
+        padding: 0 .4rem
+    }
+
+    input[data-v-8cd1bb9c]::-webkit-input-placeholder {
+        color: #ccc
+    }
+
+    [data-v-8cd1bb9c]:-moz-placeholder, [data-v-8cd1bb9c]::-moz-placeholder {
+        color: #ccc
+    }
+
+    [data-v-8cd1bb9c]:-ms-input-placeholder {
+        color: #ccc
+    }
+
+    [class*=mint-tab-container][data-v-8cd1bb9c] {
+        visibility: visible;
+        position: static;
+        opacity: 1
+    }
+
+    .loading-txt[data-v-8cd1bb9c] {
+        width: 76.8px;
+        width: 4.8rem
+    }
+
+    .loading-txt em[data-v-8cd1bb9c] {
+        display: block;
+        margin: 4.266px auto;
+        margin: .26666667rem auto
+    }
+
+    .loading-txt .txt[data-v-8cd1bb9c] {
+        margin-bottom: 2.56px;
+        margin-bottom: .16rem
+    }
+
+    .v-input-clear[data-v-8cd1bb9c] {
+        position: absolute;
+        right: -4.266px;
+        right: -.26666667rem;
+        top: 50%;
+        display: none;
+        z-index: 9;
+        padding: 4.266px;
+        padding: .26666667rem;
+        background-color: #fff;
+        transform: translateY(-50%)
+    }
+
+    .v-input-clear.active[data-v-8cd1bb9c] {
+        display: block
+    }
+
+    .v-input-clear .icon-font[data-v-8cd1bb9c] {
+        display: block;
+        color: #ccc;
+        font-size: 7.68px;
+        font-size: .48rem
+    }
+
+    .popup-container .popup-title[data-v-8cd1bb9c] {
+        font-weight: 700
+    }
+
+    .popup-container .popup-btns .btn[data-v-8cd1bb9c] {
+        color: #ff721f
+    }
+
+    .flex[data-v-8cd1bb9c] {
+        display: -ms-flexbox;
+        display: flex
+    }
+
+    .flex .flex-li[data-v-8cd1bb9c], .flex li[data-v-8cd1bb9c] {
+        -ms-flex: 1;
+        flex: 1
+    }
+
+    .i-warn-red[data-v-8cd1bb9c] {
+        display: inline-block;
+        width: 20px;
+        height: 20px;
+        background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAAAXNSR0IArs4c6QAAAkNJREFUSA29Vj1PVEEUvWdYA72dFkJCQkGhkJjQECpqTbQyWuhPcMFYUFjYyUfCbyDSYEJvZWhIiDEWmlCxFkBla8Tdfdcz897O7L7F2XkE3yS7e+fOOffMx92ZC0lo+vLOnAAPRWVRILdF9ZajAWf0ndJ3QN8+Nn98GRUOMYA2px6L6FsGm4nh/BhwLII1bJzseV/JuFRQV2amJLt4T7GFEj6xi0Mx40+wfnxSJgwJ6urkkmT6gVt1swyu1If8FINHeNf61M8bEHRiXfnIld3oB13dRlvGZLlf1Au6bdTfR6NXxiCQHU6CXH1KfCM6IbtSTNzvba/xYHtmKdto5BU2Wi/4eU7ua8//l2FjunzIAU6wyMa0BDH61cfGWLC98zJDF3IN6W0HUz+1dbCib2aP5FcH0rloptLc30tkD7o6PS/d9ud0okXyHF2rnFzzRrLOg5xc4RvyjejvFRg5lLeVYaIsViICW0yYOWy27nGl25W41DLubqzEMrse3pBge2fE4D3MFRYXcQQ3MNTQP76vjWB7Z8SgVvgfRnDXNgQot5RPTH3t3CbNaW161LJJc1CbILVs0uzXJkgt48oC91L/Z1lqWK0iS7GWLNfOQmajzx4ZINdw5LwGYVmQ0gzCzdTNgh3l4rBX54THkzWIpDzAmaxrc/Iu49sH+FlUxw66B5ixi+ZffNuvo8QI50FBV3uwBnGzKmZ05R+7slI9Y2MNCFqHE2UNQivtTC1pqJFr65hSxWZhA1ta5tVWCA8JX2Op/xc+6NDNayMwOQAAAABJRU5ErkJggg==) no-repeat;
+        background-size: 20px 20px
+    }
+
+    .i-checked[data-v-8cd1bb9c], .i-unchecked[data-v-8cd1bb9c] {
+        position: relative;
+        display: inline-block;
+        width: 16px;
+        height: 16px;
+        background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+Cjxzdmcgd2lkdGg9IjMycHgiIGhlaWdodD0iMzJweCIgdmlld0JveD0iMCAwIDMyIDMyIiB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPgogICAgPCEtLSBHZW5lcmF0b3I6IFNrZXRjaCA1MC4yICg1NTA0NykgLSBodHRwOi8vd3d3LmJvaGVtaWFuY29kaW5nLmNvbS9za2V0Y2ggLS0+CiAgICA8dGl0bGU+5Y2P6K6u5Yu+L+WLvjwvdGl0bGU+CiAgICA8ZGVzYz5DcmVhdGVkIHdpdGggU2tldGNoLjwvZGVzYz4KICAgIDxkZWZzPjwvZGVmcz4KICAgIDxnIGlkPSLljY/orq7li74v5Yu+IiBzdHJva2U9Im5vbmUiIHN0cm9rZS13aWR0aD0iMSIgZmlsbD0ibm9uZSIgZmlsbC1ydWxlPSJldmVub2RkIj4KICAgICAgICA8cGF0aCBkPSJNMjguNDQ0NDQ0NCwwIEwzLjU1NTU1NTU2LDAgQzEuNiwwIDAsMS42IDAsMy41NTU1NTU1NiBMMCwyOC40NDQ0NDQ0IEMwLDMwLjQgMS42LDMyIDMuNTU1NTU1NTYsMzIgTDI4LjQ0NDQ0NDQsMzIgQzMwLjQsMzIgMzIsMzAuNCAzMiwyOC40NDQ0NDQ0IEwzMiwzLjU1NTU1NTU2IEMzMiwxLjYgMzAuNCwwIDI4LjQ0NDQ0NDQsMCBMMjguNDQ0NDQ0NCwwIFogTTEyLjQ0NDQ0NDQsMjQuODg4ODg4OSBMMy41NTU1NTU1NiwxNi4zNDE4ODAzIEw2LjA0NDQ0NDQ0LDEzLjk0ODcxNzkgTDEyLjQ0NDQ0NDQsMjAuMTAyNTY0MSBMMjUuOTU1NTU1Niw3LjExMTExMTExIEwyOC40NDQ0NDQ0LDkuNTA0MjczNSBMMTIuNDQ0NDQ0NCwyNC44ODg4ODg5IEwxMi40NDQ0NDQ0LDI0Ljg4ODg4ODkgWiIgaWQ9IuWLvuS4iiIgZmlsbD0iI0ZGNzIxRiI+PC9wYXRoPgogICAgPC9nPgo8L3N2Zz4=) no-repeat;
+        background-size: 16px auto
+    }
+
+    .i-unchecked[data-v-8cd1bb9c] {
+        background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+Cjxzdmcgd2lkdGg9IjMycHgiIGhlaWdodD0iMzJweCIgdmlld0JveD0iMCAwIDMyIDMyIiB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPgogICAgPCEtLSBHZW5lcmF0b3I6IFNrZXRjaCA1MC4yICg1NTA0NykgLSBodHRwOi8vd3d3LmJvaGVtaWFuY29kaW5nLmNvbS9za2V0Y2ggLS0+CiAgICA8dGl0bGU+5Y2P6K6u5Yu+L+acquWLvjwvdGl0bGU+CiAgICA8ZGVzYz5DcmVhdGVkIHdpdGggU2tldGNoLjwvZGVzYz4KICAgIDxkZWZzPjwvZGVmcz4KICAgIDxnIGlkPSLljY/orq7li74v5pyq5Yu+IiBzdHJva2U9Im5vbmUiIHN0cm9rZS13aWR0aD0iMSIgZmlsbD0ibm9uZSIgZmlsbC1ydWxlPSJldmVub2RkIiBmaWxsLW9wYWNpdHk9IjAuMyI+CiAgICAgICAgPHBhdGggZD0iTTI4LjQ0NDQ0NDQsMCBMMy41NTU1NTU1NiwwIEMxLjYsMCAwLDEuNiAwLDMuNTU1NTU1NTYgTDAsMjguNDQ0NDQ0NCBDMCwzMC40IDEuNiwzMiAzLjU1NTU1NTU2LDMyIEwyOC40NDQ0NDQ0LDMyIEMzMC40LDMyIDMyLDMwLjQgMzIsMjguNDQ0NDQ0NCBMMzIsMy41NTU1NTU1NiBDMzIsMS42IDMwLjQsMCAyOC40NDQ0NDQ0LDAgTDI4LjQ0NDQ0NDQsMCBaIE0xMi40NDQ0NDQ0LDI0Ljg4ODg4ODkgTDMuNTU1NTU1NTYsMTYuMzQxODgwMyBMNi4wNDQ0NDQ0NCwxMy45NDg3MTc5IEwxMi40NDQ0NDQ0LDIwLjEwMjU2NDEgTDI1Ljk1NTU1NTYsNy4xMTExMTExMSBMMjguNDQ0NDQ0NCw5LjUwNDI3MzUgTDEyLjQ0NDQ0NDQsMjQuODg4ODg4OSBMMTIuNDQ0NDQ0NCwyNC44ODg4ODg5IFoiIGlkPSLmsqHli77kuIoiIGZpbGw9IiNGRjcyMUYiPjwvcGF0aD4KICAgIDwvZz4KPC9zdmc+)
+    }
+
+    .model-container .key-body[data-v-8cd1bb9c] {
+        padding-bottom: 1.493px;
+        padding-bottom: .09333333rem;
+        background-color: #d2d5db
+    }
+
+    .model-container .key-body ul.number li[data-v-8cd1bb9c] {
+        height: 14.933px;
+        height: .93333333rem;
+        line-height: 14.933px;
+        line-height: .93333333rem;
+        padding: 3.626px 0;
+        padding: .22666667rem 0;
+        width: 31%;
+        margin: 0 1.7% 1.7% 0;
+        border-radius: 5px;
+        background-color: #fff;
+        box-shadow: 0 1px 0 0 #898a8d
+    }
+
+    .model-container .key-body ul.number li[data-v-8cd1bb9c]:nth-child(3n-2) {
+        margin-left: 1.7%
+    }
+
+    .model-container .key-body ul.number li[data-v-8cd1bb9c]:before {
+        content: none
+    }
+
+    .model-container .key-body ul.number li.key-back[data-v-8cd1bb9c], .model-container .key-body ul.number li.key-null[data-v-8cd1bb9c] {
+        background-color: #d2d5db;
+        box-shadow: none
+    }
+
+    .model-container .key-body ul.number li.key-back[data-v-8cd1bb9c]:active {
+        opacity: .5
+    }
+
+    .freeMask[data-v-8cd1bb9c] {
+        background-color: transparent
+    }
+
+    .vx-header + .scroll-wrapper[data-v-8cd1bb9c] {
+        top: 0
+    }
+
+    @keyframes lighter-data-v-8cd1bb9c {
+        0% {
+            background-color: #000
+        }
+        50% {
+            background-color: #000
+        }
+        51% {
+            background-color: transparent
+        }
+        to {
+            background-color: transparent
+        }
+    }
+
+    @keyframes rotater-data-v-8cd1bb9c {
+        0% {
+            -webkit-transform: rotate(0)
+        }
+        to {
+            -webkit-transform: rotate(1turn)
+        }
+    }
+
+    .get-money-activity[data-v-8cd1bb9c] {
+        padding: 6.4px;
+        padding: .4rem;
+        text-align: center;
+        background-color: #fff
+    }
+
+    .get-money-activity .get-money-title[data-v-8cd1bb9c] {
+        display: -ms-flexbox;
+        display: flex;
+        -ms-flex-pack: justify;
+        justify-content: space-between;
+        font-size: 5.973px;
+        font-size: .37333333rem;
+        line-height: 7.04px;
+        line-height: .44rem;
+        margin-top: 5.546px;
+        margin-top: .34666667rem;
+        font-family: PingFangSC-Regular
+    }
+
+    .get-money-activity .get-money-title .one[data-v-8cd1bb9c] {
+        color: #333
+    }
+
+    .get-money-activity .get-money-title .two[data-v-8cd1bb9c] {
+        color: #ff7728
+    }
+
+    .get-money-activity .money[data-v-8cd1bb9c] {
+        text-align: left;
+        color: #333;
+        font-size: 13.653px;
+        font-size: .85333333rem;
+        line-height: 18.773px;
+        line-height: 1.17333333rem;
+        font-family: DINAlternate-Bold
+    }
+
+    .get-money-activity .money-desc[data-v-8cd1bb9c] {
+        font-family: PingFangSC-Regular;
+        color: #333;
+        font-size: 5.973px;
+        font-size: .37333333rem;
+        line-height: 8.533px;
+        line-height: .53333333rem;
+        margin-top: 5.333px;
+        margin-top: .33333333rem;
+        margin-bottom: 5.333px;
+        margin-bottom: .33333333rem;
+        text-align: left
+    }
+
+    .get-money-activity .money-list[data-v-8cd1bb9c] {
+        display: -ms-flexbox;
+        display: flex;
+        -ms-flex-wrap: wrap;
+        flex-wrap: wrap;
+        -ms-flex-pack: start;
+        justify-content: flex-start
+    }
+
+    .get-money-activity .money-list li[data-v-8cd1bb9c] {
+        width: 45.866px;
+        width: 2.86666667rem;
+        height: 23.253px;
+        height: 1.45333333rem;
+        line-height: 23.253px;
+        line-height: 1.45333333rem;
+        font-size: 11.093px;
+        font-size: .69333333rem;
+        color: #333;
+        border: 1px solid #bcbcbc;
+        font-family: DINAlternate-Bold;
+        border-radius: .10666667rem;
+        margin-bottom: 4.693px;
+        margin-bottom: .29333333rem
+    }
+
+    .get-money-activity .money-list li[data-v-8cd1bb9c]:nth-child(3n-1) {
+        margin-left: 4.693px;
+        margin-left: .29333333rem;
+        margin-right: 4.693px;
+        margin-right: .29333333rem
+    }
+
+    .get-money-activity .money-list li span[data-v-8cd1bb9c] {
+        font-size: 8.96px;
+        font-size: .56rem
+    }
+
+    .get-money-activity .money-list .li-disabled[data-v-8cd1bb9c] {
+        color: #dfdfdf
+    }
+
+    .get-money-activity .money-list .li-actived[data-v-8cd1bb9c] {
+        color: #ff7728;
+        border: 1px solid #ff7728;
+        background-color: rgba(255, 119, 40, .1)
+    }
+
+    .get-money-activity .get-money-desc[data-v-8cd1bb9c] {
+        font-family: PingFangSC-Regular;
+        color: #333;
+        font-size: 5.973px;
+        font-size: .37333333rem;
+        line-height: 9.386px;
+        line-height: .58666667rem;
+        margin-top: 2.133px;
+        margin-top: .13333333rem;
+        margin-bottom: 12.8px;
+        margin-bottom: .8rem;
+        text-align: left
+    }
+
+    .get-money-activity .button-disabled[data-v-8cd1bb9c], .get-money-activity .money-button[data-v-8cd1bb9c] {
+        width: 100%;
+        height: 18.773px;
+        height: 1.17333333rem;
+        line-height: 18.773px;
+        line-height: 1.17333333rem;
+        font-size: 6.826px;
+        font-size: .42666667rem;
+        border-radius: .02666667rem;
+        color: #fff;
+        font-family: PingFangSC-Medium;
+        font-weight: 700
+    }
+
+    .get-money-activity .button-disabled[data-v-8cd1bb9c] {
+        background-color: rgb(253, 117, 100)
+    }
+
+    .get-money-activity .money-button[data-v-8cd1bb9c] {
+        background-color: #ff7728
+    }
+
+    .get-money-activity .money-exchange-link[data-v-8cd1bb9c] {
+        width: 100%;
+        height: 42.666px;
+        height: 2.66666667rem;
+        margin-top: 6.4px;
+        margin-top: .4rem
+    }
+
+    .get-money-activity .money-exchange-link img[data-v-8cd1bb9c] {
+        width: 100%;
+        height: 100%
+    }</style>
+    <style>
+        #app, body, html {
+            font-size: 5.973px;
+            font-size: .37333333rem;
+            height: 100%;
+            color: #333;
+            -webkit-user-select: none;
+            -moz-user-select: none;
+            -o-user-select: none;
+            -ms-user-select: none;
+            user-select: none
+        }
+
+        #app {
+            background-color: #F5F5F5;
+        }
+
+        .title-img img {
+            width: 100%;
+        }
+
+        .title-img {
+            text-align: center;
+            background-color: #FFFFFF;
+        }
+
+        .qrcode {
+            margin-top: 10px;
+            width: 100%;
+            background-color: #FFFFFF;
+        }
+
+        .qrcode-img {
+            text-align: center;
+        }
+
+        .qrcode-title {
+            width: 80%;
+            font-size: .5333rem;
+            font-family: Helvetica, 'Hiragino Sans GB', 'Microsoft Yahei', '微软雅黑', Arial, sans-serif;
+            font-weight: 700;
+            padding-bottom: 10px;
+            padding-top: 10px;
+            padding-left: 10px;
+        }
+
+        .qrcode-img img {
+            width: 70%;
+            height: 200px;
+        }
+
+        .qrcode-p {
+            margin-top: 10px;
+        }
+
+        .title-p {
+            margin-top: 10px;
+            color: #A9A9A9;
+            padding-left: 15px;
+            font-size: 0.3777rem;
+        }
+
+        .qrcode-body {
+            display: flex;
+            justify-content: space-between;
+            line-height: 45px;
+            margin-left: 10px;
+        }
+
+        .q-title {
+            font-size: .53333rem;
+            font-family: Helvetica, 'Hiragino Sans GB', 'Microsoft Yahei', '微软雅黑', Arial, sans-serif;
+            font-weight: 700;
+        }
+
+        .bq {
+            color: #ef5151;
+            font-size: 0.3777rem;
+            margin-right: 10px;
+        }
+
+        /*.label{
+            border: 1px solid #ef5151;
+            margin-top: 10px;
+            line-height: 30px;
+            width: 50%;
+            text-align: center;
+            border-radius: 3px;
+            margin-left: 10px;
+        }*/
+        .label {
+            position: relative;
+            width: 49%;
+            overflow: hidden;
+            text-align: center;
+            border: 1px solid #ef5151;
+            border-radius: 5px;
+            margin-bottom: 10px;
+            z-index: 88;
+            line-height: 1.022rem;
+            /*margin: 10px 10px 0 10px;*/
+
+        }
+
+        /*.label:before{
+            position: absolute;
+            display: block;
+            border-top: 16px solid #ef5151;
+            border-left: 16px solid transparent;
+            right: 0;
+            top: 0;
+            content: "";
+            z-index: 101;
+        }*/
+        .label:after {
+            content: '✔';
+            display: block;
+            height: 0px;
+            width: 0px;
+            position: absolute;
+            bottom: 0;
+            right: 0;
+            color: #fff;
+            /**对号大小*/
+            line-height: 8px;
+            border: 10px solid;
+            border-color: transparent #FF3333 #FF3333 transparent;
+            /*height: 0;
+            visibility: hidden;*/
+        }
+
+        .pox:after {
+            height: 0;
+            visibility: hidden;
+        }
+
+        .q-t {
+            color: #A9A9A9;
+            padding-left: 10px;
+            font-size: 0.3777rem;
+        }
+
+        .title-float {
+            display: flex;
+            justify-content: space-between;
+            margin-bottom: 10px;
+            flex-wrap: wrap;
+        }
+
+        .case {
+            padding: 0 10px 0 10px;
+        }
+
+        .case img {
+            width: 100%;
+        }
+
+        p {
+            line-height: 25px;
+        }
+
+        .add {
+            margin-top: -10px;
+        }
+
+        .save-btn {
+            color: #FFFFFF;
+            background-color: #ef5151;
+            line-height: 0.999rem;
+            width: 60%;
+            font-size: 15px;
+            text-align: center;
+            border-radius: 10px;
+            margin-left: 20%;
+            display: flex;
+        }
+
+        .del-img {
+            width: 15px;
+            height: 15px;
+            z-index: 100;
+            position: absolute;
+            top: -1px;
+            right: -1px;
+        }
+
+        .save-btn-item {
+            width: 50%;
+        }
+
+        .item-upload {
+            border-right: 1px solid #FFF;
+        }
+
+        .qrcode-wechat {
+            font-size: .5rem;
+        }
+
+        .dialog-tips {
+            box-shadow: rgb(136 136 136) 5px 5px 5px;
+        }
+    </style>
+</head>
+
+<body>
+<div id="app" style="font-size: 12px;">
+    <div class="title-img">
+        <img src="${resourcePath}/images/title.png">
+    </div>
+    <div class="qrcode">
+        <div class="qrcode-body">
+            <div class="q-title">1.上传微信二维码</div>
+            <c:if test="${not empty qrCodeUrl}">
+                <div class="bq" id="clear">清空</div>
+            </c:if>
+        </div>
+
+        <div class="qrcode-img">
+            <div>
+                <c:choose>
+                    <c:when test="${not empty qrCodeUrl}">
+                        <img src="${qrCodeUrl}" height="136px" id="qrcodeImg"/>
+                    </c:when>
+                    <c:otherwise>
+                        <img src="${resourcePath}/images/example.jpg" height="136px" id="qrcodeImg"/>
+                    </c:otherwise>
+                </c:choose>
+
+            </div>
+            <div class="qrcode-wechat" style="display: ${not empty wechat ? 'black':'none'}">
+                <label>微信号：<span id="wechatNumTxt">${wechat}</span></label>
+            </div>
+
+            <div class="qrcode-p">
+                <input accept="image/*" type="file" id="uploadIMG" onchange="btnUploadFile(event)"
+                       style="display: none"/>
+                <div class="save-btn">
+                    <div class="save-btn-item item-upload" id="showImg">上传二维码</div>
+                    <div class="save-btn-item" id="inputWx">填写微信号</div>
+                </div>
+            </div>
+        </div>
+        <br/>
+        <div class="title-p">
+            <p>营销策略：客户付款完即可看到老板微信从而添加好友，帮助商户维系老客户，提升复购率；更可以通过建立福利群，搭建商户的私域流量，提高营业额。</p>
+        </div>
+        <br/>
+        <div class="qrcode-body">
+            <div class="q-title">2.添加引导话术,吸引客户加好友</div>
+            <div class="bq" onclick="updateLabel(this)">管理话术</div>
+        </div>
+        <div>
+            <div class="q-title-p">
+                <p class="q-t">选择或添加标签(最多选择1个)，将和二维码一起展示</p>
+            </div>
+        </div>
+        <div style="padding: 20px" id="label">
+            <div class="title-float">
+                <c:if test="${not empty guideLabel}">
+                    <c:forEach items="${guideLabel}" var="label" varStatus="index">
+                        <c:choose>
+                            <c:when test="${ not empty checkCommonId}">
+                                <div class="label ${label.id == checkCommonId ? '' : 'pox'}" data-type="common"
+                                     data-id="${label.id}" pox="${label.id == checkCommonId ? '0' : '1'}">
+                                    <div onclick="check(this)">
+                                            ${label.name}
+                                    </div>
+                                </div>
+                            </c:when>
+                            <c:otherwise>
+                                <div class="label ${label.status == 1 ? '' : 'pox'}" data-type="common"
+                                     data-id="${label.id}" pox="${label.status == 1 ? '0' : '1'}">
+                                    <div onclick="check(this)">
+                                            ${label.name}
+                                    </div>
+                                </div>
+                            </c:otherwise>
+                        </c:choose>
+
+                    </c:forEach>
+                </c:if>
+                <c:if test="${not empty mGlist}">
+                    <c:forEach items="${mGlist}" var="label" varStatus="index">
+                        <div class="label ${label.status == 1 ? '' : 'pox'}" data-type="merchant" data-id="${label.id}"
+                             pox="${label.status == 1 ? '0' : '1'}">
+                            <div>
+                                <img class="del-img" onclick="deleteLabel(this)" style="display: none"
+                                     src="${resourcePath}/images/icon-del-1.png"/>
+                            </div>
+                            <div onclick="check(this)">
+                                    ${label.name}
+                            </div>
+                        </div>
+                    </c:forEach>
+                </c:if>
+            </div>
+            <div class="label pox add" onclick="addLabel()"
+                 style="display: flex;justify-content: center;max-height: 40px;">
+                <div style="margin-top: 5px;"><img width="20px" height="20px"
+                                                   src="${resourcePath}/images/icon-add.png"/></div>
+                <div>添加话术</div>
+            </div>
+        </div>
+        <div>
+            <div class="qrcode-title">3.案例</div>
+            <div class="case">
+                <div style="color: #A9A9A9;font-size: .3888rem">
+                    <p>
+                        私域流量：客户扫码完如下图引导话术加老板微信，通过微信群、朋友圈了解商户最新的特价商品，福利活动，通过线上门店外卖点餐，增加商户销售渠道，提高营业额。
+                    </p>
+                </div>
+                <div style="margin-top: 20px;">
+                    <img src="${resourcePath}/images/case.png">
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+<div class="popup-container dialog-body active"
+     style="display: none;box-shadow: 5px 5px 20px #888888;border-radius: 5px;">
+    <div class="popup"><!---->
+        <div class="popup-body">
+            名称：<input type="text" id="labelInput" maxlength="12" placeholder="最多输入12个字符">
+        </div>
+        <div class="popup-btns" style="display: flex;justify-content:space-around;">
+            <div style="width: 50%" onclick="hide(this)">
+                <span style="color: rgba(0,0,0,.5)" class="btn btn-positive">取消</span>
+            </div>
+            <div style="width: 50%">
+                <span class="btn btn-positive" onclick="confirm('label')">确认</span>
+            </div>
+        </div>
+    </div>
+</div>
+
+<div class="popup-container dialog-body-wechat active"
+     style="display: none;box-shadow: 5px 5px 20px #888888;border-radius: 5px;">
+    <div class="popup"><!---->
+        <div class="popup-body">
+            微信号：<input type="text" id="wechatNum" maxlength="50" placeholder="请填写微信号">
+        </div>
+        <input type="hidden" id="id" maxlength="50" value="${id}">
+        <div class="popup-btns" style="display: flex;justify-content:space-around;">
+            <div style="width: 50%" onclick="hide(this)">
+                <span style="color: rgba(0,0,0,.5)" class="btn btn-positive">取消</span>
+            </div>
+            <div style="width: 50%">
+                <span class="btn btn-positive" onclick="confirm('wechat')">确认</span>
+            </div>
+        </div>
+    </div>
+</div>
+
+<div class="backdrop-container active" style="display: none;"></div>
+<div class="popup-container dialog-tips active" style="display: none;">
+    <div class="popup"><!---->
+        <div class="popup-body dialog-tips-html"></div>
+        <div class="popup-btns" id="popup-btns" onclick="hide(this)"><span class="btn btn-positive">确定</span></div>
+    </div>
+</div>
+
+<div class="popup-container dialog-tips2 active" style="display: none;">
+    <div class="popup"><!---->
+        <div class="popup-body dialog-tips2-html"></div>
+        <div class="popup-btns" style="display: flex;justify-content:space-around;">
+            <div style="width: 50%" onclick="hide(this)">
+                <span style="color: rgba(0,0,0,.5)" class="btn btn-positive">取消</span>
+            </div>
+            <div style="width: 50%">
+                <span class="btn btn-positive" onclick="clearData()">确认</span>
+            </div>
+        </div>
+    </div>
+</div>
+</body>
+<script type="text/javascript">
+
+    $("#clear").on('click', () => {
+        var id = $("#id").val();
+        if (id == "") {
+            showMask()
+            $(".dialog-tips").show();
+            $(".dialog-tips-html").html("请先上传二维码");
+            return;
+        }
+
+        showMask()
+        $(".dialog-tips2").show();
+        $(".dialog-tips2-html").html("确认清除微信信息");
+    });
+
+    $("#inputWx").on('click', () => {
+        var id = $("#id").val();
+        if (id == "") {
+            showMask()
+            $(".dialog-tips").show();
+            $(".dialog-tips-html").html("请先上传二维码");
+            return;
+        }
+
+        showMask()
+        $("#wechatNum").val("");
+        $(".dialog-body-wechat").show();
+    })
+
+    function showMask() {
+        $(".backdrop-container").show()
+    }
+
+    function hideMask() {
+        $(".backdrop-container").hide()
+    }
+
+    function clearData() {
+        var url = ctx + "/merchant/wechat/clear";
+        $.post(url, {token: '${token}'}, function (res) {
+            if (res.code == 200) {
+                location.reload();
+            } else {
+                alert(res.message);
+            }
+        });
+    }
+
+    function deleteLabel(obj) {
+        var dom = $(obj).parent().parent();
+        if (dom.attr("class").indexOf("pox") < 0) {
+            showMask()
+            $(".dialog-tips").show();
+            $(".dialog-tips-html").html("不能删除已选中的！");
+            return;
+        }
+        var url = ctx + "/merchant/guide/remove";
+        $.post(url, {token: '${token}', id: dom.attr("data-id")}, function (res) {
+            if (res.code == 200) {
+                dom.remove();
+            } else {
+                alert(res.message);
+            }
+        })
+    }
+
+    function updateLabel(obj) {
+        $(".del-img").each(function (k, v) {
+            if ($(v).attr("style").indexOf("none") > 0) {
+                $(v).show();
+            } else {
+                $(v).hide();
+            }
+        })
+    }
+
+    function addLabel() {
+        showMask()
+        $("#labelInput").val("");
+        $(".dialog-body").show();
+    }
+
+    function confirm(type) {
+        var labelName = $("#labelInput").val();
+        var wechatNum = $("#wechatNum").val();
+        var params = {};
+        var url = "";
+        if (type == "label") {
+            if (labelName == "") {
+                alert("名称不能为空！")
+                return;
+            }
+            params.name = labelName;
+            url = ctx + "/merchant/guide/add";
+        } else if (type == "wechat") {
+            if (wechatNum == "") {
+                alert("微信号不能为空！")
+                return;
+            }
+            var id = $("#id").val();
+            params.wechat = wechatNum;
+            params.id = id;
+            url = ctx + "/merchant/wechat/add";
+        }
+        params.token = '${token}';
+        $.post(url, params, function (res) {
+            if (res.code == 200) {
+                hide();
+                if (type == "label") {
+                    addLabelHtml(labelName, res.data);
+                } else {
+                    alert("添加成功");
+                    $(".qrcode-wechat").show();
+                    $("#wechatNumTxt").html(wechatNum);
+                }
+            } else {
+                alert(res.message);
+            }
+        })
+    }
+
+    function addLabelHtml(name, data) {
+        var html = '<div class="label pox" data-type="merchant" data-id="' + data.id + '" pox="1"><div><img  class="del-img" onclick="deleteLabel(this)" src="' + resourcePath + '/images/icon-del-1.png" style="display: none"  /></div><div onclick="check(this)">' + name + '</div></div>';
+        $(".title-float").append(html);
+    }
+
+    function hide(obj) {
+        hideMask()
+        //$(obj).parentsUntil(".popup-container").hide();
+        $('.active').hide();
+    }
+
+    function check(obj) {
+        var dom = $(obj).parent("div");
+        var id = dom.attr("data-id");
+        var type = dom.attr("data-type");
+        var pox = dom.attr("pox");
+        if (pox === "0") {
+            alert("至少选择一项");
+            return;
+        }
+        if (pox === "0" || pox == undefined) {
+            $(".label").each(function (k, v) {
+                $(v).addClass("pox");
+                $(v).attr("pox", "1");
+            })
+            dom.addClass("pox");
+            dom.attr("pox", "1");
+        } else {
+            $(".label").each(function (k, v) {
+                $(v).addClass("pox");
+                $(v).attr("pox", "1");
+            })
+            dom.removeClass("pox");
+            dom.attr("pox", "0");
+        }
+        var url = ctx + "/merchant/guide/save";
+        $.post(url, {token: '${token}', id: id, type: type}, function (res) {
+            if (res.code == 200) {
+            } else {
+                alert(res.message);
+            }
+        })
+    }
+
+    $("#showImg").click(function () {
+        $("#uploadIMG").click();
+    });
+
+    function btnUploadFile(e) {
+        //获取图片文件
+        var imgFile = e.target.files[0];
+        //后缀选取
+        if (!/\/(?:jpeg|jpg|png|bmp)/i.test(imgFile.type)) {
+            alert("图片格式不支持，只支持后缀为jpg,jpeg,png,bmp等格式");
+            return;
+        }
+
+        var suffix = imgFile.name.split(".")[1];
+        // uploadImg(suffix, imgFile);
+
+        compress(e.target.files[0], suffix, uploadImg)
+    }
+
+    var uploadImg = function ajaxFormData(suffix, imgFile) {
+        var upload = '${upload}';
+        var data = JSON.parse(upload);
+        /*data.OSSAccessKeyId = $('#accessid').val();
+        data.policy = $('#policy').val();
+        data.signature = $('#signature').val();
+        data.expire = $('#expire').val();
+        data.success_action_status = $('#success_action_status').val();
+        data.callBack = $("#key2_callBack").val();
+        data.key = key;*/
+        var url = data.host;
+        var formData = new FormData();
+        formData.append("OSSAccessKeyId", data.accessid);
+        formData.append("policy", data.policy);
+        formData.append("signature", data.signature);
+        formData.append("success_action_status", "200");
+        formData.append("callBack", data.callBack);
+        formData.append("key", data.key + "." + suffix);
+        formData.append("file", imgFile);
+        $.ajax({
+            url: url,
+            type: "POST",
+            data: formData,
+            dataType: "json",
+            processData: false,
+            contentType: false,
+            success: function (res) {
+                if (res.code == 200) {
+                    $.post(ctx + '/merchant/qrCode/upload', {token: '${token}', photoUrl: res.url}, function (data) {
+                        if (data.code == 200) {
+                            let res = data.data;
+                            //异步读取文件
+                            var reader = new FileReader();
+                            reader.onload = function (evt) {
+                                //替换url
+                                $("#qrcodeImg").attr("src", evt.target.result);
+                            }
+                            reader.readAsDataURL(imgFile);
+                            $("#id").val(res.id);
+                        } else {
+                            alert("上传失败");
+                        }
+                    })
+                }
+            },
+            error: function (xhr) {
+                alert("上传失败")
+            }
+        })
+    }
+</script>
+<script type="text/javascript">
+    !function (a, b) {
+        function c() {
+            var b = f.getBoundingClientRect().width;
+            b / i > 540 && (b = 540 * i);
+            var c = b / 10;
+            f.style.fontSize = c + "px", k.rem = a.rem = c
+        }
+
+        var d, e = a.document,
+            f = e.documentElement,
+            g = e.querySelector('meta[name="viewport"]'),
+            h = e.querySelector('meta[name="flexible"]'),
+            i = 0,
+            j = 0,
+            k = b.flexible || (b.flexible = {});
+        if (g) {
+            var l = g.getAttribute("content").match(/initial\-scale=([\d\.]+)/);
+            l && (j = parseFloat(l[1]), i = parseInt(1 / j))
+        } else if (h) {
+            var m = h.getAttribute("content");
+            if (m) {
+                var n = m.match(/initial\-dpr=([\d\.]+)/),
+                    o = m.match(/maximum\-dpr=([\d\.]+)/);
+                n && (i = parseFloat(n[1]), j = parseFloat((1 / i).toFixed(2))), o && (i = parseFloat(o[1]), j = parseFloat((
+                    1 / i).toFixed(2)))
+            }
+        }
+        if (!i && !j) {
+            var p = (a.navigator.appVersion.match(/android/gi), a.navigator.appVersion.match(/iphone/gi)),
+                q = a.devicePixelRatio;
+            i = p ? q >= 3 && (!i || i >= 3) ? 3 : q >= 2 && (!i || i >= 2) ? 2 : 1 : 1, j = 1 / i
+        }
+        if (f.setAttribute("data-dpr", i), !g)
+            if (g = e.createElement("meta"), g.setAttribute("name", "viewport"), g.setAttribute("content",
+                "initial-scale=" + j + ", maximum-scale=" + j + ", minimum-scale=" + j + ", user-scalable=no"), f
+                .firstElementChild) f.firstElementChild.appendChild(g);
+            else {
+                var r = e.createElement("div");
+                r.appendChild(g), e.write(r.innerHTML)
+            }
+        a.addEventListener("resize", function () {
+            clearTimeout(d), d = setTimeout(c, 300)
+        }, !1), a.addEventListener("pageshow", function (a) {
+            a.persisted && (clearTimeout(d), d = setTimeout(c, 300))
+        }, !1), "complete" === e.readyState ? e.body.style.fontSize = 12 * i + "px" : e.addEventListener(
+            "DOMContentLoaded",
+            function () {
+                e.body.style.fontSize = 12 * i + "px"
+            }, !1), c(), k.dpr = a.dpr = i, k.refreshRem = c, k.rem2px = function (a) {
+            var b = parseFloat(a) * this.rem;
+            return "string" == typeof a && a.match(/rem$/) && (b += "px"), b
+        }, k.px2rem = function (a) {
+            var b = parseFloat(a) / this.rem;
+            return "string" == typeof a && a.match(/px$/) && (b += "rem"), b
+        }
+    }(window, window.lib || (window.lib = {}));
+
+    // 对图片进行压缩
+    function compress(fileObj, suffix, callback){
+        var fileSize = parseFloat(parseInt(fileObj['size'])/1024/1024).toFixed(2);
+        if ( typeof (FileReader) === 'undefined') {
+            console.log("当前浏览器内核不支持base64图标压缩");
+            callback(suffix, fileObj);
+        } else {
+            var reader = new FileReader();
+            reader.onload = function (e) { //要先确保图片完整获取到，这是个异步事件
+                var image = new Image();
+                image.src = e.target.result;
+                image.onload = function(){
+                    if (fileSize <= 0.2) {
+                        callback(suffix, fileObj);
+                        return;
+                    }
+
+                    //定义画布的大小，也就是图片压缩之后的像素
+                    var square = image.width / image.height;
+                    console.log("文件大小：" + fileSize);
+                    console.log("比例：" + square);
+                    var canvas = document.createElement('canvas'); //创建canvas元素
+                    var context = canvas.getContext('2d');
+
+                    var imageHeight;
+                    var imageWidth;
+
+                    var maxHeight = 1000;
+                    if (image.height < maxHeight) {
+                        imageHeight = image.height;
+                        imageWidth = image.width;
+                    } else {
+                        imageHeight = maxHeight;
+                        imageWidth = Math.round(square * maxHeight) ;
+                    }
+
+                    canvas.width = imageWidth;
+                    canvas.height = imageHeight;
+                    context.clearRect(0, 0, imageWidth, imageHeight); //在给定矩形内清空一个矩形
+                    context.drawImage(this, 0, 0, imageWidth, imageHeight);
+                    var data = canvas.toDataURL('image/jpeg', 0.6);
+                    //压缩完成执行回调
+                    var blobData = dataURLToBlob(data)
+                    callback(suffix, blobData);
+                };
+            };
+            reader.readAsDataURL(fileObj);
+        }
+    }
+
+    function dataURLToBlob(dataurl) {
+        console.log('datarul', dataurl)
+        let arr = dataurl.split(','),
+            mime = arr[0].match(/:(.*?);/)[1],
+            bstr = atob(arr[1]),
+            n = bstr.length,
+            u8arr = new Uint8Array(n)
+        while (n--) {
+            u8arr[n] = bstr.charCodeAt(n)
+        }
+        return new Blob([u8arr], { type: mime })
+    }
+</script>
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/jsp/device/order.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/device/order.jsp
new file mode 100644
index 0000000..188e262
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/device/order.jsp
@@ -0,0 +1,308 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<!DOCTYPE html>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html lang="en" data-dpr="1" style="font-size: 37.52px;">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta name="viewport"
+          content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no,viewport-fit=cover">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <meta name="format-detection" content="telephone=no">
+    <meta name="keywords" content="">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+	<c:set var="ctx" value="${pageContext.request.contextPath}"  scope="request"/>
+	<c:set var="resourcePath" value="${ctx}/resources"  scope="request"/>
+	<script type="text/javascript">
+		var ctx = "${ctx}"; //上下文路径
+		var resourcePath = "${resourcePath}";
+		document.writeln('<script type="text/javascript" src="'+resourcePath+'/js/global.js?d=' + new Date().getTime() + '" ><\/script>');
+	</script>
+	<script type="text/javascript" src="${resourcePath}/js/zepto.min.js"></script>
+	<script type="text/javascript" src="${resourcePath}/js/zepto.weui.js"></script>
+    <title>确认订单</title>
+	<link rel="stylesheet" href="${resourcePath}/css/h5.css">
+	<link rel="stylesheet" href="${resourcePath}/css/h5-common.css">
+	<link rel="stylesheet" href="${resourcePath}/css/weui.css">
+	<link rel="stylesheet" href="${resourcePath}/css/weuix.css">
+	<style>
+		body{
+			background-color: #F6F6F4;
+		}
+		#app{
+			padding: .4rem;
+		}
+		.address{
+			background-color: #fff;
+			border-radius: 5px;
+			display: flex;
+			justify-content: space-between;
+			padding: 8px;
+			align-items: center;
+		}
+		.icon{
+			width: 25px;
+			height: 25px;
+		}
+		.add-text{
+			color: #f14e4e;
+			font-size: .4rem;
+			width: 80%;
+		}
+		.good-image{
+			width: 60px;
+			height: 60px;
+		}
+		.good-order{
+			background-color: #fff;
+			border-radius: 5px;
+			margin-top: .355rem;
+		}
+		.goods-info{
+			padding: 10px;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+		}
+		.goods-name{
+			width: 70%;
+		}
+		.order-info{
+			display: flex;
+			justify-content: space-between;
+			padding: 0 10px 8px 10px;
+		}
+		.order-price{
+			color: #f14e4e;
+			font-size: 18px;
+		}
+		.order-price-text{
+			font-size: 14px;
+		}
+		.good-price-text{
+			margin-top: 5px;
+			font-size: 16px;
+			color: #f14e4e;
+		}
+		.good-name-text{
+			font-size: 14px;
+		}
+		.footer{
+			position: fixed;
+			bottom: 0;
+			left: 0;
+			background-color: #fff;
+			display: flex;
+			width: 100%;
+			padding: 10px;
+			justify-content: space-between;
+			border-radius: 5px 5px 0 0;
+			box-shadow: 1px 1px 12px #acacac;
+			align-items: center;
+			font-size: 12px;
+		}
+		.btn-submit{
+			width: 2.5rem;
+			height: 1rem;
+			line-height: 1rem;
+			margin:0;
+			background:#f14e4e;
+		}
+		.price-desc,.postage-fee{
+			color: #f14e4e;
+		}
+		.price-jf-text{
+			font-size: 12px;
+		}
+		.pay-icon{
+			width: 30px;
+		}
+		.order-pay-type{
+			margin-top: .355rem;
+			background-color: #fff;
+			border-radius: 5px;
+			padding: 10px;
+		}
+		.pay-info{
+			display: flex;
+			justify-content: flex-start;
+			align-items: center;
+		}
+		.hr{
+			border-top: 1px solid #ebe5e5;
+			margin: 10px 0;
+		}
+		.pay-name{
+			margin-left: 10px;
+		}
+		.type-pay{
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+		}
+		.pay-type{
+			width: .5rem;
+			height: .5rem;
+			appearance: auto;
+			webkit-appearance:auto;
+			border: black;
+		}
+
+
+		.order-pay-type div{
+			position: relative;
+		}
+
+		input[type="radio"] {
+			width: 20px;
+			height: 20px;
+			opacity: 0;
+		}
+
+		.type-pay label {
+			position: absolute;
+			right: 5px;
+			top: 3px;
+			width: 20px;
+			height: 20px;
+			border-radius: 50%;
+			border: 1px solid #999;
+　　　　　　　cursor: pointer;
+		}
+
+		/*设置选中的input的样式*/
+		/* + 是兄弟选择器,获取选中后的label元素*/
+		input:checked+label {
+			background-color: #f14e4e;
+			border: 1px solid #f14e4e;
+		}
+		/*添加的加号与label进行拼接(一个矩形边框去掉上和左的边框),再旋转45度*/
+		input:checked+label::after {
+			position: absolute;
+			content: "";
+			width: 5px;
+			height: 10px;
+			top: 1px;
+			left: 6px;
+			border: 2px solid #fff;
+			border-top: none;
+			border-left: none;
+			transform: rotate(45deg);
+		}
+		.address-info{
+			width: 75%;
+		}
+		.address-text{
+			font-size: 13px;
+		}
+		.link-text{
+			font-size: 11px;
+			color: #a0a0a0;
+		}
+		.ellipsis{
+			text-overflow: ellipsis;
+			overflow: hidden;
+			white-space: nowrap;
+		}
+		.order-hr{
+			border-top: 1px solid #ebe5e5;
+			margin: 0 auto 10px auto;
+			width: 93%;
+		}
+		.weui-icon_toast.weui-loading{
+			margin: 20px 0 0 0;
+		}
+		.foot-text{
+			font-size: 14px;
+		}
+		.postage-fee{
+			font-size: 14px;
+			color: #e89292;
+		}
+	</style>
+	<style type="text/css">.mint-popup-bottom[data-v-8cd1bb9c]{-webkit-transform:translate3d(-50%,0,0)!important}.mint-indicator-wrapper[data-v-8cd1bb9c]{-webkit-transform:translate(-50%,-50%);z-index:999}#app[data-v-8cd1bb9c],body[data-v-8cd1bb9c],html[data-v-8cd1bb9c]{font-size:5.973px;font-size:.37333333rem;height:100%;color:#333;-webkit-user-select:none;-moz-user-select:none;-o-user-select:none;-ms-user-select:none;user-select:none}body[data-v-8cd1bb9c],html[data-v-8cd1bb9c],input[data-v-8cd1bb9c],textarea[data-v-8cd1bb9c]{font-family:PingFangSC-Regular,Helvetica,sans-serif}input[data-v-8cd1bb9c],textarea[data-v-8cd1bb9c]{background-color:#fff}input[data-v-8cd1bb9c],li[data-v-8cd1bb9c],ol[data-v-8cd1bb9c],textarea[data-v-8cd1bb9c],ul[data-v-8cd1bb9c]{padding:0;border:0;margin:0}.tc[data-v-8cd1bb9c]{text-align:center}.tr[data-v-8cd1bb9c]{text-align:right}.tl[data-v-8cd1bb9c]{text-align:left}.c4b[data-v-8cd1bb9c]{color:#4b4b4b}.c000[data-v-8cd1bb9c]{color:#000}.c333[data-v-8cd1bb9c]{color:#333}.c666[data-v-8cd1bb9c]{color:#666}.c999[data-v-8cd1bb9c]{color:#999}.cccc[data-v-8cd1bb9c]{color:#ccc}.cddd[data-v-8cd1bb9c]{color:#ddd}.c9b9b[data-v-8cd1bb9c]{color:#9b9b9b}.cblue[data-v-8cd1bb9c]{color:#3089f7}.cred[data-v-8cd1bb9c]{color:red}.cora[data-v-8cd1bb9c]{color:#faa800}.cbase[data-v-8cd1bb9c]{color:#ff721f}.cfff[data-v-8cd1bb9c]{color:#fff}.bfff[data-v-8cd1bb9c]{background-color:#fff}.bbase[data-v-8cd1bb9c]{background-color:#ff721f}.fl[data-v-8cd1bb9c]{float:left}.fr[data-v-8cd1bb9c]{float:right}.mt10[data-v-8cd1bb9c]{margin-top:4.266px;margin-top:.26666667rem}.ml15[data-v-8cd1bb9c]{margin-left:6.4px;margin-left:.4rem}.mr15[data-v-8cd1bb9c]{margin-right:6.4px;margin-right:.4rem}.mt15[data-v-8cd1bb9c]{margin-top:6.4px;margin-top:.4rem}.mb15[data-v-8cd1bb9c]{margin-bottom:6.4px;margin-bottom:.4rem}.pl15[data-v-8cd1bb9c]{padding-left:6.4px;padding-left:.4rem}.pr15[data-v-8cd1bb9c]{padding-right:6.4px;padding-right:.4rem}.pt15[data-v-8cd1bb9c]{padding-top:6.4px;padding-top:.4rem}.pb15[data-v-8cd1bb9c]{padding-bottom:6.4px;padding-bottom:.4rem}.mt30[data-v-8cd1bb9c]{margin-top:12.8px;margin-top:.8rem}.mb30[data-v-8cd1bb9c]{margin-bottom:12.8px;margin-bottom:.8rem}.fz12[data-v-8cd1bb9c]{font-size:5.12px;font-size:.32rem}.fz13[data-v-8cd1bb9c]{font-size:5.546px;font-size:.34666667rem}.fz14[data-v-8cd1bb9c]{font-size:5.973px;font-size:.37333333rem}.fz15[data-v-8cd1bb9c]{font-size:6.4px;font-size:.4rem}.fz16[data-v-8cd1bb9c]{font-size:6.826px;font-size:.42666667rem}.fz18[data-v-8cd1bb9c]{font-size:7.68px;font-size:.48rem}.fz20[data-v-8cd1bb9c]{font-size:8.533px;font-size:.53333333rem}.fz22[data-v-8cd1bb9c]{font-size:9.386px;font-size:.58666667rem}.fz24[data-v-8cd1bb9c]{font-size:10.24px;font-size:.64rem}.fz32[data-v-8cd1bb9c]{font-size:13.653px;font-size:.85333333rem}.fz36[data-v-8cd1bb9c]{font-size:15.36px;font-size:.96rem}.block[data-v-8cd1bb9c]{display:block}b[data-v-8cd1bb9c],dfn[data-v-8cd1bb9c],em[data-v-8cd1bb9c]{font-style:normal;font-weight:400}.font-DINAlternate[data-v-8cd1bb9c]{font-family:DINAlternate-Bold,PingFangSC-Regular,Helvetica,sans-serif}.arr_r[data-v-8cd1bb9c]{position:relative}.arr_r[data-v-8cd1bb9c]:after{content:"";position:absolute;z-index:80;right:6.4px;right:.4rem;top:50%;width:6px;height:6px;border:1px solid #c7c7cc;border-width:2px 2px 0 0;transform:translateY(-50%) rotate(45deg)}.shadow[data-v-8cd1bb9c]{box-shadow:0 8px 25px 0 #eaebec}.ellips[data-v-8cd1bb9c]{white-space:nowrap;overflow:hidden;text-overflow:ellipsis}.ellips_line2[data-v-8cd1bb9c],.ellips_line3[data-v-8cd1bb9c]{display:-webkit-box;overflow:hidden}.ellips_line2[data-v-8cd1bb9c]{-webkit-line-clamp:2}.ellips_line3[data-v-8cd1bb9c]{-webkit-line-clamp:3}.to-check[data-v-8cd1bb9c]{position:relative}.to-check.checked[data-v-8cd1bb9c]:before{content:"";position:absolute;top:50%;right:6.4px;right:.4rem;width:6.4px;width:.4rem;height:3.2px;height:.2rem;border:2px solid #ff721f;border-width:0 0 2px 2px;transform:translateY(-50%) rotate(-45deg)}.ui-page[data-v-8cd1bb9c]{position:relative;max-width:256px;max-width:16rem;min-height:100%;background-color:#f7f7f7;padding-top:1px;margin:-1px auto 0}.ui-page[data-v-8cd1bb9c]:after{content:"";position:fixed;top:0;bottom:0;left:0;right:0;z-index:-1;background-color:#f7f7f7}button[data-v-8cd1bb9c]{font-size:6.4px;font-size:.4rem;border-radius:1px;background-color:#ff721f}button.disabled[data-v-8cd1bb9c]{opacity:.4}.mebtn[data-v-8cd1bb9c]{width:100%;padding:0 6.4px;padding:0 .4rem}input[data-v-8cd1bb9c]::-webkit-input-placeholder{color:#ccc}[data-v-8cd1bb9c]:-moz-placeholder,[data-v-8cd1bb9c]::-moz-placeholder{color:#ccc}[data-v-8cd1bb9c]:-ms-input-placeholder{color:#ccc}[class*=mint-tab-container][data-v-8cd1bb9c]{visibility:visible;position:static;opacity:1}.loading-txt[data-v-8cd1bb9c]{width:76.8px;width:4.8rem}.loading-txt em[data-v-8cd1bb9c]{display:block;margin:4.266px auto;margin:.26666667rem auto}.loading-txt .txt[data-v-8cd1bb9c]{margin-bottom:2.56px;margin-bottom:.16rem}.v-input-clear[data-v-8cd1bb9c]{position:absolute;right:-4.266px;right:-.26666667rem;top:50%;display:none;z-index:9;padding:4.266px;padding:.26666667rem;background-color:#fff;transform:translateY(-50%)}.v-input-clear.active[data-v-8cd1bb9c]{display:block}.v-input-clear .icon-font[data-v-8cd1bb9c]{display:block;color:#ccc;font-size:7.68px;font-size:.48rem}.popup-container .popup-title[data-v-8cd1bb9c]{font-weight:700}.popup-container .popup-btns .btn[data-v-8cd1bb9c]{color:#ff721f}.flex[data-v-8cd1bb9c]{display:-ms-flexbox;display:flex}.flex .flex-li[data-v-8cd1bb9c],.flex li[data-v-8cd1bb9c]{-ms-flex:1;flex:1}.i-warn-red[data-v-8cd1bb9c]{display:inline-block;width:20px;height:20px;background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAAAXNSR0IArs4c6QAAAkNJREFUSA29Vj1PVEEUvWdYA72dFkJCQkGhkJjQECpqTbQyWuhPcMFYUFjYyUfCbyDSYEJvZWhIiDEWmlCxFkBla8Tdfdcz897O7L7F2XkE3yS7e+fOOffMx92ZC0lo+vLOnAAPRWVRILdF9ZajAWf0ndJ3QN8+Nn98GRUOMYA2px6L6FsGm4nh/BhwLII1bJzseV/JuFRQV2amJLt4T7GFEj6xi0Mx40+wfnxSJgwJ6urkkmT6gVt1swyu1If8FINHeNf61M8bEHRiXfnIld3oB13dRlvGZLlf1Au6bdTfR6NXxiCQHU6CXH1KfCM6IbtSTNzvba/xYHtmKdto5BU2Wi/4eU7ua8//l2FjunzIAU6wyMa0BDH61cfGWLC98zJDF3IN6W0HUz+1dbCib2aP5FcH0rloptLc30tkD7o6PS/d9ud0okXyHF2rnFzzRrLOg5xc4RvyjejvFRg5lLeVYaIsViICW0yYOWy27nGl25W41DLubqzEMrse3pBge2fE4D3MFRYXcQQ3MNTQP76vjWB7Z8SgVvgfRnDXNgQot5RPTH3t3CbNaW161LJJc1CbILVs0uzXJkgt48oC91L/Z1lqWK0iS7GWLNfOQmajzx4ZINdw5LwGYVmQ0gzCzdTNgh3l4rBX54THkzWIpDzAmaxrc/Iu49sH+FlUxw66B5ixi+ZffNuvo8QI50FBV3uwBnGzKmZ05R+7slI9Y2MNCFqHE2UNQivtTC1pqJFr65hSxWZhA1ta5tVWCA8JX2Op/xc+6NDNayMwOQAAAABJRU5ErkJggg==) no-repeat;background-size:20px 20px}.i-checked[data-v-8cd1bb9c],.i-unchecked[data-v-8cd1bb9c]{position:relative;display:inline-block;width:16px;height:16px;background:url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+Cjxzdmcgd2lkdGg9IjMycHgiIGhlaWdodD0iMzJweCIgdmlld0JveD0iMCAwIDMyIDMyIiB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPgogICAgPCEtLSBHZW5lcmF0b3I6IFNrZXRjaCA1MC4yICg1NTA0NykgLSBodHRwOi8vd3d3LmJvaGVtaWFuY29kaW5nLmNvbS9za2V0Y2ggLS0+CiAgICA8dGl0bGU+5Y2P6K6u5Yu+L+WLvjwvdGl0bGU+CiAgICA8ZGVzYz5DcmVhdGVkIHdpdGggU2tldGNoLjwvZGVzYz4KICAgIDxkZWZzPjwvZGVmcz4KICAgIDxnIGlkPSLljY/orq7li74v5Yu+IiBzdHJva2U9Im5vbmUiIHN0cm9rZS13aWR0aD0iMSIgZmlsbD0ibm9uZSIgZmlsbC1ydWxlPSJldmVub2RkIj4KICAgICAgICA8cGF0aCBkPSJNMjguNDQ0NDQ0NCwwIEwzLjU1NTU1NTU2LDAgQzEuNiwwIDAsMS42IDAsMy41NTU1NTU1NiBMMCwyOC40NDQ0NDQ0IEMwLDMwLjQgMS42LDMyIDMuNTU1NTU1NTYsMzIgTDI4LjQ0NDQ0NDQsMzIgQzMwLjQsMzIgMzIsMzAuNCAzMiwyOC40NDQ0NDQ0IEwzMiwzLjU1NTU1NTU2IEMzMiwxLjYgMzAuNCwwIDI4LjQ0NDQ0NDQsMCBMMjguNDQ0NDQ0NCwwIFogTTEyLjQ0NDQ0NDQsMjQuODg4ODg4OSBMMy41NTU1NTU1NiwxNi4zNDE4ODAzIEw2LjA0NDQ0NDQ0LDEzLjk0ODcxNzkgTDEyLjQ0NDQ0NDQsMjAuMTAyNTY0MSBMMjUuOTU1NTU1Niw3LjExMTExMTExIEwyOC40NDQ0NDQ0LDkuNTA0MjczNSBMMTIuNDQ0NDQ0NCwyNC44ODg4ODg5IEwxMi40NDQ0NDQ0LDI0Ljg4ODg4ODkgWiIgaWQ9IuWLvuS4iiIgZmlsbD0iI0ZGNzIxRiI+PC9wYXRoPgogICAgPC9nPgo8L3N2Zz4=) no-repeat;background-size:16px auto}.i-unchecked[data-v-8cd1bb9c]{background-image:url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+Cjxzdmcgd2lkdGg9IjMycHgiIGhlaWdodD0iMzJweCIgdmlld0JveD0iMCAwIDMyIDMyIiB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPgogICAgPCEtLSBHZW5lcmF0b3I6IFNrZXRjaCA1MC4yICg1NTA0NykgLSBodHRwOi8vd3d3LmJvaGVtaWFuY29kaW5nLmNvbS9za2V0Y2ggLS0+CiAgICA8dGl0bGU+5Y2P6K6u5Yu+L+acquWLvjwvdGl0bGU+CiAgICA8ZGVzYz5DcmVhdGVkIHdpdGggU2tldGNoLjwvZGVzYz4KICAgIDxkZWZzPjwvZGVmcz4KICAgIDxnIGlkPSLljY/orq7li74v5pyq5Yu+IiBzdHJva2U9Im5vbmUiIHN0cm9rZS13aWR0aD0iMSIgZmlsbD0ibm9uZSIgZmlsbC1ydWxlPSJldmVub2RkIiBmaWxsLW9wYWNpdHk9IjAuMyI+CiAgICAgICAgPHBhdGggZD0iTTI4LjQ0NDQ0NDQsMCBMMy41NTU1NTU1NiwwIEMxLjYsMCAwLDEuNiAwLDMuNTU1NTU1NTYgTDAsMjguNDQ0NDQ0NCBDMCwzMC40IDEuNiwzMiAzLjU1NTU1NTU2LDMyIEwyOC40NDQ0NDQ0LDMyIEMzMC40LDMyIDMyLDMwLjQgMzIsMjguNDQ0NDQ0NCBMMzIsMy41NTU1NTU1NiBDMzIsMS42IDMwLjQsMCAyOC40NDQ0NDQ0LDAgTDI4LjQ0NDQ0NDQsMCBaIE0xMi40NDQ0NDQ0LDI0Ljg4ODg4ODkgTDMuNTU1NTU1NTYsMTYuMzQxODgwMyBMNi4wNDQ0NDQ0NCwxMy45NDg3MTc5IEwxMi40NDQ0NDQ0LDIwLjEwMjU2NDEgTDI1Ljk1NTU1NTYsNy4xMTExMTExMSBMMjguNDQ0NDQ0NCw5LjUwNDI3MzUgTDEyLjQ0NDQ0NDQsMjQuODg4ODg4OSBMMTIuNDQ0NDQ0NCwyNC44ODg4ODg5IFoiIGlkPSLmsqHli77kuIoiIGZpbGw9IiNGRjcyMUYiPjwvcGF0aD4KICAgIDwvZz4KPC9zdmc+)}.model-container .key-body[data-v-8cd1bb9c]{padding-bottom:1.493px;padding-bottom:.09333333rem;background-color:#d2d5db}.model-container .key-body ul.number li[data-v-8cd1bb9c]{height:14.933px;height:.93333333rem;line-height:14.933px;line-height:.93333333rem;padding:3.626px 0;padding:.22666667rem 0;width:31%;margin:0 1.7% 1.7% 0;border-radius:5px;background-color:#fff;box-shadow:0 1px 0 0 #898a8d}.model-container .key-body ul.number li[data-v-8cd1bb9c]:nth-child(3n-2){margin-left:1.7%}.model-container .key-body ul.number li[data-v-8cd1bb9c]:before{content:none}.model-container .key-body ul.number li.key-back[data-v-8cd1bb9c],.model-container .key-body ul.number li.key-null[data-v-8cd1bb9c]{background-color:#d2d5db;box-shadow:none}.model-container .key-body ul.number li.key-back[data-v-8cd1bb9c]:active{opacity:.5}.freeMask[data-v-8cd1bb9c]{background-color:transparent}.vx-header+.scroll-wrapper[data-v-8cd1bb9c]{top:0}@keyframes lighter-data-v-8cd1bb9c{0%{background-color:#000}50%{background-color:#000}51%{background-color:transparent}to{background-color:transparent}}@keyframes rotater-data-v-8cd1bb9c{0%{-webkit-transform:rotate(0)}to{-webkit-transform:rotate(1turn)}}.get-money-activity[data-v-8cd1bb9c]{padding:6.4px;padding:.4rem;text-align:center;background-color:#fff}.get-money-activity .get-money-title[data-v-8cd1bb9c]{display:-ms-flexbox;display:flex;-ms-flex-pack:justify;justify-content:space-between;font-size:5.973px;font-size:.37333333rem;line-height:7.04px;line-height:.44rem;margin-top:5.546px;margin-top:.34666667rem;font-family:PingFangSC-Regular}.get-money-activity .get-money-title .one[data-v-8cd1bb9c]{color:#333}.get-money-activity .get-money-title .two[data-v-8cd1bb9c]{color:#ff7728}.get-money-activity .money[data-v-8cd1bb9c]{text-align:left;color:#333;font-size:13.653px;font-size:.85333333rem;line-height:18.773px;line-height:1.17333333rem;font-family:DINAlternate-Bold}.get-money-activity .money-desc[data-v-8cd1bb9c]{font-family:PingFangSC-Regular;color:#333;font-size:5.973px;font-size:.37333333rem;line-height:8.533px;line-height:.53333333rem;margin-top:5.333px;margin-top:.33333333rem;margin-bottom:5.333px;margin-bottom:.33333333rem;text-align:left}.get-money-activity .money-list[data-v-8cd1bb9c]{display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;-ms-flex-pack:start;justify-content:flex-start}.get-money-activity .money-list li[data-v-8cd1bb9c]{width:45.866px;width:2.86666667rem;height:23.253px;height:1.45333333rem;line-height:23.253px;line-height:1.45333333rem;font-size:11.093px;font-size:.69333333rem;color:#333;border:1px solid #bcbcbc;font-family:DINAlternate-Bold;border-radius:.10666667rem;margin-bottom:4.693px;margin-bottom:.29333333rem}.get-money-activity .money-list li[data-v-8cd1bb9c]:nth-child(3n-1){margin-left:4.693px;margin-left:.29333333rem;margin-right:4.693px;margin-right:.29333333rem}.get-money-activity .money-list li span[data-v-8cd1bb9c]{font-size:8.96px;font-size:.56rem}.get-money-activity .money-list .li-disabled[data-v-8cd1bb9c]{color:#dfdfdf}.get-money-activity .money-list .li-actived[data-v-8cd1bb9c]{color:#ff7728;border:1px solid #ff7728;background-color:rgba(255,119,40,.1)}.get-money-activity .get-money-desc[data-v-8cd1bb9c]{font-family:PingFangSC-Regular;color:#333;font-size:5.973px;font-size:.37333333rem;line-height:9.386px;line-height:.58666667rem;margin-top:2.133px;margin-top:.13333333rem;margin-bottom:12.8px;margin-bottom:.8rem;text-align:left}.get-money-activity .button-disabled[data-v-8cd1bb9c],.get-money-activity .money-button[data-v-8cd1bb9c]{width:100%;height:18.773px;height:1.17333333rem;line-height:18.773px;line-height:1.17333333rem;font-size:6.826px;font-size:.42666667rem;border-radius:.02666667rem;color:#fff;font-family:PingFangSC-Medium;font-weight:700}.get-money-activity .button-disabled[data-v-8cd1bb9c]{background-color:rgb(253,117,100)}.get-money-activity .money-button[data-v-8cd1bb9c]{background-color:#ff7728}.get-money-activity .money-exchange-link[data-v-8cd1bb9c]{width:100%;height:42.666px;height:2.66666667rem;margin-top:6.4px;margin-top:.4rem}.get-money-activity .money-exchange-link img[data-v-8cd1bb9c]{width:100%;height:100%}</style><style type="text/css" title="fading circle style">.circle-color-12 > div::before { background-color: #ccc; }
+	</style>
+</head>
+<body>
+	<div id="app">
+		<div class="good-order">
+			<div class="goods-info">
+				<img class="good-image" src="${resourcePath}/images/sim_card.png" alt="">
+				<div class="goods-name">
+					<div class="good-name-text">移动4G流量年卡通讯费</div>
+					<div class="good-price-text">每个月30M流量 共12个月</div>
+				</div>
+			</div>
+			<div class="hr order-hr"></div>
+			<div class="order-info">
+				<div class="order-name">设备编号：</div>
+				<div class="order-price postage-fee">${device.snNo}</div>
+			</div>
+			<div class="order-info">
+				<div class="order-name">关联商户：</div>
+				<div class="order-price postage-fee">${device.actMercName}</div>
+			</div>
+			<div class="hr order-hr"></div>
+			<div class="order-info">
+				<div class="order-name">金额：</div>
+				<div class="order-price postage-fee">10元</div>
+			</div>
+		</div>
+		<div class="order-pay-type">
+			<div class="type-pay" for="alipay">
+				<div class="pay-info">
+					<img class="pay-icon" src="${resourcePath}/images/alipay-icon.png" alt="支付宝">
+					<div class="pay-name">支付宝</div>
+				</div>
+				<input type="radio" class="pay-type" checked id="alipay" value="alipay" name="pay-type">
+				<label for="alipay" class="radio-label"></label>
+			</div>
+		</div>
+		<div class="footer">
+			<div class="foot-text">
+				实付 :
+				<span class="postage-fee">10元</span>
+			</div>
+			<button class="btn-submit">立即付款</button>
+		</div>
+	</div>
+	<script src="${resourcePath}/js/common/h5.js"></script>
+	<script>
+		$(".btn-submit").click(function (res){
+			let isPostage = '${good.isPostage}';
+			let aid = $("#aid").val();
+			// if(isPostage == 0)return $.alert("不包邮商品暂时无法兑换！","提示");
+			let url = ctx + "/merchantDevice/simOrder";
+			var data = {};
+			data.aid = aid;
+			data.token = '${token}';
+			data.address = '${snNo}';
+			data.goodName = '移动4G流量年卡流量';
+			let lodingText = "支付中...";
+			$.showLoading(lodingText);
+			$.ajax({
+				url:url,
+				data:data,
+				type:"post",
+				dataType:"json",
+				success:function (res){
+					if(res.code == 200){
+						if(isPostage == 0){
+							let form = res.data.result;
+							$("#app").append(form);
+						}else{
+							$.alert(res.message,"提示",function (res){
+								window.location.href= ctx + '/activity/good?token=${token}';
+							});
+						}
+					}else{
+						$.hideLoading();
+						$.alert(res.message,"提示");
+					}
+				}
+			})
+		})
+	</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/jsp/device/simChargeIndex.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/device/simChargeIndex.jsp
new file mode 100644
index 0000000..5f502df
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/device/simChargeIndex.jsp
@@ -0,0 +1,102 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<!DOCTYPE html>
+<html lang="en" data-dpr="1">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta name="viewport"
+          content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no,viewport-fit=cover">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <meta name="format-detection" content="telephone=no">
+    <meta name="keywords" content="">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <jsp:include page="../../common.jsp"/>
+    <c:set var="ctx" value="${pageContext.request.contextPath}" scope="request"/>
+    <c:set var="resourcePath" value="${ctx}/resources" scope="request"/>
+    <script type="text/javascript">
+        var ctx = "${ctx}"; //上下文路径
+        var resourcePath = "${resourcePath}";
+        document.writeln('<script type="text/javascript" src="' + resourcePath + '/js/global.js?d=' + new Date().getTime() + '" ><\/script>');
+    </script>
+    <title>流量卡充值</title>
+
+    <script type="text/javascript" src="${resourcePath}/js/zepto.min.js"></script>
+    <script type="text/javascript" src="${resourcePath}/js/zepto.weui.js"></script>
+    <link rel="stylesheet" href="${resourcePath}/css/h5.css">
+    <link rel="stylesheet" href="${resourcePath}/css/h5-common.css">
+<%--    <link rel="stylesheet" href="${resourcePath}/css/weui.css">--%>
+<%--    <link rel="stylesheet" href="${resourcePath}/css/weuix.css">--%>
+    <style>
+        @media screen and (max-device-width: 395px) {
+            div.title {
+                font-size: 6em;
+                margin-top: 100px;
+                font-weight: bold;
+            }
+
+            .input {
+                display: inline-block;
+                font-size: 4em;
+            }
+        }
+
+        @media screen and (min-device-width: 396px) and (max-device-width: 800px) {
+            div.title {
+                font-size: 2.4em;
+                margin-top: 100px;
+                font-weight: bold;
+            }
+
+            .input {
+                display: inline-block;
+                font-size: 1.6em;
+            }
+        }
+
+        @media screen and (min-device-width: 800px) {
+            div.title {
+                font-size: 3.6em;
+                margin-top: 100px;
+                font-weight: bold;
+            }
+
+            .input {
+                display: inline-block;
+                font-size: 2.4em;
+            }
+        }
+    </style>
+</head>
+
+<body style="font-size: 62.5%">
+<div style="text-align: center">
+    <div class="title">流量卡充值</div>
+
+    <div>
+        <div style="display: inline-block; margin-left: 10px; margin-top: 50px;">
+            <div class="input">设备编号</div>
+        </div>
+        <div style="display: inline-block; margin-left: 10px; margin-top: 50px;">
+            <input class="input" type="text" name="snNo" placeholder="请输入设备编号或SN号" />
+        </div>
+        <div style="margin-left: 15px; margin-top: 50px" class="button-sp-area">
+            <a style="width: 184px; font-size: 18px;" href="javascript:" role="button" class="weui-btn weui-btn_primary" onclick="next()">下一步</a>
+        </div>
+    </div>
+</div>
+</body>
+<script>
+    function next() {
+        var snNo = $('input[name="snNo"]').val();
+        if (snNo == null || snNo == '') {
+            debugger;
+            $.toast("设备编号不能为空", "text");
+            return;
+        }
+        window.location = ctx + "/merchantDevice/simOrder?token=${token}&snNo=" + snNo;
+    }
+</script>
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/jsp/error.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/error.jsp
new file mode 100644
index 0000000..cd5e3cf
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/error.jsp
@@ -0,0 +1,27 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+		 pageEncoding="UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html>
+<meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=0">
+<jsp:include page="../common.jsp" />
+<head>
+<body>
+<div class="weui-mask weui-mask--visible" style="opacity: 1;"></div>
+<div class="weui-dialog weui-dialog--visible" style="opacity: 1;">
+	<div class="weui-dialog__hd"><strong class="weui-dialog__title">错误提示</strong></div>
+	<div class="weui-dialog__bd">${error}</div>
+	<div class="weui-dialog__ft">
+		<a href="javascript:;" class="weui-dialog__btn primary" onclick="WeixinJSBridge.call('closeWindow');">确定</a>
+	</div>
+
+
+</div>
+</body>
+<script>
+	document.addEventListener('WeixinJSBridgeReady', function onBridgeReady() {
+		// 通过下面这个API隐藏右上角按钮
+		WeixinJSBridge.call('hideOptionMenu');
+	});
+</script>
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/jsp/index/index.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/index/index.jsp
new file mode 100644
index 0000000..7ab3e06
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/index/index.jsp
@@ -0,0 +1,31 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<jsp:include page="../../common.jsp"></jsp:include>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no">
+<meta name="format-detection" content="telephone=no">
+<link rel="shortcut icon" href="${resourcePath }/images/favicon.ico" type="image/x-icon">
+<meta name="keywords" content="">
+<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+<meta name="renderer" content="webkit">
+<title>武汉荣商创银科技有限公司</title>
+	
+<script type="text/javascript">
+</script>
+
+</head>
+
+<body style="overflow: hidden;">
+	welcome to wap!<br/>
+	
+	<c:forEach var="sys" items="${systemConfigList }">
+	
+		${sys.propertyValue }<br/>
+	</c:forEach>
+</body>
+
+
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/jsp/merchant/audit.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/merchant/audit.jsp
new file mode 100644
index 0000000..b3ad635
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/merchant/audit.jsp
@@ -0,0 +1,654 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<!DOCTYPE html>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1">
+    <meta http-equiv="pragma" content="no-cache">
+    <meta http-equiv="Cache-Control" content="no-cache, must-revalidate">
+    <meta http-equiv="expires" content="0">
+    <c:set var="ctx" value="${pageContext.request.contextPath}" scope="request"/>
+    <c:set var="resourcePath" value="${ctx}/resources" scope="request"/>
+    <script type="text/javascript">
+        var ctx = "${ctx}"; //上下文路径
+        var resourcePath = "${resourcePath}";
+        document.writeln('<script type="text/javascript" src="' + resourcePath + '/js/global.js?d=' + new Date().getTime() + '" ><\/script>');
+    </script>
+    <title>商户进件审核</title>
+    <style>
+        #Rootloading {
+            display: inline-block;
+            width: 12.8%;
+            max-width: 80px;
+            position: absolute;
+            left: 50%;
+            top: 50%;
+            transform: translate(-50%, -50%);
+        }
+    </style>
+    <link href="${resourcePath}/css/act-common.css" rel="stylesheet">
+    <style id="__WXWORK_INNER_SCROLLBAR_CSS">
+        ::-webkit-scrollbar {
+            width: 12px !important;
+            height: 12px !important;
+        }
+
+        ::-webkit-scrollbar-track:vertical {
+        }
+
+        ::-webkit-scrollbar-thumb:vertical {
+            background-color: rgba(136, 141, 152, 0.5) !important;
+            border-radius: 10px !important;
+            background-clip: content-box !important;
+            border: 2px solid transparent !important;
+        }
+
+        ::-webkit-scrollbar-track:horizontal {
+        }
+
+        ::-webkit-scrollbar-thumb:horizontal {
+            background-color: rgba(136, 141, 152, 0.5) !important;
+            border-radius: 10px !important;
+            background-clip: content-box !important;
+            border: 2px solid transparent !important;
+        }
+
+        ::-webkit-resizer {
+            display: none !important;
+        }
+
+        .content-wrapper .header {
+            height: 3.125rem;
+            background-color: #ff2d4b;
+            color: white;
+            display: flex;
+            justify-content: center;
+            text-align: center;
+            align-items: center
+        }
+
+        .merc-info {
+            margin: 1.25rem 1.25rem;
+            line-height: 3rem;
+        }
+
+        .item {
+            display: flex;
+            justify-content: space-between;
+            border-bottom: 1px solid rgba(163, 162, 162, .5);
+        }
+
+        .main-title {
+            border-left: 6px solid #ff2d4b;
+            padding-left: .8rem;
+            color: #ff2d4b;
+        }
+
+        .item-image-view {
+            display: flex;
+            justify-content: space-around;
+            align-items: center;
+        }
+
+        .item-image-view .item-image img {
+            height: 100px;
+            width: 80%;
+        }
+
+        .item-image img {
+            height: 160px;
+            width: 60%;
+        }
+
+        .item-image {
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            padding-bottom: 20px;
+        }
+
+        .item-value {
+            max-width: 15.625rem;
+        }
+
+        .foot {
+            height: 5rem;
+            width: 100%;
+            background-color: #ffffff;
+            position: fixed;
+            bottom: 0;
+        }
+
+        .foot-bottom {
+            display: flex;
+            justify-content: space-around;
+            margin: 1.25rem 5%;
+            align-items: center;
+            text-align: center;
+            line-height: 2.4rem;
+        }
+
+        .foot-bottom .btn-success {
+            background-color: #67C23A;
+            color: white;
+            height: 2.4rem;
+            width: 45%;
+            border-radius: 30px;
+        }
+
+        .foot-bottom .btn-reject {
+            background-color: #F56C6C;
+            color: white;
+            height: 2.4rem;
+            width: 45%;
+            border-radius: 30px;
+        }
+
+
+        #imgdiv {
+            width: 500px;
+            margin: 50px auto;
+        }
+
+        #imgdiv img {
+            width: 300px;
+            margin: 0 100px;
+        }
+
+        #bigimg {
+            width: 100%;
+            height: 100%;
+            position: fixed;
+            background: rgba(0, 0, 0, .3);
+            top: 0;
+            display: none;
+        }
+
+        #bigimg img {
+            width: 90%;
+            margin: auto;
+            position: fixed;
+            left: 0;
+            right: 0;
+            top: 80px;
+            cursor: pointer;
+        }
+
+        .btn-cacle {
+            background-color: #67C23A;
+        }
+
+        .btn-cancel {
+            background-color: #909399;
+        }
+        .channle-item{
+            line-height: 4rem;
+            display: flex;
+            justify-content: space-around;
+        }
+        .channel-radio-item{
+            margin: 0 0.5rem;
+        }
+        .income-class{
+            text-align: center;
+            display: flex;
+            justify-content: space-evenly;
+        }
+        .class-loading{
+            background-color: white;
+            position: relative;
+            top: 50%;
+            left: 30%;
+            width: 40%;
+            height: 45px;
+            border-radius: 5px;
+        }
+        .class-loading-body{
+            display: flex;
+            justify-content: space-evenly;
+            align-items: center;
+            width: 80%;
+            text-align: center;
+            padding: 8px 0 0 12px;
+        }
+        .loading-txt{
+            color: #8d8b8b;
+        }
+        .hide{
+            display: none;
+        }
+        .channel-text{
+            margin-left: 0.2rem;
+        }
+        .ban-selected{
+            color: #7d7d7d;
+        }
+    </style>
+</head>
+
+<body style="height: auto;">
+<div id="app" class="">
+    <div class="content-wrapper">
+        <div class="header">
+            进件审核
+        </div>
+
+        <div class="main">
+
+            <div class="merc-info">
+                <div class="main-popula-info">
+                    <div class="main-title">
+                        推广员基本信息
+                    </div>
+                    <div class="item">
+                        <div class="item-name">推广员名称</div>
+                        <div class="item-value">${app.userName}</div>
+                    </div>
+                    <div class="item">
+                        <div class="item-name">登录账号</div>
+                        <div class="item-value">${info.loginName}</div>
+                    </div>
+                    <div class="item">
+                        <div class="item-name">证件号</div>
+                        <div class="item-value">${cert.certNo}</div>
+                    </div>
+                    <div>
+                        <div class="item-name">实名认证件照</div>
+                        <div class="item-image-view">
+                            <div class="item-image"><img onerror="this.src='${resourcePath }/images/error.jpg'"
+                                                         src="${cert.imgPositive}" style="width: 125px"/></div>
+                            <div class="item-image"><img onerror="this.src='${resourcePath }/images/error.jpg'"
+                                                         src="${cert.imgNegative}" style="width: 125px"/></div>
+                        </div>
+                    </div>
+                </div>
+
+
+                <div class="main-merc-info">
+                    <div class="main-title">
+                        商户基本信息
+                    </div>
+
+                    <div class="item">
+                        <div class="item-name">商户名称</div>
+                        <div class="item-value">${merchant.merchantName}</div>
+                    </div>
+                    <div class="item">
+                        <div class="item-name">商户类型</div>
+                        <div class="item-value">${merchant.merchantType == '1' ? '小微' : merchant.merchantType == '2' ? '个体' : '企业'}</div>
+                    </div>
+                    <div class="item">
+                        <div class="item-name">商户简称</div>
+                        <div class="item-value">${merchant.alias}</div>
+                    </div>
+
+                    <div class="item">
+                        <div class="item-name">商户联系人</div>
+                        <div class="item-value">${merchant.contactName}</div>
+                    </div>
+
+                    <div class="item">
+                        <div class="item-name">联系人电话</div>
+                        <div class="item-value">${merchant.contactMobile}</div>
+                    </div>
+
+                    <div class="item">
+                        <div class="item-name">经营类目</div>
+                        <div class="item-value" style="font-size: 0.8rem">${merchant.mccName}</div>
+                    </div>
+                    <div class="item">
+                        <div class="item-name">详细地址</div>
+                        <div class="item-value"
+                             style="font-size: 0.8rem">${merchant.province}${merchant.city}${merchant.district}${merchant.address}</div>
+                    </div>
+                    <div>
+                        <div class="item-name">门店照片</div>
+                        <div class="item-image-view">
+                            <div class="item-image"><img onerror="this.src='${resourcePath }/images/error.jpg'"
+                                                         src="${merchant.storeHeadPic}" style="width: 90px"/></div>
+                            <div class="item-image"><img onerror="this.src='${resourcePath }/images/error.jpg'"
+                                                         src="${merchant.cashPic}" style="width: 90px"/></div>
+                            <div class="item-image"><img onerror="this.src='${resourcePath }/images/error.jpg'"
+                                                         src="${merchant.storeInsidePic}" style="width: 90px"/></div>
+                        </div>
+                    </div>
+                </div>
+
+
+                <c:if test="${merchant.merchantType ne '1'}">
+                    <div class="main-license-info">
+
+                        <div class="main-title">
+                            营业执照信息
+                        </div>
+
+                        <div class="item">
+                            <div class="item-name">法人姓名</div>
+                            <div class="item-value">${merchant.principalPerson}</div>
+                        </div>
+
+                        <div class="item">
+                            <div class="item-name">法人证件号</div>
+                            <div class="item-value">${merchant.principalCertNo}</div>
+                        </div>
+
+                        <div class="item">
+                            <div class="item-name">执照名称</div>
+                            <div class="item-value">${merchant.bussAuthName}</div>
+                        </div>
+
+                        <div class="item">
+                            <div class="item-name">执照编号</div>
+                            <div class="item-value">${merchant.bussAuthNum}</div>
+                        </div>
+
+                        <div class="item">
+                            <div class="item-name">注册地址</div>
+                            <div class="item-value" style="font-size: 0.8rem">${merchant.bussAuthAddress}</div>
+                        </div>
+
+                        <div>
+                            <div class="item-name">营业执照照片</div>
+                            <div class="item-image"><img onerror="this.src='${resourcePath }/images/error.jpg'"
+                                                         src="${merchant.businessLicensePic}"/></div>
+                        </div>
+                    </div>
+                </c:if>
+
+
+                <div class="main-settle-info">
+                    <div class="main-title">
+                        结算基本信息
+                    </div>
+
+                    <div class="item">
+                        <div class="item-name">银行名称</div>
+                        <div class="item-value">${bank.bankName}</div>
+                    </div>
+
+                    <div class="item">
+                        <div class="item-name">支行名称</div>
+                        <div class="item-value">${bank.branchName}</div>
+                    </div>
+
+                    <div class="item">
+                        <div class="item-name">开户名</div>
+                        <div class="item-value">${bank.bankHolder}</div>
+                    </div>
+
+                    <div class="item">
+                        <div class="item-name">开户卡号</div>
+                        <div class="item-value">${bank.bankCardNo}</div>
+                    </div>
+
+                    <div class="item">
+                        <div class="item-name">预留手机号</div>
+                        <div class="item-value">${bank.phone}</div>
+                    </div>
+
+                    <div class="item">
+                        <div class="item-name">证件号码</div>
+                        <div class="item-value">${card.certNo}</div>
+                    </div>
+
+                    <div>
+                        <div class="item-name">结算人证件照</div>
+                        <div class="item-image-view">
+                            <div class="item-image"><img onerror="this.src='${resourcePath }/images/error.jpg'" src="${card.imgPositive}" style="width: 90px"/></div>
+                            <div class="item-image"><img onerror="this.src='${resourcePath }/images/error.jpg'" src="${card.imgNegative}" style="width: 90px"/></div>
+                            <div class="item-image"><img onerror="this.src='${resourcePath }/images/error.jpg'" src="${bank.imgUrl}" style="width: 90px"/></div>
+                        </div>
+
+                    </div>
+                    <div>
+                        <div class="item-name">结算人其他照片</div>
+                        <div class="item-image-view">
+                            <div class="item-image"><img onerror="this.src='${resourcePath }/images/error.jpg'" src="${merchant.literalPic}" style="width: 125px"/></div>
+                            <div class="item-image"><img onerror="this.src='${resourcePath }/images/error.jpg'" src="${merchant.handPic}" style="width: 125px"/></div>
+                        </div>
+                    </div>
+                    <div>
+                        <div class="item-name">商户协议</div>
+                        <div class="item-image-view">
+                            <div class="item-image"><img onerror="this.src='${resourcePath }/images/error.jpg'" src="${merchant.dealPic}" style="width: 125px"/></div>
+                            <div class="item-image"><img onerror="this.src='${resourcePath }/images/error.jpg'" src="${merchant.affilatePic}" style="width: 125px"/></div>
+                        </div>
+                    </div>
+                    <c:if test="${settleType == '012' || settleType == '022'}">
+                        <div>
+                            <div class="item-name">非法人授权函</div>
+                            <div class="item-image-view">
+                                <div class="item-image"><img onerror="this.src='${resourcePath}/images/error.jpg'" style="width: 125px" src="${merchant.warrantyPic}"/></div>
+                            </div>
+                        </div>
+                    </c:if>
+                    <c:if test="${channelFlag}">
+                        <div class="main-channel-info">
+                            <div class="main-title">
+                                通道信息
+                            </div>
+                            <div>已进件通道：${useChannelName}</div>
+                        </div>
+                    </c:if>
+                    <div class="main-settle-info">
+                        <div class="main-title">
+                            上次驳回原因
+                        </div>
+                        <div>驳回时间：${userApp.updateTime}</div>
+                        <div>驳回理由：${userApp.remark}</div>
+                        <p>
+                        <div>1</div>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <div class="foot">
+            <div class="foot-bottom">
+                <div class="btn-success" id="adopt">通过</div>
+                <div class="btn-reject" id="reject">驳回</div>
+            </div>
+        </div>
+    </div>
+
+</div>
+<div id="imgdiv"></div>
+<!-- 放大遮罩层 -->
+<div id="bigimg" onclick="closeimg();"></div>
+
+<div class="toast-wrapper" style="display: none;">
+    <div class="toast"></div>
+</div>
+    <%--	<div class="toast3-wrapper" style="display: block;">--%>
+
+    <%--	</div>--%>
+<div class="toast-wrapper2 toast-title" style="display: none;">
+    <div class="toast2" id="toast1" style="height: 200px;">
+        <p class="toast-title">选择进件通道</p>
+        <div class="channle-item">
+            <c:if test="${not empty channelList}">
+                <c:forEach items="${channelList}" var="channel">
+                    <label for="${channel.channelCode}" class="channel-radio-item">
+                        <input type="radio" name="channel" ${channel.useFlag ? "disabled" : ""}  data-id="${channel.id}" value="${channel.channelCode}" id="${channel.channelCode}" class="channel-radio"><span class="channel-text ${channel.useFlag ? "ban-selected" : ""}">${channel.channelName}</span>
+                    </label>
+                </c:forEach>
+            </c:if>
+        </div>
+        <div class="income-class">
+            <div>已进件:${not empty useChannelName ? useChannelName : "暂无"}</div>
+            <div>类型:${importType eq 2 ? '插件' : '普通'}</div>
+        </div>
+        <div class="foot-bottom" style="display: flex;justify-content: space-around;">
+            <div class="btn-success" id="confirm">确定</div>
+            <div class="btn-reject" id="cancel">取消</div>
+        </div>
+    </div>
+    <div class="class-loading hide">
+        <div class="class-loading-body">
+            <div class="loading-img">
+                <img src="${resourcePath }/images/loading-2.gif" width="28px">
+            </div>
+            <div class="loading-txt">加载中...</div>
+        </div>
+    </div>
+
+</div>
+
+
+
+<div class="toast-wrapper2 reject-title" style="display: none;">
+    <div class="toast2" id="toast2" style="height: 250px;">
+        <p class="toast-title toast2-title">请入驳回原因</p>
+        <p class="toast-message" style="line-height: 60px">
+            <select name="remark1" id="remark1" style="max-width: 250px">
+                <option value="">请选择</option>
+                <c:forEach items="${rejectList}" var="reject">
+                    <option value="${reject.rejectName}">${reject.rejectName}</option>
+                </c:forEach>
+            </select>
+            <textarea name="remark" id="remark" autocomplete="false" style="min-width: 250px;margin-left: 2px"
+                      placeholder="请输入驳回原因"></textarea>
+                <%--				<input type="text" name="remark" style="margin-left: 4px;" autocomplete="false" placeholder="请输入驳回原因" id="remark">--%>
+        </p>
+        <div class="foot-bottom" style="display: flex;justify-content: space-around;">
+            <div class="btn-success" id="save">确定</div>
+        </div>
+    </div>
+</div>
+
+
+<script>
+    $(function () {
+        $("img[id!='prevewImg']").on('click', function () {
+            imgbig(this);
+        })
+        $("#adopt").on('click', function () {
+            $(".toast-title-message").html("是否确认审核通过？");
+            $(".toast-title").show();
+            //$(".toast-title").fadeIn(700);
+        })
+
+        $("#cancel").on('click', function () {
+            $('#toast1').addClass('toast2-out');
+            $('.toast-title').fadeOut(700);
+            setTimeout(function () {
+                $('#toast1').removeClass('toast2-out');
+            }, 1000)
+        })
+        $("#reject").on('click', function () {
+            $(".reject-title").fadeIn(700);
+            $(".toast2-title").show();
+        })
+        $('#toast2').on('click', function (e) {
+            e.stopPropagation();
+            return false
+        })
+        $('.reject-title').click(function () {
+            $('#toast2').addClass('toast2-out')
+            $(this).fadeOut(700)
+            setTimeout(function () {
+                $('#toast2').removeClass('toast2-out')
+            }, 1000)
+        })
+        $("#confirm").on('click', function () {
+            let flag = false;
+            let cV = "";
+            let cI = "";
+            $("[name='channel']").each((k,v)=>{
+                if(v.checked){
+                    flag = true;
+                    cV = v.value;
+                    cI = $(v).data().id;
+                }
+            })
+            if(!flag){
+                alert("至少选中一个通道类型进件！");
+                return;
+            }
+            let type = '${importType}';
+            if(cV == "SXF" && type == 2){
+                alert("随行付暂不支持插件进件！");
+                return;
+            }
+            $("#toast1").hide();
+            $(".class-loading").removeClass('hide');
+            if(type == 1){
+                //普通进件
+                var url = "/manage/merchantStore/manualMerchantIncom/${userId}/"+cI+'/${app.merchantCode}';
+                $.ajax({
+                    type:'GET',
+                    url:url,
+                    timeout:15000, //超时时间 15秒
+                    dataType: 'json',
+                    complete:(XMLHttpRequest, textStatus)=>{
+                        if(textStatus == 'timeout'){
+                            alert("请求超时，请登录后台查看进件结果！");
+                        }
+                    },
+                    success:(res)=>{
+                        if (res.code == 1) {
+                            alert("提交成功！");
+                        } else {
+                            alert(res.msg);
+                        }
+                    }
+                })
+            }else if (type == 2){
+                //插件进件
+                var url = "/manage/merchantStore/audit/${userId}";
+                $.get(url,function (res) {
+                    $(".class-loading").addClass('hide');
+                    $(".toast-title").hide();
+                    $("#toast1").show();
+                    if (res.code == 200) {
+                        alert("提交成功！");
+                    } else {
+                        alert(res.msg);
+                    }
+                })
+            }else{
+                alert("未知进件类型");
+                $(".class-loading").addClass('hide');
+                $(".toast-title").hide();
+                $("#toast1").show();
+            }
+        })
+        $("#remark1").on('change', function () {
+            $("#remark").val($(this).val());
+        })
+
+        $("#save").on('click', function () {
+            var remark = $("#remark").val();
+            if (!remark) {
+                alert("请填写驳回原因！");
+                return
+            }
+            var url = "/manage/merchantStore/rejectAudit/${userId}?errMsg=" + remark;
+            $.get(url, function (res) {
+                if (res.code == 1) {
+                    alert("操作成功！");
+                    $(".reject-title").hide();
+                } else {
+                    alert(res.msg);
+                }
+            })
+        })
+
+    })
+
+    function imgbig(obj) {
+        var imgsrc = $(obj).attr('src');
+        $("#bigimg").css("display", "block");
+        $("#bigimg").html("<img id='prevewImg' src=" + imgsrc + " />");
+    }
+
+    function closeimg() {
+        $("#bigimg").css("display", "none");
+    }
+
+
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/jsp/merchant/auth.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/merchant/auth.jsp
new file mode 100644
index 0000000..fd0bc7a
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/merchant/auth.jsp
@@ -0,0 +1,55 @@
+<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<jsp:include page="../../common.jsp" />
+<title></title>
+</head>
+<body>
+
+<input type="hidden" id="appId" value="${appId }">
+<input type="hidden" id=ali_appid value="${ali_appid }">
+
+
+<script type="text/javascript">
+function GetQueryString(name){
+     var reg = new RegExp("(^|&)"+ name +"=([^&]*)(&|$)");
+     var r = window.location.search.substr(1).match(reg);
+     if(r!=null)return  unescape(r[2]); return null;
+}
+
+/**
+ * 判断是否是微信浏览器
+ */
+function isWeiXin(){
+    var ua = window.navigator.userAgent.toLowerCase();
+    if(ua.match(/MicroMessenger/i) == 'micromessenger'){
+        return true;
+    }else{
+        return false;
+    }
+}
+
+
+
+/**
+ * 业务分流
+ */
+ var uri="${url}";
+ var domain_url = '${domain_wap}';
+ if(uri==''||typeof(uri)=='undefined'){
+    uri=domain_url+"/index";
+ }else{
+     uri=domain_url+uri;
+ }
+var appId=document.getElementById("appId").value;
+var aLi_appId=document.getElementById("ali_appid").value;
+if(isWeiXin()){
+    var jump="https://open.weixin.qq.com/connect/oauth2/authorize?appid="+appId+"&redirect_uri="+encodeURIComponent(uri)+"&response_type=code&scope=snsapi_base&state=123#wechat_redirect";
+    window.location=jump;
+}
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/jsp/merchant/complaint.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/merchant/complaint.jsp
new file mode 100644
index 0000000..bd28d3a
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/merchant/complaint.jsp
@@ -0,0 +1,383 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+         pageEncoding="UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html>
+<jsp:include page="../../common.jsp" />
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta name="viewport"
+          content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <title>交易投诉</title>
+    <script src="${resourcePath}/js/My97DatePicker/WdatePicker.js"></script>
+    <style>
+        *{
+            margin: 0;
+            padding: 0;
+            color: #000;
+        }
+        .container{
+            background-color: #f6f6f65e;
+        }
+        .header {
+            height: 2rem;
+            background-color: #ff2d4b;
+            color: white;
+            display: flex;
+            justify-content: center;
+            text-align: center;
+            align-items: center
+        }
+        .content-wrapper {
+            margin: 1.25rem 1rem;
+            line-height: 2rem;
+        }
+        .body-item{
+            margin-bottom: 1.2rem;
+        }
+        .title {
+            border-left: 4px solid #ff2d4b;
+            padding-left: .8rem;
+            color: #ff2d4b;
+            margin-bottom: .5rem;
+        }
+        .item {
+            display: flex;
+            justify-content: space-between;
+            border-bottom: 1px solid rgba(163, 162, 162, .5);
+        }
+        .item-input{
+            line-height: 1.5rem;
+            font-size: 17px;
+        }
+        .item-textarea{
+            width: 92%;
+            font-size: 15px;
+            line-height: 1rem;
+            padding:.5rem .5rem;
+            border: 1px solid #ddd1d1;
+            color: #707070;
+        }
+        .weui-uploader__input-box{
+            position: relative;
+            height: 135px;
+            border: 1px solid #D9D9D9;
+            width:  135px;
+            margin: 0 0 0 5px;
+        }
+        .weui-uploader__bd{
+            margin-bottom: 0;
+            margin-right: 0;
+        }
+        .footer{
+            line-height: 3rem;
+        }
+        .footer-btn{
+            height: 100%;
+            text-align: center;
+        }
+        .footer-submit-btn{
+            width: 80%;
+            border: 0;
+            height: 1.8rem;
+            /* height: 100%; */
+            border-radius: 20px;
+            background-color: #ff2d4b;
+            color: #fff;
+            font-size: 17px;
+            box-shadow: 1px 1px 10px #797979ed;
+        }
+        .weui-cell{
+            padding: 0;
+        }
+
+        .weui-uploader__files, .weui-uploader__files li, .weui-uploader__input-box {
+            display: inline-block !important;
+            margin: 0;
+            width: 128px;
+            height: 128px;
+        }
+        .img-box {
+            padding-top: 20px;
+        }
+        .img {
+            display: inline-block;
+            width: 130px;
+            height: 130px;
+            /*width: 50%;*/
+            position: relative;
+        }
+        .img img {
+            width: 100%;
+            height: 100%;
+            object-fit: cover;
+        }
+        .img:nth-child(2n) {
+            margin-left: 15px;
+        }
+        .flex{
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+        }
+        .img-max{
+            color: #707070;
+        }
+        .img-count{
+            display: flex;
+        }
+        .title-p{
+            color: #ff2d4b;
+        }
+        .item-input{
+            text-align:right;
+        }
+        .img-del {
+            position: absolute;
+            z-index: 2;
+            top: -10px;
+            right: -10px;
+            width: 18px !important;
+            height: 18px !important;
+
+        }
+</style>
+</head>
+<body>
+    <form id="form">
+        <input type="hidden" name="merchantCode" value="${merchantCode}">
+        <input type="hidden" name="orderNumber" value="${orderNumber}">
+        <div class="container">
+            <header class="header">交易投诉</header>
+            <div class="content-wrapper">
+                <div class="body-item">
+                    <div class="title">投诉商户信息</div>
+                    <div class="item">
+                        <div class="item-name">商户名称</div>
+                        <div class="item-value">
+                            <input type="text" name="merchantName" class="item-input" value="${mercName}" readonly maxlength="15"  autocomplete="off" placeholder="请输入投诉商户名称" >
+                        </div>
+                    </div>
+                    <c:if test="${not empty mercPhone}">
+                        <div class="item">
+                            <div class="item-name">商户电话</div>
+                            <div class="item-value">
+                                <input type="text" class="item-input" value="${mercPhone}" readonly placeholder="请输入投诉商家联系方式" autocomplete="off" maxlength="11" >
+                            </div>
+                        </div>
+                    </c:if>
+                </div>
+                <div class="body-item">
+                    <div class="title">订单信息</div>
+                    <div class="item">
+                        <div class="item-name">订单金额</div>
+                        <div class="item-value">
+                            <input type="number" name="orderAmt" class="item-input" maxlength="10"  autocomplete="off" placeholder="请输入投诉订单金额">
+                        </div>
+                    </div>
+                    <div class="item">
+                        <div class="item-name">交易时间</div>
+                        <div class="item-value">
+                            <input type="text" name="payTime" readonly id="payTime" class="item-input"  autocomplete="off" onclick="WdatePicker({el:this,dateFmt:'yyyy-MM-dd HH:mm'})" placeholder="请选择交易时间">
+                            <img onclick="WdatePicker({el:'payTime',dateFmt:'yyyy-MM-dd HH:mm'})" src="${resourcePath}/js/My97DatePicker/skin/datePicker.gif" width="16" height="22" style="cursor:pointer" align="absmiddle">
+                        </div>
+                    </div>
+                </div>
+
+                <div class="body-item">
+                    <div class="title">投诉人联系方式</div>
+                    <div class="item">
+                        <div class="item-name">手机号</div>
+                        <div class="item-value">
+                            <input type="number" name="complaintPhone" class="item-input" placeholder="您的联系方式，方便核实" autocomplete="off" maxlength="11" />
+                        </div>
+                    </div>
+                </div>
+
+                <div class="body-item">
+                    <div class="title">投诉内容</div>
+                    <div class="item-group">
+                        <div class="item-value">
+                            <textarea name="remark" cols="20" rows="8" maxlength="500" autocomplete="off" class="item-textarea"></textarea>
+                        </div>
+                    </div>
+                    <div class="title flex">
+                        <p class="title-p">上传交易账单及被骗截图</p>
+                        <div class="img-count"><span id="uploadCount" class="img-now-count">0</span>/<span id="img-max" class="img-max">8</span></div>
+                    </div>
+                    <div class="item-group">
+                        <div class="item-name"></div>
+                        <div class="item-value">
+                            <div class="weui-uploader__bd">
+                                <ul class="img-box">
+                                    <li class="img" id="img-add">
+                                        <div class="weui-uploader__input-box">
+                                            <input id="uploaderInput" class="weui-uploader__input" type="file"  accept="image/jpg,image/jpeg,image/png,image/gif"  multiple="">
+                                        </div>
+                                    </li>
+                                </ul>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <footer class="footer">
+                <div class="footer-btn">
+                    <button class="footer-submit-btn" id="submit">提交投诉</button>
+                </div>
+            </footer>
+        </div>
+    </form>
+</body>
+<script>
+    $(function (){
+        let allowTypes = ['image/jpg', 'image/jpeg', 'image/png', 'image/gif'];
+        let maxSize = 1024 * 1024*5; //5M
+        let maxCount = 8;
+        let maxWidth = 1900;  // 图片最大宽度
+        let $uploaderFiles = $('#img-add');
+        $("#img-max").text(maxCount);
+        // let imageArr = [];
+        let tmpl = `<li class="img" data-index="#index#">
+            <img class="img-li" src="#url#" alt="">
+            <img class="img-del" src="${resourcePath}/images/icon-del.png" />
+            </li>`
+        $("#uploaderInput").on("change", function (e) {
+            files = e.target.files;
+            // 如果没有选中文件，直接返回
+            if (files.length === 0) {
+                return;
+            }
+            let nowCount = $("#uploadCount").text();
+            if (files.length + parseInt(nowCount) > maxCount) {
+                $.alert('最多只能上传' + maxCount + '张图片',"系统提示");
+                return;
+            }
+            for (let i = 0, len = files.length; i < len; ++i) {
+                let file = files[i];
+                // let imgID = new Date().getTime()+randomNum(1000,9999);
+                let reader = new FileReader();
+                let fileType = file.type;
+                // 如果类型不在允许的类型范围内
+                let fileName = file.name;
+                let suffix = fileName.substr(fileName.lastIndexOf(".")+1,fileName.length);
+                if (allowTypes.indexOf(file.type) === -1) {
+                    $.alert('该类型不允许上传' + fileType,"系统提示");
+                    continue;
+                }
+
+                if (file.size > maxSize) {
+                    $.alert("图片太大，不允许上传！","系统提示");
+                    continue;
+                }
+                reader.onload = function (e) {
+                    var img = new Image();
+                    img.onload = function () {
+                        // 不要超出最大宽度
+                        let w = Math.min(maxWidth, img.width);
+                        // 高度按比例计算
+                        let h = img.height * (w / img.width);
+                        let canvas = document.createElement('canvas');
+                        let ctx = canvas.getContext('2d');
+                        // 设置 canvas 的宽度和高度
+                        canvas.width = w;
+                        canvas.height = h;
+                        ctx.drawImage(img, 0, 0, w, h);
+                        let base64 = canvas.toDataURL(fileType,0.6); //0.6指的是压缩60%
+                        $uploaderFiles.before($(tmpl.replace('#url#', base64).replace('#index#', i)));
+                        let num = $('.img-li').length;
+                        $('#uploadCount').text(num);
+                        if($('.img-li').length == maxCount){
+                            $("#img-add").hide();
+                        }
+                        if(suffix == "jpg"){
+                            suffix = "jpeg";
+                        }
+                    };
+                    img.src = e.target.result;
+                };
+                reader.readAsDataURL(file);
+            }
+        });
+        // 删除图片
+        $(document).on('click', '.img-del', function () {
+            $("#uploadCount").text(parseInt($("#uploadCount").text())-1)
+            $(this).parent().remove();
+            if($('.img-li').length < maxCount){
+                $("#img-add").show();
+            }
+        })
+        $("#submit").on("click",function (){
+            let $data = serialize($("#form"));
+            if(!$data.orderAmt){
+                $.alert("投诉订单金额不能为空！","系统提示");
+                return false;
+            }
+            if(!$data.payTime){
+                $.alert("投诉订单交易时间不能为空！","系统提示");
+                return false;
+            }
+            if(!$data.complaintPhone){
+                $.alert("投诉人联系方式不能为空！","系统提示");
+                return false;
+            }
+            let flag = checkPhone($data.complaintPhone);
+            if(!flag){
+                $.alert("手机号码有误，请重填","系统提示");
+                return false;
+            }
+            if(!$data.remark){
+                $.alert("投诉内容不能为空！","系统提示");
+                return false;
+            }
+            let imgd = $(".img-li");
+            if(imgd.length <= 0){
+                $.alert("请上传交易账单以及被骗的相关截图！","系统提示");
+                return false;
+            }
+            let imageArr = [];
+            imgd.each(function (){
+                let $base64 = $(this).attr("src");
+                imageArr.push($base64.replace("data:image/jpeg;base64,","").replace("data:image/png;base64,","").replace("data:image/jpg;base64,",""));
+            })
+            $data.imageList = imageArr;
+            let url = ctx + "/merchant/complaint/save";
+            $.showLoading("提交中...");
+            $.ajax({
+                url:url,
+                type:"post",
+                dataType:'json',
+                traditional:true,
+                data:$data,
+                success:(res)=>{
+                    $.hideLoading();
+                    $.alert(res.message,"系统提示");
+                }
+            })
+            return false;
+        })
+    })
+    function randomNum(minNum,maxNum){
+        switch(arguments.length){
+            case 1:
+                return parseInt(Math.random()*minNum+1,10);
+                break;
+            case 2:
+                return parseInt(Math.random()*(maxNum-minNum+1)+minNum,10);
+                break;
+            default:
+                return 0;
+                break;
+        }
+    }
+    function checkPhone(phone){
+        if(!(/^1(3|4|5|6|7|8|9)\d{9}$/.test(phone))){
+            return false;
+        }
+        return true;
+    }
+    function dateClick(){
+
+    }
+</script>
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/jsp/merchant/error.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/merchant/error.jsp
new file mode 100644
index 0000000..b7eccae
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/merchant/error.jsp
@@ -0,0 +1,36 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> 
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<%@ taglib prefix="shiro" uri="http://shiro.apache.org/tags" %>
+<html>
+    <head>
+        <title>支付</title>
+        <jsp:include page="../../common.jsp" />
+        <script type="text/javascript" src="https://www.shouyinbei.net/resources/wap/js/json2.js"></script>
+        <link rel="stylesheet" href="https://www.shouyinbei.net/resources/wap/css/reset.css">
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+       <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="viewport"
+    content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    </head>
+
+<body style="background:#fff;">
+        <div class="content whitebg ml02 mr02">
+            <div class="textc">
+        </div>
+        <div class="textc f4 mt03 bdbc pb03"></div>
+        <div class="gray f3 mt05"><span class="ml02 mr02">${message}</span></div>
+        <div class="mt04 ml02 mr02 pb01 box">
+        
+        </div>
+        </div>
+        <input type="hidden" id="timestamp" value=${timestamp }>
+        <input type="hidden" id="nonceStr" value=${nonceStr }>
+        <input type="hidden" id="signature" value=${signature }>
+        <input type="hidden" id="appId" value=${appId }>
+        <input type="hidden" id="merchantCode" value=${merchantCode }>
+        <input type="hidden" id="cardId" value=${cardId }>
+    </body>
+
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/jsp/merchant/errorInfo.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/merchant/errorInfo.jsp
new file mode 100644
index 0000000..5303b12
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/merchant/errorInfo.jsp
@@ -0,0 +1,31 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html>
+<jsp:include page="../../common.jsp" />
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="viewport"
+    content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+<title>提示</title>
+</head>
+  <body style="background:#ffff;">
+        <div class="login_form ml20 mr20 mt50">
+            <form method="post">
+                <div class="weui-cells weui-cells_form mt50 tcenter">   
+                    <div class=" f55 white dlblock radiusp50 padding15">
+                        <img src="${resourcePath}/images/bg_error_msg.png" width="100" height="100">
+                    </div>
+                    <div  style="font-weight: 700;color: #000000;font-size: 15px;text-align: center;">
+                        ${error}
+                    </div>
+                </div>
+               <%--  <div class="btn mt50">
+                    <a href="${ctx }/vip/myVIPCard?storeId=${storeId}" class="weui-btn weui-btn_primary radius10 f16 pt10 pb10">确定</a>
+                </div> --%>
+            </form>
+        </div>
+    </body>
+
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/jsp/merchant/errorInfo2.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/merchant/errorInfo2.jsp
new file mode 100644
index 0000000..fa6ecaa
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/merchant/errorInfo2.jsp
@@ -0,0 +1,59 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+         pageEncoding="UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html>
+<jsp:include page="../../common.jsp" />
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta name="viewport"
+          content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <title>提示</title>
+    <style>
+        .footer{
+            text-align: center;
+            position: fixed;
+            bottom: 30%;
+            width: 100%;
+            color: #000;
+        }
+        .complaint{
+            color: red;
+        }
+    </style>
+</head>
+<body style="background:#ffff;">
+<div class="page-title tcenter bluebg white h40 white positionr">
+    <div>
+        <span>提示</span>
+    </div>
+</div>
+<div class="login_form ml20 mr20 mt50">
+    <form method="post">
+        <div class="weui-cells weui-cells_form mt50 tcenter">
+            <div class=" f55 white dlblock radiusp50 padding15">
+                <img src="${resourcePath}/images/error_img.png" width="100" height="100">
+            </div>
+            <div class="mt30" style="font-weight: 700;color: #000000;font-size: 23px;text-align: center;">
+                ${error}
+            </div>
+        </div>
+    </form>
+</div>
+<c:if test="${not empty token }">
+    <div class="footer">
+        <div class="footer-content">
+            如遭遇诈骗或交易纠纷，<a href="javascript:void(0)" id="complaint" class="complaint">请点此投诉</a>
+        </div>
+    </div>
+</c:if>
+</body>
+<script>
+  $("#complaint").on("click",()=>{
+      let $token = '${token}';
+      if($token){
+          window.location.href = ctx + "/merchant/complaint/"+$token
+      }
+  })
+</script>
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/jsp/merchant/goMemberPay.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/merchant/goMemberPay.jsp
new file mode 100644
index 0000000..589bd79
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/merchant/goMemberPay.jsp
@@ -0,0 +1,134 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> 
+<jsp:include page="../../common.jsp" />
+  <head>
+        <meta charset="utf-8">
+        <title></title>
+        <meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=0">
+        <title>会员卡充值</title>
+        <style>
+            .h40{
+                height:40px;
+                line-height:40px;
+            }
+        </style>
+    </head>
+<!doctype html>
+    <body class="">
+        <div class="bluebg pt20 pb15 positionr mt20 ml20 mr20 pl10 pr10 positionr radius5" style="min-height:150px;">
+            <div class="weui-flex">
+                   <div class="weui-flex__item white">
+                       <div class="f14 mb10">${merchantMenber.nickName }</div>
+                        <div class="f14">${merchantMenber.memberCode }</div>
+                  </div>
+                  <div class="weui-flex__item white tright">
+                      收银就用收银呗
+                  </div>  
+            </div>
+            <div class="f14 pt20 white">
+            
+            
+            <c:if test="${not empty activityRechargeList }">
+            <div class="mb10">
+                <span class="icon icon-18 f14 vm"></span><span class="vm ml10">
+                <c:forEach var="activityRecharge" items="${activityRechargeList }">
+                    充<fmt:formatNumber type="number" value="${activityRecharge.rechargeMoney }" pattern="0.00" maxFractionDigits="2"/> 送<fmt:formatNumber type="number" value="${activityRecharge.giveMoney}" pattern="0.00" maxFractionDigits="2"/>；
+                </c:forEach>
+                </span>
+            </div>
+        </c:if>
+       
+            
+            
+                <!--   <div class="mb10"><span class="icon icon-18 f14 vm"></span><span class="vm ml10">充100送1；充200送2；充300送3</span></div>
+                  <div class="mb10"><span class="icon icon-18 f14 vm"></span><span class="vm ml10">消费2返2</span></div>
+                  <div class="mb10"><span class="icon icon-18 f14 vm"></span><span class="vm ml10">激活会员送100</span></div> -->
+                
+                <div class="tright positiona bottom0 right0 pr20 pb15 pr10">
+                        <span class="vm"><img src="https://www.shouyinbei.net/resources/wap/images/wollet.png" width="20"></span>
+                        <span class="vm">钱包</span>
+                        <span class="f28 vm"><fmt:formatNumber type="number" value="${merchantMenber.usableRechargeFee + merchantMenber.usableGiveFee }" pattern="0.00" maxFractionDigits="2"/></span>
+                </div> 
+            </div>
+        </div>
+        <div class="weui-cells weui-cells_form bdbe ml20 mr20">
+            <div class="weui-cell weui-cell_warn">
+                <div class="weui-cell__hd"><label for="" class="weui-label f-black f22">¥</label></div>
+                <div class="weui-cell__bd">
+                    <input class="weui-input tright" type="number" pattern="[0-9]*" id="rechargeMoney" value="weui input error" placeholder="请输入充值金额(元)">
+                </div>
+            </div>
+        </div>
+       <div class="weui-cells weui-cells_form bdbe pb20">
+            <div class="tcenter clearfix payTab">
+                <div class="f16 fl tcenter pt20 wp33 current">
+                    <a href="javascript:void(0);" class="dblock radius5 pt10 pb10 ml10 mr10">200元</a>
+                </div>
+                <div class="f16 fl tcenter pt20 wp33">
+                    <a href="javascript:void(0);" class="dblock radius5 pt10 pb10 ml10 mr10">150元</a>
+                </div>
+                <div class="f16 fl tcenter pt20 wp33">
+                    <a href="javascript:void(0);" class="dblock radius5 pt10 pb10 ml10 mr10">50元</a>
+                </div>
+                <c:forEach items="${activityRechargeList }" var="activityRecharge">
+                     <div class="f16 fl tcenter pt20 wp33">
+                    <a href="javascript:void(0);" class="dblock radius5 pt10 pb10 ml10 mr10">${activityRecharge.rechargeMoney }元送${activityRecharge.giveMoney }元</a>
+                </div>
+                </c:forEach>
+            </div>
+        </div>
+        <div class="btn mt20 ml20 mr20">
+            <a href="javascript:void(0);onclick=memberPay()" class="weui-btn weui-btn_primary radius10 f14 pt15 pb15">立即充值</a>
+        </div>
+        <script>
+             $(function(){
+                 $(".payTab>div").click(function(){
+                     $(this).addClass("current").siblings("div").removeClass("current");
+                     var a=$(".current a").text();
+                     var money=a.split('元');
+                     var rechargeMoney=money[0];
+                     $("#rechargeMoney").val(rechargeMoney);
+                 })
+             })
+             
+             function memberPay(){
+            	 var rechargeMoney=$("#rechargeMoney").val();
+            	 if(StringUtil.isNotTwo(rechargeMoney)){
+                     if(StringUtil.isBlank(rechargeMoney)){
+                     alert("请输入金额");
+                     return;
+                     }
+                     alert('请输入正确的金额格式(正整数或小数)');
+                     return;
+                 }
+                 if(StringUtil.isNotBlank(rechargeMoney)){
+                     if(rechargeMoney<0.01){
+                         alert('充值金额必须大于0.01');
+                         return;
+                     }
+                 }
+            	 $.ajax({
+            		 url:ctx+'/merchant/memberPay',
+            		 data:{
+            			 "consumeMoney":rechargeMoney,
+            			 'openId':'${merchantMenber.openid}',
+            			 'merchantCode':'${merchantMenber.merchantCode}',
+            			 'storeId':'${merchantMenber.storeId}',
+            		 },
+            		 dataType:"json",
+            		 type:"post",
+            		 success:function(res){
+            			if(res.code=='1'){
+            				window.location = res.jspay_url;
+            			}else{
+            				$.toast(res.msg,"text");
+            			}
+            		 }
+            	 })
+             }
+        </script>
+    </body>
+
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/jsp/merchant/goUpgradePage.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/merchant/goUpgradePage.jsp
new file mode 100644
index 0000000..03684e4
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/merchant/goUpgradePage.jsp
@@ -0,0 +1,260 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> 
+<!DOCTYPE html>
+<html>
+<jsp:include page="../../common.jsp" />
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <title>升级充值</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <script type="text/javascript" src="https://www.shouyinbei.net/resources/wap/js/jquery.min.js"></script>
+    <!-- 引入样式 -->
+    <link rel="stylesheet" href="http://unpkg.com/vue-ydui/dist/ydui.rem.css">
+    <!-- 引入rem自适应类库 -->
+    <script src="http://unpkg.com/vue-ydui/dist/ydui.flexible.js"></script>
+    <script src="https://gw.alipayobjects.com/as/g/h5-lib/alipayjsapi/3.1.1/alipayjsapi.min.js"></script>
+    <style>
+        .body,html{
+            margin: 0;
+            padding: 0;
+            font-family: 微软雅黑, 宋体, Arial;
+        }
+        .center-top{
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            height: 200px;
+        }
+     .yd-navbar-center-title,.yd-back-icon{
+         color: #fff !important;
+     }
+     .center{
+         margin-top: 20px;
+         padding: 20px;
+         background-color: #eee;
+     }
+     .chong{
+       width: 150px;
+       margin: 0 auto;
+     }
+     .b{
+         width: 100%;
+         height: 200px;
+         font-size: 20px;
+         font-family: 微软雅黑, 宋体, Arial;
+     }
+     .btn{
+        margin-top: 40px;
+        width: 100%;
+        height: 40px;
+        background-color: #f96a4f;
+        color:#fff;
+        border-radius: 5px;
+        border: 0;
+     }
+    .backdrop {
+        position: fixed;
+        z-index: 998;
+        top: 0;
+        right: 0;
+        bottom: 0;
+        left: 0;
+        background-color: rgba(0,0,0,.1);
+    }
+    </style>
+</head>
+<body>
+<div id='loading' class="backdrop" style="display: none; padding-top: 70%; text-align: center;">
+    <div>
+        <img src="${resourcePath}/images/loading-2.gif" alt="loading" />
+    </div>
+    <div style="font-family:'Microsoft YaHei';color:#000000;font-size: 0.5rem;">支付中...</div>
+    <!--自己放loding图片-->
+</div>
+
+<div id="app">
+        <yd-navbar title="充值" style="background-color: #f96a4f;">
+            <a to="#" slot="left">
+                <yd-navbar-back-icon></yd-navbar-back-icon>
+             </a>
+        </yd-navbar>
+         <c:if test="${level eq '1'}">
+        <div class="center-top">
+            <img class="b" src="https://www.shouyinbei.net/resources/images/levelLogo.png" alt="">
+        </div>
+        </c:if>
+        
+         <c:if test="${level eq '2'}">
+         <div class="center-top">
+            <img class="b" src="https://www.shouyinbei.net/resources/images/levellogo1.png" alt="">
+        </div>
+        </c:if>
+        
+        <c:if test="${level eq '1'}">
+	        <div class="center">
+	                    <div class="chong">
+	                        <span style="font-size: 16px;" >充值金额:<b id="a">${twoUpVipAmount}</b>元</span>
+	                    </div>
+	                    <button class="btn" onclick="setFocusHander()">立即充值</button>
+	            </div>
+            </c:if>
+            <c:if test="${level eq '2'}">
+            <div class="center">
+                        <div class="chong">
+                            <span style="font-size: 16px;" >充值金额:<b id="a">${threeUpVipAmount}</b>元</span>
+                        </div>
+                        <button class="btn" onclick="setFocusHander()">立即充值</button>
+                </div>
+            </c:if>
+
+        <input type="hidden" id="userAppId"  value="${userAppId}">
+        <input type="hidden" id="payType"  value="${payType}">
+        <input type="hidden" id="userid"  value="${userid}">
+        <input type="hidden" id="openid"  value="${openid}">
+            
+</div>
+<!-- 引入 Vue -->
+<script src="http://unpkg.com/vue"></script>
+<!-- 引入组件库 -->
+<script src="http://unpkg.com/vue-ydui/dist/ydui.rem.js"></script>
+<!-- <script src="https://unpkg.com/axios/dist/axios.min.js"></script> -->
+<script>
+function isWeiXin(){
+    var ua = window.navigator.userAgent.toLowerCase();
+    if(ua.match(/MicroMessenger/i) == 'micromessenger'){
+        return true;
+    }else{
+        return false;
+    }
+}
+function isAlipay() {
+    var ua = window.navigator.userAgent.toLowerCase();
+    if(ua.match(/Alipay/i) == "alipay"){
+        return true;
+    }else{
+        return false;
+    }
+}
+function setFocusHander(){
+	var money=$("#a").text();
+	var userAppId=$("#userAppId").val();
+	var payWay=$("#payType").val();
+    var userid=$("#userid").val();
+    var openid=$("#openid").val();
+    if(userAppId == "" || userAppId == null || userAppId == undefined){ // "",null,undefined
+        alert("用户id不能为空！");
+        return;
+    }
+    if(money == "" || money == null || money == undefined){ // "",null,undefined
+        alert("金额不能为空！");
+        return;
+    }
+    $('#loading').css('display','block');
+    $.ajax({
+        url:ctx + '/merchant/upGradePay',
+        data:{
+             "userAppId": userAppId,
+             "money": money,
+             "payWay": payWay,
+             "level":${level},
+             "userid":userid,
+             "openid":openid,
+        },
+        dataType:"json",
+        type:"post",
+        success:function(res){
+            $('#loading').css('display','none');
+            if(res.code=='1'){
+                var rdata = res.data;
+                if("WXZF" == payWay){
+                    WeixinJSBridge.invoke('getBrandWCPayRequest', {
+                        // 商品名称
+                        "appId" : rdata.payAppId,
+                        "timeStamp" : rdata.payTimeStamp,
+                        "nonceStr" : rdata.paynonceStr,
+                        "package" : rdata.payPackage,
+                        "signType" : rdata.paySignType,
+                        "paySign" : rdata.paySign,
+                    }, function(res) {
+                        if (res.err_msg == "get_brand_wcpay_request:ok") {
+                            //成功之后跳转地址
+                            window.location = ctx + '/merchant/paySuccess';
+                        } else {
+                            alert("支付失败");
+                        }
+                    })
+                }else if("ZFBZF" == payWay){
+                    var reg=/^([hH][tT]{2}[pP]:\/\/|[hH][tT]{2}[pP][sS]:\/\/)(([A-Za-z0-9-~]+).)+([A-Za-z0-9-~\/])+$/;
+                    if(reg.test(rdata.source)){
+                        window.location = rdata.source;
+                    }else{
+                        ap.tradePay({
+                            tradeNO : rdata.source
+                        }, function(res) {
+                            if (res.resultCode == '9000') {
+                                window.location = ctx + '/merchant/paySuccess'; //订单支付成功
+                            } else if (res.resultCode == '8000') {
+                            } else if (res.resultCode == '4000') {
+                                ap.alert("订单支付失败");
+                            } else if (res.resultCode == '6001') {
+                            } else if (res.resultCode == '6002') {
+                                ap.alert("网络连接出错");
+                            }
+                        });
+                    }
+                }else{
+                    window.location = rdata.redirectUrl;
+                }
+            }else{
+                alert(res.msg);
+            }
+        }
+    })
+}
+
+
+   /*  new Vue({
+        el: '#app',
+        data:{
+            input10:''
+        },
+        mounted(){
+        	var money=this.$refs.a.innerHTML;
+        	console.log(this.$refs.b.value)
+        },
+        methods: {
+        	setFocusHander: function (){
+            	var money=this.$refs.a.innerHTML;
+            	var userId=this.$refs.b.value;
+            	var payWay='';
+            	if(isWeiXin()){
+            		payWay='WXZF';
+            	}else{
+            		payWay='ZFBZF';
+            	}
+            	$.ajax({
+            		url:'/wap/wechat/leshuaPay',
+            		data:{
+            			 "userId": userId,
+                         "money": money,
+                         "payWay": payWay,
+            		},
+            		dataType:"json",
+            		type:"post",
+            		success:function(res){
+            			if(res.code=='1'){
+            				window.location=res.jspay_url;
+            			}else{
+            				alert(res.msg);
+            			}
+            		}
+            	})
+            },
+        }
+    }) */
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/jsp/merchant/index.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/merchant/index.jsp
new file mode 100644
index 0000000..1fa79f9
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/merchant/index.jsp
@@ -0,0 +1,893 @@
+<%@ page contentType="text/html; charset=UTF-8"
+		 pageEncoding="UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<c:set var="ctx" value="${pageContext.request.contextPath}"  scope="request"/>
+<c:set var="resourcePath" value="${ctx}/resources"  scope="request"/>
+<!DOCTYPE html>
+<html>
+<link rel="stylesheet" href="${resourcePath}/css/weui.css">
+<link rel="stylesheet" href="${resourcePath}/css/weuix.css">
+<%--<script type="text/javascript" src="${resourcePath}/js/zepto.min.js"></script>--%>
+<%--<script type="text/javascript" src="${resourcePath}/js/zepto.weui.js"></script>--%>
+<script type="text/javascript" src="${resourcePath}/js/swiper.min.js"></script>
+<script type="text/javascript" src="${resourcePath}/js/utils/StringUtil.js"></script>
+<%--<script type="text/javascript" src="${resourcePath}/js/utils/DateUtil.js"></script>--%>
+<%--<script type="text/javascript" src="${resourcePath}/js/global.js"></script>--%>
+<%--<link href="https://www.shouyinbei.net/resources/wap/css/weui.min.css" type="text/css" rel="stylesheet" />--%>
+<script src="https://www.shouyinbei.net/resources/js/alipayjsapi.min3.1.1.js"></script>
+<script src="${resourcePath}/js/third-party/jquery/jquery-1.11.0.min.js"></script>
+<%--<script src="https://cdn.bootcss.com/vConsole/3.3.4/vconsole.min.js"></script>--%>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="viewport"
+	content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+<title>向商家付款</title>
+
+<style type="text/css">
+	.logo {
+		margin: 2vw !important;
+		line-height: 1;
+		height: 10vw;
+		position: relative;
+	}
+
+	.logo img {
+		margin: 0;
+		height: 10vw;
+		border-radius: 50%;
+	}
+
+	.logo div.title {
+		position: absolute;
+		margin-left: 2vw;
+		display:inline-block;
+		height: 100%;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+		text-align: left;
+		line-height: 10vw;
+		font-size: 5vw;
+		right: 64px;
+		left: 36px;
+	}
+
+	.logo div.right {
+		right: 0;
+		font-size: 4vw;
+		display: inline-block;
+		color: #df6051;
+		line-height: 10vw;
+		position: relative;
+	}
+
+	.item {
+		height: 80px;
+		padding: 5px 20px;
+	}
+
+	.shangLogo {
+		width: 30%;
+		height: 100%;
+		position: relative;
+		float: left;
+	}
+
+	.bs {
+		padding: 0 10px;
+		border-bottom: none;
+	}
+
+	.shouyin {
+		text-align: center;
+		left: 50%;
+		padding: 7px;
+		background-color: #f8f8f8;
+		color: #000;
+		font-size: 12px;
+		border-bottom: white solid 1px;
+	}
+
+	.gongsi p {
+		width: 100%;
+		height: 120px;
+		line-height: 120px;
+		text-align: center;
+	}
+
+	.mt40 {
+		margin-top: 40px;
+	}
+
+	.moneyPay {
+		padding-left: 30px;
+		background: url(../resources/images/bankcard.png) no-repeat left
+	}
+
+	.weui-cell {
+		justify-content: space-between;
+	}
+
+	.weui-cell:before {
+		border-top: 0;
+	}
+
+	.weui-cells:after {
+		border-bottom: 0;
+	}
+
+	.weui-cells:before {
+		border-top: 0;
+	}
+	.vm {
+		vertical-align: center;
+		padding: 10px 0;
+	}
+
+	.submit, .del {
+		padding: 0 !important;
+
+	}
+	.weui-footer_fixed-bottom {
+		bottom: 0;
+		-webkit-user-select: none;
+		-moz-user-select: none;
+	}
+
+	.showKeyBoard {
+		animation: showKeyBoard 200ms;
+		-moz-animation: showKeyBoard 200ms;
+		-webkit-animation: showKeyBoard 200ms;
+		-o-animation: showKeyBoard 200ms;
+
+		-webkit-animation-fill-mode: forwards;
+		-moz-animation-fill-mode: forwards;
+		-o-animation-fill-mode: forwards;
+		animation-fill-mode: forwards;
+	}
+
+	.hiddenKeyBoard {
+		animation: hiddenKeyBoard 200ms;
+		-moz-animation: hiddenKeyBoard 200ms;
+		-webkit-animation: hiddenKeyBoard 200ms;
+		-o-animation: hiddenKeyBoard 200ms;
+
+		-webkit-animation-fill-mode: forwards;
+		-moz-animation-fill-mode: forwards;
+		-o-animation-fill-mode: forwards;
+		animation-fill-mode: forwards;
+	}
+
+	.weui-btn+.weui-btn {
+		margin: 0;
+	}
+
+	.weui-btn+.weui-cell {
+		padding: 15px;
+	}
+
+	.weui-btn {
+		border-radius: 0 !important;
+		border: 0 !important;
+		font-size: 22px;
+	}
+
+	.weui-btn:after {
+		border-radius: 0 !important;
+		border: 1px solid white;
+	}
+	.f-submit{
+	    line-height: 50px;
+	}
+
+	/*input::-webkit-input-placeholder { !* WebKit browsers 适配谷歌 *!*/
+	/*	color: #000;*/
+	/*}*/
+	/*input:-moz-placeholder { !* Mozilla Firefox 4 to 18 适配火狐 *!*/
+	/*	color: #000;*/
+	/*}*/
+	/*input::-moz-placeholder { !* Mozilla Firefox 19+ 适配火狐 *!*/
+	/*	color: #000;*/
+	/*}*/
+	/*input:-ms-input-placeholder { !* Internet Explorer 10+  适配ie*!*/
+	/*	color: #000;*/
+	/*}*/
+
+	img {
+		pointer-events:none;/* 禁止长按图片保存 */
+	}
+
+	/* 隐藏键盘动画 */
+	@keyframes hiddenKeyBoard
+	{
+		from {bottom: 0;}
+		to {bottom: -224px;}
+	}
+
+	@-moz-keyframes hiddenKeyBoard /* Firefox */
+	{
+		from {bottom: 0;}
+		to {bottom: -224px;}
+	}
+
+	@-webkit-keyframes hiddenKeyBoard /* Safari and Chrome */
+	{
+		from {bottom: 0;}
+		to {bottom: -224px;}
+	}
+
+	@-o-keyframes hiddenKeyBoard /* Opera */
+	{
+		from {bottom: 0;}
+		to {bottom: -224px;}
+	}
+
+	/* 弹出键盘动画 */
+	@keyframes showKeyBoard
+	{
+		from {bottom: -224px;}
+		to {bottom: 0;}
+	}
+
+	@-moz-keyframes showKeyBoard /* Firefox */
+	{
+		from {bottom: -224px;}
+		to {bottom: 0;}
+	}
+
+	@-webkit-keyframes showKeyBoard /* Safari and Chrome */
+	{
+		from {bottom: -224px;}
+		to {bottom: 0;}
+	}
+
+	@-o-keyframes showKeyBoard /* Opera */
+	{
+		from {bottom: -224px;}
+		to {bottom: 0;}
+	}
+	.backdrop {
+		position: fixed;
+		z-index: 998;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		left: 0;
+		background-color: rgba(0,0,0,.1);
+	}
+</style>
+</head>
+<body style="background: #fff;">
+	<div id='loading' class="backdrop" style="display: none; padding-top: 70%; text-align: center;">
+		<div>
+			<img src="${resourcePath}/images/loading-2.gif" alt="loading" />
+		</div>
+		<div style="font-family:'Microsoft YaHei';color:#000000;font-size: 1rem;">支付中...</div>
+		<!--自己放loding图片-->
+	</div>
+	<!-- <div class="page-title tcenter h40 bluebg white">
+            <span>收银呗</span>
+        </div> -->
+	<div class="logo" style="margin: 10px;">
+		<img src="https://www.shouyinbei.net/resources/images/syblogo.png" />
+		<div class="title" style="color:black;">${storeName}</div>
+		<div class="right" onclick="showRemarkDialog()">
+			添加备注
+		</div>
+	</div>
+<%--	<div class="tcenter">--%>
+<%--		<img src="https://www.shouyinbei.net/resources/images/merchant.png"--%>
+<%--			style="height: 30px; width: 30px" class="vm">--%>
+<%--	</div>--%>
+	<div class="weui-cells weui-cells_form bs" style="margin-top: 30px">
+		<div class="weui-cell weui-cell_warn bdbe" style="background-color: #f8f8f8; border-radius: 5px;">
+			<div class="weui-cell__hd">
+				<label class="weui-label f-black f26">金额</label>
+			</div>
+			<div class="weui-cell__bd">
+				<input class="weui-input f26 tright" name="comsumeMoney"
+					id="comsumeMoney" value="" placeholder="¥0.00"
+					style="color: #000;">
+			</div>
+		</div>
+
+		<div class="weui-cells weui-cells_form" style="margin-top: 10px;">
+			<c:if test="${payType eq 'wx'}">
+				<div class="weui-cell weui-cell_warn">
+					<div class="weui-cell__hd">
+						<span class="icon icon-14 f26 vm f-green"></span>
+						<span class="f-black f18 ml10">微信支付</span>
+					</div>
+					<div class="weui-cells_checkbox">
+						<label class="weui-check__label" style="padding: 0;">
+							<div class="weui-cell__hd">
+								<input type="radio" class="weui-check" name="radio1"
+									   value="weixinPay" checked="checked"> <i
+									class="weui-icon-checked"></i>
+							</div>
+						</label>
+					</div>
+				</div>
+<%--				<c:if test="${isMember eq  '1'}">--%>
+<%--					<div class="weui-cell weui-cell_warn">--%>
+<%--						<div class="weui-cell__hd">--%>
+<%--							<span class="icon icon-42 f26 vm "></span>--%>
+<%--							<span class="f-black f18 ml10">会员卡支付</span>--%>
+<%--							<span class="weui-cell__hd f16" style="color: #ccc;">--%>
+<%--								<c:forEach items="${activityRechargeList }" var="activityRecharge">--%>
+<%--								  充${activityRecharge.rechargeMoney }送${activityRecharge.giveMoney}--%>
+<%--								</c:forEach>--%>
+<%--							</span>--%>
+<%--						</div>--%>
+
+<%--						<div class="weui-cells_checkbox">--%>
+<%--							<label class="weui-check__label" style="padding: 0;">--%>
+<%--								<div class="weui-cell__hd">--%>
+<%--									<input type="radio" class="weui-check" name="radio1"--%>
+<%--										value="memberPay"> <i class="weui-icon-checked"></i>--%>
+<%--								</div>--%>
+<%--							</label>--%>
+<%--						</div>--%>
+<%--					</div>--%>
+<%--					<div class="weui-cell weui-cell_warn">--%>
+<%--						<div class="weui-cell__hd">--%>
+<%--							<span class="f18 ml10" style="color:#bbb;">会员卡余额:<fmt:formatNumber type="number" value="${balance}" pattern="0.00" maxFractionDigits="2"/></span>--%>
+<%--						</div>--%>
+
+<%--						<div class="weui-cell__hd">--%>
+<%--							<a href="javascript:void(0)" onclick="goMemberPay()" style="color:#FF586A;" class="f16 mr10">充值</a>--%>
+<%--						</div>--%>
+<%--					</div>--%>
+<%--				</c:if>--%>
+<%--				<c:if test="${isMember ne  '1'}">--%>
+<%--					<div class="weui-cell weui-cell_warn">--%>
+<%--						<div class="weui-cell__hd">--%>
+<%--							<span class="icon icon-42 f26 vm "></span>--%>
+<%--							<span class="f-black f18 ml10">会员卡支付</span>--%>
+<%--							<span class="weui-cell__hd f16" style="color: #ccc;">--%>
+<%--								<c:forEach items="${activityRechargeList }" var="activityRecharge">--%>
+<%--									充${activityRecharge.rechargeMoney }送${activityRecharge.giveMoney}--%>
+<%--								</c:forEach>--%>
+<%--							</span>--%>
+<%--						</div>--%>
+
+<%--						<div class="weui-cell__hd">--%>
+<%--							<a href="javascript:void(0)" onclick="openVIPCard()" style="color:#FF586A;" class="f16 mr10">开通</a>--%>
+<%--						</div>--%>
+<%--					</div>--%>
+<%--				</c:if>--%>
+			</c:if>
+		</div>
+	</div>
+	<input type="hidden" id="code" value="${code }">
+	<input type="hidden" id="nickName" value="${nickName }">
+	<input type="hidden" id="userImg" value="${userImg }">
+	<input type="hidden" id="auth_code" value="${auth_code}">
+	<input type="hidden" id="openid" value="${openid }">
+	<input type="hidden" id="userid" value="${userid }">
+	<input type="hidden" id="userAppId" value="${userAppId }">
+	<input type="hidden" id="merchantCode" value="${merchantCode }">
+	<input type="hidden" id="storeId" value="${storeId }">
+	<input type="hidden" id="aisleSwitch" value="${aisleSwitch }">
+	<input type="hidden" id="leshuaMchId" value="${leshuaMchId }">
+	<input type="hidden" id="isMember" value="${isMember }">
+	<input type="hidden" id="unionId" value="${unionId }">
+	<input type="hidden" id="qrNo" value="${qrNo}">
+<%--	<div class="btn mt40 ml20 mr20">--%>
+<%--		<a href="javascript:void(0);onclick=paySuccessOrFail()"--%>
+<%--			class="weui-btn weui-btn_primary radius10 f14 pt5 pb5">确&nbsp;&nbsp;认&nbsp;&nbsp;支&nbsp;&nbsp;付</a>--%>
+<%--	</div>--%>
+<%--	<div class="gongsi">--%>
+<%--		<p>@2019&nbsp;武汉融商创银科技有限公司</p>--%>
+<%--	</div>--%>
+
+	<div class="weui-mask" style="opacity: 1;"></div>
+	<div class="weui-dialog" style="opacity: 1;">
+		<div class="weui-dialog__hd">
+			<strong class="weui-dialog__title">备注信息</strong>
+		</div>
+		<div class="weui-dialog__bd">
+			<input type="text" class="weui-input weui-prompt-input" placeholder="请输入备注" id="remark" name="remark" value="">
+		</div>
+		<div class="weui-dialog__ft">
+			<a href="javascript:;" class="weui-dialog__btn default" onclick="hiddenRemarkDialog()">取消</a>
+			<a href="javascript:;" class="weui-dialog__btn primary" onclick="enterRemark()">确定</a>
+		</div>
+	</div>
+
+	<div class="weui-footer_fixed-bottom">
+		<div class="shouyin">
+			<p>收&nbsp;银&nbsp;就&nbsp;用&nbsp;收&nbsp;银&nbsp;呗</p>
+		</div>
+		<div class="weui-flex tcenter f26 f-black" style="padding: 0;">
+			<div class="weui-flex__item">
+				<div class="weui-btn weui-btn_default" onclick="onNumberDown(1)">
+					<div class="swiper-container">1</div>
+				</div>
+				<div class="weui-btn weui-btn_default" onclick="onNumberDown(4)">
+					<div class="swiper-container">4</div>
+				</div>
+				<div class="weui-btn weui-btn_default" onclick="onNumberDown(7)">
+					<div class="swiper-container">7</div>
+				</div>
+				<div class="weui-btn weui-btn_default" onclick="onNumberDown('.')">
+					<div class="swiper-container">.</div>
+				</div>
+			</div>
+
+			<div class="weui-flex__item">
+				<div class="weui-btn weui-btn_default" onclick="onNumberDown(2)">
+					<div class="swiper-container">2</div>
+				</div>
+				<div class="weui-btn weui-btn_default" onclick="onNumberDown(5)">
+					<div class="swiper-container">5</div>
+				</div>
+				<div class="weui-btn weui-btn_default" onclick="onNumberDown(8)">
+					<div class="swiper-container">8</div>
+				</div>
+				<div class="weui-btn weui-btn_default" onclick="onNumberDown(0)">
+					<div class="swiper-container">0</div>
+				</div>
+			</div>
+			<div class="weui-flex__item">
+				<div class="weui-btn weui-btn_default" onclick="onNumberDown(3)">
+					<div class="swiper-container">3</div>
+				</div>
+				<div class="weui-btn weui-btn_default" onclick="onNumberDown(6)">
+					<div class="swiper-container">6</div>
+				</div>
+				<div class="weui-btn weui-btn_default" onclick="onNumberDown(9)">
+					<div class="swiper-container">9</div>
+				</div>
+				<div class="weui-cell weui-btn weui-btn_default" onclick="hiddenKeyBoard()">
+					<img class="swiper-container" src="<%=request.getAttribute("resourcePath")%>/images/keyboard.png" width="26px" height="26px" />
+				</div>
+			</div>
+			<div class="weui-flex__item">
+				<div class="weui-cell weui-btn weui-btn_default del" onclick="backSpace()">
+					<img class="swiper-container" src="<%=request.getAttribute("resourcePath")%>/images/del.png" width="26px" height="26px" />
+				</div>
+				<div class="weui-cell weui-btn_default weui-swiped-btn_warn f-white submit" onclick="paySuccessOrFail()">
+					<div class="swiper-container f22 f-submit">
+						<p>支</p><p>付</p>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</body>
+<script type="text/javascript">
+
+	// // 初始化
+	// var vConsole = new VConsole();
+	// console.log('VConsole is cool');
+
+	var isKeyBoardVisible = false;
+	/** 是否需要打开自己写的键盘 */
+	var showDiyKeyBoardFlag = false;
+	/** 自定义键盘是否可见 */
+	var isDiyKeyBoardVisible = true;
+	/** 网页初始高度 */
+	var winHeight;
+	/** 网页实时高度 */
+	var thisHeight;
+	/** 备注 */
+	var remark;
+
+	document.addEventListener('WeixinJSBridgeReady', function onBridgeReady() {
+		// 通过下面这个API隐藏右上角按钮
+		WeixinJSBridge.call('hideOptionMenu');
+	});
+
+
+	$(function (){
+		winHeight = window.innerHeight;
+
+		window.onresize = function(){
+			thisHeight = window.innerHeight;
+			// confirm("winHeight : " + winHeight);
+			// confirm("thisHeight : " + thisHeight);
+			if(winHeight - thisHeight > 50){
+				// confirm("当前系统键盘可见");
+				isKeyBoardVisible = true;
+				//当软键盘弹出，在这里面操作
+				if (showDiyKeyBoardFlag) {
+					hiddenKeyBoardImmediately();
+				}
+			}else{
+				isKeyBoardVisible = false;
+				//当软键盘收起，在此处操作
+				if (showDiyKeyBoardFlag) {
+					showDiyKeyBoard();
+				}
+			}
+		}
+
+		let del = $(".del");
+		let submit  = $(".submit");
+		let parent = $(".del").parent();
+		console.log("total height: " + parent.parent().height());
+		parent.height(parent.parent().height());
+		console.log("del height: " + (parent.height() / 4));
+		del.height(parent.height() / 4);
+		console.log("submit height: " + (parent.height() * 3 / 4));
+		submit.height(parent.height() * 3 / 4);
+
+		$("#comsumeMoney").focus(function() {
+			showKeyBoard();
+			document.activeElement.blur();
+		});
+
+		$("#remark").focus(function () {
+			showDiyKeyBoardFlag = false;
+
+			hiddenKeyBoardImmediately()
+			console.log("remark winHeight ： " + winHeight);
+			$(window).height(winHeight * 0.8);
+			console.log("remark winHeight ： " + $(window).height());
+
+		});
+
+		$(".shouyin").click(function() {
+			showKeyBoard();
+		});
+	});
+
+	function isWeiXin() {
+		var ua = window.navigator.userAgent.toLowerCase();
+		if (ua.match(/MicroMessenger/i) == 'micromessenger') {
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+	function isAlipay() {
+		var ua = window.navigator.userAgent.toLowerCase();
+		if(ua.match(/Alipay/i) == "alipay"){
+			return true;
+		}else{
+			return false;
+		}
+	}
+
+	function paySuccessOrFail() {
+		var comsumeMoney = $("#comsumeMoney").val();//消费金额
+		var aisleSwitch = $("#aisleSwitch").val();//通道
+		var leshuaMchId = $("#leshuaMchId").val();//乐刷商户id
+		var userImg = $("#userImg").val();//支付用户头像
+		var nickName = $("#nickName").val();//昵称
+		var pattern = /^(?!0+(?:\.0+)?$)(?:[1-9]\d*|0)(?:\.\d{1,2})?$/;
+		if (!pattern.test(comsumeMoney)) {
+			alert('请输入正确的金额(保留两位有效数字)');
+			return;
+		}
+		if (StringUtil.isNotBlank(comsumeMoney)) {
+			if (comsumeMoney < 0.01) {
+				alert('充值金额必须大于0.01');
+				return;
+			}
+		}
+		if (aisleSwitch == '0') {//1乐刷通道 0官方通道
+			if (isWeiXin()) {
+				wechatPay(comsumeMoney, userImg, nickName);// 微信支付
+			} else {
+				aliPay(comsumeMoney, userImg, nickName);
+			}
+		} else{
+			tradePay(comsumeMoney, leshuaMchId, userImg, nickName);
+		}
+
+	}
+
+	// 微信支付
+	function wechatPay(comsumeMoney, userImg, nickName) {
+		var openid = $('#openid').val();
+		var code = $("#code").val();
+		var userAppId = $("#userAppId").val();
+		var storeId = $("#storeId").val();
+		var merchantCode = $("#merchantCode").val();
+		var remark = $("#remark").val();
+		$.ajax({
+			url : '${ctx}/merchant/wechatPay',
+			data : {
+				"openid" : openid,
+				"merchantCode" : merchantCode,
+				"comsumeMoney" : comsumeMoney,
+				"userAppId" : userAppId,
+				"storeId" : storeId,
+				"userImg" : userImg,
+				"nickName" : nickName,
+				"remark" : remark
+			},
+			dataType : "json",
+			type : "post",
+			success : function(result) {
+				var rdata = result.data;
+				WeixinJSBridge.invoke('getBrandWCPayRequest', {
+					// 商品名称
+					"appId" : rdata.appId,
+					"timeStamp" : rdata.timeStamp,
+					"nonceStr" : rdata.nonceStr,
+					"package" : rdata.packageMsg,
+					"signType" : rdata.signType,
+					"paySign" : rdata.paySgin,
+				}, function(res) {
+					if (res.err_msg == "get_brand_wcpay_request:ok") {
+						//成功之后跳转地址
+						window.location = '${ctx}/merchant/paySuccess';
+					} else {
+						alert("支付失败");
+					}
+				})
+			},
+			error : function(data) {
+				alert('系统错误请稍后再试')
+			}
+		})
+	}
+
+	// 支付宝支付
+	function aliPay(comsumeMoney, userImg, nickName) {
+		var auth_code = $("#auth_code").val();
+		var userid = $("#userid").val();
+		var userAppId = $("#userAppId").val();
+		var storeId = $("#storeId").val();
+		var merchantCode = $("#merchantCode").val();
+		var remark = $("#remark").val();
+		$.ajax({
+			url : '${ctx}/merchant/aliPay',
+			dataType : 'json',
+			"type" : "post",
+			data : {
+				'comsumeMoney' : comsumeMoney,
+				"merchantCode" : merchantCode,
+				"storeId" : storeId,
+				'userid' : userid,
+				"userAppId" : userAppId,
+				"userImg" : userImg,
+				"nickName" : nickName,
+				"remark" : remark,
+			},
+			success : function(data) {
+				if ("1" == data.code) {
+					ap.tradePay({
+						tradeNO : data.transNo
+					}, function(res) {
+						if (res.resultCode == '9000') {
+							window.location = '${ctx}/merchant/paySuccess'; //订单支付成功
+						} else if (res.resultCode == '8000') {
+						} else if (res.resultCode == '4000') {
+							ap.alert("订单支付失败");
+						} else if (res.resultCode == '6001') {
+						} else if (res.resultCode == '6002') {
+							ap.alert("网络连接出错");
+						}
+					});
+				} else {
+					alert(data.resultMsg);
+				}
+			},
+			error : function(data) {
+				alert('系统错误请稍后再试')
+			}
+		});
+	}
+
+	//统一支付入口
+	function tradePay(comsumeMoney, leshuaMchId, userImg, nickName) {
+		var radioPay = $("input[name='radio1']:checked").val();//是会员选择的
+		var storeId = $("#storeId").val();
+		var openid = $("#openid").val();
+		var merchantCode = $("#merchantCode").val();
+		var remark = $("#remark").val();
+		var isMember = $("#isMember").val();
+		var userId = $("#userid").val();
+		var unionId = $("#unionId").val();
+		var qrNo = $("#qrNo").val();
+		var payWay = "";
+		if (isWeiXin()) {
+			payWay = "WXZF";
+		} else if(isAlipay()){
+			payWay = "ZFBZF";
+		}else{
+			payWay = "UNIONPAY";
+		}
+		//var index = layer.msg('支付中...', {icon: 16,time:0,shade : [0.3 , '#000' , false]});
+		$('#loading').css('display','block');
+		$.ajax({
+			url : '${ctx}/merchant/tradePay',
+			data : {
+				"comsumeMoney" : comsumeMoney,
+				"leshuaMchId" : leshuaMchId,
+				"merchantCode" : merchantCode,
+				"storeId" : storeId,
+				"payWay" : payWay,
+				"userImg" : userImg,
+				"nickName" : nickName,
+				"remark" : remark,
+				"openid" : openid,
+				"isMember" : isMember,
+				"radioPay" : radioPay,
+				"userId" : userId,
+				"unionId" : unionId,
+				"snNo" : qrNo,
+			},
+			dataType : "json",
+			type : "post",
+			success : function(res) {
+				$('#loading').css('display','none');
+				if (res.isMember == '1') {
+					window.location = '${ctx}/merchant/paySuccess';
+				} else if (res.isMember == '0') {
+					window.location = '${ctx}/wap/merchant/payFail';
+				} else {
+					if (res.code == 200) {
+						//乐刷
+						var rdata = res.data;
+						if("WXZF" == payWay){
+							WeixinJSBridge.invoke('getBrandWCPayRequest', {
+								// 商品名称
+								"appId" : rdata.payAppId,
+								"timeStamp" : rdata.payTimeStamp,
+								"nonceStr" : rdata.paynonceStr,
+								"package" : rdata.payPackage,
+								"signType" : rdata.paySignType,
+								"paySign" : rdata.paySign,
+							}, function(res) {
+								if (res.err_msg == "get_brand_wcpay_request:ok" || res.err_msg == "stopMonitoringBeacons:ok") {
+									//成功之后跳转地址
+									window.location = '${ctx}/merchant/jumpUrl?orderNumber='+rdata.orderNumber;
+								} else {
+									cancelPay(rdata.orderNumber);
+									alert("支付失败");
+								}
+							})
+						}else if("ZFBZF" == payWay){
+							var reg=/^([hH][tT]{2}[pP]:\/\/|[hH][tT]{2}[pP][sS]:\/\/)(([A-Za-z0-9-~]+).)+([A-Za-z0-9-~\/])+$/;
+							if(reg.test(rdata.source)){
+								window.location = rdata.source;
+							}else{
+								ap.tradePay({
+									tradeNO : rdata.source
+								}, function(res) {
+									if (res.resultCode == '9000') {
+										window.location = '${ctx}/merchant/jumpUrl?orderNumber='+rdata.orderNumber;//订单支付成功
+									} else if (res.resultCode == '8000') {
+									} else if (res.resultCode == '4000') {
+										cancelPay(rdata.orderNumber);
+										ap.alert("订单支付失败");
+									} else if (res.resultCode == '6001' || res.resultCode == '99') {
+										cancelPay(rdata.orderNumber);
+									} else if (res.resultCode == '6002') {
+										cancelPay(rdata.orderNumber);
+										ap.alert("网络连接出错");
+									}
+								});
+							}
+						}else{
+							window.location = rdata.redirectUrl;
+						}
+					} else {
+						alert(res.message);
+					}
+				}
+			}
+		})
+	}
+	
+	function cancelPay(m) {
+		var url =  "${ctx}/merchant/cancelPay/"+m;
+		$.get(url, (res)=>{
+			console.log(res);
+		})
+	}
+	
+	<%--function goMemberPay(){--%>
+	<%--	/*var storeId=$("#storeId").val();--%>
+	<%--	var merchantCode=$("#merchantCode").val();--%>
+	<%--	var openid=$("#openid").val();*/--%>
+	<%--	var openid = $("#openid").val();--%>
+	<%--	window.location = '${ctx}/vip/goPay?cardNo=${cardNo}';--%>
+	<%--}--%>
+
+	<%--function openVIPCard() {--%>
+	<%--	var storeId=$("#storeId").val();--%>
+	<%--	var merchantCode=$("#merchantCode").val();--%>
+	<%--	var openid=$("#openid").val();--%>
+	<%--	window.location= '${ctx}/vip/vipOpenCard?storeId='+storeId+'&merchantCode='+merchantCode+'&openid='+openid;--%>
+	<%--}--%>
+
+	function showDiyKeyBoard() {
+		isDiyKeyBoardVisible = true;
+		$(".weui-footer_fixed-bottom").removeClass("hiddenKeyBoard");
+		$(".weui-footer_fixed-bottom").addClass("showKeyBoard");
+	}
+
+	function hiddenDiyKeyBoard() {
+		isDiyKeyBoardVisible = false;
+		$(".weui-footer_fixed-bottom").removeClass("showKeyBoard");
+		$(".weui-footer_fixed-bottom").addClass("hiddenKeyBoard");
+	}
+
+	function hiddenKeyBoard() {
+		showDiyKeyBoardFlag = false;
+		if (isDiyKeyBoardVisible) {
+			hiddenDiyKeyBoard()
+		}
+	}
+
+	function showKeyBoard() {
+		showDiyKeyBoardFlag = true;
+		// 两种键盘都不可见，则调用动画
+		if (!isDiyKeyBoardVisible && !isKeyBoardVisible) {
+			// confirm("当前自定义键盘不可见；系统键盘不可见");
+			showDiyKeyBoard();
+		}
+	}
+
+	/**
+	 * 立即收起自定义键盘
+	 */
+	function hiddenKeyBoardImmediately() {
+		showDiyKeyBoardFlag = false;
+		isDiyKeyBoardVisible = false;
+		$(".weui-footer_fixed-bottom").removeClass("showKeyBoard");
+		$(".weui-footer_fixed-bottom").removeClass("hiddenKeyBoard");
+		$(".weui-footer_fixed-bottom").css("bottom", "-224px");
+	}
+
+	function onNumberDown(num) {
+		let number = $('#comsumeMoney').val();
+
+		if (number === "" || number === "undefined" || number === undefined || number === null) {
+			number = "0";
+		}
+
+		let dotPosition = number.indexOf(".");
+		if (dotPosition !== -1 && num === ".") {
+			return;
+		}
+
+		if (dotPosition !== -1 && (dotPosition + 3) === number.length) {
+			return;
+		}
+
+		if (number === "0" && num !== ".") {
+			number = num;
+		} else {
+			number += num;
+		}
+
+		$('#comsumeMoney').val(number);
+	}
+
+	function backSpace() {
+		let number = $('#comsumeMoney').val();
+		$('#comsumeMoney').val(number.substr(0, number.length - 1));
+	}
+
+	/** 打开备注弹窗 */
+	function showRemarkDialog() {
+		hiddenKeyBoardImmediately()
+		$("#remark").val(remark);
+		$(".weui-mask").addClass("weui-mask--visible");
+		$(".weui-dialog").addClass("weui-dialog--visible");
+	}
+
+	/** 收起备注弹窗 */
+	function hiddenRemarkDialog() {
+		$(".weui-mask").removeClass("weui-mask--visible");
+		$(".weui-dialog").removeClass("weui-dialog--visible");
+		showDiyKeyBoard();
+	}
+
+	function enterRemark() {
+		remark = $("#remark").val();
+		$(".weui-mask").removeClass("weui-mask--visible");
+		$(".weui-dialog").removeClass("weui-dialog--visible");
+		showDiyKeyBoard();
+	}
+</script>
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/jsp/merchant/locationError.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/merchant/locationError.jsp
new file mode 100644
index 0000000..764f9d6
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/merchant/locationError.jsp
@@ -0,0 +1,107 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+         pageEncoding="UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html>
+<jsp:include page="../../common.jsp" />
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta name="viewport"
+          content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <title>提示</title>
+    <script src="https://www.shouyinbei.net/resources/js/alipayjsapi.min3.1.1.js"></script>
+    <style>
+        html {
+            font-family: Source Sans Pro,-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Arial,sans-serif;
+            word-spacing: .03125rem;
+            -ms-text-size-adjust: 100%;
+            -webkit-text-size-adjust: 100%;
+            -moz-osx-font-smoothing: grayscale;
+            -webkit-font-smoothing: antialiased;
+            -webkit-box-sizing: border-box;
+            box-sizing: border-box;
+        }
+        .lineH2{
+            line-height: 2rem;
+        }
+        p{
+            font-size: 16px;
+        }
+        .btn{
+            border: 0;
+            border-radius: 20px;
+            height: 1.8rem;
+            background-color: #FF586A;
+            color: #fff;
+            font-size: .8rem;
+            width: 80%;
+        }
+    </style>
+</head>
+<body style="background:#ffff;">
+<div class="page-title tcenter bluebg white h40 white positionr">
+    <div>
+        <span>提示</span>
+    </div>
+</div>
+<div class="login_form ml20 mr20 mt50">
+    <div class="weui-cells weui-cells_form mt50 tcenter">
+        <div class=" f55 white dlblock radiusp50 padding15">
+            <img src="${resourcePath}/images/error_img.png" width="100" height="100">
+        </div>
+        <div class="lineH2" style="text-align: center;">
+            <p>您的付款距离与店铺过远，请当面付款!</p>
+            <p>如位置判断有误，授权获取定位后支付!</p>
+        </div>
+        <div class="mt30" style="display: ${empty province ? 'block' : 'none'}">
+            <button class="btn read">获取定位</button>
+        </div>
+    </div>
+</div>
+<form id="form" class="hiddenForm">
+
+    <input type="hidden" id="code" name="code" value="${code}">
+    <input type="hidden" id="auth_code" name="auth_code" value="${auth_code}">
+    <input type="hidden" id="userAuthCode" name="userAuthCode" value="${userAuthCode}">
+
+    <input type="hidden" id="merchantCode" name="merchantCode" value="${merchantCode}">
+    <input type="hidden" id="userAppId" name="userAppId" value="${userAppId}">
+    <input type="hidden" id="qrNo" name="qrNo" value="${qrNo}">
+
+    <input type="hidden" id="payType" name="payType" value="${payType}">
+    <input type="hidden" id="cokus" name="cokus" value="${cokus}">
+    <input type="hidden" id="province" name="province" value="">
+</form>
+</body>
+<script>
+    function ready(callback) {
+        // 如果jsbridge已经注入则直接调用
+        if (window.AlipayJSBridge) {
+            callback && callback();
+        } else {
+            // 如果没有注入则监听注入的事件
+            document.addEventListener('AlipayJSBridgeReady', callback, false);
+        }
+    }
+    ready(function() {
+        document.querySelector('.read').addEventListener('click', function() {
+            AlipayJSBridge.call('getCurrentLocation', { bizType: '$s',requestType:1}, function(result) {
+                if (result.error) {
+                    AlipayJSBridge.call('alert', {
+                        title: '提示',
+                        message: result.errorMessage,
+                        button: '确定'
+                    }, function(e) {
+                    });
+                    return;
+                }else{
+                    let province = result.province;
+                    $("#province").val(province);
+                    let data = $("#form").serialize();
+                    window.location.href = ctx + "/merchant/h5pay?"+data;
+                }
+            });
+        });
+    });
+</script>
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/jsp/merchant/payFail.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/merchant/payFail.jsp
new file mode 100644
index 0000000..a0975b9
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/merchant/payFail.jsp
@@ -0,0 +1,39 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html>
+<jsp:include page="../../common.jsp" />
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="viewport"
+    content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+<title>支付失败</title>
+</head>
+  <body style="background:#ffff;">
+        <div class="page-title tcenter bluebg white h40 white positionr">
+            <div>
+                <span>支付失败</span>
+                <!-- <a href="javascript:history.go(-1);" class="white f21 h40 left0 top0 positiona">
+                    <span class="dblock w40 h40 icon icon-59 white f22"></span>
+                </a> -->
+            </div>
+        </div>
+        <div class="login_form ml20 mr20 mt50">
+            <form method="post">
+                <div class="weui-cells weui-cells_form mt50 tcenter">   
+                    <div class="bg-red icon icon-95 f55 white dlblock radiusp50 padding15">
+                        
+                    </div>
+                    <div class="mt30" style="font-weight: 700;color: #000;font-size: 22px;text-align: center;">
+                        支付失败！
+                    </div>
+                </div>
+               <%--  <div class="btn mt50">
+                    <a href="${ctx }/vip/myVIPCard?storeId=${storeId}" class="weui-btn weui-btn_primary radius10 f16 pt10 pb10">确定</a>
+                </div> --%>
+            </form>
+        </div>
+    </body>
+
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/jsp/merchant/paySuccess.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/merchant/paySuccess.jsp
new file mode 100644
index 0000000..149f851
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/merchant/paySuccess.jsp
@@ -0,0 +1,36 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html>
+<jsp:include page="../../common.jsp" />
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="viewport"
+    content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+<title>支付成功</title>
+</head>
+  <body style="background:#fff;">
+        <div class="page-title tcenter bluebg white h40 white positionr">
+            <div>
+                <span>提示</span>
+               <!--  <a href="javascript:history.go(-1);" class="white f21 h40 left0 top0 positiona">
+                    <span class="dblock w40 h40 icon icon-59 white f22"></span>
+                </a> -->
+            </div>
+        </div>
+        <div class="login_form ml20 mr20 mt50">
+            <form method="post">
+                <div class="weui-cells weui-cells_form mt50 tcenter">   
+                    <div class="bg-red icon icon-66 f55 white dlblock radiusp50 padding15">
+                        
+                    </div>
+                    <div class="mt30" style="font-weight: 700;color: #000;font-size: 22px;text-align: center;">
+                        支付成功
+                    </div>
+                </div>
+            </form>
+        </div>
+    </body>
+
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/jsp/merchant/registerSuccess.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/merchant/registerSuccess.jsp
new file mode 100644
index 0000000..cdb125d
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/merchant/registerSuccess.jsp
@@ -0,0 +1,49 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html>
+<jsp:include page="../../common.jsp" />
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="viewport"
+    content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+<title>注册成功</title>
+</head>
+  <body style="background:#f7f8fa;">
+<%--        <div class="page-title tcenter bluebg white h40 white positionr">--%>
+<%--            <div>--%>
+<%--                <span>注册成功</span>--%>
+<%--                <a href="javascript:history.go(-1);" class="white f21 h40 left0 top0 positiona">--%>
+<%--                    <span class="dblock w40 h40 icon icon-59 white f22"></span>--%>
+<%--                </a>--%>
+<%--            </div>--%>
+<%--        </div>--%>
+        <div class="login_form ml20 mr20 mt50">
+            <form method="post">
+                <div class="weui-cells weui-cells_form mt50 tcenter">   
+                    <div class="bg-green icon icon-66 f55 white dlblock radiusp50 padding15">
+                        
+                    </div>
+                    <div class="mt30">
+                        成功！
+                    </div>
+                </div>
+            </form>
+        </div>
+        <div class="btn ml20 mr20 mr40" style="margin-top:2rem;">
+            <a href="javascript:void(0);" id="btnOpenApp" class="weui-btn weui-btn_primary radius10 f14 pt15 pb15">已有账号，下载登录</a>
+        </div>
+    </body>
+    <script src="https://static.jmlk.co/scripts/dist/jmlink.min.js"></script>
+    <script type="text/javascript">
+        new JMLink({
+            jmlink:'https://bztg6y.jglinks.cn/AAp2',
+            button:document.querySelector('a#btnOpenApp'),
+            autoLaunchApp : false,
+            downloadWhenUniversalLinkFailed: true,
+            inapp : false,
+            params: {}
+        });
+    </script>
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/jsp/merchant/share.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/merchant/share.jsp
new file mode 100644
index 0000000..f6fd443
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/merchant/share.jsp
@@ -0,0 +1,251 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html>
+<jsp:include page="../../common.jsp" />
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="viewport"
+    content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+<title>分享</title>
+<style>
+    div,body,p,span,h1,h2,h3,h4{ color:#333}
+    input::-webkit-input-placeholder {
+        font-family: Avenir,Helvetica,Arial,sans-serif;
+        /* placeholder颜色  */
+        color: rgb(118, 118, 118);
+        /*color: #aab2bd;*/
+        /* placeholder字体大小  */
+        font-size: 18px;
+        /* placeholder位置  */
+    }
+    input {
+        border:none;
+        border-bottom: 1px solid #000
+    }
+    .mr40{
+        margin-top:40px;
+    }
+    .bg-logo{
+        height:8rem;
+        width:100%;
+        background-repeat: no-repeat;
+        background-size:contain;
+        background-position:center 0;
+        background-image: url('${resourcePath}/images/bg_logo.png');
+    }
+    .kaptcha{
+        width: 80px;
+        height: 32px;
+    }
+    .weui-cells{
+        height: 60px;
+    }
+</style>
+</head>
+<body>
+        <div class="bg-logo">
+        </div>
+        <!-- <div class="page-title tcenter h40 bluebg white">
+            <span>分享</span>
+            <a href="个人中心.html" class="white f21 h40 left0 top0 positiona">
+                <span class="dblock w40 h40 icon icon-59 white f22"></span>
+            </a>
+        </div>-->
+        <div class="weui-cells weui-cells_form bdbe" style="margin-top:10px;">
+            <div class="weui-cell weui-cell_warn">
+                <div class="weui-cell__hd"><span class="icon icon-90 f24"></span></div>
+                <div class="weui-cell__bd">
+                    <input class="weui-input tleft pl10" id="phone" type="number" pattern="[0-9]*" value="weui input error" placeholder="请输入手机号码">
+                </div>
+            </div>
+        </div>
+
+        <div class="weui-cells weui-cells_form bdbe">
+            <div class="weui-cell weui-cell_warn">
+                <div class="weui-cell__hd"><span class="icon icon-71 f24"></span></div>
+                <div class="weui-cell__bd">
+                    <input class="weui-input tleft pl10" id="validateCode" type="text" maxlength="4" value="" placeholder="请输入图形验证码">
+                </div>
+                <div class="weui-cell__bd tright">
+                    <img src="${ctx}/kaptcha/get" onclick="refreshKaptcha(this)" class="kaptcha dlblock white f12" />
+                </div>
+            </div>
+        </div>
+
+        <div class="weui-cells weui-cells_form bdbe">
+            <div class="weui-cell weui-cell_warn">
+                <div class="weui-cell__hd"><span class="icon icon-71 f24"></span></div>
+                <div class="weui-cell__bd">
+                    <input class="weui-input tleft pl10" id="phoneverify" type="number" pattern="[0-9]*" value="weui input error" placeholder="请输入验证码">
+                </div>
+                <div class="weui-cell__bd tright">
+                    <a  href="javascript:void(0);onclick=verification()" id="obtain" class="weui-btn_primary radius5 pt10 pb10 pl10 pr10 dlblock white f12">获取验证码</a>
+                </div>
+            </div>
+        </div>
+        <div class="weui-cells weui-cells_form bdbe">
+            <div class="weui-cell weui-cell_warn">
+                <div class="weui-cell__hd"><span class="icon icon-31 f24"></span></div>
+                <div class="weui-cell__bd">
+                    <input class="weui-input tleft pl10" type="password" id="password" maxlength="20" placeholder="请输入6~20位登录密码">
+                </div>
+            </div>
+        </div>
+        <div class="weui-cells weui-cells_form bdbe">
+            <div class="weui-cell weui-cell_warn">
+                <div class="weui-cell__hd"><span class="icon icon-31 f24"></span></div>
+                <div class="weui-cell__bd pl10">
+                    <input class="weui-input tleft" type="password" id="againPassword" maxlength="20" placeholder="请再次输入登录密码"/>
+                </div>
+            </div>
+            <input type="hidden" id="inviteNum" value="${inviteNum }">
+        </div>
+        <div class="weui-cells weui-cells_form bdbe">
+            <div class="weui-cell weui-cell_warn">
+                <div class="weui-cell__hd"><span class="icon icon-123 f24"></span></div>
+                <div class="weui-cell__bd pl10">
+                    <input class="weui-input tleft"  type="text" readonly value="推荐人:${userName}${enPhone }"/>
+                </div>
+            </div>
+        </div>
+        <div class="btn ml20 mr20 mr40">
+            <!-- <a href="javascript:void(0);" class="weui-btn weui-btn_primary radius10 f14 pt15 pb15">推荐人:${userName}${enPhone}</a -->
+            <a href="javascript:void(0);" onclick="goreGister()" class="weui-btn weui-btn_primary radius10 f14 pt15 pb15">注册</a>
+            <a href="javascript:void(0);" id="btnOpenApp" class="weui-btn weui-btn_primary radius10 f14 pt15 pb15">已有账号，下载登录</a>
+        </div>
+    </body>
+<script src="https://static.jmlk.co/scripts/dist/jmlink.min.js"></script>
+<script type="text/javascript">
+new JMLink({
+    jmlink:'https://bztg6y.jglinks.cn/AAp2',
+    button:document.querySelector('a#btnOpenApp'),
+    autoLaunchApp : false,
+    downloadWhenUniversalLinkFailed: true,
+    inapp : false,
+    params: {}
+});
+  function goreGister(){
+	  var phone=$("#phone").val();
+	  var phoneverify=$("#phoneverify").val();
+	  var password=$("#password").val();
+	  var againPassword=$("#againPassword").val();
+	  var inviteNum=$("#inviteNum").val();
+	  var phoneReg = /(^1[3|4|5|6|7|8|9]\d{9}$)|(^09\d{8}$)/;
+      // var psdReg = /^(?=.*[a-z|A-Z]).{6,20}$/;
+      if (!phoneReg.test(phone)) {
+          $.alert("请输入正确的手机号","系统提示");
+          return;
+      }
+
+      if (!password || !againPassword) {
+          $.alert("请输入登录密码","系统提示");
+          return;
+      }
+
+      if (password.length < 6) {
+          $.alert("密码长度6到20位！","系统提示");
+          return;
+      }
+
+      if(password!=againPassword){
+          $.alert("两次的密码必须相同！","系统提示");
+    	  return;
+      }
+      $.showLoading("提交中...")
+	  $.ajax({
+		  url:ctx+'/merchant/goRegister',
+		  data:{
+			  "inviteNum":inviteNum,
+			  "phoneverify" : phoneverify,
+			  "phone":phone,
+			  "password":password,
+		  },
+		  dataType:"json",
+		  type:"post",
+		  success:function(res){
+              $.hideLoading();
+			  if(res.code == '200'){
+			      window.location.href = ctx+ "/merchant/registerSuccess";
+			  }else{
+                  $.alert(res.message,"系统提示");
+              }
+		  },
+		  error:function(res){
+              $.hideLoading();
+			  $.alert("系统繁忙,请稍后再试","系统提示");
+		  },
+	  })
+  }
+  function verification() {
+      var phoneReg = /(^1[3|4|5|6|7|8|9]\d{9}$)|(^09\d{8}$)/;
+      var phone=$.trim($("#phone").val());
+      if (!phoneReg.test(phone)) {
+          $.alert("请输入正确的手机号","系统提示");
+          return;
+      }
+      var validateCode = $.trim($("#validateCode").val());
+      if(!validateCode){
+          $.alert("请输入图形验证码","系统提示");
+          return;
+      }
+      var href = 'javascript:void(0); onclick=verification()';
+      var _this = $("#obtain");
+      _this.removeAttr("href");
+      $.showLoading("获取中...");
+      $.ajax({
+          url:ctx+'/vip/getPhoneCode',
+          data:{
+              "phone":phone,
+              "validateCode" : validateCode
+          },
+          dataType:"json",
+          type:"post",
+          success:function(data){
+              //成功
+              $.hideLoading();
+              if(data.code=='1'){
+                  var sec = 60;
+                  var timer = window.setInterval(function() {
+                      sec--;
+                      if (sec > 0) {
+                          _this.text(sec + "秒重新发送!");
+                      } else {
+                          // 去掉定时器
+                          window.clearInterval(timer);
+                          _this.text("获取验证码");
+                          _this.attr("href","javascript:void(0); onclick=verification()");
+                      }
+                  }, 1000);
+              }else if(data.code=='0'){
+                  $.alert("获取验证码失败，请稍后再试","系统提示");
+                  _this.text("获取验证码");
+                  _this.attr("href",href);
+              }else if(data.code=='2'){
+                  //系统错误
+                  $.alert("系统繁忙！","系统提示");
+                  _this.text("获取验证码");
+                  _this.attr("href",href);
+              }else if(data.code=='3'){
+                  $.alert("手机号已被注册！","系统提示");
+                  _this.text("获取验证码");
+                  _this.attr("href",href);
+              }else{
+                  $.alert(data.msg,"系统提示");
+                  _this.text("获取验证码");
+                  _this.attr("href",href);
+              }
+          }
+      })
+  }
+  function refreshKaptcha(obj){
+      let url = $(obj).attr("src");
+      let time = new Date().getTime();
+      if(url.indexOf("?") > 0){
+          url = url.split("?")[0]
+      }
+      $(obj).attr("src",url+"?t="+ time);
+  }
+</script>
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/jsp/merchant/wxLocation.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/merchant/wxLocation.jsp
new file mode 100644
index 0000000..5449e67
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/merchant/wxLocation.jsp
@@ -0,0 +1,103 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+         pageEncoding="UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html>
+<jsp:include page="../../common.jsp" />
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta name="viewport"
+          content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <title>提示</title>
+    <link rel="stylesheet" href="https://cdn.bootcss.com/weui/1.1.3/style/weui.min.css">
+    <link rel="stylesheet" href="https://cdn.bootcss.com/jquery-weui/1.2.1/css/jquery-weui.min.css">
+    <script src="http://res.wx.qq.com/open/js/jweixin-1.6.0.js"></script>
+    <script src="https://cdn.bootcss.com/jquery-weui/1.2.1/js/jquery-weui.min.js"></script>
+    <style>
+        html {
+            font-family: Source Sans Pro,-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Arial,sans-serif;
+            word-spacing: .03125rem;
+            -ms-text-size-adjust: 100%;
+            -webkit-text-size-adjust: 100%;
+            -moz-osx-font-smoothing: grayscale;
+            -webkit-font-smoothing: antialiased;
+            -webkit-box-sizing: border-box;
+            box-sizing: border-box;
+        }
+        .lineH2{
+            line-height: 2rem;
+        }
+        p{
+            font-size: 16px;
+        }
+        .btn{
+            border: 0;
+            border-radius: 20px;
+            height: 1.8rem;
+            background-color: #FF586A;
+            color: #fff;
+            font-size: .8rem;
+            width: 80%;
+        }
+    </style>
+</head>
+<body style="background:#ffff;">
+<div class="login_form ml20 mr20 mt50">
+    <div class="weui-cells weui-cells_form mt50 tcenter">
+        <div class=" f55 white dlblock radiusp50 padding15">
+            <img src="${resourcePath}/images/error_img.png" width="100" height="100">
+        </div>
+        <div class="lineH2" style="text-align: center;">
+            <p>您的付款距离与店铺过远，请当面付款!</p>
+            <p>如位置判断有误，授权获取定位后支付!</p>
+        </div>
+        <div class="mt30" style="display: ${empty province ? 'block' : 'none'}">
+            <button class="btn read" onclick="getLocation()">获取定位</button>
+        </div>
+    </div>
+</div>
+</body>
+<script>
+    wx.config({
+        debug: true, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
+        appId: '${appId}', // 必填，公众号的唯一标识
+        timestamp: '${timestamp}', // 必填，生成签名的时间戳
+        nonceStr: '${noncestr}', // 必填，生成签名的随机串
+        signature: '${sign}',// 必填，签名
+        jsApiList: ["getLocation"], // 必填，需要使用的JS接口列表
+        verifyJsApiList:["geoLocation"]
+    });
+    wx.ready(function(){
+        // config信息验证后会执行ready方法，所有接口调用都必须在config接口获得结果之后，config是一个客户端的异步操作，所以如果需要在页面加载时就调用相关接口，则须把相关接口放在ready函数中调用来确保正确执行。对于用户触发时才调用的接口，则可以直接调用，不需要放在ready函数中。
+    });
+    wx.error(function(res){
+        // config信息验证失败会执行error函数，如签名过期导致验证失败，具体错误信息可以打开config的debug模式查看，也可以在返回的res参数中查看，对于SPA可以在这里更新签名。
+    });
+    function getLocation(){
+        $.showLoading("获取中...");
+        wx.miniProgram.geoLocation({
+            type: 'gcj02', // 默认为wgs84的gps坐标，如果要返回直接给openLocation用的火星坐标，可传入'gcj02'
+            success: function (res) {
+                let latitude = res.latitude; // 纬度，浮点数，范围为90 ~ -90
+                let longitude = res.longitude; // 经度，浮点数，范围为180 ~ -180。
+                getAddress(latitude,longitude);
+            },cancel:function (){
+                $.alert("请先授权获取位置信息！");
+            },fail:function (res){
+                $.alert(JSON.stringify(res));
+            }
+        });
+    }
+    function  getAddress(latitude,longitude){
+        let url = ctx + "/wechat/getAddress";
+        $.post(url,{lat:latitude,lng:longitude},function (res){
+            $.hideLoading();
+            if(res.code != 200){
+                return $.alert(res.message,"系统提示");
+            }
+            window.localStorage.setItem("province",res.data);
+            window.location.href = ctx + "/merchant/recharge?storeId=${storeId}&appOpenId=${appOpenId}"
+        })
+    }
+</script>
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/jsp/recharge/recharge.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/recharge/recharge.jsp
new file mode 100644
index 0000000..e0b7296
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/recharge/recharge.jsp
@@ -0,0 +1,233 @@
+<%@ page contentType="text/html; charset=UTF-8"
+		 pageEncoding="UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> 
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <c:set var="ctx" value="${pageContext.request.contextPath}"  scope="request"/>
+    <c:set var="resourcePath" value="${ctx}/resources"  scope="request"/>
+    <script type="text/javascript">
+        var ctx = "${ctx}"; //上下文路径
+        var resourcePath = "${resourcePath}";
+        document.writeln('<script type="text/javascript" src="'+resourcePath+'/js/global.js?d=' + new Date().getTime() + '" ><\/script>');
+    </script>
+    <link rel="stylesheet" href="${resourcePath}/css/weui.min.css">
+    <link rel="stylesheet" href="${resourcePath}/css/jquery-weui.min.css">
+    <link rel="stylesheet" type="text/css" href="${resourcePath}/css/recharge.css"/>
+    <link rel="stylesheet" type="text/css" href="${resourcePath}/css/icon.css"/>
+<%--    <script src="https://gw.alipayobjects.com/as/g/h5-lib/alipayjsapi/3.1.1/alipayjsapi.min.js"></script>--%>
+    <script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.3.2.js"></script>
+    <script src="${resourcePath}/js/jquery.min.js"></script>
+    <style>
+        body{
+            font-size: 1rem;
+            line-height: 1.2;
+        }
+        .uInfo-lef{
+            font-size: 0.8rem;
+        }
+        .card-head{
+            display: flex;
+            justify-content: flex-start;
+            align-items: center;
+        }
+        .vip-card-logo{
+            width: 27px;
+            height: 27px;
+        }
+        .shopDes{
+            font-size: 0.9rem;
+        }
+        .choseCard{
+            margin-bottom: .5rem;
+        }
+    </style>
+    <title>会员充值</title>
+</head>
+<body>
+    <div class="container">
+        <div class="top ">
+            <div class="card">
+                <div class="card-head">
+                    <img class="vip-card-logo" src="${resourcePath}/images/vip-card-logo.png">
+                    <div class="shopName">${merchant.alias}</div>
+                </div>
+                <div class="shopDes">欢迎使用本店会员卡</div>
+                <c:if test="${not empty activityRecharge}">
+                    <div class="shopAct">
+                        <div class="iconfont icon-dian saicon"></div>
+                        充${activityRecharge.rechargeMoney}送${activityRecharge.giveMoney}
+                    </div>
+                </c:if>
+                <div class="uInfo">
+                    <div class="uInfo-lef">
+                        <div >卡号：${menber.cardNo}</div>
+                        <div class="uName">会员：${menber.nickName}</div>
+                    </div>
+                    <div class="uInfo-rig">
+                        <span class="curNumText">余额：</span>
+                        <span class="curNum">${balance}</span>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="mid">
+            <div class="rechargeNum-box">
+                <div class="rn-des">￥</div>
+                <input id="rnInput"  type="number" ${store.storeId eq 'TQTDMS' ? 'readonly' : ''}   value="" maxlength="14" class="rechargeNum-input" placeholder="${store.storeId eq 'TQTDMS' ? '不支持自定义金额' : '自定义金额'}">
+            </div>
+            <div class="choseCard-box">
+                <c:if test="${not empty list}">
+                    <c:forEach items="${list}" var="r">
+                        <div class="choseCard "> <%--cardActive--%>
+                            <div class="cardNum" data-i="${r.id}"  data-v="${r.rechargeMoney}" data-r="${r.giveMoney}" data-t="1">${r.rechargeMoney}元</div>
+                            <div class="cardNumA">送${r.giveMoney}元</div>
+                                <%--<div class="sel-icon iconfont icon-gou"></div>--%>
+                        </div>
+                    </c:forEach>
+                </c:if>
+                <c:if test="${not empty amt}">
+                    <c:forEach items="${amt}" var="a">
+                        <div class="choseCard">
+                            <div class="cardNum" data-v="${a}" data-t="0">${a}元</div>
+                        </div>
+                    </c:forEach>
+                </c:if>
+<%--                <div class="choseCard">--%>
+<%--                    <div class="cardNum" data-v="300" data-t="0">300元</div>--%>
+<%--                </div>--%>
+<%--                <div class="choseCard">--%>
+<%--                    <div class="cardNum" data-v="200" data-t="0">200元</div>--%>
+<%--                </div>--%>
+<%--                <div class="choseCard">--%>
+<%--                    <div class="cardNum" data-v="100" data-t="0">100元</div>--%>
+<%--                </div>--%>
+            </div>
+            <div class="recharge-button flex-cc" id="toRecharge">
+                <div class="iconfont recharge-loading"></div>
+                <div class="recharge-text">立即充值</div>
+            </div>
+        </div>
+        <!-- <div class="bot">
+            <div class="banlanceRecord-item">
+                <div class="bot-title">最近30天余额记录</div>
+            </div>
+            <div class="banlanceRecord-item">
+                <view class="bi-des">会员消费信息</view>
+                <view class="bi-time">2020-10-12 14:57:06</view>
+                <view class="bi-Num">-0.1元</view>
+            </div>
+            <div class="banlanceRecord-item">
+                <view class="bi-des">会员消费信息</view>
+                <view class="bi-time">2020-10-12 14:57:06</view>
+                <view class="bi-Num">-0.1元</view>
+            </div>
+
+        </div> -->
+    </div>
+</body>
+<script src="${resourcePath}/js/recharge/recharge.js" type="text/javascript" charset="utf-8"></script>
+<script src="${resourcePath}/js/jquery-weui.min.js"></script>
+<script>
+    $("#toRecharge").click(function () {
+        var rechargeAmt = $("#rnInput").val();
+        if(!rechargeAmt){
+            $.alert("请输入充值金额！");
+            return;
+        }
+        var reg = /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/;
+        if(!reg.test(rechargeAmt)){
+            $.alert("金额格式不正确！");
+            return;
+        }
+        if(parseFloat(rechargeAmt) < 0.01){
+            $.alert("最少充值0.01！");
+            return;
+        }
+       /* openLoading();
+        $(this).unbind("click","fn");*/
+        var dom = $(".cardActive");
+        var t = "0";
+        var v = rechargeAmt;
+        var i = "";
+        if(dom.length != 0){
+            t = dom.find("div").attr("data-t");
+            i = dom.find("div").attr("data-i");
+        }
+        if(t == 1){
+            var gv = dom.find("div").attr("data-r") == undefined ? 0.00 : dom.find("div").attr("data-r");
+            v = parseFloat(v) + parseFloat(gv);
+        }
+        $.confirm({
+            title: '充值',
+            text: '充值'+rechargeAmt+'元实际到账'+v+'元！',
+            onOK: function () {
+                openLoading();
+                $("#toRecharge").unbind("click","fn");
+                ajaxFormPay(t,rechargeAmt,i);
+            },
+            onCancel: function () {
+            }
+        });
+    })
+
+    function ajaxFormPay(t,rechargeAmt,i) {
+        let data = {};
+        data.storeId = '${store.id}';
+        data.appOpenId = '${appOpenId}';
+        data.rechargeAmt = rechargeAmt;
+        data.payWay = "WXZF";
+        data.payType = "03";
+        data.type = t;
+        data.aId = i;
+        let province = window.localStorage.getItem("province");
+        if(province){
+            data.province = province;
+        }
+        var url = ctx + "/merchant/toRecharge";
+        $.ajax({
+            url : url,
+            data : JSON.stringify(data),
+            dataType : "json",
+            type : "post",
+            contentType:'application/json',
+            success : function(res) {
+                $("#toRecharge").bind("click","fn");
+                closeLoading();
+                if (res.code == '200') {
+                    var rdata = res.data;
+                    var params = '?timestamp=' + rdata.payTimeStamp + '&nonceStr=' + rdata.paynonceStr
+                        + '&package=' + encodeURIComponent(rdata.payPackage) + '&signType=' + rdata.paySignType
+                        + '&paySign=' + encodeURIComponent(rdata.paySign) + '&pType=0&appId='+rdata.payAppId;
+                    var path = '../../pages/store/wxpay'+params;
+                    //通过JSSDK的api跳转到指定的小程序页面
+                    wx.miniProgram.navigateTo({url: path});
+                } else {
+                    $.alert(res.message,"系统提示");
+                    <%--$.alert(res.message,"系统提示",function (){--%>
+                    <%--    if(res.message.indexOf("收款店铺过远") > -1 && !province){--%>
+                    <%--        window.location.href = ctx + "/merchant/wxLocation?storeId=${store.id}&appOpenId=${appOpenId}";--%>
+                    <%--    }--%>
+                    <%--});--%>
+                }
+            }
+        })
+    }
+
+    function openLoading(){
+        $('.recharge-loading').addClass('icon-loading');
+        $('.recharge-text').text('支付中');
+        $('.recharge-button').css('background-color','#ec7b8e')
+    }
+    // 关闭loading
+    function closeLoading(){
+        $('.recharge-loading').removeClass('icon-loading');
+        $('.recharge-text').text('立即充值');
+        $('.recharge-button').css('background-color','#f33c5b')
+    }
+</script>
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/jsp/vip/auth.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/vip/auth.jsp
new file mode 100644
index 0000000..665b5f7
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/vip/auth.jsp
@@ -0,0 +1,47 @@
+<%@ page language="java" contentType="text/html; charset=utf-8"
+	pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<jsp:include page="../../common.jsp" />
+<title></title>
+</head>
+<body>
+
+	<input type="hidden" id="appId" value="${appId }">
+	<script type="text/javascript">
+function GetQueryString(name){
+     var reg = new RegExp("(^|&)"+ name +"=([^&]*)(&|$)");
+     var r = window.location.search.substr(1).match(reg);
+     if(r!=null)return  unescape(r[2]); return null;
+}
+
+/**
+ * 判断是否是微信浏览器
+ */
+function isWeiXin(){
+    var ua = window.navigator.userAgent.toLowerCase();
+    if(ua.match(/MicroMessenger/i) == 'micromessenger'){
+        return true;
+    }else{
+        return false;
+    }
+}
+
+
+/**
+ * 业务分流
+ */
+ var uri="${url}";
+var appId=document.getElementById("appId").value;
+if(isWeiXin()){
+	var jump='https://open.weixin.qq.com/connect/oauth2/authorize?appid='+appId+'&redirect_uri='+encodeURIComponent(uri)+'&response_type=code&scope=snsapi_userinfo&state=123#wechat_redirect';
+	window.location=jump;
+}else{
+	window.location=uri;
+}
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/jsp/vip/bestNewActivity.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/vip/bestNewActivity.jsp
new file mode 100644
index 0000000..f4e42b4
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/vip/bestNewActivity.jsp
@@ -0,0 +1,63 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html>
+<jsp:include page="../../common.jsp" />
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="viewport"
+    content="width=device-width, initial-scale=1.0, maximum-scale=1.0">   
+<title>最新活动</title>
+</head>
+<body class="pb100 lgraybg">
+        <div class="positionf wp100 left0 top0 zindex100 bluebg h40 tcenter">
+            <div>
+                <a href="${ctx }/vip/myVIPCard?storeId=${sessionScope.sessionMerchantMenber.storeId}&phone=${sessionScope.sessionMerchantMenber.phone}" class="white f21 h40 left0 top0 positiona">
+                    <span class="dblock w40 h40 icon icon-59 white f22"></span>
+                </a>
+                <span class="white">最新活动</span>
+            </div>
+        </div>
+        <!-- 容器 -->
+        <div class="weui-tab">
+            <div class="mt60">
+                <div class="mb10">
+                    <div class="weui-flex pt10 pb10 whitebg ml10 mr10 bdl2r">
+                          <div class="ml10"><img src="https://www.shouyinbei.net/resources/wap/images/acti1.png" class="dlblock fc radiusp50 vm" width="60" height="60"/></div>
+                           <div class="weui-flex__item">
+                                    <div class="mb10 f16 tleft f-black">活动类型：推荐奖励</div>
+                                    <div class="f14">有效时间：无限制</div>
+                          </div>
+                    </div>
+                </div>      
+                <div class="mb10">
+                    <div class="weui-flex pt10 pb10 whitebg ml10 mr10 bdl2g">
+                          <div class="ml10"><img src="https://www.shouyinbei.net/resources/wap/images/acti2.png" class="dlblock fc radiusp50 vm" width="60" height="60"/></div>
+                           <div class="weui-flex__item">
+                               <div class="mb10 f16 tleft f-black">活动类型：激活送</div>
+                               <div class="f14">有效时间：2019.2.1-2019.12.1</div>
+                          </div>
+                    </div>
+                </div>      
+                <div class="mb10">
+                    <div class="weui-flex pt10 pb10 whitebg ml10 mr10 bdl2o">
+                          <div class="ml10"><img src="https://www.shouyinbei.net/resources/wap/images/acti3.png" class="dlblock fc radiusp50 vm" width="60" height="60"/></div>
+                           <div class="weui-flex__item">
+                                    <div class="mb10 f16 tleft f-black">活动类型：充值送</div>
+                                    <div class="f14">有效时间：无限制</div>
+                          </div>
+                    </div>
+                </div> 
+                    <div class="mb10">
+                        <div class="weui-flex pt10 pb10 whitebg ml10 mr10 bdl2r">
+                              <div class="ml10"><img src="https://www.shouyinbei.net/resources/wap/images/acti4.png" class="dlblock fc radiusp50 vm" width="60" height="60"/></div>
+                               <div class="weui-flex__item">
+                                     <div class="mb10 f16 tleft f-black">活动类型：消费返</div>
+                                     <div class="f14">有效时间：2019.2.1-2020.2.1</div>
+                              </div>
+                        </div>
+                    </div>        
+            </div>
+        </div>
+    </body>
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/jsp/vip/consumeLog.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/vip/consumeLog.jsp
new file mode 100644
index 0000000..554c19f
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/vip/consumeLog.jsp
@@ -0,0 +1,150 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+	pageEncoding="UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> 
+<!DOCTYPE html>
+<html>
+<jsp:include page="../../common.jsp" />
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="viewport"
+	content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+<title>消费记录</title>
+</head>
+<body class="pb100">
+        <div class="positionf wp100 left0 top0 zindex100 bluebg h40 tcenter">
+            <div>
+                <a href="${ctx }/vip/myVIPCard?storeId=${sessionScope.sessionMerchantMenber.storeId}&phone=${sessionScope.sessionMerchantMenber.phone}" class="white f21 h40 left0 top0 positiona">
+                    <span class="dblock w40 h40 icon icon-59 white f22"></span>
+                </a>
+                <span class="white">消费记录</span>
+            </div>
+        </div>
+        <!-- 容器 -->
+        <div class="weui-tab">
+            <div class="mt60">
+                <div id="data_content">
+                <c:forEach items="${merchantMenberComsumeList }" var="mcs">
+                    <div class="weui-flex pt10 pb10 bdbe">
+                          <div class="ml10"><img src="https://www.shouyinbei.net/resources/wap/images/bg.png" class="dlblock fc radiusp50 vm" width="45" height="45"/></div>
+                           <div class="weui-flex__item">
+                                    <div class="mb10 f16 tleft ml10 f-black">${mcs.nickName }</div>
+                                    <div class="f14 ml10"><fmt:formatDate value='${mcs.createDt }' pattern='yyyy-MM-dd HH:mm:ss' /></div>
+                          </div>
+                          <div class="mr10 f16 tright pt10 f-black">-${mcs.comsumeMoney }</div>
+                    </div>
+                </c:forEach>
+                </div>      
+            </div>
+        </div>
+    </body>
+    <input type="hidden" id="memberCode" name="memberCode" value="${memberCode }" />
+    <input type="hidden" id="storeId" name="storeId" value="${storeId }" />
+    <!-- 定义分页的当前页码和总页码start -->
+            <input type="hidden" id="currPage" value="1" />
+            <input type="hidden" id="PageCount" value="0" />
+    
+    <script type="text/javascript">
+    
+    var pageIndex=1;
+    $(document).ready(function(){
+        //调用查询
+        pageIndex=StringUtil.getQueryString('pageIndex');
+        if(pageIndex==undefined||pageIndex==null){
+            pageIndex=1;
+        }
+        queryConsumeLog(pageIndex);
+    });
+    
+    var loading = false;  //状态标记
+    $(document.body).infinite().on("infinite",function() {
+      if(loading) return;
+      loading = true;
+      setTimeout(function() {
+          if ($('#currPage').val()<=$('#PageCount').val()) {
+              queryConsumeLog($('#currPage').val());
+            } else {
+                $.toast("已到底！", "text");
+            }
+        loading = false;
+      }, 1500);   //模拟延迟
+    });
+
+    function queryConsumeLog(index){
+        if(typeof(index)=='undefined'){
+            index=1;
+        }
+         $.ajax({
+             url:ctx+'/vip/goConsumeLog',
+             data:{
+                "currPage":index,
+                "memberCode":$("#memberCode").val(),
+                "storeId":$("#storeId").val(),
+             },
+             dataType:"json",
+             type:"post",
+             success:function(result){
+            	 if(result.merchantMenberComsumeList.lenght==0){}else{
+            		 var data='';
+                     $.each(result.merchantMenberComsumeList,function(i){
+                         var merchantMenberComsume=result.merchantMenberComsumeList[i];
+                         var createDt='';
+                         if(StringUtil.isNotBlank(merchantMenberComsume.createDt)){
+                        	 createDt = myTime(merchantMenberComsume.createDt);
+                         	createDt = formatDateTime(createDt);
+                         }
+                        data+='<div class="weui-flex pt10 pb10 bdbe">';
+                        data+='<div class="ml10"><img src="'+ctx+'/resources/images/bg.png" class="dlblock fc radiusp50 vm" width="45" height="45"/></div>';
+                        data+=' <div class="weui-flex__item">';
+                        data+=' <div class="mb10 f16 tleft ml10 f-black">'+merchantMenberComsume.nickName+'</div>';
+                        data+='<div class="f14 ml10">'+createDt+'</div>';
+                        data+='</div>';
+                        data+='<div class="mr10 f16 tright pt10 f-black">-'+merchantMenberComsume.comsumeMoney+'</div>';
+                        data+='</div>';
+                     });
+                     $('#data_content').append(data);
+                     $('#currPage').val(result.currPage + 1);
+                     $('#PageCount').val(result.pageCount);
+            	 }
+                
+                 
+                 
+                 
+             }
+          })
+    }
+    
+    
+    function myTime(date){
+        var arr=date.split("T");
+        var d=arr[0];
+        var darr = d.split('-');
+
+        var t=arr[1];
+        var tarr = t.split('.000');
+        var marr = tarr[0].split(':');
+
+        var dd = parseInt(darr[0])+"/"+parseInt(darr[1])+"/"+parseInt(darr[2])+" "+parseInt(marr[0])+":"+parseInt(marr[1])+":"+parseInt(marr[2]);
+        return dd;
+    }
+
+    function  addZero(num) {
+        return num < 10 ? '0' + num : num;
+    }
+
+    function formatDateTime (date) {
+        var time = new Date(Date.parse(date));
+        time.setTime(time.setHours(time.getHours() + 8));
+        var Y = time.getFullYear() + '/';
+        var M = this.addZero(time.getMonth() + 1) + '/';
+        var D = this.addZero(time.getDate()) + ' ';
+        var h = this.addZero(time.getHours()) + ':';
+        var m = this.addZero(time.getMinutes()) + ':';
+        var s = this.addZero(time.getSeconds());
+        return Y + M + D + h + m + s;
+    }
+
+    </script>
+    
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/jsp/vip/goPay.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/vip/goPay.jsp
new file mode 100644
index 0000000..c5c11f0
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/vip/goPay.jsp
@@ -0,0 +1,213 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+	pageEncoding="UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> 
+<!DOCTYPE html>
+<html>
+<jsp:include page="../../common.jsp" />
+<style type="text/css">
+    .weui-cell{
+        justify-content: space-between;
+    }
+
+    .middle-inner {
+        display: table-cell;
+        vertical-align: middle;
+        text-align: center;
+    }
+    .backdrop {
+        position: fixed;
+        z-index: 998;
+        top: 0;
+        right: 0;
+        bottom: 0;
+        left: 0;
+        background-color: rgba(0,0,0,.1);
+    }
+</style>
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="viewport"
+	content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+<title>去充值</title>
+</head>
+<body>
+        <div id='loading' class="backdrop" style="display: none; padding-top: 70%; text-align: center;">
+            <div>
+                <img src="${resourcePath}/images/loading-2.gif" alt="loading" />
+            </div>
+            <div style="font-family:'Microsoft YaHei';color:#000000;font-size: 1rem;">支付中...</div>
+            <!--自己放loding图片-->
+        </div>
+        <div class="page-title tcenter h40 bluebg white">
+            <span>去充值</span>
+            <a href="${ctx }/vip/myVIPCard?storeId=${sessionScope.sessionMerchantMenber.storeId}&phone=${sessionScope.sessionMerchantMenber.phone}" class="white f21 h40 left0 top0 positiona">
+                <span class="dblock w40 h40 icon icon-59 white f22"></span>
+            </a>
+        </div>
+        <div class="weui-cells weui-cells_form bdb5">
+            <div class="weui-cell">
+                <div class="weui-cell__hd"><label class="weui-label">当前余额:</label></div>
+                <div class="weui-cell__bd tright f-red">
+                    ¥<fmt:formatNumber type="number" value="${merchantMenber.usableRechargeFee + merchantMenber.usableGiveFee }" pattern="0.00" maxFractionDigits="2"/>
+                </div>
+            </div>
+        </div>
+        <div class="weui-cells weui-cells_form bdbe">
+            <div class="weui-cell weui-cell_warn">
+                <div class="weui-cell__hd"><label for="" class="weui-label f-black f22">¥</label></div>
+                <div class="weui-cell__bd">
+                    <input class="weui-input tright" type="text" id="rechargeMoney"   placeholder="请输入充值金额">
+                </div>
+            </div>
+        </div>
+        <div class="weui-cells weui-cells_form bdbe pb20">
+            <div class="tcenter clearfix payTab">
+                <c:forEach items="${activityRechargeList }" var="activityRecharge">
+                    <div class="f16 fl tcenter pt20 wp33">
+                        <a href="javascript:void(0);" class="dblock radius5 pt10 pb10 ml10 mr10 option">
+                            <div class="middle-inner">${activityRecharge.rechargeMoney}元<br/>送${activityRecharge.giveMoney}元</div>
+                        </a>
+                    </div>
+                </c:forEach>
+                <div class="f16 fl tcenter pt20 wp33">
+                    <a href="javascript:void(0);" class="dblock radius5 pt10 pb10 ml10 mr10 option">
+                        <div class="middle-inner">50元</div>
+                    </a>
+                </div>
+                <div class="f16 fl tcenter pt20 wp33">
+                    <a href="javascript:void(0);" class="dblock radius5 pt10 pb10 ml10 mr10 option">
+                        <div class="middle-inner">100元</div>
+                    </a>
+                </div>
+                <div class="f16 fl tcenter pt20 wp33">
+                    <a href="javascript:void(0);" class="dblock radius5 pt10 pb10 ml10 mr10 option">
+                        <div class="middle-inner">150元</div>
+                    </a>
+                </div>
+                <div class="f16 fl tcenter pt20 wp33">
+                    <a href="javascript:void(0);" class="dblock radius5 pt10 pb10 ml10 mr10 option">
+                        <div class="middle-inner">200元</div>
+                    </a>
+                </div>
+                <div class="f16 fl tcenter pt20 wp33">
+                    <a href="javascript:void(0);" class="dblock radius5 pt10 pb10 ml10 mr10 option">
+                        <div class="middle-inner">500元</div>
+                    </a>
+                </div>
+            </div>
+        </div>
+        <div class="weui-cells weui-cells_form bdbe">
+            <div class="weui-cell weui-cell_warn">
+                <div class="weui-cell__hd"><span class="icon icon-14 f22 vm f-green"></span><span class="f-black vm f14 ml10">微信充值</span></div>
+                <div class="weui-cells weui-cells_checkbox">
+                    <label class="weui-cell weui-check__label" style="padding:0;">
+                        <div class="weui-cell__hd">
+                            <input type="checkbox" class="weui-check" name="checkbox1" checked="checked">
+                            <i class="weui-icon-checked"></i>
+                        </div>
+                    </label>
+                </div>
+            </div>
+        </div>
+        <div class="btn mt60 ml20 mr20">
+            <a href="javascript:wechatPay()" class="weui-btn weui-btn_primary radius10 f14 pt15 pb15">去充值</a>
+        </div>
+ <script>
+     $(function(){
+         $(".payTab>div").click(function(){
+             $(this).addClass("current").siblings("div").removeClass("current");
+             var a=$(".current a>div").text();
+             var money=a.split('元');
+             var rechargeMoney=money[0];
+             $("#rechargeMoney").val(rechargeMoney);
+         })
+
+         var maxHeight = 0;
+         $(".option").each(function() {
+            var height = $(this).height();
+            maxHeight = Math.max(maxHeight, height);
+         });
+
+         $(".option").height(maxHeight);
+
+         $(".option>div").height(maxHeight);
+         $(".option>div").width($(".option").width());
+
+         // $(".option").css('line-height', maxHeight);
+     })
+    function wechatPay(){
+        var rechargeMoney=$("#rechargeMoney").val();
+        if(StringUtil.isNotTwo(rechargeMoney)){
+            if(StringUtil.isBlank(rechargeMoney)){
+            alert("请输入金额");
+            return;
+            }
+            alert('请输入正确的金额格式(正整数或小数)');
+            return;
+        }
+        if(StringUtil.isNotBlank(rechargeMoney)){
+            if(rechargeMoney<0.01){
+                alert('充值金额必须大于0.01');
+                return;
+            }
+        }
+        $('#loading').css('display','block');
+        $.ajax({
+            url:ctx+"/vip/wechatPay",
+            type:"POST",
+            dataType:'json',
+            data:{
+            	"rechargeMoney":rechargeMoney,
+            },
+            success:function(res){
+                $('#loading').css('display','none');
+                var rdata = res.data;
+                if(res.code=="1"){
+                    WeixinJSBridge.invoke('getBrandWCPayRequest', {
+                        // 商品名称
+                        "appId":rdata.appId,
+                        "timeStamp":rdata.timeStamp,
+                        "nonceStr":rdata.nonceStr,
+                        "package":rdata.packageMsg,
+                        "signType":rdata.signType,
+                        "paySign":rdata.paySgin,
+                    }, function(res) {
+                        if (res.err_msg == "get_brand_wcpay_request:ok") {
+                            window.location = ctx +'/vip/rechargeSuccess';
+                        } else {
+                        	 window.location = ctx +'/vip/rechargeFail';
+                        }
+                    })
+                }else if(res.code=="2"){
+                    if(res.aisleSwitch == "1"){
+                        window.location=res.jspay_url;
+                    }else if(res.aisleSwitch == "2"){
+                        WeixinJSBridge.invoke('getBrandWCPayRequest', {
+                            // 商品名称
+                            "appId" : rdata.payAppId,
+                            "timeStamp" : rdata.payTimeStamp,
+                            "nonceStr" : rdata.paynonceStr,
+                            "package" : rdata.payPackage,
+                            "signType" : rdata.paySignType,
+                            "paySign" : rdata.paySign,
+                        }, function(res) {
+                            if (res.err_msg == "get_brand_wcpay_request:ok") {
+                                //成功之后跳转地址
+                                window.location = ctx +'/vip/rechargeSuccess';
+                            } else {
+                                window.location = ctx +'/vip/rechargeFail';
+                            }
+                        })
+                    }
+                }else{
+                    $.toast(res.msg,"text");
+                }
+            }
+        });  
+    }
+ </script>
+    </body>
+
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/jsp/vip/goPayment.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/vip/goPayment.jsp
new file mode 100644
index 0000000..7d977a8
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/vip/goPayment.jsp
@@ -0,0 +1,52 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html>
+<jsp:include page="../../common.jsp" />
+<script type="text/javascript" src="https://www.shouyinbei.net/resources/wap/js/jquery.qrcode.js"></script>
+<script type="text/javascript" src="https://www.shouyinbei.net/resources/wap/js/qrcode.js"></script>
+<!-- <script type="text/javascript">
+     require("js/jquery.qrcode.js");
+     require("js/qrcode.js");
+</script> -->
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="viewport"
+    content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+<title>会员卡付款码</title>
+</head>
+<body class="bluebg">
+        <div class="positionf wp100 left0 top0 zindex100 h40 tcenter">
+            <div>
+                <a href="${ctx }/vip/myVIPCard?storeId=${sessionScope.sessionMerchantMenber.storeId}&phone=${sessionScope.sessionMerchantMenber.phone}" class="white f21 h40 left0 top0 positiona">
+                    <span class="dblock w40 h40 icon icon-59 white f22"></span>
+                </a>
+                <span class="white">会员卡付款码</span>
+            </div>
+        </div>
+        <!-- 容器 -->
+        <div class="weui-tab">
+            <div class="mt50">
+                <div class="ml20 mr20 pt20 fc cardbg">
+                    <div class="lgraybg radius5" id="qrcodeTable" style="width: 210px;margin:15px auto"></div>
+                    <div class="pt10 pb50 tcenter f14"><span class="f-red">*注:</span><span class="">此码仅供对应储值门店会员余额消费使用</span></div>
+                </div>
+            </div>
+        </div>
+        <input type="hidden" id="website" value="${website}">
+        <script type="text/javascript">
+             $(function(){
+               var website=$("#website").val();
+                $(".lgraybg").height($(".lgraybg").width());
+                jQuery('#qrcodeTable').qrcode({
+                    //这种方式兼容IE8
+                    text: website,
+                     width:210,         // 宽度
+                    height:210,  
+        });
+            });
+          
+        </script>
+    </body>
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/jsp/vip/index.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/vip/index.jsp
new file mode 100644
index 0000000..1089492
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/vip/index.jsp
@@ -0,0 +1,13 @@
+<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<jsp:include page="../../common.jsp" />
+<title></title>
+</head>
+<body>
+index.jsp
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/jsp/vip/inputComsumeMoney.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/vip/inputComsumeMoney.jsp
new file mode 100644
index 0000000..6780778
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/vip/inputComsumeMoney.jsp
@@ -0,0 +1,48 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html>
+<jsp:include page="../../common.jsp" />
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="viewport"
+    content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+<title>输入消费金额</title>
+</head>
+<body>
+        <div class="page-title tcenter h40 bluebg white">
+            <span>输入消费金额</span>
+            <a href="${ctx }/vip/myVIPCard?storeId=${sessionScope.sessionMerchantMenber.storeId}&phone=${sessionScope.sessionMerchantMenber.phone}" class="white f21 h40 left0 top0 positiona">
+                <span class="dblock w40 h40 icon icon-59 white f22"></span>
+            </a>
+        </div>
+        <div class="weui-cells weui-cells_form bdbe">
+            <div class="weui-cell weui-cell_warn">
+                <div class="weui-cell__hd"><label for="" class="weui-label f-black f22">¥</label></div>
+                <div class="weui-cell__bd">
+                    <input class="weui-input tright" name="comsumeMoney" id="comsumeMoney" type="number" pattern="[0-9]*" value="weui input error" placeholder="请输入消费金额">
+                </div>
+            </div>
+        </div>
+        <input type="hidden" id="cardNo" value="${cardNo}">
+        <input type="hidden" id="storeId" value="${storeId}">
+        <div class="btn mt60 ml20 mr20">
+            <a href="javascript:void(0);onclick=paySuccessOrFail()"  class="weui-btn weui-btn_primary radius10 f14 pt15 pb15">确认</a>
+        </div>
+    </body>
+    
+     <script type="text/javascript">
+      function paySuccessOrFail(){
+            var comsumeMoney=$("#comsumeMoney").val();
+            var storeId=$("#storeId").val();
+            var cardNo=$("#cardNo").val();
+            if(comsumeMoney==""){
+            	alert("请输入金额");
+            	return;
+            }
+             window.location=ctx+'/vip/paySuccessOrFail?cardNo='+cardNo+'&storeId='+storeId+'&comsumeMoney='+comsumeMoney+'';
+         }
+ </script>
+
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/jsp/vip/myVIPCard.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/vip/myVIPCard.jsp
new file mode 100644
index 0000000..b7dca00
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/vip/myVIPCard.jsp
@@ -0,0 +1,142 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+	pageEncoding="UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> 
+<!DOCTYPE html>
+<html>
+<jsp:include page="../../common.jsp" />
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="viewport"
+	content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+<title>个人中心</title>
+<style type="text/css">
+      .pd {
+        padding: 30px 0px;
+      }
+      .ma {
+        margin: 10px 10px;
+      }
+      .bottom0 {
+        bottom: 30px;
+      }
+      .myName{
+      	width:100px;
+      	overflow: hidden;
+	    white-space: nowrap;
+	    text-overflow: ellipsis;
+      }
+    </style>
+</head>
+<body class="">
+	<div
+		class="page-title tcenter bluebg h40 white positionf wp100 left0 top0 zindex100">
+		<div>
+			<span>我的会员卡</span>
+		</div>
+	</div>
+	<div class="gbluebg positionr mt60 ml10 mr10 pl20 pr20 positionr" style="padding: 30px">
+	<div class="padding:20px 0;">
+		<div class="weui-flex">
+			<div>
+				<img src="${merchantMenber.logo }" onerror="this.src='https://www.shouyinbei.net/resources/wap/images/bg.png'"
+					class="dlblock fc radiusp50 vm" width="60" height="60" />
+			</div>
+			<div class="weui-flex__item white pt10">
+				<div class="weui-flex" style="padding-right:5px;">
+					<div class="mb10 f16 weui-flex__item tleft ml10">${merchantMenber.nickName}</div>
+					<div class="mb10 f16 weui-flex__item tright myName" onclick="membercode(this)" data-membercode='${merchantMenber.memberCode}'>${merchantMenber.storeName}</div>
+					<span style="margin-top:-5px;">&nbsp;<img src="https://www.shouyinbei.net/resources/images/right.png"></span>
+				</div>
+				<div class="f14 ml10">卡号:${merchantMenber.cardNo }</div>
+			</div>
+		</div>
+		<div class="f14 pt20 white">
+		
+		<c:if test="${not empty activityRechargeList }">
+			<div class="mb10 ma">
+				<span class="icon icon-18 f14 vm"></span><span class="vm ml10">
+				<c:forEach var="activityRecharge" items="${activityRechargeList }">
+				    充<fmt:formatNumber type="number" value="${activityRecharge.rechargeMoney }" pattern="0.00" maxFractionDigits="2"/> 送<fmt:formatNumber type="number" value="${activityRecharge.giveMoney}" pattern="0.00" maxFractionDigits="2"/>；
+				</c:forEach>
+				</span>
+			</div>
+		</c:if>
+		
+		<c:if test="${not empty activityConsumReturnList}">
+			<div class="mb10 ma">
+				<span class="icon icon-18 f14 vm"></span><span class="vm ml10">
+				<c:forEach items="${activityConsumReturnList }" var="activityConsumReturn">
+				          消费<fmt:formatNumber type="number" value="${activityConsumReturn.comsumeMoney }" pattern="0.00" maxFractionDigits="2"/> 返<fmt:formatNumber type="number" value="${activityConsumReturn.returnMoney }" pattern="0.00" maxFractionDigits="2"/>
+				</c:forEach>
+				</span>
+			</div>
+			
+		</c:if>	
+		<c:if test="${not empty activityActivateList }">
+			<div class="mb10 ma">
+				<span class="icon icon-18 f14 vm"></span><span class="vm ml10">
+				<c:forEach items="${activityActivateList}" var="activityActivate">
+				        激活会员送<fmt:formatNumber type="number" value="${activityActivate.giveMoney}" pattern="0.00" maxFractionDigits="2"/> 
+				</c:forEach>
+				</span>
+			</div>
+        </c:if>
+        
+			<div class="tright">
+				<span><img src="https://www.shouyinbei.net/resources/wap/images/wollet.png" width="20"></span> <span
+					>钱包</span> <span class="f28"><fmt:formatNumber type="number" value="${merchantMenber.usableRechargeFee + merchantMenber.usableGiveFee }" pattern="0.00" maxFractionDigits="2"/></span>
+			</div>
+		</div>
+		</div>
+	</div>
+	<div class="weui-flex mt20">
+		<div class="f16 weui-flex__item tcenter">
+			<a href="${ctx }/vip/goPay?cardNo=${merchantMenber.cardNo}" class="bdr dblock ml30 mr20 radius5 pt10 pb10">去充值</a>
+		</div>
+		<%-- <div class="f16 weui-flex__item tcenter">
+			<a href="${ctx }/vip/goPayment"
+				class="bdr dblock mr30 ml20 radius5 pt10 pb10">去支付</a>
+		</div> --%>
+	</div>
+	<div class="weui-panel__bd mt20">
+		<div class="weui-media-box weui-media-box_small-appmsg">
+			<div class="weui-cells">
+				<%-- <a class="weui-cell weui-cell_access bdbe" href="${ctx }/vip/bestNewActivity">
+					<div class="weui-cell__hd">
+						<img src="https://www.shouyinbei.net/resources/wap/images/icon1.png" width="18">
+					</div>
+					<div class="weui-cell__bd weui-cell_primary">
+						<p class="f15 pl5 f-black">会员活动</p>
+					</div> <span class="weui-cell__ft"></span>
+				</a>  --%>
+				<a class="weui-cell weui-cell_access bdbe" href="${ctx }/vip/rechargeLog">
+					<div class="weui-cell__hd">
+						<img src="https://www.shouyinbei.net/resources/wap/images/icon2.png" width="18">
+					</div>
+					<div class="weui-cell__bd weui-cell_primary">
+						<p class="f15 pl5 f-black">充值记录</p>
+					</div> <span class="weui-cell__ft"></span>
+				</a> 
+				<a class="weui-cell weui-cell_access bdbe" href="${ctx }/vip/consumeLog">
+					<div class="weui-cell__hd">
+						<img src="https://www.shouyinbei.net/resources/wap//images/icon3.png" width="18">
+					</div>
+					<div class="weui-cell__bd weui-cell_primary">
+						<p class="f15 pl5 f-black">消费记录</p>
+					</div> <span class="weui-cell__ft"></span>
+				</a>
+			</div>
+		</div>
+	</div>
+</body>
+<script type="text/javascript">
+  function membercode(obj){
+	  var membercode=$(obj).data('membercode');
+	  window.location=ctx+'/vip/storeChoose?membercode='+membercode;
+  }
+
+</script>
+
+
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/jsp/vip/noVipCard.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/vip/noVipCard.jsp
new file mode 100644
index 0000000..b29f4b5
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/vip/noVipCard.jsp
@@ -0,0 +1,28 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html>
+<jsp:include page="../../common.jsp" />
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="viewport"
+    content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+<title>提示</title>
+</head>
+  <body style="background:#ffff;">
+        <div class="login_form ml20 mr20 mt50">
+            <form method="post">
+                <div class="weui-cells weui-cells_form mt50 tcenter">   
+                    <div class=" f55 white dlblock radiusp50 padding15">
+                        <img src="${resourcePath}/images/bg_error_msg.png" width="100" height="100">
+                    </div>
+                    <div class="mt30" style="font-weight: 700;color: #000000;font-size: 15px;text-align: center;">
+                        ${msg}
+                    </div>
+                </div>
+            </form>
+        </div>
+    </body>
+
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/jsp/vip/payFail.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/vip/payFail.jsp
new file mode 100644
index 0000000..2f4c323
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/vip/payFail.jsp
@@ -0,0 +1,39 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html>
+<jsp:include page="../../common.jsp" />
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="viewport"
+    content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+<title>支付失败</title>
+</head>
+  <body style="background:#f7f8fa;">
+        <div class="page-title tcenter bluebg white h40 white positionr">
+            <div>
+                <span>支付失败</span>
+                <a href="${url}/vip/myVIPCard?storeId=${sessionScope.sessionMerchantMenber.storeId}&phone=${sessionScope.sessionMerchantMenber.phone}" class="white f21 h40 left0 top0 positiona">
+                    <span class="dblock w40 h40 icon icon-59 white f22"></span>
+                </a>
+            </div>
+        </div>
+        <div class="login_form ml20 mr20 mt50">
+            <form method="post">
+                <div class="weui-cells weui-cells_form mt50 tcenter">   
+                    <div class="bg-red icon icon-95 f55 white dlblock radiusp50 padding15">
+                        
+                    </div>
+                    <div class="mt30" style="font-weight: 700;color: #000;font-size: 22px;text-align: center;">
+                        支付失败！
+                    </div>
+                </div>
+                <div class="btn mt50">
+                    <a href="${url}/vip/myVIPCard?storeId=${sessionScope.sessionMerchantMenber.storeId}&phone=${sessionScope.sessionMerchantMenber.phone}" class="weui-btn weui-btn_primary radius10 f16 pt10 pb10">确定</a>
+                </div>
+            </form>
+        </div>
+    </body>
+
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/jsp/vip/paySuccess.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/vip/paySuccess.jsp
new file mode 100644
index 0000000..f28393f
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/vip/paySuccess.jsp
@@ -0,0 +1,39 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html>
+<jsp:include page="../../common.jsp" />
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="viewport"
+    content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+<title>支付成功</title>
+</head>
+  <body style="background:#f7f8fa;">
+        <div class="page-title tcenter bluebg white h40 white positionr">
+            <div>
+                <span>支付成功</span>
+                <a href="${url}/vip/myVIPCard?storeId=${sessionScope.sessionMerchantMenber.storeId}&phone=${sessionScope.sessionMerchantMenber.phone}" class="white f21 h40 left0 top0 positiona">
+                    <span class="dblock w40 h40 icon icon-59 white f22"></span>
+                </a>
+            </div>
+        </div>
+        <div class="login_form ml20 mr20 mt50">
+            <form method="post">
+                <div class="weui-cells weui-cells_form mt50 tcenter">   
+                    <div class="bg-green icon icon-66 f55 white dlblock radiusp50 padding15">
+                        
+                    </div>
+                    <div class="mt30" style="font-weight: 700;color: #000;font-size: 22px;text-align: center;">
+                        支付成功！
+                    </div>
+                </div>
+                <div class="btn mt50">
+                    <a href="${url}/vip/myVIPCard?storeId=${sessionScope.sessionMerchantMenber.storeId}&phone=${sessionScope.sessionMerchantMenber.phone}" class="weui-btn weui-btn_primary radius10 f16 pt10 pb10">确定</a>
+                </div>
+            </form>
+        </div>
+    </body>
+
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/jsp/vip/rechargeLog.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/vip/rechargeLog.jsp
new file mode 100644
index 0000000..452a7b2
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/vip/rechargeLog.jsp
@@ -0,0 +1,155 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html>
+<jsp:include page="../../common.jsp" />
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="viewport"
+    content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+<title>充值记录</title>
+</head>
+    <body class="pb100">
+        <div class="positionf wp100 left0 top0 zindex100 bluebg h40 tcenter">
+            <div>
+                <a href="${ctx }/vip/myVIPCard?storeId=${sessionScope.sessionMerchantMenber.storeId}&phone=${sessionScope.sessionMerchantMenber.phone}" class="white f21 h40 left0 top0 positiona">
+                    <span class="dblock w40 h40 icon icon-59 white f22"></span>
+                </a>
+                <span class="white">充值记录</span>
+            </div>
+        </div>
+        <!-- 容器 -->
+        <div class="weui-tab">
+            <div class="mt50" id="data_content">
+                <div class="weui-flex lgraybg">
+               <div class="weui-flex__item pt15 pb15 dgray tcenter f14">金额(元)</div>
+                <div class="weui-flex__item pt15 pb15 dgray tcenter f14">时间</div>
+                <div class="weui-flex__item pt15 pb15 dgray tcenter f14">状态</div>
+                </div>
+            
+            </div>
+        </div>
+    </body>
+    <input type="hidden" id="memberCode" name="memberCode" value="${memberCode }" />
+    <input type="hidden" id="storeId" name="storeId" value="${storeId }" />
+    
+     <!-- 定义分页的当前页码和总页码start -->
+            <input type="hidden" id="currPage" value="1" />
+            <input type="hidden" id="PageCount" value="0" />
+<script type="text/javascript">
+
+
+
+var pageIndex=1;
+$(document).ready(function(){
+    //调用查询
+    pageIndex=StringUtil.getQueryString('pageIndex');
+    if(pageIndex==undefined||pageIndex==null){
+        pageIndex=1;
+    }
+    queryMerchantMenberRecharge(pageIndex);
+});
+
+var loading = false;  //状态标记
+$(document.body).infinite().on("infinite",function() {
+  if(loading) return;
+  loading = true;
+  setTimeout(function() {
+      if ($('#currPage').val()<=$('#PageCount').val()) {
+    	  queryMerchantMenberRecharge($('#currPage').val());
+        } else {
+            $.toast("已到底！", "text");
+        }
+    loading = false;
+  }, 1500);   //模拟延迟
+});
+
+
+
+//查询
+function queryMerchantMenberRecharge(index){
+    if(typeof(index)=='undefined'){
+        index=1;
+    }
+    var url=ctx+'/vip/goRechargeLog';
+    $.ajax({  
+        url:url,  
+        type:"post", 
+        dataType:"json",
+        data:{  
+            "currPage":index,
+             "memberCode":$("#memberCode").val(),
+             "storeId":$("#storeId").val(),
+        },  
+        success:function(result){
+        	if(result.merchantMenberRechargeList.lenght==0){}else{
+        		var data='';
+                $.each(result.merchantMenberRechargeList,function(i){
+                    var merchantMenberRecharge=result.merchantMenberRechargeList[i];
+                    console.log(new Date(merchantMenberRecharge.createDt) instanceof Date);
+                    console.log(merchantMenberRecharge.createDt);
+                    var createDt='';
+                    if(StringUtil.isNotBlank(merchantMenberRecharge.createDt)){
+                    	createDt = myTime(merchantMenberRecharge.createDt);
+                    	createDt = formatDateTime(createDt);
+                    }
+                    data+='<div class="weui-flex bdbe">';
+                    data+='<div class="weui-flex__item pt15 pb15 tcenter f14">¥'+merchantMenberRecharge.rechargeMoney+'</div>';
+                    data+='<div class="weui-flex__item pt15 pb15 tcenter f14">'+createDt+'</div>';
+                    data+='<div class="weui-flex__item pt15 pb15 tcenter f14 f-green">充值成功</div>';
+                    data+='</div>';
+                });
+                $('#data_content').append(data);
+                $('#currPage').val(result.currPage + 1);
+                $('#PageCount').val(result.pageCount);
+        	}
+        } 
+    });  
+}
+
+
+
+function myTime(date){
+    var arr=date.split("T");
+    var d=arr[0];
+    var darr = d.split('-');
+
+    var t=arr[1];
+    var tarr = t.split('.000');
+    var marr = tarr[0].split(':');
+
+    var dd = parseInt(darr[0])+"/"+parseInt(darr[1])+"/"+parseInt(darr[2])+" "+parseInt(marr[0])+":"+parseInt(marr[1])+":"+parseInt(marr[2]);
+    return dd;
+}
+
+function  addZero(num) {
+    return num < 10 ? '0' + num : num;
+}
+
+function formatDateTime (date) {
+    var time = new Date(Date.parse(date));
+    time.setTime(time.setHours(time.getHours() + 8));
+    var Y = time.getFullYear() + '/';
+    var M = this.addZero(time.getMonth() + 1) + '/';
+    var D = this.addZero(time.getDate()) + ' ';
+    var h = this.addZero(time.getHours()) + ':';
+    var m = this.addZero(time.getMinutes()) + ':';
+    var s = this.addZero(time.getSeconds());
+    return Y + M + D + h + m + s;
+}
+
+
+
+
+
+
+
+
+
+
+
+    
+</script>
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/jsp/vip/storeChoose.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/vip/storeChoose.jsp
new file mode 100644
index 0000000..ff9f4c6
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/vip/storeChoose.jsp
@@ -0,0 +1,34 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html>
+<jsp:include page="../../common.jsp" />
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="viewport"
+    content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+<title>门店选择</title>
+</head>
+  <body class="pb100">
+        <div class="positionf wp100 left0 top0 zindex100 bluebg h40 tcenter">
+            <div>
+                <a href="${ctx }/vip/myVIPCard?storeId=${sessionScope.sessionMerchantMenber.storeId}&phone=${sessionScope.sessionMerchantMenber.phone}" class="white f21 h40 left0 top0 positiona">
+                    <span class="dblock w40 h40 icon icon-59 white f22"></span>
+                </a>
+                <span class="white">门店选择</span>
+            </div>
+        </div>
+        <!-- 容器 -->
+        <div class="weui-tab">
+            <div class="mt50">
+	            <c:forEach items="${merchantMenberList }" var="mbe">
+	                 <div class="pt15 pb15 pl10 bdbe pr10 f-black">
+	                    <a href="${ctx}/vip/myVIPCard?storeId=${mbe.storeId}&phone=${mbe.phone}" class="f-black">${mbe.merchantName }(${mbe.storeName })</a>
+	                </div>
+	            </c:forEach>
+            </div>
+        </div>
+    </body>
+
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/jsp/vip/vipActivity.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/vip/vipActivity.jsp
new file mode 100644
index 0000000..5968fee
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/vip/vipActivity.jsp
@@ -0,0 +1,83 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<!DOCTYPE html>
+<html>
+<jsp:include page="../../common.jsp" />
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="viewport"
+    content="width=device-width, initial-scale=1.0, maximum-scale=1.0">   
+<title>最新活动</title>
+</head>
+    <body class="pb100 lgraybg">
+        <div class="positionf wp100 left0 top0 zindex100 bluebg h40 tcenter">
+            <div>
+                <a href="${ctx }/vip/myVIPCard?storeId=${sessionScope.sessionMerchantMenber.storeId}&phone=${sessionScope.sessionMerchantMenber.phone}" class="white f21 h40 left0 top0 positiona">
+                    <span class="dblock w40 h40 icon icon-59 white f22"></span>
+                </a>
+                <span class="white">会员活动</span>
+            </div>
+        </div>
+        <!-- 容器 -->
+        <div class="weui-tab">
+            <div class="mt60">
+            <c:if test="${not empty activityRecommend }">
+                <div class="mb10">
+                    <div class="weui-flex pt10 pb10 whitebg ml10 mr10 bdl2r">
+                          <div class="ml10"><img src="https://www.shouyinbei.net/resources/wap/images/acti1.png" class="dlblock fc radiusp50 vm" width="60" height="60"/></div>
+                           <div class="weui-flex__item">
+                                    <div class="mb10 f16 tleft f-black">活动类型：推荐奖励</div>
+                                    <div class="f14">有效时间：无限制</div>
+                          </div>
+                    </div>
+                </div>  
+                </c:if>  
+                <c:if test="${not empty activityActivate }"> 
+                <div class="mb10">
+                    <div class="weui-flex pt10 pb10 whitebg ml10 mr10 bdl2g">
+                          <div class="ml10"><img src="https://www.shouyinbei.net/resources/wap/images/acti2.png" class="dlblock fc radiusp50 vm" width="60" height="60"/></div>
+                           <div class="weui-flex__item">
+                                    <div class="mb10 f16 tleft f-black">活动类型：激活送</div>
+                                    <div class="f14">有效时间：无限制</div>
+                          </div>
+                    </div>
+                </div>
+                </c:if> 
+                <c:if test="${not empty activityRecharge }">
+	                <div class="mb10">
+	                    <div class="weui-flex pt10 pb10 whitebg ml10 mr10 bdl2o">
+	                          <div class="ml10"><img src="https://www.shouyinbei.net/resources/wap/images/acti3.png" class="dlblock fc radiusp50 vm" width="60" height="60"/></div>
+	                           <div class="weui-flex__item">
+	                                    <div class="mb10 f16 tleft f-black">活动类型：充值送</div>
+	                                    <c:if test="${activityRecharge.timeType eq '1' }">
+                                          <div class="f14">有效时间：<fmt:formatDate value="${activityRecharge.startDt}" pattern="yyyy.MM.dd"/>-<fmt:formatDate value="${activityRecharge.endDt}" pattern="yyyy.MM.dd"/></div>
+                                        </c:if>
+                                        <c:if test="${activityRecharge.timeType eq '0' }">
+                                          <div class="f14">有效时间：无限制</div>
+                                        </c:if>
+	                          </div>
+	                    </div>
+	                </div>  
+                </c:if>
+                <c:if test="${not empty activityConsumReturn }">
+                    <div class="mb10">
+                        <div class="weui-flex pt10 pb10 whitebg ml10 mr10 bdl2r">
+                              <div class="ml10"><img src="https://www.shouyinbei.net/resources/wap/images/acti4.png" class="dlblock fc radiusp50 vm" width="60" height="60"/></div>
+                               <div class="weui-flex__item">
+                                        <div class="mb10 f16 tleft f-black">活动类型：消费返</div>
+                                        <c:if test="${activityConsumReturn.timeType eq '1' }">
+                                          <div class="f14">有效时间：<fmt:formatDate value="${activityConsumReturn.startDt}" pattern="yyyy.MM.dd"/>-<fmt:formatDate value="${activityConsumReturn.endDt}" pattern="yyyy.MM.dd"/></div>
+                                        </c:if>
+                                        <c:if test="${activityConsumReturn.timeType eq '0' }">
+                                          <div class="f14">有效时间：无限制</div>
+                                        </c:if>
+                              </div>
+                        </div>
+                    </div>  
+                 </c:if>     
+            </div>
+        </div>
+    </body>
+
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/jsp/vip/vipOpenCard.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/vip/vipOpenCard.jsp
new file mode 100644
index 0000000..eaeb88a
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/vip/vipOpenCard.jsp
@@ -0,0 +1,218 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+	pageEncoding="UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html>
+<jsp:include page="../../common.jsp" />
+<style type="text/css">
+.weui-cell {
+	justify-content: space-between;
+}
+</style>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="viewport"
+	content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+	<c:if test="${ storeId ne  'null' }">
+        <title>会员开卡</title>
+    </c:if>
+    <c:if test="${ storeId eq  'null' }">
+    <title>请扫商家会员码</title>
+    </c:if>
+<title>会员开卡</title>
+</head>
+<body>
+	<div class="page-title tcenter h40 bluebg white">
+	<c:if test="${ storeId ne  'null' }">
+		<span>会员开卡</span>
+	</c:if>
+	<c:if test="${ storeId eq  'null' }">
+	<span>请扫商家会员码</span>
+	</c:if>
+	</div>
+	
+	<c:if test="${ storeId ne  'null' }">
+	<div class="weui-cells weui-cells_form bdbe">
+		<div class="weui-cell weui-cell_warn">
+			<div class="weui-cell__hd">
+				<span class="red">*</span>手机号
+			</div>
+			<div class="weui-cell__bd">
+				<input class="weui-input tleft pl10" type="number" id="phone"
+					pattern="[0-9]*" value="weui input error" placeholder="请输入手机号码">
+			</div>
+		</div>
+	</div>
+	<div class="weui-cells weui-cells_form bdbe">
+		<div class="weui-cell weui-cell_warn">
+			<div class="weui-cell__hd">
+				<span class="red">*</span>验证码
+			</div>
+			<div class="weui-cell__bd">
+				<input class="weui-input tleft pl10" type="number" id="phoneverify"
+					pattern="[0-9]*" value="weui input error" placeholder="请输入验证码">
+			</div>
+			<div class="weui-cell__bd tright">
+				<a href="javascript:void(0);onclick=verification()" id="obtain"
+					class="weui-btn_primary radius5 pt10 pb10 pl10 pr10 dlblock white f12">获取验证码</a>
+			</div>
+		</div>
+	</div>
+	<div class="weui-cells weui-cells_form bdbe">
+		<div class="weui-cell weui-cell_warn">
+			<div class="weui-cell__hd">会员名</div>
+			<div class="weui-cell__bd">
+				<input class="weui-input tleft pl10" id="nickName" type="text"
+					placeholder="请输入会员名">
+			</div>
+		</div>
+	</div>
+	<div class="weui-cells weui-cells_form bdbe">
+		<div class="weui-cell weui-cell_warn">
+			<div class="weui-cell__hd">生日&nbsp;</div>
+			<div class="weui-cell__bd pl10">
+				<input class="weui-input tleft pl10" data-toggle='date'  type="text" id="my-input" />
+			</div>
+		</div>
+	</div>
+	<div class="btn mt60 ml20 mr20">
+		<a href="#" onclick="openCardSuccess()"
+			class="weui-btn weui-btn_primary radius10 f14 pt15 pb15">完成</a>
+	</div>
+	</c:if>
+	<c:if test="${ storeId  eq 'null'}">
+	   <div class="margin50-top " style="text-align:center;margin-top:80px;">
+	         <img alt="" src="${resourcePath}/images/member.png"  width="150">
+	         <div class="mt20">请扫商家会员码</div>
+	   </div>
+	</c:if>
+	<input id="storeId" type="hidden" value="${storeId }">
+ 	<input id="openid" type="hidden"  value="${openid }">
+ 	<input id="userPhone" type="hidden" value="${userPhone }">
+</body>
+<script type="text/javascript">
+
+$("#my-input").datetimePicker({
+	times: function () {
+        return [
+        ];
+    }
+});
+	function verification() {
+		var phoneReg = /(^1[3|4|5|7|8|9]\d{9}$)|(^09\d{8}$)/;
+		var phone=$.trim($("#phone").val());
+		var storeId=$("#storeId").val();
+		if (!phoneReg.test(phone)) {
+			alert("请输入正确的手机号");
+		}else{
+			var herf = 'javascript:void(0); onclick=verification()';
+            var _this = $("#obtain");
+            _this.removeAttr("href");
+			$.ajax({
+				url:ctx+'/vip/getPhoneCodeVIP',
+			    data:{
+			    	"phone":phone,
+			    	"storeId":storeId,
+			    },
+			    dataType:"json",
+			    type:"post",
+			    success:function(data){
+			    	//成功
+			    	if(data.code=='1'){
+			            var sec = 60;
+			            var timer = window.setInterval(function() {
+			                sec--;
+			                if (sec > 0) {
+			                    _this.text(sec + "秒重新发送!");
+			                } else {
+			                    // 去掉定时器
+			                    window.clearInterval(timer);
+			                    _this.text("获取验证码");
+			                    _this.attr("href","javascript:void(0); onclick=verification()");
+			                }
+			            }, 1000);
+			    	}else if(data.code=='0'){
+                        alert("获取验证码失败，请稍后再试");
+                        _this.text("获取验证码");
+                        _this.attr("href",href);
+                    }else if(data.code=='2'){
+                    	//系统错误
+                    	alert("系统繁忙！");
+                        _this.text("获取验证码");
+                        _this.attr("href",href);
+                    }else if(data.code=='3'){
+                    	alert("手机号已被注册 ！");
+                    	 _this.text("获取验证码");
+                         _this.attr("href",href);
+                    } 
+			    }
+			})
+	   }
+	}
+    
+	//
+	function openCardSuccess() {
+		var phone = $("#phone").val();
+		var phoneverify = $("#phoneverify").val();
+		var nickName = $("#nickName").val();
+		var birthdayDt = $("#my-input").val();
+		var storeId=$("#storeId").val();
+		var openid=$("#openid").val();
+
+		if (phone == "") {
+			alert("请输入手机号");
+			return;
+		}
+
+		if (phoneverify == "") {
+			alert("请输入验证码");
+			return;
+		}
+
+		if (nickName == "") {
+			alert("请输入会员名");
+			return;
+		}
+
+		if (birthdayDt == "") {
+			alert("请输入生日");
+			return;
+		}
+
+		if(storeId==""){
+			alert("页面已超时，请重新扫码");
+			return;
+		}
+
+		$.ajax({
+			url : ctx + '/vip/openCardSuccess',
+			data : {
+				"phone" : phone,
+				"nickName" : nickName,
+				"birthdayDt" : birthdayDt,
+				"phoneverify" : phoneverify,
+				"storeId":storeId,
+				"openid":openid,
+			},
+			dataType : "json",
+			type : "post",
+			success : function(result) {
+				//成功
+				if (result.code == "1") {
+					alert("开卡成功");
+					window.location = ctx + "/vip/myVIPCard?storeId="+storeId + "&phone=" + phone;
+				} else if (result.code == "0") {
+					alert("验证码错误");
+				} else if (result.code == "2") {
+					alert("系统繁忙");
+				}else if(result.code=="3"){
+					alert("页面已超时，请重新扫码");
+				} else {
+					alert(result.msg);
+				}
+			}
+
+		})
+	}
+</script>
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/jsp/wechat/goUpgradePage.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/wechat/goUpgradePage.jsp
new file mode 100644
index 0000000..9408d94
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/wechat/goUpgradePage.jsp
@@ -0,0 +1,183 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> 
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <title>升级充值</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <script type="text/javascript" src="https://www.shouyinbei.net/resources/wap/js/jquery.min.js"></script>
+    <!-- 引入样式 -->
+    <link rel="stylesheet" href="http://unpkg.com/vue-ydui/dist/ydui.rem.css">
+    <!-- 引入rem自适应类库 -->
+    <script src="http://unpkg.com/vue-ydui/dist/ydui.flexible.js"></script>
+    <style>
+        .body,html{
+            margin: 0;
+            padding: 0;
+            font-family: 微软雅黑, 宋体, Arial;
+        }
+        .center-top{
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            height: 200px;
+        }
+     .yd-navbar-center-title,.yd-back-icon{
+         color: #fff !important;
+     }
+     .center{
+         margin-top: 20px;
+         padding: 20px;
+         background-color: #eee;
+     }
+     .chong{
+       width: 150px;
+       margin: 0 auto;
+     }
+     .b{
+         width: 100%;
+         height: 200px;
+         font-size: 20px;
+         font-family: 微软雅黑, 宋体, Arial;
+     }
+     .btn{
+        margin-top: 40px;
+        width: 100%;
+        height: 40px;
+        background-color: #f96a4f;
+        color:#fff;
+        border-radius: 5px;
+        border: 0;
+     }
+    </style>
+</head>
+<body>
+<div id="app">
+        <yd-navbar title="充值" style="background-color: #f96a4f;">
+            <a to="#" slot="left">
+                <yd-navbar-back-icon></yd-navbar-back-icon>
+             </a>
+        </yd-navbar>
+         <c:if test="${level eq '1'}">
+        <div class="center-top">
+            <img class="b" src="https://www.shouyinbei.net/resources/images/levelLogo.png" alt="">
+        </div>
+        </c:if>
+        
+         <c:if test="${level eq '2'}">
+         <div class="center-top">
+            <img class="b" src="https://www.shouyinbei.net/resources/images/levellogo1.png" alt="">
+        </div>
+        </c:if>
+        
+        <c:if test="${level eq '1'}">
+	        <div class="center">
+	                    <div class="chong">
+	                        <span style="font-size: 16px;" >充值金额:<b id="a">${twoUpVipAmount}</b>元</span>
+	                    </div>
+	                    <button class="btn" onclick="setFocusHander()">立即充值</button>
+	                <input type="hidden" id="userId"  value="${userId}">
+	            </div>
+            </c:if>
+            
+            <c:if test="${level eq '2'}">
+            <div class="center">
+                        <div class="chong">
+                            <span style="font-size: 16px;" >充值金额:<b id="a">${threeUpVipAmount}</b>元</span>
+                        </div>
+                        <button class="btn" onclick="setFocusHander()">立即充值</button>
+                    <input type="hidden" id="userId"  value="${userId}">
+                </div>
+            </c:if>
+            
+</div>
+<!-- 引入 Vue -->
+<script src="http://unpkg.com/vue"></script>
+<!-- 引入组件库 -->
+<script src="http://unpkg.com/vue-ydui/dist/ydui.rem.js"></script>
+<!-- <script src="https://unpkg.com/axios/dist/axios.min.js"></script> -->
+<script>
+function isWeiXin(){
+    var ua = window.navigator.userAgent.toLowerCase();
+    if(ua.match(/MicroMessenger/i) == 'micromessenger'){
+        return true;
+    }else{
+        return false;
+    }
+}
+function setFocusHander(){
+	var money=$("#a").text();
+	var userId=$("#userId").val();
+	var payWay='';
+    if(isWeiXin()){
+        payWay='WXZF';
+    }else{
+        payWay='ZFBZF';
+    }
+    $.ajax({
+        url:'/wap/wechat/leshuaPay',
+        data:{
+             "userId": userId,
+             "money": money,
+             "payWay": payWay,
+             "level":${level},
+        },
+        dataType:"json",
+        type:"post",
+        success:function(res){
+            if(res.code=='1'){
+                window.location=res.jspay_url;
+            }else{
+                alert(res.msg);
+            }
+        }
+    })
+}
+
+
+   /*  new Vue({
+        el: '#app',
+        data:{
+            input10:''
+        },
+        mounted(){
+        	var money=this.$refs.a.innerHTML;
+        	console.log(this.$refs.b.value)
+        },
+        methods: {
+        	setFocusHander: function (){
+            	var money=this.$refs.a.innerHTML;
+            	var userId=this.$refs.b.value;
+            	var payWay='';
+            	if(isWeiXin()){
+            		payWay='WXZF';
+            	}else{
+            		payWay='ZFBZF';
+            	}
+            	$.ajax({
+            		url:'/wap/wechat/leshuaPay',
+            		data:{
+            			 "userId": userId,
+                         "money": money,
+                         "payWay": payWay,
+            		},
+            		dataType:"json",
+            		type:"post",
+            		success:function(res){
+            			if(res.code=='1'){
+            				window.location=res.jspay_url;
+            			}else{
+            				alert(res.msg);
+            			}
+            		}
+            	})
+            },
+        }
+    }) */
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/menu.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/menu.jsp
new file mode 100644
index 0000000..7ef41c6
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/menu.jsp
@@ -0,0 +1,66 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+
+
+		<div class="header">
+			<div class="pt10 pb10">
+				<div class="w1100 fc">
+					<div class="pt5 pb5 clearfix">
+						<div class="fl">
+							<img src="${resourcePath }/images/logo.png" alt="" width="300">
+						</div>
+						<div class="fr mt15">
+							<span>欢迎您,</span>
+							<a href="javascript:void(0);" class="f14 black">${user.name}</a>
+							<span>|</span>
+							<a href="${ctx }/index!logout.do" class="f14 black">退出</a>
+						</div>
+					</div>
+				</div>
+			</div>
+			<div class="dgraybg">
+				<div class="w1100 fc">
+					<div class="clearfix">
+						<ul class="nav"  id="menuUl">
+							
+						</ul>
+					</div>
+				</div>
+			</div>
+		</div>
+<script type="text/javascript">
+require('js/index/menu.js');
+</script>
+
+<script type="text/javascript">
+$(function() {
+	//菜单滑动效果
+	$(".nav li").click(function() {
+		$(this).addClass("current").siblings("li").removeClass("current");
+	})
+	$(".nav li").mouseover(function() {
+		$(this).addClass("coti");
+	})
+	$(".nav li").mouseleave(function() {
+		$(this).removeClass("coti");
+	})
+})
+
+//获取当前url 链接
+$(document).ready(function(){
+	 var url=window.document.location.pathname;
+	 //设置选中效果
+	 //一级菜单显示判断
+	$('#menuUl').find('li').each(function(){
+		if(url==$(this).children('a').attr('href')){
+			$(this).addClass("current").siblings("li").removeClass("current");
+		}
+	});
+	 //二级菜单显示
+	$('#menuUl').find('li >div a').each(function(){
+		if(url==$(this).attr('href')){
+			$(this).parents("li").addClass("current").siblings("li").removeClass("current");
+		}
+	});
+})
+
+</script>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/public.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/public.jsp
new file mode 100644
index 0000000..6a27953
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/public.jsp
@@ -0,0 +1,37 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@include file="taglib.jsp"%>
+<meta http-equiv="X-UA-Compatible" content="IE=8" >
+<c:set var="res" value="/resources/auth"  scope="request"/>
+<link href="${res}/jquery-ui-bs/assets/css/bootstrap.css" rel="stylesheet">
+<link href="${res}/jquery-ui-bs/assets/css/bootstrap-responsive.css" rel="stylesheet">
+<link href="${res}/jquery-ui-bs/css/custom-theme/jquery-ui-1.10.0.custom.css" rel="stylesheet">
+<!--[if lt IE 9]>
+<link rel="stylesheet" href="${res}/jquery-ui-bs/css/custom-theme/jquery.ui.1.10.0.ie.css"/>
+<![endif]-->
+
+<link href="${res}/jquery-validation/1.10.0/validate.css" rel="stylesheet">
+<link href="${res}/dataTables/jquery.dataTables.bs.css" rel="stylesheet">
+<link href="${res}/jquery-ui-multiselect/jquery.multiselect.css" rel="stylesheet">
+<link href="${res}/jquery-loadmask-0.4/jquery.loadmask.css" rel="stylesheet">
+<link href="${res}/uploadify/uploadify.css" rel="stylesheet" type="text/css"/>
+<link href="${res}/My97DatePicker/skin/WdatePicker.css" rel="stylesheet" type="text/css"/>
+
+<link href="${res}/css/common.css" rel="stylesheet">
+
+<link rel="shortcut icon" href="http://lingxi.voicecloud.cn/favicon.ico" />
+
+<script type="text/javascript" src="${res}/jquery-ui-bs/js/jquery-1.8.3.min.js"></script>
+<script type="text/javascript" src="${res}/jquery-ui-bs/js/jquery-ui-1.10.0.custom.min.js"></script>
+<script type="text/javascript" src="${res}/jquery-ui-bs/assets/js/bootstrap.min.js"></script>
+<script type="text/javascript" src="${res}/jquery-validation/1.10.0/jquery.validate.min.js"></script>
+<script type="text/javascript" src="${res}/jquery-validation/1.10.0/messages_bs_zh.js"></script>
+<script type="text/javascript" src="${res}/dataTables/jquery.dataTables.js"></script>
+<script type="text/javascript" src="${res}/jquery-ui-multiselect/jquery.multiselect.js"></script>
+<script type="text/javascript" src="${res}/jquery-loadmask-0.4/jquery.loadmask.min.js"></script>
+<script type="text/javascript" src="${res}/uploadify/jquery.uploadify.min.js"></script>
+<script type="text/javascript" src="${res}/My97DatePicker/WdatePicker.js"></script>
+
+<script type="text/javascript" src="${res}/js/common.js"></script>
+
+<script type="text/javascript" src="${res}/upload/jquery.form.js"></script>
+<script type="text/javascript" src="${res}/upload/upload.js?rnd=12.1"></script>
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/taglib.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/taglib.jsp
new file mode 100644
index 0000000..f07013c
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/taglib.jsp
@@ -0,0 +1,16 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ taglib prefix="shiro" uri="http://shiro.apache.org/tags"%>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> 
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+<%@ taglib prefix="s" uri="http://www.springframework.org/tags" %>
+<c:set var="version" value="1.02" scope="request" />
+<c:set var="ctx" value="${pageContext.request.contextPath}" scope="request"/>
+<%--上传文件URL --%>
+<c:set var="res" value="/sso/resources/auth" scope="request"/>
+<meta http-equiv="X-UA-Compatible" content="IE=8" >
+<script type="text/javascript">
+	var ctx = "${ctx}";
+	var res = "${res}";
+</script>
\ No newline at end of file
diff --git a/pluss-wap-page/src/main/webapp/index.html b/pluss-wap-page/src/main/webapp/index.html
new file mode 100644
index 0000000..1d0f30a
--- /dev/null
+++ b/pluss-wap-page/src/main/webapp/index.html
@@ -0,0 +1,336 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<head>
+    <meta charset="utf-8">
+    <meta content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=no" name="viewport">
+    <meta content="yes" name="apple-mobile-web-app-capable">
+    <meta content="black" name="apple-mobile-web-app-status-bar-style">
+    <meta content="telephone=no" name="format-detection">
+    <meta content="email=no" name="format-detection">
+    <link rel="stylesheet" href="https://act.weixin.qq.com/static/cdn/css/wepayui/0.1.1/wepayui.min.css">
+    <title>输入金额付款</title>
+    <style>
+        html,body{
+            width:100%;
+            height:100%;
+            margin:0 auto;
+            padding:0px;
+            background-color:#EFEFF4;
+        }
+        .payinfo{
+            display: block;
+            position: absolute;
+            bottom: 0;
+            height: 13rem;
+            width: 100%;
+            overflow: hidden;
+            transition: .4s;
+        }
+        table{
+            width:100%;
+            height: 90%;
+            bottom: 0;
+            background-color:white;
+        }
+        table tr td{
+            text-align:center;
+            width:24.9999999%;
+            border-right:1px solid #D9D9D9;
+            border-bottom:1px solid #D9D9D9;
+        }
+        table tr td:active{
+            background-color:#ECECEC;
+        }
+        .keybord-return,.keybord-stop{
+            width:30px;
+            height:30px;
+            margin:0px auto;
+            color:white;
+        }
+        .keybord-return{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADICAMAAACahl6sAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAALpQTFRFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAqyRq8wAAAD10Uk5TAAM/gJ+efz5Q2ddPAouKAZZ8nP0vrfcLN03+GcxYu9gSGkCBndobPbe8+QonMuCH7xOIW0fNtCwra4NgHN+ehK8AAAABYktHRACIBR1IAAAACXBIWXMAAABIAAAASABGyWs+AAAB4UlEQVR42u3c51LCQBiF4Y2IgDQVRcWCvffe9v5vS2FGhSH5kTLzney8zxWcd3ZD+BXnAAAAAAAAAAAAgFSiucp8daEWWe/Iq97wY4tN6yW5tNr+T6drvSa77pKfsGw9J7PWymSH761aDyqmw/s160XZTN+rkf669aYsZs7jx4b1qII6/Kb1qvRm79VIzXpWarHn4Qdb1ruK6fDb1rvSir9X3u9YD0sp4Tz8bst6WTEdwz3rZekk3avGvvUyOuiwR4cWOrTQoYUOLXRooUMLHVro0EKHFjq00KGFDi10aKFDCx1a6NBChxY6tNChhQ4tdIhpx3cMy9ZRD6QjaoTR4Q7CeD6cOwzjPJyrhnEezh3FhByfWK/KoBLK1TqNfdhLeCbRMJCfX9cM5IXoXCeUkqQ/jeV7TijRQ4keSvRQoocSPZTooUQPJXoo0UOJHkr0UKKHEj2U6KFEDyV6KNFDiR5K9FCihxI9lOgJpySUD04ml5yV7jPlSberfN8tTjiTc+tdRZVcXFrvSi/+dl1Zz8og9kyurVcVVVK6b2KPzd6uG+tJGc2cya31ooJK7u6tB2U2dbt65Xsf/ms9DH47+o/WY/J5eh5nDF5erZfk9vb+Ufn8sl4BAAAAAAAAAAAAY9/5YLt8mhkMlgAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAyMC0wNy0wNFQxNTowMjo0OSswODowMMIgQKAAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMjAtMDctMDRUMTU6MDI6NDkrMDg6MDCzffgcAAAAR3RFWHRzdmc6YmFzZS11cmkAZmlsZTovLy9ob21lL2FkbWluL2ljb24tZm9udC90bXAvaWNvbl91ZmVhaXVpd2lrZy9iYWNrLnN2Z4Ft+LMAAAAASUVORK5CYII=); background-size:100% 90%; }
+        .keybord-stop{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAgAAAAIACAMAAADDpiTIAAAAA3NCSVQICAjb4U/gAAAACXBIWXMAAA3lAAAN5QHm6mmvAAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAAWtQTFRF////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAR9G26gAAAHh0Uk5TAAECAwQFBgcICQsMDQ4PEBMUFRcaHyEiJiwuLzAyMzQ1Nj0+P0JGR0pNUFZXW11eYmZnaG1ub3F3eH6Ag4SFhomMj5WWmJmgoqWmp6usrrGytLq9vsLDxsnKy87P0NLT1dfZ3N7i4+Tl5unr7O/w8vX29/n6+/3+X88dAwAACGRJREFUeNrt3Y1/jfUfx/HvSFbKXaxVilVCq4lFIRRRQm6SkbsYs9pqbcr682PkdtfsOlOPc6738/UHXI/f4/N+/kp2zrVS5tvyvoF9x4cuXx+b+ltt2tTY9ctDx/cN9C0vz7dV/YeHnbeTGj7cv+p5rf/67ovTLtp5TV/c/frC11+x7axTdm5nt61Y0Pyv7p90xM5ucv+rLc+/ZMeYA3Z+YzuWtLZ/vz/3NaTh/hbmf++cwzWnc+/VnL/3pKM1q5O9dfbfMuFiTWtiy/z333XbvZrX7V3znL/7iGM1syPd89l/zXmXamrn1zx7/w2j7tTcRjc8a/+P/ayv0U19/Iz9najpzSlgg///N/+fAXP8W2CNf/8HNFr5J8Fuf/6P6HzVfw367/+QjlT8/Z/LpDTr3wlu8fe/Md2e5ecCvX7+E9TE0z8b9PPfqE4+9fkPN8nqyU+InHOSrM498fk/F0nrsc8JLvH5z7iGH/2s8A73yGvHI9//8Pn/wMYefmNkv2sktv/B9/98/yuyyX+/N7jNLTLbdh+A7/+Gdvb+9/9dIrV77w/Y7RCp7Z4BcNEhUrs48/4f73+JbXqVHwNkd/cHAoedIbfDdwD4OVBww6Usd4Xklpc+R0iurww4QnIDZZ8jJLevHHeE5I6XIUdIbqhcdoTkLpfrjpDc9eLjgNGNFe8EiW6quEF2AAAgAASAABAAAkAACAABIAAEgAAQAAJAAAgAASAABIAAEAACQAAIgJmmLtWv8mHj9Z91rfJhI/UfNlL5sGv1HzZe+bAWTjbVtgAulfpVPuxQ/Wetq3zYYP2HDVY+bF39hx2qHqB+lwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA1JEBAIAAEAACQAAIAAEgAASAABAAAkAACAABIAAEgAAQAAJAAAgAASAAZho/VL/Kh/1c/1nHKh/2Y/2H/Vj5sGP1H/Zz5cNaONl42wLw1TDfDQQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADg/wRwbV39Kh92rP6zPqp82N76D9tb+bCP6j+s+pfZtHCya20LQJ0XAAAIAAEgAASAABAAAkAACAABIAAEgAAQAAJAAAgAASAABIAAEAACQAAIAAEgAASAABAAAkAACAABIAAEgAAQAAJAAAgAASAABIAAEAACQAAIgLu18Euj2rdDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB3AfzVrv/Lxi81qPF2vfJf5be2tan/od/KiCMkN1KuOkJyV8tPjpDcT+W0IyR3uhx0hOQOlk8dIblPyweOkNwHZa0jJLe2dE24Qm4TXaWccobcTpVSPnOG3D67A+BNZ8jtzTsAun51h9R+7br7s+pvHSK1b2c+rLDJIVLbNANg8S8ukdkvi+99Xukrp8jsq/sfWHvLKTJ769+PLJ5xi8TOPPjM6vpp18hrev3DTy0fdY68jj7ysfWeW+6R1q2eR7+4cMBB0jrw2DdXVv7uIln9vvLx7y597iRZff7El9e6b7hJUje6n/z64oCjJDXw9BdYv3GVnL6Z5RvMS4fcJaWhpbN9h/013xMNaeS12d9i8Pak2yQ0+XbVeyz6HSeh/uo3mXzhOs3vizleZdP1vfs0ve+75nqZ0cs+GtDwzrw89+usXvB18UZ38IVnvtFs8E9namp/Ds7nnXbvt+07zbSwxt+f31sNe664VRO70jPf91ouO+FazevEsvm/2bRrj8+INaxbe7pqvdy25zufFG5Q09/1lLq9468EGtOZd1p6xfVmfxhsRFc2t/qS80Wf3HS+Tu/mJ4sW8J77l3ZecMJO7sLOlxb6uw7e+NI/Bjr1//xfvvFcft3For5dp/9wzs7qj9O7+haV59eL7+78+odRd+2ERn/4eue7L/4nv/rmld71Gz/cun1Qbdn2rR9uXN/7SpEkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZKkuq1u0i9zWW3P+u1pzq9x2mPNaAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAfbPFmD/bAH2zxZg/2wB9s8WYP9sAen7/wNF3uGEUW54AwAAAABJRU5ErkJggg==); background-size:100% 100%;}
+        .pay{
+            color:#ffffff;
+            font-size:120%;
+            background-color:#df6051;
+        }
+        .pay:active{
+            /*background-color: #df6051;*/
+            background-color: rgba(223,96,81,0.7);
+        }
+        .shouyin{
+            text-align: center;
+            color: #9b9b9b;
+            font-size: 13px;
+        }
+        .logo{
+            background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAD70lEQVRoQ9VaTYgURxT+Xm8w7PQs6CFgXDCXEAKeFHKLRKMo6HoSc0qmqlfxICSn/KCXmIMuiZ4UBEG3q+aokItKiGSTDZ5CIHtK9LAXhRVJDoZs9ywR7CfVuzPMzM5sV/X0MNt92Z7q9773vu2qej/VhIKuSIgDBO8AgEkCTybApLlfg1/ygCUGLSH9m8xVtZ4rwjQNAhLXgikQjgE8BWCHI9ZTgO6Cccevh3cddVvizgT4zJnqSqMRMFMA8O68hjv1aIGIw/FKJaRr1yIXTGsCkZTbx5iChJNpEL3tYsRalnnRI2/2JXFYVeqZjZ4VgVjK95hRJ+BdG9BBZRh4RISar9TvWViZBFZq0/sTSn7OAhrGc4+9D8frs79shL0hgUiIgECzw3DOFpPB01Wtw37yfQlEQnxJoG9tDQ1TjsFfVbX+rpeNngRiIU4CdGOYTrlj8ylf65vdeusIxEIcTffnTXnxlK/1vXbXOgiYrZKYHwBD2iYH/qfwIhPtbd9iOwisiOBsAr44sJ0hAnigc+M6nGmaaBEwEbYRxQtDC1JFkWJerFT93c2I3SLQkPJTZlwpys4wcYjwWUWpq8ZGi0Asgj9cchsC5l8yfi3C0THCBwzss8eiBV+He1oEIiEOEehHewAgYXwzUVfnXXT6yS7X5HmP8LULFoMPV7W+n76BhhCXGPS5C8Bo34CZOny5ovUXKYFYyMcAdroScJHPknWbQinaE1+rt6jxyfT77CUPsgx0BY/5ilb7XXSyZGMh/wewJUuuw4/E20uxCC4CfNZJkXC8otT3LjpZsrGUF8A4lyXX+ZxmDAENcM1F0dcqMw13wUun8cen38TYi6duelSnhpA/MWCKcdvrpq/VKVthF7lYSJODHbXVIWCOIiEfulRaDD5YVEeh29HVJgHfsSWQVm6RkP8RMGGr9IKwbZtS/7bLLwfBG+b3RBj+M8j4cym3bmE8t/WFgWVnAuDkiF+v/9DhqAlESH4bdLwh5Qlm3HIl4DSFDDgRPqooddvctxstatyBwKM8i7iJ/+faza4ug0WNZ/JIF3GebdQgJ4Q0kHmMDbsGWV4MhkP1XIHMOGViwbKU+4ogMKHUfCwkZ5Fd/5xmcqUSm4UAmVQijYI5krlN8AZWk7l0J8mRTo+aQEc6naegGTWBjoJmdRq5lZSjJdBVUq4FJKei/jWPdr0ehn+57xzrNUwq4iX8ty1Wz6I+R1vlfkJo9WdsjfeSI8Z1At6xwujXVjHKpW5sGQKlby2uLuYSN3ebc7DU7fUmiVIfcLSRKO8RU5NEqQ/5WmuizMesrelU5oPu9ghZ2k8NeoX5Un7s0S9fGdXnNq8Aors/k02FsxcAAAAASUVORK5CYII=);background-size:100% 100%;
+            width: 35px;
+            height: 35px;
+        }
+        .icon{
+            background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAC7UlEQVRYR72WTWgTURDH/7ObJi1YENFT4kVtD/YgSMFaaOrbpfYgeElaURA8CIKKIAhCQYyCIAiC0KLgodBDwUqhiODB8N42RfFQEYoVBUGRCiKioPUjNbsjK4mk2ySbTTe+687O7/dm3hehiSOXy+20bXuEiAQzTwkhznpx1Cx+ET4FoKuMMSaEOF3ObIpAFfhfruM4l0zTzJQkmiIwNze3y7btKWbuXFNyoh/RaHRzb2/vT/db6AKWZd1h5tsAlgHcBZDwSHxLJBJbOjo68qELSCkniegwgC8A9gPYQETTzLypJNG0FkgpJ4joaNlsX2qadpCIttm2PQOglZlvGoZxMvRFqJQaB3DM229mzsVisaF8Pr8XwCHDMI6Evg2VUm6/j1fbzkR0Lx6PD5d6HqqAUuoWgBM+Z8n07OzscCaTcSrFNbwLlFKjAE75wGfa29uHu7u7f1etUCMnoWVZN5j5jM+/9wEMCSF+1YoLXAEp5XUiWnOmeyAPVlZWhgYHB7/7TTCQgFLqGoBzPkkftrW1pXt6er76wQMdREqpqwDO1ywnkdR1Pd3X1+ceRHWNuiogpbxCRCO1Mrp7nohSQohPdZGLQb4CUsrLRHTBJ+kjAGkhxIcg8JotyGazndFoNOLeap473ct44jhO2jTN90HhNQUsy3JX+pKmaYs1JOYLhUJqYGDgXSPwmgJKqSwAk5kPRCKRtxUknmmalurv73/TKLyqQPFFs1hK7DjOnpaWluWSBBEtMLO74F6vB15VQCl1EcC/Z5MbGIlEtjNza/GlkzIM49V64VUFpJRPiWi3F1AoFDbGYrF4Mpl8EQa8ooC3/EXQvOM4E5qmjQsh3KdWaGPNOVBefiKatG17zDTNx6ERPYkqCTwHMCqEcO/6po9VAm75w+xvPfarBJRS7hN6Rz0/BonRdf1jtYl5BThI4iCxuq53VZL4bwIAtgohlrzSlRbhviAzqydW1/XPyWRyoVKs73VcD2A9MX8AVWwjMF0q1kMAAAAASUVORK5CYII=);background-size:100% 100%;
+            width: 15px;
+            height: 15px;
+        }
+        .body{
+            padding: 2rem 1rem;
+        }
+        .store-info{
+            display: flex;
+            align-items: center;
+        }
+        .name{
+            margin-left: .5rem;
+        }
+        .main-amt{
+            height: 3rem;
+            padding: 1.2rem 0 0 0;
+        }
+        .amt-content {
+            display: flex;
+            background: #fff;
+            padding: 10px 20px;
+            border-radius: 4px;
+            height: 40px;
+            font-size: 18px;
+        }
+        .input-label {
+            flex: 1;
+            line-height: 40px;
+        }
+        .input-box {
+            line-height: 40px;
+            font-size: 25px;
+            color: #777;
+        }
+        .gb {
+            display: inline-block;
+            width: 2px;
+            height: 30px;
+            margin-top: -6px;
+            background: #df6051;
+            vertical-align: middle;
+            animation: gb 1.3s infinite;
+        }
+        .money-input {
+            font-weight: bold;
+            color: #df6051;
+        }
+        @keyframes gb {
+            from {
+                opacity: 1;
+            } to {
+                opacity: 0;
+            }
+        }
+        .remark-info{
+            display: flex;
+            align-items: center;
+            font-size: 13px;
+            color: #9e9e9e;
+        }
+        .set-remark{
+            margin-left: 5px;
+        }
+        .main-title{
+            display: flex;
+            justify-content: space-between;
+        }
+
+        .shade{
+            display: none;
+            position: absolute;
+            top: 0;
+            left: 0;
+            width: 100%;
+            height: 100%;
+            background-color: rgba(0,0,0,.1);
+            z-index: 1002;
+            overflow: auto;
+        }
+        .dialog{
+            z-index: 8888;
+            height: 13rem;
+            width: 100%;
+            position: absolute;
+            display: none;
+        }
+        .dialog-content{
+            background: #fff;
+            height: 11rem;
+            border-radius: 10px;
+            padding: 10px 20px;
+            margin: 0 auto;
+            width: 60%;
+        }
+        .btns{
+            padding: 0 0 0 5%;
+        }
+        .btn-cancel{
+            width: 45%;
+            height: 1.8rem;
+            border-radius: 20px;
+            border: none;
+        }
+        .btn-submit{
+            width: 45%;
+            height: 1.8rem;
+            border-radius: 20px;
+            border: none;
+            background-color: #df6051;
+            color: #fff;
+        }
+        .remark-text{
+            border: 1px solid #e4e0e0;
+            height: 6rem;
+            width: 100%;
+        }
+        .remark-body{
+            margin-top: 15px;
+        }
+    </style>
+</head>
+<body>
+    <div class="body">
+        <div th:text="${msg}"></div>
+        <div class="main-title">
+            <div class="store-info">
+                <div class="logo"></div>
+                <div class="name">云霄滑冰超市</div>
+            </div>
+            <div class="remark-info">
+                <div class="icon"></div>
+                <div class="set-remark" onclick="showRemarkDialog()">设置备注</div>
+            </div>
+        </div>
+        <div class="main-amt">
+            <div class="amt-content" onclick="showInput()">
+                <div class="input-label">消费金额</div>
+                <div class="input-box">￥ <span class="money-input" name="comsumeMoney" id="comsumeMoney"></span> <span class="gb"></span></div>
+            </div>
+        </div>
+
+    </div>
+    <div class="payinfo" id="payinfo">
+        <div class="shouyin" onclick="showInput()">
+            <p>收&nbsp;银&nbsp;就&nbsp;用&nbsp;收&nbsp;银&nbsp;呗</p>
+        </div>
+        <table cellspacing="0" cellpadding="0" id="table1">
+            <tr>
+                <td class="paynum" onclick="inputAmt(1)">1</td>
+                <td class="paynum" onclick="inputAmt(2)">2</td>
+                <td class="paynum" onclick="inputAmt(3)">3</td>
+                <td id="pay-return" onclick="inputAmt('del')"><div class="keybord-return"></div></td>
+            </tr>
+            <tr>
+                <td class="paynum" onclick="inputAmt(4)">4</td>
+                <td class="paynum" onclick="inputAmt(5)">5</td>
+                <td class="paynum" onclick="inputAmt(6)">6</td>
+                <td rowspan="3" class="pay" id="pay">支付</td>
+            </tr>
+            <tr>
+                <td class="paynum" onclick="inputAmt(7)">7</td>
+                <td class="paynum" onclick="inputAmt(8)">8</td>
+                <td class="paynum" onclick="inputAmt(9)">9</td>
+            </tr>
+            <tr>
+                <td id="pay-stop" onclick="hideInput()"><div class="keybord-stop"></div></td>
+                <td id="pay-zero" onclick="inputAmt(0)">0</td>
+                <td id="pay-float" onclick="inputAmt('.')">.</td>
+            </tr>
+        </table>
+    </div>
+    <div id='shade' class="shade"></div>
+
+    <div class="dialog" id="dialog">
+        <div class="dialog-content">
+            <div class="label">设置备注</div>
+            <div class="remark-body">
+                <textarea class="remark-text"></textarea>
+            </div>
+            <div class="btns">
+                <button class="btn-cancel" onclick="hideRemarkDialog()">取消</button>
+                <button class="btn-submit" onclick="hideRemarkDialog()">确定</button>
+            </div>
+        </div>
+    </div>
+</body>
+<script>
+    function inputAmt(o){
+        var dom = document.getElementById('comsumeMoney');
+        var txt = dom.innerText;
+        if(!txt){
+            if(o === 'del' || o === '.'){
+                return;
+            }
+        }
+        if(o === '.' && txt.indexOf(".") > 0){
+            return;
+        }
+        if(o === 'del'){
+            txt = txt.slice(0,-1);
+            dom.innerText = txt
+            return;
+        }
+        if(txt.indexOf(".") > 0 ){
+            var v = txt.split(".")[1];
+            if(v && v.length > 1){
+                return;
+            }
+        }else{
+            if(txt.indexOf("0") == 0 && o !== '.'){
+                return;
+            }
+        }
+        txt = txt === "" ? o : txt + "" + o;
+        let max = 999999;
+        if(parseFloat(txt) > max){
+            return;
+        }
+        dom.innerText = txt;
+    }
+    function hideInput(){
+        var dom = document.getElementById('payinfo');
+        dom.style.height = '20px'
+    }
+    function showInput(){
+        var dom = document.getElementById('payinfo');
+        dom.style.height = '13rem'
+    }
+    function showRemarkDialog(){
+        var shape = document.getElementById('shade');
+        var dialog = document.getElementById('dialog');
+        shape.style.display = 'block';
+        dialog.style.display = 'block';
+    }
+    function hideRemarkDialog(){
+        var shape = document.getElementById('shade');
+        var dialog = document.getElementById('dialog');
+        shape.style.display = 'none';
+        dialog.style.display = 'none';
+    }
+    document.getElementById("pay").onclick = ()=>{
+        var comsumeMoney = document.getElementById('comsumeMoney').innerText;
+        if(comsumeMoney == undefined || comsumeMoney == '' || comsumeMoney == null){
+            return;
+        }
+        var url = "/wap/merchant/tradePay";
+        var xhr = new XMLHttpRequest();//创建请求对象
+        xhr.open("POST", url, true);//链接服务器
+        xhr.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
+        xhr.onreadystatechange = function () {
+            if (xhr.readyState === 4) {//请求已完成，且响应已就绪
+                if (xhr.status === 200) {//请求成功
+                    var resultStr = xhr.responseText//获取结果
+                    var resultObj = JSON.parse(resultStr);//解析数据
+                }
+                else {
+                    alert("错误码 : " + xhr.status);
+                }
+            }
+        }
+        xhr.send("comsumeMoney="+comsumeMoney);//发送请求
+    }
+</script>
+</html>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..ee9073f
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>cn.pluss.platform</groupId>
+    <artifactId>pluss-parent</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <modules>
+        <module>pluss-model-bundle</module>
+        <module>pluss-service-bundle</module>
+        <module>pluss-common-bundle</module>
+        <module>pluss-dao-bundle</module>
+        <module>pluss-manage-page</module>
+        <module>pluss-api-page</module>
+        <module>pluss-wap-page</module>
+        <module>code-generator</module>
+    </modules>
+
+    <packaging>pom</packaging>
+
+    <properties>
+        <skipTests>true</skipTests>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <swagger.version>2.4.0</swagger.version>
+        <mysql.version>5.1.49</mysql.version>
+        <!--        <mysql.version>8.0.20</mysql.version>-->
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <log4j.version>2.5</log4j.version>
+        <mapstruct.version>1.4.2.Final</mapstruct.version>
+        <lombok.version>1.18.20</lombok.version>
+        <springboot-thymeleaf.version>3.0.2.RELEASE</springboot-thymeleaf.version>
+        <!-- 布局功能的支持程序  thymeleaf3主程序  layout2以上版本 -->
+        <thymeleaf-layout-dialect.version>2.1.1</thymeleaf-layout-dialect.version>
+
+        <poi.version>4.1.0</poi.version>
+        <log4j.version>2.5</log4j.version>
+
+        <hutools.version>5.8.4</hutools.version>
+        <jdom2.version>2.0.6</jdom2.version>
+
+        <mybatis-plus.version>3.3.2</mybatis-plus.version>
+
+        <fastjson.version>1.2.75</fastjson.version>
+        <kotlin.version>1.5.10</kotlin.version>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>2.1.0.RELEASE</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>cn.hutool</groupId>
+                <artifactId>hutool-all</artifactId>
+                <version>${hutools.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.poi</groupId>
+                <artifactId>poi</artifactId>
+                <version>${poi.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.poi</groupId>
+                <artifactId>poi-ooxml</artifactId>
+                <version>${poi.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.jdom</groupId>
+                <artifactId>jdom2</artifactId>
+                <version>${jdom2.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.mapstruct</groupId>
+                <artifactId>mapstruct</artifactId>
+                <version>${mapstruct.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.mapstruct</groupId>
+                <artifactId>mapstruct-processor</artifactId>
+                <version>${mapstruct.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.baomidou</groupId>
+                <artifactId>mybatis-plus-boot-starter</artifactId>
+                <version>${mybatis-plus.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.alibaba</groupId>
+                <artifactId>fastjson</artifactId>
+                <version>${fastjson.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.projectlombok</groupId>
+                <artifactId>lombok</artifactId>
+                <version>${lombok.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.baomidou</groupId>
+                <artifactId>mybatis-plus-extension</artifactId>
+                <version>${mybatis-plus.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>mysql</groupId>
+                <artifactId>mysql-connector-java</artifactId>
+                <version>${mysql.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-stdlib-jdk8</artifactId>
+            <version>${kotlin.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-test</artifactId>
+            <version>${kotlin.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-clean-plugin</artifactId>
+                    <version>3.1.0</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-war-plugin</artifactId>
+                    <version>3.2.2</version>
+                </plugin>
+                <plugin>
+                    <groupId>cn.smallbun.screw</groupId>
+                    <artifactId>screw-maven-plugin</artifactId>
+                    <version>1.0.3</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+        <plugins>
+            <plugin>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-maven-plugin</artifactId>
+                <version>${kotlin.version}</version>
+                <executions>
+                    <execution>
+                        <id>compile</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>test-compile</id>
+                        <phase>test-compile</phase>
+                        <goals>
+                            <goal>test-compile</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <jvmTarget>1.8</jvmTarget>
+                    <apiVersion>1.5</apiVersion>
+                    <languageVersion>1.5</languageVersion>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file